summaryrefslogtreecommitdiff
path: root/spec/ruby/library/net-http/httpheader/range_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby/library/net-http/httpheader/range_spec.rb')
-rw-r--r--spec/ruby/library/net-http/httpheader/range_spec.rb50
1 files changed, 50 insertions, 0 deletions
diff --git a/spec/ruby/library/net-http/httpheader/range_spec.rb b/spec/ruby/library/net-http/httpheader/range_spec.rb
new file mode 100644
index 0000000000..8944e2d5f2
--- /dev/null
+++ b/spec/ruby/library/net-http/httpheader/range_spec.rb
@@ -0,0 +1,50 @@
+require_relative '../../../spec_helper'
+require 'net/http'
+require_relative 'fixtures/classes'
+
+describe "Net::HTTPHeader#range" do
+ before :each do
+ @headers = NetHTTPHeaderSpecs::Example.new
+ end
+
+ it "returns a Range object that represents the 'Range' header entry" do
+ @headers["Range"] = "bytes=0-499"
+ @headers.range.should == [0..499]
+
+ @headers["Range"] = "bytes=500-1233"
+ @headers.range.should == [500..1233]
+
+ @headers["Range"] = "bytes=10-"
+ @headers.range.should == [10..-1]
+
+ @headers["Range"] = "bytes=-10"
+ @headers.range.should == [-10..-1]
+ end
+
+ it "returns nil when there is no 'Range' header entry" do
+ @headers.range.should == nil
+ end
+
+ it "raises a Net::HTTPHeaderSyntaxError when the 'Range' has an invalid format" do
+ @headers["Range"] = "invalid"
+ -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
+
+ @headers["Range"] = "bytes 123-abc"
+ -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
+
+ @headers["Range"] = "bytes abc-123"
+ -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
+ end
+
+ it "raises a Net::HTTPHeaderSyntaxError when the 'Range' was not specified" do
+ @headers["Range"] = "bytes=-"
+ -> { @headers.range }.should.raise(Net::HTTPHeaderSyntaxError)
+ end
+end
+
+describe "Net::HTTPHeader#range=" do
+ it "is an alias of Net::HTTPHeader#set_range" do
+ Net::HTTPHeader.instance_method(:range=).should ==
+ Net::HTTPHeader.instance_method(:set_range)
+ end
+end
GAL91
-rw-r--r--Makefile.in262
-rw-r--r--NEWS915
-rw-r--r--README154
-rw-r--r--README.EXT1258
-rw-r--r--README.EXT.ja2056
-rw-r--r--README.ja241
-rw-r--r--ToDo124
-rw-r--r--addr2line.c1080
-rw-r--r--addr2line.h21
-rw-r--r--array.c2324
-rw-r--r--bcc32/Makefile.sub5
-rw-r--r--bcc32/setup.mak6
-rw-r--r--benchmark/bm_app_erb.rb2
-rw-r--r--benchmark/bm_app_factorial.rb4
-rw-r--r--benchmark/bm_app_mandelbrot.rb6
-rw-r--r--benchmark/bm_app_raise.rb4
-rw-r--r--benchmark/bm_app_strconcat.rb6
-rw-r--r--benchmark/bm_io_file_create.rb2
-rw-r--r--benchmark/bm_io_file_read.rb2
-rw-r--r--benchmark/bm_io_file_write.rb2
-rw-r--r--benchmark/bm_io_select.rb9
-rw-r--r--benchmark/bm_io_select2.rb22
-rw-r--r--benchmark/bm_io_select3.rb21
-rw-r--r--benchmark/bm_loop_whileloop.rb4
-rw-r--r--benchmark/bm_loop_whileloop2.rb4
-rw-r--r--benchmark/bm_so_concatenate.rb6
-rw-r--r--benchmark/bm_so_exception.rb2
-rw-r--r--benchmark/bm_so_fannkuch.rb2
-rw-r--r--benchmark/bm_so_lists.rb4
-rw-r--r--benchmark/bm_so_matrix.rb2
-rw-r--r--benchmark/bm_so_nsieve_bits.rb1
-rw-r--r--benchmark/bm_so_random.rb6
-rw-r--r--benchmark/bm_so_sieve.rb6
-rw-r--r--benchmark/bm_vm1_attr_ivar.rb14
-rw-r--r--benchmark/bm_vm1_attr_ivar_set.rb14
-rw-r--r--benchmark/bm_vm1_block.rb8
-rw-r--r--benchmark/bm_vm1_const.rb4
-rw-r--r--benchmark/bm_vm1_ensure.rb6
-rw-r--r--benchmark/bm_vm1_float_simple.rb7
-rw-r--r--benchmark/bm_vm1_ivar.rb4
-rw-r--r--benchmark/bm_vm1_ivar_set.rb2
-rw-r--r--benchmark/bm_vm1_length.rb6
-rw-r--r--benchmark/bm_vm1_lvar_init.rb18
-rw-r--r--benchmark/bm_vm1_lvar_set.rb5
-rw-r--r--benchmark/bm_vm1_neq.rb4
-rw-r--r--benchmark/bm_vm1_not.rb4
-rw-r--r--benchmark/bm_vm1_rescue.rb6
-rw-r--r--benchmark/bm_vm1_simplereturn.rb6
-rw-r--r--benchmark/bm_vm1_swap.rb6
-rw-r--r--benchmark/bm_vm1_yield.rb10
-rw-r--r--benchmark/bm_vm2_array.rb6
-rw-r--r--benchmark/bm_vm2_bigarray.rb106
-rw-r--r--benchmark/bm_vm2_bighash.rb5
-rw-r--r--benchmark/bm_vm2_case.rb6
-rw-r--r--benchmark/bm_vm2_defined_method.rb9
-rw-r--r--benchmark/bm_vm2_dstr.rb6
-rw-r--r--benchmark/bm_vm2_eval.rb6
-rw-r--r--benchmark/bm_vm2_method.rb6
-rw-r--r--benchmark/bm_vm2_method_missing.rb12
-rw-r--r--benchmark/bm_vm2_method_with_block.rb9
-rw-r--r--benchmark/bm_vm2_mutex.rb6
-rw-r--r--benchmark/bm_vm2_poly_method.rb6
-rw-r--r--benchmark/bm_vm2_poly_method_ov.rb6
-rw-r--r--benchmark/bm_vm2_proc.rb6
-rw-r--r--benchmark/bm_vm2_raise1.rb18
-rw-r--r--benchmark/bm_vm2_raise2.rb18
-rw-r--r--benchmark/bm_vm2_regexp.rb6
-rw-r--r--benchmark/bm_vm2_send.rb6
-rw-r--r--benchmark/bm_vm2_super.rb4
-rw-r--r--benchmark/bm_vm2_unif1.rb4
-rw-r--r--benchmark/bm_vm2_zsuper.rb4
-rw-r--r--benchmark/bm_vm3_backtrace.rb22
-rw-r--r--benchmark/bm_vm3_clearmethodcache.rb8
-rw-r--r--benchmark/bm_vm3_thread_create_join.rb6
-rw-r--r--benchmark/bm_vm3_thread_mutex.rb18
-rw-r--r--benchmark/bm_vm_thread_alive_check1.rb6
-rw-r--r--benchmark/bm_vm_thread_create_join.rb6
-rw-r--r--benchmark/bm_vm_thread_mutex1.rb21
-rw-r--r--benchmark/bm_vm_thread_mutex2.rb21
-rw-r--r--benchmark/bm_vm_thread_mutex3.rb20
-rw-r--r--benchmark/bm_vm_thread_pass.rb15
-rw-r--r--benchmark/bm_vm_thread_pass_flood.rb8
-rw-r--r--benchmark/bm_vm_thread_pipe.rb17
-rw-r--r--benchmark/bmx_temp.rb9
-rw-r--r--benchmark/driver.rb124
-rw-r--r--benchmark/other-lang/eval.rb4
-rw-r--r--benchmark/other-lang/fact.rb4
-rw-r--r--benchmark/other-lang/loop.rb4
-rw-r--r--benchmark/report.rb2
-rw-r--r--benchmark/run.rb6
-rw-r--r--bignum.c727
-rwxr-xr-xbin/gem2
-rwxr-xr-xbin/rake12
-rwxr-xr-xbin/rdoc13
-rwxr-xr-xbin/ri7
-rwxr-xr-xbin/testrb13
-rwxr-xr-xbootstraptest/runner.rb281
-rw-r--r--bootstraptest/test_autoload.rb32
-rw-r--r--bootstraptest/test_block.rb58
-rw-r--r--bootstraptest/test_eval.rb39
-rw-r--r--bootstraptest/test_exception.rb30
-rw-r--r--bootstraptest/test_flow.rb68
-rw-r--r--bootstraptest/test_io.rb10
-rw-r--r--bootstraptest/test_jump.rb8
-rw-r--r--bootstraptest/test_literal.rb33
-rw-r--r--bootstraptest/test_method.rb92
-rw-r--r--bootstraptest/test_objectspace.rb12
-rw-r--r--bootstraptest/test_proc.rb88
-rw-r--r--bootstraptest/test_syntax.rb16
-rw-r--r--bootstraptest/test_thread.rb26
-rw-r--r--class.c486
-rw-r--r--common.mk662
-rw-r--r--compar.c34
-rw-r--r--compile.c2200
-rw-r--r--complex.c690
-rw-r--r--configure.in2083
-rw-r--r--constant.h36
-rw-r--r--cont.c620
-rw-r--r--cygwin/GNUmakefile.in41
-rw-r--r--debug.c10
-rw-r--r--debug.h36
-rw-r--r--defs/default_gems5
-rw-r--r--defs/id.def93
-rw-r--r--defs/opt_operand.def49
-rw-r--r--dir.c288
-rw-r--r--dln.c213
-rw-r--r--dln.h9
-rw-r--r--dln_find.c36
-rw-r--r--dmydln.c2
-rw-r--r--dmyext.c5
-rw-r--r--doc/.document4
-rw-r--r--doc/ChangeLog-1.9.392772
-rw-r--r--doc/ChangeLog-YARV2
-rw-r--r--doc/NEWS-1.8.725
-rw-r--r--doc/NEWS-1.9.133
-rw-r--r--doc/NEWS-1.9.2509
-rw-r--r--doc/NEWS-1.9.3341
-rw-r--r--doc/etc.rd75
-rw-r--r--doc/etc.rd.ja76
-rw-r--r--doc/forwardable.rd83
-rw-r--r--doc/forwardable.rd.ja44
-rw-r--r--doc/globals.rdoc68
-rw-r--r--doc/irb/irb-tools.rd.ja110
-rw-r--r--doc/irb/irb.rd391
-rw-r--r--doc/irb/irb.rd.ja352
-rw-r--r--doc/pty/README84
-rw-r--r--doc/pty/README.expect22
-rw-r--r--doc/pty/README.expect.ja28
-rw-r--r--doc/pty/README.ja86
-rw-r--r--doc/rake/CHANGES2
-rw-r--r--doc/rake/command_line_usage.rdoc87
-rw-r--r--doc/rake/glossary.rdoc4
-rw-r--r--doc/rake/jamis.rb4
-rw-r--r--doc/rake/proto_rake.rdoc44
-rw-r--r--doc/rake/rakefile.rdoc89
-rw-r--r--doc/rake/rational.rdoc12
-rw-r--r--doc/rake/release_notes/rake-0.8.7.rdoc2
-rw-r--r--doc/rake/release_notes/rake-0.9.0.rdoc112
-rw-r--r--doc/rake/release_notes/rake-0.9.1.rdoc52
-rw-r--r--doc/rake/release_notes/rake-0.9.2.2.rdoc55
-rw-r--r--doc/rake/release_notes/rake-0.9.2.rdoc49
-rw-r--r--doc/rake/release_notes/rake-0.9.3.rdoc102
-rw-r--r--doc/rake/release_notes/rake-0.9.4.rdoc110
-rw-r--r--doc/rake/release_notes/rake-0.9.5.rdoc114
-rw-r--r--doc/rake/release_notes/rake-0.9.6.rdoc127
-rw-r--r--doc/re.rdoc101
-rw-r--r--doc/rubygems/ChangeLog5689
-rw-r--r--doc/rubygems/History.txt852
-rw-r--r--doc/rubygems/LICENSE.txt (renamed from lib/rubygems/LICENSE.txt)0
-rw-r--r--doc/rubygems/README41
-rw-r--r--doc/security.rdoc149
-rw-r--r--doc/shell.rd347
-rw-r--r--doc/shell.rd.ja150
-rw-r--r--doc/standard_library.rdoc126
-rw-r--r--doc/syntax.rdoc34
-rw-r--r--doc/syntax/assignment.rdoc455
-rw-r--r--doc/syntax/calling_methods.rdoc349
-rw-r--r--doc/syntax/control_expressions.rdoc500
-rw-r--r--doc/syntax/exceptions.rdoc96
-rw-r--r--doc/syntax/literals.rdoc295
-rw-r--r--doc/syntax/methods.rdoc414
-rw-r--r--doc/syntax/miscellaneous.rdoc107
-rw-r--r--doc/syntax/modules_and_classes.rdoc345
-rw-r--r--doc/syntax/precedence.rdoc60
-rw-r--r--doc/syntax/refinements.rdoc240
-rw-r--r--enc/Makefile.in30
-rw-r--r--enc/ascii.c7
-rw-r--r--enc/big5.c38
-rw-r--r--enc/cp949.c10
-rw-r--r--enc/depend134
-rw-r--r--enc/emacs_mule.c9
-rw-r--r--enc/encdb.c8
-rw-r--r--enc/encinit.c.erb26
-rw-r--r--enc/euc_jp.c316
-rw-r--r--enc/euc_kr.c8
-rw-r--r--enc/euc_tw.c12
-rw-r--r--enc/gb18030.c17
-rw-r--r--enc/gbk.c10
-rw-r--r--enc/iso_2022_jp.h7
-rw-r--r--enc/iso_8859_1.c8
-rw-r--r--enc/iso_8859_10.c4
-rw-r--r--enc/iso_8859_11.c4
-rw-r--r--enc/iso_8859_13.c4
-rw-r--r--enc/iso_8859_14.c4
-rw-r--r--enc/iso_8859_15.c4
-rw-r--r--enc/iso_8859_16.c4
-rw-r--r--enc/iso_8859_2.c10
-rw-r--r--enc/iso_8859_3.c4
-rw-r--r--enc/iso_8859_4.c4
-rw-r--r--enc/iso_8859_5.c4
-rw-r--r--enc/iso_8859_6.c4
-rw-r--r--enc/iso_8859_7.c4
-rw-r--r--enc/iso_8859_8.c4
-rw-r--r--enc/iso_8859_9.c4
-rw-r--r--enc/koi8_r.c4
-rw-r--r--enc/koi8_u.c4
-rwxr-xr-xenc/make_encmake.rb88
-rw-r--r--enc/mktable.c1162
-rw-r--r--enc/shift_jis.c285
-rw-r--r--enc/trans/JIS/JISX0213-1%UCS@BMP.src1926
-rw-r--r--enc/trans/JIS/JISX0213-1%UCS@SIP.src60
-rw-r--r--enc/trans/JIS/JISX0213-2%UCS@BMP.src2193
-rw-r--r--enc/trans/JIS/JISX0213-2%UCS@SIP.src311
-rw-r--r--enc/trans/JIS/UCS@BMP%JISX0213-1.src1922
-rw-r--r--enc/trans/JIS/UCS@BMP%JISX0213-2.src2189
-rw-r--r--enc/trans/JIS/UCS@SIP%JISX0213-1.src56
-rw-r--r--enc/trans/JIS/UCS@SIP%JISX0213-2.src307
-rw-r--r--enc/trans/big5-hkscs-tbl.rb18919
-rw-r--r--enc/trans/big5-tbl.rb13705
-rw-r--r--enc/trans/big5.trans19
-rw-r--r--enc/trans/chinese.trans3
-rw-r--r--enc/trans/emoji.trans3
-rw-r--r--enc/trans/emoji_iso2022_kddi.trans5
-rw-r--r--enc/trans/emoji_sjis_docomo.trans3
-rw-r--r--enc/trans/emoji_sjis_kddi.trans3
-rw-r--r--enc/trans/emoji_sjis_softbank.trans3
-rw-r--r--enc/trans/escape.trans3
-rw-r--r--enc/trans/euckr-tbl.rb2
-rw-r--r--enc/trans/gb18030.trans3
-rw-r--r--enc/trans/gbk-tbl.rb1
-rw-r--r--enc/trans/gbk.trans3
-rw-r--r--enc/trans/ibm737-tbl.rb130
-rw-r--r--enc/trans/iso-8859-16-tbl.rb98
-rw-r--r--enc/trans/iso2022.trans3
-rw-r--r--enc/trans/japanese.trans3
-rw-r--r--enc/trans/japanese_euc.trans15
-rw-r--r--enc/trans/japanese_sjis.trans3
-rw-r--r--enc/trans/korean.trans3
-rw-r--r--enc/trans/single_byte.trans5
-rw-r--r--enc/trans/ucm/glibc-BIG5-2.3.3.ucm14087
-rw-r--r--enc/trans/ucm/glibc-BIG5HKSCS-2.3.3.ucm18332
-rw-r--r--enc/trans/ucm/windows-950-2000.ucm20379
-rw-r--r--enc/trans/ucm/windows-950_hkscs-2001.ucm23446
-rw-r--r--enc/trans/utf8_mac.trans5
-rw-r--r--enc/trans/utf_16_32.trans191
-rw-r--r--enc/unicode.c1954
-rw-r--r--enc/unicode/casefold.h2238
-rw-r--r--enc/unicode/name2ctype.h19467
-rw-r--r--enc/unicode/name2ctype.h.blt19467
-rw-r--r--enc/unicode/name2ctype.kwd16913
-rw-r--r--enc/unicode/name2ctype.src16913
-rw-r--r--enc/us_ascii.c4
-rw-r--r--enc/utf_16_32.h5
-rw-r--r--enc/utf_16be.c11
-rw-r--r--enc/utf_16le.c14
-rw-r--r--enc/utf_32be.c14
-rw-r--r--enc/utf_32le.c14
-rw-r--r--enc/utf_8.c28
-rw-r--r--enc/windows_1251.c4
-rw-r--r--enc/windows_31j.c80
-rw-r--r--encoding.c453
-rw-r--r--enum.c1346
-rw-r--r--enumerator.c1283
-rw-r--r--error.c875
-rw-r--r--eval.c631
-rw-r--r--eval_error.c63
-rw-r--r--eval_intern.h87
-rw-r--r--eval_jump.c76
-rw-r--r--ext/-test-/array/resize/extconf.rb1
-rw-r--r--ext/-test-/array/resize/resize.c14
-rw-r--r--ext/-test-/bug-3571/bug.c23
-rw-r--r--ext/-test-/bug-3571/extconf.rb1
-rw-r--r--ext/-test-/bug-5832/bug.c14
-rw-r--r--ext/-test-/bug-5832/extconf.rb1
-rw-r--r--ext/-test-/debug/extconf.rb6
-rw-r--r--ext/-test-/debug/init.c11
-rw-r--r--ext/-test-/debug/inspector.c32
-rw-r--r--ext/-test-/exception/enc_raise.c15
-rw-r--r--ext/-test-/exception/ensured.c25
-rw-r--r--ext/-test-/exception/extconf.rb6
-rw-r--r--ext/-test-/exception/init.c11
-rw-r--r--ext/-test-/fatal/extconf.rb1
-rw-r--r--ext/-test-/fatal/rb_fatal.c19
-rw-r--r--ext/-test-/funcall/extconf.rb2
-rw-r--r--ext/-test-/funcall/passing_block.c30
-rw-r--r--ext/-test-/iter/break.c25
-rw-r--r--ext/-test-/iter/extconf.rb1
-rw-r--r--ext/-test-/load/dot.dot/dot.dot.c1
-rw-r--r--ext/-test-/load/dot.dot/extconf.rb1
-rw-r--r--ext/-test-/marshal/compat/extconf.rb1
-rw-r--r--ext/-test-/marshal/compat/usrcompat.c32
-rw-r--r--ext/-test-/marshal/usr/extconf.rb1
-rw-r--r--ext/-test-/marshal/usr/usrmarshal.c35
-rw-r--r--ext/-test-/method/arity.c22
-rw-r--r--ext/-test-/method/extconf.rb6
-rw-r--r--ext/-test-/method/init.c11
-rw-r--r--ext/-test-/num2int/depend1
-rw-r--r--ext/-test-/num2int/extconf.rb1
-rw-r--r--ext/-test-/num2int/num2int.c120
-rw-r--r--ext/-test-/old_thread_select/depend2
-rw-r--r--ext/-test-/old_thread_select/extconf.rb4
-rw-r--r--ext/-test-/old_thread_select/old_thread_select.c75
-rw-r--r--ext/-test-/path_to_class/extconf.rb6
-rw-r--r--ext/-test-/path_to_class/path_to_class.c15
-rw-r--r--ext/-test-/printf/extconf.rb1
-rw-r--r--ext/-test-/printf/printf.c110
-rw-r--r--ext/-test-/st/numhash/extconf.rb1
-rw-r--r--ext/-test-/st/numhash/numhash.c120
-rw-r--r--ext/-test-/st/update/extconf.rb1
-rw-r--r--ext/-test-/st/update/update.c34
-rw-r--r--ext/-test-/string/coderange.c30
-rw-r--r--ext/-test-/string/ellipsize.c13
-rw-r--r--ext/-test-/string/enc_associate.c14
-rw-r--r--ext/-test-/string/enc_str_buf_cat.c14
-rw-r--r--ext/-test-/string/init.c8
-rw-r--r--ext/-test-/string/modify.c22
-rw-r--r--ext/-test-/string/qsort.c61
-rw-r--r--ext/-test-/struct/extconf.rb7
-rw-r--r--ext/-test-/struct/init.c11
-rw-r--r--ext/-test-/struct/member.c18
-rw-r--r--ext/-test-/symbol/extconf.rb6
-rw-r--r--ext/-test-/symbol/init.c11
-rw-r--r--ext/-test-/symbol/intern.c14
-rw-r--r--ext/-test-/symbol/type.c43
-rw-r--r--ext/-test-/typeddata/extconf.rb1
-rw-r--r--ext/-test-/typeddata/typeddata.c20
-rw-r--r--ext/-test-/wait_for_single_fd/depend2
-rw-r--r--ext/-test-/wait_for_single_fd/extconf.rb1
-rw-r--r--ext/-test-/wait_for_single_fd/wait_for_single_fd.c30
-rw-r--r--ext/-test-/win32/dln/dlntest.c17
-rw-r--r--ext/-test-/win32/dln/extconf.rb36
-rw-r--r--ext/-test-/win32/dln/libdlntest.c4
-rw-r--r--ext/-test-/win32/dln/libdlntest.def2
-rw-r--r--ext/-test-/win32/fd_setsize/depend2
-rw-r--r--ext/-test-/win32/fd_setsize/extconf.rb3
-rw-r--r--ext/-test-/win32/fd_setsize/fd_setsize.c55
-rw-r--r--ext/.cvsignore2
-rw-r--r--ext/.document58
-rw-r--r--ext/Setup2
-rw-r--r--ext/Setup.atheos2
-rw-r--r--ext/Setup.emx2
-rw-r--r--ext/Setup.nacl49
-rw-r--r--ext/Setup.nt2
-rw-r--r--ext/bigdecimal/.cvsignore4
-rw-r--r--ext/bigdecimal/README6
-rw-r--r--ext/bigdecimal/bigdecimal.c3083
-rw-r--r--ext/bigdecimal/bigdecimal.gemspec30
-rw-r--r--ext/bigdecimal/bigdecimal.h155
-rw-r--r--ext/bigdecimal/bigdecimal_en.html792
-rw-r--r--ext/bigdecimal/bigdecimal_ja.html799
-rw-r--r--ext/bigdecimal/extconf.rb8
-rw-r--r--ext/bigdecimal/lib/bigdecimal/jacobian.rb9
-rw-r--r--ext/bigdecimal/lib/bigdecimal/math.rb70
-rw-r--r--ext/bigdecimal/lib/bigdecimal/newton.rb2
-rw-r--r--ext/bigdecimal/lib/bigdecimal/util.rb105
-rw-r--r--ext/coverage/coverage.c42
-rw-r--r--ext/coverage/extconf.rb1
-rw-r--r--ext/curses/.cvsignore4
-rw-r--r--ext/curses/curses.c2292
-rw-r--r--ext/curses/depend2
-rw-r--r--ext/curses/extconf.rb112
-rw-r--r--ext/curses/rain.rb2
-rw-r--r--ext/curses/view.rb2
-rw-r--r--ext/date/date_core.c9673
-rw-r--r--ext/date/date_parse.c3128
-rw-r--r--ext/date/date_strftime.c633
-rw-r--r--ext/date/date_strptime.c699
-rw-r--r--ext/date/date_tmx.h56
-rw-r--r--ext/date/depend3
-rw-r--r--ext/date/extconf.rb2
-rw-r--r--ext/date/lib/date.rb61
-rw-r--r--ext/date/lib/date/format.rb1
-rw-r--r--ext/dbm/.cvsignore4
-rw-r--r--ext/dbm/dbm.c461
-rw-r--r--ext/dbm/extconf.rb249
-rw-r--r--ext/digest/.cvsignore4
-rw-r--r--ext/digest/bubblebabble/.cvsignore4
-rw-r--r--ext/digest/bubblebabble/bubblebabble.c2
-rw-r--r--ext/digest/bubblebabble/extconf.rb1
-rw-r--r--ext/digest/digest.c72
-rw-r--r--ext/digest/lib/digest.rb24
-rw-r--r--ext/digest/lib/digest/hmac.rb87
-rw-r--r--ext/digest/md5/.cvsignore4
-rw-r--r--ext/digest/md5/extconf.rb6
-rw-r--r--ext/digest/md5/md5.h2
-rw-r--r--ext/digest/md5/md5init.c5
-rw-r--r--ext/digest/rmd160/.cvsignore4
-rw-r--r--ext/digest/rmd160/extconf.rb6
-rw-r--r--ext/digest/rmd160/rmd160.c10
-rw-r--r--ext/digest/rmd160/rmd160.h2
-rw-r--r--ext/digest/rmd160/rmd160init.c5
-rw-r--r--ext/digest/rmd160/rmd160ossl.c2
-rw-r--r--ext/digest/sha1/.cvsignore4
-rw-r--r--ext/digest/sha1/extconf.rb6
-rw-r--r--ext/digest/sha1/sha1.h2
-rw-r--r--ext/digest/sha1/sha1init.c5
-rw-r--r--ext/digest/sha1/sha1ossl.c2
-rw-r--r--ext/digest/sha2/.cvsignore4
-rw-r--r--ext/digest/sha2/extconf.rb10
-rw-r--r--ext/digest/sha2/lib/sha2.rb49
-rw-r--r--ext/digest/sha2/sha2.c22
-rw-r--r--ext/digest/sha2/sha2init.c2
-rw-r--r--ext/digest/sha2/sha2ossl.c4
-rw-r--r--ext/dl/.cvsignore10
-rw-r--r--ext/dl/callback/mkcallback.rb20
-rw-r--r--ext/dl/cfunc.c77
-rw-r--r--ext/dl/cptr.c112
-rw-r--r--ext/dl/dl.c410
-rw-r--r--ext/dl/dl.h87
-rw-r--r--ext/dl/extconf.rb21
-rw-r--r--ext/dl/handle.c58
-rw-r--r--ext/dl/lib/dl.rb3
-rw-r--r--ext/dl/lib/dl/callback.rb26
-rw-r--r--ext/dl/lib/dl/cparser.rb47
-rw-r--r--ext/dl/lib/dl/func.rb78
-rw-r--r--ext/dl/lib/dl/import.rb45
-rw-r--r--ext/dl/lib/dl/struct.rb155
-rw-r--r--ext/dl/lib/dl/types.rb37
-rw-r--r--ext/dl/lib/dl/value.rb6
-rw-r--r--ext/dl/win32/extconf.rb2
-rw-r--r--ext/dl/win32/lib/Win32API.rb3
-rw-r--r--ext/dl/win32/lib/win32/resolv.rb2
-rw-r--r--ext/etc/.cvsignore3
-rw-r--r--ext/etc/depend2
-rw-r--r--ext/etc/etc.c304
-rw-r--r--[-rwxr-xr-x]ext/extmk.rb209
-rw-r--r--ext/fcntl/.cvsignore4
-rw-r--r--ext/fcntl/fcntl.c188
-rw-r--r--ext/fiddle/closure.c124
-rw-r--r--ext/fiddle/conversions.c61
-rw-r--r--ext/fiddle/conversions.h9
-rw-r--r--ext/fiddle/extconf.rb34
-rw-r--r--ext/fiddle/fiddle.c430
-rw-r--r--ext/fiddle/fiddle.h49
-rw-r--r--ext/fiddle/function.c118
-rw-r--r--ext/fiddle/handle.c470
-rw-r--r--ext/fiddle/lib/fiddle.rb25
-rw-r--r--ext/fiddle/lib/fiddle/closure.rb31
-rw-r--r--ext/fiddle/lib/fiddle/cparser.rb176
-rw-r--r--ext/fiddle/lib/fiddle/function.rb12
-rw-r--r--ext/fiddle/lib/fiddle/import.rb314
-rw-r--r--ext/fiddle/lib/fiddle/pack.rb128
-rw-r--r--ext/fiddle/lib/fiddle/struct.rb243
-rw-r--r--ext/fiddle/lib/fiddle/types.rb71
-rw-r--r--ext/fiddle/lib/fiddle/value.rb112
-rw-r--r--ext/fiddle/pointer.c724
-rw-r--r--ext/fiddle/win32/extconf.rb3
-rw-r--r--ext/fiddle/win32/lib/win32/registry.rb845
-rw-r--r--ext/fiddle/win32/lib/win32/resolv.rb379
-rw-r--r--ext/gdbm/.cvsignore4
-rw-r--r--ext/gdbm/gdbm.c68
-rw-r--r--ext/iconv/.cvsignore6
-rw-r--r--ext/iconv/charset_alias.rb104
-rw-r--r--ext/iconv/depend2
-rw-r--r--ext/iconv/extconf.rb54
-rw-r--r--ext/iconv/iconv.c1228
-rw-r--r--ext/iconv/mkwrapper.rb53
-rw-r--r--ext/io/console/console.c764
-rw-r--r--ext/io/console/extconf.rb20
-rw-r--r--ext/io/console/io-console.gemspec18
-rw-r--r--ext/io/console/lib/console/size.rb20
-rw-r--r--ext/io/nonblock/nonblock.c10
-rw-r--r--ext/io/wait/.cvsignore3
-rw-r--r--ext/io/wait/wait.c85
-rw-r--r--ext/json/fbuffer/fbuffer.h190
-rw-r--r--ext/json/generator/depend3
-rw-r--r--ext/json/generator/extconf.rb2
-rw-r--r--ext/json/generator/generator.c801
-rw-r--r--ext/json/generator/generator.h110
-rw-r--r--ext/json/lib/json.rb52
-rw-r--r--ext/json/lib/json/add/bigdecimal.rb28
-rw-r--r--ext/json/lib/json/add/complex.rb22
-rw-r--r--ext/json/lib/json/add/core.rb155
-rw-r--r--ext/json/lib/json/add/date.rb34
-rw-r--r--ext/json/lib/json/add/date_time.rb50
-rw-r--r--ext/json/lib/json/add/exception.rb31
-rw-r--r--ext/json/lib/json/add/ostruct.rb31
-rw-r--r--ext/json/lib/json/add/rails.rb58
-rw-r--r--ext/json/lib/json/add/range.rb29
-rw-r--r--ext/json/lib/json/add/rational.rb22
-rw-r--r--ext/json/lib/json/add/regexp.rb30
-rw-r--r--ext/json/lib/json/add/struct.rb30
-rw-r--r--ext/json/lib/json/add/symbol.rb25
-rw-r--r--ext/json/lib/json/add/time.rb38
-rw-r--r--ext/json/lib/json/common.rb229
-rw-r--r--ext/json/lib/json/editor.rb1371
-rw-r--r--ext/json/lib/json/ext.rb10
-rw-r--r--ext/json/lib/json/generic_object.rb61
-rw-r--r--ext/json/lib/json/version.rb2
-rw-r--r--ext/json/parser/depend3
-rw-r--r--ext/json/parser/extconf.rb1
-rw-r--r--ext/json/parser/parser.c853
-rw-r--r--ext/json/parser/parser.h19
-rw-r--r--ext/json/parser/parser.rl311
-rw-r--r--ext/json/parser/prereq.mk9
-rw-r--r--ext/nkf/.cvsignore4
-rw-r--r--ext/nkf/depend5
-rw-r--r--ext/nkf/nkf-utf8/nkf.c710
-rw-r--r--ext/nkf/nkf-utf8/nkf.h25
-rw-r--r--ext/nkf/nkf-utf8/utf8tbl.c5875
-rw-r--r--ext/nkf/nkf-utf8/utf8tbl.h14
-rw-r--r--ext/nkf/nkf.c23
-rw-r--r--ext/objspace/depend3
-rw-r--r--ext/objspace/extconf.rb2
-rw-r--r--ext/objspace/objspace.c366
-rw-r--r--ext/openssl/.cvsignore5
-rw-r--r--ext/openssl/deprecation.rb21
-rw-r--r--ext/openssl/extconf.rb80
-rw-r--r--ext/openssl/lib/openssl.rb6
-rw-r--r--ext/openssl/lib/openssl/bn.rb38
-rw-r--r--ext/openssl/lib/openssl/buffering.rb271
-rw-r--r--ext/openssl/lib/openssl/cipher.rb40
-rw-r--r--ext/openssl/lib/openssl/config.rb313
-rw-r--r--ext/openssl/lib/openssl/digest.rb66
-rw-r--r--ext/openssl/lib/openssl/ssl-internal.rb177
-rw-r--r--ext/openssl/lib/openssl/ssl.rb294
-rw-r--r--ext/openssl/lib/openssl/x509-internal.rb153
-rw-r--r--ext/openssl/lib/openssl/x509.rb163
-rw-r--r--ext/openssl/openssl_missing.c12
-rw-r--r--ext/openssl/openssl_missing.h30
-rw-r--r--ext/openssl/ossl.c671
-rw-r--r--ext/openssl/ossl.h43
-rw-r--r--ext/openssl/ossl_asn1.c1122
-rw-r--r--ext/openssl/ossl_bio.c5
-rw-r--r--ext/openssl/ossl_bn.c32
-rw-r--r--ext/openssl/ossl_cipher.c554
-rw-r--r--ext/openssl/ossl_config.c440
-rw-r--r--ext/openssl/ossl_digest.c209
-rw-r--r--ext/openssl/ossl_engine.c73
-rw-r--r--ext/openssl/ossl_hmac.c28
-rw-r--r--ext/openssl/ossl_ns_spki.c150
-rw-r--r--ext/openssl/ossl_ocsp.c71
-rw-r--r--ext/openssl/ossl_pkcs12.c16
-rw-r--r--ext/openssl/ossl_pkcs5.c109
-rw-r--r--ext/openssl/ossl_pkcs7.c49
-rw-r--r--ext/openssl/ossl_pkey.c209
-rw-r--r--ext/openssl/ossl_pkey.h26
-rw-r--r--ext/openssl/ossl_pkey_dh.c198
-rw-r--r--ext/openssl/ossl_pkey_dsa.c213
-rw-r--r--ext/openssl/ossl_pkey_ec.c258
-rw-r--r--ext/openssl/ossl_pkey_rsa.c275
-rw-r--r--ext/openssl/ossl_rand.c14
-rw-r--r--ext/openssl/ossl_ssl.c873
-rw-r--r--ext/openssl/ossl_ssl.h8
-rw-r--r--ext/openssl/ossl_ssl_session.c36
-rw-r--r--ext/openssl/ossl_x509attr.c12
-rw-r--r--ext/openssl/ossl_x509cert.c154
-rw-r--r--ext/openssl/ossl_x509crl.c14
-rw-r--r--ext/openssl/ossl_x509ext.c36
-rw-r--r--ext/openssl/ossl_x509name.c170
-rw-r--r--ext/openssl/ossl_x509req.c16
-rw-r--r--ext/openssl/ossl_x509revoked.c12
-rw-r--r--ext/openssl/ossl_x509store.c109
-rw-r--r--ext/openssl/ruby_missing.h17
-rw-r--r--ext/pathname/extconf.rb2
-rw-r--r--ext/pathname/lib/pathname.rb574
-rw-r--r--ext/pathname/pathname.c1385
-rw-r--r--ext/psych/.gitignore11
-rw-r--r--ext/psych/emitter.c412
-rw-r--r--ext/psych/emitter.h (renamed from ext/psych/psych_emitter.h)0
-rw-r--r--ext/psych/extconf.rb32
-rw-r--r--ext/psych/lib/psych.rb148
-rw-r--r--ext/psych/lib/psych/coder.rb24
-rw-r--r--ext/psych/lib/psych/core_ext.rb13
-rw-r--r--ext/psych/lib/psych/deprecated.rb2
-rw-r--r--ext/psych/lib/psych/handler.rb34
-rw-r--r--ext/psych/lib/psych/handlers/document_stream.rb22
-rw-r--r--ext/psych/lib/psych/handlers/recorder.rb39
-rw-r--r--ext/psych/lib/psych/json/ruby_events.rb19
-rw-r--r--ext/psych/lib/psych/json/stream.rb15
-rw-r--r--ext/psych/lib/psych/json/tree_builder.rb18
-rw-r--r--ext/psych/lib/psych/json/yaml_events.rb29
-rw-r--r--ext/psych/lib/psych/nodes.rb2
-rw-r--r--ext/psych/lib/psych/nodes/node.rb17
-rw-r--r--ext/psych/lib/psych/nodes/stream.rb2
-rw-r--r--ext/psych/lib/psych/parser.rb7
-rw-r--r--ext/psych/lib/psych/scalar_scanner.rb67
-rw-r--r--ext/psych/lib/psych/stream.rb36
-rw-r--r--ext/psych/lib/psych/streaming.rb22
-rw-r--r--ext/psych/lib/psych/syntax_error.rb22
-rw-r--r--ext/psych/lib/psych/tree_builder.rb6
-rw-r--r--ext/psych/lib/psych/visitors.rb1
-rw-r--r--ext/psych/lib/psych/visitors/depth_first.rb26
-rw-r--r--ext/psych/lib/psych/visitors/emitter.rb14
-rw-r--r--ext/psych/lib/psych/visitors/json_tree.rb28
-rw-r--r--ext/psych/lib/psych/visitors/to_ruby.rb195
-rw-r--r--ext/psych/lib/psych/visitors/visitor.rb21
-rw-r--r--ext/psych/lib/psych/visitors/yaml_tree.rb261
-rw-r--r--ext/psych/lib/psych/y.rb9
-rw-r--r--ext/psych/parser.c341
-rw-r--r--ext/psych/parser.h (renamed from ext/psych/psych_parser.h)0
-rw-r--r--ext/psych/psych.gemspec24
-rw-r--r--ext/psych/psych.h8
-rw-r--r--ext/psych/psych_emitter.c538
-rw-r--r--ext/psych/psych_parser.c579
-rw-r--r--ext/psych/to_ruby.c (renamed from ext/psych/psych_to_ruby.c)0
-rw-r--r--ext/psych/to_ruby.h (renamed from ext/psych/psych_to_ruby.h)0
-rw-r--r--ext/psych/yaml/LICENSE19
-rw-r--r--ext/psych/yaml/api.c1415
-rw-r--r--ext/psych/yaml/config.h10
-rw-r--r--ext/psych/yaml/dumper.c394
-rw-r--r--ext/psych/yaml/emitter.c2329
-rw-r--r--ext/psych/yaml/loader.c459
-rw-r--r--ext/psych/yaml/parser.c1370
-rw-r--r--ext/psych/yaml/reader.c469
-rw-r--r--ext/psych/yaml/scanner.c3583
-rw-r--r--ext/psych/yaml/writer.c141
-rw-r--r--ext/psych/yaml/yaml.h1971
-rw-r--r--ext/psych/yaml/yaml_private.h664
-rw-r--r--ext/psych/yaml_tree.c (renamed from ext/psych/psych_yaml_tree.c)0
-rw-r--r--ext/psych/yaml_tree.h (renamed from ext/psych/psych_yaml_tree.h)0
-rw-r--r--ext/pty/.cvsignore4
-rw-r--r--ext/pty/extconf.rb4
-rw-r--r--ext/pty/lib/expect.rb36
-rw-r--r--ext/pty/pty.c450
-rw-r--r--ext/purelib.rb17
-rw-r--r--ext/racc/cparse/.cvsignore4
-rw-r--r--ext/racc/cparse/cparse.c6
-rw-r--r--ext/readline/.cvsignore4
-rw-r--r--ext/readline/README.ja404
-rw-r--r--ext/readline/extconf.rb117
-rw-r--r--ext/readline/readline.c437
-rw-r--r--ext/ripper/.cvsignore8
-rw-r--r--ext/ripper/README2
-rw-r--r--ext/ripper/depend24
-rw-r--r--ext/ripper/eventids2.c14
-rw-r--r--ext/ripper/extconf.rb3
-rw-r--r--ext/ripper/lib/ripper.rb69
-rw-r--r--ext/ripper/lib/ripper/core.rb8
-rw-r--r--ext/ripper/lib/ripper/filter.rb21
-rw-r--r--ext/ripper/lib/ripper/lexer.rb23
-rw-r--r--ext/ripper/lib/ripper/sexp.rb27
-rwxr-xr-xext/ripper/tools/generate.rb12
-rw-r--r--ext/sdbm/.cvsignore4
-rw-r--r--ext/sdbm/_sdbm.c124
-rw-r--r--ext/sdbm/extconf.rb1
-rw-r--r--ext/sdbm/init.c379
-rw-r--r--ext/socket/.cvsignore5
-rw-r--r--ext/socket/.document22
-rw-r--r--ext/socket/addrinfo.h2
-rw-r--r--ext/socket/ancdata.c98
-rw-r--r--ext/socket/basicsocket.c20
-rw-r--r--ext/socket/depend4
-rw-r--r--ext/socket/extconf.rb202
-rw-r--r--ext/socket/getaddrinfo.c5
-rw-r--r--ext/socket/getnameinfo.c3
-rw-r--r--ext/socket/init.c195
-rw-r--r--ext/socket/ipsocket.c27
-rw-r--r--ext/socket/lib/socket.rb237
-rw-r--r--ext/socket/mkconstants.rb721
-rw-r--r--ext/socket/option.c266
-rw-r--r--ext/socket/raddrinfo.c274
-rw-r--r--ext/socket/rubysocket.h19
-rw-r--r--ext/socket/socket.c277
-rw-r--r--ext/socket/sockssocket.c23
-rw-r--r--ext/socket/tcpserver.c36
-rw-r--r--ext/socket/tcpsocket.c25
-rw-r--r--ext/socket/udpsocket.c13
-rw-r--r--ext/socket/unixserver.c11
-rw-r--r--ext/socket/unixsocket.c56
-rw-r--r--ext/stringio/.cvsignore4
-rw-r--r--ext/stringio/README2
-rw-r--r--ext/stringio/depend2
-rw-r--r--ext/stringio/stringio.c327
-rw-r--r--ext/strscan/.cvsignore4
-rw-r--r--ext/strscan/extconf.rb1
-rw-r--r--ext/strscan/strscan.c153
-rw-r--r--ext/syck/.cvsignore4
-rw-r--r--ext/syck/bytecode.c1165
-rw-r--r--ext/syck/depend12
-rw-r--r--ext/syck/emitter.c1247
-rw-r--r--ext/syck/extconf.rb5
-rw-r--r--ext/syck/gram.c1894
-rw-r--r--ext/syck/gram.h79
-rw-r--r--ext/syck/handler.c173
-rw-r--r--ext/syck/implicit.c2990
-rw-r--r--ext/syck/lib/syck.rb447
-rw-r--r--ext/syck/lib/syck/baseemitter.rb242
-rw-r--r--ext/syck/lib/syck/basenode.rb223
-rw-r--r--ext/syck/lib/syck/constants.rb45
-rw-r--r--ext/syck/lib/syck/encoding.rb35
-rw-r--r--ext/syck/lib/syck/error.rb34
-rw-r--r--ext/syck/lib/syck/loader.rb14
-rw-r--r--ext/syck/lib/syck/rubytypes.rb465
-rw-r--r--ext/syck/lib/syck/stream.rb41
-rw-r--r--ext/syck/lib/syck/stringio.rb85
-rw-r--r--ext/syck/lib/syck/syck.rb16
-rw-r--r--ext/syck/lib/syck/tag.rb95
-rw-r--r--ext/syck/lib/syck/types.rb192
-rw-r--r--ext/syck/lib/syck/yamlnode.rb54
-rw-r--r--ext/syck/lib/syck/ypath.rb54
-rw-r--r--ext/syck/lib/yaml/syck.rb14
-rw-r--r--ext/syck/node.c407
-rw-r--r--ext/syck/rubyext.c2324
-rw-r--r--ext/syck/syck.c524
-rw-r--r--ext/syck/syck.h453
-rw-r--r--ext/syck/token.c2724
-rw-r--r--ext/syck/yaml2byte.c259
-rw-r--r--ext/syck/yamlbyte.h171
-rw-r--r--ext/syslog/.cvsignore4
-rw-r--r--ext/syslog/lib/syslog/logger.rb194
-rw-r--r--ext/syslog/syslog.c364
-rw-r--r--ext/syslog/syslog.txt4
-rw-r--r--ext/tk/.cvsignore3
-rw-r--r--ext/tk/ChangeLog.tkextlib38
-rw-r--r--ext/tk/MANUAL_tcltklib.eng302
-rw-r--r--ext/tk/MANUAL_tcltklib.eucj826
-rw-r--r--ext/tk/README.1st26
-rw-r--r--ext/tk/README.ActiveTcl24
-rw-r--r--ext/tk/README.fork14
-rw-r--r--ext/tk/README.macosx-aqua20
-rw-r--r--ext/tk/README.tcltklib95
-rw-r--r--ext/tk/config_list.in6
-rw-r--r--ext/tk/extconf.rb140
-rw-r--r--ext/tk/lib/README4
-rw-r--r--ext/tk/lib/multi-tk.rb10
-rw-r--r--ext/tk/lib/tcltk.rb2
-rw-r--r--ext/tk/lib/tk.rb16
-rw-r--r--ext/tk/lib/tk/autoload.rb10
-rw-r--r--ext/tk/lib/tk/canvas.rb32
-rw-r--r--ext/tk/lib/tk/fontchooser.rb12
-rw-r--r--ext/tk/lib/tk/image.rb128
-rw-r--r--ext/tk/lib/tk/menuspec.rb2
-rw-r--r--ext/tk/lib/tk/msgcat.rb41
-rw-r--r--ext/tk/lib/tk/namespace.rb7
-rw-r--r--ext/tk/lib/tk/ttk_selector.rb2
-rw-r--r--ext/tk/lib/tk/wm.rb6
-rw-r--r--ext/tk/lib/tkextlib/SUPPORT_STATUS56
-rwxr-xr-xext/tk/lib/tkextlib/pkg_checker.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/README14
-rw-r--r--ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/chatwidget.rb4
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ip_entry.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/khim.rb4
-rw-r--r--ext/tk/lib/tkextlib/tcllib/plotchart.rb18
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist.rb2
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist_core.rb12
-rw-r--r--ext/tk/lib/tkextlib/tile/sizegrip.rb2
-rw-r--r--ext/tk/lib/tkextlib/tile/style.rb2
-rw-r--r--ext/tk/lib/tkextlib/tkimg/README2
-rw-r--r--ext/tk/lib/tkextlib/tktable/tktable.rb2
-rw-r--r--ext/tk/old-README.tcltklib.eucj206
-rw-r--r--ext/tk/sample/demos-en/ChangeLog.prev2
-rw-r--r--ext/tk/sample/demos-en/README130
-rw-r--r--ext/tk/sample/demos-en/README.1st8
-rw-r--r--ext/tk/sample/demos-en/README.tkencoding22
-rw-r--r--ext/tk/sample/demos-en/browse122
-rw-r--r--ext/tk/sample/demos-en/browse222
-rw-r--r--ext/tk/sample/demos-en/doc.org/license.terms2
-rw-r--r--ext/tk/sample/demos-en/doc.org/license.terms.tk802
-rw-r--r--ext/tk/sample/demos-en/ixset28
-rw-r--r--ext/tk/sample/demos-en/ixset254
-rw-r--r--ext/tk/sample/demos-en/rmt68
-rw-r--r--ext/tk/sample/demos-en/rolodex6
-rw-r--r--ext/tk/sample/demos-en/square12
-rw-r--r--ext/tk/sample/demos-en/tcolor18
-rw-r--r--ext/tk/sample/demos-en/text.rb2
-rw-r--r--ext/tk/sample/demos-en/timer2
-rw-r--r--ext/tk/sample/demos-en/tree.rb2
-rw-r--r--ext/tk/sample/demos-en/widget144
-rw-r--r--ext/tk/sample/demos-jp/README104
-rw-r--r--ext/tk/sample/demos-jp/README.1st28
-rw-r--r--ext/tk/sample/demos-jp/anilabel.rb22
-rw-r--r--ext/tk/sample/demos-jp/aniwave.rb10
-rw-r--r--ext/tk/sample/demos-jp/arrow.rb22
-rw-r--r--ext/tk/sample/demos-jp/bind.rb38
-rw-r--r--ext/tk/sample/demos-jp/bitmap.rb20
-rw-r--r--ext/tk/sample/demos-jp/browse122
-rw-r--r--ext/tk/sample/demos-jp/browse222
-rw-r--r--ext/tk/sample/demos-jp/button.rb20
-rw-r--r--ext/tk/sample/demos-jp/check.rb30
-rw-r--r--ext/tk/sample/demos-jp/check2.rb30
-rw-r--r--ext/tk/sample/demos-jp/clrpick.rb28
-rw-r--r--ext/tk/sample/demos-jp/colors.rb20
-rw-r--r--ext/tk/sample/demos-jp/combo.rb36
-rw-r--r--ext/tk/sample/demos-jp/cscroll.rb22
-rw-r--r--ext/tk/sample/demos-jp/ctext.rb36
-rw-r--r--ext/tk/sample/demos-jp/dialog1.rb12
-rw-r--r--ext/tk/sample/demos-jp/dialog2.rb12
-rw-r--r--ext/tk/sample/demos-jp/doc.org/license.terms2
-rw-r--r--ext/tk/sample/demos-jp/doc.org/license.terms.tk802
-rw-r--r--ext/tk/sample/demos-jp/entry1.rb32
-rw-r--r--ext/tk/sample/demos-jp/entry2.rb32
-rw-r--r--ext/tk/sample/demos-jp/entry3.rb46
-rw-r--r--ext/tk/sample/demos-jp/filebox.rb28
-rw-r--r--ext/tk/sample/demos-jp/floor.rb24
-rw-r--r--ext/tk/sample/demos-jp/floor2.rb24
-rw-r--r--ext/tk/sample/demos-jp/form.rb28
-rw-r--r--ext/tk/sample/demos-jp/goldberg.rb20
-rw-r--r--ext/tk/sample/demos-jp/hello6
-rw-r--r--ext/tk/sample/demos-jp/hscale.rb14
-rw-r--r--ext/tk/sample/demos-jp/icon.rb24
-rw-r--r--ext/tk/sample/demos-jp/image1.rb22
-rw-r--r--ext/tk/sample/demos-jp/image2.rb34
-rw-r--r--ext/tk/sample/demos-jp/image3.rb18
-rw-r--r--ext/tk/sample/demos-jp/items.rb60
-rw-r--r--ext/tk/sample/demos-jp/ixset30
-rw-r--r--ext/tk/sample/demos-jp/ixset278
-rw-r--r--ext/tk/sample/demos-jp/knightstour.rb20
-rw-r--r--ext/tk/sample/demos-jp/label.rb30
-rw-r--r--ext/tk/sample/demos-jp/labelframe.rb32
-rw-r--r--ext/tk/sample/demos-jp/mclist.rb58
-rw-r--r--ext/tk/sample/demos-jp/menu.rb108
-rw-r--r--ext/tk/sample/demos-jp/menu84.rb50
-rw-r--r--ext/tk/sample/demos-jp/menu8x.rb120
-rw-r--r--ext/tk/sample/demos-jp/menubu.rb28
-rw-r--r--ext/tk/sample/demos-jp/msgbox.rb30
-rw-r--r--ext/tk/sample/demos-jp/msgbox2.rb32
-rw-r--r--ext/tk/sample/demos-jp/paned1.rb16
-rw-r--r--ext/tk/sample/demos-jp/paned2.rb22
-rw-r--r--ext/tk/sample/demos-jp/pendulum.rb10
-rw-r--r--ext/tk/sample/demos-jp/plot.rb26
-rw-r--r--ext/tk/sample/demos-jp/puzzle.rb30
-rw-r--r--ext/tk/sample/demos-jp/radio.rb30
-rw-r--r--ext/tk/sample/demos-jp/radio2.rb26
-rw-r--r--ext/tk/sample/demos-jp/radio3.rb24
-rw-r--r--ext/tk/sample/demos-jp/rmt68
-rw-r--r--ext/tk/sample/demos-jp/rolodex6
-rw-r--r--ext/tk/sample/demos-jp/rolodex-j136
-rw-r--r--ext/tk/sample/demos-jp/ruler.rb22
-rw-r--r--ext/tk/sample/demos-jp/sayings.rb20
-rw-r--r--ext/tk/sample/demos-jp/search.rb40
-rw-r--r--ext/tk/sample/demos-jp/spin.rb42
-rw-r--r--ext/tk/sample/demos-jp/square12
-rw-r--r--ext/tk/sample/demos-jp/states.rb34
-rw-r--r--ext/tk/sample/demos-jp/style.rb192
-rw-r--r--ext/tk/sample/demos-jp/tcolor52
-rw-r--r--ext/tk/sample/demos-jp/text.rb102
-rw-r--r--ext/tk/sample/demos-jp/textpeer.rb32
-rw-r--r--ext/tk/sample/demos-jp/timer2
-rw-r--r--ext/tk/sample/demos-jp/toolbar.rb56
-rw-r--r--ext/tk/sample/demos-jp/tree.rb24
-rw-r--r--ext/tk/sample/demos-jp/ttkbut.rb56
-rw-r--r--ext/tk/sample/demos-jp/ttkmenu.rb46
-rw-r--r--ext/tk/sample/demos-jp/ttknote.rb42
-rw-r--r--ext/tk/sample/demos-jp/ttkpane.rb24
-rw-r--r--ext/tk/sample/demos-jp/ttkprogress.rb26
-rw-r--r--ext/tk/sample/demos-jp/twind.rb76
-rw-r--r--ext/tk/sample/demos-jp/twind2.rb116
-rw-r--r--ext/tk/sample/demos-jp/unicodeout.rb42
-rw-r--r--ext/tk/sample/demos-jp/vscale.rb16
-rw-r--r--ext/tk/sample/demos-jp/widget432
-rw-r--r--ext/tk/sample/editable_listbox.rb2
-rw-r--r--ext/tk/sample/irbtkw.rbw10
-rw-r--r--ext/tk/sample/menubar3.rb2
-rw-r--r--ext/tk/sample/msgs_rb/README4
-rw-r--r--ext/tk/sample/msgs_rb/es.msg2
-rw-r--r--ext/tk/sample/msgs_rb/ru.msg4
-rw-r--r--ext/tk/sample/msgs_rb2/README2
-rw-r--r--ext/tk/sample/msgs_rb2/ja.msg154
-rw-r--r--ext/tk/sample/msgs_tk/README2
-rw-r--r--ext/tk/sample/msgs_tk/el.msg2
-rw-r--r--ext/tk/sample/msgs_tk/es.msg2
-rw-r--r--ext/tk/sample/msgs_tk/license.terms2
-rw-r--r--ext/tk/sample/msgs_tk/ru.msg4
-rw-r--r--ext/tk/sample/safe-tk.rb2
-rw-r--r--ext/tk/sample/scrollframe.rb8
-rw-r--r--ext/tk/sample/tcltklib/sample0.rb12
-rw-r--r--ext/tk/sample/tcltklib/sample1.rb304
-rw-r--r--ext/tk/sample/tcltklib/sample2.rb14
-rw-r--r--ext/tk/sample/tkalignbox.rb6
-rw-r--r--ext/tk/sample/tkballoonhelp.rb6
-rw-r--r--ext/tk/sample/tkcombobox.rb10
-rw-r--r--ext/tk/sample/tkextlib/blt/readme.txt2
-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/tile/readme.txt4
-rw-r--r--ext/tk/sample/tkextlib/tile/repeater.tcl10
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl8
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl28
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl2
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl38
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl2
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl2
-rw-r--r--ext/tk/sample/tkextlib/tile/toolbutton.tcl34
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/README6
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/index.html2
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/index.html48
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/index.html38
-rw-r--r--ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension4
-rw-r--r--ext/tk/sample/tkextlib/tkimg/readme.txt2
-rw-r--r--ext/tk/sample/tkextlib/treectrl/readme.txt2
-rw-r--r--ext/tk/sample/tkoptdb-safeTk.rb2
-rw-r--r--ext/tk/sample/tkoptdb.rb2
-rw-r--r--ext/tk/stubs.c20
-rw-r--r--ext/tk/tcltklib.c694
-rw-r--r--ext/tk/tkutil/.cvsignore3
-rw-r--r--ext/tk/tkutil/tkutil.c94
-rw-r--r--ext/win32ole/.cvsignore4
-rw-r--r--ext/win32ole/depend2
-rw-r--r--ext/win32ole/extconf.rb32
-rw-r--r--ext/win32ole/lib/win32ole.rb22
-rw-r--r--ext/win32ole/win32ole.c166
-rw-r--r--ext/zlib/.cvsignore4
-rw-r--r--ext/zlib/extconf.rb10
-rw-r--r--ext/zlib/zlib.c1538
-rw-r--r--file.c1157
-rw-r--r--gc.c5081
-rw-r--r--gc.h53
-rw-r--r--gem_prelude.rb236
-rw-r--r--golf_prelude.rb8
-rw-r--r--goruby.c34
-rw-r--r--hash.c1096
-rw-r--r--ia64.s4
-rw-r--r--id.c50
-rw-r--r--include/ruby.h1
-rw-r--r--include/ruby/backward/classext.h18
-rw-r--r--include/ruby/backward/rubysig.h8
-rw-r--r--include/ruby/debug.h93
-rw-r--r--include/ruby/defines.h145
-rw-r--r--include/ruby/encoding.h67
-rw-r--r--include/ruby/intern.h298
-rw-r--r--include/ruby/io.h130
-rw-r--r--include/ruby/missing.h69
-rw-r--r--include/ruby/oniguruma.h100
-rw-r--r--include/ruby/re.h9
-rw-r--r--include/ruby/regex.h8
-rw-r--r--include/ruby/ruby.h714
-rw-r--r--include/ruby/st.h42
-rw-r--r--include/ruby/subst.h19
-rw-r--r--include/ruby/thread.h49
-rw-r--r--include/ruby/util.h27
-rw-r--r--include/ruby/version.h17
-rw-r--r--include/ruby/vm.h26
-rw-r--r--include/ruby/win32.h178
-rw-r--r--inits.c2
-rw-r--r--insns.def1083
-rw-r--r--internal.h395
-rw-r--r--io.c4477
-rw-r--r--iseq.c1255
-rw-r--r--iseq.h102
-rw-r--r--lib/.document107
-rw-r--r--lib/English.rb42
-rw-r--r--lib/README93
-rw-r--r--[-rwxr-xr-x]lib/abbrev.rb107
-rw-r--r--lib/benchmark.rb230
-rw-r--r--lib/cgi.rb73
-rw-r--r--lib/cgi/.document1
-rw-r--r--lib/cgi/cookie.rb116
-rw-r--r--lib/cgi/core.rb374
-rw-r--r--lib/cgi/html.rb106
-rw-r--r--lib/cgi/session.rb28
-rw-r--r--lib/cgi/util.rb26
-rw-r--r--lib/cmath.rb340
-rw-r--r--lib/csv.rb426
-rw-r--r--lib/date.rb1849
-rw-r--r--lib/date/delta.rb431
-rw-r--r--lib/date/delta/parser.rb301
-rw-r--r--lib/date/delta/parser.ry84
-rw-r--r--lib/date/format.rb1313
-rw-r--r--lib/debug.rb1654
-rw-r--r--lib/delegate.rb201
-rw-r--r--lib/drb/acl.rb152
-rw-r--r--lib/drb/drb.rb445
-rw-r--r--lib/drb/eq.rb2
-rw-r--r--lib/drb/extserv.rb4
-rw-r--r--lib/drb/extservm.rb26
-rw-r--r--lib/drb/gw.rb42
-rw-r--r--lib/drb/invokemethod.rb10
-rw-r--r--lib/drb/observer.rb3
-rw-r--r--lib/drb/ssl.rb326
-rw-r--r--lib/drb/timeridconv.rb96
-rw-r--r--lib/drb/unix.rb53
-rw-r--r--lib/e2mmap.rb62
-rw-r--r--lib/erb.rb442
-rw-r--r--lib/fileutils.rb223
-rw-r--r--lib/find.rb4
-rw-r--r--lib/forwardable.rb205
-rw-r--r--lib/getoptlong.rb214
-rw-r--r--lib/gserver.rb89
-rw-r--r--lib/ipaddr.rb345
-rw-r--r--lib/irb.rb662
-rw-r--r--lib/irb/cmd/chws.rb3
-rw-r--r--lib/irb/cmd/fork.rb5
-rw-r--r--lib/irb/cmd/help.rb4
-rw-r--r--lib/irb/cmd/load.rb2
-rw-r--r--lib/irb/cmd/nop.rb3
-rw-r--r--lib/irb/cmd/pushws.rb2
-rw-r--r--lib/irb/cmd/subirb.rb2
-rw-r--r--lib/irb/completion.rb71
-rw-r--r--lib/irb/context.rb171
-rw-r--r--lib/irb/ext/change-ws.rb10
-rw-r--r--lib/irb/ext/history.rb15
-rw-r--r--lib/irb/ext/loader.rb17
-rw-r--r--lib/irb/ext/math-mode.rb13
-rw-r--r--lib/irb/ext/multi-irb.rb54
-rw-r--r--lib/irb/ext/save-history.rb31
-rw-r--r--lib/irb/ext/tracer.rb11
-rw-r--r--lib/irb/ext/use-loader.rb9
-rw-r--r--lib/irb/ext/workspaces.rb13
-rw-r--r--lib/irb/extend-command.rb76
-rw-r--r--lib/irb/frame.rb16
-rw-r--r--lib/irb/help.rb1
-rw-r--r--lib/irb/init.rb19
-rw-r--r--lib/irb/input-method.rb71
-rw-r--r--lib/irb/inspector.rb152
-rw-r--r--lib/irb/lc/.document4
-rw-r--r--lib/irb/lc/error.rb4
-rw-r--r--lib/irb/lc/help-message12
-rw-r--r--lib/irb/lc/ja/encoding_aliases.rb2
-rw-r--r--lib/irb/lc/ja/error.rb3
-rw-r--r--lib/irb/lc/ja/help-message12
-rw-r--r--lib/irb/locale.rb4
-rw-r--r--lib/irb/magic-file.rb3
-rw-r--r--lib/irb/notifier.rb89
-rw-r--r--lib/irb/output-method.rb46
-rw-r--r--lib/irb/ruby-lex.rb54
-rw-r--r--lib/irb/ruby-token.rb7
-rw-r--r--lib/irb/slex.rb6
-rw-r--r--lib/irb/version.rb2
-rw-r--r--lib/irb/workspace.rb14
-rw-r--r--lib/irb/ws-for-case-2.rb2
-rw-r--r--lib/irb/xmp.rb76
-rw-r--r--lib/logger.rb238
-rw-r--r--lib/mathn.rb220
-rw-r--r--lib/matrix.rb724
-rw-r--r--lib/matrix/eigenvalue_decomposition.rb882
-rw-r--r--lib/matrix/lup_decomposition.rb218
-rw-r--r--lib/minitest/.document2
-rw-r--r--lib/minitest/README.txt394
-rw-r--r--lib/minitest/autorun.rb18
-rw-r--r--lib/minitest/benchmark.rb380
-rw-r--r--lib/minitest/hell.rb16
-rw-r--r--lib/minitest/mock.rb214
-rw-r--r--lib/minitest/parallel_each.rb36
-rw-r--r--lib/minitest/pride.rb119
-rw-r--r--lib/minitest/spec.rb535
-rw-r--r--lib/minitest/unit.rb1054
-rw-r--r--lib/mkmf.rb3809
-rw-r--r--lib/monitor.rb171
-rw-r--r--lib/mutex_m.rb76
-rw-r--r--lib/net/.document8
-rw-r--r--lib/net/ftp.rb602
-rw-r--r--lib/net/http.rb2429
-rw-r--r--lib/net/http/backward.rb25
-rw-r--r--lib/net/http/exceptions.rb25
-rw-r--r--lib/net/http/generic_request.rb329
-rw-r--r--lib/net/http/header.rb452
-rw-r--r--lib/net/http/proxy_delta.rb16
-rw-r--r--lib/net/http/request.rb20
-rw-r--r--lib/net/http/requests.rb122
-rw-r--r--lib/net/http/response.rb405
-rw-r--r--lib/net/http/responses.rb268
-rw-r--r--lib/net/https.rb80
-rw-r--r--lib/net/imap.rb395
-rw-r--r--lib/net/pop.rb55
-rw-r--r--lib/net/protocol.rb34
-rw-r--r--lib/net/smtp.rb82
-rw-r--r--lib/net/telnet.rb26
-rw-r--r--lib/observer.rb75
-rw-r--r--lib/open-uri.rb234
-rw-r--r--lib/open3.rb45
-rw-r--r--lib/optparse.rb194
-rw-r--r--lib/optparse/ac.rb50
-rw-r--r--lib/ostruct.rb193
-rw-r--r--lib/pathname.rb1053
-rw-r--r--lib/pp.rb66
-rw-r--r--lib/prettyprint.rb20
-rw-r--r--lib/prime.rb170
-rw-r--r--lib/profiler.rb146
-rw-r--r--lib/pstore.rb82
-rw-r--r--lib/racc/parser.rb271
-rw-r--r--lib/racc/rdoc/grammar.en.rdoc219
-rw-r--r--lib/rake.rb2482
-rw-r--r--lib/rake/alt_system.rb109
-rw-r--r--lib/rake/application.rb702
-rw-r--r--lib/rake/backtrace.rb18
-rw-r--r--lib/rake/classic_namespace.rb3
-rw-r--r--lib/rake/clean.rb3
-rw-r--r--lib/rake/cloneable.rb16
-rw-r--r--lib/rake/contrib/compositepublisher.rb1
-rw-r--r--lib/rake/contrib/ftptools.rb12
-rw-r--r--lib/rake/contrib/publisher.rb20
-rw-r--r--lib/rake/contrib/sshpublisher.rb5
-rw-r--r--lib/rake/contrib/sys.rb192
-rw-r--r--lib/rake/default_loader.rb10
-rw-r--r--lib/rake/dsl_definition.rb182
-rw-r--r--lib/rake/early_time.rb18
-rw-r--r--lib/rake/ext/core.rb27
-rw-r--r--lib/rake/ext/module.rb39
-rw-r--r--lib/rake/ext/string.rb168
-rw-r--r--lib/rake/ext/time.rb15
-rw-r--r--lib/rake/file_creation_task.rb24
-rw-r--r--lib/rake/file_list.rb410
-rw-r--r--lib/rake/file_task.rb47
-rw-r--r--lib/rake/file_utils.rb114
-rw-r--r--lib/rake/file_utils_ext.rb146
-rw-r--r--lib/rake/gempackagetask.rb98
-rw-r--r--lib/rake/invocation_chain.rb51
-rw-r--r--lib/rake/invocation_exception_mixin.rb16
-rw-r--r--lib/rake/lib/.document1
-rw-r--r--lib/rake/lib/project.rake21
-rw-r--r--lib/rake/loaders/makefile.rb8
-rw-r--r--lib/rake/multi_task.rb13
-rw-r--r--lib/rake/name_space.rb25
-rw-r--r--lib/rake/packagetask.rb5
-rw-r--r--lib/rake/pathmap.rb1
-rw-r--r--lib/rake/phony.rb15
-rw-r--r--lib/rake/private_reader.rb20
-rw-r--r--lib/rake/promise.rb99
-rw-r--r--lib/rake/pseudo_status.rb24
-rw-r--r--lib/rake/rake_module.rb37
-rw-r--r--lib/rake/rake_test_loader.rb21
-rw-r--r--lib/rake/rdoctask.rb388
-rw-r--r--lib/rake/ruby182_test_unit_fix.rb25
-rw-r--r--lib/rake/rule_recursion_overflow_error.rb20
-rw-r--r--lib/rake/runtest.rb11
-rw-r--r--lib/rake/task.rb350
-rw-r--r--lib/rake/task_argument_error.rb7
-rw-r--r--lib/rake/task_arguments.rb78
-rw-r--r--lib/rake/task_manager.rb307
-rw-r--r--lib/rake/tasklib.rb1
-rw-r--r--lib/rake/testtask.rb88
-rw-r--r--lib/rake/thread_history_display.rb48
-rw-r--r--lib/rake/thread_pool.rb155
-rw-r--r--lib/rake/trace_output.rb19
-rw-r--r--lib/rake/version.rb13
-rw-r--r--lib/rake/win32.rb45
-rw-r--r--lib/rbconfig/.document1
-rw-r--r--lib/rbconfig/datadir.rb19
-rw-r--r--lib/rbconfig/obsolete.rb38
-rw-r--r--lib/rdoc.rb455
-rw-r--r--lib/rdoc/alias.rb81
-rw-r--r--lib/rdoc/anon_class.rb4
-rw-r--r--lib/rdoc/any_method.rb282
-rw-r--r--lib/rdoc/attr.rb199
-rw-r--r--lib/rdoc/class_module.rb694
-rw-r--r--lib/rdoc/code_object.rb242
-rw-r--r--lib/rdoc/code_objects.rb24
-rw-r--r--lib/rdoc/comment.rb232
-rw-r--r--lib/rdoc/constant.rb136
-rw-r--r--lib/rdoc/context.rb1011
-rw-r--r--lib/rdoc/context/section.rb238
-rw-r--r--lib/rdoc/cross_reference.rb183
-rw-r--r--lib/rdoc/encoding.rb97
-rw-r--r--lib/rdoc/erb_partial.rb18
-rw-r--r--lib/rdoc/erbio.rb37
-rw-r--r--lib/rdoc/extend.rb117
-rw-r--r--lib/rdoc/generator.rb48
-rw-r--r--lib/rdoc/generator/darkfish.rb1021
-rw-r--r--lib/rdoc/generator/json_index.rb248
-rw-r--r--lib/rdoc/generator/markup.rb138
-rw-r--r--lib/rdoc/generator/ri.rb72
-rw-r--r--lib/rdoc/generator/template/darkfish/_footer.rhtml5
-rw-r--r--lib/rdoc/generator/template/darkfish/_head.rhtml16
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml18
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml9
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml16
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml8
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml16
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml14
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml12
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml7
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml12
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml10
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml10
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml10
-rw-r--r--lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml19
-rw-r--r--lib/rdoc/generator/template/darkfish/class.rhtml179
-rw-r--r--lib/rdoc/generator/template/darkfish/classpage.rhtml297
-rw-r--r--lib/rdoc/generator/template/darkfish/filepage.rhtml124
-rwxr-xr-xlib/rdoc/generator/template/darkfish/images/add.pngbin733 -> 0 bytes-rwxr-xr-xlib/rdoc/generator/template/darkfish/images/arrow_up.pngbin372 -> 0 bytes-rwxr-xr-xlib/rdoc/generator/template/darkfish/images/delete.pngbin715 -> 0 bytes-rwxr-xr-xlib/rdoc/generator/template/darkfish/images/tag_blue.pngbin1880 -> 0 bytes-rw-r--r--lib/rdoc/generator/template/darkfish/images/transparent.pngbin97 -> 0 bytes-rw-r--r--lib/rdoc/generator/template/darkfish/index.rhtml83
-rw-r--r--lib/rdoc/generator/template/darkfish/js/darkfish.js163
-rw-r--r--lib/rdoc/generator/template/darkfish/js/jquery.js36
-rw-r--r--lib/rdoc/generator/template/darkfish/js/quicksearch.js114
-rw-r--r--lib/rdoc/generator/template/darkfish/js/search.js94
-rw-r--r--lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js10
-rw-r--r--lib/rdoc/generator/template/darkfish/page.rhtml18
-rw-r--r--lib/rdoc/generator/template/darkfish/rdoc.css833
-rw-r--r--lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml18
-rw-r--r--lib/rdoc/generator/template/darkfish/servlet_root.rhtml37
-rw-r--r--lib/rdoc/generator/template/darkfish/table_of_contents.rhtml55
-rw-r--r--lib/rdoc/generator/template/json_index/.document1
-rw-r--r--lib/rdoc/generator/template/json_index/js/navigation.js142
-rw-r--r--lib/rdoc/generator/template/json_index/js/searcher.js228
-rw-r--r--lib/rdoc/ghost_method.rb2
-rw-r--r--lib/rdoc/include.rb68
-rw-r--r--lib/rdoc/known_classes.rb7
-rw-r--r--lib/rdoc/markdown.rb16336
-rw-r--r--lib/rdoc/markdown/entities.rb2131
-rw-r--r--lib/rdoc/markdown/literals_1_9.rb417
-rw-r--r--lib/rdoc/markup.rb806
-rw-r--r--lib/rdoc/markup/attr_changer.rb22
-rw-r--r--lib/rdoc/markup/attr_span.rb29
-rw-r--r--lib/rdoc/markup/attribute_manager.rb72
-rw-r--r--lib/rdoc/markup/attributes.rb70
-rw-r--r--lib/rdoc/markup/blank_line.rb14
-rw-r--r--lib/rdoc/markup/block_quote.rb14
-rw-r--r--lib/rdoc/markup/document.rb110
-rw-r--r--lib/rdoc/markup/formatter.rb159
-rw-r--r--lib/rdoc/markup/formatter_test_case.rb432
-rw-r--r--lib/rdoc/markup/hard_break.rb31
-rw-r--r--lib/rdoc/markup/heading.rb50
-rw-r--r--lib/rdoc/markup/include.rb42
-rw-r--r--lib/rdoc/markup/indented_paragraph.rb47
-rw-r--r--lib/rdoc/markup/inline.rb128
-rw-r--r--lib/rdoc/markup/list.rb31
-rw-r--r--lib/rdoc/markup/list_item.rb24
-rw-r--r--lib/rdoc/markup/paragraph.rb17
-rw-r--r--lib/rdoc/markup/parser.rb576
-rw-r--r--lib/rdoc/markup/pre_process.rb293
-rw-r--r--lib/rdoc/markup/preprocess.rb130
-rw-r--r--lib/rdoc/markup/raw.rb14
-rw-r--r--lib/rdoc/markup/rule.rb3
-rw-r--r--lib/rdoc/markup/special.rb40
-rw-r--r--lib/rdoc/markup/text_formatter_test_case.rb114
-rw-r--r--lib/rdoc/markup/to_ansi.rb37
-rw-r--r--lib/rdoc/markup/to_bs.rb12
-rw-r--r--lib/rdoc/markup/to_html.rb408
-rw-r--r--lib/rdoc/markup/to_html_crossref.rb227
-rw-r--r--lib/rdoc/markup/to_html_snippet.rb284
-rw-r--r--lib/rdoc/markup/to_joined_paragraph.rb71
-rw-r--r--lib/rdoc/markup/to_label.rb74
-rw-r--r--lib/rdoc/markup/to_markdown.rb189
-rw-r--r--lib/rdoc/markup/to_rdoc.rb196
-rw-r--r--lib/rdoc/markup/to_table_of_contents.rb87
-rw-r--r--lib/rdoc/markup/to_test.rb15
-rw-r--r--lib/rdoc/markup/to_tt_only.rb120
-rw-r--r--lib/rdoc/markup/verbatim.rb47
-rw-r--r--lib/rdoc/meta_method.rb2
-rw-r--r--lib/rdoc/method_attr.rb398
-rw-r--r--lib/rdoc/normal_class.rb51
-rw-r--r--lib/rdoc/normal_module.rb29
-rw-r--r--lib/rdoc/options.rb922
-rw-r--r--lib/rdoc/parser.rb248
-rw-r--r--lib/rdoc/parser/c.rb994
-rw-r--r--lib/rdoc/parser/changelog.rb194
-rw-r--r--lib/rdoc/parser/markdown.rb23
-rw-r--r--lib/rdoc/parser/perl.rb165
-rw-r--r--lib/rdoc/parser/rd.rb22
-rw-r--r--lib/rdoc/parser/ruby.rb878
-rw-r--r--lib/rdoc/parser/ruby_tools.rb18
-rw-r--r--lib/rdoc/parser/simple.rb31
-rw-r--r--lib/rdoc/parser/text.rb11
-rw-r--r--lib/rdoc/rd.rb99
-rw-r--r--lib/rdoc/rd/block_parser.rb1055
-rw-r--r--lib/rdoc/rd/inline.rb71
-rw-r--r--lib/rdoc/rd/inline_parser.rb1207
-rw-r--r--lib/rdoc/rdoc.rb270
-rw-r--r--lib/rdoc/require.rb23
-rw-r--r--lib/rdoc/ri.rb6
-rw-r--r--lib/rdoc/ri/driver.rb732
-rw-r--r--lib/rdoc/ri/paths.rb139
-rw-r--r--lib/rdoc/ri/store.rb246
-rw-r--r--lib/rdoc/ruby_lex.rb188
-rw-r--r--lib/rdoc/ruby_token.rb55
-rw-r--r--lib/rdoc/rubygems_hook.rb238
-rw-r--r--lib/rdoc/servlet.rb416
-rw-r--r--lib/rdoc/single_class.rb14
-rw-r--r--lib/rdoc/stats.rb497
-rw-r--r--lib/rdoc/stats/normal.rb48
-rw-r--r--lib/rdoc/stats/quiet.rb59
-rw-r--r--lib/rdoc/stats/verbose.rb45
-rw-r--r--lib/rdoc/store.rb977
-rw-r--r--lib/rdoc/task.rb303
-rw-r--r--lib/rdoc/test_case.rb178
-rw-r--r--lib/rdoc/text.rb287
-rw-r--r--lib/rdoc/token_stream.rb95
-rw-r--r--lib/rdoc/tokenstream.rb52
-rw-r--r--lib/rdoc/tom_doc.rb233
-rw-r--r--lib/rdoc/top_level.rb264
-rw-r--r--lib/resolv-replace.rb3
-rw-r--r--lib/resolv.rb128
-rw-r--r--lib/rexml/attribute.rb2
-rw-r--r--lib/rexml/cdata.rb2
-rw-r--r--lib/rexml/child.rb4
-rw-r--r--lib/rexml/comment.rb12
-rw-r--r--lib/rexml/doctype.rb11
-rw-r--r--lib/rexml/document.rb77
-rw-r--r--lib/rexml/element.rb49
-rw-r--r--lib/rexml/encoding.rb95
-rw-r--r--lib/rexml/encodings/CP-1252.rb103
-rw-r--r--lib/rexml/encodings/EUC-JP.rb35
-rw-r--r--lib/rexml/encodings/ICONV.rb22
-rw-r--r--lib/rexml/encodings/ISO-8859-1.rb7
-rw-r--r--lib/rexml/encodings/ISO-8859-15.rb72
-rw-r--r--lib/rexml/encodings/SHIFT-JIS.rb37
-rw-r--r--lib/rexml/encodings/SHIFT_JIS.rb1
-rw-r--r--lib/rexml/encodings/UNILE.rb34
-rw-r--r--lib/rexml/encodings/US-ASCII.rb30
-rw-r--r--lib/rexml/encodings/UTF-16.rb35
-rw-r--r--lib/rexml/encodings/UTF-8.rb18
-rw-r--r--lib/rexml/entity.rb7
-rw-r--r--lib/rexml/formatters/default.rb2
-rw-r--r--lib/rexml/formatters/pretty.rb12
-rw-r--r--lib/rexml/formatters/transitive.rb1
-rw-r--r--lib/rexml/functions.rb8
-rw-r--r--lib/rexml/light/node.rb14
-rw-r--r--lib/rexml/node.rb12
-rw-r--r--lib/rexml/output.rb7
-rw-r--r--lib/rexml/parseexception.rb2
-rw-r--r--lib/rexml/parsers/baseparser.rb69
-rw-r--r--lib/rexml/parsers/lightparser.rb8
-rw-r--r--lib/rexml/parsers/sax2parser.rb10
-rw-r--r--lib/rexml/parsers/ultralightparser.rb8
-rw-r--r--lib/rexml/parsers/xpathparser.rb2
-rw-r--r--lib/rexml/quickpath.rb31
-rw-r--r--lib/rexml/rexml.rb12
-rw-r--r--lib/rexml/source.rb89
-rw-r--r--lib/rexml/text.rb41
-rw-r--r--lib/rexml/validation/validation.rb2
-rw-r--r--lib/rexml/xmldecl.rb8
-rw-r--r--lib/rexml/xpath.rb13
-rw-r--r--lib/rexml/xpath_parser.rb12
-rw-r--r--lib/rinda/.document3
-rw-r--r--lib/rinda/ring.rb68
-rw-r--r--lib/rinda/tuplespace.rb4
-rw-r--r--lib/rss.rb80
-rw-r--r--lib/rss/atom.rb93
-rw-r--r--lib/rss/maker.rb26
-rw-r--r--lib/rss/maker/0.9.rb4
-rw-r--r--lib/rss/maker/1.0.rb2
-rw-r--r--lib/rss/maker/base.rb14
-rw-r--r--lib/rss/maker/dublincore.rb3
-rw-r--r--lib/rss/maker/entry.rb4
-rw-r--r--lib/rss/maker/image.rb4
-rw-r--r--lib/rss/rss.rb55
-rw-r--r--lib/rubygems.rb1080
-rw-r--r--lib/rubygems/available_set.rb93
-rw-r--r--lib/rubygems/builder.rb94
-rw-r--r--lib/rubygems/command.rb139
-rw-r--r--lib/rubygems/command_manager.rb123
-rw-r--r--lib/rubygems/commands/build_command.rb46
-rw-r--r--lib/rubygems/commands/cert_command.rb259
-rw-r--r--lib/rubygems/commands/check_command.rb108
-rw-r--r--lib/rubygems/commands/cleanup_command.rb153
-rw-r--r--lib/rubygems/commands/contents_command.rb51
-rw-r--r--lib/rubygems/commands/dependency_command.rb78
-rw-r--r--lib/rubygems/commands/environment_command.rb30
-rw-r--r--lib/rubygems/commands/fetch_command.rb21
-rw-r--r--lib/rubygems/commands/generate_index_command.rb63
-rw-r--r--lib/rubygems/commands/help_command.rb17
-rw-r--r--lib/rubygems/commands/install_command.rb124
-rw-r--r--lib/rubygems/commands/lock_command.rb12
-rw-r--r--lib/rubygems/commands/mirror_command.rb108
-rw-r--r--lib/rubygems/commands/outdated_command.rb18
-rw-r--r--lib/rubygems/commands/owner_command.rb21
-rw-r--r--lib/rubygems/commands/pristine_command.rb94
-rw-r--r--lib/rubygems/commands/push_command.rb52
-rw-r--r--lib/rubygems/commands/query_command.rb284
-rw-r--r--lib/rubygems/commands/rdoc_command.rb55
-rw-r--r--lib/rubygems/commands/search_command.rb4
-rw-r--r--lib/rubygems/commands/server_command.rb12
-rw-r--r--lib/rubygems/commands/setup_command.rb252
-rw-r--r--lib/rubygems/commands/sources_command.rb88
-rw-r--r--lib/rubygems/commands/specification_command.rb65
-rw-r--r--lib/rubygems/commands/stale_command.rb3
-rw-r--r--lib/rubygems/commands/uninstall_command.rb38
-rw-r--r--lib/rubygems/commands/unpack_command.rb105
-rw-r--r--lib/rubygems/commands/update_command.rb209
-rw-r--r--lib/rubygems/commands/which_command.rb15
-rw-r--r--lib/rubygems/commands/yank_command.rb98
-rw-r--r--lib/rubygems/compatibility.rb55
-rw-r--r--lib/rubygems/config_file.rb261
-rw-r--r--lib/rubygems/core_ext/kernel_gem.rb53
-rwxr-xr-xlib/rubygems/core_ext/kernel_require.rb149
-rw-r--r--lib/rubygems/custom_require.rb44
-rw-r--r--lib/rubygems/defaults.rb84
-rw-r--r--lib/rubygems/dependency.rb221
-rw-r--r--lib/rubygems/dependency_installer.rb356
-rw-r--r--lib/rubygems/dependency_list.rb72
-rw-r--r--lib/rubygems/dependency_resolver.rb575
-rw-r--r--lib/rubygems/deprecate.rb70
-rw-r--r--lib/rubygems/doc_manager.rb240
-rw-r--r--lib/rubygems/doctor.rb125
-rw-r--r--lib/rubygems/errors.rb102
-rw-r--r--lib/rubygems/exceptions.rb32
-rw-r--r--lib/rubygems/ext.rb1
-rw-r--r--lib/rubygems/ext/builder.rb49
-rw-r--r--lib/rubygems/ext/cmake_builder.rb14
-rw-r--r--lib/rubygems/ext/configure_builder.rb4
-rw-r--r--lib/rubygems/ext/ext_conf_builder.rb52
-rw-r--r--lib/rubygems/ext/rake_builder.rb18
-rw-r--r--lib/rubygems/format.rb83
-rw-r--r--lib/rubygems/gem_openssl.rb94
-rw-r--r--lib/rubygems/gem_path_searcher.rb100
-rw-r--r--lib/rubygems/gem_runner.rb27
-rw-r--r--lib/rubygems/gemcutter_utilities.rb89
-rw-r--r--lib/rubygems/indexer.rb452
-rw-r--r--lib/rubygems/install_message.rb12
-rw-r--r--lib/rubygems/install_update_options.rb98
-rw-r--r--lib/rubygems/installer.rb676
-rw-r--r--lib/rubygems/installer_test_case.rb196
-rw-r--r--lib/rubygems/local_remote_options.rb25
-rw-r--r--lib/rubygems/mock_gem_ui.rb88
-rw-r--r--lib/rubygems/name_tuple.rb110
-rw-r--r--lib/rubygems/old_format.rb152
-rw-r--r--lib/rubygems/package.rb600
-rw-r--r--lib/rubygems/package/digest_io.rb64
-rw-r--r--lib/rubygems/package/f_sync_dir.rb23
-rw-r--r--lib/rubygems/package/old.rb178
-rw-r--r--lib/rubygems/package/tar_header.rb73
-rw-r--r--lib/rubygems/package/tar_input.rb219
-rw-r--r--lib/rubygems/package/tar_output.rb144
-rw-r--r--lib/rubygems/package/tar_reader.rb23
-rw-r--r--lib/rubygems/package/tar_reader/entry.rb7
-rw-r--r--lib/rubygems/package/tar_test_case.rb137
-rw-r--r--lib/rubygems/package/tar_writer.rb72
-rw-r--r--lib/rubygems/package_task.rb26
-rw-r--r--lib/rubygems/path_support.rb77
-rw-r--r--lib/rubygems/platform.rb54
-rw-r--r--lib/rubygems/psych_additions.rb9
-rw-r--r--lib/rubygems/psych_tree.rb31
-rw-r--r--lib/rubygems/rdoc.rb336
-rw-r--r--lib/rubygems/remote_fetcher.rb370
-rw-r--r--lib/rubygems/request_set.rb182
-rw-r--r--lib/rubygems/require_paths_builder.rb13
-rw-r--r--lib/rubygems/requirement.rb147
-rw-r--r--lib/rubygems/security.rb922
-rw-r--r--lib/rubygems/security/policies.rb115
-rw-r--r--lib/rubygems/security/policy.rb263
-rw-r--r--lib/rubygems/security/signer.rb136
-rw-r--r--lib/rubygems/security/trust_dir.rb104
-rw-r--r--lib/rubygems/server.rb292
-rw-r--r--lib/rubygems/source.rb149
-rw-r--r--lib/rubygems/source_index.rb597
-rw-r--r--lib/rubygems/source_info_cache.rb395
-rw-r--r--lib/rubygems/source_info_cache_entry.rb56
-rw-r--r--lib/rubygems/source_list.rb87
-rw-r--r--lib/rubygems/source_local.rb92
-rw-r--r--lib/rubygems/source_specific_file.rb28
-rw-r--r--lib/rubygems/spec_fetcher.rb325
-rw-r--r--lib/rubygems/specification.rb2891
-rw-r--r--lib/rubygems/ssl_certs/.document1
-rw-r--r--lib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem25
-rw-r--r--lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem32
-rw-r--r--lib/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem14
-rw-r--r--lib/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem23
-rw-r--r--lib/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem28
-rw-r--r--lib/rubygems/ssl_certs/GeoTrustGlobalCA.pem20
-rw-r--r--lib/rubygems/ssl_certs/ca-bundle.pem3366
-rw-r--r--lib/rubygems/syck_hack.rb76
-rw-r--r--lib/rubygems/test_case.rb1116
-rw-r--r--lib/rubygems/test_utilities.rb44
-rw-r--r--lib/rubygems/text.rb37
-rw-r--r--lib/rubygems/uninstaller.rb239
-rw-r--r--lib/rubygems/user_interaction.rb317
-rw-r--r--lib/rubygems/validator.rb159
-rw-r--r--lib/rubygems/version.rb100
-rw-r--r--lib/scanf.rb724
-rw-r--r--lib/securerandom.rb41
-rw-r--r--lib/set.rb985
-rw-r--r--lib/shell.rb211
-rw-r--r--lib/shell/builtin-command.rb40
-rw-r--r--lib/shell/command-processor.rb640
-rw-r--r--lib/shell/error.rb6
-rw-r--r--lib/shell/filter.rb84
-rw-r--r--lib/shell/process-controller.rb332
-rw-r--r--lib/shell/system-command.rb122
-rw-r--r--lib/shell/version.rb8
-rw-r--r--lib/shellwords.rb139
-rw-r--r--lib/singleton.rb309
-rw-r--r--lib/sync.rb219
-rwxr-xr-x[-rw-r--r--]lib/tempfile.rb87
-rw-r--r--lib/test/unit.rb877
-rw-r--r--lib/test/unit/assertions.rb192
-rw-r--r--lib/test/unit/parallel.rb187
-rw-r--r--lib/test/unit/test-unit.gemspec14
-rw-r--r--lib/test/unit/testcase.rb19
-rw-r--r--lib/thread.rb176
-rw-r--r--lib/thwait.rb29
-rw-r--r--lib/time.rb289
-rw-r--r--lib/timeout.rb48
-rw-r--r--lib/tmpdir.rb31
-rw-r--r--lib/tracer.rb191
-rw-r--r--lib/un.rb89
-rw-r--r--lib/uri.rb90
-rw-r--r--lib/uri/.document7
-rw-r--r--lib/uri/common.rb391
-rw-r--r--lib/uri/ftp.rb52
-rw-r--r--lib/uri/generic.rb622
-rw-r--r--lib/uri/http.rb16
-rw-r--r--lib/uri/https.rb4
-rw-r--r--lib/uri/ldap.rb72
-rw-r--r--lib/uri/ldaps.rb8
-rw-r--r--lib/uri/mailto.rb18
-rw-r--r--lib/weakref.rb143
-rw-r--r--lib/webrick.rb201
-rw-r--r--lib/webrick/accesslog.rb89
-rw-r--r--lib/webrick/cgi.rb54
-rw-r--r--lib/webrick/compat.rb20
-rw-r--r--lib/webrick/config.rb53
-rw-r--r--lib/webrick/cookie.rb71
-rw-r--r--lib/webrick/htmlutils.rb10
-rw-r--r--lib/webrick/httpauth.rb56
-rw-r--r--lib/webrick/httpauth/authenticator.rb59
-rw-r--r--lib/webrick/httpauth/basicauth.rb45
-rw-r--r--lib/webrick/httpauth/digestauth.rb82
-rw-r--r--lib/webrick/httpauth/htdigest.rb39
-rw-r--r--lib/webrick/httpauth/htgroup.rb32
-rw-r--r--lib/webrick/httpauth/htpasswd.rb40
-rw-r--r--lib/webrick/httpauth/userdb.rb29
-rw-r--r--lib/webrick/httpproxy.rb61
-rw-r--r--lib/webrick/httprequest.rb225
-rw-r--r--lib/webrick/httpresponse.rb174
-rw-r--r--lib/webrick/https.rb25
-rw-r--r--lib/webrick/httpserver.rb63
-rw-r--r--lib/webrick/httpservlet/abstract.rb87
-rw-r--r--lib/webrick/httpservlet/cgi_runner.rb3
-rw-r--r--lib/webrick/httpservlet/cgihandler.rb19
-rw-r--r--lib/webrick/httpservlet/erbhandler.rb39
-rw-r--r--lib/webrick/httpservlet/filehandler.rb49
-rw-r--r--lib/webrick/httpservlet/prochandler.rb13
-rw-r--r--lib/webrick/httpstatus.rb76
-rw-r--r--lib/webrick/httputils.rb143
-rw-r--r--lib/webrick/httpversion.rb30
-rw-r--r--lib/webrick/log.rb75
-rw-r--r--lib/webrick/server.rb173
-rw-r--r--lib/webrick/ssl.rb78
-rw-r--r--lib/webrick/utils.rb77
-rw-r--r--lib/webrick/version.rb6
-rw-r--r--lib/xmlrpc.rb301
-rw-r--r--lib/xmlrpc/.document1
-rw-r--r--lib/xmlrpc/README.rdoc300
-rw-r--r--lib/xmlrpc/README.txt31
-rw-r--r--lib/xmlrpc/base64.rb63
-rw-r--r--lib/xmlrpc/client.rb607
-rw-r--r--lib/xmlrpc/config.rb26
-rw-r--r--lib/xmlrpc/create.rb22
-rw-r--r--lib/xmlrpc/datetime.rb119
-rw-r--r--lib/xmlrpc/httpserver.rb47
-rw-r--r--lib/xmlrpc/marshal.rb18
-rw-r--r--lib/xmlrpc/parser.rb91
-rw-r--r--lib/xmlrpc/server.rb575
-rw-r--r--lib/xmlrpc/utils.rb44
-rw-r--r--lib/yaml.rb104
-rw-r--r--lib/yaml/dbm.rb131
-rw-r--r--lib/yaml/store.rb58
-rw-r--r--load.c606
-rw-r--r--main.c7
-rw-r--r--man/erb.118
-rw-r--r--man/goruby.110
-rw-r--r--man/irb.114
-rw-r--r--man/rake.14
-rw-r--r--man/ri.113
-rw-r--r--man/ruby.169
-rw-r--r--marshal.c522
-rw-r--r--math.c24
-rw-r--r--method.h56
-rw-r--r--misc/README4
-rw-r--r--misc/inf-ruby.el48
-rw-r--r--misc/rb_optparse.bash20
-rwxr-xr-xmisc/rb_optparse.zsh38
-rw-r--r--misc/rdoc-mode.el74
-rw-r--r--misc/ruby-additional.el100
-rw-r--r--misc/ruby-electric.el31
-rw-r--r--misc/ruby-mode.el258
-rw-r--r--misc/ruby-style.el1
-rw-r--r--missing/alloca.c8
-rw-r--r--missing/cbrt.c1
-rw-r--r--missing/close.c5
-rw-r--r--missing/crt_externs.h8
-rw-r--r--missing/crypt.c79
-rw-r--r--missing/erf.c1
-rw-r--r--missing/ffs.c49
-rw-r--r--missing/finite.c2
-rw-r--r--missing/flock.c7
-rw-r--r--missing/hypot.c1
-rw-r--r--missing/isinf.c2
-rw-r--r--missing/isnan.c2
-rw-r--r--missing/langinfo.c7
-rw-r--r--missing/lgamma_r.c12
-rw-r--r--missing/memcmp.c1
-rw-r--r--missing/memmove.c1
-rw-r--r--missing/os2.c4
-rw-r--r--missing/setproctitle.c170
-rw-r--r--missing/strchr.c4
-rw-r--r--missing/strerror.c2
-rw-r--r--missing/strlcat.c1
-rw-r--r--missing/strlcpy.c1
-rw-r--r--missing/strstr.c4
-rw-r--r--missing/strtol.c1
-rw-r--r--missing/x86_64-chkstk.s10
-rw-r--r--nacl/GNUmakefile.in87
-rw-r--r--nacl/README.nacl34
-rw-r--r--nacl/create_nmf.rb70
-rw-r--r--nacl/dirent.h15
-rw-r--r--nacl/example.html150
-rw-r--r--nacl/ioctl.h7
-rw-r--r--nacl/nacl-config.rb61
-rw-r--r--nacl/package.rb109
-rw-r--r--nacl/pepper_main.c870
-rw-r--r--nacl/resource.h8
-rw-r--r--nacl/select.h7
-rw-r--r--nacl/signal.h6
-rw-r--r--nacl/stat.h10
-rw-r--r--nacl/unistd.h9
-rw-r--r--nacl/utime.h11
-rw-r--r--node.c78
-rw-r--r--node.h78
-rw-r--r--numeric.c1054
-rw-r--r--object.c1064
-rw-r--r--pack.c526
-rw-r--r--parse.y3083
-rw-r--r--prelude.rb18
-rw-r--r--probes.d211
-rw-r--r--probes_helper.h67
-rw-r--r--proc.c793
-rw-r--r--process.c3101
-rw-r--r--random.c595
-rw-r--r--range.c499
-rw-r--r--rational.c640
-rw-r--r--re.c218
-rw-r--r--regcomp.c720
-rw-r--r--regenc.c37
-rw-r--r--regenc.h22
-rw-r--r--regerror.c25
-rw-r--r--regexec.c850
-rw-r--r--regint.h130
-rw-r--r--regparse.c1147
-rw-r--r--regparse.h17
-rw-r--r--regsyntax.c84
-rw-r--r--ruby.c538
-rw-r--r--ruby_atomic.h170
-rw-r--r--safe.c4
-rw-r--r--sample/README2
-rw-r--r--sample/biorhythm.rb22
-rw-r--r--sample/coverage.rb2
-rw-r--r--sample/drb/README.rd.ja48
-rw-r--r--sample/drb/darray.rb2
-rw-r--r--sample/drb/darrayc.rb4
-rw-r--r--sample/drb/dbiff.rb4
-rw-r--r--sample/drb/dchatc.rb4
-rw-r--r--sample/drb/dchats.rb2
-rw-r--r--sample/drb/dhasen.rb4
-rw-r--r--sample/drb/dhasenc.rb8
-rw-r--r--sample/drb/dlogc.rb2
-rw-r--r--sample/drb/dlogd.rb2
-rw-r--r--sample/drb/dqin.rb2
-rw-r--r--sample/drb/dqout.rb2
-rw-r--r--sample/drb/dqueue.rb2
-rw-r--r--sample/drb/drbc.rb2
-rw-r--r--sample/drb/drbch.rb2
-rw-r--r--sample/drb/drbm.rb6
-rw-r--r--sample/drb/drbmc.rb2
-rw-r--r--sample/drb/drbs-acl.rb6
-rw-r--r--sample/drb/drbs.rb4
-rw-r--r--sample/drb/extserv_test.rb12
-rw-r--r--sample/drb/gw_cu.rb2
-rw-r--r--sample/drb/holderc.rb2
-rw-r--r--sample/drb/holders.rb6
-rw-r--r--sample/drb/http0.rb6
-rw-r--r--sample/drb/http0serv.rb12
-rw-r--r--sample/drb/name.rb16
-rw-r--r--sample/drb/namec.rb2
-rw-r--r--sample/drb/old_tuplespace.rb6
-rw-r--r--sample/drb/ring_echo.rb2
-rw-r--r--sample/drb/simpletuple.rb6
-rw-r--r--sample/drb/speedc.rb2
-rw-r--r--sample/drb/speeds.rb4
-rw-r--r--sample/from.rb2
-rw-r--r--sample/fullpath.rb2
-rw-r--r--sample/list.rb1
-rw-r--r--sample/list2.rb2
-rw-r--r--sample/list3.rb2
-rw-r--r--sample/logger/app.rb2
-rw-r--r--[-rwxr-xr-x]sample/mine.rb40
-rw-r--r--sample/openssl/certstore.rb2
-rw-r--r--sample/openssl/smime_write.rb2
-rw-r--r--[-rwxr-xr-x]sample/optparse/opttest.rb0
-rwxr-xr-xsample/rss/re_read.rb4
-rw-r--r--sample/svr.rb2
-rw-r--r--[-rwxr-xr-x]sample/test.rb151
-rw-r--r--sample/trojan.rb2
-rw-r--r--sample/webrick/httpproxy.rb7
-rw-r--r--signal.c475
-rw-r--r--siphash.c483
-rw-r--r--siphash.h48
-rw-r--r--sparc.c31
-rw-r--r--spec/README11
-rw-r--r--spec/default.mspec11
-rw-r--r--sprintf.c148
-rw-r--r--st.c755
-rw-r--r--strftime.c363
-rw-r--r--string.c1832
-rw-r--r--struct.c256
-rw-r--r--symbian/configure.bat7
-rw-r--r--symbian/setup2
-rw-r--r--template/Doxyfile.tmpl22
-rw-r--r--template/encdb.h.tmpl2
-rwxr-xr-x[-rw-r--r--]template/fake.rb.in17
-rw-r--r--template/id.c.tmpl27
-rw-r--r--template/id.h.tmpl136
-rw-r--r--template/ruby.pc.in53
-rw-r--r--template/yarvarch.ja402
-rw-r--r--test/-ext-/array/test_resize.rb29
-rw-r--r--test/-ext-/debug/test_debug.rb58
-rw-r--r--test/-ext-/exception/test_enc_raise.rb15
-rw-r--r--test/-ext-/exception/test_ensured.rb32
-rw-r--r--test/-ext-/funcall/test_passing_block.rb22
-rw-r--r--test/-ext-/iter/test_iter_break.rb12
-rw-r--r--test/-ext-/load/test_dot_dot.rb10
-rw-r--r--test/-ext-/marshal/test_usrmarshal.rb34
-rw-r--r--test/-ext-/method/test_arity.rb37
-rw-r--r--test/-ext-/num2int/test_num2int.rb227
-rw-r--r--test/-ext-/old_thread_select/test_old_thread_select.rb100
-rw-r--r--test/-ext-/path_to_class/test_path_to_class.rb12
-rw-r--r--test/-ext-/st/test_numhash.rb49
-rw-r--r--test/-ext-/st/test_update.rb50
-rw-r--r--test/-ext-/string/test_ellipsize.rb46
-rw-r--r--test/-ext-/string/test_enc_associate.rb12
-rw-r--r--test/-ext-/string/test_enc_str_buf_cat.rb15
-rw-r--r--test/-ext-/string/test_modify_expand.rb15
-rw-r--r--test/-ext-/string/test_qsort.rb19
-rw-r--r--test/-ext-/string/test_set_len.rb25
-rw-r--r--test/-ext-/struct/test_member.rb16
-rw-r--r--test/-ext-/symbol/test_inadvertent_creation.rb183
-rw-r--r--test/-ext-/symbol/test_type.rb114
-rw-r--r--test/-ext-/test_bug-3571.rb21
-rw-r--r--test/-ext-/test_bug-5832.rb21
-rw-r--r--test/-ext-/test_printf.rb61
-rw-r--r--test/-ext-/typeddata/test_typeddata.rb21
-rw-r--r--test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb45
-rw-r--r--test/-ext-/win32/test_dln.rb13
-rw-r--r--test/-ext-/win32/test_fd_setsize.rb25
-rw-r--r--test/base64/test_base64.rb1
-rw-r--r--test/benchmark/test_benchmark.rb171
-rw-r--r--test/bigdecimal/test_bigdecimal.rb803
-rw-r--r--test/bigdecimal/test_bigdecimal_util.rb43
-rw-r--r--test/bigdecimal/test_bigmath.rb17
-rw-r--r--test/bigdecimal/testbase.rb7
-rw-r--r--test/cgi/test_cgi_core.rb18
-rw-r--r--test/cgi/test_cgi_header.rb60
-rw-r--r--test/cgi/test_cgi_modruby.rb7
-rw-r--r--test/cgi/test_cgi_multipart.rb68
-rw-r--r--test/cgi/test_cgi_session.rb5
-rw-r--r--test/cgi/test_cgi_tag_helper.rb13
-rw-r--r--test/cgi/test_cgi_util.rb30
-rw-r--r--test/coverage/test_coverage.rb64
-rw-r--r--test/csv/base.rb8
-rw-r--r--[-rwxr-xr-x]test/csv/test_csv_parsing.rb9
-rw-r--r--[-rwxr-xr-x]test/csv/test_csv_writing.rb6
-rw-r--r--[-rwxr-xr-x]test/csv/test_data_converters.rb24
-rw-r--r--[-rwxr-xr-x]test/csv/test_encodings.rb96
-rw-r--r--[-rwxr-xr-x]test/csv/test_features.rb71
-rw-r--r--[-rwxr-xr-x]test/csv/test_headers.rb7
-rw-r--r--[-rwxr-xr-x]test/csv/test_interface.rb40
-rw-r--r--[-rwxr-xr-x]test/csv/test_row.rb40
-rw-r--r--test/csv/test_serialization.rb156
-rw-r--r--[-rwxr-xr-x]test/csv/test_table.rb24
-rw-r--r--test/csv/ts_all.rb1
-rw-r--r--test/date/test_date.rb25
-rw-r--r--test/date/test_date_attr.rb3
-rw-r--r--test/date/test_date_base.rb55
-rw-r--r--test/date/test_date_marshal.rb12
-rw-r--r--test/date/test_date_new.rb11
-rw-r--r--test/date/test_date_parse.rb960
-rw-r--r--test/date/test_date_strftime.rb46
-rw-r--r--test/date/test_date_strptime.rb189
-rw-r--r--test/date/test_switch_hitter.rb664
-rw-r--r--test/dbm/test_dbm.rb101
-rwxr-xr-xtest/digest/test_digest.rb30
-rw-r--r--test/digest/test_digest_extend.rb41
-rw-r--r--test/dl/test_base.rb13
-rw-r--r--test/dl/test_c_struct_entry.rb55
-rw-r--r--test/dl/test_c_union_entity.rb31
-rw-r--r--test/dl/test_callback.rb9
-rw-r--r--test/dl/test_cfunc.rb2
-rw-r--r--test/dl/test_cparser.rb24
-rw-r--r--test/dl/test_cptr.rb10
-rw-r--r--test/dl/test_dl2.rb16
-rw-r--r--test/dl/test_func.rb92
-rw-r--r--test/dl/test_handle.rb29
-rw-r--r--test/dl/test_import.rb17
-rw-r--r--test/drb/drbtest.rb54
-rw-r--r--test/drb/test_drb.rb5
-rw-r--r--test/drb/test_drbssl.rb6
-rw-r--r--test/drb/test_drbunix.rb6
-rw-r--r--test/drb/ut_array.rb2
-rw-r--r--test/drb/ut_array_drbssl.rb13
-rw-r--r--test/drb/ut_drb.rb3
-rw-r--r--test/drb/ut_drb_drbssl.rb13
-rw-r--r--test/drb/ut_eq.rb2
-rw-r--r--test/dtrace/dummy.rb1
-rw-r--r--test/dtrace/helper.rb40
-rw-r--r--test/dtrace/test_array_create.rb35
-rw-r--r--test/dtrace/test_cmethod.rb49
-rw-r--r--test/dtrace/test_function_entry.rb87
-rw-r--r--test/dtrace/test_gc.rb26
-rw-r--r--test/dtrace/test_hash_create.rb52
-rw-r--r--test/dtrace/test_load.rb52
-rw-r--r--test/dtrace/test_object_create_start.rb35
-rw-r--r--test/dtrace/test_raise.rb29
-rw-r--r--test/dtrace/test_require.rb34
-rw-r--r--test/dtrace/test_singleton_function.rb55
-rw-r--r--test/dtrace/test_string.rb27
-rw-r--r--test/erb/test_erb.rb62
-rw-r--r--test/etc/test_etc.rb38
-rw-r--r--test/fiddle/helper.rb25
-rw-r--r--test/fiddle/test_c_struct_entry.rb76
-rw-r--r--test/fiddle/test_c_union_entity.rb34
-rw-r--r--test/fiddle/test_closure.rb39
-rw-r--r--test/fiddle/test_cparser.rb35
-rw-r--r--test/fiddle/test_fiddle.rb23
-rw-r--r--test/fiddle/test_func.rb92
-rw-r--r--test/fiddle/test_function.rb12
-rw-r--r--test/fiddle/test_handle.rb196
-rw-r--r--test/fiddle/test_import.rb149
-rw-r--r--test/fiddle/test_pointer.rb238
-rw-r--r--test/fileutils/clobber.rb2
-rw-r--r--test/fileutils/fileasserts.rb85
-rw-r--r--test/fileutils/test_dryrun.rb20
-rw-r--r--test/fileutils/test_fileutils.rb157
-rw-r--r--test/fileutils/test_nowrite.rb21
-rw-r--r--test/fileutils/test_verbose.rb18
-rw-r--r--test/fileutils/visibility_tests.rb41
-rw-r--r--test/gdbm/test_gdbm.rb59
-rw-r--r--test/iconv/test_basic.rb59
-rw-r--r--test/iconv/test_option.rb43
-rw-r--r--test/iconv/test_partial.rb41
-rw-r--r--test/iconv/utils.rb26
-rw-r--r--test/io/console/test_io_console.rb294
-rw-r--r--test/io/nonblock/test_flush.rb1
-rw-r--r--test/io/wait/test_io_wait.rb50
-rw-r--r--test/irb/test_completion.rb22
-rw-r--r--test/json/fixtures/fail18.json2
-rw-r--r--test/json/setup_variant.rb11
-rwxr-xr-xtest/json/test_json.rb264
-rwxr-xr-xtest/json/test_json_addition.rb98
-rw-r--r--test/json/test_json_encoding.rb25
-rwxr-xr-xtest/json/test_json_fixtures.rb21
-rwxr-xr-xtest/json/test_json_generate.rb193
-rw-r--r--test/json/test_json_generic_object.rb60
-rwxr-xr-xtest/json/test_json_rails.rb152
-rw-r--r--test/json/test_json_string_matching.rb39
-rwxr-xr-xtest/json/test_json_unicode.rb10
-rw-r--r--test/logger/test_logger.rb40
-rw-r--r--test/matrix/test_matrix.rb1
-rw-r--r--test/matrix/test_vector.rb15
-rw-r--r--test/minitest/metametameta.rb74
-rw-r--r--test/minitest/test_mini_mock.rb89
-rw-r--r--test/minitest/test_mini_spec.rb172
-rw-r--r--test/minitest/test_mini_test.rb1040
-rw-r--r--test/minitest/test_minitest_benchmark.rb119
-rw-r--r--test/minitest/test_minitest_mock.rb377
-rw-r--r--test/minitest/test_minitest_spec.rb738
-rw-r--r--test/minitest/test_minitest_unit.rb1701
-rw-r--r--test/misc/test_ruby_mode.rb181
-rw-r--r--test/mkmf/base.rb125
-rw-r--r--test/mkmf/test_constant.rb37
-rw-r--r--test/mkmf/test_convertible.rb34
-rw-r--r--test/mkmf/test_find_executable.rb44
-rw-r--r--test/mkmf/test_flags.rb56
-rw-r--r--test/mkmf/test_framework.rb46
-rw-r--r--test/mkmf/test_have_func.rb14
-rw-r--r--test/mkmf/test_have_library.rb53
-rw-r--r--test/mkmf/test_have_macro.rb35
-rw-r--r--test/mkmf/test_libs.rb86
-rw-r--r--test/mkmf/test_signedness.rb29
-rw-r--r--test/mkmf/test_sizeof.rb39
-rw-r--r--test/net/ftp/test_buffered_socket.rb40
-rw-r--r--test/net/ftp/test_ftp.rb813
-rw-r--r--test/net/http/test_buffered_io.rb17
-rw-r--r--test/net/http/test_http.rb649
-rw-r--r--test/net/http/test_http_request.rb79
-rw-r--r--test/net/http/test_httpheader.rb27
-rw-r--r--test/net/http/test_httpresponse.rb285
-rw-r--r--test/net/http/test_httpresponses.rb24
-rw-r--r--test/net/http/test_https.rb49
-rw-r--r--test/net/http/test_https_proxy.rb6
-rw-r--r--test/net/http/utils.rb22
-rw-r--r--test/net/imap/Makefile15
-rw-r--r--test/net/imap/cacert.pem84
-rw-r--r--test/net/imap/server.crt65
-rw-r--r--test/net/imap/test_imap.rb148
-rw-r--r--test/net/imap/test_imap_response_parser.rb195
-rw-r--r--test/net/protocol/test_protocol.rb28
-rw-r--r--test/net/smtp/test_smtp.rb29
-rw-r--r--test/nkf/test_nkf.rb2
-rw-r--r--test/objspace/test_objspace.rb69
-rw-r--r--test/open-uri/test_open-uri.rb84
-rw-r--r--test/open-uri/test_ssl.rb43
-rw-r--r--test/openssl/test_asn1.rb410
-rw-r--r--test/openssl/test_bn.rb21
-rw-r--r--test/openssl/test_buffering.rb37
-rw-r--r--test/openssl/test_cipher.rb177
-rw-r--r--test/openssl/test_config.rb295
-rw-r--r--test/openssl/test_digest.rb50
-rw-r--r--test/openssl/test_ec.rb128
-rw-r--r--test/openssl/test_engine.rb75
-rw-r--r--test/openssl/test_fips.rb14
-rw-r--r--test/openssl/test_hmac.rb6
-rw-r--r--test/openssl/test_ns_spki.rb12
-rw-r--r--test/openssl/test_ocsp.rb47
-rw-r--r--test/openssl/test_pair.rb88
-rw-r--r--test/openssl/test_pkcs12.rb209
-rw-r--r--test/openssl/test_pkcs5.rb97
-rw-r--r--test/openssl/test_pkcs7.rb22
-rw-r--r--test/openssl/test_pkey_dh.rb82
-rw-r--r--test/openssl/test_pkey_dsa.rb112
-rw-r--r--test/openssl/test_pkey_ec.rb211
-rw-r--r--test/openssl/test_pkey_rsa.rb245
-rw-r--r--test/openssl/test_ssl.rb1023
-rw-r--r--test/openssl/test_ssl_session.rb367
-rw-r--r--test/openssl/test_x509cert.rb69
-rw-r--r--test/openssl/test_x509crl.rb16
-rw-r--r--test/openssl/test_x509ext.rb7
-rw-r--r--test/openssl/test_x509name.rb115
-rw-r--r--test/openssl/test_x509req.rb28
-rw-r--r--test/openssl/test_x509store.rb29
-rw-r--r--test/openssl/utils.rb200
-rw-r--r--test/optparse/test_acceptable.rb195
-rw-r--r--test/optparse/test_autoconf.rb63
-rw-r--r--test/optparse/test_bash_completion.rb42
-rw-r--r--test/optparse/test_getopts.rb4
-rw-r--r--test/optparse/test_summary.rb25
-rw-r--r--test/optparse/test_zsh_completion.rb22
-rw-r--r--test/ostruct/test_ostruct.rb66
-rw-r--r--test/pathname/test_pathname.rb139
-rw-r--r--test/profile_test_all.rb52
-rw-r--r--test/psych/handlers/test_recorder.rb25
-rw-r--r--test/psych/helper.rb11
-rw-r--r--test/psych/json/test_stream.rb109
-rw-r--r--test/psych/nodes/test_enumerable.rb43
-rw-r--r--test/psych/test_alias_and_anchor.rb72
-rw-r--r--test/psych/test_array.rb40
-rw-r--r--test/psych/test_boolean.rb2
-rw-r--r--test/psych/test_class.rb29
-rw-r--r--test/psych/test_coder.rb13
-rw-r--r--test/psych/test_date_time.rb8
-rw-r--r--test/psych/test_deprecated.rb4
-rw-r--r--test/psych/test_document.rb10
-rw-r--r--test/psych/test_emitter.rb9
-rw-r--r--test/psych/test_encoding.rb163
-rw-r--r--test/psych/test_engine_manager.rb12
-rw-r--r--test/psych/test_exception.rb115
-rw-r--r--test/psych/test_hash.rb16
-rw-r--r--test/psych/test_json_tree.rb13
-rw-r--r--test/psych/test_merge_keys.rb62
-rw-r--r--test/psych/test_nil.rb18
-rw-r--r--test/psych/test_null.rb4
-rw-r--r--test/psych/test_numeric.rb45
-rw-r--r--test/psych/test_object.rb19
-rw-r--r--test/psych/test_object_references.rb67
-rw-r--r--test/psych/test_omap.rb9
-rw-r--r--test/psych/test_parser.rb166
-rw-r--r--test/psych/test_psych.rb40
-rw-r--r--test/psych/test_scalar.rb2
-rw-r--r--test/psych/test_scalar_scanner.rb39
-rw-r--r--test/psych/test_serialize_subclasses.rb2
-rw-r--r--test/psych/test_set.rb2
-rw-r--r--test/psych/test_stream.rb93
-rw-r--r--test/psych/test_string.rb71
-rw-r--r--test/psych/test_struct.rb8
-rw-r--r--test/psych/test_symbol.rb2
-rw-r--r--test/psych/test_tainted.rb6
-rw-r--r--test/psych/test_to_yaml_properties.rb2
-rw-r--r--test/psych/test_tree_builder.rb2
-rw-r--r--test/psych/test_yaml.rb37
-rw-r--r--test/psych/test_yamldbm.rb197
-rw-r--r--test/psych/test_yamlstore.rb87
-rw-r--r--test/psych/visitors/test_depth_first.rb49
-rw-r--r--test/psych/visitors/test_emitter.rb38
-rw-r--r--test/psych/visitors/test_to_ruby.rb3
-rw-r--r--test/psych/visitors/test_yaml_tree.rb26
-rw-r--r--test/rake/capture_stdout.rb24
-rw-r--r--test/rake/check_expansion.rb5
-rw-r--r--test/rake/check_no_expansion.rb5
-rw-r--r--test/rake/contrib/test_ftp.rb55
-rw-r--r--test/rake/data/chains/Rakefile15
-rw-r--r--test/rake/data/default/Rakefile19
-rw-r--r--test/rake/data/dryrun/Rakefile22
-rw-r--r--test/rake/data/file_creation_task/Rakefile33
-rw-r--r--test/rake/data/imports/Rakefile19
-rw-r--r--test/rake/data/imports/deps.mf1
-rw-r--r--test/rake/data/multidesc/Rakefile17
-rw-r--r--test/rake/data/namespace/Rakefile57
-rw-r--r--test/rake/data/rakelib/test1.rake3
-rw-r--r--test/rake/data/rbext/rakefile.rb3
-rw-r--r--test/rake/data/sample.mf14
-rw-r--r--test/rake/data/statusreturn/Rakefile8
-rw-r--r--test/rake/data/unittest/Rakefile1
-rw-r--r--test/rake/data/unittest/subdir/.gitignore2
-rw-r--r--test/rake/file_creation.rb34
-rw-r--r--test/rake/filecreation.rb30
-rw-r--r--test/rake/helper.rb562
-rw-r--r--test/rake/in_environment.rb30
-rw-r--r--test/rake/rake_test_setup.rb9
-rw-r--r--test/rake/reqfile.rb3
-rw-r--r--test/rake/reqfile2.rb3
-rw-r--r--test/rake/reqfile3.rb3
-rwxr-xr-xtest/rake/shellcommand.rb3
-rw-r--r--test/rake/test_application.rb687
-rw-r--r--test/rake/test_clean.rb12
-rw-r--r--test/rake/test_definitions.rb81
-rw-r--r--test/rake/test_earlytime.rb33
-rw-r--r--test/rake/test_extension.rb61
-rw-r--r--test/rake/test_file_creation_task.rb60
-rw-r--r--test/rake/test_file_task.rb139
-rw-r--r--test/rake/test_filelist.rb625
-rw-r--r--test/rake/test_fileutils.rb262
-rw-r--r--test/rake/test_invocation_chain.rb75
-rw-r--r--test/rake/test_makefile_loader.rb24
-rw-r--r--test/rake/test_multitask.rb43
-rw-r--r--test/rake/test_namespace.rb44
-rw-r--r--test/rake/test_package_task.rb115
-rw-r--r--test/rake/test_pathmap.rb207
-rw-r--r--test/rake/test_private_reader.rb42
-rw-r--r--test/rake/test_pseudo_status.rb23
-rw-r--r--test/rake/test_rake.rb11
-rw-r--r--test/rake/test_rake_application.rb531
-rw-r--r--test/rake/test_rake_application_options.rb460
-rw-r--r--test/rake/test_rake_backtrace.rb89
-rw-r--r--test/rake/test_rake_clean.rb14
-rw-r--r--test/rake/test_rake_definitions.rb80
-rw-r--r--test/rake/test_rake_directory_task.rb57
-rw-r--r--test/rake/test_rake_dsl.rb77
-rw-r--r--test/rake/test_rake_early_time.rb31
-rw-r--r--test/rake/test_rake_extension.rb59
-rw-r--r--test/rake/test_rake_file_creation_task.rb56
-rw-r--r--test/rake/test_rake_file_list.rb628
-rw-r--r--test/rake/test_rake_file_list_path_map.rb8
-rw-r--r--test/rake/test_rake_file_task.rb122
-rw-r--r--test/rake/test_rake_file_utils.rb305
-rw-r--r--test/rake/test_rake_ftp_file.rb59
-rw-r--r--test/rake/test_rake_functional.rb496
-rw-r--r--test/rake/test_rake_invocation_chain.rb52
-rw-r--r--test/rake/test_rake_makefile_loader.rb44
-rw-r--r--test/rake/test_rake_multi_task.rb59
-rw-r--r--test/rake/test_rake_name_space.rb43
-rw-r--r--test/rake/test_rake_package_task.rb79
-rw-r--r--test/rake/test_rake_path_map.rb157
-rw-r--r--test/rake/test_rake_path_map_explode.rb34
-rw-r--r--test/rake/test_rake_path_map_partial.rb18
-rw-r--r--test/rake/test_rake_pseudo_status.rb21
-rw-r--r--test/rake/test_rake_rake_test_loader.rb21
-rw-r--r--test/rake/test_rake_rdoc_task.rb83
-rw-r--r--test/rake/test_rake_reduce_compat.rb65
-rw-r--r--test/rake/test_rake_require.rb40
-rw-r--r--test/rake/test_rake_rules.rb327
-rw-r--r--test/rake/test_rake_task.rb316
-rw-r--r--test/rake/test_rake_task_argument_parsing.rb103
-rw-r--r--test/rake/test_rake_task_arguments.rb88
-rw-r--r--test/rake/test_rake_task_lib.rb9
-rw-r--r--test/rake/test_rake_task_manager.rb157
-rw-r--r--test/rake/test_rake_task_manager_argument_resolution.rb36
-rw-r--r--test/rake/test_rake_task_with_arguments.rb181
-rw-r--r--test/rake/test_rake_test_task.rb120
-rw-r--r--test/rake/test_rake_thread_pool.rb123
-rw-r--r--test/rake/test_rake_top_level_functions.rb111
-rw-r--r--test/rake/test_rake_win32.rb72
-rw-r--r--test/rake/test_rdoc_task.rb84
-rw-r--r--test/rake/test_require.rb32
-rw-r--r--test/rake/test_rules.rb352
-rw-r--r--test/rake/test_sys.rb20
-rw-r--r--test/rake/test_task_arguments.rb92
-rw-r--r--test/rake/test_task_manager.rb181
-rw-r--r--test/rake/test_tasklib.rb10
-rw-r--r--test/rake/test_tasks.rb369
-rw-r--r--test/rake/test_test_task.rb81
-rw-r--r--test/rake/test_thread_history_display.rb91
-rw-r--r--test/rake/test_top_level_functions.rb91
-rw-r--r--test/rake/test_trace_output.rb43
-rw-r--r--test/rake/test_win32.rb45
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text21
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Auto links.text13
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text120
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text11
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Code Blocks.text14
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Code Spans.text6
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text8
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text67
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text15
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text69
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text13
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Links, inline style.text12
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Links, reference style.text71
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text20
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text7
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text306
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text888
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text5
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text131
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Strong and em together.text7
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Tabs.text21
-rw-r--r--test/rdoc/MarkdownTest_1.0.3/Tidyness.text5
-rw-r--r--test/rdoc/test.ja.large.rdoc3
-rw-r--r--test/rdoc/test.ja.largedoc3
-rw-r--r--test/rdoc/test.ja.rdoc2
-rw-r--r--test/rdoc/test_attribute_manager.rb81
-rw-r--r--test/rdoc/test_rdoc_alias.rb13
-rw-r--r--test/rdoc/test_rdoc_any_method.rb259
-rw-r--r--test/rdoc/test_rdoc_attr.rb166
-rw-r--r--test/rdoc/test_rdoc_class_module.rb1401
-rw-r--r--test/rdoc/test_rdoc_code_object.rb225
-rw-r--r--test/rdoc/test_rdoc_comment.rb504
-rw-r--r--test/rdoc/test_rdoc_constant.rb136
-rw-r--r--test/rdoc/test_rdoc_context.rb631
-rw-r--r--test/rdoc/test_rdoc_context_section.rb137
-rw-r--r--test/rdoc/test_rdoc_cross_reference.rb191
-rw-r--r--test/rdoc/test_rdoc_encoding.rb204
-rw-r--r--test/rdoc/test_rdoc_extend.rb94
-rw-r--r--test/rdoc/test_rdoc_generator_darkfish.rb187
-rw-r--r--test/rdoc/test_rdoc_generator_json_index.rb275
-rw-r--r--test/rdoc/test_rdoc_generator_markup.rb59
-rw-r--r--test/rdoc/test_rdoc_generator_ri.rb62
-rw-r--r--test/rdoc/test_rdoc_include.rb91
-rw-r--r--test/rdoc/test_rdoc_markdown.rb977
-rw-r--r--test/rdoc/test_rdoc_markdown_test.rb1891
-rw-r--r--test/rdoc/test_rdoc_markup.rb70
-rw-r--r--test/rdoc/test_rdoc_markup_attribute_manager.rb17
-rw-r--r--test/rdoc/test_rdoc_markup_attributes.rb39
-rw-r--r--test/rdoc/test_rdoc_markup_document.rb175
-rw-r--r--test/rdoc/test_rdoc_markup_formatter.rb149
-rw-r--r--test/rdoc/test_rdoc_markup_hard_break.rb31
-rw-r--r--test/rdoc/test_rdoc_markup_heading.rb20
-rw-r--r--test/rdoc/test_rdoc_markup_include.rb19
-rw-r--r--test/rdoc/test_rdoc_markup_indented_paragraph.rb53
-rw-r--r--test/rdoc/test_rdoc_markup_paragraph.rb33
-rw-r--r--test/rdoc/test_rdoc_markup_parser.rb680
-rw-r--r--test/rdoc/test_rdoc_markup_pre_process.rb430
-rw-r--r--test/rdoc/test_rdoc_markup_raw.rb14
-rw-r--r--test/rdoc/test_rdoc_markup_to_ansi.rb235
-rw-r--r--test/rdoc/test_rdoc_markup_to_bs.rb221
-rw-r--r--test/rdoc/test_rdoc_markup_to_html.rb465
-rw-r--r--test/rdoc/test_rdoc_markup_to_html_crossref.rb250
-rw-r--r--test/rdoc/test_rdoc_markup_to_html_snippet.rb710
-rw-r--r--test/rdoc/test_rdoc_markup_to_joined_paragraph.rb32
-rw-r--r--test/rdoc/test_rdoc_markup_to_label.rb112
-rw-r--r--test/rdoc/test_rdoc_markup_to_markdown.rb383
-rw-r--r--test/rdoc/test_rdoc_markup_to_rdoc.rb243
-rw-r--r--test/rdoc/test_rdoc_markup_to_table_of_contents.rb126
-rw-r--r--test/rdoc/test_rdoc_markup_to_tt_only.rb246
-rw-r--r--test/rdoc/test_rdoc_markup_verbatim.rb29
-rw-r--r--test/rdoc/test_rdoc_method_attr.rb155
-rw-r--r--test/rdoc/test_rdoc_normal_class.rb35
-rw-r--r--test/rdoc/test_rdoc_normal_module.rb15
-rw-r--r--test/rdoc/test_rdoc_options.rb601
-rw-r--r--test/rdoc/test_rdoc_parser.rb256
-rw-r--r--test/rdoc/test_rdoc_parser_c.rb1330
-rw-r--r--test/rdoc/test_rdoc_parser_changelog.rb322
-rw-r--r--test/rdoc/test_rdoc_parser_markdown.rb61
-rw-r--r--test/rdoc/test_rdoc_parser_perl.rb73
-rw-r--r--test/rdoc/test_rdoc_parser_rd.rb62
-rw-r--r--test/rdoc/test_rdoc_parser_ruby.rb2201
-rw-r--r--test/rdoc/test_rdoc_parser_simple.rb80
-rw-r--r--test/rdoc/test_rdoc_rd.rb30
-rw-r--r--test/rdoc/test_rdoc_rd_block_parser.rb541
-rw-r--r--test/rdoc/test_rdoc_rd_inline.rb63
-rw-r--r--test/rdoc/test_rdoc_rd_inline_parser.rb178
-rw-r--r--test/rdoc/test_rdoc_rdoc.rb336
-rw-r--r--test/rdoc/test_rdoc_ri_driver.rb847
-rw-r--r--test/rdoc/test_rdoc_ri_paths.rb150
-rw-r--r--test/rdoc/test_rdoc_ri_store.rb309
-rw-r--r--test/rdoc/test_rdoc_ruby_lex.rb291
-rw-r--r--test/rdoc/test_rdoc_ruby_token.rb19
-rw-r--r--test/rdoc/test_rdoc_rubygems_hook.rb254
-rw-r--r--test/rdoc/test_rdoc_servlet.rb467
-rw-r--r--test/rdoc/test_rdoc_single_class.rb12
-rw-r--r--test/rdoc/test_rdoc_stats.rb647
-rw-r--r--test/rdoc/test_rdoc_store.rb1001
-rw-r--r--test/rdoc/test_rdoc_task.rb68
-rw-r--r--test/rdoc/test_rdoc_text.rb450
-rw-r--r--test/rdoc/test_rdoc_token_stream.rb42
-rw-r--r--test/rdoc/test_rdoc_tom_doc.rb492
-rw-r--r--test/rdoc/test_rdoc_top_level.rb264
-rw-r--r--test/rdoc/xref_data.rb22
-rw-r--r--test/rdoc/xref_test_case.rb40
-rw-r--r--test/readline/test_readline.rb279
-rw-r--r--test/readline/test_readline_history.rb8
-rw-r--r--test/resolv/test_addr.rb13
-rw-r--r--test/resolv/test_dns.rb84
-rw-r--r--test/resolv/test_resource.rb21
-rw-r--r--test/rexml/data/euc.xml592
-rw-r--r--test/rexml/data/testsrc.xml128
-rw-r--r--test/rexml/data/ticket_61.xml8
-rw-r--r--test/rexml/data/xp.tst52
-rw-r--r--test/rexml/test_attributes.rb4
-rw-r--r--test/rexml/test_changing_encoding.rb4
-rw-r--r--test/rexml/test_comment.rb25
-rw-r--r--test/rexml/test_contrib.rb40
-rw-r--r--test/rexml/test_core.rb184
-rw-r--r--test/rexml/test_doctype.rb107
-rw-r--r--test/rexml/test_doctype_mixin.rb67
-rw-r--r--test/rexml/test_document.rb287
-rw-r--r--test/rexml/test_elements.rb32
-rw-r--r--test/rexml/test_encoding.rb28
-rw-r--r--test/rexml/test_encoding_2.rb2
-rw-r--r--test/rexml/test_entity.rb45
-rw-r--r--test/rexml/test_functions.rb2
-rw-r--r--test/rexml/test_functions_number.rb64
-rw-r--r--test/rexml/test_jaxen.rb252
-rw-r--r--test/rexml/test_light.rb12
-rw-r--r--test/rexml/test_lightparser.rb2
-rw-r--r--test/rexml/test_listener.rb6
-rw-r--r--test/rexml/test_namespace.rb38
-rw-r--r--test/rexml/test_notationdecl_mixin.rb6
-rw-r--r--test/rexml/test_notationdecl_parsetest.rb2
-rw-r--r--test/rexml/test_order.rb9
-rw-r--r--test/rexml/test_pullparser.rb12
-rw-r--r--test/rexml/test_sax.rb15
-rw-r--r--test/rexml/test_stream.rb8
-rw-r--r--test/rexml/test_validation_rng.rb6
-rw-r--r--test/rexml/test_xml_declaration.rb34
-rw-r--r--test/rexml/test_xml_declaration_parent_child.rb33
-rw-r--r--test/rexml/test_xpath.rb114
-rw-r--r--test/rexml/test_xpath_attribute_query.rb28
-rw-r--r--test/rexml/test_xpath_msw.rb76
-rw-r--r--test/rexml/test_xpath_pred.rb6
-rw-r--r--test/rexml/test_xpathtext.rb2
-rw-r--r--test/rinda/test_rinda.rb147
-rw-r--r--test/ripper/dummyparser.rb2
-rw-r--r--test/ripper/test_files.rb23
-rw-r--r--test/ripper/test_parser_events.rb114
-rw-r--r--test/ripper/test_ripper.rb49
-rw-r--r--test/ripper/test_scanner_events.rb166
-rw-r--r--test/rss/rss-assertions.rb2
-rw-r--r--test/rss/rss-testcase.rb2
-rw-r--r--test/rss/test_1.0.rb59
-rw-r--r--test/rss/test_2.0.rb59
-rw-r--r--test/rss/test_atom.rb34
-rw-r--r--test/rss/test_dublincore.rb22
-rw-r--r--test/rss/test_maker_2.0.rb8
-rw-r--r--test/rss/test_parser.rb10
-rw-r--r--test/ruby/enc/test_euc_jp.rb2
-rw-r--r--test/ruby/enc/test_euc_kr.rb8
-rw-r--r--test/ruby/enc/test_shift_jis.rb4
-rw-r--r--test/ruby/enc/test_utf16.rb2
-rw-r--r--test/ruby/enc/test_utf32.rb2
-rw-r--r--test/ruby/envutil.rb438
-rw-r--r--test/ruby/lbtest.rb9
-rw-r--r--test/ruby/marshaltestlib.rb47
-rw-r--r--test/ruby/memory_status.rb127
-rw-r--r--test/ruby/test_alias.rb88
-rw-r--r--test/ruby/test_argf.rb150
-rw-r--r--test/ruby/test_arity.rb71
-rw-r--r--test/ruby/test_array.rb358
-rw-r--r--test/ruby/test_autoload.rb149
-rw-r--r--test/ruby/test_backtrace.rb187
-rw-r--r--test/ruby/test_basicinstructions.rb26
-rw-r--r--test/ruby/test_beginendblock.rb62
-rw-r--r--test/ruby/test_bignum.rb318
-rw-r--r--test/ruby/test_call.rb16
-rw-r--r--test/ruby/test_case.rb19
-rw-r--r--test/ruby/test_class.rb136
-rw-r--r--test/ruby/test_comparable.rb14
-rw-r--r--test/ruby/test_complex.rb64
-rw-r--r--test/ruby/test_complex2.rb2
-rw-r--r--test/ruby/test_complexrational.rb4
-rw-r--r--test/ruby/test_const.rb18
-rw-r--r--test/ruby/test_continuation.rb54
-rw-r--r--test/ruby/test_defined.rb123
-rw-r--r--test/ruby/test_dir.rb29
-rw-r--r--test/ruby/test_dir_m17n.rb138
-rw-r--r--test/ruby/test_econv.rb66
-rw-r--r--test/ruby/test_encoding.rb28
-rw-r--r--test/ruby/test_enum.rb38
-rw-r--r--test/ruby/test_enumerator.rb219
-rw-r--r--test/ruby/test_env.rb160
-rw-r--r--test/ruby/test_eval.rb226
-rw-r--r--test/ruby/test_exception.rb320
-rw-r--r--test/ruby/test_fiber.rb169
-rw-r--r--test/ruby/test_file.rb184
-rw-r--r--test/ruby/test_file_exhaustive.rb428
-rw-r--r--test/ruby/test_fixnum.rb69
-rw-r--r--test/ruby/test_flip.rb42
-rw-r--r--test/ruby/test_float.rb190
-rw-r--r--test/ruby/test_fnmatch.rb26
-rw-r--r--test/ruby/test_gc.rb136
-rw-r--r--test/ruby/test_hash.rb317
-rw-r--r--test/ruby/test_ifunless.rb14
-rw-r--r--test/ruby/test_integer.rb43
-rw-r--r--test/ruby/test_io.rb1682
-rw-r--r--test/ruby/test_io_m17n.rb487
-rw-r--r--test/ruby/test_iseq.rb95
-rw-r--r--test/ruby/test_iterator.rb34
-rw-r--r--test/ruby/test_keyword.rb377
-rw-r--r--test/ruby/test_lambda.rb54
-rw-r--r--test/ruby/test_lazy_enumerator.rb487
-rw-r--r--test/ruby/test_literal.rb189
-rw-r--r--test/ruby/test_m17n.rb205
-rw-r--r--test/ruby/test_m17n_comb.rb112
-rw-r--r--test/ruby/test_marshal.rb140
-rw-r--r--test/ruby/test_math.rb5
-rw-r--r--test/ruby/test_method.rb217
-rw-r--r--test/ruby/test_module.rb960
-rw-r--r--test/ruby/test_not.rb12
-rw-r--r--test/ruby/test_notimp.rb4
-rw-r--r--test/ruby/test_numeric.rb119
-rw-r--r--test/ruby/test_object.rb345
-rw-r--r--test/ruby/test_objectspace.rb27
-rw-r--r--test/ruby/test_optimization.rb42
-rw-r--r--test/ruby/test_pack.rb202
-rw-r--r--test/ruby/test_parse.rb163
-rw-r--r--test/ruby/test_path.rb17
-rw-r--r--test/ruby/test_pipe.rb13
-rw-r--r--test/ruby/test_proc.rb448
-rw-r--r--test/ruby/test_process.rb524
-rw-r--r--test/ruby/test_rand.rb133
-rw-r--r--test/ruby/test_range.rb202
-rw-r--r--test/ruby/test_rational.rb61
-rw-r--r--test/ruby/test_refinement.rb1207
-rw-r--r--test/ruby/test_regexp.rb203
-rw-r--r--test/ruby/test_require.rb379
-rw-r--r--test/ruby/test_rubyoptions.rb264
-rw-r--r--test/ruby/test_settracefunc.rb970
-rw-r--r--test/ruby/test_signal.rb108
-rw-r--r--test/ruby/test_sleep.rb4
-rw-r--r--test/ruby/test_sprintf.rb106
-rw-r--r--test/ruby/test_sprintf_comb.rb46
-rw-r--r--test/ruby/test_string.rb352
-rw-r--r--test/ruby/test_stringchar.rb32
-rw-r--r--test/ruby/test_struct.rb181
-rw-r--r--test/ruby/test_super.rb377
-rw-r--r--test/ruby/test_symbol.rb71
-rw-r--r--test/ruby/test_syntax.rb347
-rw-r--r--test/ruby/test_system.rb80
-rw-r--r--test/ruby/test_thread.rb795
-rw-r--r--test/ruby/test_threadgroup.rb55
-rw-r--r--test/ruby/test_time.rb544
-rw-r--r--test/ruby/test_time_tz.rb332
-rw-r--r--test/ruby/test_transcode.rb141
-rw-r--r--test/ruby/test_unicode_escape.rb4
-rw-r--r--test/ruby/test_variable.rb11
-rw-r--r--test/ruby/test_whileuntil.rb3
-rw-r--r--test/ruby/test_yield.rb11
-rw-r--r--test/rubygems/alternate_cert.pem18
-rw-r--r--test/rubygems/alternate_cert_32.pem18
-rw-r--r--test/rubygems/alternate_key.pem27
-rw-r--r--test/rubygems/bad_rake.rb1
-rw-r--r--test/rubygems/child_cert.pem18
-rw-r--r--test/rubygems/child_cert_32.pem18
-rw-r--r--test/rubygems/child_key.pem27
-rw-r--r--test/rubygems/data/null-type.gemspec.rzbin554 -> 0 bytes-rw-r--r--test/rubygems/expired_cert.pem18
-rw-r--r--test/rubygems/fix_openssl_warnings.rb12
-rw-r--r--test/rubygems/functional.rb92
-rw-r--r--test/rubygems/future_cert.pem18
-rw-r--r--test/rubygems/future_cert_32.pem18
-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.rb588
-rw-r--r--test/rubygems/good_rake.rb1
-rw-r--r--test/rubygems/grandchild_cert.pem18
-rw-r--r--test/rubygems/grandchild_cert_32.pem18
-rw-r--r--test/rubygems/grandchild_key.pem27
-rw-r--r--test/rubygems/invalid_issuer_cert.pem18
-rw-r--r--test/rubygems/invalid_issuer_cert_32.pem18
-rw-r--r--test/rubygems/invalid_key.pem27
-rw-r--r--test/rubygems/invalid_signer_cert.pem18
-rw-r--r--test/rubygems/invalid_signer_cert_32.pem18
-rw-r--r--test/rubygems/invalidchild_cert.pem18
-rw-r--r--test/rubygems/invalidchild_cert_32.pem18
-rw-r--r--test/rubygems/invalidchild_key.pem27
-rw-r--r--test/rubygems/mockgemui.rb56
-rw-r--r--test/rubygems/plugin/exception/rubygems_plugin.rb2
-rw-r--r--test/rubygems/plugin/load/rubygems_plugin.rb4
-rw-r--r--test/rubygems/plugin/standarderror/rubygems_plugin.rb2
-rw-r--r--test/rubygems/private_key.pem50
-rw-r--r--test/rubygems/public_cert.pem34
-rw-r--r--test/rubygems/public_cert_32.pem18
-rw-r--r--test/rubygems/public_key.pem9
-rw-r--r--test/rubygems/rubygems/commands/crash_command.rb2
-rw-r--r--test/rubygems/sff/discover.rb0
-rw-r--r--test/rubygems/simple_gem.rb4
-rw-r--r--test/rubygems/test_bundled_ca.rb59
-rw-r--r--test/rubygems/test_config.rb10
-rw-r--r--test/rubygems/test_deprecate.rb76
-rw-r--r--test/rubygems/test_gem.rb1327
-rw-r--r--test/rubygems/test_gem_activation.rb21
-rw-r--r--test/rubygems/test_gem_available_set.rb106
-rw-r--r--test/rubygems/test_gem_builder.rb27
-rw-r--r--test/rubygems/test_gem_command.rb16
-rw-r--r--test/rubygems/test_gem_command_manager.rb94
-rw-r--r--test/rubygems/test_gem_commands_build_command.rb62
-rw-r--r--test/rubygems/test_gem_commands_cert_command.rb494
-rw-r--r--test/rubygems/test_gem_commands_check_command.rb54
-rw-r--r--test/rubygems/test_gem_commands_cleanup_command.rb152
-rw-r--r--test/rubygems/test_gem_commands_contents_command.rb78
-rw-r--r--test/rubygems/test_gem_commands_dependency_command.rb53
-rw-r--r--test/rubygems/test_gem_commands_environment_command.rb15
-rw-r--r--test/rubygems/test_gem_commands_fetch_command.rb79
-rw-r--r--test/rubygems/test_gem_commands_generate_index_command.rb93
-rw-r--r--test/rubygems/test_gem_commands_help_command.rb64
-rw-r--r--test/rubygems/test_gem_commands_install_command.rb824
-rw-r--r--test/rubygems/test_gem_commands_list_command.rb9
-rw-r--r--test/rubygems/test_gem_commands_lock_command.rb6
-rw-r--r--test/rubygems/test_gem_commands_mirror.rb32
-rw-r--r--test/rubygems/test_gem_commands_mirror_command.rb60
-rw-r--r--test/rubygems/test_gem_commands_outdated_command.rb28
-rw-r--r--test/rubygems/test_gem_commands_owner_command.rb84
-rw-r--r--test/rubygems/test_gem_commands_pristine_command.rb234
-rw-r--r--test/rubygems/test_gem_commands_push_command.rb165
-rw-r--r--test/rubygems/test_gem_commands_query_command.rb238
-rw-r--r--test/rubygems/test_gem_commands_search_command.rb17
-rw-r--r--test/rubygems/test_gem_commands_server_command.rb4
-rw-r--r--test/rubygems/test_gem_commands_setup_command.rb129
-rw-r--r--test/rubygems/test_gem_commands_sources_command.rb101
-rw-r--r--test/rubygems/test_gem_commands_specification_command.rb168
-rw-r--r--test/rubygems/test_gem_commands_stale_command.rb18
-rw-r--r--test/rubygems/test_gem_commands_uninstall_command.rb144
-rw-r--r--test/rubygems/test_gem_commands_unpack_command.rb97
-rw-r--r--test/rubygems/test_gem_commands_update_command.rb306
-rw-r--r--test/rubygems/test_gem_commands_which_command.rb39
-rw-r--r--test/rubygems/test_gem_commands_yank_command.rb97
-rw-r--r--test/rubygems/test_gem_config_file.rb200
-rw-r--r--test/rubygems/test_gem_dependency.rb132
-rw-r--r--test/rubygems/test_gem_dependency_installer.rb783
-rw-r--r--test/rubygems/test_gem_dependency_list.rb93
-rw-r--r--test/rubygems/test_gem_dependency_resolver.rb327
-rw-r--r--test/rubygems/test_gem_dependency_resolver_api_set.rb80
-rw-r--r--test/rubygems/test_gem_doc_manager.rb31
-rw-r--r--test/rubygems/test_gem_doctor.rb168
-rw-r--r--test/rubygems/test_gem_ext_builder.rb60
-rw-r--r--test/rubygems/test_gem_ext_cmake_builder.rb90
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb16
-rw-r--r--test/rubygems/test_gem_ext_ext_conf_builder.rb119
-rw-r--r--test/rubygems/test_gem_ext_rake_builder.rb45
-rw-r--r--test/rubygems/test_gem_format.rb70
-rw-r--r--test/rubygems/test_gem_gem_path_searcher.rb78
-rw-r--r--test/rubygems/test_gem_gem_runner.rb35
-rw-r--r--test/rubygems/test_gem_gemcutter_utilities.rb140
-rw-r--r--test/rubygems/test_gem_indexer.rb494
-rw-r--r--test/rubygems/test_gem_install_update_options.rb103
-rw-r--r--test/rubygems/test_gem_installer.rb1049
-rw-r--r--test/rubygems/test_gem_local_remote_options.rb29
-rw-r--r--test/rubygems/test_gem_name_tuple.rb15
-rw-r--r--test/rubygems/test_gem_package.rb636
-rw-r--r--test/rubygems/test_gem_package_old.rb81
-rw-r--r--test/rubygems/test_gem_package_tar_header.rb4
-rw-r--r--test/rubygems/test_gem_package_tar_input.rb112
-rw-r--r--test/rubygems/test_gem_package_tar_output.rb97
-rw-r--r--test/rubygems/test_gem_package_tar_reader.rb36
-rw-r--r--test/rubygems/test_gem_package_tar_reader_entry.rb14
-rw-r--r--test/rubygems/test_gem_package_tar_writer.rb87
-rw-r--r--test/rubygems/test_gem_package_task.rb42
-rw-r--r--test/rubygems/test_gem_path_support.rb67
-rw-r--r--test/rubygems/test_gem_platform.rb94
-rw-r--r--test/rubygems/test_gem_rdoc.rb269
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb505
-rw-r--r--test/rubygems/test_gem_request_set.rb70
-rw-r--r--test/rubygems/test_gem_requirement.rb100
-rw-r--r--test/rubygems/test_gem_security.rb250
-rw-r--r--test/rubygems/test_gem_security_policy.rb488
-rw-r--r--test/rubygems/test_gem_security_signer.rb190
-rw-r--r--test/rubygems/test_gem_security_trust_dir.rb94
-rw-r--r--test/rubygems/test_gem_server.rb285
-rw-r--r--test/rubygems/test_gem_silent_ui.rb111
-rw-r--r--test/rubygems/test_gem_source.rb198
-rw-r--r--test/rubygems/test_gem_source_index.rb461
-rw-r--r--test/rubygems/test_gem_source_list.rb87
-rw-r--r--test/rubygems/test_gem_source_local.rb83
-rw-r--r--test/rubygems/test_gem_source_specific_file.rb33
-rw-r--r--test/rubygems/test_gem_spec_fetcher.rb414
-rw-r--r--test/rubygems/test_gem_specification.rb1221
-rw-r--r--test/rubygems/test_gem_stream_ui.rb120
-rw-r--r--test/rubygems/test_gem_text.rb58
-rw-r--r--test/rubygems/test_gem_uninstaller.rb331
-rw-r--r--test/rubygems/test_gem_validator.rb61
-rw-r--r--test/rubygems/test_gem_version.rb87
-rw-r--r--test/rubygems/test_gem_version_option.rb4
-rw-r--r--test/rubygems/test_kernel.rb20
-rw-r--r--test/rubygems/test_require.rb215
-rw-r--r--test/rubygems/wrong_key_cert.pem18
-rw-r--r--test/rubygems/wrong_key_cert_32.pem18
-rw-r--r--test/runner.rb32
-rw-r--r--test/scanf/test_scanf.rb17
-rw-r--r--test/socket/test_addrinfo.rb41
-rw-r--r--test/socket/test_socket.rb225
-rw-r--r--test/socket/test_unix.rb126
-rw-r--r--test/stringio/test_stringio.rb88
-rw-r--r--test/strscan/test_stringscanner.rb12
-rw-r--r--test/syck/test_array.rb18
-rw-r--r--test/syck/test_boolean.rb37
-rw-r--r--test/syck/test_class.rb18
-rw-r--r--test/syck/test_engine_manager.rb3
-rw-r--r--test/syck/test_exception.rb46
-rw-r--r--test/syck/test_hash.rb29
-rw-r--r--test/syck/test_null.rb20
-rw-r--r--test/syck/test_omap.rb56
-rw-r--r--test/syck/test_set.rb31
-rw-r--r--test/syck/test_string.rb45
-rw-r--r--test/syck/test_struct.rb42
-rw-r--r--test/syck/test_symbol.rb22
-rw-r--r--test/syck/test_yaml.rb1413
-rw-r--r--test/syck/test_yaml_properties.rb64
-rw-r--r--test/syck/test_yamlstore.rb76
-rw-r--r--test/syslog/test_syslog_logger.rb522
-rw-r--r--test/test_abbrev.rb54
-rw-r--r--test/test_cmath.rb16
-rw-r--r--test/test_curses.rb63
-rw-r--r--test/test_delegate.rb7
-rw-r--r--test/test_mathn.rb106
-rw-r--r--test/test_mutex_m.rb26
-rw-r--r--test/test_pp.rb5
-rw-r--r--test/test_prime.rb2
-rw-r--r--test/test_pstore.rb42
-rw-r--r--test/test_pty.rb93
-rw-r--r--test/test_rbconfig.rb53
-rw-r--r--test/test_securerandom.rb185
-rw-r--r--test/test_set.rb641
-rw-r--r--test/test_shellwords.rb22
-rw-r--r--test/test_syslog.rb29
-rw-r--r--test/test_tempfile.rb31
-rw-r--r--test/test_time.rb10
-rw-r--r--test/test_timeout.rb12
-rw-r--r--test/test_tmpdir.rb33
-rw-r--r--test/test_tracer.rb51
-rw-r--r--test/test_weakref.rb56
-rw-r--r--test/testunit/test4test_hideskip.rb7
-rw-r--r--test/testunit/test4test_redefinition.rb11
-rw-r--r--test/testunit/test4test_sorting.rb15
-rw-r--r--test/testunit/test_hideskip.rb27
-rw-r--r--test/testunit/test_parallel.rb190
-rw-r--r--test/testunit/test_rake_integration.rb35
-rw-r--r--test/testunit/test_redefinition.rb13
-rw-r--r--test/testunit/test_sorting.rb17
-rw-r--r--test/testunit/tests_for_parallel/ptest_first.rb7
-rw-r--r--test/testunit/tests_for_parallel/ptest_forth.rb29
-rw-r--r--test/testunit/tests_for_parallel/ptest_second.rb11
-rw-r--r--test/testunit/tests_for_parallel/ptest_third.rb10
-rw-r--r--test/testunit/tests_for_parallel/runner.rb10
-rw-r--r--test/thread/test_cv.rb191
-rw-r--r--test/thread/test_queue.rb142
-rw-r--r--test/thread/test_sync.rb57
-rw-r--r--test/uri/test_common.rb23
-rw-r--r--test/uri/test_ftp.rb4
-rw-r--r--test/uri/test_generic.rb105
-rw-r--r--test/uri/test_http.rb1
-rw-r--r--test/uri/test_ldap.rb2
-rw-r--r--test/uri/test_mailto.rb10
-rw-r--r--test/webrick/test_cgi.rb15
-rw-r--r--test/webrick/test_cookie.rb27
-rw-r--r--test/webrick/test_filehandler.rb23
-rw-r--r--test/webrick/test_htmlutils.rb20
-rw-r--r--test/webrick/test_httpauth.rb87
-rw-r--r--test/webrick/test_httpproxy.rb11
-rw-r--r--test/webrick/test_httprequest.rb42
-rw-r--r--test/webrick/test_httpresponse.rb49
-rw-r--r--test/webrick/test_httpserver.rb115
-rw-r--r--test/webrick/test_httputils.rb4
-rw-r--r--test/webrick/test_server.rb34
-rw-r--r--test/webrick/utils.rb8
-rw-r--r--test/win32ole/test_err_in_callback.rb41
-rw-r--r--test/win32ole/test_folderitem2_invokeverb.rb64
-rw-r--r--test/win32ole/test_thread.rb25
-rw-r--r--test/win32ole/test_win32ole.rb11
-rw-r--r--test/win32ole/test_win32ole_event.rb12
-rw-r--r--test/win32ole/test_win32ole_method.rb2
-rw-r--r--test/win32ole/test_win32ole_type.rb2
-rw-r--r--test/win32ole/test_win32ole_variant.rb57
-rw-r--r--test/win32ole/test_win32ole_variant_outarg.rb13
-rw-r--r--test/with_different_ofs.rb17
-rw-r--r--test/xmlrpc/data/blog.xml18
-rw-r--r--test/xmlrpc/htpasswd2
-rw-r--r--test/xmlrpc/test_client.rb293
-rw-r--r--test/xmlrpc/test_marshal.rb1
-rw-r--r--test/xmlrpc/test_parser.rb6
-rw-r--r--test/xmlrpc/test_webrick_server.rb44
-rw-r--r--test/xmlrpc/webrick_testing.rb10
-rw-r--r--test/zlib/test_zlib.rb630
-rw-r--r--thread.c3022
-rw-r--r--thread_pthread.c1084
-rw-r--r--thread_pthread.h33
-rw-r--r--thread_win32.c434
-rw-r--r--thread_win32.h16
-rw-r--r--time.c951
-rwxr-xr-x[-rw-r--r--]tool/asm_parse.rb6
-rwxr-xr-xtool/change_maker.rb32
-rwxr-xr-x[-rw-r--r--]tool/compile_prelude.rb10
-rwxr-xr-xtool/config.guess425
-rwxr-xr-xtool/config.sub209
-rwxr-xr-xtool/enc-unicode.rb143
-rwxr-xr-x[-rw-r--r--]tool/eval.rb2
-rwxr-xr-xtool/file2lastrev.rb106
-rwxr-xr-xtool/gen_dummy_probes.rb30
-rwxr-xr-x[-rw-r--r--]tool/generic_erb.rb8
-rwxr-xr-xtool/id2token.rb24
-rw-r--r--tool/install-sh2
-rwxr-xr-xtool/instruction.rb120
-rwxr-xr-xtool/make-snapshot65
-rwxr-xr-xtool/mdoc2man.rb6
-rwxr-xr-xtool/merger.rb242
-rwxr-xr-xtool/mkconfig.rb106
-rwxr-xr-xtool/mkrunnable.rb96
-rwxr-xr-xtool/node_name.rb8
-rwxr-xr-x[-rw-r--r--]tool/parse.rb0
-rwxr-xr-xtool/rbinstall.rb324
-rwxr-xr-xtool/rmdirs2
-rwxr-xr-xtool/rubytest.rb5
-rwxr-xr-xtool/runruby.rb20
-rwxr-xr-xtool/strip-rdoc.rb2
-rwxr-xr-x[-rw-r--r--]tool/transcode-tblgen.rb41
-rwxr-xr-xtool/update-deps139
-rw-r--r--tool/vcs.rb114
-rw-r--r--tool/vpath.rb82
-rwxr-xr-x[-rw-r--r--]tool/vtlh.rb0
-rw-r--r--transcode.c536
-rw-r--r--transcode_data.h22
-rw-r--r--util.c432
-rw-r--r--variable.c1030
-rw-r--r--version.c73
-rw-r--r--version.h21
-rw-r--r--vm.c1334
-rw-r--r--vm_backtrace.c1206
-rw-r--r--vm_core.h618
-rw-r--r--vm_debug.h41
-rw-r--r--vm_dump.c598
-rw-r--r--vm_eval.c991
-rw-r--r--vm_exec.c57
-rw-r--r--vm_exec.h33
-rw-r--r--vm_insnhelper.c2854
-rw-r--r--vm_insnhelper.h150
-rw-r--r--vm_method.c741
-rw-r--r--vm_opts.h9
-rw-r--r--vm_trace.c1351
-rw-r--r--vsnprintf.c181
-rw-r--r--win32/Makefile.sub444
-rw-r--r--win32/README.win3228
-rwxr-xr-xwin32/configure.bat73
-rw-r--r--win32/dir.h16
-rw-r--r--win32/file.c717
-rwxr-xr-xwin32/makedirs.bat3
-rwxr-xr-xwin32/mkexports.rb25
-rwxr-xr-xwin32/rm.bat5
-rwxr-xr-xwin32/rmall.bat6
-rw-r--r--win32/rtname.cmd18
-rw-r--r--win32/setup.mak138
-rw-r--r--win32/stub.c42
-rw-r--r--win32/win32.c2486
2649 files changed, 228634 insertions, 583366 deletions
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000000..76c9bc0b78
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,52 @@
+*.bak
+*.orig
+*.rej
+*.sav
+*~
+.*.list
+.*.time
+.ccmalloc
+.ppack
+.ext
+.git
+.svn
+.pc
+COPYING.LIB
+ChangeLog.pre-alpha
+ChangeLog.pre1_1
+ChangeLog-1.8.0
+Makefile
+README.fat-patch
+README.v6
+README.atheos
+archive
+autom4te*.cache
+automake
+beos
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+libruby.so.*
+miniruby
+newdate.rb
+newver.rb
+parse.c
+patches
+patches-master
+pitest.rb
+ppack
+preview
+rbconfig.rb
+rename2.h
+repack
+riscos
+rubicon
+ruby
+ruby-man.rd.gz
+tmp
+web
+y.output
+y.tab.c
diff --git a/.document b/.document
index 9a5067bc52..8a05d61beb 100644
--- a/.document
+++ b/.document
@@ -10,19 +10,13 @@
prelude.rb
# the lib/ directory (which has its own .document file)
+
lib
+
# and some of the ext/ directory (which has its own .document file)
+
ext
# rdoc files
-ChangeLog
-
-NEWS
-
-README
-README.EXT
-README.EXT.ja
-README.ja
-
-doc
+doc/*.rdoc
diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 67abf4b978..0000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-tab_width = 8
-indent_style = tab
-indent_size = 4
-
-[**.bat]
-end_of_line = crlf
-
-[**.rb]
-indent_style = space
-indent_size = 2
diff --git a/.gdbinit b/.gdbinit
index c8705a6ccf..2a38da8892 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -89,11 +89,7 @@ define rp
echo undef\n
else
if (VALUE)($arg0) & RUBY_IMMEDIATE_MASK
- if ((VALUE)($arg0) & RUBY_FLONUM_MASK) == RUBY_FLONUM_FLAG
- printf "FLONUM: %g\n", (double)rb_float_value($arg0)
- else
- echo immediate\n
- end
+ echo immediate\n
else
set $flags = ((struct RBasic*)($arg0))->flags
if ($flags & RUBY_T_MASK) == RUBY_T_NONE
@@ -110,15 +106,15 @@ define rp
else
if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
printf "T_CLASS%s: ", ($flags & RUBY_FL_SINGLETON) ? "*" : ""
- rp_class $arg0
+ print (struct RClass *)($arg0)
else
if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
printf "T_ICLASS: "
- rp_class $arg0
+ print (struct RClass *)($arg0)
else
if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
printf "T_MODULE: "
- rp_class $arg0
+ print (struct RClass *)($arg0)
else
if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
printf "T_FLOAT: %.16g ", (((struct RFloat*)($arg0))->float_value)
@@ -341,19 +337,6 @@ document rp
Print a Ruby's VALUE.
end
-define rp_class
- printf "(struct RClass *) %p", (void*)$arg0
- if ((struct RClass *)($arg0))->ptr.origin != $arg0
- printf " -> %p", ((struct RClass *)($arg0))->ptr.origin
- end
- printf "\n"
- print *(struct RClass *)($arg0)
- print *((struct RClass *)($arg0))->ptr
-end
-document rp_class
- Print the content of a Class/Module.
-end
-
define nd_type
print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
end
@@ -642,18 +625,18 @@ define rb_numtable_entry
set $rb_numtable_key = 0
set $rb_numtable_rec = 0
if $rb_numtable_tbl->entries_packed
- set $rb_numtable_p = $rb_numtable_tbl->as.packed.bins
- while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->as.packed.bins+$rb_numtable_tbl->num_entries
- if $rb_numtable_p.k == $rb_numtable_id
- set $rb_numtable_key = $rb_numtable_p.k
- set $rb_numtable_rec = $rb_numtable_p.v
+ set $rb_numtable_p = $rb_numtable_tbl->bins
+ while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->bins+$rb_numtable_tbl->num_entries
+ if (st_data_t)$rb_numtable_p[0] == $rb_numtable_id
+ set $rb_numtable_key = (st_data_t)$rb_numtable_p[0]
+ set $rb_numtable_rec = (st_data_t)$rb_numtable_p[1]
set $rb_numtable_p = 0
else
- set $rb_numtable_p = $rb_numtable_p + 1
+ set $rb_numtable_p = $rb_numtable_p + 2
end
end
else
- set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[$rb_numtable_id % $rb_numtable_tbl->num_bins]
+ set $rb_numtable_p = $rb_numtable_tbl->bins[$rb_numtable_id % $rb_numtable_tbl->num_bins]
while $rb_numtable_p
if $rb_numtable_p->key == $rb_numtable_id
set $rb_numtable_key = $rb_numtable_p->key
@@ -706,23 +689,12 @@ define rb_classname
print *(struct RClass*)($arg0)
end
-define rb_ancestors
- set $rb_ancestors_module = $arg0
- while $rb_ancestors_module
- rp $rb_ancestors_module
- set $rb_ancestors_module = ((struct RClass *)($rb_ancestors_module))->ptr.super
- end
-end
-document rb_ancestors
- Print ancestors.
-end
-
define rb_backtrace
call rb_backtrace()
end
define iseq
- if ruby_dummy_gdb_enums.special_consts
+ if dummy_gdb_enums.special_consts
end
if ($arg0)->type == ISEQ_ELEMENT_NONE
echo [none]\n
@@ -759,8 +731,8 @@ define rb_ps_vm
if $ps_threads->entries_packed
set $ps_threads_i = 0
while $ps_threads_i < $ps_threads->num_entries
- set $ps_threads_key = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].key
- set $ps_threads_val = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].val
+ set $ps_threads_key = (st_data_t)$ps_threads->bins[$ps_threads_i * 2]
+ set $ps_threads_val = (st_data_t)$ps_threads->bins[$ps_threads_i * 2 + 1]
rb_ps_thread $ps_threads_key $ps_threads_val
set $ps_threads_i = $ps_threads_i + 1
end
@@ -783,20 +755,3 @@ define rb_ps_thread
set $ps_thread_id = $arg1
print $ps_thread_th = (rb_thread_t*)$ps_thread->data
end
-
-# Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
-define trace_machine_instructions
- set logging on
- set height 0
- set width 0
- display/i $pc
- while !$exit_code
- info line *$pc
- si
- end
-end
-
-define SDR
- call rb_vmdebug_stack_dump_raw_current()
-end
-
diff --git a/.gitignore b/.gitignore
index 5808bf1082..3212d4a1f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,7 @@
-*-*-*.def
-*.a
+# /
*.bak
-*.dSYM
-*.dmyh
*.dylib
-*.elc
*.inc
-*.log
*.o
*.orig
*.rej
@@ -22,13 +17,7 @@
.pc
.ppack
.svn
-Makefile
-extconf.h
-y.output
-y.tab.c
-
-# /
-/*.pc
+/.git
/*_prelude.c
/COPYING.LIB
/ChangeLog-1.8.0
@@ -36,6 +25,7 @@ y.tab.c
/ChangeLog.pre1_1
/Doxyfile
/GNUmakefile
+/Makefile
/README.atheos
/README.fat-patch
/README.v6
@@ -48,15 +38,16 @@ y.tab.c
/config.cache
/config.h
/config.h.in
+/config.log
/config.status
/config.status.lineno
/configure
-/doc/capi
/enc.mk
+/enc/trans/*.c
/encdb.h
-/exts.mk
+/ext/win32ole/.document
/goruby
-/id.[ch]
+/id.h
/largefile.h
/lex.c
/libruby*.*
@@ -73,7 +64,6 @@ y.tab.c
/ppack
/prelude.c
/preview
-/probes.h
/rbconfig.rb
/rename2.h
/repack
@@ -86,8 +76,9 @@ y.tab.c
/tmp
/transdb.h
/uncommon.mk
-/verconf.h
/web
+/y.output
+/y.tab.c
/yasmdata.rb
# /benchmark/
@@ -98,30 +89,338 @@ y.tab.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/fiddle/
+/ext/fiddle/Makefile
+/ext/fiddle/extconf.h
+/ext/fiddle/mkmf.log
+/ext/fiddle/fiddle.a
+
+# /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/nonblock/
+/ext/io/nonblock/Makefile
+/ext/io/nonblock/extconf.h
+/ext/io/nonblock/mkmf.log
+/ext/io/nonblock/nonblock.a
+
+# /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/psych/
+/ext/psych/Makefile
+/ext/psych/extconf.h
+/ext/psych/mkmf.log
+/ext/psych/psych.a
+
+# /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/tmpdir/
+/ext/tmpdir/Makefile
+/ext/tmpdir/extconf.h
+/ext/tmpdir/mkmf.log
+/ext/tmpdir/tmpdir.a
# /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
-/win32/.time
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index db25c9eb08..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) 2011 Urabe, Shyouhei. All rights reserved.
-#
-# This file is a part of the programming language Ruby. Permission is hereby
-# granted, to either redistribute or modify this file, provided that the
-# conditions mentioned in the file COPYING are met. Consult the file for
-# details.
-
-# This is a Travis-CI build configuration file. The list of configurations
-# available is located in
-#
-# http://about.travis-ci.org/docs/user/build-configuration/
-#
-# and as Ruby itself is a project written in C language,
-#
-# http://about.travis-ci.org/docs/user/languages/c/
-#
-# is also a good place to look at.
-
-# Language specification.
-language: c
-
-# Compilers. Several compilers are provided in Travis, so we try them all.
-# The value set here is visible via $CC environment variable.
-compiler:
- - gcc
- - clang
-
-# Dependencies. Some header files are missing in a Travis' worker VM, so we
-# have to install them. The "1.9.1" here is OK. It is the most adopted
-# version string for Debian/Ubuntu, and no dependencies have been changed so
-# far since the 1.9.1 release.
-before_install:
- - "sudo apt-get -qq update"
- - "sudo apt-get -qq install $CC" # upgrade if any
-install: "sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null"
-
-# Script is where the test runs. Note we just do "make test", not other tests
-# like test-all, test-rubyspec. This is because they take too much time,
-# enough for Travis to shut down the VM as being stalled.
-before_script:
- - "autoconf"
- - "./configure --with-gcc=$CC"
- - "make -sj encs"
- - "make -sj exts"
-script: "make test OPTS=-v"
-
-# Branch matrix. Not all branches are Travis-ready so we limit branches here.
-branches:
- only:
- - trunk
- - ruby_1_9_3
-
-# We want to be notified when something happens.
-notifications:
- irc:
- channels:
- - "irc.freenode.org#ruby-core"
- - "irc.freenode.org#ruby-ja"
- on_success: change # [always|never|change] # default: always
- on_failure: change # [always|never|change] # default: always
- template:
- - "%{message} by @%{author}: See %{build_url}"
-
-# Local Variables:
-# mode: YAML
-# coding: utf-8-unix
-# indent-tabs-mode: nil
-# tab-width: 4
-# fill-column: 79
-# default-justification: full
-# End:
diff --git a/BSDL b/BSDL
deleted file mode 100644
index a009caefea..0000000000
--- a/BSDL
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (C) 1993-2013 Yukihiro Matsumoto. 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.
diff --git a/COPYING b/COPYING
index a1f19ff99d..9043404a83 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the
-2-clause BSDL (see the file BSDL), or the conditions below:
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
1. You may make and give away verbatim copies of the source form of the
software without restriction, provided that you duplicate all of the
diff --git a/COPYING.ja b/COPYING.ja
index e50d01c8d1..aa2a163848 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,51 +1,51 @@
-本プログラムã¯ãƒ•リーソフトウェアã§ã™ï¼Ž2-clause BSDL
-ã¾ãŸã¯ä»¥ä¸‹ã«ç¤ºã™æ¡ä»¶ã§æœ¬ãƒ—ログラムをå†é…布ã§ãã¾ã™
-2-clause BSDLã«ã¤ã„ã¦ã¯BSDLファイルをå‚ç…§ã—ã¦ä¸‹ã•ã„.
+$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
- 1. 複製ã¯åˆ¶é™ãªã自由ã§ã™ï¼Ž
+ 1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
- 2. ä»¥ä¸‹ã®æ¡ä»¶ã®ã„ãšã‚Œã‹ã‚’満ãŸã™æ™‚ã«æœ¬ãƒ—ログラムã®ã‚½ãƒ¼ã‚¹ã‚’
- 自由ã«å¤‰æ›´ã§ãã¾ã™ï¼Ž
+ 2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
+ $B<+M3$KJQ99$G$-$^$9!%(B
- (a) ãƒãƒƒãƒˆãƒ‹ãƒ¥ãƒ¼ã‚ºã«ãƒã‚¹ãƒˆã—ãŸã‚Šï¼Œä½œè€…ã«å¤‰æ›´ã‚’é€ä»˜ã™ã‚‹
- ãªã©ã®æ–¹æ³•ã§ï¼Œå¤‰æ›´ã‚’公開ã™ã‚‹ï¼Ž
+ (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
+ $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
- (b) 変更ã—ãŸæœ¬ãƒ—ãƒ­ã‚°ãƒ©ãƒ ã‚’è‡ªåˆ†ã®æ‰€å±žã™ã‚‹çµ„織内部ã ã‘ã§
- 使ã†ï¼Ž
+ (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
+ $B;H$&!%(B
- (c) 変更点を明示ã—ãŸã†ãˆï¼Œã‚½ãƒ•トウェアã®åå‰ã‚’変更ã™ã‚‹ï¼Ž
- ãã®ã‚½ãƒ•トウェアをé…布ã™ã‚‹æ™‚ã«ã¯å¤‰æ›´å‰ã®æœ¬ãƒ—ログラ
- ãƒ ã‚‚åŒæ™‚ã«é…布ã™ã‚‹ï¼Žã¾ãŸã¯å¤‰æ›´å‰ã®æœ¬ãƒ—ログラムã®ã‚½ãƒ¼
- スã®å…¥æ‰‹æ³•を明示ã™ã‚‹ï¼Ž
+ (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
+ $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
+ $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
+ $B%9$NF~<jK!$rL@<($9$k!%(B
- (d) ãã®ä»–ã®å¤‰æ›´æ¡ä»¶ã‚’作者ã¨åˆæ„ã™ã‚‹ï¼Ž
+ (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
- 3. ä»¥ä¸‹ã®æ¡ä»¶ã®ã„ãšã‚Œã‹ã‚’満ãŸã™æ™‚ã«æœ¬ãƒ—ログラムをコンパイ
- ルã—ãŸã‚ªãƒ–ジェクトコードや実行形å¼ã§ã‚‚é…布ã§ãã¾ã™ï¼Ž
+ 3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
+ $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
- (a) ãƒã‚¤ãƒŠãƒªã‚’å—ã‘å–ã£ãŸäººãŒã‚½ãƒ¼ã‚¹ã‚’入手ã§ãるよã†ã«ï¼Œ
- ソースã®å…¥æ‰‹æ³•を明示ã™ã‚‹ï¼Ž
+ (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
+ $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
- (b) 機械å¯èª­ãªã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’添付ã™ã‚‹ï¼Ž
+ (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
- (c) 変更を行ã£ãŸãƒã‚¤ãƒŠãƒªã¯åå‰ã‚’変更ã—ãŸã†ãˆï¼Œã‚ªãƒªã‚¸ãƒŠ
- ルã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã®å…¥æ‰‹æ³•を明示ã™ã‚‹ï¼Ž
+ (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
+ $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
- (d) ãã®ä»–ã®é…布æ¡ä»¶ã‚’作者ã¨åˆæ„ã™ã‚‹ï¼Ž
+ (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
- 4. ä»–ã®ãƒ—ログラムã¸ã®å¼•用ã¯ã„ã‹ãªã‚‹ç›®çš„ã§ã‚れ自由ã§ã™ï¼ŽãŸ
- ã ã—,本プログラムã«å«ã¾ã‚Œã‚‹ä»–ã®ä½œè€…ã«ã‚ˆã‚‹ã‚³ãƒ¼ãƒ‰ã¯ï¼Œã
- れãžã‚Œã®ä½œè€…ã®æ„å‘ã«ã‚ˆã‚‹åˆ¶é™ãŒåŠ ãˆã‚‰ã‚Œã‚‹å ´åˆãŒã‚りã¾ã™ï¼Ž
+ 4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
+ $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
+ $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
- ãれらファイルã®ä¸€è¦§ã¨ãれãžã‚Œã®é…布æ¡ä»¶ãªã©ã«ä»˜ã„ã¦ã¯
- LEGALファイルをå‚ç…§ã—ã¦ãã ã•ã„.
+ $B$=$l$i%U%!%$%k$N0lMw$H$=$l$>$l$NG[I[>r7o$J$I$KIU$$$F$O(B
+ LEGAL$B%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
- 5. 本プログラムã¸ã®å…¥åŠ›ã¨ãªã‚‹ã‚¹ã‚¯ãƒªãƒ—トãŠã‚ˆã³ï¼Œæœ¬ãƒ—ログラ
- ムã‹ã‚‰ã®å‡ºåŠ›ã®æ¨©åˆ©ã¯æœ¬ãƒ—ログラムã®ä½œè€…ã§ã¯ãªã,ãれãž
- れã®å…¥å‡ºåŠ›ã‚’ç”Ÿæˆã—ãŸäººã«å±žã—ã¾ã™ï¼Žã¾ãŸï¼Œæœ¬ãƒ—ログラムã«
- 組ã¿è¾¼ã¾ã‚Œã‚‹ãŸã‚ã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã«ã¤ã„ã¦ã‚‚åŒæ§˜ã§ã™ï¼Ž
+ 5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
+ $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
+ $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
+ $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
- 6. 本プログラムã¯ç„¡ä¿è¨¼ã§ã™ï¼Žä½œè€…ã¯æœ¬ãƒ—ログラムをサãƒãƒ¼ãƒˆ
- ã™ã‚‹æ„å¿—ã¯ã‚りã¾ã™ãŒï¼Œãƒ—ログラム自身ã®ãƒã‚°ã‚ã‚‹ã„ã¯æœ¬ãƒ—
- ログラムã®å®Ÿè¡Œãªã©ã‹ã‚‰ç™ºç”Ÿã™ã‚‹ã„ã‹ãªã‚‹æå®³ã«å¯¾ã—ã¦ã‚‚責
- 任をæŒã¡ã¾ã›ã‚“.
+ 6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
+ $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
+ $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
+ $BG$$r;}$A$^$;$s!%(B
diff --git a/ChangeLog b/ChangeLog
index 305d1be2ff..04ef3ebb63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,28559 +1,81135 @@
-Tue Aug 18 22:00:12 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+Fri Jul 22 21:18:20 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
+
+ * lib/uri/generic.rb (URI.decode_www_form_component): ditto.
+
+Fri Nov 22 12:43:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * util.c (ruby_strtod): ignore too long fraction part, which does not
+ affect the result.
+
+Mon Apr 15 14:57:43 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json/parser/parser.rl (json_string_unescape): workaround fix
+ for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862
+
+Mon Apr 15 10:56:55 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
+ reserving a memory space with ALLOCA_N for restoring machine stack
+ stored in cont->machine_stack, but clang optimized out it (and
+ maybe #5851 is also caused by this).
+ This affected TestContinuation#test_check_localvars.
+
+ * cont.c (cont_restore_1): revert workaround introduced in r32201.
+
+Tue May 22 11:09:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (ruby_init_loadpath_safe): use real path for non-shared
+ build.
+
+ * configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
+
+ * tool/rbinstall.rb (bin-comm): prepend prolog shell script if
+ necessary.
+
+ * ruby.c (ruby_init_loadpath_safe): relatively called non-shared
+ binary cannot be found in PATH, so use given pathname.
+
+Mon May 21 16:27:24 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
+ module before calling rb_class2name().
+
+Fri May 18 18:13:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
+ OUTFLAG and COUTFLAG. [ruby-dev:45650]
+
+Fri May 11 14:09:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
+ must not cast it to unsigned long, which may be shorter than
+ VALUE, and the result can be mere garbage.
+
+Fri Apr 20 12:40:19 2012 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem: Removed to avoid
+ conflict with ca-bundle.pem
+ * lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
+ ditto.
+ * lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
+ ditto.
+
+Fri Apr 20 09:04:35 2012 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems: Apply the following security fixes to RubyGems 1.3.7:
+
+ RubyGems now disallows redirection from HTTPS to HTTP.
+
+ RubyGems now verifies SSL connections.
+
+ Patch by Hiroshi Nakamura.
+
+ * test/rubygems: ditto.
+
+Thu Jun 3 05:37:46 2010 Ryan Davis <ryand-ruby@zenspider.com>
+
+ * tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs.
+ Fixes rvm and multiruby installations.
+
+Thu Oct 27 09:57:56 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
+ patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]
+
+Tue Feb 14 00:00:19 2012 okkez <okkez000@gmail.com>
+
+ * thread_pthread.c (rb_thread_create_timer_thread): fix memory
+ leak. [ruby-dev:44904] [Bug #5688]
+
+Fri Feb 9 02:11:19 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+
+ * backport r34482 from trunk
+
+ * ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL
+ option to prevent BEAST attack. See [Bug #5353].
+
+ In OpenSSL, OP_DONT_INSERT_EMPTY_FRAGMENTS is used to prevent
+ TLS-CBC-IV vulunerability described at
+ http://www.openssl.org/~bodo/tls-cbc.txt
+ It's known issue of TLSv1/SSLv3 but it attracts lots of attention
+ these days as BEAST attack. (CVE-2011-3389)
+
+ Until now ossl sets OP_ALL at SSLContext allocation and call
+ SSL_CTX_set_options at connection. SSL_CTX_set_options updates the
+ value by using |= so bits set by OP_ALL cannot be unset afterwards.
+ This commit changes to call SSL_CTX_set_options only 1 time for each
+ SSLContext. It sets the specified value if SSLContext#options= are
+ called and sets OP_ALL if not.
+
+ To help users to unset bits in OP_ALL, this commit also adds several
+ constant to SSL such as
+ OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS. These constants were
+ not exposed in Ruby because there's no way to unset bits in OP_ALL
+ before.
+
+ Following is an example to enable 0/n split for BEAST prevention.
+
+ ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS
+
+ * test/openssl/test_ssl.rb: Test above option exists.
+
+Fri Jul 1 11:41:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (tr_trans): free heap ptr when the str is not embeded.
+ patched by Eric Wong. [Bug #4956] [ruby-core:37708]
+
+Fri Jul 1 08:21:28 2011 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (vm_getivar): check vm state version
+ to invalidate inline chache (ivar index).
+ fixes Bug #4926.
+
+ * vm_insnhelper.c (vm_setivar): ditto.
+
+Wed Feb 1 09:50:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * doc/re.rdoc (Repetition): fix typo. reported by Ori Avtalion
+ and patched by Zachary Scott. [Bug #5947]
+
+Tue Jan 24 11:38:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/common.rb (URI.encode_www_form_component): initialize on
+ requiring to support JRuby, which runs parallel multithreads.
+ [ruby-core:42222] [Bug #5925]
+
+ * lib/uri/common.rb (URI.decode_www_form_component): initialize on
+
+Mon Jan 16 16:41:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (Regexp): fix incorrect options when casting to
+ a Regexp, and suppress encoding option warnings.
+ https://github.com/ruby/ruby/pull/82
+
+Wed Dec 28 11:22:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
+ instead of typoed regexp. [ruby-core:41829] [Bug #5817]
+
+Fri Jul 1 06:41:36 2011 Koichi Sasada <ko1@atdot.net>
+
+ * thread.c (rb_threadptr_check_signal): only wake up main thread.
+
+ * thread.c (rb_threadptr_execute_interrupts_common): check signal
+ deliverly if it is main thread.
+ fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
+
+ * bootstraptest/test_fork.rb: add a test for above.
+
+ * signal.c (rb_get_next_signal): skip if signal_buff is empty.
+ (check signal_buff.size first)
+
+ * vm_core.h: remove unused variable rb_thread_t::exec_signal.
+
+ * thread.c (rb_thread_check_trap_pending): check
+ rb_signal_buff_size() because rb_thread_t::exec_signal
+ is no longer available.
+
+Fri Jul 1 03:28:25 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * class.c (Init_class_hierarchy): should name BasicObject
+ explicitly.
+
+ * variable.c (rb_const_defined_0): should not check for
+ superclasses as const_get.
+
+Thu Jun 30 22:17:04 2011 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
+ for methods defined by define_method(). fixes Bug #4613.
+
+ * thread.c (call_trace_proc): Fix to skip if class is not given (0).
+ Note that ID and Class object are passed for call/return event
+ if the called method was defined by define_method().
+ If you are author of tracer/profiler/debugger, this may be an
+ important change. You should check passed class as zero or
+ non-zero instead of checking the event type.
+
+ * test/ruby/test_settracefunc.rb: add a test for above.
+
+Thu Jun 30 21:18:35 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * configure.in: Add warnflags for XL/C on AIX during configure
+ to avoid [Bug #3971]. See [ruby-core:32859]
+
+Thu Jun 30 20:12:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
+
+Thu Jun 30 12:25:34 2011 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.c (rb_thread_create_timer_thread): allocate
+ machine stack for the timer thread at least 12KB. FreeBSD 8.2
+ AMD64 causes machine stack overflow (SIGSEGV) only with
+ PTHREAD_STACK_MIN (maybe defined as 2KB).
+
+Thu Jun 30 01:31:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (thread_s_pass): change RDoc description and remove
+ a sample code. The actual implementaion never behave as explained by
+ an example. It's a documentation bug.
+
+Thu Jun 30 00:54:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_thread_stop): change RDoc sample code. The old
+ example is buggy and may cause deadlock. The patch is
+ suggested by Heesob Park <phasis@gmail.com>. Thank you!
+ [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:49:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_thread_wakeup): change RDoc sample code. The old
+ example is buggy and may not display anything by a race.
+ The patch is suggested by Heesob Parrk <phasis@gmail.com>.
+ Thank you! [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:43:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_thread_run): change RDoc. The old example is buggy
+ and may cause deadlock. The patch is suggested by Heesob Park
+ <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
+
+Thu Jun 30 00:03:20 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+ * lib/irb/completion.rb: complate correctry string literal. fix
+ [Bug #1145].
+
+Wed Jun 29 23:17:57 2011 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+
+Wed Jun 29 13:55:36 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (rb_const_get_0): should not look for superclasses if
+ the second optional argument is given for #const_get().
+ fix [Bug #3422] [Bug #3423]
+
+Tue Jun 28 21:44:58 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+ * lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
+
+Tue Jun 28 20:39:29 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+
+ * lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!).
+ global_variables, local_variables, and instance_variables returns
+ Symbols from 1.9 and need to stringify before evaling it.
+ See #4931.
+
+Tue Jun 28 07:50:32 2011 Eric Hodel <drbrain@segment7.net>
+
+ * object.c (Init_Object): Teach RDoc what Init_class_hierarchy does to
+ hook up ri for BasicObject, Object, Module and Class.
+
+Tue Jun 28 01:19:52 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+ * lib/irb/ruby-lex.rb: fix [Bug #4232].
+
+Tue Jun 28 00:14:13 2011 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
+
+ * test/drb/test_drb.rb: ditto.
+
+ * test/drb/drbtest.rb: ditto.
+
+ * test/drb/ut_eq.rb: ditto.
+
+Tue Jun 28 00:08:43 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+ * lib/irb/workspace.rb: fix BUG#4793.
+
+Mon Jun 27 01:34:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
+ start with + sign, which means NIS. these are returned in the
+ case that passwd and group entries in /etc/nsswitch.conf are set
+ to use "nis" explicitly on Debian. fixed #3683
+
+Mon Jun 27 00:44:53 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * parse.y (rb_parser_end_seen_p): fix documentation about return
+ value. patched by Sho Hashimoto. [Bug #4511]
+
+Wed Jun 1 06:43:13 2011 Masaya Tarui <tarui@ruby-lang.org>
- * lib/rubygems.rb: bump version to 2.0.14.1. this version fixed
- CVE-2015-3900.
+ * load.c (loaded_feature_path): cut nonsence loop execution to fix
+ performance bug.
- * lib/rubygems/remote_fetcher.rb: ditto.
+Sat Jun 25 23:45:30 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900
+ * vm_insnhelper.c (vm_search_superclass): avoid control frame
+ stack overrun. currently super() in Proc created in a method
+ defined by Module#define_method raise NoMethodError. [Bug #4881]
+ * test/ruby/test_method.rb t_super_in_proc_from_define_method):
+ add test for it.
+
+Thu Jun 23 19:30:53 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+
+ * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
+ argument type with NUM2LONG if the arg is not a Time object.
+ See #4919.
+
+ * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_timeout): Check
+ type with NUM2LONG. Time as an arg is not allowed. See #4919.
+
+ * test/openssl/test_ssl_session.rb (test_session_time,
+ test_session_timeout): Test it.
+
+Fri Jun 24 19:57:30 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+
+ * lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
+ header failed when the request is from 2 or more Apache reverse
+ proxies. It's said that all X-Forwarded-* headers will contain more
+ than one (comma-separated) value if the original request already
+ contained one of these headers. Since we could use these values as
+ Host header, we choose the initial(first) value. See #4922.
+
+ * test/webrick/test_httprequest.rb (test_forwarded): Test it.
+
+Sat Jul 9 19:25:02 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * ext/tk/extconf.rb: I gave up to fix the build issue of ext/tk with Windows
+ installer (mingw32). Ported whole ext/tk/extconf.rb from trunk.
+
+Mon Jul 4 00:28:05 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * ext/tk/extconf.rb (find_tcl): fixed a TypeError on --with-opt-dir.
+ reported by luislavena and ksmakoto.
+
+Sun Jul 3 22:40:37 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * ext/zlib/zlib.c: added a prototype to get rid of SEGV on x86_64
+ darwin.
+ Reported by kosaki and nagachika. Patch by nagachika.
+
+Sun Jul 3 21:02:05 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * ext/socket/extconf.rb (have_type("PADDRINFO")): new check.
+
+ * ext/socket/addrinfo.h: fixed a compilation problem with VC++ 2010.
+
+Wed Jun 29 23:09:14 2011 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
+
+Sun Jun 12 16:19:48 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
+
+Thu Jun 2 00:45:26 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: fix for uninitialized global variables.
+ [Ruby 1.9 - Bug #4811]
-Tue Jun 2 00:10:14 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jun 7 13:36:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/resolv.rb (Requester#request): typo, regression introduced at
- r49422 (patchlevel 618). reported and patched by Stefan Kolb
- [ruby-core:69429] [Backport #11204]
+ * ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
+ command line escape issues on Windows. fixed #4835.
-Mon Apr 13 22:11:42 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Jun 13 23:38:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/lib/openssl/ssl.rb: stricter hostname verification
- following RFC 6125. with the patch provided by Tony Arcieri and
- Hiroshi Nakamura [ruby-core:61545] [Bug #9644]
- * test/openssl/test_ssl.rb: add tests for above.
+ * parse.y (parser_parse_string): flush delayed token. based on a
+ patch by Masaya Tarui in [ruby-dev:43762]. Bug #4544
-Tue Mar 24 16:38:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+ * parse.y (yylex): revert r24557. delayed token at the end of
+ string should be flushed already by the above change.
- * spec/default.mspec: use default configuration file name.
- https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
+Mon Jun 13 23:38:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Mar 24 16:38:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+ * parse.y (parser_parse_string): flush delayed token. based on a
+ patch by Masaya Tarui in [ruby-dev:43762]. Bug #4544
- * spec/default.mspec: remove specific version number.
- https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
+ * parse.y (yylex): revert r24557. delayed token at the end of
+ string should be flushed already by the above change.
-Tue Mar 24 16:38:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Mon Jun 13 23:05:01 2011 Tanaka Akira <akr@fsij.org>
- * common.mk: use ruby organization for rubyspec.
+ * ext/socket/unixsocket.c (unix_send_io): race condition fixed.
+ (unix_recv_io): ditto.
+ fixed by Eric Wong. [ruby-core:35574]
-Wed Feb 25 17:30:10 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+ * test/socket/test_unix.rb: test added for above problem.
- * class.c (clone_method): fixed missing assignment introduced by
- previous commit.
+Thu May 12 12:24:22 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- * vm_insnhelper.c (rb_vm_rewrite_cref_stack): ditto.
+ * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
+ However, the problem is not revised in this.
+ This adds the control of using function of SSLv2 in made macro by function check.
-Wed Feb 25 15:07:01 2015 Kazuki Tsujimoto <kazuki@callcc.net>
+Mon Jun 13 18:33:04 2011 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements
- of original crefs. It fixes segmentation fault when calling
- refined method in duplicate module. [ruby-dev:48878] [Bug #10885]
+ * lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
+ to prevent random number sequence repeatation at forked child
+ process which has same pid.
+ reported by Eric Wong. [ruby-core:35765]
- * vm_core.h, class.c: change accordingly.
+Sat Jun 11 18:02:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: add a test for above.
+ * io.c (io_getc): should be 7bit if ascii. fixes #4557
-Wed Feb 25 14:53:27 2015 Shugo Maeda <shugo@ruby-lang.org>
+Sat Jun 11 16:28:25 2011 Kouhei Sutou <kou@cozmixng.org>
- * class.c (method_entry_i, class_instance_method_list,
- rb_obj_singleton_methods): should not include methods of
- superclasses if recur is false. [ruby-dev:48854] [Bug #10826]
+ * lib/rexml/formatters/pretty.rb
+ (REXML::Formatters::Pretty#write_text),
+ test/rexml/test_core.rb
+ (Tester#test_pretty_format_long_text_finite): don't ignore
+ 'width' parameter in pretty formatter. fixes #4498
+ Reported by Michael Frasca. Thanks!!!
-Wed Feb 25 14:53:27 2015 Shugo Maeda <shugo@ruby-lang.org>
+Sat Jun 11 16:04:03 2011 Kouhei Sutou <kou@cozmixng.org>
- * vm_method.c (remove_method): When remove refined
- method, raise a NameError if the method is not
- defined in refined class.
+ * lib/rexml/parsers/xpathparser.rb
+ (REXML::Parsers::XPathParser#parse),
+ test/rexml/test_elements.rb
+ (ElementsTester#test_each_with_frozen_condition):
+ don't modify original XPath. fixes #4164
+ Reported by Pavel Shved. Thanks!!!
+
+Sat Jun 11 16:04:03 2011 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rexml/parsers/xpathparser.rb
+ (REXML::Parsers::XPathParser#parse),
+ test/rexml/test_elements.rb
+ (ElementsTester::test_each_with_frozen_condition):
+ don't modify original XPath. fixes #4164
+ Reported by Pavel Shved. Thanks!!!
+
+Mon Jun 6 09:39:43 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/parser.c (parse): release event objects to plug memory
+ leak. Thanks Mark J. Titorenko!
+
+Tue Dec 21 00:46:20 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (thread_cleanup_func): Don't touch native threading
+ resource at fork. Sadly this is purely bandaid. We need to
+ implement proper fix later. [Bug #4169] [ruby-core:33767]
+
+Tue May 24 07:06:34 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g.
+ /usr/lib64) and bug fix.
+
+Mon Jun 6 07:08:54 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/drb/ut_array.rb: uses 'druby://localhost:0' instead of nil
+ as well as test/drb/ut_drb.rb. This fixes the same problem as
+ [ruby-dev:23078].
+
+ * test/drb/ut_array_drbssl.rb: ditto.
+
+Fri May 27 08:35:04 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
+
+Tue May 24 07:06:34 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on
+ some environment (reported on [ruby-talk:381444]).
+
+Sat Jan 22 11:49:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
+ when multiple merge keys are specified.
+
+ * test/psych/test_merge_keys.rb: tests for multi-merge key support
- But if the method is defined in refined class,
- it should keep refined method and remove original
- method.
-
- Patch by Seiei Higa. [ruby-core:67722] [Bug #10765]
+Sat Jan 22 11:33:04 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-Wed Feb 25 14:41:01 2015 Seiei Higa <hanachin@gmail.com>
+ * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
+ part of YAML 1.1, so they should be supported. Remove warning and
+ merge keys to parent. [ruby-core:34679]
- * vm_method.c (check_definition): Module#public_method_defined?,
- Module#private_method_defined?, Module#protected_method_defined?
- should not use refinements. [ruby-core:67656] [Bug #10753]
+ * test/psych/test_merge_keys.rb: test for merge keys
-Wed Feb 25 14:29:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jul 15 00:35:09 2010 Tanaka Akira <akr@fsij.org>
- * ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a
- macro `DEBUG` is defined. based on the patch by Owen Rodley in
- [ruby-core:67987]. [Bug #10825]
+ * time.c (localtime_with_gmtoff_zone): renamed from
+ localtime_with_gmtoff and return the timezone abbreviation name.
+ (guess_local_offset): return the isdst and timezone abbreviation name.
+ (localtimew): use the returned isdst and timezone abbreviation name.
+ [ruby-core:31275]
-Wed Feb 25 14:22:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 22 14:22:45 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
- interference by modifying global variables in have_devel? method.
- [ruby-core:67962] [Bug #10821]
+ * time.c (time_zone): use rb_locale_str_new_cstr to set encoding
+ as locale and convert its content to internal encoding.
+ [ruby-core:33278]
-Wed Feb 25 14:19:35 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Fri Jan 14 14:01:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * thread.c: Improve documentation for Thread#value
- [Bug #10694][ruby-core:67324][ci skip]
+ * pack.c (pack_unpack): the resulted string of unpack('M') must have
+ ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
-Wed Feb 25 14:18:26 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Sat Dec 25 20:01:40 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * string.c: [DOC] Add missing documentation around String#chomp.
- Patchby @stderr [ci skip][fix GH-780]
+ * io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
+ GVL at new process creation.
-Sat Feb 21 09:48:48 2015 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Feb 5 10:09:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/uri/generic.rb (URI::Generic.build):
- use hostname= to detect and wrap IPv6 hosts.
- Build is accepting URI components and users may not expect
- that a host component needs to be wrapped with square brackets
- since it's not providing a URI.
- Note: initialize with arg_check => true does not wrap IPv6 hosts.
- by Joe Rafaniello <jrafanie@redhat.com>
- https://github.com/ruby/ruby/pull/765 fix GH-765
+ * load.c (rb_get_expanded_load_path): always expand load paths.
- * test/uri/test_generic.rb: Add more tests
+Tue Jul 6 22:57:21 2010 Tanaka Akira <akr@fsij.org>
-Wed Feb 18 16:02:30 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly
+ to avoid select() on a socket which TCP state is CLOSED.
+ patch by Eric Wong. [ruby-core:31053]
- * lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
- returned by Kernel#instance_variables are Symbols now.
- [ruby-core:68128] [Bug #10857]
+Mon May 30 15:44:16 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Feb 17 17:37:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * insns.def (opt_mult): as r31805, volatile it.
+ Without this, clang -O fails calculation.
- * ext/socket/getaddrinfo.c (get_addr): reject too long hostname to
- get rid of GHOST vulnerability on very old platforms.
+ * numeric.c (fix_mul): ditto.
- * ext/socket/raddrinfo.c (make_hostent_internal): ditto, paranoic
- check for the canonical name.
+ * rational.c (f_imul): ditto.
-Fri Jan 30 16:49:15 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon May 30 10:26:51 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * object.c: [DOC] Revise documentation by Marcus Stollsteimer at
- [ruby-core:66368]. [Bug #10526]
+ * numeric.c (int_pow): make sure to assign the result of x * z.
+ If xz is optimized out, the value won't overflow.
- * #inspect: be more specific about generated string, remove
- obsolete example.
- * #nil?: use code examples instead of different call-seq's.
- * #tap: clarify what is yielded.
- * Integer(): be more specific about to_int and to_i, remove
- reference to Ruby 1.8.
- * Array(): fix error.
- * Class: fix variable name style and indentation in example.
- * improve consistency, fix typos and formatting.
+Sun May 29 15:09:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 30 16:49:15 2015 Benoit Daloze <eregontp@gmail.com>
+ * numeric.c (flo_round): fix for negative value.
- * object.c (Module#const_defined?): [DOC] Revise the documentation.
- Patch by Xavier Noria.
- [Fixes GH-754] https://github.com/ruby/ruby/pull/754
+Sat May 28 03:04:27 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Jan 30 16:49:15 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+ * io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
- * object.c: fix document of Kernel.Stirng by @suzukaze
- [fix GH-743][ci skip]
+Fri May 27 22:38:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 30 16:26:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (fill_cbuf): finish reading at EOF.
- * pack.c (str_associate, str_associated): keep associated objects
- in an instance variables, instead of in the internal structure.
+Fri May 27 11:31:51 2011 misfo <tedwardo2@gmail.com>
-Fri Jan 30 16:11:47 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/text.rb (REXML::Text#initialize): prevent an error
+ when passing a frozen string to REXML::Text.new
- * lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
- CR. should check if substitution occurred too.
- [ruby-dev:48813] [Bug #10732]
+ dup the string passed in instead of cloning so that it's frozen
+ state is ignored
-Fri Jan 30 16:00:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 22 07:10:25 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
- * lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since
- it is fixed by r41648. [ruby-core:55760] [Bug #8115]
+ * test/openssl/test_pkey_dsa.rb: Add tests for sign/verify.
-Fri Jan 30 15:47:49 2015 Eric Wong <e@80x24.org>
+Thu May 19 07:47:26 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
- * numeric.c (bit_coerce): use original value for error message
- [ruby-core:67405] [Bug #10711]
- * test/ruby/test_numeric.rb (test_coerce): check error message
+ * test/openssl/test_pkey_rsa.rb: Add tests for sign/verify.
-Tue Jan 27 17:05:43 2015 Seiei Higa <hanachin@gmail.com>
+Wed May 18 20:25:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * vm_method.c (rb_alias): raise a NameError when creating alias to
- a refined method if the original method of the refined method is
- not defined. [ruby-core:67523] [Bug #10731]
+ * lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
+ exception. [Bug #4283] [ruby-core:34534].
-Tue Jan 27 16:41:33 2015 Seiei Higa <hanachin@gmail.com>
+Wed May 18 03:14:49 2011 Eric Hodel <drbrain@segment7.net>
- * vm_method.c (rb_export_method): bail out if the original method
- is undefined when the method is refined.
- [ruby-core:67387] [Bug #10706]
+ * test/test_singleton.rb: Add tests from lib/singleton.rb. Patch by
+ Pete Higgins. [Ruby 1.9 - Bug #4715]
-Tue Jan 27 16:27:44 2015 Eric Wong <e@80x24.org>
+Tue May 17 20:20:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
- [ruby-core:67411] [Bug #10712]
+ * vm_core.h (rb_thread_struct): add volatile to
+ transition_for_lock because it is not protected by lock.
-Thu Jan 22 18:15:41 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Sun May 15 21:22:35 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * ext/zlib/zlib.c: fix document of method signatures.
- [Bug #10668][ruby-core:67186][ci skip]
+ * cont.c (cont_init): clear macihne_stack_start/end of saved thread to
+ prevent mark machine stack of GC'ed Thread. root Fiber is not initialized by
+ fiber_init(). based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
+ * test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.
-Thu Jan 22 18:10:35 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Wed May 11 19:45:27 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
- * test/ruby/test_io.rb: added timeout for AIX environment.
- [ruby-core:62983][Bug #9917]
+ * lib/forwardable.rb: support 'delegate :foo => :bar' for to meet
+ by specification of RDOC.
-Thu Jan 22 17:30:33 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Sun May 8 19:39:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * lib/net/http.rb (Net::HTTP#send_request): there is no response body
- with HEAD request. Patch by @rodrigosaito [fix GH-520]
+ * thread_pthread.c (native_cond_timedwait): add to care EINTR.
+ * thread_pthread.c (thread_timer): remove EINTR check.
-Thu Jan 22 17:30:33 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Fri May 6 15:01:11 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
- * test/net/http/test_http.rb (_test_send_request__HEAD): Added
- failing test for send_request with HEAD method.
+ * ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by
+ silently ignoring lesser significant digits. Required buffer
+ length can be computable so you might at first think of
+ allocating enough memory space on the fly using alloca(). That
+ is a wrong idea because when using alloca there is always risk
+ of integer overflow. A function that accepts outer-process
+ resources like this should not blindly trust its inputs. In
+ this particular case we just want to generate miliseconds
+ resolution by strtod() so the string in question needs no more
+ length than what we originally have. Ignoring lesser
+ significant digits should suffice I believe.
-Wed Jan 14 16:53:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Fri May 6 14:25:53 2011 Tinco Andringa <mail@tinco.nl>
- * ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
- of tcllib. Patch by @zalt50 [fix GH-787]
+ * ext/syck/rubyext.c (mktime_do): YAML.load time correctly parse
+ usecs smaller than 1 fixes #4571
-Wed Jan 14 16:48:15 2015 Tanaka Akira <akr@fsij.org>
+Thu May 5 17:36:31 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
- objects. Label#Str#== is case-insensitive.
+ * eval.c (frame_func_id): store result of method_entry_of_iseq() to
+ cfp->me because method_entry_of_iseq() might become expensive.
-Wed Jan 14 16:48:15 2015 Ben Miller <bmiller@rackspace.com>
+Thu May 5 15:03:51 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the
- comparison should be case-insensitive as well.
- [ruby-core:66498] [Bug #10550]
+ * eval.c (frame_func_id): __method__ return different name from
+ methods defined by Module#define_method with a same block.
+ [ruby-core:35386] fixes #4606
+ * eval (method_entry_of_iseq): new helper function. search control
+ frame stack for a method entry which has given iseq.
+ * test/ruby/test_method.rb: add tests for #4696
-Wed Jan 14 16:48:15 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon May 2 00:36:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * lib/resolv.rb (Resolv::DNS::Name): names with different dots
- should be different.
+ * ext/socket/init.c (rsock_connect): add to care EINTR. based
+ on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
-Wed Jan 14 16:30:51 2015 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Apr 30 03:25:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * lib/net/http/response.rb (Net::HTTPResponse): require one or more
- spaces [Bug #10591].
- by leriksen <leif.eriksen.au@gmail.com>
- https://github.com/ruby/ruby/pull/782 fix GH-782
- NOTE: graph.facebook.com returns without SP Reason-Phrase.
+ * test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
+ the patch was written by Eric Wong. [Feature #4531]
-Wed Jan 14 16:23:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 28 15:32:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge
- data gradually not to exceed INT_MAX. workaround of OpenSSL API
- limitation. [ruby-core:67043] [Bug #10633]
+ * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
+ mswin/mingw.
-Wed Jan 14 16:14:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 27 07:42:44 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (rb_cv_binary_elf): get rid of -e option of cat
- which is not available on BusyBox, use tr instead.
- [ruby-core:64824] [Bug #10210]
+ * configure.in (STRIP): use proper toolchain. based on a patch
+ from Jon Forums at [ruby-core:35909]. fixes #4617
-Wed Jan 14 16:07:11 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Apr 27 00:51:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
- should be treated before calling signal(3).
- [Bug #10615]
+ * file.c (rb_file_truncate): fix function.
-Wed Jan 14 15:57:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/win32.h (ftruncate, truncate, ftello, fseeko): non-64
+ versions on mingw are useless because they use int32_t. fixes #4564
- * thread.c (exec_recursive): use the same last method name as
- recursive_push in the error message when recursive_pop failed.
- [ruby-core:66742] [Bug #10579]
+Mon Apr 25 21:31:36 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-Wed Jan 14 15:57:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/extconf.rb: Should check SSLv2_*method.
+ openssl compiled with "no-ssl2" the extconf don't fail
+ when running `make' having this compilation errors.
+ Patched by Laurent Arnoud. fixes #4562, #4556
- * eval.c (rb_frame_last_func): return the most recent frame method
- name.
+Mon Apr 25 20:53:32 2011 Tajima, Akio <artonx@yahoo.co.jp>
- * thread.c (recursive_list_access): use the last method name,
- instead of the current method name which can be unset in some
- cases, not to use a symbol by the invalid ID.
- [ruby-core:66742] [Bug #10579]
+ * win32/win32.c (kill): accept 0 only sig is SIGINT #4596
-Wed Jan 14 15:54:18 2015 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp>
- * lib/resolv.rb: fall back if canonicalization fails.
- Thanks Vit Ondruch for the patch! [ruby-core:65836]
+ * win32/win32.c (kill): accept 0 as pid, fixes #4596
- * test/resolv/test_dns.rb: test for patch
+Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp>
-Fri Nov 28 16:43:20 2014 Eric Hodel <drbrain@segment7.net>
+ * win32/win32.c (kill): accept 0 as pid, fixes #4596
- * lib/net/http.rb: Do not attempt SSL session resumption when the
- session is expired. [Bug #10533]
+Fri Apr 22 11:49:49 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Nov 28 16:36:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
+ XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit.
- * parse.y (symbol_list): fix the node type of literal symbol list
- with no interpolation. [ruby-core:66343]
+Fri Apr 22 04:16:14 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-Fri Nov 28 16:28:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/psych/parser.c (parse): strings from psych have proper taint
+ markings.
- * ext/etc/etc.c (etc_getlogin): set login name encoding properly.
- [ruby-core:66163] [Bug #10493]
+ * test/psych/test_tainted.rb: test for string taint
-Fri Nov 28 16:18:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 21 01:01:28 2011 Masaya Tarui <tarui@ruby-lang.org>
- * proc.c (method_proc): the receiver of binding from method should
- be same as the receiver of the method.
- [ruby-core:65917] [Bug #10432]
+ * win32/win32.c (CreateChild): maximum length of lpCommandLine is
+ 32,768 characters, including the Unicode terminating null character.
+
+Sat Oct 9 16:54:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 28 16:12:22 2014 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in (RSHIFT): quote to get rid of argument expansion
+ for autoconf 2.68.
- * lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
- of parser to handle IPv6 address. [Bug #9129]
+Wed Apr 20 14:41:28 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Nov 28 16:05:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_each_line): check string's length when compare
+ separator and string. [ruby-core:35815] fixes #4586
- * io.c (copy_stream_body): should write in binary mode. based on a
- patch by godfat (Lin Jen-Shin) at [ruby-core:56556].
- [ruby-core:56518] [Bug #8767]
+Mon Apr 18 12:15:46 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Nov 28 16:05:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+ avoid float error. [ruby-core:35804]
- * io.c (copy_stream_body): move common open flags.
+Fri Apr 15 15:10:29 2011 Akinori MUSHA <knu@iDaemons.org>
-Fri Nov 28 16:01:44 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/uri/generic.rb (#route_from_path): Fix a bug where
+ URI('http://h/b/').route_to('http://h/b') wrongly returned './'
+ (should be '../b'). [Bug #4476]
- * lib/rubygems/ssl_certs/AddTrustExternalCARoot{-2048,}.pem: add newer
- root CA for rubygems.org. a part of r48389 of trunk.
- see also https://github.com/rubygems/rubygems/commit/98f5f44c7141881c756003e4256b1a96b200b98e .
- [Backport #10516] [ruby-core:66303]
+Thu Apr 14 23:43:43 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Nov 19 10:19:36 2014 Eric Wong <e@80x24.org>
+ * numeric.c (ruby_float_step): wrong loop condition.
+ fixes [ruby-core:35753], reported by Joey Zhou.
- * vm_eval.c (rb_yield_splat): add missing GC guard
- [Bug #10509]
+ * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
+ test above change.
-Thu Nov 13 22:31:50 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Thu Apr 14 21:21:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rexml/document.rb: add REXML::Document#document.
- reported by Tomas Hoger <thoger@redhat.com> and patched by nahi.
+ * include/ruby/win32.h (frexp, modf): wrongly declared as pure in
+ mingw math.h.
-Thu Nov 6 17:31:51 2014 Naohisa Goto <ngotogenome@gmail.com>
+Thu Apr 14 21:21:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * compile.c (compile_data_alloc): add padding when strict alignment
- is required for memory access. Currently, the padding is enabled
- only when the CPU is 32-bit SPARC and the compiler is GCC.
- [Bug #9681] [ruby-core:61715]
+ * include/ruby/win32.h (ftruncate, truncate): mingw64 misses
+ prototypes.
- * compile.c (STRICT_ALIGNMENT): defined if strict alignment is required
+Thu Apr 14 16:01:45 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * compile.c (ALIGNMENT_SIZE, ALIGNMENT_SIZE_MASK, PADDING_SIZE_MAX):
- new macros for alignemnt word size, bit mask, max size of padding.
+ * io.c (rb_f_syscall): reduce warning: "HAVE___SYSCALL" is not defined.
- * compile.c (calc_padding): new function to calculate padding size
+Tue Apr 12 19:19:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Nov 5 18:26:49 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/uri/common.rb: avoid race condition. fixes #4572
- * vm_insnhelper.c (unknown_keyword_error): delete expected keywords
- directly from raw table, so that the given block is not called.
- derived from r48102 of trunk.
- [ruby-core:65837] [Bug #10413]
+Tue Apr 12 10:37:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Oct 27 20:21:05 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby/win32.h: VC doesn't have ftruncate() and others, but
+ ruby needs HAVE_ macros to use our emulation functions.
+ (fix the problem of 31262)
- * lib/rexml/entity.rb: keep the entity size within the limitation.
- reported by Willis Vandevanter <will@silentrobots.com> and
- patched by nahi.
+Tue Apr 12 01:33:00 2011 Luis Lavena <luislavena@gmail.com>
-Mon Oct 27 13:26:46 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in: properly evaluate existence of truncate, ftruncate
+ and ftello for MinGW. [ruby-core:35678]
+ * win32/win32.c: rename truncate, ftruncate and ftello to avoid
+ redefinitions.
+ * win32/win32.h: ditto.
- * vm_method.c (rb_method_entry_make): warn redefinition only for
- already defined methods, but not for undefined methods.
- [ruby-dev:48691] [Bug #10421]
+Fri Apr 8 16:01:56 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Oct 23 18:56:55 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * ext/stringio/stringio.c (strio_getline): check whether str is
+ a string when str and lim are given.
+ https://twitter.com/watson1978/status/56225052152168449
- * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override
- options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
- this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]
+Wed Apr 6 15:12:40 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Oct 23 18:56:55 2014 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
+ pop pushed error after each try of reading. fixes #4550
- * test/openssl/test_ssl.rb: Reuse TLS default options from
- OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
+ * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-Thu Oct 23 18:56:55 2014 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * ext/openssl/ossl_pkey_ec.c (ossl_ec_initialize): ditto.
- * lib/openssl/ssl.rb: Explicitly whitelist the default
- SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable
- compression by default.
- Reported by Jeff Hodges.
- [ruby-core:59829] [Bug #9424]
+Wed Apr 6 11:36:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Oct 20 14:41:45 2014 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize):
+ pop pushed error after each try of reading. fixes #4550
- * vm_core.h, vm.c, proc.c: fix GC mark miss on bindings.
- [ruby-dev:48616] [Bug #10368]
+Mon Apr 4 21:41:26 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * test/ruby/test_eval.rb: add a test code.
+ * io.c (rb_io_syswrite): While local FS writes are usually
+ buffered, the buffers can be full or the file opened with
+ O_SYNC. IO#syswrite can also be used on blocking IOs
+ (pipe/socket) just like IO#write.
+ The patch is written by Eric Wong. [ruby-core:35554]
-Fri Oct 17 13:22:17 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 25 19:39:40 2011 Ben Walton <bwalton@artsci.utoronto.ca>
- * parse.y (parser_here_document): do not append already appended
- and disposed code fragment. [ruby-dev:48647] [Bug #10392]
+ * test/test_syslog.rb:
+ Skip syslog tests that rely on LOG_PERROR unless it's defined
-Fri Oct 17 13:19:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ Instead of checking looking at the platform to determine if the tests
+ relying on LOG_PERROR should be run, look for the definition of the
+ constant as this will be robust against all platforms as long as the
+ underlying syslog.c code sets it up correctly.
- * ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO
- should be writable any encoding strings, without conversion.
- [ruby-core:65240] [Bug #10285]
+ This specifically addresses failures on Solaris 9.
-Fri Oct 17 13:10:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ Use LOG_PID instead of LOG_PERROR in Syslog.open test
- * vm_eval.c (eval_string_with_cref): fix super from eval with
- scope. set klass in the current control frame to the class of
- the receiver in the context to be evaluated, this class/module
- must match the actual receiver to call super.
- [ruby-core:65122] [Bug #10263]
+ LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms
+ that don't define it. Solaris 9 and 10 are examples of this.
-Thu Oct 16 16:33:51 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ Use LOG_PID instead.
- * regcomp.c, regexec.c: Optimization should be disabled not only for
- /(?<=x).*/ but also for /(?!x).*/.
- (merge r47598 partially. [Bug #9728])
+Thu Mar 24 11:36:55 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Oct 16 16:23:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+ * ext/openssl/ossl_x509name.c: id_aref's type is ID.
- * lib/fileutils.rb: handle ENOENT error with symlink targeted to
- non-exists file. [ruby-dev:45933] [Bug #6716]
+Thu Mar 24 09:56:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Oct 15 16:23:22 2014 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
+ so it should use NUM2INT.
- * test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
- [ruby-core:65058] [Bug #10245] Reported by Vit Ondruch.
+ * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
-Wed Oct 15 16:23:22 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Wed Mar 23 08:07:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/minitest/test_minitest_unit.rb: removed obsoleted condition
- for Ruby 1.8.
- * test/ruby/test_time_tz.rb: ditto.
+ * numeric.c (flo_round): fix inaccurate results.
-Wed Oct 15 16:19:39 2014 Eric Wong <e@80x24.org>
+Wed Mar 23 00:12:16 2011 Tajima Akio <artonx@yahoo.co.jp>
- * array.c (ary_recycle_hash): add RB_GC_GUARD
- (rb_ary_diff): remove volatile
- [Bug #10369]
+ * win32/win32.c: wait process real termination after reading
+ exit code. fixes #4518
-Wed Oct 15 16:13:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 16 15:06:21 2011 Eric Hodel <drbrain@segment7.net>
- * dir.c (dir_s_aref): fix rdoc. `Dir.glob` allows an array but
- `Dir[]` not. the former accepts an optional parameter `flags`,
- while the latter accepts arbitrary number of arguments but no
- `flags`. [ruby-core:65265] [Bug #10294]
+ * ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
+ not change sync mode on exception.
+ * test/openssl/test_buffering.rb: added
-Wed Oct 15 16:12:11 2014 Rei Odaira <Rei.Odaira@gmail.com>
+Sun Mar 13 16:07:58 2011 Shota Fukumori <sorah@tubusu.net>
- * configure.in: Fix typo. [Bug #9914]
+ * lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
+ is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]
-Wed Oct 15 16:05:47 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * test/test_pstore.rb: Test for above.
+ Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]
- * error.c: update exception tree. [DOC]
- reported by @hemge via twitter.
+Thu Mar 10 21:59:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Oct 15 15:57:48 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * parse.y (parser_encode_length): add exception as UTF8-MAC for
+ magic comment's emacs newline specifier
+ patched by James M. Lawrence [ruby-core:35476] fixes #4489
- * win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
- under any VCS (it means that the worktree may be from the release
- package).
+Thu Mar 10 16:00:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Oct 15 15:35:39 2014 Kazuki Tsujimoto <kazuki@callcc.net>
+ * parse.y (parser_encode_length): fix typo: the length of
+ "-dos" and "-mac" is not 5 but 4.
+ patched by James M. Lawrence [ruby-core:35476] fixes #4489
- * ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
- the result encoding.
+Thu Mar 10 16:00:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Sep 17 15:09:16 2014 Natalie Weizenbaum <nweiz@google.com>
+ * parse.y (parser_encode_length): fix typo: the length of
+ "-dos" and "-mac" is not 5 but 4.
+ patched by James M. Lawrence [ruby-core:35476] fixes #4489
- * ext/pathname/lib/pathname.rb (SAME_PATHS):
- Pathname#relative_path_from uses String#casecmp to compare strings
- on case-insensitive filesystem platforms (e.g., Windows). This can
- return nil for strings with different encodings, and the code
- previously assumed that it always returned a Fixnum. [Fix GH-713]
+Mon Mar 7 22:59:39 2011 Shota Fukumori <sorah@tubusu.net>
-Wed Sep 17 15:07:35 2014 Sho Hashimoto <sho.hsmt@gmail.com>
+ * lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
+ Masaki Matsushita (Glass_saga).
- * ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo,
- SIZEOF_LONG_LON. [Fix GH-714]
+ * test/test_pstore.rb(test_thread_safe): Add test for #4474.
-Wed Sep 17 14:58:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Mar 5 22:54:36 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
- $CXXFLAGS, as they are often used by C++ compiler.
- [ruby-core:54532] [Bug #8315]
+ * include/ruby/intern.h: fix a typo of prototype declaration.
+ rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
-Wed Sep 17 14:58:50 2014 Shota Fukumori <her@sorah.jp>
+Thu Mar 3 21:21:42 2011 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
- Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
+ * test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
+ >= 3 is not supported on Windows, so should not specify such options
+ when calling spawn or others.
-Wed Sep 17 14:52:38 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 14 12:20:22 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/csv.rb (CSV#<<): honor explicitly given encoding. based on
- the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
- [ruby-core:62113]. [Bug #9766]
+ * strftime.c (STRFTIME): return 0 and ERANGE when precision is too
+ large. [ruby-dev:43284] fixes #4456
+ based on r31011.
-Fri Sep 12 11:34:39 2014 Koichi Sasada <ko1@atdot.net>
+ * test/test_time.rb (TestTime#test_huge_precision): test for #4456.
- * test/ruby/test_object.rb: extend timeout.
+Sat Feb 26 07:10:05 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-Fri Sep 12 11:34:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/psych/lib/psych/scalar_scanner.rb: fix parsing timezone's whose
+ whose format is (+/-)hhmm. Thanks Gonçalo Silva!
- * object.c (rb_obj_copy_ivar): allocate no memory for empty
- instance variables. [ruby-core:64700] [Bug #10191]
+ * test/psych/test_scalar_scanner.rb: test for bug.
-Fri Sep 12 11:34:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 28 13:02:15 2011 Danial Pearce <github@tigris.id.au>
- * object.c (rb_obj_copy_ivar): extract function to copy instance
- variables only for T_OBJECT from init_copy.
+ * lib/tempfile.rb: Fix example file paths in docs for tempfile.
+ https://github.com/ruby/ruby/pull/5
-Fri Sep 12 11:30:50 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Feb 21 10:54:29 2011 Aaron Patterson <aaron@tenderlovemaking.com>
- * regcomp.c: Merge Onigmo 988517a4f16f14acbd7cc9d5b51a096d5153992c.
- [Bug #9344].
+ * ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
+ or sequences when emitting JSON.
+ * ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
+ sequences when emitting JSON.
+ * test/psych/json/test_stream.rb: tests for custom stream emits.
+ * test/psych/test_json_tree.rb: tests for JSON emits.
-Fri Sep 12 11:22:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Feb 20 16:26:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (Doxyfile): revert r43888, not to require preinstalled
- ruby. [ruby-core:64488] [Bug #10161]
+ * thread.c (exec_recursive): prevent temporary objects from GC.
-Fri Sep 12 11:15:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * prevent temporary objects from GC, and should not use
+ RSTRING_PTR() for function calls since it evaluates the argument
+ a couple of times.
- * io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
- call rb_cloexec_dup2 on it to atomically replace the file fptr->fd
- points to. This leaves no possible window where fptr->fd is invalid
- to userspace (even for any threads running w/o GVL). based on the
- patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943].
- [Bug #9036]
+Sun Feb 20 02:14:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-Wed Sep 10 12:34:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
+ because FreeBSD don't permit it. If it's used, it behave as
+ pthread_sigmask(xx, NULL, &mask).
- * io.c (io_close): ignore only "closed stream" IOError and
- NoMethodError, do not swallow other exceptions at the end of
- block. [ruby-core:64463] [Bug #10153]
+ * signal.c (init_sigchld): ditto.
-Wed Sep 10 12:27:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 19 22:37:42 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
- registered signs. [ruby-core:64452] [Bug #10149]
+ * vm_insnhelper.c (vm_check_if_namespace): guard temporary object
+ from GC.
-Wed Sep 10 12:25:24 2014 Eric Wong <e@80x24.org>
+Fri Feb 18 00:28:39 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * time.c (time_timespec): fix tv_nsec overflow
- [Bug #10144]
+ * compile.c (get_exception_sym2type): guard temporary object from GC.
-Wed Sep 10 12:21:51 2014 Eric Wong <e@80x24.org>
+Tue May 3 18:23:57 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE
- [Bug #10101]
+ * test/date/test_date.rb (TestDate#test_coerce):
+ test for [ruby-core:35127].
- * test/zlib/test_zlib.rb (test_rewind): test each_byte
+Sun Feb 13 00:48:47 2011 Tadayoshi Funaba <tadf@dotrb.org>
-Wed Sep 10 12:06:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/date.rb (Date#===): [ruby-core:35127]
- * io.c (rb_io_initialize): [DOC] fix rdoc of append mode. it does
- not move the pointer at open. [ruby-core:63747] [Bug #10039]
+Fri Feb 11 19:45:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Sep 10 11:50:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (ruby_cleanup): use rb_ary_free to free internal object.
- * sprintf.c (GETASTER): should not use the numbered argument to be
- formatted, raise ArgumentError instead.
- [ruby-dev:48330] [Bug #9982]
+ * gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
+ [ruby-core:35192]
-Wed Sep 10 11:43:55 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Fri Feb 11 16:57:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
- added timeout into testcase for low performance environment.
- [Bug #9984][ruby-core:63367]
+ * test/ruby/test_transcode.rb (test_from_cp50221): fix wrong
+ assertion and move back.
-Wed Sep 10 11:39:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 8 01:00:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * hash.c (env_aset, env_has_key, env_assoc, env_has_value),
- (env_rassoc, env_key): prohibit tainted strings if $SAFE is
- non-zero. [Bug #9976]
+ * process.c (proc_setgroups): add GC guard to prevent intermediate
+ variable from GC.
-Sat Sep 6 09:10:45 2014 Zachary Scott <e@zzak.io>
+Mon Feb 7 22:56:16 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
- rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
+ * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
+ Object#tap to restore STDOUT.sync.
-Fri Sep 5 14:08:00 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sun Feb 6 12:18:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/win32ole/win32ole.c (ole_create_dcom): use the converted
- result if the argument can be converted to a string, to get rid
- of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127]
+ * parse.y (words, qwords): dispatch array events. based on a
+ patch from Michael Edgar. [Bug #4365].
-Fri Sep 5 14:00:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 5 21:47:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (open): use UTF-8 version function to support
- non-ascii path properly. [ruby-core:63185] [Bug #9946]
+ * parse.y (mlhs_basic): include mlhs_post for ripper. a patch
+ from Michael Edgar at [ruby-core:35078].
-Fri Sep 5 13:53:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 5 11:29:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (parser_yylex): fix invalid char in eval, should raise
- an syntax error too, as well as directly coded.
- [ruby-core:64243] [Bug #10117]
+ * ext/json/parser/parser.h (GET_PARSER): raise TypeError.
-Fri Sep 5 13:51:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/json/parser/parser.rl (cParser_initialize): ditto.
- * parse.y (parser_yyerror): preserve source code encoding in
- syntax error messages. [ruby-core:64228] [Bug #10114]
+ * ext/json/parser/parser.h (GET_PARSER): check if initialized.
+ [ruby-core:35079]
-Fri Sep 5 13:44:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/json/parser/parser.rl (cParser_initialize): ditto.
- * string.c (rb_str_count): fix wrong single-byte optimization.
- 7bit ascii can be a trailing byte in Shift_JIS.
- [ruby-dev:48442] [Bug #10078]
+Sun May 1 18:35:34 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Sep 5 13:36:12 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * test/fileutils/fileasserts.rb (assert_block): little workaround
+ for [ruby-dev:43174].
- merge r46831 partially. these changes are from:
- https://github.com/k-takata/Onigmo/commit/7abd7b29481f98eb92be786e3d33611fc7d000a0
- [Bug #8716]
+Sat Feb 5 21:22:21 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/oniguruma.h (ONIG_MAX_CAPTURE_GROUP_NUM,
- ONIGERR_TOO_MANY_CAPTURE_GROUPS): add cheking the number of capture
- groups.
+ * lib/test/unit/assertions.rb (assert_block): move from
+ test/fileutils/fileasserts.rb.
- * regerror.c (onig_error_code_to_format): ditto.
+ * test/fileutils/fileasserts.rb (assert_block): pass arguments
+ as-is. [ruby-dev:43174]
- * regparse.c (scan_env_add_mem_entry): ditto.
+Sat Feb 5 03:37:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * regexec.c (onig_region_copy, match_at): fix: segmation fault occurs
- when many groups are used.
+ * lib/fileutils.rb (FileUtils::LowMethods): make low level methods
+ in NoWrite and DryRun to do nothing. [ruby-dev:43129]
-Fri Sep 5 13:06:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/fileutils/fileasserts.rb: add message arguments.
- * string.c (rb_str_resize): update capa only when buffer get
- reallocated.
- http://d.hatena.ne.jp/nagachika/20140613/ruby_trunk_changes_46413_46420#r46413
+ * test/fileutils/fileasserts.rb (Test::Unit::Assertions#assert_block):
+ show the given message.
-Fri Sep 5 13:06:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 5 02:09:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_resize): should consider the capacity instead
- of the old length, as pointed out by nagachika.
+ * parse.y (lex_getline, parser_set_encode): set encoding of lines
+ in SCRIPT_LINES__ as source encoding. [ruby-dev:43168]
-Fri Sep 5 13:06:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 6 21:25:08 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * file.c (expand_path): shrink expanded path which no longer needs
- rooms to append. [ruby-core:63114] [Bug #9934]
+ * thread.c (thread_s_kill): workaround for [ruby-core:35086].
+ fixes #4367.
-Wed Sep 3 13:42:24 2014 Mark Lorenz <mlorenz@covermymeds.com>
+ * test/ruby/test_thread.rb (TestThread#test_kill_wrong_argument):
+ test for [ruby-core:35086].
- * lib/erb.rb (result): [DOC] no longer accepts a Proc, as
- Kernel.eval does not. [fix GH-619]
+Fri Feb 4 12:11:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-Wed Sep 3 13:23:29 2014 Tanaka Akira <akr@fsij.org>
+ * string.c (str_utf8_nth): fixed a conditon of optimized lead
+ byte counting. [Bug #4366][ruby-dev:43170]
- * io.c (rb_io_autoclose_p): Don't raise on frozen IO.
+Fri Feb 4 00:14:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/lib/minitest/unit.rb: IO#autoclose? may raise IOError.
+ * ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
+ before rb_str_resurrect.
-Wed Sep 3 13:23:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 3 18:33:26 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * io.c (rb_io_fileno, rb_io_inspect): non-modification does not
- error on frozen IO. [ruby-dev:48241] [Bug #9865]
+ e ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
+ because gz->z.input is hidden string. [ruby-core:35057]
-Wed Sep 3 13:17:38 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 3 07:02:16 2011 Aaron Patterson <aaron@tenderlovemaking.com>
- * configure.in (posix_fadvise): disable use of posix_fadvise
- itself on 32-bit AIX. [ruby-core:62968] [Bug #9914]
+ * ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
+ expressions can round trip. [ruby-core:34969]
-Wed Sep 3 13:17:38 2014 <kanemoto@ruby-lang.org>
+ * test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
- * io.c (rb_io_advise): AIX currently does not support a 32-bit call to
- posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira.
- [ruby-core:62968] [Bug #9914]
+ * ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
+ expressions can round trip.
-Wed Sep 3 12:48:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
- * ext/stringio/stringio.c (strio_write): use rb_str_append to
- reuse coderange bits other than ASCII-8BIT, and keep
- taintedness. [ruby-dev:48118] [Bug #9769]
+Mon Jan 31 21:32:44 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-Wed Sep 3 12:41:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * thread.c (thread_start_func_2): check deadlock condition before
+ release thread stack. fix memory violation when deadlock detected.
+ reported by Max Aller. [Bug #4009] [ruby-core:32982]
- * hash.c (env_shift): fix memory leak on Windows, free environment
- strings block always. [ruby-dev:48332] [Bug #9983]
+Mon Jan 31 14:45:47 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Wed Sep 3 12:41:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/locale.rb (IRB::Locale::#search_file):
+ Gem might be undefined if --disable-gems. [ruby-core:34990]
- * hash.c (env_select): fix memory leak and crash on Windows, make
- keys array first instead of iterating on environ directly.
- [ruby-dev:48325] [Bug #9978]
+Mon Jan 31 04:45:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Sep 3 12:41:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
+ rb_resize_capa because rb_resize_capa expects resized length is
+ smaller than current array length. call rb_ary_unshare before
+ rb_resize_capa because rb_resize_capa losts the reference to
+ original shared array. [ruby-core:34997]
- * hash.c (ruby_setenv): fix memory leak on Windows, free
- environment strings block after check for the size.
- [ruby-dev:48323] [Bug #9977]
+Sun Jan 30 16:15:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Sep 3 12:24:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
+ work on x86_64 due to the design of DL2.
- * re.c (match_aref, rb_reg_regsub): consider encoding of captured
- names, encoding-incompatible should not match.
- [ruby-dev:48278] [Bug #9903]
+ * test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
-Wed Sep 3 12:24:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 30 15:13:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
- characters.
+ * enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
+ byte.
-Wed Sep 3 12:24:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 30 12:53:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
- characters.
+ * enc/emacs_mule.c (emacsmule_islead): fix inverse condition.
-Sun Aug 31 16:59:45 2014 Koichi Sasada <ko1@atdot.net>
+Sun Jan 30 08:02:55 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_eval.c (rb_catch_protect): fix same problem of [Bug #9961].
+ * configure.in: Mac OS X wrongly reports it has fdatasync(3).
- * vm_eval.c (rb_iterate): ditto.
+Fri Feb 18 19:31:31 2011 Shugo Maeda <shugo@ruby-lang.org>
-Sun Aug 31 16:59:45 2014 Koichi Sasada <ko1@atdot.net>
+ * lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
+ race condition in the case where the given path is a directory,
+ and some other user can move that directory, and create a
+ symlink while this method is executing.
+ Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>
- * vm.c (rb_vm_rewind_cfp): add new function to rewind specified cfp
- with invoking RUBY_EVENT_C_RETURN.
- [Bug #9961]
+Sat Jan 29 22:16:26 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_core.h: ditto.
+ * array.c (rb_ary_join): [].join.encoding must be US-ASCII.
+ [ruby-list:47790]
- * eval.c (rb_protect): use it.
+Fri Jan 28 12:05:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * eval.c (rb_rescue2): ditto.
+ * configure.in: Add #include<sys/stat.h> when struct stat is
+ tested. Otherwise, incomplete type dereference error will occur.
- * vm_eval.c (rb_iterate): ditto.
+Fri Jan 28 02:37:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * test/ruby/test_settracefunc.rb: add a test.
+ * re.c (rb_reg_raise): add GC guard to prevent intermediate
+ variable from GC.
- * vm_core.h (rb_name_err_mesg_new):
+Fri Jan 28 02:35:41 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-Sun Aug 31 16:50:06 2014 Koichi Sasada <ko1@atdot.net>
+ * hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate
+ variable from GC.
- * compile.c (rb_iseq_compile_node): put start label of block after
- trace (b_call).
- [Bug #9964]
+Wed Jan 26 22:57:30 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
- * test/ruby/test_settracefunc.rb: add a test.
+ * class.c (clone_method): add GC guard to prevent intermediate
+ variable from GC. [Bug #4321] [ruby-dev:43107]
- added assert_consistent_call_return() method check call/return
- consistency.
+Wed Jan 26 22:28:49 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-Sun Aug 31 16:38:26 2014 Koichi Sasada <ko1@atdot.net>
+ * vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
+ variable from GC. [Bug #4322] [ruby-dev:43108]
- * vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or
- rescue clause.
+Wed Jan 26 10:36:28 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at rescue/ensure.
+ * string.c (=~): documentation fix; the return value is nil when
+ it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
- * test/ruby/test_settracefunc.rb: should not invoke b_return at rescue
- clause.
- [Bug #9957]
+Tue Jan 25 08:28:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_dump.c (control_frame_dump): check VM_FRAME_MAGIC_RESCUE.
+ * string.c (rb_str_resize): get rid of out-of-bound access.
- * vm_dump.c (vm_stack_dump_each): ditto.
+Tue Jan 25 07:00:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Aug 31 16:32:10 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * string.c (rb_string_value_cstr): rb_str_modify can change
+ RSTRING_PTR.
- * lib/test/unit/parallel.rb: fix test-all parallel failure if a test
- is skipped after raise.
- DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
- But it causes Marshal.load failure due to undefined class/module
- DL::DLError when doing test-all parallel and test-all doesn't
- complete. We create new MiniTest::Skip object to avoid Marshal.load
- failure.
- [ruby-core:62133] [Bug #9767]
+Tue Jan 25 07:48:22 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/ruby/test_thread.rb: remove unused variables.
- * test/testunit/test_parallel.rb (TestParallel): add a test.
+Tue Jan 25 07:45:44 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
+ * test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
+ rid of method redefined.
-Sun Aug 31 16:24:54 2014 Tanaka Akira <akr@fsij.org>
+Tue Jan 25 03:24:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all
- separators File::SEPARATOR from File::ALT_SEPARATOR.
- Reported by Daniel Rikowski.
- Fixed by Nobuyoshi Nakada. [Bug #9618]
+ * test/ruby/test_thread.rb: Added various ConditionVariable tests.
- * ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto.
+Mon Jan 24 21:04:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Aug 31 16:23:41 2014 Naohisa Goto <ngotogenome@gmail.com>
+ * error.c (rb_invalid_str): prevent intermediate variable from GC.
+ [ruby-core:34820]
- * lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
- ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
- directory is not an empty directory, rmdir() shall fail and set
- errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
- [Bug #9571] [ruby-dev:48017]
+Sat Jan 22 11:21:40 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-Sun Aug 31 16:20:14 2014 Tanaka Akira <akr@fsij.org>
+ * ext/psych/parser.c (parse): fixing off-by-one error on line numbers
+ in parse exceptions. [ruby-core:34690]
- * lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
- security.mac.portacl.port_high is changed.
- See mac_portacl(4) for details.
- Reported by Jakub Szafranski. [ruby-core:60917] [Bug #9544]
+ * test/psych/test_parser.rb: test for error
-Sun Aug 31 16:16:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 19 13:04:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * re.c (match_aref): should not ignore name after NUL byte.
- [ruby-dev:48275] [Bug #9902]
+ * proc.c (proc_call): Add gc guard to avoid segfault. The fix
+ is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
-Sun Aug 31 16:10:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 18 23:31:01 2011 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/digest/digest.c (rb_digest_instance_equal): no need to call
- `to_s` twice. [Bug #9913]
+ * parse.y: avoid NULL reference. [ruby-dev:43067]
-Sun Aug 31 16:10:30 2014 Benoit Daloze <eregontp@gmail.com>
+Wed Jan 19 02:54:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/digest/digest.c (rb_digest_instance_equal):
- fix #== for non-string arguments. [ruby-core:62967] [Bug #9913]
+ * vsnprintf.c (cvt): set first byte of buf to NUL for the case when
+ no bytes are written to the buf. [ruby-dev:43062]
- * test/digest/test_digest.rb: add test for above.
+Tue Jan 18 02:46:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-Sun Aug 31 15:46:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
+ strings should be dumped with double quotes. [ruby-core:34186]
- * array.c (yield_indexed_values): extract from permute0(),
- rpermute0(), and rcombinate0().
+ * test/psych/test_json_tree.rb: test for double quotes
-Sun Aug 31 15:23:25 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 16 22:06:30 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * array.c (rb_ary_permutation): `p` is the array of size `r`, as
- commented at permute0(). since `n >= r` here, buffer overflow
- never happened, just reduce unnecessary allocation though.
+ * too/rbinstall.rb (install?(:ext, :comm, :gem)): no longer
+ installs no-versioned gempsecs. [ruby-core:34011]
+ Patch by Luis Lavena.
-Mon Jul 7 13:05:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Fri Jan 14 15:32:29 2011 Shugo Maeda <shugo@ruby-lang.org>
- * test/test_timeout.rb (test_timeout): inverted test condition.
- [Bug #8523]
+ * test/net/imap/test_imap.rb: call neither logout nor disconnect
+ unless connected. patch by Kazuhiro NISHIYAMA. [ruby-dev:42860]
-Mon Jul 7 12:57:26 2014 Masaya Tarui <tarui@ruby-lang.org>
+Fri Jan 14 14:56:57 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * st.c (st_foreach_check): change start point of search at check
- from top to current. [ruby-dev:48047] [Bug #9646]
+ * lib/net/imap.rb: use bytesize for binary strings.
+ patched by Yoshimasa Niwa. [ruby-core:34222]
-Mon Jul 7 12:53:45 2014 Zachary Scott <e@zzak.io>
+Fri Jan 14 13:38:58 2011 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]
+ * ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
+ gzip's header is the size of uncompressed input data modulo 2^32.
+ [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
-Mon Jul 7 12:52:44 2014 Zachary Scott <e@zzak.io>
+Fri Jan 14 07:30:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
- Patch by Erik Hollembeak [Bug #9814]
+ * io.c (argf_next_argv): go advance when the next file cannot be
+ read. [ruby-core:34446]
-Mon Jul 7 12:51:09 2014 Zachary Scott <e@zzak.io>
+Wed Jan 12 23:55:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
- Patch submitted via documenting-ruby/ruby#34
+ * io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
+ long type arguments.
-Mon Jul 7 12:49:10 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Thu Jan 13 00:06:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]
+ * io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
-Mon Jul 7 12:46:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 13 00:00:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * struct.c (not_a_member): extract name error and use same error
- messages. based on the patch by Marcus Stollsteimer <sto.mar AT
- web.de> at [ruby-core:61721]. [Bug #9684]
+ * io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
+ Therefore we should only check the result is -1 or not. [ruby-core:34062]
-Mon Jul 7 12:39:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 12 16:25:12 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * io.c (read_all): truncate the buffer before appending read data,
- instead of truncating before reading.
- [ruby-core:55951] [Bug #8625]
+ * lib/net/http.rb (Net::HTTP#connect): makes it timeout during
+ SSL handshake too. [ruby-core:34203]
+ Patch by Marc Slemko.
-Mon Jul 7 12:39:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
+ test for [ruby-core:34203]
- * io.c (io_setstrbuf, io_read): should not shorten the given buffer until
- read succeeds. [ruby-core:55951] [Bug #8625]
+ * test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
+ ditto.
-Mon Jul 7 12:16:54 2014 Shugo Maeda <shugo@ruby-lang.org>
+Sun Jan 9 16:31:53 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/net/ftp.rb (gets, readline): read lines without LF properly.
- [ruby-core:63205] [Bug #9949]
+ * io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
+ also uses __syscall if available for *BSD on 64bit architecture.
+ [ruby-core:34062]
- * test/net/ftp/test_buffered_socket.rb: related test.
+Wed Jan 12 16:24:53 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Mon Jul 7 12:13:09 2014 Shugo Maeda <shugo@ruby-lang.org>
+ * ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
+ and RL_PROMPT_END_IGNORE. [ruby-core:34331]
- * lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body
- type as "MIXED" followed immediately by params
- [ruby-core:62864] [Bug #9885]
- Patch by @rayners (David Raynes). [Fixes GH-622]
- https://github.com/ruby/ruby/pull/622
+ * ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
+ RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
+ error with libedit.
-Mon Jul 7 12:05:28 2014 Shugo Maeda <shugo@ruby-lang.org>
+Sun Jan 9 14:47:50 2011 TAKAO Kouji <kouji@takao7.net>
- * lib/net/imap.rb (body_type_msg): should accept
- message/delivery-status with extra data.
- [ruby-core:53741] [Bug #8167]
+ * ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
+ fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
+ non-printing characters in prompt
- * test/net/imap/test_imap_response_parser.rb: related test.
+Fri Jan 7 21:54:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jul 7 11:47:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
+ regexp after open bracket. [ruby-core:34183]
- * parse.y (local_tbl_gen): remove local variables duplicated with
- arguments.
+Thu Jan 6 22:42:02 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jul 3 15:17:22 2014 Koichi Sasada <ko1@atdot.net>
+ * bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
+ fail in certain case. this patch is contributed from Ray Chason
+ <chasonr at gmail.com> in personal communication.
- [ruby-core:60501] [Bug #9486]
- * vm.c (rb_vm_pop_cfunc_frame): added. It cares c_return event.
- The patch base by drkaes (Stefan Kaes).
- [Bug #9321]
+Thu Jan 6 11:27:01 2011 Aaron Patterson <aaron@tenderlovemaking.com>
- * variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame()
- instead of rb_frame_pop().
+ * ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
+ should not be included in JSON mapping
- * vm_eval.c (raise_method_missing): ditto.
+Thu Jan 6 05:14:41 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_eval.c (rb_iterate): ditto.
+ * ext/stringio/stringio.c (get_strio, strio_set_string)
+ (strio_reopen): check if frozen. [ruby-core:33648]
- * internal.h (rb_vm_pop_cfunc_frame): add decl.
+Wed Jan 5 13:56:54 2011 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_settracefunc.rb: add tests.
- provided by drkaes (Stefan Kaes).
+ * lib/net/http.rb (Net::HTTP#get): A header hash given should not
+ be modified.
- * vm.c, eval.c, include/ruby/intern.h (rb_frame_pop):
- move definition of rb_frame_pop() and deprecate it.
- It doesn't care about `return' events.
+Sun Jan 9 16:31:34 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Jun 27 17:57:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
+ some platoform has a locale without territory but with
+ encoding.
+ (#each_sub_locale): ditto.
- * string.c (rb_str_substr): need to reset code range for shared
- string too, not only copied string.
- [ruby-core:62842] [Bug #9882]
+Sat Jan 1 17:02:50 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Jun 27 17:54:09 2014 Rei Odaira <Rei.Odaira@gmail.com>
+ * lib/irb/locale.rb (IRB::Locale#search_file): make it possible
+ to load a localization from a gem.
+ (IRB::Locale#lc_path): obsoleted because of the change of #search_file
+ (IRB::Locale#each_localized_path): new private method, based on lc_path
+ (IRB::Locale#find): follows the change of #search_file.
+ (IRB::Locale#load): removed duplicate with #find.
- * signal.c (ruby_signal): should return either `old.sa_sigaction`
- or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
- `old.sa_flags`, because they may not be a union.
- [ruby-core:62836] [Bug #9878]
+Fri Dec 31 03:23:26 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Jun 27 17:37:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
+ patched by Peter Weldon <peter.weldon AT null.net>
+ [ruby-core:33985]
- * vsnprintf.c (BSD_vfprintf): fix string width when precision is
- given. as the result of `memchr` is NULL or its offset from the
- start cannot exceed the size, the comparison was always false.
- [ruby-core:62737] [Bug #9861]
+Wed Jan 5 12:10:08 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-Fri Jun 27 17:27:26 2014 Eric Wong <e@80x24.org>
+ * Use _WIN32 rather than checking for windows.h. Thanks Jon Forums!
+ [ruby-core:33977]
- * process.c (proc_getgroups, proc_setgroups): use ALLOCV_N
- [Bug #9856]
+Tue Dec 28 04:32:37 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-Fri Jun 27 17:19:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/fiddle/extconf.rb: check for windows.h while building fiddle.
+ Thanks Jon Forums! [ruby-core:33923]
- * io.c (io_setstrbuf): always check if the buffer is modifiable.
- [ruby-core:62643] [Bug #9847]
+Sun Dec 26 11:39:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jun 27 17:15:36 2014 Tanaka Akira <akr@fsij.org>
+ * parse.y (stmt): missing ripper rule. i.e., `a::B ||= c 1'.
+ http://twitter.com/#!/wannabe53/status/18797576396472321
+ http://twitter.com/#!/wannabe53/status/18798416150663168
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):
- Consider Socket#accept as well as TCPServer#accept.
- Reported by Sam Stelfox. [ruby-core:62064] [Bug #9750]
+Sun Dec 26 04:31:15 2010 Luis Lavena <luislavena@gmail.com>
-Fri Jun 27 17:12:45 2014 Eric Wong <e@80x24.org>
+ * ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
+ Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
- * complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END
- [Bug #9608]
- * rational.c (read_digits): ditto
+Sat Dec 25 15:04:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jun 27 17:05:23 2014 Tanaka Akira <akr@fsij.org>
+ * test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
+ suite writing to the source directory.
- * lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
- exception occur.
+Sat Dec 25 14:27:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jun 27 17:02:36 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * io.c (rb_io_extract_encoding_option): accept Encoding object as
+ encoding: optional argument. [ruby-dev:42884]
- * thread_win32.c (rb_w32_stack_overflow_handler): use Structured
- Exception Handling by AddVectoredExceptionHandler() for machine
- stack overflow on mingw.
- This would be equivalent to the handling using __try and __except
- on mswin introduced by r43748.
+Sat Dec 25 15:08:08 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-Fri Jun 27 17:02:36 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
+ We must reinitialize GVL at new process creation. Otherwise
+ we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
- * eval_intern.h (SAVE_ROOT_JMPBUF): workaround for the failure of
- test/ruby/test_exception.rb on Windows.
- wrap by __try and __exception statements on mswin to raise SIGSEGV
- when EXCEPTION_STACK_OVERFLOW is occurred, because MSVCRT doesn't
- handle the exception.
- however, (1) mingw-gcc doesn't support __try and __exception
- statements, and (2) we cannot retry SystemStackError after this
- change yet (maybe crashed) because SEH and longjmp() are too
- uncongenial.
+Wed Sep 8 22:46:31 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * signal.c (check_stack_overflow, CHECK_STACK_OVERFLOW): now defined on
- Windows, too.
+ * ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
+ blocked on Windows while blocking call for SSLSocket. Need to
+ convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
+ Patch by arton. ref #3794.
- * thread_win32.c (ruby_stack_overflowed_p): ditto.
+Thu Dec 23 23:29:04 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Jun 27 16:56:38 2014 Eric Wong <e@80x24.org>
+ * common.mk, win32/Makefile.sub: fixes dependencies.
+ patch by nobu.
- * signal.c (signal_exec): ignore immediate cmd for SIG_IGN
- * signal.c (trap_handler): set cmd to true for SIG_IGN
- * signal.c (trap): handle nil and true values for oldcmd
- [Bug #9835]
+Thu Dec 23 22:29:08 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Mon Jun 23 18:51:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_fillbuf): fixes a mistake on merging r30280, at r30321.
- * class.c (rb_mod_init_copy): always clear instance variable,
- constant and method tables first, regardless the source tables.
- [ruby-dev:48182] [Bug #9813]
+Thu Dec 23 06:35:41 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-Mon Jun 23 18:50:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
+ connection verification fails.
- * thread.c (thread_start_func_2): stop if forked in a sub-thread,
- the thread has become the main thread.
- [ruby-core:62070] [Bug #9751]
+Tue Dec 21 06:25:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jun 23 18:35:34 2014 Josh Goebel <dreamer3@gmail.com>
+ * test/rexml/test_contrib.rb (ContribTester#test_pos): should not
+ use fixed path name for tests. [ruby-dev:42827]
- * net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
- for messages not ending with a new-line.
- [ruby-core:61441] [Bug #9627] [fix GH-616]
+ * test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
+ fixed port for tests. [ruby-dev:42828]
-Mon Jun 23 18:16:07 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Tue Dec 21 01:41:42 2010 Masaya Tarui <tarui@ruby-lnag.org>
- * configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
- [ruby-core:62095] [Bug #8358]
+ * io.c : add an extra byte to buffer for the specification of read
+ in Windows. see [ruby-core:33460] and r29980. and, we have to
+ discuss how to do this one byte.
-Mon Jun 23 18:16:07 2014 Tanaka Akira <akr@fsij.org>
+Wed Dec 15 04:02:00 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * configure.in: Fix compilation error.
- https://bugs.ruby-lang.org/issues/8358#note-16
+ * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
+ fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
+ Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
-Mon Jun 23 18:16:07 2014 Vit Ondruch <vondruch@redhat.com>
+Sat Dec 11 05:48:28 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * configure.in: add qouting brackets and append wildcard for the
- rest after target_cpu, to properly detect platform for SSE2
- instructions. [ruby-core:60576] [Bug #8358]
+ * ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
+ [ruby-dev:42716] [Ruby 1.9-Bug#4129]
-Mon Jun 23 18:16:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at exit.
- * configure.in: use SSE2 instructions to drop unexpected precisions on
- other than mingw. [ruby-core:59472] [Bug #8358]
+Tue Dec 7 22:37:15 2010 Masaya Tarui <tarui@ruby-lnag.org>
-Mon Jun 23 18:16:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_read): duplicate string if shared. [ruby-dev:42719]
- * configure.in: use SSE2 instructions for drop unexpected
- precisions. [ruby-core:54738] [Bug #8358]
+Tue Dec 7 21:59:37 2010 Kouhei Sutou <kou@cozmixng.org>
-Mon Jun 23 17:29:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/light/node.rb: remove circular require.
- * process.c (obj2uid, obj2gid): now getpwnam_r() and getgrnam_r()
- may need larger buffers than sysconf values, so retry with
- expanding the buffer when ERANGE is returned.
- [ruby-core:61325] [Bug #9600]
+Tue Dec 7 18:56:52 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Jun 23 17:20:10 2014 Tanaka Akira <akr@fsij.org>
+ * ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
+ patched by Kouhei Yanagita [ruby-dev:42696]
- * ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
- Reported by Saravana kumar. [ruby-core:61820] [Bug #9697]
- Fixed by Heesob Park. [ruby-core:61868]
+Tue Dec 7 00:27:14 2010 Masaya Tarui <tarui@ruby-lnag.org>
-Mon Jun 23 17:20:10 2014 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c (rb_w32_read): fixed more for readline,
+ and so on. [ruby-core:33511]
- * ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory.
+Mon Dec 6 18:56:42 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Mon Jun 23 17:20:10 2014 Tanaka Akira <akr@fsij.org>
+ * test/ruby/test_string.rb (TestString#test_scan): add a test for
+ [ruby-core:33338] #4087.
- * ext/socket: always operate length of socket addess companion with
- socket address.
+Thu Dec 23 19:17:14 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * ext/socket/rubysocket.h (rsock_make_ipaddr): add an argument for
- socket address length.
- (rsock_ipaddr): ditto.
+ * test/net/imap/cacert.pem: updated because it has been expired.
- * ext/socket/ipsocket.c (ip_addr): pass length to rsock_ipaddr.
- (ip_peeraddr): ditto.
- (ip_s_getaddress): pass length to rsock_make_ipaddr.
+ * test/net/imap/server.crt: signed again because CA cert was expired.
- * ext/socket/socket.c (make_addrinfo): pass length to rsock_ipaddr.
- (sock_s_getnameinfo): pass actual address length to rb_getnameinfo.
- (sock_s_unpack_sockaddr_in): pass length to rsock_make_ipaddr.
-
- * ext/socket/init.c (rsock_s_recvfrom): pass length to rsock_ipaddr.
- (rsock_s_recvfrom_nonblock): ditto.
+Sun Dec 5 17:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/tcpsocket.c (tcp_sockaddr): pass length to
- rsock_make_ipaddr.
+ * class.c (make_metaclass): fix probable typo. builtin type flag
+ cannot be used with FL_TEST.
- * ext/socket/raddrinfo.c (make_ipaddr0): add an argument for socket
- address length. pass the length to rb_getnameinfo.
- (rsock_ipaddr): ditto.
- (rsock_make_ipaddr): add an argument for socket address length.
- pass the length to make_ipaddr0.
- (make_inetaddr): pass length to make_ipaddr0.
- a local variable renamed.
- (host_str): a local variable renamed.
- (port_str): ditto.
+Sun Dec 5 12:09:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
-Mon Jun 23 16:55:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Dec 5 11:27:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (primary): flush cmdarg flags inside left-paren in a
- command argument, to allow parenthesed do-block as an argument
- without arguments parentheses. [ruby-core:61950] [Bug #9726]
+ * ruby.c (load_file_internal): decrement for ungotten line.
+ [ruby-dev:42680]
-Mon Jun 23 16:45:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 3 07:08:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
- ext/fiddle/handle.c (fiddle_handle_free),
- ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
- based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].
+ * ext/stringio/stringio.c (strio_getline): round upto next char
+ boundary. [ruby-dev:42674]
-Wed May 28 13:24:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 2 15:31:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * configure.in (rb_cv_func___builtin_unreachable): try with an
- external variable not only by a warning, which might not be
- shown due to the optimization. [ruby-core:61647] [Bug #9665]
+ * win32/win32.c (rb_w32_read): more fix. [ruby-core:33513]
-Wed May 28 13:20:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 2 13:41:43 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
- other than Symbol is an undefined behavior. fix up r31699.
- [ruby-core:62142] [Bug #9771]
+ * win32/win32.c (rb_w32_read): workaround for console reading troubles.
+ fixed [ruby-core:33511]
-Wed May 28 13:18:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 30 12:23:52 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/stringio/stringio.c (strio_putc): fix for non-ascii
- encoding, like as IO#putc. [ruby-dev:48114] [Bug #9765]
+ * win32/win32.c (rb_w32_read): read only 1 byte at once on console.
+ workaround of Windows bug. see [ruby-core:33460].
+ this is not the final solution.
-Tue May 27 13:57:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 29 22:55:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/fileutils.rb (FileUtils#copy_entry): update rdoc about
- preserve option and permissions, following r31123.
- [ruby-core:62065] [Bug #9748]
+ * lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
+ by nested repeat operators. [ruby-core:33464]
-Tue May 27 13:42:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 29 18:31:31 2010 Martin Duerst <duerst@it.aoyama.ac.jp>
- * proc.c (umethod_bind): use the ancestor iclass instead of new
- iclass to get rid of infinite recursion, if the defined module
- is already included. [ruby-core:62014] [Bug #9721]
+ * test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
+ - Removed commented-out options that are no longer under discussion.
+ - Added two more tests for forthcomming clarifications.
-Tue May 27 13:42:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 29 05:54:22 2010 Koichi Sasada <ko1@atdot.net>
- * proc.c (rb_method_call_with_block, umethod_bind): call with
- IClass including the module for a module instance method.
- [ruby-core:61936] [Bug #9721]
+ * thread_pthread.c (native_cond_*): Check return code.
+ (Some OSs except Linux return error code).
- * vm_insnhelper.c (vm_search_super_method): allow bound
- UnboundMethod case.
+Sat Nov 27 19:12:10 2010 Tanaka Akira <akr@fsij.org>
-Tue May 27 11:51:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c: parenthesize macro arguments.
- * array.c (ary_reject): may be turned into a shared array during
- the given block. [ruby-dev:48101] [Bug #9727]
+Sat Nov 27 18:08:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue May 27 11:48:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (leap_year_v_p): fixed typo. [ruby-dev:42631]
- * string.c (str_buf_cat): should round up the capacity by 4KiB,
- but not number of rooms. [ruby-core:61886] [Bug #9709]
+Fri Nov 26 09:48:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue May 27 11:46:03 2014 NARUSE, Yui <naruse@ruby-lang.org>
+ * re.c (rb_reg_initialize_str): should succeed the taint status from
+ the origin. [ruby-core:33338]
- * lib/xmlrpc/client.rb (do_rpc): don't check body length.
- If HTTP content-encoding is used, the length may be different.
- [Bug #8182] [ruby-core:53811]
+Tue Nov 23 18:54:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue May 27 11:23:02 2014 Tadayoshi Funaba <tadf@dotrb.org>
+ * vm.c (rb_thread_mark): should mark self in conrol
+ frames. [ruby-core:33289]
- * ext/date/date_core.c (d_lite_cmp): should compare with #<.
+Sat Oct 30 00:35:13 2010 Koichi Sasada <ko1@atdot.net>
-Mon May 5 00:42:35 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+ * iseq.c (iseq_s_compile): fix optional argument.
+ a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
- * ext/psych/yaml/config.h: ditto.
+Mon Nov 22 21:30:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/yaml/scanner.c: ditto.
+ * string.c (rb_str_inspect): fix for ascii-compatible external
+ encoding and different encoding string. [ruby-core:33283]
- * ext/psych/yaml/yaml_private.h: ditto.
+Mon Nov 22 18:33:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu May 8 02:01:51 2014 Kenta Murata <mrkn@mrkn.jp>
+ * string.c (rb_str_inspect): append for each chars instead of bulk
+ copy if encoding conversion is needed. [ruby-core:33283]
- * ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard.
+Mon Nov 22 11:58:11 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto.
+ * string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
+ receiver is 7BIT and the argument is non ASCII.
-Thu May 8 01:51:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Nov 20 01:57:55 2010 Akio Tajima <artonx@yahoo.co.jp>
- * ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
- finalizes only a copy of the digest context, the context must be
- cleaned up after initialization by EVP_MD_CTX_cleanup() or a
- memory leak will occur. [ruby-core:62038] [Bug #9743]
+ * common.mk: add dependency(insns.inc) to compile.obj
-Wed Apr 30 16:39:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Nov 18 00:02:17 2010 James Edward Gray II <jeg2@ruby-lang.org>
- * ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
- [ruby-dev:48089] [Bug #9702]
+ * lib/csv.rb: Upgrading output encoding with ASCII content
+ as needed. [ruby-core:33229]
-Wed Apr 30 16:37:16 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Nov 17 08:54:04 2010 James Edward Gray II <jeg2@ruby-lang.org>
- * win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal):
- reset inherit flag of socket to avoid unintentional inheritance of
- socket. note that the return value of SetHandleInformation() is not
- verified intentionally because old Windows may return an error.
- [Bug #9688] [ruby-core:61754]
+ * lib/csv.rb: Upgrading output encoding as needed. [ruby-core:33135]
-Wed Apr 30 16:33:57 2014 Eric Wong <e@80x24.org>
+Tue Nov 16 22:30:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * time.c (time_mload): freeze and preserve marshal-loaded time zone
- * test/ruby/test_time.rb: add test for GC on loaded object
- [Bug #9652]
+ * vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
+ Coverity Scan found this bug.
-Wed Apr 30 16:15:09 2014 Kohei Suzuki <eagletmt@gmail.com>
+Tue Nov 16 06:39:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
- for a method aliased in a module. [ruby-core:61636] [Bug #9663]
+ * pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
+ values if block is given. [ruby-core:33193]
-Wed Apr 30 16:15:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 16 00:21:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_method.c (rb_method_entry_get_without_cache): get rid of
- infinite recursion at aliases in a subclass and a superclass.
- return actually defined class for other than singleton class.
- [ruby-core:60431] [Bug #9475]
+ * regparse.c (and_cclass, or_cclass): fix memory leak. Coverity Scan
+ found this bug. [ruby-dev:42579]
-Wed Apr 30 16:09:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 15 23:54:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an
- inline function.
+ * eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
+ size_t to a pointer typed VALUE*. Coverity Scan found this defect.
-Wed Apr 30 15:04:25 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 15 23:41:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
- [ruby-core:61756] [Bug #9578]
+ * compile.c (iseq_set_exception_local_table, iseq_set_local_table,
+ rb_iseq_build_from_ary): fix type inconsistency (which is benign
+ because sizeof(ID) == sizeof(ID*), though). Coverity Scan found
+ these bugs.
-Mon Mar 31 00:57:39 2014 James Edward Gray II <james@graysoftinc.com>
+Mon Nov 15 22:47:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/csv.rb: Fixed a broken regular expression that was causing
- CSV to miss escaping some special meaning characters when used
- in parsing.
- Reported by David Unric
- [ruby-core:54986] [Bug #8405]
+ * vm_eval.c (rb_funcall): ensure va_end after va_init_list. Coverity
+ Scan found this bug.
-Mon Mar 31 00:48:12 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Nov 15 06:43:48 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * test/ruby/envutil.rb (assert_no_memory_leak): increase default value
- of `limit` keyword argument.
- assert_no_memory_leak occasionally fails with limit=1.5.
+ * etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
+ pointer is invalid. Thanks Ippei Obayashi! [ruby-dev:42573]
-Mon Mar 31 00:15:45 2014 Shota Fukumori <her@sorah.jp>
+Mon Dec 6 22:53:49 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
+ * cygwin/GNUMakefile.in ($(RCFILES)): fixes [ruby-core:33525].
+ Patch by Luis Lavena <luislavena AT gmail.com>.
+ http://groups.google.com/group/rubyinstaller/browse_thread/thread/412abfdcb695aecb
-Mon Mar 31 00:15:45 2014 Shota Fukumori <her@sorah.jp>
+Mon Dec 6 22:28:41 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * vm_eval.c (eval_string_with_cref): Use file path even if scope is
- given. Related to [ruby-core:56099] [Bug #8662] and r42103.
+ * string.c (rb_str_concat): partially reverts r30040 because
+ it unpexpectedly changes the behavior of String#<<.
-Mon Mar 31 00:02:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 5 00:14:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * parse.y (yycompile): store file name as String to keep the encoding.
+ * ext/fiddle/extconf.rb: fixing ffi library location on windows.
+ Thanks Usa! [ruby-core:32930]
- * parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path):
- new functions to pass file name as a String.
+Wed Nov 3 14:13:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (gettable_gen): return a copy of the original file name, not
- a copy in filesystem encoding.
+ * string.c (rb_enc_cr_str_buf_cat): concatenation of valid
+ encoding string and invalid encoding string should result
+ invalid encoding. [ruby-core:33027]
- * vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)".
+Wed Nov 3 07:47:25 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Mar 30 23:49:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+ regex options. a patch from Heesob Park in [ruby-core:32988].
- * ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
- error reasons with old OpenSSL, and insert a colon iff formatted
- message is not empty.
+Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@fsij.org>
-Thu Mar 20 21:13:18 2014 Eric Wong <e@80x24.org>
+ * test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
+ group of the created file is inherited from the parent
+ directory on BSDs and MacOS X. Linux also inherit the group if
+ the setgid bit of the directory is set. It causes the test fail.
+ fixed by Shota Fukumori. [ruby-dev:42458]
- * variable.c (rb_const_set): delete existing entry on redefinition
- [Bug #9645]
- * test/ruby/test_const.rb (test_redefinition): test for leak
+Fri Oct 29 03:04:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Mar 20 20:44:17 2014 Kazuki Tsujimoto <kazuki@callcc.net>
+ * string.c (rb_str_dump): fix expected length. [ruby-core:32935]
- * test/fiddle/test_c_struct_entry.rb,
- test/fiddle/test_c_union_entity.rb,
- test/fiddle/test_cparser.rb, test/fiddle/test_func.rb,
- test/fiddle/test_handle.rb, test/fiddle/test_import.rb,
- test/fiddle/test_pointer.rb: don't run test if the system
- don't support fiddle.
+Thu Oct 21 15:42:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Mar 16 00:57:20 2014 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/net/telnet.rb (Net::Telnet#close): added.
+ patched by Erik Hollensbe [ruby-dev:42260] #3830
- * ext/.document: remove refinement from documentable directories.
+Wed Oct 27 18:27:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Mar 3 01:43:30 2014 Charlie Somerville <charliesome@ruby-lang.org>
+ * test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
+ before closing read end, to get rid of timing problem.
- * eval_error.c (warn_printf): use rb_vsprintf instead so ruby specific
- extensions like PRIsVALUE can be used in format strings
- * eval_error.c (error_print): use warn_print_str (alias for
- rb_write_error_str) to print a string value instead of using
- RSTRING_PTR and RSTRING_LEN manually
- * eval.c (setup_exception): use PRIsVALUE instead of %s and RSTRING_PTR
+ * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-Mon Mar 3 01:32:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 27 13:51:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/readline/extconf.rb (rl_hook_func_t): define as Function for
- very old readline versions. [ruby-core:61209] [Bug #9578]
+ * test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
+ in read/write thread. fix r29541.
-Mon Mar 3 01:32:14 2014 Tanaka Akira <akr@fsij.org>
+ * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
- * ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
- of Function to support readline-6.3. (rl_hook_func_t is available
- since readline-4.2.)
- Reported by Dmitry Medvinsky. [ruby-core:61141] [Bug #9578]
+Thu Oct 21 00:05:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Mar 3 01:25:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
+ a patch from Tomoyuki Chikanaga at [ruby-dev:42435]. #3970
- * eval.c (setup_exception): preserve errinfo across calling #to_s
- method on the exception. [ruby-core:61091] [Bug #9568]
+ * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-Mon Mar 3 01:00:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 18 10:19:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * numeric.c (ruby_num_interval_step_size): check signs and get rid
- of implementation dependent behavior of negative division.
- [ruby-core:61106] [Bug #9570]
+ * lib/net/http.rb (transport_request): @socket may be nil.
+ patched by Egbert Eich [ruby-core:32829]
-Mon Mar 3 00:43:33 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Sun Oct 17 10:40:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- (merged partially from r42781)
- * test/ruby/test_numeric.rb (assert_step): introduce assert_step.
+ * class.c (rb_define_{class,module}_id_under): register to be
+ marked, which probably are defined and used internally.
-Mon Mar 3 00:24:38 2014 Zachary Scott <e@zzak.io>
+Sat Oct 16 11:10:55 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * README.EXT.ja: [DOC] Fix typo "macro macro" @utenmiki [Fixes GH-551]
- https://github.com/ruby/ruby/pull/551
+ * ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
+ according to GB2312. [Bug #3937] [ruby-core:32758]
-Sat Feb 22 22:11:58 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Oct 15 23:36:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/io/console/console.c (console_dev): need read access for conout$
- because some functions need it. [Bug#9554]
+ * file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
+ unsigned int.
-Sat Feb 22 14:01:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Oct 15 20:30:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c (iseq_load): keep type_map to get rid of memory leak.
- based on a patch by Eric Wong at [ruby-core:59699]. [Bug #9399]
+ * configure.in (dev_t): use RUBY_REPLACE_TYPE.
-Sat Feb 22 13:56:38 2014 Charlie Somerville <charliesome@ruby-lang.org>
+ * file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
- * compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block
- as hash key when loading serialized instruction sequences from arrays.
- [Bug #9455] [ruby-core:60146]
+Thu Oct 14 07:35:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Feb 22 13:04:54 2014 Shugo Maeda <shugo@ruby-lang.org>
+ * file.c (DEVT2NUM): added. Size of dev_t is depend on the
+ environment even if POSIX defines dev_t as unsigned integer.
+ For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
+ dev_t as 64bit unsigned integer.
- * ext/socket/init.c (wait_connectable): break if the socket is
- writable to avoid infinite loops on FreeBSD and other platforms
- which conforms to SUSv3. This problem cannot be reproduced with
- loopback interfaces, so it's hard to write test code.
- rsock_connect() and wait_connectable() are overly complicated, so
- they should be refactored, but I commit this fix as a workaround
- for the release of Ruby 1.9.3 scheduled on Feb 24.
- [ruby-core:60940] [Bug #9547]
+ * file.c (rb_stat_dev): use DEVT2NUM.
-Sat Feb 22 12:55:24 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
+ value is int.
- (merged partially from r42927)
- * lib/rubygems/core_ext/kernel_require.rb: Backport a fix for concurrent
- requires. [ruby-core:58918] [Backport #9224]
- see also https://github.com/rubygems/rubygems/pull/833
+ * file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
+ value is int.
-Sat Feb 22 11:50:52 2014 Eric Wong <e@80x24.org>
+ * configure.in: check size of dev_t.
- * ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
- (bsock_recvmsg_internal): ditto
- * test/socket/test_unix.rb: test above for infinite loop
+Thu Oct 14 20:50:51 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Sat Feb 22 11:44:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/win32ole.c (reg_get_val): expand environment in
+ the pathname. [Bug #3907]
- * class.c (rb_mod_init_copy): do nothing if copying self.
- [ruby-dev:47989] [Bug #9535]
+Thu Oct 14 04:16:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * hash.c (rb_hash_initialize_copy): ditto.
+ * numeric.c (ruby_float_step): fix Numeric#step with infinity unit
+ doesn't works well. [ruby-core:32779]
-Thu Feb 20 02:14:18 2014 Zachary Scott <e@zzak.io>
+Wed Oct 13 22:32:34 2010 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright
+ * lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
+ string. Thanks nobu and tDiary dev members. [Bug #3909]
-Thu Feb 20 02:14:18 2014 Zachary Scott <e@zzak.io>
+Tue Oct 12 23:58:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for
- OpenSSL::Buffering which breaks overview because of RDoc bug
+ * win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
+ use uintptr_t instead of long for win64.
-Thu Feb 20 02:04:09 2014 Eric Hodel <drbrain@segment7.net>
+Tue Oct 12 23:55:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/.document: Add syslog/lib to documentable items. [Bug #9228]
+ * vsnprintf.c (BSD_vfprintf): fix cast.
-Thu Feb 20 01:54:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 12 18:25:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_insnhelper.c (vm_search_super_method): when super called in a
- bound UnboundMethod generated from a module, no superclass is
- found since the current defined class is the module, then call
- method_missing in that case. [ruby-core:59619] [Bug #9377]
+ * io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
+ may be a Bignum. On 64bit for errors. [ruby-dev:42366]
-Thu Feb 20 01:33:06 2014 Eric Hodel <drbrain@segment7.net>
+Tue Oct 12 18:25:04 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/optparse.rb: The Integer acceptable now allows binary and
- hexadecimal numbers per the documentation. [ruby-trunk - Bug #8865]
+ * string.c (rb_str_concat): use unsigned int for GB18030.
- DecimalInteger, OctalInteger, DecimalNumeric now validate their input
- before converting to a number. [ruby-trunk - Bug #8865]
+Tue Oct 12 15:52:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/optparse/test_acceptable.rb: Tests for the above, tests for all
- numeric acceptables for existing behavior.
+ * win32/win32.c (rb_w32_strerror): unmap some range of errno for
+ workaround of VC10's strerror() and sys_nerr problem.
+ based on a patch from Akio Tajima, [ruby-dev:42355].
-Thu Feb 20 01:23:36 2014 Aaron Pfeifer <aaron.pfeifer@gmail.com>
+Tue Oct 12 15:36:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * thread.c (terminate_atfork_i): fix locking mutexes not unlocked in
- forks when not tracked in thread. [ruby-core:55102] [Bug #8433]
+ * io.c (rb_io_ungetc): use unsigned int for GB18030.
-Tue Feb 18 23:48:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 12 15:10:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/envutil.rb (assert_separately): require envutil in the
- child process too.
+ * numeric.c (rb_enc_uint_chr): split from int_chr.
-Tue Feb 18 22:38:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (int_chr): use rb_enc_uint_chr.
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
- specify the encoding of source.
+ * include/ruby/encoding.h (rb_enc_uint_chr): added.
-Mon Feb 17 02:00:36 2014 Tanaka Akira <akr@fsij.org>
+Tue Oct 12 14:04:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/open-uri.rb: Make proxy disabling working again.
- Fixed by Christophe Philemotte. [ruby-core:59650] [Bug #9385]
+ * numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
+ unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
+ is defined as uisigned int.
-Mon Feb 17 01:57:45 2014 Benoit Daloze <eregontp@gmail.com>
+Mon Oct 11 20:20:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * range.c (Range#size): [DOC] improve description and add examples.
- Patch by @skade. [Fixes GH-501]
+ * lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
+ encoding of Zlib::GzipReader.
+ http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
-Mon Feb 17 01:51:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 11 14:03:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/webrick/htmlutils.rb (WEBrick::HTMLUtils#escape): replace HTML
- meta chars even in non-ascii string. [Bug #8425] [ruby-core:55052]
+ * error.c (syserr_initialize): set the encoding of Errno::*#message
+ as locale. [ruby-dev:42358]
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils#{_escape,_unescape}):
- fix %-escape encodings. [Bug #8425] [ruby-core:55052]
+Mon Oct 11 06:11:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Feb 17 01:51:49 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
+ a T_FILE. [ruby-dev:42356]
- * test/webrick/test_htmlutils.rb: add test for WEBrick::HTMLUtils.
+Fri Oct 8 00:24:54 2010 James Edward Gray II <jeg2@ruby-lang.org>
-Mon Feb 17 01:41:59 2014 Masaki Matsushita <glass.saga@gmail.com>
+ * lib/csv.rb: Fixing documentation typos. [ruby-core:32712]
- * array.c (rb_hash_rehash): use hash_alloc() instead of rb_hash_new().
- [Bug #9187]
+Wed Oct 6 11:52:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Feb 17 01:41:59 2014 Masaki Matsushita <glass.saga@gmail.com>
+ * io.c (fptr_finalize): write_mutex might have been destroyed
+ already in finalization phase, as the order of finalizers is not
+ guaranteed. rb_mutex_t should be used in place of Mutex object
+ in the future.
- * hash.c (rb_hash_rehash): make temporary st_table under the control
- of GC. [Bug #9187]
+Mon Oct 4 12:43:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_hash.rb: add a test for above.
+ * parse.y (regexp): dregexp has literal string only at the head
+ and successors are array. [ruby-core:32682]
+
+Mon Oct 4 09:30:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
+ accepts only Strings, so call Integer#to_s(16).
+ 16 is for an optimization. [ruby-dev:42336]
+
+Mon Oct 4 07:57:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * cont.c (fiber_memsize): Return size.
+ Before this change, fiber_memsize always returns 0.
+
+Sat Oct 2 22:59:32 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_thread.rb: add for win32ole with Thread.
+
+Thu Sep 30 16:11:08 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_getenv): should return NULL if specified name
+ is empty. a patch from Heesob Park at [ruby-core:32650]
+
+Sun Aug 29 13:22:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (rb_thread_method_id_and_class): curried proc has no
+ method. [ruby-core:31871]
+
+Fri Sep 24 23:44:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (sym_call), vm.c (invoke_block_from_c),
+ vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
+ [ruby-core:32075]
+
+ * vm_eval.c (rb_funcall_passing_block): new function to call
+ method with passing given block.
+
+Fri Sep 24 15:50:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (rb_str_to_i): fix rdoc: String#to_i raises an
+ exception when base is invalid. [ruby-core:31685]
+
+Wed Sep 22 16:59:40 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/test_prime.rb (TestPrime#test_new): the warning expected have
+ not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
+ a.k.a. sora_h. [ruby-dev:42272]
+ Recovers $stderr even if StringIO.new fails. Reported by unak.
+
+Wed Sep 22 01:55:48 2010 Koichi Sasada <ko1@atdot.net>
+
+ * bootstraptest/test_method.rb: fix last commit.
+
+Wed Sep 22 01:49:52 2010 Koichi Sasada <ko1@atdot.net>
+
+ * bootstraptest/test_method.rb: add a test for [ruby-core:30534].
+
+Mon Sep 20 23:23:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (bracket): get rid of scanning at the end of the pattern
+ string, not to raise an exception while globbing command line.
+ [ruby-core:32478]
+
+Fri Sep 17 23:44:07 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
+ add missing method availability check. [ruby-core:32447]
+ Reported by Wiebe Cazemier. Thanks!!!
+
+Fri Sep 17 23:23:26 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
+
+Fri Sep 17 23:10:44 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/test_core.rb: enable.
+
+Fri Sep 17 22:46:02 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/: untabify.
+
+Fri Sep 17 22:29:56 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/: fix fixture data path. All REXML tests are worked.
+
+Fri Sep 17 22:15:15 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/test_listener.rb: remove needless codes.
+
+Fri Sep 17 22:12:23 2010 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rexml/: import REXML tests from
+ http://www.germane-software.com/repos/rexml/trunk/test/.
+ Many tests are failed temporary. I'll fix them quickly. Sorry.
+
+Fri Sep 17 08:30:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/tracer.rb: count only non-internal libraries in stack trace,
+ ignoring custom_require. [ruby-core:31858]
+
+Thu Sep 16 08:30:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sprintf.c (rb_f_sprintf): fix rdoc. pointed out by Tomoyuki
+ Chikanaga at [ruby-core:32395], and a patch from Daniel
+ Bovensiepen at [ruby-core:32403].
+
+Thu Sep 16 08:27:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
+ [ruby-core:32394]
+
+Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * test/net/imap/test_imap.rb: "localhost" not guaranteed to
+ resolve to "127.0.0.1". On my machine it is "::1" instead.
+ The problem is, you have to connect to the imaps server via
+ the canonical name written in a server certificate, and that
+ of the server.cert is "localhost". So you have to listen to
+ the address of what "localhost" resolves to. I think this
+ situation cannot be resolved in a handy manner because the
+ test "test_imaps_post_connection_check" is actually
+ expecting to connect to a server via an address other than
+ the CN. On my machine several assertions won't pass because
+ the test cannot connect to the server.
+
+Wed Sep 15 09:12:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_puts): fix for wide char encoding strings.
+ [ruby-dev:42212]
+
+Wed Sep 15 07:27:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_times): mentioned about Hash argument. a patch
+ from Daniel Bovensiepen at [ruby-core:32386].
+
+ * sprintf.c (get_hash): ditto, and fix typo.
+
+Mon Sep 13 19:56:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
+ bug in system header of darwin 9. [ruby-core:32341]
+
+Mon Sep 13 10:12:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * util.c (ruby_strtod): reject Float('0x0.').
+ [ruby-dev:42239] Bug #3820
+
+Mon Sep 13 09:23:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
+ with rb_scan_args. Before this fix, OpenSSL::BN#prime?
+ is fully broken. [ruby-dev:42225]
+
+Sun Sep 12 21:21:50 2010 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb: [ruby-core:32096] Thanks Colin Bartlett.
+
+Tue Nov 2 21:33:43 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * hash.c (ruby_setenv): merged r29225 but just warning
+ instead of raising an exception. c.f. [ruby-core:32250].
+
+Sep 11 16:47:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * hash.c (ruby_setenv): raise if putenv and SetEnvironmentVariable
+ failed, because of the restriction of the size on Windows.
+ based on a patch from Peter Weldon at [ruby-core:32304]. fix:
+ Bug#3812, [ruby-core:32250]
+
+Sat Sep 11 12:32:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
+ zombie prototype declarations. a patch from Eric Hodel
+ at [ruby-core:32305].
+
+Thu Sep 9 23:25:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (vm_backtrace_each): skip allocator frames which have no
+ name. [ruby-core:32231]
+
+Thu Sep 9 10:44:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
+ that it ignores characters after = in ENV.
+ patched by Jeremy Evans [ruby-core:32184]
+
+Thu Sep 9 09:02:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/rbinstall.rb (install?): gemspec filename should include
+ its version. patched by Luis Lavena [ruby-core:32165]
+
+Mon Sep 6 11:03:13 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * Fixed wrong check of missing functions. Patch by Adrian Quark.
+ ref #3400
+ The patch contains following comment:
+ This patch should avoid unnecessary incompatibility with future
+ versions of Openssl. Changes suggested by bmaher_at_amazon.com.
+
+Mon Sep 6 10:31:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/readline/readline.c (readline_s_get_line_buffer):
+ Readline.line_buffer should return locale string.
+ [ruby-dev:42184] #3791
+
+Sat Sep 4 23:48:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_readlink): symlink target should be in
+ filesystem encoding.
+
+Wed Sep 1 14:33:36 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enum.c (enum_zip): fix typo of rdoc.
+ patched by Andrei Kulakov [ruby-core:31974]
+
+Wed Sep 1 12:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (ruby_suppress_tracing): restore the state and invoke
+ the func with normal state. a patch from Satoshi Shiba <shiba
+ AT rvm.jp> at [ruby-dev:42162]. [ruby-core:31783]
+
+Tue Aug 31 17:32:34 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
+ stubs". Thanks, Akio Tajima [ruby-dev:42159].
+
+Tue Aug 10 11:26:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist.
+
+Sat Aug 14 17:48:41 2010 Narihiro Nakamura <authorNari@gmail.com>
+
+ * test/objspace/test_objspace.rb: added test for objspace.
+
+ * ext/objspace/objspace.c: considers T_ZOMBIE by lazy sweep GC.
+
+ * gc.c: considers that dsize was 0. [ruby-dev:42022]
+
+Tue Aug 31 03:42:14 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (tr_setup_table): fix bug in r29146.
+ Initialize table even if cflag is 0; tr_find see whether
+ del is empty or not.
+
+ * string.c (tr_find): nodel can't be NULL; if NULL, it means
+ it is not specified.
+
+Mon Aug 30 15:00:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (tr_setup_table): initialize negating table when
+ negating string is given. [ruby-core:31851]
+
+ * string.c (tr_find): add a sentence for the time when
+ target characters include negating one.
+
+ * string.c (rb_str_count): move definition.
+
+Sun Aug 29 23:54:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
+ include assignment. [Bug #3759], [ruby-dev:42154]
+
+ * lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
+ name signleton class. [Bug #3759], [ruby-dev:42154]
+
+Sat Sep 25 22:48:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (LIBRUBY_DLDFLAGS): fix quoting.
+
+Sat Sep 25 10:30:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (LIBRUBY_DLDFLAGS): use -unexported_symbol only
+ when available. http://trac.macports.org/ticket/26341
+
+Sat Oct 16 10:54:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (CPP): already used in .c.i rule.
+
+ * cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
+ --preprocessor options explicitly. [ruby-core:32776]
+
+Thu Sep 23 09:01:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
+ from method. Bug #3786, Bug #3860, [ruby-core:32501]
+
+Sun Sep 19 13:44:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (LIBRUBY_SO): fix an oversight of replace
+ RUBY_INSTALL_NAME with RUBY_SO_NAME. a patch from Jeremy Evans
+ at [ruby-core:32474].
+
+Sun Aug 29 12:19:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * load.c (load_failed): should honor encoding. [ruby-core:31915]
+
+Fri Aug 27 12:26:23 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * object.c (rb_obj_class): remove mention of obsolete method.
+ a patch from Run Paint Run Run at [ruby-core:31842].
+
+Thu Aug 26 10:37:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regint.h (OnigStackIndex): the type should be intptr_t.
+ Original Oniguruma assumes the size of long and that of void *
+ are equal, but it's not true on LLP64 platform: mswin64.
+ originally patched by shintaro kuwamoto [ruby-dev:42133]
+
+Thu Aug 26 10:38:11 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
+
+ * test/fiddle/helper.rb: AIX does not have dynamically loadable lib[cm].
+
+Wed Aug 25 03:42:43 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
+ reported by kuwamoto shintaro in [ruby-dev:42125].
+
+Mon Aug 23 13:09:27 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * backport r29071 from ruby_1_8;
+
+ * ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean
+ encoding issue for OpenSSL 1.0.0 compatibility.
+ ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which
+ means 'true'.
+
+ ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false'
+ but OpenSSL >= 1.0.0 treats it as 'true'. ruby-ossl was using
+ 0x100 for 'false' for backward compatibility. Just use 0x0 for
+ the case OpenSSL >= OpenSSL 0.9.7.
+
+ * test/openssl/test_asn1.rb: test added.
+
+Mon Aug 23 22:30:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (version.o): depends on both of version.h and
+ include/ruby/version.h. [ruby-dev:42063]
+
+Mon Aug 23 12:28:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (rb_reg_search): fix: 4th argument should be regexp
+ object. patched by shintaro kuwamoto [ruby-dev:41667] #3459
+
+Mon Aug 23 02:23:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * util.c (ruby_strtod): make sure to have digit-sequence after 'p'
+ for hexadecimal-floating-constant. [ruby-dev:42105]
+
+Sun Aug 22 09:08:02 2010 Tanaka Akira <akr@fsij.org>
+
+ * include/ruby/ruby.h (UINT2NUM): fix ifdef condition for LLP64.
+ reported by Daniel Gutmanas. [ruby-core:31778]
+
+Sun Aug 22 05:55:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: fix typo. a patch from Eric Wong at
+ [ruby-core:31810].
+
+Thu Aug 19 12:04:39 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * array.c (rb_ary_permutation, rb_ary_repeated_permutation,
+ rb_ary_repeated_combination, rb_ary_product):
+ use ary_make_shared_copy instead of ary_make_substitution.
+ [ruby-dev:42067] [Bug #3708]
+
+ * test/ruby/test_array.rb (test_product, test_repeated_permutation,
+ test_repeated_combination): append assertions against [Bug #3708].
+
+Thu Aug 19 11:11:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enum.c (enum_inject): fix typo of rdoc.
+ patched by Andrei Kulakov [ruby-core:31768]
+
+Thu Aug 19 06:03:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_insnhelper.c (vm_push_frame): initialize block_iseq. a patch
+ from Peter Weldon at [ruby-core:31757].
+
+Wed Sep 15 02:13:44 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
+ Thanks Jeremy Evans! [ruby-core:32384]
+
+Wed Aug 18 01:37:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regcomp.c: revert r26701; it introduces Bug #3681.
+ [ruby-core:31677]
+
+Mon Aug 16 23:16:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * NEWS: updated. a patch from Kazuhiro NISHIYAMA in [ruby-dev:42001].
+
+Sun Aug 15 19:59:58 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
+ Fix for possible cross-site scripting (CVE-2010-0541).
+ Found by Apple, reported by Hideki Yamane.
+ Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>.
+
+Fri Jul 30 08:51:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): home directory must be absolute.
+ [ruby-core:31537]
+
+Fri Jul 30 08:33:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): should check if could find user.
+ [ruby-core:31538]
+
+Sat Aug 7 13:33:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_eval.c (vm_call0): fix for VM_METHOD_TYPE_NOTIMPLEMENTED.
+ [ruby-dev:41953]
+
+Fri Aug 6 18:59:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (realpath_rec): rb_str_modify depends on the length, so
+ resize instead.
+
+Thu Aug 5 21:20:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
+ results when poped is true. [ruby-dev:41933], [Bug #3658]
+ This is retry of r28870 and r28873 which were reverted.
+
+Thu Aug 5 16:57:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_make_pattern): fold continuous PLAINs to get rid of
+ snail at too deep path. [ruby-dev:41871]
+
+Sat Aug 7 09:47:06 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: fix checking version of GCC.
+
+Mon Aug 2 21:51:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr
+ since r26303.
+
+Mon Aug 2 21:16:03 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
+ version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
+ * ext/win32ole/extconf.rb: ditto.
+
+Fri Jul 30 07:48:04 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
+ even if MacOS X Aqua version [ruby-dev:41883].
+
+Thu Aug 5 18:36:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * complex.c (nucomp_marshal_load): should check the argument.
+ [ruby-core:31622]
+
+ * rational.c (nurat_marshal_load): ditto
+
+Mon Aug 2 16:34:32 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (native_thread_join): need to wait thread, of course.
+ [ruby-dev:41911]
+
+Mon Aug 2 12:22:22 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (file_expand_path): wrong condition. [ruby-core:31591]
+
+Thu Jul 29 02:38:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: not [freebsd] but [freebsd*] for AS_CASE.
+
+Mon Jul 26 13:52:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: define BROKEN_CLOSE only on FreeBSD.
+ This needs to merge to 1.9.2.
+
+Mon Jul 26 11:51:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: define BROKEN_CLOSE on FreeBSD.
+ This fixes build failure on MSVC. [ruby-core:31481]
+
+ * include/ruby/ruby.h, include/ruby/missing.h:
+ use BROKEN_CLOSE for replacing close(2).
+
+Mon Aug 2 00:03:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * util.c (ruby_add_suffix): fixed a bug returning uninitialized value.
+ This is the essential part from r28794 of trunk.
+
+Mon Jul 26 13:01:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (rb_thread_mark): should mark iseq itself other than normal
+ iseq. [ruby-dev:41880]
+
+Mon Jul 26 09:51:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (rb_thread_mark): mark only self of normal iseqs, not
+ nodes. [ruby-dev:41874]
+
+Sun Aug 1 10:23:48 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/irb/init.rb (IRB.parse_opts): set VERBOSE to true when debug
+ switch called in irb. a patch from Andrew Grimm in
+ [ruby-core:31558].
+
+Sun Aug 1 09:35:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bignum.c (big_op): comparison of bignum and infinity has returned 1
+ or -1, but it must return boolean.
+
+Wed Jul 21 15:22:17 2010 Evan Phoenix <evan@fallingsnow.net>
+
+ * lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
+ from gems properly.
+
+Tue Jul 20 11:35:11 2010 Evan Phoenix <evan@ruby-lang.org>
+
+ * lib/rubygems.rb: Load the custom require if --disable-rubygems
+ was used.
+
+Tue Jul 20 11:27:18 2010 Evan Phoenix <evan@ruby-lang.org>
+
+ * gem_prelude.rb: Pull in rubygem's custom require
+ [ruby-core:30846]
+
+ * lib/rubygems.rb: Handle always having custom require available
+
+Tue Jul 13 20:58:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_DEFAULT_ARCH): adjust for target
+ cpu. [ruby-core:31243]
+
+Fri Jul 23 15:09:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_MINGW32): ignore msvc suffix.
+
+Fri Jul 23 09:02:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * re.c (rb_reg_expr_str): fixed out-of-boundary access at invalid
+ multibyte characters.
+
+Thu Jul 22 16:27:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (rb_reg_expr_str): fix broken Regexp#inspect when it
+ is ASCII-8BIT and non-ASCII character.
+ The length of character should be from original byte string.
+ [ruby-core:31431]
+
+Thu Jul 22 03:02:55 2010 Eric Hodel <drbrain@segment7.net>
+
+ * README.EXT: fix signature of rb_ensure and rb_rescue to match
+ implementation.
+
+Tue Jul 20 12:42:06 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * ext/socket/raddrinfo.c (rb_getaddrinfo): according to my
+ valgrind output this variable should be initialized beforehand.
+
+Tue Jul 20 12:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_flush_buffer): write and buffer operations should be
+ monolithic. [ruby-core:31348]
+
+Tue Jul 20 12:27:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/fileutils.rb (FileUtils::Entry_#copy): check file name
+ spearator boundary. [ruby-core:31360]
+
+Mon Jul 19 09:00:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * NEWS (Kernel#instance_eval): add an incompatible change since
+ the 1.9.1 release. [ruby-core:31336]
+
+Fri Jul 16 12:06:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/rbinstall.rb (ext-arch): prune directories start with '-'.
+
+Wed Jul 14 18:18:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regexec.c (match_at): add end point to enclen's argument.
+ This only effect on compilinig with -DONIG_DEBUG_MATCH.
+
+Tue Jul 13 20:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/dl/handle.c (rb_dlhandle_close): should not pass a dynamic
+ string to rb_raise directly.
+
+Sun Jul 11 21:20:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * README.EXT{,.ja} (rb_block_call): fixed about third/fourth
+ arguments to the block. based on [ruby-core:31192] by Asher
+ Haig. [Bug #3558]
+
+Thu Jul 22 14:30:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * include/ruby/missing.h: add prototype for ruby_close().
+
+Thu Jul 22 22:38:32 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * sprintf.c: add short documentation about named reference.
+ [ruby-core:31294]
+
+Thu Jul 22 22:14:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regexec.c (onig_search): don't skip non-ANYCHARs when
+ .* fails to match. This causes to fail matching
+ ANYCHAR_STAR with LOOK_BEHIND. This fix is workaround
+ and disable the optimization. [ruby-dev:41851]
+
+Thu Jul 22 22:13:48 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread_pthread.c (get_stack): fix memory leak; pthread_attr_destory
+ must be called even when pthread_getattr_np is used.
+ [ruby-core:31269]
+
+Wed Jul 21 12:39:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/cmath.rb (CMath#cbrt): cbrt should accept a negative real
+ numbers. [ruby-core:31234]
+
+Thu Jul 15 21:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * numeric.c (fix_divide): must not use rb_rational_new1 for coercion
+ because it returns an argument itself when canonical mode is set.
+ [ruby-core:31279]
+
+Thu Jul 15 21:38:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * proc.c (bm_free): fix memory leak. [ruby-core:30869] [Bug #3466]
+
+Tue Jul 13 12:04:57 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * missing/close.c: keep original errno.
+
+Thu Jul 8 00:15:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * gem_prelude.rb: provide workaround for gem activation. Currently,
+ gem activation does not work by default. Now it can be worked
+ around by requiring "rubygems" first. [ruby-core:29486]
+ a patch from Evan Phoenix in [ruby-core:31096].
+
+ * lib/rubygems.rb: ditto.
+
+Sun Jul 11 15:14:03 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * Makefile.in ({|dist-|real-}clean-ext): fixes the previous
+ commit. http://twitter.com/knu/status/18247078381
+
+ * tool/rmdirs: ditto.
+
+Sat Jul 10 20:03:48 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * Makefile.in ({|dist-|real-}clean-ext): fixes syntax
+ for /bin/sh on Solaris
+
+ * tool/rmdirs: ditto
+
+Thu Jul 8 15:47:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (rb_str_conv_enc_opts): fix infinite loop because
+ of ISO-2022-JP conversion with empty string.
+ patched by Brian Buchanan [ruby-core:31107]
+
+Wed Jul 7 10:26:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * missing/close.c: ignore ECONNRESET.
+ FreeBSD wrongly sets ECONNRESET on close(2) and
+ it causes false-negative exceptions. [ruby-dev:41778]
+
+ * configure.in: ditto.
+
+Sun Jul 4 17:13:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (swallow, prepare_getline_args, rb_io_getline_1): fix for
+ paragraph mode reading in non-ascii-compatible encoding.
+ [ruby-dev:41803]
+
+Sat Jul 10 11:41:54 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/psych/test_date_time.rb (TestDateTime#test_round_trip_with_offset):
+ test for [ruby-core:31023].
+
+Mon Jul 5 12:32:01 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/scalar_scanner.rb (parse_string): support
+ timezones that are not one hour off. [ruby-core:31023]
+
+ * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+
+Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar):
+ teaching Psych to deserialize DateTime objects. [Bug #1390]
+
+ * ext/psych/lib/psych/visitors/yaml_tree.rb(visit_DateTime): added a
+ method for serializing DateTime objects.
+
+ * ext/psych/lib/psych/scalar_scanner.rb(parse_time): add method for
+ parsing times objects from a string.
+
+ * test/psych/test_date_time.rb: tests for dumping DateTime objects.
+
+Sat Jul 3 09:13:55 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use
+ Time#nsec to accurately serialize time objects. [ruby-core:29233]
+
+Tue Jul 6 00:34:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm.c (thread_free): free altstack to prevent memory leak. a patch
+ from Tomoyuki Chikanaga in [ruby-dev:41815]. [Bug #3537]
+
+Tue Jul 6 00:29:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * string.c (NONASCII_MASK): NONASCII_MASK must be unsigned.
+ [ruby-dev:41782]
+
+Fri Jul 2 19:07:09 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * io.c (argf_inplace_mode_set): prohibits an assignment
+ of a tainted value. Patch by unak.
+
+ * util.c, file.c: prevents a buffer over-run on windows.
+ Patch by unak.
+
+Tue Jun 29 19:39:59 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_win32ole_method.rb (is_ruby64): check
+ ruby binary is mswin64 or mingw64. [ruby-dev:41756]
+
+Mon Jun 28 20:32:33 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
+ that Ruby is 32bit or 64bit binary in order to get correct offset
+ value. [ruby-dev:41741]
+
+Mon Jun 28 21:56:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread.c (rb_fd_resize, rb_fd_copy): avoid NULL dereference upon
+ failed realloc by using xrealloc instead of not realloc. a patch
+ from Jim Meyering <meyering at redhat.com> in [ruby-core:30920]
+ [Bug #3489]
+
+Thu Jul 1 16:26:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * thread_pthread.c (thread_start_func_1): don't call
+ native_thread_init_stack(th) on cygwin to avoid the segv
+ introduced by r27789. Cygwin's signal implementation is half
+ baked so USE_SIGNALSTACK is not defined and it needs another
+ treatment.
+
+Thu Jul 1 13:00:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (test-knownbug): ignore known bugs.
+
+Thu Jul 1 12:59:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/rubygems/test_gem_activation.rb: comment out a test for WONTFIX
+ bug.
+
+Mon Jun 28 22:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/rdoc/test_rdoc_ri_driver.rb (TestRDocRIDriver#test_formatter):
+ fix a test accordingly to r28455.
+
+Mon Jun 28 05:32:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/rdoc/ri/driver.rb (RDoc::RI::Driver#formatter): should use bs
+ format when stdout is piped. [ruby-core:30734]
+
+Mon Jun 28 03:12:03 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bootstraptest/test_class.rb: add a test for [ruby-core:30843].
+
+Mon Jun 28 02:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * class.c (rb_mod_init_copy): when class is dup'ed, a metaclass of the
+ class should be attached to the dup'ed class, not the original
+ class. [ruby-core:30843] [Bug #3461]
+
+Sat Jun 26 07:59:18 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
+ that OS is Windows 32bit or Windows 64bit in order to get
+ correct offset value.
+
+Fri Jun 25 11:45:36 2010 James Edward Gray II <jeg2@ruby-lang.org>
+
+ * lib/csv.rb: Fixing a bug that prevented CSV from parsing
+ all multi-line fields correctly. Patch by Rob Biedenharn.
+
+Sat Jun 26 10:08:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/envutil.rb (EnvUtil#invoke_ruby): no needs to copy the
+ original ENV, since it's done in spawn automatically.
+ [ruby-dev:41733]
+
+Fri Jun 25 10:07:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
+ return the exit status.
+
+ * test/ruby/envutil.rb (EnvUtil#invoke_ruby): change the
+ environment of spawned process only.
+
+ * test/ruby/envutil.rb (EnvUtil#invoke_ruby): get rid of possible
+ deadlock.
+
+Wed Jun 23 23:49:21 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/raddrinfo.c (str_is_number): renamed from str_isnumber to
+ avoid confusion to str_isnumber in ext/socket/getaddrinfo.c.
+
+Wed Jun 23 21:32:08 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
+ registry entry at first. [ruby-dev:41674] [Bug #3464]
+
+Thu Jul 1 04:21:10 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/raddrinfo.c: don't use __P.
+
+Wed Jun 30 07:29:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using
+ a pipe, get rid of not-well-defined behavior after the child
+ process terminated in pty.
+
+Wed Jun 30 02:37:30 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * thread_pthread.c (get_stack): use pthread_getthrds_np() for AIX.
+
+ * configure.in: ditto.
+
+Wed Jun 23 21:17:32 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
+ getaddrinfo problem on Mac OS X Snow Leopard. [ruby-core:29427]
+ patch by Wataru Kimura. [ruby-core:30842]
+
+Wed Jun 23 06:44:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (fchown): need to check. a patch by Eric Wong
+ at [ruby-core:30818].
+
+ * io.c (argf_next_argv): check for setting owner/group.
+
+Tue Jun 22 21:33:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/optparse/test_summary.rb: fixed superclass so that it run
+ solely.
+
+Sat Jun 19 03:35:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the
+ exception message when attempting to load an unknown class. Thanks
+ nobu! [ruby-dev:41399]
+
+ * test/psych/test_psych.rb: test for the exception message
+
+Fri Jun 18 01:50:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * object.c: Object#public_methods, private_methods, etc. returns
+ method ids that belong to the class or the singleton class(es) of
+ the object. [ruby-dev:41613]
+
+ * class.c: on the other hand, Module#public_instance_methods, etc.
+ returns method ids that belong to the module itself (even if the
+ module is singleton, it does not return method ids of super
+ class(es); see [ruby-core:28837]).
+
+Tue Jun 29 21:16:05 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * ext/stringio/stringio.c (strio_write): add RB_GC_GUARD.
+
+Tue Jun 29 14:41:07 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (rb_realpath_internal, realpath_rec): skip UNC share root
+ on DOSISH platforms.
+ http://pc12.2ch.net/test/read.cgi/tech/1272248179/600
+
+Tue Jun 29 06:41:01 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: stop creating a dummy Tcl/Tk interpreter (fix
+ [ruby-core:30358]). And hide a root window before starting eventloop.
+
+ * ext/tk/extconf.rb: use tclConfig.sh/tkConfig.sh when frameworks
+ are enabled on MacOS X.
+
+ * ext/tk/stubs.c: dirty hack for frameworks and stubs on MacOS X.
+
+Tue Jun 29 01:44:33 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * ext/dl/lib/dl/func.rb (call): don't overwrite original arguments
+ to defend from GC.
+ * test/dl/test_func.rb (test_string): add test for above.
+
+Tue Jun 29 01:41:42 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
+ RB_GC_GUARD_PTR being removed by optimization.
+
+Tue Jun 29 01:22:08 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi
+ header files. Thanks Yugui! [ruby-core:30917]
+
+Sun Jun 27 23:31:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/io.h, io.c: reverted r21709.
+
+ * ruby.c (load_file_internal): nothing to read if EOF reached
+ while reading shebang. [ruby-core:30910]
+
+Sun Jun 27 13:25:07 2010 Tanaka Akira <akr@fsij.org>
+
+ * io.c (simple_sendfile): don't try to send data more than SSIZE_MAX
+ with single sendfile call..
+ based on the patch by Eric Wong. [ruby-core:30908]
+
+Sun Jun 27 10:41:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed):
+ no reason that bin directory should be included in $LOAD_PATH.
+ it is for executable files, but not libraries. [ruby-core:25936]
+
+Sat Jun 26 11:56:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (clear-installed-list): put redirection before set
+ command, since it seems to be handled by nmake in special way.
+ [ruby-dev:41711]
+
+Fri Jun 25 06:24:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/un.rb (httpd): MaxClients also should be integer.
+ [ruby-dev:41724] [Bug #3477]
+
+ * lib/un.rb (setup): fix of word splitting. [ruby-dev:41723]
+ [Bug #3476]
+
+Wed Jun 16 01:38:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
+ On Debian/lenny, which is a "supported" platform, ffi.h is installed
+ in /usr/include/i486-linux-gnu/. This causes build error when using
+ gcc whose target is not i486-linux-gnu.
+
+Tue Jun 15 17:14:58 2010 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/fiddle/extconf.rb: De Morgan's laws.
+
+Tue Jun 15 12:09:00 2010 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
+
+Wed Jun 16 00:04:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_io.rb (safe_4): does not use Timeout because
+ Timeout.timeout uses Thread#kill which raises SecurityError when
+ $SAFE == 4. based on a patch from Tomoyuki Chikanaga.
+ [ruby-dev:41484]
+
+ * test/ruby/test_io.rb (test_print_separators): use pipe (test helper
+ method) instead of IO.pipe. [ruby-dev:41484]
+
+Mon Jun 14 04:03:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/fiddle/closure.c (dealloc): refix workaround r28300.
+ don't use ffi_closure_alloc, ffi_prep_closure_loc and
+ ffi_closure_free on MACOSX and __linux__.
+ [ruby-dev:41483] [ruby-dev:41214]
+
+Sun Jun 13 15:46:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_rubyoptions.rb: add a simple test for __END__ and
+ DATA.
+
+Fri Jun 11 22:59:31 2010 Tanaka Akira <akr@fsij.org>
+
+ * include/ruby/missing.h (isnan): fix compilation error on OpenBSD.
+
+Thu Jun 24 05:44:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (struct dump_arg, struct load_arg): merge taint and
+ untrust flags into infection as bit flags.
+
+ * marshal.c (w_nbyte, clear_dump_arg): infect the buffer as soon
+ as appending, because it might have been finalized already at
+ exit. based on a patch by Tomoyuki Chikanaga
+ at [ruby-dev:41672]. [Bug #3463]
+
+Wed Jun 23 17:12:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * NEWS (ptr): new method and deprecated methods. [ruby-dev:41681]
+
+ * ext/pty/{README,README.ja}: ditto.
+
+ * ext/pty/pty.c (pty_check): add rdoc.
+
+Wed Jun 23 12:44:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_regexp.rb (test_dup_warn): read in UTF-8
+ encoding regardless environment.
+
+ * test/ruby/envutil.rb (invoke_ruby): add encoding option.
+
+Tue Jun 22 23:10:10 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (num_exact): fix for mathn. [ruby-dev:41599]
+
+
+Tue Jun 22 22:00:06 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/lib/socket.rb: suppress warnings.
+
+Tue Jun 22 13:26:47 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/delegate.rb: Forward #trust, #untrust, #taint and #untaint
+ to both the delegator and __getobj__ [ruby-core:26138]
+
+Tue Jun 22 01:38:23 2010 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
+ many arguments. [ruby-dev:41481]
+
+ * test/drb/test_drb.rb: ditto.
+
+ * test/drb/drbtest.rb: ditto.
+
+Tue Jun 22 00:57:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/webrick/httpservlet/filehandler.rb
+ (prevent_directory_traversal): apply filesystem encoding to path
+ only during calling File.expand_path. [ruby-dev:41423]
+
+Mon Jun 21 23:41:08 2010 wanabe <s.wanabe@gmail.com>
+
+ * eval_error.c (error_print): clear raised_flag while error-printing
+ to avoid hang. [ruby-core:27608]
+
+ * test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
+ above.
+
+Fri Jun 18 23:08:18 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * Makefile.in (distclean-ext): removes directories for extensions
+ correctly.
+
+ * common.mk (realclean-local): removes id.h too.
+
+Fri Jun 18 01:33:21 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * enc/Makefile.in (realclean): has been missing. necessary
+ for make realclean-enc.
+
+Fri Jun 18 01:12:33 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * configure.in (RMDIRS): reverts r27011 because it causes bothersome
+ messages on make clean.
+
+Thu Jun 17 18:55:01 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (rb_str_encode_ospath): when the encoding of the parameter
+ is ASCII-8BIT, should recognize as filesystem encoding, and convert
+ to UTF-8 on Windows.
+
+ * file.c (realpath_rec): should convert to ospath encoding before
+ calling lstat().
+
+ * file.c (rb_realpath_internal): resolved string should take over
+ the encoding of base string.
+
+ * transcode.c (rb_str_encode): should return new string always.
+ fixed #3444.
+
+Thu Jun 17 18:22:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/digest/sha2/lib/sha2.rb: revert r28347. It's my mistake.
+
+Thu Jun 17 17:32:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so",
+ for the filename extension part of native libraries.
+
+Thu Jun 17 17:30:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/digest/sha2/extconf.rb: remove a check for uint64_t.
+
+Wed Jun 16 18:35:20 2010 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/digest: Work around a build problem with VC++ 2010, likely
+ due to a bug of its cl.exe. [Bug #3231]
+
+Wed Jun 16 15:44:59 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * error.c (rb_bug): existance of _set_abort_behavior() depends on
+ runtime version, not compiler version.
+
+Mon Jun 14 22:36:09 2010 Tanaka Akira <akr@fsij.org>
+
+ * test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS
+ for Windows.
+
+ * test/socket/test_nonblock.rb (test_sendmsg_nonblock_error): ditto.
+
+ [ruby-dev:41597] reported by Masaya Tarui.
+
+Sun Jun 13 04:27:55 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/delegate.rb: Delegate !=, eql? and hash [ruby-core:26139]
+
+Sun Jun 13 02:17:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/trans/utf8_mac.trans (buf_apply): fix for patterns
+ whose result is 2 bytes. [ruby-core:30751]
+
+Sun Jun 13 01:40:52 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * time.c (rb_localtime_r2): fix mixed declarations and code.
+
+Sun Jun 13 01:37:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/dl/lib/dl.rb: don't require when already loaded.
+
+Sun Jun 13 01:37:08 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/fiddle/closure.c (dealloc): workaround fix for libffi's
+ ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]
+
+Fri Jun 11 23:21:35 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (init_leap_second_info): check the result of
+ gmtime_with_leapsecond.
+
+Fri Jun 11 22:39:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/rubygems/install_update_options.rb
+ (Gem::InstallUpdateOptions#add_install_update_options): deprecate
+ --test option which has not worked. [ruby-core:21714]
+
+ * test/rubygems/test_gem_command_manager.rb: ditto.
+
+Fri Jun 11 22:36:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * README: add a note about linking a library whose license is not
+ compatible with Ruby License. [ruby-core:30662]
+
+Sun Jun 6 19:55:21 2010 Tanaka Akira <akr@fsij.org>
+
+ * array.c (rb_ary_product): clear uninitialized elements in temporary
+ array.
+
+Sat Jun 5 06:20:57 2010 Eric Hodel <drbrain@segment7.net>
+
+ * dir.c: Clarification of what '*' matches. Patch by John Wells
+ <john.wells at greatworx.com>
+
+Thu Jun 3 00:58:45 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/dl/lib/dl/cparser.rb (parse_ctype): add backwards compatibility
+ by supporting "uint" types in the c parser. [ruby-core:29750]
+ * test/dl/test_cparser.rb: adding a test for "uint" changes.
+
+Wed Jun 2 11:40:02 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * compile.c (iseq_compile_each): should consider block on stack,
+ if block argument is passed. [ruby-core:30534]
+
+ * parse.c (arg_concat_gen): should append to nd_head, not to
+ nd_iter for NODE_BLOCK_PASS.
+
+Fri Jun 11 07:34:25 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (find_time_t): test the result of LOCALTIME.
+
+Mon May 31 15:07:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * file.c (file_expand_path): Refix r28102: this breaks
+ r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]
+
+Mon May 31 02:17:54 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * insns.def (defined): respond_to_missing? may not be available
+ (for BasicObject instances).
+
+Sun May 30 21:48:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/tempfile.rb (Tempfile#unlink): leave @data. Assigning nil to
+ @data caused double closing error of the same IO in finalizer. a
+ patch from Simon Nicholls. [ruby-core:29395]
+
+Sun May 30 16:54:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * file.c (rb_file_directory_p): update rdoc. a patch from Ilkka
+ Laukkanen. [ruby-core:30016]
+
+Sat Jun 5 16:39:13 2010 Tanaka Akira <akr@fsij.org>
+
+ * .gdbinit (rp): show type name for RTypedData.
+
+Sat Jun 5 10:03:31 2010 Tanaka Akira <akr@fsij.org>
+
+ * .gdbinit (rp): detect and show RTypedData.
+
+Fri May 28 20:35:21 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (blocking_region_begin): avoid RUBY_VM_CHECK_INTS()
+ call during GVL state transition. [Bug#3354] [ruby-dev:41435]
+
+Fri Jun 11 00:42:45 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (rb_localtime_r2): fix localtime overflow check.
+
+Thu Jun 10 23:05:44 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (rb_localtime_r2): refine localtime overflow check for
+ FreeBSD 6.4.
+
+Thu Jun 10 21:35:27 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (find_time_t): always outerpolate from past.
+ [ruby-core:30672] reported by Benoit Daloze.
+ backport r28238 from trunk.
+
+ * time.c (calc_tm_yday): extracted from timegmw_noleapsecond.
+ backport r28236 from trunk.
+
+Thu Jun 10 10:06:25 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_putc): documentation updated to mention putc would
+ not work well with multi-byte characters. [ruby-core:30697]
+
+ * io.c (rb_f_putc): ditto.
+
+Tue Jun 8 22:14:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/etc/etc.c (etc_systmpdir): moved from ext/tmpdir.
+
+ * ext/etc/etc.c (etc_sysconfdir): added.
+
+ * lib/rubygems/config_file.rb, lib/tmpdir.rb: use etc.
+
+Tue Jun 8 06:27:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gem_prelude.rb: load full rubygems at LoadError for activation
+ check. [ruby-core:29486]
+
+Tue Jun 8 06:04:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (parse_mode_enc): set set_by_bom bit. [ruby-core:30641]
+
+Sun Jun 6 23:35:12 2010 Masaya Tarui <tarui@ruby-lnag.org>
-Mon Feb 17 01:41:59 2014 Masaki Matsushita <glass.saga@gmail.com>
+ * gc.c (heaps_slot, assign_heap_slot, gc_sweep): skip sweep if
+ heap_slot's status is pre-free phase. [ruby-dev:41543]
- * hash.c (rb_hash_rehash): fix to free new st_table when exception
- is raised in do_hash(). [Bug #9187]
+Sun Jun 6 22:37:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Feb 17 01:18:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_buf_cat_escaped_char): get rid of buffer
+ overflow on platforms int is bigger than 32bit, and warnings.
- * eval.c (rb_mod_s_constants): return its own constants for other
- than Module itself. [ruby-core:59763] [Bug #9413]
+Sun Jun 6 10:44:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Feb 17 01:16:00 2014 Eric Wong <e@80x24.org>
+ * array.c (rb_ary_product): need to set the length in order to get
+ the entries marked. [ruby-dev:41540]
- * ext/json/generator/depend: add build dependencies for json extension
- [Bug #9374] [ruby-core:59609]
- * ext/json/parser/depend: ditto
+Sun Jun 6 08:26:01 2010 Tanaka Akira <akr@fsij.org>
-Mon Feb 17 01:12:57 2014 Yusuke Endoh <mame@tsg.ne.jp>
+ * vm.c (Init_BareVM): call Init_native_thread here.
- * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
- [ruby-core:57599] [Bug #8978].
+ * thread.c (Init_Thread): don't call Init_native_thread.
-Mon Feb 17 01:12:57 2014 Aaron Patterson <aaron@tenderlovemaking.com>
+ * thread_pthread.c (Init_native_thread): exported.
- * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
- [ruby-core:57599] [Bug #8978]. Thanks mame!
+ * thread_win32.c (Init_native_thread): ditto.
-Mon Feb 17 01:09:52 2014 Eric Wong <e@80x24.org>
+ [ruby-dev:41536]
- * benchmark/driver: avoid large alloc in driver process
- [ruby-core:59869] [Bug #9430]
+Sun Jun 6 08:21:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Feb 17 00:59:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * NEWS: Enumerable#join has been reverted. [ruby-core:30604]
- * thread_pthread.c (rb_thread_create_timer_thread): fix for platforms
- where PTHREAD_STACK_MIN is a dynamic value and not a compile-time
- constant. [ruby-dev:47911] [Bug #9436]
+Sun Jun 6 02:56:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Feb 17 00:59:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * encoding.c (rb_enc_unicode_p): check the encoding is Unicode
+ or not by the name; not function's pointer. [ruby-dev:41479]
- * thread_pthread.c (rb_thread_create_timer_thread): expand timer
- thread stack size to get rid of segfault on FreeBSD/powerpc64.
- based on the patch by Steve Wills at [ruby-core:59923].
- [ruby-core:56590] [Bug #8783]
+Sat Jun 5 23:15:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Feb 17 00:45:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (rb_reg_expr_str): ASCII incompatible strings
+ must always escape or converted.
- * string.c (rb_str_modify_expand): enable capacity and disable
- association with packed objects when setting capa, so that
- pack("p") string fails to unpack properly after modified.
+ * re.c (rb_reg_expr_str): use rb_str_buf_cat_escaped_char
+ when resenc is given: for Regexp#inspect or error message.
-Sun Feb 16 01:36:57 2014 Aaron Patterson <aaron@tenderlovemaking.com>
+ * re.c (rb_reg_desc): add 'n' for ENCODING_NONE.
- * ext/psych/yaml/emitter.c: merge libyaml 0.1.5
- * ext/psych/yaml/loader.c: ditto
- * ext/psych/yaml/parser.c: ditto
- * ext/psych/yaml/reader.c: ditto
- * ext/psych/yaml/scanner.c: ditto
- * ext/psych/yaml/writer.c: ditto
- * ext/psych/yaml/yaml_private.h: ditto
+Sat Jun 5 23:15:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Feb 16 01:02:32 2014 Zachary Scott <e@zzak.io>
+ * string.c (sym_inspect): Escape when the symbol is not
+ resulted encoding and not ascii_only. It had escaped
+ ascii-incompatible string, but it is wrong.
- * lib/racc/rdoc/grammar.en.rdoc: [DOC] Correct grammar and typos
- Patch by Giorgos Tsiftsis [Bug #9429] [ci skip]
+Sat Jun 5 23:15:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Feb 16 01:00:45 2014 Zachary Scott <e@zzak.io>
+ * string.c (rb_str_buf_cat_escaped_char): defined.
+ Splited from rb_str_inspect.
- * lib/open-uri.rb: [DOC] use lower case version of core classes, same
- as commit r44878, based on patch by Jonathan Jackson [Bug #9483]
+Sat Jun 5 23:14:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Feb 16 01:00:45 2014 Zachary Scott <e@zzak.io>
+ * string.c (rb_str_inspect): inspect as ASCII when the codepoint
+ of a character in Unicode string is ASCII printable one.
- * ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
- classes when referring to return value, since we aren't directly
- talking about the class. Patch by Jonathan Jackson [Bug #9483]
+Sat Jun 5 15:59:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Feb 16 00:57:13 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ruby.c (process_options, load_file_internal): $0 seen from
+ required libraries by -r option should be the main script.
+ [ruby-core:23717]
- * variable.c: [DOC] adding extra example in docs.
- patched by Steve Klabnik. [Bug #9210]
+Sat Jun 5 15:15:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Feb 16 00:54:50 2014 Tanaka Akira <akr@fsij.org>
+ * test/ruby/envutil.rb (EnvUtil#invoke_ruby): support for child
+ process env.
- * lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
+Sat Jun 5 14:11:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/net/imap/test_imap.rb (test_exception_during_shutdown):
+ need to raise always.
+
+Sat Jun 5 13:10:47 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/matrix.rb (eql?, ==, minor): Fix bugs when comparing/returning
+ some empty matrices.
+
+Sat Jun 5 11:00:48 2010 Tanaka Akira <akr@fsij.org>
+
+ * error.c (rb_name_err_mesg_new): guard mesg, recv and method.
+ The problem in [ruby-dev:41464] is caused because mesg is collected.
+
+Sat Jun 5 08:30:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_f_test): 'W' should test writable by real uid/git,
+ not world writable. [ruby-core:30587]
+
+Fri Jun 4 10:46:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/dl/cfunc.c (rb_dlcfunc_inspect): should taint the result.
+ [ruby-dev:41533]
+
+Thu Jun 3 23:34:55 2010 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/digest/lib/digest/hmac.rb: Emit a deprecation warning in
+ verbose mode and add a caution to the overview section of the
+ document. [ruby-dev:41525]
+
+Thu Jun 3 19:33:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/dl/cfunc.c (rb_dlcfunc_inspect): suppress warnings by
+ rb_sprintf.
+
+ * ext/dl/cptr.c (rb_dlptr_s_malloc): suppress warnings.
+
+Thu Jun 3 18:58:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * load.c (ruby_init_ext): statically linked extensions have no
+ real path. [ruby-dev:41526]
+
+ * vm.c (rb_vm_call_cfunc): add filepath argument.
+
+Thu Jun 3 18:17:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/rake/test_win32.rb (Rake::TestWin32): update tests.
+ [ruby-core:30309]
+
+ * test/io/nonblock/test_flush.rb (test_flush): try pipe and
+ socketpair. [ruby-dev:41517]
+
+Thu Jun 3 09:39:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/dl/dl.h (DLSTACK_TYPE): type of stack is same as VALUE.
+ reported by sakiyama shin in [ruby-dev:41514]
+
+Thu Jun 3 06:30:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_path.rb (test_path): workaround for drive
+ letter.
+
+ * test/ruby/test_path.rb (test_path): get rid of blocking on
+ access to non-existent host.
+
+Tue Jun 1 23:22:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (unescape_nonascii): \P{FOO} is also Unicode property in
+ regexp. [ruby-core:30540]
+
+Tue Jun 1 01:14:31 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * io.c (pipe_open): add RB_GC_GUARD.
+ This caused failure when test/ruby/test_argf.rb is executed with
+ GC.stress = true in mswin32_90
+
+Mon May 31 19:25:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * regparse.c (onig_syntax_warn): do not use external strings as
+ printf format.
+
+Mon May 31 18:22:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line
+ always regardless of ruby.
+
+Mon May 31 04:03:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): check if expanded dname encoding is
+ compatible with fname, not just copying. [ruby-core:30516]
+
+ * test/ruby/test_beginendblock.rb (test_endblockwarn): needs
+ encoding comment.
+
+Mon May 31 01:28:58 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/delegate: Delegator: combine (public|protected) methods with
+ those of the delegated object. [ruby-core:27224]
+ DelegateClass: combine (public|protected) instance methods
+ with those of the delegated superclass.
+
+Sun May 30 22:14:14 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/set.rb (keep_if, select!): New methods [ruby-core:29749]
+
+Sun May 30 19:17:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: updated to b856dd07.
+ this cleans warnings.
+
+Sun May 30 18:49:45 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/rdoc/generator/template/darkfish/classpage.rhtml:
+ fix encoding value of XML declaration. [ruby-dev:41452]
+
+Sun May 30 03:40:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_tokadd_utf8, parser_tokadd_string): allow NUL
+ containing symbol literals, as well as String#to_sym.
+ [ruby-dev:41447]
+
+Sun May 30 02:21:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
+ This caused failure when test/csv is executed with GC.stress = true.
+
+Sun May 30 00:02:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * gc.c (force_chain_object, rb_objspace_call_finalizer): delete
+ finalizer entry after corresponding finalizer is executed.
+ This caused SEGV when test/cgi is executed with GC.stress = true.
+
+Sat May 29 23:30:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * string.c (str_replace_shared): change embedded state atomically.
+ [ruby-core:29953] [ruby-dev:41456]
+
+Fri May 28 00:32:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * insns.def (invokesuper): check consistency between class of self and
+ class of method being invoked by super. This is temporary measure
+ for YARV. See [ruby-core:30313] in detail. See [ruby-dev:40959]
+ [ruby-dev:39772] [ruby-core:27000] [ruby-core:27230]
+
+ * vm_insnhelper.c (vm_search_superclass): ditto.
+
+Thu May 27 12:42:23 2010 Akinori MUSHA <knu@iDaemons.org>
+
+ * LGPL: Removed. We no longer have LGPL'd source files in our
+ tree.
+
+Wed May 26 18:40:23 2010 Masaya Tarui <tarui@ruby-lang.org>
+
+ * test/rinda/test_rinda.rb (TupleSpaceTest, TupleSpaceProxyTest):
+ kill a used thread at teardown. [ruby-dev:41397]
+
+Wed May 26 11:50:09 2010 Eric Hodel <drbrain@segment7.net>
+
+ * marshal.c (Init_marshal): document marshal_dump and marshal_load.
+
+Mon May 24 23:04:41 2010 Tanaka Akira <akr@fsij.org>
+
+ * error.c: fix wrong exception class name in rdoc.
+
+Sat May 29 13:55:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (rb_filesystem_encindex): avoid infinite require
+ loop. [ruby-core:30467]
+
+Sat May 29 12:05:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.
+ [ruby-dev:41452]
+
+Sat May 29 09:34:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/envutil.rb: fix for --disable-gems.
+
+Fri May 28 18:39:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (sym_inspect): escape ASCII-compatible strings.
+
+ * string.c (rb_str_inspect): escape ASCII-compatible strings.
+
+Fri May 28 17:34:48 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * array.c (rb_ary_product): Use tmpary instead, to ensure marking
+ arrays by GC.
+
+Fri May 28 11:58:42 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * array.c (rb_ary_product): Do not rely on GC, t0 should be
+ checked explicitly.
+
+Fri May 28 10:40:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (checking_for): ignore toplevel.
+
+Fri May 28 00:47:16 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * error.c (rb_bug): suppress the error report dialog if report_bug()
+ is finished successfly.
+
+Thu May 27 23:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * include/ruby/encoding.h (rb_filesystem_encindex): defined.
+
+ * include/ruby/encoding.h (rb_locale_encindex): ditto.
+
+ * encoding.c (rb_filesystem_encindex): remove static.
+
+ * encoding.c (rb_locale_encindex): ditto.
+
+Thu May 27 23:51:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * file.c (rb_home_dir): set filesystem encoding.
+
+Thu May 27 23:51:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * file.c (file_expand_path): set encoding as the same of fname
+ when _result_ is not filesystem encoding. [ruby-dev:41429]
+
+Thu May 27 23:51:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * file.c (file_expand_path): use rb_enc_associate_index and
+ rb_filesystem_encindex. Strings related FileSystem should
+ have filesystem_encoding.
+
+ * file.c (SET_EXTERNAL_ENCODING): removed.
+
+Thu May 27 22:39:23 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_read): call ReadFile() with len = 0 before
+ reading really on console, because the first ReadFile() call after
+ PeekConsoleInput() always returns broken data. (Windows's bug).
+ [ruby-core:29018]
+
+Wed May 26 20:19:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (random_rand): add the result of random to the
+ beginning of range, not the opposite. [ruby-dev:41415]
+
+Wed May 26 19:55:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (file_expand_path): revert a part of r22392. it's commit miss.
+
+Wed May 26 12:08:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (random_rand): subtraction method of non-numeric can
+ return Float. [ruby-dev:41410]
+
+Wed May 26 10:35:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (rb_cv_large_fd_select): needed on mingw, even
+ though fd_mask is not available. [ruby-core:30401]
+
+Wed May 26 00:13:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regparse.c (add_code_range_to_buf0): fix false negative
+ warning when given range is just before previous range.
+ [ruby-dev:41406]
+
+Tue May 25 16:37:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-style.el (ruby-style-version): take revision if
+ keyword is expanded. [ruby-dev:41408]
+
+Tue May 25 13:26:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/vm.h, include/ruby/encoding.h: add external
+ linkage.
+
+Tue May 25 01:46:49 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_eval.c (rb_f_caller): update rdoc. a patch from Nobuhiro IMAI
+ <nov at yo.rim.or.jp> in [ruby-dev:41387].
+
+Mon May 24 19:00:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (warn_balanced, parser_yylex): no warnings after closing
+ parens.
+
+Mon May 24 08:16:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * process.c (rb_f_spawn): use correct command name for the error
+ message. [ruby-dev:41395]
+
+Fri May 21 01:06:05 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread.c (subtract_tv): if the rest is zero, should finish waiting
+ immediately.
+
+ * win32/win32.c (subtract): ditto.
+ based on a patch from Roger Pack in [ruby-core:27957].
+
+Thu May 20 22:49:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * re.c (rb_reg_s_union_m): update rdoc. [ruby-dev:41354]
+
+Thu May 20 20:47:46 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_invoke): raise NoMethodError
+ when COM method is not found. [ruby-core:30160] [Bug #3277]
+
+ * test/win32ole/test_win32ole.rb (test_no_method_error): ditto.
+
+Wed May 19 23:36:57 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: [ruby-dev:41334] [Bug #3307] invalid result
+ on searching tcl.h/tk.h. Thanks, Masaya Tarui.
+
+Wed May 19 23:19:30 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP
+ object only when it is not closed. [ruby-dev:41350]
+
+Sun May 9 08:24:24 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (disconnect): terminates @receiver_thread even if
+ @sock.shutdown raises an exception. [ruby-dev:34881]
+
+Sun May 16 22:17:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * eval.c (setup_exception): let SystemStackError#backtrace return an
+ single element array instead of string itself. [ruby-core:30196]
+
+Sun May 23 17:29:41 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * common.mk (capi): uses a timestamp file to get rid of
+ generating twice.
+
+Sun May 23 17:48:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/openssl/lib/openssl/x509-internal.rb, lib/forwardable.rb,
+ lib/irb/cmd/fork.rb, lib/mutex_m.rb,
+ lib/shell/process-controller.rb, lib/sync.rb, object.c:
+ suppress warnings patched by Benoit Daloze at [ruby-core:30366].
+
+ * parse.y (warn_balanced): no warning for singleton class.
+ [ruby-core:30366]
+
+Sun May 23 17:16:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
+ warnings with -Wconversion.
+
+Sat May 22 06:46:45 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * cont.c: revert FIBER_USE_NATIVE feature.
+ i.e. r27635, r27643, r27646, r27682, r27701
+
+Fri May 21 23:46:43 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_invoke): merged from trunk (r27922).
+ raise NoMethodError when COM method is not found.
+
+ * test/win32ole/test_win32ole.rb (test_no_method_error): ditto.
+
+Fri May 21 19:11:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
string.
- Patch by Ryan Brunner. [ruby-core:58220] [Bug #9093]
-Sun Feb 16 00:50:59 2014 Zachary Scott <e@zzak.io>
+Thu May 20 22:19:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_eval.c (rb_f_caller): update rdoc. a patch from Nobuhiro IMAI
+ <nov at yo.rim.or.jp> in [ruby-dev:41348].
+
+Thu May 20 22:17:24 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm.c (vm_backtrace_each): now takes an init function to distinguish
+ an empty stack from out of stack. [ruby-dev:41366]
+
+ * vm_eval.c (print_backtrace, rb_thread_backtrace): ditto.
+
+Wed May 19 22:48:06 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/extconf.rb: mswin/mingw ruby has socketpair(), but it's
+ not exist as such name in ruby static library, so mkmf.rb cannot
+ find it.
+
+Wed May 19 20:09:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_eval.c (rb_f_caller): return [] instead of nil when the function
+ is called on toplevel. [ruby-dev:41348]
+
+Wed May 19 20:06:11 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * iseq_compile_each (NODE_DEFINED): put nil first to fix stack
+ consistency. [ruby-core:30293]
+ Now, lfinish[0] of defined_expr seems not to be used. Refactoring
+ may be needed.
+
+Wed May 19 17:22:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * version.h (RUBY_VERSION_TEENY): revert to API version 1.9.1.
+
+Wed May 19 10:46:05 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (argv_size): merged into join_argv() to maintain the
+ agreement with it. removed code has a calclulation bug.
+ fixed [Bug#2388]
+
+ * win32/win32.c (join_argv): calc and return the length of joined
+ argv.
+ the cause of the original bug was clarified by Masaya TARUI
+ <tarui AT prx.jp> and the solution was suggested by him, too.
+
+Mon May 17 11:09:58 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/fileutils.rb (FileUtils::Entry_#entries): returns pathname in
+ UTF-8 on Windows to allow FileUtils accessing all pathnames
+ internally.
+
+Sun May 16 22:21:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * proc.c (mnew): initialize a field. a patch from Takahiro Kambe.
+ [ruby-dev:41312]
+
+Sun May 16 17:16:09 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * proc.c (proc_binding): don't propagative filename and line_no of
+ binding that is created from C level. [ruby-dev:41322]
+
+ * vm_eval.c (eval_string_with_cref): ditto.
+
+Sun May 16 13:55:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * error.c (rb_loaderror): use locale string, not ascii-8bit.
+
+Sun May 16 21:14:04 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
+ fixes "NoMethodError: undefined method `[]=' for nil:NilClass"
+
+Fri May 14 01:17:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_core.c (rb_thread_struct): add a field for sigaltstack.
+
+ * thread_pthread.c (thread_start_func_1): initialize machine stack
+ information.
+
+ * thread.c (thread_start_func_2): set sigaltstack for each sub thread.
+ [ruby-core:24540] [ruby-core:30207]
+
+Thu May 13 07:37:49 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/sdbm/_sdbm.c: include unistd.h before sdbm.h for off_t.
+ fix compilation problem on FreeBSD 6.4.
+
+Wed May 12 11:39:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/extconf.rb: test all IPPROTO_* constants for recent Win32
+ SDK.
+
+Tue May 11 23:07:22 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/extconf.rb: test IPPROTO_IP and IPPROTO_IPV6 constants.
+
+ * ext/socket/mkconstants.rb: define macros for enum.
+
+ [ruby-dev:38849]
+
+Tue May 11 21:53:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/rake/test_task_arguments.rb: makes ENV empty during tests
+ because ENV may change the behavior of Rake::TaskArguments.
+ [ruby-core:29984]
+
+Tue May 11 09:57:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval_intern.h (rb_vm_get_sourceline): add prototype.
+
+Tue May 11 09:53:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/psych/parser.c (PSYCH_TRANSCODE): get rid of bare use of gcc
+ extension.
+
+Mon May 10 02:58:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (iseq_compile_each), vm_insnhelper.c (vm_invoke_block,
+ vm_throw): allow "return" and "yield" even in singleton class
+ definition. based on a patch from wanabe <s.wanabe AT gmail.com>
+ for "return". [ruby-core:21379] [ruby-dev:40975]
+
+ * insns.def (defineclass): ditto (straightforwardly push block ptr,
+ instead of dfp ptr with special flag).
+
+ * vm_core.h (RUBY_VM_CLASS_SPECIAL_P): ditto (no longer needed).
+
+ * proc.c (proc_new): ditto (remove handling for special flag).
+
+ * bootstraptest/test_jump.rb: add tests for above.
+
+Sun May 16 14:41:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (dln_find.o): fix dependency.
+
+Sun May 9 23:07:53 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * proc.c (proc_dup): copy blockprocval. proc_dup is used by
+ define_method, which made blockprocval be GC'ed mistakenly.
+ [ruby-core:30023]
+
+Sun May 16 14:55:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (dln_find.o): fix dependency.
+
+Tue May 11 01:20:43 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/parser.c (parse): Return strings encoded as
+ Encoding.default_internal if set.
+
+Mon May 10 03:36:56 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_eval.c (eval_string_with_cref): propagative filename and line_no
+ of binding. [ruby-dev:38767] [ruby-core:28307]
+
+ * vm_core.h (rb_binding_t), proc.c: add filename and line_no fields to
+ preserve them.
+
+Mon May 10 02:29:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * cont.c (fiber_switch): raise FiberError when returning to dead
+ fiber. [ruby-dev:40833]
+
+Sun May 16 11:39:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/missing.h (signbit): add missing prototype.
+
+Sun May 16 10:49:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
+ a patch by Masaya TARUI <tarui AT prx.jp>.
+
+Sun May 16 02:23:00 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * configure.in: can not load libruby.so if gcc is used with
+ --enable-shared on AIX.
+
+Sat May 15 17:16:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
+ errno is not set. [ruby-dev:41317]
+
+Thu May 13 18:20:16 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * io.c (swallow): should use more_char() instead of fill_cbuf().
+ suggested by akr.
+
+Thu May 13 13:09:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (rb_vm_get_sourceline): moved from eval_intern.h for
+ vm_dump.c.
+
+Thu May 13 13:04:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * io.c (swallow): support text mode and UTF-16/32 as internal encoding.
+ [Bug #1576]
+
+ * io.c (io_shift_cbuf): read and throw it away when str is NULL.
+
+Wed May 12 16:43:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flo_to_s): fixed broken output including nuls.
+
+Wed May 12 16:34:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval_intern.h (rb_vm_get_sourceline): add prototype.
+
+Wed May 12 16:25:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flo_to_s): exponent needs 2 digits.
+
+Mon May 10 06:59:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * common.mk (rdoc): rdoc should depend main. Moreover when XRUBY
+ is miniruby, it can run after miniruby is built.
+
+Tue May 11 15:14:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/utf_8.c: Add new alias UTF-8-HFS for UTF8-MAC.
+ http://www.gnu.org/software/emacs/NEWS.23.2
+
+Wed May 12 09:21:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (rb_reg_initialize_m): fix wrong index for the lang
+ option's value 'N'. reported by Masaya TARUI via IRC.
+
+Wed May 12 16:02:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flo_to_s): fill lower zeros.
+
+Wed May 12 15:50:20 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rdoc/generator/ri.rb (generate): should load existing cache
+ before generating it.
+
+Wed May 12 15:37:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flo_to_s): make minimum string representation.
+ [ruby-core:30145]
+
+Wed May 12 15:04:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#log): improved
+ precision and performance. [ruby-dev:41295]
+
+Tue May 11 14:26:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb (atan),
+ test/bigdecimal/test_bigmath.rb (test_atan): explicitly specify
+ the precision for calculating a reciprocal number of an argument.
+ [Bug #3267]
+
+Tue May 11 14:10:36 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * time.c (rb_big_abs_find_minbit): get rid of a warning of VC.
+
+Tue May 11 14:09:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c, include/ruby/win32.h (rb_w32_has_cancel_io): new
+ function.
+
+ * io.c (WAIT_FD_IN_WIN32): check only when it's not cancelable.
+
+Tue May 11 11:49:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/sdbm/sdbm.h (DBM): large file support on win32.
+ [ruby-core:23039]
+
+ * ext/sdbm/depend: objects depend on sdbm.h.
+
+Mon May 10 23:50:19 2010 Tanaka Akira <akr@fsij.org>
+
+ * pack.c (pack_unpack): add a missing break.
+
+Sun May 9 23:53:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (RB_GC_GUARD_PTR): get rid of removal by
+ optimization.
+
+Sun May 9 16:28:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * cont.c (fiber_initialize_machine_stack_context): try to release
+ unnecessary fibers and retry to create. based on a patch from
+ masaya tarui at [ruby-dev:41230].
+
+Sun May 9 08:32:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json/generator/generator.c (fbuffer_inc_capa):
+ fix tha use of REALLOC_N. [ruby-dev:41227]
+
+Sun May 9 09:15:03 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/net/imap/test_imap.rb: use IPv4 for
+ test_imaps_post_connection_check. [ruby-dev:41189]
+
+Sun May 9 02:57:02 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
+ yet. [ruby-core:30095]
+
+Sun May 9 09:30:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
+
+ * ext/json/{generator,parser}/depend: added.
+
+Sun May 9 05:44:59 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * include/ruby/ruby.h (rb_intern): fix compile error.
+
+Sun May 9 02:37:33 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * io.c (nogvl_copy_stream_sendfile): mixed decls not allowed.
+
+ * include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
+ arguments.
+
+Sun May 9 01:15:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * cont.c (stackgrowdirection): removed duplicated code, use
+ STACK_UPPER macro instead.
+
+ * gc.h (STACK_DIR_UPPER): moved from thread_pthread.c.
+
+Sun May 9 00:35:56 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * test/dl/test_base.rb (libc_so, libm_so): supports solaris.
+
+Sun May 9 00:27:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_aset): fixed argument type.
+
+Sat May 8 19:03:31 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * spec/default.mspec (config): . is no longer in $:.
+
+Sat May 8 13:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * array.c (rb_ary_fetch, rb_ary_splice, rb_ary_store): Improve
+ IndexError messages [ruby-core:28394]
+
+ * hash.c (rb_hash_fetch_m): Improve KeyError message
+
+Sat May 8 11:07:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (VpAlloc): ensure buf does not get
+ collected. based on a patch masaya tarui at [ruby-dev:41213].
+
+Sat May 8 10:03:39 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/lib/socket.rb (BasicSocket#connect_address): MacOS X 10.6
+ returns "::ffff:a.b.c.d" for IPv4-mapped IPv6 address.
+ [ruby-dev:41215] patch by Tomoyuki Chikanaga.
+
+Fri May 7 11:30:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/rbinstall.rb (install-man): install mdocs directly without
+ temporary files. [ruby-dev:41204]
+
+Fri May 7 09:16:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/tk/extconf.rb (get_tclConfig_dirs): glob with EXEEXT.
+
+ * ext/tk/extconf.rb (search_tclConfig): fixed typo.
+
+Fri May 7 06:45:28 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: search directories on PATH, only if containing
+ tclsh or wish command (probably right fix for [ruby-core:30010]).
+
+Fri May 7 03:40:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (VpCtoV): fix to check overflow.
+
+Thu May 6 22:19:38 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * cont.c: define FIBER_USE_NATIVE only when _WIN32_WINNT >= 0x0400
+ on Windows because Fiber APIs are supported only such building
+ (and running) environments.
+ [ruby-dev:41192]
+
+Thu May 6 19:13:43 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/openssl/test_ec.rb: added test_dsa_sign_asn1_FIPS186_3. dgst is
+ truncated with ec_key.group.order.size after openssl 0.9.8m for
+ FIPS 186-3 compliance.
+
+ WARNING: ruby-openssl aims to wrap an OpenSSL so when you're using
+ openssl 0.9.8l or earlier version, EC.dsa_sign_asn1 raises
+ OpenSSL::PKey::ECError as before and EC.dsa_verify_asn1 just returns
+ false when you pass dgst longer than expected (no truncation
+ performed).
+
+ * ext/openssl/ossl_pkey_ec.c: rdoc typo fixed.
+
+Thu May 6 18:12:43 2010 Koichi Sasada <ko1@atdot.net>
+
+ * cont.c (fiber_setcontext): Fix last commit.
+
+Thu May 6 17:16:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * time.c (rb_localtime_r2): get rid of infinite loop bug of
+ localtime() on x86_64-darwin. [ruby-core:30031]
+
+Thu May 6 15:56:12 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/fiddle/*: Adding fiddle library to wrap libffi
+ * test/fiddle/*: testing fiddle extension
+ * ext/dl/lib/dl.rb: Requiring fiddle if it is available
+ * ext/dl/lib/dl/callback.rb: using Fiddle if it is available
+ * ext/dl/lib/dl/func.rb: ditto
+
+Thu May 6 15:04:37 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (rb_str_match_m): add description about optional
+ position parameter. [ruby-list:47064]
+ patched by KISHIMOTO, Makoto <ksmakoto AT dd.iij4u.or.jp>
+
+Thu May 6 14:12:39 2010 Tanaka Akira <akr@fsij.org>
+
+ * lib/tmpdir.rb: test RUBY_PLATFORM for loading tmpdir.so to avoid
+ LoadError.
+
+Thu May 6 12:41:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * NEWS: add rationalize methods of Complex, Float, Integer, NilClass,
+ and Rational classes.
+
+Thu May 6 12:12:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * README: update.
+
+Thu May 6 03:34:29 2010 Koichi Sasada <ko1@atdot.net>
+
+ * cont.c: apply FIBER_USE_NATIVE patch. This patch improve
+ Fiber context switching cost using system APIs. Detail comments
+ are written in cont.c.
+
+Thu May 6 02:16:48 2010 Koichi Sasada <ko1@atdot.net>
+
+ * vm_method.c (rb_unlink_method_entry, rb_sweep_method_entry):
+ added. Unlinked method entries are collected to
+ vm->unlinked_method_entry_list. On the GC timing, mark all method
+ entries which are on all living threads. Only non-marked method
+ entries are collected. This hack prevents releasing living method
+ entry.
+ [Performance Consideration] Since this Method Entry GC (MEGC)
+ doesn't occuer frequently, MEGC will not be a performance bottleneck.
+ However, to traverse living method entries, every control frame push
+ needs to clear cfp->me field. This will be a performance issue
+ (because pushing control frame is occurred frequently).
+ Bug #2777 [ruby-dev:40457]
+
+ * cont.c (fiber_init): init cfp->me.
+
+ * gc.c (garbage_collect): kick rb_sweep_method_entry().
+
+ * method.h (rb_method_entry_t): add a mark field.
+
+ * vm.c (invoke_block_from_c): set passed me.
+
+ * vm.c (rb_thread_mark): mark cfp->me.
+
+ * vm_core.h (rb_thread_t): add a field passed_me.
+
+ * vm_core.h (rb_vm_t): add a field unlinked_method_entry_list.
+
+ * vm_insnhelper.c (vm_push_frame): clear cfp->me at all times.
+
+ * vm_insnhelper.c (vm_call_bmethod): pass me.
+
+ * bootstraptest/test_method.rb: add a test.
+
+Wed May 5 22:22:51 2010 wanabe <s.wanabe@gmail.com>
+
+ * compile.c (iseq_set_sequence): fix check range of ic_index.
+ a patch from Tomoyuki Chikanaga. #3236
+
+Wed May 5 21:49:31 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * dln.c (aix_loaderror): use execerror for load error on AIX.
+ This can avoid SEGV reported by Perry Smith. [Bug #2063]
+
+Wed May 5 20:37:54 2010 wanabe <s.wanabe@gmail.com>
+
+ * thread_win32.c (w32_wait_events): get GVL before handle interrupt
+ event. [ruby-core:27199], [ruby-core:29698]
+
+Wed May 5 19:00:01 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: revert. enbugged by last commit.
+ ([ruby-dev:41133], [ruby-dev:41134], [ruby-core:30010])
+
+ * ext/tk/README.tcltklib: ditto.
+
+Wed May 5 15:54:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (rb_stat): use STAT macro instead of calling stat() directly.
+ reported by Bill Kelly. [ruby-core:30012]
+
+Wed May 5 11:43:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bootstraptest/test_io.rb (megacontent-copy_stream): get rid of
+ deadlock.
+
+Wed May 5 07:27:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (rb_mark_method_entry): renamed.
+
+Wed May 5 05:20:27 2010 Koichi Sasada <ko1@atdot.net>
+
+ * method.h, vm_method.c: rename some internal functions related to
+ rb_method_entry_t.
+ rb_add_method_me() -> rb_method_entry_set().
+ rb_get_method_entry() -> rb_method_entry_without_cache().
+ rb_gc_mark_method_entry() -> rb_mark_method_entry().
+
+ * class.c, proc.c: ditto.
+
+Tue May 4 22:59:48 2010 wanabe <s.wanabe@gmail.com>
+
+ * compile.c (iseq_build_body): update iseq->ic_size.
+ a patch from Tomoyuki Chikanaga. see #3236.
+
+Tue May 4 18:51:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * error.c (name_err_mesg_to_str): preserve encoding of inspection.
+ [ruby-core:29948]
+
+Tue May 4 18:38:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/fileutils/test_fileutils.rb (test_copy_stream):
+ IO.copy_stream support binmode only currently.
+ [ruby-core:23724]
+
+Tue May 4 12:46:09 2010 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (argument_error): push correct backtrace.
+ Bug #2281 [ruby-core:26333]
+
+Tue May 4 12:38:40 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/option.c (sockopt_inspect): use rb_str_cat2 and
+ rb_str_append.
+
+ * ext/socket/ancdata.c (ancillary_inspect): refined.
+
+Tue May 4 11:48:06 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/ancdata.c (ancillary_inspect): use rb_str_cat2 and
+ rb_str_append.
+
+Tue May 4 07:52:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/net/http.rb (Net::HTTPResponse#read_chunked): ensure to skip the
+ last newline of chunk. [ruby-core:29229]
- * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
+ * test/net/http/utils.rb: add an option for chunked response test.
-Sun Feb 16 00:47:36 2014 Zachary Scott <e@zzak.io>
+ * test/net/http/test_http.rb: add tests for chunked response.
- * lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
- Since RAA has been deprecated, and the SSL package has been replaced
- with net/https this statement is entirely false and should be
- deleted. [Bug #9152]
+Tue May 4 03:37:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Feb 16 00:44:51 2014 Zachary Scott <e@zzak.io>
+ * ext/nkf/nkf-utf8/nkf.c: Update nkf 2010-04-28.
- * lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
- Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394]
- * lib/open-uri.rb: ditto
+Mon May 3 21:08:16 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Sun Feb 16 00:27:04 2014 Masaki Matsushita <glass.saga@gmail.com>
+ * sample/README: update file list. [ruby-core:28981]
- * hash.c (rb_hash_assoc): revert r42224. table->type->compare is
- called only if hashes are matched.
+Mon May 3 08:15:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_hash.rb: add a test to check using #== to compare.
+ * ext/syck/emitter.c (syck_scan_scalar): set SCAN_WHITEEDGE flag
+ when scalar begins with newline. patches from Dave B <daz AT
+ d10.karoo.co.uk> at [ruby-core:23019] and caleb clausen at
+ [ruby-core:25851]. [ruby-core:23006][ruby-core:29925]
-Sun Feb 16 00:27:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 2 17:52:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * hash.c (rb_hash_initialize_copy): copy st_table type even if empty.
- [ruby-core:56256] [Bug #8703]
+ * lib/rdoc/task.rb (RDoc::Task): should not override newer code.
-Sun Feb 16 00:27:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 2 17:25:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * hash.c (rb_hash_initialize_copy): clear old table before copy new
- table.
+ * ext/dl/cfunc.c (rb_dlcfunc_call): ignore signedness.
-Sun Feb 16 00:27:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 2 12:04:30 2010 wanabe <s.wanabe@gmail.com>
- * hash.c (rb_hash_assoc): aggregate object can be initialized only
- with link time constants.
+ * iseq.c (iseq_load): allow filepath to be nil.
+ a patch from Tomoyuki Chikanaga in [Bug #3229].
-Sun Feb 16 00:27:04 2014 Masaki Matsushita <glass.saga@gmail.com>
+Sun May 2 08:54:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * hash.c (rb_hash_assoc): performance improvement by replacing
- compare function in RHASH(hash)->ntbl->type temporarily.
+ * lib/cgi.rb (CGI::NEEDS_BINMODE): check if O_BINARY value instead
+ of fragile check by platform name.
-Sun Feb 16 00:01:16 2014 Tanaka Akira <akr@fsij.org>
+Sun May 2 07:38:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on
- socket creation.
- Reported by Bjoern Rennhak. [ruby-core:60442] [Bug #9477]
+ * lib/mkmf.rb (dir_config): should not modify argument arrays
+ themselves.
-Sat Feb 15 23:58:31 2014 Tanaka Akira <akr@fsij.org>
+Sat May 1 22:53:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise
- DecodeError if no data before the limit.
- Reported by Will Bryant. [ruby-core:60557] [Bug #9498]
+ * lib/tempfile.rb (Tempfile#size): stat by path name when it is
+ closed.
-Sat Feb 15 23:46:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+ keep the first trace.
- * parse.y (IDSET_ATTRSET_FOR_INTERN): fix off-by-one bug.
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+ fixed filtering. [ruby-core:29908]
- * parse.y (rb_enc_symname_type): junk ID succeeded by '=' is also
- attrset ID. [ruby-core:60668] [Bug #8756]
+Sat May 1 16:46:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 15 23:42:04 2014 Richo Healy <richo@psych0tik.net>
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_IsInfinite): don't use
+ non-ascii character.
- * test/ruby/test_struct.rb: Add regression test for question marks and
- bangs in struct members. [Closes GH-468]
+Sat May 1 14:08:29 2010 Eric Hodel <drbrain@segment7.net>
-Sat Feb 15 23:26:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rubygems/server.rb: Fix bug when serving gems.
- * struct.c (new_struct): fix warning message, class name and encoding.
+Sat May 1 14:05:36 2010 Eric Hodel <drbrain@segment7.net>
-Sat Feb 15 16:08:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc: Upgrade to RDoc 2.5.8.
- * struct.c (make_struct): avoid inadvertent symbol creation.
- (rb_struct_aref): ditto.
- (rb_struct_aset): ditto.
+Sat May 1 09:43:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 15 15:32:46 2014 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+ filter out traces in minitest directory. [ruby-core:29908]
- * vm_insnhelper.c (vm_call_method): should check ci->me->flag of
- a refining method in case the method is private.
- [ruby-core:60111] [Bug #9452]
+Sat May 1 06:42:57 2010 wanabe <s.wanabe@gmail.com>
- * vm_method.c (make_method_entry_refined): set me->flag of a refined
- method entry to NOEX_PUBLIC in case the original method is private
- and it is refined as a public method. The original flag is stored
- in me->def->body.orig_me, so it's OK to make a refined method
- entry public. [ruby-core:60111] [Bug #9452]
+ * win32/win32.c: add declaration of wstati64 for gcc.
- * test/ruby/test_refinement.rb: related tests.
+Sat May 1 02:41:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Feb 11 23:21:02 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * merge some patches from win32-uncode-test branch.
+ see #1685.
- * test/ruby/test_struct.rb (test_struct_question_mark): add a testcase
- for Struct attribute with question mark. the patch was originally
- written by Eric Wong [ruby-core:59095] [Backport #9248]
+ * file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
+ to convert encoding for pathname.
-Tue Feb 11 23:21:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
+ rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
+ rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
+ accept UTF-8 path.
- * parse.y (rb_id_attrset, intern_str): allow junk attrset ID for
- Struct.
+ * win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
+ rb_w32_unlink): use WCHAR path internally.
- * parse.y (rb_id_attrset): fix inconsistency with literals, allow
- ID_ATTRSET and return it itself, but ID_JUNK cannot make ID_ATTRSET.
- and raise a NameError instead of rb_bug() for invalid argument.
+ * file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
+ chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
+ rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
+ functions on Win32.
-Tue Feb 11 23:21:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
+ rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
+ check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
+ rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
+ rb_str_encode_ospath() before passing the path to system.
- * parse.y (rb_enc_symname_type): allow ID_ATTRSET for ID_INSTANCE,
- ID_GLOBAL, ID_CLASS, ID_JUNK too. [Bug #8756]
+ * io.c (rb_sysopen): ditto.
-Tue Feb 11 23:21:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
- * parse.y (rb_id_attrset): allow other than ID_ATTRSET.
+Sat May 1 00:26:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (intern_str): ditto. try stem ID for ID_INSTANCE,
- ID_GLOBAL, ID_CLASS, ID_JUNK too. [Bug #8756]
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+ assertion message must be String or Proc. suggested by caleb
+ clausen at [ruby-core:29884].
-Tue Feb 11 23:21:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 1 00:14:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (rb_id_attrset): check if the argument is valid type as an
- attribute.
+ * test/ruby/test_io.rb: skip false tests on Windows.
+ [ruby-core:29886]
-Tue Feb 11 00:26:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 30 22:46:27 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * file.c (GetLastError): already defined in windows.h on nowadays
- cygwin, and caused the confliction with the system provided
- definition on cygwin64. by @kou1okada [Fixes GH-433].
+ * math.c: Math::DomainError < StandardError [ruby-core:29855]
-Mon Feb 10 01:15:10 2014 Kouhei Sutou <kou@cozmixng.org>
+Fri Apr 30 21:40:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.
+ * test/test_open3.rb (TestOpen3#test_commandline): use simple
+ command via shell. [ruby-dev:41100]
-Mon Feb 10 01:15:10 2014 Kouhei Sutou <kou@cozmixng.org>
+Fri Apr 30 15:38:45 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return
- value assignment.
+ * ext/tk/extconf.rb: better support for MinGW environment.
-Mon Feb 10 01:15:10 2014 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Apr 30 12:05:20 2010 Tanaka Akira <akr@fsij.org>
- * ext/socket/raddrinfo.c (nogvl_getaddrinfo): work around for Ubuntu
- 13.04's getaddrinfo issue with mdns4. [ruby-list:49420]
+ * file.c (file_expand_path): call rb_str_set_len before BUFCHECK to
+ prevent rb_str_resize in BUFCHECK discard the content.
-Mon Feb 10 00:42:12 2014 Masaki Matsushita <glass.saga@gmail.com>
+Fri Apr 30 11:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS
- on SizedQueue#clear. [ruby-core:59462] [Bug #9342]
+ * string.c (rb_str_sub_bang): String#sub! now raises an error when
+ called on a frozen string, even if no change is made.
+ See [ruby-core:23657]
- * test/thread/test_queue.rb: add test. the patch is from
- Justin Collins.
+Fri Apr 30 11:40:44 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Mon Feb 10 00:27:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (make_exception, rb_obj_extend): Fix error messages in case
+ of wrong
+ number of arguments
- * parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
- isolate command argument state from outer scope.
- [ruby-core:59342] [Bug #9308]
+ * file.c (rb_f_test, rb_file_s_umask): ditto
-Mon Feb 10 00:02:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (int_chr, num_step): ditto
- * dir.c (glob_helper): don't skip current directories if FNM_DOTMATCH
- is given. [ruby-core:53108] [Bug #8006]
+ * process.c (rb_f_sleep): ditto
-Wed Feb 5 23:39:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (rb_reg_initialize_m): ditto
- * parse.y (intern_str): sigil only names are junk, at least one
- identifier character is needed. [ruby-dev:47723] [Bug #8928]
+ * signal.c (rb_f_kill, sig_trap): ditto
- * parse.y (rb_enc_symname_type): fix out of bound access.
+ * string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count,
+ rb_str_delete_bang,
+ rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto
-Wed Feb 5 22:54:52 2014 Kazuki Tsujimoto <kazuki@callcc.net>
+ * proc.c (curry): rdoc fix
- * time.c (get_timeval, get_new_timeval): use rb_obj_class()
- instead of CLASS_OF() because CLASS_OF() may return
- a singleton class.
+Fri Apr 30 04:09:30 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Sun Feb 2 05:48:42 2014 Eric Wong <e@80x24.org>
+ * time.c (TIMET_MAX): should be time_t, not unsigned_time_t.
- * io.c (rb_io_syswrite): add RB_GC_GUARD
- [Bug #9472][ruby-core:60407]
+Fri Apr 30 03:59:08 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Jan 31 00:51:50 2014 Shugo Maeda <shugo@ruby-lang.org>
+ * time.c (rb_time_unmagnify_to_float): should cast.
- * configure.in: use $@ instead of $(.TARGET) because .TARGET is not
- supported by GNU make.
+Fri Apr 30 03:38:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Jan 31 00:49:41 2014 Yamashita Yuu <yamashita@geishatokyo.com>
+ * numeric.c (fix_mul): the width of fixnum is same as long's on all
+ platforms.
+
+Fri Apr 30 03:17:20 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/matrix.rb: Improve algorithm for Matrix#determinant and
+ Matrix#rank
+ {determinant,det,rank}_e are now deprecated. [ruby-core:28273]
+ Also fixes a bug in Determinant#rank (e.g. [[0,1][0,1][0,1]])
+ Matrix#singular?, Matrix#regular? now raise on rectangular matrices
+ and use determinant instead of rank.
+
+Fri Apr 30 00:52:56 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): define some constants to select
+ collect code for win64.
+
+Thu Apr 29 20:10:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/test_open3.rb (test_commandline): use dump instead of
+ shellwords. [ruby-core:23797]
+
+Thu Apr 29 18:39:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/thwait.rb (ThreadsWait#join): refined rdoc again.
+ [ruby-core:29863] [ruby-dev:41092]
+
+Thu Apr 29 14:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby: use more descriptive assertions.
+
+ * test/ruby: fixed nonsense assertions.
+
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+ reverted. [ruby-core:29872]
+
+Thu Apr 29 12:33:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/thwait.rb (ThreadsWait#join): refined rdoc. [ruby-core:29863]
+
+Thu Apr 29 12:16:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): reject
+ non-boolean values. [ruby-core:29868]
+
+Thu Apr 29 11:20:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (seek_before_access): renamed. see [ruby-core:29861].
+
+ * io.c (rb_io_s_binread): fixed rdoc. parts of a patch from Roger
+ Pack in [ruby-core:29861].
+
+Thu Apr 29 03:50:49 2010 James Edward Gray II <jeg2@ruby-lang.org>
+
+ * lib/xmlrpc/utils.rb: Fixing an incompatibility with
+ reflection methods returning Symbols. Patch by
+ HD Moore. [ruby-core:29821]
+
+Wed Apr 28 23:53:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/thwait.rb: revise rdoc. a patch from Roger Pack in
+ [ruby-core:27362].
+
+Wed Apr 28 23:21:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json: Update to JSON 1.4.2.
+
+Wed Apr 28 22:53:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread. (rb_thread_terminate_all): revert r24591 which caused SEGV
+ sometimes. [ruby-dev:40936] [ruby-core:27245] [ruby-core:27416]
+
+Wed Apr 28 22:26:55 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/psych/visitors/test_yaml_tree.rb (test_struct_const): remove
+ Struct::Foo which affects test/ruby/test_struct to warn redefining
+ constant.
+
+Wed Apr 28 18:04:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * time.c (time_timespec): use rb_check_funcall.
+
+Wed Apr 28 17:14:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/extconf.rb: CMSG_ macros are broken on 64bit darwin,
+ because of use of __DARWIN_ALIGN.
+
+Wed Apr 28 16:44:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h ({RSTRING,RSTRUCT,RBIGNUM}_LENINT): check long
+ to cast to int.
+
+Wed Apr 28 16:28:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/unixsocket.c (sendmsg_blocking, recvmsg_blocking):
+ define only when used.
+
+ * ext/socket/rubysocket.h: non-implemented method definitions need
+ to be shared.
+
+Wed Apr 28 10:27:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vsnprintf.c (ruby_vsnprintf, ruby_snprintf): suppress warnings.
+ why return int in spite of the arguments of size_t?
+
+Wed Apr 28 09:49:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/compile_prelude.rb: enable optimization.
+
+Wed Apr 28 09:43:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (warn_balanced): do not warn for EXPR_ENDFN.
+
+Tue Apr 27 23:57:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * eval.c (ruby_cleanup): add exception guard around code running
+ signal handler (of r27513). Absence of the guard made
+ bootstraptest/test_thread.rb fail sometimes.
+
+Tue Apr 27 22:55:29 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * insns.def (onceinlinecache): add exclusion control for a region
+ between onceinlinecache and setinlinecache. [ruby-dev:39768]
+
+Tue Apr 27 22:40:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * iseq.c (set_relation): do not use top_wrapper as bottom of cref,
+ which caused constant lookup error when "wrapped load" is used;
+ instead, use Object as bottom, and push top_wrapper on Object.
+ [ruby-core:25039]
+
+Tue Apr 27 21:24:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * eval.c (ruby_cleanup): before cleanup, check signal buffer and run
+ handler if any. [ruby-core:20970]
+
+ * thread.c (rb_threadptr_check_signal): separeted from
+ timer_thread_function.
+
+Tue Apr 27 18:00:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/net/smtp.rb (Net::SMTP#rcptto_list): fixed typo.
+ [ruby-core:29809]
+
+Tue Apr 27 12:44:23 2010 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc: Import RDoc 2.5.7. Fixes #1318 and ruby-core:29780.
+
+Tue Apr 27 10:54:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_read_escape): deny extra character escapes.
+ [ruby-core:27228]
+
+Tue Apr 27 06:20:13 2010 Tanaka Akira <akr@fsij.org>
+
+ * io.c (select_internal): IO which cbuf is not empty is readable.
+
+Tue Apr 27 00:07:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * parse.y (program): check void_expr when rb_parse_in_main().
+ [ruby-dev:38717]
+
+Mon Apr 26 20:11:05 2010 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * complex.c, rational.c, lib/cmath.rb, lib/date.rb lib/date/delta*:
+ reverted r27484-27486. now official spec.
+
+Mon Apr 26 15:42:59 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get rid
+ of a warning.
+
+Mon Apr 26 13:11:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (ripper_get_value): escape Qundef.
+
+Mon Apr 26 12:42:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (warn_balanced): warn according to last state.
+
+Mon Apr 26 09:05:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json: Update to JSON 1.4.1.
+
+Sun Apr 25 23:50:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (ruby_dup): update max fd.
+
+Sun Apr 25 21:56:49 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (fetch_internal): do not quote message data item
+ names. Thanks, Eric Hodel. [ruby-core:23508]
+
+Sun Apr 25 15:59:02 2010 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/cmath.rb: reverted experimental r23900.
+
+Sun Apr 25 15:51:00 2010 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * complex.c, ratioanl.c: reverted experimental r24565.
+
+Sun Apr 25 15:34:48 2010 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb, lib/date/delta*: reverted experimental r24567 and
+ r25393.
+
+Sun Apr 25 11:02:20 2010 wanabe <s.wanabe@gmail.com>
+
+ * hash.c (ruby_setenv): putenv on msvcrt.dll can't remove empty value.
+
+Sat Apr 24 23:40:50 2010 Tanaka Akira <akr@fsij.org>
+
+ * lib/pp.rb: use [""].pack("p").size to detect the pointer size.
+
+Sat Apr 24 21:07:27 2010 Tanaka Akira <akr@fsij.org>
+
+ * test/psych/test_psych.rb: don't leave temporary files.
+
+Sat Apr 24 16:27:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (RUBY_PROGRAM_VERSION): added
+
+ * tool/rbinstall.rb: expand target file name.
+
+ * template/fake.rb.in: no need for hook if extmk.
+
+Sat Apr 24 14:40:20 2010 Tanaka Akira <akr@fsij.org>
+
+ * io.c: raise IOError when byte oriented operations occur with
+ non-empty character buffer.
+ [ruby-dev:40493] [ruby-dev:40506]
+
+Sat Apr 24 13:06:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (get_arglen): skip the last terminator of argv before
+ checking environ.
+
+ * ruby.c (get_arglen): duplicate environ area if setenv and unsetenv
+ are provided.
+
+ * ruby.c (set_arg0): keep empty strings.
+
+Sat Apr 24 09:44:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):
+ removed wrong extra assignments. a patch from Marcus Rueckert
+ <darix AT opensu.se> at [ruby-core:29759].
+
+Sat Apr 24 00:41:52 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * process.c (rb_f_fork): remove after_exec() which sometimes caused
+ two timer threads started. [ruby-core:25217]
+
+ * signal.c: use pthread_sigmask() instead of sigprocmask().
+ sigprocmask() is unspecified behavior on multi-thread programs.
+ [ruby-core:25217]
+
+Sat Apr 24 00:36:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/dl/test_base.rb: add kfreebsd support. based on a patch from
+ Petr Salinger in [ruby-core:29769].
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560293
+
+Sat Apr 24 00:14:41 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl_ssl_session.c (SSL_SESSION_cmp): remove static for
+ loopy version of openssl (0.9.8l?).
+
+Fri Apr 23 23:27:17 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/openssl/ossl_config.c: fix compilation failure with
+ OpenSSL 0.9.8.
+
+Fri Apr 23 17:29:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl_config.c: OpenSSL 1.0.0 support.
+ [ruby-core:29256]
+
+ * ext/openssl/extconf.rb: check some functions added/removed at
+ OpenSSL 1.0.0.
+
+ * ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which
+ exists.
+
+ * ext/openssl/ossl_ssl_session (SSL_SESSION_cmp): removed at 1.0.0,
+ so implement compatible fuction here.
+
+Fri Apr 23 14:37:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gem_prelude.rb (Gem::QuickLoader.load_full_rubygems_library):
+ get rid of creating same regexps many times.
+
+ * lib/rubygems/custom_require.rb (Kernel#require): ditto.
+
+Fri Apr 23 14:07:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * doc/etc.rd, doc/etc.rd.ja: moved from ext/etc.
+
+ * ext/etc.c (Init_etc): fixed rdoc.
+
+Fri Apr 23 11:31:25 2010 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc: Update to RDoc 2.5.6.
+
+Fri Apr 23 04:11:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ripper/test_parser_events.rb (test_unterminated_regexp):
+ separate test.
+
+Fri Apr 23 01:47:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_wopen): shouldn't use FILE_FLAG_OVERLAPPED with
+ normal file. #1807, #2510, #2549
+
+Fri Apr 23 01:28:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (ubf_handle): remove unused typedef.
+
+Thu Apr 22 23:10:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * proc.c (mnew): fix wrong error message when Kernel#public_method
+ receives name of private method. [Bug #2425]
+
+Thu Apr 22 22:56:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bootstraptest/test_thread.rb: fix test. [Bug #2342]
+
+Thu Apr 22 21:50:17 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/irb/ext/multi-irb.rb: fix multi-irb running
+ parallelly. [ruby-dev:41031] [Bug #3182]
+
+Thu Apr 22 17:13:34 2010 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems: Import RubyGems 1.3.7.pre.1 (as 1.3.6.1).
+
+Thu Apr 22 16:43:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (warn_balanced): removed false warning.
+
+ * parse.y (parser_yylex): skip whitespaces after method name.
+
+Wed Apr 22 02:16:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/bigdecimal/bigdecimal.[ch]: replace _DEBUG with BIGDECIMAL_DEBUG
+ to prevent activating debugging code when compiled with -DEBUG flag
+ on Windows. [ruby-core:22989] #1308
+
+Wed Apr 21 21:24:20 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/digest/sha2/extconf.rb: check SHA256_CTX and SHA512_CTX to fix
+ compilation failure on OpenBSD 4.4.
+
+Wed Apr 21 15:13:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (io_getc): fix incomplete character immediately before EOF
+ with newline converter. [ruby-dev:41024]
+
+Wed Apr 21 13:44:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (regexp): check each fragments. [ruby-core:27374]
+
+Wed Apr 21 13:36:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_yylex): reverted r27388 due to backward
+ compatibility.
+
+ * parse.y (parser_yylex): warn confusing binary operators after
+ local variable.
+
+Wed Apr 21 11:53:47 2010 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc: Update to RDoc 2.5.5. Fixes bugs in ri, Darkfish and
+ rdoc option handling.
+
+Wed Apr 21 11:31:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_yylex): abandoned EXPR_VCALL.
+
+Wed Apr 21 03:17:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (io_getc): set read_encoding to resulted one character
+ string. [ruby-dev:41023]
+
+Wed Apr 21 00:29:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bignum.c (bigmul1_karatsuba): fix calculation order to prevent
+ underflow. [ruby-core:29088]
+
+Wed Apr 21 00:26:17 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (NODE_NEXT, NODE_REDO): add dummy putnil instruction to
+ fix stack consistency error. [ruby-core:28172]
+
+ * bootstraptest/test_jump.rb: add a test for above.
+
+Wed Apr 21 00:16:44 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/zlib/zlib.c (rb_deflate_params): update buf_filled count because
+ deflateParams writes to out buffer. And, revert r18029 because the
+ flush was not needed now and emits garbage. [ruby-dev:40802]
+
+Wed Apr 21 00:01:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_method.c (rb_add_method_def): decrement alias count of
+ rb_method_definition_t to prevent memory leak. see
+ [ruby-dev:41021].
+
+Tue Apr 20 21:33:06 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/dl/win32/lib/win32/registry.rb (PredefinedKey#create): root key
+ name should be a string. fixed [ruby-core:28192]
+
+Tue Apr 20 19:25:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_yylex): fix for tLPAREN_ARG.
+
+Tue Apr 20 12:34:23 2010 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+
+ * lib/cgi/{core, util}.rb (RFC822_DAYS, RFC822_MONTHS):
+ move the constant because used only util.rb.
+
+Tue Apr 20 12:24:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (lex_state_e, IS_END, IS_SPCARG, parser_yylex): separate
+ the state after vcall. [ruby-core:29578]
+
+Tue Apr 20 01:03:00 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bootstraptest/test_fork.rb: add a test for [ruby-core:28924].
+
+Tue Apr 20 00:43:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_extname): skip last directory separators.
+ [ruby-core:29627]
+
+Tue Apr 20 00:41:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (internal_{read,write}_func, rb_{read,write}_internal):
+ reverted r27265, since now rb_thread_blocking_region() preserves
+ errno.
+
+Mon Apr 19 23:14:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread.c (rb_thread_blocking_region, rb_thread_blocking_region_end):
+ preserve errno. [Bug #2606] [ruby-core:28924]
- * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
- `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined. The
- `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
- snapshot of OpenSSL 1.0.1. [Fixes GH-488]
+Mon Apr 19 19:41:10 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-Thu Jan 23 21:08:16 2014 Shota Fukumori <her@sorah.jp>
+ * lib/fileutils.rb (FileUtils::cp_r): backport r11156 from ruby_1_8.
- * vm_insnhelper.c (check_match): Fix SEGV with VM_CHECKMATCH_TYPE_CASE
- and class of `pattern` has `method_missing`
- [Bug #8882] [ruby-core:58606]
+Mon Apr 19 19:18:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jan 20 01:02:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (parser_yylex): reduced duplicated conditions.
- * ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap
- depending on PRIsVALUE for 1.9. [Backport #9406]
+Mon Apr 19 13:58:04 2010 Eric Hodel <drbrain@segment7.net>
- * ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback
- definition for 2.1 or older. [ruby-core:59750] [Backport #9406]
+ * lib/rdoc: Update to RDoc 2.5.4. Fixes #3169, #3160, #3023.
-Sun Jan 12 22:46:49 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Apr 19 12:46:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- patch inspired from r44260 on trunk. [ruby-core:58652] [Bug #9168]
+ * lib/timeout.rb (Timeout#timeout): propagate errors to the
+ caller. [ruby-dev:41010]
- * gc.c (run_finalizer): clear th->errinfo before invoke finalizer and
- restore afterward.
+Mon Apr 19 00:27:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_gc.rb (test_exception_in_finalizer): add test for
+ * vm_method.c (rb_add_method_def): workarond fix for redefinition
+ of methods. This is because cfp->me uses the rb_method_entry
+ which is freed by redefinition of remove_method. Note that
+ reusing may cause another problem when the usage is changed.
+ [ruby-core:27320] [ruby-core:29464]
+
+Sun Apr 18 22:13:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (string_content): cond_stack and cmdarg_stack are VALUE.
+
+Sun Apr 18 18:07:47 2010 Tanaka Akira <akr@fsij.org>
+
+ * lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255.
+ [ruby-core:29501]
+
+Sun Apr 18 12:48:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_yylex): seems like a symbol-literal when spaces
+ are unbalanced. [ruby-core:29578]
+
+Sun Apr 18 12:32:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (string_content): preserve cond_stack and cmdarg_stack.
+ [ruby-core:29579]
+
+Sun Apr 18 05:50:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/yaml_tree.rb: defaulting binary string
+ format to "literal" format.
+
+Sun Apr 18 02:13:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/irb/ruby-lex.rb (identify_identifier): add '_' to the regexp.
+
+Sat Apr 17 23:21:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in: use AC_TRY_LINK instead of AC_TRY_COMPILE.
+ On Solaris it can compile with signbit but can't link.
+
+Sat Apr 17 20:34:09 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/envutil.rb: update Gem::ConfigMap to fake environment for
+ tests. Some test of rubygems had failed because envutil.rb changed
+ only RbConfig::CONFIG but not Gem::ConfigMap.
+
+Sat Apr 17 20:31:08 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/irb/ruby-lex.rb (identify_identifier): allow multibyte character
+ as identifier. [ruby-core:27275]
+
+Sat Apr 17 09:19:27 2010 wanabe <s.wanabe@gmail.com>
+
+ * compile.c (iseq_compile_each): fix splat condition in NODE_WHEN.
+ [Bug #2226]
+
+Sat Apr 17 08:57:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/net/smtp.rb (Net::SMTP#rcptto_list): continue when at least
+ one RCPT is accepted. based on a patch from Kero van Gelder at
+ [ruby-core:26190].
+
+Sat Apr 17 07:43:55 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/thread/test_queue.rb (TestQueue#grind): fix typos.
+
+Sat Apr 17 07:27:53 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * NEWS: add Array#repeated_{combinationpermutation} [Feature #2981]
+
+Sat Apr 17 05:30:22 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/core_ext.rb (yaml_as): supporting deprecated
+ "yaml_as" method
+ * ext/syck/lib/syck/tag.rb: ditto
+
+Sat Apr 17 05:25:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/coder.rb (scalar): supporting deprecated methods
+ * ext/psych/lib/psych/deprecated.rb: supporting deprecated
+ to_yaml_properties method
+
+Sat Apr 17 01:32:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * io.c (rb_io_rewind, rb_io_eof): add rdoc. based on a patch from
+ Roger Pack in [ruby-core:26771] [Bug #2377].
+
+Fri Apr 16 23:42:56 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_folderitem2_invokeverb.rb (test_invokeverb):
+ run test only when "Create Shortcut (&S)" menu is found.
+ [ruby-core:29550] [Bug #1602]
+
+Fri Apr 16 21:52:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * parse.y (string_content, etc): counts of CMDARG_PUSH and POP were
+ inconsistent. [ruby-core:22637]
+
+Fri Apr 16 21:27:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): revert r23389,
+ which not only is unnecessary but also causes the inconsistency of
+ return type. [ruby-core:25706] [Bug #2129]
+
+Fri Apr 16 20:05:24 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/thread.rb (Queue#push, #pop, SizedQueue#push, #pop): remove
+ code that kicks waiting thread twice, which caused race and
+ deadlock. a patch from James M. Lawrence. [ruby-core:25537]
+
+ * test/thread/test_queue.rb: added.
+
+Fri Apr 16 20:01:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * .gitignore: updated.
+
+Fri Apr 16 16:51:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/file2lastrev.rb (VCS::SVN::get_revisions.): remind about
+ DOSISH, sometimes.
+
+Fri Apr 16 16:15:40 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_repeated_permutation): new method added. a patch
+ from Makoto Kishimoto in [ruby-core:29267] [ruby-core:28724]
+
+ * array.c (rb_ary_repeated_combination): ditto.
+
+Thu Apr 15 22:41:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread.c (rb_thread_priority, rb_thread_priority_set): fix rdoc.
+ Lower-priority thread may run even if there are higher-priority
+ threads. See [ruby-dev:40977].
+
+Thu Apr 15 22:33:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * lib/uri/ftp.rb (URI::FTP#set_path): added to correct handling of
+ special case where path of ftp is relative. This converts relative
+ path to absolute one, because external representation of ftp path is
+ relative and internal representation is absolute. [ruby-core:24077]
+
+ * lib/uri/ftp.rb (URI::FTP#initialize): converts absolute to relative.
+
+ * lib/uri/generic.rb (URI::Generic#check_path): allow relative path
+ when scheme is ftp.
+
+Thu Apr 15 21:54:39 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/file2lastrev.rb: use backtick for ruby 1.8.
+
+Thu Apr 15 21:13:29 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/file2lastrev.rb: this should run with ruby 1.8.
+
+Thu Apr 15 20:41:10 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/file2lastrev.rb: make -q effective for files not version
+ controlled.
+
+Thu Apr 15 14:50:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (vm_backtrace_each): get rid of use of malloc from signal
+ handler by using ruby_engine_name. [ruby-core:29497]
+
+ * vm_eval.c (print_backtrace): file may be nil when segfaulted in
+ very early stage.
+
+ * vm_dump.c (bugreport_backtrace): ditto.
+
+Thu Apr 15 11:51:49 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk (help): small fix.
+
+Wed Apr 14 22:09:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/rexml/source.rb: force_encoding("UTF-8") when the input
+ is already UTF-8. patched by Kouhei Sutou [ruby-core:23404]
+
+Wed Apr 14 18:23:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * configure.in (signbit): signbit is a macro in C99.
+
+Wed Apr 14 17:56:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_shift_cbuf): should terminate.
+ http://golf.shinh.org/p.rb?DECimal+number+to+BINary#Ruby
+
+Wed Apr 14 16:29:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (GET_STACK_BOUNDS): fixed macro argument names. a patch from
+ Satoshi Shiba <shiba AT rvm.jp> at [ruby-dev:40973].
+
+ * gc.h (ruby_get_stack_grow_direction): fixed prototype.
+
+ * thread_pthread.c (get_stack, ruby_stack_overflowed_p): both side
+ should be same type. [Bug #3145]
+
+Wed Apr 14 15:58:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_string_value_cstr): make NUL terminated if it is
+ not done.
+
+Wed Apr 14 12:56:21 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo
+ Matsuyama. [ruby-dev:38063]
+
+Wed Apr 14 11:39:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/syck/lib/syck/basenode.rb (Syck::BaseNode#match_path): fixed
+ library name.
+
+ * ext/syck/lib/yaml/syck.rb: split from ext/syck/lib/syck.rb for
+ backward compatibility.
+
+Wed Apr 14 09:24:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: Refix [nkf-bug:21393]. (explicit -X)
+
+Tue Apr 13 20:36:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: Fix: Windows Codepages wrongly convert
+ Halfwidth Katakana. [nkf-bug:21393]
+
+Tue Apr 13 15:00:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (make_seed_value): fix leading-zero-guard condition on
+ bdigit is smaller than 32bit.
+
+Tue Apr 13 13:57:36 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/irb/completion.rb (CompletionProc): fix [ruby-dev:40953]
+ [Bug #3126]. Thanks Kazuhiro NISHIYAMA.
+
+Tue Apr 13 09:32:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * transcode.c (transcode_loop): insert output the value when
+ fallback hash has a related key. [ruby-dev:40540]
+ [ruby-dev:40829] #3036
+
+ * transcode.c (rb_econv_prepare_opts): pass to newhash
+ a value with the key :fallback.
+
+Tue Apr 13 00:12:04 2010 Tanaka Akira <akr@fsij.org>
+
+ * random.c (rand_init): use the absolute value of seed to
+ make srand(-2**40) portable with 32bit and 64bit.
+ [ruby-core:29292](2)
+
+Mon Apr 12 22:48:47 2010 Tanaka Akira <akr@fsij.org>
+
+ * enumerator.c (inspect_enumerator): don't raise for uninitialized
+ enumerator.
+
+Mon Apr 12 21:47:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * LEGAL: separated the section for parse.c. contributed by Paul
+ Betteridge in [ruby-core:29472].
+
+Mon Apr 12 09:19:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/fileutils.rb (fu_each_src_dest): ensure src is accessible.
+
+ * lib/fileutils.rb (fu_same): use File.identical? to get rid of
+ exceptions. [ruby-core:28141]
+
+ * lib/fileutils.rb (fu_have_st_ino): no longer used.
+
+ * lib/fileutils.rb (fu_have_st_ino): check if required method is
+ defined, instead of platform name.
+
+Mon Apr 12 05:10:20 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/matrix.rb: New method Matrix.build [ruby-core:28272]
+
+Mon Apr 12 03:45:25 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/matrix.rb: Deprecate elements_to_{f/i/r}
+
+Mon Apr 12 03:30:29 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/matrix.rb: Handle coercion errors by raising TypeErrors
+ [ruby-core:26736]
+
+Mon Apr 12 00:51:21 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * io.c (rb_io_getline_fast, rb_io_getline_1): fix ARGF.lineno
+ behavior. [ruby-core:25205]
+
+ * test/ruby/test_argf.rb (TestArgf#test_lineno3): add a test for
above.
- * vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear th->errinfo
- before invoke hook.
+Sun Apr 11 23:25:17 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * configure.in: can not load libraries if --with-opt-dir is used
+ on AIX. [Bug #3107]
-Sun Jan 12 16:07:52 2014 vo.x (Vit Ondruch) <vondruch@redhat.com>
+Sun Apr 11 14:44:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * tool/rbinstall.rb (Gem::Specification#collect): make stable
- Gem::Specification.files in default .gemspecs the different order of
- "files" in .gemspec files makes them different therefore possibly
- conflicting in multilib scenario. patch by vo.x (Vit Ondruch) at
- [ruby-core:57544] [Bug #8623].
+ * lib/irb/ruby-lex.rb (RubyLex#getc): revert r10817, which caused
+ regression for handling case when there is no newline at the end of
+ file. [ruby-core:28248]
-Sun Jan 12 16:01:54 2014 Tanaka Akira <akr@fsij.org>
+Sun Apr 11 12:08:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use
- String#succ because it can make modified (wrong) auth_tag longer
- than 16 bytes. The longer auth_tag makes that
- EVP_CIPHER_CTX_ctrl (and internally aes_gcm_ctrl) fail.
- [ruby-core:55143] [Bug #8439] reported by Vit Ondruch.
+ * encoding.c (enc_replicate): new encoding name must be valid
+ c-string. [ruby-dev:40954]
-Sun Jan 12 15:33:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 11 11:58:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * util.c (ruby_qsort): fix potential stack overflow on a large
- machine. based on the patch by Conrad Irwin <conrad.irwin AT
- gmail.com> at [ruby-core:51816]. [Bug #7772]
+ * include/ruby/win32.h (ftruncate): rename to get rid of conflict
+ with same name but non-LFS function on MinGW. [ruby-core:24757]
-Sun Jan 12 15:17:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 11 10:33:34 2010 Eric Hodel <drbrain@segment7.net>
- * ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and
- rb_intern_str() instead of rb_intern() and RSTRING_PTR() with
- RB_GC_GUARD(), to prevent temporary objects from GC.
- [ruby-core:39000] [Bug #5199]
+ * lib/rdoc: Update to RDoc 2.5.3. Includes r27288 and r27290.
-Tue Jan 7 01:16:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 11 09:31:39 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * proc.c (mnew_from_me): keep iclass as-is, to make inheritance
- chain consistent. [ruby-core:59358] [Bug #9315]
+ * test/syck/*: Moved test/yaml to test/syck since it's actually
+ testing the syck YAML engine.
- * proc.c (method_owner): return the original defined_class from
- prepended iclass, instead.
+Sun Apr 11 08:56:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Jan 7 01:16:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc/rdoc.rb (setup_output_dir): compare by Time#to_i.
+ Cached created time doesn't have fractinal times,
+ but FileStat#mtime has; so rdoc almost alway judged files
+ are updated.
- * vm_insnhelper.c (vm_search_super_method): direct superclass of a
- module is found when super called in a Method object generated a
- method defined in a module, call method_missing in that case.
- [ruby-core:59358] [Bug #9315]
+Sun Apr 11 07:40:48 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Jan 3 22:25:23 2014 Aman Gupta <ruby@tmm1.net>
+ * lib/rdoc/rdoc.rb (setup_output_dir): fix typo. [ruby-core:29415]
- * test/net/imap/cacert.pem: generate new CA cert, since the last one
- expired. [Bug #9341] [ruby-core:59459]
- * test/net/imap/server.crt: new server cert signed with updated CA.
- * test/net/imap/Makefile: add `make regen_certs` to automate this
- process.
+Sun Apr 11 07:01:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 25 00:46:44 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/uri/common.rb (decode_www_form_component): validate.
+ [ruby-dev:40938]
- * lib/net/smtp.rb (Net::SMTP#critical): Always return a
- Net::SMTP::Response. Patch by Pawel Veselov.
- [ruby-trunk - Bug #9125]
- * test/net/smtp/test_smtp.rb: Test for the above.
+ * lib/uri/common.rb (decode_www_form): allow empty string.
-Wed Dec 25 00:18:19 2013 Tanaka Akira <akr@fsij.org>
+ * lib/uri/common.rb: fix nodoc for constant. [ruby-dev:40949]
- * ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because
- it may be set before the body.
- Reported by ko1 and mrkn. [ruby-core:59088] [Bug #9247]
+Sat Apr 10 21:26:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/cgi/core.rb: Ditto.
+ * lib/rdoc/markup/preprocess.rb (RDoc::Markup::PreProcess#handle):
+ use File.binread to avoid locale dependency.
- * lib/drb/ssl.rb: Ditto.
+Sat Apr 10 15:18:26 2010 Eric Hodel <drbrain@segment7.net>
-Tue Dec 24 00:18:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc: Import RDoc 2.5.2
+ * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): Don't parse rdoc
+ files, reverts r24976 in favor of include directive support in C
+ parser.
- * lib/mkmf.rb (configuration): strip destdir part from prefix to get
- rid of duplication. a patch by arton at [ruby-core:58859].
- [ruby-core:58856] [Bug #9213]
+Sat Apr 10 13:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Dec 23 22:37:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_ssl.c (Init_ossl_ssl): add SSLContext#ssl_timeout=,
+ which allows net/https to specify timeout. [ruby-core:24812]
- * proc.c (mnew_from_me): method by respond_to_missing? should be
- owned by the original class.
+Sat Apr 10 07:36:13 2010 wanabe <s.wanabe@gmail.com>
-Sun Dec 22 22:56:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_method.c (rb_add_method): clear attr.location before rb_ary_new3.
+ a patch from Masaya TARUI in [Bug #3108]
- * proc.c (mnew_from_me): achieve the original defined_class from
- prepended iclass, to fix inherited owner.
+Sat Apr 10 05:27:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * proc.c (method_owner): return the defined class, but not the
- class which the method object is created from.
+ * ext/psych/lib/psych/deprecated.rb: implementing Psych.quick_emit and
+ adding deprecation warnings.
+ * ext/psych/lib/psych/visitors/to_ruby.rb: supporting deprecated
+ yaml_initialize api.
+ * ext/psych/lib/psych/visitors/yaml_tree.rb: supporting deprecated
+ to_yaml api.
-Sun Dec 22 22:56:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 10 01:08:53 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * proc.c (method_owner): return the class where alias is defined, not
- the class original method is defined.
+ * ext/psych/parser.c: parse raises a TypeError when nil is passed in.
- * vm_method.c (rb_method_entry_make, rb_alias): store the originally
- defined class in me. [Bug #7993] [Bug #7842] [Bug #9236]
+Sat Apr 10 00:01:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_method.c (rb_method_entry_get_without_cache): cache included
- module but not iclass.
+ * ext/pty/lib/expect.rb: preserve buffer read, instead of discard.
+ based on a patch from Luiz Angelo Daros de Luca in
+ [ruby-core:23464].
-Sun Dec 22 00:07:09 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Fri Apr 9 23:58:58 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * insns.def: Fix optimization bug of Float#/ [Bug #9238]
+ * ext/pty/lib/expect.rb: raise an error when argument is unexpected
+ type. based on a patch from Luiz Angelo Daros de Luca in
+ [ruby-core:23464].
-Sat Dec 21 23:13:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 9 23:57:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * eval_jump.c (rb_exec_end_proc): unlink and free procs data before
- calling for each procs. [Bug #9110]
+ * ext/pty/lib/expect.rb: add rdoc. based on a patch from Luiz Angelo
+ Daros de Luca in [ruby-core:23464].
-Sat Dec 21 23:13:55 2013 Masaki Matsushita <glass.saga@gmail.com>
+Fri Apr 9 23:54:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * eval_jump.c (rb_exec_end_proc): fix double free or corruption error
- when reentering by callcc. [ruby-core:58329] [Bug #9110]
+ * lib/irb/init.rb, lib/irb/lc/help-message,
+ lib/irb/lc/ja/help-message: add -w flag. [ruby-core:24594]
- * test/ruby/test_beginendblock.rb: test for above.
+Fri Apr 9 23:51:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Dec 21 22:55:03 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/ipsocket.c (init_inetsock_internal),
+ ext/socket/unixsocket.c (rsock_init_unixsock): check the result of
+ listen(2). based on a patch from Mike Pomraning. [ruby-core:23698]
- * lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
- consider encodings in hosts file. [ruby-core:59239] [Bug #9273]
+Fri Apr 9 21:22:10 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
- * lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.
+ * lib/irb/completion.rb (CompletionProc): irb will be stuck with
+ long variable name at copletion. [Bug#1969]. refix [ruby-core:28366].
-Sat Dec 21 22:51:51 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Apr 9 20:54:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly
- install win32.h.
- [ruby-core:58801][Bug #9199] reported by arton.
+ * lib/uri/common.rb (decode_www_form): don't ignore leading '?'.
+ [ruby-dev:40938]
-Sat Dec 21 16:16:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/uri/common.rb (decode_www_form): check whether argument is
+ valid application/x-www-form-urlencoded data.
- * gc.c (finalize_deferred): flush all deferred finalizers while other
- finalizers can get ready to run newly by lazy sweep.
- [ruby-core:58833] [Bug #9205]
+Fri Apr 9 20:29:13 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Dec 21 16:07:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can
+ precede the last reference). [ruby-dev:40942]
- * ruby_atomic.h (ATOMIC_PTR_EXCHANGE): atomic exchange function for
- a generic pointer.
+Fri Apr 9 20:05:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Dec 21 15:50:13 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * dir.c (push_glob): add RB_GC_GUARD to prevent str being free'ed.
+ a patch from Masaya TARUI in [ruby-dev:40939]. [ruby-dev:40514]
- * ruby_atomic.h: remove duplicate definisions between ATOMIC_XXX
- and ATOMIC_SIZE_XXX.
+Fri Apr 9 10:53:00 2010 Kenta Murata <mrkn@mrkn.jp>
-Sat Dec 21 15:50:13 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * compile.c (iseq_compile_each): stop hiding, and freeze unpopped
+ string nodes to allow method redefinition. [ruby-dev:40641]
- * ruby_atomic.h: define ATOMIC_SIZE_CAS() with
- __atomic_compare_exchange_n() and refactoring.
+Fri Apr 9 01:26:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 21 15:50:13 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * io.c (internal_{read,write}_func, rb_{read,write}_internal):
+ preserve errno. a patch from Takehiro Kubo in [ruby-core:29340].
+ [ruby-core:28924]
- * ruby_atomic.h: use __atomic builtin functions supported by GCC.
- __sync family are legacy functions now and it is recommended
- that new code use the __atomic functions.
- http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
+Fri Apr 9 01:12:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * configure.in: check existence of __atomic functions.
+ * lib/irb/completion.rb (CompletionProc): calling the method "methods"
+ may raise an exception. [ruby-core:28366]
-Sat Dec 21 15:37:11 2013 Naohisa Goto <ngotogenome@gmail.com>
+Thu Apr 8 14:33:24 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
- * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris
- since r43460.
+ * configure.in: --disable-install-doc should prohibit doxygen.
-Sat Dec 21 15:37:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 8 14:23:51 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t.
+ * include/ruby/win32.h: include errno.h before defining errnos.
+ see [ruby-core:29314]
-Sat Dec 21 15:37:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 8 11:45:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby_atomic.h (rb_w32_atomic_cas): call InterlockedCompareExchange
- directly.
+ * lib/yaml.rb: use Psych if only it is loaded already.
- * ruby_atomic.h (ATOMIC_CAS): fix missing function call.
+ * lib/yaml.rb (YAML::EngineManager#yamler): set the result after
+ successfully switched.
-Sat Dec 21 15:37:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 8 07:22:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby_atomic.h (ATOMIC_CAS): suppress C4022 and C4047 warnings in
- VC6. only InterlockedCompareExchange is declared using PVOID.
+ * random.c (rand_init): ignore higher bits if all they are same as
+ the lower sign bit. [ruby-core:29292](2)
-Sat Dec 21 14:54:37 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Thu Apr 8 07:16:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] remove example of
- Rational#to_d without argument. [Bug #8958]
+ * lib/irb/cmd/help.rb (IRB::ExtendCommand::Help#execute): use RI
+ interactive mode if no argument. [ruby-dev:39839]
-Sat Dec 21 14:54:37 2013 Zachary Scott <e@zzak.io>
+Wed Apr 8 02:33:55 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] +precision+ is required
+ * array.c (rb_ary_permutation): Remove limitation for lengthy permutations
+ [ruby-core:29240]
-Sat Dec 21 14:54:37 2013 Zachary Scott <e@zzak.io>
+ * test/ruby/test_array.rb: ditto
- * ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] Document the required
- +precision+ argument for Rational#to_d [Bug #8958]
+Wed Apr 7 23:33:55 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-Sat Dec 21 03:46:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-mode-map): binded C-c C-c and C-c C-c C-u
+ to comment-region and uncomment-region. Thanks Michael Klishin!
+ [Feature #872] [ruby-core:20552]
- * ext/date/date_strptime.c (date__strptime_internal): unset
- case-insensitive flag for [:alpha:], which already implies both
- cases, to get rid of backtrack explosion. [ruby-core:58984]
- [Bug #9221]
+Wed Apr 7 21:44:14 2010 Tanaka Akira <akr@fsij.org>
-Sat Dec 21 03:46:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (ASCTIME): unused macro removed.
- * ext/date/date_parse.c (parse_time): unset case-insensitive flag
- for [:alpha:], which already implies both cases, to get rid of
- backtrack explosion. [ruby-core:58876] [Bug #9221]
+Wed Apr 7 16:45:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 13 00:23:01 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in (Makefile): reverted r27244.
- * enumerator.c (enumerator_with_index): try to convert given offset to
- integer. fix bug introduced in r39594.
+Wed Apr 7 11:49:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Dec 2 23:31:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/quickpath.rb (REXML::QuickPath::predicate):
+ fix regexp.
- * enumerator.c (enumerator_with_index): should not store local variable
- address to memoise the arguments. it is invalidated after the return.
- [ruby-core:58692] [Bug #9178]
+Wed Apr 7 09:44:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 2 23:16:50 2013 Eric Hodel <drbrain@segment7.net>
+ * configure.in (Makefile): quote init-commands.
- * enumerator.c (enumerator_with_index): Restore handling of a nil memo
- from r39594.
+ * configure.in (Makefile): `make ruby` builds ruby command
+ even if RUBY_INSTALL_NAME is customized or it has extension.
-Mon Dec 2 22:53:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 7 03:28:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_readlink): fix buffer overflow on a long symlink. since
- rb_str_modify_expand() expands from its length but not its capacity,
- need to set the length properly for each expansion.
- [ruby-core:58592] [Bug #9157]
+ * lib/rdoc/rdoc.rb (RDoc#{initialize,setup_output_dir}):
+ initialize @last_created and use it.
-Fri Nov 29 00:31:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 7 02:05:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (Doxyfile): tool/file2lastrev.rb needs running with
- BASERUBY since r43617. [ruby-dev:47823] [Bug #9169]
+ * template/fake.rb.in: not define $extout to make target in cwd.
-Fri Nov 22 13:18:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 6 23:01:35 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- * util.c (ruby_strtod): BigMath requires more precision.
+ * vm_core.h: Introduce UNINITIALIZED_VAR() macro.
+ * thread.c (do_select): Use UNINITIALIZED_VAR() instead FAKE_FD_ZERO().
+ Also, remove FAKE_FD_ZERO completely. [Feature #3018]
-Fri Nov 22 12:46:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 6 14:53:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * util.c (ruby_strtod): ignore too long fraction part, which does not
- affect the result.
+ * include/ruby/win32.h: check definition existence before defining
+ errno macros.
-Wed Nov 20 15:20:00 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * win32/win32.c (errmap): define winsock errors mappings.
+ these are VC++10 support. see [ruby-core:29278]
- * test/ruby/test_thread.rb (test_mutex_unlock_on_trap): extend waiting
- time to invocation of signal handler from 0.01 sec to 0.2 sec.
- RubyCI report error on mswin. reported by @unak
+Tue Apr 6 21:55:25 2010 Tanaka Akira <akr@fsij.org>
-Wed Nov 13 11:57:01 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * configure.in: test localtime(3) overflow. [ruby-dev:40910]
- * lib/rubygems: Update to RubyGems 2.0.14. [ruby-core:58300]
- [Backport #9104]
- the patch is provided by drbrain (Eric Hodel).
+ * time.c (rb_gmtime_r): renamed from rb_gmtime.
+ (rb_localtime_r): renamed from rb_localtime.
+ (rb_localtime_r2): call rb_localtime_r and validate the result if
+ there is overflow problem.
+ (rb_gmtime_r2): call rb_gmtime_r and validate the result if there
+ is overflow problem.
-Tue Nov 12 23:41:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 6 11:21:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (rb_feature_p): deal with default loadable suffixes.
+ * template/fake.rb.in: hooks for extconf.rb.
- * load.c (load_lock): initialize statically linked extensions.
+Tue Apr 6 06:19:36 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * load.c (search_required, rb_require_safe): deal with statically
- linked extensions.
+ * lib/rexml/text.rb (REXML::Text.check): comment out
+ broken logic.
- * load.c (ruby_init_ext): defer initialization of statically linked
- extensions until required actually. [Bug #8883]
+Tue Apr 6 05:59:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Nov 12 23:41:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/parsers/baseparser.rb (LETTER, DIGIT):
+ always use POSIX charclass.
- * load.c (ruby_init_ext): share feature names between frame name and
- provided features.
+ * lib/rexml/parsers/baseparser.rb (NAMECHAR):
+ remove duplicated range.
-Tue Nov 12 23:33:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/xmltokens.rb (NCNAME_STR, NAMECHAR): ditto.
- * tool/rbinstall.rb (Gem::Specification.load): obtain spec date from
- VCS for the case using git, RUBY_RELEASE_DATE is the last resort.
- probably fixes [Bug #9085].
+ * lib/rexml/parsers/xpathparser.rb (PathExpr): ditto.
-Tue Nov 12 23:24:35 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/text.rb (REXML::Text#initialize):
+ initialize @parent.
- * configure.in (RUNRUBY): append -- only after runruby.rb, not
- cross-compiling baseruby, so that $(RUN_OPT) can be command line
- options. [ruby-dev:47703] [Bug #8893]
+Mon Apr 5 19:54:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Nov 12 23:24:35 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * re.c (make_regexp): use onig_new_with_source to keep
+ sourcefile and sourceline.
- (partially merged from r42862)
- * common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't
- require extension libraries. The patch is from nobu
- (Nobuyoshi Nakada).
+ * re.c (onig_new_with_source): copied from onig_new in
+ regcomp.c for keep sourcefile and sourceline.
-Mon Nov 11 23:54:51 2013 Tanaka Akira <akr@fsij.org>
+Mon Apr 5 13:20:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/socket/init.c (cloexec_accept): Fix a compile error on
- Debian GNU/kFreeBSD. Consider HAVE_ACCEPT4 is defined
- but SOCK_CLOEXEC is not defined.
+ * include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
+ defined EWOULDBLOCK. based on a patch from Charlie Savage,
+ see [ruby-core:29255]
-Mon Nov 11 22:14:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Apr 5 13:10:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * include/ruby/win32.h (rb_infinity_float): suppress overflow in
- constant arithmetic warnings. [ruby-core:57981] [Bug #9044]
+ * ext/psych/lib/psych/core_ext.rb: remove before alias.
-Mon Nov 11 22:14:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/lib/syck.rb: don't warn called by itself.
- * win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics
- functions. [ruby-core:57981] [Bug #9044]
+Mon Apr 5 13:08:24 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Oct 31 22:28:04 2013 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * win32/mkexports.rb (each_export): VC10 support.
+ a patch from Charlie Savage in [ruby-core:29254]
- * test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as
- they are not suitable for ECDSA.
- [ruby-core:54881] [Bug #8384]
+Sun Apr 4 22:18:32 2010 Tanaka Akira <akr@fsij.org>
-Thu Oct 31 22:28:04 2013 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * time.c (cmp): optimize for fixnums.
+ (lt): use cmp.
+ (gt): ditto.
+ (le): ditto.
+ (ge): ditto.
+ (wlt): use wcmp.
+ (wgt): ditto.
+ (wle): ditto.
+ (wge): ditto.
+ (time_subsec): use wmod.
- * ext/openssl/ossl_pkey_ec.c: Ensure compatibility to builds of
- OpenSSL with OPENSSL_NO_EC2M defined, but OPENSSL_NO_EC not
- defined.
- * test/openssl/test_pkey_ec.rb: Iterate over built-in curves
- (and assert their non-emptiness!) instead of hard-coding them, as
- this may cause problems with respect to the different availability
- of individual curves in individual OpenSSL builds.
- [ruby-core:54881] [Bug #8384]
+Sun Apr 4 10:04:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * include/ruby/ruby.h: replace snprintf and vsnprintf by
+ ruby_snprintf and ruby_vsnprintf. [ruby-dev:40909]
+
+ * configure.in: don't check snprintf(3) and vsnprintf(3).
+
+ * include/ruby/missing.h: don't declare snprintf and vsnprintf.
+
+ * include/ruby/ruby.h: include stdarg.h.
+
+ * sprintf.c: include vsnprintf.c
+
+ * vsnprintf.c: renamed from missing/vsnprintf.c.
+
+ * vsnprintf.c: remove useless ifdefs.
+
+ * win32/mkexports.rb: use ruby_snprintf and ruby_vsnprintf.
+
+Sun Apr 4 09:44:01 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (lt): call <=> instead of <.
+
+Sun Apr 4 06:46:16 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * lib/yaml: Moved to ext/syck/lib, Syck only uses Syck constant.
+ * lib/yaml.rb: Added an engine manager for choosing YAML engine.
+ * ext/syck/lib/syck/rubytypes.rb: squashed warnings when using Psych
+
+Sat Apr 3 22:47:51 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c: don't define STRUCT_WIDEVAL.
+
+Sat Apr 3 18:15:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/rdoc.rb (RDoc#{setup,update}_output_dir): store mtimes
+ per files in the flag file.
+
+ * lib/rdoc/rdoc.rb (RDoc#normalized_file_list): skip already
+ processed and unmodified files.
+
+Sat Apr 3 15:09:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (rdoc): no force-update, and add RDOCFLAGS.
+
+ * lib/rdoc/options.rb (RDoc#parse): no-force-update option.
+
+Sat Apr 3 10:51:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (random_rand): raise ArgumentError on nil, as the
+ documentation implies. [ruby-core:29075]
+
+ * random.c (rb_f_rand): mentioned the case of when max is nil.
+
+Sat Apr 3 06:56:11 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * array.c (rb_ary_product): Accept a block [ruby-core:29045]
+
+Sat Apr 3 04:46:00 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/file2lastrev.rb (VCS#relative_to): path and @srcdir may have
+ different relative-ness.
+
+Sat Apr 3 03:19:01 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * lib/benchmark.rb (Benchmark::Tms#add): fix NameError.
+ [ruby-dev:40906]
+
+ * test/benchmark/test_benchmark.rb: add a test for above.
+
+Sat Apr 3 01:50:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/parser/ruby.rb (RDoc#make_message): no empty lines.
+
+ * lib/rdoc/stats.rb (RDoc::Normal#print_file): send to stdout and
+ flush always
+
+Sat Apr 3 00:03:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
+
+ * lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in
+ source directory.
+
+Fri Apr 2 22:13:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/rdoc.rb: reverted r27186 to add generators.
+
+Fri Apr 2 21:17:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * NEWS: added reverse_lookup option.
+
+Fri Apr 2 15:26:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/rdoc/test_rdoc_ri_driver.rb (with_dummy_pager): don't grasp
+ the terminal.
+
+Fri Apr 2 14:43:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/rdoc.rb (RDoc::Generator): defer by autoload.
+
+ * lib/rdoc/generator/darkfish.rb: use normal library instead of
+ gem.
+
+Fri Apr 2 14:26:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
+ RUBY_VERSION. reapplied r24990.
+
+ * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
+ are delimited by a semicolon. supported Vim style. reapplied
+ r24988 with fixing a typo for shebang.
+
+Fri Apr 2 14:16:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
+ files. reapplied r24976.
+
+ * lib/rdoc/parser/c.rb: fixed a small error in the documentation.
+ [ruby-core:24744] reapplied r24395.
+
+ * lib/rdoc/parser.rb (RDoc::Parser.binary?): blksize may be nil
+ and is irrelevant to whether a file is binary. TAB and newlines
+ would be usually considered to be included in text data.
+ reapplied r23071 and r24297.
+
+Fri Apr 2 13:59:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been
+ obsolete. reapplied r24599.
+
+ * lib/rdoc/ri/paths.rb: follows $ridir. reapplied r23554.
+
+ * lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): expand_path deals with
+ platform dependent environments. reapplied r21312.
+
+Fri Apr 2 12:52:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rdoc/parser.rb (binary?): regression.
+
+Fri Apr 2 11:54:49 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (init_env): wrong calculation of the head of setenv
+ string. [ruby-core:29216]
+ a patch from Heesob Park in [ruby-core:29218]
+
+Fri Apr 2 08:24:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * process.c (ruby_setsid): split from proc_setsid.
+
+ * process.c (proc_daemon): use EXIT_SUCCESS instead of magic number.
- Thanks to Vit Ondruch for providing the patch!
+Fri Apr 2 07:00:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 27 01:04:28 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * ext/dl/cptr.c (rb_dlptr_inspect): fix format specifiers.
- * lib/rubygems: Update to RubyGems 2.0.13. [ruby-core:58031]
- [Backport #9052]
- the patch is provided by drbrain (Eric Hodel).
+Fri Apr 2 05:38:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Oct 26 16:04:36 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * include/ruby/ruby.h (InitVM): calls per-VM initialization in
+ single VM, but does nothing in MVM.
- * gc.c (gc_prof_set_heap_info): fix compile error when
- GC_PROFILE_MORE_DETAIL != 0.
- the patch is provided by ko1 (Koichi Sasada).
+Fri Apr 2 02:56:56 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Thu Oct 24 23:27:12 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * lib/matrix.rb: New instance methods:
+ empty? [ruby-core:26284], each, each_with_index [ruby-core:28400],
+ conjugate, conj, imaginary, imag, real, real?, rectangular, rect
+ [ruby-core:26285]
- * lib/rubygems: Update to RubyGems 2.0.12. [ruby-core:57818]
- [Backport #9014]
- the patch is provided by drbrain (Eric Hodel).
+ Removed compare_by*, inspect_org, cf [ruby-core:26268]
-Thu Oct 24 22:49:28 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ Matrix.empty: raise on negative sizes
- * parse.y: Remove +(binary) and -(binary) special cases
- [Feature #9048]
+ Matrix.determinant: raise on rectangular matrices [ruby-core:28271]
-Thu Oct 24 22:36:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 1 17:17:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * encoding.c (load_encoding): should preserve outer errinfo, so that
- expected exception may not be lost. [ruby-core:57949] [Bug #9038]
+ * enc/trans/iso2022.trans: CP50221 supports 8bit JIS.
-Fri Oct 18 02:10:00 2013 Shugo Maeda <shugo@ruby-lang.org>
+Thu Apr 1 16:44:00 2010 Eric Hodel <drbrain@segment7.net>
- * vm_insnhelper.c (vm_call_method): set ci->me to 0 when the
- original method of a refined method is undef to avoid SEGV.
+ * lib/rdoc, test/rdoc: Imported RDoc 2.5
- * vm_method.c (rb_method_entry_without_refinements): return 0 when
- the original method of a refined method is undef to avoid SEGV.
+Thu Apr 1 14:30:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: related test.
+ * enc/utf_16{be,le}.c (utf16{be,le}_mbc_to_code): simplified.
-Fri Oct 18 02:05:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 1 14:07:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * win32/file.c (rb_file_expand_path_internal): fix memory leaks at
- a non-absolute home exception.
+ * util.c (BSD__hdtoa): don't use C99 macros. (FP_NORMAL etc)
-Thu Oct 10 01:14:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 1 13:30:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * compar.c (cmp_eq): fail if recursion. [ruby-core:57736] [Bug #9003]
+ * sprintf.c (rb_str_format): support %a format. [ruby-dev:40650]
- * thread.c (rb_exec_recursive_paired_outer): new function which is
- combinnation of paired and outer variants.
+ * missing/vsnprintf.c (BSD_vfprintf): ditto.
-Thu Oct 10 01:07:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/vsnprintf.c (cvt): ditto.
- * lib/tempfile.rb (Tempfile#unlink): finalizer is no longer needed
- after unlinking. patched by by normalperson (Eric Wong) at
- [ruby-core:56521] [Bug #8768]
+ * util.c (BSD__hdtoa): added. This is 2-clause BSDL licensed
+ by David Schultz and from FreeBSD.
-Thu Oct 10 00:58:39 2013 Benoit Daloze <eregontp@gmail.com>
+ * LEGAL: add about hdtoa() in util.c.
- * test/ruby/test_array.rb (test_count): add a test case for #count
- with an argument. See Bug #8654.
+Thu Apr 1 13:24:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Oct 10 00:58:39 2013 Benoit Daloze <eregontp@gmail.com>
+ * object.c (rb_cstr_to_dbl): return 0.0 if hexadecimal and
+ badcheck is FALSE: Float("0x1p+0") works, but "0x1p+0".to_f
+ doesn't. [ruby-dev:40650]
- * array.c (rb_ary_count): check length to avoid SEGV
- while iterating. Remove other pointer loop when arg is given.
+ * util.c (ruby_strtod): allow hexadecimal integers.
- * test/ruby/test_array.rb (test_count): add test for bug.
- [ruby-core:56072] [Bug #8654]
+Thu Apr 1 13:20:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Oct 10 00:58:39 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * lib/scanf.rb: support %a format. [ruby-dev:40650]
- * array.c (rb_ary_count): iterate items appropriately.
- [Bug #8654]
+Thu Apr 1 12:04:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Oct 10 00:44:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/ruby.h (PRE_TIMET_PREFIX): define if configure doesn't
+ defines it. [ruby-core:29190]
- * process.c (rb_fork_internal): remove cloexec setting on pipes
- created by rb_cloexec_pipe. patch by normalperson (Eric Wong) at
- [ruby-core:56523]. [Bug #8769]
+Thu Apr 1 11:36:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 10 00:24:01 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * io.c (rb_io_initialize): fixed a rdoc miss that textmode and
+ binmode flag explanation was reversed each other. a patch from
+ Heesob Park in [ruby-core:29166].
- * cont.c: disable FIBER_USE_NATIVE on GNU/Hurd because it doesn't
- support a combination getcontext() and threads. Patch by
- Gabriele Giacone (1o5g4r8o@gmail.com). [Bug #8990][ruby-core:57685]
+Thu Apr 1 09:54:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Oct 7 21:03:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/ruby.h (RUBY_{DEFAULT,NEVER}_FREE): added.
+ [ruby-dev:40889]
- * configure.in, win32/Makefile.sub (FIBER_USE_NATIVE): move conditions
- from cont.c
+Thu Apr 1 04:55:08 2010 Tanaka Akira <akr@fsij.org>
-Thu Oct 10 00:17:56 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * time.c (rb_big_abs_find_minbit): fix handling the last word.
- * test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
- correctly. Patch by Gabriele Giacone (1o5g4r8o@gmail.com).
- [Bug #8937][ruby-core:57311]
- * test/fiddle/helper.rb: ditto.
+Thu Apr 1 04:30:11 2010 Tanaka Akira <akr@fsij.org>
-Thu Oct 10 00:00:30 2013 Tanaka Akira <akr@fsij.org>
+ * time.c (long_mul): overflow condition changed.
+ (wi_mul): ditto.
- * lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
- time Time object as Ruby 2.0 and before.
+Wed Mar 31 23:33:29 2010 Tanaka Akira <akr@fsij.org>
-Thu Oct 10 00:00:30 2013 Tanaka Akira <akr@fsij.org>
+ * time.c (long_mul): extracted from mul and avoid integer overflow.
+ (wi_mul): extracted from wmul and avoid integer overflow.
- * lib/time.rb (Time.strptime): Use :offset.
- Patch by Felipe Contreras. [ruby-core:57694]
+Wed Mar 31 21:30:38 2010 Tanaka Akira <akr@fsij.org>
-Wed Oct 9 23:32:37 2013 Koichi Sasada <ko1@atdot.net>
+ * time.c: less bignum allocations.
- * gc.c (rb_gc_disable): do rest_sweep() before disable GC.
- This fix may solve a failure of
- TestTracepointObj#test_tracks_objspace_events
- [test/-ext-/tracepoint/test_tracepoint.rb:43].
+ * strftime.c (rb_strftime_timespec): defined to avoid rational for
+ nano second resolution time.
-Sat Oct 5 02:14:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 31 16:05:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_io_close_read): duplex IO should wait its child process
- even after close_read.
+ * test/rake/test_{package_task,rules,task_manager}.rb: use
+ temporary directories.
-Sat Oct 5 02:14:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 31 13:53:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * io.c (rb_io_close_read): keep fptr in write_io to be discarded, to
- fix freed pointer access when it is in use by other threads, and get
- rid of potential memory/fd leak.
+ * test/rubygems/gemutilities.rb (setup, teardown):
+ Object#to_yaml must use syck on RubyGem.
-Sat Oct 5 01:59:50 2013 Shugo Maeda <shugo@ruby-lang.org>
+Wed Mar 31 06:57:14 2010 Tanaka Akira <akr@fsij.org>
- * vm_method.c (rb_undef): raise a NameError if the original method
- of a refined method is not defined.
+ * time.c (timew2timespec): fix previous change.
- * vm_insnhelper.c (rb_method_entry_eq): added NULL check to avoid SEGV.
+Wed Mar 31 00:32:19 2010 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_refinement.rb: related test.
+ * time.c (wdivmod): renamed from wdivmodv. fix neg/pos and pos/neg.
+ (split_second): return number of seconds as wideval_t.
+ (timet2wv): new function.
+ (wv2timet): new function.
+ (timet2wideval): removed.
-Sat Oct 5 00:16:33 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Mar 30 22:24:19 2010 Tanaka Akira <akr@fsij.org>
- * process.c (rb_daemon): daemon(3) is implemented with fork(2).
- Therefore it needs rb_thread_atfork(). (and revert r41903)
+ * time.c: use more polymorphic operations.
-Sat Oct 5 00:16:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 30 22:12:38 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * process.c (fork_daemon): kill the other threads all and abandon the
- kept mutexes.
+ * NEWS: add URI.decode and URI.encode to Obsoleted methods,
+ and fix typos. [ruby-dev:40852]
-Sat Oct 5 00:16:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * NEWS: add Time#subsec.
- * process.c (fork_daemon): kill the other threads all and abandon the
- kept mutexes.
+Tue Mar 30 22:07:12 2010 Tanaka Akira <akr@fsij.org>
-Tue Oct 1 00:28:40 2013 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+ * time.c: reorder wide value implementation.
- * tool/make-snapshot: Fix order of priority for option parameter.
+Tue Mar 30 22:00:44 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
-Sat Sep 28 21:40:40 2013 Kenichi Kamiya <kachick1@gmail.com>
+ * lib/irb.rb: support [Feature#988], [ruby-core:21177].
+ * lib/irb/context.rb: fix Context#verbose?.
- * random.c (rb_random_ulong_limited): coerce before check negative.
- [Fixes GH-379]
+Tue Mar 30 21:56:33 2010 Tanaka Akira <akr@fsij.org>
-Fri Sep 27 01:24:20 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * time.c: make wide value more polymorphic.
- * lib/rubygems: Update to Rubygems 2.0.10. [ruby-core:57360]
- [Backport #8950]
- the patch is provided by drbrain (Eric Hodel).
- this update contains a security fix for CVE-2013-4363.
+Tue Mar 30 21:18:32 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Sep 27 01:11:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/psych/extconf.rb: install psych .so to not psych/ but direct.
+ This prepends to install *.rb files to psych/psych.
- * parse.y (lambda): adjust position to the beginning of the block.
+ * ext/psych/lib/psych.rb: require 'psych.so'.
-Fri Sep 27 01:02:59 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Mar 30 20:55:14 2010 Tanaka Akira <akr@fsij.org>
- * lib/uri/generic.rb (URI::Generic.find_proxy): return nil if
- http_proxy environment variable is empty string.
- [ruby-core:57140] [Bug #8898]
+ * time.c (w2v): renamed from w2xv.
+ (v2w): renamed from xv2w.
+ (rb_time_magnify): takes wideval_t.
+ (rb_time_unmagnify): returns wideval_t.
-Fri Sep 27 00:58:57 2013 Zachary Scott <e@zzak.io>
+Tue Mar 30 19:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]
+ * ext/psych/lib: moved external library dependent files from lib.
+ [ruby-core:29129]
-Sun Sep 15 23:15:32 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Tue Mar 30 18:25:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems: Update to Rubygems 2.0.9. [ruby-core:57183]
- [Backport #8908]
- the patch is provided by drbrain (Eric Hodel).
+ * file.c (rb_file_dirname): split from rb_file_s_dirname.
-Sun Sep 15 22:59:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * load.c (rb_f_require_relative): use absolute path instead of
+ expanded path.
- * tool/rbinstall.rb (Gem::Specification#initialize): default date to
- RUBY_RELEASE_DATE. [ruby-core:57072] [Bug #8878]
+Tue Mar 30 13:57:08 2010 Akinori MUSHA <knu@iDaemons.org>
- * tool/rbinstall.rb (Gem::Specification#to_ruby): add date.
+ * process.c (proc_daemon): Process.daemon should raise an error on
+ failure regardless of whether the implementation uses daemon(3)
+ or not. [ruby-dev:40832]
-Sun Sep 15 22:55:44 2013 Zachary Scott <e@zzak.io>
+Tue Mar 30 13:11:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * hash.c (rb_hash_aset): [DOC] Document key dup patch by @kachick
- [Fixes GH-382] https://github.com/ruby/ruby/pull/382
+ * tool/file2lastrev.rb (VCS::GIT_SVN): removed because git-log can
+ deal with git-svn repository faster than git-svn-info.
-Sun Sep 15 22:03:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * tool/file2lastrev.rb (VCS#get_revisions): particular commands do
+ not depend on instance.
- * vsnprintf.c (MAXEXP, MAXFRACT): calculate depending on constants in
- float.h.
+Tue Mar 30 08:55:50 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * vsnprintf.c (BSD_vfprintf): limit length for cvt() to get rid of
- buffer overflow. [ruby-core:57023] [Bug #8864]
+ * ext/psych/extconf.rb: Making library detection more agnostic.
- * vsnprintf.c (exponent): make expbuf size more precise.
+Tue Mar 30 08:10:59 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-Sat Sep 14 00:01:20 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * lib/psych.rb: Fix problem with empty and white-space only strings.
+ Thanks Peter McLain!
+ * test/psych/test_psych.rb: tests for change.
- * lib/rubygems: Update to RubyGems 2.0.8. [ruby-core:57155]
- [Backport #8900]
- the patch is provided by drbrain (Eric Hodel).
- this update contains a security fix for CVE-2013-4287.
+Tue Mar 30 05:31:39 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-Fri Sep 13 23:20:29 2013 Kenichi Kamiya <kachick1@gmail.com>
+ * lib/psych.rb: documentation updates. Thanks Peter McLain!
+ * lib/psych/{coder,tree_builder}.rb: ditto
- * object.c (Init_Object): undef Module#prepend_features on Class, as
- well as Module#append_features. [Fixes GH-376]
+Tue Mar 30 03:56:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test_class.rb: Added test for above. And ensure type checking
- on similar methods as module_function.
+ * ext/psych/{emitter,parser,psych}.c: move variable
+ declaration to the first of the block.
-Fri Sep 13 23:16:12 2013 Zachary Scott <e@zzak.io>
+Mon Mar 29 21:47:44 2010 Akinori MUSHA <knu@iDaemons.org>
- * enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle
- Patch by @kachick [Fixes GH-372]
- https://github.com/ruby/ruby/pull/372
+ * prelude.rb, .document: Stuff in prelude.rb should be documented
+ as well.
-Fri Sep 13 22:40:28 2013 Koichi Sasada <ko1@atdot.net>
+Mon Mar 29 20:23:05 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
- * vm_insnhelper.c (vm_search_super_method): use ci->argc instead of
- ci->orig_argc. ci->argc can be changed by splat arguments.
- [ruby-list:49575]
- This fix should be applied to Ruby 2.0.0 series.
+ * lib/matrix.rb(Vector#each2, Vector#collect2): add type check for
+ Integer[Bug #2495].
- * test/ruby/test_super.rb: add a test for above.
+Mon Mar 29 19:45:09 2010 Tanaka Akira <akr@fsij.org>
-Fri Sep 13 01:44:54 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * time.c: wide value condition changed.
- * thread.c (rb_mutex_unlock): Mutex#unlock no longer raise
- an exception even if uses on trap. [Bug #8891]
+Mon Mar 29 18:10:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Sep 13 01:09:59 2013 Shota Fukumori <sorah@tubusu.net>
+ * lib/optparse.rb (Numeric): accept rationals.
- * vm_backtrace.c (vm_backtrace_to_ary): Ignore the second argument if
- it is nil. [Bug #8884] [ruby-core:57094]
+Mon Mar 29 15:10:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_backtrace.rb (test_caller_with_nil_length):
- Test for above.
+ * lib/tempfile.rb (Tempfile#open): re-open with same mode and
+ options as initialize.
-Fri Sep 13 00:57:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 29 09:16:45 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * class.c (method_entry_i): should exclude refined methods from
- instance method list. [ruby-core:57080] [Bug #8881]
+ * random.c: change include order; ruby.h should be at first.
-Fri Sep 13 00:33:09 2013 Charlie Somerville <charliesome@ruby-lang.org>
+Mon Mar 29 06:47:25 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * vm_eval.c (vm_call0): fix prototype, the id parameter should be of
- type ID, not VALUE
+ * ext/psych/*: importing Psych to trunk
+ * test/psych/*: ditto
+ * lib/psych/*: ditto
- * vm_insnhelper.c (check_match): the rb_funcall family of functions
- does not care about refinements. We need to use
- rb_method_entry_with_refinements instead to call === with
- refinements. Thanks to Jon Conley for reporting this bug.
- [ruby-core:57051] [Bug #8872]
+Sun Mar 28 10:03:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_refinement.rb: add test
+ * lib/scanf.rb: fix max width modifier for %f.
-Fri Sep 13 00:18:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 28 10:35:45 2010 Ryan Davis <ryand-ruby@zenspider.com>
- * enumerator.c (lazy_zip_func): fix non-single argument. fix
- out-of-bound access and pack multiple yielded values.
- [ruby-core:56383] [Bug #8735]
+ * lib/minitest/*.rb: Imported minitest 1.6.0 r5717.
+ * test/minitest/*.rb: ditto.
-Thu Sep 12 01:44:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 28 10:12:28 2010 Tanaka Akira <akr@fsij.org>
- * string.c (str_gsub): use BEG(0) for whole matched position not
- return value from rb_reg_search(), for \K matching.
- [ruby-dev:47694] [Bug #8856]
+ * time.c (rb_time_magnify): fix for LP64.
-Thu Sep 12 01:34:07 2013 Charlie Somerville <charliesome@ruby-lang.org>
+Sun Mar 28 09:28:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * object.c (rb_class_inherited_p): allow iclasses to be tested for
- inheritance. [Bug #8686] [ruby-core:56174]
+ * lib/scanf.rb: fix %[egEFG] isn't accept.
- * test/ruby/test_method.rb: add test
+Sun Mar 28 09:53:02 2010 Tanaka Akira <akr@fsij.org>
-Thu Sep 12 01:18:44 2013 Michal Rokos <michal@rokos.cz>
+ * time.c: rename small integer specialization related identifiers.
- * configure.in (sys/pstat.h): fix missing header check for
- missing/setproctitle.c on HP-UX. [ruby-core:56644] [Bug #8792]
+Sun Mar 28 08:20:37 2010 Tanaka Akira <akr@fsij.org>
-Thu Sep 12 01:02:56 2013 Benoit Daloze <eregontp@gmail.com>
+ * time.c (weq): specialize for small integer.
+ (wne): ditto.
+ (wlt): ditto.
+ (wgt): ditto.
+ (wle): ditto.
+ (wge): ditto.
+ (rb_time_magnify): ditto.
+ (rb_time_unmagnify): ditto.
+ (rb_time_unmagnify_to_float): new function to avoid rational for
+ Time#to_f and Time#-.
- * test/ruby/test_time.rb: use the in_timezone() helper
- and define it at the top with other helpers.
+Sun Mar 28 07:12:41 2010 Tanaka Akira <akr@fsij.org>
-Thu Sep 12 01:02:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (mul): condition refined.
- * time.c (time_mload): ignore auxiliary data, offset and zone, if
- invalid. [ruby-core:56648] [Bug #8795]
+Sun Mar 28 02:14:13 2010 Tanaka Akira <akr@fsij.org>
-Thu Sep 12 00:22:22 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+ * time.c: fix previous commit.
- * variable.c (classname): the name of class that has
- non class id should not be nil. This bug was introduced
- in r36577.
+Sat Mar 27 23:17:52 2010 Tanaka Akira <akr@fsij.org>
- * test/thread/test_cv.rb: test for change.
+ * time.c: use 64bit arithmetic even on platforms with 32bit VALUE.
-Thu Aug 29 21:51:33 2013 Eric Hodel <drbrain@segment7.net>
+Fri Mar 26 23:52:07 2010 wanabe <s.wanabe@gmail.com>
- * ext/zlib/zlib.c (zstream_run): Fix handling of deflate streams that
- need a dictionary but are being decompressed by Zlib::Inflate.inflate
- (which has no option to set a dictionary). Now Zlib::NeedDict is
- raised instead of crashing. [ruby-trunk - Bug #8829]
- * test/zlib/test_zlib.rb (TestZlibInflate): Test for the above.
+ * NEWS: add Thread#add_trace_func and Thread#set_trace_func.
-Thu Aug 29 21:28:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 26 22:58:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_insnhelper.c (vm_call_method): a method entry refers the based
- class/module, so should search superclass from the origin i-class
- where the entry belongs to, to get rid of infinite loop when zsuper
- in a prepended class/module. [ruby-core:54105] [Bug #8238]
+ * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
+ store->ex_data.sk. a patch from Christian Holtje in
+ [ruby-core:28907]. [ruby-core:23971] [ruby-core:18121]
-Fri Aug 23 01:16:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 26 19:55:41 2010 Akinori MUSHA <knu@iDaemons.org>
- * ext/date/date_parse.c (rfc2822_cb): check if wday is given, since it
- can be omitted.
+ * Makefile.in (DOXYGEN): Define a missing variable DOXYGEN. Build
+ has been failing when doxygen(1) is found by configure but the
+ variable is not defined by the system and make(1) does not allow
+ an empty command. ("@$(DOXYGEN)" was the cause)
-Fri Aug 23 00:55:02 2013 Tanaka Akira <akr@fsij.org>
+Fri Mar 26 19:28:03 2010 Shugo Maeda <shugo@ruby-lang.org>
- * gc.c (getrusage_time): Fallback clock_gettime to getrusage when
- clock_gettime fails.
- Reported by Eric Saxby. [ruby-core:56762] [Bug #8805]
-
-Sat Aug 17 00:42:12 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * test/ruby/test_hash.rb (test_recursive_key): recursive keys are
+ permitted now. [ruby-dev:40735]
- * parse.y: fix build error with bison-3.0.
+Fri Mar 26 12:36:10 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-Sat Aug 17 00:39:20 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/yaml/basenode.rb: deprecating YPath methods
- * test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
- mswin is not only mswin32 but also mswin64. [Bug #8746]
+ * lib/yaml/stream.rb: deprecating YAML::Stream#edit
-Sat Aug 17 00:36:24 2013 Charlie Somerville <charliesome@ruby-lang.org>
+Fri Mar 26 12:29:28 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
- Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437]
+ * lib/yaml/encoding.rb: YAML.encode, YAML.decode are deprecated.
-Sat Aug 17 00:32:17 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * lib/yaml/stringio.rb: yaml/stringio.rb is deprecated.
- * lib/rubygems: update to RubyGems 2.0.7. the patch by drbrain.
- [ruby-core:56633] [Backport #8787]
+ * lib/yaml/ypath.rb: YAML::YPath is deprecated.
-Sat Aug 10 23:59:47 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Mar 26 04:52:19 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/coverage/test_coverage.rb (TestCoverage#test_big_code): use `1'
- instead of `p' to get rid of a side effect.
- Kernel#p without any argument seems to do nothing, but flushes stdout.
- and, if stdout is redirected to file, fsync() will be called on
- Windows. so, when running test-all on Windows with redirection, such
- as CI environment, this test took a lot of time.
+ * ext/tk/extconf.rb: fix [ruby-core:28901] [Bug #2997].
+ Thanks, Michael Graff.
-Sun Aug 4 22:42:16 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/tcltklib.c: use xfree() for memories allocated by ALLOC().
- * win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
- because the latter fails on cross device file move of some
- environments.
- fix [ruby-core:53492] [Bug #8109]
- reported by mitchellh (Mitchell Hashimoto)
+ * ext/tk/tkutil/tkutil.c: ditto.
-Sat Aug 3 23:02:09 2013 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tkextlib/version.rb: forgot updating.
- * ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
- clause.
+Thu Mar 25 23:53:22 2010 wanabe <s.wanabe@gmail.com>
-Sat Aug 3 23:02:09 2013 Tanaka Akira <akr@fsij.org>
+ * thread.c (thread_reset_event_flags): set flags to thread. [Bug #693]
- * ext/extmk.rb (extmake): Use Logging.open to switch stdout and
- stderr. Delay Logging::log_close until the failure message is
- written. Write the failure message only if log file is opened.
+Thu Mar 25 23:17:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/mkmf.rb (Logging.log_opened?): New method.
+ * file.c (rb_get_path_check): prefer #to_path over #to_str. a patch
+ originally written by me, and modified by Nobuyoshi Nakada.
+ [ruby-core:24257]
- [ruby-dev:47215] [Bug #8209]
+Thu Mar 25 18:10:08 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Sat Aug 3 22:46:19 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * NEWS: Array#{uniq,uniq!} can take a block. see [ruby-dev:37998]
- * lib/mkmf.rb (xsystem): expand environment variable in all macros not
- expanded with RbConfig. [Bug #8702]
+Thu Mar 25 17:21:49 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/mkmf/test_framework.rb (create_framework): replace all $@ not
- only once.
+ * NEWS: add IO#autoclose=, IO#autoclose?, IO#codepoints,
+ IO#each_codepoint.
-Sat Aug 3 22:40:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 25 14:50:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (have_framework): allow header file to check.
- [ruby-core:55745] [Bug #8593]
+ * win32/win32.c (rb_w32_{read,write}): fix handle leaks. based on
+ a patch from Heesob Park in [ruby-core:28919]. [ruby-core:28833]
-Sat Aug 3 22:24:44 2013 Shota Fukumori <her@sorah.jp>
+Thu Mar 25 12:37:37 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * NEWS: add Kernel#singleton_class.
+
+Thu Mar 25 11:34:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * bignum.c, node.h, strftime.c, enc/trans/utf8_mac.trans:
+ added explicit casts for suppressing warnings.
+
+Thu Mar 25 11:34:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * test/ruby/test_dir_m17n.rb: HFS+ escapes invalid byte sequences of
+ filenames.
+
+Thu Mar 25 05:44:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (ruby_version): needs runnable CPP.
+
+Thu Mar 25 04:42:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/make-snapshot (package): take a breath for HP-UX make
+ [ruby-core:28938].
+
+ * tool/make-snapshot (Dir.mktmpdir): for 1.8.6 backward compatibility.
+
+ * tool/make-snapshot (package): $: no longer contains ".", in trunk.
+
+Thu Mar 25 03:52:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/charset_alias.rb: update of URL. [ruby-dev:38360]
+
+Wed Mar 24 23:43:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread.c (thread_create_core): let new thread inherit RUBY_EVENT_VM
+ of event_flags. [ruby-core:25191]
+
+ * thread.c (rb_threadptr_exec_event_hooks): delete RUBY_EVENT_VM if
+ all event_hooks are removed.
+
+Wed Mar 24 22:58:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * configure.in: revert the previous commit, which seemed to break make
+ install. The files of standard libraries are directly installed to
+ $(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1
+
+Wed Mar 24 18:16:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912]
+
+Wed Mar 24 14:33:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_read): limit read size to 16KB if the file
+ seems to be console. [ruby-core:28902]
+
+Wed Mar 24 10:18:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * file.c (file_expand_path): set length of string before calling
+ rb_enc_check because rb_enc_check scans its content.
+ This prevents warnings by valgrind.
+
+Tue Mar 23 23:58:51 2010 James Edward Gray II <jeg2@ruby-lang.org>
+
+ * lib/csv.rb: Incorporating the fixes from the recent
+ FasterCSV releases: 1.5.2 and 1.5.3. New parser
+ by Tim Elliott. [ruby-core:25038]
+
+Tue Mar 23 18:35:46 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * object.c (rb_obj_singleton_class): new method
+ Kernel#singleton_class. [ruby-core:21702]
+
+Tue Mar 23 01:13:59 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket: use rsock_ prefix for internal initialization functions.
+
+Mon Mar 22 20:32:22 2010 wanabe <s.wanabe@gmail.com>
+
+ * proc.c (rb_method_location): return attr's location if it is setup.
+ [Feature #2084]
+
+ * NEWS: follow above.
+
+ * vm_method.c (rb_add_method): save attr's location.
+
+ * gc.c (mark_method_entry): mark attr's location.
+
+ * method.h (rb_method_definition_t): add member to save attr's location.
+
+ * vm_eval.c (vm_call0): follow above.
+
+ * vm_insnhelper.c (vm_call_method): ditto.
+
+ * vm_method.c (rb_method_definition_eq): ditto.
+
+Mon Mar 22 19:31:06 2010 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb (Date#>>): fixed. [ruby-core:28011]
+
+Mon Mar 22 18:01:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RMDIRS): use rmdir -p if possible.
+
+ * Makefile.in ({dist,real}clean-ext): fix for removing ext
+ directories.
+
+Mon Mar 22 09:06:10 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/.document: extracted from ext/.document.
+
+Mon Mar 22 00:50:33 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/rubysocket.h (rsock_revlookup_flag): declared.
+
+Mon Mar 22 00:01:24 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
+
+ * symbian/setup (config.h): RUBY_EXEC_PREFIX defined.
+
+Sun Mar 21 00:46:29 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/common.rb (URI.encode_www_form_component):
+ convert strings of HTML5 ASCII incompatible encoding
+ to UTF-8.
+
+ * lib/uri/common.rb (URI.encode_www_form_component):
+ "\x83\x41" of Shift_JIS should be encoded as "%83A".
+ This follows real implementations.
* lib/uri/common.rb (URI.decode_www_form_component):
- Don't raise error when str includes multibyte characters.
+ use given encoding for force_encoding. [ruby-dev:40721]
+
+Sun Mar 21 21:09:17 2010 Tanaka Akira <akr@fsij.org>
+
+ * lib/resolv-replace.rb: specify super class for rdoc.
+
+ * lib/ipaddr.rb: ditto.
+
+Sun Mar 21 19:52:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_initialize): add autoclose argument to control close
+ at finalization. [ruby-core:26222]
+
+ * io.c (rb_io_autoclose_p, rb_io_set_autoclose): new methods.
+
+Sun Mar 21 19:50:04 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket: make sources rdoc friendly.
+
+Sun Mar 21 17:57:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (IO_RBUF_CAPA_FOR): use large buffer as cbuf if readconv is
+ needed for performance improvement. based on a patch by Roger Pack
+ in [ruby-core:28163]. [ruby-core:28162]
+
+Sun Mar 21 17:14:49 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: reuse hash object.
+
+Sun Mar 21 12:32:39 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb (transcode_compile_tree): make
+ valid_encoding mandatory unless from_encoding is registered in
+ ValidEncoding.
+ (transcode_tbl_only): ditto.
+ (transcode_tblgen): ditto.
+ (ValidEncoding): new function.
+
+ * enc/trans/escape.trans: specify valid_encoding.
+
+ * enc/trans/emoji_sjis_docomo.trans: ditto.
+
+ * enc/trans/emoji.trans: ditto.
+
+ * enc/trans/emoji_iso2022_kddi.trans: ditto.
+
+ * enc/trans/big5.trans: ditto.
+
+ * enc/trans/emoji_sjis_softbank.trans: ditto.
+
+ * enc/trans/emoji_sjis_kddi.trans: ditto.
+
+ * enc/trans/chinese.trans: use ValidEncoding() instead of
+ ValidEncoding[].
+
+Sun Mar 21 09:43:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (IO_[CRW]BUF_CAPA_MIN): replaced magic numbers.
+
+Sun Mar 21 09:22:10 2010 Tanaka Akira <akr@fsij.org>
+
+ * object.c (rb_obj_hash): use LONG2FIX to avoid Bignum allocation.
+
+Sat Mar 20 22:51:46 2010 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_sum): use UCHAR_MAX.
+
+Sat Mar 20 19:16:42 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb (ActionMap.unambiguous_action): use
+ Array#delete.
+ (ActionMap.merge2): defined.
+ (ActionMap::PostMemo): removed.
+ (transcode_compile_tree): use ActionMap.merge2.
+
+Sat Mar 20 13:26:09 2010 Tanaka Akira <akr@fsij.org>
+
+ * array.c (rb_ary_uniq_bang): the array is already unique if the
+ length is zero or one.
+ (rb_ary_uniq): ditto.
+
+Sat Mar 20 12:30:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib: fixed typo. a patch by Sho Hashimoto in [ruby-dev:40716].
+
+Sat Mar 20 11:32:18 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb (each_firstbyte_range): tuned for less
+ method calls.
+
+Sat Mar 20 00:59:50 2010 wanabe <s.wanabe@gmail.com>
+
+ * ext/dl/lib/dl/pack.rb (DL#pack): allow LLP64.
+
+Fri Mar 19 05:26:31 2010 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_sum): don't call method for each byte.
+
+Thu Mar 18 21:24:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (miniruby): link $(NORMALMAINOBJ).
+
+Thu Mar 18 19:52:27 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: scan singleton mappings sequentially.
+
+Thu Mar 18 06:28:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_EXEC_PREFIX): added to config.h.
+
+ * ruby.c (ruby_init_loadpath_safe): TMP_RUBY_PREFIX should be
+ exec_prefix, not rubylibprefix. [ruby-core:28718]
+
+ * version.c (RUBY_LIB_PREFIX): fallback to RUBY_EXEC_PREFIX.
+
+Thu Mar 18 05:58:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_{to_i,mod,divmod,div2}):
+ removed unused variables.
+
+Thu Mar 18 04:40:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (rb_intern3): get rid of type-punning cast.
+
+Thu Mar 18 02:29:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (iseq_build_body): add mark to jump table hash of case.
+
+Thu Mar 18 00:58:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * util.c (ruby_strtod): Add support for Hexadecimal
+ floating-point expression [ruby-dev:40650] #2969
+
+Thu Mar 18 00:00:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/common.rb (URI.{en,de}code_www_form_component):
+ renamed from URI.{en,de}code_www_component. [ruby-dev:40672]
+
+ * lib/uri/common.rb (URI.encode_www_form_component): %-encoded
+ element should have always two hex.
+
+ * lib/uri/common.rb (URI.encode_www_form_component):
+ better treatment for ASCII incompatible encodings and
+ encodings whose lead byte may use 7bit.
+
+ * lib/uri/common.rb (URI.decode_www_form_component): add %20.
+
+ * lib/uri/common.rb (URI.decode_www_form_component): add
+ result's encoding as 2nd argument.
+
+ * lib/uri/common.rb (URI.decode_www_form): added.
+
+Wed Mar 17 16:25:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * hash.c (rb_hash_aset): allow recursive key. [ruby-core:24648]
+
+Wed Mar 17 06:39:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc.
+ [ruby-core:28696]
+
+Wed Mar 17 02:29:46 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c, iseq.c, ruby.c, vm.c, vm_core.h, vm_eval.c: add absolute
+ path field into rb_iseq_t. The field contains a string representing
+ a path to corresponding source file. or nil when the iseq is created
+ from -e, stdin, eval, etc. This field is used for require_relative.
+ [ruby-dev:40004]
+
+ * load.c (rb_f_require_relative): add C implementation of
+ require_relative.
+
+ * prelude.rb (require_relative): get rid of Ruby implementation of
+ require_relative.
+
+Wed Mar 17 01:24:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * parse.y (rb_intern3): prohibit Symbol with an invalid encoding.
+ [ruby-core:24621]
+
+ * test/ruby/test_m17n_comb.rb: modify a test for above.
+
+Tue Mar 16 22:51:11 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: specialize for singleton mappings.
+
+Tue Mar 16 20:13:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * enc/trans/emoji.trans: added codepoints leading 0xf4 into
+ nomap_table.
+
+Tue Mar 16 17:33:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (VpCtoV): keep e's sign.
+ When e doesn't over flow e * BASE_FIG but overflow e * 10,
+ e will overflow.
+
+Tue Mar 16 17:18:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/encoding.h (rb_str_conv_enc_opts): missing prototype.
+
+Tue Mar 16 15:20:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/tmpdir: split from lib/tmpdir.rb.
+
+ * win32/win32.c (rb_w32_system_tmpdir): extracted from init_env.
+
+ * win32/win32.c (rb_w32_getcwd): removed duplicated code.
+
+Tue Mar 16 14:06:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/encoding.h (ENC_TO_ENCINDEX): suppress warnings.
+
+Tue Mar 16 14:03:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RSHIFT): parenthesize the argument of cast instead
+ of the result.
+
+Tue Mar 16 11:23:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): ignore dname if it has different
+ drive letter or UNC.
+
+Tue Mar 16 07:16:56 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: redundant loop removed.
+
+Tue Mar 16 07:01:43 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: refactored to use tree as memo key.
+
+Tue Mar 16 04:05:13 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: more info in generating macro names.
+
+Mon Mar 15 21:58:03 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: ActionMap#each_firstbyte inlined.
+
+Mon Mar 15 21:22:49 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb (transcode_tblgen): add valid_encoding
+ optional argument.
+
+ * enc/trans/single_byte.trans use valid_encoding argument for
+ transcode_tblgen.
+
+ * enc/trans/chinese.trans: ditto.
+
+Mon Mar 15 18:33:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (default_rand): removed initial buffer.
+
+ * random.c (Init_RandomSeed): initialize seed of default random.
+
+ * random.c (Init_RandomSeed2): turn the seed to Bignum object.
+
+Mon Mar 15 17:28:30 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_print): RDoc update. a patch from Daniel Kelley
+ in [ruby-core:28643].
+
+Mon Mar 15 14:06:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (next_state): no initialization here.
+
+ * random.c (default_mt): always return initialized MT.
+
+Mon Mar 15 11:49:48 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * random.c (rb_reset_random_seed): set seed in this.
+ [ruby-core:28655]
+
+Mon Mar 15 10:26:02 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: import latest nkf. [master 9306cb0]
+ this also fixes [ruby-dev:40607]
+
+Mon Mar 15 09:34:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/common.rb (URI.encode_www_component):
+ call str.to_s at first.
+
+Mon Mar 15 09:36:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * symbian/README.SYMBIAN: fixed broken patch and converted to
+ unified diff.
+
+Mon Mar 15 07:51:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
+
+Mon Mar 15 07:41:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (realpath_rec): use same cache.
+
+ * file.c (realpath_internal): regulate separators in prefix.
+ [ruby-core:28653]
+
+ * file.c (FILE_ALT_SEPARATOR): separated condition.
+
+Mon Mar 15 04:41:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_each_codepoint): read directly when readconv is
+ needed but internal encoding is not set. [ruby-core:28650]
-Sun Jul 28 22:00:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 15 04:18:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * rational.c (f_round_common): Rational is expected to be returned by
- Rational#*, but mathn.rb breaks that assumption. [ruby-core:56177]
- [Bug #8687]
+ * tool/file2lastrev.rb (VCS::{SVN,GIT}#get_revisions):
+ use block argument 'path' to get the path given by super.
-Sun Jul 28 21:50:34 2013 Masaki Matsushita <glass.saga@gmail.com>
+Mon Mar 15 02:43:59 2010 Tanaka Akira <akr@fsij.org>
- * io.c (io_getpartial): use rb_str_locktmp_ensure().
- [ruby-core:56121] [Bug #8669]
+ * tool/transcode-tblgen.rb (Action#hash): defined.
+ (Action#eql?): ditto.
+ (Action#==): ditto.
- * io.c (rb_io_sysread): ditto.
+Mon Mar 15 01:52:46 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: refactored.
+
+Mon Mar 15 01:18:31 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
+
+ * symbian/setup (*.pkg): Ruby Core installation separated from standard extensions.
+
+ * symbian/configure.bat: ditto.
+
+ * symbian/README.SYMBIAN: ditto.
+
+ * symbian/setup (config.h): support for 2nd internal drive added.
+
+Mon Mar 15 00:11:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/file2lastrev.rb (VCS::GIT_SVN#get_revisions) :
+ use block argument 'path' to get the path given by super.
+
+ * tool/file2lastrev.rb (VCS::GIT#get_revisions):
+ use double quotes for Windows.
+ patched by Vladimir Sizikov [ruby-core:28651]
+
+Sun Mar 14 22:38:31 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: consider valid_encoding for max_input.
+
+Sun Mar 14 15:46:09 2010 Tanaka Akira <akr@fsij.org>
+
+ * enc/trans/emoji.trans: fix nomap_table.
+
+Sun Mar 14 09:50:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * compile.c (insn_data_to_s_detail), iseq.c (insn_operand_intern):
+ fixed format specifiers.
+
+Sun Mar 14 07:20:17 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (EXPAND_PATH_BUFFER): make it back to usascii, to prevent
+ infinite loop on some platform. [ruby-dev:40629]
+
+Sun Mar 14 02:40:38 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: reject ambiguous mapping.
+
+ * enc/trans/single_byte.trans: remove ambiguous mapping such as
+ \xD6 -> U+05F2 and \xD6\xC7 -> U+FB1F in Windows-1255
+
+Sat Mar 13 23:48:27 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (file_expand_path): should not just copy the encoding
+ from fname. [ruby-core:28635]
+
+ * file.c (EXPAND_PATH_BUFFER): set filesystem_encoding, not
+ usascii for path buffer.
+
+Sat Mar 13 17:48:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/file2lastrev.rb: refactored. fixed changed revision of git.
+
+Sat Mar 13 15:44:20 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_print): should not print field separator at the end
+ of arguments. [ruby-talk:358633]
+
+Sat Mar 13 14:49:55 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enum.c (enum_join): remove Enumerable#join. [ruby-core:24786]
+
+ * array.c (ary_join_1): use #to_ary to detect recursive array.
+
+Sat Mar 13 12:26:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/io.h (MakeOpenFile): finalize fptr to get rid of
+ memory leak.
+
+Sat Mar 13 11:14:26 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * load.c (rb_get_expanded_load_path): expand paths if any item in $:
+ is not a string.
+
+Sat Mar 13 10:16:32 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * load.c (rb_get_expanded_load_path): does not expand paths if all
+ the items in $: are absolute paths. [ruby-core:28113]
+
+Sat Mar 13 10:03:52 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw.
+
+Sat Mar 13 03:24:15 2010 Tanaka Akira <akr@fsij.org>
+
+ * tool/transcode-tblgen.rb: show consumed time at last.
+
+Sat Mar 13 00:44:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_basename): check encoding of suffix.
+
+Sat Mar 13 00:11:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (ruby_init_loadpath_safe): mark initial load paths.
+
+ * gem_prelude.rb (push_all_highest_version_gems_on_load_path):
+ search insertion position by initial load path mark.
+
+ * lib/rubygems.rb (Gem.load_path_insert_index): ditto.
+
+Fri Mar 12 21:34:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * NEWS: emoji encodings.
+
+Fri Mar 12 17:14:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/common.rb (URI.encode_www_form): new method to
+ generate URL-encoded form data. [ruby-dev:39246]
+
+ * lib/uri/common.rb (URI.encode_www_component,
+ URI.decode_www_component): new method for encode/decode
+ a name/value of HTML form.
+
+Fri Mar 12 17:36:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/webrick/httpservlet/cgihandler.rb
+ (WEBrick::HTTPServlet::CGIHandler#do_GET):
+ set binary mode for tempfile.
+ http://pc12.2ch.net/test/read.cgi/tech/1265467681/286
+
+Fri Mar 12 13:52:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * tool/compile_prelude.rb: TMP_RUBY_PREFIX should replace
+ rubylibprefix but not prefix.
+
+Fri Mar 12 09:43:11 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * complex.c (f_signbit): remove condition for signbit because
+ all platforms have signbit from r26871.
+
+Fri Mar 12 07:25:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (init_env): get rid of alloca() for outer string.
+
+Fri Mar 12 07:17:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/racc/cparse/cparse.c: suppressed warnings for shortening on
+ platforms where pointer is bigger than int.
+
+Fri Mar 12 07:15:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (ruby_init_loadpath_safe, ruby_init_gems): set and remove
+ TMP_RUBY_PREFIX.
+
+ * variable.c (rb_const_remove): new function.
+
+ * tool/compile_prelude.rb: split each preludes.
+
+Fri Mar 12 07:09:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (config.status): setup MINIRUBY environment for
+ cross-compiling.
+
+Fri Mar 12 06:48:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/tk/extconf.rb: log() is built-in in some compilers and needs
+ proper declaration.
+
+Fri Mar 12 06:37:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sample/timeout.rb: split from lib/timeout.rb.
+
+Thu Mar 11 22:35:27 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (time_round): new method Time#round. [ruby-dev:40595]
+
+Thu Mar 11 17:31:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * transcode.c (str_transcode0): confirm the code range.
+
+Thu Mar 11 12:14:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * missing/signbit.c: added.
+
+Thu Mar 11 11:16:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: check if target_archs has changed.
+
+Thu Mar 11 01:33:30 2010 wanabe <s.wanabe@gmail.com>
+
+ * win32/win32.c (signbit): allow x64.
+
+Thu Mar 11 01:04:48 2010 Shugo Maeda <shugo@ruby-lang.org>
+
+ * iseq.c (rb_iseq_clone): sets local_iseq and klass properly.
+
+Wed Mar 10 21:25:41 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * enum.c (min_ii, max_ii, minmax_ii): remove wrong optimization that
+ reuses array for yield parameter, which caused unexpected behavior.
+ [ruby-core:25989]
+
+Wed Mar 10 12:10:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * enc/x_emoji.h: renamed from enc/x-emoji.c.
+
+Wed Mar 10 04:17:08 2010 Koichi Sasada <ko1@atdot.net>
+
+ * compile.c (defined_expr), insns.def (defined): fix to pass a Symbol
+ object such as :$foo for the "defined?($foo)" expression
+ on defined instruction. This patch fixes ISeq#to_a/load.
+
+Tue Mar 9 20:50:09 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/dl/test_method.rb: delete a residual test for dl on libffi.
+
+Tue Mar 9 18:00:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * enc/trans/EMOJI/*.src, enc/trans/emoji*,
+ enc/x-emoji.c, test/ruby/enc/test_emoji.rb,
+ tool/enc-emoji-citrus-gen.rb, tool/enc-emoji4unicode.rb,
+ tool/jisx0208.rb, tool/test/test_jisx0208.rb:
+ new encodings to support emoji charsets, which are used by
+ Japanese mobile phones [ruby-dev:40528].
+ Thanks Yoji Shidara for a lot of contribution.
+
+ * tool/transcode-tblgen.rb: modified for enc-emoji4unicode.rb.
+
+Tue Mar 9 14:57:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/transcode-tblgen.rb (ActionMap#generate_node):
+ remove useless dup.
+
+ * tool/transcode-tblgen.rb (transcode_tbl_only): remove duplicated
+ method call for encode_utf8.
+
+Tue Mar 9 14:55:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (rb_reg_to_s): remove unused variable.
+
+Tue Mar 9 12:17:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * tool/transcode-tblgen.rb (StrSet#parse, ActionMap#generate_node):
+ optimization (reusing object and improving memoize).
+ [ruby-dev:40582]
+
+Sun Mar 7 02:27:03 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
+
+ * dln.c [DLN_NEEDS_ALT_SEPARATOR] (translit_separator): small typo
+ fixed.
+
+ * symbian/setup (*.pkg): Shared library installation path fixed to
+ match changes in version.c.
+
+ * symbian/setup (ruby.mmp): SOURCE dln_find.c added.
+
+Sun Mar 7 23:14:22 2010 Tanaka Akira <akr@fsij.org>
+
+ * bignum.c (rb_big_pack): use DIGSPERLONG and BITSPERDIG.
+ (rb_big_unpack): use DIGSPERLONG.
+
+Sun Mar 7 19:21:10 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * io.c: Fix documentation for each/each_line/lines, bytes/each_byte,
+ codepoints/each_code_point [ruby-core:23948]
+
+ * string.c: ditto
+
+ * ext/stringio/stringio.c: ditto
+
+Sun Mar 7 13:49:49 2010 Tanaka Akira <akr@fsij.org>
+
+ * file.c: add optional basedir argument for realpath/realdirpath.
+ (realpath_internal): handle basedir.
+ (rb_file_s_realpath): extract basedir from argument list.
+ (rb_file_s_realdirpath): extract basedir from argument list.
+
+ * lib/pathname.rb (realpath): pass basedir.
+ (realdirpath): ditto.
+
+Sun Mar 7 02:05:38 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (enc_set_filesystem_encoding):
+ filesystem encoding on Mac OS X is now
+ default external encoding. so Mac OS X is now
+ treated as one of Unix. [ruby-dev:40439]
+
+ * file.c (file_path_convert): ditto.
+
+Sat Mar 6 22:07:09 2010 Tanaka Akira <akr@fsij.org>
+
+ * pack.c: fix the prototype of rb_big2ulong_pack.
+
+Sat Mar 6 13:45:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * io.c (rb_io_s_write, rb_io_s_binwrite): delete File#write and
+ #binwrite. It may take a long time to make them stable, so 1.9.2
+ should not include them. We need refactoring to implement them
+ again.
+
+ * test/ruby/test_io.rb: delete tests for them.
+
+Sat Mar 6 10:03:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * io.c (rb_io_s_binwrite): use mode "r+b" instead of "ab" to handle
+ offset correctly. [ruby-core:28517]
+
+ * test/ruby/test_io.rb: use assert_equal instead of assert.
+
+Sat Mar 6 01:08:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): VC6 has __int64.
+
+Fri Mar 5 19:36:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * transcode.c (econv_opts): set :undef => :replace when
+ :replace is given and :invalid is not given. [ruby-dev:40554]
+
+Fri Mar 5 17:51:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (pipe_open): suppressed a warning.
+
+ * win32/win32.c (rb_w32_map_errno, winnt_stat, rb_chsize): ditto.
+
+ * win32/win32.c (rb_w32_aspawn): get rid of overflow.
+
+Fri Mar 5 11:59:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (signbit): defined on mingw.
+
+Thu Mar 4 22:49:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * eval.c (setup_exception): avoid line number 0 when setting
+ $DEBUG=true. [ruby-dev:39116]
+
+Thu Mar 4 22:45:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * io.c (io_s_write, io_s_binwrite): add File#write and #binwrite.
+ [ruby-core:21701]
* test/ruby/test_io.rb: add tests for above.
-Sun Jul 28 21:50:34 2013 Masaki Matsushita <glass.saga@gmail.com>
+Mon Mar 4 13:14:34 2010 wanabe <s.wanabe@gmail.com>
- * string.c: add internal API rb_str_locktmp_ensure().
+ * gc.c (gc_profile_total_time): add GC::Profiler.total_time.
+ [ruby-core:27169]
- * io.c (io_fread): use rb_str_locktmp_ensure().
- [ruby-core:56121] [Bug #8669]
+ * NEWS: ditto.
- * test/ruby/test_io.rb: add a test for above.
+Thu Mar 4 10:15:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Jul 28 21:44:57 2013 Eric Hodel <drbrain@segment7.net>
+ * complex.c (m_log, m_exp): remove unused functions.
- * ext/openssl/ossl_asn1.c (asn1time_to_time): Implement YYMMDDhhmmZ
- format for ASN.1 UTCTime. [ruby-trunk - Bug #8664]
- * test/openssl/test_asn1.rb: Test for the above.
+Thu Mar 4 02:34:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Jul 26 00:38:58 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * test/ruby/test_env.rb (TestEnv#test_select_bang): add tests.
- * lib/rubygems: Update to RubyGems 2.0.6. [ruby-core:56160]
- [Backport #8682]
+Thu Mar 4 02:29:52 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Wed Jul 24 22:35:32 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/ruby/test_hash.rb (TestHash#test_keep_if): fix typo.
- * lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is
- a relative URI. [Bug #8645]
+Thu Mar 4 00:10:54 2010 Tanaka Akira <akr@fsij.org>
-Wed Jul 24 01:13:02 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * tool/transcode-tblgen.rb (HEX2): extracted from regexps.
- * include/ruby/intern.h (rb_f_lambde): restore the declaration of
- rb_f_lambda() for backword compatibility. and mark it as deprecated.
+Wed Mar 3 23:16:32 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Tue Jul 23 01:36:43 2013 Zachary Scott <e@zzak.io>
+ * complex.c (nucomp_real_check): raise TypeError instead of
+ ArgumentError when argument is not a real as expected
+ [ruby-core:28395]
- * lib/rubygems/psych_additions.rb: Ignore Psych docs here
+ * rational.c (nurat_int_check): ditto (for integers)
-Tue Jul 23 01:34:00 2013 Koichi Sasada <ko1@atdot.net>
+Wed Mar 3 23:07:08 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * test/test_tracer.rb: catch up recent rubygems changes.
+ * lib/matrix.rb (Vector#each): Return self and optimization
+ [ruby-core:28405]
-Tue Jul 23 01:28:54 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Wed Mar 3 18:35:55 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rubygems: Update to RubyGems 2.0.5.
- The patch provided by drbrain (Eric Hodel). [ruby-core:55896]
- [Backport #8617]
+ * hash.c (rb_hash_select_bang): add #select! and keep_if to Hash.
- * test/rubygems: Tests for the above.
+ * hash.c (env_select_bang): ..and to ENV.
-Tue Jul 23 00:00:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 3 15:54:20 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_eval.c (eval_string_with_cref): use the given file name unless
- eval even if scope is given. additional fix for [Bug #8436].
- based on the patch by srawlins at [ruby-core:56099] [Bug #8662].
+ * lib/matrix.rb (Vector#each2, collect2): small refactoring.
-Sat Jul 20 23:49:33 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Mar 3 16:14:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
- if it fails with Errno::EPERM on Windows (workaround).
- [ruby-dev:47245] [Bug #8251]
+ * lib/matrix.rb (Vector#each): make Vector enumerable.
+ [ruby-core:28405]
-Sat Jul 20 23:31:11 2013 Aman Gupta <tmm1@ruby-lang.org>
+Wed Mar 3 14:28:23 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * iseq.c (iseq_location_setup): re-use existing string when iseq has
- the same path and absolute_path. [Bug #8149]
+ * array.c (rb_ary_select_bang): select! removes all elements for
+ which block returns false. [ruby-core:27286]
-Sun Jul 14 00:18:08 2013 Zachary Scott <e@zzak.io>
+ * array.c (rb_ary_keep_if): #keep_if, new method.
- * sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
- https://github.com/ruby/ruby/pull/357
+Wed Mar 3 06:19:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jul 14 00:17:07 2013 Zachary Scott <zachary@zacharyscott.net>
+ * win32/win32.c (signbit): defined.
- * man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill
+ * win32/Makefile.sub, symbian/setup (config.h): pack.c requires
+ SIZEOF_INT*_T now.
-Sun Jul 14 00:15:26 2013 Zachary Scott <zachary@zacharyscott.net>
+Tue Mar 2 21:16:48 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/logger.rb: Use :call-seq: for method signature rdoc
+ * io.c (rb_io_lines, rb_io_bytes, rb_io_chars, rb_io_codepoints):
+ change to alias to each_*, in similar way to ARGF and String.
+ [ruby-core:23948]
-Sun Jul 14 00:13:01 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Mar 2 15:54:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
- TestNetHTTP_v1_2_chunked#test_get): shouldn't check
- HttpResponse#decode_content if Zlib is not available.
- ko1 complained via IRC.
+ * regcomp.c (noname_disable_map): add NT_ANCHOR case.
+ Without this change, captured groups in anchors (look-ahead,
+ look-behind, and so on) are not removed and
+ unintended invalid backref error occur. [ruby-core:28235]
-Sat Jul 13 23:50:00 2013 Tadayoshi Funaba <tadf@dotrb.org>
+ * regcomp.c (renumber_by_map): ditto.
- * ext/date/date_core.c: fixed coding error [ruby-core:55337].
- reported by Riley Lynch.
+Tue Mar 2 14:42:00 2010 Kenta Murata <mrkn@mrkn.jp>
-Sat Jul 13 23:50:00 2013 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/dl/test_closure.rb: forget to revert at r26764.
- * ext/date/date_core.c: fixed a bug [ruby-core:55295]. reported
- by Riley Lynch.
+Tue Mar 2 14:29:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 13 23:41:25 2013 Tadayoshi Funaba <tadf@dotrb.org>
+ * file.c (rb_find_file_ext_safe, rb_find_file_safe): skip argument
+ checks in file_expand_path().
- * ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
+Tue Mar 2 13:54:44 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Sat Jul 13 23:34:13 2013 Akinori MUSHA <knu@iDaemons.org>
+ * test/ruby/test_math.rb: Fix lgamma test
- * object.c: Fix rdoc for Kernel#<=>. [Fix GH-352]
+Mon Mar 1 23:26:56 2010 Tanaka Akira <akr@fsij.org>
-Sat Jul 13 23:29:51 2013 Akinori MUSHA <knu@iDaemons.org>
+ * ext/pty/pty.c (pty_open): refine the path for master IO.
- * lib/fileutils.rb (FileUtils#mode_to_s): Define mode_to_s() also
- as singleton method, or FileUtils.chmod fails in verbose mode.
+Mon Mar 1 20:07:06 2010 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-Sat Jul 13 23:27:12 2013 Akinori MUSHA <knu@iDaemons.org>
+ * ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare
+ different type values warning.
- * lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user
- and group are both nil, print ":".
+Mon Mar 1 17:42:45 2010 wanabe <s.wanabe@gmail.com>
-Sat Jul 13 23:16:49 2013 Tanaka Akira <akr@fsij.org>
+ * configure.in (mingw): do not detect snprintf/vsnprintf.
- * bignum.c (bigrsh_bang): Fix bignum digits overrun.
+Mon Mar 1 16:54:21 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jul 13 23:16:49 2013 Tanaka Akira <akr@fsij.org>
+ * include/ruby/oniguruma.h: updated to follow Oniguruma 5.9.2.
- * bignum.c (biglsh_bang): Fix bignum digits under-run.
+ * re.c (make_regexp): use onig_new() instead of onig_alloc_init().
-Sat Jul 13 22:45:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (rb_reg_to_s): ditto.
+Sun Feb 28 21:32:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (RUBY_DTRACE_POSTPROCESS): dtrace version SUN D 1.11
- introduces a check in the dtrace compiler to ensure that probes
- actually exist. If there are no probes, then the -G step will
- fail. As this test is only being used to determine whether -G is
- necessary (for instance, on OSX it is not), adding a real probe to
- the conftest allows it to succeed on newer versions of dtrace.
- Patch by Eric Saxby <sax AT livinginthepast.org> at
- [ruby-core:55826]. [Fix GH-351], [Bug #8606].
+ * ext/pty/pty.c (get_device_once): raise on error when fail is
+ non-zero.
-Sat Jul 13 22:41:20 2013 Martin Bosslet <Martin.Bosslet@gmail.com>
+Sun Feb 28 18:58:00 2010 Kenta Murata <mrkn@mrkn.jp>
- * test/openssl/test_x509crl.rb: Remove unused variable.
- [ruby-core:53501] [Bug #8114]
+ * math.c (rb_eMathDomainError): new exception class
+ for representing mathematical domain error instead
+ of Errno::EDOM.
- Thanks, Vipul Amler, for pointing this out!
+ * math.c (domain_check, infinity_check): removed,
+ no longer needed.
-Sun Jul 7 02:00:41 2013 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * math.c (math_atan2, math_acos, math_asin, math_acosh,
+ math_atanh, math_log, math_log2, math_log10, math_sqrt,
+ math_gamma, math_lgamma): mathematical domain errors
+ are checked and raised before calling libm's functions.
- * lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked
- critical.
- The patch for CVE-2013-4073 caused SSL crash when a SSL server returns
- the certificate that has critical SAN value. X509 extension could
- include 2 or 3 elements in it:
+ * test/ruby/test_math.rb: updated for changes of math.c.
- [id, criticality, octet_string] if critical,
- [id, octet_string] if not.
+Sun Feb 28 15:07:28 2010 Tanaka Akira <akr@fsij.org>
- Making sure to pick the last element of X509 extension and use it as
- SAN value.
- [ruby-core:55685] [Bug #8575]
+ * pack.c (pack_pack): use union to avoid pointer cast.
+ (pack_unpack): ditto.
- Thank you @nahi for providing the patch!
+Sun Feb 28 11:49:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Jul 7 01:58:25 2013 Akinori MUSHA <knu@iDaemons.org>
+ * openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.
+ patched by Jeroen van Meeuwen at [ruby-core:25210]
+ fixed by Nobuyoshi Nakada [ruby-core:25238],
+ Hongli Lai [ruby-core:27417],
+ and Motohiro KOSAKI [ruby-core:28063]
- * lib/fileutils.rb (FileUtils#symbolic_modes_to_i): Fix the wrong
- character class [+-=], which happened to match all desired
- characters but also match undesired characters.
+ * ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
+ split pkcs7_get_certs_or_crls.
-Sun Jul 7 01:54:44 2013 Akinori MUSHA <knu@iDaemons.org>
+Sun Feb 28 11:42:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the
- wrong output message when user is nil, which should be "chown
- :group file" instead of "chown group file".
+ * test/openssl/{test_x509cert.rb,openssl,test_x509crl.rb,
+ test_x509req.rb}:
+ fix false positive tests because of OpenSSL spec change.
+ patched by originally Hongli Lai [ruby-core:27417],
+ and fixed by Motohiro KOSAKI [ruby-core:28063]
-Fri Jul 5 00:55:05 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Feb 28 11:21:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161.
+ * test/openssl/{test_x509cert.rb,openssl,test_x509req.rb}:
+ remove false positive tests because of OpenSSL spec change.
+ patched by Motohiro KOSAKI [ruby-core:28063]
+ see also [ruby-dev:40077]
- * [bug] (thanks Akinori MUSHA and Ippei Obayashi)
- Fix a renumbering bug in condition regexp with a named
- capture. [Bug #8583]
- * [spec] (thanks Akinori MUSHA)
- Allow ENCLOSE_OPTION in look-behind.
+Sun Feb 28 11:25:16 2010 Tanaka Akira <akr@fsij.org>
-Wed Jul 3 23:31:26 2013 Shota Fukumori <sorah@cookpad.com>
+ * pack.c (pack_pack): generalized integer packer implemented.
+ (pack_unpack): generalized integer unpacker implemented.
- * lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs
- (1.9.3 behavior) [ruby-core:55752] [Bug #8595]
+Sun Feb 28 06:58:53 2010 Tanaka Akira <akr@fsij.org>
-Tue Jul 2 03:06:38 2013 Kenta Murata <mrkn@mrkn.jp>
+ * pack.c (swap32): use __builtin_bswap32 on gcc 4.3.0 or later.
+ (swap64): ditto.
- * ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when
- the argument x is not a BigDecimal.
- This change is based on the patch made by Heesob Park and Garth Snyder.
- [Bug #6862] [ruby-core:47145]
- [Fix GH-332] https://github.com/ruby/ruby/pull/332
+Sun Feb 28 00:38:18 2010 Tanaka Akira <akr@fsij.org>
-Fri Jun 28 02:20:13 2013 Aman Gupta <ruby@tmm1.net>
+ * pack.c: use integer types with explicit size.
- * compile.c (iseq_add_mark_object): Use new rb_iseq_add_mark_object().
+Sat Feb 27 15:54:55 2010 Tanaka Akira <akr@fsij.org>
- * insns.def (setinlinecache): Ditto.
+ * pack.c: check assumption on QUAD_SIZE and SIZEOF_LONG.
- * iseq.c (rb_iseq_add_mark_object): New function to allocate
- iseq->mark_ary on demand. [Bug #8142]
+ * bignum.c: check assumption on SIZEOF_LONG and SIZEOF_BDIGITS.
- * iseq.h (rb_iseq_add_mark_object): Ditto.
+Sat Feb 27 03:48:18 2010 Tanaka Akira <akr@fsij.org>
- * iseq.c (prepare_iseq_build): Avoid allocating mark_ary until needed.
+ * pack.c: fix q and Q for big endian environments which have no
+ 8 bytes integer type.
+ (pack_pack): use rb_big_pack.
+ (pack_unpack): use rb_big_unpack.
- * iseq.c (rb_iseq_build_for_ruby2cext): Ditto.
+ * include/ruby/intern.h (rb_big_pack): declared.
+ (rb_big_unpack): ditto.
-Thu Jun 27 20:10:56 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * bignum.c (rb_big_pack): new function.
+ (rb_big_unpack): ditto.
- * ext/openssl/lib/openssl/ssl.rb (verify_certificate_identity): fix
- hostname verification. Patched by nahi.
+Fri Feb 26 21:36:51 2010 Tanaka Akira <akr@fsij.org>
- * test/openssl/test_ssl.rb (test_verify_certificate_identity): test for
- above.
+ * bignum.c: fix rb_quad_pack and rb_quad_unpack for environments
+ which don't have 8bytes integer type. This still depends on little
+ endian.
+ (rb_quad_pack): use quad_buf_complement. don't raise for large
+ values.
+ (rb_quad_unpack): use quad_buf_complement.
+ (quad_buf_complement): new function extracted from rb_quad_pack.
+ add one after bitwise negation.
+Fri Feb 26 21:29:48 2010 Tanaka Akira <akr@fsij.org>
-Thu Jun 27 13:16:40 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * configure.in (RSHIFT): add parenthesis to suppress warning.
- * test/rubygems/test_gem_installer.rb (test_install_extension_flat):
- use ruby in build directory in case ruby is not installed.
- [ruby-core:53265] [Bug #8058]
+Fri Feb 26 20:51:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Jun 26 23:05:34 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * ext/socket/raddrinfo.c, ext/socket/udpsocket.c: avoid illegal cast
+ from void-returning function to VALUE-returning one. It causes SEGV
+ on RubySpec with mingw32.
- * test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if
- writing a file is slow.
- [ruby-core:55541] [Bug #8519]
+Fri Feb 26 20:07:48 2010 Tanaka Akira <akr@fsij.org>
-Wed Jun 26 22:42:36 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * pack.c (QUAD_SIZE): it should be always 8.
- * lib/mkmf.rb: should use expanded values for header directories
- unless extmk. patch by vo.x (Vit Ondruch) at [ruby-core:55653]
- [Bug #8115], rhbz#921650.
+ * bignum.c (rb_quad_pack): use LONG_LONG version only if
+ SIZEOF_LONG_LONG == QUAD_SIZE.
-Wed Jun 26 02:25:52 2013 Akinori MUSHA <knu@iDaemons.org>
+Fri Feb 26 16:49:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass
- DESTDIR via command line to override what's in MAKEFLAGS. This
- fixes an installation problem under a package building
- environment where DESTDIR is specified in the (parent) command
- line. [Fixes GH-327]
+ * pack.c (swap64): fix for VC6.
-Tue Jun 25 00:12:19 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Feb 26 14:17:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c: Return value in Array overview example found by @PragTob
- [Fix GH-336] https://github.com/ruby/ruby/pull/336
+ * pack.c (pack_pack, pack_unpack): suppressed warnings.
-Tue Jun 25 00:11:46 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Feb 26 07:44:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * array.c (rb_ary_zip): typo by @PragTob [Fix GH-337]
- https://github.com/ruby/ruby/pull/337
+ * ext/dl: revert dl with libffi because it can't run on mswin now.
-Tue Jun 25 00:10:54 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Feb 25 22:59:46 2010 Tanaka Akira <akr@fsij.org>
- * win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]
- https://github.com/ruby/ruby/pull/334
+ * pack.c: consider DYNAMIC_ENDIAN. refactored.
-Sun Jun 23 00:03:18 2013 Charlie Somerville <charliesome@ruby-lang.org>
+Thu Feb 25 11:17:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead
- of %s and RSTRING_PTR
+ * rational.c (nurat_expt): use Float#** when Rational ** Float.
+ This fixes Rational(3,1)**3.0=>26.99999999999999 on FreeBSD.
- * ext/etc/etc.c (etc_getgrnam): ditto
+ * complex.c (rb_fexpt): removed.
+ Note that this function is not static but is private.
-Sat Jun 22 00:54:41 2013 Eric Hodel <drbrain@segment7.net>
+Thu Feb 25 00:43:57 2010 Koichi Sasada <ko1@atdot.net>
- * lib/rubygems: Update to RubyGems 2.0.3
+ * insns.def: Change the operand type of setinlinecache
+ (OFFSET to IC). This IC must be same as corresponding
+ getinlinecache instruction's IC operand.
+ This change is for a little performance improvement
+ (getting IC directly) and is for the AOT compilation development.
- * test/rubygems: Tests for the above.
+ * compile.c, iseq.c, insns.def: Change the approach to handling inline
+ cache (IC) type operand to enable the above change.
+ This change also affects ISeq#to_a method. The inline cache operand
+ will be dumped by fixnum, the index of inline cache, in other words,
+ inline cache identity.
- * NEWS: Added RubyGems 2.0.3 note.
+ * template/insns_info.inc.tmpl, tool/instruction.rb: No need to count
+ inline cache size (insn_iclen()).
-Wed Jun 19 04:20:31 2013 Charlie Somerville <charliesome@ruby-lang.org>
+Thu Feb 25 00:57:59 2010 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (vm_call_method): ensure methods of type
- VM_METHOD_TYPE_ATTR_SET are called with 1 argument
+ * pack.c (swap64): don't redefine.
- * test/ruby/test_module.rb (class TestModule): add test
+Thu Feb 25 00:29:55 2010 Tanaka Akira <akr@fsij.org>
- [ruby-core:55543] [Bug #8540]
+ * pack.c (pack_unpack): don't use OFF32 for gcc 4.5.
-Wed Jun 19 03:54:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 24 22:39:15 2010 Tanaka Akira <akr@fsij.org>
- * defs/id.def (predefined): add "idProc".
+ * lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg.
+ (Resolv::DNS::Requester#request): raise ResolvTimeout
+ consistently for timeout.
- * proc.c (mnew, mproc, mlambda): use predefined IDs.
+Wed Feb 24 14:38:16 2010 Eric Hodel <drbrain@segment7.net>
- * vm.c (Init_VM): ditto.
+ * lib/rubygems/indexer: Removed obsolete files.
-Wed Jun 19 03:54:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 24 11:52:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h (rb_block_lambda): add declaration instead of
- deprecated rb_f_lambda.
+ * dln.c (translit_separator): moved back from load.c again.
-Wed Jun 19 03:24:07 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+ * dln_find.c: split from dln.c.
- * include/ruby/ruby.h, vm_eval.c (rb_funcall_with_block):
- new function to invoke a method with a block passed
- as an argument.
+Wed Feb 24 09:31:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (sym_call): use the above function to avoid
- a block sharing. [ruby-dev:47438] [Bug #8531]
+ * ext/digest/extconf.rb: use OpenSSL only when all transform
+ functions are available.
- * vm_insnhelper.c (vm_yield_with_cfunc): don't set block
- in the frame.
+Wed Feb 24 00:39:17 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * test/ruby/test_symbol.rb (TestSymbol#test_block_given_to_proc):
- run related tests.
+ * string.c (str_new_empty): String#split, partition, rpartition
+ taints the resulting strings if self is tainted.
-Wed Jun 19 03:06:57 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+Mon Feb 22 21:35:33 2010 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_proc.rb (TestProc#test_block_given_method_to_proc):
- run test for r41359.
+ * ext/digest/sha2/sha2init.c: test OpenSSL more strictly.
-Wed Jun 19 03:06:57 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+Mon Feb 22 11:52:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h, proc.c (rb_method_call_with_block):
- new function to invoke a Method object with a block passed
- as an argument.
+ * lib/rubygems: update to 1.3.6.
- * proc.c (bmcall): use the above function to avoid a block sharing.
- [ruby-core:54626] [Bug #8341]
+Mon Feb 22 11:21:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_proc.rb (TestProc#test_block_persist_between_calls):
- run related tests.
+ * ext/digest/sha2: Use OpenSSL's SHA1 engine if available.
-Tue Jun 18 02:49:20 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Feb 21 21:20:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (assert_separately): stop_auto_run of
- Test::Unit::Runner to prevent auto runner use ARGV.
+ * lib/mkmf.rb (create_makefile, install_files): honor srcprefix
+ argument if given. [ruby-dev:40449]
- * test/ruby/envutil.rb (assert_separately): add $: to separate process.
+Sun Feb 21 13:29:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (assert_separately): fail if stderr is not
- empty and ignore_stderr is false.
+ * lib/rubygems/rubygems_version.rb: outdated. [ruby-core:28275]
-Tue Jun 18 02:21:54 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Feb 21 06:24:12 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
- * test/ruby/envutil.rb (EnvUtil.with_default_external): add for
- changing Encoding.default_external without warnings.
+ * symbian/setup (config.h): HAVE_STRUCT_TIMEZONE, VOID_UNSETENV, and RUBY_LIB_VERSION_STYLE defined.
+ * symbian/setup (ruby.mmp): SOURCE node.c added.
- * test/ruby/envutil.rb (EnvUtil.with_default_internal): ditto.
+Mon Feb 22 09:15:45 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_io_m17n.rb: use above with_default_external.
+ * gc.c (gc_mark_children): lost comment added.
-Tue Jun 18 00:43:27 2013 Zachary Scott <zachary@zacharyscott.net>
+Sat Feb 20 14:42:19 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
+ * marshal.c (r_object0): should prepare placeholder before
+ processing instance variables. [ruby-dev:40414]
-Tue Jun 18 00:34:57 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * marshal.c (id2encidx): no longer need arg.
-merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]
+Sat Feb 20 14:36:16 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/extconf.rb: support s390x (Thanks to bkabrda) [Bug #5465]
+ * vm.c (vm_backtrace_each): use called_id when method definition
+ structure is already freed. [ruby-dev:40234] [ruby-core:27959]
- * ext/tk/extconf.rb: apply [Bug #5048]
+Fri Feb 19 00:04:19 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/tk/lib/tk/canvas.rb,ext/tk/sample/demos-{en,jp}/{tree.rb,widget}:
- fix bug (Thanks to zzak) [ruby-trunk - Bug #8319]
+ * lib/drb/drb.rb (DRbServer#stop_service): join killed thread to
+ ensure service stops. [ruby-dev:40441]
-Sun Jun 16 01:56:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 18 22:31:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * array.c (FL_SET_EMBED): shared object is frozen even when get
- unshared.
+ * math.c (math_atanh): raise ERANGE without calling atanh if absolute
+ value is 1 to achieve platform-independent math. [ruby-core:28219]
- * array.c (rb_ary_modify): ARY_SET_CAPA needs unshared array.
+ * math.c (math_lgamma): return [Infinity, 1] without calling lgamma_r
+ if argument is infinity or -infinity. [ruby-core:28219]
-Sun Jun 16 01:32:26 2013 TAKANO Mitsuhiro <tak@no32.tk>
+Thu Feb 18 22:28:00 2010 Kenta Murata <mrkn@mrkn.jp>
- * insns.def: fix condition.
+ * configure.in: new --with-ext and --with-out-ext options for extmk.
+ * tool/mkconfig.rb: normalizing --with-out-ext to --without-ext.
-Sun Jun 16 01:22:35 2013 Eric Hodel <drbrain@segment7.net>
+Thu Feb 18 21:50:00 2010 Tanaka Akira <akr@fsij.org>
- * ext/socket/extconf.rb: Enable RFC 3542 IPV6 socket options for OS X
- 10.7+. [ruby-trunk - Bug #8517]
+ * pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'.
-Sun Jun 16 01:11:10 2013 Koichi Sasada <ko1@atdot.net>
+Thu Feb 18 02:14:26 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * compile.c (rb_iseq_compile_node): fix location of a `trace'
- instruction (b_return event).
- [ruby-core:55305] [ruby-trunk - Bug #8489]
- (need a backport to 2.0.0?)
+ * io.c (io_fread, io_getpartial, io_read, io_sysread): by using lock,
+ prohibit modification of buffer string during read (which had caused
+ EFAULT or SEGV). [ruby-dev:40437]
- * test/ruby/test_settracefunc.rb: add a test.
+ * test/ruby/test_io.rb: rewrite tests for the old behavior.
-Sun Jun 16 00:30:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 17 21:34:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_eval.c (eval_string_with_cref): propagate absolute path from the
- binding if it is given explicitly. patch by Gat (Dawid Janczak) at
- [ruby-core:55123]. [Bug #8436]
+ * regcomp.c (setup_tree, onig_compile): optimize .* at last by
+ converting into (?>.*), which does not backtrack. [ruby-core:27791]
-Wed Jun 12 23:41:21 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/ruby/test_regexp.rb: add a test for above.
- * vm_insnhelper.c (vm_yield_setup_block_args): partially revert r41019.
- The code is not useless.
+Wed Feb 17 21:26:53 2010 Tanaka Akira <akr@fsij.org>
-Wed Jun 12 23:41:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bootstraptest/runner.rb (assert_normal_exit): add :timeout option.
- * vm_insnhelper.c (vm_yield_setup_block_args): split single parameter
- if any keyword arguments exist, and then extract keyword arguments.
- [ruby-core:55203] [Bug #8463]
+Wed Feb 17 17:05:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jun 12 23:05:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_insnhelper.c (vm_call_cfunc): removed unused variable.
- * io.c (io_getc): fix 7bit coderange condition, check if ascii read
- data instead of read length. [ruby-core:55444] [Bug #8516]
+ * vm.c (vm_frametype_name): define only when VMDEBUG.
-Sun Jun 9 02:27:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 17 15:34:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR
- directories to install only unless bundled extension libraries.
- [ruby-core:53502] [Bug #8115]
+ * ext/dl/dl_conversions.c (rb_dl_type_to_ffi_type): support signed
+ long long.
-Sun Jun 9 02:17:16 2013 Charlie Somerville <charliesome@ruby-lang.org>
+ * ext/dl/cfunc.c (rb_dlcfunc_inspect): get rid of overflow.
- * class.c (include_modules_at): invalidate method cache if included
- module contains constants
+ * ext/dl/closure.c (dlc_callback, rb_dlclosure_init): ditto.
- * test/ruby/test_module.rb: add test
+ * ext/dl/cptr.c (rb_dlptr_s_malloc): ditto.
-Sun Jun 9 01:59:39 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * ext/dl/method.c (rb_dlfunction_initialize): ditto.
-merge revision 40783 (partially): [Backport #8413]
+Wed Feb 17 01:16:12 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * win32/Makefile.sub: fix a typo in config.h.
+ * hash.c (hash_update): always raise an exception when adding a new
+ key during iteration. Traditionally, an exception was raised only
+ when rehash occurs, but it may lead to difficult bug to reproduce.
+ [ruby-core:23614]
-Sun Jun 9 01:38:55 2013 Charlie Somerville <charliesome@ruby-lang.org>
+Tue Feb 16 22:09:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * intern.h: remove dangling rb_class_init_copy declaration
- [ruby-core:55120] [Bug #8434]
+ * gc.c (chain_finalized_object): fix precedence.
-Sun Jun 9 01:30:57 2013 Shugo Maeda <shugo@ruby-lang.org>
+Tue Feb 16 21:32:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/net/imap.rb (capability_response): should ignore trailing
- spaces. Thanks, Peter Kovacs. [ruby-core:55024] [Bug #8415]
+ * gc.c (rb_objspace_call_finalizer): always run finalizer at exit,
+ before object is free'd. [ruby-dev:40382]
- * test/net/imap/test_imap_response_parser.rb: related test.
+Tue Feb 16 20:56:39 2010 Tanaka Akira <akr@fsij.org>
-Wed Jun 5 00:38:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (rb_group_member): renamed from group_member.
+ don't use group_member() in glibc because it's not valgrind clean.
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570047
- * ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
- (gzreader_gets): check EOF. [ruby-core:55220] [Bug #8467]
+Tue Feb 16 19:19:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jun 5 00:32:18 2013 Tanaka Akira <akr@fsij.org>
+ * ext/dl/cfunc.c (rb_dlcfunc_call): convert signed value to
+ unsigned.
- * test/ruby/test_require.rb: Remove temporally files in the tests.
+Tue Feb 16 19:02:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_rubyoptions.rb: Ditto.
+ * test/dl/test_{base,handle}.rb: use more verbose assertions.
- * test/logger/test_logger.rb: Ditto.
+ * test/dl/test_import.rb (DL::LIBC::BoundQsortCallback): renamed
+ to get rid of overwriting warning.
- * test/psych/test_psych.rb: Ditto.
+Tue Feb 16 11:03:19 2010 Aaron Patterson <aaron@tenderlovemaking.com>
- * test/readline/test_readline.rb: Ditto.
+ * ext/dl/method.c: Adding DL::Method as a superclass for DL::Function
- * test/syslog/test_syslog_logger.rb: Ditto.
+Mon Feb 15 23:37:30 2010 Tanaka Akira <akr@fsij.org>
- * test/webrick/test_httpauth.rb: Ditto.
+ * io.c: check lseek error by errno. NetBSD 4.0.1 may return -1 as
+ a file position of tty.
- * test/zlib/test_zlib.rb: Ditto.
+Mon Feb 15 23:08:56 2010 Tanaka Akira <akr@fsij.org>
-Wed Jun 5 00:08:55 2013 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/pstore.rb (PStore#initialize): initialize @thread_safe.
+ [ruby-core:27853]
- * dir.c (bracket): fix copy-paste error. When the first and last
- characters of fnmatch range have different length, fnmatch may
- have wrongly matched a path that does not really match.
- Coverity Scan found this bug.
+Mon Feb 15 22:45:26 2010 Tanaka Akira <akr@fsij.org>
-Wed Jun 5 00:04:12 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * st.c (st_foreach): don't access ptr->hash after func call.
+ It may access freed area.
- * string.c (rb_str_quote_unprintable): check if argument is a string.
+Mon Feb 15 22:25:16 2010 Tanaka Akira <akr@fsij.org>
-Tue Jun 4 23:42:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/zlib/zlib.c (zlib_mem_alloc): suppress valgrind warnings.
+ http://www.zlib.net/zlib_faq.html#faq36
- * load.c (loaded_feature_path): fix invalid read by index underflow.
- the beginning of name is also a boundary as well as just after '/'.
+Mon Feb 15 22:18:49 2010 Tanaka Akira <akr@fsij.org>
-Tue Jun 4 23:32:12 2013 Charlie Somerville <charliesome@ruby-lang.org>
+ * time.c (time_add): propagate fixed time offset.
- * variable.c (set_const_visibility): use rb_frame_this_func() instead
- of rb_frame_callee() for getting the name of the called method
+Mon Feb 15 17:42:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_module.rb: add test for private_constant with no args
+ * signal.c (USE_SIGALTSTACK): NetBSD can't use sigaltstack(2)
+ with pthread.
+ http://netbsd.gw.com/cgi-bin/man-cgi?sigaltstack++NetBSD-current
-Tue Jun 4 23:27:24 2013 Yusuke Endoh <mame@tsg.ne.jp>
+Mon Feb 15 13:11:47 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_insnhelper.c (vm_callee_setup_keyword_arg,
- vm_callee_setup_arg_complex): consider a hash argument for keyword
- only when the number of arguments is more than the expected
- mandatory parameters. [ruby-core:53199] [ruby-trunk - Bug #8040]
+ * array.c (rb_ary_push_m): use rb_ary_modify instead of
+ rb_ary_modify_check. This fixes regression due to r26632.
- * test/ruby/test_keyword.rb: update a test for above.
+Sun Feb 14 12:54:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Jun 4 00:46:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (r_object0): removed duplicated entry for regexp.
+ [ruby-dev:40416]
- * win32/win32.c (setup_overlapped, finish_overlapped): extract from
- rb_w32_read() and rb_w32_write().
+Sun Feb 14 04:45:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Jun 4 00:02:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (r_object0): register regexp object before encoding
+ name. [ruby-dev:40414]
- * vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
- be accessible.
+ * re.c (rb_reg_alloc, rb_reg_init_str): split from rb_reg_new_str.
-Tue Jun 4 00:02:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 13 17:07:20 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
- pushing tag to get rid of unaccessible tag by stack overflow.
+ * array.c (rb_ary_delete): RDoc update. a patch from Hugh Sasse.
+ [ruby-core:28128]
-Mon Jun 3 23:22:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_compact_bang): ditto.
- * compile.c (iseq_compile_each): forward anonymous and first keyword
- rest argument one. [ruby-core:55033] [Bug #8416].
+Sat Feb 13 15:01:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Jun 2 22:39:24 2013 Zachary Scott <zachary@zacharyscott.net>
+ * marshal.c (id2encidx): duplicated entry for encoding name.
+ [ruby-dev:40388]
- * range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143]
+Sat Feb 13 12:17:52 2010 Tanaka Akira <akr@fsij.org>
-Mon May 20 04:00:48 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/tempfile.rb (Tempfile::Remover): new class to replace
+ Tempfile.callback. port r24902 from Ruby 1.8.
- * lib/yaml.rb: YAML documentation from #8344 [Bug #8355]
+Fri Feb 12 17:55:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed May 15 23:22:09 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * vm.c (thread_free): fixed typo.
- * include/ruby/intern.h: should include sys/time.h for struct timeval
- if it exists. [ruby-list:49363]
+Fri Feb 12 02:27:39 2010 Akinori MUSHA <knu@iDaemons.org>
-Tue May 14 20:21:41 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/set.rb (Set#initialize, Set#replace, Set#merge)
+ (Set#subtract, Set#&): Fix duck type tests. [ruby-core:28078]
- * lib/rubygems/config_file.rb: Lazily load .gem/credentials to only
- check permissions when necessary. RubyGems bug #465
- * test/rubygems/test_gem_config_file.rb: Test for the above.
+ * lib/set.rb (Set#initialize, Set#replace, Set#merge)
+ (Set#subtract, Set#&): Try #each if #each_entry fails.
- * test/rubygems/test_gem_commands_push_command.rb: Remove duplicated
- test.
+Thu Feb 11 20:43:00 2010 Tanaka Akira <akr@fsij.org>
-Tue May 14 20:11:00 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * io.c (rb_io_oflags_modestr): return "r" for O_RDONLY|O_APPEND.
+ [ruby-dev:40379]
- * ext/dl/lib/dl/func.rb (DL::Function#call): check tainted when
- $SAFE > 0.
- * ext/fiddle/function.c (function_call): check tainted when $SAFE > 0.
- * test/fiddle/test_func.rb (module Fiddle): add test for above.
+Thu Feb 11 19:19:21 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * missing/alloca.c: s/RUBY_LIB/RUBY_LIB_PREFIX/ [ruby-dev:40395]
-Sun May 12 22:42:25 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Feb 11 17:52:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * signal.c (rb_f_kill): fixes typo. s/HAS_KILLPG/HAVE_KILLPG/.
+ * vm.c (vm_exec): reset thread state before restarting vm loop
+ from catch scope. [ruby-core:28129], [ruby-core:28143]
-Sun May 12 04:23:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 11 14:43:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (parser_peek_variable_name): treat invalid global, class,
- and instance variable names as mere strings rather than errors.
- [ruby-core:54885] [Bug #8375]
+ * marshal.c (r_object0): read sequentially since marshal source
+ may not be possible to rewind. [ruby-dev:40386]
-Sun May 12 04:23:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (r_object0): replace non-1.8 escapes directly.
- * parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid
- name character. [ruby-core:54846] [Bug #8375].
+Thu Feb 11 09:49:31 2010 Tanaka Akira <akr@fsij.org>
-Sun May 12 02:50:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/resolv.rb: fix [ruby-core:28144] reported by Hans de Graaff.
+ (Resolv::DNS#make_requester): pass nameserver_port to
+ UnconnectedUDP.new.
+ (Resolv::DNS.bind_random_port): change the is_ipv6 argument to
+ bind_host.
+ (Resolv::DNS::Requester#initialize): change instance variable to
+ store multiple sockets.
+ (Resolv::DNS::Requester#request): pass readable sockets to
+ recv_reply.
+ (Resolv::DNS::Requester#close): close all sockets.
+ (Resolv::DNS::Requester::UnconnectedUDP#initialize): allocate
+ a socket for each address family of name servers.
+ (Resolv::DNS::Requester::UnconnectedUDP#recv_reply): read from the
+ passwd readable socket.
+ (Resolv::DNS::Requester::UnconnectedUDP#sender): use appropriate
+ socket for the target nameserver.
+ (Resolv::DNS::Requester::ConnectedUDP): follow the instance variable
+ change.
+ (Resolv::DNS::Requester::TCP#sender): ditto.
+ (Resolv::DNS::Config#nameserver_port): new method.
- * configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
- autoconf 2.69 or earlier on darwin.
+Thu Feb 11 01:45:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Sun May 12 02:50:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm.c (vm_exec): temporarily revert r26628, which causes SEGV when
+ executing rubyspec.
- * configure.in (rm, shvar_to_cpp, unexpand_shvar): local is not
- available on old shells.
+Wed Feb 10 16:31:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (shvar_to_cpp): escape quotes for old shells.
- [Bug #7959] [Bug #8071]
+ * array.c (rb_ary_push_m, rb_ary_unshift_m, rb_ary_aset),
+ (rb_ary_insert, rb_ary_replace, rb_ary_concat),
+ (rb_ary_uniq_bang, rb_ary_flatten_bang): check if frozen after
+ wrong number of arguments but before TypeError.
+ [ruby-core:28140]
-Thu May 9 23:39:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (rb_hash_replace): ditto.
- * class.c (rb_mod_included_modules): should not include non-modules.
- [ruby-core:53158] [Bug #8025]
+ * string.c (rb_str_replace): ditto.
-Thu May 9 23:39:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 10 04:06:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * class.c (rb_mod_included_modules): should not include the original
- module itself. [ruby-core:53158] [Bug #8025]
+ * vm.c (vm_exec): reset thread state before starting vm loop.
+ [ruby-core:28129]
-Wed May 8 23:07:19 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 9 23:48:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * insns.def (defined): use vm_search_superclass() like as normal super
- call. based on a patch <https://gist.github.com/wanabe/5520026> by
- wanabe.
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_divide): fix precision too.
- * vm_insnhelper.c (vm_search_superclass): return error but not raise
- exceptions.
+Tue Feb 9 23:26:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_insnhelper.c (vm_search_super_method): check the result of
- vm_search_superclass and raise exceptions on error.
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix precision.
+ [ruby-core:17472][ruby-dev:35372][ruby-dev:40105][ruby-dev:40358]
-Wed May 8 23:07:19 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 9 22:23:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * insns.def (defined): get method entry from the method top level
- frame, not block frame. [ruby-core:54769] [Bug #8367]
+ * io.c (READ_CHECK): do not select fd before reading, that had made
+ TCPServer#gets stuck. [ruby-dev:40317]
-Wed May 8 01:18:41 2013 Tanaka Akira <akr@fsij.org>
+Tue Feb 9 21:27:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro.
- (MUL_OVERFLOW_FIXNUM_P): Ditto.
- (MUL_OVERFLOW_LONG_P): Ditto.
+ * lib/rexml/text.rb (REXML::Text#initialize): REXML::Text.new checks
+ raw text for illegal characters without entity check, for the sake
+ of 1.8 compatibility. This had caused rubyspec error.
- * array.c (rb_ary_product): Don't overflow on signed integer
- multiplication.
+Mon Feb 8 23:49:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * numeric.c (fix_mul): Ditto.
- (int_pow): Ditto.
+ * io.c (rb_io_getline_fast): wrong calculation of new position
+ from rb_str_coderange_scan_restartable(). [ruby-core:28103]
- * rational.c (f_imul): Ditto.
+ * io.c (read_all): ditto.
- * insns.def (opt_mult): Ditto.
+ * sprintf.c (rb_str_format): ditto.
- * thread.c (sleep_timeval): Don't overflow on signed integer addition.
+Mon Feb 8 21:03:53 2010 Tanaka Akira <akr@fsij.org>
- * bignum.c (rb_int2big): Don't overflow on signed integer negation.
- (rb_big2ulong): Ditto.
- (rb_big2long): Ditto.
- (rb_big2ull): Ditto.
- (rb_big2ll): Ditto.
+ * ext/socket/socket.c (socket_s_ip_address_list): obtain the scope_id
+ of IPv6 link local address on OpenSolaris.
-Tue May 7 20:13:12 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Feb 8 16:27:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_thread.rb (invoke_rec): extend timeout 10 -> 50 sec,
- to investigate test failure on rubyci.
- http://a.mrkn.jp/~mrkn/chkbuild/mountain_lion/ruby-2.0.0-m64-o0/log/20130507T052909Z.log.html.gz
+ * dmyversion.c: empty load path in miniruby.
-Sat May 4 23:48:56 2013 Zachary Scott <zachary@zacharyscott.net>
+ * common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
- * doc/security.rdoc: Add note about reporting security vulns
+ * tool/eval.rb, win32/{mkexports,resource}.rb: miniruby no longer
+ contains "." in $:.
-Sat May 4 23:44:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 8 15:15:07 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * object.c (rb_obj_is_kind_of): skip prepending modules.
- [ruby-core:54742] [Bug #8357]
+ * object.c (rb_obj_clone): call initialize_clone hook method to
+ call initialize_copy.
- * object.c (rb_class_inherited_p): ditto.
- [ruby-core:54736] [Bug #8357]
+ * object.c (rb_obj_dup): call initialize_dup hook.
-Thu May 2 23:39:45 2013 Tanaka Akira <akr@fsij.org>
+ * lib/delegate.rb (Delegator#initialize_clone): use new hook to
+ implement deep copy. [ruby-dev:40242]
- * thread.c (double2timeval): convert the infinity to TIME_MAX to avoid
- SEGV by Thread.new {}.join(Float::INFINITY) on
- Debian GNU/Linux (amd64).
+ * lib/delegate.rb (Delegator#initialize_dup): ditto.
-Thu May 2 00:30:00 2013 Tanaka Akira <akr@fsij.org>
+ * test/test_delegate.rb (TestDelegateClass#test_copy_frozen): add
+ a test to ensure #clone copies frozen status.
- * thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
- This fixes a compilation failure while cross-compiling for Tensilica
- Xtensa Processor.
+Mon Feb 8 10:28:58 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu May 2 00:19:46 2013 Tanaka Akira <akr@fsij.org>
+ * configure.in: check pthread_attr_getstack to prevent obsolete
+ warning for pthread_attr_getstackaddr.
- * dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
- exist.
+Sun Feb 7 23:12:34 2010 Tanaka Akira <akr@fsij.org>
-Thu May 2 00:16:36 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sample/test.rb: sort files for syntax validation.
- * README.EXT: correct method name to be used. [Bug #7982]
+Sun Feb 7 23:08:53 2010 Tanaka Akira <akr@fsij.org>
- * README.EXT.ja: add notes too.
+ * bootstraptest/runner.rb: sort test files.
-Thu May 2 00:16:36 2013 Zachary Scott <zachary@zacharyscott.net>
+Sun Feb 7 12:53:12 2010 Tanaka Akira <akr@fsij.org>
- * README.EXT: Copy note from r40505 for rb_sprintf() [Bug #7982]
+ * lib/rake.rb (Rake::FileList::ARRAY_METHODS): fix test failure by <=>
+ definition at Kernel.
-Thu May 2 00:16:36 2013 Zachary Scott <zachary@zacharyscott.net>
+Sun Feb 7 03:01:46 2010 Tanaka Akira <akr@fsij.org>
- * README.EXT: Update note from r40504, by Jeremy Evans [Bug #7982]
+ * math.c (math_lgamma): initialize sign because
+ lgamma(NaN) doesn't set the sign in OpenSolaris.
-Thu May 2 00:16:36 2013 Zachary Scott <zachary@zacharyscott.net>
+Sun Feb 7 00:23:21 2010 Shugo Maeda <shugo@ruby-lang.org>
- * README.EXT: Add note to warn use of %i in Exceptions [Bug #7982]
+ * class.c (rb_class_init_copy): raise a TypeError if the argument is
+ BasicObject. [ruby-core:27060]
-Wed May 1 23:35:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 6 23:37:11 2010 Shugo Maeda <shugo@ruby-lang.org>
- * io.c (rb_io_ext_int_to_encs, parse_mode_enc): bom-prefixed name is
- not a real encoding name, just a fallback. so the proper conversion
- should take place even if if the internal encoding is equal to the
- bom-prefixed name, unless actual encoding is equal to the internal
- encoding. [ruby-core:54563] [Bug #8323]
+ * lib/net/ftp.rb (initialize): set @sock to a NullSocket instance to
+ raise FTPConnectionError when not connected. [ruby-dev:40258]
- * io.c (io_set_encoding_by_bom): reset extenal encoding if no BOM
- found. [ruby-core:54569]
+Sat Feb 6 23:25:57 2010 Shugo Maeda <shugo@ruby-lang.org>
-Sat Apr 27 02:12:14 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/curses/view2.rb: replaced with Hugh Sasse's version.
+ [ruby-core:27894]
- * io.c (rb_fd_fix_cloexec): use rb_update_max_fd().
+Sat Feb 6 22:57:00 2010 Shugo Maeda <shugo@ruby-lang.org>
-Sat Apr 27 02:12:14 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/net/imap.rb (receive_responses): does not hang when an
+ unexpected BYE response received. fixed [ruby-core:27944].
+ Thanks, Bob Potter.
- * io.c (rb_update_max_fd): use ATOMIC_CAS because this function
- is used from timer thread too.
+Sat Feb 6 21:31:23 2010 Shugo Maeda <shugo@ruby-lang.org>
-Sat Apr 27 01:57:43 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * lib/monitor.rb (wait): supported timeout.
- * configure.in: use quadrigraphs. workaround for autoconf 2.64.
- a patch provided by Hessob Park. [ruby-core:53157] [Backport #8020]
+ * test/net/imap/test_imap.rb (test_exception_during_idle): use timeout.
-Sat Apr 27 00:39:28 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Feb 6 19:35:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * string.c (rb_str_inspect): refix r40413, on Ruby 1.9 usual character
- escape uses hex/Unicode escapes, so fix to use Unicode escape on
- Unicode strings and hex on others. [ruby-core:54458] [Bug #8290]
+ * tool/compile_prelude.rb: fix require path.
-Sat Apr 27 00:39:28 2013 Akinori MUSHA <knu@iDaemons.org>
+Sat Feb 6 12:02:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_module.rb
- (TestModule#test_const_get_invalid_name)
- (test_const_defined_invalid_name): Fix expected values.
+ * lib/delegate.rb (Delegator#method_missing),
+ (Delegator.delegating_block): don't hide backtrace from
+ __getobj__ and reduced exception messages when $DEBUG.
-Sat Apr 27 00:39:28 2013 Akinori MUSHA <knu@iDaemons.org>
+Sat Feb 6 11:35:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_inspect): NUL should not be represented as "\0"
- when octal digits may follow. [ruby-core:54458] [Bug #8290]
+ * ext/socket/ipsocket.c (ip_addr, ip_peeraddr),
+ ext/socket/socket.c (sock_s_getaddrinfo): added optional
+ reverse_lookup flag. [ruby-core:28007]
-Fri Apr 26 23:48:58 2013 Tanaka Akira <akr@fsij.org>
+Sat Feb 6 01:55:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
- This fixes a compilation failure while cross-compiling for ARM.
+ * ext/stringio/stringio.c (strio_ungetc): pads with \000 when the
+ current position is after the end. [ruby-dev:40271]
-Fri Apr 26 23:32:09 2013 Kouhei Sutou <kou@cozmixng.org>
+Sat Feb 6 01:14:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/rss/atom.rb (RSS::Atom::Entry): Fix indent of document comment.
+ * ext/purelib.rb, common.mk: to simulate ruby command more precisely,
+ remove "." from $: of virtual environment for build and test.
-Fri Apr 26 23:32:09 2013 Kouhei Sutou <kou@cozmixng.org>
+Sat Feb 6 00:02:31 2010 Tanaka Akira <akr@fsij.org>
- * lib/rss/maker.rb (RSS::Maker): Fix indent of document comment.
+ * random.c (fill_random_seed): don't use O_NOFOLLOW because
+ /dev/urandom is a symlink in OpenSolaris.
-Fri Apr 26 23:32:09 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/securerandom.rb (SecureRandom.random_bytes): ditto.
- * lib/rss/atom.rb: Documentation for RSS::Atom based on a patch by
- Michael Denomy
- * lib/rss/maker.rb: Documentation for RSS::Maker also by @mdenomy
+Fri Feb 5 16:38:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Apr 25 00:40:41 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/delegate.rb (Delegator): include copy of Kernel.
+ [ruby-dev:40314]
- * numeric.c: Fix wiki link on Float imprecision in overview, patched
- by Makoto Kishimoto [Bug #8304] [ruby-dev:47280]
+ * lib/delegate.rb (Delegator#{dup,clone}): class of copy should be
+ Delegator. [ruby-dev:40313]
-Thu Apr 25 00:39:16 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Feb 5 09:26:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * string.c: Document String#setbyte return value by @gjmurakami-10gen
- [Fixes GH-294]
+ * bignum.c (big_op): remove unused variables.
-Thu Apr 25 00:38:06 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Feb 5 02:06:57 2010 Aaron Patterson <tenderlove@ruby-lang.org>
- * ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
+ * lib/yaml/rubytypes.rb: Struct members are emitted without a leading
+ colon. Thanks Yusuke Endoh! [ruby-core:28052]
-Tue Apr 23 23:06:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/yaml/test_struct.rb: fixed tests to go with Struct changes
- * vm_method.c (rb_mod_public_method): fix visibility on anonymous
- module. set visibility of singleton method, not method in base
- class. [ruby-core:54404] [Bug #8284]
+ * test/yaml/test_yaml.rb: fixed tests to go with Struct changes
-Tue Apr 23 22:33:16 2013 Shugo Maeda <shugo@ruby-lang.org>
+Fri Feb 5 00:34:24 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
- response correctly. [ruby-core:54365] [Bug #8281]
+ * bignum.c (big_gt, big_ge, big_lt, big_ge): added Bignum#>, >=, < and
+ <= to allow to compare with BigDecimal. [ruby-dev:40167]
-Sun Apr 21 00:14:36 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Thu Feb 4 15:47:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
- RUBY_PLATFORM should escape as Regexp,
- because RUBY_PLATFORM may contain '.'.
+ * thread_pthread.c (native_thread_init_stack): use get_stack.
+ patched by KOSAKI Motohiro [ruby-dev:40309]
-Sun Apr 21 00:14:36 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * thread_pthread.c (ruby_init_stack): use get_stack
+ on platforms which have pthread_attr_get_np.
+ (FreeBSD, DragonFlyBSD and NetBSD)
+ This is because FreeBSD and DragonFly BSD must use
+ pthread_attr_get_np to get stack size of main thread,
+ but Mac OS X and Linux with LinuxThreads must use getrlimit.
+ <http://www.nminoru.jp/~nminoru/programming/stackoverflow_handling.html>
+ <http://d.hatena.ne.jp/nurse/20100204>
- * test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
- fix load path for encoding to run the test as stand-alone.
+Thu Feb 4 09:55:38 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Apr 21 00:14:36 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * configure.in: FreeBSD, DragonFly BSD and OpenBSD needs
+ pthread_np.h to use pthread_*_np functions.
+ OpenBSD's pthread_*_np also depend sys/signal.h,
+ but it is included at signal.h via vm_core.h via thread.c.
- * load.c (features_index_add): use rb_str_subseq() to specify C string
- position properly to fix require non ascii path.
- [ruby-core:53733] [Bug #8165]
+Thu Feb 4 08:15:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
- a test for the above.
+ * lib/delegate.rb (Delegator): now inherits BasicObject.
+ [ruby-dev:39154], [Bug #2679], [ruby-dev:40242]
-Sun Apr 21 00:13:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 4 03:00:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * load.c (rb_feature_p), vm_core.h (rb_vm_struct): turn
- loaded_features_index into st_table. patches by tmm1 (Aman Gupta)
- in [ruby-core:53251] and [ruby-core:53274] [Bug #8048]
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): get red of
+ floating point exception.
-Sun Apr 21 00:13:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 4 01:24:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * load.c (features_index_add_single, rb_feature_p): store single index
- as Fixnum to reduce the number of arrays for the indexes. based on
- the patch by tmm1 (Aman Gupta) in [ruby-core:53216] [Bug #8048].
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix infinity
+ handling. 1 / Infinity was evaluated to NaN.
-Sat Apr 20 23:32:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 4 00:37:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * dir.c (glob_helper): should skip dot directories only for recursion,
- but should not if matching to the given pattern. [ruby-core:54387]
- [Bug #8283]
+ * time.c (time_mdump, time_mload): dump/load utc_offset.
+ [ruby-dev:40063]
-Sat Apr 20 02:37:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 3 22:22:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/curses/curses.c (Init_curses): fix implementation function,
- crmode should be same as cbreak. [ruby-core:54013] [Bug #8222]
+ * configure.in: check for non-portable stack attribute functions.
-Sat Apr 20 02:09:46 2013 Martin Bosslet <Martin.Bosslet@gmail.com>
+Wed Feb 3 20:10:52 2010 Tanaka Akira <akr@fsij.org>
- * ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC.
+ * ext/iconv/charset_alias.rb: pass block argument to outer local
+ variable.
- * test/openssl/test_ssl.rb: Add tests to verify correct behavior.
+Wed Feb 3 20:08:05 2010 Tanaka Akira <akr@fsij.org>
- [Bug #8240] Patch provided by Shugo Maeda. Thanks!
+ * file.c (realpath_rec): rb_path_last_separator may return NULL.
-Sat Apr 20 01:56:32 2013 Yuki Yugui Sonoda <yugui@google.com>
+Wed Feb 3 13:15:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * thread_pthread.c (ruby_init_stack): Avoid using uninitialized value.
- stackaddr and size are not set if get_stack() fails.
+ * thread_pthread.c: DragonFlyBSD is also the same as FreeBSD
+ on getting the stack size of the main thread.
-Sat Apr 20 01:47:31 2013 Yuki Yugui Sonoda <yugui@google.com>
+Wed Feb 3 12:30:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
- .. #endif sections. This fixes a build error on NativeClient.
+ * thread_pthread.c (ruby_init_stack): use pthread_get_attr_np
+ to get the stack size of the main thread on FreeBSD.
-Sat Apr 20 01:31:38 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * thread_pthread.c: include pthread_np.h on FreeBSD.
- * Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
- [bug] fix problem with optimization of \z (Issue #16) [Bug #8210]
+Wed Feb 3 11:38:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Apr 20 01:18:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/{closure,function}.c: removed C99 features and warnings.
- * vm_insnhelper.c (vm_callee_setup_keyword_arg): non-symbol key is not
- a keyword argument, keep it as a positional argument.
+Wed Feb 3 10:12:09 2010 Aaron Patterson <tenderlove@ruby-lang.org>
-Sat Apr 20 01:14:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/function.c: DL::Function now uses libffi
- * thread.c (rb_mutex_synchronize_m): yield no block params. patch by
- splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097].
- fix GH-266.
+ * ext/dl/cfunc.c (rb_dl_set_last_error): set to non static so errors
+ can be exposed.
-Sat Apr 20 00:41:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/closure.c: DL::Closure will now be used in place of
+ ext/dl/callback/*.
- * compile.c (iseq_compile_each): append keyword hash to argument array
- to splat if needed. [ruby-core:54094] [Bug #8236]
+ * ext/dl/dl.c: legacy callbacks removed in favor of libffi
-Sat Apr 20 00:31:57 2013 Kouhei Sutou <kou@cozmixng.org>
+ * ext/dl/dl_conversions.(c,h): used for converting ruby types to FFI
+ types.
- * README.EXT.ja (Data_Wrap_Struct): Remove a description about
- orphan argument. Oh, I renamed the argument name without
- changing description at r36180... Sorry....
- Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]
- * README.EXT.ja (Data_Make_Struct): Add a sample code that describes
- how it works.
- Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]
+ * ext/dl/callback/*: replaced by libffi callbacks.
-Tue Apr 16 01:30:47 2013 Kenta Murata <mrkn@mrkn.jp>
+ * ext/dl/lib/dl/callback.rb: Converting internal callbacks to use
+ DL::Closure
- * configure.in: set ac_cv_prog_cxx if CXX is supplied.
+ * ext/dl/lib/dl/closure.rb: Ruby parts of the new DL::Closure object
-Tue Apr 16 01:30:47 2013 Kenta Murata <mrkn@mrkn.jp>
+ * ext/dl/lib/dl/import.rb: More conversion to use DL::Closure object
- * configure.in: Fix c++ compiler auto-selection not only for
- Darwin 11.x, but also the other versions of Darwin.
+ * ext/dl/lib/dl/value.rb (ruby2ffi): adding private method for
+ DL::CPtr to ffi value conversion.
-Tue Apr 16 00:27:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 2 18:15:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * compile.c (iseq_compile_each): fix of defined? with empty
- expression. [ruby-core:53999] [Bug #8220]
+ * ext/socket/socket.c: turn on do_not_reverse_lookup by default,
+ which has been reverted in r9880 probably unintentionally,
+ according to matz. [ruby-core:24530]
-Mon Apr 15 00:25:00 2013 Tanaka Akira <akr@fsij.org>
+Tue Feb 2 14:46:06 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * time.c (num_exact): use to_r method only if to_int method is
- available.
- [ruby-core:53764] [Bug #8173] reported by Hiro Asari.
+ * enumerator.c: move implementation of each_slice, each_cons,
+ each_with_object to enum.c.
-Mon Apr 15 00:22:09 2013 Shota Fukumori <her@sorah.jp>
+ * enum.c (each_slice_i): convert multiple values from yield into
+ an array.
- * ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
- [Bug #8116] [ruby-dev:47177]
+ * enum.c (each_cons_i): ditto.
-Mon Apr 15 00:15:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enum.c (each_with_object_i): ditto.
- * class.c (HAVE_METACLASS_P): should check FL_SINGLETON flag before get
- instance variable to get rid of wrong warning about __attached__.
- [ruby-core:53839] [Bug #8188]
+Tue Feb 2 14:30:27 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Apr 15 00:13:13 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+ * enum.c (enum_each_entry): new method #each_entry to pack values
+ from yield into an array.
- * win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
- fix [ruby-core:53079] [Bug #7996]
- reported and patched by mmeltner (Michael Meltner).
+ * lib/set.rb (Set#merge): use Enumerable#each_entry to implement
+ Set compatible to 1.8 behavior. [ruby-core:27985]
-Mon Apr 15 00:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/set.rb: replace is_a?(Enumerable) with respond_to?(:each)
+ for duck typing.
- * include/ruby/io.h: undef POSIX compliant names on AIX, which are no
- longer needed. patch suggested by edelsohn (David Edelsohn) in
- [ruby-core:53815]. [Bug #8174]
+ * lib/set.rb (SortedSet#add): typo fixed.
-Mon Apr 15 00:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 2 11:13:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,
- to get rid of conflict on AIX. [ruby-core:53765] [Bug #8174]
+ * lib/delegate.rb (Delegator#marshal_dump): exclude
+ delegator-specific instance variables.
-Sun Apr 14 23:49:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 1 21:26:41 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
- use different set than C for C++. [ruby-core:45273] [Bug #6504]
+ * lib/matrix.rb (Vector#each2): returns a self. [ruby-dev:40241]
-Sun Apr 14 23:43:06 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Feb 1 17:08:42 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/fiddle/closure.c (initialize): check mprotect's return value.
- If mprotect is failed because of PaX or something, its function call
- will cause SEGV.
- http://c5664.rubyci.org/~chkbuild/ruby-trunk/log/20130401T210301Z.diff.html.gz
+ * numeric.c (flo_minus): RDoc update. a patch from red stun
+ in [ruby-core:27951]
-Sun Apr 14 23:19:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 1 07:36:33 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
- preserved. [ruby-core:53745] [Bug #8169]
+ * ext/tk/tkutil/tkutil.c: fix SEGV on TkUtil::CallbackSubst._setup_subst_table.
-Sun Apr 14 23:19:55 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb: [ruby1.9] fix freeze at exit.
- * lib/mkmf.rb (MAIN_DOES_NOTHING): force to refer symbols for tests
- to be preserved. [ruby-core:53745] [Bug #8169]
+ * ext/tk/lib/tk.rb: [POTENTIAL INCOMPATIBLE] return NoMethodError
+ for TkWindow#to_ary and to_str.
-Sun Apr 14 03:00:51 2013 Naohisa Goto <ngotogenome@gmail.com>
+ * ext/tk/lib/tkextlib/tcllib/plotchart.rb: wrong arguments.
- * configure.in (AC_CHECK_HEADERS): atomic.h for Solaris atomic_ops.
+ * ext/tk/sample/tkballoonhelp.rb: fail to support TkEntry widgets.
- * ruby_atomic.h: Skip using Solaris10 atomic_ops on Solaris 9 or
- earlier if atomic.h is not available. [ruby-dev:47229] [Bug #8228]
+Sun Jan 31 23:20:43 2010 wanabe <s.wanabe@gmail.com>
-Sun Apr 14 02:32:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (rb_io_each_codepoint): use cbuf when needs readconv.
- * time.c (GetTimeval): check if already initialized instance.
+Sun Jan 31 23:07:23 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * time.c (GetNewTimeval): check if newly created instance.
+ * test/ruby/test_dir.rb: use string instead of symbol as file name.
- * time.c (time_init_0, time_init_1, time_init_copy, time_mload): must
- be newly created instance. [ruby-core:53436] [Bug #8099]
+Sun Jan 31 22:41:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Sun Apr 14 02:13:25 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * string.c (rb_string_value): fix the previous commit.
- * vm_eval.c (check_funcall_respond_to): preserve passed_block, which
- is modified in vm_call0_body() via vm_call0(), and caused a bug of
- rb_check_funcall() by false negative result of rb_block_given_p().
- re-fix [ruby-core:53650] [Bug #8153].
- [ruby-core:53653] [Bug #8154]
+Sun Jan 31 21:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Apr 12 04:16:30 2013 Naohisa Goto <ngotogenome@gmail.com>
+ * string.c (rb_string_value): make no exception for Symbol.
+ [ruby-dev:40274]
- * marshal.c (marshal_dump, marshal_load): workaround for segv on
- Intel Solaris compiled with Oracle SolarisStudio 12.3.
- Partly revert r38174. [ruby-core:52042] [Bug #7805]
+Sun Jan 31 21:10:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Apr 12 04:12:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969]
- * string.c (rb_str_conv_enc_opts): convert with one converter, instead
- of re-creating converters for each buffer expansion.
+Sun Jan 31 21:29:58 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Apr 12 03:48:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
+ parent is specified, since Text.check may need doctype. partially
+ revert r26518.
- * lib/mkmf.rb (find_library): fix to format message.
- [ruby-core:53568] [Bug #8130]
+Sun Jan 31 15:50:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Apr 12 03:44:45 2013 Narihiro Nakamura <authornari@gmail.com>
+ * lib/rexml/text.rb (REXML::Text#initialize): fix typo and a bug that
+ seems to be caused by refactoring.
- * proc.c (bm_free): need to clean up the mark flag of a free and
- unlinked method entry. [Bug #8100] [ruby-core:53439]
+Sun Jan 31 15:46:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Apr 12 02:27:42 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/rexml/parent.rb (REXML::Parent#delete): return the deleted node
+ because the rdoc of REXML::Element#delete_element says it returns
+ "the element that was removed." [REXMLTracker#161]
- * addr2line.c: use more generic type:
- * u_char -> unsigned char
- * u_short -> unsigned short
- * u_int -> unsigned int
- * u_long -> unsigned long
- * quad_t -> int64_t
- * u_quad_t -> uint64_t
+Sun Jan 31 14:33:00 2010 James Edward Gray II <jeg2@ruby-lang.org>
- * addr2line.c (imax): inline is defined by configure.
+ * lib/csv.rb: A bug fix for deleting blank Table rows from Andy Hartford.
-Fri Apr 12 02:27:42 2013 Naohisa Goto <ngotogenome@gmail.com>
+Sun Jan 31 13:31:43 2010 wanabe <s.wanabe@gmail.com>
- * addr2line.c: quad_t and u_quad_t is not available on Solaris.
- __inline is not available with old compilers on Solaris.
- [ruby-dev:47229] [Bug #8227]
+ * gc.c (obj_free): free rb_classext_t of eigenclass. [Bug #1392]
-Fri Apr 12 02:27:42 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sun Jan 31 13:00:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * addr2line.c (putce): suppress unused return value warning.
+ * lib/rexml/document.rb (REXML::Document#add): fix duplicate XMLDecls
+ and bad DocTypes in REXML::Document. (Bug #19058) [ruby-core:27979]
+ based on the patch by Federico Builes.
-Fri Apr 12 02:27:42 2013 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jan 29 22:49:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * addr2line.c (kprintf): added from FreeBSD libstand's printf.
- this is consided as async signal safe function.
+ * lib/getoptlong.rb (set_options): ensure that the type of argument is
+ Array, restoring this check that was deleted at r10239. This caused
+ rubyspec error.
- * addr2line.c (rb_dump_backtrace_with_lines): use kfprintf.
- [Bug #8144] [ruby-core:53632]
+Fri Jan 29 12:59:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 12 02:27:42 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in (mingw): needs $(DEFFILE) for extension libraries.
+ [ruby-core:27946]
- * addr2line.c (rb_dump_backtrace_with_lines): output line at once.
+Fri Jan 29 11:09:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 12 02:10:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (try_do): log no source when no development env.
- * vm_method.c (rb_export_method): directly override the flag of method
- defined in prepending class too, not adding zsuper entry.
- [ruby-core:53106] [Bug #8005]
+ * lib/mkmf.rb (create_makefile): srcprefix always needs $(srcdir).
-Fri Apr 12 01:57:52 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/mkmf.rb (create_makefile): yield configuration if a block is
+ given.
- * lib/fileutils.rb: Revert r34669 which altered the way
- metaprogramming in FileUtils occurred. [ruby-trunk - Bug #7958]
+Fri Jan 29 09:43:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/fileutils/visibility_tests.rb: Refactored tests of FileUtils
- options modules to expose bug found in #7958
- * test/fileutils/test_dryrun.rb: ditto.
- * test/fileutils/test_nowrite.rb: ditto.
- * test/fileutils/test_verbose.rb: ditto.
+ * enc/trans/utf8_mac.trans (buf_shift_char): don't see uninitialized
+ value. [ruby-dev:40233]
-Fri Apr 12 01:28:46 2013 Luis Lavena <luislavena@gmail.com>
+Fri Jan 29 01:42:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/file.c (get_user_from_path): add internal function that retrieves
- username from supplied path (refactored).
- * win32/file.c (rb_file_expand_path_internal): refactor expansion of user
- home to use get_user_from_path and cover dir_string corner cases.
- [ruby-core:53168] [Bug #8034]
+ * lib/delegate.rb (Delegator#initialize_copy): use initialize_copy
+ instead of overriding clone/dup. [ruby-dev:40221]
+ it now always clones the target, it might cause incompatibility.
-Fri Apr 12 01:28:46 2013 Luis Lavena <luislavena@gmail.com>
+Fri Jan 29 01:26:53 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/file.c (rb_file_expand_path_internal): Expand home directory when
- used as second parameter (dir_string). [ruby-core:53168] [Bug #8034]
- * test/ruby/test_file_exhaustive.rb: add test to verify.
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): update RDoc to
+ denote that #to_i raises FloatDomainError for Inf and NaN.
-Mon Apr 8 00:10:59 2013 Narihiro Nakamura <authornari@gmail.com>
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): fast #to_i using
+ BigDecimal_split().
- * gc.c: Fix unlimited memory growth with large values of
- RUBY_FREE_MIN. patched by tmm1(Aman Gupta).
- [Bug #8095] [ruby-core:53405]
+ * bignum.c (conv_digit): use faster ISDIGIT() assuming ASCII.
-Sun Apr 7 22:27:12 2013 Narihiro Nakamura <authornari@gmail.com>
+Fri Jan 29 00:18:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta).
- [Bug #8093] [ruby-core:53393]
+ * lib/cgi.rb: set autoload to CGI::HtmlExtension. [ruby-dev:40194]
-Sun Apr 7 03:01:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 28 09:44:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * parse.y (simple_re_meta): escape all closing characters, not only
- round parenthesis. [ruby-core:53578] [Bug #8133]
+ * regcomp.c (onig_compile): initialize ScanEnv.
+ mainly to initialize env->warnings_flag [ruby-dev:40196]
-Sun Apr 7 02:54:40 2013 Narihiro Nakamura <authornari@gmail.com>
+ * regparse.c (scan_env_clear): clear warnings_flag.
- * gc.c: Improve accuracy of objspace_live_num() and
- allocated/freed counters. patched by tmm1(Aman Gupta).
- [Bug #8092] [ruby-core:53392]
+Wed Jan 27 23:33:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Apr 5 00:54:08 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/matrix/test_matrix.rb, test/matrix/test_vector.rb: add some
+ tests.
- * ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn.
+Wed Jan 27 23:29:36 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Thu Apr 4 02:27:12 2013 Tanaka Akira <akr@fsij.org>
+ * lib/thread.rb (ConditionVariable#wait, signal, broadcast): return
+ self (for 1.8 compatibility).
- * lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
- argument only if non-nil value is given.
- [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
- mrkn.
+Wed Jan 27 23:27:54 2010 Keiju Ishitsuka <keiju@emperor2.pendome>
-Thu Apr 4 02:24:59 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/matrix.rb: add exception Matrix::ErrOperationNotImplemented
+ [ruby-dev:40149].
+ * lib/matrix.rb: change message of exception
+ Matrix::ErrOperationNotDefined [ruby-dev:40150], [ruby-dev:40176].
+ * lib/matrix.rb: add method Vector#/ [ruby-dev:40151].
+ * lib/matrix.rb(Matrix::Scalar#+,-,/): delete meaningless when
+ switch. [ruby-dev:40149]
- * Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
- fix lookbehind assertion fails with /m mode enabled. [Bug #8023]
- fix \Z matches where it shouldn't. [Bug #8001]
+Wed Jan 27 23:22:54 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Thu Apr 4 02:11:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_dump.c (bugreport_backtrace): trivial change.
- * marshal.c (w_extended): check for prepended object.
- [ruby-core:53206] [Bug #8043]
+ * vm_dump.c (rb_vm_bugreport): uninitialized local variable i.
+ [ruby-dev:40169]
-Wed Mar 27 03:02:30 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
+ follow above change.
- * vm_exec.c: Correct predefined macro name. This typo is introduced by
- r36534 and should be backported to ruby_2_0_0.
+Wed Jan 27 23:20:52 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Wed Mar 27 02:58:44 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/ruby/test_exception.rb
+ (TestException#test_thread_signal_location):
+ change test method name.
- * Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
- v5.13.3 [Bug#7972] [Bug#7974]
+Wed Jan 27 22:48:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Mar 27 02:53:53 2013 Kouhei Sutou <kou@cozmixng.org>
+ * lib/matrix.rb (determinant): fix name error.
- * lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...
- * lib/rexml/rexml.rb: ... here to make rexml/text independent from
- REXML::Document. It causes circular require.
- * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
- deprecated.
- * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
- deprecated.
- * lib/rexml/text.rb: add missing require "rexml/rexml" for
- REXML.entity_expansion_text_limit.
- Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]
+Wed Jan 27 22:26:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Mar 27 02:50:45 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * vm_eval.c (rb_backtrace): "circular require" warning was output to
+ stdout except the first line. All line is output to stderr now.
+ [ruby-dev:40147]
- * object.c (Init_Object): remove Module#used, which has been
- introduced in Ruby 2.0 by mistake. [Bug #7916] [ruby-core:52719]
+Wed Jan 27 00:22:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Mar 25 02:02:15 2013 Tadayoshi Funaba <tadf@dotrb.org>
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod, BigDecimal_mod,
+ BigDecimal_divmod, BigDecimal_div2): BigDecimal#% and #div returned
+ an array itself that was returned by #divmod.
- * complex.c: edited rdoc.
- * rational.c: ditto.
+Wed Jan 27 00:19:30 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Mar 25 02:02:15 2013 Tadayoshi Funaba <tadf@dotrb.org>
+ * ext/bigdecimal/bigdecimal.c (VpCtoV): do not raise infinity
+ exception for BigDecimal("0E200000000000").
- * complex.c: described syntax of string form.
- * rational.c: ditto.
+Tue Jan 26 21:50:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Mar 25 01:26:26 2013 Zachary Scott <zachary@zacharyscott.net>
+ * ext/bigdecimal/bigdecimal.c (VpCtoV): BigDecimal("0E200000000000")
+ was Infinity, not 0.
- * lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013]
- Patch by Nobuhiro IMAI [ruby-core:53127]
+ * test/bigdecimal/test_bigdecimal.rb: add a test for above.
-Mon Mar 25 01:09:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 26 21:36:22 2010 Tanaka Akira <akr@fsij.org>
- * compile.c (iseq_compile_each): pass keyword arguments to zsuper,
- with current values. [ruby-core:53114] [Bug #8008]
+ * configure.in: test unsetenv returns a value.
+ unsetenv is void in older BSDs (FreeBSD 6 and OpenBSD 4.5 at least).
-Mon Mar 25 01:05:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (ruby_setenv): don't use the result of unsetenv if unsetenv
+ doesn't return a value.
- * ext/objspace/objspace.c (count_nodes): count also newly added nodes,
- and fix key for unknown node. patch by tmm1 (Aman Gupta) in
- [ruby-core:53130] [Bug #8014]
+Tue Jan 26 21:32:03 2010 Tanaka Akira <akr@fsij.org>
-Mon Mar 25 01:00:03 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/extconf.rb: suppress a warning.
- * class.c (rb_prepend_module): check redefinition of built-in optimized
- methods. [ruby-dev:47124] [Bug #7983]
+ * ext/extmk.rb: ditto.
- * vm.c (rb_vm_check_redefinition_by_prepend): ditto.
+Tue Jan 26 20:23:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Mar 25 00:51:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm.c (rb_vm_invoke_proc): this function must not catch TAG_RETURN
+ because vm_exec does. This caused rubyspec error. [ruby-dev:40158]
- * Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
- must appear after object files with newer versions of gcc. patch by
- tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009]
+Tue Jan 26 20:21:28 2010 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Mon Mar 25 00:47:04 2013 Koichi Sasada <ko1@atdot.net>
+ * lib/drb/eq.rb: fix circular require in drb.
+ reported by akr. see [ruby-dev:40156] [ruby-core:27661]
- * iseq.c (iseq_data_to_ary): fix condition.
- r34303 introduces a bug to avoid all line information from
- a result of ISeq#to_a. This is a regression problem from 2.0.0p0.
+Tue Jan 26 19:59:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_iseq.rb: add a test of lines after ISeq#to_a.
+ * ext/zlib/zlib.c (rb_gzfile_s_wrap): add rdoc. [Bug #2656]
+ patched by Hugh Sasse [ruby-core:27692] [ruby-core:27852]
-Mon Mar 25 00:41:23 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/zlib/doc/zlib.rd: removed.
- * tool/mkconfig.rb: reconstruct comma separated list values. a
- command line to Windows batch file is split not only by spaces
- and equal signs but also by commas and semicolons.
+Tue Jan 26 16:43:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Mar 20 23:21:14 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * ext/strscan/strscan.c: fix rdoc. (length -> bytesize)
+ reported by Kornelius Kalnbach. see [ruby-core:27792]
- * test/rubygems/test_gem_installer.rb (test_install_extension_flat):
- use ruby in build directory in case ruby is not installed.
- [ruby-core:53265] [Bug #8058]
+Tue Jan 26 07:06:05 2010 Tanaka Akira <akr@fsij.org>
-Wed Mar 20 23:17:33 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/matrix.rb: suppress warnings.
- * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
- allow using different root for source and build directories.
- this may fixes a minor problem of r39834.
+Tue Jan 26 03:16:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Mar 20 23:17:33 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+ * cont.c, vm_core.h, eval.c: because rb_protect must not be jumped by
+ callcc, revert r26407. And rename trap_tag to protect_tag and
+ change exception message (across trap -> across stack rewinding
+ barrier).
- * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use
- relative path to get rid of "too long commandline" error.
+Mon Jan 25 23:08:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Mar 20 23:17:33 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+ * thread.c (do_select): wrong conditions. [ruby-core:27753]
- * test/win32ole/test_err_in_callback.rb
- (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
- the top of build directory.
+Mon Jan 25 22:31:53 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Mar 20 23:08:40 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/ruby/envutil.rb: use method_defined? instead of
+ instance_methods.include?.
- * include/ruby/missing.h: removed __linux__. it's unnecessary.
+Mon Jan 25 22:08:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Mar 20 23:03:27 2013 Tanaka Akira <akr@fsij.org>
+ * cont.c (rb_cont_call, cont_restore_1): remove trap_tag check because
+ it seems not to make sense. [ruby-dev:40121]
- * configure.in: move OS specific header/function knowledge before
- automatic header tests.
+ * vm_core.h, eval.c (rb_protect): ditto.
-Wed Mar 20 23:01:42 2013 Tanaka Akira <akr@fsij.org>
+Mon Jan 25 21:43:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * configure.in: move header files check to the beginning of
- "header and library section".
- test rlim_t with sys/types.h and sys/time.h for MirOS BSD.
- sys/types.h and sys/time.h is gurded by #ifdef and the above move
- is required for this change.
+ * test/ruby/envutil.rb: fix the check if instance method `ruby' is
+ defined or not.
-Wed Mar 20 22:57:27 2013 Tanaka Akira <akr@fsij.org>
+Mon Jan 25 21:17:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * configure.in: move the test for -march=i486 just after
- RUBY_UNIVERSAL_ARCH/RUBY_DEFAULT_ARCH.
+ * test/ruby/test_rubyoptions.rb (test_segv_test): add a test for
+ bugreport trace dumper.
-Wed Mar 20 22:56:07 2013 Tanaka Akira <akr@fsij.org>
+Mon Jan 25 17:47:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: change CFLAGS temporally to test
- ARCH_FLAG="-march=i486".
+ * ext/pty/pty.c (pty_check): needs WNOHANG to poll, return $?, and
+ call raise_from_check() with pid_t. [ruby-dev:40141]
-Wed Mar 20 22:54:33 2013 Tanaka Akira <akr@fsij.org>
+Mon Jan 25 17:36:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: don't define ARCH_FLAG="-march=i486" if it causes
- compilation problem.
+ * version.c (RUBY_LIB, RUBY_*_LIB): moved from configures.
-Wed Mar 20 22:36:41 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jan 25 12:11:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug.
- [Bug #8080] [ruby-core:53349]
- * test/ruby/test_io.rb (TestIO#test_io_select_with_many_files):
- test for the above.
+ * signal.c (USE_SIGALTSTACK): only when SA_SIGINFO also is
+ available. see [ruby-core:27768].
-Wed Mar 20 22:34:52 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jan 25 12:02:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * include/ruby/missing.h (__syscall): moved to...
- * io.c: here. because __syscall() is only used from io.c.
+ * dln.c, file.c, io.c, signal.c: add __HAIKU__.
+ patched by Alexander von Gluck [ruby-core:27767]
- * include/ruby/missing.h: move "#include <sys/type.h>" to ....
- * include/ruby/intern.h: here. because it was introduced for
- fixing NFDBITS issue. [ruby-core:05179].
+Mon Jan 25 11:45:47 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Mar 20 22:33:26 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * math.c (domain_check): ignore errno if y is inf.
+ r26335 is because NetBSD 5.0's asin and acos returns
+ 0.0 with errno EDOM. But it breaks Linux whose gamma returns inf
+ with errno ERANGE on.
- * include/ruby/missing.h (struct timespec): include <sys/time.h>
+Sun Jan 24 22:48:05 2010 Koichi Sasada <ko1@atdot.net>
-Wed Mar 20 22:33:26 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * eval.c, vm.c, vm_eval.c, vm_insnhelper.c: fix issues about
+ return and c-return trace. This issue skips (c-)return event
+ with global jump such as break or return. This fix make vm invoke
+ hooks at stack rewind timing. fix [ruby-core:27606] [Bug #2610].
- * configure.in: check struct timeval exist or not.
- * include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL
- properly. and don't include sys/time.h if struct timeval exist.
+ * test/ruby/test_settracefunc.rb: add a test for above.
- * file.c: include sys/time.h explicitly.
- * random.c: ditto.
- * thread_pthread.c: ditto.
- * time.c: ditto.
- * ext/date/date_strftime.c: ditto.
+Sun Jan 24 14:21:48 2010 Tanaka Akira <akr@fsij.org>
-Mon Mar 18 00:12:28 2013 Eric Hodel <drbrain@segment7.net>
+ * string.c (rb_enc_strlen_cr): increment by rb_enc_mbminlen(enc) for
+ broken byte sequence. [ruby-core:27748]
+ (rb_str_inspect): ditto.
- * lib/rubygems/commands/setup_command.rb: Don't delete non-rubygems
- files when installing RubyGems.
- * test/rubygems/test_gem_commands_setup_command.rb: Test for the
- above.
+Sun Jan 24 05:18:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/ext/ext_conf_builder.rb: Use full path to siteconf.rb
- in case the extconf.rb changes directories (like memcached does).
+ * thread.c (thread_start_func_2): unlock all locking mutexes
+ before clean up. [ruby-core:26877]
- * lib/rubygems/package.rb: Remove double slash from path.
- * test/rubygems/test_gem_package.rb: Test for the above.
- * test/rubygems/test_gem_package_old.rb: ditto.
+ * thread.c (rb_thread_atfork): no other threads to be joined.
- * lib/rubygems/source.rb: Revert automatic HTTPS upgrade
- * lib/rubygems/spec_fetcher.rb: ditto.
- * test/rubygems/test_gem_remote_fetcher.rb: ditto.
- * test/rubygems/test_gem_source.rb: ditto.
- * test/rubygems/test_gem_spec_fetcher.rb: ditto.
+ * vm_core.h (rb_thread_lock_unlock, rb_thread_lock_destroy):
+ new functions.
-Mon Mar 18 00:11:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm.c (ruby_vm_destruct): unlock and destroy global VM lock.
- * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
- it is impossible to predict which file will be installed to where,
- by the arguments, so use intermediate destination directory always.
- [Bug #7698]
+Sun Jan 24 00:31:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Mar 18 00:11:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc/parser/ruby.rb: fix typo.
+ patched by Hal Brodigan [ruby-core:21536]
- * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
- it is impossible to predict which file will be installed to where,
- by the arguments, so use intermediate destination directory always.
- [Bug #7698]
+Sun Jan 24 00:02:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Mar 18 00:05:50 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/rdoc/markup/to_html_crossref.rb: fix failure of the test.
+ patched by Tomoyuki Chikanaga and nobu [ruby-core:20564]
- * lib/rubygems/commands/setup_command.rb: Install .pem files.
- * test/rubygems/test_gem_commands_setup_command.rb: Test for the
- above.
+Sat Jan 23 23:27:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rubygems/spec_fetcher.rb: Test HTTPS upgrade with URI::HTTPS,
- not URI::HTTP. Fixes bug in automatic HTTPS upgrade.
- * test/rubygems/test_gem_spec_fetcher.rb: Test for the above.
+ * dir.c (dir_s_glob): add rdoc by Roger Pack. [ruby-core:27669]
- * lib/rubygems.rb: Version 2.0.2
+Sat Jan 23 23:12:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rubygems/test_utilities.rb: Ensure scheme and uri class match.
+ * lib/rdoc/generator/html.rb (RDoc::Generator::HTML#gen_into):
+ make the rdoc(generating html) run faster and use less memory.
+ patch by Tetsu Soh [ruby-core:27656]
-Mon Mar 18 00:03:27 2013 Eric Hodel <drbrain@segment7.net>
+Sat Jan 23 19:54:48 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * test/rubygems/test_require.rb: Fix tests when 'a.rb' exists.
- [ruby-trunk - Bug #7749]
+ * ext/win32ole/win32ole.c: add WIN32OLE.ole_initialize,
+ WIN32OLE.ole_uninitialize to use in win32ole.rb.
+ You must not use these methods.
-Mon Mar 18 00:02:27 2013 Eric Hodel <drbrain@segment7.net>
+ * ext/win32ole/lib/win32ole.rb: add win32ole.rb
+ re-define Thread#initialize (fix ruby-core:27634)
- * lib/rubygems.rb: Allow specification of directory permissions.
- [ruby-trunk - Bug #7713]
- * test/rubygems/test_gem.rb: Test for the above.
+Sat Jan 23 00:25:19 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Mar 18 00:00:32 2013 Eric Hodel <drbrain@segment7.net>
+ * sample/coverage.rb: preserve exit status.
- * test/rubygems/test_gem_spec_fetcher.rb: Removed unused variable.
+Sat Jan 23 00:21:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Mar 18 00:00:32 2013 Eric Hodel <drbrain@segment7.net>
+ * test/ruby/test_dir.rb: get rid of debug print.
- * lib/rubygems/commands/query_command.rb: Only fetch remote specs when
- showing details. [ruby-trunk - Bug #8019] RubyGems bug #487
- * lib/rubygems/remote_fetcher.rb: ditto.
- * lib/rubygems/security/policy.rb: ditto.
- * test/rubygems/test_gem_commands_query_command.rb: Test for the
- above.
+ * test/ruby/test_module.rb: fixed to make test-all work.
+
+Fri Jan 22 23:54:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_array.rb: add a test for Array#rotate, rotate!.
+
+ * test/ruby/test_dir.rb, test/ruby/test_fnmatch.rb: add some tests
+ (for coverage of dir.c).
+
+ * test/ruby/test_enum.rb: add a test for Enumerable#minmax.
+
+ * test/ruby/test_enumerator.rb: add some tests for Enumerator#inspect,
+ Enumerator::Generator and Yielder.
+
+ * test/ruby/test_env.rb: add a test for ENV#index.
+
+ * test/ruby/test_exception.rb: add some tests (for coverage of
+ error.c).
+
+ * test/ruby/test_hash.rb: add a test for recursive check.
+
+ * test/ruby/test_integer.rb: add a test for number of argument of
+ Integer.
+
+ * test/ruby/test_method.rb: add a test for define_method.
+
+ * test/ruby/test_module.rb: add a test for constant of included
+ module.
+
+ * test/ruby/test_proc.rb: add a test for parameters with cfunc.
+
+Fri Jan 22 23:50:03 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_regexp.rb, test/ruby/test_symbol.rb,
+ test/ruby/test_variable.rb: add some tests (for coverage of
+ compile.c).
+
+Fri Jan 22 21:05:34 2010 Tanaka Akira <akr@fsij.org>
+
+ * time.c (time_mload): add submicro into vtm.subsecx. [ruby-dev:40133]
+
+Fri Jan 22 14:26:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (rdoc): needs encodings and exts.
- * lib/rubygems/security.rb: Make OpenSSL optional for RubyGems.
- * lib/rubygems/commands/cert_command.rb: ditto.
+Fri Jan 22 14:16:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rubygems/config_file.rb: Display file with YAML error, not
- ~/.gemrc
+ * configure.in: add missing comma.
- * lib/rubygems/remote_fetcher.rb: Only create gem subdirectories when
- installing gems.
- * lib/rubygems/dependency_resolver.rb: ditto.
- * lib/rubygems/test_utilities.rb: ditto.
- * test/rubygems/test_gem_commands_fetch_command.rb: Test for the
+Fri Jan 22 01:07:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_bignum.rb, test/ruby/test_class.rb,
+ test/ruby/test_defined.rb, test/ruby/test_hash.rb,
+ test/ruby/test_primitive.rb, test/ruby/test_variable.rb: add some
+ tests (for coverage).
+
+Fri Jan 22 01:03:28 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_require.rb (test_define_class): expect TypeError
+ instead of NameError. [ruby-core:27504]
+
+Thu Jan 21 15:09:35 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * configure.in: some tidy.
+
+Thu Jan 21 11:15:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (rb_ary_rotate): new methods, Array#rotate! and
+ Array#rotate. [ruby-dev:17194]
+
+ * array.c (rb_ary_reverse_m): copy directly.
+
+Thu Jan 21 09:38:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: use AS_CASE instead of when, to get rid of
+ an unintentional substitution.
+
+Thu Jan 21 08:45:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * iseq.c (iseq_s_disasm): check for proc first. based on the
+ patch by Roger Pack in [ruby-core:27626]. [ruby-core:27227]
+
+Wed Jan 20 16:09:59 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * common.mk (compile.$(OBJEXT)): dependencies lacking.
+
+ * vm_method.c (rb_add_method_cfunc): invalid initializer for C89
+
+ * compile.c (iseq_insns_unification): int might be smaller than int*
+
+Tue Jan 19 20:00:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/resolv.rb (Resolv::Config.default_config_hash): return an
+ empty hash when resolv.conf is not available. [ruby-core:27620]
+
+ * lib/resolv.rb (Resolv::DNS::Config#lazy_initialize): fixed the
+ defaults of nameserver and port.
+
+Tue Jan 19 14:29:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (clean-ext): allow glob patterns.
+
+ * ext/extmk.rb: ditto.
+
+Tue Jan 19 14:19:26 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/zlib/{extconf.rb, zlib.c): crc32_combine and adler32_combine is
+ supported on Zlib 1.2.2.1, so check them for old zlib.
+
+Tue Jan 19 09:03:37 2010 Aaron Patterson <tenderlove@ruby-lang.org>
+
+ * ext/zlib/zlib.c: added Zlib.crc32_combine and Zlib.adler32_combine
+
+ * test/zlib/test_zlib.rb: corresponding tests [ruby-core:27551]
+
+
+Tue Jan 19 02:02:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_array.rb: add some tests (for coverage).
+
+ * test/ruby/test_bignum.rb: ditto.
+
+Tue Jan 19 01:57:12 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_bignum.rb: some coerce definitions (for test) was
+ wrong.
+
+Tue Jan 19 01:53:11 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bignum.c (bigsub_int): remove nonsense loop.
+
+Tue Jan 19 01:42:36 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * parse.y (top_compstmt, top_stmts, top_stmt): prohibit BEGIN {} in
+ non-toplevel scope. [ruby-core:21657]
+
+ * test/ruby/test_beginendblock.rb (test_begininclass): add a test for
above.
- * lib/rubygems/spec_fetcher.rb: Only try to upgrade
- http://rubygems.org to HTTPS
- * test/rubygems/test_gem_spec_fetcher.rb: Test for the above.
+Mon Jan 18 17:16:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems.rb: Update win_platform? check for JRuby compatibility.
+ * lib/webrick/httpservlet/filehandler.rb (make_partial_content):
+ add bytes-unit. [ruby-dev:40030]
- * test/rubygems/test_gem_installer.rb: Update for Ruby 1.9.2
- compatibility
+Mon Jan 18 15:49:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Mar 17 23:53:19 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
+ use inclusive range same as the header representation.
- * lib/rubygems.rb: Bump version to 2.0.1 for upcoming bugfix release
+Mon Jan 18 03:59:57 2010 Akinori MUSHA <knu@iDaemons.org>
- * lib/rubygems/ext/ext_conf_builder.rb: Restore ruby 1.8 compatibility
- for [Bug #7698]
- * test/rubygems/test_gem_installer.rb: Ditto.
+ * ext/digest/digest.c (rb_digest_instance_hexdigest_bang): Fix
+ rdoc.
- * lib/rubygems/package.rb: Restore ruby 1.8 compatibility.
+ * ext/digest/lib/digest.rb (Digest::Class.base64digest)
+ (Digest::Instance#base64digest{,!}): New methods.
- * test/rubygems/test_gem_dependency_installer.rb: Fix warnings
+Sun Jan 17 22:48:44 2010 Akinori MUSHA <knu@iDaemons.org>
-Sun Mar 17 23:36:05 2013 Eric Hodel <drbrain@segment7.net>
+ * ext/digest/digest.c (rb_digest_instance_digest)
+ (rb_digest_instance_hexdigest): Save a method call of reset()
+ for a disposable clone.
- * lib/rubygems/available_set.rb: Undent for style
+Sun Jan 17 19:24:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/dependency_installer.rb: Pick latest prerelease gem to
- install. Fixes RubyGems bug #468.
- * test/rubygems/test_gem_dependency_installer.rb: Test for the above.
+ * math.c (domain_check): check errno first.
+ NetBSD 5.0's asin and acos returns 0.0 with errno EDOM.
- * lib/rubygems/dependency_installer.rb: Don't display "Done installing
- documentation" if documentation will not be installed.
- * lib/rubygems/rdoc.rb: ditto
+Sun Jan 17 14:24:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/dependency_list.rb: Use Array#concat for Ruby 1.x
- performance.
+ * ext/iconv/iconv.c (rb_str_derive): use long.
- * lib/rubygems/installer.rb: Use formatted program name when comparing
- executables. RubyGems pull request #471
- * test/rubygems/test_gem_installer.rb: Test for the above.
+ * ext/iconv/iconv.c (iconv_convert): suppress a warning.
- * lib/rubygems/package.rb: Use more explicit feature check to work
- around JRuby bug #552
+ * lib/mkmf.rb (check_signedness): new method.
- * lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem: Added GeoTrust root
- certificate.
+ * lib/mkmf.rb (have_header, create_header): use String#tr_cpp.
- * test/rubygems/test_gem_source_list.rb: Use "example" instead of real
- hostname
+Thu Jan 14 13:06:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Mar 17 23:28:44 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (flo_hash, int_chr): fixed type.
- * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
- clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overrdden.
- [Bug #7698]
+Thu Jan 14 12:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Mar 17 23:26:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_concat): fixed range check for Fixnum, and
+ added checks for integer overflow and invalid char code.
- * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
- fix for unusal cases again. install to a temporary directory once
- and move instaled files to the destination directory, if it is same
- as the current directory. [Bug #7698]
+Thu Jan 14 09:34:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Mar 17 23:22:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_concat): raise RangeError when the argument is
+ negative value. [ruby-core:27583]
- * lib/rubygems/ext/ext_conf_builder.rb
- (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
- circular dependencies in install-so too. [ruby-core:52882]
- [Bug #7698]
+Thu Jan 14 08:49:59 2010 Tanaka Akira <akr@fsij.org>
-Sun Mar 17 23:19:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_to_r): convert to rational if internal representation
+ is not rational.
- * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
- revert use of temporary directory for build, to work some buggy
- extconf.rb which cannot build outside the source directory.
- [ruby-core:53056] [Bug #7698]
+Thu Jan 14 04:01:50 2010 Tanaka Akira <akr@fsij.org>
-Sun Mar 17 23:11:35 2013 Eric Hodel <drbrain@segment7.net>
+ * time.c (time_mdump): use nano_num and nano_den instead of subnano to
+ avoid Rational class in marshaled data which prevent unmarshal by
+ Ruby 1.8.
+ (time_mload): use nano_num and nano_den.
- * lib/rubygems/ext/builder.rb: Fix incompatibilities when installing
- extensions. Patch by Nobu.
- [ruby-trunk - Bug #7698] [ruby-trunk - Bug #7971]
- * lib/rubygems/ext/ext_conf_builder.rb: ditto.
- * lib/rubygems/installer.rb: ditto.
- * test/rubygems/test_gem_ext_ext_conf_builder.rb: Test for the above.
- * test/rubygems/test_gem_installer.rb: ditto.
+Wed Jan 13 11:57:38 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * lib/rubygems/commands/sources_command.rb: Prefer HTTPS over HTTP.
- * lib/rubygems/defaults.rb: ditto
- * lib/rubygems/dependency_resolver.rb: Ditto.
- * lib/rubygems/source.rb: ditto.
- * lib/rubygems/spec_fetcher.rb: ditto.
- * lib/rubygems/specification.rb: ditto.
- * lib/rubygems/test_utilities.rb: ditto.
- * test/rubygems/test_gem.rb: Test for the above.
- * test/rubygems/test_gem_commands_sources_command.rb: ditto.
- * test/rubygems/test_gem_dependency_resolver_api_set.rb: ditto.
- * test/rubygems/test_gem_remote_fetcher.rb: ditto.
- * test/rubygems/test_gem_source.rb: ditto.
- * test/rubygems/test_gem_spec_fetcher.rb: ditto.
+ * object.c (rb_class_initialize): Make sure BasicObject doesn't get
+ initialized twice [ruby-core:27577]
-Tue Mar 12 00:56:19 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * class.c (rb_class_init_copy): ditto
- * test/thread/test_queue.rb (TestQueue#test_thr_kill): reduce
- iterations from 2000 to 250. When running on uniprocessor
- systems, every th.kill needs TIME_QUANTUM_USEC time (i.e.
- 100msec on posix systems). Because, "r.read 1" is 3 steps
- operations that 1) release GVL 2) read 3) acquire gvl and
- (1) invoke context switch to main thread. and then, main
- thread's th.kill resume (1), but not (2). Thus read interrupt
- need TIME_QUANTUM_USEC. Then maximum iteration is 30sec/100msec
- = 300.
+Wed Jan 13 06:54:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Mar 12 00:53:34 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * configure.in: check for if struct timezone is defined.
- * process.c (setup_communication_pipe): remove unused function.
- it was unintentionally added r39683.
+ * missing.h (struct timezone): define if not defined.
-Tue Mar 12 00:53:34 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * win32/win32.h (struct timezone): defined in the newer w32api.
+ [ruby-core:27515]
- * thread_pthread.c (ARRAY_SIZE): new.
- * thread_pthread.c (gvl_acquire_common): use low priority
- notification for avoiding timer thread interval confusion.
- If we use timer_thread_pipe[1], every gvl_yield() request
- one more gvl_yield(). It lead to thread starvation.
- [Bug #7999] [ruby-core:53095]
- * thread_pthread.c (rb_reserved_fd_p): adds timer_thread_pipe_low
- to reserved fds.
+Wed Jan 13 00:33:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Mar 12 00:53:34 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/shell/command-processor.rb: fix typo by Sho Hashimoto.
+ reported and patched at [ruby-dev:40058] [Bug #2599]
- * thread_pthread.c (rb_thread_wakeup_timer_thread_fd): add fd
- argument and remove hardcoded dependency of timer_thread_pipe[1].
- * thread_pthread.c (consume_communication_pipe): add fd argument.
- * thread_pthread.c (close_communication_pipe): ditto.
+Tue Jan 12 23:48:29 2010 Kouhei Sutou <kou@cozmixng.org>
- * thread_pthread.c (timer_thread_sleep): adjust the above changes.
+ * lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb:
+ accept any time format in maker. [ruby-core:26923]
- * thread_pthread.c (setup_communication_pipe_internal): factor
- out pipe initialize logic.
+Tue Jan 12 21:56:00 2010 Tanaka Akira <akr@fsij.org>
-Tue Mar 12 00:53:34 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * string.c (rb_str_set_len): call rb_str_modify.
- * thread_pthread.c (rb_thread_create_timer_thread): factor out
- creating communication pipe logic into separate function.
- * thread_pthread.c (setup_communication_pipe): new helper function.
- * thread_pthread.c (set_nonblock): moves a definition before
- setup_communication_pipe.
+ * file.c (realpath_rec): don't call rb_str_modify before
+ rb_str_set_len.
-Tue Mar 12 00:53:34 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Jan 12 20:44:14 2010 Tanaka Akira <akr@fsij.org>
- * thread_pthread.c (consume_communication_pipe): retry when
- read returned CCP_READ_BUFF_SIZE.
+ * file.c (realpath_internal): call rb_secure.
-Tue Mar 12 00:53:34 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Jan 12 16:48:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c (set_nonblock): new helper function for set
- O_NONBLOCK.
- * thread_pthread.c (rb_thread_create_timer_thread): set O_NONBLOCK
- to timer_thread_pipe[0] too.
+ * lib/net/http.rb (Net::HTTP.start): options may not be given.
-Tue Mar 12 00:51:23 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Jan 12 16:48:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c (timer_thread_sleep): use poll() instead of
- select(). select doesn't work if timer_thread_pipe[0] is
- greater than FD_SETSIZE.
- * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): add a dependency
- against poll.
+ * ext/readline/readline.c (readline_readline): check if instream
+ is closed instead of fd 0.
-Tue Mar 12 00:51:23 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/readline/readline.c (Init_readline): use STDIN for input.
+ Reported by Sora Harakami. See
+ http://d.hatena.ne.jp/codnote/20100111/1263174134
- * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): use more accurate
- ifdef condtions.
+Tue Jan 12 16:09:02 2010 wanabe <s.wanabe@gmail.com>
-Mon Mar 11 01:16:12 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_process.rb (test_execopts_env): MANDATORY_ENVS might
+ not be a part of ENV. e.g. TMPDIR.
- * configure.in (unexpand_shvar): get rid of non-portable shell
- behavior on OpenBSD, so no extra quotes. [Bug #7959]
+Tue Jan 12 14:07:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Mar 11 01:12:50 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/http.rb (Net::HTTP.start): add hash argument to
+ set ssl related options. when use_ssl is set default value
+ of verify_mode is OpenSSL::SSL::VERIFY_PEER. [ruby-dev:40003]
- * parse.y (IS_LABEL_POSSIBLE): allow labels for keyword arguments just
- after method definition without a parenthesis. [ruby-core:52820]
- [Bug #7942]
+Tue Jan 12 14:53:07 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Mar 11 01:09:23 2013 Zachary Scott <zachary@zacharyscott.net>
+ * win32/win32.c (init_env): use _wputenv() instead of
+ SetEnvironmentVariableW() because latter doesn't set msvcrt's environ
+ work area, of course.
+ [Bug #2552]
- * error.c: clarify reason for sleep in SignalException example
+Tue Jan 12 13:33:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Mar 11 01:09:23 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * file.c (realpath_rec): trace symbolic link only when supporting
+ readlink().
- * error.c: clarify a document of SignalException. Process.kill()
- doesn't have any guarantee when signal will be delivered.
- [Bug #7951] [ruby-core:52864]
+Tue Jan 12 12:49:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Mar 11 01:04:54 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
+ which ends with an underscore.
- * string.c (str_byte_substr): don't set coderange if it's not known.
- [Bug #7954] [ruby-dev:47108]
+Tue Jan 12 09:58:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Mar 11 00:58:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c: need to include errno.h for EINVAL.
- * common.mk (realclean-local): miniprelude.c is made by srcs, so it
- should not removed by distclean but by realclean. [Bug #6807]
+ * hash.c (ruby_setenv): fixed typo. see [ruby-dev:40026]
-Mon Mar 11 00:54:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 12 09:22:43 2010 Tanaka Akira <akr@fsij.org>
- * enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
- output option and the output file name. [Bug #7950]
+ * prelude.rb (require_relative): use File.realpath. [ruby-dev:40040]
- * enc/depend (RANLIB): set default command to do nothing, or make the
- entire line a label on Windows.
+ * include/ruby/intern.h: declare rb_dir_getwd.
-Mon Mar 11 00:50:21 2013 Zachary Scott <zachary@zacharyscott.net>
+ * dir.c (rb_dir_getwd): copied from dir_s_getwd to export.
+ (dir_s_getwd): use rb_dir_getwd.
- * thread.c: Document Thread::new, clean up ::fork and mention calling
- super if subclassing Thread
+ * file.c (rb_file_s_realpath): new method File.realpath.
+ (rb_file_s_realdirpath): new method File.realdirpath.
-Mon Mar 11 00:47:47 2013 Akinori MUSHA <knu@iDaemons.org>
+ * lib/pathname.rb (Pathname#realpath): use File.realpath.
+ (Pathname#realdirpath): use File.realdirpath.
- * configure.in (unexpand_shvar): Use the numeric comparison
- operator instead of '==' which is a ksh extention. [Bug #7941]
+Mon Jan 11 22:45:08 2010 Akinori MUSHA <knu@iDaemons.org>
-Sun Mar 10 00:01:07 2013 Tadayoshi Funaba <tadf@dotrb.org>
+ * hash.c (ruby_setenv): Improve the emulation of setenv(3) on
+ environments where putenv(3) is used. Raise EINVAL If a
+ variable name contains an '='.
- * ext/date/date_core.c: [ruby-core:52303]
+Mon Jan 11 18:16:38 2010 wanabe <s.wanabe@gmail.com>
-Sat Mar 9 23:55:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_insnhelper.h (GET_BLOCK_PTR): return 0 when in class frame.
+ [Bug #2583]
- * random.c (rb_random_ulong_limited): limit is inclusive, but generic
- rand method should return a number less than it, so increase for the
- difference. [ruby-core:52779] [Bug #7935]
+Mon Jan 11 16:52:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Mar 9 23:51:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_strlen): added. [ruby-dev:40028]
- * random.c (rb_random_ulong_limited): fix error message for negative
- value. [ruby-dev:47061] [Bug #7903]
+ * include/ruby/intern.h (rb_str_strlen): declared.
-Sat Mar 9 23:41:11 2013 Zachary Scott <zachary@zacharyscott.net>
+Mon Jan 11 13:30:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c: Document ThreadGroup::Default
+ * lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.
-Sat Mar 9 23:31:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status#initialize):
+ accept 0 or more arguments. [ruby-dev:40021]
- * vm_insnhelper.c (vm_call_method): block level control frame does not
- have method entry, so obtain the method entry from method top-level
- control frame to be compared with refined method entry.
- [ruby-core:52750] [Bug #7925]
+Mon Jan 11 12:47:58 2010 Akinori MUSHA <knu@iDaemons.org>
-Sat Mar 9 23:15:06 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * hash.c (ruby_setenv): ENV.[]= should raise an error if setenv(3)
+ or putenv(3) fails. [ruby-dev:40023]
- * signal.c (sigsegv): suppress unused result warning. Because
- write(2) is marked __warn_unused_result__ on Linux glibc.
+Sun Jan 10 17:25:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Mar 9 23:08:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/webrick/accesslog.rb : Escape needed.
- * compile.c (iseq_set_arguments): no keyword check if any keyword rest
- argument exists, even unnamed. [ruby-core:52744] [Bug #7922]
+ * lib/webrick/httpstatus.rb : ditto.
-Sat Mar 9 22:50:28 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/webrick/httprequest.rb : ditto.
- * array.c: Document #<=> return values and formatting
- * bignum.c: ditto
- * file.c: ditto
- * object.c: ditto
- * numeric.c: ditto
- * rational.c: ditto
- * string.c: ditto
- * time.c: ditto
+ * lib/webrick/httputils.rb : ditto.
-Sat Mar 9 22:45:01 2013 Zachary Scott <zachary@zacharyscott.net>
+ * test/webrick/test_cgi.rb (TestWEBrickCGI::test_bad_): Test for it.
- * array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
- [RubySpec #7803]
+Sun Jan 10 04:54:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Mar 9 22:38:26 2013 Zachary Scott <zachary@zacharyscott.net>
+ * class.c (rb_define_class): raise TypeError same as class
+ statement. [ruby-core:27504]
- * object.c (rb_obj_comp): Documenting Object#<=> return values
- Patch by Stefan Rusterholz
+Sun Jan 10 04:41:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Mar 9 22:35:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (configuration): needs ARCH_FLAG.
- * dir.c (file_s_fnmatch, fnmatch_brace): encoding-incompatible pattern
- and string do not match, instead of exception. [ruby-dev:47069]
- [Bug #7911]
+Sat Jan 9 14:20:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Mar 9 22:18:43 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * common.mk (install-all): maybe typo.
- * test/test_rbconfig.rb (TestRbConfig): fix r39372.
- It must see RbConfig::CONFIG instead of CONFIG.
+Sat Jan 9 14:01:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Mar 9 22:18:43 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/vsnprintf.c (BSD_vfprintf): get rid of a warning of VC++ x64.
- * test/test_rbconfig.rb (TestRbConfig): skip user defined values by
- configuration options. [Bug #7902]
+Sat Jan 9 08:40:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Mar 9 22:07:53 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * win32/configure.bat (WIN32DIR): regularise file separators.
- * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
- fix a typo in comment in r39384.
+Fri Jan 8 23:35:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Mar 9 21:52:19 2013 Zachary Scott <zachary@zacharyscott.net>
+ * proc.c (mnew): don't check visibility of method body if public
+ ZSUPER method is found. [ruby-dev:39767]
- * numeric.c: Examples and formatting for Numeric and Float
- Based on a patch by Zach Morek and Oren K of newhaven.rb
- [Github documenting-ruby/ruby#5]
+ * test/ruby/test_method.rb: add a test for above.
-Sat Mar 9 21:46:41 2013 Eric Hodel <drbrain@segment7.net>
+Fri Jan 8 22:59:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
- * doc/globals.rdoc: Document what setting $DEBUG does.
+ * vm_method.c (rb_alias): skip ZSUPER method when searching body of
+ source method. [ruby-dev:39760]
- * doc/globals.rdoc: Added pointer to $-d for full documentation.
+ * test/ruby/test_alias.rb: add a test for above.
-Sat Mar 9 21:45:38 2013 Eric Hodel <drbrain@segment7.net>
+Fri Jan 8 21:15:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
- * doc/globals.rdoc: Document what setting $VERBOSE does. [Bug #7899]
+ * lib/net/http, lib/net/https: move content from net/https to
+ net/http. [ruby-dev:39986]
- * doc/globals.rdoc: Added pointer to $-w and $-v for full
- documentation.
+Fri Jan 8 14:06:01 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Mar 9 21:29:45 2013 Naohisa Goto <ngotogenome@gmail.com>
+ * io.c (rb_io_s_read): close the IO if an exception is raised on
+ seeking. [ruby-core:27429]
- * signal.c (ruby_abort): fix typo in r39354 [Bug #5014]
+Fri Jan 8 13:12:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Mar 9 21:29:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (w_symbol): dump no encoding for 7bit only coderange
+ symbol. [ruby-core:27375]
- * signal.c (check_stack_overflow): extract duplicated code and get rid
- of declaration-after-statement. [Bug #5014]
+Thu Jan 7 07:56:09 2010 Ryan Davis <ryand-ruby@zenspider.com>
-Sat Mar 9 21:29:45 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/minitest/*.rb: Imported minitest 1.5.0 r5596.
+ * test/minitest/*.rb: ditto.
- * signal.c (sigsegv): avoid to use async signal unsafe functions
- when nested sigsegv is happen.
- [Bug #5014] [ruby-dev:44082]
+Tue Jan 5 19:30:53 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Sat Mar 9 21:25:45 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/ruby/test_exception.rb: add a test. cf [ruby-dev:39116]
- * file.c (rb_group_member): added an error check. SUS says,
- getgroups(small_value) may return EINVAL.
+Tue Jan 5 02:03:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Mar 9 21:23:36 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * configure.in (DTRACE): clear this when `dtrace -l` fails.
+ Note that current FreeBSD needs privilege to call it;
+ so to use DTrace on FreeBSD, you should run configure as root.
- * process.c (RB_MAX_GROUPS): moved to
- * internal.h (RB_MAX_GROUPS): here.
+Mon Jan 4 21:24:18 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * file.c (rb_group_member): use RB_MAX_GROUPS instead of
- RUBY_GROUP_MAX. They are the same.
+ * gc.c: added UNLIKELY to probes for optimization.
-Sat Mar 9 21:15:39 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * vm.c: ditto.
- * file.c (access_internal): removed.
- * file.c (rb_file_readable_real): use access() instead of
- access_internal().
- * file.c (rb_file_writable_real): ditto.
- * file.c (rb_file_executable_real): ditto.
+ * thread.c: ditto.
-Wed Mar 6 22:13:38 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Jan 4 09:30:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-merge revision(s) 39297: [Backport #8032]
+ * win32/Makefile.sub (TRACING_MODEL): follow yugui's previous changes.
- * tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
- before expanding rubyarchdir to remove prefix.
+Mon Jan 4 09:30:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Mar 5 01:20:39 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * thread_win32.c (InterlockedExchangePointer): old SDK support.
- * tool/merger.rb: add interaction when only ChangeLog is modified.
+Sun Jan 3 23:54:51 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Tue Mar 5 01:03:16 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * trace.h: new file. wraps tracing mechanisms.
- * file.c (rb_group_member): get rid of NGROUPS dependency.
- [Bug #7886] [ruby-core:52537]
+ * defs/dtrace.d: new file. defined a dtrace provider "ruby".
-Tue Mar 5 00:16:56 2013 Eric Hodel <drbrain@segment7.net>
+ * include/ruby/ruby.h (LIKELY): moved from vm.c.
+ (UNLIKELY): ditto.
+ (OBJSETUP): probe "object-create".
+ (RUBY_EVENT_RESCUE): new event.
- * ext/openssl/ossl.c (class OpenSSL): Use only inner parenthesis in
- create_extension examples.
+ * vm_exec.c (DEBUG_ENTER_INSN): embedded a probe insn-entry into it.
+ (DEBUG_END_INSN): insn-return.
-Tue Mar 5 00:16:56 2013 Eric Hodel <drbrain@segment7.net>
+ * vm.c (LIKELY): moved into ruby.h.
+ (UNLIKELY): ditto.
+ (Init_BareVM): embedded a probe "raise" into it.
- * ext/openssl/ossl.c (class OpenSSL): Fixed ExtensionFactory example.
- Patch by Richard Bradley. [ruby-trunk - Bug #7551]
+ * variable.c (rb_class2name_without_alloc): new utility function.
-Mon Mar 4 23:53:18 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * tool/rbinstall.rb (install?(:ext, :arch, :'ext-arch')): installs
+ dtrace.d if necessary.
- (merge r39291)
- * configure.in (opt-dir): remove debug print.
+ * thread_pthread.c (add_signal_thread_list): probe "raise".
+ (rb_thread_create_timer_thread): ditto.
-Mon Mar 4 23:42:34 2013 Zachary Scott <zachary@zacharyscott.net>
+ * thread.c (rb_thread_schedule_rec): probes "thread-enter" and
+ "thread-leave",
+ (thread_start_func_2): ditto.
+ (thread_cleanup_func): probe "thread-term"
- * ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
- [Github tenderlove/psych#127]
+ * lib/mkmf.rb: supports dtrace postprocessor on making an extension.
-Mon Mar 4 23:37:14 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * iseq.c (rb_vm_insn_name): new utility function.
+ (rb_vm_insn_len): ditto.
- * tool/mkconfig.rb: remove prefix from rubyarchdir.
- r39267 expands variables, it changes expansion timing,
- breaks RbConfig::CONFIG["includedir"] and building
- extension libraries with installed ruby.
+ * insns.def (hook): probes "method-entry", "method-return", "line",
+ and "rescue".
-Sun Mar 3 02:45:13 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+ * compile.c (iseq_compile_each): adds a trace op for "rescue" probe.
- * vm.c (ENV_IN_HEAP_P): fix off-by-one error.
+ * gc.c (garbage_collect): probes "gc-begin" and "gc-end".
+ (obj_free): probe "object-free"
+ (garbage_collect_with_gvl): probe "raise"
+ (negative_size_allocation_error): ditto.
+ (rb_memerror): ditto.
-Sun Mar 3 02:39:01 2013 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * eval.c (rb_rescue2): probe "rescue"
+ (rb_longjmp): probe "raise"
- * test/ruby/test_thread.rb: fixed typo
- patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248
+ * ext/probe/probe.c: new extension for application defined probes.
-Sun Mar 3 02:22:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/probe/extconf.rb: ditto.
- * class.c (include_modules_at): detect cyclic prepend with original
- method table. [ruby-core:52205] [Bug #7841]
+ * configure.in (--with-tracing-model): new option to choose a tracing
+ mechanism.
+ (DTRACE): new substitution. name of dtrace(1).
+ (RUBY_TRACING_MODEL): new substitution.
+ (DTRACE_OBJ): ditto.
+ (MINIDTRACE_OBJ): ditto.
+ (GOLFDTRACE_OBJ): ditto.
+ (LIBRUBY_DTRACE_OBJ): ditto.
+ (RUBY_DTRACE_POSTPROCESS): new macro. checks whether the dtrace on
+ the system needs postprocessing.
+ (RUBY_DTRACE_BSD_BROKEN): new macro. checks whether the dtrace
+ supports USDT.
-Sun Mar 3 02:16:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * Makefile.in:
+ (DTRACE): new variable. name of dtrace(1).
+ (TRACING_MODEL): new variable. name of the chosen tracing mechanism.
+ (DTRACE_OBJ): same as the one in configure.in.
+ (MINIDTRACE_OBJ): ditto.
+ (GOLFDTRACE_OBJ): ditto.
+ (LIBRUBY_DTRACE_OBJ): ditto.
+ (CPPOUTFILE): new substitution. necessary for generating dtrace.d
+ (trace_none.h): new target for TRACING_MODEL=none
+ (RUBY_H_INCLUDES): appended a header for tracing.
+ (distclean-local): also removes preprocessed version of dtrace.d
+ ($(LIBRUBY_A)): needs $(LIBRUBY_DTRACE_OBJ) if dtrace needs
+ postprocessing.
+ ($(PROGRAM)): ditto.
+ (golf): ditto.
+ (miniruby): ditto.
+ ($(arch_hdrdir)/ruby/dtrace.d): new target. preprocessed version
+ of defs/dtrace.d. generated if necessary.
+ ($(arch_hdrdir)/ruby/trace_dtrace.h): new target.
+ definition of probes.
+ ($(LIBRUBY_DTRACE_OBJ)): new target. generated if dtrace needs
+ postprocessing.
+ ($(DTRACE_OBJ)): ditto.
+ ($(MINIDTRACE_OBJ)): ditto.
+ ($(GOLFDTRACE_OBJ)): ditto.
- * vm_method.c: call method_removed hook on called class, not on
- prepending iclass. [ruby-core:52207] [Bug #7843]
+Sun Jan 3 15:34:19 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Sun Mar 3 01:57:50 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/text.rb: String no longer has #each.
+ Patch by Mitsutaka Mimura (takkanm). [ruby-dev:39949].
- * configure.in (warnflags): disable -Werror by default unless
- development. [ruby-core:52131] [Bug #7830]
+Sun Jan 3 01:29:18 2010 Tanaka Akira <akr@fsij.org>
-Wed Feb 27 00:20:43 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#inspect):
+ implemented.
- * test/ruby/test_process.rb (test_setsid): Added a workaround for
- MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]
+Sat Jan 2 15:57:54 2010 Tanaka Akira <akr@fsij.org>
-Sun Feb 24 15:16:00 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/resolv.rb (Resolv::DNS#initialize): new option :nameserver_port.
+ (Resolv::DNS#each_resource): pass port number.
+ (Resolv::DNS#make_requester): ditto.
+ (Resolv::DNS::Config#lazy_initialize): initialize @nameserver_port
+ instead of @nameserver.
+ (Resolv::DNS::Config#single?): return port number addition to the
+ nameserver.
+ (Resolv::DNS::Config#generate_timeouts): use @nameserver_port.
+ (Resolv::DNS::Config#resolv): yield port number.
- * lib/net/http.rb: Removed duplicate Accept-Encoding in Net::HTTP#get.
- [ruby-trunk - Bug #7924]
- * test/net/http/test_http.rb: Test for the above.
+Sat Jan 2 00:43:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Feb 20 14:23:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/uri/common.rb (initialize_regexp): allow leading
+ and trailing white space, and forbid extra characters
+ on another lines. [ruby-core:26223]
+ RFC 3986 Appendix C. Delimiting a URI in Context
+ draft-duerst-iri-bis-07 7.2. Web Address processing
- * thread.c: Grammar for #backtrace_locations and ::handle_interrupt
+Fri Jan 1 23:17:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Feb 22 11:10:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/uri/generic.rb (URI#normalize!): normalize case of
+ scheme. [ruby-core:27309]
- * enum.c (Enumerable#chunk: Improved examples, grammar, and formatting
- Patch by Dan Bernier and Rich Bruchal of newhaven.rb
- [Backport #7926]
+Fri Jan 1 00:47:57 2010 Akinori MUSHA <knu@iDaemons.org>
-Fri Feb 22 02:33:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * ext/digest/digest.c (rb_digest_instance_method_unimpl): Suppress
+ compiler warnings.
- * lib/abbrev.rb: Add words parameter to Abbrev::abbrev
- Patch by Devin Weaver [Backport #7927]
+Fri Jan 1 00:00:00 2010 Tanaka Akira <akr@fsij.org>
-Wed Feb 20 13:37:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * tool/mkconfig.rb: generate RbConfig.ruby in rbconfig.rb.
- * ext/pty/pty.c: Documentation for the PTY module [Backport #7928]
+ * lib/webrick/httpservlet/cgihandler.rb: use RbConfig.ruby.
-Wed Feb 20 12:18:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * test/ruby/envutil.rb: ditto.
- * object.c: Document Data class by Matthew Mongeau [Backport #7929]
+ * benchmark/report.rb: ditto.
-Wed Feb 20 11:50:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * benchmark/runc.rb: ditto.
- * lib/mutex_m.rb: Add rdoc for Mutex_m module [Backport #7930]
+ * tool/eval.rb: ditto.
-Tue Feb 19 12:30:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Dec 31 18:18:55 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * object.c: rdoc formatting for Kernel#Array() [Backport #7931]
- * array.c: Add rdoc for Array() method to Creating Arrays section
+ * ext/socket/rubysocket.h: include addrinfo.h only when using our own
+ getaddrinfo.c.
-Sat Feb 23 16:51:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Dec 31 14:20:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c: Documentation for Thread#backtrace_locations
- [Backport #7932]
+ * process.c (save_redirect_fd): consider EBADF that the fd is not used.
+ [ruby-dev:39938]
-Sat Feb 23 16:05:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Dec 31 06:03:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c: Typo in ObjectSpace::WeakMap overview [Backport #7933]
+ * ext/socket/raddrinfo.c (addrinfo_type): typed.
-Sat Feb 23 16:00:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * ext/socket/extconf.rb: fix for wide-getaddrinfo option.
- * thread.c: Improved rdoc for ::handle_interrupt, ::pending_interrupt?
- and #pending_interrupt? [Backport #7934]
+ * ext/socket/addrinfo.c: rename {addr,name}info functions to ensure
+ those are used on darwin.
-Sat Feb 23 14:19:51 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 31 03:27:53 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for
- rb_scan_args() optional hash feature. [Bug #7861]
+ * thread_win32.c (native_thread_destroy): decreased the probability of
+ using the interrupt event in the thread termination.
+ see [ruby-core:27199].
-Sat Feb 23 13:03:22 2013 Akinori MUSHA <knu@iDaemons.org>
+Thu Dec 31 02:35:57 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing
- parenthesis.
+ * thread_win32.c (w32_error): should report the function.
-Sat Feb 23 13:03:22 2013 Akinori MUSHA <knu@iDaemons.org>
+Thu Dec 31 01:58:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/ipaddr.rb (IPAddr#in6_addr): Fix the parser so that it can
- recognize IPv6 addresses with only one edge 16-bit piece
- compressed, like [::2:3:4:5:6:7:8] or [1:2:3:4:5:6:7::].
- [Bug #7477]
+ * ext/extmk.rb: fix for extstatic.
-Sat Feb 23 13:00:49 2013 Akinori MUSHA <knu@iDaemons.org>
+Wed Dec 30 19:43:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * configure.in (LIBRUBY_DLDFLAGS): Fix a bug where --with-opt-dir
- options given were not reflected to LIBRUBY_DLDFLAGS on many
- platforms including Linux and other GNU-based systems, NetBSD,
- AIX and BeOS.
+ * include/ruby/ruby.h (RREGEXP_SRC_END): added.
-Sat Feb 23 13:00:07 2013 Akinori MUSHA <knu@iDaemons.org>
+Wed Dec 30 19:40:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * configure.in: Fix a bug introduced in r38342 that the cflagspat
- substitution is messed up by the way CFLAGS and optflags are
- modified, which affected FreeBSD and NetBSD/amd64 when
- configured to use libexecinfo. This bug resulted in CFLAGS and
- CXXFLAGS in RbConfig::CONFIG having warnflags expanded in them,
- forcing third-party C/C++ extensions to follow what warnflags
- demands, like ANSI/ISO-C90 conformance. ref [Bug #7101]
+ * include/ruby/defines.h (INFINITY): this is float.
-Sat Feb 23 12:58:32 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/defines.h (NAN): ditto.
- * lib/mkmf.rb: remove extra topdir in VPATH, which was in
- win32/Makefile.sub for some reason and moved from there.
- [ruby-dev:46998] [Bug #7864]
+ * numeric.c (rb_infinity): change content as float.
-Tue Feb 23 12:07:00 2013 Kenta MURATA <mrkn@mrkn.jp>
+ * numeric.c (rb_nan): ditto.
- * backport r39321 from trunk. [ruby-core:51777] [Bug #7761]
+Wed Dec 30 17:59:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.gemspec: bump to 1.2.0.
- [ruby-core:51777] [Bug #7761]
+ * gem_prelude.rb (push_all_highest_version_gems_on_load_path):
+ simplified.
-Sat Feb 23 08:57:46 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * lib/rubygems/command_manager.rb (Gem#load_and_instantiate):
+ rescue only NameError from const_get.
- * backport r39410 from trunk
+ * lib/rubygems/source_index.rb (Gem#load_specification): don't use
+ RUBY_VERSION to branch.
- * doc/NEWS-*: Update NEWS from their respective branches
+ * lib/rubygems/validator.rb (Gem::TestRunner, Gem#alien): ditto.
-Sat Feb 23 08:14:43 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * lib/rubygems.rb: Kernel#gem is already defined, and workaround
+ for home directory and custom_require are no longer needed.
- * backport r39400-r39407 from trunk.
+Tue Dec 29 16:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * NEWS: many additions
+ * numeric.c (Init_Numeric): Add Float::INFINITY and Float::NAN.
+ [ruby-dev:1657] [ruby-dev:4760] [ruby-list:7023]
+ [ruby-list:46690]
+ [ruby-core:26632] [ruby-talk:41352] [ruby-talk:203333]
- * object.c: Add doc for Module.prepended
+ * include/ruby/defines.h (INFINITY): defined.
-Sat Feb 23 06:07:04 2013 Eric Hodel <drbrain@segment7.net>
+ * include/ruby/defines.h (NAN): defined.
- * lib/rubygems/installer.rb (build_extensions): Create extension
- install destination before building extension. Patch by Kenta Murata.
- [ruby-trunk - Bug #7897]
- * test/rubygems/test_gem_installer.rb: Test for the above.
+ * include/ruby/util.h (ruby_div0): removed.
-Sat Feb 23 04:34:44 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * numeric.c (fix_pow): use INFINITY and NAN
+ instead of ruby_div0(1.0).
- * NEWS: pending_interrupt? is both instance and singleton method
+ * marshal.c (r_object0): ditto.
-Sat Feb 23 02:49:10 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * bignum.c (big_fdiv): ditto.
- * NEWS: Add Thread#pending_interrupt? and Thread.handle_interrupt
+Tue Dec 29 10:36:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Feb 22 19:22:05 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::STANDALONE):
+ any number spaces can be placed between equal-sign and the value.
+ patch from Ed Howland in [ruby-core:27345].
- * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
- new attribute to read/write entity expansion text limit. the default
- limit is 10Kb.
+Mon Dec 28 22:33:58 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.
+ * win32/win32.c (CreateChild): force to inherit standard I/O handles.
+ this change fixes [ruby-core:27273], but other side effects might
+ exist.
-Thu Feb 21 05:03:38 2013 Eric Hodel <drbrain@segment7.net>
+Mon Dec 28 22:00:10 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * lib/rubygems/commands/update_command.rb: Create the installer after
- options are processed. [ruby-trunk - Bug #7779]
- * test/rubygems/test_gem_commands_update_command.rb: Test for the
- above.
+ * test/ruby/test_marshal.rb: added tests for taintness/untrustness
+ propagation.
-Thu Feb 21 04:54:14 2013 Eric Hodel <drbrain@segment7.net>
+Mon Dec 28 18:13:26 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/rubygems/installer.rb: Use gsub instead of gsub! to avoid
- altering @bin_dir. Fixes tests on windows. [ruby-trunk - Bug #7885]
+ * sample/occur2.rb: reimplemented in modern style. [ruby-dev:39927].
-Thu Feb 21 03:16:37 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Mon Dec 28 17:19:37 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * NEWS: Floats are frozen too
+ * tool/install-sh: correction by Hiro Asari.
+ https://gist.github.com/264558/58ad1cae45cde49600bbb39286af2aae23e639d5
-Thu Feb 21 03:10:53 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Mon Dec 28 13:18:52 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * NEWS: Add that Fixnums and Bignums are frozen
+ * tool/install-sh: wrote the intention. [ruby-dev:39928]
-Wed Feb 20 17:02:12 2013 Koichi Sasada <ko1@atdot.net>
+Sun Dec 27 10:45:00 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * vm_eval.c (vm_call0_body): check interrupts after method dispatch
- from C methods. [Bug #7878]
+ * ext/win32ole/win32ole.c (foleparam_initialize): add foleparam_initialize
+ to check argument of WIN32OLE_PARAM.new
-Wed Feb 20 08:05:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/win32ole/test_win32ole_param.rb (test_s_new): add some assertion
+ to test WIN32OLE_PARAM.new
- * compar.c (rb_invcmp): compare by inversed comparison, with preventing
- from infinite recursion. [ruby-core:52305] [Bug #7870]
+Sun Dec 27 09:41:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite
- recursion.
+ * tool/rbinstall.rb (install?(:local, :comm, :bin, :'bin-comm')):
+ Makes it vim friendly. __END__ in a heredoc is confusing with
+ the script end for vim.
-Tue Feb 19 15:49:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Dec 27 09:13:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * configure.in (unexpand_shvar): regularize a shell variable by
- unexpanding shell variables in it.
+ * sample/occur2.rb: have been broken. fixed for Ruby 1.9 feature.
- * configure.in (shvar_to_cpp): do not substitute exec_prefix itself
- with RUBY_EXEC_PREFIX, which cause recursive definition.
- [ruby-core:52296] [Bug #7860]
+Thu Dec 24 16:32:30 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * configure.in: unexpand arch sitearch and exec_prefix values, so
- directly specified bindir, libdir, rubyprefix, etc can be properly
- substituted. [ruby-core:52296] [Bug #7860]
+ * lib/uri/generic.rb (eql?): Check the class of the compared object.
+ Based on a patch by Peter McLain [ruby-core:27019]
-Tue Feb 19 14:08:46 2013 Eric Hodel <drbrain@segment7.net>
+Thu Dec 24 15:20:03 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * backport r39307 from trunk. [Bug #7880]
+ * regexec.c (match_at): follow enclen's change.
- * lib/rubygems/installer.rb: Fixed placement of executables with
- --user-install. [ruby-trunk - Bug #7779]
+Thu Dec 24 12:08:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * test/rubygems/test_gem_installer.rb: Test for above.
+ * lib/delegate.rb (marshal_dump/load): dump & load instance variables
+ by default [ruby-core:24211]
-Tue Feb 19 13:57:26 2013 Eric Hodel <drbrain@segment7.net>
+Thu Dec 24 10:31:50 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * backport r39247 from trunk. [Bug #7853]
+ * lib/object.c (rb_obj_cmp): Default <=> operator returns 0 if
+ objects are == [ruby-core:24063]
- * lib/rdoc.rb: Update to release version of 4.0.0
+Wed Dec 23 09:12:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems.rb: Update to release version of 2.0.0
+ * test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
+ always must be binary mode. c.f. Bug#2341
-Tue Feb 19 12:25:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 10 09:20:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * win32/Makefile.sub (config.status): site and vendor directories
- should use sitearch, not arch. [ruby-dev:46964] [Bug #7823]
+ * encoding.c (Init_Encoding): undef Encoding.new because
+ a class which is rb_undef_alloc-func-ed can't call new method.
+ [ruby-dev:39862]
-Tue Feb 19 07:51:01 2013 Koichi Sasada <ko1@atdot.net>
+ * vm.c (Init_VM): undef RubyVM.new and RubyVM::Env.new.
- * backport r39275 from trunk. [ruby-dev:46994] [Bug #7774]
+Mon Dec 21 17:51:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * proc.c (rb_binding_new_with_cfp): create binding object even if
- the frame is IFUNC. But return a ruby-level binding to keep
- compatibility.
- This patch fix degradation introduced from r39067.
- [Bug #7774] [ruby-dev:46960]
+ * regcomp.c (optimize_node_left): include equal on the condition of for-loop.
+ This bug also affects original Oniguruma. [ruby-core:27247]
- * test/ruby/test_settracefunc.rb: add a test.
+Mon Dec 21 10:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Feb 16 20:43:43 2013 Koichi Sasada <ko1@atdot.net>
+ * regcomp.c (print_enc_string): follow enclen's change.
- * backport r39276 from trunk. [ruby-dev:46997] [Bug #7825]
+ * regcomp.c (onig_print_compiled_byte_code): ditto.
- * vm.c (rb_thread_mark): mark a working Proc of bmethod
- (a method defined by define_method) even if the method was removed.
- We could not trace working Proc object which represents the body
- of bmethod if the method was removed (alias/undef/overridden).
- Simply, it was mark miss.
- This patch by Kazuki Tsujimoto. [Bug #7825]
+ * regcomp.c (onig_print_compiled_byte_code): change prototype.
- NOTE: We can brush up this marking because we do not need to mark
- `me' on each living control frame. We need to mark `me's
- only if `me' was free'ed. This is future work after Ruby 2.0.0.
+ * regint.c (onig_print_compiled_byte_code): comment out.
- * test/ruby/test_method.rb: add a test.
+Mon Dec 21 08:04:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Fri Feb 15 00:49:32 2013 Eric Hodel <drbrain@segment7.net>
+ * object.c: BasicObject#initialize accepts any number of arguments
+ [ruby-core:27080]
- * lib/net/http.rb: Removed OpenSSL dependency from Net::HTTP.
+Mon Dec 21 02:45:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * test/net/http/test_http.rb: Remove Zlib dependency from tests.
- * test/net/http/test_http_request.rb: ditto.
+ * vm_eval.c (rb_iterate): remove SEGV (retry).
-Fri Feb 15 00:49:32 2013 Eric Hodel <drbrain@segment7.net>
+Sun Dec 20 23:18:23 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/net/http: Do not handle Content-Encoding when the user sets
- Accept-Encoding. This allows users to handle Content-Encoding for
- themselves. This restores backwards-compatibility with Ruby 1.x.
- [ruby-trunk - Bug #7831]
- * lib/net/http/generic_request.rb: ditto.
- * lib/net/http/response.rb: ditto
- * test/net/http/test_http.rb: Test for the above.
- * test/net/http/test_http_request.rb: ditto.
- * test/net/http/test_httpresponse.rb: ditto.
+ * vm_eval.c (rb_iterate): remove SEGV (use the original patch).
+ [ruby-dev:39874]
-Thu Feb 14 13:17:10 2013 Zachary Scott <zachary@zacharyscott.net>
+Sun Dec 20 21:26:05 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * Backport r39168 Warning about TracePoint events to 2.0.0
- [ruby-core:52073] [Bug #7815]
+ * vm_eval.c (rb_iterate): pass current block when the argument bl_proc
+ is NULL. This behavior can be used to make enumerator faster
+ [ruby-dev:39874]
- * vm_trace.c: note about TracePoint events set
+ * enumerator.c (enumerator_each): pass current block directly instead
+ of trampoline block (enumerator_each_i).
-Thu Feb 14 07:04:13 2013 Eric Hodel <drbrain@segment7.net>
+ * io.c (argf_each_line, argf_each_byte, argf_each_char): ditto.
- * Backport r39213 from trunk [ruby-trunk - Bug #7383]
+Sat Dec 19 14:59:30 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rubygems.rb: Return BINARY strings from Gem.gzip and Gem.gunzip.
- Fixes intermittent test failures. RubyGems issue #450 by Jeremey
- Kemper.
- * test/rubygems/test_gem.rb: Test for the above.
+ * gem_prelude.rb (Kernel#gem): should make gem private. a patch
+ from Sho Hashimoto in [ruby-dev:39838].
-Thu Feb 14 07:01:12 2013 Eric Hodel <drbrain@segment7.net>
+Sat Dec 19 14:57:17 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * Backport part of r39166 from trunk [ruby-trunk - Bug #7809]
+ * lib/webrick/config.rb (WEBrick::Config): typo fixed. a patch
+ from Sho Hashimoto in [ruby-dev:39835].
- * lib/rubygems/package.rb: Include checksums.yaml.gz signatures for
- verification.
- * test/rubygems/test_gem_package.rb: Test for the above.
+Sat Dec 19 11:06:48 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Wed Feb 13 15:34:21 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/matrix.rb (each2,collect2,map2): Fix enumerator
+ [ruby-core:27225]
- * ext/json: merge JSON 1.7.7.
- This includes security fix. [CVE-2013-0269]
- https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
- https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
+Sat Dec 19 09:58:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 9 21:13:35 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+ * vm_eval.c (check_funcall): reset method_missing_reason before
+ trying the call. based on a patch from Yehuda Katz in
+ [ruby-core:27219].
- * backport r39167 from trunk. [ruby-core:52059] [Bug #7812]
+Sat Dec 19 09:29:22 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * BSDL: update copyright notice for 2013.
+ * lib/set.rb: Add checks that passed argument is Enumerable.
+ [ruby-core:23844]
-Fri Feb 8 19:56:54 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Dec 16 20:28:46 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * array.c (rb_ary_dup): reverted r39004. see [Bug #7768], and
- release manager finally decided to revert it.
+ * test/ruby/envutil.rb: fix a typo in assert message.
-Fri Feb 8 16:09:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 16 16:57:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_ensure): preserve errinfo across ensure proc before
- JUMP_TAG(). [ruby-core:52022] [Bug #7802]
+ * lib/un.rb (httpd): try to convert port number to integer.
-Fri Feb 8 16:08:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 16 11:18:30 2009 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/ruby/envutil.rb (assert_separately): check also terminating
- signal not only if core dumped.
+ * configure.in(MINIRUBY): use "$BASERUBY" as a default ruby executable
+ name.
-Fri Feb 8 13:12:04 2013 Eric Hodel <drbrain@segment7.net>
+Wed Dec 16 00:53:14 2009 Tanaka Akira <akr@fsij.org>
- * lib/rdoc/generator/darkfish.rb: Set encoding on output template to
- user-specified encoding.
- * test/rdoc/test_rdoc_generator_darkfish.rb: Test for above.
+ * lib/find.rb (Find.find): rescue more exceptions which is possible to
+ occur by other process change the directory tree.
- * lib/rdoc.rb: Bump version
+Tue Dec 15 09:06:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Feb 8 11:53:33 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/find.rb (Find.find): get rid of race condition.
- * lib/rubygems/security/policy.rb: Raise proper exceptions when
- verifying unsigned gems (instead of crashing).
- * test/rubygems/test_gem_security_policy.rb: Tests for the above.
+Mon Dec 14 22:33:21 2009 Tanaka Akira <akr@fsij.org>
-Fri Feb 8 10:44:44 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/find.rb (Find.find): rescue only ENOENT and EACCES for lstat.
- * test/rubygems/test_gem_dependency_installer.rb: Improve coverage of
- --install-dir feature of gem install.
+Mon Dec 14 21:49:30 2009 Tanaka Akira <akr@fsij.org>
-Fri Feb 8 10:11:09 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/find.rb (Find.find): narrow rescue region.
- * lib/rubygems/config_file.rb: Add missing require for
- user_interaction.rb
+Mon Dec 14 09:20:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/dependency_installer.rb: Minor refactor for clarity.
+ * lib/find.rb (Find.find): removed already unnecessary code.
-Fri Feb 8 09:35:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Dec 13 23:48:25 2009 Tanaka Akira <akr@fsij.org>
- * lib/mkmf.rb (MakeMakefile#configuration): set all ruby names.
- hdrdir now needs RUBY_VERSION_NAME.
+ * lib/find.rb (Find.find): sort directory entries. [ruby-dev:39847]
-Fri Feb 8 08:58:26 2013 Eric Hodel <drbrain@segment7.net>
+Sun Dec 13 20:55:30 2009 Tanaka Akira <akr@fsij.org>
- * lib/rubygems/package/old.rb: Fix loading old format gems on ruby
- 1.8. This commit is only so trunk and rubygems master have the same
- code.
+ * test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
+ reject non-string.
-Fri Feb 8 08:53:27 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Dec 13 20:26:57 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotation
- when dumping Ruby strings. Thanks Ingy
+ * ruby.c (rb_parser_dump_tree): add prototype.
- * test/psych/test_psych.rb: appropriate tests.
+Thu Dec 10 20:55:55 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
- * test/psych/test_yaml.rb: ditto
+ * transcode_data.h, transcode.c, tool/transcode-tblgen.rb: Added
+ support for new transcoding instruction FUNsio (with Tatsuya Mizuno)
-Fri Feb 8 08:50:42 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+ * enc/trans/gb18030.trans: Significantly reduced GB18030 conversion
+ table footprint using FUNsio and differences (with Tatsuya Mizuno)
- * ext/psych/lib/psych/visitors/yaml_tree.rb: change output reference
- ids to be sequential numbers.
+ * test/ruby/test_transcode.rb: Minor name fix (from Tatsuya Mizuno)
-Fri Feb 8 07:47:56 2013 Eric Hodel <drbrain@segment7.net>
+Thu Dec 10 17:22:36 2009 Shugo Maeda <shugo@ruby-lang.org>
- * lib/rubygems/package/old.rb: Disallow installation of old-format
- gems when a security policy is active.
- * test/rubygems/test_gem_package_old.rb: Test for above.
+ * vm_eval.c (yield_under): yields self the same as 1.8.
-Fri Feb 8 07:34:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Dec 10 15:49:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/http.rb (HTTP.post_form): Fix module scope in documentation
- Patch by David Albert [Bug #7794] [ruby-core:51955]
+ * thread_pthread.c (native_mutex_reinitialize_atfork): release and
+ re-acquire the lock at re-initialization.
-Fri Feb 8 07:33:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Dec 10 12:56:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * compar.c (cmp_equal): Document ignored exception and return false
- By Makoto Kishimoto [Bug #7790] [ruby-dev:46925] [ruby-dev:46910]
+ * encoding.c (enc_replicate): add Encoding#replicate(name).
-Fri Feb 8 07:17:00 2013 Eric Hodel <drbrain@segment7.net>
+ * encoding.c (enc_replicate_with_index): renamed from old
+ enc_replicate.
- * lib/rubygems/dependency_installer.rb: Only install local gems if
- they end in '.gem'. Fixes github rubygems issue #407.
- * test/rubygems/test_gem_dependency_installer.rb: Test for the above.
+ * encoding.c (rb_enc_from_encoding_index): split from
+ rb_enc_from_encoding.
-Fri Feb 8 00:02:48 2013 Tanaka Akira <akr@fsij.org>
+Thu Dec 10 09:15:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * process.c (obj2gid): use getgrnam_r() only if getgrnam_r() and
- _SC_GETGR_R_SIZE_MAX is available.
- MirOS BSD (MirBSD 10 GENERIC#1382 i386) have getgrnam_r() but
- no _SC_GETGR_R_SIZE_MAX.
- (obj2uid): use getpwnam_r() only if getpwnam_r() and
- _SC_GETPW_R_SIZE_MAX is available.
- This is consistency for obj2gid.
- MirOS BSD have neither getpwnam_r() nor _SC_GETPW_R_SIZE_MAX.
+ * string.c (rb_str_inspect): CHAR_ESC_LEN should be 13.
-Thu Feb 7 22:01:18 2013 Tanaka Akira <akr@fsij.org>
+Thu Dec 10 01:12:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: define linker for shared library on MirOS BSD.
+ * parse.y (dyna_pop_gen): pop dvars. [ruby-dev:39861]
-Thu Feb 7 21:09:23 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Dec 10 00:46:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rubygems/test_gem_config_file.rb
- (TestGemConfigFile#test_check_credentials_permissions): skip on
- Windows. see [Bug #7784] [ruby-core:51864] and r39070.
+ * node.c (dump_node): fixed for long members.
-Thu Feb 7 20:52:40 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Dec 9 22:57:04 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * win32/Makefile.sub (config.status): added variables which were
- missing at r39130.
+ * node.c: node management added. Currently, only pretty-dumper is
+ implemented. [ruby-dev:39853]
-Thu Feb 7 15:33:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c: --dump=parsetree and --dump=parsetree_with_comment options
+ added. This is just for debug or research purpose. Note that the
+ compatibility of these options are not supported at all.
- * lib/mkmf.rb (MakeMakefile#merge_libs): insert following reversal
- ordered elements just after the duplicated element, not overwriting
- successive elements. [ruby-core:50314] [Bug #7467]
+Wed Dec 9 09:50:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Feb 7 14:56:15 2013 Eric Hodel <drbrain@segment7.net>
+ * string.c (rb_str_justify): fixed the case a fill size is a
+ multiple of the length of the padding. [ruby-dev:39856]
- * lib/rubygems/package.rb: Ensure digests are generated for signing.
- * test/rubygems/test_gem_package.rb: Test for the above.
+Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rubygems/security/policy.rb: Ensure digests are present when
- verifying a gem and match the number of signatures bidirectionally.
- * test/rubygems/test_gem_security_policy.rb: Test for the above.
+ * win32/configure.bat: now recognize --with-*-{dir,include,lib} options
+ and pass them to mkmf.
- * lib/rubygems.rb: Documentation improvements (by zzak)
+ * win32/configure.bat: general conversion from ``/'' to ``\'' of
+ configure_args is not necessary any longer.
-Thu Feb 7 05:52:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * win32/setup.mak: BASERUBY is used as command, so always need to
+ convert ``/'' to ``\'' within it.
- * doc/pty/README: Remove static documentation file
- * ext/pty/pty.c: Add License to PTY module overview
+Tue Dec 8 23:39:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Feb 7 02:31:10 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * numeric.c (flo_eq): suppress a warning on VC++ for x64.
- * vm_insnhelper.c: attr_writer should return its argument [Bug #7773]
+Tue Dec 8 16:19:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_basicinstructions.rb: Test for above
+ * lib/rubygems: update to 1.3.5.
-Thu Feb 7 01:35:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * lib/rubygems/defaults.rb (Gem::default_dir): removed a clause
+ doing nothing.
- * doc/security.rdoc: Link to japanese version of CVE page patch by
- nagachika
+Tue Dec 8 03:50:24 2009 Tanaka Akira <akr@fsij.org>
-Wed Feb 6 23:30:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * file.c (rb_f_test): use string form in unknown command error
+ message.
- * doc/pty/README.expect: Removed static documentation file
- * ext/pty/lib/expect.rb: Documentation for IO#expect
+Mon Dec 7 14:11:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Feb 6 22:25:00 2013 Charlie Somerville <charlie@charliesomerville.com>
+ * marshal.c (w_object): reverted r26007. [ruby-dev:39845]
- * hash.c (env_reject_bang): hide keys array from ObjectSpace
- * hash.c (env_select_bang): ditto
+ * test/test_delegate.rb (test_marshal): moved from test_marshal.rb.
-Wed Feb 6 17:33:01 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 7 13:05:59 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * configure.in (multiarch): add option to move architecture dependent
- directories. [Feature #6111]
+ * string.c (rb_str_justify): CVE-2009-4124.
+ Fixes a bug reported by
+ Emmanouel Kellinis <Emmanouel.Kellinis AT kpmg.co.uk>, KPMG London;
+ Patch by nobu.
- * template/ruby.pc.in: add arch dependent paths.
+Sun Dec 6 23:50:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
- options to customize architecture dependent header directories.
+ * strftime.c: %l should be 1..12 instead of 0..12 [ruby-core:27072]
- * configure.in (rubyarchprefix, sitearchdir, vendorarchdir): add
- options to customize architecture dependent library directories.
+Sun Dec 6 23:16:35 2009 Tanaka Akira <akr@fsij.org>
- * template/ruby.pc.in, tool/mkconfig.rb, tool/rbinstall.rb: use
- configured values.
+ * lib/find.rb (Find.find): reduce stat system call.
- * tool/mkconfig.rb: expand rubyarchdir to extract prefix.
+Sun Dec 6 16:02:15 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * configure.in (RUBY_VERSION_NAME), template/ruby.pc.in: add
- substitution and define.
+ * lib/webrick/httpservlet/filehandler.rb: escape filename of index.
+ [ruby-dev:37768]
- * configure.in, version.c: parametric architecture name for paths.
+Sun Dec 6 00:35:16 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
- * configure.in (shvar_to_cpp): convert sh variable references
- by replacing with string literal forms in cpp.
+ * symbian/setup (config.h): EXECUTABLE_EXTS moved from
+ dln.c:dln_find_1().
-Wed Feb 6 17:05:26 2013 Eric Hodel <drbrain@segment7.net>
+Sat Dec 5 15:35:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc: Import RDoc 4.0.0.rc.2
+ * marshal.c (w_object): dump instance variables when using
+ marshal_dump. [ruby-core:24211]
-Mon Feb 4 02:22:49 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * variable.c (rb_ivar_count): added.
- * test/ruby/test_process.rb (test_setsid): ensure to call
- Process.wait(). Reported by George Koehler. Thanks.
+Sat Dec 5 13:19:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Feb 4 02:18:00 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * configure.in: default ac_cv_prog_CC to CC.
- * test/ruby/test_process.rb (test_setsid): skip when platform is
- OpenBSD. Contributed from George Koehler.
- [Bug #7789] [ruby-core:51889]
+Sat Dec 5 10:18:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Feb 6 13:35:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/extend-command.rb (def_extend_command): fixed argument
+ number for negative arity.
- * proc.c (rb_method_entry_location, rb_{mod,obj}_method_location): new
- functions to obtain source location of method definition.
+Fri Dec 4 16:50:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (rb_obj_respond_to): show the location of old style
- respond_to? method.
+ * parse.y (k_def): adjust the location of method definition to the
+ line of def. [Bug #2427]
-Wed Feb 6 13:03:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Dec 4 19:05:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * doc/security.rdoc: Add link to CVEs on ruby-lang.org/en/security
+ * insns.def (defined): should respect #respond_to_missing? as
+ #respond_to? does.
-Wed Feb 6 12:49:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Dec 4 15:50:18 2009 Shugo Maeda <shugo@ruby-lang.org>
- * NEWS: Add note about removal of CSV::load and CSV::dump from r39077
+ * vm_eval.c (yield_under): does not yield self, and passes blockptr
+ instead of &block to vm_cref_push(). [ruby-dev:39833]
-Wed Feb 6 05:57:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Dec 4 15:15:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/racc/parser.rb: Hide copyright notice from Racc doc
+ * time.c (num_exact): should not accept strings as operands, even
+ though they respond to #to_r. ideally, strict rational
+ conversion should be done by a method like #to_rational, not #to_r.
+ [ruby-core:23729]
-Wed Feb 6 05:50:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Dec 4 13:10:23 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * doc/rubygems/*: Removed outdated documentation files
- * lib/rubygems/LICENSE.txt: Include license file
- * lib/rubygems.rb: Move Gem module documentation so rdoc can parse it
- and link to LICENSE.txt
- * lib/rubygems/*: Hide useless documentation from Gem module rdoc
+ * ext/stringio/stringio.c (ungetc): RDoc updated. trunk allows
+ pushing back behind the beginning of the pseudo stream.
-Wed Feb 6 03:45:19 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Dec 4 03:10:38 2009 Shugo Maeda <shugo@ruby-lang.org>
- * doc/security.rdoc: Remove documentation for unsafe CSV.load which
- was deleted in r39077
+ * compile.c (compile_cpath, iseq_compile_each): reverted
+ constant/class variable lookup in instance_eval etc. to the
+ behavior of 1.8.
-Wed Feb 6 03:27:19 2013 James Edward Gray II <james@graysoftinc.com>
+ * eval.c (rb_mod_nesting): ditto.
- * lib/csv.rb: Remove the dangerous serialization feature.
+ * insns.def (putspecialobject, defineclass): ditto.
-Wed Feb 6 00:56:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * node.h (NODE_FL_CREF_PUSHED_BY_EVAL): ditto.
- * lib/irb.rb: Remove example from restrictions, it works [Github #246]
- Based on patch by Ryunosuke SATO
+ * vm_core.h (VM_SPECIAL_OBJECT_CONST_BASE): ditto.
-Wed Feb 6 00:46:53 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+ * vm_eval.c (yield_under, eval_under): ditto.
- * vm.c (rb_vm_stack_to_heap): call rb_vm_get_binding_creatable_next_cfp
- instead of rb_vm_get_ruby_level_next_cfp to prevent a segfault by
- calling Kernel#callcc. See r39067 for more details.
- [ruby-dev:46908] [ruby-trunk - Bug #7774]
+ * vm_insnhelper.c (vm_cref_push, vm_get_const_base,
+ vm_get_ev_const, vm_get_cvar_base): ditto.
- * test/ruby/test_settracefunc.rb: add a test.
+Thu Dec 3 20:27:27 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Tue Feb 5 18:48:00 2013 Charlie Somerville <charlie@charliesomerville.com>
+ * enc/trans/gb18030-tbl.rb: Fix omission of C1 region in code table
+ (from Tatsuya Mizuno)
- * doc/security.rdoc: add regex, eval and drb sections
+ * test/ruby/test_transcode.rb: Added test for converting full range of
+ Unicode codepoints from/to GB18030 (from Tatsuya Mizuno)
-Tue Feb 5 17:24:02 2013 Eric Hodel <drbrain@segment7.net>
+Wed Dec 2 23:51:28 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * lib/rdoc/servlet.rb: Fixed root search paths, filesystem paths
- instead of HTTP paths were returned.
- * test/rdoc/test_rdoc_servlet.rb: Test for above.
+ * ext/openssl/ossl_ssl.c: initialize @hostname of SSLSocket to avoid
+ warning at SSLSocket#connect.
-Tue Feb 5 16:37:00 2013 Eric Hodel <drbrain@segment7.net>
+Tue Dec 1 18:01:43 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * lib/rubygems/config_file.rb: Ignore permissions check on windows.
- Windows writes 0600 file as 0644 permissions making the check
- useless.
+ * test/digest/test_digest_extend.rb: added tests for digest framework.
-Tue Feb 5 16:25:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Dec 1 12:01:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (rb_obj_respond_to): drop optional include_all flag if
- respond_to? method is defined in old style. [Bug #7722]
+ * parse.y (dyna_push_gen, dyna_pop_gen): no needs to save both of
+ args and vars. [ruby-core:26961]
-Tue Feb 05 15:04:34 2013 Koichi Sasada <ko1@atdot.net>
+ * parse.y (dyna_push_gen): use rb_node_newnode() for ripper.
+ [ruby-core:26961]
- * proc.c (rb_binding_new_with_cfp): permit to create binding object
- of IFUNC frame.
- When `rb_binding_new_with_cfp()' is called, VM finds out the first
- normal (has iseq) frame and create a binding object of this frame
- and create Env objects. `ep's of related frames are updated
- (`ep's point Env object managed spaces).
- However, `ep' of skipped IFUNC frame was not updated and
- old invalid `ep' was remained. It causes serious problems.
- To solve this issue, permit IFUNC to create binding.
- (Maybe there is no problem on it)
- [ruby-dev:46908] [ruby-trunk - Bug #7774]
+ * parse.y (dyna_push_gen, dyna_pop_gen): adjust local vtable level
+ for the case of syntax errors in method name or argument inside
+ do block. [ruby-core:26961]
- * test/ruby/test_settracefunc.rb: add a test.
+Mon Nov 30 16:57:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (rb_vm_get_binding_creatable_next_cfp), vm_core.h: added.
+ * ext/extmk.rb (command_output): $makeflags are already quoted.
- * vm_trace.c: fix to use `rb_vm_get_binding_creatable_next_cfp()'.
+Mon Nov 30 16:54:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Feb 5 14:43:15 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * configure.in, win32/Makefile.sub (EXECUTABLE_EXTS): moved from
+ dln.c:dln_find_1().
- * lib/matrix.rb: Fix error message, patch by pypypy [Bug #7777]
+ * lib/mkmf.rb (def find_executable0): use EXECUTABLE_EXTS, not
+ only EXEEXT. [ruby-core:26821]
-Tue Feb 5 14:36:04 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Mon Nov 30 11:00:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * numeric.c (fix_pow): Handle special cases when base is 0, -1 or +1
- [Bug #5713] [Bug #5715]
+ * parse.y (parser_yylex): suppress an extra error message after
+ numeric literal without digits. based on a patch from ujihisa .
+ in [ruby-dev:39811]. [ruby-dev:39798]
- * rational.c (nurat_expt): ditto
+Sun Nov 29 16:56:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Feb 5 13:27:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_eval.c (check_funcall_failed): pass ID. [ruby-core:26934]
- * ext/io/console/console.c (rawmode_opt): use default values by `stty
- raw`.
+Sun Nov 29 06:37:53 2009 Aaron Patterson <tenderlove@ruby-lang.org>
-Tue Feb 5 12:50:47 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * lib/rexml/formatters/default.rb (write_attribute): fix an
+ exception when printing a document when duplicate namespaced
+ attributes exist. Thanks, Alexey Froloff [ruby-core:26837]
- * range.c: Use div instead of / for bsearch
+Sat Nov 28 09:05:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_range.rb: Test showing bug when requiring mathn
+ * vm_eval.c (check_funcall_failed): should rescue user raised
+ NoMethodError. rescue all NoMethodError if receiver does not
+ respond to the method name. [ruby-dev:39796]
-Tue Feb 5 12:48:38 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Nov 26 21:14:30 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * enumerator.c: Use to_enum for Enumerable methods returning
- Enumerators.
- This makes Lazy#cycle no longer needed, so it was removed.
- Make Enumerator#chunk and slice_before return lazy Enumerators.
- [Bug #7715]
+ * test/ruby/test_complex.rb (@unify): fix the detection if math
+ loaded. This makes test_complex.rb work fine with the previous
+ commit.
- * internal.h: Remove ref to rb_enum_cycle_size; no longer needed
+ * test/ruby/test_rational.rb (@unify): ditto.
- * enum.c: Make enum_cycle_size static.
+Thu Nov 26 21:13:36 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * test/ruby/test_lazy_enumerator.rb: Test for above
+ * test/test_mathn.rb (TestMathn): new test case.
+ test for r25067.
-Tue Feb 5 12:48:10 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Nov 26 21:11:23 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * enumerator.c: Finalize and document Lazy.new. [Bug #7248]
- Add Lazy#to_enum and simplify Lazy#size.
+ * test/openssl/test_config.rb (OpenSSL::TestConfig): new test case.
+ test for r25017.
- * test/ruby/test_lazy_enumerator.rb: tests for above
+Thu Nov 26 21:08:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Tue Feb 5 11:35:35 2013 Eric Hodel <drbrain@segment7.net>
+ * test/ruby/test_range.rb (TestRange#test_comparison_when_recursive):
+ test for r25010.
- * lib/rubygems/commands/push_command.rb: Fixed credential download for
- `gem push --host`
- * lib/rubygems/gemcutter_utilities.rb: ditto.
- * test/rubygems/test_gem_commands_push_command.rb: Test for the above.
- * test/rubygems/test_gem_gemcutter_utilities.rb: ditto.
+ * test/ruby/test_struct.rb (TestStruct#test_comparison_when_recursive):
+ ditto.
- * lib/rubygems/config_file.rb: Abort if the `gem push` credentials
- file has insecure permissions.
- * test/rubygems/test_gem_config_file.rb: Test for the above.
+Thu Nov 26 20:18:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rubygems/ext/builder.rb: Do not look for Gemfile, Isolate, etc.
- while building gem extensions.
+ * gem_prelude.rb (Gem.set_home): must dup before force_encoding
+ and must force_encoding before gsub.
+ cf. Yen Sign problem of SJIS [ruby-core:26910]
- * lib/rubygems/package.rb: Unset spec and files list if a gem's
- signatures cannot be verified.
- * test/rubygems/test_gem_package.rb: Test for the above.
+Thu Nov 26 17:54:37 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rubygems/specification.rb: Reduce use of eval.
- * lib/rubygems/test_case.rb: ditto.
+ * win32/{configure.bat, setup.mak, Makefile.sub}: add new configure
+ option ``--with-ntver''.
- * test/rubygems/test_gem_specification.rb: Test setting
- specification_version for legacy gems. Dup Gem.ruby before
- untainting in case it's frozen.
+Thu Nov 26 11:42:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems.rb: Reduce use of eval. Only read files when looking
- for Gemfile, Isolate, etc.
- * test/rubygems/test_gem.rb: Test for the above.
+ * test/mkmf/base.rb: use $INCFLAGS to add -I option. [Bug#2387]
-Tue Feb 5 10:15:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Nov 26 07:17:58 2009 wanabe <s.wanabe@gmail.com>
- * doc/security.rdoc: Wrap security guide at 80 columns
+ * marshal.c (mark_dump_arg): mark str. see also [ruby-dev:39735]
-Tue Feb 5 10:15:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Thu Nov 26 00:05:58 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * doc/security.rdoc: Grammatical error on security guide
- Patch by Josh Bassett [Github fixes #245]
+ * test/digest/test_digest_extend.rb: Added tests for current digest
+ framework.
-Tue Feb 5 10:00:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Wed Nov 25 20:46:37 2009 Tanaka Akira <akr@fsij.org>
- * lib/racc/parser.rb: Update #do_parse and #yyparse from upstream
- See [Github tenderlove/racc@7d954b5]
+ * vm_eval.c (rb_search_method_entry): refine error message.
-Tue Feb 5 09:55:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Wed Nov 25 19:29:05 2009 Akinori MUSHA <knu@iDaemons.org>
- * lib/racc: Merge Racc documentation downstream, add grammar ref file
+ * ext/digest/digest.c (rb_digest_instance_method_unimpl): Do not
+ call rb_inspect() on an object that does not implement necessary
+ methods; reported by NaHi.
-Tue Feb 5 08:03:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Wed Nov 25 19:30:30 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
- * lib/irb.rb, lib/irb/ext/save-history.rb: Add documentation on how to
- enabled irb history [ruby-core:51347] [Bug #7679]
+ * transcode.c: Added a check for an internal error
+ (with Tatsuya Mizuno)
-Tue Feb 5 07:35:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Tue Nov 24 22:57:46 2009 Tanaka Akira <akr@fsij.org>
- * lib/irb.rb, lib/irb/context.rb: Add documentation on how to enable
- auto-indentation and autocompletion using irbrc and irb_context
- [ruby-core:51209] [Bug #7642] and [ruby-core:51348] [Bug #7680]
+ * test/ruby/envutil.rb (EnvUtil.invoke_ruby): raise Timeout::Error
+ instead of flunk. reported by Yusuke Endoh.
-Tue Feb 5 05:20:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Tue Nov 24 22:31:44 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * doc/standard_library.rdoc: Document list of libraries and extensions
- and their purpose or short description
- * lib/README: Remove lib/README in favor of doc/standard_library.rdoc
+ * vm.c (ruby_vm_destruct, thread_memsize): fix argument type to make
+ RUBY_MARK_FREE_DEBUG available.
-Tue Feb 5 04:40:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Tue Nov 24 21:25:21 2009 Tanaka Akira <akr@fsij.org>
- * ext/json/lib/json.rb: Move module overview definition for rdoc
+ * error.c: include errno.h at beginning.
-Tue Feb 5 03:00:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Tue Nov 24 20:11:37 2009 Tanaka Akira <akr@fsij.org>
- * lib/tracer.rb: Move class overview definition and reformat
+ * strftime.c: %Y format a year with 4 digits at least.
-Mon Feb 4 15:10:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/time.rb: format a year with 4 digits at least.
- * ext/io/console/console.c (rawmode_opt): initialize options for the
- case all options are not given.
+Tue Nov 24 20:05:27 2009 Tanaka Akira <akr@fsij.org>
-Mon Feb 4 12:44:13 2013 Koichi Sasada <ko1@atdot.net>
+ * defs/known_errors.def: more errors.
- * vm_dump.c (control_frame_dump): capitalize prefix of `ep'
- if `ep' points an env object.
+Tue Nov 24 20:01:49 2009 Tanaka Akira <akr@fsij.org>
-Mon Feb 4 04:20:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * include/ruby/ruby.h (rb_bug_errno): declared.
- * lib/English.rb: Add English module for RDoc to parse, then
- remove_const to avoid confusion. Include full list of aliases and
- their associated global variable.
+ * include/ruby/intern.h (rb_strerrno): declaration removed.
-Mon Feb 4 02:40:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * error.c (rb_strerrno): make it static. return NULL for unknown
+ errors.
+ (rb_bug_errno): defined.
- * lib/yaml.rb (YAML::EngineManager): Documentation for #yamler and
- #yamler= for using the removed Syck gem as the YAML::ENGINE
+ * thread_pthread.c: use rb_bug_errno.
-Sun Feb 3 16:54:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * signal.c (ruby_signal): use rb_bug_errno.
- * ext/io/console/io-console.gemspec: bump. [Bug #7762]
+Tue Nov 24 10:17:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/io/console/test_io_console.rb (test_stringio_getch): use more
- descriptive assertions.
+ * file.c (file_path_convert): fix fs_encoding is not assign.
- * ext/io/console/console.c (rawmode_opt): min is minimum characters,
- not tenths.
+Tue Nov 24 10:00:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Feb 3 16:13:00 2013 Charlie Somerville <charlie@charliesomerville.com>
+ * error.c (rb_strerrno): constified.
- * doc/security.rdoc: add first cut at a Ruby security document
+Tue Nov 24 09:49:31 2009 Tanaka Akira <akr@fsij.org>
-Sun Feb 3 10:25:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * error.c (rb_strerrno): return "UNKNOWNERROR" for non-zero unknown
+ error.
- * random.c: Document range argument for Kernel#rand.
- [ruby-core:51794] [Bug #7770]
+Tue Nov 24 09:18:33 2009 Tanaka Akira <akr@fsij.org>
-Sun Feb 3 10:00:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * include/ruby/intern.h (rb_strerrno): declared.
- * numeric.c: Document Float constants [ruby-core:51484] [Bug #7709]
+ * template/known_errors.inc.tmpl: generate defined_error() and
+ undefined_error() instead of set_syserr.
-Sun Feb 3 09:38:44 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c (Init_syserr): define defined_error() and undefined_error()
+ to follow the above change.
+ (rb_strerrno): defined.
- * lib/profiler.rb (PROFILE_CALL_PROC, PROFILE_RETURN_PROC): add b_call
- and b_return to profile block calls.
+ * thread_pthread.c: show error message and errno macro name with
+ rb_bug.
- * lib/profiler.rb (PROFILE_CALL_PROC, PROFILE_RETURN_PROC): split
- PROFILE_PROC for call and return events.
+Mon Nov 23 16:06:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 2 14:32:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * thread_pthread.c (RUBY_STACK_MIN, RUBY_STACK_SPACE): delay for
+ platforms where PTHREAD_STACK_MIN is not compile time constant.
+ [ruby-dev:39751]
- * lib/minitest/mock.rb, lib/minitest/hell.rb: nodoc top-level module
+Mon Nov 23 11:26:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 2 14:05:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * dln.c (dln_find_1): removed duplication.
- * lib/debug.rb: Documentation for DEBUGGER__ class methods based on
- patch by Vincent Batts [ruby-core:51253]
+Mon Nov 23 04:12:00 2009 Tanaka Akira <akr@fsij.org>
-Sat Feb 2 13:37:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * enc/trans/newline.trans (fun_so_universal_newline): generate \n
+ after \r\n detection instead of just after \r.
+ [ruby-list:45988] [ruby-core:25881] [ruby-core:26788]
- * lib/net/smtp.rb: Fix rdoc title for Net::SMTP
+Sat Nov 21 18:48:35 2009 Tanaka Akira <akr@fsij.org>
-Sat Feb 2 13:32:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * vm_eval.c (rb_search_method_entry): show flags and klass value in
+ not implemented error message.
- * lib/net/pop.rb: Fix rdoc title for Net::POP3
+Sat Nov 21 16:38:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 2 13:00:11 2013 Yusuke Endoh <mame@tsg.ne.jp>
+ * marshal.c (marshal_dump): use normal object as the buffer so
+ that no hidden object is exposed to ruby-level. [ruby-dev:39744]
- * lib/gserver.rb (GServer#start): fix a timing issue. patch from
- Charles Nutter. [Bug #7081]
+Sat Nov 21 15:58:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Feb 2 12:36:54 2013 Yusuke Endoh <mame@tsg.ne.jp>
+ * io.c (read_all): fix: false negative invalid byte sequence
+ on reading from pipes. [ruby-dev:39743]
+ fix: assign the variable 'pos' as relative value from recent pos.
- * lib/fileutils.rb (copy_entry, wrap_traverse): preserve attributes of
- directories on FileUtils.cp_r. The fix was proposed by Jan
- Wedekind. [Bug #7246]
+Sat Nov 21 14:44:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/fileutils/test_fileutils.rb: add a test for above.
+ * file.c (file_path_convert): delay getting UTF8-MAC encoding
+ while really needed. [ruby-core:26807]
-Sat Feb 2 12:30:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Fri Nov 20 21:16:54 2009 Tanaka Akira <akr@fsij.org>
- * lib/uri/ftp.rb (URI::FTP.new2): nodoc method from r39013 [Bug #7301]
+ * vm_eval.c (rb_search_method_entry): avoid trigraph.
-Sat Feb 2 12:15:36 2013 Yusuke Endoh <mame@tsg.ne.jp>
+Thu Nov 19 23:17:06 2009 Shugo Maeda <shugo@ruby-lang.org>
- * lib/uri/ftp.rb (URI::FTP.new2): remove the rdoc because it is not
- well tested yet. [Bug #7301]
+ * lib/net/ftp.rb (putbinaryfile): use APPE for resume.
+ Thanks, Tomoyuki Chikanaga.
-Sat Feb 2 12:07:41 2013 Yusuke Endoh <mame@tsg.ne.jp>
+Thu Nov 19 22:50:05 2009 Shugo Maeda <shugo@ruby-lang.org>
- * ChangeLog: Forgot to add a reference to the ChangeLog of the
- previous commit.
+ * lib/net/imap.rb (flag_list): untaint strings to intern in the safe
+ level 1.
-Sat Feb 2 12:05:18 2013 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/net/imap.rb (max_flag_count=): new methods to set the max
+ number of flags interned to symbols.
- * lib/fileutils.rb: chmod/chmod_R with a string mode (e.g., "+x")
- caused error in verbose mode. [Bug #7373]
+Thu Nov 19 20:43:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/fileutils/test_fileutils.rb: add a test for above.
+ * ext/socket/getnameinfo.c: need to include extconf.h for HAVE_* macros.
+ reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
-Sat Feb 2 11:44:42 2013 Yusuke Endoh <mame@tsg.ne.jp>
+Thu Nov 19 17:00:59 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/English.rb: Remove some confusing words from rdoc. [Bug #7406]
+ * win32/Makefile.sub: nmake execute the file named echo if it exists
+ in the PATH. reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
-Sat Feb 2 10:17:12 2013 Kazuki Tsujimoto <kazuki@callcc.net>
+Thu Nov 19 02:50:47 2009 Tanaka Akira <akr@fsij.org>
- * NEWS: add keyword arguments.
+ * vm_eval.c (rb_search_method_entry): show the type of the hidden
+ object.
+ (rb_type_str): new function for above.
-Sat Feb 2 07:45:44 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Nov 19 00:47:09 2009 Tanaka Akira <akr@fsij.org>
- * proc.c (proc_curry): Fix arity check [Bug #5747]
+ * io.c (MORE_CHAR_SUSPENDED): renamed from MORE_CHAR_CBUF_FULL.
- * test/ruby/test_proc.rb: Test for above
+Wed Nov 18 22:00:13 2009 Tanaka Akira <akr@fsij.org>
-Sat Feb 2 07:44:15 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * io.c (fill_cbuf): extracted from more_char.
+ (io_shift_cbuf): fix memmove condition.
+ (read_all): use fill_cbuf directly to avoid ECONV_AFTER_OUTPUT.
+ [ruby-dev:39708]
- * proc.c: Add {*}_min_max_arity and refactor.
- [Bug #7765]
+Wed Nov 18 18:25:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_proc.rb: Fix wrong test
+ * thread.c (rb_thread_atfork_internal): reinitialize global lock
+ at fork to get rid of deadlock. based on the patch from Hongli
+ Lai in [ruby-core:26783]. [ruby-core:23572]
-Fri Feb 2 00:46:00 2013 Charlie Somerville <charlie@charliesomerville.com>
+Wed Nov 18 17:48:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * marshal.c: add security considerations to marshal overview, refer to
- overview from Marshal.load documentation [#7759]
+ * thread.c (terminate_atfork_i): all mutex locks by other threads
+ have been abandoned at fork.
-Fri Feb 1 23:04:00 2013 Charlie Somerville <charlie@charliesomerville.com>
+Wed Nov 18 15:27:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * array.c (rb_ary_dup): make returned array the same class as the original
- array [Bug #7768] [ruby-core:51792]
- * test/ruby/test_array.rb (class TestArray): add test
+ * file.c (file_path_convert): delay getting filesystem encoding
+ while really needed.
-Fri Feb 1 16:35:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 18 12:33:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * marshal.c (r_object0): prohibit setting instance variables of
- existing class/module.
+ * encoding.c (enc_set_default_encoding): reset filesystem
+ encoding because on resetting default_external because
+ Unix's filesystem encoding depends on default_external.
-Fri Feb 1 14:34:29 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * encoding.c (enc_set_filesystem_encoding): added.
- * ext/readline/extconf.rb, ext/readline/readline.c: check
- RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE directly in
- readline.c. Patch by Zachary Scott. [Bug #7397] [ruby-core:49561]
+ * ruby.c (process_options): don't call rb_filesystem_encoding
+ because filesystem encoding is reset when default_external
+ is reset.
-Thu Jan 31 21:55:00 2013 Charlie Somerville <charlie@charliesomerville.com>
+Wed Nov 18 11:57:32 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * marshal.c (marshal_load): Add documentation warning against using
- Marshal.load on untrusted data [Bug #7759] [ruby-core:51765]
+ * math.c (math_gamma): fix incorrect comparison expression.
+ see also [ruby-dev:39709] [Bug #2381]
-Thu Jan 31 16:33:27 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 18 11:37:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * parse.y (local_push_gen): no assigned but unused variable warnings
- in eval as well as -e. [Feature #7730] [ruby-core:51580]
+ * io.c (rb_scan_open_args): move path encoding conversion
+ for filesystem encoding of Mac OS X.
-Wed Jan 30 12:30:08 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * file.c (file_path_convert): added for convert encoding
+ of file path.
- * test/ruby/test_signal.rb (test_trap_puts): Fix typo. "sync"
- should be "STDOUT.sync".
+ * file.c (rb_get_path_check): add file_path_convert.
-Thu Jan 31 15:39:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Wed Nov 18 10:17:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_aset_m): Documentation for String#[]= fix
- Raises an IndexError if Regexp match is out of range.
- Github fixes #243 Patch by Dmtiriy Budnik
+ * string.c (str_utf8_nth): no count_utf8_lead_bytes_with_word
+ optimization for short string. [ruby-core:26787]
-Thu Jan 31 13:54:44 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * string.c (str_utf8_offset): str_utf8_nth never return NULL.
- * ext/socket/raddrinfo.c (rsock_unix_sockaddr_len): return
- sizeof(sa_family_t) if path is empty. see "Autobind Feature" in
- unix(7) for details.
+Wed Nov 18 10:12:34 2009 Shugo Maeda <shugo@ruby-lang.org>
- * ext/socket/lib/socket.rb (unix_socket_abstract_name?): treat an
- empty path as an abstract name.
+ * vm_method.c (rb_undef): should raise TypeError if klass is nil.
+ 1.instance_eval { undef to_s } causes SEGV before this fix.
- * test/socket/test_unix.rb: related test.
+ * test/ruby/test_undef.rb: new tests for undef.
-Wed Jan 30 20:58:50 2013 Tanaka Akira <akr@fsij.org>
+Wed Nov 18 08:41:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/basicsocket.c (bsock_getsockname): ignore truncated
- part of socket address.
- (bsock_getpeername): ditto.
- (bsock_local_address): ditto.
- (bsock_remote_address): ditto.
+ * string.c (str_utf8_nth): fixed overrun. [ruby-core:26787]
- * ext/socket/unixsocket.c (unix_path): ditto.
- (unix_addr): ditto.
- (unix_peeraddr): ditto.
+Wed Nov 18 07:51:01 2009 Tanaka Akira <akr@fsij.org>
- * ext/socket/init.c (cloexec_accept): ditto.
+ * io.c (parse_mode_enc): fix invalid access.
-Wed Jan 30 17:08:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 17 23:50:06 2009 Shugo Maeda <shugo@ruby-lang.org>
- * include/ruby/win32.h (fstat): revert r37337, which uses _fstati64()
- instead of fstati64() on mingw32. [Bug #7276]
+ * vm_method.c (rb_alias): should raise TypeError if klass is nil.
+ 1.instance_eval { alias to_string to_s } causes SEGV before this
+ fix.
-Wed Jan 30 15:26:37 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * test/ruby/test_alias.rb (test_special_const_alias): ditto.
- * ext/socket/unixsocket.c (rsock_init_unixsock): use rb_inspect()
- because rb_sys_fail_str() fails if its argument contains NUL.
+Tue Nov 17 17:53:53 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
- * test/socket/test_unix.rb: related test.
+ * enc/big5.c, enc/trans/big5.trans, enc/trans/big5-uao-tbl.rb,
+ test/ruby/test-transcode.rb: Added Encoding 'Big5-UAO' and transcoding
+ for it (from Tatsuya Mizuno) (see Bug #1784)
-Wed Jan 30 15:21:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 17 16:26:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_dump.c (rb_vm_bugreport): show the most important message, Crash
- Report log information, first.
+ * insns.def (opt_case_dispatch): runtime value cannot be used as
+ an element initializer.
-Wed Jan 30 15:00:05 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * vm_insnhelper.c (opt_case_dispatch_i): gets rid of type-punning
+ calls.
- * array.c (rb_ary_bsearch): Raise TypeError on bad return from block
+Mon Nov 16 15:51:53 2009 Shugo Maeda <shugo@ruby-lang.org>
- * range.c (range_bsearch): ditto
+ * vm_insnhelper.c (vm_call_method): protected singleton methods of
+ an object should not be able to called from other instances of the
+ class of the object. [ruby-core:26761]
- * test/ruby/test_array.rb (class): Test for above
+ * vm_eval.c (rb_method_call_status): ditto.
- * test/ruby/test_range.rb (class): ditto
+ * test/ruby/test_module.rb (test_protected_singleton_method): ditto.
-Wed Jan 30 14:46:28 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Mon Nov 16 14:03:53 2009 wanabe <s.wanabe@gmail.com>
- * range.c: Restrict bsearch to integers [#7728]
+ * io.c (read_all): shift read buffer if exception occurred.
+ pointed out in [ruby-dev:39702].
- * test/ruby/test_range.rb: Test for above
+Mon Nov 16 07:59:38 2009 wanabe <s.wanabe@gmail.com>
-Wed Jan 30 14:10:52 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * io.c (read_all): don't call io_shift_cbuf until buffering enough or
+ econv_finished. [ruby-dev:39696]
- * array.c (rb_ary_bsearch): Return enumerator if no block [#7725]
+ * io.c (more_char): don't call clear_readconv to read buffer after
+ econv_finished.
- * range.c (range_bsearch): ditto
+ * io.c (appendline, rb_io_each_codepoint): clear readconv when done.
- * test/ruby/test_array.rb: Test for above
+Mon Nov 16 01:58:08 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * test/ruby/test_range.rb: ditto
+ * include/ruby/ruby.h (rb_classext_t): annotate @internal.
-Wed Jan 30 13:53:43 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Mon Nov 16 01:35:34 2009 Tanaka Akira <akr@fsij.org>
- * lib/matrix.rb: Take conjugate for inner product
- [rubyspec:5a01ad5719f2] [ruby-dev:46101]
+ * encoding.c (rb_filesystem_encindex): use default external encoding
+ instead of locale encoding in Unix.
-Wed Jan 30 13:22:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (process_options): delay filesystem encoding
+ initialization until default external encoding initialization.
- * parse.y (local_push_gen): warn assigned but unused variables also in
- toplevel, except for -e option. [Feature #7730] [ruby-core:51580]
+Mon Nov 16 00:06:26 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Wed Jan 30 13:17:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * thread.c (thread_cleanup_func): delete locking_mutex when thread
+ object become dummy because of fork. [ruby-core:26744]
+ [ruby-core:26745]
- * cont.c (cont_restore_thread): svar should be separate per fibers.
- [ruby-core:51331] [Bug #7678]
+ * bootstraptest/test_thread.rb: add a test for above.
-Wed Jan 30 07:15:04 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Sat Nov 14 21:54:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * re.c (reg_operand): Simplify and reuse error handling [Bug #7539]
+ * class.c (rb_mod_init_copy): fix memory leak of Class#dup.
+ [ruby-dev:39687]
- * test/ruby/test_regexp.rb: Test for above
+Sat Nov 14 17:09:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 30 07:00:16 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * configure.in (--with-opt-dir): ignore and suppress a warning.
+ [ruby-dev:39684]
- * object.c: Improve error for failed implicit conversions [Bug #7539]
+Sat Nov 14 16:43:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * error.c: Adapt rdoc
+ * hash.c (ruby_setenv): get rid of crash in Solaris 8 and 10.
+ [ruby-core:26668]
- * test/ruby/test_object.rb: Test for above
+Sat Nov 14 09:16:54 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Tue Jan 29 21:40:12 2013 Tanaka Akira <akr@fsij.org>
+ * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): Fix comparisons
+ [ruby-core:26646]
- * lib/net/http/generic_request.rb (encode_multipart_form_data): remove
- tempfile explicitly.
+ * test/bigdecimal/test_bigdecimal.rb (class): Fix and improve tests.
-Tue Jan 29 19:27:18 2013 Benoit Daloze <eregontp@gmail.com>
+Sat Nov 14 04:07:06 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * array.c: Improve documentation about
- comparison by hash for concerned methods. [ruby-core:51266]
+ * ext/tk/lib/tk/variable.rb (TkVariable::coerce): fix bug on a
+ numeric value.
-Tue Jan 29 17:03:28 2013 Koichi Sasada <ko1@atdot.net>
+Sat Nov 14 03:35:29 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * vm_backtrace.c: fix issue of rb_debug_inspector_open().
- The order of making binding should be stack (frame) top to bottom.
- [Bug #7635]
- And also fix issue of collecting klass. Collecting klass is same
- as TracePoint#defined_class.
- (previous version, it returns T_ICLASS (internal objects).
+ * ext/tk/lib/tk/variable.rb: TkVariable#*(other) and /(other) have a
+ bug on handling of the "other" value.
- * test/-ext-/debug/test_debug.rb: add a test.
+Fri Nov 13 21:18:15 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/-test-/debug/extconf.rb, init.c, inspector.c: ditto.
+ * ext/zlib/zlib.c (rb_zlib_adler32): fix typo.
- * vm_backtrace.c: remove magic number and add enum CALLER_BINDING_*.
+Fri Nov 13 16:22:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_backtrace.c, include/ruby/debug.h: add new C api (experimental)
- rb_debug_inspector_frame_self_get().
+ * thread.c (thread_start_func_2): see first_func, not first_proc,
+ to decide which to use.
- * vm.c, vm_core.h, vm_trace.c: move decl. of
- rb_vm_control_frame_id_and_class() and constify first parameter.
+ * gc.c (vm_xrealloc): use the given object space.
-Tue Jan 29 16:50:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 13 00:46:24 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * vm_trace.c (rb_tracepoint_enable, rb_tracepoint_disable): check safe
- level as well as set_trace_func.
+ * lib/cgi/util.rb (CGI::pretty): fix the overflow bug
+ if stripped string.[ruby-dev:37975]
- * vm_trace.c (set_trace_func, thread_{add,set}_trace_func_m): check
- safe level as well as 1.8.
+Thu Nov 12 23:08:11 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-Tue Jan 29 16:49:19 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/cgi/core.rb (read_from_cmdline): this code is better.
+ [ruby-core:25991]
- * proc.c (rb_mod_method_arity): return original arity of the method if
- aliased because of visibility change, like as Method#arity.
+Thu Nov 12 22:55:42 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-Tue Jan 29 12:05:18 2013 Tanaka Akira <akr@fsij.org>
+ * lib/net/telnet.rb: don't use simple delegate.
+ because SimpleDelegate behavior changed.
- * test/ruby/test_marshal.rb: remove temporally files early.
+Thu Nov 12 14:33:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_process.rb: ditto.
+ * thread_win32.c (thread_errno): CreateThread does not set errno.
- * test/psych/test_exception.rb: ditto.
+ * thread.c (thread_create_core): moved failure handling from
+ native_thread_core().
-Tue Jan 29 09:26:20 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * thread_pthread.c (native_thread_create): constified.
- * ext/socket/socket.c (sock_s_pack_sockaddr_un): calculate the
- correct address length of an abstract socket.
+Thu Nov 12 10:08:56 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/socket/test_unix.rb: related test.
+ * .document: remove documents not in rdoc format until
+ rdoc supports non rdoc files. [ruby-core:26459]
-Mon Jan 28 18:02:16 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Nov 12 06:42:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_backtrace.c (rb_debug_inspector_frame_{class,binding,iseq}_get):
- use long as index as well as RARRAY_LEN().
+ * lib/tempfile.rb (Tempfile#initialize): option hash may not be
+ given. [ruby-core:26681]
-Mon Jan 28 17:51:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Nov 12 01:29:15 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * test/ruby/envutil.rb (assert_separately): imply no core dump.
+ * enumerator.c (yielder_yield_push): Yielder#<< should return self.
+ [ruby-dev:39660]
-Mon Jan 28 12:32:31 2013 Tanaka Akira <akr@fsij.org>
+Wed Nov 11 19:17:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/fcntl/fcntl.c: update document. use "file descriptor" instead
- of "file handle" because it is not used other Ruby documents and
- it is confusing with Windows file handle.
- correct F_DUPFD behavior.
+ * lib/tempfile.rb (Tempfile#initialize): merge mode option.
-Sat Jan 26 22:39:12 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/tmpdir.rb (Dir::Tmpname#create): splat options.
- * marshal.c (w_object): dump instance variables of the result of
- marshal_dump not the original object. [ruby-core:51163] [Bug #7627]
+Wed Nov 11 12:54:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (nucomp_marshal_dump): need to copy instance variables.
+ * hash.c (ruby_setenv): use ruby_strdup().
- * rational.c (nurat_marshal_dump): ditto.
+Wed Nov 11 12:19:27 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Jan 26 13:35:56 2013 Eric Hodel <drbrain@segment7.net>
+ * hash.c (ruby_setenv): also set CRT workarea. ref [ruby-core:25010]
- * ext/fcntl/fcntl.c: Document Fcntl constants
+Wed Nov 11 09:36:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jan 26 12:54:40 2013 Eric Hodel <drbrain@segment7.net>
+ * marshal.c (w_object, r_object0): use RHASH_IFNONE but not ifnone
+ directly.
- * hash.c (rb_env_size): Restored documentation for ENV.size
+Wed Nov 11 08:32:45 2009 Tanaka Akira <akr@fsij.org>
- * lib/drb/drb.rb: Documented DRb::DRb#run.
+ * thread.c (blocking_region_begin): define before BLOCKING_REGION.
+ reported by Luis Lavena. [ruby-core:26670]
- * lib/erb.rb (class ERB): Improved documentation of ERb.
+Wed Nov 11 08:22:19 2009 Tanaka Akira <akr@fsij.org>
- * transcode.c: Documented Encoding::Converter constants.
+ * util.c (ruby_strtod): use dval() consistently.
-Sat Jan 26 10:09:57 2013 Eric Hodel <drbrain@segment7.net>
+Wed Nov 11 02:14:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/webrick/accesslog.rb: Improved WEBrick documentation.
- * lib/webrick/cgi.rb: ditto.
- * lib/webrick/config.rb: ditto.
- * lib/webrick/cookie.rb: ditto.
- * lib/webrick/httpauth/authenticator.rb: ditto.
- * lib/webrick/httpauth/basicauth.rb: ditto.
- * lib/webrick/httpauth/digestauth.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/cgihandler.rb: ditto.
- * lib/webrick/httpservlet/filehandler.rb: ditto.
- * lib/webrick/httpservlet/prochandler.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.
+ * test/matrix/test_matrix.rb (TestMatrix#test_rank):
+ added a test method for r24969.
-Sat Jan 26 08:29:33 2013 Shugo Maeda <shugo@ruby-lang.org>
+Tue Nov 10 08:23:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/raddrinfo (rsock_unix_sockaddr_len): renamed from
- rsock_unixpath_len, because it returns not the length of the path,
- but the length of a socket address for the path.
+ * process.c (rb_f_exec, rb_f_system, rb_f_spawn): mentioned about
+ the shell to be used when the command line is single string.
+ See [ruby-core:26652]
-Sat Jan 26 01:12:23 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Nov 9 20:15:16 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_io.rb (test_ioctl_linux): skip if a platform is
- not x86 because linux ioctl request number depend on cpu arch.
- At least, alpha, mips, sparc and ppc have a different number.
- [Bug #7718] [ruby-core:51544]
+ * thread.c (rb_gc_save_machine_context): don't save the stack pointer
+ in this function.
+ (RB_GC_SAVE_MACHINE_CONTEXT): call rb_gc_save_machine_context and
+ save the stack pointer at caller side.
+ (rb_thread_schedule_rec): use RB_GC_SAVE_MACHINE_CONTEXT instead of
+ rb_gc_save_machine_context.
+ (blocking_region_begin): changed to a macro. use
+ RB_GC_SAVE_MACHINE_CONTEXT instead of rb_gc_save_machine_context.
+ [ruby-dev:39659]
-Fri Jan 25 19:14:24 2013 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Mon Nov 9 11:28:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/win32ole/win32ole.c: use TlsAlloc instead of __declspec(thread)
- to avoid SEGV if win32ole.so loaded with LoadLibrary in Windows
- XP or earlier.
+ * configure.in (warnflags): add -Wno-long-long.
-Fri Jan 25 16:47:31 2013 Shugo Maeda <shugo@ruby-lang.org>
+Sun Nov 8 18:13:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/raddrinfo.c (rsock_unixpath_len, init_unix_addrinfo),
- ext/socket/unixsocket.c (unixsock_connect_internal,
- rsock_init_unixsock): calculate the correct address length of
- an abstract socket. Without this fix, sizeof(struct sockaddr_un)
- is specified as the length of an abstract socket for bind(2) or
- connect(2), so the address of the socket is filled with extra NUL
- characters. See unix(7) for details.
+ * hash.c: use RHASH_IFNONE but not ifnone directly.
- * ext/socket/lib/socket.rb (unix_server_socket): don't access the
- file system if the platform is Linux and path starts with NUL,
- which means that the socket is an abstract socket.
+Sat Nov 7 21:02:57 2009 Tanaka Akira <akr@fsij.org>
- * test/socket/test_unix.rb: related test.
+ * lib/pp.rb (PP::ObjectMixin#pretty_print): use to_s regardless of
+ instance variables.
-Fri Jan 25 13:02:27 2013 Eric Hodel <drbrain@segment7.net>
+Sat Nov 7 20:59:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/drb/drb.rb: Updated documentation based on patch from Vincent
- Batts. [ruby-trunk - Bug #7714]
- * lib/drb/ssl.rb: ditto.
+ * vm_insnhelper.c (vm_push_frame): get rid of out-of-bounds
+ access.
-Fri Jan 25 12:23:29 2013 Eric Hodel <drbrain@segment7.net>
+Sat Nov 7 12:41:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/drb/drb.rb: Improved documentation by adding or hiding methods.
- * lib/drb/eq.rb: ditto.
- * lib/drb/extserv.rb: ditto.
- * lib/drb/gw.rb: ditto.
- * lib/drb/invokemethod.rb: ditto.
- * lib/drb/observer.rb: ditto.
- * lib/drb/ssl.rb: ditto.
- * lib/drb/timeridconv.rb: ditto.
- * lib/drb/unix.rb: ditto.
+ * vm_insnhelper.c (VM_CALLEE_SETUP_ARG): revert r25521.
+ [ruby-core:26427] [ruby-core:26447]
- * sample/drb/gw_cu.rb: Fixed bug in DRb gateway sample.
+Fri Nov 6 18:33:47 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jan 25 12:01:56 2013 Koichi Sasada <ko1@atdot.net>
+ * vm_insnhelper.c (vm_push_frame): add CHECK_STACK_OVERFLOW.
+ [ruby-dev:39592]
- * vm_core.h: modify a comment about rb_iseq_t::local_size.
- A patch by davidbalbert (David Albert) [Bug #6750]
+ * eval.c (rb_longjmp): add 1 level backtrace for sysstack_error
+ without calling any method to prevent further stack overflow.
-Fri Jan 25 10:36:31 2013 Eric Hodel <drbrain@segment7.net>
+ * eval.c (make_exception): don't call #exception for
+ sysstack_error to prevent stack overflow.
- * lib/mkmf.rb: Documented MakeMakefile constants. Hide implementation
- details from RDoc
+ * proc.c (Init_Proc): don't freeze sysstack_error.
-Fri Jan 25 10:04:07 2013 Eric Hodel <drbrain@segment7.net>
+ * eval.c (rb_longjmp): move reentrant check after exception
+ preparation.
- * lib/rubygems/compatibility.rb: Hide compatibility shims from RDoc
+Fri Nov 6 17:13:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/config_file.rb: Hide RbConfig use from RDoc
+ * lib/mkmf.rb (create_header): split the line by tabs.
- * lib/rubygems/test_case.rb: Added note to use realpath when 1.8
- support is dropped.
+Fri Nov 6 12:02:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Jan 25 09:14:43 2013 Eric Hodel <drbrain@segment7.net>
+ * configure.in (MINIDLNOBJ): set default as dmydln.o.
+ Now LLVM clang seems to be able to build Ruby 1.9.
- * lib/rdoc/generator/darkfish.rb: Fixed debug message. RDoc bug #174
- by Thomas Leitner.
+Fri Nov 6 09:29:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/store.rb: Fixed deletion of ri attribute data when a class
- was loaded then saved. RDoc bug #171 by Thomas Leitner.
- * test/rdoc/test_rdoc_store.rb: Test for above.
+ * encoding.c (rb_filesystem_encindex): add fallback to
+ ASCII-8BIT on Windows.
-Thu Jan 24 19:55:25 2013 Shota Fukumori <her@sorah.jp>
+Fri Nov 6 07:29:07 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * NEWS (yaml): Write about bundled libyaml.
+ * test/ruby/test_case.rb: merged r25658 from ruby_1_8.
-Thu Jan 24 16:54:34 2013 Eric Hodel <drbrain@segment7.net>
+Thu Nov 5 12:27:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * doc/syntax/calling_methods.rdoc: Added a Method Lookup section.
- * doc/syntax/refinements.rdoc (Method Lookup): Clarified that
- refinement methods are looked up in classes, not instances.
+ * gem_prelude.rb (Gem.user_home): force_encoding(
+ Encoding.find('filesystem')). [ruby-core:26525]
-Thu Jan 24 16:49:17 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Nov 5 07:47:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enum.c (enum_zip): Fix error message
+ * parse.y (BEGIN): now local_push and local_pop are necessary in
+ ripper.
- * array.c (take_items): Same, for Array#zip
+Wed Nov 4 21:39:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Jan 24 16:47:26 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * .document: add some README files to default rdoc's of trunk.
+ patched by Roger Pack [ruby-core:26459]
- * enumerator.c (lazy_zip): raise error for bad arguments
- [Bug #7706]
+Wed Nov 4 16:06:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Jan 24 16:05:08 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * include/ruby/st.h (SIZEOF_ST_INDEX_T): moved from st.c for
+ Init_RandomSeed().
- * enumerator.c: Optimize Lazy#zip when passed only arrays
- [Bug #7706]
+Wed Nov 4 15:50:16 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-Thu Jan 24 15:21:17 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * include/ruby/ruby.h (NUM2CHR): prefix __extension__ for
+ braced-groups within expressions.
- * enumerator.c: Fix state handling for Lazy#zip,{drop_take}{_while}
- [bug #7696] [bug #7691]
+Wed Nov 4 15:46:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Jan 24 11:43:47 2013 Narihiro Nakamura <authornari@gmail.com>
+ * ruby.c (set_{internal,external}_encoding_once): fixed typos.
- * eval.c (f_current_dirname): Add documentation about "__dir__
- returns always an absolute path". [Bug #7729]
+Wed Nov 4 12:49:18 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Thu Jan 24 10:28:30 2013 Eric Hodel <drbrain@segment7.net>
+ * proc.c (mnew): Fix scope issue [ruby-core:26069]
- * NEWS (RDoc): Added mention of page support and markdown support.
+Wed Nov 4 08:50:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Jan 24 09:40:13 2013 Eric Hodel <drbrain@segment7.net>
+ * random.c (rb_hash_start): moved from string.c.
- * doc/syntax/refinements.rdoc: Added refinements document based on
- the specification from the wiki.
- * doc/syntax.rdoc: Added link to refinements document.
+ * random.c (Init_RandomSeed2): register global address before set.
-Wed Jan 23 16:29:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * random.c (Init_RandomSeed): initialize hashseed.
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): fix missing
- initialization. pointed out by phasis68 (Heesob Park) at
- [ruby-core:51579]. [Bug #7721]
+Wed Nov 4 08:26:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 23 16:18:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (dir_check): moved other checks from GetDIR.
- * lib/mkmf.rb (MakeMakefile#try_constant): fix for large unsigned.
+ * dir.c (GetDIR): fixed a variable name.
- * lib/mkmf.rb (MakeMakefile#try_constant): fix for larger constants.
+Wed Nov 4 08:19:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/mkmf/test_constant.rb: tests for try_constant.
- TODO: define check_constant and use it.
+ * cont.c (rb_fiber_start): fixed unconditional test.
-Wed Jan 23 13:35:37 2013 Koichi Sasada <ko1@atdot.net>
+Wed Nov 4 02:08:14 2009 Aaron Patterson <tenderlove@ruby-lang.org>
- * thread_pthread.c (ruby_init_stack): ignore `STACK_END_ADDRESS'
- if Ruby interpreter is running on co-routine.
- [Feature #2294]
- https://bugs.ruby-lang.org/issues/2294#note-18
+ * ext/dl/cptr.c (rb_dlptr_eql, rb_dlptr_cmp): DL::CPtr#== and DL::CPtr#<=>
+ should not raise an exception when compared to a different object.
-Wed Jan 23 12:28:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 4 00:05:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): check the results
- of acp_to_wstr() which can return NULL. [ruby-core:51557] [Bug #7721]
+ * string.c (rb_str_upto): make next object before yield its block.
+ fix: can modify original begin string of String#upto.
+ [ruby-dev:26384] [ruby-dev:39626]
-Wed Jan 23 10:40:49 2013 Eric Hodel <drbrain@segment7.net>
+Mon Nov 2 18:33:21 2009 wanabe <s.wanabe@gmail.com>
- * doc/syntax/assignment.rdoc (Implicit Array Assignment): Clarify
- that "left-hand side" means "of the assignment". Suggested by Jorge
- Dias.
- * doc/syntax/assignment.rdoc (Multiple Assignment): ditto.
+ * cont.c (fiber_free): don't free unallocated local_storage. see #1325.
-Wed Jan 23 10:34:47 2013 Eric Hodel <drbrain@segment7.net>
+ * cont.c (cont_init): clear local_storage not to use current thread's.
- * doc/syntax/assignment.rdoc (Local Variables and Methods): Fixed
- example showing caching of a method's results into a local variable.
- Added not about using an explicit receiver to call a method that
- matches a local variable. Suggested by markov_twain on twitter.
+ * cont.c (fiber_t_alloc, root_fiber_alloc): link itself always for
+ a case that fiber_link_remove() is called before fiber_link_join().
-Wed Jan 23 10:20:08 2013 Eric Hodel <drbrain@segment7.net>
+ * cont.c (fiber_init): clear cont->vm_stack and th->stack before
+ root_fiber_alloc() in rb_fiber_current().
- * lib/README: Fixed typo. Patch by Pradeep Sahoo.
- Fixes #240 on github
+Mon Nov 2 14:52:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 23 09:53:39 2013 Eric Hodel <drbrain@segment7.net>
+ * eval.c (rb_exc_raise, rb_exc_fatal, rb_make_exception):
+ suppressed shorten-64-to-32 warnings.
- * lib/rdoc/servlet.rb: Fixed display of site and home documentation.
- Fixes rdoc issue #170 by Thomas Leitner.
- * test/rdoc/test_rdoc_servlet.rb: Test for above.
+Mon Nov 2 14:43:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rdoc/code_object.rb: Split #initialize_visibility from
- #initialize for reuse when loading a stored object.
- Fixes rdoc issue #171 by Thomas Leitner.
+ * thread_pthread.c (native_stop_timer_thread): delay joining timer
+ thread after unlocking mutex.
- * lib/rdoc/any_method.rb: Initialize visibility for #display? For
- rdoc issue #171
- * lib/rdoc/attr.rb: ditto.
- * lib/rdoc/class_module.rb: ditto.
- * lib/rdoc/top_level.rb: ditto.
- * test/rdoc/test_rdoc_any_method.rb: Test for above.
- * test/rdoc/test_rdoc_attr.rb: ditto.
- * test/rdoc/test_rdoc_class_module.rb: ditto.
- * test/rdoc/test_rdoc_constant.rb: ditto.
- * test/rdoc/test_rdoc_top_level.rb: ditto.
+Mon Nov 2 13:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jan 23 06:43:26 2013 Eric Hodel <drbrain@segment7.net>
+ * thread_pthread.c (native_stop_timer_thread): need to join timer thread
+ only when really stopping it.
- * lib/rubygems/test_case.rb: Use Dir.tmpdir for rubygems tests instead
- of ./tmp/test. Fixes [ruby-trunk - Bug #7717]
+Mon Nov 2 12:55:50 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jan 22 22:58:03 2013 Akinori MUSHA <knu@iDaemons.org>
+ * thread_{pthread,win32}.c (native_stop_timer_thread): join the thread
+ here.
- * misc/ruby-electric.el (ruby-electric-curlies): Fix the bug where
- an open curly inserted in a string is always replaced with a
- hash sign.
+ * thread_{pthread,win32}.c (native_reset_timer_thread): new function.
-Mon Jan 21 15:41:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * thread.c (rb_thread_stop_timer_thread, rb_thread_reset_timer_thread):
+ call above function instead of simply setting 0.
- * tool/mkconfig.rb: BASERUBY is transient at core build.
+Mon Nov 2 11:22:19 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Jan 21 13:51:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/win32/lib/win32/registry.rb: update rdoc. [ruby-core:26022]
- * lib/mkmf.rb ($extmk): traverse parent directories for the case
- srcdir is a symlink.
+Sun Nov 1 20:16:03 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Jan 20 23:55:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/bigdecimal/bigdecimal.c: fixed rdoc. [ruby-core:26457]
- * marshal.c (w_object, r_object0): separate respond_to checks and
- calling, and get back to the old behavior for 2.0. [Bug #7564]
+Sun Nov 1 16:24:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jan 20 22:24:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (rb_cv_stack_grow_dir): fix for universal binary.
- * tool/vpath.rb (VPath#def_options): hack for msys make, which
- converts a command line argument to non-msys command seems like a
- path list automagically. [Bug #7710] [ruby-core:51489]
+ * configure.in (sitehdrdir, vendorhdrdir): fixed default values.
-Sat Jan 19 11:35:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Sun Nov 1 13:31:16 2009 wanabe <s.wanabe@gmail.com>
- * struct.c (Struct.new): Document Struct.new with block
- Patch by Hiroyuki Iwatsuki [Bug #7674]
+ * win32/win32.c (overlapped_socket_io, recvmsg, sendmsg): pass handle
+ instead of pointer to CloseHandle().
-Sat Jan 19 09:52:46 2013 Eric Hodel <drbrain@segment7.net>
+Sun Nov 1 13:11:27 2009 wanabe <s.wanabe@gmail.com>
- * doc/syntax/miscellaneous.rdoc: Added section on defined?
+ * ext/socket/socket.c (socket_s_ip_address_list): use FreeLibrary() to
+ free HMODULE.
-Sat Jan 19 09:27:31 2013 Eric Hodel <drbrain@segment7.net>
+Sun Nov 1 08:17:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * doc/syntax/assignment.rdoc (Local Variables and Methods): Made it
- more clear that local variables are created by the parser, not
- execution. Thanks to John Hawthorn.
+ * gc.c (GET_STACK_BOUNDS): refactored common code. based on a
+ patch from Suraj N. Kurapati <sunaku AT gmail.com> in
+ [ruby-core:26443].
-Sat Jan 19 09:15:58 2013 Eric Hodel <drbrain@segment7.net>
+Sat Oct 31 23:44:35 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * doc/syntax/assignment.rdoc: Improved links
- * doc/syntax/methods.rdoc: ditto.
+ * enum.c (enum_count): remove optimization using #size.
+ revert r25560.
- * doc/syntax.rdoc: Added link to assignment document
+ * vm_eval.c (rb_funcall_no_recursive): remove method.
-Sat Jan 19 08:47:33 2013 Eric Hodel <drbrain@segment7.net>
+Sat Oct 31 23:28:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * doc/syntax/assignment.rdoc: Added a syntax document on assignment.
+ * vm_eval.c (check_funcall): logic updated according to
+ [ruby-dev:39594]. search method entry, call if it exists;
+ otherwise check method_missing, call if it was overridden,
+ protecting exceptions; if NoMethodError happens, check method
+ name.
-Fri Jan 18 14:11:01 2013 Eric Hodel <drbrain@segment7.net>
+ * vm_eval.c (vm_call0): use idMethodMissing.
- * doc/syntax/methods.rdoc: Added Array Decomposition.
+ * vm_eval.c (rb_search_method_entry): typo fixed.
-Fri Jan 18 12:54:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Oct 31 17:19:28 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * tool/rbinstall.rb (gem): Gem.ensure_gem_subdirectories makes
- subdirectories group-writable, so make them with $dir_mode.
+ * lib/net/http.rb (Net::HTTPResponse#each_response_header):
+ cosmetic: '?\ ' -> '?\s'
-Fri Jan 18 11:24:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Oct 30 22:09:47 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * ext/win32ole/win32ole.c (ole_initialize): uninitialize OLE at thread
- ends. [Bug #2618] [ruby-core:27634]
+ * lib/net/http.rb (Net::HTTPResponse#each_response_header):
+ accept multiline message header of HTTP response. see #1796.
+ cf. RFC 2616 '4.2 Message Header'.
- * ext/win32ole/win32ole.c (ole_initialize): initialize OLE for each
- threads. [Bug #2618] [ruby-core:27634]
+ * test/net/http/test_httpresponse.rb: added.
-Thu Jan 17 22:10:35 2013 Kouhei Sutou <kou@cozmixng.org>
+Fri Oct 30 18:54:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Remove
- .time dependency from *.rb install target. It causes needless
- *.rb install. [Bug #7698] [ruby-core:51437]
- Reported by Tadashi Saito. Thanks!!!
- * test/rubygems/test_gem_installer.rb
- (TestGemInstaller#test_install_extension_and_script): Add a test
- for the above change.
+ * string.c (trnext): detect empty range and raise exception.
+ [ruby-dev:39108]
-Thu Jan 17 21:08:20 2013 Kouhei Sutou <kou@cozmixng.org>
+Fri Oct 30 17:01:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c: Fix a typo in ruby_finalize() documentation.
+ * vm_eval.c (enum call_type): get rid of last comma.
-Thu Jan 17 20:28:18 2013 Benoit Daloze <eregontp@gmail.com>
+ * vm_eval.c (vm_call0, vm_call_super, rb_f_send, rb_f_public_send):
+ fixed call_type. [ruby-dev:39581]
- * object.c: Typo in Kernel#hash documentation.
- Patch by zed_0xff [Github Fixes #237]
+ * vm_eval.c (rb_search_method_entry, rb_method_call_status): split
+ from rb_call0().
-Thu Jan 17 10:48:56 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+ * vm_eval.c (rb_check_funcall): get rid of raising exceptions and
+ hiding further exceptions. [ruby-dev:39584]
- * ext/psych/lib/psych/scalar_scanner.rb: use constants rather than
- calculating Inf and NaN.
+ * vm_eval.c (rb_funcall_no_recursive): ditto.
-Thu Jan 17 10:21:05 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 30 13:36:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * doc/syntax/miscellaneous.rdoc: Added Ending an Expression and
- indentation.
+ * thread.c (rb_thread_blocking_region): reverted r25566, and added
+ description that no exception is allowed inside `func', instead.
+ see [ruby-dev:39582]
-Thu Jan 17 09:30:21 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 30 13:13:16 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rubygems/installer.rb: Untaint string when checking output
- for $SAFE=1
+ * win32.c (recvmsg, sendmsg, link): shouldn't raise ruby's exceptions
+ in the functions expected as system API. see [ruby-dev:39579] and
+ [ruby-dev:39582]
- * lib/rubygems/specification.rb: Keep previously loaded specs as
- active. This prevents double loading when refreshing the gem list.
- * test/rubygems/test_gem.rb: Test for above
+Fri Oct 30 12:59:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rubygems.rb: Bump version to 2.0.0.rc.2
+ * thread.c (rb_thread_blocking_region): standard C doesn't accept
+ preprocessing directive within macro expansion.
-Thu Jan 17 09:08:37 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 30 10:55:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * doc/syntax/control_expressions.rdoc: Added ? : ternary if
+ * thread.c (rb_thread_blocking_region): must ensure to unlock GVL.
+ [ruby-dev:39579]
-Thu Jan 17 08:36:04 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 30 04:47:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * doc/syntax/miscellaneous.rdoc: Added documentation for alias, undef,
- BEGIN, END.
- * doc/syntax/modules_and_classes.rdoc (Constants): Fixed unwrapped
- paragraph with trailing whitespace.
- * doc/syntax/modules_and_classes.rdoc (Scope): Added section pointing
- to alias and undef documentation.
- * doc/syntax.rdoc: Added link to miscellaneous section.
+ * include/ruby/ruby.h (RSTRING_END): trivial optimization.
-Thu Jan 17 07:50:26 2013 Eric Hodel <drbrain@segment7.net>
+ * string.c (rb_str_sub_bang): trivial optimization.
- * doc/syntax/control_expressions.rdoc (Flip-Flop): Added a section on
- the flip-flop.
+Fri Oct 30 02:11:36 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jan 17 06:59:51 2013 Eric Hodel <drbrain@segment7.net>
+ * enum.c (enum_count): call #size using rb_funcall_no_recursive()
+ to prevent infinite recursive calls. [ruby-core:24794]
- * doc/syntax/control_expressions.rdoc (if Expressions): Fixed markup
- error. Fixes #235 on github by FlyingFoX.
+ * vm_eval.c (rb_funcall_no_recursive): utility function to check
+ direct recursive call.
-Thu Jan 17 06:53:58 2013 Eric Hodel <drbrain@segment7.net>
+ * vm_eval.c (rb_check_funcall): move from eval.c. [refactoring]
- * doc/syntax/literals.rdoc (Strings): Fixed typo. Fixes #236 on
- github by Doug Yun.
+Thu Oct 29 18:37:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Jan 16 18:45:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * encoding.c (Init_Encoding): revert previous commit.
- * ext/win32ole/lib/win32ole.rb: use TracePoint to hook all thread
- creation not only by Thread.new and to get rid of interference with
- svar scope. [Bug #7681] [ruby-core:51365]
+ * ruby.c (process_options): ditto.
-Wed Jan 16 09:35:53 2013 Eric Hodel <drbrain@segment7.net>
+Thu Oct 29 15:35:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * .document: Removed extra space
- * lib/irb/lc/.document: Hide help-message
- * lib/minitest/.document: Hide README.txt
- * lib/rake/lib/.document: Hide project.rake
- * lib/rdoc/generator/template/json_index/.document: Hide JavaScript
- files
- * lib/rubygems/ssl_certs/.document: Hide PEM files.
+ * encoding.c (Init_Encoding): set locale and filesystem encindex.
-Wed Jan 16 03:54:28 2013 Eric Hodel <drbrain@segment7.net>
+ * ruby.c (process_options): move setting func of filesystem
+ encoding to Init_Encoding.
- * doc/syntax/control_expressions.rdoc: Omit optional "then" for if and
- unless expressions. Improved description of "a if a = 0.zero?"
- NameError. Note that "do" for for loop is optional.
+Thu Oct 29 15:43:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 16 03:28:47 2013 Eric Hodel <drbrain@segment7.net>
+ * vm_core.h (rb_name_err_mesg_new): added prototype.
- * doc/syntax/calling_methods.rdoc: Link to defining methods.
- * doc/syntax/methods.rdoc: Link to calling methods, fixed typo.
+Thu Oct 29 13:53:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jan 16 03:15:00 2013 Eric Hodel <drbrain@segment7.net>
+ * array.c (rb_ary_to_ary): do not use #respond_to? to detect
+ to_ary. Just call. [ruby-core:23738]
- * doc/syntax/methods.rdoc: Fixed link
- * doc/syntax/modules_and_classes.rdoc: Fixed link
- * doc/syntax.rdoc: Updated with links to the recently added pages
+ * eval.c (rb_check_funcall): new function with method existence
+ check. returns Qundef when the method does not exist.
-Wed Jan 16 03:05:50 2013 Eric Hodel <drbrain@segment7.net>
+ * enumerator.c (enumerator_rewind): just call method, using
+ rb_check_funcall(). [ruby-core:23738]
- * doc/syntax/control_expressions.rdoc (redo Statement): Added note
- about retry.
- * doc/syntax/exceptions.rdoc: Added retry statement
+ * error.c (exc_equal): ditto.
-Tue Jan 15 23:12:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (convert_type): ditto.
- * tool/vpath.rb (VPath#list): default separator to PATH_SEPARATOR from
- configure.in for make, not same name constant of File for use in ruby.
+ * error.c (rb_name_err_mesg_new): export function.
-Tue Jan 15 22:30:04 2013 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * eval.c (make_exception): ditto.
- * lib/irb/ext/save-history.rb: identify rightly a status of a
- history file that already exists [Bug #7694]. Thanks Nobuhiro IMAI
- for this patch.
+ * io.c (pop_last_hash): return early when the last argument is nil.
-Tue Jan 15 15:55:28 2013 Eric Hodel <drbrain@segment7.net>
+ * io.c (rb_io_puts): treat T_STRING specially for small
+ optimization.
- * doc/syntax/control_expressions.rdoc: Added description of control
- expressions in ruby.
+ * vm_eval.c (raise_method_missing): skip method call if possible
+ using rb_method_basic_definition_p().
-Tue Jan 15 13:33:00 2013 Eric Hodel <drbrain@segment7.net>
+ * vm_eval.c (method_missing): ditto.
- * doc/syntax/methods.rdoc (Method Names): Added method names including
- operator methods.
- * doc/syntax/methods.rdoc (Return Values): Added note that assignment
- methods ignore return values.
- * doc/syntax/precedence.rdoc: Added document describing precedence.
+ * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_debug): test
+ suites changed to ignore exceptions caused by just-call policy.
-Tue Jan 15 11:49:31 2013 Eric Hodel <drbrain@segment7.net>
+Thu Oct 29 04:41:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * doc/syntax/methods.rdoc (Block Argument): Added section on block
- argument. Thanks to Andy Lindeman.
+ * ruby.c (process_options): call rb_filesystem_encoding().
-Tue Jan 15 10:54:59 2013 Eric Hodel <drbrain@segment7.net>
+Thu Oct 29 04:40:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * doc/syntax/calling_methods.rdoc (Arguments): Added improved
- introduction to arguments including passing style and lazy
- evaluation. Thanks to Matt Aimonetti.
- * doc/syntax/calling_methods.rdoc (Positional Arguments): Added
- description for sending a message to a method with *arguments
- * doc/syntax/calling_methods.rdoc (Default Positional Arguments):
- Added description. Thanks to Andy Lindeman.
- * doc/syntax/calling_methods.rdoc (Block Local Arguments):
- Added description of block locals. Thanks to Justin Collins.
- * doc/syntax/calling_methods.rdoc (Hash to Keyword Arguments): Added
- section describing ** operator. Thanks to Justin Collins.
+ * io.c (Init_IO): rb_default_rs should be US-ASCII.
-Tue Jan 15 10:40:18 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Oct 29 01:22:01 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
- * test_lazy_enumerator: Test that map & flat_map also require a block
+ * ext/socket/extconf.rb : Compilation failure on AIX.
+ ss_len (a member of struct sockaddr_storage) has preceding __,
+ but ss_family does not have it from AIX 5.2.
-Tue Jan 15 09:22:47 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Oct 28 16:32:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * thread_pthread.c (gvl_init): Reset gvl.wait_yield explicitly when
- fork()ing. Patch by Apollon Oikonomopoulos. Thanks!
- [Bug #7693][ruby-core:51424]
+ * encoding.c (get_filesystem_encoding): removed.
-Tue Jan 15 09:27:56 2013 Eric Hodel <drbrain@segment7.net>
+ * encoding.c (rb_locale_encindex): added.
- * doc/syntax/calling_methods.rdoc (Receiver): Added :: as pointed out
- by Tony Arcieri
- * doc/syntax/calling_methods.rdoc (Block Argument): Fixed { } block
- examples as pointed out by David Copeland.
+ * encoding.c (rb_filesystem_encindex): added.
-Tue Jan 15 09:10:29 2013 Eric Hodel <drbrain@segment7.net>
+ * encoding.c (rb_filesystem_encindex): add an alias 'filesystem'.
+ [ruby-dev:39574]
- * doc/syntax/methods.rdoc (Array/Hash Argument): Moved above Keyword
- Arguments
- * doc/syntax/methods.rdoc (Keyword Arguments): Described ** for
- gathering arbitrary keyword arguments.
+ * encoding.c (enc_find): add rdoc about special aliases.
-Tue Jan 15 08:56:37 2013 Eric Hodel <drbrain@segment7.net>
+ * gem_prelude.rb (Gem.set_home): use Encoding.find('filesystem').
- * doc/syntax/calling_methods.rdoc: Added document describing method
- calls.
+ * gem_prelude.rb (Gem.set_paths): ditto.
-Tue Jan 15 07:39:21 2013 Eric Hodel <drbrain@segment7.net>
+Wed Oct 28 15:02:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/top_level.rb: Fixed extension trimming for page names in
- RDoc HTML output. [ruby-trunk - Bug #7673]
- * test/rdoc/test_rdoc_top_level.rb: Test for above.
+ * gem_prelude.rb (Gem.set_home):
+ force_encoding(Encoding.filesystem_encoding)
+ [ruby-core:25959]
-Mon Jan 14 23:06:41 2013 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * gem_prelude.rb (Gem.set_paths): ditto.
- * lib/irb/ext/save-history.rb: outputs its history to
- owner-only-readable file and change the permission of a file that
- already exists [Bug #7694]. Thanks Nobuhiro IMAI for bug reports.
+Wed Oct 28 14:24:45 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Jan 14 17:12:48 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * encoding.c (get_filesystem_encoding):
+ add Encoding.filesystem_encoding [ruby-dev:39546]
+ also see [ruby-core:25959]
- * enumerator.c (lazy_flat_map_func): flat_map should call each only
- when the value of a block returns a forcable object.
- [ruby-core:51401] [Bug #7690]
+Wed Oct 28 14:51:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c (lazy_flat_map): add documentation.
+ * ext/etc/etc.c (etc_each_group): fixed typo.
- * test/ruby/test_lazy_enumerator.rb: related test.
-Mon Jan 14 16:42:28 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Wed Oct 28 13:02:10 2009 Shugo Maeda <shugo@ruby-lang.org>
- * enumerator.c: Require block for Lazy#{take|drop}_while [Bug #7692]
+ * lib/net/ftp.rb (Net::FTP#initialize): sets @binary to true.
-Mon Jan 14 14:41:00 2013 Kenta Murata <mrkn@mrkn.jp>
+ * lib/net/ftp.rb (Net::FTP#binary=): sends a TYPE command only when
+ logged in. [ruby-dev:39548]
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_s): use CRuby style.
+ * lib/net/ftp.rb (Net::FTP#send_type_command): new private method
+ which sends an appropriate TYPE command according to the value of
+ @binary.
-Mon Jan 14 14:39:00 2013 Kenta Murata <mrkn@mrkn.jp>
+ * lib/net/ftp.rb (Net::FTP#login): calls send_type_command instead
+ of binary=.
- * ext/bigdecimal/bigdecimal.c: use `RB_TYPE_P(x, t)` instead of
- `TYPE(x) == t`.
+Wed Oct 28 12:26:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 14 10:18:56 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * vm_insnhelper.c (vm_setup_method): should push call frame before
+ raising exception, to put the Ruby-defined method name in the
+ error message. [ruby-core:26333]
- * enumerator.c: Fix size for Enumerator::Lazy#flat_map
+ * vm_insnhelper.c (VM_CALLEE_SETUP_ARG): macro modified.
-Mon Jan 14 07:12:52 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * vm_insnhelper.c (vm_yield_setup_args): modified for new
+ VM_CALLEE_SETUP_ARG macro.
- * lib/matrix/lup_decomposition: Fix bugs with LUP Decomposition of
- rectangular matrices. [rubyspec:ba849801a85]
+Tue Oct 27 22:46:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Jan 14 06:46:53 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/net/ftp.rb (Net::FTP#initialize): @sock = nil.
- * regparse.c (add_ctype_to_cc): don't check dup warn on adding
- negative ctype to cclass. [Bug #7471] [ruby-core:50344]
+ * lib/net/ftp.rb (Net::FTP#binary=): send command only when
+ socket is open. [ruby-dev:39548]
-Mon Jan 14 06:06:03 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Tue Oct 27 22:22:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/matrix/eigenvalue_decomposition: Backport bugfix of Jama 1.0.3
- [rubyspec:df87040be371]
+ * ext/stringio/stringio.c (Init_stringio): added read_nonblock and
+ write_nonblock aliases. [ruby-dev:39551]
-Sun Jan 13 16:45:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * ext/stringio/stringio.c (strio_data_type): typed.
- * ext/psych/yaml/scanner.c: Fix typos, patch by James Dabbs
- [Github tenderlove/psych#118]
+Tue Oct 27 21:20:35 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sun Jan 13 15:00:00 2013 Kenta Murata <mrkn@mrkn.jp>
+ * ext/tk/lib/tk/variable.rb: add TkVariable#+@ and -@ method.
- * ext/bigdecimal/bigdecimal.c (BigDecimal_sub):
- need to specify precision for converting Rational and Float.
- [ruby-dev:46544] [Bug #7404]
+Tue Oct 27 16:36:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_mult): ditto.
+ * string.c (chopped_length): get rid of unexpected exception.
+ see [ruby-core:26336].
- * ext/bigdecimal/bigdecimal.c (BigDecimal_divide): ditto.
+Tue Oct 27 15:53:10 2009 Tanaka Akira <akr@fsij.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): ditto.
+ * gc.h (SET_MACHINE_STACK_END): use __i386.
+ Some compiler may not define __i386__.
+ Solaris 64-bit Developer's Guide:
+ http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view
- * ext/bigdecimal/bigdecimal.c (BigDecimal_divremain): ditto.
+Tue Oct 27 15:44:48 2009 Shugo Maeda <shugo@ruby-lang.org>
- * test/bigdecimal/test_bigdecimal.rb: add tests for the above fixes.
+ * lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
+ a Pathname instance into a string. [ruby-core:26237]
-Sun Jan 13 14:48:55 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Tue Oct 27 12:30:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/matrix/eigenvalue_decomposition: Fix eigensystem with complex
- eigenvectors. Patch by pypypy567.
- [Bug #7208] [ruby-dev:46251] [rubyspec:242f8e55bd]
+ * gc.h (SET_MACHINE_STACK_END): use __i386__ instead of __i386,
+ and explicit size qualifiers.
- * lib/matrix/lup_decomposition.rb: Fix error for rectangular matrices
- [bug#7620] [ruby-core:51118] [rubyspec:41f833ee2]
+Tue Oct 27 09:40:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Jan 13 14:06:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * gc.h (SET_MACHINE_STACK_END): add x86_64 version by nobu.
- * lib/irb.rb, lib/prime.rb: Typos in overview
- Patch by Ershad K [Github Fixes #234]
+Tue Oct 27 09:27:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Jan 13 13:40:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * vm_exec.c (DECL_SC_REG): use __clang__.
- * lib/open3.rb : Typo in Open3 overview. Patch by zed_0xff
- [Github Fixes #233]
+Tue Oct 27 08:56:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jan 12 17:42:00 2013 Kenta Murata <mrkn@cookpad.com>
+ * mkconfig.rb: reverted r25443 because build_os is used in mkmf.rb
+ on some platforms. [ruby-core:26332]
- * numeric.c (do_coerce): fix for the exceptions which the coerce
- method raises. The optimization done by r38756 is preserved.
- [Bug #7645] [ruby-core:51213]
+Tue Oct 27 08:01:57 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Sat Jan 12 16:12:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (ripper_filename): add Ripper#filename. [ruby-dev:37856]
- * win32/setup.mak (-runtime-): see msvcrt from link header on mswin
- instead of running testing executable file, for cross compiling.
+ * test/ripper/test_filter.rb: add more tests.
-Sat Jan 12 08:58:47 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Oct 27 07:53:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that
- contain something besides a hash should be left in tact.
+ * gc.c (garbage_collect_with_gvl): do not garbage_collect when
+ dont_gc flag turned on. [ruby-core:26327]
- * test/psych/test_merge_keys.rb: test for change
+Tue Oct 27 07:38:39 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat Jan 12 07:52:47 2013 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * ext/tk/tcltklib.c,stubs.c: remove errors or warnings when compiled
+ with old ruby 1.8.x.
- * ext/win32ole/win32ole.c (ole_set_byref): support VT_UI8|VT_BYREF,
- VT_I8|VT_BYREF in cygwin and mingw.
+ * ext/tk/tkutil/tkutil.c: ditto.
- * ext/win32ole/win32ole.c (ole_variant2val): ditto.
+Tue Oct 27 05:56:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/win32ole/test_win32ole_variant.rb (test_s_new_with_i8_byref):
- ditto.
+ * vm.c (invoke_block_from_c): return Qnil when its iseq is
+ SPECIAL CONST. [ruby-core:26335]
- * test/win32ole/test_win32ole_variant.rb (test_s_new_with_ui8_byref):
- ditto.
+Tue Oct 27 05:11:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Jan 12 02:45:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it.
+ LLVM/clang defines __GNUC__ but doesn't have __asm__.
- * man/ruby.1 (options): include --*-encoding from r38784
+Tue Oct 27 03:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 11 23:34:48 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * win32/Makefile.sub (config.h): added RUBY_SITEARCH to use
+ different name from RUBY_ARCH. [ruby-core:26324]
- * ruby.c (usage): sort --*-encoding in help. (same order of -E)
+Mon Oct 26 20:04:13 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Fri Jan 11 16:56:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails
+ [ruby-core:26316]
- * tool/mkconfig.rb: use configured libdir value to fix
- --enable-load-relative on systems where libdir is not default value,
- overridden in config.site files. [ruby-core:47267] [Bug #6903]
+Mon Oct 26 18:37:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jan 11 11:59:32 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * hash.c (default_proc_arity_check): new support function.
- * string.c (dispose_string): use rb_str_free for freeing string in
- parse.y. by Sokolov Yura <funny.falcon@gmail.com>
- https://github.com/ruby/ruby/pull/87 fix GH-87
+ * hash.c (rb_hash_initialize): should do arity check as #default_proc=.
+ [ruby-core:26281]
-Fri Jan 11 09:56:22 2013 Shugo Maeda <shugo@ruby-lang.org>
+Mon Oct 26 13:24:17 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * insns.def (defineclass): private constants should not be accessed
- by scoped module definitions. The bug was introduced in r38495.
+ * ext/tk/lib/remote-tk.rb: typo fixed.
- * test/ruby/test_module.rb: related test.
+Mon Oct 26 12:34:08 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Jan 11 02:11:59 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * ruby.c (usage): -T and -W descriptions updated. see
+ [ruby-dev:39539]
- * lib/rbconfig/obsolete.rb (respond_to_missing?): use send because
- RbConfig.respond_to_missing? is now private.
+ * man/ruby.1: ditto.
-Thu Jan 10 22:00:58 2013 Koichi Sasada <ko1@atdot.net>
+Mon Oct 26 12:06:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (VM_DEBUG_BP_CHECK): set 0 as default.
- This flag specifies checking BP consistency on each frame popping.
- Now, we don't have any trouble on it, so I remove it.
- If you feel any bugs about VM execution, then set it to 1.
+ * io.c (io_fwrite): adjust stdio file position after direct write on
+ BSDish platforms. [ruby-core:26300]
-Thu Jan 10 21:03:05 2013 TAKANO `takano32' Mitsuhiro <tak@no32.tk>
+Sun Oct 25 15:44:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * cont.c: define FIBER_USE_NATIVE as 0 in ia64.
+ * ext/dl/handle.c (dlhandle_sym): fixed an invalid local variable
+ declaration.
-Thu Jan 10 19:39:05 2013 TAKANO `takano32' Mitsuhiro <tak@no32.tk>
+Sun Oct 25 13:33:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c: fix RB_GC_SAVE_MACHINE_REGISTER_STACK define for ia64.
+ * io.c (io_cntl): F_DUPFD is platform dependent.
-Thu Jan 10 17:45:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Oct 25 10:19:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Makefile.in, win32/Makefile.sub ($(MKFILES)): continue if Makefile
- unchanged.
+ * ext/dl/handle.c (rb_dlhandle_close): fixed an invalid local
+ variable declaration.
-Thu Jan 10 16:31:20 2013 Shugo Maeda <shugo@ruby-lang.org>
+Sun Oct 25 05:44:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * vm_insnhelper.c (vm_search_super_method): raise a TypeError
- instead of a NotImplementedError if self is not an instance of the
- current class. [ruby-dev:39772] [Bug #2402]
+ * lib/matrix.rb (**): Optimization (up to 45% faster)
-Thu Jan 10 16:47:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Oct 24 14:28:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/extconf.rb (find_tcltk_header): use have_header instead of
- try_cpp, which is incredibly slow with VC.
+ * hash.c (rb_hash_set_default_proc): checks arity of default_proc
+ of a Hash. [ruby-core:26087]
-Thu Jan 10 15:55:28 2013 Shugo Maeda <shugo@ruby-lang.org>
+Sat Oct 24 13:38:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * numeric.c (do_coerce): remove an unused variable.
+ * object.c (rb_obj_cmp): defines Object#<=>. [ruby-core:24063]
-Thu Jan 10 15:35:55 2013 Shugo Maeda <shugo@ruby-lang.org>
+Sat Oct 24 09:51:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * tool/gen_dummy_probes.rb: remove comments in probes.d to fix the
- compilation error introduced by r38755.
+ * enum.c (enum_flat_map): new method that concatenates the values
+ from given block. also provides alias #collect_concat.
-Thu Jan 10 11:15:04 2013 Kenta Murata <mrkn@cookpad.com>
+Sat Oct 24 00:36:47 2009 Tanaka Akira <akr@fsij.org>
- * numeric.c (do_coerce): speed optimization by using rb_check_funcall
- instead of rb_rescue + rb_funcall.
- This fix is based on the patch by Benoit Daloze.
- [Bug #7645] [ruby-core:51213]
+ * io.c (io_cntl): update max file descriptor by the result of
+ fcntl(F_DUPFD).
-Thu Jan 10 11:15:04 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Oct 23 16:31:14 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * probes.d: updating probes to be more symmetrical, adding
- documentation.
+ * class.c (rb_class_new): move class check to rb_check_inheritable().
- * load.c: ditto
+ * class.c (rb_check_inheritable): should not allow subclass of
+ class Class. [ruby-core:26225]
-Thu Jan 10 04:23:07 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Oct 23 14:25:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots from
- floats so that Float() will not raise an exception.
+ * configure.in (target, target_alias): replace with real cpu.
- * test/psych/test_numeric.rb: test to ensure "1." can be loaded
+ * mkconfig.rb: build* are not needed in rbconfig.rb.
- * test/psych/test_string.rb: make sure "1." can round trip
+ * configure.in (warnflags): use -Wextra only when
+ -Wno-missing-field-initializers is available.
-Thu Jan 10 03:38:40 2013 Aaron Patterson <aaron@tenderlovemaking.com>
+ * configure.in (optflags): removed -fomit-frame-pointer by default.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: ascii only binary strings
- will be dumped as unicode. Thanks Paul Kunysch!
+Fri Oct 23 09:12:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/psych/test_string.rb: appropriate test
+ * lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
+ non-nil.
-Thu Jan 10 03:29:55 2013 Koichi Sasada <ko1@atdot.net>
+Fri Oct 23 07:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * compile.c (compile_array_): modify wrong optimization.
- A script "[print(1)]; print(2)" should output "12".
- However, the compiler had eliminated "[print(1)]" expression
- because it is void expression (unused array).
- Of course, side-effect should be remained.
- This issue is reported by Masaya Tarui.
+ * configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
+ ruby without current libraries.
- * bootstraptest/test_literal.rb: add a test.
+ * common.mk (rdoc): use XRUBY.
-Wed Jan 9 22:07:42 2013 Masaki Matsushita <glass.saga@gmail.com>
+Fri Oct 23 07:28:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (load_lock): if thread shield is destroyed and there is no
- waiting thread, insert new thread shield into load_table.
- [Bug #7530] [ruby-core:50645]
+ * configure.in (warnflags): use -Wextra instead of -Wall.
-Wed Jan 9 21:43:32 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * gc.c (mark_current_machine_context): get rid of warning.
- * load.c (load_lock): revert r38744. it should acquire new thread
- shield.
+Thu Oct 22 21:10:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jan 9 15:40:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * class.c (rb_obj_basic_to_s_p): typo. Please become familiar with
+ the ANSI style.
- * vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil,
- since lep_svar_place() expects uninitialized svar to be nil, not 0.
+Thu Oct 22 20:20:27 2009 Tanaka Akira <akr@fsij.org>
-Wed Jan 9 13:20:23 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * test/ruby/envutil.rb (assert_in_out_err): test_stdout and
+ test_stderr should be an array.
- * test/ruby/test_require.rb: improve test for r38744.
- fix to use Tempfile instead of temporary file in current directory.
- the patch is from nobu (Nobuyoshi Nakada).
+ * test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of
+ assert_in_out_err should be a string.
-Wed Jan 9 09:53:23 2013 Masaki Matsushita <glass.saga@gmail.com>
+Thu Oct 22 17:49:05 2009 Akinori MUSHA <knu@iDaemons.org>
- * load.c (load_lock): fix not to delete thread shield twice.
- it may break the shield locked by another thread.
- [Bug #7530] [ruby-core:50645]
+ * lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
+ convert an integer back and forth.
- * test/ruby/test_require.rb: a test for above.
+Thu Oct 22 17:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 9 02:13:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (arg_prepend): removed. a patch from Mikhail T. in
+ [ruby-core:26217].
- * include/ruby/ruby.h (RBasic): to be aligned on a VALUE size
- boundary. [Bug #7647]
+Thu Oct 22 04:54:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jan 8 14:41:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (rb_obj_inspect): print instance variables only when
+ Object#to_s is not overridden. [ruby-core:24425]
- * vm_core.h (rb_iseq_t): move flip_cnt from struct iseq_compile_data,
- because it has same life span as enclosing iseq. [Bug #7671]
- [ruby-core:51296]
+ * class.c (rb_obj_basic_to_s_p): new function.
-Mon Jan 7 23:43:00 2013 Kenta Murata <mrkn@mrkn.jp>
+Wed Oct 21 19:32:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal):
- add RB_GC_GUARD to prevent the intermediate object is GCed too early.
- This patch was made by Yusuke Endoh. [Bug #7044] [ruby-core:47632]
+ * object.c (rb_obj_inspect): fixed rdoc about the case that to_s
+ is called. [ruby-core:24425]
- * test/bigdecimal/test_bigdecimal.rb: add a reproduction test for
- the issue [Bug #7044]
+Wed Oct 21 08:17:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jan 7 21:40:36 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * test/logger/test_logger.rb (TestLogDevice#test_write): check
+ also error message.
- * vm_method.c (Init_eval_method): main.public and main.private
- should be private.
+Wed Oct 21 03:54:41 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * proc.c (Init_Proc): main.define_method should be private.
+ * lib/matrix.rb:
+ Creator functions now strict with their arguments
+ Support for empty matrices (see new method Matrix.empty)
+ Matrix#trace raises an ErrDimensionMismatch if the matrix is not square
+ Enumerators are returned when no block given
+ Consistent results when accessing elements with out of bounds indices
+ Details in [ruby-core:23598].
- * test/ruby/test_module.rb: related test.
+Wed Oct 21 00:27:15 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Mon Jan 7 20:48:47 2013 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/webrick/httpauth/digestauth.rb: typo in exception message fixed.
- * eval.c (Init_eval): main.include should be private.
- [ruby-core:51293] [Bug #7670]
+Wed Oct 21 00:17:28 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * test/ruby/test_module.rb (test_top_include_is_private): a new test
- for the above change.
+ * lib/logger.rb: imported upstream version (logger/1.2.7) see #2238.
+ * 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)
+ * test/logger/test_logger.rb: ditto.
-Mon Jan 7 20:29:50 2013 Shugo Maeda <shugo@ruby-lang.org>
+Tue Oct 20 22:29:06 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
- * NEWS: remove description about `require "refinement"'.
+ * lib/matrix.rb: Bug fix. See detail [ruby-core:23598].
-Mon Jan 7 20:15:49 2013 Shugo Maeda <shugo@ruby-lang.org>
+Tue Oct 20 17:57:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (Init_eval): enable Refinements by default.
- [ruby-core:51286] [Bug #7667]
+ * marshal.c (w_symbol, r_symreal): fixed the order of symbol and
+ its encoding modifier, in order to make the dump readable from
+ 1.8. [ruby-dev:39515]
- * eval.c (rb_mod_refine, top_using): show a warning when
- Module#refine or main.using is called at the first time.
+Tue Oct 20 16:41:18 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/refinement/*: removed the extension library "refinement".
+ * include/ruby/win32.h (finite, scalb): inline'ed non-standard
+ identifier macros. [ruby-core:26166]
- * test/ruby/test_refinement.rb: fix for the above changes.
+Tue Oct 20 15:38:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jan 7 17:34:22 2013 Koichi Sasada <ko1@atdot.net>
+ * parse.y (ripper_intern): enable literal optimization.
- * include/ruby/ruby.h (RUBY_EVENT_SPECIFIED_LINE): make it special.
- This flag is not contained by RUBY_EVENT_TRACEPOINT_ALL.
- This event is experimental one. It is possible to remove/rename
- flag name after 2.0.1.
+ * parse.y (method_call): dispatch symbols. a patch from Andy Keep in
+ [ruby-core:26169]. [ruby-core:26165]
- * vm_trace.c (get_event_id): return :line if SPECIFIED_LINE was
- occurred. `:specified_line' never been returned.
+ * parse.y (mlhs_basic): fixed handling splat in middle of mlhs. a
+ patch from Andy Keep in [ruby-core:26163]
-Mon Jan 7 15:42:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (parser_here_document): dispatch delayed heredoc
+ contents. based on a patch from Andy Keep in [ruby-core:24855].
- * parse.y (f_kwrest): allow bare kwrest_mark as valid syntax. its
- semantics is still undefined. [Bug #7662] [ruby-core:51269]
+Mon Oct 19 15:17:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jan 7 15:31:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * .gdbinit (rb_method_entry): search method entry by class and id.
- * parse.y (f_kwrest): reject duplicated kwrest argument name.
+Mon Oct 19 15:03:31 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Jan 7 15:24:10 2013 Koichi Sasada <ko1@atdot.net>
+ * win32/Makefile.sub (enc/unicode/name2ctype.h): no need to create
+ directory if it already exists.
- * vm_trace.c (rb_threadptr_exec_event_hooks_orig): pop tag before
- JUMP_TAG() if frame is `finish' frame.
- Without this patch, there is an inconsistency between control
- frame stack and tags stack.
- [Bug #7668]
+Mon Oct 19 11:34:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_settracefunc.rb: add a test for above.
+ * .gdbinit (rb_ps): dump all threads and their callstacks. based
+ on [ruby-core:26155] by Joshua ben Jore <twists AT gmail.com>.
-Mon Jan 7 15:21:48 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 19 10:59:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Makefile.in, common.mk (fake, yes-fake, no-make): these dependencies
- are not platform dependent.
+ * iseq.c (prepare_iseq_build, rb_iseq_build_for_ruby2cext):
+ untrust mark array. [ruby-core:26137]
- * win32/Makefile.sub ($(arch)-fake.rb): workaround.
+Mon Oct 19 05:49:53 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Mon Jan 7 12:09:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rexml/element.rb (text=): false should be converted to string.
+ A patch by Teruo Oshida [ruby-dev:38351]
- * vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
- set keyrest hash after making rest array, so that the last element
- will not be overwritten. [ruby-core:51278] [Bug #7665]
+Sun Oct 18 22:33:25 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Mon Jan 7 09:37:24 2013 Koichi Sasada <ko1@atdot.net>
+ * lib/date.rb: do not require lib/delta.rb.
- * NEWS: add a NEWS entry about RubyVM.
+ * lib/date/delta.rb: follows the above change.
-Sun Jan 6 19:06:57 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+Sun Oct 18 19:14:21 2009 Tanaka Akira <akr@fsij.org>
- * win32/Makefile.sub: Fix build with VC.
- Patch by Charlie Savage. Fixes [ruby-core:51261]
+ * parse.y (is_special_global_name): add boundary check.
-Sun Jan 6 18:43:48 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+Sun Oct 18 18:31:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bootstraptest/test_io.rb: add a test for [ruby-dev:46834].
+ * ruby.c (ruby_init_loadpath_safe): should not dup tmp string. a
+ patch from neomjp neomjp in [ruby-core:24251].
- * io.c (rb_cloexec_fcntl_dupfd) Use an emulation with dup(2) when
- fcntl(2) and/or F_DUPFD is unavailable.
- Suggested by akr.
+Sun Oct 18 09:49:14 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * configure.in (HAVE_FCNTL): NativeClient does not provide fcntl(2).
+ * test/test_prime.rb
+ (TestPrime#test_eratosthenes_works_fine_after_timeout):
+ test for [ruby-dev:39465].
-Sun Jan 6 11:11:26 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/prime.rb (Prime::EratosthenesSieve):
+ fixed [ruby-dev:39465].
+ suppressed memory reallocation.
+ constantified some magic numbers.
- * doc/syntax/modules_and_classes.rdoc: Fixed typo.
+Sat Oct 17 22:11:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jan 6 05:35:18 2013 Eric Hodel <drbrain@segment7.net>
+ * marshal.c (id2encidx): register encoding name.
+ (r_object0): register object before encoding name.
+ [ruby-core:24882]
- * doc/syntax/modules_and_classes.rdoc: Added singleton classes
- documentation.
+Sat Oct 17 17:56:58 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Sun Jan 6 02:22:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * test/rake/test_fileutils.rb (Rake::TestFileUtils#test_sh): uses
+ FileUtils::RUBY instead of fixed "ruby" so that the ruby command
+ works fine in Ruby's "make test-all".
+ (test_sh_with_a_single_string_argument): ditto.
+ (test_sh_with_multiple_arguments): ditto.
+ (test_sh_failure): ditto
+ (test_sh_special_handling): ditto.
- * lib/webrick/httpservlet/abstract.rb (WEBrick::HTTPServlet): Typo in
- example. Patch by shlensky [Fixes #232 on github]
+Sat Oct 17 17:30:06 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Jan 5 21:15:10 2013 NARUSE, Yui <naruse@ruby-lang.org>
+ * bignum.c (big_split): fix off-by-one error. [ruby-dev:39501]
- * lib/net/http/generic_request.rb:
- Amazon ECA API and GTE/1.3 disallow requests whose host has port
- number if its port number equals to default port number of the
- scheme. [Bug #7650]
+Sat Oct 17 16:34:27 2009 Tanaka Akira <akr@fsij.org>
-Sat Jan 5 13:58:59 2013 Eric Hodel <drbrain@segment7.net>
+ * parse.y (parser_yylex): fix token even after trailing under score.
- * doc/syntax/modules_and_classes.rdoc: Improved description of methods
- on a module or class as suggested by Tobias Buhlmann
+Sat Oct 17 11:27:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jan 5 13:38:07 2013 Masaki Matsushita <glass.saga@gmail.com>
+ * vm_method.c (basic_obj_respond_to): call #respond_to_missing?
+ always with two arguments. [ruby-core:26090]
- * string.c (rb_str_enumerate_lines): fix invalid byte sequence error
- when a separator is passed. The patch is from yoshidam (Yoshida
- Masato).
- [Bug #7646] [ruby-dev:46827]
+Sat Oct 17 08:51:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_string.rb: a test for above.
+ * lib/delegate.rb (Delegator#respond_to_missing): warn only when
+ specified method is a private. [ruby-dev:39498]
-Sat Jan 5 12:25:42 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Oct 17 00:05:53 2009 wanabe <s.wanabe@gmail.com>
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
- check stdout and stderr both.
+ * st.c (unpack_entries): save table->bins and never change the table
+ during unpacking. Because st_insert() may cause GC and refer the
+ table, i.e. st_foreach(). [Bug #2196]
-Sat Jan 5 10:21:54 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 16 22:20:25 2009 Tanaka Akira <akr@fsij.org>
- * doc/syntax/modules_and_classes.rdoc: Added documentation of syntax
- for Modules and Classes.
- * doc/syntax/methods.rdoc: Moved some text to the Modules and
- Classes syntax document.
+ * prelude.rb (require_relative): defined as a module function of
+ Kernel.
-Sat Jan 5 08:38:27 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 16 20:18:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * doc/syntax/methods.rdoc: Added return values and scope sections,
- slightly modified from the original patch. Fixes #227 from github by
- Dave Brown.
+ * lib/delegate.rb (Delegator#method_missing): remove backtrace
+ lines _until_ `method_missing'.
-Sat Jan 5 08:21:41 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Oct 16 20:09:55 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_cloexec_fcntl_dupfd): improve #ifdef condition.
- * io.c (rb_maygvl_fd_fix_cloexec): ditto.
+ * lib/delegate.rb (Delegator#freeze): #freeze should freeze self
+ and the target at once. [ruby-core:26118]
-Sat Jan 5 07:54:59 2013 Eric Hodel <drbrain@segment7.net>
+Fri Oct 16 19:39:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rubygems/commands/cleanup_command.rb: Clean all possible gems
- using multiple passes. Fixes RubyGems bug #422. Refactored for
- maintainability.
- * test/rubygems/test_gem_commands_cleanup_command.rb: Test for above.
+ * lib/delegate.rb (Delegator#respond_to_missing): warn if optional
+ include_private argument is not false. Delegator does (and
+ should) not forward private methods. [ruby-core:26080]
-Sat Jan 5 05:04:39 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/delegate.rb (Delegator#respond_to_missing): instead of
+ redefining #respond_to?, use #respond_to_missing?. [ruby-core:26081]
- * gc.c (vm_xrealloc): add a few comment why we avoid realloc(ptr,0).
+Fri Oct 16 18:42:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 4 20:17:06 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+ * bootstraptest/test_gc.rb: added tests based on [ruby-dev:39484]
+ from wanabe <s.wanabe AT gmail.com>.
- * Makefile.in (RBCONFIG): Moved from common.mk in order to use the
- variable in Makefile.in.
+Fri Oct 16 16:09:01 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * win32/Makefile.sub (RBCONFIG): Ditto.
+ * win32/win32.c (rb_w32_spawn): `\'' is also quote character.
-Fri Jan 4 19:45:50 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+Fri Oct 16 13:40:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (run, parse): Use BTESTRUBY instead of MINIRUBY to handle
- cross-compiling cases, e.g. NativeClient.
+ * gc.h (rb_gc_debug_body): constified.
-Fri Jan 4 17:58:16 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+Fri Oct 16 13:20:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * common.mk (yes-btest): btest depends on also $(arch)-fake.rb and
- rbconfig.rb on building for NativeClient.
+ * ext/bigdecimal/bigdecimal.c (VpMidRound): remove warnings.
+ patch from Charlie Savage. [ruby-core:22869]
- * Makefile.in (fake): Avoid generating $(arch)-fake.rb unless cross
- compiling.
+ * ext/digest/bubblebabble/bubblebabble.c (bubblebabble_str_new): ditto.
- * configure.in (CROSS_COMPILING): New substitution.
+ * ext/digest/digest.c (hexencode_str_new): ditto.
-Fri Jan 4 16:26:45 2013 Eric Hodel <drbrain@segment7.net>
+ * ext/iconv/iconv.c (iconv_convert): ditto.
- * lib/rubygems/doctor.rb: Process directories in order in case the
- filesystem doesn't. [ruby-trunk - Bug #7618]
+ * ext/socket/socket.c (inspect_sockaddr): ditto.
- Process specifications before other directories in case of bugs.
- * test/rubygems/test_gem_doctor.rb: Test for above.
+ * ext/socket/raddrinfo.c (sockaddr_obj): ditto.
- * lib/rubygems.rb: Updated version.
+ * ext/syck/emitter.c (syck_emitter_write): ditto.
- * test/rubygems/test_require.rb: Fixed double require of
- benchmark.rb. RubyGems bug #420.
+ * ext/syck/emitter.c (syck_emitter_flush): ditto.
- * test/rubygems/test_gem_commands_check_command.rb: Fixed unused
- variable warnings.
- * test/rubygems/test_gem_commands_query_command.rb: ditto
- * test/rubygems/test_gem_installer.rb: ditto
+ * ext/syck/emitter.c (syck_emit_tag): ditto.
+
+Fri Oct 16 12:03:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Jan 4 15:05:25 2013 Eric Hodel <drbrain@segment7.net>
+ * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io
+ doesn't have encoding.
- * lib/rdoc/cross_reference.rb: Fixed matching of C#=== or #===. RDoc
- bug #164
- * test/rdoc/test_rdoc_cross_reference.rb: Test for above.
+Fri Oct 16 03:15:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/parser/changelog.rb: Fixed parsing of dates. RDoc bug #165
- * test/rdoc/test_rdoc_parser_changelog.rb: Test for above.
+ * lib/csv.rb (CSV#read_to_char): set encoding and verify data
+ which read from io before encode it to @encoding.
- * lib/rdoc/parser.rb: Fixed parsing multibyte files with incomplete
- characters at byte 1024. [ruby-trunk - Bug #6393]
- Fixed handling of -E. [ruby-trunk - Bug #6392]
- * test/rdoc/test_rdoc_options.rb: Test for above.
- * test/rdoc/test_rdoc_parser.rb: ditto.
- * test/rdoc/test_rdoc_parser_c.rb: ditto.
- * test/rdoc/test_rdoc_parser_changelog.rb: ditto.
- * test/rdoc/test_rdoc_parser_markdown.rb: ditto.
- * test/rdoc/test_rdoc_parser_rd.rb: ditto.
- * test/rdoc/test_rdoc_rdoc.rb: ditto.
+ * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding.
- * lib/rdoc/tom_doc.rb: Fixed parsing of [] in TomDoc arguments list.
- RDoc bug #167
- * test/rdoc/test_rdoc_tom_doc.rb: Test for above.
+ * lib/csv.rb (CSV#read_io): add to read string and set @io's
+ encoding.
- * lib/rdoc.rb: Update version.
+Thu Oct 15 18:26:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 4 11:51:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * parse.y (rb_intern3): check symbol table overflow before generate
+ next id. [ruby-core:26092]
- * lib/forwardable.rb: Fix rdoc parameters for ::def_single_delegator.
- Patch by Vladimir Andrijevik [Github Fixes #230]
+Thu Oct 15 15:14:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 4 00:35:11 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+ * io.c (io_encoding_set): get rid of parsing non-ascii string, and
+ refine messages for invalid name encoding.
- Fix failures on btest for NativeClient.
- * bootstraptest/runner.rb (nacl?): New method to distinguish NaCl
- cross build.
+ * io.c (io_reopen): unread current buffer before telling the
+ position, for the case of reopening same file. [ruby-dev:39479]
- * bootstraptest/test_io.rb: Skip unsupported operations.
+Thu Oct 15 14:20:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bootstraptest/test_literal.rb: ditto.
+ * ext/iconv/iconv.c (iconv_create): cannot retry with given block.
+ [ruby-dev:39487]
-Fri Jan 4 00:29:40 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+Thu Oct 15 09:25:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c (rb_cloexec_fcntl_dupfd): Fix failures in
- bootstrap_test/test_io.rb. NativeClient does not support F_DUPFD
- but supports dup2(2).
+ * ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK
+ flag in st_mode of struct stat. so, use rb_w32_issocket() function
+ instead of S_ISSOCK macro.
-Thu Jan 3 17:46:50 2013 Kouhei Sutou <kou@cozmixng.org>
+Thu Oct 15 00:47:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rexml/element.rb (REXML::Elements#add): Remove too much
- "elements" in document. Sorry...
+ * tool/enc-unicode.rb,
+ enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+ enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+ use UTS#18 for POSIX character class.
+ http://rubyspec.org/issues/show/161
-Thu Jan 3 17:42:32 2013 Kouhei Sutou <kou@cozmixng.org>
+Thu Oct 15 00:26:07 2009 Tanaka Akira <akr@fsij.org>
- * lib/rexml/element.rb (REXML::Elements#each): Add missing
- "elements" in document. [ruby-talk:402713]
- Reported by Wesley Rishel. Thanks!!!
+ * ext/socket/init.c (rsock_init_sock): validate file descriptor.
-Thu Jan 3 15:13:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Wed Oct 14 13:24:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych.rb (Psych.load): Return value of
- Psych::SyntaxError.message should be same as example.
- Patch by Ippei Obayashi [ruby-core:51193] [Bug #7636]
+ * ruby.c (process_options): script name should not be shown in an
+ error message before loaded.
-Thu Jan 3 14:58:00 2013 Zachary Scott <zachary@zacharyscott.net>
+Wed Oct 14 09:06:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/forwardable.rb (SingleForwardable): Fix example in overview
- Patch by Vladimir Andrijevik [Github Fixes #231]
+ * eval.c (ruby_run_node): need to call ruby_cleanup() always even
+ if any error occurred so far.
-Thu Jan 3 14:32:47 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+Wed Oct 14 08:08:12 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * configure.in (OBJCOPY): Fixes build error for NativeClient.
- Avoid disabling OBJCOPY for NativeClient.
+ * proc.c (mnew): Method#new checks for respond_to_missing? with
+ private set to true
+ [ruby-core:26069]
- * thread_pthread.c (rb_reserved_fd_p): USE_SLEEPY_TIMER_THREAD is
- always defined. Fixes compilation error for NativeClient.
+Tue Oct 13 21:05:01 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Jan 02 03:09:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * tool/enc-unicode.rb,
+ enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+ enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+ Add DerivedCoreProperties, PropList (Binary Property),
+ PropertyAlias and PropertyValueAlias.
+ Now users of tool/enc-unicode.rb should specify
+ the directory of UCD files.
- * ext/zlib/zlib.c (Zlib::GzipReader): Fix typo by zed_0xff
- [Fixes Github #229]
+Tue Oct 13 18:54:25 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Jan 02 02:29:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * ext/tk/variable.rb: bug fix. additional trace definition changes the
+ option of first trace definition.
- * hash.c (rb_hash_update): Revert documentation from r38672
- See: https://github.com/ruby/ruby/pull/228#issuecomment-11791013
+Tue Oct 13 18:23:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 02 02:16:00 2013 Zachary Scott <zachary@zacharyscott.net>
+ * parse.y (token_info_push, token_info_pop): reduced ifdefs.
- * hash.c (rb_hash_update): Documentation for Hash#merge and shallow
- copies Patch by Yorick Peterse [Fixes Github #228]
+ * parse.y (parser_magic_comment): fixed normalization.
-Mon Dec 31 15:10:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Tue Oct 13 09:04:14 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * vm_backtrace.c: Add documentation for Kernel#caller_locations,
- Kernel#caller, and Thread::Backtrace::Location
+ * thread.c: Revert changes to Thread#raise made in r25278
+ [ruby-core:25367]
-Mon Dec 31 13:05:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * eval_intern.h: ditto
- * test/ruby/test_backtrace.rb: Add test for r37957 [Feature #7434]
+Mon Oct 12 23:27:57 2009 Shugo Maeda <shugo@ruby-lang.org>
-Sun Dec 30 23:33:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/ftp.rb (login): use "anonymous@" as a default password.
+ [ruby-dev:39451]
- * parse.y (simple_re_meta): escaped closing parenthesis has different
- meaning. [Bug #7610] [ruby-core:51088]
+Mon Oct 12 22:48:25 2009 Shugo Maeda <shugo@ruby-lang.org>
-Sun Dec 30 12:09:47 2012 Charlie Somerville <charlie@charliesomerville.com>
+ * lib/net/ftp.rb (retrlines): added a new block parameter.
- * configure.in: use 4 argument form of AC_CHECK_HEADERS to force
- autoconf to use compiler's result
+ * lib/net/ftp.rb (gettextfile): preserve missing end-of-line at end
+ of files. [ruby-core:24590]
-Sun Dec 30 10:58:04 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+Mon Oct 12 19:48:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_keyword.rb: add a test for passing hash
- as a last argument. [ruby-dev:46712] [Bug #7529]
+ * eval.c (ruby_run_node): if an exception occurred in ruby_option,
+ the result is not executable.
-Sun Dec 30 10:51:29 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+Mon Oct 12 05:51:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_insnhelper.c: set keyword hash on Proc/block calls.
- [ruby-core:51172] [Bug #7630]
+ * regparse.c (fetch_token): warn invalid back reference
+ and subexp call. (\k and \g).
- * test/ruby/test_keyword.rb: add tests for above.
+Mon Oct 12 03:47:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Dec 29 21:57:11 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * marshal.c (has_encoding): added for check the regexp
+ is dumped by 1.8 or 1.9.
- * lib/irb/completion.rb: treat rightly completion for symbol on irb
- [Bug #7632].
+ * marshal.c (r_object0): use has_encoding.
-Sat Dec 29 21:51:30 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sun Oct 11 15:54:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/curses/curses.c (window_cury, window_curx, window_maxy,
- window_maxx, window_begy, window_begx): use RB_UNUSED_VAR()
- to suppress unused-but-set-variable warnings.
+ * ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc. a patch from Justin
+ Collins in [ruby-core:26050].
-Sat Dec 29 16:45:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Sun Oct 11 10:27:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c (RubyVM::InstructionSequence): rdoc formatting
+ * lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
+ attr_reader. [ruby-core:26047]
-Sat Dec 29 15:28:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
+ character class range.
- * iseq.c (RubyVM::InstructionSequence): Add rdoc for new iseq features
- added from r38085, this includes ::of, #path, #absolute_path,
- #label, #base_label, #first_lineno, and #inspect
+Sun Oct 11 10:04:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Dec 29 14:06:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * regparse.c (fetch_token_in_cc): warn when \p is not
+ followed by property name.
- * iseq.c (rb_iseq_line_trace_all, rb_iseq_line_trace_specify): Add
- rdoc for experimental C level api of iseq, from r38076
+ * regparse.c (fetch_token): ditto.
-Sat Dec 29 11:37:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Oct 11 09:44:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * object.c (rb_obj_clone): attach clone to its singleton class during
- cloning singleton class so that singleton_method_added will be called
- on it. based on the patch by shiba (satoshi shiba)[Bug #5283] in
- [ruby-dev:44477]. [Bug #5283]
+ * regerror.c (onig_vsnprintf_with_pattern): added.
-Sat Dec 29 10:10:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regparse.c (onig_syntax_warn): use above.
- * configure.in (crt_externs.h): use standard macro AC_CHECK_HEADERS.
+Sun Oct 11 09:04:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 28 23:12:44 2012 Charlie Somerville <charlie@charliesomerville.com>
+ * include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc
+ optimization.
- * configure.in: check for the whether crt_externs.h is present when compiling
- for darwin (this header is missing in the iOS SDK)
- * eval_intern.h: check HAVE_CRT_EXTERNS_H before including crt_externs.h, if
- not defined, include missing/crt_externs.h instead
- * hash.c: ditto
- * missing/setproctitle.c: ditto
- * missing/crt_externs.h: declare _NSGetEnviron() function and define environ
- for iOS
+ * include/ruby/ruby.h (ruby_exec_node): declared.
-Fri Dec 28 21:40:36 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+Sun Oct 11 03:10:50 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/irb/context.rb: IRB::Context#new: Check from JobManager
- inside IRB namespace [Bug #7628]. Thanks rafaelfranca for bug
- report and its patch.
+ * regparse.c (onig_syntax_warn): added.
-Fri Dec 28 17:06:17 2012 Akinori MUSHA <knu@iDaemons.org>
+ * regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
+ CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.
- * misc/ruby-electric.el (ruby-electric-curlies): Automatically
- indent closing curly brackets when
- ruby-electric-newline-before-closing-bracket is true.
+Sun Oct 11 00:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 28 11:50:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (marshal_dump, marshal_load): prevent from GC.
- * vm_insnhelper.c (vm_yield_setup_block_args): pass single argument to
- single optional parameter unchanged without splatting. [Bug #7621]
- [ruby-dev:46801]
+Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 28 11:17:47 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * file.c (path_check_0): prevent from GC.
- * proc.c (method_eq): fix the documentation to refer to owner.
- [ruby-core:51105] [Bug #7613]
+Sat Oct 10 23:51:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_method.rb (test_alias_onwer): new test to confirm
- that `a == b' returns false if owners of a and b are different.
+ * transcode.c (rb_transcoding, str_transcoding_resize): fixed
+ types.
-Fri Dec 28 07:07:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Oct 10 20:35:27 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * def/id.def: use split(/^/) instead of String#lines to support
- Ruby 1.8.5 as BASERUBY.
+ * math.c (math_atanh): reverted r25279.
-Thu Dec 27 21:56:56 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Oct 10 19:03:29 2009 Tanaka Akira <akr@fsij.org>
- * variable.c (rb_mod_remove_const): fix segv caused by r38558.
+ * ext/curses/curses.c: use rb_thread_blocking_region to avoid
+ rb_read_check. This makes other threads runnable in getstr and
+ wgetstr.
+ (getch_func): extracted from curses_getch.
+ (curses_getch): use rb_thread_blocking_region with getch_func.
+ (getstr_func): extracted from curses_getstr.
+ (curses_getstr): use rb_thread_blocking_region with getstr_func.
+ (wgetch_func): extracted from window_getch.
+ (window_getch): use rb_thread_blocking_region with wgetch_func.
+ (wgetstr_func): extracted from window_getstr.
+ (window_getstr): use rb_thread_blocking_region with wgetstr_func.
-Tue Dec 28 01:13:48 2012 James Edward Gray II <james@graysoftinc.com>
+ * include/ruby/io.h (rb_read_check): deprecated because it access
+ internal of stdio.
- * lib/csv.rb: Added more Hash methods to CSV::Row.
+Sat Oct 10 18:59:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 27 23:27:15 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * configure.in (cflags, cxxflags): remove duplicating options.
- * lib/irb/ruby-lex.rb: make lex_state to EXPR_END when next token
- is an operator after SYMBEG [Bug #6378].
+Sat Oct 10 18:19:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 27 21:30:21 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),
+ win32/mkexports.rb (each_export): exclude _threadptr_ functions.
- * lib/irb/ruby-lex.rb: allow to handle recursive heredocs on
- irb[Bug #5648].
+Sat Oct 10 17:55:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 27 20:45:29 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * eval.c (rb_threadptr_errinfo): renamed.
- * ext/stringio/stringio.c (strio_getline): fix not to raise TypeError
- when limit is nil.
- [Bug #7232] [ruby-core:48531]
+Sat Oct 10 17:03:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/stringio/test_stringio.rb: a test for above.
+ * eval.c (ruby_exec_node): removed unused argument.
-Thu Dec 27 21:08:23 2012 Charlie Somerville <charlie@charliesomerville.com>
+Sat Oct 10 14:55:55 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * vm_core.h (VM_DEFINECLASS_TYPE): explicit cast to enum type to avoid 64->32
- shorten warning
+ * math.c (math_atanh): Fix bug for Math.atanh(+/-1). It now returns
+ +-Infinity. [ruby-core:26028]
-Thu Dec 27 20:11:29 2012 Masaki Matsushita <glass.saga@gmail.com>
+Sat Oct 10 14:09:40 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * ext/stringio/stringio.c (strio_ungetc): raise IOError instead of RuntimeError
- if the string is frozen.
- [Bug #7231] [ruby-core:48530]
+ * thread.c (rb_threadptr_execute_interrupts_rec, rb_threadptr_raise):
+ Thread#raise with no argument will now re-raise the current exception
+ if there is one [ruby-core:25367]
- * ext/stringio/stringio.c (strio_ungetbyte): ditto.
+ * eval.c (get_errinfo, rb_rubylevel_thread_errinfo): Getter for
+ current exception for a given thread
- * test/stringio/test_stringio.rb: a test for above.
+Fri Oct 9 23:10:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Dec 26 23:55:18 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * vm_method.c (rb_method_boundp): should exclude NOEX_RESPONDS.
+ based on the patch from Nikolai Lugovoi. [ruby-core:25949]
- * lib/irb/context.rb: fix IRB::Inspector#keys_with_inspector [Bug #7598]
+Fri Oct 9 21:14:40 2009 Tanaka Akira <akr@fsij.org>
-Wed Dec 26 23:26:15 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP): disable
+ reverse lookup.
+ (Resolv::DNS::Requester::UnconnectedUDP): ditto.
- * lib/irb/context.rb: IRB::Context#use_readline= has been obsolete
- [Bug #6339].
+Fri Oct 9 10:12:13 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 26 21:32:46 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * lib/irb/context.rb (IRB::Context#initialize):
+ remove warnings when $VERBOSE is set as true in .irbrc.
- * lib/irb/context.rb: make a correct prompt from
- IRB.conf[:IRB_NAME] on irb [Bug #6338]. Patched by sho-h.
+Fri Oct 9 02:58:18 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 26 21:09:19 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * tool/enc-unicode.rb: optimized.
- * lib/irb/ext/math-mode.rb: make not able to change math-mode
- after irb starting [Bug #6302]. Patched by sho-h.
+ * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+ enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+ U+100000-U+10FFFD is assigned, not Cn.
-Wed Dec 26 12:52:36 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+Fri Oct 9 02:12:02 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * lib/irb/init.rb: change default debug level for
- irb[ruby-dev:46805], [Bug #6301].
+ * ext/curses/curses.c: Many functions of module Curses could cause a
+ crash if the ncurses library was not properly initialized.
+ Fix pointed out by Alexander Beisig [ruby-core:22592]
+ Functions fixed: attroff, attron, attrset, bkgd, bkgdset,
+ can_change_color, close_screen, closed, color_content, curs_set,
+ def_prog_mode, delch, deleteln, getmouse, getstr, has_colors,
+ init_color, init_pair, insertln, keyname, mouseinterval, mousemask,
+ pair_content, pair_number, reset_prog_mode, resizeterm, scrl,
+ setscrreg, standend, standout, start_color, timeout, ungetmouse,
+ use_default_colors
-Wed Dec 26 11:54:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Oct 9 01:07:34 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * configure.in: enable -fPIE when checking -pie for fixing
- OpenBSD build error. Patch by George Koehler. Thank you!
- [Bug #7606] [ruby-core:51082]
+ * compile.c (ADD_TRACE): fire coverage event in ensure clause.
+ [ruby-dev:39303]
-Wed Dec 26 07:31:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * iseq.h, iseq.c: ditto.
- * string.c (rb_enc_cr_str_copy_for_substr): empty string is always
- valid or 7bit.
+Fri Oct 9 00:33:29 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * string.c (rb_str_enumerate_lines, rb_str_chop): reduce duplicated
- code.
+ * lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian
+ Candler [ruby-core:22723]
- * string.c (rb_str_enumerate_chars): prevent shared copy from GC.
+Fri Oct 9 00:01:17 2009 Tanaka Akira <akr@fsij.org>
-Wed Dec 26 01:31:16 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * ext/socket/lib/socket.rb (Socket.udp_server_recv): extracted from
+ Socket.udp_server_loop_on.
- * lib/irb/init.rb, lib/irb/context.rb: fix conf.debug_level=
- [Bug #6301] and fix irb command option: -- irb_debug_level for irb.
+Thu Oct 8 05:45:14 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 26 00:59:18 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * tool/enc-unicode.rb: parse range notation of UnicodeData.txt.
- * lib/irb/ruby-lex.rb: improve RubyLex performance for large files
- [Bug #5202]. Patch by ryanmelt.
+ * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+ enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+ follow above change. [ruby-dev:39444]
-Tue Dec 25 22:21:06 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+Thu Oct 8 02:46:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/irb/output-method.rb: raise right exception when
- IRB::OutputMethod#print don't defined [Bug #6657].
+ * string.c (rb_str_inspect): copy by chunks.
-Tue Dec 25 22:06:33 2012 Koichi Sasada <ko1@atdot.net>
+Thu Oct 8 01:23:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_trace.c (rb_threadptr_exec_event_hooks_and_pop_frame):
- pop a frame before JUMP_TAG() if exception occurred.
- This change fix bug of Ruby 1.9.
- [ruby-core:51128] [ruby-trunk - Bug #7624]
+ * iseq.c (iseq_s_disasm): accept proc objects. [ruby-core:18762]
- * vm_core.h (EXEC_EVENT_HOOK_AND_POP_FRAME): add to use
- `rb_threadptr_exec_event_hooks_and_pop_frame()'.
+Wed Oct 7 16:42:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (vm_exec): use EXEC_EVENT_HOOK_AND_POP_FRAME() while
- exception handling. While exception handling, if an exception
- is raised in hooks, need to pop current frame and raise this
- raised exception by hook.
+ * marshal.c (mark_dump_arg, mark_load_arg): ignore already cleaned
+ data. [ruby-core:25969]
- * test/ruby/test_settracefunc.rb: add a test.
+ * marshal.c (clear_dump_arg, clear_load_arg): clear freed fields.
-Tue Dec 25 21:08:53 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+Wed Oct 7 16:06:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/irb/init.rb, lib/irb/lc/ja/error.rb, lib/irb/lc/error.rb:
- raise exception when illegal RC_NAME_GENERATOR defined [Bug #6455].
+ * include/ruby/ruby.h (rb_long2int): evaluates the argument only
+ once.
-Tue Dec 25 19:22:17 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * struct.c (rb_struct_alloc): check array length overflow.
- * lib/irb/workspace.rb: define method to private on top-level irb
- [Bug #5776]. Patch by davidbalbert.
+Wed Oct 7 09:23:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Dec 25 19:09:51 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * string.c (rb_str_inspect): don't assign -1 to unsigned int.
- * bignum.c, include/ruby/intern.h (rb_big_eql): exported.
+Wed Oct 7 00:27:01 2009 Tanaka Akira <akr@fsij.org>
- * thread.c (recursive_check): object_id maybe a Bignum, not Fixnum on
- LLP64. see also r38493 and r38548.
- reported by Heesob Park at [ruby-core:51083] [Bug #7607], and patched
- by shirosaki at [ruby-core:51095]
+ * lib/resolv.rb (Resolv::DNS.bind_random_port): bind to "::" for IPv6.
+ (Resolv::DNS::ConnectedUDP#initialize): specify is_ipv6 argument of
+ bind_random_port.
+ [ruby-core:25970]
-Tue Dec 25 18:53:35 2012 Koichi Sasada <ko1@atdot.net>
+Tue Oct 6 23:32:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_core.h, eval_intern.h (CHECK_STACK_OVERFLOW): move
- CHECK_STACK_OVERFLOW() to vm_core.h and rename to
- CHECK_VM_STACK_OVERFLOW().
- This change is only move and rename.
+ * string.c (rb_str_upto): RDoc updated. a patch from Nobuhiro
+ IMAI <nov at yo.rim.or.jp> in [ruby-dev:39440]. [ruby-dev:39439]
- * tool/instruction.rb: catch up above changes.
+Tue Oct 6 21:30:58 2009 Tanaka Akira <akr@fsij.org>
- * vm.c, vm_insnhelper.c: ditto.
+ * io.c (io_reopen): avoid close if possible.
- * vm_insnhelper.c (vm_stackoverflow): add a function to unify
- raising vm stackoverflow exception.
+Tue Oct 6 18:56:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Dec 25 16:16:54 2012 Koichi Sasada <ko1@atdot.net>
+ * struct.c (rb_struct_select): Struct#select should return
+ enumerator when no block given.
- * vm_core.h (RUBY_VM_THREAD_VM_STACK_SIZE): change default
- VM stack size (128 KB or 256 KB -> 512 KB or 1024 KB).
- This re-sizing corrects smaller value introduced at r38478.
- Newer value is same VM stack size of Ruby 1.9.
- [ruby-dev:46797] [ruby-trunk - Bug #7603]
+Tue Oct 6 06:26:00 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Dec 25 13:38:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * * ext/tk/lib/tk/canvas.rb: *** POTENTIALLY INCOMPATIBLE ***
+ 'tags' option of a TkcItem object should give a list of TkcTag objs.
- * error.c (compile_err_append, compile_warn_print, warn_print): use
- rb_write_error_str() instead of writing to rb_stderr directly.
+ * ext/tk/lib/tkextlib/vu/dial.rb: fix logical bug.
- * io.c (rb_write_error_str): a stopgap measure not to unblock GVL.
- warning from require seems to still have race condition errors.
+ * ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb:
+ lack of support for methodcall_optkeys.
-Tue Dec 25 00:59:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 5 17:19:33 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * node.h (NODE_OP_CDECL), compile.c (iseq_compile_each),
- parse.y (stmt, arg): allow scoped constant op-assignment.
- [ruby-core:40154] [Bug #5449]
+ * lib/delegate.rb (Delegator::public_api): take snapshot of
+ public method at the beginning time.
-Mon Dec 24 04:56:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/delegate.rb (SimpleDelegator#initialize): use
+ Delegator.public_api since public_method might be added after
+ initialization. [ruby-dev:39383]
- * lib/net/http/generic_request.rb (Net::HTTPGenericRequest):
- set content-length to zero on empty post requests
- by Gregory Ostermayr <gregory.ostermayr@gmail.com>
- https://github.com/ruby/ruby/pull/201 fix GH-201
+ * lib/delegate.rb (DelegateClass): ditto.
-Sun Dec 23 19:09:16 2012 Koichi Sasada <ko1@atdot.net>
+Mon Oct 5 12:22:12 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread.c: rename methods:
- from Thread.async_interrupt_timing to Thread.handle_interrupt,
- from Thread.async_interrupted? to Thread.pending_interrupt?.
- Also rename option from `defer' to `never'.
- [ruby-core:51074] [ruby-trunk - Feature #6762]
+ * array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
+ calls inside of the loop by keeping pointers in local
+ variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
+ It was found and fixed at Security and Programming camp 2009.
- * vm_core.c, thread.c: rename functions and data structure
- `async_errinfo' to `pending_interrupt'.
+ * string.c (rb_str_{times, split_m}): ditto.
- * thread.c: add global variables sym_immediate, sym_on_blocking and
- sym_never.
+ * struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
+ inspect}_struct, recursive_{equal, hash, eql}): ditto.
- * cont.c, process.c, vm.c, signal.c: ditto.
+Mon Oct 5 00:09:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/sync.rb, lib/thread.rb: catch up this renaming.
+ * vm_method.c (basic_obj_respond_to): should not call
+ #respond_to_missing? for not implemented methods.
+ [ruby-core:25909]
- * test/ruby/test_thread.rb: ditto.
+ * vm_method.c (rb_method_boundp): returns exceptional value 2 for
+ not-implemented methods when called from #respond_to? (specifies
+ by new constant NOEX_RESPONDS).
-Sun Dec 23 17:57:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * method.h (enum): new constant NOEX_RESPONDS added.
- * lib/profiler.rb (Profiler__::PROFILE_PROC, print_profile): store
- profile data per threads for concurrent-execution.
- [ruby-core:22046] [Bug #1152]
+Sun Oct 4 22:16:29 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * lib/profiler.rb (Profiler__::Wrapper): support calling singleton
- methods of an instance of BasicObject.
+ * lib/cgi/cookie.rb: add default value to @@accept_charset
+ if have not defined. [ruby-dev:38987]
- * lib/profiler.rb (Profiler__::PROFILE_PROC): use TracePoint.
+ * lib/cgi/util.rb: ditto.
-Sun Dec 23 16:13:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Sun Oct 4 19:30:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/erb.rb: typos for ERB::new link
+ * marshal.c (struct {dump,load}_arg): manage with dfree, instead
+ of using local variable which may be moved by context switch.
+ [ruby-dev:39425]
-Sun Dec 23 16:06:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Sun Oct 4 15:00:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/erb.rb: Document ERB::new trim_mode '-' for lines ending in -%>
- [ruby-core:51084] [Bug #7608]
+ * pack.c (NATINT_LEN, pack_pack): suppressed warnings.
-Sun Dec 23 15:25:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Sun Oct 4 14:01:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/irb/ruby-lex.rb: Add handling for %i and %I quoting to irb
- Patch by flori [ruby-core:49550] [Bug #7392] [Github Issue #157]
+ * lib/rubygems.rb (Gem::binary_mode): binary mode uses binary
+ encoding.
-Sun Dec 23 15:05:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Oct 4 08:27:10 2009 Tanaka Akira <akr@fsij.org>
- * vm_eval.c (rb_check_funcall_with_hook): rb_check_funcall with hook
- which is called before calling method_missing or target method.
+ * enum.c (slicebefore_ii): use id_eqq.
- * marshal.c (w_object, r_object0): use rb_check_funcall_with_hook
- instead of respond_to? and call.
+Sun Oct 4 06:40:09 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Sun Dec 23 14:52:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * symbian/setup (ruby.mmp): added macro RUBY_EXPORT to match the
+ change in dln.c
- * re.c (rb_reg_eqq): doc: #=== is not a synonym for #=~, added example
- [ruby-dev:46746] [Bug #7571]
+Sun Oct 4 05:34:34 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sun Dec 23 14:35:13 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/variable.rb: add TkVariable#to_hash,to_proc,to_int,
+ to_str,to_ary
- * thread.c (BLOCKING_REGION): if fail_if_interrupted is false ignore
- the result of blocking_region_begin(), since it always is true in
- that case. suppress "uninitialized" warnings.
+Sun Oct 4 00:59:52 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-Sun Dec 23 09:34:07 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/cgi/core.rb: fix command-line option of
+ non-interactive terminal. [ruby-core:23016]
- * lib/rubygems/commands/check_command.rb: Added --doctor and --dry-run
- options to clean up after failed uninstallation.
- * test/rubygems/test_gem_commands_check_command.rb: Test for above.
+Sun Oct 4 00:40:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/commands/push_command.rb: Allow pushes from RubyGems
- 2.0.0.preview3
+ * lib/rake/contrib: added. [ruby-core:25918]
- * lib/rubygems/commands/update_command.rb: Use Gem.ruby_version
+Sat Oct 3 22:14:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/dependency.rb: Update style.
+ * parse.y (bv_decls, bvar): fix for block variables.
+ [ruby-dev:39423]
- * lib/rubygems/installer.rb: Ensure installed gem specifications will
- be useable. Refactor.
- * test/rubygems/test_gem_installer.rb: ditto.
+Sat Oct 3 21:19:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/validator.rb: Fixed bug with unreadable files.
+ * vm_method.c (rb_add_method_def): no redefinition warning on
+ undef.
- * lib/rubygems.rb: Fixed broken methods.
- * test/rubygems/test_gem.rb: Test for above.
+Sat Oct 3 18:51:11 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/rubygems/test_gem_commands_push_command.rb: Fixed overridden
- Gem.latest_rubygems_version
+ * object.c (rb_f_integer): now Integer() takes optional base
+ argument. base will be ignored for non string values.
+ suggested by Sam Carr at RubyFoo Lounge at London.
-Sun Dec 23 01:52:01 2012 Akinori MUSHA <knu@iDaemons.org>
+ * test/ruby/test_integer.rb (TestInteger#test_Integer): test
+ updated.
- * io.c (rb_io_lines, rb_io_bytes, rb_io_chars, rb_io_codepoints):
- Deprecate IO#{lines,bytes,chars,codepoints} and those of ARGF.
- [Feature #6670]
+Sat Oct 3 04:34:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/stringio/stringio.c (strio_lines, strio_bytes, strio_chars)
- (strio_codepoints): Deprecate
- StringIO#{lines,bytes,chars,codepoints}. [Feature #6670]
+ * parse.y (assignable_gen): parser_yyerror takes two arguments.
- * ext/zlib/zlib.c (rb_gzreader_lines, rb_gzreader_bytes):
- Deprecate Zlib::GzipReader#{lines,bytes}. [Feature #6670]
+Sat Oct 3 04:07:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 23 01:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * lib/rake: updated to rake code to rake-0.8.7 source code base.
- * lib/optparse.rb: Documentation for OptionParser to remove 'shadowed
- outer local variable' from example and make obvious ARGV with
- non-option arguments.
- Patch by Marcus Stollsteimer [ruby-core:47460] [Bug #6997]
+ * lib/rake/loaders/makefile.rb (Rake::MakefileLoader#process_line):
+ respace dependencies too.
-Sat Dec 23 00:08:00 2012 Kenta Murata <mrkn@mrkn.jp>
+Sat Oct 3 02:59:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h: add the prototype declaration of
- rb_num_coerce_bit.
+ * parse.y (assignable_gen): get rid of macro collision.
- * numeric.c (rb_num_coerce_bit): the new coerce function for bitwise
- binary operation.
+Sat Oct 3 02:49:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (rb_big_and): use coerce to convert the argument, which isn't
- a Fixnum nor a Bignum, to the corresponding Integer object so that
- bitwise operations can support Integer-mimic objects.
- [Bug #1792] [ruby-core:39491]
+ * array.c (ary_make_shared): should count frozen array itself.
- * bignum.c (rb_big_or): ditto.
+Sat Oct 3 01:01:20 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * bignum.c (rb_big_xor): ditto.
+ * enc/unicode/name2ctype.h: Updated to Unicode 5.2.0.
- * numeric.c (bit_coerce): ditto.
+Sat Oct 3 01:01:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * numeric.c (fix_and): ditto.
+ * configure.in: workaround for regexp metacharacters of expr in
+ prefix path.
- * numeric.c (fix_or): ditto.
+Sat Oct 3 00:47:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * numeric.c (fix_xor): ditto.
+ * test/ripper/dummyparser.rb (DummyParser): improvement by Magnus
+ Holm in [ruby-core:25884].
+ * remove scanner events which simply returned the first argument.
+ * all parser events are now automatically generated.
+ * simplify blocks.
- * test/ruby/test_integer.rb: add tests for the above changes.
+Sat Oct 3 00:43:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_bignum.rb: ditto.
+ * method.h (rb_method_type_t): remove a comma at end of
+ enumerator list.
-Sun Dec 23 00:04:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Oct 3 00:31:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * internal.h (QUOTE, QUOTE_ID): quote unprintable chars in strings and
- IDs. [Bug #7574] [ruby-dev:46749]
+ * range.c (discrete_object_p): needs the argument type to get rid
+ of truncation on platforms where VALUE is larger than int.
- * string.c (rb_str_quote_unprintable): ditto.
+Fri Oct 2 22:30:15 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Dec 22 23:59:18 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd,
+ enc/unicode/name2ctype.src: Updated to Unicode 5.2.0.
+ NOTE: when you update these data, download UnicodeData.txt
+ and Scripts.txt from http://www.unicode.org/Public/UNIDATA/
+ and run
+ ruby1.9 tool/enc-unicode.rb UnicodeData.txt Scripts.txt \
+ > enc/unicode/name2ctype.kwd
- * error.c (rb_compile_error, rb_compile_warn, rb_compile_warning),
- (rb_warn, rb_warning): support PRIsVALUE.
+ * enc/unicode/Scripts.txt: removed.
-Sat Dec 22 22:04:58 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * enc/unicode/UnicodeData.txt: removed.
- * cont.c (rb_fiber_start): unify conditions.
+Fri Oct 2 20:49:19 2009 Tanaka Akira <akr@fsij.org>
-Sat Dec 22 21:47:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * enum.c (enum_slice_before): take a pattern if no block given.
- * io.c (rb_io_wait_writable): use rb_thread_check_ints() instead
- of rb_thread_fd_writable().
- * io.c (rb_io_wait_readable): ditto.
+Fri Oct 2 20:37:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 22 20:31:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (ripper_yylval_id, ripper_get_{id,value}): wrap ID by
+ NODE to track local variable assignment.
- * object.c (rb_mod_const_get): symbol cannot be nested constant name.
+ * parse.y (lvar_defined_gen, assignable_gen): enable local
+ variable check. [ruby-core:24923]
-Sat Dec 22 19:26:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (validate): use value only.
- * object.c (rb_mod_const_get): check more strictly. [ruby-dev:46748]
- [Bug #7573]
+ * test/ripper/test_parser_events.rb (test_local_variables): tests
+ based on a patch from Magnus Holm in [ruby-core:25885].
-Wed Dec 19 02:34:48 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Fri Oct 2 15:34:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * cont.c (rb_fiber_start): in case of jump with TAG_FATAL,
- enqueue error into async_errinfo_queue, because you cannot call
- TH_TAG_JUMP() in this function. [ruby-dev:45218] [Bug #5993]
+ * thread.c (ruby_suppress_tracing): get rid of clobbering by
+ longjmp.
- * thread.c (rb_threadptr_execute_interrupts): now INT2FIX(TAG_FATAL)
- can be popped from async_errinfo_queue.
+Fri Oct 2 09:20:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm.c (rb_vm_make_jump_tag_but_local_jump): revert r38441.
- rb_vm_make_jump_tag_but_local_jump() shouldn't return exception
- in case of state == TAG_FATAL.
+ * eval.c (rb_origenviron): remove unused old variable.
+ [ruby-dev:39412]
- * test/ruby/test_fiber.rb (test_exit_in_fiber): fix a test to illuminate
- Thread.exit should terminate current Thread.
+Thu Oct 1 14:16:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Dec 22 13:15:08 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * win32/{setup.mak,Makefile.sub,win32.c},include/ruby/win32.h (RT_VER):
+ split compiler specification and runtime library specification.
- * gc.c (obj_id_to_ref): add a macro to treat Bignum object id.
- This follows the change r38493.
+ * win32/Makefile.sub (LD_SHARED*, config.status): no need to embed
+ manifest if not exist.
- * gc.c (id2ref): fix for working fine with Bignum object id on x64
- Windows.
- * gc.c (wmap_finalize): ditto.
+Thu Oct 1 13:23:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Dec 22 11:30:21 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * win32/win32.c (rb_w32_getpid): simply call GetCurrentProcessId()
+ instead of calling MSVCRT's getpid().
- * struct.c (make_struct): remove junk ID check to allow members who
- have junk name like "foo\000".
- * test/ruby/test_struct.rb: Test for above.
- [Bug #7575] [ruby-dev:46750]
+Wed Sep 30 13:15:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 22 05:34:54 2012 Eric Hodel <drbrain@segment7.net>
+ * vm_method.c (rb_add_method_def): show the location where
+ overwritten method was defined. [ruby-dev:39400]
- * lib/net/http.rb: Requests may be created with a URI which sets the
- Host header. Responses contain the requested URI for easier redirect
- following. [ruby-trunk - Feature #6482]
- * lib/net/http/generic_request.rb: ditto.
- * lib/net/http/response.rb: ditto.
- * NEWS (net/http): Updated for above.
- * test/net/http/test_http.rb: Tests for above.
- * test/net/http/test_http.rb: ditto.
- * test/net/http/test_httpresponse.rb: ditto.
+Wed Sep 30 00:37:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 22 02:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * enumerator.c (enumerator_block_call): extracted.
- * lib/irb/slex.rb(#match): Typo, should be D_DETAIL
- [ruby-core:51071] [Bug#7600]
+Wed Sep 30 00:00:25 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Dec 22 02:29:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * string.c (rb_str_inspect): escape as \x{XXXX} when the encoding is
+ other than Unicode. [ruby-dev:39388]
- * lib/irb/input-method.rb, lib/irb.rb: Typo in
- InputMethod#readable_atfer_eof? to #readable_after_eof?
- [ruby-core:51069] [Bug #7599]
+Wed Sep 30 00:00:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 22 02:19:38 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * configure.in (THREAD_MODEL): modified message when no thread
+ model is available.
- * vm_dump.c (rb_vm_bugreport): revert r38533.
- * addr2line.c (fill_lines): add ELF sanity check.
- [Bug #7597] [ruby-dev:46786]
+Tue Sep 29 23:17:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 22 02:05:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * io.c (rb_scan_open_args): rb_utf8mac_encoding is undefined.
- * lib/irb/inspector.rb, lib/irb/context.rb: Move IRB::INSPECTORS and
- class methods to IRB::Inspector [ruby-core:51067][Bug #7598]
+Tue Sep 29 22:25:41 2009 Tanaka Akira <akr@fsij.org>
-Sat Dec 22 00:28:46 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby/intern.h (rb_struct_iv_get): deprecated because it is
+ not used and access internal structure.
- * object.c (rb_obj_hash): shouldn't assume object_id can be long.
- based on a patch by Heesob Park at [ruby-core:51060].
- cf. [Backport #7454]
+Tue Sep 29 22:19:36 2009 Tanaka Akira <akr@fsij.org>
-Fri Dec 21 23:15:25 2012 Kouhei Sutou <kou@cozmixng.org>
+ * lib/test/unit/assertions.rb (assert_equal): use Time#subsec if nsec
+ is not enough to distinguish arguments.
- * ext/fiddle/lib/fiddle/struct.rb (Fiddle::CStructEntity#set_ctypes):
- CPtr -> Pointer.
- * test/fiddle/test_c_struct_entry.rb
- (Fiddle::TestCStructEntity#test_aref_pointer):
- Added the test for the above.
+Tue Sep 29 21:16:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 21 23:12:05 2012 Kouhei Sutou <kou@cozmixng.org>
+ * io.c (rb_scan_open_args): add UTF8-MAC to no-convertion encoding.
- * ext/fiddle/lib/fiddle/struct.rb (Fiddle::CStructEntity#set_ctypes):
- CPtr -> Pointer.
- * test/fiddle/test_c_struct_entry.rb
- (Fiddle::TestCStructEntity#test_aref_pointer_array):
- Added the test for the above.
+Tue Sep 29 21:21:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 21 22:43:36 2012 Kouhei Sutou <kou@cozmixng.org>
+ * configure.in (--enable-pthread): deprecated.
- * ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof):
- CPtr -> Pointer.
- * test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof):
- Added the test for the above.
+Tue Sep 29 21:03:59 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Dec 21 22:34:17 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/pp.rb (Kernel#pp): returns its arguments, like Kernel#p.
+ [ruby-dev:34830]
- * test/ruby/test_iseq.rb: disable a test which checks features
- removed at r38532.
+Tue Sep 29 17:02:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 21 22:02:00 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/json/lib/json/common.rb (recurse_proc): removed needless
+ module_function, since visibility is already module_function.
- * win32/{dir.h,win32.c} (rb_w32_readdir): removed old rb_w32_readdir()
- and renamed from rb_w32_readdir_with_enc().
- [ruby-core:24864] [Feature #1927]
+Tue Sep 29 13:48:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * dir.c (READDIR): follow above change.
+ * vm_method.c (rb_method_definition_eq): non-null definition is
+ not equal to null definition.
-Fri Dec 21 21:12:54 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * vm_method.c (rb_add_method_def): nothing to do if old method had
+ same definition. [ruby-dev:39397]
- * vm_dump.c (rb_vm_bugreport): commentout addr2line call temporarily
- in order to avoid segv. anyone can fix addr2line?
- [Bug #7597] [ruby-dev:46786]
+Tue Sep 29 06:50:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 21 20:38:28 2012 Koichi Sasada <ko1@atdot.net>
+ * string.c (rb_str_inspect): dump as \uXXXX when the
+ string is in Unicode. [ruby-dev:39388]
- * iseq.c (Init_ISeq): remove definition of the following methods:
- ISeq#line_trace_all and ISeq#line_trace_specify because they are
- half baked.
- C APIs are remained as experimental. These functions will be
- renamed, removed their parameters may be changed.
- You can use these methods by C exts. Please give us your comments.
+Tue Sep 29 06:49:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 21 20:21:04 2012 Koichi Sasada <ko1@atdot.net>
+ * encoding.c (rb_enc_unicode_p): defined.
+ Returns 1 when the encoding is Unicode series
+ other than UTF-7 else 0.
- * vm_trace.c (tracepoint_new): add code to support specified thread.
- But not tested and this feature is not supported officially.
+Tue Sep 29 04:14:08 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 21 19:37:15 2012 Koichi Sasada <ko1@atdot.net>
+ * encoding.c (rb_filesystem_encoding): On Unix systems,
+ filesystem encoding should be locale encoding.
+ [ruby-dev:39393]
- * ruby.c (process_options): need to acquire env from TOPLEVEL_BINDING
- each time.
- `bind->env' may update after `eval()'.
- [Bug #7536]
+Tue Sep 29 04:07:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 21 18:46:50 2012 Koichi Sasada <ko1@atdot.net>
+ * hash.c (rb_f_getenv): use rb_filesystem_str_new_cstr
+ instead of rb_str_new2.
+ ENV['PATH'].encoding should be Filesystem Encoding
+ because its content is related to filesystem.
+ see [ruby-dev:39393]
- * include/ruby/debug.h, vm_core.h: define rb_trace_arg_t at
- include/ruby/debug.h (move from vm_core.h).
+ * hash.c (env_fetch): ditto.
-Fri Dec 21 17:48:15 2012 Koichi Sasada <ko1@atdot.net>
+ * string.c (rb_filesystem_str_new): defined.
- * vm_core.h, vm_trace.c: fix multi-threading bug for tracing.
- Move `trace_arg' from rb_tp_t::trace_arg to rb_thread_t::trace_arg.
- `trace_arg' may changed by multiple threads.
- rb_thread_t::trace_arg can represent rb_thread_t::trace_running
- (null or non-null) and rb_thread_t::trace_running is removed.
- After that, `rb_tp_t' is not needed to check tracing or not
- (A running thread knows tracing or not). This is why I remove
- tp_attr_check_active() and make new function get_trace_arg().
+ * string.c (rb_filesystem_str_new_cstr): ditto.
- And this modification disable to work the following code:
- TracePoint.trace{|tp|
- Thread.new{p tp.event} # access `tp' from other threads.
- }
- I believe nobody mix threads at trace procedure.
- This is current limitation.
- [Bug #7590]
+ * include/ruby/intern.h (rb_filesystem_str_new): added.
- * cont.c (fiber_switch, rb_cont_call): use rb_thread_t::trace_arg
- instead of rb_thread_t::trace_running.
+ * include/ruby/intern.h (rb_filesystem_str_new_cstr): ditto.
- * test/ruby/test_settracefunc.rb: add a multi-threading test.
+Tue Sep 29 04:06:18 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 21 16:38:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/st.h: include inttypes.h and stdint.h.
- * template/id.h.tmpl (ID2ATTRSET): compile time constant macro for
- ID_ATTRSET.
+Tue Sep 29 00:07:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * defs/id.def (KeywordError): check duplication.
+ * hash.c (rb_f_getenv, env_fetch): env string may be overwritten.
- * defs/id.def: support for other scope IDs,
- ID_{INSTANCE,GLOBAL,CONST,CLASS}.
+Mon Sep 28 23:30:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 21 14:45:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * dln.c (load_lib, dln_find_exe_r): env string may be overwritten.
- * lib/irb.rb, lib/irb/*: Documentation for IRB
+ * dln.c (dln_{exit,loaderror,memerror,notimplement}): renamed as
+ independent names.
-Fri Dec 21 11:31:02 2012 Eric Hodel <drbrain@segment7.net>
+ * dln.c (aix_loaderror): needs format string.
- * lib/rake/*: Updated to rake 0.9.6
- * doc/rake/*: ditto
- * test/rake/*: ditto
+Mon Sep 28 19:36:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Dec 21 08:56:34 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * win32/win32.c (LK_ERR): with overlapped I/O, LockFileEx() returns
+ ERROR_IO_PENDING if the file is locked.
- * vm_trace.c (rb_suppress_tracing): remove unused variable 'vm_tracing'
+Mon Sep 28 19:05:05 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Fri Dec 21 01:01:45 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * include/ruby/st.h: aligned prototype of st_hash_uint32 with function
+ definition (fixing compiling problem on cygwin)
- * lib/irb/completion.rb (CompletionProc): support completion of
- instance variables. [ruby-dev:46710] [Bug #7520]
+Mon Sep 28 12:13:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Dec 20 20:58:25 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * method.h (enum): new method type VM_METHOD_TYPE_MISSING.
- * vm_trace.c (rb_suppress_tracing): bugfix for vm->trace_running
- counter. And if tracing is already true, vm_trace_running ops is
- skipped to control overflow.
+ * vm_eval.c (vm_call0): invoking VM_METHOD_TYPE_MISSING method
+ objects.
-Thu Dec 20 18:29:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_insnhelper.c (vm_call_method): invoking method defined from
+ VM_METHOD_TYPE_MISSING.
- * include/ruby/ruby.h (RTEST, NIL_P): make bare expressions without
- outermost parentheses.
+ * proc.c (rb_method_entry_arity): ditto.
-Thu Dec 20 17:29:00 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * vm_method.c (rb_method_entry_eq): two method object wraps
+ method_missing with same symbol should be equal.
+ [ruby-core:25755]
- * NEWS: fix the description for Refinements.
+ * proc.c (mnew): should always return method object.
-Thu Dec 20 16:53:59 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Sep 28 11:38:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm_core.h (rb_vm_defineclass_type_t),
- compile.c (iseq_compile_each), insns.def (defineclass): change the
- meaning of the third operand of defineclass as follows:
- lower 3bits: the type of the defineclass
- 0 = class, 1 = singleton class, 2 = module
- 4th bit: a flag represents whether the defineclass is scoped
- 0 = not scoped (e.g., class Foo)
- 1 = scoped (e.g., class Bar::Baz)
- 5th bit: a flag represents whether the superclass is specified
- 0 = not specified (e.g., class Foo)
- 1 = specified (e.g., class Bar < Foo)
- If the superclass is specified and is not a class, a TypeError
- should be raised. [ruby-dev:46747] [Bug #7572]
+ * parse.y (parser_tokadd_string): the byte after ``\'' may be a part of
+ multibyte character, so pushback it. [ruby-list:46416]
- * test/ruby/test_class.rb: related test.
+Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Dec 20 16:52:37 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * stringio/stringio.c (strio_read): set ASCII-8BIT encoding
+ when length argument is given.
- * NEWS: announce AEAD encryption support in the OpenSSL extension.
+Mon Sep 28 01:28:17 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-Thu Dec 20 16:40:13 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * Makefile.in (miniruby): suppress duplication warning on AIX.
- * gc.c (nonspecial_obj_id): VALUE is not compatible with Fixnum on
- LLP64 platform, such as 64bit Windows.
- reported by Heesob Park at [ruby-core:50255] [Bug #7454], and the
- fix is suggested by akr.
+Mon Sep 28 01:13:25 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-Thu Dec 20 16:39:04 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * common.mk (ruby.imp): add text section [Bug #2064].
- * ext/openssl/ossl_cipher.c: fix errors for installations that do not
- feature Authenticated Encryption.
- * ext/openssl/extconf.rb: detect presence of EVP_CTRL_GCM_GET_TAG to
- determine whether Authenticated Encryption can be used.
- [Feature #6980] [ruby-core:47426]
+ * common.mk (ruby.imp): do not export Init_*.
-Thu Dec 20 15:55:46 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
+Sun Sep 27 13:06:43 2009 Tanaka Akira <akr@fsij.org>
- * ext/openssl/ossl.c: do not use FIPS_mode_set if not available.
- * test/openssl/utils.rb: revise comment about setting FIPS mode to
- false.
- * test/openssl/test_fips.rb: remove tests that cause errors on
- ruby-ci.
- [Feature #6946] [ruby-core:47345]
+ * lib/pp.rb (PP:ObjectMixin#pretty_print): delegates has no inspect
+ method. [ruby-core:25804]
-Thu Dec 20 15:22:59 2012 Eric Hodel <drbrain@segment7.net>
+Sun Sep 27 12:01:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/parser/ruby.rb: Ignore methods defined on constants to
- prevent modules with the names of constants from appearing in the
- documentation.
- * test/rdoc/test_rdoc_parser_ruby.rb: Test for the above.
+ * string.c (str_buf_cat2): optimize since all second arguments are
+ constant literals.
-Thu Dec 20 15:00:33 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * string.c (str_cat_char): unused now.
- * ext/openssl/ossl_cipher.c: add support for Authenticated Encryption
- with Associated Data (AEAD) for OpenSSL versions that support the
- GCM encryption mode. It's the only mode supported for now by OpenSSL
- itself. Add Cipher#authenticated? to detect whether a chosen mode
- does support Authenticated Encryption.
- * test/openssl/test_cipher.rb: add tests for Authenticated Encryption.
- [Feature #6980] [ruby-core:47426] Thank you, Stephen Touset for
- providing a patch!
+ * string.c (rb_hash_{uint{32,},end}): removed.
-Thu Dec 20 12:56:53 2012 Eric Hodel <drbrain@segment7.net>
+Sun Sep 27 11:58:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/markup/to_html.rb (class RDoc): Added current heading and
- top links to headings.
- * lib/rdoc/generator/template/darkfish/rdoc.css: ditto
- * test/rdoc/test_rdoc_generator_markup.rb: Test for above
- * test/rdoc/test_rdoc_markup_to_html.rb: ditto
+ * configure.in (optflags): add -fomit-frame-pointer by default.
- * test/rdoc/test_rdoc_comment.rb: Removed trailing whitespace.
+Sun Sep 27 11:28:15 2009 Tanaka Akira <akr@fsij.org>
-Thu Dec 20 11:05:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enum.c (enum_minmax): use struct for memo.
+ (enum_minmax_by): ditto.
- * test/ruby/envutil.rb (assert_valid_syntax): move from
- test_syntax.rb.
+Sun Sep 27 10:21:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (assert_normal_exit): validate syntax before
- running because this assertion passes even if the code fails by
- SyntaxError.
+ * configure.in (warnflags): check all flags if each are available.
-Thu Dec 20 10:29:58 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sun Sep 27 05:35:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/openssl/test_pkey_dh.rb: revert special treatment of
- FIPS-capable installations since FIPS mode is now disabled for the
- tests.
+ * ext/json/ext/generator/generator.c: Documentation patch by okkez.
+ [Bug #2075]
-Thu Dec 20 10:23:12 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
-
- * ext/openssl/ossl.c: add OpenSSL.fips_mode= to allow enabling FIPS
- mode manually.
- * test/openssl/utils.rb: turn off FIPS mode for tests. This prevents
- OpenSSL installations with FIPS mode enabled by default from raising
- FIPS-related errors during the tests.
- * test/openssl/test_fips.rb: add tests for FIPS-capable OpenSSL
- installations.
- [Feature #6946] [ruby-core:47345]
-
-Thu Dec 20 06:59:52 2012 Koichi Sasada <ko1@atdot.net>
-
- * vm.c: support variable VM/Machine stack sizes.
- Specified by the following environment variables:
- - RUBY_THREAD_VM_STACK_SIZE: vm stack size used at thread creation.
- default: 128KB (32bit CPU) or 256KB (64bit CPU).
- - RUBY_THREAD_MACHINE_STACK_SIZE: machine stack size used at thread
- creation. default: 512KB or 1024KB.
- - RUBY_FIBER_VM_STACK_SIZE: vm stack size used at fiber creation.
- default: 64KB or 128KB.
- - RUBY_FIBER_MACHINE_STACK_SIZE: machine stack size used at fiber
- creation. default: 256KB or 256KB.
- This values are specified at launched timing. You can not change
- these values at running time.
- Environ variables are only *hints* because:
- - They are aligned to 4KB.
- - They have minimum values (depend on OSs).
- - Machine stack settings are ignored by some OSs.
- Default values especially fiber stack sizes are increased.
- This change affect Fiber's behavior:
- (1) You can run more complex program on a Fiber.
- (2) You can not make many (thousands) Fibers because of
- lack of address space (on 32bit CPU).
- If (2) bothers you,
- (a) Use 64bit CPU with big memory, or
- (b) Specify RUBY_FIBER_(VM|MACHINE)_STACK_SIZE correctly.
- You need to choose correct stack size carefully. These values
- are completely rely on systems (OS/compiler and so on).
- [Feature #4614], [Bug #7212]
-
- * vm_core.h (rb_vm_t::default_params): add to record above settings.
-
- * vm.c (RubyVM::DEFAULT_PARAMS): add new constant to see
- above setting.
-
- * thread_pthread.c: support RUBY_THREAD_MACHINE_STACK_SIZE.
-
- * cont.c: support RUBY_FIBER_(VM|MACHINE)_STACK_SIZE.
+Sun Sep 27 04:20:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_fiber.rb: add tests for above.
+ * string.c (rb_str_inspect): result's encoding should be fixed.
+ If default_internal is not nil, the encoding is default_internal.
+ Else if default_external is not nil, the encoding is default_external.
+ But the encoding is not ASCII-compatible, the encoding is replaced by
+ US-ASCII.
+ Characters in ASCII-incompatible encoding or non ASCII characters
+ in other than the encoding will be \xXX escaped.
+ [ruby-dev:39343]
- * test/ruby/test_thread.rb: ditto.
+ * string.c (str_buf_cat2): defined.
-Thu Dec 20 06:25:44 2012 Koichi Sasada <ko1@atdot.net>
+ * string.c (prefix_escape): removed.
- * test/ruby/test_fiber.rb: remove a strange single quote character.
- With this character, this script exits by SyntaxError.
+Sun Sep 27 05:37:45 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Thu Dec 20 01:03:00 2012 Zachary Scott <zachary@zacharyscott>
+ * symbian/missing-pips.c: Updated to work with the latest PIPS 1.6.
- * ext/.document: Add missing ext modules to .document
- Patch by Ryunosuke SATO [Fixes Github #224]
+ * symbian/setup: ditto.
-Wed Dec 19 23:52:16 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * symbian/README.SYMBIAN: ditto.
- * ruby.c (load_file_internal): use original C string as the filename
- for parser.
- reported by whiteleaf at [ruby-list:49085] [ruby-dev:46738]
- [Bug #7562]
+Sun Sep 27 02:00:46 2009 Koichi Sasada <ko1@atdot.net>
-Wed Dec 19 23:36:12 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * string.c: use rename-macro instead of RUBY_ALIAS_FUNCTION_TYPE.
+ Because build causes failure.
- * marshal.c (marshal_dump, marshal_load): fix SEGV during make rdoc
- and test failure in TestMarshal#test_gc and test_context_switch
- on SPARC Solaris 10 compiled with Oracle Solaris Studio 12.3.
- [Bug #7591] [ruby-dev:46772]
+Sat Sep 26 23:29:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 19 19:34:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * st.c: moved murmur hash from string.c. [ruby-dev:39376]
- * object.c (rb_mod_const_get): nul byte is invalid as constant name.
+Sun Sep 26 00:24:14 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Wed Dec 19 17:54:18 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * symbian/setup: Updated .mmp file generation due to blockinlining.c removal.
- * vm_trace.c (rb_threadptr_exec_event_hooks): get rid of race
- condition. [Bug #7589] [ruby-dev:46763]
+Sat Sep 26 22:39:24 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Wed Dec 19 16:30:28 2012 Eric Hodel <drbrain@segment7.net>
+ * Makefile.in(test-rubyspec): explicitly executes run subcommand of
+ mspec.
- * doc/syntax/literals.rdoc: Added 0d decimal format. Thanks Nobu!
+ * spec/README: typo fix
-Wed Dec 19 16:19:36 2012 Eric Hodel <drbrain@segment7.net>
+Sat Sep 26 17:53:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * doc/syntax/methods.rdoc: Fixed typo. Thanks to Josh Susser.
+ * st.c (COLLISION): improved collision log feature.
-Wed Dec 19 16:18:22 2012 Eric Hodel <drbrain@segment7.net>
+ * string.c (hash): updated to MurmurHash 2.0 2009-09-19.
- * lib/rubygems/commands/query_command.rb: Refactored to improve
- maintainability.
- * test/rubygems/test_gem_commands_query_command.rb: Note default gems
- in gem list details.
+ * string.c (rb_hash_start): fixed shift width on 128bit platform.
- * lib/rubygems/uninstaller.rb: Detect all gems for uninstallation.
- This allows duplicate installs of default gems to be removed.
- * lib/rubygems/specification.rb: Allow use of ::each_spec.
- * lib/rubygems/test_case.rb: Added install_default_gems.
- * test/rubygems/test_gem_commands_uninstall_command.rb: Moved test
- down to the uninstaller tests.
- * test/rubygems/test_gem_uninstaller.rb: Test for uninstallation of
- default gems and duplicate default gems.
+ * include/ruby/intern.h (rb_hash_{start,uint32,uint,end}): fixed
+ prototypes.
-Wed Dec 19 15:23:50 2012 Eric Hodel <drbrain@segment7.net>
+Sat Sep 26 13:26:55 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * doc/syntax/methods.rdoc: Add () around keyword arguments example for
- consistency. Thanks to Josh Susser.
+ * lib/net/http.rb (transport_request): Handle timeout error by
+ closing socket if exception raised. [ruby-core:20976]
-Wed Dec 19 01:51:24 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Sat Sep 26 12:08:17 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm.c (rb_vm_jump_tag_but_local_jump): remove unnecessary 2nd
- argument.
+ * vm_method.c (rb_method_entry_eq): method defined from same
+ block/proc should be equal. [ruby-core:25755] [ruby-core:24791]
- * load.c (rb_load_internal): ditto.
+Sat Sep 26 08:35:12 2009 Koichi Sasada <ko1@atdot.net>
- * eval_intern.h (rb_vm_jump_tag_but_local_jump): ditto.
+ * iseq.c (compile_string): rename to parse_string(), because
+ this function only parse String to NODE.
-Tue Dec 18 18:57:58 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Sep 25 16:01:45 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c (rb_io_wait_writable): don't use rb_thread_wait_fd()
- because it is for waiting until io readable.
+ * win32/win32.c, include/ruby/win32.h (rb_w32_access): new function to
+ replace MSVCRT's access().
+ [ruby-core:25761]
- * io.c (rb_io_wait_writable): always use rb_thread_fd_writable()
- instead of bare rb_wait_for_single_fd(). we shouldn't ignore
- return value.
- * io.c (rb_io_wait_readable): ditto. always use rb_thread_wait_fd().
+ * file.c (eaccess): workaround for recent MSVCRT is no longer needed.
+
+Fri Sep 25 13:04:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * proc.c (mnew): fix for instance method of Module, BasicObject
+ and subclass of a class which overrides respond_to_missing?.
+ based on a patch from Nikolai Lugovoi <nlugovoi AT gmail.com> in
+ [ruby-core:25748].
+
+Fri Sep 25 11:56:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_method.c (rb_mod_method_defined): should return true or false.
+
+Thu Sep 24 13:32:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * proc.c (mnew): generate method object that wraps method_missing,
+ when #respond_to_missing? is defined.
+
+ * test/ruby/test_object.rb (test_respond_to_missing): add test
+ suites for #respond_to_missing? changes.
+
+Thu Sep 24 09:41:42 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/mathn.rb (Bignum#**): Fixed bignum**fixnum that was broken when
+ requiring lib/mathn
+ [ruby-core:25740]
+
+Thu Sep 24 02:21:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb (atan): atan(Infinity) is
+ PI/2.
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb (atan): reduce loop with
+ the double-angle formula. based on a patch from Masahiro
+ Kanai (CanI) in [ruby-dev:39367].
+
+Thu Sep 24 01:14:18 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * dln.c (aix_loaderror): fixed typo. suppress warnings.
+
+Thu Sep 24 00:17:06 2009 Tanaka Akira <akr@fsij.org>
+
+ * enum.c (enum_minmax): reduce comparison.
+ (enum_minmax_by): ditto.
+
+Wed Sep 23 22:58:57 2009 Tanaka Akira <akr@fsij.org>
+
+ * lib/thread.rb (ConditionVariable#wait): add timeout argument.
+ [ruby-talk:346154]
+
+Wed Sep 23 21:25:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb (atan): refined.
+
+Wed Sep 23 17:08:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (assign_in_cond): also should warn assignment to dvar in
+ conditional. [ruby-dev:39363]
+
+Wed Sep 23 13:14:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_upto): keep first width. [ruby-dev:39361]
+
+Wed Sep 23 11:28:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/instruction.rb (make_header_prepare_stack): check stack
+ overflow. [ruby-core:25714]
+
+ * tool/instruction.rb (make_footer_stack_val): ditto.
+
+
+Wed Sep 23 05:03:36 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * proc.c (umethod_bind, rb_mod_define_method): Fix bug that
+ disallowed methods from singleton classes to be used for
+ UnboundMethod#bind, Kernel#define_singleton_method and
+ Module#define_method, even when that singleton class was of the right
+ kind_of. A patch by Shane O'Brien [ruby-core:25632]
+
+Tue Sep 22 22:56:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * vm_method.c (basic_obj_respond_to): new function to fundamental
+ behavior for #respond_to?
+
+ * vm_method.c (basic_obj_respond_to): calls #respond_to_missing
+ method if overridden, to check responsiveness of methods
+ implemented by #method_missing.
+
+Tue Sep 22 16:34:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * st.c (st_table_entry, st_get_key): use st_index_t.
+
+Tue Sep 22 16:28:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * regenc.h (PosixBracketEntryType): constified.
+
+ * regenc.h (PosixBracketEntryInit): suppress warnings.
+
+ * regerror.c (onig_error_code_to_str, onig_snprintf_with_pattern):
+ fixed type.
+
+ * regparse.c (st_str_end_key, str_end_cmp, str_end_hash):
+ constified.
+
+ * tool/transcode-tblgen.rb (transcode_generated_code): fixed type.
+
+Tue Sep 22 10:29:06 2009 Tanaka Akira <akr@fsij.org>
+
+ * enum.c (enum_chunk): new method Enumerable#chunk.
+ * enum.c (enum_slice_before): new method Enumerable#slice_before.
+ [ruby-dev:38392] [ruby-dev:39240]
+
+Tue Sep 22 05:58:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * compile.c, cont.c, gc.c, insns.def, iseq.c, iseq.h, process.c,
+ thread.c, vm.c, vm_core.h, vm_dump.c, vm_eval.c,
+ vm_insnhelper.c, vm_method.c, template/insns_info.inc.tmpl,
+ tool/instruction.rb: fixed types.
+
+Tue Sep 22 05:04:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/{ludcmp,math}.rb: depend on
+ bigdecimal.
+
+ * ext/bigdecimal/lib/bigdecimal/*.rb: made module functions.
+
+Tue Sep 22 04:47:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c (GetVpValue): support conversion from
+ Rational. [ruby-core:25697]
+
+Tue Sep 22 04:43:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in, win32/Makefile.sub (INSNS): depend on tools.
+
+Tue Sep 22 01:10:22 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * ossl_ocsp.c (ossl_ocspres_to_der): Bug fix in Response#to_def.
+ Patch by Chris Chandler [ruby-core:18411]
+
+Tue Sep 22 01:10:02 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * ossl_config.c (ossl_config_add_value_m, ossl_config_set_section):
+ Check if frozen (or untrusted for $SAFE >= 4) [ruby-core:18377]
+
+Mon Sep 21 17:12:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * proc.c (proc_binding): allow proc from method. [ruby-core:25589]
+
+ * vm.c (collect_local_variables_in_env): block iseq can be NULL.
+
+Mon Sep 21 10:50:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c (rb_time_succ): make Time#succ obsolete since time is not
+ a discrete value.
+
+ * range.c (discrete_object_p): treat time objects specially to
+ determine discrete values, since time objects have #succ yet are
+ discrete (for now at least).
+
+Mon Sep 21 10:13:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * cont.c (cont_new, cont_capture, fiber_t_alloc): needs already
+ running thread. cf. [ruby-core:25681]
+
+Mon Sep 21 00:07:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb (sin, cos, atan, exp, log):
+ improved precision and performance. based on a patch from Makoto
+ Yamashita in [ruby-core:25600] and [ruby-core:25602].
+
+Sun Sep 20 11:11:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * struct.c (rb_struct_equal, rb_struct_eql): Handle comparison of
+ recursive structures [ruby-core:24759]
+
+ * range.c (range_eq, range_eql): ditto for ranges
+
+Sat Sep 19 17:46:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (ENABLE_VM_OBJSPACE): socklist needs st_table in
+ rb_w32_sysinit(), before object space initialization.
+
+Sat Sep 19 17:32:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (GlobPathValue), file.c (rb_get_path_check): path names
+ must be ASCII compatible.
+
+Sat Sep 19 00:02:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (rb_type): forward declaration to suppress a
+ warning. a patch from Naohisa Goto at [ruby-dev:39350]
+
+Fri Sep 18 23:59:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (GlobPathValue): adjust return types. based on a patch
+ from Naohisa Goto at [ruby-dev:39350].
+
+Fri Sep 18 23:51:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (r_object0): entry regexp object before its encoding
+ name. [ruby-core:25625]
+
+Fri Sep 18 16:29:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (eval.o): needs vm.h.
+
+ * eval.c (ruby_cleanup): destruct current VM before exit.
+
+ * gc.c (rb_objspace_free): free object space.
+
+ * vm.c (ruby_vm_destruct): destruct and free VM struct.
+
+Fri Sep 18 16:15:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * compile.c (iseq_compile_each), parse.y (stmt, arg): arg_concat()
+ on op_asgn was inversed. [ruby-core:25629] [Bug #2050]
+
+Fri Sep 18 16:06:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (GlobPathValue): glob allows null bytes as separators.
+
+Fri Sep 18 10:11:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * doc/re.rdoc: use rdoc mode.
+
+ * misc/rdoc-mode.el: added.
+
+Fri Sep 18 09:02:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
+ RUBY_VERSION.
+
+ * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
+ are delimited by a semicolon. supported Vim style.
+
+Fri Sep 18 07:06:41 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]
+
+Fri Sep 18 06:47:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Dec 18 18:55:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * dir.c (push_glob): str should be a string always.
- * thread.c (rb_thread_wait_fd_rw): fix infinite loop bug.
- rb_wait_for_single_fd() never return positive number.
+ * dir.c (rb_push_glob, dir_globs): use #to_path to convert non-
+ string values. cf. [ruby-dev:39345]
-Tue Dec 18 17:24:40 2012 Eric Hodel <drbrain@segment7.net>
+Fri Sep 18 06:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/encoding.rb: Do not remove #! line from document when
- setting encoding. This allows ruby executables to be parsed as ruby
+ * lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
+ [ruby-dev:39345]
+
+ * lib/mkmf.rb (create_header): open in binmode.
+
+Thu Sep 17 18:34:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (vm_xrealloc): free as like standard free if size is zero.
+
+Thu Sep 17 15:41:02 2009 Koichi Sasada <ko1@atdot.net>
+
+ * eval_intern.h: use rb_node_newnode() directly.
+
+Thu Sep 17 15:01:32 2009 Koichi Sasada <ko1@atdot.net>
+
+ * blockinlining.c: removed.
+
+ * README.EXT: ditto.
+
+ * README.EXT.ja: ditto.
+
+Thu Sep 17 13:50:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_s_debug_set): set level, not only boolean.
+
+Thu Sep 17 13:12:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
files.
- * test/rdoc/test_rdoc_encoding.rb: Test for above.
- * lib/rdoc/parser.rb: Set the parser file name of ruby executables
- correctly.
- * test/rdoc/test_rdoc_parser.rb: Test for above.
-
-Tue Dec 18 16:46:15 2012 Eric Hodel <drbrain@segment7.net>
-
- * doc/syntax/literals.rdoc: Used simplified heredoc example that
- doesn't include method definition. Added heredoc with backticks.
-
-Tue Dec 18 16:38:51 2012 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/store.rb: Work around RDoc stores from older versions of
- RDoc.
- * test/rdoc/test_rdoc_store.rb: Test for above.
-
-Tue Dec 18 16:31:20 2012 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ruby_lex.rb: Return a TkHEREDOC instead of a TkSTRING when
- the heredoc identifier is followed by a line-end. This allows proper
- display of some HEREDOCs in source view.
- * lib/rdoc/ruby_token.rb: Added TkHEREDOC
- * test/rdoc/test_rdoc_ruby_lex.rb: Test for above.
-
-Tue Dec 18 09:45:14 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
-
- * vm.c (rb_vm_make_jump_tag_but_local_jump): take care of the case
- TAG_JUMP() with TAG_FATAL (ex. rb_fatal()). [ruby-core:50917]
- [Bug #7570]
-
- * test/ruby/test_fiber.rb (test_fatal_in_fiber): add a test for above.
-
- * ext/-test-/fatal/extconf.rb, ext/-test-/fatal/rb_fatal.c: ditto.
-
-Tue Dec 18 13:17:00 2012 Zachary Scott <zachary@zacharyscott.net>
-
- * vm_trace.c (tracepoint_attr_defined_class): Clean up rdoc for
- TracePoint#defined_class
-
-Tue Dec 18 12:15:59 2012 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/specification.rb: Fixed ruby output of requirements
- with multiple version specifiers.
- * test/rubygems/test_gem_ext_cmake_builder.rb: Only look for specific
- lines in cmake output. Should fix [ruby-trunk - Bug #7579]
-
-Tue Dec 18 11:45:26 2012 Eric Hodel <drbrain@segment7.net>
-
- * doc/syntax/literals.rdoc: Added 0o octal integers.
-
-Tue Dec 18 12:28:52 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
-
- * test/openssl/test_ssl.rb: Use :TLSv1_2_client explicitly in
- test_tls_v1_2 to prevent upstream bug.
- [Bug #7197] [ruby-dev:46240]
-
-Tue Dec 18 11:52:34 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
-
- * ext/openssl/lib/ssl.rb: Enable insertion of empty fragments as a
- countermeasure for the BEAST attack by default. The default options
- of OpenSSL::SSL:SSLContext are now:
- OpenSSL::SSL::OP_ALL & ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
- [Bug #5353] [ruby-core:39673]
-
- * test/openssl/test_ssl.rb: Adapt tests to new SSLContext default.
-
- * NEWS: Announce the new default.
-
-Tue Dec 18 06:36:12 2012 Koichi Sasada <ko1@atdot.net>
-
- * method.h: remove `VM_METHOD_TYPE_CFUNC_FRAMELESS' method type.
- This method type is for optimized CFUNC such as Fixnum#+ and so on.
- This feature is half-baked and no way to use them.
- [Background]
- Now, VM has opt_plus instructions to optimize `+' methods for
- some Classes (such as Fixnum, Float (flonum)). We call this
- type of instructions as `specialized instructions'.
- This simple technique improve simple program dramatically.
- However, we can make specialized instructions for only several
- types (classes) and selectors (method names) because a large
- instruction will be slow. In other words, this technique has no
- extensibility.
- To overcome this problem, VM_METHOD_TYPE_CFUNC_FRAMELESS was
- introduced (r37198). This type is a variant of CFUNC, but called
- their functions directly without building a method frame.
- Any CFUNC method can be defined as frameless methods if a method
- is not needed to make method frame. Frameless methods are faster
- as specialized instructions (a bit slower, but no need to care).
- No problem described at
- http://charlie.bz/blog/why-do-singleton-methods-make-ruby-slow
- because this technique doesn't see class, but see method body
- itself. Alias is also no problem.
- [Problem]
- However, we can't set frameless method type for polymorphic methods
- such as Array#[]. Necessity for method frame depends on which
- parameter type. For example, Fixnum#+ needs method frame if
- coerce is needed. Current VM_METHOD_TYPE_CFUNC_FRAMELESS is not
- flexible and need more tuning to introduce it.
- Expected behavior of frameless method type may be:
- result = optimized_cfunc(params); /* call optimized cfunc */
- if (result == Qundef) { result = normal_cfunc(); }
- This is why I say this feature is half-baked.
- We need to learn primitive method in Smalltalk more.
- (I heard this name at RubyConf Taiwan this month. Thanks!)
- [Conclusion]
- I remove this feature and consider again.
- This feature goes to next minor (2.1?).
- Nobody may use this feature and there is no compatibility issue.
+ * doc/re.rdoc: renamed from re.rb.
- * proc.c (rb_method_entry_arity): ditto.
+Thu Sep 17 09:37:28 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_eval.c, vm_insnhelper.c, vm_method.c: ditto.
+ * doc/re.rb: New document for Ruby's fork of Oniguruma.
+ written by Run Paint Run Run [ruby-core:25420]
-Tue Dec 18 04:58:22 2012 Koichi Sasada <ko1@atdot.net>
+ * re.c: import document in doc/re.rb.
- * vm_trace.c (fill_id_and_klass): TracePoint#defined_class returns
- singleton class. `set_trace_func' passed attached class (which is
- attached/modified by singleton class) by 6th block parameter if it
- is singleton class. Previous behavior follows this spec.
- However, this method named `defined_class' should return singleton
- class directly because singleton methods are defined in singleton
- class. There are no compatible issue because TracePoint is introduced
- after 2.0.
- But compatibility with `set_trace_func' is broken. This means that
- you can not replace all `set_trace_func' code with TracePoint
- without consideration of this behavior.
- [Bug #7554]
+ * .document: add doc/re.rb.
- * test/ruby/test_settracefunc.rb: change a test to catch up
- an above change.
+Thu Sep 17 06:03:40 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Tue Dec 18 03:03:10 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/matrix.rb (Matrix#rank): Two bug fixes. One made
+ Matrix[[0,0],[0,0],[1,0]].rank raise a NoMethodError while the other
+ one had Matrix[[0,1],[0,0],[1,0]].rank raise a TypeError.
- * ext/psych/lib/psych/visitors/to_ruby.rb: speed up node mapping so
- common cases are evaluated first. Thanks Kevin Menard!
+Thu Sep 17 06:02:04 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Tue Dec 18 02:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * lib/matrix.rb: Optimizations
- * lib/optparse.rb: Remove 'developer documentation' section from rdoc
- Patch by Marcus Stollsteimer [ruby-core:50526][Bug #7504]
+Thu Sep 17 00:36:01 2009 Tanaka Akira <akr@fsij.org>
-Tue Dec 18 02:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * time.c (time_mdump): error message refined.
- * lib/matrix.rb (#lup): typo in example [ruby-core:50946][Bug #7582]
+Wed Sep 16 19:27:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Dec 17 18:03:34 2012 Charlie Somerville <charlie@charliesomerville.com>
+ * test/ruby/test_thread.rb (TestThread#test_recursive): remove
+ implementation dependent test.
- * class.c (rewrite_cref_stack, clone_method): rewrite a method's cref
- stack when cloning into a new class to allow lexical const lookup to
- work as expected [ruby-core:47834] [Bug #7107]
- * test/ruby/test_class.rb (class TestClass): related test
+Wed Sep 16 17:42:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Dec 17 13:56:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * win32/Makefile.sub (config.status): install-capi needs docdir. And,
+ mandir, infodir and ridir are also depend on datadir like docdir.
- * io.c (io_flush_buffer_sync2): avoid to return 0. because
- rb_thread_call_without_gvl2 uses 0 internally.
- * io.c (io_flush_buffer_async2): adapt the above.
+Wed Sep 16 17:20:49 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Mon Dec 17 12:05:32 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/matrix.rb (Matrix#/): Fix obvious bug
- * doc/syntax/methods.rdoc: Added a description of singleton methods.
+Wed Sep 16 16:59:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Dec 17 11:35:57 2012 Eric Hodel <drbrain@segment7.net>
+ * win32/Makefile.sub (DOCTARGETS): rdoc is default.
- * doc/.document: Added doc/syntax
+Wed Sep 16 16:27:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Dec 17 11:25:32 2012 Eric Hodel <drbrain@segment7.net>
+ * win32/Makefile.sub: typo.
- * doc/syntax.rdoc: Added syntax guide table of contents
- * doc/syntax/exceptions.rdoc: Syntax guide for exceptions
- * doc/syntax/literals.rdoc: Syntax guide for literals
- * doc/syntax/methods.rdoc: Syntax guide for methods
+Wed Sep 16 16:20:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 17 07:59:40 2012 Eric Hodel <drbrain@segment7.net>
+ * configure.in (CAPITARGET): enable iff doxygen is available.
- * lib/rubygems.rb: Updated VERSION
+ * configure.in (INSTALLDOC): enable if rdoc or doxygen are enabled.
- * test/rubygems/test_gem_installer.rb: Fixed ambiguous first argument
- warning.
+ * common.mk (docs): target to make documents.
- * test/rubygems/test_gem_rdoc.rb: RDoc generation depends on installed
- version of RDoc.
+ * Makefile.in, win32/Makefile.sub (install-{all,nodoc}): trigger
+ by $(INSTALLDOC) from install.
-Sun Dec 16 02:04:41 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Sep 16 13:39:10 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * signal.c (rb_sigaltstack_size): cast sysconf() return value
- explicitly. Fix compile error on Mac OS X.
+ * lib/matrix.rb (determinant): Bug fix where determinant failed on
+ some matrices [ruby-core:23597]
-Sun Dec 16 00:39:43 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Wed Sep 16 13:30:20 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * cont.c (rb_fiber_start): don't enqueue Qnil to async_errinfo_queue.
- rb_vm_make_jump_tag_but_local_jump() could return Qnil (ex. when
- finished by Thread.exit). [ruby-dev:45218] [Bug #5993]
+ * lib/matrix.rb: trivial optimizations
- * test/ruby/test_fiber.rb (test_exit_in_fiber): add test for it.
+Wed Sep 16 13:15:17 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Dec 15 23:56:51 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * template/Doxyfile.tmpl: RbConfig::CONFIG['DOT'] is sometimes nil.
- * ext/fiddle/pointer.c (rb_fiddle_ptr2cptr): fix error message
- forgotten to be changed from DL to Fiddle.
+Wed Sep 16 10:14:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 15 23:14:32 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * README.EXT, README.EXT.ja (rb_protect, rb_jump_tag): added.
- * signal.c (default_handler): remove rb_register_sigaltstack()
- call. sigaltstack was already registered when creating threads.
+Wed Sep 16 10:12:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 15 23:08:56 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * common.mk (main): makes also encs.
- * signal.c (rb_sigaltstack_size): new. calculate stack size for
- sigsegv handler. enlarge value when x86 or x86_64 on Linux.
- Linux has very small MINSIGSTKSZ size (2048 bytes) and
- our sigsegv routine need 5KiB at least. [Bug #7141]
- * internal.h: add declaration of rb_sigaltstack_size().
- * vm_core.h: remove ALT_STACK_SIZE definition.
+Wed Sep 16 06:30:07 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * signal.c (rb_register_sigaltstack): replace ALT_STACK_SIZE with
- rb_sigaltstack_size();
- * gc.c (Init_heap): ditto.
- * vm.c (th_init): ditto.
+ * thread.c (rb_exec_recursive_outer, rb_exec_recursive): Added method
+ to short-circuit to the outermost level in case of recursion
-Sat Dec 15 18:24:21 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/ruby/test_thread.rb (test_recursive_outer): Test for above
- * rational.c (f_round_common): should check overflow.
+ * hash.c (rb_hash_hash): Return a sensible hash for in case of
+ recursion [ruby-core:24648]
-Sat Dec 15 18:00:00 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * range.c (rb_range_hash): ditto
- * rational.c (float_rationalize): reduced.
+ * struct.c (rb_struct_hash): ditto
-Sat Dec 15 14:18:44 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * array.c (rb_array_hash): ditto
- * io.c (finish_writeconv): uses rb_write_internal2 if
- fptr->write_lock have.
+ * test/ruby/test_array.rb (test_hash2): test for above
-Sat Dec 15 13:57:08 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Sep 16 06:17:33 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * thread.c (rb_mutex_owned_p): remove static.
- * io.c (io_flush_buffer): don't hold mutex if already have.
- Now recursive lock may occur when following scenario.
- fptr_finalize -> finish_writeconv_sync -> finish_writeconv
- -> io_fflush.
+ * vm_eval.c (rb_catch_obj, rb_catch, rb_f_catch): No longer use the
+ obsolete function rb_iterate.
-Sat Dec 15 13:38:30 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 21:48:12 2009 Tanaka Akira <akr@fsij.org>
- * io.c (io_flush_buffer): uses io_flush_buffer_async2 instead of
- io_flush_buffer_async.
- * io.c (io_flush_buffer_async2): new helper function for
- io_flush_buffer. It uses rb_thread_call_without_gvl2() instead
- of rb_thread_io_blocking_region.
- * io.c (io_flush_buffer_sync2): new helper function for
- io_flush_buffer_async2.
+ * configure.in (--enable-frame-address): removed.
-Sat Dec 15 13:04:26 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 15:21:01 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c (internal_write_func2): new helper function for rb_write_internal2().
- * io.c (rb_write_internal2): new function. it uses
- rb_thread_call_without_gvl2() instead of rb_thread_io_blocking_region().
- * io.c (rb_binwrite_string): uses rb_write_internal2 instead of
- rb_write_internal. [Bug #7134]
+ * win32/{configure.bat,Makefile.sub} (RDOCTARGET): the meaning of this
+ macro was changed at r24923.
-Sat Dec 15 12:55:29 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 15:16:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_io_wait_writable): add to call rb_thread_wait_fd()
- likes rb_io_wait_readable.
+ * common.mk (install-rdoc), configure.in (RDOCTARGET): removed
+ circular dependency. [ruby-dev:39339]
-Sat Dec 15 11:54:50 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 15:09:13 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c (rb_io_wait_writable): don't call rb_thread_fd_writable()
- when EINTR. EINTR mean signal interrupt was happen. We don't
- need any wait.
+ * win32/configure.bat: need a space before a tab to output the tab by
+ echo.
-Sat Dec 15 11:53:36 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 14:24:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * thread.c (rb_thread_wait_fd_rw): remove silly rb_thread_alone()
- check.
+ * string.c (rb_str_split_m): use rb_isspace when the
+ string may be ASCII-incompatible.
-Sat Dec 15 10:22:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_lstrip_bang): ditto.
- * thread.c (rb_thread_polling): revert but deprecate.
+ * string.c (rb_str_rstrip_bang): ditto.
- * include/ruby/intern.h (rb_thread_polling): deprecate.
+Tue Sep 15 12:12:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 15 08:37:01 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * configure.in (RUBY_USE_BUILTIN_FRAME_ADDRESS): check after real
+ target CPU is set.
- * test/rubygems/test_gem_ext_cmake_builder.rb (test_self_build):
- get rid of false positive.
+ * configure.in (RUBY_UNIVERSAL_ARCH): check real target CPU after
+ AC_PROG_CC.
-Sat Dec 15 08:05:56 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 06:42:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_thread.rb (test_uninitialized, test_backtrace,
- test_thread_timer_and_interrupt, test_thread_join_in_trap,
- test_thread_join_current, test_thread_join_main_thread,
- test_main_thread_status_at_exit, test_thread_status_in_trap,
- test_thread_status_raise_after_kill, test_mutex_owned,
- test_mutex_owned2): move these tests from TestThreadGroup class
- to TestThread because they are not thread group tests.
+ * common.mk (install-all): target to install all.
- * test/ruby/test_thread.rb (test_thread_status_raise_after_kill):
- add t.join.
+ * tool/rbinstall.rb (parse_args): accept all install targets.
- * test/ruby/test_threadgroup.rb: new file. moved ThreadGroup test
- from test_thread.rb.
+ * tool/rbinstall.rb (parse_args): show help message and exit if
+ rbconfig could not load.
-Sat Dec 15 08:02:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Sep 15 04:25:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_thread.rb (TestThread::Thread::new.): remove
- th.abort_on_exception change. Test template shouldn't change
- global flag. It prevent to test a normal case.
+ * configure.in (RDOCTARGET): use install-all. [ruby-dev:39334]
-Sat Dec 15 06:15:14 2012 Eric Hodel <drbrain@segment7.net>
+Tue Sep 15 03:00:35 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (HAVE_GCC_ATOMIC_BUILTINS): Set -march=i486 to enable
- __sync_val_compare_and_swap. Patch by KOSAKI Motohiro.
- [ruby-trunk - Bug #7485]
+ * string.c (rb_str_lstrip_bang): use ascii_isspace(). [ruby-dev:39322]
-Sat Dec 15 03:42:34 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * string.c (rb_str_rstrip_bang): ditto.
- * ext/.document: add fiddle/pointer.c, fiddle/handle.c, and
- fiddle/win32/lib as documentation.
+ * string.c (rb_str_split_m): ditto.
-Sat Dec 15 03:06:40 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Sep 14 16:39:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_file_flock): use rb_thread_wait_for() instead of
- rb_thread_polling(). When getting EAGAIN, we need to wait a
- while even if no multi threading.
- * thread.c (sleep_for_polling, rb_thread_polling) removed.
+ * debug.c, parse.y: fixed types.
-Sat Dec 15 00:03:31 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * node.h (nd_line): limit to int.
- * signal.c (rb_f_kill): remove rb_thread_polling() because this
- has no good effect and makes meaningless 100ms delay. 1)
- when sending signal to another process, waiting has just silly.
- 2) when sending signal to current process, 100ms is often not
- enough time to wait. It depend on kernel behavior. And,
- rb_thread_polling() doesn't make sense anyway. When rb_thread_alone()
- is true, it doesn't wait at all and Process.kill() users don't
- expect threading changes Process.kill() behavior. [Bug #7560]
+Mon Sep 14 11:23:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 14 17:10:57 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in, common.mk, */configure.bat (rdoc): make before
+ install if rdoc is enabled. [ruby-dev:39325]
- * parse.y (parser_params): parser_tokline to track the line number at
- which token started. [ruby-dev:46737] [Bug #7559]
+Mon Sep 14 10:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (fcall): operation with starting line number.
+ * common.mk (check-ruby): run all test of ruby itself.
- * parse.y (command, primary, method_call): point method name line.
+Mon Sep 14 10:44:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (gettable_gen): return token line for __LINE__.
+ * include/ruby/ruby.h (RB_TYPE_P): should not use BUILTIN_TYPE for
+ special constants.
-Fri Dec 14 16:56:59 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Sep 14 10:08:19 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_insnhelper.c (vm_call_super_method): remove volatile introduced
- in r38365.
+ * string.c (rb_str_inspect): use rb_enc_mbc_to_codepoint
+ because we already knew char is found and got length.
- * vm_insnhelper.c (vm_call_method): use __forceinline to prevent
- VC++ to make vm_call_general and vm_call_super_method as the same
- method. Thanks, Heesob Park. [Bug #7556] [ruby-core:50867]
+Mon Sep 14 09:59:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Dec 14 14:59:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
+ (LONG2NUM, ULONG2NUM, NUM2CHR): get rid of backward references of
+ macros. the code couldn't compile by VC.
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
- take file and line by using caller_locations if not given.
+Mon Sep 14 08:33:11 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
- count assertions in separated tests.
+ * lib/net/http.rb (each_*): return enumerator if no block present.
+ Patch by Arthur Schreiber [ruby-core:18310]
-Fri Dec 14 14:16:42 2012 Eric Hodel <drbrain@segment7.net>
+Mon Sep 14 06:42:21 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * lib/rdoc/rubygems_hook.rb: Fixed generation of documentation.
- Disabled rdoc generation by default to match RubyGems defaults.
- Reduced diff with RubyGems::RDoc.
- * test/rdoc/test_rdoc_rubygems_hook.rb: Tests for the above.
- * test/rubygems/test_gem_rdoc.rb: ditto.
+ * lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
+ cookie itself. Based on a patch by Arthur Schreiber [ruby-core:17634]
- * lib/rdoc/store.rb: Removed useless variable assignment
+Mon Sep 14 05:21:12 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Fri Dec 14 13:58:40 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/net/http.rb (fetch): Handle properly default values; a patch by
+ Arthur Schreiber [ruby-core:18308]
- * lib/rubygems/commands/rdoc_command.rb: When overwriting
- documentation, remove existing documentation first.
+Mon Sep 14 04:07:09 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
- * lib/rubygems/server.rb: Fixed documentation links.
- * test/rubygems/test_gem_server.rb: Test for the above.
+ * lib/set.rb (==): Optimization; patch by Arthur Schreiber [ruby-core:17203]
- * lib/rubygems/rdoc.rb: Reduced diff with RDoc::RubyGemsHook
- * test/rubygems/test_gem_rdoc.rb: ditto
+Mon Sep 14 03:30:23 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Fri Dec 14 04:08:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * symbian/pre-build: added rule to generate id.h for Symbian build.
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
- added to execute given test source on separate process,
- catch its resulted exception and raise it on main process.
+ * symbian/configure.bat: fixed harmless error message.
-Fri Dec 14 07:43:44 2012 Aaron Patterson <aaron@tenderlovemaking.com>
- * ext/psych/lib/psych/visitors/yaml_tree.rb: quote strings that begin
- with non-word characters. Thanks Alex Tambellini!
- * test/psych/test_yaml.rb: appropriate test case
+Sun Sep 13 22:18:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 13 23:14:17 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * variable.c (rb_mod_remove_const): do not change VM state when an
+ exception will occur.
- * vm_insnhelper.c (vm_call_super_method): a workaround for the
- failure of TestRefinement#test_refine_recursion in Windows.
- See [ruby-core:50871] for details.
+Sun Sep 13 21:25:01 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Thu Dec 13 23:10:52 Charlie Somerville <charlie@charliesomerville.com>
+ * ext/win32ole/win32ole.c (oletypelib_get_libattr): some refactoring
+ by adding oletypelib_get_libattr.
- * object.c (Init_Object): use rb_mod_init_copy for Class#initialize_copy
- * class.c (rb_class_init_copy): rename to class_init_copy_check, performs type
- checks on arguments to prevent reinitialization of initialized class
- [ruby-core:50869] [Bug #7557]
- * class.c (rb_mod_init_copy): use class_init_copy_check if receiver is T_CLASS
- * test/ruby/test_class.rb (class TestClass): related test
+Sun Sep 13 20:55:19 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Thu Dec 13 16:53:10 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/win32ole/win32ole.c (oletypelib_get_typelib): some refactoring
+ by adding oletypelib_get_typelib.
- * lib/rdoc/class_module.rb: Fixed duplicate comments for classes and
- modules from C.
- * test/rdoc/test_rdoc_class_module.rb: Test for the above.
+Sun Sep 13 20:18:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/parser/c.rb: Reload C variable names to allow proper
- updates of an ri store for C files.
- * lib/rdoc/rdoc.rb: ditto.
- * lib/rdoc/store.rb: ditto.
- * test/rdoc/test_rdoc_parser_c.rb: Test for the above.
- * test/rdoc/test_rdoc_store.rb: ditto.
+ * ruby.c (process_sflag, proc_options, load_file_internal): fixed
+ types.
-Thu Dec 13 14:20:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Sun Sep 13 19:39:59 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * lib/irb*: merge doc from doc/irb/ird.rd and improve overall
- documentation of IRB
- * doc/irb/irb.rd: remove stale documentation
+ * ext/win32ole/win32ole.c: some refactoring.
-Thu Dec 13 14:10:00 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sun Sep 13 19:38:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * marshal.c (r_entry0): don't taint classes and modules because
- Marshal.load just returns the dumped classes and modules.
- [Bug #7325] [ruby-core:49198]
+ * ruby.c (load_file_internal): no need to define DATA when error.
- * test/ruby/test_marshal.rb: related test.
+Sun Sep 13 18:48:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 13 14:10:13 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in (XLDFLAGS): link startup code with ObjC support.
- * test/ruby/test_require.rb (TestRequire#test_loaded_features_encoding):
- need to check compatibility, not equality of encodings.
+Sun Sep 13 13:38:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Thu Dec 13 14:02:15 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * thread.c (recursive_*): refactored the access to the inspect
+ table used by rb_exec_recursive_*. The functions recursive_push,
+ pop and check now assume a valid hash table as their first
+ argument. Added documentation.
- * file.c (rb_file_join): check encoding compatibility before joining
- strings.
+Sun Sep 13 12:07:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 13 13:06:27 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/ruby.h (SYM2ID): needs parens.
- * proc.c (umethod_bind): allow another form of method transplanting
- from a module via UnboundMethod. [ruby-core:34267][Feature #4254]
+ * include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
+ (LONG2NUM, ULONG2NUM, NUM2CHR, rb_type_p, rb_special_const_p):
+ GCC specific optimization.
-Thu Dec 13 12:07:25 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sun Sep 13 11:06:12 2009 Tanaka Akira <akr@fsij.org>
- * include/ruby/ruby.h (RB_UNUSED_VAR): new macro to suppress
- warnings for unused variables.
+ * lib/open-uri.rb (OpenURI::Meta#content_type_parse): strip quotes.
- * ext/bigdecimal/bigdecimal.c (ENTER): use RB_UNUSED_VAR() to
- suppress annoying warnings by -Wunused-but-set-variable in gcc 4.6.
+Sun Sep 13 09:38:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 13 11:22:33 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/prime.rb (EratosthenesGenerator#initialize): call super.
+ (TrialDivisionGenerator, Generator23): ditto. [ruby-core:25539]
- * method.h: remove "VM_METHOD_TYPE__MAX" from rb_method_type_t.
- rb_method_type_t is not a number and "_MAX" causes misunderstanding.
+Sun Sep 13 09:34:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * proc.c (rb_method_entry_arity): ditto.
+ * vm_method.c (rb_add_method_def): no warning for inherited
+ method.
- * vm_eval.c (vm_call0_body): ditto.
+Sun Sep 13 08:30:30 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * vm_insnhelper.c (vm_call_method): ditto.
+ * ext/win32ole/win32ole.c: fix WIN32OLE_TYPELIB.new when the 1st
+ argument is the non-registered file.
+
+Sun Sep 13 02:08:43 2009 Koichi Sasada <ko1@atdot.net>
+
+ * vm_core.h: change members of iseq_inline_cache_entry.
+ make cache value members to one union member "ic_value".
-Wed Dec 12 21:40:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * insns.def: ditto.
- * lib/tmpdir.rb (Dir::Tmpname#create): deal with a prefix name which
- starts with tilde as a plain name, not expanding as home directory.
- [ruby-core:50793] [Bug #7547]
+ * vm_insnhelper.c: ditto.
-Wed Dec 12 19:48:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Sep 13 01:15:49 2009 Tanaka Akira <akr@fsij.org>
- * ext/json: merge JSON 1.7.5.
- fix tests and other fixes.
+ * lib/open-uri.rb (URI::FTP#buffer_open): fix the %2F handling.
-Wed Dec 12 18:30:29 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sun Sep 13 00:46:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * class.c (rb_prepend_module): move refined methods from the origin
- of a class to the class, because refinements should have priority
- over prepended modules.
+ * vm_method.c (CALL_METHOD_HOOK): refined with macro.
- * test/ruby/test_refinement.rb: related test.
+ * vm_method.c (rb_remove_method_id): no definition body is
+ undefined.
-Wed Dec 12 18:27:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_method.c (rb_add_method, rb_add_method_me): call method added
+ hook after definition. [ruby-core:25536]
- * time.c (zone_str): lookup or insert by using st_update() at once.
+ * vm_method.c (rb_alias): hooks are called from rb_add_method_def.
-Wed Dec 12 15:30:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Sep 12 22:47:24 2009 Tanaka Akira <akr@fsij.org>
- * configure.in: add -fno-omit-frame-pointer if libexecinfo is used.
- At least on FreeBSD ruby will crash on getting C backtrace
- when it is compiled with other than -O0.
+ * lib/open-uri.rb (URI::FTP#buffer_open): use the port specified in
+ the URI.
- * vm_dump.c: enable backtrace on FreeBSD even if with optimizations.
+Sat Sep 12 17:31:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 12 16:08:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (GCC): subst for GCC depending extension libraries.
- * test/rdoc/test_rdoc_rdoc.rb (TestRDocRDoc#test_normalized_file_list_non_file_directory):
- use File::NULL for portability if possible.
+Sat Sep 12 07:52:59 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Wed Dec 12 16:07:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/win32ole.c (EVENTSINK_Invoke): initialize result
+ variant value.
- * method.h (rb_method_flag_t): name a magic number for NOEX_SAFE and
- NOEX_WITH as NOEX_SAFE_SHIFT_OFFSET.
+Fri Sep 11 21:52:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * method.h (rb_method_type_t, method_optimized_type): C89 forbids a
- comma after the last element in enum.
+ * NEWS: update for 1.9.2. based on a patch from Run Paint Run Run
+ in [ruby-core:25534].
- * proc.c (rb_method_entry_arity), vm_eval.c (vm_call0_body),
- vm_insnhelper.c (vm_call_method): add VM_METHOD_TYPE__MAX case.
+Fri Sep 11 21:38:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 12 14:16:35 2012 Eric Hodel <drbrain@segment7.net>
+ * configure.in: check for real target cpu on darwin 10.
- * lib/rdoc/class_module.rb: Added RDoc::ClassModule#documented? which
- checks comment_location. Hide RDoc::ClassModule#comment=.
- * test/rdoc/test_rdoc_class_module.rb: Test for above.
+Fri Sep 11 18:51:57 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml:
- Fix display of the table of contents in the sidebar.
+ * test/fileutils: use require_relative to require fileasserts.
- * lib/rdoc/generator/template/darkfish/table_of_contents.rhtml:
- Use #comment_location when displaying classes or modules.
+Fri Sep 11 14:22:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rdoc/test_rdoc_store.rb: Use comment_location.
+ * configure.in (debugflags): use gdb by default on linux and
+ darwin.
-Wed Dec 12 13:40:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (XLDFLAGS): keep ARCHFILE macro on AIX.
- * vm_insnhelper.c (vm_getivar): no uninitialized instance variables
- warnings for non-object if attr method.
+ * configure.in (RUBY_REPLACE_TYPE): define typename to default
+ type if the latter is found.
-Wed Dec 12 06:43:37 2012 Benoit Daloze <eregontp@gmail.com>
+Fri Sep 11 13:57:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c (rb_iseq_parameters): fix limit for optional arguments.
+ * include/ruby/win32.h (fstat): override if large file support is
+ enabled.
- * test/ruby/test_keyword.rb: tests for above.
+Fri Sep 11 11:33:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (struct rb_iseq_struct): update documentation
- with keyword arguments. [Bug #7540] [ruby-core:50735]
+ * tool/config.{guess,sub}: updated to automake-1.11.
-Wed Dec 12 03:45:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
- * vm.c (vm_exec): pass exceptions while handling an exception.
+ * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s
+ to k. A patch from swdyh <youhei@gmail.com>
+ http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39
- * vm_trace.c (rb_threadptr_exec_event_hooks): propagate exceptions.
- revert r38293 partially.
+Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 12 03:09:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dln.c (aix_loaderror): get rid of using uninitialized value in the
+ case loadquery fails. fixed wrong index variable usage. see
+ [ruby-core:25479].
- * sample/test.rb (Progress#initialize): add --verbose option and show
- messages in one line unless --verbose is given.
+Fri Sep 11 07:52:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 12 01:47:02 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * unicode.c (onigenc_unicode_property_name_to_ctype):
+ ignore case of properties.
- * eval.c (rb_using_refinement): make the method table of an iclass
- for a refinement that of the refinement, not that of the origin of
- the refinement, which is set by rb_include_class_new(). This
- change is needed to make module prepend into a refinement work
- properly.
+ * tool/enc-unicode.rb: downcase properties list.
- * test/ruby/test_refinement.rb: related test.
+ * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
+ enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
+ follow above.
-Wed Dec 12 01:05:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Sep 11 05:00:19 2009 Koichi Sasada <ko1@atdot.net>
- * tool/make-snapshot: add --disable-rubygem to both MINIRUBY and RUBY.
- On making miniprelude.c, it seems use MINIRUBY. this fixes #7541
- but rubygems also needs to be fixed for older rubies.
+ * include/ruby/ruby.h (rb_data_type_t): Add comments.
+ And add a member variable "data", a multi-purpose storage
+ area for rb_data_type.
-Wed Dec 12 00:32:11 2012 Naohisa Goto <ngotogenome@gmail.com>
+Fri Sep 11 02:14:21 2009 Tanaka Akira <akr@fsij.org>
- * test/dl/test_func.rb (test_name_with_block, test_bind, test_qsort1):
- call unbind to release the callback closure because maximum number
- of callbacks is limited to DL::MAX_CALLBACK (== 5) with pure DL
- without Fiddle.
+ * test/dl: use require_relative to require test_base.rb.
-Wed Dec 12 00:13:34 2012 Naohisa Goto <ngotogenome@gmail.com>
+Fri Sep 11 02:06:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/dl/lib/dl/func.rb (DL::Function#unbind, #bound?): suppress
- NoMethodError when Fiddle is available. [ruby-core:50756] [Bug #7543]
- * test/dl/test_func.rb (test_bound*, test_unbind*): tests for the above.
+ * parse.y (rb_char_to_option_kcode): ASCII-8BIT should
+ also delay.
-Tue Dec 11 19:38:37 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * re.c (parser_regx_options): return rb_ascii8bit_encindex on
+ ASCII-8BIT. [ruby-dev:39300]
- * ext/fiddle/function.c (Fiddle::Function.new): new keyword argument
- :name to set the name attribute.
- * ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
- set function name by using the :name keyword argument.
- Re-fixes r38243. [ruby-core:50566]
- * test/fiddle/test_function.rb (test_name): test for the :name keyword
- argument and Fiddle::Function#name.
+Fri Sep 11 01:14:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-Tue Dec 11 16:57:33 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/net/http.rb (fetch): rdoc fix, patch by Arthur Schreiber.
+ [ruby-core:18309].
- * common.mk: Added --pages-dir to rdoc creation. Now doc/ items show
- up at top-level.
- * .document: Moved doc/* entries to doc/.document
- * doc/.document: ditto
+Thu Sep 10 23:00:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Dec 11 16:44:37 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/mkmf.rb (create_makefile): fix for parallel execution.
+ [ruby-core:25509]
- * lib/rdoc/options.rb: Added --page-dir option for moving pages in
- doc/ to the top-level.
- * lib/rdoc/rdoc.rb: ditto.
- * test/rdoc/test_rdoc_options.rb: Test for the above.
- * test/rdoc/test_rdoc_rdoc.rb: ditto.
+Thu Sep 10 21:22:01 2009 Tanaka Akira <akr@fsij.org>
-Tue Dec 11 15:24:05 2012 Eric Hodel <drbrain@segment7.net>
+ * test/dl/test_cptr.rb (test_free=): test SEGV at first.
+ [ruby-dev:39269]
- * ext/pathname/lib/pathname.rb: Hide private methods from RDoc.
+Thu Sep 10 21:20:59 2009 Tanaka Akira <akr@fsij.org>
-Tue Dec 11 15:11:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/ruby/envutil.rb (assert_normal_exit): Don't use
+ AssertionMessage.
- * tool/make-snapshot (BASERUBY): add --disable-gem to avoid load gems.
- [Bug #7541] [ruby-core:50736]
+Thu Sep 10 15:59:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Dec 11 12:00:19 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * regparse.c (UNKNOWN_ESC_WARN): added.
- * ext/dl/win32/extconf.rb: Fix typo
- by Santiago Pastorino <santiago@wyeworks.com>
- https://github.com/ruby/ruby/pull/221 fix GH-221
+ * regparse.c (conv_backslash_value): Warn unknown
+ escaped chars in regexp. [ruby-dev:39104]
-Tue Dec 11 01:53:37 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Wed Sep 9 22:02:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/matrix: alias {row|column}_size to {row|column}_count and use
- the latter.
- [Bug #7369] [ruby-core:49409]
+ * lib/fileutils.rb (FileUtils::Entry_#copy_file): open the source
+ file first to ensure it can be copied. [ruby-core:25498]
-Tue Dec 11 00:26:58 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Sep 9 21:20:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * fix the behavior when a module is included into a refinement.
- This change is a little tricky, so it might be better to prohibit
- module inclusion to refinements.
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_data_type): typed.
- * include/ruby/ruby.h (RMODULE_INCLUDED_INTO_REFINEMENT): new flag
- to represent that a module (iclass) is included into a refinement.
+ * ext/dl/cfunc.c (dlcfunc_data_type): typed.
- * class.c (include_modules_at): set RMODULE_INCLUDED_INTO_REFINEMENT
- if klass is a refinement.
+ * ext/dl/cptr.c (dlptr_data_type): ditto.
- * eval.c (rb_mod_refine): set the superclass of a refinement to the
- refined class for super.
+ * ext/dl/handle.c (dlhandle_data_type): ditto.
- * eval.c (rb_using_refinement): skip the above superclass (the
- refined class) when creating iclasses for refinements. Otherwise,
- `using Refinement1; using Refinement2' creates iclasses:
- <Refinement2> -> <RefinedClass> -> <Refinement1> -> RefinedClass,
- where <Module> is an iclass for Module, so RefinedClass is
- searched before Refinement1. The correct iclasses should be
- <Refinement2> -> <Refinement1> -> RefinedClass.
+Wed Sep 9 17:17:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_insnhelper.c (vm_search_normal_superclass): if klass is an
- iclass for a refinement, use the refinement's superclass instead
- of the iclass's superclass. Otherwise, multiple refinements are
- searched by super. For example, if a refinement Refinement2
- includes a module M (i.e., Refinement2 -> <M> -> RefinedClass,
- and if refinements iclasses are <Refinement2> -> <M>' ->
- <Refinement1> -> RefinedClass, then super in <Refinement2> should
- use Refinement2's superclass <M> instead of <Refinement2>'s
- superclass <M>'.
+ * re.c (parser_regx_options): only one kcode should effect
+ options [ruby-core:25411]
- * vm_insnhelper.c (vm_search_super_method): do not raise a
- NotImplementError if current_defined_class is a module included
- into a refinement. Because of the change of
- vm_search_normal_superclass(), the receiver might not be an
- instance of the module('s iclass).
+Wed Sep 9 15:46:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: related test.
+ * load.c (rb_feature_provided): fixed for autoloading extension
+ library without suffix.
-Mon Dec 10 18:35:25 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Sep 9 15:24:32 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * vm_method.c (rb_method_entry_without_refinements): use
- rb_resolve_refined_method() to search superclasses if
- me->def->orig_me is 0. This change fixes make test-all
- TESTS="json ruby/test_refinement.rb".
+ * include/ruby/st.h : revert previous commit.
- * test/ruby/test_refinement.rb: related test.
+ * ext/objspace/objspace.c : remove st_memsize declare.
-Mon Dec 10 17:59:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Sep 9 14:07:19 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * ext/fiddle/win32/*: library ports from DL to Fiddle.
+ * include/ruby/st.h : fix duplicate st_memsize declare.
- * ext/dl/win32/extconf.rb: check fiddle. often case dl compiled prior
- to fiddle, so this change is no meaning. in most cases, simply
- fiddle/win32 overwrite dl/win32.
+Wed Sep 9 13:33:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 10 15:23:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * variable.c (rb_autoload): initialize typed data.
- * vm_trace.c (rb_threadptr_exec_event_hooks): exceptions in event
- hooks should not propagate outside.
+Wed Sep 9 13:10:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 10 15:11:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * st.c (st_free_table): constified.
- * compile.c (iseq_compile_each): count flip-flop state in local iseq
- not in each iseqs, so that the keys can be other than hidden
- strings. [ruby-core:47253] [Bug #6899]
+Wed Sep 9 13:09:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (lep_svar_get, lep_svar_set, vm_getspecial): store
- flip-flop states in an array instead of a hash.
+ * dir.c (dir_data_type): typed.
- * iseq.c (set_relation): main iseq also can has local scope.
+ * enumerator.c (enumerator_data_type): typed.
+ (yielder_data_type, generator_data_type): ditto.
-Mon Dec 10 10:36:12 2012 Narihiro Nakamura <authornari@gmail.com>
+ * error.c (name_err_mesg_data_type): typed.
- * lib/irb/magic-file.rb: set a encoding, which is detected from
- the file to read, to the internal encoding.
- [Bug #4281][ruby-dev:43036]
+ * file.c (stat_data_type): typed.
-Mon Dec 10 09:40:19 2012 Eric Hodel <drbrain@segment7.net>
+ * thread.c (thgroup_data_type, mutex_data_type, barrier_data_type):
+ typed.
- * lib/rubygems/ext/cmake_builder.rb: Added a builder for cmake.
- * lib/rubygems/ext.rb: ditto.
- * lib/rubygems/installer.rb: ditto.
- * test/rubygems/test_gem_ext_cmake_builder.rb: Test for above.
+ * time.c (time_data_type): typed.
-Mon Dec 10 09:13:08 2012 Eric Hodel <drbrain@segment7.net>
+ * transcode.c (econv_data_type): typed.
- * lib/rubygems/package.rb: Omit directories when packaging gems like
- RubyGems 1.8.x
- * test/rubygems/test_gem_package.rb: Test for above.
+ * variable.c (autoload_data_type): typed.
-Sun Dec 9 17:36:59 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Sep 9 11:11:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (vm_call_opt_send): Kernel#send should not use
- refinements.
+ * include/ruby/ruby.h (rb_data_type_struct): constified dsize.
- * proc.c (mnew): Kernel#method, Kernel#public_method,
- Module#instance_method, and Module#public_instance_method should
- not use refinements.
+Wed Sep 9 11:07:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (rb_method_boundp): Kernel#respond_to? should not use
- refinements.
+ * cont.c (cont_memsize): fixed wrong expression on IA64.
- * test/ruby/test_refinement.rb: related test.
+Wed Sep 9 10:51:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Dec 9 06:19:04 2012 Eric Hodel <drbrain@segment7.net>
+ * cont.c (cont_restore_1, rb_cont_call): should be Fiber.
- * lib/rdoc/markdown/entities.rb: Added documentation.
+Wed Sep 9 00:27:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/parser/ruby.rb: Updated style
+ * cont.c (cont_data_type, fiber_data_type): typed.
- * lib/rdoc/ruby_lex.rb: Parse characters up to \u{FFFFF}
- * test/rdoc/test_rdoc_ruby_lex.rb: Test for above.
+Tue Sep 8 22:37:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 8 22:38:35 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/tempfile.rb, lib/tmpdir.rb (Tmpname): extracted new module.
+ [ruby-dev:39197]
- * eval.c (rb_mod_refine): don't override Module#include. It's
- unnecessary now because refinements are activated only in refine
- blocks.
+Tue Sep 8 22:18:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 8 22:33:26 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * st.c (st_init_*table_with_size): use st_index_t.
- * eval.c: remove Module#refinements.
+ * include/ruby/st.h (st_hash_func): use st_index_t.
- * test/ruby/test_refinement.rb: remove tests for Module#refinements.
+Tue Sep 8 21:48:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 8 13:17:55 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * vm.c (rb_thread_mark): mark callers iseqs. [ruby-core:25474]
+ [Bug #2062]
- * eval.c (top_using): raise a RuntimeError if using is called in a
- module definition or a method definition.
+Tue Sep 8 11:53:58 2009 Koichi Sasada <ko1@atdot.net>
- * test/ruby/test_refinement.rb: related test.
+ * iseq.c (iseq_mark): no need to mark inline cache entries.
-Sat Dec 8 15:01:35 2012 Eric Hodel <drbrain@segment7.net>
+ * insns.def (onceinlinecache, setinlinecache): save a value
+ to mark cached value.
- * lib/rubygems/commands/cleanup_command.rb: Skip default gems when
- cleaning up.
- * test/rubygems/test_gem_commands_cleanup_command.rb: Test for above.
+Tue Sep 8 08:32:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/commands/query_command.rb: Fixed listing remote gems.
+ * test/dl/test_{cfunc,ptr}.rb: added tests from Aaron Patterson.
+ see [ruby-dev:39249].
- * lib/rubygems/dependency_installer.rb: Ignore non-files when looking
- for local gems.
- * test/rubygems/test_gem_dependency_installer.rb: Test for above.
+Mon Sep 7 17:22:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/uninstaller.rb: The user must confirm uninstalling gems
- that have dependencies.
- * test/rubygems/test_gem_uninstaller.rb: Test for above.
+ * io.c (rb_io_tell): adjustment for ungotten data.
- * lib/rubygems.rb (module Gem): Updated version.
+Mon Sep 7 17:13:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rubygems/*.pem: Updated to run in FIPS mode.
- * test/rubygems/test_gem_security.rb: ditto.
- * test/rubygems/test_gem_security_signer.rb: ditto.
+ * io.c (io_encname_bom_p): removed magic number.
-Sat Dec 8 12:34:01 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Sep 7 12:26:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_insnhelper.c (vm_search_normal_superclass): super in a
- refinement always uses the refined class as its superclass.
+ * lib/irb/inspector.rb (IRB::INSPECTORS.def_inspector): support
+ object without #inspect defined. a patch from Daniel
+ Bovensiepen. [ruby-core:25200]
- * test/ruby/test_refinement.rb: related test.
+Mon Sep 7 05:38:34 2009 Koichi Sasada <ko1@atdot.net>
-Sat Dec 8 11:59:59 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * insns.def (opt_*): add IC operands.
- * eval.c (rb_mod_refine): raise an ArgumentError if a given
- block is of a Proc object.
+ * vm_insnhelper.h (CALL_SIMPLE_METHOD): add a version which
+ use an inline cache. USE_IC_FOR_SPECIALIZED_METHOD macro
+ switches the behaviour. This change also removes
+ CALL_SIMPLE_METHOD_IC() macro.
- * vm_insnhelper.c (vm_call_method): store refined methods in inline
- cache to improve performance. It's safe now because blocks cannot
- be yielded with different refinements in the new specification.
+ * tool/instruction.rb: fix elimination process to ignore
+ variable "ic".
- * test/ruby/test_refinement.rb: related test.
+Mon Sep 7 05:21:09 2009 Koichi Sasada <ko1@atdot.net>
-Sat Dec 8 11:17:53 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * Makefile.in, common.mk: move a id.h generation rule.
- * eval.c (rb_mod_refine), vm_eval.c (rb_yield_refine_block):
- Module#refine activates all refinements defined in that module
- only in a given block.
+Mon Sep 7 05:07:59 2009 Koichi Sasada <ko1@atdot.net>
- * string.c (sym_to_proc, sym_call): don't use refinements.
+ * benchmark/driver.rb: remove RUBY_VERSION output.
- * test/ruby/test_refinement.rb: related test.
+Mon Sep 7 05:06:16 2009 Koichi Sasada <ko1@atdot.net>
-Sat Dec 8 09:24:42 2012 Eric Hodel <drbrain@segment7.net>
+ * vm_insnhelper.c: rename macro name ENABLE_IC_FOR_IVAR
+ to USE_IC_FOR_IVAR.
- * ext/openssl/ossl_x509name.c: Completed documentation for
- OpenSSL::X509::Name.
+Mon Sep 7 03:21:40 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Dec 8 07:57:12 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/uri/common.rb (URI.escape): obsoleted.
- * ext/objspace/objspace.c (iow_size): return size of internal object
- for ObjectSpace.memsize_of().
+ * lib/uri/common.rb (URI.unescape): ditto.
- * test/objspace/test_objspace.rb: add a test.
+Sun Sep 6 18:13:54 2009 Koichi Sasada <ko1@atdot.net>
-Tue Dec 08 02:39:23 2012 James Edward Gray II <james@graysoftinc.com>
+ * vm_insnhelper.h (CALL_SIMPLE_METHOD_IC): make a macro
+ invoke simple method with inline cache entry.
- * lib/csv.rb: A fix for row comparison by Stephen Wattam. [Bug #7528]
+ * insns.def (opt_length, opt_size): fix to use inline method cache.
-Sat Dec 8 01:27:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Sep 6 17:47:21 2009 Koichi Sasada <ko1@atdot.net>
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): no need to
- check all reports.
+ * template/id.h.tmpl: fix this.
-Sat Dec 8 00:10:34 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * id.h: removed. Because this file is generated automatically.
- * vm_eval.c (yield_under, eval_under): do not activate refinements
- of the receiver in module_eval and instance_eval.
+Sun Sep 6 17:31:28 2009 Koichi Sasada <ko1@atdot.net>
- * eval.c (ruby_Init_refinement): undef Class#refine.
+ * compile.c (iseq_specialized_instruction), insns.def (opt_size):
+ optimize #size methods (by specialized instruction).
- * eval.c (ruby_Init_refinement): remove Module#using.
+ * id.c, id.h, vm.c, vm_insnhelper.h: ditto.
- * eval.c (ruby_Init_refinement): main.using should be private.
+Sun Sep 6 16:13:06 2009 Koichi Sasada <ko1@atdot.net>
- * eval.c (rb_mod_refine): the argument of Module#refine should not
- be a module.
+ * insns.def (setinstancevariable), vm_insnhelper.c (vm_setivar):
+ fix to use inline cache (trivial optimization).
- * insns.def (defineclass): do not activate refinements in a class or
- module.
+Sun Sep 6 10:34:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 7 23:42:11 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * io.c: fixed rdoc, a patch from Nobuhiro IMAI at [ruby-core:25433].
- * ext/refinement/refinement.c: include ruby/ruby.h instead of the
- declaration of rb_warn().
+Sun Sep 6 05:19:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Dec 7 16:07:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * io.c: Add rdoc for ARGF.
+ contributed by Run Paint Run Run. [ruby-core:23854]
- * doc/etc.rd: Removed stale documentation file
- * ext/etc/etc.c: Merged documentation from doc/etc.rd and updated
- rdoc, added documentation for Etc::Passwd and Etc::Group
+Sat Sep 5 15:21:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 7 16:00:57 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * compile.c (iseq_compile_each): op_asgn to aref should return rhs.
+ [ruby-core:25387]
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): no need to
- retry skipped test. this fix makes 40% faster the whole test-all
- with -j5 on Windows.
+Sat Sep 5 10:38:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 7 14:22:29 2012 Eric Hodel <drbrain@segment7.net>
+ * compile.c (iseq_compile_each): &&= and ||= should return rhs.
+ [ruby-dev:39163] (#1996), [ruby-core:25143]
- * lib/rdoc/markup/to_joined_paragraph.rb: Completed documentation
- * lib/rdoc/parser/c.rb: ditto
- * lib/rdoc/parser/changelog.rb: ditto
- * lib/rdoc/servlet.rb: ditto
- * lib/rdoc/store.rb: ditto
+Sat Sep 5 08:51:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/store.rb: Improved HTML error page. Completed
- documentation
+ * re.c (update_char_offset): position should be long.
- * lib/rdoc/parser/ruby.rb: Fixed bug attaching a comment to A::B = 42
- * test/rdoc/test_rdoc_parser_ruby.rb: Test for above
+ * re.c (match_hash, match_equal): new methods. [ruby-core:24748]
- * test/rdoc/test_rdoc_comment.rb: Removed garbage
+ * re.c (reg_match_pos, rb_reg_eqq, rb_reg_s_quote): get rid of use
+ VALUE as int.
-Fri Dec 7 14:03:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Sep 4 20:40:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/timeout.rb (Timeout#timeout): since async_interrupt_timing
- re-raises a deferred exception, replace the timeout exception with
- Timeout::Error after it. [Bug #7503]
+ * numeric.c (round): added declaration. [ruby-dev:39222]
-Fri Dec 7 13:07:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Fri Sep 4 06:15:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * doc/forwardable.rd: Remove stale documentation file
- * lib/forwardable.rb: Merge documentation from doc/forwardable.rd
+ * dir.c (Init_Dir): alias Dir#path to Dir#to_path. [ruby-core:25326]
-Fri Dec 7 09:47:35 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Sep 4 04:49:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * time.c (time_mdump): dump timezone string to private instance variable
- on marshaling.
+ * random.c (random_rand): fixed rdoc. [ruby-core:25332]
- * time.c (time_mload): load timezone string from private instance
- variable named 'zone'.
+Fri Sep 4 04:46:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Dec 7 01:15:07 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/webrick/httpservlet/abstract.rb (do_OPTIONS): method names
+ are symbols now. [ruby-core:24580]
- * ext/fiddle/lib/fiddle/function.rb (Fiddle::Function#name): new
- attribute needed to switch Win32::Registry from DL to Fiddle.
+Thu Sep 3 17:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
- set function name to the returned Fiddle::Function object.
+ * parse.y (literal_concat_gen): concat body from dstr instead of
+ nd_next. [ruby-core:25284]
-Fri Dec 7 00:11:44 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Sep 2 16:49:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: fix some tests to use neither
- Module#using nor Module#module_eval.
+ * math.c (math_gamma): get rid of direct comparison between too
+ big double and integer, with gcc on x86_64. [ruby-core:25257]
-Thu Dec 6 23:27:50 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Sep 2 13:47:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_Init_refinement): a new function to enable
- Refinements with a warning "Refinements are experimental...".
+ * math.c (domain_check): simplified.
- * ext/refinement/refinement.c, ext/refinement/extconf.rb: a new
- extension library to enable Refinements.
+Wed Sep 2 11:32:24 2009 Koichi Sasada <ko1@atdot.net>
-Thu Dec 6 18:23:05 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * gc.c (obj_free): fix to free method table (fix memory leak).
- * revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
- entry with VM_METHOD_TYPE_REFINED holds only the original method
- definition, so ci->me is set to a method entry allocated in the
- stack, and it causes SEGV/ILL. In this commit, a method entry
- with VM_METHOD_TYPE_REFINED holds the whole original method entry.
- Furthermore, rb_thread_mark() is changed to mark cfp->klass to
- avoid GC for iclasses created by copy_refinement_iclass().
+Wed Sep 2 07:42:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (rb_method_entry_make): add a method entry with
- VM_METHOD_TYPE_REFINED to the class refined by the refinement if
- the target module is a refinement. When a method entry with
- VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
- the same name is searched in refinements. If such a method is
- found, the method is invoked. Otherwise, the original method in
- the refined class (rb_method_definition_t::body.orig_me) is
- invoked. This change is made to simplify the normal method lookup
- and to improve the performance of normal method calls.
+ * tool/instruction.rb (RubyVM::InstructionsLoader#make_stackcaching_insns):
+ simplified.
- * vm_method.c (EXPR1, search_method, rb_method_entry),
- vm_eval.c (rb_call0, rb_search_method_entry): do not use
- refinements for method lookup.
+Wed Sep 2 02:32:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_insnhelper.c (vm_call_method): search methods in refinements if
- ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
- super (i.e., ci->call == vm_call_super_method), skip the same
- method entry as the current method to avoid infinite call of the
- same method.
+ * ext/json/lib/json/common.rb (NaN): Change definition
+ of NaN to 0.0/0 for 1.8/1.9 compatibility.
- * class.c (include_modules_at): add a refined method entry for each
- method defined in a module included in a refinement.
+Wed Sep 2 01:16:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * class.c (rb_prepend_module): set an empty table to
- RCLASS_M_TBL(klass) to add refined method entries, because
- refinements should have priority over prepended modules.
+ * ext/json: Update to JSON 1.1.9.
- * proc.c (mnew): use rb_method_entry_with_refinements() to get
- a refined method.
+Tue Sep 1 19:56:28 2009 Koichi Sasada <ko1@atdot.net>
- * vm.c (rb_thread_mark): mark cfp->klass for iclasses created by
- copy_refinement_iclass().
+ * vm_eval.c (eval_string_with_cref): fix to check local_table_size.
+ [ruby-dev:39205] [Bug #2024]
- * vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass.
+Mon Aug 31 16:20:41 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
- the test because it should pass successfully.
+ * class.c (make_singleton_class): variable name changed.
+ removed an unnecessary conditional.
- * test/ruby/test_refinement.rb (test_redefine_refined_method): new
- test for the case a refined method is redefined.
+Mon Aug 31 14:17:09 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Thu Dec 6 17:29:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * class.c: refactored singleton class related matters.
+ Handles eigenclasses and plain classes transparently.
- * parse.y (parser_here_document): flush string content between new
- line and :string_embexpr. [ruby-core:48703] [Bug #7255]
+ (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.
-Thu Dec 6 16:35:21 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * test/rake/helper.rb: Load envutil correctly. Removed useless rescue
- for signal propagation tests
- * lib/rake/file_utils.rb: Prefer the built ruby.
- * test/rake/test_rake_functional.rb: ditto
+Sun Aug 30 23:44:09 2009 Tanaka Akira <akr@fsij.org>
-Thu Dec 6 15:20:34 2012 Eric Hodel <drbrain@segment7.net>
+ * time.c (find_time_t): use mktime for the first guess.
- * lib/rdoc/context.rb: Don't warn for duplicate methods while loading.
- * test/rdoc/test_rdoc_context.rb: Test for above.
+Sun Aug 30 16:38:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 6 14:26:22 2012 Eric Hodel <drbrain@segment7.net>
+ * parse.y (rb_enc_symname2_p): not depend on nul terminator.
- * lib/rubygems/command_manager.rb: Removed string concatenation
- syntax. [Bug #6265]
- * lib/rubygems/commands/install_command.rb: ditto
- * lib/rubygems/commands/uninstall_command.rb: ditto
- * lib/rubygems/indexer.rb: ditto
- * lib/rubygems/security/policy.rb: ditto
- * lib/rubygems/security.rb: ditto
- * lib/rubygems/uninstaller.rb: ditto
- * test/rubygems/test_gem_commands_cert_command.rb: ditto
- * test/rubygems/test_gem_package.rb: ditto
- * test/rubygems/test_gem_security.rb: ditto
- * test/rubygems/test_gem_security_policy.rb: ditto
+Sun Aug 30 14:11:45 2009 Tanaka Akira <akr@fsij.org>
-Thu Dec 6 14:10:08 2012 Eric Hodel <drbrain@segment7.net>
+ * common.mk: dependencies updated.
- * lib/rubygems/package.rb: Set rubygems_version before validation.
- Fixes issue with bundler.
- * test/rubygems/test_gem_package.rb: Test for above.
+Sun Aug 30 13:00:11 2009 Tanaka Akira <akr@fsij.org>
- * lib/rubygems/remote_fetcher.rb: Only update the cache when we have
- permission. [ruby-trunk - Bug #7509]
- * lib/rubygems/source.rb (class Gem): ditto
- * test/rubygems/test_gem_remote_fetcher.rb: Test for above.
- * lib/rubygems/test_utilities.rb: ditto
+ * time.c (add): shortcut implemented for fixnums.
+ (sub): ditto.
+ (mul): ditto.
- * lib/rubygems/specification.rb: Derive base_dir properly for default
- gems. [ruby-trunk - Bug #7496]
- * test/rubygems/test_gem_specification.rb: Test for above.
+Sun Aug 30 10:24:43 2009 Tanaka Akira <akr@fsij.org>
- * lib/rubygems.rb: Untaint Dir.pwd when searching for gemdeps files
- for operation under $SAFE=1
+ * time.c (eq): apply RTEST.
+ (ne): ditto.
+ (add): avoid method dispatch for bignums.
+ (sub): ditto.
+ (mul): ditto.
+ (mod): ditto.
-Thu Dec 06 12:07:11 2012 Koichi Sasada <ko1@atdot.net>
+Sun Aug 30 09:45:11 2009 Tanaka Akira <akr@fsij.org>
- * vm_trace.c: TracePoint#enable should not cause an error
- when it is already enabled. TracePoint#disable is too.
- [ruby-core:50561] [ruby-trunk - Bug #7513]
+ * bignum.c (bigmul1_single): new function specialized respect to
+ multiply two single digit bignums.
+ (bigmul0): use bigmul1_single.
- * test/ruby/test_settracefunc.rb: add tests.
+Sun Aug 30 03:59:43 2009 Tanaka Akira <akr@fsij.org>
-Thu Dec 6 07:19:58 2012 Eric Hodel <drbrain@segment7.net>
+ * timev.h (TIME_SCALE): defined as 1000000000.
+ (struct vtm): subsec is replaced by subsecx.
+ subsec * TIME_SCALE == subsecx.
- * lib/rdoc*: Improved display of ChangeLog files as HTML.
- * test/rdoc*: Test for above.
+ * time.c: avoid rational in most cases.
+ (struct time_object): timev is replaced by timexv.
+ timev * TIME_SCALE == timexv.
-Thu Dec 6 04:34:19 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sun Aug 30 03:17:25 2009 Tanaka Akira <akr@fsij.org>
- * thread.c (rb_uninterruptible): helper function for providing
- temporary async_interrupt_timing(Object => :defer)
+ * time.c (init_leap_second_info): use TIMET_MAX.
- * io.c (rb_f_p): use rb_uninterruptible.
- * io.c (rb_f_p_internal): helper function for rb_f_p().
- * io.c (struct rb_f_p_arg): new struct for rb_f_p_internal.
+Sun Aug 30 01:15:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_thread.rb (test_async_interrupt_and_p): test for
- the above.
+ * ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
+ set and convert its encoding. [ruby-dev:38304]
-Thu Dec 6 04:27:10 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sat Aug 29 20:40:02 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * io.c (io_binwrite): check interrupt before io issue.
- * test/ruby/test_thread.rb (test_async_interrupt_and_io):
- test for the above.
+ * vm_eval.c (rb_call0): gets rid of checking method cache twice.
-Thu Dec 6 01:10:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * method.h (rb_get_method_entry): added a prototype of the function.
+ (rb_method_entry_without_cache): more friendly name.
- * vm_eval.c (rb_method_call_status): use Qundef as no self instead of
- the current self.
+Sat Aug 29 12:16:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_eval.c (send_internal): public_send does not consider how it is
- called, as mentioned in r14173. patched by charliesome (Charlie
- Somerville). [ruby-core:50489] [Bug #7499]
+ * lib/tmpdir.rb (Dir.mktmpdir): rolled back r24699. [ruby-dev:39193]
-Wed Dec 5 23:50:23 2012 Narihiro Nakamura <authornari@gmail.com>
+Sat Aug 29 03:27:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (getrusage_time): uses clock_gettime() with
- CLOCK_PROCESS_CPUTIME_ID when available, which provides a 1ns
- precision on linux. [ruby-core:50495] [Bug #7500]
- patched by Aman Gupta.
+ * lib/tempfile.rb (Tempfile#make_tmpname): removed thread race
+ condition.
-Wed Dec 5 22:46:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/tmpdir.rb (Dir.mktmpdir): ditto.
- * vm.c (rb_vm_make_proc): save the proc made from the given block so
- that it will not get collected. [ruby-core:50545] [Bug #7507]
+Fri Aug 28 20:29:34 2009 Akinori MUSHA <knu@iDaemons.org>
-Wed Dec 5 22:13:57 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/tempfile.rb (Tempfile#callback): Debug information should be
+ output to stderr, not stdout; pointed out by akira yamada.
+ cf. [ruby-dev:39072]
- * ext/dl/lib/dl/func.rb (DL::Function#bind): When Fiddle is used,
- @ptr should be updated. This fixes SEGV raised in DL::Function#call
- after calling DL::Function#bind. [Bug #7516] [ruby-dev:46708]
+Fri Aug 28 20:34:24 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * test/dl/test_func.rb (test_bind): test for the above
+ * ext/win32ole/win32ole.c: use SafeStringValue instead of
+ Check_SafeStr.
-Wed Dec 5 18:53:00 2012 Masaya Tarui <tarui@ruby-lang.org>
+Fri Aug 28 13:30:43 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c (rb_thread_s_async_interrupt_timing): have to check ints
- before jumping out.
- * test/ruby/test_thread.rb (test_async_interrupt_with_return): add test
- rescue has to catch a queued async exception at the time of return.
- * test/ruby/test_thread.rb (test_async_interrupt_with_break): add test
- rescue has to catch a queued async exception at the time of break.
+ * thread.c (do_select): rollback r24680. void struct initializer is
+ invalid.
-Wed Dec 5 16:54:28 2012 Koichi Sasada <ko1@atdot.net>
+Fri Aug 28 11:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/memory_status.rb: suppress warning.
- A patch from NAKAMURA Usaku.
+ * method.h (rb_method_definition_t): split from rb_method_entry_
+ to deal aliases. [ruby-dev:39165]
-Wed Dec 5 16:06:54 2012 Eric Hodel <drbrain@segment7.net>
+ * proc.c (struct METHOD): contains rb_method_entry_t copy.
- * lib/rdoc/parser/changelog.rb: Parse more ChangeLog file variations.
- * test/rdoc/test_rdoc_parser_changelog.rb: Test for above.
+Fri Aug 28 10:21:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 5 12:17:11 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * iseq.c (iseq_mark): skip outdated cache entries.
- * ext/dl/lib/dl/func.rb (DL::Function#initialize, DL::Function#bind):
- ABI should be set by using CFunc#calltype even when Fiddle is used.
- When Fiddle is used and a block is given, name should not be ignored.
- [ruby-core:50562] [Bug #7514]
+ * vm_core.h ({GET,INC}_VM_STATE_VERSION): moved from
+ vm_insnhelper.h.
- * ext/dl/lib/dl/import.rb (DL::Importer#bind_function): should respect
- abi and name when Fiddle is used.
+Fri Aug 28 07:25:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/dl/test_func.rb (test_name_with_block): test for "name" method
- with giving a block.
+ * enumerator.c (next_i): typo fixed (reached at end -> reached an
+ end). pointed out by James Edward Gray II at LoneStar RubyConf.
-Wed Dec 5 11:55:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Thu Aug 27 18:31:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * doc/shell.rd, doc/shell.rd.ja: Removed stale doc files
- * lib/shell.rb, lib/shell/*: Merge and updates docs from doc/shell.rd*
+ * vm_method.c (rb_remove_method_id): exported.
-Wed Dec 5 11:42:38 2012 Koichi Sasada <ko1@atdot.net>
+ * numeric.c (num_sadded): fix for non-ascii method name.
- * test/ruby/test_settracefunc.rb: disable trace.
+Thu Aug 27 14:32:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 5 11:37:37 2012 Nobuyoshi Nakada <nobu@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.
- * lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
- strings from conflict markers.
+Thu Aug 27 13:51:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 5 04:25:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * random.c (random_rand): random integer can be a fixnum for
+ bignum range. [ruby-dev:39173]
- * lib/README: Add rdoc modeline directive and formatting libs
+Thu Aug 27 08:16:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 5 04:04:02 2012 Masaya Tarui <tarui@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].
- * test/ruby/test_thread.rb (test_async_interrupt_blocking): bugfix
- about deferred check
+Thu Aug 27 02:06:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 5 03:35:37 2012 Masaya Tarui <tarui@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.
- * vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime.
- * thread.c (sleep_forever): check RUBY_VM_CHECK_INTS_BLOCKING first.
- * thread.c (sleep_timeval): ditto.
- * test/ruby/test_thread.rb (test_async_interrupt_blocking): add a test
- exceptions are correctly deferred and raised on :on_blocking context.
+Thu Aug 27 02:00:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Dec 5 02:36:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * unicode.c (PROPERTY_NAME_MAX_SIZE): use MAX_WORD_LENGTH.
- * common.mk, defs/id.def, template/id.c.tmpl: generate id.c as well as id.h.
+Wed Aug 26 23:59:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 5 00:56:21 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * random.c (random_rand): refined error message.
- * thread.c (rb_mutex_owned_p): new method that return current
- thread have the target mutex or not. [Feature #7505] [ruby-dev:46697]
- * test/ruby/test_thread.rb (test_mutex_owned, test_mutex_owned2):
- test for the above.
- * NEWS: new for the above.
+ * random.c (random_rand): fixed for edge cases of ranges.
+ [ruby-dev:39166]
-Wed Dec 5 00:05:47 2012 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Aug 26 21:49:23 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/erb.rb (make_compiler, add_put_cmd, add_insert_cmd): extract
- methods.
+ * lib/tempfile.rb: add documents from Hongli Lai's fork.
+ cf [ruby-core:25131].
-Tue Dec 4 18:21:04 2012 Naohisa Goto <ngotogenome@gmail.com>
+Wed Aug 26 19:51:13 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/memory_status.rb (Memory): use fiddle/types if available.
+ * tool/mkconfig.rb (program_transform_name): fix for multiple trans
+ rules for autoconf 2.61 or earlier.
- * test/ruby/memory_status.rb (Memory::Win32): :stdcall is needed on
- x86 WIN32. This commit partly reverts r38054.
+ * tool/rbinstall.rb (program_transform_name): ditto.
-Tue Dec 4 18:05:58 2012 Naohisa Goto <ngotogenome@gmail.com>
+Wed Aug 26 19:20:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/fiddle/lib/fiddle/types.rb: copied from ext/dl/lib/dl/types.rb
- and modified for Fiddle, needed for migration from DL to Fiddle.
+ * random.c (random_rand): unified random_int and random_float.
+ [ruby-dev:39158]. and fixes [ruby-core:24655], [ruby-core:24677],
+ [ruby-core:24679].
-Tue Dec 4 17:57:09 2012 Naohisa Goto <ngotogenome@gmail.com>
+Wed Aug 26 18:59:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
- should respect call_type for migration from DL to Fiddle.
- [Bug #7484] [ruby-core:50405]
+ * test/test_tempfile.rb: merged from Hongli Lai's fork.
+ cf [ruby-core:25131].
-Tue Dec 4 16:54:00 2012 Eric Hodel <drbrain@segment7.net>
+Wed Aug 26 18:49:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * .document: Added ChangeLog and doc/ChangeLog-* as documentation
+ * lib/tempfile.rb (Tempfile#close!): should not undefine finalizer
+ by just unlink.
-Tue Dec 4 16:47:46 2012 Eric Hodel <drbrain@segment7.net>
+Wed Aug 26 17:00:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/parser/changelog.rb: Added a ChangeLog parser to RDoc.
- * lib/rdoc/parser.rb: ditto
- * test/rdoc/test_rdoc_parser_changelog.rb: Test for above.
+ * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
+ or earlier.
-Tue Dec 4 16:23:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Aug 26 14:34:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * marshal.c (path2class, path2module): use PRIsVALUE.
+ * lib/tempfile.rb (Tempfile#close!, Tempfile#path): added side
+ notes from Hongli Lai's fork.
- * marshal.c (w_object, marshal_dump, marshal_load): use
- rb_check_funcall if possible.
+ * lib/tempfile.rb (Tempfile#unlink, Tempfile.callback): do nothing
+ any more once unlinked.
- * marshal.c (w_object, marshal_dump, r_object0, marshal_load): use
- RB_GC_GUARD() (directly or indirectly) instead of volatile.
+Wed Aug 26 13:48:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * variable.c (rb_path_to_class): prevent the argument from GC.
+ * lib/tempfile.rb (Tempfile#unlink): reverted r23494, since the
+ usage in RubyInline is considered wrong.
-Tue Dec 04 13:55:07 2012 Koichi Sasada <ko1@atdot.net>
+Wed Aug 26 12:36:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_opts.h: enable optimization - operand unification.
- Operand unification technique enable to combine
- an instruction and specific operands and make new
- instruction.
+ * vm.c (collect_local_variables_in_env): skips internal variables.
+ [ruby-core:25125]
- * defs/opt_operand.def: add several configuration
- of operand unification.
+Tue Aug 25 23:51:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * insns.def: use `int' instead to suppress warning.
+ * tool/enc-unicode.rb: added for generate name2ctype.kwd.
+ contributed by Run Paint Run Run [ruby-core:24775]
-Mon Dec 3 17:58:53 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * enc/unicode.c (CodeRanges): move definitions to name2ctype.h.
- * parse.y: replace parser->enc with current_enc.
+ * enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd,
+ enc/unicode/name2ctype.src: updated to v5.1.
-Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>
+ * enc/unicode/UnicodeData.txt, enc/unicode/Scripts.txt: added v5.1.
- * README.EXT: Converted to RDoc format
- * README.EXT.ja: ditto
+ * Makefile.in: add rule to generate name2ctype.kwd from
+ UnicodeData.txt and Scripts.txt.
-Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>
+Tue Aug 25 22:31:51 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/ri/driver.rb: Fixed ri page display for files with
- extensions.
- * test/rdoc/test_rdoc_ri_driver.rb: Test for above
+ * configure.in (MKDIR_P): Set 'mkdir -p' to MKDIR_P
+ when AC_PROG_MKDIR_P doesn't set MKDIR_P.
-Tue Dec 4 04:11:50 2012 Eric Hodel <drbrain@segment7.net>
+Tue Aug 25 17:38:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * .document: Add NEWS for `ri ruby:NEWS`
- * NEWS: Set format as rdoc
- * doc/NEWS-1.8.7: ditto
- * doc/NEWS-1.9.1: ditto
- * doc/NEWS-1.9.2: ditto
- * doc/NEWS-1.9.3: ditto
+ * bignum.c (rb_big_clone, bigmul1_normal, bigdivrem): trivial
+ optimization.
-Mon Dec 3 20:37:22 2012 Koichi Sasada <ko1@atdot.net>
+ * bignum.c (big2dbl): truncates zero digits to get rid of possible
+ underflow.
- * vm_exec.c: check VM_COLLECT_USAGE_DETAILS.
+Tue Aug 25 12:22:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>
+ * Makefile.in (enc/unicode/name2ctype.h): explicitly ignores the
+ result of diff and turns -e option off, because *BSD make passes
+ it by default.
- * compile.c (iseq_specialized_instruction):
- change condition of using `opt_send_simple'.
- More method invocations can be simple.
+Tue Aug 25 02:16:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 3 20:03:38 2012 Koichi Sasada <ko1@atdot.net>
+ * configure.in (DLDFLAGS): use linker_flag and changed undefined
+ and multiply_defined behaviors. cf [ruby-core:25086].
- * test/ruby/test_objectspace.rb: skip RuntimeError
- which says a message "can't modify frozen File".
- Is that correct behavior?
+Mon Aug 24 21:31:37 2009 Kouhei Sutou <kou@cozmixng.org>
-Mon Dec 03 20:00:19 2012 Koichi Sasada <ko1@atdot.net>
+ * 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!!!
- * vm_exec.c: vm_analysis_insn should be static.
+Mon Aug 24 18:58:56 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Dec 3 19:10:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/missing.h (vsnprintf): rollback a part of r24179, because
+ it's meaningless.
- * random.c (Init_Random), rational.c (Init_Rational): make marshal
- methods private. [Feature #6539]
+Mon Aug 24 16:35:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 3 18:29:27 2012 Koichi Sasada <ko1@atdot.net>
+ * st.c (st_delete_safe): deals with packed entries.
+ [ruby-core:25080]
- * iseq.h: iseq_catch_table_entry::catch_type should be
- Fixnum because they are pushed into Array in a compiler.
- [Bug #7502]
+ * st.c (st_cleanup_safe): ditto. [ruby-core:25081]
- * test/ruby/test_objectspace.rb: add a test of this issue.
+Mon Aug 24 13:24:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Dec 3 18:25:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (MAKEDIRS): define.
- * template/id.h.tmpl (preserved_ids): "empty?" is not an attribute name.
+ * common.mk (capi): using $(MAKEDIRS), so depends on $(PREP).
-Mon Dec 3 16:23:09 2012 Koichi Sasada <ko1@atdot.net>
+Mon Aug 24 13:14:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_backtrace.c (vm_backtrace_to_ary): check negative size (2nd arg).
+ * configure.in (RUBY_CHECK_SIZEOF): set cross_compiling only when
+ universal binary.
-Mon Dec 3 15:50:33 2012 Akinori MUSHA <knu@iDaemons.org>
+Mon Aug 24 12:55:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * misc/ruby-additional.el (ruby-mode-set-encoding): Unbreak by
- fixing a typo, s/set/setq/.
+ * win32/Makefile.sub (enc/unicode/name2ctype.h): use md instead of
+ $(MAKEDIRS).
-Mon Dec 3 14:14:19 2012 Koichi Sasada <ko1@atdot.net>
+Sun Aug 23 15:22:45 2009 Tanaka Akira <akr@fsij.org>
- * compile.c (iseq_compile_each): joke shouldn't use id.h defined ids.
+ * bootstraptest/runner.rb (main): "usage" description updated.
- * id.c (Init_id): ditto.
+Sun Aug 23 15:12:22 2009 Tanaka Akira <akr@fsij.org>
- * common.mk: fix dependency.
+ * bootstraptest/runner.rb (Dir.mktmpdir): updated to latest.
+ (in_temporary_working_directory): temporary directory name changed.
-Mon Dec 3 12:43:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Aug 23 00:56:13 2009 Tanaka Akira <akr@fsij.org>
- * misc/ruby-mode.el (ruby-block-end-re, ruby-delimiter)
- (ruby-mode-syntax-table, ruby-parse-partial, ruby-beginning-of-indent):
- merge from Emacs.
+ * thread.c (rb_thread_schedule): don't recur infinitely.
+ (rb_threadptr_execute_interrupts): ditto.
+ [ruby-dev:38060]
- * misc/ruby-mode.el (ruby-calculate-indent): fix indentation of
- argument lines in parentheses. [Bug #5140]
+Sat Aug 22 15:07:23 2009 Tanaka Akira <akr@fsij.org>
-Mon Dec 3 07:52:41 2012 Eric Hodel <drbrain@segment7.net>
+ * 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/rdoc/parser.rb: Improved modeline support. Patch by nobu.
- * test/rdoc/test_rdoc_parser.rb: Test for above.
+ * lib/yaml.rb (YAML.quick_emit): give the object itself to emitter.
+ don't use object_id and hash.
-Sun Dec 3 00:06:00 2012 Kenta Murata <mrkn@mrkn.jp>
+Sat Aug 22 13:05:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_new): stop checking string
- taintness. [Bug #5508] [ruby-core:40510]
+ * Makefile.in: use CP and MV macros.
-Sun Dec 2 19:26:47 2012 Masaya Tarui <tarui@ruby-lang.org>
+Sat Aug 22 01:29:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context):
- extract rb_gc_save_machine_context to RB_GC_SAVE_MACHINE_CONTEXT.
- NOTE: machine_regs and machine_stack_end must be set in current scope.
+ * lib/mkmf.rb (rm_f, rm_rf): pass the last hash through if exists.
+ [ruby-dev:39153]
-Sun Dec 2 18:46:24 2012 Koichi Sasada <ko1@atdot.net>
+Sat Aug 22 00:48:08 2009 Tanaka Akira <akr@fsij.org>
- * array.c, enum.c, insns.def, io.c, numeric.c, parse.y, process.c,
- range.c: use prepared IDs.
- A patch from charliesome (Charlie Somerville).
- [Bug #7495]
+ * 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.
- * common.mk: add dependency to id.h.
+Sat Aug 22 00:03:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * common.mk: replace ID_H_INCLUDES with id.h.
+ * thread.c (rb_check_deadlock): decrease number of sleepers before
+ deadlock detection because the deadlock exception makes main thread
+ run. [ruby-dev:39142]
-Sun Dec 2 16:48:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Fri Aug 21 22:34:58 2009 Tanaka Akira <akr@fsij.org>
- * lib/weakref.rb (rdoc): Clean up usage, add example,
- note ArgumentError on WeakRef.new
+ * enumerator.c (get_next_values): extracted from
+ enumerator_next_values.
+ (enumerator_next_values): use get_next_values.
+ (enumerator_peek_values): ditto.
-Sun Dec 2 16:45:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Fri Aug 21 17:01:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (WeakMap): Add doc for internal reference, use lib/weakref.rb
+ * enc/unicode/name2ctype.h: split from enc/unicode.c and made a
+ perfect hash.
-Sun Dec 2 07:24:23 2012 Eric Hodel <drbrain@segment7.net>
+Fri Aug 21 15:13:08 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/parser.rb: Parse files with a -*- rdoc -*- modeline
- * test/rdoc/test_rdoc_parser.rb: Test for above
+ * include/ruby/io.h, io.c (FMODE_SETENC_BY_BOM):
+ renamed from FMODE_STRIP_BOM.
-Sun Dec 2 06:02:00 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Aug 20 01:24:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * gc.h (SET_MACHINE_STACK_END): add volatile for preventing
- harmful optimization. [ruby-dev:46665] [Bug #7468]
+ * io.c (rb_io_fmode_modestr): change modestr syntax for BOM
+ to "BOM|UTF-*". [ruby-dev:39106]
-Sun Dec 2 05:01:58 2012 Koichi Sasada <ko1@atdot.net>
+ * io.c (parse_mode_enc): ditto.
- * iseq.c (rb_iseq_line_trace_each): iterate `line' event only.
+Fri Aug 21 15:01:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_iseq.rb: add a test for this change.
+ * ext/readline/readline.c (readline_readline): use rb_prep_terminal
+ only on Windows.
-Sun Dec 2 02:46:04 2012 Koichi Sasada <ko1@atdot.net>
+Fri Aug 21 07:25:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_trace.c: add TracePoint#inspect.
+ * lib/rdoc/ri/gemdirs.rb: split from lib/rdoc/ri/paths.rb to ge
+ rid of loading rubygems and searching all gems always.
- * test/ruby/test_settracefunc.rb: add a test for this change.
+Fri Aug 21 07:14:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 1 21:18:19 2012 Koichi Sasada <ko1@atdot.net>
+ * configure.in (RUBY_PROGRAM_VERSION, RUBY_RELEASE_DATE): extracts
+ from version.h for cross-compiling.
- * test/ruby/test_backtrace.rb: add a test for
- Thread::Backtrace::Location#inspect.
- BTW, tests for `caller_locations' are not enough.
- Any volunteers are welcome.
+ * template/fake.rb.in (RUBY_VERSION, RUBY_DESCRIPTION): use above.
-Sat Dec 1 21:06:58 2012 Koichi Sasada <ko1@atdot.net>
+Fri Aug 21 00:08:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_backtrace.c (location_inspect_m): add
- Thread::Backtrace::Location#inspect.
- It same as loc_obj.to_s.inspect.
+ * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been obsolete.
-Sat Dec 1 19:24:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Aug 20 23:56:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_io_puts): recurse for the argument itself, not converted
- array elements. [ruby-core:42444] [Bug #5986]
+ * io.c (rb_sysopen): moved sysopen_struct from rb_sysopen_internal.
-Sat Dec 1 19:01:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Aug 20 23:39:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * marshal.c (w_object, r_object0): call private marshal methods.
- [Feature #6539]
+ * parse.y (reduce_nodes_gen): preserve NODE_FL_NEWLINE flag during
+ node reducing. [ruby-core:24463]
-Sat Dec 1 18:52:22 2012 Eric Hodel <drbrain@segment7.net>
+Thu Aug 20 14:39:47 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rubygems/commands/cleanup_command.rb: Fix cleanup command for
- multiple gems. [ruby-trunk - #7481] by Kouhei Sutou
- * test/rubygems/test_gem_commands_cleanup_command.rb: Test for above.
- * lib/rubygems.rb: Autoload Gem::Source to prevent test failures
+ * ext/readline/readline.c (readline_get): add rl_prep_terminal(1).
+ incited by jitte [ruby-list:43546]
-Sat Dec 1 18:17:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Aug 20 12:09:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (Init_Complex), time.c (Init_Time): make marshal methods
- private. [Feature #6539]
+ * parse.y (ivar2_hash_type): disabled for now.
- * object.c (Init_Object): make remove_instance_variable public.
- [Feature #6539]
+Thu Aug 20 08:39:50 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * id.c (Init_id), template/id.h.tmpl: add initialize_{copy,clone,dup}
- and respond_to_missing?.
+ * thread.c (rb_thread_terminate_all): do not ignore interrupt when
+ reaping threads on termination. [ruby-dev:39107]
- * vm_method.c (rb_method_entry_make): make above methods private.
- [Feature #6539]
+Thu Aug 20 02:32:08 2009 Tanaka Akira <akr@fsij.org>
-Sat Dec 1 16:40:22 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * enumerator.c (next_init): don't clear feedvalue.
- * test/ruby/test_thread.rb: move ConditionVariable related test
- into test/thread/test_cv.rb.
- * test/thread/test_cv.rb: new file.
- * test/thread/test_cv.rb (test_condvar_empty_signal): new tests.
- * test/thread/test_cv.rb (test_condvar_empty_broadcast): ditto.
+Thu Aug 20 01:28:42 2009 Tanaka Akira <akr@fsij.org>
-Sat Dec 1 15:14:25 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * 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.
- * test/ruby/test_thread.rb (test_cv_wait_deadlock): enable
- cv deadlock test.
+Thu Aug 20 01:06:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Dec 1 14:23:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * 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]
- * lib/thread.rb (ConditionVariable): use hash instead of array for
- @waiters.
- * test/thread/test_queue.rb (test_sized_queue_and_wakeup): remove
- a test because @waiters no longer have a chance to duplicated. Now it's
- a hash.
+ * configure.in (SIZEOF_STRUCT_DIRENT_TOO_SMALL): Solaris dirent
+ check.
-Sat Dec 1 17:16:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Aug 19 11:32:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * misc/ruby-electric.el (ruby-electric-curlies): use kill-region
- instead of interactive command delete-backward-char.
+ * enc/unicode.c (CodeRanges): initialized statically.
-Sat Dec 1 17:12:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Aug 19 02:54:01 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * misc/inf-ruby.el (inferior-ruby-mode): fix the
- compilation-shell-minor-mode configuration. a patch by
- j2petkov (Jean-Christophe Petkovich) in [ruby-core:46518].
- [Bug #6742]
+ * test/ruby/test_settracefunc.rb (test_return, test_return2): add two
+ tests for [ruby-dev:38701] and [ruby-core:24463].
-Sat Dec 1 15:05:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Aug 19 01:08:34 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * dir.c (glob_helper): use NAMLEN() to tell the length of d_name
- instead of strlen(), which can access beyond the boundary.
+ * compile.c (NODE_RETURN): fire return event at explicit return.
+ [ruby-dev:38701]
-Sat Dec 1 13:48:13 2012 Eric Hodel <drbrain@segment7.net>
+Tue Aug 18 21:00:26 2009 Tanaka Akira <akr@fsij.org>
- * lib/rubygems/specification.rb: Don't add default gems to $LOAD_PATH
- as they are already there.
+ * enumerator.c (enumerator_peek): new method Enumerator#peek.
+ (enumerator_next): don't rewind at end.
+ [ruby-dev:38932]
-Sat Dec 1 12:22:17 2012 Kouhei Sutou <kou@cozmixng.org>
+Tue Aug 18 13:46:14 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * re-added r38053 that is reverted by r38061. Problems by r38053
- are resolved by r38096. r38096 removed GEM_SKIP configuration.
+ * touch test/rdoc/empty.dat to run test_rdoc_parser.rb
- The below is ChangeLog of r38053:
+Tue Aug 18 11:37:24 2009 wanabe <s.wanabe@gmail.com>
- * defs/default_gems: Add base directory column.
+ * vm_insnhelper.c (vm_call_cfunc): ensure hook c-return.
+ [Bug #1588]
- * tool/rbinstall.rb:
- - Install .gemspecs of default gem to
- #{GEM_HOME}/specifications/default/.
- - Update files parameter of .gemspecs by relative path from
- library directory.
+ * test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_raise):
+ follow above.
-Sat Dec 1 11:09:12 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Aug 18 01:57:00 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * variable.c (rb_class_path_no_cache): add a function to get the class
- path without caching the computed path. Some classes are frozen, and
- will raise an exception without this.
+ * range.c (range_step): treat symbols specially so that iterating
+ over symbols should work like strings. [ruby-core:24780]
- * probes.d (cmethod-entry, cmethod-return): separate cmethods from
- regular methods to match set trace func.
+ * range.c (range_each): ditto.
- * probes_helper.h: refactor macros. Fix probes to avoid calling
- #inspect when profiling.
+Tue Aug 18 01:21:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * insns.def: update for use with new macros.
+ * range.c (range_each): should honor to_str conversion.
- * vm_eval.c: ditto
+Mon Aug 17 23:45:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * vm_insnhelper.c: ditto
+ * lib/date/delta.rb: removed require 'date'. added to_c.
- * test/dtrace/test_singleton_function.rb: fix test for new output.
+Mon Aug 17 14:35:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/dtrace/test_cmethod.rb: test the cmethod probes.
+ * parse.y (lex_get_str, lex_io_gets, rb_parser_compile_string):
+ must be ascii compatible.
-Sat Dec 1 09:44:16 2012 Eric Hodel <drbrain@segment7.net>
+Mon Aug 17 10:37:41 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/rdoc/test_rdoc_options.rb: Windows drive letters are
- case-insensitive.
+ * regparse.c (add_code_range_to_buf0): added with checkdup argument.
-Sat Dec 1 09:42:13 2012 Eric Hodel <drbrain@segment7.net>
+ * regparse.c (add_code_range_to_buf): use above.
- * lib/rubygems.rb: Search for gem deps file up the directory tree.
- * test/rubygems/test_gem.rb: Test for above.
+ * regparse.c (add_code_range0): added with checkdup argument.
-Sat Dec 1 09:33:32 2012 Eric Hodel <drbrain@segment7.net>
+ * regparse.c (add_code_range): use above.
- * test/runner.rb: Set GEM_HOME, GEM_PATH and GEM_SKIP to empty set.
- With default_gem support in RubyGems GEM_SKIP prevents loading of
- built-in gems.
+ * regparse.c (i_apply_case_fold): don't warn if the duplicate is
+ caused by case folding.
-Sat Dec 1 07:16:17 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Mon Aug 17 08:31:56 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * compile.c (ADD_CATCH_ENTRY): add a cast to fix SEGV with x64 mingw
- on Windows 8. Without cast, 0 might be non zero value at higher bits
- in rb_ary_new3().
- [ruby-core:50258] [Bug #7456]
+ * lib/date/delta.rb: merged from date4. [experimental]
-Sat Dec 1 04:07:57 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/date/delta/parser.*: ditto.
- * parse.y (parser.utf8): remove unused property.
+ * lib/date.rb: followed the above changes.
- * parse.y (UTF8_ENC): remove unused macro.
+Mon Aug 17 08:19:03 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * parse.y (parser_tokadd_utf8): use rb_utf8_encoding() directly.
+ * lib/date/format.rb (strptime): removed \v; since \s includes \v.
-Sat Dec 1 03:49:45 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Aug 17 08:14:26 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * lib/sync.rb (Sync_m#sync_synchronize): add Thread.async_interrupt_timing
- for protecting from async interrupt.
- * lib/sync.rb (Sync_m#sync_lock): ditto.
+ * complex.c (nucomp_rationalize) added. [experimental]
-Sat Dec 1 03:38:04 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * rational.c ({nurat,nilclass,integer,float}_rationalize) ditto.
- * lib/thread.rb (ConditionVariable#broadcast): s/RuntimeError/StandardError/
- * lib/thread.rb (ConditionVariable#signal): ditto.
+Mon Aug 17 08:11:53 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Dec 1 03:29:52 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/cmath.rb: use num#i.
- * lib/thread.rb (SizedQueue#pop): rewrite by using ConditionVariable.
- * lib/thread.rb (SizedQueue#push): ditto.
- * lib/thread.rb (SizedQueue#max): ditto.
- * lib/thread.rb (Queue#pop): ditto.
- * lib/thread.rb (Queue#push): ditto.
+Mon Aug 17 07:59:00 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * lib/thread.rb (SizedQueue#num_waiting): adopt the above changes.
- * lib/thread.rb (SizedQueue#initialize): ditto.
- * lib/thread.rb (Queue#num_waiting): ditto.
- * lib/thread.rb (Queue#initialize): ditto.
- * test/thread/test_queue.rb (test_sized_queue_and_wakeup): ditto.
+ * numeric.c (flo_pow,fix_pow): may return complex number.
-Sat Dec 1 03:45:47 2012 Koichi Sasada <ko1@atdot.net>
+ * bignum.c (rb_big_pow): ditto.
- * thread.c (Thread.async_interrupt_timing): fix RDoc.
- :never is not used any more.
+Mon Aug 17 07:16:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Dec 1 02:56:19 2012 Koichi Sasada <ko1@atdot.net>
+ * numeric.c (num_imaginary): num#i to return imaginary counterpart
+ of the given numeric.
- * iseq.c: add RubyVM::InstructionSequence (ISeq) inspection methods.
- * ISeq#path returns path of this ISeq written.
- * ISeq#absolute_path returns absolute path.
- * ISeq#label returns label (method name and so on).
- * ISeq#base_label returns base label (see Thread::Backtrace::Location).
- * ISeq#first_lineno returns first line number of this ISeq.
- * ISeq.of(obj) returns ISeq object which obj (Proc or Method)
- is contains.
+ * complex.c (Init_Complex): undef #i for complex numbers.
- * test/ruby/test_iseq.rb: add tests.
+Mon Aug 17 00:17:33 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Dec 1 02:58:51 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/complex.rb, lib/rational.rb: added warning messages.
- * include/ruby/ruby.h (rb_event_flag_t): Maintain integer precision
- for clang error (VALUE aka unsigned long vs unsigned int)
+Sun Aug 16 23:58:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 1 02:53:18 2012 Eric Hodel <drbrain@segment7.net>
+ * parse.y (yylex): should dispatch scan-event even when follows
+ just after delayed-token. [ruby-dev:37855] [Bug #1071]
- * test/rubygems/test_gem_dependency_installer.rb: Use Gem.read_binary
- instead of File.binread for ruby 1.8 compatibility in the rubygems
- source repository. Updates r38075
+Sun Aug 16 22:20:16 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Dec 1 02:33:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/date/format.rb: reverted.
- * thread.c (rb_threadptr_interrupt_mask, async_interrupt_timing_func):
- merge into them into rb_thread_s_async_interrupt_timing.
- * thread.c (rb_thread_s_async_interrupt_timing): ditto.
+Sun Aug 16 21:31:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sat Dec 1 02:11:47 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/date/format.rb: suppressed a warning.
- * thread.c (rb_threadptr_interrupt_mask): add argument check.
- * thread.c (async_interrupt_timing_arg_check_i): helper function
- for the above.
- * test/ruby/test_thread.rb (test_async_interrupt_timing_invalid_argument):
- test for the above.
+ * lib/irb/ruby-lex.rb: ditto.
-Sat Dec 1 01:19:34 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sun Aug 16 15:25:26 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/thread.rb (ConditionVariable#broadcast): protect from
- async interrupt by using Thread.async_interrupt_timing.
- * lib/thread.rb (ConditionVariable#signal): ditto.
- * lib/thread.rb (ConditionVariable#wait): ditto.
+ * lib/csv.rb: Change magic comment to US-ASCII in order to
+ make literals as US-ASCII.
-Sat Dec 1 02:04:23 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Sun Aug 16 10:45:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
- raise if assert_in_out_err misused.
+ * 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>
-Sat Dec 1 02:08:16 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h: check
+ definition of (classes)#=== for case/when optimization.
+ Fix Bug #1376 [ruby-core:23190].
- * test/rdoc/test_rdoc_rubygems_hook.rb
- (TestRDocRubygemsHook#test_setup_unwritable): 1. check the existence
- of the file(directory) before touch it. 2. remove test
- file(directory) after the test. see [ruby-core:50388].
+ * string.c (Init_String), bignum.c (Init_Bignum),
+ numeric.c (Init_Numeric): define String#===, Symbol#===,
+ Bignum#===, Fixnum#===, Float#=== as same as (classes)#==.
-Sat Dec 1 01:51:06 2012 Koichi Sasada <ko1@atdot.net>
+Wed Aug 12 14:14:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- [EXPERIMENTAL]
- * iseq.c: add following two methods.
- * ISeq#line_trace_all returns all line traces (line numbers)
- * ISeq#line_trace_specify(pos, set) set `pos'th line event to
- specified_line event (if set is true).
- These features are introduced for debuggers (mainly to make
- breakpoint).
+ * win32/win32.c (readdir_internal): free old temporary filename.
+ [ruby-core:24820]
- * iseq.h: add decl. of C APIs.
+Wed Aug 12 12:59:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_iseq.rb: add tests.
+ * string.c (rb_str_new_frozen): must not change encoding of frozen
+ shared string. [ruby-dev:39068]
- * vm_trace.c: add `specified_line' event.
+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.
-Sat Dec 1 01:49:52 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * iseq.c: ditto.
- * test/rubygems/test_gem_dependency_installer.rb: gems are of course
- binary files, so use a binary reading method when reading it.
- see [ruby-core:50388].
+ * node.h: ditto.
-Sat Dec 1 01:21:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm_insnhelper.c: ditto.
- * lib/rubygems/command.rb (Gem::Command#get_all_gem_names_and_versions):
- who assumes that the pathname of a gem never contains ':' ?
- yes, on Unixen pathnames can contain ':', and on Windows they almost
- certainly contain ':'. see [ruby-core:50388].
+ * vm_insnhelper.h: ditto.
- * lib/rubygems/requirement.rb (Gem::Requirement::PATTERN_RAW): extract
- the regexp to match the version specifier from PATTERN to use in
- above method.
+Mon Aug 10 06:55:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Dec 1 00:48:19 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * marshal.c (class2path, w_unique, w_extended, w_class, w_uclass):
+ deal with non-ascii class path. [ruby-core:24790]
- * ext/fiddle/extconf.rb, ext/fiddle/function.c
- (Fiddle::Function::STDCALL): FFI_STDCALL is not a macro, but an
- enumeration. [ruby-core:50398] [Bug #7483]
+ * marshal.c (r_unique, path2class, path2module, obj_alloc_by_path),
+ (r_object0): ditto.
-Sat Dec 1 00:08:55 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * variable.c (rb_path_to_class): new encoding-aware function to
+ get a class from its name.
- * test/rubygems/test_gem_installer.rb
- (TestGemInstaller#test_check_executable_overwrite_other_non_gem):
- on Windows, rubygems always generate a wrapper .bat file when
- installing a file into bin, so testing no-overwrite a wrapper file
- and a non-wrapper file is nonsense. see [ruby-core:50388].
+Sun Aug 9 21:14:03 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Nov 30 23:39:58 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/extconf.rb (search_tclConfig): last change isn't enough.
+ fixed it.
- * test/rubygems/test_gem_installer.rb
- (TestGemInstaller#test_check_executable_overwrite_default_bin_dir):
- if the executable to be overwritten was generated by rubygems, the
- error message differs from the only copied one's.
- see [ruby-core:50388].
+Sun Aug 9 16:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 23:27:26 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * common.mk (ruby.imp): excluded prelude.o to get rid of circular
+ dependency. [ruby-dev:39052]
- * test/rubygems/test_gem_ext_ext_conf_builder.rb
- (TestGemExtExtConfBuilder::test_class_make): reading with binary mode
- of course introduce \r on Windows. see [ruby-core:50388].
+Sun Aug 9 14:49:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Nov 30 23:11:37 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * bignum.c (rb_big_cmp, bigsub, big_real_len, bigmul1_normal,
+ bigmul1_balance, big_split): remove BDIGITS() inside of the loops.
+ same as r24444.
- * lib/rubygems/specification.rb
- (Gem::Specification.validate_permissions): don't check executability
- of the source on Windows. they will be wrapped to .bat files when
- installing. see [ruby-core:50388].
+Sat Aug 8 17:03:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Nov 30 22:44:14 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * encoding.c (enc_ascii_compatible_p): added. [ruby-core:24793]
+ (Init_Encoding): New API Encoding#ascii_compatible?.
- * vm_core.h (rb_vm_struct): add thread_destruct_lock field.
- * thread.c (Init_Thread): ditto.
- * thread.c (rb_vm_gvl_destroy): ditto.
+Sun Aug 9 07:25:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (thread_start_func_2): make sure vm->running_thread
- don't point to dead thread.
- * thread.c (timer_thread_function): close a race against thread
- destruction. [Bug #4911][ruby-dev:43859]
+ * ext/ripper/eventids2.c (token_to_eventid): added
+ keyword_do_LAMBDA. [ruby-dev:39049]
- * vm_core.h (rb_thread_set_current): reset running time of
- current thread instead of previous thread. We no longer
- assume previous running thread still live.
+Sun Aug 9 02:07:41 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Nov 30 21:57:43 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * tool/compile_prelude.rb: fixes a regexp pattern for require.
+ It had matched 'require("foo"('.
- * revert r38053 because it causes too many test failures.
- if you've already installed r38053 or later, remove the installed
- lib/ruby/gems/2.0.0 directory and reinstall this revision or later.
+Sat Aug 8 11:42:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Nov 30 21:07:56 2012 NAKAMURA Usaku <usa@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>.
- * lib/test/unit/parallel.rb (Test::Unit::Worker.run): wrap LoadError
- because it's Gem::LoadError sometimes. see [Bug #6882]
+Sat Aug 8 06:18:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 20:47:44 2012 Koichi Sasada <ko1@atdot.net>
+ * 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]
- * thread.c: TracePoint#self returns invoking/exiting thread object
- at thread_begin/end event.
+Fri Aug 7 03:25:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_settracefunc.rb: fix test.
+ * eval_error.c (error_print): removed an extra argument.
-Fri Nov 30 19:55:17 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Aug 7 03:22:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/memory_status.rb (Memory::Win32): use fiddle instead of dl,
- but I doubt fiddle is not compatible with dl. (if you are interested,
- see the diff.) [ruby-core:50194] [Bug #7443]
+ * eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
-Fri Nov 30 19:37:44 2012 Kouhei Sutou <kou@cozmixng.org>
+Fri Aug 7 01:49:41 2009 Akinori MUSHA <knu@iDaemons.org>
- * defs/default_gems: Add base directory column.
+ * 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]
- * tool/rbinstall.rb:
- - Install .gemspecs of default gem to
- #{GEM_HOME}/specifications/default/.
- - Update files parameter of .gemspecs by relative path from
- library directory.
+Fri Aug 7 01:35:26 2009 Akinori MUSHA <knu@iDaemons.org>
-Fri Nov 30 19:30:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * ext/digest/*/extconf.rb: inttypes.h and unistd.h need not be
+ checked here. [ruby-dev:39032]
- * vm_trace.c:
- tracepoint_attr_return_value (TracePoint#return_value):
- include `:b_return` for method doc
- tracepoint_enable_m, tracepoint_disable_m (#enable/#disable):
- don't have block argument, document block scope
+Fri Aug 7 01:04:17 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Nov 30 18:52:56 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/tk/extconf.rb (search_tclConfig): fix logic bug.
- * vm_trace.c (tracepoint_disable_m, tracepoint_enable_m):
- fix block parameter.
- No argument should be given to a block which is passed
- to TracePoint#enable (and disable).
+Thu Aug 6 21:18:15 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Nov 30 18:23:26 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/digest/sha2/lib/sha2.rb: should require sha2.so.
- * thread.c: rename Thread.control_interrupt
- to Thread.async_interrupt_timing.
- The option name `:never' is also changed to `:defer'.
- [ruby-core:50375] [ruby-trunk - Feature #6762]
+Thu Aug 6 21:11:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c: remove Thread.check_interrupt.
- This method is difficult to understand by name.
+ * ext/digest/sha2/sha2.c (*_Final): typos.
- * thread.c: add Thread.async_interrupted?.
- This method check any deferred async interrupts.
+Thu Aug 6 19:46:56 2009 Akinori MUSHA <knu@iDaemons.org>
- * test/ruby/test_thread.rb: change tests for above.
+ * ext/digest/sha2/sha2.h (BYTE_ORDER): Define BYTE_ORDER as
+ necessary. [ruby-dev:39029]
-Fri Nov 30 18:24:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Thu Aug 6 16:36:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_trace.c: Documentation for TracePoint API
- [ruby-core:47243] [Feature #6895]
+ * encoding.c (valid_encoding_name_p): rejects too long encoding
+ names.
-Fri Nov 30 17:43:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * encoding.c (encoding_data_type): typed data.
- * string.c (rb_str_cmp_m): try to compare with to_str result if
- possible before calling <=> method. [ruby-core:49279] [Bug #7342]
+ * encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding
+ capable.
- * string.c (rb_str_cmp_m): use rb_check_funcall instead of respond_to
- and call.
+ * encoding.c (rb_enc_associate_index): cannot set encoding on
+ special constants.
- * string.c (rb_str_cmp_m): return fixed value, one of -1,0,+1 always.
+Thu Aug 6 15:44:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 16:19:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_method.c (rb_method_entry_eq): deals with optimized method
+ properly. [ruby-core:24789]
- * vm_dump.c (rb_vm_bugreport): get rid of calling methods in sigsegv
- handler. based on a patch by charliesome (Charlie Somerville)
- [ruby-core:49573] [Bug #7402]
+Thu Aug 6 13:30:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 16:05:44 2012 Eric Hodel <drbrain@segment7.net>
+ * test/mkmf/base.rb (TestMkmf): was turned into a class, because
+ MiniUnit doesn't complain even if a testcase has no tests.
- * NEWS: Added RubyGems 2.0.0
+Thu Aug 6 13:00:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 15:24:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (check_sizeof): added optional compiler option
+ argument. [ruby-core:24785]
- * parse.y (parser_yylex): fix false usage of local variable, it cannot
- appear in fname state [ruby-core:49659] [Bug #7408]
+ * lib/mkmf.rb (create_makefile): suppressed shadowing outer local
+ variable warnings.
-Fri Nov 30 15:20:12 2012 Eric Hodel <drbrain@segment7.net>
+Thu Aug 6 12:05:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/package.rb: Load YAML for building gems.
- * test/rubygems/test_gem_commands_contents_command.rb: Sort expected
- output of default gem contents. Re-fixes r38004 and r38005.
+ * lib/test/unit/testcase.rb (Test::Unit): removes silly TestCase
+ class.
-Fri Nov 30 15:15:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Thu Aug 6 01:37:20 2009 Akinori MUSHA <knu@iDaemons.org>
- * vm_trace.c (set_trace_func): Formatting of params and events
+ * 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]
-Fri Nov 30 14:45:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Thu Aug 6 00:09:56 2009 Akinori MUSHA <knu@iDaemons.org>
- * lib/net/http.rb: Net::HTTP::Patch to list of HTTP Request Classes
- Patch by Ryunosuke SATO [Fixes #217 on github]
+ * lib/ipaddr.rb (IPAddr#hash): Take account of netmask; submitted
+ by Nobuhiro IMAI in [ruby-dev:39011]
-Fri Nov 30 14:05:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Wed Aug 5 19:19:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/cgi.rb: CGI example for HTML generation
- Patch by Marcus Stollsteimer [ruby-core:50303] [Bug #7465]
+ * ruby.c (load_file_internal): assumes -x flag if no "ruby" is in
+ the shebang line. [ruby-dev:39015]
-Fri Nov 30 13:52:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Wed Aug 5 19:11:01 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * time.c: Documentation improvements, grammar and formatting
- Patch by Bernd Homuth [ruby-core:49203] [Bug #7326]
+ * ruby.c (rb_stdio_set_default_encoding): declared.
-Fri Nov 30 13:48:33 2012 Eric Hodel <drbrain@segment7.net>
+Wed Aug 5 18:46:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc.rb: Set version to 4.0.0.preview2
- * lib/rubygems.rb: Set version to 2.0.0.preview2
+ * debug.c (ruby_dummy_gdb_enums): made public. [ruby-dev:39001]
-Fri Nov 30 13:11:53 2012 Eric Hodel <drbrain@segment7.net>
+Wed Aug 5 13:49:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rubygems/commands/setup_command.rb: Remove old files on install
- of RubyGems. (not by rbinstall.rb).
- * test/rubygems/test_gem_commands_setup_command.rb: Test for above.
+ * string.c (rb_str_upto): generate numerical sequence when
+ characters in both edges are all digits. [ruby-talk:343186]
-Fri Nov 30 12:47:59 2012 Akinori MUSHA <knu@iDaemons.org>
+Wed Aug 5 12:54:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/abbrev.rb (Abbrev#abbrev): A fixed string prefix pattern
- should only match the beginning of each word, not the beginning
- of every line in it.
+ * eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
+ [ruby-core:24767]
- * lib/abbrev.rb (Abbrev#abbrev): Stop using a regexp that causes a
- false warning. [Bug #7471]
+Wed Aug 5 12:39:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 12:30:55 2012 Akinori MUSHA <knu@iDaemons.org>
+ * eval.c (rb_longjmp): reset raised flag before fatal error.
- * test/test_abbrev.rb: Add tests for lib/abbrev.rb.
+Wed Aug 5 10:20:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Nov 30 12:27:51 2012 Eric Hodel <drbrain@segment7.net>
+ * re.c (rb_reg_preprocess_dregexp): add options to arguments.
- * lib/rubygems/spec_fetcher.rb: Allow prerelease spec fetching to fail
- for bundler.
- * test/rubygems/test_gem_spec_fetcher.rb: Test for above.
+ * re.c (rb_reg_new_ary): follow above.
-Fri Nov 30 12:20:53 2012 Eric Hodel <drbrain@segment7.net>
+ * 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]
- * lib/rake/backtrace.rb: Removed duplication in
- Rake::Backtrace::SUPPRESSED_PATHS
- * test/rake/test_rake_backtrace.rb: Skip tests when tmpdir is in the
- suppressed pattern.
+Wed Aug 5 03:28:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 30 11:07:45 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/test/unit.rb (Test::Unit.setup_argv): expands paths before
+ requiring. [ruby-dev:39012]
- * revert r37993 to avoid SEGV in tests.
+Wed Aug 5 01:38:27 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Fri Nov 30 10:38:54 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/pp.rb (guard_inspect_key): untrust internal hash to prevent
+ unexpected SecurityError.
- * lib/rdoc/ri/driver.rb: Relaxed matching for pages to be more
- user-friendly.
- * test/rdoc/test_rdoc_ri_driver.rb: Test for above.
+ * test/ruby/test_object.rb: add a test for [ruby-dev:38982].
-Fri Nov 30 09:50:16 2012 Eric Hodel <drbrain@segment7.net>
+Wed Aug 5 00:33:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rdoc/markdown.rb: Fixed warnings with -w
+ * lib/rdoc/parser/c.rb: fixed a small error in the documentation.
+ [ruby-core:24744]
-Fri Nov 30 09:38:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Aug 4 22:10:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * include/ruby/ruby.h (RB_GC_GUARD_PTR): add note.
+ * win32/win32.c (has_redirection): need to execute shell if commandline
+ includes newline. cf. [ruby-core:24560]
- * vm_backtrace.c (backtrace_to_str_ary): use RB_GC_GUARD() instead of
- RB_GC_GUARD_PTR() which has no effect.
- (backtrace_to_location_ary): ditto.
- (vm_backtrace_to_ary): ditto.
+Tue Aug 4 15:06:58 2009 Akinori MUSHA <knu@iDaemons.org>
-Fri Nov 30 09:22:52 2012 Eric Hodel <drbrain@segment7.net>
+ * 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>.
- * lib/rubygems/commands/contents_command.rb: Sort output from command.
- Replaces r38004, r38005
- * test/rubygems/test_gem_commands_contents_command.rb: ditto.
+Tue Aug 4 13:07:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rubygems/defaults.rb: Use Gem.path_separator for jruby support.
- * lib/rubygems/path_support.rb: ditto
+ * 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.
-Fri Nov 30 08:34:03 2012 Eric Hodel <drbrain@segment7.net>
+Tue Aug 4 12:40:45 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/rdoc/generator/darkfish.rb: Silenced warning
- * test/rdoc/test_rdoc_rdoc.rb: ditto
+ * enc/encdb.c (ENC_SET_BASE): fix typo.
+ patch by ujihisa [ruby-dev:39004]
- * lib/rdoc/markup/parser.rb: Use byteslice when available for
- performance
- * test/rdoc/test_rdoc_markup_parser.rb: Test for above
- * lib/rdoc/test_case.rb: ditto
+Tue Aug 4 11:57:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rdoc/parser/ruby.rb: Fixed bug parsing yield({})
- * test/rdoc/test_rdoc_parser_ruby.rb (end):
+ * range.c (range_eql, range_eq): fixed equality to work for
+ subclasses of Range. a patch from Marc-Andre Lafortune.
+ [ruby-core:22190]
- * lib/rdoc/rubygems_hook.rb: Skip default gems. Display generator
- name properly.
- * test/rdoc/test_rdoc_rubygems_hook.rb: Test for above
+ * test/ruby/test_range.rb: add assertions for above.
- * lib/rdoc/servlet.rb: Fixed typo.
+Tue Aug 4 09:41:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Nov 30 08:09:56 2012 Narihiro Nakamura <authornari@gmail.com>
+ * 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.
- * gc.c : remove a unused function.
+Tue Aug 4 09:33:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Nov 30 07:46:42 2012 Narihiro Nakamura <authornari@gmail.com>
+ * encoding.c (rb_enc_set_base): Add for setting base encoding
+ with their names. this is internal function.
- * gc.c (rb_objspace_call_finalizer): finalize_deferred may free up
- a object which is reachable from a part after this function,
- e.g. ruby_vm_destruct(). [ruby-dev:46647] [Bug #7452]
+ * template/encdb.h.tmpl: specify ENC_SET_BASE for second encodings in
+ each encoding files.
- * test/ruby/test_gc.rb (test_finalizing_main_thread): add a test
- for above.
+ * enc/encdb.c (rb_enc_set_base): add a declaration.
+ (ENC_SET_BASE): ditto.
-Fri Nov 30 07:43:44 2012 Koichi Sasada <ko1@atdot.net>
+Tue Aug 4 06:30:01 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread.c (rb_thread_interrupted): avoid warning of
- implicit conversion.
+ * hash.c (rb_hash_replace): should copy compare_by_identity status as well.
+ [ruby-core:24728]
- * thread.c (rb_threadptr_execute_interrupts): ditto.
+Tue Aug 4 05:43:03 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Nov 30 07:34:28 2012 Koichi Sasada <ko1@atdot.net>
+ * thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997]
- * vm_backtrace.c: add GC guards.
+Tue Aug 4 03:56:51 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Nov 30 07:21:33 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/tk/lib/tcltklib.c: fix trouble on old-style C function
+ declarations [ruby-core:22871].
- [EXPERIMENTAL: NEED DISCUSS]
- * vm_trace.c: add events
- * :thread_begin - hook at thread beginning.
- * :thread_end - hook at thread ending.
- * :b_call - hook at block enter.
- * :b_return - hook at block leave.
- This change slow down block invocation.
- Please try and give us feedback until 2.0 code freeze.
+ * ext/tk/lib/tcltklib.c: (ruby_1_8) fix warning about RUBY_RELEASE_DATE
- * include/ruby/ruby.h: ditto.
+ * ext/tk/lib/tk/multi-tk.rb: kill zombie threads.
- * compile.c (rb_iseq_compile_node): ditto.
+ * ext/tk/lib/tk/fontchooser.rb: fix typo and support OptionObj.
- * insns.def: ditto.
+ * ext/tk/lib/tk/{canvas.rb,virtevent.rb,image.rb,timer.rb}:
+ don't create unnecessary array.
- * thread.c: ditto.
+Mon Aug 3 22:19:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * vm.c: ditto.
+ * eval.c (rb_mod_include): fix document. [ruby-core:24675]
- * include/ruby/debug.h: add a comment.
+Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_settracefunc.rb: add a tests.
+ * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712]
-Fri Nov 30 06:56:30 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * sample/tsvr.rb: ditto.
- * test/minitest/*: Imported minitest 4.3.2 (r8027)
+ * sample/dualstack-httpd.rb: ditto.
-Fri Nov 30 04:16:29 2012 Eric Hodel <drbrain@segment7.net>
+Mon Aug 3 18:12:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rake/*: Updated to rake 0.9.5
- * test/rake/*: ditto.
- * NEWS: ditto.
+ * thread.c (recursive_push): untrust internal hash to prevent
+ unexpected SecurityError. a patch from Kazuhiro NISHIYAMA.
+ Fix: #1864 [ruby-dev:38982]
-Fri Nov 30 02:53:47 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Aug 3 17:06:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm.c: add a return hook when a method raises an exception.
+ * lib/README: updated. a patch from Daniel Bovensiepen.
+ [ruby-core:24693]
- * probes_helper.h: look up klass and method if none are provided.
+Mon Aug 3 16:28:09 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * eval.c: update macro usage.
+ * win32/win32.c (rb_w32_connect): return value was broken when some
+ error occurred.
+ [ruby-core:24234]
- * vm_eval.c: ditto.
+Mon Aug 3 15:56:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c: ditto.
+ * array.c (permute0): use chars for boolean array.
- * test/dtrace/test_function_entry.rb: test for change.
+ * array.c (rb_ary_{permutation,combination}): disallow reentrance
+ with continuation since work-buffers cannot restore.
-Fri Nov 30 02:27:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * array.c (rb_ary_{permutation,combination,product}): must not use
+ ary_discard on strings.
- * compile.c (compile_array_): refix r37991 remove assertion:
- it is true only if type == COMPILE_ARRAY_TYPE_HASH.
- [ruby-dev:46658] [Bug #7466]
+Mon Aug 3 06:43:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm.c (m_core_hash_from_ary): add assertion instead of above.
+ * numeric.c (flo_hash): normalize -0.0 to 0.0. [ruby-core:24577]
- * vm.c (m_core_hash_merge_ary): ditto.
+Mon Aug 3 00:32:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 29 19:15:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * random.c (rb_random_int): arguments have to be converted to
+ integer. [ruby-core:24679]
- * compile.c (compile_array_): hash elements must be paired even for
- literal elements. [ruby-dev:46658] [Bug #7466]
+Sun Aug 2 21:04:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 29 22:39:35 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * parse.y (literal_concat0): tail can be nil. [ruby-dev:38980]
- * ext/openssl/ossl_ssl.c (ssl_npn_encode_protocol_i): fix byte order
- issue on big-endian architecture [ruby-core:50292] [Bug #7463]
+Sun Aug 2 20:09:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 29 22:23:31 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * array.c (rb_ary_combination, rb_ary_product): prevent from GC.
- * test/openssl/test_cipher.rb (test_ctr_if_exists): add CTR mode test
- if underlying OpenSSL supports it. See #4408
+Sun Aug 2 16:53:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Thu Nov 29 21:42:16 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * test/ruby/test_rand.rb: add tests for Random#float's rejection
+ against Infinity and NaN.
- * vm_method.c (rb_method_entry_make): add a method entry with
- VM_METHOD_TYPE_REFINED to the class refined by the refinement if
- the target module is a refinement. When a method entry with
- VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with
- the same name is searched in refinements. If such a method is
- found, the method is invoked. Otherwise, the original method in
- the refined class (rb_method_definition_t::body.orig_def) is
- invoked. This change is made to simplify the normal method lookup
- and to improve the performance of normal method calls.
+Sun Aug 2 14:20:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (EXPR1, search_method, rb_method_entry),
- vm_eval.c (rb_call0, rb_search_method_entry): do not use
- refinements for method lookup.
+ * random.c (rand_int): prevent from GC.
- * vm_insnhelper.c (vm_call_method): search methods in refinements if
- ci->me is VM_METHOD_TYPE_REFINED. If the method is called by
- super (i.e., ci->call == vm_call_super_method), skip the same
- method entry as the current method to avoid infinite call of the
- same method.
+Sat Aug 1 19:23:27 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * class.c (include_modules_at): add a refined method entry for each
- method defined in a module included in a refinement.
+ * string.c (tr_trans): change condition of singlebyte
+ optimization.
- * class.c (rb_prepend_module): set an empty table to
- RCLASS_M_TBL(klass) to add refined method entries, because
- refinements should have priority over prepended modules.
+Sat Aug 1 18:50:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * proc.c (mnew): use rb_method_entry_with_refinements() to get
- a refined method.
+ * random.c (random_float): rejects Infinity and NaN.
+ [ruby-core:24651]
- * test/ruby/test_refinement.rb (test_inline_method_cache): do not skip
- the test because it should pass successfully.
+Sat Aug 1 18:34:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb (test_redefine_refined_method): new
- test for the case a refined method is redefined.
+ * tool/rbinstall.rb (gem): suppressed warnings.
+ cf: [ruby-dev:38975]
-Thu Nov 29 17:45:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Aug 1 05:18:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * variable.c (rb_const_set): show namespace in warning messages.
- [Feature #7190]
+ * string.c (tr_trans): can't use singlebyte optimization when
+ the replacement is multibyte. [ruby-core:24612]
-Thu Nov 29 17:31:53 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jul 31 18:01:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rubygems.rb (Gem.load_yaml): return if Kernel#gem is not defined
- yet. This causes crash if test-all requires libraries in a certain
- order. A simple reproducible code is
- ruby --disable-gem -e'require"yaml";require"minitest/autorun"'
+ * lib/securerandom.rb (SecureRandom.random_bytes): return string should
+ be ASCII-8BIT. [ruby-core:24640]
-Thu Nov 29 17:19:26 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 31 16:28:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/tracer.rb: Updated to match removal of custom_require from
- RubyGems.
- * test/test_tracer.rb: ditto. Improved failure message if the test
- fails
+ * io.c (rb_stdio_set_default_encoding): added.
-Thu Nov 29 17:15:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * ruby.c (process_options): call rb_stdio_set_default_encoding
+ after setting default internal and external.
- * gc.c: Documentation for GC, GC::Profiler, ObjectSpace, and
- ObjectSpace::WeakMap [ruby-core:50245] [Bug #7449]
+Fri Jul 31 15:06:33 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Nov 29 17:12:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * tool/compile_prelude.rb: too long string literal causes compile error
+ on some platforms.
- * tool/generic_erb.rb, tool/id2token.rb: add --path-separator option
- for mingw where make and built ruby live in different world.
+Fri Jul 31 13:15:27 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * tool/vpath.rb: extract from tool/instruction.rb.
+ * transcode.c (str_encode_bang): C99ism.
-Thu Nov 29 17:11:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 31 11:48:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/io/wait/test_io_wait.rb (TestIOWait#fill_pipe):
- Errno::EWOULDBLOCK may not be the same as Errno::EAGAIN. patch by
- phasis68 (Heesob Park) at [ruby-core:49894]. [Bug #7420]
+ * compile.c (iseq_compile_each): used more appropriate construct.
-Thu Nov 29 17:03:38 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 31 10:54:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rubygems/test_case.rb: Determine path to certificates to avoid
- build-dir problems.
- * test/rubygems/test_gem_security_signer.rb: Use predetermined paths
- to avoid build-dir problems.
+ * parse.y (literal_concat_gen): reduced unnecessary node at string
+ literal concatenation with empty head dstr. [ruby-dev:38968]
-Thu Nov 29 16:18:14 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 31 02:57:39 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/rubygems/test_case.rb: Disable loading of keys and certificates
- outside rubygems or ruby tests as the files are not available (or
- necessary).
+ * parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
+ NODE_STR. [ruby-dev:38968]
-Thu Nov 29 16:14:41 2012 Koichi Sasada <ko1@atdot.net>
+ * bootstraptest/test_syntax.rb: add a test for above.
- * vm_backtrace.c (rb_debug_inspector_open): use RARRAY_LENINT() for
- int variable.
+Fri Jul 31 00:55:48 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Thu Nov 29 15:59:55 2012 Koichi Sasada <ko1@atdot.net>
+ * test/ruby/test_module.rb (test_ancestors, test_included_modules):
+ ignore rake mixins.
- * include/ruby/debug.h: add rb_debug_inspector_* APIs.
+Fri Jul 31 00:30:54 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_backtrace.c: ditto.
+ * vm_insnhelper.c (vm_call_cfunc): let set_trace_func use called_id
+ instead of original_id.
- * common.mk: add dependency from vm_backtrace.o to
- include/ruby/debug.h.
+Thu Jul 30 23:04:32 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * proc.c (rb_binding_new_with_cfp): constify.
+ * 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.
- * vm.c (rb_vm_get_ruby_level_next_cfp): constify.
+Thu Jul 30 22:28:04 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * vm_core.h, vm_trace.c: move decls.
+ * tool/compile_prelude.rb: replaces "require" with in-place evaluation
+ so that copy & paste for lib/rubygems/default.rb is not necessary.
-Thu Nov 29 15:56:14 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * gem_prelude.rb: removes copied codes from lib/rubygems/defaults.rb.
+ uses require instead.
- * lib/rdoc/test_case.rb (RDoc::TestCase#verbose_capture_io):
- defined for asserts of warnings.
+ * common.mk (prelude.c): adds dependency for lib/rubygems/defaults.rb.
- * test/rdoc: use verbose_capture_io on asserts of warnings.
- they failed when tests was run with RUBYOPT=-W0.
+Thu Jul 30 21:56:18 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Thu Nov 29 15:53:38 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * test/ruby/test_rand.rb: add tests for Random class.
- * ext/psych/extconf.rb: added --enable-bundled-libyaml option. this
- enforces using bundled libyaml.
+Thu Jul 30 21:48:56 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Thu Nov 29 15:51:54 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * lib/rubygems*: Updated to RubyGems 2.0
- * test/rubygems*: ditto.
+Thu Jul 30 21:43:41 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * common.mk (prelude): Updated for RubyGems 2.0 source rearrangement.
+ * random.c (random_bytes): use NUM2LONG instead of FIX2LONG because
+ Random#bytes may receive bignum.
- * tool/change_maker.rb: Allow invalid UTF-8 characters in source
- files.
+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> in
+ [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>
-Thu Nov 29 15:38:14 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/tk/extconf.rb: should not create "config_list" in a $srcdir.
- * include/ruby/debug.h: provide rb_tracearg_*() APIs,
- instead of rb_tracepoint_attr_*().
- These APIs are for debuggers/profilers.
- They will be explained in another docs sometime.
+Thu Jul 23 14:35:02 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm_trace.c: ditto.
+ * win32/win32.c (rb_w32_{open,wopen}): fixed typos. these conditions
+ mean to call runtime's open() if textmode.
-Thu Nov 29 15:10:45 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Jul 23 08:53:24 2009 Eric Hodel <drbrain@segment7.net>
- * test/minitest/test_minitest_unit.rb: restore orig_verbose only
- if it is set. This broke rdoc's tests.
- http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20121129T050102Z.diff.html.gz
+ * lib/rdoc/markup/simple_markup/: Remove useless directory.
+ [Bug #1343]
-Thu Nov 29 14:56:30 2012 Koichi Sasada <ko1@atdot.net>
+Thu Jul 23 08:52:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_trace.c (rb_tracepoint_attr_method_id):
- rename TracePoint#id to TracePoint#method_id.
+ * random.c (random_{state,left}): internal/debug use.
- * include/ruby/debug.h: ditto.
+Wed Jul 22 19:29:26 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_settracefunc.rb: ditto,
+ * test/ruby/test_module.rb (TestModule#test_alias): warning
+ message updated.
-Thu Nov 29 14:49:10 2012 Koichi Sasada <ko1@atdot.net>
+Thu Jul 23 00:39:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_trace.c (rb_tracepoint_attr_defined_class):
- rename TracePoint#klass to TracePoint#defined_class.
- [ruby-core:50187] Re: [ruby-trunk - Feature #6895]
+ * common.mk (class.o): depends on vm_core.h.
- * include/ruby/debug.h: ditto.
+Thu Jul 23 00:10:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_settracefunc.rb: ditto.
+ * time.c (init_leap_second_info): checks the result of gmtime to
+ suppress warnings.
-Thu Nov 29 14:27:57 2012 Koichi Sasada <ko1@atdot.net>
+Wed Jul 22 22:23:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * gc.c (gc_stat): prepare Symbol objects at first time
- to make it fast.
+ * 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]
-Thu Nov 29 14:02:15 2012 Koichi Sasada <ko1@atdot.net>
+ * iseq.c, compile.c: ditto.
- * gc.c (gc_stat): GC.stat supports new information
- * total_allocated_object: total allocated object number.
- * total_freed_object: total freed object number.
- Above two numbers are only accumulated and they will
- overflow (return to 0). Please use them as a hint.
+ * parse.y: line number hack (for Proc#source_location) is no longer
+ needed.
-Thu Nov 29 12:13:54 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * test/ruby/test_settracefunc.rb: line number of set_trace_func is now
+ compatible with 1.8's.
- * lib/minitest/*: Imported minitest 4.3.2 (r8026)
- * test/minitest/*: ditto
+Wed Jul 22 22:16:48 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-Thu Nov 29 11:06:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * method.h: Commas at end of enum list not allowed as of C89
- * thread.c (thread_start_func_2): remove unused code. When
- th->safe_level == 4, th->errinfo never be thrown. So, to
- create new exception makes no sense.
+ * vm_method.c (rb_add_method): avoid C++ comment
-Thu Nov 29 10:29:53 2012 Koichi Sasada <ko1@atdot.net>
+ * 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.
- * vm_backtrace.c: same as a last patch.
+Mon Jul 20 19:00:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 29 10:24:25 2012 Koichi Sasada <ko1@atdot.net>
+ * compile.c (compile_dstr_fragments): reduced needless literal.
- * vm_backtrace.c: use `long' for return values of `NUM2LONG()'.
+ * 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.
-Thu Nov 29 09:52:08 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jul 20 12:51:39 2009 wanabe <s.wanabe@gmail.com>
- * thread.c (do_select): suppress warning (uninitialized value warning)
- with UNINITIALIZED_VAR().
+ * lib/matrix.rb (Matrix#rank): revert a part of r20859 to avoid
+ infinite loop. [Bug #1020]
-Thu Nov 29 09:36:09 2012 Koichi Sasada <ko1@atdot.net>
+Mon Jul 20 11:12:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_cleanup): delay THREAD_KILLED timing.
- It should be located just before rb_thread_terminate_all().
+ * configure.in, Makefile.in (TEST_RUNNABLE): tests are no
+ runnable if cross-compiling.
-Thu Nov 29 09:10:17 2012 Koichi Sasada <ko1@atdot.net>
+ * common.mk (btest*, test*): ditto.
- * vm_backtrace.c (vm_backtrace_to_ary): support range argument
- like Array#[].
- [ruby-core:50092] [ruby-trunk - Feature #7434]
- Test and document is not available. Please help us.
+Mon Jul 20 10:55:18 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 29 06:46:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in
+ error message. patch by Nobuhiro IMAI. [ruby-dev:38828]
- * thread.c (thread_start_func_2): small cleanups.
+Sun Jul 19 22:22:54 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Thu Nov 29 06:37:08 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * rational.c (float_to_r): an improvement.
- * thread.c (thread_start_func_2): remove unused code.
- this function never be used for main thread.
+Sun Jul 19 20:41:24 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Thu Nov 29 06:27:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * complex.c (make_patterns): do not use \d.
- * thread.c (thread_start_func_2): remove unused code.
- errinfo = th->errinfo; and errinfo = rb_errinfo(); are
- the same.
+ * rational.c (make_patterns): ditto.
-Thu Nov 29 05:26:32 2012 Koichi Sasada <ko1@atdot.net>
+Sun Jul 19 17:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_backtrace.c (backtrace_to_str_ary2): rename to backtrace_to_str_ary.
+ * io.c (io_read): should taint the result. [ruby-dev:38826]
- * vm_backtrace.c (rb_backtrace_to_str_ary): use `backtrace_to_str_ary()'.
+Sun Jul 19 11:00:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_backtrace.c (backtrace_to_frame_ary): rename to
- backtrace_to_location_ary.
+ * vm_method.c (me_opts): fixed optimized method aliasing.
+ [ruby-dev:38824]
-Thu Nov 29 05:19:25 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Jul 19 10:54:56 2009 Tanaka Akira <akr@fsij.org>
- * probes.d: Change function-entry probe to method-entry.
- * insns.def: ditto
- * probes_helper.h: ditto
- * test/dtrace/test_function_entry.rb: ditto
- * test/dtrace/test_singleton_function.rb: ditto
- * vm.c: ditto
- * vm_eval.c: ditto
- * vm_insnhelper.c: ditto
+ * ext/socket/lib/socket.rb (Socket.accept_loop): rescue
+ IO::WaitReadable instead of Errno::EWOULDBLOCK.
+ (Socket.udp_server_loop_on): ditto.
-Thu Nov 29 04:45:17 2012 Koichi Sasada <ko1@atdot.net>
+Sat Jul 18 23:44:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_backtrace.c: rename Class name from
- ::RubyVM::Backtrace and ::RubyVM::Backtrace::Location
- to ::Thread::Backtrace and ::Thread::Backtrace::Location.
+ * 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]
-Wed Nov 28 23:52:02 2012 Masaya Tarui <tarui@ruby-lang.org>
+Sat Jul 18 17:43:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * NEWS (Thread) remove incompatible changes about trap.
+ * string.c (rb_str_hash_cmp): got rid of overflow.
-Wed Nov 28 23:39:01 2012 Koichi Sasada <ko1@atdot.net>
+Sat Jul 18 16:03:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_mutex_sleep): fix to allow spurious wakeup.
- [ruby-dev:46654] [ruby-trunk - Bug #7455]
+ * include/ruby/defines.h (TRUE, FALSE): for internal use.
- * NEWS: write about spurious wakeup.
+Sat Jul 18 11:39:49 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Nov 28 22:57:23 2012 Koichi Sasada <ko1@atdot.net>
+ * random.c: workaround for VC++ 6.0.
- * thread_win32.c: catch up latest change of BLOCKING_REGION.
+Sat Jul 18 09:16:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 28 22:54:21 2012 Koichi Sasada <ko1@atdot.net>
+ * 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>
- * vm_insnhelper.c (vm_call_method): fix undefined behavior.
- Should not access scope local variable from outer scope.
+ * struct.c (recursive_hash): extracted from rb_struct_hash. reject
+ recursive key.
+ (rb_struct_hash): use recursive_hash.
-Wed Nov 28 22:20:55 2012 Masaya Tarui <tarui@ruby-lang.org>
+Fri Jul 17 16:45:22 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_thread.rb (test_thread_status_in_trap): change test for
- thread status in trap. now can accept Thread#join and Thread#value in trap.
+ * array.c (recursive_hash): reject recursive key.
-Wed Nov 28 21:58:47 2012 Koichi Sasada <ko1@atdot.net>
+Fri Jul 17 15:20:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/thread.h (rb_thread_call_without_gvl2): change
- meaning of function.
- This function is called with same parameters of
- `rb_thread_call_without_gvl()'.
- However, if interrupts are detected, then return immediately.
+ * random.c (DIGSPERINT): fix for LP64.
- * thread.c: implement `rb_thread_call_without_gvl2()'.
+ * random.c (fill_random_seed): /dev/urandom is not available on
+ DOSISH systems.
-Wed Nov 28 21:31:21 2012 Masaya Tarui <tarui@ruby-lang.org>
+ * random.c (random_equal): new method Random#==.
- * thread.c (thread_join_sleep): check spurious wakeup by itself for
- corresponding status change in trap context.
- * vm_core.h (struct rb_thread_struct): add rb_thread_list_t and use as join_list for
- reentry by trap context.
- * thread.c (thread_start_func_2): ditto.
- * thread.c (remove_from_join_list): ditto.
- * thread.c (rb_thread_atfork): ditto.
- * thread.c (thread_join): ditto. & remove trap handler check.
- * thread.c (sleep_forever): add argument : spurious_check.
- * thread.c (sleep_timeval): ditto.
- * thread.c (rb_thread_sleep_forever): set spurious_check.
- * thread.c (rb_thread_sleep_deadly): ditto.
- * thread.c (sleep_for_polling): ditto.
- * thread.c (rb_thread_wait_for): ditto.
- * thread.c (sleep_wait_for_interrupt): bypass spurious_check.
+Fri Jul 17 13:35:47 2009 Tanaka Akira <akr@fsij.org>
-Wed Nov 28 21:23:18 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/init.c (rsock_getfamily): return AF_UNSPEC if getsockname
+ is failed. [ruby-core:24383]
- * ext/psych/yaml/emitter.c (yaml_emitter_write_indicator): constify.
+Fri Jul 17 01:22:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/psych/yaml/emitter.c (yaml_emitter_write_block_scalar_hints):
+ * 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.
- * ext/psych/extconf.rb: mingw32 also needs macros for win32, not
- only mswin32.
+Thu Jul 16 19:02:28 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/psych/extconf.rb: compile sources in the source directory
- without copying by using VPATH.
+ * ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): servers
+ is nil if an error occurs before setting it.
-Wed Nov 28 21:18:57 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jul 16 18:42:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (MakeMakefile#each_compile_rules): splat $(*VPATH*) for
- each VPATH elements.
+ * random.c (fill_random_seed): suppress a warning.
-Wed Nov 28 16:40:14 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jul 16 18:30:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (enum rb_thread_status): remove THREAD_TO_KILL
- * vm_core.h (struct rb_thread_struct): add to_kill field
- * thread.c (terminate_i): convert THREAD_TO_KILL to to_kill.
- * thread.c (rb_threadptr_to_kill): ditto.
- * thread.c (rb_thread_kill): ditto.
- * thread.c (rb_thread_wakeup_alive): ditto.
- * thread.c (thread_list_i): ditto.
- * thread.c (static const char): ditto.
- * thread.c (thread_status_name): ditto.
- * thread.c (rb_thread_status): ditto.
- * thread.c (rb_thread_inspect): ditto.
- * vm_backtrace.c (thread_backtrace_to_ary): ditto.
+ * hash.c (rb_hash_aset, recursive_hash): rejects recursive hash.
+ [ruby-core:22921]
- * thread.c (rb_threadptr_execute_interrupts): fix thread status
- overwritten issue. [Bug #7450] [ruby-core:50249]
-
- * test/ruby/test_thread.rb (test_hread_status_raise_after_kill):
- test for the above.
- * test/ruby/test_thread.rb (test_thread_status_in_trap): test for
- thread status in trap.
- * test/ruby/test_thread.rb (test_status_and_stop_p): remove
- Thread.control_interrupt unsafe test. Thread#kill no longer
- changes thread status. Instead of, Thread#kill receiver changes
- their own status when receiving kill signal.
+Thu Jul 16 18:28:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 28 16:21:46 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * id.c (Init_id), vm.c (vm_exec): @#__ThrowState__ is no longer
+ used. [ruby-dev:38760]
- * thread.c (struct rb_mutex_struct): add allow_trap field.
- * internal.h (rb_mutex_allow_trap): added.
- * thread.c (rb_mutex_lock, rb_mutex_unlock): check mutex->allow_trap.
- * thread.c (mutex_sleep): remove trap check because it uses
- rb_mutex_lock and rb_mutex_unlock internally.
- * thread.c (rb_mutex_allow_trap): new helper function for the above.
+Thu Jul 16 17:41:28 2009 Koichi Sasada <ko1@atdot.net>
- * io.c (io_binwrite): mark fptr->write_lock as writable in trap.
+ * vm_method.c (rb_alias): fix a case which try non-existing method alias.
- * test/ruby/test_signal.rb (test_trap_puts): test for the above.
+ * test/ruby/test_alias.rb: add a test.
-Wed Nov 28 16:59:12 2012 Koichi Sasada <ko1@atdot.net>
+Thu Jul 16 16:00:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * proc.c: remove Proc#== and Proc#eql?.
- Proc objects compared with their object ids.
- [Bug #4559]
+ * io.c (io_reopen): discards read buffer. [ruby-core:24240]
- * test/ruby/test_proc.rb: remove related test.
+Thu Jul 16 15:52:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 28 16:41:04 2012 Eric Hodel <drbrain@segment7.net>
+ * bignum.c (rb_big_new, rb_bigzero_p), range.c (rb_range_values):
+ added for random.c.
- * lib/rdoc/servlet.rb: Add support for serving documentation from a
- subdirectory.
- * lib/rdoc/generator/darkfish.rb: ditto
- * test/rdoc/test_rdoc_servlet.rb: Test for above
- * test/rdoc/test_rdoc_servlet.rb: ditto
+ * random.c (rb_random_t): objectified. [EXPERIMENTAL]
+ [ruby-dev:30954]
-Wed Nov 28 15:37:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Jul 16 14:08:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: fix r37924: run only on i[3-6]86-linux.
+ * array.c (rb_ary_sample): RDoc update. a patch from Florian
+ Frank. [ruby-core:24347]
-Wed Nov 28 15:31:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jul 16 12:42:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * io.c (FMODE_SYNCWRITE): removed unused macro.
+ * ext/readline/readline.c (readline_readline): rl_free_line_state
+ before rl_cleanup_after_signal.
-Wed Nov 28 15:19:25 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * ext/readline/readline.c (Init_readline): set rl_catch_signals and
+ rl_catch_sigwinch as 0. [ruby-core:21884]
- * configure.in: revert r37911, r37906 and r37904 which break build
- with non-gcc and/or non-IA32 compilers, e.g. Solaris Studio,
- Fujitsu C Compiler. [ruby-dev:46646] [Bug #7451]
+Thu Jul 16 08:59:22 2009 Koichi Sasada <ko1@atdot.net>
-Wed Nov 28 14:50:55 2012 Koichi Sasada <ko1@atdot.net>
+ * node.h, vm_core.h, variable.c: rename global_entry to rb_global_entry.
- * ext/psych/extconf.rb: copy sources into build directory,
- not into srcdir.
+ * compile.c, insns.def, iseq.c, vm_insnhelper.h: ditto.
-Wed Nov 28 14:34:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jul 16 08:57:44 2009 Koichi Sasada <ko1@atdot.net>
- * thread.c (rb_mutex_lock): moved trap context check from
- rb_mutex_trylock because try_lock have no change to make
- a deadlock.
- * thread.c (rb_mutex_trylock): ditto.
- * NEWS: news for the above.
+ * vm_method.c: separate clearing cache entry code.
-Wed Nov 28 13:39:54 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jul 16 08:56:32 2009 Koichi Sasada <ko1@atdot.net>
- * thread.c (thread_s_new): uses main_thread->status instead of
- th->inhibit_thread_creation for preventing thread creation.
- * vm_core.h (rb_vm_struct): remove inhibit_thread_creation field.
- * thread.c (rb_thread_terminate_all): ditto.
-
-Wed Nov 28 13:27:29 2012 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/extconf.rb: use embedded libyaml if no system libyaml is
- found. [ruby-core:49463]
- * ext/psych/lib/psych.rb: updating to psych 2.0.0
- * ext/psych/lib/psych/deprecated.rb: updated docs
- * ext/psych/psych.gemspec: updated to psych 2.0.0
- * ext/psych/psych.h: fixing header file include for rename
- * ext/psych/psych_emitter.c: renamed to avoid libyaml conflict.
- * ext/psych/psych_emitter.h: ditto
- * ext/psych/psych_parser.c: ditto
- * ext/psych/psych_parser.h: ditto
- * ext/psych/psych_to_ruby.c: ditto
- * ext/psych/psych_to_ruby.h: ditto
- * ext/psych/psych_yaml_tree.c: ditto
- * ext/psych/psych_yaml_tree.h: ditto
- * ext/psych/yaml/LICENSE: embedding libyaml 0.1.4
- * ext/psych/yaml/api.c: ditto
- * ext/psych/yaml/config.h: ditto
- * ext/psych/yaml/dumper.c: ditto
- * ext/psych/yaml/emitter.c: ditto
- * ext/psych/yaml/loader.c: ditto
- * ext/psych/yaml/parser.c: ditto
- * ext/psych/yaml/reader.c: ditto
- * ext/psych/yaml/scanner.c: ditto
- * ext/psych/yaml/writer.c: ditto
- * ext/psych/yaml/yaml.h: ditto
- * ext/psych/yaml/yaml_private.h: ditto
-
-Wed Nov 28 12:54:59 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * dir.c (push_glob): re-fix GC problem.
- * thread.c (thread_join): A trap handler check was moved from
- thread_join_m because Thread#value should be raised an exception
- too.
- * thread.c (thread_join_m): remove trap handler check.
- * test/ruby/test_thread.rb (test_thread_join_in_trap): add test
- for thread#value.
- * NEWS: documentation fix for the above.
+Thu Jul 16 08:55:27 2009 Koichi Sasada <ko1@atdot.net>
-Wed Nov 28 11:07:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * common.mk: add method.h.
- * ext/fiddle/closure.c: Documentation for Fiddle
- * ext/fiddle/lib/fiddle/import.rb: ditto
- * ext/fiddle/lib/fiddle/value.rb: ditto
- * ext/fiddle/lib/fiddle/pack.rb: ditto
- * ext/fiddle/lib/fiddle/cparser.rb: ditto
- * ext/fiddle/lib/fiddle/struct.rb: ditto
- * ext/fiddle/lib/fiddle/function.rb: ditto
+Thu Jul 16 08:53:26 2009 Koichi Sasada <ko1@atdot.net>
-Wed Nov 28 09:15:51 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * io.c (argf_free): free data body.
- * ext/strscan/strscan.c: Added #charpos for multibyte string position.
- * test/strscan/test_stringscanner.rb: ditto
+Wed Jul 15 23:46:55 2009 Koichi Sasada <ko1@atdot.net>
-Wed Nov 28 09:00:34 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * method.h, vm_core.h: add rb_method_entry_t. Remove nodes around
+ method management. This change affect some VM control stack structure.
- * ext/fiddle/fiddle.c: adding alignment constants for compatibility
- with DL.
- * ext/fiddle/fiddle.h: ditto
- * ext/fiddle/lib/fiddle/cparser.rb: importing the C parser for DL
- backwards compatibility.
- * ext/fiddle/lib/fiddle/import.rb: importing the import DSL for DL
- backwards compatibility.
- * ext/fiddle/lib/fiddle/pack.rb: importing structure pack for DL
- backwards compatibility.
- * ext/fiddle/lib/fiddle/value.rb: ditto
- * ext/fiddle/lib/fiddle/struct.rb: importing struct DSL for DL backwards
- compatibility.
- * test/dl/test_c_struct_entry.rb: importing tests
- * test/dl/test_c_union_entity.rb: ditto
- * test/dl/test_cparser.rb: ditto
- * test/dl/test_import.rb: ditto
- * test/fiddle/test_c_struct_entry.rb: ditto
- * test/fiddle/test_c_union_entity.rb: ditto
- * test/fiddle/test_cparser.rb: ditto
- * test/fiddle/test_import.rb: ditto
+ * vm.c, vm_insnhelper.c, vm_method.c, vm_eval.c: ditto. and make some
+ refactoring.
-Wed Nov 28 08:56:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * insns.def, class.c, eval.c, proc.c, vm_dump.c : ditto.
- * doc/globals.rdoc: Add documentation file for magic globals
- [ruby-core:29048] [Bug #3022]
+ * vm_core.h, compile.c (iseq_specialized_instruction): remove
+ VM_CALL_SEND_BIT. use another optimization tech for Kernel#send.
-Wed Nov 28 08:55:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * node.h: remove unused node types.
- * .document: Add README's to be included with docs
+ * ext/objspace/objspace.c (count_nodes): ditto.
-Wed Nov 28 08:26:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * gc.c: add mark/free functions for method entry.
- * ext/dl/lib/dl.rb: Deprecation notice for DL
+ * include/ruby/intern.h: remove decl of
+ rb_define_notimplement_method_id(). nobody can use it
+ because noex is not opened.
-Wed Nov 28 08:25:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * iseq.c (iseq_mark): fix to check ic_method is available.
- * ext/fiddle/closure.c: Documentation for Fiddle
- * ext/fiddle/pointer.c: ditto
- * ext/fiddle/function.c: ditto
- * ext/fiddle/lib/fiddle.rb: ditto
- * ext/fiddle/fiddle.c: ditto
- * ext/fiddle/handle.c: ditto
+ * iseq.c (rb_iseq_disasm): fix to use rb_method_get_iseq().
-Wed Nov 28 04:53:40 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Jul 15 23:45:11 2009 Koichi Sasada <ko1@atdot.net>
- * ext/fiddle/handle.c: Make Fiddle independent of DL, copy DL::Handle
- to Fiddle::Handle.
- * ext/fiddle/pointer.c: Make Fiddle independent of DL, copy
- DL::Pointer to Fiddle::Pointer.
- * test/fiddle/test_func.rb: relevant tests
- * test/fiddle/test_handle.rb: ditto
- * test/fiddle/test_pointer.rb: ditto
- * ext/dl/lib/dl/struct.rb: use Fiddle::Pointer if available
- * ext/fiddle/extconf.rb: check for dlfcn.h
- * ext/fiddle/fiddle.c: add constants for sizeof() things
- * ext/fiddle/fiddle.h: include dlfcn.h
- * ext/fiddle/function.c: expose a C function for creating new
- Fiddle::Function objects.
- * ext/fiddle/lib/fiddle.rb: include constants for dl backwards compat
- * ext/fiddle/lib/fiddle/function.rb: read the pointer from the
- function for dl backwards compat.
- * test/dl/test_callback.rb: check the addresses of the pointers rather
- than their types.
- * test/fiddle/helper.rb: remove dependency on dl
- * test/fiddle/test_closure.rb: ditto
- * test/fiddle/test_fiddle.rb: ditto
+ * dir.c (push_glob): fix GC problem.
-Wed Nov 28 03:03:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Jul 15 17:33:52 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * configure.in (opt-dir): don't use non portable flag -E of sed.
+ * 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/*.
-Wed Nov 28 02:55:35 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * 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.
- * configure.in (ARCH_FLAG): __sync_val_compare_and_swap_4 needs
- -march=$target_cpu on at least linux gcc 4.1.
- patched by KOSAKI Motohiro
+Wed Jul 15 16:29:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Nov 27 22:03:09 2012 Akinori MUSHA <knu@iDaemons.org>
+ * win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
- * string.c (rb_str_enumerate_chars, rb_str_enumerate_codepoints)
- (rb_str_enumerate_lines): Dummy initialization of ary has been
- replaced with UNINITIALIZED_VAR().
+Wed Jul 15 06:21:50 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Nov 27 21:29:00 2012 Kenta Murata <mrkn@mrkn.jp>
+ * ext/tk/extconf.rb: --with-{tcl,tk}-dir doesn't work.[ruby-dev:38782]
- * bignum.c (bigdivrem): optimize the way to retry calculation of
- bigdivrem so that the calculation is started from the point where
- the last interruption was occurred.
+Wed Jul 15 04:22:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * bignum.c (bigdivrem1): ditto.
+ * test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
+ set tempfile name with literal.
- * test/ruby/test_bignum.rb: add a test case for rb_bigdivrem in the
- case that an interruption is occurred during bigdivrem1 is running.
+Tue Jul 14 21:53:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 27 19:56:43 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/io/nonblock: moved from ext/io/wait/lib.
- * vm.c (rb_vm_make_env_object): make Proc object if Env is possible
- to point block.
- [ruby-core:41038] [ruby-trunk - Bug #5634]
+Tue Jul 14 17:29:20 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm.c (rb_vm_make_proc): No need to make Proc object here.
+ * string.c (rb_str_index_m): return nil if pos is out of string.
+ [ruby-core:23660]
- * bootstraptest/test_proc.rb: add tests.
+Tue Jul 14 16:13:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 27 18:51:06 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * io.c (rb_io_initialize): check if the descriptor can be accessed
+ in the specified open mode. [ruby-dev:38571]
- * ruby_atomic.h (ATOMIC_CAS): added for Solaris and other platforms.
- * ruby_atomic.h, signal.c (NEED_RUBY_ATOMIC_OPS): renamed from
- NEED_RUBY_ATOMIC_EXCHANGE.
- * signal.c (ruby_atomic_compare_and_swap): naive, non-atomic
- compare-and-swap implementation only used for platforms without
- valid support for atomic operations.
+Tue Jul 14 09:26:14 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Nov 27 17:43:46 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * lib/rdoc/*: Added --root option for building documentation outside
- the source directory.
- * test/rdoc/*: ditto
- * common.mk (rdoc): Added --root to rdoc rule
+Tue Jul 14 01:28:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Nov 27 16:24:45 2012 Eric Hodel <drbrain@segment7.net>
+ * test/ruby/test_m17n.rb (TestM17N#test_env): the encoding of
+ ENV is now locale encoding.
- * test/rdoc/test_rdoc_ri_paths.rb: Fixed duplicate path bug which
- caused windows failures.
+Tue Jul 14 01:24:56 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Nov 27 16:06:00 2012 Eric Hodel <drbrain@segment7.net>
+ * marshal.c (r_object0): should return real object.
- * test/rdoc/test_rdoc_generator_darkfish.rb: Updated tests for windows
- * test/rdoc/test_rdoc_options.rb: ditto
- * test/rdoc/test_rdoc_parser.rb: ditto
- * test/rdoc/test_rdoc_rdoc.rb: ditto
- * test/rdoc/test_rdoc_ri_driver.rb: ditto
- * test/rdoc/test_rdoc_servlet.rb: ditto
+Tue Jul 14 01:06:31 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Tue Nov 27 15:13:51 2012 Eric Hodel <drbrain@segment7.net>
+ * enumerator.c (yielder_yield_i): use rb_proc_new instead of
+ rb_iterate. [ruby-dev:38518]
- * common.mk (rdoc): Set --debug for rdoc generation in case of bugs
+ * README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call
+ instead.
-Tue Nov 27 14:56:45 2012 Eric Hodel <drbrain@segment7.net>
+ * README.EXT.ja: ditto.
- * lib/rdoc/rubygems_hook.rb: Updated for (upcoming) RubyGems 2
- import.
- * test/rdoc/test_rdoc_rubygems_hook.rb: ditto
+Tue Jul 14 00:45:41 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Tue Nov 27 13:59:29 2012 Narihiro Nakamura <authornari@gmail.com>
+ * test/ruby/test_case.rb (TestCase#test_deoptimization):
+ test for [ruby-core:23190].
- * NEWS: add improvements of the garbage collector.
+Mon Jul 13 22:49:50 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Tue Nov 27 13:27:46 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/prime.rb (Prime#prime_division): now decomposes
+ negative integer into a decomposition with element [-1, 1].
- * lib/rdoc*: Updated to RDoc 4.0 (pre-release)
- * bin/rdoc: ditto
- * test/rdoc*: ditto
- * NEWS: Updated with RDoc 4.0 information
+ * test/test_prime.rb: test for it.
-Tue Nov 27 12:17:11 2012 Koichi Sasada <ko1@atdot.net>
+Mon Jul 13 22:28:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c (rb_thread_terminate_all): retry broadcast only when
- an exception is raised.
+ * io.c (pipe_open): handles leaked on win32 when an error occurs.
-Tue Nov 27 12:02:25 2012 Koichi Sasada <ko1@atdot.net>
+Mon Jul 13 20:21:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_thread_terminate_all): broadcast terminate event
- not only an interrupt exception but any exceptions.
+ * marshal.c (r_object0): should not shadow outer variable not to
+ return Qnil always.
-Tue Nov 27 10:55:09 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jul 13 19:41:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * eval.c (ruby_cleanup): set thread status to THREAD_KILLED
- for preventing thr.raise.
- * test/ruby/test_thread.rb (test_main_thread_status_at_exit):
- test for the above.
+ * marshal.c (r_object0): copy instance variables to new regexp.
-Tue Nov 27 10:31:29 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jul 13 17:49:11 2009 Koichi Sasada <ko1@atdot.net>
- * thread.c (rb_thread_terminate_all): suppress a warning.
+ * 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.
-Tue Nov 27 09:29:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * iseq.c: fix mark, free, memsize functions for above change.
- * thread.c (thread_join): raises ThreadError if target thread
- is a main thread.
- * test/ruby/test_thread.rb (test_thread_join_main_thread):
- test for the above.
- * NEWS: news for the above.
+ * insns.def: remove rb_gc_write_barrier().
-Tue Nov 27 09:24:47 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * vm_insnhelper.c (vm_method_search): ditto.
- * thread.c (thread_join): raises ThreadError if target thread
- is a current thread.
- * test/ruby/test_thread.rb (test_thread_join_current):
- test for the above.
- * NEWS: news for the above.
+ * tool/instruction.rb, template/insns_info.inc.tmpl (insn_iclen):
+ added.
-Tue Nov 27 09:59:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jul 13 13:35:08 2009 Koichi Sasada <ko1@atdot.net>
- * ext/extmk.rb (extmake): close mkmf.log for each libraries so that
- failure messages are not mixed.
+ * insns.def, vm_insnhelper.c (getinstancevariable):
+ fix to use inline cache.
-Tue Nov 27 09:58:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * compile.c: fix to skip inline cache entry (IC). IC is added
+ automatically by compiler.
- * ext/digest/*/extconf.rb, ext/openssl/extconf.rb: get git rid of
- post-1.8 feature require_relative for cross compilation.
- [ruby-core:50160] [Bug #7439]
+ * insns.def, vm_insnhelper.h: fix IC positions.
-Tue Nov 27 09:17:59 2012 Koichi Sasada <ko1@atdot.net>
+ * iseq.c: increment minor_version of ISeq because of above change.
- * NEWS: add TracePoint.
+Mon Jul 13 08:01:00 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Nov 27 08:16:03 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/tk/extconf.rb: New strategy for searching Tcl/Tk libraries.
- * vm_trace.c: rename TracePoint#file and TracePoint#line
- to TracePoint#path and TracePoint#lineno respectively.
- They are consistent to RubyVM::Backtrace::Location.
+ * 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. )
- * include/ruby/debug.h: ditto.
+ * ext/tk/*: Unify sources between Ruby 1.8 & 1.9.
+ Improve default_widget_set handling.
- * vm_core.h: ditto.
+ * 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. )
- * test/ruby/test_settracefunc.rb: ditto.
+ * 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
-Tue Nov 27 08:04:26 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jul 13 01:18:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_thread_terminate_all): broadcast eTerminateSignal
- again when Ctrl-C was pressed. [Feature #1952] [ruby-dev:39107]
+ * time.c (time_timespec): rounds subsecond toward zero.
-Tue Nov 27 07:58:03 2012 Koichi Sasada <ko1@atdot.net>
+Sun Jul 12 23:51:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_core.h: add members to rb_trace_arg_t:
- * `klass_solved' represents klass and id is checked.
- * `line' represents line calculated from cfp.
- * `file' represents line calculated from cfp.
+ * 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.
- * vm_trace.c: fix to use above data structures.
- No need to calculate klass and id, line and file
- pairs for each trace points.
+Sun Jul 12 23:56:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Tue Nov 27 07:47:09 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * complex.c: added some shortcuts.
- * thread.c (rb_thread_terminate_all): add RUBY_VM_CHECK_INTS_BLOCKING().
- Otherwise the loop in this function behave as busy loop because
- native_sleep() return immediately when RUBY_VM_INTERRUPTED() is true.
+ * rational.c: ditto.
-Tue Nov 27 04:12:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jul 12 23:30:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/extmk.rb (extmake): git rid of post-1.8 features for cross
- compilation. [ruby-core:50160] [Bug #7439]
+ * object.c (rb_to_integer, rb_check_to_integer): return Bignum
+ as-is.
-Tue Nov 27 00:13:41 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sun Jul 12 21:07:46 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * thread.c (rb_mutex_trylock, rb_mutex_unlock, mutex_sleep):
- raises ThreadError if called from trap handler as Thread#join.
- * NEWS: news for the above.
+ * complex.c: use k_exact_{zero,one}_p macro.
-Mon Nov 26 23:55:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * rational.c: ditto.
- * NEWS: update for Thread#join incompatible change.
+Sun Jul 12 20:42:58 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Mon Nov 26 22:44:24 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * numeric.c (fix_divide): added an entry to rational.
- * thread.c (rb_thread_terminate_all): use native_sleep() instead
- of rb_thread_schedule(). Otherwise, it consume 100% cpu meaninglessly.
- [Bug #5368] [ruby-dev:44546]
- * thread.c (thread_start_func_2): last sub-thread wakes up main thread.
+ * rational.c (rb_rational_reciprocal): added.
-Mon Nov 26 21:16:04 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * complex.c (f_reciprocal): added.
- * vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT)
- (RUBY_VM_SET_FINALIZER_INTERRUPT, RUBY_VM_SET_TRAP_INTERRUPT)
- (RUBY_VM_INTERRUPTED): use enum symbol instead of immediate value.
- * thread.c (thread_join_m, rb_threadptr_execute_interrupts): ditto.
- * signal.c (signal_exec): ditto.
+Sun Jul 12 02:24:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 26 20:23:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * random.c (rand_init): use fixed buffer for small numbers.
- * thread.c (thread_join_m): use th->interrupt_mask instead of
- th->in_trap.
+Sat Jul 11 14:43:34 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_core.h (struct rb_thread_struct): remove in_trap member.
- * signal.c (signal_exec): ditto.
- * thread.c (thread_create_core): ditto.
- * thread.c (Init_Thread): ditto.
+ * test/ruby/test_io_m17n.rb (test_strip_bom): added.
-Mon Nov 26 20:23:49 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Jul 11 07:11:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_argf.rb (TestArgf#test_chars): since marshal data is
- binary, shouldn't pass via text mode. use base64 encoded data.
+ * ext/readline/readline.c (readline_attempted_completion_function):
+ array length is long.
-Mon Nov 26 19:45:18 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/readline/readline.c (readline_s_get_filename_quote_characters):
+ missing type of self.
- * ruby_atomic.h (ATOMIC_CAS): new macro for compare-and-exchange.
+Sat Jul 11 02:37:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (struct rb_thread_struct): add interrupt_mask member.
- * thread.c (thread_create_core, Init_Thread): initialize
- th->thread_mask.
+ * random.c (limited_rand): expands to long before shift so that
+ the result does not overflow.
- * vm_core.h (RUBY_VM_INTERRUPTED_ANY): new macro for avoiding
- bare th->interrupt_flag.
- * vm_core.h (RUBY_VM_INTERRUPTED, RUBY_VM_INTERRUPTED): check
- th->interrupt_mask.
- * thread.c (set_unblock_function, rb_thread_schedule): replace
- th->interrupt_flag with RUBY_VM_INTERRUPTED_ANY()
+Sat Jul 11 00:16:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * signal.c (signal_exec): set up thread->interrupt_mask for
- preventing recursive trap handler.
- * vm_core.h (RUBY_VM_CHECK_INTS, RUBY_VM_CHECK_INTS_BLOCKING): ditto.
+ * random.c (rand_init): got rid of buffer overflow.
- * thread.c (rb_threadptr_execute_interrupts):
- don't process interrupt if it is masked.
- [Bug #6009] [ruby-core:42524]
+Sat Jul 11 00:11:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 26 19:43:42 2012 Koichi Sasada <ko1@atdot.net>
+ * array.c (ary_join_1): should recurse for element array.
- * iseq.c (make_compile_option_value): add trace_instruction option.
- a patch by davidbalbert (David Albert).
- [Bug #6786]
+Fri Jul 10 23:10:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Nov 26 19:10:53 2012 Koichi Sasada <ko1@atdot.net>
+ * io.c (io_strip_bom): ungetbyte third byte when UTF-16LE.
- * bootstraptest/test_thread.rb: try to `join' each 100
- threads.
- This benchmark seems consuming long time on travis-ci
- several times (and make `failure').
+Fri Jul 10 23:04:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Nov 26 18:22:56 2012 Koichi Sasada <ko1@atdot.net>
+ * io.c (io_strip_bom): Fix condition of second byte of
+ UTF-16LE/UTF-32LE.
- * common.mk: specify label `built-ruby'.
+Fri Jul 10 21:45:30 2009 TAKAO Kouji <kouji@takao7.net>
- * benchmark/driver.rb: quote path.
+ * ext/readline/extconf.rb: checked rl_refresh_line in readline.
-Mon Nov 26 18:26:28 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/readline/readline.c (readline_s_refresh_line): add new
+ method, a patch from Koichiro Ohba. see [ruby-list:45922].
- * signal.c (signal_exec): add volatile to make sure setjmp safe.
+Fri Jul 10 21:00:05 2009 TAKAO Kouji <kouji@takao7.net>
-Mon Nov 26 18:19:47 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/readline/extconf.rb: checked rl_line_buffer and rl_point in
+ readline.
- * signal.c (signal_exec): suppress "warning: variable 'signum'
- might be clobbered by 'longjmp' or 'vfork'" warning.
+ * ext/readline/readline.c (readline_s_get_line_buffer): new method.
+ (readline_s_get_point): new method.
-Mon Nov 26 18:15:47 2012 Koichi Sasada <ko1@atdot.net>
+Fri Jul 10 16:30:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/driver.rb: accept multiple `-e'.
- You don't need to use `;' separation character.
- [ruby-core:50139] [ruby-trunk - Bug #7380]
+ * array.c (recursive_join): use obj to tell if recursion occurs.
+ [ruby-core:24150]
-Mon Nov 26 17:10:04 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * enum.c (enum_join): reverted r23966. [ruby-core:24196]
- * string.c (rb_str_enumerate_chars, rb_str_enumerate_codepoints)
- (rb_str_enumerate_lines): suppress "may be used uninitialized in
- this function" warning.
+Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Mon Nov 26 17:00:12 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * marshal.c (r_object0): set encoding only if the encoding
+ is not US-ASCII.
- * vm_core.h (rb_thread_struct): added 'in_trap' member for marking
- running trap handler.
- * signal.c (signal_exec): turn on in_trap when running trap.
- * thread.c (Init_Thread, thread_create_core): initialize in_trap
- when creating new threads.
- * thread.c (thread_join_m): raise ThreadError when running trap
- handler.Bug [#6416][ruby-core:44956]
- * test/ruby/test_thread.rb (test_thread_join_in_trap): new test
- for the above.
+Fri Jul 10 14:44:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 26 16:36:13 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * random.c (struct MT): ruby already assumes int has 32bit a
+ least, so no needs to use long.
- * io.c (argf_each_codepoint): add missing ARGF#codepoints [Bug #7438]
+ * random.c (rand_init): copies data to be used really only.
-Mon Nov 26 15:50:29 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Jul 10 11:41:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (bigdivrem): restart calculation when bigdivrem1 was
- interrupted by signal. Otherwise, ruby script may see a garbage
- value.
+ * include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
+ prototypes. [ruby-dev:38756]
-Mon Nov 26 15:33:02 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Jul 10 10:25:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (big_div_struct): added volatile to 'stop' member.
- Otherwise, "if (bds->stop)" check in bigdivrem1 don't read
- memory and ignore interrupt.
- * bignum.c (bigdivrem, rb_big_stop): ditto.
+ * vm_insnhelper.c (vm_search_superclass): checks for implicit
+ argument passing before method search. [ruby-core:24244]
-Mon Nov 26 12:11:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 10 07:22:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/Makefile.sub (DLNOBJ): missing in r37821.
+ * parse.y (parser_data_type): typed.
-Mon Nov 26 10:50:19 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jul 9 23:28:48 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_process.rb (test_setsid): added a few wait for
- preventing that Process.getsid(io.pid) makes Errno::ESRCH.
+ * include/ruby/io.h (FMODE_STRIP_BOM): new constant.
-Sun Nov 25 22:34:00 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * 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]
- * array.c (ary_resize_smaller): new function to resize array.
+Thu Jul 9 21:56:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * array.c (rb_ary_delete): refactoring to extract a function.
+ * marshal.c (r_object0): replace \u by u when the regexp is
+ made by Ruby 1.8. [ruby-dev:36750]
- * array.c (rb_ary_delete_same): refactoring.
- It renames function, reduces duplicated code and removes unused
- code.
+Wed Jul 8 23:13:54 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * gc.c (wmap_final_func): follow the above change.
+ * complex.c (nucomp_div): omitted zero division check.
- * internal.h (rb_ary_delete_same): ditto.
+Wed Jul 8 21:00:37 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-Sun Nov 25 22:27:33 2012 Benoit Daloze <eregontp@gmail.com>
+ * lib/irb/inspector.rb: forget svn add.
- * array.c: fixes for the updated documentation in r35858:
- Typos and #take/#drop accept to take/drop 0 elements.
+Wed Jul 8 19:10:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 25 19:43:29 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * error.c (rb_check_type): rejects typed data.
- * NEWS: add a news about iconv.
+Wed Jul 8 18:28:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 25 03:49:23 2012 Akinori MUSHA <knu@iDaemons.org>
+ * proc.c ({proc,binding,method}_data_type): typed.
- * lib/set.rb, test/test_set.rb: Move tests embedded in lib/set.rb
- to test/test_set.rb.
+Wed Jul 8 16:47:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 25 03:44:50 2012 Akinori MUSHA <knu@iDaemons.org>
+ * file.c (rb_file_s_basename): returns new string instead of
+ shared string from FilePathStringValue(). [ruby-core:24199]
- * string.c (rb_str_each_line, rb_str_lines): String#lines now
- returns an array instead of an enumerator. Passing a block is
- deprecated but still supported for backwards compatibility.
- Based on the patch by yhara. [Feature #6670]
+Wed Jul 8 04:28:16 2009 Eric Hodel <drbrain@segment7.net>
- * string.c (rb_str_each_char, rb_str_chars): Ditto for
- String#chars.
+ * ext/.document: Update with extensions that appear to have
+ documentation. [ruby-core:24181]
- * string.c (rb_str_each_codepoint, rb_str_codepoints): Ditto for
- String#codepoints.
+Wed Jul 8 04:28:16 2009 Koichi Sasada <ko1@atdot.net>
- * string.c (rb_str_each_byte, rb_str_bytes): Ditto for
- String#bytes.
+ * 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.
- * NEWS: Add notes for the above changes.
+ * error.c, gc.c, iseq.c, vm.c: ditto.
-Sun Nov 25 02:07:37 2012 Akinori MUSHA <knu@iDaemons.org>
+Tue Jul 7 20:23:27 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_warning)
- (Test::Unit::Assertions#assert_warn), test/ruby/envutil.rb,
- test/ruby/test_enumerator.rb, test/ruby/test_io_m17n.rb,
- test/ruby/test_regexp.rb, test/ruby/test_syntax.rb:
- assert_warn() and assert_warning() are reversed.
+ * bin/irb, lib/irb.rb lib/irb/*: irb-0.9.6, extend inspect-mode
-Sat Nov 24 21:08:50 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Tue Jul 7 17:00:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (wmap_final_func): rename variables to clarify the meaning.
- In wmap2obj the key is WeakRef and the value is referenced object.
- In obj2wmap the key is referenced object and the value is an array
- of WeakRef.
+ * gc.c (rb_gc_call_finalizer_at_exit): deal with typed struct like
+ as obj_free().
- * gc.c (wmap_finalize): ditto.
- [ruby-core:49044] [Bug #7304]
+ * error.c (rb_typed_struct_is_kind_of): new function to see if the
+ given typed struct.
-Sat Nov 24 21:01:55 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * error.c (rb_check_typed_struct): new function to check typed
+ struct.
- * array.c (rb_ary_delete_same_obj): new function for WeakRef.
- This deletes same objects as item argument in the array.
+ * include/ruby/ruby.h (Check_TypedStruct, Data_Get_TypedStruct):
+ new macro to check typed struct.
- * internal.h (rb_ary_delete_same_obj): add a declaration.
+Tue Jul 7 13:36:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (wmap_final_func): remove WeakRef object reference from the
- array. rb_ary_delete() is not usable because it uses rb_equal() to
- compare object references.
+ * enum.c (DEFINE_ENUMFUNCS): included function signature.
- * gc.c (wmap_finalize): remove recycled object references from weak
- map hash properly. How to get object reference from object id was
- wrong. st_delete() doesn't work properly if key and value arguments
- are same. The key of obj2wmap is referenced object and the value of
- obj2wmap is WeakRef array.
+ * enum.c (rb_enum_join): non-nil separator must be convertible to
+ String. [ruby-core:24172]
- * gc.c (wmap_aset): obj2wmap should contain WeakRef array in the
- definition.
+Tue Jul 7 12:47:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/test_weakref.rb
- (TestWeakRef#test_not_reference_different_object,
- TestWeakRef#test_weakref_finalize): add tests for above.
- [ruby-core:49044] [Bug #7304]
+ * enum.c (rb_enum_join): should propagate taint to the return
+ value. the change was overridden by r23967. [ruby-core:24176]
-Sat Nov 24 19:44:41 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Jul 7 11:56:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/nkf/nkf-utf8/nkf.c (unicode_iconv_combine): returning flags are
- nkf_char.
+ * gc.c (GC_PROF_SET_MALLOC_INFO, GC_PROF_SET_HEAP_INFO): simplified.
-Sat Nov 24 19:29:18 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Jul 7 10:12:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_rubyoptions.rb (test_usage, test_usage_long):
- reduced, renamed.
+ * io.c (rb_io_ext_int_to_encs): Set external encoding if
+ ext==intern. [ruby-dev:38278]
-Sat Nov 24 13:10:14 2012 Koichi Sasada <ko1@atdot.net>
+Mon Jul 6 09:31:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_trace.c (rb_tracepoint_attr_raised_exception): should not check
- value before event checking.
+ * proc.c (make_curry_proc): should propagate lambda-ness.
+ [ruby-core:24127]
- * vm_trace.c (rb_tracepoint_attr_return_value): ditto.
+ * proc.c (proc_hash): use long.
- * test/ruby/test_settracefunc.rb: add tests for TracePoint#return_value
- and TracePoint#raised_exception.
+Mon Jul 6 09:06:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Nov 24 12:47:27 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * test/ruby/test_module.rb (TestModule#test_undef): adjust to
+ message change.
- * test/ruby/test_process.rb (TestProcess#test_setsid): "./ruby-trunk"
- doesn't work on all environments. EnvUtil.rubybin would be suitable.
+ * test/ruby/test_object.rb (TestObject#test_redefine_method_which_may_case_serious_problem): ditto.
-Sat Nov 24 12:28:04 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * test/ruby/test_object.rb (TestObject#test_remove_method): ditto.
- * array.c (rb_ary_aref): fix Segmentation fault at TestArray#test_aref
- on x64 mingw. Variable argument of rb_scan_args() should be a pointer
- (VALUE *), but 0 of variable argument seems not equal to null pointer
- on x64 mingw.
+Mon Jul 6 09:04:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 24 11:47:14 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * enum.c (enum_join): deals with self recursive objects to get rid
+ of infinite recursion. [ruby-core:24150]
- * process.c (proc_getsid): adds new method for getting session id.
- Contributed from fumiyas (Fumiyasu SATOH). Thank you!
- [Feature #6757] [ruby-dev:45977]
- * configure.in: adds getsid check.
- * test/ruby/test_process.rb (TestProcess#test_setsid): new test
- for the above.
- * NEWS: news for the above.
+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]
-Sat Nov 24 10:59:14 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * enum.c (enum_sort_by): ditto.
- * thread.c (thread_create_core): don't use th->thread_id before
- initialized.
+Mon Jul 6 00:41:41 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Nov 24 00:00:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * rational.c: edited rdoc.
- * ruby.c (proc_options, process_options, ruby_process_options): take
- care of the case argc is 0, and check if argv has NULL.
- [ruby-core:49889] [Bug #7423]
+Sun Jul 5 23:55:57 2009 Tanaka Akira <akr@fsij.org>
-Sat Nov 24 00:00:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (find_time_t): fix Time.local(2009,2,31) failure on 64bit
+ time_t environment.
- * configure.in (--disable-dln): option to disable dynamic linking
- feature. [ruby-core:37676] [Feature #4946]
+Sun Jul 5 22:43:13 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Fri Nov 23 23:44:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * complex.c (nucomp_s_polar): now arg is optional.
- * lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for
- mingw64+MSYS pkg-config which erroneously emits extra newlines.
- [ruby-core:47998] [Bug #7163]
+Sun Jul 5 20:40:35 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Fri Nov 23 17:31:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * complex.c (float_arg): returns PI for -0.0.
- * ruby.c (usage): wrap description lines if options are too long.
+Sun Jul 5 14:04:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 23 11:13:46 2012 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]
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_usage2): refine
- assertion.
+Sun Jul 5 08:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_usage2): now
- --help option is for modern terminals.
+ * 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].
-Fri Nov 23 10:45:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * vm_method.c (Init_eval_method): registers notimplement_body as a
+ mark-object.
- * ext/socket/ipsocket.c (IPSocket#peeraddr): Fix example
- [ruby-core:46429] [Bug #6732]
+ * vm_insnhelper.c (vm_yield_setup_block_args): restores the firs
+ arg where is overwritten at funcall. [ruby-core:24139]
-Fri Nov 23 02:40:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Sat Jul 4 08:20:03 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/cgi/core.rb: Documentation for CGI#header alias
- Based on a patch by Marcus Stollsteimer
- [ruby-core:49585] [Bug #7405]
+ * numeric.c (dbl2ival): should raise FloatDomainError on Infinity
+ and NaN as 1.8 does. [ruby-dev:38726]
-Thu Nov 22 23:48:10 2012 Narihiro Nakamura <authornari@gmail.com>
+Fri Jul 3 22:48:45 2009 Tanaka Akira <akr@fsij.org>
- * gc.c (is_swept_object): extract from is_dead_object().
+ * time.c (find_time_t): less number of guesses for hh:mm:60.
- * gc.c (rb_gcdebug_print_obj_condition): add the function for debug.
- This function shows some conditions of given object (e.g.,
- marked, in heap, swept).
+Fri Jul 3 21:30:14 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * gc.c (rb_gcdebug_sentinel): add the function for debug.
- This function allow check to inadvertently free up an object.
+ * complex.c (nucomp_equal_p): removed.
-Thu Nov 22 23:45:18 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Fri Jul 3 21:07:29 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * array.c (rb_ary_shared_with_p): fix cache validity check.
- If #pop or #shift has been called against $: or $", the array will
- be still shared with the snapshot. We check array length for cache
- validity.
- [ruby-core:49518] [Bug #7383]
+ * rational.c: renamed equal_p to eqeq_p.
- * test/ruby/test_require.rb
- (TestRequire#test_require_with_array_pop,
- TestRequire#test_require_with_array_shift): add tests for above.
+ * complex.c: ditto.
-Thu Nov 22 21:48:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * complex.c (nucomp_equal_p): added.
+ Complex(NaN).equal?(Complex(NaN)) should return true.
- * common.mk, win32/Makefile.sub (probes.dmyh): now be made in current
- (=build) directory if build from the repository.
+Fri Jul 3 19:48:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Thu Nov 22 21:34:51 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * complex.c: undef-ed shome methods. [ruby-core:24110]
- * test/ruby/test_rubyoptions.rb: added a test.
+ * complex.c (Numeric#arg): NaN for NaN. [ruby-core:24116]
-Thu Nov 22 20:32:07 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Fri Jul 3 18:35:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (string_to_c_strict, string_to_c): check NUL.
- * rational.c (string_to_r_strict, string_to_r): ditto.
+ * vm_core.h (struct rb_iseq_struct): fixed types.
-Thu Nov 22 20:21:45 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * vm_core.h (ic_vmstat): VM state version is VALUE.
- * Makefile.in (.dmyh.h): removed $(VPATH). GNU make don't
- recognize suffix rule with VPATH.
+Fri Jul 3 02:52:20 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 22 18:11:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * time.c (find_time_t): time guess strategy refined again.
- * common.mk, Makefile.in, win32/Makefile.sub (.dmyh.h): nmake merges
- explicit rules for same target, but not merges explicit rules and
- implicit rules -- always explicit rules win. So, need to add an
- explicit rule for probes.h. [Bug #7421] [ruby-core:49839]
+Fri Jul 3 00:36:16 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 22 18:01:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * time.c (find_time_t): time guess strategy refined.
- * Makefile.in (probes.o): add -C to ignore #include in probes.d.
+Thu Jul 2 11:16:25 2009 Shugo Maeda <shugo@ruby-lang.org>
- * probes.d: include vm_opts.h instead of vm_core.h.
+ * lib/net/imap.rb: added response to Net::IMAP::ResponseError.
+ a patch from Eric Hodel in [ruby-core:24111].
- * vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.
+Thu Jul 2 08:04:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 22 17:45:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * time.c (num_exact): rb_check_to_integer() can deal with both of
+ Fixnum and Bignum together.
- * ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5.
- Support JIS X 0213 and some bugfixes.
+Thu Jul 2 07:53:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 22 17:39:37 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * parse.y (parser_yylex): fixed wrong variable.
- * tool/gen_dummy_probes.rb: don't change #include, #if and #endif
- lines. [Bug #7370]
+Thu Jul 2 05:37:38 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 22 16:58:26 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * time.c (num_exact): use to_r for T_FLOAT.
- * Makefile.in: run preprocessor when making probe.h
- * probes.d: define probe insn and insn__operand only when
- VM_COLLECT_USAGE_DETAILS is 1. [Bug #7370]
+Thu Jul 2 05:15:54 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 22 16:20:49 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * time.c (quo): return an integer if possible.
- * vm.c: Don't define vm_collect_usage_operand() and
- static void vm_collect_usage_insn() when disabling
- VM_COLLECT_USAGE_DETAILS. (refix r37796)
+Wed Jul 1 21:09:25 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 22 15:26:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * include/ruby/intern.h (rb_time_num_new): declared.
- * vm_insnhelper.h: partly revert r37631 (DTrace support).
- "vm usage information is always collected, so uncomment the
- functions." causes performance impact. [Bug #7370]
- Off course this revert disables related probes.
+ * 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.
-Thu Nov 22 14:14:36 2012 Akinori MUSHA <knu@iDaemons.org>
+ * ext/socket/ancdata.c (ancillary_timestamp): use rb_time_num_new to
+ represent struct bintime preciously.
- * re.c (rb_memsearch_ss): Apply performance improvement to short
- byte array search for platforms without memmem(3).
- [Feature #6311] [ruby-dev:45530]
+Wed Jul 1 08:46:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 22 12:52:19 2012 Akinori MUSHA <knu@iDaemons.org>
+ * marshal.c (w_encoding): encodings need extra depth.
+ [ruby-core:24100]
- * test/ruby/test_string.rb (TestString#test_index): Add some
- corner cases to tests for String#index, which might fail if ruby
- directly used a buggy memmem(3) implementation.
+Wed Jul 1 06:47:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 22 08:06:42 2012 Narihiro Nakamura <authornari@gmail.com>
+ * enum.c (enum_grep): gets rid of type-punning calls.
- * test/ruby/test_gc.rb (test_profiler_clear): fix wrong method
- calls [Bug #7419] [ruby-core:49828].
+Wed Jul 1 06:36:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Nov 22 02:22:33 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * enum.c (enum_join): add Enumerable#join.
- * NEWS: edited (order etc).
+ * array.c (ary_join_1): recursive join for Enumerators (and
+ objects with #to_a).
-Wed Nov 21 22:52:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_join): performance tune.
- * ext/io/wait/wait.c (io_wait_readable): add alias wait_readable.
+Tue Jun 30 18:19:07 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/io/wait/wait.c (io_wait_writable): this is easier to use than
- IO.select for a single IO object and is immune to the
- limitations/inefficiency of select() on platforms where poll/ppoll
- is available. patched by Eric Wong. [Feature #4646]
+ * hash.c (rb_hash_hash): documentation fix. a patch from
+ Marc-Andre Lafortune. [ruby-core:23943]
-Wed Nov 21 22:27:52 2012 Narihiro Nakamura <authornari@gmail.com>
+ * object.c (rb_mod_cmp): ditto.
- * gc.c (garbage_collect): remove a duplicative probe.
+ * range.c (range_eq): ditto.
-Wed Nov 21 22:08:48 2012 Narihiro Nakamura <authornari@gmail.com>
+ * string.c (rb_str_partition, rb_str_rpartition): ditto.
- * gc.c (gc_profile_clear): realloc profile records if its size is
- higher than the threshold, GC_PROFILE_RECORD_DEFAULT_SIZE * 2.
+ * struct.c (rb_struct_s_def): ditto.
-Wed Nov 21 21:53:29 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Jun 30 17:44:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * complex.c (nucomp_to_c): added.
+ * re.c (reg_match_pos): adjust offset based on characters, not
+ bytes. [ruby-dev:38722]
-Wed Nov 21 21:35:38 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * string.c (rb_str_offset): new function.
- * include/ruby/util.h: removed extra semicolon in definition of
- macro.
- * compile.c: ditto.
- * cont.c: ditto.
- * math.c: ditto.
- * node.c: ditto.
- * parse.y: ditto.
+ * string.c (rb_str_index_m): no call to rb_reg_adjust_startpos().
-Wed Nov 21 18:46:37 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Jun 30 16:57:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * rational.c (read_digits): due to a bit tighter rb_cstr_to_inum().
+ * tool/rbinstall.rb: renamed to get rid of collision against
+ instruction.rb on command line completion of shell.
-Wed Nov 21 16:13:37 2012 Koichi Sasada <ko1@atdot.net>
+ * tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
+ frozen strings unless really changed.
- * benchmark/bm_so_nsieve_bits.rb: add an encoding pragma because
- this benchmark using strings (literals) as binary sequence.
- Now, they are UTF-8 strings. [ruby-dev:46578]
+ * tool/file2lastrev.rb: get rid of global variables.
-Wed Nov 21 00:57:43 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * tool/compile_prelude.rb: use US-ASCII name.
- * file.c (Init_File): null device definition uses rb_define_const
- instead of rb_file_const.
+Tue Jun 30 16:46:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 21 00:28:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * insns.def, tool/instruction.rb: fixed types.
- * test/ruby/test_m17n_comb.rb (test_str_crypt): Use RbConfig to get
- libc's directory. Patched by Vit Ondruch [ruby-core:49763] [Bug #7312]
+Tue Jun 30 11:08:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 20 23:28:26 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * include/ruby/oniguruma.h, include/ruby/re.h, re.c, regcomp.c,
+ regenc.c, regerror.c, regexec.c, regint.h, regparse.c: use long.
- * marshal.c: add marshal readahead. marshalized Array, Hash and Struct
- have size at least number of its elements, marshal readahead will
- read the certain readable length and buffer when it needs more bytes.
- marshal readahead prevents many calls to IO#getbyte and IO#read,
- then it enables performance improvement.
- [ruby-dev:45637] [Feature #6440]
+Tue Jun 30 11:05:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 20 22:35:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * dln.c (dln_find_1): fixed index overrun.
- * Makefile.in (.d.h): replace char * to const char * because somehow
- current dtrace removes const of function declaration in probes.d.
+Tue Jun 30 08:42:34 2009 Eric Hodel <drbrain@segment7.net>
-Tue Nov 20 21:41:04 2012 Koichi Sasada <ko1@atdot.net>
+ * tool/instruby.rb: summary is required in a .gemspec.
- * include/ruby/debug.h: introduced.
- Debugging/profiling features will be located.
+Tue Jun 30 01:35:12 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * vm_trace.c: expose C-level TracePoint APIs.
- Note that they are experimental.
+ * tool/strip-rdocs.rb: supports QT style doxy-comments.
- * vm_trace.c, include/ruby/debug.h: rename `rb_hook_flag_t'
- to `rb_event_hook_flag_t'.
- Macro names `RUBY_HOOK_FLAG_*' are also renamed to
- `RUBY_EVENT_HOOK_FLAG_*'.
+Tue Jun 30 01:24:10 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * debug.h, vm_debug.h: rename debug.h to vm_debug.h.
+ * lib/cmath.rb (log2, cbrt): added. [experimental]
- * common.mk: ditto.
+Tue Jun 30 01:19:53 2009 Tadayoshi Funaba <tadf@dotrb.org>
- * debug.c, main.c, vm_core.h: ditto.
+ * complex.c (nucomp_expt): do not use rb_fexpt.
-Tue Nov 20 21:12:37 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jun 29 22:50:10 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * configure.in (RUBY_DTRACE_AVAILABLE): only check dtrace availability.
+ * Doxyfile.in: removed. merged into template/Doxyfile.template
- * configure.in (RUBY_DTRACE_POSTPROCESS): restore.
+ * configure.in: new checking for dot and doxygen.
-Tue Nov 20 21:22:44 2012 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * template/Doxyfile.template: merged with Doxyfile.in.
+ configured some options.
- * test/win32ole/test_win32ole_type.rb (test_implemented_ole_types):
- IShellDispatch6 bundled in Windows 8. Thanks to phasis68 (Heesob
- Park). [ruby-core:49580][Bug #7403]
+ * common.mk (capi): use $(DOXYGEN) instead of "doxygen".
+ (Doxyfile): removed a duplicate entry in the dependency.
-Tue Nov 20 21:06:41 2012 Tadayoshi Funaba <tadf@dotrb.org>
+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.
- * complex.c: some improvements.
* rational.c: ditto.
-Tue Nov 20 21:01:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+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.
- * common.mk (incs): BSD make cannot deal with non-prefixed dependency
- and prefixed target.
+Mon Jun 15 17:48:42 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 20 20:10:23 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * gc.c (os_obj_of): invoke garbage collection before iteration, to
+ avoid accessing half recycled object references. [ruby-dev:38613]
- * array.c (rb_ary_bsearch): fix rdoc bug (O(n log n) -> O(log n)).
- Patch by Charlie Somerville. [ruby-core:49661] [Bug #7409]
+Mon Jun 15 11:04:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * range.c (range_bsearch): ditto.
+ * .gdbinit (rp, iseq): load dummy_gdb_enums on demand.
+ [ruby-dev:38606]
-Tue Nov 20 19:02:44 2012 Koichi Sasada <ko1@atdot.net>
+Sun Jun 14 14:57:57 2009 Koichi Sasada <ko1@atdot.net>
- * vm_trace.c: rename and add TracePoint APIs.
- (1) TracePoint.new(...){...} creates a new trace point
- but does not make it enable.
- (2) TracePoint.trace(...){...} creates a new trace point
- and enable it (same as old behavior).
- (3) TracePoint#enable make it enable (renamed from TracePoint#retrace).
- If block given, when enable only in block.
- (4) TracePoint#disable make it disable (renamed from TracePoint#untrace).
- If block given, when disable only in block.
- (5) TracePoint#enabled? returns this trace is enable or not.
- [Feature #6895]
+ * thread.c, vm_eval.c: add Thread.backtrace.
- * test/ruby/test_settracefunc.rb: add tests.
+ * test/ruby/test_thread.rb: add a test.
-Tue Nov 20 18:35:05 2012 Koichi Sasada <ko1@atdot.net>
+Sun Jun 14 13:58:32 2009 Koichi Sasada <ko1@atdot.net>
- * vm_trace.c: add two methods:
- (1) TracePoint#return_value which returns return
- value on the :return and :c_return event.
- (2) TracePoint#raised_exception which returns raised exception
- value on the :raise event.
- Each methods raise RuntimeError if it is called at unsupported
- event.
- Please review and give us feedback until next preview
- release (Dec/2012) of Ruby 2.0.0.
- [Feature #6895]
+ * transcode.c (transcode_restartable0): revert last commit because
+ this change cause SEGV at test-all.
- * insns.def, vm.c, vm_eval.c, vm_insnhelper.c, eval.c, thread.c:
+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.
- * vm_trace.c, vm_core.h: move definition of rb_trace_arg_t from
- vm_trace.c to vm_core.h.
- Caller fills rb_trace_arg_t and pass the pointer of this variable.
+ * include/ruby/intern.h: remove decl of rb_thread_signal_raise() and
+ rb_thread_signal_exit().
- * test/ruby/test_settracefunc.rb: fix tests to test this change.
+Mon Jun 8 05:07:41 2009 Koichi Sasada <ko1@atdot.net>
-Tue Nov 20 17:31:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * thread_pthread.c (rb_thread_create_timer_thread): print fatal error
+ message to stderr instead of using rb_bug().
- * configure.in: fix dtrace didn't work on darwin.
+ * KNOWNBUGS.rb, bootstraptest/test_fork.rb: move a fixed test.
- * configure.in (RUBY_DTRACE_AVAILABLE): unify RUBY_DTRACE_POSTPROCESS
- and RUBY_DTRACE_BSD_BROKEN.
+Sun Jun 7 22:44:20 2009 Tadayoshi Funaba <tadf@dotrb.org>
-Tue Nov 20 15:20:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * lib/cmath.rb (log): avoided redundant expression.
- * file.c (File.extname): Documentation for extname on dotfiles and
- files ending with a dot. Also, added example for this.
- [ruby-core:47852] [Bug #7112]
+Sat Jun 6 02:49:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 20 14:19:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * hash.c (rb_hash_reject_bang): always check frozen status.
+ [ruby-core:23715]
- * test/ruby/test_signal.rb (TestSignal#test_signame): fix windows
- test failure. Process.kill on windows can't send a signal to
- another process.
+ * hash.c (rb_hash_update): ditto.
-Tue Nov 20 13:58:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * hash.c (rb_hash_reject_bang): call rb_hash_foreach() directly.
- * io.c (Init_IO): moved all rb_file_const() into file.c.
- * file.c (Init_File): replace with rb_file_const() with
- rb_define_const() because RDoc don't care rb_file_const.
- [Bug #5530]
+ * hash.c (rb_hash_update_i): call st_insert() directly.
-Tue Nov 20 12:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * hash.c (rb_hash_update_block_i): ditto.
- * ruby.c (usage_msg): Fix typo [ruby-core:49205] [Bug #7327]
+Fri Jun 5 07:12:32 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 20 12:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * lib/mkmf.rb (#link_command): should dup CONFTEST_C which is
+ frozen. ref [ruby-core:23675]. [ruby-core:23702]
- * file.c (File::NULL): Document File::NULL constant
- [ruby-core:49384] [Bug #7365]
+Thu Jun 4 02:25:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 20 12:05:15 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/base64.rb: typo fixed. a patch from okkez. [ruby-dev:38564]
- * win32/win32.c (rb_w32_read): Windows 8 fixed one of a bug of console
- API.
- based on the patch by Heesob Park at [ruby-core:49479] [Bug #7379]
+Wed Jun 3 09:03:23 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 20 11:14:33 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * enum.c (enum_first): should check negative length.
- * configure.in (--enable-dtrace): always call RUBY_DTRACE_BSD_BROKEN
- for portability.
- As the note, FreeBSD 8 has DTrace as the optional
- feature (it is enabled by the build option), but doesn't have USDT.
- FreeBSD 9 has USDT but they are still optional. FreeBSD 10 will
- enable them by default.
- The variable $rb_cv_prog_dtrace_g is "yes" only on FreeBSD 9 with
- optional DTrace or FreeBSD 10. If it is "no", you cannot know
- whether it doesn't need -G or DTrace is disabled. (by checking
- error code, you can know)
+Tue Jun 2 17:32:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 19 22:55:48 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * enum.c (first_i): Enumerator#first should consume only what is
+ needed. a patch from Marc-Andre Lafortune. [ruby-core:23661]
- * configure.in (--enable-dtrace): change help message
+ * enum.c (enum_first): call to_int once for an argument. based on
+ a patch from Marc-Andre Lafortune.
-Tue Nov 20 11:05:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Tue Jun 2 13:27:21 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * lib/tracer.rb (Tracer.trace_func): printf to stdout
- Patch by Michal Fojtik [ruby-core:45219] [Bug #6490]
+ * test/ripper/test_filter.rb: add tests. see [ruby-dev:37856]
-Mon Nov 19 21:24:18 2012 Naohisa Goto <ngotogenome@gmail.com>
+Tue Jun 2 07:44:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_dump.c: not to include probes.h because the code does not depend
- on it.
- * common.mk (vm_dump.$(OBJEXT)): remove dependency on probes.h
+ * string.c (rb_str_gsub_bang): modify check at the beginning.
+ [ruby-core:23662] ref [ruby-core:23657]
-Tue Nov 20 10:14:22 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * string.c (rb_str_rstrip_bang): ditto. [ruby-core:23657]
- * thread.c (rb_thread_s_check_interrupt): removed redundant
- GET_THREAD().
+ * string.c (rb_str_chop_bang): ditto.
-Tue Nov 20 10:12:46 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * string.c (rb_str_chomp_bang): ditto.
- * thread.c (rb_threadptr_async_errinfo_active_p): added a small
- comment.
+ * string.c (rb_str_reverse_bang): modify check added. [ruby-core:23671]
-Tue Nov 20 10:05:56 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jun 1 11:21:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_thread_blocking_region_end): replaced GET_THREAD()
- with ruby_thread_from_native(). We don't have GVL here.
+ * cont.c (cont_capture, fiber_store): reraise transferred error.
-Tue Nov 20 09:56:15 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * cont.c (fiber_switch): transfers dead fiber error to the previous
+ or root fiber if the current fiber is dead. [ruby-core:23651]
- * thread.c (rb_threadptr_execute_interrupts) removed.
- * thread.c (rb_threadptr_execute_interrupts_common) renamed to
- rb_threadptr_execute_interrupts. I.e. unified
- rb_threadptr_execute_interrupts and rb_threadptr_execute_interrupts_common.
- * thread.c (rb_thread_schedule, rb_thread_execute_interrupts) s/_common//.
+Mon Jun 1 10:41:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 20 09:48:34 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * include/ruby/intern.h (rb_exc_new2): optimization for literal.
- * signal.c (rb_get_next_signal): removed pointless signal
- disabling. pthread_sigmask() only changes current thread
- mask.
+Mon Jun 1 07:20:02 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 20 09:36:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): returns Inf if
+ exp is bigger than DBL_MANT_DIG.
- * signal.c (install_sighandler): added comments why we need
- rb_disable_interrupt().
+Sun May 31 23:28:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 20 09:31:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/mkmf.rb (create_makefile): checks for duplication of source
+ files.
- * signal.c (rb_disable_interrupt, rb_enable_interrupt): removed
- USE_TRAP_MASK.
- * signal.c (trap_arg, trap_ensure): removed.
- * signal.c (trap, sig_trap): removed pointless signal disabling.
- We don't need it because we no longer run trap handler on signal
- handler context.
+Sun May 31 23:26:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 20 09:20:49 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * file.c (istrailinggarbage): fixed typo.
- * prelude.rb: Moved Mutex#synchronize to
- * thread.c (rb_mutex_synchronize_m): here. [Bug #4266]
+Fri May 29 17:10:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 20 08:36:15 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * 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].
- * signal.c (sig_signame): implements Signal.signame method
- [Feature #5613]
- * test/ruby/test_signal.rb (test_signame): adds test for above
- * NEWS: add an item about above
+Fri May 29 17:08:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 19 16:30:59 2012 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]
- * struct.c (rb_struct_each_pair): yield associated pairs so that
- an unsplat argument can get both, for consistency with Hash,
- OpenStruct, and etc. [ruby-dev:46533] [Bug #7382]
+Fri May 29 09:30:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 19 16:17:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enum.c (collect_all): checks interrupts. [ruby-core:23594]
- * configure.in (LIBS): libelf is need on only FreeBSD.
+Thu May 28 07:39:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 19 16:08:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (THREAD_MODEL): reject unknown value and checks
+ pthread.h only when pthread. [ruby-core:23577]
- * common.mk (RUBYLIB): purelib option in runruby.rb is deprecated
- since r28841, so set to an empty list to get rid of a bogus path in
- child processes, which caused an insecure operation exception in
- test/ruby/test_encoding.rb:test_unsafe.
+Thu May 28 03:47:46 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 19 15:40:50 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * sample/optparse/opttest.rb: typo fixed. [ruby-dev:38544]
- * .travis.yml (script): add OPTS=-v, requested by @_ko1.
+Thu May 28 03:43:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 19 15:09:07 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * time.c (time_strftime): update RDoc according to info from
+ Marc-Andre Lafortune in [ruby-core:23575]. [ruby-core:23564]
- * configure.in: fix didn't enable_dtrace=yes on auto.
+Thu May 28 02:40:54 2009 Tanaka Akira <akr@fsij.org>
- * configure.in: see enable_dtrace for adding libelf on FreeBSD.
+ * 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]
- * common.mk: VPATH is not needed.
+Wed May 27 23:00:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 19 14:55:51 2012 Koichi Sasada <ko1@atdot.net>
+ * parse.y (struct parser_params): lex_gets_ptr should be long.
- * thread.c: add `Thread#backtrace_locations' method.
- This method is similar to `caller_locations' method for
- specific method.
- And fix to accept `level' and `n' parameters for `Thread#backtrace'
- and `Thread#backtrace_locations'.
- `caller' (and `caller_locations') do not return `caller' method
- frame.
- However, `Thread#backtrace' (and `Thread#backtrace_locations')
- return `Thread#backtrace' method frame itself
- if `Thread.current.backtrace' was called.
+Wed May 27 18:00:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_backtrace.c: ditto.
+ * bignum.c (bigand_int): new function to calculate bignum and
+ fixnum without allocating internal bignum.
- * internal.h: ditto.
+ * bignum.c (bigor_int): ditto.
- * test/ruby/test_backtrace.rb: add tests.
+ * bignum.c (bigxor_int): ditto.
-Mon Nov 19 14:54:32 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * bignum.c (bigand_int): even less object allocation.
- * Makefile.in, common.mk (probes.h): moved to common.mk and changed to
- see $(srcdir).
+Wed May 27 14:29:55 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk (probes.dmyh): now created it on $(srcdir) always.
+ * marshal.c (w_encoding): more compact encoding information for
+ US-ASCII and UTF-8. [incompatible] [experimental]
- * win32/Makefile.sub (.SUFFIXES): removed common suffix.
+ * marshal.c (r_ivar): restore :E encoding information.
-Mon Nov 19 10:00:10 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed May 27 14:08:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * Makefile.in (.SUFFIX): bsdmake needs .SUFFIX is defined before use.
+ * st.c (st_insert2): new function with processing new key,
+ e.g. copy.
- * common.mk: fix path of probes.dmyh.
+ * hash.c (rb_hash_aset): use st_insert2() to reduce redundant
+ st_lookup calls.
- * common.mk (vm_dump.o): depend probes.h.
+Wed May 27 02:31:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * configure.in: FreeBSD's USDT requires libelf.
+ * ext/readline/readline.c (readline_getc): the function for
+ rl_getc_function must be a byte function.
+ so use getbyte method. [ruby-dev:38535]
-Mon Nov 19 01:11:59 2012 Naohisa Goto <ngotogenome@gmail.com>
+Tue May 26 14:24:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h, probes_helper.h (RUBY_DTRACE_FUNC_ENTRY_HOOK,
- RUBY_DTRACE_FUNC_RETURN_HOOK): move from vm_core.h to new file
- probes_helper.h for narrowing dependency to probes.h.
- * common.mk (VM_CORE_H_INCLUDES): remove dependency to probes.h.
- * common.mk (vm.$(OBJEXT)): add dependency to probes_helper.h.
- * vm.c, vm_insnhelper.c: include probes_helper.h.
+ * gc.c: fixed types.
-Sun Nov 18 16:33:00 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * common.mk (bignum.o, numeric.o): depend on util.h.
- * configure.in, Makefile.in, common.mk: support DTrace on Solaris 10,
- based on r26235 by Yugui. On Solaris 10, low optimization level
- may also be needed, e.g. optflags="-xO1" or "-xO0" with Oracle
- SolarisStudio 12.3 cc.
+ * bignum.c, marshal.c: fixed types.
- * configure.in (--enable-dtrace): new option to enable/disable
- DTrace support. By default, trying to enable if dtrace command
- is found on the system. It is disabled when cross compiling.
+ * numeric.c (infinite_value): use ruby_div0.
- * configure.in (RUBY_DTRACE_POSTPROCESS): new macro. checks whether
- the dtrace on the system needs postprocessing with "dtrace -G".
- The postprocessing is needed on Solaris 10 and other platforms.
+ * include/ruby/util.h (ruby_div0): moved from marshal.c.
- * configure.in (RUBY_DTRACE_BSD_BROKEN): new macro. checks whether
- the dtrace supports USDT.
+Tue May 26 11:01:41 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * configure.in (DTRACE): move after RUBY_DTRACE_POSTPROCESS.
+ * lib/mkmf.rb: use map! to replace strings in $objs array.
- * configure.in (LD): On Solaris, /usr/ccs/bin/ld is preferred.
+Tue May 26 10:12:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in, Makefile.in, common.mk (DTRACE_OBJ): new macro for
- DTrace probe object generated by postprocessing with "dtrace -G".
+ * bignum.c (bignew_1): inline memory allocation.
- * Makefile.in, common.mk (probes.$(OBJEXT)): DTrace probe object
- generated by the postprocessing. New file probes.stamp is for
- rebuilding related objects that may be modified by "dtrace -G".
+ * bignum.c (bigtrunc): call rb_big_resize() only when needed.
- * configure.in, Makefile.in, common.mk (DTRACE_GLOMMED_OBJ): new
- macro for DTrace static library hacks.
+ * bignum.c (bigfixize): declare inline.
- * configure.in, Makefile.in (LIBRUBY_A_OBJS): ditto.
+Tue May 26 05:39:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Makefile.in, common.mk (ruby-glommed.$(OBJEXT)): new target with
- rule for DTrace static library hacks.
+ * include/ruby/ruby.h (FilePathValue): prevent from GC.
- * common.mk (DTRACE_DEPENDENT_OBJS): objects depended on probes.h.
+ * include/ruby/ruby.h (NUM2LONG): added GCC specific optimization.
-Sun Nov 18 09:31:47 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Tue May 26 03:41:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (read_comp): mathn compliant.
- * rational.c (read_num): ditto.
+ * time.c (rb_gmtime, rb_localtime): gmtime and localtime return
+ NULL on error. [ruby-core:23551]
-Sun Nov 18 02:50:12 2012 Luis Lavena <luislavena@gmail.com>
+Tue May 26 03:38:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/file.c (replace_to_long_name): correct logic around wildcard
- characters detection and ensure wide-chars are used as pattern.
- [ruby-core:49451] [Bug #7374]
+ * string.c (rb_str_each_char, rb_str_each_codepoint): string
+ length must be long.
-Sun Nov 18 02:02:46 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Mon May 25 13:27:32 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * complex.c (read_comp): modified handling of polar form.
+ * lib/mkmf.rb: dont use gsub! method for frozen string.
-Sun Nov 18 00:50:44 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Mon May 25 11:47:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (read_comp): fixed handling of polar form.
+ * tool/mkconfig.rb, tool/instruby.rb: removed redundant code.
-Sun Nov 18 00:14:46 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Mon May 25 09:34:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * complex.c (string_to_c_strict, string_to_c): rewrote without regexp.
- * rational.c (string_to_r_strict, string_to_r): ditto.
+ * string.c (rb_str_hash): avoid calling rb_enc_str_asciionly_p().
-Sat Nov 17 23:53:05 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * string.c (rb_str_replace): avoid redundant calling rb_str_new4().
- * complex.c (make_patterns): should not accept extra sign.
+ * string.c (str_replace): factor out replacement from
+ rb_str_replace() without type check nor discarding the
+ destination contents.
-Sat Nov 17 21:45:12 Luis Lavena <luislavena@gmail.com>
+Mon May 25 08:06:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/file.c (replace_to_long_name): skip expansion for all wildcard
- characters.
- [ruby-core:49451] [Bug #7374]
+ * string.c (rb_str_partition): should use the converted result. a
+ patch from Marc-Andre Lafortune at [ruby-core:23540].
- * test/ruby/test_file_exhaustive.rb: add more assertions to test.
+ * string.c (rb_str_rpartition): ditto.
-Sat Nov 17 12:14:50 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon May 25 06:25:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/psych/lib/psych/visitors/yaml_tree.rb: use literal YAML style
- when emitting multi-line strings. Thanks @atambo
+ * test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
+ are handled properly now. ref: [ruby-core:23402]
- * test/psych/test_yaml.rb: test for change.
+ * test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed
-Sat Nov 17 12:03:41 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon May 25 05:32:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/psych/lib/psych/scalar_scanner.rb: avoid raising exceptions when
- parsing Floats and Integers. Thanks riffraff [ruby-core:44426]
- * test/psych/test_numeric.rb: associated test
+ * lib/cgi/core.rb (CGI::HTTP_STATUS): typo fixed. a patch from
+ Nobuhiro IMAI. [ruby-dev:38538]
-Sat Nov 17 11:34:31 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun May 24 22:48:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * st.c (st_update): pass the key in st_table so that we can free
- memory of the key in st_table when deleting.
- [ruby-core:49220] [Bug #7330]
+ * thread.c (rb_exec_recursive_paired): new function for proper
+ handling of recursive arrays. [EXPERIMENTAL] [ruby-core:23402]
- * test/-ext-/st/test_update.rb
- (Bug::StTable#test_pass_objects_in_st_table): add a test.
+ * array.c (rb_ary_equal, rb_ary_eql, rb_ary_cmp): use above.
-Sat Nov 17 11:26:36 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * hash.c (hash_equal): ditto.
- * ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it can
- manually be required as 'psych/y'.
+Sun May 24 22:39:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/y.rb: ditto
+ * error.c (syserr_initialize): errno is int.
-Sat Nov 17 08:13:48 2012 Benoit Daloze <eregontp@gmail.com>
+Sun May 24 00:52:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/abbrev.rb: fix r37113. Correct examples, fix style
- and show explicit dependency (require 'abbrev').
+ * configure.in ($ridir): new configuration. [ruby-core:23520].
+ c.f. [ruby-core:23519].
-Sat Nov 17 07:35:15 2012 Luis Lavena <luislavena@gmail.com>
+ (--with-ridir): new configure option.
- * win32/file.c (replace_to_long_name): skip automatic path expansion
- when wildcard character is used. [ruby-core:49451] [Bug #7374]
+ * tool/instruby.rb (:doc, :rdoc): uses $ridir instead of
+ a fixed path.
- * test/ruby/test_file_exhaustive.rb: add a test for above.
+ * lib/rdoc/ri/paths.rb: follows $ridir.
-Sat Nov 17 00:50:23 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * Makefile.in: removes RIDATADIR which is no longer used.
- * marshal.c (w_object): add flonum to arg->data to keep reference index
- consistency. [ruby-core:49323] [Bug #7348]
+ * bcc32/Makefile.sub: generates the 'ridir' entry for RbConfig.
+ removes RIDATADIR which is no longer used.
- * test/ruby/test_marshal.rb: add a test for above.
+ * win32/Makefile.sub: ditto.
-Sat Nov 17 00:40:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 23 23:52:33 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk (incs): dist files need probes.dmyh.
+ * string.c (rb_str_each_char): return original string.
+ [ruby-core:23499]
- * common.mk (probes.dmyh): depends on generator script.
+ * string.c (rb_str_each_codepoint): protect string from
+ modification.
- * Makefile.in, common.mk, configure.in, win32/Makefile.sub (probes.h):
- select generating with dtrace or copying dummy file by suffix rules.
+Sat May 23 21:48:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 16 19:24:10 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/dl/handle.c (rb_dlhandle_s_sym): added a method to access
+ using RTLD_NEXT. [ruby-dev:38152]
- * thread.c (rb_thread_call_without_gvl2): change the parameter of
- `func' from `int *skip_interrupt' to `VALUE *flags'.
- If (flags & RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS) is not zero,
- then skip checking interrupt.
- [ruby-core:46547]
+ * ext/dl/handle.c (Init_dlhandle): added constants DEFAULT and
+ NEXT which correspond to RTLD_DEFAULT and RTLD_NEXT.
- * include/ruby/thread.h: ditto.
+Sat May 23 18:53:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 16 18:59:05 2012 NARUSE, Yui <naruse@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].
- * Makefile.in (no-dtrace-probes.h): dmyprobes.h is in srcdir.
+ * ext/dl/cptr.c (rb_dlptr_cmp): return signed value, and restrict
+ to Fixnum. [ruby-dev:38533]
- * common.mk (dmyprobes.h): ditto.
+Fri May 22 23:22:53 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Nov 16 17:57:15 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/vsnprintf.c (errno): [BUG] fixes a compilation
+ error on SIZEOF_LONG > SIZEOF_INT.
+ (BSD_vfprintf): ditto.
- * Makefile.in (probes.h): split build commands for dtrace-available
- and unavailable platforms.
+Fri May 22 23:20:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * Makefile.in (incs): probes.h is a platform dependent file, so it
- cannot be a part of prereq target. move it to all-incs.
+ * spec/default.mspec: follows runruby.rb's move at r23542.
- * configure.in (DTRACE): move after AC_PROG_CC since cross_compiling
- is set in it.
+Fri May 22 21:38:55 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * configure.in (DTRACE): ignore non-prefixed version if
- cross-compiling.
+ * 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.
- * Makefile.in, win32/Makefile.sub (probes.h): fix copying dmyprobes.h
- path when outplace-build.
+Sun Apr 26 20:17:24 2009 Tanaka Akira <akr@fsij.org>
-Fri Nov 16 15:27:36 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * lib/rake.rb: use RbConfig::CONFIG instead of Config::CONFIG.
- * lib/net/pop.rb (POP3.certs): fix typo in comment.
- patch from no6v (Nobuhiro IMAI) <nov@yo.rim.or.jp>.
- [ruby-dev:46519] [Bug #7355]
+ * lib/rbconfig/datadir.rb: ditto.
-Fri Nov 16 12:36:47 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Apr 26 19:30:29 2009 Tanaka Akira <akr@fsij.org>
- * test/rake/helper.rb (Rake::TestCase#setup): revert r37669.
- @orig_PWD should be the original pwd.
+ * time.c (time_arg): unused variable removed.
- * test/rake/test_*.rb: don't use @orig_PWD to load libraries.
- It should be specified with relative path from the file.
+Sun Apr 26 18:35:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 16 10:22:52 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * io.c (io_reopen): keeps pathv for prep_stdio. [ruby-dev:38131]
- * test/rake/helper.rb (Rake::TestCase#setup): @orig_PWD shouldn't be
- Dir.pwd when the build directory is different from source directory.
+Sun Apr 26 15:13:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 16 09:41:08 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/optparse.rb (OptionParser#parse_in_order): do not make an
+ option from non-option argument. [ruby-dev:38333]
- * lib/rake/version.rb: workaround fix to build. see #7366
- [ruby-dev:46522]
+Sat Apr 25 19:11:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 16 07:23:18 2012 Eric Hodel <drbrain@segment7.net>
+ * configure.in (ac_cv_func_daemon): use daemon(3) only on *BSD.
- * lib/rake*: Updated to rake 0.9.4
- http://rake.rubyforge.org/doc/release_notes/rake-0_9_4_rdoc.html for
- a list of changes in 0.9.4.
+ * process.c (proc_daemon): double fork to ensure not having ctty.
+ [ruby-core:23305]
- * test/rake*: ditto
+Sat Apr 25 16:19:48 2009 Tanaka Akira <akr@fsij.org>
- * NEWS: ditto
+ * time.c (month_arg): extracted from time_arg.
+ (validate_vtm): ditto.
-Fri Nov 16 06:58:52 2012 Eric Hodel <drbrain@segment7.net>
+Sat Apr 25 16:03:21 2009 Tanaka Akira <akr@fsij.org>
- * lib/rake*: Updated to rake 0.9.3. See
- http://rake.rubyforge.org/doc/release_notes/rake-0_9_3_rdoc.html for
- a list of changes in 0.9.3.
+ * time.c (TIME_COPY_GMT): new macro.
+ (time_s_at): use TIME_COPY_GMT.
+ (time_succ): ditto.
- * test/rake*: ditto
+Sat Apr 25 15:54:04 2009 Tanaka Akira <akr@fsij.org>
- * bin/rake: ditto
+ * time.c (time_mload): use TIME_SET_UTC.
- * NEWS: ditto
+Sat Apr 25 15:47:54 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 15 22:39:32 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * time.c (time_get_tm): take time_object instead of gmt.
- * range.c (range_bsearch): fix some bugs: a documentation bug, a wrong
- condition, missed break in switch/case, and workaround for GCC
- optimization. See [ruby-core:49364] in detail. A great patch from
- Heesob Park. [Bug #7352] [Feature #4766]
+Sat Apr 25 15:39:44 2009 Tanaka Akira <akr@fsij.org>
- * array.c (rb_ary_bsearch): fix similar bug (missed break).
+ * time.c (time_succ): refactored to avoid gmt variable.
+ (strftimev): use TIME_UTC_P.
+ (time_strftime): ditto.
- * test/ruby/test_range.rb: add two test cases for above.
+Sat Apr 25 15:21:33 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 15 22:41:57 2012 Koichi Sasada <ko1@atdot.net>
+ * 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.
- * vm_exec.h (GENTRY): GENTRY should be pointer size.
- A patch by yoshidam (Yoshida Masato) [Bug #7332].
+Thu Apr 23 01:30:37 2009 Akinori MUSHA <knu@iDaemons.org>
-Thu Nov 15 13:20:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * ext/zlib/zlib.c (Zlib::GzipFile#path): New method.
- * man/erb.1: Fix grammar and copyright dates
- * man/goruby.1: ditto
- * man/irb.1: ditto
- * man/rake.1: ditto
- * man/ri.1: ditto
- * man/ruby.1: ditto
- Patch by Arthur Gunn
- [Fixes Github #210]
+Wed Apr 22 20:25:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 15 11:35:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * time.c (time_timespec): check out-of-range. [ruby-core:23282]
+ [Bug #1396]
- * man/ruby.1: Grammar edits for man page
- Based on a patch by Michael Endsley [Fixes Github #183]
+Wed Apr 22 19:33:13 2009 Tanaka Akira <akr@fsij.org>
-Thu Nov 15 00:47:20 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/time.rb (Time.parse): use year completion in Date._parse.
- * array.c (rb_ary_bsearch): add Array#bsearch for binary search.
- [ruby-core:36390] [Feature #4766]
+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.
- * range.c (range_bsearch): add Range#bsearch for binary search.
- [ruby-core:36390] [Feature #4766]
+Wed Apr 15 11:53:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ruby/test_range.rb: add a test for above
+ * dir.c (fnmatch_helper): use rb_enc_precise_mbclen and
+ fail if bytes are invalid. [ruby-dev:38307]
- * NEWS: added the two new methods.
+Tue Apr 14 18:11:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 14 13:25:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * dir.c (bracket): if same in bytes, path is matching.
+ [ruby-dev:38305]
- * lib/fileutils.rb (chmod): Add "X" to modes, convert format to table
- [ruby-core:48965] [Bug #7288]
+Mon Apr 13 17:21:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 14 11:51:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * sprintf.c (rb_str_format): scan coderange incrementally.
- * lib/csv.rb (init_comments): Document private method #init_comments.
- Based on a patch from Vincent Batts [ruby-core:49172] [Bug #7319]
+Mon Apr 13 11:35:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Wed Nov 14 00:54:00 2012 Kenta Murata <mrkn@mrkn.jp>
+ * sprintf.c (rb_str_format): optimize previous commit.
+ [ruby-list:45954]
- * Makefile.in (probes.h): create from probes.d
+Mon Apr 13 10:58:54 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Nov 13 18:44:01 2012 Koichi Sasada <ko1@atdot.net>
+ * sprintf.c (rb_str_format): check encoding compatibility only on
+ real parts.
- * vm_insnhelper.c (vm_call_cfunc_with_frame): don't use ci after
- EXEC_EVENT_HOOK because ci can be overridden.
+Sun Apr 12 19:54:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_eval.c: ditto.
+ * dir.c (bracket, fnmatch_helper): compare bytewise first, to get
+ rid of invalid byte sequence. [ruby-dev:38303]
- * method.h: change invoker's parameters types.
+Sat Apr 11 08:45:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (call_cfunc_invoker_func): ditto.
+ * configure.in (Makefile): phony ruby target needs empty command.
-Tue Nov 13 18:01:54 2012 Shugo Maeda <shugo@ruby-lang.org>
+Fri Apr 10 11:32:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_mod_using): raise an ArgumentError if cyclic using is
- detected. based on the patch by Charlie Somerville.
- [ruby-core:49092] Bug #7308
+ * common.mk (up): updates timestamp file.
- * test/ruby/test_refinement.rb: related test.
+Fri Apr 10 04:54:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 13 17:40:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in (Makefile): info-program needs common.mk.
- * common.mk (vm_insnhelper.c): this target is useless and causes
- ruby always need rebuild.
+Fri Apr 10 03:46:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 13 17:35:49 2012 Koichi Sasada <ko1@atdot.net>
+ * configure.in (RUBY_INSTALL_NAME): use --program-transform-name.
- * compile.c (insn_data_to_s_detail): remove debug lines.
+ * instruby.rb, mkconfig.rb: deal with --program-transform-name
+ better. now supports s, y commands and single addressing.
-Tue Nov 13 17:28:47 2012 Koichi Sasada <ko1@atdot.net>
+Thu Apr 9 23:59:11 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (vm_caller_setup_args): save and restore
- ci->argc and ci->blockptr before and after method invocations
- because these method dispatches can override call_info.
+ * configure.in: don't override the rule for ruby.
- * bootstraptest/test_method.rb: add tests for this fix.
+Wed Apr 8 21:58:12 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Tue Nov 13 16:38:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * string.c (rb_str_dump): buffer length plus one byte for null
+ terminator. [ruby-dev:38294]
- * common.mk (dmyprobes.h): always create for make dist.
+ * test/ruby/test_m17n.rb (test_str_dump): add a test for above.
- * Makefile.in (probes.h): create or copy dmyprobes.h
+Wed Apr 8 20:08:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/Makefile.sub: only do copy dmyprobes.h.
+ * string.c (rb_str_rstrip_bang): should not sign-expand non-ascii.
+ [ruby-core:23158]
-Tue Nov 13 15:37:21 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Apr 8 17:29:29 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * Makefile.in (.SUFFIX): .SUFFIX is needed here for .d.h on bsd make.
+ * string.c (rb_str_chop_bang): reset coderange. [ruby-core:23155]
-Tue Nov 13 15:34:35 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Apr 8 14:00:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk Makefile.in win32/Makefile.sub (.d.h): it's not common.
+ * lib/mkmf.rb (what_type?): fixed typo, and refined for member of
+ aggregation types.
-Tue Nov 13 12:27:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/mkmf.rb (Logging.postpone): copy postponed output always.
- * configure.in: disable dtrace because it doesn't work on FreeBSD.
+Wed Apr 8 09:45:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (clean-local): rm probes.h.
+ * configure.in (LIBRUBY_SO): removed redundant additional version
+ numbers.
- * common.mk (parse.o): depend $(PROBES_H_INCLUDES).
+Tue Apr 7 13:35:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (.d.h): moved from Makefile.in and use BASERUBY.
+ * common.mk (info): shows configured names.
- * tool/gen_dummy_probes.rb: reimplemented with ruby because sed is not
- available on Windows Microsoft VC++ environment.
+ * configure.in (Makefile): works even if RUBY_INSTALL_NAME
+ contains macro.
-Tue Nov 13 12:30:26 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in (LIBRUBY_DLDFLAGS): compatibility version is
+ ruby_version.
- * win32/README.win32: added mention about build directory. currently
- we can not build ruby in win32 directory. this problem is reported
- by Masahiro Kitajima <katonbo@katontech.com>.
+ * configure.in (RUBY_REPLACE_TYPE): defines type modifier prefix
+ for printf.
-Tue Nov 13 11:03:47 2012 Masaki Matsushita <glass.saga@gmail.com>
+Tue Apr 7 02:27:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * re.c (rb_memsearch_ss): performance improvement by using memmem(3) if
- possible. [ruby-dev:45530] [Feature #6311]
+ * configure.in (RUBY_DEFINT): should pass includes to
+ AC_CHECK_SIZEOF and RUBY_CHECK_SIZEOF.
- * configure.in: check existence of memmem(3) and that it is not broken.
+ * configure.in (CFLAGS, CXXFLAGS): need ARCH_FLAG for universal
+ binary.
-Tue Nov 13 06:50:02 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Apr 7 01:08:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * probes.d: add DTrace probe declarations. [ruby-core:27448]
+ * numeric.c (flo_to_s): reduce fragments if no precision lost.
+ c.f. [ruby-core:23075]
- * array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
+Mon Apr 6 23:16:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * compile.c (rb_insns_name): allowing DTrace probes to access
- instruction sequence name.
+ * configure.in (CFLAGS, CXXFLAGS): override with $cflags and
+ $cxxflags if not given. [ruby-core:23130]
- * Makefile.in: translate probes.d file to appropriate header file.
+Mon Apr 6 19:26:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk: declare dependencies on the DTrace header.
+ * file.c (utime_failed): refined the error message for EINVAL on
+ DOSISH platforms, where it may fail depending on filesystems.
+ see [ruby-dev:38277].
- * configure.in: add a test for existence of DTrace.
+Mon Apr 6 16:38:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (setup_exception): add a probe for when an exception is
- raised.
+ * file.c (sys_fail2, rb_file_s_readlink, BUFCHECK, rmext),
+ (rb_file_s_basename): get rid of overflow.
- * gc.c: Add DTrace probes for mark begin and end, and sweep begin and
- end.
+Mon Apr 6 15:11:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * hash.c (empty_hash_alloc): Add a probe for hash allocation.
+ * numeric.c (int_chr): checks overflow.
- * insns.def: Add probes for function entry and return.
+Mon Apr 6 10:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * internal.h: function declaration for compile.c change.
+ * test/stringio/test_stringio.rb (test_path): StringIO#path is no
+ longer defined. [ruby-dev:38254]
- * load.c (rb_f_load): add probes for `load` entry and exit, require
- entry and exit, and wrapping search_required for load path search.
+Mon Apr 6 10:47:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * object.c (rb_obj_alloc): added a probe for general object creation.
+ * ext/stringio/stringio.c (strio_path): removed. [ruby-dev:38254]
- * parse.y (yycompile0): added a probe around parse and compile phase.
+Sun Apr 5 18:02:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (empty_str_alloc, str_new): DTrace probes for string
- allocation.
+ * include/ruby/intern.h (rb_fd_resize): does nothing on Win32.
- * test/dtrace/*: tests for DTrace probes.
+Sat Apr 4 17:05:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (vm_invoke_proc): add probes for function return on exception
- raise, hash create, and instruction sequence execution.
+ * include/ruby/intern.h (RB_NUM_COERCE_FUNCS_NEED_OPID): macro to
+ check compatibility. [ruby-dev:38162]
- * vm_core.h: add probe declarations for function entry and exit.
+Sat Apr 4 07:38:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_dump.c: add probes header file.
+ * mkconfig.rb (sitearch): default to arch.
- * vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
- function entry and return.
+Fri Apr 3 14:02:42 2009 Akinori MUSHA <knu@iDaemons.org>
- * vm_exec.c: expose instruction number to instruction name function.
+ * lib/irb/completion.rb (IRB::InputCompletor::Operators): Add
+ overloadable negative operators.
- * vm_insnhelper.c: add function entry and exit probes for cfunc
- methods.
+ * lib/irb/ruby-lex.rb (RubyLex#lex_init): Support overloadable
+ negative operators.
- * vm_insnhelper.h: vm usage information is always collected, so
- uncomment the functions.
+ * lib/irb/ruby-lex.rb (RubyLex#identify_identifier): Minus signs
+ need to be escaped in regexp character class.
-Mon Nov 12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org>
+ * misc/ruby-mode.el (ruby-font-lock-keywords, ruby-parse-partial):
+ Support overloadable negative operators.
- * configure.in (isinf, isnan): isinf() and isnan() are macros on
- DragonFly which cannot be found by AC_REPLACE_FUNCS(). This
- workaround enforces the fact that they exist on DragonFly.
+Fri Apr 3 12:45:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * ext/extmk.rb: quotes arguments with spaces always.
- * vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
- vm_insnhelper.c (vm_search_method): revert r37616 because it's too
- slow. [ruby-dev:46477]
+Thu Apr 2 14:50:06 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_refinement.rb (test_inline_method_cache): skip
- the test until the bug is fixed efficiently.
+ * lib/getoptlong.rb: remove unused rdoc/usage from example.
+ [ruby-core:23098]
-Mon Nov 12 14:28:01 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Apr 2 07:42:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/mkexports.rb (each_export): skip garbage generated by VS2012's
- nmake.
- reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
+ * win32/Makefile.sub (config.h): updated.
-Sun Nov 11 18:58:55 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Apr 1 20:37:49 2009 Tanaka Akira <akr@fsij.org>
- * test/date/test_date_{parse,strptime}.rb: changed the format of
- some extra messages.
+ * configure.in (rb_cv_fork_with_pthread): fail if the child process
+ fail.
-Sun Nov 11 18:41:34 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Apr 1 19:46:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_parse.c (date__parse): revised the tight parser
- (about handling of apostrophes).
+ * lib/mkmf.rb (create_makefile): support for parallel make. a
+ patch from Takuto Matsuu at [ruby-dev:38220].
-Sun Nov 11 15:39:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 1 19:39:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * hash.c (rb_hash_s_create): just warn for wrong elements now.
- [ruby-dev:46440] [Bug #7300]
+ * configure.in (LIBRUBY_LDSHARED): use $(CC) instead of cc.
+ a patch from Wataru Kimura at [ruby-dev:38225].
- * hash.c (rb_hash_s_create): refine error messages.
+Wed Apr 1 18:53:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * error.c (rb_builtin_class_name): share for above.
+ * vm_dump.c (rb_vm_bugreport): should not #include inside a
+ function, since headers may have declarations.
+ c.f. [ruby-core:23095]
-Sun Nov 11 15:12:18 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Apr 1 18:44:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (top_using): remove Kernel#using, and add main.using instead.
+ * mkconfig.rb: ignores version numbers in config.status. replaces
+ all $$s in program_transform_name.
- * test/ruby/test_refinement.rb: related test.
+Wed Apr 1 15:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 11 13:41:01 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * Makefile.in (.c.i): use CPP instead of CC, since gcc -E can'
+ work with multiple -arch options.
- * eval.c (rb_using_refinement, rb_mod_using, f_using): clear method
- cache only when using is called explicitly.
+Wed Apr 1 13:46:20 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_refinement.rb: related test.
+ * thread.c (rb_thread_fd_select): new function to call select
+ using rb_fdset_t.
-Sun Nov 11 12:56:34 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * io.c (select_internal): use rb_thread_fd_select instead of
+ rb_thread_select. based on the patch from Kengo Matsuyama.
+ [ruby-dev:38221]
- * lib/pstore.rb (PStore): fix not to replace ThreadError raised in
- #transaction block with PStore::Error.
- [ruby-core:39238] [Bug #5269]
+Wed Apr 1 13:16:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Nov 11 11:36:19 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * process.c (rb_f_sleep): RDoc disambiguation. [ruby-talk:332632]
- * vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo):
- add a new field for inline method cache.
+Tue Mar 31 15:17:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (vm_search_method): check rb_call_info_t::refinements
- not to confuse inline method cache when module_eval is used with
- refinements.
+ * 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].
- * test/ruby/test_refinement.rb: related test.
+Mon Mar 31 08:18:57 2009 James Edward Gray II <jeg2@ruby-lang.org>
-Sun Nov 11 08:45:45 2012 Martin Duerst <duerst@it.aoyama.ac.jp>
+ * test/csv/test_interface.rb, test/csv/test_serialization.rb:
+ Trying more fixes some failing tests on Windows.
- * ruby.c: removed a comma before "before"
+Mon Mar 30 19:04:25 2009 Tanaka Akira <akr@fsij.org>
-Sat Nov 10 23:02:31 2012 Narihiro Nakamura <authornari@gmail.com>
+ * .gdbinit (rp): show negative fixnum correctly.
- * gc.c: move immutable fields from struct heaps_slot and struct
- sorted_heaps_slot into struct heaps_header.
- Based on a patch from Sokolov Yura [Feature #6199][ruby-core:43592]
+Mon Mar 30 12:12:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 10 19:28:16 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * vm_eval.c (eval_string_with_cref): replaces the message if
+ frozen. [ruby-dev:38208]
- * complex.c: modified doc.
- * rational.c: ditto.
+Mon Mar 30 01:00:20 2009 James Edward Gray II <jeg2@ruby-lang.org>
-Sat Nov 10 18:20:10 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/csv/test_interface.rb: Trying a fix for some failing tests
+ on Windows.
- * ext/date/date_parse.c: edited about era.
+Sun Mar 29 08:59:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 10 12:13:41 2012 Kouhei Sutou <kou@cozmixng.org>
+ * lib/pathname.rb (Pathname#relative_path_from): compares path
+ components according to system default case-sensitiveness.
+ [ruby-core:22829]
- * tool/rbinstall.rb: Don't install *.gemspec under lib/.
- [ruby-core:48966] [Bug #7289]
- Reported by Vit Ondruch. Thanks!!!
+Sat Mar 28 11:10:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 10 00:49:26 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * 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> in
+ [ruby-talk:332282].
- * ruby_atomic.h: renamed from atomic.h to avoid header file name
- conflict on Solaris 10. [ruby-dev:46414] [Bug #7287]
+Sat Mar 28 08:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c, signal.c, vm_core.h, common.mk: reflect the rename from
- atomic.h to ruby_atomic.h.
+ * sprintf.c (rb_str_format): checks if named argument given twice.
-Sat Nov 10 00:46:57 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * sprintf.c (GETNAMEARG): remembers named arg is used, to get rid
+ of too many arguments warning.
- * atomic.h: Revert r37491 which is a temporary workaround.
+Sat Mar 28 03:16:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 10 00:33:31 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/mkmf.rb (link_command, cc_command, cpp_command): should no
+ override extout defined in extmk.rb.
- * siphash.h: check configure macros before include newer headers.
+Fri Mar 27 12:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 9 23:33:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (what_type?): checks more restrictively, and
+ supports universal binary.
- * lib/erb.rb (ERB#run, ERB#result): eval under isolated bindings for
- safe concurrent use. [ruby-core:47638] [Bug #7046]
+Fri Mar 27 01:33:37 2009 Tanaka Akira <akr@fsij.org>
-Fri Nov 9 23:05:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_cmp): negate the result of reverse comparison.
- * random.c (BYTE_ORDER): define using configured WORDS_BIGENDIAN.
+Fri Mar 27 01:19:50 2009 Tanaka Akira <akr@fsij.org>
- * siphash.c (sip_init_state): use union to suppress warnings by gcc
- 4.7.
+ * bignum.c (rb_cmpint): FIX2INT may fail on LP64 platforms.
-Fri Nov 9 19:40:03 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Mar 26 12:22:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (rb_ary_splice): fix r37583 doesn't consider the case when
- beg > array length.
+ * lib/yaml/rubytypes.rb (String#is_binary_data?): TAB would be
+ usually considered to be included in text data.
-Fri Nov 9 16:11:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * random.c (rb_memhash): use siphash.
+Thu Mar 26 11:33:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 9 16:08:46 2012 Sokolov Yura funny-falcon <funny.falcon@gmail.com>
+ * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): considers
+ --program-prefix and --program-suffix. reapplied r19923.
- * array.c: speedup Array#unshift by using space in shared array.
- [Feature #6638]
- - when array owns its shared array (ARY_SHARED_NUM == 1), and there
- is enough space then try unshift values directly into shared
- array.
- - when resulting array is big (~>64 items) then make it shared with
- enough room for future #unshifts, and then insert into shared
- array.
+Wed Mar 25 07:45:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (rb_ary_splice): use shared array in rb_ary_slice.
- [Feature #6638]
- - use ary_ensure_room_for_push when rb_ary_slice used to add at the
- end of array, cause rb_ary_concat use rb_ary_slice.
+ * configure.in (target_alias): replaces cpu with universal too.
- * array.c (ary_ensure_room_for_push): make array really suitable for
- queue. [Feature #6638]
- when array is shared (which happens after Array#shift), and
- ARY_SHARED_NUM == 1 (which is very often when array used as queue),
- then make rb_ary_push push directly into shared array.
+ * configure.in (target): replaces cpu with arch by --with-arch.
- * array.c (rb_ary_modify): steal shared array's container when
- ARY_SHARED_NUM == 1. [Feature #6638]
- - Do not allocate new memory in rb_ary_modify when ARY_SHARED_NUM == 1
- and length almost same.
- - Store ARY_CAPA instead of RARRAY_LEN in ary_make_shared, to make
- it useful.
- - Fix rb_ary_sort_bang accordantly.
+ * mkconfig.rb (TOPDIR): chops arch in config instead of
+ RUBY_PLATFORM which varies on universal_binary.
-Fri Nov 9 16:00:00 2012 Zachary Scott <zzak@zacharyscott.net>
+ * mkconfig.rb (MAJOR, MINOR, TEENY): reads from version.h always.
- * ext/bigdecimal/bigdecimal.c: Documentation for BigDecimal
- Based on a patch from Vincent Batts [ruby-core:49047] [Bug #7305]
+Tue Mar 24 19:23:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 9 15:25:42 2012 Akinori MUSHA <knu@iDaemons.org>
+ * configure.in (RUBY_CHECK_SIZEOF): need to include $4.
- * lib/shellwords.rb (Shellwords#shellescape): Add back my original
- real world example with some enhancement.
+Tue Mar 24 17:08:52 2009 Akinori MUSHA <knu@iDaemons.org>
- * lib/shellwords.rb (Shellwords#shelljoin): Undo part of the
- previous rdoc change. This new example using a string-only
- array was not in line with the description.
+ * 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"
-Fri Nov 9 12:58:13 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Mar 23 22:01:00 2009 Tanaka Akira <akr@fsij.org>
- * string.c (rb_str_crypt): crypt(3) may return NULL.
- Latest glibc (2.16?) crypt(3) actually returns NULL. [Bug #7312]
+ * time.c (time_timespec): use NUM2TIMET.
+ (time_s_at): ditto.
-Fri Nov 9 12:07:06 2012 Akinori MUSHA <knu@iDaemons.org>
+Mon Mar 23 21:52:26 2009 Akinori MUSHA <knu@iDaemons.org>
- * include/ruby/ruby.h (alloca), eval_intern.h (alloca), gc.c
- (alloca): Make alloca() globally available by moving the
- ultimate ifdef's to ruby/ruby.h. Gcc hides its builtin alloca()
- when compiling with -ansi, and linking thus fails on platforms
- that lack their own alloca() implementation in libc, which
- include OpenBSD and some ports of NetBSD. We use alloca()
- everywhere including from within third party C extensions, so
- alloca() must be made globally available. [Bug #7307]
+ * process.c (Init_process): Better patch for eliminating an
+ "unused variable".
- * addr2line.c (alloca): Replace the alloca() part with the
- ultimate ifdef's. [Bug #7307]
+Mon Mar 23 21:41:14 2009 Akinori MUSHA <knu@iDaemons.org>
-Fri Nov 9 09:30:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * 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)
- * io.c (IO#new):
- Fix indentation from r37444
- [ruby-core:48052] [Bug #7179]
+ * ext/sdbm/init.c (fsdbm_initialize): Ditto.
-Fri Nov 9 07:36:00 2012 Kenta Murata <mrkn@mrkn.jp>
+Mon Mar 23 19:22:14 2009 Akinori MUSHA <knu@iDaemons.org>
- * bignum.c (bigmul0): enable big_mul_toom3.
- [ruby-core:48552] [Bug #7242]
+ * file.c (rb_file_s_lstat): Back out.
- * bignum.c (bigmul1_toom3): fix incorrect calculation.
- the patch is made by Heesob Park.
- [ruby-core:48552] [Bug #7242]
+Mon Mar 23 18:54:57 2009 Akinori MUSHA <knu@iDaemons.org>
-Fri Nov 9 05:33:00 2012 Kenta Murata <mrkn@mrkn.jp>
+ * file.c (rb_file_s_stat, rb_file_s_lstat): Remove repeated type
+ checks.
- * bignum.c (bigmul0): disable big_mul_toom3 temporarily.
- [ruby-core:48552] [Bug #7242]
+Mon Mar 23 14:57:48 2009 Narihiro Nakamura <authorNari@gmail.com>
- * test/ruby/test_bignum.rb (test_mul_large_numbers):
- add a test for bigmul1_toom3 suggested in [Bug #7242].
+ * 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.
-Thu Nov 8 21:57:59 2012 Masaki Matsushita <glass.saga@gmail.com>
+Mon Mar 23 14:32:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * re.c (rb_memsearch): performance improvement by using memchr().
- [ruby-dev:45397] [Feature #6173]
+ * win32/win32.c (rb_w32_spawn): use original command if not found.
-Thu Nov 8 19:02:50 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Mar 23 06:51:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line):
- treat \r as newline as mame pointed. [ruby-dev:46425] [Bug #7278]
+ * enc/depend (link_so): replaces $(TARGET) with basename of the
+ target. [ruby-talk:330286]
-Thu Nov 8 11:32:11 2012 Akinori MUSHA <knu@iDaemons.org>
+Sun Mar 22 14:51:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (--with-opt-dir): Avoid nesting of double quotes
- inside backquotes, since some traditional shells like PD KSH
- (which OpenBSD's /bin/sh bases on) fail to parse them.
+ * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): use NULL as
+ application name for batch files.
-Thu Nov 8 09:34:00 2012 Kenta Murata <mrkn@cookpad.com>
+Sat Mar 21 15:54:41 2009 Tanaka Akira <akr@fsij.org>
- * numeric.c: Add a caution that the results of the comparing
- operations of two NaNs are undefined.
- [#1720] [ruby-dev:38725] [ruby-core:36966]
+ * 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.
-Thu Nov 8 04:45:21 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Sat Mar 21 08:19:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h: Restore rb_enumeratorize as it was before
- r37497 and introduce rb_enumeratorize_with_size instead. [#7302]
+ * process.c (rb_exec): prints error message only on platforms
+ neither close-on-exec nor spawnv is supported.
- * enumerator.c: ditto.
+Sat Mar 21 08:17:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 7 15:22:37 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): omit program name
+ if actual program path is found. [ruby-core:22960]
- * numeric.c (ruby_float_step): fix r37514: it yielded with NaN
- if the unit is infinity.
+Sat Mar 21 07:25:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 7 15:46:12 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * io.c (pipe_open): should pass program name even if multiple
+ arguments are given. fix for TestProcess::test_argv0.
- * lib/webrick.rb: fix typo. reported by Rohit Arondekar.
- https://github.com/ruby/ruby/pull/211
+Sat Mar 21 02:37:07 2009 Tanaka Akira <akr@fsij.org>
-Wed Nov 7 15:34:12 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+ * ext/openssl/lib/openssl/buffering.rb
+ (OpenSSL::Buffering#write_nonblock): new method.
- * lib/cgi/core.rb: alias CGI#http_header to CGI#header.
+ * ext/openssl/ossl_ssl.c (ossl_ssl_write_nonblock): new method.
+ (ossl_ssl_write_internal): defined.
+ (ossl_ssl_write): use ossl_ssl_write_internal.
-Wed Nov 7 12:49:39 2012 Shugo Maeda <shugo@ruby-lang.org>
+Fri Mar 20 18:25:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_mod_refine): set RMODULE_IS_REFINEMENT to a created
- refinement module, and don't override method_added.
+ * win32/win32.c (errmap): added ERROR_MOD_NOT_FOUND.
- * vm_method.c (rb_method_entry_make): check redefinition of
- optimized methods when a method is added to a refinement module.
- [ruby-core:48970] [Bug #7290]
+Fri Mar 20 09:22:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: related test.
+ * 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].
-Wed Nov 7 11:48:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 19 20:29:40 2009 Tanaka Akira <akr@fsij.org>
- * misc/ruby-additional.el (ruby-mode-set-encoding): now encoding needs
- to be set always explicitly actually. [Feature #6679]
+ * 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.
-Wed Nov 7 09:15:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c (make_errno_exc): extracted from rb_sys_fail.
+ (rb_mod_sys_fail): new function.
- * object.c (rb_mod_const_get): avoid inadvertent symbol creation.
+ * include/ruby/ruby.h (rb_mod_sys_fail): declared.
+ (rb_mWaitReadable): declared.
+ (rb_mWaitWritable): declared.
-Wed Nov 7 07:52:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * enum.c (rb_enum_cycle_size): prefix with rb.
+ * ext/socket/socket.c (sock_connect_nonblock): extend IO::WaitWritable
+ on EINPROGRESS.
-Wed Nov 7 04:32:15 2012 Luis Lavena <luislavena@gmail.com>
+ * ext/socket/ancdata.c (bsock_sendmsg_internal): extend
+ IO::WaitWritable on EWOULDBLOCK and EAGAIN.
+ (bsock_recvmsg_internal): extend IO::WaitReadable on EWOULDBLOCK and
+ EAGAIN.
- * test/ruby/test_file_exhaustive.rb: Remove FIXME skip on Windows
- specific test because the test in question was already fixed.
+ * 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.
-Wed Nov 7 03:45:12 2012 Luis Lavena <luislavena@gmail.com>
+ * ext/openssl/ossl.c (ossl_make_error): extracted from ossl_raise.
+ (ossl_exc_new): new function.
- * ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
- Patch by Daniel Berger.
+ * ext/openssl/ossl.h (ossl_exc_new): declared.
- [ruby-core:44979] [Feature #6421]
+ * lib/net/protocol.rb (rbuf_fill): rescue IO::WaitReadable and
+ IO::WaitWritable.
-Wed Nov 7 02:06:40 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ [ruby-core:22539], [ruby-dev:38140]
- * enumerator.c: New method #size; constructor accepts size.
- Have #to_enum accept a block
- Warn when using deprecated form of constructor
- Support #size for enumerators created from enumerators
- Support for lazy.{map|flat_map|...}.size.
+Thu Mar 19 18:49:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h: RETURN_SIZED_ENUMERATOR for support of
- sized enumerators.
+ * configure.in (RUBY_CHECK_SIZEOF): allows qualified name.
- * array.c: Support for various enumerator.size.
+ * configure.in (RUBY_REPLACE_TYPE): checks more strictly.
- * enum.c: ditto.
+ * configure.in (struct stat.st_size, struct stat.st_blocks),
+ (struct stat.st_ino): check for size.
- * hash.c: ditto.
+ * lib/mkmf.rb (check_sizeof): allows qualified name.
- * numeric.c: ditto.
+ * file.c (rb_stat_ino, rb_stat_blocks): check by size.
- * range.c: ditto.
+Wed Mar 18 16:59:48 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * string.c: ditto.
+ * test/test_syslog.rb (TestSyslog#test_open): check
+ param after block again. because detect not to call block.
- * struct.c: ditto.
+Wed Mar 18 16:54:04 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * vm_eval.c: ditto.
+ * ext/socket/ancdata.c: not use pktinfo.ipi_spec_dst if not defined
+ * ext/socket/extconf.rb: define HAVE_IPI_SPEC_DST
-Tue Nov 6 20:40:28 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Mar 18 16:38:11 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * object.c (rb_mod_const_get): Fix constant missing exception class
- and message to maintain backwards compatibility. Constant search
- should start at Object when constant starts with '::'
+ * test/test_syslog.rb (TestSyslog#test_open): check
+ block parameter in block. [ruby-dev:38180]
- * test/ruby/test_module.rb: test for fixes
+Wed Mar 18 12:48:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 6 16:50:00 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * error.c (report_bug): rb_bug can be caused by extension
+ libraries.
- * lib/tempfile.rb (Tempfile#inspect): fix confusing #inspect.
- previous Tempfile#inspect says it is a File, but actually
- it is not a File.
+Wed Mar 18 02:41:33 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- t = Tempfile.new("foo") #=> #<File:/tmp/foo20121106-31970-1ffbum0>
- t.is_a? File #=> false
+ * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
+ families problem. a patch from Charl Matthee at [ruby-core:21033].
- now Tempfile#inspect returns like:
+Tue Mar 17 21:42:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- t = Tempfile.new("foo")
- #=> #<Tempfile:/tmp/foo20121106-31970-1ffbum0>
+ * tool/make-snapshot (package): creates .revision.time and passes
+ CHDIR to create prerequisite files.
- [ruby-core:47544] [Bug #7027]
+Tue Mar 17 18:00:55 2009 Akinori MUSHA <knu@iDaemons.org>
-Tue Nov 6 16:22:30 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * 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]
- * atomic.h: add #include <sys/atomic.h> for the workaround of
- header file name conflict of atomic.h with /usr/include/atomic.h
- on Solaris 10. [ruby-dev:46414] [Bug #7287]
+Tue Mar 17 14:25:16 2009 Tanaka Akira <akr@fsij.org>
-Tue Nov 6 14:38:00 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/pathname.rb (Pathname#sub): set $~ in block.binding.
+ [ruby-dev:38173]
- * test/win32ole/test_win32ole.rb: now source encoding is UTF-8, so
- binary strings in old scripts are dangerous.
+Tue Mar 17 13:48:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 6 14:25:09 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * win32/Makefile.sub (config.h): added RUBY_COREDLL.
- * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line):
- don't use /n in universal regexp. [ruby-dev:46394] [Bug #7278]
+ * ext/dl/handle.c (rb_dlhandle_initialize): returns msvcrt if libc
+ or RUBY_COREDLL is given. [ruby-core:22828]
-Tue Nov 6 09:42:26 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Mar 17 10:29:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_b): Add String#b, returning a copied string
- whose encoding is ASCII-8BIT. [ruby-dev:45992] [Feature #6767]
+ * 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.
-Tue Nov 6 09:37:57 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Mar 16 17:15:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby.c (load_file_internal): set default source encoding as
- UTF-8 instead of US-ASCII. [ruby-core:46021] [Feature #6679]
+ * test/dl/test_win32.rb (Win32API): enclosed by DL::TestWin32.
+ [ruby-core:22827]
- * parse.y (parser_initialize): set default parser encoding as
- UTF-8 instead of US-ASCII.
+Mon Mar 16 16:37:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 6 05:48:06 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core),
+ (lib_watchdog_core): tv_usec is not time_t.
- * test/ruby/test_require.rb
- (TestRequire#test_require_to_path_redefined_in_load_path,
- TestRequire#test_require_to_str_redefined_in_load_path):
- Suppress method redefined warning when test-all with RUBYOPT=-w.
+Mon Mar 16 12:30:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 8 00:24:14 2012 Akinori MUSHA <knu@iDaemons.org>
+ * common.mk (REVISION_H): keeps timestamp of revision.h.
+ [ruby-core:22900]
- * ext/curses/view.rb: Do not fail if the file to view is shorter
- than the screen height.
+ * tool/ifchange, win32/ifchange.bat: extended --timestamp option.
-Mon Nov 5 11:40:00 2012 Mark Somerville <mark@scottishclmibs.com>
+Mon Mar 16 09:28:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c (rb_reserved_fd_p): fix typo in macro check
- that prevented the ifdef ever being true.
- [Bug #7281] [ruby-core:48940]
+ * Makefile.in, common.mk, win32/Makefile.sub: added preprocessing rules.
-Mon Nov 5 23:28:57 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Mar 15 12:34:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_get_path_check_to_string): extract from
- rb_get_path_check(). We change the spec not to call to_path of
- String object.
+ * test/minitest/test_mini_test.rb: fixed tests depending on the
+ detail of floating point representation.
- * file.c (rb_get_path_check_convert): extract from rb_get_path_check().
+Sun Mar 15 12:01:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_get_path_check): follow the above change.
+ * lib/rubygems/installer.rb (Gem::Installer#shebang): fix for env
+ shebang.
- * file.c (rb_file_expand_path_fast): remove check_expand_path_args().
- Instead we call it in load.c.
+Sun Mar 15 11:15:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_find_file_ext_safe): use rb_get_expanded_load_path() to
- reduce expand cost.
+ * include/ruby/ruby.h ({RSTRING,RBIGNUM}_EMBED_LEN_MAX): made int.
- * file.c (rb_find_file_safe): ditto.
+ * include/ruby/ruby.h (OBJ_{TAINTED,UNTRUSTED,FROZEN}): return int.
- * internal.h (rb_get_expanded_load_path): add a declaration.
+ * include/ruby/encoding.h (ENC_CODERANGE): ditto.
- * internal.h (rb_get_path_check_to_string, rb_get_path_check_convert):
- add declarations.
+Sun Mar 15 11:11:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (rb_construct_expanded_load_path): fix for compatibility.
- Same checks in rb_get_path_check() are added. We don't replace
- $LOAD_PATH and ensure that String object of $LOAD_PATH are frozen.
- We don't freeze non String object and expand it every time. We add
- arguments for expanding load path partially and checking if load path
- have relative paths or non String objects.
+ * string.c (rb_hash_uint, rb_hash_start, rb_hash_end): use VALUE
+ rather than unsigned int.
- * load.c (load_path_getcwd): get current working directory for checking
- if it's changed when getting load path.
+Sun Mar 15 11:00:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (rb_get_expanded_load_path): fix for rebuilding cache properly.
- We check if current working directory is changed and rebuild expanded
- load path cache. We expand paths which start with ~ (User HOME) and
- non String objects every time for compatibility. We make this
- accessible from other source files.
+ * ruby.c (load_file_internal): stop the timer thread before exec.
- * load.c (rb_feature_provided): call rb_get_path() since we changed
- rb_file_expand_path_fast() not to call it.
+Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (Init_load): initialize vm->load_path_check_cache.
+ * common.mk (.y.c): use SRC_FILE which contains slashes instead of
+ backslashes. [ruby-core:22891]
- * vm.c (rb_vm_mark): mark vm->load_path_check_cache for GC.
+Sun Mar 15 08:26:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (rb_vm_struct): add vm->load_path_check_cache to store data
- to check load path cache validity.
+ * common.mk (srcs-ext): creates ext/dl/callback/callback.c also.
- * test/ruby/test_require.rb (TestRequire): add tests for require
- compatibility related to cached expanded load path.
- [ruby-core:47970] [Bug #7158]
+Sun Mar 15 03:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 5 23:26:05 2012 Greg Price <price@mit.edu>
+ * process.c (SAVED_GROUP_ID, p_gid_switch): should be rb_gid_t.
- * load.c (rb_get_expanded_load_path): cache the expanded load
- path. This saves 4KB of allocation and some stats for every
- element of the load path (so nearly a MB in my Rails app)
- on every require.
+Sun Mar 15 02:53:13 2009 Tanaka Akira <akr@fsij.org>
- * load.c (rb_construct_expanded_load_path): ensure that $LOAD_PATH
- entries are frozen strings. The user must mutate $LOAD_PATH
- itself rather than its individual entries.
+ * 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.
- * vm_core.h (rb_vm_struct): add fields.
+ * include/ruby/intern.h (rb_reg_backref_number): declared.
- * vm.c (rb_vm_mark): mark new fields.
+ * re.c (rb_reg_backref_number): defined.
- * ruby.c (process_options): modify $LOAD_PATH directly rather than
- its elements.
- Patch by Greg Price.
- [ruby-core:47970] [Bug #7158]
+ [ruby-core:21057]
-Mon Nov 5 23:24:42 2012 Greg Price <price@mit.edu>
+Sun Mar 15 02:09:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (rb_feature_p, rb_provide_feature): index $LOADED_FEATURES
- so that require isn't so slow.
+ * proc.c (bmcall): should not uninitialized variable. a patch from
+ pegacorn at [ruby-dev:38169].
- * load.c (rb_provide_feature, get_loaded_features_index): ensure
- that $LOADED_FEATURES entries are frozen strings. The user
- must mutate $LOADED_FEATURES itself rather than its individual
- entries.
+Sat Mar 14 18:25:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (reset_loaded_features_snapshot): add a new function to reset
- vm->loaded_features_snapshot.
+ * util.c (ruby_scan_oct, ruby_scan_hex): use size_t.
- * load.c (get_loaded_features_index_raw): add a new function to get
- the loaded-features index.
+Sat Mar 14 18:18:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (features_index_add_single): add a new function to add to the
- loaded-features index a single feature.
+ * proc.c (rb_proc_call, rb_node_arity, bmcall, curry): checks
+ overflow.
- * load.c (features_index_add): add a new function to add to the
- loaded-features index all the required entries for `feature`.
+ * proc.c (rb_proc_parameters): unnamed_parameters() expects in
+ not VALUE.
- * vm_core.h (rb_vm_struct): add fields.
+Sat Mar 14 17:54:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (rb_vm_mark): mark new fields.
+ * util.c (ruby_each_words): assume no string exceeds INT_MAX.
- * include/ruby/intern.h (rb_hash_clear): declare function.
+Sat Mar 14 15:59:04 2009 Tanaka Akira <akr@fsij.org>
- * hash.c (rb_hash_clear): make function non-static.
- Patch by Greg Price.
- [ruby-core:47970] [Bug #7158]
+ * process.c (rb_spawn_internal): use int variable for status.
-Mon Nov 5 23:23:51 2012 Greg Price <price@mit.edu>
+Sat Mar 14 14:45:51 2009 Tanaka Akira <akr@fsij.org>
- * array.c (rb_ary_shared_with_p): new function.
- Expose whether two arrays are shared (read-only, C only).
+ * process.c (rb_f_system): use rb_pid_t for pid.
+ (rb_spawn_internal): local variable renamed.
- * include/ruby/intern.h (rb_ary_shared_with_p): declare.
- Patch by Greg Price.
- [ruby-core:47970] [Bug #7158]
+Sat Mar 14 14:16:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 5 23:21:14 2012 Greg Price <price@mit.edu>
+ * util.c (ruby_strdup, Balloc, rv_alloc): use size_t.
- * load.c (loaded_feature_path): clarify and briefly comment
- function. These clarifications have no effect on the behavior
- of the function.
+Sat Mar 14 13:53:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (rb_feature_p): explain the search loop. Especially
- useful because the logic is complicated as described in the
- second paragraph.
- Patch by Greg Price.
- [ruby-core:47970] [Bug #7158]
+ * util.c (ruby_qsort): the result of cmp must be signed, so ge
+ rid of reuse of a variable.
-Mon Nov 5 22:45:03 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sat Mar 14 10:56:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dl/win32/lib/Win32API.rb (Win32API#call): use 64bit pointer for x64
- Windows. This would fix
- TestSecureRandom#test_s_random_bytes_without_openssl error.
- [ruby-core:47451] [Bug #6990]
+ * dln.c (init_funcname_len, dln_find_exe_r, dln_find_file_r): use
+ size_t.
-Mon Nov 5 22:09:26 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * file.c (rb_stat_inspect, file_expand_path): ditto.
- * cygwin/GNUmakefile.in (uncommon.mk): link *.res.o.
- EXTOBJES is defined in uncommon.mk. *.res.o setting should be below
- uncommon.mk.
- [ruby-core:48858] [Bug #7277]
+ * util.c (ruby_qsort): ditto.
-Mon Nov 5 11:35:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Sat Mar 14 10:39:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c (native_thread_init, native_thread_destroy):
- removed HAVE_PTHREAD_CONDATTR_INIT check because this silly
- #ifdef makes use-uninitialized-var issue and (2) native_cond_initialize()
- already have a right platform and caller don't need any additional care.
- [Bug #6825]
+ * lib/mkmf.rb (CXX_EXT): checks for case-sensitive filesystem with
+ FNM_SYSCASE rather than build_os.
-Mon Nov 5 10:57:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Mar 13 23:03:40 2009 Tanaka Akira <akr@fsij.org>
- * lib/cgi/core.rb: check if Tempfile is defined before use it.
+ * ext/socket/init.c (wait_connectable0): remove unreachable code.
- * lib/cgi/core.rb: remove tempfiles only if tempfiles exist
+Fri Mar 13 23:00:02 2009 Tanaka Akira <akr@fsij.org>
-Mon Nov 5 12:17:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * configure.in (RUBY_CHECK_SIZEOF): pass [include] to AC_CHECK_SIZEOF.
- * lib/uri/http.rb (URI::HTTP.build): Fix example
- Patch by Carina C. Zona
- [Fixes #209 Github]
+Fri Mar 13 20:58:11 2009 Tanaka Akira <akr@fsij.org>
-Mon Nov 5 09:55:05 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+ * dln.c (dln_find_1): compare fspace in size_t world.
- * lib/cgi/core.rb: remove tempfile more early.
+Fri Mar 13 18:58:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 4 20:29:46 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+ * configure.in (CFLAGS, CXXFLAGS): moved after warnflags.
- * lib/cgi.rb, lib/cgi/*/rb: rename CGI#header to CGI#http_header,
- add and update HTML5 tag generator. [Bug #7110]
- Patch provided by Marcus Stollsteimer, thank you !
+Fri Mar 13 18:10:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 4 11:47:39 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * vm_eval.c (rb_throw_obj): inverted call flow. [ruby-core:22872]
- * lib/fileutils.rb (module FileUtils): repatch [ruby-core:39622]
- [Feature #5337]. improve performance of FileUtils.compare_stream.
- [ruby-core:47545] [Feature #7028]
+Fri Mar 13 17:04:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 4 11:27:54 2012 Masaki Matsushita <glass.saga@gmail.com>
+ * include/ruby/ruby.h (bool): not define to get rid of conflict
+ against curses.
- * array.c (recursive_equal): fix to return true when self and other
- are resized to same size and the current index become out of
- range.
+Fri Mar 13 16:45:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_array.rb: add a test for the above.
+ * ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks.
+ [ruby-core:22860]
-Sun Nov 4 10:19:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a
+ warning.
- * dir.c (file_s_fnmatch): match with expanding braces if FNM_EXTGLOB
- is set. [ruby-core:40037] [Feature #5422]
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may
+ be larger than long.
-Sat Nov 3 23:38:15 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time),
+ (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert
+ time_t.
- * complex.c: modified doc.
- * rational.c: ditto.
+Fri Mar 13 15:10:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 22:38:55 2012 Tadayoshi Funaba <tadf@dotrb.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].
- * ext/date/date_core.c: modified doc.
+Fri Mar 13 21:11:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Nov 3 18:35:55 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/sdbm/_sdbm.c: should include "ruby/defines.h" as well for
+ prototypes of compatibility functions on Win32 platform.
+ [ruby-core:22870]
- * vm.c (rb_vm_rewrite_ep_in_errinfo, vm_rewrite_ep_in_errinfo):
- merge code and remove `rb_vm_rewrite_ep_in_errinfo'.
+Fri Mar 13 10:42:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 18:15:24 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * configure.in (AC_HEADER_STDBOOL): added.
- * vm.c, proc.c: avoid unnecessary `rb_vm_rewrite_ep_in_errinfo'
- calls.
+ * 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.
-Sat Nov 3 17:53:43 2012 Kouhei Sutou <kou@cozmixng.org>
+ * gc.c (gc_stress_set), ext/openssl/ossl_asn1.c (decode_bool): go
+ rid of variables named `bool'.
- * bin/testrb: Use only Test::Unit::AutoRunner in test-unit gem
- compatible API to be available by both test/unit bundled in Ruby
- and test-unit gem.
- * lib/test/unit.rb (Test::Unit::AutoRunner): Move codes from testrb.
+Fri Mar 13 10:16:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 14:56:21 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * configure.in (struct stat.st_size): may be huge.
- * ext/date/date_parse.c (parse_eu): should capture apostrophe too.
+Fri Mar 13 09:30:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 14:46:15 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * bignum.c (bigfixize): zero length Bignum is 0.
- * ext/date/date_parse.c (date__parse): revised the tight parser.
+Fri Mar 13 09:17:12 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Nov 3 14:43:42 2012 Kouhei Sutou <kou@cozmixng.org>
+ * lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
+ argument before making regexp match. [ruby-dev:38155]
- * lib/rexml/xmldecl.rb (REXML::XMLDecl#content): Add missing \A
- and \z.
+Fri Mar 13 08:06:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 14:42:55 2012 Kouhei Sutou <kou@cozmixng.org>
+ * util.c (rv_strdup): macro to duplicate nul-terminated string.
+ [ruby-core:22852]
- * lib/rexml/output.rb (REXML::Output#initialize): Use normalized
- encoding name.
+Thu Mar 12 22:41:41 2009 Tanaka Akira <akr@fsij.org>
-Sat Nov 3 14:41:17 2012 Kouhei Sutou <kou@cozmixng.org>
+ * ext/openssl: suppress warnings.
- * lib/rexml/output.rb (REXML::Output): Don't output BOM in middle
- of the output string.
- * test/rexml/test_document.rb: Add a test for the above change.
+ * ext/openssl/ossl.h (OSSL_Debug): don't use gcc extension for
+ variadic macro.
-Sat Nov 3 14:09:55 2012 Kouhei Sutou <kou@cozmixng.org>
+Thu Mar 12 22:29:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * NEWS: Add an item about REXML::Document#write.
+ * win32/Makefile.sub (WARNFLAGS): warning 4996 is only in VC++8 or
+ later.
-Sat Nov 3 13:46:49 2012 Kouhei Sutou <kou@cozmixng.org>
+Thu Mar 12 22:14:01 2009 Tanaka Akira <akr@fsij.org>
- * test/rexml/test_document.rb: Fix tests that expect encoding name
- isn't normalized.
+ * ext/openssl/ossl_ssl.c (ossl_ssl_def_const): use INT2NUM because
+ OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG doesn't fit into Fixnum.
-Sat Nov 3 13:26:00 2012 Zachary Scott <zachary@zacharyscott.net>
+Thu Mar 12 18:16:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * dir.c (Dir#glob):
- Documentation for pattern section, backslash subsection
- Patch by Eric Bouchut
- [ruby-core:48528] [Bug #7230]
+ * 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]
-Sat Nov 3 13:26:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * marshal.c (div0), numeric.c (infinite_value): new functions to
+ get rid of VC division by 0 warnings.
- * io.c (IO#new):
- Documentation for IO#open modes and formatting
- [ruby-core:48052] [Bug #7179]
+ * st.c: use st_index_t for indexes instead of int.
-Sat Nov 3 13:01:02 2012 Kouhei Sutou <kou@cozmixng.org>
+ * vm.c (rb_vm_get_sourceline), vm_insnhelper.c (vm_throw): use
+ rb_num_t.
- * test/rexml/test_encoding.rb (EncodingTester#test_in_different_out):
- Fix a test that expects encoding in XML declaration is changed by
- Output's encoding. It is dropped feature.
+Thu Mar 12 09:30:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 12:49:45 2012 Kouhei Sutou <kou@cozmixng.org>
+ * configure.in (RUBY_CHECK_SIZEOF): if same size type is found, no
+ more calculation is needed.
- * lib/rexml/document.rb (REXML::Document#write): Document encoding
- option. Now different encoding between XML file's encoding and
- XML declaration's encoding is support.
- [Feature #4872] (work in progress)
- * lib/rexml/xmldecl.rb (REXML::XMLDecl#write): Always use XMLDecl's
- encoding.
- * test/rexml/test_document.rb: Update tests for the above change.
+ * configure.in (RUBY_DEFINT): falls back to RUBY_CHECK_SIZEOF if
+ size is not immediate.
-Sat Nov 3 12:18:35 2012 Masaki Matsushita <glass.saga@gmail.com>
+Thu Mar 12 09:24:24 2009 Tanaka Akira <akr@fsij.org>
- * array.c (recursive_equal): fix not to make invalid pointers when
- self and other are resized to same size in #== of their elements.
- [ruby-dev:46373] [Feature #6177]
+ * transcode_data.h: suppress warnings of overflow.
-Sat Nov 3 12:06:15 2012 Kouhei Sutou <kou@cozmixng.org>
+Thu Mar 12 09:15:14 2009 Tanaka Akira <akr@fsij.org>
- * test/rexml/test_xml_declaration.rb (TestXmlDeclaration#test_*):
- Remove needless prefix from test names.
+ * include/ruby/encoding.h: suppress warnings of overflow.
-Sat Nov 3 12:04:52 2012 Kouhei Sutou <kou@cozmixng.org>
+Thu Mar 12 05:49:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rexml/test_xml_declaration_parent_child.rb: Rename to ...
- * test/rexml/test_xml_declaration.rb: ... this.
+ * 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.
-Sat Nov 3 11:43:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * configure.in (RUBY_CHECK_HUGE): checks whether a value range is
+ larger than long.
- * hash.c (rb_hash_delete): Correct grammar
- Patch by Glenn Oppegard
- [Fixes #208 Github]
+ * file.c (rb_stat_blocks): struct stat.st_blocks may be larger
+ than long.
-Sat Nov 3 11:28:28 2012 Narihiro Nakamura <authornari@gmail.com>
+ * io.c (copy_stream_fallback_body): off_t may be larger than long.
- * NEWS: add a news about GC::Profiler.raw_data.
+ * iseq.c (rb_iseq_disasm): RSTRING_LEN() returns long.
-Sat Nov 3 11:01:32 2012 Narihiro Nakamura <authornari@gmail.com>
+ * process.c (rb_f_sleep): time() needs time_t.
- * NEWS: add a news about rb_newobj_of() and NEWOBJ_OF().
+ * random.c (fill_random_seed): enclosed conditionally used
+ variables.
-Sat Nov 3 10:17:41 2012 Narihiro Nakamura <authornari@gmail.com>
+ * thread_pthread.c (ruby_init_stack): range of rlim_cur may be
+ larger than int.
- * eval.c (f_current_dirname): add the new method for Kernel.
- This method almost same as File.dirname(__FILE__). One
- different behavior is it returns nil when __FILE__ returns nil.
- [Feature #3346]
+ * missing/vsnprintf.c (BSD_vfprintf): commented out code which has
+ no effect at all.
- * NEWS: ditto
+Thu Mar 12 02:10:57 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_method.rb: related test.
+ * configure.in: strip spaces from ruby_version.
+ Sun C 5.9 SunOS_i386 Build47_dlight 2007/05/22 generates
+ `ruby_version= 1 "." 9 "." 1'.
-Sat Nov 3 09:03:34 2012 Shugo Maeda <shugo@ruby-lang.org>
+Thu Mar 12 01:18:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb (test_new_method_by_send,
- test_new_method_by_method_object): add tests for Kernel#send and
- Kernel#method with refinements.
+ * dir.c (dir_seek): use long for seekdir().
- * test/ruby/test_refinement.rb (test_symbol_to_proc): add a test
- calling a proc created by Symbol#to_proc outside the scope where
- a refinement is closed over.
+Thu Mar 12 01:08:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 3 04:14:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * tool/ytab.sed: replaces backslashes with slash for nmake.
- * vm.c (rb_vm_rewrite_ep_in_errinfo): rewrite all catch points in
- errinfo, not only the topmost frame. based on the patch by
- ktsj (Kazuki Tsujimoto) in [ruby-dev:45656]. [Bug #6460]
+Wed Mar 11 21:23:06 2009 Tanaka Akira <akr@fsij.org>
-Fri Nov 2 20:11:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_mload): don't clear tm_mday.
- * lib/mkmf.rb (MakeMakefile#timestamp_file): remove @ which looks like
- configure variables.
+Wed Mar 11 20:13:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (MakeMakefile#timestamp_file): use .-. instead of !, a
- special character of NMAKE and BSD make. [Bug #7265]
+ * ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
+ name. [ruby-dev:38150]
-Fri Nov 2 17:55:39 2012 Shota Fukumori <sorah@tubusu.net>
+Wed Mar 11 17:26:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/test/unit.rb (_run_parallel): Delete status line before showing
- results. Patch by Hiroshi Shirosaki. [Bug #6897] [ruby-core:47250]
+ * ext/dl/win32/lib/Win32API.rb: call by :stdcall as default.
+ [ruby-core:22826]
- * lib/test/unit.rb (_run_parallel): Fix strange result when disabled retrying.
- Patch by Hiroshi Shirosaki. [Bug #6897] [ruby-core:47250]
+Wed Mar 11 13:27:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 2 17:52:12 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * parse.y (stack_type): uses VALUE which is able to be stored
+ parser stack.
- * object.c (rb_mod_to_s): Module#{to_s,inspect}, when invoked on
- a refinement, returns a string in the format #<refinement:C@M>,
- where C is a refined class and M is a module at which the refinement
- is defined.
+Wed Mar 11 13:22:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_mod_refine): store information on a refinement for the
- above change.
+ * win32/win32.c (init_env): set TMPDIR if none of TMPDIR, TMP,
+ TEMP is set.
- * test/ruby/test_refinement.rb: related test.
+ * win32/win32.c (rb_w32_telldir, rb_w32_seekdir): should use long,
+ as defined by SUSv3.
-Fri Nov 2 16:57:52 2012 Shota Fukumori <sorah@tubusu.net>
+Wed Mar 11 13:03:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_dump.c (rb_vm_bugreport): Because of many log directories,
- making directory lists readable.
+ * ext/dl/handle.c (rb_dlhandle_sym): fixed heap corruption.
+ [ruby-core:22822]
-Fri Nov 2 16:44:00 2012 Kenta Murata <mrkn@mrkn.jp>
+Wed Mar 11 06:12:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_dump.c (rb_vm_bugreport): add ~/Library/Logs/DiagnosticReports
- in the locations list of crash reports.
+ * ruby.c (ruby_init_loadpath_safe): expands libpath and removes
+ last /lib.
-Fri Nov 2 14:52:52 2012 Masaki Matsushita <glass.saga@gmail.com>
+Wed Mar 11 04:47:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (recursive_equal): performance improvement by avoiding
- overhead to call rb_ary_elt().
- [ruby-dev:45412] [Feature #6177]
+ * time.c (time_to_i, time_hash): time_t may be bigger than long
+ and int.
-Fri Nov 2 14:47:53 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * time.c (time_timeval, rb_time_timeval, obj2nsec, time_strftime),
+ (time_mdump, time_mload): suppress warnings.
- * string.c (sym_to_proc, sym_call): A Proc created by Symbol#to_proc
- should close over the current refinements.
- [ruby-dev:46345] [Bug #7261]
+ * win32/Makefile.sub (config.h): added TIMET2NUM and NUM2TIMET.
- * vm_eval.c (rb_call0, rb_search_method_entry,
- rb_funcall_passing_block_with_refinements): add a new argument
- `refinements' for the above changes.
+Wed Mar 11 04:29:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: related test.
+ * win32/win32.c: suppress warnings. based on a patch from Charlie
+ Savage at [ruby-core:22804].
-Fri Nov 2 08:24:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 11 04:22:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * proc.c (top_define_method): new method, main.define_method.
- [ruby-core:45715] [Feature #6609]
+ * signal.c (sig_trap): suppress warnings.
- * eval.c (top_include): fix a warning message, main is not a class or
- module.
+Tue Mar 10 20:07:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 2 04:41:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (WARNFLAGS): uses -wd4996 instead of
+ CRTDEFFLAGS. cf. [ruby-core:22725]
- * lib/mkmf.rb (MakeMakefile#timestamp_file): use ! instead of %, a GNU
- make special character.
+Tue Mar 10 19:58:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 2 04:40:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/win32.h (strcasecmp, strncasecmp): use _ prefixed
+ versions to suppress warnings.
- * test/ruby/test_process.rb (test_execopts_preserve_env_on_exec_failure):
- use never existing file in the current temporary directory.
+ * ext/dl/callback/mkcallback.rb (DLTYPE[FLOAT]): cast to suppress
+ warnings. [ruby-core:22792]
-Fri Nov 2 04:23:20 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * 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]
- * tool/merger.rb: add feature to tag preview/rc.
+Tue Mar 10 13:45:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 2 03:23:37 2012 NARUSE, Yui <naruse@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]
- * lib/mkmf.rb: fix for if config["libdir"] is nil.
+ * win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so
+ that extconf.rb could refer it. [ruby-core:22725]
-Thu Nov 1 23:06:01 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Mar 10 11:36:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/make-snapshot: fix wrong regexp for releasing preview.
- patched by mame.
+ * iseq.c (prepare_iseq_build): too few arguments to function
+ rb_ary_tmp_new().
-Thu Nov 1 22:27:11 2012 Koichi Sasada <ko1@atdot.net>
+Tue Mar 10 10:53:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * NEWS: add a news about objspace,
- ObjectSpace.reachable_objects_from.
+ * iseq.c (rb_iseq_compile_with_option): argument may be converted.
-Thu Nov 1 21:57:00 2012 Kenta Murata <mrkn@mrkn.jp>
+Tue Mar 10 04:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_new),
- test/bigdecimal/test_bigdecimal.rb:
- Fix exception message of BigDecimal constructor with a Float.
+ * configure.in (MINIRUBY): keep macro into Makefile.
-Thu Nov 1 21:52:20 2012 Kenta Murata <mrkn@mrkn.jp>
+ * configure.in (RUBY_CHECK_SIZEOF): fix for fallback.
- * ext/bigdecimal/bigdecimal.c (BigDecimal_add),
- test/bigdecimal/test_bigdecimal.rb:
- need to specify precision for converting Rational and Float.
- [ruby-core:48045] [Bug #7176]
+ * configure.in (MANGLED_PATH): defines for RUBYLIB_PREFIX.
-Thu Nov 1 21:42:20 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * ruby.c (ruby_init_loadpath_safe): uses string as buffer.
- * test/ruby/test_process.rb: Revert r37404. My ubuntu box has
- actually the directory named "/nonexistent"... Sorry.
+ * symbian/setup (config_h): defines MANGLED_PATH.
-Thu Nov 1 21:28:28 2012 Yusuke Endoh <mame@tsg.ne.jp>
+Tue Mar 10 03:48:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_process.rb: Process.exec raised EACCES on Linux
- 3.5.0-17-generic. This is a temporal fix to rescue that exception.
- Needs kosaki's review.
+ * ext/dl/callback/depend: fix for parallel build.
-Thu Nov 1 21:19:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/callback/extconf.rb: callback.h is no longer created.
- * iseq.c (set_relation): parent_iseq need to be set regardless iseq
- type. fix r37397.
+ * ext/dl/callback/mkcallback.rb: creates main source first.
-Thu Nov 1 19:47:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/callback/extconf.rb ($distcleanfiles): added callback.c.
- * thread_pthread.c (RUBY_STACK_MIN): may not a compile time constant.
- fix r37079. [ruby-dev:46322] [Bug #7247]
+Tue Mar 10 00:06:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Nov 1 16:44:36 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * configure.in (load_relative): new option to enable load path
+ relative to libruby_so.
- * NEWS: add note for Module#refine, Module#refinements,
- Module#using, and Kernel#using.
+ * ruby.c (ruby_init_loadpath_safe): added the case using dladdr().
-Thu Nov 1 14:41:47 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Mar 9 16:49:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_using_module): using should be used indirectly.
- [ruby-dev:46326] [Feature #7251]
+ * lib/rake: updated to rake code to rake-0.8.4 source code base.
-Wed Oct 31 18:17:38 2012 Narihiro Nakamura <authornari@gmail.com>
+Mon Mar 9 16:03:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (gc_profile_record): don't define unused variables when
- GC_PROFILE_MORE_DETAIL is 0.
+ * lib/rubygems/installer.rb (Gem::Installer#initialize): env may
+ not be under /usr/bin.
-Wed Oct 31 18:10:53 2012 Narihiro Nakamura <authornari@gmail.com>
+ * lib/rubygems/installer.rb (Gem::Installer#shebang): uses /bin/sh
+ if shebang has any options, since env shebang trick does no
+ work with options.
- * gc.c (gc_prof_mark_timer_stop): count is not initialized.
+Mon Mar 9 15:19:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 31 09:28:24 2012 Eric Hodel <drbrain@segment7.net>
+ * instruby.rb (manpages): use basename to compare and for Tempfile.
- * thread.c (rb_thread_call_without_gvl2): Note that ubf() may or may
- not be called with the GVL. Hinted that rb_thread_call_with_gvl()
- can be used to access ruby functionality.
+Mon Mar 9 14:55:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 31 09:06:54 2012 Eric Hodel <drbrain@segment7.net>
+ * instruby.rb (default gems): installs default gemspecs.
- * thread.c (rb_thread_call_without_gvl2): Update documentation to
- natural English.
- * thread.c (rb_thread_call_with_gvl): ditto.
+Mon Mar 9 14:48:08 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Oct 31 02:53:07 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * win32/Makefile.sub (OPTFLAGS): simplified. see [ruby-core:22725]
- * ext/dl/lib/dl/struct.rb: fix strange require order. [ruby-dev:45702]
+Mon Mar 9 14:33:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dl/lib/dl/value.rb: ditto
+ * instruby.rb: prints names of the directories where files are
+ installed to.
- * test/dl/test_c_struct_entry.rb: remove strange require order from
- tests.
+Mon Mar 9 02:25:54 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * test/dl/test_c_union_entity.rb: ditto
+ * test/ruby/test_proc.rb: add some tests.
-Tue Oct 30 23:59:32 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Mar 9 01:38:00 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * eval.c (rb_mod_refine): fix the error message when no block is
- given. [ruby-dev:46319] [Bug #7244]
+ * test/ruby/test_enum.rb: add some tests.
- * test/ruby/test_refinement.rb: related test.
+Mon Mar 9 01:12:37 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Tue Oct 30 19:27:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * test/ruby/test_object.rb: add a test for Object#method_missing.
- * process.c (redirect_dup2): set standard handles when new fd is stdio,
- because if there is no allocated console at the moment Windows does
- not automatically associate it for child process's standard handle.
- this is adhoc workaround.
- reported by Martin Thiede at [ruby-core:48542] [Bug #7239].
+Mon Mar 9 01:11:17 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * io.c (rb_cloexec_dup2): ditto.
+ * test/ruby/test_file_exhaustive.rb: add tests for File#size and
+ File.absolute_path.
-Tue Oct 30 03:08:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 8 23:02:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rbconfig/obsolete.rb (Config): re-introduce warnings for a
- lame-duck. [ruby-core:46836] [Bug #6809]
+ * win32/Makefile.sub (LDFLAGS): always prepends -link.
-Tue Oct 30 02:20:10 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Mar 8 11:39:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c: added Thread#thread_variable_(get|set),
- Thread#thread_variable?, and Thread#thread_variables for operating
- on variables that are local to threads. [ruby-core:47790]
+ * configure.in (RUBY_CHECK_SIZEOF): dirty hack to compute multiple
+ sizeof, for apple's universal binary.
- * vm.c: ditto
+Sat Mar 7 22:06:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_thread.rb: tests for thread variables.
+ * configure.in (universal_binary): checks if sizes are same on all
+ architectures.
-Mon Oct 29 18:22:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Mar 7 18:45:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/stringio/stringio.c (strio_close): close separately per each
- instances, as well as IO.
+ * configure.in: checks if cd really succeeded.
-Mon Oct 29 10:22:00 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Mar 7 14:24:47 2009 Tanaka Akira <akr@fsij.org>
- * ext/psych/lib/psych/handlers/recorder.rb: added a class for
- recording YAML parse and emit events.
+ * configure.in: don't use CONFIG_SHELL for testing shell feature in
+ Makefile.
- * ext/psych/lib/psych/handler.rb: adding a list of events so that
- handler classes can more easily be meta-programmed.
+Sat Mar 7 14:07:31 2009 Tanaka Akira <akr@fsij.org>
- * test/psych/handlers/test_recorder.rb: tests for the change.
+ * configure.in: fix the location of cdcmd.
-Mon Oct 29 05:48:52 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Sat Mar 7 13:52:01 2009 Tanaka Akira <akr@fsij.org>
- * lib/ostruct.rb: Add [] and []=, base on a patch by Thomas Sawyer.
- Also accept {Open}Struct as argument to new.
- Add #eql?, #hash & #each_pair
- Protect new_ostruct_member
+ * configure.in: the shell which runs configure may be different from
+ the shell for make. configure likes bash but Makefile specifies
+ SHELL=/bin/sh.
-Mon Oct 29 03:20:58 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Sat Mar 7 12:31:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/matrix.rb: Fix determinant_e [ruby-dev:46305] [Bug #7228]
+ * test/erb/test_erb.rb: reverted space sensitive test results.
-Sun Oct 28 23:52:25 2012 Kouhei Sutou <kou@cozmixng.org>
+ * test/rdoc/test_rdoc_parser_c.rb: ditto.
- * test/rexml/test_document.rb: Add tests for parsing XML encoded
- by UTF-8 with BOM.
+ * test/rdoc/test_rdoc_ri_default_display.rb: ditto.
-Sun Oct 28 23:47:09 2012 Kouhei Sutou <kou@cozmixng.org>
+Fri Mar 6 23:35:59 2009 Tanaka Akira <akr@fsij.org>
- * lib/rexml/source.rb: Move encoding detection code to base class.
- * lib/rexml/encoding.rb: Remove needless encoding detection code.
+ * lib/securerandom.rb (SecureRandom.urlsafe_base64): add optional
+ argument to add padding.
-Sun Oct 28 21:40:13 2012 Kouhei Sutou <kou@cozmixng.org>
+Fri Mar 6 19:25:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rexml/parsers/baseparser.rb: Fix a bug that UTF-8 is used
- for UTF-16XX encoded XML that doesn't have encoding="UTF-16" in
- XML declaration.
- * test/rexml/test_document.rb: Add tests for the above change.
+ * configure.in (RUBY_LIB_VERSION_STYLE): sets full or minor style
+ not to show RUBY_VERSION_MAJOR and so on.
-Sun Oct 28 21:37:34 2012 Kouhei Sutou <kou@cozmixng.org>
+ * version.h (RUBY_LIB_VERSION): makes from RUBY_LIB_VERSION_STYLE.
- * test/rexml/test_document.rb: Group tests that they parse
- UTF-16XX encoded XML that has encoding="UTF-16" in XML declaration.
+ * configure.in, Makefile.in, win32/Makefile.sub (CHDIR): cd using
+ physical directory.
-Sun Oct 28 21:25:11 2012 Kouhei Sutou <kou@cozmixng.org>
+ * Makefile.in (update-mspec): split from update-rubyspec.
- * lib/rexml/source.rb (REXML::IOSource#initialize): Reduce
- @line_break initialize code. It should be done only in #encoding=.
- * lib/rexml/parsers/baseparser.rb: Don't set UTF-16 encoding to
- source by encoding="UTF-16" in XML declaration because UTF-16XX
- source encoding should be set in Source#initialize or
- IOSource#initialize. They should handle BOM. Parser should not
- consider about it.
+ * win32/Makefile.sub (update-{rubyspec,mspec}): added.
-Sun Oct 28 21:18:37 2012 Kouhei Sutou <kou@cozmixng.org>
+Fri Mar 6 14:28:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rexml/test_document.rb: Add tests for parsing XML encoded
- by UTF-16 with BOM.
+ * Makefile.in, win32/Makefile.sub (INSNS): moved variable
+ definition before rule.
-Sun Oct 28 19:12:11 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Fri Mar 6 13:47:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_parse.c (iso8601_{ext,bas}_time): should not match
- empty string.
+ * lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with
+ escaped spaces. incorporated from rake 0.8.4.
-Sun Oct 28 18:51:33 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * lib/rake/testtask.rb (Rake::TestTask#define): passes each libs
+ as each arguments with expanded. incorporated from rake 0.8.4.
- * ext/date/date_parse.c (date__parse): revised the tight parser.
+Thu Mar 5 18:36:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 28 15:41:50 2012 Kouhei Sutou <kou@cozmixng.org>
+ * numeric.c (flo_to_s): keeps enough precision for round trip.
+ [ruby-core:22325]
- * lib/rexml/document.rb (REXML::Document#write): Add :encoding option
- to support custom XML encoding.
- [Feature #4872] (work in progress)
- * test/rexml/test_document.rb: Add tests for the above change.
+Thu Mar 5 17:42:06 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Oct 28 15:00:19 2012 Kouhei Sutou <kou@cozmixng.org>
+ * array.c (rb_ary_fill): doc for Array#fill misses indication
+ about negative value for the start argument. [ruby-core:22497]
- * lib/rexml/document.rb (REXML::Document#write): Remove needless
- indent in document.
+Thu Mar 5 16:56:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 28 14:59:14 2012 Kouhei Sutou <kou@cozmixng.org>
+ * lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
+ non-existent directory.
- * lib/rexml/document.rb (REXML::Document#write): Accept options
- Hash as argument.
- * test/rexml/test_document.rb: Add tests for the above change.
+Thu Mar 5 14:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 28 14:09:44 2012 Kouhei Sutou <kou@cozmixng.org>
+ * win32/win32.c (rb_w32_sysinit): initializes version info first.
- * lib/rexml/document.rb (REXML::Document#write): Fix wrong usage
- in document.
+ * win32/win32.c (rb_w32_osid): always define for binary compatibility.
-Sun Oct 28 14:03:48 2012 Kouhei Sutou <kou@cozmixng.org>
+Thu Mar 5 11:52:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/rexml/document.rb (REXML::Document#write): Fix wrong method
- names in document.
+ * win32/Makefile.sub (make_insns_rules): rule to make rules for insns.
-Sun Oct 28 10:12:15 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Thu Mar 5 11:27:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/visitors/yaml_tree.rb: `tree` should return the
- same thing on every call.
+ * win32/Makefile.sub (miniruby.exe): workaround for a failure of
+ mt.exe on Windows 7 beta. [ruby-talk:330284]
- * test/psych/visitors/test_yaml_tree.rb: related test.
+Thu Mar 5 10:32:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Oct 28 10:05:03 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * test/dl/test_base.rb: Add dragonfly to libc and libm switch.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: YAML Tree object should
- be able to take an emitter object as it's output.
+Thu Mar 5 10:29:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/psych/visitors/test_yaml_tree.rb: related test.
+ * string.c (str_eql): extracted from rb_str_equal and rb_str_eql.
-Sun Oct 28 08:23:16 2012 Koichi Sasada <ko1@atdot.net>
+ * string.c (rb_str_chomp_bang): keeps 7bit coderange.
- * bignum.c (bignew_1): Bignum instances are frozen.
- Feature #3222
+Thu Mar 5 10:10:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/ruby.h: Fixnum instances are also frozen.
+ * include/ruby/encoding.h (enc_initialized_p): ENC_UNINITIALIZED
+ is not defined already.
- * class.c (singleton_class_of): check Bignum before
- singleton checking.
+ * include/ruby/encoding.h (ENC_FROM_ENCINDEX): removed because
+ depending on a static variable.
- * test/ruby/test_bignum.rb: add a test.
+Thu Mar 5 04:42:52 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * test/ruby/test_fixnum.rb: ditto.
+ * test/ruby/test_array.rb: fix wrong test, and add a test for
+ sort_by!.
- * test/ruby/marshaltestlib.rb, test/ruby/test_eval.rb,
- test/ruby/test_object.rb: catch up above changes.
+Thu Mar 5 04:32:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Sun Oct 28 04:38:06 2012 Koichi Sasada <ko1@atdot.net>
+ * test/ruby/test_array.rb: add some tests for coverage.
- * vm.c (vm_define_method): remove type and frozen checking.
- Checking is done in `rb_singleton_class()'.
+Thu Mar 5 00:06:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 28 00:49:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/README.win32 (Requirement): added unicows.lib and dll.
- * parse.y (assign_in_cond): warn for static content object assignments
- in conditional statements. [ruby-dev:43083] [Feature #4299]
+Wed Mar 4 23:29:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Oct 27 23:33:41 2012 Benoit Daloze <eregontp@gmail.com>
+ * configure.in, win32/configure.bat (--enable-win95): new option
+ to enable/disable win95 support.
- * gc.c (gc_profile_result, gc_profile_report): use internal structures
- to avoid allocations and progressively print the output for #report.
- [ruby-core:47163] [Bug #6865]
+Wed Mar 4 21:21:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Oct 27 11:01:10 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/thread.rb (SizedQueue#push): fix limit condition.
+ [ruby-dev:38135]
- * numeric.c (rb_float_new_in_heap), include/ruby/ruby.h:
- make all Float objects frozen.
- [ruby-dev:46081] [ruby-trunk - Feature #6936]
- Most part of patch by NARUSE, Yui <naruse@ruby-lang.org>.
+Wed Mar 4 20:27:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * class.c (singleton_class_of): raise TypeError when
- trying to define a singleton method on Float objects.
+ * configure.in (mingw): checks if unicows.lib is available.
- * vm.c (vm_define_method): ditto.
+ * include/ruby/win32.h (WIN95): moved to config.h
- * test/ruby/marshaltestlib.rb: catch up above changes.
+ * win32/Makefile.sub (LIBS): links unicows.lib if available.
- * test/ruby/test_class.rb: ditto.
+ * win32/Makefile.sub (config.h): defines WIN95 only if unicows.lib
+ is available.
- * test/test_pp.rb: ditto.
+ * win32/setup.mak (-unicows-): checks if unicows.lib is available.
-Sat Oct 27 10:50:53 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Mar 3 17:10:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * object.c (rb_mod_const_get): make sure the constant name is
- converted to a string before searching. [ruby-core:48405]
+ * ext/extmk.rb (extmake): removes object files no longer used and
+ files to be removed by old distclean.
-Sat Oct 27 10:12:13 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+Tue Mar 3 16:51:51 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * iseq.c (rb_iseq_compile_with_option): Instead of testing
- respond_to, just check if the argument is actually a file,
- because by calling user-defined gets something weired can
- happen. Patch by Glass_saga. [ruby-dev:40202] [Bug #2861]
+ * ext/dl/win32/lib/win32/resolv.rb: get rid of warning.
- * parse.y (ripper_initialize): ditto.
+ * ext/dl/lib/dl/func.rb: ditto.
-Sat Oct 27 10:07:57 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 3 16:25:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (enum lex_state_e): [EXPERIMENTAL] lex_state as bit field /
- IS_lex_state() macro. based on the patch by Dave B in
- [ruby-core:23503]. [Feature #1493]
+ * ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
+ $srcs are always Array or nil now.
-Sat Oct 27 10:05:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 3 15:54:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * include/ruby/win32.h (fstat): use _fstati64() instead of fstati64()
- on mingw32.
+ * ext/dl/win32/lib/win32/{registry,resolv}.rb: use dl/import instead
+ of Win32API.
-Sat Oct 27 06:28:33 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Mar 3 15:53:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * object.c (rb_mod_const_get): const_get accepts qualified constant
- strings. e.g. Object.const_get("Foo::Bar::Baz") [ruby-core:41404]
+ * ext/dl/lib/dl/func.rb (DL::Function.name): delegate to @cfunc.
- * test/ruby/test_module.rb: tests for new behavior
+Tue Mar 3 15:40:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Oct 26 13:24:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/dl.c (rb_dl_init_callbacks): autoloads callbacks.
- * parse.y (literal_concat_gen): merge fixed strings across
- concatenated literals, after an interpolation.
+ * ext/dl/callback: split from dl.
-Thu Oct 25 17:48:54 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/dl/lib/dl/cparser.rb (DL::CParser::parse_signature): fixed
+ variable name.
- * win32/win32.c (has_redirection): should use shell (cmd.exe) when
- the commandline contains '&'.
- reported by Roger Pack at [ruby-core:47912] [Bug #7143], and
- patched by Heesob Park at [ruby-core:47931].
+ * ext/dl/lib/dl/pack.rb (DL::PackInfo): reduced redundant
+ initialization.
-Thu Oct 25 15:00:08 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/dl/lib/dl/stack.rb (DL::Stack): ditto.
- * include/ruby/ruby.h, class.c: remove (revert)
- `rb_add_method_cfunc_frameless()' API.
- This API is not mature to become an official API.
- For example, we can not use this API with
- `rb_define_private_method()'.
+ * ext/dl/lib/dl/value.rb (DL::ValueUtil#wrap_arg): NULL for nil.
- * method.h, vm_method.c (rb_add_method_cfunc_frameless): removed.
+ * test/dl: moved from ext/dl/test.
-Thu Oct 25 13:35:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Mar 3 14:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/mkconfig.rb: remove string literal concatenation.
+ * common.mk (main): passes $(MAKE) to mkmain_cmd
-Wed Oct 24 18:49:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/extmk.rb (command_output): uses arguments to invoke make.
- * ext/objspace/objspace.c (type2sym, count_objects_size): use enum
- instead of size_t which may be larger than actual values.
+Tue Mar 3 01:56:03 2009 Tanaka Akira <akr@fsij.org>
-Wed Oct 24 17:41:24 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/securerandom.rb (SecureRandom.urlsafe_base64): delete padding.
- * benchmark/driver.rb: add `-x' or `--exclude' option
- to specify exclude benchmark name pattern.
- You can specify "-x foo" if you want to exclude the benchmarks
- if the name of benchmark contains `foo'.
+Mon Mar 2 21:39:08 2009 Tanaka Akira <akr@fsij.org>
-Wed Oct 24 11:57:24 2012 Narihiro Nakamura <authornari@gmail.com>
+ * ext/socket/sockport.h (SS_LEN): defined unconditionally.
- * gc.c (gc_prepare_free_objects): rename to match the behavior of
- this function.
+Mon Mar 2 21:26:42 2009 Tanaka Akira <akr@fsij.org>
-Wed Oct 24 11:55:19 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/ancdata.c (anc_inspect_socket_creds): suppress warnings.
- * ext/objspace/objspace.c (reachable_object_from_i): change data
- structure of the result of reachable objects. Keys of table
- contains object_id of each reachable objects. Value of table
- is an object itself or an instance of InternalObjectWrapper.
- To avoid duplication, we use st_table and object_id keys.
+Mon Mar 2 21:13:42 2009 Tanaka Akira <akr@fsij.org>
- * ext/objspace/objspace.c (type2sym): bug fix.
- Should use `i' instead of `type'.
+ * ext/socket/ancdata.c (rsock_discard_cmsg_resource): defined
+ unconditionally.
-Wed Oct 24 10:33:09 2012 Koichi Sasada <ko1@atdot.net>
+Mon Mar 2 21:06:40 2009 Tanaka Akira <akr@fsij.org>
- * gc.c (garbage_collect, gc_marks): move the location of
- clear and restore rb_objspace_t::mark_func_data
- from garbage_collect() to gc_marks().
+ * ext/socket/raddrinfo.c (addrinfo_mload): don't use "sun" variable
+ for Solaris.
-Wed Oct 24 10:17:45 2012 Koichi Sasada <ko1@atdot.net>
+Mon Mar 2 21:01:36 2009 Tanaka Akira <akr@fsij.org>
- * ext/objspace/objspace.c (Init_objspace): add a new method
- `ObjectSpace::InternalObjectWrapper#internal_object_id' which returns
- an object id of a wrapped internal object.
+ * file.c: include fcntl.h for O_RDONLY on Solaris.
-Wed Oct 24 08:55:04 2012 Koichi Sasada <ko1@atdot.net>
+Mon Mar 2 19:43:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/objspace/objspace.c (ObjectSpace.reachable_objects_from):
- internal object support.
- If given object `obj' has references to internal objects
- (such as T_NODE objects), then this method returns instances of
- `ObjectSpace::InternalObjectWrapper' instead of that internal objects.
- This instance contains a reference to an internal object and you can
- check the type of internal object using
- `ObjectSpace::InternalObjectWrapper#type' method.
- Rdoc of `InternalObjectWrapper' is not prepared yet.
+ * lib/uri/common.rb (URI::Parser#escape): escaped string is ascii
+ only.
- * gc.c (rb_objspace_reachable_objects_from), gc.h: change
- an interface of 'rb_objspace_reachable_objects_from()'
+ * lib/uri/common.rb (URI::Parser#unescape): converts bytewise.
+ [ruby-dev:38005], [ruby-dev:38110]
- * gc.c, gc.h: add two APIs
- - rb_objspace_markable_object_p(obj): check markable or not.
- - rb_objspace_internal_object_p(obj): check internal or not.
+Mon Mar 2 16:40:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 24 05:52:36 2012 Koichi Sasada <ko1@atdot.net>
+ * README.EXT, README.EXT.ja (Macros): added HAVE_RUBY_*_H.
- * vm_insnhelper.c (vm_call_method): remove `default' and
- add a case for `VM_METHOD_TYPE_UNDEF'.
+Mon Mar 2 12:22:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 24 05:41:18 2012 Koichi Sasada <ko1@atdot.net>
+ * win32/win32.c (init_env): keeps wide chars as wide chars.
- * eval_error.c (error_print), vm_eval.c (eval_string_with_cref),
- vm_trace.c (rb_suppress_tracing): use TH_PUSH_TAG() instead of
- PUSH_TAG().
+Mon Mar 2 11:01:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 24 05:17:52 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/dl/dl.h (dlerror): fixed on Windows.
- * vm_eval.c (vm_call0_body): remove RUBY_VM_CHECK_INTS()
- after method invocation using rb_call0().
+ * ext/dl/handle.c (rb_dlhandle_initialize): returns handle to
+ libruby if nil is given on Windows as dlopen.
- * vm_eval.c (vm_call0_body): remove default section on top of
- switch statement and add cases for `VM_METHOD_TYPE_CFUNC_FRAMELESS'
- and `VM_METHOD_TYPE_UNDEF'.
+ * ext/dl/handle.c (rb_dlhandle_sym): get rid of buffer overrun,
+ and try ASCII WINAPI versions too.
- * vm_eval.c (vm_call0_body): remove useless brackets.
+Mon Mar 2 10:29:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 23 22:34:49 2012 Koichi Sasada <ko1@atdot.net>
+ * eval.c (rb_longjmp), include/ruby/intern.h (ruby_cleanup): fixed
+ prototypes.
- * thread.c (thread_raise_m): check interrupts after Thread#raise
- if a target thread is the current thread because the behavior
- of Thread.current.raise is expected to perform same as
- Kernel.raise (by rubyspec).
+Mon Mar 2 00:56:45 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Oct 23 17:08:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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].
- * ruby.c (usage, process_options): show more info in --help.
- [EXPERIMENTAL] [ruby-core:48072] [Bug #7184]
+Sun Mar 1 22:59:41 2009 Tanaka Akira <akr@fsij.org>
-Tue Oct 23 14:20:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/raddrinfo.c: suppress warnings.
- * misc/ruby-electric.el using variable `last-command-event' instead of
- obsolete `last-command-char', so that work with Emacs trunk.
- a patch by Victor Deryagin <vderyagin AT gmail.com>.
+ * ext/socket/socket.c: ditto.
-Tue Oct 23 14:06:47 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/unixsocket.c: ditto.
- * configure.in (visibility_option): visibility attribute is not
- available before GCC 4, so do not use -fvisibility option in that
- case. [ruby-core:48147] [Bug #7205]
+Sun Mar 1 20:57:41 2009 Tanaka Akira <akr@fsij.org>
-Tue Oct 23 12:57:29 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily.
- * vm_core.h, vm_insnhelper.c, vm_eval.c (OPT_CALL_CFUNC_WITHOUT_FRAME):
- add a new optimization and its macro `OPT_CALL_CFUNC_WITHOUT_FRAME'.
- This optimization makes all cfunc method calls `frameless', which
- is faster than ordinal cfunc method call.
- If `frame' is needed (for example, it calls another method with
- `rb_funcall()'), then build a frame. In other words, this
- optimization delays frame building.
- However, to delay the frame building, we need additional overheads:
- (1) Store the last call information.
- (2) Check the delayed frame building before the frame is needed.
- (3) Overhead to build a delayed frame.
- rb_thread_t::passed_ci is storage of delayed cfunc call information.
- (1) is lightweight because it is only 1 assignment to `passed_ci'.
- To achieve (2), we modify GET_THREAD() to check `passed_ci' every
- time. It causes 10% overhead on my environment.
- This optimization only works for cfunc methods which do not need
- their `frame'.
- After evaluation on my environment, this optimization does not
- effective every time. Because of this evaluation results, this
- optimization is disabled at default.
+Sun Mar 1 19:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c, vm.c: add VM_PROFILE* macros to measure behaviour
- of VM internals. I will extend this feature.
+ * ext/dl/win32/lib/Win32API.rb (initialize): passes res
+ arguments to DL.
- * vm_method.c, method.h: change parameters of the `invoker' function.
- Receive `func' pointer as the first parameter.
+Sun Mar 1 19:38:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 23 06:21:05 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/zlib/zlib.c (zstream_run): suppress a warning. a patch from
+ Charlie Savage at [ruby-core:22607].
- * ext/psych/parser.c: just get the constant defined in Ruby.
+Sun Mar 1 19:36:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/syntax_error.rb: Psych::SyntaxError now inherits
- from StandardError rather than SyntaxError. Thanks Eric Hodel!
+ * util.c (ruby_dtoa): allocates one more byte to get rid of buffer
+ overrun. a patch from Charlie Savage at [ruby-core:22604].
- * test/psych/test_exception.rb: tests for change.
+Sun Mar 1 19:10:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 23 06:17:36 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * common.mk (.y.c): removed extra backslash. [ruby-core:22602]
- * ext/psych/lib/psych/scalar_scanner.rb: Cache symbols while
- tokenizing. Thanks Kevin Menard!
+Sun Mar 1 19:02:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 23 06:15:40 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/dl/cfunc.c (rb_dlcfunc_call): fix for stdcall and missing
+ argument numbers. [ruby-core:22601]
- * ext/psych/lib/psych/scalar_scanner.rb: Updated the RegExp to catch
- Strings earlier in the tokenization process. Thanks Kevin Menard!
+ * ext/dl/dl.h (DLSTACK_PROTO0_): added.
-Tue Oct 23 06:12:39 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/dl/mkcallback.rb (gencallback, gen_callback_file),
+ (rb_dl_init_callbacks): omit stdcall functions unless supported.
- * ext/psych/lib/psych/visitors/to_ruby.rb: Handle nil tags specially
- to avoid slow method_missing calls. Thanks Kevin Menard!
+ * lib/rubygems/config_file.rb (SHGetFolderPath): stdcall.
-Tue Oct 23 06:07:57 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Mar 1 17:27:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/scalar_scanner.rb: Ignore bad timestamps. If
- something looks like a timestamp but has an invalid component, treat
- it as a string instead of throwing an ArgumentError.
- Thanks Rhett Sutphin!
+ * ext/bigdecimal/bigdecimal.c (gfDebug): uncommented out.
+ [ruby-core:22600]
- * test/psych/test_scalar_scanner.rb: appropriate tests.
+Sun Mar 1 16:15:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 23 06:04:07 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * process.c (rb_waitpid): use wait_each() on no waitpid platforms.
+ [ruby-dev:38054]
- * ext/psych/lib/psych/scalar_scanner.rb: Fix scalar_scanner to
- understand strings starting with an underscore and containing only
- digits. Thanks Kelley Reynolds.
+Sun Mar 1 16:01:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/psych/test_scalar_scanner.rb: test for fix
+ * process.c (proc_daemon): stops and restarts timer thread because
+ daemon(3) implies fork(2). [ruby-dev:38055]
-Tue Oct 23 06:00:41 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Mar 1 15:45:49 2009 Tanaka Akira <akr@fsij.org>
- * ext/psych/lib/psych.rb: Changed comment in psych.rb to update new
- home page for libyaml. Thanks to Carolyn Ann.
+ * 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.
-Sun Oct 21 19:12:59 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/socket/socket.c (sock_listen): make it static.
- * vm_core.h (rb_vm_t::trace_running): add a new field
- `trace_running' to store vm global tracing status.
+Sun Mar 1 15:29:31 2009 Tanaka Akira <akr@fsij.org>
- * vm_trace.c: fix SEGV bug. event_hook was free'd
- even when the hook is still used in another thread.
- [ruby-dev:46141] [Bug #7032]
+ * ext/socket: add rsock_ prefix.
-Sun Oct 21 19:12:42 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+Sat Feb 28 21:52:37 2009 Tanaka Akira <akr@fsij.org>
- * vm_core.h (rb_vm_t::trace_flag): remove `trace_flag'
- which is no longer used.
+ * vm_eval.c (rb_iterate): use volatile to suppress warnings.
-Sun Oct 21 18:34:27 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * eval.c (ruby_cleanup): ditto.
- * ext/date/date_parse.c (date__parse): uses more tight parser if
- defined TIGHT_PARSER. now inactivated; because it introduces
- incompatibilities and it is a bit slow.
+Sat Feb 28 20:09:40 2009 Tanaka Akira <akr@fsij.org>
-Sat Oct 20 15:35:06 2012 Narihiro Nakamura <authornari@gmail.com>
+ * eval_error.c (error_print): use volatile to suppress warnings.
- * include/ruby/ruby.h: add C APIs.
- VALUE rb_newobj_of(VALUE klass, VALUE flags)
- #define NEWOBJ_OF(obj,type,klass,flags)
- These allow to change a allocation strategy depending on klass
- or flags.
+ * vm_eval.c (eval_string_with_cref): ditto.
- * gc.c: ditto
+ * thread.c (rb_exec_recursive): ditto.
- * array.c: use new C API.
- * bignum.c: ditto
- * class.c: ditto
- * complex.c: ditto
- * ext/socket/ancdata.c: ditto
- * ext/socket/option.c: ditto
- * hash.c: ditto
- * io.c: ditto
- * marshal.c: ditto
- * numeric.c: ditto
- * object.c: ditto
- * random.c: ditto
- * range.c: ditto
- * rational.c: ditto
- * re.c: ditto
- * string.c: ditto
- * struct.c: ditto
- [Feature #7177][Feature #7047]
+ * eval_jump.c (rb_exec_end_proc): ditto.
-Sat Oct 20 12:50:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * eval.c (ruby_exec_node): ditto.
+ (rb_longjmp): ditto.
- * ext/socket/socket.c: Documentation for Socket
- Based on a patch by David Albert
- [Bug #7105] [ruby-core:47828]
+Sat Feb 28 18:28:58 2009 Tanaka Akira <akr@fsij.org>
-Sat Oct 20 11:00:00 2012 Zachary Scott <zachary@zacharyscott.net>
+ * ext/socket/ancdata.c (ancillary_unix_rights): check message type.
- * lib/open-uri.rb: Documentation for OpenURI
+Sat Feb 28 16:18:39 2009 Tanaka Akira <akr@fsij.org>
-Sat Oct 20 06:18:34 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/net/http.rb: suppress warnings of non-existing instance variable
+ access for SSL.
- * hash.c (initialize_copy): unset the default proc if there isn't one
- for the target hash, call to_hash, check frozen status.
+Sat Feb 28 14:50:47 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 19 22:22:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.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.
- * vm.c (rb_vm_jump_tag_but_local_jump): pass through thrown objects.
- [ruby-dev:46234] [Bug #7185]
+Sat Feb 28 00:18:40 2009 Tanaka Akira <akr@fsij.org>
- * vm_eval.c (rb_eval_cmd): if state is non-zero, val should be nil and
- rb_vm_jump_tag_but_local_jump() just jump tag.
+ * 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.
-Fri Oct 19 22:11:55 2012 Benoit Daloze <eregontp@gmail.com>
+ * ext/socket/socket.c: ditto.
- * pack.c (pack_unpack): set encoding of the
- 'H','h','B' and 'B' modifiers to US-ASCII.
+ * ext/socket/unixsocket.c: ditto.
- * test/ruby/test_pack.rb: tests for the above.
- [ruby-core:47653][Bug #7050]
+ * ext/socket/sockport.h (SS_LEN): defined.
+ (SET_SS_LEN): ditto.
- * test/test_securerandom.rb: tests for SecureRandom.hex
- from tenderlove. [ruby-core:46792][Bug #6799]
+Fri Feb 27 22:30:18 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 19 19:29:11 2012 Koichi Sasada <ko1@atdot.net>
+ * 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.
- * method.h (rb_method_cfunc_t::invoker): add new field (func ptr)
- `invoker'. `invoker' function invoke cfunc body
- (rb_method_cfunc_t::func).
- `invoker' is set at method definition timing.
- With this change, the big `switch' (branch) in `call_cfunc()'
- is no longer needed.
- However, the performance benefit is only a bit.
+Fri Feb 27 22:14:22 2009 Tanaka Akira <akr@fsij.org>
- * vm_core.h (rb_call_info_t::aux::func): add a new field to store
- cfunc body function pointer.
+ * ext/openssl/lib/openssl/buffering.rb: define Buffering module under
+ OpenSSL. [ruby-dev:37906]
- * vm_method.c (call_cfunc_invoker_func): add a new function which
- returns a suitable invoke function.
+Fri Feb 27 22:09:24 2009 Tanaka Akira <akr@fsij.org>
- * vm_method.c (setup_method_cfunc_struct): added.
+ * lib/test/unit/assertions.rb: don't define assert_not_* if already
+ overridden.
- * vm_method.c (rb_add_method): fix to set `invoker'.
+Fri Feb 27 22:02:34 2009 Tanaka Akira <akr@fsij.org>
- * vm_eval.c (vm_call0_body): catch up above changes.
+ * 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.
- * vm_insnhelper.c (call_cfunc): removed.
+Fri Feb 27 18:30:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (vm_call_cfunc): fix to call cfunc body
- with `invoker' function.
+ * 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 Oct 19 16:55:58 2012 Koichi Sasada <ko1@atdot.net>
+Fri Feb 27 18:01:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c, vm_eval.c: use TH_PUSH_TAG() instead of PUSH_TAG().
+ * gc.c (ruby_get_stack_grow_direction): no needs to use thread
+ here, and not initialized yet. [ruby-core:22439]
-Fri Oct 19 11:13:55 2012 Koichi Sasada <ko1@atdot.net>
+Fri Feb 27 17:45:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/driver.rb: remove unexpected `output'.
- (commit miss)
+ * 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 Oct 19 10:24:03 2012 Koichi Sasada <ko1@atdot.net>
+Fri Feb 27 14:39:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm_insnhelper.c (vm_search_method): remove needless local variable.
+ * numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le, flo_eql): revert
+ isnan() checks for VC++6.
-Fri Oct 19 10:22:26 2012 Koichi Sasada <ko1@atdot.net>
+ * insns.def (opt_lt, opt_gt): ditto.
- * benchmark/bmx_temp.rb: removed.
- This file should not be in repository.
+Fri Feb 27 14:23:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Oct 19 10:20:10 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/ostruct.rb (modifiable): check if really frozen.
+ [ruby-core:22559]
- * benchmark/driver.rb: add new option `--ruby-arg [ARG]'
- which is passed as a launch parameter for each ruby's execution.
- ($ ruby [ARG] [File])
+Thu Feb 26 23:14:46 2009 Tanaka Akira <akr@fsij.org>
-Thu Oct 18 18:42:35 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/lib/socket.rb (BasicSocket#connect_address): new method.
- * insns.def (opt_send_simple): move the location of
- `opt_send_simple' to the place near `send' definition.
- (to take care about icache locality).
+Thu Feb 26 19:29:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 18 18:29:25 2012 Koichi Sasada <ko1@atdot.net>
+ * hash.c (hash_foreach_iter): fix for prototype.
- * insns.def (send): remove unused condition.
- This condition will be true after r37258.
+Thu Feb 26 18:36:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (vm_caller_setup_args): remove `UNLIKELY' on
- checking blockiseq (it seems `LIKELY').
+ * common.mk (INSNS, newline.c, miniprelude.c, prelude.c),
+ (node_name.inc, known_errors.inc): unified from Makefile.in and
+ win32/Makefile.sub.
-Thu Oct 18 17:31:58 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 26 13:30:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * insns.def (opt_send_simple): introduce new instruction used
- when no need to care about block and splat.
+ * util.c (valid_filename): use our own implementation of open(),
+ close() and unlink().
- * compile.c: use the `opt_send_simple' instruction.
+Thu Feb 26 13:23:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 18 16:44:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * iseq.c (cdhash_each): resurrects internal literals.
- * vm_method.c (rb_add_method_cfunc, rb_add_method_cfunc_frameless):
- check arity earlier at definition time.
+Thu Feb 26 10:56:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Oct 18 15:11:31 2012 Koichi Sasada <ko1@atdot.net>
+ * include/ruby/win32.h (rb_w32_wopen): prototype forgotten.
- * vm_insnhelper.c: add `inline' keyword to several functions.
- Compilers (gcc) are conservative than I expected.
+ * io.c (rb_sysopen_internal): shouldn't replace undefined chars in this
+ case.
-Thu Oct 18 15:01:15 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 26 01:34:38 2009 Tanaka Akira <akr@fsij.org>
- * include/ruby/ruby.h: add a decl. of
- `rb_define_frameless_method()'.
+ * ext/socket/mkconstants.rb: more MSG_* constants.
-Thu Oct 18 14:31:17 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 26 00:21:21 2009 Tanaka Akira <akr@fsij.org>
- * compile.c (new_callinfo): set a temporary index of callinfo
- (used in `iseq_set_sequence()') to rb_call_info_t::aux::index.
- rb_call_info_t::argc is initialized by same value of
- rb_call_info_t::orig_argc.
+ * 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.
-Thu Oct 18 14:11:08 2012 Koichi Sasada <ko1@atdot.net>
+Wed Feb 25 23:23:03 2009 Tanaka Akira <akr@fsij.org>
- * class.c (rb_define_frameless_method): rename from
- rb_define_method_fast(). Defined method with this C API
- does not make a method frame. It is bit lightweight than
- ordinal C functions. Now only 0 or 1 argc are permitted.
+ * ext/socket/ancdata.c (ancillary_unix_rights): raise
+ NotImplementedError if no fd passing feature.
+ (ancillary_timestamp): raise NotImplementedError if no timestamp
+ feature.
- * method.h (VM_METHOD_TYPE_CFUNC_FRAMELESS): rename macro name
- from VM_METHOD_TYPE_CFUNC_FAST.
+Wed Feb 25 23:18:53 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c, vm_method.c: rename related functions.
+ * ext/socket/ancdata.c (ancillary_s_unix_rights): new method.
- * proc.c (rb_method_entry_arity): catch up above changes.
+Wed Feb 25 23:01:26 2009 Tanaka Akira <akr@fsij.org>
-Thu Oct 18 10:30:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/unixsocket.c (unix_recv_io): prevent FD leak when 2 fd is
+ sent on LP64 platform.
- * parse.y (assignable_gen): fail if yyerror occurred. fix a bug in
- r36973.
+ * ext/socket/rubysocket.h (rsock_discard_cmsg_resource): declared.
-Thu Oct 18 09:23:03 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/socket/ancdata.c (rsock_discard_cmsg_resource): renamed from
+ discard_cmsg_resource. export it.
- * hash.c (initialize_copy): duping should rehash the hash.
+Wed Feb 25 17:31:32 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_hash.rb: added a test to ensure rehash.
+ * io.c (sysopen_func, rb_sysopen_internal, rb_sysopen): open file
+ by UTF-16'ed filename on Windows.
-Wed Oct 17 21:16:47 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * io.c (rb_file_open_generic, rb_io_s_sysopen, rb_io_reopen,
+ argf_next_argv): follow above change.
- * common.mk (WPROGRAM): need same dependencies as PROGRAM.
+ * io.c (rb_scan_open_args): no longer need to convert filepath here on
+ Windows.
- * cygwin/GNUmakefile.in (uncommon.mk): move include position
- below WPROGRAM definition to be defined in uncommon.mk.
+ * win32/wio32.c (rb_w32_wopen): new function to open file by UTF-16'ed
+ filename.
- * ext/extmk.rb (all, static): fix make rubyw.exe failure with make -jN.
- If make of ruby.exe and rubyw.exe run in parallel, link dll and link
- exe run in parallel, which causes link failure on mingw. To fix this,
- we make ruby.exe and rubyw.exe in one make process.
- [ruby-core:48007] [Bug #7165]
+ * win32/win32.c (rb_w32_open): call rb_w32_open().
-Wed Oct 17 16:25:34 2012 Koichi Sasada <ko1@atdot.net>
+Wed Feb 25 15:05:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * benchmark/bm_vm2_method_missing.rb: add a benchmark to measure
- performance of invoking `method_missing'.
+ * win32/Makefile.sub (config.status): use un.rb as cp instead of
+ cmd.exe's copy command.
-Wed Oct 17 16:23:17 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/mkmf.rb (create_makefile): no longer need to convert path
+ separator when copying file.
- * vm_insnhelper.c (vm_getivar): fix to use `aux.index' instead of
- `aux.opt_pc'.
+Wed Feb 25 12:27:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 17 16:03:54 2012 Koichi Sasada <ko1@atdot.net>
+ * string.c (rb_str_force_encoding): should clear coderange at changing
+ encoding. [ruby-core:22437]
- * vm_insnhelper.c (vm_call_method_missing): make a refactoring
- about method_missing process. Use `vm_call_method()' to invoke
- `method_missing' method instead of `rb_funcall2()'.
- In `vm_call_method()', set fastpath to `vm_call_method_missing()'
- if it can be cached.
+Wed Feb 25 12:06:09 2009 <nobu@ruby-lang.org>
- * vm_core.h (rb_call_info_t): add new field
- `rb_call_info_t::aux::missing_reason' to pass the reason to
- `vm_call_method_missing()'.
+ * io.c (rb_io_getline_1): enables limit even if rs is given.
+ [ruby-core:22434]
-Wed Oct 17 15:33:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 25 02:28:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (opt-dir): allow multiple directories separated by
- $PATH_SEPARATOR as well as dir_config in mkmf.rb. [ruby-core:47868]
- [Bug #7120]
+ * string.c (rb_str_chomp_bang): coderange may change.
+ [ruby-core:22414]
-Wed Oct 17 15:08:13 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Feb 25 02:17:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/imap.rb: fix Net::IMAP::ResponseParser to accept
- message/delivery-status ([ruby-core:47920] [Bug #7146]),
- message/rfc822 attachments ([ruby-core:47921] [Bug #7147]), and
- (BODY ("MIXED")) ([ruby-core:47951] [Bug #7153]).
- patched by Tony Arkles.
+ * string.c (rb_str_delete_bang): should recalculate coderange.
+ [ruby-talk:329267]
- * test/net/imap/test_imap_response_parser.rb: related test.
+Wed Feb 25 00:41:21 2009 Akinori MUSHA <knu@iDaemons.org>
-Wed Oct 17 11:04:48 2012 NAKAMURA Usaku <usa@ruby-lang.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.
- * test/ruby/test_hash.rb (TestHash#test_dup_equality): added a new test
- to show the problem of r37232.
+ * ext/socket/tcpserver.c (tcp_svr_init): Make use of it.
-Wed Oct 17 10:48:40 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Feb 25 00:28:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_insnhelper.c (vm_search_method): fix a build error that occurs
- when OPT_INLINE_METHOD_CACHE is 0.
+ * file.c (rb_file_size): new method added. [ruby-core:22088]
-Wed Oct 17 08:46:47 2012 Koichi Sasada <ko1@atdot.net>
+Wed Feb 25 00:15:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * benchmark/bm_vm2_dstr.rb: add a benchmark to measure
- performance of dynamic generated string ("foo#{bar}baz").
+ * ext/curses/curses.c (curses_colors): new method added. a patch
+ from Alexander Beisig in [ruby-core:22331].
-Wed Oct 17 08:32:46 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/curses/curses.c (curses_color_pairs): ditto.
- * compile.c (compile_dstr_fragments): use `putobject' instead of
- `putstring' for all of strings used by NODE_DSTR because
- ruby users can not grab this string.
- For example, the string object of "baz" in "foo#{bar}baz"
- is located by `putobject' (users can not touch "baz" object
- directly). This change reduces GC pressure.
- This improvement is suggested by Aaron Patterson.
+Wed Feb 25 00:05:13 2009 Akinori MUSHA <knu@iDaemons.org>
-Wed Oct 17 08:02:57 2012 Koichi Sasada <ko1@atdot.net>
+ * 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.
- * thread.c (rb_threadptr_interrupt_mask): fix to check interrupt
- after interrupt_mask changed.
+Tue Feb 24 23:58:52 2009 Akinori MUSHA <knu@iDaemons.org>
-Wed Oct 17 06:42:47 2012 Koichi Sasada <ko1@atdot.net>
+ * array.c (rb_ary_index, rb_ary_rindex): Emit a warning that a
+ given block is unused when an argument is specified.
- * vm_insnhelper.c (vm_call_method): fix to return value immediately.
- Remove CHECK_INTS() after that method dispatch.
+Tue Feb 24 22:00:37 2009 Tanaka Akira <akr@fsij.org>
-Wed Oct 17 06:25:56 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/socket/socket.c (sockaddr_obj): convert fe80:1::1 to fe80::1%1.
- * hash.c (initialize_copy): copy the underlying st_table on dup,
- rather than copying the hash key by key. [ruby-core:48009]
+Tue Feb 24 19:56:11 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_hash.rb: relevant tests for initialize_copy
+ * ext/socket/ancdata.c (ancillary_timestamp): support SCM_BINTIME.
-Wed Oct 17 06:17:44 2012 Koichi Sasada <ko1@atdot.net>
+Tue Feb 24 19:45:15 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (vm_call_iseq_setup_2): separate tailcall and normal
- method frame setup functions.
- Add checking interrupts at the tailcall setup function.
+ * ext/socket/ancdata.c (ancillary_timestamp): new method.
-Wed Oct 17 05:35:37 2012 Koichi Sasada <ko1@atdot.net>
+Tue Feb 24 19:01:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/bm_vm1_yield.rb: add a benchmark to measure `yield'
- (invoke empty block) performance.
+ * 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]
- * benchmark/bm_vm2_method_with_block.rb: add a benchmark to measure
- method invocation with empty block.
+ * Makefile.in, win32/Makefile.sub (RUNCMD, MKMAIN_CMD): macros to
+ run script file.
-Wed Oct 17 05:05:07 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/extmk.rb (parse_args): added --command-output option which
+ creates script file to make main program.
- * vm_insnhelper.c (vm_invoke_block): vm_caller_setup_args() can skip
- when splat flag is not set.
+Tue Feb 24 17:58:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 17 01:53:47 2012 Koichi Sasada <ko1@atdot.net>
+ * common.mk (ripper.c): exec can't work on Windows.
- * vm_insnhelper.c (vm_getivar, vm_setivar): support index inline cache
- with rb_call_info_t to speedup `attr' getter and setter.
- Cached index is stored in rb_call_info_t::aux::index.
- `index' == 0 means not cached. `index' > 0 means cached and cached
- index is `index - 1'.
+ * ext/ripper/depend (.SUFFIXES): nmake doesn't have .y by default.
- * insns.def ((get|set)instancevariable): use new wrapper functions
- vm_(get|set)instancevariable() defined in vm_insnhelper.c.
+ * Makefile.in (id.h): overwrites unconditionally.
- * vm_core.h (rb_call_info_t::aux): introduce new union data because
- opt_pc can share with index.
+Tue Feb 24 13:13:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 16 22:24:44 2012 Koichi Sasada <ko1@atdot.net>
+ * missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than
+ long.
- * benchmark/driver.rb (show_results): Show speedup ratio
- with first executables score at last of results
- if two or more executables are given.
+Tue Feb 24 11:21:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 16 21:59:01 2012 Koichi Sasada <ko1@atdot.net>
+ * signal.c (rb_disable_interrupt, rb_enable_interrupt): see
+ USE_TRAP_MASK.
- * benchmark/driver.rb: some refactoring.
- (1) Remove `average differential'.
- In this benchmark driver, We should not care about `average'.
- We use fastest score because this score should not include
- any disturbances (affections of background process, etc).
- If you care about timing affect, I recommend `median'
- score with more than 5 examinations rather than simple
- `average' score (`average' score was affected by error scores).
- (2) Show log file name.
- (3) Change default directory from './' to driver's directory.
+Tue Feb 24 10:49:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 16 14:56:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c (rb_waitpid): last argument was missing.
- * file.c (rb_file_join): need to check again after any conversion run.
- [ruby-core:48012] [Bug #7168]
+ * process.c (waitall_each): fixed typo. a patch from shinichiro.h
+ <shinichiro.hamaji AT gmail.com> at [ruby-dev:38054].
-Tue Oct 16 12:52:14 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Tue Feb 24 01:53:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_file):
- rename from file_assertion.
+ * numeric.c (flo_eq): remove unnecessary NaN check using isnan().
+ comparison regarding NaN is false anyway.
-Tue Oct 16 11:30:18 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (flo_gt, flo_ge, flo_lt, flo_le, flo_eql): ditto.
- * file.c (rb_file_join): hide the result under construction until
- return.
+Tue Feb 24 01:22:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * file.c (rb_file_join): check nul-byte only for strings, since
- FilePathStringValue() does it. [ruby-core:48012] [Bug #7168]
+ * bootstraptest/test_thread.rb: fix for environment where fork is not
+ available.
- * file.c (rb_file_join): path names must be ASCII-compatible.
- [ruby-core:48012] [Bug #7168]
+Tue Feb 24 01:19:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * file.c (check_path_encoding): new function to ensure path name
- encoding to be ASCII-compatible.
+ * thread.c (thread_cleanup_func): unlock all locked mutexes even when
+ forking. [ruby-core:22269]
-Tue Oct 16 09:40:04 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Feb 24 00:54:16 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_regexp.rb
- (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
- Regexp.new instead of literal to ignore a parser warning.
+ * insns.def (opt_minus): inline float operation.
-Tue Oct 16 09:30:30 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * insns.def (opt_lt, opt_gt): ditto.
- * test/ruby/test_regexp.rb
- (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
- warnings are already set in setup method.
+Tue Feb 24 00:24:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Oct 16 06:44:06 2012 Koichi Sasada <ko1@atdot.net>
+ * range.c (range_each): check #succ only when it is really
+ needed. small performance improvement.
- * vm_insnhelper.c (VM_CALLEE_SETUP_ARG): fix wrong condition.
+ * math.c (Need_Float): call rb_to_float() only when it is really
+ needed. small performance improvement.
-Tue Oct 16 06:29:18 2012 Koichi Sasada <ko1@atdot.net>
+Tue Feb 24 00:19:33 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_insnhelper.c (vm_call_method): disable CI_SET_FASTPATH() if
- this method call needs splat argument because cached functions
- (vm_call_attrset, vm_call_ivar, vm_call_cfunc_fast_(unary|binary))
- do not check an arity.
+ * lib/pathname.rb (Pathname#foreachline): removed wrongly
+ resurrected method. [ruby-dev:38065]
- * bootstraptest/test_method.rb: add a test to check an above issue.
+Mon Feb 23 20:39:21 2009 Tanaka Akira <akr@fsij.org>
-Tue Oct 16 06:15:44 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/ancdata.c (inspect_timespec_as_abstime): new function to
+ show struct timespec.
+ (ancillary_inspect): use it for SCM_TIMESTAMPNS on GNU/Linux.
- * method.h: introduce new method type VM_METHOD_TYPE_CFUNC_FAST.
- This method is similar to VM_METHOD_TYPE_CFUNC methods, but
- called cfunc without building new frame (does not push new control
- frame). If error is occurred in cfunc, the backtrace only shows
- caller frame and upper.
- This kind of methods can be added by rb_define_method_fast().
- This feature is similar to specialized instructions (opt_plus, etc),
- but more flexible (but a bit slower).
+Mon Feb 23 20:30:06 2009 Tanaka Akira <akr@fsij.org>
- * class.c (rb_define_method_fast): added.
- Maybe it will be renamed soon.
+ * ext/socket/ancdata.c (inspect_bintime_as_abstime): new function to
+ show struct bintime.
+ (ancillary_inspect): use it for SCM_BINTIME on FreeBSD.
- * vm_insnhelper.c (vm_call_method): support method type
- VM_METHOD_TYPE_CFUNC_FAST.
+ * ext/socket/mkconstants.rb: define SCM_BINTIME.
- * proc.c (rb_method_entry_arity): catch up new method type.
+Mon Feb 23 20:18:49 2009 Tanaka Akira <akr@fsij.org>
- * vm_method.c (rb_add_method_cfunc_fast): added.
+ * 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.
-Tue Oct 16 02:32:29 2012 Koichi Sasada <ko1@atdot.net>
+Mon Feb 23 15:53:30 2009 Akinori MUSHA <knu@iDaemons.org>
- * vm_insnhelper.h (CI_SET_FASTPATH): add new parameter `enabled'.
- If `enable' is 0 then CI_SET_FASTPATH() doesn't work.
- And add new configuration option OPT_CALL_FASTPATH. If this macro
- was defined by 0, then CI_SET_FASTPATH() doesn't work any more.
+ * array.c (rb_ary_index, rb_ary_rindex): We know that argc is not
+ zero when we reach here.
- * vm_insnhelper.c (vm_call_method): Pass `0' for `enabled' parameter
- of CI_SET_FASTPATH if this method is protected.
+ * array.c (rb_ary_initialize, rb_ary_index): Shrink a double
+ space. (NFC)
-Tue Oct 16 02:17:35 2012 Koichi Sasada <ko1@atdot.net>
+Mon Feb 23 14:47:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (VM_CALL_*): rename VM_CALL_*_BIT
- to VM_CALL_* (remove `_BIT' suffix).
- Add comments on each macros.
- Remove unused macro VM_CALL_TAILRECURSION_BIT.
+ * lib/fileutils.rb (mv): added description for the case of
+ different partitions. [ruby-talk:329072]
- * compile.c, iseq.c, insns.def, vm_insnhelper.c: ditto.
+Mon Feb 23 10:19:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Oct 15 22:14:44 2012 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]
- * test/ruby/envutil.rb (Test::Unit::Assertions#file_assertion):
- rewrite file assertions.
+Mon Feb 23 10:15:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Oct 15 09:41:17 2012 Koichi Sasada <ko1@atdot.net>
+ * README.EXT, README.EXT.ja: added macros for the Compatibilities.
- * vm_insnhelper.c (VM_CALLEE_SETUP_ARG): skip CI_SET_FASTPATH() if
- it was called from vm_yield_setup_args().
+Mon Feb 23 03:19:37 2009 Tanaka Akira <akr@fsij.org>
-Mon Oct 15 05:20:13 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/mkconstants.rb: define SO_TIMESTAMPNS and SCM_TIMESTAMPNS
+ if available.
- * vm_insnhelper.h CI_SET_FASTPATH: introduce new macro
- `CI_SET_FASTPATH(ci, func)'. This macro set `ci->call' as `func'.
- `func' (ci->call) is called at the last of `send'
- (and `invokesuper') instruction.
- `CI_SET_FASTPATH' does not set `ci->call' when the method
- (stored in `ci->me') is `protected'.
+Mon Feb 23 02:54:31 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (vm_call_method): use `CI_SET_FASTPATH'.
- After several checking (visibility, argc checking), the result of
- checking can be reused until re-definition of this method
- with inline method cache.
+ * ext/socket/ancdata.c (ancillary_inspect): use SCM_TIMESTAMP instead
+ of SO_TIMESTAMP. SCM_TIMESTAMP != SO_TIMESTAMP on MacOS X.
- Note that this optimization is now experimental.
- If you find any problem about it, please tell us.
+Mon Feb 23 02:44:42 2009 Tanaka Akira <akr@fsij.org>
-Mon Oct 15 04:51:55 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/ancdata.c (inspect_timeval_as_abstime): new function.
+ (ancillary_inspect): use it for SO_TIMESTAMP.
- * vm_insnhelper.c: refactoring.
- - move all `call' related functions to the last of file.
- - make functions for respective method types in vm_call_method().
- (all functions have same function parameters)
+Mon Feb 23 02:26:44 2009 Tanaka Akira <akr@fsij.org>
- * vm_core.h: add `opt_pc' field in `rb_call_info_t'
- as temporal variable.
+ * ext/socket/option.c (inspect_timeval_as_interval): renamed from
+ inspect_timeval.
- * vm_eval.c (vm_call0_body): catch up above changes.
+Mon Feb 23 02:10:09 2009 Tanaka Akira <akr@fsij.org>
-Mon Oct 15 03:51:46 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/option.c (inspect_timeval): fix the size test.
- * benchmark/bm_vm1_attr_ivar(_set).rb: added (for method dispatch speed).
+Sun Feb 22 22:42:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/bm_vm1_float_simple.rb: added (for flonum/float).
+ * string.c (tr_trans): should recalculate coderange.
+ [ruby-core:22326] (reopened at [ruby-core:22328])
-Mon Oct 15 02:51:16 2012 Koichi Sasada <ko1@atdot.net>
+Sun Feb 22 20:09:29 2009 Tanaka Akira <akr@fsij.org>
- * vm_eval.c (vm_call0_body): add new function.
- `vm_call0()' makes call_info struct and calls `vm_call0_body()'
- with this struct. In near future, `vm_call0()' will be removed
- because all of `vm_call0()' users setup call_info struct by itself.
+ * ext/socket/option.c (inspect_linger): message refined.
-Mon Oct 15 01:38:06 2012 Koichi Sasada <ko1@atdot.net>
+Sun Feb 22 19:28:08 2009 Tanaka Akira <akr@fsij.org>
- * insns.def (send, invokesuper, invokeblock, opt_*), vm_core.h:
- use only a `ci' (rb_call_info_t) parameter instead of using
- parameters such as `op_id', 'op_argc', `blockiseq' and flag.
- These information are stored in rb_call_info_t at the compile
- time.
- This technique simplifies parameter passing at related
- function calls (~10% speedups for simple method invocation at
- my machine).
- `rb_call_info_t' also has new function pointer variable `call'.
- This `call' variable enables to customize method (block)
- invocation process for each place. However, it always call
- `vm_call_general()' at this changes.
- `rb_call_info_t' also has temporary variables for method
- (block) invocation.
+ * ext/socket/init.c (s_recvfrom): use rb_io_wait_readable after
+ recvfrom.
- * vm_core.h, compile.c, insns.def: introduce VM_CALL_ARGS_SKIP_SETUP
- VM_CALL macro. This flag indicates that this call can skip
- caller_setup (block arg and splat arg).
+Sun Feb 22 18:40:04 2009 Tanaka Akira <akr@fsij.org>
- * compile.c: catch up above changes.
+ * ext/socket/option.c (inspect_errno): new function.
+ (sockopt_inspect): use inspect_errno for SO_ERROR.
- * iseq.c: catch up above changes (especially for TS_CALLINFO).
+Sun Feb 22 15:11:51 2009 Tanaka Akira <akr@fsij.org>
- * tool/instruction.rb: catch up above changes.
+ * re.c (Init_Regexp): define Regexp::FIXEDENCODING. [ruby-dev:38066]
- * vm_insnhelper.c, vm_insnhelper.h: ditto. Macros and functions
- parameters are changed.
+Sun Feb 22 14:33:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_eval.c (vm_call0): ditto (it will be rewritten soon).
+ * string.c (tr_trans): should not be affected by the encoding of
+ replacement unless actually modified. [ruby-talk:328967]
+ [ruby-core:22326]
-Sun Oct 14 12:30:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Feb 22 13:38:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby.c (rb_f_sub, rb_f_gsub): pass the given block.
- [ruby-core:47967] [Bug #7157]
+ * ext/socket/init.c (s_recvfrom_nonblock): handles EAGAIN too.
-Sat Oct 13 23:15:39 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/init.c (s_accept_nonblock): ditto, and EPROTO depends
+ on platforms.
- * regparse.c (parse_char_class): should match with a hyphen after a
- range in a character class.
+Sun Feb 22 13:03:12 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * test/ruby/test_regexp.rb (TestRegexp#test_char_class): fixed wrong
- test.
+ * eval.c (ruby_options): the evaluator now expects iseq instead of tree.
- * test/ruby/test_regexp.rb (TestRegexp#check): now can accept the
- error message.
+ * ruby.c (ruby_process_options): ditto.
- * test/ruby/test_regexp.rb
- (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): renamed
- because the previous name was wrong.
+Sun Feb 22 13:03:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_regexp.rb
- (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): added
- more test pattern.
+ * Makefile.in (configure): unset PWD to use symlink to building
+ directory.
-Sat Oct 13 03:01:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * Makefile.in (up): cd doesn't need LC_TIME, VCS needs.
- * file.c (realpath_rec): prevent link from GC while link_names refers
- the content.
+Sun Feb 22 10:43:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Oct 13 01:37:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm_eval.c (method_missing): should not pop cfp if missing method
+ is method_missing. [ruby-core:22298]
- * test/ruby/test_regexp.rb
- (TestRegexp#test_raw_hyphen_and_type_char_after_range): added new
- test. ref [ruby-core:47115] [Backport #6853]
+ * vm_eval.c (rb_raise_method_missing): new function to directly
+ raise NoMethodError.
-Fri Oct 12 21:55:08 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * vm_insnhelper.c (vm_call_method): fixed the case method_missing
+ is missing.
- * include/ruby/win32.h (rb_w32_pow): set floating point precision
- for mingw-w64 x86 pow(). This improves the precision of pow() on
- Windows XP for TestFloat#test_round_with_precision failure.
- [ruby-core:47911] [Bug #7142]
+Sun Feb 22 02:15:40 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 12 21:37:25 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): handle EMSGSIZE as
+ well.
- * test/webrick/test_cgi.rb (TestWEBrickCGI#test_cgi): skip a test
- depending on locale on Windows. ENV[] doesn't work properly if
- console code page is not equal to file system encoding.
- [ruby-core:47910] [Bug #7140]
+Sun Feb 22 02:03:46 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 12 20:40:29 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): check max length
+ overflow.
- * process.c (posix_sh_cmds): the command name of colon is ":".
+Sun Feb 22 01:52:30 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 12 18:18:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): don't call
+ discard_cmsg_resource when EMFILE.
- * file.c (rb_get_path_check): path name must not contain NUL bytes.
+Sun Feb 22 01:48:51 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 12 16:06:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): gc when SCM_RIGHTS
+ hit the file descriptor limit.
- * tool/merger.rb: now can merge revision(s) without --ticket again.
+Sun Feb 22 00:51:58 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 12 14:10:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_getpartial): error message describes what should be
+ waited after nonblocking error.
+ (rb_io_write_nonblock): ditto.
- * lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
- default library path. [ruby-core:43726] [Bug #6207]
+ * ext/socket/init.c (s_recvfrom_nonblock): ditto.
+ (s_accept_nonblock): ditto.
-Fri Oct 12 05:25:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/socket.c (sock_connect_nonblock): ditto.
- * lib/timeout.rb (timeout):
- Remove paragraph on wrong implementation detail.
- [ruby-core:47739] [Bug #7088]
+ * ext/socket/ancdata.c (bsock_sendmsg_internal): ditto.
+ (bsock_recvmsg_internal): ditto.
-Thu Oct 11 23:09:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Feb 22 00:31:42 2009 Tanaka Akira <akr@fsij.org>
- * string.c (rb_str_sub{seq,pos,str}, rb_str_each_{line,codepoint}):
- prevent String copies from GC. [ruby-core:47881] [Bug #7135]
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): check recvmsg error
+ earlier.
-Thu Oct 11 07:40:50 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Feb 20 23:28:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * iseq.c (insn_operand_intern): cast op to rb_call_info_t* before
- compare with iseq->callinfo_entries whose type is rb_call_info_t*.
+ * util.c (rv_alloc, freedtoa): use our normal xmalloc()/xfree() because
+ couldn't free the returned pointer from ruby_dtoa().
-Thu Oct 11 03:37:08 2012 Koichi Sasada <ko1@atdot.net>
+ * missing/vsnprintf.c (cvt): receive buffer and use/return it instead
+ of returning the pointer returned from BSD__dtoa().
- * bootstraptest/test_block.rb: add tests for block with super.
+ * missing/vsnprintf.c (BSD_vfprintf): pass buf to cvt() as the buffer.
+ [ruby-core:22184]
-Thu Oct 11 02:54:07 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 19 22:59:09 2009 Tanaka Akira <akr@fsij.org>
- * vm_dump.c: fix debug prints to catch up recent changes
- such as VM data structures.
+ * 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 Oct 11 02:50:34 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 19 22:17:38 2009 Tanaka Akira <akr@fsij.org>
- * iseq.c (insn_operand_intern): add support disasm TS_CALLINFO
- operands.
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): fix exception.
-Wed Oct 10 15:12:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Feb 19 21:13:03 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_process.rb (TestProcess#test_execopts_gid): skip on
- windows because the platform does not have Process.group method.
- patched by Jon Forums in [ruby-core:47878] [Bug #7133].
+ * ext/socket/ancdata.c (ancillary_unix_rights): method renamed.
-Tue Oct 9 23:18:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 19 15:47:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (assert_file, assert_file_not): more
- descriptive assertions for File predicates.
+ * template/fake.rb.in: extracted from Makefile.in.
-Tue Oct 9 18:01:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (fake.rb): prefixed with $(arch)-.
- * array.c (rb_ary_sample): use rb_random_ulong_limited, since
- precision of long may be larger than double.
+Thu Feb 19 15:39:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * random.c (rb_random_ulong_limited): new function to return a random
- value from 0 upto limit as unsigned long, similarly to
- rb_genrand_ulong_limited but with arbitrary RNG object.
+ * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
+ returns positive value on success, not non-zero. [ruby-core:21762]
-Tue Oct 9 17:13:27 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 19 15:17:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (rb_execarg_addopt, rb_execarg_run_options): add :uid and
- :gid options. [ruby-core:47414] [Feature #6975]
+ * lib/tmpdir.rb (@@systmpdir): File.expand_path also joins paths.
-Tue Oct 9 14:36:11 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 19 15:14:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c (iseq_free): fix memory leak.
- rb_iseq_t::callinfo_entries should be freed.
+ * ext/etc/etc.c (etc_each_group): defines only when Etc::Group is
+ available.
-Tue Oct 9 14:28:18 2012 Koichi Sasada <ko1@atdot.net>
+Thu Feb 19 15:11:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h (rb_call_info_t): add new type `rb_call_info_t'.
- This data structure contains information including inline method
- cache. After that, `struct iseq_inline_cache_entry' does not
- need to contain inline cache for method invocation.
- Other information will be added to this data structure.
+ * eval_intern.h (translit_char): moved from ruby.c.
- * vm_core.h (rb_iseq_t): add `callinfo_entries' and `callinfo_size'
- members to `rb_iseq_t'.
+ * load.c (load_ext): transliterates file separators and back if
+ needed.
- * insns.def, compile.c: Use CALL_INFO instead of IC.
+ * symbian/setup (DLN_NEEDS_ALT_SEPARATOR): defined.
- * tool/instruction.rb: support CALL_INFO as operand type.
+Thu Feb 19 14:48:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c, vm_insnhelper.h: ditto.
+ * configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c
-Sun Oct 7 23:54:33 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Thu Feb 19 14:39:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/zlib/zlib.c (zstream_run_func): don't call inflate() when
- z->stream.avail_in == 0. it return Z_BUF_ERROR.
- but deflate() could be called with z->stream->avail_in == 0 because
- it has hidden buffer in z->stream->state (opaque structure).
- fix for gem install error. [ruby-dev:46149] [Bug #7040]
+ * configure.in (darwin): uses -unexported_symbol option of ld instead
+ of objcopy
-Mon Oct 8 23:55:41 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * configure.in (darwin): makes dylib instead of so.
- * eval.c (rb_mod_refinements): new method Module#refinements.
+Thu Feb 19 14:22:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_refinement.rb: add new tests for the above changes.
+ * lib/mkmf.rb (create_makefile): added phony targets.
-Mon Oct 8 23:02:19 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): creates target directories before
+ copying. [ruby-core:21958]
- * eval.c, gc.c, iseq.c, node.h, vm_insnhelper.c, vm_insnhelper.h,
- vm_method.c: rename omod and overlaid modules to refinements.
+ * lib/mkmf.rb (create_makefile): removes directories in the depth
+ order.
- * eval.c (hidden_identity_hash_new): renamed from identity_hash_new.
+Thu Feb 19 13:56:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 7 04:50:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * file.c (rb_home_dir): checks if HAVE_PWD_H. [ruby-dev:38049]
- * lib/abbrev.rb: Documentation examples for Abbrev.
- [ruby-core:47442] [Bug #6985]
+Thu Feb 19 08:45:48 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-Sun Oct 7 04:50:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/rubysocket.h: add "#include <sys/stat.h>"
- * thread.c (rb_thread_aref):
- Grammar in Thread documentation.
- Patch by Steve Klabnik [ruby-core:47799] [Bug #7099]
+Thu Feb 19 03:42:48 2009 Tanaka Akira <akr@fsij.org>
-Sun Oct 7 04:37:00 2012 Zachary Scott <zzak@ruby-lang.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.
- * string.c (rb_str_match):
- Clarify behavior for captured strings and local variable assignment
- Patch by Marcus Stollsteimer [ruby-core:47668] [Bug #7062]
+Thu Feb 19 03:28:59 2009 Akinori MUSHA <knu@iDaemons.org>
-Sat Oct 6 18:31:36 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * README.EXT, README.EXT.ja: Improve the document about
+ rb_scan_args() even more.
- * vm_opts.h (OPT_GLOBAL_METHOD_CACHE): new build option to
- enable/disable global method caching. [ruby-dev:46203] [Bug #7111]
+Thu Feb 19 03:12:51 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_method.c (rb_method_entry_get_with_omod): don't use global
- method cache if OPT_GLOBAL_METHOD_CACHE is 0.
+ * test/ruby/test_file_exhaustive.rb: skip some tests if euid == 0.
+ a patch from Lucas Nussbaum in [ruby-core:22209].
-Sat Oct 6 16:32:04 2012 Shugo Maeda <shugo@ruby-lang.org>
+Thu Feb 19 03:00:49 2009 Akinori MUSHA <knu@iDaemons.org>
- * vm_method.c (search_method): check omod only once for performance.
+ * README.EXT, README.EXT.ja: Improve the document about
+ rb_scan_args().
-Sat Oct 6 09:42:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 18 22:47:01 2009 Tanaka Akira <akr@fsij.org>
- * enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): endian-less wide
- UTF encodings are dummy but Unicode.
+ * 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.
- * encoding.c (rb_encdb_set_unicode): set Unicode flag.
+Wed Feb 18 21:47:37 2009 Tanaka Akira <akr@fsij.org>
- * template/encdb.h.tmpl: allow ENC_DUMMY variants.
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): prevent misalignment.
- * encoding.c (rb_enc_unicode_p): oniguruma provides Unicode flag.
+Wed Feb 18 21:34:30 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 5 17:18:42 JST 2012 TAKANO Mitsuhiro <tak@no32.tk>
+ * ext/socket/ancdata.c (bsock_sendmsg_internal): prevent misalignment.
- * template/Doxyfile.tmpl: remove SHOW_DIRECTORIES and
- HTML_ALIGN_MEMBERS lines. They have been obsolete in
- Doxygen version 1.8.2.
+Wed Feb 18 21:09:43 2009 Tanaka Akira <akr@fsij.org>
-Fri Oct 5 15:26:18 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): reduce code on
+ environments which have no control message.
- * ext/objspace/objspace.c: add ObjectSpace#reachable_objects_from.
- This method returns an array of objects referenced by given object.
- If given object is special objects such as true/false/nil/Fixnum etc
- then it returns nil. See rdoc for details.
- [ruby-core:39772]
+Wed Feb 18 20:27:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/objspace/test_objspace.rb: add a test for this method.
+ * configure.in (OBJCOPY): set ac_cv_prog_ac_ct_OBJCOPY to do nothing
+ on cygwin and mingw because symbols are exported by def file.
- * gc.c: add rb_objspace_reachable_objects_from().
- To make this function, add several member `mark_func_data'
- to rb_objspace_t. If mark_func_data is not null, then
- gc_mark() calls mark_func_data::mark_func.
+Wed Feb 18 15:35:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.h: export rb_objspace_reachable_objects_from().
+ * file.c (rb_file_chown): use chown unless HAVE_FCHOWN.
-Thu Oct 4 23:40:04 2012 Narihiro Nakamura <authornari@gmail.com>
+ * io.c (pipe_open): sarg is always used unless HAVE_FORK.
- * gc.c (init_heap): call init_mark_stack before to allocate
- altstack. This change avoid the stack overflow at the signal
- handler on 32bit, but I don't understand reason... [Feature #7095]
+Wed Feb 18 15:23:34 2009 Akinori MUSHA <knu@iDaemons.org>
-Thu Oct 4 22:39:27 2012 Koichi Sasada <ko1@atdot.net>
+ * bootstraptest/runner.rb: Use RUBY_DESCRIPTION if defined.
- * insns.def (getlocal, setlocal): remove old getlocal/setlocal
- instructions and rename getdaynmic/setdynamic instructions
- to getlocal/setlocal.
+Wed Feb 18 14:33:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * compile.c: ditto.
+ * array.c (rb_ary_resurrect), string.c (rb_str_resurrect): new
+ functions based on [ruby-dev:37983]
- * iseq.c: remove TS_DINDEX.
+ * insns.def (putstring, duparray): use rb_{ary,str}_resurrect().
- * vm_exec.h (dindex_t): remove type definition of `dindex_t'.
+ * iseq.c (iseq_data_to_ary): needs to result TS_VALUE.
- * tool/instruction.rb: ditto.
+Wed Feb 18 12:35:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 4 21:44:17 2012 Koichi Sasada <ko1@atdot.net>
+ * file.c (rb_file_s_extname): fix for spaces before extension.
+ [ruby-dev:38044]
- * vm.c (vm_analysis_insn|operand|register): use st_insert
- instead of using rb_hash_aset() because rb_hash_aset()
- check $SAFE.
+Wed Feb 18 12:00:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 4 21:15:26 2012 Koichi Sasada <ko1@atdot.net>
+ * file.c (file_expand_path): suppress a warning. named magic
+ numbers.
- * vm.c (VM_COLLECT_USAGE_DETAILS): make new VM usage analysis
- hooks (old macro name is COLLECT_USAGE_ANALYSIS).
- This feature is only for VM developers. (I'm not sure I can use
- `VM developers' (the plural form) in this sentence).
- If VM_COLLECT_USAGE_DETAILS is not 0, VM enables the following
- usage collection features:
- (1) instruction: collect instruction usages.
- (2) operand: collect operand usages.
- (3) register: collect register usages.
- The results are stored in
- RubyVM::USAGE_ANALYSIS_INSN for (1, 2),
- RubyVM::USAGE_ANALYSIS_INSN_BIGRAM for (1) and
- RubyVM::USAGE_ANALYSIS_REGS for (3).
- You can stop collecting usages with
- RubyVM::USAGE_ANALYSIS_INSN_STOP(),
- RubyVM::USAGE_ANALYSIS_OPERAND_STOP(),
- RubyVM::USAGE_ANALYSIS_REGISTER_STOP()
- for (1), (2), (3) respectively.
- You can also change the hook functions by setting
- C level global variables
- `ruby_vm_collect_usage_func_(insn|operand|register)'
- for (1), (2), (3) respectively.
- See codes for more details.
+Wed Feb 18 10:29:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/instruction.rb: fix macro names.
+ * thread.c (thread_start_func_2): do not delete main thread from
+ living_threads. [ruby-core:19385], [ruby-core:22158]
- * iseq.c (insn_operand_intern): make it export (used in vm.c).
- fix to skip several processes if not needed (pointer is 0).
+Wed Feb 18 01:05:05 2009 Tanaka Akira <akr@fsij.org>
- * vm_dump.c: move codes for collection features to vm.c.
+ * ext/openssl: avoid cyclic require.
- * vm_exec.h: rename macro and function names.
+ * ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb
- * vm_insnhelper.h: ditto.
+ * ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb.
-Thu Oct 4 18:59:14 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/net/imap.rb: require openssl, instead of openssl/ssl.
- * test/ruby/test_settracefunc.rb (test_tracepoint):
- remove unused test case.
- (this test case is redefined by newer tests)
+ * lib/net/pop.rb: require openssl, instead of openssl/ssl.
-Thu Oct 4 17:24:51 2012 Narihiro Nakamura <authornari@gmail.com>
+ [ruby-dev:38018]
- * gc.c (rb_objspace_call_finalizer): call gc_mark_stacked_objects
- at suitable point.
+Wed Feb 18 00:55:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 4 16:31:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/etc/etc.c (Etc::Passwd.each, Etc::Group.each): new methods.
+ [ruby-dev:37999]
- * gc.c (rb_objspace_call_finalizer): mark self-referencing finalizers
- before run finalizers, to fix SEGV from btest on 32bit.
+Tue Feb 17 23:25:01 2009 Tanaka Akira <akr@fsij.org>
- * gc.c (gc_mark_stacked_objects): extract from gc_marks().
+ * ext/socket/ancdata.c (bsock_sendmsg_internal): make the padding
+ removing only on NetBSD.
-Thu Oct 4 11:43:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 17 19:39:04 2009 Tanaka Akira <akr@fsij.org>
- * thread_pthread.c (ruby_init_stack): round stack limit to page size
- boundary to calculate stack size more precisely. [ruby-dev:46174]
- [Bug #7084]
+ * ext/socket/ancdata.c (bsock_sendmsg_internal): should not remove the
+ last padding of control messages, basically.
-Wed Oct 3 19:51:57 2012 Narihiro Nakamura <authornari@gmail.com>
+Tue Feb 17 12:50:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c: Use the non-recursive marking instead of recursion. The
- recursion marking of CRuby needs checking stack overflow and the
- fail-safe system, but these systems not good at partial points,
- for example, marking deep tree structures. [ruby-dev:46184]
- [Feature #7095]
+ * string.c (rb_str_shared_replace): no need for
+ str_make_independent.
- * configure.in (GC_MARK_STACKFRAME_WORD): removed. It's used by
- checking stack overflow of marking.
+Tue Feb 17 05:41:08 2009 Koichi Sasada <ko1@atdot.net>
- * win32/Makefile.sub (GC_MARK_STACKFRAME_WORD): ditto.
+ * compile.c: fix to add "ensure" codes across "while" clause
+ before "return" expression. [ruby-dev:37967]
-Wed Oct 3 15:33:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bootstraptest/test_flow.rb: add a test.
- * thread_pthread.c (ruby_init_stack): use getrlimit() for the main
- thread on Mac OS X, since pthread_get_stack{addr,size}_np()
- return the default value always, but not the ulimit value.
- [ruby-dev:46174] [Bug #7084]
+Tue Feb 17 01:53:35 2009 Tanaka Akira <akr@fsij.org>
-Wed Oct 3 11:43:15 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: generate rb_define_const directly for
+ rdoc.
- * io.c (rb_io_reopen): improvement to accept optional arguments.
- a patch by Glass_saga (Masaki Matsushita) in [ruby-core:47806].
- [Feature #7103]
+ * ext/.document: add socket/constdefs.c.
-Wed Oct 3 04:36:11 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/constants.c (sock_define_const): removed.
+ (sock_define_uconst): ditto.
+ (rb_mSockConst): new static variable.
- * ext/openssl/ossl_x509store.c (ossl_x509store_add_file): Added
- documentation
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
- ditto
- * ext/openssl/ossl_x509store.c (ossl_x509store_add_cert): ditto
+Mon Feb 16 23:14:51 2009 Tanaka Akira <akr@fsij.org>
-Wed Oct 3 02:23:37 2012 Shugo Maeda <shugo@ruby-lang.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.
- * error.c (exc_to_s, name_err_to_s, name_err_mesg_to_str): do not
- taint messages.
+Mon Feb 16 21:59:32 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Tue Oct 2 16:47:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * symbian/setup: Update Symbian config to match recent changes in missing/alloca.c
- * eval.c (identity_hash_new): hide internal hashes for refinements.
+Mon Feb 16 17:04:14 2009 Akinori MUSHA <knu@iDaemons.org>
- * eval.c (rb_mod_refine): no default value.
+ * 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 Oct 1 22:54:02 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Feb 16 16:46:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (identity_hash_new): new function to create a new identity
- hash.
+ * debug.c (set_debug_option): added rtc_error option.
- * eval.c (rb_overlay_module, rb_mod_using, rb_mod_refine): use
- identity_hash_new().
+ * win32/Makefile.sub (CRTDEFFLAGS): separated from DEFS.
-Mon Oct 1 02:34:53 2012 Akinori MUSHA <knu@iDaemons.org>
+ * win32/win32.c (rtc_error_handler): ignores RTC errors unless
+ rtc_error debug option is given.
- * configure.in (--with-opt-dir): Make this also work on DLDFLAGS
- so LIBRUBY_SO links fine with libexecinfo installed in a
- non-system directory.
+ * win32/win32.c (rb_w32_sysinit): suppress useless CRT assertions.
+ [ruby-core:22116]
-Sun Sep 30 23:32:00 2012 Kenta Murata <mrkn@mrkn.jp>
+Sun Feb 15 21:43:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_dump.c (rb_vm_bugreport): add /Library/Logs/DiagnosticReports
- in the list of locations of crash reports.
+ * lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen.
+ [ruby-talk:328195], [ruby-core:22142]
-Sun Sep 30 21:18:03 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Feb 15 21:22:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_concat): use memcpy to copy a string which contains
- NUL characters. [ruby-core:47751] [Bug #7090]
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions): aliases
+ assert_not_ methods.
-Sat Sep 29 19:41:53 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Feb 15 16:57:35 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process
- before Timeout::Error is raised. rmdir of mktmpdir fails with
- EACCES if child process is alive on Windows.
+ * lib/securerandom.rb (SecureRandom.urlsafe_base64): new method.
- * test/thread/test_queue.rb (TestQueue): increase timeout.
- This test takes long time on Windows XP.
+Sun Feb 15 14:58:07 2009 Tanaka Akira <akr@fsij.org>
-Sat Sep 29 19:41:33 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * hash.c (hash_i): use Murmurhash.
- * test/net/http/test_http.rb (TestNetHTTP#test_proxy_address):
- clear environment variables. If http_proxy environment variable was
- set, the test failed.
+Sun Feb 15 11:45:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/net/http/test_http.rb (TestNetHTTP#test_proxy_port): ditto.
+ * variable.c (rb_define_hooked_variable): suppress false assertion
+ with VC9. [ruby-core:22115]
-Sat Sep 29 19:41:11 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Feb 15 08:35:33 2009 Tanaka Akira <akr@fsij.org>
- * test/drb/drbtest.rb (DRbCore#teardown):
- Use Process.kill :KILL on Windows because Process.kill :INT silently
- fails on Windows 7 and raises EINVAL on Windows XP for spawned
- process with new_pgroup: false.
+ * test/test_pp.rb: extract from lib/pp.rb.
- * test/drb/drbtest.rb (DRbAry#teardown): ditto.
+ * test/test_prettyprint.rb: extract from lib/prettyprint.rb.
-Sat Sep 29 19:40:32 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * test/test_tsort.rb: extract from lib/tsort.rb.
- * test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic):
- set script encoding to work with LANG=C. It would work on both
- Windows and Unix. Refix of r37051.
+Sun Feb 15 06:34:22 2009 Tanaka Akira <akr@fsij.org>
-Sat Sep 29 11:21:06 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/time.rb (Time.parse): raise ArgumentError if Date._parse don't
+ extract date information. [ruby-core:20912]
- * vm_insnhelper.c (rb_vm_using_modules): use using_modules before
- klass to fix method lookup order, and use klass even if klass is
- not a module to make refinements in class_eval invoked on classes
- work.
+Sun Feb 15 04:48:08 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * eval.c (rb_using_module): accept a class as the second argument.
+ * string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
+ include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784]
- * eval.c (rb_mod_using, f_using): raise a TypeError if the argument
- is not a module.
+ * 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]
- * test/ruby/test_refinement.rb: add new tests for the above changes.
+Sun Feb 15 03:50:21 2009 Yusuke Endoh <mame@tsg.ne.jp>
-Sat Sep 29 02:18:57 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * 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_unicode_escape.rb (TestUnicodeEscape#test_basic):
- Use ruby only on Windows since the test fails on Unix with LANG=C.
- [ruby-core:47709] [Bug #7076]
+ * test/ruby/test_hash.rb: add a test for above.
-Fri Sep 28 22:19:31 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Feb 15 00:45:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic):
- echo command doesn't work properly against non-ascii character on
- Windows with chcp 437. Instead we use ruby.
- [ruby-core:47709] [Bug #7076]
+ * array.c (rb_ary_uniq_bang, rb_ary_uniq): unique by the result of
+ given block. [ruby-dev:37998]
-Fri Sep 28 17:54:31 2012 Koichi Sasada <ko1@atdot.net>
+Sun Feb 15 00:39:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (vm_setup_method): refactoring.
- Remove src_argc and use iseq->arg_size directly.
+ * array.c (ary_resize_capa): should not overwrite outside embedded
+ array.
-Fri Sep 28 17:26:27 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Feb 14 20:18:19 2009 Tanaka Akira <akr@fsij.org>
- * lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):
- test_generate_bin_bindir_with_user_install_warning(TestGemInstaller)
- fails on Windows with msys bash. It makes comparing paths
- case-insensitive.
- pick from upstream to fix a failure of test-all [ruby-core:47711]
- https://github.com/rubygems/rubygems/commit/c474edb2f3704206f04da1c8c6cf9fb079d84abe
+ * test/test_time.rb: extracted from lib/time.rb.
-Fri Sep 28 15:44:45 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sat Feb 14 19:20:15 2009 Tanaka Akira <akr@fsij.org>
- * vm_method.c (search_method): copy refinement iclasses to search
- superclasses correctly.
+ * lib/pathname.rb: obsolete methods removed.
+ [ruby-core:21564]
- * test/ruby/test_refinement.rb: related test.
+Sat Feb 14 15:46:01 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Sep 28 15:15:41 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/pathname.rb (Pathname#binread): added. [ruby-dev:37952]
- * insns.def (opt_checkenv): remove unused instruction `opt_checkenv'.
+Sat Feb 14 13:14:18 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * compile.c (iseq_compile_each): ditto.
+ * iseq.c: remove nil parameter from Proc#parameters
+ after rest appeared.
- * node.h: remove unused node `NODE_OPTBLOCK'.
+Sat Feb 14 07:23:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/objspace/objspace.c, gc.c (gc_mark_children): ditto.
+ * string.c (rb_external_str_new_with_enc): change evaluation order
+ for speed.
-Fri Sep 28 13:14:34 2012 Koichi Sasada <ko1@atdot.net>
+Sat Feb 14 02:20:04 2009 Tanaka Akira <akr@fsij.org>
- * vm_core.h: now VM_DEBUG_BP_CHECK should be 1.
+ * ext/socket/sockport.h (SET_SA_LEN): cast to void for suppressing a
+ warning.
-Fri Sep 28 12:51:54 2012 Koichi Sasada <ko1@atdot.net>
+Fri Feb 13 23:37:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h: remove rb_control_frame_t::bp (bp: base pointer).
- `bp' can be calculate by `sp' (stack pointer) of previous frame.
- Now, `bp_check' field is remained for debug. You can eliminate
- this field by setting VM_DEBUG_BP_CHECK as 0.
+ * ext/dl/win32/lib/Win32API.rb (Win32API#initialize): DL.dlopen
+ raises DLError.
- * vm_insnhelper.c (vm_base_ptr): add `vm_base_ptr(cfp).
- This function calculates base pointer from cfp.
+Fri Feb 13 21:13:19 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (vm_setup_method): push `recv' value on top of
- value stack (before method parameters).
- This change is for keeping consistency with normal method dispatch.
+ * ext/socket/socket.c (Init_socket): define TCPServer#listen and
+ UNIXServer#listen here for rdoc.
- * insns.def: fix to use vm_base_ptr().
+Fri Feb 13 20:59:48 2009 Tanaka Akira <akr@fsij.org>
- * vm.c (vm_exec): ditto.
+ * ext/socket/ancdata.c (extract_ipv6_pktinfo): set sa_len for 4.4BSD.
- * vm_dump.c: remove `bp' related dumps.
+Fri Feb 13 15:34:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * cont.c (fiber_init): fix to check VM_DEBUG_BP_CHECK.
+ * iseq.c (simple_default_value): removed. default values of optional
+ parameters are not available still now. [ruby-dev:37980]
-Fri Sep 28 10:40:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Feb 13 15:11:11 2009 Koichi Sasada <ko1@atdot.net>
- * io.c (rb_io_reopen): accept File::Constants as well as mode string.
- based on the patch by Glass_saga (Masaki Matsushita) in
- [ruby-core:47694]. [Feature #7067]
+ * 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]
-Thu Sep 27 18:36:51 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp()
+ on vm_core.h.
- * eval.c (rb_overlay_module, rb_mod_refine): accept a module as the
- argument of Module#refine.
+Fri Feb 13 15:01:40 2009 Koichi Sasada <ko1@atdot.net>
- * vm_method.c (search_method): if klass is an iclass, lookup the
- original module of the iclass in omod in order to allow
- refinements of modules.
+ * cont.c (rb_fiber_alive_p): fix to return true instead of 0.
+ [ruby-dev:37991]
- * test/ruby/test_refinement.rb: add tests for the above changes.
+ * test/ruby/test_fiber.rb: add a test for Fiber#alive?
-Thu Sep 27 18:12:20 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Feb 13 09:43:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/syslog/lib/syslog/logger.rb: add a formatter to the
- Syslog::Logger object. [Bug #7065]
- * test/syslog/test_syslog_logger.rb: ditto.
+ * configure.in (ac_cv_func_flock): using flock defined in
+ win32/win32.c on mingw.
-Wed Sep 26 16:39:57 2012 Koichi Sasada <ko1@atdot.net>
+Fri Feb 13 01:45:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def: add new instruction `opt_empty_p' for optimize `empty?'
- method. Apply a patch proposed at [ruby-dev:46120]
- [ruby-trunk - Feature #6972] by Glass_saga (Masaki Matsushita).
+ * compile.c (iseq_set_sequence, compile_dstr_fragments),
+ (iseq_compile_each): hides other internal objects.
- * compile.c (iseq_specialized_instruction), vm.c, vm_insnhelper.h:
- ditto.
+ * compile.c (iseq_compile_each): just freeze xstr.
- * id.c, template/id.h.tmpl: ditto.
+Fri Feb 13 00:48:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_optimization.rb: test for this changes.
+ * insns.def (defineclass): try to autoload const to be overridden.
-Tue Sep 25 09:59:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 12 23:22:29 2009 Tanaka Akira <akr@fsij.org>
- * insns.def (invokesuper): klass in cfp is not valid in at_exit and
- END blocks. [ruby-core:47680] [Bug #7064]
+ * test/socket/test_socket.rb (test_udp_server): filter out unreachable
+ addresses. [ruby-dev:37970]
-Tue Sep 25 08:11:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Feb 12 22:51:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c (rb_iseq_defined_string): the index of defined_strings must
- be the value of type - 1.
+ * compile.c (hide_obj): OBJ_FREEZE() is not an expression. a patch
+ from nagachika <nagachika00 AT gmail.com> at [ruby-dev:37977].
-Mon Sep 24 17:36:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * compile.c (insn_set_sc_state): fixed typo.
- * compile.c (defined_expr), insns.def (defined): share single frozen
- strings. [EXPERIMENTAL] [ruby-core:47558][Feature #7035]
+Thu Feb 12 12:36:35 2009 Tanaka Akira <akr@fsij.org>
- * iseq.c (rb_iseq_defined_string): make expression strings.
+ * ext/socket/basicsocket.c (bsock_getpeereid): implemented for Solaris
+ using getpeerucred.
-Mon Sep 24 11:22:36 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/extconf.rb: check ucred.h and getpeerucred.
- * tool/merger.rb: add --ticket option to add ticket number.
+ * ext/socket/rubysocket.h: include ucred.h if available.
-Sun Sep 23 21:51:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 12 19:42:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (String#unspace): unescape with backslashes. normal
- makes need to escape spaces with backslashes. nmake is not the
- case. [Bug #7036]
+ * compile.c (compile_array_, defined_expr, iseq_compile_each): hide
+ and freeze internal literal objects, to prevent from modifying.
+ [ruby-dev:37959]
- * lib/mkmf.rb (create_makefile): use timestamp file dependencies for
- directories.
+ * iseq.c (insn_operand_intern): copy internal literal objects.
- * lib/mkmf.rb: unexpand macros.
+ * insns.def (putstring, duparray): ditto.
- * lib/mkmf.rb (LIBPATHFLAG): no needs to escape library path here.
+ * string.c (rb_str_replace): exported.
- * lib/mkmf.rb (MakeMakefile#configuration): make prefix paths
- internal to deal with in Makefile.
+Thu Feb 12 17:17:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (MakeMakefile#mkintpath): not a global function now.
+ * ext/stringio/stringio.c (strio_ungetc): calculates new position
+ before reallocation. [Bug#1099]
-Sun Sep 23 02:33:37 2012 Benoit Daloze <eregontp@gmail.com>
+Thu Feb 12 16:50:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c: Fix examples of r36993.
- Keep the simple definition, mathematics define the result.
- Based on patch by Robin Dupret. Fixes #188 on github.
+ * configure.in: a patch to build on GNU/kOpenSolaris from Rober
+ Millan at [ruby-core:21888].
-Sat Sep 22 07:15:00 2012 Zachary Scott <zzak@ruby-lang.org>
+Thu Feb 12 15:28:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/ripper/lib/ripper.rb:
- Match sample output to Ripper.sexp from current trunk version.
- [Bug #6929]
+ * iseq.c (simple_default_value): allow plain strings as default
+ values.
-Thu Sep 20 23:05:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Feb 11 18:09:41 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread_pthread.c (native_cond_initialize): destroy condattr
- after using it. Patch by Stanislav Sedov. Thank you.
- [Bug #7041] [ruby-core:47619]
+ * gc.c (define_final, undefine_final): shouldn't add/remove finalizer
+ of frozen objects.
-Thu Sep 20 22:53:02 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * gc.c (undefine_final): should remove FL_FINALIZE flag.
+ [ruby-dev:37964] (also see [ruby-dev:37959])
- * thread_pthread.c (native_cond_initialize): clean up #ifdef condition.
+Wed Feb 11 17:37:41 2009 Tanaka Akira <akr@fsij.org>
-Thu Sep 20 16:42:44 2012 NARUSE, Yui <naruse@ruby-lang.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.
- * lib/drb/ssl.rb (DRb::DRbSSLSocket::SSLConfig::DEFAULT): add
- SSLTmpDhCallback for configuration option.
+Wed Feb 11 17:34:16 2009 Tanaka Akira <akr@fsij.org>
- * lib/drb/ssl.rb (setup_ssl_context): copy the value of tmp_dh_callback.
+ * 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.
- * test/drb/ut_array_drbssl.rb: set tmp_dh_callback to suppress warning.
+Wed Feb 11 17:01:52 2009 Tanaka Akira <akr@fsij.org>
- * test/drb/ut_drb_drbssl.rb: ditto.
+ * ext/socket/lib/socket.rb (Socket.unix_server_loop): use
+ unix_server_socket with a block.
-Thu Sep 20 10:56:08 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 11 16:54:26 2009 Tanaka Akira <akr@fsij.org>
- * test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
- with another method. if the substitution is removed, the ExtSrv
- object will be GC'ed and some tests will be blocked.
+ * ext/socket/lib/socket.rb (Socket.unix_server_socket): close the
+ socket when the block exits.
-Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
+Wed Feb 11 16:50:59 2009 Tanaka Akira <akr@fsij.org>
- * complex.c: Examples for Complex Documentation.
- Patch by Robin Dupret.
- Fixes #184 on github.
+ * ext/socket/lib/socket.rb (Socket.unix_server_socket): call the block
+ if given. remove the socket file when the block exits.
-Thu Sep 20 07:15:00 2012 Zachary Scott <zzak@ruby-lang.org>
+Wed Feb 11 16:44:20 2009 Tanaka Akira <akr@fsij.org>
- * ext/ripper/lib/ripper.rb: Documentation for Ripper.
- +:void_stmt+ is meaningless
- [Bug #6929] [ruby-core:47507]
+ * ext/socket/ancdata.c (ancillary_s_ip_pktinfo): make 3rd argument
+ optional.
-Thu Sep 20 07:05:00 2012 Zachary Scott <zzak@ruby-lang.org>
+Wed Feb 11 15:47:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv):
- Examples and documentation for CSV.
- [Bug #6880] [ruby-core:47218]
+ * array.c (ary_make_shared): returns shared root array itself, and
+ frozen array can be shared.
-Thu Sep 20 00:42:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 11 14:46:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (take_items), enum.c (enum_zip): raise TypeError at
- non-enumerable objects, not NoMethodError. [ruby-dev:46145]
- [Bug #7038]
+ * insns.def (setspecial, putstring): fixed typos in rdoc.
- * vm_eval.c (rb_check_block_call): check_funcall variant with block
- function.
+ * insns.def (toregexp): uses rb_ary_tmp_new(), and clears it after
+ used.
-Tue Sep 18 17:51:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Feb 11 14:08:23 2009 Tanaka Akira <akr@fsij.org>
- * ext/openssl/ossl_ssl.c (ossl_sslctx_attrs): add npn_select_db to
- suppress warning: instance variable @npn_select_cb not initialized
+ * 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.
-Sun Sep 16 17:47:00 2012 Eric Hodel <drbrain@segment7.net>
+Wed Feb 11 12:55:07 2009 Tanaka Akira <akr@fsij.org>
- * tool/change_maker.rb: Update svn detection for subversion 1.7's
- single .svn directory.
+ * ext/socket/ancdata.c (anc_inspect_ip_pktinfo): make result bit
+ succinct.
+ (Init_ancdata): fix number of arguments.
-Sun Sep 16 11:39:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 11 11:47:41 2009 Tanaka Akira <akr@fsij.org>
- * io.c (io_set_read_length): if the read length equals to the buffer
- string size then nothing to do. or ensure the string modifiable
- before setting the length only when the former is shorter. based on
- the patch in [ruby-core:47541] by Hiroshi Shirosaki.
- [ruby-core:46586] [Bug #6764]
+ * ext/socket/ipsocket.c (Init_ipsocket): undef getpeereid at IPSocket.
-Sun Sep 16 08:57:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 11 10:16:34 2009 Tanaka Akira <akr@fsij.org>
- * configure.in (strict_warnflags): separate strict flags from
- warnflags only for core. [ruby-dev:46105]
+ * ext/socket/extconf.rb: check getpeereid.
-Sun Sep 16 08:16:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/basicsocket.c (bsock_getpeereid): new method.
- * .editorconfig: add. [ruby-core:47548] [Feature #7030]
+Wed Feb 11 09:58:59 2009 Tanaka Akira <akr@fsij.org>
-Sat Sep 15 01:56:40 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/lib/socket.rb (Socket::UDPSource#inspect): fix variable
+ name.
- * ext/nkf/nkf-utf8/nkf.c: Merge upstream: 50a383c84.
- [ruby-dev:46128] [Bug #7005]
+Wed Feb 11 00:38:16 2009 Tanaka Akira <akr@fsij.org>
-Sat Sep 15 00:20:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX.
- * ext/nkf/nkf.c (rb_nkf_convert): suppress warning.
+ * ext/socket/raddrinfo.c (make_ipaddr): local variable renamed.
-Fri Sep 14 04:05:00 2012 Zachary Scott <zzak@ruby-lang.org>
+Tue Feb 10 23:44:53 2009 Tanaka Akira <akr@fsij.org>
- * array.c (rb_ary_diff, rb_ary_uniq):
- Enhance documentation for array uniqueness
- Based on a patch by Robin Dupret
- [Bug #6872] [ruby-core:47209]
+ * 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.
-Fri Sep 14 03:30:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/socket.c (sock_accept): use struct sockaddr_storage.
+ (sock_accept_nonblock): ditto.
+ (sock_sysaccept): ditto.
- * array.c (rb_ary_select):
- Update documentation for Array#select
- * enum.c (enum_find_all, enum_reject):
- Update documentation for Enumerable#find_all and Enumerable#reject
- Based on a patch by Jeff Saracco
- [Bug #6908] [ruby-core:47285] [Fixes #166 on github]
+ * ext/socket/ancdata.c (bsock_recvmsg_internal): use struct
+ sockaddr_storage.
-Fri Sep 14 00:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
+Tue Feb 10 23:30:32 2009 Tanaka Akira <akr@fsij.org>
- * signal.c (rb_f_kill):
- Update documentation for Process.kill to reflect kill(2)
- Patch by Richo Healey
+ * ext/socket/basicsocket.c (bsock_getpeername): use struct
+ sockaddr_storage.
+ (bsock_local_address): ditto.
+ (bsock_remote_address): ditto.
-Thu Sep 13 21:40:49 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Tue Feb 10 21:26:33 2009 Tanaka Akira <akr@fsij.org>
- * lib/securerandom.rb (SecureRandom.random_bytes):
- Use 64bit value as pointer for Windows x64 to fix SystemCallError.
+ * 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.
- * lib/securerandom.rb (SecureRandom.lastWin32ErrorMessage):
- Set proper encoding to avoid invalid byte sequence error.
- [ruby-core:47451] [Bug #6990]
+Tue Feb 10 21:14:43 2009 Tanaka Akira <akr@fsij.org>
-Thu Sep 13 11:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/socket.c (sockaddr_obj): fill pfamily.
- * lib/optparse.rb: Remove unreachable email address from documentation
- [Bug #6996] [ruby-core:47459]
+Tue Feb 10 21:09:23 2009 Tanaka Akira <akr@fsij.org>
-Thu Sep 13 11:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/option.c (sockopt_s_bool): new method.
+ (sockopt_bool): new method.
- * lib/xmlrpc.rb: Documentation for XMLRPC
- * lib/xmlrpc/datetime.rb: ditto.
- * lib/xmlrpc/parser.rb: ditto.
- * lib/xmlrpc/client.rb: ditto.
- * lib/xmlrpc/utils.rb: ditto.
- * lib/xmlrpc/README.rdoc: ditto.
- * lib/xmlrpc/create.rb: ditto.
- * lib/xmlrpc/base64.rb: ditto.
- * lib/xmlrpc/config.rb: ditto.
- * lib/xmlrpc/httpserver.rb: ditto.
- * lib/xmlrpc/server.rb: ditto.
- * lib/xmlrpc/marshal.rb: ditto.
- * lib/xmlrpc/README.txt: ditto.
- [Bug #6909] [ruby-core:47286]
+Tue Feb 10 20:58:47 2009 Tanaka Akira <akr@fsij.org>
-Thu Sep 13 10:22:11 2012 Takashi Toyoshima <toyoshim@gmail.com>
+ * 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.
- * configure.in: Don't use PIE on Haiku because loader support is not
- enough.
+Tue Feb 10 20:56:07 2009 Tanaka Akira <akr@fsij.org>
-Thu Sep 13 08:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/ancdata.c (anc_inspect_socket_creds): refactored to avoid
+ a rb_str_cat2 call.
- * lib/shellwords.rb: Documentation for Shellwords.
+Tue Feb 10 04:34:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Sep 13 08:00:00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * configure.in (when): makes parentheses balanced.
- * ext/ripper/lib/ripper.rb: Documentation for Ripper.
- * ext/ripper/lib/ripper/lexer.rb: ditto.
- * ext/ripper/lib/ripper/sexp.rb: ditto.
- * ext/ripper/lib/ripper/filter.rb: ditto.
- * ext/ripper/lib/ripper/core.rb: ditto.
- [Bug #6929] [ruby-core:47309]
+Tue Feb 10 01:28:49 2009 Tanaka Akira <akr@fsij.org>
-Wed Sep 12 22:59:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/ancdata.c (ip_cmsg_type_to_sym): renamed from
+ cmsg_type_to_sym.
- * vm_insnhelper.c (vm_method_missing, vm_call_method): reuse arguments
- on the VM stack and get rid of ALLOCA.
+Tue Feb 10 01:22:56 2009 Tanaka Akira <akr@fsij.org>
-Wed Sep 12 22:45::00 2012 Zachary Scott <zzak@ruby-lang.org>
+ * ext/socket/option.c (sockopt_inspect): refactored.
- * ext/pathname/lib/pathname.rb: Documentation for Pathname.
- * ext/pathname/pathname.c: ditto.
- [Bug #6947] [ruby-core:47354]
+Tue Feb 10 01:02:16 2009 Tanaka Akira <akr@fsij.org>
-Mon Sep 10 10:19:34 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/mkconstants.rb: generate intern_family_noprefix.
- * enc/depend: fixed wrong change in a part of r34802.
+ * ext/socket/option.c (sockopt_inspect): use intern_family_noprefix
+ not to show AF_ prefix.
-Sun Sep 9 22:02:50 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/socket/ancdata.c (ancillary_inspect): ditto.
- * ext/socket/basicsocket.c (rsock_bsock_send):
- avoid unnecessary select() calls before doing I/O
- Patch by Eric Wong. [Feature #4538] [ruby-core:35586]
- * ext/socket/init.c (rsock_s_recvfrom): ditto.
- * ext/socket/init.c (rsock_s_accept): ditto.
- * ext/socket/udpsocket.c (udp_send): ditto.
- * io.c (io_fflush): ditto.
- * io.c (io_binwrite): ditto.
- * io.c (rb_io_syswrite): ditto.
+Mon Feb 9 23:21:29 2009 Tanaka Akira <akr@fsij.org>
-Mon Sep 10 01:38:51 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * 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.
- * io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
- suppress integer <-> pointer cast warnings.
- [Feature #4570] [ruby-core:35711]
+ * ext/socket/mkconstants.rb: generate unknown_level_to_int.
+ rename iplevel_to_int to ip_level_to_int.
-Mon Sep 10 01:36:00 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 9 23:04:27 2009 Tanaka Akira <akr@fsij.org>
- * io.c (rb_io_close): notify fd close before releasing gvl.
- * io.c (fptr_finalize): modify fptr->mode before releasing gvl.
- remove unnecessary rb_thread_fd_close().
- [Feature #4570] [ruby-core:35711]
+ * ext/socket/mkconstants.rb: rename level_to_int to iplevel_to_int.
+ rename intern_level to intern_iplevel.
-Mon Sep 10 00:16:34 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/constants.c: follow the renaming.
- * process.c: exec() requires to be single threaded also on Haiku.
- by Takashi Toyoshima <toyoshim@gmail.com>
- https://github.com/ruby/ruby/pull/178
+ * ext/socket/option.c: ditto.
-Sun Sep 9 21:21:15 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/socket/ancdata.c: ditto.
- * lib/thread.rb (Queue#pop): Fixed double registration issue when
- mutex.sleep is interrupted. [Bug #5258] [ruby-dev:44448]
- * lib/thread.rb (SizedQueue#push): ditto.
+Mon Feb 9 22:52:13 2009 Tanaka Akira <akr@fsij.org>
- * test/thread/test_queue.rb (test_sized_queue_and_wakeup,
- test_queue_pop_interrupt, test_sized_queue_pop_interrupt,
- test_sized_queue_push_interrupt): new tests.
+ * ext/socket/rubysocket.h (level_arg): add family argument.
+ (optname_arg): ditto.
+ (cmsg_type_arg): ditto.
+ (rb_sock_getfamily): declared.
-Sun Sep 9 20:20:31 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/socket/constants.c (level_arg): add family argument.
+ (optname_arg): ditto.
+ (cmsg_type_arg): ditto.
- * lib/sync.rb (Sync_m#sync_lock): Fixed wakeup/raise unsafe code.
- Patched by Masaki Matsushita. [Bug #5355] [ruby-dev:44521]
+ * ext/socket/init.c (rb_sock_getfamily): defined.
- * test/thread/test_sync.rb (test_sync_lock_and_wakeup,
- test_sync_upgrade_and_wakeup, test_sync_lock_and_raise):
- new test.
+ * ext/socket/option.c (sockopt_initialize): give family for level_arg
+ and optname_arg.
+ (sockopt_s_int): ditto.
-Sun Sep 9 18:39:46 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/socket/basicsocket.c (bsock_setsockopt): ditto.
+ (bsock_getsockopt): ditto.
- * include/ruby/intern.h (rb_thread_blocking_region): Added
- a comment of recommended alternative way.
+ * 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.
-Sun Sep 9 18:37:05 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 9 21:48:59 2009 Tanaka Akira <akr@fsij.org>
- * lib/sync.rb (Sync_m): Removed RCS_ID.
+ * ext/socket/ancdata.c (ancillary_inspect): show address family.
-Sun Sep 9 18:21:03 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 9 20:19:36 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_io.rb (test_advise_pipe): new test to check
- io.advise() against anonymous io object don't make crash.
- made by Eric Wong. [Bug #6081] [ruby-core:42880]
+ * ext/socket/basicsocket.c (bsock_getsockname): use sockaddr_storage.
-Sun Sep 9 16:47:12 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 9 20:11:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
- new functions.
- * io.c (fptr_finalize): release GVL if possible.
- Patched by Eric Wong. [Feature #4570] [ruby-core:35711]
+ * ext/win32ole/win32ole.c (load_conv_function51932): fixed for the
+ case IMultiLanguage is not available. [ruby-dev:37950]
-Sun Sep 9 16:08:48 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 9 20:04:35 2009 Tanaka Akira <akr@fsij.org>
- * io.c (io_bufread): removed unnecessary rb_thread_wait_fd().
- Patch by Eric Wong. [Bug #6629] [ruby-core:45789]
- * io.c (rb_io_sysread): ditto.
- * io.c (copy_stream_fallback_body): ditto.
+ * 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.
-Sun Sep 9 15:21:52 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 9 20:00:26 2009 Tanaka Akira <akr@fsij.org>
- * thread.c (rb_mutex_lock): stop multiple threads use
- pthread_cond_timedwait() concurrently. [Bug #6278] [ruby-core:44275]
+ * ext/socket/mkconstants.rb: more constants for Solaris.
-Sat Sep 8 18:52:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 9 19:59:18 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (struct rb_classext_struct): move allocator function into
- rb_classext_t from ordinary method table. [ruby-dev:46121]
- [Feature #6993]
+ * ext/socket/basicsocket.c (bsock_getsockopt): refine address family
+ examination.
- * object.c (rb_obj_alloc): call allocator function directly.
+Mon Feb 9 19:52:32 2009 Tanaka Akira <akr@fsij.org>
- * vm_method.c (rb_define_alloc_func, rb_undef_alloc_func)
- (rb_get_alloc_func): use allocator function in rb_classext_t.
+ * ext/socket/option.c (sockopt_initialize): argument conversion
+ reordered.
-Fri Sep 7 01:21:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 9 19:46:22 2009 Tanaka Akira <akr@fsij.org>
- * ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting
- options with an argument, not using NUL as special character.
- [ruby-core:47447] [Bug #6987]
+ * 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.
-Thu Sep 6 14:49:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 9 11:31:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * .gdbinit (rp): FLONUM support.
+ * io.c (io_encoding_set): ignore second argument when external and
+ internal are same. [ruby-dev:37939]
- * include/ruby/ruby.h (ruby_special_consts): define FLONUM constants
- always, so that they are available from gdb.
+Mon Feb 9 09:05:12 2009 Tanaka Akira <akr@fsij.org>
- * include/ruby/ruby.h (RB_FLOAT_TYPE_P): merge FLONUM and non-FLONUM
- versions. inline TYPE() comparison and FLONUM_P() should be
- optimized away on non-FLONUM.
+ * ext/socket/option.c (inspect_local_peercred): check version.
+ (sockopt_inspect): suppress warning.
-Thu Sep 6 08:20:55 2012 Ryan Davis <ryand-ruby@zenspider.com>
+Mon Feb 9 02:04:03 2009 Tanaka Akira <akr@fsij.org>
- * lib/minitest/*: Imported minitest 3.4.0 (r7762)
- * test/minitest/*: ditto
+ * ext/socket/option.c (inspect_peercred): struct ucred contains
+ effective uid/gid.
-Wed Sep 5 19:20:53 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Feb 9 00:44:45 2009 Tanaka Akira <akr@fsij.org>
- * parse.y (rb_warn4S): renamed from rb_warn4(), because the case in
- r36911 takes a string.
+ * ext/socket/option.c (sockopt_inspect): add ifdef guard for
+ LOCAL_PEERCRED.
- * parse.y (rb_warn4S): use ripper_warnS() for ripper.
+Mon Feb 9 00:37:06 2009 Tanaka Akira <akr@fsij.org>
- * parse.y (ripper_warnS): now it is used.
+ * ext/socket/option.c (inspect_local_peercred): cr_uid is a effective
+ uid, not a real uid.
-Wed Sep 5 15:51:52 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+Mon Feb 9 00:30:56 2009 Tanaka Akira <akr@fsij.org>
- * .travis.yml (notifications): [experimental] update notification
- template.
+ * ext/socket/extconf.rb: check sys/param.h and sys/ucred.h.
-Wed Sep 5 15:21:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/rubysocket.h: include sys/param.h and sys/ucred.h.
- * parse.y (rb_warn4): added as a rb_warn variant to warn with explicit
- source file name and line in parse.y.
+ * 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.
- * parse.y (warn_unused_var): use rb_warn4 to suppress warning on ripper.
+Mon Feb 9 00:01:47 2009 Tanaka Akira <akr@fsij.org>
-Wed Sep 5 13:30:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/rubysocket.h (sockopt_new): add family argument.
- * dir.c (glob_make_pattern): names under recursive need to be single
- basenames to match for each name. [ruby-core:47418] [Bug #6977]
+ * 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.
-Tue Sep 4 20:55:17 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * ext/socket/basicsocket.c (bsock_getsockopt): check address family
+ using getsockname.
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error
- instead of IOError if the timeout has expired.
+Sun Feb 8 23:37:17 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * test/test_pstore.rb
- (PStoreTest#test_pstore_files_are_accessed_as_binary_files):
- increase timeout because this test is slow on Windows.
- [ruby-core:47402] [Bug #6965]
+ * enumerator.c (enumerator_with_index): receives one argument which
+ represents a start offset. [ruby-dev:37921]
-Tue Sep 4 11:28:57 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+Sun Feb 8 23:28:05 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * vm_eval.c (ruby_eval_string_from_file_protect): initializer
- element is not computable at load time.
+ * 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]
-Tue Sep 4 07:48:35 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sun Feb 8 23:22:35 2009 Tanaka Akira <akr@fsij.org>
- * test/openssl/test_asn1_rb:
- test/openssl/test_ssl_session.rb:
- test/openssl/test_x509name.rb:
- test/openssl/test_buffering.rb:
- test/openssl/test_x509cert.rb:
- test/openssl/test_ssl.rb: Refactor code that leads to warnings on
- Ruby CI.
+ * ext/socket/option.c (inspect_peercred): new function to show
+ SO_PEERCRED socket option on GNU/Linux.
-Tue Sep 4 07:02:56 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sun Feb 8 22:44:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/openssl/utils.rb: Use DSS1 as DSA signature digest for all
- OpenSSL versions < 1.0.0.
- [Feature #6946] [ruby-core:47405]
+ * include/ruby/backward/rubysig.h (rb_thread_blocking_region_begin),
+ (rb_thread_blocking_region_end): marked as deprecated.
-Mon Sep 3 21:22:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/backward/rubysig.h (TRAP_BEG): fix for C++. a
+ patch from Aman Gupta at [ruby-core:21934]
- * include/ruby/ruby.h (rb_float_value): suppress warnings.
- [ruby-core:47406][Bug #6971]
+Sun Feb 8 21:47:50 2009 Tanaka Akira <akr@fsij.org>
-Mon Sep 3 14:49:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/extconf.rb: check struct cmsgcred.
- * lib/matrix.rb (Vector#magnitude): accumulate squares of absolute
- values to fix for complex vector. [ruby-dev:46100] [Bug #6966]
+ * ext/socket/ancdata.c (anc_inspect_passcred_credentials): add
+ "(ucred)".
+ (anc_inspect_socket_creds): show struct cmsgcred too, for FreeBSD.
-Mon Sep 3 10:09:36 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sun Feb 8 21:05:35 2009 Tanaka Akira <akr@fsij.org>
- * ext/openssl/extconf.rb: Detect OpenSSL_FIPS macro
- ext/openssl/ossl.c: Expose OpenSSL::OPENSSL_FIPS constant to
- indicate whether OpenSSL runs in FIPS mode.
- test/openssl/test_pkey_dh.rb: Generate 256 bit keys for
- non-FIPS installations to improve test performance (e.g. for
- rubyci).
- test/openssl/utils.rb: Replace DSS1 as certificate signature
- digest with SHA1 for FIPS installations when using DSA by
- introducing TestUtils::DSA_SIGNATURE_DIGEST.
- test/openssl/test_x509cert.rb:
- test/openssl/test_x509crl.rb:
- test/openssl/test_x509req.rb: Use DSA_SIGNATURE_DIGEST
- NEWS: Introduce OpenSSL::OPENSSL_FIPS
+ * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
+ detach spawned process. [ruby-dev:37936]
- These changes allow running the OpenSSL tests in FIPS mode
- while keeping a high performance for non-FIPS installations.
- Introduction of OpenSSL::OPENSSL_FIPS allows for applications
- to react to special requirements when using OpenSSL in FIPS mode.
- [Feature #6946] [ruby-core:47345]
+Sun Feb 8 20:30:29 2009 Tanaka Akira <akr@fsij.org>
-Sun Sep 2 21:46:28 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/socket/extconf.rb: check struct sockcred.
- * test/openssl/utils.rb: Use a cached DH key instead of generating a
- new one each time.
+ * ext/socket/ancdata.c (anc_inspect_socket_creds): new function to
+ show SCM_CREDS on NetBSD.
-Sun Sep 2 05:41:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Feb 8 19:05:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/webrick/ssl.rb (WEBrick::Config::SSL): add new key
- SSLTmpDhCallback to set SSLContext#tmp_dh_callback.
+ * include/ruby/backward/rubysig.h: extern "C" was missing.
+ [ruby-core:21929]
- * lib/webrick/ssl.rb (WEBrick::GenericServer#setup_ssl_context):
- follow above.
+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.
-Sat Sep 1 18:50:50 2012 Akinori MUSHA <knu@iDaemons.org>
+ * configure.in (RUBY_DEFINE_IF): changed parameter order, now
+ condition comes first.
- * lib/set.rb (#initialize_copy, #eql): Use instance_variable_get
- instead of instance_eval.
+ * configure.in (universal_binary): checks architecture macros, and
+ improved thin load paths.
-Fri Aug 31 21:47:56 2012 Kouhei Sutou <kou@cozmixng.org>
+Sun Feb 8 09:41:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/test/unit/test-unit.gemspec: Make test/unit default gem.
- [Feature #6875] [ruby-dev:46051]
+ * runruby.rb: gets extout and arch from rbconfig.rb.
-Fri Aug 31 18:35:02 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sat Feb 7 21:26:15 2009 Tanaka Akira <akr@fsij.org>
- * ext/openssl/extconf.rb: Check existence of OPENSSL_NPN_NEGOTIATED.
- ext/ossl_ssl.c: Support Next Protocol Negotiation. Protocols to be
- advertised by the server can be set in the SSLContext by using
- SSLContext#npn_protocols=, protocol selection on the client is
- supported by providing a selection callback with
- SSLContext#npn_select_cb. The protocol that was finally negotiated
- is available through SSL#npn_protocol.
- test/openssl/test_ssl.rb: Add tests for Next Protocol Negotiation.
- NEWS: add news about NPN support.
- [Feature #6503] [ruby-core:45272]
+ * 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
-Fri Aug 31 17:38:43 2012 Akinori MUSHA <knu@iDaemons.org>
+Sat Feb 7 18:02:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/set.rb (Set#{each,reject!,select!}, SortedSet#each): Pass
- the original block through instead of creating one that only
- yields the passed argument.
+ * configure.in (--with-arch): added new option to support
+ universal binary. replaced --enable-fat-binary option which
+ didn't work actually.
-Fri Aug 31 16:23:20 2012 Akinori MUSHA <knu@iDaemons.org>
+ * configure.in (RUBY_FUNC_ATTRIBUTE): added conditional test.
- * lib/ipaddr.rb: Introduce several new error classes where only
- ArgumentError and StandardError were used. IPAddr::Error is
- their common ancestor class that inherits from ArgumentError for
- backward compatibility. Submitted by Jon Daniel. Fixes #173 on
- GitHub.
+ * configure.in (ac_cv_type_getgroups): declared because getgroups()
+ fills rest of the buffer with garbage on Rosetta.
-Fri Aug 31 14:51:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in (alloca): defines only for powerpc, but always
+ create empty object to suppress ld warning.
- * test/bigdecimal/test_bigdecimal.rb (TestBigDecimal#test_to_f): added
- for previous commit.
+ * configure.in (LIBRUBY_DLDFLAGS): set compatibility version with
+ TEENY.
-Fri Aug 31 14:32:05 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in (CFLAGS, LDFLAGS): separates ARCH_FLAG.
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use self's sign to
- determine 0.0 and Inf's sign instead of internal double value's.
- Reported by phasis68 (Heesob Park) at [ruby-core:47381] [Bug #6955]
+ * configure.in (arch): renamed to "universal" from "fat".
-Fri Aug 31 14:31:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * Makefile.in (ARCH_FLAG): added.
- * template/id.h.tmpl, tool/id2token.rb: make id.h independent from
- parse.h, and make parse.c dependent on it instead.
+ * include/ruby/defines.h (WORDS_BIGENDIAN): uses
+ AC_APPLE_UNIVERSAL_BUILD.
-Fri Aug 31 14:27:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/alloca.c (alloca): defines only if C_ALLOCA is defined.
- * lib/mkmf.rb (create_makefile): fix race conditions at install-ext.
- target files need to depend on destination directory timestamp
- files, not phony targets.
+Sat Feb 7 12:31:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 31 14:03:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * runruby.rb: added --precommand and --show options.
- * vm_trace.c (clean_hooks): do not access freed memory.
+ * runruby.rb: added --cpu option.
- * vm_trace.c (rb_threadptr_exec_event_hooks): fix uninitialized state
- when no events is executed.
+ * runruby.rb: skips version check in rbconfig.rb.
-Thu Aug 30 18:21:51 2012 Tanaka Akira <akr@fsij.org>
+Sat Feb 7 11:44:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_io_close): call rb_last_status_clear.
+ * lib/mkmf.rb (have_header): needs dependent headers if trying to
+ compile.
-Thu Aug 30 16:17:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/extconf.rb: net/if.h depends on other headers.
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): check underflow since
- strtod() sets errno to ERANGE at underflow too. [ruby-core:47342]
- [Bug #6944]
+Sat Feb 7 04:02:37 2009 Tanaka Akira <akr@fsij.org>
-Thu Aug 30 12:44:43 2012 Akinori MUSHA <knu@iDaemons.org>
+ * dir.c (dir_read): don't disable rdoc.
- * lib/set.rb (Set#{<,>,<=,>=}): Define comparison operators as
- shorthand for the {proper_}{subset?,superset?} methods (finally).
- Given a push by Alexander E. Fischer.
+Fri Feb 6 23:28:33 2009 Tanaka Akira <akr@fsij.org>
-Thu Aug 30 09:21:01 2012 NARUSE, Yui <naruse@ruby-lang.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'
- * lib/uri/ftp.rb (URI::FTP#initialize): raise InvalidURIError if "//"
- is not present [ruby-core:47344] [Bug #6945]
+Fri Feb 6 22:36:11 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Thu Aug 30 07:45:12 2012 Luis Lavena <luislavena@gmail.com>
+ * thread_pthread.c (native_thread_create) [__SYMBIAN32__]: reduced pthread stack size.
- * test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for
- posix environments where HOME is not defined. [ruby-core:47322]
+ * thread_pthread.c (thread_timer) [__SYMBIAN32__]: compiled out unsupported yet signal-related functionality.
-Wed Aug 29 23:42:59 2012 Tanaka Akira <akr@fsij.org>
+ * io.c (pipe_open) [__SYMBIAN32__]: fixed compile time error.
- * internal.h (rb_last_status_clear): declared.
+Fri Feb 6 22:11:46 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
- * process.c (rb_last_status_clear): exported.
- (rb_f_system): call rb_last_status_clear.
+ * include/ruby/defines.h [__SYMBIAN32__]: included <sys/select.h> for fd_set definition
- * io.c (rb_f_backquote): call rb_last_status_clear.
+Fri Feb 6 21:58:24 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-Wed Aug 29 22:01:15 2012 Tanaka Akira <akr@fsij.org>
+ * symbian/missing-pips.c: added a stub for missing PIPS function execl.
- * process.c (rb_f_system): check failures of waitpid.
- [ruby-talk:398687]
+ * process.c (rb_proc_exec) [__SYMBIAN32__]: removed conditional around execl function call.
-Wed Aug 29 15:03:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Feb 6 20:37:42 2009 Tanaka Akira <akr@fsij.org>
- * configure.in (LIBDIR_BASENAME): use configured libdir value to fix
- --enable-load-relative on systems where libdir is not default value,
- overridden in config.site files. [ruby-core:47267] [Bug #6903]
+ * 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.
-Wed Aug 29 14:34:41 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * version.c (ruby_initial_load_paths): moved initial load path
+ version depending on version from ruby.c.
- * addr2line.c: SIZE_MAX is defined in stdint.h, so r36755 breaks
- 32bit FreeBSD. [ruby-core:47360] [Bug #6948]
+ * version.h (RUBY_VERSION_{MAJOR,MINOR,TEENY}): now mean library
+ and API version, and reverted to 1.9.1. [ruby-dev:37889]
-Wed Aug 29 04:50:04 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Thu Feb 5 07:39:33 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/openssl/utils.rb
- test/openssl/test_pair.rb
- test/openssl/test_pkey_dh.rb: Use 1024 bit DH parameters to satisfy
- OpenSSL FIPS requirements. Patch by Vit Ondruch.
- [Bug #6938] [ruby-core:47326]
+ * ext/readline/readline.c (Init_readline): remove_history(0) may be
+ NULL. [ruby-dev:37891]
-Tue Aug 28 22:31:49 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Thu Feb 5 03:55:22 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * insns.def (checkmatch): suppress warnings. [ruby-core:47339]
- [Bug #6930]
+ * time.c (LOCALTIME): should call tzset() before localtime_r().
+ [ruby-dev:37896]
-Tue Aug 28 20:03:54 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Feb 5 02:12:35 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
- * configure.in: Fixing Haiku R1/alpha3 build with gcc-4.4.4.
- - omit ANSI standard flags to compile socket extension where
- anonymous union is required.
- - remove redundant -be flags.
- by Takashi Toyoshima <toyoshim@gmail.com>
- https://github.com/ruby/ruby/pull/168
+ * symbian/configure.bat: Updated Symbian configuration procedure to
+ avoid creating files outside build directory
-Tue Aug 28 11:32:37 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * symbian/pre-build: ditto
- * nacl/GNUmakefile.in (.rbconfig.time): r36828 was incomplete.
- It did not run correctly on clean build.
+ * symbian/setup: ditto
-Tue Aug 28 09:25:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * symbian/rubyu.def: removed
- * win32/Makefile.sub (Makefile): make to depend on common.mk, to
- stop and force to re-run make process when common.mk is changed.
+Thu Feb 5 01:44:02 2009 Tanaka Akira <akr@fsij.org>
-Mon Aug 27 20:19:49 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * transcode.c (make_econv_exception): refine error message for
+ undefined conversion. [ruby-core:21828]
- * test/etc/test_etc.rb (TestEtc#test_getgrgid): fix for non unique GID.
- No unixen systems guarantee that GID is unique. Etc.getgrgid would
- not return the first entry in the order of Etc.group for shared GID.
- [ruby-core:47312] [Bug #6935]
+Thu Feb 5 01:18:25 2009 Tanaka Akira <akr@fsij.org>
-Mon Aug 27 18:19:36 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/socket.c (sock_s_socketpair): make 3rd argument optional.
- * include/ruby/ruby.h (rb_float_value): optimize it.
- This technique was pointed by shinichiro.hamaji
- <http://shinh.skr.jp/m/?date=20120825#p02>.
+ * ext/socket/unixsocket.c (unix_s_socketpair): follow the above
+ change.
-Mon Aug 27 15:08:25 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * ext/socket/rubysocket.h (sock_s_socketpair): ditto.
- * common.mk (vm_trace.o): Added a missing dependency.
+Thu Feb 5 00:09:39 2009 Tanaka Akira <akr@fsij.org>
-Sun Aug 26 09:29:32 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+ * ext/socket/raddrinfo.c (addrinfo_ipv6_to_ipv4): new method.
- * nacl/GNUmakefile.in (package): make package should install
- example.html for nacl build
+Wed Feb 4 21:59:31 2009 Tanaka Akira <akr@fsij.org>
- Patch by Takashi Toyoshima <toyoshim AT gmail.com>.
+ * transcode.c (make_econv_exception): show U+XXXX form for undefined
+ conversion error from UTF-8.
-Sun Aug 26 09:22:33 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Wed Feb 4 21:57:37 2009 Tanaka Akira <akr@fsij.org>
- * nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY)
- Rewrites these variables instead of PATH.
- NaCl port uses a toolchain which is specified by NACL_SDK_ROOT
- environment variable. Originally, NaCl build added the toolchain
- under the NACL_SDK_ROOT to the PATH. But updating PATH doesn't work
- on Mac.
- (RBCONFIG): Replaces configs with the variable updates above.
+ * string.c (rb_str_dump): use MBCLEN_CHARFOUND_P properly.
- * configure.in: Thus it is no longer necessary to check $PATH.
+Wed Feb 4 21:55:38 2009 Tanaka Akira <akr@fsij.org>
- Based on a patch by Takashi Toyoshima <toyoshim AT gmail.com>.
+ * bootstraptest/runner.rb: refine success message.
-Sun Aug 26 16:53:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 4 19:10:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (checkmatch): suppress warnings. [ruby-core:47310]
- [Bug #6930]
+ * Makefile.in (id.h): updates from parse.h.
- * vm_core.h (VM_FRAME_TYPE_FINISH_P): ditto.
+Wed Feb 4 11:45:06 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Aug 24 15:42:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/mkexports.rb: shouldn't export DllMain.
+ reported at http://pc11.2ch.net/test/read.cgi/tech/1233686068/21
- * lib/mkmf.rb (create_makefile): use timestamp for destination
- directories to make them before making or copying files there.
- [ruby-dev:46067] [Bug #6904]
+Wed Feb 4 10:12:05 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Aug 24 12:40:15 2012 Luis Lavena <luislavena@gmail.com>
+ * missing/vsnprintf.c (BSD_vfprintf): should support 't' format
+ modifier to handle PRIdPTRDIFF. thanks for the info from
+ Kazuhiro NISHIYAMA. [ruby-core:21807]
- * configure.in (mingw): add shlwapi to the list of dependency
- libs for Windows.
- * win32/Makefile.sub (EXTSOLIBS): ditto.
+Wed Feb 4 01:28:46 2009 Tanaka Akira <akr@fsij.org>
- * internal.h: declare internal functions rb_w32_init_file,
- rb_file_expand_path_internal and rb_file_expand_path_fast.
+ * ext/socket/extconf.rb: fix struct in_pktinfo and struct in6_pktinfo
+ detection.
- * file.c (Init_File): invoke Windows initialization rb_w32_init_file
+Wed Feb 4 00:32:59 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * win32/file.c (rb_file_load_path_internal): new function.
- Windows-specific implementation that replaces file_expand_path.
- [Bug #6836][ruby-core:46996]
+ * 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].
- * win32/file.c (rb_w32_init_file): new function. Initialize codepage
- cache for faster conversion encodings lookup.
+Wed Feb 4 00:17:52 2009 Tanaka Akira <akr@fsij.org>
- * file.c (file_expand_path): rename to rb_file_expand_path_internal.
- Conditionally exclude from Windows.
+ * ext/socket/lib/socket.rb (Socket.tcp_server_sockets_port0): skip
+ socket creation error.
- * file.c (rb_file_expand_path_fast): new function. delegates to
- rb_file_expand_path_internal without performing a hit to the
- filesystem.
+Tue Feb 3 23:37:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (file_expand_path_1): use rb_file_expand_path_internal without
- path expansion (used by require).
- * file.c (rb_find_file_ext_safe): ditto.
- * file.c (rb_find_file_safe): ditto.
+ * ruby.c (load_file_internal): resets EOF flag after parse.
- * load.c (rb_get_expanded_load_path): use rb_file_expand_path_fast.
- * load.c (rb_feature_provided): ditto.
+Tue Feb 3 23:13:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_file_expand_path): use rb_file_expand_path_internal with
- path expansion.
- * file.c (rb_file_absolute_path): ditto.
+ * vm.c (vm_backtrace): always returns non-nil array if lev is
+ negative. [ruby-core:21795]
- * test/ruby/test_file_exhaustive.rb: new tests to exercise
- rb_file_expand_path_internal implementation and compliance with
- existing behaviors.
+Tue Feb 3 21:19:06 2009 TAKAO Kouji <kouji@takao7.net>
-Fri Aug 24 07:35:24 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/readline/extconf.rb: checked rl_set_screen_size and
+ rl_get_screen_size.
- * lib/net/http/backward.rb (class Net): Restored Net::HTTPSession to
- fix backwards-compatibility with ancient Net::HTTP. [Bug #6889]
+ * ext/readline/readline.c (readline_s_set_screen_size): added
+ Readline.set_screen_size.
-Thu Aug 23 20:58:55 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * ext/readline/readline.c (readline_s_get_screen_size): added
+ Readline.get_screen_size.
- * common.mk: support `make id.h` without `rm .id.h.time` after
- `rm id.h`.
+Tue Feb 3 21:07:19 2009 TAKAO Kouji <kouji@takao7.net>
-Thu Aug 23 20:48:45 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/readline/readline.c (readline_s_set_completion_proc): set
+ default if proc is nil. fix #1095
- * test/ruby/test_fixnum.rb (TestFixnum#test_singleton_method): new test.
+Tue Feb 3 16:36:06 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * test/ruby/test_bignum.rb (TestBignum#test_singleton_method): ditto.
+ * array.c (rb_ary_sort_by_bang): RDoc update.
- * test/ruby/test_float.rb (TestFloat#test_singleton_method): ditto.
+ * NEWS: add Array#sort_by!.
- * test/ruby/test_symbol.rb (TestSymbol#test_singleton_method): ditto.
+Tue Feb 3 16:23:16 2009 Tanaka Akira <akr@fsij.org>
-Thu Aug 23 20:34:32 2012 NAKAMURA Usaku <usa@ruby-lang.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.
- * class.c (singleton_class_of): flonum can't have singleton class.
+Tue Feb 3 14:12:10 2009 Shugo Maeda <shugo@ruby-lang.org>
- * vm.c (vm_define_method): flonum can't have singleton method.
+ * lib/net/imap.rb: validate data before sending to a server.
+ [ruby-core:20320]
-Thu Aug 23 19:18:33 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Feb 3 12:35:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk (win32/*): macro RUBY_H_INCLUDES is not defined there,
- so need to move dependency rules under the definition of it.
+ * re.c (match_array): replace match_check().
-Thu Aug 23 19:16:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * re.c (match_values_at): ditto.
- * win32/Makefile.sub: refactoring. remove unused rules, and update
- some rules which are not used usually to fit current macros.
+Tue Feb 3 12:09:08 2009 Shugo Maeda <shugo@ruby-lang.org>
-Thu Aug 23 16:46:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/imap.rb (hmac_md5): should use String#ord to get ascii
+ code from the one-character string.
- * file.c (rb_find_file_ext_safe, rb_find_file_safe): default to
- US-ASCII for encdb and transdb.
+Tue Feb 3 11:25:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * load.c (search_required): keep encoding of feature name. set
- loading path to filesystem encoding. [Bug #6377][ruby-core:44750]
+ * load.c (load_lock): warn for circular require. [ruby-core:20794],
+ [ruby-core:20797]
- * ruby.c (add_modules, require_libraries): assume default external
- encoding as well as ARGV.
+Tue Feb 3 08:35:12 2009 Tanaka Akira <akr@fsij.org>
-Thu Aug 23 16:20:04 2012 Koichi Sasada <ko1@atdot.net>
+ * 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.
- * include/ruby/ruby.h: introduce flonum technique for
- 64bit CPU environment (sizeof(double) == sizeof(VALUE)).
- flonum technique enables to avoid double object creation
- if the double value d is in range about between
- 1.72723e-77 < |d| <= 1.15792e+77 or 0.0.
- flonum Float value is immediate and their lowest two bits
- are b10.
- If flonum is activated, then USE_FLONUM macro is 1.
- I'll write detailed in this technique on
- https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/Flonum_tech
+Tue Feb 3 08:21:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/bmx_temp.rb: add an benchmark for simple
- Float calculation.
+ * test/ruby/test_readpartial.rb (make_pipe): readpartial does not
+ work in text mode.
- * gc.c (id2ref, rb_obj_id): add flonum Float support.
+Tue Feb 3 08:18:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h: move decl of rb_float_new(double)
- to include/ruby/ruby.h.
+ * cygwin/GNUmakefile.in (RUBYDEF): uses mkexports.rb on cygwin too.
- * insns.def, vm.c, vm_insnhelper.c: add flonum optimization
- and simplify source code.
+ * win32/mkexports.rb (Exports::Cygwin): added.
- * vm_insnhelper.h (FLONUM_2_P): added.
+Tue Feb 3 08:10:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * marshal.c: support flonum output.
+ * common.mk (Doxyfile): moved from Makefile.in.
- * numeric.c (rb_float_new_in_heap): added.
+ * template/Doxyfile.tmpl: split from Doxyfile.in.
- * parse.y: support flonum.
+Tue Feb 3 08:01:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * random.c: ditto.
+ * win32/win32.c (rb_w32_write): use of cast expressions as lvalues
+ is deprecated.
-Thu Aug 23 16:12:40 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Feb 3 07:57:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (create_makefile): add dependency to header files when
- depend files don't exist. now we can remove simple (and often
- wrong) depend files in most cases.
+ * 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.
-Thu Aug 23 16:02:20 2012 Koichi Sasada <ko1@atdot.net>
+Tue Feb 3 07:02:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/depend: add dependency to $(ruby_headers).
+ * missing/langinfo.c (nl_langinfo_codeset): accepts iso-8859
+ fragment. [ruby-core:21757]
-Thu Aug 23 12:51:39 2012 Shugo Maeda <shugo@ruby-lang.org>
+Tue Feb 3 07:01:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (invokesuper): reverted r36640 partially to make super
- in a thread work correctly. [ruby-core:47284] [Bug #6907]
+ * mkconfig.rb (patchlevel): config.status may not contain
+ PATCHLEVEL even if other version numbers exist.
- * test/ruby/test_super.rb: related test.
+Mon Feb 2 23:43:00 2009 Tanaka Akira <akr@fsij.org>
-Thu Aug 23 12:30:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/raddrinfo.c (Init_addrinfo): add AddrInfo#to_s as an
+ alias of AddrInfo#to_sockaddr.
- * win32/configure.bat: support --with(out)?-ext(ensions) options.
+ * ext/socket/option.c (Init_sockopt): add Socket::Option#to_s as an
+ alias of Socket::Option#data.
-Thu Aug 23 11:52:04 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ [ruby-dev:37873]
- * configure.in: Fixing Haiku build.
- - -lbe is not required for linking
- - stack protector doesn't work for now because of the default gcc's
- bug
- by Takashi Toyoshima <toyoshim@gmail.com>
- https://github.com/ruby/ruby/pull/167
+Mon Feb 2 21:04:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * signal.c (ruby_signal): haiku doesn't have SIGBUS.
+ * array.c (rb_ary_sort_by_bang): RDoc update. [ruby-core:21742]
-Thu Aug 23 11:32:44 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Feb 2 20:49:24 2009 Akinori MUSHA <knu@iDaemons.org>
- * test/open-uri/test_open-uri.rb (TestOpenURI#test_read_timeout): this
- test expects that the server thread will be killed in sleep, but 0.01
- sec is too short to reach there.
+ * enumerator.c: Introduce id_each to save rb_intern() and SYM2ID()
+ calls.
-Thu Aug 23 10:49:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Feb 2 19:55:51 2009 Tanaka Akira <akr@fsij.org>
- * configure.in: use the value of --with-opt-dir on building ruby
- itself. [ruby-dev:46064] [Bug #6900]
+ * 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]
-Thu Aug 23 10:36:35 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Feb 2 19:17:16 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk (ID_H_TARGET): revert a part of r36724 and r36751. they
- break mswin build from clean source.
+ * doc/NEWS-1.9.1: typo fixed: collect_all -> collect.
+ [ruby-core:21706]
-Thu Aug 23 02:37:35 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Feb 2 17:23:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/syck: removed. Fixes [ruby-core:43360]
+ * cygwin/GNUmakefile.in (dir.o, win32.o): depend on win32/dir.h.
- * test/syck: removed.
+Mon Feb 2 17:13:46 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/yaml.rb: only require psych, show a warning if people try to set
- the engine to syck.
+ * mkconfig.rb: patchlevel is sometimes minus.
-Thu Aug 23 01:46:53 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * win32/resource.rb: ditto.
- * insns.def: search up the cf stack for an object that is an instance
- of the recipient class. Fixes [ruby-core:47186]
+Mon Feb 2 17:11:23 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_super.rb: related test.
+ * ext/socket/ancdata.c (cmsg_type_to_sym): add #ifdef for no IPv6
+ environment.
-Wed Aug 22 19:46:24 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Feb 2 17:05:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_core.c: [ruby-core:47266].
+ * file.c (rb_find_file_ext): should not be infected from other
+ load paths.
-Wed Aug 22 19:41:19 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Feb 2 16:33:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_core.c: [ruby-core:47226].
+ * dir.c (dir_s_home): new method. [ruby-core:21454]
-Wed Aug 22 16:57:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 2 16:06:10 2009 Tanaka Akira <akr@fsij.org>
- * lib/mkmf.rb (configuration): extract least ruby headers list as
- ruby_headers, so depend files can use default dependency
- explicitly.
+ * version.h: bump up to 1.9.2 patchlevel -1.
+ yugui recommend "-1" strongly.
-Wed Aug 22 15:27:50 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/rubygems/version.rb: accept negative patchlevel.
- * vm_insnhelper.c (vm_setup_method): fix last commit of
- vm_insnhelper.c (r36771). [ruby-dev:46065] [Bug #6901]
- Should not disable tail call opt on FINISH_FRAME.
- This flag should be propagated correctly.
+Mon Feb 2 14:53:35 2009 Tanaka Akira <akr@fsij.org>
-Wed Aug 22 14:05:23 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
+ optional.
- * vm_trace.c: support TracePoint. [ruby-trunk - Feature #6895]
+Mon Feb 2 14:47:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_settracefunc.rb: add tests for above.
+ * array.c (rb_ary_sort_by_bang): new method. requested in
+ [ruby-core:21709]
- * proc.c (rb_binding_new_with_cfp): add an internal function.
+Mon Feb 2 14:22:56 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm.c (rb_vm_control_frame_id_and_class): add an internal function.
+ * ext/socket/constants.c (cmsg_type_arg): INET6 check.
- * vm_trace.c: add rb_add_event_hook2() and rb_thread_add_event_hook2().
- Give us the good name for them!
+Mon Feb 2 14:18:20 2009 Tanaka Akira <akr@fsij.org>
-Wed Aug 22 11:38:16 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * ext/socket/option.c: use INET6 instead of IPV6.
- * .travis.yml (before_script): Turned out that make -j is broken.
+Mon Feb 2 12:47:47 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Aug 22 11:23:35 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * ext/socket/{options,raddrinfo}.c: use INET6 instead of AF_INET6 for
+ VC++6.
- * vm_insnhelper.c (vm_setup_method): should not enable tail call
- optimization for frames with VM_FRAME_FLAG_FINISH.
- [ruby-dev:46065] [Bug #6901]
+Mon Feb 2 12:41:52 2009 Shugo Maeda <shugo@ruby-lang.org>
-Wed Aug 22 11:20:47 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * complex.c (f_signbit): regard NaN as a positive value.
+ [ruby-dev:37861].
- * lib/rubygems/test_case.rb: run test with psych if exist.
+Mon Feb 2 12:39:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Aug 16 12:09:51 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * sample/test.rb (valid_syntax?), test/ruby/test_system.rb
+ (TestSystem::valid_syntax?): use catch and throw instead of
+ return inside BEGIN block.
- * nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
- other architectures than x86_64. Fixes #6873.
+Mon Feb 2 11:45:10 2009 Tanaka Akira <akr@fsij.org>
-Wed Aug 15 19:37:33 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * ext/socket/rubysocket.h (cmsg_type_arg): declared.
+ (Init_ancdata): ditto.
- * configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy
- implementation but has no declaration and does not work in
- NativeClient SDK pepper_20.
+ * ext/socket/init.c (Init_socket_init): call Init_ancdata.
-Wed Aug 15 19:29:29 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * ext/socket/constants.c (cmsg_type_arg): defined.
- * common.mk (vm_backtrace.o): Added missing dependencies.
+ * ext/socket/depend: add dependency for ancdata.o.
- * ext/nkf/depend (nkf.o): ditto.
+ * ext/socket/mkconstants.rb: generate scm_optname_to_int.
+ more constants.
- * ext/ripper/depend (ripper.o) ditto.
+ * ext/socket/extconf.rb: add ancdata.o.
-Wed Aug 22 07:27:00 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/ancdata.c: new file. new method
+ BasicSocket#{sendmsg,sendmsg_nonblock,recvmsg,recvmsg_nonblock}
- * lib/cgi/util.rb (CGI.escapeHTML): use &#39;
- [ruby-core:47221] [Bug #6861]
+Mon Feb 2 10:57:27 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Aug 21 21:59:22 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * 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.
- * lib/observer.rb: fix typo. https://github.com/ruby/ruby/pull/162 by
- unsymbol (Philip Cunningham).
+Mon Feb 2 10:48:38 2009 Tanaka Akira <akr@fsij.org>
-Tue Aug 21 20:30:06 2012 Benoit Daloze <eregontp@gmail.com>
+ * ext/socket/basicsocket.c (bsock_setsockopt): accept Socket::Option
+ object.
+ (bsock_getsockopt): return Socket::Option object.
- * test/fileutils/test_fileutils.rb (TestFileUtils#teardown):
- do not assume cwd is TMPROOT and never remove current directory.
- [ruby-core:47224][Bug #6884]
+ * ext/socket/option.c: new file.
-Tue Aug 21 17:29:56 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/rubysocket.h (rb_cSockOpt): declared.
+ (sockopt_new): ditto.
+ (Init_sockopt): ditto.
- * addr2line.c (fill_lines): need check and cast of the file size of
- target binary because there are some platforms which off_t > size_t.
+ * ext/socket/init.c (Init_socket_init): call Init_sockopt.
-Tue Aug 21 17:07:58 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * ext/socket/depend: add dependency for option.o
- * .travis.yml (compiler): [experimental] clang support.
+ * 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.
-Tue Aug 21 15:44:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/extconf.rb: add option.o.
- * ext/dl/lib/dl/func.rb (DL::Function#bind): fixes an error in
- test/dl/test_import.rb (DL::TestImport#test_carried_function)
- introduced by r36718.
- the instance of the anonymous class which wraps the block should have
- same methods and instance variables of self.
+Mon Feb 2 09:49:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Aug 21 14:29:22 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm.c (vm_backtrace_each): progname is not available at
+ initializing phase.
- * win32/Makefile.sub (scriptbin.mk): no need to include twice.
+Mon Feb 2 08:12:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Aug 21 10:52:08 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded
+ platform names.
- * test/unit/test.rb (Test::Unit::ProxyError): new exception class to
- wrap exceptions raised in workers in parallel test mode.
+ * lib/resolv.rb (Resolv::Hosts::DefaultFileName),
+ (Resolv::DNS::Config.default_config_hash): tries win32/resolv on
+ mswin64 too.
- * test/unit/parallel.rb (Test::Unit::Worker#puke): use above wrapper
- exception.
- [Bug #6882] [ruby-dev:46054]
+ * lib/rubygems/specification.rb (Gem::Specification#ruby_code):
+ added mswin64.
-Tue Aug 21 10:40:06 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
+ spawn is better to start a process in background.
- * test_continuation.rb (tracing_with_thread_set_trace_func):
- fix to use Thread#set_trace_func(nil), not set_trace_func(nil).
+ * ext/extmk.rb: uses FNM_SYSCASE.
-Tue Aug 21 09:32:41 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * instruby.rb: installs win32.h on mswin64 platform.
+ [ruby-core:21722]
- * lib/minitest/*: Imported minitest 3.3.0 (r7676)
- * test/minitest/*: ditto
+Mon Feb 2 07:36:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Aug 21 09:05:32 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm.c (vm_backtrace_each): now takes an iterator function.
- * test/testunit/tests_for_parallel/ptest_forth.rb: added a test case
- which causes an error.
+ * vm_core.h (rb_make_backtrace, rb_backtrace_each): added
+ prototypes.
- * test/testunit/test_parallel.rb: follow above change.
- see [Bug #6882]
+ * vm_dump.c (rb_vm_bugreport), vm_eval.c (rb_backtrace): gets rid
+ of allocating objects. [ruby-core:21619]
-Tue Aug 21 05:43:00 2012 James Edward Gray II <james@graysoftinc.com>
+ * vm_eval.c (rb_backtrace_each): new function which iterates over
+ each backtrace info.
- * lib/csv.rb: Fixes #161 on github
- * lib/csv.rb: You can now specify a pattern for :skip_lines.
- Matching lines will not be passed to the CSV parser.
- * lib/csv.rb: Patch by Christian Schwartz.
+Mon Feb 2 06:51:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Aug 21 05:25:41 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * re.c (rb_reg_initialize_m): Forgot to update output for or'd-options
- example.
+Sun Feb 1 21:27:55 2009 Tanaka Akira <akr@fsij.org>
-Tue Aug 21 05:18:03 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/raddrinfo.c (addrinfo_ipv4_private_p): new method.
+ (addrinfo_ipv4_loopback_p): ditto.
+ (addrinfo_ipv4_multicast_p): ditto.
- * re.c (rb_reg_initialize_m): Update example to show that regexp
- options use | an not || to avoid confusion.
+Sun Feb 1 16:10:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Aug 20 23:02:27 2012 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]
- * parse.y: more descriptive token names in syntax error messages.
+Sun Feb 1 05:19:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Aug 20 20:36:30 2012 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]
- * vm_insnhelper.c (vm_call_method): follow iclasses as klass in cfp
- but not included modules. [ruby-core:47241] [Bug #6891]
+Sat Jan 31 22:50:38 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (vm_call_bmethod): pass defined_class to follow
- proper ancestors. [ruby-core:47241] [Bug #6891]
+ * lib/test/unit/assertions.rb (assert_equal): show class in failure
+ message if meaningful.
-Mon Aug 20 11:40:27 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Sat Jan 31 22:38:46 2009 Tanaka Akira <akr@fsij.org>
- * common.mk: fix failed to make with -j2.
- https://gist.github.com/3397935
+ * lib/resolv.rb (Resolv::DNS#each_address): don't query IPv6 address
+ if the host has no global IPv6 address.
-Mon Aug 20 10:51:01 2012 Shota Fukumori <sorah@tubusu.net>
+Sat Jan 31 22:29:05 2009 Tanaka Akira <akr@fsij.org>
- * lib/test/unit.rb, lib/test/unit/parallel.rb:
- generate error message (String) in parallel.rb instead of
- marshalling Exception. Fixes [Bug #6882] [ruby-dev:46054]
+ * include/ruby/ruby.h (STR2CSTR): removed.
+ (rb_str2cstr): removed.
-Sun Aug 19 01:24:32 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * object.c (rb_str2cstr): removed.
- * enum.c: fix docs. https://github.com/ruby/ruby/pull/129 by
- richardkmichael (Richard Michael).
+Sat Jan 31 20:07:59 2009 Tanaka Akira <akr@fsij.org>
-Sun Aug 19 00:47:26 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * 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.
- * lib/fileutils.rb: fix typo.
- https://github.com/ruby/ruby/pull/155 by simonc (Simon COURTOIS).
+Sat Jan 31 19:09:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Aug 18 09:57:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * load.c (rb_require_safe): raises when the path to be loaded is
+ tainted. [ruby-dev:37843]
- * enc/depend: fix inplace-build condition. enc.mk is generated with
- setting $srcdir to enc, but pwd is still top build directory.
- [ruby-core:47236] [Bug #6888]
+Sat Jan 31 18:08:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 17 23:28:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (optflags): defaulted to -O3 to get rid of slug of
+ gcc 4.3.
- * object.c (rb_any_to_s, rb_obj_inspect): preserve encodings of class
- name and instance variable names.
+Sat Jan 31 18:03:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 17 12:39:33 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/optparse.rb (List#accept, parse_in_order): n option is no
+ longer needed.
- * ext/dl/lib/dl/func.rb (DL::Function#bind): allow to return/break from
- the callback method. (Fiddle already allows it.)
- [Bug #6389] [ruby-dev:45604]
+Sat Jan 31 14:12:43 2009 Tanaka Akira <akr@fsij.org>
-Thu Aug 16 19:54:24 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/pathname.rb (Pathname#each_child): new method.
- * vm_trace.c, vm_core.h: simplify tracing mechanism.
+Sat Jan 31 00:07:49 2009 Tanaka Akira <akr@fsij.org>
- (1) add rb_hook_list_t data structure which includes
- hooks, events (flag) and `need_clean' flag.
- If the last flag is true, then clean the hooks list.
- In other words, deleted hooks are contained by `hooks'.
- Cleanup process should run before traversing the list.
- (2) Change check mechanism
- See EXEC_EVENT_HOOK() in vm_core.h.
- (3) Add `raw' hooks APIs
- Normal hooks are guarded from exception by rb_protect().
- However, this protection is overhead for too simple
- functions which never cause exceptions. `raw' hooks
- are executed without protection and faster.
- Now, we only provide registration APIs. All `raw'
- hooks are kicked under protection (same as normal hooks).
+ * lib/test/unit/assertions.rb
+ (Test::Unit::Assertions#assert_nothing_raised): suppress warning.
+ [ruby-core:21312]
- * include/ruby/ruby.h: remove internal data definition and
- macros.
+Fri Jan 30 21:49:32 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (ruby_suppress_tracing), vm_trace.c: rename
- ruby_suppress_tracing() to rb_suppress_tracing()
- and remove unused function parameter.
+ * lib/pathname.rb (Pathname#realdirpath): new method based on the
+ patch in [ruby-dev:36560] by Akinori MUSHA.
+ [ruby-dev:36290]
- * parse.y: fix to use renamed rb_suppress_tracing().
+Fri Jan 30 18:04:23 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c (thread_create_core): no need to set RUBY_VM_VM.
+ * win32/win32.c (rb_w32_write): limit write size to 32KB if the file
+ seems to be console. [ruby-core:21613]
- * vm.c (mark_event_hooks): move definition to vm_trace.c.
+Fri Jan 30 16:12:32 2009 TAKAO Kouji <kouji@takao7.net>
- * vm.c (ruby_vm_event_flags): add a global variable.
- This global variable represents all of Threads and VM's
- event masks (T1#events | T2#events | ... | VM#events).
- You can check the possibility kick trace func or not
- with ruby_vm_event_flags.
- ruby_vm_event_flags is maintained by vm_trace.c.
+ * ext/curses/curses.c (Init_curses): Curses#crmode and
+ Curses#nocrmode changes to the module function.
+ fix #916
- * cont.c (fiber_switch, rb_cont_call): restore tracing status.
- [Feature #4347]
+Fri Jan 30 14:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_continuation.rb: ditto.
+ * tool/make-snapshot (prereq): remove enc.mk from tarball because
+ BSD make checks $(srcdir)/enc.mk and try to run $(builddir)/enc.mk.
-Thu Aug 16 19:15:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 30 14:11:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * object.c (rb_class_initialize): forbid inheriting uninitialized
- class. another class tree not based on BasicObject cannot exist.
- [ruby-core:47148][Bug #6863]
+ * enc/depend: extract compile rules to each target for nmake.
-Thu Aug 16 11:52:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 30 12:59:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/-ext-/test_printf.rb (Test_SPrintf#test_{taint,untrust}): use
- plain object so that the results of to_s and inspect are infected.
- [ruby-dev:46053] [Bug #6881]
+ * cygwin/GNUmakefile.in (RUBYDEF): depends on makefiles.
-Thu Aug 16 09:46:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * cygwin/GNUmakefile.in (RUBYDEF): adds DATA to non-function symbols
+ which is not marked as T.
- * strftime.c: remove unnecessary macros to check traditional C.
- https://github.com/ruby/ruby/pull/46 by lateau (Daehyub Kim).
+Fri Jan 30 11:03:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vsnprintf.c: remove K&R.
+ * lib/test/unit/assertions.rb (assert_respond_to): gets rid of
+ overcounting. [ruby-dev:37703]
-Wed Aug 15 20:47:49 2012 Benoit Daloze <eregontp@gmail.com>
+Fri Jan 30 02:55:56 2009 Tanaka Akira <akr@fsij.org>
- * object.c (rb_obj_inspect): Kernel#inspect: do not call #to_s. A class
- can now benefit from the nice default #inspect even if it defines #to_s.
- Also, there is no more unexpected change in #inspect result.
+ * transcode.c (rb_econv_init_by_convpath_i): make it static.
- * NEWS: Add note about the change.
+Thu Jan 29 16:22:41 2009 Shugo Maeda <shugo@ruby-lang.org>
- * bignum.c, io.c, numeric.c, object.c, proc.c, vm.c (Init_*):
- Adapt internal structures (by aliasing #inspect to #to_s) so they
- don't rely on the removed behavior (#inspect calling overridden #to_s).
+ * load.c (rb_feature_provided): should not calculate len by pointer
+ subtraction because feature may be a expanded path.
+ [ruby-core:21267]
- * test/ruby/test_object.rb (test_inspect): add tests for Kernel#inspect.
+Thu Jan 29 14:12:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/pp.rb (class PP): do not call #to_s anymore, as #inspect
- no more does (mame).
+ * configure.in (BASERUBY): erases RUBYOPT at the test.
- * test/test_pp.rb (class PPInspectTest): remove related assertion (mame).
- [ruby-core:43238][Feature #6130]
+ * configure.in (OBJCOPY): not used on Windows.
- * test/drb/drbtest.rb (DRbCore#teardown, DRbAry#teardown):
- adapt DRb tests with the new change (shirosaki).
- [ruby-core:47182][Bug #6866]
+Thu Jan 29 13:16:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Aug 15 18:05:37 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/securerandom.rb (SecureRandom.uuid): uses unpacked array
+ instead of string, because String#[] returns one length string.
- * lib/test/unit.rb (Test::Unit::Runner#failed): need to delete the
- status line if the status is skipped and -q is specified.
+Thu Jan 29 12:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Aug 15 16:26:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rake.rb (FileUtils#rake_system): no longer needs workaround
+ on Windows. [ruby-core:21339]
- * sprintf.c (ruby__sfvextra): the result should be infected by the
- given strings.
+ * lib/rake/win32.rb (Rake::Win32#rake_system): ditto.
- * sprintf.c (ruby__sfvwrite): set buffer length and exclude
- uninitialized garbage to get correct coderange.
+ * lib/rake/win32.rb (Rake::Win32#win32_system_dir): no longer
+ needs environment variables other than APPDATA now.
-Wed Aug 15 16:20:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rake.rb (Rake::Application#standard_system_dir): uses
+ platform specific definition on Windows system.
- * common.mk (ID_H_TARGET): make timestamp file of id.h so that the
- header will not be remade repetitively.
+Thu Jan 29 12:18:54 2009 Technorama Ltd. <oss-ruby@technorama.net>
-Wed Aug 15 11:39:53 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/securerandom.rb: new method SecureRandom#uuid
- * vm_trace.c: separate trace_func related functions from
- thread.c.
+Thu Jan 29 11:22:19 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c: ditto.
+ * ext/socket/raddrinfo.c (inspect_sockaddr): if defined AF_INET6,
+ perhaps can inspect IPv6 addresses if not defined INET6.
- * common.mk: add vm_trace.o.
+ * ext/socket/socket.c (socket_s_ip_address_list): support Windows XP
+ or later. (Win2k or earlier is still not supported)
- * inits.c: call Init_vm_trace().
+Thu Jan 29 00:24:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Aug 14 16:25:46 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * ext/zlib/zlib.c (zstream_run): previous change didn't resolve the
+ problem.
- * test/erb/test_erb.rb (test_html_escape): add assertions for the
- cases where the argument is not a String.
+Wed Jan 28 22:51:12 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Aug 14 16:03:31 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/zlib/zlib.c (zstream_run): desperately guard the variable.
+ [ruby-core:20576]
- * win32/win32.c (check_valid_dir): reject "..." as directory name.
- [Bug #6851]
+Wed Jan 28 15:24:11 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-Tue Aug 14 16:02:51 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * math.c: SEGV is caused by implicit rb_to_float declaration
+ test_complexrational.rb: [BUG] in IA-64 architecture
- * test/ruby/test_file_exhaustive.rb
- (TestFileExhaustive#test_stat_dotted_prefix): added.
+Tue Jan 27 20:02:07 2009 Tanaka Akira <akr@fsij.org>
-Tue Aug 14 15:39:09 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/init.c (socks_connect_blocking): moved from
+ sockssocket.c. [ruby-dev:37834]
- * test/ruby/test_file_exhaustive.rb
- (TestFileExhaustive#test_stat_drive_root): added.
+ * sockssocket.c (socks_init): don't omit "int" type.
-Tue Aug 14 10:38:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Jan 27 14:41:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/erb.rb (ERB::Util.html_escape): fix r36687: call to_s before
- passing it to CGI.escapeHTML.
+ * cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
+ non-function symbols. [ruby-core:21582]
-Mon Aug 13 13:13:19 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * win32/mkexports.rb (Exports::Mingw#each_export): ditto.
- * lib/erb.rb (ERB::Util.html_escape): use CGI.escapeHTML to escape
- single quotes. [ruby-core:47138] [Bug #6861]
+Tue Jan 27 12:59:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Aug 12 11:57:20 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/ripper/depend: use VPATH.
+ If a platform doesn't support VPATH, Ruby doesn't support it:
+ for example MSYS. [ruby-core:21570]
- * vm.c (invoke_block_from_c): fix unintentional block passing.
- [ruby-dev:45071] [Bug #5832]
+Tue Jan 27 12:21:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Aug 10 08:41:28 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/ripper/depend: lex.c's correct path is ../../lex.c.
- * gc.c (gc_malloc_allocated_size): RDoc does not process macros, so
- mention this method is only available when ruby is built with
- CALC_EXACT_MALLOC_SIZE
- * gc.c (gc_malloc_allocations): ditto
+Tue Jan 27 11:09:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Aug 9 23:46:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (try_header): checks the header depending on
+ platform.
- * tool/mkrunnable.rb: see build_os instead of target arch for
- cross-compiling.
+ * lib/mkmf.rb (have_header, find_header): use try_header.
- * configure.in (MINIRUBY): use real path for include path.
+ * win32/Makefile.sub (try_header): uses try_compile to get rid of
+ slow -E option of VC.
- * template/fake.rb.in (builddir): remove duplications
+Tue Jan 27 11:03:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Aug 9 20:03:11 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * common.mk (distclean-enc, realclean-enc): do not call clean of
+ enc.mk twice or more.
- * test/ruby/test_file_exhaustive.rb
- (TestFileExhaustive#test_stat_special_file): add a test.
- GetFileAttributesExW fails to get attributes of special files
- such as pagefile.sys.
+ * enc/depend (cleanobjs): added deffile.
- * win32/win32.c (check_valid_dir): for performance, check the path
- by FindFirstFileW only if the path contains "..."
+ * lib/mkmf.rb (create_makefile): removes deffile at clean instead
+ of distclean.
- * win32/win32.c (winnt_stat): use GetFileAttributesExW instead of
- FindFirstFileW since GetFileAttributesExW is faster.
- Based on the patch by Dusan D. Majkic.
- [ruby-core:47083] [Feature #6845]
+ * win32/Makefile.sub (miniruby, LIBRUBY_SO): removes lib and exp
+ files.
-Thu Aug 9 18:33:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (clean, distclean): have moved to common.mk.
- * ruby.c (proc_options): show version only once even if -v and
- --version are given together.
- http://twitter.com/d6rkaiz/status/233491797085671424
+ * win32/rmdirs.bat: omits `not empty' message.
-Thu Aug 9 12:37:22 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Jan 27 10:15:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/openssl/test_config.rb (OpenSSL#test_constants): skip this
- test if platform is Mac OS X or Windows. [Bug #6830]
+ * transcode.c (struct rb_transcoding): added ary member for debug.
-Wed Aug 8 22:51:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 27 10:10:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_eval.c (eval_under): singletons other than special constants
- don't need cref-scope hack.
+ * Doxyfile.in (FILE_VERSION_FILTER, INPUT_FILTER): should not use
+ ./miniruby directly for cross compiling.
-Wed Aug 8 22:45:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 27 04:02:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk (.y.h): split from .y.c rule to manage dependency on
- parse.h. [ruby-core:46741] [Bug #6789]
+ * ext/ripper/depend: fixed dependency path to lex.c.
+ [ruby-core:21570]
- * common.mk (id.h): keep old file unless changed.
+Tue Jan 27 03:43:34 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Aug 8 17:11:20 2012 Koichi Sasada <ko1@atdot.net>
+ * hash.c (rb_any_hash): fixed performance issues with nil, true,
+ false as hash keys. a patch from Matthias Waechter.
+ [ruby-core:21568]
- * compile.c (ADD_INSNL): make ADD_INSNL as alias of ADD_INSN1.
+Tue Jan 27 03:23:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Aug 8 17:08:14 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/mkmf.rb (create_makefile): should point correct path to
+ ruby.h and defines.h. [ruby-core:21569]
- * bootstrap/test_exception.rb: fix a last committed test.
+Mon Jan 26 16:00:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Aug 8 16:27:58 2012 Koichi Sasada <ko1@atdot.net>
+ * array.c (rb_ary_aset): fixed arguments evaluation order.
- * compile.c, insns.def (checkmatch):
- remove checkincludearray instruction and
- add new instruction checkmatch.
- This change is to solve
- [Bug #4438] "rescue args type check omitted".
+Mon Jan 26 15:49:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c: increment ISEQ_MAJOR_VERSION because removal of
- checkincludearray instruction.
+ * lib/pathname.rb (chop_basename, prepend_prefix): use o option.
- * vm_core.h: add several definitions for
- the checkmatch instruction.
+Sun Jan 25 16:35:44 2009 Tanaka Akira <akr@fsij.org>
- * vm_insnhelper.c (check_match): added.
+ * ext/socket/socket.c (socket_s_ip_address_list): renamed from
+ socket_s_list_ip_address. [ruby-dev:37806]
- * bootstraptest/test_exception.rb: add a test.
+Sun Jan 25 12:17:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_exception.rb: ditto.
+ * cygwin/GNUmakefile.in (RUBYDEF): needs read-only section too.
-Wed Aug 8 05:51:20 2012 Eric Hodel <drbrain@segment7.net>
+Sun Jan 25 12:02:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * proc.c (method_clone): Added documentation. Patch by Robin Dupret.
- Fixes #152 on github.
+ * win32/Makefile.sub (clean-ext): condition of EXTS was inverted.
-Tue Aug 7 20:19:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Jan 25 11:50:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/readline/readline.c (Init_readline): rl_catch_signals=0 returns
- back. Without this, on FreeBSD9 and readline 6.2 irb can't catch ^C.
- [Bug #5423]
+ * lib/mkmf.rb (create_makefile): fixed the variables order because
+ converter proc refers the separator.
-Tue Aug 7 20:12:39 2012 Koichi Sasada <ko1@atdot.net>
+Sun Jan 25 11:25:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_exec.c, insns.def (leave): solve problems on
- OPT_CALL_THREADED_CODE.
- Catch up finish frame structure on OPT_CALL_THREADED_CODE.
+ * Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
+ parents.
- * vm_core.h: add rb_thread_t#retval for temporary space on
- OPT_CALL_THREADED_CODE.
+ * Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove
+ temporary rdoc.
- * vm.c (th_init): clear rb_thread_t#retval as Qundef.
+ * Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent
+ directories.
- * vm_dump.c (rb_vmdebug_debug_print_pre): fix debug print format.
+ * common.mk (clean, distclean): cleans rdoc.
-Tue Aug 7 11:58:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * common.mk (clean-extout): removes extout directory.
- * test/ruby/test_require.rb (TestRequire#test_require_twice): added.
+ * configure.in (RMDIRS, RMALL): added to clean extout.
-Tue Aug 7 11:35:37 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/fileutils.rb (FileUtils#rmdir): added :parents option.
- * vm_method.c (rb_redefine_opt_method): use RCLASS_ORIGIN to avoid
- SEGV when a module-prepended class is refined.
+ * lib/mkmf.rb (create_makefile): cleans installed files at clean
+ instead of distclean.
-Tue Aug 7 10:46:37 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): added clean-so and clean-rb.
- * test/ruby/test_file_exhaustive.rb
- (TestFileExhaustive#test_expand_path*): refactoring. split the method
- into some chunks of the same kind of tests.
+ * lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.
-Tue Aug 7 00:31:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/un.rb (rmdir): added -p option.
- * class.c (rb_special_singleton_class_of): utility function.
+ * tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.
- * vm_eval.c (eval_under): special deal for class variable scope with
- instance_eval.
+ * win32/rm.bat: added -r option.
- * vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow method
- definition in instance_eval of special constants. [ruby-core:28324]
- [Bug #2788]
+Sun Jan 25 09:09:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Aug 7 00:23:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (join_path): use strlcat() to force link.
- * variable.c (CVAR_LOOKUP): split into helper functions.
+ * dir.c (glob_helper): no strcpy() is needed since len is known.
-Mon Aug 6 19:15:11 2012 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sun Jan 25 06:44:58 2009 Technorama Ltd. <oss-ruby@technorama.net>
- * test/win32ole/test_win32ole_variant.rb: setting WIN32OLE.locale
- to pass some assertion. Thanks to Hiroshi Shirosaki.
- [ruby-core:46873][Bug #6814]
+ * ext/openssl/ossl_ssl.c: Server Name Indication support.
+ new methods SSLContext#server_name_cb=, SSLSocket#hostname=.
-Mon Aug 6 15:54:50 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * test/openssl/test_ssl.rb: Tests for above.
- * internal.h, class.c, eval.c, insns.def: find the appropriate
- receiver for super called in instance_eval. If such a receiver is
- not found, raise NoMethodError. [ruby-dev:39772] [Bug #2402]
+Sat Jan 24 08:22:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Aug 6 14:54:38 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/mkmf.rb (configuration): tools under the top source
+ directory are not installed, so unusable outside extmk.rb.
- * include/ruby/ruby.h, eval.c, vm_insnhelper.c: fix typo.
+Fri Jan 23 17:24:31 2009 WATANABE Hirofumi <eban@ruby-lang.org>
-Mon Aug 6 13:13:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * golf_prelude.rb (Enumerator#inspect): avoid warning.
- * vm_eval.c (vm_call_super): since cfp->klass is always class or
- iclass, no search from method entry.
+Fri Jan 23 15:12:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (defined): now should use klass in the current control
- frame to search superclass, not me->klass. reported by naruse.
+ * lib/mkmf.rb (mkintpath): new function which converts native path
+ to format acceptable in Makefile.
-Mon Aug 6 11:19:19 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.
- * test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.
+ * lib/mkmf.rb (configuration): converts srcdir, topdir and hdrdir.
+ a patch by Alexey Borzenkov <snaury AT gmail.com> at
+ [ruby-core:21448].
-Mon Aug 6 11:08:48 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/mkmf.rb (try_func): got rid of c-mode confusion.
- * test/syslog/test_syslog_logger.rb: skip unless Syslog module is
- available.
+Fri Jan 23 13:26:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Aug 6 00:40:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * signal.c (trap_handler): also accepts symbols. [ruby-dev:37823]
- * ext/bigdecimal/bigdecimal.c (BigMath_s_log): fix format specifier.
+Thu Jan 22 18:14:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Aug 6 00:39:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): removes installed files under
+ extout at distclean.
- * include/ruby/ruby.h (NUM2ULONG): optimize by inline as well as
- NUM2LONG, and cast to unsigned long explicitly for the platforms
- where SIZEOF_VALUE is larger than SIZEOF_LONG.
+Thu Jan 22 17:12:37 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * include/ruby/ruby.h (NUM2SSIZET): fix type to cast.
+ * 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"]})
-Sun Aug 5 21:10:36 2012 Narihiro Nakamura <authornari@gmail.com>
+ * test/cgi/test_cgi_core.rb: fix test for key only params.
- * gc.c : if ENABLE_VM_OBJSPACE is 1, rest_sweep is not defined.
- remove unused declarations. [ruby-core:47004] [Bug #6837]
+Thu Jan 22 16:29:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Aug 5 19:31:57 2012 Narihiro Nakamura <authornari@gmail.com>
+ * lib/rubygems/installer.rb (Gem::Installer#initialize): fixed
+ typos.
- * gc.c: just move functions and so on. I don't touch any internal
- implementation.
+ * test/rubygems/test_gem.rb (test_self_dir): removed false
+ assertions.
-Sun Aug 5 13:22:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/rubygems/test_gem.rb (test_self_set_paths): checks if paths
+ are included.
- * configure.in: use gcc-4.2 prior to clang, gcc, and cc if exist for
- the use of Snow Leopard's old clang. see also r36594, r36610, r36611.
+ * test/rubygems/test_gem_commands_install_command.rb
+ (test_execute_remote): checks diagnostic message too.
-Sun Aug 5 06:55:10 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/rubygems/test_gem_installer.rb (load): uses Gem.ruby.
- * ext/date/date_{core,strftime}.c: [ruby-core:46990].
+ * test/rubygems/gemutilities.rb (Gem.ruby): initializes from the
+ environment variable to run without installation.
-Sat Aug 4 22:56:20 2012 Narihiro Nakamura <authornari@gmail.com>
+ * test/rubygems/gemutilities.rb (RubyGemTestCase#util_build_gem):
+ creates cache directory.
- * gc.c: use inline functions instead of macros, and close up
- related codes for the profiler.
+Thu Jan 22 16:12:51 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Aug 4 20:37:56 2012 Narihiro Nakamura <authornari@gmail.com>
+ * revert previous revision. it's already out-of-date.
- * gc.c (gc_mark_children): use gc_mark_ptr instead of marking
- a object directly.
+Thu Jan 22 15:54:02 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Aug 4 10:02:03 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * include/ruby/win32.h, win32/win32.c (rb_w32_is_valid_fd): new function
+ to validate fd.
- * test/ruby/test_alias.rb (test_super_in_aliased_module_method):
- add a test case for [ruby-dev:46028], which fails in 1.8.
+ * io.c (rb_io_initialize): check fd with above function.
-Sat Aug 4 01:56:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 22 14:53:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_insnhelper.c (vm_search_normal_superclass): no longer needs
- receiver, klass is always unique in the ancestors now.
+ * test/ruby/test_process.rb (MANDATORY_ENVS): needs RUBYLIB to run
+ tests without install.
-Sat Aug 4 01:27:40 2012 Shugo Maeda <shugo@ruby-lang.org>
+Thu Jan 22 12:19:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (invokesuper): reverted r36612 so that super in an
- aliased method will not call the same method.
+ * gc.c (define_final): cannot define finalizer for immediate
+ values. [ruby-core:21500]
-Fri Aug 3 19:26:10 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * gc.c (define_final): freezes or hides internal values.
- * insns.def (invokesuper): don't skip the same class. instead, use
- rb_method_entry_get_with_omod() to avoid infinite loop when
- super is used with refinements. [ruby-core:30450] [Bug #3351]
+Thu Jan 22 11:33:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 3 19:21:19 2012 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].
- * configure.in: use clang prior to gcc only when self-compiling on
- darwin. search default compilers on other platforms. [Bug #6816]
+Wed Jan 21 21:43:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 3 17:25:49 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * io.c (rb_io_ungetbyte, rb_io_ungetc): allows nil to reset EOF
+ flag with ungetting nothing.
- * configure.in: move RUBY_MINGW32 after AC_PROG_CC.
- RUBY_MINGW32 uses AC_TRY_CPP and it sets CC and CPP. [Bug #6816]
+ * ruby.c (load_file_internal): rests EOF flag to make possible to
+ load from stdin after reading data.
- * configure.in: don't use AC_PROG_CC in AS_CASE.
+Wed Jan 21 17:17:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Aug 3 17:21:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (ary_double_capa): a new function to expand array more
+ aggressively. [ruby-core:21460]
- * test/runner.rb: get rid of loading previously installed gems.
- [ruby-dev:46025]
+ * array.c (rb_ary_store): use ary_double_capa().
-Fri Aug 3 16:40:01 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * array.c (rb_ary_unshift_m): ditto.
- * .travis.yml (notifications): [experimental] IRC notifications.
+ * array.c (rb_ary_splice): ditto.
-Thu Aug 2 20:32:29 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Jan 21 15:32:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (rb_mod_using): new method Module#using. [experimental]
+ * io.c (rb_io_ungetbyte, rb_io_ungetc): clears EOF flag.
- * eval.c (rb_mod_refine): new method Module#refine. [experimental]
+Wed Jan 21 14:41:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * eval.c (f_using): new method Kernel#using. [experimental]
+ * array.c (take_items): to_ary() raises ArgumentError if cannot to
+ convert to Array. [ruby-dev:37797]
-Thu Aug 2 20:08:02 2012 Shugo Maeda <shugo@ruby-lang.org>
+Wed Jan 21 14:32:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * class.c, insns.def, method.h, proc.c, vm.c, vm_core.h, vm_eval.c,
- vm_insnhelper.c, vm_insnhelper.h, vm_method.c: add klass to
- rb_control_frame_t to implement super correctly.
+ * parse.y (debug_lines): calls rb_intern() once.
-Thu Aug 2 13:23:08 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Jan 21 13:58:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (AC_PROG_CC): AC_PROG_CC tries clang at first on
- darwin. [Bug #6816]
+ * include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
-Thu Aug 2 11:39:25 2012 Narihiro Nakamura <authornari@gmail.com>
+ * io.c (io_set_eof): sets EOF flag for TTY.
- * gc.c: return true or false. Patch by Dirkjan Bussink. [Bug #6821]
+ * io.c (io_seek): clears EOF flag.
- * test/ruby/test_gc.rb: add test-case for this bug.
+ * io.c (io_fillbuf): returns EOF if already met EOF. [ruby-dev:37798]
-Thu Aug 2 10:51:12 2012 Martin Bosslet <Martin.Bosslet@gmail.com>
+ * io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.
- * ext/openssl/lib/openssl/digest.rb
- test/openssl/test_digest.rb: Add Digest module function to OpenSSL
- module and test it. Patch provided by Eric Hodel.
- [ruby-core:46908][Feature #6819]
+Wed Jan 21 08:22:04 2009 Ryan Davis <ryand-ruby@zenspider.com>
-Wed Aug 1 22:29:12 2012 Benoit Daloze <eregontp@gmail.com>
+ * lib/minitest/*.rb: Imported minitest 1.3.1 r4532.
+ * test/minitest/*.rb: ditto.
- * ext/digest/digest.c (hexencode_str_new): return an ASCII string
+Tue Jan 20 20:16:21 2009 Tanaka Akira <akr@fsij.org>
- * test/digest: tests for all kind of digests encodings
- [ruby-core:46792][Bug #6799]
+ * ext/socket/socket.c (socket_s_list_ip_address): new method.
+ (sockaddr_obj): new function.
-Wed Aug 1 05:50:53 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * ext/socket/rubysocket.h: include ifaddrs.h, sys/ioctl.h,
+ sys/sockio.h, net/if.h if available.
+ (addrinfo_new): declared.
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_encoding):
- Fix test_encoding failure on Windows.
- With chcp 65001, 1252 and 437, test_encoding failed. Test result
- depends on locale because LANG environment variable doesn't affect
- locale on Windows.
- [ruby-core:46872] [Bug #6813]
+ * ext/socket/raddrinfo.c (addrinfo_new): exported.
-Wed Aug 1 00:33:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/extconf.rb: check ifaddrs.h, sys/ioctl.h, sys/sockio.h,
+ net/if.h and getifaddrs.
- * class.c (include_class_new): fix duplication of prepended module.
- since m_tbl of prepended module is always zero, copy from its
- copy iclass of original.
+Tue Jan 20 20:05:21 2009 Tanaka Akira <akr@fsij.org>
-Tue Jul 31 18:22:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/rubysocket.h (pseudo_AF_FTIP): moved from mkconstants.rb.
- * variable.c (classname): tell if found name is permanent. search
- tmp_classpath only if class id is set. [ruby-core:42865][Bug #6078]
+ * ext/socket/mkconstants.rb: prepend header if -H is not given.
- * variable.c (rb_class_path): duplicate found temporary path.
+Tue Jan 20 17:50:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * variable.c (rb_set_class_path_string, rb_set_class_path): set class
- id to find classpath.
+ * ext/nkf/nkf-utf8/nkf.c (nkf_buf): use nkf_char.
-Tue Jul 31 10:36:12 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Jan 20 16:17:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych.rb: updated to released version.
+ * cont.c (ruby_Init_{Continuation_body,Fiber_as_Coroutine}): prefixed
+ with ruby_ to export.
- * ext/psych/psych.gemspec: ditto
+ * ext/continuation/continuation.c, ext/fiber/fiber.c: ditto.
-Tue Jul 31 06:18:06 2012 Eric Hodel <drbrain@segment7.net>
+Tue Jan 20 15:32:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * time.c (time_sec): Remove extra wording about leap seconds and refer
- directly to Wikipedia's leap second page for further information.
- [Bug #6749]
+ * Makefile.in (miniruby): renames and then removes, to get rid of
+ EPERM on cygwin and mingw.
-Mon Jul 30 23:01:47 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * Makefile.in ($(LIBRUBY_SO)): use wildcard option of objcopy.
- * lib/rubygems/platform.rb (Gem::Platform#initialize): Support pattern
- like x86_64-netbsd6.99.7.
+ * configure.in (DLDFLAGS): do not export all symbols.
-Mon Jul 30 21:00:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * cygwin/GNUmakefile.in (RUBYDEF): rejects symbols prefixed with
+ Init_.
- * variable.c (find_class_path): no retry when preferred is given.
+ * win32/mkexports.rb (Exports::Mingw): includes all symbols as
+ well as mswin32, except for prefixed with Init_.
- * variable.c (classname): if classid is set try it to find full
- qualified class path, and then try arbitrary class path. try
- tmp_classpath at last even if enclosing namespace is anonymous.
- fix r36574. [ruby-core:42865][Bug #6078]
+Tue Jan 20 13:03:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * variable.c (rb_set_class_path_string, rb_set_class_path): set
- tmp_classpath instead of classpath if the name is not permanent.
+ * string.c (hash): fixed the tail bytes handling in the aligned
+ access case.
-Mon Jul 30 14:24:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 20 09:26:05 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * variable.c: store anonymous class path in tmp_classpath but not in
- classpath. [ruby-core:42865][Bug #6078]
+ * ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
-Mon Jul 30 13:11:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
- * configure.in (DLDFLAGS): on Darwin, deprecate -flat_namespace to get
- rid of huge imported symbols table.
+Tue Jan 20 06:48:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (LIBRUBY_RELATIVE): libruby_so is not made when
- disable-shared, so no absolute path is used for it and executable
- file is runnable anywhere.
+ * array.c (take_items), enum.c (enum_zip): tries to convert to
+ array first. [ruby-core:21442]
-Mon Jul 30 01:30:10 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Tue Jan 20 03:50:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * common.mk: add a dependency. [ruby-core:46741] [Bug #6789]
+ * ext/nkf/nkf-utf8/nkf.c: Update nkf to 2.0.9.
+ revert -s meaning as Shift_JIS, etc.
-Sun Jul 29 15:44:47 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Tue Jan 20 03:42:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (thread_create_core): hide th->async_errinfo_mask_stack from
- ObjectSpace.each_object. refix of r36539.
+ * string.c (hash): fixed typo. [ruby-dev:37791]
-Sun Jul 29 23:57:27 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 20 01:15:27 2009 Tanaka Akira <akr@fsij.org>
- * ext/socket/option.c (inet_ntop): use rb_w32_inet_ntop, instead of
- inet_ntop directly, which is unavailable on older version Windows.
+ * ext/socket/mkconstants.rb (SOMAXCONN): defined.
- * win32/win32.c (rb_w32_inet_ntop): type should be const.
+Mon Jan 19 22:31:35 2009 Tanaka Akira <akr@fsij.org>
-Sun Jul 29 14:20:34 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/socket/mkconstants.rb: use erb for generating code.
- * thread.c (Init_Thread): does not need to set klass
- explicitly.
+Mon Jan 19 17:33:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jul 29 06:21:04 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * string.c (hash): defaulted to MurmurHash 2.0.
- * win32/win32.c: suppress warning redeclared on mingw64.
- *_s functions are declared if MINGW_HAS_SECURE_API is defined.
- Follow up r36556.
+Mon Jan 19 17:29:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jul 29 00:28:46 2012 Narihiro Nakamura <authornari@gmail.com>
+ * include/ruby/defines.h (RUBY_ALIAS_FUNCTION_TYPE): added.
- * gc.c: remove unused initialization.
+Mon Jan 19 17:24:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 28 16:26:09 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * vm_dump.c (vm_stack_dump_each): used only if debug mode.
- * win32/win32.c (gmtime_r): use _gmtime64_s() with x86_64-w64-mingw32.
+Mon Jan 19 16:32:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/win32.c (localtime_r): use _localtime64_s() with
- x86_64-w64-mingw32. Since FileTimeToSystemTime() seems not work with
- large value under x64. Mingw-w64 doesn't have these declaration.
- [ruby-core:46780] [Bug #6794]
+ * string.c (hash): added MurmurHash 2.0.
-Fri Jul 27 18:25:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 19 14:31:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_io_check_io): make public.
+ * thread.c (rb_thread_execute_interrupts): needs
+ rb_signal_buff_size to be declared.
- * process.c (check_exec_redirect): try conversion to IO on redirect
- parameters. [ruby-core:44181] [Bug #6269]
+Mon Jan 19 13:34:25 2009 Koichi Sasada <ko1@atdot.net>
-Fri Jul 27 17:58:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (require_libraries): reset th->parse_in_eval while
+ loading libraries. fixes [ruby-dev:37780]
- * configure.in (RUBY_CPPOUTFILE): get rid of variable conflict so
- CPPFLAGS is not duplicated. [ruby-core:43097] [Bug #6119]
+Mon Jan 19 11:46:39 2009 Koichi Sasada <ko1@atdot.net>
-Fri Jul 27 12:12:36 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm_eval.c, eval.c (rb_f_block_given_p): move definition of
+ "iterator?" and "block_given?" to make static.
- * win32/mkexports.rb: should not export DllMain().
- reported by luis at [ruby-core:46743] [Bug #6790], solved by
- Heesob Park, and confirmed by nobu.
+ * vm.c (vm_get_ruby_level_caller_cfp): make it static.
-Thu Jul 26 14:51:29 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * eval_intern.h, vm_insnhelper.c: move decl. of
+ vm_get_ruby_level_caller_cfp()
+ from eval_intern.h to vm_insnhelper.c.
- * test/net/http/test_https.rb (TestNetHTTPS#test_session_reuse):
- localhost is not (always) 127.0.0.1. Don't expect that.
+Mon Jan 19 11:27:39 2009 Koichi Sasada <ko1@atdot.net>
-Thu Jul 26 07:18:38 2012 <kanemoto@ruby-lang.org>
+ * 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.
- * ext/json/fbuffer/fbuffer.h: avoid compilation error on AIX by
- -ansi -std=iso9899:199409 (r36038). [ruby-core:46744] [Bug #6791].
+ * 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.
-Thu Jul 26 00:42:23 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Mon Jan 19 11:22:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (thread_create_core, Init_Thread): hide
- th->async_errinfo_queue and th->async_errinfo_mask_stack from
- ObjectSpace.each_object.
+ * ext/socket/rubysocket.h (rb_cUNIXSocket, rb_cUNIXServer),
+ (unixpath, unixaddr): UNIX domain sockets depend on sys/un.h.
-Wed Jul 25 17:41:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 19 11:02:30 2009 Koichi Sasada <ko1@atdot.net>
- * complex.c, rational.c: compatible marshal loader for compatibilities
- with 1.8. [ruby-core:45775] [Bug #6625]
+ * 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).
-Wed Jul 25 17:17:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_core.h: ditto.
- * atomic.h: prefer GCC atomic builtins than Windows APIs, if possible,
- since they are generic.
+ * vm_exec.h (SDR2): remove duplicate definition.
-Wed Jul 25 11:16:57 2012 Eric Hodel <drbrain@segment7.net>
+Mon Jan 19 11:00:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/.document: Removed. All files in net/ should be included in
- RDoc.
+ * ext/socket/raddrinfo.c (addrinfo_ip_port): use AF_INET6 only when
+ defined, as well as addrinfo_ipv6_p().
-Wed Jul 25 10:00:23 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jan 19 10:43:38 2009 Koichi Sasada <ko1@atdot.net>
- * test/testunit/test_redefinition.rb: broken class/method names.
+ * gc.c (garbage_collect_with_gvl): suppress warnings.
-Wed Jul 25 09:26:32 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jan 19 10:34:32 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/cgi/html.rb: Use << instead of +=.
- `a += b` is syntax sugar of `a = a + b`; it creates a new string
- object. `a << b` is concatenation and doesn't create new object.
+ * ext/socket/depend: workaround for nmake. files in depend without
+ paths should converted by RULE_SUBST, but mkmf.rb cannot recognize
+ macros currently.
-Wed Jul 25 09:16:26 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jan 19 09:53:43 2009 Koichi Sasada <ko1@atdot.net>
- * lib/cgi/html.rb (element_init): suppress redefine warning.
- Don't define methods if they are already defined.
+ * iseq.c:
+ rename ruby_iseq_disasm_insn() -> rb_iseq_disasm_insn().
+ rename ruby_iseq_disasm() -> rb_iseq_disasm().
-Wed Jul 25 09:05:38 2012 Eric Hodel <drbrain@segment7.net>
+ * 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().
- * lib/net/http.rb: Added SSL session reuse across connections for a
- single instance to speed up connection. [Feature #5341]
- * NEWS: ditto
- * test/net/http/test_https.rb: Tests for #5341
+ * iseq.c, compile.c: remove ruby_insn_make_insn_table() and make
+ static function insn_make_insn_table().
-Wed Jul 25 06:54:24 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * doc/re.rdoc: Fix spelling
+Mon Jan 19 09:21:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jul 25 06:49:12 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/mkconstants.rb: define macros with default value in
+ constdefs.h if not exist them.
- * re.c (rb_reg_s_last_match): Update $~ to reference Regexp
- documentation about "special global variables". [Bug #6723]
+ * ext/socket/raddrinfo.c (addrinfo_mdump, addrinfo_mload): support
+ UNIX socket only on platforms which support it.
-Wed Jul 25 06:28:56 2012 Eric Hodel <drbrain@segment7.net>
+Mon Jan 19 08:56:53 2009 Koichi Sasada <ko1@atdot.net>
- * iseq.c: Added documentation. Patch by David Albert. [Bug #6785]
+ * 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.
-Wed Jul 25 03:05:06 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * vm.c (vm_collect_local_variables_in_heap): make it static.
- * parse.y: added symbols and qsymbols productions for %i and %I
- support. %i{ .. } returns a list of symbols without interpolation,
- %I{ .. } returns a list of symbols with interpolation. Thanks to
- Josh Susser for inspiration of this feature. [Feature #4985]
+Mon Jan 19 04:06:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/ripper/eventids2.c: added ripper events for %i and %I.
+ * iseq.c (rb_iseq_load): renamed from ruby_iseq_load, since it is
+ for C extensions or the ruby core. [ruby-core:21407]
- * test/ripper/test_parser_events.rb: ripper tests
+Mon Jan 19 03:06:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * test/ripper/test_scanner_events.rb: ditto
+ * transcode.c (str_transcode0): fix: :xml option doesn't
+ work on str.encode([options]) form without default_internal.
- * test/ruby/test_array.rb: test for %i and %I behavior
+Sun Jan 18 16:56:46 2009 Tanaka Akira <akr@fsij.org>
-Tue Jul 24 23:34:43 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * 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.
- * include/ruby/win32.h (rb_w32_pow): add new function.
- We use powl() instead of broken pow() for x64-mingw32. This workaround
- fixes test failures related to floating point numeric.
- [ruby-core:46686] [Bug #6784]
+Sun Jan 18 16:46:37 2009 Tanaka Akira <akr@fsij.org>
-Tue Jul 24 15:01:24 2012 NAKAMURA Usaku <usa@ruby-lang.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.
- * win32/win32.c (rb_w32_socket, rb_w32_socketpair): remember the family
- in the high word of socklist value.
+Sun Jan 18 14:29:52 2009 Tanaka Akira <akr@fsij.org>
- * win32/win32.c (overlapped_socket_io, recvmsg, sendmsg, setfl): follow
- above changes.
+ * ext/socket/unixsocket.c: redundant #ifdef removed.
- * win32/win32.c (rb_w32_getsockname): set remembered family to the
- argument when OS's function fails.
+Sun Jan 18 03:33:23 2009 Tanaka Akira <akr@fsij.org>
-Tue Jul 24 12:35:13 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/raddrinfo.c (addrinfo_mdump): don't use symbol.
+ (addrinfo_mload): ditto.
- * test/ruby/test_dir_m17n.rb: remove a garbage.
+Sun Jan 18 03:05:20 2009 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_dir_m17n.rb: convert from ascii-8bit to other encoding
- with 8bit bytes always fails.
+ * ext/socket/raddrinfo.c (addrinfo_mdump): new method.
+ (addrinfo_mload): new method.
+ (Init_addrinfo): define the method above.
-Tue Jul 24 12:32:18 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/constants.c (constant_arg): str_to_int's first argument
+ constified.
- * test/ruby/test_dir_m17n.rb: sorry, typo.
+ * 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.
-Tue Jul 24 12:13:26 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/rubysocket.h (IS_IP_FAMILY): moved from raddrinfo.c.
- * test/ruby/test_dir_m17n.rb: refactoring. RE should be in the left side
- of the =~ operator, and compare the result with nil is meaningless.
+Sun Jan 18 01:37:50 2009 Tanaka Akira <akr@fsij.org>
-Tue Jul 24 11:35:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/socket.c (sock_s_getnameinfo): accept AddrInfo object.
- * test/ruby/test_pack.rb (test_pack_unpack_M): was redefined
- accidentally.
+ * ext/socket/raddrinfo.c (rb_check_sockaddr_string_type): defined.
-Tue Jul 24 09:31:18 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/rubysocket.h (rb_check_sockaddr_string_type): declared.
- * lib/rubygems: Updated to RubyGems 1.8.24, a bugfix release.
+Sat Jan 17 22:01:15 2009 Tanaka Akira <akr@fsij.org>
-Tue Jul 24 08:30:15 2012 Luis Lavena <luislavena@gmail.com>
+ * ext/socket/lib/socket.rb: new file.
- * test/ruby/test_dir_m17n.rb (create_and_check_raw_file_name): add new
- helper method to ease encoding testing. Patch by Oleg Sukhodolsky.
- [ruby-core:46589][Bug #6765]
+Sat Jan 17 19:33:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * test/ruby/test_dir_m17n.rb (test_filename_extutf8): use filesystem
- encoding when reading entries and comparing.
+ * configure.in (VCSUP): fixed the cases for git-svn or git.
- * test/ruby/test_dir_m17n.rb (test_filename_utf8_raw_name): removed.
+ * win32/Makefile.sub (VCSUP): ditto.
- * test/ruby/test_dir_m17n.rb (test_filename_utf8_raw_jp_name): split test.
+ * Makefile.in (up): `cd' is necessary for git and git-svn.
-Tue Jul 24 08:09:30 2012 Luis Lavena <luislavena@gmail.com>
+Sat Jan 17 19:16:16 2009 Tanaka Akira <akr@fsij.org>
- * test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform
- used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki.
- [ruby-core:46651][Bug #6782]
+ * ext/socket/mkconstants.rb: generate a header file for generated
+ functions.
-Tue Jul 24 07:22:58 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/rubysocket.h: include constdefs.h. don't declare
+ generated functions.
- * time.c (time_sec): Updated description of leap seconds for accuracy.
- Based on patch by Marcus Stollsteimer. [Bug #6749]
+ * ext/socket/constants.c: include constdefs.c instead of constants.h.
-Tue Jul 24 07:03:11 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/depend: dependency updated.
- * string.c (rb_str_sub): Fixed wording of documentation to match the
- replacement operation. Minor cleanup of markup. [Bug #6719]
- * string.c (rb_str_sub_bang): Minor wording change for clarity, minor
- cleanup of markup.
+Sat Jan 17 17:58:22 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Mon Jul 23 23:58:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod.
+ [ruby-core:21383].
- * enc/Makefile.in (TARGET_NAME, TARGET_ENTRY): needed for EXTDLDFLAGS
- on some platforms. [ruby-core:46600] [Bug #6768]
+Sat Jan 17 15:01:22 2009 Tanaka Akira <akr@fsij.org>
- * enc/depend: no longer needs tweaking DLDFLAGS for TARGET names.
+ * 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.
-Mon Jul 23 22:48:19 2012 Tanaka Akira <akr@fsij.org>
+Sat Jan 17 14:52:27 2009 Tanaka Akira <akr@fsij.org>
- * lib/open-uri.rb: use respond_to? to test Tempfile.
- [ruby-dev:45995] [Bug #6781] reported by hsbt (Hiroshi SHIBATA).
+ * ext/socket/mkconstants.rb: don't cause an error for duplicate names.
-Mon Jul 23 14:43:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jan 17 12:46:17 2009 Tanaka Akira <akr@fsij.org>
- * configure.in (LIBPATHENV): LIBPATH is used on AIX, but not
- SHLIB_PATH which was carelessly copied from HP/UX. suggested by
- Perry Smith at [ruby-core:46397]. [Bug #6728]
+ * ext/socket: split files for each class.
-Mon Jul 23 01:55:08 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * ext/socket/rubysocket.h: common header.
- * test/uri/test_generic.rb (URI#test_find_proxy): add tests with
- empty *_proxy env variables.
+ * ext/socket/basicsocket.c: new file for BasicSocket.
-Mon Jul 23 01:47:26 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * ext/socket/ipsocket.c: new file for IPSocket.
- * test/uri/test_generic.rb (URI#with_env): unset proxy related env
- variables. [Bug #6774]
+ * ext/socket/tcpsocket.c: new file for TCPSocket.
- * test/uri/test_generic.rb (URI#test_find_proxy): fix failures
- when proxy related env variables already set. [Bug #6774]
+ * ext/socket/tcpserver.c: new file for TCPServer.
-Sun Jul 22 23:58:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/sockssocket.c: new file for SOCKSSocket.
- * thread.c (rb_threadptr_execute_interrupts_common): increase
- running_time_us on THREAD_TO_KILL like on THREAD_RUNNABLE.
- This cause not to switch from a thread which is to be killed
- on FreeBSD and Mac OS X. see also the test.
- This issue maybe exist for long time but happens after r36430.
+ * ext/socket/udpsocket.c: new file for UDPSocket.
-Sat Jul 21 06:21:45 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/socket/unixsocket.c: new file for UNIXSocket.
- * lib/net/http.rb: fixes for r36476. [Feature #6546]
- http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120720T030101Z.diff.html.gz
+ * ext/socket/unixserver.c: new file for UNIXServer.
- * lib/net/http.rb (Net::HTTP.newobj): return back for compatibility.
+ * ext/socket/socket.c: now for Socket.
- * lib/net/http.rb (Net::HTTP.new): set default_port if proxy port is
- not given.
+ * ext/socket/raddrinfo.c: new file for AddrInfo and name resolution.
- * lib/net/http.rb (Net::HTTP#initialize): ditto.
+ * ext/socket/constants.c: new file for constants.
- * lib/net/http.rb (Net::HTTP#proxy?): return true or false.
+ * ext/socket/init.c: new file for utilities.
- * lib/net/http.rb (Net::HTTP#proxy_address): check proxy_uri is not nil.
+ * ext/socket/mkconstants.rb: export *_to_int.
- * lib/net/http.rb (Net::HTTP#proxy_port): ditto.
+ * ext/socket/extconf.rb: add new object files.
-Sat Jul 21 23:12:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/depend: add dependencies for new files.
- * thread_pthread.c (ruby_init_stack): STACK_GROW_DIR_DETECTION is
- necessary on platforms with unknown stack direction. [Bug #6761]
+ * ext/.document: add new files.
-Sat Jul 21 15:13:42 2012 Shota Fukumori <sorah@tubusu.net>
+Sat Jan 17 11:12:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/test/unit/testcase.rb (method_added): refactoring.
+ * cont.c (cont_restore_0): padding size doesn't need to be large
+ if alloca is used. suppress warnings.
-Sat Jul 21 14:06:41 2012 Shota Fukumori <sorah@tubusu.net>
+Sat Jan 17 11:12:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/test/unit/testcase.rb: warn when test_* method is redefined.
- Patch by mame (Yusuke Endoh). [Feature #2643] [ruby-core:27790]
+ * vm_dump.c (vm_stack_dump_each): initialized at declarations.
- * test/testunit/test_redefinition.rb: Test for above.
+ * vm_dump.c (rb_vm_bugreport): constified to suppress a warning.
- * test/testunit/test4test_redefinition.rb: Ditto.
+Fri Jan 16 22:30:27 2009 Tanaka Akira <akr@fsij.org>
-Sat Jul 21 08:41:14 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/socket.c: move addrinfo code.
- * lib/logger.rb: Updated example in Logger comment to match other
- examples and fixed a bug. Patch by Marcus Stollsteimer.
- [Bug #6759]
+Fri Jan 16 18:51:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Jul 20 17:20:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (up): tell nmake that need to run command via
+ shell.
- * random.c (rb_random_real): refine error message.
+Fri Jan 16 18:43:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jul 20 11:03:17 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * NEWS: Updated net/http for automatic proxy detection (#6546) and
- automatic gzip and deflate compression (#6492, #6494).
+Fri Jan 16 18:26:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jul 20 10:55:38 2012 Eric Hodel <drbrain@segment7.net>
+ * include/ruby/ruby.h (VALUE): use unsigned long or long long
+ instead of uintptr_t, since many %lx and so on are still used.
- * lib/net/http.rb: Net::HTTP now automatically detects and uses
- proxies from the environment. A proxy may also be specified as
- before.
+Fri Jan 16 17:33:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- Net::HTTP::Proxy still creates anonymous classes, but these classes
- are only used to store configuration information. When an HTTP
- instance is created the configuration is now copied.
+ * configure.in (Makefile): set VCS and VCSUP to support `git svn'
+ and git.
- Additionally, Net::HTTP::ProxyDelta is no longer used by Net::HTTP
+ * Makefile.in, win32/Makefile.sub (up): split from common.mk.
- [Feature #6546]
- * lib/open-uri.rb: Moved URI::Generic#find_proxy to uri/generic.
- * lib/uri/generic.rb: Imported find_proxy from open-uri.
- * test/open-uri/test_open-uri.rb: Moved proxy-discovery tests to URI.
- * test/uri/test_generic.rb: Imported proxy-discovery tests from
- open-uri.
- * test/net/http/test_http.rb: Added tests for proxy behavior.
+Fri Jan 16 12:24:39 2009 Koichi Sasada <ko1@atdot.net>
-Fri Jul 20 09:34:11 2012 Eric Hodel <drbrain@segment7.net>
+ * thread.c (thread_start_func_2): call ruby_cleanup() if thread is
+ main thread. [ruby-dev:37624]
- * test/socket/test_socket.rb: Ignore IPv6 unique local addresses on OS
- X (iCloud Back to my Mac addresses) for test_udp_socket since they do
- not act as loopback addresses. [Bug #6692]
+Fri Jan 16 12:27:50 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Jul 20 09:32:14 2012 Eric Hodel <drbrain@segment7.net>
+ * 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).
- * ext/socket/raddrinfo.c (addrinfo_ipv6_unique_local_p): Added
- Addrinfo#ipv6_unique_local? to detect RFC 4193 unique local
- addresses. Part of #6692
- * ext/socket/rubysocket.h: Add IN6_IS_ADDR_UNIQUE_LOCAL macro if
- missing.
- * test/socket/test_addrinfo.rb: Test for ipv6_unique_local?
+Fri Jan 16 12:15:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Jul 20 07:40:32 2012 Eric Hodel <drbrain@segment7.net>
+ * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string.
+ if not, cause compile error in using PRI?VALUE.
- * lib/net/http/response.rb: Automatically inflate gzip and
- deflate-encoded response bodies. [Feature #6942]
- * lib/net/http/generic_request.rb: Automatically accept gzip and
- deflate content-encoding for requests. [Feature #6494]
- * lib/net/http/request.rb: Updated documentation for #6494.
- * lib/net/http.rb: Updated documentation for #6492 and #6494, removed
- Content-Encoding handling now present in Net::HTTPResponse.
- * test/net/http/test_httpresponse.rb: Tests for #6492
- * test/net/http/test_http_request.rb: Tests for #6494
- * test/open-uri/test_open-uri.rb (test_content_encoding): Updated test
- for automatic content-encoding handling.
+ * win32/Makefile.sub (config.h): add SIZEOF_INTPTR_T and
+ SIZEOF_UINTPTR_T for SIZEOF_VALUE.
-Fri Jul 20 03:42:54 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jan 16 11:51:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c: use #ifdef, not #if.
+ * symbian/pre-build (COMSPEC): should not overridden.
-Thu Jul 19 15:08:40 2012 Koichi Sasada <ko1@atdot.net>
+Fri Jan 16 11:47:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_thread_s_control_interrupt,
- rb_thread_s_check_interrupt): added for
- Thread.control_interrupt and Thread.check_interrupt.
- See details on rdoc.
- I'll make an ticket for this feature.
+ * parse.y (rb_parse_in_main): fixed typo.
- * test/ruby/test_thread.rb: add a test for Thread.control_interrupt.
+Fri Jan 16 11:41:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_threadptr_raise): make a new exception object
- even if argc is 0.
+ * configure.in (RUBY_REPLACE_TYPE): does not define rb_ prefixed
+ name if no default type is given.
- * thread.c (rb_thread_kill): kill thread immediately if target thread
- is current thread.
+ * configure.in (RUBY_DEFINT): checks size.
- * vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): added.
- CHECK_INTS while/after blocking operation.
+ * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX):
+ assumes usable if PRIdPTR is defined.
- * vm_core.h (RUBY_VM_CHECK_INTS): require rb_thread_t ptr.
+Fri Jan 16 02:25:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * cont.c (fiber_switch): use replaced RUBY_VM_CHECK_INTS().
+ * thread.c (rb_thread_execute_interrupts): if signal is already
+ buffered, main thread should wait until timer thread delivers it.
- * eval.c (ruby_cleanup): ditto.
+ * thread.c (timer_thread_function): should defer delivery of a signal
+ if main thread does not yet trap a previous one. [ruby-dev:37676]
- * insns.def: ditto.
+Fri Jan 16 02:05:55 2009 Tanaka Akira <akr@fsij.org>
- * process.c (rb_waitpid): ditto.
+ * ext/socket/socket.c (addrinfo_s_ip): new method AddrInfo.ip.
- * vm_eval.c (vm_call0): ditto.
+Fri Jan 16 01:42:50 2009 Koichi Sasada <ko1@atdot.net>
- * vm_insnhelper.c (vm_call_method): ditto.
+ * 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]
-Thu Jul 19 22:46:48 2012 Tanaka Akira <akr@fsij.org>
+Fri Jan 16 01:09:37 2009 Koichi Sasada <ko1@atdot.net>
- * test/ruby/test_io.rb: remove temporally files early.
+ * ruby.c (process_options): decrement parse_in_eval to recognize
+ parsing main or normal eval script.
-Thu Jul 19 15:38:35 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * compile.c (rb_parse_in_main): return 1 if parsing main script.
+ (if parse_in_eval is negative value, it means main script)
- * variable.c (rb_mod_class_variables): return inherited variables
- except when the optional argument is set to false.
- [ruby-dev:44034] [Bug #4971]
+ * parse.y (yycompile0): check rb_parse_in_main() to accumulate
+ script text. Bug #848 [ruby-core:20450]
- * variable.c (rb_mod_constants): fix typo in documentation.
+Fri Jan 16 00:57:34 2009 Koichi Sasada <ko1@atdot.net>
-Thu Jul 19 14:30:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/debug.rb: as wanabe-san pointed out,
+ set_trace_func should be completely final task in debug.rb.
+ Bug #847 [ruby-core:20449]
- * internal.h: move mark function declarations that should be private.
+Fri Jan 16 00:27:03 2009 Koichi Sasada <ko1@atdot.net>
-Thu Jul 19 14:18:22 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm.c (rb_vm_inc_const_missing_count, ruby_vm_const_missing_count):
+ added.
- * ext/socket/init.c (rsock_init_sock): need to update max fd on all
- platforms.
+ * vm_insnhelper.h: ditto.
-Thu Jul 19 14:15:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * variable.c (rb_const_get_0), insns.def: Constants should not be
+ cached if const_missing is called. [ruby-core:21059] [Bug #967]
- * thread.c (rb_gc_mark_threads): remove deprecated function.
+ * bootstraptest/test_class.rb: add a test.
-Thu Jul 19 13:28:03 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jan 16 00:25:09 2009 Koichi Sasada <ko1@atdot.net>
- * test/net/http/test_http.rb (TestNetHTTPLocalBind#test_bind_to_local*):
- re-enable the tests because now it's OK on windows.
+ * common.mk: btest-ruby should receive option with OPTS.
-Thu Jul 19 13:26:25 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jan 16 00:21:10 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/socket/extconf.rb: now enable IPv6 by default on mswin.
+ * 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.)
-Thu Jul 19 09:33:46 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * win32/Makefile.sub ($(INSNS)): shouldn't remove BASERUBY.
- * ext/psych/emitter.c (initialize): allow a configuration object to be
- passed to the constructor so that mutation isn't required after
- instantiation.
+Fri Jan 16 00:19:55 2009 Koichi Sasada <ko1@atdot.net>
- * ext/psych/lib/psych/handler.rb: add configuration object
+ * gc.c (gc_with_gvl): suppress warnings.
- * ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
- extra configuration is present.
+Thu Jan 15 20:44:30 2009 Tanaka Akira <akr@fsij.org>
-Thu Jul 19 08:20:25 2012 Tanaka Akira <akr@fsij.org>
+ * tool/file2lastrev.rb: RUBY_REVISION must be an integer.
- * test/ruby/test_file.rb: remove temporally files early.
+Thu Jan 15 15:55:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jul 19 07:37:41 2012 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * 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]
- * test/drb/drbtest.rb: fixed: can't delete unix domain sockets problem.
+Thu Jan 15 14:27:27 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Thu Jul 19 03:41:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * LEGAL: Added information for missing/langinfo.c
- * bignum.c: Added #include <strings.h> for ffs(). Patch by Perry
- Smith. Thank you. [Bug #6748]
+Thu Jan 15 14:17:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jul 19 01:56:02 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * parse.y (stmt): explicit error for "Object::Far += foo 1" just
+ as "Object::Far += 1".
- * include/ruby/intern.h (rb_num_zerodiv): Added NORETURN.
- Patched by Xi Wang. [Bug #6736]
+ * parse.y (command): moved return/break/next from command_call for
+ better error message.
-Wed Jul 18 23:57:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (call_args): void value check added.
- * pack.c (pack_pack): round down too long uuencode width. folding
- width in uuencode format cannot be longer than 63 bytes.
+Thu Jan 15 13:10:58 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jul 18 23:04:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c.
- * ext/dbm/dbm.c (fdbm_empty_p): fix wrong condition introduced in r36438.
+Thu Jan 15 13:10:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/sdbm/init.c (fsdbm_empty_p): ditto.
+ * configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
+ and mswin.
-Wed Jul 18 23:08:57 2012 Tanaka Akira <akr@fsij.org>
+ * encoding.c (rb_locale_charmap): use environments on mingw and mswin.
- * test/ruby/test_beginendblock.rb: remove temporally files early.
+ * missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
+ environment uses Windows-31J derived from Shift_JIS, not EUC-JP.
-Wed Jul 18 22:43:02 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 15 12:10:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_autoload.rb: remove temporally files early.
+ * win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
+ miniprelude.c, newline.c): copy only when $(srcdir) != pwd.
-Wed Jul 18 21:59:46 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 15 11:40:44 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_argf.rb: use temporally directory.
+ * io.c (pipe_open): revert a part of previous commit. it may be a
+ mistake.
-Wed Jul 18 19:41:19 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 15 10:45:52 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/openssl/test_config.rb: remove temporally files early.
+ * symbian/README.SYMBIAN: symbian support added. great appreciate
+ to <alexandre.zavorine at symbian.com>.
-Wed Jul 18 17:45:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 15 00:06:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * error.c (rb_builtin_type_name): map by index.
+ * enc/trans/gb18030.trans: get rid of a 1.9 feature for cross
+ compile. [ruby-core:21345]
-Wed Jul 18 16:17:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 14 23:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb (have_framework): get rid of separating -framework
- option and its argument and dealing with the argument as a library
- or an object name. if $LDFLAGS were an array...
+ * encoding.c (rb_locale_charmap): fallback to codepage if no
+ locale is found. [ruby-core:21110]
-Wed Jul 18 16:09:10 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
+ locale is found.
- * ext/curses/extconf.rb: support PDCurses. patched by Luis Lavena.
- [ruby-core:46485] [Feature #6735]
+Wed Jan 14 22:38:30 2009 Tanaka Akira <akr@fsij.org>
-Wed Jul 18 15:50:25 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * gc.c (negative_size_allocation_error_with_gvl): abolish a warning.
+ (negative_size_allocation_error): ditto.
- * parse.y (primary): allow an empty grouped expression as the
- operand of the not operator (e.g., not ()).
- [ruby-core:45976] [Bug #6674]
+ * ext/openssl/ossl.c (ossl_raise): ditto.
- * parse.y (parser_yylex): show no warning for a grouped expression
- as the operand of the not operator (e.g., not (a)) or as an
- argument of a method call without parentheses (e.g., foo (a)).
- [ruby-core:39050] [Bug #5214]
+Wed Jan 14 20:05:05 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Wed Jul 18 15:33:21 2012 Koichi Sasada <ko1@atdot.net>
+ * enc/trans/gb18030.trans, gb18030-tbl.rb:
+ new Chinese GB18030 transcoding (from Yoshihiro Kambayashi)
- * thread.c (rb_thread_call_without_gvl2): added.
- it can skip last CHECK_INTS. See document for more details.
- Document about it was updated a bit.
+ * test/ruby/test_transcode.rb: added tests for the above
+ (from Yoshihiro Kambayashi)
- * include/ruby/thread.h (decl. of rb_thread_call_without_gvl2): added.
+ * transcode_data.h, transcode.c, tool/transcode_tblgen.rb:
+ added support for GB18030-specific 4-byte sequences
+ (with Yoshihiro Kambayashi)
- * thread.c (rb_thread_call_with_gvl): remove "EXPERIMENTAL!"
- warning from a document.
+Wed Jan 14 16:16:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jul 18 14:53:21 2012 Nobuyoshi Nakada <nobu@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]
- * configure.in (EXTDLDFLAGS): split options for each extension
- libraries, and unused in ruby.pc. [Bug #6734]
+Wed Jan 14 14:42:30 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
- * lib/mkmf.rb (MakeMakefile#configuration): add EXTDLDFLAGS.
+ * cont.c: fix prototype declare of register_stack_extend
-Wed Jul 18 14:47:23 2012 Koichi Sasada <ko1@atdot.net>
+Wed Jan 14 13:19:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c: fix last commit miss.
+ * win32/win32.c (rb_w32_aspawn): should not escape with caret
+ unless using cmd.exe.
-Wed Jul 18 14:16:51 2012 Koichi Sasada <ko1@atdot.net>
+Wed Jan 14 13:09:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_threadptr_async_errinfo_*): manage async errors queue.
- Async events such as an exception throwed by Thread#raise,
- Thread#kill and thread termination (after main thread termination)
- will be queued to th->async_errinfo_queue.
- - clear: clear the queue.
- - enque: enque err object into queue.
- - deque: deque err object from queue.
- - active_p: return 1 if the queue should be checked.
- rb_thread_t#thrown_errinfo was removed.
+ * ext/socket/extconf.rb (gai_strerror): checks if available and if
+ returns const pointer.
- * vm_core.h: add declarations of rb_threadptr_async_errinfo_*.
- remove rb_thread_t#thrown_errinfo field and
- add rb_thread_t#async_errinfo_queue (queue body: Array),
- rb_thread_t#async_errinfo_queue_checked (flag),
- rb_thread_t#async_errinfo_mask_stack(Array, not used yet).
+ * ext/socket/getaddrinfo.c (gai_strerror): defines only if non
+ available. [ruby-core:21328]
- * vm.c (rb_thread_mark): fix a mark function.
+Wed Jan 14 12:39:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * cont.c (rb_fiber_start): enque an error.
+ * io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.
- * process.c (after_fork): clear async errinfo queue.
+ * io.c (appendline): reformed.
-Wed Jul 18 14:25:55 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * io.c (rb_io_s_pipe): reduced nest of rb_ensure of main block.
- * pack.c: (ditto) bitwise operations are not char. Apply explicit
- casts on them.
+Tue Jan 13 22:56:57 2009 Tanaka Akira <akr@fsij.org>
-Wed Jul 18 12:59:50 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * ext/socket/addrinfo.h (AI_NUMERICSERV): defined.
+ (AI_MASK): add AI_NUMERICSERV.
- * encoding.c (load_encoding): explicit cast to suppress warning.
- Though the cast truncates some bits, from heuristic analysis I
- believe it is OK to do so here.
+ * ext/socket/getaddrinfo.c (getaddrinfo): support AI_NUMERICSERV.
- * bignum.c (rb_cstr_to_inum): ditto.
+Tue Jan 13 21:45:53 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Wed Jul 18 12:55:54 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check.
+ Patch by Kornelius Kalnbach. [ruby-core:20992].
- * lib/benchmark.rb: Fix Benchmark.benchmark output with an empty
- caption. patched by Benoit Daloze. [ruby-core:45719] [Bug #6610]
+ * test/ostruct/test_ostruct.rb: test for inspect.
+ Patch by Kornelius Kalnbach. [ruby-core:20992].
-Wed Jul 18 10:00:54 2012 Eric Hodel <drbrain@segment7.net>
+Tue Jan 13 21:44:30 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/debug.rb: Added toplevel documentation. Based on patch by Oscar
- Del Ben. [Bug #6743], fixes #146 on github.
+ * io.c (io_reopen, rb_io_init_copy): should register fptr to pipe_list
+ when copying pipe fptr.
-Wed Jul 18 09:33:59 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 13 21:38:07 2009 Tanaka Akira <akr@fsij.org>
- * test/win32ole/test_win32ole_event.rb (TestWIN32OLE_EVENT): use
- standard skip method to skip tests.
+ * 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.
-Wed Jul 18 09:26:45 2012 Eric Hodel <drbrain@segment7.net>
+ * extconf.rb: define GETADDRINFO_EMU if getaddrinfo.c/getnameinfo.c is
+ used.
- * lib/logger.rb: Updated typos and output to match modern Logger
- output. Patch by Marcus Stollsteimer. [Bug #6738]
+Tue Jan 13 21:28:14 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Wed Jul 18 07:59:29 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+ * object.c (rb_obj_not_match): rdoc.
+ Patch by Kornelius Kalnbach. [ruby-core:20991]
- * lib/cgi/util.rb (CGI.escapeHTML,unescapeHTML): Add &apos; for HTML5
- escaping.
- [Feature #6620]
+Tue Jan 13 18:21:44 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jul 17 22:17:13 2012 Tanaka Akira <akr@fsij.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)
- * lib/open-uri.rb: call io.close! for Tempfile.
+Tue Jan 13 18:19:49 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jul 17 16:41:32 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
+ (also see [ruby-dev:37721])
- * proc.c (rb_proc_arity): return normal value (not -n-1) if it is not
- a labmda, or it is a labmda and no arg_opts. [Bug #5694]
+Tue Jan 13 17:29:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Jul 17 03:56:34 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * enc/trans/make_transdb.rb (converters): should not depend on the
+ hash order for cross compile.
- * ext/psych/lib/psych/visitors/to_ruby.rb: strings with YAML anchors
- are properly referenced. Patched by Joe Rafaniello via Github:
- https://github.com/tenderlove/psych/pull/69
- * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
- * test/psych/test_alias_and_anchor.rb: test for change
+Tue Jan 13 16:39:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Jul 16 23:20:24 2012 Tanaka Akira <akr@fsij.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.
- * bignum.c (rb_integer_float_cmp): use FIXNUM_MIN and FIXNUM_MAX,
- instead of LONG_MIN and LONG_MAX.
+ * win32/win32.c (extract_fd, rb_w32_select): use rb_fdset_t to expand
+ fd_array if needed. [ruby-core:19946]
-Mon Jul 16 22:50:41 2012 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c (copy_fd): new function for rb_w32_select().
- * numeric.c (flo_to_s): use the exponential form if the integer part
- is longer than or equal DBL_DIG.
- [ruby-dev:45960] [ruby-trunk - Bug #6741]
+Tue Jan 13 12:31:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Mon Jul 16 22:01:00 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * tool/file2lastrev.rb (get_revisions): fixes problem with
+ svn on cygwin. [ruby-dev:37702].
+ Patch by Kouhei Sutou.
- * ext/readline/readline.c: fixed docs. [Bug #6740][ruby-core:46501]
- patched by Nobuhiro IMAI.
+Tue Jan 13 11:58:04 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Mon Jul 16 19:24:01 2012 Tanaka Akira <akr@fsij.org>
+ * lib/irb/input-method.rb: IRB did not prompt for MSwin32.
+ [ruby-dev:37686].
+ Patch by arton <artonx AT yahoo.co.jp>.
- * bignum.c (rb_integer_float_eq): new function.
- (rb_big_eq): use rb_integer_float_eq.
+Tue Jan 13 12:10:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * internal.h (rb_integer_float_eq): declared.
+ * ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
+ on Windows.
- * numeric.c (flo_eq): use rb_integer_float_eq.
- (fix_equal): ditto.
+Tue Jan 13 09:49:49 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Mon Jul 16 19:02:31 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/socket.c: removed warning about unused variable 'rai'.
- * bignum.c (rb_integer_float_cmp): rename a local variable.
+Tue Jan 13 03:07:28 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Jul 16 18:40:26 2012 Tanaka Akira <akr@fsij.org>
+ * instruby.rb: require "tool/mdoc2man.rb" before chdir if needed.
- * bignum.c (rb_integer_float_cmp): renamed from rb_big_float_cmp.
+Tue Jan 13 02:54:54 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * internal.h: follow the above change.
+ * 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)
- * numeric.c: ditto.
+ * 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.
-Mon Jul 16 17:57:54 2012 Tanaka Akira <akr@fsij.org>
+Tue Jan 13 02:21:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (rb_big_float_cmp): compare an integer and float precisely.
- [ruby-core:31376] [Bug #3589] reported by Tomasz Wegrzanowski.
+ * win32/win32.c (internal_cmd_match): extracted from
+ is_internal_cmd.
-Mon Jul 16 17:29:45 2012 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c (argv_size, join_argv): escapes redirection, pipe
+ and caret punctuations with carets.
- * bignum.c (rb_big_float_cmp): support fixnum for argument x.
+ * win32/win32.c (rb_w32_aspawn): ditto, and redirections and pipe
+ have no meanings.
- * numeric.c (fix_equal): use rb_big_float_cmp.
- (fix_cmp): ditto.
- (fix_gt): ditto.
- (fix_ge): ditto.
- (fix_lt): ditto.
- (fix_le): ditto.
- (flo_eq): ditto.
- (flo_cmp): use rb_big_float_cmp for fixnum argument.
- (flo_gt): ditto.
- (flo_ge): ditto.
- (flo_lt): ditto.
- (flo_le): ditto.
+Tue Jan 13 02:07:38 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Mon Jul 16 17:05:53 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/lib/tk.rb: use Encoding.find("locale") instead of
+ Encoding.locale_charmap
- * test/fileutils/test_fileutils.rb: add test for FileUtils#uptodate?
+Tue Jan 13 00:57:56 2009 Tanaka Akira <akr@fsij.org>
-Mon Jul 16 16:56:12 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short
+ sockaddr.
+ (sock_s_unpack_sockaddr_un): ditto.
- * lib/fileutils.rb (FileUtils.uptodate?): remove useless parameter.
- patched by Oscar Del Ben.[Bug #6708][ruby-core:46256]
+Mon Jan 12 23:55:19 2009 Tanaka Akira <akr@fsij.org>
-Mon Jul 16 15:37:56 2012 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.
- * bignum.c (rb_big_eq): use rb_big_float_cmp.
+Mon Jan 12 23:31:42 2009 Tanaka Akira <akr@fsij.org>
-Mon Jul 16 15:00:45 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/socket.c (IS_IP_FAMILY): defined.
+ (addrinfo_ip_p): use it.
- * internal.h (rb_big_float_cmp): declared.
+Mon Jan 12 17:23:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bignum.c (rb_big_float_cmp): extracted from rb_big_cmp and big_op.
- (rb_big_cmp): use rb_big_float_cmp.
- (big_op): ditto.
+ * lib/test/unit/assertions.rb (assert_nothing_raised): removes the
+ current trace to get rid of an issue of MiniTest::Unit#location.
- * numeric.c (flo_cmp): use rb_big_float_cmp.
- (flo_gt): ditto.
- (flo_ge): ditto.
- (flo_lt): ditto.
- (flo_le): ditto.
+Mon Jan 12 16:49:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jul 16 14:14:21 2012 Tanaka Akira <akr@fsij.org>
+ * instruby.rb (install): erased a garbage.
- * bignum.c (enum big_op_t): new type.
- (big_op): use enum big_op_t.
- (big_gt): ditto.
- (big_ge): ditto.
- (big_lt): ditto.
- (big_le): ditto.
+Mon Jan 12 16:45:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 14 18:18:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.
- * array.c (rb_get_values_at): fill with nil out of range.
- [ruby-core:43678] [Bug #6203]
+ * win32/win32.c (winnt_stat): gets rid of strange behavior of
+ GetFileAttributes(). [ruby-core:21269]
-Sat Jul 14 17:17:55 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Mon Jan 12 12:43:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * cont.c (cont_restore_0): improve docs. [Bug #6706][ruby-core:46243]
- patched by Oscar Del Ben via https://github.com/ruby/ruby/pull/140
+ * instruby.rb (parse_args, install): added --strip option.
-Sat Jul 14 17:08:13 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * instruby.rb (install_recursive): skips the directory if matched
+ to a no_install pattern ending with a file separator.
- * hash.c (rb_hash_s_create): raise an exception, when input elements
- are not one or two elements arrays. [ruby-core:39945] [Bug #5406]
+Mon Jan 12 12:33:56 2009 Tanaka Akira <akr@fsij.org>
-Sat Jul 14 16:16:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: don't use bytesize because 1.9 dependent.
+ [ruby-core:21266]
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): use
- Array#uniq!.
+Mon Jan 12 11:59:19 2009 Koichi Sasada <ko1@atdot.net>
- * lib/test/unit.rb (Test::Unit::Runner#deal): deal tasks to workers.
+ * 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.
- * lib/test/unit.rb (Test::Unit::Runner#quit_workers): close and kill
- all workers.
+Mon Jan 12 10:39:19 2009 Koichi Sasada <ko1@atdot.net>
- * lib/test/unit.rb (Test::Unit::Runner#delete_worker): delete dead
- worker from working set.
+ * thread.c: fix comment (terminology: Global VM Lock).
- * lib/test/unit.rb (Test::Unit::Runner#launch_worker): add new worker
- to working set.
+ * thread.c (blocking_region_begin, blocking_region_end):
+ save and clear th->blocking_region_buffer.
- * lib/test/unit.rb (Test::Unit::Runner#launch_worker): extract.
+ * thread.c (rb_thread_call_with_gvl): check if it has GVL.
- * lib/test/unit.rb (Test::Unit::Runner#start_watchdog): extract.
+ * thread.c (ruby_thread_has_gvl_p): added.
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): move
- initializations with nothing to release outside begin/ensure.
+ * vm_core.h: add decls.
-Sat Jul 14 16:04:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 12 10:21:11 2009 Koichi Sasada <ko1@atdot.net>
- * array.c (rb_ary_join): should not infected by separator if it is not
- used. [ruby-core:42161][Bug #5902]
+ * eval.c: remove unused decl.
-Sat Jul 14 02:31:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 11 16:53:14 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * include/ruby/intern.h (rb_thread_blocking_region): fix declarations
- prototypes without arguments in C++ have different meanings than C.
+ * lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
+ %> bug. [ruby-dev:37751] [Bug #997]
-Thu Jul 12 12:32:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/erb/test_erb.rb: ditto
- * test/runner.rb: skip default gems to get rid of loading old versions
- before installation.
+Sun Jan 11 09:53:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Jul 12 11:44:23 2012 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]
- * string.c (rb_str_new_frozen): since the result object should have
- same tainted/untrusted bits with the original object, return new
- object if the shared object unmatch. [ruby-core:39745][Bug #5374]
+Sun Jan 11 09:47:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Jul 12 10:46:39 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * hash.c (rb_hash_s_create): set nil as the value if assoc length
+ is not enough. [ruby-core:21249]
- * test/net/http/test_http.rb (TestNetHTTPLocalBind#test_bind_to_local*):
- cannot cross between network interfaces on Windows, so skip this test
- until we find better test.
+Sat Jan 10 21:17:28 2009 Tanaka Akira <akr@fsij.org>
-Thu Jul 12 08:48:33 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * ext/socket/mkconstants.rb: don't generate unintended newlines.
- * lib/minitest/*: Imported minitest 3.2.0 (r7598)
- * test/minitest/*: ditto
+Sat Jan 10 20:50:02 2009 Tanaka Akira <akr@fsij.org>
-Thu Jul 12 05:11:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: refactored to nest properly in statically
+ and dynamically.
- * insns.def (defined): use method entry and id in cfp for proper
- superclass, since klass in iseq is shared by dynamically defined
- methods from the same block. [ruby-core:45831][Bug #6644]
+Sat Jan 10 20:26:17 2009 Tanaka Akira <akr@fsij.org>
-Thu Jul 12 01:49:07 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * version.h: make version string succinct:
+ "ruby 1.9.1p5000 (2009-01-10 trunk 21414) [i686-linux]".
- * lib/net/http.rb (Net::HTTP#connect): use local_host and local_port
- if specified. patched by Ricardo Amorim [Feature #6617]
+Sat Jan 10 19:05:13 2009 Koichi Sasada <ko1@atdot.net>
-Wed Jul 11 17:36:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * cont.c (cont_restore_1): should not be inlined.
- * ext/extmk.rb: append ENCOBJS to DLDOBJS but not EXTSOLIBS which is
- not a target, to compile enc/encinit.c.
+Fri Jan 9 21:52:47 2009 Tanaka Akira <akr@fsij.org>
-Wed Jul 11 12:38:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/socket.c (sock_define_const): use INT2NUM.
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): nonstatic initializer
- of an aggregate type is a C99ism.
+Fri Jan 9 15:40:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): get rid of VC++
- warnings.
+ * ext/socket/mkconstants.rb: define macro if default_value is passed.
-Mon Jul 9 16:11:30 2012 Yuki Yugui Sonoda <yugui@google.com>
+Fri Jan 9 13:20:08 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * vm_eval.c (rb_eval_string_from_file,
- rb_eval_string_from_file_protect): new functions to replace
- rb_compile_main_from_string() and ruby_eval_main().
+ * ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
- * nacl/pepper_ruby.c: Follows the change in vm_eval.c
+Fri Jan 9 12:29:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jul 9 14:05:42 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * common.mk (test-sample), rubytest.rb: use runruby.rb
- Reverts a half of r36079. As we discussed on ruby-dev@ and IRC,
- we do not need to disclose intermediate representation of program.
- The program embedding CRuby should use rb_eval_string family.
- * include/ruby/ruby.h (ruby_opaque_t): removed.
- (ruby_compile_main_from_file, ruby_compile_main_from_string,
- ruby_eval_main): removed.
+Fri Jan 9 10:40:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval.c (ruby_eval_main_internal): became ruby_exec_internal() again.
- (ruby_eval_main): removed.
+ * test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some
+ platforms need environments for shared objects.
- * ruby.c (PREPARE_PARSE_MAIN) reverted.
- (parse_and_compile_main, ruby_compile_main_from_file,
- ruby_compile_main_from_string): removed
+Thu Jan 8 23:19:38 2009 Tanaka Akira <akr@fsij.org>
-Wed Jul 11 10:16:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (bsock_shutdown): accept symbol/string as how.
+ (shutdown_how_arg): new function.
- * include/ruby.h (HAVE_RUBY_THREAD_H): to show ruby/thread.h to be
- available. fixup of r36355.
+ * ext/socket/mkconstants.rb: generate shutdown_how_to_int.
-Wed Jul 11 03:26:47 2012 Eric Hodel <drbrain@segment7.net>
+Thu Jan 8 23:16:37 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/zlib/zlib.c: Added streaming support to inflate processing.
- This allows zlib streams to be processed without huge memory growth.
- [Feature #6612]
- * NEWS: ditto
- * ext/zlib/zlib.c (zstream_expand_buffer): Uses rb_yield when a block
- is given for streaming support. Refactored to use
- zstream_expand_buffer_into to remove duplicate code.
- * ext/zlib/zlib.c (zstream_expand_buffer_protect): Added wrapper
- function to pass jump state back through GVL-free section to allow
- zstream clean-up before terminating the ruby call.
- * ext/zlib/zlib.c (zstream_expand_buffer_without_gvl): Acquire GVL to
- yield processed chunk of output stream.
- * ext/zlib/zlib.c (zstream_detach_buffer): When a block is given,
- returns Qnil mid-stream and yields the output buffer at the end of
- the stream.
- * test/zlib/test_zlib.rb: Updated tests
+ * instruby.rb: easy code contains fewer bugs.
-Tue Jul 10 22:57:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 8 22:59:30 2009 Tanaka Akira <akr@fsij.org>
- * include/ruby/thread.h: new header file for thread stuff.
+ * ext/socket/mkconstants.rb (gen_name_to_int_func): generate
+ name_to_int functions, not only body.
- * thread.c (rb_thread_call_without_gvl): export. [Feature#4328]
- returns void* instead of VALUE. [Feature #5543]
+Thu Jan 8 22:44:10 2009 Tanaka Akira <akr@fsij.org>
- * thread.c (rb_thread_blocking_region): deprecate. [ruby-core:46295]
+ * ext/socket/socket.c: don't use AI_NUMERICSERV for platforms which
+ not define it as old Windows.
+ [ruby-dev:37736]
-Tue Jul 10 10:48:59 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jan 8 17:32:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/win32.h (NT, NtInitialize): removed unused old macros.
+ * instruby.rb: should not depend on a library which does not exist
+ in 1.8.
-Tue Jul 10 10:43:37 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jan 8 07:52:55 2009 Tanaka Akira <akr@fsij.org>
- * configure.in: removed --enable/disable-win95 options. (see r36342)
+ * ext/socket/socket.c (init_unix_addrinfo): don't return a value.
-Tue Jul 10 00:44:41 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jan 8 07:30:52 2009 Tanaka Akira <akr@fsij.org>
- * include/ruby/ruby.h: Removed RUBY_GLOBAL_SETUP completely. It is
- no meaning definition since r24894.
- * main.c: ditto.
- * nacl/pepper_main.c: ditto.
+ * lib/open-uri.rb (OpenURI.redirectable?): reverted https redirection.
-Mon Jul 9 23:59:36 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Jan 8 00:31:58 2009 Tanaka Akira <akr@fsij.org>
- * dln.c: Simplify and make consistent an ifdef for Mac OS X.
- * ext/socket/rubysocket.h: ditto.
- * ext/tk/stubs.c: ditto.
- * io.c: ditto.
- * process.c: ditto.
- * signal.c: ditto.
- * vm_dump.c: ditto.
+ * lib/test/unit/assertions.rb (assert_no_match): don't count up as two
+ assertions.
-Mon Jul 9 17:37:35 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jan 8 00:26:35 2009 Tanaka Akira <akr@fsij.org>
- * win32/win32.c (win95_stat): removed unnecessary macro.
+ * ext/socket/socket.c (addrinfo_getnameinfo): use NI_DGRAM if socktype
+ is SOCK_DGRAM.
-Mon Jul 9 17:22:16 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jan 8 00:16:22 2009 Tanaka Akira <akr@fsij.org>
- * win32/configure.bat, win32/setup.mak, win32/Makefile.sub: omitted
- Win9x support. removed --enable/disable-win95 options.
+ * 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.
- * include/ruby/win32.h, file.c, win32/win32.c: ditto.
+Wed Jan 7 22:24:12 2009 Tanaka Akira <akr@fsij.org>
- * win32/README.win32: ditto.
+ * 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.
-Mon Jul 9 13:28:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: generate intern_protocol_family,
+ intern_socktype and intern_ipproto.
- * configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
- instead of TARGET which may contain non-identifier characters.
+ [ruby-dev:37692]
- * lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
- part consists of only word characters. [ruby-core:46248][Bug #6709]
+Wed Jan 7 22:13:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jul 8 07:36:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * instruby.rb (man, gem): fixed errors.
- * parse.y (shadowing_lvar_gen, warn_unused_var): no warnings for
- variables starting with _. [ruby-core:46160][Feature #6693]
+Wed Jan 7 17:14:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 7 23:07:30 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * instruby.rb: use installed libraries. [ruby-core:21006]
- * test/csv/test_features.rb: add require for Tempfile.
- * test/csv/test_serialization.rb: ditto.
+ * instruby.rb (gem), lib/rubygems/defaults.rb (Gem.default_dir):
+ use version invariant configuration.
-Fri Jul 6 06:49:50 2012 Eric Hodel <drbrain@segment7.net>
+Tue Jan 6 19:09:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (rb_ary_aref): Added a description of the behavior of
- index positioning. [Bug #6680]
- * array.c (rb_ary_aset): ditto. Reordered sentences for clarity.
- * string.c (rb_str_aref_m): Added a description of the behavior of
- index positioning
+ * cont.c (cont_restore_0): streamlined to ensure O(1) time. based on
+ a patch by Brent Roman <brent AT mbari.org>.
-Fri Jul 6 05:38:44 2012 Eric Hodel <drbrain@segment7.net>
+Tue Jan 6 00:34:25 2009 Tanaka Akira <akr@fsij.org>
- * string.c (rb_str_bytesize): Improve documentation. Patch by Oscar
- Del Ben from github issue #138.
- * string.c (rb_str_empty): ditto.
- * string.c (rb_str_times): ditto.
- * string.c (rb_str_dump): ditto.
- * string.c (rb_str_center): ditto.
+ * io.c (rb_close_before_exec): more heuristics to detect maximum fd.
-Fri Jul 6 04:05:59 2012 Eric Hodel <drbrain@segment7.net>
+Mon Jan 5 17:59:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/zlib/zlib.c (zstream_expand_buffer_without_gvl): Use
- ruby_xrealloc() to avoid crash with CALC_EXACT_MALLOC_SIZE.
+ * configure.in (cygwin): needs properly implemented nl_langinfo().
+ [ruby-core:21110]
-Thu Jul 5 17:32:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/langinfo.c: added as suggested at [ruby-core:21015], from
+ http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
- * internal.h: move ThreadShield declarations from intern.h.
+ * missing/langinfo.c (nl_langinfo_0): fixed typos for SJIS.
-Thu Jul 5 16:00:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 5 17:38:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c (ThreadShield): rename from Barrier.
+ * encoding.c (rb_locale_charmap): use GetConsoleCP() instead of
+ GetACP() because external encoding should be console's one.
-Thu Jul 5 15:14:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * encoding.c (rb_filesystem_encoding): use GetOEMCP() instead of
+ GetACP() because VFAT/FAT32 uses OEM CP.
- * bootstraptest/runner.rb (show_progress): refine error output. do not
- count non-empty error message, but just warn.
+Mon Jan 5 16:26:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bootstraptest/runner.rb (error): show errors immediately if tty.
+ * encoding.c (rb_filesystem_encoding): use ANSI codepage for file
+ system on cygwin.
-Thu Jul 5 12:28:11 2012 Akinori MUSHA <knu@iDaemons.org>
+ * encoding.c (rb_locale_charmap): reverted. [ruby-core:21110]
- * test/net/http/test_httpresponses.rb: Add a test file for
- Net::HTTPResponses and put a test case for the previous bug.
+Mon Jan 5 16:15:00 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Thu Jul 5 06:33:52 2012 Mark Dodwell <mark@mkdynamic.co.uk>
+ * ext/curses/curses.c (free_window): use xfree instead of free.
+ [ruby-dev:37200]
- * lib/net/http/responses.rb: Fix 4xx classes to inherit correctly
- from Net::HTTPClientError. [Bug #6700]
+Mon Jan 5 15:49:45 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Wed Jul 4 21:55:35 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/gdbm/gdbm.c (rb_gdbm_fetch): remove needless cast.
- * ruby.c (proc_options): warn only if -K and -w option is specified.
- see also r36274 [Feature #5206]
+Mon Jan 5 12:52:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jul 4 21:41:44 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * win32/win32.c (init_env): use user profile folder than personal
+ folder.
- * gc.c, atomic.h (ATOMIC_SIZE_*): moved from gc.c to atomic.h
- [ruby-dev:45909]
+Mon Jan 5 08:41:13 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jul 4 19:13:15 2012 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * file.c (rb_file_s_stat): need type check for non string values.
+ [ruby-dev:37673] fix: #964
- * test/win32ole/test_win32ole.rb (test_s_codepage_changed):
- FileSystemObject only supports ANSI or UTF-16LE encoding.
- Patch by h.shirosaki (Hiroshi Shirosaki) [ruby-trunk - Bug #6650]
+ * file.c (rb_file_s_size, rb_file_s_atime, rb_file_s_mtime,
+ rb_file_s_ctime, rb_f_test): ditto.
-Wed Jul 4 11:52:12 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jan 5 08:17:56 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * gc.c (ATOMIC_SIZE_*): 64bit Windows support.
+ * range.c (range_step): should not add up errors on loops.
+ [ruby-dev:37691]
-Wed Jul 4 11:11:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 5 07:58:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (rb_frame_callee, rb_f_callee_name): fix to return the
- called id. this longstanding bug has been caused and blocked by
- the structure of old rb_control_frame_t and rb_iseq_t.
+ * random.c (rb_f_srand): update RDoc. [ruby-core:21113]
- * vm_insnhelper.c (vm_push_frame): set proper method entry.
+Mon Jan 5 06:39:56 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jul 4 08:29:31 2012 Eric Hodel <drbrain@segment7.net>
+ * range.c (range_max): max value from ... not defined for non
+ Integer Numeric end values. [ruby-dev:37690] fix: #974
- * array.c (rb_ary_aref): Updated documentation to indicate the
- starting index is an index into the array or string. Updated
- examples to show behavior of indexes at the end of an array or
- string. Based on patch by Marcus Stollsteimer. [Bug #6680]
- * array.c (rb_ary_aset): ditto.
- * string.c (rb_str_aref): ditto. Also added descriptive argument
- names to call-seq section.
+Sun Jan 4 22:37:19 2009 Tanaka Akira <akr@fsij.org>
-Wed Jul 4 07:05:59 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * test/zlib/test_zlib.rb (test_inflate_partial_input): Added test for
- inflating incomplete zlib streams.
+Sun Jan 4 18:10:10 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Tue Jul 3 23:14:16 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * enc/trans/gbk.trans, gbk-tbl.rb:
+ new Chinese GBK transcoding (from Yoshihiro Kambayashi)
- * gc.c (ATOMIC_SIZE_EXCHANGE): fix function name on Solaris [Bug #6689]
- [ruby-dev:45904]
+ * test/ruby/test_transcode.rb: added tests for the above
+ (from Yoshihiro Kambayashi)
-Tue Jul 3 16:07:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 4 17:55:55 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
- * gc.c (vm_malloc_fixup, vm_xrealloc, vm_xfree, after_gc_sweep): use
- atomic operations to update malloc_params.
+ * test/ruby/test_transcode.rb: added tests for GB2312
+ (from Yoshihiro Kambayashi)
-Tue Jul 3 14:50:16 2012 Eric Hodel <drbrain@segment7.net>
+ * enc/trans/chinese.trans: set valid byte patterns for
+ GB2312 and GB12345
- * ext/zlib/zlib.c (zstream_run_func): Don't exit run loop for buffer
- error. [Feature #6615]
- * ext/zlib/zlib.c: Fix style to match existing functions.
+Sun Jan 4 17:39:39 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-Tue Jul 3 12:05:51 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * enc/trans/big5.trans, big5-tbl.rb:
+ new Chinese Big5 transcoding (from Yoshihiro Kambayashi)
- * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8
- for x64. [ruby-dev:45875] [Bug #6676]
- reported by aves_ramphastos (Seigo Ishigane)
+ * test/ruby/test_transcode.rb: added tests for the above
+ (from Yoshihiro Kambayashi)
-Tue Jul 3 11:56:46 2012 Eric Hodel <drbrain@segment7.net>
+Sun Jan 4 17:07:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/zlib/zlib.c (zstream_detach_buffer): Refactored tainting of
- output string, moving it from the callee to zstream_detach_buffer.
- * ext/zlib/zlib.c (rb_zstream_finish): ditto
- * ext/zlib/zlib.c (rb_zstream_flush_next_out): ditto
- * ext/zlib/zlib.c (rb_deflate_deflate): ditto
- * ext/zlib/zlib.c (rb_deflate_flush): ditto
- * ext/zlib/zlib.c (rb_inflate_inflate): ditto
+ * lib/rubygems.rb (Gem.set_home, Gem.set_paths): should not create
+ directories stealthily. [ruby-core:20990]
-Tue Jul 3 11:16:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rubygems.rb (Gem.find_home): expand_path deals with platform
+ dependent environments.
- * common.mk (runnable): make symbolic links to run in build directory.
+ * lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): ditto.
-Tue Jul 3 10:46:06 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * instruby.rb (gem): creates gem directories at installation.
- * ruby.c (proc_options): warn if -K option is specified. [Feature #5206]
+Sun Jan 4 15:41:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Jul 3 06:12:13 2012 Eric Hodel <drbrain@segment7.net>
+ * encoding.c (rb_filesystem_encoding, rb_locale_charmap): uses
+ codepage on cygwin. [ruby-core:20994]
- * object.c (Init_Object): Added RDoc location pointers for
- Kernel#methods, Kernel#protected_methods, Kernel#private_methods and
- Kernel#public_methods. [Bug #6666]
+Sun Jan 4 11:58:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Jul 3 06:02:54 2012 Eric Hodel <drbrain@segment7.net>
+ * numeric.c (ruby_float_step): extracted from num_step().
- * ext/zlib/zlib.c (zstream_run): Process zlib streams without GVL.
- [Feature #6615]
- * NEWS: ditto.
+ * range.c (range_step): uses ruby_float_step() for float range.
+ [ruby-dev:37691]
-Mon Jul 2 22:13:04 2012 Tanaka Akira <akr@fsij.org>
+Sun Jan 4 11:11:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_thread_aref): add explanation for why Thread#[] and
- Thread#[]= are fiber-local and not thread-local.
- reported by Julien A. [ruby-core:41606] [ruby-trunk - Bug #5750]
+ * ext/extmk.rb (extmake): does not use both of makefile.rb and
+ extconf.rb at the same time.
-Mon Jul 2 21:25:55 2012 Tanaka Akira <akr@fsij.org>
+ * lib/mkmf.rb (DLLIB): depends on Makefile. [ruby-core:21096]
- * time.c (timew_out_of_timet_range): specialization for
- SIZEOF_TIME_T == SIZEOF_INT64_T.
+Sun Jan 4 09:27:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jul 2 17:06:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (constant_arg): constified.
- * class.c (rb_include_module): include modules after the origin.
+ * ext/socket/socket.c (optname_arg): cygwin does not have
+ IPPROTO_IPV6.
- * class.c (include_modules_at): skip prepended modules.
+ * ext/socket/mkconstants.rb (ipv6_optname_to_int): ditto.
- * class.c (rb_prepend_module): now basic.klass in ICLASS refers the
- old original class/module. [ruby-dev:45868][Bug #6662]
+Sun Jan 4 04:33:14 2009 Tanaka Akira <akr@fsij.org>
- * class.c (rb_mod_ancestors): ditto.
+ * ext/socket/socket.c: redundant #ifdef removed.
- * vm_method.c (search_method): search method entry from the origin
- iclass.
+Sun Jan 4 03:30:18 2009 Tanaka Akira <akr@fsij.org>
-Mon Jul 2 05:54:58 2012 Tadayoshi Funaba <tadf@dotrb.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.
- * ext/date/date_core.c: [ruby-core:46058].
+Sun Jan 4 00:30:50 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Mon Jul 2 05:35:43 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * lib/erb.rb: merged r20850, r17881, r16811, r16763, r16748, r15829,
+ r15794 and r15698 from ruby_1_8.
- * ext/date/date_core.c (d_lite_marshal_load): accepts old dump.
+ * test/erb/test_erb.rb: ditto.
-Mon Jul 2 03:21:53 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Sat Jan 3 22:24:36 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * README.EXT.ja: fixed args of have_struct_member() ,
- create_makefile() same as r35977. however, mkmf.rb include
- no Japanese-docs, so Appendix C was not removed. [Bug #6597]
+ * common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
+ definition from common.mk to {Makefile.in,win32/Makefile.sub}.
+ [ruby-dev:37678]
-Fri Jun 29 05:08:41 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Jan 3 15:30:09 2009 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/test/unit/parallel.rb: workaround fix for rubygems.
- RubyGems can't find rake if the source directory is not equal to
- the directory which is running the test. [Bug #6604]
+ * enc/trans/chinese.trans: added for transcoding EUC-CN and GB12345.
-Thu Jun 28 20:33:15 2012 Luis Lavena <luislavena@gmail.com>
+ * enc/trans/GB/: ditto.
- * test/win32ole/test_win32ole.rb (test_s_codepage_changed):
- FileSystemObject only supports ANSI or UTF-16LE encoding.
- Patch by bosko (Bosko Ivanisevic) [ruby-trunk - Bug #6650]
+Sat Jan 3 15:26:30 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Jun 28 09:27:09 2012 CHIKANAGA Tomoyuki <nagachika@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".
- * class.c (class_instance_method_list): consider prepended Class/Module
- when recur != 0. [ruby-dev:45863] [Bug #6660]
+Sat Jan 3 03:00:42 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_module.rb (test_prepend_instance_methods_false): add
- a test for it.
+ * 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>
-Thu Jun 28 06:12:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.
- * class.c (rb_mod_ancestors): fix ancestors order.
- [ruby-core:45919][Bug #6658] [ruby-dev:45861][Bug #6659]
+Fri Jan 2 23:36:10 2009 Tanaka Akira <akr@fsij.org>
-Wed Jun 27 21:28:59 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * 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]
- * lib/racc/parser.rb: NotImplementError is not exist.
+Fri Jan 2 23:33:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/irb/output-method.rb (IRB::OutputMethod#print): ditto.
+ * include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
-Wed Jun 27 21:31:13 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 2 22:25:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * class.c (rb_prepend_module): ancestors of prepending module also
- should be included. [ruby-core:45914][Bug #6654]
+ * process.c: use sigaction instead of sigset. [ruby-core:21021]
-Wed Jun 27 21:01:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 2 22:22:04 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * class.c (class_instance_method_list): m_tbl in prepended
- class/module is NULL. [ruby-core:45915][Bug #6655]
+ * bootstraptest/test_proc.rb: suppress error message.
-Wed Jun 27 16:48:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 2 22:20:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
- * class.c (rb_prepend_module): prepend module into another module.
+ * test/ruby/test_process.rb (test_wait_and_sigchild): remove debug
+ output.
- * eval.c (rb_mod_prepend): new method Module#prepend. [Feature #1102]
+Fri Jan 2 17:45:19 2009 Tanaka Akira <akr@fsij.org>
-Wed Jun 27 09:15:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: rename family_to_str to intern_family.
+ it returns ID now.
- * io.c (is_popen_fork): check if fork and raise NotImplementedError if
- unavailable.
+ * ext/socket/socket.c (ipaddr): use intern_family.
- * io.c (rb_io_s_popen): allow environment variables hash and exec
- options as flat parameters, not in an array arguments.
- [Feature#6651] [EXPERIMENTAL]
+Fri Jan 2 17:20:31 2009 Tanaka Akira <akr@fsij.org>
- * process.c (rb_execarg_extract_options): extract exec options, but no
- exceptions on non-exec options and returns them as a Hash.
+ * ext/socket/mkconstants.rb: use ID in the values of
+ family_to_str_hash. family_to_str returns a VALUE.
- * process.c (rb_execarg_setenv): set environment variables.
+ * ext/socket/socket.c (ipaddr): follow family_to_str change.
-Tue Jun 26 16:57:14 2012 Koichi Sasada <ko1@atdot.net>
+Fri Jan 2 17:01:51 2009 Tanaka Akira <akr@fsij.org>
- * thread_pthread.c (register_cached_thread_and_wait):
- return immediately if malloc() failed.
- [ruby-core:43960] [ruby-trunk - Bug #6235]
+ * ext/socket/mkconstants.rb: refactored to gather stringizer
+ description.
- * thread_pthread.c (USE_THREAD_CACHE): check already defined or not.
+Fri Jan 2 15:30:57 2009 Tanaka Akira <akr@fsij.org>
-Tue Jun 26 10:01:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: make common prefix optional.
- * io.c (rb_io_s_popen): revert r36213 "popen: shell commands with
- envvar" because it disabled to let single command bypass shell.
+Fri Jan 2 14:59:52 2009 Tanaka Akira <akr@fsij.org>
-Mon Jun 25 17:49:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/mkconstants.rb: use hash for family_to_str to avoid
+ linear search. lenp argument removed.
- * class.c (rb_mix_module): revert Module#mix.
+ * ext/socket/socket.c (ipaddr): call family_to_str without lenp
+ argument.
-Mon Jun 25 16:57:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 2 14:33:12 2009 Tanaka Akira <akr@fsij.org>
- * proc.c (rb_mod_define_method): allow method transplanting from a
- module to either class or module. [ruby-core:34267][Feature #4254]
+ * ext/socket/mkconstants.rb (gen_int_to_name): don't compare constants
+ in preprocessor because the constants may be enum.
-Mon Jun 25 11:34:45 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jan 2 14:11:07 2009 Tanaka Akira <akr@fsij.org>
- * internal.h: use rb_pid_t instead of pid_t because of there is no
- definition of pid_t here on Windows.
+ * ext/socket/mkconstants.rb (gen_int_to_name): add lenp argument.
-Mon Jun 25 00:25:01 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/socket/socket.c (ipaddr): follow argument change.
- * configure.in (for stack end address): remove human68k specific
- check. It is no longer supported.
+Fri Jan 2 10:20:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Jun 24 23:02:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/singleton.rb: fix documentation. [ruby-core:21038]
- * io.c (pipe_open): merge win32 code using spawnv().
+Fri Jan 2 06:43:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
-Sun Jun 24 22:53:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * signal.c (rb_signal_buff_size): defined for check whether signal
+ is in the buffer or not.
- * process.c (check_exec_fds): separate check_exec_fds_1() since
- nonstatic initializer of an aggregate type is not allowed by C89.
+ * thread_pthread.c (thread_timer): don't exit the loop when signal
+ is in the buffer. [ruby-dev:37637]
-Sun Jun 24 07:47:17 2012 Tanaka Akira <akr@fsij.org>
+Fri Jan 2 04:40:00 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (rb_execarg): options field removed.
+ * ext/socket/mkconstants.rb: check duplicates.
- * process.c: follow the rb_execarg change.
+Fri Jan 2 02:39:08 2009 Tanaka Akira <akr@fsij.org>
-Sat Jun 23 23:48:21 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/socket.c (optname_arg): defined.
+ (bsock_setsockopt): use optname_arg.
+ (bsock_getsockopt): ditto.
- * process.c (proc_spawn_cmd): unused variable removed to suppress a
- warning.
- (save_env): 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.
- [ruby-core:45797] reported by Luis Lavena.
+Fri Jan 2 02:08:36 2009 Tanaka Akira <akr@fsij.org>
-Sat Jun 23 23:19:31 2012 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.
- * internal.h (rb_execarg): add new_pgroup_given and new_pgroup_flag
- fields.
+Fri Jan 2 01:15:11 2009 Tanaka Akira <akr@fsij.org>
- * process.c (EXEC_OPTION_NEW_PGROUP): removed.
- (proc_spawn_cmd): take a struct rb_execarg argument.
- use the new fields.
- (rb_execarg_addopt): use the new fields.
- (rb_spawn_process): follow the proc_spawn_cmd change.
+ * ext/socket/socket.c (level_arg): defined.
+ (bsock_setsockopt): use level_arg.
+ (bsock_getsockopt): ditto.
- [ruby-core:45794] [ruby-trunk - Bug #6633] reported by Luis Lavena.
+ * ext/socket/mkconstants.rb: generate level_to_int.
-Sat Jun 23 20:26:36 2012 Tanaka Akira <akr@fsij.org>
+Fri Jan 2 00:58:40 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (rb_execarg): add fd_dup2, fd_close, fd_open,
- fd_dup2_child fields.
+ * ext/socket/socket.c (family_arg): accept symbols as well.
+ (socktype_arg): ditto.
- * process.c (EXEC_OPTION_DUP2): removed.
- (EXEC_OPTION_CLOSE): removed.
- (EXEC_OPTION_OPEN): removed.
- (EXEC_OPTION_DUP2_CHILD): removed.
- (mark_exec_arg): mark the new fields.
- (check_exec_redirect1): change condition for default option.
- (check_exec_redirect): take a struct rb_execarg argument.
- use the new fields.
- (rb_execarg_addopt): follow the check_exec_redirect change.
- (check_exec_fds): use the new fields.
- (save_redirect_fd): ditto.
+Fri Jan 2 00:49:44 2009 Tanaka Akira <akr@fsij.org>
-Sat Jun 23 19:01:18 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/socket.c (sock_s_getaddrinfo): use socktype_arg.
- * process.c (rb_execarg_fixup): fix envopts condition.
+Fri Jan 2 00:12:27 2009 Tanaka Akira <akr@fsij.org>
-Sat Jun 23 18:44:13 2012 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.
- * process.c (check_exec_redirect1): extracted from
- check_exec_redirect.
+Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Sat Jun 23 17:22:02 2012 Tanaka Akira <akr@fsij.org>
+ * spec/default.mspec: fix for builddir != srcdir
- * process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS.
- (rb_execarg_run_options): ditto.
+ * Makefile.in: ditto.
-Sat Jun 23 17:04:08 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 1 21:26:05 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (rb_execarg): add env_modification field.
+ * ext/socket/socket.c (sock_s_getnameinfo): use family_to_int.
- * process.c (EXEC_OPTION_ENV): removed.
- (mark_exec_arg): mark env_modification field.
- (rb_exec_fillarg): update the new field, instead of options array.
- (rb_execarg_fixup): use the new field.
- (save_env): ditto.
- (rb_execarg_run_options): ditto.
+Thu Jan 1 21:08:34 2009 Tanaka Akira <akr@fsij.org>
-Sat Jun 23 16:27:01 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/mkconstants.rb: check all alias possibility.
- * internal.h (rb_execarg): add rlimit_limits field.
+Thu Jan 1 20:59:55 2009 Tanaka Akira <akr@fsij.org>
- * process.c (EXEC_OPTION_RLIMIT): removed.
- (mark_exec_arg): mark rlimit_limits field.
- (rb_execarg_addopt): update the new fields, instead of options array.
- (run_exec_rlimit): use the new field.
- (rb_execarg_run_options): clear sarg using MEMZERO. use the new
- field.
+ * ext/socket/mkconstants.rb: more possible aliases.
-Sat Jun 23 14:29:25 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 1 20:54:02 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (rb_execarg): add chdir_given and chdir_dir fields.
+ * ext/socket/mkconstants.rb: AF_ISO and AF_OSI may be aliased.
- * process.c (EXEC_OPTION_CHDIR): removed.
- (mark_exec_arg): mark chdir_dir field.
- (rb_execarg_addopt): update the new fields, instead of options array.
- (rb_execarg_run_options): use the new fields.
+Thu Jan 1 20:50:09 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-Sat Jun 23 13:20:47 2012 Tanaka Akira <akr@fsij.org>
+ * process.c (before_exec): it makes no sense for a conditional
+ expression to return a void value.
- * internal.h (rb_execarg): add close_others_given, close_others_do and
- close_others_maxhint fields.
+Thu Jan 1 20:47:09 2009 Tanaka Akira <akr@fsij.org>
- * process.c (EXEC_OPTION_CLOSE_OTHERS): removed.
- (rb_execarg_addopt): update the new fields, instead of options array.
- (check_exec_fds): take eargp as an argument. update the
- close_others_maxhint field.
- (rb_execarg_fixup): follow the argument change of check_exec_fds.
- (rb_execarg_run_options): use the new fields.
+ * ext/socket/socket.c (sock_s_getaddrinfo): use family_to_int.
-Sat Jun 23 10:41:59 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 1 20:17:47 2009 Tanaka Akira <akr@fsij.org>
- * internal.h (rb_execarg): add unsetenv_others_given and
- unsetenv_others_do fields.
+ * ext/socket/socket.c: include constants.h at top.
- * process.c (EXEC_OPTION_UNSETENV_OTHERS): removed.
- (rb_execarg_addopt): update the new fields, instead of options array.
- (rb_execarg_fixup): use the new fields.
+Thu Jan 1 19:53:33 2009 Tanaka Akira <akr@fsij.org>
-Sat Jun 23 09:35:47 2012 Tanaka Akira <akr@fsij.org>
+ * ext/socket/mkconstants.rb: add valp argument for family_to_int and
+ socktype_to_int.
- * process.c: use the variable name "soptions" for sargp->options.
+ * ext/socket/socket.c (setup_domain_and_type): use valp argument.
-Sat Jun 23 09:17:49 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 1 19:36:57 2009 Tanaka Akira <akr@fsij.org>
- * process.c: use the name "sargp" for struct rb_execarg variables
- consistently for saving process attributes.
+ * ext/socket/mkconstants.rb: generate family_to_str.
- * io.c: ditto.
+ * ext/socket/socket.c (ipaddr): use family_to_str.
-Sat Jun 23 07:59:57 2012 Tanaka Akira <akr@fsij.org>
+Thu Jan 1 17:37:12 2009 Tanaka Akira <akr@fsij.org>
- * process.c: use the name "eargp" for struct rb_execarg variables
- consistently except for saving process attributes.
+ * ext/socket/mkconstants.rb: generate socktype_to_int.
- * io.c: ditto.
+ * 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>
- * ext/pty/pty.c: ditto.
+ * cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
+ in [ruby-core:20921].
-Wed Jun 20 18:27:03 2012 Yuki Yugui Sonoda <yugui@google.com>
+Mon Dec 29 03:43:25 2008 Koichi Sasada <ko1@atdot.net>
- * common.mk: Add missing dependencies.
+ * ruby.c (process_options): set th->base_block only while
+ it is needed. [ruby-dev:37634] [Bug #939]
-Fri Jun 22 20:27:39 2012 Tanaka Akira <akr@fsij.org>
+ * ruby.c (require_libraries): clear th->base_block before
+ require libraries.
- * internal.h (rb_execarg): add pgroup_given and pgroup_pgid fields.
+Sun Dec 28 21:33:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * process.c (EXEC_OPTION_PGROUP): removed.
- (rb_execarg_addopt): update the new fields, instead of options array.
- (run_exec_pgroup): take a struct rb_execarg argument. refer the new
- fields.
- (rb_execarg_run_options): follow run_exec_pgroup change.
+ * test/ext/dl/test_base.rb: add BSD's case.
-Fri Jun 22 18:48:51 2012 Kouhei Sutou <kou@cozmixng.org>
+Sun Dec 28 21:09:12 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * README.EXT, README.EXT.ja: use "sval" for the third argument
- name of Data_Wrap_Struct().
- Suggested by @satoh_fumiyasu. Thanks!!!
+ * ext/dl/lib/dl/import.rb (DL::Importer#sizeof): follows
+ a feature change in 1.9.
-Fri Jun 22 18:04:26 2012 Koichi Sasada <ko1@atdot.net>
+Sun Dec 28 21:03:07 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * iseq.c, vm_eval.c: set th->base_block properly.
- th->base_block is information for (a) parsing, (b) compiling
- and (c) setting up the frame to execute the program passed by
- `eval' method. For example, (1) parser need to know up-level
- variables to detect it is variable or method without paren.
- Befor (a), (b) and (c), VM set th->base_block by passed bindng
- (or previous frame information). After execute (a), (b) and (c),
- VM should clear th->base_block. However, if (a), (b) or (c)
- raises an exception, then th->base_block is not cleared.
- Problem is that the uncleared value th->balo_block is used for
- irrelevant iseq compilation. It causes SEGV or critical error.
- I tried to solve this problem: to clear them before exception,
- but finally I found out that it is difficult to do it (Ruby
- program can be run in many places).
- Because of this background, I set th->base_block before
- compiling iseq and restore it after compiling.
- Basically, th->base_block is dirty hack (similar to global
- variable) and this patch is also dirty.
+ * 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.
- * bootstraptest/test_eval.rb: add a test for above.
+ * ext/dl/lib/dl/struct.rb (DL::CStructBuilder#create): ditto.
- * internal.h: remove unused decl.
+Sun Dec 28 19:11:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * iseq.c (rb_iseq_compile_with_option): add base_block parameter.
- set th->base_block before compilation and restore it after
- compilation.
+ * win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
+ msvcrt.
- * ruby.c (require_libraries): pass 0 as base_block instead of
- setting th->base_block
+ * sprintf.c: not force to override snprintf/vsnprintf.
+ [ruby-core:20824]
- * tool/compile_prelude.rb (prelude_eval): apply above changes.
+Sun Dec 28 17:21:36 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * vm.c, vm_eval.c: ditto.
+ * test/rubygems/test_ext_configure_builder.rb (test_self_build_fail):
+ Extends pattern for FreeBSD's error message.
- * vm_core.h: add comments.
+Sun Dec 28 17:10:13 2008 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-Fri Jun 22 18:19:38 2012 Tanaka Akira <akr@fsij.org>
+ * 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.
- * process.c: pass struct rb_execarg value instead of its options
- field for saving process attribute changing functions.
- (save_redirect_fd): take a struct rb_execarg argument.
+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.
- (save_env): ditto.
- (rb_execarg_run_options): follow the above functions change.
+ (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.
-Fri Jun 22 17:55:48 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/pty/pty.c (chfunc): add error message arguments.
- * test/ruby/test_backtrace.rb: decrease recursion depth
- to reduce consuming stack size.
+Tue Dec 23 20:28:28 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Fri Jun 22 13:36:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c: rdoc for File::open and 1.9 feature in file modes.
- * random.c (random_init, random_load): cannot initialize frozen object
- again, nor with tainted/untrusted object. [Bug #6540]
+ * transcode.c: rdoc for String#encode
-Fri Jun 22 13:32:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Dec 23 19:51:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * error.c (rb_check_copyable): new function, to ensure the target is
- not frozen and the source is not tainted nor untrusted.
+ * win32/win32.c (rb_w32_spawn): deals with quoted commands.
-Fri Jun 22 05:55:20 2012 Eric Hodel <drbrain@segment7.net>
+Tue Dec 23 18:44:21 2008 Tanaka Akira <akr@fsij.org>
- * eval.c (ruby_cleanup): Fixed typo. Patch by Trever Dawe.
- Fixes #131 (github). [ruby-trunk - Bug #6619]
+ * strftime.c (rb_strftime): use locale insensitive functions for tr_TR
+ locale.
-Thu Jun 21 21:16:58 2012 Tanaka Akira <akr@fsij.org>
+Tue Dec 23 17:38:03 2008 Tanaka Akira <akr@fsij.org>
- * process.c (rb_execarg_addopt): take a VALUE argument instead of
- struct rb_execarg.
- (rb_exec_arg_addopt): follow the rb_execarg_addopt change.
- (check_exec_options_i): ditto.
+ * lib/test/unit/assertions.rb (assert_equal): show small differences
+ for Regexp and Float.
- * io.c (pipe_open): follow the rb_execarg_addopt change.
+Tue Dec 23 16:49:48 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * internal.h (rb_execarg_addopt): follow the definition change.
+ * win32/win32.c (rb_w32_spawn): support normal commands with arguments.
-Thu Jun 21 20:34:19 2012 Tanaka Akira <akr@fsij.org>
+Tue Dec 23 16:22:41 2008 Tanaka Akira <akr@fsij.org>
- * process.c (rb_exec_fillarg): take a VALUE argument instead of
- struct rb_execarg.
- (rb_check_exec_options): ditto.
- (check_exec_options_i): ditto.
+ * io.c (rb_io_inspect): show fd number if there is no pathname.
-Thu Jun 21 19:48:05 2012 Tanaka Akira <akr@fsij.org>
+Tue Dec 23 15:48:55 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * process.c (rb_exec_async_signal_safe): use rb_execarg_run_options
- instead of rb_run_exec_options_err.
- (rb_spawn_process): ditto.
+ * tool/file2lastrev.rb: shouldn't use single quote in shell's command
+ line if you want to support Windows.
-Thu Jun 21 19:02:43 2012 Tanaka Akira <akr@fsij.org>
+Tue Dec 23 15:46:43 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * process.c (rb_exec_fillarg): take a VALUE argument instead of
- struct rb_execarg.
- (rb_execarg_init): follow the rb_exec_fillarg change.
+ * lib/mathn.rb: Math.sqrt(NaN) should be NaN. [ruby-dev:37537]
-Thu Jun 21 18:36:43 2012 Tanaka Akira <akr@fsij.org>
+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.
- * process.c (rb_execarg_init): take a VALUE argument instead of
- struct rb_execarg.
- (rb_execarg_new): follow the rb_execarg_init change.
- (rb_exec_arg_init): ditto.
+Tue Dec 23 15:36:58 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * internal.h (rb_execarg_init): follow the definition change.
+ * tool/file2lastrev.rb: detects vcs directory properly on building
+ outside of srcdir. [ruby-dev:37555] [ruby-dev:37561]
-Thu Jun 21 17:20:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Dec 23 15:30:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * parse.y (new_args_tail_gen): fix GC problem of keyword rest
- argument. the wrapped struct should be bound to the wrapping node
- before assignment of child nodes, to get rid of the case the
- children are referred by only the struct pointer which is not a
- subject of GC. [ruby-core:45744]
+ * io.c (pipe_open): need to initialize args.
-Thu Jun 21 07:06:52 2012 Koichi Sasada <ko1@atdot.net>
+Tue Dec 23 14:18:14 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * error.c (err_append): rename err_append() to compile_err_append()
- and move definition body. err_append() is used only by compiling.
+ * include/ruby/st.h: need to include defines.h because LONG_LONG is
+ defined there.
-Thu Jun 21 06:21:54 2012 Tanaka Akira <akr@fsij.org>
+Tue Dec 23 13:52:05 2008 Eric Hodel <drbrain@segment7.net>
- * process.c (rb_execarg_fixup): take a VALUE argument instead of
- struct rb_execarg.
+ * lib/rdoc/parser/c.rb: Don't coalesce adjacent comment blocks.
+ [bug#901]
- * internal.h (rb_execarg_fixup): follow the definition change.
+Tue Dec 23 12:00:00 2008 Tanaka Akira <akr@fsij.org>
- * io.c (pipe_open): follow rb_execarg_fixup change.
+ * io.c (pipe_close): fix coding style. [ruby-dev:37554]
- * ext/pty/pty.c (establishShell): ditto.
+Tue Dec 23 08:10:05 2008 Eric Hodel <drbrain@segment7.net>
-Wed Jun 20 21:25:37 2012 Tanaka Akira <akr@fsij.org>
+ * lib/rubygems/installer.rb: Fix documentation. [bug#827]
- * internal.h (struct rb_execarg): add umask_given and umask_mask
- fields.
+Tue Dec 23 08:04:58 2008 Eric Hodel <drbrain@segment7.net>
- * process.c (STATIC_ASSERT): removed.
- (rb_execarg_addopt): follow the rb_execarg change.
- (rb_execarg_run_options): ditto.
+ * gem_prelude.rb: Don't remove methods twice. [bug#555]
-Wed Jun 20 20:38:23 2012 Tanaka Akira <akr@fsij.org>
+Tue Dec 23 00:16:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * internal.h (struct rb_execarg) moved and renamed from
- struct rb_exec_arg in intern.h.
+ * sprintf.c (rb_str_format): fix buffer overflow.
- * include/ruby/intern.h (struct rb_exec_arg): refer Data object which
- contains struct rb_execarg.
+Mon Dec 22 19:31:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * process.c: use struct rb_execarg instead of struct rb_exec_arg
- except functions declared in intern.h.
- (rb_exec_arg_addopt): extract a pointer to struct rb_execarg from
- struct rb_exec_arg.
- (rb_exec_arg_init): ditto.
- (rb_exec_arg_fixup): ditto.
- (rb_run_exec_options_err): ditto.
- (rb_run_exec_options): ditto.
- (rb_exec_err): ditto.
- (rb_exec): ditto.
+ * common.mk (revision.h): uses tool/file2lastrev.rb to support
+ git-svn.
- * io.c: use struct rb_execarg instead of struct rb_exec_arg.
+ * version.h: changed version string as
+ `ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
+ [i386-darwin9.6.0]'.
- * ext/pty/pty.c: ditto.
+Mon Dec 22 16:32:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jun 20 19:13:25 2012 Tanaka Akira <akr@fsij.org>
+ * pack.c (pack_pack): encoding of packed string only from 'm',
+ 'M', and 'u' should be US-ASCII. [ruby-dev:37284]
- * internal.h (rb_execarg_new): declared.
- (rb_execarg_get): ditto.
+ * pack.c (pack_pack): encoding of packed string only from 'U'
+ should be UTF-8. also upgrade US-ASCII strings to UTF-8.
- * process.c (mark_exec_arg): new function.
- (free_exec_arg): ditto.
- (memsize_exec_arg): ditto.
- (exec_arg_data_type): defined.
- (rb_execarg_new): new function.
- (rb_execarg_get): ditto.
- (rb_f_exec): use rb_execarg_new.
- (rb_spawn_internal): ditto.
- (rb_f_spawn): ditto.
+Mon Dec 22 15:56:49 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * io.c (pipe_open_v): use rb_execarg_new.
- (pipe_open_s): ditto.
+ * 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.
- * ext/pty/pty.c (establishShell): use rb_execarg_new.
+ * test/rubygems/test_gem.rb (@default_dir_re): ditto.
-Wed Jun 20 16:36:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 28 16:13:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * missing/setproctitle.c (environ): use (*_NSGetEnviron()) instead of
- environ on Darwin for namespace cleanness, same as [ruby-core:00537].
- [ruby-core:45615] [Bug #6576]
+ * tool/make-snapshot: use String#bytesize.
-Wed Jun 20 11:33:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 28 09:51:48 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * process.c (rb_execarg_addopt): always make Fixnum, and ignore higher
- bits in too large umask value.
+ * bootstraptest/test_thread.rb: ignore some exceptions.
+ [ruby-dev:36951]
-Wed Jun 20 11:24:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 28 09:19:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): deal with
- sudden-death of workers.
+ * win32/Makefile.sub (RUNRUBY): now ruby requires something from
+ gem_prelude, so need to set library path.
-Mon Jun 18 20:34:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Oct 27 22:29:11 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * time.c (init_leap_second_info): fix non-ANSI function declaration.
+ * vm_insnhelper.c (vm_yield_setup_args): supports optional parameters.
+ Fixed [ruby-core:19503].
-Mon Jun 18 20:29:04 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * vm_insnhelper.c (vm_yield_setup_block_args): a new function. extracted
+ from vm_yield_setup_args.
- * ruby.c (rb_f_sub): use ansi style declaration.
- * ruby.c (rb_f_gsub): ditto.
- * ruby.c (rb_f_chomp): ditto.
+ * vm_insnhelper.c (vm_yield_setup_block_args_complex): ditto.
-Mon Jun 18 20:26:23 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/ruby/test_proc.rb: added tests for arguments on a Proc from
+ Kernel#proc called.
- * random.c (rb_random_int32): get rid of "warning: constant 0x100000000
- is so big it is long" warning.
+Mon Oct 27 20:03:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Jun 18 20:07:23 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/mathn/complex/complex.c: no need to define rb_cComplex because
+ it's already defined at $(srcdir)/complex.c.
- * dir.c (dir_initialize): get rid of "unused return: argc = rb_scan_args()"
+ * 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.
-Mon Jun 18 19:31:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+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>
- * include/ruby/missing.h: include math.h before checking INFINITY
- and NAN. Otherwise, strange macro redefinition will occur.
+ * 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.
-Mon Jun 18 19:12:37 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Oct 22 17:25:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * array.c (ary_reverse): use ansi style declaration.
+ * io.c (pipe_open): remove unnecessary flush before fork.
+ a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>
+ in [ruby-dev:36840].
-Tue Jun 19 18:43:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 22 16:27:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/backward/rubysig.h: fix visibility. [Bug #6607]
+ * vm_insnhelper.c (vm_yield_setup_args): should not drop arguments
+ corresponding to default parameters.
-Tue Jun 19 17:51:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 22 14:59:30 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (rb_execarg_run_options): do not call any methods in the
- async-signal-safe function. mask has been checked with NUM2MODET()
- already and converted with LONG2NUM().
+ * 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.
-Tue Jun 19 11:59:56 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/zlib/zlib.c (rb_gzreader_getc): now works on characters.
- * ext/readline/readline.c (Init_readline): don't set 0 to
- rl_catch_signals and rl_catch_sigwinch. [Bug #5423]
+ * ext/zlib/zlib.c (rb_gzreader_getbyte): new method to retrieve
+ single byte.
-Tue Jun 19 11:52:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/zlib/zlib.c (rb_gzreader_readbyte): ditto.
- * ext/readline/readline.c (readline_s_get_special_prefixes): suppress
- warning: uninitialized instance variable.
+ * ext/zlib/zlib.c (rb_gzreader_each_byte): renamed from each_char
-Tue Jun 19 11:43:16 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/zlib/zlib.c (rb_gzreader_ungetc): allow unget strings.
- * ext/readline/readline.c (readline_getc): fix editline compatibility
- broken by r36123. [Bug #6601]
+ * ext/zlib/zlib.c (rb_gzreader_ungetbyte): renamed from ungetc.
-Mon Jun 18 17:10:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 21 13:28:42 2008 Shugo Maeda <shugo@ruby-lang.org>
- * string.c (rb_str_subpos): split from rb_str_substr. returns
- adjusted position for substring.
+ * io.c, include/ruby/intern.h (rb_io_ascii8bit_binmode): externed.
-Mon Jun 18 10:42:57 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (init_sock): use rb_io_ascii8bit_binmode()
+ instead of rb_io_binmode().
- * ext/readline/readline.c (readline_getc): deal with ESC just followed
- by ASCII as meta prefix in incremental search mode. based on the
- patch from rctay (Tay Ray Chuan) at [ruby-core:45682]. [Bug #6601]
+Tue Oct 21 13:17:39 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Sun Jun 17 22:23:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * mdoc2man.rb: moved into tools/.
- * dir.c (rb_file_directory_p): move documentation for Dir.exist? from
- file.c so that the proper description will be shown instead of the
- documentation of File.directory?. [ruby-core:45685]
+ * instruby.rb: followed the change of mdoc2man.
-Sun Jun 17 16:21:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 21 11:34:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_win32.h (rb_thread_lock_t): make a union for USE_WIN32_MUTEX.
- this internal is used only in thread_win32.c, but has to be complete
- to define rb_thread_t.
+ * 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].
- * thread_win32.c (native_mutex_lock, native_mutex_destroy): fix for
- USE_WIN32_MUTEX.
+ * test/iconv/test_basic.rb (test_invalid_arguments): added tests.
- * thread_win32.c (native_cond_timedwait_ms): rename reserved pattern
- name. user defined symbols should not start with __.
+Tue Oct 21 10:40:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 16 19:24:01 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * io.c (rb_file_open_internal): should initialize fmode before using.
- * ext/date/date_core.c: define date_sg_t.
+Tue Oct 21 08:56:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 16 18:46:57 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * regparse.c (parse_char_class): CCV_SB is only for single
+ byte. [ruby-dev:36786]
- * ext/date/date_tmx.h: offset in struct tmx_funcs is now int.
- * ext/date/date_strftime.c: ditto.
- * ext/date/date_core.c: ditto.
+Tue Oct 21 01:49:55 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jun 16 18:31:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (rb_io_extract_modeenc): plain rb/wb should set ASCII-8BIT
+ to the external_encoding.
- * eval.c (ruby_setup): set running state in the normal case before
- popping a tag.
+ * io.c (rb_file_open_internal): ditto.
-Sat Jun 16 07:46:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (NEED_WRITECONV): no conversion when the external_encoding
+ is ASCII-8BIT.
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): format workers
- results in the parent.
+ * io.c (do_writeconv): skip ASCII-8BIT.
-Sat Jun 16 07:12:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 21 00:51:59 2008 Tanaka Akira <akr@fsij.org>
- * tool/runruby.rb (File.realpath): return real path of expanded path.
- [Bug #6598]
+ * 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.
-Sat Jun 16 07:12:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 20 21:19:00 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * bootstraptest/runner.rb (main): ignore -j option for compatibility
+ * 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.
-Sat Jun 16 07:11:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+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]
- * lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
- drop useless reports, not override entirely.
+Sat Oct 11 03:54:05 2008 Koichi Sasada <ko1@atdot.net>
- * lib/test/unit/parallel.rb (Test::Unit::Worker#_run_suite): report
- unformatted results. formatting messages is not a workers task.
+ * parse.y: optimize 'for' statement when one variable given.
- * lib/test/unit/parallel.rb (Test::Unit::Worker#puke): store raw
- results.
+ * benchmark/bm_loop_for.rb: added.
-Sat Jun 16 01:27:14 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * benchmark/bm_loop_times.rb: modified.
- * ext/psych/lib/psych.rb: bumping psych to 1.3.3
- * ext/psych/psych.gemspec: ditto
+Sat Oct 11 12:09:05 2008 James Edward Gray II <jeg2@ruby-lang.org>
-Fri Jun 15 20:54:28 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * lib/csv/csv.rb: Added support for Encoding::default_internal.
+ * lib/csv/csv.rb: Switched to new Hash syntax.
- * vm_backtrace.c (backtrace_collect): rename from backtreace_collect.
+Fri Oct 10 22:16:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jun 15 19:22:13 2012 Koichi Sasada <ko1@atdot.net>
+ * parse.y (comment_at_top): needed for ripper too.
- * vm_core.h: remove VM_FRAME_MAGIC_FINISH (finish frame type).
- Before this commit:
- `finish frame' was place holder which indicates that VM loop
- needs to return function.
- If a C method calls a Ruby methods (a method written by Ruby),
- then VM loop will be (re-)invoked. When the Ruby method returns,
- then also VM loop should be escaped. `finish frame' has only
- one instruction `finish', which returns VM loop function.
- VM loop function executes `finish' instruction, then VM loop
- function returns itself.
- With such mechanism, `leave' instruction (which returns one
- frame from current scope) doesn't need to check that this `leave'
- should also return from VM loop function.
- Strictly, one branch can be removed from `leave' instruction.
- Consideration:
- However, pushing the `finish frame' needs costs because
- it needs several memory accesses. The number of pushing
- `finish frame' is greater than I had assumed. Of course,
- pushing `finish frame' consumes additional control frame.
- Moreover, recent processors has good branch prediction,
- with which we can ignore such trivial checking.
- After this commit:
- Finally, I decide to remove `finish frame' and `finish'
- instruction. Some parts of VM depend on `finish frame',
- so the new frame flag VM_FRAME_FLAG_FINISH is introduced.
- If this frame should escape from VM function loop, then
- the result of VM_FRAME_TYPE_FINISH_P(cfp) is true.
- `leave' instruction checks this flag every time.
- I measured performance on it. However on my environments,
- it improves some benchmarks and slows some benchmarks down.
- Maybe it is because of C compiler optimization parameters.
- I'll re-visit here if this cause problems.
+Fri Oct 10 22:07:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (leave, finish): remove finish instruction.
+ * include/ruby.h: updated macros for headers. [ruby-core:19275]
- * vm.c, vm_eval.c, vm_exec.c, vm_backtrace.c, vm_dump.c:
- apply above changes.
+Fri Oct 10 19:21:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jun 15 19:11:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (magic_comment_encoding): warns when ignored.
- * lib/test/unit.rb (Test::Unit::Runner#puke): always add skipped
- results to the report for parallel test. [Bug #6595]
+ * parse.y (parser_magic_comment): replaces '-' with '_'.
-Fri Jun 15 09:01:35 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * parse.y (parser_yylex): allows magic comments indented and the
+ second line or later.
- * nacl/pepper_main.c: Removed an unnecessary and erroneous inclusion.
+Fri Oct 10 17:26:50 2008 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Jun 14 22:59:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/json/ext/parser/parser.c (JSON_parse_string):
+ associate encoding.
- * configure.in (RUBY_CPPOUTFILE): check if output is really sent to
- specified file to tell if -o option works. [ruby-dev:45742]
- [Bug#6591]
+Fri Oct 10 10:18:21 2008 Ryan Davis <ryand-ruby@zenspider.com>
- * configure.in (RUBY_CPPOUTFILE): check if output file is actually
- created. [ruby-dev:45742] [Bug#6591]
+ * lib/test/*: reverted back to test/unit.
+ * test/test/*: ditto
+ * lib/minitest/*: Imported minitest 1.3.0 r4333.
-Thu Jun 14 22:10:50 2012 Tanaka Akira <akr@fsij.org>
+Fri Oct 10 03:41:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (proc_exec_sh): don't strip leading spaces of the script.
+ * sprintf.c (rb_str_format): check if codepoint for %c is valid.
+ [ruby-dev:36691]
-Thu Jun 14 15:54:02 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Oct 10 01:55:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_file_s_basename, rb_file_s_dirname): documentation fix.
- File.basename and File.dirname support File::ALT_SEPARATOR.
+ * encoding.c (enc_names): minor improvement.
-Thu Jun 14 11:10:10 2012 Yuki Yugui Sonoda <yugui@google.com>
+Fri Oct 10 00:21:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * nacl/pepper_main.c: Applies the new embedding API to pepper_ruby.
+ * lib/optparse.rb (ParseError.filter_backtrace): removes internal
+ backtrace.
-Thu Jun 14 10:44:41 2012 Yuki Yugui Sonoda <yugui@google.com>
+Fri Oct 10 00:11:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * include/ruby/ruby.h: Grouped APIs for embedding CRuby interpreter.
- (ruby_setup, ruby_compile_main_from_file,
- ruby_compile_main_from_string, ruby_eval_main,
- ruby_set_script_name): new APIs to embed CRuby.
- (ruby_opaque_t) Opaque pointer to an internal data, to NODE or iseq
- in particular.
+ * transcode.c (rb_econv_add_converter): remove unnecessary NULL check.
- * eval.c (ruby_setup): Similar to ruby_init but returns an error code
- instead of exit(3) on error.
- (ruby_eval_main): Similar to ruby_exec_node but returns the
- evaluation result.
- (ruby_eval_main_internal): renamed from ruby_exec_internal.
+Thu Oct 9 23:53:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby.c (toplevel_context): new helper function.
- (PREPARE_EVAL_MAIN): moved.
- (process_options): refactored with new functions.
- (parse_and_compile_main) new helper function.
- (ruby_compile_main_from_file, ruby_compile_main_from_string) new API
- (ruby_set_script_name): new API.
+ * 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.
-Thu Jun 14 10:39:48 2012 Yuki Yugui Sonoda <yugui@google.com>
+Tue Oct 7 16:35:41 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * eval.c: Add doxygen comments.
+ * 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.
- * thread_pthread.c: ditto
+ * vms/config.h: removed.
- * version.c: ditto.
+ * 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.
-Thu Jun 14 10:16:07 2012 NARUSE, Yui <naruse@ruby-lang.org>
+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.
- * configure.in: revert r36071 and add NetBSD to blacklist of -ansi.
+ * ruby.c: ditto.
-Thu Jun 14 07:59:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * strftime.c: ditto.
- * thread_pthread.c (get_stack): Linux is the only OS which includes
- the size of guard page into the stack size.
+ * util.c: ditto.
-Thu Jun 14 06:21:00 2012 Eric Hodel <drbrain@segment7.net>
+Sat Oct 4 22:14:15 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/drb/drb.rb: Replace broken links to the English DRb book.
- Patch by Zachary Scott. [ruby-trunk - Bug #6544]
+ * djgpp/GNUmakefile.in: removed. Ruby no longer supports djgpp.
-Thu Jun 14 06:17:47 2012 Eric Hodel <drbrain@segment7.net>
+ * djgpp/README.djgpp: ditto.
- * lib/observer.rb: Update broken link to the Programming Ruby book.
- Patch by Zachary Scott. [ruby-trunk - Bug #6536]
- * lib/drb/drb.rb: ditto.
+ * djgpp/config.hin: ditto.
-Thu Jun 14 05:23:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * djgpp/config.sed: ditto.
- * regparse.c (PFETCH_READY): suppress Wunused-but-set-variable.
+ * djgpp/configure.bat: ditto.
- * regparse.c (is_onechar_cclass): restructured to clarify that c is
- used iff found == 1.
+ * djgpp/mkver.sed: ditto.
-Thu Jun 14 02:54:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/Setup.dj: ditto.
- * configure.in: use -fbuiltin with -ansi -std=iso9899:199409.
- This prevents errors introduced by disabling builtin functions,
- which is the sub-effect of -ansi/-std.
- Now NetBSD can use -ansi -std=iso9899:199409.
- Maybe mingw, cygwin and darwin can also.
+ * dln.c: removed djgpp supports.
-Thu Jun 14 02:53:30 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * file.c: ditto.
- * Makefile.in: don't remove macros. now name2ctype uses macros.
+ * gc.c: ditto.
- * tool/enc-unicode.rb: add comment why it uses Hash#index.
+ * io.c: ditto.
- * enc/unicode/{name2ctype.kwd,name2ctype.src,name2ctype.h.blt}:
- update to follow the current name2ctype.h.
- FYI current Unicode version is 6.1.
+ * process.c: ditto.
-Thu Jun 14 00:16:59 2012 Akinori MUSHA <knu@iDaemons.org>
+ * ruby.c: ditto.
- * lib/net/http/responses.rb, lib/webrick/httpstatus.rb: Add HTTP
- response codes added in RFCs 2817 and 4918. [ruby-core:45547]
- [Feature #6569]
+ * signal.c: ditto.
- * lib/net/http/responses.rb: Rename Net::HTTPMultipleChoice to
- Net::HTTPMultipleChoices, leaving the former as alias to the
- latter for backward compatibility. [ruby-core:45547]
- [Feature #6569]
+ * util.c: ditto.
- * lib/net/http/responses.rb: Add comments about unused,
- still-in-draft and private extension response codes.
- [ruby-core:45547] [Feature #6569]
+ * vm_core.h: ditto.
-Wed Jun 13 22:44:32 2012 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/fileutils.rb: ditto.
- * test/dl/test_func.rb (test_qsort1, test_qsort2): use TYPE_SIZE_T
- for size_t variables. [ruby-dev:45733] [Bug #6584]
+ * lib/mkmf.rb: ditto.
-Wed Jun 13 22:18:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c: ditto.
- * configure.in: remove -ansi and -std options for lgamma_r() and
- finite().
+ * test/fileutils/test_fileutils.rb: ditto.
-Wed Jun 13 21:46:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_env.rb: ditto.
- * configure.in: cygwin does not provide some declarations in strict
- ANSI mode.
+ * test/ruby/test_path.rb: ditto.
-Wed Jun 13 20:19:59 2012 Tanaka Akira <akr@fsij.org>
+Sat Oct 4 21:59:39 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * process.c (rb_fork_internal): move a variable declaration.
+ * x68/_dtos18.c: removed. Ruby no longer supports human68k.
-Wed Jun 13 17:54:38 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * x68/_round.c: ditto.
- * regparse.c (PFETCH_READY): this line was to suppress warning,
- but did emit warnings if -Wuninitialized was set. Assigning
- NULL instead if pfetch_prev should suffice the situation.
+ * x68/fconvert.c: ditto.
-Wed Jun 13 17:51:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * x68/select.c: ditto.
- * configure.in: cygwin needs C99 for some stuff, e.g.,
- pthread_attr_setstacksize, sched_yield.
+ * ext/Setup.x68: ditto.
-Wed Jun 13 17:50:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/x68.c: ditto.
- * Makefile.in (.c.i): add warnflags to make the result consistent with
- compilation.
+ * dln.c (dln_find_exe_r): removed human68k supports.
+ (dln_find_1): ditto.
-Wed Jun 13 15:12:07 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * lib/mkmf.rb: ditto.
- * configure.in: On Windows platforms, system provided headers are
- VC++ optimized. That is, C++ habits are often contaminated into
- various headers. Most frequent situation is the use of //
- comments. We bypass ANSI C mode for them. Otherwise extension
- libs cannot include those headers.
+ * ext/extmk.rb (Init_ext): ditto.
-Wed Jun 13 13:39:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (init_sock): ditto.
- * include/ruby/win32.h: get rid of C99 style one line comments.
+ * gc.c (GC_MALLOC_LIMIT): ditto.
+ (rb_setjmp, rb_jmpbuf): ditto.
+ (mark_current_machine_context): ditto.
-Wed Jun 13 13:39:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/defines.h (PATH_ENV): ditto.
- * encoding.c (enc_alias_internal): use strdup defined as macro.
+ * io.c: ditto.
-Wed Jun 13 10:20:27 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c: ditto.
- * process.c (rb_exec_fillarg): get rid of SIZE_T_MAX which may need
- more headers.
+ * ruby.c: ditto.
- * process.c (rb_exec_fillarg): fix array element size. "continue" and
- "readonly" exceeded the size.
+ * test/ruby/test_env.rb: ditto.
- * process.c (rb_exec_fillarg): use shell if the first word is reserved
- or special built-in name.
- http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
+ * test/ruby/test_path.rb: ditto.
- * process.c (rb_exec_fillarg): treat '=' only in the first word. if
- the first word does not contain '=', it is the command name and
- environment assignments cannot be anymore.
+ * LEGAL
-Tue Jun 12 23:45:36 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Oct 4 19:02:36 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * lib/mkmf.rb: add dummy clean-static target to prevent errors for the
- case real clean-static target doesn't exist.
+ * lib/date/format.rb: no need to require the "lib/rational.rb".
-Tue Jun 12 22:49:42 2012 Naohisa Goto <ngotogenome@gmail.com>
+Sat Oct 4 19:02:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * process.c (rb_exec_arg_fixup): fix compile error
+ * ext/nkf/nkf.c (rb_nkf_enc_get): don't replicate encoding.
+ [ruby-dev:36575]
-Tue Jun 12 21:40:13 2012 Tanaka Akira <akr@fsij.org>
+Sat Oct 4 18:47:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * process.c (rb_exec_fillarg): treat '=' character as a meta
- character to detect assignments preceding command name.
+ * ext/stringio/stringio.c (strio_external_encoding): defined.
-Tue Jun 12 20:29:19 2012 Tanaka Akira <akr@fsij.org>
+ * ext/stringio/stringio.c (strio_internal_encoding): defined.
- * include/ruby/intern.h (rb_exec_arg_init): deprecated.
- (rb_exec_arg_addopt): ditto.
- (rb_exec_arg_fixup): ditto.
- (rb_run_exec_options): ditto.
- (rb_run_exec_options_err): ditto.
+ * ext/stringio/stringio.c (Init_stringio): define above.
- * internal.h (rb_execarg_init): declared.
- (rb_execarg_addopt): ditto.
- (rb_execarg_fixup): ditto.
- (rb_execarg_run_options): ditto.
+Sat Oct 4 15:52:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * process.c: call rb_execarg_addopt, rb_execarg_fixup,
- rb_execarg_run_options, rb_execarg_init.
- (rb_execarg_addopt): renamed from rb_exec_arg_addopt.
- (rb_exec_arg_addopt): stub to call rb_execarg_addopt.
- (rb_execarg_init): renamed from rb_exec_arg_init.
- (rb_exec_arg_init): stub to call rb_execarg_init.
- (rb_execarg_fixup): renamed from rb_exec_arg_fixup.
- (rb_exec_arg_fixup): stub to call rb_execarg_fixup.
- (rb_execarg_run_options): renamed from rb_run_exec_options_err.
- (rb_run_exec_options_err): stub to call rb_execarg_run_options.
- (rb_run_exec_options): call rb_execarg_run_options.
+ * test/mini/test_mini_test.rb: recovered.
+ It had been temporarily removed at r19645.
- * io.c: call rb_execarg_addopt, rb_execarg_fixup,
- rb_execarg_run_options, rb_execarg_init.
+ * test/mini/test_mini_mock.rb: ditto.
- * ext/pty/pty.c (establishShell): call rb_execarg_init and
- rb_execarg_fixup.
+ * test/mini/test_mini_spec.rb: ditto.
-Tue Jun 12 18:39:59 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * lib/test/**/*: replaced by miniunit.
+ miniunit had been temporarily reverted at r19643 but
+ now recovered.
- * configure.in: enable strict ANSI mode by default in case of GCC,
- requested by _ko1.
+Sat Oct 4 15:33:26 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Tue Jun 12 06:40:23 2012 Tanaka Akira <akr@fsij.org>
+ * common.mk (gdb-ruby): new target. it runs ruby under controlled by
+ gdb.
- * process.c (rb_exec_fillarg): detect '#' as a meta character.
+ * common.mk (dist): accepts RELNAME variable as the second argument of
+ make-snapshot.rb.
-Mon Jun 11 22:15:44 2012 Tanaka Akira <akr@fsij.org>
+Sat Oct 4 12:17:46 2008 Keiju Ishitsuka <keiju@ruby-lang.org>
- * include/ruby/intern.h (rb_proc_exec_n): deprecated.
- (rb_exec): ditto.
- (rb_exec_err): ditto.
- (rb_fork): ditto.
- (rb_fork_err): ditto.
-
-Mon Jun 11 18:49:52 2012 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: on checking libexecinfo, don't specify /use/local.
- On FreeBSD people must specify --with-opt-dir or --with-execinfo-dir.
-
-Mon Jun 11 12:14:37 2012 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h: remove lfp (local frame pointer) and rename
- dfp (dynamic frame pointer) to ep (environment pointer).
- This change make VM `normal' (similar to other interpreters).
- Before this commit:
- Each frame has two env pointers lfp and dfp. lfp points
- local environment which is method/class/toplevel frame.
- lfp[0] is block pointer.
- dfp is block local frame. dfp[0] points previous (parent)
- environment pointer.
- lfp == dfp when frame is method/class/toplevel.
- You can get lfp from dfp by traversing previous environment
- pointers.
- After this commit:
- Each frame has only `ep' to point respective environment.
- If there is parent environment, then ep[0] points parent
- environment (as dfp). If there are no more environment,
- then ep[0] points block pointer (as lfp). We call such ep
- as `LEP' (local EP). We add some macros to get LEP and to
- detect LEP or not.
- In short, we replace dfp and lfp with ep and LEP.
- rb_block_t and rb_binding_t member `lfp' and `dfp' are removed
- and member `ep' is added.
- rename rb_thread_t's member `local_lfp' and `local_svar' to
- `root_lep' and `root_svar'.
- (VM_EP_PREV_EP(ep)): get previous environment pointer. This macro
- assume that ep is not LEP.
- (VM_EP_BLOCK_PTR(ep)): get block pointer. This macro assume
- that ep is LEP.
- (VM_EP_LEP_P(ep)): detect ep is LEP or not.
- (VM_ENVVAL_BLOCK_PTR(ptr)): make block pointer.
- (VM_ENVVAL_BLOCK_PTR_P(v)): detect v is block pointer.
- (VM_ENVVAL_PREV_EP_PTR(ptr)): make prev environment pointer.
- (VM_ENVVAL_PREV_EP_PTR_P(v)): detect v is prev env pointer.
-
- * vm.c: apply above changes.
- (VM_EP_LEP(ep)): get LEP.
- (VM_CF_LEP(cfp)): get LEP of cfp->ep.
- (VM_CF_PREV_EP(cfp)): utility function VM_EP_PREV_EP(cfp->ep).
- (VM_CF_BLOCK_PTR(cfp)): utility function VM_EP_BLOCK_PTR(cfp->ep).
-
- * vm.c, vm_eval.c, vm_insnhelper.c, vm_insnhelper.h, insns.def:
- apply above changes.
-
- * cont.c: ditto.
-
- * eval.c, eval_intern.h: ditto.
+ * 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.
- * proc.c: ditto.
+Fri Oct 3 22:43:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * thread.c: ditto.
+ * ext/dl/extconf.rb ($distcleanfiles): added callback-?.c into
+ the distclean list.
- * vm_dump.c: ditto.
+Fri Oct 3 19:33:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * vm_exec.h: fix function name (on vm debug mode).
+ * ext/json/lib/json/pure.rb (module JSON): remove Iconv dependency.
-Mon Jun 11 11:52:18 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * ext/json/lib/json/pure/generator.rb (utf8_to_json): process as
+ binary and remove Iconv dependency.
- * compile.c (iseq_set_sequence): nonstatic initializer of an
- aggregate type is a C99ism.
+ * ext/json/lib/json/pure/parser.rb (parse_string): ditto.
- * compile.c (enum compile_array_type_t): comma at the end of enum
- list is a C99ism.
+Fri Oct 3 14:04:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm_backtrace.c (enum LOCATION_TYPE): ditto.
+ * win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
+ configure option support.
-Mon Jun 11 06:31:33 2012 Tanaka Akira <akr@fsij.org>
+Thu Oct 2 21:22:43 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
- * process.c (rb_proc_exec_n): revert the function removed at r35889.
+ * 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/
-Mon Jun 11 06:20:50 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/cgi/test_cgi_multipart.rb : fixed multipart test.
- * thread_pthread.c (rb_thread_create_timer_thread): assign return
- value to the variable err.
+Thu Oct 2 20:46:17 2008 Tanaka Akira <akr@fsij.org>
-Mon Jun 11 06:17:06 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * string.c (rb_str_sub_bang): fix coderange.
- * thread_pthread.c (native_cond_initialize): fix typo in r36022.
- this cause a failure on FreeBSD 8.2 amd64.
- http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20120610T130201Z.diff.html.gz
+Wed Oct 1 22:54:09 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Jun 11 05:21:57 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/rexml/parsers/lightparser.rb, lib/debug.rb: remove unused when
+ clauses.
- * .gdbinit (SDR): add SDR function. It's only for VM debugging.
+Wed Oct 1 22:43:59 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Sun Jun 10 21:50:45 2012 Yuki Sonoda (Yugui) <yugui@yugui.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.
- * nacl/nacl_config.rb: Fixed for 32bit hosts.
+Wed Oct 1 21:36:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jun 10 20:23:14 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+ * gc.c (rb_gc_call_finalizer_at_exit): finalize deferred IO and Data.
- Fixes threading on NativeClient.
+ * gc.c (rb_gc_call_finalizer_at_exit): defers IO finalization.
+ [ruby-dev:36646]
- * thread_pthread.c (timer_thread_sleep): Extracted out a function from
- thread_timer(). Added an alternative implementation for platforms
- that lacks select(2) or pipe(2).
- (rb_thread_create_timer_thread, native_cond_initialize,
- native_cond_destroy): Replaced wrong HAVE_XXX checks.
+Wed Oct 1 19:11:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (pthread_attr_init): New check.
+ * marshal.c (marshal_dump): fixed for check_dump_arg.
-Sun Jun 10 21:30:11 2012 Tanaka Akira <akr@fsij.org>
+ * marshal.c (marshal_dump): initializes dump_arg before any funcall.
+ [ruby-dev:36648]
- * process.c (rb_exec_without_timer_thread): renamed from rb_exec_err.
- (rb_exec_err): new stub function to call
- rb_exec_without_timer_thread.
- (rb_f_exec): call rb_exec_without_timer_thread.
- (rb_exec): call rb_exec_without_timer_thread.
+Wed Oct 1 00:54:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Jun 10 21:13:10 2012 Tanaka Akira <akr@fsij.org>
+ * string.c (rb_str_split_m): should use rb_str_subseq() which use
+ offset and length by bytes. [ruby-dev:36641]
- * process.c (rb_fork): call rb_fork_internal instead of rb_fork_err.
+Wed Oct 1 00:29:48 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Sun Jun 10 20:55:59 2012 Tanaka Akira <akr@fsij.org>
+ * test/ruby/test_settracefunc.rb (test_call, test_class): line number
+ was changed at r19592.
- * process.c (rb_fork_ruby): call rb_fork_internal directly.
+Wed Oct 1 00:20:38 2008 Tanaka Akira <akr@fsij.org>
-Sun Jun 10 20:19:40 2012 Tanaka Akira <akr@fsij.org>
+ * process.c (check_exec_redirect): don't depend on rb_stdout and
+ rb_stderr.
- * process.c (rb_fork_ruby): new function.
- (rb_f_fork): use rb_fork_ruby instead of rb_fork.
- (rb_daemon): ditto.
+Tue Sep 30 23:06:58 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * io.c (pipe_open): use rb_fork_ruby instead of rb_fork.
+ * 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.
- * internal.h (rb_fork_ruby): declared.
+ * test/mini/test_mini_mock.rb: ditto.
-Sun Jun 10 18:58:16 2012 Akinori MUSHA <knu@iDaemons.org>
+ * test/mini/test_mini_spec.rb: ditto.
- * lib/net/http/response.rb: Remove a duplicated rdoc and leave a
- pointer.
+Tue Sep 30 23:04:30 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/net/http/responses.rb: Add RFC numbers to base on.
+ * lib/test/**/*: recovered.
+ Temporarily reverts the changes of lib/test/unit/* in
+ r19502 and r19501, in order to release 1.9.0-5.
-Sun Jun 10 18:31:42 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Tue Sep 30 23:00:05 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * configure.in (RUBY_NACL): Warns if $PATH does not contain the path
- to NativeClient SDK. PATH variable redefinition in GNUmakefile does
- not work for GNU make 3.81.
+ * 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.
-Sun Jun 10 17:54:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/test/unit/assertions.rb: ditto.
- * gc.h (IS_STACK_DIR_UPPER): utility macro.
+ * lib/test/unit/deprecate.rb: ditto.
- * thread_pthread.c (get_stack): seems stack size does not include
- guard size on Mac OS X.
+ * lib/test/unit/error.rb: ditto.
- * thread_pthread.c (ruby_init_stack): adjust stack size for offset of
- addr from the bottom.
+ * lib/test/unit/testcase.rb: ditto.
-Sun Jun 10 15:49:47 2012 Tanaka Akira <akr@fsij.org>
+Tue Sep 30 20:17:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (retry_fork): call after_fork except in a child process.
- (rb_fork_internal): restrict after_fork call condition.
+ * io.c (rb_io_extract_modeenc): should honor value of the
+ textmode: and binmode: options.
-Sun Jun 10 14:19:33 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Sep 30 17:04:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: NetBSD 6 adds libexecinfo but it only works on amd64.
- http://www.mail-archive.com/source-changes-full@netbsd.org/msg38729.html
+ * 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].
-Sun Jun 10 12:43:23 2012 Tanaka Akira <akr@fsij.org>
+Tue Sep 30 16:53:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (rb_f_exec): call rb_exec_async_signal_safe except on
- Mac OS X. cf. the comment in before_exec_non_async_signal_safe.
+ * parse.y (stmt): returns non zero. [ruby-dev:36633]
-Sun Jun 10 12:15:18 2012 Tanaka Akira <akr@fsij.org>
+Tue Sep 30 16:52:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (popen_exec): don't call rb_thread_atfork_before_exec. use
- rb_exec_async_signal_safe instead of rb_exec_err.
- (pipe_open): use rb_fork_async_signal_safe instead of rb_fork_err.
+ * 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].
-Sun Jun 10 11:44:57 2012 Tanaka Akira <akr@fsij.org>
+ * sprintf.c (rb_str_format): add gettext style named format
+ (%{name}) support. inspired by [ruby-dev:35852].
- * process.c (rb_fork_internal): call after_fork only unless
- chfunc_is_async_signal_safe.
+ * sprintf.c (GETNAMEARG): should raise KeyError exception when no
+ named argument found.
-Sun Jun 10 11:33:01 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * hash.c (rb_hash_fetch): export fetch function.
- * ext/openssl/ossl_pkey_ec.c
- test/openssl/test_pkey_ec.rb: Add support for EC_POINT_mul.
- Patch provided by Sambasiva Suda. Thanks!
- [ruby-core:44408][ruby-trunk - Feature #6310]
+Tue Sep 30 13:19:01 2008 Eric Hodel <drbrain@segment7.net>
-Sun Jun 10 10:48:15 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * test/rubygems/test_gem_installer.rb: remove extra call to setup to
+ fix ENV['HOME'] pollution.
- * lib/openssl/ssl.rb: Use a simple random number to generate the
- session id. MD5, as was used before, causes problems when
- using a FIPS version of OpenSSL. Issue was found by Jared
- Jennings, thank you!
- [ruby-trunk - Bug #6137]
+Tue Sep 30 13:04:11 2008 Ryan Davis <ryand-ruby@zenspider.com>
-Sun Jun 10 10:27:34 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * lib/mini/test.rb: Updated to 1.3.0 r4257.
+ * test/mini/*: added from r4257.
- * NEWS: Add note about the new private key export behavior.
+Tue Sep 30 07:46:07 2008 Eric Hodel <drbrain@segment7.net>
-Sun Jun 10 10:24:51 2012 Tanaka Akira <akr@fsij.org>
+ * 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.
- * process.c (rb_exec_async_signal_safe): exported.
+Tue Sep 30 01:02:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/pty/extconf.rb: modify $INCFLAGS to include internal.h
+ * parse.y (token_info_push, token_info_pop): do nothing for evaled
+ source.
- * ext/pty/pty.c: include internal.h.
- (chfunc): don't call rb_thread_atfork_before_exec. use
- rb_exec_async_signal_safe instead of rb_f_exec.
- (establishShell): set up earg. use rb_fork_async_signal_safe
- instead of rb_fork_err.
+Tue Sep 30 00:47:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * internal.h (rb_exec_async_signal_safe): declared.
- (rb_fork_async_signal_safe): declared.
+ * ext/nkf/nkf-utf8/nkf.c: constified.
-Sun Jun 10 10:21:37 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Mon Sep 29 23:32:25 2008 Tanaka Akira <akr@fsij.org>
- * ext/openssl/ossl.c
- ext/openssl/ossl_pkey_rsa.c
- ext/openssl/ossl_pkey_dsa.c
- ext/openssl/ossl_pkey_ec.c: Forbid export passwords that are less
- than four characters long, as OpenSSL itself does not allow this.
- Issue found by Eric Hodel.
- * ext/openssl/ossl_pkey_ec.c: Add export as an alias of to_pem,
- following the PKey interface contract.
- * test/openssl/test_pkey_dsa.rb
- test/openssl/test_pkey_rsa.rb
- test/openssl/test_pkey_ec.rb: Add tests that assert correct
- behaviour when dealing with passwords that are less than four
- characters long.
- [ruby-core: 42281][ruby-trunk - Bug #5951]
+ * string.c (rb_str_subseq): don't use rb_str_drop_bytes for short
+ string.
-Sun Jun 10 10:14:26 2012 Tanaka Akira <akr@fsij.org>
+Mon Sep 29 22:54:29 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * process.c (rb_f_exec): use rb_exec_arg_prepare.
+ * lib/mathn.rb: added String#to_[rc]. moved def_canon.
-Sun Jun 10 06:43:51 2012 Tanaka Akira <akr@fsij.org>
+Mon Sep 29 20:41:19 2008 Tanaka Akira <akr@fsij.org>
- * process.c: split after_exec into async-signal-safe part and rest.
- (after_exec_async_signal_safe): extracted from after_exec.
- (after_exec_non_async_signal_safe): ditto.
- (after_exec): call them.
- (rb_exec_async_signal_safe): call after_exec_async_signal_safe.
- (rb_exec_err): call after_exec_non_async_signal_safe instead of
- after_exec.
+ * string.c (rb_str_subseq): use rb_str_drop_bytes if possible.
-Sun Jun 10 06:21:10 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Mon Sep 29 20:22:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * NEWS: document new features of Ruby OpenSSL.
+ * test/date/*.rb: imported additional tests and some adjustments.
-Sun Jun 10 03:09:41 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Mon Sep 29 20:13:05 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * ext/openssl/ossl.c: Fix error in example. Patch by David Albert.
+ * ext/win32ole/win32ole.c (fev_initialize): initialization
+ handler instance variable.
- Add/extend existing documentation. Examples now also cover RSA
- signatures and PBKDF2.
- [ruby-core: 45154][ruby-trunk - Bug #6475]
+ * 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>
-Sun Jun 10 01:41:45 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/win32ole/win32ole.c (rescue_callback): use rb_write_error
+ instead of fprintf.
- * ext/openssl/ossl_ssl.c: Introduce SSLContext#renegotiation_cb and
- remove SSLContext#disable_client_renegotiation and related
- functionality introduced in r35797. The new callback approach
- gives clients maximum flexibility to decide on their own what to
- do on renegotiation attempts.
- Add documentation for SSL module and SSLError.
- * test/openssl/test_ssl.rb: Add a test for
- SSLContext#renegotiation_cb.
+Mon Sep 29 01:51:54 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Sun Jun 10 01:37:18 2012 Tanaka Akira <akr@fsij.org>
+ * test/rdoc/test_rdoc_info_formatting.rb (teardown): delete tmpdir for
+ test.
- * process.c (rb_fork_internal): initialize exc.
+Mon Sep 29 00:30:20 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
-Sun Jun 10 00:19:25 2012 Tanaka Akira <akr@fsij.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]
- * process.c: don't use non async-signal-safe functions in a child
- process before exec, for invoking a command.
- (rb_exec_atfork): call rb_exec_async_signal_safe only.
- (retry_fork): take chfunc_is_async_signal_safe argument. call
- before_fork and after_fork only unless chfunc_is_async_signal_safe.
- (send_child_error): take chfunc_is_async_signal_safe argument.
- send an exception only unless chfunc_is_async_signal_safe.
- (recv_child_error): take chfunc_is_async_signal_safe argument.
- receive an exception only unless chfunc_is_async_signal_safe.
- (rb_fork_internal): renamed from rb_fork_err and take
- chfunc_is_async_signal_safe argument.
- use rb_protect only unless chfunc_is_async_signal_safe.
- (rb_fork_err): call rb_fork_internal with false as
- chfunc_is_async_signal_safe.
- (rb_fork_async_signal_safe): call rb_fork_internal with true as
- chfunc_is_async_signal_safe.
- (rb_spawn_process): call rb_fork_async_signal_safe instead of
- rb_fork_err.
+ * test/cgi/test_cgi_tag_helper.rb: add a test.
-Sat Jun 9 23:57:03 2012 Tanaka Akira <akr@fsij.org>
+Sun Sep 28 23:08:38 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
- * process.c (rb_fork_err): rewrite a complex "if" statement.
+ * lib/cgi/html.rb (CGI::HtmlExtension::popup_menu):
+ fix the calls #bytesize on array parameters. [ruby-core:18919]
-Sat Jun 9 23:44:29 2012 Tanaka Akira <akr@fsij.org>
+Sun Sep 28 22:44:26 2008 Takeyuki Fujioka <xibbar@ruby-lang.org>
- * process.c (before_exec_async_signal_safe): extracted from
- before_exec.
- (before_exec_non_async_signal_safe): ditto.
- (before_exec): call before_exec_async_signal_safe and
- before_exec_non_async_signal_safe.
- (rb_exec_async_signal_safe): call before_exec_async_signal_safe.
- (rb_exec_err): call before_exec_non_async_signal_safe instead of
- before_exec.
+ * lib/cgi/core.rb (CGI::parse): ignore illegal query params.
+ [ruby-dev:36618]
-Sat Jun 9 23:36:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Sep 28 22:05:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * iseq.c (iseq_load, insn_operand_intern, rb_iseq_disasm)
- (rb_iseq_parameters): use rb_id2str() instead of rb_id2name() to
- keep encoding.
+ * compile.c (iseq_set_sequence): check duplicated when clause.
+ [ruby-dev:36616]
- * string.c (rb_str_symname_p): new function that checks if the string
- is valid as a symbol name. split from sym_inspect().
+Sun Sep 28 19:04:03 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Jun 9 22:27:05 2012 Tanaka Akira <akr@fsij.org>
+ * test/date/*.rb: imported a date test suite ruby 1.9 limited ed.
- * process.c (retry_fork): rewrite a complex "for" statement by
- simple statements.
+Sun Sep 28 18:40:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 9 21:50:04 2012 Tanaka Akira <akr@fsij.org>
+ * lib/mini/test.rb (MINI_DIR): loaded path is expanded.
- * process.c (retry_fork): extracted from rb_fork_err.
- (send_child_error): ditto.
- (recv_child_error): ditto.
+ * lib/mini/test.rb (assert_match): get rid of confusion of
+ ruby-mode.el.
-Sat Jun 9 17:21:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Sep 28 12:36:09 2008 Koichi Sasada <ko1@atdot.net>
- * iseq.c (iseq_load): type is a symbol, and invalid as ID in common.
+ * vm_exec.c (vm_exec_core): add an UNLIKELY() hint.
-Sat Jun 9 10:57:14 2012 Tanaka Akira <akr@fsij.org>
+ * vm_insnhelper.h (BASIC_OP_UNREDEFINED_P): add a LIKELY() hint.
- * process.c (rb_exec_async_signal_safe): extracted from rb_exec_err.
+Sun Sep 28 12:04:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 9 09:31:07 2012 Tanaka Akira <akr@fsij.org>
+ * string.c (str_new): sets empty string to coderange 7bit.
+ [ruby-core:18993]
- * process.c: simplified because close_others option is always
- enabled by default.
- (rb_f_exec): don't need to set the option.
- (rb_exec_arg_prepare): don't need to set the option. don't need
- default_close_others argument.
- (rb_spawn_internal): don't need to give default_close_others
- argument for rb_exec_arg_prepare. don't need default_close_others
- argument.
- (rb_spawn_err): don't need to give default_close_others
- argument for rb_spawn_internal.
- (rb_spawn): don't need to give default_close_others
- argument for rb_spawn_internal.
- (rb_f_system): don't need to give default_close_others argument for
- rb_spawn_internal.
- (rb_f_spawn): don't need to give default_close_others argument for
- rb_exec_arg_prepare.
+Sun Sep 28 09:39:48 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Jun 9 09:00:58 2012 Tanaka Akira <akr@fsij.org>
+ * lib/mathn.rb ({Fixnum,Bignum,Float}#**): may produce complex
+ value.
- * process.c (rb_proc_exec): call before_exec() here addition to
- rb_exec_err.
+Sun Sep 28 09:05:53 2008 James Edward Gray II <jeg2@ruby-lang.org>
-Sat Jun 9 08:30:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/csv/csv.rb: Worked around some minor encoding changes in Ruby
+ pointed out by Nobu.
- * thread_pthread.c (ruby_init_stack): use stack info if possible.
+Sun Sep 28 08:37:12 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Jun 9 08:21:32 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/mathn.rb: a hack to provide canonicalization. This must be
+ temporary, but this seems to be not bad for the time being.
- * README.EXT (prepare extconf.rb): Added note to see MakeMakefile for
- documentation of extconf.rb functions. Patch by Zachary Scott.
- [ruby-trunk - Feature #6522]
- * README.EXT (Appendix C): Removed in favor of MakeMakefile.
- Patch by Zachary Scott.
- * lib/mkmf.rb: Merged documentation from README.EXT Appendix C. Patch
- by Zachary Scott.
+Sat Sep 27 06:22:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 9 08:16:47 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/rake.rb (Module#rake_extension, String#ext, String#pathmap): use
+ built-in methods.
- * doc/re.rdoc: Completed wording in the description of the =~ operator.
- [ruby-trunk - Bug #6529]
+ * lib/rake.rb (String#pathmap): fixed typo in rdoc.
-Sat Jun 9 08:09:38 2012 Eric Hodel <drbrain@segment7.net>
+Sat Sep 27 04:28:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_start_with): Removed "p" from start_with? examples
- to match other String method examples. [ruby-trunk - Bug #6553]
- * string.c (rb_str_end_with): Updated end_with? to use code markup
- instead of italic.
+ * file.c (rmext): preceding dots are not a part of extension.
-Sat Jun 9 07:56:03 2012 Eric Hodel <drbrain@segment7.net>
+ * file.c (rb_file_s_extname): ditto.
- * lib/benchmark.rb: Updated formatting of Benchmark documentation for
- consistency. [ruby-trunk - Bug #6533]
+Sat Sep 27 03:15:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 9 07:46:26 2012 Eric Hodel <drbrain@segment7.net>
+ * vm.c (vm_jump_tag_but_local_jump): exc is not used if val is nil.
- * lib/delegate.rb: Added documentation for Delegator#!. Patch by
- Zachary Scott. [ruby-trunk - Feature #6534]
+Sat Sep 27 03:12:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 9 07:39:50 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/socket.c (host_str): numeric address should be unsigned.
+ [ruby-core:18971]
- * lib/net/http/responses.rb: Add RFC 6585 response codes. Patch by
- Sangil Jung. [ruby-trunk - Feature #6480]
- * lib/net/http/response.rb: ditto
- * lib/net/http.rb: ditto
- * lib/webrick/httpstatus.rb: ditto
+Fri Sep 26 22:46:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 9 01:24:28 2012 Tanaka Akira <akr@fsij.org>
+ * parse.y (primary, brace_block): fix for line number.
- * process.c (rb_exec_err): before_exec() call moved from proc_exec_cmd
- and proc_exec_sh.
- (rb_proc_exec): ditto.
+ * proc.c (rb_proc_location, rb_method_location): new methods
+ {Proc,Method,UnboundMethod}#source_location. [ruby-core:18452]
-Sat Jun 9 01:11:07 2012 Tanaka Akira <akr@fsij.org>
+Fri Sep 26 21:36:33 2008 Koichi Sasada <ko1@atdot.net>
- * include/ruby/intern.h (rb_exec_arg_init): declaration changed to
- return a value.
+ * vm_core.h (RUBY_VM_CHECK_INTS_TH): add an UNLIKELY hint.
- * process.c (rb_exec_arg_init): return a value.
+Fri Sep 26 19:33:36 2008 Tanaka Akira <akr@fsij.org>
-Fri Jun 8 23:44:14 2012 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.
- * process.c: don't check the availability of FD_CLOEXEC. It should
- be available if fork() is available.
+ * transcode.c: follow the renaming.
* io.c: ditto.
-Fri Jun 8 22:39:32 2012 Tanaka Akira <akr@fsij.org>
+Fri Sep 26 19:01:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (rb_fork_err): revert r35955. The condition needs !chfunc
- to close ep[0] and ep[1]. The catched exception is re-raised
- immediately after that if status is not NULL.
+ * test/bigdecimal/test_bigdecimal.rb (test_inspect): fixed CPU bit
+ size dependent test. pointed out by TAKANO Mitsuhiro <takano32 AT
+ jus.or.jp>.
-Fri Jun 8 19:43:33 2012 Tanaka Akira <akr@fsij.org>
+Fri Sep 26 18:57:33 2008 Akinori MUSHA <knu@iDaemons.org>
- * process.c (rb_exec_err): after_exec() call moved from proc_exec_cmd
- and proc_exec_sh.
- (rb_proc_exec): ditto.
+ * test/pathname/test_pathname.rb: Fix use of deprecated methods.
-Fri Jun 8 19:00:59 2012 Tanaka Akira <akr@fsij.org>
+Fri Sep 26 18:39:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * process.c (ARGV_COUNT): unused macro removed.
- (ARGV_SIZE): ditto.
- (ALLOC_ARGV): ditto.
- (ALLOC_ARGV_WITH_STR): ditto.
+ * common.mk (dist): nothing is needed to run BASERUBY.
-Fri Jun 8 16:19:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * tool/make-snapshot: new option -archname.
- * test/runner.rb (src_testdir): expand real path so that
- TestGem#test_self_find_files does not fail by aliased load path when
- srcdir contains a symbolic link.
+Fri Sep 26 18:24:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * tool/runruby.rb (srcdir): ditto.
+ * misc/ruby-mode.el: safe customizable variables.
-Fri Jun 8 12:04:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Sep 26 17:37:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * process.c (rb_fork_err): error state in the child process is prior
- to exceptions in proc_syswait().
+ * include/ruby/ruby.h (rb_mPrecision): removed.
+ Precision module was temporarily removed at r19430.
- * process.c (rb_fork_err): determine status on errors.
+Fri Sep 26 17:25:10 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * ext/pty/pty.c (establishShell): reraise exception if something
- raised during sleep.
+ * common.mk (dist): Changed its dependencies and action.
- * ext/pty/pty.c (establishShell): now needs status to protect from
- exceptions in rb_fork_err().
+Fri Sep 26 17:07:04 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Thu Jun 7 22:13:05 2012 Tanaka Akira <akr@fsij.org>
+ * error.c (Init_syserr): moved to the template.
+ (errno_missing): removed. fixed [ruby-dev:35958].
- * process.c (rb_fork_err): Fix the condition to use rb_protect.
+ * defs/known_errors.def: added. extracted from Init_syserr.
-Thu Jun 7 20:29:12 2012 Tanaka Akira <akr@fsij.org>
+ * templates/known_errors.inc.tmpl: added. Template for Init_syserr.
+ c.f. [ruby-dev:35958].
- * include/ruby/intern.h: rb_exec_arg and related stuff moved back from
- internal.h
+ * tools/generic_erb.rb: added. general purpose mapper which maps
+ data+template into source code.
-Thu Jun 7 15:53:03 2012 Koichi Sasada <ko1@atdot.net>
+ * common.mk (error.$(OBJEXT), incs, known_errors.inc):
+ Fixed dependencies.
- * .gdbinit: add function `trace_machine_instructions' to trace
- in native machine assemble.
- See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
- for more details.
+Fri Sep 26 17:02:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jun 6 21:31:21 2012 Tanaka Akira <akr@fsij.org>
+ * thread.c (thlist_signal): clears the woken thread if nothing woke.
- * process.c (proc_exec_cmd) renamed from proc_exec_v.
- (proc_exec_sh): renamed from rb_proc_exec_e.
- (proc_spawn_cmd_internal): renamed from proc_spawn_v.
- (proc_spawn_cmd): renamed from proc_spawn_n.
- (proc_spawn_sh): renamed from proc_spawn.
+ * thread.c (rb_barrier_wait): achieves the lock if no thread was
+ waiting yet.
-Wed Jun 6 21:18:47 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Sep 26 12:04:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (try_with_sh): please take care of the macro defined by
- you.
+ * ext/curses/curses.c: should include <ruby/io.h>.
-Wed Jun 6 20:45:08 2012 Tanaka Akira <akr@fsij.org>
+ * ext/io/wait/wait.c: ditto.
- * process.c (proc_exec_v): don't call dln_find_exe_r here because it
- is not async-signal-safe and proc_exec_v is called in a child
- process.
- command_abspath field of rb_exec_arg.
- (rb_exec_fillarg): call dln_find_exe_r and set command_abspath.
- (rb_exec_err): Give the absolute path of the invoking command for
- proc_exec_v, instead of the command name.
+ * ext/openssl/ossl.h: ditto.
- * internal.h: add command_abspath field for rb_exec_arg.
+Fri Sep 26 11:34:08 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jun 6 20:08:01 2012 Tanaka Akira <akr@fsij.org>
+ * variable.c (rb_define_hooked_variable): cast to get rid of compiler
+ warnings.
- * process.c (try_with_sh): take envp argument.
- (exec_with_sh): ditto. use it for execve.
- (proc_exec_v): provide envp for try_with_sh.
+Fri Sep 26 11:05:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Jun 6 13:25:04 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * transcode.c, include/ruby/encoding.c (rb_transcode_convertible):
+ new function. checking the existence of converter.
- * win32/win32.c, include/ruby/win32.h (rb_w32_wrap_io_handle): new API.
- this API wraps an I/O handle (HANDLE or SOCKET) and returns fd.
- the second parameter should be combination of O_*, for example,
- O_RDWR | O_BINARY | O_NOINHERIT.
+Fri Sep 26 10:35:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/win32.c, include/ruby/win32.h (rb_w32_unwrap_io_handle): new
- API. this API unwraps an I/O handle and close the fd (not closes
- the handle itself).
+ * variable.c (global_variable, struct trace_var): made function
+ members more strict.
- [Feature #4906] [ruby-core:37227]
+Fri Sep 26 09:55:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jun 6 13:18:26 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby{io,sig}.h: moved to include/ruby/backward.
- * win32/win32.c (rb_w32_close): of course, console handle is not socket.
+Fri Sep 26 09:47:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jun 6 12:37:43 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/rubysig.h: old macros for backward compatibility.
- * process.c (rb_run_exec_options_err): allocate a temporary buffer for
- run_exec_dup2() for restoring fds on non-fork environments.
+ * thread.c (BLOCKING_REGION): rewritten using helper functions.
-Wed Jun 6 09:45:21 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Sep 26 03:03:32 2008 Tanaka Akira <akr@fsij.org>
- * test/dl/test_c_{struct_entry,union_entity}.rb: sorry, typos.
+ * vm_eval.c (Init_vm_eval): define module_eval, class_eval and eval
+ here for rdoc.
-Wed Jun 6 05:27:54 2012 Tanaka Akira <akr@fsij.org>
+Fri Sep 26 00:40:30 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * process.c (rb_exec_fillarg): check use_shell field before accessing
- a union field.
+ * range.c (range_inspect): fix SEGV for cyclic range object.
+ [ruby-core:18835]
-Wed Jun 6 04:58:44 2012 Tanaka Akira <akr@fsij.org>
+Thu Sep 25 23:59:56 2008 Tanaka Akira <akr@fsij.org>
- * process.c (rb_spawn_process): prog variable is not used for Unix.
+ * common.mk: dependency updated.
-Wed Jun 6 00:20:37 2012 Tanaka Akira <akr@fsij.org>
+Thu Sep 25 21:46:48 2008 Tanaka Akira <akr@fsij.org>
- * internal.h (rb_exec_arg_init): change return type to void.
+ * transcode.c (rb_eUndefinedConversionError): renamed from
+ rb_eConversionUndefinedError.
+ (rb_eConverterNotFoundError): renamed from rb_eNoConverterError.
- * process.c (rb_exec_arg_init): don't return a value.
- (rb_exec_arg_prepare): ditto.
- (rb_spawn_process): don't take the prog argument. extract the
- information from earg.
- (rb_spawn_internal): follow rb_spawn_process change.
- (rb_f_spawn): ditto.
+Thu Sep 25 21:23:08 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * io.c (pipe_open): don't take the prog argument. extract the
- information from eargp.
- (pipe_open_v): follow pipe_open change.
- (pipe_open_s): ditto.
+ * 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).
-Tue Jun 5 23:51:33 2012 Tanaka Akira <akr@fsij.org>
+ * 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.
- * internal.h (rb_exec_arg): use union to represent command invocation
- with/without shell.
+ * test_pack.c, test/base64/test_base64.rb: add tests for above.
- * process.c: follow the rb_exec_arg change.
+Thu Sep 25 21:00:32 2008 Koichi Sasada <ko1@atdot.net>
- * io.c (pipe_open): ditto.
+ * 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.
-Tue Jun 5 22:28:46 2012 Tanaka Akira <akr@fsij.org>
+ * lib/mathn.rb: requires 'cmath' directly.
- * internal.h: rb_exec_arg and related stuff moved from intern.h
+Fri Sep 19 20:48:06 2008 Yuki Sonoda <yugui@yugui.jp>
- * include/ruby/intern.h (rb_proc_exec_n): removed.
+ * prec.c: removed. Precision will be redesigned and be back again.
+ c.f. [ruby-dev:36352].
-Tue Jun 5 21:57:22 2012 Tanaka Akira <akr@fsij.org>
+ * common.mk (COMMON_OBJS): removed prec.o.
- * process.c (rb_exec_arg_fixup): allocate a temporary buffer for
- run_exec_dup2 here because it should be async-signal-safe.
- (run_exec_dup2): use the temporary buffer.
- (run_exec_dup2_tmpbuf_size): new function.
+ * inits.c (rb_call_inits): removed Init_Precision.
- * include/ruby/intern.h (rb_exec_arg): add dup2_tmpbuf field.
+ * numeric.c (Init_Numeric): removed inclusion of Precision.
+ removed #induced_from from each class.
-Tue Jun 5 20:13:15 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * object.c (rb_obj_init_copy): should check if trusted too.
+ * hash.c (rb_any_cmp): removed an unused variable.
-Tue Jun 5 19:59:13 2012 Tanaka Akira <akr@fsij.org>
+Mon Sep 15 11:11:04 2008 Tanaka Akira <akr@fsij.org>
- * process.c (strtok): declaration removed because it is not used.
+ * transcode_data.h (rb_transcoder): resetsize_func and resetstate_func
+ also returns ssize_t.
-Tue Jun 5 19:33:51 2012 Tanaka Akira <akr@fsij.org>
+ * enc/trans/iso2022.trans: follow the type change.
- * process.c (proc_spawn): don't detect simple command line here
- because rb_exec_fillarg already did.
+Mon Sep 15 10:28:10 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-Tue Jun 5 19:21:10 2012 Tanaka Akira <akr@fsij.org>
+ * test/matrix/test_matrix.rb (setup): typo.
+ (test_equality): misdefinition of the expected working.
+ Reported by an anonymous user.
+ (test_hash): added.
- * process.c (rb_exec_fillarg): bail out a loop eagerly.
+ * test/matrix/test_vector.rb: ditto.
-Tue Jun 5 19:15:14 2012 Tanaka Akira <akr@fsij.org>
+Mon Sep 15 03:33:10 2008 Tanaka Akira <akr@fsij.org>
- * process.c: add comments about async-signal-safe.
+ * 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.
-Tue Jun 5 09:25:10 2012 Eric Hodel <drbrain@segment7.net>
+ * regexec.c: ditto.
- * io.c: Edited documentation for IO and File open and new and
- Kernel#open for consistency and clarity.
+ * enc/euc_jp.c: ditto.
-Mon Jun 4 21:53:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enc/cp949.c: ditto.
- * win32/win32.c (rb_w32_sysinit): let the system not display the
- critical-error-handler message box and the Windows Error Reporting
- dialog. [ruby-core:45389] [Bug #6535]
+ * enc/shift_jis.c: ditto.
-Mon Jun 4 19:36:25 2012 Tanaka Akira <akr@fsij.org>
+ * enc/gbk.c: ditto.
- * process.c (rb_exec_fillarg): allocate one more element before
- beginning in argv_str for try_with_sh.
+ * enc/big5.c: ditto.
- * internal.h (ARGVSTR2ARGC): adjust for the above change.
- (ARGVSTR2ARGV): ditto.
+ * enc/euc_tw.c: ditto.
-Mon Jun 4 19:17:06 2012 Tanaka Akira <akr@fsij.org>
+ * enc/euc_kr.c: ditto.
- * internal.h (ARGVSTR2ARGC): defined.
- (ARGVSTR2ARGV): defined.
+ * enc/emacs_mule.c: ditto.
- * process.c (proc_exec_v): use ARGVSTR2ARGV.
- (rb_spawn_process): use ARGVSTR2ARGC and ARGVSTR2ARGV.
+ * enc/gb18030.c: ditto.
- * io.c (pipe_open): use ARGVSTR2ARGV.
+ * enc/utf_8.c: ditto.
-Mon Jun 4 16:13:00 2012 Koichi Sasada <ko1@atdot.net>
+ * enc/utf_16le.c: ditto.
- * vm_insnhelper.h: remove magical code "lfp[0] & 0x02".
- Current VM doesn't use this bit.
+ * enc/utf_16be.c: ditto.
- * vm_core.h (RUBY_VM_GET_BLOCK_PTR): added.
+ * enc/utf_32le.c: ditto.
- * eval.c (rb_block_given_p): use RUBY_VM_GET_BLOCK_PTR().
+ * enc/utf_32be.c: ditto.
- * vm_eval.c (rb_f_block_given_p): ditto.
+Sun Sep 14 03:43:27 2008 Tanaka Akira <akr@fsij.org>
-Mon Jun 4 15:39:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/oniguruma.h (ONIGENC_STEP_BACK): add end argument.
+ (onigenc_step_back): ditto.
- * win32/win32.c (constat_apply): apply VT100 functions.
- [ruby-core:44958] [Feature #6418]
+ * regenc.c (onigenc_step_back): add end argument.
- * win32/win32.c (constat_parse): parse some VT100 escape sequence.
+ * regexec.c: follow the interface change.
-Mon Jun 4 14:06:12 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Sep 14 03:20:03 2008 Tanaka Akira <akr@fsij.org>
- * process.c (rb_exec_err): should preserve errno.
+ * include/ruby/oniguruma.h (onigenc_get_prev_char_head): add end
+ argument.
-Mon Jun 4 13:10:11 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby/encoding.h (rb_enc_prev_char): ditto.
- * test/dl/test_c_{struct_entry,union_entity}.rb: broken require.
+ * regenc.c (onigenc_get_prev_char_head): add end argument.
-Mon Jun 4 12:01:21 2012 Koichi Sasada <ko1@atdot.net>
+ * regparse.c: follow the interface change.
- * test/ruby/test_backtrace.rb: fix test.
- Windows path includes `:' character.
+ * regexec.c: ditto.
-Mon Jun 4 11:42:39 2012 Koichi Sasada <ko1@atdot.net>
+ * string.c: ditto.
- * vm_core.h (rb_location_t): fix type and field name.
- (1) rename rb_location_t to rb_iseq_location_t.
- (2) rename field names of rb_iseq_location_t to adjust
- RubyVM::Backtrace::Location methods.
- (2-1) filename -> path
- (2-2) filepath -> absolute_path
- (2-3) basename -> base_label
- (2-4) name -> label
- (3) rename filed name rb_iseq_location_t#line_no to
- rb_iseq_location_t#first_lineno to clear purpose of this field.
- (4) The field names rb_binding_t#(filename|line_no) are also renamed
- to rb_binding_t#(path|first_lineno).
+ * parse.y: ditto.
- * compile.c: apply above changes.
+Sun Sep 14 02:04:28 2008 Tanaka Akira <akr@fsij.org>
- * iseq.c: ditto.
+ * include/ruby/oniguruma.h
+ (onigenc_get_right_adjust_char_head_with_prev): add end argument.
- * proc.c: ditto.
+ * regenc.c (onigenc_get_right_adjust_char_head_with_prev): use end
+ argument.
- * vm*.c: ditto.
+ * regexec.c (forward_search_range): follow the interface change.
-Mon Jun 4 11:40:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Sep 14 01:38:26 2008 Tanaka Akira <akr@fsij.org>
- * marshal.c (r_object0): also load TYPE_USRMARSHAL, TYPE_DATA using
- compatible loader.
+ * include/ruby/oniguruma.h (onigenc_get_right_adjust_char_head): add
+ end argument.
-Mon Jun 4 11:33:42 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby/encoding.h (rb_enc_right_char_head): add end argument.
- * process.c (rb_run_exec_options_err): restore save_env() call for
- non-fork environments.
+ * regenc.c (onigenc_get_right_adjust_char_head): use end argument.
- * process.c (rb_exec_err): restore environments after the failure of
- exec to fix [ruby-core:44093] [Bug #6249] on non-fork environments
+ * re.c (rb_reg_adjust_startpos): follow the interface change.
-Mon Jun 4 10:42:04 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * string.c (rb_str_index): ditto.
- * io.c (pipe_open): follow up changes in r35889.
+ * regexec.c (backward_search_range): ditto.
+ (onig_search): ditto.
- * process.c (proc_spawn_n): now uses char ** instead of VALUE *.
+Sun Sep 14 00:43:28 2008 Tanaka Akira <akr@fsij.org>
- * process.c (rb_spawn_process): prog is now VALUE of String, not char *.
+ * ext/ripper/depend (ripper.o): it depends on ruby headers.
-Mon Jun 4 06:12:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Sep 13 19:27:01 2008 Tanaka Akira <akr@fsij.org>
- * marshal.c (r_object0): remove old warning for _alloc.
+ * io.c (io_encoding_set): don't need argc argument.
+ (rb_io_s_pipe): update io_encoding_set call.
+ (rb_io_set_encoding): ditto.
-Mon Jun 4 04:24:06 2012 Tadayoshi Funaba <tadf@dotrb.org>
+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.
- * marshal.c: experimental test aborted.
- * complex.c: ditto.
* rational.c: ditto.
- * include/ruby/intern.h: ditto.
-Mon Jun 4 00:45:18 2012 Tanaka Akira <akr@fsij.org>
+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.
- * process.c (rb_spawn_process): fix for Windows. not tested.
+Tue Sep 9 03:59:13 2008 Tanaka Akira <akr@fsij.org>
-Mon Jun 4 00:11:51 2012 Tanaka Akira <akr@fsij.org>
+ * io.c (make_writeconv): useless branch removed.
- * process.c (rb_proc_exec_e): don't use ISSPACE(). \f, \r and \v
- are not word separator in Bourne shell.
+Tue Sep 9 02:18:20 2008 Tanaka Akira <akr@fsij.org>
-Sun Jun 3 23:47:30 2012 Tanaka Akira <akr@fsij.org>
+ * include/ruby/encoding.h (rb_econv_decorate_at_first): declared.
+ (rb_econv_decorate_at_last): declared.
- * include/ruby/intern.h (rb_exec_arg): remove argc and argv fields.
- add use_shell, argv_str and argv_buf fields.
+ * 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.
- * process.c (rb_proc_exec_e): don't split shell command line arguments
- here to avoid memory allocation in a child process.
- (rb_exec_fillarg): split shell command line arguments here.
- (proc_exec_v): takes argv_str argument instead of argv.
- (rb_proc_exec_ne): removed.
- (rb_proc_exec_n): removed.
- (rb_run_exec_options_err): don't initialize the removed fields.
- (rb_exec_err): don't initialize the removed fields.
- call proc_exec_v directly instead of rb_proc_exec_ne.
- (rb_spawn_process): use use_shell field.
+Tue Sep 9 01:10:54 2008 Tanaka Akira <akr@fsij.org>
-Sun Jun 3 21:53:00 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * transcode.c (rb_econv_open): make ec a local variable.
- * GPL: update text of GPLv2. [ruby-core:44488] [Bug #6328]
- http://www.gnu.org/licenses/gpl-2.0.txt
+Tue Sep 9 00:20:10 2008 Tanaka Akira <akr@fsij.org>
-Sun Jun 3 21:22:52 2012 Tanaka Akira <akr@fsij.org>
+ * transcode.c (rb_econv_asciicompat_encoding): check decoder.
- * process.c (rb_exec_getargs): remove rb_exec_arg argument.
+Tue Sep 9 00:00:47 2008 Tanaka Akira <akr@fsij.org>
-Sun Jun 3 21:14:26 2012 Tadayoshi Funaba <tadf@dotrb.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.
- * marshal.c: calls directly rb_{Complex,Rational}_marshal_load().
- But now disabled. [experimental]
- * complex.c: followed the above.
* 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.
-Sun Jun 3 21:18:17 2012 Tanaka Akira <akr@fsij.org>
+ * regint.h: use rb_thread_check_ints() instead of
+ RUBY_CHECK_INTS() directly.
- * process.c (rb_check_argv): use rb_str_new_frozen instead of
- rb_str_new4.
+Wed Aug 13 17:01:36 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Jun 3 20:10:52 2012 Tanaka Akira <akr@fsij.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.
- * process.c (rb_proc_exec_e): extended version of rb_proc_exec() to
- call execle().
- (rb_proc_exec): use rb_proc_exec_e().
- (rb_exec_err): use rb_proc_exec_e().
+ * lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use
+ enum_for instead of hardcoding Enumerable::Enumerator.
-Sun Jun 3 19:47:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Aug 13 16:40:57 2008 Koichi Sasada <ko1@atdot.net>
- * thread.c (vm_living_thread_num): suppress a warning.
+ * 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]
-Sun Jun 3 17:23:52 2012 Tanaka Akira <akr@fsij.org>
+ * thread_pthread.c, thread_win32.c: ditto.
- * use execve() to preserve environment variables when exec method is
- failed. [ruby-core:44093] [ruby-trunk - Bug #6249]
+ * test/ruby/test_thread.rb: fix test parameter.
- * include/ruby/intern.h (rb_exec_arg): add envp_str and envp_buf field
- to store envp of execve().
+Wed Aug 13 16:02:14 2008 Shugo Maeda <shugo@ruby-lang.org>
- * process.c (proc_exec_v): takes envp_str as an argument and use it
- for execve().
- (rb_proc_exec_ne): extended version of rb_proc_exec_n().
- (rb_proc_exec_n): use rb_proc_exec_ne().
- (rb_proc_exec): follow proc_exec_v() change.
- (fill_envp_buf_i): new function.
- (rb_exec_arg_fixup): set up envp_str and envp_buf.
- (save_env_i): removed.
- (save_env): removed.
- (rb_run_exec_options_err): don't modify environment variables.
- (rb_exec_err): use rb_proc_exec_ne().
+ * object.c (rb_obj_untrusted): new method Object#untrusted?.
+ (rb_obj_untrust): new method Object#untrust.
+ (rb_obj_trust): new method Object#trust.
-Sun Jun 3 16:33:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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?.
- * marshal.c: revert r35879 "now marshal_{load|dump} are external."
+ * 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?.
- * complex.c (nucomp_marshal__{dump,load}): should use rb_marshal_{dump,load}.
+Wed Aug 13 16:13:58 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * rational.c (nurat_marshal__{dump,load}): ditto.
+ * test/ruby/test_m17n.rb: follow EncodingCompatibilityError.
-Sun Jun 3 14:13:58 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/ruby/test_mixed_unicode_escapes.rb: ditto.
- * ext/date/date_core.c: checks whether the object is frozen or not.
+ * test/ruby/enc/test_utf16.rb: ditto.
-Sun Jun 3 14:00:51 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Aug 13 16:05:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * complex.c: wrote Complex#_dump and Complex::load. But now
- disabled (due to compatibility) [experimental].
+ * time.c (time_cmp): retry with right hand operand if its not a
+ time object. [ruby-dev:35011]
- * rational.c: wrote Rational#_dump and Rational::load. ditto.
+Wed Aug 13 15:51:22 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Jun 3 10:23:32 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * string.c: Apply a temporary fix to fix build on OS X. A real
+ fix will follow later.
- * complex.c (nucomp_marshal_load): [ruby-core:45394]
- * rational.c (nurat_marshal_load): ditto.
+Wed Aug 13 15:25:09 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Jun 3 03:15:46 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to
+ just Enumerator.
- * regparse.c (onig_number_of_names): suppress a warning.
+Wed Aug 13 15:13:57 2008 Akinori MUSHA <knu@iDaemons.org>
-Sun Jun 3 01:36:52 2012 Koichi Sasada <ko1@atdot.net>
+ * common.mk (prelude.c, golf_prelude.c): Using $(COMPILE_PRELUDE)
+ requires $(RBCONFIG).
- * vm_backtrace.c: change names.
- (1) Class name: RubyVM::FrameInfo -> RubyVM::Backtrace::Location.
- (2) Method name: RubyVM::FrameInfo.caller ->
- Kernel.caller_locations.
- (3) Instance methods of
- RubyVM::FrameInfo (RubyVM::Backtrace::Location)
- (3-1) name -> label
- (3-2) basename -> base_label (basename is confusing with
- File.basename)
- (3-3) line_no -> lineno (We have already similar name
- File#lineno, commented by kou [ruby-dev:45686]).
- (3-4) filename -> path.
- (3-5) filepath -> absolute_path.
- (3-5) iseq -> removed (we will make other APIs to access iseq
- and other information of frame for debugging).
+Wed Aug 13 15:08:04 2008 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_backtrace.rb: apply above changes.
- And apply comment from kou [ruby-dev:45686].
+ * transcode.c (econv_init): make flags argument optional.
+ (econv_primitive_convert): ditto.
-Sun Jun 3 00:49:11 2012 Koichi Sasada <ko1@atdot.net>
+Wed Aug 13 14:55:27 2008 Akinori MUSHA <knu@iDaemons.org>
- * common.mk: fix to build vm_backtrace.c only itself (vm_backtrace.c
- is no longer included from vm.c). I hope this separation reduce
- compile time of vm.c.
+ * common.mk (realclean-local): Remove parse.h as well.
- * internal.h: ditto.
+ * common.mk: Add missing dependencies regarding vm_core.h, id.h,
+ parse.c (parse.h), etc..
- * vm.c, vm_core.h, vm_dump.c, vm_eval.c: ditto.
+Wed Aug 13 14:45:37 2008 Tanaka Akira <akr@fsij.org>
- * vm_eval.c: some functions (callee, etc) moved to vm_backtrace.c.
+ * enc/trans/newline.trans (rb_crlf_newline): new transcoder.
+ (rb_cr_newline): new transcoder.
-Sun Jun 3 00:20:53 2012 Koichi Sasada <ko1@atdot.net>
+ * 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.
- * vm_backtrace.c: added. Separate backtrace related functions to
- this file.
+Wed Aug 13 14:22:16 2008 Tanaka Akira <akr@fsij.org>
- * vm.c, common.mk: ditto.
+ * enc/trans/newline.trans: new file.
-Sat Jun 2 18:09:02 2012 Akinori MUSHA <knu@iDaemons.org>
+ * transcode_data.h (rb_trans_t): add last_tc field.
- * lib/ipaddr.rb: Inhibit zero-filled octets in an IPv4 address in
- all platforms. [ruby-dev:45671]
+ * 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.
- * lib/ipaddr.rb: Allow the x:x:x:x:x:x:d.d.d.d form not limited to
- IPv4 mapped/compatible addresses. This change also makes it
- possible for the parser to understand IPv4 mapped and compatible
- IPv6 addresses in non-compressed form.
+Wed Aug 13 14:00:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/ipaddr.rb: Stop exposing IPSocket.valid*? methods which were
- only usable on non-IPv6-ready platforms.
+ * common.mk (parse.c): generates parse.h together.
-Sat Jun 2 16:59:00 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * id.c, id.h: use constants for parser tokens.
- * string.c (rb_enc_cr_str_buf_cat): don't reset coderange as unknown.
- the condition 'ptr_a8 && str_cr != ENC_CODERANGE_7BIT' means not
- unknown, str is also ASCII-8BIT because str_encindex == ptr_encindex,
- and nont (str_cr == ENC_CODERANGE_UNKNOWN) and
- str_cr != ENC_CODERANGE_7BIT means str_cr is valid because ASCII-8BIT
- can't be broken. [ruby-dev:45688] [Bug #6509]
+Wed Aug 13 13:47:05 2008 Koichi Sasada <ko1@atdot.net>
-Sat Jun 2 07:04:48 2012 Eric Hodel <drbrain@segment7.net>
+ * vm.c: rewind cfp to show proper backtrace.
+ [ruby-dev:35820]
- * doc/re.rdoc (Performance): Replaced incorrect example of reducing
- backtracking through anchoring with reduced backtracking through a
- range. [ruby-trunk - Bug #6525]
+Wed Aug 13 13:09:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jun 2 06:34:15 2012 Eric Hodel <drbrain@segment7.net>
+ * tool/make-snapshot: fix for clean up.
- * doc/re.rdoc (Performance): Removed useless sample output from final
- performance example and switched from #match to #=~ for consistency.
- [ruby-trunk - Bug #6524]
+Wed Aug 13 11:45:51 2008 Akinori MUSHA <knu@iDaemons.org>
-Fri Jun 1 09:30:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_core.h: Declare rb_iseq_clone, which is used in class.c.
- * object.c (class_or_module_required): extract check for class or
- module.
+Wed Aug 13 11:39:19 2008 Tanaka Akira <akr@fsij.org>
-Fri Jun 1 08:50:47 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * array.c: Updated Array documentation formatting. Patch by Zachary
- Scott. [ruby-trunk - Feature #6517]
+Wed Aug 13 10:45:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jun 1 06:57:10 2012 Eric Hodel <drbrain@segment7.net>
+ * tool/make-snapshot: try to find exported directory.
- * ext/dl/lib/dl/struct.rb (DL::CStructEntity#set_ctypes): Refactored
- #set_ctypes using newer ruby features to simplify its implementation.
- * test/dl/test_c_struct_entry.rb (class DL): Test to verify
- refactoring.
+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 Jun 1 06:40:25 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 25 20:43:57 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * object.c (Init_Object): Restored Kernel documentation based on
- Pickaxe book documentation. Patch by Zachary Scott.
- [ruby-trunk - Feature #6521]
+ * ext/win32ole/win32ole.c (Init_win32ole): add
+ WIN32OLE_EVENT#off_event.
-Fri Jun 1 06:29:42 2012 Eric Hodel <drbrain@segment7.net>
+ * test/win32ole/test_win32ole_event.rb: ditto.
- * object.c (rb_equal): Let Object be a link in #=== documentation.
- Patch by Zachary Scott. [ruby-trunk - Feature #6518]
+ * test/win32ole/test_win32ole_event.rb: some refactoring.
-Thu May 31 09:27:06 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 25 19:50:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dl/lib/dl/struct.rb (DL::CStructEntity::size): Refactored ::size
- to remove unused variables and simplify using newer ruby features.
- * test/dl/test_c_struct_entry.rb: Test to validate refactoring
+ * regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
-Thu May 31 08:40:34 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 25 15:52:40 2008 Koichi Sasada <ko1@atdot.net>
- * ext/dl/lib/dl/struct.rb (DL::CUnionEntity#set_ctypes): Refactored
- #set_types to reuse DL::CUnionEntity::size
- * test/dl/test_c_union_entity.rb: Added test
+ * vm.c (vm_invoke_proc): skip setting safe_level if
+ it from bmethod. This change makes test/ruby/test_proc.rb pass.
-Thu May 31 08:20:14 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 25 10:00:00 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
- * ext/dl/lib/dl/struct.rb (DL::CUnionEntity::size): Fixed ::size to
- return the size of the union.
- * test/dl/test_c_union_entity.rb: Test for DL::CUnionEntity::size
+ * test/ruby/test_transcode.rb: refactoring/cleanup of
+ test_iso_2022_jp(_1)
-Thu May 31 07:45:43 2012 Eric Hodel <drbrain@segment7.net>
+Fri Jul 25 04:12:57 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/dl: Added documentation. Patch by Vincent Batts.
- [ruby-trunk - Bug #6496]
+ * ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
+ [ruby-list:45257]
-Wed May 30 16:30:00 2012 Kenta Murata <mrkn@cookpad.com>
+Fri Jul 25 02:43:11 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/bigdecimal/lib/bigdecimal/jacobian.rb,
- ext/bigdecimal/lib/bigdecimal/newton.rb:
- fix documentation comments.
- Patch by alperakgun from github.com/shyouhei/ruby/pull/8
+ * sample/coverage.rb: move from lib/coverage.rb because this remains in
+ an early phase of development.
-Wed May 30 16:20:00 2012 Kenta Murata <mrkn@cookpad.com>
+Fri Jul 25 00:10:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian#dfdxi):
- fix jacobian to get stuck in an infinite loop when a solution is not
- found due to forget to increment nRetry counter.
- Patch by alperakgun from github.com/shyouhei/ruby/pull/8
+ * file.c (rb_find_file_ext, rb_find_file): converts Windows style path
+ to Cygwin path. [ruby-dev:35647]
-Wed May 30 10:58:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jul 24 16:30:21 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * time.c (utc_offset_arg): utc offset can be precision in seconds.
- e.g. old Europe/Lisbon (c.f. [ruby-dev:40066])
+ * win32/win32.c (exit_handler): use st_free_table() to free socklist.
-Wed May 30 06:20:29 2012 Eric Hodel <drbrain@segment7.net>
+ * 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().
- * error.c (exc_set_backtrace): Updated documentation to indicate
- set_backtrace allows a string as well as an array of strings.
- [ruby-trunk - Bug #6501]
+Thu Jul 24 16:05:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue May 29 17:28:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c (overlapped_socket_io): avoid warnings.
- * strftime.c (rb_strftime_with_timespec): support GNU extension triple
- colons modifier. [EXPERIMENTAL]
+ * thread_win32.c (ubf_handle): refactoring.
- * strftime.c (rb_strftime_with_timespec): check conversion with locale
- modifier.
+Thu Jul 24 07:01:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * strftime.c (rb_strftime_with_timespec): colons are valid only for
- 'z' and must come just before it.
+ * ext/win32ole/win32ole.c: got rid of improper casts.
-Mon May 28 16:56:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jul 23 23:19:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/test/unit.rb (Test::Unit::Runner#_prepare_run): StatusLineOutput
- needs job_status to be :replace.
+ * test/socket/test_tcp.rb (test_recvfrom): replace an irrelevant test
+ for old behavior.
-Mon May 28 13:35:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jul 23 21:38:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * common.mk (do-install-*): fix dependencies. based on the patch by
- nagachika at [ruby-dev:45683]. [Bug #6506]
+ * test/ruby/test_marshal.rb: suppress warning during test.
-Mon May 28 12:03:04 2012 Narihiro Nakamura <authornari@gmail.com>
+Wed Jul 23 21:35:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * gc.c (obj_free): doesn't free a method table if it doesn't
- exist. [ruby-dev:44436]
- * test/ruby/test_gc.rb (class TestGc): added the test case for
- this issue.
+ * test/ruby/test_dir.rb: suppress warning during test.
-Sun May 27 23:37:48 2012 Koichi Sasada <ko1@atdot.net>
+Wed Jul 23 18:27:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/bm_vm1_lvar_init.rb: added.
- This benchmark measures a initialize time of non-used variable.
+ * ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings
+ about constness and signedness.
- * benchmark/bm_vm1_lvar_set.rb: added.
- This benchmark measures a local variables initialization time.
+Wed Jul 23 17:04:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/bm_vm2_bigarray.rb: added.
- This benchmark mesures a big array literal creation time.
+ * ext/openssl/openssl_missing.h (d2i_of_void): define for older
+ versions. [ruby-dev:35637]
- * benchmark/bm_vm2_bighash.rb: added.
- This benchmark mesures a big hash literal creation time.
+Wed Jul 23 13:53:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * benchmark/bm*: change notation "i=0" to "i = 0".
+ * ext/curses/extconf.rb: use try_static_assert.
-Sun May 27 13:33:26 2012 Koichi Sasada <ko1@atdot.net>
+Wed Jul 23 10:06:19 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * benchmark/driver.rb: fix to continue benchmarks when
- an error is occurred.
+ * test/zlib/test_zlib.rb (TestZlibDeflate#test_params): suppress a
+ finalizer warning.
-Sun May 27 11:27:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jul 23 06:25:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/test/unit.rb (Test::Unit::Runner#_prepare_run): fix operator
- precedence, so that platform and TERM should be counted.
+ * ext/syck: suppress warnings more.
-Sun May 27 10:02:33 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jul 23 03:19:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_strftime.c: allows %Ok and %Ol.
+ * ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
+ constified.
-Sun May 27 09:29:20 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jul 23 03:02:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_core.c: modified doc.
+ * ext/syck: suppress warnings.
-Sat May 26 19:04:34 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Jul 23 00:34:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/date/date_core.c: added description.
+ * ext/openssl: suppress warnings.
-Sat May 26 18:14:57 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Jul 22 23:01:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/date/date_strftime.c: reduced the code.
+ * 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>
-Sat May 26 18:08:59 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * regint.h (GET_ALIGNMENT_PAD_SIZE, ALIGNMENT_RIGHT): cast pointer to
+ uintptr_t instead of unsigned int.
- * time.c: modified doc.
- * ext/date/date_core.c: ditto.
+Thu Jul 3 01:23:13 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Sat May 26 17:05:45 2012 Koichi Sasada <ko1@atdot.net>
+ * sprintf.c: include ieeefp.h to refer to isinf.
- * vm.c (backtrace_*): change type of lev and n from size_t to int.
- Also set type of rb_backtrace_t#backtrace_size to int.
- A patch from nobu.
+ * 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.
-Sat May 26 16:26:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+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.
- * file.c (realpath_rec): UNC prefix does not end with path separator,
- so new separator is needed after it.
+ * enc/windows_1251.c: ditto.
-Sat May 26 15:29:22 2012 Koichi Sasada <ko1@atdot.net>
+ * process.c (run_exec_rlimit): ISO C90 forbids mixed declarations
+ and code
- * test/ruby/test_backtrace.rb (test_caller_lev):
- decrease recursion size.
+ * include/ruby/ruby.h (enum ruby_special_consts): ISO C forbids
+ comma at end of enumerator list
-Sat May 26 13:50:48 2012 Koichi Sasada <ko1@atdot.net>
+ * include/ruby/ruby.h (enum ruby_value_type): ditto.
- * NEWS: add Kernel#caller's second argument.
+ * eval_intern.h (enum): ditto.
-Sat May 26 13:40:29 2012 Koichi Sasada <ko1@atdot.net>
+ * vm_core.h (enum rb_thread_status): ditto.
- * vm.c (RubyVM::FrameInfo): add a class to access each frame
- information. You don't need to parse strings from caller().
- FrameInfo has the following methods:
- FrameInfo#name: method name, class name, etc with decorations.
- FrameInfo#basename: name without decorations.
- FrameInfo#line_no: line number.
- FrameInfo#filename: file name.
- FrameInfo#filepath: full filepath.
- FrameInfo#iseq: iseq if it is iseq frame (defined by ruby script)
- FrameInfo#to_s: return caller() method style string.
- RubyVM::FrameInfo.caller(n, lev) returns array of FrameInfo objects.
- The name "RubyVM::FrameInfo.caller" is long and ambiguous (it is
- confusing with Kernel::caller() method), we need to change the name
- before Ruby 2.0 release. Good names or comments are welcome.
+ * parse.y (enum lex_state_e): ditto.
- * test/ruby/test_backtrace.rb: add a test for above change.
+ * parse.y (enum string_type): ditto.
-Sat May 26 12:18:09 2012 Koichi Sasada <ko1@atdot.net>
+ * process.c (enum): ditto.
- * vm.c (frame_info_to_str): add `break'.
+ * ruby.c (enum dump_flag_bits): ditto.
- * vm.c (backtrace_object): remove lev and n parameter.
- backtrace_object always returns all of backtrace information.
+ * ruby.c (enum disable_flag_bits): ditto.
- * vm.c (rb_backtrace_to_str_ary): fix to use backtrace_object().
- This change improve performance of caller(lev, n).
+ * enc/gb18030.c (enum): ditto.
- * benchmark/bm_vm3_backtrace.rb: added to check above improvement.
- FYI: measurement on my laptop, 1.9.3p229 needs 5.125 sec,
- and current trunk only needs 0.299sec.
+Tue Jul 1 17:21:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat May 26 11:05:09 2012 Koichi Sasada <ko1@atdot.net>
+ * regexec.c (stack_double): use MatchStackLimitSize atomically.
- * vm.c (rb_frame_info_t): keep previous ISEQ frame info for CFUNC
- frame info. And fix to cache a calculated line_no of ISEQ frame
- info.
+ * regparse.c (onig_free_shared_cclass_table): OnigTypeCClassTable
+ needs atomicity
-Sat May 26 09:54:53 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * regsyntax.c: constified all predefined OnigSyntaxTypes.
- * ext/openssl/ossl_ssl.c: Allow disabling client-side renegotiation.
- * test/openssl/test_ssl.rb: Simple tests for this.
+Tue Jul 1 16:57:44 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
- Client-side renegotiation is still considered problematic, even
- when used in the context of secure renegotiation (RI, RFC 5746).
- The changes allow users to either completely disable client
- renegotiation on the server, or to specify a maximum number of
- handshakes allowed in total. The number of total handshakes is
- counted in a callback set as SSL_set_info_callback. If the
- maximum number of handshakes is exceeded an error will be raised
- We do not support renegotiation in the OpenSSL extension, therefore
- this feature can only be tested externally.
- The feature is opt-in, the default setting will be to allow
- unlimited client renegotiation, as was the case before.
+ * include/ruby/st.h (struct st_table): type of bit-field
+ 'num_entries' is a GCC extension
-Fri May 25 23:38:58 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * include/ruby/ruby.h (rb_intern): prefix __extension__ for
+ braced-groups within expressions.
- * test/openssl/test_ssl.rb: Clarify the intention of errors to be
- expected. Two errors are possible when connection is refused due
- to a protocol version that was explicitly disallowed,
- OpenSSL::SSL::SSLError or Errno::ECONNRESET, depending on the
- OpenSSL version in use.
+ * include/ruby/intern.h (rb_usascii_str_new2): ditto.
-Fri May 25 22:19:40 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * include/ruby/intern.h (rb_tainted_str_new2): ditto.
- * ext/openssl/ossl_ssl.c: Revert r35583
- * test/openssl/test_ssl.rb: Handle ECONNRESET in code instead to avoid
- the test failing in Ruby CI [1]
+ * include/ruby/intern.h (rb_str_new2): ditto.
- [1] http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz#test-all
+Tue Jul 1 15:01:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 25 19:51:36 2012 Koichi Sasada <ko1@atdot.net>
+ * lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make),
+ (Gem::Ext::Builder.run): EXIT_SUCCESS may be 0 or may not.
- * vm_eval.c (rb_f_caller): caller() method accepts second optional
- argument `n' which specify how many frames should return.
- For example, `caller(0, 1)' returns only one frame information
- which calls caller() method. If there are less than n frame
- information, then all frame information are returned. If n is 0,
- then always return [].
- This fix is part of [ruby-dev:42345] [Ruby 1.9-Feature#3917].
- However, performance and features are not enough.
- RDoc is also not available.
+ * test/rubygems/test_gem_ext_rake_builder.rb (build_rake_in): override
+ Gem.ruby and ENV["rake"].
- * test/ruby/test_backtrace.rb: add a test for above.
+ * runruby.rb: bin/rake does not exist in archdir where architecture
+ depend script (i.e. rbconfig.rb) exists.
-Fri May 25 17:05:07 2012 Koichi Sasada <ko1@atdot.net>
+Tue Jul 1 13:19:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (oldbt_init, vm_backtrace_str_ary): arg->data should
- be initialized before calling `backtrace_each()'.
+ * array.c (rb_ary_fill): check if beg is too big.
-Fri May 25 16:11:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jul 1 12:01:16 2008 Koichi Sasada <ko1@atdot.net>
- * trunk/ext/-test-/printf/printf.c: change function names because of
- conflict with msvcrt. fixed build error of mswin.
+ * 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.
-Fri May 25 10:52:52 2012 Koichi Sasada <ko1@atdot.net>
+ * id.c, id.h: add ids for above.
- * vm.c: refactoring backtrace related functions.
- (1) unify similar functions (rb_backtrace_each() and
- backtrace_object()). backtrace_each() is a unified function.
- variation:
- a) backtrace_object(): create backtrace object.
- b) vm_backtrace_str_ary(): create bt as an array of string.
- c) vm_backtrace_print(): print backtrace to specified file.
- d) rb_backtrace_print_as_bugreport(): print backtrace on
- bugreport style.
- (2) remove rb_backtrace_each(). Use backtrace_each() instead.
- (3) change the type of lev parameter to size_t.
- a) lev == 0 means current frame (exception, etc use it).
- b) lev == 1 means upper frame (caller(0) use it).
+ * tool/parse.rb: "VM" no longer exists. Use RubyVM instead.
- * vm_core.h, vm_dump.c, vm_eval.c: ditto.
+Tue Jul 1 03:28:16 2008 Eric Hodel <drbrain@segment7.net>
- * vm.c (backtrace_object(), vm_backtrace_str_ary()): fix to return a
- correct size of caller(lev) array.
- Let n be a "caller(0).size" then ln as caller(lev).size should be
- (n - lev). However, the previous implementation returns a wrong
- size array (ln > n - lev). [ruby-dev:45673]
+ * test/rubygems/test_ext_configure_builder.rb: Apply locale-free
+ patch by Yusuke ENDOH. [ruby-core:17444].
- * test/ruby/test_backtrace.rb: add tests for backtrace.
+ * runruby.rb: Set ENV['rake']. Patch by Yusuke ENDOH
+ [ruby-core:17442].
-Fri May 25 08:51:39 2012 Eric Hodel <drbrain@segment7.net>
+Tue Jul 1 01:07:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enum.c (enum_count): Enumerable#count no longer uses #size when
- counting elements. Patch by Nobuhiro IMAI. [ruby-trunk - Bug #6473]
+ * lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
+ double quotes are allowed. [ruby-list:45140]
-Fri May 25 01:15:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jul 1 00:59:43 2008 Tanaka Akira <akr@fsij.org>
- * sprintf.c (ruby__sfvextra): [EXPERIMENTAL] use inspect instead of
- to_s if plus flag is given.
+ * numeric.c (num_coerce): call rb_Float(x) first. don't depend on
+ evaluation order of function arguments.
- * vsnprintf.c (BSD_vfprintf): pass sign flag.
+Tue Jul 1 00:49:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 25 00:37:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (rb_newobj): abort GC phase before rb_bug.
- * test/rubygems/test_gem_indexer.rb (setup, teardown): save @tempdir
- to remove it properly. [Bug #5348]
+Mon Jun 30 23:15:07 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Thu May 24 23:36:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
+ close.
- * vsnprintf.c (BSD_vfprintf): [EXPERIMENTAL] object representation in
- rb_enc_vsprintf(). [Feature #5896]
+Mon Jun 30 23:01:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu May 24 15:33:01 2012 Koichi Sasada <ko1@atdot.net>
+ * common.mk (RUBY_H_INCLUDES): common headers which are included with
+ ruby.h together.
- * vm_method.c (rb_method_defined_by): removed.
- nobu pointed out that rb_method_basic_definition_p() is enough
- for last commit.
+Mon Jun 30 22:57:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * error.c, eval_error.c: change for above.
+ * test/ruby/test_settracefunc.rb (test_raise): reveal an exception
+ hided by rescue modifier.
-Thu May 24 14:30:13 2012 Koichi Sasada <ko1@atdot.net>
+Mon Jun 30 22:49:32 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * vm.c: add RubyVM::Backtrace object (btobj).
- Backtrace information contains an array consists of location
- information for each frames by string.
- RubyVM::Backtrace object is lightweight backtrace information,
- which contains complete information to generate traditional style
- backtrace (an array of strings) with faster generation.
- If someone accesses to backtrace information via
- Exception#backtrace, then convert a RubyVM::Backtrace object to
- traditional style backtrace.
- This change causes incompatibility on marshal dumped binary
- of Exception. If you have any trouble on it, please tell us
- before Ruby 2.0 release.
- Note that RubyVM::Backtrace object should not expose Ruby level.
+ * test/ruby/test_array.rb (test_aset): access with too big index
+ raises not ArgumentError but IndexError now.
- * error.c, eval.c, vm_eval.c: ditto.
+Mon Jun 30 22:30:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * internal.h: ditto.
+ * lib/test/unit/collector/dir.rb (recursive_collect): r15662 reverted.
- * eval_error.c: fix to skip "set_backtrace" method invocation in
- creating an exception object if it call a normal set_backtrace
- method (defined by core).
+Mon Jun 30 22:27:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * test/ruby/test_settracefunc.rb: fix for above change.
+ * ext/stringio/stringio.c (strio_getline): fix for nil and "" as
+ separator. [ruby-dev:34591]
- * vm_method.c (rb_method_defined_by): added. This function
- checks that the given object responds with the given method
- by the given cfunc.
+Mon Jun 30 22:21:30 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * benchmark/bm_vm2_raise1.rb, benchmark/bm_vm2_raise2.rb:
- add to measure exception creation speed. raise1 create
- exception objects from shallow stack frame. raise2 create
- exception objects from deep stack frame.
+ * io.c (argf_each_line): pass args to each_line. [ruby-dev:34958]
-Thu May 24 12:07:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jun 30 22:12:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (io_strip_bom): check EOF. [Bug #6487][ruby-core:45203]
+ * gc.c (chain_finalized_object): should not delete from finalizer
+ table until run.
-Wed May 23 22:06:14 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * gc.c (rb_gc_call_finalizer_at_exit): deferred_final_list may be
+ empty first.
- * lib/net/http/header.rb (Net::HTTPHeader#range): fix broken parser of
- HTTP Range request. Old one can't parse invalid specs and multiple
- specs correctly.
+Mon Jun 30 18:57:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed May 23 10:18:54 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (gc_finalize_deferred): allow object allocation in finalizers.
- * win32/win32.c (finish_overlapped_socket, overlapped_socket_io):
- replace ECONNABORTED to EPIPE in send, sendto and sendmsg to improve
- BSD socket compatibility. this change removes a failure on the test
- of net/ftp.
+ * gc.c (rb_gc_call_finalizer_at_exit): ditto.
-Wed May 23 05:35:58 2012 Eric Hodel <drbrain@segment7.net>
+Mon Jun 30 14:41:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/net/http.rb: Broke up Net::HTTP into individual files.
- [ruby-trunk - Feature #6435]
- * lib/net/http/backward.rb: ditto.
- * lib/net/http/response.rb: ditto.
- * lib/net/http/exceptions.rb: ditto.
- * lib/net/http/responses.rb: ditto.
- * lib/net/http/generic_request.rb: ditto.
- * lib/net/http/header.rb: ditto.
- * lib/net/http/request.rb: ditto.
- * lib/net/http/proxy_delta.rb: ditto.
- * lib/net/http/requests.rb: ditto.
+ * gc.c (rb_newobj): prohibit call of rb_newobj() during gc when
+ USE_VALUE_CACHE is not defined (normal case).
-Wed May 23 05:15:11 2012 Eric Hodel <drbrain@segment7.net>
+Mon Jun 30 10:28:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * class.c (rb_mod_init_copy): Clear the cached inspect string of a
- dup'd anonymous module or class. [ruby-trunk - Bug #6454]
- * test/ruby/test_module.rb (class TestModule): ditto
+ * 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>.
-Tue May 22 16:49:15 2012 Koichi Sasada <ko1@atdot.net>
+ * ext/syslog/syslog.c (mSyslog_close): ditto.
- * vm_core.h: add a data type rb_location_t to store iseq location
+ * 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.
- rb_location_t#filename, filepath, name and line_no was moved from
- rb_iseq_t. rb_location_t#basename is a new field which is
- similar to `name' field without any decoration.
- `name' field contains some decoration such as `block in foo'.
- `basename' only contains `foo'.
- rb_iseq_t contains memory object of rb_location_t.
- * iseq.c: setup rb_location_t for each rb_iseq_t memory objects.
+ * test/rss/rss-assertions.rb: follow the above change.
- * compile.c, proc.c, vm.c, vm_dump.c, vm_eval.c, vm_insnhelper.c,
- vm_method.c: support about it.
+Sun Jun 29 17:37:23 2008 Kouhei Sutou <kou@cozmixng.org>
-Tue May 22 00:45:05 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block.
- * struct.c (rb_struct_members): Refactoring. As Struct#members had
- returned an array of String, the old code was needed to convert
- Symbols to Strings. But it is almost unnecessary because the
- method now returns an array of Symbols. A patch by Masaki
- Matsushita <glass.saga at gmail dot com> [Feature #6218]
- [ruby-dev:45451]
+ * test/rss/test_maker_{0.9,1.0,2.0}.rb: follow the above change.
-Mon May 21 19:20:25 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Jun 29 17:33:34 2008 Kouhei Sutou <kou@cozmixng.org>
- * lib/net/ftp.rb (Net::FTP#retrbinary): close only if conn is not nil
- because transfercmd may fail and return nil.
+ * lib/rss/maker/base.rb, lib/rss/maker/itunes.rb: don't use
+ instance_eval to initialize variables. (speed up)
- * lib/net/ftp.rb (Net::FTP#retrlines): ditto.
+Sun Jun 29 17:31:15 2008 Kouhei Sutou <kou@cozmixng.org>
-Mon May 21 15:10:28 2012 Akinori MUSHA <knu@iDaemons.org>
+ * lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
+ 0.2.4 -> 0.2.5.
- * ext/syslog/syslog.c: Classify constants and macros into several
- sub-modules. (Syslog::Priority, Syslog::Level, Syslog::Option
- and Syslog::Macros)
+Sun Jun 29 11:36:20 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
+ * dir.rb: fix resource leak.
- * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
- module before calling rb_class2name().
+Sun Jun 29 09:43:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon May 21 12:44:11 2012 URABE Shyouhei <shyouhei@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]
- * .travis.yml (install): It seems tcl/tk is skipped in Travis
- CI. Trying to fix the situation.
+Sun Jun 29 07:53:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Mon May 21 12:11:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/win32ole.c (date2time_str): fix the overflow in
+ some situation. [ruby-bugs-20793]
- * enc/depend (ENCOBJS): add dependencies.
+Sat Jun 28 21:25:08 2008 Tanaka Akira <akr@fsij.org>
- * enc/make_encmake.rb (target_encodings): extract dependencies.
+ * include/ruby/ruby.h (struct RRegexp): new field usecnt. replace
+ str and len by src.
-Mon May 21 11:26:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * gc.c (gc_mark_children): mark src field of regexp.
+ (obj_free): don't free str field.
- * lib/net/ftp.rb (Net::FTP#transfercmd): rescue shutdown.
+ * 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")
-Sun May 20 23:00:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jun 28 21:15:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/extmk.rb (extmake): reopen $stdout to NULL, since setting
- $stdout cannot affect child processes.
+ * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
+ rb_usascii_str_new2): use inline versions only for constant
+ literals.
-Sun May 20 21:36:39 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Jun 28 13:12:06 2008 Tanaka Akira <akr@fsij.org>
- * enc/shift_jis.c (code_to_mbclen): return
- ONIGERR_INVALID_CODE_POINT_VALUE if the code is invalid.
+ * test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
+ fixed /tmp/apple_gem_home directory.
- * string.c (tr_next): increment character until the code
- is a valid character. [ruby-dev:45652] [Bug #6450]
+Sat Jun 28 08:40:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Sun May 20 12:25:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/win32ole.c: check String encoding when
+ converting String to VT_BSTR in OLE.
- * Makefile.in (LIBRUBY_SO): link EXTSOLIBS too.
+ * test/win32ole/test_win32ole.rb: ditto.
- * ext/extmk.rb (mf.macro): use EXTSOLIBS instead of SOLIBS to get rid
- of discard libraries needed by default. [Bug #6462]
+Sat Jun 28 01:08:42 2008 Tanaka Akira <akr@fsij.org>
-Sat May 19 19:04:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_timespec): fix rounding negative float.
- * ext/extmk.rb (command_output): ENCOBJS is needed for all linked
- ruby, if --disable-shared and --with-static-linked-ext.
+Fri Jun 27 21:38:57 2008 Tanaka Akira <akr@fsij.org>
- * ext/extmk.rb (command_output): dmyext is needed as DLDOBJS if no
- static linked extensions.
+ * struct.c: __size__ removed. use the length of __members__ instead.
+ (num_members): new function.
- * Makefile.in, common.mk (PROGRAM): no extension libraries.
+Fri Jun 27 21:19:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (build-ext): pass macros for libruby.so.
+ * test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+ $0. [ruby-dev:35261]
- * ext/extmk.rb (command_output): link extension libraries and encoding
- libraries into libruby.so, not ruby executable.
+ * lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
- * ext/extmk.rb (command_output): fold long macro lines.
+Fri Jun 27 17:45:17 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * Makefile.in (LIBEXT): add macro.
+ * lib/erb.rb: adjust line number for magic comment.
- * configure.in (ENCOBJS, EXTOBJS): use LIBEXT, not hardcoded suffix.
+ * test/erb/test_erb.rb: add tests for def_method.
- * Makefile.in (LIBRUBY_A): fix typo. re-applying r35242.
+Fri Jun 27 14:29:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat May 19 04:46:53 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * parse.y (primary): empty not should call '!' on nil.
+ cf [ruby-dev:35227]
- * ext/openssl/extconf.rb: Use Logging::message instead of message.
- * ext/zlib/extconf.rb: ditto.
+Fri Jun 27 14:25:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 18 18:13:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm.c (vm_eval_body): if thrown exception is frozen, reraise it to
+ create a new instance.
- * lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
- OUTFLAG and COUTFLAG. [ruby-dev:45650]
+Fri Jun 27 13:29:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 18 17:39:42 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * 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.
- * thread_pthread.c (rb_thread_create_timer_thread): Added error
- check when failing fcntl(). [Bug #6147] [ruby-dev:45364]
+Fri Jun 27 12:28:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 18 17:41:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/un.rb (mkmf): new command to create makefile.
- * ext/extmk.rb (extmake): link archives only, skip script only
- extension libraries.
+Fri Jun 27 11:06:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 18 17:25:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/un.rb (wait_writable): added help message.
- * cont.c: bump up fiber machine stack size when running on 64bit
- arch. [Bug #6344] [ruby-dev:45554]
+Fri Jun 27 06:52:54 2008 Koichi Sasada <ko1@atdot.net>
-Fri May 18 15:20:56 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in: need a ",".
- * lib/uri/generic.rb (URI::Generic.build): duplicate args before adding
- new items. (don't change arguments)
+ * process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro.
- * lib/uri/generic.rb (URI::Generic.build): use URI::Generic::COMPONENT
- if this method is called from URI::Generic.
+Fri Jun 27 06:50:56 2008 Koichi Sasada <ko1@atdot.net>
- * lib/uri/generic.rb (URI::Generic.build2): escape only if the item is
- a String.
+ * vm_eval.c (vm_call_super): fix to call method_missing.
+ [ruby-core:15719], [ruby-core:17340]
- * lib/uri/generic.rb (URI::Generic.build2): use DEFAULT_PARSER because
- it doesn't have parser method. [Bug #6420]
+Fri Jun 27 00:00:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 18 15:54:07 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ruby.c (set_arg0, ruby_prog_init): freeze $0. a patch from Keita
+ Yamaguchi <keita.yamaguchi at gmail.com>.
- * ext/zlib/extconf.rb: Use an exception instead of bare puts.
+Thu Jun 26 23:58:29 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Fri May 18 15:53:05 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * string.c (rb_str_index_m, rb_str_rindex_m, rb_str_include): fix
+ rdoc.
- * ext/psych/extconf.rb: Use an exception instead of bare abort.
+Thu Jun 26 17:43:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri May 18 15:51:32 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * variable.c (rb_f_trace_var): should not be allowed at safe level 4.
+ a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
- * ext/fiddle/extconf.rb: Use an exception instead of bare abort.
+Thu Jun 26 11:04:30 2008 Eric Hodel <drbrain@segment7.net>
-Fri May 18 15:49:35 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rubygems: Update to RubyGems 1.2.0 r1824. Incorporates patch by
+ Yusuke ENDOH [ruby-core:17353].
- * ext/readline/extconf.rb: Use an exception instead of bare exit.
+Thu Jun 26 00:48:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri May 18 15:38:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * parse.y (primary): not operand might be empty. [ruby-dev:35227]
- * ext/ripper/extconf.rb: Use an exception instead of bare
- Logging.message.
+Wed Jun 25 21:54:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri May 18 15:23:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * parse.y (primary): make functional-style not operator to act
+ like function. see <http://d.hatena.ne.jp/ku-ma-me/20080624/p1>.
- * ext/openssl/extconf.rb: Clarify a message when hit Apple
- OpenSSL issue.
+Wed Jun 25 15:28:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri May 18 15:14:32 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * array.c (rb_ary_fill): not depend on unspecified behavior at integer
+ overflow. reported by Vincenzo Iozzo <snagg AT openssl.it>.
- * ext/extmk.rb: Show a message when extconf.rb raised an exception.
- * ext/openssl/extconf.rb: Use exception raising instead of message
- and/or abort. We want to display error message to console _and_
- logging into mkmf.log.
+Wed Jun 25 13:42:44 2008 NARUSE, Yui <naruse@ruby-lang.org>
-Fri May 18 06:14:07 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
- * ext/syslog/lib/syslog/logger.rb: Added Syslog::Logger which was
- ported from the SyslogLogger gem. [ruby-trunk - Feature #5096]
- * NEWS: ditto.
- * test/syslog/test_syslog_logger.rb: ditto.
+ * lib/erb.rb (ERB::Compiler#compile): fix for broken input.
-Fri May 18 01:28:21 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Jun 25 12:10:01 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/psych/parser.c (transcode_string): fix encoding index names.
- Thanks markizko for reporting.
+ * lib/erb.rb (ERB::Compiler#compile): magic comment needs LF.
-Thu May 17 23:03:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jun 25 09:31:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * configure.in: fix function name to be checked, to initialize
- rb_thread_cond_t properly.
+ * lib/erb.rb (ERB::Compiler#compile): output magic comment.
- * thread_pthread.c (native_cond_initialize, native_cond_destroy):
- fix macro name.
+Tue Jun 24 22:14:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Thu May 17 12:53:07 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
+ exception raised.
- * thread.c, thread_pthread.c: Moved pthread-specific preprocessor
- hacks to thread_pthread.c
+Tue Jun 24 22:09:18 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Thu May 17 12:18:47 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
+ [ruby-bugs-20792]
- * io.c: Fix a mistake on merging the patch in the previous commit.
+Tue Jun 24 17:20:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu May 17 11:33:07 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * configure.in (rb_cv_fork_with_pthread): check after check for
+ pthread library, and define the macro when checked only.
- Imports Ruby's port to NativeClient (a.k.a NaCl).
- Patch by Google Inc. [ruby-core:45073].
+Tue Jun 24 17:04:39 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * configure.in (RUBY_NACL): New M4 func to configure variables for
- NaCl.
- (RUBY_NACL_CHECK_PEPPER_TYPES): New M4 func to check the old names
- of Pepper interface types.
- (BTESTRUBY): New variable to specify which ruby should be run on
- "make btest". NaCl can run the built binary by sel_ldr, but it need
- rbconfig.rb. So this variable is distinguished from $MINIRUBY.
+ * ext/io/wait/extconf.rb: check sys/socket.h for cygwin.
- * thread_pthread.c: Disabled some features on NaCl.
+Tue Jun 24 16:51:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c: ditto.
+ * io.c (io_reopen): remove cygwin handling because it seems to be for
+ C's stdio.
+ fixed [ruby-dev:35183]
- * process.c: ditto.
+Tue Jun 24 11:12:33 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * signal.c: ditto.
+ * include/ruby/win32.h, win32/win32.c (rb_w32_getppid): now support
+ getppid() on win32 (but only Win2k or later).
- * file.c: ditto.
+ * process.c (get_ppid): remove win32 special logic.
- * missing/flock.c: ditto.
+Tue Jun 24 09:40:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * nacl/pepper_main.c: An example implementation of Pepper application
- that embeds Ruby.
+ * ext/socket/socket.c (init_sock): socket is binmode on platforms
+ which support binmode.
- * nacl/example.html: An example of web page that uses the Pepper
- application.
+Tue Jun 24 00:21:53 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * nacl/nacl-config.rb: Detects variants of NaCl SDK.
+ * compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
+ Adam Strzelecki <ono at java.pl> in [ruby-core:17220].
- * nacl/GNUmakefile.in: Makefile template for NaCl specific build
- process.
+Tue Jun 24 00:10:53 2008 wanabe <s.wanabe@gmail.com>
- * nacl/package.rb: script for packaging a NaCl-Ruby embedding
- application.
+ * compile.c (iseq_build_from_ary): fix expression to obtain
+ iseq->local_size and iseq->local_table_size. [ruby-dev:35205]
- * nacl/reate_nmf.rb: Wrapper script of create_nmf.py
+Mon Jun 23 11:31:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * dln.c (dln_load): Added a hack to call on NaCl.
+ * lib/mathn.rb (Rational::power2): removed incomplete method.
+ see [ruby-dev:35195]. [ruby-core:17293]
- * util.c (ruby_getcwd): Path to the current directory is not available
- on NaCl.
+Sun Jun 22 14:16:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu May 17 10:54:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
+ needs headers to detect some functions.
- * ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS,
- to be passed to EXTLIBS in exts.mk.
+Sun Jun 22 09:51:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enc/encinit.c.erb: use %-lines to adjust indent in the generated file.
+ * object.c (rb_class_superclass): rdoc improvement, a patch from
+ Gaston Ramos <ramos.gaston AT gmail.com> in [ruby-core:17371].
- * lib/mkmf.rb (MakeMakefile#have_framework): combine -framework option
- and its argument with an equal sign not to be separated in merge_libs.
+Sun Jun 22 09:22:32 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
- * ext/tk/extconf.rb: ditto.
+ * 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.
+
+ * parse.y (parser_yylex): unified warnings at space between method
+ name and argument parenthesis. [ruby-dev:33943]
+
+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>
+
+ * 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>
+
+ * configure.in: check if fork works with pthread.
+
+Sat Jun 21 15:31:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/make-snapshot: ported to ruby.
+
+ * tool/make-snapshot: fixed digests.
+
+Sat Jun 21 04:36:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian::dfdxi):
+ typo fixed (raize -> raise). [ruby-list:45101]
+
+ * enumerator.c (enum_each_cons): typo in RDoc fixed.
+
+Sat Jun 21 00:45:34 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * tool/make-snapshot: do not use sha256sum; use BASERUBY instead
+
+ * common.mk (dist): use tool/make-snapshot instead
+
+Fri Jun 20 16:34:14 2008 Tanaka Akira <akr@fsij.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.
+
+Fri Jun 20 15:40:02 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>
+
+ * array.c (ary_new, rb_ary_initialize, rb_ary_store,
+ rb_ary_splice, 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,
+ 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>
+
+ * 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].
+
+Sat Jun 14 16:55: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>
+
+ * 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.
+
+Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/set.rb (Set#delete_if): Call to_a.
+ (SortedSet#delete_if, TC_SortedSet#test_sortedset): Use super to
+ yield elements in sorted order; [ruby-core:17144] by Arthur
+ Schreiber.
+ (SortedSet#each, SortedSet#each, TC_Set#test_each)
+ (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 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>
+
+ * 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).
+
+ * 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.
+
+Sun Jun 8 01:15:11 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>
+
+ * 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().
+
+Sat Jun 7 16:06:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (CFLAGS, CXXFLAGS): append default flags.
+
+Sat Jun 7 01:23:59 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>
+
+ * win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
+
+ * ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
+ 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.
+
+Fri Jun 6 12:43:41 2008 Yukihiro Matsumoto <matz@ruby-lang.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.
+
+ * vm.c: ditto.
+
+Thu Jun 5 23:31:21 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/stringio/test_stringio.rb: add tests to achieve over 95% test
+ coverage of stringio.
+
+ * test/strscan/test_stringscanner.rb: ditto for strscan.
+
+Thu Jun 5 23:25:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * eval.c (ruby_finalize_0): clear trace_func after executing END
+ procs.
+
+ * thread.c: fix typo.
+
+Thu Jun 5 22:50:50 2008 Tanaka Akira <akr@fsij.org>
+
+ * gc.c (os_obj_of): heaps may be modified in yield.
+
+Thu Jun 5 21:46:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * st.c (st_reverse_foreach): comment out unused function.
+
+ * util.c (dtoa): ditto.
+
+Thu Jun 5 20:30:46 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
+ Add a null check for ssl; submitted by akira yamada
+ in [ruby-dev:34950].
+
+ * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
+ SSL_OP_NO_TICKET is present; submitted by akira yamada
+ in [ruby-dev:34944].
+
+ * test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
+ 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>
+
+ * 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>
+
+ * test/ruby/test_dir.rb: add tests to achieve over 90% test coverage
+ of dir.c.
+
+ * 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.
+
+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.
+
+Tue Jun 3 12:51:57 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * enumerator.c (enumerator_allocate, enumerator_ptr): Properly
+ detect if the object is initialized and raise error when
+ 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>
+
+ * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
+ where tokens are not yielded one by one.
+
+ * test/erb/test_erb.rb (TestERBCore#_test_01)
+ (TestERBCore#test_02_safe_04): The expected value should come
+ first for assert_equal().
+
+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>
+
+ * insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
+ this is not int on 64bit system.
+
+ * vm_dump.c (control_frame_dump): ditto.
+
+ * 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.
+
+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 20:28:10 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_regexp.rb: add tests.
+
+Sat May 31 19:11:39 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * enc/utf_16{be,le}.c (utf16{be,le}_code_to_mbc):
+ fix codepoint to bytes.
+
+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]
+
+ * enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.
+
+Fri May 30 10:55:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.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.
+
+Fri May 30 03:12:18 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand):
+ Int should be enough here.
+
+Fri May 30 02:35:00 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand),
+ ext/openssl/ossl_pkey_dh.c (ossl_dh_s_generate)
+ (ossl_dh_initialize),
+ ext/openssl/ossl_pkey_dsa.c (ossl_dsa_s_generate),
+ ext/openssl/ossl_rand.c (ossl_rand_bytes)
+ (ossl_rand_pseudo_bytes, ossl_rand_egd_bytes),
+ ext/openssl/ossl_x509store.c (ossl_x509stctx_set_error): Do not
+ 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>
+
+ * 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.
+
+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:50:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/mkexports.rb (Exports#objdump, Exports#each_line): extracted.
+
+Wed May 28 17:41:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (MKPREP): appended $(RBCONFIG).
+
+ * 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>
+
+ * array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
+ beginning. [rubyspec]
+
+Wed May 28 16:12:44 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
+ Set the HTTP status code to 302 if a Location header field is
+ 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
+ private methods too. [ruby-dev:34671]
+
+ * 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.
+
+ * thread.c (rb_thread_execute_interrupts): delay interrupts during
+ raising exceptions. [ruby-dev:34855]
+
+Tue May 27 20:18:30 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>
+
+ * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
+ rid of depending PREP with nmake.
+
+ * common.mk (encs): depends on libruby.
+
+Tue May 27 19:00:22 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>
+
+ * ext/stringio/stringio.c (strio_each_byte): Return self instead
+ of nil as the rdoc says.
+
+Tue May 27 15:36:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (check_int): use PRIxVALUE format specifier.
+
+ * numeric.c (check_uint, rb_num2fix, int_chr): ditto.
+
+ * numeric.c (num_fdiv): fallback to_f should always return float
+ result. should not use #quo that may return rational.
+
+ * numeric.c (num_div): should raise ZeroDivisionError.
+
+ * numeric.c (fix_divide): ditto.
+
+ * test/ruby/test_numeric.rb (TestNumeric::test_divmod): avoid
+ ZeroDivisionError in tests.
+
+Tue May 27 13:14:53 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 13:12:37 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+
+Tue May 27 12:06:37 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * file.c (BUFCHECK): wrong condition. [ruby-core:16921]
+
+ * file.c (file_expand_buf): shouldn't use buflen for length of string.
+
+Mon May 26 18:24:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (BUFCHECK): no resize if enough room.
+
+ * 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>
+
+ * 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 00:52:52 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * hash.c (env_each_key, env_each_value, env_reject_bang)
+ (rb_env_clear, env_replace): Omit duplicated secure level check.
+
+Mon May 26 00:37:16 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * hash.c (env_each_value): Do not call env_values() twice.
+
+Sun May 25 17:54:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (iseq_compile): set local_table for
+ ISEQ_TYPE_DEFINED_GUARD.
+
+Sun May 25 17:52:25 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (iseq_build_body): remove side effect from
+ VM::InstructionSequence.load.
+
+Sun May 25 04:30:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_module.rb (remove_json_mixins): change judgment
+ condition.
+
+Sun May 25 03:54:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_module.rb (test_ancestors, test_included_modules):
+ ignore json mixins.
+
+Sun May 25 02:37:25 2008 Koichi Sasada <ko1@atdot.net>
+
+ * eval_method.c: renamed from vm_method.c. "vm_method.c" is included
+ by "vm.c".
+
+ * vm_eval.c: added. Some codes are moved from "eval.c"
+
+ * common.mk: fix for above changes.
+
+ * compile.c: make a vm_eval(0)
+
+ * 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.
+
+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]
+
+Sat May 24 15:26:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * compile.c (iseq_set_exception_table, NODE_WHILE, NODE_NEXT): remove
+ special handling that decrements sp in CATCH_TYPE_NEXT for NODE_WHILE.
+
+ * vm.c (vm_eval_body), vm_insnhelper.c (vm_throw): remove unused code.
+
+Sat May 24 08:13:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * transcode.c (rb_str_transcode): argc is 1, and argv is &to.
+
+Fri May 23 17:55:11 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * 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:44:34 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * enumerator.c (Init_Enumerator): Override
+ Enumerable::Enumerator#each_with_index with #with_index.
+
+Fri May 23 12:23:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (rb_num_t): moved form vm.h.
+
+ * tool/instruction.rb (RubyVM::Instruction#sp_increase_c_expr),
+ tool/instruction.rb (RubyVM::VmBodyGenerator#make_header_operands):
+ omit unused variables.
+
+Fri May 23 08:47:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * error.c (exc_equal): == operator should be transitional.
+ [ruby-dev:34808]
+
+ * 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>
+
+ * 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>
+
+ * iseq.c (iseq_load, iseq_data_to_ary): support
+ ISEQ_TYPE_DEFINED_GUARD.
+
+Thu May 22 19:01:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.
+
+ * vm.c (sdr, nsdr): define methods only if VMDEBUG is defined.
+
+Thu May 22 17:18:35 2008 Tanaka Akira <akr@fsij.org>
+
+ * array.c (rb_ary_compact_bang): fix reallocation size.
+
+Thu May 22 15:20:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,
+ vm.c: need to add const to prototypes, of course.
+
+Thu May 22 13:24:43 2008 Koichi Sasada <ko1@atdot.net>
+
+ * eval.c, vm.c, vm_core.h, vm_insnhelper.c: specify "const".
+
+ * vm_opts.h: add a OPT_TOKEN_THREADED_CODE macro.
+
+Thu May 22 12:51:41 2008 Tanaka Akira <akr@fsij.org>
+
+ * insns.def (newhash): fix a variable definition: "const k".
+
+Thu May 22 12:40: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.
+ [ruby-dev:34789]
+
+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>
+
+ * encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
+
+ * encoding.c, include/ruby/encoding.h (rb_ascii8bit_encindex):
+ added.
+
+ * encoding.c (rb_locale_encoding): use rb_usascii_encoding().
+
+Wed May 21 01:45:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_file_exhaustive.rb (setup): workaround for Windows
+ Vista.
+
+ * 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]
+
+Mon May 19 18:22:35 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
+ 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.
+
+ * re.c (match_init_copy): avoid unnecessary onig_region_free()
+ before onig_region_copy.
+
+ * encoding.c (rb_enc_get_index): remove implicit enc_capable check
+ each time.
+
+ * encoding.c (rb_enc_set_index): ditto.
+
+ * encoding.c (enc_compatible_p): small refactoring.
+
+ * include/ruby/encoding.h (rb_enc_dummy_p): inline
+ rb_enc_dummy_p() and export related code.
+
+Mon May 19 14:32:03 2008 Koichi Sasada <ko1@atdot.net>
+
+ * version.h: fix strange change by version.h update tool.
+
+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.
+
+ * include/ruby/ruby.h, gc.c: remove T_VALUES because of above
+ changes.
+
+ * bootstraptest/test_eval.rb, test_knownbug.rb: move solved test.
+
+Sun May 18 22:26:51 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpservlet/filehandler.rb: should normalize path
+ name in path_info to prevent script disclosure vulnerability on
+ DOSISH filesystems. (fix: CVE-2008-1891)
+ Note: NTFS/FAT filesystem should not be published by the platforms
+ other than Windows. Pathname interpretation (including short
+ filename) is less than perfect.
+
+ * lib/webrick/httpservlet/abstract.rb
+ (WEBrick::HTTPServlet::AbstractServlet#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]
+
+ * 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 12:48:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * math.c (to_flo): rb_Float() accepts even strings for input.
+
+ * complex.c (nucomp_to_f): fix wrong message.
+
+ * complex.c (nucomp_to_r): ditto.
+
+ * object.c (rb_Float): do not check NaN for error. NaN is a part
+ of valid float values.
+
+Thu May 15 23:36:09 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_string.rb: add tests to achieve over 90% test
+ coverage of string.c.
+
+ * test/ruby/test_m17n.rb: ditto.
+
+ * test/ruby/test_symbol.rb: ditto.
+
+ * test/ruby/test_pack.rb: ditto.
+
+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.
+
+ * test/ruby/test_m17n.rb (test_delete): add a test for above.
+
+Thu May 15 22:37:56 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * parse.y (ripper_warningS): now used.
+
+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.
+
+ * 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>
+
+ * array.c (rb_ary_count): Override Enumerable#count for better
+ performance.
+
+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.
+
+ * test/ruby/test_rational.rb: ditto.
+
+Wed May 14 00:45:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * eval_method.c (rb_add_method): fix check for warning when
+ Object#initialize is redefined. (same as 1.8)
+
+Tue May 13 23:32:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enum.c (enum_yield): use rb_yield_values2.
+
+ * enum.c (DEFINE_ENUMFUNCS): macro to define enumerator and yielding
+ functions.
+
+ * enum.c (enum_all_func, enum_any_func, enum_one_func,
+ enum_none_func): reduced duplicate code.
+
+Tue May 13 15:09:38 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.
+
+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 #=> []
- * ext/extmk.rb: EXTLDFLAGS also needs to be passed.
+ * 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>
+
+ * 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>
+
+ * gc.c (assign_heap_slot): fix condition for number of objects in
+ a heap.
+
+Mon May 12 12:24:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (sym_to_i): really removed. [ruby-dev:34641]
+
+Mon May 12 11:15:55 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * gc.c (assign_heap_slot): put the binary search routine in order.
+
+Mon May 12 10:52:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
+ instead of Gem::Enable.
+
+ * gem_prelude.rb (load_full_rubygems_library, const_missing): prevent
+ infinite recursion. [ruby-dev:34539]
+
+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>
+
+ * string.c (tr_trans): single '^' does not mean negation.
+ [ruby-dev:34632]
+
+ * string.c (tr_trans): should check src size, not str size.
+ [ruby-dev:34637]
+
+ * string.c (tr_trans): should not turn on modify flag if no
+ modification happens. [ruby-dev:34631]
+
+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]
+
+Wed May 7 18:02:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (sym_to_i): remove obsolete method. preparation for
+ symbol GC.
+
+ * numeric.c (fix_to_sym): ditto.
+
+ * numeric.c (fix_id2name): ditto.
+
+Wed May 7 17:43:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (io_puts_ary): check recursion first. [ruby-dev:34580]
+
+Wed May 7 17:41:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (vm_eval_body): initialize retval. [ruby-dev:34576]
+
+Wed May 7 13:02:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_big_fdiv): flo.fdiv(NaN) should result NaN.
+
+ * numeric.c (num_quo): renamed and moved from bignum.c.
+ [ruby-dev:34582]
+
+ * bignum.c (rb_big_fdiv): update RDoc description
+
+ * rational.c (nurat_s_new_m): small refactoring.
+
+ * bignum.c (rb_big2dbl): no need for forceful warning when
+ converting to float. overflow is a nature of float values.
+
+Wed May 7 00:54:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
+ 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>
+
+ * compile.c (compile_cpath): use Qundef to denote cbase lookup.
+
+ * insns.def (defineclass): Qundef is passed for cbase.
+
+ * 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]
+
+Fri May 2 14:52:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed May 16 15:44:22 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * misc/ruby-mode.el: move fontifying code from hook. a patch from
+ Phil Hagelberg <phil at hagelb.org> in [ruby-core:16636].
- * configure.in: Fix an unbalanced quote.
+Fri May 2 14:10:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed May 16 15:43:10 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * range.c (range_step): step may be bignum.
- * ext/extmk.rb (exts.mk): use double quotes instead of single quotes
- for commandline because it's not recognized as quotes on Windows.
+Fri May 2 13:52:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed May 16 15:15:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (Init_Regexp): remove MatchData#select. [ruby-dev:34563]
- * configure.in (LD): enclose with single quotes but not double quotes
- not to expand command substitution.
+Thu May 1 23:59:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed May 16 14:19:51 2012 Yuki Yugui Sonoda <yugui@google.com>
+ * bignum.c (rb_big_divide), numeric.c (fix_divide): check for result
+ domain. [ruby-dev:34559]
- Supports static linking of extensions and encodings again.
- Fixes --with-static-linked-ext.
+Thu May 1 23:57:06 2008 James Edward Gray II <jeg2@ruby-lang.org>
- Patch by Google Inc. [ruby-core:45073].
+ * 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
+ remote connection is closed. The default behavior remains unchanged though.
- * Makefile.in (ENCOBJS, EXTOBJS): New variables to specify static
- linked libraries. Also reintroduces extinit.o, introduces encinit.o
- introduces encinit.o
+Thu May 1 23:43:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk: Builds static libraries rather than shared objects if
+ * range.c (range_step): check if step can be converted to an integer.
+ [ruby-dev:34558]
+
+ * 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.
+
+Thu May 1 16:10:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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
+ 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.
- * configure.in (LD): new substitution.
+Mon Apr 28 20:24:27 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * enc/depend: Supports static linked libraries
- (libencs, libenc, libtrans): New target.
+ * rational.c (nurat_marshal_load): checks the given
+ denominator. [ruby-dev:34536]
- * enc/encinit.c.erb: new template to generate the initialization of
- statically linked encodings.
+Mon Apr 28 14:21:18 2008 Tanaka Akira <akr@fsij.org>
- * enc/make_encmake.rb (--module): new flag to specify whether static
- or dynamic.
+ * 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.
- * transcode_data.h (TRANS_INIT): New macro to get rid of the name
- collision of encoding initializers and transcoder initializers.
+Mon Apr 28 12:48:57 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/extmk.rb: Fixes the behavior on $extstatic is true.
+ * process.c (rb_exec_arg_addopt, rb_exec_arg_addopt): now can specify
+ close_exec on having no fork environment (but still meaningless).
- * lib/mkmf.rb (clean-static): new target to clean up static linked
- libraries.
+Mon Apr 28 11:11:29 2008 Tanaka Akira <akr@fsij.org>
- * ruby.c (process_options): New initializes statically linked
- encodings here.
+ * process.c (run_exec_options): don't call FIX2INT for nil.
-Wed May 16 14:30:43 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Apr 28 11:11:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c: fixed a merge mistake of r33878, reported by nobu via IRC.
+ * proc.c (method_name): should return symbols instead of strings.
+ [ruby-dev:34531]
-Wed May 16 06:59:41 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Apr 28 09:02:43 2008 Tanaka Akira <akr@fsij.org>
- * ext/date/date_strftime.c: should also be aware of flags on
- complex specifier.
+ * 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.
-Wed May 16 05:11:29 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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.
- * ext/psych/lib/psych/visitors/to_ruby.rb: fix a bug with string
- subclass dumping and loading.
+ * 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.
- * test/psych/test_array.rb: pertinent tests
+Sun Apr 27 18:59:04 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * test/psych/test_string.rb: ditto
+ * rational.c (nurat_expt): use f_rational_new2. [ruby-dev:34524]
-Wed May 16 01:31:21 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Apr 27 15:23:40 2008 Koichi Sasada <ko1@atdot.net>
- * ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
- Psych::Omap objects rather than hashes. [Bug #6425]
+ * gc.c (gc_count): add a GC.count method. This method returns
+ a GC invoking count.
- * test/psych/test_omap.rb: pertinent test.
+Sun Apr 27 12:20:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed May 16 01:15:45 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
- custom coders so that GC does not impact dumped yaml reference ids.
+ * gc.c (rb_objspace_alloc), vm.c (Init_BareVM): should not use ruby
+ malloc here.
-Tue May 15 23:59:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (garbage_collect, etc): performance improvement by passing the
+ reference instead of referring the global variable in each functions.
- * lib/test/unit.rb (Test::Unit::Options#setup_options): add --color option.
+Sun Apr 27 08:06:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/test/unit.rb (Test::Unit::Runner#_prepare_run): defer color code
- initialization to regard --color option.
+ * ruby.c (ruby_set_argv): ARGV should be locale encoding.
+ [ruby-list:44861]
-Mon May 14 16:28:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 27 01:46:29 2008 Tanaka Akira <akr@fsij.org>
- * parse.y (f_arglist): should reset lexical states after empty
- argument list with no parenthesis as well as parenthesized list,
- so that reserved name method definition work. [ruby-dev:45626]
- [Bug #6403]
+ * lib/open3.rb (Open3.popen3w): removed.
+ (Open3.popen3): notice wait_thr.
-Mon May 14 00:14:24 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+Sun Apr 27 01:13:05 2008 Eric Hodel <drbrain@segment7.net>
- * enumerator.c (lazy_take_func, lazy_take): multiple calls of
- force/to_a method to Enumerator::Lazy#take should return same
- results. [ruby-dev:45634] [Bug #6428]
+ * lib/rdoc, test/rdoc: Update to RDoc 2.0.0 r56.
- * test/ruby/test_lazy_enumerator.rb (test_take_recycle): add test for
- above.
+Sat Apr 26 21:30:40 2008 Tanaka Akira <akr@fsij.org>
-Sun May 13 23:38:31 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * include/ruby/intern.h (rb_hash_dup): declared.
- * test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
- to close IO objects. it create IO object with already closed fd, and
- cause occasional Errno::EBADF in following tests. [ruby-core:45020]
- [Bug #6228]
+ * hash.c (rb_hash_dup): new function.
-Sun May 13 23:32:16 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+ * process.c (rb_spawn_internal): don't modify option hash.
- * test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of
- test_flush_in_finalizer1. [ruby-core:43951] [Bug #6228]
+Sat Apr 26 18:36:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun May 13 22:46:36 2012 Tanaka Akira <akr@fsij.org>
+ * io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h:
+ suppress warnings.
- * ext/etc/etc.c (passwd_ensure): move endpwent() call from
- passwd_iterate to close /etc/passwd on exception.
- (group_ensure): move endgrent() call from group_iterate to close
- /etc/group on exception.
+Sat Apr 26 17:42:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun May 13 18:10:43 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * error.c (builtin_types), gc.c (count_objects): added Complex and
+ Rational.
- * ext/date/date_strftime.c: removed unused code and changed the style.
+Sat Apr 26 17:35:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun May 13 17:37:56 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * error.c (rb_eNOERROR): renamed.
- * ext/date/date_strftime.c: refactored.
+Sat Apr 26 17:30:11 2008 Koichi Sasada <ko1@atdot.net>
-Sun May 13 06:40:12 2012 Luis Lavena <luislavena@gmail.com>
+ * include/ruby/ruby.h, gc.c: remove T_BLOCK.
- * test/ruby/test_io.rb (class TestIO): Disable GC during IO tests to
- avoid file descriptors being GC'ed. Suggestion by Tomoyuki Chikanaga
- [ruby-core:43951][Bug #6228]
+ * include/ruby/ruby.h: re-number T_xxx.
-Sat May 12 07:00:16 2012 Eric Hodel <drbrain@segment7.net>
+Sat Apr 26 17:31:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/sdbm/init.c: Added documentation. Patch by Justin Collins,
- cleanup by Zachary Scott. [ruby-trunk - #6410]
+ * process.c (rb_cProcessTms, rb_cProcessStatus): renamed.
-Sat May 12 06:02:03 2012 Eric Hodel <drbrain@segment7.net>
+ * error.c (builtin_types), signal.c (siglist), st.c (primes),
+ struct.c (ref_func), time.c (months): constified.
- * lib/fileutils.rb (cp_r): Fixed cp_r example. Patch by TJ Koblentz
- from pull request #114. [ruby-trunk - Bug #6411]
+Sat Apr 26 13:00:41 2008 Tanaka Akira <akr@fsij.org>
-Sat May 12 05:23:06 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/open3.rb: double fork is replaced by spawn with Process.detach.
+ (Open3.popen3w): new method to access the thread returned by
+ Process.detach.
- * thread.c (rb_threadptr_execute_interrupts_common):
- test_signal_requiring of test/ruby/test_signal.rb fail if the sub
- process is killed on waiting IO in lex_io_gets in rb_load_file in
- rb_load_internal in require.
- This is because
- (1) the process receive the killing signal in
- rb_thread_io_blocking_region in rb_read_internal in lex_io_gets.
- (2) set th->errinfo as INT2FIX(TAG_FATAL) at
- rb_threadptr_execute_interrupts_common.
- (3) escape rb_load_file in rb_load_internal and jump to EXEC_TAG()
- without set loaded as TRUE.
- (4) call first rb_exc_raise(GET_THREAD()->errinfo); because loaded
- is FALSE as above. this errinfo should be an exception object
- but this is INT2FIX(TAG_FATAL).
- Don't call first rb_exc_raise if GET_THREAD()->errinfo is Fixnum.
+Sat Apr 26 00:47:43 2008 Tanaka Akira <akr@fsij.org>
-Fri May 11 14:23:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * parse.y (primary): begin/end block should be isolated from outside.
- [ruby-dev:45631][Bug #6419]
+Sat Apr 26 12:26:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri May 11 14:09:47 2012 Nobuyoshi Nakada <nobu@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>
- * ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
- must not cast it to unsigned long, which may be shorter than
- VALUE, and the result can be mere garbage.
+ * gc.c (free_unused_heaps): preserve last used heap segment to
+ reduce malloc() call.
-Fri May 11 09:51:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 25 17:54:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/test/unit.rb (Test::Unit::Runner#failed): no unnecessary
- newlines if no reports to be displayed.
+ * 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 May 10 10:55:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (rb_newobj_from_heap): eventually allocate heap segments.
- * test/minitest/test_minitest_mock.rb: Correct requiring path to
- metametameta.rb.
+Fri Apr 25 15:35:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/minitest/test_minitest_unit.rb: Correct requiring path to
- metametameta.rb.
+ * process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in
+ earg.
-Thu May 10 10:18:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 25 12:37:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (lex_state_name): returns name for lex_state_e, for debug
- use.
+ * array.c (flatten): returns an instance of same class.
+ [ruby-core:16554]
-Wed May 9 16:36:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 25 10:52:27 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/mkmf.rb (MakeMakefile#pkg_config): check if libs resulted from
- pkg-config works actually.
+ * include/ruby/win32.h: define mode_t for umask.
-Wed May 9 16:01:38 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * process.c (check_exec_options_i, check_exec_fds, run_exec_options):
+ support "close_others" only when fork(2) is available.
- * lib/net/imap.rb (decode_utf7, encode_utf7): refactored by
- Nobuyoshi Nakada, to use String#encode.
+Fri Apr 25 00:16:11 2008 Tanaka Akira <akr@fsij.org>
-Wed May 9 13:26:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c: include sys/stat.h for umask.
- * test/rubygems/test_gem_remote_fetcher.rb: skip OpenSSL dependent
- tests if not available.
+Thu Apr 24 23:25:17 2008 Tanaka Akira <akr@fsij.org>
-Wed May 9 08:09:38 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * 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.
- * lib/minitest/*: Imported minitest 3.0.0 (r7435)
- * test/minitest/*: ditto
- * test/rubygems/*: Imported fixes for buggy use of assert_match
- and deprecated assert_block
- UNBUNCH YOUR PANTIES. THE TESTS DO NOT RUN CLEAN ON OSX.
+ * 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.
-Wed May 9 06:28:59 2012 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * re.c (rb_reg_equal): Removed incorrect example for Regexp#== with
- "n" option. [ruby-talk - Bug #6415]
+ * hash.c (rb_env_clear): renamed from env_clear and externed.
-Wed May 9 06:23:33 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ [ruby-dev:34086]
- * ext/date/date_core.c: reverted.
+Thu Apr 24 23:00:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Wed May 9 04:31:26 2012 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * test/ruby/test_thread.rb: fix typos.
- * lib/rinda/ring.rb (lookup_ring_any): fix Rinda::RingFinger.primary
- hungs forever. [ruby-talk:395364]
+ * test/ruby/envutil.rb (rubyexec): move Open3.popen3 call into timeout
+ block.
-Tue May 8 21:09:00 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Thu Apr 24 22:34:52 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * include/ruby/win32.h (FD_SET): change function to macro.
- To avoid buffer overflow when smaller FD_SETSIZE is used in ext
- libraries.
+ * test/ruby/test_comparable.rb: new tests for Comparable, to achieve
+ 100% test coverage of compar.c.
- * win32/win32.c (rb_w32_fdset): this function is not used anymore.
- But we leave this for compatibility.
+Thu Apr 24 17:19:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/win32.c (rb_w32_select_with_thread): fix SEGV when smaller
- FD_SETSIZE is used in ext libraries. Dereference of fd_set pointer
- causes SEGV.
+ * ruby.c (process_options): set safe_level before loading script.
+ [ruby-dev:34421]
- * test/-ext-/win32/test_fd_setsize.rb(TestFdSetSize): add tests for
- above.
- * ext/-test-/win32/fd_setsize/depend: ditto.
- * ext/-test-/win32/fd_setsize/extconf.rb: ditto.
- * ext/-test-/win32/fd_setsize/fd_setsize.c: ditto.
+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.
+
+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.
+
+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 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>
+
+ * test/openssl/test_ssl.rb (start_server): add timeout to server.join.
+
+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>
+
+ * misc/ruby-style.el (ruby-style-{case,label}-indent): up list from
+ indentation point.
+
+Tue Apr 22 21:09:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
+ type of content is unsigned char.
+
+ * ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.
+
+ * ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.
+
+ * 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>
+
+ * 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>
+
+ * vm_evalbody.c (DECL_SC_REG): typo fixed.
+
+Tue Apr 22 15:25:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (struct timespec): needs time.h according to POSIX.
+
+Tue Apr 22 13:19:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * thread.c (rb_thread_stop_timer_thread): should clear
+ timer_thread_id after stopping it.
+
+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>
+
+ * 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.
+
+ * ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
+ which are aliases to #each_line and #each_byte, respectively.
+
+ * ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
+ enumerator if no block is given.
+
+ * 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.
+
+ * 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:01:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * iseq.c (rb_iseq_compile_with_option): check if src is a string.
+ [ruby-core:16453]
+
+Mon Apr 21 16:06:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enumerator.c (enumerator_init): preserve the method name in ID.
+
+ * enumerator.c (enumerator_each): need not to call rb_to_id().
+
+ * enumerator.c (enumerator_with_index): ditto.
+
+Mon Apr 21 11:00:27 2008 Yukihiro Matsumoto <matz@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]
+
+Mon Apr 21 10:06:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c: should include <errno.h> to refer to errno.
+
+Mon Apr 21 09:58:04 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>
+
+ * gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
+
+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>
+
+ * 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 15:01:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (struct iseq_compile_data): moved label_no from
+ new_label_body().
+
+ * compile.c (iseq_set_exception_table): allocates catch_table only
+ when entries exist.
+
+ * compile.c (struct iseq_link_element, struct iseq_insn_data): made
+ enum for debuggers.
+
+Sun Apr 20 14:44:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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]
+
+Sun Apr 20 13:55:37 2008 Tanaka Akira <akr@fsij.org>
+
+ * io.c (copy_stream_fallback): write directly (bypassing write method)
+ if possible.
+
+Sun Apr 20 12:49:03 2008 Tanaka Akira <akr@fsij.org>
+
+ * io.c (copy_stream_fallback): read directly (bypassing readpartial
+ method) if possible.
+
+Sun Apr 20 04:45:13 2008 Tanaka Akira <akr@fsij.org>
+
+ * io.c (copy_stream_body): use readpartial and write method for
+ non-IOs such as StringIO and ARGF.
+
+Fri Apr 18 20:57:33 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_array.rb: add tests to achieve over 95% test coverage
+ of array.c.
+
+Fri Apr 18 17:37:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (rb_gc_mark_locations): get rid of underflow.
+
+ * gc.c (mark_current_machine_context): check if the main thread stack
+ position may shrink under the initialized position. [ruby-core:16436]
+
+Thu Apr 17 22:20:52 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * enc/trans/utf_16_32.c (fun_so_to_utf_16be, fun_so_to_utf_16le): add
+ parentheses to remove warnings of gcc.
+
+ * io.c (rb_io_getc): remove unused variables.
+
+ * compile.c (NODE_NEXT, NODE_REDO): remove unused labels.
+
+ * ext/nkf/nkf.c (rb_nkf_convert): remove unused variables.
+
+ * 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>
+
+ * 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>
+
+ * test/ruby/test_rubyoptions.rb (ruby): run in C locale.
+
+ * test/ruby/test_rubyoptions.rb (test_encoding): --encoding does not
+ affect source code.
+
+Thu Apr 17 00:45:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_process.rb (test_rlimit_nofile): reset RLIMIT_NOFILE
+ before exit (for gcov).
+
+ * test/ruby/test_rubyoptions.rb: new tests for option of ruby
+ interpreter, to achieve over 95% test coverage of ruby.c.
+
+Wed Apr 16 02:40:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (process_options): preludes and parser need to run in safe
+ level 0. [ruby-dev:34407]
+
+Wed Apr 16 02:26:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (process_options): dln_find_file returns the pointer to a
+ static buffer, so should copy it. [ruby-dev:34409]
+
+Tue Apr 15 23:08:46 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>
+
+ * lib/net/http.rb, lib/net/smtp.rb, lib/net/pop.rb: update
+ URLs of Japanese documents.
+
+Tue Apr 15 16:45:14 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * 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.
+
+ * 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.
+
+ * misc/ruby-mode.el (ruby-mode): use write-contents-functions or
+ write-contents-hooks for older versions.
+
+Tue Apr 15 07:21:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * complex.c (nucomp_div): [ruby-dev:34357]
+
+ * complex.c (nucomp_abs): use hypot.
+
+ * complex.c (nucomp_quo): do not force conversion.
+
+ * test/ruby/test_complex.rb: omitted some meaningless tests.
+
+Mon Apr 14 23:25:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_objectspace.rb: add a test for
+ ObjectSpace.count_objects.
+
+Mon Apr 14 22:44:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
+ half-baked result string.
+
+ * re.c (rb_reg_search): make search reentrant. [ruby-dev:34223]
+
+ * test/ruby/test_parse.rb (TestParse::test_global_variable):
+ should preserve $& variable.
- [ruby-core:44588] [Bug #6352]
+Mon Apr 14 17:23:27 2008 Akinori MUSHA <knu@iDaemons.org>
-Tue May 8 20:44:46 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
+ env_reject_bang): Return an enumerator if no block is given.
- * io.c (io_unread): fix IO#pos with mode 'r' bug on Windows.
- If the end of reading buffer is CR, io_unread() needs to unread one
- more byte.
- [ruby-core:44874] [Bug #6401]
+Mon Apr 14 14:33:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_io_m17n.rb (TestIO_M17N#test_pos_with_buffer_end_cr):
- add a test for above.
+ * compile.c, compile.h (compile_debug): made runtime option.
-Tue May 8 13:38:17 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * debug.c (ruby_debug_print_indent): returns if debug_level exceeds
+ the threshold.
- * ext/date/date_core.c: improving introduction in Date/DateTime
- documentation. patched by Daniel Kaufman via Github.
- https://github.com/ruby/ruby/pull/110
+ * debug.c (ruby_debug_printf): printf to stderr.
-Tue May 8 13:36:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * iseq.c (make_compile_option, make_compile_option_value): added
+ debug_level option.
- * configure.in (POSTLINK): default to : command to get rid of flag
- only command, since BSD make does not work with it.
+ * vm_core.h (rb_compile_option_t): added debug_level.
-Tue May 8 13:35:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm_core.h (struct iseq_compile_data): added node_level.
- * lib/test/unit.rb (MiniTest#run_test): remove exact trace and get rid
- of IndexError, which could caused by modified $@ sometimes.
+Mon Apr 14 12:52:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue May 8 11:21:27 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (Init_stack): use ruby_init_stack. [ruby-dev:34350]
- * test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report):
- support drive letter on Windows. yes, the original code is metameta.
+ * gc.c (rb_objspace_t): packed globals. [ruby-dev:34348]
-Tue May 8 08:54:48 2012 Eric Hodel <drbrain@segment7.net>
+ * gc.c (finalizers): removed. [ruby-dev:34349]
- * lib/abbrev.rb: Fixed typo in abbrev pattern documentation. Based on
- patch by Mark Rushakoff. [ruby-trunk - #6346]
+Mon Apr 14 11:30:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue May 8 07:44:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * array.c (ary_new): new integer overflow check condition.
+ suggested by TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
+ [ruby-dev:34156].
- * ext/openssl/ossl_ssl.c (ossl_start_ssl): remove useless rb_sys_fail
- before ossl_raise. this cause a test failure on Linux.
- http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz
+ * array.c (rb_ary_initialize): ditto.
-Tue May 8 05:35:18 2012 Eric Hodel <drbrain@segment7.net>
+Mon Apr 14 00:51:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * object.c (Init_Object): Added reference to variable.c where
- public_constant and private_constant documentation lives. [#6381]
+ * test/ruby/test_parse.rb: add tests to achieve over 95% test coverage
+ of parse.y.
-Tue May 8 04:47:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 13 23:53:58 2008 Akinori MUSHA <knu@iDaemons.org>
- * lib/test/unit.rb (Test::Unit::Runner#output): prefer local output to
- get rid of unexpected side effect in test/minitest/metametameta.rb.
+ * enum.c (enum_cycle): Make Enumerable#cycle do a finite loop when
+ the number of cycles is specified.
- * lib/test/unit.rb (MiniTest#run_test): show the running test in $0.
+ * array.c (rb_ary_cycle): Ditto for Array#cycle.
- * lib/test/unit.rb (Test::Unit::StatusLineOutput): new class to output
- in status line.
+Sun Apr 13 18:52:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/testunit/test_hideskip.rb (TestHideSkip#test_hideskip):
- MiniTest#puke now reports Skipped messages only if verbose mode.
+ * thread_pthread.c (lock_func): should not check interrupts in
+ blocking region. [ruby-dev:34378]
- * test/testunit/test_sorting.rb (TestTestUnitSorting#test_sorting):
+Sat Apr 12 12:41:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
+ use iseq instead of NODE.
+
+ * gc.c (source_filenames): removed.
+
+ * include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
+ ripper_initialize): rb_source_filename() is no longer used.
+
+ * 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.
+
+Sat Apr 12 12:17:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * prelude.rb (require_relative): move require_relative from
+ lib/require_relative.rb. [ruby-core:16356]
+
+ * lib/require_relative.rb: removed.
+
+Sat Apr 12 05:55:57 2008 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems*, test/rubygems*: Update to RubyGems 1.1.1 r1701.
+
+Sat Apr 12 03:13:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): set external encoding.
+
+ * file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
+ copy encoding.
+
+Fri Apr 11 17:35:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enum.c (count_i): modified to shut warning up.
+
+Fri Apr 11 17:25:09 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * enum.c (count_i, count_iter_i, enum_count, enum_find_index):
+ Reduce code.
+
+Fri Apr 11 17:06:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enum.c (find_index_i): modified to shut warning up.
+
+ * enum.c (find_index_iter_i): ditto.
+
+Fri Apr 11 16:44:43 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * enum.c (enum_find_index): Add support for find_index(obj);
+ [ruby-dev:34313].
+
+ * array.c (rb_ary_index): Define find_index as an alias to index.
+
+Fri Apr 11 16:42:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/yaml/store.rb (YAML::load): modified to support empty
+ database.
+
+Fri Apr 11 08:05:12 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:34312].
+
+Thu Apr 10 23:08:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/pstore.rb (PStore::dump, PStore::load): allow subclass
+ overriding. [ruby-dev:34305]
+
+ * lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
+ add a method to support faster PStore.
+
+Thu Apr 10 20:36:45 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * 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.
+
+Thu Apr 10 19:41:00 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * eval.c (rb_f_loop): Mention StopIteration in the document.
+
+Thu Apr 10 19:23:55 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * array.c (rb_ary_pop_m, rb_ary_shift_m): Update documents for
+ #pop() and #shift().
+
+ * array.c (rb_ary_slice_bang): Update document. Assigning
+ array[*args]= nil no longer removes elements.
+
+Thu Apr 10 16:58:44 2008 Tanaka Akira <akr@fsij.org>
+
+ * marshal.c (w_object): TYPE_USERDEF assigns id for ivars first.
+ [ruby-dev:34159] by nagachika.
+
+Thu Apr 10 15:03:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/generator.rb: removed obsolete library. [ruby-core:16233]
+
+ * test/test_generator.rb: removed as well. [ruby-dev:34306]
+
+ * lib/pstore.rb: replaced by Hongli Lai's faster version.
+
+Thu Apr 10 10:27:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread_pthread.c (native_sleep): sleep_cond is initialized at
+ creation. [ruby-Patches-19361].
+
+Wed Apr 9 14:43:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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].
+
+Wed Apr 9 12:12:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_thread.rb: new tests from Sylvain Joyeux in
+ [ruby-Patches-19361].
+
+Tue Apr 8 21:36:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_mutex_sleep): ensures to re-acquire at waking up.
+ [ruby-Patches-19361]
+
+Tue Apr 8 11:00:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/complex.rb: remove Math first before overwriting by CMath.
+
+Tue Apr 8 10:34:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * load.c (rb_require_safe): should check fname path after $SAFE is
+ properly set. [ruby-dev:34268]
+
+ * re.c (rb_reg_quote): should always copy the quoting string.
+ [ruby-core:16235]
+
+Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (prelude.c): depends on enc/prelude.rb.
+
+ * enc/prelude.rb: fixed initial library names.
+
+Tue Apr 8 03:39:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * load.c (rb_provided): check expanded path for relative path
+ features, loading or loaded features are already expanded in 1.9.
+
+ * variable.c (rb_autoload_load): no needs to check if provided before
+ rb_require_safe. [ruby-dev:34266]
+
+Mon Apr 7 22:41:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * numeric.c: cancelled recent changes (except to remove rdiv).
+
+ * bignum.c: ditto.
+
+ * bignum.c: added rb_big_idiv.
+
+Mon Apr 7 15:51:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (enc_init_db): moved to enc/encdb.c.
+
+ * transcode.c (init_transcoder_table): moved to enc/trans/transdb.c.
+
+ * enc/depend (enc/encdb.o enc/trans/transdb.o): depend on
+ corresponding headers.
+
+ * common.mk (COMMONOBJS): moved transcode.o from OBJS
+
+Mon Apr 7 12:26:32 2008 Koichi Sasada <ko1@atdot.net>
+
+ * bootstraptest/test_knownbug.rb: add a known-bug.
+
+Mon Apr 7 12:15:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * range.c (range_each_func): should not leave a variable
+ uninitialized, which could cause SEGV.
+
+ * range.c (range_step): removed duplicated and unreachable code.
+
+Mon Apr 7 02:12:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_intern): need not to check if tainted.
+ [ruby-dev:34219]
+
+Sun Apr 6 09:45:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (dir_tell): check if closed. [ruby-core:16223]
+
+Sat Apr 5 23:17:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/cmath.rb: new.
+
+ * lib/complex.rb: depends lib/cmath.rb.
+
+ * lib/rational.rb: added rdiv.
+
+ * complex.c: removed some math functions.
+
+Sat Apr 5 05:50:57 2008 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
+
+ * lib/rdoc/generator/html.rb: ditto.
+
+ * lib/rdoc/options.rb: Fix shadowed variable warning.
+
+ * lib/webrick/httprequest.rb: Fix redefined method warning.
+
+Sat Apr 5 02:13:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_cmpint): moved from compar.c, to check bignum
+ zero.
+
+Fri Apr 4 23:24:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * re.c (rb_memsearch_qs): wrong boundary condition.
+
+ * re.c (rb_memsearch_qs_utf8): ditto.
+
+Fri Apr 4 14:11:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_memsearch_qs): wrong boundary condition. a patch from
+ wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248].
+
+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]
+
+ * 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.
- * lib/test/unit.rb (Test::Unit::Runner#puke): modify only result and
- drop useless reports, not override entirely.
+Tue Apr 1 21:19:41 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * bootstraptest/runner.rb (exec_test, show_progress): show rotators
- and pass/fail counts.
+ * rational.c: need to include <float.h> just once.
- * sample/test.rb (PROGRESS): refine output.
+Tue Apr 1 16:40:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue May 8 02:34:26 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * bignum.c (big2dbl): more precise conversion at edge cases.
+ [ruby-dev:34195]
- * lib/minitest/unit.rb (assert_match): refix of r35563.
- r35563 breaks the intention of the original change.
- https://github.com/seattlerb/minitest/commit/68858105b2eb11c85105ffac5f32b662c59397f3
- * lib/minitest/unit.rb (refute_match): ditto.
+Tue Apr 1 14:43:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon May 7 21:19:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in: get rid of empty expansion.
- * ext/json: Merge JSON 1.7.1.
- https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
+ * configure.in: _setjmp is available but _longjmp is not on mingw.
-Mon May 7 22:54:22 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Tue Apr 1 09:41:22 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_ssl.c: add support for option flags
- OpenSSL::SSL::OP_NO_TLSv1_1
- OpenSSL::SSL::OP_NO_TLSv1_2
- to allow blocking specific TLS versions. Thanks to Justin Guyett for
- pointing this out to me.
- * test/openssl/test_ssl.rb: add tests to assert correct behavior when
- blocking certain versions of TLS/SSL both on server and client side.
- Also refactored tests to reduce boilerplate code a little.
- * test/openssl/utils.rb: rescue Errno::ECONNRESET for tests where
- client rejects the connection because a forbidden protocol version
- was used.
+ * {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
-Mon May 7 20:14:15 2012 Tanaka Akira <akr@fsij.org>
+Tue Apr 1 07:31:58 2008 Eric Hodel <drbrain@segment7.net>
- * lib/securerandom.rb (random_bytes): call to_int method for the
- argument at first.
+ * lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
-Mon May 7 17:54:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Apr 1 03:20:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/minitest/unit.rb (assert_match): replace matcher only if both
- matcher and obj are String. fix r35541. [Bug #6405]
- DON'T COMMIT IF YOU CAN'T RUN TEST.
- FIX AS SOON AS POSSIBLE YOU BREAK TESTS.
- patched by ayumin.
- https://github.com/seattlerb/minitest/pull/124
+ * configure.in (RUBY_SETJMP, RUBY_LONGJMP, RUBY_JMP_BUF): prefers
+ _setjmp over setjmp and sigsetjmp. [ruby-core:16023]
+ __builtin_setjmp cannot handle a variable.
- * lib/minitest/unit.rb (refute_match): ditto.
+ * configure.in (--with-setjmp-type): new option to override the
+ default rule in the above.
-Mon May 7 13:41:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval_intern.h (ruby_setjmp, ruby_longjmp), gc.c (rb_setjmp),
+ vm_core.h (rb_jmpbuf_t): use RUBY_SETJMP, RUBY_LONGJMP and
+ RUBY_JMP_BUF.
- * Makefile.in (PROGRAM), configure.in (POSTLINK): sign built program
- using RUBY_CODESIGN identity.
+Tue Apr 1 01:55:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon May 7 13:03:55 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/resolv.rb (Resolv::Config.default_config_hash): requires
+ win32/resolv to use Win32::Resolv. [ruby-dev:34138]
- * lib/net/imap.rb (body_type_attachment): parse body type
- "ATTACHMENT". [ruby-core:44849] [Bug #6397]
+Tue Apr 1 01:40:58 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Mon May 7 10:49:36 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * complex.c: adopted the ruby's style.
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): define IDs before
- they are used. [ruby-core:44900] [Bug #6406]
+ * rational.c: ditto.
-Mon May 7 10:27:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 1 00:17:35 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * ext/digest/rmd160/rmd160.c (RMD160_Update): fix for huge data.
+ * rational.c: revert.
-Mon May 7 10:23:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 31 18:57:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/fileutils/fileasserts.rb: use assert_equal, assert_match, and so on.
+ * {bcc,win}32/Makefile.sub (config.h): define ssize_t.
- * test/ruby/enc/test_utf16.rb, test/ruby/enc/test_utf32.rb,
- test/ruby/test_io_m17n.rb (assert_str_equal): ditto.
+ * io.c (copy_stream_body): some platform don't have O_NOCTTY.
- * test/rubygems/test_gem_remote_fetcher.rb
- (assert_data_from_{server,proxy}): ditto.
+Mon Mar 31 18:42:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/test_pstore.rb (test_thread_safe): ditto.
+ * configure.in: check for ssize_t. [ruby-dev:34184]
-Mon May 7 10:16:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 31 14:45:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/rubygems/test_gem_installer.rb (TestGemInstaller#test_dir): fix
- argument order. expected value must come first.
+ * numeric.c (num_quo): should convert its operand to Rational.
-Mon May 7 09:14:11 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * rational.c (string_to_r_strict): should raise TypeError.
- * ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.2. Add
- SSLContext#version to inspect the version that was negotiated for
- a given connection.
- * ext/openssl/extconf.rb: detect TLS 1.1 & 1.2 support.
- * test/openssl/test_ssl.rb: add tests for TLS 1.1 & 1.2 given they
- are supported by the native OpenSSL being used.
+ * bignum.c (Init_Bignum): should not redefine Bignum#div.
+ Numeric#div will do. [ruby-dev:34066]
-Sun May 6 21:34:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Mar 31 04:05:15 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * io.c (io_encoding_set): suppress warnings. [ruby-dev:45627]
- this tmp1 is not required after r35538.
+ * io.c (io_getc): set coderange while getting characters.
- * addr2line.c: suppress warnings.
+Sun Mar 30 23:16:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun May 6 18:39:39 2012 Koichi Sasada <ko1@atdot.net>
+ * proc.c (proc_dup): should copy is_lambda attribute as well.
+ [ruby-talk:296244]
- * compile.c (iseq_compile_each): remove unused variable `size'.
+Sun Mar 30 15:33:29 2008 Tanaka Akira <akr@fsij.org>
-Sun May 6 14:50:03 2012 Tanaka Akira <akr@fsij.org>
+ * io.c: IO.copy_stream implemented. [ruby-dev:33843]
- * lib/securerandom.rb: show actual read length in an error message.
+ * thread.c (rb_fd_select): new function.
-Sat May 5 06:43:10 2012 Ryan Davis <ryand-ruby@zenspider.com>
+ * configure.in (sys/sendfile.h): check the header file.
+ (sendfile): check the function.
+ (pread): check the function.
- * lib/minitest/*: Imported minitest 2.12.1 (r7323)
- * test/minitest/*: ditto
+Sat Mar 29 14:18:41 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat May 5 01:47:33 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
- * test/zlib/test_zlib.rb (test_inflate): add a test for Zlib.inflate.
- patched by headius (Charles Nutter). [ruby-core:44859] [Bug #6398]
+ * 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
+ "require 'tkextlib/tile'".
- * test/zlib/test_zlib.rb (test_deflate): add a test for Zlib.deflate.
+ * ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
+ is obsolete. It outputs warning. To control default widget set,
+ use "Tk.default_widget_set = :Ttk".
-Sat May 5 00:53:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * 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
+ 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.
- * io.c (parse_mode_enc): remove warnings 'Ignoring internal encoding'.
- [ruby-core:44455] [Bug #6324]
+ * 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
+ purpose as TkConfigMethod's ones.
- * io.c (io_encoding_set): ditto.
+ * 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.
-Fri May 4 07:19:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state
+ method instead of instate/state method.
- * lib/rdoc/parser.rb (RDoc.binary?): fix wrong regexp.
- [ruby-core:44798] [Bug #6393]
+ * 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
+ are replaced to "instance_exec(self)".
-Fri May 4 01:33:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not
+ a character code on Ruby1.9).
- * lib/rdoc/parser.rb (RDoc.alias_extension): a real file is irrelevant
- to aliasing. [ruby-core:44796][Bug #6392]
+ * ext/tk/lib/tk/variable.rb: support new style of operation argument
+ on Tcl/Tk's 'trace' command for variables.
- * lib/rdoc/parser.rb (RDoc.zip?): non-existent file will not be a zip
- file.
+ * ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix
- * lib/rdoc/parser.rb (RDoc.can_parse_by_name): accept aliased
- extension file names.
+ * ext/tk/sample/demos-jp/textpeer.rb,
+ ext/tk/sample/demos-en/textpeer.rb: new widget demo.
- * lib/rdoc/parser.rb (RDoc.binary?): binary read data may have
- incomplete multibyte sequence. [ruby-core:44798][Bug #6393]
+ * ext/tk/tcltklib.c: decrease SEGV troubles (probably)
-Wed May 2 23:55:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9
- * lib/test/unit.rb (Test::Unit::RequireFiles#non_options): expand
- real path to get rid of loading same files via symlinks.
+ * ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)
-Wed May 2 23:26:04 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * 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__)
- * cont.c (rb_fiber_m_transfer): improve sample code in Fiber#transfer
- documentation. emphasize the difference between transfer and resume.
+ * 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
+ as toplevel widgets.
-Wed May 2 23:21:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tkextlib/tile/style.rb: ditto.
+ (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)
- * parse.y (parser_yylex): allow spaces between lambda arrow and
- parenthesis. [ruby-dev:45605][Feature #6390]
+ * 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.
-Wed May 2 19:06:30 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/lib/tk/timer.rb: sometimes fail to set callback procedure.
- * cont.c (rb_fiber_m_transfer): Improved Fiber documentation.
- patched by Anuj Dutta. [ruby-core:44540][Bug #6343]
+ * 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.
-Wed May 2 13:06:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.
- * README, README.ja: reformatted using rdoc markup. based on the
- patches by zzak (Zachary Scott) in [Feature #6388].
+Thu Mar 27 20:44:22 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * README, README.ja: updated the author's mail address.
+ * complex.c (f_lcm): removed.
-Wed May 2 09:46:09 2012 Kouji Takao <kouji@takao7.net>
+ * rational.c (rb_lcm, rb_gcdlcm): added.
- * ext/readline/readline.c (Readline.special_prefixes=)
- (Readline.special_prefixes): new function. An original patch was
- created by nagachika. [Feature #5784]
+ * lib/complex.rb (gcd, lcm, gcdlcm): removed.
-Tue May 1 22:18:45 2012 Kouji Takao <kouji@takao7.net>
+ * lib/rational.rb (gcd, lcm, gcdlcm): ditto.
- * ext/readline/readline.c (Readline.pre_input_hook)
- (Readline.insert_text, Readline.redisplay): new function. An
- original patch was created by nagachika. [Feature #5785]
+Wed Mar 26 18:11:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue May 1 15:46:48 2012 Koichi Sasada <ko1@atdot.net>
+ * variable.c (rb_mod_constants): rdoc updated. a patch from
+ Florian Gilcher <flo AT andersground.net> in [ruby-core:16009].
- * common.mk: "$(Q)-..." doesn't work on nmake.
+Wed Mar 26 00:55:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Tue May 1 15:32:10 2012 Koichi Sasada <ko1@atdot.net>
+ * test/ruby/test_rand.rb: add tests to achieve over 95% test coverage
+ of random.c.
- * common.mk: replace '@' prefix to '$(Q)' to control build
- process outputs.
+Wed Mar 26 00:28:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Tue May 1 14:17:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_rational.rb: add tests to achieve over 90% test
+ coverage of rational.c.
- * ext/openssl/deprecation.rb (OpenSSL.check_func): check if header is
- available for macro compatibility.
+ * test/ruby/test_complex.rb: ditto for complex.c.
-Tue May 1 10:53:54 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Mar 25 19:34:05 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * test/ruby/test_settracefunc.rb: ignore traces from another threads
- because Kernel.set_trace_func affects other threads.
+ * bootstraptest/test_knownbug.rb: add tests. [ruby-dev:34128]
-Tue May 1 06:04:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 25 19:09:04 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/digest/sha2/sha2.c (REVERSE32): explicitly cast since unsigned
- long may be larger than sha2_word32.
+ * array.c (ary_new): fix size check. [ruby-dev:34123]
- * ext/digest/sha2/sha2.c (SHA{256,512,384}_{Final,End}): should clear
- whole content, not pointer size.
+ * array.c (rb_ary_take, rb_ary_drop): check negative size and use
+ NUM2LONG instead of FIX2LONG. [ruby-dev:34123]
- * ext/digest/*/extconf.rb: use pkg_config to use same library with
- openssl. [ruby-core:44755][Bug #6379]
+ * enum.c (enum_take, enum_drop): check negative size.
- * ext/openssl/deprecation.rb: extract check for broken Apple OpenSSL.
+ * test/ruby/test_array.rb: add tests for above.
-Tue May 1 05:02:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 25 16:32:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (optflags): disable unsafe optimizations.
- [ruby-core:44679][Bug #6370]
+ * ruby.c (proc_options): checks if the word is empty.
-Mon Apr 30 23:36:49 2012 Tanaka Akira <akr@fsij.org>
+ * ruby.c (process_options): typo fixed. [ruby-dev:34122]
- * lib/fileutils.rb (copy_metadata): use File.lchown and File.lchmod to
- update meta data of symlinks.
+Tue Mar 25 15:26:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Apr 30 23:05:53 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * compile.c (defined_expr): false short-circuit destination label may
+ be needed. [ruby-talk:295296]
- * test/ruby/test_continuation.rb (tracing_with_set_trace_func): don't
- call Continuation from other threads. [ruby-dev:45596] [Bug #6382]
+ * compile.c (iseq_compile_each): put nil if false short-circuit is
+ created.
-Mon Apr 30 20:10:04 2012 Tanaka Akira <akr@fsij.org>
+ * compile.c (compile_massign_opt): no need to use alloca.
- * ext/zlib/extconf.rb: detect z_crc_t type which will be defined
- since zlib-1.2.7.
+Mon Mar 24 19:23:52 2008 Akinori MUSHA <knu@iDaemons.org>
- * ext/zlib/zlib.c (rb_zlib_crc_table): use z_crc_t if available.
+ * 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
+ #18517.
-Mon Apr 30 09:02:15 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Mon Mar 24 10:25:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/lib/openssl/ssl.rb: add hostname to "hostname does not
- match server cert." error. patched by Wes Morgan via Github.
- https://github.com/ruby/ruby/pull/122
+ * configure.in: sitearch should use target_cpu. [ruby-core:15986]
-Mon Apr 30 04:43:53 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Mar 23 02:51:57 2008 Tanaka Akira <akr@fsij.org>
- * ext/psych/lib/psych/json/yaml_events.rb: implicit styles should not
- be changeable for JSON events.
+ * process.c (rlimit_resource_value): use NUM2RLIM.
-Sun Apr 29 06:12:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 23 02:28:01 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * parse.y (assoc, parser_yylex): add syntax to splat keyword hash.
- [ruby-core:44591][Feature #6353]
+ * complex.c: fixed. [ruby-dev:34109]
- * compile.c (compile_array_): generate keyword splat insns.
+ * rational.c: ditto.
- * vm.c (m_core_hash_merge_kwd): merge keyword hash into intermediate
- hash. leftward argument is prior currently.
+Fri Mar 21 21:32:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 27 12:34:23 2012 NAKAMURA Usaku <usa@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]
- * ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to
- unsigned long long on Win64.
- [ruby-core:44636][Bug #6364] reported by raylinn@gmail.com (ray linn)
+Fri Mar 21 21:26:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 27 10:58:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
+ [ruby-dev:29945], [ruby-dev:34095]
- * test/readline/test_readline.rb (setup): avoid affected by user's
- inputrc file. [ruby-dev:45584][Bug #6357]
+ * lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
+ name too for cygwin. [ruby-dev:29945]
-Fri Apr 27 01:45:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
- * thread.c (rb_threadptr_execute_interrupts_common):
- handle timer_interrupt only on the first loop for the case to avoid
- the infinite loop like following case:
- * there is 2 Ruby threads (3 pthreads)
- (1) main thread is waiting at gvl_yield:112 (native_cond_wait)
- (2) sub thread works
- (3) sub thread waits at gvl_yield:133 (native_mutex_unlock)
- (4) main thread works
- (5) main thread goes to gvl_acquire_common
- (6) main thread call rb_wakeup_timer_thread
- (7) timer thread set timer interrupt to the main thread
- (8) main thread works
- (9) main thread waits at gvl_acquire_common:64 (native_cond_wait)
- (10) sub tread works
- (11) set sub thread as the current thread
- (12) run Ruby thread
- (13) ...100ms
- (14) sub thread goes to rb_threadptr_execute_interrupts_common
- (15) sub thread call rb_thread_schedule_limits
- (16) sub thread call gvl_release_common
- (17) sub threads waits at gvl_yield:121 (native_cond_wait)
- (18) main threads works
- (19) main thread back to gvl_yield
- (20) set main thread as the current thread
- (21) main thread call gvl_yield
- (22) main thread waits at gvl_yield:112 (native_cond_wait)
- As described above, the main thread can't escape from
- rb_threadptr_execute_interrupts_common.
- See extended memo: http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/R35480_ExtendedMemo
+Fri Mar 21 21:10:00 2008 Akinori MUSHA <knu@iDaemons.org>
-Fri Apr 27 07:15:07 2012 Tanaka Akira <akr@fsij.org>
+ * lib/ipaddr.rb: Say that I am the current maintainer.
- * ext/socket/socket.c (sock_s_pack_sockaddr_un): support the longest
- path in sockaddr_un, really.
- reported by nagachika.
- http://d.hatena.ne.jp/nagachika/20120426/ruby_trunk_changes_35474_35476
+ * lib/set.rb: Ditto.
-Thu Apr 26 12:28:06 2012 Tanaka Akira <akr@fsij.org>
+ * lib/shellwords.rb: Ditto.
- * ext/socket/raddrinfo.c (init_unix_addrinfo): support the longest
- path in sockaddr_un.
- (inspect_sockaddr): ditto.
- (addrinfo_mdump): ditto.
- (addrinfo_mload): ditto.
- (rsock_unixpath_str): new function.
- (rsock_unixpath): removed.
- (rsock_unixaddr): use rsock_unixpath_str.
+ * ext/syslog/syslog.txt: Ditto.
- * ext/socket/socket.c (sock_s_pack_sockaddr_un): support the longest
- path in sockaddr_un.
- (sock_s_unpack_sockaddr_un): ditto.
- (sock_s_gethostbyaddr): unused variable removed.
+Fri Mar 21 09:24:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/unixsocket.c (rsock_init_unixsock): support the longest
- path in sockaddr_un.
+ * instruby.rb (open_for_install): write block result and rewrite only
+ if changed from existing file.
- * ext/socket/rubysocket.h (rsock_unixpath_str): declared.
- (rsock_unixpath): removed.
+Fri Mar 21 08:29:33 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * test/socket/test_unix.rb: comment out test_nul because abstract unix
- sockets may contain NULs.
+ * rational.c (nurat_to_f): rearrangement.
-Thu Apr 26 01:32:33 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Fri Mar 21 06:44:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/optparse/test_summary.rb (test_summary_containing_space): add
- test for r35467. OptionParser#to_a shouldn't split banner by spaces.
+ * rational.c (nurat_to_f): C99.
-Wed Apr 25 23:02:46 2012 Tanaka Akira <akr@fsij.org>
+Fri Mar 21 01:40:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * ext/socket/raddrinfo.c (init_unix_addrinfo): refine error message
- format.
- (addrinfo_mload): show more information on "too long AF_UNIX path"
- error.
- (addrinfo_unix_path): ditto for "too short AF_UNIX address" and
- "too long AF_UNIX address" error.
+ * complex.c (nucomp_sub, nucomp_expt): call corresponding functions.
-Wed Apr 25 05:46:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 21 01:21:43 2008 Yusuke Endoh <mame@tsg.ne.jp>
- * lib/optparse.rb (OptionParser#to_a): split for each lines.
- [ruby-dev:45568][Bug #6348]
+ * missing/tgamma.c: include config.h before math.h. [ruby-dev:34075]
-Tue Apr 24 21:57:53 2012 Tanaka Akira <akr@fsij.org>
+Thu Mar 20 21:46:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/raddrinfo.c (init_unix_addrinfo): show actual path length
- when it is too long for Unix socket.
+ * io.c (argf_getline): use receiver.
- * ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
+Thu Mar 20 21:20:19 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * ext/socket/socket.c (sock_s_pack_sockaddr_un): ditto.
+ * rational.c: some improvements (include Shin-ichiro HARA's
+ effort).
-Tue Apr 24 21:43:58 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * complex.c: some improvements.
- * lib/net/smtp.rb (check_continue): raise an error with an explanatory
- message. [ruby-core:35854] [Feature #4598]
+ * test/ruby/test_rational2.rb: new.
-Tue Apr 24 21:11:31 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Mar 20 00:21:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
- and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
- [ruby-dev:45568][Bug #6348]
+ * io.c (argf_initialize_copy): get rid of segfault.
-Tue Apr 24 19:59:31 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * 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.
- * enc/euc_jp.c: added EUC-JP-2004 and its alias EUC-JISX0213.
- [ruby-dev:45571] [Feature #6349]
- Requested by Kyouhei Yanagita <yanagi@shakenbu.org>.
+Wed Mar 19 23:52:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enc/trans/japanese_euc.trans: ditto.
+ * 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]
- * enc/trans/JIS/JISX0213-[12]%UCS@{BMP,SIP}.src: JIS X 0213:2004 ->
- Unicode mapping table from NetBSD.
+Wed Mar 19 22:27:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * enc/trans/JIS/UCS@{BMP,SIP}%JISX0213-[12].src: Unicode -> JIS X
- 0213:2004 mapping table from NetBSD.
+ * rational.c: added rb_gcd.
- * tool/transcode-tblgen.rb: added SIP support.
+ * complex.c: use rb_gcd.
- * test/ruby/test_transcode.rb: tests of above changes.
+Wed Mar 19 18:37:00 2008 Tadayoshi Funaba <tadf@dotrb.org>
-Tue Apr 24 18:12:13 2012 Koichi Sasada <ko1@atdot.net>
+ * complex.c: revert.
- * compile.c: fix to output warning when the same literals
- are available as a condition of same case clause.
- And remove information ('#n') because we can find duplicated
- condition with explicit line numbers.
- [ruby-core:38343] [Ruby 1.9 - Bug #5068]
+ * rational.c: revert.
- * test/ruby/test_syntax.rb: add a test for above.
+Wed Mar 19 17:31:20 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Apr 24 17:03:51 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval_intern.h (TH_EXEC_TAG): need not to FLUSH_REGISTER_WINDOWS.
+ [ruby-core:15871], [ruby-dev:34088]
- * win32/win32.c (waitpid): need to check the return value of
- FindChildSlotByHandle() before passing poll_child_status().
- this fixed a SEGV in test-all. reported by ko1 via IRC.
+Wed Mar 19 14:53:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Apr 24 16:04:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * complex.c (nucomp_to_s, nucomp_inspect): get rid of making
+ unnecessary intermediate objects.
- * parse.y (parser_yylex): EXPR_BEG by keywords is a start point of
- commands. [ruby-dev:45563][Bug #6347]
+ * complex.c (make_patterns, string_to_c): do not treat successive
+ underscores as a part of numeric like as literals. [ruby-dev:34085]
- * parse.y (superclass): ditto for superclass.
+ * rational.c (make_patterns, string_to_r): ditto.
- * parse.y (parser_parse_string, parser_here_document): ditto for
- string interpolation.
+Wed Mar 19 14:36:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (parser_yylex): ditto for singleton class.
+ * bignum.c (rb_cstr_to_inum): treat successive underscores as
+ nondigit. [ruby-dev:34089]
-Tue Apr 24 15:51:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 19 14:08:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/optparse.rb (OptionParser#to_a): should split by end-of-line
- [ruby-dev:45568][Bug #6348]
+ * 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]
- * lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
- defined. [ruby-dev:45568][Bug #6348]
+Wed Mar 19 11:49:47 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Apr 24 12:46:50 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * regint.h (include): include ruby.h instead of defines.h and config.h.
- * hash.c, object.c, struct.c, lib/ostruct.rb: add to_h methods.
- [Feature #6276]
+Wed Mar 19 10:17:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Apr 24 10:54:34 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regint.h (CHECK_INTERRUPT_IN_MATCH_AT): add interrupt check
+ during match. [ruby-talk:295002]
- * test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown): cannot pass SIGTERM
- to another process on Windows, so use SIGINT instead.
+Tue Mar 18 16:24:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Apr 24 00:25:39 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * parse.y (literal_concat_gen): bail out at different encoding.
- * thread.c (rb_check_deadlock): refine an error message of deadlock
- detection. [ruby-core:44336] [Bug #6288]
+Tue Mar 18 04:00:27 2008 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Apr 24 00:14:42 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * re.c (rb_memsearch_ss): simple shift search.
- * parse.y (primary): remove wrong "fixpos" that caused incorrect
- source_location of blocks. [ruby-core:42232] [Bug #5930]
+ * re.c (rb_memsearch_qs): quick search.
- * test/ruby/test_proc.rb: add a test for above.
+ * re.c (rb_memsearch_qs_utf8): quick search for UTF-8 string.
-Mon Apr 23 22:56:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (rb_memsearch_qs_utf8_hash): hash functions for above.
- * ext/iconv: deprecated. [Feature #6322]
+ * re.c (rb_memsearch): use above functions.
-Mon Apr 23 22:07:00 2012 Tanaka Akira <akr@fsij.org>
+ * string.c (rb_str_index): give enc to rb_memsearch.
- * test/socket/test_unix.rb (bound_unix_socket): make temporary
- filename shorter for less possibility of Unix socket path over
- 107 bytes when TMPDIR has long path.
+ * include/ruby/intern.h (rb_memsearch): move to encoding.h.
-Mon Apr 23 20:35:49 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby/encoding.h (rb_memsearch): move from intern.h.
- * win32/win32.c (szInternalCmds, internal_match, internal_cmd_match):
- get rid of a segmentation fault with GCC 4.7.0.
- reported by raylinn@gmail.com (ray linn) at [ruby-core:44505]
- [Bug #6333], and patched by mame.
+ * common.mk (PREP): add dependency.
- * test/ruby/test_system.rb (TestSystem#test_system): test for it.
+Mon Mar 17 22:23:54 2008 Yusuke Endoh <mame@tsg.ne.jp>
-Mon Apr 23 20:11:02 2012 Tanaka Akira <akr@fsij.org>
+ * array.c (rb_ary_take, rb_ary_take_while, rb_ary_drop,
+ rb_ary_drop_while): new methods. [ruby-dev:34067]
- * lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.
- OpenSSL 1.0.1 rejects 512 bits RSA key for TLS1.2 with SHA512.
- http://rt.openssl.org/Ticket/Display.html?id=2769&user=guest&pass=guest
- reported by Bohuslav Kabrda.
- [ruby-core:43844] [ruby-trunk - Bug #6221]
+ * test/ruby/test_array.rb: add tests for above.
-Mon Apr 23 19:54:33 2012 Tanaka Akira <akr@fsij.org>
+Mon Mar 17 17:11:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
- reported by NARUSE, Yui. [ruby-dev:45551]
+ * misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
+ of calling `run-hooks' directly to run the mode hook. patch from
+ Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]
-Mon Apr 23 14:16:45 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Mar 17 16:41:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * .gdbinit (rb_ps_vm): follow st_table's packing change.
+ * configure.in: unset GREP_OPTIONS. [ruby-core:15918]
-Mon Apr 23 10:43:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 16 18:07:07 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
- * configure.in: disable rubygems not to load rbconfig.rb before
- fake.rb. [ruby-core:44492][Bug #6329]
+ * enc/trans/utf_16_32.c: bug fix (some invalid UTF-8 sequences
+ were legal)
-Sun Apr 22 20:26:06 2012 Tanaka Akira <akr@fsij.org>
+ * test/ruby/test_transcode.rb: test for above bug
- * lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to
- invoke service subprocess. mark detach threads for clean up.
+Sun Mar 16 17:28:07 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * test/drb/drbtest.rb: clean up the service subprocess in teardown.
+ * common.mk (LIBRUBY_SO): add dependency to $(BUILTIN_ENCOBJS).
- * test/drb/test_drb.rb: set @service_name for teardown.
+Sun Mar 16 08:51:41 2008 Tadayoshi Funaba <tadf@dotrb.org>
- * test/drb/test_drbunix.rb: ditto.
+ * include/ruby/intern.h: added some declarations.
- * test/drb/test_drbssl.rb: ditto.
+ * include/ruby/ruby.h: ditto.
- [ruby-dev:45547]
+ * common.mk: added some entries.
-Sun Apr 22 07:51:29 2012 Tanaka Akira <akr@fsij.org>
+ * configure.in: added a check for signbit.
- * lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
- [ruby-dev:45541]
+ * lib/complex.rb: nearly all of core definitions have been removed.
-Sat Apr 21 14:36:49 2012 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * lib/rational.rb: ditto.
- * test/rinda/test_rinda.rb: fix sticks on some tests problem
- [Bug #6272]
+ * lib/mathn.rb: some trivial adjustments.
-Fri Apr 20 12:24:04 2012 Eric Hodel <drbrain@segment7.net>
+ * complex.c: new.
- * lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem: Removed to avoid
- conflict with ca-bundle.pem
- * lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
+ * 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.
+
+Fri Mar 14 16:35:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::Cookie::initialize): performance patch from
+ Makoto Kuwata <kwa@kuwata-lab.com> in [ruby-dev:34048].
+
+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>
+
+ * string.c (UNALIGNED_WORD_ACCESS): IA64 cannot access unaligned word.
+
+Thu Mar 13 21:00:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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.
+
+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>
+
+ * version.c (MKSTR): make US-ASCII. [ruby-dev:34010]
+
+Mon Mar 10 02:08:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * string.c (rb_str_index): if t == s + pos, the character beginning
+ from s + pos is valid.
+
+Sun Mar 9 13:51:21 2008 Eric Hodel <drbrain@segment7.net>
+
+ * 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.
+
+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>
+
+ * {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>
+
+ * 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]
+
+Tue Mar 4 05:30:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c (open_key_args): use rb_io_open instead of rb_f_open.
+ [ruby-core:15746]
+
+Mon Mar 3 23:28:37 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.
+ 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_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:
+ Commit patch #9280 from Akinori MUSHA.
+ Simplify the OpenSSL::Digest class and make use of the
+ 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>
+
+ * 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.
+
+ * 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]
+
+Thu Feb 21 00:01:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
+ load path. [ruby-list:44600]
+
+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
+ --cmd-type options. [ruby-dev:33816]
+
+ * instruby.rb (parse_args): added bin-arch and bin-comm to install
+ 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_.
+
+ * instruby.rb (makedirs): use $dir_mode. [ruby-dev:33805]
+
+ * instruby.rb (open_for_install): set file mode, which is now
+ permission mode instead of access mode.
+
+ * 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]
+
+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>
+
+ * eval.c (ruby_exec_node): no thread starts inside iseq compilation.
+
+ * eval.c (rb_f_raise): skip current control frame. [ruby-core:15589]
+
+ * 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.
+
+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 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.
+
+Fri Feb 15 15:34:47 2008 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_getbyte): new method.
+ (rb_str_setbyte): new method.
+
+Fri Feb 15 15:29:03 2008 Tanaka Akira <akr@fsij.org>
+
+ * lib/require_relative.rb: new file.
+
+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.
+
+ * file.c (rb_file_truncate): check if ftruncate instead of truncate.
+
+Fri Feb 15 02:40:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (sigsetmask): check when signal semantics is not POSIX.
+
+ * 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>
+
+ * 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].
+
+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
+ stack. [ruby-core:15458]
+
+Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766]
+
+ * 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.
+
+ * numeric.c (rb_num_coerce_relop): ditto.
+
+ * ext/bigdecimal/bigdecimal.c (DoSomeOne): add function name argument.
+
+Tue Feb 12 10:25:02 2008 Eric Hodel <drbrain@segment7.net>
+
+ * 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:
+ 0.2.3 -> 0.2.4.
+
+ * lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
+ fixed a bug that RSS::Maker.make("0.9")'s item doesn't make some
+ elements if description is missed.
+ Reported by Michael Auzenne. Thanks!!!
+
+ * 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>
+
+ * 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.
+
+ * test/ruby/test_time.rb: ditto.
+
+ * test/ruby/test_numeric.rb: ditto.
+
+ * test/ruby/test_fixnum.rb: ditto.
+
+Mon Feb 11 00:18:57 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
+ precision. [ruby-talk:290296]
+
+ * ext/bigdecimal/bigdecimal.c (BASE_FIG): made constant.
+
+ * 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.
+
+ * lib/mkmf.rb (install_files): rejects files matching to
+ $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]
+
+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
+ configure much, since ``universal'' implies hidden cross-compiling.
+ TODO: ruby and libruby.bundle might be possible to bound with `lipo'
+ 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
+ consistent with the library implementation of MacOS X 10.5.
+ [ruby-dev:33461]
+
+ * 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>
+
+ * parse.y (dsym): allow empty symbols. [ruby-core:15248]
+
+Thu Jan 31 00:01:51 2008 Tanaka Akira <akr@fsij.org>
+
+ * 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 17:32:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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>
+
+ * 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>
+
+ * enc/trans/japanese.c (rb_to_Windows_31J): to 'Windows-31J'.
+
+ * common.mk: add rules for transdb.h.
+
+ * 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.
+
+Mon Jan 28 01:21:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_open_file): should check NUL in path.
+ <http://www.rubyist.net/~matz/20080125.html#c01>.
+
+ * io.c (rb_io_s_popen): ditto.
+
+ * io.c (rb_io_reopen): ditto.
+
+ * 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.
+
+Sun Jan 27 17:20:10 2008 Tanaka Akira <akr@fsij.org>
+
+ * string.c (rb_str_succ): don't increment/decrement codepoint.
+
+Sun Jan 27 16:03:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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.
- * lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
+
+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]
+
+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 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.
+
+Mon Jan 21 14:36:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * transcode.c (str_transcode): initialize transcoder in
+ rb_transcoding. [ruby-dev:33234]
+
+ * transcode_data.h (rb_transcoding): transcoder constified.
+
+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.
+
+ * eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
+
+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>
+
+ * lib/date.rb (Date::Infinity#<=>): didn't work. A patch from
+ Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
+ This is a bug obviously. However it didn't affect the library's
+ functions.
+
+ * 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]
+
+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>
+
+ * 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]
+
+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>
+
+ * 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.
+
+ * 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>
+
+ * encoding.c (rb_enc_init): UTF-{16,32}{BE,LE} are not builtin.
+
+Tue Jan 8 22:33:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c, Makefile.in, include/ruby/oniguruma.h,
+ enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
+
+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>
+
+ * lib/date.rb, lib/date/format.rb: introduced some constants
+ (for internal use) and aliases (minute and second).
+
+ * 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>
+
+ * sample/time.rb: use Process.times instead of Time.times.
+
+Wed Jan 2 09:09:53 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>
+
+ * 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
+ 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>
+
+ * 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/rdoc/dot/dot.rb: Move to lib/rdoc/dot.rb. Fix namespacing.
+
+ * 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/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.
+
+ * include/ruby/encoding.h (rb_enc_codelen): comment it returns
+ positive integer.
+
+ * string.c (rb_str_concat): rb_enc_codelen doesn't return 0.
+
+Thu Dec 27 15:18:44 2007 Tanaka Akira <akr@fsij.org>
+
+ * 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>
+
+ * lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES
+ occurs. this is a workaround for mswin32.
+
+Wed Dec 26 22:47:31 2007 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
+ Resolv::DNS::Label::Str.
+
+ * lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
+ 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.
+
+Wed Dec 26 13:55:02 2007 James Edward Gray II <jeg2@ruby-lang.org>
+
+ * lib/csv.rb: Cleaned up some code with Ruby 1.9 idioms.
+
+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.
+
+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>
+
+ * 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.
+
+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.
+
+ * 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.
+
+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>
+
+ * 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.
+
+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
+ and its type.
+
+ * configure.in (timezone, altzone): check for recent cygwin.
+
+ * missing/strftime.c (strftime): fix for timezone. [ruby-dev:32536]
+
+ * lib/mkmf.rb (try_var): should fail for functions.
+
+ * 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.
+
+Fri Dec 14 02:29:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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.
+
+Mon Dec 10 21:47:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * transcode.c (str_transcode): allow non-registered encodings.
+ [ruby-dev:32520]
+
+Mon Dec 10 21:00:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_slice_bang): should return nil if position out
+ 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.
+
+Sat Dec 8 11:06:29 2007 Tanaka Akira <akr@fsij.org>
+
+ * 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.
+
+ * 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.
+
+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.
+
+Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_tokadd_mbchar): check insufficient multibyte char.
+ [ruby-dev:32429]
+
+Sun Dec 2 15:42:16 2007 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/rss.rb, test/rss/test_version.rb: 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
+ of consistency.
+
+ * 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>
+
+ * 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>
+
+ * 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.
+
+ * bootstraptest/test_block.rb: ditto.
+
+Sat Dec 1 10:45:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_f_open): use to_open for every non-string object. path
+ object may use method_missing.
+
+Sat Dec 1 09:44:32 2007 Yukihiro Matsumoto <matz@ruby-lang.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>
+
+ * enum.c (enum_take_while): returns Enumerator if no block given.
+
+ * enum.c (enum_drop_while): ditto.
+
+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
+ get rid of mixing $LDFLAGS and $ARCH_FLAG.
+
+ * lib/mkmf.rb (configuration): ditto.
+
+ * 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>
+
+ * bignum.c (big2str_find_n1): removed extraneous element.
+ [ruby-dev:32351], [ruby-dev:32365]
+
+ * bignum.c (big2str_find_n1): returns necessary digits now.
+
+ * 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.
-Fri Apr 20 08:07:06 2012 Eric Hodel <drbrain@segment7.net>
+ * test/ruby/test_integer.rb, test_regexp.rb: ditto.
- * lib/rubygems: Update to RubyGems 1.8.23 which contains security
- fixes:
+Fri Nov 23 15:59:04 2007 Tanaka Akira <akr@fsij.org>
- RubyGems now disallows redirection from HTTPS to HTTP.
+ * struct.c (rb_struct_alloc_noinit): new function.
+ (rb_struct_define_without_accessor): add allocator to the arguments.
- RubyGems now verifies SSL connections.
+ * range.c (range_alloc): re-introduced using rb_struct_alloc_noinit.
- See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
- changes since 1.8.22.
- * test/rubygems: ditto.
+Fri Nov 23 15:27:43 2007 Tanaka Akira <akr@fsij.org>
-Thu Apr 19 16:33:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (REG_CASESTATE): unused macro removed.
+ (rb_reg_prepare_re): check encoding difference.
+ (rb_reg_initialize): check 8bit byte.
- * strftime.c (rb_strftime_with_timespec): fix carry-up bug and
- overwrite '+' with '-' if negative offset less than a hour.
- [ruby-core:44447][Bug #6323]
+ * parse.y (parser_tokadd_escape): fix has8bit.
-Thu Apr 19 09:39:57 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ [ruby-dev:32113]
- * ext/-test-/win32/dln/extconf.rb: need import library for ordinal
- entry even on mingw. [ruby-core:44441][Bug #6320]
+Fri Nov 23 15:16:48 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Apr 19 09:35:15 2012 Eric Hodel <drbrain@segment7.net>
+ * variable.c (rb_f_global_variables): variable names should not
+ duplicate. [ruby-dev:32344]
- * random.c (random_init): Clarify that the default seed is
- Random.new_seed, not zero. Based on patch by Roger Pack.
- [ruby-trunk - Bug #6313]
- * random.c (rb_f_srand): ditto.
+Fri Nov 23 13:34:08 2007 Tanaka Akira <akr@fsij.org>
-Thu Apr 19 08:59:02 2012 Eric Hodel <drbrain@segment7.net>
+ * struct.c (rb_struct_define_without_accessor): new function.
- * ext/curses/curses.c (window_nodelay): Fixed call-seq of nodelay to
- include the '='.
+ * range.c (range_alloc): removed.
+ (Init_Range): use rb_struct_define_without_accessor.
- Improved description window.nodelay=.
+ based on [ruby-dev:32327].
-Thu Apr 19 08:47:54 2012 Eric Hodel <drbrain@segment7.net>
+Fri Nov 23 11:01:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (io_readpartial): Document the output buffer parameter is
- overwritten with the read contents even when non-empty.
- Patch by yu nobuoka. [ruby-trunk - Bug #6285]
- * io.c (io_read_nonblock): ditto.
- * io.c (io_read): ditto.
- * io.c (rb_io_sysread): ditto.
- * io.c (argf_read): ditto.
- * io.c (argf_readpartial): ditto.
- * ext/stringio/stringio.c (strio_read): ditto.
- * test/ruby/test_argf.rb (class TestArgf): Add test for existing
- behavior of read outbuf.
- * test/ruby/test_io.rb (class TestIO): ditto.
- * test/stringio/test_stringio.rb (class TestStringIO): ditto.
+ * re.c (match_begin): should return offset by character.
+ [ruby-dev:32331]
-Wed Apr 18 22:58:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (match_end): ditto.
- * configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
- AC_CHECK_PROG which needs the third argument. [ruby-core:44433]
- [Bug #6316]
+ * re.c (rb_reg_search): ditto.
- * configure.in (PKG_CONFIG): fix condition to skip older version
- of pkg-config. continue in backticks does not affect outside.
+Fri Nov 23 10:44:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Apr 18 13:59:40 2012 NAKAMURA Usaku <usa@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]
- * win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK.
+Wed Nov 21 18:03:49 2007 Koichi Sasada <ko1@atdot.net>
-Wed Apr 18 10:22:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vm.c: fix to recycle thread data (VM stack).
- * strftime.c (rb_strftime_with_timespec): add an interim digit for
- the timezone offset which is less than an hour.
+ * thread.c: ditto.
-Wed Apr 18 09:58:29 2012 Eric Hodel <drbrain@segment7.net>
+ * benchmark/bm_vm3_thread_create_join.rb: add loop count.
- * lib/rubygems/version.rb: Fixed init_with warning by calling into
- yaml_initialize (for syck) from psych's init_with
+Wed Nov 21 18:02:10 2007 Koichi Sasada <ko1@atdot.net>
-Wed Apr 18 09:03:43 2012 Eric Hodel <drbrain@segment7.net>
+ * benchmark/driver.rb: add path to trunk/lib if driver runner is
+ in build directory.
- * lib/rubygems: Update to RubyGems 1.8.22 plus r33517 and r35337 which
- were ported to the rubygems git repository.
+Wed Nov 21 16:39:21 2007 Tanaka Akira <akr@fsij.org>
- See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
- changes since 1.8.11.
+ * 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.
- * test/rubygems: ditto.
+Wed Nov 21 14:55:13 2007 Koichi Sasada <ko1@atdot.net>
-Tue Apr 17 22:18:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_permutation): add gc guard codes.
- * strftime.c (rb_strftime_with_timespec): fix padding of time zone
- offset. [ruby-dev:43287][Bug #4458]
+Wed Nov 21 11:16:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Apr 17 13:11:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * insnhelper.ci (vm_search_normal_superclass): rename function.
- * dln.c (rb_w32_check_imported): skip ordinal entries. based on a
- patch by phasis68 (Heesob Park) at [ruby-core:44381].
- [ruby-core:44371][Bug #6303]
+ * insnhelper.ci (vm_search_superclass): ditto.
-Mon Apr 16 18:22:14 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * proc.c (struct METHOD): rename rklass -> rclass.
- * spec/default.mspec: expand relative path for ruby_exe which uses
- them with Dir.chdir; it breaks relative paths, for example
- core/kernel/exec_spec.rb.
+Wed Nov 21 03:12:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Apr 16 16:22:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c (rb_f_system): returns nil on execution failure.
+ [ruby-core:13715]
- * win32/win32.c (gmtime_r, localtime_r): POSIX compliant reentrant
- versions.
+Wed Nov 21 01:04:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (RUBY_MSVCRT_VERSION): define on mingw too.
-
- * win32/Makefile.sub (config.h): prefix RT_VER with RUBY and make
- more descriptive to get rid of potential conflict.
-
-Mon Apr 16 15:19:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (NO_RUBY_VENDOR_LIB): fix missing comma.
-
-Mon Apr 16 12:17:12 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (hermitian?): Bug fix, patch by George Koehler
- [Bug #6290] [rubyspec:4b9573d7613]
-
-Mon Apr 16 09:42:50 2012 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#download): should
- use File.identical? to check the identity of the files.
- this fixed an error of a test on Windows.
-
-Sat Apr 14 12:55:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (UNREACHABLE): gcc 4.4 eliminates unreachable code
- if -O3 is given.
-
- * win32/win32.c (child_result): dropped colon.
-
-Sat Apr 14 10:45:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#start):
- partially revert r35315.
-
- * test/webrick/test_server.rb (test_start_exception):
- received signal is delivered to the main thread, so it is needed to
- emulate it. patched by Eric Hodel. [ruby-core:44348] [Feature #6236]
-
-Sat Apr 14 09:35:45 2012 Eric Hodel <drbrain@segment7.net>
-
- * variable.c (trace_ev): Removed "not reached" comment as this line is
- reached.
- * variable.c (rb_obj_remove_instance_variable): Replaced "not reached"
- comment with the UNREACHABLE macro.
- * variable.c (rb_mod_const_missing): ditto.
- * variable.c (rb_mod_remove_cvar): ditto.
- * enum.c (first_i): ditto.
- * string.c (rb_str_aref): ditto.
- * string.c (str_byte_aref): ditto.
- * string.c (rb_to_id): ditto.
- * io.c (rb_io_fmode_modestr): ditto.
- * io.c (rb_io_oflags_modestr): ditto.
- * pack.c (num2i32): ditto.
- * vm_eval.c (rb_method_missing): ditto.
- * vm_eval.c (rb_f_throw): ditto.
- * dir.c (dir_read): ditto.
- * win32/win32.c (child_result): ditto.
- * struct.c (rb_struct_getmember): ditto.
- * struct.c (rb_struct_set): ditto.
- * struct.c (rb_struct_aref_id): ditto.
- * eval.c (rb_f_raise): ditto.
- * process.c (rb_f_exit_bang): ditto.
- * process.c (rb_f_exit): ditto.
- * process.c (rb_f_abort): ditto.
- * ext/-test-/iter/break.c (iter_break_value): ditto.
- * ext/pty/pty.c (pty_check): ditto.
- * ext/openssl/ossl_pkey.c (ossl_pkey_new): ditto.
- * ext/readline/readline.c (rb_remove_history): ditto.
- * ext/stringio/stringio.c (strio_unimpl): ditto.
- * numeric.c (num_sadded): ditto.
- * numeric.c (num_init_copy): ditto.
- * numeric.c (rb_num2ll): ditto.
- * numeric.c (rb_num2ull): ditto.
- * vm_insnhelper.c (call_cfunc): ditto.
- * ruby.c (opt_W_getter): ditto.
- * bignum.c (rb_big_coerce): ditto.
- * file.c (rb_f_test): ditto.
-
-Sat Apr 14 08:38:20 2012 Eric Hodel <drbrain@segment7.net>
-
- * encoding.c (rb_enc_codepoint_len): Use UNREACHABLE to avoid "control
- reaches end of non-void function" warnings. [ruby-trunk - Bug #6066]
- * re.c (name_to_backref_number): ditto.
- * object.c (rb_Float): ditto.
- * io.c (io_readpartial): ditto.
- * io.c (io_read_nonblock): ditto.
- * pack.c (rb_uv_to_utf8): ditto.
- * proc.c (rb_method_entry_arity): ditto.
- * vm_method.c (rb_f_notimplement): ditto.
- * struct.c (rb_struct_aset_id): ditto.
- * class.c (rb_scan_args): ditto.
- * process.c (rlimit_resource_type): ditto.
- * process.c (rlimit_resource_value): ditto.
- * process.c (p_uid_switch): ditto.
- * process.c (p_gid_switch): ditto.
- * ext/digest/digest.c (rb_digest_instance_update): ditto.
- * ext/digest/digest.c (rb_digest_instance_finish): ditto.
- * ext/digest/digest.c (rb_digest_instance_reset): ditto.
- * ext/digest/digest.c (rb_digest_instance_block_length): ditto.
- * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): ditto.
- * ext/dl/handle.c (rb_dlhandle_close): ditto.
- * ext/tk/tcltklib.c (pending_exception_check0): ditto.
- * ext/tk/tcltklib.c (pending_exception_check1): ditto.
- * ext/tk/tcltklib.c (ip_cancel_eval_core): ditto.
- * ext/tk/tcltklib.c (lib_get_reltype_name): ditto.
- * ext/tk/tcltklib.c (create_dummy_encoding_for_tk_core): ditto.
- * ext/tk/tkutil/tkutil.c (tk_hash_kv): ditto.
- * ext/openssl/ossl_ssl.c (ossl_ssl_session_reused): ditto.
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_dsa_verify_asn1): ditto.
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_at_infinit): ditto.
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_on_curve): ditto.
- * ext/fiddle/conversions.c (generic_to_value): ditto.
- * ext/socket/raddrinfo.c (rsock_io_socket_addrinfo): ditto.
- * ext/socket/socket.c (sock_s_getnameinfo): ditto.
- * ext/ripper/eventids2.c (ripper_token2eventid): ditto.
- * cont.c (return_fiber): ditto.
- * dmydln.c (dln_load): ditto.
- * vm_insnhelper.c (vm_search_normal_superclass): ditto.
- * bignum.c (big_fdiv): ditto.
- * marshal.c (r_symlink): ditto.
- * marshal.c (r_symbol): ditto.
-
-Fri Apr 13 17:12:09 2012 NARUSE, Yui <naruse@ruby-lang.org>
-
- * hash.c (inspect_i): keep string's coderange.
-
-Fri Apr 13 15:26:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_aset, rb_hash_update, rb_hash_update_by): use
- st_update() to reduce evaluation of hash values.
-
-Fri Apr 13 15:17:36 2012 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#stop): fix r35303;
- this method is to deny new connections, not shutdown yet.
-
- * lib/webrick/server.rb (WEBrick::GenericServer#start):
- re-raise exception only when the exception is Interrupt (^C).
-
-Thu Apr 12 19:51:45 2012 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: added some notes.
-
-Wed Apr 11 17:16:49 2012 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (compile_array, compile_array_):
- Divide big array (or hash) literals into several blocks and
- concatenate them. There was a problem that a big array (hash)
- literal causes SystemStackError exception (stack overflow)
- because VM push all contents of the literal onto VM stack to
- make an array (or hash). To solve this issue, we make several
- arrays (hashes) and concatenate them to make a big array (hash)
- object. [ruby-dev:37701] [Bug #982]
-
- * compile.c (iseq_compile_each, setup_args): use modified
- compile_array.
-
- * vm.c (m_core_hash_from_ary, m_core_hash_merge_ary,
- m_core_hash_merge_ptr): added for above change.
-
- * id.c (Init_id), parse.y: add core method ids.
-
- * bootstraptest/test_literal.rb: add simple tests.
-
- * bootstraptest/test_eval.rb: remove rescue clause to catch
- SystemStackError exception.
-
- * test/ruby/test_literal.rb: add tests to check no stack overflow.
-
-Thu Apr 12 07:10:37 2012 Eric Hodel <drbrain@segment7.net>
+ * object.c (nil_plus): remove unused function. [ruby-core:13737]
- * lib/uri/generic.rb (module URI): URI now downcases the scheme to
- follow RFC 2396 section 3.1. [ruby-trunk - Feature #4551]
- * test/uri/test_generic.rb (class URI): Test for above
+Tue Nov 20 21:46:46 2007 Tanaka Akira <akr@fsij.org>
-Thu Apr 12 06:15:44 2012 Eric Hodel <drbrain@segment7.net>
+ * time.c (time_mload): ignore invalid digits in submicro.
- * lib/net/protocol.rb (module Net): Added ReadTimeout to match
- OpenTimeout. ReadTimeout is now raised by rbuf_fill instead of
- Timeout::Error to help users distinguish what type of timeout
- occurred. [ruby-trunk - Feature #6088]
- * lib/net/pop.rb (module Net): Updated documentation for ReadTimeout
- and OpenTimeout.
- * lib/net/http.rb (module Net): ditto
- * lib/net/smtp.rb (module Net): ditto
- * lib/net/telnet.rb (module Net): Net::ReadTimeout is now raised in
- waitfor to match Net::Protocol.
- * test/net/http/test_http.rb: Updated Timeout::Error expectation to
- Net::ReadTimeout.
- * test/net/ftp/test_ftp.rb: ditto
+Tue Nov 20 20:33:32 2007 Koichi Sasada <ko1@atdot.net>
-Thu Apr 12 05:27:01 2012 Eric Hodel <drbrain@segment7.net>
+ * include/ruby/ruby.h: rename RFloat#double_value -> float_value.
- * lib/webrick/server.rb (module WEBrick::GenericServer): A server
- will now continue only when a StandardError subclass is raised. For
- other exception types the error will be logged at the fatal level and
- the server will safely stop. Based on a patch by Alex Young.
- [ruby-trunk - Feature #6236]
- * test/webrick/test_server.rb: Test for new exception handling
- behavior. Join the server thread instead of busy-waiting for it to
- shut down to remove race conditions.
+ * numeric.c, parse.y: ditto.
-Thu Apr 12 03:50:44 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Nov 20 19:36:21 2007 Koichi Sasada <ko1@atdot.net>
- * lib/test/unit.rb (Test::Unit:Runner::Worker#_run_suites):
- call GC.start before running the test suites.
+ * gc.h, vm_core.h: decl of rb_gc_save_machine_context()
+ should be at vm_core.h.
-Wed Apr 11 22:31:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/ruby.h, intern.h: remove type rb_thread_t.
- * parse.y (rb_check_id_cstr): new function to check if ID is
- registered with NUL-terminated C string.
+ * include/ruby/intern.h: change rb_unblock_function_t,
+ rb_unblock_function_t.
- * sprintf.c (rb_str_format): avoid inadvertent symbol creation.
+ * file.c, process.c: apply above changes.
-Wed Apr 11 20:28:36 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * thread.c, thread_pthread.ci, thread_win32.ci: ditto.
- * io.c (rb_io_eof): use eof() instead of io_fillbuf(). It's because
- io_unread() doesn't work properly when reading CRLF with read(length)
- and mode 'r'.
- [ruby-core:44189][Bug #6271]
+ * io.c: support blocking open (2). [ruby-core:13614]
- * test/ruby/test_io_m17n.rb (TestIO_M17N#test_read_crlf_and_eof):
- test for above.
+Tue Nov 20 17:10:11 2007 Tanaka Akira <akr@fsij.org>
-Wed Apr 11 07:38:33 2012 Eric Hodel <drbrain@segment7.net>
+ * 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]
- * ext/digest/sha2/lib/sha2.rb (Digest#block_length): Fixed method name
- in documentation examples. Patch by naleski via
- https://github.com/ruby/ruby/pull/115
+Tue Nov 20 16:24:31 2007 Tanaka Akira <akr@fsij.org>
-Wed Apr 11 07:33:13 2012 Eric Hodel <drbrain@segment7.net>
+ * gc.c (gc_mark_children): obj->as.file.fptr may be 0 for T_FILE.
- * pack.c (pack_pack): Warn when an invalid character is found in the
- format string when $VERBOSE is true. [ruby-trunk - Feature #5219]
- * pack.c (pack_unpack): ditto
- * test/ruby/test_pack.rb (class TestPack): Test for warnings on
- invalid format characters.
+Tue Nov 20 15:09:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Apr 11 06:11:10 2012 Eric Hodel <drbrain@segment7.net>
+ * parse.y (parser_read_escape): has8bit flag may be set with control
+ escape. [ruby-core:13722]
- * string.c (rb_str_tr): Documented use of \ to escape characters.
- [ruby-trunk - Bug #6161]
- * string.c (rb_str_count): ditto
+ * parse.y (parser_prepare): set begging after BOM if exists.
+ [ruby-core:13718]
-Wed Apr 11 05:14:51 2012 Eric Hodel <drbrain@segment7.net>
+Tue Nov 20 14:55:37 2007 Eric Hodel <drbrain@segment7.net>
- * lib/abbrev.rb: Clarified that Abbrev.abbrev returns a Hash instead
- of an Array. Patch by Andrei Bocan. [ruby-trunk - Bug #6107]
+ * lib/rubygems*: Update to RubyGems 0.9.5.
-Wed Apr 11 03:02:24 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Tue Nov 20 13:00:44 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/ripper/lib/ripper/sexp.rb: fix spelling. patched by
- Jonathan Hinkle via https://github.com/ruby/ruby/pull/116
+ * include/ruby/win32.h win32/win32.c (rb_w32_pipe_exec): use dual fd
+ instead of socketpair when mode is RDWR.
-Tue Apr 10 19:07:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (pipe_open): pass &write_fd to rb_w32_pipe_exec().
- * error.c (rb_enc_raise): new function to raise an exception with
- the message in the given encoding. patched by now (Nikolai
- Weibull) at [ruby-core:41160]. [Feature #5650]
+ * io.c (popen_redirect): define only when HAVE_FORK.
-Tue Apr 10 18:19:32 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Nov 20 12:12:04 2007 Tanaka Akira <akr@fsij.org>
- * lib/net/http.rb (Net::HTTP#send_request_with_body_stream):
- use IO.copy_stream for requests using body_stream.
- patched by Eric Wong. [ruby-core:40898] [Feature #5605]
+ * include/ruby/io.h (rb_io_t): add tied_io_for_writing member.
-Tue Apr 10 16:53:21 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c: use tied_io_for_writing for duplex popen.
- * thread_pthread.c: add prototype declarations for older Mac OS X.
- [ruby-core:43376][Bug #6170]
+ * gc.c: mark tied_io_for_writing.
-Tue Apr 10 15:35:21 2012 Koichi Sasada <ko1@atdot.net>
+ * common.mk: gc.o depends io.h.
- * compile.c (iseq_set_sequence): show a hint if there are duplicated
- "when" clauses. [ruby-core:41502] [ruby-trunk - Feature #5716]
+ [ruby-dev:32205]
-Tue Apr 10 09:57:00 2012 Eric Hodel <drbrain@segment7.net>
+Tue Nov 20 11:59:33 2007 Tanaka Akira <akr@fsij.org>
- * string.c (rb_str_split_m): Documented behavior of split on the empty
- string. [ruby-trunk - Feature #3575]
+ * 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 Apr 10 09:48:31 2012 Eric Hodel <drbrain@segment7.net>
+Tue Nov 20 03:24:42 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * ext/zlib/zlib.c (rb_deflate_s_deflate): Fixed ruby example replacing
- NO_FLUSH with FINISH. [ruby-trunk - Bug #6273]
+ * lib/drb/extservm.rb: merged from ruby_1_8 branch.
-Mon Apr 9 23:10:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/drb/acl.rb: ditto.
- * win32/win32.c (isUNCRoot, winnt_stat): support long UNC.
- [ruby-core:30623][Feature #3399]
+ * lib/drb/ssl.rb: ditto.
-Mon Apr 9 15:16:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/drb/unix.rb: ditto.
- * parse.y (string_content, parser_yylex): count brace nesting to
- dispatch embexpr_end. [ruby-core:43775][Bug #6211]
+ * lib/drb/drb.rb: ditto.
-Mon Apr 9 13:06:58 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * lib/drb/observer.rb: ditto.
- * hash.c (rb_hash_set_default_proc): Accept nil, patch by Run Paint
- [Feature #4234]
+ * lib/drb/invokemethod.rb: ditto.
- * test/ruby/test_hash.rb: test for above.
+ * test/drb/test_drbssl.rb: ditto.
-Mon Apr 9 08:01:15 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/drb/test_drb.rb: ditto.
- * ext/date/date_strftime.c: gets the value with range() consistently.
- * ext/date/date_strftime.c (range): now just replaces the given item.
+ * test/drb/drbtest.rb: ditto.
-Mon Apr 9 06:58:01 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * test/drb/test_drbunix.rb: ditto.
- * complex.c (nucomp_expt): [ruby-core:44170].
+Tue Nov 20 00:52:46 2007 Tanaka Akira <akr@fsij.org>
-Mon Apr 9 02:52:03 2012 NARUSE, Yui <naruse@ruby-lang.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.
- * complex.c (nucomp_expt): the result of f_complex_new2 may be a fixnum
- with mathn. [ruby-core:44170] [Bug #6267]
+ * test/fileutils/test_fileutils.rb (test_install): use
+ assert_equal_time.
-Sun Apr 8 22:46:01 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Nov 19 18:46:49 2007 Tanaka Akira <akr@fsij.org>
- * ext/json/generator/generator.c (generate_json_bignum):
- add RB_GC_GUARD.
- http://fb.rubyci.org/~chkbuild/ruby-trunk/log/20120407T210301Z.diff.html.gz
+ * file.c (utime_internal): fallback utimensat to utimes.
-Sun Apr 8 07:26:40 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Nov 19 17:51:27 2007 Tanaka Akira <akr@fsij.org>
- * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): get keys
- and fetch values from it to prevent @timeout_info's error
- "can't add a new key into hash during iteration".
+ * 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.
-Sun Apr 8 06:51:57 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * include/ruby/missing.h: provide struct timespec if not available.
- * io.c (io_unread): cast as long the value for extra_max.
- [ruby-core:44137] [Bug #6257]
+ * time.c: support nanosecond-resolution using struct timespec.
+ (time_nsec): new method: Time#nsec and Time#tv_nsec.
-Sun Apr 8 06:46:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * include/ruby/intern.h: provide rb_time_nano_new.
- * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
- use readpartial to get data even if the response is streaming data and
- each data is smaller than @buffer_size.
- patched by yu nobuoka. [ruby-dev:45471] [Bug #6230]
+ * 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.
-Sat Apr 7 22:35:36 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * marshal.c (w_object): dump instance variables of generated string
+ for TYPE_USERDEF, even if original object has instance variables.
- * include/ruby/win32.h (rb_w32_aspawn_flags): add the declaration of
- new function.
+ * lib/time.rb (Time#xmlschema): use nsec instead of usec.
- * process.c (enum): add EXEC_OPTION_PGROUP and move the position
- above for the usage in proc_spawn_n().
+ [ruby-dev:32306]
- * process.c (proc_spawn_n): add an argument to pass new option
- `new_pgroup`. The option specifies CREATE_NEW_PROCESS_GROUP flag to
- CreateProcessW(). This flag is necessary for the usage of
- Process.kill on the subprocess on Windows.
+Mon Nov 19 17:48:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (rb_exec_arg_addopt): ditto.
+ * object.c (rb_class_superclass): should not raise exception for
+ BasicObject. [ruby-Bugs-15668]
- * process.c (rb_spawn_process): ditto.
+Mon Nov 19 16:04:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (documentation for rb_f_spawn): add documentation for new
- option `new_pgroup` of spawn.
+ * 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]
- * test/ruby/test_process.rb (TestProcess#test_execopts_new_pgroup):
- add tests for option `new_pgroup`.
+Mon Nov 19 02:44:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_thread.rb
- (TestThreadGroup#test_thread_timer_and_interrupt):
- add option `new_pgroup: true` to spawn on Windows. It's needed for
- Process.kill on a subprocess.
+ * compile.c (iseq_compile_each): alias and undef accept dsyms as well
+ as literals. [ruby-dev:32308]
- * win32/win32.c (CreateChild): add an argument to pass
- dwCreationFlags of CreateProcessW().
+Mon Nov 19 02:31:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/win32.c (rb_w32_spawn): ditto.
+ * eval_method.ci (rb_add_method): no redefinition warning for undef.
- * win32/win32.c (rb_w32_aspawn_flags): add new function to pass
- dwCreationFlags.
+Mon Nov 19 01:53:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/win32.c (rb_w32_aspawn): refactor to move the content to
- rb_w32_aspawn_flags().
- [ruby-core:43245][Bug #6131]
+ * parse.y (parser_read_escape): disallow control and meta modifiers
+ for non-ASCII characters. [ruby-core:13685]
-Sat Apr 7 22:32:00 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Nov 18 20:47:41 2007 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_thread.rb
- (TestThreadGroup#test_thread_timer_and_interrupt): skip on Windows.
- Process.kill cannot kill a subprocess if CREATE_NEW_PROCESS_GROUP
- flag is not specified in a call to CreateProcessW().
+ * marshal.c (mark_dump_arg): it may be called after dump_ensure.
- * win32/win32.c (CreateChild): revert the usage of
- CREATE_NEW_PROCESS_GROUP flag for compatibility.
- [ruby-core:43245][Bug #6131]
+Sun Nov 18 18:27:47 2007 Tanaka Akira <akr@fsij.org>
-Sat Apr 7 10:28:40 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * time.c (time_minus): fix Time.at(2**60+1) - Time.at(2**60).
- * ext/psych/lib/psych.rb: bumping up psych version to match release.
- * ext/psych/psych.gemspec: ditto
+Sun Nov 18 17:28:49 2007 Tanaka Akira <akr@fsij.org>
-Sat Apr 7 02:07:00 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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.
- * ext/psych/parser.c: fall back to any encoding if the external
- encoding is wrong. [ruby-core:44163]
- * test/psych/test_encoding.rb: fix test
+Sun Nov 18 14:03:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 6 16:24:24 2012 Martin Duerst <duerst@it.aoyama.ac.jp>
+ * eval_method.ci (rb_alias): do not call hook functions until
+ initialization finishes. [ruby-talk:279538]
- * struct.c (documentation for rb_struct_members_m):
- fix 'array of strings' to 'array of symbols'
- [ruby-core:44152][Bug #6264]
+Sun Nov 18 09:09:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Apr 6 14:27:04 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
- * Makefile.in ($(LIBRUBY_A)): fix typo.
+Sun Nov 18 05:19:46 2007 Tanaka Akira <akr@fsij.org>
-Thu Apr 5 13:26:15 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (have_struct_member): define HAVE_type_member.
- * missing/alloca.c (xmalloc, xfree): use ruby version, not
- depending on RUBY_LIB_PREFIX. [ruby-dev:45492][Bug #6255]
+Sat Nov 17 23:51:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Wed Apr 4 13:06:39 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
- * lib/ftp/ftp.rb (Net::FTP#close): restore original read_timeout.
+Sat Nov 17 23:21:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Apr 4 10:33:31 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * parse.y (parser_yylex): should clear parser->tokp as well.
+ [ruby-dev:32250]
- * lib/ftp/ftp.rb (Net::FTP#close): ignore exceptions from shutdown and
- read on closing.
+ * parse.y: remove NEED_ASSOC that break test_parser_events.
-Wed Apr 4 01:48:35 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * parse.y (parser_yylex): should not decrement line numbers at the
+ end of file.
- * lib/ftp/ftp.rb (Net::FTP#close): close socket more gracefully.
+ * file.c (rb_find_file_ext): search .rb files first through in the
+ loadpath.
- * lib/ftp/ftp.rb (Net::BufferedSocket#shutdown): added.
+Fri Nov 16 23:31:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/net/ftp/test_ftp.rb (FTPTest#create_ftp_server): wait socket
- with shutdown and read.
+ * bignum.c (rb_big_odd_p): new method added. a patch from Tadashi
+ Saito <shiba AT mail2.accsnet.ne.jp>. [ruby-dev:32305]
-Tue Apr 3 19:00:52 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * bignum.c (rb_big_even_p): ditto.
- * test/net/ftp/test_ftp.rb (FTPTest#create_ftp_server): should wait
- a little before closing socket because if the client call
- Net::FTP#getmultiline the socket is suddenly closed by the server in
- the getline loop.
+Fri Nov 16 17:41:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Apr 3 18:33:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/iconv/iconv.c (Document-class): moved the simplest example to
+ the top.
- * process.c (setreuid, setregid): suppress warnings.
- [ruby-core:43374][Bug #6169]
+ * ext/iconv/iconv.c (iconv_s_iconv): Document-method: needs class
+ prefix for class method. [ruby-core:13542]
-Tue Apr 3 10:18:27 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/iconv/iconv.c (iconv_iconv): also instance method needs to be
+ qualified.
- * enumerator.c (inspect_enumerator): suppress uninitialized
- instance variable warnings. [ruby-dev:45449][Bug #6214]
- patched by no6v (Nobuhiro IMAI).
+Fri Nov 16 16:26:57 2007 Shugo Maeda <shugo@ruby-lang.org>
-Mon Apr 2 13:25:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * include/ruby/ruby.h: added some declarations for event hooks.
- * lib/optparse/ac.rb: autoconf-like options.
+ * lib/profile.rb: set VM::InstructionSequence.compile_option.
-Mon Apr 2 10:34:00 2012 eregon <eregontp@gmail.com>
+Fri Nov 16 11:16:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_str_start_with, rb_str_end_with): raise an error if
- an argument is not convertible to a String.
- [ruby-core:40623][Bug #5536]
+ * lib/yaml/rubytypes.rb (String#is_binary_data?): use Integer#fdiv.
-Mon Apr 2 03:35:25 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Nov 16 03:36:01 2007 why the lucky stiff <why@ruby-lang.org>
- * lib/webrick/server.rb (WEBrick::GenericServer): close socket only if
- the socket is not closed yet.
+ * ext/syck/rubyext.c: Node#value defined twice.
-Sun Apr 1 23:03:18 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/yaml/: several method redefinitions causing warnings.
- * lib/net/ftp.rb (Net::BufferedSocket): should delegate send() to @io
- for Net::FTP#abort and Net::FTP#status.
+Fri Nov 16 03:01:00 2007 why the lucky stiff <why@ruby-lang.org>
-Sun Apr 1 00:41:56 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit.
- * lib/net/ftp.rb: fixed the domain name in examples.
+Fri Nov 16 02:51:59 2007 why the lucky stiff <why@ruby-lang.org>
-Sat Mar 31 21:39:45 2012 NARUSE, Yui <naruse@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]
- * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): dup to prevent
- @timeout_info's "can't add a new key into hash during iteration".
+Thu Nov 15 19:49:03 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Mar 31 14:22:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/curses/extconf.rb: check macro if cannot find func.
+ [ruby-list:44224]
- * hash.c (hash_default_value): extract from rb_hash_aref(), to be
- shared with rb_hash_shift(), so that overriding Hash#default
- will be respected.
+Thu Nov 15 18:04:06 2007 Tanaka Akira <akr@fsij.org>
-Sat Mar 31 14:16:02 2012 Sokolov Yura (funny-falcon) <funny.falcon@gmail.com>
+ * tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
+ environment.
- * hash.c: do not allocate st_table when it is not necessary.
+Thu Nov 15 17:28:21 2007 Tanaka Akira <akr@fsij.org>
-Sat Mar 31 13:42:39 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * tool/compile_prelude.rb: absolute path may not start with a slash.
+ pointed by usa.
- * lib/net/ftp.rb (read_timeout=, open_timeout=): supported timeout.
+Thu Nov 15 17:07:54 2007 Tanaka Akira <akr@fsij.org>
-Sat Mar 31 13:20:40 2012 Sokolov Yura (funny-falcon) <funny.falcon@gmail.com>
+ * tool/compile_prelude.rb: fix first substitution.
+ use constant for prefix.
+ pointed by Richard Kilmer.
- * hash.c: remove unnecessary checks for Qundef in hash iterations.
- since hash use st_foreach_check for iterations, such checks are
- needless.
+Thu Nov 15 14:29:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Mar 31 12:05:01 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * common.mk (prereq): added auto generated sources. [ruby-dev:32280]
- * ext/openssl/ossl_x509cert.c: Fix doc typo.
+Thu Nov 15 12:31:13 2007 Tanaka Akira <akr@fsij.org>
-Sat Mar 31 10:13:24 2012 Sokolov Yura (funny-falcon) <funny.falcon@gmail.com>
+ * tool/compile_prelude.rb: use constant for prefix.
- * st.c (st_foreach_check, st_foreach): remove ancient check. This
- check are from initial ordered hash commit when first entry were
- created with entry->fore = entry->back = entry.
+Thu Nov 15 12:24:39 2007 Tanaka Akira <akr@fsij.org>
- * st.c (st_delete): use real_entries in st_delete for packed tables
+ * tool/compile_prelude.rb: use simple template system for source
+ code generation.
-Sat Mar 31 07:53:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Nov 15 12:19:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * st.c (st_foreach_check): remove the entry by replacing with never
- when ST_DELETE.
+ * lib/cgi/session.rb (CGI::Session::FileStore::restore): use
+ lockfile for exclusive locks. a patch from <tommy AT tmtm.org>.
+ [ruby-dev:32296]
- * hash.c (st_foreach_safe): since table is not for VALUE, Qundef is
- not special value, so use 0 instead. therefore this function can be
- applied to only st_table which 0 is invalid as keys, e.g., IDs.
+Thu Nov 15 12:14:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * hash.c: Qundef cannot be passed from st_foreach_check().
+ * tool/compile_prelude.rb (c_esc): need to escape closing brace.
- * hash.c, marshal.c, object.c, variable.c: fix callback argument types
- of iterators.
+Thu Nov 15 11:52:16 2007 Tanaka Akira <akr@fsij.org>
-Thu Mar 29 23:50:15 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * tool/compile_prelude.rb: adjust RbConfig::CONFIG paths relative
+ to the installation path.
- * st.c (st_update): pass pointer to key to the callback function.
+Thu Nov 15 11:25:20 2007 Tanaka Akira <akr@fsij.org>
-Thu Mar 29 16:36:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (usage): fix typo on --disable-gems option.
+ pointed by Richard Kilmer.
- * st.c (st_update): add existing parameter to the callback function.
+Wed Nov 14 16:16:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Mar 29 16:35:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/net/http/test_https_proxy.rb
+ (HTTPSProxyTest::test_https_proxy_authentication): initialize
+ local variable 't' first. [ruby-dev:32253]
- * lib/test/unit.rb (terminal_width, del_status_line, put_status):
- extract as methods.
+Wed Nov 14 15:39:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Mar 29 10:20:18 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * test/socket/test_socket.rb: update not to use 1.8 assignment to
+ external local variable in the block parameters. [ruby-dev:32251]
- * ext/openssl/ossl_pkcs7.c: fix crash when parsing garbage data.
- * test/openssl/test_pkcs7.rb: assert correct behavior for it.
- Thanks to Matt Venables for reporting the issue.
- [ruby-core:43250][Bug #6134]
+ * test/strscan/test_stringscanner.rb: avoid $KCODE, and use
+ String#force_encoding(). [ruby-dev:32251]
-Thu Mar 29 10:16:05 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Nov 14 14:04:42 2007 Tanaka Akira <akr@fsij.org>
- * thread_win32.c (TIME_QUANTUM_USEC): 10ms(= old setting) [experimental]
- cf. [Bug #6098]
+ * common.mk, Makefile.in: rename prelude.c to miniprelude.c.
+ rename ext_prelude.c to prelude.c
-Thu Mar 29 10:12:12 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * win32/Makefile.sub: ditto.
- * thread.c (rb_threadptr_execute_interrupts_common): use defined
- TIME_QUANTUM_USEC instead of a magic number. there is no meanings
- to use different values for checking interval of interruption and
- thread switching limits.
- cf. [Bug #6098]
+ * bcc32/Makefile.sub: ditto.
-Thu Mar 29 09:26:17 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Wed Nov 14 07:09:48 2007 Koichi Sasada <ko1@atdot.net>
- * test/openssl/test_x509cert.rb: exclude test that fails when issuing
- a certificate with RSA signature and DSS1 digest for earlier
- OpenSSL versions when used in conjunction with OpenSSL 1.0.1.
- Thanks, Vit Ondruch, for reporting the issue.
- [ruby-core:42949][Bug #6089]
+ * 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.
-Thu Mar 29 08:25:35 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Wed Nov 14 07:07:51 2007 Koichi Sasada <ko1@atdot.net>
- * NEWS: add note about unified behavior of encoding nil values in
- instances of OpenSSL::ASN1::ASN1Data.
+ * tool/makedocs.rb, template/insnstbl.html: removed.
-Thu Mar 29 07:45:36 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Wed Nov 14 02:50:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/ossl_asn1.c: raise TypeError when trying to encode nil
- values for Primitive instances.
- * test/openssl/test_asn1.rb: Assert consistent behavior when
- encoding nil values: Primitives raise TypeError, Constructives
- raise NoMethodError.
- Fixes [ruby-core:43009][Bug #6102]
+ * common.mk (parse.c): dependency also needs vpath.
-Wed Mar 28 16:39:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * common.mk (node_name.inc, prelude.c): VPATH in nmake does not
+ work for targets of explicit rules.
- * process.c (obj2uid, obj2gid): allow strings as input user/group id.
- [ruby-core:40923][Feature #5610]
+Wed Nov 14 02:11:38 2007 Tanaka Akira <akr@fsij.org>
-Wed Mar 28 15:06:18 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing/isinf.c (isinf): don't define if the macro is defined.
- * marshal.c (r_symreal): default to ASCII-8BIT for non-ascii symbols,
- otherwise it should be converted to US-ASCII in rb_intern_str() if
- possible. [ruby-core:43762][Bug #6209]
+ * configure.in: no need to set ac_cv_func_isinf=yes on non-gcc
+ solaris.
-Wed Mar 28 08:44:24 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Nov 14 01:34:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych.rb: updating version to match gem
- * ext/psych/psych.gemspec: ditto
- * ext/psych/lib/psych/visitors/to_ruby.rb: fixing deprecation warning
+ * numeric.c (round): fallback definition.
-Tue Mar 27 23:44:11 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * numeric.c (flo_divmod, flo_round): use round() always.
+ [ruby-dev:32269]
- * io.c (io_unread): fixed memory leak. report by nagachika via IRC.
+Wed Nov 14 00:33:49 2007 Koichi Sasada <ko1@atdot.net>
-Tue Mar 27 22:44:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * configure.in (verconf.h): separate load path specific stuff from
- config.h.
+ * 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.
-Tue Mar 27 22:43:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/mkcallback.rb, ext/json/ext/generator/generator.c:
+ ditto.
- * win32/Makefile.sub: fix config.h path to include.
+Wed Nov 14 00:15:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Mar 27 17:08:08 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * tool/ytab.sed: get rid of GNU sed feature. a patch from Laurent
+ Sansonetti <laurent.sansonetti AT gmail.com> in [ruby-core:13470].
- * win32/win32.c (check_if_dir): fix memory leak.
+Tue Nov 13 21:41:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Mar 27 13:13:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * common.mk (parse.c), ext/ripper/depend (ripper.c): process after
+ bison with sed. [ruby-dev:32204]
- * string.c (str_new_empty): should copy also the encoding as an
- empty substring. [ruby-dev:45441][Bug #6206]
+ * ruby.c (proc_options): use yydebug in cmdline_options.
-Mon Mar 26 23:43:04 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * ruby.c (process_options): set yydebug flag of parser.
- * lib/net/ftp.rb (parse227, parse228, parse229): don't use $~.
+ * parse.y (yydebug): moved into struct parser_params.
-Mon Mar 26 23:34:40 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * parse.y (rb_parser_get_yydebug, rb_parser_set_yydebug): parser
+ generic methods.
- * lib/net/ftp.rb (parse227, parse228, parse229): don't use local
- variables defined by named capture for other Ruby implementations
- such as Rubinius.
+ * */Makefile.sub (parse.c): moved to common.mk.
-Mon Mar 26 23:19:03 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * tool/ytab.sed: comment out yydebug definition, and substitute
+ yyerror with parser_yyerror.
- * lib/net/ftp.rb (parse_pasv_port): refactored.
+Tue Nov 13 16:33:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Mar 26 19:49:49 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * numeric.c (flodivmod): work around for infinity.
- * test/net/ftp/test_ftp.rb: add the test, which was forgotten in the
- previous commit.
+ * numeric.c (flo_divmod): work around for platforms have no round().
+ [ruby-dev:32247]
-Mon Mar 26 19:37:27 2012 Shugo Maeda <shugo@ruby-lang.org>
+Tue Nov 13 15:26:33 2007 Tanaka Akira <akr@fsij.org>
- * lib/net/ftp.rb (parse227, parse228, parse229): refactored.
+ * lex.c.blt: moved from lex.c.
-Mon Mar 26 11:46:23 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lex.c.src: copied from keywords. This is the source of lex.c.blt.
- * enumerator.c (inspect_enumerator): show method arguments of
- lazy enumerators correctly.
+ * Makefile.in (lex.c): use lex.c.blt if keywords is same as lex.c.src.
-Mon Mar 26 13:51:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/Makefile.sub (lex.c): re-introduce copy rule.
- * win32/win32.c (check_if_dir, check_if_wdir): fix for Visual C++
- not to use S_ISDIR(). [Feature #2408][ruby-core:26925]
+ * bcc32/Makefile.sub (lex.c): ditto.
- * ruby.c (load_file_internal): ditto.
+ * wince/Makefile.sub (lex.c): ditto.
-Mon Mar 26 11:46:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 13 15:21:52 2007 Koichi Sasada <ko1@atdot.net>
- * ruby.c (load_file_internal): bail out if the script is a directory.
- [Feature #2408][ruby-core:26925]
+ * compile.c (iseq_specialized_instruction): check argc.
- * win32/win32.c (rb_w32_open, rb_w32_wopen): check if the file is a
- directory when access denied, to set errno to EISDIR.
+Tue Nov 13 14:44:32 2007 why the lucky stiff <why@ruby-lang.org>
-Sun Mar 25 18:13:14 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/yaml/test_yaml.rb: fixed the failing YAML Struct test
+ at ko1's request.
- * string.c (tr_setup_table): fix multiple non latin argument for
- non latin (over 256 characters) tr-like methods.
- [ruby-core:43371] [Bug #6167]
+Tue Nov 13 02:57:04 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
-Sun Mar 25 00:46:06 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * numeric.c (flo_divmod): round to the nearest integer.
+ [ ruby-Bugs-14540 ]
- * enumerator (lazy_initialize): set the instance variable "receiver"
- to include the receiver to the return value of inspect on a lazy
- enumerator directly created by Enumerator::Lazy.new.
+Tue Nov 13 00:36:16 2007 Shugo Maeda <shugo@ruby-lang.org>
- * enumerator (RETURN_LAZY): don't set the instance variable "receiver".
+ * test/ruby/test_settracefunc.rb: fixed tests for set_trace_func.
-Sat Mar 24 23:59:00 2012 Shugo Maeda <shugo@ruby-lang.org>
+Mon Nov 12 19:47:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * enumerator (enumerator_inspect): include the original receiver and
- method name of Enumerator::Lazy in the result of inspect.
- [ruby-core:43345] [Bug #6159]
+ * thread.c (call_trace_proc): should return value.
- * enumerator (InitVM_Enumerator): don't use rb_define_alias for
- some methods such as collect in order to make rb_frame_this_func()
- return the correct method names.
+Mon Nov 12 19:45:18 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Mar 24 22:22:18 2012 Sambasiva Rao Suda <sambasivarao@gmail.org>
+ * {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT)
+ instead of $(LIBRUBY_A).
- * time.c (time_init_1): Time.new will accept seconds as string or
- int. [ruby-core:43569][Bug #6193]
+Mon Nov 12 18:32:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Mar 23 15:12:12 2012 Martin Duerst <duerst@it.aoyama.ac.jp>
+ * {bcc,win}32/Makefile.sub (MINIOBJS): added prelude.$(OBJEXT).
- * transcode.c (documentation for str_encode): Explain
- that transcoding to the same encoding is a no-op
- (i.e. no exceptions, no replacements,...).
- [ruby-core:43557][Bug #6190]
+Mon Nov 12 17:13:23 2007 Tanaka Akira <akr@fsij.org>
-Fri Mar 23 13:19:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * Makefile.in, common.mk: add prelude.o to MINIOBJS.
- * bignum.c (rb_str_to_inum): must be ASCII compatible encoding as
- well as String#hex and String#oct. [ruby-core:43566][Bug #6192]
+Mon Nov 12 16:52:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c (rb_must_asciicompat): check if ASCII compatible.
+ * lib/mkmf.rb (create_makefile): rdoc about srcprefix. a patch from
+ Daniel Berger <djberg96 AT gmail.com> in [ruby-core:13378].
-Thu Mar 22 23:14:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 12 16:48:09 2007 Tanaka Akira <akr@fsij.org>
- * transcode.c (str_encode_bang, encoded_dup): if nothing was
- transcoded, just set encoding but leave coderange unchanged as
- force_encoding. [ruby-core:43557][Bug #6190]
+ * Makefile.in, common.mk: add ext_prelude.o to OBJS.
-Thu Mar 22 22:30:44 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Mon Nov 12 13:57:39 2007 Tanaka Akira <akr@fsij.org>
- * io.c (static int io_fflush): add the definition.
- Use it in set_binary_mode_with_seek_cur().
+ * configure.in (MINIDLNOBJS): removed.
+ (MINIOBJS): set to dln.o if dmydln.o is not used.
- * io.c (set_binary_mode_with_seek_cur): refactoring to split the
- content into io_unread(). Fix the possibility of buffer overflow.
+ * Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.
- * io.c (io_unread): add new implementation for Windows. Previous one
- caused invalid cursor position using IO#pos with OS text mode. New
- one fixes the bug.
+Mon Nov 12 13:53:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_io_m17n.rb
- (TestIO_M17N#test_pos_dont_move_cursor_position): add a test for
- above bug.
- [ruby-core:43497] [Bug #6179]
+ * misc/ruby-mode.el (ruby-parse-partial): handle stringified
+ symbols properly using ruby-forward-string.
-Thu Mar 22 19:55:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 12 12:17:59 2007 Tanaka Akira <akr@fsij.org>
- * win32/win32.c (rb_w32_fstat, rb_w32_fstati64): convert FILETIME
- to time_t directly, not to be affected by TZ unnecessarily.
+ * configure.in (MINIDLNOBJS): defined.
- * win32/win32.c (unixtime_to_filetime): convert time_t to FILETIME
- simply.
+ * Makefile.in (miniruby): use MINIDLNOBJS and COMMONOBJS instead of
+ MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.
-Thu Mar 22 13:43:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Nov 11 20:32:45 2007 Tanaka Akira <akr@fsij.org>
- * ext/openssl/ossl_pkey_rsa.c (rsa_generate): fix argument type.
- [Bug #6094]
+ * {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.
-Thu Mar 22 11:14:10 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Nov 11 19:40:52 2007 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_io.rb (TestIO#test_pos_with_getc): updated.
- see [ruby-core:43550]
+ * Makefile.in (lex.c): simplified.
-Wed Mar 21 17:57:57 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Nov 11 18:31:48 2007 Tanaka Akira <akr@fsij.org>
- * regcomp.c: Merge Onigmo 3d855b30d574536d3ae600260208c6624ae4791c.
- [Bug#6143] [Bug#6144] [Bug#6145]
+ * 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.
-Wed Mar 21 17:01:55 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Nov 11 17:32:46 2007 Shugo Maeda <shugo@ruby-lang.org>
- * test/ruby/test_io.rb (TestIO#test_pos_with_getc): added.
- see [Bug #6179][ruby-core:43518]
+ * insnhelper.ci (vm_call_method): pass mn->nd_clss to
+ vm_call_cfunc() instead of klass.
-Mon Mar 19 17:18:51 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * vm.c (rb_thread_method_id_and_klass): traverse parent_iseq.
- * enumerator.c (lazy_flat_map_func): convert the block value to
- Array if it doesn't respond to each. [ruby-core:43334]
- [Bug #6155]
+ * thread.c (call_trace_proc): use rb_thread_method_id_and_klass().
-Mon Mar 19 16:34:14 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sun Nov 11 16:54:25 2007 Tanaka Akira <akr@fsij.org>
- * enum.c (zip_i): variadic argument needs explicit cast on the
- platforms where VALUE is longer than int.
+ * lex.c: renamed from lex.c.blt.
-Mon Mar 19 15:36:41 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * Makefile.in (lex.c): use find command to check mtime.
- * enumerator.c (enumerable_lazy): add an example of take and first
- to the documentation. [ruby-core:43344] [Bug #6158]
- add the description of the behavior when a block is given to zip
- or cycle.
+Sun Nov 11 05:34:13 2007 Eric Hodel <drbrain@segment7.net>
-Mon Mar 19 15:20:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bin/gem: Add forgotten gem command.
- * compile.c (iseq_specialized_instruction): DRY and replace chain
- of if-else with switch for special instructions. based on a
- patch by Vasfed. https://github.com/ruby/ruby/pull/105
+Sat Nov 10 23:50:31 2007 Tanaka Akira <akr@fsij.org>
-Mon Mar 19 15:05:54 2012 URABE Shyouhei <shyouhei@ruby-lang.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.
- * test/test_pty.rb: same as r29280, skip tests when PTY allocation
- failed (that's not our fault).
+Sat Nov 10 23:08:53 2007 Tanaka Akira <akr@fsij.org>
-Sun Mar 18 23:21:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in, common.mk, Makefile.in: don't generate
+ libminiruby-static.a.
- * gc.c (aligned_free): fix condition for free. memalign() and
- posix_memalign() are not defined together normally.
+Sat Nov 10 19:46:54 2007 Tanaka Akira <akr@fsij.org>
-Sun Mar 18 18:31:45 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+ * configure.in, common.mk, Makefile.in: generate libminiruby-static.a
+ which contains prelude.o for miniruby.
- * gc.c (aligned_malloc, aligned_free): added fallback implementations
- for platforms like OSX Leopard.
+Sat Nov 10 18:10:07 2007 Tanaka Akira <akr@fsij.org>
-Sun Mar 18 17:17:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gem_prelude.rb: new file for gem libraries. currently empty.
- * bignum.c (rb_big_pow): estimate result bit size more precisely.
- [ruby-core:30735][Feature #3429]
+ * 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.
-Sun Mar 18 17:17:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * inits.c (rb_call_inits): don't call Init_prelude.
- * gc.c (free_method_entry_i): method entry may be in
- unlinked_method_entry_list. [ruby-core:43383][Bug #6171]
+ * 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.
-Sun Mar 18 15:27:31 2012 Tanaka Akira <akr@fsij.org>
+ * tool/compile_prelude.rb: support multiple files.
- * compile.c: typo fix by Run Paint Run Run.
- [ruby-core:28368] [Bug #2824]
+Sat Nov 10 17:27:55 2007 Shugo Maeda <shugo@ruby-lang.org>
-Sun Mar 18 10:01:02 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * thread.c (call_trace_proc): don't call ID2SYM() for ID_ALLOCATOR
+ to avoid SEGV.
- * lib/profiler.rb: support calling singleton methods of
- an instance of BasicObject.
+Sat Nov 10 16:37:07 2007 Eric Hodel <drbrain@segment7.net>
-Sat Mar 17 06:56:58 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/rubygems: Import RubyGems revision 1493.
- * object.c: Fix indentation of Class#inherited example.
+ * lib/rubygems.rb: ditto.
-Sat Mar 17 01:46:05 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * lib/ubygems.rb: ditto.
- * string.c (trnext): fix bug with string ending with '\\'.
- [ruby-dev:45374][Bug #6160]
+ * lib/rbconfig/datadir.rb: ditto.
- * test/ruby/test_string.rb (TestString#test_delete): test for
- above.
+ * test/rubygems: ditto.
-Fri Mar 16 20:06:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Nov 10 16:34:21 2007 Eric Hodel <drbrain@segment7.net>
- * string.c (trnext): should advance char-wise.
- [ruby-core:43335][Bug #6156]
+ * lib/soap/property.rb: Don't override Enumerable#inject for 1.9.
-Fri Mar 16 17:42:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Nov 10 14:43:30 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * parse.y (block_append_gen): fix unreachable warning line number.
- should warn at the code, not jump.
+ * parse.y: use ASCII encoding for string literals that are
+ 7-bit clean, fixing regression from my previous patch
-Fri Mar 16 17:33:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Nov 10 13:18:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enum.c (enum_take): allocate buffer array before iteration, as well
- as enum_first did.
+ * {bcc32,win32}/Makefile.sub: vendor_ruby support.
- * enum.c (enum_first): remove duplication.
+Fri Nov 9 23:33:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Mar 16 14:43:18 2012 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+ * parse.y (parser_nextc): added single line read forward buffer.
- * load.c (ruby_init_ext): don't free the given pointer itself.
- It is not guaranteed even that the pointer is on heap.
+ * parse.y (parser_yylex): adjust line number for fluent interface.
-Fri Mar 16 14:37:57 2012 Shugo Maeda <shugo@ruby-lang.org>
+Fri Nov 9 22:04:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_eval.c (rb_mod_module_eval): fix the documentation of
- class_eval to mention class variable lookup. [ruby-core:40649]
- [Bug #5544]
+ * vm.h (FRAME_MAGIC_MASK_BITS): bits of FRAME_MAGIC_MASK.
-Fri Mar 16 14:27:11 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): use shift operations.
- * vm_eval.c (rb_mod_module_eval): fix the documentation of
- class_eval to mention constant lookup. [ruby-core:41718]
- [Bug #5777]
+Fri Nov 9 21:46:28 2007 Koichi Sasada <ko1@atdot.net>
-Fri Mar 16 14:10:45 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * eval.c (eval): should be volatile value for GC.
- * lib/net/imap.rb (initialize): raise Net::IMAP::Error when the
- connection is closed without a greeting response.
- [ruby-core:40938] [Bug #5616]
+Fri Nov 9 17:48:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Mar 16 13:50:12 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * ruby.c (locale_encoding): guesstimate encoding from environment
+ variables. [ruby-core:13315]
- * lib/net/imap.rb (rfc822_text): ignore [] after RFC822.
- [ruby-core:40945] [Bug #5620]
+ * ruby.c (process_options): set primary encoding from environment.
-Fri Mar 16 12:00:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 9 16:51:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_insnhelper.c (argument_error): use line number at the beginning
- of lambda, not the first code of its body.
- [ruby-core:43314][Bug #6151]
+ * io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for
+ each iteration. [ruby-dev:31659][ruby-dev:32192]
- * iseq.c (rb_iseq_first_lineno): constified.
+ * variable.c (rb_cvar_set): cvar assignment obey same rule to cvar
+ reference. [ruby-dev:32192]
-Fri Mar 16 11:20:07 2012 Shugo Maeda <shugo@ruby-lang.org>
+Fri Nov 9 15:52:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c (lazy_take): don't enumerate an extra value.
- [ruby-dev:45370] [Bug #6152]
+ * encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
+ is no longer in FL_USERS flags.
-Fri Mar 16 06:30:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 9 15:20:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c (lazy_zip_func): variadic argument needs explicit cast
- on the platforms where VALUE is longer than int.
+ * string.c (rb_str_squeeze_bang): initialize squeezing table if no
+ arguments given.
- * enumerator.c (lazy_init_iterator): no need to check overflow twice.
+Fri Nov 9 13:57:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Mar 16 05:47:09 2012 Eric Hodel <drbrain@segment7.net>
+ * 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]
- * enumerator.c (lazy_init_iterator): Fix type error (int vs long).
+Fri Nov 9 13:45:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Mar 15 23:13:36 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * test/ruby/test_iterator.rb (TestIterator::IterTest::each):
+ #each_pair is now alias to #each. [ruby-dev:32192]
- * enum.c (rb_enum_values_pack): rename from enum_values_pack, and
- remove static.
+ * test/ruby/test_iterator.rb (TestIterator::test_assoc_yield):
+ ditto
- * enumerator.c (lazy_init_iterator, lazy_init_yielder,
- lazy_select_func, lazy_reject_func, lazy_grep_func): handle
- multiple values correctly.
+Fri Nov 9 12:56:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c (lazy_grep): change the behavior when a block is
- given, to be consistent with Enumerable#grep.
+ * eval_load.c (loaded_feature_path): check with type of given feature.
-Thu Mar 15 19:12:31 2012 Shugo Maeda <shugo@ruby-lang.org>
+Fri Nov 9 12:43:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * enumerator.c (lazy_zip): rescue StopIteration returned by
- Enumerator#next.
+ * test/ruby/test_basicinstructions.rb: updated for new class
+ behavior. [ruby-dev:32192]
-Thu Mar 15 18:19:53 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * encoding.c (enc_name): Encoding should not rely on ENCODING in
+ the FL_USERS flags.
- * enumerator.c (lazy_zip, lazy_cycle): Enumerator::Lazy#{zip,cycle}
- should be eager when a block is given, to be consistent with
- Enumerable#{zip,cycle}.
+ * encoding.c (rb_enc_from_encoding): do not call rb_enc_associate
+ for encoding itself.
-Thu Mar 15 17:45:27 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * encoding.c (enc_register_at): ditto.
- * enumerator.c (InitVM_Enumerator): renamed Enumerable::Lazy to
- Enumerator::Lazy.
+ * marshal.c (r_ivar): do not set real instance variable for
+ encoding data associated.
-Thu Mar 15 16:37:38 2012 Shugo Maeda <shugo@ruby-lang.org>
+Fri Nov 9 10:43:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c (enumerable_lazy): added cycle to the documentation.
+ * eval.c (send_internal): use self in the previous frame to check for
+ protected methods. [ruby-core:13254]
-Thu Mar 15 15:37:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * insnhelper.ci (vm_call_method): send! method has gone.
- * parse.y (parser_yylex): fix warning line number.
+Fri Nov 9 10:38:13 2007 Koichi Sasada <ko1@atdot.net>
-Thu Mar 15 15:19:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (w_object): should be SPECIAL_CONST_P() instead of
+ IMMEDIATE_P().
- * enumerator.c (lazy_cycle): check argument number overflow before
- creating temporary array.
+Fri Nov 9 10:29:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Mar 15 15:04:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_invoke_method): check if invoked in function style.
+ [ruby-core:13245]
- * util.c (ruby_strtod): no need to check same digit for hexdigit
- twice. [ruby-dev:45363][Bug #6146]
+ * insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): stores and returns VM
+ calling flags.
- * parse.y (sym_check_asciionly): check ascii compatibility before
- scanning for code range.
+ * vm.c (rb_vm_cfunc_funcall_p): returns if the current method is
+ invoked in function style.
- * parse.y (intern_str): set to us-ascii if ascii only.
- [ruby-dev:45363][Bug #6146]
+Fri Nov 9 10:10:21 2007 Koichi Sasada <ko1@atdot.net>
- * file.c (ruby_enc_find_basename): allow NULL as alllen.
- [ruby-dev:45363][Bug #6146]
+ * cont.c: add rb_context_t#type.
-Thu Mar 15 14:49:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 9 10:05:54 2007 Koichi Sasada <ko1@atdot.net>
- * string.c (rb_str_conv_enc_opts): default to original encoding.
+ * ruby.c (set_arg0): fix breaking environ bugs.
-Thu Mar 15 13:47:17 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 9 07:26:04 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * hash.c (env_str_new, rb_f_getenv, env_fetch): use rb_str_conv_enc()
- instead of rb_str_encode() to simplify the code.
+ * random.c: update MT URL.[ruby-core:13305].
-Thu Mar 15 12:44:50 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Nov 8 17:09:55 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * win32/win32.c, include/ruby/win32.h (rb_w32_ugetenv): new API to
- accept and to return UTF-8 strings.
+ * object.c: improve docs for Object.tap
- * win32/win32.c (rb_w32_getenv): follow above change.
+ * ChangeLog: fix bogus dates on my previous entries
- * win32/win32.c (rb_w32_get_environ): returns UTF-8 environment area.
+Thu Nov 8 15:13:56 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * hash.c (env_str_new, rb_f_getenv, env_fetch): follow above changes.
- [Bug #5570] [ruby-core:40737]
+ * parse.y: fix segfault with \x escapes in regexps
+ delete unused #if 0 code regions from previous patch
-Thu Mar 15 10:57:27 2012 Shugo Maeda <shugo@ruby-lang.org>
+Thu Nov 8 12:12:10 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * enumerator.c (lazy_cycle): add Enumerable::Lazy#cycle.
+ * parse.y (parser_read_escape): remove C99/gcc-ism.
-Thu Mar 15 10:31:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Nov 8 07:54:22 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * test/ruby/test_arity.rb (TestArity#err_mess): use assert_raise.
+ * parse.y: patch, based on Nobu's, work to support \u escapes
+ also modifications for better coderange detection
-Thu Mar 15 07:03:52 2012 Eric Hodel <drbrain@segment7.net>
+ * test/ruby/test_unicode_escapes.rb: test cases
- * vm_eval.c (check_funcall): Raise ArgumentError if respond_to?
- requires more than three arguments. [Bug #6000]
+ * test/ruby/test_mixed_unicode_escapes.rb: mixed encoding test cases
- * test/ruby/test_object.rb (class TestObject): Test for respond_to?
- requiring more than three arguments.
+Thu Nov 8 07:14:37 2007 David Flanagan <davidflanagan@ruby-lang.org>
-Thu Mar 15 06:08:06 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * 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.
- * include/ruby/intern.h: Add rb_check_arity, rb_error_arity [#6085]
+Thu Nov 8 07:04:31 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * array.c: Use rb_check_arity / rb_error_arity
+ * string.c (tr_setup_table, tr_trans): fix test failures
+ in test/ruby/test_string.rb
- * class.c: ditto
+Wed Nov 7 15:07:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enumerator.c: ditto
+ * enum.c (enum_each_with_index): make different arrays at each
+ iteration. [ruby-dev:32181]
- * eval.c: ditto
+Wed Nov 7 05:17:24 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * file.c: ditto
+ * eval.c: fix typo in invoke_method documentation
- * hash.c: ditto
+Wed Nov 7 03:52:26 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * numeric.c: ditto
+ * array.c (rb_ary_product): core dumped with non array arguments.
+ a patch from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:32180]
- * proc.c: ditto
+Wed Nov 7 03:32:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c: ditto
+ * lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
+ nkf conversion. a patch from <moonwolf AT moonwolf.com>.
+ [ruby-dev:32183]
- * random.c: ditto
+Wed Nov 7 02:59:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * re.c: ditto
+ * array.c (rb_ary_each_index): should return meaningful value.
- * signal.c: ditto
+Tue Nov 6 16:37:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * string.c: ditto
+ * eval_load.c (loaded_feature_path): need to expand relative paths.
- * struct.c: ditto
+ * eval_load.c (rb_feature_p): check if the feature is loading with
+ load path. [ruby-dev:31932]
- * transcode.c: ditto
+ * eval_load.c (load_lock): check the result of barrier waiting.
- * vm_eval.c: ditto
+ * thread.c (rb_barrier_wait): check if owned by the current thread.
- * vm_insnhelper.c: ditto & implementation of rb_error_arity
+ * thread.c (rb_barrier_release): ditto.
- * test/ruby/test_arity.rb: tests for above
+Mon Nov 5 08:01:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Mar 15 06:08:05 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * eval.c (Init_eval): move #send to Kernel module from BasicObject.
- * vm_insnhelper.c: improve number of arguments error in case of
- optional parameters (issue #6085)
+Mon Nov 5 05:17:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * include/ruby/intern.h: define UNLIMITED_ARGUMENTS
+ * lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
+ option with very long argument. a patch from Kobayashi Noritada
+ <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
- * test/ruby/test_arity.rb: test for above
+Mon Nov 5 01:20:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Mar 15 00:58:04 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * parse.y (call_args): remove "parenthesize argument(s) for future
+ version" warning. when I added this warning, I had a plan to
+ reimplement the parser that is simpler than the current one.
+ since we abandoned the plan, warning no longer required.
- * enumerator.c (enumerable_lazy): fix the documentation of
- Enumerable#lazy.
+Mon Nov 5 01:02:56 2007 Minero Aoki <aamine@loveruby.net>
-Wed Mar 14 22:01:06 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/http.rb (HTTPHeader#initialize): provide default
+ User-Agent to fix 500 error on some corrupted HTTP servers.
+ [ruby-core:13135]
- * enumerator.c (lazy_init_iterator): break when Qundef is returned
- to make obj.drop(3).take(2) work properly.
+Mon Nov 5 00:32:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * enumerator.c (lazy_take_while): add Enumerable::Lazy#take_while.
+ * eval.c (rb_f_send): allow send/__send__ to call methods of all
+ visibility again. we no longer provide __send, __send!.
- * enumerator.c (lazy_drop): add Enumerable::Lazy#drop.
+ * 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).
- * enumerator.c (lazy_drop_while): add Enumerable::Lazy#drop_while.
+Mon Nov 5 00:24:24 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * enumerator.c (InitVM_Enumerator): add Enumerable::Lazy#force as an
- alias of to_a.
+ * win32/Makefile.sub: vendor_ruby support.
-Wed Mar 14 19:28:40 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * configure.in (RUBY_LIB): duplicated.
- * enumerator.c (lazy_take): add Enumerable::Lazy#take.
+Mon Nov 5 00:01:33 2007 Tanaka Akira <akr@fsij.org>
-Wed Mar 14 18:40:36 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * re.c (rb_reg_quote): quote \v as well.
- * enumerator.c: use long for array indices.
+Sun Nov 4 23:51:59 2007 Tanaka Akira <akr@fsij.org>
-Wed Mar 14 18:25:18 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * re.c (rb_reg_initialize_m): use StringValuePtr instead of
+ StringValueCStr because \0 exists when Regexp.new("\0").
- * enumerator.c: moved the comment of StopIteration.
+Sun Nov 4 08:11:19 2007 Tanaka Akira <akr@fsij.org>
-Wed Mar 14 17:55:29 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (count_objects): count TOTAL.
- * numeric.c (flodivmod): must go through the same pass if HAVE_FMOD or
- not. this is a bugfix of r35013.
+Sun Nov 4 03:58:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Mar 14 16:41:55 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * string.c (tr_setup_table): use C array for characters that fit
+ in a byte to gain performance.
- * test/test_tmpdir.rb (TestTmpdir#test_world_writable): skip on Windows.
+ * string.c (rb_str_delete_bang): ditto.
-Wed Mar 14 15:09:23 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * string.c (rb_str_squeeze_bang): ditto.
- * numeric.c: fix flodivmod for cornercases [Bug #6044]
- add ruby_float_mod
+ * string.c (rb_str_count): ditto.
- * insns.def (opt_mod): use ruby_float_mod
+ * string.c (tr_trans): ditto.
- * internal.h: declare ruby_float_mod
+Sun Nov 4 00:06:40 2007 Tanaka Akira <akr@fsij.org>
- * test/ruby/test_float.rb: tests for above
+ * gc.c (count_objects): ObjectSpace.count_objects implemented.
+ [ruby-core:12301]
- * test/ruby/envutil.rb: create helper assert_is_minus_zero
+Sat Nov 3 22:49:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Mar 14 10:44:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (rb_hash_each_pair): make Hash#each to be alias to
+ Hash#each_pair for compatibility and clarity.
- * enumerator.c (lazy_grep_func): should use === instead of =~, as
- well as Enumerable#grep
+ * hash.c (env_each_pair): ditto.
-Wed Mar 14 08:15:54 2012 Shugo Maeda <shugo@ruby-lang.org>
+Sat Nov 3 22:41:05 2007 Tanaka Akira <akr@fsij.org>
- * enumerator.c (lazy_flat_map_func): use each for non-Array objects.
+ * configure.in: --with-vendor-hdrdir implemented.
-Wed Mar 14 08:06:35 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/mkmf.rb: check --vendor argument.
- * enumerator.c (lazy_zip): add Enumerable::Lazy#zip.
+ * README.EXT: explain --vendor option for extconf.rb
- * enumerator.c (lazy_lazy): just returns self.
+ * README.EXT.ja: ditto.
-Wed Mar 14 07:48:36 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Sat Nov 3 20:30:48 2007 Tanaka Akira <akr@fsij.org>
- * ext/date/date_core.c (datetime_s_now): [ruby-core:43256].
+ * configure.in: --with-vendordir implemented.
-Tue Mar 13 22:00:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * mkconfig.rb: add config to vendorlibdir and vendorarchdir.
- * compile.c (iseq_set_arguments): keyword rest arg without keyword args.
+ * instruby.rb: make vendor library directories.
- * node.c (dump_node): dump kw_rest_arg too.
+ * ruby.c: insert vendor library directories into load path.
- * parse.y (block_param, f_arg): more kwrest patterns.
- [ruby-core:42455][Bug #5989]
+Fri Nov 2 20:55:49 2007 Kouhei Sutou <kou@cozmixng.org>
- * parse.y (new_args_gen): no extra kw_rest_arg if no keyword rest arg.
+ * 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.
-Tue Mar 13 15:17:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 2 20:47:04 2007 Kouhei Sutou <kou@cozmixng.org>
- * parse.y (block_param, f_args): add rules for the case arguments
- begin with kwrest. [ruby-core:42455][Bug #5989]
+ * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
-Tue Mar 13 12:37:53 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Nov 1 21:56:45 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (io_encoding_set): always warn if external encoding and internal
- encoding are identical. [ruby-core:40727] [Bug #5568]
+ * error.c (Init_Exception): make NameError to be subclass of
+ StandardError again.
-Tue Mar 13 12:37:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c (Init_Exception): make SecurityError to be subclass of
+ Exception, since it's too important to be handled implicitly.
- * gc.c: add ObjectSpace::WeakMap. [ruby-dev:44565][Bug #5350]
+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
- * lib/weakref.rb: use WeakMap instead of _id2ref.
+Thu Nov 1 02:12:50 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Mar 13 10:59:48 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * common.mk (prereq): update the path of prelude.c.
- * tool/rbinstall.rb (prepare): skip if basedir is not defined.
- [ruby-core:39135][Bug #5238]
+ * common.mk (prelude.c): rollback a part of r13675, because it is not
+ documented and causes build error.
- * tool/rbinstall.rb (CONFIG.[]): check for mandatory
- configurations.
+Thu Nov 1 01:52:23 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Mar 13 00:09:18 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * enum.c (enum_drop): fix typo.
- * enumerator.c (enumerable_lazy): added documentation.
+Thu Nov 1 01:51:01 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Mar 12 20:19:25 2012 Tanaka Akira <akr@fsij.org>
+ * vm_core.h (ruby_current_thread): RUBY_EXTERN'ed for probeprofiler.
- * lib/tmpdir.rb (Dir::tmpdir): test the current directory suitable for
- temporary directory.
+Thu Nov 1 00:46:30 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Mar 12 20:08:16 2012 Tanaka Akira <akr@fsij.org>
+ * win32/configure.bat, setup.mak: now can recognize OS even if
+ the ``--target'' option of configure is omitted.
- * lib/fileutils.rb (fu_have_symlink?): specify TypeError for rescue
- clause.
+ * win32/README.win32: update the descriptions about compiler.
-Mon Mar 12 19:23:13 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 31 03:13:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * encoding.c (rb_find_encoding): new function find encoding from
- arbitrary object as a pointer to rb_encoding, and return NULL if
- not found.
+ * enum.c (enum_take_while): separate with-block form.
- * io.c (io_encoding_set): just warn unsupported encodings, but not
- exception. [ruby-core:40726] [Bug #5567]
+ * enum.c (drop_while_i): ditto.
-Mon Mar 12 19:03:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enum.c (enum_butfirst): abandon butfirst method. reverted.
- * vm_method.c (Init_eval_method): respond_to? and
- respond_to_missing? are public.
+Tue Oct 30 10:03:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Mar 12 14:56:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enum.c (enum_butfirst): add a new method to iterates over
+ elements but first n. RDoc need to be updated.
- * node.h (NEW_YIELD), parse.y (new_yield_gen): array-values flags
- has been already obsolete. patch by Thomas Enebo.
- [ruby-core:41929][Bug #5847]
+ * enumerator.c (Init_Enumerator): remove unnecessary symbol
+ initialization.
-Mon Mar 12 12:44:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 29 18:42:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (Init_eval_method): copy basic methods to Exception.
- [ruby-core:40287][Bug #5473]
+ * parse.y (bvar): block-local variable can shadow outer variable.
+ [ruby-core:13036]
-Mon Mar 12 10:13:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 29 17:58:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * eval_jump.c (rb_exec_end_proc): remember the latest exit status.
- [ruby-core:43173][Bug #5218]
+ * string.c (rb_str_substr): performance improvement. [ruby-dev:31806]
-Mon Mar 12 07:33:12 2012 Tanaka Akira <akr@fsij.org>
+Mon Oct 29 17:20:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/tmpdir.rb: update document for changing
- FileUtils.remove_entry_secure to FileUtils.remove_entry.
+ * encoding.c (rb_enc_replicate): new function to replicate encoding.
- * NEWS: add incompatibility note for lib/tmpdir.rb.
+ * encoding.c (enc_based_encoding): Encoding#base_encoding returns
+ based encoding of replica.
-Mon Mar 12 07:19:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 29 17:18:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/tmpdir.rb (Dir.tmpdir): should not use world-writable but
- non-sticky directory.
+ * encoding.c (rb_enc_compatible): ASCII encoding is compatible with
+ ASCII-compatible encoding, even for non-string objects.
- * lib/tmpdir.rb (Dir.mktmpdir): check the parent directory.
+Sun Oct 28 21:50:02 2007 Tanaka Akira <akr@fsij.org>
-Mon Mar 12 07:04:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/open-uri.rb: :redirect option implemented to disable redirects.
+ (OpenURI::HTTPRedirect): new exception class for redirection.
- * random.c (Init_Random): removed rb_Random_DEFAULT and register as
- mark-object instead of global variable.
+Fri Oct 26 17:38:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Mar 12 07:03:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (int_chr): take an optional encoding parameter.
+ [ruby-core:12816]
- * random.c (random_s_rand): ensure default PRNG is re-initialized
- after fork. patched by Eric Wong. [ruby-core:41209][Bug #5661]
+Fri Oct 26 17:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Mar 11 23:57:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * numeric.c (fix_pow): returns 1.0 for 0**0.0.
- * pack.c (pack_unpack): when unpack('M') occurs an illegal byte
- sequence, output the "=" character and the following character in
- the decoded data without any transformation.
- [ruby-dev:44875] [Bug #5635]
+ * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084]
-Sun Mar 11 22:32:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Oct 26 15:00:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.
- [ruby-core:41917] [Bug #5846]
+ * misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for
+ labels inside switch block.
-Sun Mar 11 17:10:04 2012 Shota Fukumori <sorah@tubusu.net>
+Fri Oct 26 05:48:57 2007 David Flanagan <davidflanagan@ruby-lang.org>
+ * array.c: raise IndexError for negative length in rb_ary_fill
- * lib/test/unit.rb: Put error message into STDERR if failed to launch
- worker (job) process. [ruby-dev:44802] [Bug #5577]
+Wed Oct 25 07:12:03 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * lib/test/unit/parallel.rb: If failed to increment_io, exit with code
- 2. [ruby-dev:44802] [Bug #5577]
+ * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
+ addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
-Sun Mar 11 15:46:45 2012 Shota Fukumori <sorah@tubusu.net>
+Wed Oct 25 06:34:11 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * io.c: fix rdoc of `IO.binwrite` to show same as `IO.write` except
- it opens file with mode "wb:ASCII-8BIT". [Bug #5782] [ruby-core:42592]
+ * lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
+ pattern case insensitive. [ruby-Bugs-10746]
-Sat Mar 10 23:52:28 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Oct 26 04:21:36 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * st.c: pack tables also generic keys. patched by Sokolov Yura at
- https://github.com/ruby/ruby/pull/84
+ * lib/net/pop.rb (Net::POP3::do_start): type fixed. a patch from
+ Dan Zwell <dzwell AT zwell.net> in [ruby-core:12941].
- * st.c: add st_foreach_check for fixing iteration over packed table
- and st_delete_safe. patched by Sokolov Yura at
- https://github.com/ruby/ruby/pull/84
+Fri Oct 26 01:48:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * st.c: fix packed num_entries on delete_safe. patched by Sokolov
- Yura at https://github.com/ruby/ruby/pull/84
+ * array.c (rb_ary_assoc): check and convert inner arrays (assocs)
+ using #to_ary.
-Fri Mar 9 14:29:32 2012 Shugo Maeda <shugo@ruby-lang.org>
+ * hash.c (rb_hash_s_create): check and convert argument hash
+ using #to_hash.
- * enumerator.c (lazy_flat_map): add Enumerable::Lazy#flat_map.
+ * hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
+ hash conversion.
-Fri Mar 9 06:29:22 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Thu Oct 25 16:46:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/psych/lib/psych.rb (load, parse): stop parsing or loading after
- the first document has been parsed.
+ * parse.y (parser_yylex): dot at the head of the line denote line
+ continuation from previous one to support fluent interface.
+ [experimental]
- * test/psych/test_stream.rb: pertinent tests.
+ * misc/ruby-mode.el (ruby-calculate-indent): support fluent dot.
-Fri Mar 9 06:17:05 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Thu Oct 25 14:19:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych.rb (parse_stream, load_stream): if a block is
- given, documents will be yielded to the block as they are parsed.
- [ruby-core:42404] [Bug #5978]
+ * io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093]
- * ext/psych/lib/psych/handlers/document_stream.rb: add a handler that
- yields documents as they are parsed
+Thu Oct 25 13:59:53 2007 David Flanagan <davidflanagan@ruby-lang.org>
- * test/psych/test_stream.rb: corresponding tests.
+ * parse.y (parser_tokspace): increment tokidx
+ fixes test failure at [test/ruby/test_stringchar.rb:72]
-Fri Mar 9 00:35:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Oct 25 09:49:49 2007 akira yamada <akira@ruby-lang.org>
- * enumerator.c (lazy_initialize, enumerable_lazy): no additional
- arguments.
+ * lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
+ scheme. [ruby-dev:31896]
-Fri Mar 9 00:30:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 25 06:23:14 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * enumerator.c: add Enumerable#lazy. based on the patch by
- Innokenty Mikhailov at <https://github.com/ruby/ruby/pull/101>
- [ruby-core:37164] [Feature #4890]
+ * 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]
-Fri Mar 9 00:25:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 25 04:59:28 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * enumerator.c (enumerator_each, generator_each): pass arguments to
- the block with yielder.
+ * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
+ the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
-Fri Mar 9 00:25:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 25 04:46:53 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * array.c (rb_ary_cat): new function to concat objects into array.
+ * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
+ message for Content-Type check failures. [ruby-core:12163]
-Thu Mar 8 16:44:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 25 03:45:08 2007 James Edward Gray II <jeg2@ruby-lang.org>
- * .gdbinit (rb_numtable_entry): update for recent refactoring of
- st_table.
+ * lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
+ Making Content-Type checks case insensitive. [ruby-Bugs-3367]
-Wed Mar 7 22:41:50 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Wed Oct 24 17:09:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/xmlrpc/client.rb (module XMLRPC): fix typo.
+ * parse.y (parser_tokspace): make space in token buffer.
- * test/xmlrpc/test_client.rb (test_async_call): add test for
- XMLRPC::Client#call_async to check above fix.
+ * parse.y (parser_yylex): fix encoding of single character literal.
-Wed Mar 7 16:30:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 23 13:44:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * error.c (rb_load_fail): should honor encoding.
+ * parse.y (call_args2): nd_head of NODE_BLOCK_PASS should be a list.
+ [ruby-core:12850]
- * load.c (load_failed): ditto.
+Tue Oct 23 10:42:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Mar 7 12:26:25 2012 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.
- * error.c (rb_load_fail): use path as a string, not char*.
+Mon Oct 22 19:24:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * internal.h: (rb_load_fail): moved from ruby/intern.h.
+ * ruby.c (proc_options): allow space after -E (encoding) option.
- * ruby.c (load_file_internal): fname cannot be NULL.
+Mon Oct 22 11:03:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Mar 7 08:32:43 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * encoding.c (enc_check_encoding): returns index now.
- * error.c (rb_loaderror_with_path): Adding the missing file as an
- instance variable to the LoadError exception.
- [ruby-core:39079]
+ * encoding.c (rb_enc_compatible): check if two objects have compatible
+ encodings.
- * load.c: call rb_loaderror_with_path so that the missing path is
- added to the exception.
+ * encoding.c (enc_compatible_p): added Encoding.compatible?.
- * ruby.c: call rb_loaderror rather than raising our own LoadError
- exception.
+ * include/ruby/encoding.h (rb_enc_compatible): prototype.
- * include/ruby/intern.h: add declaration for rb_loaderror_with_path.
+Sun Oct 21 18:29:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_require.rb: add supporting test for LoadError#path
- method.
+ * encoding.c (rb_enc_default, rb_enc_primary): return pointers to
+ rb_encoding of default and primary respectively. [ruby-core:12795]
-Wed Mar 7 08:28:00 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * encoding.c (set_primary_encoding): removed primary_encoding setter.
- * lib/xmlrpc/parser.rb: support i8 types. Thanks Stas Kelvich!
- [ruby-core:29246] [Feature #3090]
+Sat Oct 20 13:17:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/xmlrpc/test_client.rb: supporting test
+ * enum.c (enum_cycle): hide temporary array from ObjectSpace.
+ [ruby-core:12762]
-Wed Mar 7 07:43:29 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Oct 20 11:49:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/xmlrpc/client.rb: assume servers that do not send a Content-Type
- header are sending 'text/xml'. Thanks Nathan Leavitt!
- [ruby-core:41204] [Bug #5660]
+ * file.c (rb_get_path): returns frozen string.
- * test/xmlrpc/test_client.rb: supporting test
+ * file.c (rb_file_s_chown, rb_file_s_lchown): use uid_t and gid_t.
-Wed Mar 7 07:39:28 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Oct 19 20:08:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/xmlrpc/test_client.rb: adding a test for performing an XMLRPC
- call.
- * test/xmlrpc/data/blog.xml: supporting XML document for the response.
+ * 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]
+
+ * 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.
+
+ * re.c (rb_reg_initialize): set fixed option if none is set.
+
+ * re.c (rb_reg_regcomp): ditto.
+
+ * re.c (rb_reg_equal): check if encodings are equal.
+
+ * re.c (rb_reg_initialize_m): encoding option is obsolete.
+
+ * re.c (rb_kcode, rb_get_kcode, rb_set_kcode): removed.
+
+ * re.c (Init_Regexp): removed Regexp#kcode method.
+
+ * ruby.c (proc_options): allow long encoding name.
+
+Tue Oct 16 14:03:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_reg_s_union): encoding of all regexp objects should
+ match. [ruby-dev:32076]
+
+Tue Oct 16 13:49:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * encoding.c (enc_to_s): rename function.
+
+Tue Oct 16 13:25:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_new4): should copy encoding. a patch from NARUSE,
+ Yui <naruse AT airemix.com>. [ruby-dev:32076]
+
+Tue Oct 16 01:31:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enum.c (enum_inject): RDoc update. a patch from David Flanagan
+ <david AT davidflanagan.com> in [ruby-core:12710].
+
+Tue Oct 16 01:25:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * encoding.c (Init_Encoding): define #to_s to show encoding name
+ in to_s representation as well as #inspect.
+
+Mon Oct 15 13:24:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (flo_round): should be number but not rounding factor.
+ [ruby-dev:32060]
+
+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.
+ [ruby-dev:32054]
+
+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
+ options, to vail out of mismatch. [ruby-list:44114]
+
+ * mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
+
+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>
+
+ * 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.
+
+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>
+
+ * array.c: remove to_a completely.
+
+ * array.c (tmpbuf): keep DRY to clear klass of temporary objects.
+
+Tue Oct 9 16:33:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (rb_ary_permutation, rb_ary_combination, rb_ary_product):
+ hide internal buffer objects. [ruby-dev:31982]
+
+Tue Oct 9 16:00:32 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * parse.y (parser_read_escape, parser_tokadd_escape): check code range.
+ [ruby-dev:31980]
+
+Tue Oct 9 15:40:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (STR_NEW3): check for if single byte sequence.
+
+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]
+
+ * 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.
-Tue Mar 6 16:24:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Sep 29 10:12:20 2007 Tanaka Akira <akr@fsij.org>
- * parse.y (parser_tokadd_string): escape simple regexp meta
- character terminators.
+ * variable.c (rb_ivar_set): fix class instance variable.
-Tue Mar 6 10:11:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (rb_class_real): cl argument may be 0.
- * ext/io/console/console.c (set_rawmode): clear ECHOE and ECHOK
- bits too.
+Sat Sep 29 09:12:02 2007 Tanaka Akira <akr@fsij.org>
- * ext/io/console/console.c (echo_p): ignore ECHOE and ECHOK bits.
- [ruby-dev:45309] [Bug #6116]
+ * 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.
- * ext/io/console/console.c (console_raw): fix rdoc.
+Sat Sep 29 08:57:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/io/console/console.c (console_set_echo): mentioned about
- platform dependency.
+ * include/ruby/win32.h (strcasecmp): needed for type_strcasehash.
-Tue Mar 6 07:18:10 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Sep 29 06:47:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/xmlrpc/client.rb: switch net/http post2 calls to modern
- `request_post` methods.
+ * ruby.c (struct cmdline_options): static variables packed.
-Tue Mar 6 02:31:20 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Sep 29 05:29:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/core_ext.rb: only extend Kernel if IRB is loaded
- in order to stop method pollution.
+ * io.c (rb_io_fdopen): create IO object from fd.
-Tue Mar 6 01:34:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (yycompile): use encoding of the source as default.
- * parse.y (block_call): rules for block_call after block_call.
- based on a patch by pasberth https://github.com/ruby/ruby/pull/102
- [ruby-dev:45308][Bug #6115]
+ * ruby.c (proc_options, load_file): ditto.
-Tue Mar 6 01:24:13 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Sep 29 04:27:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (block_command, block_call): simplified rules.
+ * encoding.c (rb_enc_alias): allow encodings multiple aliases.
-Mon Mar 5 18:28:35 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * encoding.c (rb_enc_find_index): search the encoding which has the
+ given name and return its index if found, or -1.
- * test/ruby/test_regexp.rb (TestRegexp#test_source): fix typo.
- * test/ruby/test_regexp.rb (TestRegexp#test_equal): ditto.
+ * st.c (type_strcasehash): case-insensitive string hash type.
-Mon Mar 5 17:11:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_force_encoding): force encoding of self. this name
+ comes from [ruby-dev:31894] by Martin Duerst. [ruby-dev:31744]
- * ext/syck/lib/syck/rubytypes.rb (Exception.yaml_new): fix bug
- that causes YAML serialization problem for Exception.
- Exception#initialize doesn't use visible instance variable for
- the exception message, so call the method with the message.
- patched by Jingwen Owen Ou <jingweno AT gmail.com>.
- http://github.com/ruby/ruby/pull/41
+ * include/ruby/encoding.h (rb_enc_find_index, rb_enc_associate_index):
+ prototyped.
-Mon Mar 5 16:50:22 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * include/ruby/encoding.h (rb_enc_isctype): direct interface to ctype.
- * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): syntax error.
+ * include/ruby/st.h (st_init_strcasetable): prototyped.
- * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): call uname
- only on linux because it's a workaround for linux only.
+Sat Sep 29 03:53:26 2007 Koichi Sasada <ko1@atdot.net>
-Mon Mar 5 12:44:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * cont.c: Thread local storage should be fiber local.
- * st.c (unpack_entries): chain entries directly. based on a patch
- by Sokolov Yura <funny.falcon AT gmail.com>.
+ * bootstraptest/test_knownbug.rb, test/ruby/test_fiber.rb:
+ move a fixed test.
- * st.c (unpack_entries): use union instead of casted pointer.
- patched by Sokolov Yura <funny.falcon AT gmail.com>.
+Fri Sep 28 23:15:31 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * st.c: use PACKED_ENT and FIND_ENTRY. patched by Sokolov
- Yura <funny.falcon AT gmail.com>.
+ * insnhelper.ci (vm_call_method): allow send! to call protected
+ methods as well. [ruby-core:12280]
- * st.c (unpack_entries): reallocate bins if packed array size
- is not same as initial bins size. based on a patch by
- Sokolov Yura <funny.falcon AT gmail.com>.
+Fri Sep 28 22:33:47 2007 Koichi Sasada <ko1@atdot.net>
-Mon Mar 5 11:51:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * benchmark/bm_so_fasta.rb: added.
- * ext/bigdecimal/lib/bigdecimal/math.rb: remove description about
- BigMath#log. patched by Sho Hashimoto [ruby-dev:45307] [Bug #6112]
+ * benchmark/bm_so_k_nucleotide.rb: added.
- * string.c (str_byteslice): fix typo.
+ * benchmark/bm_so_reverse_complement.rb: added.
-Sun Mar 4 23:21:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * benchmark/make_fasta_output.rb: added.
- * parse.y (parser_tokadd_string): regexp engine doesn't need
- terminators to be escaped. [ruby-core:40364][Bug #5484]
+ * benchmark/prepare_so_k_nucleotide.rb: added.
-Sat Mar 3 22:51:46 2012 Tanaka Akira <akr@fsij.org>
+ * benchmark/prepare_so_reverse_complement.rb: added.
- * process.c (rb_run_exec_options_err): chdir at last to interpret
- relative pathnames from the current directory of the parent process.
+Fri Sep 28 19:14:51 2007 Koichi Sasada <ko1@atdot.net>
-Sat Mar 3 12:20:44 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * benchmark/driver.rb: fix notations.
- * ext/date/date_strftime.c: reassigned some variables.
+ * benchmark/bm_loop_whileloop.rb: ditto.
-Sat Mar 3 12:12:16 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * benchmark/bm_loop_whileloop2.rb: ditto.
- * ext/date/date_{parse,strptime}.c: [ruby-dev:45303].
+ * benchmark/bm_app_uri.rb: added.
-Sat Mar 3 10:09:21 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * benchmark/bm_vm1_ivar_set.rb: ditto.
- * lib/xmlrpc/client.rb (initialize): net/http defaults to 1_2 in 1.8+,
- so we can safely remove the call to enable it.
+ * benchmark/bm_so_binary_trees.rb: added from Computer Language
+ Benchmarks Game (http://shootout.alioth.debian.org/).
-Sat Mar 3 08:42:25 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * benchmark/bm_so_fannkuch.rb: ditto.
- * lib/xmlrpc/client.rb (new2): use URI for uri parsing.
- * test/xmlrpc/test_client.rb: test that query params are passed to the
- client constructor.
+ * 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 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]
+
+ * ext/fiber/fiber.c: enable Fiber#transfer.
+
+Wed Sep 26 18:38:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * encoding.c (rb_enc_check): check for ASCII-compatibilities.
+
+ * parse.y (parser_tokadd_string, parser_parse_string,
+ parser_here_document, parser_yylex): set encoding to US-ASCII.
+
+ * parse.y (rb_enc_symname_p): check if valid with encoding.
+
+ * parse.y (rb_intern3): let symbols have encoding.
+
+ * string.c (rb_str_hash): add encoding index.
+
+ * string.c (rb_str_comparable, rb_str_equal, rb_str_eql): check if
+ compatible encoding.
+
+ * string.c (sym_inspect): made encoding aware.
+
+ * insns.def (opt_eq): compare with encoding.
+
+ * include/ruby/encoding.h (rb_enc_asciicompat): check if ASCII
+ compatible.
+
+ * include/ruby/encoding.h (rb_enc_get_index): added prototype.
+
+ * include/ruby/intern.h (rb_str_comparable, rb_str_equal): ditto.
+
+Wed Sep 26 15:01:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval_method.ci (rb_get_alloc_func): cast to suppress a warning.
+
+ * eval_method.ci (remove_method): local variable to be initialized.
+
+Wed Sep 26 08:36:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
+ objects. [ruby-Bugs-14228]
+
+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]
+
+ * eval.c (ruby_finalize_0): clear trace_func before finalization.
+
+Mon Sep 24 22:36:13 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]
+
+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>
+
+ * lib/net/http.rb: an SSL verification (the server hostname should
+ be matched with its certificate's commonName) is added.
+ this verification can be skipped by
+ "Net::HTTP#enable_post_connection_check=(false)".
+ suggested by Chris Clark <cclark at isecpartners.com>
+
+ * lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
+ perform SSL post connection check.
+
+ * ext/openssl/lib/openssl/ssl.c
+ (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
+
+Sun Sep 23 09:05:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
+ [ruby-dev:31810]
+
+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]
+
+ * 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
+ changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
+
+Sat Sep 22 06:02:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::List::summarize): use each_line if
+ defined rather than each. [ruby-Patches-14096]
+
+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]
+
+ * gc.c (run_final): freeze temporary argument array.
+
+Fri Sep 21 04:58:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-style.el (ruby-style-label-indent): fix for function top
+ level labels.
+
+Fri Sep 21 02:11:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_reg_match_m): evaluate a block if match. it would make
+ condition statement much shorter, if no else clause is needed.
+
+ * string.c (rb_str_match_m): ditto.
+
+Fri Sep 21 02:02:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * hash.c (hash_equal): should call rb_eql when argument eql is set.
+
+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.
+
+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>
+
+ * 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>
+
+ * 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.
+
+ * 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]
+
+Thu Sep 6 12:42:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_succ, rb_str_chop_bang, rb_str_chop): m17n support.
+ [ruby-dev:31734]
+
+Wed Sep 5 22:02:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_subseq): need integer overflow check.
+ [ruby-dev:31736]
+
+ * array.c (rb_ary_splice): ditto. [ruby-dev:31737]
+
+ * array.c (rb_ary_fill): ditto. [ruby-dev:31738]
+
+ * 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>
+
+ * 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.
+
+ * numeric.c: replace direct bignum field accessor by abstract field
+ accessor such as RBIGNUM(val)->sign to RBIGNUM_SIGN(val).
+
+ * 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]
+
+ * 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.
+
+ * 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]
+
+Wed Aug 29 11:30:10 2007 Tanaka Akira <akr@fsij.org>
+
+ * include/ruby/st.h (struct st_table): add entries_packed 1-bit
+ bitfield. decrease num_bins 1-bit.
+
+ * 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.
+
+ [ruby-list:43954]
+
+Wed Aug 29 10:46:37 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.
-Sat Mar 3 08:20:10 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Aug 28 15:42:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/xmlrpc/client.rb (new2): raises an ArgumentError on bad
+ * 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.
+
+Mon Aug 27 20:27:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
+ [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]
+
+ * io.c (rb_io_s_foreach): argument count check before making
+ Enumerator. [ruby-dev:31525]
+
+Mon Aug 20 23:17:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (struct rb_thread_struct): removed first_func_arg and
+ reuse first_args instead.
+
+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]
+
+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.
+
+ * configure.in (aix): for 64bit-mode AIX. [ruby-dev:31401]
+ + use CC for LDSHARED if non-gcc,
+ + moved -G option from *LDFLAGS to LDSHARED,
+ + set -brtl only in XLDFLAGS.
+
+Thu Aug 16 13:06:08 2007 Tanaka Akira <akr@fsij.org>
+
+ * bignum.c (big_lshift): make shift offset long type.
+ (big_rshift): ditto.
+ (rb_big_lshift): ditto.
+ (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 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.
+
+Wed Aug 15 13:50:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * hash.c (rb_hash_delete_key): delete the entry without calling block.
+
+ * hash.c (rb_hash_shift): should consider iter_lev too.
+
+ * 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>
+
+ * bootstraptest/runner.rb (assert_check): new method.
+ (assert_match): new method.
+ (assert_equal): use assert_check.
+ (pretty): give failure description as an argument.
+
+ * 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]
+
+Sat Aug 11 07:24:55 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
+ device. [ruby-talk:263410]
+
+ * ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): constified.
+
+ * ext/pty/pty.c (SlaveName): removed static buffer.
+
+ * 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.
+
+ * ext/extmk.rb (extmake): remove mkmf.log at clean, and extconf.h at
+ distclean, respectively.
+
+ * ext/extmk.rb: remove rdoc at clean, and installed list file at
+ distclean, respectively.
+
+Fri Aug 3 07:09:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb: more verbose message. [ruby-Bugs-12766]
+
+ * lib/mkmf.rb (have_type): suppress a warning with -Wall.
+
+ * 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.
+ [ruby-dev:31271]
+
+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.
+
+ * dln.c (conv_to_posix_path): removed.
+
+ * ruby.c (usage): constified.
+
+ * ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
+ VALUE instead of a pointer to static buffer.
+
+ * ruby.c (push_include_cygwin): fixed buffer overflow.
+ [ruby-dev:31297]
+
+ * 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.
+
+ * include/ruby/ruby.h (is_ruby_native_thread): moved prototype
+ from intern.h as well as version 1.8.
+
+Sun Jul 22 14:33:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_rename): deleted code to get rid of a bug of
+ old Cygwin.
+
+ * file.c (rb_file_truncate): added prototype of GetLastError()
+ on cygwin. [ruby-dev:31239]
+
+ * include/ruby/intern.h (is_ruby_native_thread): prototype.
+
+ * missing/strftime.c (strftime): fix printf format and actual
arguments.
- * test/xmlrpc/test_client.rb: tests for bad uris
-Sat Mar 3 08:08:11 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/Win32API/Win32API.c (Win32API_initialize): ditto.
- * lib/xmlrpc/client.rb (new2): fix custom port specification when an
- SSL uri is used.
- * test/xmlrpc/test_client.rb: tests for XMLRPC::Client.new2
+ * ext/tk/tcltklib.c (ip_finalize): ditto.
-Sat Mar 3 08:03:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/win32ole.c (lcid_installed): ditto.
- * ext/syck/rubyext.c (mktime_do): use ISDIGIT().
- [ruby-core:43060] [Bug #6108]
+ * ext/socket/getnameinfo.c: include stdio.h always.
- * ext/syck/token.c (sycklex_yaml_utf8): cast as unsigned char.
- [ruby-core:43060] [Bug #6108]
+Sat Jul 21 21:39:12 2007 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Mar 3 06:57:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.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]
- * configure.in (ruby_pc): make configurable. [Bug #6051]
+ * lib/date.rb, lib/date/format.rb (Date._parse): now completes
+ truncated year as default action. [experimental]
-Fri Mar 2 17:49:03 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * lib/date.rb, lib/date/format.rb: added ::iso8601, ::rfc3339,
+ ::xmlschema, ::rfc2822, ::httpdate, ::jisx0301, #xmlschema,
+ #httpdate. [experimental]
- * .travis.yml (branches): Enable TravisCI for ruby_1_9_3.
+Sat Jul 21 17:48:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Mar 2 17:13:33 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * common.mk: inverted rules order.
- * test/ruby/test_array.rb (test_combination2): Make the test case for
- [ruby-core:29240] more descriptive.
- cf. http://bugs.jruby.org/6518
+ * thread_win32.ci (w32_create_thread): bcc does not have
+ _beginthreadex().
-Fri Mar 2 16:37:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
+ only if extconf.h is created.
- * file.c (file_expand_path): use wcscasecmp().
+ * bcc32/Makefile.sub: headers have moved.
-Fri Mar 2 16:36:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
+ support.
- * thread_pthread.c (native_cond_timeout): cast explicitly to suppress
- a warning.
+ * bcc32/setup.mak: check runtime version.
-Fri Mar 2 16:35:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c (rb_w32_open_osfhandle): prototype has changed
+ in bcc 5.82.
- * io.c (pipe_open): cmd is no longer used if fork is available.
+ * {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
-Thu Mar 1 16:13:18 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/resource.rb: include patchlevel number.
- * internal.h (rb_file_const, rb_file_load_ok): moved functions for
- internal use only.
+Sat Jul 21 12:06:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Mar 1 15:40:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
- * win32/makedirs.bat: new command to make intermediate
- directories, and not to report any errors if the directory
- already exists.
+Sat Jul 21 01:45:03 2007 Tadayoshi Funaba <tadf@dotrb.org>
- * win32/Makefile.sub (MAKEDIRS): enable command extensions.
+ * lib/date/format.rb (Date._parse): completes calendar week based year.
-Thu Mar 1 01:25:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/date/format.rb (Date._parse): detects year of ordinal date in
+ extended format.
- * regparse.c (is_onechar_cclass): optimize character class
- Merge Onigmo 27278c12e6674043cc8affca6507e20e119a86ee.
+Fri Jul 20 16:30:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * regparse.c (is_onechar_cclass): [bug] unexpected match occurs when a
- char class contains no char
+ * compile.c (iseq_set_sequence): raise SyntaxError instead of rb_bug
+ since this function can be called from VM::InstructionSequence.load.
- * enc/unicode.c (init_case_fold_table): define the sizes of case
- folding tables in casefold.h
+ * compile.c (insn_set_sc_state, iseq_set_sequence_stackcaching): ditto.
-Wed Feb 29 16:11:34 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jul 20 16:11:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/Makefile.sub (MAKEDIRS): use mkdir of cmd.exe instead of ruby.
- [Bug #6103] [ruby-core:43012]
+ * compile.c, compile.h (DECL_ANCHOR, INIT_ANCHOR): split not to
+ initialize aggregations with dynamic values. [ruby-talk:259306]
- * win32/README.win32: added a notice about command extension of cmd.exe.
+ * eval.c (rb_protect): not to initialize aggregations with dynamic
+ values. [ruby-talk:259306]
-Wed Feb 29 15:39:39 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (mark_current_machine_context): ditto.
- * test/ruby/test_io.rb (TestIO#test_readpartial_locktmp): skip on
- windows because of the platform restriction.
+ * thread.c (thgroup_list, call_trace_func): ditto.
-Wed Feb 29 15:38:50 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * vm.c (vm_init_redefined_flag): ditto.
- * test/ruby/memory_status.rb (Memory): syntax error.
+Fri Jul 20 15:22:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Feb 29 13:06:42 2012 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]
- * test/ruby/memory_status.rb: use /proc/self/status if it is in
- the expected format.
+Fri Jul 20 10:39:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Feb 29 06:14:51 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * parse.y (stmt, mlhs_node, lhs, arg, var_ref): return dummy
+ NODE_BEGIN after errors. [ruby-dev:31100], [ruby-dev:31118]
- * ext/date/date_core.c: reverted r34825.
+ * parse.y (remove_begin): keep empty NODE_BEGIN, instead of null.
+ [ruby-dev:31252], [ruby-dev:31263]
-Tue Feb 28 23:20:01 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Fri Jul 20 09:50:40 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Makefile.in (PLATFORM_DIR): add a variable for `win32` directory.
- * Makefile.in (clean-platform): add new target.
- It cleans `win32` directory.
+ * bootstraptest/runner.rb (get_result_string): check $?.coredump?
+ first.
- * common.mk (clean): add a dependency for `win32` directory.
- * common.mk (distclean): ditto.
- * common.mk (distclean-platform): add new target.
- It cleans `win32` directory.
- * common.mk ($(PLATFORM_D)): add new target to make `win32` directory.
- * common.mk (win32/win32.$(OBJEXT)): move win32.o into `win32`
- directory.
- * common.mk (win32/file.$(OBJEXT)): add new target for win32/file.c.
+ * bootstraptest/runner.rb (cleanup_coredump, check_coredump): see
+ stackdump file too.
- * configure.in: move win32.o into `win32` directory and add
- win32/file.o to MISSING.
+Thu Jul 19 20:39:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (file_load_ok, rb_file_load_ok): replace static
- file_load_ok() with public rb_file_load_ok().
- It's to link Windows implementation in win32/file.c.
- * file.c (rb_find_file_ext_safe): ditto.
- * file.c (rb_find_file_safe): ditto.
+ * parse.y (value_expr_gen): warn for empty expression ().
+ [ruby-dev:31252]
- * win32/file.c (rb_file_load_ok): new file. Add Windows specific
- optimized implementation of rb_file_load_ok(). We created a
- separated file to avoid too many #ifdef macro which is unreadable.
+Thu Jul 19 19:24:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * win32/Makefile.sub (PLATFORM_DIR): add a variable for `win32`
- directory.
- * win32/Makefile.sub (MISSING): move win32.obj into `win32`
- directory and add win32/file.obj to MISSING.
- * win32/Makefile.sub (MAKEDIRS): replace MINIRUBY with BASERUBY.
- It's because miniruby doesn't exist when making `win32` directory.
- * win32/Makefile.sub (clean-platform): add new target to clean `win32`
+ * eval_error.ci (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>
+
+ * bignum.c (rb_big_lshift, rb_big_rshift): separated functions
+ to get rid of infinite recursion. fixed calculation in edge
+ cases. [ruby-dev:31244]
+
+ * numeric.c (rb_fix_lshift, rb_fix_rshift): ditto.
+
+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]
+
+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.
+ [ruby-core:11569], [ruby-core:11570], [ruby-core:11571],
+ [ruby-core:11573]
+
+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>
+
+ * ext/dl/cfunc.c (rb_dlcfunc_call): adjust format. [ruby-dev:31222]
+
+ * ext/digest/digest.c (rb_digest_instance_update,
+ rb_digest_instance_finish, rb_digest_instance_reset,
+ rb_digest_instance_block_length): %s in rb_raise() expects char*.
+ [ruby-dev:31222]
+
+ * ext/openssl/ossl.h: include ossl_pkcs5.h. [ruby-dev:31231]
+
+ * ext/openssl/ossl_pkcs5.h: new file for PKCS5. [ruby-dev:31231]
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
+ instead of rb_raise(). [ruby-dev:31222]
+
+ * ext/sdbm/_sdbm.c: DOSISH platforms need io.h. [ruby-dev:31232]
+
+ * ext/syck/syck.h: include stdlib.h for malloc() and free().
+ [ruby-dev:31232]
+
+ * ext/syck/syck.h (syck_parser_set_input_type): prototype added.
+ [ruby-dev:31231]
+
+ * win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232]
+
+ * include/ruby/win32.h (rb_w32_getcwd): prototype added.
+ [ruby-dev:31232]
+
+Sun Jul 15 21:07:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bignum.c (bigtrunc): do not empty Bignum. [ruby-dev:31229]
+
+Sun Jul 15 19:05:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bignum.c (rb_cstr_to_inum): check leading non-digits.
+ [ruby-core:11691]
+
+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 02:27:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (int_pow): overflow detection using FIT_SQRT_LONG().
+ [ruby-dev:31215]
+
+Sat Jul 14 02:05:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * insns.def (opt_div): LONG2FIX() may not work for corner cases,
+ use LONG2NUM() instead. [ruby-dev:31210]
+
+Sat Jul 14 00:34:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (int_round): should not return false, but self.
+ [ruby-dev:31212]
+
+Fri Jul 13 18:31:27 2007 Koichi Sasada <ko1@atdot.net>
+
+ * 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.
+
+Fri Jul 13 16:10:00 2007 Tanaka Akira <akr@fsij.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): use ENV.to_hash to access
+ http_proxy environment variable to avoid case insensitive
+ environment search.
+
+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.
+
+ * 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.
+
+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>
+
+ * 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>
+
+ * numeric.c (int_pow): fix previous nubu's commit.
+
+ * test/ruby/test_fixnum.rb: new test.
+
+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]
+
+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.
+
+ * vm_evalbody.ci: ditto.
+
+ * insns.def: add opt_call_native_compiled instruction
+ instead of opt_call_native_compiled.
+
+Sat Jun 30 00:17:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_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>
+
+ * gc.c (rb_obj_id): use SIGNED_VALUE instead of long.
+
+Thu Jun 28 05:01:56 2007 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk (run.gdb): fix to load $(srcdir)/.gdbinit
+
+ * vm.c (rb_vm_set_finish_env): add a cast.
+
+ * 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]
+
+Mon Jun 18 08:47:54 2007 Technorama Ltd. <oss-ruby@technorama.net>
+
+ * ext/openssl/{extconf.rb,ossl_ssl_session.c}:
+ Fix ruby-Bugs-11513.
+
+ * ext/openssl/ossl_pkey_ec.c
+ New methods EC::Point.[eql,make_affine!,invert!,on_curve?,infinity?]
+ By default output the same key form as the openssl command.
+
+ * 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
+ 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
+ optimized out value.
+
+ * variable.c (rb_global_entry, rb_f_untrace_var, rb_alias_variable,
+ rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
+ generic_ivar_defined, generic_ivar_remove, rb_mark_generic_ivar,
+ 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>
+
+ * 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]
+
+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>
+
+ * parse.y (call_args): no allow splat after assocs. takes
+ consistency over compatibility.
+
+ * parse.y (call_args2): ditto
+
+Tue Jun 12 14:53:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and
+ use it. [ruby-core:10909]
+
+ * 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.
+
+ * 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>
+
+ * enum.c (each_with_index_i): should work well with continuation.
+ a patch from sheepman <sheepman AT sheepman.sakura.ne.jp>.
+ [ruby-dev:30846]
+
+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>
+
+ * cont.c (cont_capture): store all local variables in heap
+ ([ruby-dev:30832]).
+
+ * vm.c (th_stack_to_heap): added.
+
+ * 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/imap.rb (ResponseParser#next_token): fixed
+ error message.
+
+ * lib/net/imap.rb (ResponseParser#parse_error): fixed
+ the condition not to refer to @token.symbol unexpectedly.
+ Thanks, Dick Monahan.
+
+Wed May 30 13:24:33 2007 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
+ responses for some FTP servers.
+
+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
+
+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, 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.
+
+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]
+
+Sat May 26 00:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+ 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.
+ [ruby-dev:30740], Thanks Kentaro KAWAMOTO.
+
+Wed May 23 05:49:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb, ext/purelib.rb, lib/mkmf.rb, runruby.rb: clear default
+ 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>
+
+ * 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>
+
+ * enum.c (enum_inject): it is now can work without block. you
+ have to specify two argument method name as the first argument.
+
+ * enum.c (Init_Enumerable): reduce is new alias to inject.
+
+Sat May 19 01:05:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (Init_File): method definition mismatch.
+
+Fri May 18 16:44:04 2007 Yukihiro Matsumoto <matz@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>
+
+ * 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.
+
+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>
+
+ * 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 01:54:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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>
+
+ * 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:13:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.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>
+
+ * 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>
+
+ * 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.
+
+ * 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.
+
+Wed May 2 05:40:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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]).
+
+Fri Apr 27 00:03:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+
+Thu Apr 26 17:31:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bignum.c (rb_big_pow): reduce multiplying for even number.
+
+ * numeric.c (int_pow): calculate power in Fixnum as possible.
+ [ruby-dev:30726]
+
+Thu Apr 26 17:18:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y: fixes for ripper.
+
+ * parse.y (primary): reduced duplicated code.
+
+ * parse.y (f_arg_item): should not override by meaningless value.
+
+ * parse.y (f_arg, assocs): should not use $$ before assigned.
+
+ * parse.y (assoc_list): dispatch assoclist_from_args for assocs as
+ well as args.
+
+ * parse.y (assoc): return assoc if dispatched result is $1.
+
+Thu Apr 26 13:54:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-style.el: new file. C/C++ style for ruby source code.
+
+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.
+ [ruby-talk:248288]
+
+Mon Apr 23 22:14:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb ($ruby): add extout directory to include path.
+ [ruby-core:11003]
+
+ * lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
directory.
- * win32/Makefile.sub ({$(srcdir)}.c{}.obj): make it not match
- win32/file.c to build properly.
- * win32/Makefile.sub (win32/win32.$(OBJEXT)): move win32.obj into
- `win32` directory.
- Patch created with Luis Lavena.
- [ruby-core:42480] [Feature #5999]
+ * lib/mkmf.rb (init_mkmf): add current directory to default
+ library path with highest priority. [ruby-core:10960]
-Tue Feb 28 20:27:25 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
- * ext/date/date_core.c: [ruby-core:42998]
+Fri Apr 20 16:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Feb 28 18:47:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
+ it is done by libpathflag in mkmf.rb.
- * io.c (io_binwrite, rb_io_syswrite): use shared frozen source
- strings.
+Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (io_fread, io_getpartial, rb_io_sysread): set buffer size
- after check if readable, which can cause thread switch.
- [ruby-dev:45297][Bug #6099]
+ * lib/optparse.rb: fix to override conv proc.
-Tue Feb 28 17:16:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 20 12:21:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/time.rb (Time#xmlschema): use strftime specifiers instead of
- fractional exponential calculation which yields undesirable
- result. [ruby-core:42997][Bug #6100]
+ * eval.c (ruby_cleanup): fixed access to out of bound, and inverted
+ the order of errinfos.
-Tue Feb 28 14:15:29 2012 Eric Hodel <drbrain@segment7.net>
+Fri Apr 20 10:33:23 2007 Koichi Sasada <ko1@atdot.net>
- * lib/net/protocol.rb: Add OpenTimeout subclass of Timeout::Error
- * lib/net/pop.rb: Modernize Timeout usage. Patch by Eric Wong.
- Use Net::OpenTimeout instead of Timeout::Error. [Bug #5765]
- * lib/net/http.rb: ditto
- * lib/net/smtp.rb: ditto
- * lib/net/telnet.rb: ditto
+ * eval_intern.h: add prototypes of rb_sourceline() and
+ rb_sourcefile().
-Tue Feb 28 13:51:12 2012 Eric Hodel <drbrain@segment7.net>
+Fri Apr 20 02:37:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/http.rb: Retry HTTP requests for additional network errors.
- Introduce OpenTimeout subclass of Timeout::Error. [Bug #6001]
- * test/net/http/test_http.rb: Reduce timeout to 0.01s for faster test
- * test/net/http/test_https.rb: ditto
+ * eval.c (ruby_cleanup): re-send signal. [ruby-dev:30516]
-Tue Feb 28 11:44:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval_error.h (error_handle): no message when exiting by signal.
- * configure.in (debugflags): check if -ggdb is accepted.
- [ruby-core:42875][Bug #6080]
+ * intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
-Tue Feb 28 10:28:51 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * signal.c (esignal_init): takes a signal number and an optional
+ signal name.
- * ext/psych/lib/psych.rb: default open YAML files with utf8 external
- encoding. [ruby-core:42967]
- * test/psych/test_tainted.rb: ditto
+ * signal.c (interrupt_init): pass SIGINT always.
-Mon Feb 27 23:46:09 2012 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * signal.c (ruby_default_signal): invoke system default signal
+ handler.
- * parse.y (opt_bv_decl): allow newline at the end. [ruby-dev:45292]
+ * signal.c (rb_f_kill): use NUM2PIDT instead of NUM2INT.
-Mon Feb 27 20:43:05 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * signal.c (rb_signal_exec, trap): handle SIGTERM. [ruby-dev:30505]
- * io.c (rb_io_set_pos): add rdoc about textmode.
+ * thread.c (rb_thread_signal_raise): now takes signal number instead
+ of signal name.
- * test/ruby/test_io.rb (TestIO#test_setpos): use binmode.
+ * thread.c (rb_thread_signal_exit): since rb_make_exception() calls
+ #exception method, rb_class_new_instance() is not needed here.
-Mon Feb 27 17:00:15 2012 Akinori MUSHA <knu@iDaemons.org>
+ * yarvcore.h (struct rb_vm_struct), eval_jump.h (terminate_process):
+ exit_code is no longer stored in VM.
- * string.c (rb_str_crypt): Update rdoc and state that this
- function is system dependent. Reviewed by nobu, thanks to
- @takai.
+Thu Apr 19 18:37:49 2007 Koichi Sasada <ko1@atdot.net>
-Mon Feb 27 17:03:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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).
- * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): since methods
- can be overridden, so should not make an assumption on the type
- of results. [ruby-core:42969][Bug #6093]
+ * vm.c, vm_macro.def: add hook points.
-Mon Feb 27 10:54:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * compile.c, insns.def: fix "trace" instruction.
- * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): replace the
- target flags if the given flag is accepted.
+ * iseq.c, vm_macro.h: add compile option "trace_instruction".
-Mon Feb 27 10:53:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_settracefunc.rb: hook "c-return" of set_trace_func.
- * test/rubygems/test_gem_specification.rb (test_self_from_yaml_syck_default_key_bug):
- ignore the test for too old versions.
+Thu Apr 19 20:57:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 27 10:53:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (symbol): symbols should be followed by EXPR_ENDARG.
- * lib/test/unit.rb (Test::Unit::Runner#puke): skips with no
- messages should be trivial.
+ * parse.y (dsym): ditto.
-Mon Feb 27 10:50:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (parser_yylex): strings should be followed by
+ EXPR_ENDARG.
- * io.c, process.c, time.c, ext: use rb_sys_fail_str instead of
- rb_sys_fail.
+ * parse.y (parser_yylex): ditto for numbers.
-Mon Feb 27 10:48:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (parser_yylex): EXPR_ENDARG after ']' and '}'.
- * ext/openssl/extconf.rb: suppress useless deprecation warnings
- from OpenSSL added by Apple.
+Thu Apr 19 17:46:36 2007 Koichi Sasada <ko1@atdot.net>
-Sun Feb 26 23:29:49 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/optparse.rb: fix to override conv proc.
- * regparse.c (add_code_range_to_buf0): wrong condition of duplicated
- warnings.
+Wed Apr 18 10:41:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Feb 26 11:26:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * util.c (ruby_strtod): exponent is radix 10. [ruby-talk:248272]
- * compile.c (iseq_compile_each): call on special object instead of
- self. since stabby lambda is a syntax, so it should not be
- affected by the context. [ruby-core:42349][Bug #5966]
+Wed Apr 18 02:50:50 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (send): no special deal for FCALL. self should be put
- on TOS instead.
+ * yarvcore.c (th_init2): push initial blockptr value for
+ rb_block_given_p() outside ruby_exec(). [ruby-core:10923]
-Sun Feb 26 05:35:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Apr 18 02:30:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * error.c (report_bug): use buf and snprintf to avoid consuming stack.
- [ruby-dev:45272] [Bug #6058]
+ * configure.in (LDFLAGS): prepend -L. instead appending it to
+ XLDFLAGS. [ruby-core:10933]
-Sat Feb 25 17:41:19 2012 Tanaka Akira <akr@fsij.org>
+ * configure.in (Makefile): remove $U for automake from MISSING.
+ [ruby-talk:248171]
- * ext/dbm/extconf.rb (headers): try ambiguous headers at last.
+Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Feb 25 17:07:15 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/pty/expect_sample.rb: avoid symbolic link representation for
+ expect. a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
+ [ruby-dev:30714]
- * lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid
- to regexping invalid string.
+Mon Apr 16 22:51:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Feb 25 16:18:24 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * sample: replace TRUE, FALSE with true, false respectively.
+ a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
+ [ruby-dev:30713]
- * complex.c (nucomp_marshal_load): raise error on invalid data.
- reported by John Firebaugh [ruby-core:42860] [Bug #6076]
+Mon Apr 16 17:08:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 25 14:46:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/optparse.rb (make_switch): do not clobber converter if pattern
+ has no convert method. reported by sheepman in [ruby-dev:30709].
- * ext/dl/dl.c (Init_dl): support intrinsic types, size_t, ptrdiff_t
- and intptr_t. [ruby-core:42460][Feature #5992]
+Mon Apr 16 16:49:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/fiddle/fiddle.c (Init_fiddle): ditto.
+ * ext/stringio/stringio.c (strio_seek): consistent behavior with
+ IO#seek. patch by sheepman in [ruby-dev:30710].
- * ext/dl/lib/dl/cparser.rb (DL::CParser#parse_ctype): ditto.
+Mon Apr 16 16:34:08 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Feb 25 11:08:28 2012 Tanaka Akira <akr@fsij.org>
+ * parse.y (parser_yylex): should set command_start after block
+ starting "do"s and braces. [ruby-core:10916]
- * ext/curses/curses.c (Init_curses): use rb_define_const once for
- Curses::VERSION.
+Mon Apr 16 10:51:37 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/dbm/dbm.c (Init_dbm): ditto for DBM::VERSION.
+ * enum.c (enum_each_with_index): each_with_index to forward
+ arguments to each. [ruby-core:10921]
-Sat Feb 25 10:34:22 2012 Tanaka Akira <akr@fsij.org>
+Mon Apr 16 10:43:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/curses/curses.c (Init_curses): make Curses::VERSION
- understandable without context.
+ * time.c (time_arg): should allow to specify 24:00.
+ [ruby-core:10915]
- * ext/dbm/dbm.c (Init_dbm): ditto for DBM::VERSION.
+Sun Apr 15 09:12:54 2007 Tadayoshi Funaba <tadf@dotrb.org>
-Sat Feb 25 07:53:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/date/format.rb: added some zone names.
- * parse.y (parser_tokadd_string): insert a backslash only if
- quoted by single quotes. [ruby-dev:45281] [Bug #6069]
+ * lib/date/format.rb (_parse): now interprets doted numerical
+ dates as a big endian (except dd.mm.yyyy).
-Sat Feb 25 07:53:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 12 17:13:22 2007 Koichi Sasada <ko1@atdot.net>
- * dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path.
- [Bug #6072]
+ * thread.c (mutex_try_lock): check and set owner thread.
-Sat Feb 25 07:53:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * thread_pthread.ci: fix to show error code in error message.
- * dir.c (dir_initialize): keep path in original encoding.
+Thu Apr 12 17:11:54 2007 Koichi Sasada <ko1@atdot.net>
- * error.c (syserr_initialize): prefer the encoding of message over
- locale. [ruby-dev:45279][Bug #6071]
+ * eval.c (rb_rescue2): restore cfp ([ruby-dev:30582]).
-Sat Feb 25 06:55:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 12 16:06:48 2007 Koichi Sasada <ko1@atdot.net>
- * file.c (utime_internal): fix a variable missed to replace.
- [ruby-core:42864] [Bug #6077]
+ * eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
-Fri Feb 24 18:21:55 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
+Thu Apr 12 16:04:31 2007 Koichi Sasada <ko1@atdot.net>
- * test/zlib/test_zlib.rb (TestZlibGzipReader#test_encoding): Add
- encoding testcases for GzipReader#read. read() emits
- Encoding.default_external in contrast to read(size) emits BINARY.
- See also: http://bugs.jruby.org/6208
+ * compile.c (iseq_compile_each): check node->nd_state == 1, not !0.
-Fri Feb 24 17:56:39 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+Wed Apr 11 16:35:16 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_literal.rb (TestRubyLiteral#test_special_const):
- test for https://bugs.php.net/bug.php?id=61095
+ * win32/win32.[ch] (rb_w32_enter_critical, rb_w32_leave_critical): no
+ need to reject reentrance. removed.
-Fri Feb 24 16:48:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * rubysig.h (RUBY_CRITICAL): follow above changes.
- * dir.c, file.c, io.c (rb_sys_fail_path): use rb_sys_fail_str.
+ * rubysig.h (TRAP_BEG, TRAP_END): no need to save errno.
- * error.c: new functions to deal exceptions with string instances.
+Tue Apr 10 17:02:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * dir.c, file.c, io.c: use rb_sys_fail_path.
+ * win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
+ before calling original fclose()/close().
-Fri Feb 24 15:49:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 10 16:14:22 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * configure.in (__builtin_unreachable): check for clang.
- [ruby-core:42849]
+ * thread_win32.ci (w32_wait_events): check whether interrupt_event is
+ valid handle or not.
- * include/ruby/ruby.h (UNREACHABLE): fallback definition.
+ * thread_win32.ci (native_thread_destroy): clear interrupt_event when
+ close it.
-Fri Feb 24 13:54:33 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Apr 10 15:53:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/psych/parser.c: prevent a memory leak by protecting calls to
- handler callbacks.
- * test/psych/test_parser.rb: test to demonstrate leak.
+ * thread_pthread.ci (native_thread_create): initialize sleep_cond.
+ fixed: [ruby-dev:30675]
-Fri Feb 24 12:07:34 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Mon Apr 9 18:48:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/net/http.rb: Fix documentation. Patched from Florian Mhun
- via http://github.com/ruby/ruby/pull/96
+ * thread.c (do_select): ubf_select() is not necessary. interrupt is
+ checked in the loop.
-Fri Feb 24 11:48:07 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Mon Apr 9 18:27:26 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * string.c (rb_str_prepend): Fix documentation for String#prepend.
- Patched from Franck Verrot via http://github.com/ruby/ruby/pull/98
- and Andrew Horsman via http://github.com/ruby/ruby/pull/55
+ * thread.c (do_select): use ubf_select() as UBF on windows.
-Fri Feb 24 10:08:33 2012 Eric Hodel <drbrain@segment7.net>
+ * win32/win32.c (do_select): shouldn't call catch_interrupt() here.
+ fixed: [ruby-dev:30674], reported by wanabe.
- * lib/net/http.rb (Net::HTTP#transport_request): Fix infinite loop
- upon EOFError or Errno::ECONNRESET where count is reset to 0.
- * test/net/http/test_http.rb (class TestNetHTTPKeepAlive): Test for
- above.
+Mon Apr 9 09:24:32 2007 Shugo Maeda <shugo@ruby-lang.org>
-Fri Feb 24 09:05:40 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/net/imap.rb (disconnect): call shutdown for
+ SSLSocket. Thanks, Technorama Ltd.
- * complex.c (Init_Complex): Document Complex::I. Patch by Sylvain
- Daubert. [Feature #5623]
+Sun Apr 8 13:28:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Feb 24 08:52:09 2012 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]
- * parse.y (parser_tokadd_string, parser_yylex): insert a backslash
- if the next character is non-ascii. [ruby-dev:45278] [Bug #6069]
+Fri Apr 6 10:56:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Feb 24 08:13:20 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_get_group): get rid of
+ warning. we are aware of it.
- * lib/profiler.rb: Add Profiler documentation by Gonzalo Rodriguez.
- [Bug #5816]
+Fri Apr 6 04:00:24 2007 Technorama Ltd. <oss-ruby@technorama.net>
-Fri Feb 24 08:08:38 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/openssl/ossl_{bn,x509{attr,cert,name,store}}.c:
+ Add documentation.
- * ext/psych/parser.c: set parser encoding based on the YAML input
- rather than user configuration.
- * test/psych/test_encoding.rb: corresponding tests.
- * test/psych/test_parser.rb: ditto
- * test/psych/test_tainted.rb: ditto
+Thu Apr 5 17:59:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Feb 24 08:02:52 2012 Eric Hodel <drbrain@segment7.net>
+ * compile.c (defined_expr): support for assignment.
+ [ruby-core:10867]
- * hash.c (Init_Hash): Add section on how objects are used as Hash keys
- and how to use custom classes as Hash keys.
+ * compile.h (ADD_CATCH_ENTRY): removed temporary variable.
-Fri Feb 24 07:36:11 2012 Eric Hodel <drbrain@segment7.net>
+Thu Apr 5 15:13:34 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * object.c (rb_obj_eql): Improve equality documentation by adding an
- example of equal? vs == and recommending eql? be aliased to == when
- overridden.
+ * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_alloc): should
+ return value.
-Fri Feb 24 07:21:15 2012 Eric Hodel <drbrain@segment7.net>
+Thu Apr 5 14:58:49 2007 Technorama Ltd. <oss-ruby@technorama.net>
- * object.c (rb_obj_hash): Added note that the hash value is not
- deterministic on Marc-Andre's suggestion. Expanded description of
- the purpose of the hash method. [Bug #6068]
+ * ext/openssl/ossl_pkcs5.c: New module.
-Thu Feb 23 23:01:21 2012 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/ossl_{cipher,digest,pkcs7,pkcs12}.c:
+ Remove redundant module namespace.
- * ext/dbm/extconf.rb: unused macro removed.
+ * ext/openssl/lib/openssl/{cipher,digest}.rb
+ Add backwards compatible classes for rearranged classes.
-Thu Feb 23 22:26:53 2012 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/ossl_{pkcs7,pkcs12}.c: Add documentation.
- * test/test_curses.rb: new file.
+Thu Apr 5 00:42:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Feb 23 19:57:56 2012 Tanaka Akira <akr@fsij.org>
+ * error.c (rb_notimplement), io.c (pipe_open): removed definite
+ articles and UNIX manual section from messages. [ruby-dev:30690]
- * ext/curses/rain.rb: trap SIGHUP, SIGINT, SIGQUIT and SIGTERM only.
+Wed Apr 4 17:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Feb 23 19:56:48 2012 Tanaka Akira <akr@fsij.org>
+ * io.c (pipe_open): refined the message of NotImplementedError.
+ [ruby-dev:30685]
- * signal.c (sig_trap): show signal name on error.
+Wed Apr 4 12:29:02 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Feb 23 12:21:48 2012 Tanaka Akira <akr@fsij.org>
+ * error.c (rb_notimplement): should show the name of this func,
+ not callee.
- * ext/dbm/extconf.rb: use DBM_SUFFIX only to detect header of
- Berkeley DB.
+Wed Apr 4 10:18:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Feb 23 10:00:18 2012 Eric Hodel <drbrain@segment7.net>
+ * io.c (popen_exec): should not close close-on-exec FDs.
+ [ruby-dev:30679]
- * io.c (rb_io_f_sync): Fix double-negative typo. [ruby-trunk - #5837]
+ * io.c (pipe_open): raise NotImplementedError for command "-" on
+ platforms where fork(2) is not available. [ruby-dev:30681]
-Thu Feb 23 09:57:21 2012 Eric Hodel <drbrain@segment7.net>
+Tue Apr 4 04:17:18 2007 Technorama Ltd. <oss-ruby@technorama.net>
- * load.c (rb_f_require): Add note to require for scope of items in the
- loaded file. [ruby-trunk - #5910]
+ * ext/openssl/ossl_ssl.c: Add documentation.
-Thu Feb 23 03:58:08 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Tue Apr 3 16:22:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/ostruct.rb (delete_field): Bug fix so previous value is
- returned. Patch by Nick Recobra [Bug #6063]
+ * ext/openssl/extconf.rb: check for functions added in 1.9.
-Thu Feb 23 02:33:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ruby_missing.h: check per features instead by
+ checking version code. [ruby-core:10845]
- * io.c (rb_io_extract_modeenc): fail only if conflicting
- text/binary modes given explicitly. [ruby-dev:45268][Bug #6055]
+Tue Apr 3 16:02:44 2007 Technorama Ltd. <oss-ruby@technorama.net>
-Wed Feb 22 23:27:08 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_bn.c: More documentation.
- * test/iconv/test_option.rb: enabled. [ruby-core:42802][Bug #6061]
+ * ext/openssl/lib/ossl_{pkey,pkey_ec}.[ch]: Add elliptic curves.
-Wed Feb 22 21:45:56 2012 Tanaka Akira <akr@fsij.org>
+Tue Apr 3 15:50:41 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/curses/curses.c: use defined() to suppress a warning.
+ * 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]
-Wed Feb 22 21:44:29 2012 Tanaka Akira <akr@fsij.org>
+Tue Apr 3 09:36:55 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/curses/extconf.rb: refactored.
+ * ext/openssl/ruby_missing.h: need to include version.h to check
+ RUBY_VERSION_CODE.
-Wed Feb 22 20:42:28 2012 Tanaka Akira <akr@fsij.org>
+Mon Apr 3 07:10:12 2007 Technorama Ltd. <oss-ruby@technorama.net>
- * ext/curses/extconf.rb: try to distinguish curses_version is a
- function or variable.
+ * 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.
- * ext/curses/curses.c (Init_curses): refine Curses::VERSION.
+Mon Apr 3 04:00:23 2007 Technorama Ltd. <oss-ruby@technorama.net>
-Wed Feb 22 19:47:03 2012 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/{ossl.[ch],ossl_pkey.c} Add documentation.
- * ext/curses/extconf.rb: show the chosen header and library.
+ * ext/openssl/ossl_hmac.c Add reset method.
-Wed Feb 22 19:22:31 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * ext/openssl/ossl_cipher.c (Cipher#update) Take additional
+ buffer argument.
- * reverted 34739 for test/date.
+ * ext/openssl/{ossl_bio.c,ossl_ssl.c,ruby_missing.h}
+ compatibility with 1.8.
-Wed Feb 22 19:08:55 2012 Tanaka Akira <akr@fsij.org>
+Mon Apr 2 21:55:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/curses/extconf.rb: refactored.
+ * insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed
+ typo.
-Wed Feb 22 18:44:41 2012 Shota Fukumori <sorah@tubusu.net>
+Fri Mar 30 11:46:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/test/unit.rb (setup_options): add option "--retry" as opposite
- for "--no-retry"
+ * win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by
+ wanabe [ruby-dev:30672]
-Wed Feb 22 18:34:02 2012 Shota Fukumori <sorah@tubusu.net>
+ * win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
+ instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]
- * lib/test/unit.rb (setup_options): add option "--show-skip" to
- cancel "--hide-skip" (-q)
+Fri Mar 30 02:29:04 2007 Technorama <oss-ruby@technorama.net>
-Wed Feb 22 17:36:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c:
+ Add Documentation for various methods.
- * io.c (rb_io_s_foreach): argument check before making Enumerator.
- [ruby-dev:31525]
+ * 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).
+
+Thu Mar 22 13:32:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (LIBS): remove an unnecessary library.
+
+Thu Mar 22 10:27:58 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.
+
+ * test/testunit/collector/test_objectspace.rb: Ditto.
+
+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>
+
+ * 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>
+
+ * 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>
+
+ * regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan
+ Huehner <stefan at huehner.org>. [ruby-core:10543]
+
+Mon Mar 19 11:27:13 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
+
+Sun Mar 18 08:31:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/dir.h, win32/win32.c (rb_w32_opendir, rb_w32_readdir,
+ rb_w32_closedir): get rid of possible buffer-overflows.
+
+Sat Mar 17 19:10:39 2007 Kouhei Sutou <kou@cozmixng.org>
+
+ * 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 22:32:20 2007 Minero Aoki <aamine@loveruby.net>
+
+ * 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 22:19:24 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize,
+ a little bit supporting ActiveX control. [ruby-talk:241188]
+
+Fri Mar 16 22:16:58 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: merge Ruby-SSPI patch contributed by Justin
+ Bailey.
+
+ * ext/Win32API/lib/win32/sspi.rb: new file.
+
+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>
+
+ * lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock.
+ Thanks, Keiju ISHITSUKA. [ruby-dev:30507]
+
+Tue Mar 13 02:42:58 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>
+
+ * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
+ externally defined modules; submitted by Technorama
+ Ltd. <oss-ruby AT technorama.net> in [ruby-bugs:PR#4704].
+
+ * ext/openssl/ossl_bn.c (Init_ossl_bn): Ditto.
+
+ * ext/openssl/ossl_cipher.c (Init_ossl_cipher): Ditto.
+
+ * ext/openssl/ossl_digest.c (Init_ossl_digest): Ditto.
+
+ * ext/openssl/ossl_hmac.c (Init_ossl_hmac): Ditto.
+
+ * ext/openssl/ossl_pkey.c (Init_ossl_pkey): Ditto.
+
+ * ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): Ditto.
+
+ * ext/openssl/ossl_pkey_dsa.c (Init_ossl_dsa): Ditto.
+
+ * ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): Ditto.
+
+ * ext/openssl/ossl_rand.c (Init_ossl_rand): Ditto.
+
+ * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
+
+Sun Mar 11 18:42:01 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * misc/ruby-mode.el (ruby-block-end-re): Support for the
+ experimental ';;' terminator had been dropped.
+
+Sun Mar 11 05:45:46 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * 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.
+
+Thu Mar 8 09:17:59 2007 Minero Aoki <aamine@loveruby.net>
+
+ * compile.c: iseq_compile -> rb_iseq_compile.
+
+ * iseq.c: ditto.
+
+ * intern.h: provide function prototype of Init_jump.
+
+ * eval_jump.h (Init_jump): declare function type.
+
+ * 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.
+
+ * vm_dump.c: ditto.
+
+Tue Mar 6 16:35:04 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
+
+Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/irbtkw.rbw: fails to exit process.
+
+Tue Mar 6 10:23:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * runruby.rb: added --pure (turned on by default) and --debugger
+ options.
+
+Mon Mar 5 09:19:33 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/timeout.rb (Timeout.timeout): should return the block value
+ always.
+
+ * lib/timeout.rb (Timeout.timeout): should yield sec argument
+ always.
+
+ * lib/timeout.rb (Timeout.timeout): fix document.
+
+Mon Mar 5 09:16:40 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/smtp.rb: support automatic STARTTLS.
+
+ * lib/net/smtp.rb: check server advertisement.
+
+ * lib/net/smtp.rb: introduce new class SMTP::Response.
+
+ * lib/net/smtp.rb (getok): should not use sprintf.
+
+ * lib/net/smtp.rb (get_response): ditto.
+
+ * lib/net/protocol.rb: reduce syntax warning on 1.9.
+
+Mon Mar 5 07:13:28 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/smtp.rb: reconstruct SMTPS/STARTTLS interface. New
+ interface is incompatible from current 1.9 interface at all.
+
+ * lib/net/smtp.rb: All SSL-related class methods are removed; use
+ instance methods instead.
+
+ * lib/net/smtp.rb: rename methods: *ssl -> *tls (with alias
+ "ssl").
+
+ * lib/net/smtp.rb: rename methods: *tls -> *starttls.
+
+Mon Mar 5 01:36:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
+ indentation broken at YARV merger.
+
+Sun Mar 4 23:41:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
+ rb_gid_t instead of int.
+
+ * file.c (rb_stat_s_utime): fixed a commit miss for the platforms
+ where utimes() does not exist.
+
+ * lib/fileutils.rb (touch): ditto.
+
+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>
+
+ * 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>
+
+ * lib/fileutils.rb (touch): last #touch change causes error when
+ :mtime option was not given.
+
+Sat Mar 3 22:51:29 2007 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mv): could not move directory between
+ different file systems. [ruby-dev:30411]
+
+Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_s_utime): allow nil to set the current time.
+
+ * 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>
+
+ * object.c (instance_variable_get): Restore rdoc markups lost in
+ the last commit.
+
+Fri Mar 2 21:17:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * 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.
+
+ * ext/win32ole/win32ole.c (folevariant_s_array, folevariant_initialize):
+ WIN32OLE_VARIANT#[], WIN32OLE_VARIANT#[]=, WIN32OLE_VARIANT#value=
+ is defined as instance method of WIN32OLE_VARIANT.
+
+ * test/win32ole/test_win32ole_variant.rb: add some test for
+ VT_ARRAY, VT_BYREF variant type.
+
+Fri Mar 2 07:58:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (rb_obj_ivar_set): RDoc updated according to a
+ suggestion from Brian Candler <B.Candler AT pobox.com>.
+ [ruby-core:10469]
+
+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>
+
+ * ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
+ Digest::Base subclasses, which was unintentionally made
+ impossible while restructuring Digest classes.
+
+Thu Mar 1 02:05:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb (patchlevel): read from version.h.
+
+Wed Feb 28 21:15:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
+
+ * missing/flock.c: workaround for MinGW.
+
+Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * pack.c (pack_unpack): properly ignore non-base64 octets such as
+ 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>
+
+ * 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>
+
+ * 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 04:03:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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>
+
+ * test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
+ target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+
+Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
+
+ * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
+
+ * common.mk: new target dist
+
+ * distruby.rb: new file
+
+Tue Feb 27 22:18:45 2007 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (--enable-auto-image-base): avoid the necessity to
+ rebase the shared libs as much as possible;
+ submitted by Corinna Vinschen <spam at vinschen.de> in
+ [ruby-talk:240964].
+
+Tue Feb 27 21:36:47 2007 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
+
+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>
+
+ * 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>
+
+ * 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].
+
+ * ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
+
+ * ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto.
+
+ * 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, ->]
+
+ * vm_macro.def: ditto.
+
+ * gc.c: ditto.
+
+ * iseq.c: ditto.
+
+ * compile.h: fix debug function name.
+
+ * test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
+
+ * test/ruby/test_lambda.rb: disable test temporarily.
+
+Sat Feb 24 10:46:28 2007 Koichi Sasada <ko1@atdot.net>
+
+ * test/testunit/test_testcase.rb: catch up with current instance
+ variable spec.
+
+Sat Feb 24 10:32:59 2007 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk: change vm_macro.def rule.
+
+Sat Feb 24 10:38:05 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.
+
+ * 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).
+
+Fri Feb 23 15:58:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * signal.c (sighandler): need to re-install sighandler on some
+ platforms.
+
+Fri Feb 23 15:05:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (set_pioinfo_extra): simplified.
+
+Fri Feb 23 14:23:20 2007 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_literal.rb: new test.
+
+Fri Feb 23 12:40:12 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
+ xmlrpc/client.rb; suggested by Daniel Berger
+ <Daniel.Berger@qwest.com> and approved by the maintainer.
+
+ * 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>
+
+ * 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.
+
+Mon Feb 19 17:14:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
+ 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>
+
+ * 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
+ <hgs at dmu.ac.uk> from [ruby-core:10135]
+
+ * lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
+
+Thu Feb 15 20:48:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
+ workaround. [ruby-core:10259]
+
+ * win32/win32.c (NtInitialize): call above function.
+
+Thu Feb 15 16:25:54 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.
+
+Wed Feb 14 22:52:43 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * 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>
+
+ * lib/uri/generic.rb (URI::Generic::userinfo): should support
+ empty password. [ruby-core:10290]
+
+ * 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>
+
+ * parse.y (struct local_vars): no need to warn out-of-scope
+ variables; remove dnames member from struct.
+
+Wed Feb 14 03:04:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y: RVarmap no longer used as yytype; removed.
+
+ * parse.y (dyna_push_gen): no longer need return value.
+
+ * parse.y (dyna_pop_gen): no longer need argument.
+
+ * parse.y (local_push_gen): initialize nofree.
+
+Wed Feb 14 00:30:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (init_unixsock): path may contain NUL for
+ abstract unix sockets. [ruby-core:10288]
+
+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>
+
+ * lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
+ -> dc_rights_list. dc_rightses still exists for backward
+ compatibility. [ruby-core:8350]
+
+ * test/rss/test_maker_dc.rb: added tests for dc_rights_list.
+
+Sun Feb 11 22:40:17 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_ptrtype2val): ole_type, ole_type_detail
+ should not return "VARIANT,VARIANT".
+
+Sun Feb 11 22:11:05 2007 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#initialize):
+ kept backward compatibility.
+
+Sun Feb 11 22:10:08 2007 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/parser.rb (RSS::ListenerMixin#start_else_element): used
+ const_defined? instead of constants.include?.
+
+Sun Feb 11 18:47:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_val2olevariantdata):
+ WIN32OLE_VARIANT#new accepts nil when variant type is VT_ARRAY.
+
+ * test/win32ole/test_win32ole_variant.rb: ditto.
+
+ * ext/win32ole/win32ole.c: small refactoring.
+
+Sun Feb 11 07:42:25 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
+ a quoted-string in a Content-Disposition value.
+
+Sat Feb 10 20:21:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: add WIN32OLE#ole_query_interface.
+ thanks to Mikael Pahmp.
+
+ * test/win32ole/test_win32ole.rb: ditto.
+
+Sat Feb 10 17:46:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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.
+
+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>
+
+ * process.c: fix to use rb_status_line_set/get/clear().
+
+ * eval_intern.h: fix line break.
+
+Thu Feb 8 15:00:14 2007 Koichi Sasada <ko1@atdot.net>
+
+ * 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).
+
+ * eval_intern.h: remove unused definitions.
+
+ * common.mk: fix around vm_opts.h path
+ and remove harmful argument passed to insns2vm.rb.
+
+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>
+
+ * 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.
+ * 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.
-Wed Feb 22 17:07:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Feb 2 18:27:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_io_s_foreach): return enumerator including keyword
- arguments. [ruby-dev:45267][Bug #6054]
+ * eval.c: remove duplicated global variables rb_cProc and
+ rb_cBinding. [ruby-dev:30242]
-Wed Feb 22 12:15:16 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Feb 2 00:13:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: allow llvm-gcc because it work fine with r34278.
+ * ruby.h (SYMBOL_P): make Symbol immediate again for performance.
-Wed Feb 22 10:57:08 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * string.c: redesign symbol methods.
- * regparse.c (fetch_token): don't use // comment.
+Thu Feb 1 23:25:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Feb 22 10:32:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (rb_id2str): store Strings for operator symbols.
+ [ruby-dev:30235]
- * test/mkmf/test_framework.rb: try CoreFoundation framework, than
- Cocoa which is dependent on QuickTime SDK which has separated
- since Xcode 4.3.
+Thu Feb 1 21:04:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 22 10:18:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (assignable_gen): no need to generate NODE_CVDECL.
- * common.mk (test-all, test-ruby): more dependencies.
+ * compile.c (iseq_compile_each): no NODE_CVDECL.
-Wed Feb 22 06:48:55 2012 Eric Hodel <drbrain@segment7.net>
+Thu Feb 1 20:53:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (rb_f_test): Fix formatting of Kernel#test rdoc.
+ * vm.c (eval_get_cvar_base): destination for class variable access
+ is now strictly innermost surrounding class or module. warned
+ if accessed from toplevel.
-Wed Feb 22 06:12:15 2012 Tanaka Akira <akr@fsij.org>
+ * 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.
- * ext/dbm/extconf.rb: check DBM_SUFFIX for Mac OS X.
- Its ndbm.h doesn't include db.h.
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * lib/date/format.rb (Date::Format::Bag::method_missing): add
+ prefix to avoid making t class-local instance variable.
+
+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.
+
+Fri Jan 26 12:03:39 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb (TkConfigMethod#__confinfo_cmd,
+ __conv_keyonly_optkeys): make them private [ruby-dev:30074].
+
+ * ext/tk/lib/tk/txtwin_abst.rb: fix typo [ruby-dev:30073].
+
+ * ext/tk/lib/tk/canvas.rb (TkCanvas#scan_dragto): lack of an argument.
+
+ * ext/tk/lib/tk/canvas.rb: clarify the including module name
+ [ruby-dev:30080].
+
+ * 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 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>
+
+ * Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
+ setup.mak}: add --with-baseruby configure option.
+
+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
-Wed Feb 22 06:02:42 2012 Tanaka Akira <akr@fsij.org>
+Tue Jan 16 12:00:06 2007 Koichi Sasada <ko1@atdot.net>
- * ext/dbm/dbm.c (fdbm_initialize): disable Berkeley DB error messages.
+ * eval_proc.c (rb_proc_new): added.
- * ext/dbm/extconf.rb: check DBC type for above.
+ * string.c (sym_to_proc): supported.
- [ruby-dev:45269]
+ * vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
+ rb_proc_new.
-Tue Feb 21 20:23:47 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * yarvcore.c: add a test code.
- * hash.c (rb_any_hash): treat Qundef like as other special constants.
+Sat Jan 13 23:24:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * hash.c (hash_foreach_iter): fix signature.
+ * ext/win32ole/win32ole.c (ole_free, ole_type_free,
+ olemethod_free, olevariable_free, oleparam_free,
+ ole_event_free): fix memory leak. [ruby-core:09846]
-Tue Feb 21 19:39:34 2012 Tanaka Akira <akr@fsij.org>
+Wed Jan 10 00:10:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/curses/curses.c (Init_curses): use curses_version() for
- Curses::VERSION.
+ * array.c (rb_ary_replace): use ptr and len of orig instead of
+ shared. fixed: [ruby-dev:30116]
-Tue Feb 21 18:21:25 2012 Narihiro Nakamura <authornari@gmail.com>
+Tue Jan 9 17:48:38 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * gc.c : remove gc_clear_mark_on_sweep_slots() and use
- rest_sweep() instead of it, because some dead objects might be
- marked in next the mark phase by false pointers.
- [ruby-core:42672]
+ * file.c (rb_find_file): should not call fpath_check() with NULL.
+ fixed: [ruby-core:09867]
-Tue Feb 21 16:08:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 9 12:29:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * proc.c (rb_hash_proc): get wrapped pointer properly. [Bug #6048]
+ * ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
+ convert uid/gid from VALUE.
-Tue Feb 21 14:41:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/etc/etc.c (etc_getpwuid): ditto.
- * template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
- and {ruby,vendor,site}archdir. [ruby-core:42766][Feature #6052]
+Tue Jan 9 03:54:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Feb 21 09:13:25 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * string.c (rb_str_upto): String#upto from empty string makes
+ infinite loop. [ruby-core:09864]
- * proc.c (method_hash, proc_hash): Fix {Unbound}Method#hash
- [Bug #6048]. Isolate hash computation for proc
+ * string.c (rb_str_upto): use RSTRING_LEN().
- * internal.h: Declaration for above
+Sun Jan 7 18:36:05 2007 Koichi Sasada <ko1@atdot.net>
- * vm_method.c (rb_method_definition_hash): Computation for
- hash part of a method definition
+ * thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),
+ rb_thread_start_timer_thread()): added.
- * method.h: Declaration for above
+ * thread_pthread.ci: add a native_thread_join() and move
+ rb_thread_reset_timer_thread() definition to thread.c.
- * test/ruby/test_method.rb: Test for above
+ * thread_win32.ci: ditto
-Tue Feb 21 02:56:15 2012 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * 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]).
- * enumerator.c (enumerator_rewind): update the documentation.
- fixed: #6053
+Sun Jan 7 18:28:17 2007 Koichi Sasada <ko1@atdot.net>
-Mon Feb 20 23:38:35 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * common.mk: add a "compare" rule and fix MATZRUBY variable
- * enc/depend: ignore mktable.c because it's not encoding library.
- [ruby-core:42760] [Bug #6049]
+Sun Jan 7 17:47:16 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Mon Feb 20 21:40:53 2012 Tanaka Akira <akr@fsij.org>
+ * test/win32ole/test_win32ole.rb: add test for WIN32OLE#[],
+ WIN32OLE#[]=.
- * ext/curses/extconf.rb: fold too long lines.
+ * ext/win32ole/win32ole.c: update comment for rdoc of
+ WIN32OLE#[] and WIN32OLE#[]=.
-Mon Feb 20 21:16:48 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Jan 7 12:13:26 2007 Eric Hodel <drbrain@segment7.net>
- * lib/fileutils.rb: revert a line modified accidentally at r34669.
- This fixes mingw test errors in TestDir_M17N.
- [ruby-core:42728] [Feature #4970]
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment):
+ Look for class and module comments above rb_define_class and
+ rb_define_module. Patch by Daniel Berger <djberg96 at gmail.com>
-Mon Feb 20 21:09:27 2012 Tanaka Akira <akr@fsij.org>
+Sun Jan 7 10:32:12 2007 Eric Hodel <drbrain@segment7.net>
- * ext/curses/curses.c (Init_curses): define Curses::VERSION.
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
+ Properly handle escaping of : in comments.
+ * test/rdoc/parsers/test_parse_c.rb:
+ Test RDoc::C_Parser#do_classes and Rdoc::C_Parser#find_class_comment.
-Mon Feb 20 21:08:00 2012 Tanaka Akira <akr@fsij.org>
+Sun Jan 7 09:31:18 2007 Tadayoshi Funaba <tadf@dotrb.org>
- * ext/curses/extconf.rb: restore $libs and $defs for each
- header/library choice.
+ * lib/date/format.rb: updated based on date2 4.0.1.
-Mon Feb 20 19:57:26 2012 Tanaka Akira <akr@fsij.org>
+Sat Jan 6 18:46:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dbm/extconf.rb: weaken header/library consistency check if db is
- "ndbm". It seems several (possibly historical) distributions
- provide libndbm. However the content of libndbm vary: Berkeley DB,
- GDBM or even 4.3BSD NDBM. (Mandriva, Tru64 UNIX, OpenSuSE,
- SCO OpenServer, ...)
- "ndbm" is not searched automatically now (dblib doesn't contain it)
- but configure --with-dbm-type=ndbm choose libndbm and ndbm.h.
+ * io.c (rb_io_getline_fast, rb_io_getline): increase lineno
+ when met the delimiter or EOF. fixed: [ruby-dev:30081]
-Mon Feb 20 19:15:57 2012 Tanaka Akira <akr@fsij.org>
+ * io.c (prepare_getline_args, rb_io_getline_1): split
+ preparation of arguments and reading. [ruby-dev:30085]
- * ext/dbm/extconf.rb: refine variable names.
+Sat Jan 6 13:48:36 2007 Koichi Sasada <ko1@atdot.net>
-Mon Feb 20 15:50:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * insns.def (send): fix to optimize send() with Symbol.
- * configure.in: check if -fstack-protector is really available.
+ * yarvtest/test_method.rb: add another test.
-Sun Feb 19 23:43:38 2012 Tanaka Akira <akr@fsij.org>
+Sat Jan 6 13:43:55 2007 Koichi Sasada <ko1@atdot.net>
- * ext/dbm/extconf.rb: show header and library found.
+ * common.mk: add PHONY dependency to some rules
-Sun Feb 19 23:01:01 2012 Tanaka Akira <akr@fsij.org>
+Sat Jan 6 11:50:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/dbm/dbm.c (Init_dbm): refine DBM::VERSION definition.
+ * io.c (argf_read): fix wrong replacement. [ruby-dev:30070]
- * ext/dbm/extconf.rb: provide RUBYDBM_GDBM_HEADER macro.
+Sat Jan 6 09:10:52 2007 Koichi Sasada <ko1@atdot.net>
-Sun Feb 19 17:07:27 2012 Tanaka Akira <akr@fsij.org>
+ * 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.
- * test/dbm/test_dbm.rb (test_dbmfile_suffix): check pag and dir is
- empty for 4.3BSD ndbm.
+ * compile.c (iseq_specialized_instruction): fix to support above
-Sun Feb 19 03:00:30 2012 Tanaka Akira <akr@fsij.org>
+ * eval.c: ditto (remove "static" from rb_f_send and rb_f_funcall
- * test/dbm/test_dbm.rb (test_dbmfile_suffix): check magic numbers.
+ * yarvcore.c: ditto (add a external IDs for compiler)
-Sun Feb 19 01:05:41 2012 Tanaka Akira <akr@fsij.org>
+ * yarvcore.h: ditto (add a VM_CALL_SEND_BIT macro)
- * ext/dbm/extconf.rb: detect GDBM's ndbm.h by testing dbm_clearerr is
- an empty macro.
+ * yarvtest/test_method.rb: add tests for above changes
-Sun Feb 19 00:25:55 2012 Tanaka Akira <akr@fsij.org>
+ * eval.c: remove unused "Kernel#send" declaration
- * ext/dbm/extconf.rb: don't choose 'dbm' if _GDB_H_ is defined which
- is available since GDBM 1.9 because 'gdbm_compat' is appropriate
- choice since GDBM 1.8.1.
+Sat Jan 6 08:29:17 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Sat Feb 18 23:27:00 2012 Kenta Murata <mrkn@mrkn.jp>
+ * ext/win32ole/win32ole.c (Init_win32ole): add
+ WIN32OLE::VARIANT::VT_EMPTY, WIN32OLE::VARIANT::VT_NULL
- * random.c: remove a duplicated comment.
+ * test/win32ole/test_win32ole_variant_m.rb (test_variant): ditto.
-Sat Feb 18 18:43:13 2012 Tanaka Akira <akr@fsij.org>
+Sat Jan 6 03:49:22 2007 Koichi Sasada <ko1@atdot.net>
- * ext/dbm/extconf.rb (dblib): prefer recent GDBM over older GDBM.
- (have_declared_libvar): new function to check a declared variable
- exists in a library.
- (have_undeclared_libvar): renamed from renamed from have_libvar.
- (headers.db_check2): check that GDBM version variable if GDBM header
- is chosen.
+ * benchmark/run.rb: change option format
- * ext/dbm/dbm.c (Init_dbm): use HAVE_DECLARED_LIBVAR_GDBM_VERSION and
- HAVE_UNDECLARED_LIBVAR_GDBM_VERSION macro.
+ * common.mk: ditto
-Sat Feb 18 13:53:01 2012 Tanaka Akira <akr@fsij.org>
+Fri Jan 5 22:21:08 2007 Koichi Sasada <ko1@atdot.net>
- * test/dbm/test_dbm.rb (test_dbmfile_suffix): DBM::VERSION should
- be Berkeley DB if foo.db is created by DBM.open.
+ * benchmark/bm_app_pentomino.rb: use Array#dup instead of
+ Array#clone
-Sat Feb 18 13:40:37 2012 Tanaka Akira <akr@fsij.org>
+ * benchmark/bmx_temp.rb: removed
- * test/dbm/test_dbm.rb (test_dbmfile_suffix): test dbm file suffix.
+ * benchmark/run.rb: use run.rb instead of run_rite.rb
-Sat Feb 18 12:50:59 2012 Tanaka Akira <akr@fsij.org>
+ * common.mk: ditto
- * ext/dbm/dbm.c (DBM::VERSION): define it by detecting _GDBM_H_ or
- _DBM_IOERR.
+ * benchmark/run_rite.rb: removed
-Sat Feb 18 07:52:45 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * common.mk: use $(srcdir)/test.rb to run a test program
+ with "make run"
- * tool/enc-unicode.rb: don't use 1.9 feature on tools.
+ * benchmark/bmx_temp.rb: removed and
+ set svn:ignore (bmx_*.rb) to benchmark/
-Sat Feb 18 02:48:39 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * test.rb: set svn:ignore
- * lib/fileutils.rb: refactored FileUtil methods to use the
- `define_command` API. Patch from 7rans <transfire@gmail.com>
- * test/fileutils/test_dryrun.rb: corresponding test refactoring
- * test/fileutils/test_nowrite.rb: ditto
- * test/fileutils/test_verbose.rb: ditto
+Fri Jan 5 21:03:08 2007 Koichi Sasada <ko1@atdot.net>
-Fri Feb 17 21:39:36 2012 Tanaka Akira <akr@fsij.org>
+ * yarvtest/yarvtest.rb: fix to compare results
- * ext/dbm/extconf.rb: remove dbm.
+Fri Jan 5 20:52:56 2007 Koichi Sasada <ko1@atdot.net>
-Fri Feb 17 21:18:39 2012 Tanaka Akira <akr@fsij.org>
+ * compile.c, compile.h: add ADD_CALL_RECEIVER() macro.
- * ext/dbm/extconf.rb: refine header/library mismatch detection.
- check only for ndbm.h except libc. check _GDBM_H_ for gdbm.
- check _DBM_IOERR for the original ndbm.
+ * insns.def (send): use GET_SELF() direct if FCALL.
-Fri Feb 17 20:30:44 2012 Tanaka Akira <akr@fsij.org>
+ * eval.c (rb_f_send): check method dispatch type to permit
+ invoking private method when dispatch type is FCALL/VCALL
- * ext/dbm/extconf.rb: don't check libdbm. It is not a ndbm
- implementation. (libdbm in Version 7 Unix is database library
- for single database per process.)
+ * insns.def (opt_ltlt): remove useless statement.
-Fri Feb 17 15:38:53 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * vm.h: remove unused macros.
- * Merge Onigmo-5.13.1. [ruby-dev:45057] [Feature #5820]
- https://github.com/k-takata/Onigmo
- cp reg{comp,enc,error,exec,parse,syntax}.c reg{enc,int,parse}.h
- cp oniguruma.h
- cp tool/enc-unicode.rb
- cp -r enc/
+Fri Jan 5 20:50:31 2007 Koichi Sasada <ko1@atdot.net>
-Fri Feb 17 15:20:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * benchmark/run_rite.rb: fix to use readlines instead of
+ read(...).lines (because 1.8 doesn't have String#lines).
- * enum.c (enum_each_slice): arrays to be yielded can be newly
- created in the block.
+Fri Jan 5 20:28:19 2007 Koichi Sasada <ko1@atdot.net>
- * enum.c: move work variables to objects not to let called blocks
- access stack area out of scope. [Bug #5801]
+ * thread_win32.ci (rb_thread_reset_timer_thread):
+ added ([ruby-dev:30086]).
-Fri Feb 17 12:35:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jan 5 20:20:36 2007 Koichi Sasada <ko1@atdot.net>
- * tool/merger.rb: remove borders from the commit message which is used
- when the commit doesn't change ChangeLog.
+ * common.mk: add .SUFFIXES rule
-Fri Feb 17 11:50:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 5 15:58:15 2007 Koichi Sasada <ko1@atdot.net>
- * common.mk (btest, btest-ruby, test-sample test-knownbugs)
- (test-all, test-ruby): depend on prog.
+ * eval_method.h (rb_alias): fix to check search result
-Fri Feb 17 09:56:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 5 13:59:53 2007 Koichi Sasada <ko1@atdot.net>
- * lib/mkmf.rb (create_header): log the content of header.
+ * eval_method.h (rb_add_method): fix to check old_node
-Fri Feb 17 09:44:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Jan 5 12:03:07 2007 Koichi Sasada <ko1@atdot.net>
- * tool/transcode-tblgen.rb (import_ucm): don't use \h because the
- script should work with ruby 1.8.
+ * compile.c (iseq_compile_each, set_block_local_tbl):
+ support NODE_LAMBDA (partly).
- * tool/enc-unicode.rb: ditto.
+ * sample/test.rb: restore test of NODE_LAMBDA
-Fri Feb 17 07:33:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/test_lambda.rb: ditto
- * enum.c (id_lshift): use constant ID.
+Fri Jan 5 12:31:23 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Fri Feb 17 07:30:53 2012 Tanaka Akira <akr@fsij.org>
+ * thread_pthread.ci (native_sleep): fix tv_nsec overflow.
- * ext/dbm/extconf.rb: refactored to split too long conditions.
+Thu Jan 4 20:01:29 2007 Koichi Sasada <ko1@atdot.net>
-Fri Feb 17 00:23:25 2012 Tanaka Akira <akr@fsij.org>
+ * 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.
- * test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
- reported by Bohuslav Kabrda.
- [ruby-core:42685] [ruby-trunk - Bug #6036]
+ * yarvtest/yarvtest.rb: fix to use command line option as
+ command names to be compared.
-Fri Feb 17 00:04:21 2012 Tanaka Akira <akr@fsij.org>
+ * yarvtest/runner.rb: remove a debug output.
- * ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
- Berkeley DB library.
+Thu Jan 4 19:12:27 2007 Koichi Sasada <ko1@atdot.net>
-Thu Feb 16 05:41:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * common.mk: fix to use test.rb script in build directory.
+ ($(srcdir)/test.rb -> test.rb)
- * insns.def (splatarray): make new array if flag is set.
+Thu Jan 4 17:28:05 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * compile.c (iseq_compile_each): make new array with
- splat. [ruby-core:21901][Feature #1125]
+ * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
+ Arrays could not be modified in its each block. [ruby-dev:30063]
-Thu Feb 16 00:14:04 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Thu Jan 4 16:57:14 2007 Koichi Sasada <ko1@atdot.net>
- * lib/abbrev.rb (Array#abbrev): add missing '"' in documentation.
+ * yarv_version.h: removed.
-Wed Feb 15 22:20:19 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * common.mk: remove yarv_version.h from rules
- * cont.c (rb_fiber_reset_root_local_storage): add a new function to
- restore rb_thread_t::local_storage.
+ * yarvcore.h (Init_yarvcore): remove useless constants
- * cont.c (rb_obj_is_fiber): add a new function to tell finalizer to
- prevent fibers from destroy.
+Thu Jan 4 17:00:06 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * gc.c (rb_objspace_call_finalizer): don't sweep fibers at finalizing
- objspace.
+ * ext/openssl/ossl_asn1.c (Init_ossl_asn1):
+ OpenSSL::ASN1::ASN1Data#value,#tag,#tag_class and
+ OpenSSL::ASN1::BitString#unused_bits should be public.
- * internal.h (rb_fiber_reset_root_local_storage, rb_obj_is_fiber):
- add prototypes.
+Thu Jan 4 13:45:10 2007 Koichi Sasada <ko1@atdot.net>
- * vm.c (ruby_vm_destruct): reset main thread's local_storage before
- free main thread. rb_thread_t::local_storage is replaced by fiber's
- local storage when forked from fiber, and it should be already freed
- when the fiber was destroyed. [ruby-core:41456] [Bug #5700]
+ * thread_pthread.ci: fix last changes around PTHREAD_STACK_MIN.
- * test/ruby/test_fiber.rb (test_fork_from_fiber): add test for fork
- from fiber.
+Thu Jan 4 13:42:47 2007 Koichi Sasada <ko1@atdot.net>
-Wed Feb 15 19:57:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * common.mk: restore changes.
- * ext/fiddle/closure.c (callback): deal with unsigned integers.
- [ruby-core:42458][Bug #5991][Bug #6022]
+Thu Jan 4 10:33:54 2007 Koichi Sasada <ko1@atdot.net>
- * ext/fiddle/conversions.c (value_to_generic, generic_to_value):
+ * 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.
+
+ * 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):
+ 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
+ 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>
+
+ * 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.
- * ext/fiddle/closure.c (callback): same as r34506.
+ * io.c (appendline): add limit capability.
-Wed Feb 15 17:41:31 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * io.c (rb_io_getline_fast, rb_io_getline): ditto.
- * io.c (io_strsetbuf): call rb_str_modify to make str independent
- before calling rb_str_set_len for r34580.
+ * io.c (rb_io_getline): small refactoring for DRY.
-Wed Feb 15 12:30:10 2012 Eric Hodel <drbrain@segment7.net>
+ * io.c (rb_io_s_foreach, rb_io_s_readlines): small refactoring.
- * ext/zlib/zlib.c (Init_zlib): Added Zlib::TEXT and note that
- Zlib::ASCII is deprecated in zlib 1.2.3 and newer.
+Thu Dec 28 15:27:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 15 12:24:40 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/cgi.rb (CGI::Cookie::initialize): use Array() again.
+ [ruby-core:09781]
- * ext/zlib/zlib.c: Move constant descriptions to constants. Remove
- extra comment block at the top of Init_zlib().
+Wed Dec 27 20:52:32 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Wed Feb 15 12:30:46 2012 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * ext/win32ole/win32ole.c: remove WIN32OLE::PROPERTY class.
- * lib/ostruct.rb: Create getters and setters after dup.
- [Bug #6028] [rubyspecs:0380bcc]
+ * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-Wed Feb 15 10:59:52 2012 Narihiro Nakamura <authornari@gmail.com>
+Wed Dec 27 10:04:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * gc.c (HEAP_BITMAP_LIMIT): HEAP_BITMAP_LIMIT is computed on the
- basis of HEAP_SIZE because it must covers a whole heap block.
- [ruby-trunk - Bug #6006]
+ * object.c (rb_Array): returns 1-element array if the argument
+ does not have to_ary nor to_a.
-Wed Feb 15 09:27:45 2012 Eric Hodel <drbrain@segment7.net>
+Tue Dec 26 21:02:14 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * ext/zlib/zlib.c (Init_zlib): Added Zlib::FIXED and Zlib::RLE
- strategies.
- * NEWS: Add note about the new Zlib constants.
+ * test/win32ole/test_folderitem2_invokeverb.rb: The argument
+ of Shell.NameSpace should not be file path.
-Wed Feb 15 09:11:36 2012 Eric Hodel <drbrain@segment7.net>
+Tue Dec 26 06:13:08 2006 Minero Aoki <aamine@loveruby.net>
- * ext/zlib/zlib.c: Improve documentation. [ruby-trunk - Bug #5948]
+ * ext/bigdecimal/bigdecimal.c: remove useless method
+ BigDecimal#!=. [ruby-dev:30050]
-Wed Feb 15 07:28:54 2012 Eric Hodel <drbrain@segment7.net>
+Thu Dec 21 15:37:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * encoding.c (Init_Encoding): Add IO example of internal and external
- encoding. Fixed a typo in the force_encoding example. [#5949]
+ * string.c (rb_str_slice_bang): rdoc description bug fixed.
+ [ruby-core:09754]
-Wed Feb 15 06:58:21 2012 Eric Hodel <drbrain@segment7.net>
+Wed Dec 20 12:54:31 2006 Koichi Sasada <ko1@atdot.net>
- * encoding.c (Init_Encoding): Add Encoding documentation.
- [ruby-trunk - Bug #5949]
- * encoding.c (rb_set_default_external): Fix typo in documentation.
+ * Convert CVS repository to Subversion repository.
-Tue Feb 14 20:22:11 2012 Narihiro Nakamura <authornari@gmail.com>
+Mon Dec 18 08:36:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * gc.c (CEILDIV): rename to a appropriate name.
+ * lib/cgi.rb (CGI::Cookie::initialize): Array(string) no longer
+ works. [ruby-core:09738]
-Tue Feb 14 18:07:20 2012 Narihiro Nakamura <authornari@gmail.com>
+Fri Dec 15 00:19:53 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (assign_heap_slot): SEGV happens cause on 64-bit platform
- sometime there should be `objs-=2` instead of `objs--`.
- [Bug #6006]
- patched by Sokolov Yura. https://github.com/ruby/ruby/pull/92
+ * win32/Makefile.sub (COMPILE_RULES): latter rule has higher priority.
-Tue Feb 14 16:00:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): remove static library before update,
+ to get rid of sludge of Borland tlib.exe.
- * io.c (io_setstrbuf): cut down the buffer if longer.
+Thu Dec 14 18:29:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Feb 14 15:06:37 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/readline/readline.c: NetBSD editline does not have
+ rl_username_completion_function() and rl_completion_matches().
+ a patch from Takahiro Kambe <taca at back-street.net>.
+ [ruby-dev:30008]
- * lib/test/unit/assertions.rb (build_message): skip escaped
- question marks.
+Thu Dec 14 18:20:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Feb 14 12:10:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/locale.rb (IRB::Locale::puts): typo fixed. a patch from
+ NAKAMURA Usaku <usa@ruby-lang.org>. [ruby-dev:30012]
- * variable.c (autoload_const_set, autoload_require): fix
- signatures.
+Tue Dec 12 23:33:53 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Feb 14 05:23:40 2012 Eric Hodel <drbrain@segment7.net>
+ * lib/optparse.rb (Switch#parse_arg, Switch#conv_arg): splat failures.
- * process.c (proc_wait): Change typo "SystemError" to
- "SystemCallError". [ruby-trunk - Bug #5962]
- * process.c (proc_wait2): ditto
+Mon Dec 11 11:51:10 2006 Akinori MUSHA <knu@iDaemons.org>
-Tue Feb 14 05:18:24 2012 Eric Hodel <drbrain@segment7.net>
+ * ext/digest/sha2/lib/sha2.rb: Moved one level up from under
+ the superfluous subdirectory digest/.
- * enumerator.c: Document use of Enumerator.new for creating a lazy
- enumeration for filtering/chaining. [ruby-trunk - Feature #707]
+Mon Dec 11 11:46:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 13 23:01:50 2012 Akinori MUSHA <knu@iDaemons.org>
+ * variable.c (rb_define_const): typo fixed.
- * vm_method.c (rb_method_boundp):
- obj.respond_to?(:a_protected_method) should return false because
- calling a protected method may cause NoMethodError if called
- from outside the class inheritance tree. Kernel#respond_to? is
- mostly used to test if it is safe to call a method, so the false
- positive should be avoided. [ruby-dev:40461] [ruby-dev:41739]
- [ruby-dev:41837]
+Mon Dec 11 09:36:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 13 21:52:06 2012 Narihiro Nakamura <authornari@gmail.com>
+ * string.c (rb_str_aset): index double decode problem.
+ [ruby-core:09695]
- * gc.c (HEAP_OBJ_LIMIT, HEAP_BITMAP_LIMIT): HEAP_OBJ_LIMIT used
- `sizeof(struct heaps_slot)` while heap is currently allocated
- with `struct heaps_header`.
- HEAP_BITMAP_LIMIT were calculated from
- `HEAP_OBJ_LIMIT/sizeof(uintptr_t)` - one Byte for each object,
- not one Bit. [Bug #6006]
- patched by Sokolov Yura. https://github.com/ruby/ruby/pull/92
+Sat Dec 9 21:39:24 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Feb 13 18:30:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (ruby_cleanup): keep the exception till after END blocks.
+ [ruby-core:09675]
- * io.c (io_setstrbuf): defer resizing buffer string until data is
- read actually.
+Sat Dec 9 11:22:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 13 10:24:39 2012 Loren Segal <lsegal@soen.ca>
+ * lib/irb/locale.rb (IRB::Locale::search_file): use File.exist?
+ instead of File.exists?. a patch from Yutaka Kanemoto
+ <kinpoco at gmail.com> in [ruby-dev:30000].
- * io.c (Init_IO): use directive hack to make ARGF documentable
- in other tools. [ruby-core:42515][Bug #6007]
+Fri Dec 8 18:11:18 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Sun Feb 12 20:43:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/optparse.rb: cannot put :nodoc: before method definition.
+ put after it.
- * include/ruby/ruby.h (rb_event_hook_func_t): add argument names.
+Fri Dec 8 17:00:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Sun Feb 12 16:30:23 2012 Akinori MUSHA <knu@iDaemons.org>
+ * bin/rdoc: use File.exist? instead of File.exists?.
- * tool/merger.rb (#default_merge_branch): Add support for
- Subversion 1.7 which adopted a whole new working directory
- structure.
+Thu Dec 7 23:50:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Feb 12 15:14:41 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * object.c (Init_Object): new method Dir.exist?(path).
+ [ruby-core:09663]
- * benchmark/driver.rb: suppress unused/shadowing variable warnings.
+ * file.c (Init_File): remove File.exists?; use File.exist?
+ instead.
-Sun Feb 12 03:14:40 2012 Eric Hodel <drbrain@segment7.net>
+ * file.c: rename functions to test_* to rb_file_*_p.
- * vm_eval.c (check_funcall): Call respond_to? with matching arity for
- legacy single-argument implementations. [ruby-trunk - Bug #6000]
+Thu Dec 7 09:29:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Feb 11 12:04:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/weakref.rb (WeakRef::__setobj__): should support
+ marshaling. [ruby-talk:228508]
- * compile.c (defined_expr): guard the whole expression.
- [ruby-dev:45021][Bug#5786]
+Wed Dec 6 23:58:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Feb 11 08:34:42 2012 Eric Hodel <drbrain@segment7.net>
+ * Makefile.in, common.mk (NULLCMD): moved for platforms that empty
+ command does not run. fixed: [ruby-dev:29994]
- * ext/zlib/zlib.c (rb_inflate_add_dictionary): Added
- Zlib::Inflate#add_dictionary to allow users to pre-specify
- for using during #inflate. [ruby-trunk - Feature #5937]
+ * win32/win32.c (init_stdhandle): redirect unopened IOs to NUL.
+ [ruby-core:09572]
-Sat Feb 11 08:23:02 2012 Eric Hodel <drbrain@segment7.net>
+Tue Dec 5 19:01:42 2006 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/zlib/zlib.c (do_inflate): Inflate more data if buffered data
- exists. Allows Zlib::Inflate#set_dictionary to work.
- [ruby-trunk - Bug #5929]
+ * configure.in (SITE_DIR): fixed to empty RUBY_SITE_LIB in config.h on
+ NetBSD. fixed: [ruby-dev:29358]
-Sat Feb 11 06:00:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Dec 5 18:38:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * dir.c (fnmatch): The * needs to be escaped to avoid formatting in
- fnmatch comment.
- patched by @dalton. https://github.com/ruby/ruby/pull/91
+ * lib/matrix.rb (Matrix::rank): use quo method to avoid integer
+ division problem. [ruby-core:09644]
-Fri Feb 10 03:41:31 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/matrix.rb (Matrix::rank_e): ditto.
- * ext/psych/parser.c: removed external encoding setter, allow parser
- to be reused.
- * ext/psych/lib/psych/parser.rb: added external encoding setter.
- * test/psych/test_parser.rb: test parser reuse
+Tue Dec 5 00:59:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Feb 10 01:30:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
+ self assignment operator, not regex. [ruby-talk:227324]
- * ext/dl/dl.h (ALIGN_OF): use offsetof().
+Tue Dec 5 00:19:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dl/dl.h (DLALIGN): round up at once and get rid of overflow.
+ * 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]
-Fri Feb 10 00:47:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 4 23:49:28 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (assert_no_memory_leak): new assertion to
- check memory leak by invoking child ruby process and watch its
- memory size.
+ * instruby.rb (install_recursive): get rid of warning.
-Thu Feb 9 23:41:44 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * lib/optparse.rb (CompletingHash#match): get rid of splat failure.
- * test/pathname/test_pathname.rb (test_binread): add assertion to
- check encoding.
+Mon Dec 4 19:16:39 2006 Akinori MUSHA <knu@iDaemons.org>
-Thu Feb 9 16:48:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/digest/lib/digest/hmac.rb: Do alias << update.
- * ext/dl/dl.c (Init_dl): fix mangled document.
+Mon Dec 4 10:48:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Feb 9 16:10:34 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
+ sizeof(off_t).
- * test/ruby/memory_status.rb (Memory::Win32): 64bit support.
+Mon Dec 4 08:32:25 2006 Shugo Maeda <shugo@ruby-lang.org>
-Thu Feb 9 16:08:55 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
+ boundary. JVN#84798830
- * ext/dl/lib/value.rb (DL::ValueUtil.{unsigned_value,signed_value}):
- currently pack/unpack does not accept "q!" and "Q!".
+Sun Dec 3 16:16:53 2006 Akinori MUSHA <knu@iDaemons.org>
-Thu Feb 9 16:01:29 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/digest/lib/digest/hmac.rb: Fix problems with update
+ timing. [Reported by: oss-ruby@technorama.net]
- * ext/fiddle/conversions.c (value_to_generic): src is not guaranteed as
- a Bignum if the type is LONG_LONG. it may be a Fixnum if the value
- is small.
+Sat Dec 2 07:33:53 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Feb 9 11:32:36 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils::FormData::<<):
+ HTTPUtils::parse_header() takes a string. [ruby-dev:29931]
- * ext/dl/lib/types.rb: Win64 support.
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header):
+ String does no longer have each method.
-Thu Feb 9 04:12:29 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_form_data):
+ ditto.
- * test/pathname/test_pathname.rb: not read but binread.
- patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]
+Sat Dec 2 07:09:04 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Wed Feb 8 22:29:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
+ subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
- * string.c (rb_str_modify_expand): fix memory leak.
+Fri Dec 1 16:31:53 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Feb 8 14:06:59 2012 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
+ [ruby-talk: 227408]
- * ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL
- option to prevent BEAST attack. See [Bug #5353].
+Tue Nov 28 17:25:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- In OpenSSL, OP_DONT_INSERT_EMPTY_FRAGMENTS is used to prevent
- TLS-CBC-IV vulnerability described at
- http://www.openssl.org/~bodo/tls-cbc.txt
- It's known issue of TLSv1/SSLv3 but it attracts lots of attention
- these days as BEAST attack. (CVE-2011-3389)
+ * array.c (ary_iter_check): should check modification (size
+ change) during iteration.
- Until now ossl sets OP_ALL at SSLContext allocation and call
- SSL_CTX_set_options at connection. SSL_CTX_set_options updates the
- value by using |= so bits set by OP_ALL cannot be unset afterwards.
+ * 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.
- This commit changes to call SSL_CTX_set_options only 1 time for each
- SSLContext. It sets the specified value if SSLContext#options= are
- called and sets OP_ALL if not.
+Mon Nov 27 09:00:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- To help users to unset bits in OP_ALL, this commit also adds several
- constant to SSL such as
- OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS. These constants were
- not exposed in Ruby because there's no way to unset bits in OP_ALL
- before.
+ * string.c (rb_str_ord): typo fixed. reported from Kornelius
+ Kalnbach <murphy@rubychan.de>. [ruby-core:09621]
- Following is an example to enable 0/n split for BEAST prevention.
+Sun Nov 26 16:36:46 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
- ctx.options = OP_ALL & ~OP_DONT_INSERT_EMPTY_FRAGMENTS
+ * version.h: addition of RUBY_PATCHLEVEL.
+ * version.c: ditto.
- * test/openssl/test_ssl.rb: Test above option exists.
+Wed Nov 22 16:00:49 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Feb 8 13:12:02 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/tk/extconf.rb: support --with-X11/--without-X11 option.
- * ext/openssl/ossl_x509name.c: Use the numerical representation of
- unrecognized OIDs instead of the sn "UNDEF".
+ * ext/tk/README.tcltklib: add description about --with-X11-* option
+ [ruby-talk:225166] and --with-X11/--without-X11 option.
- * test/openssl/test_x509name.rb: Add tests for the fixed behavior.
+ * ext/tk/tkutil/extconf.rb: able to be called manually
+ [ruby-talk:225950].
- Patch provided by Paul Kehrer, thank you!
- [ruby-core:41769] [Feature #5787]
+Sat Nov 18 23:39:20 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 8 09:49:58 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * object.c (rb_obj_tap): a new method. [ruby-talk:224013]
- * tool/merger.rb: don't abort, update first.
+Wed Nov 15 23:22:54 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Feb 8 09:47:33 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * file.c (test_grpowned, rb_stat_grpowned): should honor
+ supplementary group IDs. [ruby-core:09546]
- * ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.
- Thanks to Mantas Mikulenas for noticing and providing a patch!
- [ruby-core:42358] [Bug #5972]
+Tue Nov 7 18:35:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 8 09:19:00 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * eval.c (formal_assign): need to pack rest arg information in
+ argc.
- * ext/openssl/ossl_cipher.c: Add warning about key as IV.
+Tue Nov 7 18:05:01 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Feb 7 20:08:12 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/lib/tk/itemconfig.rb: minor bug fix.
- * error.c (exc_inspect): Fix typo. patch from Trent Ogren
- via https://github.com/ruby/ruby/pull/90
+Tue Nov 7 17:52:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Feb 7 19:37:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * class.c (rb_include_module): revert duplicate inclusion of
+ modules. [ruby-dev:29793]
- * st.c: refactor packed entries using structs.
+Tue Nov 7 17:18:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Feb 7 14:52:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (method_missing): update old argument adjustment.
- * st.c (st_update): table can be unpacked in the callback.
+Tue Nov 7 16:41:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * st.c (st_foreach): should not yield same pair when checking
- after unpacking.
+ * eval.c (when_check): need to splat for NODE_ARGSCAT as well.
+ [ruby-dev:29860]
-Mon Feb 6 21:55:13 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Nov 6 22:23:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * tool/merger.rb: abort if the working directory is dirty.
+ * string.c (Init_String): remove duplicated definition of
+ Symbol#to_s.
- * tool/merger.rb: update the working directory after commit.
+Mon Nov 6 18:54:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 6 00:16:27 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * eval.c (svalue_to_avalue): need to splat but no error.
- * encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
- is ascii only string. [ruby-core:42354] [Bug #5968]
+ * eval.c: new macros - YIELD_CALL, YIELD_VALUES.
-Fri Feb 3 07:16:47 2012 Eric Hodel <drbrain@segment7.net>
+ * eval.c (rb_yield_values): specify YIELD_VALUES.
- * lib/webrick.rb: Moved proxy rewriting to WEBrick::HTTPProxy.
- * lib/webrick/httpproxy.rb: Add examples of creating a proxy server
- and response rewriting using HTTPProxy.
+ * eval.c (rb_yield_0): use new macros.
-Fri Feb 3 06:53:22 2012 Eric Hodel <drbrain@segment7.net>
+ * eval.c (proc_invoke): slightly modified to separate YIELD_CALL
+ and YIELD_VALUES from YIELD_ARY_ARGS.
- * ext/openssl/ossl_x509store.c: Add class documentation for
- OpenSSL::X509::Store
+ * object.c (Init_Object): add nil.to_splat => [].
-Thu Feb 2 22:28:13 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Mon Nov 6 15:41:55 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/net/http/test_https_proxy.rb
- (HTTPSProxyTest#test_https_proxy_authentication):
- add workaround to avoid to hang up without openssl.
- see [ruby-dev:45021][Bug #5786]
+ * ext/tk/lib/tk/itemconfig.rb: ext/tk/lib/tk/itemconfig.rb: bug
+ 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/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
+
+ * ext/tk/lib/tkextlib/SUPPORT_STATUS: update.
+
+ * ext/tk/sample/editable_listbox.rb: [new] the listbox with editable
+ items. It's one of the example about usage of Place geometry manager.
+
+ * ext/tk/sample/tktextio.rb: improve the functions of TkTextIO class.
+ Those are required by 'irbtkw.rbw'.
+
+ * ext/tk/sample/irbtkw.rbw: [new] IRB on Ruby/Tk. It doesn't need any
+ 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.
- * test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address):
+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>
+
+ * lib/date.rb: updated based on date2 3.9.7.
+
+Sat Nov 4 13:09:31 2006 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
+
+Fri Nov 3 00:16:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (ruby_getnameinfo__aix): AF_INET6 workaround
+ 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 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.
-Thu Feb 2 21:48:18 2012 Kouhei Sutou <kou@cozmixng.org>
+ * lib/set.rb (TC_Set::test_s_new): strings are no longer
+ Enumerable
- * lib/rexml/parsers/baseparser.rb: use meaningful names.
+ * lib/soap/property.rb (Property::load): ditto.
-Thu Feb 2 21:38:52 2012 Kouhei Sutou <kou@cozmixng.org>
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto.
- * lib/rexml/parsers/baseparser.rb, test/rexml/test_namespace.rb:
- fix the default xml namespace URI validation.
- [ruby-dev:45169] [Bug #5956]
- Reported by Miho Hiramatsu. Thanks!!!
+ * lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto.
-Thu Feb 2 17:51:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Nov 2 09:08:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace.
- r34409 breaks replacing ARGV.
- [ruby-dev:45160] [Bug #5952]
+ * array.c: revert lfree shift/unshift boost patch to avoid unknown
+ memory error.
-Thu Feb 2 16:21:01 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Nov 1 23:24:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/net/http/test_http.rb (TestNetHTTPKeepAlive#*): remove debug
- output.
+ * ruby.h (struct RArray): revert embedding ptr in RVALUE.
-Thu Feb 2 01:24:34 2012 Yusuke Endoh <mame@tsg.ne.jp>
+ * array.c: ditto.
- * parse.y (debug_lines, coverage): set file path encoding for coverage
- result. [ruby-dev:44950]
+Wed Nov 1 23:01:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 1 14:38:31 2012 Akinori MUSHA <knu@iDaemons.org>
+ * string.c (hash): use Bob Jenkins' hash algorithm.
- * lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): Just
- call File.unlink and ignore ENOENT because existence check
- before unlinking does not help in terms of race condition.
+Wed Nov 1 02:22:31 2006 Akinori MUSHA <knu@iDaemons.org>
- * lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): My
- comment about thread safeness is obsolete.
+ * ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
+ optimization.
-Wed Feb 1 09:50:10 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/digest/digest.c (rb_digest_instance_equal): Allow comparing
+ a digest instance with another of a different class.
- * doc/re.rdoc (Repetition): fix typo. reported by Ori Avtalion
- and patched by Zachary Scott. [Bug #5947]
+Wed Nov 1 01:05:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Feb 1 06:38:54 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
+ fixed: [ruby-list:42928]
- * io.c (argf_close): skip stdin, which should be readable again.
- [ruby-dev:45160] [Bug #5952]
+Tue Oct 31 17:03:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (argf_readlines): reinitialize after all read to be
- readable again.
+ * time.c (time_dup): duplicate the class of original time.
+ [ruby-core:09357]
-Tue Jan 31 21:27:43 2012 Narihiro Nakamura <authornari@gmail.com>
+ * lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
+ should respect subclasses. [ruby-core:09357]
- * configure.in (HEAP_ALIGN_LOG): HEAP_ALIGN_LOG should be page
- size in OpenBSD. [ruby-core:42158][Bug #5901]
+Tue Oct 31 16:25:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * gc.c : avoid to redefine.
+ * array.c (ary_shared_first): should address offset after
+ ary_shared_array(). [ruby-core:09358]
-Tue Jan 31 14:27:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 30 23:40:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid
- in block form.
+ * Makefile.in (miniruby): add XLDFLAGS.
-Mon Jan 30 19:08:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (aix): use -bE option for miniruby. [ruby-dev:29698]
- * vm_eval.c (vm_call0): should pass block to enumerators. patched
- by Kazuki Tsujimoto. [ruby-dev:44961][Bug #5731]
+ * dir.c (glob_helper): get rid of possible memory leak.
- * vm_eval.c (method_missing), vm_insnhelper.c (vm_call_method):
- ditto. patched by satoshi shiba.
+ * win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
+ rb_w32_get_environ): not to use GC before initialization.
-Mon Jan 30 12:31:05 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 30 19:28:02 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * file.c (append_fspath): need to set the encoding to result always.
+ * bignum.c (rb_big2str0): use better approximation.
-Mon Jan 30 10:38:37 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 30 18:35:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/irb/test_completion.rb: skip if cannot load irb/completion
- (maybe readline does not exist).
+ * bignum.c (rb_big2str0): wrong allocation length. a patch from
+ U.Nakamura <usa at garbagecollect.jp> [ruby-dev:29710]
-Sun Jan 29 22:47:19 2012 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+Mon Oct 30 12:34:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * tool/config.{guess,sub}: updated to automake-1.11.2.
+ * eval.c (rb_eval): fix commit miss. [ruby-dev:29707]
-Sun Jan 29 12:17:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 30 11:15:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/readline/readline.c (readline_attempted_completion_function):
- respect encodings. [Bug #5941]
+ * sprintf.c (rb_str_format): should preserve leading zero
+ information for negative %b and %x. [ruby-talk:221347]
-Sat Jan 28 09:33:33 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sun Oct 29 19:51:31 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * win32/win32.c (rb_w32_read): fix an issue that $stdin.read doesn't
- terminate by CTRL-C on Windows.
- [ruby-dev:45149] [Bug #5812]
+ * regexec.c: invalid offset value was used in STATE_CHECK_BUFF_INIT().
-Sat Jan 28 08:18:11 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Sat Oct 28 20:13:18 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * test/ruby/test_thread.rb
- (TestThreadGroup#test_thread_timer_and_interrupt): skip exit status
- assertion because we cannot get signal status on Windows.
+ * oniguruma.h: Version 4.4.5
- * win32/win32.c (CreateChild): create process group to receive the
- signal by GenerateConsoleCtrlEvent().
+ * regint.h: ditto.
- * win32/win32.c (kill): use CTRL_BREAK_EVENT instead of CTRL_C_EVENT
- if a process group is specified. CTRL_C_EVENT signal cannot be
- generated for process groups for the specification.
- [ruby-dev:45149] [Bug #5812]
+ * regerror.c: ditto.
-Sat Jan 28 07:46:03 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+ * regexec.c: ditto.
- * thread_win32.c (rb_w32_wait_events_blocking): use
- ruby_thread_from_native() instead of GET_THREAD() because
- GET_THREAD() doesn't always return the current thread and
- WaitForMultipleObjects() at rb_w32_read() doesn't return by
- Thread#kill. This fixes TestQueue#test_thr_kill failure on
- Windows.
+ * regcomp.c ditto.
- * thread_win32.c (rb_w32_wait_events): use ruby_thread_from_native()
- instead of GET_THREAD() for consistency with the above change.
+ * regparse.c ditto.
- * thread_win32.c (rb_w32_sleep): ditto.
+Sat Oct 28 07:56:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread_win32.c (rb_w32_Sleep): ditto.
- [ruby-dev:45149] [Bug #5812]
+ * marshal.c (r_object0): missing break. [ruby-core:09345]
-Sat Jan 28 07:28:48 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Fri Oct 27 17:30:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/zlib/test_zlib.rb (TestZlibGzipReader#test_reader_wrap): set
- binmode explicitly for fixing test error on Windows. This is consistent
- with r34243.
- [ruby-dev:45149] [Bug #5812]
+ * enumerator.c (enum_each_cons): move RETURN_ENUMERATOR() after
+ argument check.
-Sat Jan 28 05:53:34 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Oct 26 21:05:48 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/irb/completion.rb (IRB::InputCompletor::CompletionProc):
- ignore non-string name modules. [ruby-core:42244][Bug #5938]
+ * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
+ (fix http://bugs.debian.org/394336)
-Fri Jan 27 16:31:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
- * gc.c (HEAP_ALIGN, HEAP_ALIGN_MASK): DRY, let compiler calculate
- from HEAP_ALIGN_LOG.
+Thu Oct 26 15:23:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jan 26 11:03:37 2012 Eric Hodel <drbrain@segment7.net>
+ * enumerator.c: remove by_slice and by_cons.
- * lib/matrix.rb: Clean up extra whitespace in output documentation.
+Thu Oct 26 15:12:12 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Jan 26 03:24:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/digest/digest.c (Init_digest): typo.
- * ext/io/console/console.c (io_getch): default delegating method
- for StringIO. https://github.com/nobu/io-console/issues/4
+Wed Oct 25 17:16:05 2006 Akinori MUSHA <knu@iDaemons.org>
- * ext/stringio/stringio.c: moved some methods to hidden modules.
+ * test/digest/test_digest_hmac.rb: added.
-Wed Jan 25 13:27:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 25 16:34:31 2006 Akinori MUSHA <knu@iDaemons.org>
- * file.c (rb_file_s_basename): ignore non-ascii extension in
- different encoding, which cannot match.
+ * ext/digest/test.sh: make this script work again.
- * file.c (rmext): no extension to strip if empty string.
+Wed Oct 25 07:59:42 2006 Tadayoshi Funaba <tadf@dotrb.org>
- * file.c (rb_enc_path_next, rb_enc_path_skip_prefix)
- (rb_enc_path_last_separator, rb_enc_path_end)
- (ruby_enc_find_basename, ruby_enc_find_extname): encoding-aware
- path handling functions.
+ * lib/date/format.rb: updated based on date2 3.9.6.
+ [ruby-core:09323]
- * file.c (rb_home_dir, file_expand_path, rb_realpath_internal)
- (rb_file_s_basename, rb_file_dirname, rb_file_s_extname)
- (rb_file_join): should respect the encodings of arguments than
- file system encoding. [ruby-dev:45145] [Bug #5919]
+Wed Oct 25 00:58:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * dir.c (check_dirname, ruby_glob0): ditto.
+ * win32/mkexports.rb, win32/resource.rb: use unique variable names.
- * ext/pathname/pathname.c (path_sub_ext): ditto.
+Tue Oct 24 19:18:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jan 24 14:20:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enumerator.c (enumerator_by_slice): new method added.
- * vm.c (rb_iter_break_value): new function to break a block with
- the value. [ruby-dev:45132] [Feature #5895]
+ * enumerator.c (enumerator_by_cons): ditto.
-Tue Jan 24 12:58:41 2012 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Oct 24 18:56:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * object.c (rb_Hash): add Kernel#Hash conversion method like
- Array() or Float(). a patch from Run Paint Run Run. Fix #3131
+ * enumerator.c (enum_each_slice, enum_each_cons): returns
+ Enumerable::Enumerator if no block is given. [ruby-dev:29246]
-Tue Jan 24 11:38:05 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * enumerator.c: remove methods: enum_with_index, enum_slice,
+ enum_cons. [ruby-dev:29246]
- * lib/uri/common.rb (URI.encode_www_form_component): initialize on
- requiring to support JRuby, which runs parallel multithreads.
- [ruby-core:42222] [Bug #5925]
+Tue Oct 24 18:51:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/uri/common.rb (URI.decode_www_form_component): initialize on
+ * enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
-Mon Jan 23 20:33:11 2012 Jason Kay <geniture@me.com>
+Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/http.rb (Net::HTTP#connect): Writing entire packet at
- once to avoid incomplete transmission. Current code using
- writeline was causing sub-optimal conversing with a proxy due to
- the connect tunnel request headers being split over multiple
- packets. The modification I made allows the connect request to
- be written as one packet, avoiding problems and optimizing the
- conversation.
+ * 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.
- https://github.com/ruby/ruby/pull/72
- [Feature #5460]
+Sun Oct 22 14:48:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 23 17:06:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * signal.c (Init_signal): avoid duplicated installation of SIGCHLD
+ handler.
- * lib/uri/mailto.rb (URI::MailTo.build): follow Array#to_s change of
- Ruby 1.9; use Array#join. [Bug #5840]
+Sun Oct 22 16:47:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Jan 23 16:42:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * string.c (rb_str_substr): should be infected with only original
+ string, but not the shared string. fixed: [ruby-core:09152]
- * io.c (extract_binmode): raise an exception if binmode/textmode
- is specified with both vmode and opthash.
- [ruby-core:42199] [Bug #5918]
+ * string.c (rb_str_new4): keep shared string untainted when original
+ string is tainted. fixed: [ruby-dev:29672]
-Mon Jan 23 16:35:27 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Oct 22 07:55:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_io_extract_modeenc): set ASCII-8BIT if binmode is specified
- with opthash. [ruby-core:42197] [Bug #5917]
+ * 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.
-Mon Jan 23 10:08:00 2012 Kenta Murata <mrkn@cookpad.com>
+Sun Oct 22 05:20:34 2006 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
- * test/cgi/test_cgi_util.rb (test_cgi_escape_preserve_encoding):
- add a test for CGI::escape to preserve encoding.
+ * configure.in: alloca is broken; use C_ALLOCA instead.
+ [ruby-dev:29416]
- * test/cgi/test_cgi_util.rb (test_cgi_unescape_preserve_encoding):
- add a test for CGI::unescape to preserve encoding.
+Sat Oct 21 17:50:40 2006 Akinori MUSHA <knu@iDaemons.org>
-Mon Jan 23 00:45:34 2012 Akinori MUSHA <knu@iDaemons.org>
+ * ext/digest/lib/digest.rb: Follow the framework updates.
- * misc/rdoc-mode.el (rdoc-imenu-create-index): Add imenu support
- to rdoc-mode.
+Fri Oct 20 22:00:43 2006 Akinori MUSHA <knu@iDaemons.org>
- * misc/rdoc-mode.el (rdoc-mode): Fix regexp patterns containing
- "\s " where CR/LF is not supposed to match.
+ * ext/digest/lib/digest/hmac.rb: Complete half-boiled updates.
-Sun Jan 22 15:41:26 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/digest/sha2/lib/digest/sha2.rb: Fix #initialize_clone().
- * parse.y (rb_intern3): split to registration check and new
- registration.
+Fri Oct 20 20:28:37 2006 Akinori MUSHA <knu@iDaemons.org>
- * parse.y (rb_intern_str): make interned string shared with the
- given string.
+ * ext/digest: Prefix C constants with RUBY_ and C type names with
+ rb_ to avoid name clash in writing extensions.
- * parse.y (rb_intern3, rb_intern_str): check the coderange first.
+ * ext/digest: Introduce Digest::Class and Digest::Instance for
+ ease of implementing subclasses and add-ons, inspired by
+ gotoyuzo.
-Sat Jan 21 22:21:07 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
+ * 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.
-Sat Jan 21 21:51:19 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/digest/lib/digest.rb: Adjust autoload entries for SHA2
+ classes.
- * encoding.c (rb_enc_compatible): fix segv on symbols.
- [ruby-core:42204] [Bug #5921]
+ * ext/digest/lib/digest/hmac.rb: Follow the framework updates.
-Sat Jan 21 11:43:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Oct 20 10:47:43 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * dir.c (dir_chdir, check_dirname): get rid of optimization-out.
+ * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
-Fri Jan 20 20:47:37 2012 Kenta Murata <mrkn@cookpad.com>
+Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/cgi/util.rb (CGI.escape): support a string with invalid byte
- sequence. [Bug #5913]
+ * common.mk (NULLCMD): dummy command.
- * test/cgi/test_cgi_util.rb
- (test_cgi_escape_with_invalid_byte_sequence): test for the above
- change.
+ * bcc32/Makefile.sub (post-install-*): Borland make cannot ignore
+ command-less double-colon rules. [ruby-dev:29676]
-Fri Jan 20 17:37:37 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Oct 20 00:37:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (vm_exec): remove workaround for LLVM because r34278 fixes it.
+ * bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.
- * vm_insnhelper.c (vm_call_cfunc): ditto.
+ * ext/extmk.rb: workaround for Borland make.
-Fri Jan 20 14:31:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Oct 18 23:02:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/http.rb (Net::HTTP#transport_request): retry a idempotent
- request automatically. [ruby-dev:45030] [Bug #5790]
- [ruby-core:41821] [Bug #5813]
+ * array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]
- * lib/net/http.rb (Net::HTTP#keep_alive_timeout=): added to specify
- the second to reconnect the TCP connection on Keep-Alive.
- The default value is 2 second because current servers uses 2 sec.
- http://ftp-admin.blogspot.com/2009/09/keepalivetimeout2.html
+ * signal.c (Init_signal): handle SIGTERM. fixed: [ruby-list:42895]
- * lib/net/http.rb (Net::HTTP#begin_transport): reconnect TCP
- connection on keep-alive timeout.
+ * win32/win32.c (rb_w32_utime): allow NULL to set the current time.
+ [ruby-talk:219248]
-Thu Jan 19 07:53:09 2012 Tadayoshi Funaba <tadf@dotrb.org>
+Wed Oct 18 13:25:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/date/date_strptime.c: moved detector of leftover.
+ * 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]
-Thu Jan 19 07:10:47 2012 Tadayoshi Funaba <tadf@dotrb.org>
+ * string.c (rb_str_each_byte): ditto for bytes in place of lines.
- * ext/date/date_parse.c: [ruby-core:42173].
+Wed Oct 18 00:55:33 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Jan 18 18:11:02 2012 Akinori MUSHA <knu@iDaemons.org>
+ * parse.y (parser_yylex): use particular enums. [ruby-core:09221]
- * misc/rdoc-mode.el (rdoc-mode): Add provide so that requiring
- this library succeeds.
+Tue Oct 17 22:03:08 2006 Minero Aoki <aamine@loveruby.net>
-Wed Jan 18 18:06:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/erb.rb: String#each was removed, use #each_line instead.
- * ext/curses/curses.c (cWindow, cMouseEvent): made typed data.
+Tue Oct 17 12:27:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jan 18 12:49:15 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * array.c (ary_shared_array): should set NOEMBED flag for a copied
+ array.
- * ext/psych/lib/psych/visitors/to_ruby.rb: Added support for loading
- subclasses of String with ivars
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Added support for dumping
- subclasses of String with ivars
- * test/psych/test_string.rb: corresponding tests
+Tue Oct 17 08:04:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jan 18 10:39:47 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+ * string.c (rb_str_lines): now takes optional argument for the
+ line separator.
- * ext/psych/lib/psych/visitors/to_ruby.rb: Added ability to load array
- subclasses with ivars.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Added ability to dump
- array subclasses with ivars.
- * test/psych/test_array.rb: corresponding tests
+ * io.c (rb_io_lines, rb_io_bytes): new methods.
-Tue Jan 17 17:18:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 16 23:33:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (SPT_TYPE): enable as SPT_REUSEARGV on Darwin.
+ * array.c (rb_ary_unshift_m): a bug in lfree shift length
+ calculation.
- * missing/setproctitle.c (ruby_init_setproctitle): changed prefix.
+Mon Oct 16 08:30:43 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Jan 17 12:32:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * mkconfig.rb: *OBJS are not needed for extension libraries.
- * gc.c (aligned_malloc, aligned_free): covered missing defined
- operators and fixes for cygwin.
+ * {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo,
+ missing comma.
-Tue Jan 17 10:54:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 16 00:44:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * st.c (do_hash): it's the time to remove cast to unsigned int.
+ * pack.c (pack_unpack): execute block if given with unpacked value
+ instead of creating an array. an idea from Tim Bray.
-Tue Jan 17 07:30:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Oct 15 01:03:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * st.c (unpack_entries): Fix r34310: on unpacking, the position of
- a hash must be do_hash-ed value.
+ * lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
+ directory but not prepend.
- * st.c (add_packed_direct): ditto.
+ * lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): do not
+ join with dot. fixed: [ruby-core:09179]
-Mon Jan 16 16:41:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Oct 14 23:39:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/optparse.rb (Regexp): fix incorrect options when casting to
- a Regexp, and suppress encoding option warnings.
- https://github.com/ruby/ruby/pull/82
+ * parse.y (singleton): no need to re-create NODE_SELF() again.
+ [ruby-core:09177]
-Mon Jan 16 11:22:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Oct 14 23:25:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/win32.c (rb_chsize): no need to get the current file size.
+ * parse.y (parser_warning, parser_warn): some error message may
+ contain format specifiers. a patch from Akinori MUSHA <knu at
+ iDaemons.org>. [ruby-dev:29657]
-Mon Jan 16 00:41:33 2012 Sokolov Yura <funny.falcon@gmail.com>
+ * regparse.c (onig_rb_warning, onig_rb_warn): ditto.
- * st.c: st use function instead of macro. In my current
- environment (Ubuntu 11.04 32bit gcc-4.5.2) it gives 4%
- performance improvement.
+ * ext/bigdecimal/bigdecimal.c (VpException): ditto.
- https://github.com/ruby/ruby/pull/77
+ * ext/dl/handle.c (rb_dlhandle_initialize): ditto.
-Sun Jan 15 14:09:48 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto.
- * object.c (rb_inspect): raise the result is not compatible with
- the default external encoding. [ruby-core:42095] [Bug #5848]
- If the default external encoding is ASCII compatible, the encoding of
- inspected result must be compatible with it.
- If the default external encoding is ASCII incompatible,
- the result must be ASCII only.
+Sat Oct 14 08:15:42 2006 Akinori MUSHA <knu@iDaemons.org>
-Sun Jan 15 13:21:50 2012 NARUSE, Yui <naruse@ruby-lang.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/json/parser/parser.rl (json_string_unescape): workaround fix
- for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862
+ * 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().
+
+Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * bcc32/Makefile.sub (post-install-ext): no longer needed.
+
+ * 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>
+
+ * 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 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.
+
+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
+ base directory to load path.
+
+ * lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): should
+ use the given File-like interface, but not File directly.
+
+ * test/testunit/collector/test_dir.rb (TestDir::FileSystem): implement
+ File-like methods correctly.
+
+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
+ Mauricio Fernandez <mfp at acm.org>. [ruby-core:09158]
+
+ * object.c (rb_mod_cvar_get): typo fixed. [ruby-core:09168]
+
+ * 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.
+
+ * ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
+
+ * ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
+
+ * ext/digest/depend, ext/digest/extconf.rb: Use $INSTALLFILES
+ rather than adding make targets. [Pointed out by: nobu]
+
+Tue Oct 10 16:39:08 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/sha1/depend, ext/digest/sha2/depend: Remove obsolete
+ dependencies.
+
+Mon Oct 9 23:46:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/parsedate.rb: documentation patch from Konrad Meyer
+ <konrad.meyer@gmail.com>. [ruby-doc:1238]
+
+ * 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
+ are allowed around equal sign. [ruby-core:09032]
+
+ * 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.
+ [ruby-core:09007]
+
+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.
+
+ * 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
+ (see ext/tk/ChangeLog.tkextlib).
+
+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.
+
+ * 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.
+
+Mon Oct 2 23:47:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::COLLECTORS):
+ base directory should be lower precedence. fixed: [ruby-dev:29622]
+
+ * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): typo.
+
+ * 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>
+
+ * instruby.rb: batfile should be CRLF'ed.
+
+Mon Oct 2 01:24:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (test-all): separate directory where running test cases
+ from source tree.
+
+ * lib/test/unit/autorunner.rb (options): added --basedir, --workdir
+ and --load-path options.
+
+ * lib/test/unit/collector/dir.rb (recursive_collect, collect_file):
+ base directory support.
+
+Sun Oct 1 23:56:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in, common.mk, ext/extmk.rb, win{32,ce}/Makefile.in: keep
+ LIBRUBY_SO unless need to be removed.
+
+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>
+
+ * 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'.
+ fixed: [ruby-talk:216845]
+
+Fri Sep 29 11:43:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (try_func): revert fallback checking undeclared function.
+ fixed: [ruby-core:08949]
+
+Fri Sep 29 09:56:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: extout is needed for also clean.
+ fixed: [ruby-core:08944]
+
+ * lib/optparse.rb (OptionParser::Switch#conv_arg): unsplat by
+ Proc#call if no conversion is given.
+
+Thu Sep 28 23:59:31 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * node.h (struct thread): declare win32_exception_list on cygwin and
+ 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>
+
+ * 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>
+
+ * {win32,wince}/Makefile.sub (CPP): check predefined value.
+
+Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_shift): should not move memory region if array
+ 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.
+ [ruby-talk:216055]
+
+ * array.c (rb_ary_shift): avoid creating shared object if array
+ size is small.
+
+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>
+
+ * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
+
+Sun Sep 24 06:55:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_print): no special handling for nil as well as puts.
+ fixed: [ruby-dev:29586]
+
+Sun Sep 24 06:25:53 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.
+
+ * eval.c (thread_no_ensure): added THREAD_NO_ENSURE thread flag.
+
+ * 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]
+
+ * eval.c (rb_thread_kill): fix Thread#kill docs, which returns
+ the thread object in all cases.
+
+ * node.h: expose the rb_jmpbuf_t and rb_thread_t structs, along
+ with the thread flags. used by the sandbox extension.
+
+ * ruby.h: extern rb_eThreadError, so sandbox can swap it.
+
+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>
+
+ * 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.
+
+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.
+
+ * common.mk (install-doc, no-install-doc): use instruby.rb.
+
+ * instruby.rb: rdoc installation.
+
+ * 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
+ 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.
+
+ * lib/mkmf.rb (dir_re): fixed typo.
+
+ * 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>
+
+ * {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
+ this macro to install.
+
+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.
+
+Wed Sep 20 09:25:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/gdbm/gdbm.c: add RDoc documentation. a patch from Peter
+ Adolphs <futzilogik at users dot sourceforge dot net>.
+ [ruby-doc:1223]
+
+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,
+ Kernel#instance_variable_defined? and Module#class_variable_defined?.
+ [ruby-dev:29587]
+
+ * lib/date/format.rb (Date::Bag#method_missing): use new method,
+ instance_variable_defined? to check if an instance variable is
+ 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
+ after the previous generation.
+
+Sun Sep 17 17:42:13 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (install-doc): reverted.
+
+ * instruby.rb: stores file name list without destdir prefix.
+
+ * 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>
+
+ * README.EXT: should mention new macros: RSTRING_PTR, RSTRING_LEN,
+ RARRAY_PTR, RARRAY_LEN.
+
+ * README.EXT.ja: ditto.
+
+Sat Sep 16 16:39:23 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.
+
+ * instruby.rb: store installed list into the file.
+
+ * ext/dbm/extconf.rb: allow multiple candidates for dbm-type.
+
+ * ext/io/wait/extconf.rb: suspicious checking_for.
+
+ * ext/pty/pty.c (establishShell): parent pid is not used.
+
+ * 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/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]
+
+Thu Sep 14 16:11:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_intern): raise SecurityError only when $SAFE
+ level is greater than zero. [ruby-core:08862]
+
+ * 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]
+
+Wed Sep 13 18:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * README.EXT: English adjustment. [ruby-core:08851] and
+ [ruby-core:08852]
+
+Wed Sep 13 18:25:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
+ a patch from Marshall T. Vandegrift <llasram at gmail.com>.
+ [ruby-core:08804]
+
+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>
+
+ * 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>
+
+ * 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 (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>
+
+ * file.c (rb_f_test): test(0) should not have any special
+ meaning. [ruby-dev:29425]
+
+ * file.c (rb_f_test): properer error message.
+
+Sat Sep 9 14:08:38 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/test/unit/testcase.rb (Test::Unit::TestCase#run): Rescue
+ Exception in Test::Unit::TestCase#run. [ruby-core:08783]
+
+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>
+
+ * 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.
+
+ * lib/mkmf.rb (create_makefile): ditto.
+
+ * win32/resource.rb: ditto.
+
+Fri Sep 8 10:00:12 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.
+ Thanks to Aaron Patterson <aaron_patterson at speakeasy.net>.
+ [ruby-core:08802]
+
+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.
+
+ * lib/mkmf.rb (create_makefile): replace "print array" by
+ "print *array".
+
+ * 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]
+
+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 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::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:49:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (path_check_0): check if sticky bit is set on parent
+ directories for executable path. fixed: [ruby-dev:29415]
+
+Tue Sep 5 05:03:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (fix_plus): addition in Fixnum will never overflow
+ long. a patch from Ondrej Bilka <neleai at seznam.cz>.
+ [ruby-core:08794]
+
+ * numeric.c (fix_minus): ditto.
+
+ * bignum.c (rb_big_pow): eagerly truncate resulting bignum.
+ [ruby-core:08794]
+
+Mon Sep 4 23:15:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c (time_to_s): make it conform to RFC2822 date format.
+ [ruby-dev:29467]
+
+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>
+
+ * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
+
+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 06:46:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (rb_id2sym): intern if id is attrset_id.
+ [ruby-dev:29420] [ruby-dev:29447]
+
+Mon Sep 4 01:25:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_f_local_variables): list symbols.
+
+ * struct.c (rb_struct_s_members_m): 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.
+
+Sun Sep 3 15:32:44 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb: get rid of nil.to_s.
+
+Sun Sep 3 06:24:38 2006 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/socket.c (ruby_connect): sockerrlen should be socklen_t.
+
+Sun Sep 3 04:40:42 2006 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/extconf.rb: check arpa/inet.h for ntohs.
+
+ * 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.
+
+ * parse.y (rb_intern2): handle symbol as strings.
+
+ * 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.
+
+ * array.c: use RARRAY_LEN and RARRAY_PTR.
+
+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]
+
+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.
+
+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.
-Sat Jan 14 22:24:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_shuffle): ditto.
- * ext/dl/callback/mkcallback.rb (gencallback): suppress unused
+ * 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>
+
+ * 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>
+
+ * 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]
+
+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.
+
+ * regcomp.c ditto.
+
+ * regparse.c: ditto.
+
+Sat Aug 26 08:03:03 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 20:35:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/wsdl/document/echo.rb: removed.
+
+ * test/wsdl/document/test_rpc.rb: remove echo.rb after test.
+ [ruby-dev:29337]
+
+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>
+
+ * ext/win32ole/win32ole.c (hash2named_arg): accept hash argument
+ of symbol key.
+
+ * test/win32ole/test_win32ole.rb
+ ditto.
+
+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>
+
+ * lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode. a
+ patch from Fujioka <fuj at rabbix.jp>. [ruby-dev:29284]
+
+Thu Aug 17 19:15:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_stat_[rRwWxX]): check for super user.
+ fixed: [ruby-core:08616]
+
+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]
+
+Wed Aug 16 17:22:44 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk (pre-install-local): remove unnecessary code.
+ [ruby-dev:29249]
+
+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.
+
+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.
+
+ * 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]
+
+Tue Aug 8 23:49:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
+ 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]
+
+ * 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]
+
+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
+ Kanemoto <kinpoco at gmail.com>. [ruby-dev:29197]
+
+Mon Aug 7 15:55:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/syck/syck.c (syck_move_tokens): should avoid negative
+ memmove. [ruby-list:42625]
+
+Mon Aug 7 14:37:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * configure.in, common.mk: AIX link issue. a patch from Yutaka
+ Kanemoto <kinpoco at gmail.com>. [ruby-dev:29190]
+
+ * ext/socket/socket.c: AIX socket support. [ruby-dev:29190]
+
+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>.
+ [ruby-dev:29191]
+
+Sun Aug 6 20:34:24 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>
+
+ * lib/date/format.rb (str[fp]time): "%\n" means "\n".
+
+Fri Aug 4 12:13:22 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/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
+
+Fri Aug 4 18:59:49 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
+
+Fri Aug 4 14:02:14 2006 James Edward Gray II <james@grayproductions.net>
+
+ * lib/date/format.rb (__strptime, strftime): allow multi-line patterns
+ in Date#strftime the same as Time#strftime accepts.
+ fixed: [ruby-core:08466]
+
+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.
+
+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.
+
+Thu Aug 3 15:16:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * range.c (range_include): should always call Enumerable#include?
+ (not #===) for non numeric end points. [ruby-core:08477]
+ [ruby-core:08496]
+
+Mon Jul 31 16:51:40 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (exit_handler): new function; release winsock and
+ environment work area.
+
+ * win32/win32.c (NTInitialize): setup exit_handler.
+
+ * win32/win32.c (StartSockets): use exit_handler.
+
+ * win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
+ of GetEnvironmentVariable(), because the latter cannot distinguish
+ whether a null environment variable exists or not.
+ fixed: [ruby-talk:205123]
+
+Mon Jul 31 16:15:13 2006 Tanaka Akira <akr@fsij.org>
+
+ * test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
+ setrlimit may fail with EINVAL.
+ reported by MIYAMUKO Katsuyuki. [ruby-dev:29174]
+
+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>
+
+ * eval.c (rb_call0): trace call/return of method defined from block.
+ fixed: [ruby-core:08329]
+
+ * eval.c (rb_trap_eval): make the current thread runnable to deal with
+ exceptions which occurred within the trap. fixed: [ruby-dev:27729]
+
+ * lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
+ fixed: [ruby-talk:204896]
+
+Sat Jul 29 06:12:06 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
+
+Sat Jul 29 01:23:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/logger.rb: improves the amount of documentation that Rdoc
+ picks up when processing logger.rb by moving the require
+ 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
+
+ * math.c (math_log): too few argument to domain_check().
+
+Thu Jul 27 21:19:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * math.c (domain_check): a new function to check domain error
+ explicitly for systems that return NaN like FreeBSD.
+ [ruby-core:07019]
+
+ * math.c (math_acos, math_asin, math_acosh, math_atanh, math_log,
+ math_log10, math_sqrt): use domain_check().
+
+ * 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.
+
+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: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>
+
+ * lib/net/http.rb (Net::HTTP#post, request_post, request): should
+ set Content-Type: x-www-form-urlencoded by default.
+
+ * lib/net/http.rb (Net::HTTPHeader#content_type): should return
+ nil when there's no Content-Type.
+
+ * lib/net/http.rb (Net::HTTPHeader#sub_type): should return nil
+ when there's no sub Content-Type (e.g. "Content-Type: text").
+
+ * 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!.
+
+ * eval.c (rb_eval): prohibit redefining __send and __send!.
+
+ * lib/delegate.rb (Delegator): preserve __send.
+
+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,
+ but not "-". fixed: [ruby-core:08167]
+
+Wed Jul 26 16:39:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_scan): add string modification check.
+ [ruby-core:7216]
+
+Wed Jul 26 16:06:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): check
+ multipart boundary end. a patch from Fujioka <fuj at rabbix.jp>
+ [ruby-dev:28470]
+
+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>
+
+ * lib/mkmf.rb (configuration): typo.
+
+Tue Jul 25 13:14:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * process.c (rb_proc_times): rename hz to hertz to avoid name
+ crash on AIX. [ruby-dev:29126]
+
+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 15:51:52 2006 Tanaka Akira <akr@fsij.org>
+
+ * ext/readline/readline.c (readline_readline): rl_deprep_term_function
+ may be NULL with libedit. reported by Ryan Davis. [ruby-dev:29070]
+
+Mon Jul 24 15:19:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_call0): revert last change. [ruby-dev:29112]
+ [ruby-core:08374]
+
+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>
+
+ * eval.c (rb_yield_0): should check args_args before lambda
+ argument check. [ruby-dev:29029]
+
+Tue Jul 18 23:53:59 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * process.c (rb_f_system): shouldn't block SIGCHLD if it's not
+ exist.
+
+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>
+
+ * win32/win32.c (open_ifs_socket): should not use plain malloc.
+
+ * win32/win32.c (rb_w32_opendir): should not use plain realloc.
+
+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
+ string. [ruby-core:08223]
+
+ * pack.c (pack_unpack): return referenced string itself if it has
+ same length as specified. a patch from <nobu at ruby-lang.org>
+ in [ruby-core:08225].
+
+ * 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
+ inpect argument from sprintf. [ruby-dev:29039]
+
+Tue Jul 18 10:53:37 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * object.c (rb_cstr_to_dbl): limit out-of-range message.
+
+ * util.c (ruby_strtod): return end pointer even if ERANGE occurred.
+ fixed: [ruby-dev:29041]
+
+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]
+
+Tue Jul 18 00:01:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
+
+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>
+
+ * st.c: still need to include config.h on some platforms.
+
+Sat Jul 15 01:09:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * st.c (malloc): use xmalloc/xcalloc instead of plain
+ malloc/calloc, to detect memory allocation failure. see
+ <http://www.nongnu.org/failmalloc/>.
+
+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.
+
+ * ext/tk/lib/tk/namespace.rb: ditto.
+
+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 00:10:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_pop): may cause realloc oscillation. a patch
+ from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>.
+ [ruby-dev:29028]
+
+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.
+
+Wed Jul 12 20:05:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (f_args): allow post mandatory arguments after optional
+ arguments. [ruby-dev:29014]
+
+ * 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.
+
+Tue Jul 11 20:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ruby.h: export rb_cMethod. [ruby-talk:201259]
+
+Tue Jul 11 19:13:33 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: remove restriction on the class of
+ pseudo-toplevel.
+
+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>
+
+ * 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
+ digits. [ruby-dev:28872]
+
+ * ext/bigdecimal/lib/bigdecimal/util.rb: Bug in to_r reported by
+ [ruby-list:42533] fixed.
+
+Mon Jul 10 19:22:19 2006 Tanaka Akira <akr@fsij.org>
+
+ * gc.c (gc_sweep): expand heap earlier.
+ reported by MORITA Naoyuki. [ruby-dev:28960]
+
+Mon Jul 10 18:59:34 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/font.rb: sorry. mistaken to patch.
+
+Mon Jul 10 18:46:52 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tcltklib.c: make SEGV risk lower at exit.
+
+ * ext/tk/lib/tk.rb: ditto.
+
+ * ext/tk/lib/multi-tk.rb: fail to call function-style methods on slave
+ interpreters. The strategy (MultiTkIp_PseudoToplevel_Evaluable) to
+ fix the problem is a little tricky. You may have to take care of
+ conflicting with it.
+
+ * ext/tk/lib/tk.rb: a little change for the pseudo-toplevel strategy.
+
+ * ext/tk/lib/tk/font.rb: ditto.
+
+ * ext/tk/lib/tk/msgcat.rb: ditto.
+
+ * ext/tk/lib/tkextlib/itk/incr_tk.rb: ditto.
+
+ * ext/tk/sample/demos-en/widget: fail to call function-style methods
+ on sample scripts. To fix it, a strategy which similar to the way
+ on MultiTiIp is used. Please take care when re-write and re-run a
+ demo script on the Widget-Demo code viewer.
+
+ * ext/tk/sample/demos-jp/widget: ditto.
+
+Mon Jul 10 17:32:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * sample/test.rb: update test suites.
+
+ * test/ruby/test_assignment.rb (TestAssignment::test_yield): ditto.
+
+ * test/ruby/test_iterator.rb (TestIterator::test_itertest): 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-ruby@zenspider.com>
+
+ * lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
+ Morikawa including new file suffixes, function support, public
+ variables and constants, derived-types, defined operators and
+ assignments, namelists, and subroutine and function
+ arguments. Truly massive.
+
+ * lib/rdoc/diagram.rb: diagrams are now cached.
+
+ * lib/irb/completion.rb: fixed a crasher when completing against
+ an unnamed class/module.
+
+ * lib/rdoc/parsers/parse_c.rb: private comment (--/++) support in
+ C-file rdoc.
+
+ * lib/debug.rb: minor clarification in help.
+
+ * lib/pp.rb: minor clarification on exception.
+
+Sun Jul 9 00:54:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (next_jump): deal with destination of next.
+ fixed: [ruby-core:08169]
+
+Fri Jul 7 17:49:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_ord): extract lower byte. fixed: [ruby-dev:28980]
+
+ * lib/jcode.rb (String#succ!): fix for 1.9. fixed: [ruby-dev:28979]
+
+Fri Jul 7 14:05:03 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
+ from [ruby-dev:28970].
+
+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>
+
+ * 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>
+
+ * ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
+
+ * ext/racc/cparse/cparse.c: should mark CparseParams objects.
+
+ * lib/racc/parser.rb: sync with original code, rev 1.8.
+
+ * 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
+ bindings for general use.
+
+ * ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
+ Tk.callback_continue don't work on MultiTkIp.
+
+ * ext/tk/lib/multi-tk.rb: ditto.
+
+ * ext/tk/lib/tk.rb: lack of Tk.callback_return.
+
+ * ext/tk/lib/tk/menu.rb: improve creating clone menus.
+
+Mon Jul 3 14:42:06 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
+ 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.
+ [ruby-dev:28927]
+
+ * 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>
+
+ * ext/racc/cparse/cparse.c: sync with original source code, rev
+ 1.6.
+
+ * 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]
+
+Sat Jul 1 15:15:49 2006 Tanaka Akira <akr@m17n.org>
+
+ * test/socket/test_nonblock.rb: add timeout to send/receive
+ an empty UDP packet.
+ [ruby-dev:28820]
+
+Fri Jun 30 23:46:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * configure.in: should test isinf for Solaris with GCC compiler.
+ a patch from <ville.mattila at stonesoft.com>. [ruby-core:07791]
+
+ * 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
+ failure.
+
+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>
+
+ * 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
+ <alex at blackkettle.org>. [ruby-core:08068]
+
+Tue Jun 27 22:47:18 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
+
+ * 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.
+
+ * configure.in: set ac_cv_header_sys_time_h=no on MinGW
+ for msvcrt compatibility.
+
+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>
+
+ * eval.c (rb_yield_0): avoid core dump. [ruby-dev:28840]
+
+Mon Jun 26 11:03:00 2006 Eric Hodel <drbrain@segment7.net>
+
+ * 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]
+
+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]
+
+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>
+
+ * parse.y (paren_args): wrap $2 by escape_Qundef because it may be
+ Qundef. [ruby-dev:28843]
+
+Sun Jun 25 17:18:33 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c(ole_invoke): support some kind of
+ method of word. [ruby-Bugs#3237]
+
+ * test/win32ole/test_word.rb: ditto.
+
+Sat Jun 24 23:48:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y: replace terminal token names with more descriptive
+ name, i.e. kEND to keyword_end. [ruby-list:42477]
+
+Sat Jun 24 23:37:41 2006 Tanaka Akira <akr@m17n.org>
+
+ * 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.
+
+ * array.c (rb_ary_new4): don't set len as n if contents is not
+ initialized. make it safe with GC.
+
+ [ruby-dev:28826]
+
+Fri Jun 23 23:35:32 2006 Tanaka Akira <akr@m17n.org>
+
+ * ruby.h, lib/drb/drb.rb, lib/drb/invokemethod.rb: remove Values class.
+ [ruby-dev:28805]
+
+Fri Jun 23 17:27:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_block_pass): removed.
+
+ * eval.c (rb_thread_start_1): use rb_proc_yield() instead of
+ rb_block_pass(). fixed: [ruby-dev:28794]
+
+Thu Jun 22 11:52:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
+ HTTPInternalServerError should be error 500. [ruby-core:08037]
+
+Thu Jun 22 11:47:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (rb_mod_name): returns nil for anonymous modules.
+ [ruby-talk:198440]
+
+Thu Jun 22 10:31:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_aref): "abc"[3] should not return an empty
+ string but nil. [ruby-dev:28786]
+
+Thu Jun 22 05:15:58 2006 Tanaka Akira <akr@m17n.org>
+
+ * ext/socket/socket.c (sock_s_socketpair): try GC only once.
+ [ruby-dev:28778]
+
+Wed Jun 21 21:20:31 2006 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb (jd_to_commercial): now works fine even if in
+ mathn-ized context.
+
+Wed Jun 21 17:29:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo.
+
+ * ext/tk/tcltklib.c (tcl_eval, tcl_global_eval): ditto.
+
+ * ext/zlib/zlib.c (rscheck): constified.
+
+Wed Jun 21 17:18:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/pp.rb (PP::PPMethods::seplist): should have preserved
+ original reference to the array. [ruby-dev:28747]
+
+Wed Jun 21 14:35:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (block_param): do not use multiple assignment for a sole
+ block parameter. [ruby-dev:28710]
+
+ * eval.c (rb_yield_0): pass a raw yielded value to a sole block
+ parameter if a value is passed by yield.
+
+ * eval.c (proc_invoke): args may not be an array.
+
+ * eval.c (rb_proc_yield): pass original value without wrapping
+ it in an array.
+
+Wed Jun 21 14:06:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (method_call): remove (fn)(args) style lambda
+ invocation, add fn.(args) instead.
+
+Wed Jun 21 08:39:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
+ and Time processing. [ruby-core:08033]
+
+Wed Jun 21 03:01:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c, file.c, etc.: code-cleanup patch from Stefan Huehner
+ <stefan at huehner.org>. [ruby-core:08029]
+
+Wed Jun 21 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (reswords): modifier token is no longer returned in fname
+ state. fixed: [ruby-dev:28775]
+
+Tue Jun 20 23:28:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
+
+ * lib/optparse.rb (OptionParser::List#summarize, OptionParser#order!): ditto.
+
+Tue Jun 20 11:07:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (proc_invoke): intercept break and return from lambda
+ Proc objects. [ruby-dev:28742]
+
+ * eval.c (proc_invoke): remove unnecessary YIELD_PROC_CALL flag.
+
+ * eval.c (YIELD_EXACT_ARGS): renamed from YIELD_LAMBDA_CALL, which
+ is no longer related to the behavior turned on by this flag.
+
+ * eval.c (return_jump): no need to care about PROT_YIELD.
+
+ * eval.c (break_jump): no jump to toplevel PROT_THREAD tag.
+
+ * 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).
+
+ * eval.c (rb_thread_yield): no need to specify YIELD_LAMBDA_CALL.
+
+ * eval.c (rb_block_pass): update blkid in prot_tag.
+
+Mon Jun 19 23:40:59 2006 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
+
+ * ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
+ imported nkf 2.0.7.
+
+Mon Jun 19 17:02:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * sample/test.rb (proc_return3): return within non lambda block
+ should terminate surrounding method. [ruby-dev:28741]
+
+Mon Jun 19 13:22:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (unix_sysaccept): typo fixed.
+
+ * ext/socket/socket.c (sock_connect): remove an unused local
+ variable tmpaddr.
+
+Mon Jun 19 02:10:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (tcp_accept_nonblock): forgot to remove
+ abandoned hacks. [ruby-dev:28740]
+
+Mon Jun 19 00:00:17 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+
+Sun Jun 18 20:28:43 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (fole_methods): The return value
+ of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+
+ * ext/win32ole/win32ole.c (fole_put_methods): The return value
+ of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
+
+ * test/win32ole/test_ole_methods.rb: ditto.
+
+ * ext/win32ole/win32ole.c (ole_propertyput): support
+ PROPERTYPUTREF. [ruby-talk:183042]
+
+ * test/win32ole/test_propertyputref.rb: ditto.
+
+Sat Jun 17 23:42:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (Init_eval): add aliases invoke_method and
+ invoke_functional_method corresponding send and funcall
+ respectively. [ruby-talk:197512]
+
+ * parse.y (parser_yylex): returns the most typical keyword token
+ on EXPR_FNAME. [ruby-core:7995]
+
+ * ext/socket/socket.c: protoize.
+
+Sat Jun 17 22:17:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/mathn.rb (Integer::prime_division): raise ZeroDivisionError
+ on zeros. [ruby-dev:28739]
+
+Sat Jun 17 14:53:32 2006 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Kernel#Pathname): new method.
+
+Sat Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org>
+
+ * lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+ string.
+
+Fri Jun 16 01:41:00 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_proc_arity): get rid of segfault for mere splat.
+
+ * gc.c (gc_mark_children): NODE_BLOCK_PASS needs u3 to be marked.
+
+Thu Jun 15 22:06:56 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (then): remove ':' from 'then' and 'do' rules.
+
+Wed Jun 14 18:00:20 2006 Eric Hodel <drbrain@segment7.net>
+
+ * enum.c (enum_any): Documentation typo.
+
+Wed Jun 14 15:01:09 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
+ warnings when -q is set.
+
+Wed Jun 14 16:11:37 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (rb_f_method_name, rb_f_callee_name): document typo.
+
+Wed Jun 14 15:19:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * hash.c (env_aset): raise TypeError on nil with more descriptive
+ message. [ruby-core:07990]
+
+Tue Jun 13 17:22:19 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (Init_socket): remove obsolete constants:
+ IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
+ UNIXsocket, UNIXserver.
+
+Tue Jun 13 09:07:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (formal_assign): post splat arguments should have had
+ higher priority than optional arguments, since they are
+ mandatory. [ruby-dev:28715]
+
+ * eval.c (VIS_MASK): broken. should be 15. [ruby-dev:28715]
+
+ * io.c (argf_getc): should return one-character string.
+ [ruby-dev:28715]
+
+ * io.c (rb_io_readchar): ditto.
+
+Sun Jun 11 23:20:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * object.c (sym_call): disallow to call private methods.
+
+ * lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
+ parser.
+
+Sun Jun 11 09:56:41 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.
+
+Sun Jun 11 07:27:11 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rdoc/ri/ri_writer.rb: use String#ord.
+
+Sun Jun 11 04:38:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * object.c (sym_to_proc): imported Symbol#to_proc from ActiveSupport.
+
+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]
+
+Sat Jun 10 17:49:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_ord): new method.
+
+ * parse.y (rbracket): allow optional newline before closing
+ brackets.
+
+Sat Jun 10 15:12:29 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (rb_f_method_name, rb_f_callee_name): new functions.
+ new global method `__method__' and `__callee__'.
+
+Sat Jun 10 10:13:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/getoptlong.rb (GetoptLong#set_options): receive arguments
+ as Array.
+
+ * lib/irb/slex.rb: use Proc#yield.
+
+ * lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
+ of String#[].
+
+ * lib/rdoc/ri/ri_writer.rb: ditto.
+
+Sat Jun 10 08:17:23 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * math.c (log2): may be a macro.
+
+ * parse.y (args, block_param, f_args): pass f_post_arg to #params.
+
+ * util.c (powersOf10): constified.
+
+ * ext/readline/readline.c: include extconf.h first.
+
+ * ext/ripper/eventids2.c: removed tLAMBDA_ARG.
+
+ * ext/tk/tcltklib.c (lib_fromUTF8_core): removed conflict.
+
+ * ext/tk/tkutil/tkutil.c (cbsubst_get_subst_arg): rb_id2name() is
+ defined as const now.
+
+ * ext/win32ole/win32ole.c (fole_missing): ditto.
+
+ * lib/mkmf.rb (create_makefile): force to create extconf header.
+
+ * lib/optparse.rb (order!): use Proc#yield.
+
+Sat Jun 10 06:53:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (CALLARGS): remove last semicolon. C90 compiler doesn't
+ allow any lines (even if they're empty) within variable
+ declarations.
+
+Fri Jun 9 09:56:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * sprintf.c (rb_str_format): allow %c to print one character
+ string (e.g. ?x).
+
+Thu Jun 8 14:00:02 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]
+
+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>
+
+ * parse.y (do_block): remove -> style block.
+
+ * parse.y (parser_yylex): remove tLAMBDA_ARG.
+
+Wed Jun 7 14:51:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (errmap): add some winsock errors.
+
+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.
+
+Mon Jun 5 18:12:12 2006 Tanaka Akira <akr@m17n.org>
+
+ * ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
+ non-AF_INET/AF_INET6 sockaddr.
+ (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
+ [ruby-dev:28691]
+
+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.
+
+Sat Jun 3 13:10:41 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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>
+
+ * ext/openssl/extconf.rb: use create_header.
+
+ * ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
+ include RUBY_EXTCONF_H.
+
+Fri Jun 2 17:16:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created.
+
+Fri Jun 2 00:11:19 2006 Tanaka Akira <akr@m17n.org>
+
+ * ext/socket/socket.c (s_recvfrom): alen may be zero with UNIXSocket
+ too. (tested on NetBSD 3.0)
+ (s_recvfrom_nonblock): extracted from sock_recvfrom_nonblock.
+ (sock_recvfrom_nonblock): use s_recvfrom_nonblock.
+ (ip_recvfrom_nonblock): new method: IPSocket#recvfrom_nonblock
+ (unix_recvfrom_nonblock): new method: UNIXSocket#recvfrom_nonblock
+ (s_accept_nonblock): extracted from sock_accept_nonblock.
+ (sock_accept_nonblock): use s_accept_nonblock.
+ (tcp_accept_nonblock): new method: TCPServer#accept_nonblock
+ (unix_accept_nonblock): new method: UNIXServer#accept_nonblock
+
+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>
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * ruby.h, lib/mkmf.rb (create_header): clear command line options for
+ macros moved to extconf.h.
+
+ * ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
+ EXTSTATIC permanent.
+
+ * ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
+
+ * {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
+ $(INCFLAGS).
+
+ * lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
+
+Thu May 25 01:52:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (pkg_config): particular config commands support.
+
+ * ext/extmk.rb: deal with $static set in extconf.rb.
+
+ * mkconfig.rb: merge multiple entries to an entry with multiple lines.
+
+ * lib/mkmf.rb: allow a series of commands to link.
+
+ * win32/Makefile.sub: embed manifests.
+
+ * win32/setup.mak: suffix OS name by runtime version.
+
+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>
+
+ * 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>
+
+ * rubyio.h (rb_io_set_nonblock): declared.
+
+ * io.c (rb_io_set_nonblock): new function.
+ (io_getpartial): nonblocking read support.
+ (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].
+ (sock_connect_nonblock): new method: Socket#connect_nonblock.
+ (sock_accept_nonblock): new method: Socket#accept_nonblock.
+ (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
+
+ [ruby-core:7917]
+
+Mon May 22 15:57:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (umethod_bind): should not update original class.
+ [ruby-dev:28636]
+
+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
+ number. [ruby-core:07896]
+
+ * time.c (time_add): ditto.
+
+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]
+
+Tue May 16 17:23:19 2006 Shin-ichiro HARA <sinara@blade.nagaokaut.ac.jp>
+
+ * 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.
+
+Tue May 16 15:34:18 2006 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.
+
+Tue May 16 09:20:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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.
+
+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):
+ typo fixed. a patch from Florian Gross <florg at florg.net>.
+
+Sat May 13 16:14:05 2006 Tanaka Akira <akr@m17n.org>
+
+ * lib/pp.rb (PP.mcall): new method.
+ (Struct#pretty_print): call Kernel#class and Struct#members even if
+ overridden.
+ (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>
+
+ * ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): should return
+ value. [ruby-dev:28627]
+
+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
+ <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]
+
+ * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
+ type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
+ [ruby-core:07808]
+
+Wed May 3 02:12:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (make_hostent_internal): accept ai_family
+ 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>
+
+ * ext/win32ole/win32ole.c (add_event_call_back): should not
+ delete event handler when the event name is not entried.
+
+Mon May 1 08:32:10 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (ole_param_ole_type): should return
+ "unknown type" string when ITypeInfo::GetFuncDesc failed.
+
+Sat Apr 29 22:43:37 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
+ flag. [ruby-core:07785]
+
+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]
+
+Thu Apr 27 01:38:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_fill): internalize local variable "beg" to
+ pacify Coverity. [ruby-core:07770]
+
+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]
+
+Tue Apr 25 18:00:05 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
+ count of a NULL Tcl_Obj [ruby-core:07759].
+
+Tue Apr 25 07:55:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/jcode.rb (String::tr_s): should have translated non
+ squeezing character sequence (i.e. a character) as well. thanks
+ to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
+
+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.
+
+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()
+
+ * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
+
+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 (arg): use NODE_ARGSCAT for placeholder.
+
+Wed Apr 19 11:13:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
+ mathew <meta at pobox.com>. [ruby-core:07738]
+
+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]
+
+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.
+
+ * ext/tk/lib/tk.rb: update RELEASE_DATE.
+
+ * ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
+
+ * ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
+
+Mon Apr 10 01:03:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * prec.c (prec_prec_f): documentation patch from
+ <gerardo.santana at gmail.com>. [ruby-core:07689]
+
+Sat Apr 8 02:34:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_big_pow): second operand may be too big even if
+ it's a Fixnum. [ruby-talk:187984]
+
+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]
+
+Thu Apr 6 01:04:47 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tcltklib.c: fix SEGV when embedding to an application.
+ [ruby-core:7600]
+
+ * ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
+
+ * ext/tk/tkutil/tkutil.c: follow to changing specification of
+ instance_eval on ruby-1.9.x.
+
+ * ext/tk/lib/tk.rb: ditto.
+
+ * ext/tk/lib/multi-tk.rb: ditto.
+
+ * ext/tk/lib/tk.rb: remove warning about redefinition of methods.
+
+ * ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
variables.
-Sat Jan 14 21:56:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 5 00:22:54 2006 Tanaka Akira <akr@m17n.org>
- * iseq.c (iseq_data_to_ary): check line info table boundary. line
- number 0 means no line number info is needed. [ruby-dev:45130]
- [Bug #5894]
+ * lib/pathname.rb: use a subclass for instantiation except
+ methods take pathname argument. suggested by Evan Phoenix.
+ [ruby-core:7618]
-Sat Jan 14 18:24:13 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Tue Apr 4 22:15:41 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * error.c (exc_equal): clear rb_thread_t::errinfo when ignore
- an exception under rb_protect(). [ruby-core:41979] [Bug #5865]
+ * parse.y: remove some obsolete syntax rules (unparenthesized
+ method calls in argument list).
-Sat Jan 14 12:02:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 1 15:11:27 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * sprintf.c (rb_enc_vsprintf): relaxed the restriction. since the
- implementation deeply depends on plain char, so wchar_t based
- encodings are not supported.
+ * ext/win32ole/win32ole.c: add WIN32OLE_TYPE#inspect,
+ WIN32OLE_VARIABLE#inspect
-Sat Jan 14 12:00:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * remove ext/win32ole/tests/testOLEVARIABLE.rb, testOLETYPE.rb
+ testOLETYPELIB.rb.
- * error.c (exc_equal): ignore exceptions during implicit
- conversion. [ruby-core:41979] [Bug #5865]
+ * testall.rb: ditto.
-Sat Jan 14 05:58:54 2012 Eric Hodel <drbrain@segment7.net>
+ * add test/win32ole
- * io.c (rb_io_s_read): Fix formatting of open_args comment. Reported
- by Adam Prescott.
+Fri Mar 31 14:24:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jan 13 18:41:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enumerator.c (enumerator_with_index): removed suspicious return
+ statement.
- * sprintf.c (rb_enc_vsprintf): can be used for ASCII compatible
- encodings only.
+Wed Mar 29 23:06:48 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Fri Jan 13 18:29:06 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/win32ole/win32ole.c (ole_invoke): change the behavior of
+ WIN32OLE#[], WIN32OLE#[]=. These methods invoke DISPID_VALUE.
- * thread.c (rb_mutex_unlock_th): simplified.
+ * ext/win32ole/sample/excel2.rb: ditto.
- * thread.c (rb_barrier_waiting): fix potential overflows.
+ * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-Fri Jan 13 17:23:38 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 29 10:11:31 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * load.c (load_unlock): update loading table at once.
+ * ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
+ e2w_conv): support C90 compiler.
-Fri Jan 13 16:44:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 27 22:45:37 2006 NARUSE, Yui <naruse@ruby-lang.org>
- * error.c (exc_equal): try implicit conversion for delegator.
- [ruby-core:41979] [Bug #5865]
+ * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: imported nkf 2.0.6.
+ * Add --ic / --oc option and mapping tables.
+ * Add fallback option.
+ * Add --no-best-fit-chars option.
+ * Fix some bugs.
-Fri Jan 13 03:46:53 2012 Akinori MUSHA <knu@iDaemons.org>
+ * ext/nkf/nkf.c (nkf_split_options): added for parse option string.
- * lib/shellwords.rb (Shellwords#shellescape): shellescape() now
- stringifies the given object using to_s.
+ * ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
+ Note that Kconv.to* still imply -X.
- * lib/shellwords.rb (Shellwords#shelljoin): shelljoin() accepts
- non-string objects in the given array, each of which is
- stringified using to_s.
+ * ext/nkf/test.rb: Removed. Obsolete by test/nkf.
- * lib/shellwords.rb: Fix rdoc markups.
+ * ext/.document: enabled documents in nkf and kconv
-Fri Jan 13 03:38:36 2012 Akinori MUSHA <knu@iDaemons.org>
+ * ext/nkf/nkf.c, ext/nkf/lib/kconv.rb: Add rdoc.
- * lib/shellwords.rb (Shellwords#shellsplit): Fix a bug where
- consecutive backslashes in double quotes are all removed except
- the one at the tail.
+Mon Mar 27 03:17:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jan 13 03:28:00 2012 Luis Lavena <luislavena@gmail.com>
+ * eval.c (rb_call0): insecure calling should be checked for non
+ NODE_SCOPE method invocations too.
- * ext/socket/extconf.rb (if ipv6): only define _WIN32_WINNT if was not
- previously defined. This solve warnings with multiple defines in
- command line with GCC 4.6.1
+ * eval.c (rb_alias): should preserve the current safe level as
+ well as method definition.
-Thu Jan 12 18:44:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 26 22:02:51 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * lib/mkmf.rb: fix r33904 and revert r33905. initialize global
- variables with init_mkmf before initializing constants.
- [ruby-dev:45124] [Bug #5879]
+ * re.c: refactoring for options.
-Thu Jan 12 13:51:00 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * parse.y: ditto.
- * cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
- reserving a memory space with ALLOCA_N for restoring machine stack
- stored in cont->machine_stack, but clang optimized out it (and
- maybe #5851 is also caused by this).
- This affected TestContinuation#test_check_localvars.
+Fri Mar 24 21:11:02 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * cont.c (cont_restore_1): revert workaround introduced in r32201.
+ * re.c (match_aref): RDoc description updated.
-Thu Jan 12 02:14:43 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * string.c (rb_str_sub): ditto.
- * object.c: Added examples for Object#is_a? and
- Object#instance_of? patched from Manoj Kumar.
- [Bug #5880] [ruby-core:42057]
+ * string.c (rb_str_gsub): ditto.
-Thu Jan 12 00:57:48 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Fri Mar 24 17:20:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb: verbose-mode can use by RM, RMDIRS, etc.
- (e.g. make V=1 realclean)
+ * process.c (rb_f_sleep): remove RDoc description about SIGALRM
+ which is not valid on the current implementation. [ruby-dev:28464]
-Wed Jan 11 23:40:21 2012 Naohisa Goto <ngoto@gen-info.osaka-u.ac.jp>
+Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * string.c (rb_str_concat): set array element after definition
- to fix compile error with Fujitsu C Compiler 5.6 on Solaris 10
- on Sparc. [Bug #5878] [ruby-dev:45123]
+ * re.c (rb_reg_regsub): prohibit \1, \2 ...\9 in replaced string
+ for named regex pattern.
-Wed Jan 11 22:52:51 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Thu Mar 23 21:06:23 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * gc.c (ruby_mimmalloc): don't set allocated size to header.
- ruby_mimmalloc() doesn't increment allocated_size/allocations and
- decrement them in ruby_xfree() cause inconsistency.
+ * oniguruma.h: Version 4.0.2
- * gc.c (ruby_xfree): don't decrement allocated_size/allocations if
- allocated size record is 0.
+ * regparse.c: ditto.
-Wed Jan 11 22:36:43 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * regcomp.c ditto.
- * test/readline/test_readline.rb (test_completion_proc_empty_result):
- ensure clearance of Readline's line_buffer after the test.
+ * regerror.c: ditto.
-Tue Jan 10 21:57:38 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Thu Mar 23 10:47:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/dbm/dbm.c (Init_dbm): fix a build error on mswin32.
- use `extern __declspec(dllimport)` for dll link with VC.
- [ruby-core:41996] [Bug #5869]
+ * eval.c (method_missing): should support argument splat in
+ super. a bug in combination of super, splat and
+ method_missing. [ruby-talk:185438]
-Tue Jan 10 15:31:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Mar 23 00:01:32 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- * vm.c (vm_exec): refix r34162; suppress warning and add description.
+ * re.c (rb_reg_regsub): add back reference by name \k<name> in
+ replace string.
-Tue Jan 10 15:13:58 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * re.h: add regexp argument to rb_reg_regsub().
- * ext/readline/readline.c (readline_attempted_completion_function):
- use rb_memerror().
+ * string.c (rb_str_sub_bang): ditto.
-Tue Jan 10 12:49:42 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * string.c (str_gsub): ditto.
- * gc.c: in fact, i686-linux doesn't need to define _XOPEN_SOURCE 600.
+Tue Mar 21 22:14:01 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-Tue Jan 10 12:44:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * re.c (match_alloc): initialize member regexp.
- * gc.c (ruby_mimmalloc): defined for objects need not rb_objspace,
- but should return pointer suitable for ruby_xfree;
- main vm and main thread.
- patched by Sokolov Yura. https://github.com/ruby/ruby/pull/79
+ * re.c (match_aref): add String and Symbol argument. [ruby-dev:28448]
- * internal.h: ditto.
+ * re.h: add member regexp to RMatch.
- * vm.c (Init_BareVM): use ruby_mimmalloc.
+ * gc.c (gc_mark_children): add gc_mark() to regexp member.
- * ext/dl/cfunc.c: #include <ruby/util.h>.
+Mon Mar 20 12:05:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/syslog/syslog.c: use xfree because it is allocated by
- ruby_strdup.
+ * configure.in: Solaris SunPro compiler -rapth patch from
+ <kuwa at labs.fujitsu.com>. [ruby-dev:28443]
-Tue Jan 10 12:13:56 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Mon Mar 20 11:12:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/readline/readline.c (readline_attempted_completion_function):
- fix compile error.
+ * ext/win32ole/win32ole.c (folevariant_value): could not compile
+ with C90 compiler.
-Tue Jan 10 10:41:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 20 09:40:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/readline/readline.c (readline_attempted_completion_function):
- empty completion result does not mean memory error.
+ * configure.in: remove enable_rpath=no for Solaris.
+ [ruby-dev:28440]
-Tue Jan 10 02:19:22 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Sun Mar 19 09:46:30 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * test/ruby/test_io.rb (test_autoclose_true_closed_by_finalizer,
- test_autoclose_true_closed_by_finalizer): skip if IO objects are
- not recycled yet. [ruby-dev:45098] [Bug #5850]
+ * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
+ of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
+ String object.
-Tue Jan 10 00:41:28 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * ext/win32ole/win32ole.c (folevariant_value): ditto.
- * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
- when exception is raised at @tempfile.close. [ruby-dev:45113]
+ * ext/win32ole/tests/testOLEVARIANT.rb: ditto.
- * lib/tempfile.rb (Tempfile#unlink): fix a typo.
+Wed Mar 15 16:51:11 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jan 10 00:32:17 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * lib/mkmf.rb (create_makefile): support libraries without *.so.
- * gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
- an exception under rb_protect(). [ruby-dev:45113]
+Wed Mar 15 16:39:29 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Mon Jan 9 23:37:43 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
+ "rb_str_new(0, 0)" to make empty string.
- * ext/readline/readline.c (readline_attempted_completion_function):
- fix typos.
+Sun Mar 12 17:02:10 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Mon Jan 9 20:55:34 2012 Narihiro Nakamura <authornari@gmail.com>
+ * ext/win32ole/win32ole.c(ole_val2olevariantdata): support VT_ARRAY in
+ WIN32OLE_VARIANT.new().
- * gc.c : don't embed struct heaps_slot to a heap block because it
- can causes copy-on-write of memory page on heap block when its
- free_next is rewritten.
+ * ext/win32ole/tests/testOLEVARIANT.rb: ditto.
-Mon Jan 9 20:26:33 2012 Tanaka Akira <akr@fsij.org>
+ * ext/win32ole/tests/testOLEPARAM.rb: test method name should not be
+ duplicated.
- * ext/pathname/pathname.c (path_entries): add document suggested by
- the thread [ruby-core:41959] [Bug #5859].
+Sat Mar 11 14:24:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 9 20:14:13 2012 Tanaka Akira <akr@fsij.org>
+ * ruby.1: a clarification patch from David Lutterkort
+ <dlutter at redhat.com>. [ruby-core:7508]
- * ext/socket/lib/socket.rb (family_addrinfo): don't require protocol
- equality. For example, protocol 0 and IPPROTO_TCP is not problem
- for TCP.
+Sun Mar 5 18:40:58 2006 Minero Aoki <aamine@loveruby.net>
-Mon Jan 9 20:08:52 2012 Tanaka Akira <akr@fsij.org>
+ * lib/fileutils.rb: do not repeat command options.
- * ext/socket/lib/socket.rb (family_addrinfo): return the given
- addrinfo object.
- Patch by Ippei Obayashi. [ruby-dev:45095] [Bug #5845]
+Sun Mar 5 18:35:03 2006 Minero Aoki <aamine@loveruby.net>
-Mon Jan 9 19:40:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/net/http.rb (send_request_with_body): #content_type never
+ return false, use #main_type instead. [ruby-core:07476]
- * test/zlib/test_zlib.rb (TestZlibGzipWriter#test_writer_wrap): set
- binmode explicitly.
+Sat Mar 4 15:26:40 2006 Tanaka Akira <akr@m17n.org>
-Mon Jan 9 14:42:41 2012 Narihiro Nakamura <authornari@gmail.com>
+ * gc.c (id2ref): fix symbol test.
- * gc.c: free_slots is changed Singly linked list. clear
- free_slots before sweep.
+Sat Mar 4 01:08:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 9 07:46:17 2012 NARUSE, Yui <naruse@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>.
+ [ruby-core:07423]
- * gc.c: i686-linux needs to define _XOPEN_SOURCE 600 for posix_memalign.
+Fri Mar 3 17:59:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 9 04:24:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * eval.c (rb_clear_cache_by_class): clearing wrong cache.
- * gc.c (rb_objspace_free): global_List is allocated with xmalloc.
- patched by Sokolov Yura. https://github.com/ruby/ruby/pull/78
+Fri Mar 3 21:22:42 2006 Tanaka Akira <akr@m17n.org>
- * dln_find.c: remove useless replacement of free.
+ * lib/fileutils.rb (FileUtils.cp_r): implement :remove_destination
+ option.
- * ext/readline/readline.c (readline_attempted_completion_function):
- strings for readline must allocated with malloc.
+ * ext/extmk.rb: use :remove_destination to install extension libraries
+ to avoid SEGV. [ruby-dev:28417]
- * process.c (run_exec_dup2): use free; see also r20950.
+Fri Mar 3 14:41:04 2006 Minero Aoki <aamine@loveruby.net>
- * re.c (onig_new_with_source): use malloc for oniguruma.
+ * ext/dl/.cvsignore: ignore callback.h.
- * vm.c (ruby_vm_destruct): use free for VMs.
+ * ext/ripper/.cvsignore: ignore eventids2table.c.
- * vm.c (thread_free): use free for threads.
+ * ext/socket/.cvsignore: ignore constants.h.
-Mon Jan 9 04:24:59 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Mar 2 18:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * dln_find.c: remove useless replacement of free.
+ * eval.c (rb_thread_fd_writable): should not re-schedule output
+ from KILLED thread (must be error printing).
- * ext/readline/readline.c (filename_completion_proc_call):
- matches should use xfree.
+Thu Mar 2 09:12:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/readline/readline.c (username_completion_proc_call): ditto.
+ * array.c (rb_ary_flatten_bang): allow specifying recursion
+ level. [ruby-talk:182170]
-Mon Jan 9 01:12:35 2012 NARUSE, Yui <naruse@ruby-lang.org>
+ * array.c (rb_ary_flatten): ditto.
- * numeric.c (rb_enc_uint_char): raise RangeError when added codepoint
- is invalid. [Feature #5855] [Bug #5863] [Bug #5864]
+Thu Mar 2 08:02:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (rb_str_concat): ditto.
+ * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
+ Weil <weil at mail.berlios.de>.
- * string.c (rb_str_concat): set encoding as ASCII-8BIT when the string
- is US-ASCII and the argument is an integer greater than 127.
+Wed Mar 1 17:13:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * regenc.c (onigenc_mb2_code_to_mbclen): rearrange error code.
+ * eval.c (rb_call): use separate cache for fcall/vcall
+ invocation.
- * enc/euc_jp.c (code_to_mbclen): ditto.
+ * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
+ functions.
- * enc/shift_jis.c (code_to_mbclen): ditto.
+ * eval.c (rb_mod_local): a new method to specify newly added
+ visibility "local".
-Sun Jan 8 20:31:45 2012 Narihiro Nakamura <narihiro@netlab.jp>
+ * eval.c (search_method): search for local methods which are
+ visible only from the current class.
- * gc.c : consider header bytes which are used by malloc.
+ * class.c (rb_class_local_methods): a method to list local methods.
-Sun Jan 8 11:54:43 2012 Narihiro Nakamura <authornari@gmail.com>
+Thu Mar 2 17:54:45 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * gc.c (aligned_free): support MinGW. Patch by Hiroshi Shirosaki.
+ * gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
+ [ruby-core:7474]
-Sun Jan 8 11:43:05 2012 Narihiro Nakamura <authornari@gmail.com>
+Thu Mar 2 14:12:26 2006 Tanaka Akira <akr@m17n.org>
- * gc.c (slot_sweep): add a assertion instead of a debug print.
+ * 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]
-Sun Jan 8 01:18:19 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Thu Mar 2 12:55:16 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * test/-ext-/old_thread_select/test_old_thread_select.rb:
- avoid platform bug. [Bug #5858] [ruby-dev:45108]
+ * 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]
-Sun Jan 8 00:46:34 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Mar 1 00:15:51 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * gc.c: get rid of implicit narrowing conversion.
+ * 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]
-Sun Jan 8 00:10:10 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Feb 28 19:32:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: check posix_memalign(3) and memalign(3).
+ * object.c (Init_Object): add BasicObject class as a top level
+ BlankSlate class.
- * gc.c (aligned_malloc): use configure's result instead of
- _POSIX_C_SOURCE and _XOPEN_SOURCE because they can't be used
- to check availability at least on FreeBSD.
+Mon Feb 27 00:19:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jan 7 22:25:50 2012 Narihiro Nakamura <authornari@gmail.com>
+ * ruby.h (SYM2ID): should not cast to signed long.
+ [ruby-core:07414]
- * gc.c: use Bitmap Marking algorithm to avoid copy-on-write of
- memory pages. See [ruby-dev:45085] [Feature #5839]
- [ruby-core:41916].
+Fri Feb 24 20:21:38 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * include/ruby/ruby.h : FL_MARK rename to FL_RESERVED1.
+ * 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]
- * node.h : ditto.
+Fri Feb 24 12:10:07 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * debug.c : ditto.
+ * instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
+ It's for VC++8.
- * object.c (rb_obj_clone): FL_MARK move to a bitmap.
+Fri Feb 24 11:17:45 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * class.c (rb_singleton_class_clone): ditto.
+ * win32/win32.c (NtInitialize): need to set a handler for VC++8.
-Sat Jan 7 00:47:07 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Thu Feb 23 22:39:59 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * configure.in: always define CANONICALIZATION_FOR_MATHN.
- [ruby-dev:45100] [Bug #5852]
+ * bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
+ memory manager cannot handle large memory block properly.
+ ex: 10000.times { "" << "." * 529671; GC.start } # crash
+ [ruby-dev:28230]
-Fri Jan 6 23:11:20 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Thu Feb 23 13:23:03 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * include/ruby/version.h: RUBY_API_VERSION 2.0.0
+ * eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
-Fri Jan 6 12:24:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Feb 22 21:16:55 2006 Tanaka Akira <akr@m17n.org>
- * object.c (rb_inspect): raises Encoding::CompatibilityError if the
- result is incompatible with the default external encoding.
- [ruby-core:41931] [Bug #5848]
+ * lib/pathname.rb (Pathname#each_filename): use split_names properly.
-Thu Jan 5 15:26:15 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 22 16:24:05 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * win32/win32.c (check_valid_dir): strict checking of root.
- GetDriveType() succeeds with non root directory as the argument,
- even if MSDN says that the API needs the root directory.
- this patch fixes a failure of test/ruby/test_file_exhaustive.rb.
+ * test/webrick/test_cgi.rb: should support platforms which search
+ library path from the interpreter's path.
+ And, support test without install incidentally.
-Thu Jan 5 12:15:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Feb 22 14:21:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (rb_file_join): separator is appended by array length - 1
- times. patched by Benoit Daloze [ruby-core:41901] [Bug #5841]
+ * bignum.c (bignorm): x may not be a bignum. [ruby-dev:28367]
-Thu Jan 5 11:47:54 2012 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Feb 22 09:22:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/uri/common.rb (URI::Parser#initialize_regexp):
- use \A \z instead of ^ $. [Bug #5843]
+ * eval.c (proc_alloc): add proper check for creation of a lambda
+ without a block.
-Wed Jan 4 17:55:53 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Tue Feb 21 02:07:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * array.c (rb_ary_sample): add example for Array#sample
- based on patch from https://github.com/ruby/ruby/pull/74
+ * parse.y (f_arglist): should set command_start = Qtrue for
+ command body. [ruby-talk:180648]
-Wed Jan 4 14:24:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 20 22:30:17 2006 Tanaka Akira <akr@m17n.org>
- * string.c (str_nth_len): count ascii-only run at the end. this
- bug appears only when single-byte-optimization is disabled due
- to unknown coderange. [ruby-core:41896] [Bug #5836]
+ * mkconfig.rb: alias Config to RbConfig for compatibility.
-Wed Jan 4 11:32:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Feb 20 18:21:41 2006 Tanaka Akira <akr@m17n.org>
- * win32/win32.c (check_valid_dir): special case for a root directory.
- Reported by Masateru OKAMOTO at [Bug #5819].
+ * io.c (rb_io_reopen): flush before reopening a file.
+ reported by Mathieu Bouchard. [ruby-core:7396]
-Wed Jan 4 00:19:54 2012 Kouhei Sutou <kou@cozmixng.org>
+Mon Feb 20 17:29:50 2006 Tanaka Akira <akr@m17n.org>
- * lib/rexml/parsers/baseparser.rb: use private instead of _xxx
- method name. This is Ruby code not Python code.
- refs #5696
+ * mkconfig.rb: generate RbConfig instead of Config.
-Tue Jan 3 23:57:37 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * 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.
- * lib/rexml/parsers/baseparser.rb: rexml BaseParser uses
- instance_eval unnecessarily on listener add.
- patch from Charles Nutter. [Bug #5696] [ruby-core:41437]
+Mon Feb 20 13:46:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jan 3 20:44:13 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * lib/find.rb: should raise ENOENT if root entry does not exist,
+ without opening it. [ruby-dev:28345]
- * README: add comment for Git user. patch from Arun Agrawal.
- * README.ja: ditto.
+Mon Feb 20 12:27:53 2006 Kent Sibilev <ksruby@gmail.com>
-Tue Jan 3 15:58:22 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * lib/rational.rb (Integer::gcd): small typo fix.
+ [ruby-core:07395]
- * thread.c: changed documentation for "thread-local" variables.
- patch from Julien Ammous.
+Mon Feb 20 10:03:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jan 3 15:50:12 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * variable.c (rb_const_get_0): Object should have been the lowest
+ in const lookup precedence. [ruby-dev:28343]
- * process.c: Fix typo. patch from Aviv Ben-Yosef.
+Mon Feb 20 09:17:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jan 3 13:43:37 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/delegate.rb (Delegator): should not delegate "funcall".
- * tool/merger.rb: allow r0123 style revision number.
+Mon Feb 20 09:13:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jan 3 11:17:55 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler):
+ qualify the access for Config constant. [ruby-dev:28338]
- * tool/merger.rb (#version_up): version.h date should be Japanese
- locale date.
+ * lib/resolv.rb (Resolv::DNS::Resource::IN::A): qualify
+ ClassValue. [ruby-dev:28338]
-Mon Jan 2 22:08:00 2012 Akinori MUSHA <knu@iDaemons.org>
+Mon Feb 20 01:05:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * tool/file2lastrev.rb (VCS::detect): Add support for Subversion
- 1.7 which adopted a whole new working directory structure.
+ * lib/rational.rb (Integer::gcd): replaced by gcd4 in
+ [ruby-core:07390]. [ruby-core:07377]
- * tool/file2lastrev.rb (VCS::detect): Simply use .each instead of
- .sort.reverse_each which looks too arbitrary. If you want SVN
- to be tried first, then you just have to register it first as it
- is right now.
+Mon Feb 20 00:57:02 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Mon Jan 2 20:53:36 2012 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
+ [ruby-dev:28339]
- * lib/securerandom.rb (random_bytes): use IO#read instead of
- IO#readpartial to make the intent more clear.
+Mon Feb 20 00:13:49 2006 Tanaka Akira <akr@m17n.org>
-Mon Jan 2 15:26:39 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/open-uri.rb: add :ssl_verify_mode option.
+ suggested by Will Glynn.
- * test/ruby/test_object.rb (test_send_with_block): add a normal case.
+ * lib/open-uri.rb: add :ssl_ca_cert option.
-Mon Jan 2 15:18:54 2012 Kazuki Tsujimoto <kazuki@callcc.net>
+Sun Feb 19 04:46:29 2006 Guy Decoux <ts@moulon.inra.fr>
- * test/ruby/test_object.rb (test_send_with_block): moved from
- bootstraptest/test_flow.rb.
+ * eval.c: initial value for block_unique must be 1.
+ [ruby-talk:180420]
-Mon Jan 2 15:10:11 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Sat Feb 18 23:58:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/test/unit/parallel.rb: use pack("m0") instead of
- pack("m").gsub("\n","").
- * lib/test/unit.rb (Test::Unit::Runner::Worker#run): ditto.
+ * lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
+ only when caller() level size is one. [ruby-core:07389]
-Mon Jan 2 15:05:09 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
+ [ruby-core:07389]
- * lib/test/unit.rb (Test::Unit::Runner::Worker#run): use
- File.basename with suffix instead of gsub.
+ * sample/rtags.rb: ditto.
-Mon Jan 2 14:55:28 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Sat Feb 18 21:16:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): find may
- return nil and nil can not dup.
+ * eval.c (rb_obj_instance_eval): RDoc description updated. a
+ patch from Ozgur Murat Homurlu <ozgurmurath at gmail.com>.
+ [ruby-core:07381]
-Sun Jan 1 12:23:10 2012 Akinori MUSHA <knu@iDaemons.org>
+Sat Feb 18 01:01:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag
- that only causes warnings with no real effect. [Bug #5637]
+ * 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.
-Sat Dec 31 06:28:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Sat Feb 18 00:22:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread.c (rb_barrier_waiting): save the number of waiting threads
- in RBASIC()->flags. [ruby-dev:45002] [Bug #5768]
+ * lib/tracer.rb: merged a minor clarification patch from Daniel
+ Berger <Daniel.Berger at qwest.com>. [ruby-core:07376]
- * thread.c (rb_barrier_wait): increment and decrement around
- rb_mutex_lock, and use rb_barrier_waiting().
+Fri Feb 17 17:30:20 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread.c (rb_barrier_release): use rb_barrier_waiting().
+ * eval.c (ev_const_get): simplified using rb_const_get_fallback().
- * thread.c (rb_barrier_destroy): ditto.
+ * eval.c (ev_const_defined): adopt to ev_const_get() using
+ rb_const_defined_fallback().
-Mon Dec 26 17:20:10 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * variable.c (rb_const_get_fallback): new function to implement
+ constant search.
- * vm.c (vm_exec): add guard to prevent optimization for LLVM clang.
+ * variable.c (rb_const_defined_fallback): new function to
+ implement constant definition check.
-Fri Dec 30 17:01:12 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * 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.
- * vm_eval.c (rb_f_send): fix obj.send() documentation issue.
- [Bug #5125] [ruby-core:38633]
+ * variable.c (rb_const_defined_0): ditto.
-Thu Dec 29 22:36:16 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Fri Feb 17 11:20:53 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/test/unit.rb (Test::Unit::Runner::Worker#_run_parallels): fix
- premature exit when all workers' status are :ready or :prepare.
- [ruby-dev:45061] [Bug #5822]
+ * util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
-Thu Dec 29 01:51:13 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
+ [ruby-talk:180024]
- * include/ruby/ruby.h: fix #error pragma. LLP64 platform is supported.
+ * pack.c (pack_unpack): fixed integer overflow on template "w".
+ [ruby-talk:180126]
- * include/ruby/st.h: ditto.
+Fri Feb 17 09:39:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Dec 28 11:22:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_thread_wait_for): sleep should always sleep for
+ specified amount of time. [ruby-talk:180067]
- * lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
- instead of typoed regexp. [ruby-core:41829] [Bug #5817]
+Wed Feb 15 16:52:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Dec 28 02:08:04 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
+ argument list. [ruby-core:07366]
- * vm_insnhelper.c (unknown_keyword_error): add GC guard to prevent
- intermediate object from GC.
+ * parse.y (arg): avoid unnecessary extra argument.
+ [ruby-core:07366]
-Tue Dec 27 22:34:54 2011 Shota Fukumori <sorah@tubusu.net>
+ * eval.c (rb_eval): honor visibility on OP_ASGN1 and
+ OP_ASGN2. [ruby-core:07366]
- * lib/test/unit.rb (Worker#close): "closing IO if IO is closed"
- should be "closing IO if IO isn't closed"
+Wed Feb 15 15:20:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Dec 27 22:04:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (error_line): remove void control path. [ruby-dev:28335]
- * st.c (st_update): new function to lookup the given key and
- update the value. [ruby-dev:44998]
+Wed Feb 15 10:09:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Dec 27 21:17:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (yield_under_i): should not pass self as an argument to
+ the block for instance_eval. [ruby-core:07364]
- * node.h (rb_args_info): change pre_args_num and post_args_num as
- int, to match with rb_iseq_t.
+Wed Feb 15 09:20:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (new_args_gen): check overflow.
+ * eval.c (rb_obj_instance_eval): should be no singleton classes for
+ true, false, and nil. [ruby-dev:28186]
-Mon Dec 26 22:38:35 2011 Yusuke Endoh <mame@tsg.ne.jp>
+Tue Feb 14 20:26:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_insnhelper.c (unknown_keyword_error): make it kind a error
- message when unknown keyword is given. It require more work.
- See [ruby-core:40518] and [ruby-core:40541] in detail.
+ * enumerator.c (enumerator_each): return self if no block is
+ given. [yarv-dev:882]
-Mon Dec 26 22:31:07 2011 Yusuke Endoh <mame@tsg.ne.jp>
+Tue Feb 14 18:48:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments),
- iseq.c (rb_iseq_parameters), vm_insnhelper.c
- (vm_callee_setup_arg_complex): support Method#parameters for keyword
- arguments. The provisional spec is what Benoit Daloze proposed.
- [ruby-core:40541]
+ * eval.c (DMETHOD_P): accessing wrong frame. [ruby-dev:28181]
- * test/ruby/test_keyword.rb: add a test for above.
+ * eval.c (proc_invoke): preserve FRAME_DMETH flag.
-Mon Dec 26 22:15:27 2011 Yusuke Endoh <mame@tsg.ne.jp>
+Tue Feb 14 15:15:22 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments,
- iseq_compile_each), vm_insnhelper.c (vm_callee_setup_arg_complex):
- implement keyword arguments. See [ruby-core:40290]
- The feature is promised to be included in 2.0, but the detail spec
- is still under discussion; this commit is a springboard for further
- discussion. Please try it and give us feedback.
- This commit includes fixes for some problems reported by Benoit
- Daloze <eregontp AT gmail.com> [ruby-core:40518] and Marc-Andre
- Lafortune <ruby-core-mailing-list AT marc-andre.ca>
- [ruby-core:41772].
+ * ext/zlib/zlib.c: suppress warning on test/zlib. [ruby-dev:28323]
- * iseq.c (iseq_free, prepare_iseq_build): bookkeeping.
+Tue Feb 14 13:47:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/ruby/test_keyword.rb: add tests for keyword arguments.
+ * win32/win32.c (rb_w32_utime): drop read-only attribute before
+ changing file time.
- * test/ripper/dummyparser.rb (class DummyParser): temporal fix for
- ripper test.
+Tue Feb 14 13:38:01 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Dec 26 22:00:17 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * win32/Makefile.sub (config.h): should define HAVE_LONG_LONG with
+ VC++8.
- * node.h, node.c, parse.y: implement a parser part for keyword
- arguments.
- This is a preparation for keyword argument (see [ruby-core:40290]).
+Tue Feb 14 11:42:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * gc.c (gc_mark_children): bookkeeping.
+ * time.c (search_time_t): support non 32bit time_t environments.
-Mon Dec 26 21:03:18 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
- * node.h, parse.y (new_args_gen), compile.c (iseq_set_arguments): use
- struct rb_args_info instead of NODEs.
- This is a preparation for keyword argument (see [ruby-core:40290]).
+ * win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
- * node.c (dump_node), gc.c (gc_mark_children, obj_free): bookkeeping.
+Mon Feb 13 18:01:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Dec 26 20:59:51 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * eval.c (copy_node_scope): remove duplicated semicolons at end.
+ a patch from KIMURA Koichi <kimura.koichi at canon.co.jp>.
+ [ruby-dev:28332]
- * node.h, parse.y (lambda, f_larglist): remove NEW_LAMBDA hack.
- This is a preparation for keyword argument (see [ruby-core:40290]).
+ * eval.c (VIS_MODE): remove unnecessary argument.
+ [ruby-dev:28332]
-Mon Dec 26 22:01:19 2011 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+Mon Feb 13 13:49:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_sys_fail_path): move the definition.
- Move above for using it in set_binary_mode_with_seek_cur().
+ * parse.y (parser_parse_string): mention "regexp" in a error
+ message. a patch from Mauricio Fernandez <mfp at acm.org>
+ [ruby-core:07340]
- * io.c (set_binary_mode_with_seek_cur): fix improper seek cursor.
- Seeking file cursor with setting binary mode has possibility to
- cause infinite loop. Fixed the bug and refined error handling.
- Introduced at r34043.
+Mon Feb 13 00:01:32 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
- And cleanups as below.
- Remove unnecessary parentheses of `fptr`.
- Use return value of setmode().
+ * oniguruma.h: Version 4.0.1
- * test/ruby/test_io_m17n.rb
- (TestIO_M17N#test_seek_with_setting_binmode): add a test for above.
- [ruby-core:41671] [Bug #5714]
+ * regparse.c (onig_free_shared_cclass_table): fix memory leaks.
-Mon Dec 26 17:01:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regcomp.c (optimize_node_left): change from IS_POSIXLINE() to IS_MULTILINE().
- * common.mk (LIBRUBY_A): depends on main.o since r33774.
- [ruby-core:41786] [Bug #5796]
+ * regint.h: rename ANCHOR_ANYCHAR_STAR_PL to ANCHOR_ANYCHAR_STAR_ML.
-Mon Dec 26 13:07:08 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regparse.h: ditto.
- * test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
- accept the block argument.
+ * regexec.c: ditto.
-Mon Dec 26 13:06:52 2011 Shota Fukumori <sorah@tubusu.net>
+Sat Feb 11 21:57:29 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * lib/test/unit.rb: Avoid zombie processes on "--separate" option
- added at r34121.
+ * ext/win32ole/win32ole.c: add WIN32OLE.create_guid.
-Mon Dec 26 04:01:23 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/win32ole/tests/testWIN32OLE.rb: ditto.
- * ext/openssl/ossl_cipher.c: Update and complete documentation.
+Sat Feb 11 01:57:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Dec 25 23:16:11 2011 Shota Fukumori <sorah@tubusu.net>
+ * eval.c (rb_f_autoload): check if ruby_cbase is nil (during
+ instance_eval for objects cannot have singleton classes,
+ e.g. fixnums and symbols). [ruby-dev:28178]
- * test/testunit/test_parallel.rb (test_separate): Test for "--separate"
- option (r34121)
+Fri Feb 10 12:31:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Dec 25 22:39:49 2011 Shota Fukumori <sorah@tubusu.net>
+ * eval.c (rb_eval): should support NODE_ZSUPER in NODE_ITER.
+ [ruby-dev:28326]
- * lib/test/unit.rb (_run_parallel):
- New option "--separate" for test/unit; when running tests with this
- option, a job process will be restarted after one test file has done.
- This means all test files will run with separated process.
+ * eval.c (ZSUPER_ARGS): support macro.
- * lib/test/unit/parallel.rb: Fix for above. Now parallel.rb puts
- "ready!" for first ready, "ready" for afters.
+Wed Feb 8 10:26:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Dec 25 00:02:15 2011 Luis Lavena <luislavena@gmail.com>
+ * gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
+ invoking finalizers.
- * configure.in: change --with-ntver to --with-winnt-ver to be more
- descriptive in the context. [ruby-core:41794]
+ * gc.c (rb_gc_finalize_deferred): ditto.
-Sat Dec 24 23:25:15 2011 Luis Lavena <luislavena@gmail.com>
+Tue Feb 7 23:03:13 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * configure.in: add --with-ntver option to match win32/configure.bat
- functionality. Set 0x0501 as default. [ruby-core:35010]
- [ruby-core:35035]
+ * ext/zlib/zlib.c: should not access ruby objects in finalizer.
+ [ruby-dev:28286]
-Sat Dec 24 12:38:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 7 18:42:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * proc.c (proc_call): get rid of optimization-out by clang.
+ * io.c (rb_write_error2): use fwrite(3) if rb_stderr is not
+ updated or is already freed. [ruby-dev:28313]
- * proc.c (rb_proc_call, rb_proc_call_with_block): ditto.
+Mon Feb 6 16:02:51 2006 WATANABE Hirofumi <eban@ruby-lang.org>
-Sat Dec 24 10:56:32 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
+ In such situation, flock() should return 0.
- * ext/readline/readline.c (readline_readline): check if outstream
- is closed to get rid of a bug of readline 6. [ruby-dev:45043]
- [Bug #5803]
+Mon Feb 6 14:36:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Dec 24 06:59:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (error_line): include the class name of a surrounding
+ method in error position description.
- * test/readline/test_readline.rb (test_line_buffer__point): use
- lambda not to exit entire method by "return". or "next" for
- proc. [ruby-dev:45042] [Bug #5802]
+Mon Feb 6 00:14:57 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Dec 24 01:20:39 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * enum.c (enum_find_index): a new method Enumerable#find_index.
+ [ruby-talk:178495]
- * vm_eval.c (send_internal): PASS_PASSED_BLOCK_TH must be placed
- just before calling rb_call0.
+Sun Feb 5 23:29:31 2006 Tanaka Akira <akr@m17n.org>
- * bootstraptest/test_flow.rb: add a test for above.
+ * ruby.h (struct RStruct): embed 3 or less elements structs.
+ (RSTRUCT_LEN): defined for accessing struct members.
+ (RSTRUCT_PTR): ditto.
-Sat Dec 24 00:55:16 2011 Tanaka Akira <akr@fsij.org>
+ * struct.c: use RSTRUCT_LEN and RSTRUCT_PTR.
+ (struct_alloc): allocate small structs in embedded format.
+ (rb_struct_init_copy): ditto.
- * lib/tempfile.rb (Tempfile#initialize): warn if a block is given.
+ * gc.c (gc_mark_children): use RSTRUCT_LEN and RSTRUCT_PTR.
+ (obj_free): ditto.
-Fri Dec 23 16:14:30 2011 TAKAO Kouji <kouji@takao7.net>
+ * marshal.c (w_object): use RSTRUCT_LEN and RSTRUCT_PTR.
- * ext/readline/readline.c (readline_attempted_completion_function):
- in Readline module with GNU Readline 6 case, Readline module
- resets completion_append_character to " ", after it executes
- completion. So, Readline module stores
- completion_append_character, and Readline module always sets it
- after Readline module executes completion. [ruby-dev:43456]
- [Feature #4635]
+Sun Feb 5 21:01:49 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Fri Dec 23 15:59:05 2011 TAKAO Kouji <kouji@takao7.net>
+ * 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]
- * ext/readline/readline.c (Init_readline): libedit check
- rl_getc_function only when rl_initialize() is called, and
- using_history() call rl_initialize(). This assignment should be
- placed before using_history(). [ruby-core:40641] [Bug #5539]
+Sun Feb 5 18:49:00 2006 Minero Aoki <aamine@loveruby.net>
-Fri Dec 23 10:14:47 2011 Tanaka Akira <akr@fsij.org>
+ * lib/net/http.rb (add_field, get_fields): keep 1.8.2
+ compatibility. This patch is contributed by Rob Pitt.
- * test/thread/test_queue.rb (test_thr_kill): show the number of loop
- run when the test failed.
+Sun Feb 5 16:33:50 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Fri Dec 23 09:23:48 2011 Tanaka Akira <akr@fsij.org>
+ * lib/mkmf.rb (create_makefile): Kernel#sub! was removed on HEAD.
- * test/test_pty.rb (test_pty_check_default): call PTY.check until
- "cat" command is finished.
+Sun Feb 5 14:26:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Fri Dec 23 06:03:00 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * lib/pstore.rb: should return default value if name is not found.
+ [ruby-core:7304]
- * common.mk: add "check succeeded" message.
+ * lib/pstore.rb: should raise PStore::Error if not in transaction.
- * README, README.ja: follow above change.
+Sat Feb 4 22:51:43 2006 Tanaka Akira <akr@m17n.org>
-Fri Dec 23 06:00:39 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * eval.c: apply the FreeBSD getcontext/setcontext workaround
+ only before FreeBSD 7-CURRENT.
- * ext/bigdecimal/bigdecimal.h: add satisfy cc-mode comment.
- * util.c: ditto.
+Sat Feb 4 21:10:06 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Dec 23 00:08:25 2011 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
+ In such situation, flock() should return 0.
- * test/test_pty.rb (test_pty_check_default): "cat" may not terminated
- in the 0.1 second.
+Sat Feb 4 15:52:56 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Dec 22 23:37:25 2011 Tanaka Akira <akr@fsij.org>
+ * numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
+ sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
- * test/ruby/test_thread.rb (test_condvar_timed_wait): don't test the
- maximum sleep time. Ruby is not a real-time system.
+Sat Feb 4 15:02:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Dec 22 22:37:45 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * oniguruma.h: merge Oniguruma 4.0.0 [ruby-dev:28290]
- * thread_pthread.c (ping_signal_thread_list): remove return value.
- * thread_pthread.c (check_signal_thread_list): add a new function to
- check if signal thread list is empty.
- * thread_pthread.c (thread_timer): check signal thread list after
- timer_thread_function(). main thread might be added into signal thread
- list during timer_thread_function().
+Fri Feb 3 19:25:53 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Dec 22 00:40:24 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * ruby.h: fixed prototype.
- * ext/bigdecimal/bigdecimal.c (VpMult, VpCtoV, VpSqrt): remove assigned
- but unused variables.
+ * ext/syck/rubyext.c: defined symbol ID as global variable as others.
-Wed Dec 21 18:28:22 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Feb 3 17:57:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * common.mk (newline.c, miniprelude.c): revert r33949 because the change
- broke mswin build, and the changer said no reason about the change.
- [ruby-dev:45016] [Bug #5783]
+ * eval.c: unify ruby_class (for method definition) and ruby_cbase
+ (for constant reference).
-Wed Dec 21 12:35:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Feb 3 15:02:10 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_s_allocate): follow
- Allocation Framework. [Bug #5775]
+ * 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 + '"'))
-Wed Dec 21 02:25:36 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Feb 3 00:01:31 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/psych/emitter.c: fixing clang warnings. Thanks Joey!
+ * 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
+ buffer overrun. (ex: YAML.dump("." * 12288))
-Wed Dec 21 01:06:00 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Thu Feb 2 17:13:01 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/bigdecimal/README: Update redmine.ruby-lang.org to bugs.ruby-lang.org
- * ext/socket/ancdata.c: ditto
- * test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb: ditto
- * test/syck/test_yaml.rb: ditto
- * doc/ChangeLog-1.9.3: ditto
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#get_tk): added
+ support of :'string' style Symbol.
-Tue Dec 20 23:50:12 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Thu Feb 2 16:01:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * PStore content update perf optimization. Patch by Masaki Matsushita.
- See #5248.
+ * eval.c (rb_call0): use TMP_ALLOC() instead of allocating
+ a temporary array object.
- * lib/pstore.rb (save_data):
+ * eval.c (eval): need not to protect $SAFE value.
+ [ruby-core:07177]
- * Delete inadequate Marshal check.
+ * error.c (Init_Exception): change NameError to direct subclass of
+ Exception so that default rescue do not handle it silently.
- * Deferred file truncation: when writing the new content, truncate
- the saved file to the data size after writing the data, instead of
- truncating whole bytes before writing data.
+Thu Feb 2 14:45:53 2006 Ville Mattila <ville.mattila@stonesoft.com>
- * Deferred MD5 calculation: when comparing MD5 hash to check the
- content modification, calculate MD5 hash of new data iif the
- content length is differ from the old one.
+ * configure.in: The isinf is not recognized by autoconf
+ library guesser on solaris 10. [ruby-core:7138]
- * Compare content size with String#bytesize instead of String#size.
+Wed Feb 1 22:01:47 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Dec 20 21:00:30 2011 Tadayoshi Funaba <tadf@dotrb.org>
+ * configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
+ where they are supported. modifying environ variable seems to
+ segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
- * ext/date/date_core.c: uses to_integer instead.
- * test/date/test_switch_hitter.rb: added a test.
+ * ruby.c (set_arg0): if use setenv(3), environ space cannot be used
+ for altering argv[0].
-Tue Dec 20 15:04:18 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Tue Jan 31 14:46:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * Make sure to clear $! when ignoring an exception
+ * struct.c (rb_struct_select): update RDoc description.
+ [ruby-core:7254]
- * ext/openssl/ossl.c (ossl_pem_passwd_cb0, ossl_verify_cb):
- pem_passwd_cb and verify_cb ignores the exception raised in a
- callback proc so it should clear $! for subsequent execution.
+Tue Jan 31 11:58:51 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- That's said, both subsequent processes for pem_passwd_cb and
- verify_cb raises another exception before leaking $! to Ruby world.
- We cannot test this fix in Ruby land.
+ * ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
- * test/openssl/test_pkey_rsa.rb
- (test_read_private_key_pem_pw_exception): Test for pem_passwd_cb +
- exception.
+ * ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
+ last commit. Now it will return a proper object.
-Tue Dec 20 11:49:13 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 31 08:07:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/date/test_date_base.rb (test_jd): tests for
- [ruby-dev:45008].
+ * numeric.c (int_upto): return an enumerator if no block is
+ attached to the method.
-Tue Dec 20 10:20:48 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * numeric.c (int_downto): ditto.
- * ext/date/date_core.c (wholenum): fix the type of the return value.
+ * numeric.c (int_dotimes): ditto.
-Tue Dec 20 05:03:24 2011 Eric Hodel <drbrain@segment7.net>
+ * enum.c (enum_first): new method Enumerable#first to take first n
+ elements from an enumerable.
- * README.ja: Update redmine.ruby-lang.org to bugs.ruby-lang.org
- * README: ditto
- * common.mk: ditto
- * man/erb.1: ditto
- * man/irb.1: ditto
- * man/ri.1: ditto
- * man/ruby.1: ditto
- * sparc.c: ditto
- * tool/install-sh: ditto
+ * enum.c (enum_group_by): new method Enumerable#group_by that
+ groups enumerable values according to their block values.
-Tue Dec 20 02:15:18 2011 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Jan 31 00:08:22 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/date/date_core.c: [ruby-dev:45008].
+ * ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
+ ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
-Sun Dec 18 18:52:37 2011 Naohisa Goto <ngotogenome@gmail.com>
+Sat Jan 28 07:49:30 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * vm.c (vm_define_method): improve guard of iseq from GC. Fix
- failure or segmentation fault in test_singleton_method(TestGc)
- on sparc Solaris10 compiled with Oracle Solaris Studio 12.2.
- [Bug #5762] [ruby-dev:45000] [Bug #4178]
+ * 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]
-Sun Dec 18 14:34:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 26 15:55:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): does not follow
- allocation framework right now. [ruby-core:41710] [Bug #5773]
+ * ext/socket/socket.c: turn on do_not_reverse_lookup by default.
-Sun Dec 18 12:42:48 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Jan 25 22:29:04 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych/visitors/to_ruby.rb: BigDecimals can be restored
- from YAML.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: BigDecimals can be dumped
- to YAML.
- * test/psych/test_numeric.rb: tests for BigDecimal serialization
+ * configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
+ system routine if provided. fixed: [ruby-core:07195]
-Sun Dec 18 12:03:13 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Jan 22 23:27:13 2006 Go Noguchi <gonoguti@yahoo.co.jp>
- * ext/psych/lib/psych/scalar_scanner.rb: Strings that look like dates
- should be treated as strings and not dates.
+ * lib/test/unit/autorunner.rb (process_args): ignore arguments after
+ '--' so that test scripts can handle them. fixed: [ruby-dev:28258]
- * test/psych/test_scalar_scanner.rb: corresponding tests.
+Sun Jan 22 22:09:52 2006 Tanaka Akira <akr@m17n.org>
-Sun Dec 18 09:43:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * eval.c (POST_GETCONTEXT): define separately from PRE_GETCONTEXT on
+ IA64 to avoid reusing variable address.
- * test/thread/test_queue.rb (test_thr_kill): extend timeout.
- this test takes a long time at slow machine.
+Sun Jan 22 20:03:35 2006 Tanaka Akira <akr@m17n.org>
-Sun Dec 18 09:36:51 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * eval.c (ruby_setjmp): define PRE_GETCONTEXT and POST_GETCONTEXT
+ instead of FUNCTION_CALL_MAY_RETURN_TWICE.
+ define PRE_GETCONTEXT to clear carry flag for workaround of
+ FreeBSD/i386 getcontext/setcontext bug.
+ [ruby-dev:28263]
- * test/ruby/envutil.rb (invoke_ruby): remove :timeout option before
- pass it to Kernel#spawn.
+Thu Jan 19 22:19:18 2006 Minero Aoki <aamine@loveruby.net>
-Fri Dec 16 17:18:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/fileutils.rb (mv): should remove file after copying.
+ [ruby-dev:28223]
- * README, README.ja: 'make check' is preferable to 'make test'.
+Wed Jan 18 23:37:06 2006 Tanaka Akira <akr@m17n.org>
-Thu Dec 15 23:16:13 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
+ if enable-shared.
+ (ruby_setjmp): call FUNCTION_CALL_MAY_RETURN_TWICE after getcontext
+ too.
+ reported by Pav Lucistnik and Marius Strobl.
+ http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
- * error.c (builtin_type_name): don't return pointer to the buffer of
- temporary String object.
+Tue Jan 17 23:59:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Dec 15 17:56:58 2011 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]
- * io.c (argf_type): make typed data.
+ * eval.c (rb_mod_method_defined): ditto.
-Thu Dec 15 17:40:28 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 17 11:31:47 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * error.c (rb_check_type): fix typo.
+ * win32/setup.mak (MAKE): workaround for nmake 8.
-Thu Dec 15 14:48:35 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jan 17 11:06:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/strscan/strscan.c: use typed data with
- onig_region_memsize().
+ * win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
-Thu Dec 15 14:33:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jan 16 10:13:38 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * error.c (rb_check_typeddata): refine error message with
- including expected struct name.
+ * 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]
-Thu Dec 15 13:15:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jan 14 03:38:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * regcomp.c (onig_region_memsize): implemented for memsize_of().
+ * file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
+ sizeof(void*).
- * ext/objspace/objspace.c (memsize_of): use it.
+Fri Jan 13 19:26:15 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Dec 15 10:44:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc/diagram.rb:
+ - properly quote bare element attributes
+ - terminates dangling elements (e.g. <img>, <br>, <link>, etc)
+ - converts "CVS" to the more HTML-friendly acronym element
+ - adds missing type attributes to style elements
- * array.c (rb_ary_reject_bang, rb_ary_delete_if): update rdoc.
- documentation from Thomas Leitner <t_leitner AT gmx.at> in
- [ruby-core:41616]. [Bug #5752]
+ based on Paul Duncan's patch <pabs@pablotron.org> [ruby-core:7028]
-Thu Dec 15 10:10:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc/generators/html_generator.rb: ditto.
+ * lib/rdoc/generators/template/html/hefss.rb: ditto.
+ * lib/rdoc/generators/template/html/html.rb: ditto.
+ * lib/rdoc/generators/template/html/kilmer.rb: ditto.
- * test/ruby/test_require.rb (test_race_exception): get rid of
- not-guaranteed timing issue. [ruby-core:41655] [Bug #5754]
+Thu Jan 12 11:53:08 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Dec 14 21:58:42 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/tkballoonhelp.rb: [bug fix] couldn't add to a widget
+ which is constructed with TkComposite module.
+ [new feature] support 'command' option which is called just before
+ popping up the balloon help.
- * test/ruby/test_io_m17n.rb
- (TestIO_M17N#test_{read_with_binmode_and_get[cs]}): only for Windows.
+Wed Jan 11 00:12:29 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Wed Dec 14 19:57:23 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
+ change <%='s behavior.
- * common.mk,Makefile.in,win32/Makefile.sub (ECHO1): move platform
- specific hack from common.mk to Makefile.in (and win32/Makefile.sub).
- [Bug #5711]
+Tue Jan 10 19:42:33 2006 Tanaka Akira <akr@m17n.org>
- * lib/mkmf.rb: we can generate Makefile as we like.
+ * gc.c (garbage_collect): mark ruby_current_node.
+ if an exception is raised in a finalizer written in C called by
+ rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
+ collected ruby_current_node and mark_source_filename may corrupt
+ memory.
-Wed Dec 14 19:22:33 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jan 10 13:30:34 2006 akira yamada <akira@ruby-lang.org>
- * win32/win32.c, include/ruby/win32.h (rb_w32_fd_is_text): new function.
+ * ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
+ !ruby/object:Bignum syntax 1.8.3 dumped. [ruby-core:6159]
- * win32/win32.c (init_stdhandle): set default mode of stdin as binmode.
+Tue Jan 10 12:47:41 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * io.c (set_binary_mode_with_seek_cur): new function to replace
- SET_BINARY_MODE_WITH_SEEK_CUR macro. now returns previous mode of the
- fd and take care of LF in rbuf.
+ * lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
+ ruby 1.8.3/1.8.4. [ruby-core:6115]
- * io.c (do_writeconv): set text mode when needed.
+ * lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
+ be dumped properly. [ruby-core:7047]
- * io.c (io_read): need to change the mode of the IO to binmode
- temporally when the length for IO#read, because IO#read with length
- must behave so.
+Tue Jan 10 12:00:48 2006 Aaron Schrab <aaron @nospam@ schrab.com>
- * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{read_with_length,
- read_with_length_binmode,get[cs]_and_read_with_binmode,
- read_with_binmode_and_get[cs],read_write_with_binmode}): tests for
- above changes.
+ * lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
+ Symbols broken. [ruby-Bugs:2535]
- all patches are written by Hiroshi Shirosaki. [ruby-core:41496]
- [Feature #5714]
+Tue Jan 10 07:26:52 2006 Tanaka Akira <akr@m17n.org>
-Wed Dec 14 15:28:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.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=.
- * transcode.c (str_encode): about the extension of :fallback
- option since 1.9.3.
+Mon Jan 9 19:58:56 2006 arton <artonx@yahoo.co.jp>
-Wed Dec 14 12:19:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
+ http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
- * load.c (load_unlock): release loading barrier and then remove it
- from loading_table if it is not in-use. [Bug #5754]
+Mon Jan 9 14:25:00 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * thread.c (rb_barrier_release, rb_barrier_destroy): return
- whether any other threads are waiting on it.
+ * win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
+ (VisualC++6) so use -O2b2xg- if $(MSC_VER) < 1400. [ruby-core:7040]
-Wed Dec 14 11:23:45 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jan 9 14:25:00 2006 Kero van Gelder <rubyforge @nospam@ kero.tmfweb.nl>
- * thread_pthread.c (ubf_select): call rb_thread_wakeup_timer_thread()
- only when it is not timer_thread. [Bug #5757] [ruby-dev:44985]
- patched by Tomoyuki Chikanaga.
+ * lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
-Wed Dec 14 10:20:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jan 8 14:15:27 2006 Tanaka Akira <akr@m17n.org>
- * load.c (load_lock): delete the loading barrier if it has been
- destroyed.
+ * 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
- * thread.c (rb_barrier_wait): return nil for recursive lock
- instead of false, to distinguish it from destroyed barrier.
+Sat Jan 7 15:40:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Dec 14 01:24:55 2011 okkez <okkez000@gmail.com>
+ * parse.y (singleton): get rid of segfault on syntax error.
+ fixed: [ruby-core:07070]
- * thread_pthread.c (rb_thread_create_timer_thread): fix memory
- leak. [ruby-dev:44904] [Bug #5688]
+Sat Jan 7 06:24:18 2006 Tanaka Akira <akr@m17n.org>
-Wed Dec 14 00:01:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.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
- * parse.y (primary): point method name line. [ruby-core:40936]
- [Bug #5614]
+Fri Jan 6 02:20:18 2006 Tanaka Akira <akr@m17n.org>
-Tue Dec 13 23:43:48 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * configure.in: don't force getcontext on IA64.
- * error.c (name_err_mesg_to_str): clear rb_thread_t::errinfo when
- ignore exception under rb_protect(). [ruby-core:41612] [Bug #5755]
+ * 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]
- * test/ruby/test_exception.rb (test_exception_in_name_error_to_str):
- add a corresponding test.
+Sun Jan 1 15:28:46 2006 Tanaka Akira <akr@m17n.org>
-Tue Dec 13 16:13:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.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.
- * load.c (load_unlock): all threads requiring one file should
- share same loading barrier, so it must be kept alive while those
- are waiting on it. [ruby-core:41618] [Bug #5754]
+Sun Jan 1 14:42:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Dec 13 07:30:14 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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]
- * lib/webrick/httpresponse.rb (setup_header): 1xx responses
- are allowed to have Keep-Alive connections.
+ * win32/dir.h: ditto. (stores `loc' instead of `bitpos')
- * test/webrick/test_httpresponse.rb: corresponding test.
+ * test/ruby/test_dir.rb: added.
-Tue Dec 13 07:13:28 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Dec 31 22:57:00 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/webrick/httpresponse.rb (setup_header): 204 and 304 responses
- are allowed to have a Keep-Alive connection. [ruby-core:41581]
+ * eval.c (rb_thread_save_context): should not recycle scope object used
+ in a thread. fixed: [ruby-dev:28177]
- * test/webrick/test_httpresponse.rb: corresponding test.
+Sat Dec 31 19:50:38 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Dec 13 06:29:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/rubyext.c: attribute name was truncated with Rev1.64.
- * parse.y (parser_magic_comment): should pass the proper value.
- [ruby-dev:44984][Bug #5753]
+Sat Dec 31 11:53:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Dec 13 05:50:07 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/generator.rb: (Generator#initialize): should kill @loop_thread
+ before starting new thread. (occurs when called via Generator#rewind)
+ [ruby-dev:28184]
- * vm_insnhelper.c (vm_yield_setup_block_args): splat single
- argument if optional arguments are defined not only mandatory or
- post arguments. [ruby-core:41557] [Bug #5730]
+Fri Dec 30 18:22:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Dec 12 22:35:39 2011 Shugo Maeda <shugo@ruby-lang.org>
+ * gc.c (garbage_collect): mark objects referred from aborting threads.
+ [ruby-dev:28190]
- * parse.y (stmt_or_begin): changed the error message for BEGIN not
- at toplevel. [ruby-dev:44963] [Bug #5738]
+ * win32/Makefile.sub: VC++8 support.
-Mon Dec 12 17:29:01 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Dec 30 15:17:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * README: Fixed SupportedPlatforms URL in the README.
- patched by eMxyzptlk. https://github.com/ruby/ruby/pull/62
+ * lib/generator.rb (Generator#initialize): ensured to stop @loop_thread.
+ Mr. Tanaka pointed out one Thread.pass is not enough. [ruby-dev:28185]
-Mon Dec 12 17:26:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 30 12:20:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * load.c (rb_feature_p): lazy assigned load_path searched in
- loading_table were not expanded, but all features, pushed to
- loading table, are expanded. a patch by Yura Sokolov
- <funny.falcon AT gmail.com> in [ruby-core:41545]. [Bug #5727]
+ * lib/generator.rb (Generator#initialize): fixed dead lock. this occurred
+ when end? was called before @loop_thread was stopped. [ruby-core:7029]
-Mon Dec 12 15:41:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 30 01:04:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/stringio/stringio.c (strio_truncate): fix typo. patched by
- Nick Howard <ndh AT baroquebobcat.com>.
- https://github.com/ruby/ruby/pull/65
+ * lib/generator.rb: should work with another thread. (more robust code)
+ [ruby-dev:28177]
-Sun Dec 11 12:19:17 2011 Shugo Maeda <shugo@ruby-lang.org>
+Thu Dec 29 23:59:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/net/imap.rb: includes the sequence number of UID in a error
- message. suggested by art lussos.
- [ruby-core:41413] [Feature #5692]
+ * eval.c (rb_gc_mark_threads): keep unmarked threads which won't wake
+ up alone, and mark threads in the loading table. [ruby-dev:28154]
-Sun Dec 11 11:42:10 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
+ threads. [ruby-dev:28172]
- * ext/syslog/syslog.c: fix a typo. [ruby-core:41585] [Bug #5740]
+Thu Dec 29 17:02:07 2005 Tanaka Akira <akr@m17n.org>
-Sun Dec 11 10:48:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
+ "miniruby". [ruby-dev:28140]
- * error.c (exit_initialize): deal with true and false as well as
- Kernel#exit. [ruby-dev:44951] [Bug #5728]
+Thu Dec 29 14:35:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Dec 11 10:37:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_mod_define_method): should save safe_level in the
+ proc object. [ruby-dev:28146]
- * object.c (rb_check_to_int): new function to convert a VALUE to
- an Integer if possible, but returns nil instead of raising an
- exception otherwise.
+Thu Dec 29 11:22:34 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Dec 11 10:34:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/generator.rb: reimplemented Generator class with Thread instead of
+ callcc, in order to fix memory leak. [ruby-dev:28142]
- * process.c (rb_exit_status_code): extract from rb_f_exit_bang and
- rb_f_exit. assume 0 to be success in Kernel#exit! too.
+Wed Dec 28 14:10:05 2005 Tanaka Akira <akr@m17n.org>
-Fri Dec 9 19:24:31 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ia64.s: remove .pred.safe_across_calls directive.
+ reported by WATANABE Tetsuya. [ruby-dev:28141]
- * enc/trans/iso-8859-16-tbl.rb: add ISO-8859-16 converter.
+Wed Dec 28 01:32:39 2005 Tanaka Akira <akr@m17n.org>
- * enc/trans/single_byte.trans: ditto.
+ * eval.c (struct thread): add bstr_max.
+ (rb_thread_save_context): use realloc instead of REALLOC_N
+ to avoid GC.
-Fri Dec 9 14:28:40 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Dec 27 23:59:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (file_path_convert): don't convert it when the path string is
- ascii only. [ruby-core:41556] [Bug #5733]
- tests are contributed by nobu.
+ * lib/optparse.rb (CompletingHash#match): fix for 1.9.
-Fri Dec 9 08:00:15 2011 Luis Lavena <luislavena@gmail.com>
+Tue Dec 27 16:59:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * include/ruby/win32.h: undef stat to silence mingw-w64 stat
- redefinition warnings (GCC 4.6.3).
+ * test/drb/drbtest.rb (DRbService::self.ext_service): increase
+ timeout limit. a patch from Kazuhiro NISHIYAMA
+ <zn at mbf.nifty.com>. [ruby-dev:28132]
-Thu Dec 8 23:38:24 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Tue Dec 27 14:17:55 2005 Tanaka Akira <akr@m17n.org>
- * variable.c (set_const_visibility): clear inline-cache when constant's
- visibility is modified. [ruby-dev:44929]
+ * 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.
- * test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
- add test for it.
+ * defines.h: declare rb_ia64_bsp and rb_ia64_flushrs.
+ (flush_register_windows): call rb_ia64_flushrs on IA64.
-Thu Dec 8 23:26:11 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ia64.s: new file for IA64.
+ it is separated from C program files because
+ Intel C++ Compiler for IA64 doesn't support inline assembly.
- * ext/extmk.rb (extract_makefile): should sort after map, not before
- it. in this case there is no difference, but we should write better
- code. this bad smell was caught by nagachika.
+ * common.mk (ia64.$(OBJEXT)): new target.
-Thu Dec 8 22:31:13 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ruby.h (RUBY_INIT_STACK): defined.
+ (ruby_init_stack): declared for RUBY_INIT_STACK.
- * ext/extmk.rb (extract_makefile): need to sort the array of current
- srcs before comparing to the sorted old srcs.
- fixed the problem that the configuring stage of exts were always
- run, introduced at r33801.
+ * main.c (main): precedes RUBY_INIT_STACK before ruby_init.
-Thu Dec 8 13:26:24 2011 NAKAMURA Usaku <usa@ruby-lang.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.
- * test/rexml/test_order.rb (OrderTester#test_more_ordering): use
- Zlib::GzipReader.open instead of Zlib::GzipReader.new with File.new.
- fixed a test error on Windows introduced at r33946.
+ * 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.
-Thu Dec 8 13:11:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ [ruby-dev:28127]
- * test/ruby/test_process.rb (TestProcess#test_sete[gu]id): silently
- skip if not implemented such functions (such as, on Windows).
- fixed test errors on Windows introduced at r33953.
+Tue Dec 27 14:09:39 2005 Minero Aoki <aamine@loveruby.net>
-Thu Dec 8 12:57:50 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * process.c: new method Process.exec. [ruby-dev:28107]
- * ext/socket/extconf.rb: forgotten to define HAVE_SOCKETPAIR for
- windows.
- fixed test errors on Windows introduced at r33947.
+Tue Dec 27 08:22:15 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Dec 8 12:11:06 2011 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]
- * configure.in (RUBY_WERROR_FLAG): append all warning flags which
- are enabled to compile, so that printf format modifiers properly
- fail. [ruby-core:41351] [Bug #5679]
+Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Dec 8 07:20:15 2011 Eric Hodel <drbrain@segment7.net>
+ * eval.c (ev_const_get): fixed a bug in constant reference during
+ instance_eval. [yarv-dev:707]
- * doc/re.rdoc: Document difference between match and =~, options with
- Regexp.new and global variables. Patch by Sylvain Daubert.
- [Ruby 1.9 - Bug #5709]
+ * eval.c (ev_const_defined): ditto.
-Thu Dec 8 06:53:10 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/yaml.rb (YAML::add_domain_type): typo fixed. a patch from
+ Joel VanderWerf <vjoel at path.berkeley.edu>.
+ [ruby-talk:165285] [ruby-core:6995]
- * doc/re.rdoc: Fix example code to match documentation. Patch by
- Jarno Lamberg. [Ruby 1.9 - Bug #5624]
+Fri Dec 23 10:30:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Dec 7 19:04:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from
+ Kailden <kailden at gmail.com>. [ruby-core:06984]
- * configure.in (rpath): fix typo in the help string. a patch from
- Yuji Yamano <yyamano AT kt.rim.or.jp> in [ruby-list:48568].
+Wed Dec 21 16:47:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Wed Dec 7 18:55:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (w32_io_info): should return handle because FileIndex is
+ valid only while file is open. [ruby-dev:28088]
- * vm.c (vm_set_top_stack, vm_set_eval_stack): check for stack
- overflow with stack_max before push new frame. [ruby-core:41520]
- [Bug #5720]
+Wed Dec 21 12:12:21 2005 Tanaka Akira <akr@m17n.org>
- * vm.c (vm_set_main_stack): no stack overflow chances after
- vm_set_eval_stack().
+ * test/pathname/test_pathname.rb (test_kernel_open): use
+ File.identical?.
+ [ruby-talk:171804]
-Wed Dec 7 09:58:15 2011 Eric Hodel <drbrain@segment7.net>
+Tue Dec 20 22:41:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c: Document +@, -@, hash, INFINITY, Nan.
- Patch by Sylvain Daubert. [Ruby 1.9 - Feature #5622]
+ * eval.c (eval_under_i): evaluate source in caller's frame.
+ [ruby-dev:28076]
-Wed Dec 7 09:48:00 2011 Eric Hodel <drbrain@segment7.net>
+Tue Dec 20 12:53:23 2005 why the lucky stiff <why@ruby-lang.org>
- * io.c (Init_IO): Mention io/console methods. [Ruby 1.9 - Bug #5602]
- * ext/io/console/console.c: Mention that io/console must be required
- similar to lib/time.rb
+ * ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
+ with previous Ruby versions, documents are no longer headless.
-Wed Dec 7 08:04:31 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Dec 20 12:33:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/psych/lib/psych.rb (module Psych): parse and load methods take
- an optional file name that is used when raising Psych::SyntaxError
- exceptions
- * ext/psych/lib/psych/syntax_error.rb (module Psych): allow nil file
- names and handle nil file names in the exception message
- * test/psych/test_exception.rb (module Psych): Tests for changes.
+ * ext/syck/rubyext.c (syck_node_transform): ruby object holding
+ explicitly freed SyckNode caused SEGV. [ruby-dev:28067]
-Tue Dec 6 18:26:33 2011 Tanaka Akira <akr@fsij.org>
+ ... I think syck GC problem was solved now!
- * ext/dbm/dbm.c: use db_version() instead of DB_VERSION_STRING to
- detect runtime Berkeley DB version.
- use dpversion instead of _QDBM_VERSION to detect runtime QDBM
- version.
- [ruby-dev:44948]
+Tue Dec 20 01:46:48 2005 Tanaka Akira <akr@m17n.org>
-Tue Dec 6 12:30:41 2011 Tanaka Akira <akr@fsij.org>
+ * io.c (rb_f_backquote): fix a GC problem on
+ IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
- * ext/dbm/extconf.rb: detect gdbm_version in libgdbm.
+Mon Dec 19 23:32:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dbm/dbm.c: make DBM::VERSION more informative for gdbm, qdbm and
- Berkeley DB 1.x. [ruby-dev:44944]
+ * Makefile.in (XCFLAGS): separated as well as win32/Makefile.sub.
-Tue Dec 6 07:26:37 2011 Eric Hodel <drbrain@segment7.net>
+ * main.c (always_gc): dllimport is required for VC to import a DLL
+ symbol. fixed: [ruby-dev:28051]
- * range.c: Improve documentation for Range. Patch by Chris Zetter.
- [Ruby 1.9 - Bug #5656]
+ * parse.y (rb_symname_p): fixed wrong validation. [ruby-dev:28047]
-Mon Dec 5 19:08:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 19 23:09:24 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * regparse.c (PFETCH_READY): separate gcc specific trick.
+ * 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.
-Mon Dec 5 19:01:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
+ NULL or not before S_FREE.
- * process.c (proc_seteuid_m): fix argument.
+ * 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.
- * test/ruby/test_process.rb (test_geteuid): fix typo.
+ * 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)
- * test/ruby/test_process.rb (test_getegid, test_set[eg]uid): add.
+ * ext/syck/rubyext.c (syck_mark_parser): ditto.
-Mon Dec 5 18:56:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/rubyext.c (syck_parser_load): ditto.
- * bignum.c (big_rshift), compile.c (validate_label,
- iseq_build_from_ary_exception), cont.c (cont_capture), dir.c
- (dir_open_dir), gc.c (objspace_each_objects), io.c (pipe_open)
- (rb_io_advise), parse.y (parser_compile_string)
- (rb_parser_compile_file), proc.c (binding_free), process.c
- (rb_proc_exec_n, rb_seteuid_core, proc_setegid, rb_setegid_core)
- (p_uid_exchange, p_gid_exchange), regparse.c (strdup_with_null),
- signal.c (sig_dfl), vm.c (rb_iseq_eval, rb_iseq_eval_main),
- vm_insnhelper.c (vm_expandarray): suppress
- unused-but-set-variable warnings.
+ * ext/syck/rubyext.c (syck_parser_load_documents): ditto.
- * class.c (rb_obj_methods), compile.c (iseq_compile_each),
- iseq.c(iseq_load, rb_iseq_parameters), pack.c (pack_pack),
- regcomp.c (is_not_included, update_string_node_case_fold),
- transcode.c (rb_econv_open0, make_replacement),
- vm_eval.c (raise_method_missing): remove unused variable.
+ * ext/syck/rubyext.c (syck_emitter_s_alloc): ditto.
- * signal.c (reserved_signal_p): static.
+ * ext/syck/rubyext.c (syck_mark_emitter): ditto.
-Mon Dec 5 14:27:23 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/syck/rubyext.c (syck_emitter_reset): ditto.
- * include/ruby/{subst.h,win32.h}, ext/socket/rubysocket.h: revert
- r33876. [ruby-core:41475] [Bug #5706]
+ * 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/socket/extconf.rb: the alternative hack for [Bug #5675].
+ * ext/syck/rubyext.c (syck_node_type_id_set): ditto.
-Mon Dec 5 10:18:45 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ ... I believe syck GC problem was solved by this.
- * ext/zlib/zlib.c (rb_gzreader_initialize): revert a part of r33937.
- 1st, to change the mode of an IO is very sensitive problem, so
- the maintainer of this library should judge it.
- 2nd, usually Zlib::GzipReader.new is not called directly. #initialize
- is called via .open, and in the method the I/O is opened in binary
- mode, so there is no problem without changing the mode in #initialize.
+Mon Dec 19 12:20:59 2005 Tanaka Akira <akr@m17n.org>
-Sun Dec 4 22:53:12 2011 Tanaka Akira <akr@fsij.org>
+ * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): activate only
+ before gcc 4.0.3 on SPARC and IA64.
- * lib/tempfile.rb: don't use lock directory. [ruby-dev:39197]
+Mon Dec 19 11:37:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Dec 4 22:34:43 2011 Tanaka Akira <akr@fsij.org>
+ * 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.
- * lib/tempfile.rb (Tempfile::MAX_TRY): remove unused constant.
+ (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)
-Sun Dec 4 12:11:28 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+Sat Dec 17 21:50:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/pp.rb: fix rdoc.
+ * ext/syck/rubyext.c (syck_emitter_reset): should initialize
+ emitter->bonus->oid. otherwise rb_gc_mark crashes.
-Sun Dec 4 12:03:16 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/syck/rubyext.c (syck_mark_parser): should mark anchor nodes
+ because they hold ruby objects. (ie: rb_syck_bad_anchor_handler)
- * lib/delegate.rb (Delegator#methods): Kernel#methods receives
- zero or one argument. [ruby-core:37118] [Bug #4882]
+Sat Dec 17 11:00:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Dec 4 10:15:00 2011 Luis Lavena <luislavena@gmail.com>
+ * ext/syck/rubyext.c (rb_syck_compile): avoid potential memory
+ leak.
- * ext/zlib/zlib.c (rb_gzreader_initialize): use binary mode by default
- under Windows. Patch by Hiroshi Shirosaki. [ruby-core:40706]
- [Feature #5562]
+ * ext/syck/rubyext.c (syck_set_ivars): avoid potential memory
+ leak by explicit symbol allocation.
- * include/ruby/encoding.h (void rb_econv_binmode): define NEWLINE
- decorator.
+Sat Dec 17 03:57:01 2005 Tanaka Akira <akr@m17n.org>
- * io.c (rb_cloexec_fcntl_dupfd): Introduce NEED_READCONV and
- NEED_WRITECONV to replace universal newline decorator by CRLF only
- when required to improve file reading and writing under Windows.
- Patch by Hiroshi Shirosaki. [ruby-core:40706] [Feature #5562]
- * io.c (do_writeconv): adjust binary mode if required.
- * io.c (read_all, appendline, swallow, rb_io_getline_1): ditto.
- * io.c (io_getc, rb_io_each_codepoint, rb_io_ungetc): ditto.
- * io.c (rb_io_binmode, rb_io_ascii8bit_binmode): ditto.
- * io.c (rb_io_extract_modeenc, rb_sysopen): ditto.
- * io.c (pipe_open, prep_stdio, io_encoding_set): ditto.
- * io.c (rb_io_s_pipe, copy_stream_body): ditto.
+ * bignum.c (rb_big_rshift): fix a GC problem on
+ IA64 with gcc 4.0.3 20051216 (prerelease).
- * test/ruby/test_io_m17n.rb (EOT): add test for pipe and stdin in
- binary mode.
+Sat Dec 17 03:30:23 2005 Tanaka Akira <akr@m17n.org>
- * win32/win32.c (init_stdhandle): remove O_BINARY from stdhandle
- initialization.
- * win32/win32.c (rb_w32_write): use FTEXT mode accordingly.
+ * eval.c (bmcall): fix a GC problem by tail call on
+ IA64 with gcc 4.0.3 20051216 (prerelease).
-Sat Dec 3 20:49:16 2011 Yusuke Endoh <mame@tsg.ne.jp>
+Fri Dec 16 17:53:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * variable.c (set_const_visibility): print a warning when no argument
- is passwd to Module#private_constant. [ruby-list:48558]
+ * ext/syck/rubyext.c (rb_syck_compile): fixed memory leak.
- * vm_method.c (set_method_visibility): ditto for
- Module#private_class_method.
+ * ext/syck/rubyext.c: should protect global variable from GC.
-Sat Dec 3 20:43:14 2011 Yusuke Endoh <mame@tsg.ne.jp>
+Fri Dec 16 11:44:43 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * variable.c (set_const_visibility): Module#private_constant has
- changed the visibility of only the first argument. Now it changes
- all of them. [ruby-list:48558]
+ * ext/syck/rubyext.c (syck_resolver_tagurize): fixed memory leak.
- * test/ruby/test_module.rb: add a test for above.
+ * ext/syck/rubyext.c (syck_node_type_id_set): should set newly
+ allocated memory instead of RString's internal storage.
-Sat Dec 3 07:17:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/syck/rubyext.c (syck_scalar_value_set): ditto.
- * Makefile.in (CFLAGS): append ARCH_FLAG.
+ ... these fixes won't fix [ruby-dev:27839]. more work is needed.
- * configure.in (ARCH_FLAG): exclude from CFLAGS.
+Fri Dec 16 04:38:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (UNIVERSAL_INTS): include short int. fix for
- test/mkmf.
+ * lib/delegate.rb (Delegator::method_missing): should delegate
+ block as well.
-Fri Dec 2 15:48:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Dec 15 19:57:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (VpAllocReal): reduce extra frac.
+ * lib/cgi.rb (CGI::QueryExtension::MorphingBody): fix criteria to
+ use Tempfile. A fix from Zev Blut <rubyzbibd at ubit.com>.
+ [ruby-core:06076]
-Fri Dec 2 15:41:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c: remove global functions work on $_.
- * configure.in: check whether -pie or -Wl,-pie is valid as
- LDFLAGS. [ruby-core:41438] [Bug#5697]
+Thu Dec 15 12:35:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: use $linker_flag for LDFLAGS option which is not
- limited to particular platforms.
+ * lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
+ segment7.net>. [ruby-core:06894]
-Thu Dec 1 23:21:58 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Thu Dec 15 01:33:31 2005 Tanaka Akira <akr@m17n.org>
- * thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) only if
- PR_SET_NAME is available.
+ * 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)
-Thu Dec 1 22:31:16 2011 Tanaka Akira <akr@fsij.org>
+Wed Dec 14 23:50:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (linux_get_maxfd): change local variable name.
+ * lib/rdoc/parsers/parse_c.rb (find_class_comment): fix for class
+ document with prototypes. [ruby-core:06863]
-Thu Dec 1 16:59:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 14 23:39:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/extconf.rb: add arguments for macro calls.
- [ruby-core:41370] [Bug#5681]
+ * dir.c (has_magic): glob names contain alphabets to enable case fold
+ search. [ruby-dev:27735]
-Thu Dec 1 16:20:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (Init_Dir): FNM_SYSCASE which is default case fold flag.
+ [ruby-dev:23296]
- * lib/mkmf.rb (MakeMakefile#try_func): fix broken patch at r33834.
+Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org>
-Thu Dec 1 14:43:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (r_object0): fix a GC problem for reading a bignum on
+ IA64 with gcc 3.3.5 (Debian 1:3.3.5-13).
- * ext/bigdecimal/bigdecimal.h (Real): suppress false warning from
- clang. [ruby-core:41418] [Bug#5693]
+Tue Dec 13 12:23:47 2005 Tanaka Akira <akr@m17n.org>
-Thu Dec 1 10:31:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (rb_reg_regcomp): fix a GC problem on x86_64 with
+ gcc 3.3.5 (Debian 1:3.3.5-13).
- * configure.in (LDFLAGS): -fstack-protector is always needed to
- link static library created with it. [ruby-core:41387]
- [Bug#5686]
+Tue Dec 13 01:44:16 2005 Tanaka Akira <akr@m17n.org>
-Thu Dec 1 07:03:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * array.c (rb_ary_diff): fix a GC problem on IA64 with
+ gcc 3.3.5 (Debian 1:3.3.5-13).
+ When rb_ary_push is called, there was no register which contains
+ `hash' but `&RHASH(hash)->tbl' instead.
- * configure.in: add sys/prctl.h test.
- * thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) to change
- thread name. It may help to debug.
+Tue Dec 13 00:08:09 2005 Tanaka Akira <akr@m17n.org>
-Wed Nov 30 23:35:45 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * sprintf.c (rb_str_format): fix a GC problem.
+ [ruby-dev:28001]
- * variable.c (rb_path2class): don't raise NameError when the middle
- constant of the path is not defined but defined on toplevel.
- [ruby-core:41410] [Bug #5691]
+Mon Dec 12 15:51:22 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Wed Nov 30 20:02:02 2011 Martin Duerst <duerst@it.aoyama.ac.jp>
+ * test/openssl/test_ssl.rb (test_parallel): call GC.start to close
+ unused files. [ruby-dev:27981]
- * transcode.c: Simplified rb_econv_binmode, avoided a warning on cygwin.
+Mon Dec 12 09:58:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Nov 30 08:57:07 2011 Eric Hodel <drbrain@segment7.net>
+ * 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]
- * lib/mkmf.rb: Use MakeMakefile's rm_f to avoid conflict with Rake or
- FileUtils.
- * test/ruby/test_module.rb: Hide MakeMakefile's inclusion in Object
+Mon Dec 12 00:33:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Nov 30 09:12:43 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
+ protect temporary context object. [ruby-dev:27979]
- * lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
- on Windows.
- see https://github.com/rdoc/rdoc/issues/87
+ * ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
+ be called before actual variable initialization.
+ [ruby-dev:27986]
- * test/rdoc/test_rdoc_markup_pre_process.rb
- (TestRDocMarkupPreProcess#test_include_file,
- TestRDocMarkupPreProcess#test_include_file_encoding_incompatible):
- follow above change.
+Sun Dec 11 23:54:07 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Nov 30 09:09:37 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
+ (see ext/tk/ChangeLog.tkextlib).
- * ext/psych/parser.c (parse): parse method can take an option file
- name for use in exception messages.
- * test/psych/test_parser.rb: corresponding tests.
+ * ext/tk/sample/scrollframe.rb: add a new sample.
-Tue Nov 29 09:07:59 2011 Eric Hodel <drbrain@segment7.net>
+Sun Dec 11 22:07:58 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * lib/mkmf.rb: Fix indentations of constants at end of module.
- Document some constants.
+ * test/rinda/test_rinda.rb (test_remote_array_and_hash): pseudo remote
+ objects are protected against GC. [ruby-dev:27911]
-Tue Nov 29 09:58:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Dec 10 01:06:06 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
- * io.c (rb_write_error2): suppress unused variable warning.
+ * lib/matrix.rb: add Matrix#determinant_e, Matrix#rank_e.
+ [ruby-dev:27820] and related thread.
-Tue Nov 29 07:45:26 2011 Eric Hodel <drbrain@segment7.net>
+Sat Dec 10 00:31:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb: Wrap comments to 78 columns and clean up formatting.
+ * eval.c (calling_scope_t): gave names to magic numbers for rb_call().
+ [ruby-dev:27978]
-Tue Nov 29 05:54:18 2011 Eric Hodel <drbrain@segment7.net>
+Fri Dec 9 23:31:02 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/mkmf.rb: Wrap mkmf.rb in module MakeMakefile to clean up Object
- documentation. [Ruby 1.9 - Feature #5658]
- * ext/extmk.rb: Use MakeMakefile::CONFIG instead of Object::CONFIG
- * test/mkmf/base.rb: ditto
+ * lib/rexml/encoding.rb (encoding=): give priority to particular
+ conversion to iconv. [ruby-core:06520]
-Tue Nov 29 00:08:57 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Fri Dec 9 23:16:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (INSTRUBY_ARGS): added --mantype to apply mdoc2man.rb
- to man pages. Fixes #5598.
- (do-install-nodoc, do-install-local, do-install-man,
- dont-install-nodoc, dont-install-local, dont-install-man):
- No longer needs --mantype.
+ * range.c (range_include): return false unless included in numeric
+ range. fixed: [ruby-dev:27975]
- Reported by Rainer Orth <ro AT cebitec.uni-bielefeld.de>,
- patch by George Koehler <xkernigh AT netscape.net>.
+Thu Dec 8 02:07:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 28 22:26:31 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (umethod_bind): adjust invoking class for module method.
+ [ruby-dev:27964]
- * test/rake/test_rake_directory_task.rb
- (TestRakeDirectoryTask#test_directory_win32): shouldn't create any
- file/directory on root directory. create on @tempdir (= Dir.pwd).
- see https://github.com/jimweirich/rake/issues/91
+Thu Dec 8 00:40:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 28 12:57:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (call_trace_func): klass parameter should be a
+ class/module that defines calling method. [ruby-talk:169307]
- * io.c (rb_write_error2): fwrite() returns ssize_t.
+Wed Dec 7 17:10:27 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Mon Nov 28 12:47:19 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * sprintf.c (rb_f_sprintf): [ruby-dev:27967]
- * parse.y (nodetype, nodeline): static. these functions are for
- debugging, and not intend to be public.
+Wed Dec 7 16:39:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 28 12:37:54 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * range.c (range_include): use discrete membership for non Numeric
+ values, for example, String.
- * gc.c (initial_params): static. it seems to be forgotten at r33501.
+ * numeric.c (num_scalar_p): new method. [ruby-dev:27936]
-Mon Nov 28 12:32:24 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/complex.rb (Complex#scalar?): ditto.
- * include/ruby/win32.h, win32/win32.c (GetCurrentThreadHandle): remove
- unused old API.
+Wed Dec 7 15:31:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 28 12:29:20 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * sprintf.c (rb_str_format): integer overflow check added.
- * win32/mkexports.rb (Exports#initialize): remove old symbol name.
+ * sprintf.c (GETASTER): ditto.
-Mon Nov 28 12:15:28 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 7 01:02:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * win32/mkexports.rb (Exports#read_substitution): need to read
- from subst.h too. [Bug #5675]
+ * ext/tk/README.macosx-aqua: [new document] tips to avoid the known
+ bug on platform specific dialogs of Tcl/Tk Aqua on MacOS X.
-Mon Nov 28 11:46:35 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/tcltklib.c: fix bug on switching threads and waiting on the
+ deleted interpreter on vwait and tkwait command.
- * io.c (rb_io_flush): release GVL during fsync() on Windows.
+ * ext/tk/lib/multi-tk.rb: kill the meaningless loop for the deleted Tk
+ interpreter.
-Mon Nov 28 11:00:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/demos-jp/image3.rb: [bug fix] wrong argument.
- * include/ruby/subst.h: typo of r33876.
+ * ext/tk/sample/demos-en/image3.rb: ditto.
-Mon Nov 28 10:36:00 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/sample/demos-jp/menu.rb: fix message for MacOS X.
- * include/ruby/subst.h: moved Windows specific substitutions from
- win32.h.
+ * ext/tk/sample/demos-jp/menu8x.rb: ditto.
- * ext/socket/rubysocket.h: include ruby/subst.h. [Bug #5675]
+ * ext/tk/sample/demos-en/menu.rb: ditto.
-Mon Nov 28 10:20:58 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Dec 6 16:48:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/{Makeilfe.sub,win32.c} (FILE_COUNT, FILE_READPTR): move the
- definitions from config.h to win32.c. I dared to have left such
- macros, for other future compiler support.
- [ruby-core:41313] [Bug #5674]
+ * gc.c (ruby_xmalloc2): change check condition for integer
+ overflow. [ruby-dev:27399]
-Mon Nov 28 09:28:30 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (ruby_xrealloc2): ditto.
- * win32/win32.c (rb_w32_uchmod): typo. [Bug#5671] [ruby-dev:44898]
+Tue Dec 6 16:37:57 2005 Yuya Nishida <yuya@j96.org>
- * test/ruby/test_file.rb (TestFile#test_chmod_m17n): test of above bug.
+ * eval.c (exec_under): avoid accessing ruby_frame->prev.
+ [ruby-dev:27948]
-Sun Nov 27 21:25:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Dec 2 19:06:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * configure.in: added -fno-strict-overflow. it suppress annoying
- -Wstrict-overflow warning.
+ * dir.c (Compare): should not fold double byte alphabet on win9x.
-Sun Nov 27 20:58:02 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Dec 1 00:50:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_write_error2): get rid of warning on linux. fwrite
- of glibc is tagged __attribute__ ((__warn_unused_result__))
- if _FORTIFY_SOURCE != 0.
- * vm_dump.c (rb_vm_bugreport): ditto.
+ * eval.c (rb_funcall2): allow to call protected methods.
+ fixed: [ruby-dev:27890]
-Sun Nov 27 19:09:02 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 30 23:52:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (stack_protector): disable on mingw. [Bug#5676]
+ * parse.y (struct parser_params): fields common to ripper must be
+ placed at each same offset.
- * Makefile.in (DLDFLAGS): also needs -fstack-protector.
- [Bug#5676]
+ * parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
+ fixed: [ruby-dev:27896]
-Sun Nov 27 14:13:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Nov 30 13:43:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: add -fstack-protector into XLDFLAGS as well as
- XCFLAGS if stack-protector is used.
+ * misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
+ expression. [ruby-dev:27868]
-Sun Nov 27 13:09:25 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Nov 29 23:57:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: workaround to avoid MacOS X build error.
- Maybe autoconf 2.61 is slightly buggy. [ruby-core:41316]
+ * parse.y (struct parser_params): heap must be placed at same offset
+ also in ripper.y. fixed: [ruby-dev:27846]
-Sun Nov 27 04:57:11 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * parse.y (yycompile): prevent vparser from tail call optimization.
+ fixed: [ruby-dev:27851]
- * configure.in (--no-undefined): r33840 breaks FreeBSD and DragonFly
- with gcc 4.4 or later. Their environ is in /usr/libexec/ld-elf.so.1,
- so it will be false negative.
+ * parse.y (parser_mark): value needs to be marked.
+ fixed: [ruby-dev:27845]
-Sun Nov 27 04:55:45 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Nov 29 22:45:30 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * lib/net/http.rb (Net::HTTP::SSL_IVNAMES): rerefix 33701.
- SSL_ATTRIBUTES stores names for set_params, they are symbol.
- SSL_IVNAMES stores instance variable names.
+ * lib/drb/observer.rb (notify_observers): follow change of observer.rb.
+ fixed: [ruby-core:6796]
-Sun Nov 27 00:16:07 2011 Tanaka Akira <akr@fsij.org>
+Mon Nov 28 20:24:22 2005 Tanaka Akira <akr@m17n.org>
- * io.c (copy_stream_body): use 0666 for permission argument for open.
- [ruby-core:40865]
+ * lib/pp.rb (PP::PPMethods#object_address_group): mask an address with
+ word size.
-Sat Nov 26 23:01:38 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * lib/pp.rb (PP::PPMethods#object_address_group): adjust address format.
- * test/openssl/test_engine.rb: remove side effect of generic engine
- load by explicitly loading software-based "openssl" engine for
- all tests.
+Mon Nov 28 18:55:22 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Nov 26 20:41:48 2011 NARUSE, Yui <naruse@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 ])
- * lib/net/http.rb (Net::HTTP.get_response): enable use_ssl
- if given URI object is https.
- patched by Mark Ferlatte [ruby-core:40665] [Bug #5545]
+Mon Nov 28 13:11:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/net/http.rb (Net::HTTP.post_form): ditto.
+ * win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
+ error message on bccwin32 + winsock)
-Sat Nov 26 20:01:18 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Nov 28 09:15:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES): refix 33701.
- store instance variable symbol names.
+ * lib/mkmf.rb (create_makefile): should not change sodir with
+ dir.gsub!. (bccwin32 failed to install third party extensions)
+ [ruby-dev:27834]
-Sat Nov 26 15:40:25 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+Sun Nov 27 05:37:20 2005 Tanaka Akira <akr@m17n.org>
- * .travis.yml (script): should be ./configure
+ * lib/pathname.rb: use File.basename to decompose pathnames.
+ experimental Windows support.
-Sat Nov 26 15:39:18 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+Sun Nov 27 00:56:13 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * .travis.yml (before_script): wrong name, sorry.
+ * lib/wsdl/xmlSchema/complexContent.rb: missing
+ ComplexContent#elementformdefault method.
-Sat Nov 26 15:31:34 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+Sat Nov 26 19:57:45 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * .travis.yml (before-script): autoconf required.
+ * dln.c (conv_to_posix_path): should initialize posix.
-Sat Nov 26 15:24:05 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+Fri Nov 25 20:34:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * .travis.yml: Travis enable.
+ * lib/xmlrpc/datetime.rb (DateTime::to_a): comparison with non
+ array-convertible object must return false.
-Sat Nov 26 10:47:50 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Fri Nov 25 14:34:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/extconf.rb: remove checks for available functions.
- * ext/openssl/missing.h: ditto.
- Thanks, Tim Mooney for reporting this!
- [Bug #5432] [ruby-core:40088]
+ * range.c (range_max): treat end exclusion without iteration if
+ the end value is an integer. [ruby-talk:167433]
-Sat Nov 26 10:22:28 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Fri Nov 25 12:52:57 2005 Kouhei Sutou <kou@cozmixng.org>
- * ext/openssl/ossl_ssl.c: add comment on where to find implementation
- of OpenSSL::SSL::SSLSocket#session.
+ * 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.
-Sat Nov 26 05:00:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/rss/test_content.rb: use #__send__ instead of #funcall for
+ no private method.
- * configure.in (--no-undefined): RUBY_TRY_CFLAGS does nothing for
- linker flags. use RUBY_TRY_LDFLAGS.
+Fri Nov 25 12:39:56 2005 Kouhei Sutou <kou@cozmixng.org>
-Fri Nov 25 11:37:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * 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.
- * io.c (ioctl_narg_len, linux_iocparm_len): reinstantiate linux
- specific narg length calculation.
- * test/ruby/test_io.rb (test_ioctl_linux2): add new test for old and
- unstructured ioctl.
+ * 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.
-Fri Nov 25 10:39:14 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
- * Makefile.in (EXTLDFLAGS): export it.
- * configure.in: add --no-undefined if --enable-shared is specified.
- Gentoo enabled this option long time. Also, export EXTLDFALGS.
+ * test/rss/rss-assertions.rb: improved type conversion assertions.
-Fri Nov 25 08:48:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Nov 25 10:38:20 2005 Kouhei Sutou <kou@cozmixng.org>
- * configure.in: turn on PIE if --enable-shared is not specified.
+ * lib/rss/image.rb: added Image prefix.
-Fri Nov 25 08:05:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rss/maker/image.rb: ditto.
- * configure.in: add -fstack-protector. It help to protect us from
- stack smashing attack.
+Fri Nov 25 10:33:02 2005 Kouhei Sutou <kou@cozmixng.org>
-Fri Nov 25 08:03:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/rss/test_2.0.rb: added RSS 2.0 tests.
- * configure.in: add -D_FORTIFY_SOURCE=2. It provide some compile
- time and runtime check for security.
+ * test/rss/rss-assertions.rb: extended XML stylesheet assertion.
-Fri Nov 25 08:00:23 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rss/0.9.rb: added initialize method.
- * lib/mkmf.rb: get rid of warnings of mkmf.rb if -Wmissing-declarations
- and/or -Wold-style-definition warnings if specified.
- Patch by Nikolai Weibull. Thank you! [Bug #5459] [ruby-core:40200]
+ * test/rss/test_1.0.rb: cleanup.
-Fri Nov 25 07:46:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Nov 25 10:29:48 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in: add -Wall always.
+ * range.c (range_min): use <=> comparison rather than iteration.
+ [ruby-talk:167420]
-Thu Nov 24 20:02:40 2011 Tanaka Akira <akr@fsij.org>
+ * range.c (range_max): ditto.
- * test/openssl/test_engine.rb: use IO#reopen to restore stderr.
+Thu Nov 24 01:31:44 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Nov 24 19:59:56 2011 Tanaka Akira <akr@fsij.org>
+ * 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...)
- * io.c (rb_io_reopen): re-initialize buffering mode for stdout and
- stderr.
+Wed Nov 23 23:52:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Nov 24 11:12:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * numeric.c (num_div): use floor rather than rb_Integer().
+ [ruby-dev:27674]
- * io.c (rb_io_fsync,rb_io_fdatasync): release GVL during fsync().
- fsync() and fdatasync() may take a long time on slow disks and/or
- if there is much dirty data.
- Patch by Eric Wong. [Feature #5665] [ruby-core:41247]
+Wed Nov 23 22:34:15 2005 Kouhei Sutou <kou@cozmixng.org>
-Thu Nov 24 10:05:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * lib/rss/parser.rb: added entity handling type predicate.
+ * lib/rss/rexmlparser.rb: ditto.
+ * lib/rss/xmlparser.rb: ditto.
+ * lib/rss/xmlscanner.rb: ditto.
- * test/openssl/test_engine.rb: Suppress output from 'openssl'
- engine's RC4 cipher.
- [Bug #5633] [ruby-core:41026]
+ * lib/rss/xmlscanner.rb: more robust entity handling.
-Thu Nov 24 08:05:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * test/rss/test_parser.rb: added an entity handling test.
- * ext/openssl/ossl_pkey_dsa.c: remove redundant colon from error
- message.
- * ext/openssl/ossl_ssl.c: ditto.
- * ext/openssl/ossl_pkey_rsa: ditto.
- patched by Eric Hodel [Bug #5604] [ruby-core:40896]
+Wed Nov 23 20:59:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Nov 23 20:03:43 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
+ [Tk8.5 feature].
- * io.c (ioctl_narg_len): don't use _IOC_SIZE macro on Linux.
- On Linux some constants for ioctl(2) doesn't include the size of
- its return value and 16bit value; for example FIONREAD 0x541B.
- Moreover the manual, ioctl_list(2), says "Note that the size
- bits are very unreliable: in lots of cases they are wrong,
- either because of buggy macros using sizeof(sizeof(struct)),
- or because of legacy values."
- So we shouldn't use it.
+ * ext/tk/lib/tk/text.rb: supports new indices modifiers on a Text
+ widget [Tk8.5 feature].
-Tue Nov 22 18:07:32 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
- * win32/win32.c (_pioinfo): need to declare _pioinfo() before using
- _osfhnd and other macros which uses _pioinfo() internally.
+ * ext/tk/lib/tk/autoload.rb: ditto.
-Tue Nov 22 17:49:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
+ feature].
- * win32/win32.c (_pioinfo): make an inline function.
+Wed Nov 23 18:52:45 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Nov 22 11:26:08 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * file.c (w32_io_info): should not call GetFileInformationByHandle
+ for pipe.
-Tue Nov 22 11:33:58 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (w32_io_info): checks return value from rb_w32_get_osfhandle.
- * win32/win32.c (dupfd): argument of _osfhnd and so on should not
- have side effect.
+ * file.c (w32_io_info): now can identify directory on WinNT.
-Tue Nov 22 11:26:08 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Nov 23 18:46:53 2005 Kouhei Sutou <kou@cozmixng.org>
- * bignum.c (rb_big_divide): refix of r33536. Don't change behavior of Bignum#/.
- [ruby-core:40429] [Bug #5490]
+ * lib/rss/: use #__send__ instead of #send.
+ * test/rss/: ditto.
-Tue Nov 22 10:46:57 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Nov 23 18:32:56 2005 Kouhei Sutou <kou@cozmixng.org>
- * numeric.c (ruby_float_step): improve floating point calculations.
- [ruby-core:35753] [Bug #4576]
+ * test/rss/test_taxonomy.rb: use #reject directory.
- * numeric.c (ruby_float_step): correct the error of floating point
- numbers on the excluding case.
- patched by Masahiro Tanaka [ruby-core:39608]
+Wed Nov 23 18:26:00 2005 Kouhei Sutou <kou@cozmixng.org>
- * numeric.c (ruby_float_step): use the end value when the current
- value is greater than or equal to the end value.
- patched by Akira Tanaka [ruby-core:39612]
+ * lib/rss/taxonomy.rb: changed class or module prefix to
+ Taxonomy from Taxo.
+ * lib/rss/maker/taxonomy.rb: ditto.
-Tue Nov 22 06:59:21 2011 Tanaka Akira <akr@fsij.org>
+Wed Nov 23 18:21:11 2005 Kouhei Sutou <kou@cozmixng.org>
- * test/ruby/test_io.rb (test_fcntl_dupfd): there is no known platform
- which don't have F_DUPFD. [ruby-dev:44874]
+ * 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.
-Tue Nov 22 04:46:22 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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.
- * ext/psych/lib/psych.rb: remove autoload from psych
- * ext/psych/lib/psych/json.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.
-Tue Nov 22 00:44:59 2011 Tanaka Akira <akr@fsij.org>
+ * 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/ruby/test_io.rb (test_fcntl_dupfd): the argument of F_DUPFD is
- minimum file descriptor.
+ * test/rss/rss-testcase.rb: added convenience method for setting
+ up taxo:topic.
+ * test/rss/rss-assertions.rb: added assertion for taxo:topic.
-Tue Nov 22 00:25:17 2011 Tanaka Akira <akr@fsij.org>
+ * sample/rss/blend.rb: followed new API.
- * io.c (linux_get_maxfd): get rid of a warning.
+Wed Nov 23 17:42:24 2005 Kouhei Sutou <kou@cozmixng.org>
-Mon Nov 21 23:39:14 2011 Tanaka Akira <akr@fsij.org>
+ * lib/rss/rss.rb: fixed a indentation bug.
- * io.c (linux_get_maxfd): new function to find maximum fd on Linux.
- (rb_close_before_exec): use linux_get_maxfd.
+ * lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
-Mon Nov 21 06:16:24 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/rss/test_taxonomy.rb: added a #to_s test.
- * cont.c (fiber_switch): ignore fiber context switch
- because destination fiber is same as current fiber.
- With out this, it may segv on FreeBSD 9.
- patched by Koichi Sasada.
+Wed Nov 23 03:40:49 2005 Guy Decoux <ts@moulon.inra.fr>
-Sun Nov 20 23:22:42 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
+ [ruby-core:06721]
- * ext/extmk.rb (extract_makefile, extmake): regenerate makefiles
- if globbed source file list is changed.
+Wed Nov 23 07:26:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/mkmf.rb (create_makefile): store ORIG_SRCS.
+ * ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
-Sun Nov 20 22:43:03 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/openssl/ossl_x509ext.c (MakeX509ExtFactory): should use
+ OPENSSL_malloc to allocate X509V3_CTX.
- * enc/unicode.c (PROPERTY_NAME_MAX_SIZE): +1.
- reported by Ken Takata. [ruby-dev:44894][Bug #5652]
+ * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): use
+ X509V3_EXT_nconf_nid to avoid SEGV (and to build extensions which
+ values are placed in separate section).
-Sun Nov 20 11:01:28 2011 Tanaka Akira <akr@fsij.org>
+ * test/openssl/test_x509ext.rb: new file.
- * lib/set.rb (SortedSet.setup): remove old_init after initialize
- method is redefined. The remove before redefinition makes the
- warning prevention fragile. [ruby-dev:44892]
+Wed Nov 23 01:22:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 20 04:01:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (test_identical): test if two files are identical.
- * Makefile.in (enc/unicode/name2ctype.h): remove duplicated
- ifdefs.
+ * file.c (rb_f_test): support DOSISH systems where st_ino is not
+ reliable. fixed: [ruby-core:06672]
-Sat Nov 19 19:31:47 2011 Tanaka Akira <akr@fsij.org>
+ * win32.h, win32.c (rb_w32_osid): check the running platform.
- * time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
- patch by Tomoyuki Chikanaga.
- [ruby-dev:44827] [Bug #5586]
+Tue Nov 22 23:52:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 19 16:36:57 2011 Tanaka Akira <akr@fsij.org>
+ * lib/optparse.rb: match incomplete (in current enconding) multibyte
+ string. http://inamode6.tokuhirom.dnsalias.org/show/1551
- * test/net/http/test_http.rb: remove temporally files in ensure clause.
+Tue Nov 22 18:36:11 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sat Nov 19 08:18:41 2011 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
- * test/net/http/test_http.rb: remove temporally files.
+Tue Nov 22 14:36:54 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Fri Nov 18 17:18:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
- * ext/io/console/console.c (console_raw, console_set_raw)
- (console_getch): optional parameters. [EXPERIMENTAL]
+ * test/ruby/test_path.rb (test_dirname, test_basename): follow new
+ spec. and add new tests.
-Fri Nov 18 16:12:11 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 22 13:30:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/io/console/console.c (console_cooked, console_set_cooked):
- new methods to reset cooked mode. [EXPERIMENTAL]
+ * win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
+ p Dir.glob('*') should work on WinNT. (implemented our own
+ stat(2) on WinNT) [ruby-list:41552] [ruby-dev:27711]
-Fri Nov 18 13:20:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Nov 22 02:31:53 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/unit/assertions.rb (MINI_DIR): quick dirty hack to get rid of
- warnings when using assert/assert_respond_to.
+ * ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
+ is not defined).
-Fri Nov 18 13:03:38 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Nov 22 01:45:21 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_cloexec_open): set O_NOINHERIT instead of O_CLOEXEC if it is
- available (for Windows).
+ * file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
+ DOSISH is not. fixed: [ruby-dev:27797]
- * win32/win32.c (fcntl): on F_DUPFD, determine the inheritance of the
- new handle by O_NOINHERIT flag of original fd.
+Mon Nov 21 22:50:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 18 08:00:41 2011 Ryan Davis <ryand-ruby@zenspider.com>
+ * file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path
+ should not be splitted. fixed: [ruby-dev:27776] [ruby-dev:27786]
- * lib/minitest/*: Imported minitest 2.8.1 (r6750)
- * test/minitest/*: ditto
- * configure.in: Improved gcc-llvm error message to help people migrate.
+ * parse.y (dsym): prohibit empty symbol literal by interpolation.
+ fixed: [ruby-talk:166529]
-Thu Nov 17 20:43:34 2011 Tanaka Akira <akr@fsij.org>
+Mon Nov 21 16:03:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dbm/extconf.rb: revert a part of the patch in [ruby-dev:41531].
- don't use db.h with other headers. [ruby-dev:44884].
+ * win32/setup.mk: findstr doesn't exist on win9x.
+ fixed: [ruby-dev:27756]
-Thu Nov 17 20:23:03 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Nov 20 21:39:27 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
- * benchmark/bm_io_select[23].rb: use Process::RLIMIT_NOFILE only when
- it is defined. if it is not defined, assume 64 as the max of fds.
+ * regparse.c (fetch_token_in_cc): tok->escaped should be
+ initialized. [ruby-dev:27763]
-Thu Nov 17 10:36:46 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Nov 20 22:34:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/psych/lib/psych.rb (load_file): make sure opened yaml files are
- also closed. [ruby-core:41088]
+ * parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
+ fixed: [ruby-talk:166520]
-Wed Nov 16 18:13:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Nov 19 19:57:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * Makefile.in (LIBRUBY_A): check if generated linked library is
- valid for extconf.
+ * lib/fileutils.rb (FileUtils::ln): ln documentation fix.
+ [ruby-core:06661]
-Wed Nov 16 13:51:40 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Nov 19 08:19:38 2005 Zach Dennis <zdennis@mktec.com>
- * bignum.c (rb_big2ulong): need to calc in unsigned long, because
- the range of VALUE is larger than it on LLP64 platform, such as Win64.
- this change fixes the failures of test/-ext-/num2int.
+ * ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
-Wed Nov 16 12:02:47 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Nov 19 07:34:32 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/webrick/test_cgi.rb (TestWEBrickCGI#start_cgi_server): there are
- no guarantee of existence of RbConfig::CONFIG['LIBPATHENV'].
- it only exists in Unix-like environments.
+ * ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
+ or 1.9).
- * test/webrick/test_filehandler.rb
- (WEBrick::TestFileHandler#test_script_disclosure): ditto.
+ * ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
-Wed Nov 16 11:34:20 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
- * io.c (argf_next_argv): wrong timing of setting ecflags.
- fixed the failure of TestArgf#test_textmode introduced at r33662.
+Fri Nov 18 18:07:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Wed Nov 16 10:45:00 2011 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]
- * ext/-test-/num2int/num2int.c: remove an unnecessary and wrong decl
- of rb_stdout. it's declared in ruby.h correctly.
+Fri Nov 18 17:35:09 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Nov 16 10:26:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/multi-tk.rb: add restriction to access the entried
+ command table and manipulate other IPs (for reason of security).
+ Now, a IP object can be controlled by only its master IP or the
+ default IP.
- * bignum.c (rb_big2ull): add a cast to get rid of a VC++ warning.
+ * ext/tk/lib/remote-tk.rb: add restriction to manipulate.
-Wed Nov 16 09:39:27 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/tcltklib.c (ip_is_slave_of_p): add TclTkIp#slave_of?(ip)
+ to check manipulability.
- * lib/minitest/unit.rb (assert_raises): experimental fix to run
- correctly on chkbuild over 64bit linux. call exception_details only
- when the detail is really needed to avoid create needless inspect
- under ulimit-ed environment.
+ * ext/tk/lib/tk.rb: bug fix on handling of Tcl's namespaces.
-Wed Nov 16 06:34:30 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk/namespace.rb: ditto.
- * test/ruby/test_thread.rb (test_condvar_timed_wait): use
- assert_operator.
+Fri Nov 18 16:47:33 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Nov 15 21:56:25 2011 Tanaka Akira <akr@fsij.org>
+ * file.c (rb_file_s_dirname): added checks for some patterns with drive
+ letter. fixed: [ruby-dev:27738]
- * test/ruby/test_sleep.rb (test_sleep_5sec): 0.1sec tolerance is too
- small for busy environment.
+ * test/ruby/test_path.rb (test_dirname): added tests for above
+ patterns.
-Tue Nov 15 20:08:55 2011 Tanaka Akira <akr@fsij.org>
+Fri Nov 18 12:19:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * io.c, thread.c, ext/pty/pty.c, ext/fiddle/closure.c: use
- __linux__ macro for consistency.
+ * win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
+ returns true on VisualC++6.
-Tue Nov 15 14:45:15 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Nov 17 17:58:00 2005 Kouhei Sutou <kou@cozmixng.org>
- * include/ruby/ruby.h(NUM2LONG, NUM2INT, NUM2SHORT, NUM2LL,
- INT2NUM, UINT2NUM, LONG2NUM, ULONG2NUM, NUM2CHR): wrap by
- macros.
+ * lib/rss/1.0.rb: added convenience method 'resources'.
-Tue Nov 15 13:38:14 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/rss/taxonomy.rb: ditto.
- * include/ruby/defines.h (FLUSH_REGISTER_WINDOWS): move sparc asm code
- to a separate file sparc.c for preventing inlining optimization.
- Patched by Jurij Smakov. [Bug #5244] [ruby-core:40685]
- * sparc.c (rb_sparc_flush_register_windows): ditto.
- * configure.in: ditto.
+ * test/rss/rss-assertions.rb: added test for 'resources'.
-Tue Nov 15 13:11:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/rss/test_taxonomy.rb: ditto.
- * include/ruby/ruby.h: get rid of gcc specific rb_long2int(),
- NUM2LONG(), NUM2INT(), NUM2SHORT(), NUM2LL(), INT2NUM(),
- UINT2NUM(), LONG2NUM(), ULONG2NUM() and NUM2CHR()
- implementation. Because 1) They don't make any better code
- at all. 2) Inline function have a better debugger supoort.
+Thu Nov 17 17:53:30 2005 Kouhei Sutou <kou@cozmixng.org>
-Tue Nov 15 09:58:25 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rss/taxonomy.rb: implemented taxonomy module.
- * test/ruby/test_io.rb (TestIO#test_fcntl_dupfd): fix OpenBSD test
- failure. [ruby-dev:44872]
+ * test/rss/test_taxonomy.rb: added tests for taxonomy support.
-Tue Nov 15 09:50:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Nov 17 17:40:19 2005 Kouhei Sutou <kou@cozmixng.org>
- * regcomp.c (print_indent_tree): fix double printing of ENCLOSE_OPTION
- children bug. patched by Suraj Kurapati. [ruby-core:40964]
+ * lib/rss/1.0.rb: added rdf:Bag.
-Tue Nov 15 01:53:48 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Thu Nov 17 13:52:00 2005 Kouhei Sutou <kou@cozmixng.org>
- * test/ruby/test_io.rb (test_fcntl_dupfd): fix test error on
- SnowLeopard. Pointed out by CHIKANAGA Tomoyuki. [ruby-dev:44866]
+ * lib/rss/rss.rb: removed needless argument 'prefix'.
-Mon Nov 14 22:06:02 2011 Tanaka Akira <akr@fsij.org>
+ * lib/rss/parser.rb: ditto.
- * ext/openssl/ossl_pkey.c (ossl_pkey_new_from_file): set close-on-exec
- flag.
+Wed Nov 16 23:24:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/ossl_x509cert.c (rb_fd_fix_cloexec): ditto.
+ * common.mk (static-ruby): overridable.
-Mon Nov 14 14:54:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/extmk.rb (parse_args): force to link extensions statically only
+ if static is given for extstatic.
- * bignum.c (rb_big2ull): fix 32bit platform breakage. we must
- not assume sizeof(VALUE) == sizeof(LONG_LONG).
- * test/-ext-/num2int/test_num2int.rb (class TestNum2int):
- fix false assumption on 32bit platform.
+ * ext/extmk.rb (RUBY, RUBYW): overridable.
-Mon Nov 14 14:52:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Nov 16 01:29:31 2005 Kouhei Sutou <kou@cozmixng.org>
- * numeric.c (rb_fix2ushort): fix typo. use num rb_num2ushort()
- instead of num2uint().
+ * lib/rss/trackback.rb: added TrackBack prefix.
-Sun Nov 13 10:31:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rss/maker/trackback.rb: ditto.
- * include/ruby/ruby.h: add #ifdef comment.
+Wed Nov 16 01:26:13 2005 Kouhei Sutou <kou@cozmixng.org>
-Sun Nov 13 10:28:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
- * include/ruby/ruby.h: add NUM2SHORT(), NUM2USHORT() macros.
- * numeric.c: ditto.
+ * test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
- * test/-ext-/num2int/test_num2int.rb: add testcases for NUM2SHORT().
- * ext/-test-/num2int/num2int.c: ditto.
+Tue Nov 15 23:54:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 13 10:23:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * file.c (file_load_ok): eaccess() returns 0 on success.
+ fixed: [ruby-dev:27713]
- * bignum.c (rb_big2ull): fix off-by-twice bug of NUM2ULL.
- * test/-ext-/num2int/test_num2int.rb (class TestNum2int):
- fix a testcase too.
+Tue Nov 15 16:36:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Nov 13 10:22:44 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * array.c (rb_ary_fill): previous commit disabled this usage:
- * test/-ext-/num2int/test_num2int.rb (class TestNum2int):
- add FIXNUM tests.
+ a = [0,1,2,3,4,5,6,7,8,9]
+ a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
-Sun Nov 13 09:57:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ previous commit has the advantage of early garbage collection, but
+ potentially this would break some script. so I reverted behavior.
- * numeric.c (check_uint): fix off-by-one bug of NUM2UINT.
- * bignum.c (rb_big2ulong): fix off-by-one bug of NUM2ULONG.
+Tue Nov 15 16:15:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/-ext-/num2int/test_num2int.rb: add a testcase for NUM2INT()
- NUM2UINT(), NUM2LONG(), NUM2ULONG(), NUM2LL and NUM2ULL().
- * ext/-test-/num2int/depend: ditto.
- * ext/-test-/num2int/extconf.rb: ditto.
- * ext/-test-/num2int/num2int.c: ditto.
+ * file.c (file_load_ok): use eaccess() instead of actually opening
+ the file. [ruby-talk:156378]
-Sun Nov 13 23:47:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/jcode.rb (String::reverse): add new methods.
+ [ruby-list:41245]
- * ext/dbm/extconf.rb: use convertible_int.
+Tue Nov 15 15:49:34 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Nov 13 23:45:57 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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])
- * lib/mkmf.rb (checking_for): should not modify the result.
+ * test/ruby/test_array.rb (test_fill): added.
- * lib/mkmf.rb (have_struct_member): accept compiler options.
+Tue Nov 15 14:39:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb (convertible_int): add restricted support of struct
- member, and TYPEOF_ macro.
+ * array.c (rb_ary_fill): should adjust array length correctly when
+ an array is expanded in the fill process. [ruby-core:06625]
-Sun Nov 13 23:21:24 2011 Tanaka Akira <akr@fsij.org>
+Mon Nov 14 23:49:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/gdbm/gdbm.c (fgdbm_reorganize): set close-on-exec flag after
- gdbm_reorganize(). gdbm_reorganize() opens a new database internally.
+ * file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
+ [ruby-dev:27699]
-Sun Nov 13 19:57:18 2011 Tanaka Akira <akr@fsij.org>
+Mon Nov 14 17:36:22 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/dbm/extconf.rb: rollback for each headers for each libraries.
+ * array.c (rb_ary_first): RDoc update from Daniel Berger
+ <djberg96@yahoo.com>. [ruby-core:06577].
-Sun Nov 13 16:24:48 2011 Tanaka Akira <akr@fsij.org>
+Sun Nov 13 10:55:24 2005 Minero Aoki <aamine@loveruby.net>
- * ext/dbm/extconf.rb: treat libc as a choice for a library which
- provide ndbm API.
+ * lib/uri/common.rb (escape): regard second argument as a
+ character set. [ruby-dev:27692]
-Sun Nov 13 15:40:43 2011 Tanaka Akira <akr@fsij.org>
+Sat Nov 12 08:36:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dbm/extconf.rb: duplicate $libs and $defs when save them.
+ * configure.in, eval.c, intern.h: check fd_mask type.
-Sun Nov 13 12:43:48 2011 Tanaka Akira <akr@fsij.org>
+ * configure.in (socketpair): need to be checked.
- * ext/dbm/extconf.rb: rollback $libs and $defs when db detection is
- failed. It fixes -lgdbm -lqdbm when the system has qdbm and gdbm
- without gdbm_compat.
+Fri Nov 11 19:53:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sat Nov 12 21:14:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * eval.c, intern.h: failed to compile where NFDBITS is defined but
+ howmany() is not defined. [ruby-dev:27680]
- * test/webrick/test_cgi.rb (class TestWEBrickCGI): respect
- RbConfig::CONFIG["LIBPATHENV"]. [Bug #5135] [ruby-core:38653]
- * test/webrick/test_filehandler.rb (class WEBrick): ditto.
+ * io.c (is_socket): failed to compile where S_ISSOCK is not defined.
-Sat Nov 12 20:57:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * io.c (pipe_open): failed to compile where socketpair is not supported.
- * test/ruby/test_io.rb (test_fcntl_dupfd): skip if Fcntl::DUPFD
- is not defined. Pointed out by CHIKANAGA Tomoyuki. Thanks.
+Fri Nov 11 08:20:56 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 12 17:26:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * Makefile.in (OUTFLAG): keep trailing spaces. [ruby-dev:27666]
- * io.c (do_ioctl, ioctl_narg_len, setup_narg, rb_ioctl): use
- ioctl_req_t.
+ * mkconfig.rb: substitution references added.
-Sat Nov 12 17:01:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 11 07:39:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/dbm/extconf.rb (headers.db_check): reduce duplicated code.
+ * configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
+ EINVAL, and this causes error in test/fileutils.)
-Sat Nov 12 15:59:42 2011 Tanaka Akira <akr@fsij.org>
+ * file.c: override 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]
- * ext/dbm/extconf.rb: dbm_clearerr should be available in all ndbm
- implementation. If it is not available, it is caused by
- header/library mismatch such that Berkeley DB header & gdbm library.
+Thu Nov 10 21:05:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dbm/dbm.c (fdbm_store): use dbm_clearerr() unconditionally.
- gdbm 1.9 provides it as a real function instead of a empty macro.
+ * lib/shellwords.rb: fix for blank but not empty string.
+ fixed: [ruby-dev:27663]
-Sat Nov 12 13:35:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Nov 9 08:39:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * bootstraptest/runner.rb: don't suppress SIGINT.
- [Feature #5612] [ruby-dev:44856]
+ * lib/shellwords.rb: refactored. [ruby-core:06581]
-Sat Nov 12 11:20:36 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Nov 8 17:35:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * io.c (fcntl_narg_len): introduce narg calculation for fcntl instead
- of hard coded 256.
- * io.c (setup_narg): ditto.
+ * intern.h, eval.c (rb_thread_signal_raise): constified.
-Sat Nov 12 11:19:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * signal.c: cosmetic change.
- * test/ruby/test_io.rb (test_fcntl_dupfd): add another fcntl test.
+Tue Nov 8 15:32:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Sat Nov 12 11:18:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
+ [ruby-dev:27560] [ruby-core:4627]
- * test/ruby/test_io.rb (test_fcntl_lock_freebsd): add a testcase
- of fcntl lock for freebsd.
+Mon Nov 7 20:54:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 12 11:16:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/iconv/iconv.c: iconvctl() support. [EXPERIMENTAL]
- * io.c (ioctl_narg_len): Linux doesn't have IOCPARM_LEN macro, but
- has _IOC_SIZE. support it.
+Mon Nov 7 16:23:23 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Nov 12 11:13:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/openssl/ossl.h: need to include winsock2.h before including
+ windows.h by some openssl headers.
- * io.c (rb_ioctl): don't expose our sanity check value to ruby script.
- It may change string value meaning if the value is string.
- (e.g. MacOS X has F_GETPATH ioctl)
- * io.c (rb_fcntl): ditto.
+Mon Nov 7 13:43:51 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat Nov 12 11:06:02 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/tk/stubs.c (_nativethread_consistency_check): use simpler
+ (low cost) way to check whether the Tcl interpreter was compiled
+ with threads enabled of not.
- * io.c (ioctl_req_t): Type of req argument of ioctl() depend on platform.
- Moreover almost all linux ioctl can't be represented by 32bit integer
- (i.e. MSB is 1). We need wrap ioctl argument type.
- [Bug #5429] [ruby-dev:44589]
- * io.c (struct ioctl_arg): ditto.
- * io.c (rb_ioctl): ditto.
- * test/ruby/test_io.rb (test_ioctl_linux): add a testcase for ioctl
+ * ext/tk/tcltklib.c: reduce warnings.
-Sat Nov 12 11:00:42 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/tk/tkutil/tkutil.c: ditto.
- * io.c (struct io_cntl_arg): remove io_p member.
- * io.c (nogvl_fcntl, do_fcntl, rb_fcntl): separated from ioctl functions.
- * io.c (nogvl_io_cntl): remove fcntl depended logic.
- * io.c (io_cntl): ditto.
- * io.c (rb_io_ctl): ditto.
- * io.c (rb_io_ioctl): ditto.
+Mon Nov 7 00:06:12 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sat Nov 12 10:59:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
- * io.c (setup_narg): fix off by one bug.
+Sun Nov 6 23:39:13 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 12 10:56:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
+ bug of underlying library.
- * io.c (+setup_narg): factor out length calculation logic.
- * io.c (rb_io_ctl): ditto.
+Sun Nov 6 21:43:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sat Nov 12 10:52:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
+ interpreter after initialization is done. [ruby-dev:27638]
- * io.c (+ioctl_narg_len) new helper function.
- * io.c (rb_io_ctl): don't use ioctl specific length check
- if caller is fcntl.
+Sun Nov 6 20:13:27 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 11 23:00:46 2011 Tanaka Akira <akr@fsij.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]
- * ext/dbm/extconf.rb: db_prefix is not required now.
+Sat Nov 5 13:42:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Nov 11 21:13:30 2011 Tanaka Akira <akr@fsij.org>
+ * configure.in, cygwin/GNUmakefile.in (mingw): use def file to alias
+ symbols. [ruby-dev:27532]
- * ext/gdbm/gdbm.c (fgdbm_initialize): use GDBM_CLOEXEC if available.
+ * bcc32/mkexports.rb, win32/mkexports.rb: make aliases in DLL.
-Fri Nov 11 21:00:05 2011 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c, win32/win32.h: replace symbols only when RUBY_EXPORT
+ is defined.
- * ext/dbm/extconf.rb: fix dbm_pagfno and dbm_dirfno detection with
- Berkeley DB. Macro definitions needs arguments to detect correctly.
- SIZEOF_DSIZE needs -DDB_DBM_HSEARCH because db.h defines datum type
- only if DB_DBM_HSEARCH is defined.
+Thu Nov 3 07:57:39 2005 Minero Aoki <aamine@loveruby.net>
-Fri Nov 11 18:41:57 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/open-uri.rb (open_loop): find_proxy should return nil when
+ proxy does not exist. [ruby-dev:27630]
- * process.c (proc_seteuid): separate an internal wrapper function
- from the method implementation.
+Wed Nov 2 20:25:28 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Nov 11 17:21:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
+ for Win32.
- * lib/mkmf.rb (have_library, find_library, have_func): allow
- arguments of function to be checked.
+Wed Nov 2 19:03:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Nov 11 17:09:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/tcltklib.c (ip_rbUpdateObjCmd, ip_rb_threadUpdateObjCmd):
+ passed improper flags to DoOneEvent().
- * vm_dump.c (HAVE_BACKTRACE): fallback to 0.
+ * ext/tk/tkutil/tkutil.c: use rb_obj_respond_to() instead of
+ rb_respond_to().
- * vm_dump.c (rb_vm_bugreport): show "Other runtime information"
- header only when available.
+Tue Nov 1 14:20:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_dump.c (rb_vm_bugreport): get rid of modifying the content of
- VM directly.
+ * eval.c (rb_call_super): should call method_missing if super is
+ called from Kernel method.
- * vm_dump.c (rb_vm_bugreport): check if vm is non-null.
- Pointed out by Ikegami Daisuke <ikegami.da@gmail.com>.
- Thank you.
+ * eval.c (exec_under): frame during eval should preserve external
+ information.
-Fri Nov 11 12:36:37 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Nov 1 10:48:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * io.c (pipe_open): Remove fflush(stdin). it's no effect.
- Pointed out by Ikegami Daisuke <ikegami.da@gmail.com>.
- Thank you.
+ * ext/openssl/extconf.rb: should check ERR_peek_last_error().
+ [ruby-dev:27597]
-Fri Nov 11 07:33:30 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/openssl/ossl.c (ossl_raise): ditto.
- * lib/net/http.rb (Net::HTTP::SSL_ATTRIBUTES): Use symbol keys instead
- of string keys to avoid duplicating parameters in
- OpenSSL::SSL:SSLContext#set_params.
+Mon Oct 31 17:34:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Nov 10 15:02:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in: use proper option for Sun linker. A patch from
+ Shinya Kuwamura <kuwa at labs.fujitsu.com>. [ruby-dev:27603]
- * lib/mkmf.rb (have_library, have_func, have_var, have_header):
- add compiler option parameter.
+Mon Oct 31 05:46:08 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Nov 10 07:45:16 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
+ not be empty. [ruby-talk:161220]
- * ext/openssl/lib/openssl/ssl.rb (class OpenSSL::SSL::SSLContext):
- Document #set_params.
+ * test/openssl/test_cipher.rb: add test for Cipher#update("").
-Wed Nov 9 11:36:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Oct 31 05:38:26 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield().
- [Bug #5130] [ruby-core:38647]
+ * lib/webrick/httpservlet/cgihandler.rb
+ (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
+ header field should be splited into each cookie. [ruby-Bugs:2199]
-Wed Nov 9 23:20:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
+ to parse the value of Set-Cookie: header field.
- * io.c (rb_update_max_fd): fstat(2) can fail with other than
- EBADF. [ruby-dev:44837] [Bug #5593]. Cf.
- http://pubs.opengroup.org/onlinepubs/9699919799/functions/fstat.html
+ * test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
+ test/webrick/webrick.cgi: add some test for cookie.
- * io.c (rb_sysopen): max fd is updated in rb_sysopen_internal()
- already.
+Mon Oct 31 02:33:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Nov 9 22:13:38 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * numeric.c (fix_rshift): RDoc fix. [ruby-core:6351]
- * test/ruby/test_file.rb (TestFile#test_utime_with_minus_time_segv):
- fixed previous commit.
+ * util.h (strtod): add #undef for platforms defines strtod()
+ macro. [ruby-dev:27563]
-Wed Nov 9 19:53:45 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Oct 31 02:31:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * test/ruby/test_file.rb (TestFile#test_utime_with_minus_time_segv):
- add test for r33685.
+ * test/ruby/test_float.rb (test_precision): test by assert_in_delta.
+ [ruby-dev:27575]
-Wed Nov 9 19:00:44 2011 Koichi Sasada <ko1@atdot.net>
+Sat Oct 29 01:58:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_fiber.rb: add tests for r33684 (Fiber#resume).
+ * ext/etc/etc.c: document update from mathew <meta@pobox.com>.
+ [ruby-core:06473]
-Wed Nov 9 16:40:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/fcntl/fcntl.c: ditto.
- * win32/win32.c (unixtime_to_filetime): should check the return value
- of localtime(). reported by snowjail at gmail.com.
- [ruby-dev:44838] [Bug #5596]
+Sat Oct 29 16:56:03 2005 Tadayoshi Funaba <tadf@dotrb.org>
-Thu Nov 9 13:17:25 2011 Koichi Sasada <ko1@atdot.net>
+ * lib/date.rb: added seven predicates sunday? to saturday?.
- * cont.c (rb_fiber_m_transfer, rb_fiber_resume): prohibit using
- "resume" after "transfer" method are used. You should not mix
- "resume" fiber and "transfer" fiber.
- [Bug #5526]
+ * lib/date.rb: added two methods {prev,next}_month,
+ that are almost same as << and >>.
- * NEWS: add information about this change.
+Thu Oct 27 20:34:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 9 11:40:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enumerator.c (enumerator_allocate): allow subclassing.
- * template/Doxyfile.tmpl (INCLUDE_PATH): add srcdir and include.
- [ruby-core:40843] [Bug #5597]
+Thu Oct 27 16:45:31 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Nov 9 11:02:54 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * string.c (scan_once): wrong condition to use mbclen2().
+ [ruby-dev:27535]
- * thread.c (do_select): fix cast, tv_sec is time_t.
+Thu Oct 27 11:53:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Wed Nov 9 10:32:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * missing.h, missing/memcmp.c, missing/memmove.c:
+ ANSI compatible interface.
- * configure.in: should not use test -e for portability.
- [ruby-core:40841] [Bug #5594]
+Wed Oct 26 09:15:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Wed Nov 9 04:52:16 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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]
- * ext/psych/lib/psych/tree_builder.rb: dump complex numbers,
- rationals, etc with reference ids.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
- * ext/psych/lib/psych/visitors/to_ruby.rb: loading complex numbers,
- rationals, etc with reference ids.
- * test/psych/test_object_references.rb: corresponding tests
+Wed Oct 26 01:58:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Nov 8 23:34:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in (RUBY_EXTERN): macro to export symbols in shared
+ library. [ruby-core:05528]
- * ext/dbm/dbm.c (fdbm_fetch, fdbm_key, fdbm_delete, fdbm_store)
- (fdbm_has_key, fdbm_has_value): get rid of overflow.
+ * defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
+ configuration pass.
- * ext/gdbm/gdbm.c (rb_gdbm_fetch2, rb_gdbm_nextkey)
- (rb_gdbm_delete, fgdbm_store, fgdbm_has_key): ditto.
+ * ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
- * ext/dbm/dbm.c (fdbm_delete_if): hide intermediate objects.
+Tue Oct 25 20:06:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/gdbm/gdbm.c (fgdbm_delete_if): ditto.
+ * 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]
- * ext/dbm/extconf.rb: check size of datum.dsize to get rid of
- overflow.
+Tue Oct 25 15:32:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 8 23:30:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/rational.rb: applied documentation patch from Gavin Sinclair
+ <gsinclair@gmail.com>. [ruby-core:06364]
- * addr2line.c (PATH_MAX): define if not defined. [ruby-core:40840]
+ * lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
+ in irb auto-indentation mode. [ruby-core:06358]
-Tue Nov 8 23:26:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Oct 25 14:21:46 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c (rb_thread_critical): fix type.
+ * gc.c (garbage_collect): sorry, previous commit was incorrect.
+ [ruby-core:6386]
- * ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core): int is
- enough for micro seconds. may need to check overflow in the
- setter though.
+Tue Oct 25 13:40:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/tk/tcltklib.c (RSTRING_LENINT): check overflow if necessary.
+ * gc.c (garbage_collect): return now whether there're rooms for new
+ objects, rather than whether GC run. fixed: [ruby-core:6376]
- * ext/tk/tcltklib.c (RbTk_ALLOC_N): wrapper for ckalloc() which
- takes an int.
+Tue Oct 25 02:12:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/tk/tcltklib.c (ip_ruby_cmd_receiver_get, tcltklib_compile_info):
- get rid overflow.
+ * lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
+ reduce redundant backtrack. [ruby-talk:161771]
- * ext/tk/tcltklib.c (tcltklib_compile_info): constified.
+Tue Oct 25 00:35:33 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Nov 8 20:50:45 2011 Tanaka Akira <akr@fsij.org>
+ * lib/rinda/*: RDoc documentation from Eric Hodel
+ <drbrain@segment7.net> added.
- * test/dbm/test_dbm.rb: split tests for read only database.
+Mon Oct 24 21:14:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/gdbm/test_gdbm.rb: ditto.
+ * configure.in, io.c: use sys/syscall.h if syscall.h is not available.
+ [ruby-core:06247]
-Tue Nov 8 18:59:07 2011 Tanaka Akira <akr@fsij.org>
+Mon Oct 24 20:38:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/pty/pty.c (MasterDevice): define only when used.
- (SlaveDevice): ditto.
- (deviceNo): ditto.
+ * ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
+ fixed: [ruby-list:40058], [ruby-dev:27479]
-Tue Nov 8 17:59:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 24 11:01:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * include/ruby/ruby.h (rb_long2int): define as a macro always, so
- that cpp conditionals can tell if it is provided.
+ * ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
+ typo fixed. [ruby-talk:162187]
-Tue Nov 8 17:30:50 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
+ ditto. [ruby-core:06359]
- * lib/mkmf.rb (cpp_command): remove multiple -arch flags since cpp
- cannot work.
+Mon Oct 24 07:57:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 8 14:50:55 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
+ typo fixed. [ruby-talk:162187]
- * io.c (io_fwrite): call rb_w32_write_console() only if FMODE_TTY is
- set. this is the one of the reason of IO writing slowness of Windows
- in 1.9.3 or later.
+ * ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
+ ditto. [ruby-core:06359]
-Tue Nov 8 11:01:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * 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]
- * ext/pty/pty.c (get_device_once): FreeBSD 8 supported O_CLOEXEC flag
- for posix_openpt, but FreeBSD 9's posix_openpt doesn't support
- O_CLOEXEC and fails if specified.
+Mon Oct 24 00:41:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 8 02:36:45 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * time.c (time_sunday): added predicate methods for the days of the
+ week. [ruby-list:41340]
- * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK,
- ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro.
+Sun Oct 23 07:11:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv):
- set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO
- if the flag is available.
+ * ext/tk/extconf.rb: improve messages [ruby-core:06325].
- * io.c (make_writeconv): drop decorators for reading.
+ * 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,
+ ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
+ ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
+ ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
+ ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
+ ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
- * io.c (make_readconv): drop decorators for writing.
+ * ext/tk/lib/tkextlib/*: ditto.
- * io.c (do_writeconv): existing writeconv is not the condition to raise
- ArgumentError. should check textmode or not.
+ * ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
- * test/ruby/test_io_m17n.rb
- (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above
- changes.
+ * ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
+
+ * ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
+
+ * ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
+
+ * ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
+
+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
+ if valid as a symbol name more strictly. [ruby-dev:27478]
+
+ * test/ruby/test_symbol.rb: tests for [ruby-core:03573].
+
+ * 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>
+
+ * rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
+
+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>
+
+ * bignum.c (bignew_1): convertion from `int' to `char' discards
+ upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
+ nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
+ (but I believe this won't cause actual bug in current implementation)
+ [ruby-dev:27055]
+
+ * 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>
+
+ * lib/mkmf.rb (create_makefile): Borland make seems not to allow
+ empty dependency list. If this change is not good, please correct
+ it.
+
+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.
+
+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 08:28:32 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_file_join): elements may contain null pointer strings.
+ report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
+
+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.
+
+ * win32/Makefile.sub (distclean-local): should remove .config.h.time.
+
+Mon Oct 17 09:42:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * mkconfig.rb: fixup configure_args for mswin32 configure.
+
+ * win32/configure.bat (srcdir, target): ditto.
+
+Mon Oct 17 05:01:50 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * env.h: move struct METHOD and struct BLOCK from eval.c to
+ support NodeWrap and ParseTree.
+
+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>
+
+ * lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
+ tuple. fixed: [ruby-list:41227]
+
+ * test/rinda/test_rinda.rb: test it.
+
+Sun Oct 16 03:38:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * rubysig.h (CHECK_INTS): prevent signal handler to run during
+ critical section. [ruby-core:04039]
+
+ * eval.c (load_wait): need not to call rb_thread_schedule()
+ explicitly. [ruby-core:04039]
+
+ * 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>
+
+ * 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>
+
+ * win32/win32.c (ioctl): should set errno.
+
+Fri Oct 14 16:39:37 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.
+ fixed: [ruby-core:06261]
+
+ * 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>
+
+ * ext/openssl/ossl.c (Init_openssl): should call
+ OpenSSL_add_ssl_algorithms().
+
+Wed Oct 12 11:08:54 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * file.c (rb_f_test): typo in RDoc comments.
+
+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]
+
+ * eval.c (rb_respond_to): conform to Object#respond_to?. [ruby-dev:27411]
+
+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>
+
+ * 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>
+
+ * 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.
+
+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>
+
+ * lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
+ of "join".
+
+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).
+ [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.
+ fixed by Doug Kearns. [ruby-core:06053]
+
+Thu Sep 29 00:57:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
+ autoload succeeded.
+
+ * 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>
+
+ * file.c (rb_stat_inspect): constified.
+
+Wed Sep 28 15:12:28 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]
+
+ * 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].
+
+Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
+ [ruby-dev:27237], [ruby-core:05854]
+
+ * lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
+
+ * lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
+
+Wed Sep 28 03:16:41 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * rubysig.h: fixed build problem with --enable-pthread on platforms
+ which don't have setitimer().
+
+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>
+
+ * 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.
+ fixed: [ruby-list:41168]
+
+ * misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
+ 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>
+
+ * 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.
+
+Sat Sep 24 08:54:05 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.
+
+Sat Sep 24 08:29:36 2005 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
+ DryRun. [ruby-core:05954]
+
+ * test/fileutils/test_nowrite.rb: test it.
+
+ * test/fileutils/test_dryrun.rb: new file.
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * ext/ripper/depend (SUFFIXES): no longer needed.
+
+ * ext/ripper/depend (c): avoid nmake problem. fixed [ruby-dev:27191]
+
+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
+ scalar's parent node. [ruby-talk:150620]
+
+Wed Sep 21 08:20:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * README.EXT, README.EXT.ja: add new features.
+
+Wed Sep 21 07:43:58 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (default_argv, Arguable#options): defaults strings
+ to be parsed to Arguable instance.
+
+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>
+
+ * numeric.c (fix_idiv): 1.div(1.0) should return integer value.
+ [ruby-dev:27235]
+
+Tue Sep 20 22:25:43 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]
+
+Tue Sep 20 18:20:33 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/yaml.rb: require 'yaml/constants'. [ruby-core:5776]
+
+Tue Sep 20 17:48:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
+ information to content-type header.[ruby-core:5127]
+
+ * lib/xmlrpc/server.rb (CGIServer::serve): ditto.
+
+ * lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
+
+ * lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
+
+Tue Sep 20 17:26:42 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 15:39:40 2005 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
+ appearing alone or at the end of plain scalars. [ruby-core:5826]
+
+ * ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
+ as complex keys.
+
+ * lib/syck.h: version 0.60.
+
+ * lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
+ key searches.
+
+ * 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>
+
+ * 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>
+
+ * file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
+
+Mon Sep 19 18:29:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (file_expand_path): allow pathnames to expand.
+ [ruby-dev:27152]
+
+Mon Sep 19 15:12:15 2005 Minero Aoki <aamine@loveruby.net>
+
+ * ext/ripper/depend: do not make ripper/core.rb. [ruby-dev:26462]
+
+Mon Sep 19 14:49:19 2005 Minero Aoki <aamine@loveruby.net>
+
+ * ext/ripper/eventids2.c: add prefix `t' to tLAMBDA-related lexer
+ events.
+
+ * ext/ripper/lib/ripper/core.rb: updated.
+
+Mon Sep 19 14:39:46 2005 Minero Aoki <aamine@loveruby.net>
+
+ * parse.y (do_block): do_block event dispatches 2 args.
+ [ruby-dev:26964]
+
+ * ext/ripper/lib/ripper/core.rb: updated.
+
+ * ext/ripper/tools/list-parser-event-ids.rb: check arity mismatch.
+
+Mon Sep 19 07:45:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:
+ an instance variable "private" is added to OpenSSL::PKey class.
+ this ivar is a flag that shows whether there is a private key
+ in the instance.
+
+ * 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:38:03 2005 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb: method renaming: collect_methods ->
+ collect_method.
+
+Mon Sep 19 05:58:59 2005 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb: use module_function instead of single extend.
+
+ * test/fileutils/test_fileutils.rb: test existence of singleton
+ methods.
+
+Mon Sep 19 05:32:41 2005 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (remove_entry_secure): does not use chdir(2).
+
+Mon Sep 19 03:17:48 2005 Tanaka Akira <akr@m17n.org>
+
+ * file.c (rb_thread_flock): wrap the flock system call by
+ TRAP_BEG/TRAP_END to enable signals. [ruby-dev:27122]
+
+ * ext/socket/socket.c (bsock_send): wrap the sendto and send system
+ call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
+ 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]
+
+ * file.c (rb_file_join): call FilePathValue() to all Pathnames to
+ join. [ruby-dev:27127]
+
+ * 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]
+
+Sun Sep 18 02:10:47 2005 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml/rubytypes.rb: remove comments that are bungling up
+ the rdoc and ri output. output symbols as plain scalars.
+
+ * ext/syck/rubyext.c (syck_emitter_reset): emit headless
+ documents always.
+
+ * ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
+ kind of surrounding line space, tabs or spaces alike.
+
+ * ext/syck/token.c: accept tabs as whitespace, not for indentation,
+ but strip from plain scalars.
+
+ * 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
+ operand. [ruby-core:05806]
+
+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
+ should call Kernel.eval on caller's safe-level instead of slave's
+ safe-level (Of course, the given script should be evaluated on
+ slave's safe-level).
+
+Sat Sep 17 09:45:26 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_substr): should propagate taintness even for
+ empty strings. [ruby-dev:27121]
+
+ * string.c (rb_str_aref): should infect result if range argument
+ is tainted. [ruby-dev:27121]
+
+Sat Sep 17 08:35:39 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
+ strange RSS::Maker::Item#max_size behavior.
+ Thanks to Kazuhiko <kazuhiko@fdiary.net>.
+
+ * 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>
+
+ * lib/net/imap.rb: supported DIGEST-MD5. Thanks, Mathieu Arnold.
+
+ * lib/net/imap.rb: use fcall instead of send. Thanks, Satoru
+ Takabayashi.
+
+Fri Sep 16 22:45:49 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]
+
+ * 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
+ void function. a patch from MIYAMUKO Katsuyuki
+ <miyamuko at mtb.biglobe.ne.jp>. [ruby-dev:27111]
+
+Fri Sep 16 14:48:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
+
+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>
+
+ * test/logger/test_logger.rb: unintentionally overwritten changes by
+ Usa. reverted.
+
+Fri Sep 16 00:03:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
+ $stdout.binmode.
+
+Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
+
+ #nnn is a ticket number at http://dev.ctor.org/soap4r
+
+ * 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
+ @client.options["soap.envelope.responsenamespace"] =
+ TemporaryNamespace
+ @client.do_proc(...)
+
+ * let SOAP request XML indent space configurable. see
+ "soap.envelope.no_indent" option. (#130)
+
+ * let external CES configurable.
+ ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used
+ by default. (#133)
+ external CES ::= CES used in Ruby object of client and server
+ internal CES ::= CES used in SOAP/OM
+
+ * add iso-8859-1 external CES support. (#106)
+
+ * fixed illegal 'qualified' handling of elements. it caused
+ ASP.NET interoperability problem. (#144)
+
+ * added 'soap.envelope.use_numeric_character_reference' (boolean)
+ option to let query XML use numeric character reference in XML,
+ not plain UTF-8 character. !GoogleSearch server seems to not
+ allow plain UTF-8 character since 2005-08-15 update. (#147)
+
+ * SOAP::Header::SimpleHeader (de)serialization throws an exception
+ on !SimpleHeader.on_(in|out)bound when header is a String. so we
+ could not use a simple single element headerItem. fixed. thanks
+ to emil. (#129)
+
+ * out parameter of rpc operation did not work. (#132)
+
+ * follow HTTP redirect only if using http-access2. (#125) (#145)
+
+ * add a workaround for importing an WSDL whose path begins with
+ drive letter. (#115)
+
+ * WSDL
+
+ * SOAP Data which is defined as a simpletype was not mapped
+ correctly to Ruby obj when using wsdl2ruby.rb generated classdef
+ file. (#123)
+
+ * rpc/literal support. (#118)
+
+ * re-implemented local element qualify/unqualify control. handles
+ elementFormDefault and form in WSDL. (#119)
+
+ * Array of an element which has simpleType causes a crash. (#128)
+
+ * parameterOrder may not contain return part so it can be shorter
+ than parts size. Thanks to Hugh. (#139)
+
+ * Samples
+
+ * added !BasicAuth client sample. (#117)
+
+ * added Base64 client/server sample.
+
+ * added Flickr SOAP interface client sample. (#122)
+
+ * added !SalesForce client sample. (#135)
+
+ * updated Thawte CA certificate for !GoogleAdWords sample.
+
+ * updated a client script with the newer version made by Johan.
+ thanks!
+
+ * shortened long file names. (#120)
+
+ * fixed typo in authheader sample. (#129)
+
+ * updated deprecated method usage. (#138)
+
+Thu Sep 15 22:40:27 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_signal.rb (test_exit_action): skip the test using
+ fork on fork-less platforms.
+
+Thu Sep 15 13:54:33 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb: add :read_timeout option.
+ [ruby-core:4848]
+
+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>
+
+ * 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.
+
+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>
+
+ * dir.c: changed `foo (*bar)_((boo))' to `foo (*bar)(boo)`.
+
+ * enumerator.c, eval.c, gc.c, intern.h, io.c, process.c, ruby.c,
+ ruby.h, signal.c: ditto.
+
+Wed Sep 14 15:06:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * 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.
+
+Tue Sep 13 22:09:40 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/logger.rb (Logger): added formatter accessor to logger for
+ dictating the way in which the logger should format the messages it
+ displays. Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and
+ Daniel Berger.
+
+ * lib/logger.rb (Logger): added VERSION constant.
+
+ * lib/logger.rb: removed document for LogDevice. It is an
+ implementation detail and is not a public interface.
+
+ * test/logger/test_logger.rb: added tests.
+
+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>
+
+ * ruby.h (PRINTF_ARGS): new macro for printf style argument checking.
+
+Tue Sep 13 15:41:29 2005 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: wrote documentation of HTTPRequest/HTTPResponse
+ classes.
+
+Tue Sep 13 14:27:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * 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)
+
+Tue Sep 13 12:33:05 2005 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml.rb: reworking YAML::Stream to use the new
+ emitter.
+
+ * lib/yaml/stream.rb: ditto.
+
+ * lib/yaml/rubytypes.rb: added Object#yaml_new.
+
+ * lib/yaml/tag.rb: the tag_subclasses? method now
+ shows up in the class. allow taguri to be set using an accessor.
+ 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,
+ 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.
+ new Resolver#tagurize converts type ids to taguris.
+
+ * ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
+
+ * ext/syck/emitter.c: renovated emitter, walks the tree in advance.
+ consolidated redundant block_styles struct into
+ the scalar_style struct. (this means loaded nodes can now
+ be sent back to emitter and preserve at least its very basic
+ formatting.)
+
+ * ext/syck/gram.c: headless documents of any kind allowed.
+
+ * ext/syck/node.c: new syck_replace_str methods and syck_empty_*
+ methods for rewriting node contents, while keeping the ID
+ and other setup info. added syck_seq_assign.
+
+ * 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
+ 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>
+
+ * lib/net/imap.rb (starttls): supported the STARTTLS command.
+
+Sun Sep 11 22:18:07 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>
+
+ * 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.
+
+ require "openssl"
+ pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
+ e.ctrl_cmd("SO_PATH", "/usr/lib/opensc/engine_pkcs11.so")
+ e.ctrl_cmd("LIST_ADD", "1")
+ e.ctrl_cmd("LOAD")
+ }
+ pkcs11.ctrl_cmd("PIN", "secret")
+ key = pkcs11.load_private_key
+
+ * ext/openssl/ossl_engine.c (ossl_engine_ctrl_cmd): new method
+ 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.
+
+Wed Sep 7 15:48:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
+
+ * ext/openssl/ossl_pkcs7.c: new class OpenSSL::PKCS7::RecipientInfo.
+ this class wraps PKCS7_RECIP_INFO struct.
+
+ * ext/openssl/ossl_pkcs7.c: OpenSSL::PKCS7::Signer is renamed to
+ OpenSSL::PKCS7::SignerInfo. ("Signer" remains as an alias of
+ SignerInfo.)
+
+ * test/openssl/test_pkcs7.rb: new file.
+
+Wed Sep 7 12:55:08 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb: abolish mod === tempfile to avoid a problem
+ [ruby-dev:26967].
+
+Wed Sep 7 10:45:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_switch): convert all exceptions to
+ SystemExit. fixed: [ruby-core:05724]
+
+ * 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
+ extension libraries.
+
+ * bignum.c (bignew_1, bigadd): K&R style argument actually can't be
+ defined as char.
+
+ * missing/vsnprintf.c: ANSI compiler supports const keyword.
+
+ * ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
+ but no 64bit integer.
+
+ * lib/mkmf.rb (what_type?): guesstimate type.
+
+ * 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]
+
+Mon Sep 5 22:28:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (stmt, mlhs_node, lhs, arg, method_call): aref_args might be
+ nothing. fixed: [ruby-dev:26952]
-Mon Nov 7 22:03:47 2011 Tanaka Akira <akr@fsij.org>
+ * ext/ripper/eventids2.c: added new tokens. fixed: [ruby-dev:26952]
- * ext/gdbm/gdbm.c (fgdbm_initialize): set close-on-exec flag.
+Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 7 20:31:52 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/find.rb: should raise ENOENT if root entry does not exist.
+ [ruby-list:41054]
- * ext/psych/lib/psych/scalar_scanner.rb: make sure strings that look
- like base 60 numbers are serialized as quoted strings.
- * test/psych/test_string.rb: test for change.
+ * 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 Nov 7 20:26:37 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Sep 5 08:20:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/psych/test_yamlstore.rb: make test case inherit from MiniTest,
- load psych/helper so that psych is loaded.
+ * lib/observer.rb: a patch from nornagon <nornagon at gmail.com>
+ merged to allow arbitrary names for update methods.
+ [ruby-core:05416]
-Mon Nov 7 20:18:29 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Sep 5 07:01:12 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * test/psych/test_yamldbm.rb: Test case should inherit from MiniTest,
- load psych/helper so that psych and friends are loaded.
+ * ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
+ should clear data from the buffer which already been output.
-Mon Nov 7 20:15:44 2011 Tanaka Akira <akr@fsij.org>
+Sun Sep 4 15:01:35 2005 Minero Aoki <aamine@loveruby.net>
- * ext/dbm/extconf.rb: check dbm_pagfno() and dbm_dirfno().
+ * parse.y (f_arg): Ripper should not do semantic check.
+ [ruby-dev:26948]
- * ext/dbm/dbm.c: use above to set close-on-exec flag.
+Sat Sep 3 23:52:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Nov 7 20:05:16 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_f_fcall): new method to avoid inefficiency of
+ obj.instance_eval{send(...)} tricks.
- * io.c (io_fflush): remove fsync().
+Sat Sep 3 13:59:31 2005 Tanaka Akira <akr@m17n.org>
- * io.c (rb_io_flush, rb_io_rewind): fsync() here.
+ * lib/pathname.rb (Pathname#descend): Pathname.new("./a/b/c").descend
+ didn't yield "."
+ (Pathname#ascend): ditto.
- these changes reduces fsync() calls to improve performance.
- first reported at [ruby-list:48515] by ak7 at mail.goo.ne.jp .
- [Bug #5585]
+Fri Sep 2 23:51:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Nov 7 19:43:10 2011 Tanaka Akira <akr@fsij.org>
+ * parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID.
+ fixed: [ruby-dev:26942]
- * io.c (rb_close_before_exec): use F_MAXFD if available.
- F_MAXFD is available on NetBSD since NetBSD 2.0.
+ * lib: do not use __send__ to access private methods. [ruby-dev:26935]
-Mon Nov 7 19:25:16 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Sep 1 17:11:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_io_m17n.rb
- (TestIO_M17N#test_default_stdout_stderr_mode): new test for
- r33627-33629. see [backport #5565]
+ * eval.c (rb_call0): wrong condition for $SAFE restoration.
-Mon Nov 7 01:14:22 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Thu Sep 1 14:12:45 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/debug.rb: add help for 'pp' and 'r[estart]'. patch
- from Sho Hashimoto. [Bug #5093] [ruby-dev:44222]
+ * ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
+ work (gives wrong order of arguments).
-Sun Nov 6 14:49:58 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
+ to support '-namespace' option of 'interp invokehidden' command
+ on Tcl8.5.
- * ext/socket/rubysocket.h (rsock_recvmsg): declared.
+Wed Aug 31 14:41:30 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/socket/ancdata.c (rsock_recvmsg): extracted from
- nogvl_recvmsg_func.
- (nogvl_recvmsg_func): use rsock_recvmsg.
+ * win32/Makefile.sub (OPTFLAGS): default global optimization to
+ disabled for all VC++ versions. fixed: [ruby-dev:26897]
- * ext/socket/unixsocket.c (recvmsg_blocking): use rsock_recvmsg.
+Wed Aug 31 10:36:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Nov 6 03:22:36 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * process.c (proc_detach, proc_setmaxgroups): missing argument type
+ declaration. (I recommend ANSI-style function)
- * test/openssl/test_engine.rb: add test for engine cipher. RC4 is used
- because AES is not supported by the "openssl" engine currently.
+Wed Aug 31 06:59:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Nov 6 00:11:52 2011 Tanaka Akira <akr@fsij.org>
+ * string.c (rb_str_scan): already String#scan behaves differently
+ regarding if block is given.
- * lib/test/unit.rb (Test::Unit::Options#non_options): options[:ruby]
- should be an array. This fixes
- "./ruby test/runner.rb test/testunit/test_parallel.rb"
- [ruby-dev:44782]
+Tue Aug 30 23:49:34 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Nov 5 20:30:30 2011 Martin Duerst <duerst@it.aoyama.ac.jp>
+ * array.c, dir.c, enum.c, hash.c, io.c, range.c, string.c, struct.c:
+ let enumerable methods return Enumerator. [ruby-dev:26924]
- * insns.def: Some fixes and tweaks to English explanations
+ * intern.h (RETURN_ENUMERATOR): utility macro for enumerable methods.
-Sat Nov 5 19:11:50 2011 Tanaka Akira <akr@fsij.org>
+Tue Aug 30 23:25:45 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * io.c (rb_cloexec_fcntl_dupfd): don't clear try_dupfd_cloexec if
- fcntl(F_DUPFD) failed as fcntl(F_DUPFD_CLOEXEC).
+ * lib/debug.rb: no need to restart at exit.
-Sat Nov 5 18:05:12 2011 Tanaka Akira <akr@fsij.org>
+Tue Aug 30 23:20:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/socket/socket.c (rsock_socketpair0): refactored.
+ * eval.c (rb_rescue2): initialization miss. fixed: [ruby-dev:26917]
-Sat Nov 5 17:55:52 2011 Tanaka Akira <akr@fsij.org>
+ * lib/mkmf.rb (xsystem, xpopen): no longer expand by Config.
- * ext/socket/init.c (rsock_socket0): don't clear try_sock_cloexec if
- SOCK_CLOEXEC is not a reason for EINVAL.
+ * lib/mkmf.rb (link_command, cc_command, cpp_command): expand
+ variables at once, and quote hdrdir. fixed: [ruby-core:05680]
-Sat Nov 5 16:27:52 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/mkmf.rb (libpathflag): quote paths.
- * ext/pathname/lib/pathname.rb, ext/tk/lib/multi-tk.rb,
- ext/tk/sample/demos-en/widget, lib/benchmark.rb, lib/irb/cmd/fork.rb,
- lib/mkmf.rb, lib/net/ftp.rb, lib/net/smtp.rb, lib/open3.rb,
- lib/pstore.rb, lib/rexml/element.rb, lib/rexml/light/node.rb,
- lib/rinda/tuplespace.rb, lib/rss/maker/base.rb,
- lib/rss/maker/entry.rb, lib/scanf.rb, lib/set.rb, lib/shell.rb,
- lib/shell/command-processor.rb, lib/shell/process-controller.rb,
- lib/shell/system-command.rb, lib/uri/common.rb: remove unused block
- arguments to avoid creating Proc objects.
+Tue Aug 30 19:34:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Sat Nov 5 15:45:04 2011 Tanaka Akira <akr@fsij.org>
+ * ext/digest/md5/md5ossl.h, ext/digest/rmd160/rmd160ossl.h,
+ ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
+ error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
- * ext/socket/init.c (rsock_socket0): extract single socket() call with
- CLOEXEC handling from rsock_socket.
+Tue Aug 30 16:19:40 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-Sat Nov 5 13:49:40 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/irb/init.rb: bug fix. [ruby-dev: 26920]
- * lib/pathname.rb (Pathname#find): return an enumerator if
+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>
+
+ * 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>
+
+ * lib/pathname.rb (Pathname#descend): new method.
+ (Pathname#ascend): ditto.
+
+Mon Aug 29 00:35:09 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]
+
+Sat Aug 27 20:13:31 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'.
+ [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>
+
+ * 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>
+
+ * 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
+ condition bug fixed. [ruby-dev:26764]
+
+ * test/logger/test_logger.rb: tests.
+
+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>
+
+ * win32/win32.c (socketpair_internal): need to call open_ifs_socket()
+ to create sockets instead of winsock's socket().
+ fixed: [yarv-dev:581]
+
+Wed Aug 17 23:58:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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
+ where a method is defined .
+
+ * 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.
+ [ruby-dev:26800]
+
+ * 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.
+ fixed: [ruby-dev:26274]
+
+ * 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]
+
+ * lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
+ removed self.
+
+ * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
+ instead of @date.
+ (RSS::Maker::Base::self.def_array_element): added #size.
+
+ * lib/rss/maker/1.0.rb
+ (RSS::Maker::RSS10::Channel#to_rss,
+ RSS::Maker::RSS10::Items::Item#to_rss): cleared dc_dates set
+ upped by using #date.
+
+ * lib/rss/maker/dublincore.rb
+ (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
+ fixed opposite alias.
+
+ * test/rss/test_setup_maker_1.0.rb
+ (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().
+
+ * ext/tk/lib/tk/itemconfig.rb: fix bug on handling
+ __item_ruby2val_optkeys().
+
+ * ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
+
+ * 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/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
+ help to convert option values between ruby and tcl.
+
+ * ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
+ __item_ruby2val_optkeys to help to convert option values between
+ ruby and tcl.
+
+ * ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
+ option (for the reason of backward compatibility).
+
+ * ext/tk/lib/tk/composite.rb: clarify the arguments of super().
+
+ * ext/tk/lib/tk/spinbox.rb: ditto.
+
+ * ext/tk/lib/tk/text.rb: ditto.
+
+ * ext/tk/lib/tk/validation.rb: ditto.
+
+ * 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>
+
+ * test/ruby/test_fnmatch.rb: separated from test_file.rb.
+
+Mon Aug 8 20:40:35 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>
+
+ * parse.y (f_larglist): mistake in syntax rule. [ruby-core:05535]
+
+Mon Aug 8 05:16:55 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
+ 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]
+
+ * lib/webrick/httputils.rb: add a media-type "text/html" for .xhtml.
+
+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.
+
+Sat Aug 6 12:35:24 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
+ TkVariable if key name is 'variable' or 'textvariable'
+ by default. [ruby-dev:26749]
+
+ * ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
+ {variable,textvariable} function.
+
+ * ext/tk/lib/tk/variable.rb: retains backward compatibility.
+
+Fri Aug 5 12:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/tk/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>
+
+ * lib/mkmf.rb (create_makefile): need to convert path separator
+ 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>
+
+ * ext/tk/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/tk/tcltklib.c: add nativethread consistency check.
+
+ * ext/tk/stubs.c: ditto.
+
+ * ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
+ when Tcl is 7.6 or 8.0.
+
+ * ext/tk/lib/tk/wm.rb: support to make some methods as options of
+ root or toplevel widget. [ruby-talk:150336]
+
+ * ext/tk/lib/tk/root.rb: ditto.
+
+ * 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]
+
+Thu Aug 4 08:03:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake): should not modify $mflags for each
+ extensions.
+
+Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
+ macro definitions.
+
+ * bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
+
+ * {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]
+
+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]
+
+ * 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
+ Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
+
+ * ext/tk/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.
+
+Tue Aug 2 01:40:38 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>
+
+ * ext/tk/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>
+
+ * ext/tk/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>
+
+ * ext/tk/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>
+
+ * lib/drb/drb.rb (check_insecure_method): use private_methods and
+ protected_methods instead of respond_to? to check method visibility.
+ [ruby-dev:26616]
+
+ * test/drb/drbtest.rb: ditto.
+
+ * 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.
+
+ * 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]
+
+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
+ 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.
+
+ * ext/tk/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/tk/tcltklib.c: Show friendly error messages for errors on
+ initialization.
+
+ * ext/tk/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/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
+ don't work properly.
+
+ * 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>
+
+ * 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
+ <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]
+
+Sat Jul 23 10:01:41 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sprintf.c (rb_vsprintf, rb_sprintf): new functions return new String,
+ using missing/vsnprintf.c. [ruby-dev:26580]
+
+ * missing/vsnprintf.c: made the output changeable.
+
+Fri Jul 22 21:06:08 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
+
+ * bignum.c (rb_big_eq): reduce isnan(). [ruby-dev:26600]
+
+ * numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
+
+Fri Jul 22 15:02:39 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/rss.rb: moved copyright description to lib/rss.rb.
+
+ * lib/rss.rb: added for convenience.
+
+ * sample/rss/re_read.rb: added #to_s sample.
+
+ * sample/rss/blend.rb: use 'require "rss"' instead of
+ 'require "rss/*"'.
+ * sample/rss/list_description.rb: ditto.
+ * sample/rss/rss_recent.rb: ditto.
+ * sample/rss/tdiary-plugin/rss-recent.rb: ditto.
+
+ * sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
+
+Fri Jul 22 14:37:43 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
+ URI and local file path too.
+
+ * test/rss/test_parser.rb (RSS::TestParser#test_parse): test
+ for the above.
+
+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/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
+
+ * ext/tk/tcltklib.c: add TclTkIp#has_mainwindow? method.
+
+ * ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
+
+ * ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
+
+ * ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
+
+ * ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
+
+ * ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
+ avoid access from external.
+
+ * ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
+ mainloop.
+
+ * ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
+ with $SAFE==4.
+
+ * ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
+ properly.
+
+ * ext/tk/lib/multi-tk.rb: add MultiTkIp#set_cb_error(proc) and
+ cb_error(exc) to log errors at callbacks on safe slave IPs.
+
+ * ext/tk/lib/multi-tk.rb: fail to get an available slave IP object
+ when call Tk.mainloop in the block which is given to new_* method,
+ because cannot finish initialize while the root widget is alive.
+
+ * 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>
+
+ * 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>
+
+ * io.c (wsplit_p): patch for the environment where
+ fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
+ set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
+
+Wed Jul 20 18:07:11 2005 Tanaka Akira <akr@m17n.org>
+
+ * io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
+ by F_SETFL.
+
+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]
+
+Wed Jul 20 03:58:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
+ so reverted.
+
+ * 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>
+
+ * ext/socket/socket.c: should not undef close() on win32.
+ it's defined to rb_w32_close(), otherwise handle leaks.
+ [ruby-Bugs-2131]
+
+Wed Jul 20 00:48:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * error.c (syserr_initialize): don't use str before StringValue()
+ check. [ruby-dev:26579]
+
+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]
+
+ * 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>
+
+ * ext/tk/tcltklib.c: rbtk_eventloop_depth is used as int.
+
+ * ext/tk/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
+ ip is deleted.
+
+Tue Jul 19 13:19:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/variable.rb: For symmetry, add TkVariable#string. It
+ 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>
+
+ * 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.
+ [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]
+
+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
+ 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
+ module enclosed in a built-in module. fixed: [ruby-talk:148239]
+
+ * lib/rdoc/parsers/parse_c.rb (find_body): allow macros as methods.
+
+ * 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>
+
+ * enumerator.c (Init_Enumerator): use an internal directly.
+
+Fri Jul 15 07:58:10 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.
- * test/pathname/test_pathname.rb: add tests for above.
+ * enumerator.c: moved from ext/enumerator.
+
+Thu Jul 14 18:27:35 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]
+
+ * win32/win32.c (rb_w32_strerror): stripped CR LF on the tail.
+ (bcc32) [ruby-dev:26533]
+
+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>
+
+ * win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
+ if file or directory already exists. (bcc32) [ruby-dev:26508]
+
+ * win32/win32.c (rb_w32_rmdir): should set ENOTDIR (not EINVAL)
+ if it is not directory. (bcc32, win32)
+
+ * win32/win32.c (rb_w32_rmdir, rb_w32_unlink): restore
+ FILE_ATTRIBUTE_READONLY flag on function failure.
+
+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/tk/lib/tk.rb: Tk.thread_update is available.
+
+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
+ 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>
+
+ * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
+ mistook to merge the patch of [ruby-dev:26235] at
+ revision 1.11.
+
+Sun Jul 10 23:58:04 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
+ avoid unlink a directory by root.
+ cf. [ruby-dev:26237]
+
+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>
+
+ * ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
+ in Ruby and C by INT2NUM and NUM2INT.
+
+ * ext/win32ole/win32ole.c (ole_invoke2): ditto.
+
+ * ext/win32ole/test/testWIN32OLE.rb: ditto.
+
+ * ext/win32ole/test/testOLEMETHOD.rb: ditto.
+
+Fri Jul 8 15:45:04 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/rss.rb (RSS::VERSION): 0.1.4 -> 0.1.5.
+
+ * test/rss/test_version.rb (RSS::TestVersion#test_version):
+ ditto.
+
+ * lib/rss/0.9.rb (RSS::Rss::Channel::Item::Category):
+ domain attribute of <category> is optional. Thanks to
+ Chris Lee <clee@kde.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.
+
+Tue Jul 5 23:27:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (sort_2): get rid of yet another bcc's bug.
+ fixed: [ruby-core:05152]
+
+ * eval.c (rb_thread_save_context): must not switch contexts during
+ re-allocating stack. fixed: [ruby-core:05219]
+
+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>
+
+ * ext/tk/tcltklib.c: bug fix on treating Unicode strings.
+
+ * ext/tk/tcltklib.c: add methods to treat encoding mode.
+
+ * ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding,
+ encoding_system, and so on.
+
+ * ext/tk/MANUAL_tcltklib.eucj: 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/lib/tk.rb: ditto.
+
+ * ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible.
+
+ * ext/tk/lib/remote-tk.rb: ditto.
+
+ * ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to
+ use TkCore::INTERP.encoding and encoding=.
+
+ * ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check
+ DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode.
+
+ * ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and
+ Tk.encoding_system. Tk.encoding has higher priority.
+
+ * ext/tk/lib/tk/optiondb.rb: ditto.
+
+ * ext/tk/lib/tk/spinbox.rb: ditto.
+
+ * ext/tk/lib/tk/validation.rb: ditto.
- [ruby-dev:44797] [Feature #5572]
+ * ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
+ should be UTF-8 strings.
-Sat Nov 5 11:18:12 2011 Tanaka Akira <akr@fsij.org>
+Mon Jul 4 19:29:32 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/socket/socket.c (rsock_socketpair0): don't clear
- try_sock_cloexec if SOCK_CLOEXEC is not a reason for EINVAL.
+ * lib/set.rb: test change to follow revision 1.28. (duck typing?)
-Fri Nov 4 14:08:19 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Mon Jul 4 11:23:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_pkey_rsa.c (rsa_generate): [SECURITY] Set RSA
- exponent value correctly. Awful bug. This bug caused exponent of
- generated key to be always '1'. By default, and regardless of e
- given as a parameter.
+ * test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
+ which using fork on fork-less platforms.
- !!! Keys generated by this code (trunk after 2011-09-01) must be
- re-generated !!! (ruby_1_9_3 is safe)
+Sun Jul 3 23:26:30 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * test/openssl/test_pkey_rsa.rb: Add tests for default exponent and
- specifying exponent by a parameter.
+ * test/wsdl/document/test_rpc.rb: compare formatted time string of
+ Time objects instead of comparing Time objects itself to avoid
+ unintended conflict of usec part. [ruby-dev:26220]
-Fri Nov 4 01:31:25 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sat Jul 2 22:41:04 2005 Tanaka Akira <akr@m17n.org>
- * test/openssl/test_engine.rb: add first tests for builtin "openssl"
- engine.
+ * ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64 and
+ IA64.
-Fri Nov 4 08:41:26 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Sat Jul 2 17:06:23 2005 Tanaka Akira <akr@m17n.org>
- * ext/openssl/extconf.rb:
- * ext/openssl/ossl_engine.c: add some missing OpenSSL engines.
- Thanks, Yui Naruse, for providing the patch!
- [Bug #5548] [ruby-core:40670]
+ * defines.h (FLUSH_REGISTER_WINDOWS): defined for IA64.
+ (flush_register_windows): declare flush_register_windows.
-Fri Nov 4 04:54:10 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (flush_register_windows): new function.
- * win32/configure.bat: disable delayed expansion of enironment variable.
- [Bug #5517] [ruby-core:40531]
+ * ruby.h (NOINLINE): move up to be effective in defines.h.
-Fri Nov 4 03:45:22 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Jul 2 15:19:41 2005 Tanaka Akira <akr@m17n.org>
- * io.c (make_writeconv): fixed typo of previous commit.
+ * configure.in: check select_large_fdset.
-Fri Nov 4 01:56:30 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c: use select_large_fdset to support large file descriptors
+ on Solaris. [ruby-dev:26404]
- * io.c (make_writeconv): unversal_newline converter is for reading.
- so, if the io is text mode and has ECONV_UNIVERSAL_NEWLINE_DECORATOR
- flag, use crlf_newline converter for writing.
- this change fixes the problem about the luck of CR up Kernel.p and
- Kernel.puts to stdout/stderr on Windows.
+Fri Jul 1 17:55:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Nov 4 01:04:48 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * bignum.c (rb_big_neg): may be accessing bogus pointer value.
- * ext/readline/readline.c (Init_readline): like r18313, libedit's
- replace_history_entry may use offset instead of which.
- so introduce history_replace_offset_func and initialize it.
+Fri Jul 1 15:50:12 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/readline/readline.c (hist_set): use history_replace_offset_func.
+ * missing/erf.c: need to include some headers for some platforms.
-Fri Nov 4 00:53:35 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * win32/win32.h (copysign, scalb): define for compatibility with
+ other platforms. [ruby-dev:26430]
- * ext/readline/readline.c (Init_readline): fix wrong condition.
+Fri Jul 1 15:37:42 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Nov 3 23:53:04 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * missing/crypt.c: modified to make it compilable on platforms
+ other than BSD. [ruby-dev:26430]
- * encoding.c (rb_locale_charmap): ignore calling nl_langinfo_codeset()
- on Windows except cygwin. [experimental]
+ * missing/erf.c: ditto. code from <exp.c> merged.
-Thu Nov 3 22:45:09 2011 Tanaka Akira <akr@fsij.org>
+Fri Jul 1 12:44:56 2005 Tanaka Akira <akr@m17n.org>
- * ext/socket/socket.c (rsock_socketpair0): extracted from
- rsock_socketpair to set close-on-exec flag for each socketpair()
+ * lib/open-uri.rb (OpenURI.open_http): refine post_connection_check
call.
-Thu Nov 3 22:12:41 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Fri Jul 1 11:34:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/socket/init.c (rsock_socket): set close-on-exec flag when
- SOCK_CLOEXEC is not available.
+ * missing/crypt.c: replaced with 4.4BSD version.
-Thu Nov 3 08:36:00 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * missing/erf.c: ditto.
- * test/openssl/test_engine.rb: call Engine::cleanup on exit.
- Patch provided by Yui Naruse, thanks!
- [Bug #5547] [ruby-core:40669]
+ * missing/vsnprintf.c: removed the third provision from the old
+ BSD license. [ruby-core:05177]
-Wed Nov 2 21:36:00 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 1 01:45:21 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * complex.c (nucomp_rationalize): fix function. [ruby-core:40667]
- [Bug #5546]
+ * enum.c (enum_min, enum_max): must not return Qundef.
+ fixed: [ruby-core:05299]
-Wed Nov 2 08:16:45 2011 Tanaka Akira <akr@fsij.org>
+Fri Jul 1 00:18:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/webrick/utils.rb: fix fcntl call.
+ * lib/delegate.rb (Delegator::respond_to): respond_to? must check
+ destination object. [ruby-talk:146894]
- * lib/drb/unix.rb: ditto.
+Thu Jun 30 23:52:12 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Nov 2 00:43:59 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * signal.c (trap): non-string trap hander was ignored.
+ fixed: [ruby-dev:26417]
- * test/psych/test_yamldbm.rb: avoid platform dependency.
- patch by Naohisa Goto. [ruby-dev:44763] [Bug #5535]
- * test/syck/test_yamldbm.rb: ditto.
+Thu Jun 30 19:00:21 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-Wed Nov 2 00:14:15 2011 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
+ for [ruby-dev:26410]. And support a numeric form of 0d99999.
- * test/ruby/test_marshal.rb: renamed methods duplicated with those
- of marshaltestlib.rb.
+Thu Jun 30 17:28:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 1 22:08:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat
+ plain zero as an octal number. [ruby-dev:26410]
- * configure.in: reject llvm-gcc.
+Thu Jun 30 15:13:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Nov 1 21:39:00 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * eval.c (rb_eval): pre-evaluate argument for unambiguous
+ evaluation order. [ruby-dev:26383]
- * io.c (rb_cloexec_pipe): remove workaround of r33587.
- The bug of NetBSD is fixed on Mon Oct 31 21:31:29 UTC 2011.
- http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=45545
+Thu Jun 30 14:48:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Tue Nov 1 19:49:08 2011 Tanaka Akira <akr@fsij.org>
+ * lib/net/http.rb (Net::HTTP#connect, Net::HTTP#request): should
+ not send proxy username and password to origin servers.
+ [ruby-dev:25673]
- * io.c (rb_io_reopen): call rb_fd_fix_cloexec instead of
- rb_maygvl_fd_fix_cloexec.
+ * lib/net/http.rb (Net::HTTP::ProxyDelta#edit_path): should not
+ send HTTPS scheme URL to origine servers. [ruby-dev:25689]
-Tue Nov 1 19:00:30 2011 Tanaka Akira <akr@fsij.org>
+Thu Jun 30 09:53:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_io_reopen): call rb_maygvl_fd_fix_cloexec after freopen().
+ * lib/delegate.rb (Delegator::method_missing): forward unknown
+ method to the destination. suggested by
+ <christophe.poucet@gmail.com>. [ruby-talk:146776]
-Tue Nov 1 17:17:26 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Jun 29 00:03:20 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * file.c (file_expand_path): reset coderange after expanding path.
+ * regparse.c (fetch_token): avoid warning of unused goto tag.
+ [ruby-dev:26389]
-Tue Nov 1 14:55:29 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Jun 28 21:59:29 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
+ * dir.c, eval.c, parse.y, process.c, ruby.c: avoid warning "unused
+ variable" [ruby-dev:26387]
- * process.c (move_fds_to_avoid_crash): ditto.
+ * dir.c (glob_helper): avoid warning "enumeration value `RECURSIVE'
+ not handled in switch" [ruby-dev:26392]
-Tue Nov 1 13:14:33 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Jun 28 01:52:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
- * vsnprintf.c (BSD_vfprintf): support 'll' prefix.
+ * 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
- * vsnprintf.c (__sfeof): rename to avoid the collision with NetBSD's
- one.
+Sat Jun 25 23:30:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vsnprintf.c (__sferror): ditto.
+ * process.c (detach_process_watcher): terminate process watcher
+ thread right after rb_waitpid() succeed. [ruby-talk:146430]
- * vsnprintf.c (__sclearerr): ditto.
+Sat Jun 25 17:12:20 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * vsnprintf.c (__sfileno): ditto.
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
+ discard if key=val pair is empty. patch from Gary Wright.
-Tue Nov 1 12:36:16 2011 Tanaka Akira <akr@fsij.org>
+Sat Jun 25 15:49:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * internal.h (rb_maygvl_fd_fix_cloexec): change the visibility for
- ext/socket.
+ * enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore
+ nil as the first element.
-Tue Nov 1 12:00:53 2011 Tanaka Akira <akr@fsij.org>
+Sat Jun 25 15:13:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * io.c (rb_maygvl_fd_fix_cloexec): renamed from fd_set_cloexec.
+ * lib/set.rb (Set#==): [ruby-dev:25206] (ported from ruby_1_8 branch)
- * internal.h (rb_maygvl_fd_fix_cloexec): declared.
+Sat Jun 25 11:37:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/socket/init.c (cloexec_accept): use rb_maygvl_fd_fix_cloexec.
- (rsock_s_accept_nonblock): use rb_update_max_fd.
- (rsock_s_accept): use rb_update_max_fd.
+ * 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_*
-Tue Nov 1 08:24:40 2011 Tanaka Akira <akr@fsij.org>
+Fri Jun 24 17:00:00 2005 Shigeo Kobayashi <shigeo@tinyforest.jp>
- * ext/socket/init.c (cloexec_accept): new function to use accept4 if
- available.
- (rsock_s_accept_nonblock): use cloexec_accept.
- (accept_blocking): ditto.
+ * ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
+ (u-tokyo.ac.jp) applied to fix rounding bug.
- * ext/socket/extconf.rb: check accept4.
+Fri Jun 24 13:17:45 2005 akira yamada <akira@ruby-lang.org>
-Tue Nov 1 07:31:55 2011 Tanaka Akira <akr@fsij.org>
+ * lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
+ replaced some existent domain name with "example.com".
- * ext/socket/ancdata.c (nogvl_recvmsg_func): use MSG_CMSG_CLOEXEC if
- available.
+Fri Jun 24 12:23:19 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/socket/unixsocket.c (recvmsg_blocking): ditto.
+ * ext/tk/lib/tk.rb: fix typo on Tk.grid_propagate.
-Tue Nov 1 05:59:41 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk.rb: Tk.event_generate and TkWindow#event_generate
+ accept TkEvent::Event object as context argument.
- * ext/socket/socket.c (rsock_socketpair): use SOCK_CLOEXEC if
- available.
+ * ext/tk/lib/tk/event.rb: add TkEvent::Event#valid_fields and
+ valid_for_generate to get field parameters of event_generate.
-Tue Nov 1 02:56:17 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Jun 23 23:55:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ruby.c (load_file_internal): convert the encoding of load path if
- needed by platform. calling open() was replaced by rb_cloexec_open()
- at r33549, but the function expected UTF-8 pathname on Windows.
- (open() expected "locale" pathname.)
- reported by taco via IRC.
+ * runruby.rb: should load built rbconfig.rb.
- * ruby.c (load_file): change the type of the 2nd parameter to pass its
- encoding to load_file_internal().
+Thu Jun 23 16:53:15 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ruby.c (process_options, rb_load_file): follow above change.
- NOTE: we should pass encoding information to rb_load_file().
+ * ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
+ TkcGroup#exclude calls wrong method.
+ Add alias TkcGroup#add [ruby-talk:146049].
-Mon Oct 31 23:49:38 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
+ TkCanvas#addtag fail to treat a TkcTag argument.
- * ext/socket/socket.c (rsock_socketpair): extracted from
- rsock_sock_s_socketpair.
+ * ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
+ current event to other widgets.
-Mon Oct 31 23:31:53 2011 Tanaka Akira <akr@fsij.org>
+Mon Jun 20 18:44:04 2005 Tanaka Akira <akr@m17n.org>
- * ext/socket/init.c (rsock_socket): use SOCK_CLOEXEC if available.
+ * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): DUMMY_SETJMP is replaced
+ because setjmp is not enough to fix getcontext and SPARC register
+ window problem.
-Mon Oct 31 21:47:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Jun 20 17:15:51 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * io.c (rb_cloexec_pipe): NetBSD 6.0 will support pipe2(2),
- but its return value is -1 or larger than 0.
+ * ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
-Mon Oct 31 22:04:54 2011 Tanaka Akira <akr@fsij.org>
+ * ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
- * ext/dbm/dbm.c (fdbm_initialize): use O_CLOEXEC if available.
+ * ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
-Mon Oct 31 21:47:48 2011 Tanaka Akira <akr@fsij.org>
+ * test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
+ (teardown): close all db objects before deleting data files.
- * include/ruby/intern.h (rb_fd_fix_cloexec): renamed from
- rb_fd_set_cloexec.
+ * win32/win32.{ch} (unlink): hook runtime function to change
+ file attribute before unlinking.
+ merge from 1.8, see [ruby-dev:26360]
- * io.c: follow the above renaming.
+Mon Jun 20 02:15:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/pty/pty.c: ditto.
+ * gc.c (define_final): document fix: finalizers never get called
+ before target object is destroyed.
- * ext/socket/init.c: ditto.
+Mon Jun 20 01:26:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/socket/socket.c: ditto.
+ * ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
+ ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
+ ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
+ compiler warnings. suggested by Michal Rokos.
- * ext/socket/ancdata.c: ditto.
+Sun Jun 20 00:22:02 2005 Michael Neumann <mneumann@ruby-lang.org>
- * ext/socket/unixsocket.c: ditto.
+ * 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.
-Mon Oct 31 21:02:43 2011 Tanaka Akira <akr@fsij.org>
+ * lib/xmlrpc/client.rb: Aliased XMLRPC::Client#new2 as
+ XMLRPC::Client#new_from_uri, and #new3 as #new_from_hash.
- * lib/resolv.rb (Resolv::DNS): retry IO.select for premature wakeup.
+Sun Jun 19 14:09:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Oct 31 20:14:22 2011 Tanaka Akira <akr@fsij.org>
+ * gc.c (run_final): reduce unnecessary object allocation during
+ finalization.
- * io.c (fd_set_cloexec): clear CLOEXEC flag for standard file
- descriptors.
- (rb_cloexec_dup): use rb_cloexec_fcntl_dupfd.
- (rb_cloexec_fcntl_dupfd): use F_DUPFD_CLOEXEC if available.
+ * gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
+ be cleared before calling them. fixed: [ruby-talk:145790]
-Mon Oct 31 19:14:11 2011 Tanaka Akira <akr@fsij.org>
+Sat Jun 18 01:15:36 2005 Shugo Maeda <shugo@ruby-lang.org>
- * test/resolv/test_dns.rb: don't check maximum slept time.
- ruby doesn't guarantee the maximum time because it is not a
- realtime application.
+ * ext/readline/readline.c (readline_readline): do not set
+ rl_{in,out}stream.
-Mon Oct 31 13:10:06 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/readline/readline.c (readline_s_set_input): new method.
- * win32/win32.c (setfl): extract from fcntl().
+ * ext/readline/readline.c (readline_s_set_output): new method.
- * win32/win32.c (dupfd): new function to support F_DUPFD. based on a
- patch written by akr.
+ * lib/irb/input-method.rb: set Readline.input and Readline.output.
- * win32/win32.c (fcntl): use above functions.
+Fri Jun 17 13:01:40 2005 Tanaka Akira <akr@m17n.org>
- * include/ruby/win32.h (F_DUPFD): define. [experimental]
+ * lib/time.rb (Time.parse): fix previous leap seconds support.
+ (Time.rfc2822): ditto.
+ (Time.xmlschema): ditto.
- * include/ruby/win32.h (F_SETFL): change the value to correspond with
- other platforms.
+Thu Jun 16 15:41:32 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Oct 31 12:37:50 2011 Tanaka Akira <akr@fsij.org>
+ * ruby.c (load_file): '!' is already read. reported by gotoyuzo.
- * ext/pty/pty.c (get_device_once): use O_CLOEXEC for posix_openpt if
- available.
+Thu Jun 16 15:09:38 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Mon Oct 31 12:05:24 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
+ was missing.
- * io.c (rb_cloexec_dup2): check oldfd == newfd at first.
- pointed by KOSAKI Motohiro. [ruby-dev:44713]
+Thu Jun 16 13:34:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Mon Oct 31 10:50:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/tk.rb: add Tk.getMultiple{Open|Save}File() which return
+ an Array of selected files.
- * io.c (rb_cloexec_fcntl_dupfd): this function needs F_DUPFD.
+Thu Jun 16 12:53:24 2005 Tanaka Akira <akr@m17n.org>
- * io.c (nogvl_io_cntl): use rb_cloexec_fcntl_dupfd() only if the
- platform has F_DUPFD.
+ * lib/time.rb (Time.parse): "Fri Jan 1 08:59:60 +0900 1999" was
+ parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment
+ which supports leap seconds.
+ (Time.rfc2822): ditto.
+ (Time.xmlschema): ditto.
-Mon Oct 31 00:50:00 2011 Luis Lavena <luislavena@gmail.com>
+Thu Jun 16 00:13:41 2005 Tanaka Akira <akr@m17n.org>
- * configure.in: check -fno-omit-frame-pointer acceptance and usage
- under MinGW. [ruby-core:39957] [Bug #5407]
+ * 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.
-Mon Oct 31 00:16:11 2011 Tanaka Akira <akr@fsij.org>
+Wed Jun 15 18:26:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * include/ruby/intern.h (rb_cloexec_fcntl_dupfd): declared.
+ * ext/tk/lib/tk.rb: support "tk inactive" sub-command [for Tcl/Tk8.5a3]
- * io.c (rb_cloexec_fcntl_dupfd): new function.
- (nogvl_io_cntl): use rb_cloexec_fcntl_dupfd.
+ * ext/tk/lib/tk/namespace.rb: support "namespace path" sub-command and
+ 'namespace ensemble' sub-command [for Tcl/Tk8.5a3]
- * process.c (move_fds_to_avoid_crash): use rb_cloexec_fcntl_dupfd.
+Tue Jun 14 02:02:43 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sun Oct 30 22:46:46 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/tkutil/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 ").
- * configure.in: check pipe2.
+ * ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
- * io.c (rb_cloexec_pipe): use pipe2 if available.
+Mon Jun 13 13:03:08 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Oct 30 22:32:44 2011 Tanaka Akira <akr@fsij.org>
+ * hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
- * ruby.c (fill_standard_fds): use fstat() instead of fcntl(F_GETFD)
- for MinGW. reported by Luis Lavena. [ruby-core:40526] [Bug #5516]
+Mon Jun 13 01:54:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Oct 30 21:12:47 2011 Tanaka Akira <akr@fsij.org>
+ * signal.c (sigexit): call rb_thread_signal_exit() instead of
+ rb_exit(). [ruby-dev:26347]
- * include/ruby/intern.h (rb_cloexec_pipe): declared.
+ * eval.c (rb_thread_signal_exit): a new function to exit on main
+ thread.
- * io.c (rb_cloexec_pipe): new function.
- (rb_pipe): use rb_cloexec_pipe.
+ * eval.c (rb_thread_switch): exit status should be retrieved from
+ ruby_errinfo.
- * thread_pthread.c (rb_thread_create_timer_thread): use
- rb_cloexec_pipe.
+ * eval.c (rb_f_exit): ensure exit(0) should call
+ exit(EXIT_SUCCESS).
-Sun Oct 30 20:06:07 2011 Tanaka Akira <akr@fsij.org>
+Mon Jun 13 01:20:02 2005 Tanaka Akira <akr@m17n.org>
- * io.c (rb_cloexec_dup): refine control flow.
- (rb_cloexec_dup2): ditto.
+ * eval.c (rb_gc_mark_threads): curr_thread may not be part of the
+ thread list. [ruby-dev:26312]
-Sun Oct 30 18:45:50 2011 Tanaka Akira <akr@fsij.org>
+Sat Jun 11 22:34:44 2005 Minero Aoki <aamine@loveruby.net>
- * ruby.c (fill_standard_fds): new function to open closed standard
- file descriptors.
- (ruby_sysinit): call fill_standard_fds.
+ * parse.y: missing arg_paren event. This patch is contributed by
+ Mitchell N Charity.
-Sun Oct 30 10:50:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 10 23:55:17 2005 Tanaka Akira <akr@m17n.org>
- * tool/rbinstall.rb (install_recursive, bin-comm): split mere
- string not path name. [ruby-core:40462] [Bug #5492]
+ * eval.c (unknown_node): show more information. [ruby-dev:26196]
-Sun Oct 30 10:47:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 10 23:35:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_cloexec_dup, rb_cloexec_dup2): CLOEXEC has been set if
- dup3 succeeded.
+ * missing/mkdir.c: remove. [ruby-core:05177]
-Sun Oct 30 09:58:48 2011 Tanaka Akira <akr@fsij.org>
+Fri Jun 10 22:54:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_cloexec_dup): don't allocate standard file descriptors.
+ * missing.h: fd_set stuffs need sys/types.h. fixed: [ruby-core:05179]
-Sun Oct 30 08:29:51 2011 Tanaka Akira <akr@fsij.org>
+Thu Jun 9 23:58:12 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c (rb_cloexec_dup2): don't set CLOEXEC for standard file
- descriptors.
+ * ext/Win32API/Win32API.c (Win32API_Call): disable global
+ optimization. fixed: [ruby-core:05143]
-Sun Oct 30 07:47:10 2011 Tanaka Akira <akr@fsij.org>
+Thu Jun 9 23:35:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in: check dup3.
+ * enum.c (enum_inject): default the result value to Qundef to use
+ first element as initial value if not given.
- * io.c (rb_cloexec_dup2): use dup3 if available.
+Thu Jun 9 19:55:41 2005 Tanaka Akira <akr@m17n.org>
-Sat Oct 29 22:06:37 2011 Tanaka Akira <akr@fsij.org>
+ * eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc.
+ (ruby_setjmp): new macro to call setjmp, getcontext, etc.
+ (ruby_setjmp): call setjmp before getcontext to avoid IA64 register
+ stack problem.
+ [ruby-talk:144939]
- * include/ruby/intern.h (rb_cloexec_dup2): declared.
+ * gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
- * io.c (rb_cloexec_dup2): new function.
- (io_reopen): use rb_cloexec_dup2.
+Thu Jun 9 18:24:16 2005 Tanaka Akira <akr@m17n.org>
-Sat Oct 20 21:08:18 2011 Tajima Akio <artonx@yahoo.co.jp>
+ * configure.in, eval.c, gc.c: use libunwind only on HP-UX.
+ [ruby-dev:26297]
- * win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
- [Bug #5243]
+Thu Jun 9 14:46:32 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Oct 29 20:59:08 2011 Tanaka Akira <akr@fsij.org>
+ * hash.c (env_aset): do not treat nil as key-removing value.
+ [ruby-list:40865]
- * io.c (rb_cloexec_dup): use F_DUPFD_CLOEXEC if available.
+ * parse.y (method_call): allow aref expression ([]) to take a
+ block.
-Sat Oct 29 20:00:26 2011 Tanaka Akira <akr@fsij.org>
+ * parse.y (block_dup_check): a function to check duplication of
+ a block argument and an actual block.
- * include/ruby/intern.h (rb_cloexec_dup): declared.
+Thu Jun 9 11:55:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_cloexec_dup): new function.
- (ruby_dup): use rb_cloexec_dup.
+ * lib/delegate.rb (SimpleDelegator::__setobj__): need check for
+ recursive delegation. [ruby-core:04940]
- * ext/pty/pty.c (pty_getpty): use rb_cloexec_dup.
+Thu Jun 9 11:50:43 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/ossl_bio.c (ossl_obj2bio): ditto.
+ * lib/cgi.rb: add underscore aliases CGI::escape_html,
+ CGI::unescape_html, CGI::escape_element, CGI::unescape_element.
+ [ruby-core:05058]
-Sat Oct 29 16:11:34 2011 Tanaka Akira <akr@fsij.org>
+Wed Jun 8 18:47:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/sdbm/_sdbm.c (sdbm_prep): use O_CLOEXEC if available.
+ * misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
-Sat Oct 29 14:26:56 2011 Tanaka Akira <akr@fsij.org>
+Wed Jun 8 12:25:59 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_cloexec_open): use O_CLOEXEC if available.
+ * array.c (rb_ary_nitems): add the block feature to Array#nitems.
+ suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
+ [ruby-talk:134083].
-Sat Oct 29 12:57:15 2011 Tanaka Akira <akr@fsij.org>
+Wed Jun 8 11:11:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * process.c (ruby_setsid): use rb_cloexec_open.
- (rb_daemon): ditto.
+ * bignum.c (get2comp): revert all prior changes, and calculate
+ proper 2's complement for negative numbers.
- * ruby.c (load_file_internal): ditto.
+Wed Jun 8 08:33:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * file.c (rb_file_s_truncate): ditto.
- (file_load_ok): ditto.
+ * enum.c (enum_min_by, enum_max_by): return nil if no iteration.
+ fixed: [ruby-dev:26245]
- * random.c (fill_random_seed): ditto.
+ * eval.c (rb_need_block): ensure a block is given.
- * ext/pty/pty.c (chfunc): ditto.
- (get_device_once): ditto.
+ * eval.c (backtrace): skip successive frames sharing same node.
- * ext/io/console/console.c (console_dev): ditto.
+Wed Jun 8 01:27:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Oct 29 10:40:19 2011 Tanaka Akira <akr@fsij.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.
- * include/ruby/intern.h (rb_cloexec_open): declared.
+ * bignum.c (rb_cstr_to_inum): must remove leading zeros for this
+ case.
- * io.c (fd_set_cloexec): extracted from rb_fd_set_cloexec.
- (rb_cloexec_open): new function.
- (sysopen_func): use rb_cloexec_open.
- (rb_sysopen_internal): use rb_update_max_fd instead of
- rb_fd_set_cloexec.
+Wed Jun 8 00:15:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Oct 29 09:05:07 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
+ KUBO Takehiro <kubo at jiubao.org> to support AIX. [ruby-list:40832]
- * thread_pthread.h: no Structured Exception Handling like macros.
- [ruby-core:40432] [Bug #5491]
+Wed Jun 8 00:09:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Oct 28 22:05:34 2011 Tanaka Akira <akr@fsij.org>
+ * lib/yaml/rubytypes.rb (Array::to_yaml): merged a patch from
+ Tilman Sauerbeck <tilman at code-monkey.de>. [ruby-core:05055]
- * ext/sdbm/_sdbm.c: RCS $Id$ removed.
+ * lib/yaml/rubytypes.rb (Hash::to_yaml): ditto.
-Thu Oct 27 18:58:00 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Jun 8 00:00:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (parser_nextc): set encoding for the buffer of ripper.
+ * ext/curses/curses.c (curses_insertln): merged a patch from
+ TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>. [ruby-ext:02305]
-Fri Oct 28 06:06:08 2011 Tanaka Akira <akr@fsij.org>
+Tue Jun 7 19:34:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/sdbm/_sdbm.c (sdbm_prep): set FD_CLOEXEC flags for file
- descriptors.
- (fd_set_cloexec): new function.
+ * lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
+ IRB.rc_file_generators. [ruby-core:05163]
-Fri Oct 28 03:01:27 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Jun 7 18:39:31 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_insnhelper.c (vm_call_cfunc): adding back useless hack. For some
- reason, this fixes CFP errors on OS X 10.7.
+ * lib/thread.rb: RDoc documentation from Eric Hodel
+ <drbrain@segment7.net> added. [ruby-core:05148]
-Fri Oct 28 00:09:31 2011 Tanaka Akira <akr@fsij.org>
+Tue Jun 7 18:30:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/sdbm/_sdbm.c (sdbm_prep): refactored for less nesting.
+ * lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
+ fixed: [ruby-dev:26294]
-Thu Oct 27 18:28:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 7 17:20:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (RUBY_DEFINE_IF): revert r33534 partially to get
- rid of AS_ECHO which is not available in autoconf 2.61.
- [ruby-dev:44702]
+ * parse.y (parser_yylex): allow ';;' to be block terminator in
+ place of 'end'. [highly experimental]
-Thu Oct 27 16:10:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-block-end-re): allow ';;' to be a
+ negative indent trigger. [highly experimental]
- * bignum.c (rb_big_divide): raise ZeroDivisionError if divisor is
- zero, as well as Fixnum. [ruby-core:40429] [Bug #5490]
+ * parse.y (parser_yylex): small error fixed.
-Thu Oct 27 14:56:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 7 16:45:49 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * configure.in (RUBY_FUNC_ATTRIBUTE): unset temporary variable.
+ * parse.y (parser_yylex): "respond_to?:foo" should be interpreted
+ as "respond_to? :foo" at the command level. [ruby-talk:144303]
- * configure.in (RUBY_STACK_GROW_DIRECTION): substitute CPU name as
- shell variable name. based on the patch by The Written Word Inc. at
- [ruby-core:40421]. [Bug #5488]
+Tue Jun 7 16:32:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Oct 27 09:57:56 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
+ not verbose mode (-v/-w). [ruby-core:05123]
- * include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
- patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]
+ * sprintf.c (rb_f_sprintf): warn always on verbose mode.
-Thu Oct 27 08:47:38 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Tue Jun 7 10:30:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/psych/parser.c: remove unused variable.
+ * ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
+ delegated by master-ip.
-Thu Oct 27 08:38:41 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Mon Jun 6 16:35:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/extconf.rb: add -Wall flag by default when compiler is
- GCC.
+ * ext/ripper/depend: add .y to .SUFFIXES for nmake.
-Wed Oct 26 15:24:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 5 23:00:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * file.c (rb_file_join): honor input encodings than ASCII-8BIT.
- [ruby-core:40338] [Bug #5483]
+ * ext/tk/lib/tk/console.rb: create console when required
-Tue Oct 25 21:52:31 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
- * include/ruby/defines.h: use "__sparc" instead of "sparc" and
- "__sparc__".
+Sun Jun 5 10:23:52 2005 Tanaka Akira <akr@m17n.org>
- * dln.c: ditto.
+ * signal.c (ruby_signal): don't set SA_RESTART.
+ [ruby-dev:26276]
- [ruby-dev:44694]
+Sat Jun 4 14:55:18 2005 Tanaka Akira <akr@m17n.org>
-Tue Oct 25 06:34:39 2011 Eric Hodel <drbrain@segment7.net>
+ * test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
- * re.c (match_aref): Use <code> around indexing examples to prevent
- hyperlinks. [ruby-talk:389396]
+ * test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
-Mon Oct 24 23:55:31 2011 Tanaka Akira <akr@fsij.org>
+ * test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
+ modification to use test/unit.
- * complex.c: use "__sun" instead of "__sun__" to detect SunOS.
+Fri Jun 3 23:23:02 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * math.c: ditto.
+ * intern.h (rb_fdset_t): deal with fd bit sets over FD_SETSIZE.
+ fixed: [ruby-dev:26187]
- * hash.c: ditto.
+ * eval.c (rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr,
+ rb_fd_isset, rb_fd_copy): ditto.
- * atomic.h: ditto.
+ * io.c (rb_io_wait_readable, rb_io_wait_writable, rb_f_select): ditto.
- * ext/io/wait/wait.c: ditto.
+ * ext/io/wait/wait.c (io_wait): ditto.
- [ruby-dev:44693]
+ * ext/socket/socket.c (wait_connectable, unix_recv_io): ditto.
-Mon Oct 24 22:45:37 2011 Tanaka Akira <akr@fsij.org>
+Fri Jun 3 14:06:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * io.c: use "__sun" instead of "sun" to detect SunOS.
+ * ext/tk/lib/multi-tk.rb: fix typo.
- * dln.c: ditto.
+Thu Jun 2 23:42:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * cont.c: ditto.
+ * parse.y: pragma support on ripper. [ruby-dev:26266]
- * ext/sdbm/_sdbm.c: ditto.
+Thu Jun 2 00:02:16 2005 Minero Aoki <aamine@loveruby.net>
- [ruby-dev:44693]
+ * struct.c: accessing >10 member caused segmentation fault.
+ [ruby-dev:26247]
-Mon Oct 24 22:38:08 2011 Tanaka Akira <akr@fsij.org>
+ * test/ruby/test_struct.rb: test it.
- * ext/pty/pty.c (get_device_once): delay rb_fd_set_cloexec() until
- grantpt() on Solaris. grantpt() doesn't work with CLOEXEC on
- Solaris 10.
- reported by Naohisa GOTO. [ruby-dev:44688] [Bug #5475]
+Wed Jun 1 11:30:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Mon Oct 24 08:18:14 2011 Tanaka Akira <akr@fsij.org>
+ * bcc32/Makefile.sub: can use single quote character in DESTDIR.
+ [ruby-dev:26205]
- * io.c (copy_stream_fallback_body): check nil for EOF of read method.
- patch by Eric Wong. [ruby-core:39134] [Bug #5237]
+ * bcc32/Makefile.sub: Dir.glob in 1.9 doesn't treat \ as path separator.
+ [ruby-dev:26254]
-Sun Oct 23 18:21:23 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+Wed Jun 1 00:11:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/MANUAL_tcltklib.eng: fix typo.
+ * parse.y (method_call): new experiment: "(expr)(args...)" to
+ invoke "expr.call(args...)". [EXPERIMENTAL]
-Sun Oct 23 18:03:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 31 23:43:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * numeric.c (rb_infinity, rb_nan): aggregated member initializers
- need braces.
+ * parse.y (command): revert implicit "call" for local variables.
-Sun Oct 23 16:43:43 2011 Naohisa Goto <ngotogenome@gmail.com>
+Tue May 31 15:52:45 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/io/wait/wait.c: ioctl(2) is declared in unistd.h on Solaris.
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
+ break the loop if the socket reached to EOF. [ruby-talk:142285]
-Sun Oct 23 16:33:35 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): send response
+ without reading the whole request body if keep-alive is diabled.
+ [experimental]
- * ext/tk/MANUAL_tcltklib.eng: fix typo. reported by Mimura-san.
- [ruby-dev:44683] [Bug #5471]
+Mon May 30 23:48:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sun Oct 23 08:01:29 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
+ Extension.
- * io.c (rb_fd_set_cloexec): set close-on-exec flag only if F_GETFD is
- defined. reported by Luis Lavena. [ruby-core:40281] [Bug #5470]
+ * ext/tk/lib/tk/msgcat.rb: ditto.
-Sat Oct 22 19:48:50 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tk/winpkg.rb: ditto.
- * test/openssl/test_ssl.rb (test_multibyte_read_write): start server
- for each length to avoid race condition.
+ * ext/tk/lib/tkextlib/*: ditto.
-Sat Oct 22 18:49:24 2011 Tanaka Akira <akr@fsij.org>
+Sat May 28 16:39:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * include/ruby/intern.h (rb_fd_set_cloexec): declared.
+ * test/openssl/test_x509store.rb: add test for expired CRL
+ and refine some assertions.
- * io.c (rb_fd_set_cloexec): new function.
- (ruby_dup): call rb_fd_set_cloexec to set close-on-exec flag.
- (rb_sysopen_internal): ditto.
- (rb_pipe): ditto.
- (io_reopen): ditto.
- (io_cntl): ditto.
+Sat May 28 05:15:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * process.c (rb_f_exec): change the default :close_others option to
- true.
- (rb_f_system): ditto.
- (move_fds_to_avoid_crash): call rb_fd_set_cloexec to set
- close-on-exec flag.
- (ruby_setsid): ditto.
- (rb_daemon): ditto.
+ * ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
+ not set internal flag directry.
- * thread_pthread.c (rb_thread_create_timer_thread): call
- rb_fd_set_cloexec to set close-on-exec flag.
+Sat May 28 02:00:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ruby.c (load_file_internal): ditto.
+ * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
+ ENV["REQUEST_URI"] is better to get correct Request-URI
+ than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"]. [ruby-dev:26235]
- * file.c (rb_file_s_truncate): ditto.
- (file_load_ok): ditto.
+Fri May 27 16:32:04 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * random.c (fill_random_seed): ditto.
+ * lib/mkmf.rb: use the semicolon as the path separator
+ in the environment of MSYS. fixed: [ruby-dev:26232]
- * ext/pty/pty.c (chfunc): ditto.
- (get_device_once): ditto.
+Thu May 26 20:31:21 2005 Minero Aoki <aamine@loveruby.net>
- * ext/openssl/ossl_bio.c (ossl_obj2bio): ditto.
+ * lib/fileutils.rb (remove_entry_secure): add documentation.
- * ext/socket/init.c (rsock_socket): ditto.
- (rsock_s_accept_nonblock): ditto.
- (rsock_s_accept): ditto.
+ * lib/fileutils.rb (remove_entry_secure): should not invoke
+ unlink(2) against a directory.
- * ext/socket/socket.c (rsock_sock_s_socketpair): ditto.
+Thu May 26 08:29:19 2005 Akiyoshi, Masamichi <akiyoshi@hp.com>
- * ext/socket/ancdata.c (discard_cmsg): ditto.
- (make_io_for_unix_rights): ditto.
+ * vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
+ for VMS port are added.
- * ext/socket/unixsocket.c (unix_recv_io): ditto.
+ * eval.c (ruby_init): change to call VMS private intialization routine.
- * ext/io/console/console.c (console_dev): ditto.
+Thu May 26 07:39:07 2005 Minero Aoki <aamine@loveruby.net>
- [ruby-core:38140] [Feature #5041]
+ * lib/fileutils.rb (rm_r): use lchown(2), not chown(2).
+ [ruby-dev:26226]
-Sat Oct 22 17:46:27 2011 Tanaka Akira <akr@fsij.org>
+ * lib/fileutils.rb (cd): remove :noop option. (feature change)
- * lib/resolv.rb: fix a exception name in previous patch.
+ * lib/fileutils.rb (cp_r): should copy symlink as symlink, for
+ also tree root. (feature change)
-Sat Oct 22 17:43:33 2011 Tanaka Akira <akr@fsij.org>
+ * lib/fileutils.rb (cp_r): new option :dereference_root.
- * lib/resolv.rb: make timeout configurable for DNS query.
- patch by Eric Wong. [ruby-core:38533] [Feature #5100]
+ * lib/fileutils.rb: new method remove_entry.
-Sat Oct 22 02:07:48 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/fileutils.rb: new method remove_entry_secure.
- * numeric.c (rb_infinity, rb_nan): use union to prevent bus error
- caused by misalignment. [Bug #5469] [ruby-dev:44657]
+ * lib/fileutils.rb: add documentation.
- * include/ruby/missing.h (INFINITY, NAN): ditto
+Thu May 26 06:08:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Fri Oct 21 22:02:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
- * gc.c (initial_params): pack in a struct.
+Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * gc.c (rb_gc_set_params): set parameters always.
- [ruby-dev:44648] [Bug #5467]
+ * ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
+ strings. To avoid the trouble, add arguments to control converting
+ encoding, and do split on a UTF8 string.
-Fri Oct 21 12:10:20 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * ext/tk/lib/multi-tk.rb: modify to attend encoding.
- * atomic.h: change Solaris checking macro because atomic_ops can work
- not only with Sun Studio but also with Fujitsu C Compiler.
+ * ext/tk/lib/remote-tk.rb: ditto.
-Fri Oct 21 02:11:00 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/tk/lib/tk/itemconfig.rb: ditto.
- * ext/openssl/ossl_ns_spki.c: Complete documentation.
- * test/openssl/test_ns_spki.rb: Integrate SPKI#to_text.
+ * ext/tk/lib/tk/listbox.rb: ditto.
-Thu Oct 20 22:47:28 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/tk/namespace.rb: ditto.
- * win32/win32.c (socklist_insert, socklist_lookup, socklist_delete):
- new functions to wrap of st_insert(), st_lookup() and st_delete() to
- socklist.
- allocating socklist is deferred until it is really needed.
+ * ext/tk/lib/tk/panedwindow.rb: ditto.
- * win32/win32.c (exit_handler): delete socklist only if it is
- initialized.
+ * ext/tk/lib/tk/text.rb: ditto.
- * win32/win32.c (rb_w32_sysinit, StartSockets): refactoring: move
- initialization of select_mutex to StartSockets().
+ * ext/tk/lib/tk/textmark.rb: ditto.
- * win32/win32.c (exit_handler): refactoring: delete select_mutex only
- if winsock is used.
+ * ext/tk/lib/tk/texttag.rb: ditto.
-Thu Oct 20 22:38:53 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/tk/lib/tk/variable.rb: ditto.
- * ext/openssl/ossl_pkcs5.c: add note on timing attacks and general
- documentation.
+ * ext/tk/lib/tk/winfo.rb: ditto.
-Thu Oct 20 21:19:15 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
- * vm_eval.c (check_funcall): set array elements one-by-one to fix
- compile error with Fujitsu C Compiler 5.6 on Solaris 10 on Sparc.
- [Bug #5464] [ruby-dev:44632]
+ * ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
-Thu Oct 20 13:09:35 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and
+ Tk#lower_window/raise_window by reason of method-name conflict
- * include/ruby/defines.h (flush_register_windows): use software
- trap on Debian Sparc 32-bit userspace. [Bug #5244]
+ * ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given
+ non-TkcItem arguments.
-Thu Oct 20 12:28:22 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
- * test/openssl/test_pkcs5.rb: add RFC 6070 tests for PBKDF2 with
- HMAC-SHA1
+Wed May 25 19:48:12 2005 Minero Aoki <aamine@loveruby.net>
-Thu Oct 20 11:42:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/fileutils.rb (rm_r): does chown(2). [ruby-dev:26199]
- * util.c (mmprepare): fix for fragmental size.
+Wed May 25 12:59:48 2005 Tanaka Akira <akr@m17n.org>
- * util.c (mmswap_, mmrot3_): portability improvement.
+ * lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
+ quoted-string should be zero or more characters.
-Thu Oct 20 05:58:02 2011 Eric Hodel <drbrain@segment7.net>
+Tue May 24 23:42:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/ossl_ns_spki.c (Init_ossl_ns_spki): Stub documentation
- for Netscape SPKI.
+ * numeric.c (fix_pow): support Fixnum ** Float case directly
+ without coercing. [ruby-talk:142697] [ruby-talk:143054]
-Thu Oct 20 05:13:39 2011 Ryan Davis <ryand-ruby@zenspider.com>
+Tue May 24 16:57:24 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/minitest/*: Imported minitest 2.6.2 (r6712)
- * test/minitest/*: ditto
+ * ruby.c (require_libraries): caused SEGV when continuation jumped
+ in to the required library code.
-Thu Oct 20 06:55:32 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Tue May 24 17:45:59 2005 Shugo Maeda <shugo@ruby-lang.org>
- * lib/openssl/buffering.rb: Force multi-byte strings to be treated as
- binary data.
- * test/openssl/test_ssl.rb: Add test for it.
+ * test/readline/test_readline.rb: do not test libedit.
+ fixed: [ruby-dev:26217]
- Thanks to Niklas Baumstark for reporting the issue!
+Tue May 24 06:45:31 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- [Ruby 1.9 - Bug #5233] [ruby-core:39120]
+ * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
+ literals to be matched non-greedy.
-Wed Oct 19 17:06:54 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue May 24 00:39:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * version.h (RUBY_VERSION): finally declare start of 2.0 work!
+ * test/soap/calc: method name 'set' was able to crash with a class Set.
+ [ruby-dev:26210]
-Wed Oct 19 11:48:44 2011 Eric Hodel <drbrain@segment7.net>
+ * test/wsdl/document/test_rpc.rb: dateTime comparison failed under
+ TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
- * error.c (Init_Exception): Document $! and $@. Provide
- recommendations for creating exceptions for a library.
+Mon May 23 16:23:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Oct 19 11:25:46 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/extconf.rb: Framework support on MacOS X Tiger.
- * error.c (Init_Exception): Add hierarchy of Exception subclasses.
- Based on patch by Sylvain Daubert. [Ruby 1.9 - Bug #5438]
+ * ext/tk/README.tcltklib: add description of Framework support options.
-Wed Oct 19 11:04:47 2011 Eric Hodel <drbrain@segment7.net>
+Mon May 23 15:07:34 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * enum.c: Reformat block args to a single standard, { |args| ... }.
- Patch by b t. [Ruby 1.9 - Bug #5393]
+ * win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO).
+ [experimental]
-Wed Oct 19 12:11:26 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Mon May 23 12:21:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/ossl_ssl.c: Remove set, but unused variables.
- ext/openssl/ossl_pkey.c: ditto
+ * re.c (make_regexp): should not return junk address during
+ compile time. [ruby-dev:26206]
- * ext/openssl/ossl_pkey_dh.c: Make functions passed to
- rb_thread_blocking_region return VALUE instead of void.
- ext/openssl/ossl_pkey_dsa.c: ditto
- ext/openssl/ossl_pkey_rsa.c: ditto
+Sun May 22 21:54:06 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Tue Oct 18 23:28:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
- * hash.c (identhash): share with type_numhash.
+ == SOAP client and server ==
- * st.c (st_hashtype_num): rename from type_numhash.
+ === for both client side and server side ===
-Tue Oct 18 23:07:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * improved document/literal service support.
+ style(rpc,document)/use(encoding, literal) combination are all
+ supported. for the detail about combination, see
+ test/soap/test_style.rb.
- * vm_core.h (ruby_current_thread): probeprofiler has been removed
- long ago.
+ * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
+ WSDL as well as obj2soap. closes #70.
-Tue Oct 18 23:05:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
+ you can set/get XML attribute via accessor methods which as a name
+ 'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).
- * ext/ripper/eventids2.c (ripper_init_eventids2): separate
- initializations of IDs and objects.
+ === client side ===
- * ext/ripper/tools/generate.rb (generate_eventids1): ditto.
+ * WSDLDriver capitalized name operation bug fixed. from
+ 1.5.3-ruby1.8.2, operation which has capitalized name (such as
+ KeywordSearchRequest in AWS) is defined as a method having
+ uncapitalized name. (converted with GenSupport.safemethodname
+ to handle operation name 'foo-bar'). it introduced serious
+ incompatibility; in the past, it was defined as a capitalized.
+ define capitalized method as well under that circumstance.
+
+ * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
+ to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
+ are merged). 'WSDLDriverFactory#create_driver' still creates
+ WSDLDriver for compatibility but it warns that the method is
+ deprecated. please use create_rpc_driver instead of create_driver.
+
+ * allow to use an URI object as an endpoint_url even with net/http,
+ not http-access2.
+
+ === server side ===
+
+ * added mod_ruby support to SOAP::CGIStub. rename a CGI script
+ server.cgi to server.rb and let mod_ruby's RubyHandler handles the
+ script. CGIStub detects if it's running under mod_ruby environment
+ or not.
+
+ * added fcgi support to SOAP::CGIStub. see the sample at
+ sample/soap/calc/server.fcgi. (almost same as server.cgi but has
+ fcgi handler at the bottom.)
+
+ * allow to return a SOAPFault object to respond customized SOAP fault.
+
+ * added the interface 'generate_explicit_type' for server side
+ (CGIStub, HTTPServer). call 'self.generate_explicit_type = true'
+ if you want to return simplified XML even if it's rpc/encoded
+ service.
+
+ == WSDL ==
+
+ === WSDL definition ===
+
+ * improved XML Schema support such as extension, restriction,
+ simpleType, complexType + simpleContent, ref, length, import,
+ include.
+
+ * reduced "unknown element/attribute" warnings (warn only 1 time for
+ each QName).
+
+ * importing XSD file at schemaLocation with xsd:import.
+
+ === code generation from WSDL ===
+
+ * generator crashed when there's '-' in defined element/attribute
+ name.
+
+ * added ApacheMap WSDL definition.
+
+ * sample/{soap,wsdl}: removed.
+
+Sun May 22 19:11:35 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
+ should initialize session id context. [ruby-core:4663]
+
+ * 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>
+
+ * 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>
+
+ * 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.
+
+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>
+
+ * dir.c (glob_helper): get rid of using String. [ruby-dev:26180]
+
+ * 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>
+
+ * 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>
+
+ * win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
+ to get rid of redefinition warnings on mingw.
+
+ * 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>
+
+ * win32/win32.{h,c}: define rb_[pgu]id_t.
+
+Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
+ 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>
+
+ * lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
+ [ruby-dev:26164]
+
+Sun May 15 18:56:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
+ to get rid of types which might not be defined yet. [ruby-dev:26165]
+
+Sun May 15 14:35:46 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
+ was failed. [ruby-core:4992]
+
+Sun May 15 09:57:30 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (unixtime_to_filetime): deal with DST.
+ [ruby-talk:141817]
+
+Sat May 14 23:59:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (Init_ripper, InitVM_ripper): fix inversed roles.
+ * error.c (exc_exception, {exit,name_err,syserr}_initialize): call
+ Execption#initialize. fixed: [ruby-talk:142593]
-Sun Oct 16 19:46:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 14 23:56:41 2005 Erik Huelsmann <ehuels@gmail.com>
- * ext/bigdecimal/bigdecimal.gemspec (files): fixed typo, and
- removed nonexistent file.
+ * configure.in: Check for the availability of pid_t, gid_t and uid_t and
+ remove AC_TYPE_UID_T. fixed: [ruby-core:04745]
- * ext/bigdecimal/bigdecimal.gemspec (homepage): added.
+ * defines.h: Remove pid_t typedef.
- * ext/io/console/io-console.gemspec (homepage): ditto.
+ * ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
+ the available system types.
-Fri Oct 14 12:13:57 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * process.c: Change instances of pid_t and gid_t to their rb_*
+ counterparts.
- * ext/pty/pty.c (pty_check): should return nil until the child
- terminates or stops. [ruby-dev:44600] [Bug #2642]
+ * ext/pty/pty.c: Change pid_t to rb_pid_t.
-Fri Oct 14 11:19:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * vms/config.h: Define HAVE_{P,G,U}ID_T to 1.
- * include/ruby/intern.h (rb_ary_rotate): export.
+ * win32/Makefile.sub: Remove #define for {g,u}id_t.
-Fri Oct 14 05:58:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c: Change pid_t to rb_pid_t.
- * atomic.h (ATOMIC_INC, ATOMIC_DEC): return old values.
- [ruby-dev:44596] [Bug #5439]
+ * wince/Makefile.sub: Remove #define for {g,u}id_t.
- * signal.c (ruby_atomic_exchange): no needs to define on the
- platforms where atomic.h is available.
+ * wince/sys/types.h: Remove definitions of {p,g,u}id_t.
-Thu Oct 13 19:29:40 2011 Naohisa Goto <ngotogenome@gmail.com>
+Sat May 14 11:47:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * atomic.h (ATOMIC_*): use atomic_ops(3C) when SunStudio on Solaris.
- [ruby-dev:44596] [Bug #5439]
+ * intern.h (ruby_pragma): prototype. [ruby-core:04881]
-Thu Oct 13 18:13:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * parse.y (parser_pragma): parse Emacsen hack.
- * atomic.h(ATOMIC_SET): add cast to void to prevent misuse.
- [ruby-dev:44596] [Bug #5439]
+ * parse.y (parser_prepare): deal with specific syntax at the top.
-Thu Oct 13 18:04:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (load_file): read the first line iff it started with shebang.
- * gc.c (rb_gc_finalize_deferred, rb_objspace_call_finalizer):
- should use ATOMIC_EXCHANGE() to check the previous value.
- [ruby-dev:44596] [Bug #5439]
+Fri May 13 23:44:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 12 23:39:58 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * ext/extmk.rb: keep srcdir unexpanded.
- * test/openssl/test_ssl.rb: Move duplicated tests for SSL::Session to
- test_ssl_session.rb
+ * lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
+ fixed: [ruby-core:04932]
-Tue Oct 11 08:49:40 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
+ also INSTALL_PROG and INSTALL_DATA system dependent.
+ fixed: [ruby-core:04931]
- * array.c (rb_ary_initialize): Improve explanation of Array.new
- parameters. Patch by Alvaro Pereyra Rabanal. [Ruby 1.9 - Bug #5425]
- * array.c (rb_ary_s_try_convert): Fix typo (try => tries)
- * array.c (rb_ary_rindex): Add spacing for block.
- * array.c (rb_ary_uniq_bang): Describe block
- * array.c (rb_ary_uniq): ditto
+Fri May 13 23:32:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 11 07:55:38 2011 Eric Hodel <drbrain@segment7.net>
+ * eval.c (unknown_node): add volatile directive to prototype.
- * array.c: Add a description to Array, minor cleanups. Patch by
- Andrea Singh. [Ruby 1.9 - Bug #5412]
+Fri May 13 17:50:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Oct 11 06:09:52 2011 Eric Hodel <drbrain@segment7.net>
+ * variable.c (generic_ivar_get): rb_attr_get should not warn.
+ [ruby-dev:26010]
- * lib/pp.rb: Move PP documentation to top of class PP. Patch by
- Sylvain Daubert. [Ruby 1.9 - Bug #5430]
+Thu May 12 17:41:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-Tue Oct 11 06:06:29 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
- * ext/coverage/coverage.c (Init_coverage): Change list format and
- describe Coverage.result output. Patch by Sylvain Daubert.
- [Ruby 1.9 - Bug #5428]
+Thu May 12 16:50:40 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Oct 11 05:53:23 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/rdoc/parsers/parse_c.rb: more readability for mixing
+ progress "c..." and warning message.
- * object.c (Init_Object): Add reference to BasicObject, brief
- explanation of constant lookup. Based on patch by Alvaro Pereyra
- Rabanal.
- [Ruby 1.9 - Bug #5426]
+Thu May 12 15:50:56 2005 Tilman Sauerbeck <tilman@code-monkey.de>
-Sun Oct 9 11:06:52 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
+ [ruby-core:4341]
- * test/psych/test_yamldbm.rb: don't run test if the system
- don't support yaml/dbm.
+Thu May 12 09:53:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/syck/test_yamldbm.rb: ditto.
+ * version.c (ruby_show_version): flush for non-tty stdout.
-Sat Oct 8 08:54:56 2011 Eric Hodel <drbrain@segment7.net>
+Thu May 12 01:23:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enum.c (group_by): Improve group_by description. Patch by b t.
- [#5411]
+ * 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.
-Sat Oct 8 03:17:51 2011 Eric Hodel <drbrain@segment7.net>
+Wed May 11 15:58:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/shell.rb: Document some methods of Shell. Patch by Carol
- Nichols. [Ruby 1.9 - Bug #5417]
+ * eval.c (break_jump): break should not cross functions.
+ [ruby-list:40818]
-Fri Oct 7 17:54:28 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed May 11 10:41:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * lib/test/unit/assertions.rb (assert_send, assert_not_send):
- parenthesize non-empty arguments.
+ * lib/tempfile.rb (Tempfile#unlink): fixed typo.
-Fri Oct 7 06:35:50 2011 Eric Hodel <drbrain@segment7.net>
+Wed May 11 01:03:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c: Use + for arguments described in documentation to allow
- rdoc -C2 to work better. Remove <code> from method references to
- allow cross-references in HTML documentation.
+ * eval.c (TMP_ALLOC): use macro NEW_NODE() to get rid of warnings on
+ platforms which have no alloca(). fixed: [ruby-talk:141301]
-Thu Oct 6 18:46:23 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Sun May 8 23:17:47 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * vm_eval.c (make_no_method_exception): fix typo.
+ * ext/tk/lib/tk/timer.rb: fix typo.
- * vm_insnhelper.c, vm_insnhelper.h: ditto.
+Sun May 8 21:00:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Oct 6 16:29:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (Init_Hash): remove custom "hash" and "eql?".
+ (ported from 1.8) [ruby-dev:26132]
- * vm_eval.c (make_no_method_execption): extract from
- raise_method_missing().
+Sun May 8 16:50:25 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * vm_eval.c (send_internal): remove inadvertent symbol creation
- from public_send. based on a patch by Jeremy Evans <code AT
- jeremyevans.net> in [ruby-core:38576]. [Feature #5112]
+ * lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
+ [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
- * vm_insnhelper.c (vm_call_method): remove inadvertent symbol
- creation from send and __send__, too.
+Sat May 7 22:58:00 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 6 14:59:11 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/mkmf.rb (have_var): no libs argument is given.
- * lib/time.rb: Clean up Time documentation. Patch by Jake Goulding.
- [Ruby 1.9 - Bug #5416]
+Fri May 6 08:08:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 6 10:00:54 2011 Eric Hodel <drbrain@segment7.net>
+ * hash.c:rb_hash_hash_i() should be static. [ruby-core:04815]
- * enum.c (group_by): Improve documentation based on patch by b t.
+ * re.c should include regint.h for declarations of oniguruma
+ functions. [ruby-core:04815]
-Thu Oct 6 09:56:30 2011 Eric Hodel <drbrain@segment7.net>
+Sun May 1 09:15:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * enum.c: Clean up wording in Enumerable documentation. Patch by b t.
- [Ruby 1.9 - Bug #5411]
+ * ruby.c (process_sflag): replace '-' in variable names with '_'.
+ [ruby-dev:26107]
-Thu Oct 6 09:17:18 2011 Eric Hodel <drbrain@segment7.net>
+ * eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
+ parser. fixed: [ruby-dev:26113]
- * time.c (Init_Time): Remove editorial comments from Time
- documentation, fix link.
+Sat Apr 30 11:59:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Oct 6 09:14:20 2011 Eric Hodel <drbrain@segment7.net>
+ * configure.in (RUBY_FUNC_ATTRIBUTE): check for function attribute.
+ [ruby-dev:26109]
- * time.c (Init_Time): Improve Time documentation. Patch by Shane
- Emmons. [Ruby 1.9 - Bug #5404]
- * lib/time.rb: Improve time.rb documentation including Time.strptime.
- Patch by Shane Emmons. [Ruby 1.9 - Bug #5402]
+ * eval.c, gc.c: moved noinline to configure.in.
-Thu Oct 6 08:54:05 2011 Eric Hodel <drbrain@segment7.net>
+ * rubyio.h (DEPRECATED): moved to configure.in.
- * random.c: Improve documentation of Random. Patch by Gregory
- Parkhurst. [Ruby 1.9 - Bug #5410]
+ * ruby.h (DEPRECATED, NOINLINE): default definition.
-Thu Oct 6 01:44:51 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * win{32,ce}/Makefile.sub (config.h): deprecated and noinline for
+ __declspec() are available for VC++7 or later.
- * cont.c (cont_mark): mark original Thread object from saved_thread.
- [ruby-dev:44571] [Bug #5386]
+Sat Apr 30 06:57:39 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Wed Oct 5 16:33:04 2011 NARUSE, Yui <naruse@ruby-lang.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)
- * vm_insnhelper.c (vm_call_cfunc): remove useless hack.
+ * 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.
-Wed Oct 5 05:56:39 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
+ not use String#split("/"). it removes trailing empty path component.
- * hash.c (Init_Hash): Improve Hash documentation. Patch by Alvaro
- Pereyra Rabanal. [Ruby 1.9 - Bug #5405]
+Thu Apr 28 08:21:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 5 05:47:59 2011 Eric Hodel <drbrain@segment7.net>
+ * ruby.c (set_arg0): use also environment variable space for setting
+ $0. [ruby-core:04774]
- * random.c (Init_Random): Add a top-level comment for Random. Patch
- by Brett Bim. [Ruby 1.9 - Bug #5403]
+Wed Apr 27 23:42:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Oct 5 02:50:27 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * win32/Makefile.sub (OPTFLAGS): default global optimization to
+ disabled only for VC++6.
- * ext/psych/lib/psych/syntax_error.rb: Add file, line, offset, and
- message attributes during parse failure.
- * ext/psych/parser.c: Update parser to raise exception with correct
+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"
+ 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]
+
+Sat Apr 23 19:49:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/tk/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.
+
+Thu Apr 21 06:45:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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.
+
+Thu Apr 21 00:07:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): support platforms have file separator
+ other than /.
+
+ * {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
+ of building platform.
+
+ * {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
+
+Wed Apr 20 23:22:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in, common.mk: miniruby depends on MINIOBJS.
+
+ * dmydln.c (dln_load): dummy function to raise LoadError.
+
+ * cygwin/GNUmakefile.in, {bcc32,win32,wince}/Makefile.sub: miniruby
+ can't load extensions on Windows.
+
+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:
+ add extout option.
+
+ * bcc32/setup.mak: make configuration variables overridable.
+
+Tue Apr 19 23:37:09 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
+
+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>
+
+ * eval.c (search_required, rb_require_safe): expand path in
+ rb_features. [ruby-dev:26079]
+
+ * file.c (rb_find_file_ext): return absolute path.
+
+ * 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]
+
+Sun Apr 17 23:57:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake, parse_args): do not expand destdir.
+
+ * ext/extmk.rb (relative_from): treat mere drive letter as an absolute
+ path.
+
+Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):
+ use the first date information of items as site date information
+ if channel doesn't have date information.
+
+Sat Apr 16 15:27:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.
+ files need timestamps to be kept are only ar-archive on a few
+ platforms, and be installed by instruby.rb but not INSTALL.
+ fixed: [ruby-core:04721]
+
+ * mkconfig.rb: purge autoconf value variables.
+
+Sat Apr 16 10:33:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * bcc32/Makefile.sub: quick hack... prepend DESTDIR.
+ still have restriction on DESTDIR ("", "/", "e:")
+
+Sat Apr 16 03:59:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/extconf.rb: check for OPENSSL_cleanse.
+
+ * 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>
+
+ * 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.
+
+ * lib/irb/slex.rb: bug fix by [ruby-core:04707].
+
+Thu Apr 14 00:20:31 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * bin/irb lib/irb.rb lib/irb/...: IRB 0.9.5.
+
+Wed Apr 13 23:40:21 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
+
+ * 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>
+
+ * 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
+ 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()
+ 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
+ Tcl commands before calling Tcl_GlobalEval().
+
+Mon Apr 11 23:36:04 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.
+
+ * test/drb/test_drb.rb: ditto.
+
+Mon Apr 11 22:18:23 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * dir.c, file.c (lstat): avoid warnings for mingw.
+
+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.
+
+Mon Apr 11 15:24:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+
+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
+ creating a new image object on Tk.
+
+ * ext/tk/lib/tk/menu.rb: use TkCommandNames on create_self()
+
+ * ext/tk/lib/tk/root.rb: TkRoot.to_eval() returns '.'.
+
+ * ext/tk/lib/tk/text.rb: add methods to create a TkText::IndexString
+ from (x, y) coords.
+
+ * ext/tk/lib/tkextlib/tile/: add demo and update support status.
+
+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>
+
+ * ext/extmk.rb (extmake): hdrdir needs to be defined also in
+ Config::CONFIG.
+
+ * lib/mkmf.rb (configuration, create_makefile): get rid of recursive
+ macro reference.
+
+Fri Apr 8 01:55:20 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
+ [ruby-dev:25992]
+
+Thu Apr 7 23:58:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+
+ * lib/mkmf.rb (configuration, create_makefile): ditto.
+
+ * lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+
+Thu Apr 7 17:24:17 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * eval.c (rb_call0): "return" event hook should be always executed
+ if event_hooks is set.
+
+Thu Apr 7 14:33:09 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * test/rss/test_maker_dc.rb (test_date): added a test for #date=
+ and #dc_date=.
+
+Thu Apr 7 11:49:53 2005 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/maker/dublincore.rb: _really_ supported multiple Dublin
+ Core items.
+
+ * test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
+ an assertion for testing multiple Dublin Core items.
+
+ * 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>
+
+ * sample/rss/tdiary_plugin/rss-recent.rb:
+ new option: @options['rss-recent.use-image-link']:
+ use image as link instread of text if available.
+
+ * 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>
+
+ * lib/rss/dublincore.rb: supported multiple Dublin Core items.
+
+ * 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/rss/maker/base.rb: added default current_element implementation.
+
+ * lib/rss/maker/dublincore.rb: supported multiple Dublin Core
+ items.
+
+ * lib/rss/maker/image.rb: supproted new Dublin Core API.
+
+ * lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
+ moved to RSS::Utils.
+
+ * lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
+ moved from RSS::TrackBackUtils.
+
+ * 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.
+
+ * lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
+ for date value.
+
+ * 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/psych/test_exception.rb: corresponding tests.
-Wed Oct 5 01:52:16 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Apr 4 23:17:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/psych/parser.c (parse): Use context_mark for indicating error
- line and column.
+ * ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
+ decide whether convert encoding of each element or not.
-Wed Oct 5 01:22:08 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the
+ encoding of array elements when assign an array to an TkVariable
+ object.
- * ext/psych/lib/psych/scalar_scanner.rb: use normal begin / rescue
- since postfix rescue cannot receive the exception class. Thanks
- nagachika!
+Mon Apr 4 10:26:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Oct 4 21:10:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/dialog.rb: fixed typo.
- * class.c (class_alloc): allocate extra memory after containing
- object setup to get rid of rare-but-potential memory leak.
+Sat Apr 2 23:38:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (gc_mark_children): skip marking extended members if ptr is
- NULL.
+ * configure.in (CP, INSTALL): get rid of less portable options.
-Tue Oct 4 16:17:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/mkmf.rb (configuration, create_makefile): correct configuration
+ variable.
- * lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
- Reported by Christopher Eberz. [ruby-core:39903] Bug #5399
+ * wince/configure.bat, wince/setup.mak: add prefix, extstatic and
+ rdoc options.
-Tue Oct 4 11:44:10 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): ensure library directories get made
+ before copying libraries there.
- * gc.c (rb_gc_set_params): ruby_verbose can be Qnil, so use RTEST.
+Sat Apr 2 16:59:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Oct 4 08:33:41 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
- * ext/etc/etc.c: Document Etc, Etc.sysconfdir, Etc.systmpdir. Patch
- by mathew murphy. [Ruby 1.9 - Bug #5396]
+ * ext/tk/lib/tk/variable.rb: fix namespace trouble when autoloading
-Tue Oct 4 08:21:51 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/lib/tk/palette.rb: define Tcl variable 'tkPalette' as global
- * lib/shellwords.rb: Update toplevel comment with an example. Patch
- by Samnang Chhun. [Ruby 1.9 - Bug #5388]
+ * ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
+ Tk.ip_eval.
-Tue Oct 4 08:15:50 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
+ 'TkWarningObj'
- * proc.c (proc_call): Update documentation to match argument handling
- of proc/Proc.new/lambda/->()
+Sat Apr 2 13:23:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Tue Oct 4 07:59:16 2011 Eric Hodel <drbrain@segment7.net>
+ * hash.c (env_key): ENV.index is deprecated as well as Hash#index.
+ use ENV.key instead. [ruby-dev:25974]
- * proc.c (proc_call): Fix documentation of Proc#call vs Proc#===.
- [Ruby 1.9 - Bug #5349]
+Sat Apr 2 02:19:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Tue Oct 4 07:43:18 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
+ option without 'widgetname' option to allow creating a widget object
+ which is used as an argument of Tcl/Tk's widget allocation commands.
- * array.c (rb_ary_initialize): Make Array.new description match
- call-seq. Patch by Henry Maddocks. [Ruby 1.9 - Bug #5344]
+ * ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
+ option to create a image object by the given name.
-Tue Oct 4 07:35:23 2011 Eric Hodel <drbrain@segment7.net>
+Thu Mar 31 22:23:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * array.c (rb_ary_initialize): Add output for examples. Patch by
- Jonathan Mukai. [Ruby 1.9 - Bug #5216]
+ * lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case
+ insensitive file system platforms.
-Tue Oct 4 07:30:50 2011 Eric Hodel <drbrain@segment7.net>
+ * README.EXT, README.EXT.ja (Appendix C): utility functions.
- * array.c (rb_ary_s_create): Add example results for Array::[]. Patch
- by Jonathan Mukai. [Ruby 1.9 - Bug #5215]
+Thu Mar 31 14:08:43 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Tue Oct 4 07:15:17 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
+ value. [ruby-dev:25971]
- * lib/rubygems: Update to RubyGems 1.8.11. Move Deprecate into the
- Gem namespace.
+Thu Mar 31 11:07:50 2005 Kouhei Sutou <kou@cozmixng.org>
-Tue Oct 4 06:43:47 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/rss/parser.rb: @@setter -> @@setters.
- * ext/psych/lib/psych.rb: update psych version.
- * ext/psych/psych.gemspec: generate new gemspec for new version.
+ * 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.
-Tue Oct 4 06:29:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * 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/psych/lib/psych.rb: calling `yaml` rather than `to_yaml`.
- * ext/psych/lib/psych/nodes/node.rb: Rename `to_yaml` to just `yaml`
- in order to avoid YAML::ENGINE switching from replacing this method.
- * test/psych/helper.rb: fix tests for method name change.
- * test/psych/test_document.rb: ditto
- * test/psych/visitors/test_emitter.rb: ditto
+Thu Mar 31 11:00:36 2005 Kouhei Sutou <kou@cozmixng.org>
-Tue Oct 4 06:20:19 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/rss/parser.rb
+ (RSS::BaseListener.install_setter)
+ (RSS::BaseListener.register_uri): changed fallback way.
- * ext/psych/lib/psych/scalar_scanner.rb: Match values against the
- floating point spec defined in YAML to avoid erroneous parses.
- * test/psych/test_numeric.rb: corresponding test.
+Thu Mar 31 08:25:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Oct 4 05:59:24 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * common.mk (RUBYOPT): clear for the environment RubyGems installed.
- * ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be
- constructed with a ScalarScanner.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: ScalarScanner can be
- passed to the YAMLTree visitor.
+ * common.mk (clean-local): keep $(PREP) files till distclean.
-Tue Oct 4 05:47:23 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * common.mk (check): do all tests.
- * ext/psych/lib/psych/visitors/to_ruby.rb: Define Regexp::NOENCODING
- for 1.9.2 backwards compatibility.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Fix Date string
- generation for 1.9.2 backwards compatibility.
+Thu Mar 31 06:00:20 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Mon Oct 3 23:56:39 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise
+ error even if the specified engine could not be loaded. (Dynamic
+ engines don't have fixed name to load.)
- * gc.c (rb_gc_set_params): output GC parameter change messages only
- if -w/-v options are specified. these messages are output to stderr,
- not to stdout. [ruby-core:39795] [Bug #5380]
+Wed Mar 30 17:41:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/ruby/test_gc.rb (test_gc_parameter): add test for it.
+ * ext/tk/tcltklib.c: add TclTkIp#_create_console() method to create
+ a Tcl/Tk's console window.
-Sun Oct 2 20:05:32 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
- * vm.c (rb_thread_mark), cont.c (cont_mark): revert r33369 and r33371
- that may cause SEGV in certain environments.
+ * ext/tk/lib/remote-tk.rb: ditto.
-Sun Oct 2 12:14:06 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/lib/tk/console.rb: ditto.
- * test/psych/test_yamldbm.rb: add test case.
- * test/syck/test_yamldbm.rb: ditto.
+ * ext/tk/lib/tk.rb: update RELEASE_DATE
-Sun Oct 2 11:28:09 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/tk/sample/demo-*/check2.rb: use 'return' in the Proc object.
- * lib/yaml/store.rb: make initialize method signature match the
- superclass signature.
+ * ext/tk/sample/tkextlib/**: ditto.
-Sun Oct 2 10:44:01 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+Tue Mar 29 22:20:49 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * io.c: fix documentation of ARGF.lineno=.
+ * test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
+ [ruby-dev:25961]
-Sat Oct 1 20:03:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 29 00:04:57 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * lib/mkmf.rb (have_framework): try as Objective-C.
- https://twitter.com/nagachika/status/120294447660539904
+ * lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
+ extract method DRbObject.prepare_backtrace. add DRb.regist_server,
+ remove_server, fetch_server. change server in thread variable if
+ in-proc server. [druby-ja:113]
-Sun Oct 2 08:43:25 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/drb/gw.rb: ditto.
- * vm.c (rb_thread_mark), cont.c (cont_mark): self pointer should not
- be marked by itself. Patch by Koichi Sasada.
- [ruby-dev:44567] [Bug #5386]
+Mon Mar 28 20:53:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Oct 2 00:42:14 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/extmk.rb (extract_makefile): nothing to be removed when no file
+ was deleted.
- * vm.c (rb_thread_mark): rb_thread_t needs self to be marked.
- [ruby-dev:44566] [Bug #5386]
+ * ext/extmk.rb (extmake): restore srcdir.
-Sat Oct 1 09:48:53 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Mon Mar 28 08:39:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (add_heap_slots, init_heap): reset heaps_inc zero when
- heap slots are expanded by environment variable RUBY_HEAP_MIN_SLOTS.
- [ruby-core:39777] [Bug #5380]
+ * ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
+ arguments. (pointed out by NaHi)
- * test/ruby/test_gc.rb (test_gc_parameter): add test for it.
+Sun Mar 27 00:56:58 2005 Minero Aoki <aamine@loveruby.net>
- * test/ruby/envutil.rb (assert_normal_exit): add :child_env option to
- enable pass environment variables to child process.
+ * lib/fileutils.rb (remove_file): ignore Errno::E* if force option
+ is set. [ruby-dev:25944]
-Thu Sep 29 13:17:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Mar 26 22:51:33 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * array.c (ary_join_1): should not copy the encoding of non-string
- element after string element. [ruby-core:39776] [Bug #5379]
+ * ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
+ a class is available for a callback entry.
-Thu Sep 29 11:53:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
- * gc.c (slot_sweep, rb_gc_finalize_deferred)
- (rb_objspace_call_finalizer, rb_gc): run finalizers
- sequentially. [ruby-dev:44562]
+ * ext/tk/lib/tk.rb (array2tk_list): change from private module method
+ of TkComm to public module method.
-Thu Sep 29 20:37:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk.rb (cget): add check that slot argument is not
+ empty string.
- * ext/gdbm/gdbm.c (rb_gdbm_fatal): adjust argument type.
+ * ext/tk/lib/tk.rb (configinfo): ditto.
-Thu Sep 29 20:10:42 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
+ is not empty string.
- * gc.c (is_id_value, is_live_object): extract from id2ref().
+ * ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
- * gc.c (run_finalizer): use object instead of object id.
+ * ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
+ cursor and cursor= method).
-Thu Sep 29 20:07:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/font.rb: improve font treatment when the font name is
+ empty string.
- * use RB_TYPE_P which is optimized for constant types, instead of
- comparison with TYPE.
+ * ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure
+ type.
-Wed Sep 28 09:20:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/variable.rb: improve treatment of array-type
+ tkvariable.
- * configure.in (pthread_np.h): needs pthread.h to be included
- previously on OpenBSD. a patch by George Koehler <xkernigh AT
- netscape.net> at [ruby-core:39752]. [Bug #5376]
+ * ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
-Wed Sep 28 04:41:35 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/lib/tkextlib/blt/*: bug fix.
- * test/psych/test_yamlstore.rb: use tmpdir for tmpfile.
- * test/syck/test_yamlstore.rb: ditto.
+ * ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
+ to call TreeCtrl commands for bindings.
-Wed Sep 28 04:10:46 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/sample/tkextlib/blt/*: new sample scripts.
- * ext/bigdecimal/README: update report to.
+ * ext/tk/sample/tkextlib/treectrl/*: ditto.
-Tue Sep 28 04:05:00 2011 Kenta Murata <mrkn@mrkn.jp>
+Fri Mar 25 10:53:16 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/bigdecimal/bigdecimal_en.html: removed because this file isn't
- maintained now.
+ * configure.in (WIN32_LEAN_AND_MEAN): removed because a lot of
+ troubles. [ruby-list:40721]
- * ext/bigdecimal/bigdecimal_ja.html: ditto.
+Thu Mar 24 23:10:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Sep 27 09:55:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/mkmf.rb (macro_defined?): try to compile for an old compiler
+ which doesn't bail out at #error directive. [ruby-dev:25818]
- * thread_pthread.c: make native_fd_select().
- * thread.c (do_select): remove #ifdef _WIN32. Instead, use
- native_fd_select() always.
+ * lib/mkmf.rb (check_sizeof): refine logging messages.
-Tue Sep 27 09:44:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Wed Mar 23 19:08:10 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * thread.c (do_select): remove cygwin specific hack. It's layer
- violation and too large hack.
- * thread.c (cmp_tv, subtract_tv): removed.
+ * 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.
-Tue Sep 27 03:50:19 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
+ parameter is 0, it should be updated with the port number which
+ ectually listened.
- * test/rexml/test_sax.rb: add require 'rexml/document'.
+Wed Mar 23 16:12:40 2005 Shugo Maeda <shugo@ruby-lang.org>
-Tue Sep 27 03:32:27 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * parse.y (primary): fix lineno of rescue and ensure.
- * test/psych/test_yamldbm.rb: fix #setup and #teardown.
- [Bug #5370] [ruby-core:39730]
- * test/syck/test_yamldbm.rb: ditto.
+Wed Mar 23 00:39:05 2005 Shugo Maeda <shugo@ruby-lang.org>
-Mon Sep 26 11:27:38 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/ruby/test_settracefunc.rb (test_event): added tests for
+ "class" and "end" and "raise".
- * lib/webrick/httputils.rb: Add MIME Type definition of .js and .svg.
- patched by Hal Brodigan. [ruby-core:39704] [Bug #5365]
+Sun Mar 20 22:51:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Sep 26 09:20:44 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/mkmf.rb (mkmf_failed): check if Makefile is created without
+ create_makefile.
- * configure.in: remove DJGPP support. It's not longer supported
- since ruby 1.9.0.
+Sat Mar 19 23:48:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Sep 26 09:07:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * misc/ruby-mode.el (ruby-expr-beg): returned true always.
+ fixed: [ruby-list:40683]
- * include/ruby/defines.h: remove NextStep, OpenStep, Rhapsody
- support. Last activity of their OSes are 7 years ago.
- * configure.in: ditto.
- * dir.c: ditto.
- * ext/tk/extconf.rb: ditto.
+Sat Mar 19 00:41:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Mon Sep 26 09:02:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/tk/lib/tk/font.rb: add some TkFont class methods to get font
+ information without creating a TkFont object.
- * configure.in: remove a code for human68k. it's no longer
- supported since r19677.
+ * ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
+ classes for components of Tk::TreeCtrl
-Sun Sep 25 23:43:32 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Thu Mar 17 17:42:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/ossl_asn1.c: fix int_ossl_asn1_decode0_cons when being
- fed arbitrary string values.
- Clearly distinguish between the cases "universal, infinite and
- not a SEQUENCE or SET" and "universal SEQUENCE or SET, possibly
- infinite". Raise error for universal tags that are not infinite.
- * test/openssl/test_asn1.rb: add a test for this.
+ * struct.c (make_struct): allow non local-id field
+ names. [ruby-core:04575]
- Thanks to Hiroshi Yoshida for reporting this bug.
- [Bug #5363] [ruby-dev:44542]
+ * struct.c (inspect_struct): ditto.
-Sun Sep 25 20:57:18 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Wed Mar 16 23:39:13 2005 Shugo Maeda <shugo@ruby-lang.org>
- * test/syck/test/yamldbm.rb: add test for Syck::DBM.
- * test/psych/test_yamldbm.rb: add test for Psych::DBM.
- * test/psych/test_yamlstore.rb: add test for Psych::PStore.
+ * test/ruby/test_settracefunc.rb: added test for c-return.
-Sun Sep 25 20:54:10 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Wed Mar 16 22:57:43 2005 Shugo Maeda <shugo@ruby-lang.org>
- * lib/yaml/dbm/dbm.rb: fix #update, add #key for using instead #index.
- [Bug #5305][ruby-dev:44485]
+ * eval.c (rb_call0): call_cfunc() should be protected.
-Sun Sep 25 16:54:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_add_event_hook): use K&R style.
- * encoding.c (require_enc): reject only loading from untrusted
- load paths. [ruby-dev:44541] [Bug #5279]
+ * eval.c (rb_remove_event_hook): ditto.
- * transcode.c (load_transcoder_entry): ditto.
+Wed Mar 16 22:03:15 2005 Shugo Maeda <shugo@ruby-lang.org>
-Sun Sep 25 16:45:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_add_event_hook): new function to add a hook function for
+ interpreter events.
- * configure.in: ignore all warnings from an arbitrary
- header in /usr/local/include.
+Wed Mar 16 18:08:32 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Sep 25 03:43:03 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * eval.c (rb_call0): reorganize "return" event post.
- * enum.c (slice_before_i): use rb_attr_get to suppress wrong warning
- for internal instance variable slicebefore_initial_state.
+ * eval.c (return_jump): no need to post "return" event here.
-Fri Sep 23 14:20:14 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Tue Mar 15 23:49:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/ossl_asn1.c: remove unused variable.
+ * ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
+ Iconv::Failure.
-Fri Sep 23 13:46:59 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Tue Mar 15 23:12:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/openssl/test_ssl_session.rb: execute test_session_exts_read
- only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for
- reporting this.
- [Bug #4961] [ruby-core:37726]
+ * eval.c (recursive_check, recursive_push): more restrictive check.
+ fixed: [ruby-dev:25916]
-Fri Sep 23 11:59:08 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Tue Mar 15 16:38:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/openssl/test_ssl_session.rb: ensure server calls callbacks in
- test_ctx_server_session_cb. Thanks to Eric Wong for the patch.
- [Bug #5336] [ruby-core:39619]
+ * ext/tk/tkutil/tkutil.c (ary2list): give wrong arguments to hash2kv()
-Thu Sep 22 02:53:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 14 19:39:33 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * vm_insnhelper.c (vm_call_cfunc): suppress a warning. note that
- `volatile type *var' doesn't make var itself volatile.
+ * ext/tk/lib/tk/timer.rb (TkTimer): forgot to clear @return_value
+ when restarting
-Thu Sep 22 01:52:48 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * ext/tk/lib/tk/sample/cd_timer.rb: new sample of TkRTTimer
- * thread_pthread.c (ubf_select): activate timer thread when interrupt
- blocking thread.
- A patch created by Koichi Sasada. [ruby-core:39634] [Bug #5343]
- to cover race condition, timer thread periodically send SIGVTARLM to
- threads in signal thread list. so you should activate timer thread
- when interrupt a thread.
+Mon Mar 14 12:21:03 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Sep 21 16:55:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/tk/timer.rb (TkRTTimer): forgot to reset the callback
+ time. So, 'continue' do all callbacks between 'stop' and 'continue'.
- * test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the
- behavior of mingw is just same with mswin.
+Mon Mar 14 08:14:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Sep 20 18:08:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (str_to_id): raise ArgumentError for NUL containing
+ strings.
- * vm_insnhelper.c (vm_get_cvar_base): reduce duplicated checks and
- move a warning outside the loop.
+Mon Mar 14 00:13:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Mon Sep 19 18:55:51 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset
+ value. get a little better accuracy.
- * lib/fileutils.rb (module FileUtils): improve performance of
- FileUtils.compare_stream. a patch by Masaki Matsushita.
- [Feature #5337] [ruby-core:39622]
+ * ext/tk/sample/demos-en/widget: use a binding with no local variables
+ when eval a sample script.
-Mon Sep 19 18:42:58 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/tk/sample/demos-en/bind.rb: ditto.
- * test/-ext-/old_thread_select/test_old_thread_select.rb:
- select() with timeout may return early in old Linux kernels
- with 250 Hz tickrate and no dynticks, so skip everything older
- than 2.6.32 (which has long term support).
- And, Make the timing assertions consistently use assert_operator with
- timing difference in error message
- Patch by Eric Wong. [Bug #5335] [ruby-core:39618]
+ * ext/tk/sample/demos-en/tcolor: ditto.
-Mon Sep 19 09:28:06 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/sample/demos-jp/widget: ditto.
- * test/openssl/test_ssl.rb (class OpenSSL): Test
- OpenSSL::SSL::SSLSocket#session and #session=.
+ * ext/tk/sample/demos-jp/bind.rb: ditto.
-Mon Sep 19 07:54:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/sample/demos-jp/tcolor: ditto.
- * object.c (rb_obj_clone): singleton class should be attached
- singleton object to. a patch by Satoshi Shiba <shiba AT rvm.jp>
- at [ruby-dev:44460]. [Bug #5274]
+Sun Mar 13 22:19:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Sep 17 23:34:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (recursive_pop): raise TypeError instead of fatal error.
+ fixed: [ruby-dev:25843]
- * parse.y (parser_data_type): inherit the core type in ripper so
- that checks in core would work. [ruby-core:39591] [Bug #5331]
+Sun Mar 13 10:09:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Sat Sep 17 12:44:04 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
- * lib/find.rb (Find.find): add documentation that Find.find
- without block returns an enumerator.
+Sun Mar 13 02:32:54 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Sep 15 11:39:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH
+ parameter from the current SSL object.
- * gc.c (mark_entry, mark_key, mark_keyvalue): adjust callback
- argument types.
+Sun Mar 13 02:09:03 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Sep 15 01:44:10 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
+ patch from IWATSUKI Hiroyuki. [ruby-dev:25867]
- * ext/tk/*: Change encoding from EUC-JP to UTF-8
+ * ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto.
+ (ossl_call_tmp_dh_callback): ditto
-Wed Sep 14 11:43:37 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Mar 11 03:24:59 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread.c (rb_fd_rcopy): added an argument guard.
- Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]
+ * parse.y (primary): wrong var node was set for NODE_LAMBDA.
+ [ruby-core:04555]
-Tue Sep 13 20:21:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 10 19:10:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/pstore.rb, test/test_pstore.rb: suppress warnings with -v.
+ * ext/tk/tcltklib.c (lib_eventloop_ensure): mis-delete a timer handler
+ when exit from a recursive called eventloop
- * lib/pstore.rb (PStore): always open in binary mode even if
- default encodings are set. [Bug #5311] [ruby-core:39503]
+ * ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
+ realtime operation
-Tue Sep 13 05:37:15 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
- * io.c (Init_IO): update BINARY comment. it should not change the
- encoding of the result to ASCII-8BIT. [ruby-talk:387719]
+ * ext/tk/lib/tk/textmark.rb: move TkTextMark#+ and TkTextMark#- to
+ TkText::IndexModMethods
-Mon Sep 12 19:55:00 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
+ add them to TkText::IndexModMethods module
- * thread.c (rb_thread_select): fix to ignore an argument
- modification of rb_thread_fd_select().
- based on a patch by Eric Wong. [Bug #5306] [ruby-core:39435]
- * thread.c (rb_fd_rcopy): New. for reverse fd copy.
+ * ext/tk/sample/tktextio.rb: add test part of "seek by text index
+ modifiers"
- * test/-ext-/old_thread_select/test_old_thread_select.rb
- (test_old_select_false_positive): test for bug5306.
+Thu Mar 10 08:10:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/-test-/old_thread_select/old_thread_select.c (fdset2array):
- New. convert fdsets to array.
- * ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
- return 'read', 'write', 'except' argument of rb_thread_select()
- to ruby script.
+ * re.c (make_regexp): need to free internal regexp structure when
+ compilation fails. [ruby-talk:133228]
-Mon Sep 12 13:38:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 10 01:08:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * README.EXT, README.EXT.ja (2.2.2), parse.y (rb_check_id): add
- documents for rb_check_id().
+ * parse.y (bv_decl): remove initialize rule from block local
+ variable declaration.
-Mon Sep 12 12:53:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Mar 9 23:55:34 2005 Tanaka Akira <akr@m17n.org>
- * lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
- open files in binary mode.
- see more details in https://github.com/jimweirich/rake/issues/74
+ * lib/pp.rb (PP::PPMethods#guard_inspect_key): support
+ __recursive_key__. [ruby-dev:25821]
-Mon Sep 12 12:42:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 9 19:42:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * test/ruby/test_exception.rb (TestException#test_exit_success_p):
- assert also the cases when exiting with true and false.
+ * 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.
- * lib/test/unit/assertions.rb (assert_send): make arguments in
- the default message clearer.
+ * 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]
-Sun Sep 11 05:23:14 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * ext/openssl/ossl_pkey.c
+ (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
+ (DupPrivPKeyPtr): new function.
- * lib/matrix.rb: Deal with subclasses of Matrix [redmine #5307]
+ * ext/openssl/ossl_pkey_dh.c: add default DH parameters.
-Sat Sep 10 13:38:20 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/openssl/ossl_pkey.h: ditto.
- * dir.c (dir_s_aref):
- * dir.c (dir_entries): Two small documentation fixes.
- A patch from Aaron Lerch. [Bug #5302] [ruby-core:39404]
+ * ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
-Sat Sep 10 08:30:03 2011 Koichi Sasada <ko1@atdot.net>
+Wed Mar 9 18:09:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * gc.c (GC_PROFILE_MORE_DETAIL, CALC_EXACT_MALLOC_SIZE):
- define macros only if they are not defined.
- fixes: [Ruby 1.9 - Feature #5291]
+ * parse.y (gettable_gen): warns if VCALL name is used as
+ out-of-scope block local variable. [EXPERIMENTAL]
-Sat Sep 10 08:25:47 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (opt_bv_decl): add explicit block local variable
+ declaration. raises error for name conflicts. [EXPERIMENTAL]
- * parse.y (bv_decls): parse.y relies on $$ = $1 before action
- routines. a patch from Michael Edgar. [Bug #5303]
- [ruby-core:39429]
+Wed Mar 9 13:37:57 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat Sep 10 01:37:55 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
+ support initial text, overwrite setting and pos_gravity control.
- * sample/drb/dhasenc.rb: coding cookie of Emacs is coding,
- not encoding.
+Tue Mar 8 18:16:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * sample/mine.rb: ditto.
+ * ext/tk/sample/tktextio.rb: New sample script. TkTextIO class in this
+ sample supports to use a text widget as if it is a I/O stream (such
+ like as StringIO class).
-Fri Sep 9 21:56:40 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Tue Mar 8 13:39:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimal_sqrt): Fix comment.
- BigDecimal#sqrt requires argument. Reported by Makoto Kishimoto.
- Thanks for your contribution. [Bug #5267] [ruby-dev:44452]
+ * ext/socket/mkconstants.rb: workaround for some of 4.4BSD-Lite
+ derived OSs.
-Fri Sep 9 11:00:55 2011 Shota Fukumori <sorah@tubusu.net>
+Tue Mar 8 12:36:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/rubygems/test_gem_commands_help_command.rb: Add one
- `require` because if run test-all with test/unit parallel
- running, sometimes this test fails by some constants not found.
- The error reason is some worker doesn't require the file needed by
- this test. This issue is related to [ruby-core:36168].
+ * ext/socket/socket.c: document from Sam Roberts
+ <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
+ [ruby-doc:824]
-Fri Sep 9 10:22:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 8 10:48:53 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread.c (rb_thread_select): fix a typo to initialize efds
- properly. [Bug #5299] [ruby-core:39380]
+ * eval.c (rb_exec_recursive): declaration should precede statements
+ before C99.
-Fri Sep 9 02:02:09 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Tue Mar 8 10:05:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * template/yarvarch.ja:
- Change encoding from Shift_JIS to UTF-8
+ * error.c (errno_missing): Errno.const_missing to allow references
+ to SyscallError exceptions not defined on the platform.
+ [ruby-core:04522]
-Thu Sep 9 01:14:00 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * error.c (Init_syserr): Errno::NOERROR(0) for fallback exception.
- * sample/drb/README.rd.ja:
- * sample/drb/dhasenc.rb:
- * sample/mine.rb:
- Change encoding from EUC-JP to UTF-8
+Tue Mar 8 01:19:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Sep 8 21:03:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
+ fixed: [ruby-dev:25828]
- * ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
- Bump version number/release date only.
+Mon Mar 7 21:29:40 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Sep 8 12:43:18 2011 Narihiro Nakamura <authornari@gmail.com>
+ * lib/webrick/server.rb (WEBrick::GenericServer#start): should
+ restore @token if accept failure. suggested by Dominique Brezinski.
+ [ruby-core:04518]
- * gc.c (Init_GC): defined GC::Profiler.raw_data. based on the
- patch by Eric Hodel. [ruby-core:37857] [Bug #4991]
+ * sample/webrick/httpsd.rb: fix typo in comment. suggested by
+ Kazuhiko Shiozaki.
-Thu Sep 8 09:02:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 7 21:01:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * gc.c (id2ref): objects which are unmarked but not in sweep_slots
- are not dead.
+ * eval.c (rb_require_safe): get actual path string under safe level
+ when requested. fixed: [ruby-dev:25815]
-Thu Sep 8 07:44:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 7 16:46:02 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * transcode.c (rb_declare_transcoder, load_transcoder_entry): no
- longer need to limit the length of transcoder library name.
+ * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
+ ossl_ssl_write): need to set errno on Win32 platform.
-Thu Sep 8 07:36:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Mar 7 14:55:43 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/syck/lib/syck/types.rb: use toplevel Syck.
- for the case someone define Syck::Syck (or YAML::Syck).
+ * eval.c (block_pass): should not push unique number if a block is
+ not an orphan. [ruby-dev:25808]
-Thu Sep 8 07:33:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 7 14:13:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * gc.c (id2ref): unmarked object is already dead while lazy
- sweeping, and to it cannot come back since other objects
- referred from it might have been freed already.
+ * ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
+ should set @eof and @rbuffer.
-Wed Sep 8 03:48:00 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Mon Mar 7 10:28:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/readline/README.ja:
- Change encoding from EUC-JP to UTF-8
+ * object.c (inspect_obj): unintended space removal.
+ [ruby-dev:25810]
-Wed Sep 8 02:59:00 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * eval.c (rb_exec_recursive): should not use NODE in disclosed
+ context. [ruby-dev:25812]
- * test/rexml/test_encoding.rb:
- Add require 'require 'rexml/document'
+ * io.c (rb_f_open): need not to check if to_open value is a
+ T_FILE. [ruby-dev:25812]
-Wed Sep 8 02:53:00 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+Mon Mar 7 01:21:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/nkf/nkf-utf8/nkf.c:
- Change encoding from ISO-2022 to UTF-8
+ * ext/tk/tkutil/tkutil.c: follow the change of st.c (committed
+ at Fri, 4 Mar 2005 15:47:47 +0900 by matz)
-Wed Sep 7 23:41:24 2011 Kouhei Sutou <kou@cozmixng.org>
+Mon Mar 7 00:01:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/rexml/parsers/baseparser.rb, test/rexml/test_comment.rb:
- allow a single hyphen in comment. [Bug #5278] [ruby-core:39289]
- Reported by Thomas Fritzsche. Thanks!!!
+ * ext/tk/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
-Wed Sep 7 17:27:18 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Sun Mar 6 13:04:10 2005 Dee Zsombor <zsombor@ruby-lang.org>
- * lib/yaml.rb: explicitly specify ::Object to avoid the collision with
- Syck::Object.
+ * misc/ruby-electric.el: added.
+ * misc/Readme: updated.
-Tue Sep 6 21:06:49 2011 Shota Fukumori <sorah@tubusu.net>
+Sun Mar 6 11:47:10 2005 Sam Roberts <sroberts@uniserve.com>
- * lib/test/unit.rb (_run_suites): Now reports are written the
- following order: Skip, Failure, Error. [Feature #5282]
+ * lib/pp.rb: rdoced. [ruby-core:4490]
- * test_sorting.rb: test for above.
+Sun Mar 6 11:36:37 2005 Tanaka Akira <akr@m17n.org>
- * test4test_sorting.rb: Ditto.
+ * lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
+ may return nil. [ruby-talk:129826]
+ reported by Daniel Berger.
- * lib/test/unit.rb (run): Put RUBY_DESCRIPTION before quitting.
- [Feature #5282]
+Sun Mar 6 06:34:31 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Tue Sep 6 21:13:47 2011 Masaya Tarui <tarui@ruby-lang.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]
- * win32/Makefile.sub (INSNS): change command line option -Ks to -Ku
- for generate *.inc. because insns.def encoding has been changed SJIS
- to UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]
- (same as r33194)
+ * ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): ditto.
-Tue Sep 6 15:55:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/lib/openssl/buffering.rb
+ (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#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.
- * transcode.c (load_transcoder_entry): concatenate paths directly.
+ * ext/openssl/extconf.rb: get rid of GNUmakefile generation.
- * encoding.c (load_encoding): predefined encoding names are safe.
- [ruby-dev:44469] [Bug #5279]
+ * text/openssl/test_pair.rb: test for IO like methods.
- * transcode.c (load_transcoder_entry): ditto.
+ * test/ruby/ut_eof.rb: test about empty file.
-Tue Sep 6 12:07:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Mar 5 17:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * transcode.c: enabled econv newline option.
+ * dir.c (rb_glob): fixed mismatch of argument.
-Tue Sep 6 06:44:57 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * dir.c (fnmatch): removed unnecessary code. (by string.c 1.219)
- * numeric.c (dbl2ival): Fix Float#divmod and #round for 32 bit
- platform. part 1 of [bug #5276]
+ * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.117)
-Tue Sep 6 06:44:25 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
- * numeric.c (flo_round): Fix criteria for 32 bits platform
- part 2 of [bug #5276]
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
-Tue Sep 6 05:37:11 2011 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
- [ruby-dev:44430] [Ruby 1.9 - Bug #372]
+ * ext/tk/lib/multi-tk.rb: freeze callback-entry objects
-Mon Sep 5 20:59:30 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * ext/tk/lib/tkextlib/tile.rb: support tile-0.6
- * insns.def: change encoding pragma for emacs (shift_jis to utf-8).
+Sat Mar 5 12:52:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Sep 5 19:32:15 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * lib/mkmf.rb (create_makefile): allow putting spaces between target
+ and colon in depend file.
- * Makefile.in (INSNS): change command line option -Ks to -Ku for
- generate *.inc. because insns.def encoding has been changed SJIS to
- UTF-8. if $BASERUBY is 1.9, -Ks cause an error. [Feature #5128]
+Sat Mar 5 02:41:00 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Mon Sep 5 18:10:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (eaccess): workaround for VC++8 runtime.
- * transcode.c (rb_econv_binmode): newline decorators are
- exclusive.
+ * win32/win32.c (ioinfo): VC++8 support.
-Mon Sep 5 15:03:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Mar 4 19:39:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rubygems/test_gem_security.rb
- (test_class_build_self_signed_cert): reset opt[:trust_dir] to apply
- temporary Gem.user_home.
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
+ also locally defined modules.
-Mon Sep 5 10:04:35 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * ext/iconv/iconv.c: rdocified.
- * README.ja, README.EXT.ja: resolve conflicts. [ruby-dev:44459]
+ * ext/strscan/strscan.c: moved misplaced rdoc.
-Mon Sep 5 05:13:22 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Fri Mar 4 16:11:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * numeric.c (flo_round): Make Float#round round big values [bug
- #5272]
+ * eval.c (rb_exec_recursive): matched the declaration to prototype.
-Mon Sep 5 04:28:25 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
+ window_color_set().
- * numeric.c (int_round): Integer#round always returns an Integer [Bug
- #5271]
+ * ext/tk/tcltklib.c: fixed commit mistakes.
-Sun Sep 4 22:28:50 2011 Shugo Maeda <shugo@ruby-lang.org>
+Fri Mar 4 12:45:17 2005 Tilman Sauerbeck <tilman@code-monkey.de>
- * lib/net/imap.rb (default_port, default_imap_port,
- default_tls_port, default_ssl_port, default_imaps_port):
- added methods for consistency with Net::POP.
- based on the patch by art lussos. [ruby-core:38997] [Bug #5198]
+ * lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
+ [ruby-core:4296]
-Sun Sep 4 21:19:19 2011 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
+ * lib/rdoc/parsers/parse_simple.rb: adds support for private comments
+ in the "simple" parser. [ruby-core:4301]
- * Change encoding from EUC-JP to UTF-8. [Feature #5128]
+Fri Mar 4 12:45:17 2005 Charles Mills <cmills@freeshell.org>
-Sun Sep 4 00:47:39 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * 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]
- * test/ruby/test_fiber.rb (TestFiber#test_no_valid_cfp):
- add a test. Unlike TestThread#test_no_valid_cfp,
- this test succeeds even if win32ole is required (see r33153).
+Fri Mar 4 12:45:17 2005 Florian Gross <florgro@gmail.com>
-Sun Sep 4 00:11:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
+ [ruby-core:4302]
- * variable.c (rb_const_set): show the previous definition
- location. [EXPERIMENTAL]
+Fri Mar 4 12:45:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Sep 3 23:56:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c: replace rb_protect_inspect() and rb_inspecting_p() by
+ rb_exec_recursive() in eval.c.
- * configure.in (sizeof_struct_dirent_too_small): check if struct
- dirent.d_name is too small.
+ * eval.c (rb_exec_recursive): new function.
- * configure.in (RUBY_MINGW32): take tool prefix from CC.
+ * array.c (rb_ary_join): use rb_exec_recursive().
-Sat Sep 3 23:52:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_inspect, rb_ary_hash): ditto.
- * io.c (argf_next_argv): open in default text mode.
- [ruby-core:39234] [Bug #5268]
+ * file.c (rb_file_join): ditto.
-Sat Sep 3 18:40:57 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
- * lib/thread.rb (SizedQueue#max=): raise ArgumentError if max is not
- positive number. patch by Masaki Matsushita.
- [ruby-dev:44449] [Bug #5259]
+ * io.c (rb_io_puts): ditto.
- * test/thread/test_queue.rb (test_sized_queue_initialize,
- test_sized_queue_assign_max): add tests for it.
+ * object.c (rb_obj_inspect): ditto
-Fri Sep 2 21:11:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * struct.c (rb_struct_inspect): ditto.
- * io.c (validate_enc_binmode, prep_stdio): default to text mode on
- dosish platforms. [ruby-core:38822] [Bug #5164]
+Fri Mar 4 10:15:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * transcode.c (rb_econv_prepare_options): keep default ecflags
- unchanged if no options.
+ * lib/set.rb (SortedSet::setup): a hack to shut up warning.
+ [ruby-talk:132866]
-Fri Sep 2 14:36:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 4 09:37:12 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * vm_insnhelper.c (vm_search_const_defined_class): search
- ancestors only when global scope. [ruby-core:39227] [Bug #5264]
+ * common.mk (install-nodoc, pre-install-doc, post-install-doc):
+ fix some omissions.
-Fri Sep 2 09:58:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Mar 4 08:09:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (parser_tokadd_string, parser_yylex): ignore a backslash
- which prefixes an non-ascii character, which has no escape
- syntax. [ruby-core:39222] [Ruby 1.9 - Bug #5262]
+ * lib/time.rb (Time::strptime): add new function. inspired by
+ [ruby-talk:132815].
-Fri Sep 2 04:05:25 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/parsedate.rb (ParseDate::strptime): ditto.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: emit strings tagged as
- ascii-8bit as binary in YAML.
- * test/psych/test_string.rb: corresponding test.
+Fri Mar 4 07:07:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-Fri Sep 2 01:07:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
- * numeric.c (flo_round): substitute machine dependent magic number.
+Thu Mar 3 23:24:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-Thu Sep 1 17:31:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
- * insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
- also inherited constants for classes without superclass and
- modules. [ruby-core:37698] [Bug #3423]
+Thu Mar 3 18:47:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Thu Sep 1 16:18:44 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * {bcc32,win32,wince}/Makefile.sub (config.h): check if affected
+ when makefiles are modified.
- * Release GVL while OpenSSL's public key generation.
+ * {bcc32,win32,wince}/Makefile.sub (config.status): add variables
+ for tests.
- t = Thread.new { print "."; sleep 0.1 }
- key = OpenSSL::PKey::RSA.new(2048)
- #=> Thread t works in parallel with public key generation if
- OS/machine allows it.
+ * win32/ifchange.bat: try to update a file only if modified.
- This works with OpenSSL >= 0.9.8. From this version, it has new
- public key generation function which allows us to interrupt the
- execution while pkey generation iterations.
+ * win32/resource.rb: more descriptions.
- * ext/openssl/extconf.rb: Check existence of OpenSSL's new public key
- generation function. (DH_generate_parameters_ex,
- DSA_generate_parameters_ex and RSA_generate_key_ex.
+ * common.mk: add {pre,post}-install targets.
- * ext/openssl/ossl_pkey.{h,c} (ossl_generate_cb_2,
- ossl_generate_cb_stop): Added new callback function for OpenSSL pkey
- generation which handles Thread interruption by Ruby.
- ossl_generate_cb_stop is the unblock function(ubf) for Ruby which
- sets a stop flag. New pkey generation callback ossl_generate_cb_2
- checks the stop flag at each iterations of OpenSSL and interrupts
- pkey generation when the flag is set.
+ * instruby.rb (install?): install particular part.
- * ext/openssl/ossl_pkey_dsa.c (dsa_generate): Call
- rb_thread_blocking_region with the above unblock function to release
- GVL while pkey generation.
+ * bcc32/Makefile.sub (post-install-ext): remove debug information
+ files after installation.
- * ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
+ * ext/tk/tcltklib.c (ip_rbUpdateCommand, ip_rb_threadUpdateCommand):
+ get rid of warnings with Tcl/Tk 8.3 or former.
- * ext/openssl/ossl_pkey_dh.c (dh_generate): ditto.
+Thu Mar 3 11:49:51 2005 Kouhei Sutou <kou@cozmixng.org>
- * test/openssl/test_pkey_{dh,dsa,rsa}.rb: Test it.
+ * sample/rss/tdiary_plugin/rss-recent.rb: added site information.
-Thu Sep 1 14:06:54 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Mar 2 19:53:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when
- win32ole is required. in such case, win32ole redefines
- Thread#initialize, and the block argument becomes to be not the top
- of the thread, then this testcase always fails.
+ * ext/extmk.rb (parse_args): return false if nothing matched.
-Thu Sep 1 10:20:50 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Mar 2 17:15:08 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish,
- default_mode_on_unix,text_mode,binary_mode}): sorry for wrong test
- committed in r33144. I'd misunderstood the spec of ruby's universal
- newline.
+ * ext/tk/tcltklib.c (lib_eventloop_core): fix typo
-Thu Sep 1 09:27:57 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Mar 2 16:59:50 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * variable.c (rb_autoloading_value): Fix the order of definitions.
- It is used by autoload_defined_p.
+ * eval.c (ruby_native_thread_kill): call pthread_kill() to send a
+ signal to ruby's native thread
-Wed Aug 31 17:28:23 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * ruby.h: add definition of ruby_native_thread_kill()
- * variable.c (rb_autoload): There was a chance to run GC (from
- rb_str_new2()) before finishing autoload_data_i construction. It
- caused SEGV at rb_gc_mark() at autoload_i_mark.
+ * 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
- * variable.c (rb_autoload_load): Move RB_GC_GUARD() to proper
- position based on suggestion by CHIKANAGA Tomoyuki at
- http://d.hatena.ne.jp/nagachika/20110826/ruby_trunk_changes_33070_33078
+Wed Mar 2 16:03:08 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * variable.c (autoload_defined_p): Fix incompatible autoload behavior
- that causes Rails crash. Class definition instruction defined in
- 'defineclass' in insns.def always invokes rb_autoload_load for a
- constant. It's invoked for every class definition regardless of
- existence of autoload definition. rb_autoload_load checks if a
- constant is defined as autoloaded, but new thread-safe autoload
- returned different value if the constant is under autoloading.
+ * ext/tk/tcltklib.c: enforce thread-check and exception-handling to
+ avoid SEGV trouble.
-Wed Aug 31 17:20:56 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * ext/tk/tkutil/tkutil.c: fix a bug on converting a SJIS string array
+ to a Tcl's list string.
- * Re-apply r33078, thread-safe autoload which is reverted at r33093.
+ * ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
+ protect from namespace crash.
-Wed Aug 31 16:28:04 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/multi-tk.rb: enforce exception-handling.
- * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish,
- default_mode_on_unix,text_mode,binary_mode}): tests for [Bug #5164].
+ * ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
-Wed Aug 31 15:54:11 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/lib/tk.rb: ditto.
- * ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
+ * ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
-Wed Aug 31 13:09:41 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+ * ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
- * numeric.c (flo_round): Avoid overflow by optimizing for trivial
- cases [Bug #5227]
+ * ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
-Wed Aug 31 00:50:01 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/clock.rb: fix 'no method error'.
- * win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
- be more careful.
+ * ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
-Wed Aug 31 00:48:38 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/lib/variable.rb: be able to set default_value_type; :numeric,
+ :bool, :string, :symbol, :list, :numlist or nil (default; same to
+ :string). If set a type, TkVariable#value returns a value of the
+ type.
- * thread.c (rb_thread_select): critical typo in r33117.
+ * ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
+ risk of using TclX extension's 'signal' command.
-Wed Aug 31 00:30:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
- * test/-ext-/old_thread_select/test_old_thread_select.rb
- (TestOldThreadSelect#test_old_select_read_timeout): if the machine
- is fast enough, the time used by code around IO.select may be smaller
- than Time implement threshold.
+ * ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
-Wed Aug 31 00:04:38 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
- * ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
- typo.
+ * ext/tk/sample/demos-*/pendulum.rb: ditto.
- * test/-ext-/old_thread_select/test_old_thread_select.rb
- (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
- of SIGUSR1 because the former is general and the latter is platform
- dependent.
+ * ext/tk/sample/demos-*/goldberg.rb: ditto.
-Tue Aug 30 23:59:36 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/demos-*/widget: add entries of animation demos.
- * win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement
- for rb_thread_select() in thread.c. the use of rb_fd_copy() is
- introduced in r33117.
- [Bug #5251] [ruby-core:39195]
+Wed Mar 2 12:21:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread.c (rb_thread_select): must call rb_fd_init() before using
- rb_fdset_t. see the implementations of rb_fd_init()s if you want to
- know the reason.
+ * eval.c (rb_eval): [EXPERIMENTAL] NODE_LAMBDA implemented.
+ [ruby-dev:25780]
-Tue Aug 30 22:34:45 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * node.h (NODE_LAMBDA): for literal Proc object.
- * test/dl/test_callback.rb (test_callback_with_string): prevents
- temporary string from GC.
+ * parse.y (expr): interpret mere do...end block as proc object.
-Tue Aug 30 22:25:38 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * parse.y (primary): ditto, for brace block.
- * vm_insnhelper.c (vm_call_cfunc): revert r33112. RB_GC_GUARD macro
- protect a VALUE from GC. It's not for general anti-optimizing
- purpose.
+Tue Mar 1 21:16:54 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-Tue Aug 30 11:06:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * regcomp.c (optimize_node_left): uninitialized member
+ (OptEnv.backrefed_status) was used. [ruby-dev:25778]
- * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
- [Bug #5173] [ruby-core:38866]
+Tue Mar 1 16:50:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Aug 30 09:57:50 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * regparse.c: move st_*_strend() functions from st.c. fixed some
+ potential memory leaks.
- * lib/thread.rb (Queue#pop): fix a race against Thread.wakeup.
- Patch by Masaki Matsushita <glass.saga at gmail dot com>
- [Bug #5195] [ruby-dev:44400]
+Tue Mar 1 00:40:35 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Aug 30 09:48:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
- * cont.c (fiber_entry): fix stack allocation failure on Debian
- GNU/kFreeBSD.
- Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
- [Bug #5241] [ruby-core:39147]
+ * test/rinda/test_rinda.rb: ditto.
-Tue Aug 30 09:28:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 28 23:10:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * thread.c (rb_thread_select): rewrite by using
- rb_thread_fd_select(). old one is EINTR unsafe.
- Patch by Eric Wong. [Bug #5229] [ruby-core:39102]
+ * ext/socket/socket.c (Init_socket): IPv6 is not supported although
+ AF_INET6 is defined on bcc32. (rev1.108 again)
- * test/-ext-/old_thread_select/test_old_thread_select.rb:
- a testcase for rb_thread_select().
- * ext/-test-/old_thread_select/old_thread_select.c: ditto.
- * ext/-test-/old_thread_select/depend: ditto.
- * ext/-test-/old_thread_select/extconf.rb: ditto.
+ * ext/socket/mkconstants.rb: ditto.
-Tue Aug 30 09:08:22 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Feb 28 21:55:49 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
- * configure.in: fix a build failure on GNU Hurd.
- Patch by Samuel Thibault <sthibault at debian dot org>. Thank you!
- [Bug #5250] [ruby-core:39185]
+ * ext/strscan/strscan.c (strscan_s_allocate):
+ use onig_region_init().
-Sun Aug 29 23:22:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * ext/strscan/strscan.c (adjust_registers_to_matched):
+ use onig_region_set().
- * test/ruby/test_numeric.rb (test_num2long): modify a test against the
- change by r33108.
+Mon Feb 28 15:12:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Sun Aug 29 09:58:00 2011 Kenta Murata <mrkn@mrkn.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]
- * numeric.c (bit_coerce): A Fixnum and a Bignum are only permitted for
- bitwise arithmetic with a Fixnum. #1792
+ * ext/socket/depend: ditto.
- * test/ruby/test_fixnum.rb: add tests for the above change.
+ * ext/socket/mkconstants.rb: ditto. (added)
- * bignum.c (bit_coerce): A Fixnum and a Bignum are only permitted for
- bitwise arithmetic with a Bignum. #1792
+Mon Feb 28 11:42:23 2005 Ian Macdonald <ian@caliban.org>
- * test/ruby/test_bignum.rb: add tests for the above change.
+ * exception error messages updated. [ruby-core:04497]
-Sun Aug 28 15:38:17 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Mon Feb 28 09:03:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
- stored in variable while the contents buffer is being used.
+ * ext/socket/socket.c (Init_socket): add bunch of Socket
+ constants. Patch from Sam Roberts <sroberts@uniserve.com>.
+ [ruby-core:04409]
- * ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
- memory read. [ruby-dev:44409] [Bug #5213]
+Sun Feb 27 05:55:38 2005 Minero Aoki <aamine@loveruby.net>
-Sun Aug 28 05:29:50 2011 Ryan Davis <ryand-ruby@zenspider.com>
+ * parse.y [ripper]: fix typo. [ruby-core:04494]
- * lib/minitest/*: Imported minitest 2.5.1 (r6596)
- * test/minitest/*: ditto
+Sat Feb 26 16:58:20 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
-Sat Aug 27 20:46:05 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * parse.y, re.c, regex.h, LEGAL, ext/strscan/strscan.c:
+ remove oniggnu.h (GNU regex API).
- * vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type
- to suppress a warning.
+Wed Feb 23 22:08:16 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
- * vm_core.h: ditto.
+ * st.c, st.h: imported additional file changes on
+ Oniguruma 3.7.0.
-Sat Aug 27 19:04:06 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Feb 23 21:45:29 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
- * internal.h (rb_strftime_timespec): moved from time.c and define only
- if ruby/encoding.h is included.
+ * 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.
- * internal.h (rb_strftime): ditto.
+Wed Feb 23 15:04:32 2005 akira yamada <akira@ruby-lang.org>
-Sat Aug 27 18:53:51 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
+ and "pass". [ruby-dev:25667]
- * proc.c (proc_new): force to rewrite errinfo when calling Proc.new in ensure.
- [Bug #5234] [ruby-core:39125]
- This code will be removed after changing throw mechanism (see r33064).
+Wed Feb 23 08:00:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm.c (rb_vm_rewrite_dfp_in_errinfo): new function.
+ * array.c (rb_ary_s_create): no need for negative argc check.
+ [ruby-core:04463]
- * vm.c (vm_make_env_each): changed accordingly.
+ * array.c (rb_ary_unshift_m): ditto.
- * vm_core.h: ditto.
+Wed Feb 23 01:53:29 2005 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (initialize): handle certs correctly. Thanks,
+ NABEYA Kenichi.
- * bootstraptest/test_flow.rb: add tests for above.
+Wed Feb 23 00:37:34 2005 Kouhei Sutou <kou@cozmixng.org>
-Sat Aug 27 18:44:06 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/mkmf.rb (mkmf_failed): fixed typo.
- * internal.h (rb_strftime_timespec): move to time.c because it depends
- encoding.h.
+Tue Feb 22 23:52:45 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Aug 27 18:17:58 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * configure.in, lib/mkmf.rb: use simple commands if available.
- * strftime.c (rb_strftime_with_timespec): get enc argument to specify
- the encoding of the format. On Windows (at least Japanese Windows),
- Time#strftime("%Z") includes non ASCII in locale encoding (CP932).
- So convert locale to default internal. [ruby-core:39092] [Bug #5226]
+ * mkconfig.rb: remove autoconf internal variables from rbconfig.rb.
- * strftime.c (rb_strftime): ditto.
+ * lib/mkmf.rb (create_makefile): substitute implicit rules in depend
+ file.
- * strftime.c (rb_strftime_timespec): ditto.
+ * {bcc32,win32,wince}/Makefile.sub (COMPILE_RULES, RULE_SUBST):
+ include $(topdir) and $(hdrdir) to search path.
- * internal.h (rb_strftime_timespec): follow above.
+Tue Feb 22 23:51:45 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * time.c (rb_strftime_alloc): ditto.
+ * ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
- * time.c (strftimev): ditto.
+Tue Feb 22 23:50:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * time.c (time_strftime): ditto.
+ * signal.c (ruby_signal, ruby_nativethread_signal): must be valid as
+ expressions, not only statements.
- * time.c (time_to_s): the resulted string of Time#to_s is always
- ascii only, so this should be US-ASCII.
+Tue Feb 22 12:54:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * time.c (time_asctime): ditto.
+ * eval.c (rb_thread_start_0): update curr_thread before raising
+ TAG_THREAD. [ruby-dev:25712]
-Sat Aug 27 11:18:12 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Tue Feb 22 07:24:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * Revert r33078. It caused a Rails application NoMethodError.
+ * parse.y (parser_yylex): identifier after dot must not be a variable.
- /home/nahi/git/emptyApp/ruby/1.9.1/gems/rack-mount-0.6.14/lib/rack/mount/utils.rb:157: warning: toplevel constant ScanError referenced by Regin::Parser::ScanError
- /home/nahi/git/emptyApp/ruby/1.9.1/gems/rack-mount-0.6.14/lib/rack/mount/vendor/regin/regin/parser.rb:17:in `parse_regexp': undefined method `scan_str' for #<Regin::Parser:0x00000002344548> (NoMethodError)
+Mon Feb 21 18:31:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sat Aug 27 08:44:58 2011 Eric Hodel <drbrain@segment7.net>
+ * 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.
- * lib/rdoc: Import RDoc 3.9.4. Typo and grammar fixes by Luke Gruber.
- [Ruby 1.9 - Bug #5203]
+Sun Feb 20 00:48:48 2005 Tanaka Akira <akr@m17n.org>
-Sat Aug 27 07:53:34 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
+ re-implemented according to RFC 1738.
+ reported by Guillaume Marcais. [ruby-talk:131650]
- * lib/open-uri.rb: Fix indentation of OpenURI::OpenRead#open. Use ++
- instead of `' for method arguments in open-uri.rb
+Sat Feb 19 18:46:56 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Sat Aug 27 07:22:07 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
+ [ruby-dev:25722]
- * ext/pathname/lib/pathname.rb: Fix typos and grammar mistakes. Patch
- by Luke Gruber. [#5203]
- * ext/pty/lib/expect.rb: ditto
- * lib/mathn.rb: ditto
- * lib/net/http.rb: ditto
- * lib/open-uri.rb: ditto
- * lib/ostruct.rb: ditto
- * lib/tempfile.rb: ditto
- * lib/thread.rb: ditto
- * lib/weakref.rb: ditto
- * sample/webrick/httpproxy.rb: ditto
+ * test/drb/drbtest.rb: ditto.
-Sat Aug 27 04:03:18 2011 Koichi Sasada <ko1@atdot.net>
+Sat Feb 19 13:52:02 2005 Tanaka Akira <akr@m17n.org>
- * iseq.c (iseq_data_to_ary): fix type of variable
- (long -> unsigned long) to suppress a warning.
+ * lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
+ after connection is made.
-Sat Aug 27 04:02:11 2011 Koichi Sasada <ko1@atdot.net>
+Sat Feb 19 13:31:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_core.h: add a decl. of rb_autoloading_value().
+ * ext/extmk.rb (extract_makefile): remove no longer existing installed
+ files.
-Fri Aug 26 19:12:08 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * lib/mkmf.rb (install_dirs): return installation directory list.
- * variable.c: Make autoload thread-safe. See #921.
+ * lib/mkmf.rb (create_makefile): reverted wrongly removed lines.
- What's the problem?
- autoload is thread unsafe. When we define a constant to be
- autoloaded, we expect the constant construction is invariant. But
- current autoload implementation allows other threads to access the
- constant while the first thread is loading a file.
+Sat Feb 19 01:28:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- What's happening inside?
- The current implementation uses Qundef as a marker of autoload in
- Constant table. Once the first thread find Qundef as a value at
- constant lookup, it starts loading a defined feature. Generally a
- loaded file overrides the Qundef in Constant table by module/class
- declaration at very beginning lines of the file, so other threads
- can see the new Module/Class object before feature loading is
- finished. It breaks invariant construction.
+ * ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
+ [ruby-dev:25685]
- How to solve?
- To ensure invariant constant construction, we need to override
- Qundef with defined Object after the feature loading. For keeping
- Qundef in Constant table, I expanded autoload_data struct in
- Module to have a slot for keeping the defined object while feature
- loading. And changed Module's constant lookup/update logic a
- little so that the slot is only visible from the thread which
- invokes feature loading. (== the first thread which accessed the
- autoload constant)
+ * ext/bigdecimal/sample/linear.rb: ditto.
- Evaluation?
- All test passes (bootstrap test, test-all and RubySpec) and added
- 8 tests for threading behavior. Extra logics are executed only
- when Qundef is found, so no perf drop should happen except
- autoloading.
+ * ext/bigdecimal/sample/nlsolve.rb: ditto.
- * variable.c (rb_autoload): Prepare new autoload_data struct.
+ * ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
+ is sample script and same file exists in ext/bigdecimal/sample.
- * variable.c (rb_autoload_load): Load feature and update Constant
- table after feature loading is finished.
+Fri Feb 18 17:14:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * variable.c (rb_const_get_0): When the fetched constant is under
- autoloading, it returns the object only for the thread which starts
- autoloading.
+ * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
+ of StandardError class, not Exception class. [ruby-core:04429]
- * variable.c (rb_const_defined_0): Ditto.
+Fri Feb 18 04:06:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * variable.c (rb_const_set): When the specified constant is under
- autoloading, it sets the object only for the thread which starts
- autoloading. Otherwise, simply overrides Qundef with constant
- override warning.
+ * parse.y (fcall_gen): lvar(arg) will be evaluated as
+ lvar.call(arg) when lvar is a defined local variable. [new]
- * vm_insnhelper.c (vm_get_ev_const): Apply same change as
- rb_const_get_0 in variable.c.
+Thu Feb 17 22:15:34 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
- * test/ruby/test_autoload.rb: Added tests for threading behavior.
+ * ext/strscan/strscan.c: calls Oniguruma API directly.
-Fri Aug 26 10:10:37 2011 Eric Hodel <drbrain@segment7.net>
+Thu Feb 17 21:53:12 2005 K.Kosako <sndgk393 AT ybb.ne.jp>
- * lib/rubygems: Update to RubyGems 1.8.10. Fixes security issue in
- creating ruby-format gemspecs. Fixes Gem.dir not being at the front
- of Gem.path to fix uninstall and cleanup commands. Fixes gem
- uninstall stopping on the first missing gem.
+ * common.mk, LEGAL: remove reggnu.c.
-Fri Aug 26 08:21:10 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Thu Feb 17 21:53:12 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
- * time.c (strftimev): Make Time#to_s default to US-ASCII encoding but
- respect Encoding.default_internal. [ruby-core:39092]
- * test/ruby/test_time.rb (class TestTime): Corresponding test.
+ * gc.c, re.c: now ruby calls Oniguruma API directly, bypassing
+ GNU compatible APIs.
-Thu Aug 25 09:43:16 2011 Eric Hodel <drbrain@segment7.net>
+Thu Feb 17 20:09:23 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/openssl/lib/openssl/bn.rb: Hide copyright info from RDoc.
- * ext/openssl/lib/openssl/digest.rb: ditto
- * ext/openssl/lib/openssl/x509.rb: ditto
- * ext/openssl/lib/openssl/cipher.rb: ditto
+ * lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
-Thu Aug 25 09:25:48 2011 Eric Hodel <drbrain@segment7.net>
+Thu Feb 17 20:09:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/openssl/ossl_digest.c: Document OpenSSL::Digest::digest and add
- an example to OpenSSL::Digest. Patch by Sylvain Daubert.
- [Ruby 1.9 - Bug #5166]
- * ext/openssl/lib/openssl/digest.rb (module OpenSSL): ditto
+ * test/digest/test_digest.rb: separate test case for each algorithms.
+ [ruby-dev:25412]
-Thu Aug 25 08:19:43 2011 Koichi Sasada <ko1@atdot.net>
+Thu Feb 17 14:31:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm.c (vm_make_env_each): work around to solve Bug #2729.
- fixes: Bug #2729
- a patch from Kazuki Tsujimoto <kazuki@callcc.net>
- This problem is caused by changing dfp (dynamic env pointer)
- from saved dfp. Saved dfp is pointed env in VM stack. However,
- the dfp can be moved because VM copies env from VM stack to
- the heap. At this copying, dfp was also changed. To solve this
- problem, I'll try to change throw mechanism (not save target dfp,
- but save target cfp).
+ * object.c (rb_class_initialize): call inherited method before
+ calling initializing block.
- * bootstraptest/test_flow.rb: add a test for above.
+ * eval.c (rb_thread_start_1): initialize newly pushed frame.
+ fixed: [ruby-dev:25707]
-Thu Aug 25 07:57:33 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Feb 17 13:46:00 2005 Nathaniel Talbott <ntalbott@ruby-lang.org>
- * numeric.c (int_round): Fix Integer#round [ruby-core:39096]
+ * lib/test/unit/collector.rb (collect_file): now deletes paths added
+ to $LOAD_PATH instead of restoring it verbatim.
-Thu Aug 25 07:00:00 2011 Koichi Sasada <ko1@atdot.net>
+ * lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
+ 'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
+ collector again. Also tried to simplify the calling convention.
- * vm_insnhelper.h, vm_insnhelper.c, vm.c, vm_method.c, insns.def:
- Manage a redefinition of special methods for each classes.
- A patch from Joel Gouly <joel.gouly@gmail.com>. Thanks!
+ * test/runner.rb: adjusted for new AutoRunner semantics.
-Thu Aug 25 06:51:08 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/test/unit.rb: ditto.
- * ext/psych/lib/psych.rb: Fixing psych version number.
- * ext/psych/psych.gemspec: updating the gemspec.
+Thu Feb 17 04:21:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Aug 25 06:11:35 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
+ fixed: [ruby-core:04444]
- * ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be
- UTF-8.
- * test/psych/test_encoding.rb: test yaml dump encoding.
+Thu Feb 17 00:31:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Thu Aug 25 01:24:33 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * test/drb/test_drb.rb, ut_safe1.rb: port from 1.8
- * test/fileutils/test_fileutils.rb (test_chmod_symbol_mode): Solaris
- seems to behave the same as FreeBSD.
+Thu Feb 17 00:02:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Aug 25 01:11:36 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * eval.c (is_defined): NODE_IASGN is an assignment.
- * test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty
- should be manipulated because master pty may not be a tty on some
- environment (e.g. Solaris). [Bug:#5222] [ruby-dev:44420]
+Wed Feb 16 23:54:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Aug 24 15:13:56 2011 Koichi Sasada <ko1@atdot.net>
+ * eval.c (rb_thread_start_1): outer block variables wasn't linked to
+ threads. fixed: [ruby-dev:25700]
- * iseq.h, iseq.c, compile.c: Change the line number data structure
- to solve an issue reported at [ruby-dev:44413] [Ruby 1.9 - Bug #5217].
- Before this fix, each instruction has an information including
- line number (iseq::iseq_insn_info_table). Instead of this data
- structure, recording only line number changing places
- (iseq::iseq_line_info_table).
- The order of entries in iseq_line_info_table is ascending order of
- iseq_line_info_table_entry::position. You can get a line number
- by an iseq and a program counter with this data structure.
- This fix reduces memory consumption of iseq (bytecode).
- On my measurement, a rails application consumes 21.8MB for
- iseq with this fix on the 32bit CPU. Without this fix, it
- consumes 24.7MB for iseq [ruby-dev:44415].
+Wed Feb 16 15:11:43 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * proc.c: ditto.
+ * ext/openssl/lib/openssl/ssl.rb (OpenSSL::Nonblock#initialize):
+ native win32 platform doesn't have F_GETFL.
- * vm_insnhelper.c: ditto.
+Wed Feb 16 02:47:45 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * vm_method.c: ditto.
+ * 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.
- * vm.c (rb_vm_get_sourceline): change to use rb_iseq_line_no().
+ * ext/openssl/lib/openssl/buffering.rb (Buffering#fill_rbuff):
+ should rescue Errno::EAGAIN.
-Wed Aug 24 09:49:10 2011 Koichi Sasada <ko1@atdot.net>
+ * ext/openssl/lib/openssl/buffering.rb (Buffering#each): fix typo.
+ suggested by Brian Ollenberger.
- * insns.def (defined): fix to checking class variable.
- A patch by Magnus Holm <judofyr@gmail.com>. Thanks!
+ * ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
+ underlying IO.
- * test/ruby/test_variable.rb: add a test for above.
+Tue Feb 15 22:14:34 2005 sheepman <sheepman@tcn.zaq.ne.jp>
-Wed Aug 24 08:53:06 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/readline/readline.c (Readline.readline): use rl_outstream
+ and rl_instream. [ruby-dev:25699]
- * lib/rdoc: Update to RDoc 3.9.3. Fixes RDoc with `ruby -Ku`. Allows
- HTTPS image paths to be turned into <img> tags. Prevents special
- markup inside <tt> from being processed.
+Mon Feb 14 23:58:17 2005 Kouhei Sutou <kou@cozmixng.org>
-Wed Aug 24 07:57:43 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
+ fixed invalid namespace handling bug.
- * lib/rubygems: Update to RubyGems 1.8.9. Fixes uninstalling multiple
- gems and gem cleanup.
+Mon Feb 14 13:12:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Wed Aug 24 06:45:20 2011 Ryan Davis <ryand-ruby@zenspider.com>
+ * ext/openssl/lib/openssl/ssl.rb
+ (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
- * lib/minitest/*: Imported minitest 2.5.0 (r6557)
- * test/minitest/*: ditto
+Mon Feb 14 00:10:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Wed Aug 24 00:38:22 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
+ config[:safe_level] ([druby-ja:120])
- * thread.c (update_coverage): skip coverage count up if the current
- line is out of the way. rb_sourceline() is unreliable when source
- code is big. [ruby-dev:44413]
+ * test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
- * test/coverage/test_coverage.rb: add a test for above.
+Sun Feb 13 23:13:46 2005 Kouhei Sutou <kou@cozmixng.org>
-Tue Aug 23 15:23:56 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
+ convenient methods.
- * load.c (rb_f_require): Improve documentation of Kernel#require.
- [Ruby 1.9 - Bug #5210]
+ * lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
-Tue Aug 23 11:27:26 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
- * ext/zlib/zlib.c (gzfile_read_header): Ensure that each section of
- gzip header is readable to avoid SEGV.
+ * test/rss/: added tests for the convenient methods.
- * test/zlib/test_zlib.rb (test_corrupted_header): Test it.
+Sun Feb 13 23:12:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Mon Aug 22 23:43:33 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * eval.c (rb_thread_start_0): restore prot_tag before rewinding.
- * sprintf.c (rb_str_format): add RB_GC_GUARD to prevent temporary
- strings from GC.
+Sun Feb 13 16:56:52 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Sun Aug 21 17:49:53 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
+ to the value of status header field. ([ruby-dev:40617])
- * iseq.c (iseq_s_disasm): remove variable which is no longer used
- since r33013.
+Sun Feb 13 11:38:40 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-Sun Aug 21 14:20:58 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * regparse.c (type_cclass_hash): (Thanks Nobu) fixed
+ overrun. ([ruby-dev:25676]).
- * configure.in: use LD_LIBRARY_PATH_64 on 64-bit Solaris.
+Sun Feb 13 10:53:08 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-Sat Aug 20 13:19:52 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * oniggnu.h, oniguruma.h, regcomp.c, st.c: imported
+ Oni Guruma 3.6.0.
- * iseq.c (iseq_s_disasm): fix a bug that may cause SEGV.
+Sun Feb 13 01:33:19 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * test/ruby/test_method.rb (test_body): add a test for the above change.
+ * lib/erb.rb (ERB::Util.h, u): make it module_function.
-Sat Aug 20 10:43:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 12 22:17:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/stringio/stringio.c (strio_read): return new string if nil
- is explicitly given as a buffer ([Bug #5207]), otherwise set the
- encoding. also removed dead code.
+ * eval.c (TAG_THREAD): to start a new thread.
-Fri Aug 19 14:25:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (ruby_init, ruby_options, ruby_cleanup, rb_protect,
+ rb_load_protect, rb_thread_start_0): make thread anchor.
- * process.c (proc_spawn_v, proc_spawn): should not wait the
- spawned process.
+ * eval.c (proc_alloc): clone proc object if klass is not Proc or
+ created in different thread.
- * process.c (proc_spawn_v): fix missing argument, and try with
- /bin/sh only if failed with ENOEXEC.
+ * eval.c (rb_block_pass): call a function with a block. [new]
-Fri Aug 19 14:12:57 2011 Shugo Maeda <shugo@ruby-lang.org>
+ * eval.c (rb_f_throw): raise NameError in main thread.
- * lib/net/imap.rb (idle): raises a Net::IMAP::Error when the
- connection is closed. based on the patch by Hugo Barauna.
- [Bug #5190] [ruby-core:38930]
+Sat Feb 12 17:29:19 2005 Tanaka Akira <akr@m17n.org>
-Fri Aug 19 13:18:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * lib/open-uri.rb (OpenURI.open_loop): send authentication only for
+ the URI directly specified.
- * configure.in: defines _DARWIN_UNLIMITED_SELECT if the target_os
- is darwin.
+Sat Feb 12 15:07:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Aug 19 13:14:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * random.c (rand_init): suppress warning.
- * thread.c: add a description for the behavior of select(2) on
- Mac OS X 10.7 (Lion).
+Sat Feb 12 14:10:24 2005 Tanaka Akira <akr@m17n.org>
-Fri Aug 19 11:28:58 2011 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/open-uri.rb (OpenURI.open_http): reject userinfo explicitly.
- * lib/net/imap.rb (msg_att): accepts extra space before ')'.
- based on the patch by art lussos. [Bug #5163] [ruby-core:38820]
+Sat Feb 12 13:54:03 2005 Tanaka Akira <akr@m17n.org>
-Wed Aug 17 23:01:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * lib/open-uri.rb: support https if the platform provides CA
+ certificates.
- * ext/bigdecimal/bigdecimal.c (cannot_be_coerced_into_BigDecimal):
- remove duplication.
+Sat Feb 12 06:18:28 2005 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
-Wed Aug 17 15:27:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
+ [ruby-dev:25675]
- * ext/bigdecimal/bigdecimal.c (cannot_be_coerced_into_BigDecimal):
- add a new function for raising error when an object cannot coerce
- into BigDecimal. [Bug #5172]
+Fri Feb 11 17:37:50 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/bigdecimal/bigdecimal.c (BigDecimalValueWithPrec): use
- cannot_be_coerced_into_BigDecimal function.
+ * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
+ new method OpenSSL::X509::Store#set_default_paths.
- * ext/bigdecimal/bigdecimal.c (BigMath_s_exp): ditto.
+Fri Feb 11 11:33:53 2005 Tanaka Akira <akr@m17n.org>
- * ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto.
+ * lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
+ :http_basic_authentication.
+ suggested by Kent Sibilev. [ruby-core:4392]
- * test/bigdecimal/test_bigdecimal.rb: test for the above changes.
+Fri Feb 11 06:30:07 2005 George Ogata <g_ogata@optushome.com.au>
- * test/bigdecimal/testbase.rb (under_gc_stress): add a new utility
- method to run tests under the condition of GC.stress = true.
+ * misc/ruby-mode.el: ignore parenthesis inside heredoc.
+ [ruby-core:04415]
-Wed Aug 17 10:16:00 2011 Kenta Murata <mrkn@mrkn.jp>
+Fri Feb 11 04:54:13 2005 Tilman Sauerbeck <tilman@code-monkey.de>
- * rational.c (nurat_coerce): Rational#coerce should converts itself
- into Complex if the argument is a Complex with non-zero imaginary
- part. [Bug #5020] [ruby-dev:44088]
+ * lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
- * test/ruby/test_rational.rb (test_coerce): test for the above change.
+ * lib/rdoc/generators/ri_generator.rb: ditto.
-Wed Aug 17 06:33:19 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Thu Feb 10 13:52:42 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_x509cert.c: Add class documentation for
- OpenSSL::X509::Certificate.
+ * configure.in, win32/Makefile.sub (LIBS, COMMON_HEADERS): use
+ winsock2 on mswin32/mingw.
-Wed Aug 17 04:54:25 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * ext/socket/extconf.rb: ditto.
- * ext/openssl/ossl_pkey.c: corrected docs, OpenSSL::PKey::DH does
- *not* support #sign/verify.
+ * win32/win32.c (StartSockets): ditto.
-Tue Aug 16 18:56:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.h: ditto.
- * vm.c (ruby_threadptr_data_type): rename to hide.
- [ruby-core:38972]
+Thu Feb 10 12:09:16 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Tue Aug 16 18:52:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/extmk.rb (extract_makefile): default to true if not compiled
+ previously.
- * win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_
- and _threadptr_ functions, as well as mingw.
+ * ext/extmk.rb (extmake): create dummy makefile if extconf failed.
-Tue Aug 16 09:31:44 2011 Eric Hodel <drbrain@segment7.net>
+Thu Feb 10 12:07:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/dl: Add documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #5192]
+ * win32/win32.c (init_stdhandle): assign standard file handles.
-Tue Aug 16 08:48:26 2011 Eric Hodel <drbrain@segment7.net>
+ * bcc32/Makefile.sub (COMMON_LIBS): add libraries included in
+ import32.lib.
- * ext/.document (fiddle): Remove duplicate entry
- * ext/fiddle: Complete documentation of Fiddle. Patch by Vincent
- Batts. [#5192]
+ * 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.
-Tue Aug 16 08:00:15 2011 Eric Hodel <drbrain@segment7.net>
+ * win32/win32.c, win32/win32.h (read): avoid a BCC runtime bug.
- * ext/socket: Make Socket documentation appear. Add documentation for
- Socket, TCPServer, SOCKSSocket. Patch by Sylvain Daubert.
- [Ruby 1.9 - Feature #5182]
+Thu Feb 10 00:47:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Aug 15 09:58:55 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * struct.c (make_struct): fixed: [ruby-core:04402]
- * ext/openssl/ossl_ssl.c: Support disabling OpenSSL compression.
+Wed Feb 9 16:33:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/openssl/test_ssl.rb: Add a test for it.
- Thanks to Eric Wong for the patch.
- [Ruby 1.9 - Feature #5183] [ruby-core:38911]
+ * ext/socket/socket.c (wait_connectable): fixed wrong condition.
-Sun Aug 14 05:57:01 2011 Tanaka Akira <akr@fsij.org>
+Wed Feb 9 14:42:28 2005 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
- * test/socket/test_socket.rb (test_connect_timeout): added a test
- based on a patch by Eric Wong. [ruby-core:38910]
+ * eval.c (scope_dup): add volatile not to optimize tbl.
-Sat Aug 13 22:17:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 9 10:02:02 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * tool/mkconfig.rb: do not make the entries related to sitedir and
- verdordir if disabled by --without options. [ruby-core:38922]
- [Bug #5187]
+ * ext/tk/make-tkutil, ext/tk/tkutil/subconf.rb: no longer used.
-Sat Aug 13 17:03:22 2011 Tadayoshi Funaba <tadf@dotrb.org>
+ * ext/tk/tkutil/extconf.rb: need to compile tkutil. [ruby-dev:25607]
- * ext/date/date_core.c: [ruby-core:38861]
+Wed Feb 9 08:07:08 2005 Paul Duncan <pabs@pablotron.org>
-Sat Aug 13 09:39:07 2011 Tadayoshi Funaba <tadf@dotrb.org>
+ * ext/curses/curses.c (window_color_set): [ruby-core:04393]
- * test/date/test_*.rb: added tests.
+Tue Feb 8 23:48:36 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Sat Aug 13 09:36:19 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
+ [druby-ja:117]
- * ext/date/date_parse.c (parse_ddd_cb): fix r32896. RB_GC_GUARD
- insertion position was mistaken. [ruby-dev:44337] [Bug #5152]
+Tue Feb 8 22:38:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Aug 13 09:26:24 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * keywords, parse.y: separate EXPR_VALUE from EXPR_BEG.
+ fixed: [ruby-core:04310], [ruby-core:04368]
- * ext/psych/lib/psych/core_ext.rb: Make Kernel#y private.
- [ruby-core:38913]
+Tue Feb 8 13:06:12 2005 Sam Roberts <sroberts@uniserve.com>
- * test/psych/test_yaml.rb: corresponding test.
+ * ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
+ [ruby-talk:130092]
-Sat Aug 13 09:05:16 2011 Tadayoshi Funaba <tadf@dotrb.org>
+Tue Feb 8 00:19:02 2005 Tanaka Akira <akr@m17n.org>
- * ext/date/date_core.c (date_strftime_alloc): followed the change
- of r32885.
+ * lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
+ (Resolv::DNS::Name#inspect): ditto.
+ Suggested by Sam Roberts. [ruby-talk:129086]
- * doc/NEWS-1.9.3: followed the above change.
+Mon Feb 7 23:14:11 2005 Tanaka Akira <akr@m17n.org>
-Sat Aug 13 08:55:38 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * io.c (io_getc): flush rb_stdout before read from stdin, which is
+ connected to a tty. [ruby-core:4378]
- * ext/psych/lib/psych/scalar_scanner.rb: Only consider strings
- with fewer than 2 dots to be numbers. [ruby-core:38915]
+ * rubyio.h (FMODE_TTY): renamed from FMODE_LINEBUF.
-Sat Aug 13 08:47:20 2011 Tadayoshi Funaba <tadf@dotrb.org>
+Mon Feb 7 10:06:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/date/date_core.c: [ruby-core:38855].
+ * object.c: [ruby-doc:818]
-Sat Aug 13 03:41:37 2011 Eric Hodel <drbrain@segment7.net>
+Mon Feb 7 02:13:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/uri/common.rb: Fix documentation of URI::Parser.new. Patch by
- Steve Klabnik. [Ruby 1.9 - Bug #5177]
+ * 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.
-Sat Aug 13 02:19:57 2011 Eric Hodel <drbrain@segment7.net>
+Mon Feb 7 01:22:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/digest/digest.c: Add documentation for the Digest module. Patch
- by Sylvain Daubert. [Ruby 1.9 - Bug #5167]
+ * ext/extmk.rb (extract_makefile): extract previously collected
+ informations from existing Makefile.
-Sat Aug 13 01:56:11 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/socket/extconf.rb: check if getaddrinfo() works fine only when
+ wide-getaddrinfo option is not given. fixed: [ruby-dev:25422]
- * lib/rake: Update to Rake 0.9.2.2. Prevent pollution of toplevel
- namespace by Commands. Remove unused variable and debugging
- statement in tests.
+ * ext/tk/extconf.rb: separate tkutil configuration.
-Fri Aug 12 11:39:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/mkmf.rb ($extmk): check if under ext directory.
- * configure.in: Describe "no" configure option for site_ruby
- and vendor_ruby. Patch by Vit Ondruch. [Bug #5187][ruby-core:38921]
+ * lib/mkmf.rb (Logging.postpone): allow recursive operation.
-Fri Aug 12 09:00:24 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/mkmf.rb (try_constant): make sure if really a constant, reduce
+ the number of times of compile.
- * lib/rubygems: Import RubyGems 1.8.8. Fixes encoding of YAML gemspec
- from gems. Github Issue #149
+ * lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
-Fri Aug 12 08:17:46 2011 Tanaka Akira <akr@fsij.org>
+ * lib/mkmf.rb (find_library): allow directory list with separators.
- * ext/socket/ipsocket.c (init_inetsock_internal): use SOMAXCONN for
- listen backlog.
+ * lib/mkmf.rb (arg_config): manage provided configuration options.
- * ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
+ * lib/mkmf.rb (dir_config): accept arrays of directory names as
+ default values.
- * ext/socket/lib/socket.rb (Addrinfo#listen): ditto.
- (Socket.tcp_server_sockets_port0): ditto.
+ * lib/mkmf.rb (with_cppflags, with_cflags, with_ldflags): keep flags
+ modified if the block returned true.
- * ext/socket/mkconstants.rb: define SOMAXCONN as 5 if not available.
+Sun Feb 6 19:20:05 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- [ruby-core:38493]
+ * eval.c (stack_extend): add prototype because VC++8 doesn't
+ accept __declspec(noinline) with K&R style function definitions.
-Fri Aug 12 03:24:35 2011 Eric Hodel <drbrain@segment7.net>
+Sun Feb 6 13:56:19 2005 Tadayoshi Funaba <tadf@dotrb.org>
- * lib/rdoc: Import RDoc 3.9.2. Fixes TIDYLINK for HTML output.
+ * lib/date.rb (new_with_hash): changed messages of exception.
-Thu Aug 11 15:37:42 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * lib/date/format.rb (str[fp]time): undocumented conversion
+ specifications %[1-3] are now deprecated.
- * variable.c (autoload_delete): An autoload entry is still in a
- RCLASS_IV_TBL, not in a RCLASS_CONST_TBL, so take back the table
- changed in r29600. And an autoload entry keeps not a
- rb_const_entry_t but a NODE so remove rb_const_entry_t thing added
- in r29602.
+Sun Feb 6 11:27:37 2005 Tanaka Akira <akr@m17n.org>
-Thu Aug 11 15:07:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/dl/dl.c (Init_dl): function declaration should precede
+ statements before C99.
- * lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
- unbundled extensions. [ruby-core:38802] [Bug #5147]
+Sun Feb 6 03:24:20 2005 Tanaka Akira <akr@m17n.org>
- * lib/mkmf.rb (init_mkmf): revert r32902. [ruby-core:38903]
+ * lib/resolv.rb (Resolv::DNS::Resource::TXT): multiple strings was not
+ handled.
+ (Resolv::DNS::Resource::TXT#strings): new method to return all
+ strings.
+ (Resolv::DNS::Message::MessageEncoder#put_string_list): new method.
+ (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
+ based on [ruby-talk:129732] by Sam Roberts.
-Wed Aug 10 23:03:55 2011 Tanaka Akira <akr@fsij.org>
+Sat Feb 5 02:24:06 2005 Minero Aoki <aamine@loveruby.net>
- * ext/socket/lib/socket.rb: fix argument check in the previous commit.
+ * test/ripper/test_scanner_events.rb: fix test.
-Wed Aug 10 22:12:28 2011 Tanaka Akira <akr@fsij.org>
+Fri Feb 4 18:44:35 2005 Minero Aoki <aamine@loveruby.net>
- * ext/socket/lib/socket.rb (Socket.tcp): add :connect_timeout option.
- (Addrinfo#connect_from): add :timeout option.
- (Addrinfo#connect): ditto.
- (Addrinfo#connect_to): ditto.
- [ruby-core:38538]
+ * ext/ripper/lib/ripper/lexer.rb: last Lexer fix was incomplete;
+ test all green.
-Wed Aug 10 21:27:19 2011 Tanaka Akira <akr@fsij.org>
+Fri Feb 4 15:57:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/pop.rb: fix typo in document.
+ * parse.y (open_args): fix too verbose warnings for the space
+ before argument parentheses. [ruby-dev:25492]
- * lib/net/http.rb: ditto.
+ * parse.y (parser_yylex): ditto.
- * lib/net/imap.rb: ditto.
+Fri Feb 4 14:33:25 2005 Minero Aoki <aamine@loveruby.net>
-Wed Aug 10 19:30:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * ext/ripper/lib/ripper/filter.rb: ripper/tokenizer ->
+ ripper/lexer. [ruby-dev:25632]
- * complex.c (nucomp_rationalize): calls rationalize of real part if
- imaginary part is exactly zero. The patch is made by Marc-Andre
- Lafortune. fixes [Bug #5178] [ruby-core:38885]
+Fri Feb 4 00:24:15 2005 Kouhei Sutou <kou@cozmixng.org>
- * test/ruby/test_complex.rb (test_rationalize): add a test for the
- above change.
+ * lib/rss: supported Image module.
+ http://web.resource.org/rss/1.0/modules/image/
- * complex.c (nucomp_to_r): fix RDoc comment. The patch is made by
- Marc-Andre Lafortune.
+Thu Feb 3 23:42:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Wed Aug 10 14:11:07 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/stringio/stringio.c (strio_close, strio_close_read, strio_close_write):
+ should return nil instead of self as well as IO. [ruby-dev:25623]
- * lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
- option. [ruby-core:38802] [Bug #5147]
+ * ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
+ extended portion. [ruby-dev:25626]
-Wed Aug 10 02:53:27 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Feb 3 16:12:57 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/http.rb: come back autoload. OpenSSL constant is used
- some places, so it leads mistakes like HTTP.start.
+ * parse.y (parser_yylex): the first expression in the parentheses
+ should not be a command. [ruby-dev:25492]
-Tue Aug 9 22:57:45 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Thu Feb 3 03:31:20 2005 NARUSE, Yui <naruse@ruby-lang.org>
- * ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
- [ruby-dev:44337] [Bug #5152]
+ * ext/nkf/nkf-utf8/nkf.c: follow original v 1.57
- * ext/date/data_parse.c (parse_ddd_cb): ditto.
+ * ext/nkf/nkf-utf8/utf8tbl.c: follow original v 1.8
-Tue Aug 9 14:25:47 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * ext/nkf/nkf-utf8/config.h: follow original v 1.7
- * ext/fiddle/conversions.c (generic_to_value): ffi_arg and ffi_sarg
- should be used to handle shorter return value. fix [Bug #3861]
- [ruby-core:32504]
+Wed Feb 2 23:52:53 2005 sheepman <sheepman@tcn.zaq.ne.jp>
- * ext/fiddle/closure.c (callback): ditto
+ * ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
+ part. [ruby-dev:25618]
- * ext/fiddle/conversions.h (fiddle_generic): ditto
+Wed Feb 2 21:56:01 2005 Kouhei Sutou <kou@cozmixng.org>
- * ext/fiddle/conversions.c (value_to_generic): char, short and int
- are strictly distinguished on big-endian CPU, e.g. sparc64.
+ * lib/rss/rss.rb (RSS::Element#convert): added.
-Tue Aug 9 11:21:08 2011 Narihiro Nakamura <authornari@gmail.com>
+ * lib/rss/rss.rb: convert -> need_convert.
- * gc.c (gc_lazy_sweep): if sweep target slots are not found, we
- try heap_increment() because it might be able to expand the
- heap. [Bug #5127] [ruby-dev:44285]
+ * lib/rss/1.0.rb: ditto.
- * gc.c (gc_clear_mark_on_sweep_slots): if a sweeping was
- interrupted, we expand the heap if at all possible.
+ * lib/rss/0.9.rb: ditto.
-Tue Aug 9 12:20:33 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/rss/2.0.rb: ditto.
- * test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
- [ruby-core:38853] [Bug #5168]
+ * lib/rss/trackback.rb: ditto.
- * test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
- and libm version numbers for detecting default libc and libm.
+Wed Feb 2 03:30:58 2005 Minero Aoki <aamine@loveruby.net>
-Tue Aug 9 09:18:04 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/ripper/lib/ripper/tokenizer.rb -> lexer.rb.
- * ext/zlib/zlib.c (gzfile_wrap): Document encoding options.
+ * ext/ripper/lib/ripper/lexer.rb: new method Ripper.slice.
+ [experimental]
- * ext/zlib/zlib.c (rb_gzwriter_s_open): ditto
+ * ext/ripper/lib/ripper/sexp.rb: new file. [experimental]
- * ext/zlib/zlib.c (rb_gzreader_s_open): ditto
+ * ext/ripper/lib/ripper.rb: require ripper/lexer and ripper/sexp.
-Sun Aug 7 23:31:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Tue Feb 1 21:49:24 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * time.c (rb_strftime_alloc): raise ERANGE if width is too large.
- Patch by Nobuyoshi Nakada. [Bug #4457] [ruby-dev:43285]
+ * lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
+ _dump.
- * test/ruby/test_time.rb (class TestTime): add a test for the
- above change.
+Tue Feb 1 00:20:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Aug 7 22:51:45 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * Makefile.in, configure.in: made EXTOUT configurable.
- * ext/openssl/ossl_asn1.c (decode_eoc): remove unused variables.
- Patch by Eric Wong. [Feature #5157] [ruby-core:38798]
+ * ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+ * lib/mkmf.rb: make extensions in depth order. [ruby-dev:25522]
- * ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): ditto.
+ * configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
-Sun Aug 7 22:37:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Mon Jan 31 13:16:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * configure.in: add -Wunused-variable to default CFLAGS.
- Patch by Eric Wong. [Feature #5157] [ruby-core:38798]
+ * ext/tk/extconf.rb: add tkutil configuration step (remove old schema)
-Sun Aug 7 15:37:35 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/depend: remove the information of tkutil
- * ext/digest/sha2/sha2ossl.c: use original SHA384_Final on DragonFly.
+ * ext/tk/make-tkutil: sub-part of Makefile to compile tkutil
-Sun Aug 7 14:08:16 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * ext/tk/tkutil/tkutil.c: move tkutil.c to subdirectory
- * ext/objspace/objspace.c: fix typos in a document.
+ * ext/tk/tkutil/subconf.rb: configuration file for tkutil.c
-Sun Aug 7 07:14:57 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/tkutil/depend: ditto
- * cont.c (HAVE_GETCONTEXT): see getcontext(3) because DragonFly BSD
- x64 port doesn't have it.
+Mon Jan 31 13:13:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Sun Aug 7 00:42:55 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/tcltklib.c: add invalid namespace check
- * ext/tk/lib/tk/wm.rb (Tk::Wm.command): Add the missing receiver
- before calling epath. patched by flori
- https://github.com/flori/ruby/commit/aa9474d32e5f2c57f8b0e2e0c528a03f06a4d433
+ * ext/tk/lib/multi-tk.rb: add invalid_namespace? method
-Sat Aug 6 07:06:34 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/tk/lib/remote-tk.rb: ditto
- * marshal.c (w_object): Fix exception message when _dump_data is not
- defined on a T_DATA object.
+Mon Jan 31 10:29:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Aug 5 22:16:20 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
- * numeric.c (rb_infinity, rb_nan): use WORDS_BIGENDIAN to get endian.
- fix [Bug #5160] [ruby-dev:44356]
+Mon Jan 31 09:44:03 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Aug 5 17:14:11 2011 Akinori MUSHA <knu@iDaemons.org>
+ * object.c (Init_Object): remove Object#type. [ruby-core:04335]
- * test/test_syslog.rb (TestSyslog#test_log): Do not be too
- specific about the log line format. Fixes #5081.
+Sat Jan 29 09:42:12 2005 Sam Roberts <sroberts@uniserve.com>
-Fri Aug 5 15:57:10 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
+ resource record for specifying location of services.
- * complex.c (f_signbit): fix compile error in gcc4 on Solaris with
- CFLAGS="-std=gnu99". [ruby-dev:44355] fix [Bug #5159]
+Sat Jan 29 00:10:33 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
- * math.c: ditto.
+ * 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 Aug 5 15:55:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 28 17:16:55 2005 Tanaka Akira <akr@m17n.org>
- * test/ruby/test_object.rb: tests that respond_to? returns false.
+ * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
+ parse options line for ndots option.
+ (Resolv::Hosts#lazy_initialize): return self.
+ (Resolv::DNS#lazy_initialize): ditto.
+ (Resolv::DNS::Config#lazy_initialize): ditto.
+ Suggested by Sam Roberts.
-Fri Aug 5 13:32:43 2011 Shugo Maeda <shugo@ruby-lang.org>
+Thu Jan 27 17:15:03 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/xmlrpc/client.rb, lib/xmlrpc/server.rb: should use
- String#bytesize instead of String#size.
+ * ext/tk/extconf.rb: support new tk scheme on bccwin32.
+ fixed: [ruby-dev:25546]
-Fri Aug 5 12:18:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 27 13:18:03 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * vm_eval.c (check_funcall): try respond_to? first if redefined.
- [Bug #5158]
+ * st.c (st_foreach): report success/failure by return value.
+ [ruby-Bugs-1396]
-Fri Aug 5 09:48:22 2011 Eric Hodel <drbrain@segment7.net>
+Thu Jan 27 00:12:19 2005 Minero Aoki <aamine@loveruby.net>
- * lib/rubygems: Import RubyGems 1.8.7:
- Added missing require for `gem uninstall --format-executable`.
+ * test/fileutils/test_fileutils.rb (setup): support BSD style
+ directory group inheritance (again).
- The correct name of the executable being uninstalled is now displayed
- with --format-executable.
+Thu Jan 27 00:02:40 2005 Minero Aoki <aamine@loveruby.net>
- Fixed `gem unpack uninstalled_gem` default version picker.
+ * test/fileutils/test_fileutils.rb (setup): support BSD style
+ directory group inheritance. [ruby-dev:25440]
- RubyGems no longer claims a nonexistent gem can be uninstalled.
+ * test/fileutils/fileasserts.rb (assert_same_entry): show entry
+ difference.
- `gem which` no longer claims directories are requirable files.
+Wed Jan 26 17:12:50 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- `gem cleanup` continues cleaning up gems if one can't be uninstalled
- due to permissions. Issue #82.
+ * parse.y: forgot to initialize parser struct. [ruby-dev:25492]
- Gem repository directories are no longer created world-writable.
- Patch by Sakuro OZAWA. [Ruby 1.9 - Bug #4930]
+ * parse.y (parser_yylex): no tLABEL on EXPR_BEG.
+ [ruby-talk:127711]
-Fri Aug 5 07:00:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 26 14:12:58 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * test/io/console/test_io_console.rb (test_noctty): daemon() on
- Fedora Rawhide seems not to detach the controlling terminal,
- when the argument noclose is non-zero. ref: [Bug #5135]
+ * ext/Setup*: remove tcltklib.
-Thu Aug 4 23:48:00 2011 Kenta Murata <mrkn@mrkn.jp>
+Wed Jan 26 12:45:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread_pthread.c (native_cond_signal): retry to call pthread_cond_signal
- and pthread_cond_broadcast if they return EAGAIN in
- native_cond_signal and native_cond_broadcast, respectively.
- It is for the pthread implementation of Mac OS X 10.7 (Lion).
- fixes #5155. [ruby-dev:44342].
+ * ext/tk/extconf.rb: support new tk scheme on mswin32.
+ fixed: [ruby-dev:25535]
- * thread_pthread.c (native_cond_broadcast): ditto.
+Wed Jan 26 10:45:19 2005 NAKAMURA Usaku <usa@ruby-lang.org>
- * thread_pthread.c (struct cached_thread_entry): stop using
- pthread_cond_t and its functions directly.
+ * win32/win32.c (flock_winnt, flock_win95): unlock file even if
+ LOCK_NB is specified.
- * thread_pthread.c (register_cached_thread_and_wait): ditto.
+Tue Jan 25 23:10:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * thread_pthread.c (use_cached_thread): ditto.
+ * ext/tk: merge tcltklib for Ruby/Tk installation control
-Thu Aug 4 20:29:41 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * ext/tcltklib: remove
- * configure.in: when Solaris cc, use $(CC) to link shared libs.
+Tue Jan 25 17:05:15 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-Thu Aug 4 20:19:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * ruby.c (proc_options): correct -T option in RUBYOPT.
+ fixed: [ruby-dev:25512]
- * error.c (report_bug): use a small message buffer instead of BUFSIZ.
- It is needed for avoiding nested SIGSEGV on Linux.
- Note: BUFSIZ is not proper buffer size. It's unrelated with maximum
- filename length. :-/
- [Bug #5139] [ruby-dev:44315]
+Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Thu Aug 4 16:08:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
+ after scripts [ruby-dev:25479]: NULL current namespace when deleting
+ Tk interpreter [ruby-talk:126225]
- * tool/rbinstall.rb (gem): install all gemspecs under lib and ext.
+ * ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
+ [ruby-talk:126360]
- * tool/rbinstall.rb (Gem::Specification): may not be defined when
- cross-compiling and BASERUBY is 1.8.
+ * ext/tcltklib/extconf.rb: add yet another native-thread check
-Thu Aug 4 11:30:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
+ Ruby interpreter
- * include/ruby/missing.h: define __syscall on OpenBSD as r32702.
+ * ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
-Thu Aug 4 03:02:54 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
+ doesn't return the created object [ruby-dev:25479]
- * tool/rbinstall.rb: use rubygems to load gemspecs, copy actual
- gemspecs on install rather than generate fake ones for all gems.
+ * ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
-Thu Aug 4 02:45:10 2011 Kenta Murata <mrkn@mrkn.jp>
+ * ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
+ a command argument [ruby-dev:25479]
- * configure.in: set CXX variable to the C++ compiler that matches the
- C compiler specified by CC variable (e.g. use g++-4.2 for gcc-4.2).
+ * ext/tk/lib/multi-tk.rb: ditto
-Thu Aug 4 02:21:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/tk/lib/tk/*.rb: ditto
- * lib/mkmf.rb (link_command): use static library only for bundled
- extensions. [Bug #5147]
+ * ext/tk/lib/tkextlib/*.rb: ditto
-Thu Aug 4 02:02:10 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+ * ext/tk/sample/demos-jp/anilabel.rb: new demo script
- * ext/psych/psych.gemspec: installing psych as a gem.
+ * ext/tk/sample/demos-en/anilabel.rb: ditto
-Wed Aug 3 16:01:35 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
+ [ruby-dev:25479]
- * util.c, include/ruby/util.h (ruby_add_suffix): remove the function.
- [Bug #5153] [ruby-core:38736]
+Mon Jan 24 16:00:53 2005 NARUSE, Yui <naruse@ruby-lang.org>
- * io.c (argf_next_argv): remove the call of above function.
+ * ext/nkf/lib/kconv.rb (guess_old): not use NKF.guess_old
+ but NKF.guess1. fixed: [ruby-dev:25491]
- * ext/-test-/add_suffix, test/-ext-/test_add_suffix.rb: remove the test
- extension module because this is only for testing ruby_add_suffix().
+Mon Jan 24 15:44:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * LEGAL: remove the mention about a part of util.c, because now we
- removed the part.
+ * document updates - [ruby-core:04296], [ruby-core:04301],
+ [ruby-core:04302], [ruby-core:04307]
- * io.c (argf_next_argv): now the new filename is not guaranteed to
- use, so should check the return value of rename(2).
+Sun Jan 23 12:38:01 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * test/ruby/test_argf.rb (TestArgf#test_inplace_rename_impossible):
- now we expect same result with other platforms on no_safe_rename
- platforms (=Windows).
+ * lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
+ capitalized name (such as KeywordSearchRequest in AWS) is defined as
+ a method having uncapitalized name. (converted with
+ GenSupport.safemethodname to handle operation name 'foo-bar'). it
+ introduced serious incompatibility; in the past, it was defined as a
+ capitalized.
-Wed Aug 3 09:18:08 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+ define capitalized method as well under that circumstance.
- * test/xmlrpc/webrick_testing.rb (WEBrick_Testing#start_server):
- Like r32795, bind address should be specified.
+Sun Jan 23 05:24:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Wed Aug 3 07:46:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
+ GetOCSPReq at first.
- * encoding.c (enc_find): mistakenly remained !. [Bug #5150]
+Sat Jan 22 22:59:08 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Wed Aug 3 00:11:08 2011 Tanaka Akira <akr@fsij.org>
+ * lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
- * lib/prettyprint.rb: update document. [ruby-core:36776]
+Sat Jan 22 22:27:28 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Tue Aug 2 22:04:46 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
- * gc.c (init_heap): allocate sigaltstack after heaps are allocated.
- [ruby-dev:44315] [Bug #5139]
+Fri Jan 21 20:07:02 2005 Tanaka Akira <akr@m17n.org>
- * vm.c (thread_free): use free because objspace is not ready.
+ * lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
+ reported by Sam Roberts. [ruby-talk:127133]
- * vm.c (th_init): use malloc because objspace is not ready.
+Fri Jan 21 17:09:44 2005 Shugo Maeda <shugo@ruby-lang.org>
-Tue Aug 2 20:10:16 2011 Shota Fukumori <sorah@tubusu.net>
+ * lib/net/imap.rb (decode_utf7): use pack("U*") to encode UTF-8.
- * test/testunit/test_parallel.rb: pass "--ruby" option to
- test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303]
+ * lib/net/imap.rb (encode_utf7): use unpack("U*") to decode UTF-8.
-Tue Aug 2 15:53:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/net/imap/test_imap.rb: added tests for Net::IMAP.
- * encoding.c (str_to_encoding): rename from to_encoding and
- use str_to_encindex.
+Fri Jan 21 16:58:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * encoding.c (str_to_encindex): split from to_encoding.
+ * dir.c (rb_push_glob): should work for NUL delimited patterns.
- * encoding.c (rb_to_encoding): use str_to_encoding.
+ * dir.c (rb_glob2): should aware of offset in the pattern.
- * encoding.c (rb_obj_encoding): don't bypass rb_encoding*.
- If it uses rb_encoding*, it bypass encindex. If it uses encindex,
- it doesn't bypass.
+Fri Jan 21 13:58:37 2005 Shugo Maeda <shugo@ruby-lang.org>
- * encoding.c (enc_find): add shortcut for encoding object, use
- str_to_encindex, and avoid bypass rb_encoding*.
+ * lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
-Tue Aug 2 12:03:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 21 00:37:09 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * hash.c (recursive_hash): hash value of emptied hash should be
- equal to an empty hash. [ruby-core:38650]
+ * ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
+ "local variable 'size' used without having been initialized".
-Tue Aug 2 11:42:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jan 20 11:42:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (rb_enc_symname2_p): :! is valid symbol. [Bug #5136]
+ * string.c (rb_str_new4): should propagate taintedness.
-Tue Aug 2 07:33:29 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * env.h: rename member names in struct FRAME; last_func -> callee,
+ orig_func -> this_func, last_class -> this_class.
- * test/net/http/test_http.rb (TestNetHTTP_version_1_1_methods#test_timeout_during_HTTP_session):
- If you connect to localhost, you should listen localhost.
+ * struct.c (rb_struct_set): use original method name, not callee
+ name, to retrieve member slot. [ruby-core:04268]
- * test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
+ * 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>
+
+ * lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
+
+Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
+ domain and search directive without an argument.
+ reported by Sam Roberts. [ruby-talk:126781]
+
+Mon Jan 17 23:33:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (aix): fix typo. [ruby-talk:126401]
+
+Mon Jan 17 07:08:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/readline/readline.c: suppress warnings.
+
+ * lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
ditto.
-Tue Aug 2 06:18:15 2011 Luis Lavena <luislavena@gmail.com>
+ * lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
- * lib/rubygems/installer.rb (class Gem): Correct path check on Windows
- Possible fix for [Ruby 1.9 - Bug #5111]
- * test/rubygems/test_gem_installer.rb (load Gem): ditto
+ * lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
-Mon Aug 1 20:12:03 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/irb/locale.rb (IRB::Locale::real_load): ditto.
- * test/ruby/test_process.rb (TestProcess#windows?): new method.
+ * lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
- * test/ruby/test_process.rb (TestProcess#*): use above method.
+Mon Jan 17 00:09:42 2005 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/ruby/test_process.rb (TestProcess#test_execopts_redirect):
- windows doesn't support FD_CLOEXEC.
+ * lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
-Mon Aug 1 15:45:23 2011 Eric Hodel <drbrain@segment7.net>
+Sat Jan 15 14:57:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rake/test_rake_functional.rb: Don't assume the binary name of
- ruby is "ruby". [Ruby 1.9 - Bug #5114]
- * test/rake/helper.rb: ditto
+ * ruby.c (proc_options): ignore trailing CRs at the end of short
+ options as well as long options. fixed: [ruby-core:04232]
-Mon Aug 1 15:31:14 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+Sat Jan 15 13:44:22 2005 Kouhei Sutou <kou@cozmixng.org>
- * test/io/console/test_io_console.rb (TestIO_Console#test_sync):
- Skip when PTY allocation failed (that's not our fault).
+ * lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
-Mon Aug 1 15:04:12 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+ * lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
- * test/xmlrpc/test_webrick_server.rb (Test_Webrick#setup_http_server):
- XMLRPC::Client.new3(), when called without host: argument, tries
- to connect to a host where "localhost" resolves to. On the
- other hand a WEBrick::HTTPServer.new(), when called without
- BindAddress: argument, tries to listen all the address where
- getaddrinfo(AF_UNSPEC) resolves to. This is a mismatch because
- "localhost" might not resolve to one of those listening sockets.
- We would better explicitly specify "localhost" here and if
- failed, just skip the whole test.
+Wed Jan 12 12:29:28 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Aug 1 14:24:56 2011 Eric Hodel <drbrain@segment7.net>
+ * eval.c (rb_mod_define_method): incomplete subclass check.
+ [ruby-dev:25464]
- * lib/rdoc.rb: Import RDoc 3.9.1. Fixes bugs in the RDoc::Markup
- parser.
+ * class.c (rb_make_metaclass): class of metaclasses should be
+ plain Class. [ruby-list:40524]
-Mon Aug 1 12:00:35 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Jan 11 20:58:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * insns.def (concatstrings): don't use initial ASCII-8BIT string.
- [ruby-core:38635] [Bug #5126]
+ * io.c (remain_size): use buffered data instead of unreading to avoid
+ inconsistency of text mode. fixed: [ruby-dev:25446]
-Sun Jul 31 22:57:16 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Tue Jan 11 09:37:53 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * enc/Makefile.in (ECHO1): Same as the recent fix in common.mk.
- ":" in a make variable replacement cause a syntax error with
- /usr/ccs/bin/make on Solaris. Uses $(NULLCMD) instead.
+ * numeric.c (Init_Numeric): turn off floating point exceptions
+ on bcc32. "1e300".to_f had crashed by overflow.
-Sun Jul 31 21:16:02 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Mon Jan 10 15:28:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does
- not have it on header.
+ * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
+ escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
- * math.c: ditto.
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
+ new method to escape URI path component.
-Sun Jul 31 21:09:04 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+ * lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
+ of :SSLEnable is false.
- * common.mk (node_name.inc): Use $(Q) for consistency.
+ * test/webrick/{test_cgi.rb,webrick.cgi}: new file.
- * Makefile.in (INSNS): ditto.
+ * test/webrick/utils.rb: require "webrick/https.h".
-Sun Jul 31 21:19:51 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Mon Jan 10 01:22:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
- common.mk.
- ":" in a make variable replacement cause a syntax error with
- /usr/ccs/bin/make on Solaris. Uses $(NULLCMD) instead.
+ * gc.c (rb_data_object_alloc): klass may be NULL.
+ [ruby-list:40498]
-Sun Jul 31 20:39:12 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Sun Jan 9 14:12:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * common.mk (ECHO1): nmake does not allow parenthesis in make variable
- replacement.
+ * 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: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]
+
+Sat Jan 8 04:38:47 2005 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml.rb: Kernel#y requires an argument.
+
+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>
+
+ * ext/zlib/zlib.c (zstream_end): should return value.
+
+Thu Jan 6 19:59:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * win32/win32.c (rb_w32_close): didn't close socket handle.
+ [ruby-dev:25414]
+
+ * 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>
+
+ * random.c (random_seed): O_NONBLOCK isn't defined on some
+ platforms. [ruby-dev:25417]
+
+Thu Jan 6 13:45:35 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/time.rb: recognize +00:00 and GMT as a localtime.
+
+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.
+ [ruby-dev:25408]
+
+ * 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 02:30:11 2005 Tanaka Akira <akr@m17n.org>
+
+ * random.c (init_by_array): imported from mt19937ar-cok.tgz.
+ (genrand_int32): ditto.
+ (genrand_real): replaced with genrand_res53 in mt19937ar-cok.
+ (rand_init): support bignum for longer seed.
+ (random_seed): generate longer seed.
+ (make_mask): new function.
+ (limited_rand): ditto.
+ (limited_big_rand): ditto.
+ (rb_f_rand): call limited_rand and limited_big_rand.
+ [ruby-dev:25403]
+
+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>
+
+ * test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
+ DRbService.ext_service. reduce sleep.
+
+Mon Jan 3 14:01:54 2005 Tanaka Akira <akr@m17n.org>
+
+ * random.c (random_seed): don't use /dev/urandom if it is not
+ character device.
+
+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>
+
+ * lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
+ raise NotImplementedError if password is encrypted by digest
+ algorithms. This patch is contributed by sheepman. [ruby-list:40467]
+
+ * lib/webrick/httpauth/digestauth.rb
+ (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
+ This patch is contributed by sheepman. [ruby-list:40482]
+
+ * lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
+ pack/unpack-template char "m" instead of lib/base64.rb to do base64
+ encoding/decoding. fixed: [ruby-dev:25336]
+
+ * 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
+ StringValue before GetSPKI. fixed: [ruby-dev:25359].
+
+Sat Jan 1 01:13:28 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (rb_autoload): [ruby-dev:25373]
+
+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.
+
+Thu Dec 30 00:41:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (svalue_to_avalue): [ruby-dev:25366]
+
+ * string.c (rb_str_justify): [ruby-dev:25367]
+
+Wed Dec 29 11:07:07 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/template/html/kilmer.rb: Update to use new
+ sections.
+
+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
+ variables. fixed: [ruby-list:40445]
+
+Tue Dec 28 15:25:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
+ 0xfe.
+
+ * ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
+ properly.
+
+Tue Dec 28 13:35:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
+ freeing internal zstreams. fixed: [ruby-dev:25309]
+
+ * ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
+
+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>
+
+ * 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>
+
+ * test/fileutils/test_fileutils.rb (cp_r): tested wrong file name.
+ [ruby-dev:25339]
+
+Mon Dec 27 15:15:18 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mv): should raise error when moving a
+ directory to the (empty) directory. [ruby-talk:124368]
+
+ * lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
+ platforms.
+
+Mon Dec 27 14:36:20 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not error.
+ fixed: [ruby-dev:25346]
+
+Sun Dec 26 16:21:39 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new class
+ to support the PLAIN authentication mechanism. Thanks, Benjamin
+ Stiglitz.
+
+Sat Dec 25 01:28:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_f_select): [ruby-dev:25312]
+
+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>
+
+ * 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 (syck_loader_transfer): check type conversion.
+
+ * ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
+ typing.
+
+ * ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
+ allocation framework.
+
+ * ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
+ ditto.
+
+Fri Dec 24 01:21:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tkextlib/blt.rb: add BLT extension support
+
+ * ext/tk/lib/tkextlib/blt/*.rb: ditto
+
+ * ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
+
+Thu Dec 23 23:43:24 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * process.c (proc_setgroups): check if the argument length 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
+ RELEASE_DATE
+
+ * ext/tcltklib/extconf.rb: ditto
+
+ * ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
+
+ * ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
+
+Thu Dec 23 00:16:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (bsdi): use $(CC) for LDSHARED. fixed [ruby-dev:25270]
+
+Wed Dec 22 11:14:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
+ fixed: [ruby-dev:25273]
+
+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>
+
+ * 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.
+
+ * 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>
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode):
+ 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: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>
+
+ * added samples for the previous soap4r's commit.
+
+Mon Dec 20 22:56:39 2004 Tanaka Akira <akr@m17n.org>
+
+ * gc.c (set_stack_end): gcc noinline attribute is available since
+ gcc-3.1.
+
+Mon Dec 20 22:40:31 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * added files:
+ * lib/soap/mapping/wsdl*.rb
+ * lib/wsdl/soap/element.rb
+ * lib/wsdl/xmlSchema/simpleContent.rb
+
+ * modified files:
+ * lib/soap/*
+ * lib/wsdl/*
+ * lib/xsd/*
+ * test/soap/*
+ * test/wsdl/*
+ * test/xsd/*
+
+ * summary
+ * imported from the soap4r repository. Version: 1.5.3-ruby1.8.2
+
+ * added several XSD basetype support: nonPositiveInteger,
+ negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
+ unsignedShort, unsignedByte, positiveInteger
+
+ * HTTP client connection/send/receive timeout support.
+
+ * 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>
+
+ * lib/net/https.rb: delete descriptions about key_file and cert_file.
+ fixed: [ruby-dev:25243]
+
+ * ext/openssl/lib/net/telnets.rb: ditto.
+
+Mon Dec 20 14:07:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
+
+ * ext/tk/lib/tk/clock.rb: ditto
+
+ * ext/tk/lib/tk/text.rb: ditto
+
+ * ext/tk/lib/tk/panedwindow.rb: ditto
+
+Mon Dec 20 13:51:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
+
+Mon Dec 20 10:51:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (special_local_set): prevent the parser object from GC.
+ fixed: [ruby-dev:25252]
+
+Mon Dec 20 03:30:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/cgi/session.rb (CGI::Session#initialize): empty session id was
+ used if request had no session key. fixed: [ruby-core:03981]
+
+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>
+
+ * lib/rexml/encodings/SHIFT_JIS.rb: fixed LoadError bug.
+ [ruby-core:3958]
+
+Sun Dec 19 17:24:59 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (enable_rpath): use rpath flag to embed the library
+ path into extensions on ELF environment. [ruby-dev:25035]
+
+Sun Dec 19 11:01:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit.rb: use standalone runner for -e.
+
+ * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
+ multiple -p and -x options.
+
+ * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
+ ditto.
+
+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>
+
+ * lib/webrick/httpauth.rb,
+ lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
+ pack/unpack-template char "m" instead of lib/base64.rb to do base64
+ encoding/decoding.
+
+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 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]
+
+Fri Dec 17 16:28:12 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: fix bug on setting up system encoding
+
+ * ext/tk/lib/tk/event.rb: fix error on require process
+
+ * ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
+
+ * ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
+ accepts event-sequence arguments
+
+ * ext/tk/lib/tk/text.rb: fail to dump embedded images
+
+ * ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
+ types of values
+
+ * ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
+ types of values
+
+ * ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
+ TkText::IndexString class to treat text index modifiers
+
+ * ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
+
+ * ext/tk/lib/tk/textmark.rb: ditto
+
+ * ext/tk/lib/tk/textimage.rb: ditto
+
+ * ext/tk/lib/tk/textwindow.rb: ditto
+
+ * ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
+ image
+
+ * ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
+ embedded window
+
+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>
+
+ * 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 23:31:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): create RUBYARCHDIR also when no extension
+ is installed. fixed: [ruby-dev:25215]
+
+Thu Dec 16 22:36:57 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * test/drb/test_drb.rb: adjust and reduce sleep.
+
+Thu Dec 16 18:37:08 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl.c (ossl_raise): refine message format.
+
+Thu Dec 16 16:29:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/demos-en/widget: modify version check for
+ supporting features
+
+Thu Dec 16 16:03:50 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
+
+ * ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
+
+ * ext/tk/lib/tk.rb: add TkComm._callback_entry?()
+
+ * ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
+
+ * ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
+
+ * ext/tk/lib/tk/canvastag.rb: ditto
+
+ * ext/tk/lib/tk/dialog.rb: ditto
+
+ * ext/tk/lib/tk/optiondb.rb: ditto
+
+ * ext/tk/lib/tk/text.rb: ditto
+
+ * ext/tk/lib/tk/texttag.rb: ditto
+
+ * ext/tk/lib/tk/textwindow.rb: ditto
+
+ * ext/tk/lib/tk/timer.rb: ditto
+
+ * ext/tk/lib/tk/validation.rb: ditto
+
+ * 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:27:10 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: remove junk.
+
+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]
+
+Thu Dec 16 00:43:29 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: changed default binded address family to use an
+ available address family of host name. [druby-ja:101]
+
+ * lib/drb/ssl.rb: ditto
+
+Wed Dec 15 17:47:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
+ should log about all accepted socket. [ruby-core:03962]
+
+ * lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
+ "%%" and "%u" are supported. [webricken:135]
+
+ * lib/webrick/httpservlet/filehandler.rb
+ (WEBrick::HTTPServlet::FileHandler#check_filename):
+ :NondisclosureName is acceptable if it is Enumerable.
+
+ * lib/webrick/config.rb (WEBrick::Config::FileHandler):
+ default value of :NondisclosureName is [".ht*", "*~"].
+
+Wed Dec 15 16:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * object.c (rb_obj_id_obsolete): warn always.
+
+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>
+
+ * win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
+
+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>
+
+ * win32/win32.c (rb_w32_close): need to reset osfhnd().
+
+Tue Dec 14 14:03:57 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
+ [ruby-dev:25187]
+
+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.
+ 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>
+
+ * test/ruby/test_super.rb (TestSuper#test_define_method): now methods
+ from procs can call super.
+
+Sun Dec 12 10:35:10 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
+ show an accessor's r/w flag if none was specified
+
+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>
+
+ * lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
+ [ruby-list:40390]
+
+ * test/drb/drbtest.rb: ditto.
+
+ * test/drb/ut_drb.rb: ditto.
+
+Sat Dec 11 13:08:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sample/optparse/subcommand.rb: a sample for sub commands like
+ cvs. contributed by Minero Aoki.
+
+Fri Dec 10 08:39:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/socket.c (sock_listen): get OpenFile just before calling
+ listen(2).
+
+Thu Dec 9 16:28:35 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/sdbm/init.c (GetDBM): typo.
+
+Thu Dec 9 16:21:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/cgi.rb (WEBrick::CGI#setup_header): avoid
+ SecurityError. [ruby-dev:24970]
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
+ for reading request till data arrive. [ruby-talk:121068]
+
+Thu Dec 9 14:38:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_inspect): escape # which starts an expression
+ substitution. fixed: [ruby-core:03922]
+
+ * 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]
+
+ * ext/sdbm/init.c: ditto.
+
+ * 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
+ the running script is '-e one-liner' or '-' (stdin).
+
+ * ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for
+ stub libs
+
+ * ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
+ have a wrong parent class.
+
+ * ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
+ TkWarning2 --> TkWarningObj (old names are changed to alias names)
+
+ * ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
+ option and hashes for configuration
+
+ * ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the
+ button name
+
+ * ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==>
+ get_value() and value=(val) ==> set_value(val).
+
+ * ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
+
+ * ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
+ TkOptionMenuButton = TkOptionMenubutton)
+
+ * ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
+ event_generate) for Event object
+
+ * ext/tk/lib/tk/font.rb: configinfo returns proper types of values
+
+ * ext/tk/lib/tk.rb: bind methods accept subst_args + block
+
+ * ext/tk/lib/tk/canvas.rb: ditto
+
+ * ext/tk/lib/tk/canvastag.rb: ditto
+
+ * ext/tk/lib/tk/frame.rb: ditto
+
+ * ext/tk/lib/tk/text.rb: ditto
+
+ * ext/tk/lib/tk/texttag.rb: ditto
+
+ * ext/tk/lib/tk/toplevel.rb: ditto
+
+ * ext/tk/lib/tkextlib/*: ditto and bug fix
+
+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.
+
+ * 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.
+
+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 (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.
+
+ * win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
+ interface.
+
+ * win32/win32.[ch] (rb_w32_rmdir): new function.
+
+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:32:38 2004 Tanaka Akira <akr@m17n.org>
+
+ * 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]
+
+ * 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]
+
+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>
+
+ * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
+ ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
+ ossl_rsa_private_decrypt): should take an optional argument
+ to specify padding mode. [ruby-talk:122539]
+
+ * ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): add new constants
+ PKCS1_PADDING, SSLV23_PADDING, NO_PADDING and PKCS1_OAEP_PADDING
+ under OpenSSL::PKey::RSA.
+
+ * test/openssl/test_pkey_rsa.rb: new file.
+
+Sun Dec 5 19:39:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::Completion#complete): new parameter
+ to direct case insensitiveness.
+
+ * 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]
+
+ * io.c (io_fwrite): takes VALUE string as an argument.
+ [ruby-dev:25050]
+
+ * ext/socket/socket.c (sock_connect): remove rb_str_locktmp().
+ [ruby-dev:25050]
+
+ * ext/socket/socket.c (udp_connect): [ruby-dev:25045]
+
+ * ext/socket/socket.c (udp_bind): ditto.
+
+ * ext/socket/socket.c (udp_send): ditto.
+
+ * ext/socket/socket.c (bsock_send): ditto.
+
+ * ext/socket/socket.c (s_recvfrom): ditto.
+
+ * 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.
+
+ * 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.
+
+Sat Dec 4 14:28:56 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/code_objects.rb (RDoc::Context::Section::set_comment):
+ Section comments may now be bracketed by lines which are
+ ignored. You can now write
+ # -----------
+ # :section: Dave's Section
+ # comment material
+ # -----------
+ The lines before :section: are removed, and identical lines at the end are
+ also removed if present.
+
+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>
+
+ * st.h: fix prototype for C++.
+
+Fri Dec 3 01:55:24 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing
+ returns proper object. "widget.option = val" returns val, and
+ "widget.option(val)" returns self.
+
+ * ext/tk/lib/tk/font.rb: TkFont#replace accepts only one font argument.
+
+ * ext/tk/lib/tk/radiobutton.rb: add TkRadiobutton#value and
+ TkRadiobutton#value=(val).
+
+ * ext/tk/lib/tk/spinbox.rb: callback substitution support on
+ command option.
+
+ * ext/tk/sample/demos-en/widget: bug fix (wrong image height)
+
+ * 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]
+
+Thu Dec 2 16:41:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_protect): prevent continuations created inside from being
+ called from the outside. [ruby-dev:25003]
+
+ * 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>
+
+ * eval.c (thread_mark): mark thread group. [ruby-dev:25020]
+
+ * eval.c (thgroup_add): check whether the argument is really a Thread.
+
+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>
+
+ * 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]
+
+ * io.c (io_readpartial): ditto.
+
+ * io.c (io_read): ditto.
+
+Tue Nov 30 14:58:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * instruby.rb (install): add arguments explicitly to "super".
+
+Tue Nov 30 00:49:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (PUSH_FRAME): flags should have been initialized.
+
+ * eval.c (rb_eval): [ruby-core:03856]
+
+ * 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
+ being extended when overwriting. [ruby-core:03836]
+
+Mon Nov 29 15:59:05 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/ostruct.rb (OpenStruct::method_missing): check method
+ duplication for -d.
+
+ * lib/ostruct.rb (OpenStruct::initialize): ditto.
+
+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]
+
+ * eval.c (rb_funcall_rescue): new function.
+
+ * object.c (rb_Array): avoid using rb_respond_to().
+
+ * 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]).
+
+Sun Nov 28 12:08:15 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+
+ * regparse.c, test/ruby/test_regexp.rb: fixed problem with UTF-8
+ characters that have U+00FE or invalid characters.
+
+Sun Nov 28 12:07:04 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+
+ * regexec.c, test/ruby/test_regexp.rb: fixed segmentation fault
+ ([ruby-dev:24887]).
+
+Sun Nov 28 12:05:48 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+
+ * regcomp.c, regint.h: fixed PLATFORM_UNALIGNED_WORD_ACCESS
+ problem ([ruby-dev:24802] and [ruby-core:3733])
+
+Sat Nov 27 23:43:39 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_initialize): [ruby-dev:24972]
+
+Sat Nov 27 21:43:39 2004 Tanaka Akira <akr@m17n.org>
+
+ * io.c: avoid data lost with nonblocking fd and
+ stdio buffering in sync mode. [ruby-dev:24966]
+ based on matz's patch [ruby-dev:24967]
+ (io_fwrite): new primitive writing function which writes
+ directly if sync mode.
+ (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]
+
+Sat Nov 27 09:41:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_fread): old rb_io_fread with file closing checking.
+ (rb_io_fread): wrapper for io_fread now.
+ [ruby-dev:24964]
+
+Fri Nov 26 18:02:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath
+
+ * ext/tk/lib/tk/image.rb: bug fix
+
+ * ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
+
+ * 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]
+
+ * lib/erb.rb: add RDoc by James Edward Gray II. [ruby-core:03786]
+
+Fri Nov 26 13:29:02 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break
+ out of preprocessing when we find a :section: directive (previously cleared out the
+ comment, but this apparently now generates an error in gsub!)
+
+Fri Nov 26 00:17:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_read): move StringValue() check before GetOpenFile().
+ [ruby-dev:24959]
+
+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>
+
+ * 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]
+
+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]
+
+Wed Nov 24 01:01:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_read): integer conversion should be prior to
+ GetOpenFile(). [ruby-dev:24952]
+
+ * configure.in, io.c: cancel [ ruby-Patches-1074 ].
+
+Tue Nov 23 08:09:50 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/menu.rb: improve usability of TkOptionMenubutton
+
+Tue Nov 23 02:00:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (rb_file_chown): integer conversion should be prior to
+ GetOpenFile(). [ruby-dev:24949]
+
+Tue Nov 23 00:10:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (rb_file_chown): integer conversion should be prior to
+ GetOpenFile(). [ruby-dev:24947]
+
+ * file.c (rb_file_truncate): ditto.
+
+ * file.c (rb_file_s_truncate): ditto.
+
+ * dir.c (dir_seek): use NUM2OFFT().
+
+ * misc/ruby-mode.el (ruby-non-block-do-re): [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'
+
+Mon Nov 22 00:13:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dir.c (dir_seek): should retrieve dir_data after NUM2INT().
+ [ruby-dev:24941]
+
+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
+ group together methods, attributes, constants, etc under
+ headings in the output. If used, a table of contents is
+ generated.
+
+Sat Nov 20 23:56:54 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/options.rb (Options::parse): Force --inline-source if
+ --one-file option given
+
+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 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.
+
+Sat Nov 20 05:34:24 2004 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: original nkf.c rev:1.40
+
+ * 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.
+ [ruby-core:03774]
+
+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
+ exception if data corresponding to session specified from the
+ client does not exist.
+
+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.
+
+Thu Nov 18 00:21:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * process.c (proc_getpgrp): prohibit for $SAFE=2.
+ [ruby-dev:24899]
+
+ * process.c (get_pid): ditto. [ruby-dev:24904]
+
+ * process.c (get_ppid): ditto.
+
+ * array.c (rb_ary_delete): defer rb_ary_modify() until actual
+ modification. [ruby-dev:24901]
+
+Thu Nov 18 10:10:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c, rubyio.h (rb_io_modenum_flags): exported.
+
+ * 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>
+
+ * 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]
+
+ * parse.y (string_content): should not use FL_UNSET.
+
+ * 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>
+
+ * dir.c (rb_push_glob): fix overrun. [ruby-dev:24886]
+
+Wed Nov 17 11:48:17 2004 Michael Neumann <mneumann@ruby-lang.org>
+
+ * lib/xmlrpc/parser.rb, test/xmlrpc/test_features.rb: fixed "assigning
+ to constants" warnings
+
+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]
+
+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>
+
+ * {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
+ config.status to force updating them.
+
+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
+ Regexp conversion.
+
+Tue Nov 16 01:41:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (str_mod_check): frozen check should be separated.
+ [ruby-core:3742]
+
+ * 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>
+
+ * configure.in: check rlim_t more portably. [ruby-core:3735]
+
+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>
+
+ * 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>
+
+ * 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
+ export it.
+
+Fri Nov 12 14:08:01 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/event.rb: remove $LOADED_FEATURES trick
+
+ * ext/tk/lib/tk.rb: ditto
+
+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>
+
+ * dir.c (rb_glob): should have called rb_glob_caller().
+ [ruby-dev:24773]
+
+Thu Nov 11 16:56:10 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).
+
+Thu Nov 11 01:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * error.c (syserr_initialize): use stringified object.
+ [ruby-dev:24768]
+
+Wed Nov 10 22:49:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/delegate.rb (SimpleDelegator::dup): wrong number of
+ arguments.
+
+ * 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.
+
+Wed Nov 10 03:33:36 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x
+ or older
+
+ * 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
+ memory leaks. use string object for buffering instead.
+ [ruby-dev:24738]
+
+ * dir.c (join_path): ditto.
+
+ * io.c (io_read): external input buffer may be modified even after
+ rb_str_locktmp(). [ruby-dev:24735]
+
+ * 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>
+
+ * lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
+ [ruby-dev:24743]
+
+Mon Nov 8 22:20:19 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
+ Fix bug where parent class wasn't being detected if the
+ child class was defined using the A::B notation.
+
+Mon Nov 8 00:14:13 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in: add setup for mingw32 cross compiling.
+ [ruby-talk:119413]
+
+Sun Nov 7 23:49:26 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: bind-event methods accept multi substitution
+ arguments.
+
+ * ext/tk/lib/tk/canvas.rb: ditto.
+
+ * ext/tk/lib/tk/canvastag.rb: ditto.
+
+ * ext/tk/lib/tk/text.rb: ditto.
+
+ * ext/tk/lib/tk/texttag.rb: ditto.
+
+ * ext/tk/lib/tkextlib: ditto.
+
+Sat Nov 6 20:40:16 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: rename WIN32OLE#ole_obj_help to
+ WIN32OLE#ole_type. alias ole_obj_help to ole_type.
+
+ * ext/win32ole/tests/testWIN32OLE.rb: ditto.
+
+Sat Nov 6 11:18:59 2004 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb (_parse): checks whether zone was given.
+
+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
+ X_Scrollable and Y_Scrollable
+
+ * ext/tk/lib/tk/entry.rb: include X_Scrollable instead of Scrollable
+
+ * ext/tk/lib/tk/autoload.rb: define autoload for X_Scrollable and
+ Y_Scrollable
+
+Fri Nov 5 16:05:32 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: TkComm._at() supprts both of "@x,y" and "@x"
+
+Fri Nov 5 13:22:58 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/text.rb: sorry. bug fix again.
+
+Fri Nov 5 13:17:54 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/text.rb: bug fix
+
+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>
+
+ * 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.
+
+Thu Nov 4 15:02:14 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/variable.rb: forget to initialize instance_variables
+ of TkVarAccess objects
+
+Thu Nov 4 09:11:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (gc_mark): enable GC stack checking.
+
+Thu Nov 4 03:11:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (str_gsub): lock strings temporarily. [ruby-dev:24687]
+
+ * ext/socket/socket.c (s_recvfrom): tmplock input buffer.
+ [ruby-dev:24705]
+
+Wed Nov 3 22:24:17 2004 Daigo Moriwaki <techml@sgtpepper.net>
+
+ * lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
+ avoid warnings.
+
+Wed Nov 3 17:19:59 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_uniq_bang): do not push frozen string from hash
+ table. [ruby-dev:24695]
+
+ * array.c (rb_ary_and): ditto.
+
+ * array.c (rb_ary_or): ditto.
+
+Wed Nov 3 17:02:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: support to use different Tcl commands between
+ configure and configinfo
+
+ * ext/tk/lib/font.rb: ditto.
+
+ * ext/tk/lib/itemconfig.rb: support to use different Tcl commands
+ between item_configure and item_configinfo
+
+ * ext/tk/lib/itemfont.rb: ditto.
+
+ * ext/tk/extconf.rb: install SUPPORT_STATUS
+
+ * 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.
+
+ * lib/rss/maker/*.rb: changed API to RSS version independence.
+
+ * lib/rss/maker/base.rb
+ (RSS::Maker::XMLStyleSheets::XMLStyleSheet): checked required
+ (pseudo) attributes.
+
+ * lib/rss/maker/base.rb (RSS::Maker::Items): sort -> do_sort.
+
+ * lib/rss/rss.rb (RSS::BaseModel.install_date_element): avoided
+ warning.
+
+ * lib/rss/0.9.rb (RSS::Rss#textinput): added convenience method.
+
+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>
+
+ * io.c (pipe_open): need to set cmd if argc == 0 (win32).
+
+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.
+
+ * ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
+ ext/stringio/extconf.rb: added.
+
+ * MANIFEST, ext/**/MANIFEST: removed.
+
+ * 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 03:14:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_get_method_body): store ICLASS in the cache.
+ [ruby-core:03672]
+
+ * eval.c (rb_provided): should return true for loading library
+ too for autoloading. [ruby-core:03655]
+
+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]
+
+ * string.c (rb_str_locktmp): lock string temporarily.
+
+ * string.c (str_independent): add tmplock check.
+
+ * io.c (io_write): lock output string temporarily.
+ [ruby-dev:24649]
+
+ * io.c (io_write): use rb_str_locktmp().
+
+ * 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
+ object. [ruby-talk:118234]
+
+ * 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.
+ [ruby-core:03611]
+
+ * eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
+ should be wrapped by PUSH_TAG/POP_TAG(). [ruby-dev:24627]
+
+Thu Oct 28 08:42:02 2004 Tanaka Akira <akr@m17n.org>
+
+ * io.c (argf_forward): use ANSI style.
+ (argf_read): call argf_forward with argv argument.
+ [ruby-dev:24624]
+
+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.
+
+ * io.c (ARGF_FORWARD): should have specified argv explicitly,
+ since we no longer have frame->argv saved. [ruby-dev:24602]
+
+Tue Oct 26 23:30:39 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module):
+ Restore correct :nopdoc: behavior with nested classes and modules.
+
+Tue Oct 26 18:21:29 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (RESIZE_CAPA): check string attribute before modifying
+ capacity member of string structure. [ruby-dev:24594]
+
+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 '.'.
+ [ruby-dev:24590]
+
+ * win32/win32.c (isUNCRoot): fixed buffer overrun.
+
+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>
+
+ * 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.
+ Thanks. [ruby-core:03549]
+
+Sat Oct 23 00:20:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/zlib/zlib.c (zstream_append_input): clear klass for z->input
+ to avoid potential vulnerability.
+
+ * ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
+ to avoid SEGV. [ruby-dev:24568]
+
+Fri Oct 22 12:02:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_alias): was warning for wrong condition.
+ [ruby-dev:24565]
+
+Fri Oct 22 10:36:37 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars):
+ should check if path_info is not nil.
+
+Fri Oct 22 00:22:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/zlib/zlib.c (zstream_shift_buffer): should restore class
+ field of a buffer. [ruby-dev:24562]
+
+Fri Oct 22 00:20:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_include): should not treat char as negative value.
+ [ruby-dev:24558]
+
+Thu Oct 21 21:32:30 2004 IWATSUKI Hiroyuki <don@na.rim.or.jp>
+
+ * lib/pstore.rb (PStore#transaction): Use the empty content when a
+ file is not found. [ruby-dev:24561]
+
+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.
+ [ruby-dev:24546]
+
+ * 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.
+
+Wed Oct 20 04:17:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/dbm/dbm.c (fdbm_delete_if): should check if deleting element
+ is a string. [ruby-dev:24490]
+
+ * ext/sdbm/init.c (fsdbm_delete_if): ditto.
+
+Wed Oct 20 01:37:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_times): Array#* should return an instance of
+ the class of right operand. [ruby-dev:24526]
+
+ * ext/zlib/zlib.c (zstream_detach_buffer): should not expose
+ class-less object to Ruby world. [ruby-dev:24530]
+
+ * eval.c (proc_dup): provide Proc#dup as well. [ruby-talk:116915]
+
+ * 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>
+
+ * ext/win32ole.c(ole_invoke): retrieve the result value when
+ retrying the IDispatch::invoke.
+
+Tue Oct 19 17:24:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (read_all): block string buffer modification during
+ rb_io_fread() by freezing it temporarily. [ruby-dev:24479]
+
+ * dir.c (rb_push_glob): block call at once the end of method.
+ [ruby-dev:24487]
+
+ * ext/enumerator/enumerator.c (enum_each_slice): remove
+ rb_gc_force_recycle() to prevent potential SEGV.
+ [ruby-dev:24499]
+
+ * 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>
+
+ * string.c (rb_str_upto): method result must be checked. [ruby-dev:24504]
+
+ * eval.c (error_print): ditto. [ruby-dev:24519]
+
+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>
+
+ * io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether file
+ not existing is created. [ruby-dev:24505]
+
+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>
+
+ * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#initialize):
+ initial value of accpet-* should be array.
+
+Mon Oct 18 00:42:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (sock_s_getservbyaname): protocol string
+ might be altered. [ruby-dev:24503]
+
+ * string.c (rb_str_upto): check if return value from succ is a
+ string. [ruby-dev:24504]
+
+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>
+
+ * ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
+ * ext/win32ole/win32ole.c (fole_get_methods): ditto.
+ * ext/win32ole/win32ole.c (fole_put_methods): ditto.
+ * ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE#ole_func_methods
+ WIN32OLE#ole_get_methods, WIN32OLE#ole_put_methods
+
+Sat Oct 16 14:45:28 2004 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/0.9.rb (RSS::Rss#to_s): removed garbage.
+
+Sat Oct 16 13:42:49 2004 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/: untabified.
+ * test/rss/: untabified.
+ * lib/rss/0.9.rb (RSS::Rss#to_s): inent -> indent.
+
+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
+ acceptable. Add TkTimer.start ( == new + start ).
+
+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>
+
+ * 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]
+
+ * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
+ prevent access to recycled object (via continuation for
+ example). [ruby-dev:24463]
+
+Mon Oct 11 13:48:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/*: untabify
+
+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
+ conversion.
+
+ * lib/rss/rss.rb: 0.0.9 -> 0.1.0.
+
+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
+ iteration. [ruby-dev:24445]
+
+Fri Oct 8 01:13:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/optiondb.rb: make it more secure
+
+Thu Oct 7 23:47:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/scrollbar.rb: When 'set' operation, a scrollbar
+ cannot propagate view port information from the source widget
+ (that calls 'set') to other assigned widgets.
+
+Thu Oct 7 17:36:25 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: When CHILDKILLED and so on, Tk.errorCode returns
+ a Fixnum for 2nd element (it's pid) of the return value.
+
+Thu Oct 7 12:55:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (io_read): should freeze buffer before thread context
+ switch. [ruby-dev:24442]
+
+ * pack.c (pack_unpack): string conversion should at the top of the
+ method. [ruby-dev:24439]
+
+ * io.c (io_read): buffer should be frozen only after the length
+ check. [ruby-dev:24440]
+
+Thu Oct 7 02:56:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c: use FMODE_APPEND.
+
+Thu Oct 7 01:05:33 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: add Tk.errorInfo and Tk.errorCode
+
+Thu Oct 7 00:08:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_s_sysopen): preserve path in the buffer allocated by
+ ALLOCA_N() to prevent modification. [ruby-dev:24438]
+
+Wed Oct 6 09:21:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_mode_flags): preserve append mode flag.
+ [ruby-dev:24436]
+
+ * io.c (rb_io_modenum_mode): do not use external output buffer.
+
+ * string.c (rb_str_justify): differ pointer retrieval to prevent
+ padding string modification. [ruby-dev:24434]
+
+ * range.c (range_each_func): allow func to terminate loop by
+ returning RANGE_EACH_BREAK.
+
+ * 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>
+
+ * io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
+ while GC. [ruby-dev:24408]
+
+Mon Oct 4 12:53:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/optiondb.rb: support definition of command
+ resources on widgets
+
+ * ext/tk/lib/tk/image.rb: bug fix
+
+Sun Oct 3 21:16:05 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.
+
+ * 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]
+
+ * node.h (NEW_DVAR): extra semicolon.
+
+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]
+
+Fri Oct 1 11:40:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
+ sourcefile string modification. [ruby-dev:24373]
+
+ * io.c (io_read): block string buffer modification during
+ rb_io_fread() by freezing it temporarily. [ruby-dev:24366]
+
+ * io.c (rb_io_s_popen): mode argument may be altered.
+ [ruby-dev:24375]
+
+ * file.c (rb_file_s_basename): ext argument may be altered.
+ [ruby-dev:24377]
+
+ * enum.c (enum_sort_by): use NODE instead of 2 element arrays.
+ [ruby-dev:24378]
+
+ * string.c (rb_str_chomp_bang): StringValue() may change the
+ receiver. [ruby-dev:24371]
+
+Fri Oct 1 11:25:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/grid.rb: revive TkGrid.grid
+
+ * ext/tk/lib/tk/pack.rb: revive TkPack.pack
+
+ * ext/tk/lib/tk/place.rb: revive TkPlace.place
+
+Thu Sep 30 00:50:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c (ip_init): bug fix
+
+ * ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
+
+ * ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation
+
+ * ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a
+ matting pattern argument
+
+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
+ accessors. [ruby-dev:24342]
+
+ * marshal.c (w_object, r_object0): use accessors.
+
+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
+ to avoid double call to rb_gc_force_recycle(). [ruby-dev:24311]
+
+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]
+
+ * array.c (rb_ary_replace): ditto.
+
+ * array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
+
+ * 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
+ during iteration. [ruby-dev:24315]
+
+ * 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.
+
+ * hash.c (env_fetch): ditto.
+
+Wed Sep 22 13:02:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+
+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]
+
+ * array.c (rb_ary_reject_bang): ditto. [ruby-dev:24300]
+
+ * 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_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
+ rb_ary_sort_bang() instead. [ruby-dev:24291]
+
+ * enum.c (enum_sort_by): pedantic type check added.
+ [ruby-dev:24291]
+
+ * hash.c (rb_hash_foreach_iter): check iter_lev after each
+ iteration. [ruby-dev:24289]
+
+ * array.c (rb_ary_and): element size might change during
+ comparison. [ruby-dev:24290]
+
+ * array.c (rb_ary_or): ditto. [ruby-dev:24292]
+
+ * array.c (rb_ary_equal): wrong fix. [ruby-dev:24286]
+
+Sat Sep 18 15:02:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_equal): element size might change during
+ comparison. [ruby-dev:24254]
+
+ * array.c (rb_ary_diff): ditto. [ruby-dev:24274]
+
+ * array.c (rb_ary_select): ditto. [ruby-dev:24278]
+
+ * array.c (rb_ary_delete): ditto. [ruby-dev:24283]
+
+ * array.c (rb_ary_rindex): ditto. [ruby-dev:24275]
+
+ * array.c (rb_ary_initialize): element size might change during
+ initializing block. [ruby-dev:24284]
+
+Sat Sep 18 14:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
+ the original directory when exception has caused in changing
+ 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.
+
+ * ext/ripper/depend (parse.obj): lex.c exists at hdrdir.
+
+ * {bcc32,win32,wince}/Makefile.sub (YACC, YFLAGS, parse.c):
+ use bison.
+
+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]
+
+ * ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
+ which might return singleton class. [ruby-dev:24202]
+
+Fri Sep 17 16:07:09 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: improve exit operation
+
+Fri Sep 17 15:01:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or
+ (thread_)tkwait
+
+ * ext/tk/lib/tk.rb: add alias wait_window to wait_destroy
+
+ * ext/tk/lib/multi-tk.rb: support calling 'mainloop' on slave
+ interpreters (however, the 'real' eventloop must be run on the
+ Default Master IP)
+
+ * ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb
+
+ * ext/tk/sample/remote-ip_sample2.rb: ditto
+
+ * ext/tk/sample/tkoptdb-safeTk.rb: ditto
+
+Thu Sep 16 18:12:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
+ to request.user attribute.
+
+ * lib/webrick/httpservlet/filehandler.rb
+ (WEBrick::HTTPServlet::FileHandler#initialize): should expand
+ the pathname of document root directory.
+
+Thu Sep 16 15:49:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_intern): protect string argument from GC.
+ [ruby-core:03411]
+
+Wed Sep 15 20:22:23 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
+ of MultiTkIp
+
+Tue Sep 14 23:54:11 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by
+ the previous changes.
+
+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
+
+ * ext/tk/lib/multi-tk.rb: improve safe-level handling of argument proc
+
+ * ext/tk/sample/multi-ip_sample.rb: rename of old 'safe-tk.rb'
+
+ * ext/tk/sample/safe-tk.rb: new sample script
+
+Mon Sep 13 21:33:40 2004 GOTOU Yuuzou <gotoyuzo@notwork.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.
+
+Mon Sep 13 19:16:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * eval.c (blk_copy_prev): need frame_dup(). [ruby-dev:24103]
+
+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>
+
+ * 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
+
+ * ext/tcltklib/tcltklib.c: store original 'exit' command
+
+ * 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>
+
+ * util.c (ruby_strdup): remove unnecessary code. (xmalloc never
+ returns NULL.)
+
+ * util.c (ruby_getcwd): fix memory leak on failure.
+
+Sun Sep 12 02:41:58 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
+ allow_ruby_exit=
+
+ * ext/tk/lib/multi-tk.rb: ditto.
+
+ * ext/tk/lib/remote-tk.rb: ditto.
+
+ * ext/tcltklib/MANUAL.euc: ditto.
+
+ * ext/tcltklib/MANUAL.eng: ditto.
+
+ * ext/tcltklib/tcltklib.c: fix some reasons of SEGV
+
+ * ext/tk/tkutil.c: ditto.
+
+ * ext/tk/lib/multi-tk.rb: ditto.
+
+ * ext/tk/lib/tk/timer.rb: ditto.
+
+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>
+
+ * 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
+ patch for call-seq.
+
+Thu Sep 9 13:58:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
+ 'argv' and 'argv0' variable
+
+ * ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
+
+Thu Sep 9 11:46:18 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow
+ spaces aroun parameter to define_method_under (James Buck)
+
+Wed Sep 8 18:44:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_write): zero fill a gap if exsts.
+ [ruby-dev:24190]
+
+Wed Sep 8 15:19:49 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
+
+ * ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
+ and error treatment
+
+ * ext/tk/lib/multi-tk.rb: allow a trusted slave IP to create slave IPs
+
+ * ext/tk/lib/tk/listbox.rb: add TkListbox#value, value=, clear, and
+ erase
+
+ * ext/tk/lib/tk/text.rb: add TkText#clear and erase
+
+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.
+
+ * ext/socket/socket.c (wait_connectable, ruby_connect): support
+ nonblocking connect on various platforms.
+
+Mon Sep 6 11:00:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dir.c (dir_s_chdir): the patch to shut up false warning when
+ 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.
+ [ruby-dev:24223]
+
+ * eval.c (rb_load): should preserve previous ruby_wrapper value.
+ [ruby-dev:24226]
+
+Sat Sep 4 01:14:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (cvar_cbase): class variables cause SEGV in
+ instance_eval() for fixnums and symbols. [ruby-dev:24213]
+
+Fri Sep 3 17:47:58 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * struct.c (make_struct): remove redefining constant when
+ conflict. [ruby-dev:24210]
+
+Fri Sep 3 11:31:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow
+ [ruby-dev:24207]
+
+Fri Sep 3 02:12:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266]
+
+ * ext/tk/lib/tk/text.rb: fix typo
+
+ * ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs
+
+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>
+
+ * ext/tk/lib/tk/spinbox.rb: fix typo
+
+Wed Sep 1 19:28:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * process.c (rb_proc_exec): label cannot precede variable declarations.
+
+Tue Aug 31 18:20:49 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/tk/tkutil.c (cbsubst_init): fix memory leak
+
+ * ext/tk/tkutil.c (cbsubst_get_all_subst_keys): fix SEGV
+
+Tue Aug 31 16:04:22 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c (ip_delete): when a tcltkip is deleted,
+ destroy its root widget
+
+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
+ if it finds the same class in multiple places.
+
+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 15:10:46 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+
+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]
+
+ * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
+
+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>
+
+ * lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
+ use a session id as a filename.
+
+ * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
+
+ * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
+ Dir::tmpdir.
+
+Tue Aug 24 14:32:17 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
+ session id after check.
+
+Tue Aug 24 08:57:51 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.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+
+ * 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>
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_read):
+ - should return an empty string if specified length to read is 0.
+ - should check for pending data and wait for fd before reading.
+ - call underlying IO's sysread if SSL session is not started.
+ [ruby-dev:24072], [ruby-dev:24075]
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_write):
+ - call underlying IO's syswrite if SSL session is not started.
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_pending): new method
+ OpenSSL::SSL#pending.
+
+ * ext/openssl/lib/openssl/buffering.rb: should not use select.
+
+Sun Aug 22 01:10:36 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
+ should call :ProxyContentHandler before finishing CONNECT.
+
+Sat Aug 21 06:41:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
+
+ * 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.
+
+ * ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
+
+ * ext/tk/lib/menu.rb: typo bug.
+
+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>
+
+ * configure.in, win32/Makefile.sub (LIBS): need to link shell32
+ library for SH* functions on mswin32 and mingw32.
+
+ * wince/Makefile.sub (LIBS): need to link ceshell library for SH*
+ functions on mswince.
+
+Thu Aug 19 03:07:00 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
+ fixed problem with extra line feeds at end of folding, whitespace
+ opening scalar blocks.
+
+ * 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>
+
+ * lib/net/protocol.rb (rbuf_fill): OpenSSL::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>
+
+ * ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
+ Tcl_FindExecutable() for Tcl/Tk 8.4.
+
+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
+ out by Guy Decoux. [ruby-core:03288]
+
+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 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>
+
+ * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
+ fix regex for range-spec.
+
+ * lib/webrick/httpservlet/filehandler.rb
+ (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/fileutils.rb: new method FileUtils.copy_entry.
+
+ * test/fileutils/test_fileutils.rb: more cp_r tests.
+
+Sun Aug 8 00:43:31 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/implicit.c: added sexagecimal float#base60.
+
+ * ext/syck/rubyext.c (yaml_org_handler): ditto.
+
+ * lib/token.c: indentation absolutely ignored when processing flow
+ 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>
+
+ * 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
+ looking up some top level symbols (batsman)
+
+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>
+
+ * 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>
+
+ * 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/rubytypes.rb: exceptions were using an older
+ YAML.object_maker. [ruby-core:03080]
+
+ * ext/syck/token.c (sycklex_yaml_utf8): using newline_len to
+ 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]
+
+Fri Jul 30 16:10:54 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c (lib_fromUTF8_core): raise ArgumentError when
+ the unknown encoding name is given.
+
+ * ext/tcltklib/tcltklib.c (lib_toUTF8_core): ditto.
+
+ * ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertfrom): bug fix.
+
+ * ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertto): ditto.
+
+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>
+
+ * eval.c (rb_eval): copy on write for argument local variable
+ assignment.
+
+ * eval.c (assign): ditto.
+
+ * eval.c (rb_call0): update ruby_frame->argv with the default
+ value used for the optional arguments.
+
+ * object.c (Init_Object): "===" calls rb_obj_equal() directly.
+ [ruby-list:39937]
+
+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>
+
+ * 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
+ outside of a range. No boundary check for "end".
+
+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>
+
+ * lib/net/imap.rb (disconnected?): new method.
+
+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.
+
+ * lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
+ ditto.
+
+Mon Jul 19 00:53:46 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]
+
+Sun Jul 18 16:14:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
+ ( wrong number of argument )
+
+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>
+
+ * dir.c (bracket): 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.
+
+Sat Jul 17 23:59:01 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (send_string_data): wait command continuation
+ requests before sending octet data of literals.
+
+Sat Jul 17 23:54:59 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/variable.rb: TkVariable#ref returns a TkVariable object
+
+Sat Jul 17 22:04:44 2004 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/ldap.rb: method hierarchical? should be in URI::LDAP.
+
+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
+ process expression interpolation. [ruby-talk:106691]
+
+Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/diagram.rb: Incorporate Micheal Neumann's
+ client-side imagemao patch
+
+Sat Jul 17 01:57:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (THREAD_ALLOC): th->thread should be initialized to NULL.
+ [ruby-talk:106657] The solution was found by Guy Decoux.
+
+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 11:17:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
+ [ruby-dev:23913]
+
+ * error.c (exit_success_p): new method SystemExit#success?.
+ [ruby-dev:23912]
+
+ * error.c (syserr_initialize): initialization for subclasses.
+ [ruby-dev:23912]
+
+Thu Jul 15 23:53:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception
+ no longer has to_str method.
+
+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
+
+Thu Jul 15 14:12:34 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * 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.
+
+Thu Jul 15 10:15:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/, ext/tcltklib/: bug fix
+
+ * ext/tk/lib/tk.rb: better operation for SIGINT when processing
+ callbacks.
+ * ext/tk/lib/tk/msgcat.rb: ditto.
+ * ext/tk/lib/tk/variable.rb: ditto.
+ * ext/tk/lib/tk/timer.rb: ditto.
+
+ * ext/tk/lib/tk/validation.rb: add Tk::ValidateConfigure.__def_validcmd
+ to define validatecommand methods easier
+
+ * ext/tk/lib/tk.rb (_genobj_for_tkwidget): support autoload Tk ext
+ classes
+
+ * ext/tk/lib/tk/canvas.rb and so on: remove the parent widget type
+ check for items (e.g. canvas items; depends on the class) to
+ avoid some troubles on Tk extension widget class definition.
+
+ * ext/tk/lib/tkextlib/: add Iwidget and TkTable extension support
+
+ * 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>
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
+ argument. [ruby-dev:23891]
+
+ * 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>
+
+ * 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>
+
+ * array.c: rdoc patch. merged patch from Johan Holmberg
+ <holmberg@iar.se> [ruby-core:3170]
+
+Tue Jul 13 19:39:12 2004 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic#merge_path):
+ "URI('http://www.example.com/foo/..') + './'" should return
+ "URI('http://www.example.com/')". [ruby-list:39838]
+ "URI('http://www.example.com/') + './foo/bar/..'" should return
+ "URI('http://www.example.com/foo/')". [ruby-list:39844]
+
+ * test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
+
+Tue Jul 13 15:48:56 2004 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
+ extmk mode.
+
+ * lib/mkmf.rb (dir_config): Prepend a new library path instead of
+ appending so it is tried first.
+
+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>
+
+ * 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
+ (::Struct) to avoid name crash.
+
+Sat Jul 10 04:21:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: better operation for SIGINT when processing
+ callbacks.
+ * ext/tk/lib/tk/msgcat.rb: ditto.
+ * ext/tk/lib/tk/variable.rb: ditto.
+ * ext/tk/lib/tk/timer.rb: ditto.
+
+ * ext/tk/lib/tk/validation.rb (__def_validcmd): add a module
+ function of Tk::ValidateConfigure to define validatecommand
+ methods easier
+
+Fri Jul 9 22:18:59 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]
+
+ * numeric.c: rdoc patch.
+
+Fri Jul 9 19:26:39 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (URI::HTTPS#proxy_open): raise ArgumentError to
+ notice https is not supported.
+
+Fri Jul 9 14:28:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_raise): accept third argument as well as
+ Kernel#raise, and evaluate the arguments to create an exception in
+ the caller's context. [ruby-talk:105507]
+
+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
+ [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]
+
+ * gc.c (Init_stack): use system provided address if possible.
+
+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>
+
+ * 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.
+
+Wed Jul 7 00:48:34 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/tk/lib/tkextlib/tktrans.rb,
+ ext/tk/lib/tkextlib/treectrl.rb: fix syntax errors.
+
+Tue Jul 6 18:38:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib: improve framework of developping Tcl/Tk extension
+ wrappers
+
+Mon Jul 5 23:56:42 2004 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/{trackback,syndication,dublincore,content}.rb: worked
+ with ruby 1.6 again.
+
+ * test/rss/rss-assertions.rb: ditto.
+
+Mon Jul 5 22:54:39 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/uri/common.rb (Kernel#URI): new global method for parsing URIs.
+
+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>
+
+ * 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)
+ [ruby-dev:23860]
+
+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>
+
+ * added files:
+ * lib/soap/header/*
+ * lib/soap/rpc/httpserver.rb
+ * lib/wsdl/soap/cgiStubCreator.rb
+ * lib/wsdl/soap/classDefCreator.rb
+ * lib/wsdl/soap/classDefCreatorSupport.rb
+ * lib/wsdl/soap/clientSkeltonCreator.rb
+ * lib/wsdl/soap/driverCreator.rb
+ * lib/wsdl/soap/mappingRegistryCreator.rb
+ * lib/wsdl/soap/methodDefCreator.rb
+ * lib/wsdl/soap/servantSkeltonCreator.rb
+ * lib/wsdl/soap/standaloneServerStubCreator.rb
+ * lib/wsdl/xmlSchema/enumeration.rb
+ * lib/wsdl/xmlSchema/simpleRestriction.rb
+ * lib/wsdl/xmlSchema/simpleType.rb
+ * lib/xsd/codegen/*
+ * lib/xsd/codegen.rb
+ * 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/*
+ * test/wsdl/multiplefault.wsdl
+ * test/wsdl/simpletype/*
+ * test/wsdl/test_multiplefault.rb
+
+ * modified files:
+ * lib/soap/baseData.rb
+ * lib/soap/element.rb
+ * lib/soap/generator.rb
+ * lib/soap/netHttpClient.rb
+ * lib/soap/parser.rb
+ * lib/soap/property.rb
+ * lib/soap/soap.rb
+ * lib/soap/streamHandler.rb
+ * lib/soap/wsdlDriver.rb
+ * lib/soap/encodingstyle/handler.rb
+ * lib/soap/encodingstyle/literalHandler.rb
+ * lib/soap/encodingstyle/soapHandler.rb
+ * lib/soap/mapping/factory.rb
+ * lib/soap/mapping/mapping.rb
+ * lib/soap/mapping/registry.rb
+ * lib/soap/mapping/rubytypeFactory.rb
+ * lib/soap/mapping/wsdlRegistry.rb
+ * lib/soap/rpc/cgistub.rb
+ * lib/soap/rpc/driver.rb
+ * lib/soap/rpc/proxy.rb
+ * lib/soap/rpc/router.rb
+ * lib/soap/rpc/soaplet.rb
+ * lib/soap/rpc/standaloneServer.rb
+ * lib/wsdl/data.rb
+ * lib/wsdl/definitions.rb
+ * lib/wsdl/operation.rb
+ * lib/wsdl/parser.rb
+ * lib/wsdl/soap/definitions.rb
+ * lib/wsdl/xmlSchema/complexContent.rb
+ * lib/wsdl/xmlSchema/complexType.rb
+ * lib/wsdl/xmlSchema/data.rb
+ * lib/wsdl/xmlSchema/parser.rb
+ * lib/wsdl/xmlSchema/schema.rb
+ * lib/xsd/datatypes.rb
+ * lib/xsd/qname.rb
+ * sample/soap/sampleStruct/server.rb
+ * sample/wsdl/amazon/AmazonSearch.rb
+ * sample/wsdl/amazon/AmazonSearchDriver.rb
+ * test/soap/test_property.rb
+ * test/soap/calc/test_calc_cgi.rb
+ * test/wsdl/test_emptycomplextype.rb
+
+ * summary
+ * add SOAP Header mustUnderstand support.
+
+ * add HTTP client SSL configuration and Cookies support (works
+ completely with http-access2).
+
+ * add header handler for handling sending/receiving SOAP Header.
+
+ * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
+ Model. it caused error.
+
+ * add WSDL simpleType support to restrict lexical value space.
+
+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>
+
+ * ext/tk/lib/tcltklib: bug fix
+
+ * ext/tk/lib/tk: bug fix and add Tcl/Tk extension support libraries
+
+Thu Jul 1 18:31:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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>
+
+ * 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_set_key_length): new method
+ OpenSSL::Cipher::Cipher#key_len=.
+
+Wed Jun 30 19:48:09 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,
+ EVP_DigestFinal_ex and EVP_DigestInit_ex.
+
+ * ext/openssl/openssl_missing.c (EVP_CIPHER_CTX_copy): new function.
+
+ * ext/openssl/openssl_missing.h (EVP_DigestInit_ex, EVP_DigestFinal_ex,
+ EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
+ OpenSSL 0.9.6.
+
+ * 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.
+ 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 (Init_ossl_cipher): Cipher#<< is deprecated.
+
+ * ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
+ EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
+ and EVP_MD_CTX_init should only be called once.
+
+ * ext/openssl/ossl_digest.c (digest_final): should call
+ EVP_MD_CTX_cleanup to avoid memory leak.
+
+ * ext/openssl/ossl_hmac.c (ossl_hmac_initialize): repalce HMAC_init
+ into HMAC_init_ex. and HMAC_CTX_init is moved to ossl_hmac_alloc.
+
+ * ext/openssl/ossl_hmac.c (hmac_final): should call
+ HMAC_CTX_cleanup to avoid memory leak.
+
+ * 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>
+
+ * test/ruby/test_file.rb (test_fnmatch): some tests for File.fnmatch
+ are added.
+
+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>
+
+ * ext/syck/rubyext.c (syck_emitter_new): set buffer after
+ Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
+
+Tue Jun 29 10:31:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
+
+ * gc.c (define_final, run_final): preserve and restore safe level for
+ finalizers. [ruby-core:03058]
+
+ * signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
+ safe level for signal handlers. [ruby-dev:23829]
+
+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>
+
+ * sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
+
+Sun Jun 27 22:36:47 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>
+
+ * variable.c (rb_mod_class_variables): class variables are no longer
+ inherited. [ruby-dev:23808]
+
+Sat Jun 26 11:07:20 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]
+
+Sat Jun 26 00:13:08 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]
+
+Fri Jun 25 18:07:15 2004 Michal Rokos <michal@ruby-lang.org>
+
+ * gc.c: bring back _stklen for DJGPP [ruby-core:3084]
+
+Fri Jun 25 15:33:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/extconf.rb: check stricter. [ruby-talk:104501]
+
+Fri Jun 25 01:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
+ including version.h. [ruby-talk:104456]
+
+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>
+
+ * version.h: added declarations of ruby_version,
+ ruby_release_date, ruby_platform.
+
+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>
+
+ * 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>
+
+ * 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-
+ dLibraries().
+
+ * ext/win32ole/win32ole.c (ole_event_free): ditto.
+
+ * 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 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.
+
+Sun Jun 20 21:12:54 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (binary=): send TYPE commands only once.
+
+Sat Jun 19 13:27:01 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
+ safe level.
+
+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]
+
+ * 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]
+
+Wed Jun 16 16:01:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (stack_grow_direction): memoize the direction.
+
+ * gc.c (Init_stack): should always move to end of VALUE.
+
+Tue Jun 15 12:10:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
+
+Mon Jun 14 18:23:27 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/remote-tk.rb: bug fix
+
+Sun Jun 13 00:23:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
+
+ * ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
+ eliminate warning about instance variable access
+
+ * ext/tk/lib/tk/menubar.rb: improve supported menu_spec
+
+ * ext/tk/lib/tk/menuspec.rb: [add] menu_spec support library
+
+ * ext/tk/lib/tk/root.rb: add menu_spec support
+
+ * ext/tk/lib/tk/text.rb: bug fix
+
+ * ext/tk/lib/tk/toplevel.rb: add menu_spec support
+
+ * 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.
+
+ * hash.c: ditto.
+
+ * ext/dbm/dbm.c: remove #indexes, #indices, "values_at" warning
+ from #select.
+
+ * ext/gdbm/gdbm.c: ditto.
+
+ * ext/sdbm/init.c: ditto.
+
+ * ext/dbm/dbm.c (Init_dbm): set VERSION constant as "unknown" when
+ DB_VERSION_STRING is not available.
+
+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>
+
+ * lib/uri/generic.rb (URI::Generic::merge,
+ URI::Generic::route_from): accepts non-hierarchical URI.
+ [ruby-dev:23631]
+
+ * 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>
+
+ * 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.
+
+Wed Jun 2 20:16:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (str_new4): should share shared instance if it already
+ exists. [ruby-dev:23665]
+
+Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_gets_m): set lastline ($_) even when read line is
+ nil. [ruby-dev:23663]
+
+Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval): bad influence on frame node.
+
+ * eval.c (eval): reverted wrongly removed condition. [ruby-dev:23638]
+
+Thu May 27 21:37:50 2004 Tanaka Akira <akr@m17n.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>
+
+ * io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+
+Thu May 27 15:54:02 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
+ Thanks, Rutger Nijlunsing.
+
+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]
+
+ * io.c (rb_io_fwrite): should check if errno == ENOENT, too.
+
+Thu May 27 11:25:03 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: illegal require module name (../lib/csv.rb).
+
+Wed May 26 23:12:13 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * 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']]
+
+ * test/csv/test_csv.rb: follow above changes.
+
+Wed May 26 14:19:42 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval, eval): make line number consistent on eval with
+ Proc. [ruby-talk:101253]
+
+Wed May 26 13:59:17 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for
+ 'do' after for statement
+
+Wed May 26 13:56:03 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb (Generators::MarkUp::style_url): Fix
+ relative path to code CSS file
+
+Wed May 26 13:14:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_init_copy): copy also positions. [ruby-talk:100910]
+
+Wed May 26 00:00:00 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/syck.c (syck_new_parser): clear parser on init.
+ thanks, ts. [ruby-core:02931]
+
+ * ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
+ thanks, ts. [ruby-core:02929]
+
+ * 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.
+
+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>
+
+ * MANIFEST: add test/openssl/test_x509store.rb.
+
+ * ext/tk/MANIFEST: add recent files.
+
+Sat May 22 05:37:11 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
+ on the other processes by Tcl/Tk's 'send' command
+
+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]
+
+ * lib/mkmf.rb (create_header): macro name should not include equal
+ sign.
+
+Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org>
+
+ * ext/socket/socket.c: check SCM_RIGHTS macro addition to
+ the msg_control field to test existence of file descriptor passing
+ by msg_control.
+
+Thu May 20 12:38:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (flo_eq): always check if operands are NaN.
+ [ruby-list:39685]
+
+Thu May 20 12:34:39 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
+ At Ryan Davis' suggestion, honor visibility modifers if guarded by a
+ statement modifier
+
+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]
+
+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>
+
+ * 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>
+
+ * numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
+ instead of "0.0e+00". [ruby-dev:23480]
+
+ * numeric.c (flo_to_s): it's preferable that "p 0.00000000000000000001"
+ outputs "1.0e-20" instead of "9.999999999999999e-21". (the precision
+ is considered, but there is assumption DBL_DIG == 15 in current
+ implementation)
+
+Mon May 17 10:13:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (setup_domain_and_type): honor duck typing.
+ [ruby-dev:23522]
+
+ * ext/socket/socket.c (sock_s_getnameinfo): ditto.
+
+Mon May 17 00:36:21 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * 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
+ single-, or double-quoted.
+
+ * ext/syck/syck.c: ditto.
+
+ * ext/syck/gram.c: ditto.
+
+ * ext/syck/node.c: ditto.
+
+ * ext/syck/token.c: ditto.
+
+ * ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
+ if scalar style is plain.
+
+ * test/yaml/test_yaml.rb (test_perl_regexp): updated test to
+ match new regexp serialization.
+
+Sat May 15 01:41:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (eval): forgot to restore $SAFE value before evaluating
+ compiled node. [ruby-core:02872]
+
+Sat May 15 01:33:12 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * range.c (range_each_func): terminates loop if generating value
+ is same to @end. [ruby-talk:100269]
+
+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>
+
+ * 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>
+
+ * util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
+ [ruby-dev:23498]
+
+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>
+
+ * ext/syck/rubyext.c (yaml_org_handler): some empty strings were
+ loaded as symbols.
+
+Thu May 13 11:04:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * pack.c (pack_pack): always add with null for 'Z'.
+
+ * pack.c (pack_unpack): terminated by null for 'Z'. [ruby-talk:98281]
+
+Wed May 12 19:59:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
+ [ruby-talk:99788]
+
+Wed May 12 17:41:42 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/resolv.rb (Resolv::DNS::Config): make it configurable without
+ external file such as /etc/resolv.conf.
+
+Wed May 12 14:37:27 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_x509name.c: attribute value of DC (short name of
+ domainComponent) should be IA5String.
+
+Wed May 12 13:20:19 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk/composite.rb: improve configure methods (based on
+ the proposal of [ruby-talk:99671]).
+
+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
+ looking up symbols in HTML generator.
+
+Mon May 10 16:45:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (eval): warning during eval should not cause deadlock.
+ [ruby-talk:98651]
+
+ * eval.c (rb_eval): raise TypeError exception for superclass
+ mismatch. [ruby-list:39567]
+
+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
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
+ hostname.
+
+Thu May 6 22:09:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+
+Thu May 6 14:22:29 2004 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
+ for Ranges, Strings, Structs, Regexps.
+
+ * lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
+ String's flow style.
+
+ * lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
+
+ * 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.
+
+ * lib/net/imap.rb (body_type_basic): allow body-fields omissions.
+
+Thu May 6 01:59:04 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
+ 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>
+
+ * lib/rinda/ring.rb: use recv instead of recvfrom.
+
+Wed May 5 00:38:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/gserver.rb: documented
+ * lib/xmlrpc/README.txt: introduced for documentation purposes
+
+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
+
+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>
+
+ * common.mk: LIBURUBY_A is needed for extconf.rb even when
+ cross-compiling.
+
+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>
+
+ * lib/yaml/rubytypes.rb: passing Range tests.
+
+ * ext/syck/syck.h: version 0.44.
+
+ * ext/syck/gram.c: transfers no longer open an indentation.
+ fixed transfers which precede blocks.
+
+ * ext/syck/token.c: ditto.
+
+ * ext/syck/syck.c: fixed segfault if an anchor has been released already.
+
+ * ext/syck/node.c (syck_free_members): organized order of free'd nodes.
+
+ * ext/syck/rubyext.c (syck_emitter_write_m): test for proper string with
+ StringValue.
+
+Mon Apr 26 23:56:54 2004 Daniel Kelley <news-1082945587@dkelley.gmp.san-jose.ca.us>
+
+ * README.EXT, README.EXT.ja: fixed wrong function signature.
+ [ruby-talk:98349]
+
+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>
+
+ * 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.
+
+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>
+
+ * parse.y (stmt, arg, aref_args): should not make sole splat into
+ array, in aref_args other than aref with op_asgn.
+
+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]
+
+ * parse.y (aref_args): should pass expanded list. [ruby-core:02793]
+
+Thu Apr 22 01:12:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * numeric.c (flo_to_s): tweak output string based to preserve
+ decimal point and to remove trailing zeros. [ruby-talk:97891]
+
+ * 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>
+
+ * lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
+
+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
+ of key-value set. [ruby-talk:97559]
+
+ * 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>
+
+ * 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.
+
+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 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]
-Sun Jul 31 23:06:57 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+Fri Apr 16 12:38:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm.c (check_env): print debug messages to stderr.
- [Feature #4871] [ruby-dev:43743]
+ * 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>
+
+ * 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>
+
+ * 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 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>
+
+ * 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>
+
+ * 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>
+
+ * bcc32/Makefile.sub (PHONY): Borland make disallows empty command
+ rules.
+
+Tue Apr 13 17:55:16 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (begin_transport): should not overwrite HTTP
+ request header. [ruby-list:39543]
+
+Tue Apr 13 16:48:00 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/pop.rb: merge POP3S patch. This patch is contributed by
+ Daniel Hobe.
+
+Tue Apr 13 02:56:29 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
+
+ * common.mk: changed the order of ascii.c alphabetically.
+
+Mon Apr 12 19:11:21 2004 Eric Hodel <drbrain@segment7.net>
+
+ * gc.c (rb_gc_copy_finalizer): typo. [ruby-core:02774]
+
+Mon Apr 12 18:45:58 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
+ a value.
+
+Mon Apr 12 10:39:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * dir.c (rb_glob2, rb_glob, push_globs, push_braces, rb_push_glob):
+ fix memory leak. (leaked when block was interrupted)
+
+Sun Apr 11 19:10:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (require_libraries): restore source file/line after
+ statically linked extensions initialized. [ruby-dev:23357]
+
+Sun Apr 11 10:47:04 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
+ classes and modules are a special case too... (handle extending existing
+ classes with or without :enddoc:)
+
+Sat Apr 10 23:51:13 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
+ made one too many assumptions...
+
+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>
+
+ * lib/rinda/rinda.rb: fix hash tuple bug.
+
+ * lib/rinda/tuplespace.rb: ditto.
+
+ * test/rinda/test_rinda.rb
+
+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>
+
+ * configure.in: check the size of time_t.
+
+ * time.c (time_add): new function.
+ (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.
+
+ * 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]
-Sun Jul 31 22:50:23 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+ * eval.c (error_print): should no call "to_str" anymore use
+ "message" method instead.
- * vm.c (vm_make_env_each): don't save prev env value.
- It is no longer used. [Feature #4871] [ruby-dev:43743]
+ * io.c (rb_f_open): Kernel#open() calls "to_open" if the first
+ argument responds to it. [Ruby2]
- * vm.c (check_env): changed accordingly.
+Tue Apr 6 00:13:43 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Sun Jul 31 20:21:36 2011 "Yuki Sonoda (Yugui)" <yugui@yugui.jp>
+ * lib/rinda/rinda.rb: add require 'drb/drb'
- * common.mk (ECHO1): ":" in a make variable replacement cause a syntax
- error with /usr/ccs/bin/make on Solaris. Uses $(NULLCMD) instead.
+Mon Apr 5 22:25:32 2004 Tanaka Akira <akr@m17n.org>
- * configure.in (NULLCMD): new check.
+ * test/zlib/test_zlib.rb: new file.
+ (TestZlibGzipWriter#test_new_nil): test for [ruby-dev:23228].
- * Makefile.in (NULLCMD): Reflects checking in configure.
+Mon Apr 5 22:16:23 2004 Minero Aoki <aamine@loveruby.net>
- * win32/Makefile.sub (NULLCMD): new assignment.
+ * parse.y (assoc_list): {a: 1, b: 2} should be allowed.
+ [ruby-dev:23328]
-Sun Jul 31 18:58:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Apr 5 19:43:40 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
- * io.c (rb_pipe): pipe on cygwin can succeed half but fail
- half.
+ * regexec.c: imported Oni Guruma 2.2.6.
-Sun Jul 31 11:31:07 2011 Kazuki Tsujimoto <kazuki@callcc.net>
+Mon Apr 5 19:39:10 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
- * vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208]
+ * regparse.c, oniguruma.h: imported Oni Guruma 2.2.6.
-Sun Jul 31 09:18:28 2011 Eric Hodel <drbrain@segment7.net>
+Mon Apr 5 12:12:09 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * lib/rdoc: Update to RDoc 3.9. Fixed `ri []`, stopdoc creating an
- object reference, nodoc for class aliases, verbatim === lines.
+ * ext/socket/socket.c (raise_socket_error): some platforms don't have
+ EAI_SYSTEM.
-Sun Jul 31 01:29:08 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Apr 5 08:18:23 2004 Dave Thomas <dave@pragprog.com>
- * io.c (rb_io_each_byte): remove unused variable e.
+ * lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
+ references work properly.
-Sat Jul 31 01:23:45 2011 Kenta Murata <mrkn@mrkn.jp>
+Sun Apr 4 14:01:20 2004 Dave Thomas <dave@pragprog.com>
- * test/bigdecimal/test_bigdecimal.rb (test_version): removed.
+ * lib/rdoc/options.rb (Options::parse): Allow multiple -x options to
+ RDoc. Fix bug where files weren't being excluded properly
-Sat Jul 30 23:19:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 3 09:36:38 2004 why the lucky stiff <why@ruby-lang.org>
- * defs/default_gems: separate from tool/rbinstall.rb.
+ * ext/syck/syck.h: version 0.43.
-Sat Jul 30 23:14:44 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 3 08:28:47 2004 why the lucky stiff <why@ruby-lang.org>
- * io.c (rb_io_each_byte): rbuf can be refreshed during yield.
- [Bug #5119]
+ * ext/syck/lib/gram.c: allow root-level inline collections.
+ [ruby-talk:94922]
-Sat Jul 30 22:35:50 2011 Naohisa Goto <ngotogenome@gmail.com>
+ * lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
+ [ruby-talk:94930]
- * strftime.c (NEEDS): avoid SEGV due to integer overflow in
- sparc-solaris2.10 and i686-linux. fix [Bug #4456] [ruby-dev:43284]
+Fri Apr 2 19:28:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 30 17:26:26 2011 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * bcc32/Makefile.sub (OUTFLAG): needed for static-linked-ext.
- * test/win32ole/test_win32ole_variant.rb: use skip method to skip the test.
+Fri Apr 2 18:00:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/win32ole/test_win32ole_variant_outarg.rb: ditto.
+ * ext/extmk.rb (extmake): extract necessary variables for static link
+ from Makefile.
-Sat Jul 30 14:27:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * lib/mkmf.rb (create_makefile): save preload and libpath for next
+ compile.
- * ext/bigdecimal/bigdecimal.c (BigDecimal_version): version 1.1.0.
+Fri Apr 2 17:27:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/bigdecimal/bigdecimal.gemspec: turn into a default gem.
+ * eval.c (top_include): include in the wrapped load is done for
+ the wrapper, not for a singleton class for wrapped main.
+ [ruby-dev:23305]
- * tool/rbinstall.rb: ditto.
+Fri Apr 2 15:13:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jul 30 11:21:55 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * bignum.c (rb_big_eq): use temporary double variable to save the
+ result (internal float register may be bigger than 64 bits, for
+ example, 80 bits on x86). [ruby-dev:23311]
- * vm_core.h (ALT_STACK_SIZE): use MINSIGSTKSZ*2 instead of SIGSTKSZ*2.
- [ruby-core:38607]
+Fri Apr 2 14:35:26 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jul 30 10:39:14 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * eval.c (block_pass): should generate unique identifier of the
+ pushing block. [ruby-talk:96363]
- * vm.c (th_init): preallocate alternative stack.
- NoMemoryError is better than rb_bug, of course.
- Patch by Eric Wong. [ruby-core:38572][ruby-core:38594].
+Fri Apr 2 11:36:20 2004 Minero Aoki <aamine@loveruby.net>
- * signal.c (rb_register_sigaltstack): ditto.
+ * eval.c (Init_load): make $LOADED_FEATURES built-in.
+ [ruby-dev:23299]
- * vm_core.h: moved ALT_STACK_SIZE definition from signal.c.
- * vm.c (thread_free): use xfree() instead of free().
+ * ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
-Sat Jul 30 07:20:49 2011 Tanaka Akira <akr@fsij.org>
+ * lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
- * ext/socket/lib/socket.rb (udp_server_sockets): unused variable
+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>.
+
+Thu Apr 1 22:55:33 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb: Allow rdoc comments in
+ =begin rdoc/=end
+
+ * lib/rdoc/parsers/parse_rb.rb: Fix problem with comment in
+ top-level method being taken as file comment.
+
+Thu Apr 1 22:55:04 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
+
+Thu Apr 1 19:58:37 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
+ object with soap/marshal.
+ added URIFactory class for URI mapping. BasetypeFactory checks
+ instance_variables when original mapping is not allowed (ivar must
+ be empty). Instance of URI have instance_variables but it must be
+ llowed whenever original mapping is allowed or not.
+
+Wed Mar 31 19:06:23 2004 Tanaka Akira <akr@m17n.org>
+
+ * time.c (year_leap_p): new function.
+ (timegm_noleapsecond): ditto.
+ (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>
+
+ * lib/delegate.rb (DelegateClass): define internal methods of the
+ result class, but not metaclass of the caller. [ruby-talk:96156]
+
+ * intern.h: provide proper prototypes. [ruby-core:02724]
+
+ * 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>
+
+ * lib/net/pop.rb (auth): failed when account/password include "%".
+ [ruby-talk:95933]
+
+Sat Mar 27 21:40:41 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb: permit extra semicolon in content-type field.
+
+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.
+
+ * sample/openssl/gen_csr.rb: fixed wrong usage text.
+
+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,
+ which dumps our all known names
+
+Thu Mar 25 03:57:47 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
+ allow nested classes to be designated using "."--you must
+ now use "::"
+
+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>
+
+ * lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
+ * lib/uri/common.rb: Ditto.
+ * lib/uri/ftp.rb: Ditto.
+ * lib/uri/generic.rb: Ditto.
+ * lib/uri/http.rb: Ditto.
+ * lib/uri/https.rb: Ditto.
+ * lib/uri/ldap.rb: Ditto.
+ * lib/uri/mailto.rb: Ditto.
+
+Wed Mar 24 18:48:05 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.
+
+Wed Mar 24 12:32:56 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_class_module):
+ Don't document methods if we don't know for sure the
+ class or module.
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
+ Don't store documentation for singleton classes if we
+ don't know the real class.
+
+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.
+
+ * 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.
- patch by Jeremy Evans. [ruby-core:38600]
-Fri Jul 29 23:56:32 2011 Tanaka Akira <akr@fsij.org>
+ * 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.
+
+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.
+
+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.
+
+Sat Mar 20 23:51:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * eval.c (rb_require_safe): preserve old ruby_errinfo.
+ [ruby-talk:95409]
+
+ * 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>
+
+ * 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 18:50:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb: no longer embed srcdir and compile_dir into
+ rbconfig.rb.
+
+ * ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
+ paths.
+
+Thu Mar 18 17:46:35 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: do not undef :to_a.
+
+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.
+
+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.
+
+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.
+
+ * ruby.c (ruby_init_loadpath): buffer for path name should have
+ MAXPATHLEN.
+
+ * 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]
+
+Wed Mar 10 22:26:25 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]
+
+Wed Mar 10 16:28:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (return_jump): set return value to the return
+ destination. separated from localjump_destination().
+
+ * eval.c (break_jump): break innermost loop (or thread or proc).
+
+ * 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-ruby@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>
+
+ * 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>
+
+ * dir.c (range): treat incomplete '[' as ordinary character (like
+ has_magic does). fix buffer overrun at incomplete escape like '[\'.
+
+Mon Mar 8 13:35:32 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * regparse.c (parse_exp): need to separate initialization for bcc32.
+ [ruby-dev:23169]
+
+ * 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.
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use
+ :RequestCallback and warn if :RequestHandler is in server's option.
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print
+ error message for WEBrick::HTTPSataus::Error.
+
+ * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
+ lookup for hostname from :ServerAlias if the req.host is not match
+ to :ServerName.
+
+ * lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
+ use $?.exitstatus and refine log message.
+
+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>
+
+ * 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
+ 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>
+
+ * 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):
+ Allow aliases to have parentheses
+
+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>
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * lib/cgi-lib.rb, lib/getopts.rb, lib/importenv.rb, lib/parsearg.rb:
+ warn with caller position.
+
+ * 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.
+
+Tue Feb 24 18:42:03 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
+ heuristics on which files to include and exclude. Now only include
+ non-standard files if they are explicitly named in ARGV.
+
+Tue Feb 24 07:23:30 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb: Deal with :stopdoc: when
+ choosing a default main page to display (ie. don't select a page
+ if we don't have documentation for it).
+
+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
+ aliases in C files.
+
+Tue Feb 24 06:16:22 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
+ parsing files.
+
+Tue Feb 24 06:08:47 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
+ Start collecting text of constant values earlier: was missing
+ values in output if there was no space after '='
+
+Tue Feb 24 06:08:25 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb: Escape contant values.
+
+Tue Feb 24 03:45:06 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_config.c (ossl_config_each): add new method
+ OpenSSL::Config#each. it iterates with section name, field name
+ and value.
+
+ * 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.
+
+ * 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]
+
+ * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: terminate options.
+
+ * 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>
+
+ * re.c: corrected documentation format (rb_reg_initialize_m)
+
+Sat Feb 21 22:41: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>
+
+ * 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>
+
+ * lib/ostruct.rb: documented
+
+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>
+
+ * 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)
+
+Thu Feb 19 18:08:18 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 02:37:28 2004 Minero Aoki <aamine@loveruby.net>
+
+ * ext/strscan/strscan.c: merge documentation from 1.8 branch.
+ Thanks Gavin Sinclair.
+
+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
+
+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>
+
+ * lib/drb/unix.rb: remove O_NONBLOCk, thanks \ay
+
+Wed Feb 18 22:42:19 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * test/rinda/test_rinda.rb: improt test_rinda.rb
+
+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.
+
+Tue Feb 17 23:40:34 2004 Guy Decoux <ts@moulon.inra.fr>
+
+ * sprintf.c (rb_f_sprintf): preserve original val for
+ format_integer. [ruby-talk:92975]
+
+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.
+
+ * test/soap/marshal/test_marshal.rb: ditto.
+
+ * test/soap/marshal/cmarshal.rb: removed (not used).
- * lib/securerandom.rb: call OpenSSL::Random.seed at the
- SecureRandom.random_bytes call.
- based on the patch by Masahiro Tomita. [ruby-dev:44270]
+Tue Feb 17 19:34:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jul 29 23:53:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.
- * array.c (rb_ary_set_len): new function to set array length.
+ * ext/extmk.rb (extmake): remove compile directory if empty.
- * vm_eval.c (method_missing): set the length of argv array, to mark
+ * 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.
+
+ * ext/strscan/strscan.c: #empty? is obsolete, use #eos?.
+
+ * ext/strscan/strscan.c: #clear is obsolete, use #terminate.
+
+ * ext/strscan/strscan.c: #getbyte is obsolete, use #get_byte.
+
+Tue Feb 17 12:12:47 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (parse_args): delay expanding $(extout) until invoking
+ make.
+
+ * lib/mkmf.rb (CLEANLIBS): should remove files have specific
+ extensions.
+
+Tue Feb 17 11:33:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rss/rexmlparser.rb: REXML version may be 4 digits.
+
+Tue Feb 17 10:45:59 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+
+Tue Feb 17 07:48:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rexml/encodings/SHIFT_JIS: wrong library name.
+
+Tue Feb 17 01:35:28 2004 Tanaka Akira <akr@m17n.org>
+
+ * 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.
+
+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>
+
+ * 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>
+
+ * 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.
+
+ * lib/mkmf.rb (create_makefile): now don't need to remove
+ $(TARGET).lib.
+
+Mon Feb 16 15:45:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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.
- * vm_eval.c (rb_apply): get rid of too large alloca.
+ * win32/win32.c (rb_w32_join_argv): join arguments with quoting.
-Fri Jul 29 20:48:39 2011 Tanaka Akira <akr@fsij.org>
+ * win32/win32.c (rb_w32_pipe_exec, rb_w32_spawn, rb_w32_aspawn):
+ accept program name adding to command line.
- * ext/socket/mkconstants.rb: fix typos.
+Mon Feb 16 15:18:33 2004 Minero Aoki <aamine@loveruby.net>
-Fri Jul 29 20:28:56 2011 Tanaka Akira <akr@fsij.org>
+ * lib/racc/parser.rb: add note for Racc full package.
- * ext/socket/mkconstants.rb: use whitespaces as a separator.
+Mon Feb 16 15:13:01 2004 Minero Aoki <aamine@loveruby.net>
-Fri Jul 29 18:59:07 2011 Tanaka Akira <akr@fsij.org>
+ * ext/racc/cparse/README: new file.
- * ext/socket/mkconstants.rb: add documents for constants.
- patch by Eric Hodel. [ruby-core:37853] [Bug #4989]
+ * ext/racc/cparse/MANIFEST: add README.
-Fri Jul 29 16:00:43 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Mon Feb 16 12:29:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * configure.in (enable_pthread): use -pthread on OpenBSD without
- explicit option. patched by Jeremy Evans. [ruby-core:38572]
+ * ext/iconv/iconv.c (iconv_s_list): new method Iconv.list
+ (libiconv only).
-Thu Jul 28 23:36:28 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+Mon Feb 16 10:29:52 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of
- xmalloc() to allocate an array for arguments of callback procedure,
- to prevent arguments from being swept by GC. [ruby-core:38546]
- [Bug #4929]
+ * 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())
-Thu Jul 28 22:36:06 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Mon Feb 16 02:14:29 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
- * ext/openssl/ossl_cipher.c (ossl_cipher_initialize): Avoid possible
- SEGV from AES encryption/decryption. Processing data by
- Cipher#update without initializing key (meaningless usage of Cipher
- object since we don't offer a way to export a key) could cause SEGV.
+ * bcc32/Makefile.sub: should warn suspicious pointer conversion.
- In OpenSSL, the EVP which has EVP_CIPH_RAND_KEY flag (such as DES3)
- allows uninitialized key, but other EVPs (such as AES) does not
- allow it. Calling EVP_CipherUpdate() without initializing key causes
- SEGV so we set the data filled with "\0" as the key by default. See
- #2768.
+ * bcc32/setup.mak: ditto.
- * test/openssl/test_cipher.rb: test it.
+Sun Feb 15 20:56:22 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Jul 28 14:25:08 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * dir.c (push_braces): remove wrong const. [ruby-dev:22891]
- * lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): typo.
+Sun Feb 15 20:41:15 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Thu Jul 28 12:32:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * 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.
- * ext/dl/callback/mkcallback.rb (gencallback): use PTR2NUM.
+ * sample/soap/calc/samplehttpd.conf,
+ sample/soap/exchange/samplehttpd.conf,
+ sample/soap/sampleStruct/samplehttpd.conf,
+ sample/wsdl/googleSearch/samplehttpd.conf: added.
- * ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer
- dereference.
+Sun Feb 15 19:13:33 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall.
+ * lib/rinda/tuplespace.rb: read(tpl,0), raise RequestExpiredError
+ if not found.
- * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition.
+Sun Feb 15 15:48:57 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-Thu Jul 28 04:53:31 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
+ Thanks, arton.
- * lib/delegate.rb: Move file-level documentation to the appropriate
- classes.
+Sun Feb 15 15:23:29 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-Thu Jul 28 02:15:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.h, dir.c (rb_glob): add const.
- * ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark):
- workaround to mark wrapped object. this is not a true fix,
- because [Bug #4929] is caused by the interface design of DL.
+Sun Feb 15 01:46:05 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-Thu Jul 28 00:28:15 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
+ [ruby-dev:22870]
- * test/fileutils/test_fileutils.rb: add OpenBSD case.
- patched by Jeremy Evans [ruby-core:38530] see #5097
+Sat Feb 14 23:59:11 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/ruby/test_process.rb: ditto.
+ * mkconfig.rb: use fileutils.rb instead of ftools.rb.
-Wed Jul 27 22:46:59 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+ * bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
+ STACK_GROW_DIRECTION.
- * test/rinda/test_rinda.rb (test_remote_array_and_hash):
- add local variables to protect objects from GC. [ruby-dev:44253]
- [Bug #5104]
+ * bcc32/Makefile.sub (config.h): add newer checks.
-Wed Jul 27 17:55:54 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
- * include/ruby/missing.h: define __syscall if the platform has
- __syscall in the library but doesn't define it in headers
- for example Mac OS X.
+Sat Feb 14 23:26:27 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-Wed Jul 27 15:39:14 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/un.rb: use OptionParser instead of getopts.
- * object.c: Add usage documentation for BasicObject. Based on patch
- by Thomas Sawyer. [Ruby 1.9 - Bug #5067]
+Sat Feb 14 11:28:14 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Wed Jul 27 12:24:17 2011 Eric Hodel <drbrain@segment7.net>
+ * sample/drb/*: import lib/drb/sample
- * lib/rubygems/uninstaller.rb: Add missing require and update
- messaging to avoid confusion with uninstall --format-executable.
- [Ruby 1.9 - Bug #4062]
+Sat Feb 14 11:14:12 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-Wed Jul 27 09:34:24 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/drb/drb.rb: add pretty_print, thanks gotoken.
- * lib/rubygems: Update to RubyGems 1.8.6.1.
+Fri Feb 13 21:51:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-Wed Jul 27 09:27:59 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * lib/fileutils.rb: slighly improved documentation (sync with 1.8)
- * test/openssl/test_pkcs12.rb: Add test and intermediate certificates.
- [ Ruby 1.9 - Feature #3793 ] [ruby-core:32088]
+Fri Feb 13 19:57:01 2004 Kouhei Sutou <kou@cozmixng.org>
-Wed Jul 27 01:05:32 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * test/rss/test_trackback.rb: added tests for TrackBack with RSS
+ 2.0.
- * eval_error.c (rb_print_undef_str): new function to raise
- NameError for undefined method.
+ * test/rss/common.rb: added methods make RSS 2.0.
- * load.c (rb_mod_autoload_p), object.c (rb_mod_const_get),
- variable.c (rb_f_untrace_var, set_const_visibility), vm_method.c
- (rb_mod_{remove,undef,alias}_method, set_method_visibility):
- remove inadvertent symbol creation. based on the first patch by
- Jeremy Evans at [ruby-core:38447]. [Feature #5089]
+ * lib/rss/trackback.rb: TrackBack API is decided.
- * vm_method.c (obj_respond_to): fix the respond_to_missing? override
- case. based on the patch by Jeremy Evans at [ruby-core:38417].
- [Feature #5072]
+ * lib/rss/rss.rb: RSS::VERSION 0.0.7 -> 0.0.8.
- * parse.y (rb_check_id): make the given name a symbol or a string.
- based on the second patch by Jeremy Evans at [ruby-core:38447]
+ * lib/rss/parser.rb, lib/rss/rss.rb: replaced $DEBUG by RSS::DEBUG.
-Wed Jul 27 00:50:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * lib/rss/2.0.rb: removed RSS 2.0 URI. Because RSS 2.0 doesn't
+ have URI.
- * ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
- zero or negative precision is error. fixes #5098.
- [ruby-dev:44210]
+Fri Feb 13 14:41:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * test/bigdecimal/test_bigdecimal_util.rb: add test for the above
- change.
+ * ext/tk/lib/tk.rb: en-bugged at last commit (Feb 11 23:24:22 2004)
-Wed Jul 27 00:48:00 2011 Kenta Murata <mrkn@mrkn.jp>
+Fri Feb 13 12:26:37 2004 Minero Aoki <aamine@loveruby.net>
- * ext/bigdecimal/lib/bigdecimal/util.rb (Float#to_d): modified for
- specifying precision. fixes #5098. [ruby-dev:44210]
+ * test/fileutils/test_fileutils.rb: rescue SystemCallError instead
+ of EINVAL. File.link may raise EACCES on network file systems.
- * test/bigdecimal/test_bigdecimal_util.rb: add test for the above
- change.
+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>
+
+ * 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>
+
+ * lib/net/protocol.rb (WriteAdapater#puts): must append "\n" to
+ the string, don't prepend. (ruby-bugs:PR#1280)
+
+Thu Feb 12 20:31:43 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.
+
+ * lib/pp.rb: ditto.
+
+ * lib/time.rb: ditto.
+
+ * 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>
+
+ * 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/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
+ added tests. [ruby-core:02306] [ruby-core:02311]
+
+Sun Feb 8 14:24:35 2004 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (HTTP#request): should not overwrite Connection
+ header. (ruby-bugs:PR#1274)
+
+Sun Feb 8 10:11:21 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * dir.c (glob_helper): Dir.glob('**/') did not work. [ruby-dev:22832]
+
+Sun Feb 8 00:29:26 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
+ [ruby-dev:22815]
+
+ * dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
+ [ruby-dev:22819]
+
+ * dir.c: Did some styles (no change to behavior)
+
+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]
+
+Fri Feb 6 22:48:16 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb (gen_url): Support
+ https in RDoc hyperlinks
+
+Fri Feb 6 22:41:22 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
+ commit. [ruby-dev:22813]
+
+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.
+
+Thu Feb 5 23:56:55 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/prettyprint.rb (PrettyPrint#seplist): added.
+
+ * lib/pp.rb (PPMethods#pp_object): use seplist.
+ (PPMethods#pp_hash): ditto.
+ (Array#pretty_print): ditto.
+ (Struct#pretty_print): ditto.
+ (MatchData#pretty_print): ditto.
+
+ * 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.
+ (test_S): ditto.
+ (test_b): ditto.
+ (test_c): ditto.
+ (test_suid): ditto.
+ (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>
+
+ * parse.y (block_append, new_evstr, void_expr0): remove no longer used
+ labels.
+
+Mon Feb 2 18:45:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * dln.c (dln_load): don't specify RTLD_GLOBAL on Interix,
+ because it caused SEGV when running runner.rb.
+
+Mon Feb 2 01:54:00 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/pp.rb (Struct#pretty_print): make it 1.8 style.
+ (Numeric#pretty_print, FalseClass#pretty_print)
+ (TrueClass#pretty_print, Module#pretty_print): fix pp for objects
+ with instance variables. [ruby-talk:91157]
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
+ address.
+
+ * lib/resolv-replace.rb (BasicSocket#send): don't replace because
+ it has no hostname argument.
+ (IPSocket.getaddress): raise SocketError instead of
+ Resolv::ResolvError for errors.
+ (TCPSocket#initialize, UDPSocket#bind, UDPSocket#connect)
+ (SOCKSSocket#initialize): use IPSocket.getaddress instead of
+ Resolv.getaddress.
+ (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>
+
+ * ext/bigdecimal.c: Bug in BigDecimal("1e#{n}").add BigDecimal('.5'),n)
+ reported and fixed by Javier Goizueta.
+
+Sun Feb 1 18:21: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.
+
+Sun Feb 1 05:30:06 2004 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
+ 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 02:28:15 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (RPATHFLAG): set to -Wl,-R like NetBSD on Interix.
+
+Sat Jan 31 01:09:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/logger.rb: leading 0 padding of timestamp usec part.
+
+Fri Jan 30 18:53:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (KR_REHASH): wrong hash value on sizeof(long) > sizeof(int).
+
+Thu Jan 29 23:11:57 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (DLEXT2): removed. Ruby does not treat
+ ".dll" as a extension library anymore.
+
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub (DLEXT2):
+ ditto.
+
+ * util.c (mblen): fix overrun. [ruby-dev:22672]
+
+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>
-Wed Jul 27 00:45:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * lib/net/http.rb (Request#initialize): reject only when a path is
+ empty. [ruby-dev:22771]
- * ext/bigdecimal/lib/bigdecimal/util.rb (Integer#to_d): added
- for symmetry to BigDecimal() function with an Integer.
- fixes #5098. [ruby-dev:44210]
+Thu Jan 29 18:54:08 2004 H.Yamamoto <ocean@m2.ccsnet.ne.jp>
- * test/bigdecimal/test_bigdecimal_util.rb: add test for the above
+ * 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.
+
+ * 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>
+
+ * test/rss/*.rb: remove "test/" prefix.
+
+Wed Jan 28 13:07:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]
+
+Wed Jan 28 12:43:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/rss: rss library imported. [ruby-dev:22726]
+
+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>
+
+ * 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>
+
+ * ext/win32ole/win32ole.c (set_argv): fix condition.
+
+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.
+
+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>
+
+ * lib/weakref.rb (WeakRef::initialize): set up @__id before
+ calling "super".
+
+ * lib/delegate.rb (Delegator::initialize): preserve
+ singleton_method_added method [ruby-dev:22685]
+
+ * 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>
+
+ * ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
+
+Mon Jan 26 11:30:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
+ (ruby-bugs:PR#1256)
+
+ * 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>
+
+ * 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>
+
+ * lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
+ * lib/drb/extserv.rb: typo
+
+Wed Jan 21 17:57:56 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (envelope): allow NIL.
+ * lib/net/imap.rb (body): ditto.
+ * lib/net/imap.rb (number): ditto.
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
+ of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
+
+Tue Jan 20 14:43:17 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/base64.rb: Add RDoc
+
+Tue Jan 20 14:25:51 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/abbrev.rb: Add RDoc
+
+Tue Jan 20 13:22:39 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb: Document aliases at
+ top-most level.
+
+ * 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.
+
+ * eval.c (rb_method_missing): use hidden constant.
+
+Mon Jan 19 16:30:53 2004 akira yamada <akira@ruby-lang.org>
+
+ * test/ruby/test_time.rb: added tests for [ruby-dev:22614] and
+ [ruby-dev:22617].
+
+Mon Jan 19 13:09:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/extmk.rb, win32/Makefile.sub, win32/configure.bat,
+ win32/setup.mak: --with-static-linked-ext support on mswin32.
+
+Mon Jan 19 06:49:07 2004 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date.rb: zone was wrong when it was behind UTC.
+ Thanks Mark J. Reed.
+
+ * lib/date/format.rb: %z is now always replaced by four digits
+ with a leading plus or minus sign.
+
+ * 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.
+
+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>
+
+ * 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>
+
+ * 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>
+
+ * 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]
+
+ * ruby.h (rb_class_of): reduce branch. [ruby-dev:22577]
+
+ * ruby.h (rb_type): ditto.
+
+Tue Jan 13 14:26:59 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>
+
+ * 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):
+ Someone changed the "// in eval.c" comments to "/*...*/" style,
+ so the parsing of the source file name broke.
+
+ * object.c: Remove spurious space in TrueClass documentation.
+
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Fix
+ bad regexp: if the code before a documented method contained
+ a comment that wasn't terminated by whitespace, that comment
+ and all intervening code was included in the following
+ method's documentation.
+
+ * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
+ HTML formats need explicit line breaks.
+
+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]
+
+Sun Jan 11 02:35:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (make_hostent): a bug in brace position.
+
+ * configure.in: install rdoc by default. if you do not want to
+ install rdoc, specify --disable-install-doc.
+
+Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+ Also accept command line options via the 'RI' environment variable.
+
+Sat Jan 10 21:27:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (eval): need to add message delimiter. [ruby-dev:22561]
+
+Sat Jan 10 01:54:50 2004 Eric Sunshine <sunshine@sunshineco.com>
+
+ * defines.h (__NeXT__): Ensure that all standard S_IRUSR, S_IWGRP,
+ S_IRWXO, etc. macros are defined since future code might require
+ them (even though present code only requires a subset).
+
+ * defines.h (__NeXT__): Bug fix: WORDS_BIGENDIAN was not being set
+ 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>
+
+ * lib/mkmf.rb (libpathflag): use single quotes. [ruby-dev:22440]
+
+Thu Jan 8 23:49:21 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (RDOCTARGET): new macro. if you want to install
+ rdoc documentation, you need to run configure with
+ --enable-install-doc.
+
+Thu Jan 8 21:17:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
+ public key only.
+
+ * ext/openssl/ossl_pkey_dh.c (ossl_dh_to_der): new function for
+ OpenSSL::PKey::DH#to_der.
+
+ * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_to_der): new function for
+ OpenSSL::PKey::DSA#to_der.
+
+ * 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
+ dumps "E" at month-end.
+
+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>
+
+ * 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
+ being too eager to find matches of ambiguous method
+ names (such as "ri Thread.join" would return both
+ Thread.join and ThreadsWait.join)
+
+Wed Jan 7 12:35:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/debug.rb: revert command parse regexps. [ruby-list:39014] by
+ Shirai,Kaoru.
+
+Wed Jan 7 08:21:04 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parserfactory.rb: Check for shebang
+ line in files that would otherwise be treated as
+ plain text.
+
+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>
+
+ * 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
+
+ * lib/.document: Update with list of files that seem to have
+ documentation
+
+ * lib/test/unit.rb: Reorder comment to make it RDoc friendly.
+
+ * Makefile.in: add install-nodoc target, and make it
+ generate RDoc on default install.
+
+ * lib/rdoc/ri/ri_options.rb (RI::Options::parse): Add
+ --doc-dir option to ri.
+
+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
+ help messages to be paged too.
+
+ * bin/rdoc: Add statistics.
+
+ * process.c: (MG) Added Process documentation
+
+ * lib/rdoc/ri/ri_formatter.rb (RI::AttributeFormatter::wrap):
+ Fix problem with labels not displaying in RI labeled
+ lists using BS and ANSI modes.
+
+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
+ file referenced in "// in sss.c" relative to current file.
+
+Wed Dec 31 11:17:37 2003 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/generators/html_generator.rb: Fix problem when
+ a public method was aliased, but the alias is then
+ made private, and hence doesn't appear in RDoc output.
+
+Wed Dec 31 01:33:05 2003 Dave Thomas <dave@pragprog.com>
+
+ * array.c, error.c, eval.c, io.c, prec.c, range.c, re.c,
+ string.c, time.c: Add RDoc for Kernel functions, and tidy.
+
+Tue Dec 30 19:39:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_f_readline): should raise EOFError at the end of
+ files. [ruby-dev:22458]
+
+ * io.c (argf_read): should concatenate input files when length
+ argument is nil. [ruby-dev:22450]
+
+ * io.c (argf_read): should update supplied string buffer (2nd
+ argument) even when IO#read is called multiple times.
+
+ * io.c: should initialize lineno by zero. [ruby-dev:22460]
+
+Tue Dec 30 12:30:30 2003 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a
+ class and a method have the same name, finding Xxx.abc was trying
+ to find 'abc' in method 'Xxx', not class 'Xxx'.
+
+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
+
+Tue Dec 30 07:30:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/pathname.rb: Added documentation.
+
+Mon Dec 29 20:08:17 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (GenericRequest#initialize): check if path
+ begins with '/'.
+
+ * lib/net/http.rb: def m( arg ) -> def m(arg)
+
+Mon Dec 29 12:51:02 2003 Dave Thomas <dave@pragprog.com>
+
+ * eval.c: Add RDoc for Kernel global functions.
+
+Mon Dec 29 11:00:16 2003 Dave Thomas <dave@pragprog.com>
+
+ * array.c: Tidy up RDoc loose ends.
+
+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
+
+Sun Dec 28 20:19:11 2003 Tanaka Akira <akr@m17n.org>
+
+ * ext/stringio/stringio.c (strio_sysread): StringIO.new.sysread didn't
+ raise EOFError.
+
+ * ext/zlib/zlib.c (gzreader_gets): don't increment lineno when
+ gzfile_read_all returns "".
+
+Sun Dec 28 15:25:08 2003 Dave Thomas <dave@pragprog.com>
+
+ * class.c,object.c,parse.y,sprintf.c,variable.c: Document classes
+ Object, Module, etc...
+
+Sun Dec 28 11:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
+ [ruby-talk:88852]
+
+ * test/csv/{bom.csv,mac.csv}: removed.
+
+Sun Dec 28 08:56:51 2003 Dave Thomas <dave@pragprog.com>
+
+ * eval.c: Thead[Group] RDoc (thanks to MG)
+
+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>
+
+ * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
+ Add support for rules in 'ri' output.
+
+Sun Dec 28 01:35:35 2003 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body):
+ Sometimes the Ruby source aliases two otherwise
+ unrelated methods (for example Kernel#object_id and
+ Kernel#hash are both the same C function). Provide a
+ facility to allow the methods to be documented
+ separately.
+
+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>
+
+ * 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.
+
+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>
+
+ * time.c: Add RDoc comments for Time class.
+
+Sat Dec 27 15:07:26 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>
+
+ * numeric.c (Init_Numeric): Add RDoc comments.
+
+Sat Dec 27 00:44:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (next_argv): warn always for stdin on inplace edit mode.
+
+ * io.c (read_all): need to check string value.
+
+ * io.c (argf_read): allow ARGF.read(nil). [ruby-dev:22433]
+
+Fri Dec 26 23:02:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_f_backquote): need not to check nil result.
+ [ruby-core:02078]
+
+ * 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>
+
+ * configure.in: check if getcontext and setcontext are available.
+
+ * eval.c: use presence of getcontext/setcontext.
+
+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>
+
+ * 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>
+
+ * string.c (rb_str_update): don't return any value.
+
+Thu Dec 25 15:30:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_update): call rb_str_modify().
+
+Thu Dec 25 05:08:09 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (search_required): search actual file name once when no
+ extension specified.
+
+Thu Dec 25 04:00:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * stable version 1.8.1 released.
+
+Thu Dec 25 00:17:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * configure.in: check for nanosleep, -lrt if required.
+ [ruby-core:02059]
+
+ * eval.c (thread_timer): use select(2) if nanosleep(2) is not
+ available.
+
+ * eval.c: check __stub_getcontext for glibc on some platforms.
+ [ruby-list:38984]
+
+Wed Dec 24 23:48:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * 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"
+ to express -0.0. [ruby-talk:88786]
+
+Wed Dec 24 23:29:30 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/tsort.rb (test_orphaned_break): removed.
+
+Wed Dec 24 20:53:06 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/tkmulticolumnlist.rb: new sample
+
+ * ext/tk/sample/tkmultilistframe.rb: bug fix
+
+Wed Dec 24 20:37:37 2003 Eric Sunshine <sunshine@sunshineco.com>
+
+ * configure.in (LDSHARED): Fixed typographical error in assignment of
+ LDSHARED for Rhapsody which caused linking of extension modules to
+ fail.
+
+Wed Dec 24 17:51:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (rb_thread_flock): enable thread support again.
+
+Wed Dec 24 16:46:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (catch_timer): do not call rb_thread_schedule() inside to
+ avoid pthread_mutex_lock() deadlock. interrupts to system calls
+ are detected by TRAP_END via EINTR error.
+
+ * eval.c (thread_timer): do not post signal unless it is
+ absolutely necessary.
+
+ * rubysig.h (TRAP_END): add CHECK_INTS to switch thread.
+
+ * regex.c (re_compile_pattern): check if nextp is smaller than
+ pend. [ruby-dev:22372]
+
+ * eval.c (umethod_bind): remove method overridden check.
+ [ruby-dev:22366]
+
+Wed Dec 24 16:13:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_read): should check for error
+ status by SSL_get_error().
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_write): ditto.
+
+Wed Dec 24 14:23:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_read): clear the buffer argument
+ when returning nil. [ruby-dev:22363]
+
+ * test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
+ add buffer argument tests.
+
+Wed Dec 24 14:07:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: Modules are allowed to rescue.
+
+ * lib/test/unit/autorunner.rb: show output_level in order.
+
+ * lib/test/unit/collector/dir.rb: get rid of successive same
+ directories in load path.
+
+ * test/testunit/test_assertions.rb (test_assert_nothing_raised,
+ test_assert_raise): test for modules.
+
+Wed Dec 24 13:43:34 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/imap.rb (authenticate): remove "\n" from base64 encoded
+ strings.
+
+Wed Dec 24 11:26:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/fileutils/test_fileutils.rb: should not create any
+ files or directories in current directory. [ruby-talk:88724]
+
+Wed Dec 24 10:29:53 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_read): never return nil at
+ unlimited read. [ruby-dev:22334]
+
+ * ext/stringio/stringio.c (strio_read): support second
+ argument. [ruby-dev:22350]
+
+Wed Dec 24 09:38:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (arg): should return 0 after error. [ruby-dev:22360]
+
+Wed Dec 24 00:56:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (read_all): do not return nil at the end of file.
+ [ruby-dev:22334]
+
+ * io.c (argf_read): do not depend on nil at eof behavior of
+ IO#read().
+
+ * eval.c (rb_thread_join): dup exception before re-raising it.
+
+ * io.c (rb_io_eof): call clearerr() to prevent side effect. this
+ patch is supplied by Masahiro Sakai <sakai@tom.sfc.keio.ac.jp>.
+ [ruby-dev:22234]
+
+ * pack.c (OFF16): get offset for big endian machines.
+
+ * pack.c (pack_pack): use OFF16 instead of OFF16B.
+ [ruby-dev:22344]
+
+ * pack.c (pack_unpack): ditto.
+
+Tue Dec 23 22:47:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_io_check_readable): set FMODE_RBUF always, even if
+ NEED_IO_SEEK_BETWEEN_RW is not defined. [ruby-dev:22340]
+
+ * io.c (rb_io_check_writable): clear FMODE_RBUF before writing
+ something.
+
+Tue Dec 23 22:25:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/optparse.rb: incomplete RDoc documentation added in place of
+ existing RD comments. Tabs converted to spaces.
+
+Tue Dec 23 19:44:47 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/test_streamhandler.rb (test_basic_auth): removed.
+ soap4r + basic_auth is not officially supported in ruby/1.8.1 even
+ though soap4r + basic_auth + http-access2 should run fine.
+
+Tue Dec 23 19:42:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_ungetc): raise an exception at unread stream to
+ avoid unspecified behavior. [ruby-dev:22330]
+
+ * test/ruby/test_system.rb (test_syntax): glob relatively from
+ __FILE__.
+
+Tue Dec 23 18:09:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * pack.c (pack_pack): remove unnecessary negative value check.
+ [ruby-dev:22329]
+
+Tue Dec 23 17:26:55 2003 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+
+ * bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
+
+Tue Dec 23 16:08:16 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/rexml/encodings/US-ASCII.rb: typo. [ruby-talk:88650]
+
+ * test/ruby/test_system.rb: num of asserts depended on running dir.
+
+ * test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
+ handle euc-jp. install iconv, uconv or xmlscan.
+
+Tue Dec 23 14:13:51 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic::check_userinfo,
+ URI::Generic::check_user, URI::Generic::check_password): tests
+ conflicts/depends with other components closely.
+
+ * test/uri/test_generic.rb (TestGeneric::test_set_component):
+ added tets.
+
+Tue Dec 23 11:08:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/xsd/test_noencoding.rb: rescue Errno::EINVAL and do not test.
+ "euc-jp" might not be in supported encoding name list.
+ [ruby-talk:88650]
+
+Tue Dec 23 06:10:31 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/cgi.rb (CGI): add support for mod_ruby.
+
+ * lib/webrick/cgi.rb (CGI::Socket): add check for existence of
+ OpenSSL module in all HTTPS related methods.
+
+ * lib/webrick/cgi.rb (CGI::Socket#cipher): should create similar
+ value to OpenSSL::SSLSocket#cipher.
+
+ * lib/webrick/httpresponse.rb (HTTPResponse#setup_header): should
+ set "connection: close" if @keep_alive is false.
+
+ * lib/webrick/https.rb (HTTPrequest#meta_vars): add supprt for
+ SSL_PROTOCOL, SSL_CIPHER_USEKEYSIZE and SSL_CIPHER_ALGKEYSIZE.
+
+Mon Dec 22 23:00:05 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic::check_opaque): fixed typo.
+
+Mon Dec 22 21:59:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (map_charset): always ensure code is a String.
+
+Mon Dec 22 21:15:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * class.c (rb_mod_init_copy): always copy singleton class.
+ [ruby-dev:22325]
+
+Mon Dec 22 20:44:36 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
+ has no host-part.
+
+ * test/uri/test_generic.rb (TestGeneric::test_route): added a test.
+
+Mon Dec 22 20:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/cgi.rb: reduce eval.
+
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): alias path to
+ local_path. [ruby-list:38883]
+
+Mon Dec 22 20:09:31 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/test_property.rb: remove duplicated test method.
+
+Mon Dec 22 18:22:04 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * bcc32/Makefile.sub, win32/Makefile.sub (config.h): remove
+ HAVE_ISINF definition to follow previous commits of missing.h
+ and win32/win32.h.
+
+Mon Dec 22 17:23:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (ac_cv_func_setitimer): moved from defines.h
+
+ * defines.h, rubysig.h, signal.c: removed macro handling which
+ should be done in configure.
+
+ * configure.in (intrinsics.h): check if present.
+
+ * ruby.h: include intrinsics.h if available.
+
+ * bignum.c, marshal.c: include ieeefp.h if available.
+
+ * missing.h (isinf): define as a macro if finite() and isnan()
+ are available. [ruby-core:02032]
+
+Mon Dec 22 17:07:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (mingw): set isnan, finite and isinf to yes.
+
+Mon Dec 22 13:40:19 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/property.rb: passing block by reference.
+
+Mon Dec 22 00:32:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_with_disable_interrupt): use ENABLE_INTS instead of
+ ALLOW_INTS which may switch context. [ruby-dev:22319]
+
+ * ext/syck/emitter.c (syck_emitter_write): str bigger than
+ e->bufsize causes buffer overflow. [ruby-dev:22307]
+
+Sun Dec 21 17:29:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * class.c (rb_check_inheritable): new function. [ruby-dev:22316]
+
+ * intern.h: add prototype.
+
+ * eval.c (superclass): use rb_check_inheritable().
+
+ * object.c (rb_class_initialize): check argument validity.
+
+Sun Dec 21 16:25:10 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Pathname#+): re-implemented to resolve ".." in
+ beginning of the argument.
+ (Pathname#join): concatenate from the last argument.
+ (Pathname#parent): just use Pathname#+.
+
+Sun Dec 21 00:12:37 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: add new methods (TkScrollbar#assign, assign_list)
+
+ * ext/tk/sample/tkmultilistframe.rb: use TkScrollbar#assign method
+
+Sat Dec 20 21:59:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): refine regexp.
+
+ * lib/webrick/cgi.rb (CGI#start): NPH scripts return status line
+ instead of Status: header field.
+
+ * lib/webrick/cgi.rb (CGI::Socket): refine some coditions.
+
+Sat Dec 20 16:07:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::Completion::complete): wrong
+ Regexp for word boundary. pointed out by Gavin Sinclair.
+
+ * lib/optparse.rb (OptionParser::make_switch): [no-] prefix was
+ missing.
+
+Sat Dec 20 11:40:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/yaml.rb (YAML::YAML): adjust Marshal version.
+
+Sat Dec 20 03:56:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_with_disable_interrupt): prohibit thread context
+ switch during proc execution. [ruby-dev:21899]
+
+Sat Dec 20 02:41:02 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/cgi.rb: add file. (yet another CGI library)
+
+ * MANIFEST: add lib/webrick/cgi.rb.
+
+Sat Dec 20 02:18:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-calculate-indent): proper indentation
+ inside of parentheses. [ruby-dev:22308]
+
+Fri Dec 19 21:24:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): should not set
+ HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
+
+ * lib/webrick/https.rb (HTTPRequest#parse): should check presence
+ of cert() method to detect SSLSocket.
+
+Fri Dec 19 22:56:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/property.rb (SOAP::Property#load): new method for loading
+ property value into existing property tree.
+
+ * test/soap/test_property.rb: add test.
+
+Fri Dec 19 19:21:49 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/runit/cui/testrunner.rb (RUNIT::CUI::TestRunner::run):
+ should use Test::Unit::UI::{PROGRESS_ONLY,VERBOSE}.
+
+Fri Dec 19 17:36:49 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/tkmultilistbox.rb: bug fix
+
+ * ext/tk/sample/tkmultilistframe.rb: new sample script
+
+Fri Dec 19 03:44:27 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httputils.rb (parse_form_data): should return an
+ empty Hash if the body is empty.
+
+Thu Dec 18 21:47:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): should remove deffile if it's
+ made by miniruby. based on nobu's patch.
+
+Thu Dec 18 21:44:21 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (stack_extend): ignore inline optimization on VC7.
+
+ * win32/Makefile.sub (OS, RT): can override.
+
+ * win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
+ option. based on Tietew's patch [ruby-dev:22289]
+
+Thu Dec 18 16:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never
+ return NULL.
+
+Thu Dec 18 15:27:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
+ [ruby-dev:21678]
+
+Wed Dec 17 15:15:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
+ String#[] if more than one arguments are specified.
+
+ * lib/delegate.rb: avoid using common instance name as "@obj".
+
+ * lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
+ subclass of String, but DelegateClass(String).
+
+ * ext/curses/extconf.rb: restore function check for init_color.
+ [ruby-list:38905]
+
+ * Makefile.in: need to specify $(MAINLIBS) for the miniruby
+ generation rule.
+
+ * configure.in: better FreeBSD -lc_r support.
+
+Wed Dec 17 00:16:14 2003 Minero Aoki <aamine@loveruby.net>
+
+ * ext/strscan/strscan.c: new method
+ StringScanner#beginning_of_line? (alias #bol?)
+
+ * ext/strscan/strscan.c: new method StringScanner#concat and #<<.
+
+ * ext/strscan/strscan.c: StringScanner#new(str) does not duplicate
+ nor freeze STR (allow destructive modification).
+
+ * test/strscan/test_stringscanner.rb: test new methods above.
+
+ * test/strscan/test_stringscanner.rb: test destructive string
+ modification.
+
+Tue Dec 16 21:20:47 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pp.rb: don't use local variable `pp'.
+
+ * lib/prettyprint.rb: ditto.
+
+Tue Dec 16 13:20:43 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: condition bug of if statement on
+ {pack,grid}_propagate methods
+
+Tue Dec 16 03:17:29 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml/rubytypes.rb: comments in strings. [ruby-talk:88012]
+
+ * test/yaml/test_yaml.rb: add test.
+
+Tue Dec 16 01:14:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (catch_timer): check rb_thread_crtical in main native
+ thread.
+
+ * eval.c (thread_timer): just sends signals periodically, to
+ prevent main native thread from receiving them in critical
+ section. [ruby-core:01959]
+
+Mon Dec 15 13:32:22 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (check_dirname): check string safety and remove extraneous
+ trailing directory separators. [ruby-dev:22279]
+
+ * file.c: renamed and externalized rb_path_next,
+ rb_path_skip_prefix, rb_path_last_separator, rb_path_end.
+
+ * intern.h: prototypes for rb_path_next, rb_path_skip_prefix,
+ rb_path_last_separator, rb_path_end.
+
+Mon Dec 15 09:27:46 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): first argument
+ of rb_protect should take an argument of VALUE.
+
+Sun Dec 14 18:46:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/socket/socket.c (Init_socket): IPv6 is not supported although
+ AF_INET6 is defined on MinGW.
+
+ * lib/ipaddr.rb (AF_INET6): workaround in the environment which does
+ not support IPv6.
+
+Sat Dec 13 18:55:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/charset_alias.rb: preserve original order.
+
+ * ext/iconv/extconf.rb: remove wrapper file at clean.
+
+Sat Dec 13 18:09:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (thread_timer): use timer by sub-thread and nanosleep.
+ [ruby-talk:87519]
+
+ * gc.c (Init_stack): no stack adjustment for THREAD_SAFE.
+
+Sat Dec 13 17:17:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (proc_alloc): cache the created object at first time.
+ [ruby-talk:61288], [ruby-dev:22240]
+
+Sat Dec 13 09:01:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: check ucontext.h.
+
+ * eval.c: use getcontext/setcontext() instead of setjmp/longjmp()
+ on ia64 or with native thread enabled. [ruby-core:01932]
+
+Sat Dec 13 03:09:14 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * lib/yaml/rubytypes.rb: anonymous struct fix. [ruby-core:01946]
+
+ * test/yaml/test_yaml.rb: add test.
+
+Fri Dec 12 22:36:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/csv.rb: add Cell#to_str and Cell#to_s for /.../ =~ aCell,
+ "#{aCell}" and so on.
+
+ * test/csv/test_csv.rb: add tests.
+
+Fri Dec 12 19:33:06 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mkdir): remove trailing `/' from pathes.
+
+ * lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
+
+ * lib/fileutils.rb (rmdir_r): ditto.
+
+ * lib/fileutils.rb (fu_copy_dir): check if it is a directory after
+ mkdir(2).
+
+Fri Dec 12 06:06:09 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (proc_invoke): fix class name in warning message for
+ define_method. [ruby-dev:22235]
+
+Thu Dec 11 21:24:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
+
+ * ext/openssl/ossl.[ch]: ditto.
+
+ * ext/openssl/MANIFEST: add ossl_pkcs12.[ch].
+
+Thu Dec 11 20:54:28 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mkdir_p): remove trailing `/' befere mkdir(2).
+ mkdir("nonexistdir/") does not work on NetBSD/Alpha 1.6.1.
+
+ * lib/fileutils.rb (fu_list): call to_str for all arguments.
+
+Thu Dec 11 20:07:01 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/ftools.rb (makedirs): sync with fileutils.
+
+Thu Dec 11 19:53:03 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
+ (mkdir("C:\") causes EACCESS on Windows 2000/NTFS)
+
+Thu Dec 11 19:08:02 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (mkdir_p): check if it is a directory after
+ mkdir(2) instead of before mkdir(2), to avoid race condition.
+ [ruby-talk:87730]
+ Refer: mkinstalldirs sh script, GNU mkdir(1) (coreutils 5.0)
+
+Thu Dec 11 18:49:30 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb: def m( arg ) -> def m(arg).
+
+Thu Dec 11 11:39:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (ieeefp.h), numeric.c: needed for finite() on
+ Solaris. [ruby-core:01921]
+
+ * file.c (rb_stat_inspect): adjust format specifier.
+
+ * parse.c (arg_prepend): nodetype() is for debug use.
+
+ * ruby.h (ISASCII, etc): cast to int to get rid of warning.
+
+ * ruby.h (alloca.h): include even in GCC. [ruby-core:01925]
+
+ * ext/bigdecimal/bigdecimal.c (GetVpValue): adjust format
+ specifier.
+
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_prec, BigDecimal_coerce,
+ BigDecimal_divmod): use rb_assoc_new() to suppress memory usage.
+
+ * ext/bigdecimal/bigdecimal.c (BigDecimal_split): ditto.
+
+ * ext/dl/sym.c (rb_dlsym_guardcall): guard itself should be
+ volatile.
+
+ * ext/iconv/iconv.c (iconv_convert): ensure actual parameter with
+ format specifier.
+
+ * ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): do not
+ define unless used.
+
+ * ext/pty/pty.c (getDevice): get rid of warning.
+
+ * ext/socket/socket.c (port_str, sock_s_getaddrinfo,
+ sock_s_getnameinfo): FIX2INT() now returns long.
+
+ * ext/socket/socket.c (init_inetsock_internal): uninitialized
+ variable.
+
+ * ext/syck/rubyext.c (syck_parser_assign_io): add prototype.
+
+ * ext/syck/rubyext.c (rb_syck_mktime, yaml_org_handler): use
+ ISDIGIT() instead of isdigit() to avoid warnings and for
+ platforms which don't support non-ascii charater.
+
+Wed Dec 10 19:28:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_read): set EOF flag at short read.
+ [ruby-dev:22223], [ruby-dev:22224]
+
+Wed Dec 10 18:07:25 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
+
+Wed Dec 10 17:54:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_read): do not set EOF flag when
+ requested length is zero. [ruby-dev:22214]
+
+Wed Dec 10 17:17:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (read_all): should return given string even if data read is
+ empty. [ruby-dev:22207]
+
+Wed Dec 10 17:16:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_read): adjust behavior at reading
+ beyond EOF to IO. [ruby-dev:22205]
+
+ * test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading
+ beyond EOF.
+
+ * test/ruby/test_file.rb, test/stringio/test_stringio.rb: include
+ TestEOF::Seek test case.
+
+Wed Dec 10 15:01:19 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/monitor/test_monitor.rb (test_cond): use Queue#deq
+ instead of sleep.
+
+Wed Dec 10 14:45:39 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/pty/pty.c (HAVE_SYS_IOCTL_H): need to include <sys/ioctl.h>
+ for TIOCSCTTY on *BSD. based on gotoyuzo's patch.
+ (ruby-bugs:PR#1211)
+
+ * ext/pty/pty.c (establishShell): should close descriptors if fork
+ failed.
+
+Wed Dec 10 12:53:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * win32/win32.h: define execv() using do_aspawn().
+
+ * process.c (proc_exec_v): remove #ifdef's which stopped needing.
+
+Tue Dec 9 23:32:23 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb, ext/tk/lib/tkcanvas.rb, ext/tk/lib/tkdialog.rb,
+ ext/tk/lib/tkentry.rb, ext/tk/lib/tkscrollbox.rb, ext/tk/lib/tktext.rb,
+ ext/tk/sample/tkalignbox.rb, ext/tk/sample/tkcombobox.rb,
+ ext/tk/sample/tkmultilistbox.rb, ext/tk/sample/tkoptdb.rb, ext/tk/sample/tktextframe.rb,
+ ext/tk/sample/demos-en/dialog1.rb, ext/tk/sample/demos-en/dialog2.rb,
+ ext/tk/sample/demos-jp/dialog1.rb, ext/tk/sample/demos-jp/dialog2.rb:
+ overrided instance methods, which are private methods on the super
+ class, are changed to 'private'
+
+Tue Dec 9 19:53:02 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic#route_from0): make case insensitive
+ for host-part.
+
+ * test/uri/test_generic.rb (test_route): added tests for the above
change.
-Wed Jul 27 00:30:00 2011 Kenta Murata <mrkn@mrkn.jp>
+Tue Dec 9 14:10:48 2003 Tanaka Akira <akr@m17n.org>
- * ext/bigdecimal/lib/bigdecimal/util.rb (BigDecimal#to_d): added
- for adapting other Numeric subclasses. [ruby-dev:44245]
+ * io.c (rb_io_check_readable): don't call io_seek if EOF flag is set,
+ to avoid clearing EOF flag.
+ (rb_io_check_writable): ditto.
- * test/bigdecimal/test_bigdecimal_util.rb: test for the above change.
+Tue Dec 9 02:53:55 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-Wed Jul 27 00:27:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * ext/tk/sample/tkalignbox.rb: new sample script
- * bigdecimal/bigdecimal.c (VpDup) a new function for duplicating
- a BigDecimal.
+Tue Dec 9 00:45:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
- * bigdecimal/bigdecimal.c (BigDecimal_new): support generating a new
- BigDecimal from another BigDecimal using BigDecimal global function
- or constructor. [ruby-dev:44245]
+ * lib/test/unit/assertions.rb: renamed #assert_raises to #assert_raise
+ and made the former call the latter. [ruby-core:01890]
-Tue Jul 26 23:33:24 2011 Igor Zubkov <igor.zubkov@gmail.com>
+ * test/testunit/test_assertions.rb: ditto.
- * array.c: Fix typo. https://github.com/ruby/ruby/pull/36
+Tue Dec 9 00:07:35 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Mon Jul 25 23:51:01 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
+ methods as delegates to WEBrick.
- * proc.c: pre-allocate the unlinked_method_entry_list_entry struct to
- avoid memory allocation during GC. based on a patch from Eric Wong.
- [ruby-core:38498]
+ * test/soap/calc/{test_calc.rb,test_calc2.rb},
+ test/soap/helloworld/test_helloworld.rb,
+ test/wsdl/datetime/test_datetime.rb, test/wsdl/raa/test_raa.rb:
+ follow the change.
-Mon Jul 25 23:39:33 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Dec 8 22:48:03 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/rake/test_rake_directory_task.rb (TestRakeDirectoryTask#
- test_directory_win32): fixed wrong test.
+ * lib/test/unit/autorunner.rb: remove dependency to a particular
+ runner. [ruby-core:01901], [ruby-list:38869]
-Mon Jul 25 22:36:11 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/test/unit/ui/testrunnerutilities.rb: moved output level
+ constants from Console.
- * proc.c (struct METHOD), gc.c (gc_marks), vm_method.c
- (rb_gc_mark_unlinked_live_method_entries): fix SEGV bug.
- rb_method_entry_t was free'd even when the method is still on the
- stack if it is BMETHOD (i.e., Method#call). This is because
- rb_method_entry_t is embedded in struct METHOD. This commit
- separates them and marks the live method entries.
- See [ruby-core:38449] in detail. fix [Bug #5047] [ruby-core:38171]
+ * lib/test/unit/ui/console/testrunner.rb: ditto.
-Mon Jul 25 22:14:37 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
+ accept output_level.
- * lib/xmlrpc/client.rb: Fix possible HTTP header formatting failure by
- 'Basic' header. Long username caused the base64 String truncation in
- HTTP header which is not allowed. See #5046.
+Mon Dec 8 15:03:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/xmlrpc/test_webrick_server.rb: test it.
+ * ext/syck/syck.c (syck_io_str_read): get rid of buffer overflow.
-Mon Jul 25 15:04:33 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Mon Dec 8 13:02:11 2003 Minero Aoki <aamine@loveruby.net>
- * ext/openssl/lib/openssl.rb: End of transition period introduced by
- [ruby-dev:38018]. From the next version of 1.9.3, you should use
- require "openssl"
- instead of
- require "openssl/ssl"
- and
- require "openssl/x509"
+ * lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
-Mon Jul 25 13:46:38 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * test/uri/test_common.rb: add test for URI.regexp.
- * ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
- introduced in r30152 to x509-internal.rb.
+Mon Dec 8 12:44:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jul 25 13:09:42 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * pack.c: define swap16 and swap32 only if they are not
+ defined. OpenBSD defines these macros. [ruby-dev:22181]
- * ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Avoid randomly generated
- SSLError from SSLSocket just after invoking SSLSocket#close.
- OpenSSL's SSL_shutdown could try to send alert packet and it might
- set SSLerr(global error stack) as the result. It causes the next
- SSL read/write operation to fail by unrelated reason.
+Sun Dec 7 20:54:17 2003 Tanaka Akira <akr@m17n.org>
- By design, we're ignoring any error at SSL_shutdown() so we clear
- global error stack after SSL_shutdown is called. See #5039.
+ * ext/iconv/iconv.c (map_charset): make case sensitive.
+ ext/iconv/charset_alias.rb (charset_alias): don't ignore
+ config.charset's information. sort aliases.
-Sun Jul 24 20:29:53 2011 Tanaka Akira <akr@fsij.org>
+Sat Dec 6 22:58:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/socket/extconf.rb: refine the recvmsg test.
+ * ext/openssl/ossl_ssl.c (ossl_start_ssl): new function to wrap
+ SSL_connect and SSL_accept; if SSL_connect (or SSL_accept) returned
+ but not finished the handshake process, we should retry it.
-Sun Jul 24 20:02:31 2011 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/ossl_ssl.c (ossl_ssl_connect): call ossl_start_ssl.
- * ext/socket/extconf.rb: fix the recvmsg test.
+ * ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto.
-Sun Jul 24 08:42:51 2011 Tanaka Akira <akr@fsij.org>
+ * ext/openssl/ossl_ssl.c (ossl_ssl_read): allow signal traps.
- * ext/socket/extconf.rb: test recvmsg allocates file descriptors for
- fd passing even with MSG_PEEK.
+Sat Dec 6 21:45:10 2003 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/socket/ancdata.c: use the above test result.
+ * io.c (flush_before_seek): flush before seek on any platform.
-Sun Jul 24 01:04:50 2011 Eric Hodel <drbrain@segment7.net>
+ * configure.in: ditto.
- * lib/rubygems/specification.rb: Restore behavior of
- Gem::Specification#loaded. [Ruby 1.9 - Bug #5032]
+Sat Dec 6 17:23:00 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Sun Jul 24 00:05:00 2011 Jeremy Evans <merch-redmine@jeremyevans.net>
+ * lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable
+ as well as downcase one.
- * error.c (rb_name_error_str): new function to raise NameError
- with the name string but not ID.
+ * lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI.
- * object.c, proc.c, variable.c: more removal of inadvertent symbol
- creation. [Feature #5079]
+Fri Dec 5 23:22:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 23 21:14:00 2011 Tadayoshi Funaba <tadf@dotrb.org>
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises,
+ Test::Unit::Assertions::assert_nothing_raised): use the last
+ argument as message unless class object.
- * lib/cmath.rb (cbrt): should return a real number if possible.
+ * test/testunit/test_assertions.rb (test_assert_raises): test for
+ multiple exception list. [ruby-core:01891]
-Sat Jul 23 20:12:52 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * test/testunit/test_assertions.rb (test_assert_nothing_raised): test
+ for non-exception classes.
- * test/rake/test_rake_functional.rb (setup): Use __FILE__ for the base
- directory. Current directory is not the top source directory when
- the building process runs on other than there.
+Fri Dec 5 22:23:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * test/rake/test_rake_rake_test_loader.rb: ditto.
+ * lib/soap/netHttpClient.rb: proxy support did not work. fixed.
- * test/rake/test_rake_task_argument_parsing.rb
- (test_terminal_width_using_hardcoded_80): hardcoded 80 is used
- when app.unix? is false.
+ * lib/soap/property.rb: add class methods for loading property from
+ stream/file/propertyfile. propertyfile is a file which is located at
+ somedir in $:.
-Sat Jul 23 20:11:50 2011 Tadayoshi Funaba <tadf@dotrb.org>
+ * lib/soap/soap.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb,
+ lib/wsdl/importer.rb: load property from propertyfile 'soap/property'
+ e.g. /usr/local/lib/ruby/site_ruby/1.8/soap/property.
- * ext/date/date_core.c: an issue that is same as [ruby-dev:44071].
- * ext/date/date_strftime.c: identical to [ruby-dev:44112].
+ * test/soap/test_property.rb, test/soap/test_streamhandler.rb: new file.
-Sat Jul 23 19:12:53 2011 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Fri Dec 5 17:26:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/win32ole/test_err_in_callback.rb (test_err_in_callback):
- skip test if ADODB.connection is not available.
+ * eval.c (rb_exec_end_proc): maintain tmp_end_procs.
+ [ruby-dev:22154]
-Sat Jul 23 15:37:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Fri Dec 5 13:36:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (rb_enc_symname_type): :$a!, @a! and so on are not
- valid symbols, so they should be inspected with quotes.
+ * eval.c (rb_exec_end_proc): should not clear end_procs and
+ ephemeral_end_procs before execution. [ruby-dev:22144]
-Sat Jul 23 17:06:25 2011 Tanaka Akira <akr@fsij.org>
+ * eval.c (rb_obj_extend): call Module#extended hook after
+ extended_object. [ruby-list:38866]
- * io.c (rb_update_max_fd): validate fd.
+ * object.c (Init_Object): Module#extended defined.
- * ext/socket/rubysocket.h (rsock_discard_cmsg_resource): add
- msg_peek_p argument for the declaration.
+Fri Dec 5 13:17:30 2003 Tanaka Akira <akr@m17n.org>
- * ext/socket/ancdata.c (discard_cmsg): add msg_peek_p argument.
- assume FreeBSD, NetBSD and MacOS X doesn't generate passed fd
- when MSG_PEEK.
- (rsock_discard_cmsg_resource): add msg_peek_p argument.
- (bsock_recvmsg_internal): call rsock_discard_cmsg_resource with
- msg_peek_p argument.
+ * test/ruby/test_pipe.rb: use IO.pipe instead of IO.popen.
- * ext/socket/unixsocket.c (unix_recv_io): call
- rsock_discard_cmsg_resource with msg_peek_p argument.
+Fri Dec 5 11:54:45 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sat Jul 23 14:38:28 2011 Eric Hodel <drbrain@segment7.net>
+ * ext/stringio/stringio.c (strio_read): follow IO#read.
- * test/rake*: Remove dependencies on flexmock and session gems.
- [Ruby 1.9 - Bug #4987]
+ * test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
+ test/stringio/test_stringio.rb: add EOF test.
-Sat Jul 23 12:19:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 5 02:49:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * parse.y (rb_check_id): take care of attrset ID created
- implicitly by local ID. [Bug #5084]
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
+ allow multiple exception list. [ruby-core:01884]
- * parse.y (rb_check_id): conversion condition was inverse.
- [Bug #5084]
+ * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
+ check whether arguments are subclass of Exception.
-Fri Jul 22 21:46:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Thu Dec 4 23:54:00 2003 Rick Ohnemus <rick.ohnemus@systemware.com>
- * vm_insnhelper.c (vm_call_cfunc): added volatile for a workaround
- of cfp consistency error problem on OS X 10.7 (Lion). It's
- suspected llvm optimization bug.
- [Bug #5074] [ruby-dev:44185]
+ * dln.c (aix_loaderror): should not use member named 'errno' which
+ might be a macro (e.g. on AIX).
-Fri Jul 22 21:18:20 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Thu Dec 4 23:32:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
+ * io.c (read_all): do not depend on lseek position.
+ [ruby-dev:22026]
- * lib/uri/generic.rb (URI.decode_www_form_component): ditto.
+Thu Dec 4 22:37:26 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jul 22 21:06:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_eval): preserve $! value when retry happens in the
+ rescue clause. [ruby-talk:86697]
- * object.c (rb_mod_{const,cvar}_defined, rb_obj_ivar_defined):
- avoid inadvertent symbol creation in reflection methods. based
- on a patch by Jeremy Evans at [ruby-core:38367]. [Feature #5072]
+Thu Dec 4 21:50:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * vm_method.c (rb_mod_method_defined)
- (rb_mod_{public,private,protected}_method_defined)
- (obj_respond_to): ditto.
+ * lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):
+ should rescue errors and re-raise DRbConnError on write too.
+ [ruby-dev:22132]
- * parse.y (rb_check_id): new function returns already interned ID
- or 0.
+Thu Dec 4 16:41:17 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Fri Jul 22 20:44:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (exc_list): allow expanding list. [ruby-dev:22134]
- * parse.y (rb_is_global_id, rb_is_attrset_id): add missing
- predicates.
+Thu Dec 4 14:09:24 2003 Minero Aoki <aamine@loveruby.net>
-Fri Jul 22 20:24:38 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * test/fileutils/test_fileutils.rb (test_cp): test if the error is
+ kind of SystemCallError. It is needless details that which errno
+ is set on each systems.
- * test/ruby/test_object.rb (TestObject#test_respond_to_missing):
- 2nd argument of respond_to_missing? is not optional.
+Thu Dec 4 13:24:13 2003 Shugo Maeda <shugo@ruby-lang.org>
-Fri Jul 22 19:05:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/monitor.rb: use Object#__send__ instead of Object#send.
- * parse.y (rb_enc_symname2_p): get rid of potential out-of-bound
- access.
+Thu Dec 4 13:17:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Fri Jul 22 13:55:59 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/soap/streamHandler.rb: support latest released version of
+ http-access2.
- * lib/net/http.rb: Net::HTTP#finish is used to manually close
- connections. [Ruby 1.9 - Bug #5045]
+Thu Dec 4 13:04:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Fri Jul 22 13:51:29 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/soap/soap.rb: add SOAP::Env module for environment repository
+ such as HTTP_PROXY.
- * ext/readline/readline.c: Add examples for Readline.completion_proc=.
- [Ruby 1.9 - Bug #5057]
+ * lib/soap/property.rb: property implementation.
-Fri Jul 22 13:03:12 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
+ lib/soap/rpc/driver.rb: use soap/property.rb.
- * ext/openssl/ossl_hmac.c: Revert checking return type of
- HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
+ * lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
+ use SOAP::Env.
-Fri Jul 22 12:10:21 2011 Eric Hodel <drbrain@segment7.net>
+ * lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
+ management interface, but ignored for now.
- * tool/rbinstall.rb (default gems): Install executables into the fake
- gem dir for Gem.bin_path. [#4485]
+ * lib/xsd/charset.rb: add XSD::Charset.encoding= interface to set
+ wiredump charset explicitly. it was fixed to 'utf-8' when iconv or
+ uconv module was found.
-Fri Jul 22 11:20:20 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Thu Dec 4 10:43:58 2003 NAKAMURA Usaku <usa@ruby-lang.org>
- * ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
- * ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
- Thanks, Jared Jennings, for the patch.
- [ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]
+ * ext/dl/sym.c (rb_dlsym_guardcall): __declspec(noinline) is VC7
+ feature.
-Fri Jul 22 09:09:43 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+Thu Dec 4 10:27:12 2003 Minero Aoki <aamine@loveruby.net>
- * ext/openssl/ossl_engine.c: Avoid double free of ENGINE reference.
- * test/openssl/test_engine.rb: Add a test for it.
- Thanks to Ippei Obayashi for providing the patch.
- [ Ruby 1.9 - Bug #5062 ] [ruby-dev:44173]
+ * lib/net/http.rb: update hyperlink to the Japanese document.
-Fri Jul 22 06:37:13 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Thu Dec 4 09:12:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356]
+ * ext/openssl/ossl_asn1.c (asn1time_to_time): should check that
+ the underlying value of ASN1_TIME isn't NULL. [ruby-core:01881]
-Thu Jul 21 20:59:59 2011 Tanaka Akira <akr@fsij.org>
+Thu Dec 4 08:29:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/socket/ancdata.c (discard_cmsg): workaround for MacOS X Lion.
+ * lib/webrick/server.rb (GenericServer#start): should rescue
+ Exception to avoid unexpected aborting. [ruby-core:01853]
-Thu Jul 21 20:02:11 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/webrick/server.rb (GenericServer#start_thread): should check
+ that peeraddr isn't nil before printing.
- * thread.c (set_trace_func, thread_set_trace_func_m): reset tracing
- state when set_trace_func hook is removed. This is workaround patch
- to force to reset tracing state that is broken by continuation call.
- a patch from James M. Lawrence. [Feature #4347] [ruby-core:34998]
+ * lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should
+ rescue Exception to avoid unexpected aborting of thread.
- * test/ruby/test_continuation.rb (class TestContinuation): add a test
- for above. a patch from James M. Lawrence.
+Thu Dec 4 03:48:59 2003 Tanaka Akira <akr@m17n.org>
-Thu Jul 21 19:27:19 2011 Yusuke Endoh <mame@tsg.ne.jp>
+ * lib/pathname.rb (Pathname#link, Pathname#symlink): obsoleted.
+ (Pathname#make_link, Pathname#make_symlink): new method.
- * node.c (dump_node): add today's knowledge. "init arguments (m)" and
- "init arguments (p)" of compile.c indicates a Ruby code that
- evaluates multiple assignments that is in method or block
- parameters: def foo((m1,m2), (m3,m4), *r, (p1,p2), (p3,p4)); end
- The former (init arguments (m)) evaluates the multiple assignments
- before rest argument, that are (m1,m2) and (m3,m4). The letter
- (init arguments (p)) does ones after rest argument, that are
- (p1,p2) and (p3, p4).
+Thu Dec 4 01:45:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jul 21 18:11:07 2011 NARUSE, Yui <naruse@ruby-lang.org>
+ * io.c (argf_read): should not terminate on empty string; wait
+ until real EOF. [ruby-dev:21969]
- * enum.c (enum_inject): remove empty line to notify rdoc
- Enumerable#reduce is alias. patched by milki@github.
- https://github.com/ruby/ruby/pull/26
+ * io.c (argf_read): should adjust length to read, when length is
+ specified and read spans command line argument files.
-Thu Jul 21 17:30:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Dec 3 19:38:36 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * array.c (rb_ary_delete_at_m): use simple array literal in rdoc.
- patched by samuel tonini. [ruby-core:38310] [Bug #5066]
+ * lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
-Thu Jul 21 17:14:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Dec 3 13:49:07 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#each):
- Allow HTTP/0.9 request which doesn't has any header or body.
- patched by Felix Jodoin. [ruby-core:38040] [Bug #5022]
+ * ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
-Wed Jul 20 23:02:18 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * ext/tk/lib/tkafter.rb: ditto.
- * io.c (rb_update_max_fd): remove parentheses. they are not in
- macro.
+ * ext/tk/lib/tkcanvas.rb: ditto.
-Wed Jul 20 22:22:23 2011 Tanaka Akira <akr@fsij.org>
+ * ext/tk/lib/tkdialog.rb: ditto.
- * include/ruby/intern.h (rb_update_max_fd): declaration moved from
- internal.h.
+ * ext/tk/lib/tktext.rb: ditto.
- * file.c: ditto.
+Wed Dec 3 13:28:13 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * io.c: call rb_update_max_fd for each new fds.
+ * Makefile.in (lex.c): try gperf first, and copy from the source
+ directory if failed. [ruby-dev:22123]
- * process.c: ditto.
+ * ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
- * random.c: ditto.
+ * lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
- * ruby.c: ditto.
+Tue Dec 2 23:18:12 2003 Minero Aoki <aamine@loveruby.net>
- * ext/io/console/console.c: ditto.
+ * lib/net/http.rb: wrote the warning about HTTP_PROXY environment
+ variable.
- * ext/openssl/ossl_bio.c: ditto.
+Tue Dec 2 21:31:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * ext/pty/pty.c: ditto.
+ * bin/testrb: new test runner. [ruby-core:01845]
- * ext/socket/init.c: ditto.
+ * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner.run,
+ Test::Unit::AutoRunner#process_args): take test list to run and
+ options.
- * ext/socket/socket.c: ditto.
+ * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::RUNNERS,
+ Test::Unit::AutoRunner#run): should not exit inside a library,
+ just return the result instead.
- * ext/socket/ancdata.c: ditto.
+ * lib/test/unit.rb: ditto.
- * ext/socket/unixsocket.c: ditto.
+ * test/runner.rb: exit with the test result.
-Wed Jul 20 15:16:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
+Tue Dec 2 20:18:48 2003 Eric Sunshine <sunshine@sunshineco.com>
- * ext/dl/handle.c (dlhandle_sym): clear previous error with dlerror()
- before calling dlsym(). [ruby-dev:44091] [Bug #5021]
+ * configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
+ instead of Bison or byacc.
-Wed Jul 20 07:16:26 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * parse.y: If OLD_YACC is defined, ensure that YYMAXDEPTH is at least
+ 10000 (Bison's default) since some old versions of Yacc define it as
+ low as 150 by default, which is too low for Ruby to parse some files,
+ such as date/format.rb. Among other issues, the parse problem causes
+ "make test" to fail.
- * NEWS: mention Kernel#warn. [ruby-core:38119] [Feature #5029]
+Tue Dec 2 20:03:20 2003 Minero Aoki <aamine@loveruby.net>
-Tue Jul 19 16:40:45 2011 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
+ * test/fileutils/test_fileutils.rb: check if Pathnames are usable
+ for arguments.
- * cont.c (cont_save_thread): fix missing semicolon.
+Tue Dec 2 04:22:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-Tue Jul 19 16:25:15 2011 Tanaka Akira <akr@fsij.org>
+ * lib/test/unit/assertions.rb: fixed #assert_no_match message.
- * io.c (UPDATE_MAXFD): removed.
+ * test/testunit/test_assertions.rb: ditto.
-Tue Jul 19 16:07:45 2011 Tanaka Akira <akr@fsij.org>
+Tue Dec 2 00:43:00 2003 why the lucky stiff <why@ruby-lang.org>
- * io.c (rb_update_max_fd): new function.
+ * ext/syck/syck.c: string buffering bug. decrementing by full
+ max_size now. [ruby-core:01834]
- * internal.h (rb_update_max_fd): declare rb_update_max_fd.
+Mon Dec 1 21:33:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * thread_pthread.c (rb_thread_create_timer_thread): update max fd when
- timer thread pipe is created.
+ * numeric.c (num_sadded): prohibit singleton method definition for
+ Numerics. fill yet another gap between Fixnum and Bignum.
-Mon Jul 18 13:36:47 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Dec 1 17:33:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/psych/lib/psych.rb: define a new BadAlias error class.
+ * pack.c (htov16): converts endian using swap16. htov32(), hton16,
+ hton32 as well. [ruby-talk:85377]
- * ext/psych/lib/psych/visitors/to_ruby.rb: raise an exception when
- deserializing an alias that does not exist.
+ * pack.c (swap16): swap 2 bytes no matter how big short is on the
+ platform. swap32() is also prepared.
- * test/psych/test_merge_keys.rb: corresponding test.
+ * numeric.c (rb_num2int): returns long to preserve information.
+ rb_fix2int(), rb_num2uint(), rb_fix2uint() as well.
+ [ruby-talk:85377]
-Mon Jul 18 00:00:46 2011 Shugo Maeda <shugo@ruby-lang.org>
+ * numeric.c (rb_num2uint): should not check for value range if the
+ source value is negative.
- * ext/curses/curses.c: added the new class Curses::Pad, which
- supports scrolling. patch by Eric Hodel. [Feature #4896]
- [ruby-core:37206]
+Mon Dec 1 17:14:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-Sun Jul 17 16:26:40 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sample/optparse/opttest.rb: added.
- * error.c (rb_check_trusted): new function to check an object is
- trusted.
+Mon Dec 1 16:10:52 2003 Dave Thomas <dave@pragprog.com>
- * struct.c (rb_struct_modify), time.c (time_modify): check by the
- above function to show proper class names. [Bug #5036]
+ * lib/rdoc/rdoc.rb: (etc) initial merge into main tree.
-Sun Jul 17 15:30:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 1 14:17:49 2003 Minero Aoki <aamine@loveruby.net>
- * error.c (rb_warn_m): accept multiple args in like puts. rdoc
- patch by Erik Price at [ruby-core:38119]. [Feature #5029]
+ * lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow
+ Pathname for arguments. [ruby-core:01795]
-Sun Jul 17 07:56:31 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
+ * test/fileutils/test_fileutils.rb: does much strict test on
+ "same" files detecting.
- * test/openssl/test_ssl_session.rb: add PEM SSL session without TLS
- extensions. Use this as the default for the tests to ensure
- compatibility with OpenSSL 0.9.7.
- [ Ruby 1.9 - Bug #4961 ] [ruby-core:37726]
+Mon Dec 1 09:28:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-Sat Jul 16 17:29:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+ (XCFLAGS): re-export $(XCFLAGS).
- * configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.
- Bug #4977
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+ (ARCH_FLAG): export $(ARCH_FLAG) (perhaps empty value).
-Sat Jul 16 06:27:51 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+Mon Dec 1 01:03:27 2003 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/uri/common.rb (module): Remove optional parser argument to
- Kernel#URI
- [ruby-core:38061]
+ * lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
+ and ARCH_FLAG. [ruby-dev:22085]
- * lib/uri/generic.rb (module): ditto
+Sun Nov 30 20:18:07 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-Sat Jul 16 03:19:45 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
+ [ruby-core:01819]
- * win32/win32.c (is_socket, is_console): add prototypes to fix compile
- problem with gcc introduced at r32549.
- reported by Jon Forums. [Bug #5030] [ruby-core:38079]
+ * Makefile.in: add ARCH_FLAG to CFLAGS.
-Sat Jul 16 00:55:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
- * time.c (time_dup): used rb_obj_class() instead of CLASS_OF().
- The patch is made by Kazuki Tsujimoto. [Bug #5012] [ruby-dev:44071]
+ * lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
- * test/ruby/test_time.rb (TestTime#test_getlocal_dont_share_eigenclass):
- added a new test for eigenclass of time object.
+ * lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS.
-Fri Jul 15 19:11:00 2011 Kenta Murata <mrkn@mrkn.jp>
+ * Makefile.in: add ARCH_FLAG to DLDFLAGS.
- * bignum.c (bigsub_int): add RB_GC_GUARD. This patch is made by
- Makoto Kishimoto. fixes #4223 [ruby-dev:42907]
+ * configure.in: should put getcwd in AC_CHECK_FUNCS, not
+ AC_REPLACE_FUNCS. [ruby-core:01826]
- * bignum.c (bigadd_int): ditto.
+Sun Nov 30 18:22:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-Fri Jul 15 14:27:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
+ DLDFLAGS and LDSHARED.
- * win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed
- from rb_w32_has_cancel_io(). now it takes a parameter as fd to check
- the fd is console or not, because we cannot cancel console input even
- if we have cancel_io function.
+ * configure.in: XCFLAGS for compiling ruby itself. ARCH_FLAG is
+ reflected in CFLAGS.
- * io.c (WAIT_FD_IN_WIN32): call above function instead of the old one,
- so now we can kill the thread which calls STDIN.gets.
- the problem was reported by ko1 via IRC.
+ * lib/mkmf.rb: ditto. do not import XCFLAGS from config.status.
-Fri Jul 15 09:10:41 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+Sun Nov 30 17:37:36 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/digest/sha2/sha2.c (SHA256_Update, SHA512_Update): avoid Bus
- Error caused by unalignment access on Sparc-Solaris (and possibly on
- other similar environment.) This patch just do memcpy always instead
- of checking architecture. I see no perf drop on my 64bit env. For
- more details, see #4320.
+ * ext/tk/lib/tk.rb: bug fix [ruby-talk:86746]
- * test/digest/test_digest.rb: add test for unalignment access.
+Sun Nov 30 13:02:00 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-Fri Jul 15 01:51:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/soap/encodingstyle/soapHandler.rb: refactoring - Simplifying
+ Conditional Expressions.
- * regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not
- allow unaligned word access.
+ * lib/wsdl/soap/definitions.rb: refactoring - Move Method.
- * st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word
- access as well as i386.
+ * test/xsd/{test_noencoding.rb,noencoding.xml}: new files. test for
+ encoding unspecified XML file parsing.
-Thu Jul 14 12:19:34 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
+ * test/wsdl/{test_fault.rb,map,datetime}: new files. test of
+ SOAPFault, dateTime and Apache's Map.
- * ext/openssl/ossl.c (ossl_verify_cb): trap the exception from
- verify callback of SSLContext and X509Store and make the
- verification fail normally. Raising exception directly from callback
- causes orphan resources in OpenSSL stack. Patched by Ippei Obayashi.
- See #4445.
+Sun Nov 30 09:35:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * test/openssl/test_ssl.rb
- (test_exception_in_verify_callback_is_ignored): test it.
+ * string.c (rb_str_update): get rid of SEGV at just allocated String.
+ [ruby-core:01812]
-Tue Jul 12 23:41:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Nov 28 23:19:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * NEWS: add a description of Signal.trap change.
+ * gc.c (gc_mark): explicitly check mark recursion levels, instead
+ of unreliable stack length.
-Tue Jul 12 20:02:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Nov 28 22:49:56 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * signal.c (reserved_signal_p): reverted a part of r32523.
- chikanaga noticed trap(:CHLD) has some realworld usecase.
- * test/ruby/test_signal.rb (TestSignal#test_reserved_signal):
- ditto.
+ * lib/rinda/rinda.rb: fix TupleSpaceProxy#read, read_all.
-Tue Jul 12 17:12:45 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Nov 28 21:44:40 2003 WATANABE Hirofumi <eban@ruby-lang.org>
- * vm_method.c (rb_add_method): should not call method_added hook
- for undef operation. [Bug #5015]
+ * test/fileutils/test_fileutils.rb (test_ln_s): should be a file, not
+ a directory for FreeBSD.
-Tue Jul 12 16:58:44 2011 Shota Fukumori <sorah@tubusu.net>
+Fri Nov 28 19:37:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * lib/test/unit.rb(Test::Unit::Options#process_args): Fix bug.
- Fix process_args didn't return `@option` after r30939.
+ * hash.c (env_has_value, env_index): must match exactly.
-Tue Jul 12 14:07:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/ruby/test_env.rb (test_has_value, test_index): condition for
+ aboves.
- * signal.c (install_sighandler): fixed a race.
+Fri Nov 28 17:59:20 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-Tue Jul 12 13:49:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * test/ruby/test_env.rb: add tests for ENV.
- * signal.c (sig_trap): don't permit to change a signal handler which
- the interpreter reserved.
- * signal.c (reserved_signal_p): ditto.
- [Bug #2616] [ruby-core:27625]
+Fri Nov 28 17:47:46 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * test/ruby/test_signal.rb (TestSignal#test_reserved_signal):
- added a test for reserved signal.
+ * lib/drb/drb.rb (DRbMessage#load): rescue Errno::* and raise
+ DRbConnError.
-Tue Jul 12 11:58:28 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Nov 28 15:41:15 2003 Tanaka Akira <akr@m17n.org>
- * win32/setup.mak: support x86-amd64 cross compile environment.
+ * lib/pathname.rb (Pathname#realpath): obsolete the force_absolute
+ argument.
-Mon Jul 11 23:22:28 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+Fri Nov 28 14:41:52 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
- * time.c: can't compile time.c on AIX due to missing declaration for
- ffs(). It is declared in strings.h on AIX.
+ * lib/soap/streamHandler.rb: drop unused http parameters.
-Mon Jul 11 15:54:24 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+ * lib/soap/encodingstyle/soapHandler.rb, lib/soap/mapping/factory.rb,
+ lib/soap/mapping/mapping.rb, lib/soap/mapping/registry.rb,
+ lib/wsdl/soap/complexType.rb: ApacheSOAP's map support was broken
+ under WSDL dynanic client environment. fixed.
- * process.c: removed signal() macro. It's no longer used.
+ * test/wsdl/raa/*: add tests.
-Mon Jul 11 15:02:24 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/xsd/datatypes.rb: dateTime precision bug fix (at least, I hope.)
+ bug of soap4r. XSDDateTimeImple.to_time passed a Float to
+ Time.local/Time.gm as an usec, and NUM2LONG(rb_num2long for Float)
+ causes rounding error.
- * numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
- rb_num2ulong(). fixed the problem of ObjectSpace._id2ref of IL32LLP64
- platforms, introduced at r32433.
+ * test/soap/test_basetype.rb, test/xsd/test_xsd.rb: add tests.
-Mon Jul 11 05:38:05 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+Fri Nov 28 04:15:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c (get_stack): need to adjust stack addr for
- [Bug #1813] on AIX.
+ * eval.c (method_arity): used wrong Proc object. [ruby-talk:86504]
-Mon Jul 11 01:16:27 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+Fri Nov 28 00:47:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * thread_pthread.c (rb_thread_create_timer_thread): removed
- rb_disable_interrupt()/rb_enable_interrupt().
- * vm_core.h: ditto.
- * process.c (static void before_exec): ditto.
- * process.c (static void after_exec): ditto.
- [Bug #4765] [ruby-dev:43571]
+ * eval.c (rb_f_exit), process.c (rb_f_exit_bang): treat true as
+ success, false as failure. [ruby-dev:22067]
+
+ * eval.c (rb_f_abort, rb_thread_switch), process.c (rb_f_system): use
+ ANSI macro instead of hard coded value.
+
+ * eval.c (rb_f_exit), process.c (rb_f_exit_bang): use VALUEs not but
+ TYPEs.
+
+Thu Nov 27 22:05:48 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * eval.c, gc.c: FreeBSD/ia64 currently does not have a way for a
+ process to get the base address for the RSE backing store, so
+ hardcode it for the moment.
+ [submitted by: Marcel Moolenaar <marcel@FreeBSD.org>]
+
+Thu Nov 27 17:36:42 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode).
+ TkTimer#wait recieves the exception of the callback.
+ The exception is kept on @return_value.
+
+Thu Nov 27 16:58:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_stat): remove _fullpath() for NUL: device.
+
+Wed Nov 26 15:38:47 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * test/fileutils/test_fileutils.rb (test_ln_s): should take the
+ existing symbolic link for OpenBSD.
+
+Wed Nov 26 04:48:42 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/token.c: removed YYTOKTMP references which
+ were causing buffer overflows on large block scalars,
+ comments, quoted scalars and plain scalars.
+
+ * ext/syck/rubyext.c: dynamic changing of buffer size.
+
+ * ext/syck/syck.h: default buffer size of 4k.
+
+Wed Nov 26 00:55:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
+
+ * lib/webrick/httpserver.rb (HTTPServer#run): should pass the
+ request's keep_alive flag to the response.
+
+Tue Nov 25 21:41:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * defines.h (ENV_IGNORECASE): should define when DOSISH without
+ human68k. [ruby-dev:22047]
+
+ * hash.c (env_has_value, env_index): don't ignore case of value.
+ [ruby-dev:22048]
+
+Tue Nov 25 21:39:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (path_check_1): honor sticky bits always.
+ [ruby-talk:86273]
+
+Tue Nov 25 20:02:14 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/test_fileutils.rb: do test in more deep
+ directory.
+
+ * test/fileutils/test_nowrite.rb: ditto.
+
+Tue Nov 25 19:04:23 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
+ refined.
+
+Tue Nov 25 18:13:30 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
+ test. [ruby-dev:22045]
+
+ * test/fileutils/test_nowrite.rb: ditto.
+
+Tue Nov 25 17:52:11 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
+ if the environment variable is case sensitive.
+
+Tue Nov 25 16:41:33 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb:
+ removed. this test requires extra libraries in soap4r/1.5.*.
+
+Tue Nov 25 16:24:42 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license;
+ GPL2 -> Ruby's.
+
+ * lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb,
+ lib/soap/streamHandler.rb: add interface to streamhandler.
+
+ * lib/soap/marshal.rb: raise error if parse fails.
+
+ * lib/soap/netHttpClient.rb: add https support. Patched by
+ Oliver M. Bolzer.
+
+ * lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
+
+ * lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb,
+ lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce
+ using charset for parsing response from buggy server.
+
+ * lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half
+ typed multi-ref array.
+
+ * lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map
+ SOAPStruct which has multi-accessors which name are the same, to an
+ array.
+
+ * lib/soap/rpc/element.rb: fixed illegal parameter order.
+
+ * lib/soap/rpc/element.rb: element name of response message could have
+ the name other than 'return'.
+
+ * lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb,
+ lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb,
+ lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural
+ fault definition in a operation. [ruby-talk:84948]
+
+ * test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add
+ test for above fix.
+
+ * lib/wsdl/soap/complexType.rb: support WSDL array definition with
+ maxOccures="unbound".
+
+ * lib/xsd/charset.rb: use cp932 under emx. Patched by
+ Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
+
+ * lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means
+ 'follow encoding declaration in XML'.
+
+ * sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb,
+ sample/wsdl/googleSearch/sampleClient.rb,
+ sample/wsdl/googleSearch/wsdlDriver.rb,
+ test/wsdl/test_emptycomplextype.rb,
+ test/wsdl/marshal/test_wsdlmarshal.rb,
+ test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read }
+ instead of File.open(...).read. [ruby-dev:21964]
+
+ * test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb:
+ simplify the test case.
+
+ * test/wsdl/axisArray/*: add tests for axis's array encoding.
+
+Tue Nov 25 16:15:29 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ruby.h: don't treat Cygwin as Windows.
+
+Tue Nov 25 15:18:28 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * configure.in: change default value of --enable-pthread (default: no)
+
+Tue Nov 25 07:31:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (primary): allow newlines just before right argument
+ parenthesis. (ruby-bugs:PR#1221)
+
+Mon Nov 24 23:32:06 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (OpenURI.open_loop, URI::HTTP#proxy_open): use
+ catch/throw for redirection instead of exception.
+ (OpenURI.open_loop, OpenURI.redirectable?): restrict redirection.
+
+Mon Nov 24 19:59:48 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): use CGI_HTTP_PROXY
+ instead of HTTP_PROXY in the CGI environment.
+
+Mon Nov 24 19:32:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/etc/extconf.rb: check for pw_passwd in struct passwd and
+ gr_passwd in struct group for DJGPP.
+
+ * ext/etc/etc.c: ditto.
+
+ * ext/Setup.dj: support for curses, etc, zlib.
+
+Mon Nov 24 17:00:00 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb: validate option names.
+ :content_length_proc and :progress_proc option implemented.
+
+Mon Nov 24 14:53:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+ (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
+
+Sat Nov 22 23:09:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in: set enable_pthread to no on MinGW.
+
+Sat Nov 22 22:56:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * configure.in: add --enable-pthread option (default: yes)
+
+Sat Nov 22 22:48:46 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite
+
+ * ext/tk/lib/tkafter.rb: bug fix of TkAfter#start
+
+ * ext/tk/sample/tkcombobox.rb: new sample script
+
+ * ext/tcltklib/tcltklib.c: add native thread check
+
+Sat Nov 22 18:49:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
+ libcruses returns no value, just like keypad().
+
+Sat Nov 22 17:36:36 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+ (HAVE_GETCWD): output to config.h.
+
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
+ (XCFLAGS): output to config.status.
+
+Sat Nov 22 13:10:10 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (have_st_ino?): djgpp has valid st_ino.
+
+Sat Nov 22 11:28:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (Init_stack): stack region is far smaller than usual if
+ pthread is used.
+
+Sat Nov 22 07:30:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/util/backtracefilter.rb: fixed a bug that occurred
+ when an exception had no backtrace.
+
+ * test/testunit/util/test_backtracefilter.rb: ditto.
+
+Fri Nov 21 16:44:18 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tkentry.rb: fix the encoding trouble of percent
+ substitutions on validatecommand option of TkEntry widget
+
+ * ext/tk/lib/tk.rb: fix bug on {pack|grid}_propagate() method
+
+Fri Nov 21 16:12:11 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * ruby.1: Fix markups and grammar.
+
+Fri Nov 21 14:49:42 2003 Minero Aoki <aamine@loveruby.net>
+
+ * ruby.1: wrote about ruby related environment variables.
+
+Fri Nov 21 12:28:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_extended): singleton methods should not be checked
+ when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
+
+Fri Nov 21 01:40:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * configure.in: check <pthread.h>
+
+ * ruby.h: include pthread.h if existence.
+ define is_ruby_native() macro when not HAVE_NATIVETHREAD
+
+ * eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
+
+Fri Nov 21 00:43:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: use #__send__ instead of #send.
+
+ * lib/test/unit/testcase.rb: ditto.
+
+Thu Nov 20 19:19:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in: don't find the Cygwin's pthread library on MinGW.
+
+Thu Nov 20 19:15:50 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not
+ have st_ino (always 0). [ruby-dev:21972]
+
+ * lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not
+ allow overwriting files by rename(2).
+
+ * test/fileutils/test_fileutils.rb: windows? ->
+ have_drive_letter?, have_file_perm?
+
+Thu Nov 20 17:50:58 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/sample/tkballoonhelp.rb: new sample script
+
+ * ext/tk/sample/tkmultilistbox.rb: ditto
+
+ * ext/tk/sample/tktextframe.rb: ditto
+
+Thu Nov 20 13:37:34 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ruby.h: define is_ruby_native_thread() for no native thread
+ environment
+
+ * eval.c: ditto
+
+Thu Nov 20 12:42:47 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * configure.in: always check existence of the pthread library
+
+ * ruby.h: define macros for ruby's native thread check
+
+ * eval.c: add ruby's native thread check
+
+ * gc.c: ditto
+
+Wed Nov 19 14:45:18 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (to_ary): print more friendly warning message.
+
+Wed Nov 19 14:32:08 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (fu_same?): add djgpp and wince.
+
+ * lib/fileutils.rb (cannot_overwrite_file?): add wince.
+
+Wed Nov 19 11:04:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
+ is same as mswin32.
+
+Wed Nov 19 07:54:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit.rb: do not run tests if $! is set.
+
+ * lib/test/unit/assertionfailederror.rb: extend StandardError instead
+ Exception (irb catches the former but not the latter).
+
+Tue Nov 18 23:31:36 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * missing/memmove.c (memmove): take void *, not char *.
+
+ * missing.h (memmove): ditto.
+
+ * missing.h (strchr, strrchr): return char *, not int.
+
+Tue Nov 18 22:20:10 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (fu_same?): temporal fix for windows.
+
+Tue Nov 18 19:05:04 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (fu_same?): check by inode instead of path
+ name, to detect two hard links pointing to the same content.
+
+ * test/fileutils.rb: did not create correctly looped symlinks.
+
+Tue Nov 18 18:23:05 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_read): behave as IO at empty string.
+ [ruby-dev:21939], [ruby-dev:21941]
+
+ * ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
+
+ * ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
+ clear EOF flag.
+
+ * test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
+
+Tue Nov 18 14:06:35 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
+ [ruby-talk:85344] [ruby-core:01699]
+
+ * lib/fileutils.rb: use Object#is_a? instead of Class#=== to allow
+ e.g. remote objects for receivers.
+
+ * lib/fileutils.rb: FileTest -> File.
+
+ * lib/fileutils.rb: put parentheses for arguments of File.xxxx?
+
+ * test/fileutils/test_fileutils.rb (test_cp): test "cp a a".
+
+ * test/fileutils/test_fileutils.rb (test_mv): test "mv a a".
+
+ * test/fileutils/test_fileutils.rb (test_ln): test "ln a a".
+
+ * test/fileutils/test_fileutils.rb (test_ln_s): test "ln_s a a".
+
+ * test/fileutils/test_fileutils.rb (test_install): test "install a a".
+
+ * test/fileutils/fileasserts.rb: new method assert_symlink.
+
+ * test/fileutils/fileasserts.rb: assert_is_directory -> assert_directory.
+
+Mon Nov 17 19:38:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (getcwdofdrv): avoid using getcwd() directly, use
+ my_getcwd() instead.
+
+ * merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
+ <sunshine@sunshineco.com>. [ruby-core:01596]
+
+Mon Nov 17 10:50:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::Completion::complete): allow least
+ common completion for three or more candidates.
+
+Mon Nov 17 09:41:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/ui/tk/testrunner.rb,
+ lib/test/unit/ui/gtk/testrunner.rb:
+ run GUI main loop in sub thread.
+
+ * lib/test/unit/ui/gtk2/testrunner.rb: imported from rough.
+
+ * lib/test/unit/autorunner.rb (keyword_display): sort keywords.
+
+Sun Nov 16 18:10:57 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval): iterator should return value from next inside
+ begin/rescue/end. (ruby-bugs:PR#1218)
+
+Sun Nov 16 13:26:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_object): LINK check earlier than anything else,
+ i.e. do not dump TYPE_IVAR for already dumped objects.
+ (ruby-bugs:PR#1220)
+
+ * eval.c (rb_eval): call "inherited" only when a new class is
+ generated; not on reopening.
+
+ * eval.c (eval): prepend error position in evaluating string to
+ "mesg" attribute string only when it's available and is a
+ string.
+
+Sun Nov 16 12:16:10 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/protocol.rb: logging response body. [experimental]
+ [ruby-list:38800]
+
+Sun Nov 16 10:49:38 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/thread.rb (Thread.exclusive): wrap method definition in
+ class Thread to enable rdoc to process.
+
+Sun Nov 16 09:45:23 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (set_debug_output): warn if method is called
+ after #start. [ruby-dev:38798]
+
+Sun Nov 16 04:41:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (eval): do not re-raise exception to avoid unnecessary
+ exception copying, instead modify exception and internal
+ information to adjust eval().
+
+ * eval.c (backtrace): can return the current frame information
+ only if lev < -1.
+
+Sat Nov 15 22:16:42 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * /ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext):
+ refine error message.
+
+Sat Nov 15 10:05:40 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (OpenURI.open_loop, OpenURI::HTTP#proxy_open):
+ refactored to support options.
+ (Buffer): maintain size by this class.
+
+Sat Nov 15 07:40:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_method_node): new API to retrieve method body.
+
+Fri Nov 14 13:21:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
+
+ * ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget
+ argument [ruby-talk:85066]
+
+Thu Nov 13 20:53:35 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed.
+ [ruby-ext:02251]
+
+Thu Nov 13 19:17:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * lib/test/unit/ui/tk/testrunner.rb: use grid and panedwindow
+ (if available)
+
+Thu Nov 13 17:56:41 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (OpenURI.open_uri): use File::RDONLY.
+ reported by Take_tk <ggb03124@nifty.ne.jp>.
+ [ruby-ext:02245]
+
+Thu Nov 13 16:45:53 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_x509req.c (ossl_x509req_to_der): add function for
+ X509::Request#to_der.
+
+Thu Nov 13 11:31:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::Completion#complete): prior shorter
+ name to containing longer name.
+
+Thu Nov 13 06:08:54 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: stop freezing some classes
+
+ * ext/tk/lib/multi-tk.rb: ditto.
+
+Wed Nov 12 17:32:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb (assert_throws, assert_nothing_thrown):
+ uncaught throw in sub thread raises ThreadError.
+
+ * lib/test/unit/ui/tk/testrunner.rb (setup_ui): "expand" is not
+ necessary.
+
+Wed Nov 12 14:09:43 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/monitor/test_monitor.rb: fix the timing problem by Queue.
+
+Wed Nov 12 12:59:44 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/monitor/test_monitor.rb: added.
+
+Wed Nov 12 10:14:28 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/monitor.rb: refactored. Thanks, Gennady Bystritsky.
+
+Wed Nov 12 06:11:39 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary):
+ add functions to convert STACK into Array.
+
+ * ext/openssl/ossl.h: add prototypes.
+
+ * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_set_certificates,
+ ossl_pkcs7_get_certificates, ossl_pkcs7_get_crls,
+ ossl_pkcs7_set_crls): add functions for PKCS7#certificates=
+ PKCS7#certificates, PKCS7#crls= and PKCS7#crls.
+
+Wed Nov 12 00:47:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/ui/testrunnermediator.rb: should require 'test/unit'.
+
+Tue Nov 11 23:54:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/ui/gtk/testrunner.rb: added a rescue clause to handle
+ the case when the requested font is not available.
+
+Tue Nov 11 22:44:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (appendline): file may not end with newline. a bug if
+ READ_DATA_PENDING_PTR is defined. [ruby-talk:84925]
+
+Tue Nov 11 10:42:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: raise an exception when creating TkWindow
+ object, because TkWindow class is an abstract class.
+
+Tue Nov 11 03:30:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
+ if the specified value doesn't exist.
+
+ * lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
+ a empty hash if the specified section doesn't exist.
+
+Mon Nov 10 11:40:29 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/monitor.rb (wait): return true on signal/broadcastfalse and
+ false on timeout. Thanks Gennady Bystritsky.
+
+Mon Nov 10 00:07:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (primary): primary_value may be 0 when syntax error.
+ [ruby-talk:84893]
+
+Sun Nov 9 02:05:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
+ maintain symmetry with #assert_nil. Also added better output for
+ #assert_kind_of.
+
+ * test/testunit/tc_assertions.rb: ditto.
+
+Sat Nov 8 18:50:20 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/wsdl/raa/*: add new testcase for WSDL loading, parsing and
+ reading.
+
+ * test/soap/marshal/*: backport from soap4r/1.5.1. all differences are
+ for ruby/1.6.
+
+ * lib/soap/*: backport from soap4r/1.5.1. all differences are for
+ ruby/1.6.
+
+ * lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of
+ ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*.
+ [ruby-talk:84813]
+
+ * lib/wsdl/soap/definitions.rb: element name typo in custom exception
+ struct definition which is needed for wsdlDriver; camelCase ->
+ underscore_name.
+
+Sat Nov 8 13:49:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * configure.in: improvement of pthread check
+
+Sat Nov 8 13:28:46 2003 Takaaki Tateishi <ttate@ttsky.net>
+
+ * ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
+ Thanks, Kaoru Shirai.
+
+Sat Nov 8 06:19:38 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
+ TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
+ (queueing a handler to the EventQueue).
+
+ * ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
+
+Fri Nov 7 23:23:04 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Pathname#+): if self or the argument is `.', return
+ another.
+ (Pathname#parent): if self is `.', return `..'.
+ (Pathname#children): if self is `.', don't prepend self for a
+ pathname in a result.
+ (Pathname#join): re-implemented using Pathname#+.
+ (Pathname#find): if self is `.', remove `./' prefix of yielding
+ pathname.
+
+Fri Nov 7 10:23:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/socket.c (make_hostent): get rid of SEGV on aliases
+ lookup failure. (ruby-bugs:PR#1215)
+
+Fri Nov 7 04:08:05 2003 UENO Katsuhiro <katsu@blue.sky.or.jp>
+
+ * ext/zlib/zlib.c (Init_zlib): define Zlib::GzipReader#each_line as
+ an alias of Zlib::GzipReader#each.
+
+Fri Nov 7 01:03:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_load): save and restore rb_prohibit_interrupt.
+ [ruby-dev:21857]
+
+Thu Nov 6 18:05:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * io.c (rb_io_inspect): show the path also at a closed file.
+ [ruby-dev:21851]
+
+Thu Nov 6 11:42:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_set_string, strio_reopen): check
+ tainted.
+
+ * ext/stringio/stringio.c (strio_copy, strio_ungetc, strio_write,
+ strio_putc): add infection.
+
+ * ext/stringio/stringio.c (strio_path): just nil. [ruby-dev:21846]
+
+ * ruby.c (proc_options): reserve searched script path in the
+ source file name table. [ruby-list:38765]
+
+ * lib/optparse.rb (OptionParser::Completion#complete): default not to
+ ignore case on completion. [ruby-talk:84726]
+
+ * win32/win32.c (make_cmdvector): process backslashes even if a quote
+ is not enclosed.
+
+Wed Nov 5 23:49:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * sample/openssl/gen_csr.rb: there (at least) is a CA which does not
+ accept DN in UTF8STRING format. it's a sample.
+
+Wed Nov 5 22:55:16 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * configure.in, eval.c, signal.c: : add '--with-pthread-ext'
+ option to fix the pthread trouble on 'tcltklib'
+
+ * ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
+
+ * 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
+ tk_menuSetFocus
+
+Wed Nov 5 17:33:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_load): allow interrupt during loaded program
+ evaluation. [ruby-dev:21834]
+
+ * hash.c (rb_hash_fetch): always warn if default argument and a
+ block are supplied at the same time. [ruby-dev:21842]
+
+ * hash.c (env_fetch): ditto.
+
+ * array.c (rb_ary_fetch): ditto.
+
+Wed Nov 5 19:08:47 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
+ do not remove next argument if empty value is placed.
+
+ * test/optparse: added.
+
+Wed Nov 5 17:05:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/ui/gtk/testrunner.rb: typo.
+
+Wed Nov 5 11:13:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * string.c: add #include "version.h". this file still depends on it.
+
+ * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
+ wince/Makefile.sub: add version.h dependency to string.c.
+
+Wed Nov 5 09:14:23 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/monitor.rb: revert to the previous revision.
+
+Wed Nov 5 08:39:51 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/https.rb (HTTPRequest#parse): set @client_cert_chain.
+
+ * lib/webrick/https.rb (HTTPRequest#meta_vars): create
+ SSL_CLIENT_CERT_CHAIN_n from @client_cert_chain.
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
+ if no cert-chain was given.
+
+Tue Nov 4 23:44:48 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
+ remove needless version.h dependency.
+
+Tue Nov 4 23:38:43 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * class.c, hash.c, string.c: remove #include "version.h".
+
+ * Makefile.in: remove needless version.h dependency.
+
+Tue Nov 4 06:54:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (read_all): fptr->f may be NULL, if IO is closed in the
+ signal handler.
+
+ * io.c (io_read): ditto.
+
+ * string.c (get_pat): remove 1.8.0 warning code.
+
+ * string.c (rb_str_match): extend warning until 1.8.2.
+
+ * string.c (rb_str_match2): ditto.
+
+ * class.c (class_instance_method_list): remove 1.8.0 warnings.
+ method_list now recurs. [ruby-dev:21816]
+
+ * class.c (rb_obj_singleton_methods): ditto.
+
+ * array.c (rb_ary_select): remove select with block.
+ [ruby-dev:21824]
+
+ * hash.c (rb_hash_select): ditto.
+
+ * hash.c (env_select): ditto.
+
+ * re.c (match_select): ditto.
+
+ * struct.c (rb_struct_select): ditto.
+
+Mon Nov 3 22:53:21 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/racc/parser.rb: synchronize with Racc 1.4.4.
+
+ * ext/racc/cparse/cparse.c: ditto.
+
+ * ext/racc/cparse/cparse.c (parse_main): should abort when
+ the length of LR state stack <=1, not ==0.
+
+Mon Nov 3 08:50:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * process.c (check_uid_switch): remove duplicated error messages.
+
+ * process.c (check_gid_switch): ditto.
+
+Sun Nov 2 02:28:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/ssl.rb: new option :SSLExtraChainCert.
+
+Sun Nov 2 01:02:04 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * string.c (rb_str_hash): Update the HASH_PERL alternative hash
+ algorithm in sync with Perl 5.8.
+
+ * st.c (strhash): Ditto.
+
+Sat Nov 1 18:21:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
+ SSLSocket#peer_cert_chain.
+
+ * ext/openssl/ossl_x509req.c (GetX509ReqPtr): new function
+ which returns underlying X509_REQ.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_issuer_cert,
+ ossl_x509extfactory_set_subject_cert, ossl_x509extfactory_set_crl,
+ ossl_x509extfactory_set_subject_req, ossl_x509extfactory_set_config):
+ use underlying C struct without duplication not to leak momory.
+
+Sat Nov 1 01:49:03 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/mapping/factory.rb: mark marshalled basetype objects when
+ @allow_original_mapping is true. multi-referencing basetype node is
+ prohibited in SOAP/1.1 encoding but soap4r's original ruby object
+ mapping requires basetype to be marked to detect self referencing
+ loop. e.g. o = 1; o.instance_eval { @iv = o } soap4r's original
+ mapping is only used through soap/marshal API.
+
+ * test/soap/marshal/test_marshal.rb: add tests for self referencing
+ immutable objects.
+
+ * test/soap/calc/test_calc_cgi.rb: fix test name.
+
+Fri Oct 31 22:26:29 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+ * wince/string_wce.c (strrchr): should decrement pointer.
+
+ * wince/Makefile.sub: correct a range of isdigit().
+
+Fri Oct 31 12:55:24 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
+ [ruby-dev:21791]
+
+ * bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
+
+Fri Oct 31 01:38:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces
+ at the beginning of line to remove by sed. (ruby-bugs-ja:PR#580)
+
+Fri Oct 31 01:02:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * compar.c (cmp_equal): protect exceptions from <=> comparison
+ again. returns nil if any exception or error happened during
+ comparison.
+
+ * eval.c (search_required): should update *featurep when DLEXT2 is
+ defined. (ruby-bugs-ja:PR#581)
+
+Thu Oct 30 23:41:04 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/drb.rb: add DRbArray
+
+ * lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
+
+ * lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
+
+Thu Oct 30 23:19:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/generator.rb: better XML pretty printing.
+
+ * lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
+ assignment in the element which has "encodingStyle" attribute, and
+ add necessary namespace assignment for "arrayType" attribute.
+
+ * test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
+ through CGI.
+
+Thu Oct 30 22:59:39 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/yaml2byte.c: HASH const too long. Thanks, matz.
+
+Thu Oct 30 19:13:53 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/syck/MANIFEST: Add yamlbyte.h.
+
+Thu Oct 30 14:25:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
+ buffer filled.
+
+ * io.c (rb_io_fptr_cleanup): move path deallocation to
+ rb_io_fptr_finalize (finalizer called by GC).
+
+Thu Oct 30 13:23:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (logop): left may be NULL. [ruby-talk:84539]
+
+ * eval.c (rb_eval): NODE_CASE nd_head may be NULL.
+
+Thu Oct 30 10:14:51 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/test/unit/autorunner.rb: make fox runner work.
+
+Thu Oct 30 09:32:26 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * process.c (rb_f_system): fixed lack of security check before
+ calling do_spawn() on win32. [ruby-talk:84555]
+
+Thu Oct 30 02:46:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (proc_invoke): single array value to normal Proc#call
+ (i.e. not via lambda call), should be treated just like yield.
+ [ruby-dev:21726]
+
+Thu Oct 30 02:25:48 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
+ add new method to inherit @sync from @io.sync.
+
+ * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
+ set sync flag explicitly.
+
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
+
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
+ certificates in @extra_chain_cert.
+
+Wed Oct 29 22:02:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
+ interpreter to exec, instead of test/ruby/envutil.rb,
+
+Wed Oct 29 19:58:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
+ defined and TCL_MAJOR_VERSION >= 8.
+
+ * ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
+ rb_threadVwaitProc): use CONST84 instead of CONST.
+
+ * ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
+ ip_rb_threadTkWaitCommand): use CONST84 always.
+
+Wed Oct 29 17:27:05 2003 Tanaka Akira <akr@m17n.org>
+
+ * re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
+
+ * lib/pathname.rb (realpath): examine Dir.pwd because it may have
+ symlinks.
+
+Wed Oct 29 17:16:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_longjmp): must not disturb original jump.
+ [ruby-dev:21733]
+
+Wed Oct 29 15:28:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (Init_Proc): taint preallocated exception object
+ sysstack_error. [ruby-talk:84534]
+
+Wed Oct 29 11:27:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (ret_args): node may be NULL. [ruby-talk:84530]
+
+Tue Oct 28 15:20:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd,
+ WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
+ ip_rbTkWaitObjCmd, ip_rbTkWaitCommand, rb_threadVwaitProc,
+ rb_threadWaitVisibilityProc, rb_threadWaitWindowProc,
+ ip_rb_threadVwaitObjCmd, ip_rb_threadTkWaitObjCmd): prototype;
+ avoid VC++ warnings.
+
+Mon Oct 27 19:19:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_longjmp): ignore reentering error while warning.
+ [ruby-dev:21730]
+
+Mon Oct 27 00:23:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
+ calling 'exit' in the Tk callback procedure. [ruby-list:38656]
+
+Sat Oct 25 09:18:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_method_missing): protect exception from within
+ "inspect". (ruby-bugs:PR#1204)
+
+Fri Oct 24 23:26:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * hash.c (rb_hash_each): Hash#each should yield single value.
+ [ruby-talk:84420]
+
+ * hash.c (env_each): ditto for ENV.each.
+
+Thu Oct 23 20:25:32 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/server.rb (GenericServer#start): should rescue
+ IOError from IO::accept. [ruby-dev:21692]
+
+Thu Oct 23 17:59:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (ruby_cleanup): initialize stack bottom for embedding.
+ [ruby-dev:21686]
+
+ * ext/dl/extconf.rb: move list of files to clean from DEPEND file,
+ to get rid of macro redefinitions.
+
+Thu Oct 23 13:44:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y: integrate operations for stack_type. [ruby-dev:21681]
+
+Thu Oct 23 00:41:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/calc/*, test/soap/helloworld/*: set logging threshold
+ to ERROR.
+
+Wed Oct 22 12:53:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
+ ignore tests which raised LoadError.
+
+ * test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
+ test/ruby/test_system.rb: avoid requiring same file twice.
+
+ * test/drb/test_drbssl.rb, test/drb/test_drbunix.rb: should not use
+ ARGV unless invoked directly. do not create test cases unless
+ required libraries are available.
+
+Wed Oct 22 02:31:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (ruby_cleanup): should not ignore exit_value in END
+ execution. [ruby-dev:21670]
+
+Tue Oct 21 23:16:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (ruby_cleanup): call finalizers and exit procs before
+ terminating threads.
+
+ * eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
+
+Tue Oct 21 15:57:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
+ prepend the directory of target file to the load path.
+
+Tue Oct 21 15:08:53 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (do_spawn, do_aspawn): should wait child process even
+ if callded with P_OVERLAY.
+
+ * win32/win32.c (do_spawn, do_aspawn): should return child's exit
+ status to parent.
+
+Tue Oct 21 00:35:02 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/calc/*, test/soap/helloworld/*: catch the exception from
+ test server thread and recover.
+
+Tue Oct 21 00:22:57 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * test/drb/*: import drb/runit.
+
+Mon Oct 20 23:55:47 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval): set current node after arguments evaluation.
+ [ruby-dev:21632]
+
+ * eval.c (rb_yield_0): set current node and keep it at local jump.
+
+Mon Oct 20 22:01:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_cleanup): keep thread group for main thread.
+ [ruby-dev:21644]
+
+Mon Oct 20 18:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_catch): backout.
+
+Mon Oct 20 17:31:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
+ destination.
+
+ * eval.c (localjump_destination): use unique number in ruby_frame
+ for localjump destination.
+
+Mon Oct 20 11:31:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_signal.rb (test_signal): restore old trap.
+
+Mon Oct 20 11:00:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (gc_sweep): loosen page free condition to avoid add_heap()
+ race condition. [ruby-dev:21633]
+
+ * gc.c (gc_sweep): do not update malloc_limit when malloc_increase
+ is smaller than malloc_limit.
+
+Mon Oct 20 09:45:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/debug.rb (debug_command): remove debug print.
+
+Sun Oct 19 13:12:30 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
+
+Sun Oct 19 00:14:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
+ server. (17171)
+
+Sat Oct 18 23:01:32 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
+
+Sat Oct 18 05:48:59 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/rubyext.c: YAML::Syck::compile method.
+
+ * ext/syck/syck.c: Buffer edge bug.
+
+ * ext/syck/yaml2byte.c: YAML to bytecode converter.
+
+ * ext/syck/yamlbyte.h: Ditto.
+
+ * ext/syck/bytecode.c: Bytecode parser fixes to empty collections
+ and empty strings.
+
+ * ext/syck/token.c: Ditto.
+
+Fri Oct 17 23:07:38 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/enumerator/enumerator.c, ext/enumerator/enumerator.txt:
+ Provide Kernel#to_enum as an alias for Kernel#enum_for. Maybe
+ this is a better name.
+
+Fri Oct 17 23:00:30 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/generator.rb: Add rdoc documentation.
+
+Fri Oct 17 22:16:42 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/set.rb: Reword and fix Overview.
+
+ * lib/set.rb: It is not necessary to require
+ 'test/unit/ui/console/testrunner'.
+
+Fri Oct 17 11:15:22 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_range.rb: added.
+
+ * MANIFEST: add test/ruby/test_range.rb.
+
+Fri Oct 17 03:21:23 2003 William Sobel <will.sobel@barra.com>
+
+ * ext/socket/socket.c (make_hostent): h_aliases may be NULL.
+ (ruby-bugs:PR#1195)
+
+ * ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
+
+Fri Oct 17 00:12:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
+ without initializing on TkComposite module.
+
+Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
+ in a callback operation, Ruby/Tk shows a (verbose) backtrace
+ information on the callback process.
+
+Thu Oct 16 17:09:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
+ debug_silent_eval() when $1 is not set. (ruby-bugs:PR#1194)
+
+Thu Oct 16 16:54:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (rb_str_upto): ("a"..."a").to_a should return [].
+ [ruby-core:01634]
+
+Thu Oct 16 16:40:51 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb:
+ Add Tk::EncodedString and Tk::UTF8_String class to support
+ characters using the \uXXXX escape to the UNICODE string.
+
+ * ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
+ new demo-scripts (samples of Tk::UTF8_String)
+
+ * ext/tk/sample/{demos-en,demos-jp}/widget
+ add entries for 'unicodeout.rb'
+
+Thu Oct 16 08:38:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/digest/test_digest.rb (test_eq): show failed class.
+
+ * test/ruby/test_iterator.rb (test_break, test_return_trace_func):
+ test localjump destination.
+
+Wed Oct 15 20:22:31 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
+ instance_eval('path_query'). [ruby-list:38575]
+
+Wed Oct 15 17:24:45 2003 URABE Shyouhei <root@mput.dip.jp>
+
+ * lib/cgi.rb (CGI::Cookie): tiny typo fix.
+
+Wed Oct 15 15:00:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (ruby_run): just return FAILURE instead of parse error
+ count. [ruby-list:38569]
+
+Wed Oct 15 13:17:02 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/digest/digest.c (rb_digest_base_alloc): need to initialize
+ buffer. [ruby-dev:21622]
+
+Wed Oct 15 11:23:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_object): dump extended modules as well.
+
+ * marshal.c (r_object0): TYPE_USRMARSHAL should restore extended
+ modules before invoking marshal_load. these two fixes are done
+ by Masatoshi Seki <m_seki@mva.biglobe.ne.jp>.
+
+Wed Oct 15 09:30:34 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
+
+ * ext/syck/syck.h: include stdio.h for definition of FILE.
+
+Wed Oct 15 08:09:07 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/bytecode.c: Checkin of YAML bytecode support.
+
+ * ext/syck/gram.c: Ditto.
+
+ * ext/syck/syck.c: Ditto.
+
+ * ext/syck/token.c: Ditto.
+
+ * ext/syck/handler.c: Ditto.
+
+ * ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
+
+ * ext/syck/rubyext.c: Ditto (on both counts).
+
+Wed Oct 15 05:05:53 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/generator.rb: A new library which converts an internal
+ iterator to an external iterator.
+
+ * lib/abbrev.rb: A new library which creates an abbreviation table
+ from a list.
+
+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:
+ new demo-scripts
+
+ * 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>
+
+ * test/digest/test_digest.rb: Moved from ext/digest/test.rb.
+
+Wed Oct 15 03:53:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
+ on the last commit).
+
+Wed Oct 15 00:25:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (yylex): argument parentheses preceded by spaces should
+ be warned; not error. [ruby-talk:84103]
+
+Wed Oct 15 00:20:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
+ switch on threads smoothly and avoid seg-fault.
+
+ * ext/tcltklib/tcltklib.c: add TclTkIp._thread_vwait and
+ _thread_tkwait for waiting on a thread. (Because Tcl/Tk's vwait
+ and tkwait command wait on an eventloop.)
+
+ * ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
+ _thread_tkwait.
+
+ * ext/tk/lib/tk.rb: now, TkVariable#wait has 2 arguments.
+ If 1st argument is true, waits on a thread. If false, waits on
+ an eventloop. If 2nd argument is true, checks existence of
+ rootwidgets. If false, doesn't. Default is wait(true, false).
+
+ * ext/tk/lib/tk.rb: add TkVariable#tkwait(arg) which is equal to
+ TkVariable#wait(arg, true). wait_visibility and wait_destroy
+ have an argument for waiting on a thread or an eventloop.
+
+ * ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
+
+ * ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
+ an eventloop'.
+
+Wed Oct 15 00:10:24 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
+ SOAPBasetype and SOAPCompoundtype.
+
+ * lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
+ Encoding methods signature change. Pass SOAPGenerator as a parameter.
+
+ * lib/soap/mapping/*, test/soap/marshal/test_marshal.rb: Refactoring
+ for better marshalling/unmarshalling support. Now I think SOAP
+ marshaller supports all kind of object graph which is supported by
+ Ruby's original marshaller. Of course there could be bugs as always.
+ Find it. :-)
+
+ * lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
+ DEBUG is too noisy.
+
+ * lib/xsd/datatypes.rb: DateTime#of is obsoleted. Use DateTime#offset.
+
+ * test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
+ useless warning.
+
+Tue Oct 14 19:09:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (ruby_finalize_0): return the given exit status unless
+ SystemExit got raised.
+
+Tue Oct 14 11:53:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * intern.h (ruby_stop): never return.
+
+ * ruby.h (ruby_run): ditto.
+
+Tue Oct 14 04:43:55 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (realpath): make ELOOP check bit more robust.
+ (children): prepend self by default.
+ (chroot): obsoleted.
+
+Tue Oct 14 02:29:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_require_safe): segfault after loading .so.
+
+Tue Oct 14 02:05:23 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
+ module for the Enumerable interface.
+
+Mon Oct 13 23:55:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
+ not "ruby".
+
+Mon Oct 13 23:57:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_feature_p): match by classified suffix.
+
+ * eval.c (rb_require_safe): require library in the specified safe
+ level.
+
+ * variable.c (rb_autoload, rb_autoload_load): restore safe level
+ when autoload was called. [ruby-dev:21338]
+
+ * intern.h: prototypes; rb_require_safe.
+
+ * test/runner.rb: accept non-option arguments.
+
+Mon Oct 13 20:49:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * string.c (str_new4): should not preserve FL_TAINT status in the
+ internal shared string. [ruby-dev:21601]
+
+ * string.c (rb_str_new4): ditto.
+
+ * eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
+
+ * process.c: ditto. [ruby-list:38521]
+
+Mon Oct 13 19:51:02 2003 Koji Arai <jca02266@nifty.ne.jp>
+
+ * lib/debug.rb (debug_command): should enter emacs mode when
+ assigned any value to the environment variable "EMACS".
+ On Meadow, (getenv "EMACS") is "meadow".
+
+Sun Oct 12 14:45:03 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/win32ole/extconf.rb: check "windows.h", not "windows".
+ [ruby-talk:84051]
+
+Sat Oct 11 20:41:03 2003 Corinna Vinschen <corinna@vinschen.de>
+
+ * file.c (eaccess): Use access(2) on Cygwin.
+
+Sat Oct 11 17:09:21 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/rexml/quickpath.rb (REXML::QuickPath::match):
+ escape '[' to avoid warning.
+
+Sat Oct 11 16:08:41 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (realpath): check existence of the file.
+
+ * lib/pathname.rb (realpath): re-implemented.
+ (realpath_root?, realpath_rec): removed
+
+Sat Oct 11 10:19:39 2003 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
+ Bystritsky.
+
+Fri Oct 10 07:50:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (is_defined): inheritance line adjustment as like as
+ rb_call_super().
+
+Fri Oct 10 01:19:00 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): add
+ optional argument to specify the DirectoryString type
+ (ASN1::UTF8STRING by default). RFC3280 deprecates PrintableString
+ for DirectoryString, and strongly requires to use UTF8String for
+ all certificates issued after December, 31 2003.
+
+ * ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
+
+Thu Oct 9 23:50:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_start_0): prevent thread from GC.
+ [ruby-dev:21572]
+
+Thu Oct 9 19:11:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_start_0): non-volatile should be restored from
+ volatile.
+
+Thu Oct 9 17:43:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (proc_save_safe_level, proc_get_safe_level,
+ proc_set_safe_level): save/restore safe level 1..4.
+
+Thu Oct 9 16:33:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (r_object0): remove unnecessary iv restoration for
+ USRMARSHAL. [ruby-dev:21582]
+
+ * marshal.c (w_object): dump generic instance variables from
+ a string from '_dump'.
+
+ * variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
+ is not set.
+
+ * time.c (time_dump): copy instance variables to dumped string, to
+ be included in the marshaled data.
+
+ * bignum.c (rb_big2ulong): add range check to ensure round trip.
+
+Thu Oct 9 15:45:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * pack.c (uv_to_utf8): change message to "out of range", since
+ negative values are not "too big". [ruby-dev:21567]
+
+Thu Oct 9 14:05:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
+ [ruby-dev:21557]
+
+Thu Oct 9 10:51:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_yield_0): no error if block is empty.
+
+Thu Oct 9 06:43:33 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (localjump_error): id should be ID.
+
+ * eval.c (rb_eval): nd_rval is set in copy_node_scope().
+
+ * eval.c (rb_yield_0): unused variable.
+
+ * eval.c (rb_yield_0): nothing to do for empty node.
+
+ * eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
+ [ruby-dev:21551]
+
+ * eval.c (rb_thread_start_0): set the value by break as the result.
+ [ruby-dev:21552]
+
+ * eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
+ variables across THREAD_SAVE_CONTEXT.
+
+Thu Oct 9 12:05:46 2003 Eric Sunshine <sunshine@sunshineco.com>
+
+ * configure.in: revived NextStep, OpenStep, and Rhapsody ports which
+ had become unbuildable; enhanced --enable-fat-binary option so that
+ it accepts a list of desired architectures (rather than assuming a
+ fixed list), or defaults to a platform-appropriate list if user does
+ not provide an explicit list; made the default list of architectures
+ for MAB (fat binary) more comprehensive; now uses -fno-common even
+ when building the interpreter (in addition to using it for
+ extensions), thus allowing the interpreter to be embedded into a
+ plugin module of an external project (in addition to allowing
+ embedding directly into an application); added checks for
+ <netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
+ ensures that -I/usr/local/include is employed when extensions'
+ extconf.rb scripts invoke have_header() since extension checks on
+ NextStep and OpenStep will fail without it if the desired resource
+ resides in the /usr/local tree; fixed formatting of --help message.
+
+ * Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
+ invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
+ (see configure's --enable-fat-binary option); added rule for new
+ missing/getcwd.c.
+
+ * defines.h: fixed endian handling during MAB build (see configure's
+ --enable-fat-binary option) to ensure that all portions of the
+ project see the correct WORDS_BIGENDIAN value (some extension modules
+ were getting the wrong endian setting); added missing constants
+ GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
+ and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
+ define in NeXT section.
+
+ * dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
+ NextStep since, on some installations, this value always resolves
+ uselessly to zero.
+
+ * dln.c: added error reporting to NextStep extension loader since the
+ previous behavior of failing silently was not useful; now ensures
+ that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
+ for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
+ on Rhapsody since this header lacks multiple-include protection,
+ which resulted in "redefinition" compilation errors.
+
+ * main.c: also create hard reference to objc_msgSend() on NeXT
+ platforms (in addition to Apple platforms).
+
+ * lib/mkmf.rb: now exports XCFLAGS from configure script to extension
+ makefiles so that extensions can be built MAB (see configure's
+ --enable-fat-binary option); also utilize XCFLAGS in cc_command()
+ (but not cpp_command() because MAB flags are incompatible with
+ direct invocation of `cpp').
+
+ * ext/curses/extconf.rb: now additionally checks for presence of these
+ curses functions which are not present on NextStep or Openstep:
+ bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
+ setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
+ wscrl(), wsetscrreg()
+
+ * ext/curses/curses.c: added appropriate #ifdef's for additional set of
+ curses functions now checked by extconf.rb; fixed curses_bkgd() and
+ window_bkgd() to correctly return boolean result rather than numeric
+ result; fixed window_getbkgd() to correctly signal an error by
+ returning nil rather than -1.
+
+ * ext/etc/etc.c: setup_passwd() and setup_group() now check for null
+ pointers before invoking rb_tainted_str_new2() upon fields extracted
+ from `struct passwd' and `struct group' since null pointers in some
+ fields are common on NextStep/OpenStep (especially so for the
+ `pw_comment' field) and rb_tainted_str_new2() throws an exception
+ when it receives a null pointer.
+
+ * ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
+ platforms such as NextStep and OpenStep which lack strdup().
+
+ * ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
+ gethostbyaddr(), and gethostbyname() from (const char*) to non-const
+ (char*) for older platforms such as NextStep and OpenStep.
+
+ * ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
+ platforms such as NextStep and OpenStep which lack strdup(); include
+ <netinet/in_systm.h> if present for NextStep and OpenStep; cast first
+ argument of gethostbyaddr() and getservbyname() from (const char*) to
+ non-const (char*) for older platforms.
+
+ * ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
+ platforms such as NextStep and OpenStep which lack strdup().
+
+Wed Oct 8 22:19:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit.rb: removed installation instructions.
+
+ * lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
+ central location.
+
+ * lib/test/unit.rb: ditto.
+
+ * lib/test/unit.rb: extracted the running code in to AutoRunner.
+
+ * lib/test/unit/autorunner.rb: added.
+
+ * lib/test/unit/collector/objectspace.rb: extracted common test
+ collection functionality in to a module.
+
+ * lib/test/unit/collector.rb: ditto; added.
+
+ * test/testunit/collector/test_objectspace.rb: ditto.
+
+ * lib/test/unit/collector/dir.rb: added. Supports collecting tests out
+ of a directory structure.
+
+ * test/testunit/collector/test_dir.rb: added.
+
+ * test/runner.rb: simplified to use the new capabilities.
+
+Tue Oct 7 15:23:09 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
+
+ * test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
+
+ * test/ruby/endblockwarn.rb: new file added to test of END-in-method
+ warning.
+
+Tue Oct 7 12:23:47 2003 Tanaka Akira <akr@m17n.org>
+
+ * ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
+
+ * ext/socket/extconf.rb: useless assignment removed.
+
+Tue Oct 7 09:13:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
+ allowed in eval.
+
+Tue Oct 7 04:15:25 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (stmt): should not expand mrhs if lhs is solely starred.
+
+Tue Oct 7 02:57:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (stmt): rhs of multiple assignment should not be
+ expanded using "to_a". [ruby-dev:21527]
+
+Tue Oct 7 01:42:34 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
+ free function for ASN1_OBJECT.
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
+ ASN1::ObjectId#sn; it returns short name text representation of OID.
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
+ ASN1::ObjectId#ln; it returns long name text representation of OID.
+
+ * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
+ ASN1::ObjectId#oid; it returns numerical representation of OID.
+
+Mon Oct 6 22:59:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/csv.rb (IOReader, BasicWriter): call binmode when a given IO
+ respond_to?(:binmode). record separator was wrong when you gave
+ text mode IO to Reader.parse and Writer.generate.
+
+ * test/csv/test_csv.rb: add tests for above change.
+
+Mon Oct 6 16:23:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (w_object): wrong method name in the message.
+
+Mon Oct 6 16:02:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (stmt): END in method should cause warning.
+ [ruby-dev:21519]
+
+Mon Oct 6 15:17:23 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_iterator.rb (test_block_argument_without_paren):
+ added. (follows sample/test.rb)
+
+Mon Oct 6 11:57:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
+ test for eval-ed BEGIN END order.
+
+Mon Oct 6 09:19:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_object): should pass "weak" value to next level.
+ [ruby-dev:21496]
+
+ * eval.c (proc_alloc): should not use cached object if klass is
+ different. [ruby-talk:83685]
+
+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>
+
+ * eval.c (rb_f_END): block should be given. [ruby-dev:21497]
+
+Sun Oct 5 22:51:23 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/ext/openssl/extconf.rb: add check for some engine functions
+ unavailable in OpenSSL-0.9.6.
+
+ * lib/ext/openssl/ossl_engine.c: ditto.
+
+Sun Oct 5 17:56:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval): fix evaluation order. [ruby-list:38431]
+
+Sun Oct 5 15:05:06 2003 akira yamada <akira@ruby-lang.org>
+
+ * test/uri/*: translated RUNIT to Test::Unit.
+
+Sun Oct 5 14:37:39 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
+
+ * test/soap/marshal/test_marshal.rb: ditto.
+
+ * test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
+ RUBYBIN.
+
+Sun Oct 5 13:47:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
+ about scope, order and allowed syntax.
+
+Sun Oct 5 11:54:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/envutil.rb: added. split "rubybin" from test_system.rb.
+
+ * test/ruby/test_system.rb: use envutil.rb
+
+ * test/ruby/test_beginendblock.rb: added.
+
+ * test/ruby/beginmainend.rb: added. used in test_beginendblock.rb.
+
+Sun Oct 5 11:23:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * test/testunit/runit/test_testresult.rb: removed some unnecessary
+ cruft.
+
+Sun Oct 5 11:14:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/rubyunit.rb: aliasing TestCase into the top level is
+ problematic.
+
+ * lib/runit/assert.rb: fixed a couple of bugs caused by recent
+ refactoring in Test::Unit.
+
+ * test/testunit/runit/*: added.
+
+Sun Oct 5 10:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
+ work. [ruby-dev:21484]
+
+Sun Oct 5 09:52:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: will use pp for output if available.
+ Can be disabled by setting Assertions.use_pp = false.
+
+ * test/testunit/test_assertions.rb: made a small change to exception
+ formatting.
+
+Sun Oct 5 07:42:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: made small improvements to assertion
+ messages. Deprecated Assertions#assert_not_nil; use #assert instead.
+
+ * test/testunit/test_assertions.rb: ditto.
+
+ * test/testunit/util/test_procwrapper.rb: use #assert instead of
+ #assert_not_nil.
+
+Sun Oct 5 04:10:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: refactored message building.
+
+Sun Oct 5 03:40:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_asn1.h: global symbols should be declared
+ as external.
+
+Sun Oct 5 03:03:20 2003 akira yamada <akira@ruby-lang.org>
+
+ * test/ruby/test_exception.rb (test_else): added.
+
+Sun Oct 5 02:12:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: changed assertion messages to rely more
+ heavily on #inspect. Added backtrace filtering for exceptions in
+ assertion messages.
+
+ * test/testunit/test_assertions.rb: ditto.
+
+Sun Oct 5 02:12:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/acl.rb, lib/drb/ssl.rb: added.
+
+ * lib/drb/drb.rb: exit from a thread using 'break'.
+
+Sat Oct 4 21:49:14 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * gc.c (Init_stack): the type of space is changed to unsigned int
+ from double. [ruby-dev:21483]
+
+Sat Oct 4 17:52:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/netHttpClient.rb: follow http-access2. hosts which matches
+ ENV['no_proxy'] or ENV['NO_PROXY'] are not proxyed.
+ - [,:] separated. ("ruby-lang.org:rubyist.net")
+ - no regexp. (give "ruby-lang.org", not "*.ruby-lang.org")
+ - if you want specify host by IP address, give full address.
+ ("192.168.1.1, 192.168.1.2")
+
+ * lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
+
+ * test/runner.rb: give testsuite name.
+
+Sat Oct 4 15:16:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_object): instance variable dump do not cause error
+ for objects that cannot be dumped, if they traversed from
+ marshal_dump. they are just ignored.
+
+ * gc.c (Init_stack): cast "space" (doble value) into unsigned
+ int. should run on PowerPC.
+
+ * eval.c (rb_eval): should not execute else part if any exception
+ is caught. [ruby-dev:21482]
+
+ * parse.y (f_args): should allow unparenthesized block argument.
+
+ * parse.y (f_rest_arg): should allow unparenthesized rest
+ argument.
+
+Sat Oct 4 14:59:51 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (initialize): raise ArgumentError if argument has
+ '\0' character.
+ (relative_path_from): new method.
+ (each_entry): new method for replacement of dir_foreach.
+ (foreach, foreachline, dir_foreach, chdir): obsoleted.
+
+Sat Oct 4 12:58:48 2003 akira yamada <akira@ruby-lang.org>
+
+ * test/uri/* (6 files): added.
+
+Sat Oct 4 12:44:45 2003 akira yamada <akira@ruby-lang.org>
+
+ * lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+
+Sat Oct 4 07:33:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/testsuite.rb: changed #<< to return self, and added
+ #delete.
+
+ * test/testunit/test_testsuite.rb: ditto. Also slightly refactored
+ #test_size.
+
+ * lib/test/unit/collector/objectspace.rb: collector now preserves the
+ hierarchy of suites.
+
+ * test/testunit/collector/test_objectspace.rb: ditto.
+
+Sat Oct 4 04:48:49 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/rubyext.c: default keys handled.
+
+ * ext/syck/syck.h: lowered default buffer size to 16k for increased
+ performance.
+
+ * test/yaml: checkin of basic unit tests.
+
+Sat Oct 4 04:24:19 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/extconf.rb: add check for X509V3_set_nconf.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
+ cannot implement if X509V3_set_nconf doesn't exist.
+
+Sat Oct 4 02:12:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/xsd/datatypes.rb: dump sign by itself. under the problematic
+ platform, sprintf("%+.10g", -0.0) => +0. sigh.
+
+ * sample/wsdl/amazon/*: update schema ver2 to ver3.
+
+Sat Oct 4 01:33:46 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (initialize): duplicate and freeze argument.
+ (to_s): return duplicated string.
+ (children): new method.
+ (each_line): new alias to foreachline.
+
+Fri Oct 3 16:13:19 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_asn1.c: add DER encoder and decoder.
+
+ * ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
+
+ * ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
+
+ * ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
+
+ * ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
+ DER encoded data argument.
+
+ * ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
+ DER encoded data in OpenSSL::ASN1 types.
+
+Fri Oct 3 13:02:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit.rb: refactored to use optparse.
+
+ * lib/test/unit.rb: added support for selecting the output
+ level from the command-line.
+
+ * lib/test/unit.rb: added a command-line switch to stop processing
+ the command-line, allowing arguments to be passed to tests.
+
+ * lib/test/unit.rb: changed the method for specifying a runner or a
+ filter from the command-line.
+
+ * lib/test/unit/collector/objectspace.rb: fixed a bug causing all
+ tests to be excluded when the filter was set to an empty array.
+
+ * test/testunit/collector/test_objectspace.rb: ditto.
+
+Fri Oct 3 08:14:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
+ 'class ::Foo' syntax. [ruby-talk:83514]
+
+Fri Oct 3 08:01:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: added a default message for #assert,
+ #assert_block, and #flunk.
+
+ * test/testunit/test_assertions.rb: ditto.
+
+ * lib/test/unit/failure.rb: failures now show a better trace of where
+ they occurred.
+
+ * test/testunit/test_failure.rb: ditto (added).
+
+ * lib/test/unit/testcase.rb: ditto.
+
+ * test/testunit/test_testcase.rb: ditto.
+
+ * lib/test/unit/util/backtracefilter.rb: added.
+
+ * test/testunit/util/test_backtracefilter.rb: added.
+
+ * lib/test/unit/error.rb: changed to use BacktraceFilter and improved
+ output.
+
+ * test/testunit/test_error.rb: ditto.
+
+Thu Oct 2 20:33:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (iconv_failure_initialize): conform with
+ orthodox initialization method.
+
+ * ext/iconv/iconv.c (iconv_fail): initialize exception instance
+ from the class, and do not share instance variables with the
+ others. [ruby-dev:21470]
+
+Thu Oct 2 18:20:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * time.c (Init_Time): define initialize. [ruby-dev:21469]
+
+Thu Oct 2 17:39:38 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
+ it supports OpenSSL hardware cryptographic engine interface.
+
+ * ext/openssl/ossl_engine.h: ditto.
+
+ * ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
+
+ * ext/openssl/extconf.rb: add check for openssl/engine.h.
+
+ * ext/openssl/ossl.c: call Init_ossl_engine().
+
+ * ext/openssl/ossl.h: include openssl/engine.h.
+
+ * ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
+ EVP_PKEY referes engine.
+
+Thu Oct 2 17:22:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c (time_load): restore instance variables (if any) before
+ loading from marshaled data.
+
+Thu Oct 2 14:19:15 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
+ set error object to $!.
+
+ * ext/iconv/iconv.c (iconv_convert): error handler block should
+ return appended part and the rest. if rest is nil, the
+ conversion stops.
+
+Thu Oct 2 12:00:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * variable.c (rb_const_defined_0): look up constants in Object as
+ well. [ruby-dev:21458]
+
+ * test/ruby/test_defined.rb (TestDefined::test_defined): test for
+ constants.
+
+Thu Oct 2 11:17:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: should not capture an
+ AssertionFailedError unless explicitly requested.
+
+ * test/testunit/test_assertions.rb: ditto.
+
+ * test/testunit/collector/test_objectspace.rb: fixed a test failure
+ caused by methods being returned in different orders on different
+ platforms by moving test sorting from TestSuite into the locations
+ where suites are constructed. [ruby-talk:83156]
+
+ * lib/test/unit/testcase.rb: ditto.
+
+ * lib/test/unit/testsuite.rb: ditto.
+
+ * lib/test/unit/collector/objectspace.rb: ditto.
+
+Thu Oct 2 03:25:01 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (rb_thread_raise): prototype; avoid VC++ warning.
+
+Thu Oct 2 01:37:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * time.c (time_mdump): new marshal dumper. _dump is still
+ available for compatibility.
+
+ * time.c (time_mload): new marshal loader.
+
+ * marshal.c (w_object): preserve instance variables for objects
+ with marshal_dump.
+
+ * marshal.c (r_object0): restore instance variables before calling
+ marshal_load.
+
+ * error.c (rb_warn_m): always return nil.
+
+Thu Oct 2 01:32:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_f_block_given_p): real required condition is
+ ruby_frame->prev->iter == ITER_CUR.
+
+ * eval.c (rb_block_given_p): ditto.
+
+ * eval.c (block_pass): update ruby_frame->iter only when previous
+ value is ITER_NOT.
+
+Thu Oct 2 01:02:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (rb_const_defined_at): should exclude constants from
+ Object when TYPE(klass) == T_MODULE *and* exclude is on.
+ [ruby-dev:21458]
+
+ * variable.c (rb_const_get_0): do not lookup constants from Object
+ when TYPE(klass) == T_MODULE *and* exclude is on.
+
+Thu Oct 2 00:21:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/logger/test_logger.rb: unlinking file before close causes
+ problem under win32 box.
+
+ * lib/xsd/datatypes.rb(XSDFloat, XSDDouble): add +/- sign explicitly
+ when stringified and embedded into XML instance. Ruby's sprintf may
+ format -0.0 as "0.0" (no minus sign) depending on underlying C
+ sprintf implementation.
+
+ * test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
+
+ * test/soap/calc/*: give httpd config param "CGIInterpreter".
+ "/usr/bin/env ruby" thing does not work under non-Unix boxes.
+
+Thu Oct 2 00:25:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * signal.c (ruby_signal_name): adjust to the prototype.
+
+ * process.c (pst_inspect): ditto.
+
+ * ext/etc/etc.c (etc_getgrent, Init_etc): typo.
+
+Wed Oct 1 20:49:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * gc.c (heaps): manage slots and limits together. [ruby-dev:21453]
+
+ * gc.c (add_heap): should not clear heaps slot even if realloc()
+ failed.
+
+Wed Oct 1 20:36:49 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * MANIFEST: add wince/mkconfig_wce.rb.
+
+Wed Oct 1 17:22:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
+ setgrent, getgrent, endgrent.
+
+ * ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
+
+Wed Oct 1 17:01:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_load): Object scope had priority over required file
+ scope. [ruby-dev:21415]
+
+Wed Oct 1 14:09:53 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+ * wince/mkconfig_wce.rb: sorry, forget to commit.
+
+Wed Oct 1 10:08:42 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+ * wince/setup.mak: add sigmarionIII SDK support.
+
+ * wince/Makefile.sub: ditto.
+
+ * wince/mkexports.rb: fix linker error in SH4.
+
+ * wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
+
+Wed Oct 1 08:02:52 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+
+ * wince/time_wce.c (time): add zero check.
+
+Tue Sep 30 16:11:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * Makefile.in: copy lex.c from $(srcdir) if it's not the current
+ directory. [ruby-dev:21437]
+
+Tue Sep 30 11:29:23 2003 Tanaka Akira <akr@m17n.org>
+
+ * process.c (pst_inspect): describe stopped process "stopped".
+
+Tue Sep 30 09:31:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/runner.rb: glob for directories.
+
+Tue Sep 30 09:11:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_eval): while/until should not capture break unless
+ they are destination of the break.
+
+Tue Sep 30 03:12:02 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (finish): revert to 1.93.
+
+ * lib/net/pop.rb (finish): revert to 1.60.
+
+ * lib/net/smtp.rb (finish): revert to 1.67.
+
+ * lib/net/http.rb (do_start): ensure to close socket if failed to
+ start session.
+
+ * lib/net/pop.rb (do_start): ditto.
+
+ * lib/net/smtp.rb (do_start): ditto.
+
+ * lib/net/smtp.rb: SMTP#started? wrongly returned false always.
+
+Tue Sep 30 02:54:49 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/ruby/test_iterator.rb: new test
+ test_break__nested_loop[123].
+
+Mon Sep 29 23:39:13 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb (finish): does not raise IOError even if
+ !started?, to allow closing socket which was opened before
+ session started.
+
+ * lib/net/pop.rb (finish): ditto.
+
+ * lib/net/smtp.rb (finish): ditto.
+
+Mon Sep 29 19:06:51 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/win32ole/extconf.rb: add windows.h checking.
+ (ruby-bugs:PR#1185)
+
+Mon Sep 29 16:18:30 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/logger.rb: check if the given logdevice object respond_to :write
+ and :close, not is_a? IO. duck duck.
+
+ * test/logger/test_logger.rb: self IO.pipe reading/writing may be
+ locked by the flood. use tempfile.
+
+ * lib/wsdl/xmlSchema/data.rb: wrong constant reference.
+
+Mon Sep 29 16:11:23 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/test_fileutils.rb: clean up temporary symlink.
+ Patched by NaHi. [ruby-dev:21420]
+
+Mon Sep 29 11:16:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_thread_atfork): wrong format specifier.
+ [ruby-dev:21428]
+
+ * process.c (pst_inspect): better description.
+
+Mon Sep 29 02:31:44 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/utils.rb (Utils::su): use setgid and setuid to
+ set real and effective IDs. and setup group access list by
+ initgroups.
+
+Sun Sep 28 11:14:19 2003 Koji Arai <jca02266@nifty.ne.jp>
+
+ * ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
+ `initialize_copy' should be defined.
+
+ * ext/stringio/stringio.c (Init_stringio): ditto.
+
+Sat Sep 27 18:25:13 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
+ $KCODE = "NONE" environment. check added.
+
+ * test/xsd/test_xsd.rb: add tests for above fix.
+
+Sat Sep 27 15:58:50 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
+
+ * lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
+ a chance to reset logging severity threshold.
+
+ * test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
+ silent.
+
+Sat Sep 27 09:44:18 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/test_fileutils.rb: clear all errors on Windows.
+ [ruby-dev:21417]
+
+ * test/fileutils/test_nowrite.rb: ditto.
+
+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
+ behaviour now.
+
+ * test/soap/marshal/test_digraph.rb: should close before unlink.
+ unlink-before-close pattern is not needed here.
+
+Sat Sep 27 03:32:37 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into
+ each module namespace. TestMarshal in
+ test/soap/marshal/test_marshal.rb crashed with
+ test/ruby/test_marshal.rb.
+
+Sat Sep 27 01:30:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/socket.c (ruby_connect): on win32, type of the 4th
+ argument of getsockopt is char *.
+
+Fri Sep 26 18:35:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/resolv-replace.rb: 1.8 compliance. [ruby-talk:82946]
+
+Fri Sep 26 17:39:27 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_marshal.rb: add test for ruby's objects.
+
+Fri Sep 26 09:52:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * defines.h (flush_register_windows): use volatile only for gcc on
+ Solaris. [ruby-dev:21403]
+
+ * lib/mkmf.rb (xsystem): use system directly to honor shell meta
+ charaters.
+
+Fri Sep 26 00:10:13 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/README: updated.
+
+Thu Sep 25 17:48:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
+ rb_protect.
+
+ * ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
+ value.
+
+Thu Sep 25 09:00:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/ostruct.rb: Added OpenStruct#==.
+
+ * test/ostruct/test_ostruct.rb: Added.
+
+Thu Sep 25 07:55:26 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/win32ole/win32ole.c, ext/openssl/ossl_pkey_dsa.c,
+ ext/openssl/ossl_pkey_rsa.c, ext/bigdecimal/bigdecimal.h: must
+ not use C++ or C99 style comment yet. (ruby-bugs:PR#1184)
+
+Thu Sep 25 00:23:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * MANIFEST: add SOAP4R.
+
+Thu Sep 25 00:13:15 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/soap/* (29 files): SOAP4R added.
+
+ * lib/wsdl/* (42 files): WSDL4R added.
+
+ * lib/xsd/* (12 files): XSD4R added.
+
+ * test/soap/* (16 files): added.
+
+ * test/wsdl/* (2 files): added.
+
+ * test/xsd/* (3 files): added.
+
+ * sample/soap/* (27 files): added.
+
+ * sample/wsdl/* (13 files): added.
+
+Wed Sep 24 02:08:11 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
+ [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
+
+Tue Sep 23 23:10:16 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/logger.rb: add Logger#<<(msg) for writing msg without any
+ formatting.
+
+ * test/logger/test_logger.rb: ditto.
+
+Tue Sep 23 20:47:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * error.c (rb_warn_m): should not warn if -W0 is specified.
+ [ruby-talk:82675]
+
+Mon Sep 22 21:28:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * MANIFEST: updated.
+
+Mon Sep 22 19:22:26 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * configure.in (AC_CHECK_FUNCS): add setuid and setgid.
+
+Mon Sep 22 12:34:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * util.c (ruby_strtod): skip preceding zeros before counting
+ digits in the mantissa. (ruby-bugs:PR#1181)
+
+Sun Sep 21 04:12:36 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
+ should be a String.
+
+ * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
+
+ * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+
+Sat Sep 20 11:49:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/logger.rb: typo fixed.
+
+ * test/logger/test_logger.rb: new file.
+
+Fri Sep 19 11:39:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * test/testunit/*: Added.
+
+ * lib/test/unit.rb: Documentation update.
+
+ * lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
+ Ditto.
+
+ * lib/test/unit.rb: Factored out an ObjectSpace collector.
+
+ * lib/test/unit/collector/objectspace.rb: Ditto.
+
+ * sample/testunit/*: Added.
+
+Fri Sep 19 01:00:48 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
+ condition.
+
+ * lib/webrick/log.rb (BasicLog#format): add "\n" to message.
+
+Thu Sep 18 22:43:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
+
+ * eval.c (proc_invoke): should update "result" for orphans.
+
+Thu Sep 18 20:33:03 2003 Tietew <tietew-ml-ruby-list@tietew.net>
+
+ * parse.y (str_xquote): do not prepend escapes in
+ backqoute literals. [ruby-list:38409]
+
+Thu Sep 18 20:30:17 2003 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb: update document.
+
+Thu Sep 18 15:27:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/logger.rb: new file. Logger, formerly called devel-logger or
+ Devel::Logger.
+
+ * sample/logger/*: new file. samples of logger.rb.
+
+Wed Sep 17 23:41:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (localjump_destination): should not raise ThreadError
+ exception for "break". [ruby-dev:21348]
+
+ * eval.c (proc_invoke): use result instead of prot_tag->retval.
+ retval is no longer propagated to the ancestors.
+
+Wed Sep 17 20:34:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (tokadd_string, parse_string, yylex): escaped terminator
+ is now interpreted as is. [ruby-talk:82206]
+
+Wed Sep 17 18:52:36 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/fileutils/fileassertions.rb: new file.
+
+ * test/fileutils/test_fileutils.rb: new file.
+
+ * test/fileutils/test_nowrite.rb: new file.
+
+Wed Sep 17 18:51:02 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/strscan/test_stringscanner.rb: require test/unit.
+
+Wed Sep 17 18:35:34 2003 Minero Aoki <aamine@loveruby.net>
+
+ * test/strscan/test_stringscanner.rb: new file.
+
+Wed Sep 17 18:03:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl: all files are reviewed to simplify and avoid memory leak.
+
+ * ext/openssl/extconf.rb: add check for assert.h.
+
+ * ext/openssl/ossl.c (ossl_buf2str): new function to convert
+ C buffer to String and free buffer.
+
+ * ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
+ Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
+
+ * ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
+ functions to convert object to DER string.
+
+ * ext/openssl/ossl.h: ditto.
+
+ * ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
+ BIO to String object and free BIO.
+
+ * ext/openssl/ossl_bio.h: ditto.
+
+ * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
+
+ * ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
+
+ * ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
+ and reimplement in openssl/x509.rb.
+
+ * ext/openssl/ossl_x509attr.c: reimplemented and disable some
+ method temporarily. this class doesn't work fine without ASN.1
+ data support;-) I'll rewrite in near future.
+
+ * ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
+ unused code.
+
+ * ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
+
+Tue Sep 16 22:25:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: add negative tests of row_sep.
+
+Tue Sep 16 18:02:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * regex.c (re_compile_pattern): should not translate character
+ class range edge. [ruby-list:38393]
+
+Tue Sep 16 16:47:56 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * MANIFEST: add test/csv/mac.csv.
+
+ * win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
+
+Mon Sep 15 19:02:52 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/csv.rb: add extra pamameter to specify row(record) separater
+ character. To parse Mac's CR separated CSV, do like this.
+ CSV.open("mac.csv", "r", ?,, ?\r) { |row| p row.to_a }
+ The 3rd parameter in this example ?, is for column separater and the
+ 4th ?\r is for row separater. Row separater is nil by default. Nil
+ separater means "\r\n" or "\n".
+
+ * test/csv/test_csv.rb: add tests for above feature.
+
+ * test/csv/mac.csv: added. Sample CR separated CSV file.
+
+Fri Sep 12 22:41:48 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+
+ * ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
+
+ * ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
+
+ * ext/openssl/ossl_asn1.[ch]: new files
+
+ * ext/openssl/ossl_bio.[ch]: new files
+
+Fri Sep 12 12:30:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * intern.h (rb_disable_super, rb_enable_super): replace with dummy
+ expressions instead of prototypes. the functions remain yet for
+ binary compatibility. [ruby-talk:81758]
+
+Fri Sep 12 12:09:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_big_and): convert argument using 'to_int'.
+
+ * bignum.c (rb_big_or): ditto.
+
+ * bignum.c (rb_big_xor): ditto.
+
+Fri Sep 12 07:06:14 2003 David Black <dblack@superlink.net>
+
+ * lib/scanf.rb: Took out useless @matched_item variable; some small
+ refactoring.
+
+Thu Sep 11 08:43:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
+ name is not tainted.
+
+ * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
+ Supports StringIO.
+
+Wed Sep 10 22:47:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl.h: add a workaround for win32 platform.
+ libeay32.dll doesn't export functions defined in conf_api.h.
+
+ * ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
+
+ * ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
+
+ * ext/openssl/ossl_config.c (set_conf_section_i): should check
+ if the argument is Array.
+
+Wed Sep 10 22:41:54 2003 Tietew <tietew@tietew.net>
+
+ * eval.c (win32_get_exception_list): avoid VC7 warning.
+ [ruby-win32:577]
+
+Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (struct tag): dst should be VALUE.
+
+ * eval.c (localjump_destination): stop at the scope where the current
+ block was created. [ruby-dev:21353]
+
+Tue Sep 9 05:17:04 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
+
+Tue Sep 9 02:41:35 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+
+ * ext/openssl/ossl_config.c: Refine compatibility.
+
+Tue Sep 9 01:50:45 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
+ the message.
+
+ * lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
+
+Mon Sep 8 22:15:33 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/lib/multi-tk.rb: modify security check at creating
+ a new interpreter
+
+Mon Sep 8 20:00:12 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb, lib/optparse/version.rb: search also all
+ capital versions.
+
+Mon Sep 8 19:26:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
+
+ * ext/openssl/ossl_config.c: refine all with backward compatibility.
+
+ * ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
+
+ * ext/openssl/ossl_x509.c: added new constants under X509 module.
+ DEFAULT_CERT_AREA, DEFAULT_CERT_DIR, DEFAULT_CERT_FILE,
+ DEFAULT_CERT_DIR_ENV, DEFAULT_CERT_FILE_ENV and DEFAULT_PRIVATE_DIR.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
+ the members of the struct. it's left to GC.
+
+ * ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
+
+ * ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
+ add attr readers: issuer_certificate, subject_certificate,
+ subject_request, crl and config.
+
+Mon Sep 8 18:26:41 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
+ instead of config[:Port] or req.request_uri.port.
+
+ * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
+
+ * lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
+
+ * lib/webrick/config.rb: :Listen option never be used.
+
+ * lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
+ option and add warning message.
+
+ * lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
+
+ * lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
+
+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
+
+Sat Sep 6 02:26:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_*.rb: assert_same, assert_match, and so on.
+
+Sat Sep 6 18:45:46 2003 Mauricio Fernandez <batsman.geo@yahoo.com>
+
+ * parse.y (assignable): call rb_compile_error(), not rb_bug().
+ [ruby-core:01523]
+
+Sat Sep 6 17:40:41 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ruby_missing.c: rid of unnecessary backward
+ compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
+ all sources.
+
+ * ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
+
+ * ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
+
+ * ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
+
+ * ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
+
+Sat Sep 6 01:23:22 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
+
+ * win32/win32.c (CreateChild): fix condition about whether to call
+ shell or not.
+
+Sat Sep 6 00:36:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * Makefile.in (test): phony target.
+
+ * lib/mkmf.rb (have_library, find_library): configure by library
+ name.
+
+ * lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
+ array as argument.
+
+ * test/ruby/test_*.rb: moved invariants to left side in
+ assert_equal, and use assert_nil, assert_raises and so on.
+
+ * win32/win32.c (isInternalCmd): distinguish command.com and
+ cmd.exe.
+
+ * win32/win32.c (make_cmdvector): a character just after wildcard
+ was ignored. [ruby-core:01518]
+
+Fri Sep 5 20:27:08 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
+
+Fri Sep 5 18:00:51 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
+
+ * ext/openssl/ossl_digest.c: add ossl_digest_new().
+
+ * ext/openssl/ossl_digest.h: ditto.
+
+ * ext/openssl/ossl_cipher.c: add ossl_cipher_new().
+
+ * ext/openssl/ossl_cipher.h: ditto.
+
+Fri Sep 5 15:32:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
+ search delimiter forward if found in backward.
+
+Fri Sep 5 13:32:48 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/runner.rb: arguments should be keys.
+
+Fri Sep 5 12:09:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * test/ruby/test_system.rb (test_system): check existence of ruby
+ interpreter.
+
+Fri Sep 5 11:32:17 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/optparse.rb (--version): fix assignment/reference order.
+
+ * lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
+ be deprecated in future.
+
+ * lib/optparse/version.rb (OptionParser#show_version): hide Object.
+
+ * test/runner.rb: fix optparse usage.
+
+ * test/runner.rb: glob all testsuits if no tests given.
+
+Fri Sep 5 10:42:58 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/runner.rb: added. gets testcases from command line and runs it.
+
+ * test/ruby/test_gc.rb: remove useless part which was for dumping test
+ result.
+
+Fri Sep 5 09:28:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby/test_gc.rb: added. splitter.rb which I made to split
+ sample/test.rb into test/ruby/test_* kindly removed GC test (the
+ last section in the original test) to reduce things to be worried.
+
+Fri Sep 5 03:00:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_iterator.rb (test_block_in_arg): add no block
+ given tests.
+
+ * test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
+ test.
+
+Fri Sep 5 01:10:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/ruby: tests for ruby itself.
+
+ * test/ruby/test_*.rb: split sample/test.rb into 28 test/unit testcases.
+ some tests could not be translates... search '!!' mark to see it.
+
+ * test/csv/test_csv.rb: should require 'csv', not '../lib/csv'. test
+ runner should set load path correctly.
+
+Fri Sep 5 01:03:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: close opened files for CSV::IOBuf explicitly.
+ opened file cannot be removed under win32 box.
+
+Thu Sep 4 23:59:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (tokadd_string): newlines have no special meanings in
+ %w/%W, otherwise they are ignored only when interpolation is
+ enabled. [ruby-dev:21325]
+
+Thu Sep 4 19:38:25 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * ext/io/wait/.cvsignore: added.
+
+ * ext/openssl/.cvsignore: added.
+
+Thu Sep 4 19:28:24 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * sample/openssl: added. Sample of standard distribution library
+ should be locate in sample/{module_name}/*.
+
+ * ext/openssl/sample/*: removed. move to sample/openssl/*.
+
+Thu Sep 4 18:02:15 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: use remove_const to reduce warnings. use
+ Dir.tmpdir to locate working files.
+
+Thu Sep 4 17:41:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
+ valid delimiter.
+
+ * misc/ruby-mode.el (ruby-here-doc-end-match): must quote
+ arbitrary string to use as regexp.
+
+ * misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): must not
+ call `ruby-here-doc-end-match' unless `ruby-here-doc-beg-re'
+ matched.
+
+Thu Sep 4 15:40:07 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: run on test/unit original layer.
+
+Thu Sep 4 12:54:50 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/token.c: headerless documents with root-level spacing now
+ honored.
+
+Thu Sep 4 00:06:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (mark_frame_adj): need to adjust argv pointer if using
+ system's alloca. [ruby-core:01503]
+
+Wed Sep 3 21:33:20 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test: add test directory. Test::Unit aware testcases and needed
+ files should be located in this directory. dir/file name convention;
+ test/{module_name}/test_{testcase_name}.rb
+ test/{module_name}/{needed_files}
+ someday, someone will write testrunner which searches test_*.rb and
+ run testcases automatically.
+
+ * test/csv/*: add testcase for lib/csv.rb.
+
+Wed Sep 3 01:37:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * io.c (rb_f_gets): should call next_argv() before type check
+ current_file. [ruby-list:38336]
+
+Tue Sep 2 20:37:15 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
+ for skipping server verification.
+
+Tue Sep 2 23:36:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (proc_invoke): should retrieve retval when pcall is true.
+
+Tue Sep 2 14:09:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
+ the patch is submitted by nmu <nmu@users.sourceforge.jp>.
+
+ * ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
+ some platforms.
+
+ * ext/socket/getnameinfo.c (getnameinfo): ditto.
+
+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}:
+ bug fix and improvement of font control
+
+Tue Sep 2 09:51:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval): should not handle exceptions within rescue
+ argument. [ruby-talk:80804]
+
+Tue Sep 2 00:44:37 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * re.c (rb_memsearch): fix overrun. [ruby-talk:80759]
+
+Tue Sep 2 00:41:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/iconv/iconv.c (map_charset): use lower case keys.
+
+ * ext/iconv/iconv.c (iconv_fail): just yield error and return the
+ result if a block is given.
+
+ * ext/iconv/iconv.c (iconv_convert): yield error and append the
+ result if a block is given.
+
+ * ext/iconv/charset_alias.rb (charset_alias): optional third
+ argument.
+
+ * ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
+ SHIFT_JIS on cygwin.
+
+Mon Sep 1 18:34:25 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval): make tail recursion in ELSE clause of
+ RESCUE a jump.
+
+Mon Sep 1 18:00:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
+ Dave Butcher.
+
+ * eval.c (Init_Thread): protect thgroup_default. suggested by Guy
+ Decoux in [ruby-talk:80623]
+
+Mon Sep 1 16:59:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
+ thread termination.
+
+ * eval.c (rb_thread_start_0): should not error_print() within
+ terminated thread, because $stderr used by it might be
+ overriden now. [ruby-dev:21280]
+
+Sun Aug 31 22:46:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * eval.c (TAG_DST()): take no argument.
+
+ * process.c (p_gid_sw_ensure): return VALUE.
+
+Sun Aug 31 22:27:10 2003 Hidetoshi NAGAI <nagai@dumbo.ai.kyutech.ac.jp>
+
+ * process.c (p_gid_sw_ensure): lack of function type
+
+Sun Aug 31 12:25:06 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * lib/optparse.rb: --version takes an optional argument; "all" or
+ a list of package names.
+
+Sun Aug 31 10:17:02 2003 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * lib/date/format.rb: yyyy/mm is not an acceptable format.
+
+ * lib/time.rb: follow above.
+
+Sat Aug 30 14:25:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_iter_break): should not call TAG_JUMP directly.
+
+Sat Aug 30 03:58:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
+
+ * eval.c (POP_TAG): no longer propagate retval. retval is now set
+ directly by localjump_destination().
+
+ * eval.c (localjump_destination): new function to cast
+ return/break local jump.
+
+ * eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
+
+Fri Aug 29 22:35:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
+ then result will be the same as +,-,*,/ respectively.
+
+Fri Aug 29 17:30:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * process.c: bug fix
+
+ * process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
+
+ * 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: can create a interpreter without Tk
+
+ * ext/tcltklib/tcltklib.c: bug fix on handling exceptions
+
+ * ext/tcltklib/MANUAL.euc: modify
+
+ * ext/tk/lib/tk.rb: freeze some core modules
+
+ * ext/tk/lib/multi-tk.rb: more secure
+
+ * ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
+ Tk's list
+
+ * 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/tkfont.rb: TkFont.new() accepts compound fonts
+
+Thu Aug 28 22:07:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (rb_autoload_load): call const_missing if autoloading
+ constant is not defined to allow hook.
+
+ * eval.c (rb_eval): use rb_const_get_from() instead of
+ rb_const_get_at().
+
+ * eval.c (is_defined): forgot to check NODE_COLON3.
+
+Thu Aug 28 17:30:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * variable.c (rb_const_get_0): should check constants defined in
+ included modules, if klass is Object. [ruby-talk:79302]
+
+ * numeric.c (check_uint): check should be done using UINT_MAX, not
+ INT_MAX. this fix is submitted by Lyle Johnson
+ <lyle@knology.net> in [ruby-core:01486]
+
+Thu Aug 28 05:02:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (singleton): typo fixed (ruby-bugs-ja:PR#562)
+
+Thu Aug 28 02:37:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
+ consistent with *a = [1], which set [[1]] to a.
+
+ * node.h: merge NODE_RESTARY to NODE_SPLAT.
+
+ * parse.y: rules simplified a bit by removing NODE_RESTARY.
+
+ * sample/test.rb: updated for new assignment behavior.
+
+Wed Aug 27 22:33:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * error.c (rb_bug): should not use other methods; this function is
+ not for ordinary use. [ruby-dev:21259]
+
+Wed Aug 27 15:07:57 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
+ response. [ruby-list:38279]
+
+Wed Aug 27 05:10:15 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (map_errno): support winsock error.
+
+ * win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
+ kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime):
+ pass errno to map_errno().
+
+ * win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
+ rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
+ rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
+ rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
+ rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
+ rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
+ rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
+ rb_w32_fclose, rb_w32_close): use map_errno().
+
+ * win32/win32.h: add winsock errors.
+
+Tue Aug 26 23:53:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
+ frozen OpenStruct. [ruby-talk:80214]
+
+Tue Aug 26 20:03:50 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_tmpsrc): add the hook for source.
+ [ruby-list:38122]
+
+Tue Aug 26 15:59:53 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * implicit.c (syck_type_id_to_taguri): corrected detection of
+ x-private types.
+
+Sun Aug 24 01:02:48 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): performance improvement.
+ [ruby-talk:79748]
+
+Sat Aug 23 23:41:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
+ apparent cases. [ruby-talk:79748]
+
+Sat Aug 23 18:56:53 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/nkf/nkf.c (rb_nkf_putchar): should use rb_str_resize() to just
+ resize a string, rb_str_cat() disallows NULL. [ruby-dev:21237]
+
+Sat Aug 23 16:48:41 2003 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+ * lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
+
+Sat Aug 23 15:59:58 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
+ EXEC_TAG() for retry. [ruby-dev:21216]
+
+Sat Aug 23 02:32:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_yield_splat): should check if "values" is array.
+
+ * enum.c (each_with_index_i): typo.
+
+Fri Aug 22 17:07:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * enum.c (inject_i): use rb_yield_values.
+
+ * enum.c (each_with_index_i): ditto.
+
+ * eval.c (rb_yield_splat): new function to call "yield *values".
+
+ * string.c (rb_str_scan): use rb_yield_splat().
+
+Fri Aug 22 06:13:22 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/rubyext.c: refactoring of the transfer method
+ dispatch. added yaml_org_handler for faster dispatch of
+ transfers to base types.
+
+ * lib/yaml/rubytypes.rb: removed handling of builtins from
+ Ruby library.
+
+ * ext/syck/token.c: quoted and block scalars are now implicit !str
+
+ * ext/syck/implicit.c: empty string detected as !null.
+
+Fri Aug 22 01:00:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (block_pass): improve passing current block.
+
+Fri Aug 22 00:13:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
+ fixed, and VpNmlz() speed up.
+
+Wed Aug 20 16:44:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/socket.c (ruby_connect): many systems seem to have
+ a problem in select() after EINPROGRESS. [ruby-list:38080]
+
+Wed Aug 20 01:31:17 2003 why the lucky stiff <why@ruby-lang.org>
+
+ * ext/syck/syck.h: Parser definition problems on HP-UX.
+ [ruby-talk:79389]
+
+ * ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
+
+ * ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
+
+ * ext/syck/rubyext.c: Tainting issues.
+
+Tue Aug 19 23:20:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
+
+ * 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>
+
+ * lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
+
+ * lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
+
+ * lib/webrick/compat.rb (File::fnmatch): remove old migration code.
+
+ * lib/webrick/httpserver.rb (HTTPServer#run): ditto.
+
+ * lib/webrick/server.rb (GenericServer#listen): the body of this
+ method is pull out as Utils::create_lisnteners.
+
+ * lib/webrick/utils.rb (Utils::create_lisnteners): new method.
+
+ * lib/webrick/server.rb (GenericServer#start): should rescue
+ unknown errors. and refine comments.
+
+ * ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
+ socket if SSLSocket raises error.
+
+Tue Aug 19 07:47:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
+ a builtin.
+
+ * ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
+
+ * ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
+ add a return to the tails of each line.
+
+ * ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
+
+ * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
+
+ * ext/openssl/sample/echo_svr.rb: use SSLServer.
+
+ * ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
+
+Tue Aug 19 01:24:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
+ headers are inconsistent at this macro. [ruby-core:01432]
+
+ * ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
+
+ * ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
+ winspool.h
+
+ * instruby.rb: make list at first instead of iterator.
+ [ruby-talk:79347]
+
+Mon Aug 18 11:23:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_helper): preserve raw order for **.
+
+Sun Aug 17 23:39:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
+
+Sun Aug 17 17:10:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/openssl/ssl.rb (SSLSocket#sync_close=): add a
+ method to specify if the underlying IO will be closed in
+ SSLSocket#close.
+
+ * ext/openssl/lib/openssl/buffering.rb: add forwarders to
+ setsockopt, getsockopt and fcntl.
+
+ * ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
+
+Sun Aug 17 11:32:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake): should not force to remake Makefile when
+ installation and so on.
+
+Sat Aug 16 23:58:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * marshal.c (w_symbol, w_object): get rid of warnings.
+
+ * re.c (rb_memsearch): ditto.
+
+ * time.c (time_dump): ditto.
+
+ * ext/extmk.rb (extmake): not continue making when extconf.rb
+ failed.
+
+ * ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
+
+ * ext/openssl/ossl.h: remove version.h dependency.
+
+ * ext/openssl/ruby_missing.h: ditto.
+
+ * lib/mkmf.rb (pkg_config): use --libs output except with
+ only-L for other options. [ruby-list:38099]
+
+ * lib/mkmf.rb (create_makefile): separate rule for static
+ library from shared object.
+
+ * win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
+ define exec_prefix and libdir.
+
+Fri Aug 15 23:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
+ method fixed.
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
+
+Fri Aug 15 12:01:44 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]
+ http://www.geocities.co.jp/SiliconValley-PaloAlto/1409/ruby/beos.html
+
+ * error.c (syserr_eqq): errno might exceed Fixnum limit.
+
+ * error.c (Init_Exception): moved base initialization from
+ init_syserr().
+
+ * inits.c (rb_call_inits): postpone initializing errnos until
+ Bignum is available.
+
+Fri Aug 15 12:01:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
+ keyname() and so on be declared.
+
+ * ext/curses/curses.c (curses_resizeterm, window_resize):
+ arguments conflicted with macros in term.h.
+
+ * ext/curses/curses.c (Curses module methods): ensure
+ initialized. [ruby-dev:21191]
+
+Fri Aug 15 02:08:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * gc.c (id2ref): recycle check should be done by klass == 0.
+ [ruby-core:01408]
+
+Fri Aug 15 01:34:23 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+
+ * ext/openssl/ossl_pkey.c: move generate_cb here
+
+ * ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
+
+ * ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
+
+ * ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
+
+Fri Aug 15 00:38:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
+
+ * ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
+
+ * ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
+
+Thu Aug 14 21:19:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (Init_Thread): Continuation#[] added. [ruby-talk:79028]
+
+Thu Aug 14 20:03:34 2003 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c (OLE_FREE): should not call
+ ole_message_loop.
+
+ * ext/win32ole/win32ole.c (ole_event_free): ditto.
+
+ * ext/win32ole/win32ole.c (ole_initialize): stop calling
+ OleUninitialize at exit.
+
+Thu Aug 14 11:27:37 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * gc.c (rb_data_object_alloc): check type of 1st argument.
+ [ruby-dev:21192]
+
+Thu Aug 14 00:21:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
+
+ * parse.y (lhs): ditto.
+
+ * parse.y (yylex): should return tCOLON3 right after kCLASS.
+ [ruby-talk:78918]
+
+ * error.c (exc_initialize): was converting argument to string too
+ eagerly. Only check was needed. [ruby-talk:78958]
+
+Wed Aug 13 23:31:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
+ BigDecimal::limit removed.
+
+Wed Aug 13 19:21:34 2003 Christian Neukirchen <chneukirchen@yahoo.de>
+
+ * lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
+ to SSLSocket. [ruby-talk:78919]
+
+Wed Aug 13 18:13:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
+
+ * eval.c (proc_invoke): unpack return/break destination when block
+ is already left.
+
+Wed Aug 13 15:58:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * object.c (rb_class_s_alloc): add function prototype to avoid VC++
+ warning.
+
+Wed Aug 13 13:50:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/Win32API/Win32API.c (Win32API_initialize): should pass some
+ class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
+
+Tue Aug 12 16:55:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in: static link libraries to LIBRUBY_SO with static linked
+ ext. [ruby-dev:21157]
+
+ * ext/extmk.rb (extmake): sort extension library initialization order.
+
+ * ext/extmk.rb (extmake): compact $extlibs.
+
+Tue Aug 12 02:48:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
+ flag before calling getcontext(2).
+
+ * eval.c (struct thread): add member to save backing store on
+ IA64. (ruby-bugs PR1086)
+
+ * eval.c (thread_mark): mark IA64 backing store region.
+
+ * eval.c (thread_free): free saved IA64 backing store.
+
+ * eval.c (rb_thread_save_context): save IA64 backing store as well.
+
+ * eval.c (rb_thread_restore_context): restore IA64 backing store.
+
+ * eval.c (THREAD_ALLOC): initialize IA64 members.
+
+Mon Aug 11 22:31:50 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/debug.rb(debug_command): inspection command should inspect
+ resulting value even if it's nil. [ruby-dev:21180] by OMAE, jun
+ <jun66j5@ybb.ne.jp>.
+
+ * lib/debug.rb(debug_command): incomplete regexp.
+
+Mon Aug 11 17:33:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_call_super): do not use rb_block_given_p() for
+ check. [ruby-talk:78656]
+
+ * eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+
+Sun Aug 10 10:43:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
+ from 1k to 16k bytes. [ruby-talk:78603]
+
+ * ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
+ partial write to allow interruption in SSLSocket#write.
+
+Sun Aug 10 00:34:16 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
+ for ccache.
+
+Sat Aug 9 10:36:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * marshal.c (w_object): do not dump generic instance variable when
+ marshal_dump is defined.
+
+Sat Aug 9 00:35:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal.c: F style output(like 1234.56789) implemented
+ to to_s method.
+ * ext/bigdecimal_??.html: F style output(like 1234.56789)
+ implemented to to_s method.
+
+Fri Aug 8 12:33:17 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
+ add the -aa option to WLDFLAGS.
+
+Fri Aug 8 11:29:26 2003 Koji Arai <jca02266@nifty.ne.jp>
+
+ * marshal.c (w_object): should set `c_arg' at first.
+
+Fri Aug 8 03:22:28 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/webrick/httputils.rb (FormData#list): should not take
+ a side effect for the receiver.
+
+Thu Aug 7 14:40:37 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * cygwin/GNUmakefile: better --disbale-shared option support.
+
+ * cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+
+Thu Aug 7 14:21:05 2003 Corinna Vinschen <vinschen@redhat.com>
+
+ * configure.in: Fix Cygwin specific naming of libraries to
+ be net distribution compliant. (ruby-bugs:PR#1077)
+ cygwin-ruby18.dll -> cygruby18.dll
+
+Thu Aug 7 12:51:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_f_at_exit): should not be called without a block.
+ block_given check added.
+
+Thu Aug 7 06:46:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_call0): forgot to pop ruby_class.
+
+ * eval.c (rb_call0): update ruby_class as well as ruby_cref.
+ (ruby-bugs-ja:PR#540)
+
+Thu Aug 7 04:52:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
+ ruby_cref. [ruby-talk:78141]
+
+Thu Aug 7 04:19:15 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of
+ Linux/ia64. This makes gc.c compile but miniruby coredumps for
+ the moment.
+
+Thu Aug 7 00:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+
+ * ext/bigdecimal.c: Comparison results adjusted to Float's.
+ * ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
+
+Wed Aug 6 22:58:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/testcase.rb: Added equality checking.
+ * lib/test/unit/testsuite.rb: Added equality checking.
+ * lib/test/unit/assertions.rb: Fixed a warning.
+
+Wed Aug 6 17:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137]
+
+ * ext/extmk.rb (extmake): set library name as source file name in
+ Init_ext(). [ruby-dev:21137]
+
+ * lib/mkmf.rb (Logging::postpone): postpone logging messages after
+ heading message as the result of the block.
+
+ * lib/mkmf.rb (macro_defined?): append newline to src unless ended
+ with it.
+
+ * lib/mkmf.rb (have_library): treat nil function name as "main".
+ (ruby-bugs:PR#1083)
+
+ * lib/mkmf.rb (pkg_config): should append additional libraries to
+ $libs but not $LIBS. [ruby-dev:21137]
+
+ * ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
+
+ * ext/digest/sha1/extconf.rb: have_library already appends library
+ name.
+
+Wed Aug 6 17:23:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c: initialize /* OK */ variables by Qnil to stop warnings.
+
+Wed Aug 6 04:58:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/Setup*: add io/wait and openssl.
+
+Wed Aug 6 01:13:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
+
+ * eval.c (rb_f_autoload_p): ditto.
+
+ * class.c (rb_mod_init_copy): no longer implements independent
+ clone and dup methods. override "initialize_copy" instead.
+ [ruby-core:01352]
+
+ * object.c (rb_class_s_alloc): define Class allocation function.
+ this makes Classes to follow clone framework that uses
+ initialize_copy.
+
+ * object.c (rb_class_initialize): separate instantiation and
+ initialization.
+
+ * object.c (rb_obj_alloc): prohibit instantiation from
+ uninitialized class.
+
+ * object.c (rb_class_superclass): check uninitialized class.
+
+ * array.c (rb_ary_fill): wrong index processing with block. this
+ fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
+
+ * marshal.c (w_object): should preserve generic ivar for nil,
+ true, false, symbols, and fixnums.
+
+ * marshal.c (w_uclass): base_klass check should be done after
+ rb_class_real().
+
+Wed Aug 6 01:18:50 2003 Minero Aoki <aamine@loveruby.net>
+
+ * lib/net/http.rb: update document.
+
+ * lib/net/pop.rb: ditto.
+
+ * lib/net/protocol.rb: ditto.
+
+Wed Aug 6 00:48:37 2003 Koji Arai <jca02266@nifty.ne.jp>
- * eval_intern.h: removed rb_trap_restore_mask().
- * vm_eval.c (rb_throw_obj): ditto.
- * eval.c (setup_exception): ditto.
+ * marshal.c (w_object): should recommend marshal_dump rather than
+ _dump_data.
- * signal.c: removed trap_last_mask.
- * signal.c (trap_restore_mask): removed.
- * signal.c (init_sigchld): comment clarification why signal block
- is needed. and removed trap_last_mask operation.
- * signal.c (trap_ensure): removed trap_last_mask operation.
+Tue Aug 5 17:58:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
- * signal.c (rb_disable_interrupt, rb_enable_interrupt): made
- static and removed sigdelset(SIGVTALRM) and sigdelset(SIGSEGV).
+ * lib/fileutils.rb (install): should preserve timestamp only.
- * process.c (rb_syswait): removed implicit signal handler change.
+Tue Aug 5 17:31:59 2003 Ian Macdonald <ian@caliban.org>
-Sun Jul 10 23:49:12 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+ * lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
+ simple typo.
- * docs/NEWS-1.9.3: moved from NEWS.
+Tue Aug 5 15:47:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * docs/ChangeLog-1.9.3: merged ChangeLog for 1.9.3.
+ * eval.c (rb_load): should preserve current source file/line.
- * NEWS: NEWS for 1.9.4 that describes changes since 1.9.3
+Tue Aug 5 10:04:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ChangeLog: new ChangeLog for 1.9.4.
+ * string.c (str_new4): ptr may refer to null_str.
-Sun Jul 10 23:30:52 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Mon Aug 4 17:25:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
- * version.h (RUBY_VERSION): ruby_1_9_3 branch was forked.
+ * stable version 1.8.0 released.
-For the changes before 1.9.3, see doc/ChangeLog-1.9.3
For the changes before 1.8.0, see doc/ChangeLog-1.8.0
Local variables:
-coding: us-ascii
add-log-time-format: (lambda ()
(let* ((time (current-time))
(system-time-locale "C")
@@ -28563,6 +81139,4 @@ add-log-time-format: (lambda ()
(format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
indent-tabs-mode: t
tab-width: 8
-change-log-indent-text: 2
end:
-vim: tabstop=8 shiftwidth=2
diff --git a/GPL b/GPL
index d159169d10..5b6e7c66c2 100644
--- a/GPL
+++ b/GPL
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
+the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -303,9 +303,10 @@ the "copyright" line and a pointer to where the full notice is found.
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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 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
+
Also add information on how to contact you by electronic and paper mail.
@@ -335,5 +336,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
+library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
index b97a08d928..5c0e4d5156 100644
--- a/KNOWNBUGS.rb
+++ b/KNOWNBUGS.rb
@@ -3,3 +3,14 @@
# So all tests will cause failure.
#
+assert_normal_exit %q{
+ open("tst-remove-load.rb", "w") {|f|
+ f << <<-'End'
+ module Kernel
+ remove_method :load
+ end
+ raise
+ End
+ }
+ load "tst-remove-load.rb"
+}, '[ruby-dev:40234] [ruby-core:27959]', :timeout => 1
diff --git a/LEGAL b/LEGAL
index 65706459cd..3ddf571175 100644
--- a/LEGAL
+++ b/LEGAL
@@ -148,6 +148,7 @@ util.c (partly):
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,
@@ -231,75 +232,36 @@ random.c
http://www.math.keio.ac.jp/matumoto/emt.html
email: matumoto@math.keio.ac.jp
-vsnprintf.c:
-
- This file is under the old-style BSD license. Note that the
- paragraph 3 below is now null and void.
-
- Copyright (c) 1990, 1993
- The Regents of the University of California. All rights reserved.
-
- This code is derived from software contributed to Berkeley by
- Chris Torek.
-
- 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. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
-
- IMPORTANT NOTE:
- --------------
- From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
- paragraph 3 above is now null and void.
-
st.[ch]:
missing/alloca.c:
missing/dup2.c:
-missing/erf.c:
missing/finite.c:
missing/hypot.c:
missing/isinf.c:
missing/isnan.c:
-missing/lgamma_r.c:
missing/memcmp.c:
missing/memmove.c:
missing/strchr.c:
missing/strstr.c:
missing/strtol.c:
-missing/tgamma.c:
ext/digest/sha1/sha1.[ch]:
These files are all under public domain.
+missing/erf.c:
+missing/tgamma.c:
+missing/lgamma_r.c:
missing/crypt.c:
+missing/vsnprintf.c:
This file is under the old-style BSD license. Note that the
paragraph 3 below is now null and void.
- Copyright (c) 1989, 1993
- The Regents of the University of California. All rights reserved.
+ Copyright (c) 1990, 1993
+ The Regents of the University of California. All rights reserved.
This code is derived from software contributed to Berkeley by
- Tom Truscott.
+ Chris Torek.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -325,39 +287,10 @@ missing/crypt.c:
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-missing/setproctitle.c
-
- This file is under the old-style BSD license. Note that the
- paragraph 3 below is now null and void.
-
- Copyright 2003 Damien Miller
- Copyright (c) 1983, 1995-1997 Eric P. Allman
- Copyright (c) 1988, 1993
- The Regents of the University of California. 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. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ IMPORTANT NOTE:
+ --------------
+ 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
diff --git a/Makefile.in b/Makefile.in
index 2d349e5201..c3d3de9495 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,24 +1,17 @@
SHELL = /bin/sh
-NULLCMD = @NULLCMD@
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
+NULLCMD = :
RUNCMD = $(SHELL)
-CDPATH = .
CHDIR = @CHDIR@
exec = exec
-NULL = /dev/null
-PATH_SEPARATOR = @PATH_SEPARATOR@
#### Start of system configuration section. ####
srcdir = @srcdir@
top_srcdir = $(srcdir)
hdrdir = $(srcdir)/include
-PLATFORM_DIR = @PLATFORM_DIR@
CC = @CC@
CPP = @CPP@
-LD = @LD@
YACC = bison
PURIFY =
AUTOCONF = autoconf
@@ -26,7 +19,6 @@ AUTOCONF = autoconf
MKFILES = @MAKEFILES@
BASERUBY = @BASERUBY@
TEST_RUNNABLE = @TEST_RUNNABLE@
-CROSS_COMPILING = @CROSS_COMPILING@
DOXYGEN = @DOXYGEN@
prefix = @prefix@
@@ -55,62 +47,38 @@ empty =
OUTFLAG = @OUTFLAG@$(empty)
COUTFLAG = @COUTFLAG@$(empty)
ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@ $(ARCH_FLAG)
+CFLAGS = @CFLAGS@
cflags = @cflags@
optflags = @optflags@
debugflags = @debugflags@
-warnflags = @warnflags@ @strict_warnflags@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
-XCFLAGS = @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
+warnflags = @warnflags@
+XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
+CPPFLAGS = @CPPFLAGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-EXTLDFLAGS = @EXTLDFLAGS@
+EXTLDFLAGS =
XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
-EXTLIBS =
+EXTLIBS =
LIBS = @LIBS@ $(EXTLIBS)
MISSING = @LIBOBJS@ @ALLOCA@
LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
+DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
SOLIBS = @SOLIBS@
MAINLIBS = @MAINLIBS@
ARCHMINIOBJS = @MINIOBJS@
-DLNOBJ = @DLNOBJ@
-ENCOBJS = @ENCOBJS@
-EXTOBJS = @EXTOBJS@
BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
-POSTLINK = @POSTLINK@
RUBY_BASE_NAME=@RUBY_BASE_NAME@
RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
RUBY_SO_NAME=@RUBY_SO_NAME@
-RUBY_RELEASE_DATE=@RUBY_RELEASE_DATE@
EXEEXT = @EXEEXT@
-LIBEXT = @LIBEXT@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
RUBY = $(RUBY_INSTALL_NAME)
-MINIRUBY = @MINIRUBY@\
- $(MINIRUBYOPT)
-# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly
-RUNRUBY_COMMAND = @RUNRUBY_COMMAND@
-# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby
-RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
-# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
-RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
+MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
+RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
XRUBY = @XRUBY@
-BTESTRUBY = @BTESTRUBY@\
- $(MINIRUBYOPT)
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-XRUBY_LIBDIR = @XRUBY_LIBDIR@
-XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
-XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
-
-DEFAULT_PRELUDES = $(@USE_RUBYGEMS@_GEM_PRELUDE)
#### End of system configuration section. ####
@@ -125,8 +93,6 @@ LIBRUBY = @LIBRUBY@
LIBRUBYARG = @LIBRUBYARG@
LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
-LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
THREAD_MODEL = @THREAD_MODEL@
@@ -140,7 +106,6 @@ MAKEDIRS = @MKDIR_P@
CP = cp
MV = mv
RM = rm -f
-RMDIR = @RMDIR@
RMDIRS = @RMDIRS@
RMALL = @RMALL@
NM = @NM@
@@ -148,45 +113,26 @@ AR = @AR@
ARFLAGS = rcu
RANLIB = @RANLIB@
AS = @AS@
-ASFLAGS = @ASFLAGS@ $(INCFLAGS)
+ASFLAGS = @ASFLAGS@
IFCHANGE = $(srcdir)/tool/ifchange
SET_LC_MESSAGES = env LC_MESSAGES=C
OBJDUMP = @OBJDUMP@
OBJCOPY = @OBJCOPY@
VCS = @VCS@
VCSUP = @VCSUP@
-DTRACE = @DTRACE@
-DTRACE_EXT = @DTRACE_EXT@
-DTRACE_OBJ = @DTRACE_OBJ@
-DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@
OBJEXT = @OBJEXT@
ASMEXT = S
DLEXT = @DLEXT@
MANTYPE = @MANTYPE@
-SYMBOL_PREFIX = @SYMBOL_PREFIX@
INSTALLED_LIST= .installed.list
MKMAIN_CMD = mkmain.sh
-NEWLINE_C = newline.c
-MINIPRELUDE_C = miniprelude.c
-RBCONFIG = .rbconfig.time
-
SRC_FILE = $<
-OS_SRC_FILE = $<
-DEST_FILE = $@
-OS_DEST_FILE = $@
-
-MESSAGE_BEGIN = @for line in
-MESSAGE_END = ; do echo "$$line"; done
-
-configure_args = @configure_args@
#### End of variables
-.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
-
all:
.DEFAULT: all
@@ -196,68 +142,38 @@ all:
miniruby$(EXEEXT):
@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
- $(ECHO) linking $@
- $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(DTRACE_OBJ) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
$(PROGRAM):
@$(RM) $@
- $(ECHO) linking $@
- $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
- $(Q) $(POSTLINK)
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
# We must `rm' the library each time this rule is invoked because "updating" a
# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
# supported.
$(LIBRUBY_A):
@$(RM) $@
- $(ECHO) linking static-library $@
- $(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(DMYEXT)
+ $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
@-$(RANLIB) $@ 2> /dev/null || true
- $(ECHO) verifying static-library $@
- @$(PURIFY) $(CC) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT) $(LDFLAGS)
- @$(RM) conftest$(EXEEXT) conftest.c
$(LIBRUBY_SO):
@-$(PRE_LIBRUBY_UPDATE)
- $(ECHO) linking shared-library $@
- $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(DTRACE_OBJ) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
- -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
- $(Q) $(POSTLINK)
+ $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+ -$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' -L '@EXPORT_PREFIX@*_threadptr_*' $@
@-$(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 $(srcdir)/template/fake.rb.in
@./config.status --file=$@:$(srcdir)/template/fake.rb.in
@chmod +x $@
-ruby_pc = @ruby_pc@
-$(ruby_pc):
- @./config.status --file=$@:$(srcdir)/template/ruby.pc.in
-
-install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
- $(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
- $(ECHO) installing cross-compiling stuff
- $(Q) $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
- $(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
- $(Q) $(BASERUBY) -p \
- -e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
- -e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
- rbconfig.rb > fake-rbconfig.rb
- $(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb
- $(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb
- @$(RM) fake.rb fake-rbconfig.rb
- $(INSTALL_DATA) $(arch_hdrdir)/ruby/config.h $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
- $(INSTALL_DATA) $(top_srcdir)/include/ruby/win32.h $(XRUBY_RUBYHDRDIR)/ruby
- $(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
- $(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch)
-
Makefile: $(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
$(MKFILES): config.status
- @[ -f Makefile ] && mv Makefile Makefile.old
MAKE=$(MAKE) $(SHELL) ./config.status
- @cmp Makefile Makefile.old > /dev/null 2>&1 && echo Makefile unchanged && exit 0; \
- { \
+ @{ \
echo "all:; -@rm -f conftest.mk"; \
echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
echo ".force:"; \
@@ -268,22 +184,15 @@ $(MKFILES): config.status
uncommon.mk: $(srcdir)/common.mk
sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
-.PHONY: reconfig
-reconfig-args = $(srcdir)/configure $(configure_args)
-config.status-args = ./config.status --recheck
-reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
-reconfig-exec-1 = set -x; "$$@"
-
-reconfig config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in \
- $(srcdir)/include/ruby/version.h
+config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
- set $(SHELL) $($@-args); $(reconfig-exec-$(V))
+ set $(SHELL) ./config.status --recheck; \
+ exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
$(srcdir)/configure: $(srcdir)/configure.in
$(CHDIR) $(srcdir) && exec $(AUTOCONF)
incs: id.h
-all-incs: probes.h
# Things which should be considered:
# * with gperf v.s. without gperf
@@ -295,10 +204,10 @@ all-incs: probes.h
lex.c: defs/keywords
@\
if cmp -s $(srcdir)/defs/lex.c.src $?; then \
- [ $(Q) ] && echo copying $@ || set -x; \
+ set -x; \
$(CP) $(srcdir)/lex.c.blt $@; \
else \
- [ $(Q) ] && echo generating $@ || set -x; \
+ 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 && \
@@ -317,7 +226,7 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
trap '$(RM) $@-1.h $@-2.h' 0 && \
set -x; \
sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
- sed '/^#ifdef USE_UNICODE_PROPERTIES/d;/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-2.h && \
+ gperf $(NAME2CTYPE_OPTIONS) < $? > $@-2.h && \
diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
$(MV) $@.tmp $@ && \
$(CP) $? $(?:.kwd=.src) && \
@@ -325,107 +234,52 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
fi
.c.@OBJEXT@:
- @$(ECHO) compiling $<
- $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
+ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
.s.@OBJEXT@:
- @$(ECHO) assembling $<
- $(Q) $(AS) $(ASFLAGS) -o $@ $<
+ $(AS) $(ASFLAGS) -o $@ $<
.c.S:
- @$(ECHO) translating $<
- $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
+ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
.c.i:
- @$(ECHO) preprocessing $<
- $(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
-
-.d.h:
- @$(ECHO) translating probes $<
- $(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
- $(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
- $(Q) $(RM) $@.tmp
-
-.dmyh.h:
- @$(ECHO) copying dummy $(DEST_FILE)
- $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
-
-probes.@OBJEXT@: $(srcdir)/probes.d
- @$(ECHO) processing probes in object files
- $(Q) stamp="$*.stamp"; \
- if test -f "$$stamp" -o -f "$@"; then \
- $(RM) $(DTRACE_DEPENDENT_OBJS) "$$stamp"; \
- for o in $(DTRACE_DEPENDENT_OBJS); do \
- echo "rebuilding $$o which was modified by \"dtrace -G\""; \
- $(MAKE) "$$o"; \
- done; \
- fi; \
- touch "$$stamp"
- $(RM) $@
- $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
-
-# DTrace static library hacks described here:
-# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
-ruby-glommed.$(OBJEXT):
- @$(ECHO) generating a glommed object with DTrace probes for static library
- $(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ)
+ $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
clean-local::
- $(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
- enc/encinit.c enc/encinit.$(OBJEXT)
- -$(Q)$(RM) $(pkgconfig_DATA)
+ @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
distclean-local::
- $(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
- -$(Q)$(RM) run.gdb
- -$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h verconf.h
- -$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
+ @$(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::
- @cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
- test "$$#" = 0 && set .; \
- set dummy `\
- find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
- `; shift; \
- cd ..; \
- for dir do \
- echo $(@:-ext=)ing "$$dir"; \
- (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
- case "$@" in \
- *distclean-ext*|*realclean-ext*) \
- $(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \
- esac; \
- done
- -$(Q)$(RM) ext/extinit.$(OBJEXT)
+ @if [ -d ext ]; then \
+ cd ext; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
+ test "$$#" = 0 && set .; \
+ set dummy `for dir in "$$@"; do \
+ find $$dir -name Makefile | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
+ done`; shift; \
+ cd ..; \
+ for dir in "$$@"; do \
+ echo $(@:-ext=)ing "$$dir"; \
+ (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
+ case "$@" in \
+ *distclean-ext*|*realclean-ext*) \
+ $(RMDIRS) "ext/$$dir";; \
+ esac; \
+ done \
+ fi
distclean-ext realclean-ext::
- -$(Q)$(RM) ext/extinit.c
- -$(Q)$(RMDIR) ext 2> /dev/null || true
-
-clean-extout:
- -$(Q)$(RMDIRS) $(EXTOUT) 2> /dev/null || true
-
-clean-enc distclean-enc realclean-enc:
- @test -f "$(ENC_MK)" || exit 0; \
- echo $(@:-enc=ing) encodings; \
- exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
-
-clean-rdoc distclean-rdoc realclean-rdoc:
- @echo $(@:-rdoc=ing) rdoc
- $(Q)$(RMALL) $(RDOCOUT)
-clean-capi distclean-capi realclean-capi:
- @echo $(@:-capi=ing) capi
- $(Q)$(RMALL) $(CAPIOUT)
-
-clean-platform:
- @$(RM) $(PLATFORM_D)
- -$(Q) $(RMDIR) $(PLATFORM_DIR) 2> /dev/null || true
+ @-rmdir ext 2> /dev/null || true
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
- $(ECHO) compiling $@
- $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
+ $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
up::
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
@@ -452,8 +306,9 @@ update-rubyspec: update-mspec
exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
fi
-test-rubyspec-precheck:
+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 run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
vmtc.inc vm.inc
@@ -461,5 +316,4 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
$(INSNS): $(srcdir)/insns.def vm_opts.h \
$(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
$(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
- $(ECHO) generating $@
- $(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+ $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
diff --git a/NEWS b/NEWS
index 99c9e1dd26..3b22bbfd10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,5 @@
-# -*- rdoc -*-
-
-= NEWS for Ruby 2.0.0
+# -*- rd -*-
+= NEWS
This document is a list of user visible feature changes made between
releases except for bug fixes.
@@ -9,536 +8,502 @@ 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.3 release
-
-=== Language changes
-
-* Added keyword arguments.
-
-* Added %i and %I for symbol list creation (similar to %w and %W).
-
-* Default source encoding is changed to UTF-8. (was US-ASCII)
-
-* No warning for unused variables starting with '_'
-
-=== Core classes updates (outstanding ones only)
-
-* ARGF
- * added method:
- * added ARGF#codepoints and ARGF#each_codepoint, like the corresponding
- methods for IO.
-
-* Array
- * added method:
- * added Array#bsearch for binary search.
- * incompatible changes:
- * random parameter of Array#shuffle! and Array#sample now
- will be called with one argument, maximum value.
- * when given Range arguments, Array#values_at now returns nil for each
- value that is out-of-range.
-
-* Enumerable
- * added method:
- * added Enumerable#lazy method for lazy enumeration.
-
-* Enumerator
- * added method:
- * added Enumerator#size for lazy size evaluation.
- * extended method:
- * Enumerator.new accept an argument for lazy size evaluation.
- * new class Enumerator::Lazy for lazy enumeration
-
-* ENV
- * aliased method:
- * ENV.to_h is a new alias for ENV.to_hash
-
-* Fiber
- * incompatible changes:
- * Fiber#resume cannot resume a fiber which invokes "Fiber#transfer".
-
-* File
- * extended method:
- * File.fnmatch? now expands braces in the pattern if
- File::FNM_EXTGLOB option is given.
-
-* GC
- * improvements:
- * introduced the bitmap marking which suppresses to copy a memory page
- with Copy-on-Write.
- * introduced the non-recursive marking which avoids unexpected stack overflow.
-
-* GC::Profiler
- * added method:
- * added GC::Profiler.raw_data which returns raw profile data for GC.
-
-* Hash
- * added method:
- * added Hash#to_h as explicit conversion method, like Array#to_a.
- * extended method:
- * Hash#default_proc= can be passed nil to clear the default proc.
-
-* IO
- * deprecated methods:
- * IO#lines, #bytes, #chars and #codepoints are deprecated.
-
-* Kernel
- * added method:
- * added Kernel#Hash conversion method like Array() or Float().
- * added Kernel#__dir__ which returns the absolute path of the
- directory of the file from which this method is called.
- * added Kernel#caller_locations which returns an array of
- frame information objects.
- * extended method:
- * Kernel#warn accepts multiple args in like puts.
- * Kernel#caller accepts second optional argument `n' which specify
- required caller size.
- * Kernel#to_enum and enum_for accept a block for lazy size evaluation.
- * incompatible changes:
- * system() and exec() closes non-standard file descriptors
- (The default of :close_others option is changed to true by default.)
- * respond_to? against a protected method now returns false unless
- the second argument is true.
- * __callee__ has returned to the original behavior, and now
- returns the called name but not the original name in an
- aliased method.
- * Kernel#inspect does not call #to_s anymore
- (it used to call redefined #to_s).
-
-* LoadError
- * added method:
- * added LoadError#path method to return the file name that could not be
- loaded.
-
-* Module
- * added method:
- * added Module#prepend which is similar to Module#include,
- however a method in the prepended module overrides the
- corresponding method in the prepending module.
- * added Module.prepended and Module.prepend_features, similar
- to included and append_features.
- * added Module#refine, which extends a class or module locally.
- [experimental]
- * extended method:
- * Module#define_method accepts a UnboundMethod from a Module.
- * Module#const_get accepts a qualified constant string, e.g.
- Object.const_get("Foo::Bar::Baz")
-
-* Mutex
- * added method:
- * added Mutex#owned? which returns the mutex is held by current
- thread or not. [experimental]
- * incompatible changes:
- * Mutex#lock, Mutex#unlock, Mutex#try_lock, Mutex#synchronize
- and Mutex#sleep are no longer allowed to be used from trap handler
- and raise a ThreadError in such case.
- * Mutex#sleep may spurious wakeup. Check after wakeup.
-
-* NilClass
- * added method:
- * added nil.to_h which returns {}
-
-* ObjectSpace::WeakMap
- * new low level class to hold weak references to objects.
-
-* Proc
- * incompatible change:
- * removed Proc#== and #eql? so two procs are == only when they are
- the same object.
-
-* Process
- * added method:
- * added getsid for getting session id (unix only).
-
-* Range
- * added method:
- * added Range#size for lazy size evaluation.
- * added Range#bsearch for binary search.
-
-* RubyVM (MRI specific)
- * added RubyVM::InstructionSequence.of to get the instruction sequence
- from a method or a block.
- * added RubyVM::InstructionSequence#path, #absolute_path, #label,
- #base_label and #first_lineno to retrieve information from where
- the instruction sequence was defined.
- * added Environment variables to specify stack usage:
- * RUBY_THREAD_VM_STACK_SIZE: vm stack size used at thread creation.
- default: 128KB (32bit CPU) or 256KB (64bit CPU).
- * RUBY_THREAD_MACHINE_STACK_SIZE: machine stack size used at thread
- creation. default: 512KB or 1024KB.
- * RUBY_FIBER_VM_STACK_SIZE: vm stack size used at fiber creation.
- default: 64KB or 128KB.
- * RUBY_FIBER_MACHINE_STACK_SIZE: machine stack size used at fiber
- creation. default: 256KB or 256KB.
- These variables are checked only at launched time.
- * added constant DEFAULT_PARAMS to get above default parameters.
-
-* Signal
- * added method:
- * added Signal.signame which returns signal name
-
- * incompatible changes:
- * Signal.trap raises ArgumentError when :SEGV, :BUS, :ILL, :FPE, :VTALRM
- are specified.
-
-* String
- * added method:
- * added String#b returning a copied string whose encoding is ASCII-8BIT.
- * change return value:
- * String#lines now returns an array instead of an enumerator.
- * String#chars now returns an array instead of an enumerator.
- * String#codepoints now returns an array instead of an enumerator.
- * String#bytes now returns an array instead of an enumerator.
-
-* Struct
- * added method:
- * added Struct#to_h returning values with keys corresponding to the
- instance variable names.
-
-* Thread
- * added method:
- * added Thread#thread_variable_get for getting thread local variables
- (these are different than Fiber local variables).
- * added Thread#thread_variable_set for setting thread local variables.
- * added Thread#thread_variables for getting a list of the thread local
- variable keys.
- * added Thread#thread_variable? for testing to see if a particular thread
- variable has been set.
- * added Thread.handle_interrupt as well as instance and singleton methods
- pending_interrupt? for asynchronous handling of exceptions
- * added Thread#backtrace_locations which returns similar information of
- Kernel#caller_locations.
- * new class Thread::Backtrace::Location to hold backtrace location
- information. These are returned by Thread#backtrace_locations and
- Kernel#caller_locations.
- * incompatible changes:
- * Thread#join and Thread#value now raises a ThreadError if target thread
- is the current or main thread.
-
-* Time
- * change return value:
- * Time#to_s now returns US-ASCII encoding instead of BINARY.
-
-* TracePoint
- * new class. This class is replacement of set_trace_func.
- Easy to use and efficient implementation.
-
-* toplevel
- * added method:
- * added main.define_method which defines a global function.
- * added main.using, which imports refinements into the current file or
- eval string. [experimental]
-
-=== Core classes compatibility issues (excluding feature bug fixes)
-
-* Array#values_at
-
- See above.
+== Changes since the 1.9.1 release
+=== Library updates (outstanding ones only)
+
+* builtin classes
+
+ * Array
+ * new methods:
+ * Array#keep_if
+ * Array#repeated_combination
+ * Array#repeated_permutation
+ * Array#rotate
+ * Array#rotate!
+ * Array#select!
+ * Array#sort_by!
+
+ * extended method:
+ * Array#{uniq,uniq!,product} can take a block.
+
+ * Complex
+ * new method:
+ * Complex#rationalize
+
+ * Dir
+ * new method:
+ * Dir.home
+
+ * Encoding
+ * new encodings:
+ * Big5
+ * Big5-UAO
+ * ISO-2022-JP-KDDI
+ * SJIS-DoCoMo
+ * SJIS-KDDI
+ * SJIS-SoftBank
+ * UTF8-DoCoMo
+ * UTF8-KDDI
+ * UTF8-SoftBank
+
+ * new method:
+ * ascii_compatible?
+
+ * Enumerable
+ * new methods:
+ * Enumerable#chunk
+ * Enumerable#collect_concat
+ * Enumerable#each_entry
+ * Enumerable#flat_map
+ * Enumerable#slice_before
+
+ * Enumerator
+ * new methods:
+ * Enumerator#peek
+ * Enumerator#next_values
+ * Enumerator#peek_values
+ * Enumerator#feed
+ * StopIteration#result
+
+ * extended method:
+ * #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.
+
+ * ENV
+ * Uses locale's encoding
+ * ENV.[]= raises Errno::{EINVAL,ENOMEM} etc. on failure.
+ * new methods:
+ * ENV.keep_if
+ * ENV.select!
+
+ * Float
+ * new constants:
+ * Float::INFINITY
+ * Float::NAN
+ * new method:
+ * Float#rationalize
+
+ * File
+ * new methods:
+ * File.realpath
+ * File.realdirpath
+
+ * GC::Profiler
+ * new method:
+ * GC::Profiler.total_time
+
+ * Hash
+ * new methods:
+ * Hash#keep_if
+ * Hash#select!
+
+ * IO
+ * new methods:
+ * IO#autoclose=
+ * IO#autoclose?
+ * IO#fdatasync
+ * IO#codepoints
+ * IO#each_codepoint
+
+ * extended method:
+ * IO.pipe can take a block.
+
+ * new modules:
+ * IO::WaitReadable
+ * IO::WaitWritable
+ They are used to extend non-blocking exceptions.
+
+ * Integer
+ * new method:
+ * Integer#rationalize
+
+ * Kernel
+ * new methods:
+ * Kernel#respond_to_missing?
+ * Kernel#singleton_class
+ * Kernel#require_relative
+
+ * extended method:
+ * Kernel#respond_to? can be used to detect methods not implemented.
+ For example, Process.respond_to?(:fork) returns false on Windows.
+
+ * incompatible changes:
+ * Kernel#instance_eval yields the receiver.
+
+ * Kernel#exec
+ * Kernel#spawn
+ * Kernel#system
+ * Kernel#` (`...`)
+ ..etc.
+
+ On Windows, the current directory is no longer implicitly
+ prepended to the default command search path, just like other
+ platforms.
+
+ * MatchData
+ * new method:
+ * MatchData#==
+
+ * Method
+ * new method:
+ * Method#parameters
+
+ * NilClass
+ * new method:
+ * NilClass#rationalize
+
+ * Object
+ * extended methods:
+ * Float() supports hexadecimal floating point format.
+ * printf() supports %a/%A format.
+
+ * Proc
+ * new method:
+ * Proc#parameters
+ * extended method:
+ * Proc#source_location returns location even if receiver is a method
+ defined by attr_reader / attr_writer / attr_accessor.
+
+ * Process
+ * extended method:
+ * Process.spawn accepts [:child, FD] for a redirect target.
+
+ * Random (new class to generate pseudo-random numbers)
+
+ * Rational
+ * new method:
+ * Rational#rationalize
+
+ * String
+ * extended methods:
+ * string[regexp, name] is supported for named capture.
+
+ * Thread
+ * new methods:
+ * Thread#add_trace_func
+ * Thread#set_trace_func
+
+ * Time
+ * extended features:
+ * 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 methods:
+ * Time#to_r
+ * Time#subsec
+ * Time#round
+
+ * incompatible change:
+ * 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.
+
+ * UnboundMethod
+ * new method:
+ * UnboundMethod#parameters
+
+
+* digest
+ * new methods:
+ * Digest::Class.base64digest
+ * Digest::Instance#base64digest
+ * Digest::Instance#base64digest!
-* String#lines
-* String#chars
-* String#codepoints
-* String#bytes
+ * Digest::HMAC (digest/hmac) has been marked as deprecated because
+ it was unintentional for the experimental library to be included
+ in the final release of 1.9.1. Please use OpenSSL::HMAC instead.
- These methods no longer return an Enumerator, although passing a
- block is still supported for backwards compatibility.
+* rss
- Code like str.lines.with_index(1) { |line, lineno| ... } no longer
- works because str.lines returns an array. Replace lines with
- each_line in such cases.
+ * 0.2.4 -> 0.2.7.
-* IO#lines
-* IO#chars
-* IO#codepoints
-* IO#bytes
-* ARGF#lines
-* ARGF#chars
-* ARGF#bytes
-* StringIO#lines
-* StringIO#chars
-* StringIO#codepoints
-* StringIO#bytes
-* Zlib::GzipReader#lines
-* Zlib::GzipReader#bytes
+ * RSS::Maker.make
+ * raise an exception not returns nil for invalid feed making.
+ * requires block.
- These methods are deprecated in favor of each_line, each_byte,
- each_char and each_codepoint.
+ * RSS::Maker.[]
+ * new method to return maker class.
-* Proc#==
-* Proc#eql?
+ * RSS::Maker.supported?(version)
+ * new method to check whether given version is supported.
- These methods were removed. Two procs are == only when they are
- the same object.
+ * RSS::Maker: item.guid.permanent_link?
+ * new alias of item.guid.isPermaLink
+ * RSS::Maker: item.guid.permanent_link=
+ * new alias of item.guid.isPermaLink=
-* Fixnum
-* Bignum
-* Float
+* DL
+ * Now uses libffi as a backend if avaiable.
+ It means DL works fine on more platforms.
- Fixnums, Bignums and Floats are frozen.
+* Fiddle
+ * A lightweight wrapper for libffi.
-* Signal.trap
+* YAML
+ * Now uses libyaml as a backend if available.
+ It means YAML library supports new standards for YAML.
- See above.
+* Psych
+ * A wrapper for libyaml.
-* Merge Onigmo.
- https://github.com/k-takata/Onigmo
+* JSON
+ * Update to JSON 1.1.9
-* The :close_others option is true by default for system() and exec().
- Also, the close-on-exec flag is set by default for all new file descriptors.
- This means file descriptors doesn't inherit to spawned process unless
- explicitly requested such as system(..., fd=>fd).
+* REXML
-* Kernel#respond_to? against a protected method now returns false
- unless the second argument is true.
+ * REXML::Document.entity_expansion_limit=
-* Kernel#respond_to_missing?
-* Kernel#initialize_clone
-* Kernel#initialize_dup
+ New method to set the entity expansion limit. By default the limit is
+ set to 10000. See the following URL for details.
- These methods are now private.
+ http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
-* Thread#join, Thread#value
+* RDoc
- See above.
+ * Updated to RDoc 2.5.8
-* Mutex#lock, Mutex#unlock, Mutex#try_lock, Mutex#synchronize and Mutex#sleep
+* RubyGems
- See above.
+ * Updated to RubyGems 1.3.7
-=== Stdlib updates (outstanding ones only)
+* logger
-* cgi
- * Add HTML5 tag maker.
- * CGI#header has been renamed to CGI#http_header and
- aliased to CGI#header.
- * When HTML5 tagmaker called, overwrite CGI#header,
- CGI#header function is to create a <header> element.
+ * 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)
-* CSV
- * Removed CSV::dump and CSV::load to protect users from dangerous
- serialization vulnerability
+* matrix
+ * API change to adhere strictly to mathematical definitions:
+ * Matrices must now be rectangular.
+ * trace, regular?, singular? are defined only for square matrices
+ * support for empty matrices
+ * all integer matrices now have the right determinant (also an integer)
-* iconv
- * Iconv has been removed. Use String#encode instead.
+ * Matrix and Vector include Enumerable.
-* io/console
* new methods:
- * added IO#cooked which sets the terminal to cooked mode within the given block.
- * added IO#cooked! which sets the terminal to cooked.
- * extended method:
- * IO#raw, IO#raw!, and IO#getch accept keyword arguments, :min and :time.
-
-* io/wait
- * new features:
- * added IO#wait_writable method.
- * added IO#wait_readable method as alias of IO#wait.
-
-* json
- * updated to 1.7.7.
+ * Matrix.build
+ * Matrix.empty
+ * Matrix#conj
+ * Matrix#conjugate
+ * Matrix#each
+ * Matrix#each_with_index
+ * Matrix#empty?
+ * Matrix#imag
+ * Matrix#imaginary
+ * Matrix#real
+ * Matrix#real?
+ * Matrix#rect
+ * Matrix#rectangular
* net/http
- * new features:
- * Proxies are now automatically detected from the http_proxy environment
- variable. See Net::HTTP::new for details.
- * gzip and deflate compression are now requested for all requests by
- default. See Net::HTTP for details.
- * SSL sessions are now reused across connections for a single instance.
- This speeds up connection by using a previously negotiated session.
- * Requests may be created from a URI which sets the request_uri and host
- header of the request (but does not change the host connected to).
- * Responses contain the URI requested which allows easier implementation of
- redirect following.
- * new methods:
- * Net::HTTP#local_host
- * Net::HTTP#local_host=
- * Net::HTTP#local_port
- * Net::HTTP#local_port=
- * extended method:
- * Net::HTTP#connect uses local_host and local_port if specified.
+ * merged net/https.
-* net/imap
+* open3
* new methods:
- * Net::IMAP.default_port
- * Net::IMAP.default_imap_port
- * Net::IMAP.default_tls_port
- * Net::IMAP.default_ssl_port
- * Net::IMAP.default_imaps_port
-
-* objspace
- * new method:
- * ObjectSpace.reachable_objects_from(obj)
+ * Open3.popen2
+ * Open3.popen2e
+ * Open3.capture3
+ * Open3.capture2
+ * Open3.capture2e
+ * Open3.pipeline_rw
+ * Open3.pipeline_r
+ * Open3.pipeline_w
+ * Open3.pipeline_start
+ * Open3.pipeline
+
+* pty
+ * new methods:
+ * PTY.open
+ * PTY.check
+ * deprecated methods:
+ * protect_signal
+ * reset_signal
* openssl
- * Consistently raise an error when trying to encode nil values. All instances
- of OpenSSL::ASN1::Primitive now raise TypeError when calling to_der on an
- instance whose value is nil. All instances of OpenSSL::ASN1::Constructive
- raise NoMethodError in the same case. Constructing such values is still
- permitted.
- * TLS 1.1 & 1.2 support by setting OpenSSL::SSL::SSLContext#ssl_version to
- :TLSv1_2, :TLSv1_2_server, :TLSv1_2_client or :TLSv1_1, :TLSv1_1_server
- :TLSv1_1_client. The version being effectively used can be queried
- with OpenSSL::SSL#ssl_version. Furthermore, it is also possible to
- blacklist the new TLS versions with OpenSSL::SSL:OP_NO_TLSv1_1 and
- OpenSSL::SSL::OP_NO_TLSv1_2.
- * Added OpenSSL::SSL::SSLContext#renegotiation_cb. A user-defined callback
- may be set which gets called whenever a new handshake is negotiated. This
- also allows to programmatically decline (client) renegotiation attempts.
- * Support for "0/n" splitting of records as BEAST mitigation via
- OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS.
- * The default options for OpenSSL::SSL::SSLContext have changed to
- OpenSSL::SSL::OP_ALL & ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
- instead of OpenSSL::SSL::OP_ALL only. This enables the countermeasure for
- the BEAST attack by default.
- * OpenSSL requires passwords for decrypting PEM-encoded files to be at least
- four characters long. This led to awkward situations where an export with
- a password with fewer than four characters was possible, but accessing the
- file afterwards failed. OpenSSL::PKey::RSA, OpenSSL::PKey::DSA and
- OpenSSL::PKey::EC therefore now enforce the same check when exporting a
- private key to PEM with a password - it has to be at least four characters
- long.
- * SSL/TLS support for the Next Protocol Negotiation extension. Supported
- with OpenSSL 1.0.1 and higher.
- * OpenSSL::OPENSSL_FIPS allows client applications to detect whether OpenSSL
- is FIPS-enabled. OpenSSL.fips_mode= allows turning on and off FIPS mode
- manually in order to adapt to situations where FIPS mode would be an
- explicit requirement.
- * Authenticated Encryption with Associated Data (AEAD) is supported via
- Cipher#auth_data= and Cipher#auth_tag/Cipher#auth_tag=.
- Currently (OpenSSL 1.0.1c), only GCM mode is supported.
-
-* ostruct
* new methods:
- * OpenStruct#[], []=
- * OpenStruct#each_pair
- * OpenStruct#eql?
- * OpenStruct#hash
- * OpenStruct#to_h converts the struct to a hash.
- * extended method:
- * OpenStruct.new also accepts an OpenStruct / Struct.
-
-* pathname
- * extended method:
- * Pathname#find returns an enumerator if no block is given.
-
-* rake
- * rake has been updated to version 0.9.5.
-
- This version is backwards-compatible with previous rake versions and
- contains many bug fixes.
+ * OpenSSL::Buffering#read_nonblock
+ * OpenSSL::Buffering#write_nonblock
+ * OpenSSL::SSL::SSLSocket#connect_nonblock
+ * OpenSSL::SSL::SSLSocket#accept_nonblock
- See
- http://rake.rubyforge.org/doc/release_notes/rake-0_9_5_rdoc.html for a list
- of changes in rake 0.9.3, 0.9.4 and 0.9.5.
+* scanf
+ * support %a/%A format.
-* RDoc
- * RDoc has been updated to version 4.0
-
- This version is largely backwards-compatible with previous rdoc versions.
- The most notable change is an update to the ri data format (ri data must
- be regenerated for gems shared across rdoc versions). Further API changes
- are internal and won't affect most users.
-
- Notable changes include:
- * Page support for ri. Try `ri ruby:` for a list of pages in ruby or
- `ri ruby:syntax/literals` for the syntax documentation for literals.
+* socket
- This also works for gems such as `ri rspec:README` for the rspec gem's
- README file.
- * Markdown support. See ri RDoc::Markdown for details.
-
- See https://github.com/rdoc/rdoc/blob/master/History.rdoc for a full list
- of changes in rdoc 4.0.
+ * 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.
+ * Socket.do_not_reverse_lookup is turned on by default now.
+
+ * new class:
+ * Addrinfo
+ * Socket::Option
+ * Socket::AncillaryData
-* resolv
* new methods:
- * Resolv::DNS#timeouts=
- * Resolv::DNS::Config#timeouts=
+ * 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.
+ * Socket.getaddrinfo and IPSocket#{addr,peeraddr} accept an optional
+ argument to turn reverse lookup on/off.
+
+ * 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
-* rexml
- * REXML::Document#write supports Hash arguments.
- * REXML::Document#write supports new :encoding option. It changes
- XML document encoding. Without :encoding option, encoding in
- XML declaration is used for XML document encoding.
-
-* RubyGems
- * Updated to 2.0.14.
-
- See http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.0.14+%2F+2013-11-12
- for release notes.
-
- * Updated to 2.0.10. This fixes CVE_2013-4363:
+* stringio
+ * new methods:
+ * StringIO#read_nonblock
+ * StringIO#write_nonblock
+* pathname
+ * new methods:
+ * Pathname#binread
+ * Pathname#realdirpath
+ * Pathname#each_child
- http://rubygems.rubyforge.org/rubygems-update/CVE-2013-4363_txt.html
+ * extended methods:
+ * Pathname#realpath and Pathname#realdirpath takes optional basedir
+ argument.
- * Updated to 2.0.8. This fixes CVE-2013-4287:
+* Readline
+ * new methods:
+ * Readline.set_screen_size
+ * Readline.get_screen_size
- http://rubygems.rubyforge.org/rubygems-update/CVE-2013-4287_txt.html
+ * extended methods:
+ * Readline.completion_proc= accepts nil.
+ nil means to use default completion proc.
- * Updated to 2.0.0
+* set
+ * new methods:
+ * Set#keep_if
+ * Set#select!
- RubyGems 2.0.0 features the following improvements:
+* time
+ * incompatible changes:
+ * Time.parse raises ArgumentError when no date information.
- * Improved support for default gems shipping with ruby 2.0.0+
- * A gem can have arbitrary metadata through Gem::Specification#metadata
- * `gem search` now defaults to --remote and is anchored like gem list.
- * Added --document to replace --rdoc and --ri. Use --no-document to
- disable documentation, --document=rdoc to only generate rdoc.
- * Only ri-format documentation is generated by default.
- * `gem server` uses RDoc::Servlet from RDoc 4.0 to generate HTML
- documentation.
+* thread
+ * extended method:
+ * ConditionVariable#wait takes timeout argument.
- For an expanded list of updates and bug fixes see:
- https://github.com/rubygems/rubygems/blob/master/History.txt
+* securerandom
+ * new methods:
+ * SecureRandom.urlsafe_base64
-* shellwords
- * Shellwords#shellescape now stringifies the given object using to_s.
- * Shellwords#shelljoin accepts non-string objects in the given
- array, each of which is stringified using to_s.
+* URI
+ * new methods:
+ * URI.encode_www_form
+ * URI.decode_www_form
+ * URI.encode_www_form_component
+ * URI.decode_www_form_component
+ * Obsoleted methods:
+ * URI.decode
+ * URI.encode
+ * URI.escape
+ * URI.unescape
+
+* etc
+ * new methods:
+ * Etc::Passwd.each
+ * Etc::Group.each
-* stringio
- * deprecated methods:
- * StringIO#lines, #bytes, #chars and #codepoints are deprecated.
+* zlib
+ * new methods:
+ * Zlib::GzipFile#path
+ * Zlib.#adler32_combine
+ * Zlib.#crc32_combine
-* syslog
- * Added Syslog::Logger which provides a Logger API atop Syslog.
- * Syslog::Priority, Syslog::Level, Syslog::Option and Syslog::Macros
- are introduced for easy detection of available constants on a
- running system.
+* rbconfig
+ * new methods:
+ * RbConfig.ruby
-* tmpdir
- * incompatible changes:
- * Dir.mktmpdir uses FileUtils.remove_entry instead of
- FileUtils.remove_entry_secure. This means that applications should not
- change the permission of the created temporary directory to make
- accessible from other users.
+=== Language changes
-* yaml
- * Syck has been removed. YAML now completely depends on libyaml being
- installed.
- * libyaml is now bundled with ruby, for cases where the library is not
- installed locally.
+* Regexp properties (\p{}) names now ignore underscores, spaces, and case, so
+ \p{ol chiki} is the same as \p{Ol_Chiki}
+* Regexps now support Unicode 5.2 (new characters and scripts)
+* \d, \s, and \w are now ASCII only; use POSIX bracket classes and \p{} for
+ Unicode semantics
+* $: no longer includes the current directory, use require_relative
+* Symbol with an invalid encoding is forbidden to exist.
-* zlib
- * Added streaming support for Zlib::Inflate and Zlib::Deflate. This allows
- processing of a stream without the use of large amounts of memory.
- * Added support for the new deflate strategies Zlib::RLE and Zlib::FIXED.
- * Zlib streams are now processed without the GVL. This allows gzip, zlib and
- deflate streams to be processed in parallel.
- * deprecated methods:
- * Zlib::GzipReader#lines and #bytes are deprecated.
+=== Compilation options
-=== Stdlib compatibility issues (excluding feature bug fixes)
+* --program-prefix and --program-suffix no longer act on the shared object
+ names nor paths to libraries.
-* OpenStruct new methods can conflict with custom attributes named
- "each_pair", "eql?", "hash" or "to_h".
+ use --with-rubylibprefix='${libruby}/${RUBY_INSTALL_NAME}' and
+ --with-soname='${RUBY_INSTALL_NAME}' for the same result as Ruby 1.9.1.
-* Dir.mktmpdir in lib/tmpdir.rb
+* --with-arch is added for universal binary, instead of
+ --enable-fat-binary option.
- See above.
+=== Compatibility issues (excluding feature bug fixes)
-=== C API updates
+ * 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
+ * --enable-fat-binary
+ * $:
-* NUM2SHORT() and NUM2USHORT() added. They are similar to NUM2INT, but short.
+ See above.
-* rb_newobj_of() and NEWOBJ_OF() added. They create a new object of a given class.
+ * Digest::HMAC
+ Deprecated. See above.
diff --git a/README b/README
index cda6a93cd6..4a032c4308 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-= What's Ruby
+* What's Ruby
Ruby is the interpreted scripting language for quick and
easy object-oriented programming. It has many features to
@@ -6,130 +6,113 @@ process text files and to do system management tasks (as in
Perl). It is simple, straight-forward, and extensible.
-== Features of Ruby
+* Features of Ruby
-* Simple Syntax
-* *Normal* Object-Oriented features(ex. class, method calls)
-* *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method)
-* Operator Overloading
-* Exception Handling
-* Iterators and Closures
-* Garbage Collection
-* Dynamic Loading of Object files(on some architecture)
-* Highly Portable (works on many Unix-like/POSIX compatible platforms
+ + Simple Syntax
+ + *Normal* Object-Oriented features(ex. class, method calls)
+ + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method)
+ + Operator Overloading
+ + Exception Handling
+ + 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://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
+ cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms
-== How to get Ruby
-
-For a complete list of ways to install Ruby, including using third party
-tools like rvm, see:
-
-http://www.ruby-lang.org/en/downloads/
+* How to get Ruby
The Ruby distribution files can be found in the following FTP site:
-ftp://ftp.ruby-lang.org/pub/ruby/
+ ftp://ftp.ruby-lang.org/pub/ruby/
The trunk of the Ruby source tree can be checked out with the
following command:
$ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-Or if you are using git then use following command:
-
- $ git clone git://github.com/ruby/ruby.git
-
There are some other branches under development. Try the following
command and see the list of branches:
$ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
-Or if you are using git then use following command:
- $ git ls-remote git://github.com/ruby/ruby.git
-
-== Ruby home-page
+* Ruby home-page
The URL of the Ruby home-page is:
-http://www.ruby-lang.org/
+ http://www.ruby-lang.org/
-== Mailing list
+* Mailing list
There is a mailing list to talk about Ruby.
To subscribe this list, please send the following phrase
- subscribe YourFirstName YourFamilyName
+ subscribe YourFirstName YourFamilyName
e.g.
subscribe Joseph Smith
-in the mail body (not subject) to the address <mailto:ruby-talk-ctl@ruby-lang.org>.
+in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
-== How to compile and install
+* How to compile and install
This is what you need to do to compile and install Ruby:
-0. If you want to use Microsoft Visual C++ to compile ruby,
- read win32/README.win32 instead of this document.
-
-1. If +./configure+ does not exist or is older than configure.in,
+ 1. If ./configure does not exist or is older than configure.in,
run autoconf to (re)generate configure.
-2. Run +./configure+, which will generate config.h and Makefile.
+ 2. Run ./configure, which will generate config.h and Makefile.
Some C compiler flags may be added by default depending on your
- environment. Specify <tt>optflags=..</tt> and <tt>warnflags=..</tt> as
- necessary to override them.
+ environment. Specify optflags=.. and warnflags=.. as necessary
+ to override them.
-3. Edit +defines.h+ if you need. Usually this step will not be needed.
+ 3. Edit defines.h if you need. Usually this step will not be needed.
-4. Remove comment mark(<tt>#</tt>) before the module names from +ext/Setup+
- (or add module names if not present), if you want to link modules
+ 4. Remove comment mark(#) before the module names from ext/Setup (or
+ add module names if not present), if you want to link modules
statically.
If you don't want to compile non static extension modules
(probably on architectures which does not allow dynamic loading),
- remove comment mark from the line "<tt>#option nodynamic</tt>" in
- +ext/Setup+.
+ remove comment mark from the line "#option nodynamic" in
+ ext/Setup.
- Usually this step will not be needed.
+ 5. Run make.
-5. Run +make+.
-
-6. Optionally, run '<tt>make check</tt>' to check whether the compiled Ruby
- interpreter works well. If you see the message "<tt>check succeeded</tt>",
+ 6. 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).
-7. Run '<tt>make install</tt>'
+ 7. Run 'make install'
This command will create following directories and install files
onto them.
- * <tt>${DESTDIR}${prefix}/bin</tt>
- * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/share/man/man1</tt>
- * <tt>${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system</tt>
-
- If Ruby's API version is '_x.y.z_', the <tt>${MAJOR}</tt> is '_x_', the
- <tt>${MINOR}</tt> is '_y_', and the <tt>${TEENY}</tt> is '_z_'.
-
- *NOTE*: teeny of the API version may be different from one of
+ * ${DESTDIR}${prefix}/bin
+ * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib
+ * ${DESTDIR}${prefix}/lib/ruby
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/share/man/man1
+ * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
+
+ If Ruby's API version is `x.y.z', the ((|${MAJOR}|)) is `x', the
+ ((|${MINOR}|)) is `y', and the ((|${TEENY}|)) is `z'.
+
+ NOTE: teeny of the API version may be different from one of
Ruby's program version
You may have to be a super user to install ruby.
@@ -137,30 +120,25 @@ This is what you need to do to compile and install Ruby:
If you fail to compile ruby, please send the detailed error report with
the error log and machine/OS type, to help others.
-Some extension libraries may not get compiled because of lack of
-necessary external libraries and/or headers, then you will need to run
-'<tt>make distclean-ext</tt>' to remove old configuration after
-installing them in such case.
-
-== Copying
+DO NOT LINK Ruby WITH A LIBRARY WHOSE LICENSE IS NOT COMPATIBLE WITH Ruby
+License (see COPYING).
+For example, currently you cannot link with readline6, which is under GPLv3.
-See the file +COPYING+.
-== Feedback
+* Copying
-Questions about the Ruby language can be asked on the Ruby-Talk mailing list
-(http://www.ruby-lang.org/en/community/mailing-lists) or on websites like
-(http://stackoverflow.com).
+See the file COPYING.
-Bug reports should be filed at http://bugs.ruby-lang.org
-== The Author
+* The Author
-Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in 1995.
+Feel free to send comments and bug reports to the author. Here is the
+author's latest mail address:
-<mailto:matz@ruby-lang.org>
+ matz@netlab.jp
---
+-------------------------------------------------------
+created at: Thu Aug 3 11:57:36 JST 1995
Local variables:
-mode: rdoc
+mode: indented-text
end:
diff --git a/README.EXT b/README.EXT
index 61bc6ef731..72dba58c5d 100644
--- a/README.EXT
+++ b/README.EXT
@@ -1,8 +1,8 @@
-# README.EXT - -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995
+.\" README.EXT - -*- Text -*- created at: Mon Aug 7 16:45:54 JST 1995
This document explains how to make extension libraries for Ruby.
-= Basic Knowledge
+1. Basic knowledge
In C, variables have types and data do not have types. In contrast,
Ruby variables do not have a static type, and data themselves have
@@ -13,46 +13,47 @@ has its data-type.
To retrieve C data from a VALUE, you need to:
-1. Identify the VALUE's data type
-2. Convert the VALUE into C data
+ (1) Identify the VALUE's data type
+ (2) Convert the VALUE into C data
Converting to the wrong data type may cause serious problems.
-== Data-Types
+
+1.1 Data-types
The Ruby interpreter has the following data types:
-T_NIL :: nil
-T_OBJECT :: ordinary object
-T_CLASS :: class
-T_MODULE :: module
-T_FLOAT :: floating point number
-T_STRING :: string
-T_REGEXP :: regular expression
-T_ARRAY :: array
-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
-T_DATA :: data
-T_SYMBOL :: symbol
+ T_NIL nil
+ T_OBJECT ordinary object
+ T_CLASS class
+ T_MODULE module
+ T_FLOAT floating point number
+ T_STRING string
+ T_REGEXP regular expression
+ T_ARRAY array
+ 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
+ T_DATA data
+ T_SYMBOL symbol
In addition, there are several other types used internally:
-T_ICLASS :: included module
-T_MATCH :: MatchData object
-T_UNDEF :: undefined
-T_NODE :: syntax tree node
-T_ZOMBIE :: object awaiting finalization
+ T_ICLASS
+ T_MATCH
+ T_UNDEF
+ T_NODE
+ T_ZOMBIE
Most of the types are represented by C structures.
-== Check Data Type of the VALUE
+1.2 Check Data Type of the VALUE
The macro TYPE() defined in ruby.h shows the data type of the VALUE.
TYPE() returns the constant number T_XXXX described above. To handle
@@ -86,7 +87,7 @@ There are also faster check macros for fixnums and nil.
FIXNUM_P(obj)
NIL_P(obj)
-== Convert VALUE into C Data
+1.3 Convert VALUE into C data
The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true
respectively. They are singletons for the data type.
@@ -136,19 +137,19 @@ 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.
-== Convert C Data into VALUE
+1.4 Convert C data into VALUE
To convert C data to Ruby values:
-FIXNUM ::
+ * FIXNUM
- left shift 1 bit, and turn on LSB.
+ left shift 1 bit, and turn on LSB.
-Other pointer values::
+ * Other pointer values
- cast to VALUE.
+ cast to VALUE.
-You can determine whether a VALUE is pointer or not by checking its LSB.
+You can determine whether a VALUE is pointer or not by checking its LSB.
Notice Ruby does not allow arbitrary pointer values to be a VALUE. They
should be pointers to the structures which Ruby knows about. The known
@@ -156,153 +157,129 @@ structures are defined in <ruby.h>.
To convert C numbers to Ruby values, use these macros.
-INT2FIX() :: for integers within 31bits.
-INT2NUM() :: for arbitrary sized integer.
+ INT2FIX() for integers within 31bits.
+ INT2NUM() for arbitrary sized integer.
INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
range, but is a bit slower.
-== Manipulating Ruby Data
+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:
-=== String Functions
-
-rb_str_new(const char *ptr, long len) ::
-
- 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)).
-
-rb_tainted_str_new(const char *ptr, long len) ::
-
- Creates a new tainted Ruby string. Strings from external data
- sources should be tainted.
+ String functions
-rb_tainted_str_new2(const char *ptr) ::
-rb_tainted_str_new_cstr(const char *ptr) ::
+ rb_str_new(const char *ptr, long len)
- Creates a new tainted Ruby string from a C string.
+ Creates a new Ruby string.
-rb_sprintf(const char *format, ...) ::
-rb_vsprintf(const char *format, va_list ap) ::
+ rb_str_new2(const char *ptr)
+ rb_str_new_cstr(const char *ptr)
- Creates a new Ruby string with printf(3) format.
+ Creates a new Ruby string from a C string. This is equivalent to
+ rb_str_new(ptr, strlen(ptr)).
- Note: In the format string, %i is used for Object#to_s (or Object#inspect if
- '+' flag is set) output (and related argument must be a VALUE). For integers
- in format strings, use %d.
+ rb_tainted_str_new(const char *ptr, long len)
-rb_str_cat(VALUE str, const char *ptr, long len) ::
+ Creates a new tainted Ruby string. Strings from external data
+ sources should be tainted.
- Appends len bytes of data from ptr to the Ruby string.
+ rb_tainted_str_new2(const char *ptr)
+ rb_tainted_str_new_cstr(const char *ptr)
-rb_str_cat2(VALUE str, const char* ptr) ::
+ Creates a new tainted Ruby string from a C string.
- Appends C string ptr to Ruby string str. This function is
- equivalent to rb_str_cat(str, ptr, strlen(ptr)).
+ rb_sprintf(const char *format, ...)
+ rb_vsprintf(const char *format, va_list ap)
-rb_str_catf(VALUE str, const char* format, ...) ::
-rb_str_vcatf(VALUE str, const char* format, va_list ap) ::
+ Creates a new Ruby string with printf(3) format.
- 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_str_cat(VALUE str, const char *ptr, long len)
-rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) ::
+ Appends len bytes of data from ptr to the Ruby string.
- Creates a new Ruby string with the specified encoding.
+ rb_str_cat2(VALUE str, const char* ptr)
-rb_usascii_str_new(const char *ptr, long len) ::
-rb_usascii_str_new_cstr(const char *ptr) ::
+ Appends C string ptr to Ruby string str. This function is
+ equivalent to rb_str_cat(str, ptr, strlen(ptr)).
- Creates a new Ruby string with encoding US-ASCII.
+ rb_str_catf(VALUE str, const char* format, ...)
+ rb_str_vcatf(VALUE str, const char* format, va_list ap)
-rb_str_resize(VALUE str, long len) ::
+ 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.
- Resizes Ruby string to len bytes. If str is not modifiable, this
- function raises an exception. The length of str must be set in
- advance. If len is less than the old length the content beyond
- len bytes is discarded, else if len is greater than the old length
- the content beyond the old length bytes will not be preserved but
- will be garbage. Note that RSTRING_PTR(str) may change by calling
- this function.
+ 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)
-rb_str_set_len(VALUE str, long len) ::
+ Creates a new Ruby string with encoding US-ASCII.
- Sets the length of Ruby string. If str is not modifiable, this
- function raises an exception. This function preserves the content
- upto len bytes, regardless RSTRING_LEN(str). len must not exceed
- the capacity of str.
+ Array functions
-=== Array Functions
+ rb_ary_new()
-rb_ary_new() ::
+ Creates an array with no elements.
- Creates an array with no elements.
+ rb_ary_new2(long len)
-rb_ary_new2(long len) ::
+ Creates an array with no elements, allocating internal buffer
+ for len elements.
- Creates an array with no elements, allocating internal buffer
- for len elements.
+ rb_ary_new3(long n, ...)
-rb_ary_new3(long n, ...) ::
+ Creates an n-element array from the arguments.
- Creates an n-element array from the arguments.
+ rb_ary_new4(long n, VALUE *elts)
-rb_ary_new4(long n, VALUE *elts) ::
+ Creates an n-element array from a C array.
- Creates an n-element array from a C array.
+ rb_ary_to_ary(VALUE obj)
-rb_ary_to_ary(VALUE obj) ::
+ Converts the object into an array.
+ Equivalent to Object#to_ary.
- 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.
-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)
-rb_ary_aref(argc, VALUE *argv, VALUE ary) ::
+ Equivaelent to Array#[].
- Equivaelent to Array#[].
+ rb_ary_entry(VALUE ary, long offset)
-rb_ary_entry(VALUE ary, long offset) ::
+ ary[offset]
- ary[offset]
+ rb_ary_subseq(VALUE ary, long beg, long len)
-rb_ary_subseq(VALUE ary, long beg, long len) ::
+ ary[beg, 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)
-rb_ary_push(VALUE ary, VALUE val) ::
-rb_ary_pop(VALUE ary) ::
-rb_ary_shift(VALUE ary) ::
-rb_ary_unshift(VALUE ary, VALUE val) ::
-rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
+2. Extending Ruby with C
- Appends len elements of objects from ptr to the array.
-
-= Extending Ruby with C
-
-== Adding New Features to Ruby
+2.1 Adding new features to Ruby
You can add new features (classes, methods, etc.) to the Ruby
interpreter. Ruby provides APIs for defining the following things:
-* Classes, Modules
-* Methods, Singleton Methods
-* Constants
+ * Classes, Modules
+ * Methods, Singleton Methods
+ * Constants
-=== Class and Module Definition
+2.1.1 Class/module definition
To define a class or module, use the functions below:
@@ -317,21 +294,21 @@ To define nested classes or modules, use the functions below:
VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
VALUE rb_define_module_under(VALUE outer, const char *name)
-=== Method and Singleton Method Definition
+2.1.2 Method/singleton method definition
To define methods or singleton methods, use these functions:
- void rb_define_method(VALUE klass, const char *name,
+ void rb_define_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
- void rb_define_singleton_method(VALUE object, const char *name,
+ void rb_define_singleton_method(VALUE object, const char *name,
VALUE (*func)(), int argc)
The `argc' represents the number of the arguments to the C function,
which must be less than 17. But I doubt you'll need that many.
If `argc' is negative, it specifies the calling sequence, not number of
-the arguments.
+the arguments.
If argc is -1, the function will be called as:
@@ -349,16 +326,16 @@ 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 also ID or Symbol below.
+as the name of method to be defined. See 2.2.2 for IDs.
- void rb_define_method_id(VALUE klass, ID name,
+ void rb_define_method_id(VALUE klass, ID name,
VALUE (*func)(ANYARGS), int argc)
There are two functions to define private/protected methods:
- void rb_define_private_method(VALUE klass, const char *name,
+ void rb_define_private_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
- void rb_define_protected_method(VALUE klass, const char *name,
+ void rb_define_protected_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
At last, rb_define_module_function defines a module functions,
@@ -375,7 +352,7 @@ or
To define module functions, use:
- void rb_define_module_function(VALUE module, const char *name,
+ void rb_define_module_function(VALUE module, const char *name,
VALUE (*func)(), int argc)
In addition, function-like methods, which are private methods defined
@@ -400,7 +377,7 @@ func has to take the klass as the argument and return a newly
allocated instance. This instance should be as empty as possible,
without any expensive (including external) resources.
-=== Constant Definition
+2.1.3 Constant definition
We have 2 functions to define constants:
@@ -410,11 +387,11 @@ We have 2 functions to define constants:
The former is to define a constant under specified class/module. The
latter is to define a global constant.
-== Use Ruby Features from C
+2.2 Use Ruby features from C
There are several ways to invoke Ruby's features from C code.
-=== Evaluate Ruby Programs in a String
+2.2.1 Evaluate Ruby Programs in a String
The easiest way to use Ruby's functionality from a C program is to
evaluate the string as Ruby program. This function will do the job:
@@ -424,7 +401,7 @@ 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
+Note that the evaluation can raise an exception. There is a safer
function:
VALUE rb_eval_string_protect(const char *str, int *state)
@@ -432,7 +409,8 @@ function:
It returns nil when an error occur. Moreover, *state is zero if str was
successfully evaluated, or nonzero otherwise.
-=== ID or Symbol
+
+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
@@ -440,30 +418,18 @@ 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
-
+ :Identifier
or
-
- :"any kind of string"
+ :"any kind of string"
You can get the ID value from a string within C code by using
rb_intern(const char *name)
- rb_intern_str(VALUE name)
You can retrieve ID from Ruby object (Symbol or String) given as an
argument by using
rb_to_id(VALUE symbol)
- rb_check_id(volatile VALUE *name)
- rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
-
-These functions try to convert the argument to a String if it was not
-a Symbol nor a String. The second function stores the converted
-result into *name, and returns 0 if the string is not a known symbol.
-After this function returned a non-zero value, *name is always a
-Symbol or a String, otherwise it is a String if the result is 0.
-The third function takes NUL-terminated C string, not Ruby VALUE.
You can convert C ID to Ruby Symbol by using
@@ -473,7 +439,7 @@ and to convert Ruby Symbol object to ID, use
ID SYM2ID(VALUE symbol)
-=== Invoke Ruby Method from C
+2.2.3 Invoke Ruby method from C
To invoke methods directly, you can use the function below
@@ -482,7 +448,7 @@ To invoke methods directly, you can use the function below
This function invokes a method on the recv, with the method name
specified by the symbol mid.
-=== Accessing the Variables and Constants
+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
@@ -499,11 +465,11 @@ To access the constants of the class/module:
VALUE rb_const_get(VALUE obj, ID id)
-See also Constant Definition above.
+See 2.1.3 for defining new constant.
-= Information Sharing Between Ruby and C
+3. Information sharing between Ruby and C
-=== Ruby Constants That C Can Be Accessed From C
+3.1 Ruby constants that C can be accessed from C
As stated in section 1.3,
the following Ruby constants can be referred from C.
@@ -517,7 +483,7 @@ Boolean values. Qfalse is false in C also (i.e. 0).
Ruby nil in C scope.
-== Global Variables Shared Between C and Ruby
+3.2 Global variables shared between C and Ruby
Information can be shared between the two environments using shared global
variables. To define them, you can use functions listed below:
@@ -561,12 +527,12 @@ The prototypes of the getter and setter functions are as follows:
void (*setter)(VALUE val, ID id);
-== Encapsulate C Data into a Ruby Object
+3.3 Encapsulate C data into a Ruby object
To wrap and objectify a C pointer as a Ruby object (so called
DATA), use Data_Wrap_Struct().
- Data_Wrap_Struct(klass, mark, free, sval)
+ Data_Wrap_Struct(klass, mark, free, ptr)
Data_Wrap_Struct() returns a created DATA object. The klass argument
is the class for the DATA object. The mark argument is the function
@@ -599,34 +565,31 @@ Data_Get_Struct().
A pointer to the structure will be assigned to the variable sval.
-See the example below for details.
+See the example below for details.
-= Example - Creating dbm Extension
+4. Example - Creating dbm extension
OK, here's the example of making an extension library. This is the
extension to access DBMs. The full source is included in the ext/
directory in the Ruby's source tree.
-== Make the Directory
+(1) make the directory
% mkdir ext/dbm
Make a directory for the extension library under ext directory.
-== Design the Library
+(2) design the library
You need to design the library features, before making it.
-== Write the C Code
+(3) write C code.
You need to write C code for your extension library. If your library
has only one source file, choosing ``LIBRARY.c'' as a file name is
preferred. On the other hand, in case your library has multiple source
files, avoid choosing ``LIBRARY.c'' for a file name. It may conflict
with an intermediate file ``LIBRARY.o'' on some platforms.
-Note that some functions in mkmf library described below generate
-a file ``conftest.c'' for checking with compilation. You shouldn't
-choose ``conftest.c'' as a name of a source file.
Ruby will execute the initializing function named ``Init_LIBRARY'' in
the library. For example, ``Init_dbm()'' will be executed when loading
@@ -634,37 +597,41 @@ the library.
Here's the example of an initializing function.
- void
- Init_dbm(void)
- {
- /* define DBM class */
- cDBM = rb_define_class("DBM", rb_cObject);
- /* DBM includes Enumerable module */
- rb_include_module(cDBM, rb_mEnumerable);
-
- /* DBM has class method open(): arguments are received as C array */
- rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
-
- /* DBM instance method close(): no args */
- rb_define_method(cDBM, "close", fdbm_close, 0);
- /* DBM instance method []: 1 argument */
- rb_define_method(cDBM, "[]", fdbm_fetch, 1);
-
- /* ... */
-
- /* ID for a instance variable to store DBM data */
- id_dbm = rb_intern("dbm");
- }
-
-The dbm extension wraps the dbm struct in the C environment using
+--
+void
+Init_dbm(void)
+{
+ /* define DBM class */
+ cDBM = rb_define_class("DBM", rb_cObject);
+ /* DBM includes Enumerate module */
+ rb_include_module(cDBM, rb_mEnumerable);
+
+ /* DBM has class method open(): arguments are received as C array */
+ rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+ /* DBM instance method close(): no args */
+ rb_define_method(cDBM, "close", fdbm_close, 0);
+ /* DBM instance method []: 1 argument */
+ rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+ :
+
+ /* ID for a instance variable to store DBM data */
+ id_dbm = rb_intern("dbm");
+}
+--
+
+The dbm extension wraps the dbm struct in the C environment using
Data_Make_Struct.
- struct dbmdata {
- int di_size;
- DBM *di_dbm;
- };
+--
+struct dbmdata {
+ int di_size;
+ DBM *di_dbm;
+};
+
- obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+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.
@@ -672,10 +639,12 @@ wrapping DBM* directly, because we want to cache size information.
To retrieve the dbmdata structure from a Ruby object, we define the
following macro:
- #define GetDBM(obj, dbmp) {\
- Data_Get_Struct(obj, struct dbmdata, dbmp);\
- if (dbmp->di_dbm == 0) closed_dbm();\
- }
+--
+#define GetDBM(obj, dbmp) {\
+ Data_Get_Struct(obj, struct dbmdata, dbmp);\
+ if (dbmp->di_dbm == 0) closed_dbm();\
+}
+--
This sort of complicated macro does the retrieving and close checking for
the DBM.
@@ -683,11 +652,13 @@ the DBM.
There are three kinds of way to receive method arguments. First,
methods with a fixed number of arguments receive arguments like this:
- static VALUE
- fdbm_delete(VALUE obj, VALUE keystr)
- {
- /* ... */
- }
+--
+static VALUE
+fdbm_delete(VALUE obj, VALUE keystr)
+{
+ :
+}
+--
The first argument of the C function is the self, the rest are the
arguments to the method.
@@ -695,15 +666,17 @@ arguments to the method.
Second, methods with an arbitrary number of arguments receive
arguments like this:
- static VALUE
- fdbm_s_open(int argc, VALUE *argv, VALUE klass)
- {
- /* ... */
- if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
- mode = 0666; /* default value */
- }
- /* ... */
- }
+--
+static VALUE
+fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+{
+ :
+ if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+ mode = 0666; /* default value */
+ }
+ :
+}
+--
The first argument is the number of method arguments, the second
argument is the C array of the method arguments, and the third
@@ -718,21 +691,25 @@ references.
The following is an example of a method that takes arguments by Ruby's
array:
- static VALUE
- thread_initialize(VALUE thread, VALUE args)
- {
- /* ... */
- }
+--
+static VALUE
+thread_initialize(VALUE thread, VALUE args)
+{
+ :
+}
+--
The first argument is the receiver, the second one is the Ruby array
which contains the arguments to the method.
-*Notice*: GC should know about global variables which refer to Ruby's objects,
-but are not exported to the Ruby world. You need to protect them by
+** Notice
+
+GC should know about global variables which refer to Ruby's objects, but
+are not exported to the Ruby world. You need to protect them by
void rb_global_variable(VALUE *var)
-== Prepare extconf.rb
+(4) prepare extconf.rb
If the file named extconf.rb exists, it will be executed to generate
Makefile.
@@ -745,26 +722,10 @@ need to put
at the top of the file. You can use the functions below to check
various conditions.
- have_macro(macro[, headers[, opt]]): check whether macro is defined
- have_library(lib[, func[, headers[, opt]]]): check whether library containing function exists
- find_library(lib[, func, *paths]): find library from paths
- have_func(func[, headers[, opt]): check whether function exists
- have_var(var[, headers[, opt]]): check whether variable exists
- have_header(header[, preheaders[, opt]]): check whether header file exists
- find_header(header, *paths): find header from paths
- have_framework(fw): check whether framework exists (for MacOS X)
- have_struct_member(type, member[, headers[, opt]]): check whether struct has member
- have_type(type[, headers[, opt]]): check whether type exists
- find_type(type, opt, *headers): check whether type exists in headers
- have_const(const[, headers[, opt]]): check whether constant is defined
- check_sizeof(type[, headers[, opts]]): check size of type
- check_signedness(type[, headers[, opts]]): check signedness of type
- convertible_int(type[, headers[, opts]]): find convertible integer type
- find_executable(bin[, path]): find excutable file path
- create_header(header): generate configured header
- create_makefile(target[, target_prefix]): generate Makefile
-
-See MakeMakefile for full documentation of these functions.
+ have_library(lib, func): check whether library containing function exists.
+ have_func(func, header): check whether function exists
+ have_header(header): check whether header file exists
+ create_makefile(target): generate Makefile
The value of the variables below will affect the Makefile.
@@ -781,7 +742,7 @@ If a compilation condition is not fulfilled, you should not call
``create_makefile''. The Makefile will not be generated, compilation will
not be done.
-== Prepare Depend (Optional)
+(5) prepare depend (optional)
If the file named depend exists, Makefile will include that file to
check dependencies. You can make this file by invoking
@@ -790,7 +751,7 @@ check dependencies. You can make this file by invoking
It's harmless. Prepare it.
-== Generate Makefile
+(6) generate Makefile
Try generating the Makefile by:
@@ -805,7 +766,7 @@ You don't need this step if you put the extension library under the ext
directory of the ruby source tree. In that case, compilation of the
interpreter will do this step for you.
-== Run make
+(7) make
Type
@@ -814,38 +775,36 @@ Type
to compile your extension. You don't need this step either if you have
put the extension library under the ext directory of the ruby source tree.
-== Debug
+(8) debug
You may need to rb_debug the extension. Extensions can be linked
statically by adding the directory name in the ext/Setup file so that
you can inspect the extension with the debugger.
-== Done! Now You Have the Extension Library
+(9) done, now you have the extension library
You can do anything you want with your library. The author of Ruby
will not claim any restrictions on your code depending on the Ruby API.
Feel free to use, modify, distribute or sell your program.
-= Appendix A. Ruby Source Files Overview
+Appendix A. Ruby source files overview
-== Ruby Language Core
+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
+ 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 :: grammar definition
-parse.c :: automatically generated from parse.y
-keywords :: reserved keywords
-lex.c :: automatically generated from keywords
-
-== Ruby Evaluator (a.k.a. YARV)
+ruby syntax parser
+ parse.y
+ -> parse.c : automatically generated
+ keywords : reserved keywords
+ -> lex.c : automatically generated
+ruby evaluator (a.k.a. YARV)
compile.c
eval.c
eval_error.c
@@ -870,8 +829,7 @@ lex.c :: automatically generated from keywords
-> opt*.inc : automatically generated
-> vm.inc : automatically generated
-== Regular Expression Engine (Oniguruma)
-
+regular expression engine (oniguruma)
regex.c
regcomp.c
regenc.c
@@ -880,18 +838,18 @@ lex.c :: automatically generated from keywords
regparse.c
regsyntax.c
-== Utility Functions
+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
+ 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
-== Ruby Interpreter Implementation
+ruby interpreter implementation
dmyext.c
- dmydln.c
+ dmydln.c
dmyencoding.c
id.c
inits.c
@@ -902,568 +860,574 @@ util.c :: misc utilities
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#sprintf
-string.c :: String
-struct.c :: Struct
-time.c :: Time
-
-defs/known_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
+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
-= Appendix B. Ruby Extension API Reference
+Appendix B. Ruby extension API reference
-== Types
+** Types
-VALUE ::
+ VALUE
- The type for the Ruby object. Actual structures are defined in ruby.h,
- such as struct RString, etc. To refer the values in structures, use
- casting macros like RSTRING(obj).
+The type for the Ruby object. Actual structures are defined in ruby.h,
+such as struct RString, etc. To refer the values in structures, use
+casting macros like RSTRING(obj).
-== Variables and Constants
+** Variables and constants
-Qnil::
- nil object
+ Qnil
-Qtrue::
- true object (default true value)
+const: nil object
-Qfalse::
- false object
+ Qtrue
-== C Pointer Wrapping
+const: true object(default true value)
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
+ Qfalse
- Wrap a C pointer into a Ruby object. If object has references to other
- Ruby objects, they should be marked by using the mark function during
- the GC process. Otherwise, mark should be 0. When this object is no
- longer referred by anywhere, the pointer will be discarded by free
- function.
+const: false object
-Data_Make_Struct(klass, type, mark, free, sval) ::
+** C pointer wrapping
- This macro allocates memory using malloc(), assigns it to the variable
- sval, and returns the DATA encapsulating the pointer to memory region.
+ Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
-Data_Get_Struct(data, type, sval) ::
+Wrap a C pointer into a Ruby object. If object has references to other
+Ruby objects, they should be marked by using the mark function during
+the GC process. Otherwise, mark should be 0. When this object is no
+longer referred by anywhere, the pointer will be discarded by free
+function.
- This macro retrieves the pointer value from DATA, and assigns it to
- the variable sval.
+ Data_Make_Struct(klass, type, mark, free, sval)
-== Checking Data Types
+This macro allocates memory using malloc(), assigns it to the variable
+sval, and returns the DATA encapsulating the pointer to memory region.
-TYPE(value) ::
+ Data_Get_Struct(data, type, sval)
- Internal type (T_NIL, T_FIXNUM, etc.)
+This macro retrieves the pointer value from DATA, and assigns it to
+the variable sval.
-FIXNUM_P(value) ::
+** Checking data types
- Is +value+ a Fixnum?
+TYPE(value)
+FIXNUM_P(value)
+NIL_P(value)
+void Check_Type(VALUE value, int type)
+void Check_SafeStr(VALUE value)
-NIL_P(value) ::
+** Data type conversion
- Is +value+ nil?
+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)
+NUM2DBL(value)
+rb_float_new(f)
+StringValue(value)
+StringValuePtr(value)
+StringValueCStr(value)
+rb_str_new2(s)
-void Check_Type(VALUE value, int type) ::
+** defining class/module
- Ensures +value+ is of the given internal +type+ or raises a TypeError
+ VALUE rb_define_class(const char *name, VALUE super)
-SaveStringValue(value) ::
+Defines a new Ruby class as a subclass of super.
- Checks that +value+ is a String and is not tainted
+ VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
-== Data Type Conversion
+Creates a new Ruby class as a subclass of super, under the module's
+namespace.
-FIX2INT(value), INT2FIX(i) ::
+ VALUE rb_define_module(const char *name)
- Fixnum <-> integer
+Defines a new Ruby module.
-FIX2LONG(value), LONG2FIX(l) ::
+ VALUE rb_define_module_under(VALUE module, const char *name)
- Fixnum <-> long
+Defines a new Ruby module under the module's namespace.
-NUM2INT(value), INT2NUM(i) ::
+ void rb_include_module(VALUE klass, VALUE module)
- Numeric <-> integer
+Includes module into class. If class already includes it, just
+ignored.
-NUM2UINT(value), UINT2NUM(ui) ::
+ void rb_extend_object(VALUE object, VALUE module)
- Numeric <-> unsigned integer
+Extend the object with the module's attributes.
-NUM2LONG(value), LONG2NUM(l) ::
+** Defining Global Variables
- Numeric <-> long
+ void rb_define_variable(const char *name, VALUE *var)
-NUM2ULONG(value), ULONG2NUM(ul) ::
+Defines a global variable which is shared between C and Ruby. If name
+contains a character which is not allowed to be part of the symbol,
+it can't be seen from Ruby programs.
- Numeric <-> unsigned long
+ void rb_define_readonly_variable(const char *name, VALUE *var)
-NUM2LL(value), LL2NUM(ll) ::
+Defines a read-only global variable. Works just like
+rb_define_variable(), except the defined variable is read-only.
- Numeric <-> long long
+ void rb_define_virtual_variable(const char *name,
+ VALUE (*getter)(), VALUE (*setter)())
-NUM2ULL(value), ULL2NUM(ull) ::
+Defines a virtual variable, whose behavior is defined by a pair of C
+functions. The getter function is called when the variable is
+referenced. The setter function is called when the variable is set to a
+value. The prototype for getter/setter functions are:
- Numeric <-> unsigned long long
+ VALUE getter(ID id)
+ void setter(VALUE val, ID id)
-NUM2OFFT(value), OFFT2NUM(off) ::
+The getter function must return the value for the access.
- Numeric <-> off_t
+ void rb_define_hooked_variable(const char *name, VALUE *var,
+ VALUE (*getter)(), VALUE (*setter)())
-NUM2SIZET(value), SIZET2NUM(size) ::
+Defines hooked variable. It's a virtual variable with a C variable.
+The getter is called as
- Numeric <-> size_t
+ VALUE getter(ID id, VALUE *var)
-NUM2SSIZET(value), SSIZET2NUM(ssize) ::
+returning a new value. The setter is called as
- Numeric <-> ssize_t
+ void setter(VALUE val, ID id, VALUE *var)
-NUM2DBL(value) ::
+GC requires C global variables which hold Ruby values to be marked.
- Numeric -> double
+ void rb_global_variable(VALUE *var)
-rb_float_new(f) ::
+Tells GC to protect these variables.
- double -> Float
+** Constant Definition
-StringValue(value) ::
+ void rb_define_const(VALUE klass, const char *name, VALUE val)
- Object with #to_str -> String
+Defines a new constant under the class/module.
-StringValuePtr(value) ::
+ void rb_define_global_const(const char *name, VALUE val)
- Object with #to_str -> pointer to String data
+Defines a global constant. This is just the same as
-StringValueCStr(value) ::
+ rb_define_const(cKernal, name, val)
- Object with #to_str -> pointer to String data without NULL bytes
+** Method Definition
-rb_str_new2(s) ::
+ rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
- char * -> String
+Defines a method for the class. func is the function pointer. argc
+is the number of arguments. if argc is -1, the function will receive
+3 arguments: argc, argv, and self. if argc is -2, the function will
+receive 2 arguments, self and args, where args is a Ruby array of
+the method arguments.
-== Defining Class and Module
+ rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
-VALUE rb_define_class(const char *name, VALUE super) ::
+Defines a private method for the class. Arguments are same as
+rb_define_method().
- Defines a new Ruby class as a subclass of super.
+ rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
+Defines a singleton method. Arguments are same as rb_define_method().
- Creates a new Ruby class as a subclass of super, under the module's
- namespace.
+ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
-VALUE rb_define_module(const char *name) ::
+Retrieve argument from argc and argv to given VALUE references
+according to the format string. The format can be described in ABNF
+as follows:
- Defines a new Ruby module.
+--
+scan-arg-spec := param-arg-spec [block-arg-spec]
-VALUE rb_define_module_under(VALUE module, const char *name) ::
+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
- Defines a new Ruby module under the module's namespace.
+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
+--
-void rb_include_module(VALUE klass, VALUE module) ::
+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.
- Includes module into class. If class already includes it, just ignored.
+The number of given arguments, excluding an iterator block, is
+returned.
-void rb_extend_object(VALUE object, VALUE module) ::
+** Invoking Ruby method
- Extend the object with the module's attributes.
+ VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
-== Defining Global Variables
+Invokes a method. To retrieve mid from a method name, use rb_intern().
-void rb_define_variable(const char *name, VALUE *var) ::
+ VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
- Defines a global variable which is shared between C and Ruby. If name
- contains a character which is not allowed to be part of the symbol,
- it can't be seen from Ruby programs.
+Invokes a method, passing arguments by an array of values.
-void rb_define_readonly_variable(const char *name, VALUE *var) ::
+ VALUE rb_eval_string(const char *str)
- Defines a read-only global variable. Works just like
- rb_define_variable(), except the defined variable is read-only.
+Compiles and executes the string as a Ruby program.
-void rb_define_virtual_variable(const char *name, VALUE (*getter)(), VALUE (*setter)()) ::
+ ID rb_intern(const char *name)
- Defines a virtual variable, whose behavior is defined by a pair of C
- functions. The getter function is called when the variable is
- referenced. The setter function is called when the variable is set to a
- value. The prototype for getter/setter functions are:
+Returns ID corresponding to the name.
- VALUE getter(ID id)
- void setter(VALUE val, ID id)
+ char *rb_id2name(ID id)
- The getter function must return the value for the access.
+Returns the name corresponding ID.
-void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), VALUE (*setter)()) ::
+ char *rb_class2name(VALUE klass)
- Defines hooked variable. It's a virtual variable with a C variable.
- The getter is called as
+Returns the name of the class.
- VALUE getter(ID id, VALUE *var)
+ int rb_respond_to(VALUE object, ID id)
- returning a new value. The setter is called as
+Returns true if the object responds to the message specified by id.
- void setter(VALUE val, ID id, VALUE *var)
+** Instance Variables
- GC requires C global variables which hold Ruby values to be marked.
+ VALUE rb_iv_get(VALUE obj, const char *name)
-void rb_global_variable(VALUE *var)
+Retrieve the value of the instance variable. If the name is not
+prefixed by `@', that variable shall be inaccessible from Ruby.
- Tells GC to protect these variables.
+ VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
-== Constant Definition
+Sets the value of the instance variable.
-void rb_define_const(VALUE klass, const char *name, VALUE val) ::
+** Control Structure
- Defines a new constant under the class/module.
+ VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv,
+ VALUE (*func) (ANYARGS), VALUE data2)
-void rb_define_global_const(const char *name, VALUE val) ::
+Calls a method on the recv, with the method name specified by the
+symbol mid, with argc arguments in argv, supplying func as the
+block. When func is called as the block, it will receive the value
+from yield as the first argument, and data2 as the second argument.
+When yielded with multiple values (in C, rb_yield_values(),
+rb_yield_values2() and rb_yield_splat()), data2 is packed as an Array,
+whereas yielded values can be gotten via argc/argv of the third/fourth
+arguments.
- Defines a global constant. This is just the same as
+ [OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
- rb_define_const(cKernal, name, val)
+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.
-== Method Definition
+ VALUE rb_yield(VALUE val)
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+Evaluates the block with value val.
- Defines a method for the class. func is the function pointer. argc
- is the number of arguments. if argc is -1, the function will receive
- 3 arguments: argc, argv, and self. if argc is -2, the function will
- receive 2 arguments, self and args, where args is a Ruby array of
- the method arguments.
+ VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+Calls the function func1, with arg1 as the argument. If an exception
+occurs during func1, it calls func2 with arg2 as the argument. The
+return value of rb_rescue() is the return value from func1 if no
+exception occurs, from func2 otherwise.
- Defines a private method for the class. Arguments are same as
- rb_define_method().
+ VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+Calls the function func1 with arg1 as the argument, then calls func2
+with arg2 if execution terminated. The return value from
+rb_ensure() is that of func1 when no exception occured.
- Defines a singleton method. Arguments are same as rb_define_method().
+ VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
+Calls the function func with arg as the argument. If no exception
+occured during func, it returns the result of func and *state is zero.
+Otherwise, it returns Qnil and sets *state to nonzero. If state is
+NULL, it is not set in both cases.
- Retrieve argument from argc and argv to given VALUE references
- according to the format string. The format can be described in ABNF
- as follows:
+ void rb_jump_tag(int state)
- scan-arg-spec := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
+Continues the exception caught by rb_protect() and rb_eval_string_protect().
+state must be the returned value from those functions. This function
+never return to the caller.
- 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
- option-hash-arg-spec := sym-for-option-hash-arg
- block-arg-spec := sym-for-block-arg
+** Exceptions and Errors
- 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-option-hash-arg := ":" ; Indicates that an option
- ; hash is captured if the last
- ; argument is a hash or can be
- ; converted to a hash with
- ; #to_hash. When the last
- ; argument is nil, it is
- ; captured if it is not
- ; ambiguous to take it as
- ; empty option hash; i.e. '*'
- ; is not specified and
- ; arguments are given more
- ; than sufficient.
- sym-for-block-arg := "&" ; Indicates that an iterator
- ; block should be captured if
- ; given
+ void rb_warn(const char *fmt, ...)
- 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.
+Prints a warning message according to a printf-like format.
- The number of given arguments, excluding an option hash or iterator
- block, is returned.
+ void rb_warning(const char *fmt, ...)
-== Invoking Ruby method
+Prints a warning message according to a printf-like format, if
+$VERBOSE is true.
-VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
+void rb_raise(rb_eRuntimeError, const char *fmt, ...)
- Invokes a method. To retrieve mid from a method name, use rb_intern().
+Raises RuntimeError. The fmt is a format string just like printf().
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
+ void rb_raise(VALUE exception, const char *fmt, ...)
- Invokes a method, passing arguments by an array of values.
+Raises a class exception. The fmt is a format string just like printf().
-VALUE rb_eval_string(const char *str) ::
+ void rb_fatal(const char *fmt, ...)
- Compiles and executes the string as a Ruby program.
+Raises a fatal error, terminates the interpreter. No exception handling
+will be done for fatal errors, but ensure blocks will be executed.
-ID rb_intern(const char *name) ::
+ void rb_bug(const char *fmt, ...)
- Returns ID corresponding to the name.
+Terminates the interpreter immediately. This function should be
+called under the situation caused by the bug in the interpreter. No
+exception handling nor ensure execution will be done.
-char *rb_id2name(ID id) ::
+** Initialize and Start the Interpreter
- Returns the name corresponding ID.
-
-char *rb_class2name(VALUE klass) ::
-
- Returns the name of the class.
-
-int rb_respond_to(VALUE object, ID id) ::
-
- Returns true if the object responds to the message specified by id.
-
-== Instance Variables
-
-VALUE rb_iv_get(VALUE obj, const char *name) ::
-
- Retrieve the value of the instance variable. If the name is not
- prefixed by `@', that variable shall be inaccessible from Ruby.
-
-VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
-
- 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) ::
+The embedding API functions are below (not needed for extension libraries):
- Calls a method on the recv, with the method name specified by the
- symbol mid, with argc arguments in argv, supplying func as the
- block. When func is called as the block, it will receive the value
- from yield as the first argument, and data2 as the second argument.
- When yielded with multiple values (in C, rb_yield_values(),
- rb_yield_values2() and rb_yield_splat()), data2 is packed as an Array,
- whereas yielded values can be gotten via argc/argv of the third/fourth
- arguments.
+ void ruby_init()
-[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2) ::
+Initializes the interpreter.
- 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.
+ void ruby_options(int argc, char **argv)
- 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.
+Process command line arguments for the interpreter.
-VALUE rb_yield(VALUE val) ::
+ void ruby_run()
- Evaluates the block with value val.
+Starts execution of the interpreter.
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+ void ruby_script(char *name)
- Calls the function func1, with arg1 as the argument. If an exception
- occurs during func1, it calls func2 with arg2 as the argument. The
- return value of rb_rescue() is the return value from func1 if no
- exception occurs, from func2 otherwise.
+Specifies the name of the script ($0).
-VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+** Hooks for the Interpreter Events
- Calls the function func1 with arg1 as the argument, then calls func2
- with arg2 if execution terminated. The return value from
- rb_ensure() is that of func1 when no exception occured.
+ void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
-VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
+Adds a hook function for the specified interpreter events.
+events should be Or'ed value of:
+
+ 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
- Calls the function func with arg as the argument. If no exception
- occured during func, it returns the result of func and *state is zero.
- Otherwise, it returns Qnil and sets *state to nonzero. If state is
- NULL, it is not set in both cases.
- You have to clear the error info with rb_set_errinfo(Qnil) when
- ignoring the caught exception.
+The definition of rb_event_hook_func_t is below:
-void rb_jump_tag(int state) ::
+ typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
+ VALUE self, ID id, VALUE klass)
- Continues the exception caught by rb_protect() and rb_eval_string_protect().
- state must be the returned value from those functions. This function
- never return to the caller.
+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.
-void rb_iter_break() ::
+ int rb_remove_event_hook(rb_event_hook_func_t func)
- Exits from the current innermost block. This function never return to
- the caller.
+Removes the specified hook function.
-void rb_iter_break_value(VALUE value) ::
+** Macros for the Compatibilities
- Exits from the current innermost block with the value. The block will
- return the given argument value. This function never return to the
- caller.
+Some macros to check API compatibilities are available by default.
-== Exceptions and Errors
+ NORETURN_STYLE_NEW
-void rb_warn(const char *fmt, ...) ::
+Means that NORETURN macro is functional style instead of prefix.
- Prints a warning message according to a printf-like format.
+ HAVE_RB_DEFINE_ALLOC_FUNC
-void rb_warning(const char *fmt, ...) ::
+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").
- Prints a warning message according to a printf-like format, if
- $VERBOSE is true.
+ HAVE_RB_REG_NEW_STR
-void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
+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").
- Raises RuntimeError. The fmt is a format string just like printf().
+ HAVE_RB_IO_T
-void rb_raise(VALUE exception, const char *fmt, ...) ::
+Means that type rb_io_t is provided.
- Raises a class exception. The fmt is a format string just like printf().
+ USE_SYMBOL_AS_METHOD_NAME
-void rb_fatal(const char *fmt, ...) ::
+Means that Symbols will be returned as method names, e.g.,
+Module#methods, #singleton_methods and so on.
- Raises a fatal error, terminates the interpreter. No exception handling
- will be done for fatal errors, but ensure blocks will be executed.
+ HAVE_RUBY_*_H
-void rb_bug(const char *fmt, ...) ::
+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.
- Terminates the interpreter immediately. This function should be
- called under the situation caused by the bug in the interpreter. No
- exception handling nor ensure execution will be done.
+ RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
-Note: In the format string, %i is used for Object#to_s (or Object#inspect if
-'+' flag is set) output (and related argument must be a VALUE). For integers
-in format strings, use %d.
+Means that rb_add_event_hook() takes the third argument `data', to be
+passed to the given event hook function.
-== Initialize and Start the Interpreter
+Appendix C. Functions Available in extconf.rb
-The embedding API functions are below (not needed for extension libraries):
+These functions are available in extconf.rb:
-void ruby_init() ::
+ have_macro(macro, headers)
- Initializes the interpreter.
+Checks whether macro is defined with header. Returns true if the macro
+is defined.
-void ruby_options(int argc, char **argv) ::
+ have_library(lib, func)
- Process command line arguments for the interpreter.
+Checks whether the library exists, containing the specified function.
+Returns true if the library exists.
-void ruby_run() ::
+ find_library(lib, func, path...)
- Starts execution of the interpreter.
+Checks whether a library which contains the specified function exists in
+path. Returns true if the library exists.
-void ruby_script(char *name) ::
+ have_func(func, header)
- Specifies the name of the script ($0).
+Checks whether func exists with header. Returns true if the function
+exists. To check functions in an additional library, you need to
+check that library first using have_library().
-== Hooks for the Interpreter Events
+ have_var(var, header)
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events,
- VALUE data)
+Checks whether var exists with header. Returns true if the variable
+exists. To check variables in an additional library, you need to
+check that library first using have_library().
-Adds a hook function for the specified interpreter events.
-events should be OR'ed value of:
-
- 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
+ have_header(header)
-The definition of rb_event_hook_func_t is below:
+Checks whether header exists. Returns true if the header file exists.
- typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
- VALUE self, ID id, VALUE klass)
+ find_header(header, path...)
-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.
+Checks whether header exists in path. Returns true if the header file
+exists.
- int rb_remove_event_hook(rb_event_hook_func_t func)
+ have_struct_member(type, member, header)
-Removes the specified hook function.
+Checks whether type has member with header. Returns true if the type
+is defined and has the member.
-== Macros for Compatibility
+ have_type(type, header, opt)
-Some macros to check API compatibilities are available by default.
+Checks whether type is defined with header. Returns true if the type
+is defined.
-NORETURN_STYLE_NEW ::
+ check_sizeof(type, header)
- Means that NORETURN macro is functional style instead of prefix.
+Checks the size of type in char with header. Returns the size if the
+type is defined, otherwise nil.
-HAVE_RB_DEFINE_ALLOC_FUNC ::
+ create_makefile(target)
- 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").
+Generates the Makefile for the extension library. If you don't invoke
+this method, the compilation will not be done.
-HAVE_RB_REG_NEW_STR ::
+ find_executable(bin, path)
- 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").
+Finds command in path, which is File::PATH_SEPARATOR-separated list of
+directories. If path is nil or omitted, environment variable PATH
+will be used. Returns the path name of the command if it is found,
+otherwise nil.
-HAVE_RB_IO_T ::
+ with_config(withval[, default=nil])
- Means that type rb_io_t is provided.
+Parses the command line options and returns the value specified by
+--with-<withval>.
-USE_SYMBOL_AS_METHOD_NAME ::
+ enable_config(config, *defaults)
+ disable_config(config, *defaults)
- Means that Symbols will be returned as method names, e.g.,
- Module#methods, #singleton_methods and so on.
+Parses the command line options for boolean. Returns true if
+--enable-<config> is given, or false if --disable-<config> is given.
+Otherwise, yields defaults to the given block and returns the result
+if it is called with a block, or returns defaults.
-HAVE_RUBY_*_H ::
+ dir_config(target[, default_dir])
+ dir_config(target[, default_include, default_lib])
- Defined in ruby.h and means corresponding header is available. For
- instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not
- mere st.h.
+Parses the command line options and adds the directories specified by
+--with-<target>-dir, --with-<target>-include, and/or --with-<target>-lib
+to $CFLAGS and/or $LDFLAGS. --with-<target>-dir=/path is equivalent to
+--with-<target>-include=/path/include --with-<target>-lib=/path/lib.
+Returns an array of the added directories ([include_dir, lib_dir]).
-RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
+ pkg_config(pkg)
- Means that rb_add_event_hook() takes the third argument `data', to be
- passed to the given event hook function.
+Obtains the information for pkg by pkg-config command. The actual
+command name can be overridden by --with-pkg-config command line
+option.
/*
* Local variables:
diff --git a/README.EXT.ja b/README.EXT.ja
index 993a21ac79..dae0d24b43 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -1,952 +1,922 @@
-# README.EXT.ja - -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995
+.\" README.EXT.ja - -*- Text -*- created at: Mon Aug 7 16:45:54 JST 1995
-Rubyã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã®ä½œã‚Šæ–¹ã‚’説明ã—ã¾ã™ï¼Ž
+Ruby¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Îºî¤êÊý¤òÀâÌÀ¤·¤Þ¤¹¡¥
-= 基礎知識
+1¡¥´ðÁÃÃμ±
-Cã®å¤‰æ•°ã«ã¯åž‹ãŒã‚り,データã«ã¯åž‹ãŒã‚りã¾ã›ã‚“.ã§ã™ã‹ã‚‰ï¼ŒãŸ
-ã¨ãˆã°ãƒã‚¤ãƒ³ã‚¿ã‚’intã®å¤‰æ•°ã«ä»£å…¥ã™ã‚‹ã¨ï¼Œãã®å€¤ã¯æ•´æ•°ã¨ã—ã¦å–
-り扱ã‚れã¾ã™ï¼Žé€†ã«Rubyã®å¤‰æ•°ã«ã¯åž‹ãŒãªã,データã«åž‹ãŒã‚りã¾
-ã™ï¼Žã“ã®é•ã„ã®ãŸã‚,Cã¨Rubyã¯ç›¸äº’ã«å¤‰æ›ã—ãªã‘れã°ï¼ŒãŠäº’ã„ã®
-データをアクセスã§ãã¾ã›ã‚“.
+C¤ÎÊÑ¿ô¤Ë¤Ï·¿¤¬¤¢¤ê¡¤¥Ç¡¼¥¿¤Ë¤Ï·¿¤¬¤¢¤ê¤Þ¤»¤ó¡¥¤Ç¤¹¤«¤é¡¤¤¿
+¤È¤¨¤Ð¥Ý¥¤¥ó¥¿¤òint¤ÎÊÑ¿ô¤ËÂåÆþ¤¹¤ë¤È¡¤¤½¤ÎÃͤÏÀ°¿ô¤È¤·¤Æ¼è
+¤ê°·¤ï¤ì¤Þ¤¹¡¥µÕ¤ËRuby¤ÎÊÑ¿ô¤Ë¤Ï·¿¤¬¤Ê¤¯¡¤¥Ç¡¼¥¿¤Ë·¿¤¬¤¢¤ê¤Þ
+¤¹¡¥¤³¤Î°ã¤¤¤Î¤¿¤á¡¤C¤ÈRuby¤ÏÁê¸ß¤ËÊÑ´¹¤·¤Ê¤±¤ì¤Ð¡¤¤ª¸ß¤¤¤Î
+¥Ç¡¼¥¿¤ò¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡¥
-Rubyã®ãƒ‡ãƒ¼ã‚¿ã¯VALUEã¨ã„ã†Cã®åž‹ã§è¡¨ç¾ã•れã¾ã™ï¼ŽVALUEåž‹ã®ãƒ‡ãƒ¼
-ã‚¿ã¯ãã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—を自分ã§çŸ¥ã£ã¦ã„ã¾ã™ï¼Žã“ã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã¨
-ã„ã†ã®ã¯ãƒ‡ãƒ¼ã‚¿(オブジェクト)ã®å®Ÿéš›ã®æ§‹é€ ã‚’æ„味ã—ã¦ã„ã¦ï¼ŒRuby
-ã®ã‚¯ãƒ©ã‚¹ã¨ã¯ã¾ãŸé•ã£ãŸã‚‚ã®ã§ã™ï¼Ž
+Ruby¤Î¥Ç¡¼¥¿¤ÏVALUE¤È¤¤¤¦C¤Î·¿¤Çɽ¸½¤µ¤ì¤Þ¤¹¡¥VALUE·¿¤Î¥Ç¡¼
+¥¿¤Ï¤½¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ò¼«Ê¬¤ÇÃΤäƤ¤¤Þ¤¹¡¥¤³¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤È
+¤¤¤¦¤Î¤Ï¥Ç¡¼¥¿(¥ª¥Ö¥¸¥§¥¯¥È)¤Î¼ÂºÝ¤Î¹½Â¤¤ò°ÕÌ£¤·¤Æ¤¤¤Æ¡¤Ruby
+¤Î¥¯¥é¥¹¤È¤Ï¤Þ¤¿°ã¤Ã¤¿¤â¤Î¤Ç¤¹¡¥
-VALUEã‹ã‚‰Cã«ã¨ã£ã¦æ„味ã®ã‚るデータをå–り出ã™ãŸã‚ã«ã¯
+VALUE¤«¤éC¤Ë¤È¤Ã¤Æ°ÕÌ£¤Î¤¢¤ë¥Ç¡¼¥¿¤ò¼è¤ê½Ð¤¹¤¿¤á¤Ë¤Ï
-1. VALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—を知る
-2. VALUEã‚’Cã®ãƒ‡ãƒ¼ã‚¿ã«å¤‰æ›ã™ã‚‹
+ (1) VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤òÃΤë
+ (2) VALUE¤òC¤Î¥Ç¡¼¥¿¤ËÊÑ´¹¤¹¤ë
-ã®ä¸¡æ–¹ãŒå¿…è¦ã§ã™ï¼Ž(1)を忘れるã¨é–“é•ã£ãŸãƒ‡ãƒ¼ã‚¿ã®å¤‰æ›ãŒè¡Œã‚れ
-ã¦ï¼Œæœ€æ‚ªãƒ—ログラムãŒcore dumpã—ã¾ã™ï¼Ž
+¤ÎξÊý¤¬É¬ÍפǤ¹¡¥(1)¤ò˺¤ì¤ë¤È´Ö°ã¤Ã¤¿¥Ç¡¼¥¿¤ÎÊÑ´¹¤¬¹Ô¤ï¤ì
+¤Æ¡¤ºÇ°­¥×¥í¥°¥é¥à¤¬core dump¤·¤Þ¤¹¡¥
-== データタイプ
+1.1 ¥Ç¡¼¥¿¥¿¥¤¥×
-Rubyã«ã¯ãƒ¦ãƒ¼ã‚¶ãŒä½¿ã†å¯èƒ½æ€§ã®ã‚る以下ã®ã‚¿ã‚¤ãƒ—ãŒã‚りã¾ã™ï¼Ž
+Ruby¤Ë¤Ï¥æ¡¼¥¶¤¬»È¤¦²ÄǽÀ­¤Î¤¢¤ë°Ê²¼¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡¥
-T_NIL :: nil
-T_OBJECT :: 通常ã®ã‚ªãƒ–ジェクト
-T_CLASS :: クラス
-T_MODULE :: モジュール
-T_FLOAT :: æµ®å‹•å°æ•°ç‚¹æ•°
-T_STRING :: 文字列
-T_REGEXP :: æ­£è¦è¡¨ç¾
-T_ARRAY :: é…列
-T_HASH :: 連想é…列
-T_STRUCT :: (Rubyã®)構造体
-T_BIGNUM :: 多å€é•·æ•´æ•°
-T_FIXNUM :: Fixnum(31bitã¾ãŸã¯63bité•·æ•´æ•°)
-T_COMPLEX :: 複素数
-T_RATIONAL :: æœ‰ç†æ•°
-T_FILE :: 入出力
-T_TRUE :: 真
-T_FALSE :: å½
-T_DATA :: データ
-T_SYMBOL :: シンボル
+ T_NIL nil
+ T_OBJECT Ä̾ï¤Î¥ª¥Ö¥¸¥§¥¯¥È
+ T_CLASS ¥¯¥é¥¹
+ T_MODULE ¥â¥¸¥å¡¼¥ë
+ T_FLOAT ÉâÆ°¾®¿ôÅÀ¿ô
+ T_STRING ʸ»úÎó
+ T_REGEXP Àµµ¬É½¸½
+ T_ARRAY ÇÛÎó
+ T_HASH Ï¢ÁÛÇÛÎó
+ T_STRUCT (Ruby¤Î)¹½Â¤ÂÎ
+ T_BIGNUM ¿ÇÜĹÀ°¿ô
+ T_FIXNUM Fixnum(31bit¤Þ¤¿¤Ï63bitĹÀ°¿ô)
+ T_COMPLEX Ê£ÁÇ¿ô
+ T_RATIONAL Í­Íý¿ô
+ T_FILE Æþ½ÐÎÏ
+ T_TRUE ¿¿
+ T_FALSE µ¶
+ T_DATA ¥Ç¡¼¥¿
+ T_SYMBOL ¥·¥ó¥Ü¥ë
-ãã®ä»–ã«å†…部ã§åˆ©ç”¨ã•れã¦ã„る以下ã®ã‚¿ã‚¤ãƒ—ãŒã‚りã¾ã™ï¼Ž
+¤½¤Î¾¤ËÆâÉô¤ÇÍøÍѤµ¤ì¤Æ¤¤¤ë°Ê²¼¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡¥
- T_ICLASS
- T_MATCH
- T_UNDEF
- T_NODE
- T_ZOMBIE
+ T_ICLASS
+ T_MATCH
+ T_UNDEF
+ T_NODE
+ T_ZOMBIE
-ã»ã¨ã‚“ã©ã®ã‚¿ã‚¤ãƒ—ã¯Cã®æ§‹é€ ä½“ã§å®Ÿè£…ã•れã¦ã„ã¾ã™ï¼Ž
+¤Û¤È¤ó¤É¤Î¥¿¥¤¥×¤ÏC¤Î¹½Â¤ÂΤǼÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-== VALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹
+1.2 VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ò¥Á¥§¥Ã¥¯¤¹¤ë
-ruby.hã§ã¯TYPE()ã¨ã„ã†ãƒžã‚¯ãƒ­ãŒå®šç¾©ã•れã¦ã„ã¦ï¼ŒVALUEã®ãƒ‡ãƒ¼ã‚¿
-タイプを知るã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼ŽTYPE()マクロã¯ä¸Šã§ç´¹ä»‹ã—ãŸT_XXXX
-ã®å½¢å¼ã®å®šæ•°ã‚’è¿”ã—ã¾ã™ï¼ŽVALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã«å¿œã˜ã¦å‡¦ç†ã™ã‚‹
-å ´åˆã«ã¯ï¼ŒTYPE()ã®å€¤ã§åˆ†å²ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ï¼Ž
+ruby.h¤Ç¤ÏTYPE()¤È¤¤¤¦¥Þ¥¯¥í¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Æ¡¤VALUE¤Î¥Ç¡¼¥¿
+¥¿¥¤¥×¤òÃΤ뤳¤È¤¬½ÐÍè¤Þ¤¹¡¥TYPE()¥Þ¥¯¥í¤Ï¾å¤Ç¾Ò²ð¤·¤¿T_XXXX
+¤Î·Á¼°¤ÎÄê¿ô¤òÊÖ¤·¤Þ¤¹¡¥VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤Ë±þ¤¸¤Æ½èÍý¤¹¤ë
+¾ì¹ç¤Ë¤Ï¡¤TYPE()¤ÎÃͤÇʬ´ô¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
switch (TYPE(obj)) {
case T_FIXNUM:
- /* FIXNUMã®å‡¦ç† */
+ /* FIXNUM¤Î½èÍý */
break;
case T_STRING:
- /* 文字列ã®å‡¦ç† */
+ /* ʸ»úÎó¤Î½èÍý */
break;
case T_ARRAY:
- /* é…列ã®å‡¦ç† */
+ /* ÇÛÎó¤Î½èÍý */
break;
default:
- /* 例外を発生ã•ã›ã‚‹ */
+ /* Îã³°¤òȯÀ¸¤µ¤»¤ë */
rb_raise(rb_eTypeError, "not valid value");
break;
}
-ãれã¨ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ï¼Œæ­£ã—ããªã‘れã°ä¾‹å¤–を発生ã™
-る関数ãŒç”¨æ„ã•れã¦ã„ã¾ã™ï¼Ž
+¤½¤ì¤È¥Ç¡¼¥¿¥¿¥¤¥×¤ò¥Á¥§¥Ã¥¯¤·¤Æ¡¤Àµ¤·¤¯¤Ê¤±¤ì¤ÐÎã³°¤òȯÀ¸¤¹
+¤ë´Ø¿ô¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡¥
void Check_Type(VALUE value, int type)
-ã“ã®é–¢æ•°ã¯valueãŒtypeã§ç„¡ã‘れã°ï¼Œä¾‹å¤–を発生ã•ã›ã¾ã™ï¼Žå¼•æ•°ã¨
-ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸVALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ãŒæ­£ã—ã„ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ã™
-ã‚‹ãŸã‚ã«ã¯ï¼Œã“ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž
+¤³¤Î´Ø¿ô¤Ïvalue¤¬type¤Ç̵¤±¤ì¤Ð¡¤Îã³°¤òȯÀ¸¤µ¤»¤Þ¤¹¡¥°ú¿ô¤È
+¤·¤ÆÍ¿¤¨¤é¤ì¤¿VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤¬Àµ¤·¤¤¤«¤É¤¦¤«¥Á¥§¥Ã¥¯¤¹
+¤ë¤¿¤á¤Ë¤Ï¡¤¤³¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-FIXNUMã¨NILã«é–¢ã—ã¦ã¯ã‚ˆã‚Šé«˜é€Ÿãªåˆ¤åˆ¥ãƒžã‚¯ãƒ­ãŒç”¨æ„ã•れã¦ã„ã¾ã™ï¼Ž
+FIXNUM¤ÈNIL¤Ë´Ø¤·¤Æ¤Ï¤è¤ê¹â®¤ÊȽÊÌ¥Þ¥¯¥í¤¬ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡¥
FIXNUM_P(obj)
NIL_P(obj)
-== VALUEã‚’Cã®ãƒ‡ãƒ¼ã‚¿ã«å¤‰æ›ã™ã‚‹
-
-データタイプãŒT_NIL,T_FALSE,T_TRUEã§ã‚る時,データã¯ãれãž
-れnil,false,trueã§ã™ï¼Žã“ã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã®ã‚ªãƒ–ジェクトã¯ã²ã¨
-ã¤ãšã¤ã—ã‹å­˜åœ¨ã—ã¾ã›ã‚“.
+1.3 VALUE¤òC¤Î¥Ç¡¼¥¿¤ËÊÑ´¹¤¹¤ë
+
+¥Ç¡¼¥¿¥¿¥¤¥×¤¬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()ã€ãŒã‚りã¾ã™ï¼Ž
+¥Ç¡¼¥¿¥¿¥¤¥×¤¬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 文字ãŒå«ã¾ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ã‚‚ã‚りã¾ã™ï¼Ž
+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 ʸ»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡¥
-ãれ以外ã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã¯å¯¾å¿œã™ã‚‹Cã®æ§‹é€ ä½“ãŒã‚りã¾ã™ï¼Žå¯¾å¿œã™
-る構造体ã®ã‚ã‚‹VALUEã¯ãã®ã¾ã¾ã‚­ãƒ£ã‚¹ãƒˆ(型変æ›)ã™ã‚Œã°æ§‹é€ ä½“ã®
-ãƒã‚¤ãƒ³ã‚¿ã«å¤‰æ›ã§ãã¾ã™ï¼Ž
+¤½¤ì°Ê³°¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ÏÂбþ¤¹¤ëC¤Î¹½Â¤ÂΤ¬¤¢¤ê¤Þ¤¹¡¥Âбþ¤¹
+¤ë¹½Â¤ÂΤΤ¢¤ëVALUE¤Ï¤½¤Î¤Þ¤Þ¥­¥ã¥¹¥È(·¿ÊÑ´¹)¤¹¤ì¤Ð¹½Â¤ÂΤÎ
+¥Ý¥¤¥ó¥¿¤ËÊÑ´¹¤Ç¤­¤Þ¤¹¡¥
-構造体ã¯ã€Œstruct RXxxxxã€ã¨ã„ã†åå‰ã§ruby.hã§å®šç¾©ã•れã¦ã„ã¾
-ã™ï¼Žä¾‹ãˆã°æ–‡å­—列ã¯ã€Œstruct RStringã€ã§ã™ï¼Žå®Ÿéš›ã«ä½¿ã†å¯èƒ½æ€§ãŒ
-ã‚ã‚‹ã®ã¯æ–‡å­—列ã¨é…列ãらã„ã ã¨æ€ã„ã¾ã™ï¼Ž
+¹½Â¤ÂΤϡÖstruct RXxxxx¡×¤È¤¤¤¦Ì¾Á°¤Çruby.h¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ
+¤¹¡¥Î㤨¤Ðʸ»úÎó¤Ï¡Östruct RString¡×¤Ç¤¹¡¥¼ÂºÝ¤Ë»È¤¦²ÄǽÀ­¤¬
+¤¢¤ë¤Î¤Ïʸ»úÎó¤ÈÇÛÎ󤯤餤¤À¤È»×¤¤¤Þ¤¹¡¥
-ruby.hã§ã¯æ§‹é€ ä½“ã¸ã‚­ãƒ£ã‚¹ãƒˆã™ã‚‹ãƒžã‚¯ãƒ­ã‚‚「RXXXXX()ã€(全部大文
-å­—ã«ã—ãŸã‚‚ã®)ã¨ã„ã†åå‰ã§æä¾›ã•れã¦ã„ã¾ã™(例: RSTRING()).
+ruby.h¤Ç¤Ï¹½Â¤ÂΤإ­¥ã¥¹¥È¤¹¤ë¥Þ¥¯¥í¤â¡ÖRXXXXX()¡×(Á´ÉôÂçʸ
+»ú¤Ë¤·¤¿¤â¤Î)¤È¤¤¤¦Ì¾Á°¤ÇÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹(Îã: RSTRING())¡¥
-構造体ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’å–り出ã™ãƒžã‚¯ãƒ­ãŒæä¾›ã•れã¦ã„ã¾ã™ï¼Žæ–‡å­—列
-strã®é•·ã•ã‚’å¾—ã‚‹ãŸã‚ã«ã¯ã€ŒRSTRING_LEN(str)ã€ã¨ã—,文字列strã‚’
-char*ã¨ã—ã¦å¾—ã‚‹ãŸã‚ã«ã¯ã€ŒRSTRING_PTR(str)ã€ã¨ã—ã¾ã™ï¼Žé…列ã®
-å ´åˆã«ã¯ï¼Œãれãžã‚Œã€ŒRARRAY_LEN(ary)ã€ï¼Œã€ŒRARRAY_PTR(ary)ã€ã¨
-ãªã‚Šã¾ã™ï¼Ž
+¹½Â¤ÂΤ«¤é¥Ç¡¼¥¿¤ò¼è¤ê½Ð¤¹¥Þ¥¯¥í¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥Ê¸»úÎó
+str¤ÎŤµ¤òÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING_LEN(str)¡×¤È¤·¡¤Ê¸»úÎóstr¤ò
+char*¤È¤·¤ÆÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING_PTR(str)¡×¤È¤·¤Þ¤¹¡¥ÇÛÎó¤Î
+¾ì¹ç¤Ë¤Ï¡¤¤½¤ì¤¾¤ì¡ÖRARRAY_LEN(ary)¡×¡¤¡ÖRARRAY_PTR(ary)¡×¤È
+¤Ê¤ê¤Þ¤¹¡¥
-Rubyã®æ§‹é€ ä½“を直接アクセスã™ã‚‹æ™‚ã«æ°—ã‚’ã¤ã‘ãªã‘れã°ãªã‚‰ãªã„ã“
-ã¨ã¯ï¼Œé…åˆ—ã‚„æ–‡å­—åˆ—ã®æ§‹é€ ä½“ã®ä¸­èº«ã¯å‚ç…§ã™ã‚‹ã ã‘ã§ï¼Œç›´æŽ¥å¤‰æ›´ã—
-ãªã„ã“ã¨ã§ã™ï¼Žç›´æŽ¥å¤‰æ›´ã—ãŸå ´åˆï¼Œã‚ªãƒ–ジェクトã®å†…å®¹ã®æ•´åˆæ€§ãŒ
-ã¨ã‚Œãªããªã£ã¦ï¼Œæ€ã‚ã¬ãƒã‚°ã®åŽŸå› ã«ãªã‚Šã¾ã™ï¼Ž
+Ruby¤Î¹½Â¤ÂΤòľÀÜ¥¢¥¯¥»¥¹¤¹¤ë»þ¤Ëµ¤¤ò¤Ä¤±¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³
+¤È¤Ï¡¤ÇÛÎó¤äʸ»úÎó¤Î¹½Â¤ÂΤÎÃæ¿È¤Ï»²¾È¤¹¤ë¤À¤±¤Ç¡¤Ä¾ÀÜÊѹ¹¤·
+¤Ê¤¤¤³¤È¤Ç¤¹¡¥Ä¾ÀÜÊѹ¹¤·¤¿¾ì¹ç¡¤¥ª¥Ö¥¸¥§¥¯¥È¤ÎÆâÍÆ¤ÎÀ°¹çÀ­¤¬
+¤È¤ì¤Ê¤¯¤Ê¤Ã¤Æ¡¤»×¤ï¤Ì¥Ð¥°¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹¡¥
-== Cã®ãƒ‡ãƒ¼ã‚¿ã‚’VALUEã«å¤‰æ›ã™ã‚‹
+1.4 C¤Î¥Ç¡¼¥¿¤òVALUE¤ËÊÑ´¹¤¹¤ë
-VALUEã®å®Ÿéš›ã®æ§‹é€ ã¯
+VALUE¤Î¼ÂºÝ¤Î¹½Â¤¤Ï
-FIXNUMã®å ´åˆ ::
+ * FIXNUM¤Î¾ì¹ç
- 1bit左シフトã—ã¦ï¼ŒLSBã‚’ç«‹ã¦ã‚‹ï¼Ž
+ 1bitº¸¥·¥Õ¥È¤·¤Æ¡¤LSB¤òΩ¤Æ¤ë¡¥
-ãã®ä»–ã®ãƒã‚¤ãƒ³ã‚¿ã®å ´åˆ ::
+ * ¤½¤Î¾¤Î¥Ý¥¤¥ó¥¿¤Î¾ì¹ç
- ãã®ã¾ã¾VALUEã«ã‚­ãƒ£ã‚¹ãƒˆã™ã‚‹ï¼Ž
+ ¤½¤Î¤Þ¤ÞVALUE¤Ë¥­¥ã¥¹¥È¤¹¤ë¡¥
-ã¨ãªã£ã¦ã„ã¾ã™ï¼Žã‚ˆã£ã¦ï¼ŒLSBã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚Œã°VALUEãŒFIXNUMã‹ã©
-ã†ã‹ã‚ã‹ã‚‹ã‚ã‘ã§ã™(ãƒã‚¤ãƒ³ã‚¿ã®LSBãŒç«‹ã£ã¦ã„ãªã„ã“ã¨ã‚’仮定ã—ã¦
-ã„ã‚‹).
+¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥¤è¤Ã¤Æ¡¤LSB¤ò¥Á¥§¥Ã¥¯¤¹¤ì¤ÐVALUE¤¬FIXNUM¤«¤É
+¤¦¤«¤ï¤«¤ë¤ï¤±¤Ç¤¹(¥Ý¥¤¥ó¥¿¤ÎLSB¤¬Î©¤Ã¤Æ¤¤¤Ê¤¤¤³¤È¤ò²¾Äꤷ¤Æ
+¤¤¤ë)¡¥
-ã§ã™ã‹ã‚‰ï¼ŒFIXNUM以外ã®Rubyã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã®æ§‹é€ ä½“ã¯å˜ã«VALUE
-ã«ã‚­ãƒ£ã‚¹ãƒˆã™ã‚‹ã ã‘ã§VALUEã«å¤‰æ›å‡ºæ¥ã¾ã™ï¼ŽãŸã ã—,任æ„ã®æ§‹é€ 
-体ãŒVALUEã«ã‚­ãƒ£ã‚¹ãƒˆå‡ºæ¥ã‚‹ã‚ã‘ã§ã¯ã‚りã¾ã›ã‚“.キャストã™ã‚‹ã®
-ã¯Rubyã®çŸ¥ã£ã¦ã„る構造体(ruby.hã§å®šç¾©ã•れã¦ã„ã‚‹struct RXxxx
-ã®ã‚‚ã®)ã ã‘ã§ã™ï¼Ž
+¤Ç¤¹¤«¤é¡¤FIXNUM°Ê³°¤ÎRuby¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î¹½Â¤ÂΤÏñ¤ËVALUE
+¤Ë¥­¥ã¥¹¥È¤¹¤ë¤À¤±¤ÇVALUE¤ËÊÑ´¹½ÐÍè¤Þ¤¹¡¥¤¿¤À¤·¡¤Ç¤°Õ¤Î¹½Â¤
+ÂΤ¬VALUE¤Ë¥­¥ã¥¹¥È½ÐÍè¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥¥­¥ã¥¹¥È¤¹¤ë¤Î
+¤ÏRuby¤ÎÃΤäƤ¤¤ë¹½Â¤ÂÎ(ruby.h¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ëstruct RXxxx
+¤Î¤â¤Î)¤À¤±¤Ç¤¹¡¥
-FIXNUMã«é–¢ã—ã¦ã¯å¤‰æ›ãƒžã‚¯ãƒ­ã‚’経由ã™ã‚‹å¿…è¦ãŒã‚りã¾ã™ï¼ŽCã®æ•´æ•°
-ã‹ã‚‰VALUEã«å¤‰æ›ã™ã‚‹ãƒžã‚¯ãƒ­ã¯ä»¥ä¸‹ã®ã‚‚ã®ãŒã‚りã¾ã™ï¼Žå¿…è¦ã«å¿œã˜
-ã¦ä½¿ã„分ã‘ã¦ãã ã•ã„.
+FIXNUM¤Ë´Ø¤·¤Æ¤ÏÊÑ´¹¥Þ¥¯¥í¤ò·Ðͳ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥C¤ÎÀ°¿ô
+¤«¤éVALUE¤ËÊÑ´¹¤¹¤ë¥Þ¥¯¥í¤Ï°Ê²¼¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡¥É¬Íפ˱þ¤¸
+¤Æ»È¤¤Ê¬¤±¤Æ¤¯¤À¤µ¤¤¡¥
-INT2FIX() :: ã‚‚ã¨ã®æ•´æ•°ãŒ31bitã¾ãŸã¯63bit以内ã«åŽã¾ã‚‹è‡ªä¿¡
- ãŒã‚る時
-INT2NUM() :: ä»»æ„ã®æ•´æ•°ã‹ã‚‰VALUEã¸
+ INT2FIX() ¤â¤È¤ÎÀ°¿ô¤¬31bit¤Þ¤¿¤Ï63bit°ÊÆâ¤Ë¼ý¤Þ¤ë¼«¿®
+ ¤¬¤¢¤ë»þ
+ INT2NUM() Ǥ°Õ¤ÎÀ°¿ô¤«¤éVALUE¤Ø
-INT2NUM()ã¯æ•´æ•°ãŒFIXNUMã®ç¯„囲ã«åŽã¾ã‚‰ãªã„å ´åˆï¼ŒBignumã«å¤‰æ›
-ã—ã¦ãれã¾ã™(ãŒï¼Œå°‘ã—é…ã„).
+INT2NUM()¤ÏÀ°¿ô¤¬FIXNUM¤ÎÈϰϤ˼ý¤Þ¤é¤Ê¤¤¾ì¹ç¡¤Bignum¤ËÊÑ´¹
+¤·¤Æ¤¯¤ì¤Þ¤¹(¤¬¡¤¾¯¤·ÃÙ¤¤)¡¥
-== Rubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ“作ã™ã‚‹
+1.5 Ruby¤Î¥Ç¡¼¥¿¤òÁàºî¤¹¤ë
-先程も述ã¹ãŸé€šã‚Šï¼ŒRubyã®æ§‹é€ ä½“をアクセスã™ã‚‹æ™‚ã«å†…å®¹ã®æ›´æ–°ã‚’
-行ã†ã“ã¨ã¯å‹§ã‚られã¾ã›ã‚“.ã§ï¼ŒRubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ“作ã™ã‚‹æ™‚ã«ã¯
-RubyãŒç”¨æ„ã—ã¦ã„る関数を用ã„ã¦ãã ã•ã„.
+ÀèÄø¤â½Ò¤Ù¤¿Ä̤ꡤRuby¤Î¹½Â¤ÂΤò¥¢¥¯¥»¥¹¤¹¤ë»þ¤ËÆâÍÆ¤Î¹¹¿·¤ò
+¹Ô¤¦¤³¤È¤Ï´«¤á¤é¤ì¤Þ¤»¤ó¡¥¤Ç¡¤Ruby¤Î¥Ç¡¼¥¿¤òÁàºî¤¹¤ë»þ¤Ë¤Ï
+Ruby¤¬ÍѰդ·¤Æ¤¤¤ë´Ø¿ô¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤¡¥
-ã“ã“ã§ã¯ã‚‚ã£ã¨ã‚‚使ã‚れるã§ã‚ã‚ã†æ–‡å­—列ã¨é…列ã®ç”Ÿæˆ/æ“作を行
-ã„関数をã‚ã’ã¾ã™(全部ã§ã¯ãªã„ã§ã™).
+¤³¤³¤Ç¤Ï¤â¤Ã¤È¤â»È¤ï¤ì¤ë¤Ç¤¢¤í¤¦Ê¸»úÎó¤ÈÇÛÎó¤ÎÀ¸À®/Áàºî¤ò¹Ô
+¤¤´Ø¿ô¤ò¤¢¤²¤Þ¤¹(Á´Éô¤Ç¤Ï¤Ê¤¤¤Ç¤¹)¡¥
-=== 文字列ã«å¯¾ã™ã‚‹é–¢æ•°
+ ʸ»úÎó¤ËÂФ¹¤ë´Ø¿ô
-rb_str_new(const char *ptr, long len) ::
+ rb_str_new(const char *ptr, long len)
- æ–°ã—ã„Rubyã®æ–‡å­—列を生æˆã™ã‚‹ï¼Ž
+ ¿·¤·¤¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
-rb_str_new2(const char *ptr)
-rb_str_new_cstr(const char *ptr)
+ rb_str_new2(const char *ptr)
+ rb_str_new_cstr(const char *ptr)
- Cã®æ–‡å­—列ã‹ã‚‰Rubyã®æ–‡å­—列を生æˆã™ã‚‹ï¼Žã“ã®é–¢æ•°ã®æ©Ÿèƒ½ã¯
- rb_str_new(ptr, strlen(ptr))ã¨åŒç­‰ã§ã‚る.
+ C¤Îʸ»úÎ󤫤éRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï
+ rb_str_new(ptr, strlen(ptr))¤ÈƱÅù¤Ç¤¢¤ë¡¥
-rb_tainted_str_new(const char *ptr, long len)
+ rb_tainted_str_new(const char *ptr, long len)
+ rb_tainted_str_new_cstr(const char *ptr)
- 汚染マークãŒä»˜åŠ ã•ã‚ŒãŸæ–°ã—ã„Rubyã®æ–‡å­—列を生æˆã™ã‚‹ï¼Žå¤–部
- ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ã«åŸºã¥ã文字列ã«ã¯æ±šæŸ“マークãŒä»˜åŠ ã•れるã¹ã
- ã§ã‚る.
+ ±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤줿¿·¤·¤¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥³°Éô
+ ¤«¤é¤Î¥Ç¡¼¥¿¤Ë´ð¤Å¤¯Ê¸»úÎó¤Ë¤Ï±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤ì¤ë¤Ù¤­
+ ¤Ç¤¢¤ë¡¥
-rb_tainted_str_new2(const char *ptr)
-rb_tainted_str_new_cstr(const char *ptr)
+ rb_tainted_str_new2(const char *ptr)
- Cã®æ–‡å­—列ã‹ã‚‰æ±šæŸ“マークãŒä»˜åŠ ã•れãŸRubyã®æ–‡å­—列を生æˆã™ã‚‹ï¼Ž
+ C¤Îʸ»úÎ󤫤鱸À÷¥Þ¡¼¥¯¤¬Éղ䵤줿Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
-rb_sprintf(const char *format, ...)
-rb_vsprintf(const char *format, va_list ap)
+ rb_sprintf(const char *format, ...)
+ rb_vsprintf(const char *format, va_list ap)
- Cã®æ–‡å­—列formatã¨ç¶šã引数をprintf(3)ã®ãƒ•ォーマットã«ã—ãŸãŒã£ã¦
- æ•´å½¢ã—,Rubyã®æ–‡å­—列を生æˆã™ã‚‹ï¼Ž
+ C¤Îʸ»úÎóformat¤È³¤¯°ú¿ô¤òprintf(3)¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤·¤¿¤¬¤Ã¤Æ
+ À°·Á¤·¡¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
- 注æ„: %iã¯Object#to_s('+'ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れã¦ã„ã‚‹ã¨ãã¯Object#inspect)ã‚’
- 使ã£ãŸVALUEã®å‡ºåŠ›ã«ä½¿ç”¨ã•れã¦ã„ã‚‹ãŸã‚,整数ã«ã¯%dを使用ã™ã‚‹ã“ã¨ï¼Ž
+ rb_str_cat(VALUE str, const char *ptr, long len)
-rb_str_cat(VALUE str, const char *ptr, long len)
+ Ruby¤Îʸ»úÎóstr¤Ëlen¥Ð¥¤¥È¤Îʸ»úÎóptr¤òÄɲ乤롥
- Rubyã®æ–‡å­—列strã«lenãƒã‚¤ãƒˆã®æ–‡å­—列ptrを追加ã™ã‚‹ï¼Ž
+ rb_str_cat2(VALUE str, const char* ptr)
-rb_str_cat2(VALUE str, const char* ptr)
+ Ruby¤Îʸ»úÎóstr¤ËC¤Îʸ»úÎóptr¤òÄɲ乤롥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï
+ rb_str_cat(str, ptr, strlen(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)
-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_str_resize(VALUE str, long len)
-
- Rubyã®æ–‡å­—列ã®ã‚µã‚¤ã‚ºã‚’lenãƒã‚¤ãƒˆã«å¤‰æ›´ã™ã‚‹ï¼Žstrã®é•·ã•ã¯å‰
- 以ã¦ã‚»ãƒƒãƒˆã•れã¦ã„ãªã‘れã°ãªã‚‰ãªã„.lenãŒå…ƒã®é•·ã•よりも短
- ã„æ™‚ã¯ï¼Œlenãƒã‚¤ãƒˆã‚’è¶ŠãˆãŸéƒ¨åˆ†ã®å†…å®¹ã¯æ¨ã¦ã‚‰ã‚Œã‚‹ï¼ŽlenãŒå…ƒ
- ã®é•·ã•ã‚ˆã‚Šã‚‚é•·ã„æ™‚ã¯ï¼Œå…ƒã®é•·ã•ã‚’è¶ŠãˆãŸéƒ¨åˆ†ã®å†…容ã¯ä¿å­˜ã•
- れãªã„ã§ã‚´ãƒŸã«ãªã‚‹ã ã‚ã†ï¼Žã“ã®é–¢æ•°ã®å‘¼ã³å‡ºã—ã«ã‚ˆã£ã¦
- RSTRING_PTR(str)ãŒå¤‰æ›´ã•れるã‹ã‚‚ã—れãªã„ã“ã¨ã«æ³¨æ„.
-
-rb_str_set_len(VALUE str, long len)
-
- Rubyã®æ–‡å­—列ã®ã‚µã‚¤ã‚ºã‚’lenãƒã‚¤ãƒˆã«ã‚»ãƒƒãƒˆã™ã‚‹ï¼ŽstrãŒå¤‰æ›´å¯
- 能ã§ãªã‘れã°ä¾‹å¤–ãŒç™ºç”Ÿã™ã‚‹ï¼ŽRSTRING_LEN(str)ã¨ã¯ç„¡é–¢ä¿‚ã«ï¼Œ
- lenãƒã‚¤ãƒˆã¾ã§ã®å†…容ã¯ä¿å­˜ã•れる.lenã¯strã®å®¹é‡ã‚’è¶Šãˆã¦ã„
- ã¦ã¯ãªã‚‰ãªã„.
+ 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()
- è¦ç´ ãŒ0ã®é…列を生æˆã™ã‚‹ï¼Ž
+ ÇÛÎó¤ËÂФ¹¤ë´Ø¿ô
-rb_ary_new2(long len)
+ rb_ary_new()
- è¦ç´ ãŒ0ã®é…列を生æˆã™ã‚‹ï¼Žlenè¦ç´ åˆ†ã®é ˜åŸŸã‚’ã‚らã‹ã˜ã‚割り
- 当ã¦ã¦ãŠã.
+ Í×ÁǤ¬0¤ÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
-rb_ary_new3(long n, ...)
+ rb_ary_new2(long len)
- å¼•æ•°ã§æŒ‡å®šã—ãŸnè¦ç´ ã‚’å«ã‚€é…列を生æˆã™ã‚‹ï¼Ž
+ Í×ÁǤ¬0¤ÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥lenÍ×ÁÇʬ¤ÎÎΰè¤ò¤¢¤é¤«¤¸¤á³ä¤ê
+ Åö¤Æ¤Æ¤ª¤¯¡¥
-rb_ary_new4(long n, VALUE *elts)
+ rb_ary_new3(long n, ...)
- é…列ã§ä¸ŽãˆãŸnè¦ç´ ã®é…列を生æˆã™ã‚‹ï¼Ž
+ °ú¿ô¤Ç»ØÄꤷ¤¿nÍ×ÁǤò´Þ¤àÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
-rb_ary_to_ary(VALUE obj)
+ rb_ary_new4(long n, VALUE *elts)
- オブジェクトをé…列ã«å¤‰æ›ã™ã‚‹.
- Object#to_aryã¨åŒç­‰ã§ã‚ã‚‹.
+ ÇÛÎó¤ÇÍ¿¤¨¤¿nÍ×ÁǤÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
-ä»–ã«ã‚‚é…列をæ“作ã™ã‚‹é–¢æ•°ãŒå¤šæ•°ã‚ã‚‹. ã“れらã¯
-引数aryã«é…列を渡ã•ãªã‘れã°ãªã‚‰ãªã„. ã•ã‚‚ãªã„ã¨
-コアをåã.
+ rb_ary_to_ary(VALUE obj)
-rb_ary_aref(argc, VALUE *argv, VALUE ary)
+ ¥ª¥Ö¥¸¥§¥¯¥È¤òÇÛÎó¤ËÊÑ´¹¤¹¤ë.
+ Object#to_ary¤ÈƱÅù¤Ç¤¢¤ë.
- Array#[]ã¨åŒç­‰.
+ ¾¤Ë¤âÇÛÎó¤òÁàºî¤¹¤ë´Ø¿ô¤¬Â¿¿ô¤¢¤ë. ¤³¤ì¤é¤Ï
+ °ú¿ôary¤ËÇÛÎó¤òÅϤµ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤. ¤µ¤â¤Ê¤¤¤È
+ ¥³¥¢¤òÅǤ¯.
-rb_ary_entry(VALUE ary, long offset)
+ rb_ary_aref(argc, VALUE *argv, VALUE ary)
- ary[offset]
+ Array#[]¤ÈƱÅù.
-rb_ary_subseq(VALUE ary, long beg, long len)
+ rb_ary_entry(VALUE ary, long offset)
- ary[beg, len]
+ ary[offset]
-rb_ary_push(VALUE ary, VALUE val)
-rb_ary_pop(VALUE ary)
-rb_ary_shift(VALUE ary)
-rb_ary_unshift(VALUE ary, VALUE val)
+ rb_ary_subseq(VALUE ary, long beg, long len)
-rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
+ ary[beg, len]
- é…列aryã«ptrã‹ã‚‰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)
-= Rubyã®æ©Ÿèƒ½ã‚’使ã†
+2¡¥Ruby¤Îµ¡Ç½¤ò»È¤¦
-原ç†çš„ã«Rubyã§æ›¸ã‘ã‚‹ã“ã¨ã¯Cã§ã‚‚書ã‘ã¾ã™ï¼ŽRubyãã®ã‚‚ã®ãŒCã§è¨˜
-è¿°ã•れã¦ã„ã‚‹ã‚“ã§ã™ã‹ã‚‰ï¼Œå½“ç„¶ã¨ã„ãˆã°å½“ç„¶ãªã‚“ã§ã™ã‘ã©ï¼Žã“ã“ã§
-ã¯Rubyã®æ‹¡å¼µã«ä½¿ã†ã“ã¨ãŒå¤šã„ã ã‚ã†ã¨äºˆæ¸¬ã•れる機能を中心ã«ç´¹
-介ã—ã¾ã™ï¼Ž
+¸¶ÍýŪ¤ËRuby¤Ç½ñ¤±¤ë¤³¤È¤ÏC¤Ç¤â½ñ¤±¤Þ¤¹¡¥Ruby¤½¤Î¤â¤Î¤¬C¤Çµ­
+½Ò¤µ¤ì¤Æ¤¤¤ë¤ó¤Ç¤¹¤«¤é¡¤ÅöÁ³¤È¤¤¤¨¤ÐÅöÁ³¤Ê¤ó¤Ç¤¹¤±¤É¡¥¤³¤³¤Ç
+¤ÏRuby¤Î³ÈÄ¥¤Ë»È¤¦¤³¤È¤¬Â¿¤¤¤À¤í¤¦¤Èͽ¬¤µ¤ì¤ëµ¡Ç½¤òÃæ¿´¤Ë¾Ò
+²ð¤·¤Þ¤¹¡¥
-== Rubyã«æ©Ÿèƒ½ã‚’追加ã™ã‚‹
+2.1 Ruby¤Ëµ¡Ç½¤òÄɲ乤ë
-Rubyã§æä¾›ã•れã¦ã„る関数を使ãˆã°Rubyã‚¤ãƒ³ã‚¿ãƒ—ãƒªã‚¿ã«æ–°ã—ã„æ©Ÿèƒ½
-を追加ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼ŽRubyã§ã¯ä»¥ä¸‹ã®æ©Ÿèƒ½ã‚’追加ã™ã‚‹é–¢æ•°ãŒ
-æä¾›ã•れã¦ã„ã¾ã™ï¼Ž
+Ruby¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë´Ø¿ô¤ò»È¤¨¤ÐRuby¥¤¥ó¥¿¥×¥ê¥¿¤Ë¿·¤·¤¤µ¡Ç½
+¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡¥Ruby¤Ç¤Ï°Ê²¼¤Îµ¡Ç½¤òÄɲä¹¤ë´Ø¿ô¤¬
+Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-* クラス,モジュール
-* メソッド,特異メソッドãªã©
-* 定数
+ * ¥¯¥é¥¹¡¤¥â¥¸¥å¡¼¥ë
+ * ¥á¥½¥Ã¥É¡¤ÆÃ°Û¥á¥½¥Ã¥É¤Ê¤É
+ * Äê¿ô
-ã§ã¯é †ã«ç´¹ä»‹ã—ã¾ã™ï¼Ž
+¤Ç¤Ï½ç¤Ë¾Ò²ð¤·¤Þ¤¹¡¥
-=== クラス/モジュール定義
+2.1.1 ¥¯¥é¥¹/¥â¥¸¥å¡¼¥ëÄêµÁ
-クラスやモジュールを定義ã™ã‚‹ãŸã‚ã«ã¯ï¼Œä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž
+¥¯¥é¥¹¤ä¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤¹¤ë¤¿¤á¤Ë¤Ï¡¤°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
VALUE rb_define_class(const char *name, VALUE super)
VALUE rb_define_module(const char *name)
-ã“れらã®é–¢æ•°ã¯æ–°ã—ã定義ã•れãŸã‚¯ãƒ©ã‚¹ã‚„モジュールを返ã—ã¾ã™ï¼Ž
-メソッドや定数ã®å®šç¾©ã«ã“れらã®å€¤ãŒå¿…è¦ãªã®ã§ï¼Œã»ã¨ã‚“ã©ã®å ´åˆ
-ã¯æˆ»ã‚Šå€¤ã‚’å¤‰æ•°ã«æ ¼ç´ã—ã¦ãŠãå¿…è¦ãŒã‚ã‚‹ã§ã—ょã†ï¼Ž
+¤³¤ì¤é¤Î´Ø¿ô¤Ï¿·¤·¤¯ÄêµÁ¤µ¤ì¤¿¥¯¥é¥¹¤ä¥â¥¸¥å¡¼¥ë¤òÊÖ¤·¤Þ¤¹¡¥
+¥á¥½¥Ã¥É¤äÄê¿ô¤ÎÄêµÁ¤Ë¤³¤ì¤é¤ÎÃͤ¬É¬ÍפʤΤǡ¤¤Û¤È¤ó¤É¤Î¾ì¹ç
+¤ÏÌá¤êÃͤòÊÑ¿ô¤Ë³ÊǼ¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡¥
-クラスやモジュールを他ã®ã‚¯ãƒ©ã‚¹ã®å†…部ã«ãƒã‚¹ãƒˆã—ã¦å®šç¾©ã™ã‚‹æ™‚ã«
-ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž
+¥¯¥é¥¹¤ä¥â¥¸¥å¡¼¥ë¤ò¾¤Î¥¯¥é¥¹¤ÎÆâÉô¤Ë¥Í¥¹¥È¤·¤ÆÄêµÁ¤¹¤ë»þ¤Ë
+¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
VALUE rb_define_module_under(VALUE outer, const char *name)
-=== メソッド/特異メソッド定義
+2.1.2 ¥á¥½¥Ã¥É/ÆÃ°Û¥á¥½¥Ã¥ÉÄêµÁ
-メソッドや特異メソッドを定義ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž
+¥á¥½¥Ã¥É¤äÆÃ°Û¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¤Ë¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
- void rb_define_method(VALUE klass, const char *name,
- VALUE (*func)(), int argc)
+ void rb_define_method(VALUE klass, const char *name,
+ VALUE (*func)(), int argc)
- void rb_define_singleton_method(VALUE object, const char *name,
- VALUE (*func)(), int argc)
+ void rb_define_singleton_method(VALUE object, const char *name,
+ VALUE (*func)(), int argc)
-念ã®ãŸã‚説明ã™ã‚‹ã¨ã€Œç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã€ã¨ã¯ï¼Œãã®ç‰¹å®šã®ã‚ªãƒ–ジェク
-トã«å¯¾ã—ã¦ã ã‘有効ãªãƒ¡ã‚½ãƒƒãƒ‰ã§ã™ï¼ŽRubyã§ã¯ã‚ˆãSmalltalkã«ãŠ
-ã‘るクラスメソッドã¨ã—ã¦ï¼Œã‚¯ãƒ©ã‚¹ã«å¯¾ã™ã‚‹ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ãŒä½¿ã‚れ
-ã¾ã™ï¼Ž
+ǰ¤Î¤¿¤áÀâÌÀ¤¹¤ë¤È¡ÖÆÃ°Û¥á¥½¥Ã¥É¡×¤È¤Ï¡¤¤½¤ÎÆÃÄê¤Î¥ª¥Ö¥¸¥§¥¯
+¥È¤ËÂФ·¤Æ¤À¤±Í­¸ú¤Ê¥á¥½¥Ã¥É¤Ç¤¹¡¥Ruby¤Ç¤Ï¤è¤¯Smalltalk¤Ë¤ª
+¤±¤ë¥¯¥é¥¹¥á¥½¥Ã¥É¤È¤·¤Æ¡¤¥¯¥é¥¹¤ËÂФ¹¤ëÆÃ°Û¥á¥½¥Ã¥É¤¬»È¤ï¤ì
+¤Þ¤¹¡¥
-ã“れらã®é–¢æ•°ã® argcã¨ã„ã†å¼•æ•°ã¯Cã®é–¢æ•°ã¸æ¸¡ã•ã‚Œã‚‹å¼•æ•°ã®æ•°(ã¨
-å½¢å¼)を決ã‚ã¾ã™ï¼ŽargcãŒ0ä»¥ä¸Šã®æ™‚ã¯é–¢æ•°ã«å¼•ãæ¸¡ã™å¼•æ•°ã®æ•°ã‚’æ„
-味ã—ã¾ã™ï¼Ž16個以上ã®å¼•æ•°ã¯ä½¿ãˆã¾ã›ã‚“(ãŒï¼Œè¦ã‚Šã¾ã›ã‚“よã­ï¼Œã
-ã‚“ãªã«).実際ã®é–¢æ•°ã«ã¯å…ˆé ­ã®å¼•æ•°ã¨ã—ã¦selfãŒä¸Žãˆã‚‰ã‚Œã¾ã™ã®
-ã§ï¼ŒæŒ‡å®šã—ãŸæ•°ã‚ˆã‚Š1多ã„引数をæŒã¤ã“ã¨ã«ãªã‚Šã¾ã™ï¼Ž
+¤³¤ì¤é¤Î´Ø¿ô¤Î argc¤È¤¤¤¦°ú¿ô¤ÏC¤Î´Ø¿ô¤ØÅϤµ¤ì¤ë°ú¿ô¤Î¿ô(¤È
+·Á¼°)¤ò·è¤á¤Þ¤¹¡¥argc¤¬0°Ê¾å¤Î»þ¤Ï´Ø¿ô¤Ë°ú¤­ÅϤ¹°ú¿ô¤Î¿ô¤ò°Õ
+Ì£¤·¤Þ¤¹¡¥16¸Ä°Ê¾å¤Î°ú¿ô¤Ï»È¤¨¤Þ¤»¤ó(¤¬¡¤Íפê¤Þ¤»¤ó¤è¤Í¡¤¤½
+¤ó¤Ê¤Ë)¡¥¼ÂºÝ¤Î´Ø¿ô¤Ë¤ÏÀèÆ¬¤Î°ú¿ô¤È¤·¤Æself¤¬Í¿¤¨¤é¤ì¤Þ¤¹¤Î
+¤Ç¡¤»ØÄꤷ¤¿¿ô¤è¤ê1¿¤¤°ú¿ô¤ò»ý¤Ä¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
-argcãŒè² ã®æ™‚ã¯å¼•æ•°ã®æ•°ã§ã¯ãªã,形å¼ã‚’指定ã—ãŸã“ã¨ã«ãªã‚Šã¾ã™ï¼Ž
-argcãŒ-1ã®æ™‚ã¯å¼•æ•°ã‚’é…列ã«å…¥ã‚Œã¦æ¸¡ã•れã¾ã™ï¼ŽargcãŒ-2ã®æ™‚ã¯å¼•
-æ•°ã¯Rubyã®é…列ã¨ã—ã¦æ¸¡ã•れã¾ã™ï¼Ž
+argc¤¬Éé¤Î»þ¤Ï°ú¿ô¤Î¿ô¤Ç¤Ï¤Ê¤¯¡¤·Á¼°¤ò»ØÄꤷ¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
+argc¤¬-1¤Î»þ¤Ï°ú¿ô¤òÇÛÎó¤ËÆþ¤ì¤ÆÅϤµ¤ì¤Þ¤¹¡¥argc¤¬-2¤Î»þ¤Ï°ú
+¿ô¤ÏRuby¤ÎÇÛÎó¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡¥
-メソッドを定義ã™ã‚‹é–¢æ•°ã¯ã¾ã ã„ãã¤ã‹ã‚りã¾ã™. ã²ã¨ã¤ã¯ãƒ¡ã‚½ãƒƒãƒ‰
-åã¨ã—ã¦IDã‚’å–りã¾ã™. IDã«ã¤ã„ã¦ã¯2.2.2ã‚’å‚ç…§.
+¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ï¤Þ¤À¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹. ¤Ò¤È¤Ä¤Ï¥á¥½¥Ã¥É
+̾¤È¤·¤ÆID¤ò¼è¤ê¤Þ¤¹. ID¤Ë¤Ä¤¤¤Æ¤Ï2.2.2¤ò»²¾È.
- void rb_define_method_id(VALUE klass, ID name,
+ void rb_define_method_id(VALUE klass, ID name,
VALUE (*func)(ANYARGS), int argc)
-private/protectedãªãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã™ã‚‹ãµãŸã¤ã®é–¢æ•°ãŒã‚りã¾ã™.
+private/protected¤Ê¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¤Õ¤¿¤Ä¤Î´Ø¿ô¤¬¤¢¤ê¤Þ¤¹.
- void rb_define_private_method(VALUE klass, const char *name,
+ void rb_define_private_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
- void rb_define_protected_method(VALUE klass, const char *name,
+ void rb_define_protected_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
-privateメソッドã¨ã¯é–¢æ•°å½¢å¼ã§ã—ã‹å‘¼ã³å‡ºã™ã“ã¨ã®å‡ºæ¥ãªã„メソッ
-ドã§ã™ï¼Ž
+private¥á¥½¥Ã¥É¤È¤Ï´Ø¿ô·Á¼°¤Ç¤·¤«¸Æ¤Ó½Ð¤¹¤³¤È¤Î½ÐÍè¤Ê¤¤¥á¥½¥Ã
+¥É¤Ç¤¹¡¥
-最後ã«ï¼Œ rb_define_module関数ã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«é–¢æ•°ã‚’定義ã—ã¾ã™ï¼Ž
-モジュール関数ã¨ã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚ã‚Šï¼ŒåŒæ™‚ã«
-privateメソッドã§ã‚‚ã‚ã‚‹ã‚‚ã®ã§ã™ï¼Žä¾‹ã‚’ã‚ã’ã‚‹ã¨Mathモジュール
-ã®sqrt()ãªã©ãŒã‚ã’られã¾ã™ï¼Žã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯
+ºÇ¸å¤Ë¡¢ rb_define_module´Ø¿ô¤Ï¥â¥¸¥å¡¼¥ë´Ø¿ô¤òÄêµÁ¤·¤Þ¤¹¡£
+¥â¥¸¥å¡¼¥ë´Ø¿ô¤È¤Ï¥â¥¸¥å¡¼¥ë¤ÎÆÃ°Û¥á¥½¥Ã¥É¤Ç¤¢¤ê¡¤Æ±»þ¤Ë
+private¥á¥½¥Ã¥É¤Ç¤â¤¢¤ë¤â¤Î¤Ç¤¹¡¥Îã¤ò¤¢¤²¤ë¤ÈMath¥â¥¸¥å¡¼¥ë
+¤Îsqrt()¤Ê¤É¤¬¤¢¤²¤é¤ì¤Þ¤¹¡¥¤³¤Î¥á¥½¥Ã¥É¤Ï
Math.sqrt(4)
-ã¨ã„ã†å½¢å¼ã§ã‚‚
+¤È¤¤¤¦·Á¼°¤Ç¤â
include Math
sqrt(4)
-ã¨ã„ã†å½¢å¼ã§ã‚‚使ãˆã¾ã™ï¼Žãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«é–¢æ•°ã‚’定義ã™ã‚‹é–¢æ•°ã¯ä»¥ä¸‹ã®
-通りã§ã™ï¼Ž
+¤È¤¤¤¦·Á¼°¤Ç¤â»È¤¨¤Þ¤¹¡¥¥â¥¸¥å¡¼¥ë´Ø¿ô¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ï°Ê²¼¤Î
+Ä̤ê¤Ç¤¹¡¥
- void rb_define_module_function(VALUE module, const char *name,
+ void rb_define_module_function(VALUE module, const char *name,
VALUE (*func)(), int argc)
-関数的メソッド(Kernelモジュールã®private method)を定義ã™ã‚‹ãŸ
-ã‚ã®é–¢æ•°ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž
+´Ø¿ôŪ¥á¥½¥Ã¥É(Kernel¥â¥¸¥å¡¼¥ë¤Îprivate method)¤òÄêµÁ¤¹¤ë¤¿
+¤á¤Î´Ø¿ô¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
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を定義ã—ãŸã‚Šå‰Šé™¤ã—ãŸã‚Šã™ã‚‹ãŸã‚ã®é–¢æ•°ã¯
-以下ã®é€šã‚Šã§ã™ï¼Ž
+¥¯¥é¥¹¥á¥½¥Ã¥Éallocate¤òÄêµÁ¤·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¤¿¤á¤Î´Ø¿ô¤Ï
+°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
void rb_undef_alloc_func(VALUE klass);
-funcã¯ã‚¯ãƒ©ã‚¹ã‚’引数ã¨ã—ã¦å—ã‘å–ã£ã¦ï¼Œæ–°ã—ã割り当ã¦ã‚‰ã‚ŒãŸã‚¤ãƒ³
-スタンスを返ã•ãªãã¦ã¯ãªã‚Šã¾ã›ã‚“.ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ï¼Œå¤–部リ
-ソースãªã©ã‚’å«ã¾ãªã„,ã§ãã‚‹ã ã‘「空ã€ã®ã¾ã¾ã«ã—ã¦ãŠã„ãŸã»ã†
-ãŒã‚ˆã„ã§ã—ょã†ï¼Ž
+func¤Ï¥¯¥é¥¹¤ò°ú¿ô¤È¤·¤Æ¼õ¤±¼è¤Ã¤Æ¡¤¿·¤·¤¯³ä¤êÅö¤Æ¤é¤ì¤¿¥¤¥ó
+¥¹¥¿¥ó¥¹¤òÊÖ¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡¥¤³¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ï¡¤³°Éô¥ê
+¥½¡¼¥¹¤Ê¤É¤ò´Þ¤Þ¤Ê¤¤¡¤¤Ç¤­¤ë¤À¤±¡Ö¶õ¡×¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¤¤¿¤Û¤¦
+¤¬¤è¤¤¤Ç¤·¤ç¤¦¡¥
-=== 定数定義
+2.1.3 Äê¿ôÄêµÁ
-拡張ライブラリãŒå¿…è¦ãªå®šæ•°ã¯ã‚らã‹ã˜ã‚定義ã—ã¦ãŠã„ãŸæ–¹ãŒè‰¯ã„
-ã§ã—ょã†ï¼Žå®šæ•°ã‚’定義ã™ã‚‹é–¢æ•°ã¯äºŒã¤ã‚りã¾ã™ï¼Ž
+³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפÊÄê¿ô¤Ï¤¢¤é¤«¤¸¤áÄêµÁ¤·¤Æ¤ª¤¤¤¿Êý¤¬Îɤ¤
+¤Ç¤·¤ç¤¦¡¥Äê¿ô¤òÄêµÁ¤¹¤ë´Ø¿ô¤ÏÆó¤Ä¤¢¤ê¤Þ¤¹¡¥
void rb_define_const(VALUE klass, const char *name, VALUE val)
void rb_define_global_const(const char *name, VALUE val)
-å‰è€…ã¯ç‰¹å®šã®ã‚¯ãƒ©ã‚¹/モジュールã«å±žã™ã‚‹å®šæ•°ã‚’定義ã™ã‚‹ã‚‚ã®ï¼Œå¾Œ
-者ã¯ã‚°ãƒ­ãƒ¼ãƒãƒ«ãªå®šæ•°ã‚’定義ã™ã‚‹ã‚‚ã®ã§ã™ï¼Ž
+Á°¼Ô¤ÏÆÃÄê¤Î¥¯¥é¥¹/¥â¥¸¥å¡¼¥ë¤Ë°¤¹¤ëÄê¿ô¤òÄêµÁ¤¹¤ë¤â¤Î¡¤¸å
+¼Ô¤Ï¥°¥í¡¼¥Ð¥ë¤ÊÄê¿ô¤òÄêµÁ¤¹¤ë¤â¤Î¤Ç¤¹¡¥
-== Rubyã®æ©Ÿèƒ½ã‚’Cã‹ã‚‰å‘¼ã³å‡ºã™
+2.2 Ruby¤Îµ¡Ç½¤òC¤«¤é¸Æ¤Ó½Ð¤¹
-æ—¢ã«ã€Ž1.5 Rubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ“作ã™ã‚‹ã€ã§ä¸€éƒ¨ç´¹ä»‹ã—ãŸã‚ˆã†ãªé–¢æ•°ã‚’
-使ãˆã°ï¼ŒRubyã®æ©Ÿèƒ½ã‚’実ç¾ã—ã¦ã„る関数を直接呼ã³å‡ºã™ã“ã¨ãŒå‡ºæ¥
-ã¾ã™ï¼Ž
+´û¤Ë¡Ø1.5 Ruby¤Î¥Ç¡¼¥¿¤òÁàºî¤¹¤ë¡Ù¤Ç°ìÉô¾Ò²ð¤·¤¿¤è¤¦¤Ê´Ø¿ô¤ò
+»È¤¨¤Ð¡¤Ruby¤Îµ¡Ç½¤ò¼Â¸½¤·¤Æ¤¤¤ë´Ø¿ô¤òľÀܸƤӽФ¹¤³¤È¤¬½ÐÍè
+¤Þ¤¹¡¥
-# ã“ã®ã‚ˆã†ãªé–¢æ•°ã®ä¸€è¦§è¡¨ã¯ã„ã¾ã®ã¨ã“ã‚ã‚りã¾ã›ã‚“.ソースを見
-# ã‚‹ã—ã‹ãªã„ã§ã™ã­ï¼Ž
+# ¤³¤Î¤è¤¦¤Ê´Ø¿ô¤Î°ìÍ÷ɽ¤Ï¤¤¤Þ¤Î¤È¤³¤í¤¢¤ê¤Þ¤»¤ó¡¥¥½¡¼¥¹¤ò¸«
+# ¤ë¤·¤«¤Ê¤¤¤Ç¤¹¤Í¡¥
-ãれ以外ã«ã‚‚Rubyã®æ©Ÿèƒ½ã‚’呼ã³å‡ºã™æ–¹æ³•ã¯ã„ãã¤ã‹ã‚りã¾ã™ï¼Ž
+¤½¤ì°Ê³°¤Ë¤âRuby¤Îµ¡Ç½¤ò¸Æ¤Ó½Ð¤¹ÊýË¡¤Ï¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡¥
-=== Rubyã®ãƒ—ログラムをevalã™ã‚‹
+2.2.1 Ruby¤Î¥×¥í¥°¥é¥à¤òeval¤¹¤ë
-Cã‹ã‚‰Rubyã®æ©Ÿèƒ½ã‚’呼ã³å‡ºã™ã‚‚ã£ã¨ã‚‚ç°¡å˜ãªæ–¹æ³•ã¨ã—ã¦ï¼Œæ–‡å­—列ã§
-与ãˆã‚‰ã‚ŒãŸRubyã®ãƒ—ログラムを評価ã™ã‚‹ä»¥ä¸‹ã®é–¢æ•°ãŒã‚りã¾ã™ï¼Ž
+C¤«¤éRuby¤Îµ¡Ç½¤ò¸Æ¤Ó½Ð¤¹¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤È¤·¤Æ¡¤Ê¸»úÎó¤Ç
+Í¿¤¨¤é¤ì¤¿Ruby¤Î¥×¥í¥°¥é¥à¤òɾ²Á¤¹¤ë°Ê²¼¤Î´Ø¿ô¤¬¤¢¤ê¤Þ¤¹¡¥
VALUE rb_eval_string(const char *str)
-ã“ã®è©•価ã¯ç¾åœ¨ã®ç’°å¢ƒã§è¡Œã‚れã¾ã™ï¼Žã¤ã¾ã‚Šï¼Œç¾åœ¨ã®ãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°
-ãªã©ã‚’å—ã‘ç¶™ãŽã¾ã™ï¼Ž
+¤³¤Îɾ²Á¤Ï¸½ºß¤Î´Ä¶­¤Ç¹Ô¤ï¤ì¤Þ¤¹¡¥¤Ä¤Þ¤ê¡¤¸½ºß¤Î¥í¡¼¥«¥ëÊÑ¿ô
+¤Ê¤É¤ò¼õ¤±·Ñ¤®¤Þ¤¹¡¥
-評価ã¯ä¾‹å¤–を発生ã™ã‚‹ã‹ã‚‚ã—れãªã„ã“ã¨ã«æ³¨æ„ã—ã¾ã—ょã†. より安全
-ãªé–¢æ•°ã‚‚ã‚りã¾ã™.
+ɾ²Á¤ÏÎã³°¤òȯÀ¸¤¹¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Þ¤·¤ç¤¦. ¤è¤ê°ÂÁ´
+¤Ê´Ø¿ô¤â¤¢¤ê¤Þ¤¹.
VALUE rb_eval_string_protect(const char *str, int *state)
-ã“ã®é–¢æ•°ã¯ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã¨nilã‚’è¿”ã—ã¾ã™ï¼Žãã—ã¦ï¼ŒæˆåŠŸæ™‚ã«ã¯
-*stateã¯ã‚¼ãƒ­ã«ï¼Œã•ã‚‚ãªãã°éžã‚¼ãƒ­ã«ãªã‚Šã¾ã™ï¼Ž
-
-=== IDã¾ãŸã¯ã‚·ãƒ³ãƒœãƒ«
+¤³¤Î´Ø¿ô¤Ï¥¨¥é¡¼¤¬È¯À¸¤¹¤ë¤Ènil¤òÊÖ¤·¤Þ¤¹¡£¤½¤·¤Æ¡¢À®¸ù»þ¤Ë¤Ï
+*state¤Ï¥¼¥í¤Ë¡¢¤µ¤â¤Ê¤¯¤ÐÈó¥¼¥í¤Ë¤Ê¤ê¤Þ¤¹¡£
-Cã‹ã‚‰æ–‡å­—列を経由ã›ãšã«Rubyã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™ã“ã¨ã‚‚ã§ãã¾
-ã™ï¼Žãã®å‰ã«ï¼ŒRubyインタプリタ内ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚„変数åを指定ã™ã‚‹
-時ã«ä½¿ã‚れã¦ã„ã‚‹IDã«ã¤ã„ã¦èª¬æ˜Žã—ã¦ãŠãã¾ã—ょã†ï¼Ž
-IDã¨ã¯å¤‰æ•°å,メソッドåã‚’è¡¨ã™æ•´æ•°ã§ã™ï¼ŽRubyã®ä¸­ã§ã¯
+2.2.2 ID¤Þ¤¿¤Ï¥·¥ó¥Ü¥ë
- :識別å­
+C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤â¤Ç¤­¤Þ
+¤¹¡¥¤½¤ÎÁ°¤Ë¡¤Ruby¥¤¥ó¥¿¥×¥ê¥¿Æâ¤Ç¥á¥½¥Ã¥É¤äÊÑ¿ô̾¤ò»ØÄꤹ¤ë
+»þ¤Ë»È¤ï¤ì¤Æ¤¤¤ëID¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡¥
-ã¾ãŸã¯
+ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤ÎÃæ¤Ç¤Ï
- :"ä»»æ„ã®æ–‡å­—列"
+ :¼±ÊÌ»Ò
+¤Þ¤¿¤Ï
+ :"Ǥ°Õ¤Îʸ»úÎó"
-ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ï¼ŽCã‹ã‚‰ã“ã®æ•´æ•°ã‚’å¾—ã‚‹ãŸã‚ã«ã¯é–¢æ•°
+¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡¥C¤«¤é¤³¤ÎÀ°¿ô¤òÆÀ¤ë¤¿¤á¤Ë¤Ï´Ø¿ô
rb_intern(const char *name)
- rb_intern_str(VALUE name)
-を使ã„ã¾ã™ï¼ŽRubyã‹ã‚‰å¼•æ•°ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸã‚·ãƒ³ãƒœãƒ«(ã¾ãŸã¯æ–‡å­—
-列)ã‚’IDã«å¤‰æ›ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž
+¤ò»È¤¤¤Þ¤¹¡¥Ruby¤«¤é°ú¿ô¤È¤·¤ÆÍ¿¤¨¤é¤ì¤¿¥·¥ó¥Ü¥ë(¤Þ¤¿¤Ïʸ»ú
+Îó)¤òID¤ËÊÑ´¹¤¹¤ë¤Ë¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
rb_to_id(VALUE symbol)
- rb_check_id(volatile VALUE *name)
- rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
-ã‚‚ã—引数ãŒã‚·ãƒ³ãƒœãƒ«ã§ã‚‚文字列ã§ã‚‚ãªã‘れã°ã€to_strãƒ¡ã‚½ãƒƒãƒ‰ã§æ–‡
-字列ã«å¤‰æ›ã—よã†ã¨ã—ã¾ã™ï¼Žç¬¬äºŒã®é–¢æ•°ã¯ãã®å¤‰æ›çµæžœã‚’*nameã«ä¿
-å­˜ã—,ãã®åå‰ãŒæ—¢çŸ¥ã®ã‚·ãƒ³ãƒœãƒ«ã§ãªã„å ´åˆã¯0ã‚’è¿”ã—ã¾ã™ï¼Žã“ã®é–¢
-æ•°ãŒ0以外を返ã—ãŸå ´åˆã¯*nameã¯å¸¸ã«ã‚·ãƒ³ãƒœãƒ«ã‹æ–‡å­—列ã§ã‚りã€0ã‚’
-è¿”ã—ãŸå ´åˆã¯å¸¸ã«æ–‡å­—列ã§ã™ï¼Žç¬¬ä¸‰ã®é–¢æ•°ã¯Rubyã®æ–‡å­—列ã§ã¯ãªã
-NUL終端ã•れãŸCã®æ–‡å­—列を使ã„ã¾ã™ï¼Ž
+2.2.3 C¤«¤éRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹
-=== Cã‹ã‚‰Rubyã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™
-
-Cã‹ã‚‰æ–‡å­—列を経由ã›ãšã«Rubyã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™ãŸã‚ã«ã¯ä»¥ä¸‹
-ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž
+C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Ë¤Ï°Ê²¼
+¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
-ã“ã®é–¢æ•°ã¯ã‚ªãƒ–ジェクトrecvã®midã§æŒ‡å®šã•れるメソッドを呼ã³å‡º
-ã—ã¾ã™ï¼Žãã®ä»–ã«å¼•æ•°ã®æŒ‡å®šã®ä»•æ–¹ãŒé•ã†ä»¥ä¸‹ã®é–¢æ•°ã‚‚ã‚りã¾ã™ï¼Ž
+¤³¤Î´Ø¿ô¤Ï¥ª¥Ö¥¸¥§¥¯¥Èrecv¤Îmid¤Ç»ØÄꤵ¤ì¤ë¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð
+¤·¤Þ¤¹¡¥¤½¤Î¾¤Ë°ú¿ô¤Î»ØÄê¤Î»ÅÊý¤¬°ã¤¦°Ê²¼¤Î´Ø¿ô¤â¤¢¤ê¤Þ¤¹¡¥
VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
VALUE rb_apply(VALUE recv, ID mid, VALUE args)
-applyã«ã¯å¼•æ•°ã¨ã—ã¦Rubyã®é…列を与ãˆã¾ã™ï¼Ž
+apply¤Ë¤Ï°ú¿ô¤È¤·¤ÆRuby¤ÎÇÛÎó¤òÍ¿¤¨¤Þ¤¹¡¥
-=== 変数/定数をå‚ç…§/æ›´æ–°ã™ã‚‹
+2.2.4 ÊÑ¿ô/Äê¿ô¤ò»²¾È/¹¹¿·¤¹¤ë
-Cã‹ã‚‰é–¢æ•°ã‚’使ã£ã¦å‚照・更新ã§ãã‚‹ã®ã¯ï¼Œå®šæ•°ï¼Œã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰
-æ•°ã§ã™ï¼Žå¤§åŸŸå¤‰æ•°ã¯ä¸€éƒ¨ã®ã‚‚ã®ã¯Cã®å¤§åŸŸå¤‰æ•°ã¨ã—ã¦ã‚¢ã‚¯ã‚»ã‚¹ã§ã
-ã¾ã™ï¼Žãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã‚’å‚ç…§ã™ã‚‹æ–¹æ³•ã¯å…¬é–‹ã—ã¦ã„ã¾ã›ã‚“.
+C¤«¤é´Ø¿ô¤ò»È¤Ã¤Æ»²¾È¡¦¹¹¿·¤Ç¤­¤ë¤Î¤Ï¡¤Äê¿ô¡¤¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ
+¿ô¤Ç¤¹¡¥Âç°èÊÑ¿ô¤Ï°ìÉô¤Î¤â¤Î¤ÏC¤ÎÂç°èÊÑ¿ô¤È¤·¤Æ¥¢¥¯¥»¥¹¤Ç¤­
+¤Þ¤¹¡¥¥í¡¼¥«¥ëÊÑ¿ô¤ò»²¾È¤¹¤ëÊýË¡¤Ï¸ø³«¤·¤Æ¤¤¤Þ¤»¤ó¡¥
-オブジェクトã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã‚’å‚照・更新ã™ã‚‹é–¢æ•°ã¯ä»¥ä¸‹ã®é€š
-りã§ã™ï¼Ž
+¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤ò»²¾È¡¦¹¹¿·¤¹¤ë´Ø¿ô¤Ï°Ê²¼¤ÎÄÌ
+¤ê¤Ç¤¹¡¥
VALUE rb_ivar_get(VALUE obj, ID id)
VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
-idã¯rb_intern()ã§å¾—られるもã®ã‚’使ã£ã¦ãã ã•ã„.
+id¤Ïrb_intern()¤ÇÆÀ¤é¤ì¤ë¤â¤Î¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-定数をå‚ç…§ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã£ã¦ãã ã•ã„.
+Äê¿ô¤ò»²¾È¤¹¤ë¤Ë¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
VALUE rb_const_get(VALUE obj, ID id)
-定数を新ã—ã定義ã™ã‚‹ãŸã‚ã«ã¯ã€Ž2.1.3 定数定義ã€ã§ç´¹ä»‹ã•
-れã¦ã„る関数を使ã£ã¦ãã ã•ã„.
+Äê¿ô¤ò¿·¤·¤¯ÄêµÁ¤¹¤ë¤¿¤á¤Ë¤Ï¡Ø2.1.3 Äê¿ôÄêµÁ¡Ù¤Ç¾Ò²ð¤µ
+¤ì¤Æ¤¤¤ë´Ø¿ô¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-= Rubyã¨Cã¨ã®æƒ…報共有
+3¡¥Ruby¤ÈC¤È¤Î¾ðÊó¶¦Í­
-C言語ã¨Rubyã®é–“ã§æƒ…報を共有ã™ã‚‹æ–¹æ³•ã«ã¤ã„ã¦è§£èª¬ã—ã¾ã™ï¼Ž
+C¸À¸ì¤ÈRuby¤Î´Ö¤Ç¾ðÊó¤ò¶¦Í­¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡¥
-== Cã‹ã‚‰å‚ç…§ã§ãã‚‹Rubyã®å®šæ•°
+3.1 C¤«¤é»²¾È¤Ç¤­¤ëRuby¤ÎÄê¿ô
-以下ã®Rubyã®å®šæ•°ã¯Cã®ãƒ¬ãƒ™ãƒ«ã‹ã‚‰å‚ç…§ã§ãã¾ã™ï¼Ž
+°Ê²¼¤ÎRuby¤ÎÄê¿ô¤ÏC¤Î¥ì¥Ù¥ë¤«¤é»²¾È¤Ç¤­¤Þ¤¹¡¥
Qtrue
Qfalse
-真å½å€¤ï¼ŽQfalseã¯C言語ã§ã‚‚å½ã¨ã¿ãªã•れã¾ã™(ã¤ã¾ã‚Š0).
+ ¿¿µ¶ÃÍ¡¥Qfalse¤ÏC¸À¸ì¤Ç¤âµ¶¤È¤ß¤Ê¤µ¤ì¤Þ¤¹(¤Ä¤Þ¤ê0)¡¥
Qnil
-C言語ã‹ã‚‰è¦‹ãŸã€Œnilã€ï¼Ž
+ C¸À¸ì¤«¤é¸«¤¿¡Önil¡×¡¥
-== Cã¨Rubyã§å…±æœ‰ã•れる大域変数
+3.2 C¤ÈRuby¤Ç¶¦Í­¤µ¤ì¤ëÂç°èÊÑ¿ô
-Cã¨Rubyã§å¤§åŸŸå¤‰æ•°ã‚’使ã£ã¦æƒ…報を共有ã§ãã¾ã™ï¼Žå…±æœ‰ã§ãる大域
-変数ã«ã¯ã„ãã¤ã‹ã®ç¨®é¡žãŒã‚りã¾ã™ï¼Žãã®ãªã‹ã§ã‚‚ã£ã¨ã‚‚良ã使ã‚
-ã‚Œã‚‹ã¨æ€ã‚れるã®ã¯rb_define_variable()ã§ã™ï¼Ž
+C¤ÈRuby¤ÇÂç°èÊÑ¿ô¤ò»È¤Ã¤Æ¾ðÊó¤ò¶¦Í­¤Ç¤­¤Þ¤¹¡¥¶¦Í­¤Ç¤­¤ëÂç°è
+ÊÑ¿ô¤Ë¤Ï¤¤¤¯¤Ä¤«¤Î¼ïÎब¤¢¤ê¤Þ¤¹¡¥¤½¤Î¤Ê¤«¤Ç¤â¤Ã¤È¤âÎɤ¯»È¤ï
+¤ì¤ë¤È»×¤ï¤ì¤ë¤Î¤Ïrb_define_variable()¤Ç¤¹¡¥
void rb_define_variable(const char *name, VALUE *var)
-ã“ã®é–¢æ•°ã¯Rubyã¨Cã¨ã§å…±æœ‰ã™ã‚‹å¤§åŸŸå¤‰æ•°ã‚’定義ã—ã¾ã™ï¼Žå¤‰æ•°åãŒ
-`$'ã§å§‹ã¾ã‚‰ãªã„時ã«ã¯è‡ªå‹•çš„ã«è¿½åŠ ã•れã¾ã™ï¼Žã“ã®å¤‰æ•°ã®å€¤ã‚’変
-æ›´ã™ã‚‹ã¨è‡ªå‹•çš„ã«Rubyã®å¯¾å¿œã™ã‚‹å¤‰æ•°ã®å€¤ã‚‚変ã‚りã¾ã™ï¼Ž
+¤³¤Î´Ø¿ô¤ÏRuby¤ÈC¤È¤Ç¶¦Í­¤¹¤ëÂç°èÊÑ¿ô¤òÄêµÁ¤·¤Þ¤¹¡¥ÊÑ¿ô̾¤¬
+`$'¤Ç»Ï¤Þ¤é¤Ê¤¤»þ¤Ë¤Ï¼«Æ°Åª¤ËÄɲ䵤ì¤Þ¤¹¡¥¤³¤ÎÊÑ¿ô¤ÎÃͤòÊÑ
+¹¹¤¹¤ë¤È¼«Æ°Åª¤ËRuby¤ÎÂбþ¤¹¤ëÊÑ¿ô¤ÎÃͤâÊѤï¤ê¤Þ¤¹¡¥
-ã¾ãŸRubyå´ã‹ã‚‰ã¯æ›´æ–°ã§ããªã„変数もã‚りã¾ã™ï¼Žã“ã®read onlyã®
-変数ã¯ä»¥ä¸‹ã®é–¢æ•°ã§å®šç¾©ã—ã¾ã™ï¼Ž
+¤Þ¤¿Ruby¦¤«¤é¤Ï¹¹¿·¤Ç¤­¤Ê¤¤ÊÑ¿ô¤â¤¢¤ê¤Þ¤¹¡¥¤³¤Îread only¤Î
+ÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤ÇÄêµÁ¤·¤Þ¤¹¡¥
void rb_define_readonly_variable(const char *name, VALUE *var)
-ã“れら変数ã®ä»–ã«hookã‚’ã¤ã‘ãŸå¤§åŸŸå¤‰æ•°ã‚’定義ã§ãã¾ã™ï¼Žhook付ã
-ã®å¤§åŸŸå¤‰æ•°ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’用ã„ã¦å®šç¾©ã—ã¾ã™ï¼Žhook付ã大域変数ã®
-値ã®å‚照や設定ã¯hookã§è¡Œã†å¿…è¦ãŒã‚りã¾ã™ï¼Ž
+¤³¤ì¤éÊÑ¿ô¤Î¾¤Ëhook¤ò¤Ä¤±¤¿Âç°èÊÑ¿ô¤òÄêµÁ¤Ç¤­¤Þ¤¹¡¥hookÉÕ¤­
+¤ÎÂç°èÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤òÍѤ¤¤ÆÄêµÁ¤·¤Þ¤¹¡¥hookÉÕ¤­Âç°èÊÑ¿ô¤Î
+Ãͤλ²¾È¤äÀßÄê¤Ïhook¤Ç¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥
void rb_define_hooked_variable(const char *name, VALUE *var,
VALUE (*getter)(), void (*setter)())
-ã“ã®é–¢æ•°ã¯Cã®é–¢æ•°ã«ã‚ˆã£ã¦hookã®ã¤ã‘られãŸå¤§åŸŸå¤‰æ•°ã‚’定義ã—ã¾
-ã™ï¼Žå¤‰æ•°ãŒå‚ç…§ã•ã‚ŒãŸæ™‚ã«ã¯é–¢æ•°getterãŒï¼Œå¤‰æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•れ
-ãŸæ™‚ã«ã¯é–¢æ•°setterãŒå‘¼ã°ã‚Œã‚‹ï¼Žhookを指定ã—ãªã„å ´åˆã¯getterã‚„
-setterã«0を指定ã—ã¾ã™ï¼Ž
-# getterã‚‚setterã‚‚0ãªã‚‰ã°rb_define_variable()ã¨åŒã˜ã«ãªã‚‹ï¼Ž
+¤³¤Î´Ø¿ô¤ÏC¤Î´Ø¿ô¤Ë¤è¤Ã¤Æhook¤Î¤Ä¤±¤é¤ì¤¿Âç°èÊÑ¿ô¤òÄêµÁ¤·¤Þ
+¤¹¡¥ÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ï´Ø¿ôgetter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì
+¤¿»þ¤Ë¤Ï´Ø¿ôsetter¤¬¸Æ¤Ð¤ì¤ë¡¥hook¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ïgetter¤ä
+setter¤Ë0¤ò»ØÄꤷ¤Þ¤¹¡¥
+# getter¤âsetter¤â0¤Ê¤é¤Ðrb_define_variable()¤ÈƱ¤¸¤Ë¤Ê¤ë¡¥
-getterã¨setterã®ä»•æ§˜ã¯æ¬¡ã®é€šã‚Šã§ã™ï¼Ž
+getter¤Èsetter¤Î»ÅÍͤϼ¡¤ÎÄ̤ê¤Ç¤¹¡£
VALUE (*getter)(ID id, VALUE *var);
void (*setter)(VALUE val, ID id, VALUE *var);
-ãれã‹ã‚‰ï¼Œå¯¾å¿œã™ã‚‹Cã®å¤‰æ•°ã‚’æŒãŸãªã„Rubyã®å¤§åŸŸå¤‰æ•°ã‚’定義ã™ã‚‹
-ã“ã¨ã‚‚ã§ãã¾ã™. ãã®å¤‰æ•°ã®å€¤ã¯ãƒ•ック関数ã®ã¿ã«ã‚ˆã£ã¦å–得・設定
-ã•れã¾ã™.
+¤½¤ì¤«¤é¡¤Âбþ¤¹¤ëC¤ÎÊÑ¿ô¤ò»ý¤¿¤Ê¤¤Ruby¤ÎÂç°èÊÑ¿ô¤òÄêµÁ¤¹¤ë
+¤³¤È¤â¤Ç¤­¤Þ¤¹. ¤½¤ÎÊÑ¿ô¤ÎÃͤϥե寴ؿô¤Î¤ß¤Ë¤è¤Ã¤Æ¼èÆÀ¡¦ÀßÄê
+¤µ¤ì¤Þ¤¹.
void rb_define_virtual_variable(const char *name,
VALUE (*getter)(), void (*setter)())
-ã“ã®é–¢æ•°ã«ã‚ˆã£ã¦å®šç¾©ã•れãŸRubyã®å¤§åŸŸå¤‰æ•°ãŒå‚ç…§ã•ã‚ŒãŸæ™‚ã«ã¯
-getterãŒï¼Œå¤‰æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚ŒãŸæ™‚ã«ã¯setterãŒå‘¼ã°ã‚Œã¾ã™ï¼Ž
+¤³¤Î´Ø¿ô¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤¿Ruby¤ÎÂç°èÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ï
+getter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ïsetter¤¬¸Æ¤Ð¤ì¤Þ¤¹¡¥
-getterã¨setterã®ä»•様ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž
+getter¤Èsetter¤Î»ÅÍͤϰʲ¼¤ÎÄ̤ê¤Ç¤¹¡¥
(*getter)(ID id);
(*setter)(VALUE val, ID id);
-== Cã®ãƒ‡ãƒ¼ã‚¿ã‚’Rubyオブジェクトã«ã™ã‚‹
+3.3 C¤Î¥Ç¡¼¥¿¤òRuby¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤¹¤ë
-Cã®ä¸–界ã§å®šç¾©ã•れãŸãƒ‡ãƒ¼ã‚¿(構造体)ã‚’Rubyã®ã‚ªãƒ–ジェクトã¨ã—ã¦
-å–り扱ã„ãŸã„å ´åˆãŒã‚りãˆã¾ã™ï¼Žã“ã®ã‚ˆã†ãªå ´åˆã«ã¯ï¼ŒDataã¨ã„ã†
-Rubyオブジェクトã«Cã®æ§‹é€ ä½“(ã¸ã®ãƒã‚¤ãƒ³ã‚¿)ã‚’ãã‚‹ã‚€ã“ã¨ã§Ruby
-オブジェクトã¨ã—ã¦å–り扱ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ï¼Ž
+C¤ÎÀ¤³¦¤ÇÄêµÁ¤µ¤ì¤¿¥Ç¡¼¥¿(¹½Â¤ÂÎ)¤òRuby¤Î¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æ
+¼è¤ê°·¤¤¤¿¤¤¾ì¹ç¤¬¤¢¤ê¤¨¤Þ¤¹¡¥¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¤Data¤È¤¤¤¦
+Ruby¥ª¥Ö¥¸¥§¥¯¥È¤ËC¤Î¹½Â¤ÂÎ(¤Ø¤Î¥Ý¥¤¥ó¥¿)¤ò¤¯¤ë¤à¤³¤È¤ÇRuby
+¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æ¼è¤ê°·¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥
-Dataオブジェクトを生æˆã—ã¦æ§‹é€ ä½“ã‚’Rubyオブジェクトã«ã‚«ãƒ—セル
-化ã™ã‚‹ãŸã‚ã«ã¯ï¼Œä»¥ä¸‹ã®ãƒžã‚¯ãƒ­ã‚’使ã„ã¾ã™ï¼Ž
+Data¥ª¥Ö¥¸¥§¥¯¥È¤òÀ¸À®¤·¤Æ¹½Â¤ÂΤòRuby¥ª¥Ö¥¸¥§¥¯¥È¤Ë¥«¥×¥»¥ë
+²½¤¹¤ë¤¿¤á¤Ë¤Ï¡¤°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤¤¤Þ¤¹¡¥
- Data_Wrap_Struct(klass, mark, free, sval)
+ Data_Wrap_Struct(klass, mark, free, ptr)
-ã“ã®ãƒžã‚¯ãƒ­ã®æˆ»ã‚Šå€¤ã¯ç”Ÿæˆã•れãŸDataオブジェクトã§ã™ï¼Ž
+¤³¤Î¥Þ¥¯¥í¤ÎÌá¤êÃͤÏÀ¸À®¤µ¤ì¤¿Data¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡¥
-klassã¯ã“ã®Dataオブジェクトã®ã‚¯ãƒ©ã‚¹ã§ã™ï¼Žmarkã¯ã“ã®æ§‹é€ ä½“ãŒ
-Rubyã®ã‚ªãƒ–ジェクトã¸ã®å‚ç…§ãŒã‚る時ã«ä½¿ã†é–¢æ•°ã§ã™ï¼Žãã®ã‚ˆã†ãª
-å‚ç…§ã‚’å«ã¾ãªã„時ã«ã¯0を指定ã—ã¾ã™ï¼Ž
+klass¤Ï¤³¤ÎData¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¯¥é¥¹¤Ç¤¹¡¥ptr¤Ï¥«¥×¥»¥ë²½¤¹¤ë
+C¤Î¹½Â¤ÂΤؤΥݥ¤¥ó¥¿¤Ç¤¹¡¥mark¤Ï¤³¤Î¹½Â¤ÂΤ¬Ruby¤Î¥ª¥Ö¥¸¥§
+¥¯¥È¤Ø¤Î»²¾È¤¬¤¢¤ë»þ¤Ë»È¤¦´Ø¿ô¤Ç¤¹¡¥¤½¤Î¤è¤¦¤Ê»²¾È¤ò´Þ¤Þ¤Ê¤¤
+»þ¤Ë¤Ï0¤ò»ØÄꤷ¤Þ¤¹¡¥
-# ãã®ã‚ˆã†ãªå‚ç…§ã¯å‹§ã‚られã¾ã›ã‚“.
+# ¤½¤Î¤è¤¦¤Ê»²¾È¤Ï´«¤á¤é¤ì¤Þ¤»¤ó¡¥
-freeã¯ã“ã®æ§‹é€ ä½“ãŒã‚‚ã†ä¸è¦ã«ãªã£ãŸæ™‚ã«å‘¼ã°ã‚Œã‚‹é–¢æ•°ã§ã™ï¼Žã“ã®
-関数ãŒã‚¬ãƒ¼ãƒ™ãƒ¼ã‚¸ã‚³ãƒ¬ã‚¯ã‚¿ã‹ã‚‰å‘¼ã°ã‚Œã¾ã™ï¼Žã“れãŒ-1ã®å ´åˆã¯ï¼Œå˜
-ç´”ã«é–‹æ”¾ã•れã¾ã™ï¼Ž
+free¤Ï¤³¤Î¹½Â¤ÂΤ¬¤â¤¦ÉÔÍפˤʤä¿»þ¤Ë¸Æ¤Ð¤ì¤ë´Ø¿ô¤Ç¤¹¡¥¤³¤Î
+´Ø¿ô¤¬¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥¿¤«¤é¸Æ¤Ð¤ì¤Þ¤¹¡¥¤³¤ì¤¬-1¤Î¾ì¹ç¤Ï¡¤Ã±
+½ã¤Ë³«Êü¤µ¤ì¤Þ¤¹¡¥
-markãŠã‚ˆã³free関数ã¯GC実行中ã«å‘¼ã³å‡ºã•れã¾ã™.
-ãªãŠ, GC実行中ã¯Rubyオブジェクトã®ã‚¢ãƒ­ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¯ç¦æ­¢ã•れã¾
-ã™. よã£ã¦, markãŠã‚ˆã³free関数ã§Rubyオブジェクトã®ã‚¢ãƒ­ã‚±ãƒ¼ã‚·
-ョンã¯è¡Œã‚ãªã„ã§ãã ã•ã„.
+mark¤ª¤è¤Ófree´Ø¿ô¤ÏGC¼Â¹ÔÃæ¤Ë¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹.
+¤Ê¤ª, GC¼Â¹ÔÃæ¤ÏRuby¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥í¥±¡¼¥·¥ç¥ó¤Ï¶Ø»ß¤µ¤ì¤Þ
+¤¹. ¤è¤Ã¤Æ, mark¤ª¤è¤Ófree´Ø¿ô¤ÇRuby¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥í¥±¡¼¥·
+¥ç¥ó¤Ï¹Ô¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤.
-Cã®æ§‹é€ ä½“ã®å‰²å½“ã¨Dataオブジェクトã®ç”Ÿæˆã‚’åŒæ™‚ã«è¡Œã†ãƒžã‚¯ãƒ­ã¨
-ã—ã¦ä»¥ä¸‹ã®ã‚‚ã®ãŒæä¾›ã•れã¦ã„ã¾ã™ï¼Ž
+C¤Î¹½Â¤ÂΤγäÅö¤ÈData¥ª¥Ö¥¸¥§¥¯¥È¤ÎÀ¸À®¤òƱ»þ¤Ë¹Ô¤¦¥Þ¥¯¥í¤È
+¤·¤Æ°Ê²¼¤Î¤â¤Î¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
Data_Make_Struct(klass, type, mark, free, sval)
-ã“ã®ãƒžã‚¯ãƒ­ã®æˆ»ã‚Šå€¤ã¯ç”Ÿæˆã•れãŸDataオブジェクトã§ã™ï¼Žã“ã®ãƒžã‚¯
-ロã¯ä»¥ä¸‹ã®å¼ã®ã‚ˆã†ã«åƒãã¾ã™:
-
- (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
+¤³¤Î¥Þ¥¯¥í¤ÎÌá¤êÃͤÏÀ¸À®¤µ¤ì¤¿Data¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡¥
-klass, mark, freeã¯Data_Wrap_Structã¨åŒã˜åƒãã‚’ã—ã¾ã™ï¼Žtype
-ã¯å‰²ã‚Šå½“ã¦ã‚‹C構造体ã®åž‹ã§ã™ï¼Žå‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸæ§‹é€ ä½“ã¯å¤‰æ•°sval
-ã«ä»£å…¥ã•れã¾ã™ï¼Žã“ã®å¤‰æ•°ã®åž‹ã¯ (type*) ã§ã‚ã‚‹å¿…è¦ãŒã‚りã¾ã™ï¼Ž
+klass, mark, free¤ÏData_Wrap_Struct¤ÈƱ¤¸Æ¯¤­¤ò¤·¤Þ¤¹¡¥type
+¤Ï³ä¤êÅö¤Æ¤ëC¹½Â¤ÂΤη¿¤Ç¤¹¡¥³ä¤êÅö¤Æ¤é¤ì¤¿¹½Â¤ÂΤÏÊÑ¿ôsval
+¤ËÂåÆþ¤µ¤ì¤Þ¤¹¡¥¤³¤ÎÊÑ¿ô¤Î·¿¤Ï (type*) ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-Dataオブジェクトã‹ã‚‰ãƒã‚¤ãƒ³ã‚¿ã‚’å–り出ã™ã®ã¯ä»¥ä¸‹ã®ãƒžã‚¯ãƒ­ã‚’用ã„
-ã¾ã™ï¼Ž
+Data¥ª¥Ö¥¸¥§¥¯¥È¤«¤é¥Ý¥¤¥ó¥¿¤ò¼è¤ê½Ð¤¹¤Î¤Ï°Ê²¼¤Î¥Þ¥¯¥í¤òÍѤ¤
+¤Þ¤¹¡¥
Data_Get_Struct(obj, type, sval)
-Cã®æ§‹é€ ä½“ã¸ã®ãƒã‚¤ãƒ³ã‚¿ã¯å¤‰æ•°svalã«ä»£å…¥ã•れã¾ã™ï¼Ž
+C¤Î¹½Â¤ÂΤؤΥݥ¤¥ó¥¿¤ÏÊÑ¿ôsval¤ËÂåÆþ¤µ¤ì¤Þ¤¹¡¥
-ã“れらã®Dataã®ä½¿ã„æ–¹ã¯ã¡ã‚‡ã£ã¨åˆ†ã‹ã‚Šã«ãã„ã®ã§ï¼Œå¾Œã§èª¬æ˜Žã™ã‚‹
-例題をå‚ç…§ã—ã¦ãã ã•ã„.
+¤³¤ì¤é¤ÎData¤Î»È¤¤Êý¤Ï¤Á¤ç¤Ã¤Èʬ¤«¤ê¤Ë¤¯¤¤¤Î¤Ç¡¤¸å¤ÇÀâÌÀ¤¹¤ë
+ÎãÂê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-= 例題 - dbmパッケージを作る
+4¡¥ÎãÂê - dbm¥Ñ¥Ã¥±¡¼¥¸¤òºî¤ë
-ã“ã“ã¾ã§ã®èª¬æ˜Žã§ã¨ã‚Šã‚ãˆãšæ‹¡å¼µãƒ©ã‚¤ãƒ–ãƒ©ãƒªã¯ä½œã‚Œã‚‹ã¯ãšã§ã™ï¼Ž
-Rubyã®extディレクトリã«ã™ã§ã«å«ã¾ã‚Œã¦ã„ã‚‹dbmライブラリを例ã«
-ã—ã¦æ®µéšŽçš„ã«èª¬æ˜Žã—ã¾ã™ï¼Ž
+¤³¤³¤Þ¤Ç¤ÎÀâÌÀ¤Ç¤È¤ê¤¢¤¨¤º³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ïºî¤ì¤ë¤Ï¤º¤Ç¤¹¡¥
+Ruby¤Îext¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¹¤Ç¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ëdbm¥é¥¤¥Ö¥é¥ê¤òÎã¤Ë
+¤·¤ÆÃʳ¬Åª¤ËÀâÌÀ¤·¤Þ¤¹¡¥
-== ディレクトリを作る
+(1) ¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ë
% mkdir ext/dbm
-Ruby 1.1ã‹ã‚‰ã¯ä»»æ„ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ãƒ©ã‚¤ãƒ–ラリを作
-ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã—ãŸï¼ŽRubyã«é™çš„ã«ãƒªãƒ³ã‚¯ã™ã‚‹å ´åˆã«
-ã¯Rubyを展開ã—ãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ä¸‹ï¼Œextディレクトリã®ä¸­ã«æ‹¡å¼µ
-ライブラリ用ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作る必è¦ãŒã‚りã¾ã™ï¼Žåå‰ã¯é©å½“ã«
-é¸ã‚“ã§æ§‹ã„ã¾ã›ã‚“.
-
-== 設計ã™ã‚‹
-
-ã¾ã‚,当然ãªã‚“ã§ã™ã‘ã©ï¼Œã©ã†ã„ã†æ©Ÿèƒ½ã‚’実ç¾ã™ã‚‹ã‹ã©ã†ã‹ã¾ãšè¨­
-計ã™ã‚‹å¿…è¦ãŒã‚りã¾ã™ï¼Žã©ã‚“ãªã‚¯ãƒ©ã‚¹ã‚’ã¤ãã‚‹ã‹ï¼Œãã®ã‚¯ãƒ©ã‚¹ã«ã¯
-ã©ã‚“ãªãƒ¡ã‚½ãƒƒãƒ‰ãŒã‚ã‚‹ã‹ï¼Œã‚¯ãƒ©ã‚¹ãŒæä¾›ã™ã‚‹å®šæ•°ãªã©ã«ã¤ã„ã¦è¨­è¨ˆ
-ã—ã¾ã™ï¼Ž
-
-== Cコードを書ã
-
-拡張ライブラリ本体ã¨ãªã‚‹C言語ã®ã‚½ãƒ¼ã‚¹ã‚’書ãã¾ã™ï¼ŽC言語ã®ã‚½ãƒ¼
-スãŒã²ã¨ã¤ã®æ™‚ã«ã¯ã€Œãƒ©ã‚¤ãƒ–ラリå.cã€ã‚’é¸ã¶ã¨è‰¯ã„ã§ã—ょã†ï¼ŽC
-言語ã®ã‚½ãƒ¼ã‚¹ãŒè¤‡æ•°ã®å ´åˆã«ã¯é€†ã«ã€Œãƒ©ã‚¤ãƒ–ラリå.cã€ã¨ã„ã†ãƒ•ã‚¡
-イルåã¯é¿ã‘ã‚‹å¿…è¦ãŒã‚りã¾ã™ï¼Žã‚ªãƒ–ジェクトファイルã¨ãƒ¢ã‚¸ãƒ¥ãƒ¼
-ãƒ«ç”Ÿæˆæ™‚ã«ä¸­é–“çš„ã«ç”Ÿæˆã•れる「ライブラリå.oã€ã¨ã„ã†ãƒ•ァイル
-ã¨ãŒè¡çªã™ã‚‹ã‹ã‚‰ã§ã™ï¼Žã¾ãŸï¼Œå¾Œè¿°ã™ã‚‹ mkmf ライブラリã®ã„ãã¤
-ã‹ã®é–¢æ•°ãŒã‚³ãƒ³ãƒ‘イルをè¦ã™ã‚‹ãƒ†ã‚¹ãƒˆã®ãŸã‚ã«ã€Œconftest.cã€ã¨ã„
-ã†ãƒ•ァイルåを使用ã™ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„.ソースファイル
-åã¨ã—ã¦ã€Œconftest.cã€ã‚’使用ã—ã¦ã¯ãªã‚Šã¾ã›ã‚“.
-
-Rubyã¯æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリをロードã™ã‚‹æ™‚ã«ã€ŒInit_ライブラリåã€ã¨
-ã„ã†é–¢æ•°ã‚’自動的ã«å®Ÿè¡Œã—ã¾ã™ï¼Ždbmライブラリã®å ´åˆã€ŒInit_dbmã€
-ã§ã™ï¼Žã“ã®é–¢æ•°ã®ä¸­ã§ã‚¯ãƒ©ã‚¹ï¼Œãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ï¼Œãƒ¡ã‚½ãƒƒãƒ‰ï¼Œå®šæ•°ãªã©ã®
-定義を行ã„ã¾ã™ï¼Ždbm.cã‹ã‚‰ä¸€éƒ¨å¼•用ã—ã¾ã™ï¼Ž
-
- void
- Init_dbm(void)
- {
- /* DBMクラスを定義ã™ã‚‹ */
- cDBM = rb_define_class("DBM", rb_cObject);
- /* DBMã¯Enumerableモジュールをインクルードã™ã‚‹ */
- rb_include_module(cDBM, rb_mEnumerable);
-
- /* DBMクラスã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰open(): 引数ã¯Cã®é…列ã§å—ã‘ã‚‹ */
- rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
-
- /* DBMクラスã®ãƒ¡ã‚½ãƒƒãƒ‰close(): 引数ã¯ãªã— */
- rb_define_method(cDBM, "close", fdbm_close, 0);
- /* DBMクラスã®ãƒ¡ã‚½ãƒƒãƒ‰[]: 引数ã¯1個 */
- rb_define_method(cDBM, "[]", fdbm_fetch, 1);
-
- /* ... */
-
- /* DBMデータを格ç´ã™ã‚‹ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°åã®ãŸã‚ã®ID */
- id_dbm = rb_intern("dbm");
- }
-
-DBMライブラリã¯dbmã®ãƒ‡ãƒ¼ã‚¿ã¨å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトã«ãªã‚‹ã¯ãšã§
-ã™ã‹ã‚‰ï¼ŒCã®ä¸–界ã®dbmã‚’Rubyã®ä¸–界ã«å–り込む必è¦ãŒã‚りã¾ã™ï¼Ž
-
-dbm.cã§ã¯Data_Make_Structを以下ã®ã‚ˆã†ã«ä½¿ã£ã¦ã„ã¾ã™ï¼Ž
-
- struct dbmdata {
- int di_size;
- DBM *di_dbm;
- };
-
-
- obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
-
-ã“ã“ã§ã¯dbmstruct構造体ã¸ã®ãƒã‚¤ãƒ³ã‚¿ã‚’Dataã«ã‚«ãƒ—セル化ã—ã¦ã„
-ã¾ã™ï¼ŽDBM*を直接カプセル化ã—ãªã„ã®ã¯close()ã—ãŸæ™‚ã®å‡¦ç†ã‚’考
-ãˆã¦ã®ã“ã¨ã§ã™ï¼Ž
-
-Dataオブジェクトã‹ã‚‰dbmstruct構造体ã®ãƒã‚¤ãƒ³ã‚¿ã‚’å–り出ã™ãŸã‚
-ã«ä»¥ä¸‹ã®ãƒžã‚¯ãƒ­ã‚’使ã£ã¦ã„ã¾ã™ï¼Ž
-
- #define GetDBM(obj, dbmp) {\
- Data_Get_Struct(obj, struct dbmdata, dbmp);\
- if (dbmp->di_dbm == 0) closed_dbm();\
- }
-
-ã¡ã‚‡ã£ã¨è¤‡é›‘ãªãƒžã‚¯ãƒ­ã§ã™ãŒï¼Œè¦ã™ã‚‹ã«dbmdata構造体ã®ãƒã‚¤ãƒ³ã‚¿
-ã®å–り出ã—ã¨ï¼Œcloseã•れã¦ã„ã‚‹ã‹ã©ã†ã‹ã®ãƒã‚§ãƒƒã‚¯ã‚’ã¾ã¨ã‚ã¦ã„
-ã‚‹ã ã‘ã§ã™ï¼Ž
-
-DBMクラスã«ã¯ãŸãã•んメソッドãŒã‚りã¾ã™ãŒï¼Œåˆ†é¡žã™ã‚‹ã¨3種類ã®
-引数ã®å—ã‘æ–¹ãŒã‚りã¾ã™ï¼Žã²ã¨ã¤ã¯å¼•æ•°ã®æ•°ãŒå›ºå®šã®ã‚‚ã®ã§ï¼Œä¾‹ã¨
-ã—ã¦ã¯deleteメソッドãŒã‚りã¾ã™ï¼Ždeleteメソッドを実装ã—ã¦ã„ã‚‹
-fdbm_delete()ã¯ã“ã®ã‚ˆã†ã«ãªã£ã¦ã„ã¾ã™ï¼Ž
-
- static VALUE
- fdbm_delete(VALUE obj, VALUE keystr)
- {
- /* ... */
- }
-
-å¼•æ•°ã®æ•°ãŒå›ºå®šã®ã‚¿ã‚¤ãƒ—ã¯ç¬¬1引数ãŒself,第2引数以é™ãŒãƒ¡ã‚½ãƒƒãƒ‰
-ã®å¼•æ•°ã¨ãªã‚Šã¾ã™ï¼Ž
-
-å¼•æ•°ã®æ•°ãŒä¸å®šã®ã‚‚ã®ã¯Cã®é…列ã§å—ã‘ã‚‹ã‚‚ã®ã¨Rubyã®é…列ã§å—ã‘
-ã‚‹ã‚‚ã®ã¨ãŒã‚りã¾ã™ï¼Ždbmライブラリã®ä¸­ã§ï¼ŒCã®é…列ã§å—ã‘ã‚‹ã‚‚ã®
-ã¯DBMã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚ã‚‹open()ã§ã™ï¼Žã“れを実装ã—ã¦ã„ã‚‹é–¢
-æ•°fdbm_s_open()ã¯ã“ã†ãªã£ã¦ã„ã¾ã™ï¼Ž
-
- static VALUE
- fdbm_s_open(int argc, VALUE *argv, VALUE klass)
- {
- /* ... */
-
- if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
- mode = 0666; /* default value */
- }
-
- /* ... */
- }
-
-ã“ã®ã‚¿ã‚¤ãƒ—ã®é–¢æ•°ã¯ç¬¬1引数ãŒä¸Žãˆã‚‰ã‚ŒãŸå¼•æ•°ã®æ•°ï¼Œç¬¬2引数ãŒä¸Žãˆ
-られãŸå¼•æ•°ã®å…¥ã£ã¦ã„ã‚‹é…列ã«ãªã‚Šã¾ã™ï¼Žselfã¯ç¬¬3引数ã¨ã—ã¦ä¸Ž
-ãˆã‚‰ã‚Œã¾ã™ï¼Ž
-
-ã“ã®é…列ã§ä¸Žãˆã‚‰ã‚ŒãŸå¼•æ•°ã‚’è§£æžã™ã‚‹ãŸã‚ã®é–¢æ•°ãŒopen()ã§ã‚‚使ã‚
-れã¦ã„ã‚‹rb_scan_args()ã§ã™ï¼Žç¬¬3å¼•æ•°ã«æŒ‡å®šã—ãŸãƒ•ォーマットã«å¾“
-ã„,第4変数以é™ã«æŒ‡å®šã—ãŸVALUEã¸ã®å‚ç…§ã«å€¤ã‚’代入ã—ã¦ãれã¾
-ã™ï¼Ž
-
-
-引数をRubyã®é…列ã¨ã—ã¦å—ã‘å–るメソッドã®ä¾‹ã«ã¯
-Thread#initializeãŒã‚りã¾ã™ï¼Žå®Ÿè£…ã¯ã“ã†ã§ã™ï¼Ž
-
- static VALUE
- thread_initialize(VALUE thread, VALUE args)
- {
- /* ... */
- }
-
-第1引数ã¯self,第2引数ã¯Rubyã®é…列ã§ã™ï¼Ž
-
-*注æ„事項*
-
-Rubyã¨å…±æœ‰ã¯ã—ãªã„ãŒRubyã®ã‚ªãƒ–ジェクトを格ç´ã™ã‚‹å¯èƒ½æ€§ã®ã‚ã‚‹
-Cã®å¤§åŸŸå¤‰æ•°ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã£ã¦Rubyインタプリタã«å¤‰æ•°ã®å­˜åœ¨
-ã‚’æ•™ãˆã¦ã‚ã’ã¦ãã ã•ã„.ã§ãªã„ã¨GCã§ãƒˆãƒ©ãƒ–ルを起ã“ã—ã¾ã™ï¼Ž
+Ruby 1.1¤«¤é¤ÏǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¥À¥¤¥Ê¥ß¥Ã¥¯¥é¥¤¥Ö¥é¥ê¤òºî
+¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡¥Ruby¤ËÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë¾ì¹ç¤Ë
+¤ÏRuby¤òŸ³«¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¡¤ext¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Ë³ÈÄ¥
+¥é¥¤¥Ö¥é¥êÍѤΥǥ£¥ì¥¯¥È¥ê¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥Ì¾Á°¤ÏŬÅö¤Ë
+Áª¤ó¤Ç¹½¤¤¤Þ¤»¤ó¡¥
+
+(2) À߷פ¹¤ë
+
+¤Þ¤¢¡¤ÅöÁ³¤Ê¤ó¤Ç¤¹¤±¤É¡¤¤É¤¦¤¤¤¦µ¡Ç½¤ò¼Â¸½¤¹¤ë¤«¤É¤¦¤«¤Þ¤ºÀß
+·×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥¤É¤ó¤Ê¥¯¥é¥¹¤ò¤Ä¤¯¤ë¤«¡¤¤½¤Î¥¯¥é¥¹¤Ë¤Ï
+¤É¤ó¤Ê¥á¥½¥Ã¥É¤¬¤¢¤ë¤«¡¤¥¯¥é¥¹¤¬Ä󶡤¹¤ëÄê¿ô¤Ê¤É¤Ë¤Ä¤¤¤ÆÀß·×
+¤·¤Þ¤¹¡¥
+
+(3) C¥³¡¼¥É¤ò½ñ¤¯
+
+³ÈÄ¥¥é¥¤¥Ö¥é¥êËÜÂΤȤʤëC¸À¸ì¤Î¥½¡¼¥¹¤ò½ñ¤­¤Þ¤¹¡¥C¸À¸ì¤Î¥½¡¼
+¥¹¤¬¤Ò¤È¤Ä¤Î»þ¤Ë¤Ï¡Ö¥é¥¤¥Ö¥é¥ê̾.c¡×¤òÁª¤Ö¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡¥C
+¸À¸ì¤Î¥½¡¼¥¹¤¬Ê£¿ô¤Î¾ì¹ç¤Ë¤ÏµÕ¤Ë¡Ö¥é¥¤¥Ö¥é¥ê̾.c¡×¤È¤¤¤¦¥Õ¥¡
+¥¤¥ë̾¤ÏÈò¤±¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤È¥â¥¸¥å¡¼
+¥ëÀ¸À®»þ¤ËÃæ´ÖŪ¤ËÀ¸À®¤µ¤ì¤ë¡Ö¥é¥¤¥Ö¥é¥ê̾.o¡×¤È¤¤¤¦¥Õ¥¡¥¤¥ë
+¤È¤¬¾×ÆÍ¤¹¤ë¤«¤é¤Ç¤¹¡¥
+
+Ruby¤Ï³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤¹¤ë»þ¤Ë¡ÖInit_¥é¥¤¥Ö¥é¥ê̾¡×¤È
+¤¤¤¦´Ø¿ô¤ò¼«Æ°Åª¤Ë¼Â¹Ô¤·¤Þ¤¹¡¥dbm¥é¥¤¥Ö¥é¥ê¤Î¾ì¹ç¡ÖInit_dbm¡×
+¤Ç¤¹¡¥¤³¤Î´Ø¿ô¤ÎÃæ¤Ç¥¯¥é¥¹¡¤¥â¥¸¥å¡¼¥ë¡¤¥á¥½¥Ã¥É¡¤Äê¿ô¤Ê¤É¤Î
+ÄêµÁ¤ò¹Ô¤¤¤Þ¤¹¡¥dbm.c¤«¤é°ìÉô°úÍѤ·¤Þ¤¹¡¥
+
+--
+void
+Init_dbm(void)
+{
+ /* DBM¥¯¥é¥¹¤òÄêµÁ¤¹¤ë */
+ cDBM = rb_define_class("DBM", rb_cObject);
+ /* DBM¤ÏEnumerate¥â¥¸¥å¡¼¥ë¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë */
+ rb_include_module(cDBM, rb_mEnumerable);
+
+ /* DBM¥¯¥é¥¹¤Î¥¯¥é¥¹¥á¥½¥Ã¥Éopen(): °ú¿ô¤ÏC¤ÎÇÛÎó¤Ç¼õ¤±¤ë */
+ rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+ /* DBM¥¯¥é¥¹¤Î¥á¥½¥Ã¥Éclose(): °ú¿ô¤Ï¤Ê¤· */
+ rb_define_method(cDBM, "close", fdbm_close, 0);
+ /* DBM¥¯¥é¥¹¤Î¥á¥½¥Ã¥É[]: °ú¿ô¤Ï1¸Ä */
+ rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+ :
+
+ /* DBM¥Ç¡¼¥¿¤ò³ÊǼ¤¹¤ë¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô̾¤Î¤¿¤á¤ÎID */
+ id_dbm = rb_intern("dbm");
+}
+--
+
+DBM¥é¥¤¥Ö¥é¥ê¤Ïdbm¤Î¥Ç¡¼¥¿¤ÈÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤Ê¤ë¤Ï¤º¤Ç
+¤¹¤«¤é¡¤C¤ÎÀ¤³¦¤Îdbm¤òRuby¤ÎÀ¤³¦¤Ë¼è¤ê¹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
+
+
+dbm.c¤Ç¤ÏData_Make_Struct¤ò°Ê²¼¤Î¤è¤¦¤Ë»È¤Ã¤Æ¤¤¤Þ¤¹¡¥
+
+--
+struct dbmdata {
+ int di_size;
+ DBM *di_dbm;
+};
+
+
+obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+--
+
+¤³¤³¤Ç¤Ïdbmstruct¹½Â¤ÂΤؤΥݥ¤¥ó¥¿¤òData¤Ë¥«¥×¥»¥ë²½¤·¤Æ¤¤
+¤Þ¤¹¡¥DBM*¤òľÀÜ¥«¥×¥»¥ë²½¤·¤Ê¤¤¤Î¤Ïclose()¤·¤¿»þ¤Î½èÍý¤ò¹Í
+¤¨¤Æ¤Î¤³¤È¤Ç¤¹¡¥
+
+Data¥ª¥Ö¥¸¥§¥¯¥È¤«¤édbmstruct¹½Â¤ÂΤΥݥ¤¥ó¥¿¤ò¼è¤ê½Ð¤¹¤¿¤á
+¤Ë°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡¥
+
+--
+#define GetDBM(obj, dbmp) {\
+ Data_Get_Struct(obj, struct dbmdata, dbmp);\
+ if (dbmp->di_dbm == 0) closed_dbm();\
+}
+--
+
+¤Á¤ç¤Ã¤ÈÊ£»¨¤Ê¥Þ¥¯¥í¤Ç¤¹¤¬¡¤Íפ¹¤ë¤Ëdbmdata¹½Â¤ÂΤΥݥ¤¥ó¥¿
+¤Î¼è¤ê½Ð¤·¤È¡¤close¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Î¥Á¥§¥Ã¥¯¤ò¤Þ¤È¤á¤Æ¤¤
+¤ë¤À¤±¤Ç¤¹¡¥
+
+DBM¥¯¥é¥¹¤Ë¤Ï¤¿¤¯¤µ¤ó¥á¥½¥Ã¥É¤¬¤¢¤ê¤Þ¤¹¤¬¡¤Ê¬Îह¤ë¤È3¼ïÎà¤Î
+°ú¿ô¤Î¼õ¤±Êý¤¬¤¢¤ê¤Þ¤¹¡¥¤Ò¤È¤Ä¤Ï°ú¿ô¤Î¿ô¤¬¸ÇÄê¤Î¤â¤Î¤Ç¡¤Îã¤È
+¤·¤Æ¤Ïdelete¥á¥½¥Ã¥É¤¬¤¢¤ê¤Þ¤¹¡¥delete¥á¥½¥Ã¥É¤ò¼ÂÁõ¤·¤Æ¤¤¤ë
+fdbm_delete()¤Ï¤³¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
+
+--
+static VALUE
+fdbm_delete(VALUE obj, VALUE keystr)
+{
+ :
+}
+--
+
+°ú¿ô¤Î¿ô¤¬¸ÇÄê¤Î¥¿¥¤¥×¤ÏÂè1°ú¿ô¤¬self¡¤Âè2°ú¿ô°Ê¹ß¤¬¥á¥½¥Ã¥É
+¤Î°ú¿ô¤È¤Ê¤ê¤Þ¤¹¡¥
+
+°ú¿ô¤Î¿ô¤¬ÉÔÄê¤Î¤â¤Î¤ÏC¤ÎÇÛÎó¤Ç¼õ¤±¤ë¤â¤Î¤ÈRuby¤ÎÇÛÎó¤Ç¼õ¤±
+¤ë¤â¤Î¤È¤¬¤¢¤ê¤Þ¤¹¡¥dbm¥é¥¤¥Ö¥é¥ê¤ÎÃæ¤Ç¡¤C¤ÎÇÛÎó¤Ç¼õ¤±¤ë¤â¤Î
+¤ÏDBM¤Î¥¯¥é¥¹¥á¥½¥Ã¥É¤Ç¤¢¤ëopen()¤Ç¤¹¡¥¤³¤ì¤ò¼ÂÁõ¤·¤Æ¤¤¤ë´Ø
+¿ôfdbm_s_open()¤Ï¤³¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
+
+--
+static VALUE
+fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+{
+ :
+ if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+ mode = 0666; /* default value */
+ }
+ :
+}
+--
+
+¤³¤Î¥¿¥¤¥×¤Î´Ø¿ô¤ÏÂè1°ú¿ô¤¬Í¿¤¨¤é¤ì¤¿°ú¿ô¤Î¿ô¡¤Âè2°ú¿ô¤¬Í¿¤¨
+¤é¤ì¤¿°ú¿ô¤ÎÆþ¤Ã¤Æ¤¤¤ëÇÛÎó¤Ë¤Ê¤ê¤Þ¤¹¡¥self¤ÏÂè3°ú¿ô¤È¤·¤ÆÍ¿
+¤¨¤é¤ì¤Þ¤¹¡¥
+
+¤³¤ÎÇÛÎó¤ÇÍ¿¤¨¤é¤ì¤¿°ú¿ô¤ò²òÀϤ¹¤ë¤¿¤á¤Î´Ø¿ô¤¬open()¤Ç¤â»È¤ï
+¤ì¤Æ¤¤¤ërb_scan_args()¤Ç¤¹¡¥Âè3°ú¿ô¤Ë»ØÄꤷ¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë½¾
+¤¤¡¤Âè4ÊÑ¿ô°Ê¹ß¤Ë»ØÄꤷ¤¿VALUE¤Ø¤Î»²¾È¤ËÃͤòÂåÆþ¤·¤Æ¤¯¤ì¤Þ
+¤¹¡¥
+
+
+°ú¿ô¤òRuby¤ÎÇÛÎó¤È¤·¤Æ¼õ¤±¼è¤ë¥á¥½¥Ã¥É¤ÎÎã¤Ë¤Ï
+Thread#initialize¤¬¤¢¤ê¤Þ¤¹¡¥¼ÂÁõ¤Ï¤³¤¦¤Ç¤¹¡¥
+
+--
+static VALUE
+thread_initialize(VALUE thread, VALUE args)
+{
+ :
+}
+--
+
+Âè1°ú¿ô¤Ïself¡¤Âè2°ú¿ô¤ÏRuby¤ÎÇÛÎó¤Ç¤¹¡¥
+
+** Ãí°Õ»ö¹à
+
+Ruby¤È¶¦Í­¤Ï¤·¤Ê¤¤¤¬Ruby¤Î¥ª¥Ö¥¸¥§¥¯¥È¤ò³ÊǼ¤¹¤ë²ÄǽÀ­¤Î¤¢¤ë
+C¤ÎÂç°èÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤Ã¤ÆRuby¥¤¥ó¥¿¥×¥ê¥¿¤ËÊÑ¿ô¤Î¸ºß
+¤ò¶µ¤¨¤Æ¤¢¤²¤Æ¤¯¤À¤µ¤¤¡¥¤Ç¤Ê¤¤¤ÈGC¤Ç¥È¥é¥Ö¥ë¤òµ¯¤³¤·¤Þ¤¹¡¥
void rb_global_variable(VALUE *var)
-== extconf.rbを用æ„ã™ã‚‹
+(4) extconf.rb¤òÍѰդ¹¤ë
-Makefileを作る場åˆã®é››åž‹ã«ãªã‚‹extconf.rbã¨ã„ã†ãƒ•ァイルを作り
-ã¾ã™ï¼Žextconf.rbã¯ãƒ©ã‚¤ãƒ–ラリã®ã‚³ãƒ³ãƒ‘イルã«å¿…è¦ãªæ¡ä»¶ã®ãƒã‚§ãƒƒ
-クãªã©ã‚’行ã†ã“ã¨ãŒç›®çš„ã§ã™ï¼Žã¾ãšï¼Œ
+Makefile¤òºî¤ë¾ì¹ç¤Î¿÷·¿¤Ë¤Ê¤ëextconf.rb¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºî¤ê
+¤Þ¤¹¡¥extconf.rb¤Ï¥é¥¤¥Ö¥é¥ê¤Î¥³¥ó¥Ñ¥¤¥ë¤ËɬÍפʾò·ï¤Î¥Á¥§¥Ã
+¥¯¤Ê¤É¤ò¹Ô¤¦¤³¤È¤¬ÌÜŪ¤Ç¤¹¡¥¤Þ¤º¡¤
require 'mkmf'
-ã‚’extconf.rbã®å…ˆé ­ã«ç½®ãã¾ã™ï¼Žextconf.rbã®ä¸­ã§ã¯ä»¥ä¸‹ã®Rubyé–¢
-数を使ã†ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Ž
+¤òextconf.rb¤ÎÀèÆ¬¤ËÃÖ¤­¤Þ¤¹¡¥extconf.rb¤ÎÃæ¤Ç¤Ï°Ê²¼¤ÎRuby´Ø
+¿ô¤ò»È¤¦¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥
- have_library(lib, func): ライブラリã®å­˜åœ¨ãƒã‚§ãƒƒã‚¯
- have_func(func, header): 関数ã®å­˜åœ¨ãƒã‚§ãƒƒã‚¯
- have_header(header): ヘッダファイルã®å­˜åœ¨ãƒã‚§ãƒƒã‚¯
- create_makefile(target[, target_prefix]): Makefileã®ç”Ÿæˆ
+ have_library(lib, func): ¥é¥¤¥Ö¥é¥ê¤Î¸ºß¥Á¥§¥Ã¥¯
+ have_func(func, header): ´Ø¿ô¤Î¸ºß¥Á¥§¥Ã¥¯
+ have_header(header): ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Î¸ºß¥Á¥§¥Ã¥¯
+ create_makefile(target): Makefile¤ÎÀ¸À®
-以下ã®å¤‰æ•°ã‚’使ã†ã“ã¨ãŒã§ãã¾ã™ï¼Ž
+°Ê²¼¤ÎÊÑ¿ô¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
- $CFLAGS: コンパイル時ã«è¿½åŠ çš„ã«æŒ‡å®šã™ã‚‹ãƒ•ラグ(-Oãªã©)
- $CPPFLAGS: プリプロセッサã«è¿½åŠ çš„ã«æŒ‡å®šã™ã‚‹ãƒ•ラグ(-Iã‚„-Dãªã©)
- $LDFLAGS: リンク時ã«è¿½åŠ çš„ã«æŒ‡å®šã™ã‚‹ãƒ•ラグ(-Lãªã©)
- $objs: リンクã•れるオブジェクトファイルåã®ãƒªã‚¹ãƒˆ
+ $CFLAGS: ¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-O¤Ê¤É)
+ $CPPFLAGS: ¥×¥ê¥×¥í¥»¥Ã¥µ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-I¤ä-D¤Ê¤É)
+ $LDFLAGS: ¥ê¥ó¥¯»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-L¤Ê¤É)
+ $objs: ¥ê¥ó¥¯¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È
-オブジェクトファイルã®ãƒªã‚¹ãƒˆã¯ï¼Œé€šå¸¸ã¯ã‚½ãƒ¼ã‚¹ãƒ•ァイルを検索ã—
-ã¦è‡ªå‹•çš„ã«ç”Ÿæˆã•れã¾ã™ãŒï¼Œmakeã®é€”中ã§ã‚½ãƒ¼ã‚¹ã‚’生æˆã™ã‚‹ã‚ˆã†ãª
-å ´åˆã¯æ˜Žç¤ºçš„ã«æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚りã¾ã™ï¼Ž
+¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤Ï¡¤Ä̾ï¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·
+¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤¹¤¬¡¤make¤ÎÅÓÃæ¤Ç¥½¡¼¥¹¤òÀ¸À®¤¹¤ë¤è¤¦¤Ê
+¾ì¹ç¤ÏÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-ライブラリをコンパイルã™ã‚‹æ¡ä»¶ãŒæƒã‚ãšï¼Œãã®ãƒ©ã‚¤ãƒ–ラリをコン
-パイルã—ãªã„時ã«ã¯create_makefileを呼ã°ãªã‘れã°Makefileã¯ç”Ÿ
-æˆã•れãšï¼Œã‚³ãƒ³ãƒ‘イルも行ã‚れã¾ã›ã‚“.
+¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ò·ï¤¬Â·¤ï¤º¡¤¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó
+¥Ñ¥¤¥ë¤·¤Ê¤¤»þ¤Ë¤Ïcreate_makefile¤ò¸Æ¤Ð¤Ê¤±¤ì¤ÐMakefile¤ÏÀ¸
+À®¤µ¤ì¤º¡¤¥³¥ó¥Ñ¥¤¥ë¤â¹Ô¤ï¤ì¤Þ¤»¤ó¡¥
-== dependを用æ„ã™ã‚‹
+(5) depend¤òÍѰդ¹¤ë
-ã‚‚ã—,ディレクトリã«dependã¨ã„ã†ãƒ•ァイルãŒå­˜åœ¨ã™ã‚Œã°ï¼Œ
-MakefileãŒä¾å­˜é–¢ä¿‚ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãれã¾ã™ï¼Ž
+¤â¤·¡¤¥Ç¥£¥ì¥¯¥È¥ê¤Ëdepend¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ì¤Ð¡¤
+Makefile¤¬°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤ì¤Þ¤¹¡¥
% gcc -MM *.c > depend
-ãªã©ã§ä½œã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Žã‚ã£ã¦æã¯ç„¡ã„ã§ã—ょã†ï¼Ž
+¤Ê¤É¤Çºî¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤¢¤Ã¤ÆÂ»¤Ï̵¤¤¤Ç¤·¤ç¤¦¡¥
-== Makefileを生æˆã™ã‚‹
+(6) Makefile¤òÀ¸À®¤¹¤ë
-Makefileを実際ã«ç”Ÿæˆã™ã‚‹ãŸã‚ã«ã¯
+Makefile¤ò¼ÂºÝ¤ËÀ¸À®¤¹¤ë¤¿¤á¤Ë¤Ï
ruby extconf.rb
-ã¨ã—ã¾ã™ï¼Žextconf.rbã« require 'mkmf' ã®è¡ŒãŒãªã„å ´åˆã«ã¯ã‚¨ãƒ©ãƒ¼
-ã«ãªã‚Šã¾ã™ã®ã§ï¼Œå¼•数を追加ã—ã¦
+¤È¤·¤Þ¤¹¡¥extconf.rb¤Ë require 'mkmf' ¤Î¹Ô¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¥¨¥é¡¼
+¤Ë¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¤°ú¿ô¤òÄɲä·¤Æ
ruby -r mkmf extconf.rb
-ã¨ã—ã¦ãã ã•ã„.
+¤È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-site_ruby ディレクトリã§ãªã,
-vendor_ruby ディレクトリã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã«ã¯
-以下ã®ã‚ˆã†ã« --vendor オプションを加ãˆã¦ãã ã•ã„.
+site_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¯¡¤
+vendor_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï
+°Ê²¼¤Î¤è¤¦¤Ë --vendor ¥ª¥×¥·¥ç¥ó¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡¥
ruby extconf.rb --vendor
-ディレクトリをext以下ã«ç”¨æ„ã—ãŸå ´åˆã«ã¯Ruby全体ã®makeã®æ™‚ã«
-自動的ã«MakefileãŒç”Ÿæˆã•れã¾ã™ã®ã§ï¼Œã“ã®ã‚¹ãƒ†ãƒƒãƒ—ã¯ä¸è¦ã§ã™ï¼Ž
+¥Ç¥£¥ì¥¯¥È¥ê¤òext°Ê²¼¤ËÍѰդ·¤¿¾ì¹ç¤Ë¤ÏRubyÁ´ÂΤÎmake¤Î»þ¤Ë
+¼«Æ°Åª¤ËMakefile¤¬À¸À®¤µ¤ì¤Þ¤¹¤Î¤Ç¡¤¤³¤Î¥¹¥Æ¥Ã¥×¤ÏÉÔÍפǤ¹¡¥
-== makeã™ã‚‹
+(7) make¤¹¤ë
-動的リンクライブラリを生æˆã™ã‚‹å ´åˆã«ã¯ãã®å ´ã§makeã—ã¦ãã ã•
-ã„.必è¦ã§ã‚れ㰠make install ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•れã¾ã™ï¼Ž
+ưŪ¥ê¥ó¥¯¥é¥¤¥Ö¥é¥ê¤òÀ¸À®¤¹¤ë¾ì¹ç¤Ë¤Ï¤½¤Î¾ì¤Çmake¤·¤Æ¤¯¤À¤µ
+¤¤¡¥É¬ÍפǤ¢¤ì¤Ð make install ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡¥
-ext以下ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’用æ„ã—ãŸå ´åˆã¯ï¼ŒRubyã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§
-makeを実行ã™ã‚‹ã¨Makefileを生æˆã‹ã‚‰make,必è¦ã«ã‚ˆã£ã¦ã¯ãã®ãƒ¢
-ジュールã®Rubyã¸ã®ãƒªãƒ³ã‚¯ã¾ã§è‡ªå‹•çš„ã«å®Ÿè¡Œã—ã¦ãれã¾ã™ï¼Ž
-extconf.rbã‚’æ›¸ãæ›ãˆã‚‹ãªã©ã—ã¦Makefileã®å†ç”ŸæˆãŒå¿…è¦ãªæ™‚ã¯ã¾
-ãŸRubyディレクトリã§makeã—ã¦ãã ã•ã„.
+ext°Ê²¼¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤òÍѰդ·¤¿¾ì¹ç¤Ï¡¤Ruby¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç
+make¤ò¼Â¹Ô¤¹¤ë¤ÈMakefile¤òÀ¸À®¤«¤émake¡¤É¬Íפˤè¤Ã¤Æ¤Ï¤½¤Î¥â
+¥¸¥å¡¼¥ë¤ÎRuby¤Ø¤Î¥ê¥ó¥¯¤Þ¤Ç¼«Æ°Åª¤Ë¼Â¹Ô¤·¤Æ¤¯¤ì¤Þ¤¹¡¥
+extconf.rb¤ò½ñ¤­´¹¤¨¤ë¤Ê¤É¤·¤ÆMakefile¤ÎºÆÀ¸À®¤¬É¬Íפʻþ¤Ï¤Þ
+¤¿Ruby¥Ç¥£¥ì¥¯¥È¥ê¤Çmake¤·¤Æ¤¯¤À¤µ¤¤¡¥
-拡張ライブラリã¯make installã§Rubyライブラリã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®
-下ã«ã‚³ãƒ”ーã•れã¾ã™ï¼Žã‚‚ã—æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã¨å”調ã—ã¦ä½¿ã†Rubyã§è¨˜
-è¿°ã•れãŸãƒ—ログラムãŒã‚り,Rubyライブラリã«ç½®ããŸã„å ´åˆã«ã¯ï¼Œ
-拡張ライブラリ用ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ä¸‹ã« lib ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª
-を作り,ãã“ã« æ‹¡å¼µå­ .rb ã®ãƒ•ァイルを置ã„ã¦ãŠã‘ã°åŒæ™‚ã«ã‚¤ãƒ³
-ストールã•れã¾ã™ï¼Ž
+³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ïmake install¤ÇRuby¥é¥¤¥Ö¥é¥ê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î
+²¼¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡¥¤â¤·³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤È¶¨Ä´¤·¤Æ»È¤¦Ruby¤Çµ­
+½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¤Ruby¥é¥¤¥Ö¥é¥ê¤ËÃÖ¤­¤¿¤¤¾ì¹ç¤Ë¤Ï¡¤
+³ÈÄ¥¥é¥¤¥Ö¥é¥êÍѤΥǥ£¥ì¥¯¥È¥ê¤Î²¼¤Ë lib ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê
+¤òºî¤ê¡¤¤½¤³¤Ë ³ÈÄ¥»Ò .rb ¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤±¤ÐƱ»þ¤Ë¥¤¥ó
+¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡¥
-== デãƒãƒƒã‚°
+(8) ¥Ç¥Ð¥Ã¥°
-ã¾ã‚,デãƒãƒƒã‚°ã—ãªã„ã¨å‹•ã‹ãªã„ã§ã—ょã†ã­ï¼Žext/Setupã«ãƒ‡ã‚£ãƒ¬
-クトリåを書ãã¨é™çš„ã«ãƒªãƒ³ã‚¯ã™ã‚‹ã®ã§ãƒ‡ãƒãƒƒã‚¬ãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãª
-りã¾ã™ï¼Žãã®åˆ†ã‚³ãƒ³ãƒ‘イルãŒé…ããªã‚Šã¾ã™ã‘ã©ï¼Ž
+¤Þ¤¢¡¤¥Ç¥Ð¥Ã¥°¤·¤Ê¤¤¤Èư¤«¤Ê¤¤¤Ç¤·¤ç¤¦¤Í¡¥ext/Setup¤Ë¥Ç¥£¥ì
+¥¯¥È¥ê̾¤ò½ñ¤¯¤ÈÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë¤Î¤Ç¥Ç¥Ð¥Ã¥¬¤¬»È¤¨¤ë¤è¤¦¤Ë¤Ê
+¤ê¤Þ¤¹¡¥¤½¤Îʬ¥³¥ó¥Ñ¥¤¥ë¤¬ÃÙ¤¯¤Ê¤ê¤Þ¤¹¤±¤É¡¥
-== ã§ãã‚ãŒã‚Š
+(9) ¤Ç¤­¤¢¤¬¤ê
-後ã¯ã“ã£ãり使ã†ãªã‚Šï¼Œåºƒã公開ã™ã‚‹ãªã‚Šï¼Œå£²ã‚‹ãªã‚Šï¼Œã”自由ã«ãŠ
-使ã„ãã ã•ã„.Rubyã®ä½œè€…ã¯æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã«é–¢ã—ã¦ä¸€åˆ‡ã®æ¨©åˆ©ã‚’
-主張ã—ã¾ã›ã‚“.
+¸å¤Ï¤³¤Ã¤½¤ê»È¤¦¤Ê¤ê¡¤¹­¤¯¸ø³«¤¹¤ë¤Ê¤ê¡¤Çä¤ë¤Ê¤ê¡¤¤´¼«Í³¤Ë¤ª
+»È¤¤¤¯¤À¤µ¤¤¡¥Ruby¤Îºî¼Ô¤Ï³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë´Ø¤·¤Æ°ìÀڤθ¢Íø¤ò
+¼çÄ¥¤·¤Þ¤»¤ó¡¥
-= Appendix A. Rubyã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã®åˆ†é¡ž
+Appendix A. Ruby¤Î¥½¡¼¥¹¥³¡¼¥É¤ÎʬÎà
-Rubyã®ã‚½ãƒ¼ã‚¹ã¯ã„ãã¤ã‹ã«åˆ†é¡žã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Žã“ã®ã†ã¡ã‚¯ãƒ©
-スライブラリã®éƒ¨åˆ†ã¯åŸºæœ¬çš„ã«æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã¨åŒã˜ä½œã‚Šæ–¹ã«ãªã£
-ã¦ã„ã¾ã™ï¼Žã“れらã®ã‚½ãƒ¼ã‚¹ã¯ä»Šã¾ã§ã®èª¬æ˜Žã§ã»ã¨ã‚“ã©ç†è§£ã§ãã‚‹ã¨
-æ€ã„ã¾ã™ï¼Ž
+Ruby¤Î¥½¡¼¥¹¤Ï¤¤¤¯¤Ä¤«¤ËʬÎह¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤³¤Î¤¦¤Á¥¯¥é
+¥¹¥é¥¤¥Ö¥é¥ê¤ÎÉôʬ¤Ï´ðËÜŪ¤Ë³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ÈƱ¤¸ºî¤êÊý¤Ë¤Ê¤Ã
+¤Æ¤¤¤Þ¤¹¡¥¤³¤ì¤é¤Î¥½¡¼¥¹¤Ïº£¤Þ¤Ç¤ÎÀâÌÀ¤Ç¤Û¤È¤ó¤ÉÍý²ò¤Ç¤­¤ë¤È
+»×¤¤¤Þ¤¹¡¥
-== Ruby言語ã®ã‚³ã‚¢
+Ruby¸À¸ì¤Î¥³¥¢
-class.c :: クラスã¨ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«
-error.c :: 例外クラスã¨ä¾‹å¤–機構
-gc.c :: 記憶領域管ç†
-load.c :: ライブラリã®ãƒ­ãƒ¼ãƒ‰
-object.c :: オブジェクト
-variable.c :: 変数ã¨å®šæ•°
+ class.c : ¥¯¥é¥¹¤È¥â¥¸¥å¡¼¥ë
+ error.c : Îã³°¥¯¥é¥¹¤ÈÎã³°µ¡¹½
+ gc.c : µ­²±Îΰè´ÉÍý
+ load.c : ¥é¥¤¥Ö¥é¥ê¤Î¥í¡¼¥É
+ object.c : ¥ª¥Ö¥¸¥§¥¯¥È
+ variable.c : ÊÑ¿ô¤ÈÄê¿ô
-== Rubyã®æ§‹æ–‡è§£æžå™¨
+Ruby¤Î¹½Ê¸²òÀÏ´ï
+ parse.y : »ú¶ç²òÀÏ´ï¤È¹½Ê¸ÄêµÁ
+ -> parse.c : ¼«Æ°À¸À®
+ keywords : ͽÌó¸ì
+ -> lex.c : ¼«Æ°À¸À®
- parse.y : å­—å¥è§£æžå™¨ã¨æ§‹æ–‡å®šç¾©
- -> parse.c : 自動生æˆ
- keywords : 予約語
- -> lex.c : 自動生æˆ
-
-== Rubyã®è©•価器 (通称YARV)
+Ruby¤Îɾ²Á´ï (Ä̾ÎYARV)
compile.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 : åŒä¸Š
+ insns.def : ²¾ÁÛµ¡³£¸ì¤ÎÄêµÁ
+ iseq.c : VM::ISeq¤Î¼ÂÁõ
+ thread.c : ¥¹¥ì¥Ã¥É´ÉÍý¤È¥³¥ó¥Æ¥­¥¹¥ÈÀÚ¤êÂØ¤¨
+ thread_win32.c : ¥¹¥ì¥Ã¥É¼ÂÁõ
+ thread_pthread.c : Ʊ¾å
vm.c
vm_dump.c
vm_eval.c
@@ -954,15 +924,14 @@ variable.c :: 変数ã¨å®šæ•°
vm_insnhelper.c
vm_method.c
- opt_insns_unif.def : 命令èžåˆ
- opt_operand.def : 最é©åŒ–ã®ãŸã‚ã®å®šç¾©
-
- -> insn*.inc : 自動生æˆ
- -> opt*.inc : 自動生æˆ
- -> vm.inc : 自動生æˆ
+ opt_insns_unif.def : Ì¿ÎáÍ»¹ç
+ opt_operand.def : ºÇŬ²½¤Î¤¿¤á¤ÎÄêµÁ
-== æ­£è¦è¡¨ç¾ã‚¨ãƒ³ã‚¸ãƒ³ (鬼車)
+ -> insn*.inc : ¼«Æ°À¸À®
+ -> opt*.inc : ¼«Æ°À¸À®
+ -> vm.inc : ¼«Æ°À¸À®
+Àµµ¬É½¸½¥¨¥ó¥¸¥ó (µ´¼Ö)
regex.c
regcomp.c
regenc.c
@@ -971,15 +940,15 @@ variable.c :: 変数ã¨å®šæ•°
regparse.c
regsyntax.c
-== ユーティリティ関数
+¥æ¡¼¥Æ¥£¥ê¥Æ¥£´Ø¿ô
-debug.c :: Cデãƒãƒƒã‚¬ç”¨ã®ãƒ‡ãƒãƒƒã‚°ã‚·ãƒ³ãƒœãƒ«
-dln.c :: 動的ローディング
-st.c :: 汎用ãƒãƒƒã‚·ãƒ¥è¡¨
-strftime.c :: 時刻整形
-util.c :: ãã®ä»–ã®ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£
+ debug.c : C¥Ç¥Ð¥Ã¥¬ÍѤΥǥХå°¥·¥ó¥Ü¥ë
+ dln.c : ưŪ¥í¡¼¥Ç¥£¥ó¥°
+ st.c : ÈÆÍѥϥå·¥åɽ
+ strftime.c : »þ¹ïÀ°·Á
+ util.c : ¤½¤Î¾¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£
-== Rubyコマンドã®å®Ÿè£…
+Ruby¥³¥Þ¥ó¥É¤Î¼ÂÁõ
dmyext.c
dmydln.c
@@ -993,600 +962,577 @@ util.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#sprintf
-string.c :: String
-struct.c :: Struct
-time.c :: Time
-defs/known_errors.def :: 例外クラス Errno::*
--> known_errors.inc :: 自動生æˆ
-
-== 多言語化
-
-encoding.c :: Encoding
-transcode.c :: Encoding::Converter
-enc/*.c :: エンコーディングクラス群
-enc/trans/* :: コードãƒã‚¤ãƒ³ãƒˆå¯¾å¿œè¡¨
-
-== gorubyコマンドã®å®Ÿè£…
-
+¥¯¥é¥¹¥é¥¤¥Ö¥é¥ê
+
+ 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 : 自動生æˆ
+ golf_prelude.rb : goruby¸ÇÍ­¤Î¥é¥¤¥Ö¥é¥ê
+ -> golf_prelude.c : ¼«Æ°À¸À®
-= Appendix B. 拡張用関数リファレンス
-C言語ã‹ã‚‰Rubyã®æ©Ÿèƒ½ã‚’利用ã™ã‚‹APIã¯ä»¥ä¸‹ã®é€šã‚Šã§ã‚る.
+Appendix B. ³ÈÄ¥ÍÑ´Ø¿ô¥ê¥Õ¥¡¥ì¥ó¥¹
-== åž‹
+C¸À¸ì¤«¤éRuby¤Îµ¡Ç½¤òÍøÍѤ¹¤ëAPI¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¢¤ë¡¥
-VALUE ::
+** ·¿
- Rubyオブジェクトを表ç¾ã™ã‚‹åž‹ï¼Žå¿…è¦ã«å¿œã˜ã¦ã‚­ãƒ£ã‚¹ãƒˆã—ã¦ç”¨ã„る.
- 組ã¿è¾¼ã¿åž‹ã‚’表ç¾ã™ã‚‹Cã®åž‹ã¯ruby.hã«è¨˜è¿°ã—ã¦ã‚ã‚‹Rã§å§‹ã¾ã‚‹æ§‹é€ 
- 体ã§ã‚る.VALUE型をã“れらã«ã‚­ãƒ£ã‚¹ãƒˆã™ã‚‹ãŸã‚ã«Rã§å§‹ã¾ã‚‹æ§‹é€ ä½“
- åã‚’å…¨ã¦å¤§æ–‡å­—ã«ã—ãŸåå‰ã®ãƒžã‚¯ãƒ­ãŒç”¨æ„ã•れã¦ã„る.
+VALUE
-== 変数・定数
+ Ruby¥ª¥Ö¥¸¥§¥¯¥È¤òɽ¸½¤¹¤ë·¿¡¥É¬Íפ˱þ¤¸¤Æ¥­¥ã¥¹¥È¤·¤ÆÍѤ¤¤ë¡¥
+ ÁȤ߹þ¤ß·¿¤òɽ¸½¤¹¤ëC¤Î·¿¤Ïruby.h¤Ëµ­½Ò¤·¤Æ¤¢¤ëR¤Ç»Ï¤Þ¤ë¹½Â¤
+ ÂΤǤ¢¤ë¡¥VALUE·¿¤ò¤³¤ì¤é¤Ë¥­¥ã¥¹¥È¤¹¤ë¤¿¤á¤ËR¤Ç»Ï¤Þ¤ë¹½Â¤ÂÎ
+ ̾¤òÁ´¤ÆÂçʸ»ú¤Ë¤·¤¿Ì¾Á°¤Î¥Þ¥¯¥í¤¬ÍѰդµ¤ì¤Æ¤¤¤ë¡¥
-Qnil ::
+** ÊÑ¿ô¡¦Äê¿ô
- 定数: nilオブジェクト
+Qnil
-Qtrue ::
+ Äê¿ô: nil¥ª¥Ö¥¸¥§¥¯¥È
- 定数: trueオブジェクト(真ã®ãƒ‡ãƒ•ォルト値)
+Qtrue
-Qfalse ::
+ Äê¿ô: true¥ª¥Ö¥¸¥§¥¯¥È(¿¿¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ)
- 定数: falseオブジェクト
+Qfalse
-== Cデータã®ã‚«ãƒ—セル化
+ Äê¿ô: false¥ª¥Ö¥¸¥§¥¯¥È
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
+** C¥Ç¡¼¥¿¤Î¥«¥×¥»¥ë²½
- Cã®ä»»æ„ã®ãƒã‚¤ãƒ³ã‚¿ã‚’カプセル化ã—ãŸRubyオブジェクトを返ã™ï¼Žã“
- ã®ãƒã‚¤ãƒ³ã‚¿ãŒRubyã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã•れãªããªã£ãŸæ™‚,freeã§æŒ‡å®šã—ãŸ
- 関数ãŒå‘¼ã°ã‚Œã‚‹ï¼Žã¾ãŸï¼Œã“ã®ãƒã‚¤ãƒ³ã‚¿ã®æŒ‡ã™ãƒ‡ãƒ¼ã‚¿ãŒä»–ã®Rubyオブ
- ジェクトを指ã—ã¦ã„ã‚‹å ´åˆï¼Œmarkã«æŒ‡å®šã™ã‚‹é–¢æ•°ã§ãƒžãƒ¼ã‚¯ã™ã‚‹å¿…è¦
- ãŒã‚る.
+Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
-Data_Make_Struct(klass, type, mark, free, sval) ::
+ C¤ÎǤ°Õ¤Î¥Ý¥¤¥ó¥¿¤ò¥«¥×¥»¥ë²½¤·¤¿Ruby¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤¹¡¥¤³
+ ¤Î¥Ý¥¤¥ó¥¿¤¬Ruby¤«¤é¥¢¥¯¥»¥¹¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿»þ¡¤free¤Ç»ØÄꤷ¤¿
+ ´Ø¿ô¤¬¸Æ¤Ð¤ì¤ë¡¥¤Þ¤¿¡¤¤³¤Î¥Ý¥¤¥ó¥¿¤Î»Ø¤¹¥Ç¡¼¥¿¤¬Â¾¤ÎRuby¥ª¥Ö
+ ¥¸¥§¥¯¥È¤ò»Ø¤·¤Æ¤¤¤ë¾ì¹ç¡¤mark¤Ë»ØÄꤹ¤ë´Ø¿ô¤Ç¥Þ¡¼¥¯¤¹¤ëɬÍ×
+ ¤¬¤¢¤ë¡¥
- typeåž‹ã®ãƒ¡ãƒ¢ãƒªã‚’mallocã—,変数svalã«ä»£å…¥ã—ãŸå¾Œï¼Œãれをカプセ
- ル化ã—ãŸãƒ‡ãƒ¼ã‚¿ã‚’è¿”ã™ãƒžã‚¯ãƒ­ï¼Ž
+Data_Make_Struct(klass, type, mark, free, sval)
-Data_Get_Struct(data, type, sval) ::
+ type·¿¤Î¥á¥â¥ê¤òmalloc¤·¡¤ÊÑ¿ôsval¤ËÂåÆþ¤·¤¿¸å¡¤¤½¤ì¤ò¥«¥×¥»
+ ¥ë²½¤·¤¿¥Ç¡¼¥¿¤òÊÖ¤¹¥Þ¥¯¥í¡¥
- dataã‹ã‚‰typeåž‹ã®ãƒã‚¤ãƒ³ã‚¿ã‚’å–り出ã—変数svalã«ä»£å…¥ã™ã‚‹ãƒžã‚¯ãƒ­ï¼Ž
+Data_Get_Struct(data, type, sval)
-== åž‹ãƒã‚§ãƒƒã‚¯
+ data¤«¤étype·¿¤Î¥Ý¥¤¥ó¥¿¤ò¼è¤ê½Ð¤·ÊÑ¿ôsval¤ËÂåÆþ¤¹¤ë¥Þ¥¯¥í¡¥
- TYPE(value)
- FIXNUM_P(value)
- NIL_P(value)
- void Check_Type(VALUE value, int type)
- SafeStringValue(value)
+** ·¿¥Á¥§¥Ã¥¯
-== 型変æ›
+TYPE(value)
+FIXNUM_P(value)
+NIL_P(value)
+void Check_Type(VALUE value, int type)
+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)
- NUM2DBL(value)
- rb_float_new(f)
- StringValue(value)
- StringValuePtr(value)
- StringValueCStr(value)
- rb_str_new2(s)
+** ·¿ÊÑ´¹
-== クラス/モジュール定義
+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)
+NUM2DBL(value)
+rb_float_new(f)
+StringValue(value)
+StringValuePtr(value)
+StringValueCStr(value)
+rb_str_new2(s)
-VALUE rb_define_class(const char *name, VALUE super) ::
+** ¥¯¥é¥¹/¥â¥¸¥å¡¼¥ëÄêµÁ
- superã®ã‚µãƒ–クラスã¨ã—ã¦æ–°ã—ã„Rubyクラスを定義ã™ã‚‹ï¼Ž
+VALUE rb_define_class(const char *name, VALUE super)
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
+ super¤Î¥µ¥Ö¥¯¥é¥¹¤È¤·¤Æ¿·¤·¤¤Ruby¥¯¥é¥¹¤òÄêµÁ¤¹¤ë¡¥
- superã®ã‚µãƒ–クラスã¨ã—ã¦æ–°ã—ã„Rubyクラスを定義ã—,moduleã®
- 定数ã¨ã—ã¦å®šç¾©ã™ã‚‹ï¼Ž
+VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
-VALUE rb_define_module(const char *name) ::
+ super¤Î¥µ¥Ö¥¯¥é¥¹¤È¤·¤Æ¿·¤·¤¤Ruby¥¯¥é¥¹¤òÄêµÁ¤·¡¤module¤Î
+ Äê¿ô¤È¤·¤ÆÄêµÁ¤¹¤ë¡¥
- æ–°ã—ã„Rubyモジュールを定義ã™ã‚‹ï¼Ž
+VALUE rb_define_module(const char *name)
-VALUE rb_define_module_under(VALUE module, const char *name) ::
+ ¿·¤·¤¤Ruby¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤¹¤ë¡¥
- æ–°ã—ã„Rubyモジュールを定義ã—,moduleã®å®šæ•°ã¨ã—ã¦å®šç¾©ã™ã‚‹ï¼Ž
+VALUE rb_define_module_under(VALUE module, const char *name)
-void rb_include_module(VALUE klass, VALUE module) ::
+ ¿·¤·¤¤Ruby¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤·¡¤module¤ÎÄê¿ô¤È¤·¤ÆÄêµÁ¤¹¤ë¡¥
- モジュールをインクルードã™ã‚‹ï¼ŽclassãŒã™ã§ã«moduleをインク
- ルードã—ã¦ã„る時ã«ã¯ä½•ã‚‚ã—ãªã„(多é‡ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰ã®ç¦æ­¢).
+void rb_include_module(VALUE klass, VALUE module)
-void rb_extend_object(VALUE object, VALUE module) ::
+ ¥â¥¸¥å¡¼¥ë¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë¡¥class¤¬¤¹¤Ç¤Ëmodule¤ò¥¤¥ó¥¯
+ ¥ë¡¼¥É¤·¤Æ¤¤¤ë»þ¤Ë¤Ï²¿¤â¤·¤Ê¤¤(¿½Å¥¤¥ó¥¯¥ë¡¼¥É¤Î¶Ø»ß)¡¥
- オブジェクトをモジュール(ã§å®šç¾©ã•れã¦ã„るメソッド)ã§æ‹¡å¼µã™ã‚‹ï¼Ž
+void rb_extend_object(VALUE object, VALUE module)
-== 大域変数定義
+ ¥ª¥Ö¥¸¥§¥¯¥È¤ò¥â¥¸¥å¡¼¥ë(¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥á¥½¥Ã¥É)¤Ç³ÈÄ¥¤¹¤ë¡¥
-void rb_define_variable(const char *name, VALUE *var) ::
+** Âç°èÊÑ¿ôÄêµÁ
- Rubyã¨Cã¨ã§å…±æœ‰ã™ã‚‹ã‚°ãƒ­ãƒ¼ãƒãƒ«å¤‰æ•°ã‚’定義ã™ã‚‹ï¼Žå¤‰æ•°åãŒ`$'ã§
- å§‹ã¾ã‚‰ãªã„時ã«ã¯è‡ªå‹•çš„ã«è¿½åŠ ã•れる.nameã¨ã—ã¦Rubyã®è­˜åˆ¥å­
- ã¨ã—ã¦è¨±ã•れãªã„文字(例ãˆã°` ')ã‚’å«ã‚€å ´åˆã«ã¯Rubyプログラ
- ムã‹ã‚‰ã¯è¦‹ãˆãªããªã‚‹ï¼Ž
+void rb_define_variable(const char *name, VALUE *var)
-void rb_define_readonly_variable(const char *name, VALUE *var) ::
+ Ruby¤ÈC¤È¤Ç¶¦Í­¤¹¤ë¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥ÊÑ¿ô̾¤¬`$'¤Ç
+ »Ï¤Þ¤é¤Ê¤¤»þ¤Ë¤Ï¼«Æ°Åª¤ËÄɲ䵤ì¤ë¡¥name¤È¤·¤ÆRuby¤Î¼±ÊÌ»Ò
+ ¤È¤·¤Æµö¤µ¤ì¤Ê¤¤Ê¸»ú(Î㤨¤Ð` ')¤ò´Þ¤à¾ì¹ç¤Ë¤ÏRuby¥×¥í¥°¥é
+ ¥à¤«¤é¤Ï¸«¤¨¤Ê¤¯¤Ê¤ë¡¥
- Rubyã¨Cã¨ã§å…±æœ‰ã™ã‚‹read onlyã®ã‚°ãƒ­ãƒ¼ãƒãƒ«å¤‰æ•°ã‚’定義ã™ã‚‹ï¼Ž
- read onlyã§ã‚ã‚‹ã“ã¨ä»¥å¤–ã¯rb_define_variable()ã¨åŒã˜ï¼Ž
+void rb_define_readonly_variable(const char *name, VALUE *var)
-void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) ::
+ Ruby¤ÈC¤È¤Ç¶¦Í­¤¹¤ëread only¤Î¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥
+ read only¤Ç¤¢¤ë¤³¤È°Ê³°¤Ïrb_define_variable()¤ÈƱ¤¸¡¥
- 関数ã«ã‚ˆã£ã¦å®Ÿç¾ã•れるRuby変数を定義ã™ã‚‹ï¼Žå¤‰æ•°ãŒå‚ç…§ã•れãŸ
- 時ã«ã¯getterãŒï¼Œå¤‰æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚ŒãŸæ™‚ã«ã¯setterãŒå‘¼ã°ã‚Œ
- る.
+void rb_define_virtual_variable(const char *name,
+ VALUE (*getter)(), void (*setter)())
-void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) ::
+ ´Ø¿ô¤Ë¤è¤Ã¤Æ¼Â¸½¤µ¤ì¤ëRubyÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥ÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿
+ »þ¤Ë¤Ïgetter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ïsetter¤¬¸Æ¤Ð¤ì
+ ¤ë¡¥
- 関数ã«ã‚ˆã£ã¦hookã®ã¤ã‘られãŸã‚°ãƒ­ãƒ¼ãƒãƒ«å¤‰æ•°ã‚’定義ã™ã‚‹ï¼Žå¤‰æ•°
- ãŒå‚ç…§ã•ã‚ŒãŸæ™‚ã«ã¯getterãŒï¼Œé–¢æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚ŒãŸæ™‚ã«ã¯
- setterãŒå‘¼ã°ã‚Œã‚‹ï¼Žgetterã‚„setterã«0を指定ã—ãŸæ™‚ã«ã¯hookã‚’
- 指定ã—ãªã„ã®ã¨åŒã˜äº‹ã«ãªã‚‹ï¼Ž
+void rb_define_hooked_variable(const char *name, VALUE *var,
+ VALUE (*getter)(), void (*setter)())
-void rb_global_variable(VALUE *var)
+ ´Ø¿ô¤Ë¤è¤Ã¤Æhook¤Î¤Ä¤±¤é¤ì¤¿¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥ÊÑ¿ô
+ ¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ïgetter¤¬¡¤´Ø¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ï
+ setter¤¬¸Æ¤Ð¤ì¤ë¡¥getter¤äsetter¤Ë0¤ò»ØÄꤷ¤¿»þ¤Ë¤Ïhook¤ò
+ »ØÄꤷ¤Ê¤¤¤Î¤ÈƱ¤¸»ö¤Ë¤Ê¤ë¡¥
- GCã®ãŸã‚,Rubyプログラムã‹ã‚‰ã¯ã‚¢ã‚¯ã‚»ã‚¹ã•れãªã„ãŒ, Rubyオブ
- ジェクトをå«ã‚€å¤§åŸŸå¤‰æ•°ã‚’マークã™ã‚‹ï¼Ž
+void rb_global_variable(VALUE *var)
-== 定数
+ GC¤Î¤¿¤á¡¤Ruby¥×¥í¥°¥é¥à¤«¤é¤Ï¥¢¥¯¥»¥¹¤µ¤ì¤Ê¤¤¤¬, Ruby¥ª¥Ö
+ ¥¸¥§¥¯¥È¤ò´Þ¤àÂç°èÊÑ¿ô¤ò¥Þ¡¼¥¯¤¹¤ë¡¥
-void rb_define_const(VALUE klass, const char *name, VALUE val) ::
+** Äê¿ô
- 定数を定義ã™ã‚‹ï¼Ž
+void rb_define_const(VALUE klass, const char *name, VALUE val)
-void rb_define_global_const(const char *name, VALUE val) ::
+ Äê¿ô¤òÄêµÁ¤¹¤ë¡¥
- 大域定数を定義ã™ã‚‹ï¼Ž
+void rb_define_global_const(const char *name, VALUE val)
- rb_define_const(rb_cObject, name, val)
+ Âç°èÄê¿ô¤òÄêµÁ¤¹¤ë¡¥
- ã¨åŒã˜æ„味.
+ rb_define_const(rb_cObject, name, val)
-== メソッド定義
+ ¤ÈƱ¤¸°ÕÌ£¡¥
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+** ¥á¥½¥Ã¥ÉÄêµÁ
- メソッドを定義ã™ã‚‹ï¼Žargcã¯selfを除ãå¼•æ•°ã®æ•°ï¼ŽargcãŒ-1ã®æ™‚,
- 関数ã«ã¯å¼•æ•°ã®æ•°(selfã‚’å«ã¾ãªã„)を第1引数, 引数ã®é…列を第2
- 引数ã¨ã™ã‚‹å½¢å¼ã§ä¸Žãˆã‚‰ã‚Œã‚‹(第3引数ã¯self).argcãŒ-2ã®æ™‚,
- 第1引数ãŒself, 第2引数ãŒargs(argsã¯å¼•æ•°ã‚’å«ã‚€Rubyã®é…列)ã¨
- ã„ã†å½¢å¼ã§ä¸Žãˆã‚‰ã‚Œã‚‹ï¼Ž
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+ ¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¡¥argc¤Ïself¤ò½ü¤¯°ú¿ô¤Î¿ô¡¥argc¤¬-1¤Î»þ,
+ ´Ø¿ô¤Ë¤Ï°ú¿ô¤Î¿ô(self¤ò´Þ¤Þ¤Ê¤¤)¤òÂè1°ú¿ô, °ú¿ô¤ÎÇÛÎó¤òÂè2
+ °ú¿ô¤È¤¹¤ë·Á¼°¤ÇÍ¿¤¨¤é¤ì¤ë(Âè3°ú¿ô¤Ïself)¡¥argc¤¬-2¤Î»þ,
+ Âè1°ú¿ô¤¬self, Âè2°ú¿ô¤¬args(args¤Ï°ú¿ô¤ò´Þ¤àRuby¤ÎÇÛÎó)¤È
+ ¤¤¤¦·Á¼°¤ÇÍ¿¤¨¤é¤ì¤ë¡¥
+
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
- privateメソッドを定義ã™ã‚‹ï¼Žå¼•æ•°ã¯rb_define_method()ã¨åŒã˜ï¼Ž
+ private¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¡¥°ú¿ô¤Ïrb_define_method()¤ÈƱ¤¸¡¥
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
- 特異メソッドを定義ã™ã‚‹ï¼Žå¼•æ•°ã¯rb_define_method()ã¨åŒã˜ï¼Ž
+ ÆÃ°Û¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¡¥°ú¿ô¤Ïrb_define_method()¤ÈƱ¤¸¡¥
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
- argc, argvå½¢å¼ã§ä¸Žãˆã‚‰ã‚ŒãŸæŒ‡å®šã•れãŸãƒ•ォーマットã«å¾“ã£ã¦å¼•
- 数を分解ã—,続ãVALUEã¸ã®å‚ç…§ã«ã‚»ãƒƒãƒˆã—ã¾ã™ï¼Žã“ã®ãƒ•ォーマッ
- トã¯ï¼ŒABNFã§è¨˜è¿°ã™ã‚‹ã¨ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž
+ argc, argv·Á¼°¤ÇÍ¿¤¨¤é¤ì¤¿»ØÄꤵ¤ì¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë½¾¤Ã¤Æ°ú
+ ¿ô¤òʬ²ò¤·¡¤Â³¤¯VALUE¤Ø¤Î»²¾È¤Ë¥»¥Ã¥È¤·¤Þ¤¹¡¥¤³¤Î¥Õ¥©¡¼¥Þ¥Ã
+ ¥È¤Ï¡¤ABNF¤Çµ­½Ò¤¹¤ë¤È°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
- scan-arg-spec := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
+--
+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
- option-hash-arg-spec := sym-for-option-hash-arg
- block-arg-spec := sym-for-block-arg
+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-option-hash-arg := ":" ; オプションãƒãƒƒã‚·ãƒ¥ã‚’å–å¾—ã™ã‚‹
- ; ãŸã‚ã®æŒ‡å®š; çœç•¥ä¸èƒ½ãªå¼•æ•°ã®
- ; 数よりも多ãã®å¼•æ•°ãŒæŒ‡å®šã•れ,
- ; 最後ã®å¼•æ•°ãŒãƒãƒƒã‚·ãƒ¥ï¼ˆã¾ãŸã¯
- ; #to_hashã§å¤‰æ›å¯èƒ½ï¼‰ã®å ´åˆã«
- ; å–å¾—ã•れる.最後ã®å¼•æ•°ãŒnilã®
- ; å ´åˆï¼Œå¯å¤‰é•·å¼•数指定ãŒãªã,
- ; çœç•¥ä¸èƒ½å¼•æ•°ã®æ•°ã‚ˆã‚Šã‚‚多ãã®
- ; å¼•æ•°ãŒæŒ‡å®šã•れãŸå ´åˆã«å–å¾—ã•れる
- 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)ã«ãªã‚Šã¾ã™ï¼Ž
+ ¥Õ¥©¡¼¥Þ¥Ã¥È¤¬"12"¤Î¾ì¹ç¡¤°ú¿ô¤ÏºÇÄã1¤Ä¤Ç¡¤3¤Ä(1+2)¤Þ¤Çµö¤µ
+ ¤ì¤ë¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡¥½¾¤Ã¤Æ¡¤¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë³¤¤
+ ¤Æ3¤Ä¤ÎVALUE¤Ø¤Î»²¾È¤òÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥¤½¤ì¤é¤Ë¤Ï¼èÆÀ¤·¤¿
+ ÊÑ¿ô¤¬¥»¥Ã¥È¤µ¤ì¤Þ¤¹¡¥ÊÑ¿ô¤Ø¤Î»²¾È¤ÎÂå¤ï¤ê¤ËNULL¤ò»ØÄꤹ¤ë
+ ¤³¤È¤â¤Ç¤­¡¤¤½¤Î¾ì¹ç¤Ï¼èÆÀ¤·¤¿°ú¿ô¤ÎÃͤϼΤƤé¤ì¤Þ¤¹¡¥¤Ê¤ª¡¢
+ ¾Êά²Äǽ°ú¿ô¤¬¾Êά¤µ¤ì¤¿»þ¤ÎÊÑ¿ô¤ÎÃͤÏnil(C¸À¸ì¤Î¥ì¥Ù¥ë¤Ç¤Ï
+ Qnil)¤Ë¤Ê¤ê¤Þ¤¹¡¥
- 返り値ã¯ä¸Žãˆã‚‰ã‚ŒãŸå¼•æ•°ã®æ•°ã§ã™ï¼Žã‚ªãƒ—ションãƒãƒƒã‚·ãƒ¥ãŠã‚ˆã³ã‚¤
- ãƒ†ãƒ¬ãƒ¼ã‚¿ãƒ–ãƒ­ãƒƒã‚¯ã¯æ•°ãˆã¾ã›ã‚“.
+ ÊÖ¤êÃͤÏÍ¿¤¨¤é¤ì¤¿°ú¿ô¤Î¿ô¤Ç¤¹¡¥¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤Ï¿ô¤¨¤Þ
+ ¤»¤ó¡¥
-== Rubyメソッド呼ã³å‡ºã—
+** Ruby¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·
-VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
+VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
- メソッド呼ã³å‡ºã—.文字列ã‹ã‚‰midã‚’å¾—ã‚‹ãŸã‚ã«ã¯rb_intern()ã‚’
- 使ã†ï¼Ž
+ ¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·¡¥Ê¸»úÎ󤫤émid¤òÆÀ¤ë¤¿¤á¤Ë¤Ïrb_intern()¤ò
+ »È¤¦¡¥
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
+VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
- メソッド呼ã³å‡ºã—.引数をargc, argvå½¢å¼ã§æ¸¡ã™ï¼Ž
+ ¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·¡¥°ú¿ô¤òargc, argv·Á¼°¤ÇÅϤ¹¡¥
VALUE rb_eval_string(const char *str)
- 文字列をRubyスクリプトã¨ã—ã¦ã‚³ãƒ³ãƒ‘イル・実行ã™ã‚‹ï¼Ž
-
-ID rb_intern(const char *name) ::
-
- 文字列ã«å¯¾å¿œã™ã‚‹IDã‚’è¿”ã™ï¼Ž
-
-char *rb_id2name(ID id) ::
+ ʸ»úÎó¤òRuby¥¹¥¯¥ê¥×¥È¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¡¦¼Â¹Ô¤¹¤ë¡¥
- IDã«å¯¾å¿œã™ã‚‹æ–‡å­—列を返ã™(デãƒãƒƒã‚°ç”¨).
+ID rb_intern(const char *name)
-char *rb_class2name(VALUE klass) ::
+ ʸ»úÎó¤ËÂбþ¤¹¤ëID¤òÊÖ¤¹¡¥
- クラスã®åå‰ã‚’è¿”ã™(デãƒãƒƒã‚°ç”¨).クラスãŒåå‰ã‚’æŒãŸãªã„時ã«
- ã¯, 祖先をé¡ã£ã¦åå‰ã‚’æŒã¤ã‚¯ãƒ©ã‚¹ã®åå‰ã‚’è¿”ã™ï¼Ž
+char *rb_id2name(ID id)
-int rb_respond_to(VALUE obj, ID id) ::
+ ID¤ËÂбþ¤¹¤ëʸ»úÎó¤òÊÖ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)¡¥
- objãŒidã§ç¤ºã•れるメソッドをæŒã¤ã‹ã©ã†ã‹ã‚’è¿”ã™ï¼Ž
+char *rb_class2name(VALUE klass)
-== インスタンス変数
+ ¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)¡¥¥¯¥é¥¹¤¬Ì¾Á°¤ò»ý¤¿¤Ê¤¤»þ¤Ë
+ ¤Ï, ÁÄÀè¤òÁ̤äÆÌ¾Á°¤ò»ý¤Ä¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹¡¥
-VALUE rb_iv_get(VALUE obj, const char *name) ::
+int rb_respond_to(VALUE obj, ID id)
- objã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã®å€¤ã‚’得る.`@'ã§å§‹ã¾ã‚‰ãªã„インスタン
- ス変数㯠Rubyプログラムã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„「隠れãŸã€ã‚¤ãƒ³
- スタンス変数ã«ãªã‚‹ï¼Žå®šæ•°ã¯å¤§æ–‡å­—ã®åå‰ã‚’æŒã¤ã‚¯ãƒ©ã‚¹(ã¾ãŸã¯
- モジュール)ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã¨ã—ã¦å®Ÿè£…ã•れã¦ã„る.
+ obj¤¬id¤Ç¼¨¤µ¤ì¤ë¥á¥½¥Ã¥É¤ò»ý¤Ä¤«¤É¤¦¤«¤òÊÖ¤¹¡¥
-VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
+** ¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô
- objã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã‚’valã«ã‚»ãƒƒãƒˆã™ã‚‹ï¼Ž
+VALUE rb_iv_get(VALUE obj, const char *name)
-== 制御構造
+ obj¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤ÎÃͤòÆÀ¤ë¡¥`@'¤Ç»Ï¤Þ¤é¤Ê¤¤¥¤¥ó¥¹¥¿¥ó
+ ¥¹ÊÑ¿ô¤Ï Ruby¥×¥í¥°¥é¥à¤«¤é¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¡Ö±£¤ì¤¿¡×¥¤¥ó
+ ¥¹¥¿¥ó¥¹ÊÑ¿ô¤Ë¤Ê¤ë¡¥Äê¿ô¤ÏÂçʸ»ú¤Î̾Á°¤ò»ý¤Ä¥¯¥é¥¹(¤Þ¤¿¤Ï
+ ¥â¥¸¥å¡¼¥ë)¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤È¤·¤Æ¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¡¥
-VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) ::
+VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
- funcをブロックã¨ã—ã¦è¨­å®šã—,objをレシーãƒï¼Œargcã¨argvを引数
- ã¨ã—ã¦midメソッドを呼ã³å‡ºã™ï¼Žfuncã¯ç¬¬ä¸€å¼•æ•°ã«yieldã•れãŸå€¤ï¼Œ
- 第二引数ã«data2ã‚’å—ã‘å–る.複数ã®å€¤ãŒyieldã•れãŸå ´åˆ(Cã§ã¯
- rb_yield_values()ã¨rb_yield_values2(), rb_yield_splat()),
- data2ã¯Arrayã¨ã—ã¦ãƒ‘ックã•れã¦ã„る.第三, 第四引数ã®argcã¨
- argvã«ã‚ˆã£ã¦yieldã•れãŸå€¤ã‚’å–り出ã™ã“ã¨ãŒã§ãる.
-
-[OBSOLETE] 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ãŒç”¨æ„ã•れãŸ.
+ obj¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤òval¤Ë¥»¥Ã¥È¤¹¤ë¡¥
-VALUE rb_yield(VALUE val) ::
+** À©¸æ¹½Â¤
- valを値ã¨ã—ã¦ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ãƒ–ロックを呼ã³å‡ºã™ï¼Ž
+VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv,
+ VALUE (*func) (ANYARGS), VALUE data2)
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+ func¤ò¥Ö¥í¥Ã¥¯¤È¤·¤ÆÀßÄꤷ¡¤obj¤ò¥ì¥·¡¼¥Ð¡¤argc¤Èargv¤ò°ú¿ô
+ ¤È¤·¤Æmid¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¡¥func¤ÏÂè°ì°ú¿ô¤Ëyield¤µ¤ì¤¿ÃÍ¡¤
+ ÂèÆó°ú¿ô¤Ëdata2¤ò¼õ¤±¼è¤ë¡¥Ê£¿ô¤ÎÃͤ¬yield¤µ¤ì¤¿¾ì¹ç(C¤Ç¤Ï
+ rb_yield_values()¤Èrb_yield_values2(), rb_yield_splat())¡¤
+ data2¤ÏArray¤È¤·¤Æ¥Ñ¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¡¥Âè»°, Âè»Í°ú¿ô¤Îargc¤È
+ argv¤Ë¤è¤Ã¤Æyield¤µ¤ì¤¿Ãͤò¼è¤ê½Ð¤¹¤³¤È¤¬¤Ç¤­¤ë¡¥
- 関数func1ã‚’arg1を引数ã«å‘¼ã³å‡ºã™ï¼Žfunc1ã®å®Ÿè¡Œä¸­ã«ä¾‹å¤–ãŒç™ºç”Ÿ
- ã—ãŸæ™‚ã«ã¯ func2ã‚’arg2を引数ã¨ã—ã¦å‘¼ã¶ï¼Žæˆ»ã‚Šå€¤ã¯ä¾‹å¤–ãŒç™ºç”Ÿ
- ã—ãªã‹ã£ãŸæ™‚ã¯func1ã®æˆ»ã‚Šå€¤, 例外ãŒç™ºç”Ÿã—ãŸæ™‚ã«ã¯func2ã®æˆ»
- り値ã§ã‚る.
+[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-VALUE rb_ensure(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¤¬ÍѰդµ¤ì¤¿.
- 関数func1ã‚’arg1を引数ã¨ã—ã¦å®Ÿè¡Œã—, 実行終了後(ãŸã¨ãˆä¾‹å¤–ãŒ
- 発生ã—ã¦ã‚‚) func2ã‚’arg2を引数ã¨ã—ã¦å®Ÿè¡Œã™ã‚‹ï¼Žæˆ»ã‚Šå€¤ã¯func1
- ã®æˆ»ã‚Šå€¤ã§ã‚ã‚‹(例外ãŒç™ºç”Ÿã—ãŸæ™‚ã¯æˆ»ã‚‰ãªã„).
+VALUE rb_yield(VALUE val)
-VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
+ val¤òÃͤȤ·¤Æ¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤ò¸Æ¤Ó½Ð¤¹¡¥
- 関数funcã‚’argを引数ã¨ã—ã¦å®Ÿè¡Œã—, 例外ãŒç™ºç”Ÿã—ãªã‘れã°ãã®æˆ»
- り値を返ã™ï¼Žä¾‹å¤–ãŒç™ºç”Ÿã—ãŸå ´åˆã¯, *stateã«éž0をセットã—ã¦
- Qnilã‚’è¿”ã™ï¼Ž
- rb_jump_tag()を呼ã°ãšã«æ•æ‰ã—ãŸä¾‹å¤–を無視ã™ã‚‹å ´åˆã«ã¯ï¼Œ
- rb_set_errinfo(Qnil)ã§ã‚¨ãƒ©ãƒ¼æƒ…報をクリアã—ãªã‘れã°ãªã‚‰ãªã„.
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-void rb_jump_tag(int state) ::
+ ´Ø¿ôfunc1¤òarg1¤ò°ú¿ô¤Ë¸Æ¤Ó½Ð¤¹¡¥func1¤Î¼Â¹ÔÃæ¤ËÎã³°¤¬È¯À¸
+ ¤·¤¿»þ¤Ë¤Ï func2¤òarg2¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ö¡¥Ìá¤êÃͤÏÎã³°¤¬È¯À¸
+ ¤·¤Ê¤«¤Ã¤¿»þ¤Ïfunc1¤ÎÌá¤êÃÍ, Îã³°¤¬È¯À¸¤·¤¿»þ¤Ë¤Ïfunc2¤ÎÌá
+ ¤êÃͤǤ¢¤ë¡¥
- rb_protect()ã‚„rb_eval_string_protect()ã§æ•æ‰ã•れãŸä¾‹å¤–ã‚’å†
- é€ã™ã‚‹ï¼Žstateã¯ãれらã®é–¢æ•°ã‹ã‚‰è¿”ã•れãŸå€¤ã§ãªã‘れã°ãªã‚‰ãªã„.
- ã“ã®é–¢æ•°ã¯ç›´æŽ¥ã®å‘¼ã³å‡ºã—å…ƒã«æˆ»ã‚‰ãªã„.
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, void (*func2)(), VALUE arg2)
-void rb_iter_break() ::
+ ´Ø¿ôfunc1¤òarg1¤ò°ú¿ô¤È¤·¤Æ¼Â¹Ô¤·, ¼Â¹Ô½ªÎ»¸å(¤¿¤È¤¨Îã³°¤¬
+ ȯÀ¸¤·¤Æ¤â) func2¤òarg2¤ò°ú¿ô¤È¤·¤Æ¼Â¹Ô¤¹¤ë¡¥Ìá¤êÃͤÏfunc1
+ ¤ÎÌá¤êÃͤǤ¢¤ë(Îã³°¤¬È¯À¸¤·¤¿»þ¤ÏÌá¤é¤Ê¤¤)¡¥
- ç¾åœ¨ã®æœ€ã‚‚内å´ã®ãƒ–ロックを終了ã™ã‚‹ï¼Žã“ã®é–¢æ•°ã¯ç›´æŽ¥ã®å‘¼ã³å‡º
- ã—å…ƒã«æˆ»ã‚‰ãªã„.
+VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
-void rb_iter_break_value(VALUE value) ::
+ ´Ø¿ôfunc¤òarg¤ò°ú¿ô¤È¤·¤Æ¼Â¹Ô¤·, Îã³°¤¬È¯À¸¤·¤Ê¤±¤ì¤Ð¤½¤ÎÌá
+ ¤êÃͤòÊÖ¤¹¡¥Îã³°¤¬È¯À¸¤·¤¿¾ì¹ç¤Ï, *state¤ËÈó0¤ò¥»¥Ã¥È¤·¤Æ
+ Qnil¤òÊÖ¤¹¡¥
- ç¾åœ¨ã®æœ€ã‚‚内å´ã®ãƒ–ロックをvalueã§çµ‚了ã™ã‚‹ï¼Žãƒ–ロックã¯å¼•æ•°ã§
- 与ãˆã‚‰ã‚ŒãŸvalueã‚’è¿”ã™ï¼Žã“ã®é–¢æ•°ã¯ç›´æŽ¥ã®å‘¼ã³å‡ºã—å…ƒã«æˆ»ã‚‰ãªã„.
+void rb_jump_tag(int state)
-== 例外・エラー
+ rb_protect()¤ärb_eval_string_protect()¤ÇÊ᪤µ¤ì¤¿Îã³°¤òºÆ
+ Á÷¤¹¤ë¡¥state¤Ï¤½¤ì¤é¤Î´Ø¿ô¤«¤éÊÖ¤µ¤ì¤¿ÃͤǤʤ±¤ì¤Ð¤Ê¤é¤Ê¤¤¡¥
+ ¤³¤Î´Ø¿ô¤ÏľÀܤθƤӽФ·¸µ¤ËÌá¤é¤Ê¤¤¡¥
-void rb_warning(const char *fmt, ...) ::
+** Îã³°¡¦¥¨¥é¡¼
- rb_verboseæ™‚ã«æ¨™æº–エラー出力ã«è­¦å‘Šæƒ…報を表示ã™ã‚‹ï¼Žå¼•æ•°ã¯
- printf()ã¨åŒã˜ï¼Ž
+void rb_warning(const char *fmt, ...)
-void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
+ rb_verbose»þ¤Ëɸ½à¥¨¥é¡¼½ÐÎϤ˷ٹð¾ðÊó¤òɽ¼¨¤¹¤ë¡¥°ú¿ô¤Ï
+ printf()¤ÈƱ¤¸¡¥
- RuntimeError例外を発生ã•ã›ã‚‹ï¼Žå¼•æ•°ã¯printf()ã¨åŒã˜ï¼Ž
+void rb_raise(rb_eRuntimeError, const char *fmt, ...)
-void rb_raise(VALUE exception, const char *fmt, ...) ::
+ RuntimeErrorÎã³°¤òȯÀ¸¤µ¤»¤ë¡¥°ú¿ô¤Ïprintf()¤ÈƱ¤¸¡¥
- exceptionã§æŒ‡å®šã—ãŸä¾‹å¤–を発生ã•ã›ã‚‹ï¼Žfmt以下ã®å¼•æ•°ã¯
- printf()ã¨åŒã˜ï¼Ž
+void rb_raise(VALUE exception, const char *fmt, ...)
-void rb_fatal(const char *fmt, ...) ::
+ exception¤Ç»ØÄꤷ¤¿Îã³°¤òȯÀ¸¤µ¤»¤ë¡¥fmt°Ê²¼¤Î°ú¿ô¤Ï
+ printf()¤ÈƱ¤¸¡¥
- 致命的例外を発生ã•ã›ã‚‹ï¼Žé€šå¸¸ã®ä¾‹å¤–処ç†ã¯è¡Œãªã‚れãš, インター
- プリタãŒçµ‚了ã™ã‚‹(ãŸã ã—ensureã§æŒ‡å®šã•れãŸã‚³ãƒ¼ãƒ‰ã¯çµ‚了å‰ã«
- 実行ã•れる).
+void rb_fatal(const char *fmt, ...)
-void rb_bug(const char *fmt, ...) ::
+ Ã×̿ŪÎã³°¤òȯÀ¸¤µ¤»¤ë¡¥Ä̾ï¤ÎÎã³°½èÍý¤Ï¹Ô¤Ê¤ï¤ì¤º, ¥¤¥ó¥¿¡¼
+ ¥×¥ê¥¿¤¬½ªÎ»¤¹¤ë(¤¿¤À¤·ensure¤Ç»ØÄꤵ¤ì¤¿¥³¡¼¥É¤Ï½ªÎ»Á°¤Ë
+ ¼Â¹Ô¤µ¤ì¤ë)¡¥
- インタープリタãªã©ãƒ—ログラムã®ãƒã‚°ã§ã—ã‹ç™ºç”Ÿã™ã‚‹ã¯ãšã®ãªã„
- 状æ³ã®æ™‚呼ã¶ï¼Žã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã¯ã‚³ã‚¢ãƒ€ãƒ³ãƒ—ã—ç›´ã¡ã«çµ‚了ã™ã‚‹ï¼Ž
- 例外処ç†ã¯ä¸€åˆ‡è¡Œãªã‚れãªã„.
+void rb_bug(const char *fmt, ...)
-注æ„: %iã¯Object#to_s('+'ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れã¦ã„ã‚‹ã¨ãã¯Object#inspect)ã‚’
-使ã£ãŸVALUEã®å‡ºåŠ›ã«ä½¿ç”¨ã•れã¦ã„ã‚‹ãŸã‚,整数ã«ã¯%dを使用ã™ã‚‹ã“ã¨ï¼Ž
+ ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ê¤É¥×¥í¥°¥é¥à¤Î¥Ð¥°¤Ç¤·¤«È¯À¸¤¹¤ë¤Ï¤º¤Î¤Ê¤¤
+ ¾õ¶·¤Î»þ¸Æ¤Ö¡¥¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ï¥³¥¢¥À¥ó¥×¤·Ä¾¤Á¤Ë½ªÎ»¤¹¤ë¡¥
+ Îã³°½èÍý¤Ï°ìÀڹԤʤï¤ì¤Ê¤¤¡¥
-== Rubyã®åˆæœŸåŒ–・実行
+** Ruby¤Î½é´ü²½¡¦¼Â¹Ô
-Rubyをアプリケーションã«åŸ‹ã‚込む場åˆã«ã¯ä»¥ä¸‹ã®ã‚¤ãƒ³ã‚¿ãƒ•ェース
-を使ã†ï¼Žé€šå¸¸ã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã«ã¯å¿…è¦ãªã„.
+Ruby¤ò¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËËä¤á¹þ¤à¾ì¹ç¤Ë¤Ï°Ê²¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹
+¤ò»È¤¦¡¥Ä̾ï¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤ÏɬÍפʤ¤¡¥
-void ruby_init() ::
+void ruby_init()
- Rubyインタプリタã®åˆæœŸåŒ–を行ãªã†ï¼Ž
+ Ruby¥¤¥ó¥¿¥×¥ê¥¿¤Î½é´ü²½¤ò¹Ô¤Ê¤¦¡¥
-void ruby_options(int argc, char **argv) ::
+void ruby_options(int argc, char **argv)
- Rubyインタプリタã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³å¼•æ•°ã®å‡¦ç†ã‚’行ãªã†ï¼Ž
+ Ruby¥¤¥ó¥¿¥×¥ê¥¿¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Î½èÍý¤ò¹Ô¤Ê¤¦¡¥
-void ruby_run() ::
+void ruby_run()
- Rubyインタプリタを実行ã™ã‚‹ï¼Ž
+ Ruby¥¤¥ó¥¿¥×¥ê¥¿¤ò¼Â¹Ô¤¹¤ë¡¥
-void ruby_script(char *name) ::
+void ruby_script(char *name)
- Rubyã®ã‚¹ã‚¯ãƒªãƒ—トå($0)を設定ã™ã‚‹ï¼Ž
+ Ruby¤Î¥¹¥¯¥ê¥×¥È̾($0)¤òÀßÄꤹ¤ë¡¥
-== インタプリタã®ã‚¤ãƒ™ãƒ³ãƒˆã®ãƒ•ック
+** ¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¤¥Ù¥ó¥È¤Î¥Õ¥Ã¥¯
- 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_flag_t events, VALUE data)
-指定ã•れãŸã‚¤ãƒ³ã‚¿ãƒ—リタã®ã‚¤ãƒ™ãƒ³ãƒˆã«å¯¾ã™ã‚‹ãƒ•ック関数を追加ã—ã¾ã™ï¼Ž
-eventsã¯ä»¥ä¸‹ã®å€¤ã®orã§ãªã‘れã°ãªã‚Šã¾ã›ã‚“:
+»ØÄꤵ¤ì¤¿¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¤¥Ù¥ó¥È¤ËÂФ¹¤ë¥Õ¥Ã¥¯´Ø¿ô¤òÄɲä·¤Þ¤¹¡¥
+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
+ 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ã®å®šç¾©ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™:
+rb_event_hook_func_t¤ÎÄêµÁ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹:
- typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
- VALUE self, ID id, VALUE klass)
+ 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 ã‚‚å‚ç…§ã—ã¦ãã ã•ã„.
+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)
+ int rb_remove_event_hook(rb_event_hook_func_t func)
-指定ã•れãŸãƒ•ック関数を削除ã—ã¾ã™ï¼Ž
+»ØÄꤵ¤ì¤¿¥Õ¥Ã¥¯´Ø¿ô¤òºï½ü¤·¤Þ¤¹¡¥
-== äº’æ›æ€§ã®ãŸã‚ã®ãƒžã‚¯ãƒ­
+** ¸ß´¹À­¤Î¤¿¤á¤Î¥Þ¥¯¥í
-APIã®äº’æ›æ€§ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ãŸã‚ã«ä»¥ä¸‹ã®ãƒžã‚¯ãƒ­ãŒãƒ‡ãƒ•ォルトã§å®šç¾©ã•れã¦ã„ã¾ã™ï¼Ž
+API¤Î¸ß´¹À­¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë°Ê²¼¤Î¥Þ¥¯¥í¤¬¥Ç¥Õ¥©¥ë¥È¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-NORETURN_STYLE_NEW ::
+NORETURN_STYLE_NEW
- NORETURN マクロãŒé–¢æ•°åž‹ãƒžã‚¯ãƒ­ã¨ã—ã¦å®šç¾©ã•れã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž
+ NORETURN ¥Þ¥¯¥í¤¬´Ø¿ô·¿¥Þ¥¯¥í¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-HAVE_RB_DEFINE_ALLOC_FUNC ::
+HAVE_RB_DEFINE_ALLOC_FUNC
- rb_define_alloc_func() é–¢æ•°ãŒæä¾›ã•れã¦ã„ã‚‹ã“ã¨ï¼Œã¤ã¾ã‚Š
- allocation framework ãŒä½¿ã‚れるã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž
+ rb_define_alloc_func() ´Ø¿ô¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¡¢¤Ä¤Þ¤ê
+ allocation framework ¤¬»È¤ï¤ì¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
have_func("rb_define_alloc_func", "ruby.h")
- ã®çµæžœã¨åŒã˜ï¼Ž
+ ¤Î·ë²Ì¤ÈƱ¤¸¡¥
-HAVE_RB_REG_NEW_STR ::
+HAVE_RB_REG_NEW_STR
- Stringオブジェクトã‹ã‚‰Regexpオブジェクトを作る
- rb_reg_new_str() é–¢æ•°ãŒæä¾›ã•れã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž
+ String¥ª¥Ö¥¸¥§¥¯¥È¤«¤éRegexp¥ª¥Ö¥¸¥§¥¯¥È¤òºî¤ë
+ rb_reg_new_str() ´Ø¿ô¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
have_func("rb_reg_new_str", "ruby.h").
- ã®çµæžœã¨åŒã˜ï¼Ž
+ ¤Î·ë²Ì¤ÈƱ¤¸¡¥
-HAVE_RB_IO_T ::
+HAVE_RB_IO_T
- rb_io_t åž‹ãŒæä¾›ã•れã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž
+ rb_io_t ·¿¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-USE_SYMBOL_AS_METHOD_NAME ::
+USE_SYMBOL_AS_METHOD_NAME
- メソッドåã‚’è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰ï¼ŒModule#methods, #singleton_methods
- ãªã©ãŒSymbolã‚’è¿”ã™ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž
+ ¥á¥½¥Ã¥É̾¤òÊÖ¤¹¥á¥½¥Ã¥É¡¤Module#methods, #singleton_methods
+ ¤Ê¤É¤¬Symbol¤òÊÖ¤¹¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-HAVE_RUBY_*_H ::
+HAVE_RUBY_*_H
- ruby.h ã§å®šç¾©ã•れã¦ã„る.対応ã™ã‚‹ãƒ˜ãƒƒãƒ€ãŒæä¾›ã•れã¦ã„ã‚‹ã“ã¨
- ã‚’æ„味ã™ã‚‹ï¼ŽãŸã¨ãˆã°ï¼ŒHAVE_RUBY_ST_H ãŒå®šç¾©ã•れã¦ã„ã‚‹å ´åˆã¯
- å˜ãªã‚‹ st.h ã§ã¯ãªã ruby/st.h を使用ã™ã‚‹ï¼Ž
+ ruby.h ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¡¥Âбþ¤¹¤ë¥Ø¥Ã¥À¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È
+ ¤ò°ÕÌ£¤¹¤ë¡¥¤¿¤È¤¨¤Ð¡¤HAVE_RUBY_ST_H ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï
+ ñ¤Ê¤ë st.h ¤Ç¤Ï¤Ê¤¯ ruby/st.h ¤ò»ÈÍѤ¹¤ë¡¥
-RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
+RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
- rb_add_event_hook() ãŒãƒ•ãƒƒã‚¯é–¢æ•°ã«æ¸¡ã™ data を第3引数ã¨ã—ã¦
- å—ã‘å–ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž
+ rb_add_event_hook() ¤¬¥Õ¥Ã¥¯´Ø¿ô¤ËÅϤ¹ data ¤òÂè3°ú¿ô¤È¤·¤Æ
+ ¼õ¤±¼è¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-= Appendix C. extconf.rbã§ä½¿ãˆã‚‹é–¢æ•°ãŸã¡
+Appendix C. extconf.rb¤Ç»È¤¨¤ë´Ø¿ô¤¿¤Á
-extconf.rbã®ä¸­ã§ã¯åˆ©ç”¨å¯èƒ½ãªã‚³ãƒ³ãƒ‘イルæ¡ä»¶ãƒã‚§ãƒƒã‚¯ã®é–¢æ•°ã¯ä»¥
-下ã®é€šã‚Šã§ã‚る.
+extconf.rb¤ÎÃæ¤Ç¤ÏÍøÍѲÄǽ¤Ê¥³¥ó¥Ñ¥¤¥ë¾ò·ï¥Á¥§¥Ã¥¯¤Î´Ø¿ô¤Ï°Ê
+²¼¤ÎÄ̤ê¤Ç¤¢¤ë¡¥
-have_macro(macro, headers) ::
+have_macro(macro, headers)
- ヘッダファイルheaderをインクルードã—ã¦ãƒžã‚¯ãƒ­macroãŒå®šç¾©ã•
- れã¦ã„ã‚‹ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒžã‚¯ãƒ­ãŒå®šç¾©ã•れã¦ã„る時true
- ã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ¥Þ¥¯¥ímacro¤¬ÄêµÁ¤µ
+ ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥Þ¥¯¥í¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þtrue
+ ¤òÊÖ¤¹¡¥
-have_library(lib, func) ::
+have_library(lib, func)
- 関数funcを定義ã—ã¦ã„るライブラリlibã®å­˜åœ¨ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Ž
- ライブラリãŒå­˜åœ¨ã™ã‚‹æ™‚,trueã‚’è¿”ã™ï¼Ž
+ ´Ø¿ôfunc¤òÄêµÁ¤·¤Æ¤¤¤ë¥é¥¤¥Ö¥é¥êlib¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥
+ ¥é¥¤¥Ö¥é¥ê¤¬Â¸ºß¤¹¤ë»þ¡¤true¤òÊÖ¤¹¡¥
-find_library(lib, func, path...) ::
+find_library(lib, func, path...)
- 関数funcを定義ã—ã¦ã„るライブラリlibã®å­˜åœ¨ã‚’ -Lpath を追加
- ã—ãªãŒã‚‰ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒ©ã‚¤ãƒ–ラリãŒè¦‹ä»˜ã‹ã£ãŸæ™‚,trueã‚’è¿”ã™ï¼Ž
+ ´Ø¿ôfunc¤òÄêµÁ¤·¤Æ¤¤¤ë¥é¥¤¥Ö¥é¥êlib¤Î¸ºß¤ò -Lpath ¤òÄɲÃ
+ ¤·¤Ê¤¬¤é¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥é¥¤¥Ö¥é¥ê¤¬¸«ÉÕ¤«¤Ã¤¿»þ¡¤true¤òÊÖ¤¹¡¥
-have_func(func, header) ::
+have_func(func, header)
- ヘッダファイルheaderをインクルードã—ã¦é–¢æ•°funcã®å­˜åœ¨ã‚’ãƒã‚§
- ックã™ã‚‹ï¼ŽfuncãŒæ¨™æº–ã§ã¯ãƒªãƒ³ã‚¯ã•れãªã„ライブラリ内ã®ã‚‚ã®ã§
- ã‚る時ã«ã¯å…ˆã«have_libraryã§ãã®ãƒ©ã‚¤ãƒ–ラリをãƒã‚§ãƒƒã‚¯ã—ã¦ãŠ
- ã事.関数ãŒå­˜åœ¨ã™ã‚‹æ™‚trueã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ´Ø¿ôfunc¤Î¸ºß¤ò¥Á¥§
+ ¥Ã¥¯¤¹¤ë¡¥func¤¬É¸½à¤Ç¤Ï¥ê¥ó¥¯¤µ¤ì¤Ê¤¤¥é¥¤¥Ö¥é¥êÆâ¤Î¤â¤Î¤Ç
+ ¤¢¤ë»þ¤Ë¤ÏÀè¤Ëhave_library¤Ç¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤ª
+ ¤¯»ö¡¥´Ø¿ô¤¬Â¸ºß¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
-have_var(var, header) ::
+have_var(var, header)
- ヘッダファイルheaderをインクルードã—ã¦å¤‰æ•°varã®å­˜åœ¨ã‚’ãƒã‚§ãƒƒ
- クã™ã‚‹ï¼ŽvarãŒæ¨™æº–ã§ã¯ãƒªãƒ³ã‚¯ã•れãªã„ライブラリ内ã®ã‚‚ã®ã§ã‚
- る時ã«ã¯å…ˆã«have_libraryã§ãã®ãƒ©ã‚¤ãƒ–ラリをãƒã‚§ãƒƒã‚¯ã—ã¦ãŠã
- 事.変数ãŒå­˜åœ¨ã™ã‚‹æ™‚trueã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤ÆÊÑ¿ôvar¤Î¸ºß¤ò¥Á¥§¥Ã
+ ¥¯¤¹¤ë¡¥var¤¬É¸½à¤Ç¤Ï¥ê¥ó¥¯¤µ¤ì¤Ê¤¤¥é¥¤¥Ö¥é¥êÆâ¤Î¤â¤Î¤Ç¤¢
+ ¤ë»þ¤Ë¤ÏÀè¤Ëhave_library¤Ç¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤ª¤¯
+ »ö¡¥ÊÑ¿ô¤¬Â¸ºß¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
-have_header(header) ::
+have_header(header)
- ヘッダファイルã®å­˜åœ¨ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒ˜ãƒƒãƒ€ãƒ•ァイルãŒå­˜åœ¨ã™
- る時trueã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹
+ ¤ë»þtrue¤òÊÖ¤¹¡¥
-find_header(header, path...) ::
+find_header(header, path...)
- ヘッダファイルheaderã®å­˜åœ¨ã‚’ -Ipath を追加ã—ãªãŒã‚‰ãƒã‚§ãƒƒã‚¯
- ã™ã‚‹ï¼Žãƒ˜ãƒƒãƒ€ãƒ•ァイルãŒè¦‹ä»˜ã‹ã£ãŸæ™‚,trueã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤Î¸ºß¤ò -Ipath ¤òÄɲ䷤ʤ¬¤é¥Á¥§¥Ã¥¯
+ ¤¹¤ë¡¥¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤¬¸«ÉÕ¤«¤Ã¤¿»þ¡¤true¤òÊÖ¤¹¡¥
-have_struct_member(type, member[, header[, opt]]) ::
+have_struct_member(type, member, header)
- ヘッダファイルheaderをインクルードã—ã¦åž‹typeã«ãƒ¡ãƒ³ãƒmember
- ãŒå­˜åœ¨ã™ã‚‹ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼ŽtypeãŒå®šç¾©ã•れã¦ã„ã¦ï¼Œmemberã‚’
- æŒã¤ã™ã‚‹æ™‚trueã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ·¿type¤Ë¥á¥ó¥Ðmember
+ ¤¬Â¸ºß¤¹¤ë¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥type¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Æ¡¤member¤ò
+ »ý¤Ä¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
-have_type(type, header, opt) ::
+have_type(type, header, opt)
- ヘッダファイルheaderをインクルードã—ã¦åž‹typeãŒå­˜åœ¨ã™ã‚‹ã‹ã‚’
- ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼ŽtypeãŒå®šç¾©ã•れã¦ã„る時trueã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ·¿type¤¬Â¸ºß¤¹¤ë¤«¤ò
+ ¥Á¥§¥Ã¥¯¤¹¤ë¡¥type¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þtrue¤òÊÖ¤¹¡¥
-check_sizeof(type, header) ::
+check_sizeof(type, header)
- ヘッダファイルheaderをインクルードã—ã¦åž‹typeã®charå˜ä½ã‚µã‚¤
- ズを調ã¹ã‚‹ï¼ŽtypeãŒå®šç¾©ã•れã¦ã„る時ãã®ã‚µã‚¤ã‚ºã‚’è¿”ã™ï¼Žå®šç¾©ã•
- れã¦ã„ãªã„ã¨ãã¯nilã‚’è¿”ã™ï¼Ž
+ ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ·¿type¤Îcharñ°Ì¥µ¥¤
+ ¥º¤òÄ´¤Ù¤ë¡¥type¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þ¤½¤Î¥µ¥¤¥º¤òÊÖ¤¹¡¥ÄêµÁ¤µ
+ ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ïnil¤òÊÖ¤¹¡¥
-create_makefile(target[, target_prefix]) ::
+create_makefile(target)
- 拡張ライブラリ用ã®Makefileを生æˆã™ã‚‹ï¼Žã“ã®é–¢æ•°ã‚’呼ã°ãªã‘れ
- ã°ãã®ãƒ©ã‚¤ãƒ–ラリã¯ã‚³ãƒ³ãƒ‘イルã•れãªã„.targetã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«å
- を表ã™ï¼Ž
+ ³ÈÄ¥¥é¥¤¥Ö¥é¥êÍѤÎMakefile¤òÀ¸À®¤¹¤ë¡¥¤³¤Î´Ø¿ô¤ò¸Æ¤Ð¤Ê¤±¤ì
+ ¤Ð¤½¤Î¥é¥¤¥Ö¥é¥ê¤Ï¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Ê¤¤¡¥target¤Ï¥â¥¸¥å¡¼¥ë̾
+ ¤òɽ¤¹¡¥
-find_executable(command, path) ::
+find_executable(command, path)
- コマンドcommandã‚’File::PATH_SEPARATORã§åŒºåˆ‡ã‚‰ã‚ŒãŸãƒ‘スåã®
- リストpathã‹ã‚‰æŽ¢ã™ï¼ŽpathãŒnilã¾ãŸã¯çœç•¥ã•れãŸå ´åˆã¯ï¼Œç’°å¢ƒ
- 変数PATHã®å€¤ã‚’使用ã™ã‚‹ï¼Žå®Ÿè¡Œå¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ãŒè¦‹ã¤ã‹ã£ãŸå ´åˆ
- ã¯ãƒ‘スをå«ã‚€ãƒ•ァイルå,見ã¤ã‹ã‚‰ãªã‹ã£ãŸå ´åˆã¯nilã‚’è¿”ã™ï¼Ž
+ ¥³¥Þ¥ó¥Écommand¤òFile::PATH_SEPARATOR¤Ç¶èÀÚ¤é¤ì¤¿¥Ñ¥¹Ì¾¤Î
+ ¥ê¥¹¥Èpath¤«¤éõ¤¹¡¥path¤¬nil¤Þ¤¿¤Ï¾Êά¤µ¤ì¤¿¾ì¹ç¤Ï¡¤´Ä¶­
+ ÊÑ¿ôPATH¤ÎÃͤò»ÈÍѤ¹¤ë¡¥¼Â¹Ô²Äǽ¤Ê¥³¥Þ¥ó¥É¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç
+ ¤Ï¥Ñ¥¹¤ò´Þ¤à¥Õ¥¡¥¤¥ë̾¡¤¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¤Ïnil¤òÊÖ¤¹¡¥
-with_config(withval[, default=nil]) ::
+with_config(withval[, default=nil])
- コマンドライン上ã®--with-<withval>ã§æŒ‡å®šã•れãŸã‚ªãƒ—ション値
- を得る.
+ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--with-<withval>¤Ç»ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥óÃÍ
+ ¤òÆÀ¤ë¡¥
-enable_config(config, *defaults) ::
-disable_config(config, *defaults) ::
+enable_config(config, *defaults)
+disable_config(config, *defaults)
- コマンドライン上ã®--enable-<config>ã¾ãŸã¯
- --disable-<config>ã§æŒ‡å®šã•れãŸçœŸå½å€¤ã‚’得る.
- --enable-<config>ãŒæŒ‡å®šã•れã¦ã„ãŸå ´åˆã¯true,
- --disable-<config>ãŒæŒ‡å®šã•れã¦ã„ãŸå ´åˆã¯falseã‚’è¿”ã™ï¼Ž
- ã©ã¡ã‚‰ã‚‚指定ã•れã¦ã„ãªã„å ´åˆã¯ï¼Œãƒ–ロックã¤ãã§å‘¼ã³å‡ºã•れã¦
- ã„ã‚‹å ´åˆã¯*defaultsã‚’yieldã—ãŸçµæžœï¼Œãƒ–ロックãªã—ãªã‚‰
- *defaultsã‚’è¿”ã™ï¼Ž
+ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--enable-<config>¤Þ¤¿¤Ï
+ --disable-<config>¤Ç»ØÄꤵ¤ì¤¿¿¿µ¶ÃͤòÆÀ¤ë¡¥
+ --enable-<config>¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ïtrue¡¤
+ --disable-<config>¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ïfalse¤òÊÖ¤¹¡¥
+ ¤É¤Á¤é¤â»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¤¥Ö¥í¥Ã¥¯¤Ä¤­¤Ç¸Æ¤Ó½Ð¤µ¤ì¤Æ
+ ¤¤¤ë¾ì¹ç¤Ï*defaults¤òyield¤·¤¿·ë²Ì¡¤¥Ö¥í¥Ã¥¯¤Ê¤·¤Ê¤é
+ *defaults¤òÊÖ¤¹¡¥
-dir_config(target[, default_dir]) ::
-dir_config(target[, default_include, default_lib]) ::
+dir_config(target[, default_dir])
+dir_config(target[, default_include, default_lib])
- コマンドライン上ã®--with-<target>-dir, --with-<target>-include,
- --with-<target>-libã®ã„ãšã‚Œã‹ã§æŒ‡å®šã•れるディレクトリを
- $CFLAGS ã‚„ $LDFLAGS ã«è¿½åŠ ã™ã‚‹ï¼Ž--with-<target>-dir=/pathã¯
+ ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--with-<target>-dir, --with-<target>-include,
+ --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) ::
+pkg_config(pkg)
- pkg-configコマンドã‹ã‚‰ãƒ‘ッケージpkgã®æƒ…報を得る.
- pkg-configã®å®Ÿéš›ã®ã‚³ãƒžãƒ³ãƒ‰åã¯ï¼Œ--with-pkg-configコマンド
- ãƒ©ã‚¤ãƒ³ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§æŒ‡å®šå¯èƒ½ï¼Ž
+ pkg-config¥³¥Þ¥ó¥É¤«¤é¥Ñ¥Ã¥±¡¼¥¸pkg¤Î¾ðÊó¤òÆÀ¤ë¡¥
+ pkg-config¤Î¼ÂºÝ¤Î¥³¥Þ¥ó¥É̾¤Ï¡¤--with-pkg-config¥³¥Þ¥ó¥É
+ ¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ç»ØÄê²Äǽ¡¥
/*
* Local variables:
diff --git a/README.ja b/README.ja
index 03c007af7c..dd7f67ca59 100644
--- a/README.ja
+++ b/README.ja
@@ -1,192 +1,185 @@
-= Rubyã¨ã¯
+* Ruby¤È¤Ï
-Rubyã¯ã‚·ãƒ³ãƒ—ルã‹ã¤å¼·åŠ›ãªã‚ªãƒ–ジェクト指å‘スクリプト言語ã§ã™ï¼Ž
-Rubyã¯æœ€åˆã‹ã‚‰ç´”粋ãªã‚ªãƒ–ジェクト指å‘言語ã¨ã—ã¦è¨­è¨ˆã•れã¦ã„ã¾
-ã™ã‹ã‚‰ï¼Œã‚ªãƒ–ジェクト指å‘プログラミングを手軽ã«è¡Œã†äº‹ãŒå‡ºæ¥ã¾
-ã™ï¼Žã‚‚ã¡ã‚ã‚“é€šå¸¸ã®æ‰‹ç¶šãåž‹ã®ãƒ—ログラミングもå¯èƒ½ã§ã™ï¼Ž
+Ruby¤Ï¥·¥ó¥×¥ë¤«¤Ä¶¯ÎϤʥª¥Ö¥¸¥§¥¯¥È»Ø¸þ¥¹¥¯¥ê¥×¥È¸À¸ì¤Ç¤¹¡¥
+Ruby¤ÏºÇ½é¤«¤é½ã¿è¤Ê¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¸À¸ì¤È¤·¤ÆÀ߷פµ¤ì¤Æ¤¤¤Þ
+¤¹¤«¤é¡¤¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¥×¥í¥°¥é¥ß¥ó¥°¤ò¼ê·Ú¤Ë¹Ô¤¦»ö¤¬½ÐÍè¤Þ
+¤¹¡¥¤â¤Á¤í¤óÄ̾ï¤Î¼ê³¤­·¿¤Î¥×¥í¥°¥é¥ß¥ó¥°¤â²Äǽ¤Ç¤¹¡¥
-Rubyã¯ãƒ†ã‚­ã‚¹ãƒˆå‡¦ç†é–¢ä¿‚ã®èƒ½åŠ›ãªã©ã«å„ªã‚Œï¼ŒPerlã¨åŒã˜ãらã„強力
-ã§ã™ï¼Žã•らã«ã‚·ãƒ³ãƒ—ãƒ«ãªæ–‡æ³•ã¨ï¼Œä¾‹å¤–処ç†ã‚„イテレータãªã©ã®æ©Ÿæ§‹
-ã«ã‚ˆã£ã¦ï¼Œã‚ˆã‚Šåˆ†ã‹ã‚Šã‚„ã™ã„プログラミングãŒå‡ºæ¥ã¾ã™ï¼Ž
+Ruby¤Ï¥Æ¥­¥¹¥È½èÍý´Ø·¸¤ÎǽÎϤʤɤËÍ¥¤ì¡¤Perl¤ÈƱ¤¸¤¯¤é¤¤¶¯ÎÏ
+¤Ç¤¹¡¥¤µ¤é¤Ë¥·¥ó¥×¥ë¤Êʸˡ¤È¡¤Îã³°½èÍý¤ä¥¤¥Æ¥ì¡¼¥¿¤Ê¤É¤Îµ¡¹½
+¤Ë¤è¤Ã¤Æ¡¤¤è¤êʬ¤«¤ê¤ä¤¹¤¤¥×¥í¥°¥é¥ß¥ó¥°¤¬½ÐÍè¤Þ¤¹¡¥
-== Rubyã®ç‰¹é•·
+* Ruby¤ÎÆÃĹ
-* ã‚·ãƒ³ãƒ—ãƒ«ãªæ–‡æ³•
-* 普通ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆæŒ‡å‘æ©Ÿèƒ½(クラス,メソッドコールãªã©)
-* 特殊ãªã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆæŒ‡å‘æ©Ÿèƒ½(Mixin, 特異メソッドãªã©)
-* 演算å­ã‚ªãƒ¼ãƒãƒ¼ãƒ­ãƒ¼ãƒ‰
-* ä¾‹å¤–å‡¦ç†æ©Ÿèƒ½
-* イテレータã¨ã‚¯ãƒ­ãƒ¼ã‚¸ãƒ£
-* ガーベージコレクタ
-* ダイナミックローディング (アーキテクãƒãƒ£ã«ã‚ˆã‚‹)
-* ç§»æ¤æ€§ãŒé«˜ã„.多ãã®Unix-like/POSIX互æ›ãƒ—ラットフォーム上ã§
- å‹•ãã ã‘ã§ãªã,Windows, Mac OS X,BeOSãªã©ã®ä¸Šã§ã‚‚å‹•ã
- cf. http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
+ + ¥·¥ó¥×¥ë¤Êʸˡ
+ + ÉáÄ̤Υª¥Ö¥¸¥§¥¯¥È»Ø¸þµ¡Ç½(¥¯¥é¥¹¡¤¥á¥½¥Ã¥É¥³¡¼¥ë¤Ê¤É)
+ + ÆÃ¼ì¤Ê¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þµ¡Ç½(Mixin, ÆÃ°Û¥á¥½¥Ã¥É¤Ê¤É)
+ + ±é»»»Ò¥ª¡¼¥Ð¡¼¥í¡¼¥É
+ + Îã³°½èÍýµ¡Ç½
+ + ¥¤¥Æ¥ì¡¼¥¿¤È¥¯¥í¡¼¥¸¥ã
+ + ¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥¿
+ + ¥À¥¤¥Ê¥ß¥Ã¥¯¥í¡¼¥Ç¥£¥ó¥° (¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤è¤ë)
+ + °Ü¿¢À­¤¬¹â¤¤¡¥Â¿¤¯¤ÎUnix-like/POSIX¸ß´¹¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç
+ ư¤¯¤À¤±¤Ç¤Ê¤¯¡¤Windows¡¤ Mac OS X¡¤BeOS¤Ê¤É¤Î¾å¤Ç¤âư¤¯
+ cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatformsJa
-== 入手法
+* Æþ¼êË¡
-=== FTPã§
+** FTP¤Ç
-以下ã®å ´æ‰€ã«ãŠã„ã¦ã‚りã¾ã™ï¼Ž
+°Ê²¼¤Î¾ì½ê¤Ë¤ª¤¤¤Æ¤¢¤ê¤Þ¤¹¡¥
-ftp://ftp.ruby-lang.org/pub/ruby/
+ ftp://ftp.ruby-lang.org/pub/ruby/
-=== Subversionã§
+** Subversion¤Ç
-開発先端ã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã¯æ¬¡ã®ã‚³ãƒžãƒ³ãƒ‰ã§å–å¾—ã§ãã¾ã™ï¼Ž
+³«È¯Àèü¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤­¤Þ¤¹¡¥
$ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-ä»–ã«é–‹ç™ºä¸­ã®ãƒ–ランãƒã®ä¸€è¦§ã¯æ¬¡ã®ã‚³ãƒžãƒ³ãƒ‰ã§è¦‹ã‚‰ã‚Œã¾ã™ï¼Ž
+¾¤Ë³«È¯Ãæ¤Î¥Ö¥é¥ó¥Á¤Î°ìÍ÷¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¸«¤é¤ì¤Þ¤¹¡¥
$ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
-=== Gitã§
-Subversionã®ãƒŸãƒ©ãƒ¼ã‚’GitHubã«å…¬é–‹ã—ã¦ã„ã¾ã™ï¼Ž
-以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§ãƒªãƒã‚¸ãƒˆãƒªã‚’å–å¾—ã§ãã¾ã™ï¼Ž
+* ¥Û¡¼¥à¥Ú¡¼¥¸
- $ git clone git://github.com/ruby/ruby.git
+Ruby¤Î¥Û¡¼¥à¥Ú¡¼¥¸¤ÎURL¤Ï
-== ホームページ
+ http://www.ruby-lang.org/
-Rubyã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ã®URLã¯
+¤Ç¤¹¡¥
-http://www.ruby-lang.org/
-ã§ã™ï¼Ž
+* ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
+Ruby¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£»²²Ã´õ˾¤ÎÊý¤Ï
-== メーリングリスト
+ ruby-list-ctl@ruby-lang.org
-Rubyã®ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆãŒã‚りã¾ã™ã€‚å‚åŠ å¸Œæœ›ã®æ–¹ã¯
-
-mailto:ruby-list-ctl@ruby-lang.org
-
-ã¾ã§æœ¬æ–‡ã«
+¤Þ¤ÇËÜʸ¤Ë
subscribe YourFirstName YourFamilyName
+
+¤È½ñ¤¤¤ÆÁ÷¤Ã¤Æ²¼¤µ¤¤¡£
-ã¨æ›¸ã„ã¦é€ã£ã¦ä¸‹ã•ã„。
-
-Ruby開発者å‘ã‘メーリングリストもã‚りã¾ã™ã€‚ã“ã¡ã‚‰ã§ã¯rubyã®ãƒ
-ã‚°ã€å°†æ¥ã®ä»•様拡張ãªã©å®Ÿè£…上ã®å•題ã«ã¤ã„ã¦è­°è«–ã•れã¦ã„ã¾ã™ã€‚
-å‚åŠ å¸Œæœ›ã®æ–¹ã¯
+Ruby³«È¯¼Ô¸þ¤±¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¡£¤³¤Á¤é¤Ç¤Ïruby¤Î¥Ð
+¥°¡¢¾­Íè¤Î»ÅÍͳÈÄ¥¤Ê¤É¼ÂÁõ¾å¤ÎÌäÂê¤Ë¤Ä¤¤¤ÆµÄÏÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+»²²Ã´õ˾¤ÎÊý¤Ï
-mailto:ruby-dev-ctl@ruby-lang.org
+ ruby-dev-ctl@ruby-lang.org
-ã¾ã§ruby-listã¨åŒæ§˜ã®æ–¹æ³•ã§ãƒ¡ãƒ¼ãƒ«ã—ã¦ãã ã•ã„。
+¤Þ¤Çruby-list¤ÈƱÍͤÎÊýË¡¤Ç¥á¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-Ruby拡張モジュールã«ã¤ã„ã¦è©±ã—åˆã†ruby-extメーリングリストã¨
-数学関係ã®è©±é¡Œã«ã¤ã„ã¦è©±ã—åˆã†ruby-mathメーリングリストã¨
-英語ã§è©±ã—åˆã†ruby-talkメーリングリストもã‚りã¾ã™ã€‚å‚加方法
-ã¯ã©ã‚Œã‚‚åŒã˜ã§ã™ã€‚
+Ruby³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Ë¤Ä¤¤¤ÆÏ䷹礦ruby-ext¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤È
+¿ô³Ø´Ø·¸¤ÎÏÃÂê¤Ë¤Ä¤¤¤ÆÏ䷹礦ruby-math¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤È
+±Ñ¸ì¤ÇÏ䷹礦ruby-talk¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¡£»²²ÃÊýË¡
+¤Ï¤É¤ì¤âƱ¤¸¤Ç¤¹¡£
-== コンパイル・インストール
+* ¥³¥ó¥Ñ¥¤¥ë¡¦¥¤¥ó¥¹¥È¡¼¥ë
-ä»¥ä¸‹ã®æ‰‹é †ã§è¡Œã£ã¦ãã ã•ã„.
+°Ê²¼¤Î¼ê½ç¤Ç¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-1. ã‚‚ã— +configure+ ファイルãŒè¦‹ã¤ã‹ã‚‰ãªã„ã€ã‚‚ã—ãã¯
- +configure.in+ よりå¤ã„よã†ãªã‚‰ã€ +autoconf+ を実行ã—ã¦
- æ–°ã—ã +configure+ を生æˆã™ã‚‹
+ 1. ¤â¤·configure¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤Ê¤¤¡¢¤â¤·¤¯¤Ï
+ configure.in¤è¤ê¸Å¤¤¤è¤¦¤Ê¤é¡¢autoconf¤ò¼Â¹Ô¤·¤Æ
+ ¿·¤·¤¯configure¤òÀ¸À®¤¹¤ë
-2. +configure+ を実行ã—㦠+Makefile+ ãªã©ã‚’生æˆã™ã‚‹
+ 2. configure¤ò¼Â¹Ô¤·¤ÆMakefile¤Ê¤É¤òÀ¸À®¤¹¤ë
- 環境ã«ã‚ˆã£ã¦ã¯ãƒ‡ãƒ•ォルトã®Cコンパイラ用オプションãŒä»˜ã
- ã¾ã™ï¼Ž +configure+ オプション㧠<tt>optflags=..</tt> <tt>warnflags=..</tt> ç­‰
- ã§ä¸Šæ›¸ãã§ãã¾ã™ï¼Ž
+ ´Ä¶­¤Ë¤è¤Ã¤Æ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎC¥³¥ó¥Ñ¥¤¥éÍÑ¥ª¥×¥·¥ç¥ó¤¬ÉÕ¤­
+ ¤Þ¤¹¡¥configure¥ª¥×¥·¥ç¥ó¤Ç optflags=.. warnflags=.. Åù
+ ¤Ç¾å½ñ¤­¤Ç¤­¤Þ¤¹¡¥
-3. (å¿…è¦ãªã‚‰ã°)+defines.h+ を編集ã™ã‚‹
+ 3. (ɬÍפʤé¤Ð)defines.h¤òÊÔ½¸¤¹¤ë
- 多分,必è¦ç„¡ã„ã¨æ€ã„ã¾ã™ï¼Ž
+ ¿ʬ¡¤É¬Í×̵¤¤¤È»×¤¤¤Þ¤¹¡¥
-4. (å¿…è¦ãªã‚‰ã°)+ext/Setup+ ã«é™çš„ã«ãƒªãƒ³ã‚¯ã™ã‚‹æ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’
- 指定ã™ã‚‹
+ 4. (ɬÍפʤé¤Ð)ext/Setup¤ËÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë³ÈÄ¥¥â¥¸¥å¡¼¥ë¤ò
+ »ØÄꤹ¤ë
- +ext/Setup+ ã«è¨˜è¿°ã—ãŸãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯é™çš„ã«ãƒªãƒ³ã‚¯ã•れã¾ã™ï¼Ž
+ ext/Setup¤Ëµ­½Ò¤·¤¿¥â¥¸¥å¡¼¥ë¤ÏÀÅŪ¤Ë¥ê¥ó¥¯¤µ¤ì¤Þ¤¹¡¥
- ダイナミックローディングをサãƒãƒ¼ãƒˆã—ã¦ã„ãªã„アーキテク
- ãƒãƒ£ã§ã¯ +Setup+ ã®1行目ã®ã€Œ<tt>option nodynamic</tt>ã€ã¨ã„ã†è¡Œã®ã‚³
- メントを外ã™å¿…è¦ãŒã‚りã¾ã™ï¼Žã¾ãŸï¼Œã“ã®ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ã§
- 拡張モジュールを利用ã™ã‚‹ãŸã‚ã«ã¯ï¼Œã‚らã‹ã˜ã‚é™çš„ã«ãƒªãƒ³
- クã—ã¦ãŠãå¿…è¦ãŒã‚りã¾ã™ï¼Ž
+ ¥À¥¤¥Ê¥ß¥Ã¥¯¥í¡¼¥Ç¥£¥ó¥°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥¢¡¼¥­¥Æ¥¯
+ ¥Á¥ã¤Ç¤ÏSetup¤Î1¹ÔÌܤΡÖoption nodynamic¡×¤È¤¤¤¦¹Ô¤Î¥³
+ ¥á¥ó¥È¤ò³°¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥¤Þ¤¿¡¤¤³¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç
+ ³ÈÄ¥¥â¥¸¥å¡¼¥ë¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¤¤¢¤é¤«¤¸¤áÀÅŪ¤Ë¥ê¥ó
+ ¥¯¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥
-5. +make+ を実行ã—ã¦ã‚³ãƒ³ãƒ‘イルã™ã‚‹
+ 5. make¤ò¼Â¹Ô¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë
-6. <tt>make check</tt>ã§ãƒ†ã‚¹ãƒˆã‚’行ã†ï¼Ž
+ 6. make test¤Ç¥Æ¥¹¥È¤ò¹Ô¤¦¡¥
- 「<tt>check succeeded</tt>ã€ã¨è¡¨ç¤ºã•ã‚Œã‚Œã°æˆåŠŸã§ã™ï¼ŽãŸã ã—テスト
- ã«æˆåŠŸã—ã¦ã‚‚完璧ã ã¨ä¿è¨¼ã•れã¦ã„る訳ã§ã¯ã‚りã¾ã›ã‚“.
+ ¡Ötest succeeded¡×¤Èɽ¼¨¤µ¤ì¤ì¤ÐÀ®¸ù¤Ç¤¹¡¥¤¿¤À¤·¥Æ¥¹¥È
+ ¤ËÀ®¸ù¤·¤Æ¤â´°àú¤À¤ÈÊݾڤµ¤ì¤Æ¤¤¤ëÌõ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥
-7. <tt>make install</tt>
+ 7. make install
- 以下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作ã£ã¦ï¼Œãã“ã«ãƒ•ァイルをインストー
- ルã—ã¾ã™ï¼Ž
+ °Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤Ã¤Æ¡¤¤½¤³¤Ë¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼
+ ¥ë¤·¤Þ¤¹¡¥
- * <tt>${DESTDIR}${prefix}/bin</tt>
- * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
- * <tt>${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}</tt>
- * <tt>${DESTDIR}${prefix}/share/man/man1</tt>
- * <tt>${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system</tt>
+ * ${DESTDIR}${prefix}/bin
+ * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib
+ * ${DESTDIR}${prefix}/lib/ruby
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
+ * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
+ * ${DESTDIR}${prefix}/share/man/man1
+ * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
- Rubyã®APIãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ'_x.y.z_'ã§ã‚れã°ï¼Œ<tt>${MAJOR}</tt>ã¯
- '_x_'ã§ï¼Œ<tt>${MINOR}</tt>ã¯'_y_',<tt>${TEENY}</tt>ã¯'_z_'ã§ã™ï¼Ž
+ Ruby¤ÎAPI¥Ð¡¼¥¸¥ç¥ó¤¬`x.y.z'¤Ç¤¢¤ì¤Ð¡¤((|${MAJOR}|))¤Ï
+ `x'¤Ç¡¤((|${MINOR}|))¤Ï`y'¡¤((|${TEENY}|))¤Ï`z'¤Ç¤¹¡¥
- <b>注æ„</b>: APIãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® +teeny+ ã¯ï¼ŒRubyプログラムã®ãƒãƒ¼ã‚¸ãƒ§
- ンã¨ã¯ç•°ãªã‚‹ã“ã¨ãŒã‚りã¾ã™ï¼Ž
+ Ãí°Õ: API¥Ð¡¼¥¸¥ç¥ó¤Îteeny¤Ï¡¤Ruby¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç
+ ¥ó¤È¤Ï°Û¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡¥
- +root+ ã§ä½œæ¥­ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—れã¾ã›ã‚“.
+ root¤Çºî¶È¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥
-ã‚‚ã—,コンパイル時ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸå ´åˆã«ã¯ã‚¨ãƒ©ãƒ¼ã®ãƒ­ã‚°ã¨ãƒž
-シン,OSã®ç¨®é¡žã‚’å«ã‚€ã§ãã‚‹ã ã‘詳ã—ã„レãƒãƒ¼ãƒˆã‚’作者ã«é€ã£ã¦ã
-ã ã•ã‚‹ã¨ä»–ã®æ–¹ã®ãŸã‚ã«ã‚‚ãªã‚Šã¾ã™ï¼Ž
+¤â¤·¡¤¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¤Ë¤Ï¥¨¥é¡¼¤Î¥í¥°¤È¥Þ
+¥·¥ó¡¤OS¤Î¼ïÎà¤ò´Þ¤à¤Ç¤­¤ë¤À¤±¾Ü¤·¤¤¥ì¥Ý¡¼¥È¤òºî¼Ô¤ËÁ÷¤Ã¤Æ¤¯
+¤À¤µ¤ë¤È¾¤ÎÊý¤Î¤¿¤á¤Ë¤â¤Ê¤ê¤Þ¤¹¡¥
-== ç§»æ¤
+* °Ü¿¢
-UNIXã§ã‚れ㰠+configure+ ãŒã»ã¨ã‚“ã©ã®å·®ç•°ã‚’å¸åŽã—ã¦ãれるã¯ãšã§
-ã™ãŒï¼Œæ€ã‚ã¬è¦‹è½ã¨ã—ãŒã‚ã£ãŸå ´åˆ(ã‚ã‚‹ã«é•ã„ãªã„),作者ã«ãã®
-ã“ã¨ã‚’レãƒãƒ¼ãƒˆã™ã‚Œã°ï¼Œè§£æ±ºã§ãã‚‹ã‹ã‚‚知れã¾ã›ã‚“.
+UNIX¤Ç¤¢¤ì¤Ðconfigure¤¬¤Û¤È¤ó¤É¤Îº¹°Û¤òµÛ¼ý¤·¤Æ¤¯¤ì¤ë¤Ï¤º¤Ç
+¤¹¤¬¡¤»×¤ï¤Ì¸«Íî¤È¤·¤¬¤¢¤Ã¤¿¾ì¹ç(¤¢¤ë¤Ë°ã¤¤¤Ê¤¤)¡¤ºî¼Ô¤Ë¤½¤Î
+¤³¤È¤ò¥ì¥Ý¡¼¥È¤¹¤ì¤Ð¡¤²ò·è¤Ç¤­¤ë¤«¤âÃΤì¤Þ¤»¤ó¡¥
-アーキテクãƒãƒ£ã«ã‚‚ã£ã¨ã‚‚ä¾å­˜ã™ã‚‹ã®ã¯GC部ã§ã™ï¼ŽRubyã®GCã¯å¯¾è±¡
-ã®ã‚¢ãƒ¼ã‚­ãƒ†ã‚¯ãƒãƒ£ãŒ<tt>setjmp()</tt>ã¾ãŸã¯<tt>getcontext()</tt>ã«ã‚ˆã£ã¦å…¨ã¦ã®ãƒ¬
-ジスタを +jmp_buf+ ã‚„ +ucontext_t+ ã«æ ¼ç´ã™ã‚‹ã“ã¨ã¨ï¼Œ +jmp_buf+ ã‚„
-+ucontext_t+ ã¨ã‚¹ã‚¿ãƒƒã‚¯ãŒ32bitアラインメントã•れã¦ã„ã‚‹ã“ã¨ã‚’仮定
-ã—ã¦ã„ã¾ã™ï¼Žç‰¹ã«å‰è€…ãŒæˆç«‹ã—ãªã„å ´åˆã®å¯¾å¿œã¯éžå¸¸ã«å›°é›£ã§ã—ょã†ï¼Ž
-後者ã®è§£æ±ºã¯æ¯”較的簡å˜ã§ï¼Œ +gc.c+ ã§ã‚¹ã‚¿ãƒƒã‚¯ã‚’マークã—ã¦ã„ã‚‹
-部分ã«ã‚¢ãƒ©ã‚¤ãƒ³ãƒ¡ãƒ³ãƒˆã®ãƒã‚¤ãƒˆæ•°ã ã‘ãšã‚‰ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹ã‚³ãƒ¼ãƒ‰ã‚’
-追加ã™ã‚‹ã ã‘ã§æ¸ˆã¿ã¾ã™ï¼Ž<tt>defined(\_\_mc68000\_\_)</tt>ã§æ‹¬ã‚‰ã‚Œã¦ã„
-る部分をå‚考ã«ã—ã¦ãã ã•ã„.
+¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤â¤Ã¤È¤â°Í¸¤¹¤ë¤Î¤ÏGCÉô¤Ç¤¹¡¥Ruby¤ÎGC¤ÏÂоÝ
+¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬setjmp()¤Þ¤¿¤Ïgetcontext()¤Ë¤è¤Ã¤ÆÁ´¤Æ¤Î¥ì
+¥¸¥¹¥¿¤òjmp_buf¤äucontext_t¤Ë³ÊǼ¤¹¤ë¤³¤È¤È¡¤jmp_buf¤ä
+ucontext_t¤È¥¹¥¿¥Ã¥¯¤¬32bit¥¢¥é¥¤¥ó¥á¥ó¥È¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò²¾Äê
+¤·¤Æ¤¤¤Þ¤¹¡¥ÆÃ¤ËÁ°¼Ô¤¬À®Î©¤·¤Ê¤¤¾ì¹ç¤ÎÂбþ¤ÏÈó¾ï¤Ëº¤Æñ¤Ç¤·¤ç
+¤¦¡¥¸å¼Ô¤Î²ò·è¤ÏÈæ³ÓŪ´Êñ¤Ç¡¤gc.c¤Ç¥¹¥¿¥Ã¥¯¤ò¥Þ¡¼¥¯¤·¤Æ¤¤¤ë
+Éôʬ¤Ë¥¢¥é¥¤¥ó¥á¥ó¥È¤Î¥Ð¥¤¥È¿ô¤À¤±¤º¤é¤·¤Æ¥Þ¡¼¥¯¤¹¤ë¥³¡¼¥É¤ò
+Äɲ乤ë¤À¤±¤ÇºÑ¤ß¤Þ¤¹¡¥¡Ödefined(__mc68000__)¡×¤Ç³ç¤é¤ì¤Æ¤¤
+¤ëÉôʬ¤ò»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡¥
-レジスタウィンドウをæŒã¤CPUã§ã¯ï¼Œãƒ¬ã‚¸ã‚¹ã‚¿ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’スタッ
-クã«ãƒ•ラッシュã™ã‚‹ã‚¢ã‚»ãƒ³ãƒ–ラコードを追加ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚知
-れã¾ã›ã‚“.
+¥ì¥¸¥¹¥¿¥¦¥£¥ó¥É¥¦¤ò»ý¤ÄCPU¤Ç¤Ï¡¤¥ì¥¸¥¹¥¿¥¦¥£¥ó¥É¥¦¤ò¥¹¥¿¥Ã
+¥¯¤Ë¥Õ¥é¥Ã¥·¥å¤¹¤ë¥¢¥»¥ó¥Ö¥é¥³¡¼¥É¤òÄɲ乤ëɬÍפ¬¤¢¤ë¤«¤âÃÎ
+¤ì¤Þ¤»¤ó¡¥
-== é…布æ¡ä»¶
+* ÇÛÉÛ¾ò·ï
-+COPYING.ja+ ファイルをå‚ç…§ã—ã¦ãã ã•ã„。
+COPYING.ja¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-== 著者
+* Ãø¼Ô
-コメント,ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆãã®ä»–㯠mailto:matz@ruby-lang.jp ã¾ã§ï¼Ž
+¥³¥á¥ó¥È¡¤¥Ð¥°¥ì¥Ý¡¼¥È¤½¤Î¾¤Ï matz@netlab.jp ¤Þ¤Ç¡¥
-------------------------------------------------------
created at: Thu Aug 3 11:57:36 JST 1995
---
Local variables:
-mode: rdoc
+mode: indented-text
end:
diff --git a/ToDo b/ToDo
new file mode 100644
index 0000000000..7e5ef523a8
--- /dev/null
+++ b/ToDo
@@ -0,0 +1,124 @@
+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.
+* ... inside condition turns off just before right condition.???
+* package or access control for global variables??
+* named arguments like foo(nation:="german") or foo(nation: "german").
+* method to retrieve argument information (needs new C API)
+* multiple return values, yield values. maybe incompatible ???
+* cascading method invocation ???
+* def Class#method .. end ??
+* def Foo::Bar::baz() .. end ??
+* I18N (or M17N) script/string/regexp
+* 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?)
+ + remove scope by block
+ + variables appears within block may have independent values.
+* Regexp: make /o thread safe.
+* decide whether begin with rescue or ensure make do..while loop.
+* unify == and eql? again
+* to_i returns nil if str contains no digit.
+* jar like combined library package. -> RubyGems?
+* method combination, e.g. before, after, around, etc.
+* .. or something like defadvice in Emacs.
+* property - for methods, or for objects in general.
+* "in" modifier, to annotate, or to encourage assertion.
+* 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()"
+
+Hacking Interpreter
+
+- generational GC
+* non-blocking open (e.g. for named pipe) for thread
+* avoid blocking with gethostbyname/gethostbyaddr (use fork ???)
+* objectify interpreters ???
+* remove rb_eval() recursions
+* syntax tree -> bytecode ???
+* scrambled script, or script filter
+* setuid ruby
+* performance tune for in-block (dynamic) local variables.
+* give warnings to assign magic variables.
+* export rb_io_{addstr,printf,puts,print}
+* autoload should work with threads [ruby-talk:4589]
+* remove stdio dependency from IOs.
+* warn for inconsistent local variable usage (lv m and method m at the same time).
+* MicroRuby
+* Built-in Interactive Ruby.
+* Parser API
+* trap every method invocation, which can be enabled by e.g. trap_call :method.
+* unify Errno exceptions of same errno, or new exception comparison scheme.
+* 2.times{|i| if i==0 then a = 15 else puts eval("a") end} should print nil.
+* Thread#max_stack_size attribute (possible??)
+
+Standard Libraries
+
+- Module#define_method which takes a name and a body (block, proc or method).
+- Enume#inject
+- Array#fetch
+- IO::for_fd
+- Process::waitall [ruby-talk:4557]
+- Process::Status
+- File::lchown, File::lchmod; xxx - still need work for non existing platforms
+- move Time::times to Process.
+- Enumerable#sort_by for Schwartzian transformation
+- fork_and_kill_other_threads.
+- signal list (Signal::trap, Signal::list).
+- move NameError under StandardError.
+- Integer#to_s(base)
+- Hash::new{default}
+- hash etc. should handle self referenceing array/hash
+- Array#select(n1,n2...) works like Array#indexes(n1,n2...)
+- use Mersenne Twister RNG for random.
+- deprecate Array#indexes, and Array#indices.
+- remove dependency on MAXPATHLEN.
+- String#scanf(?)
+* Object#fmt(?)
+* Time::strptime
+* Integer[num], Float[num]; Fixnum[num]?
+* method to retrieve non-number trailer for to_i/to_f.
+* Stream or Port, abstract superclass of IO ?
+* String#{pred,prev}, String#downto
+* optional stepsize argument for succ()
+* Ruby module -- Ruby::Version, Ruby::Interpreter
+* introduce Boolean class; super of TrueClass, FalseClass
+* synchronized method - synchronized{...}, synchronized :foo, :bar
+* Array#&, Array#| to allow duplication. ???
+* way to specify immortal (fork endurance) thread;
+* or raise ForkException to every thread but fork caller.
+* new user-defined marshal scheme. _dump(dumper), _load(restorer)
+* library to load per-user profile seeking .ruby_profile or ruby.ini file.
+* warning framework (warn, warning for Ruby level)
+* marshal should not depend on sprintf (works bad with locale).
+* ternary arg pow: a.pow(b,c) == a**b%c
+* new caller(), e.g. call_stack; needs better name.
+* pointer share mechanism similar to one in String for Array.
+* require "1.6" etc. by /usr/lib/ruby/1.6/1.6.rb ;-)
+* save both "feature names" and "normalized path" in $"
+* implement Mutex_m (or MutexMixin) using Mutex.
+
+Extension Libraries
+
+* ptk.rb pTk wrapper that is compatible to tk.rb
+* Berkeley DB extension
+* BitVector
+* thread-safe fcgi
+
+Ruby Libraries
+
+- urllib.rb, nttplib.rb, etc.
+* format like perl's
+
+Tools
+
+* freeze or undump to bundle everything
+* bundle using zlib
diff --git a/addr2line.c b/addr2line.c
deleted file mode 100644
index 72e2c15617..0000000000
--- a/addr2line.c
+++ /dev/null
@@ -1,1080 +0,0 @@
-/**********************************************************************
-
- addr2line.c -
-
- $Author$
-
- Copyright (C) 2010 Shinichiro Hamaji
-
-**********************************************************************/
-
-#include "ruby/config.h"
-#include "addr2line.h"
-
-#include <stdio.h>
-#include <errno.h>
-
-#ifdef USE_ELF
-
-#ifdef __OpenBSD__
-#include <elf_abi.h>
-#else
-#include <elf.h>
-#endif
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-/* 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__ */
-
-#ifdef HAVE_DL_ITERATE_PHDR
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-# endif
-# include <link.h>
-#endif
-
-#define DW_LNS_copy 0x01
-#define DW_LNS_advance_pc 0x02
-#define DW_LNS_advance_line 0x03
-#define DW_LNS_set_file 0x04
-#define DW_LNS_set_column 0x05
-#define DW_LNS_negate_stmt 0x06
-#define DW_LNS_set_basic_block 0x07
-#define DW_LNS_const_add_pc 0x08
-#define DW_LNS_fixed_advance_pc 0x09
-#define DW_LNS_set_prologue_end 0x0a /* DWARF3 */
-#define DW_LNS_set_epilogue_begin 0x0b /* DWARF3 */
-#define DW_LNS_set_isa 0x0c /* DWARF3 */
-
-/* Line number extended opcode name. */
-#define DW_LNE_end_sequence 0x01
-#define DW_LNE_set_address 0x02
-#define DW_LNE_define_file 0x03
-#define DW_LNE_set_discriminator 0x04 /* DWARF4 */
-
-#ifndef ElfW
-# if SIZEOF_VOIDP == 8
-# define ElfW(x) Elf64##_##x
-# else
-# define ElfW(x) Elf32##_##x
-# endif
-#endif
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-int kprintf(const char *fmt, ...);
-
-typedef struct {
- const char *dirname;
- const char *filename;
- int line;
-
- int fd;
- void *mapped;
- size_t mapped_size;
- unsigned long base_addr;
-} line_info_t;
-
-/* Avoid consuming stack as this module may be used from signal handler */
-static char binary_filename[PATH_MAX];
-
-static unsigned long
-uleb128(char **p)
-{
- unsigned long r = 0;
- int s = 0;
- for (;;) {
- unsigned char b = *(unsigned char *)(*p)++;
- if (b < 0x80) {
- r += (unsigned long)b << s;
- break;
- }
- r += (b & 0x7f) << s;
- s += 7;
- }
- return r;
-}
-
-static long
-sleb128(char **p)
-{
- long r = 0;
- int s = 0;
- for (;;) {
- unsigned char b = *(unsigned char *)(*p)++;
- if (b < 0x80) {
- if (b & 0x40) {
- r -= (0x80 - b) << s;
- }
- else {
- r += (b & 0x3f) << s;
- }
- break;
- }
- r += (b & 0x7f) << s;
- s += 7;
- }
- return r;
-}
-
-static const char *
-get_nth_dirname(unsigned long dir, char *p)
-{
- if (!dir--) {
- return "";
- }
- while (dir--) {
- while (*p) p++;
- p++;
- if (!*p) {
- kprintf("Unexpected directory number %lu in %s\n",
- dir, binary_filename);
- return "";
- }
- }
- return p;
-}
-
-static void
-fill_filename(int file, char *include_directories, char *filenames,
- line_info_t *line)
-{
- int i;
- char *p = filenames;
- char *filename;
- unsigned long dir;
- for (i = 1; i <= file; i++) {
- filename = p;
- if (!*p) {
- /* Need to output binary file name? */
- kprintf("Unexpected file number %d in %s\n",
- file, binary_filename);
- return;
- }
- while (*p) p++;
- p++;
- dir = uleb128(&p);
- /* last modified. */
- uleb128(&p);
- /* size of the file. */
- uleb128(&p);
-
- if (i == file) {
- line->filename = filename;
- line->dirname = get_nth_dirname(dir, include_directories);
- }
- }
-}
-
-static int
-get_path_from_symbol(const char *symbol, const char **p, size_t *len)
-{
- if (symbol[0] == '0') {
- /* libexecinfo */
- *p = strchr(symbol, '/');
- if (*p == NULL) return 0;
- *len = strlen(*p);
- }
- else {
- /* glibc */
- const char *q;
- *p = symbol;
- q = strchr(symbol, '(');
- if (q == NULL) return 0;
- *len = q - symbol;
- }
- return 1;
-}
-
-static void
-fill_line(int num_traces, void **traces,
- unsigned long addr, int file, int line,
- char *include_directories, char *filenames, line_info_t *lines)
-{
- int i;
- for (i = 0; i < num_traces; i++) {
- unsigned long a = (unsigned long)traces[i] - lines[i].base_addr;
- /* We assume one line code doesn't result >100 bytes of native code.
- We may want more reliable way eventually... */
- if (addr < a && a < addr + 100) {
- fill_filename(file, include_directories, filenames, &lines[i]);
- lines[i].line = line;
- }
- }
-}
-
-static void
-parse_debug_line_cu(int num_traces, void **traces,
- char **debug_line, line_info_t *lines)
-{
- char *p, *cu_end, *cu_start, *include_directories, *filenames;
- unsigned long unit_length;
- int default_is_stmt, line_base;
- unsigned int header_length, minimum_instruction_length, line_range,
- opcode_base;
- /* unsigned char *standard_opcode_lengths; */
-
- /* The registers. */
- unsigned long addr = 0;
- unsigned int file = 1;
- unsigned int line = 1;
- /* unsigned int column = 0; */
- int is_stmt;
- /* int basic_block = 0; */
- /* int end_sequence = 0; */
- /* int prologue_end = 0; */
- /* int epilogue_begin = 0; */
- /* unsigned int isa = 0; */
-
- p = *debug_line;
-
- unit_length = *(unsigned int *)p;
- p += sizeof(unsigned int);
- if (unit_length == 0xffffffff) {
- unit_length = *(unsigned long *)p;
- p += sizeof(unsigned long);
- }
-
- cu_end = p + unit_length;
-
- /*dwarf_version = *(unsigned short *)p;*/
- p += 2;
-
- header_length = *(unsigned int *)p;
- p += sizeof(unsigned int);
-
- cu_start = p + header_length;
-
- minimum_instruction_length = *(unsigned char *)p;
- p++;
-
- is_stmt = default_is_stmt = *(unsigned char *)p;
- p++;
-
- line_base = *(char *)p;
- p++;
-
- line_range = *(unsigned char *)p;
- p++;
-
- opcode_base = *(unsigned char *)p;
- p++;
-
- /* standard_opcode_lengths = (unsigned char *)p - 1; */
- p += opcode_base - 1;
-
- include_directories = p;
-
- /* skip include directories */
- while (*p) {
- while (*p) p++;
- p++;
- }
- p++;
-
- filenames = p;
-
- p = cu_start;
-
-#define FILL_LINE() \
- do { \
- fill_line(num_traces, traces, addr, file, line, \
- include_directories, filenames, lines); \
- /*basic_block = prologue_end = epilogue_begin = 0;*/ \
- } while (0)
-
- while (p < cu_end) {
- unsigned long a;
- unsigned char op = *p++;
- switch (op) {
- case DW_LNS_copy:
- FILL_LINE();
- break;
- case DW_LNS_advance_pc:
- a = uleb128(&p);
- addr += a;
- break;
- case DW_LNS_advance_line: {
- long a = sleb128(&p);
- line += a;
- break;
- }
- case DW_LNS_set_file:
- file = (unsigned int)uleb128(&p);
- break;
- case DW_LNS_set_column:
- /*column = (unsigned int)*/(void)uleb128(&p);
- break;
- case DW_LNS_negate_stmt:
- is_stmt = !is_stmt;
- break;
- case DW_LNS_set_basic_block:
- /*basic_block = 1; */
- break;
- case DW_LNS_const_add_pc:
- a = ((255 - opcode_base) / line_range) *
- minimum_instruction_length;
- addr += a;
- break;
- case DW_LNS_fixed_advance_pc:
- a = *(unsigned char *)p++;
- addr += a;
- break;
- case DW_LNS_set_prologue_end:
- /* prologue_end = 1; */
- break;
- case DW_LNS_set_epilogue_begin:
- /* epilogue_begin = 1; */
- break;
- case DW_LNS_set_isa:
- /* isa = (unsigned int)*/(void)uleb128(&p);
- break;
- case 0:
- a = *(unsigned char *)p++;
- op = *p++;
- switch (op) {
- case DW_LNE_end_sequence:
- /* end_sequence = 1; */
- FILL_LINE();
- addr = 0;
- file = 1;
- line = 1;
- /* column = 0; */
- is_stmt = default_is_stmt;
- /* end_sequence = 0; */
- /* isa = 0; */
- break;
- case DW_LNE_set_address:
- addr = *(unsigned long *)p;
- p += sizeof(unsigned long);
- break;
- case DW_LNE_define_file:
- kprintf("Unsupported operation in %s\n",
- binary_filename);
- break;
- case DW_LNE_set_discriminator:
- /* TODO:currently ignore */
- uleb128(&p);
- break;
- default:
- kprintf("Unknown extended opcode: %d in %s\n",
- op, binary_filename);
- }
- break;
- default: {
- unsigned long addr_incr;
- unsigned long line_incr;
- a = op - opcode_base;
- addr_incr = (a / line_range) * minimum_instruction_length;
- line_incr = line_base + (a % line_range);
- addr += (unsigned int)addr_incr;
- line += (unsigned int)line_incr;
- FILL_LINE();
- }
- }
- }
- *debug_line = p;
-}
-
-static void
-parse_debug_line(int num_traces, void **traces,
- char *debug_line, unsigned long size, line_info_t *lines)
-{
- char *debug_line_end = debug_line + size;
- while (debug_line < debug_line_end) {
- parse_debug_line_cu(num_traces, traces, &debug_line, lines);
- }
- if (debug_line != debug_line_end) {
- kprintf("Unexpected size of .debug_line in %s\n",
- binary_filename);
- }
-}
-
-/* read file and fill lines */
-static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
- line_info_t *current_line, line_info_t *lines);
-
-static void
-follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
- line_info_t *current_line, line_info_t *lines)
-{
- /* Ideally we should check 4 paths to follow gnu_debuglink,
- but we handle only one case for now as this format is used
- by some linux distributions. See GDB's info for detail. */
- static const char global_debug_dir[] = "/usr/lib/debug";
- char *p, *subdir;
-
- p = strrchr(binary_filename, '/');
- if (!p) {
- return;
- }
- p[1] = '\0';
-
- subdir = (char *)alloca(strlen(binary_filename) + 1);
- strcpy(subdir, binary_filename);
- strcpy(binary_filename, global_debug_dir);
- strncat(binary_filename, subdir,
- PATH_MAX - strlen(binary_filename) - 1);
- strncat(binary_filename, debuglink,
- PATH_MAX - strlen(binary_filename) - 1);
-
- munmap(current_line->mapped, current_line->mapped_size);
- close(current_line->fd);
- fill_lines(num_traces, traces, syms, 0, current_line, lines);
-}
-
-/* read file and fill lines */
-static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
- line_info_t *current_line, line_info_t *lines)
-{
- int i;
- char *shstr;
- char *section_name;
- ElfW(Ehdr) *ehdr;
- ElfW(Shdr) *shdr, *shstr_shdr;
- ElfW(Shdr) *debug_line_shdr = NULL, *gnu_debuglink_shdr = NULL;
- int fd;
- off_t filesize;
- char *file;
-
- fd = open(binary_filename, O_RDONLY);
- if (fd < 0) {
- return;
- }
- filesize = lseek(fd, 0, SEEK_END);
- if (filesize < 0) {
- int e = errno;
- close(fd);
- kprintf("lseek: %s\n", strerror(e));
- return;
- }
-#if SIZEOF_OFF_T > SIZEOF_SIZE_T
- if (filesize > (off_t)SIZE_MAX) {
- close(fd);
- kprintf("Too large file %s\n", binary_filename);
- return;
- }
-#endif
- lseek(fd, 0, SEEK_SET);
- /* async-signal unsafe */
- file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
- if (file == MAP_FAILED) {
- int e = errno;
- close(fd);
- kprintf("mmap: %s\n", strerror(e));
- return;
- }
-
- ehdr = (ElfW(Ehdr) *)file;
- if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) {
- /*
- * Huh? Maybe filename was overridden by setproctitle() and
- * it match non-elf file.
- */
- close(fd);
- return;
- }
-
- current_line->fd = fd;
- current_line->mapped = file;
- current_line->mapped_size = (size_t)filesize;
-
- for (i = 0; i < num_traces; i++) {
- const char *path;
- size_t len;
- if (get_path_from_symbol(syms[i], &path, &len) &&
- !strncmp(path, binary_filename, len)) {
- lines[i].line = -1;
- }
- }
-
- shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff);
-
- shstr_shdr = shdr + ehdr->e_shstrndx;
- shstr = file + shstr_shdr->sh_offset;
-
- for (i = 0; i < ehdr->e_shnum; i++) {
- section_name = shstr + shdr[i].sh_name;
- if (!strcmp(section_name, ".debug_line")) {
- debug_line_shdr = shdr + i;
- break;
- } else if (!strcmp(section_name, ".gnu_debuglink")) {
- gnu_debuglink_shdr = shdr + i;
- }
- }
-
- if (!debug_line_shdr) {
- /* This file doesn't have .debug_line section,
- let's check .gnu_debuglink section instead. */
- if (gnu_debuglink_shdr && check_debuglink) {
- follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
- num_traces, traces, syms,
- current_line, lines);
- }
- return;
- }
-
- parse_debug_line(num_traces, traces,
- file + debug_line_shdr->sh_offset,
- debug_line_shdr->sh_size,
- lines);
-}
-
-#ifdef HAVE_DL_ITERATE_PHDR
-
-typedef struct {
- int num_traces;
- char **syms;
- line_info_t *lines;
-} fill_base_addr_state_t;
-
-static int
-fill_base_addr(struct dl_phdr_info *info, size_t size, void *data)
-{
- int i;
- fill_base_addr_state_t *st = (fill_base_addr_state_t *)data;
- for (i = 0; i < st->num_traces; i++) {
- const char *path;
- size_t len;
- size_t name_len = strlen(info->dlpi_name);
-
- if (get_path_from_symbol(st->syms[i], &path, &len) &&
- (len == name_len || (len > name_len && path[len-name_len-1] == '/')) &&
- !strncmp(path+len-name_len, info->dlpi_name, name_len)) {
- st->lines[i].base_addr = info->dlpi_addr;
- }
- }
- return 0;
-}
-
-#endif /* HAVE_DL_ITERATE_PHDR */
-
-void
-rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
-{
- int i;
- /* async-signal unsafe */
- line_info_t *lines = (line_info_t *)calloc(num_traces,
- sizeof(line_info_t));
-
- /* Note that line info of shared objects might not be shown
- if we don't have dl_iterate_phdr */
-#ifdef HAVE_DL_ITERATE_PHDR
- fill_base_addr_state_t fill_base_addr_state;
-
- fill_base_addr_state.num_traces = num_traces;
- fill_base_addr_state.syms = syms;
- fill_base_addr_state.lines = lines;
- /* maybe async-signal unsafe */
- dl_iterate_phdr(fill_base_addr, &fill_base_addr_state);
-#endif /* HAVE_DL_ITERATE_PHDR */
-
- for (i = 0; i < num_traces; i++) {
- const char *path;
- size_t len;
- if (lines[i].line) {
- continue;
- }
-
- if (!get_path_from_symbol(syms[i], &path, &len)) {
- continue;
- }
-
- strncpy(binary_filename, path, len);
- binary_filename[len] = '\0';
-
- fill_lines(num_traces, trace, syms, 1, &lines[i], lines);
- }
-
- for (i = 0; i < num_traces; i++) {
- line_info_t *line = &lines[i];
-
- if (line->line > 0) {
- if (line->filename) {
- if (line->dirname && line->dirname[0]) {
- kprintf("%s %s/%s:%d\n", syms[i], line->dirname, line->filename, line->line);
- }
- else {
- kprintf("%s %s:%d\n", syms[i], line->filename, line->line);
- }
- } else {
- kprintf("%s ???:%d\n", syms[i], line->line);
- }
- } else {
- kprintf("%s\n", syms[i]);
- }
- }
-
- for (i = 0; i < num_traces; i++) {
- line_info_t *line = &lines[i];
- if (line->fd) {
- munmap(line->mapped, line->mapped_size);
- close(line->fd);
- }
- }
- free(lines);
-}
-
-/* From FreeBSD's lib/libstand/printf.c */
-/*-
- * Copyright (c) 1986, 1988, 1991, 1993
- * The Regents of the University of California. All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
- */
-
-#include <stdarg.h>
-#define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1)
-extern int rb_toupper(int c);
-#define toupper(c) rb_toupper(c)
-#define hex2ascii(hex) (hex2ascii_data[hex])
-char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-static inline int imax(int a, int b) { return (a > b ? a : b); }
-static int kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap);
-
-static void putce(int c)
-{
- char s[1];
- ssize_t ret;
-
- s[0] = (char)c;
- ret = write(2, s, 1);
- (void)ret;
-}
-
-int
-kprintf(const char *fmt, ...)
-{
- va_list ap;
- int retval;
-
- va_start(ap, fmt);
- retval = kvprintf(fmt, putce, NULL, 10, ap);
- va_end(ap);
- return retval;
-}
-
-/*
- * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse
- * order; return an optional length and a pointer to the last character
- * written in the buffer (i.e., the first character of the string).
- * The buffer pointed to by `nbuf' must have length >= MAXNBUF.
- */
-static char *
-ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
-{
- char *p, c;
-
- p = nbuf;
- *p = '\0';
- do {
- c = hex2ascii(num % base);
- *++p = upper ? toupper(c) : c;
- } while (num /= base);
- if (lenp)
- *lenp = p - nbuf;
- return (p);
-}
-
-/*
- * Scaled down version of printf(3).
- *
- * Two additional formats:
- *
- * The format %b is supported to decode error registers.
- * Its usage is:
- *
- * printf("reg=%b\n", regval, "<base><arg>*");
- *
- * where <base> is the output base expressed as a control character, e.g.
- * \10 gives octal; \20 gives hex. Each arg is a sequence of characters,
- * the first of which gives the bit number to be inspected (origin 1), and
- * the next characters (up to a control character, i.e. a character <= 32),
- * give the name of the register. Thus:
- *
- * kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
- *
- * would produce output:
- *
- * reg=3<BITTWO,BITONE>
- *
- * XXX: %D -- Hexdump, takes pointer and separator string:
- * ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX
- * ("%*D", len, ptr, " " -> XX XX XX XX ...
- */
-static int
-kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap)
-{
-#define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; }
- char nbuf[MAXNBUF];
- char *d;
- const char *p, *percent, *q;
- unsigned char *up;
- int ch, n;
- uintmax_t num;
- int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
- int cflag, hflag, jflag, tflag, zflag;
- int dwidth, upper;
- char padc;
- int stop = 0, retval = 0;
-
- num = 0;
- if (!func)
- d = (char *) arg;
- else
- d = NULL;
-
- if (fmt == NULL)
- fmt = "(fmt null)\n";
-
- if (radix < 2 || radix > 36)
- radix = 10;
-
- for (;;) {
- padc = ' ';
- width = 0;
- while ((ch = (unsigned char)*fmt++) != '%' || stop) {
- if (ch == '\0')
- return (retval);
- PCHAR(ch);
- }
- percent = fmt - 1;
- qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
- sign = 0; dot = 0; dwidth = 0; upper = 0;
- cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
-reswitch: switch (ch = (unsigned char)*fmt++) {
- case '.':
- dot = 1;
- goto reswitch;
- case '#':
- sharpflag = 1;
- goto reswitch;
- case '+':
- sign = 1;
- goto reswitch;
- case '-':
- ladjust = 1;
- goto reswitch;
- case '%':
- PCHAR(ch);
- break;
- case '*':
- if (!dot) {
- width = va_arg(ap, int);
- if (width < 0) {
- ladjust = !ladjust;
- width = -width;
- }
- } else {
- dwidth = va_arg(ap, int);
- }
- goto reswitch;
- case '0':
- if (!dot) {
- padc = '0';
- goto reswitch;
- }
- case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- for (n = 0;; ++fmt) {
- n = n * 10 + ch - '0';
- ch = *fmt;
- if (ch < '0' || ch > '9')
- break;
- }
- if (dot)
- dwidth = n;
- else
- width = n;
- goto reswitch;
- case 'b':
- num = (unsigned int)va_arg(ap, int);
- p = va_arg(ap, char *);
- for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
- PCHAR(*q--);
-
- if (num == 0)
- break;
-
- for (tmp = 0; *p;) {
- n = *p++;
- if (num & (1 << (n - 1))) {
- PCHAR(tmp ? ',' : '<');
- for (; (n = *p) > ' '; ++p)
- PCHAR(n);
- tmp = 1;
- } else
- for (; *p > ' '; ++p)
- continue;
- }
- if (tmp)
- PCHAR('>');
- break;
- case 'c':
- PCHAR(va_arg(ap, int));
- break;
- case 'D':
- up = va_arg(ap, unsigned char *);
- p = va_arg(ap, char *);
- if (!width)
- width = 16;
- while(width--) {
- PCHAR(hex2ascii(*up >> 4));
- PCHAR(hex2ascii(*up & 0x0f));
- up++;
- if (width)
- for (q=p;*q;q++)
- PCHAR(*q);
- }
- break;
- case 'd':
- case 'i':
- base = 10;
- sign = 1;
- goto handle_sign;
- case 'h':
- if (hflag) {
- hflag = 0;
- cflag = 1;
- } else
- hflag = 1;
- goto reswitch;
- case 'j':
- jflag = 1;
- goto reswitch;
- case 'l':
- if (lflag) {
- lflag = 0;
- qflag = 1;
- } else
- lflag = 1;
- goto reswitch;
- case 'n':
- if (jflag)
- *(va_arg(ap, intmax_t *)) = retval;
- else if (qflag)
- *(va_arg(ap, int64_t *)) = retval;
- else if (lflag)
- *(va_arg(ap, long *)) = retval;
- else if (zflag)
- *(va_arg(ap, size_t *)) = retval;
- else if (hflag)
- *(va_arg(ap, short *)) = retval;
- else if (cflag)
- *(va_arg(ap, char *)) = retval;
- else
- *(va_arg(ap, int *)) = retval;
- break;
- case 'o':
- base = 8;
- goto handle_nosign;
- case 'p':
- base = 16;
- sharpflag = (width == 0);
- sign = 0;
- num = (uintptr_t)va_arg(ap, void *);
- goto number;
- case 'q':
- qflag = 1;
- goto reswitch;
- case 'r':
- base = radix;
- if (sign)
- goto handle_sign;
- goto handle_nosign;
- case 's':
- p = va_arg(ap, char *);
- if (p == NULL)
- p = "(null)";
- if (!dot)
- n = strlen (p);
- else
- for (n = 0; n < dwidth && p[n]; n++)
- continue;
-
- width -= n;
-
- if (!ladjust && width > 0)
- while (width--)
- PCHAR(padc);
- while (n--)
- PCHAR(*p++);
- if (ladjust && width > 0)
- while (width--)
- PCHAR(padc);
- break;
- case 't':
- tflag = 1;
- goto reswitch;
- case 'u':
- base = 10;
- goto handle_nosign;
- case 'X':
- upper = 1;
- case 'x':
- base = 16;
- goto handle_nosign;
- case 'y':
- base = 16;
- sign = 1;
- goto handle_sign;
- case 'z':
- zflag = 1;
- goto reswitch;
-handle_nosign:
- sign = 0;
- if (jflag)
- num = va_arg(ap, uintmax_t);
- else if (qflag)
- num = va_arg(ap, uint64_t);
- else if (tflag)
- num = va_arg(ap, ptrdiff_t);
- else if (lflag)
- num = va_arg(ap, unsigned long);
- else if (zflag)
- num = va_arg(ap, size_t);
- else if (hflag)
- num = (unsigned short)va_arg(ap, int);
- else if (cflag)
- num = (unsigned char)va_arg(ap, int);
- else
- num = va_arg(ap, unsigned int);
- goto number;
-handle_sign:
- if (jflag)
- num = va_arg(ap, intmax_t);
- else if (qflag)
- num = va_arg(ap, int64_t);
- else if (tflag)
- num = va_arg(ap, ptrdiff_t);
- else if (lflag)
- num = va_arg(ap, long);
- else if (zflag)
- num = va_arg(ap, ssize_t);
- else if (hflag)
- num = (short)va_arg(ap, int);
- else if (cflag)
- num = (char)va_arg(ap, int);
- else
- num = va_arg(ap, int);
-number:
- if (sign && (intmax_t)num < 0) {
- neg = 1;
- num = -(intmax_t)num;
- }
- p = ksprintn(nbuf, num, base, &n, upper);
- tmp = 0;
- if (sharpflag && num != 0) {
- if (base == 8)
- tmp++;
- else if (base == 16)
- tmp += 2;
- }
- if (neg)
- tmp++;
-
- if (!ladjust && padc == '0')
- dwidth = width - tmp;
- width -= tmp + imax(dwidth, n);
- dwidth -= n;
- if (!ladjust)
- while (width-- > 0)
- PCHAR(' ');
- if (neg)
- PCHAR('-');
- if (sharpflag && num != 0) {
- if (base == 8) {
- PCHAR('0');
- } else if (base == 16) {
- PCHAR('0');
- PCHAR('x');
- }
- }
- while (dwidth-- > 0)
- PCHAR('0');
-
- while (*p)
- PCHAR(*p--);
-
- if (ladjust)
- while (width-- > 0)
- PCHAR(' ');
-
- break;
- default:
- while (percent < fmt)
- PCHAR(*percent++);
- /*
- * Since we ignore an formatting argument it is no
- * longer safe to obey the remaining formatting
- * arguments as the arguments will no longer match
- * the format specs.
- */
- stop = 1;
- break;
- }
- }
-#undef PCHAR
-}
-#else /* defined(USE_ELF) */
-#error not supported
-#endif
diff --git a/addr2line.h b/addr2line.h
deleted file mode 100644
index 3782d89e07..0000000000
--- a/addr2line.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**********************************************************************
-
- addr2line.h -
-
- $Author$
-
- Copyright (C) 2010 Shinichiro Hamaji
-
-**********************************************************************/
-
-#ifndef RUBY_ADDR2LINE_H
-#define RUBY_ADDR2LINE_H
-
-#ifdef USE_ELF
-
-void
-rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
-
-#endif /* USE_ELF */
-
-#endif /* RUBY_ADDR2LINE_H */
diff --git a/array.c b/array.c
index 54d3d763e0..60f3f5646b 100644
--- a/array.c
+++ b/array.c
@@ -14,21 +14,15 @@
#include "ruby/ruby.h"
#include "ruby/util.h"
#include "ruby/st.h"
-#include "ruby/encoding.h"
-#include "internal.h"
-#include "probes.h"
-#include "id.h"
#ifndef ARRAY_DEBUG
# define NDEBUG
#endif
#include <assert.h>
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
VALUE rb_cArray;
-static ID id_cmp, id_div, id_power;
+static ID id_cmp;
#define ARY_DEFAULT_SIZE 16
#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
@@ -50,11 +44,11 @@ memfill(register VALUE *mem, register long size, register VALUE val)
}
# define ARY_SHARED_P(ary) \
- (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
- FL_TEST((ary),ELTS_SHARED)!=0)
+ (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)
+ (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)
@@ -64,17 +58,18 @@ memfill(register VALUE *mem, register long size, register VALUE val)
(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 ARY_OWNS_HEAP_P(a) (!FL_TEST(a, ELTS_SHARED|RARRAY_EMBED_FLAG))
#define FL_SET_EMBED(a) do { \
assert(!ARY_SHARED_P(a)); \
- FL_SET((a), RARRAY_EMBED_FLAG); \
+ 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_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); \
+ FL_SET(ary, ELTS_SHARED); \
} while (0)
-#define FL_UNSET_SHARED(ary) FL_UNSET((ary), ELTS_SHARED)
+#define FL_UNSET_SHARED(ary) FL_UNSET(ary, ELTS_SHARED)
#define ARY_SET_PTR(ary, p) do { \
assert(!ARY_EMBED_P(ary)); \
@@ -82,7 +77,7 @@ memfill(register VALUE *mem, register long size, register VALUE val)
RARRAY(ary)->as.heap.ptr = (p); \
} while (0)
#define ARY_SET_EMBED_LEN(ary, n) do { \
- long tmp_n = (n); \
+ long tmp_n = n; \
assert(ARY_EMBED_P(ary)); \
assert(!OBJ_FROZEN(ary)); \
RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
@@ -90,29 +85,29 @@ memfill(register VALUE *mem, register long size, register VALUE val)
} while (0)
#define ARY_SET_HEAP_LEN(ary, n) do { \
assert(!ARY_EMBED_P(ary)); \
- RARRAY(ary)->as.heap.len = (n); \
+ 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)); \
+ ARY_SET_EMBED_LEN(ary, n); \
} \
else { \
- ARY_SET_HEAP_LEN((ary), (n)); \
+ ARY_SET_HEAP_LEN(ary, n); \
} \
- assert(RARRAY_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); \
+ 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)); \
+ ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)+n); \
} \
else { \
- RARRAY(ary)->as.heap.len += (n); \
+ RARRAY(ary)->as.heap.len += n; \
} \
} while (0)
@@ -133,7 +128,7 @@ memfill(register VALUE *mem, register long size, register VALUE val)
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_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 { \
@@ -142,7 +137,7 @@ memfill(register VALUE *mem, register long size, register VALUE val)
} while (0)
#define FL_SET_SHARED_ROOT(ary) do { \
assert(!ARY_EMBED_P(ary)); \
- FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
+ FL_SET(ary, RARRAY_SHARED_ROOT_FLAG); \
} while (0)
static void
@@ -245,35 +240,26 @@ rb_ary_set_shared(VALUE ary, VALUE shared)
static inline void
rb_ary_modify_check(VALUE ary)
{
- rb_check_frozen(ary);
+ if (OBJ_FROZEN(ary)) rb_error_frozen("array");
if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4)
rb_raise(rb_eSecurityError, "Insecure: can't modify array");
}
-void
+static void
rb_ary_modify(VALUE ary)
{
rb_ary_modify_check(ary);
if (ARY_SHARED_P(ary)) {
long len = RARRAY_LEN(ary);
- VALUE shared = ARY_SHARED(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 if (ARY_SHARED_NUM(shared) == 1 && len > (RARRAY_LEN(shared)>>1)) {
- long shift = RARRAY_PTR(ary) - RARRAY_PTR(shared);
- FL_UNSET_SHARED(ary);
- ARY_SET_PTR(ary, RARRAY_PTR(shared));
- ARY_SET_CAPA(ary, RARRAY_LEN(shared));
- MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+shift, VALUE, len);
- FL_SET_EMBED(shared);
- rb_ary_decrement_share(shared);
- }
else {
VALUE *ptr = ALLOC_N(VALUE, len);
MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len);
@@ -284,48 +270,6 @@ rb_ary_modify(VALUE ary)
}
}
-static void
-ary_ensure_room_for_push(VALUE ary, long add_len)
-{
- long new_len = RARRAY_LEN(ary) + add_len;
- long capa;
-
- if (ARY_SHARED_P(ary)) {
- if (new_len > RARRAY_EMBED_LEN_MAX) {
- VALUE shared = ARY_SHARED(ary);
- if (ARY_SHARED_NUM(shared) == 1) {
- if (RARRAY_PTR(ary) - RARRAY_PTR(shared) + new_len <= RARRAY_LEN(shared)) {
- rb_ary_modify_check(ary);
- }
- else {
- /* if array is shared, than it is likely it participate in push/shift pattern */
- rb_ary_modify(ary);
- capa = ARY_CAPA(ary);
- if (new_len > capa - (capa >> 6)) {
- ary_double_capa(ary, new_len);
- }
- }
- return;
- }
- }
- }
- rb_ary_modify(ary);
- capa = ARY_CAPA(ary);
- if (new_len > capa) {
- ary_double_capa(ary, new_len);
- }
-}
-
-/*
- * call-seq:
- * ary.freeze -> ary
- *
- * Calls Object#freeze on +ary+ to prevent any further
- * modification. A RuntimeError will be raised if a modification
- * attempt is made.
- *
- */
-
VALUE
rb_ary_freeze(VALUE ary)
{
@@ -336,8 +280,8 @@ rb_ary_freeze(VALUE ary)
* call-seq:
* ary.frozen? -> true or false
*
- * Return +true+ if this array is frozen (or temporarily frozen
- * while being sorted). See also Object#frozen?
+ * Return <code>true</code> if this array is frozen (or temporarily frozen
+ * while being sorted).
*/
static VALUE
@@ -347,29 +291,11 @@ rb_ary_frozen_p(VALUE ary)
return Qfalse;
}
-/* This can be used to take a snapshot of an array (with
- e.g. rb_ary_replace) and check later whether the array has been
- modified from the snapshot. The snapshot is cheap, though if
- something does modify the array it will pay the cost of copying
- it. If Array#pop or Array#shift has been called, the array will
- be still shared with the snapshot, but the array length will
- differ. */
-VALUE
-rb_ary_shared_with_p(VALUE ary1, VALUE ary2)
-{
- if (!ARY_EMBED_P(ary1) && ARY_SHARED_P(ary1) &&
- !ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) &&
- RARRAY(ary1)->as.heap.aux.shared == RARRAY(ary2)->as.heap.aux.shared &&
- RARRAY(ary1)->as.heap.len == RARRAY(ary2)->as.heap.len) {
- return Qtrue;
- }
- return Qfalse;
-}
-
static VALUE
ary_alloc(VALUE klass)
{
- NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY);
+ NEWOBJ(ary, struct RArray);
+ OBJSETUP(ary, klass, T_ARRAY);
FL_SET_EMBED((VALUE)ary);
ARY_SET_EMBED_LEN((VALUE)ary, 0);
@@ -377,16 +303,6 @@ ary_alloc(VALUE klass)
}
static VALUE
-empty_ary_alloc(VALUE klass)
-{
- if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) {
- RUBY_DTRACE_ARRAY_CREATE(0, rb_sourcefile(), rb_sourceline());
- }
-
- return ary_alloc(klass);
-}
-
-static VALUE
ary_new(VALUE klass, long capa)
{
VALUE ary;
@@ -397,11 +313,6 @@ ary_new(VALUE klass, long capa)
if (capa > ARY_MAX_SIZE) {
rb_raise(rb_eArgError, "array size too big");
}
-
- if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) {
- RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline());
- }
-
ary = ary_alloc(klass);
if (capa > RARRAY_EMBED_LEN_MAX) {
FL_UNSET_EMBED(ary);
@@ -475,7 +386,7 @@ rb_ary_free(VALUE ary)
}
}
-RUBY_FUNC_EXPORTED size_t
+size_t
rb_ary_memsize(VALUE ary)
{
if (ARY_OWNS_HEAP_P(ary)) {
@@ -511,12 +422,12 @@ ary_make_shared(VALUE ary)
return ary;
}
else {
- NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY);
+ NEWOBJ(shared, struct RArray);
+ OBJSETUP(shared, 0, T_ARRAY);
FL_UNSET_EMBED(shared);
- ARY_SET_LEN((VALUE)shared, ARY_CAPA(ary));
+ ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary));
ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary));
- rb_mem_clear(RARRAY_PTR(shared) + RARRAY_LEN(ary), ARY_CAPA(ary) - RARRAY_LEN(ary));
FL_SET_SHARED_ROOT(shared);
ARY_SET_SHARED_NUM((VALUE)shared, 1);
FL_SET_SHARED(ary);
@@ -563,9 +474,10 @@ rb_check_array_type(VALUE ary)
* call-seq:
* Array.try_convert(obj) -> array or nil
*
- * Tries to convert +obj+ into an array, using +to_ary+ method. Returns the
- * converted array or +nil+ if +obj+ cannot be converted for any reason.
- * This method can be used to check if an argument is an array.
+ * 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 can be used to check if an argument is an
+ * array.
*
* Array.try_convert([1]) #=> [1]
* Array.try_convert("1") #=> nil
@@ -590,54 +502,36 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
* Array.new(array)
* Array.new(size) {|index| block }
*
- * Returns a new array.
- *
- * In the first form, if no arguments are sent, the new array will be empty.
- * When a +size+ and an optional +obj+ are sent, an array is created with
- * +size+ copies of +obj+. Take notice that all elements will reference the
- * same object +obj+.
- *
- * The second form creates a copy of the array passed as a parameter (the
- * array is generated by calling to_ary on the parameter).
- *
- * first_array = ["Matz", "Guido"]
- *
- * second_array = Array.new(first_array) #=> ["Matz", "Guido"]
- *
- * first_array.equal? second_array #=> false
- *
- * In the last form, an array of the given size is created. Each element in
- * this array is created by passing the element's index to the given block
- * and storing the return value.
- *
- * Array.new(3){ |index| index ** 2 }
- * # => [0, 1, 4]
- *
- * == Common gotchas
- *
- * When sending the second parameter, the same object will be used as the
- * value for all the array elements:
- *
+ * Returns a new array. In the first form, the new array is
+ * empty. In the second it is created with _size_ copies of _obj_
+ * (that is, _size_ references to the same
+ * _obj_). The third form creates a copy of the array
+ * passed as a parameter (the array is generated by calling
+ * to_ary on the parameter). In the last form, an array
+ * of the given size is created. Each element in this array is
+ * calculated by passing the element's index to the given block and
+ * storing the return value.
+ *
+ * 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 # => [{"cat"=>"feline"}, {"cat"=>"feline"}]
- *
+ * a
* a[1]['cat'] = 'Felix'
- * a # => [{"cat"=>"Felix"}, {"cat"=>"Felix"}]
- *
- * Since all the Array elements store the same hash, changes to one of them
- * will affect them all.
- *
- * If multiple copies are what you want, you should use the block
- * version which uses the result of that block each time an element
- * of the array needs to be initialized:
+ * a
*
+ * # here multiple copies are created
* a = Array.new(2) { Hash.new }
* a[0]['cat'] = 'feline'
- * a # => [{"cat"=>"feline"}, {}]
+ * a
*
+ * squares = Array.new(5) {|i| i*i}
+ * squares
+ *
+ * copy = Array.new(squares)
*/
static VALUE
@@ -695,13 +589,14 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
return ary;
}
+
/*
- * Returns a new array populated with the given objects.
- *
- * Array.[]( 1, 'a', /^A/ ) # => [1, "a", /^A/]
- * Array[ 1, 'a', /^A/ ] # => [1, "a", /^A/]
- * [ 1, 'a', /^A/ ] # => [1, "a", /^A/]
- */
+* Returns a new array populated with the given objects.
+*
+* Array.[]( 1, 'a', /^A/ )
+* Array[ 1, 'a', /^A/ ]
+* [ 1, 'a', /^A/ ]
+*/
static VALUE
rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
@@ -805,6 +700,8 @@ ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags
return ary_make_partial(ary, rb_cArray, offset, n);
}
+static VALUE rb_ary_push_1(VALUE ary, VALUE item);
+
/*
* call-seq:
* ary << obj -> ary
@@ -821,22 +718,20 @@ ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags
VALUE
rb_ary_push(VALUE ary, VALUE item)
{
- long idx = RARRAY_LEN(ary);
-
- ary_ensure_room_for_push(ary, 1);
- RARRAY_PTR(ary)[idx] = item;
- ARY_SET_LEN(ary, idx + 1);
- return ary;
+ rb_ary_modify(ary);
+ return rb_ary_push_1(ary, item);
}
-VALUE
-rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
+static VALUE
+rb_ary_push_1(VALUE ary, VALUE item)
{
- long oldlen = RARRAY_LEN(ary);
+ long idx = RARRAY_LEN(ary);
- ary_ensure_room_for_push(ary, len);
- MEMCPY(RARRAY_PTR(ary) + oldlen, ptr, VALUE, len);
- ARY_SET_LEN(ary, oldlen + len);
+ if (idx >= ARY_CAPA(ary)) {
+ ary_double_capa(ary, idx);
+ }
+ RARRAY_PTR(ary)[idx] = item;
+ ARY_SET_LEN(ary, idx + 1);
return ary;
}
@@ -844,22 +739,23 @@ rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
* call-seq:
* ary.push(obj, ... ) -> ary
*
- * Append --- Pushes the given object(s) on to the end of this array. This
+ * 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. See also Array#pop for the opposite
- * effect.
+ * may be chained together.
*
* a = [ "a", "b", "c" ]
* a.push("d", "e", "f")
* #=> ["a", "b", "c", "d", "e", "f"]
- * [1, 2, 3,].push(4).push(5)
- * #=> [1, 2, 3, 4, 5]
*/
static VALUE
rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
{
- return rb_ary_cat(ary, argv, argc);
+ rb_ary_modify(ary);
+ while (argc--) {
+ rb_ary_push_1(ary, *argv++);
+ }
+ return ary;
}
VALUE
@@ -885,11 +781,10 @@ rb_ary_pop(VALUE ary)
* ary.pop(n) -> new_ary
*
* Removes the last element from +self+ and returns it, or
- * +nil+ if the array is empty.
+ * <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. See also
- * Array#push for the opposite effect.
+ * 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"
@@ -945,14 +840,12 @@ rb_ary_shift(VALUE ary)
* ary.shift -> obj or nil
* ary.shift(n) -> new_ary
*
- * Removes the first element of +self+ and returns it (shifting all
- * other elements down by one). Returns +nil+ if the array
+ * Returns the first element of +self+ 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. With +ary+
- * containing only the remainder elements, not including what was shifted to
- * +new_ary+. See also Array#unshift for the opposite effect.
+ * 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"
@@ -990,61 +883,12 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
return result;
}
-static void
-ary_ensure_room_for_unshift(VALUE ary, int argc)
-{
- long len = RARRAY_LEN(ary);
- long new_len = len + argc;
- long capa;
- VALUE *head, *sharedp;
-
- if (ARY_SHARED_P(ary)) {
- VALUE shared = ARY_SHARED(ary);
- capa = RARRAY_LEN(shared);
- if (ARY_SHARED_NUM(shared) == 1 && capa > new_len) {
- head = RARRAY_PTR(ary);
- sharedp = RARRAY_PTR(shared);
- goto makeroom_if_need;
- }
- }
-
- rb_ary_modify(ary);
- capa = ARY_CAPA(ary);
- if (capa - (capa >> 6) <= new_len) {
- ary_double_capa(ary, new_len);
- }
-
- /* use shared array for big "queues" */
- if (new_len > ARY_DEFAULT_SIZE * 4) {
- /* make a room for unshifted items */
- capa = ARY_CAPA(ary);
- ary_make_shared(ary);
-
- head = sharedp = RARRAY_PTR(ary);
- goto makeroom;
- makeroom_if_need:
- if (head - sharedp < argc) {
- long room;
- makeroom:
- room = capa - new_len;
- room -= room >> 4;
- MEMMOVE(sharedp + argc + room, head, VALUE, len);
- head = sharedp + argc + room;
- }
- ARY_SET_PTR(ary, head - argc);
- }
- else {
- /* sliding items */
- MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
- }
-}
-
/*
* call-seq:
* ary.unshift(obj, ...) -> ary
*
- * Prepends objects to the front of +self+, moving other elements upwards.
- * See also Array#shift for the opposite effect.
+ * Prepends objects to the front of +self+,
+ * moving other elements upwards.
*
* a = [ "b", "c", "d" ]
* a.unshift("a") #=> ["a", "b", "c", "d"]
@@ -1054,16 +898,19 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
static VALUE
rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
{
- long len = RARRAY_LEN(ary);
+ long len;
- if (argc == 0) {
- rb_ary_modify_check(ary);
- return ary;
+ rb_ary_modify(ary);
+ if (argc == 0) return ary;
+ if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) {
+ ary_double_capa(ary, len + argc);
}
- ary_ensure_room_for_unshift(ary, argc);
+ /* sliding items */
+ MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
- ARY_SET_LEN(ary, len + argc);
+ ARY_INCREASE_LEN(ary, argc);
+
return ary;
}
@@ -1119,16 +966,13 @@ rb_ary_subseq(VALUE ary, long beg, long len)
* ary.slice(start, length) -> new_ary or nil
* ary.slice(range) -> new_ary or nil
*
- * Element Reference --- Returns the element at +index+, or returns a
- * subarray starting at the +start+ index and continuing for +length+
- * elements, or returns a subarray specified by +range+ of indices.
- *
- * Negative indices count backward from the end of the array (-1 is the last
- * element). For +start+ and +range+ cases the starting index is just before
- * an element. Additionally, an empty array is returned when the starting
- * index for an element range is at the end of the array.
- *
- * Returns +nil+ if the index (or starting index) are out of range.
+ * Element Reference---Returns the element at _index_,
+ * or returns a subarray starting at _start_ and
+ * continuing for _length_ elements, or returns a subarray
+ * specified by _range_.
+ * Negative indices count backward from the end of the
+ * array (-1 is the last element). Returns +nil+ if the index
+ * (or starting index) are out of range.
*
* a = [ "a", "b", "c", "d", "e" ]
* a[2] + a[0] + a[1] #=> "cab"
@@ -1140,7 +984,6 @@ rb_ary_subseq(VALUE ary, long beg, long len)
* a[-3, 3] #=> [ "c", "d", "e" ]
* # special cases
* a[5] #=> nil
- * a[6, 1] #=> nil
* a[5, 1] #=> []
* a[5..10] #=> []
*
@@ -1161,7 +1004,7 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
return rb_ary_subseq(ary, beg, len);
}
if (argc != 1) {
- rb_scan_args(argc, argv, "11", NULL, NULL);
+ rb_scan_args(argc, argv, "11", 0, 0);
}
arg = argv[0];
/* special case - speeding up */
@@ -1184,9 +1027,9 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
* call-seq:
* ary.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
- * Array#[].
+ * 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>.
*
* a = [ "a", "b", "c", "d", "e" ]
* a.at(0) #=> "a"
@@ -1205,9 +1048,8 @@ rb_ary_at(VALUE ary, VALUE pos)
* ary.first(n) -> new_ary
*
* Returns the first element, or the first +n+ elements, of the array.
- * If the array is empty, the first form returns +nil+, and the
- * second form returns an empty array. See also Array#last for
- * the opposite effect.
+ * 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"
@@ -1232,9 +1074,7 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
* ary.last(n) -> new_ary
*
* Returns the last element(s) of +self+. If the array is empty,
- * the first form returns +nil+.
- *
- * See also Array#first for the opposite effect.
+ * the first form returns <code>nil</code>.
*
* a = [ "w", "x", "y", "z" ]
* a.last #=> "z"
@@ -1256,24 +1096,21 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
* ary.fetch(index) -> obj
- * ary.fetch(index, default) -> obj
- * ary.fetch(index) { |index| block } -> obj
- *
- * Tries to return the element at position +index+, but throws an IndexError
- * exception if the referenced +index+ lies outside of the array bounds. This
- * error can be prevented by supplying a second argument, which will act as a
- * +default+ value.
+ * ary.fetch(index, default ) -> obj
+ * ary.fetch(index) {|index| block } -> obj
*
- * Alternatively, if a block is given it will only be executed when an
- * invalid +index+ is referenced. Negative values of +index+ count from the
- * end of the array.
+ * 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
* a.fetch(4, 'cat') #=> "cat"
- * a.fetch(100) { |i| puts "#{i} is out of bounds" }
- * #=> "100 is out of bounds"
+ * a.fetch(4) { |i| i*i } #=> 16
*/
static VALUE
@@ -1306,27 +1143,24 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
- * ary.index(obj) -> int or nil
- * ary.index { |item| block } -> int or nil
- * ary.index -> Enumerator
- *
- * Returns the _index_ of the first object in +ary+ such that the object is
- * <code>==</code> to +obj+.
+ * ary.index(obj) -> int or nil
+ * ary.index {|item| block} -> int or nil
+ * ary.index -> an_enumerator
*
- * If a block is given instead of an argument, returns the _index_ of the
- * first object for which the block returns +true+. Returns +nil+ if no
- * match is found.
+ * Returns the index of the first object in +self+ 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.
+ * See also <code>Array#rindex</code>.
*
- * See also Array#rindex.
- *
- * An Enumerator is returned if neither a block nor argument is given.
+ * If neither block nor argument is given, an enumerator is returned instead.
*
* a = [ "a", "b", "c" ]
- * a.index("b") #=> 1
- * a.index("z") #=> nil
- * a.index { |x| x == "b" } #=> 1
+ * a.index("b") #=> 1
+ * a.index("z") #=> nil
+ * a.index{|x|x=="b"} #=> 1
*
- * This is an alias of Array#find_index.
+ * This is an alias of <code>#find_index</code>.
*/
static VALUE
@@ -1356,26 +1190,23 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
- * ary.rindex(obj) -> int or nil
- * ary.rindex { |item| block } -> int or nil
- * ary.rindex -> Enumerator
- *
- * Returns the _index_ of the last object in +self+ <code>==</code> to +obj+.
+ * ary.rindex(obj) -> int or nil
+ * ary.rindex {|item| block} -> int or nil
+ * ary.rindex -> an_enumerator
*
- * If a block is given instead of an argument, returns the _index_ of the
- * first object for which the block returns +true+, starting from the last
- * object.
+ * Returns the index of the last object in +self+
+ * <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, starting from the last object.
+ * Returns <code>nil</code> if no match is found.
+ * See also <code>Array#index</code>.
*
- * Returns +nil+ if no match is found.
- *
- * See also Array#index.
- *
- * If neither block nor argument is given, an Enumerator is returned instead.
+ * If neither block nor argument is given, an enumerator is returned instead.
*
* a = [ "a", "b", "b", "b", "c" ]
- * a.rindex("b") #=> 3
- * a.rindex("z") #=> nil
- * a.rindex { |x| x == "b" } #=> 3
+ * a.rindex("b") #=> 3
+ * a.rindex("z") #=> nil
+ * a.rindex{|x|x=="b"} #=> 3
*/
static VALUE
@@ -1441,12 +1272,15 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
rpl = rb_ary_to_ary(rpl);
rlen = RARRAY_LEN(rpl);
}
+ rb_ary_modify(ary);
if (beg >= RARRAY_LEN(ary)) {
if (beg > ARY_MAX_SIZE - rlen) {
rb_raise(rb_eIndexError, "index %ld too big", beg);
}
- ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
len = beg + rlen;
+ if (len >= ARY_CAPA(ary)) {
+ ary_double_capa(ary, len);
+ }
rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
if (rlen > 0) {
MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
@@ -1456,7 +1290,6 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
else {
long alen;
- rb_ary_modify(ary);
alen = RARRAY_LEN(ary) + rlen - len;
if (alen >= ARY_CAPA(ary)) {
ary_double_capa(ary, alen);
@@ -1471,68 +1304,6 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
}
}
- RB_GC_GUARD(rpl);
-}
-
-void
-rb_ary_set_len(VALUE ary, long len)
-{
- long capa;
-
- rb_ary_modify_check(ary);
- if (ARY_SHARED_P(ary)) {
- rb_raise(rb_eRuntimeError, "can't set length of shared ");
- }
- if (len > (capa = (long)ARY_CAPA(ary))) {
- rb_bug("probable buffer overflow: %ld for %ld", len, capa);
- }
- ARY_SET_LEN(ary, len);
-}
-
-/*!
- * expands or shrinks \a ary to \a len elements.
- * expanded region will be filled with Qnil.
- * \param ary an array
- * \param len new size
- * \return \a ary
- * \post the size of \a ary is \a len.
- */
-VALUE
-rb_ary_resize(VALUE ary, long len)
-{
- long olen;
-
- rb_ary_modify(ary);
- olen = RARRAY_LEN(ary);
- if (len == olen) return ary;
- if (len > ARY_MAX_SIZE) {
- rb_raise(rb_eIndexError, "index %ld too big", len);
- }
- if (len > olen) {
- if (len >= ARY_CAPA(ary)) {
- ary_double_capa(ary, len);
- }
- rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen);
- ARY_SET_LEN(ary, len);
- }
- else if (ARY_EMBED_P(ary)) {
- ARY_SET_EMBED_LEN(ary, len);
- }
- else if (len <= RARRAY_EMBED_LEN_MAX) {
- VALUE tmp[RARRAY_EMBED_LEN_MAX];
- MEMCPY(tmp, ARY_HEAP_PTR(ary), VALUE, len);
- ary_discard(ary);
- MEMCPY(ARY_EMBED_PTR(ary), tmp, VALUE, len);
- ARY_SET_EMBED_LEN(ary, len);
- }
- else {
- if (olen > len + ARY_DEFAULT_SIZE) {
- REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len);
- ARY_SET_CAPA(ary, len);
- }
- ARY_SET_HEAP_LEN(ary, len);
- }
- return ary;
}
/*
@@ -1541,21 +1312,16 @@ rb_ary_resize(VALUE ary, long len)
* ary[start, length] = obj or other_ary or nil -> obj or other_ary or nil
* ary[range] = obj or other_ary or nil -> obj or other_ary or nil
*
- * Element Assignment --- Sets the element at +index+, or replaces a subarray
- * from the +start+ index for +length+ elements, or replaces a subarray
- * specified by the +range+ of indices.
- *
- * If indices are greater than the current capacity of the array, the array
- * grows automatically. Elements are inserted into the array at +start+ if
- * +length+ is zero.
- *
- * Negative indices will count backward from the end of the array. For
- * +start+ and +range+ cases the starting index is just before an element.
- *
- * An IndexError is raised if a negative index points past the beginning of
- * the array.
- *
- * See also Array#push, and Array#unshift.
+ * Element Assignment---Sets the element at _index_,
+ * or replaces a subarray starting at _start_ and
+ * continuing for _length_ elements, or replaces a subarray
+ * specified by _range_. If indices are greater than
+ * 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
+ * <code>Array#push</code>, and <code>Array#unshift</code>.
*
* a = Array.new
* a[4] = "4"; #=> [nil, nil, nil, nil, "4"]
@@ -1566,8 +1332,6 @@ rb_ary_resize(VALUE ary, long len)
* a[-1] = "Z" #=> ["A", "Z"]
* a[1..-1] = nil #=> ["A", nil]
* a[1..-1] = [] #=> ["A"]
- * a[0, 0] = [ 1, 2 ] #=> [1, 2, "A"]
- * a[3, 0] = "B" #=> [1, 2, "A", "B"]
*/
static VALUE
@@ -1582,7 +1346,9 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
rb_ary_splice(ary, beg, len, argv[2]);
return argv[2];
}
- rb_check_arity(argc, 2, 2);
+ if (argc != 2) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+ }
rb_ary_modify_check(ary);
if (FIXNUM_P(argv[0])) {
offset = FIX2LONG(argv[0]);
@@ -1604,10 +1370,8 @@ fixnum:
* call-seq:
* ary.insert(index, obj...) -> ary
*
- * Inserts the given values before the element with the given +index+.
- *
- * Negative indices count backwards from the end of the array, where +-1+ is
- * the last element.
+ * 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"]
@@ -1619,7 +1383,9 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
{
long pos;
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+ if (argc < 1) {
+ rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+ }
rb_ary_modify_check(ary);
if (argc == 1) return ary;
pos = NUM2LONG(argv[0]);
@@ -1633,18 +1399,15 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
return ary;
}
-static VALUE
-rb_ary_length(VALUE ary);
-
/*
* call-seq:
- * ary.each { |item| block } -> ary
- * ary.each -> Enumerator
+ * ary.each {|item| block } -> ary
+ * ary.each -> an_enumerator
*
- * Calls the given block once for each element in +self+, passing that element
- * as a parameter.
+ * Calls <i>block</i> once for each element in +self+, passing that
+ * element as a parameter.
*
- * An Enumerator is returned if no block is given.
+ * If no block is given, an enumerator is returned instead.
*
* a = [ "a", "b", "c" ]
* a.each {|x| print x, " -- " }
@@ -1655,12 +1418,11 @@ rb_ary_length(VALUE ary);
*/
VALUE
-rb_ary_each(VALUE array)
+rb_ary_each(VALUE ary)
{
long i;
- volatile VALUE ary = array;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ RETURN_ENUMERATOR(ary, 0, 0);
for (i=0; i<RARRAY_LEN(ary); i++) {
rb_yield(RARRAY_PTR(ary)[i]);
}
@@ -1669,13 +1431,14 @@ rb_ary_each(VALUE array)
/*
* call-seq:
- * ary.each_index { |index| block } -> ary
- * ary.each_index -> Enumerator
+ * ary.each_index {|index| block } -> ary
+ * ary.each_index -> an_enumerator
+ *
+ * Same as <code>Array#each</code>, but passes the index of the element
+ * instead of the element itself.
*
- * Same as Array#each, but passes the +index+ of the element instead of the
- * element itself.
+ * If no block is given, an enumerator is returned instead.
*
- * An Enumerator is returned if no block is given.
*
* a = [ "a", "b", "c" ]
* a.each_index {|x| print x, " -- " }
@@ -1689,7 +1452,7 @@ static VALUE
rb_ary_each_index(VALUE ary)
{
long i;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ RETURN_ENUMERATOR(ary, 0, 0);
for (i=0; i<RARRAY_LEN(ary); i++) {
rb_yield(LONG2NUM(i));
@@ -1699,10 +1462,11 @@ rb_ary_each_index(VALUE ary)
/*
* call-seq:
- * ary.reverse_each { |item| block } -> ary
- * ary.reverse_each -> Enumerator
+ * ary.reverse_each {|item| block } -> ary
+ * ary.reverse_each -> an_enumerator
*
- * Same as Array#each, but traverses +self+ in reverse order.
+ * Same as <code>Array#each</code>, but traverses +self+ in reverse
+ * order.
*
* a = [ "a", "b", "c" ]
* a.reverse_each {|x| print x, " " }
@@ -1717,7 +1481,7 @@ rb_ary_reverse_each(VALUE ary)
{
long len;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ RETURN_ENUMERATOR(ary, 0, 0);
len = RARRAY_LEN(ary);
while (len--) {
rb_yield(RARRAY_PTR(ary)[len]);
@@ -1735,7 +1499,6 @@ rb_ary_reverse_each(VALUE ary)
* Returns the number of elements in +self+. May be zero.
*
* [ 1, 2, 3, 4, 5 ].length #=> 5
- * [].length #=> 0
*/
static VALUE
@@ -1749,7 +1512,7 @@ rb_ary_length(VALUE ary)
* call-seq:
* ary.empty? -> true or false
*
- * Returns +true+ if +self+ contains no elements.
+ * Returns <code>true</code> if +self+ contains no elements.
*
* [].empty? #=> true
*/
@@ -1762,12 +1525,22 @@ rb_ary_empty_p(VALUE ary)
return Qfalse;
}
+static VALUE
+rb_ary_dup_setup(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);
+ ARY_SET_LEN(dup, RARRAY_LEN(ary));
+ return dup;
+}
+
VALUE
rb_ary_dup(VALUE ary)
{
- VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+ VALUE dup = rb_ary_dup_setup(ary);
MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
- ARY_SET_LEN(dup, RARRAY_LEN(ary));
return dup;
}
@@ -1779,7 +1552,7 @@ rb_ary_resurrect(VALUE ary)
extern VALUE rb_output_fs;
-static void ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first);
+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)
@@ -1788,13 +1561,12 @@ recursive_join(VALUE obj, VALUE argp, int recur)
VALUE ary = arg[0];
VALUE sep = arg[1];
VALUE result = arg[2];
- int *first = (int *)arg[3];
if (recur) {
rb_raise(rb_eArgError, "recursive array join");
}
else {
- ary_join_1(obj, ary, sep, 0, result, first);
+ ary_join_1(obj, ary, sep, 0, result);
}
return Qnil;
}
@@ -1805,7 +1577,6 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
long i;
VALUE val;
- if (max > 0) rb_enc_copy(result, RARRAY_PTR(ary)[0]);
for (i=0; i<max; i++) {
val = RARRAY_PTR(ary)[i];
if (i > 0 && !NIL_P(sep))
@@ -1817,7 +1588,7 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
}
static void
-ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
+ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
{
VALUE val, tmp;
@@ -1830,7 +1601,6 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
case T_STRING:
str_join:
rb_str_buf_append(result, val);
- *first = FALSE;
break;
case T_ARRAY:
obj = val;
@@ -1839,12 +1609,11 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
rb_raise(rb_eArgError, "recursive array join");
}
else {
- VALUE args[4];
+ VALUE args[3];
args[0] = val;
args[1] = sep;
args[2] = result;
- args[3] = (VALUE)first;
rb_exec_recursive(recursive_join, obj, (VALUE)args);
}
break;
@@ -1861,10 +1630,6 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
goto ary_join;
}
val = rb_obj_as_string(val);
- if (*first) {
- rb_enc_copy(result, val);
- *first = FALSE;
- }
goto str_join;
}
}
@@ -1879,8 +1644,8 @@ rb_ary_join(VALUE ary, VALUE sep)
VALUE val, tmp, result;
if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
- if (OBJ_TAINTED(ary)) taint = TRUE;
- if (OBJ_UNTRUSTED(ary)) untrust = TRUE;
+ if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE;
+ if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE;
if (!NIL_P(sep)) {
StringValue(sep);
@@ -1891,14 +1656,11 @@ rb_ary_join(VALUE ary, VALUE sep)
tmp = rb_check_string_type(val);
if (NIL_P(tmp) || tmp != val) {
- int first;
result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
- rb_enc_associate(result, rb_usascii_encoding());
if (taint) OBJ_TAINT(result);
if (untrust) OBJ_UNTRUST(result);
ary_join_0(ary, sep, i, result);
- first = i == 0;
- ary_join_1(ary, ary, sep, i, result, &first);
+ ary_join_1(ary, ary, sep, i, result);
return result;
}
@@ -1915,12 +1677,10 @@ rb_ary_join(VALUE ary, VALUE sep)
/*
* call-seq:
- * ary.join(separator=$,) -> str
+ * ary.join(sep=$,) -> str
*
* Returns a string created by converting each element of the array to
- * a string, separated by the given +separator+.
- * If the +separator+ is +nil+, it uses current $,.
- * If both the +separator+ and $, are nil, it uses empty string.
+ * a string, separated by <i>sep</i>.
*
* [ "a", "b", "c" ].join #=> "abc"
* [ "a", "b", "c" ].join("-") #=> "a-b-c"
@@ -1945,14 +1705,13 @@ inspect_ary(VALUE ary, VALUE dummy, int recur)
long i;
VALUE s, str;
- if (recur) return rb_usascii_str_new_cstr("[...]");
+ 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;
if (i > 0) rb_str_buf_cat2(str, ", ");
- else rb_enc_copy(str, s);
rb_str_buf_append(str, s);
}
rb_str_buf_cat2(str, "]");
@@ -1963,12 +1722,10 @@ inspect_ary(VALUE ary, VALUE dummy, int recur)
/*
* call-seq:
+ * ary.to_s -> string
* ary.inspect -> string
- * ary.to_s -> string
*
* Creates a string representation of +self+.
- *
- * [ "a", "b", "c" ].to_s #=> "[\"a\", \"b\", \"c\"]"
*/
static VALUE
@@ -1988,9 +1745,8 @@ rb_ary_to_s(VALUE ary)
* call-seq:
* ary.to_a -> ary
*
- * Returns +self+.
- *
- * If called on a subclass of Array, converts the receiver to an Array object.
+ * Returns +self+. If called on a subclass of Array, converts
+ * the receiver to an Array object.
*/
static VALUE
@@ -2018,7 +1774,8 @@ rb_ary_to_ary_m(VALUE ary)
}
static void
-ary_reverse(VALUE *p1, VALUE *p2)
+ary_reverse(p1, p2)
+ VALUE *p1, *p2;
{
while (p1 < p2) {
VALUE tmp = *p1;
@@ -2060,7 +1817,7 @@ rb_ary_reverse_bang(VALUE ary)
/*
* call-seq:
- * ary.reverse -> new_ary
+ * ary.reverse -> new_ary
*
* Returns a new array containing +self+'s elements in reverse order.
*
@@ -2071,15 +1828,14 @@ rb_ary_reverse_bang(VALUE ary)
static VALUE
rb_ary_reverse_m(VALUE ary)
{
+ VALUE dup = rb_ary_dup_setup(ary);
long len = RARRAY_LEN(ary);
- VALUE dup = rb_ary_new2(len);
if (len > 0) {
VALUE *p1 = RARRAY_PTR(ary);
VALUE *p2 = RARRAY_PTR(dup) + len - 1;
do *p2-- = *p1++; while (--len > 0);
}
- ARY_SET_LEN(dup, RARRAY_LEN(ary));
return dup;
}
@@ -2112,13 +1868,11 @@ rb_ary_rotate(VALUE ary, long cnt)
/*
* call-seq:
- * ary.rotate!(count=1) -> ary
+ * ary.rotate!(cnt=1) -> ary
*
- * Rotates +self+ in place so that the element at +count+ comes first, and
- * returns +self+.
- *
- * If +count+ is negative then it rotates in the opposite direction, starting
- * from the end of the array where +-1+ is the last element.
+ * Rotates +self+ in place so that the element at +cnt+ comes first,
+ * and returns +self+. If +cnt+ is negative then it rotates in
+ * counter direction.
*
* a = [ "a", "b", "c", "d" ]
* a.rotate! #=> ["b", "c", "d", "a"]
@@ -2143,13 +1897,11 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
- * ary.rotate(count=1) -> new_ary
- *
- * Returns a new array by rotating +self+ so that the element at +count+ is
- * the first element of the new array.
+ * ary.rotate([n = 1]) -> new_ary
*
- * If +count+ is negative then it rotates in the opposite direction, starting
- * from the end of +self+ where +-1+ is the last element.
+ * Returns new array by rotating +self+, whose first element is the
+ * element at +cnt+ in +self+. If +cnt+ is negative then it rotates
+ * in counter direction.
*
* a = [ "a", "b", "c", "d" ]
* a.rotate #=> ["b", "c", "d", "a"]
@@ -2171,7 +1923,7 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
}
len = RARRAY_LEN(ary);
- rotated = rb_ary_new2(len);
+ rotated = rb_ary_dup_setup(ary);
if (len > 0) {
cnt = rotate_count(cnt, len);
ptr = RARRAY_PTR(ary);
@@ -2180,7 +1932,6 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
MEMCPY(ptr2, ptr + cnt, VALUE, len);
MEMCPY(ptr2 + len, ptr, VALUE, cnt);
}
- ARY_SET_LEN(rotated, RARRAY_LEN(ary));
return rotated;
}
@@ -2196,15 +1947,15 @@ enum {
sort_optimizable_count
};
-#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString)
+#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)), \
+ ((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))))
+ (data->opt_methods |= SORT_OPTIMIZABLE_BIT(type))))
static VALUE
sort_reentered(VALUE ary)
@@ -2256,22 +2007,17 @@ sort_2(const void *ap, const void *bp, void *dummy)
/*
* call-seq:
* ary.sort! -> ary
- * ary.sort! { |a, b| block } -> ary
+ * ary.sort! {| a,b | block } -> ary
*
- * Sorts +self+ in place.
- *
- * Comparisons for the sort will be done using the <code><=></code> operator
- * or using an optional code block.
- *
- * The block must implement a comparison between +a+ and +b+, and return
- * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
- * if +b+ follows +a+.
- *
- * See also Enumerable#sort_by.
+ * 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"]
+ * a.sort #=> ["a", "b", "c", "d", "e"]
+ * a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
*/
VALUE
@@ -2282,13 +2028,12 @@ rb_ary_sort_bang(VALUE ary)
if (RARRAY_LEN(ary) > 1) {
VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
struct ary_sort_data data;
- long len = RARRAY_LEN(ary);
RBASIC(tmp)->klass = 0;
data.ary = tmp;
data.opt_methods = 0;
data.opt_inited = 0;
- ruby_qsort(RARRAY_PTR(tmp), len, sizeof(VALUE),
+ ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
rb_block_given_p()?sort_1:sort_2, &data);
if (ARY_EMBED_P(tmp)) {
@@ -2305,7 +2050,7 @@ rb_ary_sort_bang(VALUE ary)
if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
assert(!ARY_EMBED_P(ary));
FL_UNSET_SHARED(ary);
- ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
+ ARY_SET_CAPA(ary, ARY_CAPA(tmp));
}
else {
assert(!ARY_SHARED_P(tmp));
@@ -2320,8 +2065,8 @@ rb_ary_sort_bang(VALUE ary)
xfree(ARY_HEAP_PTR(ary));
}
ARY_SET_PTR(ary, RARRAY_PTR(tmp));
- ARY_SET_HEAP_LEN(ary, len);
- ARY_SET_CAPA(ary, RARRAY_LEN(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);
@@ -2338,23 +2083,17 @@ rb_ary_sort_bang(VALUE ary)
/*
* call-seq:
* ary.sort -> new_ary
- * ary.sort { |a, b| block } -> new_ary
- *
- * Returns a new array created by sorting +self+.
- *
- * Comparisons for the sort will be done using the <code><=></code> operator
- * or using an optional code block.
- *
- * The block must implement a comparison between +a+ and +b+, and return
- * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
- * if +b+ follows +a+.
- *
+ * ary.sort {| a,b | block } -> new_ary
*
- * See also Enumerable#sort_by.
+ * Returns a new array created by sorting +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"]
+ * a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
*/
VALUE
@@ -2365,106 +2104,6 @@ rb_ary_sort(VALUE ary)
return ary;
}
-/*
- * call-seq:
- * ary.bsearch {|x| block } -> elem
- *
- * By using binary search, finds a value from this array which meets
- * the given condition in O(log n) where n is the size of the array.
- *
- * You can use this method in two use cases: a find-minimum mode and
- * a find-any mode. In either case, the elements of the array must be
- * monotone (or sorted) with respect to the block.
- *
- * In find-minimum mode (this is a good choice for typical use case),
- * the block must return true or false, and there must be an index i
- * (0 <= i <= ary.size) so that:
- *
- * - the block returns false for any element whose index is less than
- * i, and
- * - the block returns true for any element whose index is greater
- * than or equal to i.
- *
- * This method returns the i-th element. If i is equal to ary.size,
- * it returns nil.
- *
- * ary = [0, 4, 7, 10, 12]
- * ary.bsearch {|x| x >= 4 } #=> 4
- * ary.bsearch {|x| x >= 6 } #=> 7
- * ary.bsearch {|x| x >= -1 } #=> 0
- * ary.bsearch {|x| x >= 100 } #=> nil
- *
- * In find-any mode (this behaves like libc's bsearch(3)), the block
- * must return a number, and there must be two indices i and j
- * (0 <= i <= j <= ary.size) so that:
- *
- * - the block returns a positive number for ary[k] if 0 <= k < i,
- * - the block returns zero for ary[k] if i <= k < j, and
- * - the block returns a negative number for ary[k] if
- * j <= k < ary.size.
- *
- * Under this condition, this method returns any element whose index
- * is within i...j. If i is equal to j (i.e., there is no element
- * that satisfies the block), this method returns nil.
- *
- * ary = [0, 4, 7, 10, 12]
- * # try to find v such that 4 <= v < 8
- * ary.bsearch {|x| 1 - x / 4 } #=> 4 or 7
- * # try to find v such that 8 <= v < 10
- * ary.bsearch {|x| 4 - x / 2 } #=> nil
- *
- * You must not mix the two modes at a time; the block must always
- * return either true/false, or always return a number. It is
- * undefined which value is actually picked up at each iteration.
- */
-
-static VALUE
-rb_ary_bsearch(VALUE ary)
-{
- long low = 0, high = RARRAY_LEN(ary), mid;
- int smaller = 0, satisfied = 0;
- VALUE v, val;
-
- RETURN_ENUMERATOR(ary, 0, 0);
- while (low < high) {
- mid = low + ((high - low) / 2);
- val = rb_ary_entry(ary, mid);
- v = rb_yield(val);
- if (FIXNUM_P(v)) {
- if (FIX2INT(v) == 0) return val;
- smaller = FIX2INT(v) < 0;
- }
- else if (v == Qtrue) {
- satisfied = 1;
- smaller = 1;
- }
- else if (v == Qfalse || v == Qnil) {
- smaller = 0;
- }
- else if (rb_obj_is_kind_of(v, rb_cNumeric)) {
- switch (rb_cmpint(rb_funcall(v, id_cmp, 1, INT2FIX(0)), v, INT2FIX(0))) {
- case 0: return val;
- case 1: smaller = 1; break;
- case -1: smaller = 0;
- }
- }
- else {
- rb_raise(rb_eTypeError, "wrong argument type %s"
- " (must be numeric, true, false or nil)",
- rb_obj_classname(v));
- }
- if (smaller) {
- high = mid;
- }
- else {
- low = mid + 1;
- }
- }
- if (low == RARRAY_LEN(ary)) return Qnil;
- if (!satisfied) return Qnil;
- return rb_ary_entry(ary, low);
-}
-
static VALUE
sort_by_i(VALUE i)
@@ -2474,13 +2113,13 @@ sort_by_i(VALUE i)
/*
* call-seq:
- * ary.sort_by! { |obj| block } -> ary
- * ary.sort_by! -> Enumerator
+ * ary.sort_by! {| obj | block } -> ary
+ * ary.sort_by! -> an_enumerator
*
* Sorts +self+ in place using a set of keys generated by mapping the
* values in +self+ through the given block.
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
*/
@@ -2489,7 +2128,7 @@ rb_ary_sort_by_bang(VALUE ary)
{
VALUE sorted;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ 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);
@@ -2499,22 +2138,20 @@ rb_ary_sort_by_bang(VALUE ary)
/*
* call-seq:
- * ary.collect { |item| block } -> new_ary
- * ary.map { |item| block } -> new_ary
- * ary.collect -> Enumerator
- * ary.map -> Enumerator
+ * ary.collect {|item| block } -> new_ary
+ * ary.map {|item| block } -> new_ary
+ * ary.collect -> an_enumerator
+ * ary.map -> an_enumerator
*
- * Invokes the given block once for each element of +self+.
+ * Invokes <i>block</i> once for each element of +self+. Creates a
+ * new array containing the values returned by the block.
+ * See also <code>Enumerable#collect</code>.
*
- * Creates a new array containing the values returned by the block.
- *
- * See also Enumerable#collect.
- *
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* a = [ "a", "b", "c", "d" ]
- * a.map { |x| x + "!" } #=> ["a!", "b!", "c!", "d!"]
- * a #=> ["a", "b", "c", "d"]
+ * a.collect {|x| x + "!" } #=> ["a!", "b!", "c!", "d!"]
+ * a #=> ["a", "b", "c", "d"]
*/
static VALUE
@@ -2523,7 +2160,7 @@ rb_ary_collect(VALUE ary)
long i;
VALUE collect;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ 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]));
@@ -2536,19 +2173,18 @@ rb_ary_collect(VALUE ary)
* call-seq:
* ary.collect! {|item| block } -> ary
* ary.map! {|item| block } -> ary
- * ary.collect! -> Enumerator
- * ary.map! -> Enumerator
- *
- * Invokes the given block once for each element of +self+, replacing the
- * element with the value returned by the block.
+ * ary.collect -> an_enumerator
+ * ary.map -> an_enumerator
*
- * See also Enumerable#collect.
+ * Invokes the block once for each element of +self+, replacing the
+ * element with the value returned by _block_.
+ * See also <code>Enumerable#collect</code>.
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* a = [ "a", "b", "c", "d" ]
- * a.map! {|x| x + "!" }
- * a #=> [ "a!", "b!", "c!", "d!" ]
+ * a.collect! {|x| x + "!" }
+ * a #=> [ "a!", "b!", "c!", "d!" ]
*/
static VALUE
@@ -2556,7 +2192,7 @@ rb_ary_collect_bang(VALUE ary)
{
long i;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ 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]));
@@ -2576,13 +2212,15 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
continue;
}
/* check if idx is Range */
- if (rb_range_beg_len(argv[i], &beg, &len, olen, 1)) {
- long end = olen < beg+len ? olen : beg+len;
- for (j = beg; j < end; j++) {
- rb_ary_push(result, (*func)(obj, j));
+ switch (rb_range_beg_len(argv[i], &beg, &len, olen, 0)) {
+ case Qfalse:
+ break;
+ case Qnil:
+ continue;
+ default:
+ for (j=0; j<len; j++) {
+ rb_ary_push(result, (*func)(obj, j+beg));
}
- if (beg + len > j)
- rb_ary_resize(result, RARRAY_LEN(result) + (beg + len) - j);
continue;
}
rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
@@ -2592,20 +2230,18 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
/*
* call-seq:
- * ary.values_at(selector, ...) -> new_ary
+ * ary.values_at(selector,... ) -> new_ary
*
- * Returns an array containing the elements in +self+ corresponding to the
- * given +selector+(s).
- *
- * The selectors may be either integer indices or ranges.
- *
- * See also Array#select.
+ * Returns an array containing the elements in
+ * +self+ corresponding to the given selector(s). The selectors
+ * 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) # => ["b", "d", "f"]
- * a.values_at(1, 3, 5, 7) # => ["b", "d", "f", nil]
- * a.values_at(-1, -2, -2, -7) # => ["f", "e", "e", nil]
- * a.values_at(4..6, 3...6) # => ["e", "f", nil, "d", "e", "f"]
+ * a.values_at(1, 3, 5)
+ * a.values_at(1, 3, 5, 7)
+ * a.values_at(-1, -3, -5, -7)
+ * a.values_at(1..3, 2...5)
*/
static VALUE
@@ -2617,20 +2253,17 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
- * ary.select { |item| block } -> new_ary
- * ary.select -> Enumerator
+ * ary.select {|item| block } -> new_ary
+ * ary.select -> an_enumerator
*
- * Returns a new array containing all elements of +ary+
- * for which the given +block+ returns a true value.
+ * Invokes the block passing in successive elements from +self+,
+ * returning an array containing those elements for which the block
+ * returns a true value (equivalent to <code>Enumerable#select</code>).
*
- * If no block is given, an Enumerator is returned instead.
- *
- * [1,2,3,4,5].select { |num| num.even? } #=> [2, 4]
+ * If no block is given, an enumerator is returned instead.
*
* a = %w{ a b c d e f }
- * a.select { |v| v =~ /[aeiou]/ } #=> ["a", "e"]
- *
- * See also Enumerable#select.
+ * a.select {|v| v =~ /[aeiou]/} #=> ["a", "e"]
*/
static VALUE
@@ -2639,7 +2272,7 @@ rb_ary_select(VALUE ary)
VALUE result;
long i;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ 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]))) {
@@ -2651,17 +2284,16 @@ rb_ary_select(VALUE ary)
/*
* call-seq:
- * ary.select! {|item| block } -> ary or nil
- * ary.select! -> Enumerator
- *
- * Invokes the given block passing in successive elements from +self+,
- * deleting elements for which the block returns a +false+ value.
- *
- * If changes were made, it will return +self+, otherwise it returns +nil+.
+ * ary.select! {|item| block } -> new_ary or nil
+ * ary.select! -> an_enumerator
*
- * See also Array#keep_if
+ * Invokes the block passing in successive elements from
+ * +self+, deleting elements for which the block returns a
+ * false value. It returns +self+ if changes were made,
+ * otherwise it returns <code>nil</code>.
+ * See also <code>Array#keep_if</code>
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
*/
@@ -2670,7 +2302,7 @@ rb_ary_select_bang(VALUE ary)
{
long i1, i2;
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ RETURN_ENUMERATOR(ary, 0, 0);
rb_ary_modify(ary);
for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
VALUE v = RARRAY_PTR(ary)[i1];
@@ -2689,53 +2321,38 @@ rb_ary_select_bang(VALUE ary)
/*
* call-seq:
- * ary.keep_if { |item| block } -> ary
- * ary.keep_if -> Enumerator
- *
- * Deletes every element of +self+ for which the given block evaluates to
- * +false+.
+ * ary.keep_if {|item| block } -> ary
+ * ary.keep_if -> an_enumerator
*
- * See also Array#select!
+ * Deletes every element of +self+ for which <i>block</i> evaluates
+ * to false.
+ * See also <code>Array#select!</code>
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* a = %w{ a b c d e f }
- * a.keep_if { |v| v =~ /[aeiou]/ } #=> ["a", "e"]
+ * a.keep_if {|v| v =~ /[aeiou]/} #=> ["a", "e"]
*/
static VALUE
rb_ary_keep_if(VALUE ary)
{
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
+ RETURN_ENUMERATOR(ary, 0, 0);
rb_ary_select_bang(ary);
return ary;
}
-static void
-ary_resize_smaller(VALUE ary, long len)
-{
- rb_ary_modify(ary);
- if (RARRAY_LEN(ary) > len) {
- ARY_SET_LEN(ary, len);
- if (len * 2 < ARY_CAPA(ary) &&
- ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
- ary_resize_capa(ary, len * 2);
- }
- }
-}
-
/*
* call-seq:
- * ary.delete(obj) -> item or nil
- * ary.delete(obj) { block } -> item or result of block
- *
- * Deletes all items from +self+ that are equal to +obj+.
+ * ary.delete(obj) -> obj or nil
+ * ary.delete(obj) { block } -> obj or nil
*
- * Returns the last deleted item, or +nil+ if no matching item is found.
- *
- * If the optional code block is given, the result of the block is returned if
- * the item is not found. (To remove +nil+ elements and get an informative
- * return value, use Array#compact!)
+ * Deletes items from +self+ that are equal to <i>obj</i>.
+ * If any items are found, returns <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. (To remove <code>nil</code> elements and
+ * get an informative return value, use #compact!)
*
* a = [ "a", "b", "b", "b", "c" ]
* a.delete("b") #=> "b"
@@ -2769,32 +2386,16 @@ rb_ary_delete(VALUE ary, VALUE item)
return Qnil;
}
- ary_resize_smaller(ary, i2);
-
- return v;
-}
-
-void
-rb_ary_delete_same(VALUE ary, VALUE item)
-{
- long i1, i2;
-
- for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
- VALUE e = RARRAY_PTR(ary)[i1];
-
- if (e == item) {
- continue;
- }
- if (i1 != i2) {
- rb_ary_store(ary, i2, e);
+ 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);
}
- i2++;
- }
- if (RARRAY_LEN(ary) == i2) {
- return;
}
- ary_resize_smaller(ary, i2);
+ return v;
}
VALUE
@@ -2822,12 +2423,11 @@ rb_ary_delete_at(VALUE ary, long pos)
* call-seq:
* ary.delete_at(index) -> obj or nil
*
- * Deletes the element at the specified +index+, returning that element, or
- * +nil+ if the +index+ is out of range.
+ * 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>.
*
- * See also Array#slice!
- *
- * a = ["ant", "bat", "cat", "dog"]
+ * a = %w( ant bat cat dog )
* a.delete_at(2) #=> "cat"
* a #=> ["ant", "bat", "dog"]
* a.delete_at(99) #=> nil
@@ -2845,11 +2445,9 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
* ary.slice!(start, length) -> new_ary or nil
* ary.slice!(range) -> new_ary or nil
*
- * Deletes the element(s) given by an +index+ (optionally up to +length+
- * elements) or by a +range+.
- *
- * Returns the deleted object (or objects), or +nil+ if the +index+ is out of
- * range.
+ * Deletes the element(s) given by an index (optionally with a length)
+ * or by a range. Returns the deleted object (or objects), or
+ * <code>nil</code> if the index is out of range.
*
* a = [ "a", "b", "c" ]
* a.slice!(1) #=> "b"
@@ -2911,100 +2509,74 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
return rb_ary_delete_at(ary, NUM2LONG(arg1));
}
-static VALUE
-ary_reject(VALUE orig, VALUE result)
-{
- long i;
-
- for (i = 0; i < RARRAY_LEN(orig); i++) {
- VALUE v = RARRAY_PTR(orig)[i];
- if (!RTEST(rb_yield(v))) {
- rb_ary_push(result, v);
- }
- }
- return result;
-}
-
-static VALUE
-ary_reject_bang(VALUE ary)
-{
- long i;
- VALUE result = Qnil;
-
- rb_ary_modify_check(ary);
- for (i = 0; i < RARRAY_LEN(ary); ) {
- VALUE v = RARRAY_PTR(ary)[i];
- if (RTEST(rb_yield(v))) {
- rb_ary_delete_at(ary, i);
- result = ary;
- }
- else {
- i++;
- }
- }
- return result;
-}
-
/*
* call-seq:
- * ary.reject! { |item| block } -> ary or nil
- * ary.reject! -> Enumerator
+ * ary.reject! {|item| block } -> ary or nil
+ * ary.reject! -> an_enumerator
*
- * Equivalent to Array#delete_if, deleting elements from +self+ for which the
- * block evaluates to +true+, but returns +nil+ if no changes were made.
+ * 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.
+ * See also <code>Enumerable#reject</code> and <code>Array#delete_if</code>.
*
- * The array is changed instantly every time the block is called, not after
- * the iteration is over.
+ * If no block is given, an enumerator is returned instead.
*
- * See also Enumerable#reject and Array#delete_if.
- *
- * If no block is given, an Enumerator is returned instead.
*/
static VALUE
rb_ary_reject_bang(VALUE ary)
{
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
- return ary_reject_bang(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];
+ if (RTEST(rb_yield(v))) continue;
+ if (i1 != i2) {
+ rb_ary_store(ary, i2, v);
+ }
+ i2++;
+ }
+
+ if (RARRAY_LEN(ary) == i2) return Qnil;
+ if (i2 < RARRAY_LEN(ary))
+ ARY_SET_LEN(ary, i2);
+ return ary;
}
/*
* call-seq:
- * ary.reject {|item| block } -> new_ary
- * ary.reject -> Enumerator
+ * ary.reject {|item| block } -> new_ary
+ * ary.reject -> an_enumerator
*
- * Returns a new array containing the items in +self+ for which the given
- * block is not +true+.
+ * Returns a new array containing the items in +self+
+ * for which the block is not true.
+ * See also <code>Array#delete_if</code>
*
- * See also Array#delete_if
+ * If no block is given, an enumerator is returned instead.
*
- * If no block is given, an Enumerator is returned instead.
*/
static VALUE
rb_ary_reject(VALUE ary)
{
- VALUE rejected_ary;
-
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
- rejected_ary = rb_ary_new();
- ary_reject(ary, rejected_ary);
- return rejected_ary;
+ RETURN_ENUMERATOR(ary, 0, 0);
+ ary = rb_ary_dup(ary);
+ rb_ary_reject_bang(ary);
+ return ary;
}
/*
* call-seq:
- * ary.delete_if { |item| block } -> ary
- * ary.delete_if -> Enumerator
- *
- * Deletes every element of +self+ for which block evaluates to +true+.
+ * ary.delete_if {|item| block } -> ary
+ * ary.delete_if -> an_enumerator
*
- * The array is changed instantly every time the block is called, not after
- * the iteration is over.
+ * Deletes every element of +self+ for which <i>block</i> evaluates
+ * to true.
+ * See also <code>Array#reject!</code>
*
- * See also Array#reject!
- *
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* a = [ "a", "b", "c" ]
* a.delete_if {|x| x >= "b" } #=> ["a"]
@@ -3013,8 +2585,8 @@ rb_ary_reject(VALUE ary)
static VALUE
rb_ary_delete_if(VALUE ary)
{
- RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
- ary_reject_bang(ary);
+ RETURN_ENUMERATOR(ary, 0, 0);
+ rb_ary_reject_bang(ary);
return ary;
}
@@ -3036,35 +2608,30 @@ take_items(VALUE obj, long n)
if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
result = rb_ary_new2(n);
args[0] = result; args[1] = (VALUE)n;
- if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef)
- rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
- rb_obj_classname(obj));
+ rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
return result;
}
/*
* call-seq:
- * ary.zip(arg, ...) -> new_ary
- * ary.zip(arg, ...) { |arr| block } -> nil
- *
- * Converts any arguments to arrays, then merges elements of +self+ with
- * corresponding elements from each argument.
- *
- * This generates a sequence of <code>ary.size</code> _n_-element arrays,
- * where _n_ is one more than the count of arguments.
- *
- * If the size of any argument is less than the size of the initial array,
- * +nil+ values are supplied.
- *
- * If a block is given, it is invoked for each output +array+, otherwise an
- * array of arrays is returned.
+ * ary.zip(arg, ...) -> new_ary
+ * ary.zip(arg, ...) {| arr | block } -> nil
+ *
+ * Converts any arguments to arrays, then merges elements of
+ * +self+ with corresponding elements from each argument. This
+ * generates a sequence of <code>self.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>enumObj.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.
*
* 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,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
@@ -3103,13 +2670,11 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
* call-seq:
* ary.transpose -> new_ary
*
- * Assumes that +self+ is an array of arrays and transposes the rows and
- * columns.
+ * Assumes that +self+ 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]]
- *
- * If the length of the subarrays don't match, an IndexError is raised.
*/
static VALUE
@@ -3144,8 +2709,8 @@ rb_ary_transpose(VALUE ary)
* call-seq:
* ary.replace(other_ary) -> ary
*
- * Replaces the contents of +self+ with the contents of +other_ary+,
- * truncating or expanding if necessary.
+ * Replaces the contents of +self+ with the contents of
+ * <i>other_ary</i>, truncating or expanding if necessary.
*
* a = [ "a", "b", "c", "d", "e" ]
* a.replace([ "x", "y", "z" ]) #=> ["x", "y", "z"]
@@ -3207,15 +2772,9 @@ rb_ary_replace(VALUE copy, VALUE orig)
VALUE
rb_ary_clear(VALUE ary)
{
- rb_ary_modify_check(ary);
+ rb_ary_modify(ary);
ARY_SET_LEN(ary, 0);
- if (ARY_SHARED_P(ary)) {
- if (!ARY_EMBED_P(ary)) {
- rb_ary_unshare(ary);
- FL_SET_EMBED(ary);
- }
- }
- else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+ if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
}
return ary;
@@ -3223,32 +2782,27 @@ rb_ary_clear(VALUE ary)
/*
* call-seq:
- * ary.fill(obj) -> ary
- * ary.fill(obj, start [, length]) -> ary
- * ary.fill(obj, range ) -> ary
- * ary.fill { |index| block } -> ary
- * ary.fill(start [, length] ) { |index| block } -> ary
- * ary.fill(range) { |index| block } -> ary
+ * ary.fill(obj) -> ary
+ * ary.fill(obj, start [, length]) -> ary
+ * ary.fill(obj, range ) -> ary
+ * ary.fill {|index| block } -> ary
+ * ary.fill(start [, length] ) {|index| block } -> ary
+ * ary.fill(range) {|index| block } -> ary
*
* The first three forms set the selected elements of +self+ (which
- * may be the entire array) to +obj+.
- *
- * A +start+ of +nil+ is equivalent to zero.
- *
- * A +length+ of +nil+ is equivalent to the length of the array.
- *
- * The last three forms fill the array with the value of the given block,
- * which is passed the absolute index of each element to be filled.
- *
- * Negative values of +start+ count from the end of the array, where +-1+ is
- * the last element.
+ * 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"]
* a.fill("y", 0..1) #=> ["y", "y", "z", "z"]
- * a.fill { |i| i*i } #=> [0, 1, 4, 9]
- * a.fill(-2) { |i| i*i*i } #=> [0, 1, 8, 27]
+ * a.fill {|i| i*i} #=> [0, 1, 4, 9]
+ * a.fill(-2) {|i| i*i*i} #=> [0, 1, 8, 27]
*/
static VALUE
@@ -3326,15 +2880,10 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
* call-seq:
* ary + other_ary -> new_ary
*
- * Concatenation --- Returns a new array built by concatenating the
+ * 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 ]
- * a = [ "a", "b", "c" ]
- * a + [ "d", "e", "f" ]
- * a #=> [ "a", "b", "c", "d", "e", "f" ]
- *
- * See also Array#concat.
*/
VALUE
@@ -3356,16 +2905,12 @@ rb_ary_plus(VALUE x, VALUE y)
* call-seq:
* ary.concat(other_ary) -> ary
*
- * Appends the elements of +other_ary+ to +self+.
+ * Appends the elements of <i>other_ary</i> to +self+.
*
* [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
- * a = [ 1, 2, 3 ]
- * a.concat( [ 4, 5 ] )
- * a #=> [ 1, 2, 3, 4, 5 ]
- *
- * See also Array#+.
*/
+
VALUE
rb_ary_concat(VALUE x, VALUE y)
{
@@ -3383,11 +2928,9 @@ rb_ary_concat(VALUE x, VALUE y)
* ary * int -> new_ary
* ary * str -> new_string
*
- * Repetition --- With a String argument, equivalent to
- * <code>ary.join(str)</code>.
- *
- * Otherwise, returns a new array built by concatenating the +int+ copies of
- * +self+.
+ * Repetition---With a String argument, equivalent to
+ * self.join(str). Otherwise, returns a new array
+ * built by concatenating the _int_ copies of +self+.
*
*
* [ 1, 2, 3 ] * 3 #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
@@ -3399,7 +2942,7 @@ static VALUE
rb_ary_times(VALUE ary, VALUE times)
{
VALUE ary2, tmp, *ptr, *ptr2;
- long t, len;
+ long i, t, len;
tmp = rb_check_string_type(times);
if (!NIL_P(tmp)) {
@@ -3425,15 +2968,8 @@ rb_ary_times(VALUE ary, VALUE times)
ptr = RARRAY_PTR(ary);
ptr2 = RARRAY_PTR(ary2);
t = RARRAY_LEN(ary);
- if (0 < t) {
- MEMCPY(ptr2, ptr, VALUE, t);
- while (t <= len/2) {
- MEMCPY(ptr2+t, ptr2, VALUE, t);
- t *= 2;
- }
- if (t < len) {
- MEMCPY(ptr2+t, ptr2, VALUE, len-t);
- }
+ for (i=0; i<len; i+=t) {
+ MEMCPY(ptr2+i, ptr, VALUE, t);
}
out:
OBJ_INFECT(ary2, ary);
@@ -3445,13 +2981,13 @@ rb_ary_times(VALUE ary, VALUE times)
* call-seq:
* ary.assoc(obj) -> new_ary or nil
*
- * Searches through an array whose elements are also arrays comparing +obj+
- * with the first element of each contained array using <code>obj.==</code>.
- *
- * Returns the first contained array that matches (that is, the first
- * associated array), or +nil+ if no match is found.
- *
- * See also Array#rassoc
+ * Searches through an array whose elements are also arrays
+ * comparing _obj_ with the first element of each contained array
+ * using obj.==.
+ * Returns the first contained array that matches (that
+ * is, the first associated array),
+ * or +nil+ if no match is found.
+ * See also <code>Array#rassoc</code>.
*
* s1 = [ "colors", "red", "blue", "green" ]
* s2 = [ "letters", "a", "b", "c" ]
@@ -3480,14 +3016,10 @@ rb_ary_assoc(VALUE ary, VALUE key)
* call-seq:
* ary.rassoc(obj) -> new_ary or nil
*
- * Searches through the array whose elements are also arrays.
- *
- * Compares +obj+ with the second element of each contained array using
- * <code>obj.==</code>.
- *
- * Returns the first contained array that matches +obj+.
- *
- * See also Array#assoc.
+ * Searches through the array whose elements are also arrays. Compares
+ * _obj_ 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"]
@@ -3502,7 +3034,7 @@ rb_ary_rassoc(VALUE ary, VALUE value)
for (i = 0; i < RARRAY_LEN(ary); ++i) {
v = RARRAY_PTR(ary)[i];
- if (RB_TYPE_P(v, T_ARRAY) &&
+ if (TYPE(v) == T_ARRAY &&
RARRAY_LEN(v) > 1 &&
rb_equal(RARRAY_PTR(v)[1], value))
return v;
@@ -3513,32 +3045,12 @@ rb_ary_rassoc(VALUE ary, VALUE value)
static VALUE
recursive_equal(VALUE ary1, VALUE ary2, int recur)
{
- long i, len1;
- VALUE *p1, *p2;
+ long i;
if (recur) return Qtrue; /* Subtle! */
-
- p1 = RARRAY_PTR(ary1);
- p2 = RARRAY_PTR(ary2);
- len1 = RARRAY_LEN(ary1);
-
- for (i = 0; i < len1; i++) {
- if (*p1 != *p2) {
- if (rb_equal(*p1, *p2)) {
- len1 = RARRAY_LEN(ary1);
- if (len1 != RARRAY_LEN(ary2))
- return Qfalse;
- if (len1 < i)
- return Qtrue;
- p1 = RARRAY_PTR(ary1) + i;
- p2 = RARRAY_PTR(ary2) + i;
- }
- else {
- return Qfalse;
- }
- }
- p1++;
- p2++;
+ for (i=0; i<RARRAY_LEN(ary1); i++) {
+ if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+ return Qfalse;
}
return Qtrue;
}
@@ -3547,9 +3059,9 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
* call-seq:
* ary == other_ary -> bool
*
- * Equality --- Two arrays are equal if they contain the same number of
- * elements and if each element is equal to (according to Object#==) the
- * corresponding element in +other_ary+.
+ * Equality---Two arrays are equal if they contain the same number
+ * of elements and if each element is equal to (according to
+ * Object.==) the corresponding element in the other array.
*
* [ "a", "c" ] == [ "a", "c", 7 ] #=> false
* [ "a", "c", 7 ] == [ "a", "c", 7 ] #=> true
@@ -3561,7 +3073,7 @@ static VALUE
rb_ary_equal(VALUE ary1, VALUE ary2)
{
if (ary1 == ary2) return Qtrue;
- if (!RB_TYPE_P(ary2, T_ARRAY)) {
+ if (TYPE(ary2) != T_ARRAY) {
if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
return Qfalse;
}
@@ -3588,15 +3100,15 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
* call-seq:
* ary.eql?(other) -> true or false
*
- * Returns +true+ if +self+ and +other+ are the same object,
- * or are both arrays with the same content (according to Object#eql?).
+ * Returns <code>true</code> if +self+ and _other_ are the same object,
+ * or are both arrays with the same content.
*/
static VALUE
rb_ary_eql(VALUE ary1, VALUE ary2)
{
if (ary1 == ary2) return Qtrue;
- if (!RB_TYPE_P(ary2, T_ARRAY)) return Qfalse;
+ 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);
}
@@ -3626,10 +3138,8 @@ recursive_hash(VALUE ary, VALUE dummy, int recur)
* call-seq:
* ary.hash -> fixnum
*
- * Compute a hash-code for this array.
- *
- * Two arrays with the same content will have the same hash code (and will
- * compare using #eql?).
+ * 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
@@ -3640,10 +3150,11 @@ rb_ary_hash(VALUE ary)
/*
* call-seq:
- * ary.include?(object) -> true or false
+ * ary.include?(obj) -> true or false
*
- * Returns +true+ if the given +object+ is present in +self+ (that is, if any
- * element <code>==</code> +object+), otherwise returns +false+.
+ * Returns <code>true</code> if the given object is present in
+ * +self+ (that is, if any object <code>==</code> <i>anObject</i>),
+ * <code>false</code> otherwise.
*
* a = [ "a", "b", "c" ]
* a.include?("b") #=> true
@@ -3687,21 +3198,16 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
* call-seq:
* ary <=> other_ary -> -1, 0, +1 or nil
*
- * Comparison --- Returns an integer (+-1+, +0+, or <code>+1</code>) if this
- * array is less than, equal to, or greater than +other_ary+.
- *
- * +nil+ is returned if the two values are incomparable.
- *
- * Each object in each array is compared (using the <=> operator).
- *
- * Arrays are compared in an "element-wise" manner; the first two elements
- * that are not equal will determine the return value for the whole
- * comparison.
- *
- * If all the values are equal, then the return is based on a comparison of
- * the array lengths. Thus, two arrays are "equal" according to Array#<=> 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.
+ * Comparison---Returns an integer (-1, 0,
+ * or +1) if this array is less than, equal to, or greater than
+ * <i>other_ary</i>. Each object in each array is compared
+ * (using <=>). If any value isn't
+ * equal, then that inequality is the return value. If all the
+ * values found are equal, then the return is based on a
+ * comparison of the array lengths. Thus, two arrays are
+ * ``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
@@ -3781,31 +3287,25 @@ ary_recycle_hash(VALUE hash)
RHASH(hash)->ntbl = 0;
st_free_table(tbl);
}
- RB_GC_GUARD(hash);
}
/*
* call-seq:
* ary - other_ary -> new_ary
*
- * Array Difference
- *
- * Returns a new array that is a copy of the original array, removing any
- * items that also appear in +other_ary+. The order is preserved from the
- * original array.
- *
- * It compares elements using their #hash and #eql? methods for efficiency.
+ * Array Difference---Returns a new array that is a copy of
+ * the original array, removing any items that also appear in
+ * <i>other_ary</i>. (If you need set-like behavior, see the
+ * library class Set.)
*
* [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ] #=> [ 3, 3, 5 ]
- *
- * If you need set-like behavior, see the library class Set.
*/
static VALUE
rb_ary_diff(VALUE ary1, VALUE ary2)
{
VALUE ary3;
- VALUE hash;
+ volatile VALUE hash;
long i;
hash = ary_make_hash(to_ary(ary2));
@@ -3823,24 +3323,17 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
* call-seq:
* ary & other_ary -> new_ary
*
- * Set Intersection --- Returns a new array containing elements common to the
- * two arrays, excluding any duplicates. The order is preserved from the
- * original array.
- *
- * It compares elements using their #hash and #eql? methods for efficiency.
+ * Set Intersection---Returns a new array
+ * containing elements common to the two arrays, with no duplicates.
*
- * [ 1, 1, 3, 5 ] & [ 1, 2, 3 ] #=> [ 1, 3 ]
- * [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ] #=> [ 'a', 'b' ]
- *
- * See also Array#uniq.
+ * [ 1, 1, 3, 5 ] & [ 1, 2, 3 ] #=> [ 1, 3 ]
*/
static VALUE
rb_ary_and(VALUE ary1, VALUE ary2)
{
- VALUE hash, ary3, v;
- st_data_t vv;
+ VALUE hash, ary3, v, vv;
long i;
ary2 = to_ary(ary2);
@@ -3852,8 +3345,8 @@ rb_ary_and(VALUE ary1, VALUE ary2)
return ary3;
for (i=0; i<RARRAY_LEN(ary1); i++) {
- vv = (st_data_t)(v = rb_ary_elt(ary1, i));
- if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+ v = vv = rb_ary_elt(ary1, i);
+ if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
rb_ary_push(ary3, v);
}
}
@@ -3866,21 +3359,18 @@ rb_ary_and(VALUE ary1, VALUE ary2)
* call-seq:
* ary | other_ary -> new_ary
*
- * Set Union --- Returns a new array by joining +ary+ with +other_ary+,
- * excluding any duplicates and preserving the order from the original array.
- *
- * It compares elements using their #hash and #eql? methods for efficiency.
+ * Set Union---Returns a new array by joining this array with
+ * <i>other_ary</i>, removing duplicates.
*
- * [ "a", "b", "c" ] | [ "c", "d", "a" ] #=> [ "a", "b", "c", "d" ]
- *
- * See also Array#uniq.
+ * [ "a", "b", "c" ] | [ "c", "d", "a" ]
+ * #=> [ "a", "b", "c", "d" ]
*/
static VALUE
rb_ary_or(VALUE ary1, VALUE ary2)
{
- VALUE hash, ary3, v;
- st_data_t vv;
+ VALUE hash, ary3;
+ VALUE v, vv;
long i;
ary2 = to_ary(ary2);
@@ -3888,14 +3378,14 @@ rb_ary_or(VALUE ary1, VALUE ary2)
hash = ary_add_hash(ary_make_hash(ary1), ary2);
for (i=0; i<RARRAY_LEN(ary1); i++) {
- vv = (st_data_t)(v = rb_ary_elt(ary1, i));
- if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+ v = vv = rb_ary_elt(ary1, i);
+ if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
rb_ary_push(ary3, v);
}
}
for (i=0; i<RARRAY_LEN(ary2); i++) {
- vv = (st_data_t)(v = rb_ary_elt(ary2, i));
- if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+ v = vv = rb_ary_elt(ary2, i);
+ if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
rb_ary_push(ary3, v);
}
}
@@ -3912,27 +3402,18 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
/*
* call-seq:
- * ary.uniq! -> ary or nil
- * ary.uniq! { |item| ... } -> ary or nil
+ * ary.uniq! -> ary or nil
*
* Removes duplicate elements from +self+.
- *
- * If a block is given, it will use the return value of the block for
- * comparison.
- *
- * It compares values using their #hash and #eql? methods for efficiency.
- *
- * Returns +nil+ if no changes are made (that is, no duplicates are found).
+ * 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"]
- *
+ * a.uniq! #=> ["a", "b", "c"]
* b = [ "a", "b", "c" ]
- * b.uniq! # => nil
- *
- * c = [["student","sam"], ["student","george"], ["teacher","matz"]]
- * c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
- *
+ * 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
@@ -3977,21 +3458,14 @@ rb_ary_uniq_bang(VALUE ary)
/*
* call-seq:
- * ary.uniq -> new_ary
- * ary.uniq { |item| ... } -> new_ary
+ * ary.uniq -> new_ary
*
* Returns a new array by removing duplicate values in +self+.
*
- * If a block is given, it will use the return value of the block for comparison.
- *
- * It compares values using their #hash and #eql? methods for efficiency.
- *
* a = [ "a", "a", "b", "b", "c" ]
- * a.uniq # => ["a", "b", "c"]
- *
- * b = [["student","sam"], ["student","george"], ["teacher","matz"]]
- * b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
- *
+ * 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
@@ -4027,8 +3501,8 @@ rb_ary_uniq(VALUE ary)
* ary.compact! -> ary or nil
*
* Removes +nil+ elements from the array.
- *
- * Returns +nil+ if no changes were made, otherwise returns the array.
+ * Returns +nil+ if no changes were made, otherwise returns
+ * </i>ary</i>.
*
* [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
* [ "a", "b", "c" ].compact! #=> nil
@@ -4080,50 +3554,45 @@ rb_ary_compact(VALUE ary)
/*
* call-seq:
- * ary.count -> int
- * ary.count(obj) -> int
+ * ary.count -> int
+ * ary.count(obj) -> int
* ary.count { |item| block } -> int
*
- * Returns the number of elements.
- *
- * If an argument is given, counts the number of elements which equal +obj+
- * using <code>===</code>.
- *
- * If a block is given, counts the number of elements for which the block
- * returns a true value.
+ * 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.
*
* ary = [1, 2, 4, 2]
- * ary.count #=> 4
- * ary.count(2) #=> 2
- * ary.count { |x| x%2 == 0 } #=> 3
+ * ary.count #=> 4
+ * ary.count(2) #=> 2
+ * ary.count{|x|x%2==0} #=> 3
*
*/
static VALUE
rb_ary_count(int argc, VALUE *argv, VALUE ary)
{
- long i, n = 0;
+ long n = 0;
if (argc == 0) {
- VALUE v;
+ VALUE *p, *pend;
if (!rb_block_given_p())
return LONG2NUM(RARRAY_LEN(ary));
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- v = RARRAY_PTR(ary)[i];
- if (RTEST(rb_yield(v))) n++;
+ for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
+ if (RTEST(rb_yield(*p))) n++;
}
}
else {
- VALUE obj;
+ VALUE obj, *p, *pend;
rb_scan_args(argc, argv, "1", &obj);
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], obj)) n++;
+ for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
+ if (rb_equal(*p, obj)) n++;
}
}
@@ -4187,14 +3656,12 @@ flatten(VALUE ary, int level, int *modified)
/*
* call-seq:
* ary.flatten! -> ary or nil
- * ary.flatten!(level) -> ary or nil
+ * ary.flatten!(level) -> array or nil
*
* Flattens +self+ in place.
- *
- * Returns +nil+ if no modifications were made (i.e., the array contains no
- * subarrays.)
- *
- * The optional +level+ argument determines the level of recursion to flatten.
+ * Returns <code>nil</code> if no modifications were made (i.e.,
+ * <i>ary</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]
@@ -4232,14 +3699,10 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
* ary.flatten -> new_ary
* ary.flatten(level) -> new_ary
*
- * Returns a new array that is a one-dimensional flattening of +self+
- * (recursively).
- *
- * That is, for every element that is an array, extract its elements into
- * the new array.
- *
- * The optional +level+ argument determines the level of recursion to
- * flatten.
+ * 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]]
@@ -4265,44 +3728,25 @@ rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
return result;
}
-#define OPTHASH_GIVEN_P(opts) \
- (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
-static VALUE sym_random;
-
-#define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1)
-
/*
* call-seq:
- * ary.shuffle! -> ary
- * ary.shuffle!(random: rng) -> ary
+ * ary.shuffle! -> ary
*
* Shuffles elements in +self+ in place.
- *
- * The optional +rng+ argument will be used as the random number generator.
*/
+
static VALUE
-rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
+rb_ary_shuffle_bang(VALUE ary)
{
- VALUE *ptr, opts, *snap_ptr, randgen = rb_cRandom;
- long i, snap_len;
+ VALUE *ptr;
+ long i = RARRAY_LEN(ary);
- if (OPTHASH_GIVEN_P(opts)) {
- randgen = rb_hash_lookup2(opts, sym_random, randgen);
- }
- rb_check_arity(argc, 0, 0);
rb_ary_modify(ary);
- i = RARRAY_LEN(ary);
ptr = RARRAY_PTR(ary);
- snap_len = i;
- snap_ptr = ptr;
while (i) {
- long j = RAND_UPTO(i);
- VALUE tmp;
- if (snap_len != RARRAY_LEN(ary) || snap_ptr != RARRAY_PTR(ary)) {
- rb_raise(rb_eRuntimeError, "modified during shuffle");
- }
- tmp = ptr[--i];
+ long j = (long)(rb_genrand_real()*i);
+ VALUE tmp = ptr[--i];
ptr[i] = ptr[j];
ptr[j] = tmp;
}
@@ -4312,49 +3756,34 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
/*
* call-seq:
- * ary.shuffle -> new_ary
- * ary.shuffle(random: rng) -> new_ary
+ * ary.shuffle -> new_ary
*
- * Returns a new array with elements of +self+ shuffled.
+ * Returns a new array with elements of this array shuffled.
*
* a = [ 1, 2, 3 ] #=> [1, 2, 3]
* a.shuffle #=> [2, 3, 1]
- *
- * The optional +rng+ argument will be used as the random number generator.
- *
- * a.shuffle(random: Random.new(1)) #=> [1, 3, 2]
*/
static VALUE
-rb_ary_shuffle(int argc, VALUE *argv, VALUE ary)
+rb_ary_shuffle(VALUE ary)
{
ary = rb_ary_dup(ary);
- rb_ary_shuffle_bang(argc, argv, ary);
+ rb_ary_shuffle_bang(ary);
return ary;
}
/*
* call-seq:
- * ary.sample -> obj
- * ary.sample(random: rng) -> obj
- * ary.sample(n) -> new_ary
- * ary.sample(n, random: rng) -> new_ary
+ * ary.sample -> obj
+ * ary.sample(n) -> new_ary
*
- * Choose a random element or +n+ random elements from the 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.
*
- * 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 +nil+ and the second form
- * returns an empty array.
- *
- * The optional +rng+ argument will be used as the random number generator.
- *
- * a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
- * a.sample #=> 7
- * a.sample(4) #=> [6, 4, 2, 5]
*/
@@ -4362,64 +3791,33 @@ static VALUE
rb_ary_sample(int argc, VALUE *argv, VALUE ary)
{
VALUE nv, result, *ptr;
- VALUE opts, randgen = rb_cRandom;
long n, len, i, j, k, idx[10];
- long rnds[numberof(idx)];
- if (OPTHASH_GIVEN_P(opts)) {
- randgen = rb_hash_lookup2(opts, sym_random, randgen);
- }
- ptr = RARRAY_PTR(ary);
len = RARRAY_LEN(ary);
if (argc == 0) {
if (len == 0) return Qnil;
- if (len == 1) {
- i = 0;
- }
- else {
- i = RAND_UPTO(len);
- if ((len = RARRAY_LEN(ary)) <= i) return Qnil;
- ptr = RARRAY_PTR(ary);
- }
- return ptr[i];
+ 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");
- if (n > len) n = len;
- if (n <= numberof(idx)) {
- for (i = 0; i < n; ++i) {
- rnds[i] = RAND_UPTO(len - i);
- }
- }
- k = len;
- len = RARRAY_LEN(ary);
ptr = RARRAY_PTR(ary);
- if (len < k) {
- if (n <= numberof(idx)) {
- for (i = 0; i < n; ++i) {
- if (rnds[i] >= len) {
- return rb_ary_new2(0);
- }
- }
- }
- }
+ len = RARRAY_LEN(ary);
if (n > len) n = len;
switch (n) {
- case 0:
- return rb_ary_new2(0);
+ case 0: return rb_ary_new2(0);
case 1:
- i = rnds[0];
- return rb_ary_new4(1, &ptr[i]);
+ return rb_ary_new4(1, &ptr[(long)(rb_genrand_real()*len)]);
case 2:
- i = rnds[0];
- j = rnds[1];
+ 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 = rnds[0];
- j = rnds[1];
- k = rnds[2];
+ 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;
@@ -4427,12 +3825,12 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
}
return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]);
}
- if (n <= numberof(idx)) {
+ if ((size_t)n < sizeof(idx)/sizeof(idx[0])) {
VALUE *ptr_result;
- long sorted[numberof(idx)];
- sorted[0] = idx[0] = rnds[0];
+ long sorted[sizeof(idx)/sizeof(idx[0])];
+ sorted[0] = idx[0] = (long)(rb_genrand_real()*len);
for (i=1; i<n; i++) {
- k = rnds[i];
+ k = (long)(rb_genrand_real()*--len);
for (j = 0; j < i; ++j) {
if (k < sorted[j]) break;
++k;
@@ -4449,54 +3847,37 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
else {
VALUE *ptr_result;
result = rb_ary_new4(len, ptr);
- RBASIC(result)->klass = 0;
ptr_result = RARRAY_PTR(result);
RB_GC_GUARD(ary);
for (i=0; i<n; i++) {
- j = RAND_UPTO(len-i) + i;
+ j = (long)(rb_genrand_real()*(len-i)) + i;
nv = ptr_result[j];
ptr_result[j] = ptr_result[i];
ptr_result[i] = nv;
}
- RBASIC(result)->klass = rb_cArray;
}
ARY_SET_LEN(result, n);
return result;
}
-static VALUE
-rb_ary_cycle_size(VALUE self, VALUE args)
-{
- long mul;
- VALUE n = Qnil;
- if (args && (RARRAY_LEN(args) > 0)) {
- n = RARRAY_PTR(args)[0];
- }
- if (RARRAY_LEN(self) == 0) return INT2FIX(0);
- if (n == Qnil) return DBL2NUM(INFINITY);
- mul = NUM2LONG(n);
- if (mul <= 0) return INT2FIX(0);
- return rb_funcall(rb_ary_length(self), '*', 1, LONG2FIX(mul));
-}
/*
* call-seq:
- * ary.cycle(n=nil) { |obj| block } -> nil
- * ary.cycle(n=nil) -> Enumerator
- *
- * Calls the given block for each element +n+ times or forever if +nil+ is
- * given.
+ * ary.cycle(n=nil) {|obj| block } -> nil
+ * ary.cycle(n=nil) -> an_enumerator
*
- * Does nothing if a non-positive number is given or the array is empty.
+ * 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.
*
- * Returns +nil+ if the loop has finished without getting interrupted.
+ * If no block is given, an enumerator is returned instead.
*
- * If no block is given, an Enumerator is returned instead.
*
* 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.
+ * 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.
*
*/
@@ -4508,7 +3889,7 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
rb_scan_args(argc, argv, "01", &nv);
- RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_cycle_size);
+ RETURN_ENUMERATOR(ary, argc, argv);
if (NIL_P(nv)) {
n = -1;
}
@@ -4531,28 +3912,7 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
#define tmpary_discard(a) (ary_discard(a), RBASIC(a)->klass = rb_cArray)
/*
- * Build a ruby array of the corresponding values and yield it to the
- * associated block.
- * Return the class of +values+ for reentry check.
- */
-static int
-yield_indexed_values(const VALUE values, const long r, const long *const p)
-{
- const VALUE result = rb_ary_new2(r);
- VALUE *const result_array = RARRAY_PTR(result);
- const VALUE *const values_array = RARRAY_PTR(values);
- long i;
-
- for (i = 0; i < r; i++) result_array[i] = values_array[p[i]];
- ARY_SET_LEN(result, r);
- rb_yield(result);
- return !RBASIC(values)->klass;
-}
-
-/*
- * Recursively compute permutations of +r+ elements of the set
- * <code>[0..n-1]</code>.
- *
+ * 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.
*
@@ -4566,7 +3926,7 @@ yield_indexed_values(const VALUE values, const long r, const long *const p)
static void
permute0(long n, long r, long *p, long index, char *used, VALUE values)
{
- long i;
+ long i,j;
for (i = 0; i < n; i++) {
if (used[i] == 0) {
p[index] = i;
@@ -4577,7 +3937,17 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
used[i] = 0; /* index unused */
}
else {
- if (!yield_indexed_values(values, r, p)) {
+ /* We have a complete permutation of array indexes */
+ /* 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);
+
+ for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
+ ARY_SET_LEN(result, r);
+ rb_yield(result);
+ if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "permute reentered");
}
}
@@ -4586,66 +3956,29 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values)
}
/*
- * Returns the product of from, from-1, ..., from - how_many + 1.
- * http://en.wikipedia.org/wiki/Pochhammer_symbol
- */
-static VALUE
-descending_factorial(long from, long how_many)
-{
- VALUE cnt = LONG2FIX(how_many >= 0);
- while (how_many-- > 0) {
- cnt = rb_funcall(cnt, '*', 1, LONG2FIX(from--));
- }
- return cnt;
-}
-
-static VALUE
-binomial_coefficient(long comb, long size)
-{
- if (comb > size-comb) {
- comb = size-comb;
- }
- if (comb < 0) {
- return LONG2FIX(0);
- }
- return rb_funcall(descending_factorial(size, comb), id_div, 1, descending_factorial(comb, comb));
-}
-
-static VALUE
-rb_ary_permutation_size(VALUE ary, VALUE args)
-{
- long n = RARRAY_LEN(ary);
- long k = (args && (RARRAY_LEN(args) > 0)) ? NUM2LONG(RARRAY_PTR(args)[0]) : n;
-
- return descending_factorial(n, k);
-}
-
-/*
* call-seq:
* ary.permutation { |p| block } -> ary
- * ary.permutation -> Enumerator
+ * ary.permutation -> an_enumerator
* ary.permutation(n) { |p| block } -> ary
- * ary.permutation(n) -> Enumerator
- *
- * When invoked with a block, yield all permutations of length +n+ of the
- * elements of the array, then return the array itself.
+ * ary.permutation(n) -> an_enumerator
*
- * If +n+ is not specified, yield all permutations of all elements.
+ * 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 permutations are yielded.
*
- * The implementation makes no guarantees about the order in which the
- * permutations are yielded.
- *
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* Examples:
*
- * a = [1, 2, 3]
- * a.permutation.to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- * a.permutation(1).to_a #=> [[1],[2],[3]]
- * a.permutation(2).to_a #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
- * a.permutation(3).to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- * a.permutation(0).to_a #=> [[]] # one permutation of length 0
- * a.permutation(4).to_a #=> [] # no permutations of length 4
+ * a = [1, 2, 3]
+ * a.permutation.to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ * a.permutation(1).to_a #=> [[1],[2],[3]]
+ * a.permutation(2).to_a #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
+ * a.permutation(3).to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ * a.permutation(0).to_a #=> [[]] # one permutation of length 0
+ * a.permutation(4).to_a #=> [] # no permutations of length 4
*/
static VALUE
@@ -4655,7 +3988,7 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
long r, n, i;
n = RARRAY_LEN(ary); /* Array length */
- RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_permutation_size); /* Return enumerator if no block */
+ 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 */
@@ -4671,7 +4004,7 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
}
}
else { /* this is the general case */
- volatile VALUE t0 = tmpbuf(r,sizeof(long));
+ 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);
@@ -4688,27 +4021,17 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
return ary;
}
-static VALUE
-rb_ary_combination_size(VALUE ary, VALUE args)
-{
- long n = RARRAY_LEN(ary);
- long k = NUM2LONG(RARRAY_PTR(args)[0]);
-
- return binomial_coefficient(k, n);
-}
-
/*
* call-seq:
* ary.combination(n) { |c| block } -> ary
- * ary.combination(n) -> Enumerator
- *
- * When invoked with a block, yields all combinations of length +n+ of elements
- * from the array and then returns the array itself.
+ * ary.combination(n) -> an_enumerator
*
- * The implementation makes no guarantees about the order in which the
- * combinations are yielded.
+ * 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 combinations are yielded.
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* Examples:
*
@@ -4728,7 +4051,7 @@ rb_ary_combination(VALUE ary, VALUE num)
long n, i, len;
n = NUM2LONG(num);
- RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size);
+ RETURN_ENUMERATOR(ary, 1, &num);
len = RARRAY_LEN(ary);
if (n < 0 || len < n) {
/* yield nothing */
@@ -4742,19 +4065,21 @@ rb_ary_combination(VALUE ary, VALUE num)
}
}
else {
- VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
- volatile VALUE t0;
- long *stack = ALLOCV_N(long, t0, n+1);
+ volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
+ long *stack = (long*)RSTRING_PTR(t0);
+ volatile VALUE cc = tmpary(n);
+ VALUE *chosen = RARRAY_PTR(cc);
long lev = 0;
- RBASIC(ary0)->klass = 0;
- MEMZERO(stack+1, long, n);
+ MEMZERO(stack, long, n);
stack[0] = -1;
for (;;) {
+ chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
for (lev++; lev < n; lev++) {
- stack[lev+1] = stack[lev]+1;
+ chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
}
- if (!yield_indexed_values(ary0, n, stack+1)) {
+ rb_yield(rb_ary_new4(n, chosen));
+ if (RBASIC(t0)->klass) {
rb_raise(rb_eRuntimeError, "combination reentered");
}
do {
@@ -4763,16 +4088,15 @@ rb_ary_combination(VALUE ary, VALUE num)
} while (stack[lev+1]+n == len+lev+1);
}
done:
- ALLOCV_END(t0);
- RBASIC(ary0)->klass = rb_cArray;
+ tmpbuf_discard(t0);
+ tmpary_discard(cc);
}
return ary;
}
/*
- * Recursively compute repeated permutations of +r+ elements of the set
- * <code>[0..n-1]</code>.
- *
+ * Recursively compute repeated permutations of r elements of the set
+ * [0..n-1].
* When we have a complete repeated permutation of array indexes, copy the
* values at those indexes into a new array and yield that array.
*
@@ -4785,45 +4109,41 @@ rb_ary_combination(VALUE ary, VALUE num)
static void
rpermute0(long n, long r, long *p, long index, VALUE values)
{
- long i;
+ long i, j;
for (i = 0; i < n; i++) {
p[index] = i;
if (index < r-1) { /* if not done yet */
rpermute0(n, r, p, index+1, values); /* recurse */
}
else {
- if (!yield_indexed_values(values, r, p)) {
+ /* We have a complete permutation of array indexes */
+ /* 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);
+
+ for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
+ ARY_SET_LEN(result, r);
+ rb_yield(result);
+ if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "repeated permute reentered");
}
}
}
}
-static VALUE
-rb_ary_repeated_permutation_size(VALUE ary, VALUE args)
-{
- long n = RARRAY_LEN(ary);
- long k = NUM2LONG(RARRAY_PTR(args)[0]);
-
- if (k < 0) {
- return LONG2FIX(0);
- }
-
- return rb_funcall(LONG2NUM(n), id_power, 1, LONG2NUM(k));
-}
-
/*
* call-seq:
* ary.repeated_permutation(n) { |p| block } -> ary
- * ary.repeated_permutation(n) -> Enumerator
- *
- * When invoked with a block, yield all repeated permutations of length +n+ of
- * the elements of the array, then return the array itself.
+ * ary.repeated_permutation(n) -> an_enumerator
*
- * The implementation makes no guarantees about the order in which the repeated
- * permutations are yielded.
+ * When invoked with a block, yield all repeated permutations of length
+ * <i>n</i> of the elements of <i>ary</i>, then return the array itself.
+ * The implementation makes no guarantees about the order in which
+ * the repeated permutations are yielded.
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* Examples:
*
@@ -4841,7 +4161,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
long r, n, i;
n = RARRAY_LEN(ary); /* Array length */
- RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_permutation_size); /* Return Enumerator if no block */
+ RETURN_ENUMERATOR(ary, 1, &num); /* Return enumerator if no block */
r = NUM2LONG(num); /* Permutation size from argument */
if (r < 0) {
@@ -4871,6 +4191,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
static void
rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
{
+ long j;
if (rest > 0) {
for (; index < n; ++index) {
p[r-rest] = index;
@@ -4878,47 +4199,43 @@ rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
}
}
else {
- if (!yield_indexed_values(values, r, p)) {
+ VALUE result = rb_ary_new2(r);
+ VALUE *result_array = RARRAY_PTR(result);
+ const VALUE *values_array = RARRAY_PTR(values);
+
+ for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]];
+ ARY_SET_LEN(result, r);
+ rb_yield(result);
+ if (RBASIC(values)->klass) {
rb_raise(rb_eRuntimeError, "repeated combination reentered");
}
}
}
-static VALUE
-rb_ary_repeated_combination_size(VALUE ary, VALUE args)
-{
- long n = RARRAY_LEN(ary);
- long k = NUM2LONG(RARRAY_PTR(args)[0]);
- if (k == 0) {
- return LONG2FIX(1);
- }
- return binomial_coefficient(k, n + k - 1);
-}
-
/*
* call-seq:
* ary.repeated_combination(n) { |c| block } -> ary
- * ary.repeated_combination(n) -> Enumerator
- *
- * When invoked with a block, yields all repeated combinations of length +n+ of
- * elements from the array and then returns the array itself.
+ * ary.repeated_combination(n) -> an_enumerator
*
- * The implementation makes no guarantees about the order in which the repeated
- * combinations are yielded.
+ * When invoked with a block, yields all repeated 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 repeated combinations are yielded.
*
- * If no block is given, an Enumerator is returned instead.
+ * If no block is given, an enumerator is returned instead.
*
* Examples:
*
- * a = [1, 2, 3]
- * a.repeated_combination(1).to_a #=> [[1], [2], [3]]
- * a.repeated_combination(2).to_a #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
- * a.repeated_combination(3).to_a #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
- * # [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
- * a.repeated_combination(4).to_a #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
- * # [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
- * # [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
- * a.repeated_combination(0).to_a #=> [[]] # one combination of length 0
+ * a = [1, 2, 3]
+ * a.repeated_combination(1).to_a #=> [[1], [2], [3]]
+ * a.repeated_combination(2).to_a #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
+ * a.repeated_combination(3).to_a #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
+ * # [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
+ * a.repeated_combination(4).to_a #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
+ * # [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
+ * # [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
+ * a.repeated_combination(0).to_a #=> [[]] # one combination of length 0
*
*/
@@ -4928,7 +4245,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
long n, i, len;
n = NUM2LONG(num); /* Combination size from argument */
- RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_combination_size); /* Return enumerator if no block */
+ RETURN_ENUMERATOR(ary, 1, &num); /* Return enumerator if no block */
len = RARRAY_LEN(ary);
if (n < 0) {
/* yield nothing */
@@ -4962,13 +4279,12 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
* ary.product(other_ary, ...) -> new_ary
* ary.product(other_ary, ...) { |p| block } -> ary
*
- * Returns an array of all combinations of elements from all arrays.
+ * Returns an array of all combinations of elements from all arrays,
+ * The length of the returned array is the product of the length
+ * of +self+ and the argument arrays.
+ * If given a block, <i>product</i> will yield all combinations
+ * and return +self+ instead.
*
- * The length of the returned array is the product of the length of +self+ and
- * the argument arrays.
- *
- * If given a block, #product will yield all combinations and return +self+
- * instead.
*
* [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]]
@@ -5013,14 +4329,15 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
else {
/* Compute the length of the result array; return [] if any is empty */
for (i = 0; i < n; i++) {
- long k = RARRAY_LEN(arrays[i]);
+ long k = RARRAY_LEN(arrays[i]), l = resultlen;
if (k == 0) {
result = rb_ary_new2(0);
goto done;
}
- if (MUL_OVERFLOW_LONG_P(resultlen, k))
- rb_raise(rb_eRangeError, "too big to product");
resultlen *= k;
+ if (resultlen < k || resultlen < l || resultlen / k != l) {
+ rb_raise(rb_eRangeError, "too big to product");
+ }
}
result = rb_ary_new2(resultlen);
}
@@ -5033,7 +4350,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
}
/* put it on the result array */
- if (NIL_P(result)) {
+ if(NIL_P(result)) {
FL_SET(t0, FL_USER5);
rb_yield(subarray);
if (! FL_TEST(t0, FL_USER5)) {
@@ -5055,7 +4372,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
counters[m]++;
while (counters[m] == RARRAY_LEN(arrays[m])) {
counters[m] = 0;
- /* If the first counter overflows, we are done */
+ /* If the first counter overlows, we are done */
if (--m < 0) goto done;
counters[m]++;
}
@@ -5071,11 +4388,7 @@ done:
* call-seq:
* ary.take(n) -> new_ary
*
- * Returns first +n+ elements from the array.
- *
- * If a negative number is given, raises an ArgumentError.
- *
- * See also Array#drop
+ * Returns first n elements from <i>ary</i>.
*
* a = [1, 2, 3, 4, 5, 0]
* a.take(3) #=> [1, 2, 3]
@@ -5094,18 +4407,16 @@ rb_ary_take(VALUE obj, VALUE n)
/*
* call-seq:
- * ary.take_while { |arr| block } -> new_ary
- * ary.take_while -> Enumerator
- *
- * Passes elements to the block until the block returns +nil+ or +false+, then
- * stops iterating and returns an array of all prior elements.
+ * ary.take_while {|arr| block } -> new_ary
+ * ary.take_while -> an_enumerator
*
- * If no block is given, an Enumerator is returned instead.
+ * Passes elements to the block until the block returns +nil+ or +false+,
+ * then stops iterating and returns an array of all prior elements.
*
- * See also Array#drop_while
+ * If no block is given, an enumerator is returned instead.
*
* a = [1, 2, 3, 4, 5, 0]
- * a.take_while { |i| i < 3 } #=> [1, 2]
+ * a.take_while {|i| i < 3 } #=> [1, 2]
*
*/
@@ -5125,12 +4436,8 @@ rb_ary_take_while(VALUE ary)
* call-seq:
* ary.drop(n) -> new_ary
*
- * Drops first +n+ elements from +ary+ and returns the rest of the elements in
- * an array.
- *
- * If a negative number is given, raises an ArgumentError.
- *
- * See also Array#take
+ * 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]
@@ -5153,16 +4460,14 @@ rb_ary_drop(VALUE ary, VALUE n)
/*
* call-seq:
- * ary.drop_while { |arr| block } -> new_ary
- * ary.drop_while -> Enumerator
- *
- * 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.
+ * ary.drop_while {|arr| block } -> new_ary
+ * ary.drop_while -> an_enumerator
*
- * If no block is given, an Enumerator is returned instead.
+ * 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.
*
- * See also Array#take_while
+ * If no block is given, an enumerator is returned instead.
*
* a = [1, 2, 3, 4, 5, 0]
* a.drop_while {|i| i < 3 } #=> [3, 4, 5, 0]
@@ -5181,238 +4486,13 @@ rb_ary_drop_while(VALUE ary)
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.
- *
- * == Creating Arrays
- *
- * A new array can be created by using the literal constructor
- * <code>[]</code>. Arrays can contain different types of objects. For
- * example, the array below contains an Integer, a String and a Float:
- *
- * ary = [1, "two", 3.0] #=> [1, "two", 3.0]
- *
- * An array can also be created by explicitly calling Array.new with zero, one
- * (the initial size of the Array) or two arguments (the initial size and a
- * default object).
- *
- * ary = Array.new #=> []
- * Array.new(3) #=> [nil, nil, nil]
- * Array.new(3, true) #=> [true, true, true]
- *
- * Note that the second argument populates the array with references to the
- * same object. Therefore, it is only recommended in cases when you need to
- * instantiate arrays with natively immutable objects such as Symbols,
- * numbers, true or false.
- *
- * To create an array with separate objects a block can be passed instead.
- * This method is safe to use with mutable objects such as hashes, strings or
- * other arrays:
- *
- * Array.new(4) { Hash.new } #=> [{}, {}, {}, {}]
- *
- * This is also a quick way to build up multi-dimensional arrays:
- *
- * empty_table = Array.new(3) { Array.new(3) }
- * #=> [[nil, nil, nil], [nil, nil, nil], [nil, nil, nil]]
- *
- * An array can also be created by using the Array() method, provided by
- * Kernel, which tries to call #to_ary, then #to_a on its argument.
- *
- * Array({:a => "a", :b => "b"}) #=> [[:a, "a"], [:b, "b"]]
- *
- * == Example Usage
- *
- * In addition to the methods it mixes in through the Enumerable module, the
- * Array class has proprietary methods for accessing, searching and otherwise
- * manipulating arrays.
- *
- * Some of the more common ones are illustrated below.
- *
- * == Accessing Elements
- *
- * Elements in an array can be retrieved using the Array#[] method. It can
- * take a single integer argument (a numeric index), a pair of arguments
- * (start and length) or a range.
- *
- * arr = [1, 2, 3, 4, 5, 6]
- * arr[2] #=> 3
- * arr[100] #=> nil
- * arr[-3] #=> 4
- * arr[2, 3] #=> [3, 4, 5]
- * arr[1..4] #=> [2, 3, 4, 5]
- *
- * Another way to access a particular array element is by using the #at method
- *
- * arr.at(0) #=> 1
- *
- * The #slice method works in an identical manner to Array#[].
- *
- * To raise an error for indices outside of the array bounds or else to
- * provide a default value when that happens, you can use #fetch.
- *
- * arr = ['a', 'b', 'c', 'd', 'e', 'f']
- * arr.fetch(100) #=> IndexError: index 100 outside of array bounds: -6...6
- * arr.fetch(100, "oops") #=> "oops"
- *
- * The special methods #first and #last will return the first and last
- * elements of an array, respectively.
- *
- * arr.first #=> 1
- * arr.last #=> 6
- *
- * To return the first +n+ elements of an array, use #take
- *
- * arr.take(3) #=> [1, 2, 3]
- *
- * #drop does the opposite of #take, by returning the elements after +n+
- * elements have been dropped:
- *
- * arr.drop(3) #=> [4, 5, 6]
- *
- * == Obtaining Information about an Array
- *
- * Arrays keep track of their own length at all times. To query an array
- * about the number of elements it contains, use #length, #count or #size.
- *
- * browsers = ['Chrome', 'Firefox', 'Safari', 'Opera', 'IE']
- * browsers.length #=> 5
- * browsers.count #=> 5
- *
- * To check whether an array contains any elements at all
- *
- * browsers.empty? #=> false
- *
- * To check whether a particular item is included in the array
- *
- * browsers.include?('Konqueror') #=> false
- *
- * == Adding Items to Arrays
- *
- * Items can be added to the end of an array by using either #push or #<<
- *
- * arr = [1, 2, 3, 4]
- * arr.push(5) #=> [1, 2, 3, 4, 5]
- * arr << 6 #=> [1, 2, 3, 4, 5, 6]
- *
- * #unshift will add a new item to the beginning of an array.
- *
- * arr.unshift(0) #=> [0, 1, 2, 3, 4, 5, 6]
- *
- * With #insert you can add a new element to an array at any position.
- *
- * arr.insert(3, 'apple') #=> [0, 1, 2, 'apple', 3, 4, 5, 6]
- *
- * Using the #insert method, you can also insert multiple values at once:
- *
- * arr.insert(3, 'orange', 'pear', 'grapefruit')
- * #=> [0, 1, 2, "orange", "pear", "grapefruit", "apple", 3, 4, 5, 6]
- *
- * == Removing Items from an Array
- *
- * The method #pop removes the last element in an array and returns it:
- *
- * arr = [1, 2, 3, 4, 5, 6]
- * arr.pop #=> 6
- * arr #=> [1, 2, 3, 4, 5]
- *
- * To retrieve and at the same time remove the first item, use #shift:
- *
- * arr.shift #=> 1
- * arr #=> [2, 3, 4, 5]
- *
- * To delete an element at a particular index:
- *
- * arr.delete_at(2) #=> 4
- * arr #=> [2, 3, 5]
- *
- * To delete a particular element anywhere in an array, use #delete:
- *
- * arr = [1, 2, 2, 3]
- * arr.delete(2) #=> [1, 3]
- *
- * A useful method if you need to remove +nil+ values from an array is
- * #compact:
- *
- * arr = ['foo', 0, nil, 'bar', 7, 'baz', nil]
- * arr.compact #=> ['foo', 0, 'bar', 7, 'baz']
- * arr #=> ['foo', 0, nil, 'bar', 7, 'baz', nil]
- * arr.compact! #=> ['foo', 0, 'bar', 7, 'baz']
- * arr #=> ['foo', 0, 'bar', 7, 'baz']
- *
- * Another common need is to remove duplicate elements from an array.
- *
- * It has the non-destructive #uniq, and destructive method #uniq!
- *
- * arr = [2, 5, 6, 556, 6, 6, 8, 9, 0, 123, 556]
- * arr.uniq #=> [2, 5, 6, 556, 8, 9, 0, 123]
- *
- * == Iterating over Arrays
- *
- * Like all classes that include the Enumerable module, Array has an each
- * method, which defines what elements should be iterated over and how. In
- * case of Array's #each, all elements in the Array instance are yielded to
- * the supplied block in sequence.
- *
- * Note that this operation leaves the array unchanged.
- *
- * arr = [1, 2, 3, 4, 5]
- * arr.each { |a| print a -= 10, " " }
- * # prints: -9 -8 -7 -6 -5
- * #=> [1, 2, 3, 4, 5]
- *
- * Another sometimes useful iterator is #reverse_each which will iterate over
- * the elements in the array in reverse order.
- *
- * words = %w[rats live on no evil star]
- * str = ""
- * words.reverse_each { |word| str += "#{word.reverse} " }
- * str #=> "rats live on no evil star "
- *
- * The #map method can be used to create a new array based on the original
- * array, but with the values modified by the supplied block:
- *
- * arr.map { |a| 2*a } #=> [2, 4, 6, 8, 10]
- * arr #=> [1, 2, 3, 4, 5]
- * arr.map! { |a| a**2 } #=> [1, 4, 9, 16, 25]
- * arr #=> [1, 4, 9, 16, 25]
- *
- * == Selecting Items from an Array
- *
- * Elements can be selected from an array according to criteria defined in a
- * block. The selection can happen in a destructive or a non-destructive
- * manner. While the destructive operations will modify the array they were
- * called on, the non-destructive methods usually return a new array with the
- * selected elements, but leave the original array unchanged.
- *
- * === Non-destructive Selection
- *
- * arr = [1, 2, 3, 4, 5, 6]
- * arr.select { |a| a > 3 } #=> [4, 5, 6]
- * arr.reject { |a| a < 3 } #=> [3, 4, 5, 6]
- * arr.drop_while { |a| a < 4 } #=> [4, 5, 6]
- * arr #=> [1, 2, 3, 4, 5, 6]
- *
- * === Destructive Selection
- *
- * #select! and #reject! are the corresponding destructive methods to #select
- * and #reject
- *
- * Similar to #select vs. #reject, #delete_if and #keep_if have the exact
- * opposite result when supplied with the same block:
- *
- * arr.delete_if { |a| a < 4 } #=> [4, 5, 6]
- * arr #=> [4, 5, 6]
- *
- * arr = [1, 2, 3, 4, 5, 6]
- * arr.keep_if { |a| a < 4 } #=> [1, 2, 3]
- * arr #=> [1, 2, 3]
- *
+
+
+/* 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
@@ -5424,7 +4504,7 @@ Init_Array(void)
rb_cArray = rb_define_class("Array", rb_cObject);
rb_include_module(rb_cArray, rb_mEnumerable);
- rb_define_alloc_func(rb_cArray, empty_ary_alloc);
+ 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);
@@ -5511,8 +4591,8 @@ Init_Array(void)
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, "count", rb_ary_count, -1);
- rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, -1);
- rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, -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, "cycle", rb_ary_cycle, -1);
rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
@@ -5525,10 +4605,6 @@ Init_Array(void)
rb_define_method(rb_cArray, "take_while", rb_ary_take_while, 0);
rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
- rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0);
id_cmp = rb_intern("<=>");
- sym_random = ID2SYM(rb_intern("random"));
- id_div = rb_intern("div");
- id_power = rb_intern("**");
}
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 1cd26a8643..24941e7150 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -248,14 +248,10 @@ config: config.status
config.status: $(CONFIG_H)
-guard = INCLUDE_RUBY_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:/=\) &&|
-\#ifndef $(guard)
-\#define $(guard) 1
\#define NO_BIG_INLINE 1
\#define HAVE_SYS_TYPES_H 1
\#define HAVE_SYS_STAT_H 1
@@ -368,7 +364,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
\#define DLEXT ".so"
\#define RUBY_LIB_PREFIX "/lib/ruby"
\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#endif /* $(guard) */
|
@exit > $(@:/=\)
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index df2fd3c128..e5b4ee8f44 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -96,9 +96,9 @@ $(BANG)endif
@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
\#define RUBY_REVISION 0
\#include "version.h"
-MAJOR = RUBY_API_VERSION_MAJOR
-MINOR = RUBY_API_VERSION_MINOR
-TEENY = RUBY_API_VERSION_TEENY
+MAJOR = RUBY_VERSION_MAJOR
+MINOR = RUBY_VERSION_MINOR
+TEENY = RUBY_VERSION_TEENY
BORLANDC = __BORLANDC__
|
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
index 77c66a7949..e58b7a34a1 100644
--- a/benchmark/bm_app_erb.rb
+++ b/benchmark/bm_app_erb.rb
@@ -5,7 +5,7 @@
require 'erb'
data = DATA.read
-max = 15_000
+max = 5_000
title = "hello world!"
content = "hello world!\n" * 10
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/bm_app_factorial.rb
index 45f471dfdb..a5a5de0426 100644
--- a/benchmark/bm_app_factorial.rb
+++ b/benchmark/bm_app_factorial.rb
@@ -6,6 +6,6 @@ def fact(n)
end
end
-100.times {
+8.times{
fact(5000)
-}
+} \ No newline at end of file
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
index 801b75e8e2..a0dcf5e874 100644
--- a/benchmark/bm_app_mandelbrot.rb
+++ b/benchmark/bm_app_mandelbrot.rb
@@ -3,7 +3,7 @@ require 'complex'
def mandelbrot? z
i = 0
while i<100
- i += 1
+ i+=1
z = z * z
return false if z.abs > 2
end
@@ -12,8 +12,8 @@ end
ary = []
-(0..1000).each{|dx|
- (0..1000).each{|dy|
+(0..100).each{|dx|
+ (0..100).each{|dy|
x = dx / 50.0
y = dy / 50.0
c = Complex(x, y)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
index 5db8f95d50..01d2ae3219 100644
--- a/benchmark/bm_app_raise.rb
+++ b/benchmark/bm_app_raise.rb
@@ -1,6 +1,6 @@
-i = 0
+i=0
while i<300000
- i += 1
+ i+=1
begin
raise
rescue
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
index 7eed7c1aed..c6ef817263 100644
--- a/benchmark/bm_app_strconcat.rb
+++ b/benchmark/bm_app_strconcat.rb
@@ -1,5 +1,5 @@
-i = 0
-while i<2_000_000
+i=0
+while i<500000
"#{1+1} #{1+1} #{1+1}"
- i += 1
+ i+=1
end
diff --git a/benchmark/bm_io_file_create.rb b/benchmark/bm_io_file_create.rb
index 2f205c1333..7adbe9ea5e 100644
--- a/benchmark/bm_io_file_create.rb
+++ b/benchmark/bm_io_file_create.rb
@@ -2,7 +2,7 @@
# Create files
#
-max = 200_000
+max = 50_000
file = './tmpfile_of_bm_io_file_create'
max.times{
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/bm_io_file_read.rb
index b9e796ed30..2b4212db76 100644
--- a/benchmark/bm_io_file_read.rb
+++ b/benchmark/bm_io_file_read.rb
@@ -4,7 +4,7 @@
require 'tempfile'
-max = 200_000
+max = 20_000
str = "Hello world! " * 1000
f = Tempfile.new('yarv-benchmark')
f.write str
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/bm_io_file_write.rb
index aa1be0e5fe..3cec58c6ae 100644
--- a/benchmark/bm_io_file_write.rb
+++ b/benchmark/bm_io_file_write.rb
@@ -4,7 +4,7 @@
require 'tempfile'
-max = 200_000
+max = 20_000
str = "Hello world! " * 1000
f = Tempfile.new('yarv-benchmark')
diff --git a/benchmark/bm_io_select.rb b/benchmark/bm_io_select.rb
deleted file mode 100644
index 19248daeb1..0000000000
--- a/benchmark/bm_io_select.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# IO.select performance
-
-w = [ IO.pipe[1] ];
-
-nr = 1000000
-nr.times {
- IO.select nil, w
-}
-
diff --git a/benchmark/bm_io_select2.rb b/benchmark/bm_io_select2.rb
deleted file mode 100644
index 10e37d71b2..0000000000
--- a/benchmark/bm_io_select2.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# IO.select performance. worst case of single fd.
-
-ios = []
-nr = 1000000
-if defined?(Process::RLIMIT_NOFILE)
- max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
-else
- max = 64
-end
-puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
-
-((max / 2) - 10).times do
- ios.concat IO.pipe
-end
-
-last = [ ios[-1] ]
-puts "last IO: #{last[0].inspect}"
-
-nr.times do
- IO.select nil, last
-end
-
diff --git a/benchmark/bm_io_select3.rb b/benchmark/bm_io_select3.rb
deleted file mode 100644
index 7d0ba1f092..0000000000
--- a/benchmark/bm_io_select3.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# IO.select performance. a lot of fd
-
-ios = []
-nr = 100
-if defined?(Process::RLIMIT_NOFILE)
- max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
-else
- max = 64
-end
-puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
-
-(max - 10).times do
- r, w = IO.pipe
- r.close
- ios.push w
-end
-
-nr.times do
- IO.select nil, ios
-end
-
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
index 0072822c06..43d35e1131 100644
--- a/benchmark/bm_loop_whileloop.rb
+++ b/benchmark/bm_loop_whileloop.rb
@@ -1,4 +1,4 @@
-i = 0
+i=0
while i<30_000_000 # benchmark loop 1
- i += 1
+ i+=1
end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
index 47d02dffc4..e514989661 100644
--- a/benchmark/bm_loop_whileloop2.rb
+++ b/benchmark/bm_loop_whileloop2.rb
@@ -1,4 +1,4 @@
-i = 0
+i=0
while i< 6_000_000 # benchmark loop 2
- i += 1
+ i+=1
end
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
index 873214de7c..82629688b7 100644
--- a/benchmark/bm_so_concatenate.rb
+++ b/benchmark/bm_so_concatenate.rb
@@ -5,11 +5,11 @@
# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
STUFF = "hello\n"
-i = 0
+i=0
while i<10
- i += 1
+ i+=1
hello = ''
- 4_000_000.times do |e|
+ 400000.times do |e|
hello << STUFF
end
end
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
index deb003a594..d8b461290c 100644
--- a/benchmark/bm_so_exception.rb
+++ b/benchmark/bm_so_exception.rb
@@ -56,6 +56,6 @@ end
i = 1
max = NUM+1
while i < max
- i += 1
+ i+=1
some_function(i+1)
end
diff --git a/benchmark/bm_so_fannkuch.rb b/benchmark/bm_so_fannkuch.rb
index bac5ecd44c..a214f2e205 100644
--- a/benchmark/bm_so_fannkuch.rb
+++ b/benchmark/bm_so_fannkuch.rb
@@ -40,6 +40,6 @@ end
def puts *args
end
-N = 9 # (ARGV[0] || 1).to_i
+N = 10 # (ARGV[0] || 1).to_i
puts "Pfannkuchen(#{N}) = #{fannkuch(N)}"
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
index e8f4a2a5f7..3652288881 100644
--- a/benchmark/bm_so_lists.rb
+++ b/benchmark/bm_so_lists.rb
@@ -1,6 +1,6 @@
#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
-NUM = 300
+NUM = 100
SIZE = 10000
def test_lists()
@@ -40,7 +40,7 @@ end
i = 0
while i<NUM
- i += 1
+ i+=1
result = test_lists()
end
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb
index e2c5c8e559..0f274ad06c 100644
--- a/benchmark/bm_so_matrix.rb
+++ b/benchmark/bm_so_matrix.rb
@@ -5,7 +5,7 @@
n = 60 #Integer(ARGV.shift || 1)
-size = 40
+size = 30
def mkmatrix(rows, cols)
count = 1
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
index 6f958ee44e..019b8b6382 100644
--- a/benchmark/bm_so_nsieve_bits.rb
+++ b/benchmark/bm_so_nsieve_bits.rb
@@ -1,5 +1,4 @@
#!/usr/bin/ruby
-#coding: us-ascii
#
# The Great Computer Language Shootout
# http://shootout.alioth.debian.org/
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
index a66b9e8e63..83c0d6d380 100644
--- a/benchmark/bm_so_random.rb
+++ b/benchmark/bm_so_random.rb
@@ -10,11 +10,11 @@ def gen_random(max)
(max * ($last = ($last * IA + IC) % IM)) / IM
end
-N = 3_000_000
+N = 1000000
-i = 0
+i=0
while i<N
- i +=1
+ i+=1
gen_random(100.0)
end
# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
index 43dc302648..dbe2bfa63d 100644
--- a/benchmark/bm_so_sieve.rb
+++ b/benchmark/bm_so_sieve.rb
@@ -1,15 +1,15 @@
# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
-num = 500
+num = 40
count = i = j = 0
flags0 = Array.new(8192,1)
k = 0
while k < num
- k += 1
+ k+=1
count = 0
flags = flags0.dup
i = 2
while i<8192
- i += 1
+ i+=1
if flags[i]
# remove all multiples of prime: i
j = i*i
diff --git a/benchmark/bm_vm1_attr_ivar.rb b/benchmark/bm_vm1_attr_ivar.rb
deleted file mode 100644
index 16906f3605..0000000000
--- a/benchmark/bm_vm1_attr_ivar.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class C
- attr_reader :a, :b
- def initialize
- @a = nil
- @b = nil
- end
-end
-obj = C.new
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
- j = obj.a
- k = obj.b
-end
diff --git a/benchmark/bm_vm1_attr_ivar_set.rb b/benchmark/bm_vm1_attr_ivar_set.rb
deleted file mode 100644
index 7e7a6b48c0..0000000000
--- a/benchmark/bm_vm1_attr_ivar_set.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class C
- attr_accessor :a, :b
- def initialize
- @a = nil
- @b = nil
- end
-end
-obj = C.new
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
- obj.a = 1
- obj.b = 2
-end
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
index a9f56b15ea..2dc4e72be5 100644
--- a/benchmark/bm_vm1_block.rb
+++ b/benchmark/bm_vm1_block.rb
@@ -2,9 +2,9 @@ def m
yield
end
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
+i=0
+while i<30000000 # while loop 1
+ i+=1
m{
}
-end
+end \ No newline at end of file
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
index ac59ebccf1..3e395d9478 100644
--- a/benchmark/bm_vm1_const.rb
+++ b/benchmark/bm_vm1_const.rb
@@ -1,8 +1,8 @@
Const = 1
i = 0
-while i<30_000_000 # while loop 1
- i += 1
+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
index a1596145f2..c3b71ead5a 100644
--- a/benchmark/bm_vm1_ensure.rb
+++ b/benchmark/bm_vm1_ensure.rb
@@ -1,6 +1,6 @@
-i = 0
-while i<30_000_000 # benchmark loop 1
- i += 1
+i=0
+while i<30000000 # benchmark loop 1
+ i+=1
begin
begin
ensure
diff --git a/benchmark/bm_vm1_float_simple.rb b/benchmark/bm_vm1_float_simple.rb
deleted file mode 100644
index d4581439ff..0000000000
--- a/benchmark/bm_vm1_float_simple.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0.0; f = 0.0
-while i<30_000_000
- i += 1
- f += 0.1; f -= 0.1
- f += 0.1; f -= 0.1
- f += 0.1; f -= 0.1
-end
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
index 68a73cf92f..4de833a316 100644
--- a/benchmark/bm_vm1_ivar.rb
+++ b/benchmark/bm_vm1_ivar.rb
@@ -1,8 +1,8 @@
@a = 1
i = 0
-while i<30_000_000 # while loop 1
- i += 1
+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
index bd81b06c34..c8076c6ab6 100644
--- a/benchmark/bm_vm1_ivar_set.rb
+++ b/benchmark/bm_vm1_ivar_set.rb
@@ -1,6 +1,6 @@
i = 0
while i<30_000_000 # while loop 1
- i += 1
+ i+= 1
@a = 1
@b = 2
end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
index 353de3ab0e..2d7d7f0b52 100644
--- a/benchmark/bm_vm1_length.rb
+++ b/benchmark/bm_vm1_length.rb
@@ -1,8 +1,8 @@
a = 'abc'
b = [1, 2, 3]
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
+i=0
+while i<30000000 # while loop 1
+ i+=1
a.length
b.length
end
diff --git a/benchmark/bm_vm1_lvar_init.rb b/benchmark/bm_vm1_lvar_init.rb
deleted file mode 100644
index 36f2068811..0000000000
--- a/benchmark/bm_vm1_lvar_init.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-def m v
- unless v
- # unreachable code
- v1 = v2 = v3 = v4 = v5 = v6 = v7 = v8 = v9 = v10 =
- v11 = v12 = v13 = v14 = v15 = v16 = v17 = v18 = v19 = v20 =
- v21 = v22 = v23 = v24 = v25 = v26 = v27 = v28 = v29 = v30 =
- v31 = v32 = v33 = v34 = v35 = v36 = v37 = v38 = v39 = v40 =
- v41 = v42 = v43 = v44 = v45 = v46 = v47 = v48 = v49 = v50 = 1
- end
-end
-
-i = 0
-
-while i<30_000_000 # while loop 1
- i += 1
- m i
-end
-
diff --git a/benchmark/bm_vm1_lvar_set.rb b/benchmark/bm_vm1_lvar_set.rb
deleted file mode 100644
index 222e864134..0000000000
--- a/benchmark/bm_vm1_lvar_set.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
- a = b = c = d = e = f = g = h = j = k = l = m = n = o = p = q = r = 1
-end
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
index bbb4ae07a4..212f056c6e 100644
--- a/benchmark/bm_vm1_neq.rb
+++ b/benchmark/bm_vm1_neq.rb
@@ -2,7 +2,7 @@ i = 0
obj1 = Object.new
obj2 = Object.new
-while i<30_000_000 # while loop 1
- i += 1
+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
index b09ecdcc21..f139fed8be 100644
--- a/benchmark/bm_vm1_not.rb
+++ b/benchmark/bm_vm1_not.rb
@@ -1,7 +1,7 @@
i = 0
obj = Object.new
-while i<30_000_000 # while loop 1
- i += 1
+while i<30000000 # while loop 1
+ i+= 1
!obj
end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
index b0d3e2bdfa..0c98d00e0d 100644
--- a/benchmark/bm_vm1_rescue.rb
+++ b/benchmark/bm_vm1_rescue.rb
@@ -1,6 +1,6 @@
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
+i=0
+while i<30000000 # while loop 1
+ i+=1
begin
rescue
end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
index 63f9f21675..c843ee3d97 100644
--- a/benchmark/bm_vm1_simplereturn.rb
+++ b/benchmark/bm_vm1_simplereturn.rb
@@ -1,9 +1,9 @@
def m
return 1
end
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
+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
index 918f8b2112..a565b6f6dc 100644
--- a/benchmark/bm_vm1_swap.rb
+++ b/benchmark/bm_vm1_swap.rb
@@ -1,8 +1,8 @@
a = 1
b = 2
-i = 0
-while i<30_000_000 # while loop 1
- i += 1
+i=0
+while i<30000000 # while loop 1
+ i+=1
a, b = b, a
end
diff --git a/benchmark/bm_vm1_yield.rb b/benchmark/bm_vm1_yield.rb
deleted file mode 100644
index 775597cea6..0000000000
--- a/benchmark/bm_vm1_yield.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def m
- i = 0
- while i<30_000_000 # while loop 1
- i += 1
- yield
- end
-end
-
-m{}
-
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
index df9037c83c..e29c11200f 100644
--- a/benchmark/bm_vm2_array.rb
+++ b/benchmark/bm_vm2_array.rb
@@ -1,5 +1,5 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
+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_bigarray.rb b/benchmark/bm_vm2_bigarray.rb
deleted file mode 100644
index b02509d6a2..0000000000
--- a/benchmark/bm_vm2_bigarray.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
- a = [
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- 1,2,3,4,5,6,7,8,9,10,
- ]
-end
diff --git a/benchmark/bm_vm2_bighash.rb b/benchmark/bm_vm2_bighash.rb
deleted file mode 100644
index 5e3f437bb8..0000000000
--- a/benchmark/bm_vm2_bighash.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<60_000 # benchmark loop 2
- i += 1
- a = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, 10=>10, 11=>11, 12=>12, 13=>13, 14=>14, 15=>15, 16=>16, 17=>17, 18=>18, 19=>19, 20=>20, 21=>21, 22=>22, 23=>23, 24=>24, 25=>25, 26=>26, 27=>27, 28=>28, 29=>29, 30=>30, 31=>31, 32=>32, 33=>33, 34=>34, 35=>35, 36=>36, 37=>37, 38=>38, 39=>39, 40=>40, 41=>41, 42=>42, 43=>43, 44=>44, 45=>45, 46=>46, 47=>47, 48=>48, 49=>49, 50=>50, 51=>51, 52=>52, 53=>53, 54=>54, 55=>55, 56=>56, 57=>57, 58=>58, 59=>59, 60=>60, 61=>61, 62=>62, 63=>63, 64=>64, 65=>65, 66=>66, 67=>67, 68=>68, 69=>69, 70=>70, 71=>71, 72=>72, 73=>73, 74=>74, 75=>75, 76=>76, 77=>77, 78=>78, 79=>79, 80=>80, 81=>81, 82=>82, 83=>83, 84=>84, 85=>85, 86=>86, 87=>87, 88=>88, 89=>89, 90=>90, 91=>91, 92=>92, 93=>93, 94=>94, 95=>95, 96=>96, 97=>97, 98=>98, 99=>99, 100=>100, 101=>101, 102=>102, 103=>103, 104=>104, 105=>105, 106=>106, 107=>107, 108=>108, 109=>109, 110=>110, 111=>111, 112=>112, 113=>113, 114=>114, 115=>115, 116=>116, 117=>117, 118=>118, 119=>119, 120=>120, 121=>121, 122=>122, 123=>123, 124=>124, 125=>125, 126=>126, 127=>127, 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135, 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143, 144=>144, 145=>145, 146=>146, 147=>147, 148=>148, 149=>149, 150=>150, 151=>151, 152=>152, 153=>153, 154=>154, 155=>155, 156=>156, 157=>157, 158=>158, 159=>159, 160=>160, 161=>161, 162=>162, 163=>163, 164=>164, 165=>165, 166=>166, 167=>167, 168=>168, 169=>169, 170=>170, 171=>171, 172=>172, 173=>173, 174=>174, 175=>175, 176=>176, 177=>177, 178=>178, 179=>179, 180=>180, 181=>181, 182=>182, 183=>183, 184=>184, 185=>185, 186=>186, 187=>187, 188=>188, 189=>189, 190=>190, 191=>191, 192=>192, 193=>193, 194=>194, 195=>195, 196=>196, 197=>197, 198=>198, 199=>199, 200=>200, 201=>201, 202=>202, 203=>203, 204=>204, 205=>205, 206=>206, 207=>207, 208=>208, 209=>209, 210=>210, 211=>211, 212=>212, 213=>213, 214=>214, 215=>215, 216=>216, 217=>217, 218=>218, 219=>219, 220=>220, 221=>221, 222=>222, 223=>223, 224=>224, 225=>225, 226=>226, 227=>227, 228=>228, 229=>229, 230=>230, 231=>231, 232=>232, 233=>233, 234=>234, 235=>235, 236=>236, 237=>237, 238=>238, 239=>239, 240=>240, 241=>241, 242=>242, 243=>243, 244=>244, 245=>245, 246=>246, 247=>247, 248=>248, 249=>249, 250=>250, 251=>251, 252=>252, 253=>253, 254=>254, 255=>255, 256=>256, 257=>257, 258=>258, 259=>259, 260=>260, 261=>261, 262=>262, 263=>263, 264=>264, 265=>265, 266=>266, 267=>267, 268=>268, 269=>269, 270=>270, 271=>271, 272=>272, 273=>273, 274=>274, 275=>275, 276=>276, 277=>277, 278=>278, 279=>279, 280=>280, 281=>281, 282=>282, 283=>283, 284=>284, 285=>285, 286=>286, 287=>287, 288=>288, 289=>289, 290=>290, 291=>291, 292=>292, 293=>293, 294=>294, 295=>295, 296=>296, 297=>297, 298=>298, 299=>299, 300=>300, 301=>301, 302=>302, 303=>303, 304=>304, 305=>305, 306=>306, 307=>307, 308=>308, 309=>309, 310=>310, 311=>311, 312=>312, 313=>313, 314=>314, 315=>315, 316=>316, 317=>317, 318=>318, 319=>319, 320=>320, 321=>321, 322=>322, 323=>323, 324=>324, 325=>325, 326=>326, 327=>327, 328=>328, 329=>329, 330=>330, 331=>331, 332=>332, 333=>333, 334=>334, 335=>335, 336=>336, 337=>337, 338=>338, 339=>339, 340=>340, 341=>341, 342=>342, 343=>343, 344=>344, 345=>345, 346=>346, 347=>347, 348=>348, 349=>349, 350=>350, 351=>351, 352=>352, 353=>353, 354=>354, 355=>355, 356=>356, 357=>357, 358=>358, 359=>359, 360=>360, 361=>361, 362=>362, 363=>363, 364=>364, 365=>365, 366=>366, 367=>367, 368=>368, 369=>369, 370=>370, 371=>371, 372=>372, 373=>373, 374=>374, 375=>375, 376=>376, 377=>377, 378=>378, 379=>379, 380=>380, 381=>381, 382=>382, 383=>383, 384=>384, 385=>385, 386=>386, 387=>387, 388=>388, 389=>389, 390=>390, 391=>391, 392=>392, 393=>393, 394=>394, 395=>395, 396=>396, 397=>397, 398=>398, 399=>399, 400=>400, 401=>401, 402=>402, 403=>403, 404=>404, 405=>405, 406=>406, 407=>407, 408=>408, 409=>409, 410=>410, 411=>411, 412=>412, 413=>413, 414=>414, 415=>415, 416=>416, 417=>417, 418=>418, 419=>419, 420=>420, 421=>421, 422=>422, 423=>423, 424=>424, 425=>425, 426=>426, 427=>427, 428=>428, 429=>429, 430=>430, 431=>431, 432=>432, 433=>433, 434=>434, 435=>435, 436=>436, 437=>437, 438=>438, 439=>439, 440=>440, 441=>441, 442=>442, 443=>443, 444=>444, 445=>445, 446=>446, 447=>447, 448=>448, 449=>449, 450=>450, 451=>451, 452=>452, 453=>453, 454=>454, 455=>455, 456=>456, 457=>457, 458=>458, 459=>459, 460=>460, 461=>461, 462=>462, 463=>463, 464=>464, 465=>465, 466=>466, 467=>467, 468=>468, 469=>469, 470=>470, 471=>471, 472=>472, 473=>473, 474=>474, 475=>475, 476=>476, 477=>477, 478=>478, 479=>479, 480=>480, 481=>481, 482=>482, 483=>483, 484=>484, 485=>485, 486=>486, 487=>487, 488=>488, 489=>489, 490=>490, 491=>491, 492=>492, 493=>493, 494=>494, 495=>495, 496=>496, 497=>497, 498=>498, 499=>499, 500=>500,}
-end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
index adc6e4df0a..1ec34ad692 100644
--- a/benchmark/bm_vm2_case.rb
+++ b/benchmark/bm_vm2_case.rb
@@ -1,5 +1,5 @@
-i = 0
-while i<6_000_000 # while loop 2
+i=0
+while i<6000000 # while loop 2
case :foo
when :bar
raise
@@ -8,7 +8,7 @@ while i<6_000_000 # while loop 2
when :boo
raise
when :foo
- i += 1
+ i+=1
end
end
diff --git a/benchmark/bm_vm2_defined_method.rb b/benchmark/bm_vm2_defined_method.rb
deleted file mode 100644
index 053ed6c912..0000000000
--- a/benchmark/bm_vm2_defined_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Object
- define_method(:m){}
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
- m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_dstr.rb b/benchmark/bm_vm2_dstr.rb
deleted file mode 100644
index 58c0f7bbc3..0000000000
--- a/benchmark/bm_vm2_dstr.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-x = y = 'z'
-while i<6_000_000 # benchmark loop 2
- i += 1
- str = "foo#{x}bar#{y}baz"
-end
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
index 307cfc28ef..375dccc00e 100644
--- a/benchmark/bm_vm2_eval.rb
+++ b/benchmark/bm_vm2_eval.rb
@@ -1,6 +1,6 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
+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
index a8ccff7138..cc94b8ab3d 100644
--- a/benchmark/bm_vm2_method.rb
+++ b/benchmark/bm_vm2_method.rb
@@ -2,8 +2,8 @@ def m
nil
end
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
+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_method_missing.rb b/benchmark/bm_vm2_method_missing.rb
deleted file mode 100644
index 2badc73101..0000000000
--- a/benchmark/bm_vm2_method_missing.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class C
- def method_missing mid
- end
-end
-
-obj = C.new
-
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
- obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
-end
diff --git a/benchmark/bm_vm2_method_with_block.rb b/benchmark/bm_vm2_method_with_block.rb
deleted file mode 100644
index b4efb4f520..0000000000
--- a/benchmark/bm_vm2_method_with_block.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
- nil
-end
-
-i = 0
-while i<6_000_000 # 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
index 7362f738c5..9ec1a0f136 100644
--- a/benchmark/bm_vm2_mutex.rb
+++ b/benchmark/bm_vm2_mutex.rb
@@ -2,8 +2,8 @@ require 'thread'
m = Mutex.new
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
+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
index c82c0e4bce..ac9953ce5f 100644
--- a/benchmark/bm_vm2_poly_method.rb
+++ b/benchmark/bm_vm2_poly_method.rb
@@ -12,9 +12,9 @@ end
o1 = C1.new
o2 = C2.new
-i = 0
-while i<6_000_000 # benchmark loop 2
+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
+ i+=1
end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
index aa5fd1dd38..856ba9b161 100644
--- a/benchmark/bm_vm2_poly_method_ov.rb
+++ b/benchmark/bm_vm2_poly_method_ov.rb
@@ -12,9 +12,9 @@ end
o1 = C1.new
o2 = C2.new
-i = 0
-while i<6_000_000 # benchmark loop 2
+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
+ i+=1
end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb
index 65e5217371..0bd05b9544 100644
--- a/benchmark/bm_vm2_proc.rb
+++ b/benchmark/bm_vm2_proc.rb
@@ -6,9 +6,9 @@ pr = m{
a = 1
}
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
+i=0
+while i<6000000 # benchmark loop 2
+ i+=1
pr.call
end
diff --git a/benchmark/bm_vm2_raise1.rb b/benchmark/bm_vm2_raise1.rb
deleted file mode 100644
index aa5387987f..0000000000
--- a/benchmark/bm_vm2_raise1.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-def rec n
- if n > 0
- rec n-1
- else
- raise
- end
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
-
- begin
- rec 1
- rescue
- # ignore
- end
-end
diff --git a/benchmark/bm_vm2_raise2.rb b/benchmark/bm_vm2_raise2.rb
deleted file mode 100644
index 1f61c63157..0000000000
--- a/benchmark/bm_vm2_raise2.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-def rec n
- if n > 0
- rec n-1
- else
- raise
- end
-end
-
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
-
- begin
- rec 10
- rescue
- # ignore
- end
-end
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
index 55f9e957a3..44f6ed402e 100644
--- a/benchmark/bm_vm2_regexp.rb
+++ b/benchmark/bm_vm2_regexp.rb
@@ -1,6 +1,6 @@
-i = 0
+i=0
str = 'xxxhogexxx'
-while i<6_000_000 # benchmark loop 2
+while i<6000000 # benchmark loop 2
/hoge/ =~ str
- i += 1
+ i+=1
end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
index 6a3ab6fdab..c20dbdd26c 100644
--- a/benchmark/bm_vm2_send.rb
+++ b/benchmark/bm_vm2_send.rb
@@ -5,8 +5,8 @@ end
o = C.new
-i = 0
-while i<6_000_000 # benchmark loop 2
- i += 1
+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
index afd8579e7b..70c86b376f 100644
--- a/benchmark/bm_vm2_super.rb
+++ b/benchmark/bm_vm2_super.rb
@@ -14,7 +14,7 @@ end
obj = CC.new
i = 0
-while i<6_000_000 # benchmark loop 2
+while i<6000000 # benchmark loop 2
obj.m
- i += 1
+ i+=1
end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
index 1774625942..e12bd2ade0 100644
--- a/benchmark/bm_vm2_unif1.rb
+++ b/benchmark/bm_vm2_unif1.rb
@@ -2,7 +2,7 @@ i = 0
def m a, b
end
-while i<6_000_000 # benchmark loop 2
- i += 1
+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
index 2a43e62217..3a75960403 100644
--- a/benchmark/bm_vm2_zsuper.rb
+++ b/benchmark/bm_vm2_zsuper.rb
@@ -14,7 +14,7 @@ end
obj = CC.new
-while i<6_000_000 # benchmark loop 2
+while i<6000000 # benchmark loop 2
obj.m 10
- i += 1
+ i+=1
end
diff --git a/benchmark/bm_vm3_backtrace.rb b/benchmark/bm_vm3_backtrace.rb
deleted file mode 100644
index 0fbf73e1ca..0000000000
--- a/benchmark/bm_vm3_backtrace.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# get last backtrace
-
-begin
- caller(0, 0)
-rescue ArgumentError
- alias caller_orig caller
- def caller lev, n
- caller_orig(lev)[0..n]
- end
-end
-
-def rec n
- if n < 0
- 100_000.times{
- caller(0, 1)
- }
- else
- rec(n-1)
- end
-end
-
-rec 50
diff --git a/benchmark/bm_vm3_clearmethodcache.rb b/benchmark/bm_vm3_clearmethodcache.rb
deleted file mode 100644
index 9661323cd2..0000000000
--- a/benchmark/bm_vm3_clearmethodcache.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-while i<200_000
- i += 1
-
- Class.new{
- def m; end
- }
-end
diff --git a/benchmark/bm_vm3_thread_create_join.rb b/benchmark/bm_vm3_thread_create_join.rb
new file mode 100644
index 0000000000..325a66d587
--- /dev/null
+++ b/benchmark/bm_vm3_thread_create_join.rb
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..649f1fddac
--- /dev/null
+++ b/benchmark/bm_vm3_thread_mutex.rb
@@ -0,0 +1,18 @@
+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/bm_vm_thread_alive_check1.rb b/benchmark/bm_vm_thread_alive_check1.rb
deleted file mode 100644
index c993accdda..0000000000
--- a/benchmark/bm_vm_thread_alive_check1.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-5_000.times{
- t = Thread.new{}
- while t.alive?
- Thread.pass
- end
-}
diff --git a/benchmark/bm_vm_thread_create_join.rb b/benchmark/bm_vm_thread_create_join.rb
deleted file mode 100644
index 393cd45df9..0000000000
--- a/benchmark/bm_vm_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_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
deleted file mode 100644
index 5c9f85dfb7..0000000000
--- a/benchmark/bm_vm_thread_mutex1.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# one thread, one mutex (no contention)
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-lmax = max * max
-(1..1).map{
- Thread.new{
- i = 0
- while i<lmax
- i += 1
- m.synchronize{
- r += 1
- }
- end
- }
-}.each{|e|
- e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
deleted file mode 100644
index 10de59054f..0000000000
--- a/benchmark/bm_vm_thread_mutex2.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# two threads, one mutex
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-lmax = (max * max)/2
-(1..2).map{
- Thread.new{
- i = 0
- while i<lmax
- i += 1
- m.synchronize{
- r += 1
- }
- end
- }
-}.each{|e|
- e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
deleted file mode 100644
index 7f9a44b39d..0000000000
--- a/benchmark/bm_vm_thread_mutex3.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# 1000 threads, one mutex
-
-require 'thread'
-m = Mutex.new
-r = 0
-max = 2000
-(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/bm_vm_thread_pass.rb b/benchmark/bm_vm_thread_pass.rb
deleted file mode 100644
index b5b3c0bc85..0000000000
--- a/benchmark/bm_vm_thread_pass.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Plenty Thtread.pass
-# A performance may depend on GVL implementation.
-
-tmax = (ARGV.shift || 2).to_i
-lmax = 200_000 / tmax
-
-(1..tmax).map{
- Thread.new{
- lmax.times{
- Thread.pass
- }
- }
-}.each{|t| t.join}
-
-
diff --git a/benchmark/bm_vm_thread_pass_flood.rb b/benchmark/bm_vm_thread_pass_flood.rb
deleted file mode 100644
index 27157d1a6f..0000000000
--- a/benchmark/bm_vm_thread_pass_flood.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-1000.times{
- Thread.new{loop{Thread.pass}}
-}
-
-i = 0
-while i<10000
- i += 1
-end
diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb
deleted file mode 100644
index 272d231eba..0000000000
--- a/benchmark/bm_vm_thread_pipe.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Mesure small and plenty pipe read/write.
-# A performance may depend on GVL implementation.
-
-lmax = 100_000
-r, w = IO.pipe
-[Thread.new{
- lmax.times{
- w.write('a')
- }
- p "w:exit"
-}, Thread.new{
- lmax.times{
- r.read(1)
- }
- p "r:exit"
-}].each{|t| t.join}
-
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb
new file mode 100644
index 0000000000..0b4b219ca2
--- /dev/null
+++ b/benchmark/bmx_temp.rb
@@ -0,0 +1,9 @@
+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
index cbc72cf604..687dec26f1 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -48,7 +48,7 @@ class BenchmarkDriver
def progress_message *args
unless STDOUT.tty?
- STDERR.print(*args)
+ STDERR.print(*args)
STDERR.flush
end
end
@@ -60,25 +60,22 @@ class BenchmarkDriver
if /(.+)::(.+)/ =~ e
# ex) ruby-a::/path/to/ruby-a
- label = $1.strip
- path = $2
- version = `#{path} -v`.chomp
+ v = $1.strip
+ e = $2
else
- path = e
- version = label = `#{path} -v`.chomp
+ v = `#{e} -v`.chomp
+ v.sub!(/ patchlevel \d+/, '')
end
- [path, label, version]
+ [e, v]
}.compact
@dir = dir
@repeat = opt[:repeat] || 1
@repeat = 1 if @repeat < 1
@pattern = opt[:pattern] || nil
- @exclude = opt[:exclude] || nil
@verbose = opt[:quiet] ? false : (opt[:verbose] || false)
@output = opt[:output] ? open(opt[:output], 'w') : nil
@loop_wl1 = @loop_wl2 = nil
- @ruby_arg = opt[:ruby_arg] || nil
@opt = opt
# [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
@@ -87,35 +84,12 @@ class BenchmarkDriver
if @verbose
@start_time = Time.now
message @start_time
- @execs.each_with_index{|(path, label, version), i|
- message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at \"#{path}\""
+ @execs.each_with_index{|(e, v), i|
+ message "target #{i}: #{v}"
}
end
end
- def adjusted_results name, results
- s = nil
- results.each_with_index{|e, i|
- r = e.min
- case name
- when /^vm1_/
- if @loop_wl1
- r -= @loop_wl1[i]
- r = 0 if r < 0
- s = '*'
- end
- when /^vm2_/
- if @loop_wl2
- r -= @loop_wl2[i]
- r = 0 if r < 0
- s = '*'
- end
- end
- yield r
- }
- s
- end
-
def show_results
output
@@ -125,7 +99,7 @@ class BenchmarkDriver
message
message PP.pp(@results, "", 79)
message
- message "Elapsed time: #{Time.now - @start_time} (sec)"
+ message "Elapesed time: #{Time.now - @start_time} (sec)"
end
output '-----------------------------------------------------------'
@@ -135,49 +109,35 @@ class BenchmarkDriver
output "minimum results in each #{@repeat} measurements."
end
- output "Execution time (sec)"
- output "name\t#{@execs.map{|(_, v)| v}.join("\t")}"
+ output "name\t#{@execs.map{|(e, v)| v}.join("\t")}"
@results.each{|v, result|
rets = []
- s = adjusted_results(v, result){|r|
+ 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")}"
}
-
- if @execs.size > 1
- output
- output "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)"
- output "name\t#{@execs[1..-1].map{|(_, v)| v}.join("\t")}"
- @results.each{|v, result|
- rets = []
- first_value = nil
- s = adjusted_results(v, result){|r|
- if first_value
- if r == 0
- rets << "Error"
- else
- rets << sprintf("%.3f", first_value/r)
- end
- else
- first_value = r
- end
- }
- output "#{v}#{s}\t#{rets.join("\t")}"
- }
- end
-
- if @opt[:output]
- output
- output "Log file: #{@opt[:output]}"
- end
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)
- next if @exclude && /#{@exclude}/ =~ File.basename(file)
case file
when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
flag[$1] = true
@@ -239,35 +199,31 @@ class BenchmarkDriver
end
def measure executable, file
- cmd = "#{executable} #{@ruby_arg} #{file}"
-
+ cmd = "#{executable} #{file}"
m = Benchmark.measure{
- system(cmd, out: File::NULL)
+ `#{cmd}`
}
if $? != 0
- output "\`#{cmd}\' exited with abnormal status (#{$?})"
- 0
- else
- m.real
+ raise "Benchmark process exited with abnormal status (#{$?})"
end
+
+ m.real
end
end
if __FILE__ == $0
opt = {
- :execs => [],
- :dir => File.dirname(__FILE__),
+ :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 (e1::path1; e2::path2; e3::path3;...)"){|e|
- e.split(/;/).each{|path|
- opt[:execs] << path
- }
+ "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
@@ -275,17 +231,11 @@ if __FILE__ == $0
o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
opt[:pattern] = p
}
- o.on('-x', '--exclude [PATTERN]', "Benchmark exclude pattern"){|e|
- opt[:exclude] = e
- }
o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
opt[:repeat] = n.to_i
}
- o.on('-o', '--output-file [FILE]', "Output file"){|f|
- opt[:output] = f
- }
- o.on('--ruby-arg [ARG]', "Optional argument for ruby"){|a|
- opt[:ruby_arg] = a
+ 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
diff --git a/benchmark/other-lang/eval.rb b/benchmark/other-lang/eval.rb
index 48a2cea019..3875927389 100644
--- a/benchmark/other-lang/eval.rb
+++ b/benchmark/other-lang/eval.rb
@@ -51,14 +51,14 @@ Bench.each{|b|
require 'pp'
# utime
-puts Lang.join("\t")
+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")
+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.rb b/benchmark/other-lang/fact.rb
index 6cedc752cd..7e97b22b39 100644
--- a/benchmark/other-lang/fact.rb
+++ b/benchmark/other-lang/fact.rb
@@ -6,8 +6,8 @@ def fact(n)
end
end
-i = 0
+i=0
while i<10000
- i += 1
+ i+=1
fact(100)
end
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
index b367b9dbf3..d43cef61f3 100644
--- a/benchmark/other-lang/loop.rb
+++ b/benchmark/other-lang/loop.rb
@@ -1,4 +1,4 @@
-i = 0
+i=0
while i<30000000
- i += 1
+ i+=1
end
diff --git a/benchmark/report.rb b/benchmark/report.rb
index d2dc56b1e1..7aa852fc85 100644
--- a/benchmark/report.rb
+++ b/benchmark/report.rb
@@ -25,7 +25,7 @@ end
def benchmark cmd
rubybin = ENV['RUBY'] || RbConfig.ruby
-
+
IO.popen(rubybin, 'r+'){|io|
io.write cmd
io.close_write
diff --git a/benchmark/run.rb b/benchmark/run.rb
index 0cd2363849..6ef2943642 100644
--- a/benchmark/run.rb
+++ b/benchmark/run.rb
@@ -33,8 +33,8 @@ def bm file
bm_name = $1
puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
puts "#{bm_name}: "
-
-
+
+
puts <<EOS unless $matzrubyonly || $rubyonly
#{prog}
--
@@ -93,7 +93,7 @@ if $0 == __FILE__
ARGV.delete_if{|arg|
/\A-/ =~ arg
}
-
+
puts "MatzRuby:"
system("#{$matzruby_program} -v")
puts "Ruby:"
diff --git a/bignum.c b/bignum.c
index a9448ceab0..fdbd300660 100644
--- a/bignum.c
+++ b/bignum.c
@@ -10,13 +10,8 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "ruby/thread.h"
#include "ruby/util.h"
-#include "internal.h"
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
#include <math.h>
#include <float.h>
#include <ctype.h>
@@ -27,8 +22,6 @@
VALUE rb_cBignum;
-static VALUE big_three = Qnil;
-
#if defined __MINGW32__
#define USHORT _USHORT
#endif
@@ -36,13 +29,12 @@ static VALUE big_three = Qnil;
#define BDIGITS(x) (RBIGNUM_DIGITS(x))
#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
#define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
-#define BIGRAD_HALF ((BDIGIT)(BIGRAD >> 1))
#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS)
#if HAVE_LONG_LONG
# define DIGSPERLL (SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
#endif
#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
-#define BIGDN(x) RSHIFT((x),BITSPERDIG)
+#define BIGDN(x) RSHIFT(x,BITSPERDIG)
#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
#define BDIGMAX ((BDIGIT)-1)
@@ -50,31 +42,6 @@ static VALUE big_three = Qnil;
(BDIGITS(x)[0] == 0 && \
(RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
-#define BIGNUM_DEBUG 0
-#if BIGNUM_DEBUG
-#define ON_DEBUG(x) do { x; } while (0)
-static void
-dump_bignum(VALUE x)
-{
- long i;
- printf("%c0x0", RBIGNUM_SIGN(x) ? '+' : '-');
- for (i = RBIGNUM_LEN(x); i--; ) {
- printf("_%08"PRIxBDIGIT, BDIGITS(x)[i]);
- }
- printf(", len=%lu", RBIGNUM_LEN(x));
- puts("");
-}
-
-static VALUE
-rb_big_dump(VALUE x)
-{
- dump_bignum(x);
- return x;
-}
-#else
-#define ON_DEBUG(x)
-#endif
-
static int
bigzero_p(VALUE x)
{
@@ -105,7 +72,7 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
if (l < 0) return -1;
return 0;
}
- if (RB_TYPE_P(val, T_BIGNUM)) {
+ if (TYPE(val) == T_BIGNUM) {
if (BIGZEROP(val)) return 0;
if (RBIGNUM_SIGN(val)) return 1;
return -1;
@@ -166,7 +133,8 @@ rb_big_resize(VALUE big, long len)
static VALUE
bignew_1(VALUE klass, long len, int sign)
{
- NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM);
+ 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;
@@ -176,11 +144,11 @@ bignew_1(VALUE klass, long len, int sign)
RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
RBIGNUM(big)->as.heap.len = len;
}
- OBJ_FREEZE(big);
+
return (VALUE)big;
}
-#define bignew(len,sign) bignew_1(rb_cBignum,(len),(sign))
+#define bignew(len,sign) bignew_1(rb_cBignum,len,sign)
VALUE
rb_big_new(long len, int sign)
@@ -272,7 +240,7 @@ bigfixize(VALUE x)
static VALUE
bignorm(VALUE x)
{
- if (RB_TYPE_P(x, T_BIGNUM)) {
+ if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
x = bigfixize(bigtrunc(x));
}
return x;
@@ -309,17 +277,13 @@ VALUE
rb_int2big(SIGNED_VALUE n)
{
long neg = 0;
- VALUE u;
VALUE big;
if (n < 0) {
- u = 1 + (VALUE)(-(n + 1)); /* u = -n avoiding overflow */
+ n = -n;
neg = 1;
}
- else {
- u = n;
- }
- big = rb_uint2big(u);
+ big = rb_uint2big(n);
if (neg) {
RBIGNUM_SET_SIGN(big, 0);
}
@@ -356,14 +320,6 @@ rb_int2inum(SIGNED_VALUE n)
* for each 0 <= i < num_longs.
* So buf is little endian at whole on a little endian machine.
* But buf is mixed endian on a big endian machine.
- *
- * The buf represents negative integers as two's complement.
- * So, the most significant bit of the most significant word,
- * (buf[num_longs-1]>>(SIZEOF_LONG*CHAR_BIT-1)),
- * is the sign bit: 1 means negative and 0 means zero or positive.
- *
- * If given size of buf (num_longs) is not enough to represent val,
- * higier words (including a sign bit) are ignored.
*/
void
rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
@@ -406,7 +362,7 @@ rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
}
}
-/* See rb_big_pack comment for endianness and sign of buf. */
+/* See rb_big_pack comment for endianness of buf. */
VALUE
rb_big_unpack(unsigned long *buf, long num_longs)
{
@@ -555,7 +511,7 @@ rb_quad_pack(char *buf, VALUE val)
}
}
-#define BNEG(b) (RSHIFT(((BDIGIT*)(b))[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
+#define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
VALUE
rb_quad_unpack(const char *buf, int sign)
@@ -737,7 +693,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
if (badcheck) goto bad;
break;
}
- nondigit = (char) c;
+ nondigit = c;
continue;
}
else if ((c = conv_digit(c)) < 0) {
@@ -778,11 +734,8 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
{
char *s;
long len;
- VALUE v = 0;
- VALUE ret;
StringValue(str);
- rb_must_asciicompat(str);
if (badcheck) {
s = StringValueCStr(str);
}
@@ -792,17 +745,14 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
if (s) {
len = RSTRING_LEN(str);
if (s[len]) { /* no sentinel somehow */
- char *p = ALLOCV(v, len+1);
+ char *p = ALLOCA_N(char, len+1);
MEMCPY(p, s, char, len);
p[len] = '\0';
s = p;
}
}
- ret = rb_cstr_to_inum(s, base, badcheck);
- if (v)
- ALLOCV_END(v);
- return ret;
+ return rb_cstr_to_inum(s, base, badcheck);
}
#if HAVE_LONG_LONG
@@ -1042,8 +992,7 @@ big2str_find_n1(VALUE x, int base)
bits = BITSPERDIG*RBIGNUM_LEN(x);
}
- /* @shyouhei note: vvvvvvvvvvvvv this cast is suspicious. But I believe it is OK, because if that cast loses data, this x value is too big, and should have raised RangeError. */
- return (long)ceil(((double)bits)/log_2[base - 2]);
+ return (long)ceil(bits/log_2[base - 2]);
}
static long
@@ -1226,15 +1175,11 @@ rb_big2ulong(VALUE x)
{
VALUE num = big2ulong(x, "unsigned long", TRUE);
- if (RBIGNUM_POSITIVE_P(x)) {
- return num;
- }
- else {
- if (num <= LONG_MAX)
- return -(long)num;
- if (num == 1+(unsigned long)(-(LONG_MIN+1)))
- return LONG_MIN;
- rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
+ if (!RBIGNUM_SIGN(x)) {
+ if ((SIGNED_VALUE)num < 0) {
+ rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
+ }
+ return (VALUE)(-(SIGNED_VALUE)num);
}
return num;
}
@@ -1244,18 +1189,12 @@ rb_big2long(VALUE x)
{
VALUE num = big2ulong(x, "long", TRUE);
- if (RBIGNUM_POSITIVE_P(x)) {
- if (LONG_MAX < num)
- rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
- return num;
- }
- else {
- if (num <= LONG_MAX)
- return -(long)num;
- if (num == 1+(unsigned long)(-(LONG_MIN+1)))
- return LONG_MIN;
- rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+ if ((SIGNED_VALUE)num < 0 &&
+ (RBIGNUM_SIGN(x) || (SIGNED_VALUE)num != LONG_MIN)) {
+ rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
}
+ if (!RBIGNUM_SIGN(x)) return -(SIGNED_VALUE)num;
+ return num;
}
#if HAVE_LONG_LONG
@@ -1283,16 +1222,8 @@ rb_big2ull(VALUE x)
{
unsigned LONG_LONG num = big2ull(x, "unsigned long long");
- if (RBIGNUM_POSITIVE_P(x)) {
- return num;
- }
- else {
- if (num <= LLONG_MAX)
- return -(LONG_LONG)num;
- if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
- return LLONG_MIN;
- rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
- }
+ if (!RBIGNUM_SIGN(x))
+ return (VALUE)(-(SIGNED_VALUE)num);
return num;
}
@@ -1301,18 +1232,12 @@ rb_big2ll(VALUE x)
{
unsigned LONG_LONG num = big2ull(x, "long long");
- if (RBIGNUM_POSITIVE_P(x)) {
- if (LLONG_MAX < num)
- rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
- return num;
- }
- else {
- if (num <= LLONG_MAX)
- return -(LONG_LONG)num;
- if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
- return LLONG_MIN;
- rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
+ if ((LONG_LONG)num < 0 && (RBIGNUM_SIGN(x)
+ || (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;
+ return num;
}
#endif /* HAVE_LONG_LONG */
@@ -1455,97 +1380,13 @@ rb_big_to_f(VALUE x)
return DBL2NUM(rb_big2dbl(x));
}
-VALUE
-rb_integer_float_cmp(VALUE x, VALUE y)
-{
- double yd = RFLOAT_VALUE(y);
- double yi, yf;
- VALUE rel;
-
- if (isnan(yd))
- return Qnil;
- if (isinf(yd)) {
- if (yd > 0.0) return INT2FIX(-1);
- else return INT2FIX(1);
- }
- yf = modf(yd, &yi);
- if (FIXNUM_P(x)) {
-#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
- double xd = (double)FIX2LONG(x);
- if (xd < yd)
- return INT2FIX(-1);
- if (xd > yd)
- return INT2FIX(1);
- return INT2FIX(0);
-#else
- long xl, yl;
- if (yi < FIXNUM_MIN)
- return INT2FIX(1);
- if (FIXNUM_MAX+1 <= yi)
- return INT2FIX(-1);
- xl = FIX2LONG(x);
- yl = (long)yi;
- if (xl < yl)
- return INT2FIX(-1);
- if (xl > yl)
- return INT2FIX(1);
- if (yf < 0.0)
- return INT2FIX(1);
- if (0.0 < yf)
- return INT2FIX(-1);
- return INT2FIX(0);
-#endif
- }
- y = rb_dbl2big(yi);
- rel = rb_big_cmp(x, y);
- if (yf == 0.0 || rel != INT2FIX(0))
- return rel;
- if (yf < 0.0)
- return INT2FIX(1);
- return INT2FIX(-1);
-}
-
-VALUE
-rb_integer_float_eq(VALUE x, VALUE y)
-{
- double yd = RFLOAT_VALUE(y);
- double yi, yf;
-
- if (isnan(yd) || isinf(yd))
- return Qfalse;
- yf = modf(yd, &yi);
- if (yf != 0)
- return Qfalse;
- if (FIXNUM_P(x)) {
-#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
- double xd = (double)FIX2LONG(x);
- if (xd != yd)
- return Qfalse;
- return Qtrue;
-#else
- long xl, yl;
- if (yi < LONG_MIN || LONG_MAX < yi)
- return Qfalse;
- xl = FIX2LONG(x);
- yl = (long)yi;
- if (xl != yl)
- return Qfalse;
- return Qtrue;
-#endif
- }
- y = rb_dbl2big(yi);
- return rb_big_eq(x, y);
-}
-
/*
* call-seq:
* big <=> numeric -> -1, 0, +1 or nil
*
- * Comparison---Returns -1, 0, or +1 depending on whether +big+ is
- * less than, equal to, or greater than +numeric+. This is the
- * basis for the tests in Comparable.
- *
- * +nil+ is returned if the two values are incomparable.
+ * Comparison---Returns -1, 0, or +1 depending on whether <i>big</i> is
+ * less than, equal to, or greater than <i>numeric</i>. This is the
+ * basis for the tests in <code>Comparable</code>.
*
*/
@@ -1564,7 +1405,15 @@ rb_big_cmp(VALUE x, VALUE y)
break;
case T_FLOAT:
- return rb_integer_float_cmp(x, y);
+ {
+ 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);
+ }
default:
return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
@@ -1580,22 +1429,15 @@ rb_big_cmp(VALUE x, VALUE y)
xds = BDIGITS(x);
yds = BDIGITS(y);
- while (xlen-- && (xds[xlen]==yds[xlen]));
+ while(xlen-- && (xds[xlen]==yds[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));
}
-enum big_op_t {
- big_op_gt,
- big_op_ge,
- big_op_lt,
- big_op_le
-};
-
static VALUE
-big_op(VALUE x, VALUE y, enum big_op_t op)
+big_op(VALUE x, VALUE y, int op)
{
VALUE rel;
int n;
@@ -1607,17 +1449,26 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
break;
case T_FLOAT:
- rel = rb_integer_float_cmp(x, y);
- break;
+ {
+ double a = RFLOAT_VALUE(y);
+
+ if (isinf(a)) {
+ if (a > 0.0) rel = INT2FIX(-1);
+ else rel = INT2FIX(1);
+ break;
+ }
+ rel = rb_dbl_cmp(rb_big2dbl(x), a);
+ break;
+ }
default:
{
ID id = 0;
switch (op) {
- case big_op_gt: id = '>'; break;
- case big_op_ge: id = rb_intern(">="); break;
- case big_op_lt: id = '<'; break;
- case big_op_le: id = rb_intern("<="); break;
+ case 0: id = '>'; break;
+ case 1: id = rb_intern(">="); break;
+ case 2: id = '<'; break;
+ case 3: id = rb_intern("<="); break;
}
return rb_num_coerce_relop(x, y, id);
}
@@ -1627,10 +1478,10 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
n = FIX2INT(rel);
switch (op) {
- case big_op_gt: return n > 0 ? Qtrue : Qfalse;
- case big_op_ge: return n >= 0 ? Qtrue : Qfalse;
- case big_op_lt: return n < 0 ? Qtrue : Qfalse;
- case big_op_le: return n <= 0 ? Qtrue : Qfalse;
+ case 0: return n > 0 ? Qtrue : Qfalse;
+ case 1: return n >= 0 ? Qtrue : Qfalse;
+ case 2: return n < 0 ? Qtrue : Qfalse;
+ case 3: return n <= 0 ? Qtrue : Qfalse;
}
return Qundef;
}
@@ -1646,7 +1497,7 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
static VALUE
big_gt(VALUE x, VALUE y)
{
- return big_op(x, y, big_op_gt);
+ return big_op(x, y, 0);
}
/*
@@ -1660,7 +1511,7 @@ big_gt(VALUE x, VALUE y)
static VALUE
big_ge(VALUE x, VALUE y)
{
- return big_op(x, y, big_op_ge);
+ return big_op(x, y, 1);
}
/*
@@ -1674,7 +1525,7 @@ big_ge(VALUE x, VALUE y)
static VALUE
big_lt(VALUE x, VALUE y)
{
- return big_op(x, y, big_op_lt);
+ return big_op(x, y, 2);
}
/*
@@ -1688,7 +1539,7 @@ big_lt(VALUE x, VALUE y)
static VALUE
big_le(VALUE x, VALUE y)
{
- return big_op(x, y, big_op_le);
+ return big_op(x, y, 3);
}
/*
@@ -1712,7 +1563,14 @@ rb_big_eq(VALUE x, VALUE y)
case T_BIGNUM:
break;
case T_FLOAT:
- return rb_integer_float_eq(x, y);
+ {
+ volatile double a, b;
+
+ a = RFLOAT_VALUE(y);
+ if (isnan(a)) return Qfalse;
+ b = rb_big2dbl(x);
+ return (a == b)?Qtrue:Qfalse;
+ }
default:
return rb_equal(y, x);
}
@@ -1733,10 +1591,10 @@ rb_big_eq(VALUE x, VALUE y)
* 68719476736.eql?(68719476736.0) #=> false
*/
-VALUE
+static VALUE
rb_big_eql(VALUE x, VALUE y)
{
- if (!RB_TYPE_P(y, T_BIGNUM)) return Qfalse;
+ 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;
@@ -1825,7 +1683,7 @@ bigsub(VALUE x, VALUE y)
long i = RBIGNUM_LEN(x);
BDIGIT *xds, *yds;
- /* if x is smaller than y, swap */
+ /* if x is larger than y, swap */
if (RBIGNUM_LEN(x) < RBIGNUM_LEN(y)) {
z = x; x = y; y = z; /* swap x y */
}
@@ -1875,7 +1733,6 @@ bigsub_int(VALUE x, long y0)
if (xn == 1 && num < 0) {
RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
zds[0] = (BDIGIT)-num;
- RB_GC_GUARD(x);
return bignorm(z);
}
zds[0] = BIGLO(num);
@@ -1902,7 +1759,6 @@ bigsub_int(VALUE x, long y0)
if (num < 0) {
z = bigsub(x, rb_int2big(y0));
}
- RB_GC_GUARD(x);
return bignorm(z);
}
@@ -1955,7 +1811,6 @@ bigadd_int(VALUE x, long y)
while (i < zn) {
zds[i++] = 0;
}
- RB_GC_GUARD(x);
return bignorm(z);
}
@@ -2164,7 +2019,7 @@ bigmul1_balance(VALUE x, VALUE y)
xn = RBIGNUM_LEN(x);
yn = RBIGNUM_LEN(y);
- assert(2 * xn <= yn || 3 * xn <= 2*(yn+2));
+ assert(2 * xn <= yn);
z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
t1 = bignew(xn, 1);
@@ -2204,15 +2059,10 @@ big_split(VALUE v, long n, volatile VALUE *ph, volatile VALUE *pl)
ln = n;
}
- if (!hn) {
- h = rb_uint2big(0);
- }
- else {
- while (--hn && !vds[hn + ln]);
- h = bignew(hn += 2, 1);
- MEMCPY(BDIGITS(h), vds + ln, BDIGIT, hn - 1);
- BDIGITS(h)[hn - 1] = 0; /* margin for carry */
- }
+ while (--hn && !vds[hn + ln]);
+ h = bignew(hn += 2, 1);
+ MEMCPY(BDIGITS(h), vds + ln, BDIGIT, hn - 1);
+ BDIGITS(h)[hn - 1] = 0; /* margin for carry */
while (--ln && !vds[ln]);
l = bignew(ln += 2, 1);
@@ -2319,241 +2169,6 @@ bigmul1_karatsuba(VALUE x, VALUE y)
return z;
}
-static void
-biglsh_bang(BDIGIT *xds, long xn, unsigned long shift)
-{
- long const s1 = shift/BITSPERDIG;
- int const s2 = (int)(shift%BITSPERDIG);
- int const s3 = BITSPERDIG-s2;
- BDIGIT* zds;
- BDIGIT num;
- long i;
- if (s1 >= xn) {
- MEMZERO(xds, BDIGIT, xn);
- return;
- }
- zds = xds + xn - 1;
- xn -= s1 + 1;
- num = xds[xn]<<s2;
- while (0 < xn) {
- *zds-- = num | xds[--xn]>>s3;
- num = xds[xn]<<s2;
- }
- assert(xds <= zds);
- *zds = num;
- for (i = s1; i > 0; --i)
- *zds-- = 0;
-}
-
-static void
-bigrsh_bang(BDIGIT* xds, long xn, unsigned long shift)
-{
- long s1 = shift/BITSPERDIG;
- int s2 = (int)(shift%BITSPERDIG);
- int s3 = BITSPERDIG - s2;
- int i;
- BDIGIT num;
- BDIGIT* zds;
- if (s1 >= xn) {
- MEMZERO(xds, BDIGIT, xn);
- return;
- }
-
- i = 0;
- zds = xds + s1;
- num = *zds++>>s2;
- while (i < xn - s1 - 1) {
- xds[i++] = (BDIGIT)(*zds<<s3) | num;
- num = *zds++>>s2;
- }
- assert(i < xn);
- xds[i] = num;
- MEMZERO(xds + xn - s1, BDIGIT, s1);
-}
-
-static void
-big_split3(VALUE v, long n, volatile VALUE* p0, volatile VALUE* p1, volatile VALUE* p2)
-{
- VALUE v0, v12, v1, v2;
-
- big_split(v, n, &v12, &v0);
- big_split(v12, n, &v2, &v1);
-
- *p0 = bigtrunc(v0);
- *p1 = bigtrunc(v1);
- *p2 = bigtrunc(v2);
-}
-
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
-static VALUE bigdivrem(VALUE, VALUE, volatile VALUE*, volatile VALUE*);
-
-static VALUE
-bigmul1_toom3(VALUE x, VALUE y)
-{
- long n, xn, yn, zn;
- VALUE x0, x1, x2, y0, y1, y2;
- VALUE u0, u1, u2, u3, u4, v1, v2, v3;
- VALUE z0, z1, z2, z3, z4, z, t;
- BDIGIT* zds;
-
- xn = RBIGNUM_LEN(x);
- yn = RBIGNUM_LEN(y);
- assert(xn <= yn); /* assume y >= x */
-
- n = (yn + 2) / 3;
- big_split3(x, n, &x0, &x1, &x2);
- if (x == y) {
- y0 = x0; y1 = x1; y2 = x2;
- }
- else big_split3(y, n, &y0, &y1, &y2);
-
- /*
- * ref. http://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
- *
- * x(b) = x0 * b^0 + x1 * b^1 + x2 * b^2
- * y(b) = y0 * b^0 + y1 * b^1 + y2 * b^2
- *
- * z(b) = x(b) * y(b)
- * z(b) = z0 * b^0 + z1 * b^1 + z2 * b^2 + z3 * b^3 + z4 * b^4
- * where:
- * z0 = x0 * y0
- * z1 = x0 * y1 + x1 * y0
- * z2 = x0 * y2 + x1 * y1 + x2 * y0
- * z3 = x1 * y2 + x2 * y1
- * z4 = x2 * y2
- *
- * Toom3 method (a.k.a. Toom-Cook method):
- * (Step1) calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4),
- * where:
- * b0 = 0, b1 = 1, b2 = -1, b3 = -2, b4 = inf,
- * z(0) = x(0) * y(0) = x0 * y0
- * z(1) = x(1) * y(1) = (x0 + x1 + x2) * (y0 + y1 + y2)
- * z(-1) = x(-1) * y(-1) = (x0 - x1 + x2) * (y0 - y1 + y2)
- * z(-2) = x(-2) * y(-2) = (x0 - 2 * (x1 - 2 * x2)) * (y0 - 2 * (y1 - 2 * y2))
- * z(inf) = x(inf) * y(inf) = x2 * y2
- *
- * (Step2) interpolating z0, z1, z2, z3, z4, and z5.
- *
- * (Step3) Substituting base value into b of the polynomial z(b),
- */
-
- /*
- * [Step1] calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4)
- */
-
- /* u1 <- x0 + x2 */
- u1 = bigtrunc(bigadd(x0, x2, 1));
-
- /* x(-1) : u2 <- u1 - x1 = x0 - x1 + x2 */
- u2 = bigtrunc(bigsub(u1, x1));
-
- /* x(1) : u1 <- u1 + x1 = x0 + x1 + x2 */
- u1 = bigtrunc(bigadd(u1, x1, 1));
-
- /* x(-2) : u3 <- 2 * (u2 + x2) - x0 = x0 - 2 * (x1 - 2 * x2) */
- u3 = bigadd(u2, x2, 1);
- if (BDIGITS(u3)[RBIGNUM_LEN(u3)-1] & BIGRAD_HALF) {
- rb_big_resize(u3, RBIGNUM_LEN(u3) + 1);
- BDIGITS(u3)[RBIGNUM_LEN(u3)-1] = 0;
- }
- biglsh_bang(BDIGITS(u3), RBIGNUM_LEN(u3), 1);
- u3 = bigtrunc(bigadd(bigtrunc(u3), x0, 0));
-
- if (x == y) {
- v1 = u1; v2 = u2; v3 = u3;
- }
- else {
- /* v1 <- y0 + y2 */
- v1 = bigtrunc(bigadd(y0, y2, 1));
-
- /* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
- v2 = bigtrunc(bigsub(v1, y1));
-
- /* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
- v1 = bigtrunc(bigadd(v1, y1, 1));
-
- /* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
- v3 = bigadd(v2, y2, 1);
- if (BDIGITS(v3)[RBIGNUM_LEN(v3)-1] & BIGRAD_HALF) {
- rb_big_resize(v3, RBIGNUM_LEN(v3) + 1);
- BDIGITS(v3)[RBIGNUM_LEN(v3)-1] = 0;
- }
- biglsh_bang(BDIGITS(v3), RBIGNUM_LEN(v3), 1);
- v3 = bigtrunc(bigadd(bigtrunc(v3), y0, 0));
- }
-
- /* z(0) : u0 <- x0 * y0 */
- u0 = bigtrunc(bigmul0(x0, y0));
-
- /* z(1) : u1 <- u1 * v1 */
- u1 = bigtrunc(bigmul0(u1, v1));
-
- /* z(-1) : u2 <- u2 * v2 */
- u2 = bigtrunc(bigmul0(u2, v2));
-
- /* z(-2) : u3 <- u3 * v3 */
- u3 = bigtrunc(bigmul0(u3, v3));
-
- /* z(inf) : u4 <- x2 * y2 */
- u4 = bigtrunc(bigmul0(x2, y2));
-
- /* for GC */
- v1 = v2 = v3 = Qnil;
-
- /*
- * [Step2] interpolating z0, z1, z2, z3, z4, and z5.
- */
-
- /* z0 <- z(0) == u0 */
- z0 = u0;
-
- /* z4 <- z(inf) == u4 */
- z4 = u4;
-
- /* z3 <- (z(-2) - z(1)) / 3 == (u3 - u1) / 3 */
- z3 = bigadd(u3, u1, 0);
- bigdivrem(z3, big_three, &z3, NULL); /* TODO: optimize */
- bigtrunc(z3);
-
- /* z1 <- (z(1) - z(-1)) / 2 == (u1 - u2) / 2 */
- z1 = bigtrunc(bigadd(u1, u2, 0));
- bigrsh_bang(BDIGITS(z1), RBIGNUM_LEN(z1), 1);
-
- /* z2 <- z(-1) - z(0) == u2 - u0 */
- z2 = bigtrunc(bigadd(u2, u0, 0));
-
- /* z3 <- (z2 - z3) / 2 + 2 * z(inf) == (z2 - z3) / 2 + 2 * u4 */
- z3 = bigtrunc(bigadd(z2, z3, 0));
- bigrsh_bang(BDIGITS(z3), RBIGNUM_LEN(z3), 1);
- t = big_lshift(u4, 1); /* TODO: combining with next addition */
- z3 = bigtrunc(bigadd(z3, t, 1));
-
- /* z2 <- z2 + z1 - z(inf) == z2 + z1 - u4 */
- z2 = bigtrunc(bigadd(z2, z1, 1));
- z2 = bigtrunc(bigadd(z2, u4, 0));
-
- /* z1 <- z1 - z3 */
- z1 = bigtrunc(bigadd(z1, z3, 0));
-
- /*
- * [Step3] Substituting base value into b of the polynomial z(b),
- */
-
- zn = 6*n + 1;
- z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
- zds = BDIGITS(z);
- MEMCPY(zds, BDIGITS(z0), BDIGIT, RBIGNUM_LEN(z0));
- MEMZERO(zds + RBIGNUM_LEN(z0), BDIGIT, zn - RBIGNUM_LEN(z0));
- bigadd_core(zds + n, zn - n, BDIGITS(z1), big_real_len(z1), zds + n, zn - n);
- bigadd_core(zds + 2*n, zn - 2*n, BDIGITS(z2), big_real_len(z2), zds + 2*n, zn - 2*n);
- bigadd_core(zds + 3*n, zn - 3*n, BDIGITS(z3), big_real_len(z3), zds + 3*n, zn - 3*n);
- bigadd_core(zds + 4*n, zn - 4*n, BDIGITS(z4), big_real_len(z4), zds + 4*n, zn - 4*n);
- z = bignorm(z);
-
- return bignorm(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
@@ -2592,7 +2207,6 @@ bigsqr_fast(VALUE x)
}
#define KARATSUBA_MUL_DIGITS 70
-#define TOOM3_MUL_DIGITS 150
/* determine whether a bignum is sparse or not by random sampling */
@@ -2600,14 +2214,28 @@ 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_genrand_ulong_limited(n / 2) + n / 4]) c++;
- if (c <= 1 && BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
- if (c <= 1 && BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+ 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)
{
@@ -2640,13 +2268,8 @@ bigmul0(VALUE x, VALUE y)
/* balance multiplication by slicing y when x is much smaller than y */
if (2 * xn <= yn) return bigmul1_balance(x, y);
- if (xn < TOOM3_MUL_DIGITS) {
- /* multiplication by karatsuba method */
- return bigmul1_karatsuba(x, y);
- }
- else if (3*xn <= 2*(yn + 2))
- return bigmul1_balance(x, y);
- return bigmul1_toom3(x, y);
+ /* multiplication by karatsuba method */
+ return bigmul1_karatsuba(x, y);
}
/*
@@ -2678,32 +2301,30 @@ rb_big_mul(VALUE x, VALUE y)
}
struct big_div_struct {
- long nx, ny, j, nyzero;
+ long nx, ny;
BDIGIT *yds, *zds;
- volatile VALUE stop;
+ VALUE stop;
};
-static void *
+static VALUE
bigdivrem1(void *ptr)
{
struct big_div_struct *bds = (struct big_div_struct*)ptr;
- long ny = bds->ny;
- long i, j;
+ 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 = bds->j;
+ j = nx==ny?nx+1:nx;
+ for (nyzero = 0; !yds[nyzero]; nyzero++);
do {
- if (bds->stop) {
- bds->j = j;
- return 0;
- }
+ 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 = bds->nyzero; num = 0; t2 = 0;
+ i = nyzero; num = 0; t2 = 0;
do { /* multiply and subtract */
BDIGIT_DBL ee;
t2 += (BDIGIT_DBL)yds[i] * q;
@@ -2727,14 +2348,14 @@ bigdivrem1(void *ptr)
}
zds[j] = q;
} while (--j >= ny);
- return 0;
+ return Qnil;
}
static void
rb_big_stop(void *ptr)
{
- struct big_div_struct *bds = ptr;
- bds->stop = Qtrue;
+ VALUE *stop = (VALUE*)ptr;
+ *stop = Qtrue;
}
static VALUE
@@ -2774,7 +2395,6 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
if (divp) *divp = z;
return Qnil;
}
-
z = bignew(nx==ny?nx+2:nx+1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
zds = BDIGITS(z);
if (nx==ny) zds[nx+1] = 0;
@@ -2818,17 +2438,8 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
bds.zds = zds;
bds.yds = yds;
bds.stop = Qfalse;
- bds.j = nx==ny?nx+1:nx;
- for (bds.nyzero = 0; !yds[bds.nyzero]; bds.nyzero++);
if (nx > 10000 || ny > 10000) {
- retry:
- bds.stop = Qfalse;
- rb_thread_call_without_gvl(bigdivrem1, &bds, rb_big_stop, &bds);
-
- if (bds.stop == Qtrue) {
- /* execute trap handler, but exception was not raised. */
- goto retry;
- }
+ rb_thread_blocking_region(bigdivrem1, &bds, rb_big_stop, &bds.stop);
}
else {
bigdivrem1(&bds);
@@ -2845,10 +2456,10 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
if (modp) { /* normalize remainder */
*modp = zz = rb_big_clone(z);
zds = BDIGITS(zz);
- while (ny > 1 && !zds[ny-1]) --ny;
+ while (--ny && !zds[ny]); ++ny;
if (dd) {
t2 = 0; i = ny;
- while (i--) {
+ while(i--) {
t2 = (t2 | zds[i]) >> dd;
q = zds[i];
zds[i] = BIGLO(t2);
@@ -2893,13 +2504,12 @@ rb_big_divide(VALUE x, VALUE y, ID op)
case T_FLOAT:
{
+ double div = rb_big2dbl(x) / RFLOAT_VALUE(y);
if (op == '/') {
- return DBL2NUM(rb_big2dbl(x) / RFLOAT_VALUE(y));
+ return DBL2NUM(div);
}
else {
- double dy = RFLOAT_VALUE(y);
- if (dy == 0.0) rb_num_zerodiv();
- return rb_dbl2big(rb_big2dbl(x) / dy);
+ return rb_dbl2big(div);
}
}
@@ -3079,31 +2689,32 @@ big_fdiv(VALUE x, VALUE y)
switch (TYPE(y)) {
case T_FIXNUM:
y = rb_int2big(FIX2LONG(y));
- case T_BIGNUM:
+ 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);
- break;
+ 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(INFINITY);
+ 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;
- break;
- default:
- rb_bug("big_fdiv");
+ goto 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(INFINITY);
- if (l < INT_MIN) return DBL2NUM(0.0);
- }
-#endif
- return DBL2NUM(ldexp(big2dbl(z), (int)l));
+ rb_bug("big_fdiv");
+ /* NOTREACHED */
}
/*
@@ -3198,11 +2809,10 @@ rb_big_pow(VALUE x, VALUE y)
else {
VALUE z = 0;
SIGNED_VALUE mask;
- const long xlen = RBIGNUM_LEN(x) - 1;
- const long xbits = ffs(RBIGNUM_DIGITS(x)[xlen]) + SIZEOF_BDIGITS*BITSPERDIG*xlen;
- const long BIGLEN_LIMIT = BITSPERDIG*1024*1024;
+ const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
- if ((xbits > BIGLEN_LIMIT) || (xbits * yy > BIGLEN_LIMIT)) {
+ if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
+ (RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
rb_warn("in a**b, b may be too big");
d = (double)yy;
break;
@@ -3224,6 +2834,18 @@ rb_big_pow(VALUE x, VALUE y)
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)
{
@@ -3283,13 +2905,8 @@ rb_big_and(VALUE xx, VALUE yy)
long i, l1, l2;
char sign;
- if (!FIXNUM_P(yy) && !RB_TYPE_P(yy, T_BIGNUM)) {
- return rb_num_coerce_bit(xx, yy, '&');
- }
-
x = xx;
- y = yy;
-
+ y = bit_coerce(yy);
if (!RBIGNUM_SIGN(x)) {
x = rb_big_clone(x);
get2comp(x);
@@ -3379,12 +2996,8 @@ rb_big_or(VALUE xx, VALUE yy)
long i, l1, l2;
char sign;
- if (!FIXNUM_P(yy) && !RB_TYPE_P(yy, T_BIGNUM)) {
- return rb_num_coerce_bit(xx, yy, '|');
- }
-
x = xx;
- y = yy;
+ y = bit_coerce(yy);
if (!RBIGNUM_SIGN(x)) {
x = rb_big_clone(x);
@@ -3475,12 +3088,8 @@ rb_big_xor(VALUE xx, VALUE yy)
long i, l1, l2;
char sign;
- if (!FIXNUM_P(yy) && !RB_TYPE_P(yy, T_BIGNUM)) {
- return rb_num_coerce_bit(xx, yy, '^');
- }
-
x = xx;
- y = yy;
+ y = bit_coerce(yy);
if (!RBIGNUM_SIGN(x)) {
x = rb_big_clone(x);
@@ -3555,7 +3164,7 @@ rb_big_lshift(VALUE x, VALUE y)
}
break;
}
- else if (RB_TYPE_P(y, T_BIGNUM)) {
+ else if (TYPE(y) == T_BIGNUM) {
if (!RBIGNUM_SIGN(y)) {
VALUE t = check_shiftdown(y, x);
if (!NIL_P(t)) return t;
@@ -3619,7 +3228,7 @@ rb_big_rshift(VALUE x, VALUE y)
}
break;
}
- else if (RB_TYPE_P(y, T_BIGNUM)) {
+ else if (TYPE(y) == T_BIGNUM) {
if (RBIGNUM_SIGN(y)) {
VALUE t = check_shiftdown(y, x);
if (!NIL_P(t)) return t;
@@ -3655,10 +3264,9 @@ big_rshift(VALUE x, unsigned long shift)
return INT2FIX(-1);
}
if (!RBIGNUM_SIGN(x)) {
- x = rb_big_clone(x);
+ save_x = x = rb_big_clone(x);
get2comp(x);
}
- save_x = x;
xds = BDIGITS(x);
i = RBIGNUM_LEN(x); j = i - s1;
if (j == 0) {
@@ -3678,7 +3286,6 @@ big_rshift(VALUE x, unsigned long shift)
if (!RBIGNUM_SIGN(x)) {
get2comp(z);
}
- RB_GC_GUARD(save_x);
return z;
}
@@ -3709,7 +3316,7 @@ rb_big_aref(VALUE x, VALUE y)
VALUE shift;
long i, s1, s2;
- if (RB_TYPE_P(y, T_BIGNUM)) {
+ if (TYPE(y) == T_BIGNUM) {
if (!RBIGNUM_SIGN(y))
return INT2FIX(0);
bigtrunc(y);
@@ -3767,13 +3374,17 @@ static VALUE
rb_big_coerce(VALUE x, VALUE y)
{
if (FIXNUM_P(y)) {
- y = rb_int2big(FIX2LONG(y));
+ return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
+ }
+ else if (TYPE(y) == T_BIGNUM) {
+ return rb_assoc_new(y, x);
}
- else if (!RB_TYPE_P(y, T_BIGNUM)) {
+ else {
rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
rb_obj_classname(y));
}
- return rb_assoc_new(y, x);
+ /* not reached */
+ return Qnil;
}
/*
@@ -3869,7 +3480,6 @@ Init_Bignum(void)
rb_cBignum = rb_define_class("Bignum", rb_cInteger);
rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
- rb_define_alias(rb_cBignum, "inspect", "to_s");
rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
rb_define_method(rb_cBignum, "-@", rb_big_uminus, 0);
rb_define_method(rb_cBignum, "+", rb_big_plus, 1);
@@ -3908,7 +3518,4 @@ Init_Bignum(void)
rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
power_cache_init();
-
- big_three = rb_uint2big(3);
- rb_gc_register_mark_object(big_three);
}
diff --git a/bin/gem b/bin/gem
index a4ec754abb..14c3d3c480 100755
--- a/bin/gem
+++ b/bin/gem
@@ -9,7 +9,7 @@ require 'rubygems'
require 'rubygems/gem_runner'
require 'rubygems/exceptions'
-required_version = Gem::Requirement.new ">= 1.8.7"
+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}"
diff --git a/bin/rake b/bin/rake
index 6aad2f0df3..c9e95da611 100755
--- a/bin/rake
+++ b/bin/rake
@@ -23,15 +23,9 @@
#++
begin
- require 'rubygems'
- gem 'rake'
+ require 'rake'
rescue LoadError
+ require 'rubygems'
+ require 'rake'
end
-
-module Rake
- REDUCE_COMPAT = true if ARGV.include?("--reduce-compat")
-end
-
-require 'rake'
-
Rake.application.run
diff --git a/bin/rdoc b/bin/rdoc
index aaa23292df..8fafd01b0f 100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -5,23 +5,14 @@
#
# Copyright (c) 2003 Dave Thomas
# Released under the same terms as Ruby
-
-begin
- gem 'rdoc'
-rescue NameError => e # --disable-gems
- raise unless e.name == :gem
-rescue Gem::LoadError
-end
+#
+# $Revision$
require 'rdoc/rdoc'
begin
r = RDoc::RDoc.new
r.document ARGV
-rescue Errno::ENOSPC
- $stderr.puts 'Ran out of space creating documentation'
- $stderr.puts
- $stderr.puts 'Please free up some space and try again'
rescue SystemExit
raise
rescue Exception => e
diff --git a/bin/ri b/bin/ri
index 7fbed0c099..243557403c 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,12 +1,5 @@
#!/usr/bin/env ruby
-begin
- gem 'rdoc'
-rescue NameError => e # --disable-gems
- raise unless e.name == :gem
-rescue Gem::LoadError
-end
-
require 'rdoc/ri/driver'
RDoc::RI::Driver.run ARGV
diff --git a/bin/testrb b/bin/testrb
index 23a00b439f..e4eb9099b3 100755
--- a/bin/testrb
+++ b/bin/testrb
@@ -1,3 +1,14 @@
#!/usr/bin/env ruby
require 'test/unit'
-exit Test::Unit::AutoRunner.run(true)
+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
+}
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 75e255428a..9d98afcb89 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -1,4 +1,4 @@
-"exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- mode: ruby; coding: utf-8 -*-
+"exec" "${RUBY-ruby}" "-x" "$0" "$@"; true # -*- mode: ruby; coding: utf-8 -*-
#!./ruby
# $Id$
@@ -60,10 +60,6 @@ end
def main
@ruby = File.expand_path('miniruby')
@verbose = false
- $stress = false
- @color = nil
- @tty = nil
- @quiet = false
dir = nil
quiet = false
tests = nil
@@ -84,17 +80,8 @@ def main
true
when /\A(--stress|-s)/
$stress = true
- when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
- warn "unknown --color argument: #$3" if $3
- @color = $1 ? nil : !$2
- true
- when /\A--tty(=(?:yes|(no)|(.*)))?\z/
- warn "unknown --tty argument: #$3" if $3
- @tty = !$1 || !$2
- true
when /\A(-q|--q(uiet))\z/
quiet = true
- @quiet = true
true
when /\A(-v|--v(erbose))\z/
@verbose = true
@@ -104,16 +91,12 @@ Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
--sets=NAME,NAME,... Name of test sets.
--dir=DIRECTORY Working directory.
default: /tmp/bootstraptestXXXXX.tmpwd
- --color[=WHEN] Colorize the output. WHEN defaults to 'always'
- or can be 'never' or 'auto'.
-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
- when /\A-j/
- true
else
false
end
@@ -126,24 +109,6 @@ End
tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
pathes = tests.map {|path| File.expand_path(path) }
- @progress = %w[- \\ | /]
- @progress_bs = "\b" * @progress[0].size
- @tty = $stderr.tty? if @tty.nil?
- case @color
- when nil
- @color = @tty && /dumb/ !~ ENV["TERM"]
- end
- @tty &&= !@verbose
- if @color
- # dircolors-like style
- colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
- @passed = "\e[#{colors["pass"] || "32"}m"
- @failed = "\e[#{colors["fail"] || "31"}m"
- @reset = "\e[m"
- @erase = "\r\e[2K\r"
- else
- @passed = @failed = @reset = @erase = ""
- end
unless quiet
puts Time.now
if defined?(RUBY_DESCRIPTION)
@@ -169,85 +134,42 @@ def exec_test(pathes)
@errbuf = []
@location = nil
pathes.each do |path|
- @basename = File.basename(path)
- $stderr.print @basename, " "
- $stderr.puts if @verbose
- count = @count
- error = @error
+ $stderr.print "\n#{File.basename(path)} "
load File.expand_path(path)
- if @tty
- if @error == error
- $stderr.print "#{@progress_bs}#{@passed}PASS #{@count-count}#{@reset}"
- $stderr.print @erase if @quiet
- else
- $stderr.print "#{@progress_bs}#{@failed}FAIL #{@error-error}/#{@count-count}#{@reset}"
- end
- end
- $stderr.puts unless @quiet and @tty
end
+ $stderr.puts
if @error == 0
if @count == 0
$stderr.puts "No tests, no problem"
else
- $stderr.puts "#{@passed}PASS#{@reset} all #{@count} tests"
+ $stderr.puts "PASS all #{@count} tests"
end
exit true
else
@errbuf.each do |msg|
$stderr.puts msg
end
- $stderr.puts "#{@failed}FAIL#{@reset} #{@error}/#{@count} tests failed"
+ $stderr.puts "FAIL #{@error}/#{@count} tests failed"
exit false
end
end
-def show_progress(message = '')
- if @verbose
- $stderr.print "\##{@count} #{@location} "
- elsif @tty
- $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
- end
- faildesc, errout = with_stderr {yield}
+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
- if @tty
- $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
- else
- $stderr.print '.'
- end
- $stderr.puts if @verbose
+ $stderr.print '.'
else
- $stderr.print "#{@failed}F#{@reset}"
- $stderr.puts if @verbose
+ $stderr.print 'F'
error faildesc, message
- unless errout.empty?
- $stderr.print "#{@failed}stderr output is not empty#{@reset}\n", adjust_indent(errout)
- end
- if @tty and !@verbose
- $stderr.print @basename, " ", @progress[@count % @progress.size]
- end
end
-rescue Interrupt
- raise Interrupt
rescue Exception => err
$stderr.print 'E'
- $stderr.puts if @verbose
error err.message, message
end
-# NativeClient is special. The binary is cross-compiled. But runs on the build environment.
-# So RUBY_PLATFORM in this process is not useful to detect it.
-def nacl?
- @ruby and File.basename(@ruby.split(/\s/).first)['sel_ldr']
-end
-
-def assert_check(testsrc, message = '', opt = '')
- show_progress(message) {
- result = get_result_string(testsrc, opt)
- check_coredump
- yield(result)
- }
-end
-
def assert_equal(expected, testsrc, message = '')
newtest
assert_check(testsrc, message) {|result|
@@ -292,89 +214,107 @@ def assert_valid_syntax(testsrc, message = '')
end
def assert_normal_exit(testsrc, *rest)
- newtest
opt = {}
opt = rest.pop if Hash === rest.last
message, ignore_signals = rest
message ||= ''
timeout = opt[:timeout]
- show_progress(message) {
- faildesc = nil
- filename = make_srcfile(testsrc)
- old_stderr = $stderr.dup
- timeout_signaled = false
- begin
- $stderr.reopen("assert_normal_exit.log", "w")
- io = IO.popen("#{@ruby} -W0 #{filename}")
- pid = io.pid
- th = Thread.new {
- io.read
- io.close
- $?
- }
- if !th.join(timeout)
- Process.kill :KILL, pid
- timeout_signaled = true
- end
- status = th.value
- ensure
- $stderr.reopen(old_stderr)
- old_stderr.close
+ newtest
+ $stderr.puts "\##{@count} #{@location}" if @verbose
+ faildesc = nil
+ filename = make_srcfile(testsrc)
+ old_stderr = $stderr.dup
+ timeout_signaled = false
+ begin
+ $stderr.reopen("assert_normal_exit.log", "w")
+ io = IO.popen("#{@ruby} -W0 #{filename}")
+ pid = io.pid
+ th = Thread.new {
+ io.read
+ io.close
+ $?
+ }
+ if !th.join(timeout)
+ Process.kill :KILL, pid
+ timeout_signaled = true
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
- if timeout_signaled
- sigdesc << " (timeout)"
- end
- faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
- stderr_log = File.read("assert_normal_exit.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
+ status = th.value
+ 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
+ if timeout_signaled
+ sigdesc << " (timeout)"
+ end
+ faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
+ stderr_log = File.read("assert_normal_exit.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
- faildesc
- }
+ 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
- show_progress(message) {
- 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)
+ $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
- io.close
- faildesc
- }
+ 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
- show_progress('') { message }
+ $stderr.print 'F'
+ error message, ''
end
def pretty(src, desc, result)
@@ -407,7 +347,6 @@ def get_result_string(src, opt = '')
begin
`#{@ruby} -W0 #{opt} #{filename}`
ensure
- raise Interrupt if $?.signaled? && $?.termsig == Signal.list["INT"]
raise CoreDumpError, "core dumped" if $? and $?.coredump?
end
else
@@ -415,27 +354,6 @@ def get_result_string(src, opt = '')
end
end
-def with_stderr
- out = err = nil
- begin
- r, w = IO.pipe
- stderr = $stderr.dup
- $stderr.reopen(w)
- w.close
- reader = Thread.start {r.read}
- begin
- out = yield
- ensure
- $stderr.reopen(stderr)
- err = reader.value
- end
- ensure
- w.close rescue nil
- r.close rescue nil
- end
- return out, err
-end
-
def newtest
@location = File.basename(caller(2).first)
@count += 1
@@ -443,12 +361,7 @@ def newtest
end
def error(msg, additional_message)
- msg = "#{@failed}\##{@count} #{@location}#{@reset}: #{msg} #{additional_message}"
- if @tty
- $stderr.puts "#{@erase}#{msg}"
- else
- @errbuf.push msg
- end
+ @errbuf.push "\##{@count} #{@location}: #{msg} #{additional_message}"
@error += 1
end
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
index e8df6684b6..b781fdb7e9 100644
--- a/bootstraptest/test_autoload.rb
+++ b/bootstraptest/test_autoload.rb
@@ -1,36 +1,4 @@
assert_equal 'ok', %q{
- File.unlink('zzz.rb') if File.file?('zzz.rb')
- instance_eval do
- autoload :ZZZ, './zzz.rb'
- begin
- ZZZ
- rescue LoadError
- :ok
- end
- end
-}, '[ruby-dev:43816]'
-
-assert_equal 'ok', %q{
- open('zzz.rb', 'w') {|f| f.puts '' }
- instance_eval do
- autoload :ZZZ, './zzz.rb'
- begin
- ZZZ
- rescue NameError
- :ok
- end
- end
-}, '[ruby-dev:43816]'
-
-assert_equal 'ok', %q{
- open('zzz.rb', 'w') {|f| f.puts 'class ZZZ; def self.ok;:ok;end;end'}
- instance_eval do
- autoload :ZZZ, './zzz.rb'
- ZZZ.ok
- end
-}, '[ruby-dev:43816]'
-
-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
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
index 6a2ccfc6da..ce7f00b033 100644
--- a/bootstraptest/test_block.rb
+++ b/bootstraptest/test_block.rb
@@ -75,7 +75,7 @@ assert_equal %q{[1, 2, 3]}, %q{
}
end
end
-
+
C.new.to_a
}
assert_equal %q{[4, 5, 6]}, %q{
@@ -87,7 +87,7 @@ assert_equal %q{[4, 5, 6]}, %q{
}
end
end
-
+
C.new.map{|e|
e + 3
}
@@ -110,7 +110,7 @@ assert_equal %q{20}, %q{
def m
yield 1
end
-
+
m{|ib|
m{|jb|
i = 20
@@ -121,7 +121,7 @@ assert_equal %q{2}, %q{
def m
yield 1
end
-
+
m{|ib|
m{|jb|
ib = 20
@@ -135,11 +135,11 @@ assert_equal %q{3}, %q{
yield
}
end
-
+
def iter2
yield
end
-
+
iter1{
jb = 2
iter1{
@@ -154,11 +154,11 @@ assert_equal %q{2}, %q{
yield
}
end
-
+
def iter2
yield
end
-
+
iter1{
jb = 2
iter1{
@@ -226,11 +226,11 @@ assert_equal %q{[10, 20, 30, 40, nil, nil]}, %q{
}
assert_equal %q{[1]}, %q{
$a = []
-
+
def iter
yield 1
end
-
+
def m
x = iter{|x|
$a << x
@@ -450,7 +450,7 @@ assert_equal 'ok', %q{
end
vs1 = []
C.new.each {|*v| vs1 << v }
- vs2 = []
+ vs2 = []
C.new.to_enum.each {|*v| vs2 << v }
vs1 == vs2 ? :ok : :ng
}, '[ruby-dev:32329]'
@@ -468,9 +468,9 @@ assert_equal '[nil, []]', %q{
def m() yield nil,[] end
l = lambda {|*v| v}
GC.stress=true
- r = m(&l)
+ r = m(&l)
GC.stress=false
- r.inspect
+ r.inspect
}, '[ruby-dev:32567]'
assert_equal NilClass.to_s, %q{
@@ -565,35 +565,3 @@ assert_normal_exit %q{
t.test_for_bug
}, '[ruby-core:14395]'
-assert_equal 'true', %q{
- class C0
- def foo
- block_given?
- end
- end
-
- class C1 < C0
- def foo
- super
- end
- end
-
- C1.new.foo{}
-}
-
-assert_equal 'true', %q{
- class C0
- def foo
- block_given?
- end
- end
-
- class C1 < C0
- def foo
- super()
- end
- end
-
- C1.new.foo{}
-}
-
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index bf7478006d..9ae50a6d30 100644
--- a/bootstraptest/test_eval.rb
+++ b/bootstraptest/test_eval.rb
@@ -137,7 +137,7 @@ assert_equal %q{C}, %q{
}
C.new.m
}
-assert_equal %q{top}, %q{
+assert_equal %q{C}, %q{
Const = :top
class C
Const = :C
@@ -264,18 +264,24 @@ assert_equal 'ok', %q{
}, '[ruby-core:16794]'
assert_equal 'ok', %q{
- nil.instance_eval {
- def defd_using_instance_eval() :ok end
- }
- nil.defd_using_instance_eval
-}, '[ruby-core:28324]'
+ begin
+ nil.instance_eval {
+ def a() :a end
+ }
+ rescue TypeError
+ :ok
+ end
+}, '[ruby-core:16796]'
assert_equal 'ok', %q{
- nil.instance_exec {
- def defd_using_instance_exec() :ok end
- }
- nil.defd_using_instance_exec
-}, '[ruby-core:28324]'
+ begin
+ nil.instance_exec {
+ def a() :a end
+ }
+ rescue TypeError
+ :ok
+ end
+}, '[ruby-core:16796]'
assert_normal_exit %q{
eval("", method(:proc).call {}.binding)
@@ -310,15 +316,6 @@ assert_normal_exit %q{
end
begin
eval "class C; @@h = #{hash.inspect}; end"
+ rescue SystemStackError
end
}, '[ruby-core:25714]'
-
-assert_normal_exit %q{
- begin
- eval("# encoding:utf-16le\nfoo")
- rescue Exception => e
- p e
- RubyVM::InstructionSequence.compile("p:hello")
- end
-}, 'check escaping the internal value th->base_block'
-
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index 35c8d25e37..33154a546d 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -97,7 +97,7 @@ assert_equal %q{[#<RuntimeError: FOO>, #<RuntimeError: FOO>]}, %q{
def m
$!
end
-
+
begin
begin
raise "FOO"
@@ -205,11 +205,11 @@ assert_equal %q{3}, %q{
assert_equal %q{ok3}, %q{
class E1 < Exception
end
-
+
def m
yield
end
-
+
begin
begin
begin
@@ -239,7 +239,7 @@ assert_equal %q{7}, %q{
$i += 2
break
ensure
-
+
end
ensure
$i += 4
@@ -247,7 +247,7 @@ assert_equal %q{7}, %q{
$i = 0
}
end
-
+
def iter
yield
end
@@ -349,7 +349,7 @@ assert_equal %q{12}, %q{
7+7
end
}
-assert_equal %q{ok}, %q{ #
+assert_equal %q{ok}, %q{ #
proc{
begin
raise
@@ -376,7 +376,7 @@ assert_match /undefined method `foo\'/, %q{#`
def inspect
bar {}
end
-
+
def bar
raise
ensure
@@ -414,19 +414,3 @@ assert_equal 'exception class/object expected', %q{
e.message
end
}, '[ruby-core:24767]'
-
-assert_equal 'ok', %q{
- class C
- def ===(o)
- true
- end
- end
- begin
- begin
- raise
- rescue C.new
- end
- rescue TypeError
- :ok
- end
-}
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
index 0390062a24..84ef216421 100644
--- a/bootstraptest/test_flow.rb
+++ b/bootstraptest/test_flow.rb
@@ -29,7 +29,7 @@ assert_equal %q{ok}, %q{
end
end
end
-
+
('a').lines.map{|e|
break :ok
}
@@ -517,75 +517,9 @@ assert_equal %Q{ENSURE\n}, %q{
end
end
e = Bug2728.new
-}],
- ['[ruby-core:28132]', %q{
- class Bug2729
- include Enumerable
- def each
- begin
- yield :foo
- ensure
- proc {}.call
- end
- end
- end
- e = Bug2729.new
-}],
- ['[ruby-core:39125]', %q{
- class Bug5234
- include Enumerable
- def each
- begin
- yield :foo
- ensure
- proc
- end
- end
- end
- e = Bug5234.new
-}],
- ['[ruby-dev:45656]', %q{
- class Bug6460
- include Enumerable
- def each
- begin
- yield :foo
- ensure
- 1.times { Proc.new }
- end
- end
- end
- e = Bug6460.new
}]].each do |bug, src|
assert_equal "foo", src + %q{e.detect {true}}, bug
assert_equal "true", src + %q{e.any? {true}}, bug
assert_equal "false", src + %q{e.all? {false}}, bug
assert_equal "true", src + %q{e.include?(:foo)}, bug
end
-
-assert_equal "foo", %q{
- class Bug6460
- def m1
- m2 {|e|
- return e
- }
- end
-
- def m2
- begin
- yield :foo
- ensure
- begin
- begin
- yield :foo
- ensure
- Proc.new
- raise ''
- end
- rescue
- end
- end
- end
- end
- Bug6460.new.m1
-}, '[ruby-dev:46372]'
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index f7360f34b3..7304aebc26 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -53,7 +53,7 @@ assert_equal 'ok', %q{
STDIN.reopen(rw)
STDIN.reopen(save)
rw.close
- File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
+ File.unlink(tmpname)
:ok
}
@@ -70,16 +70,10 @@ assert_equal 'ok', %q{
STDIN.print "a"
STDIN.reopen(save)
rw.close
- File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
+ File.unlink(tmpname)
:ok
}
-assert_equal 'ok', %q{
- dup = STDIN.dup
- dupfd = dup.fileno
- dupfd == STDIN.dup.fileno ? :ng : :ok
-}, '[ruby-dev:46834]'
-
assert_normal_exit %q{
ARGF.set_encoding "foo"
}
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
index 595aaa7c4b..c53d83591e 100644
--- a/bootstraptest/test_jump.rb
+++ b/bootstraptest/test_jump.rb
@@ -100,7 +100,7 @@ assert_equal %q{ok}, %q{
def m
yield
end
-
+
m{
begin
ensure
@@ -190,7 +190,7 @@ assert_equal %q{100}, %q{
$i = 100
end
end
-
+
def iter
yield
end
@@ -216,7 +216,7 @@ assert_equal %q{1}, %q{
return 1
end
end
-
+
m
}
assert_equal %q{1}, %q{
@@ -227,7 +227,7 @@ assert_equal %q{1}, %q{
return 1
end
end
-
+
m
}
assert_equal 'ok', %q{
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index b95a2f2d0a..ab028e2c1e 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -65,10 +65,8 @@ assert_equal ':a3c', ':"a#{1+2}c".inspect'
assert_equal 'Symbol', ':"a#{1+2}c".class'
# xstring
-unless nacl?
- assert_equal "foo\n", %q(`echo foo`)
- assert_equal "foo\n", %q(s = "foo"; `echo #{s}`)
-end
+assert_equal "foo\n", %q(`echo foo`)
+assert_equal "foo\n", %q(s = "foo"; `echo #{s}`)
# regexp
assert_equal '', '//.source'
@@ -202,30 +200,3 @@ assert_equal 'ok', %q{
assert_equal 'ok', %q{
"#{}o""#{}k""#{}"
}, '[ruby-core:25284]'
-
-assert_equal 'ok', %q{ # long array literal
- x = nil
- eval "a = [#{(1..10_000).map{'x'}.join(", ")}]"
- :ok
-}
-
-assert_equal 'ok', %q{ # long array literal (optimized)
- eval "a = [#{(1..10_000).to_a.join(", ")}]"
- :ok
-}
-
-assert_equal 'ok', %q{ # long hash literal
- x = nil
- eval "a = {#{(1..10_000).map{|n| "#{n} => x"}.join(', ')}}"
- :ok
-}
-
-assert_equal 'ok', %q{ # long hash literal (optimized)
- eval "a = {#{(1..10_000).map{|n| "#{n} => #{n}"}.join(', ')}}"
- :ok
-}
-
-assert_equal 'ok', %q{
- [print(:ok), exit] # void literal with side-effect
- :dummy
-}
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index 20dcc7a184..8d0db6e478 100644
--- a/bootstraptest/test_method.rb
+++ b/bootstraptest/test_method.rb
@@ -402,10 +402,6 @@ m(1,2,*ary,&b)
$result
}
-# aset and splat
-assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;Foo.new[1,*a=[2,3]]=4}
-assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;def m(&blk)Foo.new[1,*a=[2,3],&blk]=4;end;m{}}
-
# 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)
@@ -918,7 +914,7 @@ assert_equal %q{[:ok, :ok, :ok, :ok, :ok, :ok, :ng, :ng]}, %q{
o1 = c1.new
o2 = c2.new
-
+
test{o1.m}
test{o2.mm}
test{o1.send :m}
@@ -1001,8 +997,8 @@ assert_equal 'ok', %q{
assert_normal_exit %q{
begin
- Process.setrlimit(Process::RLIMIT_STACK, 4_206_592)
- # FreeBSD SEGVs this less than 4M + 12K bytes.
+ Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
+ # FreeBSD fails this less than 4M + 8K bytes.
rescue Exception
exit
end
@@ -1078,7 +1074,7 @@ assert_equal '[1, 2, [3, 4]]', %q{
def regular(a, b, *c)
[a, b, c]
end
- regular(*[], 1, *[], *[2, 3], *[], 4)
+ regular(*[], 1, *[], *[2, 3], *[], 4)
}, '[ruby-core:19413]'
assert_equal '[1, [:foo, 3, 4, :foo]]', %q{
@@ -1097,7 +1093,7 @@ assert_equal '["B", "A"]', %q{
end
class B < A
- define_method(:m) do
+ define_method(:m) do
['B', super()]
end
end
@@ -1184,81 +1180,3 @@ assert_equal 'ok', %q{
'ok'
}, '[ruby-core:30534]'
-# should not cache when splat
-assert_equal 'ok', %q{
- class C
- attr_reader :a
- def initialize
- @a = 1
- end
- end
-
- def m *args
- C.new.a(*args)
- end
-
- m()
- begin
- m(1)
- rescue ArgumentError
- 'ok'
- end
-}
-
-assert_equal 'DC', %q{
- $result = []
-
- class C
- def foo *args
- $result << 'C'
- end
- end
- class D
- def foo *args
- $result << 'D'
- end
- end
-
- o1 = $o1 = C.new
- o2 = $o2 = D.new
-
- args = Object.new
- def args.to_a
- test1 $o2, nil
- []
- end
- def test1 o, args
- o.foo(*args)
- end
- test1 o1, args
- $result.join
-}
-
-assert_equal 'DC', %q{
- $result = []
-
- class C
- def foo *args
- $result << 'C'
- end
- end
- class D
- def foo *args
- $result << 'D'
- end
- end
-
- o1 = $o1 = C.new
- o2 = $o2 = D.new
-
- block = Object.new
- def block.to_proc
- test2 $o2, %w(a, b, c), nil
- Proc.new{}
- end
- def test2 o, args, block
- o.foo(*args, &block)
- end
- test2 o1, [], block
- $result.join
-}
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
index 862a94e376..486d5aff73 100644
--- a/bootstraptest/test_objectspace.rb
+++ b/bootstraptest/test_objectspace.rb
@@ -32,15 +32,3 @@ assert_normal_exit %q{
end
}
}, '[ruby-dev:31985]'
-
-assert_normal_exit %q{
- ObjectSpace.define_finalizer("") do
- Mutex.new.lock
- end
-}, '[ruby-dev:44049]'
-
-assert_normal_exit %q{
- ObjectSpace.define_finalizer("") do
- Thread.new {}
- end
-}, '[ruby-core:37858]'
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
index c23394e8d2..28a23777a3 100644
--- a/bootstraptest/test_proc.rb
+++ b/bootstraptest/test_proc.rb
@@ -2,11 +2,11 @@ assert_equal %q{[1, 2, 3]}, %q{
def getproc &b
b
end
-
+
def m
yield
end
-
+
m{
i = 1
m{
@@ -24,14 +24,14 @@ 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
}
@@ -41,7 +41,7 @@ assert_equal %q{ok}, %q{
:ok
end
end
-
+
def block
C.method(:new).to_proc
end
@@ -52,7 +52,7 @@ assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{
def proc &b
b
end
-
+
pr = []
proc{|i_b|
p3 = proc{|j_b|
@@ -63,18 +63,18 @@ assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{
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{
@@ -87,11 +87,11 @@ assert_equal %q{200}, %q{
def iter
yield
end
-
+
def getproc &b
b
end
-
+
loc1 = 0
pr1 = iter{
bl1 = 1
@@ -101,7 +101,7 @@ assert_equal %q{200}, %q{
loc1 + bl1
}
}
-
+
pr2 = iter{
bl1 = 1
getproc{
@@ -110,7 +110,7 @@ assert_equal %q{200}, %q{
loc1 + bl1
}
}
-
+
pr1.call; pr2.call
pr1.call; pr2.call
pr1.call; pr2.call
@@ -120,21 +120,21 @@ 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,
@@ -147,14 +147,14 @@ assert_equal %q{1}, %q{
def proc(&pr)
pr
end
-
+
def m
a = 1
m2{
a
}
end
-
+
def m2
b = 2
proc{
@@ -429,55 +429,3 @@ assert_equal 'ok', %q{
raise "ok"
}
-assert_equal 'ok', %q{
- lambda do
- class A
- class B
- proc{return :ng}.call
- end
- end
- end.call
- :ok
-}
-
-assert_equal 'ok', %q{
- $proc = proc{return}
- begin
- lambda do
- class A
- class B
- $proc.call
- end
- end
- end.call
- :ng
- rescue LocalJumpError
- :ok
- end
-}
-
-assert_equal 'ok', %q{
- def x
- binding
- end
- b = x{|a| a }
- b.eval('yield("ok")')
-}, '[Bug #5634]'
-
-assert_equal 'ok', %q{
- def x
- binding
- end
- eval("x { 'ok' }").eval "yield"
-}, '[Bug #5634]'
-
-assert_equal 'ok', %q{
- def x
- binding
- end
- def m
- x{ 'ok' }
- end
- eval('yield', m)
-}, '[Bug #5634]'
-
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
index 80eaa6416d..ae1488353e 100644
--- a/bootstraptest/test_syntax.rb
+++ b/bootstraptest/test_syntax.rb
@@ -110,7 +110,7 @@ assert_equal %q{100}, %q{
end
return arg
end
-
+
test(100)
}
assert_equal %q{ok}, %q{
@@ -169,7 +169,7 @@ assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false,
res
end
end
-
+
def each_test
conds = make_perm(['fv', 'tv'], 3)
bangs = make_perm(['', '!'], 3)
@@ -184,10 +184,10 @@ assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false,
}
}
end
-
+
fv = false
tv = true
-
+
$ans = []
each_test{|syn, conds, bangs, exprs|
c1, c2, c3 = conds
@@ -529,7 +529,7 @@ def assert_syntax_error expected, code, 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 *, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
+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}
@@ -541,7 +541,7 @@ assert_equal %q{1}, %q{
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-of-input}, %q{!}, '[ruby-dev:31243]'
+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]'
@@ -695,7 +695,7 @@ assert_equal 'ok', %q{
while true
counter -= 1
break if counter == 0
- next
+ next
redo
end
:ok
@@ -706,7 +706,7 @@ assert_equal 'ok', %q{
while true
counter -= 1
break if counter == 0
- next
+ next
"#{ redo }"
end
:ok
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index 121def8b42..2494cccbf3 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -189,18 +189,18 @@ assert_equal %q{11}, %q{
}.value + Thread.current[:a]
}
assert_normal_exit %q{
- begin
- 100.times do |i|
- begin
- th = Thread.start(Thread.current) {|u| u.raise }
- raise
- rescue
- ensure
- th.join
- end
+begin
+ 100.times do |i|
+ begin
+ th = Thread.start(Thread.current) {|u| u.raise }
+ raise
+ rescue
+ ensure
+ th.join
end
- rescue
end
+rescue
+end
}, '[ruby-dev:31371]'
assert_equal 'true', %{
@@ -267,7 +267,7 @@ assert_normal_exit %q{
assert_equal 'ok', %q{
def m
- t = Thread.new { while true; // =~ "" end }
+ t = Thread.new { while true do // =~ "" end }
sleep 0.1
10.times {
if /((ab)*(ab)*)*(b)/ =~ "ab"*7
@@ -380,9 +380,7 @@ assert_equal 'ok', %q{
assert_equal 'ok', %q{
begin
- 100.times{
- (1..100).map{ Thread.new(true) {|x| x == false } }.each{|th| th.join}
- }
+ 10000.times { Thread.new(true) {|x| x == false } }
rescue NoMemoryError, StandardError
end
:ok
diff --git a/class.c b/class.c
index 8a0bba5a32..3711950f0a 100644
--- a/class.c
+++ b/class.c
@@ -26,9 +26,7 @@
#include "ruby/ruby.h"
#include "ruby/st.h"
#include "method.h"
-#include "constant.h"
#include "vm_core.h"
-#include "internal.h"
#include <ctype.h>
extern st_table *rb_class_tbl;
@@ -49,16 +47,14 @@ static ID id_attached;
static VALUE
class_alloc(VALUE flags, VALUE klass)
{
- NEWOBJ_OF(obj, struct RClass, klass, flags);
- obj->ptr = ALLOC(rb_classext_t);
+ 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_CONST_TBL(obj) = 0;
RCLASS_M_TBL(obj) = 0;
RCLASS_SUPER(obj) = 0;
- RCLASS_ORIGIN(obj) = (VALUE)obj;
RCLASS_IV_INDEX_TBL(obj) = 0;
- RCLASS_REFINED_CLASS(obj) = Qnil;
- RCLASS_EXT(obj)->allocator = 0;
return (VALUE)obj;
}
@@ -94,7 +90,7 @@ rb_class_boot(VALUE super)
void
rb_check_inheritable(VALUE super)
{
- if (!RB_TYPE_P(super, T_CLASS)) {
+ if (TYPE(super) != T_CLASS) {
rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
rb_obj_classname(super));
}
@@ -121,152 +117,115 @@ rb_class_new(VALUE super)
return rb_class_boot(super);
}
-static void
-clone_method(VALUE klass, ID mid, const rb_method_entry_t *me)
+struct clone_method_data {
+ st_table *tbl;
+ 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)
{
VALUE newiseqval;
if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) {
rb_iseq_t *iseq;
- NODE *new_cref;
- newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass);
+ newiseqval = rb_iseq_clone(me->def->body.iseq->self, data->klass);
GetISeqPtr(newiseqval, iseq);
- rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref);
- iseq->cref_stack = new_cref;
- rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
+ rb_add_method(data->klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
RB_GC_GUARD(newiseqval);
}
else {
- rb_method_entry_set(klass, mid, me, me->flag);
+ rb_method_entry_set(data->klass, mid, me, me->flag);
}
-}
-
-static int
-clone_method_i(st_data_t key, st_data_t value, st_data_t data)
-{
- clone_method((VALUE)data, (ID)key, (const rb_method_entry_t *)value);
return ST_CONTINUE;
}
-static int
-clone_const(ID key, const rb_const_entry_t *ce, st_table *tbl)
-{
- rb_const_entry_t *nce = ALLOC(rb_const_entry_t);
- *nce = *ce;
- st_insert(tbl, key, (st_data_t)nce);
- return ST_CONTINUE;
-}
-
-static int
-clone_const_i(st_data_t key, st_data_t value, st_data_t data)
-{
- return clone_const((ID)key, (const rb_const_entry_t *)value, (st_table *)data);
-}
-
-static void
-class_init_copy_check(VALUE clone, VALUE orig)
-{
- if (orig == rb_cBasicObject) {
- rb_raise(rb_eTypeError, "can't copy the root class");
- }
- if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
- rb_raise(rb_eTypeError, "already initialized class");
- }
- if (FL_TEST(orig, FL_SINGLETON)) {
- rb_raise(rb_eTypeError, "can't copy singleton class");
- }
-}
-
/* :nodoc: */
VALUE
rb_mod_init_copy(VALUE clone, VALUE orig)
{
- if (RB_TYPE_P(clone, T_CLASS)) {
- class_init_copy_check(clone, orig);
- }
- if (!OBJ_INIT_COPY(clone, orig)) return clone;
+ rb_obj_init_copy(clone, orig);
if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
RBASIC(clone)->klass = rb_singleton_class_clone(orig);
rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
}
RCLASS_SUPER(clone) = RCLASS_SUPER(orig);
- RCLASS_EXT(clone)->allocator = RCLASS_EXT(orig)->allocator;
- if (RCLASS_IV_TBL(clone)) {
- st_free_table(RCLASS_IV_TBL(clone));
- RCLASS_IV_TBL(clone) = 0;
- }
- if (RCLASS_CONST_TBL(clone)) {
- rb_free_const_table(RCLASS_CONST_TBL(clone));
- RCLASS_CONST_TBL(clone) = 0;
- }
- if (RCLASS_M_TBL(clone)) {
- rb_free_m_table(RCLASS_M_TBL(clone));
- RCLASS_M_TBL(clone) = 0;
- }
if (RCLASS_IV_TBL(orig)) {
- st_data_t id;
+ ID id;
+ if (RCLASS_IV_TBL(clone)) {
+ st_free_table(RCLASS_IV_TBL(clone));
+ }
RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(orig));
- CONST_ID(id, "__tmp_classpath__");
- st_delete(RCLASS_IV_TBL(clone), &id, 0);
CONST_ID(id, "__classpath__");
- st_delete(RCLASS_IV_TBL(clone), &id, 0);
+ st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
CONST_ID(id, "__classid__");
- st_delete(RCLASS_IV_TBL(clone), &id, 0);
- }
- if (RCLASS_CONST_TBL(orig)) {
-
- RCLASS_CONST_TBL(clone) = st_init_numtable();
- st_foreach(RCLASS_CONST_TBL(orig), clone_const_i, (st_data_t)RCLASS_CONST_TBL(clone));
+ st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
}
if (RCLASS_M_TBL(orig)) {
- RCLASS_M_TBL(clone) = st_init_numtable();
- st_foreach(RCLASS_M_TBL(orig), clone_method_i, (st_data_t)clone);
+ struct clone_method_data data;
+
+ if (RCLASS_M_TBL(clone)) {
+ extern void rb_free_m_table(st_table *tbl);
+ rb_free_m_table(RCLASS_M_TBL(clone));
+ }
+ data.tbl = RCLASS_M_TBL(clone) = st_init_numtable();
+ data.klass = clone;
+ st_foreach(RCLASS_M_TBL(orig), clone_method,
+ (st_data_t)&data);
}
return clone;
}
+/* :nodoc: */
VALUE
-rb_singleton_class_clone(VALUE obj)
+rb_class_init_copy(VALUE clone, VALUE orig)
{
- return rb_singleton_class_clone_and_attach(obj, Qundef);
+ if (orig == rb_cBasicObject) {
+ rb_raise(rb_eTypeError, "can't copy the root class");
+ }
+ if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
+ rb_raise(rb_eTypeError, "already initialized class");
+ }
+ if (FL_TEST(orig, FL_SINGLETON)) {
+ rb_raise(rb_eTypeError, "can't copy singleton class");
+ }
+ return rb_mod_init_copy(clone, orig);
}
VALUE
-rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
+rb_singleton_class_clone(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);
if (BUILTIN_TYPE(obj) == T_CLASS) {
- RBASIC(clone)->klass = clone;
+ RBASIC(clone)->klass = (VALUE)clone;
}
else {
RBASIC(clone)->klass = rb_singleton_class_clone(klass);
}
RCLASS_SUPER(clone) = RCLASS_SUPER(klass);
- RCLASS_EXT(clone)->allocator = RCLASS_EXT(klass)->allocator;
if (RCLASS_IV_TBL(klass)) {
RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(klass));
}
- if (RCLASS_CONST_TBL(klass)) {
- RCLASS_CONST_TBL(clone) = st_init_numtable();
- st_foreach(RCLASS_CONST_TBL(klass), clone_const_i, (st_data_t)RCLASS_CONST_TBL(clone));
- }
- if (attach != Qundef) {
- rb_singleton_class_attached(clone, attach);
- }
RCLASS_M_TBL(clone) = st_init_numtable();
- st_foreach(RCLASS_M_TBL(klass), clone_method_i, (st_data_t)clone);
- rb_singleton_class_attached(RBASIC(clone)->klass, clone);
+ 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 clone;
+ return (VALUE)clone;
}
}
@@ -294,16 +253,8 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
* @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))
+#define META_CLASS_OF_CLASS_CLASS_P(k) (METACLASS_OF(k) == k)
-/*!
- * whether k has a metaclass
- * @retval 1 if \a k has a metaclass
- * @retval 0 otherwise
- */
-#define HAVE_METACLASS_P(k) \
- (FL_TEST(METACLASS_OF(k), FL_SINGLETON) && \
- rb_ivar_get(METACLASS_OF(k), id_attached) == (k))
/*!
* ensures \a klass belongs to its own eigenclass.
@@ -313,7 +264,7 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
* @note this macro creates a new eigenclass if necessary.
*/
#define ENSURE_EIGENCLASS(klass) \
- (HAVE_METACLASS_P(klass) ? METACLASS_OF(klass) : make_metaclass(klass))
+ (rb_ivar_get(METACLASS_OF(klass), id_attached) == klass ? METACLASS_OF(klass) : make_metaclass(klass))
/*!
@@ -493,7 +444,7 @@ rb_define_class(const char *name, VALUE super)
id = rb_intern(name);
if (rb_const_defined(rb_cObject, id)) {
klass = rb_const_get(rb_cObject, id);
- if (!RB_TYPE_P(klass, T_CLASS)) {
+ if (TYPE(klass) != T_CLASS) {
rb_raise(rb_eTypeError, "%s is not a class", name);
}
if (rb_class_real(RCLASS_SUPER(klass)) != super) {
@@ -560,7 +511,7 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
if (rb_const_defined_at(outer, id)) {
klass = rb_const_get_at(outer, id);
- if (!RB_TYPE_P(klass, T_CLASS)) {
+ if (TYPE(klass) != T_CLASS) {
rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
}
if (rb_class_real(RCLASS_SUPER(klass)) != super) {
@@ -611,7 +562,7 @@ rb_define_module(const char *name)
id = rb_intern(name);
if (rb_const_defined(rb_cObject, id)) {
module = rb_const_get(rb_cObject, id);
- if (RB_TYPE_P(module, T_MODULE))
+ if (TYPE(module) == T_MODULE)
return module;
rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
}
@@ -635,7 +586,7 @@ rb_define_module_id_under(VALUE outer, ID id)
if (rb_const_defined_at(outer, id)) {
module = rb_const_get_at(outer, id);
- if (RB_TYPE_P(module, T_MODULE))
+ if (TYPE(module) == T_MODULE)
return module;
rb_raise(rb_eTypeError, "%s::%s is not a module",
rb_class2name(outer), rb_obj_classname(module));
@@ -648,8 +599,8 @@ rb_define_module_id_under(VALUE outer, ID id)
return module;
}
-VALUE
-rb_include_class_new(VALUE module, VALUE super)
+static VALUE
+include_class_new(VALUE module, VALUE super)
{
VALUE klass = class_alloc(T_ICLASS, rb_cClass);
@@ -659,14 +610,10 @@ rb_include_class_new(VALUE module, VALUE super)
if (!RCLASS_IV_TBL(module)) {
RCLASS_IV_TBL(module) = st_init_numtable();
}
- if (!RCLASS_CONST_TBL(module)) {
- RCLASS_CONST_TBL(module) = st_init_numtable();
- }
RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
- RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
- RCLASS_M_TBL(klass) = RCLASS_M_TBL(RCLASS_ORIGIN(module));
+ RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
RCLASS_SUPER(klass) = super;
- if (RB_TYPE_P(module, T_ICLASS)) {
+ if (TYPE(module) == T_ICLASS) {
RBASIC(klass)->klass = RBASIC(module)->klass;
}
else {
@@ -678,11 +625,10 @@ rb_include_class_new(VALUE module, VALUE super)
return (VALUE)klass;
}
-static int include_modules_at(const VALUE klass, VALUE c, VALUE module);
-
void
rb_include_module(VALUE klass, VALUE module)
{
+ VALUE p, c;
int changed = 0;
rb_frozen_class_p(klass);
@@ -690,39 +636,17 @@ rb_include_module(VALUE klass, VALUE module)
rb_secure(4);
}
- if (!RB_TYPE_P(module, T_MODULE)) {
+ if (TYPE(module) != T_MODULE) {
Check_Type(module, T_MODULE);
}
OBJ_INFECT(klass, module);
-
- changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module);
- if (changed < 0)
- rb_raise(rb_eArgError, "cyclic include detected");
- if (changed) rb_clear_cache();
-}
-
-static int
-add_refined_method_entry_i(st_data_t key, st_data_t value, st_data_t data)
-{
- rb_add_refined_method_entry((VALUE) data, (ID) key);
- return ST_CONTINUE;
-}
-
-static int
-include_modules_at(const VALUE klass, VALUE c, VALUE module)
-{
- VALUE p;
- int changed = 0;
- const st_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
-
+ c = klass;
while (module) {
int superclass_seen = FALSE;
- if (RCLASS_ORIGIN(module) != module)
- goto skip;
- if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
- return -1;
+ if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
+ 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)) {
switch (BUILTIN_TYPE(p)) {
@@ -739,87 +663,12 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module)
break;
}
}
- c = RCLASS_SUPER(c) = rb_include_class_new(module, RCLASS_SUPER(c));
- if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
- VALUE refined_class =
- rb_refinement_module_get_refined_class(klass);
-
- st_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i,
- (st_data_t) refined_class);
- FL_SET(c, RMODULE_INCLUDED_INTO_REFINEMENT);
- }
- if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
- changed = 1;
- if (RMODULE_CONST_TBL(module) && RMODULE_CONST_TBL(module)->num_entries)
- changed = 1;
+ c = RCLASS_SUPER(c) = include_class_new(module, RCLASS_SUPER(c));
+ changed = 1;
skip:
module = RCLASS_SUPER(module);
}
-
- return changed;
-}
-
-static int
-move_refined_method(st_data_t key, st_data_t value, st_data_t data)
-{
- rb_method_entry_t *me = (rb_method_entry_t *) value;
- st_table *tbl = (st_table *) data;
-
- if (me->def->type == VM_METHOD_TYPE_REFINED) {
- if (me->def->body.orig_me) {
- rb_method_entry_t *orig_me = me->def->body.orig_me, *new_me;
- me->def->body.orig_me = NULL;
- new_me = ALLOC(rb_method_entry_t);
- *new_me = *me;
- st_add_direct(tbl, key, (st_data_t) new_me);
- *me = *orig_me;
- xfree(orig_me);
- return ST_CONTINUE;
- }
- else {
- st_add_direct(tbl, key, (st_data_t) me);
- return ST_DELETE;
- }
- }
- else {
- return ST_CONTINUE;
- }
-}
-
-void
-rb_prepend_module(VALUE klass, VALUE module)
-{
- void rb_vm_check_redefinition_by_prepend(VALUE klass);
- VALUE origin;
- int changed = 0;
-
- rb_frozen_class_p(klass);
- if (!OBJ_UNTRUSTED(klass)) {
- rb_secure(4);
- }
-
- Check_Type(module, T_MODULE);
-
- OBJ_INFECT(klass, module);
-
- origin = RCLASS_ORIGIN(klass);
- if (origin == klass) {
- origin = class_alloc(T_ICLASS, klass);
- RCLASS_SUPER(origin) = RCLASS_SUPER(klass);
- RCLASS_SUPER(klass) = origin;
- RCLASS_ORIGIN(klass) = origin;
- RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
- RCLASS_M_TBL(klass) = st_init_numtable();
- st_foreach(RCLASS_M_TBL(origin), move_refined_method,
- (st_data_t) RCLASS_M_TBL(klass));
- }
- changed = include_modules_at(klass, klass, module);
- if (changed < 0)
- rb_raise(rb_eArgError, "cyclic prepend detected");
- if (changed) {
- rb_clear_cache();
- rb_vm_check_redefinition_by_prepend(klass);
- }
+ if (changed) rb_clear_cache();
}
/*
@@ -844,13 +693,10 @@ rb_mod_included_modules(VALUE mod)
{
VALUE ary = rb_ary_new();
VALUE p;
- VALUE origin = RCLASS_ORIGIN(mod);
for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
- if (p != origin && BUILTIN_TYPE(p) == T_ICLASS) {
- VALUE m = RBASIC(p)->klass;
- if (RB_TYPE_P(m, T_MODULE))
- rb_ary_push(ary, m);
+ if (BUILTIN_TYPE(p) == T_ICLASS) {
+ rb_ary_push(ary, RBASIC(p)->klass);
}
}
return ary;
@@ -916,7 +762,7 @@ rb_mod_ancestors(VALUE mod)
if (BUILTIN_TYPE(p) == T_ICLASS) {
rb_ary_push(ary, RBASIC(p)->klass);
}
- else if (p == RCLASS_ORIGIN(p)) {
+ else {
rb_ary_push(ary, p);
}
}
@@ -948,65 +794,56 @@ ins_methods_push(ID name, long type, VALUE ary, long visi)
}
static int
-ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
+ins_methods_i(ID name, long type, VALUE ary)
{
- return ins_methods_push((ID)name, (long)type, (VALUE)ary, -1); /* everything but private */
+ return ins_methods_push(name, type, ary, -1); /* everything but private */
}
static int
-ins_methods_prot_i(st_data_t name, st_data_t type, st_data_t ary)
+ins_methods_prot_i(ID name, long type, VALUE ary)
{
- return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PROTECTED);
+ return ins_methods_push(name, type, ary, NOEX_PROTECTED);
}
static int
-ins_methods_priv_i(st_data_t name, st_data_t type, st_data_t ary)
+ins_methods_priv_i(ID name, long type, VALUE ary)
{
- return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PRIVATE);
+ return ins_methods_push(name, type, ary, NOEX_PRIVATE);
}
static int
-ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
+ins_methods_pub_i(ID name, long type, VALUE ary)
{
- return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PUBLIC);
+ return ins_methods_push(name, type, ary, NOEX_PUBLIC);
}
-struct method_entry_arg {
- st_table *list;
- int recur;
-};
-
static int
-method_entry_i(st_data_t key, st_data_t value, st_data_t data)
+method_entry(ID key, const rb_method_entry_t *me, st_table *list)
{
- const rb_method_entry_t *me = (const rb_method_entry_t *)value;
- struct method_entry_arg *arg = (struct method_entry_arg *)data;
long type;
- if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
- VALUE klass = me->klass;
- me = rb_resolve_refined_method(Qnil, me, NULL);
- if (!me) return ST_CONTINUE;
- if (!arg->recur && me->klass != klass) return ST_CONTINUE;
+ if (key == ID_ALLOCATOR) {
+ return ST_CONTINUE;
}
- if (!st_lookup(arg->list, key, 0)) {
+
+ if (!st_lookup(list, key, 0)) {
if (UNDEFINED_METHOD_ENTRY_P(me)) {
type = -1; /* none */
}
else {
type = VISI(me->flag);
}
- st_add_direct(arg->list, key, type);
+ st_add_direct(list, key, type);
}
return ST_CONTINUE;
}
static VALUE
-class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
+class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (ID, long, VALUE))
{
VALUE ary;
- int recur, prepended = 0;
- struct method_entry_arg me_arg;
+ int recur;
+ st_table *list;
if (argc == 0) {
recur = TRUE;
@@ -1017,22 +854,16 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func
recur = RTEST(r);
}
- if (!recur && RCLASS_ORIGIN(mod) != mod) {
- mod = RCLASS_ORIGIN(mod);
- prepended = 1;
- }
-
- me_arg.list = st_init_numtable();
- me_arg.recur = recur;
+ list = st_init_numtable();
for (; mod; mod = RCLASS_SUPER(mod)) {
- if (RCLASS_M_TBL(mod)) st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)&me_arg);
- if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
+ st_foreach(RCLASS_M_TBL(mod), method_entry, (st_data_t)list);
+ if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
if (!recur) break;
}
ary = rb_ary_new();
- st_foreach(me_arg.list, func, ary);
- st_free_table(me_arg.list);
+ st_foreach(list, func, ary);
+ st_free_table(list);
return ary;
}
@@ -1125,23 +956,21 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
/*
* call-seq:
- * obj.methods(all=true) -> array
+ * obj.methods -> array
*
- * Returns a list of the names of public and protected methods of
+ * Returns a list of the names of methods publicly accessible in
* <i>obj</i>. This will include all the methods accessible in
* <i>obj</i>'s ancestors.
- * If the <i>all</i> parameter is set to <code>false</code>, only those methods
- * in the receiver will be listed.
*
* class Klass
- * def klass_method()
+ * def kMethod()
* end
* end
* k = Klass.new
- * k.methods[0..9] #=> [:klass_method, :nil?, :===,
- * # :==~, :!, :eql?
- * # :hash, :<=>, :class, :singleton_class]
- * k.methods.length #=> 57
+ * k.methods[0..9] #=> [:kMethod, :freeze, :nil?, :is_a?,
+ * # :class, :instance_variable_set,
+ * # :methods, :extend, :__send__, :instance_eval]
+ * k.methods.length #=> 42
*/
VALUE
@@ -1149,6 +978,9 @@ rb_obj_methods(int argc, VALUE *argv, VALUE obj)
{
retry:
if (argc == 0) {
+ VALUE args[1];
+
+ args[0] = Qtrue;
return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_i);
}
else {
@@ -1244,9 +1076,8 @@ rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
VALUE
rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
{
- VALUE recur, ary, klass, origin;
- struct method_entry_arg me_arg;
- st_table *mtbl;
+ VALUE recur, ary, klass;
+ st_table *list;
if (argc == 0) {
recur = Qtrue;
@@ -1255,24 +1086,20 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
rb_scan_args(argc, argv, "01", &recur);
}
klass = CLASS_OF(obj);
- origin = RCLASS_ORIGIN(klass);
- me_arg.list = st_init_numtable();
- me_arg.recur = RTEST(recur);
+ list = st_init_numtable();
if (klass && FL_TEST(klass, FL_SINGLETON)) {
- if ((mtbl = RCLASS_M_TBL(origin)) != 0)
- st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg);
+ st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
klass = RCLASS_SUPER(klass);
}
if (RTEST(recur)) {
- while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
- if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0)
- st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg);
+ 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);
}
}
ary = rb_ary_new();
- st_foreach(me_arg.list, ins_methods_i, ary);
- st_free_table(me_arg.list);
+ st_foreach(list, ins_methods_i, ary);
+ st_free_table(list);
return ary;
}
@@ -1374,24 +1201,10 @@ rb_undef_method(VALUE klass, const char *name)
#define SPECIAL_SINGLETON(x,c) do {\
if (obj == (x)) {\
- return (c);\
+ return c;\
}\
} while (0)
-static inline VALUE
-special_singleton_class_of(VALUE obj)
-{
- SPECIAL_SINGLETON(Qnil, rb_cNilClass);
- SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
- SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
- return Qnil;
-}
-
-VALUE
-rb_special_singleton_class(VALUE obj)
-{
- return special_singleton_class_of(obj);
-}
/*!
* \internal
@@ -1407,20 +1220,14 @@ singleton_class_of(VALUE obj)
{
VALUE klass;
- if (FIXNUM_P(obj) || FLONUM_P(obj) || SYMBOL_P(obj)) {
+ if (FIXNUM_P(obj) || SYMBOL_P(obj)) {
rb_raise(rb_eTypeError, "can't define singleton");
}
- if (SPECIAL_CONST_P(obj)) {
- klass = special_singleton_class_of(obj);
- if (NIL_P(klass))
- rb_bug("unknown immediate %p", (void *)obj);
- return klass;
- }
- else {
- enum ruby_value_type type = BUILTIN_TYPE(obj);
- if (type == T_FLOAT || type == T_BIGNUM) {
- rb_raise(rb_eTypeError, "can't define singleton");
- }
+ if (rb_special_const_p(obj)) {
+ SPECIAL_SINGLETON(Qnil, rb_cNilClass);
+ SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
+ SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
+ rb_bug("unknown immediate %ld", obj);
}
if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
@@ -1472,7 +1279,7 @@ rb_singleton_class(VALUE obj)
VALUE klass = singleton_class_of(obj);
/* ensures an exposed class belongs to its own eigenclass */
- if (RB_TYPE_P(obj, T_CLASS)) (void)ENSURE_EIGENCLASS(klass);
+ if (TYPE(obj) == T_CLASS) ENSURE_EIGENCLASS(klass);
return klass;
}
@@ -1557,7 +1364,7 @@ rb_define_attr(VALUE klass, const char *name, int read, int write)
int
rb_obj_basic_to_s_p(VALUE obj)
{
- const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"), 0);
+ const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"));
if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC &&
me->def->body.cfunc.func == rb_any_to_s)
return 1;
@@ -1573,10 +1380,9 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
const char *p = fmt;
VALUE *var;
va_list vargs;
- int f_var = 0, f_hash = 0, f_block = 0;
+ int f_var = 0, f_block = 0;
int n_lead = 0, n_opt = 0, n_trail = 0, n_mand;
int argi = 0;
- VALUE hash = Qnil;
if (ISDIGIT(*p)) {
n_lead = *p - '0';
@@ -1600,10 +1406,6 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
}
}
block_arg:
- if (*p == ':') {
- f_hash = 1;
- p++;
- }
if (*p == '&') {
f_block = 1;
p++;
@@ -1618,23 +1420,6 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
va_start(vargs, fmt);
- /* capture an option hash - phase 1: pop */
- if (f_hash && n_mand < argc) {
- VALUE last = argv[argc - 1];
-
- if (NIL_P(last)) {
- /* nil is taken as an empty option hash only if it is not
- ambiguous; i.e. '*' is not specified and arguments are
- given more than sufficient */
- if (!f_var && n_mand + n_opt < argc)
- argc--;
- }
- else {
- hash = rb_check_hash_type(last);
- if (!NIL_P(hash))
- argc--;
- }
- }
/* capture leading mandatory arguments */
for (i = n_lead; i-- > 0; ) {
var = va_arg(vargs, VALUE *);
@@ -1671,11 +1456,6 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
if (var) *var = argv[argi];
argi++;
}
- /* capture an option hash - phase 2: assignment */
- if (f_hash) {
- var = va_arg(vargs, VALUE *);
- if (var) *var = hash;
- }
/* capture iterator block */
if (f_block) {
var = va_arg(vargs, VALUE *);
@@ -1688,12 +1468,18 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
}
va_end(vargs);
- if (argi < argc) {
- argc_error:
- rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
- }
+ if (argi < argc)
+ goto argc_error;
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 ? "+" : "");
}
/*!
diff --git a/common.mk b/common.mk
index 31b8700d2d..e572825d68 100644
--- a/common.mk
+++ b/common.mk
@@ -2,37 +2,29 @@ bin: $(PROGRAM) $(WPROGRAM)
lib: $(LIBRUBY)
dll: $(LIBRUBY_SO)
-.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+.SUFFIXES: .inc .h .c .y .i
-# V=0 quiet, V=1 verbose. other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO = $(ECHO1:0=@echo)
-
-RUBYLIB = $(PATH_SEPARATOR)
+RUBYLIB = -
RUBYOPT = -
-RUN_OPTS = --disable-gems
-SPEC_GIT_BASE = git://github.com/ruby
+SPEC_GIT_BASE = git://github.com/rubyspec
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
STATIC_RUBY = static-ruby
EXTCONF = extconf.rb
+RBCONFIG = ./.rbconfig.time
LIBRUBY_EXTS = ./.libruby-with-ext.time
REVISION_H = ./.revision.time
-PLATFORM_D = ./$(PLATFORM_DIR)/.time
RDOCOUT = $(EXTOUT)/rdoc
-CAPIOUT = doc/capi
+ID_H_TARGET = -id.h-
DMYEXT = dmyext.$(OBJEXT)
NORMALMAINOBJ = main.$(OBJEXT)
MAINOBJ = $(NORMALMAINOBJ)
-EXTOBJS =
+EXTOBJS =
DLDOBJS = $(DMYEXT)
-EXTSOLIBS =
MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
ENC_MK = enc.mk
@@ -89,28 +81,22 @@ COMMONOBJS = array.$(OBJEXT) \
iseq.$(OBJEXT) \
vm.$(OBJEXT) \
vm_dump.$(OBJEXT) \
- vm_backtrace.$(OBJEXT) \
- vm_trace.$(OBJEXT) \
thread.$(OBJEXT) \
cont.$(OBJEXT) \
$(BUILTIN_ENCOBJS) \
$(BUILTIN_TRANSOBJS) \
$(MISSING)
-EXPORTOBJS = $(DLNOBJ) \
+EXPORTOBJS = dln.$(OBJEXT) \
encoding.$(OBJEXT) \
version.$(OBJEXT) \
$(COMMONOBJS)
OBJS = $(EXPORTOBJS) prelude.$(OBJEXT)
-ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
-GEM_PRELUDE = $(srcdir)/gem_prelude.rb
-YES_GEM_PRELUDE = $(GEM_PRELUDE)
-NO_GEM_PRELUDE =
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
PRELUDES = prelude.c miniprelude.c
GOLFPRELUDES = golf_prelude.c
@@ -119,13 +105,12 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--mflags="$(MFLAGS)" \
--make-flags="$(MAKEFLAGS)"
EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
- --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --
-INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
+ --make-flags="MINIRUBY='$(MINIRUBY)'" --
+INSTRUBY = $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
--data-mode=$(INSTALL_DATA_MODE) \
--prog-mode=$(INSTALL_PROG_MODE) \
- --installed-list $(INSTALLED_LIST) \
- --mantype="$(MANTYPE)"
+ --installed-list $(INSTALLED_LIST)
INSTALL_PROG_MODE = 0755
INSTALL_DATA_MODE = 0644
@@ -141,79 +126,43 @@ BOOTSTRAPRUBY = $(BASERUBY)
COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
-all: showflags main docs
-
-main: showflags $(EXTSTATIC:static=lib)encs exts
- @$(NULLCMD)
-
-.PHONY: showflags
-exts enc trans: showflags
-showflags:
- $(MESSAGE_BEGIN) \
- " CC = $(CC)" \
- " LD = $(LD)" \
- " LDSHARED = $(LDSHARED)" \
- " CFLAGS = $(CFLAGS)" \
- " XCFLAGS = $(XCFLAGS)" \
- " CPPFLAGS = $(CPPFLAGS)" \
- " DLDFLAGS = $(DLDFLAGS)" \
- " SOLIBS = $(SOLIBS)" \
- $(MESSAGE_END)
-
-.PHONY: showconfig
-showconfig:
- @$(MESSAGE_BEGIN) \
- "$(configure_args)" \
- $(MESSAGE_END)
-
-exts: build-ext
+all: main docs
-EXTS_MK = exts.mk
-$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
- $(ECHO) generating makefile $@
- $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
+main: encs exts
+ @$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
-configure-ext: $(EXTS_MK)
+exts: $(MKMAIN_CMD)
-build-ext: $(EXTS_MK)
- $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)"
+$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+ @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
-$(MKMAIN_CMD): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
- $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
-
-prog: program wprogram
+prog: $(PROGRAM) $(WPROGRAM)
loadpath: $(PREP) PHONY
$(MINIRUBY) -e 'p $$:'
$(PREP): $(MKFILES)
-miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE) $(DTRACE_OBJ)
-
-objs: $(ALLOBJS)
+miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
GORUBY = go$(RUBY_INSTALL_NAME)
golf: $(LIBRUBY) $(GOLFOBJS) PHONY
- $(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
-capi: $(CAPIOUT)/.timestamp PHONY
-
-$(CAPIOUT)/.timestamp: Doxyfile $(PREP)
- $(Q) $(MAKEDIRS) "$(@D)"
- $(ECHO) generating capi
- $(Q) $(DOXYGEN) -b
- $(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){|f| f.puts(Time.now)}' "$@"
+ $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
+capi: doc/capi/.timestamp PHONY
+doc/capi/.timestamp: Doxyfile $(PREP)
+ @$(MAKEDIRS) doc/capi
+ @$(DOXYGEN)
+ $(MINIRUBY) -e 'File.open("doc/capi/.timestamp", "w"){|f| f.puts(Time.now)}'
Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
- $(ECHO) generating $@
- $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
+ $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
-program: showflags $(PROGRAM)
-wprogram: showflags $(WPROGRAM)
+program: $(PROGRAM)
-$(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
+$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
-$(LIBRUBY_A): $(OBJS) $(MAINOBJ) $(DTRACE_OBJ) $(DTRACE_GLOMMED_OBJ) $(DMYEXT) $(ARCHFILE)
+$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE)
$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
@@ -221,47 +170,45 @@ $(LIBRUBY_EXTS):
@exit > $@
$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
- $(Q)$(RM) $@
+ @$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
ruby.imp: $(EXPORTOBJS)
- $(Q)$(NM) -Pgp $(EXPORTOBJS) | \
+ @$(NM) -Pgp $(EXPORTOBJS) | \
awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
sort -u -o $@
install: install-$(INSTALLDOC)
docs: $(DOCTARGETS)
-pkgconfig-data: $(ruby_pc)
-$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
install-all: docs pre-install-all do-install-all post-install-all
pre-install-all:: pre-install-local pre-install-ext pre-install-doc
-do-install-all: all
+do-install-all: $(PROGRAM)
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
post-install-all:: post-install-local post-install-ext post-install-doc
@$(NULLCMD)
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: main
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
+do-install-nodoc: $(PREP)
+ $(INSTRUBY) --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: $(PROGRAM)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
+do-install-local: $(PREP)
+ $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
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: exts
+do-install-ext: $(PREP)
$(INSTRUBY) --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: main
+do-install-arch: $(PREP)
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
post-install-arch:: post-install-bin post-install-ext-arch
@@ -273,7 +220,7 @@ 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: $(PROGRAM)
+do-install-bin: $(PREP)
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
post-install-bin::
@$(NULLCMD)
@@ -287,14 +234,14 @@ post-install-lib::
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: exts
+do-install-ext-comm: $(PREP)
$(INSTRUBY) --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: exts
+do-install-ext-arch: $(PREP)
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
post-install-ext-arch::
@$(NULLCMD)
@@ -302,7 +249,7 @@ post-install-ext-arch::
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
+ $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
post-install-man::
@$(NULLCMD)
@@ -327,14 +274,14 @@ 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)
+ $(INSTRUBY) -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
+ $(INSTRUBY) -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
@@ -394,7 +341,7 @@ 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
+ $(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
post-no-install-man::
@$(NULLCMD)
@@ -405,21 +352,9 @@ do-install-doc: $(PROGRAM)
post-install-doc::
@$(NULLCMD)
-install-gem: pre-install-gem do-install-gem post-install-gem
-pre-install-gem:: pre-install-bin pre-install-lib pre-install-man
-do-install-gem: $(PROGRAM)
- $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=gem
-post-install-gem::
- @$(NULLCMD)
-
rdoc: PHONY main
@echo Generating RDoc documentation
- $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
-
-rdoc-coverage: PHONY main
- @echo Generating RDoc coverage report
- $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
-
+ $(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
nodoc: PHONY
what-where-doc: no-install-doc
@@ -432,129 +367,101 @@ post-no-install-doc::
CLEAR_INSTALLED_LIST = clear-installed-list
-install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake PHONY
+install-prereq: $(CLEAR_INSTALLED_LIST) PHONY
clear-installed-list: PHONY
@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
-clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
+clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
clean-local:: PHONY
- $(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
- $(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
- $(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+ @$(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
- $(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
+ @$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
clean-rdoc: PHONY
-clean-capi: PHONY
-clean-platform: PHONY
clean-extout: PHONY
-clean-docs: clean-rdoc clean-capi
+ @-$(RMDIRS) $(EXTOUT)/$(arch)
-distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
+distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
distclean-local:: clean-local
- $(Q)$(RM) $(MKFILES) yasmdata.rb *.inc
- $(Q)$(RM) config.cache config.status config.status.lineno
- $(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
+ @$(RM) $(MKFILES) rbconfig.rb yasmdata.rb encdb.h
+ @$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
+ @$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
distclean-ext:: PHONY
distclean-golf: clean-golf
- $(Q)$(RM) $(GOLFPRELUDES)
+ @$(RM) $(GOLFPRELUDES)
distclean-rdoc: PHONY
-distclean-capi: PHONY
distclean-extout: clean-extout
-distclean-platform: clean-platform
+ @-$(RMDIRS) $(EXTOUT)
realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
realclean-local:: distclean-local
- $(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
+ @$(RM) parse.c parse.h lex.c newline.c revision.h id.h
realclean-ext::
realclean-golf: distclean-golf
-realclean-capi: PHONY
realclean-extout: distclean-extout
-clean-ext distclean-ext realclean-ext::
- $(Q)$(RM) $(EXTS_MK)
-
-clean-enc distclean-enc realclean-enc: PHONY
+clean-enc distclean-enc realclean-enc:
+ @echo $(@:-enc=ing) encodings
+ @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
-check: main test test-all
- $(ECHO) check succeeded
+check: test test-all
check-ruby: test test-ruby
-fake: $(CROSS_COMPILING)-fake
-yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
-no-fake: PHONY
-
-btest: $(TEST_RUNNABLE)-btest
+btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
no-btest: PHONY
-yes-btest: fake miniruby$(EXEEXT) PHONY
- $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY)" $(OPTS) $(TESTOPTS)
+yes-btest: PHONY
+ $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
-btest-ruby: $(TEST_RUNNABLE)-btest-ruby
+btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
no-btest-ruby: PHONY
-yes-btest-ruby: prog PHONY
- $(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS) $(TESTOPTS)
+yes-btest-ruby: PHONY
+ @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
-test-sample: $(TEST_RUNNABLE)-test-sample
+test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
no-test-sample: PHONY
-yes-test-sample: prog PHONY
- $(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb $(OPTS) $(TESTOPTS)
+yes-test-sample: PHONY
+ @$(RUNRUBY) $(srcdir)/tool/rubytest.rb
test-knownbugs: test-knownbug
-test-knownbug: $(TEST_RUNNABLE)-test-knownbug
+test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
no-test-knownbug: PHONY
-yes-test-knownbug: prog PHONY
- -$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb
+yes-test-knownbug: PHONY
+ -$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
test: test-sample btest-ruby test-knownbug
test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: prog PHONY
- $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) $(TESTS)
-TESTS_BUILD = mkmf
no-test-all: PHONY
- $(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+yes-test-all: PHONY
+ $(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
test-ruby: $(TEST_RUNNABLE)-test-ruby
no-test-ruby: PHONY
-yes-test-ruby: prog encs PHONY
- $(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTOPTS) -- ruby -ext-
+yes-test-ruby: PHONY
+ $(RUNRUBY) "$(srcdir)/test/runner.rb" ruby
extconf: $(PREP)
- $(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
+ $(MAKEDIRS) "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
- $(Q)$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
+ @$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
-test-rubyspec-precheck:
-
-test-rubyspec: test-rubyspec-precheck
- $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
-
-RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
-runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
- $(Q) $(MINIRUBY) $(srcdir)/tool/mkrunnable.rb -v $(EXTOUT)
-yes-runnable: PHONY
-
encs: enc trans
-libencs: libenc libtrans
-encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP)
- $(ECHO) making $@
- $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
- RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
- $(MFLAGS) $@
+encs enc trans: $(ENC_MK) $(LIBRUBY) $(PREP)
+ $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
-
-libenc enc: {$(VPATH)}encdb.h
-libtrans trans: {$(VPATH)}transdb.h
+enc: {$(VPATH)}encdb.h
+trans: {$(VPATH)}transdb.h
$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
- $(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG)
- $(ECHO) generating $@
- $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(EXTSTATIC) $@ $(ENCS)
+ $(srcdir)/lib/mkmf.rb $(RBCONFIG)
+ $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS)
.PRECIOUS: $(MKFILES)
@@ -570,18 +477,16 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc
PHONY:
-{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed {$(VPATH)}id.h
-{$(VPATH)}parse.h: {$(VPATH)}parse.c
+{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
+parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
{$(srcdir)}.y.c:
- $(ECHO) generating $@
- $(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
- $(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
- $(Q)$(RM) parse.tmp.y
- $(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!parse\.tmp\.[iy]!parse.y!" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
- $(Q)$(MV) $@.new $@
- $(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h)
- $(Q)$(RM) y.tab.c y.tab.h
+ $(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
acosh.$(OBJEXT): {$(VPATH)}acosh.c
alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
@@ -593,12 +498,9 @@ flock.$(OBJEXT): {$(VPATH)}flock.c
memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
memmove.$(OBJEXT): {$(VPATH)}memmove.c
mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c {$(VPATH)}util.h $(RUBY_H_INCLUDES)
strchr.$(OBJEXT): {$(VPATH)}strchr.c
strdup.$(OBJEXT): {$(VPATH)}strdup.c
strerror.$(OBJEXT): {$(VPATH)}strerror.c
-strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
-strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
strstr.$(OBJEXT): {$(VPATH)}strstr.c
strtod.$(OBJEXT): {$(VPATH)}strtod.c
strtol.$(OBJEXT): {$(VPATH)}strtol.c
@@ -608,106 +510,87 @@ dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
ia64.$(OBJEXT): {$(VPATH)}ia64.s
$(CC) $(CFLAGS) -c $<
-$(PLATFORM_D):
- $(Q) $(MAKEDIRS) $(PLATFORM_DIR)
- @exit > $@
+win32.$(OBJEXT): {$(VPATH)}win32.c $(RUBY_H_INCLUDES)
###
RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
- {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
- {$(VPATH)}subst.h
+ {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h
ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
-PROBES_H_INCLUDES = {$(VPATH)}probes.h
-VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
- {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
- {$(VPATH)}vm_debug.h {$(VPATH)}id.h
-
-addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
-array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}id.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- {$(VPATH)}thread.h {$(VPATH)}internal.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)}internal.h {$(VPATH)}constant.h
+ $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
-complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}internal.h
+complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES)
dir.$(OBJEXT): {$(VPATH)}dir.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- $(ENCODING_H_INCLUDES) \
- {$(VPATH)}internal.h
+ $(ENCODING_H_INCLUDES)
dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
dln_find.$(OBJEXT): {$(VPATH)}dln_find.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c $(RUBY_H_INCLUDES)
+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 {$(VPATH)}internal.h
+ {$(VPATH)}encoding.c
encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h \
- {$(VPATH)}internal.h
+ $(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h
enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
- {$(VPATH)}util.h {$(VPATH)}id.h
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}internal.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) $(ENCODING_H_INCLUDES) \
- {$(VPATH)}internal.h
+ {$(VPATH)}debug.h
eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h {$(VPATH)}vm.h \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \
- {$(VPATH)}eval_jump.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
- $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
+ {$(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)}internal.h $(PROBES_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 \
- {$(VPATH)}internal.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)}internal.h {$(VPATH)}constant.h \
- {$(VPATH)}thread.h $(PROBES_H_INCLUDES)
-hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
-inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}internal.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 \
- {$(VPATH)}internal.h {$(VPATH)}thread.h {$(VPATH)}id.h
-main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h {$(VPATH)}vm_debug.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 {$(VPATH)}internal.h
-math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}internal.h
+ $(ENCODING_H_INCLUDES) {$(VPATH)}util.h
+math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES)
node.$(OBJEXT): {$(VPATH)}node.c $(RUBY_H_INCLUDES) \
$(VM_CORE_H_INCLUDES)
numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}id.h
-object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- {$(VPATH)}internal.h {$(VPATH)}constant.h $(ENCODING_H_INCLUDES) $(PROBES_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) {$(VPATH)}id.h {$(VPATH)}regenc.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 {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
+ {$(VPATH)}parse.h
proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
$(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
- {$(VPATH)}internal.h {$(VPATH)}iseq.h
+ {$(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)}internal.h \
- {$(VPATH)}thread.h
-random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}siphash.c {$(VPATH)}siphash.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) {$(VPATH)}internal.h {$(VPATH)}id.h
-rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
+ $(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 {$(VPATH)}internal.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)
@@ -724,114 +607,84 @@ 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)}internal.h
-safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) $(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)
+ $(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 $(RUBY_H_INCLUDES)
-strftime.$(OBJEXT): {$(VPATH)}strftime.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}timev.h $(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) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
-struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.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)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
- {$(VPATH)}internal.h {$(VPATH)}io.h {$(VPATH)}thread.h
+ {$(VPATH)}debug.h {$(VPATH)}thread_$(THREAD_MODEL).c
transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) {$(VPATH)}transcode_data.h {$(VPATH)}internal.h
+ $(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)}internal.h
+ {$(VPATH)}debug.h
time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
- $(ENCODING_H_INCLUDES) {$(VPATH)}timev.h {$(VPATH)}internal.h
-util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
- {$(VPATH)}internal.h
+ $(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 {$(VPATH)}internal.h {$(VPATH)}constant.h
+ {$(VPATH)}oniguruma.h
version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h \
- verconf.h
+ {$(VPATH)}version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h
dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
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)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc \
- {$(VPATH)}internal.h
+ {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc {$(VPATH)}debug.h \
+ {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc
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)}internal.h
+ {$(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)}internal.h {$(VPATH)}vm.h {$(VPATH)}constant.h \
- $(PROBES_H_INCLUDES) {$(VPATH)}probes_helper.h
+ {$(VPATH)}vm.inc {$(VPATH)}insns.inc {$(VPATH)}debug.h
vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}addr2line.h \
- {$(VPATH)}internal.h
+ $(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
-id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}vm_opts.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \
- $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
- {$(VPATH)}internal.h {$(VPATH)}iseq.h {$(VPATH)}debug.h
-vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c $(ENCODING_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
- {$(VPATH)}internal.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)}internal.h
+ $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h
+ $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
- $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h
+ $(VM_CORE_H_INCLUDES) {$(VPATH)}debug.h
goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
- {$(VPATH)}vm_debug.h {$(VPATH)}node.h
+ {$(VPATH)}debug.h {$(VPATH)}node.h
ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
- {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+ {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h \
- {$(VPATH)}config.h {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+ {$(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 {$(VPATH)}enc/unicode/casefold.h \
- {$(VPATH)}subst.h $(RUBY_H_INCLUDES)
+ {$(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)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
-
-win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c $(RUBY_H_INCLUDES) $(PLATFORM_D)
-win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D)
+ {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
- $(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
-newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.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 {$(VPATH)}subst.h
-
-DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
- eval.$(OBJEXT) \
- gc.$(OBJEXT) \
- hash.$(OBJEXT) \
- load.$(OBJEXT) \
- object.$(OBJEXT) \
- parse.$(OBJEXT) \
- string.$(OBJEXT) \
- vm.$(OBJEXT)
-
-probes.$(OBJEXT): $(DTRACE_DEPENDENT_OBJS)
-ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ)
-
-$(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h
+ {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h
INSNS2VMOPT = --srcdir="$(srcdir)"
@@ -851,72 +704,48 @@ INSNS2VMOPT = --srcdir="$(srcdir)"
{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c srcs-ext srcs-enc
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c srcs-ext srcs-enc
-EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \
- $(srcdir)/ext/dl/callback/callback.c
+EXT_SRCS = $(srcdir)/ext/ripper/ripper.c
srcs-ext: $(EXT_SRCS)
srcs-enc: $(ENC_MK)
- $(ECHO) making srcs under enc
- $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+ $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
-all-incs: incs
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 {$(VPATH)}id.h {$(VPATH)}probes.dmyh
+ $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h
insns: $(INSNS)
-id.h: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def
- $(ECHO) generating $@
- $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
- $(srcdir)/template/$@.tmpl
-
-id.c: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def
- $(ECHO) generating $@
- $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
- $(srcdir)/template/$@.tmpl
+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
- $(ECHO) generating $@
- $(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
+ $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
- $(ECHO) generating $@
- $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
+ $(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
- $(ECHO) generating $@
- $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
-
-enc/encinit.c: $(ENC_MK) $(srcdir)/enc/encinit.c.erb
+ $(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
- $(ECHO) generating $@
- $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(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
- $(ECHO) generating $@
- $(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+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 \
- $(srcdir)/lib/rubygems/core_ext/kernel_gem.rb \
+ $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \
$(PRELUDE_SCRIPTS) $(PREP)
- $(ECHO) generating $@
- $(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+ $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
- $(ECHO) generating $@
- $(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
+ $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
-probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
- $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
-
-probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
-
-prereq: incs srcs preludes PHONY
+prereq: incs srcs preludes
preludes: {$(VPATH)}miniprelude.c
preludes: {$(srcdir)}golf_prelude.c
@@ -925,52 +754,40 @@ $(srcdir)/revision.h:
@exit > $@
$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
- -$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > revision.tmp
- $(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
-
-$(srcdir)/ext/ripper/ripper.c: parse.y
- $(ECHO) generating $@
- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
- Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
+ @-$(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > "$(srcdir)/revision.tmp"
+ @$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" "$(srcdir)/revision.tmp"
-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
- $(ECHO) generating $@
- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
-
-$(srcdir)/ext/dl/callback/callback.c: $(srcdir)/ext/dl/callback/mkcallback.rb $(srcdir)/ext/dl/dl.h
- $(ECHO) generating $@
- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
- Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
+$(EXT_SRCS):
+ $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. RUBY="$(BASERUBY)"
##
-run: fake miniruby$(EXEEXT) PHONY
- $(BTESTRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
+run: miniruby$(EXEEXT) PHONY
+ $(MINIRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
runruby: $(PROGRAM) PHONY
$(RUNRUBY) $(TESTRUN_SCRIPT)
-parse: fake miniruby$(EXEEXT) PHONY
- $(BTESTRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
+parse: miniruby$(EXEEXT) PHONY
+ $(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
COMPARE_RUBY = $(BASERUBY)
-ITEM =
-OPTS =
+ITEM =
+OPTS =
benchmark: $(PROGRAM) PHONY
$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
- --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+ --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
--pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
benchmark-each: $(PROGRAM) PHONY
$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
- --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+ --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
--pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
tbench: $(PROGRAM) PHONY
$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
- --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+ --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
--pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
run.gdb:
@@ -980,24 +797,19 @@ run.gdb:
echo '# b rb_longjmp' >> run.gdb
echo source $(srcdir)/breakpoints.gdb >> run.gdb
echo source $(srcdir)/.gdbinit >> run.gdb
- echo 'set $$_exitcode = -999' >> run.gdb
echo run >> run.gdb
- echo 'if $$_exitcode != -999' >> run.gdb
- echo ' quit' >> run.gdb
- echo end >> run.gdb
-
gdb: miniruby$(EXEEXT) run.gdb PHONY
gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
gdb-ruby: $(PROGRAM) run.gdb PHONY
- $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
+ gdb -x run.gdb --quiet --args $(PROGRAM) $(TESTRUN_SCRIPT)
dist:
$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
up::
- -$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
+ -@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
info: info-program info-libruby_a info-libruby_so info-arch
info-program:
@@ -1009,44 +821,30 @@ info-libruby_so:
info-arch:
@echo arch=$(arch)
-change: PHONY
- $(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
-
-love: sudo-precheck up all test install test-all
- @echo love is all you need
-
-sudo-precheck:
- @$(SUDO) echo > $(NULL)
-
help: PHONY
- $(MESSAGE_BEGIN) \
- " Makefile of Ruby" \
- "" \
- "targets:" \
- " all (default): builds all of below" \
- " miniruby: builds only miniruby" \
- " encs: builds encodings" \
- " exts: builds extensions" \
- " main: builds encodings, extensions and ruby" \
- " docs: builds documents" \
- " run: runs test.rb by miniruby" \
- " runruby: runs test.rb by ruby you just built" \
- " gdb: runs test.rb by miniruby under gdb" \
- " gdb-ruby: runs test.rb by ruby under gdb" \
- " check: equals make test test-all" \
- " test: ruby core tests" \
- " test-all: all ruby tests" \
- " test-rubyspec: run RubySpec test suite" \
- " update-rubyspec: update local copy of RubySpec" \
- " benchmark: benchmark this ruby and COMPARE_RUBY" \
- " install: install all ruby distributions" \
- " install-nodoc: install without rdoc" \
- " install-cross: install cross compiling staff" \
- " clean: clean for tarball" \
- " distclean: clean for repository" \
- " change: make change log template" \
- " golf: for golfers" \
- "" \
- "see DeveloperHowto for more detail: " \
- " http://bugs.ruby-lang.org/wiki/ruby/DeveloperHowto" \
- $(MESSAGE_END)
+ @echo " Makefile of Ruby"
+ @echo ""
+ @echo "targets:"
+ @echo " all (default): builds all of below"
+ @echo " miniruby: builds only miniruby"
+ @echo " encs: builds encodings"
+ @echo " exts: builds extensions"
+ @echo " main: builds encodings, extensions and ruby"
+ @echo " docs: builds documents"
+ @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 " 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 " benchmark benchmark this ruby and COMPARE_RUBY"
+ @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"
diff --git a/compar.c b/compar.c
index 63703230bb..65def78484 100644
--- a/compar.c
+++ b/compar.c
@@ -20,7 +20,7 @@ rb_cmperr(VALUE x, VALUE y)
{
const char *classname;
- if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
+ if (SPECIAL_CONST_P(y)) {
y = rb_inspect(y);
classname = StringValuePtr(y);
}
@@ -32,36 +32,9 @@ rb_cmperr(VALUE x, VALUE y)
}
static VALUE
-invcmp_recursive(VALUE x, VALUE y, int recursive)
-{
- if (recursive) return Qnil;
- return rb_check_funcall(y, cmp, 1, &x);
-}
-
-VALUE
-rb_invcmp(VALUE x, VALUE y)
-{
- VALUE invcmp = rb_exec_recursive(invcmp_recursive, x, y);
- if (invcmp == Qundef || NIL_P(invcmp)) {
- return Qnil;
- }
- else {
- int result = -rb_cmpint(invcmp, x, y);
- return INT2FIX(result);
- }
-}
-
-static VALUE
-cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive)
-{
- if (recursive) return Qfalse;
- return rb_funcall(arg1, cmp, 1, arg2);
-}
-
-static VALUE
cmp_eq(VALUE *a)
{
- VALUE c = rb_exec_recursive_paired_outer(cmp_eq_recursive, a[0], a[1], a[1]);
+ VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
if (NIL_P(c)) return Qfalse;
if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
@@ -81,9 +54,6 @@ cmp_failed(void)
* 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.
- *
- * Even if _obj_ <=> _other_ raised an exception, the exception
- * is ignoread and returns false.
*/
static VALUE
diff --git a/compile.c b/compile.c
index 7dba662466..1e8c09c929 100644
--- a/compile.c
+++ b/compile.c
@@ -10,8 +10,6 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "internal.h"
-#include <math.h>
#define USE_INSN_STACK_INCREASE 1
#include "vm_core.h"
@@ -25,10 +23,10 @@
typedef struct iseq_link_element {
enum {
- ISEQ_ELEMENT_NONE,
- ISEQ_ELEMENT_LABEL,
- ISEQ_ELEMENT_INSN,
- ISEQ_ELEMENT_ADJUST
+ 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;
@@ -51,7 +49,7 @@ typedef struct iseq_label_data {
typedef struct iseq_insn_data {
LINK_ELEMENT link;
enum ruby_vminsn_type insn_id;
- unsigned int line_no;
+ int line_no;
int operand_size;
int sc_state;
VALUE *operands;
@@ -98,37 +96,39 @@ struct iseq_compile_data_ensure_node_stack {
#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)
+ 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)))
+ 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)))
+ 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)))
+ 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)))
+ 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)))
+ 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)), \
+ (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)node), gl_node_level)), \
gl_node_level++)
-#define debug_node_end() gl_node_level --
+#define debug_node_end() gl_node_level --;
#else
@@ -154,8 +154,9 @@ r_value(VALUE value)
#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))
+#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)
@@ -163,61 +164,63 @@ r_value(VALUE value)
/* create new label */
-#define NEW_LABEL(l) new_label_body(iseq, (l))
+#define NEW_LABEL(l) new_label_body(iseq, l)
-#define iseq_path(iseq) \
- (((rb_iseq_t*)DATA_PTR(iseq))->location.path)
+#define iseq_filename(iseq) \
+ (((rb_iseq_t*)DATA_PTR(iseq))->filename)
-#define iseq_absolute_path(iseq) \
- (((rb_iseq_t*)DATA_PTR(iseq))->location.absolute_path)
+#define iseq_filepath(iseq) \
+ (((rb_iseq_t*)DATA_PTR(iseq))->filepath)
#define NEW_ISEQVAL(node, name, type, line_no) \
- new_child_iseq(iseq, (node), (name), 0, (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))
+ new_child_iseq(iseq, node, name, iseq->self, type, line_no)
/* add instructions */
#define ADD_SEQ(seq1, seq2) \
- APPEND_LIST((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_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)))
-
-/* add an instruction with label operand (alias of ADD_INSN1) */
-#define ADD_INSNL(seq, line, insn, label) ADD_INSN1(seq, line, insn, label)
+ 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)))
+ 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)))
+ 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))
+ ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(0))
#define ADD_CALL_RECEIVER(seq, line) \
- ADD_INSN((seq), (line), putself)
+ 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))
+ 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))
+ 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)))
+ 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 { \
@@ -225,49 +228,46 @@ r_value(VALUE value)
(line) != iseq->compile_data->last_coverable_line) { \
RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
iseq->compile_data->last_coverable_line = (line); \
- ADD_INSN1((seq), (line), trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
+ ADD_INSN1(seq, line, trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
} \
if (iseq->compile_data->option->trace_instruction) { \
- ADD_INSN1((seq), (line), trace, INT2FIX(event)); \
+ ADD_INSN1(seq, line, trace, INT2FIX(event)); \
} \
- } while (0)
+ }while(0);
/* add label */
#define ADD_LABEL(seq, label) \
- ADD_ELEM((seq), (LINK_ELEMENT *) (label))
-
-#define APPEND_LABEL(seq, before, label) \
- APPEND_ELEM((seq), (before), (LINK_ELEMENT *) (label))
+ ADD_ELEM(seq, (LINK_ELEMENT *) label)
#define ADD_ADJUST(seq, line, label) \
- ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), (line)))
+ 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))
+ 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), \
+ rb_ary_new3(5, type, \
(VALUE)(ls) | 1, (VALUE)(le) | 1, \
- (VALUE)(iseqv), (VALUE)(lc) | 1)))
+ iseqv, (VALUE)(lc) | 1)))
/* compile node */
#define COMPILE(anchor, desc, node) \
(debug_compile("== " desc "\n", \
- iseq_compile_each(iseq, (anchor), (node), 0)))
+ iseq_compile_each(iseq, anchor, node, 0)))
/* compile node, this node's value will be popped */
#define COMPILE_POPED(anchor, desc, node) \
(debug_compile("== " desc "\n", \
- iseq_compile_each(iseq, (anchor), (node), 1)))
+ iseq_compile_each(iseq, anchor, node, 1)))
/* compile node, which is popped when 'poped' is true */
#define COMPILE_(anchor, desc, node, poped) \
(debug_compile("== " desc "\n", \
- iseq_compile_each(iseq, (anchor), (node), (poped))))
+ iseq_compile_each(iseq, anchor, node, poped)))
#define OPERAND_AT(insn, idx) \
- (((INSN*)(insn))->operands[(idx)])
+ (((INSN*)(insn))->operands[idx])
#define INSN_OF(insn) \
(((INSN*)(insn))->insn_id)
@@ -328,6 +328,8 @@ 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, int 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, int line);
@@ -379,7 +381,7 @@ verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
#endif
}
#if CPDEBUG < 0
-#define verify_list(info, anchor) verify_list(iseq, (info), (anchor))
+#define verify_list(info, anchor) verify_list(iseq, info, anchor)
#endif
/*
@@ -393,35 +395,20 @@ ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
anchor->last = elem;
verify_list("add", anchor);
}
-
-/*
- * elem1, before, elem2 => elem1, before, elem, elem2
- */
-static void
-APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
-{
- elem->prev = before;
- elem->next = before->next;
- elem->next->prev = elem;
- before->next = elem;
- if (before == anchor->last) anchor->last = elem;
- verify_list("add", anchor);
-}
#if CPDEBUG < 0
-#define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, (anchor), (elem))
-#define APPEND_ELEM(anchor, before, elem) ADD_ELEM(iseq, (anchor), (before), (elem))
+#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_iseq_add_mark_object(iseq, v);
+ rb_ary_push(iseq->mark_ary, v);
}
return COMPILE_OK;
}
-#define ruby_sourcefile RSTRING_PTR(iseq->location.path)
+#define ruby_sourcefile RSTRING_PTR(iseq->filename)
static int
iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
@@ -432,31 +419,6 @@ iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
return COMPILE_OK;
}
-static int
-validate_label(st_data_t name, st_data_t label, st_data_t arg)
-{
- rb_iseq_t *iseq = (rb_iseq_t *)arg;
- LABEL *lobj = (LABEL *)label;
- if (!lobj->link.next) {
- do {
- int ret;
- COMPILE_ERROR((ruby_sourcefile, lobj->position,
- "%s: undefined label", rb_id2name((ID)name)));
- if (ret) break;
- } while (0);
- }
- return ST_CONTINUE;
-}
-
-static void
-validate_labels(rb_iseq_t *iseq, st_table *labels_table)
-{
- st_foreach(labels_table, validate_label, (st_data_t)iseq);
- if (!NIL_P(iseq->compile_data->err_info)) {
- rb_exc_raise(iseq->compile_data->err_info);
- }
-}
-
VALUE
rb_iseq_compile_node(VALUE self, NODE *node)
{
@@ -475,36 +437,31 @@ rb_iseq_compile_node(VALUE self, NODE *node)
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_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL);
- ADD_LABEL(ret, start);
- COMPILE(ret, "block body", node->nd_body);
- ADD_LABEL(ret, end);
- ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
-
- /* 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->location.first_lineno), 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->location.first_lineno), RUBY_EVENT_CALL);
- COMPILE(ret, "scoped node", node->nd_body);
- ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
- break;
- }
+ 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;
@@ -540,18 +497,13 @@ rb_iseq_compile_node(VALUE self, NODE *node)
}
if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
- ADD_INSN2(ret, 0, getlocal, INT2FIX(2), INT2FIX(0));
+ 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);
}
-#if SUPPORT_JOKE
- if (iseq->compile_data->labels_table) {
- validate_labels(iseq, iseq->compile_data->labels_table);
- }
-#endif
return iseq_setup(iseq, ret);
}
@@ -559,7 +511,12 @@ 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);
@@ -581,72 +538,18 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
/* definition of data structure for compiler */
/*********************************************/
-/*
- * On 32-bit SPARC, GCC by default generates SPARC V7 code that may require
- * 8-byte word alignment. On the other hand, Oracle Solaris Studio seems to
- * generate SPARCV8PLUS code with unaligned memory accesss instructions.
- * That is why the STRICT_ALIGNMENT is defined only with GCC.
- */
-#if defined(__sparc) && SIZEOF_VOIDP == 4 && defined(__GNUC__)
- #define STRICT_ALIGNMENT
-#endif
-
-#ifdef STRICT_ALIGNMENT
- #if defined(HAVE_TRUE_LONG_LONG) && SIZEOF_LONG_LONG > SIZEOF_VALUE
- #define ALIGNMENT_SIZE SIZEOF_LONG_LONG
- #else
- #define ALIGNMENT_SIZE SIZEOF_VALUE
- #endif
- #define PADDING_SIZE_MAX ((size_t)((ALIGNMENT_SIZE) - 1))
- #define ALIGNMENT_SIZE_MASK PADDING_SIZE_MAX
- /* Note: ALIGNMENT_SIZE == (2 ** N) is expected. */
-#else
- #define PADDING_SIZE_MAX 0
-#endif /* STRICT_ALIGNMENT */
-
-#ifdef STRICT_ALIGNMENT
-/* calculate padding size for aligned memory access */
-static size_t
-calc_padding(void *ptr, size_t size)
-{
- size_t mis;
- size_t padding = 0;
-
- mis = (size_t)ptr & ALIGNMENT_SIZE_MASK;
- if (mis > 0) {
- padding = ALIGNMENT_SIZE - mis;
- }
-/*
- * On 32-bit sparc or equivalents, when a single VALUE is requested
- * and padding == sizeof(VALUE), it is clear that no padding is needed.
- */
-#if ALIGNMENT_SIZE > SIZEOF_VALUE
- if (size == sizeof(VALUE) && padding == sizeof(VALUE)) {
- padding = 0;
- }
-#endif
-
- return padding;
-}
-#endif /* STRICT_ALIGNMENT */
-
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;
-#ifdef STRICT_ALIGNMENT
- size_t padding = calc_padding((void *)&storage->buff[storage->pos], size);
-#else
- const size_t padding = 0; /* expected to be optimized by compiler */
-#endif /* STRICT_ALIGNMENT */
- if (storage->pos + size + padding > storage->size) {
+ if (storage->pos + size > storage->size) {
unsigned long alloc_size = storage->size * 2;
retry:
- if (alloc_size < size + PADDING_SIZE_MAX) {
+ if (alloc_size < size) {
alloc_size *= 2;
goto retry;
}
@@ -658,15 +561,8 @@ compile_data_alloc(rb_iseq_t *iseq, size_t size)
storage->pos = 0;
storage->size = alloc_size;
storage->buff = (char *)(&storage->buff + 1);
-#ifdef STRICT_ALIGNMENT
- padding = calc_padding((void *)&storage->buff[storage->pos], size);
-#endif /* STRICT_ALIGNMENT */
}
-#ifdef STRICT_ALIGNMENT
- storage->pos += (int)padding;
-#endif /* STRICT_ALIGNMENT */
-
ptr = (void *)&storage->buff[storage->pos];
storage->pos += size;
return ptr;
@@ -769,7 +665,7 @@ POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
return elem;
}
#if CPDEBUG < 0
-#define POP_ELEMENT(anchor) POP_ELEMENT(iseq, (anchor))
+#define POP_ELEMENT(anchor) POP_ELEMENT(iseq, anchor)
#endif
#if 0 /* unused */
@@ -827,7 +723,7 @@ APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
verify_list("append", anc1);
}
#if CPDEBUG < 0
-#define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, (anc1), (anc2))
+#define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, anc1, anc2)
#endif
/*
@@ -856,7 +752,7 @@ INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
verify_list("append", anc1);
}
#if CPDEBUG < 0
-#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, (anc1), (anc2))
+#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, anc1, anc2)
#endif
#if 0 /* unused */
@@ -880,7 +776,7 @@ SWAP_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
verify_list("swap2", anc2);
}
#if CPDEBUG < 0
-#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, (anc1), (anc2))
+#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, anc1, anc2)
#endif
static LINK_ANCHOR *
@@ -914,7 +810,7 @@ REVERSE_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc)
return anc;
}
#if CPDEBUG < 0
-#define REVERSE_LIST(anc) REVERSE_LIST(iseq, (anc))
+#define REVERSE_LIST(anc) REVERSE_LIST(iseq, anc)
#endif
#endif
@@ -937,7 +833,7 @@ debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
verify_list("debug list", anchor);
}
#if CPDEBUG < 0
-#define debug_list(anc) debug_list(iseq, (anc))
+#define debug_list(anc) debug_list(iseq, anc)
#endif
#endif
@@ -1001,52 +897,31 @@ new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
return new_insn_core(iseq, line_no, insn_id, argc, operands);
}
-static rb_call_info_t *
-new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned long flag)
-{
- rb_call_info_t *ci = (rb_call_info_t *)compile_data_alloc(iseq, sizeof(rb_call_info_t));
- ci->mid = mid;
- ci->flag = flag;
- ci->orig_argc = argc;
- ci->argc = argc;
-
- if (block) {
- GetISeqPtr(block, ci->blockiseq);
- }
- else {
- ci->blockiseq = 0;
- if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG))) {
- ci->flag |= VM_CALL_ARGS_SKIP_SETUP;
- }
- }
- ci->vmstat = 0;
- ci->blockptr = 0;
- ci->recv = Qundef;
- ci->call = 0; /* TODO: should set default function? */
-
- ci->aux.index = iseq->callinfo_size++;
-
- return ci;
-}
-
static INSN *
-new_insn_send(rb_iseq_t *iseq, int line_no, VALUE id, VALUE argc, VALUE block, VALUE flag)
+new_insn_send(rb_iseq_t *iseq, int line_no,
+ VALUE id, VALUE argc, VALUE block, VALUE flag)
{
- VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 1);
- operands[0] = (VALUE)new_callinfo(iseq, SYM2ID(id), FIX2INT(argc), block, FIX2INT(flag));
- return new_insn_core(iseq, line_no, BIN(send), 1, operands);
+ INSN *iobj = 0;
+ VALUE *operands =
+ (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 5);
+ operands[0] = id;
+ operands[1] = argc;
+ operands[2] = block;
+ operands[3] = flag;
+ operands[4] = INT2FIX(iseq->ic_size++);
+ iobj = new_insn_core(iseq, line_no, BIN(send), 5, operands);
+ return iobj;
}
static VALUE
new_child_iseq(rb_iseq_t *iseq, NODE *node,
- VALUE name, VALUE parent, enum iseq_type type, int line_no)
+ 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_path(iseq->self), iseq_absolute_path(iseq->self),
- INT2FIX(line_no), parent, type, iseq->compile_data->option);
+ ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self), iseq_filepath(iseq->self), INT2FIX(line_no),
+ parent, type, iseq->compile_data->option);
debugs("[new_child_iseq]< ---------------------------------------\n");
iseq_add_mark_object(iseq, ret);
return ret;
@@ -1118,17 +993,6 @@ iseq_set_exception_local_table(rb_iseq_t *iseq)
}
static int
-get_lvar_level(rb_iseq_t *iseq)
-{
- int lev = 0;
- while (iseq != iseq->local_iseq) {
- lev++;
- iseq = iseq->parent_iseq;
- }
- return lev;
-}
-
-static int
get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
{
int i;
@@ -1182,34 +1046,52 @@ 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) {
- struct rb_args_info *args = node_args->nd_ainfo;
+ 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 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, next ->]
+ * init arg:
+ * NODE_AND(m_init, p_init)
+ * if "r" is 1, it's means "{|x,|}" type block parameter.
+ */
- iseq->argc = (int)args->pre_args_num;
+ iseq->argc = (int)node_args->nd_frml;
debugs(" - argc: %d\n", iseq->argc);
- rest_id = args->rest_arg;
- if (rest_id == 1) {
- last_comma = 1;
- rest_id = 0;
- }
- block_id = args->block_arg;
-
- if (args->first_post_arg) {
- iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg);
- iseq->arg_post_len = args->post_args_num;
+ 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 (args->opt_args) {
- NODE *node = args->opt_args;
+ if (node_opt) {
+ NODE *node = node_opt;
LABEL *label;
VALUE labels = rb_ary_tmp_new(1);
int i = 0, j;
@@ -1241,41 +1123,13 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
iseq->arg_opts = 0;
}
- if (args->kw_args) {
- NODE *node = args->kw_args;
- VALUE keywords = rb_ary_tmp_new(1);
- int i = 0, j;
-
- iseq->arg_keyword = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
- COMPILE(optargs, "kwarg", args->kw_rest_arg);
- while (node) {
- rb_ary_push(keywords, INT2FIX(node->nd_body->nd_vid));
- COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
- node = node->nd_next;
- i += 1;
+ if (node_init) {
+ if (node_init->nd_1st) { /* m_init */
+ COMPILE_POPED(optargs, "init arguments (m)", node_init->nd_1st);
}
- iseq->arg_keyword_check = (args->kw_rest_arg->nd_vid & ID_SCOPE_MASK) == ID_JUNK;
- iseq->arg_keywords = i;
- iseq->arg_keyword_table = ALLOC_N(ID, i);
- for (j = 0; j < i; j++) {
- iseq->arg_keyword_table[j] = FIX2INT(RARRAY_PTR(keywords)[j]);
+ if (node_init->nd_2nd) { /* p_init */
+ COMPILE_POPED(optargs, "init arguments (p)", node_init->nd_2nd);
}
- ADD_INSN(optargs, nd_line(args->kw_args), pop);
- }
- else if (args->kw_rest_arg) {
- iseq->arg_keyword = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
- COMPILE(optargs, "kwarg", args->kw_rest_arg);
- ADD_INSN(optargs, nd_line(args->kw_rest_arg), pop);
- }
- else {
- iseq->arg_keyword = -1;
- }
-
- if (args->pre_init) { /* m_init */
- COMPILE_POPED(optargs, "init arguments (m)", args->pre_init);
- }
- if (args->post_init) { /* p_init */
- COMPILE_POPED(optargs, "init arguments (p)", args->post_init);
}
if (rest_id) {
@@ -1295,15 +1149,11 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
}
if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
- iseq->arg_rest != -1 || iseq->arg_block != -1 ||
- iseq->arg_keyword != -1) {
+ iseq->arg_rest != -1 || iseq->arg_block != -1) {
iseq->arg_simple = 0;
/* set arg_size: size of arguments */
- if (iseq->arg_keyword != -1) {
- iseq->arg_size = iseq->arg_keyword + 1;
- }
- else if (iseq->arg_block != -1) {
+ if (iseq->arg_block != -1) {
iseq->arg_size = iseq->arg_block + 1;
}
else if (iseq->arg_post_len) {
@@ -1325,8 +1175,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
}
if (iseq->type == ISEQ_TYPE_BLOCK) {
- if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 &&
- iseq->arg_rest == -1 && iseq->arg_keyword == -1) {
+ 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;
@@ -1393,7 +1242,7 @@ static st_index_t
cdhash_hash(VALUE a)
{
if (SPECIAL_CONST_P(a)) return (st_index_t)a;
- if (RB_TYPE_P(a, T_STRING)) return rb_str_hash(a);
+ if (TYPE(a) == T_STRING) return rb_str_hash(a);
{
VALUE hval = rb_hash(a);
return (st_index_t)FIX2LONG(hval);
@@ -1405,31 +1254,15 @@ static const struct st_hash_type cdhash_type = {
cdhash_hash,
};
-struct cdhash_set_label_struct {
- VALUE hash;
- int pos;
- int len;
-};
-
-static int
-cdhash_set_label_i(VALUE key, VALUE val, void *ptr)
-{
- struct cdhash_set_label_struct *data = (struct cdhash_set_label_struct *)ptr;
- LABEL *lobj = (LABEL *)(val & ~1);
- rb_hash_aset(data->hash, key, INT2FIX(lobj->position - (data->pos+data->len)));
- return ST_CONTINUE;
-}
-
/**
- ruby insn object list -> raw instruction sequence
+ 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_line_info_entry *line_info_table;
- unsigned int last_line = 0;
+ struct iseq_insn_info_entry *insn_info_table;
LINK_ELEMENT *list;
VALUE *generated_iseq;
@@ -1472,7 +1305,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
default:
dump_disasm_list(FIRST_ELEMENT(anchor));
dump_disasm_list(list);
- rb_compile_error(RSTRING_PTR(iseq->location.path), line,
+ rb_compile_error(RSTRING_PTR(iseq->filename), line,
"error: set_sequence");
break;
}
@@ -1481,11 +1314,9 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
/* make instruction sequence */
generated_iseq = ALLOC_N(VALUE, pos);
- line_info_table = ALLOC_N(struct iseq_line_info_entry, k);
+ insn_info_table = ALLOC_N(struct iseq_insn_info_entry, k);
iseq->ic_entries = ALLOC_N(struct iseq_inline_cache_entry, iseq->ic_size);
MEMZERO(iseq->ic_entries, struct iseq_inline_cache_entry, iseq->ic_size);
- iseq->callinfo_entries = ALLOC_N(rb_call_info_t, iseq->callinfo_size);
- /* MEMZERO(iseq->callinfo_entries, rb_call_info_t, iseq->callinfo_size); */
list = FIRST_ELEMENT(anchor);
k = pos = sp = 0;
@@ -1517,11 +1348,11 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
if (iobj->operand_size != len - 1) {
/* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
dump_disasm_list(list);
- rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+ rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
"operand size miss! (%d for %d)",
iobj->operand_size, len - 1);
xfree(generated_iseq);
- xfree(line_info_table);
+ xfree(insn_info_table);
return 0;
}
@@ -1534,29 +1365,50 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
/* label(destination position) */
lobj = (LABEL *)operands[j];
if (!lobj->set) {
- rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+ 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);
+ generated_iseq[pos + 1 + j] =
+ lobj->position - (pos + len);
break;
}
case TS_CDHASH:
{
- VALUE map = operands[j];
- struct cdhash_set_label_struct data;
- data.hash = map;
- data.pos = pos;
- data.len = len;
- rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data);
-
+ /*
+ * [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) {
+ 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;
@@ -1583,23 +1435,12 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
int ic_index = FIX2INT(operands[j]);
IC ic = &iseq->ic_entries[ic_index];
if (UNLIKELY(ic_index >= iseq->ic_size)) {
- rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->ic_size);
+ rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d",
+ ic_index, iseq->ic_size);
}
generated_iseq[pos + 1 + j] = (VALUE)ic;
break;
}
- case TS_CALLINFO: /* call info */
- {
- rb_call_info_t *base_ci = (rb_call_info_t *)operands[j];
- rb_call_info_t *ci = &iseq->callinfo_entries[base_ci->aux.index];
- *ci = *base_ci;
-
- if (UNLIKELY(base_ci->aux.index >= iseq->callinfo_size)) {
- rb_bug("iseq_set_sequence: ci_index overflow: index: %d, size: %d", base_ci->argc, iseq->callinfo_size);
- }
- generated_iseq[pos + 1 + j] = (VALUE)ci;
- break;
- }
case TS_ID: /* ID */
generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
break;
@@ -1611,19 +1452,18 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
}
break;
default:
- rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+ rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
"unknown operand type: %c", type);
xfree(generated_iseq);
- xfree(line_info_table);
+ xfree(insn_info_table);
return 0;
}
}
- if (last_line != iobj->line_no) {
- line_info_table[k].line_no = last_line = iobj->line_no;
- line_info_table[k].position = pos;
- k++;
- }
+ 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:
@@ -1651,21 +1491,19 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
if (adjust->line_no != -1) {
if (orig_sp - sp > 0) {
- if (last_line != (unsigned int)adjust->line_no) {
- line_info_table[k].line_no = last_line = adjust->line_no;
- line_info_table[k].position = pos;
- k++;
- }
+ 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 */
- if (last_line != (unsigned int)adjust->line_no) {
- line_info_table[k].line_no = last_line = adjust->line_no;
- line_info_table[k].position = pos;
- k++;
- }
+ 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;
}
@@ -1691,12 +1529,10 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
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;
- line_info_table = ruby_xrealloc(line_info_table, k * sizeof(struct iseq_line_info_entry));
- iseq->line_info_table = line_info_table;
- iseq->line_info_size = k;
-
return COMPILE_OK;
}
@@ -1728,7 +1564,7 @@ iseq_set_exception_table(rb_iseq_t *iseq)
for (i = 0; i < tlen; i++) {
ptr = RARRAY_PTR(tptr[i]);
entry = &iseq->catch_table[i];
- entry->type = (enum catch_type)(ptr[0] & 0xffff);
+ 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];
@@ -1930,16 +1766,15 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
* send ...
* leave
* =>
- * send ..., ... | VM_CALL_TAILCALL, ...
+ * send ..., ... | VM_CALL_TAILCALL_BIT, ...
* leave # unreachable
*/
INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
- if (piobj->insn_id == BIN(send) || piobj->insn_id == BIN(opt_send_simple)) {
- rb_call_info_t *ci = (rb_call_info_t *)piobj->operands[0];
- if (ci->blockiseq == 0) {
- ci->flag |= VM_CALL_TAILCALL;
- }
+ 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;
@@ -1948,18 +1783,18 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
static int
insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
{
- int old_opsize = iobj->operand_size;
+ int i, old_opsize = iobj->operand_size;
+
iobj->insn_id = insn_id;
iobj->operand_size = insn_len(insn_id) - 1;
+ /* printf("iobj->operand_size: %d\n", iobj->operand_size); */
if (iobj->operand_size > old_opsize) {
- VALUE *old_operands = iobj->operands;
- if (insn_id != BIN(opt_neq)) {
- rb_bug("insn_set_specialized_instruction: unknown insn: %d", insn_id);
- }
- iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size * sizeof(VALUE));
- iobj->operands[0] = old_operands[0];
- iobj->operands[1] = (VALUE)new_callinfo(iseq, idEq, 1, 0, 0);
+ iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size);
+ }
+
+ for (i=0; i<iobj->operand_size; i++) {
+ iobj->operands[i] = INT2FIX(iseq->ic_size++);
}
return COMPILE_OK;
@@ -1969,45 +1804,72 @@ static int
iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
{
if (iobj->insn_id == BIN(send)) {
- rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, 0);
-
-#define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
- if (ci->blockiseq == 0 && (ci->flag & ~VM_CALL_ARGS_SKIP_SETUP) == 0) {
- switch (ci->orig_argc) {
- case 0:
- switch (ci->mid) {
- case idLength: SP_INSN(length); return COMPILE_OK;
- case idSize: SP_INSN(size); return COMPILE_OK;
- case idEmptyP: SP_INSN(empty_p);return COMPILE_OK;
- case idSucc: SP_INSN(succ); return COMPILE_OK;
- case idNot: SP_INSN(not); return COMPILE_OK;
+ 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(iseq, iobj, BIN(opt_length));
}
- break;
- case 1:
- switch (ci->mid) {
- case idPLUS: SP_INSN(plus); return COMPILE_OK;
- case idMINUS: SP_INSN(minus); return COMPILE_OK;
- case idMULT: SP_INSN(mult); return COMPILE_OK;
- case idDIV: SP_INSN(div); return COMPILE_OK;
- case idMOD: SP_INSN(mod); return COMPILE_OK;
- case idEq: SP_INSN(eq); return COMPILE_OK;
- case idNeq: SP_INSN(neq); return COMPILE_OK;
- case idLT: SP_INSN(lt); return COMPILE_OK;
- case idLE: SP_INSN(le); return COMPILE_OK;
- case idGT: SP_INSN(gt); return COMPILE_OK;
- case idGE: SP_INSN(ge); return COMPILE_OK;
- case idLTLT: SP_INSN(ltlt); return COMPILE_OK;
- case idAREF: SP_INSN(aref); return COMPILE_OK;
+ else if (mid == idSize) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_size));
+ }
+ else if (mid == idSucc) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_succ));
+ }
+ else if (mid == idNot) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_not));
+ }
+ }
+ else if (argc == 1) {
+ if (0) {
+ }
+ else if (mid == idPLUS) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_plus));
+ }
+ else if (mid == idMINUS) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_minus));
+ }
+ else if (mid == idMULT) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_mult));
+ }
+ else if (mid == idDIV) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_div));
+ }
+ else if (mid == idMOD) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_mod));
+ }
+ else if (mid == idEq) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_eq));
+ }
+ else if (mid == idNeq) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_neq));
+ }
+ else if (mid == idLT) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_lt));
+ }
+ else if (mid == idLE) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_le));
+ }
+ else if (mid == idGT) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_gt));
+ }
+ else if (mid == idGE) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_ge));
+ }
+ else if (mid == idLTLT) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_ltlt));
+ }
+ else if (mid == idAREF) {
+ insn_set_specialized_instruction(iseq, iobj, BIN(opt_aref));
}
- break;
}
- }
- if (ci->flag & VM_CALL_ARGS_SKIP_SETUP) {
- iobj->insn_id = BIN(opt_send_simple);
}
}
-#undef SP_INSN
-
return COMPILE_OK;
}
@@ -2133,7 +1995,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
#if OPT_STACK_CACHING
#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)]
-#define SC_NEXT(insn) sc_insn_next[(insn)]
+#define SC_NEXT(insn) sc_insn_next[insn]
#include "opt_sc.inc"
@@ -2156,7 +2018,7 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
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->location.path), iobj->line_no,
+ rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
"insn_set_sc_state error\n");
return 0;
}
@@ -2258,7 +2120,7 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
case SCS_XX:
goto normal_insn;
default:
- rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+ rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
"unreachable");
}
/* remove useless pop */
@@ -2289,8 +2151,10 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
return COMPILE_OK;
}
+
+
static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int *cntp)
{
NODE *list = node->nd_next;
VALUE lit = node->nd_lit;
@@ -2304,14 +2168,7 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
}
while (list) {
- node = list->nd_head;
- if (nd_type(node) == NODE_STR) {
- hide_obj(node->nd_lit);
- ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
- }
- else {
- COMPILE(ret, "each string", node);
- }
+ COMPILE(ret, "each string", list->nd_head);
cnt++;
list = list->nd_next;
}
@@ -2383,160 +2240,65 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
return COMPILE_OK;
}
-enum compile_array_type_t {
- COMPILE_ARRAY_TYPE_ARRAY,
- COMPILE_ARRAY_TYPE_HASH,
- COMPILE_ARRAY_TYPE_ARGS
-};
-
static int
compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
- enum compile_array_type_t type, int poped)
+ VALUE opt_p, int poped)
{
NODE *node = node_root;
- int line = (int)nd_line(node);
- int len = 0;
-
- if (nd_type(node) == NODE_ZARRAY) {
- if (!poped) {
- switch (type) {
- case COMPILE_ARRAY_TYPE_ARRAY: ADD_INSN1(ret, line, newarray, INT2FIX(0)); break;
- case COMPILE_ARRAY_TYPE_HASH: ADD_INSN1(ret, line, newhash, INT2FIX(0)); break;
- case COMPILE_ARRAY_TYPE_ARGS: /* do nothing */ break;
- }
- }
- }
- else {
- int opt_p = 1;
- int first = 1, i;
+ 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) {
- NODE *start_node = node, *end_node;
- NODE *kw = 0;
- const int max = 0x100;
- DECL_ANCHOR(anchor);
- INIT_ANCHOR(anchor);
-
- for (i=0; i<max && node; i++, len++, node = node->nd_next) {
- if (CPDEBUG > 0 && nd_type(node) != NODE_ARRAY) {
- rb_bug("compile_array: This node is not NODE_ARRAY, but %s", ruby_node_name(nd_type(node)));
- }
-
- if (type == COMPILE_ARRAY_TYPE_HASH && !node->nd_head) {
- opt_p = 0;
- kw = node->nd_next;
- node = kw->nd_next;
- kw = kw->nd_head;
- break;
- }
- if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
- opt_p = 0;
- }
-
- COMPILE_(anchor, "array element", node->nd_head, poped);
+ if (nd_type(node) != NODE_ARRAY) {
+ rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
+ ruby_node_name(nd_type(node)));
}
- if (opt_p && type != COMPILE_ARRAY_TYPE_ARGS) {
- if (!poped) {
- VALUE ary = rb_ary_tmp_new(i);
-
- end_node = node;
- node = start_node;
-
- while (node != end_node) {
- rb_ary_push(ary, node->nd_head->nd_lit);
- node = node->nd_next;
- }
- while (node && nd_type(node->nd_head) == NODE_LIT &&
- node->nd_next && nd_type(node->nd_next->nd_head) == NODE_LIT) {
- rb_ary_push(ary, node->nd_head->nd_lit);
- node = node->nd_next;
- rb_ary_push(ary, node->nd_head->nd_lit);
- node = node->nd_next;
- len++;
- }
-
- OBJ_FREEZE(ary);
-
- iseq_add_mark_object_compile_time(iseq, ary);
-
- if (first) {
- first = 0;
- if (type == COMPILE_ARRAY_TYPE_ARRAY) {
- ADD_INSN1(ret, line, duparray, ary);
- }
- else { /* COMPILE_ARRAY_TYPE_HASH */
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putobject, ary);
- ADD_SEND(ret, line, ID2SYM(id_core_hash_from_ary), INT2FIX(1));
- }
- }
- else {
- if (type == COMPILE_ARRAY_TYPE_ARRAY) {
- ADD_INSN1(ret, line, putobject, ary);
- ADD_INSN(ret, line, concatarray);
- }
- else {
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putobject, ary);
- ADD_SEND(ret, line, ID2SYM(id_core_hash_merge_ary), INT2FIX(1));
- }
- }
- }
+ i++;
+ if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
+ opt_p = Qfalse;
}
- else {
- if (!poped) {
- switch (type) {
- case COMPILE_ARRAY_TYPE_ARRAY:
- ADD_INSN1(anchor, line, newarray, INT2FIX(i));
+ COMPILE_(anchor, "array element", node->nd_head, poped);
+ node = node->nd_next;
+ }
+ }
- if (first) {
- first = 0;
- }
- else {
- ADD_INSN(anchor, line, concatarray);
- }
+ if (len != i) {
+ if (0) {
+ rb_bug("node error: compile_array (%d: %d-%d)",
+ (int)nd_line(node_root), len, i);
+ }
+ len = i;
+ }
- APPEND_LIST(ret, anchor);
- break;
- case COMPILE_ARRAY_TYPE_HASH:
- if (first) {
- first = 0;
- ADD_INSN1(anchor, line, newhash, INT2FIX(i));
- APPEND_LIST(ret, anchor);
- }
- else if (i > 0) {
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN(ret, line, swap);
- APPEND_LIST(ret, anchor);
- ADD_SEND(ret, line, ID2SYM(id_core_hash_merge_ptr), INT2FIX(i + 1));
- }
- if (kw) {
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN(ret, line, swap);
- COMPILE(ret, "keyword splat", kw);
- ADD_SEND(ret, line, ID2SYM(id_core_hash_merge_kwd), INT2FIX(2));
- }
- break;
- case COMPILE_ARRAY_TYPE_ARGS:
- APPEND_LIST(ret, anchor);
- break;
- }
- }
- else {
- /* poped */
- APPEND_LIST(ret, anchor);
- }
+ 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, enum compile_array_type_t type)
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, VALUE opt_p)
{
- return compile_array_(iseq, ret, node_root, type, 0);
+ return compile_array_(iseq, ret, node_root, opt_p, 0);
}
static VALUE
@@ -2545,11 +2307,6 @@ case_when_optimizable_literal(NODE * node)
switch (nd_type(node)) {
case NODE_LIT: {
VALUE v = node->nd_lit;
- double ival;
- if (RB_TYPE_P(v, T_FLOAT) &&
- modf(RFLOAT_VALUE(v), &ival) == 0.0) {
- return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
- }
if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
return v;
}
@@ -2558,44 +2315,34 @@ case_when_optimizable_literal(NODE * node)
case NODE_STR:
return node->nd_lit;
}
- return Qundef;
+ return Qfalse;
}
-static int
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int only_special_literals, VALUE literals)
+static VALUE
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, VALUE special_literals)
{
while (vals) {
- NODE* val = vals->nd_head;
- VALUE lit = case_when_optimizable_literal(val);
+ VALUE lit;
+ NODE* val;
- if (lit == Qundef) {
- only_special_literals = 0;
- }
- else {
- if (rb_hash_lookup(literals, lit) != Qnil) {
- rb_compile_warning(RSTRING_PTR(iseq->location.path), nd_line(val), "duplicated when clause is ignored");
- }
- else {
- rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
- }
- }
-
- ADD_INSN(cond_seq, nd_line(val), dup); /* dup target */
+ val = vals->nd_head;
- if (nd_type(val) == NODE_STR) {
- debugp_param("nd_lit", val->nd_lit);
- OBJ_FREEZE(val->nd_lit);
- ADD_INSN1(cond_seq, nd_line(val), putobject, val->nd_lit);
+ 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 {
- COMPILE(cond_seq, "when cond", val);
+ special_literals = Qfalse;
}
- ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+ 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 only_special_literals;
+ return special_literals;
}
static int
@@ -2604,16 +2351,15 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
switch (nd_type(node)) {
case NODE_ATTRASGN: {
INSN *iobj;
- rb_call_info_t *ci;
VALUE dupidx;
COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
-
POP_ELEMENT(ret); /* pop pop insn */
iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
- ci = (rb_call_info_t *)iobj->operands[0];
- ci->orig_argc += 1; ci->argc = ci->orig_argc;
- dupidx = INT2FIX(ci->orig_argc);
+
+ 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);
@@ -2821,28 +2567,27 @@ compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
}
}
-#define defined_expr defined_expr0
static int
defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
NODE *node, LABEL **lfinish, VALUE needstr)
{
- enum defined_type expr_type = 0;
+ const char *estr = 0;
enum node_type type;
switch (type = nd_type(node)) {
/* easy literals */
case NODE_NIL:
- expr_type = DEFINED_NIL;
+ estr = "nil";
break;
case NODE_SELF:
- expr_type = DEFINED_SELF;
+ estr = "self";
break;
case NODE_TRUE:
- expr_type = DEFINED_TRUE;
+ estr = "true";
break;
case NODE_FALSE:
- expr_type = DEFINED_FALSE;
+ estr = "false";
break;
case NODE_ARRAY:{
@@ -2863,13 +2608,13 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
case NODE_AND:
case NODE_OR:
default:
- expr_type = DEFINED_EXPR;
+ estr = "expression";
break;
/* variables */
case NODE_LVAR:
case NODE_DVAR:
- expr_type = DEFINED_LVAR;
+ estr = "local-variable";
break;
case NODE_IVAR:
@@ -2943,9 +2688,21 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
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);
}
@@ -2991,14 +2748,16 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
case NODE_CDECL:
case NODE_CVDECL:
case NODE_CVASGN:
- expr_type = DEFINED_ASGN;
+ estr = "assignment";
break;
}
- if (expr_type) {
+ if (estr != 0) {
if (needstr != Qfalse) {
- VALUE str = rb_iseq_defined_string(expr_type);
- ADD_INSN1(ret, nd_line(node), putobject, str);
+ 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);
@@ -3007,29 +2766,6 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
}
return 0;
}
-#undef defined_expr
-
-static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
- NODE *node, LABEL **lfinish, VALUE needstr)
-{
- LINK_ELEMENT *lcur = ret->last;
- int done = defined_expr0(iseq, ret, node, lfinish, needstr);
- if (lfinish[1]) {
- int line = nd_line(node);
- LABEL *lstart = NEW_LABEL(line);
- LABEL *lend = NEW_LABEL(line);
- VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
- rb_str_concat(rb_str_new2
- ("defined guard in "),
- iseq->location.label),
- ISEQ_TYPE_DEFINED_GUARD, 0);
- APPEND_LABEL(ret, lcur, lstart);
- ADD_LABEL(ret, lend);
- ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
- }
- return done;
-}
#define BUFSIZE 0x100
@@ -3049,10 +2785,10 @@ make_name_for_block(rb_iseq_t *iseq)
}
if (level == 1) {
- return rb_sprintf("block in %s", RSTRING_PTR(ip->location.label));
+ return rb_sprintf("block in %s", RSTRING_PTR(ip->name));
}
else {
- return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->location.label));
+ return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->name));
}
}
@@ -3121,7 +2857,7 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
}
static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned long *flag)
{
VALUE argc = INT2FIX(0);
int nsplat = 0;
@@ -3132,7 +2868,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
INIT_ANCHOR(args_splat);
if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
COMPILE(arg_block, "block", argn->nd_body);
- *flag |= VM_CALL_ARGS_BLOCKARG;
+ *flag |= VM_CALL_ARGS_BLOCKARG_BIT;
argn = argn->nd_head;
}
@@ -3143,7 +2879,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
COMPILE(args, "args (splat)", argn->nd_head);
argc = INT2FIX(1);
nsplat++;
- *flag |= VM_CALL_ARGS_SPLAT;
+ *flag |= VM_CALL_ARGS_SPLAT_BIT;
break;
}
case NODE_ARGSCAT:
@@ -3166,10 +2902,11 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
}
INSERT_LIST(args_splat, tmp);
nsplat++;
- *flag |= VM_CALL_ARGS_SPLAT;
+ *flag |= VM_CALL_ARGS_SPLAT_BIT;
if (next_is_array) {
- argc = INT2FIX(compile_array(iseq, args, argn->nd_head, COMPILE_ARRAY_TYPE_ARGS) + 1);
+ argc = INT2FIX(compile_array(iseq, args, argn->nd_head, Qfalse) + 1);
+ POP_ELEMENT(args);
}
else {
argn = argn->nd_head;
@@ -3178,7 +2915,8 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
break;
}
case NODE_ARRAY: {
- argc = INT2FIX(compile_array(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS));
+ argc = INT2FIX(compile_array(iseq, args, argn, Qfalse));
+ POP_ELEMENT(args);
break;
}
default: {
@@ -3198,7 +2936,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
ADD_SEQ(args, args_splat);
}
- if (*flag & VM_CALL_ARGS_BLOCKARG) {
+ if (*flag & VM_CALL_ARGS_BLOCKARG_BIT) {
ADD_SEQ(args, arg_block);
}
return argc;
@@ -3216,7 +2954,6 @@ static int
iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
{
enum node_type type;
- int line;
if (node == 0) {
if (!poped) {
@@ -3226,13 +2963,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
return COMPILE_OK;
}
- iseq->compile_data->last_line = line = (int)nd_line(node);
+ 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, line, RUBY_EVENT_LINE);
+ ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE);
}
switch (type) {
@@ -3256,9 +2993,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
INIT_ANCHOR(cond_seq);
INIT_ANCHOR(then_seq);
INIT_ANCHOR(else_seq);
- then_label = NEW_LABEL(line);
- else_label = NEW_LABEL(line);
- end_label = NEW_LABEL(line);
+ 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);
@@ -3269,7 +3006,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
ADD_LABEL(ret, then_label);
ADD_SEQ(ret, then_seq);
- ADD_INSNL(ret, line, jump, end_label);
+ ADD_INSNL(ret, nd_line(node), jump, end_label);
ADD_LABEL(ret, else_label);
ADD_SEQ(ret, else_seq);
@@ -3285,15 +3022,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
DECL_ANCHOR(head);
DECL_ANCHOR(body_seq);
DECL_ANCHOR(cond_seq);
- int only_special_literals = 1;
- VALUE literals = rb_hash_new();
+ VALUE special_literals = rb_ary_tmp_new(1);
INIT_ANCHOR(head);
INIT_ANCHOR(body_seq);
INIT_ANCHOR(cond_seq);
-
- RHASH_TBL(literals)->type = &cdhash_type;
-
if (node->nd_head == 0) {
COMPILE_(ret, "when", node->nd_body, poped);
break;
@@ -3302,39 +3035,37 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
node = node->nd_body;
type = nd_type(node);
- line = nd_line(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(line);
- elselabel = NEW_LABEL(line);
+ 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(line);
+ l1 = NEW_LABEL(nd_line(node));
ADD_LABEL(body_seq, l1);
- ADD_INSN(body_seq, line, pop);
+ ADD_INSN(body_seq, nd_line(node), pop);
COMPILE_(body_seq, "when body", node->nd_body, poped);
- ADD_INSNL(body_seq, line, jump, endlabel);
+ ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
vals = node->nd_head;
if (vals) {
switch (nd_type(vals)) {
case NODE_ARRAY:
- only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
+ special_literals = when_vals(iseq, cond_seq, vals, l1, special_literals);
break;
case NODE_SPLAT:
case NODE_ARGSCAT:
case NODE_ARGSPUSH:
- only_special_literals = 0;
- ADD_INSN (cond_seq, nd_line(vals), dup);
+ special_literals = 0;
COMPILE(cond_seq, "when/cond splat", vals);
- ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+ ADD_INSN1(cond_seq, nd_line(vals), checkincludearray, Qtrue);
ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
break;
default:
@@ -3351,14 +3082,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
break;
}
type = nd_type(node);
- line = nd_line(node);
}
/* else */
if (node) {
ADD_LABEL(cond_seq, elselabel);
- ADD_INSN(cond_seq, line, pop);
+ ADD_INSN(cond_seq, nd_line(node), pop);
COMPILE_(cond_seq, "else", node, poped);
- ADD_INSNL(cond_seq, line, jump, endlabel);
+ ADD_INSNL(cond_seq, nd_line(node), jump, endlabel);
}
else {
debugs("== else (implicit)\n");
@@ -3370,11 +3100,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
}
- if (only_special_literals) {
- iseq_add_mark_object(iseq, literals);
-
+ if (special_literals) {
ADD_INSN(ret, nd_line(tempnode), dup);
- ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch, literals, elselabel);
+ 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);
@@ -3390,13 +3120,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
DECL_ANCHOR(body_seq);
INIT_ANCHOR(body_seq);
- endlabel = NEW_LABEL(line);
+ endlabel = NEW_LABEL(nd_line(node));
while (node && nd_type(node) == NODE_WHEN) {
- LABEL *l1 = NEW_LABEL(line = nd_line(node));
+ LABEL *l1 = NEW_LABEL(nd_line(node));
ADD_LABEL(body_seq, l1);
COMPILE_(body_seq, "when", node->nd_body, poped);
- ADD_INSNL(body_seq, line, jump, endlabel);
+ ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
vals = node->nd_head;
if (!vals) {
@@ -3416,7 +3146,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
case NODE_ARGSPUSH:
ADD_INSN(ret, nd_line(vals), putnil);
COMPILE(ret, "when2/cond splat", vals);
- ADD_INSN1(ret, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
+ ADD_INSN1(ret, nd_line(vals), checkincludearray, Qfalse);
+ ADD_INSN(ret, nd_line(vals), pop);
ADD_INSNL(ret, nd_line(vals), branchif, l1);
break;
default:
@@ -3444,28 +3175,28 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
struct iseq_compile_data_ensure_node_stack enl;
- LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(line); /* next */
- LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(line); /* redo */
- LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(line); /* break */
- LABEL *end_label = NEW_LABEL(line);
+ 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(line);
+ 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, line, jump, next_label);
+ ADD_INSNL(ret, nd_line(node), jump, next_label);
}
else {
- tmp_label = NEW_LABEL(line);
- ADD_INSNL(ret, line, jump, tmp_label);
+ tmp_label = NEW_LABEL(nd_line(node));
+ ADD_INSNL(ret, nd_line(node), jump, tmp_label);
}
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
ADD_LABEL(ret, next_catch_label);
- ADD_INSN(ret, line, pop);
- ADD_INSNL(ret, line, jump, next_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);
@@ -3482,26 +3213,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
end_label, redo_label);
}
else {
- ADD_CALL_RECEIVER(ret, line);
- ADD_CALL(ret, line, ID2SYM(idGets), INT2FIX(0));
- ADD_INSNL(ret, line, branchif, redo_label);
+ 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, line, putundef); */
+ /* ADD_INSN(ret, nd_line(node), putundef); */
rb_bug("unsupported: putundef");
}
else {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
ADD_LABEL(ret, break_label); /* break */
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label,
@@ -3521,8 +3252,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
case NODE_ITER:
case NODE_FOR:{
VALUE prevblock = iseq->compile_data->current_block;
- LABEL *retry_label = NEW_LABEL(line);
- LABEL *retry_end_l = NEW_LABEL(line);
+ 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) {
@@ -3530,21 +3262,22 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
iseq->compile_data->current_block =
NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
- ISEQ_TYPE_BLOCK, line);
+ ISEQ_TYPE_BLOCK, nd_line(node));
- ADD_SEND_R(ret, line, ID2SYM(idEach), INT2FIX(0),
+ 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, line);
+ ISEQ_TYPE_BLOCK, nd_line(node));
COMPILE(ret, "iter caller", node->nd_iter);
}
ADD_LABEL(ret, retry_end_l);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
iseq->compile_data->current_block = prevblock;
@@ -3560,23 +3293,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
/* while/until */
LABEL *splabel = NEW_LABEL(0);
ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
+ 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, line, jump, iseq->compile_data->end_label);
+ ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
ADD_ADJUST_RESTORE(ret, splabel);
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ 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, line, throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
+ ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
}
else if (iseq->type == ISEQ_TYPE_EVAL) {
@@ -3623,25 +3356,25 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
ADD_LABEL(ret, splabel);
COMPILE(ret, "next val/valid syntax?", node->nd_stts);
add_ensure_iseq(ret, iseq, 0);
- ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
- ADD_INSNL(ret, line, jump, iseq->compile_data->start_label);
+ 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);
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
}
else if (iseq->compile_data->end_label) {
LABEL *splabel = NEW_LABEL(0);
debugs("next in block\n");
ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, line, iseq->compile_data->start_label);
+ 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, line, jump, iseq->compile_data->end_label);
+ ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
ADD_ADJUST_RESTORE(ret, splabel);
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
}
else if (iseq->type == ISEQ_TYPE_EVAL) {
@@ -3673,10 +3406,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
if (ip != 0) {
COMPILE(ret, "next val", node->nd_stts);
- ADD_INSN1(ret, line, throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
+ ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
}
else {
@@ -3690,12 +3423,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
LABEL *splabel = NEW_LABEL(0);
debugs("redo in while");
ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
+ ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
add_ensure_iseq(ret, iseq, 0);
- ADD_INSNL(ret, line, jump, iseq->compile_data->redo_label);
+ ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->redo_label);
ADD_ADJUST_RESTORE(ret, splabel);
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
}
else if (iseq->type == ISEQ_TYPE_EVAL) {
@@ -3708,12 +3441,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
debugs("redo in block");
ADD_LABEL(ret, splabel);
add_ensure_iseq(ret, iseq, 0);
- ADD_ADJUST(ret, line, iseq->compile_data->start_label);
- ADD_INSNL(ret, line, jump, iseq->compile_data->start_label);
+ 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, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
}
else {
@@ -3740,11 +3473,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
ip = ip->parent_iseq;
}
if (ip != 0) {
- ADD_INSN(ret, line, putnil);
- ADD_INSN1(ret, line, throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
+ ADD_INSN(ret, nd_line(node), putnil);
+ ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
}
else {
@@ -3755,11 +3488,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
case NODE_RETRY:{
if (iseq->type == ISEQ_TYPE_RESCUE) {
- ADD_INSN(ret, line, putnil);
- ADD_INSN1(ret, line, throw, INT2FIX(0x04) /* TAG_RETRY */ );
+ ADD_INSN(ret, nd_line(node), putnil);
+ ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x04) /* TAG_RETRY */ );
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
}
else {
@@ -3772,26 +3505,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
break;
}
case NODE_RESCUE:{
- LABEL *lstart = NEW_LABEL(line);
- LABEL *lend = NEW_LABEL(line);
- LABEL *lcont = NEW_LABEL(line);
+ 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->location.label),
- ISEQ_TYPE_RESCUE, line);
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
COMPILE(ret, "rescue else", node->nd_else);
}
- ADD_INSN(ret, line, nop);
+ ADD_INSN(ret, nd_line(node), nop);
ADD_LABEL(ret, lcont);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
/* register catch entry */
@@ -3805,28 +3538,30 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
LABEL *label_miss, *label_hit;
while (resq) {
- label_miss = NEW_LABEL(line);
- label_hit = NEW_LABEL(line);
+ 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) {
- ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
COMPILE(ret, "rescue arg", narg->nd_head);
- ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
- ADD_INSNL(ret, line, branchif, label_hit);
+ 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, line, getlocal, INT2FIX(2), INT2FIX(0));
+ ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
COMPILE(ret, "rescue/cond splat", narg);
- ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
- ADD_INSNL(ret, line, branchif, label_hit);
+ 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)",
@@ -3834,18 +3569,19 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
}
else {
- ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
- ADD_INSN1(ret, line, putobject, rb_eStandardError);
- ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
- ADD_INSNL(ret, line, branchif, label_hit);
+ 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, line, jump, label_miss);
+ 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, line, nop);
+ ADD_INSN(ret, nd_line(node), nop);
}
- ADD_INSN(ret, line, leave);
+ ADD_INSN(ret, nd_line(node), leave);
ADD_LABEL(ret, label_miss);
resq = resq->nd_head;
}
@@ -3856,11 +3592,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
rb_str_concat(rb_str_new2
("ensure in "),
- iseq->location.label),
- ISEQ_TYPE_ENSURE, line);
- LABEL *lstart = NEW_LABEL(line);
- LABEL *lend = NEW_LABEL(line);
- LABEL *lcont = NEW_LABEL(line);
+ 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;
@@ -3877,7 +3613,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE_(ret, "ensure head", node->nd_head, poped);
ADD_LABEL(ret, lend);
if (ensr->anchor.next == 0) {
- ADD_INSN(ret, line, nop);
+ ADD_INSN(ret, nd_line(node), nop);
}
else {
ADD_SEQ(ret, ensr);
@@ -3897,19 +3633,19 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
case NODE_AND:
case NODE_OR:{
- LABEL *end_label = NEW_LABEL(line);
+ LABEL *end_label = NEW_LABEL(nd_line(node));
COMPILE(ret, "nd_1st", node->nd_1st);
if (!poped) {
- ADD_INSN(ret, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
if (type == NODE_AND) {
- ADD_INSNL(ret, line, branchunless, end_label);
+ ADD_INSNL(ret, nd_line(node), branchunless, end_label);
}
else {
- ADD_INSNL(ret, line, branchif, end_label);
+ ADD_INSNL(ret, nd_line(node), branchif, end_label);
}
if (!poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
ADD_LABEL(ret, end_label);
@@ -3929,9 +3665,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE(ret, "rvalue", node->nd_value);
if (!poped) {
- ADD_INSN(ret, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
- ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+ ADD_INSN1(ret, nd_line(node), setlocal, INT2FIX(idx));
break;
}
@@ -3942,7 +3678,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
if (!poped) {
- ADD_INSN(ret, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
@@ -3951,26 +3687,27 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
}
- ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
+ 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, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
- ADD_INSN1(ret, line, setglobal,
- ((VALUE)node->nd_entry | 1));
+ 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, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
- ADD_INSN2(ret, line, setinstancevariable,
+ ADD_INSN2(ret, nd_line(node), setinstancevariable,
ID2SYM(node->nd_vid), INT2FIX(iseq->ic_size++));
break;
}
@@ -3978,33 +3715,33 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE(ret, "lvalue", node->nd_value);
if (!poped) {
- ADD_INSN(ret, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
if (node->nd_vid) {
- ADD_INSN1(ret, line, putspecialobject,
+ ADD_INSN1(ret, nd_line(node), putspecialobject,
INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
- ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_vid));
+ ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
}
else {
compile_cpath(ret, iseq, node->nd_else);
- ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_else->nd_mid));
+ 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, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
}
- ADD_INSN1(ret, line, setclassvariable,
+ ADD_INSN1(ret, nd_line(node), setclassvariable,
ID2SYM(node->nd_vid));
break;
}
case NODE_OP_ASGN1: {
DECL_ANCHOR(args);
VALUE argc;
- VALUE flag = 0;
+ unsigned long flag = 0;
ID id = node->nd_mid;
int boff = 0;
@@ -4032,7 +3769,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
*/
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
switch (nd_type(node->nd_args->nd_head)) {
@@ -4046,8 +3783,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
argc = setup_args(iseq, args, node->nd_args->nd_head, &flag);
ADD_SEQ(ret, args);
}
- ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
- ADD_SEND_R(ret, line, ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
+ ADD_INSN1(ret, nd_line(node), dupn, FIXNUM_INC(argc, 1 + boff));
+ ADD_SEND_R(ret, nd_line(node), ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
if (id == 0 || id == 1) {
/* 0: or, 1: and
@@ -4059,92 +3796,92 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
nil
end
*/
- LABEL *label = NEW_LABEL(line);
- LABEL *lfin = NEW_LABEL(line);
+ LABEL *label = NEW_LABEL(nd_line(node));
+ LABEL *lfin = NEW_LABEL(nd_line(node));
- ADD_INSN(ret, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
if (id == 0) {
/* or */
- ADD_INSNL(ret, line, branchif, label);
+ ADD_INSNL(ret, nd_line(node), branchif, label);
}
else {
/* and */
- ADD_INSNL(ret, line, branchunless, label);
+ ADD_INSNL(ret, nd_line(node), branchunless, label);
}
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
if (!poped) {
- ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
+ ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
}
- if (flag & VM_CALL_ARGS_SPLAT) {
- ADD_INSN1(ret, line, newarray, INT2FIX(1));
+ if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+ ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
if (boff > 0) {
- ADD_INSN1(ret, line, dupn, INT2FIX(3));
- ADD_INSN(ret, line, swap);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(3));
+ ADD_INSN(ret, nd_line(node), swap);
+ ADD_INSN(ret, nd_line(node), pop);
}
- ADD_INSN(ret, line, concatarray);
+ ADD_INSN(ret, nd_line(node), concatarray);
if (boff > 0) {
- ADD_INSN1(ret, line, setn, INT2FIX(3));
- ADD_INSN(ret, line, pop);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), setn, INT2FIX(3));
+ ADD_INSN(ret, nd_line(node), pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
- ADD_SEND_R(ret, line, ID2SYM(idASET),
+ ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
argc, Qfalse, LONG2FIX(flag));
}
else {
if (boff > 0)
- ADD_INSN(ret, line, swap);
- ADD_SEND_R(ret, line, ID2SYM(idASET),
+ ADD_INSN(ret, nd_line(node), swap);
+ ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
}
- ADD_INSN(ret, line, pop);
- ADD_INSNL(ret, line, jump, lfin);
+ ADD_INSN(ret, nd_line(node), pop);
+ ADD_INSNL(ret, nd_line(node), jump, lfin);
ADD_LABEL(ret, label);
if (!poped) {
- ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
+ ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
}
- ADD_INSN1(ret, line, adjuststack, FIXNUM_INC(argc, 2+boff));
+ ADD_INSN1(ret, nd_line(node), adjuststack, FIXNUM_INC(argc, 2+boff));
ADD_LABEL(ret, lfin);
}
else {
COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
- ADD_SEND(ret, line, ID2SYM(id), INT2FIX(1));
+ ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1));
if (!poped) {
- ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
+ ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 2+boff));
}
- if (flag & VM_CALL_ARGS_SPLAT) {
- ADD_INSN1(ret, line, newarray, INT2FIX(1));
+ if (flag & VM_CALL_ARGS_SPLAT_BIT) {
+ ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
if (boff > 0) {
- ADD_INSN1(ret, line, dupn, INT2FIX(3));
- ADD_INSN(ret, line, swap);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(3));
+ ADD_INSN(ret, nd_line(node), swap);
+ ADD_INSN(ret, nd_line(node), pop);
}
- ADD_INSN(ret, line, concatarray);
+ ADD_INSN(ret, nd_line(node), concatarray);
if (boff > 0) {
- ADD_INSN1(ret, line, setn, INT2FIX(3));
- ADD_INSN(ret, line, pop);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), setn, INT2FIX(3));
+ ADD_INSN(ret, nd_line(node), pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
- ADD_SEND_R(ret, line, ID2SYM(idASET),
+ ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
argc, Qfalse, LONG2FIX(flag));
}
else {
if (boff > 0)
- ADD_INSN(ret, line, swap);
- ADD_SEND_R(ret, line, ID2SYM(idASET),
+ ADD_INSN(ret, nd_line(node), swap);
+ ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
}
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_OP_ASGN2:{
ID atype = node->nd_next->nd_mid;
- LABEL *lfin = NEW_LABEL(line);
- LABEL *lcfin = NEW_LABEL(line);
+ LABEL *lfin = NEW_LABEL(nd_line(node));
+ LABEL *lcfin = NEW_LABEL(nd_line(node));
/*
class C; attr_accessor :c; end
r = C.new
@@ -4188,121 +3925,53 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
*/
COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
- ADD_INSN(ret, line, dup);
- ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_vid),
+ 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, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
if (atype == 0) {
- ADD_INSNL(ret, line, branchif, lcfin);
+ ADD_INSNL(ret, nd_line(node), branchif, lcfin);
}
else {
- ADD_INSNL(ret, line, branchunless, lcfin);
+ ADD_INSNL(ret, nd_line(node), branchunless, lcfin);
}
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
- ADD_INSN(ret, line, swap);
- ADD_INSN1(ret, line, topn, INT2FIX(1));
- ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_aid),
+ 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, line, jump, lfin);
+ ADD_INSNL(ret, nd_line(node), jump, lfin);
ADD_LABEL(ret, lcfin);
- ADD_INSN(ret, line, swap);
+ ADD_INSN(ret, nd_line(node), swap);
ADD_LABEL(ret, lfin);
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
if (poped) {
/* we can apply more optimize */
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
}
else {
COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
- ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_mid),
+ ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid),
INT2FIX(1));
if (!poped) {
- ADD_INSN(ret, line, swap);
- ADD_INSN1(ret, line, topn, INT2FIX(1));
+ ADD_INSN(ret, nd_line(node), swap);
+ ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
}
- ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_aid),
+ ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
INT2FIX(1));
- ADD_INSN(ret, line, pop);
- }
- break;
- }
- case NODE_OP_CDECL: {
- LABEL *lfin = 0;
- LABEL *lassign = 0;
- ID mid;
-
- switch (nd_type(node->nd_head)) {
- case NODE_COLON3:
- ADD_INSN1(ret, line, putobject, rb_cObject);
- break;
- case NODE_COLON2:
- COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head);
- break;
- default:
- do {
- COMPILE_ERROR((ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
- ruby_node_name(nd_type(node->nd_head))));
- } while (0);
- return COMPILE_NG;
- }
- mid = node->nd_head->nd_mid;
- /* cref */
- if (node->nd_aid == 0) {
- lassign = NEW_LABEL(line);
- ADD_INSN(ret, line, dup); /* cref cref */
- ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
- ID2SYM(mid), Qfalse); /* cref bool */
- ADD_INSNL(ret, line, branchunless, lassign); /* cref */
- }
- ADD_INSN(ret, line, dup); /* cref cref */
- ADD_INSN1(ret, line, getconstant, ID2SYM(mid)); /* cref obj */
-
- if (node->nd_aid == 0 || node->nd_aid == 1) {
- lfin = NEW_LABEL(line);
- if (!poped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
- if (node->nd_aid == 0)
- ADD_INSNL(ret, line, branchif, lfin);
- else
- ADD_INSNL(ret, line, branchunless, lfin);
- /* cref [obj] */
- if (!poped) ADD_INSN(ret, line, pop); /* cref */
- if (lassign) ADD_LABEL(ret, lassign);
- COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
- /* cref value */
- if (poped)
- ADD_INSN1(ret, line, topn, INT2FIX(1)); /* cref value cref */
- else {
- ADD_INSN1(ret, line, dupn, INT2FIX(2)); /* cref value cref value */
- ADD_INSN(ret, line, swap); /* cref value value cref */
- }
- ADD_INSN1(ret, line, setconstant, ID2SYM(mid)); /* cref [value] */
- ADD_LABEL(ret, lfin); /* cref [value] */
- if (!poped) ADD_INSN(ret, line, swap); /* [value] cref */
- ADD_INSN(ret, line, pop); /* [value] */
- }
- else {
- COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
- /* cref obj value */
- ADD_CALL(ret, line, ID2SYM(node->nd_aid), INT2FIX(1));
- /* cref value */
- ADD_INSN(ret, line, swap); /* value cref */
- if (!poped) {
- ADD_INSN1(ret, line, topn, INT2FIX(1)); /* value cref value */
- ADD_INSN(ret, line, swap); /* value value cref */
- }
- ADD_INSN1(ret, line, setconstant, ID2SYM(mid));
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_OP_ASGN_AND:
case NODE_OP_ASGN_OR:{
- LABEL *lfin = NEW_LABEL(line);
+ LABEL *lfin = NEW_LABEL(nd_line(node));
LABEL *lassign;
if (nd_type(node) == NODE_OP_ASGN_OR) {
@@ -4312,32 +3981,32 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
lassign = lfinish[1];
if (!lassign) {
- lassign = NEW_LABEL(line);
+ lassign = NEW_LABEL(nd_line(node));
}
- ADD_INSNL(ret, line, branchunless, lassign);
+ ADD_INSNL(ret, nd_line(node), branchunless, lassign);
}
else {
- lassign = NEW_LABEL(line);
+ lassign = NEW_LABEL(nd_line(node));
}
COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
- ADD_INSN(ret, line, dup);
+ ADD_INSN(ret, nd_line(node), dup);
if (nd_type(node) == NODE_OP_ASGN_AND) {
- ADD_INSNL(ret, line, branchunless, lfin);
+ ADD_INSNL(ret, nd_line(node), branchunless, lfin);
}
else {
- ADD_INSNL(ret, line, branchif, lfin);
+ ADD_INSNL(ret, nd_line(node), branchif, lfin);
}
- ADD_INSN(ret, line, pop);
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -4353,7 +4022,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
DECL_ANCHOR(args);
ID mid = node->nd_mid;
VALUE argc;
- VALUE flag = 0;
+ unsigned long flag = 0;
VALUE parent_block = iseq->compile_data->current_block;
iseq->compile_data->current_block = Qfalse;
@@ -4361,18 +4030,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
INIT_ANCHOR(args);
#if SUPPORT_JOKE
if (nd_type(node) == NODE_VCALL) {
- ID id_bitblt;
- ID id_answer;
-
- CONST_ID(id_bitblt, "bitblt");
- CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
-
- if (mid == id_bitblt) {
- ADD_INSN(ret, line, bitblt);
+ if (mid == idBitblt) {
+ ADD_INSN(ret, nd_line(node), bitblt);
break;
}
- else if (mid == id_answer) {
- ADD_INSN(ret, line, answer);
+ else if (mid == idAnswer) {
+ ADD_INSN(ret, nd_line(node), answer);
break;
}
}
@@ -4380,41 +4043,32 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
{
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)) {
- LABEL *label;
- st_data_t data;
- st_table *labels_table = iseq->compile_data->labels_table;
- ID label_name;
-
- if (!labels_table) {
- labels_table = st_init_numtable();
- iseq->compile_data->labels_table = labels_table;
- }
if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
- label_name = SYM2ID(node->nd_args->nd_head->nd_lit);
- if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
- label = NEW_LABEL(line);
- label->position = line;
- st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
- }
- else {
- label = (LABEL *)data;
+ 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 {
- COMPILE_ERROR((ERROR_ARGS "invalid goto/label format"));
+ rb_bug("invalid goto/label format");
}
if (mid == goto_id) {
- ADD_INSNL(ret, line, jump, label);
+ ADD_INSNL(ret, nd_line(node), jump, label);
}
else {
ADD_LABEL(ret, label);
@@ -4428,7 +4082,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE(recv, "recv", node->nd_recv);
}
else if (type == NODE_FCALL || type == NODE_VCALL) {
- ADD_CALL_RECEIVER(recv, line);
+ ADD_CALL_RECEIVER(recv, nd_line(node));
}
/* args */
@@ -4447,45 +4101,43 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
switch (nd_type(node)) {
case NODE_VCALL:
- flag |= VM_CALL_VCALL;
+ flag |= VM_CALL_VCALL_BIT;
/* VCALL is funcall, so fall through */
case NODE_FCALL:
- flag |= VM_CALL_FCALL;
+ flag |= VM_CALL_FCALL_BIT;
}
- ADD_SEND_R(ret, line, ID2SYM(mid),
+ ADD_SEND_R(ret, nd_line(node), ID2SYM(mid),
argc, parent_block, LONG2FIX(flag));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_SUPER:
case NODE_ZSUPER:{
DECL_ANCHOR(args);
- int argc;
- VALUE flag = 0;
+ 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) {
- VALUE vargc = setup_args(iseq, args, node->nd_args, &flag);
- argc = FIX2INT(vargc);
+ argc = setup_args(iseq, args, node->nd_args, &flag);
}
else {
/* NODE_ZSUPER */
int i;
rb_iseq_t *liseq = iseq->local_iseq;
- int lvar_level = get_lvar_level(iseq);
- argc = liseq->argc;
+ argc = INT2FIX(liseq->argc);
/* normal arguments */
for (i = 0; i < liseq->argc; i++) {
int idx = liseq->local_size - i;
- ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+ ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
}
if (!liseq->arg_simple) {
@@ -4494,18 +4146,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
int j;
for (j = 0; j < liseq->arg_opts - 1; j++) {
int idx = liseq->local_size - (i + j);
- ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+ ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
}
i += j;
- argc = i;
+ argc = INT2FIX(i);
}
if (liseq->arg_rest != -1) {
/* rest argument */
int idx = liseq->local_size - liseq->arg_rest;
- ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
- argc = liseq->arg_rest + 1;
- flag |= VM_CALL_ARGS_SPLAT;
+ 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) {
@@ -4517,63 +4169,43 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
int j;
for (j=0; j<post_len; j++) {
int idx = liseq->local_size - (post_start + j);
- ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+ ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
}
- ADD_INSN1(args, line, newarray, INT2FIX(j));
- ADD_INSN (args, line, concatarray);
+ 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_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+ ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
}
- argc = post_len + post_start;
- }
- }
-
- if (liseq->arg_keyword >= 0) {
- int local_size = liseq->local_size;
- int idx = local_size - liseq->arg_keyword;
- argc++;
- ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
- ADD_SEND (args, line, ID2SYM(rb_intern("dup")), INT2FIX(0));
- for (i = 0; i < liseq->arg_keywords; ++i) {
- ID id = liseq->arg_keyword_table[i];
- idx = local_size - get_local_var_idx(liseq, id);
- ADD_INSN1(args, line, putobject, ID2SYM(id));
- ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
- }
- ADD_SEND(args, line, ID2SYM(id_core_hash_merge_ptr), INT2FIX(i * 2 + 1));
- if (liseq->arg_rest != -1) {
- ADD_INSN1(args, line, newarray, INT2FIX(1));
- ADD_INSN (args, line, concatarray);
- --argc;
+ argc = INT2FIX(post_len + post_start);
}
}
}
}
/* dummy receiver */
- ADD_INSN1(ret, line, putobject, nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
+ ADD_INSN1(ret, nd_line(node), putobject,
+ nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
ADD_SEQ(ret, args);
- ADD_INSN1(ret, line, invokesuper, new_callinfo(iseq, 0, argc, parent_block,
- flag | VM_CALL_SUPER | VM_CALL_FCALL));
+ ADD_INSN3(ret, nd_line(node), invokesuper,
+ argc, parent_block, LONG2FIX(flag));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_ARRAY:{
- compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, poped);
+ compile_array_(iseq, ret, node, Qtrue, poped);
break;
}
case NODE_ZARRAY:{
if (!poped) {
- ADD_INSN1(ret, line, newarray, INT2FIX(0));
+ ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(0));
}
break;
}
@@ -4583,33 +4215,37 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE(ret, "values item", n->nd_head);
n = n->nd_next;
}
- ADD_INSN1(ret, line, newarray, INT2FIX(node->nd_alen));
+ ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(node->nd_alen));
if (poped) {
- ADD_INSN(ret, line, pop);
+ 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, COMPILE_ARRAY_TYPE_HASH);
+ 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:
- ADD_INSN1(ret, line, newhash, INT2FIX(0));
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -4626,25 +4262,25 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
if (is->type == ISEQ_TYPE_METHOD) {
splabel = NEW_LABEL(0);
ADD_LABEL(ret, splabel);
- ADD_ADJUST(ret, line, 0);
+ 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, line, RUBY_EVENT_RETURN);
- ADD_INSN(ret, line, leave);
+ 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, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
}
else {
- ADD_INSN1(ret, line, throw, INT2FIX(0x01) /* TAG_RETURN */ );
+ ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x01) /* TAG_RETURN */ );
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
}
}
@@ -4654,7 +4290,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
case NODE_YIELD:{
DECL_ANCHOR(args);
VALUE argc;
- VALUE flag = 0;
+ unsigned long flag = 0;
INIT_ANCHOR(args);
if (iseq->type == ISEQ_TYPE_TOP) {
@@ -4669,10 +4305,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
ADD_SEQ(ret, args);
- ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), 0, flag));
+ ADD_INSN2(ret, nd_line(node), invokeblock, argc, LONG2FIX(flag));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -4682,7 +4318,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
debugs("id: %s idx: %d\n", rb_id2name(id), idx);
- ADD_INSN2(ret, line, getlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+ ADD_INSN1(ret, nd_line(node), getlocal, INT2FIX(idx));
}
break;
}
@@ -4694,22 +4330,22 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
if (idx < 0) {
rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
}
- ADD_INSN2(ret, line, getlocal, INT2FIX(ls - idx), INT2FIX(lv));
+ ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(ls - idx), INT2FIX(lv));
}
break;
}
case NODE_GVAR:{
- ADD_INSN1(ret, line, getglobal,
- ((VALUE)node->nd_entry | 1));
+ ADD_INSN1(ret, nd_line(node), getglobal,
+ (((long)node->nd_entry) | 1));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_IVAR:{
debugi("nd_vid", node->nd_vid);
if (!poped) {
- ADD_INSN2(ret, line, getinstancevariable,
+ ADD_INSN2(ret, nd_line(node), getinstancevariable,
ID2SYM(node->nd_vid), INT2FIX(iseq->ic_size++));
}
break;
@@ -4718,41 +4354,41 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
debugi("nd_vid", node->nd_vid);
if (iseq->compile_data->option->inline_const_cache) {
- LABEL *lend = NEW_LABEL(line);
+ LABEL *lend = NEW_LABEL(nd_line(node));
int ic_index = iseq->ic_size++;
- ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
- ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
- ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+ ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
+ ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+ ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
ADD_LABEL(ret, lend);
}
else {
- ADD_INSN(ret, line, putnil);
- ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
+ ADD_INSN(ret, nd_line(node), putnil);
+ ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
}
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_CVAR:{
if (!poped) {
- ADD_INSN1(ret, line, getclassvariable,
+ ADD_INSN1(ret, nd_line(node), getclassvariable,
ID2SYM(node->nd_vid));
}
break;
}
case NODE_NTH_REF:{
if (!poped) {
- ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
+ ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
INT2FIX(node->nd_nth << 1));
}
break;
}
case NODE_BACK_REF:{
if (!poped) {
- ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
+ ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
INT2FIX(0x01 | (node->nd_nth << 1)));
}
break;
@@ -4765,10 +4401,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
INIT_ANCHOR(recv);
INIT_ANCHOR(val);
- switch (nd_type(node)) {
+ switch(nd_type(node)) {
case NODE_MATCH:
- ADD_INSN1(recv, line, putobject, node->nd_lit);
- ADD_INSN2(val, line, getspecial, INT2FIX(0),
+ 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:
@@ -4787,30 +4423,30 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
INSN_OF(recv->last) == BIN(putobject) &&
nd_type(node) == NODE_MATCH2) {
ADD_SEQ(ret, val);
- ADD_INSN1(ret, line, opt_regexpmatch1,
+ 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, line, opt_regexpmatch2);
+ ADD_INSN(ret, nd_line(node), opt_regexpmatch2);
}
}
else {
ADD_SEQ(ret, recv);
ADD_SEQ(ret, val);
- ADD_SEND(ret, line, ID2SYM(idEqTilde), INT2FIX(1));
+ ADD_SEND(ret, nd_line(node), ID2SYM(idEqTilde), INT2FIX(1));
}
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_LIT:{
debugp_param("lit", node->nd_lit);
if (!poped) {
- ADD_INSN1(ret, line, putobject, node->nd_lit);
+ ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
}
break;
}
@@ -4818,7 +4454,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
debugp_param("nd_lit", node->nd_lit);
if (!poped) {
OBJ_FREEZE(node->nd_lit);
- ADD_INSN1(ret, line, putstring, node->nd_lit);
+ ADD_INSN1(ret, nd_line(node), putstring, node->nd_lit);
}
break;
}
@@ -4826,28 +4462,28 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
compile_dstr(iseq, ret, node);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_XSTR:{
OBJ_FREEZE(node->nd_lit);
- ADD_CALL_RECEIVER(ret, line);
- ADD_INSN1(ret, line, putobject, node->nd_lit);
- ADD_CALL(ret, line, ID2SYM(idBackquote), INT2FIX(1));
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_DXSTR:{
- ADD_CALL_RECEIVER(ret, line);
+ ADD_CALL_RECEIVER(ret, nd_line(node));
compile_dstr(iseq, ret, node);
- ADD_CALL(ret, line, ID2SYM(idBackquote), INT2FIX(1));
+ ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -4855,10 +4491,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE(ret, "nd_body", node->nd_body);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
else {
- ADD_INSN(ret, line, tostring);
+ ADD_INSN(ret, nd_line(node), tostring);
}
break;
}
@@ -4866,83 +4502,83 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
compile_dregx(iseq, ret, node);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_DREGX_ONCE:{
/* TODO: once? */
- LABEL *lend = NEW_LABEL(line);
+ LABEL *lend = NEW_LABEL(nd_line(node));
int ic_index = iseq->ic_size++;
- ADD_INSN2(ret, line, onceinlinecache, lend, INT2FIX(ic_index));
- ADD_INSN(ret, line, pop);
+ ADD_INSN2(ret, nd_line(node), onceinlinecache, lend, INT2FIX(ic_index));
+ ADD_INSN(ret, nd_line(node), pop);
compile_dregx(iseq, ret, node);
- ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+ ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
ADD_LABEL(ret, lend);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_ARGSCAT:{
if (poped) {
COMPILE(ret, "argscat head", node->nd_head);
- ADD_INSN1(ret, line, splatarray, Qfalse);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+ ADD_INSN(ret, nd_line(node), pop);
COMPILE(ret, "argscat body", node->nd_body);
- ADD_INSN1(ret, line, splatarray, Qfalse);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+ ADD_INSN(ret, nd_line(node), pop);
}
else {
COMPILE(ret, "argscat head", node->nd_head);
COMPILE(ret, "argscat body", node->nd_body);
- ADD_INSN(ret, line, concatarray);
+ ADD_INSN(ret, nd_line(node), concatarray);
}
break;
}
case NODE_ARGSPUSH:{
if (poped) {
COMPILE(ret, "arsgpush head", node->nd_head);
- ADD_INSN1(ret, line, splatarray, Qfalse);
- ADD_INSN(ret, line, pop);
+ ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
+ ADD_INSN(ret, nd_line(node), pop);
COMPILE_(ret, "argspush body", node->nd_body, poped);
}
else {
COMPILE(ret, "arsgpush head", node->nd_head);
COMPILE_(ret, "argspush body", node->nd_body, poped);
- ADD_INSN1(ret, line, newarray, INT2FIX(1));
- ADD_INSN(ret, line, concatarray);
+ 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, line, splatarray, Qtrue);
+ ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
if (poped) {
- ADD_INSN(ret, line, pop);
+ 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, line);
+ ISEQ_TYPE_METHOD, nd_line(node));
debugp_param("defn/iseq", iseqval);
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
- ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
- ADD_INSN1(ret, line, putiseq, iseqval);
- ADD_SEND (ret, line, ID2SYM(id_core_define_method), INT2FIX(3));
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
debugp_param("defn", iseqval);
@@ -4951,52 +4587,52 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
case NODE_DEFS:{
VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
rb_str_dup(rb_id2str(node->nd_mid)),
- ISEQ_TYPE_METHOD, line);
+ ISEQ_TYPE_METHOD, nd_line(node));
debugp_param("defs/iseq", iseqval);
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+ ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
COMPILE(ret, "defs: recv", node->nd_recv);
- ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
- ADD_INSN1(ret, line, putiseq, iseqval);
- ADD_SEND (ret, line, ID2SYM(id_core_define_singleton_method), INT2FIX(3));
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_ALIAS:{
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+ 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, line, ID2SYM(id_core_set_method_alias), INT2FIX(3));
+ ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_method_alias), INT2FIX(3));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_VALIAS:{
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putobject, ID2SYM(node->u1.id));
- ADD_INSN1(ret, line, putobject, ID2SYM(node->u2.id));
- ADD_SEND(ret, line, ID2SYM(id_core_set_variable_alias), INT2FIX(2));
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_UNDEF:{
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+ 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, line, ID2SYM(id_core_undef_method), INT2FIX(2));
+ ADD_SEND(ret, nd_line(node), ID2SYM(id_core_undef_method), INT2FIX(2));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -5005,17 +4641,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
NEW_CHILD_ISEQVAL(
node->nd_body,
rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
- ISEQ_TYPE_CLASS, line);
- VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
- int flags = VM_DEFINECLASS_TYPE_CLASS;
- if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
- if (node->nd_super) flags |= VM_DEFINECLASS_FLAG_HAS_SUPERCLASS;
+ ISEQ_TYPE_CLASS, nd_line(node));
+ compile_cpath(ret, iseq, node->nd_cpath);
COMPILE(ret, "super", node->nd_super);
- ADD_INSN3(ret, line, defineclass,
- ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags));
+ ADD_INSN3(ret, nd_line(node), defineclass,
+ ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(0));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -5023,41 +4656,38 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
VALUE iseqval = NEW_CHILD_ISEQVAL(
node->nd_body,
rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
- ISEQ_TYPE_CLASS, line);
-
- VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
- int flags = VM_DEFINECLASS_TYPE_MODULE;
- if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
- ADD_INSN (ret, line, putnil); /* dummy */
- ADD_INSN3(ret, line, defineclass,
- ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags));
+ 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, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_SCLASS:{
ID singletonclass;
VALUE iseqval =
- NEW_ISEQVAL(node->nd_body, rb_str_new2("singleton class"),
- ISEQ_TYPE_CLASS, line);
+ 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, line, putnil);
+ ADD_INSN (ret, nd_line(node), putnil);
CONST_ID(singletonclass, "singletonclass");
- ADD_INSN3(ret, line, defineclass,
- ID2SYM(singletonclass), iseqval,
- INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
+ ADD_INSN3(ret, nd_line(node), defineclass,
+ ID2SYM(singletonclass), iseqval, INT2FIX(1));
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_COLON2:{
if (rb_is_const_id(node->nd_mid)) {
/* constant */
- LABEL *lend = NEW_LABEL(line);
+ LABEL *lend = NEW_LABEL(nd_line(node));
int ic_index = iseq->ic_size++;
DECL_ANCHOR(pref);
@@ -5068,16 +4698,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
compile_colon2(iseq, node, pref, body);
if (LIST_SIZE_ZERO(pref)) {
if (iseq->compile_data->option->inline_const_cache) {
- ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
+ ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
}
else {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
ADD_SEQ(ret, body);
if (iseq->compile_data->option->inline_const_cache) {
- ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+ ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
ADD_LABEL(ret, lend);
}
}
@@ -5088,38 +4718,38 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
else {
/* function call */
- ADD_CALL_RECEIVER(ret, line);
+ ADD_CALL_RECEIVER(ret, nd_line(node));
COMPILE(ret, "colon2#nd_head", node->nd_head);
- ADD_CALL(ret, line, ID2SYM(node->nd_mid),
+ ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid),
INT2FIX(1));
}
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_COLON3:{
- LABEL *lend = NEW_LABEL(line);
+ LABEL *lend = NEW_LABEL(nd_line(node));
int ic_index = iseq->ic_size++;
- debugi("colon3#nd_mid", node->nd_mid);
+ debugi("colon3#nd_mid", node->nd_mid);
/* add cache insn */
if (iseq->compile_data->option->inline_const_cache) {
- ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
- ADD_INSN(ret, line, pop);
+ ADD_INSN2(ret, nd_line(node), getinlinecache, lend, INT2FIX(ic_index));
+ ADD_INSN(ret, nd_line(node), pop);
}
- ADD_INSN1(ret, line, putobject, rb_cObject);
- ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
+ 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, line, setinlinecache, INT2FIX(ic_index));
+ ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
ADD_LABEL(ret, lend);
}
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -5129,83 +4759,82 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
COMPILE(ret, "min", (NODE *) node->nd_beg);
COMPILE(ret, "max", (NODE *) node->nd_end);
if (poped) {
- ADD_INSN(ret, line, pop);
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
else {
- ADD_INSN1(ret, line, newrange, flag);
+ ADD_INSN1(ret, nd_line(node), newrange, flag);
}
break;
}
case NODE_FLIP2:
case NODE_FLIP3:{
- LABEL *lend = NEW_LABEL(line);
- LABEL *lfin = NEW_LABEL(line);
- LABEL *ltrue = NEW_LABEL(line);
- rb_iseq_t *local_iseq = iseq->local_iseq;
- rb_num_t cnt;
- VALUE key;
-
- cnt = local_iseq->flip_cnt++ + DEFAULT_SPECIAL_VAR_COUNT;
- key = INT2FIX(cnt);
-
- ADD_INSN2(ret, line, getspecial, key, INT2FIX(0));
- ADD_INSNL(ret, line, branchif, lend);
+ 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, line, dup);
- ADD_INSNL(ret, line, branchunless, lfin);
+ ADD_INSN(ret, nd_line(node), dup);
+ ADD_INSNL(ret, nd_line(node), branchunless, lfin);
if (nd_type(node) == NODE_FLIP3) {
- ADD_INSN(ret, line, dup);
- ADD_INSN1(ret, line, setspecial, key);
- ADD_INSNL(ret, line, jump, lfin);
+ 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, line, setspecial, key);
+ ADD_INSN1(ret, nd_line(node), setspecial, key);
}
/* *flip == 1 */
ADD_LABEL(ret, lend);
COMPILE(ret, "flip2 end", node->nd_end);
- ADD_INSNL(ret, line, branchunless, ltrue);
- ADD_INSN1(ret, line, putobject, Qfalse);
- ADD_INSN1(ret, line, setspecial, key);
+ 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, line, putobject, Qtrue);
+ ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
ADD_LABEL(ret, lfin);
break;
}
case NODE_SELF:{
if (!poped) {
- ADD_INSN(ret, line, putself);
+ ADD_INSN(ret, nd_line(node), putself);
}
break;
}
case NODE_NIL:{
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
break;
}
case NODE_TRUE:{
if (!poped) {
- ADD_INSN1(ret, line, putobject, Qtrue);
+ ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
}
break;
}
case NODE_FALSE:{
if (!poped) {
- ADD_INSN1(ret, line, putobject, Qfalse);
+ ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
}
break;
}
case NODE_ERRINFO:{
if (!poped) {
if (iseq->type == ISEQ_TYPE_RESCUE) {
- ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
+ ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
}
else {
rb_iseq_t *ip = iseq;
@@ -5218,29 +4847,24 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
level++;
}
if (ip) {
- ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(level));
+ ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(level));
}
else {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
}
}
}
break;
}
case NODE_DEFINED:{
- if (poped) break;
- if (!node->nd_head) {
- VALUE str = rb_iseq_defined_string(DEFINED_NIL);
- ADD_INSN1(ret, nd_line(node), putobject, str);
- }
- else {
+ if (!poped) {
LABEL *lfinish[2];
- lfinish[0] = NEW_LABEL(line);
+ lfinish[0] = NEW_LABEL(nd_line(node));
lfinish[1] = 0;
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
- ADD_INSN(ret, line, swap);
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), swap);
+ ADD_INSN(ret, nd_line(node), pop);
if (lfinish[1]) {
ADD_LABEL(ret, lfinish[1]);
}
@@ -5249,71 +4873,39 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
break;
}
case NODE_POSTEXE:{
- LABEL *lend = NEW_LABEL(line);
- VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+ 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));
int ic_index = iseq->ic_size++;
- ADD_INSN2(ret, line, onceinlinecache, lend, INT2FIX(ic_index));
- ADD_INSN(ret, line, pop);
+ ADD_INSN2(ret, nd_line(node), onceinlinecache, lend, INT2FIX(ic_index));
+ ADD_INSN(ret, nd_line(node), pop);
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_INSN1(ret, line, putiseq, block);
- ADD_SEND (ret, line, ID2SYM(id_core_set_postexe), INT2FIX(1));
+ 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, line, setinlinecache, INT2FIX(ic_index));
+ ADD_INSN1(ret, nd_line(node), setinlinecache, INT2FIX(ic_index));
ADD_LABEL(ret, lend);
if (poped) {
- ADD_INSN(ret, line, pop);
- }
- break;
- }
- case NODE_KW_ARG:{
- LABEL *default_label = NEW_LABEL(line);
- LABEL *end_label = NEW_LABEL(line);
- int idx, lv, ls;
- ID id = node->nd_body->nd_vid;
-
- ADD_INSN(ret, line, dup);
- ADD_INSN1(ret, line, putobject, ID2SYM(id));
- ADD_SEND(ret, line, ID2SYM(rb_intern("key?")), INT2FIX(1));
- ADD_INSNL(ret, line, branchunless, default_label);
- ADD_INSN(ret, line, dup);
- ADD_INSN1(ret, line, putobject, ID2SYM(id));
- ADD_SEND(ret, line, ID2SYM(rb_intern("delete")), INT2FIX(1));
- switch (nd_type(node->nd_body)) {
- case NODE_LASGN:
- idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
- ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
- break;
- case NODE_DASGN:
- case NODE_DASGN_CURR:
- idx = get_dyna_var_idx(iseq, id, &lv, &ls);
- ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
- break;
- default:
- rb_bug("iseq_compile_each (NODE_KW_ARG): unknown node: %s", ruby_node_name(nd_type(node->nd_body)));
+ ADD_INSN(ret, nd_line(node), pop);
}
- ADD_INSNL(ret, line, jump, end_label);
- ADD_LABEL(ret, default_label);
- COMPILE_POPED(ret, "keyword default argument", node->nd_body);
- ADD_LABEL(ret, end_label);
break;
}
case NODE_DSYM:{
compile_dstr(iseq, ret, node);
if (!poped) {
- ADD_SEND(ret, line, ID2SYM(idIntern), INT2FIX(0));
+ ADD_SEND(ret, nd_line(node), ID2SYM(idIntern), INT2FIX(0));
}
else {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
case NODE_ATTRASGN:{
DECL_ANCHOR(recv);
DECL_ANCHOR(args);
- VALUE flag = 0;
+ unsigned long flag = 0;
VALUE argc;
INIT_ANCHOR(recv);
@@ -5321,8 +4913,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
argc = setup_args(iseq, args, node->nd_args, &flag);
if (node->nd_recv == (NODE *) 1) {
- flag |= VM_CALL_FCALL;
- ADD_INSN(recv, line, putself);
+ flag |= VM_CALL_FCALL_BIT;
+ ADD_INSN(recv, nd_line(node), putself);
}
else {
COMPILE(recv, "recv", node->nd_recv);
@@ -5332,39 +4924,42 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
debugp_param("nd_mid", ID2SYM(node->nd_mid));
if (!poped) {
- ADD_INSN(ret, line, putnil);
+ ADD_INSN(ret, nd_line(node), putnil);
ADD_SEQ(ret, recv);
ADD_SEQ(ret, args);
- if (flag & VM_CALL_ARGS_BLOCKARG) {
- ADD_INSN1(ret, line, topn, INT2FIX(1));
- if (flag & VM_CALL_ARGS_SPLAT) {
- ADD_INSN1(ret, line, putobject, INT2FIX(-1));
- ADD_SEND(ret, line, ID2SYM(idAREF), INT2FIX(1));
- }
- ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
- ADD_INSN (ret, line, pop);
- }
- else if (flag & VM_CALL_ARGS_SPLAT) {
- ADD_INSN(ret, line, dup);
- ADD_INSN1(ret, line, putobject, INT2FIX(-1));
- ADD_SEND(ret, line, ID2SYM(idAREF), INT2FIX(1));
- ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
- ADD_INSN (ret, line, pop);
+ 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, line, setn, FIXNUM_INC(argc, 1));
+ ADD_INSN1(ret, nd_line(node), setn, FIXNUM_INC(argc, 1));
}
}
else {
ADD_SEQ(ret, recv);
ADD_SEQ(ret, args);
}
- ADD_SEND_R(ret, line, ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
- ADD_INSN(ret, line, pop);
+ 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);
@@ -5372,13 +4967,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
case NODE_LAMBDA:{
/* compile same as lambda{...} */
- VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+ VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, nd_line(node));
VALUE argc = INT2FIX(0);
- ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
- ADD_CALL_WITH_BLOCK(ret, line, ID2SYM(idLambda), argc, block);
+ ADD_CALL_RECEIVER(ret, nd_line(node));
+ ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
if (poped) {
- ADD_INSN(ret, line, pop);
+ ADD_INSN(ret, nd_line(node), pop);
}
break;
}
@@ -5438,20 +5033,18 @@ insn_data_to_s_detail(INSN *iobj)
{
rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
VALUE val = Qnil;
- if (0 && iseq) { /* TODO: invalidate now */
+ 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 */
- {
- VALUE v = OPERAND_AT(iobj, j);
- rb_str_concat(str, rb_inspect(v));
- break;
- }
+ 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;
@@ -5460,17 +5053,10 @@ insn_data_to_s_detail(INSN *iobj)
struct rb_global_entry *entry = (struct rb_global_entry *)
(OPERAND_AT(iobj, j) & (~1));
rb_str_cat2(str, rb_id2name(entry->id));
- break;
}
- case TS_IC: /* inline cache */
+ case TS_IC: /* method cache */
rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
break;
- case TS_CALLINFO: /* call info */
- {
- rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, j);
- rb_str_catf(str, "<callinfo:%s, %d>", ci->mid ? rb_id2name(ci->mid) : "", ci->orig_argc);
- break;
- }
case TS_CDHASH: /* case/when condition cache */
rb_str_cat2(str, "<ch>");
break;
@@ -5502,7 +5088,8 @@ dump_disasm_list(struct iseq_link_element *link)
{
iobj = (INSN *)link;
str = insn_data_to_s_detail(iobj);
- printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str), insn_data_line_no(iobj));
+ printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str),
+ insn_data_line_no(iobj));
pos += insn_data_length(iobj);
break;
}
@@ -5532,12 +5119,6 @@ dump_disasm_list(struct iseq_link_element *link)
printf("---------------------\n");
}
-const char *
-rb_insns_name(int i)
-{
- return insn_name_info[i];
-}
-
VALUE
rb_insns_name_array(void)
{
@@ -5588,7 +5169,7 @@ get_exception_sym2type(VALUE sym)
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 == symRedo) return CATCH_TYPE_REDO;
if (sym == symNext) return CATCH_TYPE_NEXT;
sym_inspect = rb_inspect(sym);
rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
@@ -5597,7 +5178,7 @@ get_exception_sym2type(VALUE sym)
}
static int
-iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
+iseq_build_exception(rb_iseq_t *iseq, struct st_table *labels_table,
VALUE exception)
{
int i;
@@ -5626,8 +5207,6 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
lcont = register_label(iseq, labels_table, ptr[4]);
sp = NUM2INT(ptr[5]);
- (void)sp;
-
ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
}
return COMPILE_OK;
@@ -5647,25 +5226,8 @@ insn_make_insn_table(void)
return table;
}
-static VALUE
-iseq_build_load_iseq(rb_iseq_t *iseq, VALUE op)
-{
- VALUE iseqval;
- if (RB_TYPE_P(op, T_ARRAY)) {
- iseqval = rb_iseq_load(op, iseq->self, Qnil);
- }
- else if (CLASS_OF(op) == rb_cISeq) {
- iseqval = op;
- }
- else {
- rb_raise(rb_eSyntaxError, "ISEQ is required");
- }
- iseq_add_mark_object(iseq, iseqval);
- return iseqval;
-}
-
static int
-iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
+iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
VALUE body, struct st_table *labels_table)
{
/* TODO: body should be frozen */
@@ -5673,7 +5235,6 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
long i, len = RARRAY_LEN(body);
int j;
int line_no = 0;
-
/*
* index -> LABEL *label
*/
@@ -5693,22 +5254,22 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
else if (FIXNUM_P(obj)) {
line_no = NUM2INT(obj);
}
- else if (RB_TYPE_P(obj, T_ARRAY)) {
+ else if (TYPE(obj) == T_ARRAY) {
VALUE *argv = 0;
int argc = RARRAY_LENINT(obj) - 1;
- st_data_t insn_id;
+ VALUE insn_id;
VALUE insn;
insn = (argc < 0) ? Qnil : RARRAY_PTR(obj)[0];
- if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 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->location.path), line_no,
+ rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
"unknown instruction: %s", RSTRING_PTR(insn));
}
- if (argc != insn_len((VALUE)insn_id)-1) {
- rb_compile_error(RSTRING_PTR(iseq->location.path), line_no,
+ if (argc != insn_len(insn_id)-1) {
+ rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
"operand size mismatch");
}
@@ -5716,13 +5277,14 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
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((VALUE)insn_id, j)) {
+ 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;
@@ -5734,7 +5296,16 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
case TS_ISEQ:
{
if (op != Qnil) {
- argv[j] = iseq_build_load_iseq(iseq, op);
+ 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;
@@ -5747,30 +5318,8 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
break;
case TS_IC:
argv[j] = op;
- if (NUM2INT(op) >= iseq->ic_size) {
+ if (NUM2INT(op) >= iseq->ic_size)
iseq->ic_size = NUM2INT(op) + 1;
- }
- break;
- case TS_CALLINFO:
- {
- ID mid = 0;
- int orig_argc = 0;
- VALUE block = 0;
- unsigned long flag = 0;
-
- if (!NIL_P(op)) {
- VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
- VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
- VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
- VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("blockptr")));
-
- if (!NIL_P(vmid)) mid = SYM2ID(vmid);
- if (!NIL_P(vflag)) flag = NUM2ULONG(vflag);
- if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
- if (!NIL_P(vblock)) block = iseq_build_load_iseq(iseq, vblock);
- }
- argv[j] = (VALUE)new_callinfo(iseq, mid, orig_argc, block, flag);
- }
break;
case TS_ID:
argv[j] = rb_convert_type(op, T_SYMBOL,
@@ -5792,7 +5341,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
}
break;
default:
- rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type((VALUE)insn_id, j));
+ rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type(insn_id, j));
}
}
}
@@ -5804,16 +5353,15 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
rb_raise(rb_eTypeError, "unexpected object for instruction");
}
}
- validate_labels(iseq, labels_table);
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) {(void)NUM2LONG(v); return v;}
+#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,
@@ -5822,7 +5370,9 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
int i;
ID *tbl;
struct st_table *labels_table = st_init_numtable();
+
DECL_ANCHOR(anchor);
+
INIT_ANCHOR(anchor);
iseq->local_table_size = RARRAY_LENINT(locals);
@@ -5880,10 +5430,10 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
}
/* exception */
- iseq_build_from_ary_exception(iseq, labels_table, exception);
+ iseq_build_exception(iseq, labels_table, exception);
/* body */
- iseq_build_from_ary_body(iseq, anchor, body, labels_table);
+ iseq_build_body(iseq, anchor, body, labels_table);
return iseq->self;
}
diff --git a/complex.c b/complex.c
index ed8924c253..cbbc3b17ce 100644
--- a/complex.c
+++ b/complex.c
@@ -1,12 +1,11 @@
/*
- complex.c: Coded by Tadayoshi Funaba 2008-2012
+ 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 "internal.h"
#include <math.h>
#define NDEBUG
@@ -21,8 +20,7 @@ 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,
- id_i_real, id_i_imag;
+ id_real, id_real_p, id_to_f, id_to_i, id_to_r, id_to_s;
#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
@@ -30,7 +28,7 @@ static ID id_abs, id_abs2, id_arg, id_cmp, id_conj, id_convert,
inline static VALUE \
f_##n(VALUE x, VALUE y)\
{\
- return rb_funcall(x, (op), 1, y);\
+ return rb_funcall(x, op, 1, y);\
}
#define fun1(n) \
@@ -122,7 +120,7 @@ f_mul(VALUE x, VALUE y)
if (FIXNUM_P(y)) {
long iy = FIX2LONG(y);
if (iy == 0) {
- if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM))
+ if (FIXNUM_P(x) || TYPE(x) == T_BIGNUM)
return ZERO;
}
else if (iy == 1)
@@ -131,7 +129,7 @@ f_mul(VALUE x, VALUE y)
else if (FIXNUM_P(x)) {
long ix = FIX2LONG(x);
if (ix == 0) {
- if (FIXNUM_P(y) || RB_TYPE_P(y, T_BIGNUM))
+ if (FIXNUM_P(y) || TYPE(y) == T_BIGNUM)
return ZERO;
}
else if (ix == 1)
@@ -164,21 +162,8 @@ fun1(numerator)
fun1(real)
fun1(real_p)
-inline static VALUE
-f_to_i(VALUE x)
-{
- if (RB_TYPE_P(x, T_STRING))
- return rb_str_to_inum(x, 10, 0);
- return rb_funcall(x, id_to_i, 0);
-}
-inline static VALUE
-f_to_f(VALUE x)
-{
- if (RB_TYPE_P(x, T_STRING))
- return DBL2NUM(rb_str_to_dbl(x, 0));
- return rb_funcall(x, id_to_f, 0);
-}
-
+fun1(to_f)
+fun1(to_i)
fun1(to_r)
fun1(to_s)
@@ -313,7 +298,8 @@ k_complex_p(VALUE x)
inline static VALUE
nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
{
- NEWOBJ_OF(obj, struct RComplex, klass, T_COMPLEX);
+ NEWOBJ(obj, struct RComplex);
+ OBJSETUP(obj, klass, T_COMPLEX);
obj->real = real;
obj->imag = imag;
@@ -373,7 +359,7 @@ f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
#ifdef CANON
static int canonicalization = 0;
-RUBY_FUNC_EXPORTED void
+void
nucomp_canonicalization(int f)
{
canonicalization = f;
@@ -439,8 +425,6 @@ nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
* Complex.rectangular(real[, imag]) -> complex
*
* Returns a complex object which denotes the given rectangular form.
- *
- * Complex.rectangular(1, 2) #=> (1+2i)
*/
static VALUE
nucomp_s_new(int argc, VALUE *argv, VALUE klass)
@@ -480,33 +464,6 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y)
* Complex(x[, y]) -> numeric
*
* Returns x+i*y;
- *
- * Complex(1, 2) #=> (1+2i)
- * Complex('1+2i') #=> (1+2i)
- * Complex(nil) #=> TypeError
- * Complex(1, nil) #=> TypeError
- *
- * Syntax of string form:
- *
- * string form = extra spaces , complex , extra spaces ;
- * complex = real part | [ sign ] , imaginary part
- * | real part , sign , imaginary part
- * | rational , "@" , rational ;
- * real part = rational ;
- * imaginary part = imaginary unit | unsigned rational , imaginary unit ;
- * rational = [ sign ] , unsigned rational ;
- * unsigned rational = numerator | numerator , "/" , denominator ;
- * numerator = integer part | fractional part | integer part , fractional part ;
- * denominator = digits ;
- * integer part = digits ;
- * fractional part = "." , digits , [ ( "e" | "E" ) , [ sign ] , digits ] ;
- * imaginary unit = "i" | "I" | "j" | "J" ;
- * sign = "-" | "+" ;
- * digits = digit , { digit | "_" , digit };
- * digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
- * extra spaces = ? \s* ? ;
- *
- * See String#to_c.
*/
static VALUE
nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
@@ -515,6 +472,7 @@ nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
}
#define imp1(n) \
+extern VALUE rb_math_##n(VALUE x);\
inline static VALUE \
m_##n##_bang(VALUE x)\
{\
@@ -522,6 +480,7 @@ m_##n##_bang(VALUE x)\
}
#define imp2(n) \
+extern VALUE rb_math_##n(VALUE x, VALUE y);\
inline static VALUE \
m_##n##_bang(VALUE x, VALUE y)\
{\
@@ -534,7 +493,9 @@ imp1(cosh)
imp1(exp)
imp2(hypot)
-#define m_hypot(x,y) m_hypot_bang((x),(y))
+#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)
@@ -615,11 +576,6 @@ f_complex_polar(VALUE klass, VALUE x, VALUE y)
* Complex.polar(abs[, arg]) -> complex
*
* Returns a complex object which denotes the given polar form.
- *
- * Complex.polar(3, 0) #=> (3.0+0.0i)
- * Complex.polar(3, Math::PI/2) #=> (1.836909530733566e-16+3.0i)
- * Complex.polar(3, Math::PI) #=> (-3.0+3.673819061467132e-16i)
- * Complex.polar(3, -Math::PI/2) #=> (1.836909530733566e-16-3.0i)
*/
static VALUE
nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
@@ -644,9 +600,6 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
* cmp.real -> real
*
* Returns the real part.
- *
- * Complex(7).real #=> 7
- * Complex(9, -4).real #=> 9
*/
static VALUE
nucomp_real(VALUE self)
@@ -661,9 +614,6 @@ nucomp_real(VALUE self)
* cmp.imaginary -> real
*
* Returns the imaginary part.
- *
- * Complex(7).imaginary #=> 0
- * Complex(9, -4).imaginary #=> -4
*/
static VALUE
nucomp_imag(VALUE self)
@@ -677,8 +627,6 @@ nucomp_imag(VALUE self)
* -cmp -> complex
*
* Returns negation of the value.
- *
- * -Complex(1, 2) #=> (-1-2i)
*/
static VALUE
nucomp_negate(VALUE self)
@@ -716,12 +664,6 @@ f_addsub(VALUE self, VALUE other,
* cmp + numeric -> complex
*
* Performs addition.
- *
- * Complex(2, 3) + Complex(2, 3) #=> (4+6i)
- * Complex(900) + Complex(1) #=> (901+0i)
- * Complex(-2, 9) + Complex(-9, 2) #=> (-11+11i)
- * Complex(9, 8) + 4 #=> (13+8i)
- * Complex(20, 9) + 9.8 #=> (29.8+9i)
*/
static VALUE
nucomp_add(VALUE self, VALUE other)
@@ -734,12 +676,6 @@ nucomp_add(VALUE self, VALUE other)
* cmp - numeric -> complex
*
* Performs subtraction.
- *
- * Complex(2, 3) - Complex(2, 3) #=> (0+0i)
- * Complex(900) - Complex(1) #=> (899+0i)
- * Complex(-2, 9) - Complex(-9, 2) #=> (7+7i)
- * Complex(9, 8) - 4 #=> (5+8i)
- * Complex(20, 9) - 9.8 #=> (10.2+9i)
*/
static VALUE
nucomp_sub(VALUE self, VALUE other)
@@ -752,12 +688,6 @@ nucomp_sub(VALUE self, VALUE other)
* cmp * numeric -> complex
*
* Performs multiplication.
- *
- * Complex(2, 3) * Complex(2, 3) #=> (-5+12i)
- * Complex(900) * Complex(1) #=> (900+0i)
- * Complex(-2, 9) * Complex(-9, 2) #=> (0-85i)
- * Complex(9, 8) * 4 #=> (36+32i)
- * Complex(20, 9) * 9.8 #=> (196.0+88.2i)
*/
static VALUE
nucomp_mul(VALUE self, VALUE other)
@@ -845,11 +775,10 @@ f_divide(VALUE self, VALUE other,
*
* Performs division.
*
- * Complex(2, 3) / Complex(2, 3) #=> ((1/1)+(0/1)*i)
- * Complex(900) / Complex(1) #=> ((900/1)+(0/1)*i)
- * Complex(-2, 9) / Complex(-9, 2) #=> ((36/85)-(77/85)*i)
- * Complex(9, 8) / 4 #=> ((9/4)+(2/1)*i)
- * Complex(20, 9) / 9.8 #=> (2.0408163265306123+0.9183673469387754i)
+ * 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)
@@ -865,7 +794,9 @@ nucomp_div(VALUE self, VALUE other)
*
* Performs division as each part is a float, never returns a float.
*
- * Complex(11, 22).fdiv(3) #=> (3.6666666666666665+7.333333333333333i)
+ * For example:
+ *
+ * Complex(11,22).fdiv(3) #=> (3.6666666666666665+7.333333333333333i)
*/
static VALUE
nucomp_fdiv(VALUE self, VALUE other)
@@ -885,13 +816,15 @@ f_reciprocal(VALUE x)
*
* Performs exponentiation.
*
- * Complex('i') ** 2 #=> (-1+0i)
- * Complex(-8) ** Rational(1, 3) #=> (1.0000000000000002+1.7320508075688772i)
+ * 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_numeric_p(other) && k_exact_zero_p(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)))
@@ -939,7 +872,7 @@ nucomp_expt(VALUE self, VALUE other)
if (r)
break;
- x = nucomp_s_new_internal(CLASS_OF(self),
+ 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));
@@ -972,12 +905,6 @@ nucomp_expt(VALUE self, VALUE other)
* cmp == object -> true or false
*
* Returns true if cmp equals object numerically.
- *
- * Complex(2, 3) == Complex(2, 3) #=> true
- * Complex(5) == 5 #=> true
- * Complex(0) == 0.0 #=> true
- * Complex('1/3') == 0.33 #=> false
- * Complex('1/2') == '1/2' #=> false
*/
static VALUE
nucomp_eqeq_p(VALUE self, VALUE other)
@@ -1002,7 +929,7 @@ 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 (RB_TYPE_P(other, T_COMPLEX))
+ if (TYPE(other) == T_COMPLEX)
return rb_assoc_new(other, self);
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
@@ -1016,9 +943,6 @@ nucomp_coerce(VALUE self, VALUE other)
* cmp.magnitude -> real
*
* Returns the absolute part of its polar form.
- *
- * Complex(-1).abs #=> 1
- * Complex(3.0, -4.0).abs #=> 5.0
*/
static VALUE
nucomp_abs(VALUE self)
@@ -1045,9 +969,6 @@ nucomp_abs(VALUE self)
* cmp.abs2 -> real
*
* Returns square of the absolute value.
- *
- * Complex(-1).abs2 #=> 1
- * Complex(3.0, -4.0).abs2 #=> 25.0
*/
static VALUE
nucomp_abs2(VALUE self)
@@ -1064,8 +985,6 @@ nucomp_abs2(VALUE self)
* cmp.phase -> float
*
* Returns the angle part of its polar form.
- *
- * Complex.polar(3, Math::PI/2).arg #=> 1.5707963267948966
*/
static VALUE
nucomp_arg(VALUE self)
@@ -1080,8 +999,6 @@ nucomp_arg(VALUE self)
* cmp.rectangular -> array
*
* Returns an array; [cmp.real, cmp.imag].
- *
- * Complex(1, 2).rectangular #=> [1, 2]
*/
static VALUE
nucomp_rect(VALUE self)
@@ -1095,8 +1012,6 @@ nucomp_rect(VALUE self)
* cmp.polar -> array
*
* Returns an array; [cmp.abs, cmp.arg].
- *
- * Complex(1, 2).polar #=> [2.23606797749979, 1.1071487177940904]
*/
static VALUE
nucomp_polar(VALUE self)
@@ -1110,8 +1025,6 @@ nucomp_polar(VALUE self)
* cmp.conjugate -> complex
*
* Returns the complex conjugate.
- *
- * Complex(1, 2).conjugate #=> (1-2i)
*/
static VALUE
nucomp_conj(VALUE self)
@@ -1158,11 +1071,13 @@ nucomp_inexact_p(VALUE 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).
+ * Returns the denominator (lcm of both denominator, real and imag).
*
* See numerator.
*/
@@ -1179,6 +1094,8 @@ nucomp_denominator(VALUE self)
*
* Returns the numerator.
*
+ * For example:
+ *
* 1 2 3+4i <- numerator
* - + -i -> ----
* 2 3 6 <- denominator
@@ -1240,10 +1157,6 @@ nucomp_eql_p(VALUE self, VALUE other)
inline static VALUE
f_signbit(VALUE x)
{
-#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
- !defined(signbit)
- extern int signbit(double);
-#endif
switch (TYPE(x)) {
case T_FLOAT: {
double f = RFLOAT_VALUE(x);
@@ -1284,12 +1197,6 @@ f_format(VALUE self, VALUE (*func)(VALUE))
* cmp.to_s -> string
*
* Returns the value as a string.
- *
- * Complex(2).to_s #=> "2+0i"
- * Complex('-8/6').to_s #=> "-4/3+0i"
- * Complex('1/2i').to_s #=> "0+1/2i"
- * Complex(0, Float::INFINITY).to_s #=> "0+Infinity*i"
- * Complex(Float::NAN, Float::NAN).to_s #=> "NaN+NaN*i"
*/
static VALUE
nucomp_to_s(VALUE self)
@@ -1302,12 +1209,6 @@ nucomp_to_s(VALUE self)
* cmp.inspect -> string
*
* Returns the value as a string for inspection.
- *
- * Complex(2).inspect #=> "(2+0i)"
- * Complex('-8/6').inspect #=> "((-4/3)+0i)"
- * Complex('1/2i').inspect #=> "(0+(1/2)*i)"
- * Complex(0, Float::INFINITY).inspect #=> "(0+Infinity*i)"
- * Complex(Float::NAN, Float::NAN).inspect #=> "(NaN+NaN*i)"
*/
static VALUE
nucomp_inspect(VALUE self)
@@ -1323,25 +1224,6 @@ nucomp_inspect(VALUE self)
/* :nodoc: */
static VALUE
-nucomp_dumper(VALUE self)
-{
- return self;
-}
-
-/* :nodoc: */
-static VALUE
-nucomp_loader(VALUE self, VALUE a)
-{
- get_dat1(self);
-
- dat->real = rb_ivar_get(a, id_i_real);
- dat->imag = rb_ivar_get(a, id_i_imag);
-
- return self;
-}
-
-/* :nodoc: */
-static VALUE
nucomp_marshal_dump(VALUE self)
{
VALUE a;
@@ -1356,11 +1238,11 @@ nucomp_marshal_dump(VALUE self)
static VALUE
nucomp_marshal_load(VALUE self, VALUE a)
{
+ get_dat1(self);
Check_Type(a, T_ARRAY);
- if (RARRAY_LEN(a) != 2)
- rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
- rb_ivar_set(self, id_i_real, RARRAY_PTR(a)[0]);
- rb_ivar_set(self, id_i_imag, RARRAY_PTR(a)[1]);
+ dat->real = RARRAY_PTR(a)[0];
+ dat->imag = RARRAY_PTR(a)[1];
+ rb_copy_generic_ivar(self, a);
return self;
}
@@ -1399,12 +1281,7 @@ rb_Complex(VALUE x, VALUE y)
* call-seq:
* cmp.to_i -> integer
*
- * Returns the value as an integer if possible (the imaginary part
- * should be exactly zero).
- *
- * Complex(1, 0).to_i #=> 1
- * Complex(1, 0.0).to_i # RangeError
- * Complex(1, 2).to_i # RangeError
+ * Returns the value as an integer if possible.
*/
static VALUE
nucomp_to_i(VALUE self)
@@ -1423,12 +1300,7 @@ nucomp_to_i(VALUE self)
* call-seq:
* cmp.to_f -> float
*
- * Returns the value as a float if possible (the imaginary part should
- * be exactly zero).
- *
- * Complex(1, 0).to_f #=> 1.0
- * Complex(1, 0.0).to_f # RangeError
- * Complex(1, 2).to_f # RangeError
+ * Returns the value as a float if possible.
*/
static VALUE
nucomp_to_f(VALUE self)
@@ -1447,14 +1319,7 @@ nucomp_to_f(VALUE self)
* call-seq:
* cmp.to_r -> rational
*
- * Returns the value as a rational if possible (the imaginary part
- * should be exactly zero).
- *
- * Complex(1, 0).to_r #=> (1/1)
- * Complex(1, 0.0).to_r # RangeError
- * Complex(1, 2).to_r # RangeError
- *
- * See rationalize.
+ * Returns the value as a rational if possible.
*/
static VALUE
nucomp_to_r(VALUE self)
@@ -1473,43 +1338,14 @@ nucomp_to_r(VALUE self)
* call-seq:
* cmp.rationalize([eps]) -> rational
*
- * Returns the value as a rational if possible (the imaginary part
- * should be exactly zero).
- *
- * Complex(1.0/3, 0).rationalize #=> (1/3)
- * Complex(1, 0.0).rationalize # RangeError
- * Complex(1, 2).rationalize # RangeError
- *
- * See to_r.
+ * 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)
{
- get_dat1(self);
-
rb_scan_args(argc, argv, "01", NULL);
-
- 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 rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv);
-}
-
-/*
- * call-seq:
- * complex.to_c -> self
- *
- * Returns self.
- *
- * Complex(2).to_c #=> (2+0i)
- * Complex(-8, 6).to_c #=> (-8+6i)
- */
-static VALUE
-nucomp_to_c(VALUE self)
-{
- return self;
+ return nucomp_to_r(self);
}
/*
@@ -1536,306 +1372,175 @@ numeric_to_c(VALUE self)
return rb_complex_new1(self);
}
-#include <ctype.h>
+static VALUE comp_pat0, comp_pat1, comp_pat2, a_slash, a_dot_and_an_e,
+ null_string, underscores_pat, an_underscore;
-inline static int
-issign(int c)
-{
- return (c == '-' || c == '+');
-}
+#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 int
-read_sign(const char **s,
- char **b)
+static void
+make_patterns(void)
{
- int sign = '?';
+ 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 (issign(**s)) {
- sign = **b = **s;
- (*s)++;
- (*b)++;
- }
- return sign;
-}
+ if (comp_pat0) return;
-inline static int
-isdecimal(int c)
-{
- return isdigit((unsigned char)c);
-}
+ comp_pat0 = rb_reg_new(comp_pat0_source, sizeof comp_pat0_source - 1, 0);
+ rb_gc_register_mark_object(comp_pat0);
-static int
-read_digits(const char **s, int strict,
- char **b)
-{
- int us = 1;
+ comp_pat1 = rb_reg_new(comp_pat1_source, sizeof comp_pat1_source - 1, 0);
+ rb_gc_register_mark_object(comp_pat1);
- if (!isdecimal(**s))
- return 0;
+ comp_pat2 = rb_reg_new(comp_pat2_source, sizeof comp_pat2_source - 1, 0);
+ rb_gc_register_mark_object(comp_pat2);
- while (isdecimal(**s) || **s == '_') {
- if (**s == '_') {
- if (strict) {
- if (us)
- return 0;
- }
- us = 1;
- }
- else {
- **b = **s;
- (*b)++;
- us = 0;
- }
- (*s)++;
- }
- if (us)
- do {
- (*s)--;
- } while (**s == '_');
- return 1;
-}
+ a_slash = rb_usascii_str_new2("/");
+ rb_gc_register_mark_object(a_slash);
-inline static int
-islettere(int c)
-{
- return (c == 'e' || c == 'E');
-}
+ a_dot_and_an_e = rb_usascii_str_new2(".eE");
+ rb_gc_register_mark_object(a_dot_and_an_e);
-static int
-read_num(const char **s, int strict,
- char **b)
-{
- if (**s != '.') {
- if (!read_digits(s, strict, b))
- return 0;
- }
+ null_string = rb_usascii_str_new2("");
+ rb_gc_register_mark_object(null_string);
- if (**s == '.') {
- **b = **s;
- (*s)++;
- (*b)++;
- if (!read_digits(s, strict, b)) {
- (*b)--;
- return 0;
- }
- }
+ underscores_pat = rb_reg_new(underscores_pat_source,
+ sizeof underscores_pat_source - 1, 0);
+ rb_gc_register_mark_object(underscores_pat);
- if (islettere(**s)) {
- **b = **s;
- (*s)++;
- (*b)++;
- read_sign(s, b);
- if (!read_digits(s, strict, b)) {
- (*b)--;
- return 0;
- }
- }
- return 1;
+ an_underscore = rb_usascii_str_new2("_");
+ rb_gc_register_mark_object(an_underscore);
}
-inline static int
-read_den(const char **s, int strict,
- char **b)
-{
- if (!read_digits(s, strict, b))
- return 0;
- return 1;
-}
+#define id_match rb_intern("match")
+#define f_match(x,y) rb_funcall(x, id_match, 1, y)
-static int
-read_rat_nos(const char **s, int strict,
- char **b)
-{
- if (!read_num(s, strict, b))
- return 0;
- if (**s == '/') {
- **b = **s;
- (*s)++;
- (*b)++;
- if (!read_den(s, strict, b)) {
- (*b)--;
- return 0;
- }
- }
- return 1;
-}
+#define id_aref rb_intern("[]")
+#define f_aref(x,y) rb_funcall(x, id_aref, 1, y)
-static int
-read_rat(const char **s, int strict,
- char **b)
-{
- read_sign(s, b);
- if (!read_rat_nos(s, strict, b))
- return 0;
- return 1;
-}
+#define id_post_match rb_intern("post_match")
+#define f_post_match(x) rb_funcall(x, id_post_match, 0)
-inline static int
-isimagunit(int c)
-{
- return (c == 'i' || c == 'I' ||
- c == 'j' || c == 'J');
-}
-
-VALUE rb_cstr_to_rat(const char *, int);
-
-static VALUE
-str2num(char *s)
-{
- if (strchr(s, '/'))
- return rb_cstr_to_rat(s, 0);
- if (strpbrk(s, ".eE"))
- return DBL2NUM(rb_cstr_to_dbl(s, 0));
- return rb_cstr_to_inum(s, 10, 0);
-}
+#define id_split rb_intern("split")
+#define f_split(x,y) rb_funcall(x, id_split, 1, y)
-static int
-read_comp(const char **s, int strict,
- VALUE *ret, char **b)
-{
- char *bb;
- int sign;
- VALUE num, num2;
+#define id_include_p rb_intern("include?")
+#define f_include_p(x,y) rb_funcall(x, id_include_p, 1, y)
- bb = *b;
+#define id_count rb_intern("count")
+#define f_count(x,y) rb_funcall(x, id_count, 1, y)
- sign = read_sign(s, b);
+#define id_gsub_bang rb_intern("gsub!")
+#define f_gsub_bang(x,y,z) rb_funcall(x, id_gsub_bang, 2, y, z)
- if (isimagunit(**s)) {
- (*s)++;
- num = INT2FIX((sign == '-') ? -1 : + 1);
- *ret = rb_complex_new2(ZERO, num);
- return 1; /* e.g. "i" */
- }
+static VALUE
+string_to_c_internal(VALUE self)
+{
+ VALUE s;
- if (!read_rat_nos(s, strict, b)) {
- **b = '\0';
- num = str2num(bb);
- *ret = rb_complex_new2(num, ZERO);
- return 0; /* e.g. "-" */
- }
- **b = '\0';
- num = str2num(bb);
+ s = self;
- if (isimagunit(**s)) {
- (*s)++;
- *ret = rb_complex_new2(ZERO, num);
- return 1; /* e.g. "3i" */
- }
+ if (RSTRING_LEN(s) == 0)
+ return rb_assoc_new(Qnil, self);
- if (**s == '@') {
- int st;
-
- (*s)++;
- bb = *b;
- st = read_rat(s, strict, b);
- **b = '\0';
- if (strlen(bb) < 1 ||
- !isdecimal(*(bb + strlen(bb) - 1))) {
- *ret = rb_complex_new2(num, ZERO);
- return 0; /* e.g. "1@-" */
+ {
+ 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;
}
- num2 = str2num(bb);
- *ret = rb_complex_polar(num, num2);
- if (!st)
- return 0; /* e.g. "1@2." */
- else
- return 1; /* e.g. "1@2" */
- }
-
- if (issign(**s)) {
- bb = *b;
- sign = read_sign(s, b);
- if (isimagunit(**s))
- num2 = INT2FIX((sign == '-') ? -1 : + 1);
- else {
- if (!read_rat_nos(s, strict, b)) {
- *ret = rb_complex_new2(num, ZERO);
- return 0; /* e.g. "1+xi" */
+ 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;
}
- **b = '\0';
- num2 = str2num(bb);
}
- if (!isimagunit(**s)) {
- *ret = rb_complex_new2(num, ZERO);
- return 0; /* e.g. "1+3x" */
+ 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;
}
- (*s)++;
- *ret = rb_complex_new2(num, num2);
- return 1; /* e.g. "1+2i" */
- }
- /* !(@, - or +) */
- {
- *ret = rb_complex_new2(num, ZERO);
- return 1; /* e.g. "3" */
- }
-}
-
-inline static void
-skip_ws(const char **s)
-{
- while (isspace((unsigned char)**s))
- (*s)++;
-}
-
-static int
-parse_comp(const char *s, int strict,
- VALUE *num)
-{
- char *buf, *b;
- VALUE tmp;
- int ret = 1;
-
- buf = ALLOCV_N(char, tmp, strlen(s) + 1);
- b = buf;
-
- skip_ws(&s);
- if (!read_comp(&s, strict, num, &b)) {
- ret = 0;
- }
- else {
- skip_ws(&s);
-
- if (strict)
- if (*s != '\0')
- ret = 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);
}
- ALLOCV_END(tmp);
-
- return ret;
}
static VALUE
string_to_c_strict(VALUE self)
{
- char *s;
- VALUE num;
-
- rb_must_asciicompat(self);
-
- s = RSTRING_PTR(self);
-
- if (!s || memchr(s, '\0', RSTRING_LEN(self)))
- rb_raise(rb_eArgError, "string contains null byte");
-
- if (s && s[RSTRING_LEN(self)]) {
- rb_str_modify(self);
- s = RSTRING_PTR(self);
- s[RSTRING_LEN(self)] = '\0';
- }
-
- if (!s)
- s = (char *)"";
-
- if (!parse_comp(s, 1, &num)) {
- VALUE ins = f_inspect(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(ins));
+ StringValuePtr(s));
}
-
- return num;
+ 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
@@ -1845,6 +1550,8 @@ string_to_c_strict(VALUE self)
* sequences can be separated 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)
@@ -1856,31 +1563,23 @@ string_to_c_strict(VALUE self)
* '-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)
- *
- * See Kernel.Complex.
*/
static VALUE
string_to_c(VALUE self)
{
- char *s;
- VALUE num;
-
- rb_must_asciicompat(self);
+ VALUE s, a, backref;
- s = RSTRING_PTR(self);
-
- if (s && s[RSTRING_LEN(self)]) {
- rb_str_modify(self);
- s = RSTRING_PTR(self);
- s[RSTRING_LEN(self)] = '\0';
- }
+ backref = rb_backref_get();
+ rb_match_busy(backref);
- if (!s)
- s = (char *)"";
+ s = f_gsub(self, underscores_pat, an_underscore);
+ a = string_to_c_internal(s);
- (void)parse_comp(s, 0, &num);
+ rb_backref_set(backref);
- return num;
+ if (!NIL_P(RARRAY_PTR(a)[0]))
+ return RARRAY_PTR(a)[0];
+ return rb_complex_new1(INT2FIX(0));
}
static VALUE
@@ -1947,7 +1646,7 @@ nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
if (argc == 1) {
if (k_numeric_p(a1) && !f_real_p(a1))
return a1;
- /* should raise exception for consistency */
+ /* expect raise exception for consistency */
if (!k_numeric_p(a1))
return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
}
@@ -2114,7 +1813,6 @@ float_arg(VALUE self)
void
Init_Complex(void)
{
- VALUE compat;
#undef rb_intern
#define rb_intern(str) rb_intern_const(str)
@@ -2144,8 +1842,6 @@ Init_Complex(void)
id_to_i = rb_intern("to_i");
id_to_r = rb_intern("to_r");
id_to_s = rb_intern("to_s");
- id_i_real = rb_intern("@real");
- id_i_imag = rb_intern("@image"); /* @image, not @imag */
rb_cComplex = rb_define_class("Complex", rb_cNumeric);
@@ -2234,10 +1930,8 @@ Init_Complex(void)
rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
- rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
- compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject);
- rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
- rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader);
+ rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
+ rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load, 1);
/* --- */
@@ -2245,10 +1939,11 @@ Init_Complex(void)
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_cComplex, "to_c", nucomp_to_c, 0);
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);
@@ -2272,9 +1967,6 @@ Init_Complex(void)
rb_define_method(rb_cFloat, "angle", float_arg, 0);
rb_define_method(rb_cFloat, "phase", float_arg, 0);
- /*
- * The imaginary unit.
- */
rb_define_const(rb_cComplex, "I",
f_complex_new_bang2(rb_cComplex, ZERO, ONE));
}
diff --git a/configure.in b/configure.in
index 3c6ce92f81..52b9320d09 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
+dnl {
AC_INIT()
-{
AC_CONFIG_AUX_DIR(tool)
AC_PREREQ(2.60)
@@ -9,25 +9,7 @@ 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([RUBY_RM_RECURSIVE], [
-m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
-# suppress error messages, rm: cannot remove 'conftest.dSYM', from
-# AC_EGREP_CPP with CFLAGS=-g on Darwin.
-AS_CASE([$build_os], [darwin*], [
-rm() {
- rm_recursive=''
- for arg do
- AS_CASE("$arg",
- [--*], [],
- [-*r*], [break],
- [conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
- [])
- done
- command rm $rm_recursive "[$]@"
-}
-])])])
-
-{ # environment section
+dnl environment section {
AC_ARG_WITH(baseruby,
AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
@@ -37,13 +19,8 @@ AC_ARG_WITH(baseruby,
[
BASERUBY="ruby"
])
-if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then
- if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'p 42' 2>/dev/null`" = 42; then
- BASERUBY="$BASERUBY --disable=gems"
- fi
-else
+test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false"
-fi
AC_SUBST(BASERUBY)
AC_DEFUN([RUBY_MINGW32],
@@ -56,106 +33,18 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
#endif
], rb_cv_mingw32=yes,rb_cv_mingw32=no)
rm -f conftest*])
-if test "$rb_cv_mingw32" = yes; then
- target_os="mingw32"
- : ${ac_tool_prefix:="`expr "$CC" : ['\(.*-\)g\?cc[^/]*$']`"}
-fi
-])
+test "$rb_cv_mingw32" = yes && target_os="mingw32"
+ ])
AS_CASE(["$target_os"], [mingw*msvc], [
target_os="`echo ${target_os} | sed 's/msvc$//'`"
-])
-AS_CASE(["$target_cpu-$target_os"], [x86_64-mingw*], [
-target_cpu=x64
-])
-])
-
-AC_DEFUN([RUBY_NACL],
-[
- AS_CASE(["${host_os}"],
-[nacl], [
- ac_cv_exeext=.nexe
- host_vendor=chromium
- ac_cv_host=chromium
- AC_MSG_CHECKING([wheather \$NACL_SDK_ROOT is set])
- if test x"${NACL_SDK_ROOT}" = x; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([You need to set \$NACL_SDK_ROOT environment variable to build for NativeClient])
- fi
- AC_MSG_RESULT([yes])
-
- nacl_cv_build_variant=glibc
- AC_ARG_WITH(newlib,
- AS_HELP_STRING([--with-newlib], [uses newlib version of NativeClient SDK]),
- [AS_CASE([$withval],
- [no], [nacl_cv_build_variant=glibc],
- [yes], [nacl_cv_build_variant=newlib])])
-
- AS_CASE(["$build_cpu"],
- [x86_64|i?86], [nacl_cv_cpu_nick=x86], [nacl_cv_cpu_nick=$build_cpu])
- AS_CASE(["$build_os"],
- [linux*], [nacl_cv_os_nick=linux],
- [darwin*], [nacl_cv_os_nick=mac],
- [cygwin*|mingw*], [nacl_cv_os_nick=win],
- [nacl_cv_os_nick=$build_os])
-
- host="$host_cpu-chromium-$host_os-"
- ac_tool_prefix="$host_cpu-nacl-"
-
- AC_MSG_CHECKING([NativeClient toolchain])
- if test -d \
- "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"; then
- NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"
- else
- AS_CASE(
- ["${nacl_cv_build_variant}"],
- [glibc], [if test \
- -d "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_newlib" \
- -a -d "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}"; then
- NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}"
- fi],
- [newlib], [ NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}" ])
- fi
- if test ! -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/${ac_tool_prefix}gcc"; then
- if test "${build_cpu}" = i686 -a -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/nacl-gcc"; then
- ac_tool_prefix=nacl-
- fi
- if test "${build_cpu}" = x86_64 -a -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/nacl-gcc"; then
- ac_tool_prefix=nacl64-
- fi
- fi
- if test -z "${NACL_TOOLCHAIN}"; then
- AC_MSG_ERROR([Unrecognized --host and --build combination or NaCl SDK is not installed])
- fi
- AC_MSG_RESULT(${NACL_TOOLCHAIN})
-
- AC_MSG_CHECKING([path to SDK])
- if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
- PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
- fi
-
- AC_SUBST(NACL_TOOLCHAIN)
- AC_SUBST(NACL_SDK_ROOT)
- AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant)
-])])
-
-AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
-[AS_CASE(["${host_os}"],
-[nacl], [
- AC_CHECK_TYPES([struct PPB_Core, struct PPB_Messaging, struct PPB_Var,
- struct PPB_URLLoader, struct PPB_URLRequestInfo,
- struct PPB_URLResponseInfo, struct PPB_FileRef,
- struct PPP_Instance])
-])
-])
+ ])])
AC_DEFUN([RUBY_CPPOUTFILE],
[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS='-o conftest-1.i'
-rb_cv_cppoutfile=no
-AC_TRY_CPP([test-for-cppout],
- [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes])
-CPPFLAGS="$save_CPPFLAGS"
+[cppflags=$CPPFLAGS
+CPPFLAGS='-o conftest.i'
+AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no)
+CPPFLAGS=$cppflags
rm -f conftest*])
if test "$rb_cv_cppoutfile" = yes; then
CPPOUTFILE='-o conftest.i'
@@ -177,7 +66,7 @@ fi
GNU_LD=$rb_cv_prog_gnu_ld
AC_SUBST(GNU_LD)])
-eval `sed -n 's/^#define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/include/ruby/version.h`
+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)
@@ -190,11 +79,10 @@ RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/ver
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)
-RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
-AC_DEFINE(CANONICALIZATION_FOR_MATHN)
+if test "$MAJOR" = "1"; then
+ AC_DEFINE(CANONICALIZATION_FOR_MATHN)
+fi
dnl checks for alternative programs
-AC_CANONICAL_BUILD
-RUBY_RM_RECURSIVE
AC_ARG_WITH(gcc,
AS_HELP_STRING([--without-gcc], [never use gcc]),
[
@@ -208,16 +96,7 @@ then
AC_MSG_ERROR(cached CC is different -- throw away $cache_file
(it is also a good idea to do 'make clean' before compiling))
fi
-AS_CASE(["$build_os"],
- [darwin1*.*], [
- AS_CASE(["x$CC"],
- [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
- [xgcc|x/usr/bin/gcc], [: ${CXX=g++}],
- [xcc|x/usr/bin/cc], [: ${CXX=c++}],
- [xclang|x/usr/bin/clang], [: ${CXX=clang++}])
- ])
test -z "$CC" || ac_cv_prog_CC="$CC"
-test -z "$CXX" || ac_cv_prog_CXX="$CXX"
if test "$program_prefix" = NONE; then
program_prefix=
@@ -226,9 +105,6 @@ 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_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
-AC_DEFINE_UNQUOTED(RUBY_BASE_NAME, "${RUBY_BASE_NAME}" !<verconf>!)
-AC_DEFINE_UNQUOTED(RUBY_VERSION_NAME, RUBY_BASE_NAME"-"RUBY_LIB_VERSION !<verconf>!)
AC_CANONICAL_TARGET
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
@@ -255,7 +131,7 @@ AC_DEFUN([RUBY_PREPEND_OPTIONS],
$1="[$]{rb_opts}[$]$1"; }])
AC_ARG_WITH(arch,
- AS_HELP_STRING([--with-arch=ARCHS],
+ AS_HELP_STRING([--with-arch=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
@@ -275,10 +151,9 @@ AC_MSG_RESULT([$ARCH_FLAG])
AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
# RUBY_UNIVERSAL_ARCH begin
-ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
-unset universal_binary universal_archnames
+unset ARCH_FLAG universal_binary universal_archnames
if test ${target_archs+set}; then
AC_MSG_CHECKING([target architectures])
target_archs=`echo $target_archs | tr , ' '`
@@ -313,8 +188,8 @@ if test ${target_archs+set}; then
else
if test x"$target_cpu" != x"${target_archs}"; then
echo 'int main(){return 0;}' > conftest.c
- if $CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1; then
- rm -fr conftest.*
+ if $CC $CFLAGS $ARCH_FLAG conftest.c > /dev/null 2>&1; then
+ rm -f conftest.* a.out
else
RUBY_DEFAULT_ARCH("$target_archs")
fi
@@ -323,6 +198,8 @@ if test ${target_archs+set}; then
fi
AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+ CFLAGS="$CFLAGS ${ARCH_FLAG}"
+ LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
else
if test x"$target_alias" = x; then
AS_CASE(["$target_os"],
@@ -355,10 +232,6 @@ if test "${target_archs}" != "${rb_cv_target_archs-${target_archs}}"; then
else
rb_cv_target_archs=${target_archs}
fi
-if test "x${ARCH_FLAG}" != x; then
- CFLAGS="$CFLAGS ${ARCH_FLAG}"
- LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
-fi
# RUBY_UNIVERSAL_ARCH end
])
@@ -388,31 +261,21 @@ if test -z "${CXXFLAGS+set}"; then
cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
fi
-RUBY_NACL
-AS_CASE(["$host_os:$build_os"],
-[darwin*:darwin*], [
- AC_CHECK_TOOLS(CC, [gcc-4.2 clang gcc cc])
-])
if test x"${build}" != x"${host}"; then
AC_CHECK_TOOL(CC, gcc)
fi
-
AC_PROG_CC
AC_PROG_CXX
-RUBY_MINGW32
AC_PROG_GCC_TRADITIONAL
AC_SUBST(GCC)
-AS_CASE(["$target_os"],
-[solaris*], [AC_PATH_TOOL([LD], [ld], [/usr/ccs/bin/ld], [/usr/ccs/bin:$PATH])],
-[AC_CHECK_TOOL([LD], [ld], [ld])])
-AC_SUBST(LD)
if test "$GCC" = yes; then
linker_flag=-Wl,
: ${optflags=-O3}
- RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
+ AS_CASE(["$target_os"], [linux*|darwin*], [: ${debugflags=-ggdb}])
else
linker_flag=
fi
+test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
RUBY_PROG_GNU_LD
RUBY_CPPOUTFILE
@@ -422,34 +285,12 @@ RUBY_CPPOUTFILE
AC_SUBST(OUTFLAG)
AC_SUBST(COUTFLAG)
+RUBY_MINGW32
RUBY_UNIVERSAL_ARCH
if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
RUBY_DEFAULT_ARCH("$target_cpu")
fi
-AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
- AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
- AC_TRY_LINK([unsigned long atomic_var;],
- [
- __sync_val_compare_and_swap(&atomic_var, 0, 1);
- ],
- [rb_cv_gcc_compiler_cas=yes],
- [rb_cv_gcc_compiler_cas=no])])
- if test "$rb_cv_gcc_compiler_cas" = no; then
- unset rb_cv_gcc_compiler_cas
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -march=i486"
- AC_CACHE_CHECK([for __sync_val_compare_and_swap with -march=i486], [rb_cv_gcc_compiler_cas], [
- AC_TRY_LINK([unsigned long atomic_var;],
- [
- __sync_val_compare_and_swap(&atomic_var, 0, 1);
- ],
- [rb_cv_gcc_compiler_cas=yes
- ARCH_FLAG="-march=i486"],
- [rb_cv_gcc_compiler_cas=no])])
- CFLAGS="$save_CFLAGS"
- fi])
-
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(AR, ar)
if test -z "$AR"; then
@@ -468,6 +309,7 @@ AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
AS_CASE(["$target_os"],
[cygwin*|mingw*], [
+ AC_CHECK_TOOL(NM, nm)
AC_CHECK_TOOL(WINDRES, windres)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
target=`echo $target | sed "s/^$target_cpu-/-/"`
@@ -486,15 +328,11 @@ AS_CASE(["$target_os"],
sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
[rb_cv_msvcrt=msvcrt])
test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
- RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
- test "$RT_VER" = "" && RT_VER=60
- AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
])
: ${enable_shared=yes}
],
[aix*], [AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)],
[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)]) # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
-AC_CHECK_TOOL(NM, nm)
AC_PROG_LN_S
AC_PROG_MAKE_SET
@@ -511,73 +349,24 @@ fi
MAKEDIRS="$MKDIR_P"
AC_SUBST(MAKEDIRS)
-AC_DEFUN([RUBY_DTRACE_AVAILABLE],
-[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
-[
- echo "provider conftest{ probe fire(); };" > conftest_provider.d
- if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
- # DTrace is available on the system
- rb_cv_dtrace_available=yes
- else
- # DTrace is not available while dtrace command exists
- # for example FreeBSD 8 or FreeBSD 9 without DTrace build option
- rb_cv_dtrace_available=no
- fi
- rm -f conftest.[co] conftest_provider.[dho]
-])
-])
-
-AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
-[AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g,
-[
- if {
- echo "provider conftest{ probe fire(); };" > conftest_provider.d &&
- dtrace -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
- cat >conftest.c <<_CONF &&
- @%:@include "conftest_provider.h"
- int main(void){ CONFTEST_FIRE(); return 0; }
-_CONF
- $CC $CFLAGS -c -o conftest.o conftest.c &&
- $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null
- }; then
- rb_cv_prog_dtrace_g=yes
- else
- rb_cv_prog_dtrace_g=no
- fi
- rm -f conftest.[co] conftest_provider.[dho]
-])
-])
-
-AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
-if test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"; then
- AC_CHECK_PROG([DTRACE], [dtrace], [dtrace])
+AC_CHECK_TOOL(DOT, dot)
+AC_CHECK_TOOL(DOXYGEN, doxygen)
+if test x"$DOXYGEN" = x; then
+ CAPITARGET=nodoc
+else
+ CAPITARGET=capi
fi
-
-AC_CHECK_PROGS(DOT, dot)
-AC_CHECK_PROGS(DOXYGEN, doxygen)
-AS_CASE(["${host_os}"], [nacl], [AC_PATH_PROG(PYTHON, python)])
-
-AC_CHECK_PROG(PKG_CONFIG, pkg-config, [pkg-config], [], [],
- [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
+AC_SUBST(CAPITARGET)
# checks for UNIX variants that set C preprocessor variables
AC_USE_SYSTEM_EXTENSIONS
AC_SUBST(RM, ['rm -f'])
AC_SUBST(CP, ['cp'])
-RMDIRS='$(top_srcdir)/tool/rmdirs'
-RMDIR=rmdir
-mkdir "rmdirs_$$_test" "rmdirs_$$_test/a"
-rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null &&
-RMDIR='rmdir --ignore-fail-on-non-empty'
-$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null &&
-{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; }
-rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null
-AC_SUBST(RMDIR)
-AC_SUBST(RMDIRS)
+AC_SUBST(RMDIRS, ['$(top_srcdir)/tool/rmdirs'])
AC_SUBST(RMALL, ['rm -fr'])
-AC_MSG_CHECKING([for cd using physical directory])
+AC_MSG_CHECKING([for cd using phisical directory])
rm -fr conf$$.dir
mkdir conf$$.dir &&
(cd conf$$.dir && mkdir src build && cd src &&
@@ -585,7 +374,7 @@ $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 -f conf$$.dir/src/cdcmd; then
+if test -e conf$$.dir/src/cdcmd; then
read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
else
CHDIR=cd
@@ -594,405 +383,59 @@ rm -fr conf$$.dir
AC_MSG_RESULT([$CHDIR])
AC_SUBST(CHDIR)
-}
-{ # compiler section
-
-AC_DEFUN([RUBY_WERROR_FLAG], [dnl
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $rb_cv_warnflags"
-if test "${ac_c_werror_flag+set}"; then
- rb_c_werror_flag="$ac_c_werror_flag"
-else
- unset rb_c_werror_flag
-fi
-ac_c_werror_flag=yes
-$1
-CFLAGS="$save_CFLAGS"
-save_CFLAGS=
-if test "${rb_c_werror_flag+set}"; then
- ac_c_werror_flag="$rb_c_werror_flag"
-else
- unset ac_c_werror_flag
-fi])
+dnl }
+dnl compiler section {
AC_DEFUN(RUBY_TRY_CFLAGS, [
- AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])
- RUBY_WERROR_FLAG([
+ save_CFLAGS="$CFLAGS"
CFLAGS="[$]CFLAGS $1"
- AC_TRY_COMPILE([$4], [$5],
+ AC_MSG_CHECKING([whether ]$1[ is accepted])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[$2
AC_MSG_RESULT(yes)],
[$3
AC_MSG_RESULT(no)])
- ])
+ CFLAGS="$save_CFLAGS"
+ save_CFLAGS=
])
AC_DEFUN(RUBY_TRY_LDFLAGS, [
save_LDFLAGS="$LDFLAGS"
LDFLAGS="[$]LDFLAGS $1"
- AC_MSG_CHECKING([whether $1 is accepted as LDFLAGS])
- RUBY_WERROR_FLAG([
+ AC_MSG_CHECKING([whether $1 is accepted])
AC_TRY_LINK([$4], [$5],
[$2
AC_MSG_RESULT(yes)],
[$3
AC_MSG_RESULT(no)])
- ])
LDFLAGS="$save_LDFLAGS"
save_LDFLAGS=
])
-AS_CASE([$RUBY_PATCHLEVEL], [-*],
- [particular_werror_flags=yes], [particular_werror_flags=no])
-AC_ARG_ENABLE(werror,
- AS_HELP_STRING([--disable-werror],
- [don't make warnings into errors
- even if a compiler support -Werror feature
- @<:@disabled by default unless development version@:>@]),
- [particular_werror_flags=$enableval])
-
-rb_cv_warnflags="$warnflags"
if test "$GCC:${warnflags+set}:no" = yes::no; then
- for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
- -Wno-missing-field-initializers \
- -Wunused-variable \
- -Werror=pointer-arith \
- -Werror=write-strings \
- -Werror=declaration-after-statement \
- -Werror=shorten-64-to-32 \
- -Werror=implicit-function-declaration \
- ; do
- if test "$particular_werror_flags" != yes; then
- wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
- fi
- ok=no
- RUBY_TRY_CFLAGS($wflag, [
- RUBY_APPEND_OPTIONS(warnflags, $wflag)
- ok=yes
- ])
- AS_CASE([$ok:$wflag], [no:-Werror=*], [
- wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
- RUBY_TRY_CFLAGS($wflag, [
- RUBY_APPEND_OPTIONS(warnflags, $wflag)
- particular_werror_flags=no
- ])
- ])
+ for wflag in -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings \
+ -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long; do
+ RUBY_TRY_CFLAGS($wflag, [warnflags="${warnflags+$warnflags }$wflag"])
done
- AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag="-Wall -Wextra"],
+ AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag=-Wextra],
[wflag=-Wall])
RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
- # Disable warnflags while conftest. -Werror=* flags might make bad OS capability guess.
- rb_cv_warnflags="$warnflags"
- warnflags=
fi
-if test "$GCC" = yes; then
- test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
- test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
- test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
-
- # -D_FORTIFY_SOURCE
- RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
-
- # -fstack-protector
- AS_CASE(["$target_os"],
- [mingw*|nacl|haiku], [
- stack_protector=no
- ],
- [
- RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
- if test "x$stack_protector" = xyes; then
- RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken])
- fi
- ])
- if test "x$stack_protector" = xyes; then
- RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
- RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
- RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
- fi
-
- AS_CASE(["$target_os"],[mingw*], [
- # On Windows platforms, system provided headers are VC++
- # optimized. That is, C++ habits are often contaminated into
- # various headers. Most frequent situation is the use of //
- # comments. We bypass ANSI C mode for them. Otherwise
- # extension libs cannot include those headers.
- ],
- [cygwin*|darwin*|netbsd*], [
- # need lgamma_r(), finite()
- ],
- [haiku], [
- # Haiku R1/alpha3 uses gcc-4.4.4 which can not handle anonymous union
- # with ANSI standard flags. Anonumous union is required to compile
- # socket extension where <net/if.h> uses anonymous union.
- ],
- [
- # ANSI (no XCFLAGS because this is C only)
- RUBY_TRY_CFLAGS(-ansi -std=iso9899:199409, [
- RUBY_APPEND_OPTION(warnflags, -ansi -std=iso9899:199409)
- RUBY_APPEND_OPTION(strict_warnflags, -ansi -std=iso9899:199409)
- ])
- ])
-
- # suppress annoying -Wstrict-overflow warnings
- RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
-fi
-test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
-
if test "$GCC" = ""; then
- AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
+ AS_CASE(["$target_os"],[aix*],[warnflags="-qinfo=por"])
fi
if test "$GCC" = yes; then
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
- @%:@if !(defined __GNUC__ && __GNUC__ >= 4)
- @%:@error not GCC 4 or later
- >>>not GCC 4 or later<<<
- @%:@endif])],
- [visibility_option=yes], [visibility_option=no])
- if test "$visibility_option" = yes; then
- RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
- fi
- AC_SUBST(WERRORFLAG, "-Werror")
if test "$visibility_option" = yes; then
RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
else
RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
fi
- test "$visibility_option" = no -o "$host_os" = nacl || OBJCOPY=:
-fi
-
-if test "$GCC" = yes; then
- # optflags
-
- AS_CASE(["$target_os"], [mingw*], [
- RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
- ])
-
- # disable fast-math
- for oflag in -fno-fast-math; do
- RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
- done
- AS_CASE(["$target"],
- [*-darwin*], [
- # doesn't seem necessary on Mac OS X
- ],
- [[i[4-6]86*|i386*mingw*]], [
- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
- ])
- AS_CASE(["$XCFLAGS"],
- [[*-msse2*]], [
- RUBY_TRY_CFLAGS(-mstackrealign, [
- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
- ])
- ])
- ]
- )
+ test "$visibility_option" = no || OBJCOPY=:
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\""
-}
-{ # header and library section
-
-AC_ARG_WITH(winnt-ver,
- AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0501)]),
- [with_winnt_ver="$withval"], [with_winnt_ver="0x0501"])
-AS_CASE(["$target_os"],
-[mingw*], [
- RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
-])
-
-AS_CASE(["$target_os"],
-[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=$rb_cv_enable_pthread_default
- ],
-[mingw*], [
- enable_pthread=no
- ],
-[
- enable_pthread=yes
- ])
-
-AC_ARG_ENABLE(pthread,
- AS_HELP_STRING([--enable-pthread], [obsolete, and ignored]))
-
-dnl Checks for libraries.
-AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
-
-POSTLINK=:
-AC_SUBST(POSTLINK)
-AS_CASE(["$target_os"],
-[nextstep*], [ ],
-[openstep*], [ ],
-[rhapsody*], [ ],
-[darwin*], [ RUBY_PREPEND_OPTION(LIBS, -lobjc)
- RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
- AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
- 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
- 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_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
- 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
- AC_CHECK_PROGS(codesign, codesign)
- if test -n "$codesign"; then
- POSTLINK="test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@"
- LINK_SO="$LINK_SO
-$POSTLINK"
- fi
- AC_CHECK_HEADERS(crt_externs.h, [], [], [
- #include <crt_externs.h>
- ])
- ],
-[hpux*], [ LIBS="-lm $LIBS"
- ac_cv_c_inline=no],
-[beos*|haiku*], [
- ac_cv_func_link=no
- ac_cv_func_sched_yield=no
- ac_cv_func_pthread_attr_setinheritsched=no
- AS_CASE(["$target_os"],
- [beos*], [ ac_cv_header_net_socket_h=yes],
- [haiku*], [ ac_cv_func_shutdown=no])
- LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
- ],
-[cygwin*], [ ac_cv_header_langinfo_h=yes
- AC_CHECK_FUNCS(cygwin_conv_path)
- AC_LIBOBJ([langinfo])
- ],
-[mingw*], [ LIBS="-lshell32 -lws2_32 -limagehlp -lshlwapi $LIBS"
- ac_cv_header_a_out_h=no
- ac_cv_header_pwd_h=no
- ac_cv_header_utime_h=no
- ac_cv_header_sys_ioctl_h=no
- ac_cv_header_sys_param_h=no
- ac_cv_header_sys_resource_h=no
- 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_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_fseeko=yes
- ac_cv_lib_crypt_crypt=no
- ac_cv_func_getpgrp_void=no
- ac_cv_func_memcmp_working=yes
- ac_cv_lib_dl_dlopen=no
- rb_cv_binary_elf=no
- rb_cv_negative_time_t=no
- ac_cv_func_fcntl=yes
- ac_cv_func_flock=yes
- ac_cv_func_gmtime_r=yes
- rb_cv_large_fd_select=yes
- ac_cv_type_struct_timeval=yes
- AC_LIBOBJ([langinfo])
- ],
-[os2-emx*], [ LIBS="-lm $LIBS"
- ac_cv_lib_dir_opendir=no],
-[bsdi*], [ LIBS="-lm $LIBS"
- AC_DEFINE(BROKEN_SETREUID, 1)
- AC_DEFINE(BROKEN_SETREGID, 1)
- ac_cv_sizeof_rlim_t=8],
-[freebsd*], [ LIBS="-lm $LIBS"
- ac_cv_func_getpeername=no
- ac_cv_func_getsockname=no
- ac_cv_func_shutdown=no
- ac_cv_func_close=no
- ],
-[dragonfly*], [ LIBS="-lm $LIBS"
- # isinf() and isnan() are macros on DragonFly.
- ac_cv_func_isinf=yes
- ac_cv_func_isnan=yes
- ],
-[bow], [ ac_cv_func_setitimer=no
- ],
-[superux*], [ ac_cv_func_setitimer=no
- ],
-[nacl], [
- LIBS="-lm $LIBS"
- if test "${nacl_cv_build_variant}" = "newlib"; then
- RUBY_APPEND_OPTION(CPPFLAGS, -DNACL_NEWLIB)
- RUBY_APPEND_OPTION(LIBS, '-lnosys')
- else
- RUBY_APPEND_OPTION(XCFLAGS, -fPIC)
- fi
- ac_cv_func_shutdown=no
- ac_cv_func_fcntl=no
- ],
-[ LIBS="-lm $LIBS"])
-
-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_SYS_WAIT
-AC_CHECK_HEADERS(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 process.h sys/prctl.h atomic.h)
-
dnl check for large file stuff
mv confdefs.h confdefs1.h
: > confdefs.h
@@ -1001,27 +444,7 @@ mv confdefs.h largefile.h
mv confdefs1.h confdefs.h
cat largefile.h >> confdefs.h
-AS_CASE(["$target_os"],
- [mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8],
- [aix*], [
- AS_CASE(["$target_cpu:$ac_cv_sys_large_files"],
- [ppc64:*|powerpc64:*], [],
- [*:no|*:unknown], [],
- [
- # AIX currently does not support a 32-bit call to posix_fadvise()
- # if _LARGE_FILES is defined.
- ac_cv_func_posix_fadvise=no
- ])
- ])
-
-AC_C_BIGENDIAN
-AC_C_CONST
-AC_C_CHAR_UNSIGNED
-AC_C_INLINE
-AC_C_VOLATILE
-
-AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
- [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
+AS_CASE(["$target_os"],[mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8])
AC_CHECK_TYPES([long long, off_t])
@@ -1071,8 +494,11 @@ static ac__type_sizeof_ *rbcv_ptr;
done
done
}])
- m4_ifval([$2][$3],
- [test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@SIZEOF_}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" && ]){
+ m4_ifval([$2][$3], [case "${AS_TR_SH(ac_cv_sizeof_$1)}" in
+ #(
+ [SIZEOF_*]);;
+ #(
+ *)])
test "$universal_binary" = yes && cross_compiling=yes
AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
[${cond+$cond
@@ -1086,7 +512,7 @@ ${cond+@%:@endif}
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}
])
{
@@ -1123,42 +549,9 @@ RUBY_CHECK_SIZEOF(float)
RUBY_CHECK_SIZEOF(double)
RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
-AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [
-AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[
- [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE]
- RUBY_WERROR_FLAG(for pri in $2; do
- AC_TRY_COMPILE(
- [@%:@include <stdio.h>
- @%:@include <stddef.h>
- @%:@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
- PRINTF_ARGS(void test_sprintf(const char*, ...), 1, 2);],
- [printf("%]${pri}[d", (]$1[)42);
- test_sprintf("%]${pri}[d", (]$1[)42);],
- [rb_cv_pri_prefix_]AS_TR_SH($1)[=[$pri]; break])
- done)])
-if test "[$rb_cv_pri_prefix_]AS_TR_SH($1)" != NONE; then
- AC_DEFINE_UNQUOTED([PRI_]m4_ifval($3,$3,AS_TR_CPP(m4_bpatsubst([$1],[_t$])))[_PREFIX],
- "[$rb_cv_pri_prefix_]AS_TR_SH($1)")
-fi
-])
-
-if test "x$ac_cv_type_long_long" = xyes; then
- RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL)
-elif test "x$ac_cv_type___int64" = xyes; then
- RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
-fi
-
dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
- AC_CHECK_TYPE([$1],
- [n="patsubst([$1],["],[\\"])"],
- [n="patsubst([$2],["],[\\"])"],
- [$4])
+ AC_CHECK_TYPE([$1], [n=[$1]], [n=[$2]], [$4])
AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
u= t=
AS_CASE(["$n "],
@@ -1197,23 +590,13 @@ AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
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,
- [PRI_`echo ${rb_cv_[$1]_convertible} | sed ['s/^U//']`_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>])
RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
-RUBY_REPLACE_TYPE(mode_t, ["unsigned int" long], MODET, [@%:@include <sys/stat.h>])
-RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
-@%:@ifdef HAVE_SYS_TYPES_H
-@%:@include <sys/types.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TYPES_H
-@%:@include <sys/time.h>
-@%:@endif
-@%:@include <sys/resource.h>
-])
AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
[AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -1224,12 +607,12 @@ if test "$rb_cv_have_prototypes" = yes; then
fi
AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
- [AC_TRY_COMPILE([@%:@define paste(a,b) a@%:@@%:@b],
+ [AC_TRY_COMPILE([#define paste(a,b) a##b],
[int xy = 1; return paste(x,y);],
rb_cv_tokenpaste=ansi,
rb_cv_tokenpaste=knr)])
if test "$rb_cv_tokenpaste" = ansi; then
- AC_DEFINE(TOKEN_PASTE(x,y),[x@%:@@%:@y])
+ AC_DEFINE(TOKEN_PASTE(x,y),[x##y])
else
AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
fi
@@ -1288,10 +671,8 @@ if test "$rb_cv_stdarg" = yes; then
fi
AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
- [AC_TRY_COMPILE([
-int foo(int x, ...);
-@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)
-], [FOO(1);FOO(1,2);FOO(1,2,3);],
+ [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
@@ -1299,18 +680,17 @@ if test "$rb_cv_va_args_macro" = yes; then
fi
AC_DEFUN([RUBY_DEFINE_IF], [dnl
- m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
+ m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
@%:@if $1
EOH
])dnl
-AC_DEFINE_UNQUOTED($2, $3)dnl
- m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
+AC_DEFINE_UNQUOTED($2, $3)
+ m4_ifval([$1],[test "$1" && cat <<EOH >> confdefs.h
@%:@endif /* $1 */
EOH
])dnl
])dnl
-dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
m4_ifval([$2], dnl
[AS_VAR_PUSHDEF([attrib],[$2])], dnl
@@ -1320,10 +700,15 @@ 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])
+m4_ifval([$4], [rbcv_cond=[$4]; test "$rbcv_cond" || unset rbcv_cond])
AC_CACHE_CHECK(for [$1] function attribute, rbcv,
[rbcv=x
-RUBY_WERROR_FLAG([
+if test "${ac_c_werror_flag+set}"; then
+ rb_c_werror_flag="$ac_c_werror_flag"
+else
+ unset rb_c_werror_flag
+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(
@@ -1335,13 +720,17 @@ ${rbcv_cond+[@%:@endif]})
attrib[(void conftest_attribute_check(void));], [],
[rbcv="$mac"; break])
done
-])])
+if test "${rb_c_werror_flag+set}"; then
+ ac_c_werror_flag="$rb_c_werror_flag"
+else
+ unset ac_c_werror_flag
+fi
+])
if test "$rbcv" != x; then
- RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[(x)], $rbcv)
+ RUBY_DEFINE_IF([${rbcv_cond}], attrib[(x)], $rbcv)
fi
-m4_ifval([$4], [unset rbcv_cond])dnl
-AS_VAR_POPDEF([attrib])dnl
-AS_VAR_POPDEF([rbcv])dnl
+AS_VAR_POPDEF([attrib])
+AS_VAR_POPDEF([rbcv])
])
RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
@@ -1367,81 +756,253 @@ if test "$GCC" = yes; then
AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
[RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
fi
-
- AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
- AC_TRY_LINK([unsigned char atomic_var;],
- [
- __atomic_exchange_n(&atomic_var, 0, __ATOMIC_SEQ_CST);
- __atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST);
- __atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST);
- __atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST);
- ],
- [rb_cv_gcc_atomic_builtins=yes],
- [rb_cv_gcc_atomic_builtins=no])])
- if test "$rb_cv_gcc_atomic_builtins" = yes; then
- AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
- fi
-
- AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [
- AC_TRY_LINK([unsigned char atomic_var;],
- [
- __sync_lock_test_and_set(&atomic_var, 0);
- __sync_lock_test_and_set(&atomic_var, 1);
- __sync_fetch_and_add(&atomic_var, 1);
- __sync_fetch_and_sub(&atomic_var, 1);
- ],
- [rb_cv_gcc_sync_builtins=yes],
- [rb_cv_gcc_sync_builtins=no])])
- if test "$rb_cv_gcc_sync_builtins" = yes; then
- AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
- fi
-
- AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
- [RUBY_WERROR_FLAG(
- [AC_TRY_LINK([volatile int zero;],
- [if (zero) __builtin_unreachable();],
- [rb_cv_func___builtin_unreachable=yes],
- [rb_cv_func___builtin_unreachable=no])
- ])
- ])
- if test "$rb_cv_func___builtin_unreachable" = yes; then
- AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
- fi
fi
-AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
-rb_cv_func_exported=no
-RUBY_WERROR_FLAG([
-for mac in '__attribute__ ((visibility("default")))' '__declspec(dllexport)'; do
- AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern
- RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [],
- [rb_cv_func_exported="$mac"; break])
-done
-])])
-if test "$rb_cv_func_exported" != no; then
- AC_DEFINE_UNQUOTED(RUBY_FUNC_EXPORTED, [$rb_cv_func_exported extern])
-fi
+AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
+[rb_cv_ruby_extern=no
+for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
+ AC_TRY_COMPILE(
+ [extern $mac void conftest(void);],
+ [rb_cv_ruby_extern="extern $mac"; break])
+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 {
+
dnl Check whether we need to define sys_nerr locally
AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
-@%:@include <errno.h>])
+#include <errno.h>])
+
+AC_ARG_ENABLE(win95,
+ AS_HELP_STRING([--enable-win95], [enable Windows 95 series support]),
+ [AS_CASE(["$enableval"],[yes|no],[enable_win95=$enableval],[unset enable_win95])])
+
+AS_CASE(["$target_os"],
+[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=$rb_cv_enable_pthread_default
+ ],
+[mingw*], [
+ enable_pthread=no
+ ],
+[
+ enable_pthread=yes
+ ])
+
+AC_ARG_ENABLE(pthread,
+ AS_HELP_STRING([--enable-pthread], [obsolete, and ignored]))
+
+dnl Checks for libraries.
+AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
+AS_CASE(["$target_os"],
+[solaris*], [
+ AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
+ LIBS="-lm $LIBS"
+ ],
+[nextstep*], [ ],
+[openstep*], [ ],
+[rhapsody*], [ ],
+[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)
+ 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
+ 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_cv_func_fdatasync=no # Mac OS 10.6 wrongly reports it has fdatasync
+ 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
+ ],
+[hpux*], [ LIBS="-lm $LIBS"
+ ac_cv_c_inline=no],
+[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
+ ],
+[beos*|haiku*], [
+ ac_cv_func_link=no
+ ac_cv_func_sched_yield=no
+ ac_cv_func_pthread_attr_setinheritsched=no
+ AS_CASE(["$target_os"],
+ [beos*], [ ac_cv_header_net_socket_h=yes],
+ [haiku*], [ ac_cv_func_shutdown=no])
+ LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
+ ],
+[cygwin*], [ ac_cv_header_langinfo_h=yes
+ AC_LIBOBJ([langinfo])
+ ],
+[mingw*], [ LIBS="-lshell32 -lws2_32 $LIBS"
+ ac_cv_header_a_out_h=no
+ ac_cv_header_pwd_h=no
+ ac_cv_header_utime_h=no
+ ac_cv_header_sys_ioctl_h=no
+ ac_cv_header_sys_param_h=no
+ ac_cv_header_sys_resource_h=no
+ 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_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_fseeko=yes
+ ac_cv_lib_crypt_crypt=no
+ ac_cv_func_getpgrp_void=no
+ ac_cv_func_setpgrp_void=yes
+ ac_cv_func_memcmp_working=yes
+ ac_cv_lib_dl_dlopen=no
+ rb_cv_binary_elf=no
+ rb_cv_negative_time_t=no
+ ac_cv_func_fcntl=yes
+ ac_cv_func_flock=yes
+ rb_cv_large_fd_select=yes
+ AC_LIBOBJ([langinfo])
+ : ${enable_win95=maybe}
+ ],
+[os2-emx*], [ LIBS="-lm $LIBS"
+ ac_cv_lib_dir_opendir=no],
+[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_func_setrlimit=no
+ ac_cv_header_sys_socket_h=no
+ ],
+[bsdi*], [ LIBS="-lm $LIBS"
+ AC_DEFINE(BROKEN_SETREUID, 1)
+ AC_DEFINE(BROKEN_SETREGID, 1)
+ ac_cv_sizeof_rlim_t=8],
+[freebsd*], [ LIBS="-lm $LIBS"
+ ac_cv_func_getpeername=no
+ ac_cv_func_getsockname=no
+ ac_cv_func_shutdown=no
+ ac_cv_func_close=no
+ ],
+[dragonfly*], [ LIBS="-lm $LIBS"
+ ],
+[bow], [ ac_cv_func_setitimer=no
+ ],
+[superux*], [ ac_cv_func_setitimer=no
+ ],
+[ LIBS="-lm $LIBS"])
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
AS_CASE(["$target_cpu"],
-[alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
+[alpha*], [AS_CASE(["$target_os"::"$GCC"],
[*::yes], # gcc
[CFLAGS="-mieee $CFLAGS"],
[osf*], # ccc
[CFLAGS="-ieee $CFLAGS"],
- )],
-[sparc*], [AC_LIBOBJ([sparc])])
+ )])
ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
if test "$ac_cv_header_net_socket_h" = yes; then
@@ -1450,12 +1011,38 @@ 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_SYS_WAIT
+AC_CHECK_HEADERS(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)
+
+dnl Check additional types.
+RUBY_CHECK_SIZEOF(rlim_t, [int long "long long"], [], [
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ #endif
+ #ifdef HAVE_SYS_RESOURCE_H
+ # include <sys/resource.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+ #include <stdio.h>
+])
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>])
-RUBY_CHECK_PRINTF_PREFIX(size_t, z)
-RUBY_CHECK_PRINTF_PREFIX(ptrdiff_t, t)
AC_STRUCT_ST_BLKSIZE
AC_STRUCT_ST_BLOCKS
AC_STRUCT_ST_RDEV
@@ -1473,18 +1060,8 @@ 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 timeval], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@include <sys/time.h>
-@%:@endif])
-
AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
@%:@include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@include <sys/time.h>
@%:@endif])
AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
@@ -1494,13 +1071,6 @@ AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
@%:@ include <sys/time.h>
@%:@endif])
-AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@ include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@ include <sys/time.h>
-@%:@endif])
-
AC_CACHE_VAL([rb_cv_large_fd_select],
[AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no])])
if test "$rb_cv_large_fd_select" = yes; then
@@ -1547,43 +1117,18 @@ 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.
-RUBY_NACL_CHECK_PEPPER_TYPES
-
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 *__libc_stack_end;],
- [if (!__libc_stack_end) return 1;],
- [rb_cv_stack_end_address="__libc_stack_end"])
-])
+ [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
-AS_CASE(["$target_os"],
-[openbsd*], [
- AC_CACHE_CHECK(for heap align log on openbsd, rb_cv_page_size_log,
- [rb_cv_page_size_log=no
- for page_log in 12 13; do
- AC_TRY_RUN([
-#include <math.h>
-#include <unistd.h>
-
-int
-main() {
- if ((int)log2((double)sysconf(_SC_PAGESIZE)) != $page_log) return 1;
- return 0;
-}
- ],
- rb_cv_page_size_log="$page_log"; break)
- done])
- if test $rb_cv_page_size_log != no; then
- AC_DEFINE_UNQUOTED(HEAP_ALIGN_LOG, $rb_cv_page_size_log)
- else
- AC_DEFINE_UNQUOTED(HEAP_ALIGN_LOG, 12)
- fi
-])
-
dnl Checks for library functions.
AC_TYPE_GETGROUPS
AC_TYPE_SIGNAL
@@ -1603,27 +1148,6 @@ AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
[
AC_FUNC_ALLOCA
])
-if test "x$ALLOCA" = "x"; then
- AC_CACHE_CHECK([for dynamic size alloca], rb_cv_dynamic_alloca, [
- for chk in ok __chkstk; do
- AC_TRY_LINK([
- @%:@ifdef HAVE_ALLOCA_H
- @%:@include <alloca.h>
- @%:@endif
- void $chk() {}
- int dynamic_alloca_test;
- int dynamic_alloca_result;],
- [dynamic_alloca_result = alloca(dynamic_alloca_test) != 0;],
- [rb_cv_dynamic_alloca=$chk; break])
- done])
- if test "x$rb_cv_dynamic_alloca" = "x__chkstk"; then
- AC_DEFINE_UNQUOTED(RUBY_ALLOCA_CHKSTK, _$rb_cv_dynamic_alloca)
- AS_CASE("$target_cpu",
- [x64|x86_64], [
- AC_SUBST([ALLOCA], [\${LIBOBJDIR}x86_64-chkstk.${ac_objext}])
- ],)
- fi
-fi
AC_FUNC_MEMCMP
# http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
@@ -1651,16 +1175,7 @@ AS_CASE(["$target_os"],[freebsd*],[
AC_REPLACE_FUNCS(dup2 memmove strerror\
strchr strstr crypt flock\
isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
- strlcpy strlcat ffs setproctitle)
-
-# for missing/setproctitle.c
-AS_CASE(["$target_os"],
-[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
-[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
-[])
-AC_CHECK_HEADERS(sys/pstat.h)
-
-
+ strlcpy strlcat)
AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
[AC_TRY_LINK([
#include <math.h>
@@ -1675,17 +1190,16 @@ fi
AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall __syscall chroot getcwd eaccess\
truncate ftruncate ftello chsize times utimes utimensat fcntl lockf lstat\
truncate64 ftruncate64 ftello64 fseeko fseeko64 \
- link symlink readlink readdir_r fsync fdatasync fchown posix_fadvise\
- setitimer setruid seteuid setreuid setresuid socketpair\
+ link symlink readlink readdir_r fsync fdatasync fchown\
+ 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 close getpwnam_r getgrnam_r\
+ getpriority getrlimit setrlimit sysconf close\
dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp\
- getsid setsid telldir seekdir fchmod cosh sinh tanh log2 round llabs\
+ setsid telldir seekdir fchmod cosh sinh tanh log2 round\
setuid setgid daemon select_large_fdset setenv unsetenv\
- mktime timegm gmtime_r clock_gettime gettimeofday poll ppoll\
- pread sendfile shutdown sigaltstack dl_iterate_phdr\
- dup dup3 pipe2 posix_memalign memalign ioctl isfinite)
+ mktime timegm gmtime_r clock_gettime gettimeofday\
+ pread sendfile shutdown sigaltstack)
AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
[AC_TRY_COMPILE([
@@ -1750,7 +1264,7 @@ if test "$use_setreuid" = yes; then
fi
AC_STRUCT_TIMEZONE
AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
- [AC_TRY_COMPILE([@%:@include <time.h>],
+ [AC_TRY_COMPILE([#include <time.h>],
[struct tm t; t.tm_gmtoff = 3600;],
[rb_cv_member_struct_tm_tm_gmtoff=yes],
[rb_cv_member_struct_tm_tm_gmtoff=no])])
@@ -1810,7 +1324,6 @@ fi
AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
[AC_TRY_RUN([
-#include <stdlib.h>
#include <time.h>
void
@@ -1851,7 +1364,6 @@ fi
# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
[AC_TRY_RUN([
-#include <stdlib.h>
#include <time.h>
void
@@ -1922,12 +1434,14 @@ main()
fi
fi
-if test "$ac_cv_func_getpgid" = no; then
AC_FUNC_GETPGRP
-fi
-if test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes; then
AC_FUNC_SETPGRP
-fi
+
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_CHAR_UNSIGNED
+AC_C_INLINE
+AC_C_VOLATILE
if test x"$target_cpu" = xia64; then
AC_LIBOBJ([ia64])
@@ -1954,7 +1468,6 @@ else
AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
fi
-# win32.c still use this. Don't remove it.
test "$rb_cv_fcnt" = "not found" && rb_cv_fcnt="not found (OK if using GNU libc)"
AC_CACHE_CHECK([read count field in FILE structures], rb_cv_fcnt,
[rb_cv_fcnt="not found (OK if using GNU libc)"
@@ -1972,9 +1485,8 @@ for fcnt in dnl
done])
AS_CASE("$rb_cv_fcnt",
["not found"*], [rb_cv_fcnt="not found"],
- [AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)])
+ [AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)])
-# win32.c still use this. Don't remove it.
AC_CACHE_CHECK([read buffer ptr field in FILE structures], rb_cv_frptr,
[for frptr in dnl
_IO_read_ptr dnl
@@ -2014,38 +1526,6 @@ fi
RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
-AC_CACHE_CHECK([whether struct dirent.d_name is too small], rb_cv_sizeof_struct_dirent_too_small,
- [AC_COMPILE_IFELSE(
- [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([
-@%:@if defined _WIN32
-@%:@ error <<<struct direct in win32/dir.h has variable length d_name>>>
-@%:@elif defined HAVE_DIRENT_H
-@%:@ include <dirent.h>
-@%:@elif defined HAVE_DIRECT_H
-@%:@ include <direct.h>
-@%:@else
-@%:@ define dirent direct
-@%:@ if HAVE_SYS_NDIR_H
-@%:@ include <sys/ndir.h>
-@%:@ endif
-@%:@ if HAVE_SYS_DIR_H
-@%:@ include <sys/dir.h>
-@%:@ endif
-@%:@ if HAVE_NDIR_H
-@%:@ include <ndir.h>
-@%:@ endif
-@%:@endif
-@%:@include <stddef.h>
-@%:@define numberof(array) [(int)(sizeof(array) / sizeof((array)[0]))]
-struct dirent d;
-])],
- [offsetof(struct dirent, [d_name[numberof(d.d_name)]]) - offsetof(struct dirent, d_name) < 256])],
- [rb_cv_sizeof_struct_dirent_too_small=yes],
- [rb_cv_sizeof_struct_dirent_too_small=no])])
-if test "$rb_cv_sizeof_struct_dirent_too_small" = yes; then
- AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
-fi
-
if test "$ac_cv_func_sysconf" = yes; then
AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
@@ -2063,10 +1543,9 @@ if test "$ac_cv_func_sysconf" = yes; then
fi
AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
- AS_VAR_PUSHDEF([stack_grow_dir], [rb_cv_stack_grow_dir_$1])
- AC_CACHE_CHECK(stack growing direction on $1, stack_grow_dir, [
+ AC_CACHE_CHECK(stack growing direction on $1, rb_cv_stack_grow_dir_$1, [
AS_CASE(["$1"],
-[m68*|x86*|x64|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
+[m68*|x86*|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
[hppa*], [ $2=+1],
[
AC_TRY_RUN([
@@ -2088,9 +1567,8 @@ int main()
}
], $2=-1, $2=+1, $2=0)
])
-eval stack_grow_dir=\$$2])
-eval $2=\$stack_grow_dir
-AS_VAR_POPDEF([stack_grow_dir])])
+eval rb_cv_stack_grow_dir_$1=\$$2])
+eval $2=\$rb_cv_stack_grow_dir_$1])
if test "${universal_binary-no}" = yes ; then
archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
@@ -2111,7 +1589,7 @@ if test "${universal_binary-no}" = yes ; then
if test x$stack_dir = xno; then
for archs in ${universal_archnames}; do
archs=`echo $archs | sed 's/=.*//'`
- eval dir=\$[rb_cv_stack_grow_dir_]AS_TR_SH([$archs])
+ eval dir=\$rb_cv_stack_grow_dir_$archs
RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
done
else
@@ -2132,27 +1610,24 @@ if test x"$enable_pthread" = xyes; then
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
- AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
+ AC_CHECK_HEADERS(pthread_np.h)
AS_CASE([$pthread_lib],
[c], [],
[root], [],
[c_r], [MAINLIBS="-pthread $MAINLIBS"],
- [AS_CASE(["$target_os"],
- [openbsd*], [LIBS="-pthread $LIBS"],
- [LIBS="-l$pthread_lib $LIBS"])])
+ [LIBS="-l$pthread_lib $LIBS"])
else
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
fi
- AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
+ AC_CHECK_FUNCS(nanosleep sched_yield pthread_attr_setinheritsched \
pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
pthread_get_stackaddr_np pthread_get_stacksize_np \
- thr_stksegment pthread_stackseg_np pthread_getthrds_np \
- pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
- pthread_sigmask)
- if test "${host_os}" = "nacl"; then
- ac_cv_func_pthread_attr_init=no
- else
- AC_CHECK_FUNCS(pthread_attr_init)
+ thr_stksegment pthread_stackseg_np pthread_getthrds_np)
+ if test x"$ac_cv_func_nanosleep" = xno; then
+ AC_CHECK_LIB(rt, nanosleep)
+ if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
+ AC_DEFINE(HAVE_NANOSLEEP)
+ fi
fi
fi
if test x"$ac_cv_header_ucontext_h" = xyes; then
@@ -2226,9 +1701,14 @@ main(int argc, char *argv[])
test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
fi
+AC_CHECK_FUNCS(backtrace)
-}
-{ # runtime section
+AC_ARG_WITH(valgrind,
+ AS_HELP_STRING([--with-valgrind],[enable valgrind memcheck support]),
+ [AC_CHECK_HEADERS(valgrind/memcheck.h)])
+
+dnl }
+dnl runtime section {
dnl wheather use dln_a_out or not
AC_ARG_WITH(dln-a-out,
@@ -2245,8 +1725,8 @@ AC_ARG_WITH(dln-a-out,
AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
[AC_TRY_LINK([],[], [
-AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
-[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"],
+['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
rb_cv_binary_elf=no)])
if test "$rb_cv_binary_elf" = yes; then
@@ -2254,14 +1734,10 @@ if test "$rb_cv_binary_elf" = yes; then
if test "$with_dln_a_out" = yes; then
AC_MSG_ERROR(dln_a_out does not work with ELF)
fi
- AC_CHECK_HEADERS([elf.h elf_abi.h])
- if test $ac_cv_header_elf_h = yes -o $ac_cv_header_elf_abi_h = yes; then
- AC_LIBOBJ([addr2line])
- fi
fi
AS_CASE(["$target_os"],
-[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | nacl], [
+[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu], [
if test "$rb_cv_binary_elf" = no; then
with_dln_a_out=yes
else
@@ -2288,7 +1764,7 @@ if test "$with_dln_a_out" != yes; then
AC_MSG_CHECKING(whether OS depend dynamic link works)
if test "$GCC" = yes; then
AS_CASE(["$target_os"],
- [darwin*], [
+ [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
@@ -2297,7 +1773,7 @@ if test "$with_dln_a_out" != yes; then
# 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)],
- [bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ],
+ [human*|bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ],
[
RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
else
@@ -2311,8 +1787,7 @@ if test "$with_dln_a_out" != yes; then
AC_ARG_ENABLE(rpath,
- AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
- enabled by default on ELF platforms]),
+ AS_HELP_STRING([--disable-rpath], [embed run path into extension libraries]),
[enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
if test "$enable_rpath" = yes; then
RPATHFLAG=" ${linker_flag}-R%1\$-s"
@@ -2320,7 +1795,7 @@ if test "$with_dln_a_out" != yes; then
AS_CASE(["$target_os"],
[hpux*], [ DLDFLAGS="$DLDFLAGS -E"
- : ${LDSHARED='$(LD) -b'}
+ : ${LDSHARED='ld -b'}
XLDFLAGS="$XLDFLAGS -Wl,-E"
: ${LIBPATHENV=SHLIB_PATH}
if test "$rb_cv_prog_gnu_ld" = no; then
@@ -2333,23 +1808,20 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -Wl,-E"
fi
else
- : ${LDSHARED='$(CC) -G'}
- fi
- if test "$ac_cv_sizeof_voidp" = 8; then
- : ${LIBPATHENV=LD_LIBRARY_PATH_64}
+ : ${LDSHARED='ld -G'}
fi
rb_cv_dlopen=yes],
- [sunos*], [ : ${LDSHARED='$(LD) -assert nodefinitions'}
+ [sunos*], [ : ${LDSHARED='ld -assert nodefinitions'}
rb_cv_dlopen=yes],
- [irix*], [ : ${LDSHARED='$(LD) -shared'}
+ [irix*], [ : ${LDSHARED='ld -shared'}
rb_cv_dlopen=yes],
- [sysv4*], [ : ${LDSHARED='$(LD) -G'}
+ [sysv4*], [ : ${LDSHARED='ld -G'}
rb_cv_dlopen=yes],
[nto-qnx*], [ : ${LDSHARED='$(CC) -shared'}
rb_cv_dlopen=yes],
- [esix*|uxpds*], [ : ${LDSHARED='$(LD) -G'}
+ [esix*|uxpds*], [ : ${LDSHARED="ld -G"}
rb_cv_dlopen=yes],
- [osf*], [ : ${LDSHARED='$(LD) -shared -expect_unresolved "*"'}
+ [osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
rb_cv_dlopen=yes],
[bsdi3*], [ AS_CASE(["$CC"],
[*shlicc*], [ : ${LDSHARED='$(CC) -r'}
@@ -2368,24 +1840,33 @@ if test "$with_dln_a_out" != yes; then
: ${LDSHARED='$(CC) -shared'}
if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -rdynamic"
- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
+ DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
else
- test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
+ test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes],
- [openbsd*|mirbsd*], [ : ${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],
+ [nextstep*], [ : ${LDSHARED='$(CC) -r -nostdlib'}
+ LDFLAGS="$LDFLAGS -u libsys_s"
+ rb_cv_dlopen=yes],
+ [openstep*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'}
+ : ${LDFLAGS=""}
+ rb_cv_dlopen=yes],
+ [rhapsody*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'}
+ : ${LDFLAGS=""}
+ rb_cv_dlopen=yes],
[darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'}
- : ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress"}
+ : ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-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 2>/dev/null | fgrep -q "$hdr"; then
+ 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"
@@ -2393,43 +1874,46 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes],
[aix*], [ : ${LDSHARED='$(CC)'}
LDSHARED="$LDSHARED ${linker_flag}-G"
- EXTDLDFLAGS='-e$(TARGET_ENTRY)'
+ DLDFLAGS='-eInit_$(TARGET)'
XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
: ${ARCHFILE="ruby.imp"}
TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
- : ${LIBPATHENV=LIBPATH}
+ : ${LIBPATHENV=SHLIB_PATH}
RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
rb_cv_dlopen=yes],
+ [human*], [ : ${DLDFLAGS=''}
+ : ${LDSHARED=''}
+ : ${LDFLAGS=''}
+ : ${LINK_SO='ar cru $@ $(OBJS)'}
+ rb_cv_dlopen=yes],
[beos*], [ AS_CASE(["$target_cpu"],
[powerpc*], [
- : ${LDSHARED='$(LD) -xms'}
- EXTDLDFLAGS='-export $(TARGET_ENTRY)'
- DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+ : ${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"
],
[i586*], [
- : ${LDSHARED='$(LD) -shared'}
- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lroot"
- LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lroot"
+ : ${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"
])
: ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes],
[haiku*], [ AS_CASE(["$target_cpu"],
[powerpc*], [
- : ${LDSHARED='$(LD) -xms'}
- EXTDLDFLAGS='-export $(TARGET_ENTRY)'
- DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+ : ${LDSHARED="ld -xms"}
+ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
],
[i586*], [
- : ${LDSHARED='$(LD) -shared'}
- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lroot"
+ : ${LDSHARED="ld -shared"}
+ DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
])
: ${LIBPATHENV=LIBRARY_PATH}
rb_cv_dlopen=yes ],
[nto-qnx*], [ DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
- : ${LDSHARED='$(LD) -Bshareable -x'}
+ : ${LDSHARED='ld -Bshareable -x'}
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
rb_cv_dlopen=yes],
[cygwin*|mingw*], [
@@ -2438,13 +1922,12 @@ if test "$with_dln_a_out" != yes; then
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
: ${LIBPATHENV=""}
rb_cv_dlopen=yes],
- [hiuxmpp], [ : ${LDSHARED='$(LD) -r'}],
+ [hiuxmpp], [ : ${LDSHARED='ld -r'}],
[atheos*], [ : ${LDSHARED='$(CC) -shared'}
rb_cv_dlopen=yes],
[os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf"
],
- [nacl], [ LDSHARED='$(CC) -shared' ],
- [ : ${LDSHARED='$(LD)'}])
+ [ : ${LDSHARED='ld'}])
AC_MSG_RESULT($rb_cv_dlopen)
fi
if test "${LDSHAREDXX}" = ""; then
@@ -2469,49 +1952,6 @@ AC_SUBST(RPATHFLAG)
AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
AC_SUBST(TRY_LINK)
-AC_ARG_WITH(opt-dir,
- AS_HELP_STRING([--with-opt-dir=DIR-LIST],
- [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
- [
- val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
- CPPFLAGS="$CPPFLAGS $val"
- val=`IFS="$PATH_SEPARATOR"
- for dir in $withval; do
- echo x ${LIBPATHFLAG} ${RPATHFLAG} |
- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
- done | tr '\012' ' '`
- LDFLAGS_OPTDIR="$val"
- LDFLAGS="$LDFLAGS${LDFLAGS:+ }$val"
- DLDFLAGS="$DLDFLAGS${DLDFLAGS:+ }$val"
- ])
-
-AS_CASE(["$target_cpu-$target_os"],
-[*-freebsd*|x86_64-netbsd*], [
- AC_CHECK_HEADERS([execinfo.h])
- if test "x$ac_cv_header_execinfo_h" = xyes; then
- AC_CHECK_LIB([execinfo], [backtrace])
- execinfo_frame_pointer=no
- RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [execinfo_frame_pointer=yes])
- if test "x$execinfo_frame_pointer" = xyes; then
- # optflags must be manipulated very carefully. For the
- # later cflagspat/cxxflagspat substitution to work, CFLAGS
- # and CXXFLAGS must start exactly with the value of
- # optflags.
- CFLAGS="${CFLAGS# }"; CFLAGS="${CFLAGS#"$optflags "}"
- CXXFLAGS="${CXXFLAGS# }"; CXXFLAGS="${CXXFLAGS#"$optflags "}"
- RUBY_APPEND_OPTION(optflags, -fno-omit-frame-pointer)
- CFLAGS=" $optflags $CFLAGS"
- CXXFLAGS=" $optflags $CXXFLAGS"
- fi
- fi])
-AC_CHECK_FUNCS(backtrace)
-
-AC_ARG_WITH(valgrind,
- AS_HELP_STRING([--without-valgrind],[disable valgrind memcheck support]),
- [], with_valgrind=yes)
-AS_IF([test x$with_valgrind != xno],
- [AC_CHECK_HEADERS(valgrind/memcheck.h)])
-
dln_a_out_works=no
if test "$ac_cv_header_a_out_h" = yes; then
if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
@@ -2543,7 +1983,7 @@ else
AS_CASE(["$target_os"],
[hpux*], [
DLEXT=sl],
- [darwin*], [
+ [nextstep*|openstep*|rhapsody*|darwin*], [
RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
DLEXT=bundle],
[os2-emx*], [
@@ -2559,13 +1999,10 @@ 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
-if test x"$LOAD_RELATIVE" = x1; then
- load_relative=yes
-else
- unset load_relative
-fi
len=2 # .rb
n=`expr "$DLEXT" : '.*'`; test "$n" -gt "$len" && len=$n
@@ -2584,7 +2021,7 @@ fi
AS_CASE(["$target_os"],
[linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
STRIP="$STRIP -S -x"],
- [darwin*], [
+ [nextstep* | openstep* | rhapsody* | darwin*], [
STRIP="$STRIP -A -n"])
AC_ARG_WITH(ext,
@@ -2598,15 +2035,11 @@ AC_SUBST(EXTSTATIC)dnl
AC_ARG_WITH(static-linked-ext,
AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
[AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])])
-if test x"$EXTSTATIC" = xstatic; then
- ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
- EXTOBJS='ext/extinit.$(OBJEXT)'
- AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
-fi
-AC_SUBST(ENCOBJS)
-AC_SUBST(EXTOBJS)
AS_CASE(["$target_os"],
+ [human*], [
+ setup=Setup.x68
+ ],
dnl OS/2 environment w/ Autoconf 2.1x for EMX
[os2-emx], [
setup=Setup.emx
@@ -2614,69 +2047,33 @@ AS_CASE(["$target_os"],
[*djgpp*], [
setup=Setup.dj
],
- [nacl], [
- setup=Setup.nacl
- ],
[
setup=Setup
])
AC_SUBST(setup)
-test x"$prefix" = xNONE && prefix=$ac_default_prefix
-test x"${exec_prefix}" = xNONE && exec_prefix="$prefix"
-pat=`echo "${exec_prefix}" | tr -c '\012' .`'\(.*\)'
-for var in bindir libdir; do
- eval val='"$'$var'"'
- AS_CASE(["$val"], ["${exec_prefix}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
- eval $var='"$val"'
-done
+if test "$prefix" = NONE; then
+ prefix=$ac_default_prefix
+fi
-BTESTRUBY='$(MINIRUBY)'
if test x"$cross_compiling" = xyes; then
- test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
- XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
- XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
- XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
- AC_SUBST(XRUBY_LIBDIR)
- AC_SUBST(XRUBY_RUBYLIBDIR)
- AC_SUBST(XRUBY_RUBYHDRDIR)
+ test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`pwd` "-r'$(arch)-fake'
PREP='$(arch)-fake.rb'
- RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
- RUNRUBY='$(RUNRUBY_COMMAND)'
+ RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
XRUBY='$(MINIRUBY)'
TEST_RUNNABLE=no
- CROSS_COMPILING=yes
-
- if test "$host_os" = "nacl"; then
- if test "$build_cpu" = "$host_cpu" || test "${nacl_cv_cpu_nick}" = "x86" -a "$host_cpu" = "i686"; then
- nacl_cv_sel_ldr='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb sel_ldr`'
- nacl_cv_irt_core='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb irt_core`'
- nacl_cv_runnable_ld='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb runnable_ld`'
- nacl_cv_host_lib='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb host_lib`'
- TEST_RUNNABLE=yes
- BTESTRUBY="${nacl_cv_sel_ldr} -a -B ${nacl_cv_irt_core} -w 1:3 -w 2:4"
- BTESTRUBY="$BTESTRUBY -- ${nacl_cv_runnable_ld} --library-path ${nacl_cv_host_lib}"
- BTESTRUBY="$BTESTRUBY `pwd`/"'miniruby$(EXEEXT) -I`cd $(srcdir)/lib; pwd` -I.'
- BTESTRUBY="$BTESTRUBY"' -I$(EXTOUT)/common 3>&1 4>&2 1>/dev/null 2>/dev/null '
- fi
- fi
else
- MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
- MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
+ MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
+ MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
PREP='miniruby$(EXEEXT)'
- RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
- RUNRUBY='$(RUNRUBY_COMMAND) --'
+ RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
XRUBY='$(RUNRUBY)'
TEST_RUNNABLE=yes
- CROSS_COMPILING=no
fi
AC_SUBST(TEST_RUNNABLE)
-AC_SUBST(CROSS_COMPILING)
AC_SUBST(MINIRUBY)
-AC_SUBST(BTESTRUBY)
AC_SUBST(PREP)
-AC_SUBST(RUNRUBY_COMMAND)
AC_SUBST(RUNRUBY)
AC_SUBST(XRUBY)
AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
@@ -2689,7 +2086,7 @@ LIBRUBYARG='$(LIBRUBYARG_STATIC)'
SOLIBS=
AS_CASE(["$target_os"],
- [cygwin*|mingw*|beos*|haiku*|darwin*|os2-emx*], [
+ [cygwin*|mingw*|beos*|haiku*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*], [
: ${DLDLIBS=""}
],
[
@@ -2709,46 +2106,26 @@ ENABLE_SHARED=no
AC_ARG_ENABLE(shared,
AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
[enable_shared=$enableval])
+LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
libprefix='$(libdir)'
-LIBRUBY_RELATIVE=${load_relative-no}
-AS_CASE("$enable_shared", [yes], [
+LIBRUBY_RELATIVE=no
+if test "$enable_shared" = 'yes'; then
LIBRUBY='$(LIBRUBY_SO)'
- LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
LIBRUBYARG='$(LIBRUBYARG_SHARED)'
- LIBRUBY_RELATIVE=no
test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
ENABLE_SHARED=yes
if test "$rb_cv_binary_elf" = yes; then
SOLIBS='$(LIBS)'
fi
-
- # libdir can be overridden in config.site file (on OpenSUSE at least).
- libdir_basename=lib
- if test "$bindir" = '${exec_prefix}/bin'; then
- AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
- fi
- AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
-
- AS_CASE(["$target_os"],
- [freebsd*|dragonfly*], [],
- [
- if test "$GCC" = yes; then
- RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no])
- if test "no_undefined" = yes; then
- RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined])
- fi
- fi
- ])
-
AS_CASE(["$target_os"],
[sunos4*], [
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
],
[linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
+ 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'
if test "$load_relative" = yes; then
- LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../${libdir_basename}'"
+ LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../lib'"
LIBRUBY_RELATIVE=yes
fi
],
@@ -2763,7 +2140,7 @@ AS_CASE("$enable_shared", [yes], [
[netbsd*], [
SOLIBS='$(LIBS)'
LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
if test "$rb_cv_binary_elf" = yes; then # ELF platforms
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
else # a.out platforms
@@ -2780,8 +2157,6 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
if test "$GCC" = yes; then
LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
- else
- LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)'
fi
XLDFLAGS="$XLDFLAGS "'-R${libdir}'
],
@@ -2791,21 +2166,21 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
],
[aix*], [
- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
+ LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS"
LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
SOLIBS='-lm -lc'
],
[beos*], [
AS_CASE(["$target_cpu"],
[powerpc*], [
- LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
+ LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
])
],
[darwin*], [
RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_LDSHARED='$(CC) -dynamiclib'
if test "$load_relative" = yes; then
- libprefix="@executable_path/../${libdir_basename}"
+ libprefix='@executable_path/../lib'
LIBRUBY_RELATIVE=yes
fi
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
@@ -2821,45 +2196,8 @@ AS_CASE("$enable_shared", [yes], [
],
[interix*], [
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
- ],
- [mingw*|cygwin*|mswin*], [
- LIBRUBY_RELATIVE=yes
])
-], [
- LIBRUBYARG_SHARED=
-
- # enable PIE if possible
- pie=
- AS_CASE(["$target_os"],
- [haiku], [
- # gcc supports PIE, but doesn't work correctly in Haiku
- pie=no
- ],
- [nacl], [
- # -pie implies -shared for NaCl.
- pie=no
- ])
- if test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno; then
- RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
- if test "$pie" = yes; then
- # Use -fPIE when testing -pie. RUBY_TRY_LDFLAGS sets
- # $save_CFLAGS internally, so set other name here.
- save_CFLAGS_before_pie="$CFLAGS"
- CFLAGS="$CFLAGS -fPIE"
-
- # gcc need -pie but clang need -Wl,-pie.
- for pie in -pie -Wl,-pie; do
- RUBY_TRY_LDFLAGS([$pie], [], [pie=])
- if test "x$pie" != x; then
- RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
- RUBY_APPEND_OPTION(XLDFLAGS, $pie)
- break
- fi
- done
- CFLAGS="$save_CFLAGS_before_pie"
- fi
- fi
-])
+fi
if test "$enable_rpath" = yes; then
test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
@@ -2878,86 +2216,21 @@ if test "$EXEEXT" = .exe; then
AC_SUBST(EXECUTABLE_EXTS)
fi
-AC_ARG_ENABLE(dtrace,
- AS_HELP_STRING([--enable-dtrace],
- [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
- [enable_dtrace=$enableval], [enable_dtrace=auto])
-
-if test "${enable_dtrace}" = "auto"; then
- if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then
- RUBY_DTRACE_AVAILABLE()
- enable_dtrace=$rb_cv_dtrace_available
- else
- enable_dtrace=no
- fi
-fi
-
-LIBRUBY_A_OBJS='$(OBJS)'
-if test "${enable_dtrace}" = "yes"; then
- if test -z "$DTRACE"; then
- AC_MSG_ERROR([dtrace(1) is missing])
- elif test "$cross_compiling" = yes; then
- AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
- else
- RUBY_DTRACE_AVAILABLE()
- enable_dtrace=$rb_cv_dtrace_available
- if test "${enable_dtrace}" = "no"; then
- AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
- fi
- RUBY_DTRACE_POSTPROCESS()
- if test "$rb_cv_prog_dtrace_g" = 'yes'; then
- DTRACE_OBJ='probes.$(OBJEXT)'
- DTRACE_GLOMMED_OBJ='ruby-glommed.$(OBJEXT)'
- LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
- fi
- AS_CASE("${target_os}", [freebsd*], [
- # FreeBSD's dtrace requires libelf
- LIBS="-lelf $LIBS"
- ])
- fi
- DTRACE_EXT=d
-else
- DTRACE_EXT=dmyh
-fi
-AC_SUBST(DTRACE_EXT)
-AC_SUBST(DTRACE_OBJ)
-AC_SUBST(DTRACE_GLOMMED_OBJ)
-AC_SUBST(LIBRUBY_A_OBJS)
-
-}
-{ # build section
+dnl }
+dnl build section {
dnl build rdoc index if requested
RDOCTARGET=""
-CAPITARGET=""
AC_ARG_ENABLE(install-doc,
- AS_HELP_STRING([--disable-install-doc], [do not install neither rdoc indexes nor C API documents during install]),
+ AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
[install_doc=$enableval], [install_doc=yes])
-AC_ARG_ENABLE(install-rdoc,
- AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
- [install_rdoc=$enableval], [install_rdoc=yes])
-AC_ARG_ENABLE(install-capi,
- AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
- [install_capi=$enableval], [install_capi=yes])
-
if test "$install_doc" != no; then
- if test "$install_rdoc" != no; then
- RDOCTARGET="rdoc"
- else
- RDOCTARGET="nodoc"
- fi
- if test "$install_capi" != no -a -n "$DOXYGEN"; then
- CAPITARGET="capi"
- else
- CAPITARGET="nodoc"
- fi
+ RDOCTARGET="rdoc"
else
RDOCTARGET="nodoc"
CAPITARGET="nodoc"
fi
-
AC_SUBST(RDOCTARGET)
-AC_SUBST(CAPITARGET)
AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
AC_SUBST(INSTALLDOC)
@@ -2965,35 +2238,32 @@ AC_SUBST(INSTALLDOC)
if test "$rb_with_pthread" = "yes"; then
THREAD_MODEL=pthread
fi
-AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
- AC_TRY_COMPILE([extern void conftest_external(void) {}], [], [
- rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
- sed -n ['/.*T[ ]\([^ ]*\)conftest_external.*/!d;s//\1/p;q']`
- ],
- [rb_cv_symbol_prefix=''])
- test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE
-])
-SYMBOL_PREFIX="$rb_cv_symbol_prefix"
-test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
-DLNOBJ=dln.o
-AC_ARG_ENABLE(dln,
- AC_HELP_STRING([--disable-dln], [disable dynamic link feature]),
- [test "$enableval" = yes || DLNOBJ=dmydln.o])
-AC_SUBST(DLNOBJ)
MINIDLNOBJ=dmydln.o
-
AS_CASE(["$target_os"],
[linux*], [
],
[netbsd*], [
RUBY_APPEND_OPTION(CFLAGS, -pipe)
],
+ [nextstep*|openstep*], [
+ RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include)
+ ],
+ [rhapsody*], [
+ RUBY_APPEND_OPTIONS(CFLAGS, -pipe -no-precomp)
+ ],
[darwin*], [
RUBY_APPEND_OPTION(CFLAGS, -pipe)
],
+ [human*], [
+ AC_LIBOBJ([x68.o])
+ CFLAGS="$CFLAGS -fansi-only"
+ XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+ EXEEXT=.x
+ OBJEXT=o
+ ],
[os2-emx], [
AC_LIBOBJ([os2])
- CFLAGS="$CFLAGS -DOS2"
+ CFLAGS="$CFLAGS -DOS2"
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//'`
@@ -3018,7 +2288,7 @@ AS_CASE(["$target_os"],
CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
],
[cygwin*|mingw*], [
- RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
+ RUBY_SO_NAME="${RUBY_SO_NAME}${MAJOR}${MINOR}${TEENY}"
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
AS_CASE(["$target_os"],
[cygwin*], [
@@ -3029,22 +2299,17 @@ AS_CASE(["$target_os"],
],
[mingw*], [
RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
- if test x"${target_cpu}" != xi386; then
- RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
- fi
if test x"$enable_shared" = xyes; then
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
fi
EXPORT_PREFIX=' '
DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
- AC_LIBOBJ([win32/win32])
- AC_LIBOBJ([win32/file])
+ AC_LIBOBJ([win32])
COMMON_LIBS=m
# COMMON_MACROS="WIN32_LEAN_AND_MEAN="
COMMON_HEADERS="winsock2.h windows.h"
THREAD_MODEL=win32
- PLATFORM_DIR=win32
])
LIBRUBY_ALIASES=''
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
@@ -3062,8 +2327,8 @@ AS_CASE(["$target_os"],
XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
YACC="$YACC -Nl40000 -Nm40000"
])],
- [nacl], [
- FIRSTMAKEFILE=GNUmakefile:nacl/GNUmakefile.in
+ [*msdosdjgpp*], [
+ FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in
])
MINIOBJS="$MINIDLNOBJ"
@@ -3073,12 +2338,8 @@ AS_CASE(["$THREAD_MODEL"],
[""], [AC_MSG_ERROR(thread model is missing)],
[AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
-AC_ARG_ENABLE(debug-env,
- AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),
- [AC_DEFINE(RUBY_DEBUG_ENV)])
-
AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
- AC_MSG_CHECKING([if ${MAKE-make} is GNU make])
+ 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
@@ -3086,35 +2347,13 @@ AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
rm -fr conftest.dir
AS_CASE(["$gnumake"],
[*yes*], [
- echo '@%:@ -*- makefile -*-' > GNUmakefile
- echo 'override MFLAGS := $(filter-out -j%,$(MFLAGS))' >> GNUmakefile
- echo "include Makefile" >> GNUmakefile
+ echo "include Makefile" > GNUmakefile
echo "-include uncommon.mk" >> GNUmakefile
gnumake=yes],
[
gnumake=no])
AC_MSG_RESULT($gnumake)
])
-AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
- AC_MSG_CHECKING([for safe null command for ${MAKE-make}])
- mkdir conftest.dir
- NULLCMD=
- for cmd in : true; do
- echo 'A=1' > conftest.dir/Makefile
- echo 'B=$(A:1=@'$cmd')' >> conftest.dir/Makefile
- echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
- if (cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null); then
- NULLCMD=$cmd
- break
- fi
- done
- rm -fr conftest.dir
- if test -z "$NULLCMD"; then
- AC_MSG_ERROR(no candidate for safe null command)
- fi
- AC_MSG_RESULT($NULLCMD)
-])
-AC_SUBST(NULLCMD)
if test "${universal_binary-no}" = yes ; then
AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
@@ -3134,7 +2373,7 @@ if test "${universal_binary-no}" = yes ; then
archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
for archs in ${universal_archnames}; do
- cpu=${archs@%:@*=}
+ cpu=${archs#*=}
archs=${archs%=*}
CFLAGS="$new_cflags -arch $archs"
archs="__${archs}__"
@@ -3148,42 +2387,6 @@ if test "${universal_binary-no}" = yes ; then
])])
fi
-AC_CHECK_FUNC(memmem, [
- AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [
- AC_TRY_RUN([
-#include <string.h>
-
-int
-main()
-{
- char *str = "hogefugafoobar";
- char *rs = "foo";
- char *empty = "";
- char *p;
-
- p = memmem(str, strlen(str), rs, strlen(rs));
- if (p == str+8) {
- p = memmem(str, strlen(str), empty, strlen(empty));
- if (p == str)
- return 0;
- else
- return 1;
- }
- else {
- return 1;
- }
-}
- ],
- rb_cv_broken_memmem=no,
- rb_cv_broken_memmem=yes,
- rb_cv_broken_memmem=yes)
- ])
- if test "$rb_cv_broken_memmem" = no; then
- AC_DEFINE(HAVE_MEMMEM, 1)
- fi
-])
-
-
CPPFLAGS="$CPPFLAGS "'$(DEFS)'
test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
if test -n "${cflags+set}"; then
@@ -3196,22 +2399,18 @@ if test -n "${cxxflags+set}"; then
fi
if test "${ARCH_FLAG}"; then
archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
- CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
- CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
- LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
+ 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
-warnflags="$rb_cv_warnflags"
AC_SUBST(cppflags, [])dnl
AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
AC_SUBST(optflags)dnl
AC_SUBST(debugflags)dnl
AC_SUBST(warnflags)dnl
-AC_SUBST(strict_warnflags)dnl
AC_SUBST(XCFLAGS)dnl
AC_SUBST(XLDFLAGS)dnl
-AC_SUBST(EXTLDFLAGS)dnl
-AC_SUBST(EXTDLDFLAGS)dnl
AC_SUBST(LIBRUBY_LDSHARED)
AC_SUBST(LIBRUBY_DLDFLAGS)
AC_SUBST(RUBY_INSTALL_NAME)
@@ -3233,10 +2432,8 @@ AC_SUBST(COMMON_LIBS)
AC_SUBST(COMMON_MACROS)
AC_SUBST(COMMON_HEADERS)
AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(SYMBOL_PREFIX)
AC_SUBST(MINIOBJS)
AC_SUBST(THREAD_MODEL)
-AC_SUBST(PLATFORM_DIR)
MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
MAKEFILES="`echo $MAKEFILES`"
@@ -3257,98 +2454,19 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
-AC_ARG_ENABLE(multiarch,
- AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
- [multiarch=], [unset multiarch])
-
-archlibdir='${libdir}/${arch}'
-sitearchlibdir='${libdir}/${sitearch}'
-archincludedir='${includedir}/${arch}'
-sitearchincludedir='${includedir}/${sitearch}'
-
-shvar_to_cpp() {
- var="$1" val="$2"
- exec_prefix_pat="`echo \"${exec_prefix}\" | sed 's/\\./\\\\./g'`"
- arch_pat="`echo \"${arch}\" | sed 's/\\./\\\\./g'`"
- sitearch_pat="`echo \"${sitearch}\" | sed 's/\\./\\\\./g'`"
- val="`echo '\"'\"${val}\"'\"' |
- sed \
- -e 's/\${\([[A-Z][A-Z_]]*\)}/\"\1\"/g' \
- -e 's|\${sitearchlibdir}|'\"${sitearchlibdir}|g\" \
- -e 's|\${sitearchincludedir}|'\"${sitearchincludedir}|g\" \
- -e 's|\${archlibdir}|'\"${archlibdir}|g\" \
- -e 's|\${archincludedir}|'\"${archincludedir}|g\" \
- -e 's|\${libdir}|'\"${libdir}|g\" \
- -e 's/\${ruby_version}/\"RUBY_LIB_VERSION\"/g' \
- -e 's/\${arch}/\"arch\"/g' \
- -e 's/\${sitearch}/\"arch\"/g' \
- -e 's/\${vendorarchdir}/\"RUBY_VENDOR_ARCH_LIB\"/g' \
- -e 's/\${sitearchdir}/\"RUBY_SITE_ARCH_LIB\"/g' \
- -e 's/\${vendorlibdir}/\"RUBY_VENDOR_LIB2\"/g' \
- -e 's/\${sitelibdir}/\"RUBY_SITE_LIB2\"/g' \
- -e 's/\${vendordir}/\"RUBY_VENDOR_LIB\"/g' \
- -e 's/\${sitedir}/\"RUBY_SITE_LIB\"/g' \
- -e 's/\${rubylibdir}/\"RUBY_LIB\"/g' \
- -e 's/\${rubylibprefix}/\"RUBY_LIB_PREFIX\"/g' \
- -e 's/\${rubyarchprefix}/\"RUBY_ARCH_PREFIX_FOR(arch)\"/g' \
- -e 's/\${rubysitearchprefix}/\"RUBY_SITEARCH_PREFIX_FOR(arch)\"/g' \
- -e 's/\${exec_prefix}/\"RUBY_EXEC_PREFIX\"/g' \
- -e \"s|${exec_prefix_pat}/|\"'\"RUBY_EXEC_PREFIX\"/|g' \
- -e \"s|${arch_pat}|\"'\"arch\"|g' \
- -e \"s|${sitearch_pat}|\"'\"sitearch\"|g' \
- -e 's|^\\\"NONE/|RUBY_EXEC_PREFIX\\\"/|' \
- -e 's|^\\\"NONE\\\"|\\\"'\"${prefix}\"'\\\"|' \
- -e 's/^\\\"\\\"\(.\)/\1/;s/\(.\)\\\"\\\"$/\1/'
- `"
- eval $var='"$val"'
-}
-
-unexpand_shvar() {
- var=$1 n="" v="" expr=""
- shift
- test "$#" -eq 0 && return
- for n do
- eval v='"$'$n'"'
- v="`echo \"$v\" | sed -e ['s/${[^${}\"]*}/\"&\"/g'] -e ['s/[][$|.\\?*]/\\\\&/g']`"
- if test -n "$v"; then
- expr=["${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g"]
- AS_CASE(["$v"], [*'${'*'}'*], [expr=["$expr;s|$v|\"\${$n}\"|g"]])
- fi
- done
- expr=['s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g']
- eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"'
-}
-
rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
AC_ARG_WITH(rubylibprefix,
AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
- [if test "x$withval" = xno; then
- AC_MSG_ERROR([No ruby, No libprefix])
- fi
- rubylibprefix="$withval"])
+ [rubylibprefix=$withval])
+RUBY_LIB_PREFIX=`eval echo \\"${rubylibprefix}\\"`
AC_SUBST(rubylibprefix)
-rubylibdir='${rubylibprefix}/${ruby_version}'
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
-
-rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
-AC_ARG_WITH(rubyarchprefix,
- AS_HELP_STRING([--with-rubyarchprefix=DIR],
- [prefix for architecture dependent ruby libraries [[RUBYLIBPREFIX/ARCH]]]),
- [rubyarchprefix="$withval"])
-AC_SUBST(rubyarchprefix)
-
-rubysitearchprefix=${multiarch+'${sitearchlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${sitearch}'}
-AC_ARG_WITH(rubysitearchprefix,
- AS_HELP_STRING([--with-rubysitearchprefix=DIR],
- [prefix for architecture dependent site libraries [[RUBYLIBPREFIX/SITEARCH]]]),
- [rubysitearchprefix="$withval"])
-AC_SUBST(rubysitearchprefix)
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)
@@ -3366,104 +2484,85 @@ 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 "verconf.h"'
echo '#include "version.h"'
echo 'ruby_version=RUBY_LIB_VERSION'
} > conftest.c
- test -f verconf.h || > verconf.h
- ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+ 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
AC_ARG_WITH(sitedir,
- AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
+ AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
[sitedir=$withval],
[sitedir='${rubylibprefix}/site_ruby'])
-sitelibdir='${sitedir}/${ruby_version}'
-
-AC_ARG_WITH(sitearchdir,
- AS_HELP_STRING([--with-arch-sitedir=DIR],
- [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
- [sitearchdir=$withval],
- [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
+dir="${sitedir}"
+until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
+ dir="${SITE_DIR}"
+done
AC_ARG_WITH(vendordir,
- AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
+ AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
[vendordir=$withval],
[vendordir='${rubylibprefix}/vendor_ruby'])
-vendorlibdir='${vendordir}/${ruby_version}'
-
-AC_ARG_WITH(vendorarchdir,
- AS_HELP_STRING([--with-arch-vendordir=DIR],
- [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
- [vendorarchdir=$withval],
- [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+dir="${vendordir}"
+until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
+ dir="${VENDOR_DIR}"
+done
-unexpand_shvar rubylibprefix exec_prefix libdir RUBY_BASE_NAME
-unexpand_shvar rubyarchprefix exec_prefix libdir arch RUBY_BASE_NAME archlibdir rubylibprefix
-unexpand_shvar rubysitearchprefix exec_prefix libdir sitearch arch RUBY_BASE_NAME archlibdir sitearchlibdir rubylibprefix
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
- RUBY_EXEC_PREFIX='""'
+ RUBY_EXEC_PREFIX=""
+ 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
- shvar_to_cpp RUBY_EXEC_PREFIX "${exec_prefix}"
+ RUBY_EXEC_PREFIX="`eval echo \\"$exec_prefix/\\" | sed 's|^NONE/|'"$prefix"'/|;s|/$||'`"
+ 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
-shvar_to_cpp RUBY_LIB_PREFIX "${rubylibprefix}"
-shvar_to_cpp RUBY_ARCH_PREFIX_FOR "${rubyarchprefix}"
-shvar_to_cpp RUBY_SITEARCH_PREFIX_FOR "${rubysitearchprefix}"
-shvar_to_cpp RIDIR "${ridir}"
-unexpand_shvar exec_prefix prefix
-if test ${RUBY_LIB_VERSION_STYLE+set}; then
- AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE !<verconf>!)
-else
- AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION] !<verconf>!)
-fi
-AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, ${RUBY_EXEC_PREFIX})
-AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX} !<verconf>!)
-AC_DEFINE_UNQUOTED(RUBY_ARCH_PREFIX_FOR(arch), ${RUBY_ARCH_PREFIX_FOR} !<verconf>!)
-AC_DEFINE_UNQUOTED(RUBY_SITEARCH_PREFIX_FOR(arch), ${RUBY_SITEARCH_PREFIX_FOR} !<verconf>!)
+pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
+AS_CASE(["$RUBY_SITE_LIB_PATH"],
+ ["$RUBY_LIB_PREFIX/"*], [
+ RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
+ ],
+ [
+ RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
+ ])
+AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
+ ["$RUBY_LIB_PREFIX/"*], [
+ RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
+ ],
+ [
+ RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
+ ])
+pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
+AS_CASE(["$RUBY_LIB_PREFIX"],
+ ["$RUBY_EXEC_PREFIX/"*], [
+ RUBY_LIB_PREFIX='RUBY_EXEC_PREFIX"/'"`expr \"$RUBY_LIB_PREFIX\" : \"$pat\"`"'"'
+ ],
+ [
+ RUBY_LIB_PREFIX="\"${RUBY_LIB_PREFIX}\""
+ ])
-shvar_to_cpp RUBY_LIB "${rubylibdir}"
-if test "x${RUBY_LIB}" != 'xRUBY_LIB_PREFIX"/"RUBY_LIB_VERSION'; then
- AC_DEFINE_UNQUOTED(RUBY_LIB, ${RUBY_LIB} !<verconf>!)
-fi
-shvar_to_cpp RUBY_ARCH_LIB_FOR "${rubyarchdir}"
-AC_DEFINE_UNQUOTED(RUBY_ARCH_LIB_FOR(arch), ${RUBY_ARCH_LIB_FOR} !<verconf>!)
-if test "x$sitedir" = xno; then
- AC_DEFINE(NO_RUBY_SITE_LIB, [] !<verconf>!)
-else
- shvar_to_cpp RUBY_SITE_LIB "${sitedir}"
- AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB} !<verconf>!)
- shvar_to_cpp RUBY_SITE_ARCH_LIB_FOR "${sitearchdir}"
- AC_DEFINE_UNQUOTED(RUBY_SITE_ARCH_LIB_FOR(arch), ${RUBY_SITE_ARCH_LIB_FOR} !<verconf>!)
-fi
-if test "x$vendordir" = xno; then
- AC_DEFINE(NO_RUBY_VENDOR_LIB, [] !<verconf>!)
+if test ${RUBY_LIB_VERSION_STYLE+set}; then
+ AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE)
else
- shvar_to_cpp RUBY_VENDOR_LIB "${vendordir}"
- AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB} !<verconf>!)
- shvar_to_cpp RUBY_VENDOR_ARCH_LIB_FOR "${vendorarchdir}"
- AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCH_LIB_FOR(arch), ${RUBY_VENDOR_ARCH_LIB_FOR} !<verconf>!)
+ AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION])
fi
+AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
+AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
+AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH})
-AC_SUBST(archlibdir)dnl
-AC_SUBST(sitearchlibdir)dnl
-AC_SUBST(archincludedir)dnl
-AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
-AC_SUBST(rubylibdir)dnl
-AC_SUBST(rubyarchdir)dnl
AC_SUBST(sitedir)dnl
-AC_SUBST(sitelibdir)dnl
-AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
-AC_SUBST(vendorlibdir)dnl
-AC_SUBST(vendorarchdir)dnl
configure_args=$ac_configure_args
AC_SUBST(configure_args)dnl
@@ -3474,7 +2573,7 @@ if test "${universal_binary-no}" = yes ; then
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__ !<verconf>!)
+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
else
for archs in ${universal_archnames}; do
cpu=`echo $archs | sed 's/.*=//'`
@@ -3482,69 +2581,50 @@ if test "${universal_binary-no}" = yes ; then
RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
done
fi
- ints='long int short'
+ 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}" !<verconf>!)
- AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS !<verconf>!)
- AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS !<verconf>!)
+ 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)
else
arch="${target_cpu}-${target_os}"
- AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}" !<verconf>!)
+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
fi
unset sitearch
AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
-test ${sitearch+set} && AC_DEFINE_UNQUOTED(RUBY_SITEARCH, "${sitearch}" !<verconf>!)
-: ${sitearch='${arch}'}
+test ${sitearch+set} && AC_DEFINE_UNQUOTED(RUBY_SITEARCH, "${sitearch}")
AC_ARG_WITH(search-path,
AS_HELP_STRING([--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" !<verconf>!)
+ 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_VERSION_NAME}'])
-
-AC_ARG_WITH(rubyarchhdrdir,
- AS_HELP_STRING([--with-arch-rubyhdrdir=DIR],
- [architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
- [rubyarchhdrdir=$withval],
- [rubyarchhdrdir=${multiarch+'${archincludedir}/${RUBY_VERSION_NAME}'}${multiarch-'${rubyhdrdir}/${arch}'}])
+ [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(sitearchhdrdir,
- AS_HELP_STRING([--with-arch-sitehdrdir=DIR],
- [architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
- [sitearchhdrdir=$withval],
- [sitearchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/site_ruby'}${multiarch-'${sitehdrdir}/${sitearch}'}])
-
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_ARG_WITH(vendorarchhdrdir,
- AS_HELP_STRING([--with-arch-vendorhdrdir=DIR],
- [architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
- [vendorarchhdrdir=$withval],
- [vendorarchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/vendor_ruby'}${multiarch-'${vendorhdrdir}/${sitearch}'}])
-
AC_SUBST(rubyhdrdir)dnl
AC_SUBST(sitehdrdir)dnl
AC_SUBST(vendorhdrdir)dnl
-AC_SUBST(rubyarchhdrdir)dnl
-AC_SUBST(sitearchhdrdir)dnl
-AC_SUBST(vendorarchhdrdir)dnl
+
+AC_ARG_WITH(opt-dir,
+ AS_HELP_STRING([--with-opt-dir=DIR], [add optional headers and libraries DIR]))
AC_ARG_WITH(mantype,
AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
@@ -3563,29 +2643,11 @@ if test -z "$MANTYPE"; then
fi
AC_SUBST(MANTYPE)
-AC_ARG_ENABLE(rubygems,
- AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
- [enable_rubygems="$enableval"], [enable_rubygems=yes])
-if test x"$enable_rubygems" = xno; then
- AC_DEFINE(DISABLE_RUBYGEMS, 1)
- USE_RUBYGEMS=NO
-else
- USE_RUBYGEMS=YES
-fi
-AC_SUBST(USE_RUBYGEMS)
-
arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
AS_MKDIR_P("${arch_hdrdir}")
config_h="${arch_hdrdir}/config.h"
-guard=INCLUDE_RUBY_CONFIG_H
-{
- echo "#ifndef $guard"
- echo "#define $guard 1"
- grep -v "^#define PACKAGE_" confdefs.h | grep -v ' !<verconf>!$'
- echo "#endif /* $guard */"
-} | tr -d '\015' |
+tr -d '\015' < confdefs.h | grep -v "^#define PACKAGE_" |
${srcdir}/tool/ifchange "${config_h}" -
-sed -n 's/ !<verconf>!$//p' confdefs.h | ${srcdir}/tool/ifchange verconf.h -
tr -d '\015' < largefile.h > confdefs.h
rm largefile.h
@@ -3615,25 +2677,20 @@ AC_MSG_RESULT($PACKAGE library version = $ruby_version)
AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`])
AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [
- tmpmk=confmk$$.tmp
- {
- if test ${VCS+set}; then
- :
- elif svn info "$srcdir" > /dev/null 2>&1; then
+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
- AS_CASE("$VCS",
- [svn], [VCSUP='$(VCS) up $(SVNUPOPTIONS)'],
- ["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
- [git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
- [VCSUP='$(VCS)'])
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
if test "$gnumake" != yes; then
@@ -3642,44 +2699,10 @@ AC_CONFIG_FILES(Makefile, [
else
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
fi
- } > $tmpmk && if ! grep '^ruby:' $tmpmk > /dev/null; then
- if test "${gnumake}" = yes; then
- tmpgmk=confgmk$$.tmp
- {
- echo "include $tmpmk"
- echo "-include uncommon.mk"
- } > $tmpgmk
- else
- tmpgmk=$tmpmk
- fi &&
- test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" &&
- echo 'ruby: $(PROGRAM);' >> $tmpmk
- test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
- fi && mv -f $tmpmk Makefile],
+ } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
+ ${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
+ echo 'ruby: $(PROGRAM);' >> Makefile],
[EXEEXT='$EXEEXT' gnumake='$gnumake'])
-
-AC_ARG_WITH([ruby-pc],
- AC_HELP_STRING([pc file basename]),
- [ruby_pc="$withval"],
- [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
-AC_SUBST(ruby_pc)
-AC_SUBST(exec, [exec])
-
-AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
- [
- if sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
- {
- test -z "$PKG_CONFIG" ||
- PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp
- }
- then
- mv -f ruby.tmp.pc $ruby_pc
- else
- exit 1
- fi
- ],
- [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG'])
-
AC_OUTPUT
-}
-}
+dnl }
+dnl }
diff --git a/constant.h b/constant.h
deleted file mode 100644
index 9354241961..0000000000
--- a/constant.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**********************************************************************
-
- constant.h -
-
- $Author$
- created at: Sun Nov 15 00:09:33 2009
-
- Copyright (C) 2009 Yusuke Endoh
-
-**********************************************************************/
-#ifndef CONSTANT_H
-#define CONSTANT_H
-
-typedef enum {
- CONST_PUBLIC = 0x00,
- CONST_PRIVATE = 0x01
-} rb_const_flag_t;
-
-typedef struct rb_const_entry_struct {
- rb_const_flag_t flag;
- VALUE value; /* should be mark */
- VALUE file;
- int line;
-} rb_const_entry_t;
-
-VALUE rb_mod_private_constant(int argc, VALUE *argv, VALUE obj);
-VALUE rb_mod_public_constant(int argc, VALUE *argv, VALUE obj);
-void rb_free_const_table(st_table *tbl);
-VALUE rb_public_const_get(VALUE klass, ID id);
-VALUE rb_public_const_get_at(VALUE klass, ID id);
-VALUE rb_public_const_get_from(VALUE klass, ID id);
-int rb_public_const_defined(VALUE klass, ID id);
-int rb_public_const_defined_at(VALUE klass, ID id);
-int rb_public_const_defined_from(VALUE klass, ID id);
-
-#endif /* CONSTANT_H */
diff --git a/cont.c b/cont.c
index e1c5c8953e..e6f6b6dabc 100644
--- a/cont.c
+++ b/cont.c
@@ -10,75 +10,10 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "internal.h"
#include "vm_core.h"
#include "gc.h"
#include "eval_intern.h"
-/* FIBER_USE_NATIVE enables Fiber performance improvement using system
- * dependent method such as make/setcontext on POSIX system or
- * CreateFiber() API on Windows.
- * This hack make Fiber context switch faster (x2 or more).
- * However, it decrease maximum number of Fiber. For example, on the
- * 32bit POSIX OS, ten or twenty thousands Fiber can be created.
- *
- * Details is reported in the paper "A Fast Fiber Implementation for Ruby 1.9"
- * in Proc. of 51th Programming Symposium, pp.21--28 (2010) (in Japanese).
- */
-
-#if !defined(FIBER_USE_NATIVE)
-# if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
-# if 0
-# elif defined(__NetBSD__)
-/* On our experience, NetBSD doesn't support using setcontext() and pthread
- * simultaneously. This is because pthread_self(), TLS and other information
- * are represented by stack pointer (higher bits of stack pointer).
- * TODO: check such constraint on configure.
- */
-# define FIBER_USE_NATIVE 0
-# elif defined(__sun)
-/* On Solaris because resuming any Fiber caused SEGV, for some reason.
- */
-# define FIBER_USE_NATIVE 0
-# elif defined(__ia64)
-/* At least, Linux/ia64's getcontext(3) doesn't save register window.
- */
-# define FIBER_USE_NATIVE 0
-# elif defined(__GNU__)
-/* GNU/Hurd doesn't fully support getcontext, setcontext, makecontext
- * and swapcontext functions. Disabling their usage till support is
- * implemented. More info at
- * http://darnassus.sceen.net/~hurd-web/open_issues/glibc/#getcontext
- */
-# define FIBER_USE_NATIVE 0
-# else
-# define FIBER_USE_NATIVE 1
-# endif
-# elif defined(_WIN32)
-# if _WIN32_WINNT >= 0x0400
-/* only when _WIN32_WINNT >= 0x0400 on Windows because Fiber APIs are
- * supported only such building (and running) environments.
- * [ruby-dev:41192]
- */
-# define FIBER_USE_NATIVE 1
-# endif
-# endif
-#endif
-#if !defined(FIBER_USE_NATIVE)
-#define FIBER_USE_NATIVE 0
-#endif
-
-#if FIBER_USE_NATIVE
-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/mman.h>
-#include <ucontext.h>
-#endif
-#define RB_PAGE_SIZE (pagesize)
-#define RB_PAGE_MASK (~(RB_PAGE_SIZE - 1))
-static long pagesize;
-#endif /*FIBER_USE_NATIVE*/
-
#define CAPTURE_JUST_VALID_VM_STACK 1
enum context_type {
@@ -115,36 +50,12 @@ enum fiber_status {
TERMINATED
};
-#if FIBER_USE_NATIVE && !defined(_WIN32)
-#define MAX_MAHINE_STACK_CACHE 10
-static int machine_stack_cache_index = 0;
-typedef struct machine_stack_cache_struct {
- void *ptr;
- size_t size;
-} machine_stack_cache_t;
-static machine_stack_cache_t machine_stack_cache[MAX_MAHINE_STACK_CACHE];
-static machine_stack_cache_t terminated_machine_stack;
-#endif
-
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;
- /* If a fiber invokes "transfer",
- * then this fiber can't "resume" any more after that.
- * You shouldn't mix "transfer" and "resume".
- */
- int transfered;
-
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
- void *fib_handle;
-#else
- ucontext_t context;
-#endif
-#endif
} rb_fiber_t;
static const rb_data_type_t cont_data_type, fiber_data_type;
@@ -153,17 +64,18 @@ static VALUE rb_cFiber;
static VALUE rb_eFiberError;
#define GetContPtr(obj, ptr) \
- TypedData_Get_Struct((obj), rb_context_t, &cont_data_type, (ptr))
+ TypedData_Get_Struct(obj, rb_context_t, &cont_data_type, ptr)
#define GetFiberPtr(obj, ptr) do {\
- TypedData_Get_Struct((obj), rb_fiber_t, &fiber_data_type, (ptr)); \
- if (!(ptr)) rb_raise(rb_eFiberError, "uninitialized fiber"); \
-} while (0)
+ TypedData_Get_Struct(obj, rb_fiber_t, &fiber_data_type, ptr); \
+ 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);
#define THREAD_MUST_BE_RUNNING(th) do { \
- if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread"); \
+ if (!th->tag) rb_raise(rb_eThreadError, "not running thread"); \
} while (0)
static void
@@ -174,7 +86,6 @@ cont_mark(void *ptr)
rb_context_t *cont = ptr;
rb_gc_mark(cont->value);
rb_thread_mark(&cont->saved_thread);
- rb_gc_mark(cont->saved_thread.self);
if (cont->vm_stack) {
#ifdef CAPTURE_JUST_VALID_VM_STACK
@@ -187,21 +98,8 @@ cont_mark(void *ptr)
}
if (cont->machine_stack) {
- if (cont->type == CONTINUATION_CONTEXT) {
- /* cont */
- rb_gc_mark_locations(cont->machine_stack,
- cont->machine_stack + cont->machine_stack_size);
- }
- else {
- /* fiber */
- rb_thread_t *th;
- rb_fiber_t *fib = (rb_fiber_t*)cont;
- GetThreadPtr(cont->saved_thread.self, th);
- if ((th->fiber != cont->self) && fib->status == RUNNING) {
- rb_gc_mark_locations(cont->machine_stack,
- cont->machine_stack + cont->machine_stack_size);
- }
- }
+ rb_gc_mark_locations(cont->machine_stack,
+ cont->machine_stack + cont->machine_stack_size);
}
#ifdef __ia64
if (cont->machine_register_stack) {
@@ -220,41 +118,7 @@ cont_free(void *ptr)
if (ptr) {
rb_context_t *cont = ptr;
RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout);
-#if FIBER_USE_NATIVE
- if (cont->type == CONTINUATION_CONTEXT) {
- /* cont */
- RUBY_FREE_UNLESS_NULL(cont->machine_stack);
- }
- else {
- /* fiber */
-#ifdef _WIN32
- if (GET_THREAD()->fiber != cont->self && cont->type != ROOT_FIBER_CONTEXT) {
- /* don't delete root fiber handle */
- rb_fiber_t *fib = (rb_fiber_t*)cont;
- if (fib->fib_handle) {
- DeleteFiber(fib->fib_handle);
- }
- }
-#else /* not WIN32 */
- if (GET_THREAD()->fiber != cont->self) {
- rb_fiber_t *fib = (rb_fiber_t*)cont;
- if (fib->context.uc_stack.ss_sp) {
- if (cont->type == ROOT_FIBER_CONTEXT) {
- rb_bug("Illegal root fiber parameter");
- }
- munmap((void*)fib->context.uc_stack.ss_sp, fib->context.uc_stack.ss_size);
- }
- }
- else {
- /* It may reached here when finalize */
- /* TODO examine whether it is a bug */
- /* rb_bug("cont_free: release self"); */
- }
-#endif
- }
-#else /* not FIBER_USE_NATIVE */
RUBY_FREE_UNLESS_NULL(cont->machine_stack);
-#endif
#ifdef __ia64
RUBY_FREE_UNLESS_NULL(cont->machine_register_stack);
#endif
@@ -333,6 +197,7 @@ fiber_free(void *ptr)
RUBY_FREE_ENTER("fiber");
if (ptr) {
rb_fiber_t *fib = ptr;
+
if (fib->cont.type != ROOT_FIBER_CONTEXT &&
fib->cont.saved_thread.local_storage) {
st_free_table(fib->cont.saved_thread.local_storage);
@@ -359,21 +224,11 @@ fiber_memsize(const void *ptr)
return size;
}
-VALUE
-rb_obj_is_fiber(VALUE obj)
-{
- if (rb_typeddata_is_kind_of(obj, &fiber_data_type)) {
- return Qtrue;
- }
- else {
- return Qfalse;
- }
-}
-
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
@@ -412,34 +267,25 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
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 const rb_data_type_t cont_data_type = {
"continuation",
- {cont_mark, cont_free, cont_memsize,},
+ cont_mark, cont_free, cont_memsize,
};
static void
-cont_save_thread(rb_context_t *cont, rb_thread_t *th)
-{
- /* save thread context */
- cont->saved_thread = *th;
- /* saved_thread->machine_stack_(start|end) should be NULL */
- /* because it may happen GC afterward */
- cont->saved_thread.machine_stack_start = 0;
- cont->saved_thread.machine_stack_end = 0;
-#ifdef __ia64
- cont->saved_thread.machine_register_stack_start = 0;
- cont->saved_thread.machine_register_stack_end = 0;
-#endif
-}
-
-static void
cont_init(rb_context_t *cont, rb_thread_t *th)
{
/* save thread context */
- cont_save_thread(cont, th);
+ cont->saved_thread = *th;
cont->saved_thread.local_storage = 0;
+ cont->saved_thread.machine_stack_start = cont->saved_thread.machine_stack_end = 0;
}
static rb_context_t *
@@ -456,6 +302,8 @@ cont_new(VALUE klass)
return cont;
}
+void rb_vm_stack_to_heap(rb_thread_t *th);
+
static VALUE
cont_capture(volatile int *stat)
{
@@ -484,7 +332,7 @@ cont_capture(volatile int *stat)
cont_save_machine_stack(th, cont);
if (ruby_setjmp(cont->jmpbuf)) {
- volatile VALUE value;
+ VALUE value;
value = cont->value;
if (cont->argc == -1) rb_exc_raise(value);
@@ -494,12 +342,14 @@ cont_capture(volatile int *stat)
}
else {
*stat = 0;
- return contval;
+ return cont->self;
}
}
+NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
+
static void
-cont_restore_thread(rb_context_t *cont)
+cont_restore_1(rb_context_t *cont)
{
rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
@@ -542,170 +392,6 @@ cont_restore_thread(rb_context_t *cont)
th->protect_tag = sth->protect_tag;
th->errinfo = sth->errinfo;
th->first_proc = sth->first_proc;
- th->root_lep = sth->root_lep;
- th->root_svar = sth->root_svar;
-}
-
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
-static void
-fiber_set_stack_location(void)
-{
- rb_thread_t *th = GET_THREAD();
- VALUE *ptr;
-
- SET_MACHINE_STACK_END(&ptr);
- th->machine_stack_start = (void*)(((VALUE)ptr & RB_PAGE_MASK) + STACK_UPPER((void *)&ptr, 0, RB_PAGE_SIZE));
-}
-
-static VOID CALLBACK
-fiber_entry(void *arg)
-{
- fiber_set_stack_location();
- rb_fiber_start();
-}
-#else /* _WIN32 */
-
-/*
- * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
- * if MAP_STACK is passed.
- * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
- */
-#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
-#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
-#else
-#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
-#endif
-
-static char*
-fiber_machine_stack_alloc(size_t size)
-{
- char *ptr;
-
- if (machine_stack_cache_index > 0) {
- if (machine_stack_cache[machine_stack_cache_index - 1].size == (size / sizeof(VALUE))) {
- ptr = machine_stack_cache[machine_stack_cache_index - 1].ptr;
- machine_stack_cache_index--;
- machine_stack_cache[machine_stack_cache_index].ptr = NULL;
- machine_stack_cache[machine_stack_cache_index].size = 0;
- }
- else{
- /* TODO handle multiple machine stack size */
- rb_bug("machine_stack_cache size is not canonicalized");
- }
- }
- else {
- void *page;
- STACK_GROW_DIR_DETECTION;
-
- ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
- if (ptr == MAP_FAILED) {
- rb_raise(rb_eFiberError, "can't alloc machine stack to fiber");
- }
-
- /* guard page setup */
- page = ptr + STACK_DIR_UPPER(size - RB_PAGE_SIZE, 0);
- if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
- rb_raise(rb_eFiberError, "mprotect failed");
- }
- }
-
- return ptr;
-}
-#endif
-
-static void
-fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
-{
- rb_thread_t *sth = &fib->cont.saved_thread;
-
-#ifdef _WIN32
- fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
- if (!fib->fib_handle) {
- /* try to release unnecessary fibers & retry to create */
- rb_gc();
- fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
- if (!fib->fib_handle) {
- rb_raise(rb_eFiberError, "can't create fiber");
- }
- }
- sth->machine_stack_maxsize = size;
-#else /* not WIN32 */
- ucontext_t *context = &fib->context;
- char *ptr;
- STACK_GROW_DIR_DETECTION;
-
- getcontext(context);
- ptr = fiber_machine_stack_alloc(size);
- context->uc_link = NULL;
- context->uc_stack.ss_sp = ptr;
- context->uc_stack.ss_size = size;
- makecontext(context, rb_fiber_start, 0);
- sth->machine_stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
- sth->machine_stack_maxsize = size - RB_PAGE_SIZE;
-#endif
-#ifdef __ia64
- sth->machine_register_stack_maxsize = sth->machine_stack_maxsize;
-#endif
-}
-
-NOINLINE(static void fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib));
-
-static void
-fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
-{
- rb_thread_t *th = GET_THREAD(), *sth = &newfib->cont.saved_thread;
-
- if (newfib->status != RUNNING) {
- fiber_initialize_machine_stack_context(newfib, th->vm->default_params.fiber_machine_stack_size);
- }
-
- /* restore thread context */
- cont_restore_thread(&newfib->cont);
- th->machine_stack_maxsize = sth->machine_stack_maxsize;
- if (sth->machine_stack_end && (newfib != oldfib)) {
- rb_bug("fiber_setcontext: sth->machine_stack_end has non zero value");
- }
-
- /* save oldfib's machine stack */
- if (oldfib->status != TERMINATED) {
- STACK_GROW_DIR_DETECTION;
- SET_MACHINE_STACK_END(&th->machine_stack_end);
- if (STACK_DIR_UPPER(0, 1)) {
- oldfib->cont.machine_stack_size = th->machine_stack_start - th->machine_stack_end;
- oldfib->cont.machine_stack = th->machine_stack_end;
- }
- else {
- oldfib->cont.machine_stack_size = th->machine_stack_end - th->machine_stack_start;
- oldfib->cont.machine_stack = th->machine_stack_start;
- }
- }
- /* exchange machine_stack_start between oldfib and newfib */
- oldfib->cont.saved_thread.machine_stack_start = th->machine_stack_start;
- th->machine_stack_start = sth->machine_stack_start;
- /* oldfib->machine_stack_end should be NULL */
- oldfib->cont.saved_thread.machine_stack_end = 0;
-#ifndef _WIN32
- if (!newfib->context.uc_stack.ss_sp && th->root_fiber != newfib->cont.self) {
- rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL");
- }
-#endif
-
- /* swap machine context */
-#ifdef _WIN32
- SwitchToFiber(newfib->fib_handle);
-#else
- swapcontext(&oldfib->context, &newfib->context);
-#endif
-}
-#endif
-
-NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
-
-static void
-cont_restore_1(rb_context_t *cont)
-{
- cont_restore_thread(cont);
/* restore machine stack */
#ifdef _M_AMD64
@@ -720,7 +406,7 @@ cont_restore_1(rb_context_t *cont)
if (cont->machine_stack_src) {
FLUSH_REGISTER_WINDOWS;
MEMCPY(cont->machine_stack_src, cont->machine_stack,
- VALUE, cont->machine_stack_size);
+ VALUE, cont->machine_stack_size);
}
#ifdef __ia64
@@ -819,25 +505,24 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
cont_restore_1(cont);
}
#ifdef __ia64
-#define cont_restore_0(cont, vp) register_stack_extend((cont), (vp), (VALUE*)rb_ia64_bsp())
+#define cont_restore_0(cont, vp) register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
#endif
/*
* Document-class: Continuation
*
- * Continuation objects are generated by Kernel#callcc,
- * after having +require+d <i>continuation</i>. 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).
+ * 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:
*
- * require "continuation"
* arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
- * callcc{|cc| $cc = cc}
+ * callcc{|$cc|}
* puts(message = arr.shift)
* $cc.call unless message =~ /Max/
*
@@ -851,7 +536,6 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
* This (somewhat contrived) example allows the inner loop to abandon
* processing early:
*
- * require "continuation"
* callcc {|cont|
* for i in 0..4
* print "\n#{i}: "
@@ -861,7 +545,7 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
* end
* end
* }
- * puts
+ * print "\n"
*
* <em>produces:</em>
*
@@ -875,16 +559,14 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
* call-seq:
* callcc {|cont| block } -> obj
*
- * Generates a Continuation object, which it passes to
- * the associated block. You need to <code>require
- * 'continuation'</code> before using this method. Performing a
- * <em>cont</em><code>.call</code> will cause the #callcc
- * to return (as will falling through the end of the block). The
- * value returned by the #callcc is the value of the
- * block, or the value passed to <em>cont</em><code>.call</code>. See
- * class Continuation for more details. Also see
- * Kernel#throw for an alternative mechanism for
- * unwinding a call stack.
+ * 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
@@ -904,7 +586,7 @@ rb_callcc(VALUE self)
static VALUE
make_passing_arg(int argc, VALUE *argv)
{
- switch (argc) {
+ switch(argc) {
case 0:
return Qnil;
case 1:
@@ -955,9 +637,6 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
cont->argc = argc;
cont->value = make_passing_arg(argc, argv);
- /* restore `tracing' context. see [Feature #4347] */
- th->trace_arg = cont->saved_thread.trace_arg;
-
cont_restore_0(cont, &contval);
return Qnil; /* unreachable */
}
@@ -1028,9 +707,11 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
*
*/
+#define FIBER_VM_STACK_SIZE (4 * 1024)
+
static const rb_data_type_t fiber_data_type = {
"fiber",
- {fiber_mark, fiber_free, fiber_memsize,},
+ fiber_mark, fiber_free, fiber_memsize,
};
static VALUE
@@ -1045,10 +726,6 @@ fiber_t_alloc(VALUE fibval)
rb_fiber_t *fib;
rb_thread_t *th = GET_THREAD();
- if (DATA_PTR(fibval) != 0) {
- rb_raise(rb_eRuntimeError, "cannot initialize twice");
- }
-
THREAD_MUST_BE_RUNNING(th);
fib = ALLOC(rb_fiber_t);
memset(fib, 0, sizeof(rb_fiber_t));
@@ -1070,6 +747,7 @@ fiber_init(VALUE fibval, VALUE proc)
rb_context_t *cont = &fib->cont;
rb_thread_t *th = &cont->saved_thread;
+
/* initialize cont */
cont->vm_stack = 0;
@@ -1078,20 +756,18 @@ fiber_init(VALUE fibval, VALUE proc)
fiber_link_join(fib);
- th->stack_size = th->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
+ 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;
-#if VM_DEBUG_BP_CHECK
- th->cfp->bp_check = 0;
-#endif
- th->cfp->ep = th->stack;
- *th->cfp->ep = VM_ENVVAL_BLOCK_PTR(0);
+ th->cfp->bp = 0;
+ th->cfp->lfp = th->stack;
+ *th->cfp->lfp = 0;
+ th->cfp->dfp = th->stack;
th->cfp->self = Qnil;
- th->cfp->klass = Qnil;
th->cfp->flag = 0;
th->cfp->iseq = 0;
th->cfp->proc = 0;
@@ -1102,9 +778,7 @@ fiber_init(VALUE fibval, VALUE proc)
th->first_proc = proc;
-#if !FIBER_USE_NATIVE
MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
-#endif
return fibval;
}
@@ -1127,19 +801,20 @@ return_fiber(void)
{
rb_fiber_t *fib;
VALUE curr = rb_fiber_current();
- VALUE prev;
GetFiberPtr(curr, fib);
- prev = fib->prev;
- if (NIL_P(prev)) {
- const VALUE root_fiber = GET_THREAD()->root_fiber;
+ if (fib->prev == Qnil) {
+ rb_thread_t *th = GET_THREAD();
- if (root_fiber == curr) {
+ if (th->root_fiber != curr) {
+ return th->root_fiber;
+ }
+ else {
rb_raise(rb_eFiberError, "can't yield from root fiber");
}
- return root_fiber;
}
else {
+ VALUE prev = fib->prev;
fib->prev = Qnil;
return prev;
}
@@ -1152,14 +827,6 @@ rb_fiber_terminate(rb_fiber_t *fib)
{
VALUE value = fib->cont.value;
fib->status = TERMINATED;
-#if FIBER_USE_NATIVE && !defined(_WIN32)
- /* Ruby must not switch to other thread until storing terminated_machine_stack */
- terminated_machine_stack.ptr = fib->context.uc_stack.ss_sp;
- terminated_machine_stack.size = fib->context.uc_stack.ss_size / sizeof(VALUE);
- fib->context.uc_stack.ss_sp = NULL;
- fib->cont.machine_stack = NULL;
- fib->cont.machine_stack_size = 0;
-#endif
rb_fiber_transfer(return_fiber(), 1, &value);
}
@@ -1184,22 +851,21 @@ rb_fiber_start(void)
argv = (argc = cont->argc) > 1 ? RARRAY_PTR(args) : &args;
cont->value = Qnil;
th->errinfo = Qnil;
- th->root_lep = rb_vm_ep_local_ep(proc->block.ep);
- th->root_svar = Qnil;
+ th->local_lfp = proc->block.lfp;
+ th->local_svar = Qnil;
fib->status = RUNNING;
- cont->value = rb_vm_invoke_proc(th, proc, argc, argv, 0);
+ cont->value = rb_vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0);
}
TH_POP_TAG();
if (state) {
- if (state == TAG_RAISE || state == TAG_FATAL) {
- rb_threadptr_pending_interrupt_enque(th, th->errinfo);
+ if (state == TAG_RAISE) {
+ th->thrown_errinfo = th->errinfo;
}
else {
- VALUE err = rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
- if (!NIL_P(err))
- rb_threadptr_pending_interrupt_enque(th, err);
+ th->thrown_errinfo =
+ rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
}
RUBY_VM_SET_INTERRUPT(th);
}
@@ -1212,15 +878,10 @@ 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;
-#if FIBER_USE_NATIVE
-#ifdef _WIN32
- fib->fib_handle = ConvertThreadToFiber(0);
-#endif
-#endif
- fib->status = RUNNING;
fib->prev_fiber = fib->next_fiber = fib;
return fib;
@@ -1246,7 +907,7 @@ fiber_store(rb_fiber_t *next_fib)
if (th->fiber) {
GetFiberPtr(th->fiber, fib);
- cont_save_thread(&fib->cont, th);
+ fib->cont.saved_thread = *th;
}
else {
/* create current fiber */
@@ -1254,43 +915,17 @@ fiber_store(rb_fiber_t *next_fib)
th->root_fiber = th->fiber = fib->cont.self;
}
-#if !FIBER_USE_NATIVE
cont_save_machine_stack(th, &fib->cont);
-#endif
- if (FIBER_USE_NATIVE || ruby_setjmp(fib->cont.jmpbuf)) {
-#if FIBER_USE_NATIVE
- fiber_setcontext(next_fib, fib);
-#ifndef _WIN32
- if (terminated_machine_stack.ptr) {
- if (machine_stack_cache_index < MAX_MAHINE_STACK_CACHE) {
- machine_stack_cache[machine_stack_cache_index].ptr = terminated_machine_stack.ptr;
- machine_stack_cache[machine_stack_cache_index].size = terminated_machine_stack.size;
- machine_stack_cache_index++;
- }
- else {
- if (terminated_machine_stack.ptr != fib->cont.machine_stack) {
- munmap((void*)terminated_machine_stack.ptr, terminated_machine_stack.size * sizeof(VALUE));
- }
- else {
- rb_bug("terminated fiber resumed");
- }
- }
- terminated_machine_stack.ptr = NULL;
- terminated_machine_stack.size = 0;
- }
-#endif
-#endif
+ 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;
}
-#if !FIBER_USE_NATIVE
else {
return Qundef;
}
-#endif
}
static inline VALUE
@@ -1304,13 +939,6 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
GetFiberPtr(fibval, fib);
cont = &fib->cont;
- if (th->fiber == fibval) {
- /* ignore fiber context switch
- * because destination fiber is same as current fiber
- */
- return make_passing_arg(argc, argv);
- }
-
if (cont->saved_thread.self != th->self) {
rb_raise(rb_eFiberError, "fiber called across threads");
}
@@ -1332,38 +960,22 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
cont = &fib->cont;
cont->argc = -1;
cont->value = value;
-#if FIBER_USE_NATIVE
- {
- VALUE oldfibval;
- rb_fiber_t *oldfib;
- oldfibval = rb_fiber_current();
- GetFiberPtr(oldfibval, oldfib);
- fiber_setcontext(fib, oldfib);
- }
-#else
cont_restore_0(cont, &value);
-#endif
}
if (is_resume) {
fib->prev = rb_fiber_current();
}
- else {
- /* restore `tracing' context. see [Feature #4347] */
- th->trace_arg = cont->saved_thread.trace_arg;
- }
cont->argc = argc;
cont->value = make_passing_arg(argc, argv);
- value = fiber_store(fib);
-#if !FIBER_USE_NATIVE
- if (value == Qundef) {
+ if ((value = fiber_store(fib)) == Qundef) {
cont_restore_0(cont, &value);
rb_bug("rb_fiber_resume: unreachable");
}
-#endif
- RUBY_VM_CHECK_INTS(th);
+
+ RUBY_VM_CHECK_INTS();
return value;
}
@@ -1380,12 +992,9 @@ rb_fiber_resume(VALUE fibval, int argc, VALUE *argv)
rb_fiber_t *fib;
GetFiberPtr(fibval, fib);
- if (fib->prev != Qnil || fib->cont.type == ROOT_FIBER_CONTEXT) {
+ if (fib->prev != Qnil) {
rb_raise(rb_eFiberError, "double resume");
}
- if (fib->transfered != 0) {
- rb_raise(rb_eFiberError, "cannot resume transferred Fiber");
- }
return fiber_switch(fibval, argc, argv, 1);
}
@@ -1396,27 +1005,13 @@ rb_fiber_yield(int argc, VALUE *argv)
return rb_fiber_transfer(return_fiber(), argc, argv);
}
-void
-rb_fiber_reset_root_local_storage(VALUE thval)
-{
- rb_thread_t *th;
- rb_fiber_t *fib;
-
- GetThreadPtr(thval, th);
- if (th->root_fiber && th->root_fiber != th->fiber) {
- GetFiberPtr(th->root_fiber, fib);
- th->local_storage = fib->cont.saved_thread.local_storage;
- }
-}
-
/*
* 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. You need to <code>require 'fiber'</code>
- * before using this method.
+ * 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)
@@ -1453,9 +1048,7 @@ rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
*
* 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>. You need to <code>require 'fiber'</code>
- * before using this method.
+ * fiber will be suspended much like in a call to <code>Fiber.yield</code>.
*
* The fiber which receives the transfer call is treats it much like
* a resume call. Arguments passed to transfer are treated like those
@@ -1464,41 +1057,11 @@ rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
* 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.
- *
- * Example:
- *
- * fiber1 = Fiber.new do
- * puts "In Fiber 1"
- * Fiber.yield
- * end
- *
- * fiber2 = Fiber.new do
- * puts "In Fiber 2"
- * fiber1.transfer
- * puts "Never see this message"
- * end
- *
- * fiber3 = Fiber.new do
- * puts "In Fiber 3"
- * end
- *
- * fiber2.resume
- * fiber3.resume
- *
- * <em>produces</em>
- *
- * In fiber 2
- * In fiber 1
- * In fiber 3
- *
*/
static VALUE
-rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval)
+rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fib)
{
- rb_fiber_t *fib;
- GetFiberPtr(fibval, fib);
- fib->transfered = 1;
- return rb_fiber_transfer(fibval, argc, argv);
+ return rb_fiber_transfer(fib, argc, argv);
}
/*
@@ -1549,19 +1112,6 @@ rb_fiber_s_current(VALUE klass)
void
Init_Cont(void)
{
-#if FIBER_USE_NATIVE
- rb_thread_t *th = GET_THREAD();
-
-#ifdef _WIN32
- SYSTEM_INFO info;
- GetSystemInfo(&info);
- pagesize = info.dwPageSize;
-#else /* not WIN32 */
- pagesize = sysconf(_SC_PAGESIZE);
-#endif
- SET_MACHINE_STACK_END(&th->machine_stack_end);
-#endif
-
rb_cFiber = rb_define_class("Fiber", rb_cObject);
rb_define_alloc_func(rb_cFiber, fiber_alloc);
rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
@@ -1570,10 +1120,6 @@ Init_Cont(void)
rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
}
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
void
ruby_Init_Continuation_body(void)
{
@@ -1592,7 +1138,3 @@ ruby_Init_Fiber_as_Coroutine(void)
rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0);
rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
}
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 5bd414d786..025f460c9c 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,4 +1,5 @@
include Makefile
+-include uncommon.mk
ENABLE_SHARED=@ENABLE_SHARED@
DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
@@ -10,9 +11,6 @@ else
DLL_BASE_NAME := $(RUBY_SO_NAME)
DLLWRAP += -mno-cygwin
VPATH := $(VPATH):$(srcdir)/win32
- STUBPROGRAM = rubystub$(EXEEXT)
- IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
- SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))
endif
ifneq ($(ENABLE_SHARED),yes)
@@ -29,9 +27,6 @@ else
endif
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-
--include uncommon.mk
-
SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
@@ -39,24 +34,15 @@ RUBYDEF = $(DLL_BASE_NAME).def
ruby: $(PROGRAM)
rubyw: $(WPROGRAM)
-stub: $(STUBPROGRAM)
-scriptbin: $(SCRIPTPROGRAMS)
-
-%$(EXEEXT): bin/% $(STUBPROGRAM)
- $(ECHO) generating $@
- $(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
- $(Q) chmod +x $@
$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
%.res.@OBJEXT@: %.rc
- $(ECHO) compiling $@
- $(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+ $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
- $(ECHO) generating $@
- $(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
+ @$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(DLL_BASE_NAME) \
. $(icondirs) $(srcdir)/win32
@@ -64,21 +50,14 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
@rm -f $@
- $(ECHO) linking $@
- $(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
+ $(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@
- @rm -f $@
- $(ECHO) linking $@
- $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
- stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
$(RUBY_EXP): $(LIBRUBY_A)
- $(ECHO) creating $@
- $(Q) $(DLLWRAP) \
+ $(DLLWRAP) \
--output-exp=$(RUBY_EXP) \
--export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
- $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
+ $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
@rm -f $(PROGRAM)
GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in
@@ -92,18 +71,18 @@ endif
$(LIBRUBY_SO): $(RUBYDEF)
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
- $(ECHO) generating $@
- $(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
+ $(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)
- $(ECHO) generating $@
- $(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
+ @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
endif
clean-local::
@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
+
+distclean-local::
@$(RM) $(RCFILES)
diff --git a/debug.c b/debug.c
index 4909a45d17..02fa9292a2 100644
--- a/debug.c
+++ b/debug.c
@@ -12,7 +12,7 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
#include "ruby/util.h"
-#include "vm_debug.h"
+#include "debug.h"
#include "eval_intern.h"
#include "vm_core.h"
#include "id.h"
@@ -32,8 +32,8 @@ const union {
RUBY_ENC_CODERANGE_7BIT = ENC_CODERANGE_7BIT,
RUBY_ENC_CODERANGE_VALID = ENC_CODERANGE_VALID,
RUBY_ENC_CODERANGE_BROKEN = ENC_CODERANGE_BROKEN,
- RUBY_FL_RESERVED1 = FL_RESERVED1,
- RUBY_FL_RESERVED2 = FL_RESERVED2,
+ 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,
@@ -136,12 +136,13 @@ 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) { \
+ strncmp(str, name, len) == 0) { \
extern int var; \
var = 1; \
return; \
@@ -160,3 +161,4 @@ ruby_set_debug_option(const char *str)
{
ruby_each_words(str, set_debug_option, 0);
}
+#endif
diff --git a/debug.h b/debug.h
new file mode 100644
index 0000000000..d5670651a4
--- /dev/null
+++ b/debug.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+
+ 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/defs/default_gems b/defs/default_gems
deleted file mode 100644
index e73e383b26..0000000000
--- a/defs/default_gems
+++ /dev/null
@@ -1,5 +0,0 @@
-# gem base directory versioning file [executable files under bin]
-rake lib/rake lib/rake/version.rb [rake]
-rdoc lib/rdoc lib/rdoc.rb [rdoc ri]
-minitest lib/minitest lib/minitest/unit.rb
-json ext/json ext/json/lib/json/version.rb
diff --git a/defs/id.def b/defs/id.def
deleted file mode 100644
index 91c4110d24..0000000000
--- a/defs/id.def
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- mode: ruby; coding: us-ascii -*-
-firstline, predefined = __LINE__+1, %[\
- intern
- method_missing MethodMissing
- length
- size
- gets
- succ
- each
- proc
- lambda
- send
- __send__
- initialize
- initialize_copy
- initialize_clone
- initialize_dup
- _ UScore
- "/*NULL*/" NULL
- empty?
- respond_to? Respond_to
- respond_to_missing? Respond_to_missing
- <IFUNC>
- <CFUNC>
- core#set_method_alias
- core#set_variable_alias
- core#undef_method
- core#define_method
- core#define_singleton_method
- core#set_postexe
- core#hash_from_ary
- core#hash_merge_ary
- core#hash_merge_ptr
- core#hash_merge_kwd
-]
-
-class KeywordError < RuntimeError
- def self.raise(mesg, line)
- super(self, mesg, ["#{__FILE__}:#{line}", *caller])
- end
-end
-
-predefined_ids = {}
-preserved_ids = []
-local_ids = []
-instance_ids = []
-global_ids = []
-const_ids = []
-class_ids = []
-names = {}
-predefined.split(/^/).each_with_index do |line, num|
- next if /^#/ =~ line
- line.sub!(/\s+#.*/, '')
- name, token = line.split
- next unless name
- token ||= name
- if /#/ =~ token
- token = "_#{token.gsub(/\W+/, '_')}"
- else
- token = token.sub(/\?/, 'P').sub(/\A[a-z]/) {$&.upcase}
- token.sub!(/\A\$/, "_G_")
- token.sub!(/\A@@/, "_C_")
- token.sub!(/\A@/, "_I_")
- token.gsub!(/\W+/, "")
- end
- if prev = names[name]
- KeywordError.raise("#{name} is already registered at line #{prev+firstline}", firstline+num)
- end
- if prev = predefined_ids[token]
- KeywordError.raise("#{token} is already used for #{prev} at line #{names[prev]+firstline}", firstline+num)
- end
- names[name] = num
- case name
- when /\A[A-Z]\w*\z/; const_ids
- when /\A(?!\d)\w+\z/; local_ids
- when /\A\$(?:\d+|(?!\d)\w+)\z/; global_ids
- when /\A@@(?!\d)\w+\z/; class_ids
- when /\A@(?!\d)\w+\z/; instance_ids
- when /\A((?!\d)\w+)=\z/
- KeywordError.raise("use ID2ATTRSET(#{$1}) instead of ATTRSET #{name}", firstline+num)
- else preserved_ids
- end << token
- predefined_ids[token] = name
-end
-{
- "LOCAL" => local_ids,
- "INSTANCE" => instance_ids,
- "GLOBAL" => global_ids,
- "CONST" => const_ids,
- "CLASS" => class_ids,
- :preserved => preserved_ids,
- :predefined => predefined_ids,
-}
diff --git a/defs/opt_operand.def b/defs/opt_operand.def
index ab7103a421..5ca1d74028 100644
--- a/defs/opt_operand.def
+++ b/defs/opt_operand.def
@@ -7,16 +7,53 @@
# wildcard: *
#
-getlocal *, 0
-getlocal *, 1
-setlocal *, 0
-setlocal *, 1
+__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__
-putobject Qtrue
-putobject Qfalse
+
+
diff --git a/dir.c b/dir.c
index 7d61b61fdb..0339697279 100644
--- a/dir.c
+++ b/dir.c
@@ -13,7 +13,6 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -30,7 +29,12 @@
# define NAMLEN(dirent) strlen((dirent)->d_name)
#else
# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
+# if !defined __NeXT__
+# define NAMLEN(dirent) (dirent)->d_namlen
+# else
+# /* On some versions of NextStep, d_namlen is always zero, so avoid it. */
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+# endif
# if HAVE_SYS_NDIR_H
# include <sys/ndir.h>
# endif
@@ -44,10 +48,6 @@
# include "win32/dir.h"
# endif
#endif
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/dirent.h"
-# include "nacl/stat.h"
-#endif
#include <errno.h>
@@ -72,20 +72,15 @@ char *strchr(char*,char);
#undef chdir
#define chdir(p) rb_w32_uchdir(p)
#undef mkdir
-#define mkdir(p, m) rb_w32_umkdir((p), (m))
+#define mkdir(p, m) rb_w32_umkdir(p, m)
#undef rmdir
#define rmdir(p) rb_w32_urmdir(p)
-#undef opendir
-#define opendir(p) rb_w32_uopendir(p)
#endif
-#define rb_sys_fail_path(path) rb_sys_fail_str(path)
-
#define FNM_NOESCAPE 0x01
#define FNM_PATHNAME 0x02
#define FNM_DOTMATCH 0x04
#define FNM_CASEFOLD 0x08
-#define FNM_EXTGLOB 0x10
#if CASEFOLD_FILESYSTEM
#define FNM_SYSCASE FNM_CASEFOLD
#else
@@ -95,8 +90,8 @@ 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 Next(p, e, enc) (p + rb_enc_mbclen(p, e, enc))
+# define Inc(p, e, enc) ((p) = Next(p, e, enc))
static char *
bracket(
@@ -137,7 +132,7 @@ bracket(
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, r2) == 0)) {
+ (r2 <= (send-s) && memcmp(t2, s, r) == 0)) {
ok = 1;
continue;
}
@@ -351,16 +346,16 @@ dir_memsize(const void *ptr)
static const rb_data_type_t dir_data_type = {
"dir",
- {dir_mark, dir_free, dir_memsize,},
+ dir_mark, dir_free, dir_memsize
};
static VALUE dir_close(VALUE);
#define GlobPathValue(str, safe) \
/* can contain null bytes as separators */ \
- (!RB_TYPE_P((str), T_STRING) ? \
- (void)FilePathValue(str) : \
- (void)(check_safe_glob((str), (safe)), \
+ (!RB_TYPE_P(str, T_STRING) ? \
+ FilePathValue(str) : \
+ (check_safe_glob(str, safe), \
check_glob_encoding(str), (str)))
#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
@@ -389,7 +384,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
{
struct dir_data *dp;
rb_encoding *fsenc;
- VALUE dirname, opt, orig;
+ VALUE dirname, opt;
static VALUE sym_enc;
if (!sym_enc) {
@@ -397,19 +392,21 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
}
fsenc = rb_filesystem_encoding();
- rb_scan_args(argc, argv, "1:", &dirname, &opt);
+ rb_scan_args(argc, argv, "11", &dirname, &opt);
if (!NIL_P(opt)) {
- VALUE enc = rb_hash_aref(opt, sym_enc);
+ 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);
}
}
GlobPathValue(dirname, FALSE);
- orig = rb_str_dup_frozen(dirname);
- dirname = rb_str_encode_ospath(dirname);
- dirname = rb_str_dup_frozen(dirname);
TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
if (dp->dir) closedir(dp->dir);
@@ -423,10 +420,10 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
dp->dir = opendir(RSTRING_PTR(dirname));
}
if (dp->dir == NULL) {
- rb_sys_fail_path(orig);
+ rb_sys_fail(RSTRING_PTR(dirname));
}
}
- dp->path = orig;
+ dp->path = rb_str_dup_frozen(dirname);
return dir;
}
@@ -474,7 +471,7 @@ dir_check(VALUE dir)
return dirp;
}
-#define GetDIR(obj, dirp) ((dirp) = dir_check(obj))
+#define GetDIR(obj, dirp) (dirp = dir_check(obj))
/*
@@ -490,12 +487,8 @@ dir_inspect(VALUE dir)
TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
if (!NIL_P(dirp->path)) {
- VALUE str = rb_str_new_cstr("#<");
- rb_str_append(str, rb_class_name(CLASS_OF(dir)));
- rb_str_cat2(str, ":");
- rb_str_append(str, dirp->path);
- rb_str_cat2(str, ">");
- return str;
+ const char *c = rb_obj_classname(dir);
+ return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(dirp->path));
}
return rb_funcall(dir, rb_intern("to_s"), 0, 0);
}
@@ -520,11 +513,11 @@ dir_path(VALUE dir)
}
#if defined HAVE_READDIR_R
-# define READDIR(dir, enc, entry, dp) (readdir_r((dir), (entry), &(dp)) == 0 && (dp) != 0)
+# 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((dir), (enc))) != 0)
+# 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)
+# define READDIR(dir, enc, entry, dp) ((dp = readdir(dir)) != 0)
#endif
#if defined HAVE_READDIR_R
# define IF_HAVE_READDIR_R(something) something
@@ -589,10 +582,13 @@ dir_read(VALUE dir)
if (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
}
+ else if (errno == 0) { /* end of stream */
+ return Qnil;
+ }
else {
- if (errno != 0) rb_sys_fail(0);
- return Qnil; /* end of stream */
+ rb_sys_fail(0);
}
+ return Qnil; /* not reached */
}
/*
@@ -689,7 +685,6 @@ dir_seek(VALUE dir, VALUE pos)
#define dir_seek rb_f_notimplement
#endif
-#ifdef HAVE_SEEKDIR
/*
* call-seq:
* dir.pos( integer ) -> integer
@@ -710,9 +705,6 @@ dir_set_pos(VALUE dir, VALUE pos)
dir_seek(dir, pos);
return pos;
}
-#else
-#define dir_set_pos rb_f_notimplement
-#endif
/*
* call-seq:
@@ -763,8 +755,9 @@ dir_close(VALUE dir)
static void
dir_chdir(VALUE path)
{
+ path = rb_str_encode_ospath(path);
if (chdir(RSTRING_PTR(path)) < 0)
- rb_sys_fail_path(path);
+ rb_sys_fail(RSTRING_PTR(path));
}
static int chdir_blocking = 0;
@@ -845,7 +838,6 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
rb_secure(2);
if (rb_scan_args(argc, argv, "01", &path) == 1) {
FilePathValue(path);
- path = rb_str_encode_ospath(path);
}
else {
const char *dist = getenv("HOME");
@@ -863,8 +855,9 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
if (rb_block_given_p()) {
struct chdir_data args;
+ char *cwd = my_getcwd();
- args.old_path = rb_str_encode_ospath(rb_dir_getwd());
+ args.old_path = rb_tainted_str_new2(cwd); xfree(cwd);
args.new_path = path;
args.done = FALSE;
return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
@@ -909,21 +902,14 @@ dir_s_getwd(VALUE dir)
static void
check_dirname(volatile VALUE *dir)
{
- VALUE d = *dir;
char *path, *pend;
- long len;
- rb_encoding *enc;
rb_secure(2);
- FilePathValue(d);
- enc = rb_enc_get(d);
- RSTRING_GETMEM(d, path, len);
- pend = path + len;
- pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc);
- if (pend - path < len) {
- d = rb_str_subseq(d, 0, pend - path);
+ FilePathValue(*dir);
+ path = RSTRING_PTR(*dir);
+ if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
+ *dir = rb_str_new(path, pend - path);
}
- *dir = rb_str_encode_ospath(d);
}
#if defined(HAVE_CHROOT)
@@ -940,8 +926,10 @@ static VALUE
dir_s_chroot(VALUE dir, VALUE path)
{
check_dirname(&path);
+
+ path = rb_str_encode_ospath(path);
if (chroot(RSTRING_PTR(path)) == -1)
- rb_sys_fail_path(path);
+ rb_sys_fail(RSTRING_PTR(path));
return INT2FIX(0);
}
@@ -961,8 +949,6 @@ dir_s_chroot(VALUE dir, VALUE path)
* also the discussion of permissions in the class documentation for
* <code>File</code>.
*
- * Dir.mkdir(File.join(Dir.home, ".foo"), 0700) #=> 0
- *
*/
static VALUE
dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
@@ -978,8 +964,9 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
}
check_dirname(&path);
+ path = rb_str_encode_ospath(path);
if (mkdir(RSTRING_PTR(path), mode) == -1)
- rb_sys_fail_path(path);
+ rb_sys_fail(RSTRING_PTR(path));
return INT2FIX(0);
}
@@ -997,8 +984,9 @@ static VALUE
dir_s_rmdir(VALUE obj, VALUE dir)
{
check_dirname(&dir);
+ dir = rb_str_encode_ospath(dir);
if (rmdir(RSTRING_PTR(dir)) < 0)
- rb_sys_fail_path(dir);
+ rb_sys_fail(RSTRING_PTR(dir));
return INT2FIX(0);
}
@@ -1006,7 +994,7 @@ dir_s_rmdir(VALUE obj, VALUE dir)
static VALUE
sys_warning_1(VALUE mesg)
{
- rb_sys_warning("%s:%s", strerror(errno), (const char *)mesg);
+ rb_sys_warning("%s", (const char *)mesg);
return Qnil;
}
@@ -1014,10 +1002,10 @@ sys_warning_1(VALUE mesg)
#define sys_warning(val) \
(void)((flags & GLOB_VERBOSE) && rb_protect(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_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))
+#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
/*
* ENOTDIR can be returned by stat(2) if a non-leaf element of the path
@@ -1048,20 +1036,9 @@ do_lstat(const char *path, struct stat *pst, int flags)
}
static DIR *
-do_opendir(const char *path, int flags, rb_encoding *enc)
+do_opendir(const char *path, int flags)
{
- DIR *dirp;
-#ifdef _WIN32
- volatile VALUE tmp;
- if (enc != rb_usascii_encoding() &&
- enc != rb_ascii8bit_encoding() &&
- enc != rb_utf8_encoding()) {
- tmp = rb_enc_str_new(path, strlen(path), enc);
- tmp = rb_str_encode_ospath(tmp);
- path = RSTRING_PTR(tmp);
- }
-#endif
- dirp = opendir(path);
+ DIR *dirp = opendir(path);
if (dirp == NULL && !to_be_ignored(errno))
sys_warning(path);
@@ -1136,9 +1113,10 @@ find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
}
/* Remove escaping backslashes */
-static char *
-remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
+static void
+remove_backslashes(char *p, rb_encoding *enc)
{
+ register const char *pend = p + strlen(p);
char *t = p;
char *s = p;
@@ -1157,8 +1135,6 @@ remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
if (t != s)
memmove(t, s, p - s); /* move '\0' too */
-
- return p;
}
/* Globing pattern */
@@ -1177,7 +1153,6 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
{
struct glob_pattern *list, *tmp, **tail = &list;
int dirsep = 0; /* pattern is terminated with '/' */
- int recursive = 0;
while (p < e && *p) {
tmp = GLOB_ALLOC(struct glob_pattern);
@@ -1188,14 +1163,13 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
tmp->type = RECURSIVE;
tmp->str = 0;
dirsep = 1;
- recursive = 1;
}
else {
const char *m = find_dirsep(p, e, flags, enc);
int magic = has_magic(p, m, flags, enc);
char *buf;
- if (!magic && !recursive && *m) {
+ if (!magic && *m) {
const char *m2;
while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
*m2) {
@@ -1252,32 +1226,33 @@ glob_free_pattern(struct glob_pattern *list)
}
static char *
-join_path(const char *path, int dirsep, const char *name, size_t namlen)
+join_path(const char *path, int dirsep, const char *name)
{
long len = strlen(path);
- char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
+ long len2 = strlen(name)+(dirsep?1:0)+1;
+ char *buf = GLOB_ALLOC_N(char, len+len2);
if (!buf) return 0;
memcpy(buf, path, len);
if (dirsep) {
buf[len++] = '/';
}
- memcpy(buf+len, name, namlen);
- buf[len+namlen] = '\0';
+ buf[len] = '\0';
+ strlcat(buf+len, name, len2);
return buf;
}
-enum answer {UNKNOWN = -1, NO, YES};
+enum answer { YES, NO, UNKNOWN };
#ifndef S_ISDIR
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
#ifndef S_ISLNK
# ifndef S_IFLNK
# define S_ISLNK(m) (0)
# else
-# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK)
# endif
#endif
@@ -1297,7 +1272,7 @@ glob_func_caller(VALUE val)
return Qnil;
}
-#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (enc))
+#define glob_call_func(func, path, arg, enc) (*func)(path, arg, enc)
static int
glob_helper(
@@ -1368,7 +1343,7 @@ glob_helper(
if (status) return status;
}
if (match_dir && isdir == YES) {
- char *tmp = join_path(path, dirsep, "", 0);
+ char *tmp = join_path(path, dirsep, "");
if (!tmp) return -1;
status = glob_call_func(func, tmp, arg, enc);
GLOB_FREE(tmp);
@@ -1382,34 +1357,19 @@ glob_helper(
struct dirent *dp;
DIR *dirp;
IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
- dirp = do_opendir(*path ? path : ".", flags, enc);
+ dirp = do_opendir(*path ? path : ".", flags);
if (dirp == NULL) return 0;
while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) {
- char *buf;
+ char *buf = join_path(path, dirsep, dp->d_name);
enum answer new_isdir = UNKNOWN;
- int dotfile = 0;
-
- if (recursive && dp->d_name[0] == '.') {
- ++dotfile;
- if (!dp->d_name[1]) {
- /* unless DOTMATCH, skip current directories not to recurse infinitely */
- if (!(flags & FNM_DOTMATCH)) continue;
- ++dotfile;
- }
- else if (dp->d_name[1] == '.' && !dp->d_name[2]) {
- /* always skip parent directories not to recurse infinitely */
- continue;
- }
- }
- buf = join_path(path, dirsep, dp->d_name, NAMLEN(dp));
if (!buf) {
status = -1;
break;
}
- if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) {
- /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
+ if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
+ && fnmatch("*", rb_usascii_encoding(), 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;
@@ -1468,8 +1428,7 @@ glob_helper(
break;
}
memcpy(name, (*cur)->str, len);
- if (escape)
- len = remove_backslashes(name, name+len-1, enc) - name;
+ if (escape) remove_backslashes(name, enc);
new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
if (!new_beg) {
@@ -1485,7 +1444,7 @@ glob_helper(
}
}
- buf = join_path(path, dirsep, name, len);
+ buf = join_path(path, dirsep, name);
GLOB_FREE(name);
if (!buf) {
GLOB_FREE(new_beg);
@@ -1518,7 +1477,7 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
start = root = path;
flags |= FNM_SYSCASE;
#if defined DOSISH
- root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
+ root = rb_path_skip_prefix(root);
#endif
if (root && *root == '/') root++;
@@ -1751,9 +1710,11 @@ dir_globs(long argc, VALUE *argv, int flags)
/*
* call-seq:
+ * Dir[ array ] -> array
* Dir[ string [, string ...] ] -> array
*
* Equivalent to calling
+ * <code>Dir.glob(</code><i>array,</i><code>0)</code> and
* <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
*
*/
@@ -1777,8 +1738,7 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
* is not a regexp (it's closer to a shell glob). See
* <code>File::fnmatch</code> for the meaning of the <i>flags</i>
* parameter. Note that case sensitivity depends on your system (so
- * <code>File::FNM_CASEFOLD</code> is ignored), as does the order
- * in which the results are returned.
+ * <code>File::FNM_CASEFOLD</code> is ignored)
*
* <code>*</code>:: Matches any file. Can be restricted by
* other values in the glob. <code>*</code>
@@ -1792,7 +1752,7 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
* <code>/ .* /x</code> in regexp. Note, this
* will not match Unix-like hidden files (dotfiles).
* In order to include those in the match results,
- * you must use something like <code>"{*,.*}"</code>.
+ * you must use something like "{*,.*}".
* <code>**</code>:: Matches directories recursively.
* <code>?</code>:: Matches any one character. Equivalent to
* <code>/.{1}/</code> in regexp.
@@ -1806,11 +1766,10 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
* More than two literals may be specified.
* Equivalent to pattern alternation in
* regexp.
- * <code> \\ </code>:: Escapes the next metacharacter.
- * Note that this means you cannot use backslash
- * in windows as part of a glob,
- * i.e. <code>Dir["c:\\foo*"]</code> will not work,
- * use <code>Dir["c:/foo*"]</code> instead.
+ * <code>\</code>:: Escapes the next metacharacter.
+ * Note that this means you cannot use backslash in windows
+ * as part of a glob, i.e. Dir["c:\\foo*"] will not work
+ * use Dir["c:/foo*"] instead
*
* Dir["config.?"] #=> ["config.h"]
* Dir.glob("config.?") #=> ["config.h"]
@@ -1865,8 +1824,9 @@ static VALUE
dir_open_dir(int argc, VALUE *argv)
{
VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
+ struct dir_data *dirp;
- rb_check_typeddata(dir, &dir_data_type);
+ TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
return dir;
}
@@ -1922,32 +1882,6 @@ dir_entries(int argc, VALUE *argv, VALUE io)
return rb_ensure(rb_Array, dir, dir_close, dir);
}
-static int
-fnmatch_brace(const char *pattern, VALUE val, void *enc)
-{
- struct brace_args *arg = (struct brace_args *)val;
- VALUE path = arg->value;
- rb_encoding *enc_pattern = enc;
- rb_encoding *enc_path = rb_enc_get(path);
-
- if (enc_pattern != enc_path) {
- if (!rb_enc_asciicompat(enc_pattern))
- return FNM_NOMATCH;
- if (!rb_enc_asciicompat(enc_path))
- return FNM_NOMATCH;
- if (!rb_enc_str_asciionly_p(path)) {
- int cr = ENC_CODERANGE_7BIT;
- long len = strlen(pattern);
- if (rb_str_coderange_scan_restartable(pattern, pattern + len,
- enc_pattern, &cr) != len)
- return FNM_NOMATCH;
- if (cr != ENC_CODERANGE_7BIT)
- return FNM_NOMATCH;
- }
- }
- return (fnmatch(pattern, enc, RSTRING_PTR(path), arg->flags) == 0);
-}
-
/*
* call-seq:
* File.fnmatch( pattern, path, [flags] ) -> (true or false)
@@ -1964,7 +1898,7 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
* 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.
@@ -1976,7 +1910,7 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
* Behaves exactly like character sets in
* Regexp, including set negation
* (<code>[^a-z]</code>).
- * <code> \ </code>:: Escapes the next metacharacter.
+ * <code>\</code>:: Escapes the next metacharacter.
*
* <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
* parameters. The same glob pattern and flags are used by
@@ -2002,7 +1936,7 @@ fnmatch_brace(const char *pattern, VALUE val, void *enc)
*
* 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_NOESCAPE makes '\' 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
@@ -2044,26 +1978,15 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
StringValue(pattern);
FilePathStringValue(path);
- if (flags & FNM_EXTGLOB) {
- struct brace_args args;
-
- args.value = path;
- args.flags = flags;
- if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
- (VALUE)&args, rb_enc_get(pattern)) > 0)
- return Qtrue;
- }
- else {
- rb_encoding *enc = rb_enc_compatible(pattern, path);
- if (!enc) return Qfalse;
- if (fnmatch(RSTRING_PTR(pattern), enc, RSTRING_PTR(path), flags) == 0)
- return Qtrue;
- }
- RB_GC_GUARD(pattern);
+ if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
+ flags) == 0)
+ return Qtrue;
return Qfalse;
}
+VALUE rb_home_dir(const char *user, VALUE result);
+
/*
* call-seq:
* Dir.home() -> "/home/me"
@@ -2086,22 +2009,6 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
return rb_home_dir(u, rb_str_new(0, 0));
}
-#if 0
-/*
- * 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.
- *
- */
-VALUE
-rb_file_directory_p()
-{
-}
-#endif
-
/*
* Objects of class <code>Dir</code> are directory streams representing
* directories in the underlying file system. They provide a variety of
@@ -2150,8 +2057,8 @@ Init_Dir(void)
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);
- rb_define_singleton_method(rb_cDir,"exists?", rb_file_directory_p, 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);
@@ -2160,6 +2067,5 @@ Init_Dir(void)
rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
- rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB));
rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
}
diff --git a/dln.c b/dln.c
index e6b20d54e3..438d263080 100644
--- a/dln.c
+++ b/dln.c
@@ -57,7 +57,7 @@ void *xrealloc();
#include <sys/stat.h>
#ifndef S_ISDIR
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
#ifdef HAVE_SYS_PARAM_H
@@ -75,7 +75,7 @@ void *xrealloc();
char *getenv();
#endif
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(__MACH__) /* Mac OS X */
# if defined(HAVE_DLOPEN)
/* Mac OS X with dlopen (10.3 or later) */
# define MACOSX_DLOPEN
@@ -107,47 +107,44 @@ dln_loaderror(const char *format, ...)
#ifndef FUNCNAME_PATTERN
# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
-# define FUNCNAME_PREFIX "_Init_"
+# define FUNCNAME_PATTERN "_Init_%s"
# else
-# define FUNCNAME_PREFIX "Init_"
+# define FUNCNAME_PATTERN "Init_%s"
# endif
#endif
-#if defined __CYGWIN__ || defined DOSISH
-#define isdirsep(x) ((x) == '/' || (x) == '\\')
-#else
-#define isdirsep(x) ((x) == '/')
-#endif
-
static size_t
-init_funcname_len(const char **file)
+init_funcname_len(char **buf, const char *file)
{
- const char *p = *file, *base, *dot = NULL;
+ char *p;
+ const char *slash;
+ size_t len;
/* Load the file as an object one */
- for (base = p; *p; p++) { /* Find position of last '/' */
- if (*p == '.' && !dot) dot = p;
- if (isdirsep(*p)) base = p+1, dot = NULL;
+ for (slash = file-1; *file; file++) /* Find position of last '/' */
+ if (*file == '/') slash = file;
+
+ len = strlen(FUNCNAME_PATTERN) + strlen(slash + 1);
+ *buf = xmalloc(len);
+ snprintf(*buf, len, FUNCNAME_PATTERN, slash + 1);
+ for (p = *buf; *p; p++) { /* Delete suffix if it exists */
+ if (*p == '.') {
+ *p = '\0'; break;
+ }
}
- *file = base;
- /* Delete suffix if it exists */
- return (dot ? dot : p) - base;
+ return p - *buf;
}
-static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;
-
#define init_funcname(buf, file) do {\
- const char *base = (file);\
- const size_t flen = init_funcname_len(&base);\
- const size_t plen = sizeof(funcname_prefix);\
- char *const tmp = ALLOCA_N(char, plen+flen+1);\
+ size_t len = init_funcname_len(buf, file);\
+ char *tmp = ALLOCA_N(char, len+1);\
if (!tmp) {\
+ free(*buf);\
dln_memerror();\
}\
- memcpy(tmp, funcname_prefix, plen);\
- memcpy(tmp+plen, base, flen);\
- tmp[plen+flen] = '\0';\
- *(buf) = tmp;\
+ strlcpy(tmp, *buf, len + 1);\
+ free(*buf);\
+ *buf = tmp;\
} while (0)
#ifdef USE_DLN_A_OUT
@@ -228,7 +225,7 @@ load_header(int fd, struct exec *hdrp, long disp)
#define RELOC_TARGET_SIZE(r) ((r)->r_length)
#endif
-#if defined(__sun) && defined(__sparc)
+#if defined(sun) && defined(sparc)
/* Sparc (Sun 4) macros */
# undef relocation_info
# define relocation_info reloc_info_sparc
@@ -530,7 +527,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
{
int datum;
char *address;
-#if defined(__sun) && defined(__sparc)
+#if defined(sun) && defined(sparc)
unsigned int mask = 0;
#endif
@@ -539,7 +536,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
datum = arg->value;
if (R_PCREL(&(undef->reloc))) datum -= undef->base;
-#if defined(__sun) && defined(__sparc)
+#if defined(sun) && defined(sparc)
datum += undef->reloc.r_addend;
datum >>= R_RIGHTSHIFT(&(undef->reloc));
mask = (1 << R_BITSIZE(&(undef->reloc))) - 1;
@@ -763,11 +760,11 @@ load_1(int fd, long disp, const char *need_init)
while (rel < rel_end) {
char *address = (char*)(rel->r_address + block);
long datum = 0;
-#if defined(__sun) && defined(__sparc)
+#if defined(sun) && defined(sparc)
unsigned int mask = 0;
#endif
- if (rel >= rel_beg)
+ if(rel >= rel_beg)
address += hdr.a_text;
if (rel->r_extern) { /* Look it up in symbol-table */
@@ -798,7 +795,7 @@ load_1(int fd, long disp, const char *need_init)
} /* end .. is static */
if (R_PCREL(rel)) datum -= block;
-#if defined(__sun) && defined(__sparc)
+#if defined(sun) && defined(sparc)
datum += rel->r_addend;
datum >>= R_RIGHTSHIFT(rel);
mask = (1 << R_BITSIZE(rel)) - 1;
@@ -1119,31 +1116,9 @@ dln_sym(const char *name)
#if defined _WIN32 && !defined __CYGWIN__
#include <windows.h>
-#include <imagehlp.h>
#endif
-#if defined _WIN32 && !defined __CYGWIN__
-static const char *
-dln_strerror(char *message, size_t size)
-{
- int error = GetLastError();
- char *p = message;
- size_t len = snprintf(message, size, "%d: ", error);
-
-#define format_message(sublang) FormatMessage(\
- FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, \
- NULL, error, MAKELANGID(LANG_NEUTRAL, (sublang)), \
- message + len, size - len, NULL)
- if (format_message(SUBLANG_ENGLISH_US) == 0)
- format_message(SUBLANG_DEFAULT);
- for (p = message + len; *p; p++) {
- if (*p == '\n' || *p == '\r')
- *p = ' ';
- }
- return message;
-}
-#define dln_strerror() dln_strerror(message, sizeof message)
-#elif ! defined _AIX
+#if ! defined _AIX
static const char *
dln_strerror(void)
{
@@ -1171,6 +1146,27 @@ dln_strerror(void)
#ifdef USE_DLN_DLOPEN
return (char*)dlerror();
#endif
+
+#if defined _WIN32 && !defined __CYGWIN__
+ static char message[1024];
+ int error = GetLastError();
+ char *p = message;
+ p += sprintf(message, "%d: ", error);
+ FormatMessage(
+ FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ error,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ p,
+ sizeof message - strlen(message),
+ NULL);
+
+ for (p = message; *p; p++) {
+ if (*p == '\n' || *p == '\r')
+ *p = ' ';
+ }
+ return message;
+#endif
}
#endif
@@ -1180,7 +1176,7 @@ aix_loaderror(const char *pathname)
{
char *message[1024], errbuf[1024];
int i;
-#define ERRBUF_APPEND(s) strncat(errbuf, (s), sizeof(errbuf)-strlen(errbuf)-1)
+#define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1)
snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname);
if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) {
@@ -1200,46 +1196,13 @@ aix_loaderror(const char *pathname)
}
#endif
-#if defined _WIN32 && defined RUBY_EXPORT
-HANDLE rb_libruby_handle(void);
-
-static int
-rb_w32_check_imported(HMODULE ext, HMODULE mine)
-{
- ULONG size;
- const IMAGE_IMPORT_DESCRIPTOR *desc;
-
- desc = ImageDirectoryEntryToData(ext, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size);
- if (!desc) return 0;
- while (desc->Name) {
- PIMAGE_THUNK_DATA pint = (PIMAGE_THUNK_DATA)((char *)ext + desc->Characteristics);
- PIMAGE_THUNK_DATA piat = (PIMAGE_THUNK_DATA)((char *)ext + desc->FirstThunk);
- for (; piat->u1.Function; piat++, pint++) {
- static const char prefix[] = "rb_";
- PIMAGE_IMPORT_BY_NAME pii;
- const char *name;
-
- if (IMAGE_SNAP_BY_ORDINAL(pint->u1.Ordinal)) continue;
- pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData);
- name = (const char *)pii->Name;
- if (strncmp(name, prefix, sizeof(prefix) - 1) == 0) {
- FARPROC addr = GetProcAddress(mine, name);
- if (addr) return (FARPROC)piat->u1.Function == addr;
- }
- }
- desc++;
- }
- return 1;
-}
-#endif
-
#if defined(DLN_NEEDS_ALT_SEPARATOR) && DLN_NEEDS_ALT_SEPARATOR
#define translit_separator(src) do { \
char *tmp = ALLOCA_N(char, strlen(src) + 1), *p = tmp, c; \
do { \
*p++ = ((c = *file++) == '/') ? DLN_NEEDS_ALT_SEPARATOR : c; \
} while (c); \
- (src) = tmp; \
+ src = tmp; \
} while (0)
#else
#define translit_separator(str) (void)(str)
@@ -1256,7 +1219,6 @@ dln_load(const char *file)
#if defined _WIN32 && !defined __CYGWIN__
HINSTANCE handle;
char winfile[MAXPATHLEN];
- char message[1024];
void (*init_fct)();
char *buf;
@@ -1273,14 +1235,6 @@ dln_load(const char *file)
goto failed;
}
-#if defined _WIN32 && defined RUBY_EXPORT
- if (!rb_w32_check_imported(handle, rb_libruby_handle())) {
- FreeLibrary(handle);
- error = "incompatible library version";
- goto failed;
- }
-#endif
-
if ((init_fct = (void(*)())GetProcAddress(handle, buf)) == NULL) {
dln_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
}
@@ -1318,28 +1272,13 @@ dln_load(const char *file)
# define RTLD_GLOBAL 0
#endif
-#ifdef __native_client__
- char* p, *orig;
- if (file[0] == '.' && file[1] == '/') file+=2;
- orig = strdup(file);
- for (p = file; *p; ++p) {
- if (*p == '/') *p = '_';
- }
-#endif
/* Load file */
if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
-#ifdef __native_client__
- free(orig);
-#endif
error = dln_strerror();
goto failed;
}
init_fct = (void(*)())(VALUE)dlsym(handle, buf);
-#ifdef __native_client__
- strcpy(file, orig);
- free(orig);
-#endif
#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 */
@@ -1400,7 +1339,7 @@ dln_load(const char *file)
}
#endif /* _AIX */
-#if defined(MACOSX_DYLD)
+#if defined(NeXT) || defined(MACOSX_DYLD)
#define DLN_DEFINED
/*----------------------------------------------------
By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
@@ -1411,6 +1350,43 @@ dln_load(const char *file)
sunshine@sunshineco.com,
and... Miss ARAI Akino(^^;)
----------------------------------------------------*/
+#if defined(NeXT) && (NS_TARGET_MAJOR < 4)/* NeXTSTEP rld functions */
+
+ {
+ NXStream* s;
+ unsigned long init_address;
+ 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*/
+ if(rld_load(s, NULL, object_files, NULL) == 0) {
+ NXFlush(s);
+ NXClose(s);
+ dln_loaderror("Failed to load %.200s", file);
+ }
+
+ /* lookup the initial function */
+ if(rld_lookup(s, buf, &init_address) == 0) {
+ NXFlush(s);
+ NXClose(s);
+ dln_loaderror("Failed to lookup Init function %.200s", file);
+ }
+
+ NXFlush(s);
+ NXClose(s);
+
+ /* Cannot call *init_address directory, so copy this value to
+ function pointer */
+ init_fct = (void(*)())init_address;
+ (*init_fct)();
+ return (void*)init_address;
+ }
+#else/* OPENSTEP dyld functions */
{
int dyld_result;
NSObjectFileImage obj_file; /* handle, but not use it */
@@ -1429,7 +1405,7 @@ dln_load(const char *file)
NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
/* lookup the initial function */
- if (!NSIsSymbolNameDefined(buf)) {
+ if(!NSIsSymbolNameDefined(buf)) {
dln_loaderror("Failed to lookup Init function %.200s",file);
}
init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
@@ -1437,6 +1413,7 @@ dln_load(const char *file)
return (void*)init_fct;
}
+#endif /* rld or dyld */
#endif
#if defined(__BEOS__) || defined(__HAIKU__)
diff --git a/dln.h b/dln.h
index abbd6d85a3..47ff3eaf59 100644
--- a/dln.h
+++ b/dln.h
@@ -28,10 +28,6 @@
# define _(args) ()
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#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);
@@ -42,9 +38,4 @@ extern char *dln_argv0;
#endif
void *dln_load(const char*);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#endif
diff --git a/dln_find.c b/dln_find.c
index d9166fac39..728ace86d3 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -1,6 +1,6 @@
/**********************************************************************
- dln_find.c -
+ dln.c -
$Author$
created at: Tue Jan 18 17:05:06 JST 1994
@@ -15,14 +15,10 @@
#define dln_memerror rb_memerror
#define dln_exit rb_exit
#define dln_loaderror rb_loaderror
-#define dln_warning rb_warning
-#define dln_warning_arg
#else
#define dln_notimplement --->>> dln not implemented <<<---
#define dln_memerror abort
#define dln_exit exit
-#define dln_warning fprintf
-#define dln_warning_arg stderr,
static void dln_loaderror(const char *format, ...);
#endif
#include "dln.h"
@@ -45,6 +41,14 @@ char *dln_argv0;
# include <strings.h>
#endif
+#ifndef xmalloc
+void *xmalloc();
+void *xcalloc();
+void *xrealloc();
+#endif
+
+#define free(x) xfree(x)
+
#include <stdio.h>
#if defined(_WIN32)
#include "missing/file.h"
@@ -53,7 +57,7 @@ char *dln_argv0;
#include <sys/stat.h>
#ifndef S_ISDIR
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
#ifdef HAVE_SYS_PARAM_H
@@ -124,7 +128,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
register const char *ep;
register char *bp;
struct stat st;
- size_t i, fnlen, fspace;
+ size_t i, fspace;
#ifdef DOSISH
static const char extension[][5] = {
EXECUTABLE_EXTS,
@@ -136,24 +140,12 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
const char *p = fname;
static const char pathname_too_long[] = "openpath: pathname too long (ignored)\n\
-\tDirectory \"%.*s\"%s\n\tFile \"%.*s\"%s\n";
-#define PATHNAME_TOO_LONG() dln_warning(dln_warning_arg pathname_too_long, \
- ((bp - fbuf) > 100 ? 100 : (int)(bp - fbuf)), fbuf, \
- ((bp - fbuf) > 100 ? "..." : ""), \
- (fnlen > 100 ? 100 : (int)fnlen), fname, \
- (fnlen > 100 ? "..." : ""))
+\tDirectory \"%.*s\"\n\tFile \"%s\"\n";
+#define PATHNAME_TOO_LONG() fprintf(stderr, pathname_too_long, (int)(bp - fbuf), fbuf, fname)
#define RETURN_IF(expr) if (expr) return (char *)fname;
RETURN_IF(!fname);
- fnlen = strlen(fname);
- if (fnlen >= size) {
- dln_warning(dln_warning_arg
- "openpath: pathname too long (ignored)\n\tFile \"%.*s\"%s\n",
- (fnlen > 100 ? 100 : (int)fnlen), fname,
- (fnlen > 100 ? "..." : ""));
- return NULL;
- }
#ifdef DOSISH
# ifndef CharNext
# define CharNext(p) ((p)+1)
@@ -270,7 +262,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
}
/* now append the file name */
- i = fnlen;
+ i = strlen(fname);
if (fspace < i) {
toolong:
PATHNAME_TOO_LONG();
diff --git a/dmydln.c b/dmydln.c
index 25872efc98..2c8aacc06a 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -4,6 +4,4 @@ void*
dln_load(const char *file)
{
rb_loaderror("this executable file can't load extension libraries");
-
- UNREACHABLE;
}
diff --git a/dmyext.c b/dmyext.c
index 34ea7a02f4..4d273f7faf 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -2,8 +2,3 @@ void
Init_ext(void)
{
}
-
-void
-Init_enc(void)
-{
-}
diff --git a/doc/.document b/doc/.document
deleted file mode 100644
index b48c0387a7..0000000000
--- a/doc/.document
+++ /dev/null
@@ -1,4 +0,0 @@
-*.rdoc
-ChangeLog*
-NEWS-*
-syntax
diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
deleted file mode 100644
index 692b996335..0000000000
--- a/doc/ChangeLog-1.9.3
+++ /dev/null
@@ -1,92772 +0,0 @@
-Sun Jul 10 22:50:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): fix
- precision treatment errors.
-
- * test/bigdecimal/test_bigdecimal.rb: add tests for the above change.
- fix precision treatment errors.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_power): precision argument
- should be optional for its compatibility.
-
-Sun Jul 10 22:38:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (var_ref): distinguish vcall from local variable
- references. based on a patch by Michael Edgar michael.j.edgar
- AT dartmouth.edu. Bug #5002
-
-Sun Jul 10 21:51:29 2011 Koichi Sasada <ko1@atdot.net>
-
- * internal.h: add comments (cautions).
-
-Sun Jul 10 20:59:38 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Add new class variable `@@testfile_prefix`.
- This is for changing test name prefix. (For testing)
-
- * test/testunit/tests_for_parallel/ptest_first.rb: Renamed from
- test_first.rb
-
- * test/testunit/tests_for_parallel/ptest_second.rb: Renamed from
- test_second.rb
-
- * test/testunit/tests_for_parallel/ptest_third.rb: Renamed from
- test_third.rb
-
- * test/testunit/tests_for_parallel/ptest_forth.rb: Renamed from
- test_forth.rb
-
- * test/testunit/tests_for_parallel/runner.rb: Remove misc.rb
-
- * test/testunit/tests_for_parallel/ptest_first.rb: ditto.
-
- * test/testunit/tests_for_parallel/ptest_second.rb: ditto.
-
- * test/testunit/tests_for_parallel/ptest_third.rb: ditto.
-
- * test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
-
- * test/testunit/tests_for_parallel/misc.rb: Removed because no longer
- needed.
-
- * test/testunit/test_parallel.rb: Fix assertions for above.
-
-Sun Jul 10 16:57:08 2011 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_throw): check a class frame.
- Fixes Bug #4648.
- The patch is contributed by Kazuki Tsujimoto.
-
- * bootstraptest/test_proc.rb: add tests for above.
-
-Sun Jul 10 17:28:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instead of
- exit(1).
- * thread_pthread.c (add_signal_thread_list): ditto.
- * thread.c (rb_thread_call_with_gvl): ditto.
- * util.c (Bug): ditto.
-
-Sun Jul 10 15:58:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
- [Bug #4700]
-
-Sun Jul 10 16:41:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_core.h (typedef struct rb_vm_struct): create a new
- 'inhibit_thread_creation' field.
- * thread.c (rb_thread_terminate_all): set inhibit_thread_creation.
- * thread.c (thread_s_new): don't permit to create new thread
- if the VM is under destruction. Otherwise evil finalizer code
- can make SEGV. [Bug #4992][ruby-core:37858]
-
- * bootstraptest/test_objectspace.rb: new test for this fix.
-
-Sun Jul 10 16:06:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * signal.c (sigsegv): use abort() instead of exit() when nested
- SEGV was happen. Because unnested SEGV use abort().
- [Bug #5013][ruby-dev:44078]
-
-Sun Jul 10 15:30:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * load.c (rb_f_autoload): prevent to autoload for singleton
- classes. fixes [Bug #4886] [ruby-dev:43816]
-
- * bootstraptest/test_autoload.rb: add tests for the above change.
-
-Sun Jul 10 15:09:17 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/assertions.rb: Import documentation patch by Justin
- Collins. [ruby-core:37225] [Feature #4903]
-
-Sun Jul 10 14:57:36 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: canonicalizes nth and sf.
-
-Sun Jul 10 14:13:50 2011 Koichi Sasada <ko1@atdot.net>
-
- * internal.h (rb_thread_call_with_gvl, rb_thread_call_without_gvl):
- make them visible as experimental C APIs. fixes Feature #4328.
-
-Sun Jul 10 12:18:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_power): support non-integral
- exponent. fixes [Bug #3271]
-
- * ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): ditto.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_power_op): add a function to
- only use for "**" operator.
-
- * test/bigdecimal/test_bigdecimal.rb: add a bunch of tests for the
- above changes.
-
- * ext/bigdecimal/bigdecimal.c (is_integer): add an utility function.
-
- * ext/bigdecimal/bigdecimal.c (is_negative): ditto.
-
- * ext/bigdecimal/bigdecimal.c (is_positive): ditto.
-
- * ext/bigdecimal/bigdecimal.c (is_zero): ditto.
-
- * ext/bigdecimal/bigdecimal.c (is_one): ditto.
-
- * ext/bigdecimal/bigdecimal.c (is_even): ditto.
-
-Sun Jul 10 12:08:39 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (when_vals): when a string literal is written on when
- clause, skip string creation to make it faster. [ruby-dev:44068]
- [Feature #5000]
-
-Sun Jul 10 11:35:29 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (reduce_nodes_gen): NODE_RETURN in rescue body must not be
- reduced when there is an else clause. This caused bizarre behavior
- in [Bug #4473] [ruby-core:35629] [ruby-core:37884].
-
-Sun Jul 10 09:46:14 2011 Masaya Tarui <tarui@ruby-lnag.org>
-
- * range.c (range_max): fix behavior with excluded end value.
- [Bug #4591]
-
-Sun Jul 10 09:13:18 2011 Eric Hodel <drbrain@segment7.net>
-
- * NEWS: Fix RubyGems version. [Ruby 1.9 - Bug #5004]
-
-Sat Jul 9 20:01:59 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * internal.h: rb_rational_reciprocal is defined in rational.c.
-
-Sat Jul 9 19:48:31 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * internal.h: added declarations.
- * complex.c: followed the above change.
-
-Sat Jul 9 17:24:41 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * NEWS: bigdecimal is not a builtin.
-
-Sat Jul 9 17:17:53 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: some improvements for performance.
-
-Sat Jul 9 16:56:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * atomic.h (ATOMIC_OR): _InterlockedOr is unavailable in VC6.
-
- * numeric.c (ULLONG_MAX): fallback definition.
-
-Sat Jul 9 15:59:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_{read,write}): should be signed.
- Bug #5001
-
-Sat Jul 9 14:02:20 2011 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb: fix multipart form parsing bug. [Bug #3866]
-
-Sat Jul 9 11:41:03 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Add Vector#normalize [ruby-dev:43829]
-
-Sat Jul 9 09:25:06 2011 Eric Hodel <drbrain@segment7.net>
-
- * enumerator.c: Remove "enumeration sequenced by".
- [Ruby 1.9 - Bug #4757]
-
-Sat Jul 9 09:14:56 2011 Eric Hodel <drbrain@segment7.net>
-
- * io.c: Note that methods other than IO#gets may increase IO#lineno.
- [Ruby 1.9 - Bug #4902]
-
-Sat Jul 9 08:39:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (RUN_OPT): disable gems.
-
-Sat Jul 9 08:37:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_close): close(2) on a fd which is being read by
- another thread causes deadlock on Mac OS X 10.5
-
-Fri Jul 8 21:20:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c: use USE_ELF instead of __ELF__ because Solaris
- doesn't define it. USE_ELF is already provided by configure.
- patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]
-
- * addr2line.h: ditto.
-
- * vm_dump.c: ditto.
-
-Fri Jul 8 16:40:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/parser/parser.rl (convert_encoding): should not modify
- the argument.
-
- * ext/json/parser/parser.rl (convert_encoding): no needs to use
- force_encoding.
-
-Fri Jul 8 15:53:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_bug): get rid of segfault after all threads
- disposed.
-
-Fri Jul 8 15:01:06 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl.h: include openssl/e_os2.h before checking the
- definition of OPENSSL_SYS_WIN32.
-
-Fri Jul 8 14:40:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
- mixed.
-
-Fri Jul 8 14:29:47 2011 Narihiro Nakamura <authornari@gmail.com>
-
- * configure.in: can't subtract void *.
-
-Fri Jul 8 14:33:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): define GC_MARK_STACKFRAME_WORD.
- fixed build problem of r32438. the value (30) is temporary value.
- maybe it's enough by 20~24 according to my observation.
-
-Fri Jul 8 13:47:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_mutex_unlock_all): folded into
- rb_threadptr_unlock_all_locking_mutexes.
- * thread.c (rb_threadptr_unlock_all_locking_mutexes) ditto.
-
-Fri Jul 8 13:36:02 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (thread_unlock_all_locking_mutexes): rename to
- rb_threadptr_unlock_all_locking_mutexes and remove static.
- * vm_core.h: add rb_threadptr_unlock_all_locking_mutexes declaration.
- * thread.c (thread_start_func_2): adjust the above rename.
-
- * eval.c (ruby_cleanup): call rb_threadptr_unlock_all_locking_mutexes
- again after finalizer. [Bug #4988] [ruby-dev:44049]
-
-Fri Jul 8 13:06:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * cont.c (FIBER_MACHINE_STACK_ALLOCATION_SIZE): Fiber stack size
- don't need to keep multiple number of sizeof(VALUE).
-
-Fri Jul 8 11:39:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (sudo-precheck): true command is not standard on
- Windows.
-
-Fri Jul 8 10:39:52 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (gvl_destroy): fix cond_t leak.
-
-Fri Jul 8 09:17:59 2011 Eric Hodel <drbrain@segment7.net>
-
- * gc.c: Improve documentation
-
-Thu Jul 7 23:35:31 2011 Narihiro Nakamura <authornari@gmail.com>
-
- * gc.c: change water_mark value that may call
- gc_mark(lev <= GC_LEVEL_MAX) in gc_mark().
- In ruby_stack_check(), water_mark is a value that may call some
- C function. Fixes Bug #3781
-
- * configure.in: define GC_MARK_STACKFRAME_WORD that approximate
- size of gc_mark() and gc_mark_children() stackframes.
-
-Thu Jul 7 17:55:05 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/testunit/test_parallel.rb (TestParallelWorker#teardown): wait
- the child process even if the communication pipe is broken.
-
-Thu Jul 7 15:44:42 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_set_index, rb_enc_associate_index): should
- check if frozen.
-
- * parse.y (rb_intern3), ruby.c (process_options, ruby_script):
- defer freezing after associating encodings.
-
-Thu Jul 7 15:16:51 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (rb_num2ull): use own switch sentence.
- Current implementation can't convert 18446744073709551615.
-
-Thu Jul 7 06:56:15 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * cont.c (FIBER_STACK_FLAGS): workaround fix for r32420 on FreeBSD.
-
-Thu Jul 7 06:46:12 2011 Eric Hodel <drbrain@segment7.net>
-
- * benchmark/driver.rb: Add difference column to report that averages
- across all runs of a benchmark. [Ruby 1.9 - Feature #4982]
-
-Thu Jul 7 06:19:38 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems.rb: Reduce requires to improve `make benchmark`.
- [#4962]
- * lib/rubygems/specification.rb: Delay initialization of rubygems
- until require is called.
-
-Thu Jul 7 04:31:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (arg): rescue_mod is in inverse order from other
- modifiers. patched by michael.j.edgar AT dartmouth.edu at
- [ruby-core:36248]. fixed #4716.
-
-Thu Jul 7 00:40:16 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (kill): check that the process exited or not before
- terminating it. [Bug #4943]
-
-Wed Jul 6 23:13:19 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (opt_call_args): allow trailing comma after assoc
- argument e.g. 'foo(bar:1,)'. fixed #3456
-
-Wed Jul 6 22:11:12 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/cgi/test_cgi_header.rb(test_cgi_header_nph): Validate date in
- "Date:" header
-
-Wed Jul 6 21:29:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * cont.c (fiber_machine_stack_alloc): cleanup pointer arithmetic.
- "size/sizeof(VALUE)" is ugly and easy confusing.
- * cont.c (fiber_initialize_machine_stack_context): ditto.
-
-Wed Jul 6 21:24:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * cont.c (fiber_machine_stack_alloc): fix mprotect misuse. A stack
- guard page should have PROT_NONE.
- * cont.c (fiber_initialize_machine_stack_context):
- th->machine_stack_maxsize shouldn't be included guard pages size.
- [Bug #4983][ruby-dev:44043]
-
-Wed Jul 6 21:23:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * cont.c (fiber_machine_stack_alloc): use MAP_STACK if it's provided.
-
-Wed Jul 6 21:22:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * cont.c (fiber_machine_stack_alloc): use MAP_FAILED instead of -1.
-
-Wed Jul 6 21:21:05 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * cont.c (fiber_machine_stack_alloc): remove unnecessary cast.
-
-Wed Jul 6 18:10:13 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/cgi/test_cgi_header.rb(test_cgi_header_nph): Adding space after
- comma.
-
- * test/cgi/test_cgi_header.rb(test_cgi_header_nph): Remove variable
- `now`. Suppress warning.
-
-Wed Jul 6 12:18:09 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/cgi/test_cgi_header.rb(test_cgi_header_nph): Fix bug depends to
- time. The test fails if time past 1 second in line 136-145
-
-Tue Jul 5 15:28:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_here_document): should dispatch heredoc_end
- scanner event on an empty here document. fixed Bug#4543.
-
-Tue Jul 5 13:49:26 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * addr2line.c: fix r32407 to check HAVE_ALLOCA_H.
-
-Tue Jul 5 14:05:43 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httpauth/digestauth.rb (_authenticate):
- Literal texts in HTTP ABNF is case-insensitive (RFC2616 2.1),
- and a sample implementation in RFC2617 also ignores the case
- of algorithms. So now this ignores those cases.
- [ruby-dev:43965] [Feature #4936]
-
- * lib/webrick/httpauth/digestauth.rb (initialize):
- Because of above, opera_hack is useless and removed.
-
-Tue Jul 5 01:30:01 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread_pthread.c (native_sleep): cut the waiting time up to
- 100,000,000 because Solaris cond_timedwait() return EINVAL if an
- argument is greater than current_time + 100,000,000. This is
- considered as a kind of spurious wakeup. The caller to native_sleep
- should care about spurious wakeup.
-
-Tue Jul 5 01:24:26 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c: disable FIBER_USE_NATIVE on Solaris because resuming any
- Fiber caused SEGV. I haven't follow up the issue deeply, but it
- works when disabling the feature.
-
-Tue Jul 5 01:22:46 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * addr2line.c: include <alloca.h> to fix a build issue on Solaris.
-
-Tue Jul 5 00:49:05 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * ext/coverage/coverage.c: resurrect r32071 + add GC guard for
- rb_coverages. [ruby-core:37352] [Bug #4927]
- [ruby-core:36539] [Feature #4796]
-
- * test/coverage/test_coverage.rb resurrect r32071.
-
-Mon Jul 4 22:24:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (get_stack): For NetBSD/FreeBSD, use
- pthread_attr_getstack() if possible. and, remove an assumption
- of stack growing direction.
-
-Mon Jul 4 20:42:31 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/coverage/coverage.c: revert r32071. The commit caused SEGV on
- some minor nonfree OS. I have no means of debugging the bug. My
- personal opinion is that such OS should be unsupported unless there
- is an active maintainer. [ruby-core:37352]
-
- * test/coverage/test_coverage.rb: ditto.
-
-Mon Jul 4 07:14:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * thread_pthread.c (get_stack): the return address of get_stack
- must be the highest address of the current thread's stack.
-
-Mon Jul 4 06:37:22 2011 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/intern.h, thread_pthread.c (rb_reserved_fd_p,
- RB_RESERVED_FD_P): added. This C API is to limit to access
- fds which are used by RubyVM internal. In this version of
- CRuby, return 1 if fd is communication pipe.
- If your application needs to close all file descriptors to
- present resource leak, skip internal fds using this C API.
- We also define a macro RB_RESERVED_FD_P(fd). So you can write
- #ifndef RB_RESERVED_FD_P
- #define RB_RESERVED_FD_P(fd) 0
- #endif
- for Ruby 1.9.2 or previous version to write compatible extensions.
- See [ruby-core:37727]
-
- * thread_win32.c (rb_reserved_fd_p): added (return 0 for any fds).
-
- * io.c (rb_io_initialize): raise ArgumentError if given fd is reserved by Ruby.
-
-Sun Jul 3 23:43:56 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/extmk.rb (extmake): suppresses outputs from extconf.rb.
- (extmake) warns a failure in extconf.rb.
-
-Sun Jul 3 13:44:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_reject_bang): should not remove elements which are
- not yielded. [Bug #2545]
-
-Sun Jul 3 06:10:26 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (get_stack): pthread_attr_getstack() doesn't
- return stack start address, but stack base address. Thus,
- we need to add stack size for getting stack start address.
- And, we don't have to decrease guard size twice.
- * thread_pthread.c (thread_start_func_1): don't use inaccurate
- stack start guess if native_thread_init_stack() can be used.
- [Bug #1813] [ruby-core:24540]
-
-Sun Jul 3 04:50:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (get_stack): add to a care of guard page on Mac
- OS X. [Bug #1813] [ruby-core:24540]
- * signal.c (ruby_signal): SIGBUS use alternative stack too.
- * signal.c (sigbus): On Mac, thread stack overflow makes SIGBUS
- instead of SIGSEGV. thus, added stackoverflow check.
- * signal.c (default_handler): get rid of compilation warning.
- * signal.c (Init_signal): ditto.
-
-Sat Jul 02 08:59:20 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_ocsp.rb
- * test/openssl/test_x509_cert.rb: Perform SHA-256 tests only if
- supported by the available OpenSSL version. Versions < 0.9.8 don't
- support it. [ruby-core:37724]
-
-Sat Jul 2 07:17:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_reject_bang, rb_ary_delete_if): rejected
- elements should be removed. fixed [Bug #2545]
-
-Sat Jul 2 01:57:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * NEWS: remove a description of Kernel#respond_to? because it has
- been reverted at revision 28564.
-
-Sat Jul 2 00:58:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * NEWS: describe a change of multiplication of Bignum.
-
-Fri Jul 1 18:52:31 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_app_erb.rb: increase loop count. too short
- measurement time makes less accuracy.
- * benchmark/bm_app_factorial.rb: ditto.
- * benchmark/bm_app_mandelbrot.rb: ditto.
- * benchmark/bm_app_strconcat.rb: ditto.
-
- * benchmark/bm_io_file_create.rb: ditto.
- * benchmark/bm_io_file_read.rb: ditto.
- * benchmark/bm_io_file_write.rb: ditto.
-
- * benchmark/bm_so_concatenate.rb: ditto.
- * benchmark/bm_so_lists.rb: ditto.
- * benchmark/bm_so_matrix.rb: ditto.
- * benchmark/bm_so_random.rb: ditto.
- * benchmark/bm_so_sieve.rb: ditto.
-
- * benchmark/bm_vm_thread_mutex1.rb: ditto.
- * benchmark/bm_vm_thread_mutex2.rb: ditto.
- * benchmark/bm_vm_thread_mutex3.rb: ditto.
-
- * benchmark/bm_vm1_block.rb: cleanup.
- * benchmark/bm_vm1_const.rb: cleanup.
- * benchmark/bm_vm1_ensure.rb: cleanup.
- * benchmark/bm_vm1_ivar.rb: cleanup.
- * benchmark/bm_vm1_length.rb: cleanup.
- * benchmark/bm_vm1_neq.rb: cleanup.
- * benchmark/bm_vm1_not.rb: cleanup.
- * benchmark/bm_vm1_rescue.rb: cleanup.
- * benchmark/bm_vm1_simplereturn.rb: cleanup.
- * benchmark/bm_vm1_swap.rb: cleanup.
-
- * benchmark/bm_vm2_array.rb: cleanup.
- * benchmark/bm_vm2_case.rb: cleanup.
- * benchmark/bm_vm2_defined_method.rb: cleanup.
- * benchmark/bm_vm2_eval.rb: cleanup.
- * benchmark/bm_vm2_method.rb: cleanup.
- * benchmark/bm_vm2_mutex.rb: cleanup.
- * benchmark/bm_vm2_poly_method.rb: cleanup.
- * benchmark/bm_vm2_poly_method_ov.rb: cleanup.
- * benchmark/bm_vm2_proc.rb: cleanup.
- * benchmark/bm_vm2_regexp.rb: cleanup.
- * benchmark/bm_vm2_send.rb: cleanup.
- * benchmark/bm_vm2_super.rb: cleanup.
- * benchmark/bm_vm2_unif1.rb: cleanup.
- * benchmark/bm_vm2_zsuper.rb: cleanup.
-
- * benchmark/bm_vm_thread_alive_check1.rb: cleanup.
-
-Fri Jul 1 15:23:00 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix: Add LUP decomposition
-
-Fri Jul 1 15:21:14 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Allow non integer exponents for Matrix#**
-
-Fri Jul 1 15:13:25 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix: Add Eigenvalue Decomposition
-
-Fri Jul 1 15:10:22 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix: Add Matrix#round
-
-Fri Jul 1 11:41:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_trans): free heap ptr when the str is not embedded.
- patched by Eric Wong. [Bug #4956] [ruby-core:37708]
-
-Fri Jul 1 11:07:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (do_select): fix memory leak.
- Patch by Eric Wong. Thank you! [Bug #4953] [ruby-core:37702]
-
-Fri Jul 1 08:21:28 2011 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_getivar): check vm state version
- to invalidate inline cache (ivar index).
- fixes Bug #4926.
-
- * vm_insnhelper.c (vm_setivar): ditto.
-
-Fri Jul 1 08:03:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c, thread_pthread.c (WRITE_CONST): suppress warnings
- `ignoring return value'.
-
-Fri Jul 1 06:41:36 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_threadptr_check_signal): only wake up main thread.
-
- * thread.c (rb_threadptr_execute_interrupts_common): check signal
- delivery if it is main thread.
- fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
-
- * bootstraptest/test_fork.rb: add a test for above.
-
- * signal.c (rb_get_next_signal): skip if signal_buff is empty.
- (check signal_buff.size first)
-
- * vm_core.h: remove unused variable rb_thread_t::exec_signal.
-
- * thread.c (rb_thread_check_trap_pending): check
- rb_signal_buff_size() because rb_thread_t::exec_signal
- is no longer available.
-
-Fri Jul 1 03:28:25 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (Init_class_hierarchy): should name BasicObject
- explicitly.
-
- * variable.c (rb_const_defined_0): should not check for
- superclasses as const_get.
-
-Fri Jul 1 03:24:03 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: mathn is still alive (should die soon).
-
-Thu Jun 30 23:50:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * misc/ruby-mode.el (ruby-indent-beg-re): Fix broken regular
- expression. Fixes #4546
-
-Thu Jun 30 23:43:30 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl.c/.h: Added ossl_x509_name_sk2ary.
- * ext/openssl/ossl.c: Replaced ossl_x509_ary2k by generic macro to
- simplify future conversions.
- * ext/openssl/ossl_ssl.c: Implement SSLSocket#client_ca.
- * test/openssl/test_ssl.rb: Add test for SSLSocket#client_ca.
- Thanks to Ippei Obayashi for providing the patch!
- [ Ruby 1.9 - Feature #4481 ] [ruby-core:35461]
-
-Thu Jun 30 22:38:58 2011 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm2_defined_method.rb: added to measure performance of
- bmethod (method defined by define_method()).
-
-Thu Jun 30 22:17:04 2011 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
- for methods defined by define_method(). fixes Bug #4613.
-
- * thread.c (call_trace_proc): Fix to skip if class is not given (0).
- Note that ID and Class object are passed for call/return event
- if the called method was defined by define_method().
- If you are author of tracer/profiler/debugger, this may be an
- important change. You should check passed class as zero or
- non-zero instead of checking the event type.
-
- * test/ruby/test_settracefunc.rb: add a test for above.
-
-Thu Jun 30 21:18:35 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * configure.in: Add warnflags for XL/C on AIX during configure
- to avoid [Bug #3971]. See [ruby-core:32859]
-
-Thu Jun 30 21:16:04 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (m_ajd): refers a constant.
-
-Thu Jun 30 20:54:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/io-console.gemspec: spin-off gem for 1.9.2.
-
-Thu Jun 30 20:36:23 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: trivial changes.
-
-Thu Jun 30 20:12:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
-
-Thu Jun 30 20:03:39 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: modified doc.
-
-Thu Jun 30 19:09:19 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (thread_timer): ignore unknown errno.
- (we observed that select(2) was canceled by errno=514 on
- boron == Linux/Xen environment)
-
-Thu Jun 30 17:33:25 2011 Koichi Sasada <ko1@atdot.net>
-
- * ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
- Fix rdoc. Fixes Bug #3892.
-
- * ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
- Change key type if the klass of a object is zero (internal object).
- Read rdoc for details.
-
- * internal.h: export rb_objspace_data_type_name().
-
-Thu Jun 30 17:25:08 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (ping_signal_thread_list, thread_timer):
- fix to keep polling state if there are any ping-tasks.
-
-Thu Jun 30 12:25:34 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (rb_thread_create_timer_thread): allocate
- machine stack for the timer thread at least 12KB. FreeBSD 8.2
- AMD64 causes machine stack overflow (SIGSEGV) only with
- PTHREAD_STACK_MIN (maybe defined as 2KB).
-
-Thu Jun 30 09:36:37 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/weakref.rb: Attach documentation to WeakRef and add missing
- documentation
-
-Thu Jun 30 09:30:14 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/yaml.rb: Document toplevel YAML and YAML::ENGINE to describe
- Psych vs Syck engines.
-
-Thu Jun 30 09:21:52 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/cmath.rb: Hide handle_no_method_error from RDoc.
- * error.c: Document or hide undocumented error classes.
-
-Thu Jun 30 07:49:04 2011 Eric Hodel <drbrain@segment7.net>
-
- * hash.c: Document ENV
-
-Thu Jun 30 06:37:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored
- before RUBYLIB, even if MANGLED_PATH is enabled. fixed #1679.
- MANGLED_PATH is disabled by the default and will be removed
- completely in the future.
-
-Thu Jun 30 06:32:21 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/drb/drb.rb: Hide deprecated toplevel DRb constants.
-
-Thu Jun 30 06:17:02 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/cmath.rb (CMath.log): second argument: b can be nil.
-
-Thu Jun 30 06:23:28 2011 Eric Hodel <drbrain@segment7.net>
-
- * thread.c (ruby_thread_s_pass): Fix typo.
-
-Thu Jun 30 06:16:53 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Update to RDoc 3.8 which contains fixes for documentation
- in trunk.
-
-Thu Jun 30 02:53:26 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_threadptr_execute_interrupts_common): remove
- meaningless native_thread_yield(). It never close a race.
-
-Thu Jun 30 02:41:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_schedule_limits): minor optimization.
- eliminate machine context saving when running time is enough small.
-
-Thu Jun 30 02:28:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_schedule_rec): move interrupt_flag check to
- rb_thread_schedule().
- And also rename to rb_thread_schedule_limits() and remove
- sched_depth argument. It's no longer called recursive.
- * thread.c (rb_thread_schedule): add to check interrupt_flag as
- above explained.
-
- * thread.c (rb_threadptr_execute_interrupts_rec): rename to
- rb_threadptr_execute_interrupts_common() and remove sched_depth
- argument. It's no longer called recursive.
-
- * thread.c (rb_thread_sleep): adapt the renaming.
- * thread.c (rb_threadptr_execute_interrupts): ditto.
- * thread.c (rb_thread_execute_interrupts): ditto.
-
-Thu Jun 30 01:31:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (thread_s_pass): change RDoc description and remove
- a sample code. The actual implementation never behave as explained by
- an example. It's a documentation bug.
-
-Thu Jun 30 00:54:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_stop): change RDoc sample code. The old
- example is buggy and may cause deadlock. The patch is
- suggested by Heesob Park <phasis@gmail.com>. Thank you!
- [Bug #3606][ruby-core:31454]
-
-Thu Jun 30 00:49:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_wakeup): change RDoc sample code. The old
- example is buggy and may not display anything by a race.
- The patch is suggested by Heesob Park <phasis@gmail.com>.
- Thank you! [Bug #3606][ruby-core:31454]
-
-Thu Jun 30 00:43:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_run): change RDoc. The old example is buggy
- and may cause deadlock. The patch is suggested by Heesob Park
- <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
-
-Thu Jun 30 00:30:15 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/cmath.rb: make same exception for Math. fix [Bug #3137].
-
-Thu Jun 30 00:03:20 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/completion.rb: complement correctly string literal. fix
- [Bug #1145].
-
-Wed Jun 29 23:42:51 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: avoided using timev.
- * ext/date/date_strftime.c: ditto.
- * ext/date/date_tmx.h: ditto.
-
-Wed Jun 29 23:17:57 2011 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
-
-Wed Jun 29 23:09:14 2011 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
-
-Wed Jun 29 22:49:10 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/cmd/help.rb: support RDoc 3.7. fix [Bug #3760].
-
-Wed Jun 29 22:04:14 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * lib/tracer.rb: Tracer.on only if required by -r command-line option.
- and consider --disable-gems option.
- * test/test_tracer.rb: add tests for it.
-
-Wed Jun 29 13:55:36 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_get_0): should not look for superclasses if
- the second optional argument is given for #const_get().
- fix [Bug #3422] [Bug #3423]
-
-Wed Jun 29 12:07:27 2011 Eric Hodel <drbrain@segment7.net>
-
- * math.c: Attach documentation for Math.
- * object.c: Document NIL, TRUE, FALSE.
- * io.c: Improve grammar in ARGF comment. Document STDIN/OUT/ERR.
- Document ARGF global constant.
- * lib/rake: Hide deprecated toplevel constants from RDoc (import from
- rake trunk).
- * lib/thwait.rb: Document ThWait.
- * lib/mathn.rb: Hide Math redefinition from RDoc
- * lib/sync.rb: Add a basic comment for Sync_m, Synchronizer_m, Sync,
- Synchronizer.
- * parse.y: Document SCRIPT_LINES__.
- * hash.c: Document ENV class and global constant.
- * vm.c: Document TOPLEVEL_BINDING.
- * version.c: Document RUBY_* constants.
- * ruby.c: Document DATA and ARGV.
-
-Wed Jun 29 10:13:12 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Matrix.zero can build rectangular matrices.
- Vector#r should be called #magnitude
-
-Wed Jun 29 10:11:08 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?,
- orthogonal?
- permutation?, symmetric?, {lower|upper}triangular?, unitary?, zero?
-
-Wed Jun 29 10:09:35 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Specialize Matrix#find_index to return [row, col]
- and accept the same optional argument as #each
-
-Wed Jun 29 10:07:32 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Matrix#each{_with_index} can iterate over a subset
- of the Matrix
-
-Wed Jun 29 06:21:02 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (native_stop_timer_thread): skip to close
- communication pipe to avoid timing bug (process termination timing).
- The communication pipe will closed by OS.
-
-Wed Jun 29 06:09:54 2011 Koichi Sasada <ko1@atdot.net>
-
- * error.c (rb_async_bug_errno): async-safe bug report function.
- In timer thread, signal handler should use it.
- The patch is contributed by Eric Wong <normalperson@yhbt.net>.
- Refs: [ruby-core:37644] and [ruby-core:37647]
-
- * thread_pthread.c: use rb_async_bug_errno().
- And replace all fprintf() to write().
-
- * internal.h (rb_async_bug_errno): add decl. of above func.
-
-Tue Jun 28 23:46:08 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/tracer.rb: count only non-internal libraries in stack trace,
- ignoring custom_require.
-
-Tue Jun 28 21:44:58 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
-
-Tue Jun 28 20:39:29 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!).
- global_variables, local_variables, and instance_variables returns
- Symbols from 1.9 and need to stringify before evaling it.
- See #4931.
-
-Tue Jun 28 19:23:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * signal.c: Now, USE_TRAP_SIGMASK depend on HAVE_PTHREAD_SIGMASK.
- The code have already depended on pthread_sigmask since r27464.
-
-Tue Jun 28 15:09:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/benchmark.rb: merge eregon/benchmark.
- https://github.com/eregon/ruby/tree/benchmark
- patched by Benoit Daloze. [ruby-core:37593] [Bug #4940]
-
- * lib/benchmark (Benchmark#bmbm): bmbm should be consistent with bm
- for the return value.
-
- * test/benchmark: remove preemptive test instead of skipping
- I removed the preemptive test I wrote for Feature #4197.
- I'll add it back when the implementation will be able to satisfy it.
-
- * lib/benchmark (Benchmark#bmbm): remove useless explicit call,
- #format is an alias of #to_s test/benchmark: add a test for
- format of long time.
-
- * lib/benchmark: fix label width: always add 1 to ensure there is a
- space delimiter even with times over 100s
- When I asked for Feature #4197, I wanted to make delimiting spaces
- consistent for #bm and #bmbm.
- But with times over 100s, the output contains no space between the
- label and the first time (user).
- Now both ensure there is always a space, even if that means 3 spaces
- with times under 10s (because it is formatted as %10.6f)
-
- * test/benchmark: let labels be a constant
- lib/benchmark (Benchmark#realtime): avoid creating an unused Proc
- lib/benchmark (Benchmark#benchmark): use ensure clause to restore
- STDOUT.sync, as in #bmbm
-
-Tue Jun 28 13:41:51 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (native_stop_timer_thread): fixed commit miss of
- r32244. grep sources before changing the signature of a function.
-
-Tue Jun 28 11:49:14 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (consume_communication_pipe):
- Make "buff" as static. (Maybe) "buff" can be shared between
- any caller (any threads) because no one use the read values.
- "buff" (1024 byte) on stack may cause stack overflow on
- several environment (we found a crash on FreeBSD).
- And remove const value "buff_size", and define CCP_READ_BUFF_SIZE
- macro.
-
-Tue Jun 28 11:45:30 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rake: Update rake to fix some bugs and hide deprecated features
- from RDoc.
- * lib/rake/version.rb: Bump version to 0.9.2.1 to distinguish it from
- the released version.
- * NEWS: ditto
-
-Tue Jun 28 11:17:28 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Update to RDoc 3.7 (final)
- * NEWS: ditto
-
-Tue Jun 28 10:18:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * process.c (rb_daemon): fix wrong #endif position.
-
-Tue Jun 28 07:50:32 2011 Eric Hodel <drbrain@segment7.net>
-
- * object.c (Init_Object): Teach RDoc what Init_class_hierarchy does to
- hook up ri for BasicObject, Object, Module and Class.
-
-Tue Jun 28 05:03:32 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * thread.c (rb_thread_local_aref): RDoc fix. Thread#[] example
- had a race. See #4480.
-
-Tue Jun 28 01:22:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigMath_s_log): move BigMath.log from
- bigdecimal/math.rb.
-
- * ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
-
- * test/bigdecimal/test_bigdecimal.rb: move test for BigMath.log from
- test/bigdecimal/test_bigmath.rb.
-
- * test/bigdecimal/test_bigmath.rb: ditto.
-
-Tue Jun 28 01:19:52 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/ruby-lex.rb: fix [Bug #4232].
-
-Tue Jun 28 00:14:13 2011 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
-
- * test/drb/test_drb.rb: ditto.
-
- * test/drb/drbtest.rb: ditto.
-
- * test/drb/ut_eq.rb: ditto.
-
-Tue Jun 28 00:08:43 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/workspace.rb: fix BUG#4793.
-
-Mon Jun 27 22:06:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (consume_communication_pipe): don't use C99
- style variable length array.
-
-Mon Jun 27 22:04:27 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (consume_communication_pipe): change return
- type to void. caller doesn't use it.
-
-Mon Jun 27 21:29:50 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.h (rb_global_vm_lock_struct): add volatile to
- gvl->waiting. now thread_timer() access it w/o lock.
-
-Mon Jun 27 21:16:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c: s/__gvl_acquire/gvl_acquire_common/ and
- s/__gvl_release/gvl_release_common/.
-
-Mon Jun 27 11:41:47 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * thread_pthread.c (rb_thread_create_timer_thread):
- the type of return value of write(2) is ssize_t.
-
-Mon Jun 27 09:57:02 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (rb_thread_create_timer_thread):
- Fixes missing initialization of oflags.
-
-Mon Jun 27 09:07:42 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c: Stop polling in the timer thread when there are
- no waiting thread. If there are 2 or more runnable threads,
- the timer thread does polling. Avoid polling makes power save
- for several computers (0.2W per a Ruby process, when I measured).
- If outside-event such as signal or Thread#kill was occurred
- when the timer thread does not do polling, then wake-up
- the timer thread using communication-pipe (the timer thread
- waits this communication-pipe with select(2)).
- The discussion about this modification can be found from the post
- [ruby-core:33456] and other related posts.
- Note that Eric Wong and KOSAKI Motohiro give us the huge
- contributions for this modification. Thanks.
-
- * thread_pthread.c (rb_thread_wakeup_timer_thread): add a function.
- This function wakes up the timer thread using communication-pipe.
-
- * thread.c (rb_thread_stop_timer_thread): add a parameter which
- specify closing communication-pipe or not.
-
- * thread.c (rb_thread_terminate_all): do not stop timer thread here
- (ruby_cleanup() terminate timer thread).
-
- * signal.c: wake up timer thread using
- rb_thread_wakeup_timer_thread() from signal handler.
-
- * eval.c (ruby_cleanup): use rb_thread_stop_timer_thread(1).
-
- * process.c: use rb_thread_stop_timer_thread(0)
- (reuse communication-pipe).
-
- * thread_win32.c (rb_thread_wakeup_timer_thread): add a dummy
- function.
-
- * vm_core.h: add and fix decl. of functions.
-
-Mon Jun 27 08:01:19 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_parse.c: should use ALLOCA_N.
-
-Mon Jun 27 01:34:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
- start with + sign, which means NIS. these are returned in the
- case that passwd and group entries in /etc/nsswitch.conf are set
- to use "nis" explicitly on Debian. fixed #3683
-
-Mon Jun 27 00:44:53 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (rb_parser_end_seen_p): fix documentation about return
- value. patched by Sho Hashimoto. [Bug #4511]
-
-Mon Jun 27 00:40:47 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * hash.c (rb_hash_reject): add documentation that Hash#reject
- without block returns enumerator.
- patched by Michael Edgar [Bug #4847] [ruby-core:36800]
-
-Sun Jun 26 23:49:21 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/test_switch_hitter.rb: added a test.
-
- Sun Jun 26 22:21:23 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: refactoring.
-
-Sun Jun 26 18:03:30 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * parse.y: comma at the end of line is no longer allowed.
- A patch from Yukihiro Matsumoto <matz AT ruby-lang.org>.
- (fixed #3456).
-
-Sun Jun 26 13:35:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_dump.c (rb_vm_bugreport): change CrashReporter suggestion messages
- on Mac. It should be placed after "-- C level backtrace" line.
- Suggested by Endoh-san.
-
- <before>
- -- See Crash Report log file under ~/Library/Logs/CrashReporter or ---------
- -- /Library/Logs/CrashReporter, for the more detail of ---------------------
- -- C level backtrace information -------------------------------------------
-
- <after>
- -- C level backtrace information -------------------------------------------
-
- See Crash Report log file under ~/Library/Logs/CrashReporter or
- /Library/Logs/CrashReporter, for the more detail of.
-
-Sun Jun 26 10:08:28 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/extconf.rb
- * ext/openssl/ossl_missing.h/.c: add ASN1_put_eoc if missing.
-
- * ext/openssl/ossl_asn1.c: introduce ossl_asn1_object_size and
- ossl_asn1_put_object to wrap functionality depending on OpenSSL
- version in use.
- Fixes [ Ruby 1.9 - Bug #4916 ] reported by Hiroshi Nakamura.
- [ruby-core:37286]
-
-Sun Jun 26 01:00:15 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (date_strftime_internal): removed meaningless braces.
- * ext/date/date_core.c (gengo): the value should be int.
-
-Sat Jun 25 23:45:30 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * vm_insnhelper.c (vm_search_superclass): avoid control frame
- stack overrun. currently super() in Proc created in a method
- defined by Module#define_method raise NoMethodError. [Bug #4881]
- * test/ruby/test_method.rb t_super_in_proc_from_define_method):
- add test for it.
-
-Sat Jun 25 23:23:14 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * thread.c (sleep_forever): now Kernel#sleep don't wakeup by
- signal handler execution. [Bug #4072]
-
-Sat Jun 25 23:14:47 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * thread.c (rb_threadptr_check_signal): remove unnecessary th->status
- backup. fix race condition which may results unexpected main thread's
- status transition. see #4072
-
-Fri Jun 24 19:57:30 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
- header failed when the request is from 2 or more Apache reverse
- proxies. It's said that all X-Forwarded-* headers will contain more
- than one (comma-separated) value if the original request already
- contained one of these headers. Since we could use these values as
- Host header, we choose the initial(first) value. See #4922.
-
- * test/webrick/test_httprequest.rb (test_forwarded): Test it.
-
-Fri Jun 24 17:06:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_daemon): should not start timer thread
- twice. fixed Bug#4920.
-
-Fri Jun 24 15:54:14 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Try to shutdown SSL
- connection more gracefully. Call SSL_shutdown() max 4 times until it
- returns 1 (success). Bi-directional SSL close has several states but
- SSL_shutdown() kicks only 1 transition per call. Max 4 is from
- mod_ssl.c of Apache httpd that says 'max 2x pending + 2x data = 4'.
- See #4237.
-
-Fri Jun 24 07:24:37 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rake/version.rb: Fixed VERSION to work with tool/rbinstall.rb
- * bin/rake: Import bin/rake from 0.9.2
- * tool/rbinstall.rb (install): Rake::VERSION is now in
- lib/rake/version.rb. Fixes `make install`
-
-Fri Jun 24 07:11:37 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rake: Import Rake 0.9.2
-
-Fri Jun 24 00:44:15 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.
-
-Fri Jun 24 00:14:23 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: trivial changes on text.
-
-Thu Jun 23 22:46:57 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_x509name.c: Add X509::Name#hash_old as a wrapper
- for X509_NAME_hash_old in OpenSSL 1.0.0. See #4805
-
- * test/openssl/test_x509name.rb (test_hash): Make test pass with
- OpenSSL 1.0.0.
-
- * NEWS: Add it.
-
-Thu Jun 23 19:30:53 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
- argument type with NUM2LONG if the arg is not a Time object.
- See #4919.
-
- * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_timeout): Check
- type with NUM2LONG. Time as an arg is not allowed. See #4919.
-
- * test/openssl/test_ssl_session.rb (test_session_time,
- test_session_timeout): Test it.
-
-Wed Jun 23 13:30:30 2011 Shota Fukumori <sorah@tubusu.net>
-
- * signal.c(ruby_atomic_exchange): Fix definition style.
-
-Wed Jun 22 22:34:05 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_session_new_cb): Return 0 to
- OpenSSL from the callback for SSL_CTX_sess_set_get_cb().
- Returning 0 means to OpenSSL that the session is still valid
- (since we created Ruby Session object) and was not freed by us with
- SSL_SESSION_free(). Call SSLContext#remove_session(sess) in
- session_get_cb block if you don't want OpenSSL to cache the session
- internally.
- This potential issue was pointed by Ippei Obayashi. See #4416.
-
- * test/openssl/test_ssl_session.rb (test_ctx_server_session_cb): Test
- it.
-
-Wed Jun 22 22:21:17 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_ssl_session.c: Respect T_BIGNUM time values. Patch by
- Tomoyuki Chikanaga.
- [ Ruby 1.9 - Bug #4919 ] [ruby-dev:43869]
-
-Wed Jun 22 21:29:25 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/socket/depend (SOCK_HEADERS): use $(top_srcdir) instead of
- $(topdir). sorry!
-
-Wed Jun 22 19:47:03 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * cont.c (cont_capture): add volatile.
- On clang -O, it is needed to avoid the optimization.
- With this and llvm/clang's recent fix, clang 3.0 can
- build ruby-trunk with -O option.
-
- * cont.c (cont_capture): use for-loop.
-
- * array.c (rb_ary_each): add volatile and use it.
-
- * vm_insnhelper.c (vm_call_cfunc): ditto.
-
-Wed Jun 22 18:20:46 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_session_remove_cb):
- OpenSSL::SSL::SSLContext#session_remove_cb was broken. It wrongly
- tried to call the session_*new*_cb callback.
-
- * test/openssl/test_ssl_session.rb (class OpenSSL): Test it.
-
-Wed Jun 22 17:37:49 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER
- fallback scenarios.
-
- * ext/openssl/ossl_pkey_dsa.c
- * ext/openssl/ossl_x509req.c
- * ext/openssl/ossl_pkey_rsa.c
- * ext/openssl/ossl_pkey_ec.c
- * ext/openssl/ossl_ssl_session.c
- * ext/openssl/ossl_x509crl.c
- * ext/openssl/ossl_pkey.c
- * ext/openssl/ossl_pkey_dh.c
- * ext/openssl/ossl_x509cert.c
- * ext/openssl/ossl_pkcs7.c: Use OSSL_BIO_reset.
-
- * ext/openssl/ossl_ssl.c
- * ext/openssl/ossl_cipher.c
- * ext/openssl/ossl_pkey_ec.c
- * ext/openssl/ossl_pkcs12.c
- * ext/openssl/ossl_ssl_session.c: Replace rb_raise occurrences by
- ossl_raise. This automatically flushes OpenSSL's error queue.
-
- * ext/openssl/ossl_pkcs7.c: Raise error if DER fallback for parsing
- fails.
-
- * test/openssl/test_pkey_ec.rb
- * test/openssl/test_pkey_dsa.rb
- * test/openssl/test_pkey_rsa.rb: Add assertions that OpenSSL.errors is
- empty.
-
- * test/openssl/test_pkey_rsa.rb: Remove initial OpenSSL.errors call in
- test_new.
- [ Ruby 1.9 - Bug #4885 ] [ruby-core:37134]
-
-Wed Jun 22 15:01:24 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_ssl.c: Use SSL_MODE_RELEASE_BUFFERS if available.
- Thanks, Eric Wong, for providing the patch.
- [ Ruby 1.9 - Feature #4672 ] [ruby-core:36127]
-
-Wed Jun 22 14:47:53 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_buffering.rb
- * test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase
- instead of MiniTest::Unit::TestCase. [ruby-core:37275]
-
-Wed Jun 22 12:41:03 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
- OpenSSL::SSL::Session#to_der was broken. Fix buffer handling.
-
- * test/openssl/test_ssl_session.rb (test_session): Test it.
-
-Wed Jun 22 12:38:52 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * test/openssl/test_ssl_session.rb: Split out SSL::Session related
- tests from test_ssl.rb
-
-Wed Jun 22 03:20:52 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: Fix cyclic references of
- objects. Thanks to CvX for reporting the bug and a test case.
- * test/psych/test_object.rb: test for cyclic object references.
-
-Wed Jun 22 02:39:54 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP.post_form): Do not ignore query part of
- the given URI to post. See #655.
-
- * test/net/http/test_http.rb, test/net/http/utils.rb: Test it.
-
-Wed Jun 22 01:28:13 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * test/openssl/test_x509store.rb (test_set_errors): Redhat is
- distributing a patched version of OpenSSL that allows multiple CRL
- for a key (multi-crl.patch.) Make test pass on such env. See #4122,
- #4554.
-
-Tue Jun 21 21:50:37 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * lib/webrick/httpresponse.rb (HTTPResponse#setup_header): Close
- HTTP/1.1 connection when returning an IO object as response body
- without setting HTTPResponse#chunked to true. See #855 no.1.
-
- * test/webrick/test_httpserver.rb: Test it.
-
-Tue Jun 21 21:27:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * internal.h: move rb_thread_io_blocking_region() declaration
- from intern.h to internal.h. It's still experimental API and
- need more discussion. [ruby-dev:43698]
- * include/ruby/intern.h: ditto.
-
- * ext/socket/rubysocket.h: include internal.h.
- * ext/socket/depend: add internal.h dependency.
- * ext/socket/extconf.rb: add $INCFLAGS to topdir.
-
-Tue Jun 21 20:38:47 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (datetime_s_*): canonicalize 24 o'clock.
-
-Tue Jun 21 19:46:23 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_thread.rb (TestThread#test_priority): enable
- this test again. Current GVL respect thread priority rather
- than past.
-
-Tue Jun 21 13:25:35 2011 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c (readline_getc): applied a patch in
- #3827 by by Akio Tajima <artonx AT yahoo.co.jp>. (see #3827)
-
-Tue Jun 21 13:16:31 2011 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/extconf.rb: fixed bug, specify --disable-libedit
- then disable libedit, does not specify then check readline and
- libedit if failed checking readline. (fixes #3375)
-
-Mon Jun 20 22:52:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (before_exec): use sig_do_nothing instead of SIG_DFL
- for avoiding a race.
- * process.c (sig_do_nothing): new function.
-
-Mon Jun 20 21:31:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (thread_timer): rename timeout_10ms to
- time_quantum. it's no longer 10ms.
-
-Mon Jun 20 18:46:02 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_cipher.c, ext/openssl/lib/openssl/cipher.rb:
- Documentation fix by Ippei Obayashi. See #4419.
-
-Mon Jun 20 15:41:33 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * lib/webrick/cookie.rb (WEBrick::Cookie.parse): Revert r31228.
- r31228 was for allowing the 'Cookie:' header which did not have no
- SP after ';' for separating cookie-pairs but RFC6265 requires single
- SP after ';' there. We allow multiple SPs here for compatibility
- with older WEBrick version.
-
- * test/webrick/test_cookie.rb: Test it.
-
-Sun Jun 19 13:31:26 2011 Shota Fukumori <sorah@tubusu.net>
-
- * NEWS: Introduce --hide-skip on test/unit.
-
-Sun Jun 19 10:05:16 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/parallel.rb: Override Test::Unit::TestCase#on_parallel_worker?
- only when $0 == __FILE__.
-
- * lib/test/unit/parallel.rb: Run Test::Unit::Worker.run only when
- $0 == __FILE__.
-
-Sat Jun 18 23:59:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (fill_cbuf): finish reading at EOF, and the readconv has
- been cleared by another thread while io_fillbuf() is waiting at
- select(). a patch in [ruby-core:37197] by Hiroshi Shirosaki
- <h.shirosaki AT gmail.com>. fixed #3840
-
-Sat Jun 18 21:36:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c: remove GVL_DEBUG
-
-Sat Jun 18 21:32:02 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm.c, vm_core.h (rb_vm_stack_to_heap): remove const.
- It makes compilations warnings.
-
-Sat Jun 18 18:54:15 2011 Koichi Sasada <ko1@atdot.net>
-
- * vm.c, vm_core.h (rb_vm_stack_to_heap): fix "const" place.
-
-Sat Jun 18 17:23:38 2011 Tanaka Akira <akr@fsij.org>
-
- * eval.c, hash.c, load.c, proc.c, range.c, thread.c, time.c: don't
- declare internal functions.
-
- * internal.h, vm_core.h: declare internal functions.
-
- * array.c: include internal.h.
-
- * common.mk: update dependency for array.o.
-
-Sat Jun 18 13:39:33 2011 Tanaka Akira <akr@fsij.org>
-
- * internal.h: declarations declared in include/ruby/*.h removed.
-
-Sat Jun 18 12:42:17 2011 Tanaka Akira <akr@fsij.org>
-
- * method.h, internal.h iseq.h: declare internal functions.
-
- * compile.c, eval.c, iseq.c, object.c, parse.y, proc.c, process.c,
- thread.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: don't
- declare internal functions.
-
- Note that rb_method_entry_eq() is defined in vm_method.c but
- there was a declaration in proc.c with different const-ness.
- Now it is declared in method.h with same const-ness to the
- definition.
-
- * object.c (rb_mod_module_exec): don't declare functions declared in
- include/ruby/intern.h.
-
-Sat Jun 18 12:05:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/backward/classext.h: for evil gems. fixed #4803
-
-Sat Jun 18 11:12:13 2011 Tanaka Akira <akr@fsij.org>
-
- * common.mk: update dependencies.
-
-Sat Jun 18 11:09:03 2011 Tanaka Akira <akr@fsij.org>
-
- * io.c: suppress warnings.
-
-Sat Jun 18 10:22:39 2011 Tanaka Akira <akr@fsij.org>
-
- * internal.h: declare more internal functions.
-
- * iseq.h (rb_method_get_iseq): declared.
-
- * compile.c, eval.c, eval_error.c, iseq.c, parse.y, proc.c, range.c,
- ruby.c, time.c, util.c, vm.c: don't declare internal functions.
-
- * eval.c, parse.y, thread_pthread.c: non-existing function declarations
- removed.
-
-Sat Jun 18 08:12:54 2011 Tanaka Akira <akr@fsij.org>
-
- * common.mk: dependencies updated.
-
- * tool/update-deps: new file to assist update dependencies in
- common.mk.
-
-Sat Jun 18 07:27:27 2011 Tanaka Akira <akr@fsij.org>
-
- * internal.h: declare internal functions here.
-
- * node.h: declare NODE dependent internal functions here.
-
- * iseq.h: declare rb_iseq_t dependent internal functions here.
-
- * vm_core.h: declare rb_thread_t dependent internal functions here.
-
- * bignum.c, class.c, compile.c, complex.c, cont.c, dir.c, encoding.c,
- enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c, io.c,
- iseq.c, load.c, marshal.c, math.c, numeric.c, object.c, parse.y,
- proc.c, process.c, range.c, rational.c, re.c, ruby.c, string.c,
- thread.c, time.c, transcode.c, variable.c, vm.c,
- tool/compile_prelude.rb: don't declare internal functions declared
- in above headers. include above headers if required.
-
- Note that rb_thread_mark() was declared as
- void rb_thread_mark(rb_thread_t *th) in cont.c but defined as
- void rb_thread_mark(void *ptr) in vm.c. Now it is declared as
- the later in internal.h.
-
-Sat Jun 18 02:36:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpNewRbClass): fix type of the 2nd
- argument.
-
- * ext/bigdecimal/bigdecimal.h: ditto.
-
-Sat Jun 18 02:30:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigMath_s_exp): move BigMath.exp from
- bigdecimal/math.rb.
-
- * ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
-
- * test/bigdecimal/test_bigdecimal.rb: move test for BigMath.exp from
- test/bigdecimal/test_bigmath.rb.
-
- * test/bigdecimal/test_bigmath.rb: ditto.
-
-Sat Jun 18 00:20:54 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: do not define wnum[01].
-
-Fri Jun 17 18:57:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.
-
-Fri Jun 17 13:09:45 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/curses/curses.c: Clean up documentation.
-
-Fri Jun 17 09:25:14 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/curses/curses.c: Document curses constants. Patch by Vincent
- Batts. [Ruby 1.9 - Bug #4880]
-
-Fri Jun 17 09:11:05 2011 Eric Hodel <drbrain@segment7.net>
-
- * object.c: Document Module#method_added and #method_removed.
- Patch by Bryce Kerley. [Ruby 1.9 - Feature #4867]
-
-Fri Jun 17 08:50:16 2011 Eric Hodel <drbrain@segment7.net>
-
- * io.c: Improve documentation of IO and File open and new.
- Patch by Roger Pack. [Ruby 1.9 - Bug #4790]
-
-Fri Jun 17 07:53:50 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/csv.rb: Document #raw_encoding. Patch by David Czarnecki.
- [Ruby 1.9 - Bug #4874]
-
-Fri Jun 17 07:46:50 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/benchmark.rb: Document Benchmark::Tms#memberwise. Patch by
- David Czarnecki. [Ruby 1.9 - Bug #4873]
-
-Fri Jun 17 07:38:31 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/prettyprint.rb: Improve documentation. Patch by Ysiad
- Ferreiras. [#4834]
-
-Fri Jun 17 07:23:03 2011 Eric Hodel <drbrain@segment7.net>
-
- * array.c (rb_ary_drop): Improve documentation. Patch by Caley Woods.
- [Ruby 1.9 - Bug #4858]
-
-Fri Jun 17 06:11:31 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/log.rb: Improve documentation of BasicLog and Log.
- Patch by Olivier Brisse. [Ruby 1.9 - Bug #4833]
- * lib/webrick/httpstatus.rb: Improve documentation of
- WEBrick::HTTPStatus. Patch by Olivier Brisse.
- [Ruby 1.9 - Bug #4833]
-
-Fri Jun 17 04:48:22 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c, thread_pthread.h: remove unused variables.
- (native_thread_data_t::gvl_cond, native_thread_data_t::gvl_next)
-
-Thu Jun 16 14:32:31 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * time.c (rb_time_new): prevent overflow by "* 1000".
-
-Fri Jun 17 03:07:36 2011 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm4_thread_create_join.rb,
- benchmark/bm_vm4_thread_mutex[1-3].rb: renamed to
- bm_thread_* (fix last rename).
-
-Fri Jun 17 02:26:47 2011 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (native_thread_create): fix debug message.
- (add last newline)
-
-Thu Jun 16 23:40:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_schedule_rec): fix {UN,}LIKELY macro misuse.
- * gc.c (rb_newobj): ditto.
- * vm_insnhelper.c (vm_method_search): ditto.
-
-Thu Jun 16 20:06:15 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/testunit/test_parallel.rb: Fix Regexp for test.
-
- * test/testunit/tests_for_parallel/test_third.rb: Use
- Test::Unit::TestCase#on_parallel_worker? for detecting worker.
-
- * lib/test/unit/testcase.rb(Test::Unit::TestCase#on_parallel_worker?):
- New Method Test::Unit::TestCase#on_parallel_worker? returns true
- when a testcase is running on parallel worker.
- * lib/test/unit/parallel.rb(Test::Unit::TestCase#on_parallel_worker?):
- ditto.
-
-Thu Jun 16 19:27:12 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * test/test_securerandom.rb: Add testcase. This testcase does NOT aim
- to test cryptographically strongness and randomness. It includes
- the test for PID recycle issue of OpenSSL described in #4579 but
- it's disabled by default.
-
-Thu Jun 16 17:55:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_io.rb (TestIO#test_copy_stream_socket): fix
- test hanging up issue. Patch by CHIKANAGA Tomoyuki.
-
-Thu Jun 16 15:17:39 2011 Eric Hodel <drbrain@segment7.net>
-
- * variable.c (const_missing): Add simple example of const_missing.
- Patch by Anuj Dutta. [Ruby 1.9 - Bug #4794]
-
-Thu Jun 16 15:09:29 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/monitor.rb: Improve documentation. Patch by Sandor Szucs.
- [Ruby 1.9 - Bug #4823]
-
-Thu Jun 16 14:54:09 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/utils.rb: Document WEBrick::Utils. Patch by Olivier
- Brisse. [Ruby 1.9 - Bug #4819]
-
-Thu Jun 16 14:26:46 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/httpservlet/erbhandler.rb: Allow the ERB document to
- alter the content-type of the response. [Ruby 1.9 - Bug #4685]
-
-Thu Jun 16 14:15:47 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/timeout.rb: Clarify timeout duration types. Patch by Alf Mikula.
- [Ruby 1.9 - Bug #4791]
- * lib/net/http.rb: ditto
-
-Thu Jun 16 13:25:25 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc*: Import RDoc 3.7 release candidate
-
-Thu Jun 16 11:35:09 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (search_response): parses SEARCH responses from
- the Yahoo IMAP server correctly. patched by Mark Nadig. [Bug #4509]
-
-Thu Jun 16 09:12:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * fix for build on solaris 10.
-
-Thu Jun 16 09:08:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/io/console/test_io_console.rb (TestIO_Console#test_sync):
- fix for daemon process.
-
-Thu Jun 16 07:58:01 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
-
- * test/testunit/tests_for_parallel/test_third.rb: Use another way to
- detect that test is running on worker. This fixes sometimes
- TestParallel failing.
-
-Thu Jun 16 07:20:06 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
- because it makes blocking forever by IO.select.
-
-Thu Jun 16 03:08:11 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/testunit/test_parallel.rb (TestParallel::TestParallelWorker#
- setup): now can run on Windows, probably.
-
- * test/testunit/test_parallel.rb (TestParallel::TestParallel#setup):
- ditto.
-
-Thu Jun 16 03:00:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (do_select): Windows: no need to poll if select(2) is
- cancelable.
-
- * thread_win32.c (native_fd_select): new function to make select(2)
- cancelable.
-
- * thread_win32.c (rb_w32_check_interrupt): new function for checking
- interrupt.
-
- * win32/win32.c (rb_w32_select_with_thread): new function. cancelable
- select(2).
-
- * win32/win32.c (rb_w32_select): use above function internally.
-
-Wed Jun 15 23:30:45 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * gc.c: fix a regression by r31690 on AIX because AIX malloc
- return NULL if it's passed 0. But some caller don't expect it.
- patch by Yutaka Kanemoto. [ruby-dev:43779]
- (vm_malloc_prepare): return calculated size.
- (vm_xmalloc): use above result.
- (vm_xcalloc): ditto.
-
-Wed Jun 15 23:11:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c: remove BLOCKING_REGION_CORE() macro. It's no longer used
- since r32022.
-
-Wed Jun 15 21:00:47 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_config.rb: execute based on the existence of the
- OpenSSL module.
-
-Wed Jun 15 12:35:11 2011 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_io.rb (test_copy_stream_socket): wait a child process
- before SIGUSR1 handler is removed.
-
- * test/pathname/test_pathname.rb (define_assertion): use line number
- for test method names.
-
-Wed Jun 15 10:37:43 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (rb_stat_rdev): use DEVT2NUM.
-
- * file.c (rb_stat_rdev_major): ditto.
-
- * file.c (rb_stat_rdev_minor): ditto.
-
-Wed Jun 15 05:12:59 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's
- the part for ruby_1_8), and use rb_thread_check_ints() when RUBY_VM
- is defined.
-
-Wed Jun 15 04:42:47 2011 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm3_thread_*.rb: renamed bm_vm3_thread_*.rb to
- benchmark/bm_vm_thread_*.rb.
-
-Wed Jun 15 04:28:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_vm4_thread_pass.rb: rename bm_vm4* to
- bm_vm_thread_*. suggested by ko1.
- * benchmark/bm_vm4_pipe.rb: ditto.
- * benchmark/bm_vm4_alive_check1.rb: ditto.
- * benchmark/bm_vm4_pass_flood.rb: ditto.
-
-Wed Jun 15 03:52:50 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_vm4_pass_flood.rb: new benchmark for GVL fairness.
- * benchmark/bm_vm4_alive_check1.rb: ditto.
-
-Wed Jun 15 01:27:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (gvl_yield): fix live lock issue on 1-2 cpus
- system. It's additional fix for r32021.
- * thread_pthread.c (gvl_init): add switch_wait_cond.
- * thread_pthread.h (typedef struct rb_global_vm_lock_struct): ditto.
-
-Tue Jun 14 23:16:22 2011 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (show_progress): refine verbose mode.
- (exec_test): ditto.
-
-Tue Jun 14 23:02:36 2011 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (show_progress): extracted from assert_check.
- (assert_check): use show_progress.
- (assert_normal_exit): ditto.
- (assert_finish): ditto.
- (flunk): ditto.
-
-Tue Jun 14 22:51:42 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/test_*.rb: added tests.
-
-Tue Jun 14 22:09:58 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: renamed some functions.
- * ext/date/date_core.c: modified doc.
-
-Tue Jun 14 21:26:01 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * cont.c (cont_save_thread): add new utility function.
- rb_context_t::saved_thread.machine_stack_start and
- machine_stack_end should be cleared immediately after a snapshot of
- current thread is stored to saved_thread. [ruby-dev:43680] [Bug #4855]
- this change aims to get rid of unnecessary GC mark at machine stack.
-
-Tue Jun 14 19:50:49 2011 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_autoload.rb: remove temporary directory.
-
-Tue Jun 14 11:05:03 2011 Narihiro Nakamura <narihiro@netlab.jp>
-
- * gc.c (rb_gc_set_params): call initial_expand_heap if
- initial_heap_min_slots is set.
-
-Tue Jun 14 11:02:08 2011 Narihiro Nakamura <narihiro@netlab.jp>
-
- * gc.c: use size_t.
-
-Tue Jun 14 01:10:38 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/coverage/test_coverage.rb: add a test for restart. a patch
- from Xavier Shay. [ruby-core:36745]
-
-Tue Jun 14 01:05:10 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/coverage/coverage.c: make it restartable. [ruby-core:36539]
-
-Mon Jun 13 23:55:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
- * thread_pthread.c: remove HAVE_GVL_YIELD macro.
- * thread_win32.c (gvl_yield): new. this fallback logic was moved from
- rb_thread_schedule_rec().
-
-Mon Jun 13 23:50:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/io/console/console.c (console_dev): typo.
-
-Mon Jun 13 23:38:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_parse_string): flush delayed token. based on a
- patch by Masaya Tarui in [ruby-dev:43762]. Bug #4544
-
- * parse.y (yylex): revert r24557. delayed token at the end of
- string should be flushed already by the above change.
-
-Mon Jun 13 23:33:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (console_dev): console should be
- unbuffered.
-
- * ext/io/console/console.c (console_dev): take care of no-ctty
- case.
-
-Mon Jun 13 23:06:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c: rewrite GVL completely. This fix improve some
- benchmark dramatically (e.g. vm3_thread_mutex result changed
- form 120.601sec to 3.426sec).
- * thread_win32.c: ditto.
- * thread_pthread.h: ditto.
- * vm_core.h: ditto.
- * thread.c: ditto.
-
-Mon Jun 13 23:11:52 2011 Tanaka Akira <akr@fsij.org>
-
- * test/socket/test_unix.rb: don't use Thread.abort_on_exception.
-
-Mon Jun 13 23:05:01 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/unixsocket.c (unix_send_io): race condition fixed.
- (unix_recv_io): ditto.
- fixed by Eric Wong. [ruby-core:35574]
-
- * test/socket/test_unix.rb: test added for above problem.
-
-Mon Jun 13 21:41:05 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_win32.c (native_cond_signal): remove unnecessary rb_bug().
- It's additional fix for r32021. [Bug #4696]
-
-Mon Jun 13 20:50:49 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_ec.rb
- test/openssl/test_pkey_ec.rb: merge both files into test_pkey_ec.rb.
- Removed redundant group instantiation from PKey tests.
- * test/openssl/utils.rb: only create TEST_PKEY_EC_P256V1 if EC is
- defined.
-
-Mon Jun 13 20:28:24 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/digest.rb: remove MDC2 from test, it is not available
- by default in an OpenSSL installation.
-
-Mon Jun 13 20:18:55 2011 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h, vm_insnhelper.h: move decl. of
- ruby_vm_global_state_version and related macros
- from vm_core.h to vm_insnhelper.h.
-
- * vm.c (vm_clear_all_cache): added. This function is called
- when ruby_vm_global_state_version overflows.
- TODO: vm_clear_all_inline_method_cache() is only place holder.
- We need to implement it ASAP.
-
- * vm_method.c (vm_clear_global_method_cache): added.
-
-Mon Jun 13 19:46:21 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/cmath.rb: add new method Object#real?. fix #3137
-
-Mon Jun 13 18:52:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (is_kind_of_BigDecimal): new function to
- examine the whether the object is kind of BigDecimal.
-
-Mon Jun 13 18:49:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): use GetVpValueWithPrec
- for Float and Rational arguments.
-
- * test/bigdecimal/test_bigdecimal.rb (test_new, test_cmp, test_power):
- add and modify tests for the above change.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): modify coding style to
- match ruby's standard.
-
-Mon Jun 13 18:33:04 2011 Tanaka Akira <akr@fsij.org>
-
- * lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
- to prevent random number sequence repetition at forked child
- process which has same pid.
- reported by Eric Wong. [ruby-core:35765]
-
-Mon Jun 13 17:02:34 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP#use_ssl?): require 'openssl' only when
- https is needed. fixes r31933.
-
-Mon Jun 13 14:35:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * lib/cmath.rb (CMath.cbrt): returns the principal value of the cube
- root of the argument. fix #3676
-
- * test/test_cmath.rb (test_cbrt_returns_principal_value_of_cube_root):
- test for the above change.
-
-Mon Jun 13 14:17:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * lib/test/unit.rb (Test::Unit::GlobOption#non_options): fix typo.
-
-Mon Jun 13 13:04:20 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_digest.c: fix error for digests that have no oid
- (e.g. DSS1).
- * test/openssl/test_digest.c: add tests for this.
-
-Mon Jun 13 12:51:51 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/yaml.rb: load psych only when syck is not loaded.
-
-Mon Jun 13 12:23:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
-Mon Jun 13 12:23:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/psych/lib/psych/deprecated.rb (Object#to_yaml_properties):
- undef to_yaml_properties before redefine it.
-
- * ext/syck/lib/syck/rubytypes.rb: ditto.
-
-Mon Jun 13 11:30:10 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_digest.c: allow Digests to be created by sn, ln or
- oid.
- * test/openssl/test_digest.rb: add tests for this.
- [Ruby 1.9 - Feature #4412] [ruby-core:35319]
-
-Mon Jun 13 10:54:03 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/pkey_dh.c: corrected documentation.
- * test/openssl/utils.rb: add test key for DH.
- * test/openssl/test_pkey_dh.rb: add tests.
-
-Mon Jun 13 10:13:08 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/pkey_dh.c: clarify difference between DH#public_key and
- DH#pub_key in documentation.
-
-Mon Jun 13 05:50:43 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * NEWS: introduce PKey.read.
-
-Mon Jun 13 05:17:29 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey.c: added PKey.read module function that allows
- reading arbitrary public/private keys from DER-/PEM-encoded File or
- string instances.
- * ext/openssl/ossl_pkey_dh.c: improved documentation.
- * test/openssl/utils.rb: added EC test key.
- * test/openssl/test_pkey_rsa.rb
- test/openssl/test_pkey_dsa.rb: Test PKey.read. Reuse keys from
- OpenSSL::TestUtils.
- * test/openssl/test_pkey_ec.rb: Created test file for EC tests.
- Test PKey.read.
- [Ruby 1.9 - Feature #4424] [ruby-core:35330]
-
-Mon Jun 13 04:42:24 2011 Koichi Sasada <ko1@atdot.net>
-
- * ext/objspace/objspace.c (total_i): fix to skip no ruby objects.
-
-Mon Jun 13 03:07:38 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/benchmark/test_benchmark.rb (capture_output):
- replace '-' as space. On NetBSD, subtract between two Process.times
- after and before the short process may return negative value like:
- t0=Process.times; yield; t1=Process.times; p t1.utime-t0.utime
-
-Mon Jun 13 02:40:23 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_pkey_dsa.rb: Test for DSA#syssign/sysverify.
-
-Mon Jun 13 01:59:19 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey_dh.c: completed documentation.
- * ext/openssl/ossl_pkey_dsa.c: corrected examples. Improved parameter
- sections.
-
-Mon Jun 13 00:25:10 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey_dsa.c: completed documentation.
-
-Sun Jun 12 23:36:46 2011 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb (kill_sub_thread): remove the method. [ruby-core:34185]
-
-Sun Jun 12 21:01:56 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (d_lite_marshal_load): should give converted value.
-
-Sun Jun 12 20:36:30 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: edited doc.
-
-Sun Jun 12 18:12:07 2011 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm3_clearmethodcache.rb: added.
-
-Sun Jun 12 17:40:29 2011 Koichi Sasada <ko1@atdot.net>
-
- * vm_method.c (rb_clear_cache*): update only vm state version.
-
- * vm_method.c (rb_method_entry_get_without_cache, rb_method_entry):
- Fill method cache entry with vm state version, and
- check current vm state version for method (cache) look up.
- This modification speed-up invalidating of global method cache table.
- [Ruby 1.9 - Feature #3905] [ruby-core:36908]
-
-Sun Jun 12 16:19:48 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
-
-Sun Jun 12 15:56:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c: remove th->transition_for_lock. It's thread unsafe.
- [Bug #4723][ruby-dev:43563]
-
-Sun Jun 12 15:47:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c: introduce spurious wakeup safe deadlock check.
- [Bug #4696][ruby-dev:43554]
-
-Sun Jun 12 13:33:52 2011 Koichi Sasada <ko1@atdot.net>
-
- * benchmark/bm_vm3_thread_mutex.rb: remove it.
-
- * benchmark/bm_vm3_thread_mutex[1-3].rb: added 3 benchmarks.
- 1: one thread with one mutex (no contention).
- 2: two threads with one mutex (contention).
- 3: 1000 threads with one mutex (huge number of contention)
- Above removed benchmark was type 3.
- Therefore, this commit adds type 1 and 2 benchmark.
-
-Sun Jun 12 11:16:59 2011 Tanaka Akira <akr@fsij.org>
-
- * io.c: use select() appropriately for sendfile().
- Fixed by Eric Wong. [ruby-core:36150]
- (maygvl_copy_stream_wait_readwrite): removed.
- (nogvl_copy_stream_sendfile): use nogvl_copy_stream_wait_write and
- maygvl_copy_stream_wait_read instead of
- maygvl_copy_stream_wait_readwrite.
-
-Sun Jun 12 09:32:13 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * atomic.h (ATOMIC_OR): _InterlockedOr is not available on mingw.h
- * gc.c (rb_gc_set_params): VM_OBJSPACE is disabled on mingw.
-
-Sun Jun 12 01:07:09 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: edited doc.
-
-Sat Jun 11 23:18:00 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT,
- RUBY_VM_SET_FINALIZER_INTERRUPT): use atomic ops for preventing
- interrupt_flag bit lost. [Bug #4770][ruby-dev:43467]
- * thread.c (rb_threadptr_execute_interrupts_rec): ditto.
- * vm_core.h (typedef struct rb_thread_struct): change type of
- interrupt_flag to rb_atomic_t.
- * atomic.h: move atomic ops definition from signal.c.
- * signal.c: remove atomic ops definition.
- * common.mk (gc, signal, thread, cont): add to dependency to atomic.h.
-
-Sat Jun 11 23:23:52 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: edited doc.
-
-Sat Jun 11 23:02:36 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/lib/openssl/buffering.rb (module OpenSSL):
- Buffering#each_byte should return String in accordance with IO in
- 1.9.
-
- * test/openssl/test_buffering.rb (class OpenSSL): add tests for getc
- and each_byte.
-
-Sat Jun 11 22:41:37 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * time.c: a correction of doc for strftime (%v).
-
-Sat Jun 11 22:30:53 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: replaced doc for strftime based on Time's one.
-
-Sat Jun 11 22:07:56 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (datetime_s_{iso8601,rfc3339,xmlschema,rfc2822,httpdate}):
- do not take argument comp.
-
-Sat Jun 11 21:58:31 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: added examples.
-
-Sat Jun 11 19:40:45 2011 Narihiro Nakamura <authornari@gmail.com>
-
- * gc.c: expand heap if initial_heap_min_slots is bigger than
- HEAP_MIN_SLOTS.
-
-Sat Jun 11 19:42:50 2011 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ChangeLog (vim): set shiftwidth to 2.
-
-Sat Jun 11 19:27:06 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_x509req.c: raise RequestError instead of
- CertificateError when Request#to_der gets an error from OpenSSL.
- Patch from Ippei Obayashi, see #4420. I cannot write a test for
- this... Request does not allow to create broken bytes...
-
-Sat Jun 11 19:34:51 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (Date::(ABBR_)?(MONTH|DAY)NAMES): should be usascii.
-
-Sat Jun 11 19:24:33 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: rewrote doc.
-
-Sat Jun 11 19:04:15 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::GlobOption#non_options): should run
- with 1.8.
-
-Sat Jun 11 18:05:57 2011 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * bootstraptest/runner.rb: should initialize $stress to avoid warnings.
-
-Sat Jun 11 18:02:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_getc): should be 7bit if ascii. fixes #4557
-
-Sat Jun 11 16:52:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (rb_enc_uint_chr): fix message format. Bug#4869
-
-Sat Jun 11 16:28:25 2011 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/formatters/pretty.rb
- (REXML::Formatters::Pretty#write_text),
- test/rexml/test_core.rb
- (Tester#test_pretty_format_long_text_finite): don't ignore
- 'width' parameter in pretty formatter. fixes #4498
- Reported by Michael Frasca. Thanks!!!
-
-Sat Jun 11 16:11:36 2011 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_core.rb
- (Tester#test_pretty_format_long_text_finite): remove needless
- assert_nothing_raised.
-
-Sat Jun 11 16:04:03 2011 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/parsers/xpathparser.rb
- (REXML::Parsers::XPathParser#parse),
- test/rexml/test_elements.rb
- (ElementsTester#test_each_with_frozen_condition):
- don't modify original XPath. fixes #4161
- Reported by Pavel Shved. Thanks!!!
-
-Sat Jun 11 15:53:27 2011 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_elements.rb (ElementsTester): remove needless
- prefix from test name.
-
-Sat Jun 11 15:36:36 2011 Martin Duerst <duerst@it.aoyama.ac.jp>
- * common.mk: fixed a grammatical error
-
-Sat Jun 11 14:20:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm.c (thread_memsize): don't ignore size of th->local_storage.
-
-Sat Jun 11 10:32:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
- installed prefix contains spaces.
-
-Sat Jun 11 10:20:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (native_cond_timeout): wrap conditionally used
- label.
-
- * thread_pthread.c (native_sleep): remove unused variable.
-
-Sat Jun 11 10:15:50 2011 Tanaka Akira <akr@fsij.org>
-
- * thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract
- rb_thread_t from VALUE.
- reported by Motohiro KOSAKI. [ruby-dev:43700]
-
-Sat Jun 11 10:00:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_process_options): add missing return type.
-
-Fri Jun 10 23:18:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with
- rb_thread_check_ints(). Because current code can't be compiled.
-
-Fri Jun 10 16:38:13 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_locale_charmap): When ruby process is run as Windows
- Service the console codepage is not set, GetConsoleCP returns 0.
- So on such environment, use GetACP().
- http://blogs.msdn.com/b/michkap/archive/2005/02/08/369197.aspx
- patched by Rafal Bigaj [ruby-core:36832] [Bug #4854]
-
-Fri Jun 10 14:34:24 2011 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: restore TESTRUN_SCRIPT to "$(srcdir)/test.rb".
- TESTRUN_SCRIPT is used by "make run", "make gdb" and so on.
-
-Fri Jun 10 13:01:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_module.rb (TestModule#remove_rake_mixins): remove all
- module related to Rake.
-
-Fri Jun 10 09:52:38 2011 Eric Hodel <drbrain@segment7.net>
-
- * encoding.c: Mention that Encoding.compatible? can work with more
- than just Strings.
-
-Fri Jun 10 02:25:53 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych.rb: updating version to match released gem.
-
-Fri Jun 10 01:06:29 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/bigdecimal (BigDecimal_to_i): Integer#** may return flonum.
-
-Fri Jun 10 00:35:12 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (string_to_c_internal): uses rb_reg_nth_match;
- * rational.c (string_to_r_internal): ditto.
-
-Fri Jun 10 00:25:03 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * gc.c: remove an unused declaration.
-
-Fri Jun 10 00:24:04 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * rational.c (string_to_r): Rational#** may return flonum.
-
-Thu Jun 9 23:57:53 2011 Tanaka Akira <akr@fsij.org>
-
- * io.c: fix IO.copy_stream interrupt handling.
- based on the patch by Eric Wong. [ruby-core:36156]
-
- * vm_core.h (rb_thread_call_with_gvl): don't declare here.
-
- * thread.c: include internal.h.
- (rb_thread_execute_interrupts): new function.
-
- * internal.h (rb_thread_execute_interrupts): declared.
- (rb_thread_call_with_gvl): declared.
-
-Thu Jun 9 23:34:01 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * gc.c (rb_objspace_call_finalizer): use rb_typeddata_is_kind_of() for
- type check to get rid of a double free when main Thread has singleton
- class. [ruby-core:36741] [Bug #4828]
- * thread.c (rb_obj_is_mutex): add a new utility function.
- * vm.c (rb_obj_is_thread): ditto.
-
-Thu Jun 9 22:53:49 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/ruby/test_thread.rb (TestThread#test_kill_thread_subclass):
- add test for Thread.kill with Thread subclass instance.
-
-Thu Jun 9 22:31:47 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/ruby/test_thread.rb (TestThread#test_kill_wrong_argument):
- test for [ruby-core:35086].
- partially forward porting r31402 from ruby_1_9_2 branch.
-
-Thu Jun 9 18:36:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * string.c: Fix the ambiguous description of the behavior of
- rb_str_aref_m with a range. It returns nil when the beginning of
- the range is greater than the end of the string rather than the range.
-
-Thu Jun 9 10:57:03 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read
- from YAML files.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Hash subclasses can be
- dumped to YAML files.
- * test/psych/test_hash.rb: corresponding test.
-
-Thu Jun 9 09:18:51 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: Ruby modules can be loaded
- from YAML files.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby modules can be
- dumped to YAML files.
- * test/psych/test_class.rb: corresponding test.
-
-Thu Jun 9 09:05:04 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
- from YAML files.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be
- dumped to YAML files.
- * test/psych/test_class.rb: corresponding test.
-
-Wed Jun 8 21:38:57 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * cont.c (root_fiber_alloc): set root fiber's status RUNNING.
- in cont_mark() only RUNNING fiber's machine stack is marked.
- root fiber's status should be RUNNING at the beginning regardless of
- FIBER_USE_NATIVE. [ruby-core:36735] fixes #4827
-
-Tue Jun 7 20:50:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * doc/irb/irb.rd: fix typo. patch by Nobuhiro IMAI.
- [Bug #4843] [ruby-dev:43639]
- * doc/irb/irb.rd.ja: ditto.
- * doc/ChangeLog-YARV: ditto.
-
-Tue Jun 7 18:52:55 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
- Windows has been fixed at r29969.
-
- * test/rubygems/test_gem_stream_ui.rb: now can run tests.
-
-Tue Jun 7 18:36:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,
- test_self_user_home_user_drive_and_path}): should simply ignore
- meaningless tests instead of skipping them.
-
-Tue Jun 7 18:15:00 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
- should show some messages when skipping tests.
-
-Tue Jun 7 13:59:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/date/date_core.c (date_s_today, datetime_s_now): check the
- result of localtime_r().
-
-Tue Jun 7 13:36:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
- command line escape issues on Windows. fixed #4835.
-
-Tue Jun 7 03:18:45 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_io.rb (TestIO#test_s_{,bin}write): do not create a
- file under /tmp. [Bug #4846]
-
-Mon Jun 6 22:51:43 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * cont.c: use #if FIBER_USE_NATIVE instead of #ifdef.
- you can suppress use of setcontext for Fiber with compile option
- -DFIBER_USE_NATIVE=0
-
-Mon Jun 6 21:59:23 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/test_switch_hitter.rb: added a test.
-
-Mon Jun 6 21:37:45 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: added notes.
-
-Mon Jun 6 21:02:12 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: flattened format to strftimev.
- * ext/date/date_core.c (date_strftime_internal): taints run.
-
-Mon Jun 6 15:10:17 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/{defines,missing}.h (rb_infinity, rb_nan): move from
- defines.h to missing.h. (couldn't use RUBY_EXTERN there.)
-
-Mon Jun 6 14:35:48 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/rdoc/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#
- {test_include_file,test_include_file_encoding_incompatible}): no
- need to write such workaround. don't hide the bug of ruby. (and the
- bug is already fixed.)
-
-Mon Jun 6 14:11:11 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/date/date_core.c (valid_jd_sub): need to convert from VALUE to
- double.
-
- * ext/date/date_core.c (offset_to_sec): get rid of a compiler warning.
-
-Mon Jun 6 14:09:08 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/defines.h (rb_infinity, rb_nan): export for Windows.
-
-Mon Jun 6 10:54:45 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb(Test::Unit::Runner#puke):
- Add overriding from MiniTest::Unit#puke. This reverts minitest's fix
- that skip messages are hidden when not verbose mode (-v option).
- To hide skip messages, use --hide-skip option instead.
-
-Mon Jun 6 10:52:13 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: don't use autoload.
-
-Mon Jun 6 09:39:43 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/parser.c (parse): release event objects to plug memory
- leak. Thanks Mark J. Titorenko!
-
-Sun Jun 5 23:26:15 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * eval.c: remove rb_thread_stop_timer_thread function declaration.
- Instead, include vm_core.h.
- * process.c: ditto.
-
-Sun Jun 5 21:38:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (thread_timer): add to care a spurious wakeup.
- When native_cond_timedwait() return 0 by spurious wakeup, we
- don't have to neither 1) call timer_thread_function and 2)
- exit the timer thread.
-
-Sun Jun 5 17:50:01 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (m_real_cwyear): new. derived from m_cwyear.
- * ext/date/date_strftime.c: trivial changes.
-
-Sun Jun 5 17:22:01 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/config_list.in: add new options for tcltklib.
-
-Sun Jun 5 10:06:50 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_tmx.h: now does not place decoded data. allows to
- access indirectly via functions on demand.
- * ext/date/date_strftime.c: ditto.
- * ext/date/date_core.c: ditto.
- * ext/date/date_core.c ({d|dt}_lite_to_s): use strftime.
-
-Sun Jun 5 06:22:02 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * NEWS: wrote about changes of date.
-
-Sat Jun 4 16:59:26 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (d_lite_inspect): changed the format.
- * ext/date/date_core.c: refactoring and fixing some bugs.
-
-Sat Jun 4 11:30:57 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (check_mix_method_i, do_mix_method_i): not mix methods
- renamed as nil.
-
-Sat Jun 4 04:04:41 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/rubygems/test_gem_commands_which_command.rb:
- "missing" exists on ruby's top source directory. [Bug #4815]
-
-Fri Jun 3 21:48:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rubygems/test_case.rb: Refix for test-all in separate directory.
- r31147 + r31151.
-
-Fri Jun 3 20:58:47 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/date/date_core.c (d_lite_plus): get rid of compiler warnings.
-
-Fri Jun 3 20:56:40 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/missing.h, numeric.c (round): moved prototype of round()
- from numeric.c to missing.h. (note: round() is C99 feature, so ruby
- provides it if not exist in C runtime.)
-
-Fri Jun 3 20:42:04 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/parallel.rb: Keep $stdin, $stdout before run testcase
- and restore after run. Because some test break $stdin, $stdout.
- Fixes [Bug #4433] [ruby-core:35353]
-
-Fri Jun 3 19:58:14 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (io_fflush): windows -- call fsync() only when the FD is tied to
- file, because if the FD is pipe, it blocks.
-
-Fri Jun 3 09:27:31 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (URI::HTTP#request_uri): return nil when the uri
- is path-rootless form. Bug #4759
-
-Thu Jun 2 23:51:03 2011 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Improve the line ending detection algorithm
- patch by Alexey).
-
-Thu Jun 2 20:05:57 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_s_write, rb_io_s_binwrite): return!!!
-
-Thu Jun 2 16:29:34 2011 Shota Fukumori <sorah@tubusu.net>
-
- * io.c: Add File.write, File.binwrite. [Feature #1081] [ruby-core:21701]
-
- * test/ruby/test_io.rb: Test for File.write, File.binwrite.
-
- * NEWS: News for above.
-
-Thu Jun 2 12:33:09 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (io_fflush, rb_io_flush): need to fsync() when ruby calls
- internal flush. [ruby-core:36670] [Bug #4813]
-
-Thu Jun 2 07:56:24 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: reduce CPU power required by an eventloop.
-
-Tue May 31 21:28:33 2011 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
- redirect stderr to null device.
-
-Thu Jun 2 00:45:26 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: fix for uninitialized global variables.
- [Ruby 1.9 - Bug #4811]
-
-Wed Jun 1 21:57:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (native_sleep): fix 1000times calculation error.
- this is a regression since r31457. [Bug #4808] [ruby-dev:43606]
-
-Wed Jun 1 17:19:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c: remove unused macro.
-
-Wed Jun 1 15:42:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (peek_n): new macro to see next nth char.
-
-Wed Jun 1 15:40:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb (gem): fix for rubygems change.
-
-Wed Jun 1 14:07:57 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*: Imported minitest 2.2.2 (r6281)
- * test/minitest/*: ditto
-
-Wed Jun 1 12:35:50 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/rubygems*: Import rubygems 1.8.5 (released @ 137c80f)
- * test/rubygems: Ditto
-
-Wed Jun 1 12:34:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * NEWS: add new features of bigdecimal.
-
-Wed Jun 1 09:41:14 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/cgi/util.rb: Improve documentation. Patch by Kuba Fietkiewicz.
- [Ruby 1.9 - Bug #4775]
- * lib/cgi/core.rb: ditto
-
-Wed Jun 1 09:26:05 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/mathn.rb: Improve documentation and attach it to Numeric.
- Modified from patch by Anil V. [Ruby 1.9 - Bug #4762]
-
-Wed Jun 1 09:21:30 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/prime.rb: Indent examples enough to appear as code sections.
- Note that Prime is Enumerable. [#4762]
-
-Wed Jun 1 07:34:57 2011 Eric Hodel <drbrain@segment7.net>
-
- * hash.c (key_i): Change rdoc from "the first occurrence" to "an
- occurrence" since first occurrence is not a specification of
- Hash#key. [Ruby 1.9 - Bug #4760]
-
-Wed Jun 1 07:26:19 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/pty/pty.c (pty_check): Restore "not reached" comment.
- [Ruby 1.9 - Bug #4756]
-
-Wed Jun 1 07:21:40 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/zlib/zlib.c: Fix document-method declarations for set_sync and
- set_comment. [Ruby 1.9 - Bug #4695]
-
-Wed Jun 1 06:43:13 2011 Masaya Tarui <tarui@ruby-lang.org>
-
- * load.c (loaded_feature_path): cut nonsense loop execution to fix
- performance bug.
-
-Wed Jun 1 01:16:02 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (rb_mix_module): implement Module#mix.
-
-Wed Jun 1 01:15:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_encoding_set): should honor already set ecflags since it
- might be set by mode option. fixed #4804
-
-Wed Jun 1 00:34:04 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): remove unused
- variable.
-
-Wed Jun 1 00:32:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): support instantiation from
- a Float through Rational.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_new): ditto.
-
- * test/bigdecimal/test_bigdecimal.rb (test_global_new_float): add a test for
- the above changes.
-
- * test/bigdecimal/test_bigdecimal.rb (test_new_with_float): ditto.
-
-Wed Jun 1 00:07:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): support coerce with a
- Rational. The precision used for instantiate a BigDecimal from the
- given Rational is obtained from the receiver BigDecimal.
-
- * test/bigdecimal/test_bigdecimal.rb (test_coerce): add a test for the
- above change.
-
-Tue May 31 23:49:08 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (offset_to_sec): fixed invalid validation.
-
-Tue May 31 23:43:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): replace the algorithm for
- coercing from a Rational to stop requiring "bigdecimal/util.rb".
- [ruby-core:34318]
-
- * ext/bigdecimal/bigdecimal.c (GetVpValue): refactoring.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation from a
- Rational.
-
- * test/bigdecimal/test_bigdecimal.rb (test_global_new_with_rational): add a
- test for the above change.
-
- * test/bigdecimal/test_bigdecimal.rb (test_new_with_rational): ditto.
-
-Tue May 31 22:44:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation a
- BigDecimal object from an Integer.
-
- * test/bigdecimal/test_bigdecimal.rb (test_new_with_integer):
- add for testing the above change.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): replace its body
- with a BigDecimal_new call.
-
- * test/bigdecimal/test_bigdecimal.rb (test_global_new_with_integer):
- add for testing the above change.
-
-Tue May 31 22:24:39 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: use simple/complex mode instead of light/right mode.
- * test/date/*.rb: followed the above changes.
-
-Tue May 31 21:28:33 2011 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
- initialize SIGINT handler.
-
-Tue May 31 17:03:24 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * lib/net/http.rb, lib/net/protocol.rb: Allow to configure to wait
- server returning '100 continue' response before sending HTTP request
- body. See NEWS for more detail. See #3622.
- Original patch is made by Eric Hodel <drbrain@segment7.net>.
-
- * test/net/http/test_http.rb: test it.
-
- * NEWS: Add new feature.
-
-Tue May 31 14:17:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_s_pipe): potential bug. the mode of read IO is set as
- DEFAULT_TEXTMODE in call of io_set_encoding(), and of write IO is
- also set as it in call of io_new_instance() via rb_protect().
- so, if DEFAULT_TEXTMODE is not 0, we should check the result of
- extract_binmode() and avoid crush of default IO mode and the result.
-
-Tue May 31 13:00:17 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * strftime.c (rb_strftime_with_timespec): improved style consistency.
- constified some variables.
-
- * test/test_time.rb (TestTime#test_huge_precision): test for #4456.
-
-Tue May 31 12:53:10 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/io/wait/test_io_wait.rb (TestIOWait#{test_nread,test_ready?,
- test_wait}: give system some time to process the written data.
-
-Tue May 31 12:40:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_io.rb (TestIO#test_open_mode): MUST release resources
- explicitly. fix problem of r31671
-
-Tue May 31 10:49:55 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_exec.c: remove conditions for clang
- because clang version 3.0 (trunk 132165) doesn't need them.
-
-Mon May 30 22:19:33 2011 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_signal.rb (TestSignal#test_signal_requiring): don't
- close stderr.
-
-Mon May 30 20:22:00 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_signal.rb (TestSignal#test_signal_requiring): small
- but critical typo of r31642. sorry...
- [Bug #4798] [ruby-core:36550]
-
-Mon May 30 15:44:16 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * insns.def (opt_mult): as r31805, volatile it.
- Without this, clang -O fails calculation.
-
- * numeric.c (fix_mul): ditto.
-
- * rational.c (f_imul): ditto.
-
-Mon May 30 10:26:51 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (int_pow): make sure to assign the result of x * z.
- If xz is optimized out, the value won't overflow.
-
-Sun May 29 23:17:29 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_match): fix rdoc of Regexp#=~.
- patched by Tsuyoshi Sawada. [Bug #4781]
-
-Sun May 29 23:10:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/https.rb (WEBrick::HTTPRequest#parse_uri):
- keep parse_uri as private. patched by okkez. [Bug #4773]
-
-Sun May 29 17:53:03 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * numeric.c: add #include "internal.h" for rb_big_uminus() prototype.
-
-Sun May 29 15:09:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_round): fix for negative value.
-
-Sun May 29 02:16:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/net/http/utils.rb (TestNetHTTPUtils#teardown): add nil check.
-
-Sun May 29 00:22:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (before_exec, after_exec): change from macro to function.
-
-Sat May 28 19:30:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (before_exec, after_exec): change SIGPIPE handler to SIG_DFL
- before calling execve(). Because r31760 reintroduced an issue that
- system() may hang up (i.e. [ruby-dev:12261]).
- * process.c (save_sigpipe, restore_sigpipe): new.
-
-Sat May 28 16:08:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * signal.c (Init_signal, default_handler): change default SIGPIPE handler
- from empty function to SIG_IGN. [ruby-dev:43215]
- * signal.c (sigpipe): removed.
-
-Sat May 28 03:04:27 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
-
-Sat May 28 02:22:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * string.c (rb_str_bytesize): rb_str_bytesize() should use LONG2NUM().
- Patch by Nikolai Weibull. [Bug #4789] [ruby-core:36511]
-
-Sat May 28 02:06:26 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (fill_cbuf): Fix test-all crash.
-
-Sat May 28 00:58:40 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/ostruct.rb (method_missing): Handle [] and []= correctly.
- Based on a patch by Caius Durling, bug #4179 [ruby-core:33792]
-
-Fri May 27 23:56:54 2011 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_core.rb (Tester::test_text_frozen): split frozen
- string test. refs #4783
-
-Fri May 27 22:46:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb (gem): install gemspec of json. fixed #4784
-
-Fri May 27 22:45:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (validate_enc_binmode): do not clear textmode flag if
- default. fixed #4732
-
- * io.c (fill_cbuf): finish reading at EOF.
-
-Fri May 27 11:31:51 2011 misfo <tedwardo2@gmail.com>
-
- * lib/rexml/text.rb (REXML::Text#initialize): prevent an error
- when passing a frozen string to REXML::Text.new
-
- dup the string passed in instead of cloning so that it's frozen
- state is ignored
-
-Fri May 27 08:47:26 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * thread.c (ppoll): typo bug fix.
-
-Fri May 27 08:35:04 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
-
- * ext/tk/lib/tk/extconf.rb: cannot make on MinGW [Ruby 1.9 - Bug #4141].
-
-Thu May 27 00:34:07 2011 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Enhance each() to support Enumerator.
-
-Thu May 26 10:32:11 2011 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Documentation improvements from Ysiad Ferreiras.
- [Ruby 1.9 - Bug #4785]
-
-Thu May 26 15:42:02 2011 Cezary Baginski <cezary.baginski@gmail.com>
-
- * lib/xmlrpc/parser.rb (FaultException): fix to_s and inspect
-
- * test/xmlrpc/parser.rb: test for the above
-
-Wed May 25 11:54:31 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/curses/curses.c: Remove color constants block.
- [Ruby 1.9 - Bug #4748]
-
-Wed May 25 09:56:45 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/curses/curses.c: Add missing documentation for button state, MIN
- and MAX comments. Add Curses. to TABSIZE= and ESCDELAY= methods.
- [Ruby 1.9 - Bug #4747]
-
-Wed May 25 09:35:31 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/benchmark.rb: Restore nodoc for Benchmark::Job and
- Benchmark::Report. [Ruby 1.9 - Bug #4726]
-
-Wed May 25 09:29:38 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/pop.rb: Hide implementation details from RDoc.
- [Ruby 1.9 - Bug #4711]
-
-Wed May 25 09:26:29 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/ftp.rb: Add :nodoc: for private methods.
- [Ruby 1.9 - Bug #4710]
-
-Wed May 25 09:19:17 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/zlib/zlib.c: Fix Document-method declarations. Improve
- Zlib::GzipFile's method catalog. [Ruby 1.9 - Bug #4695]
-
-Wed May 25 08:22:12 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/erb.rb: Hide documentation for implementation details of ERB.
- [Ruby 1.9 - Bug #4694]
-
-Wed May 25 07:58:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile.{mkdir,rmdir}): revert for backward
- compatibility.
-
-Wed May 25 07:13:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * spec/README: update the description.
-
-Wed May 25 07:12:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
-
-Tue May 24 17:30:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * spec/README: fix typo.
- patched by bowsersenior. https://github.com/ruby/ruby/pull/24
-
-Tue May 24 07:06:34 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on
- some environment (reported on [ruby-talk:381444]).
-
- * ext/tk/lib/tk/canvas.rb: support creating a canvas item object from
- an item ID number.
-
- * ext/tk/lib/tk/image.rb: import documents which are pull-requested.
- [Ruby 1.9 - Feature #4595]
-
- * ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g.
- /usr/lib64), add some new configure options (see README.tcltklib),
- and bug fix.
-
- * ext/tk/lib/tk/README.tcltklib: modify docs for some new configure
- options.
-
-Tue May 24 04:01:46 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/yaml.rb: switch default YAML engine to Psych, old syck engine
- may be enabled via YAML::ENGINE.yamler = "syck". [ruby-core:36374]
-
-Mon May 23 09:45:26 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. Forgot to
- include this file in the commit r31692. __APPLE__ is not
- CASEFOLD_FILESYSTEM again, from this time.
-
-Mon May 23 10:01:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Do not parse zero-tagged values as EOC. Do
- not let current length become negative for infinite length constructed
- values. Support constructed values of length zero. Added tests.
-
-Mon May 23 09:19:53 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/smtp.rb: Document Net::SMTP::Response. Patch by J.R. Garcia.
- [Ruby 1.9 - Bug #4768]
-
-Mon May 23 09:03:52 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/parallel.rb: Never Ignore SIGINT. When received
- Interrupt, immediately puts result and exit. [ruby-dev:43571]
-
- * lib/test/unit.rb: When received Interrupt, wait results from workers
- and collect them. [ruby-dev:43571]
-
-Mon May 23 09:08:07 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/mathn.rb: Improve documentation. Patch by Sandor Szucs.
- [Ruby 1.9 - Bug #4767]
-
-Mon May 23 08:45:55 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/ostruct.rb: Improve documentation. Patch by Franklin Webber.
- [Ruby 1.9 - Bug #4761]
-
-Mon May 23 08:35:24 2011 Eric Hodel <drbrain@segment7.net>
-
- * hash.c: Improve documentation of Hash#key. Patch by Utkarsh
- Kukreti. [Ruby 1.9 - Bug #4760]
-
-Mon May 23 08:32:59 2011 Eric Hodel <drbrain@segment7.net>
-
- * enumerator.c: Improve documentation. Patch by Dave Copeland.
- [Ruby 1.9 - Bug #4757]
-
-Mon May 23 07:19:45 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * NEWS (openssl): Infinite length support. Different behavior of
- Constructive and Primitive constructors.
-
-Mon May 23 06:58:33 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Forbid Constructives whose value is not an
- Array to prevent segfault. Added test.
-
-Mon May 23 06:33:17 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Forbid Constructive without infinite
- length. This also prevents a segfault. Added test and improved
- documentation.
-
-Mon May 23 05:58:14 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Fix decoding of infinite length values.
- Simplified ossl_asn1_decode0 by splitting it into three separate
- functions. Add tests.
- [Ruby 1.9 - Bug #4374][ruby-core:35123]
-
-Mon May 23 04:03:46 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): Allow creation of
- Constructives with an explicit tag_class parameter without
- automatically setting tagging to :EXPLICIT. Fixes a bug when encoding
- infinite length primitive values.
-
-Mon May 23 04:03:46 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_cons_to_der): Add an additional
- EOC for infinite length Constructives that are supposed to be encoded
- with explicit tagging. Also tabify method correctly.
-
-Mon May 23 03:44:39 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1data_to_der): Remove redundant
- flag tmp_cons.
-
-Mon May 23 00:35:00 2001 Kenta Murata <mrkn@mrkn.jp>
-
- * bignum.c (dump_bignum, bigmul1_balance, big_split, biglsh_bang),
- (bigrsh_bang, big_split3, bigmul1_toom3, bigmul0): implement Toom3 (Toom-Cook)
- multiplication.
-
- * include/ruby/defines.h: add format prefixes for BDIGIT and BDIGIT_DBL.
-
-Sun May 22 23:24:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Instead of rb_intern use static symbols to
- improve performance.
-
-Sun May 22 21:56:51 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Use OpenSSL constants V_ASN1_xxx instead of
- hardcoded numbers for initializing class_tag_map.
-
-Sun May 22 21:29:29 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255.
- Now __APPLE__ is not CASEFOLD_FILESYSTEM again.
-
- * load.c (loaded_feature_path, rb_feature_p, load_lock): Revert r30508.
- See #4255. Make $LOADED_FEATURES scanning case-sensitive again.
-
-Sun May 22 18:59:27 2011 Hiroshi Nakamura <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_asn1.c(ossl_asn1_default_tag): avoid using RCLASS_SUPER
- to make it compilable. Plus, tabify and change variable definition style.
-
-Sun May 22 18:26:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (vm_xcalloc): use calloc provided by platforms.
- fixes #4754
-
-Sun May 22 11:44:53 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/pty/pty.c: Improve documentation. Patch by David Copeland.
- [Ruby 1.9 - Bug #4756]
-
-Sun May 22 11:26:39 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/timeout.rb: Improve documentation. Patch by David Copeland.
- [Ruby 1.9 - Bug #4755]
-
-Sun May 22 11:21:41 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/ipaddr.rb: Improve documentation. Patch by Sandor Szucs.
- [Ruby 1.9 - Bug #4753]
-
-Sun May 22 11:14:40 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/forwardable.rb: Document def_delegator. Patch by Sandor Szucs.
- [Ruby 1.9 - Bug #4752]
-
-Sun May 22 11:11:41 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/fileutils.rb: Document block behavior of FileUtils.cd. Patch by
- Bil Kleb. [Ruby 1.9 - Bug #4751]
-
-Sun May 22 11:07:47 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/curses/curses.c: Complete documentation. Patch by Vincent
- Batts. [Ruby 1.9 - Bug #4748]
-
-Sun May 22 09:29:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
- use spawn. it prevent that other tests inherit renamed $0.
-
-Sun May 22 08:57:13 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Default tag lookup in constant time via hash
- instead of previous linear algorithm.
- [Ruby 1.9 - Feature #4309][ruby-core:34813]
-
-Sun May 22 07:54:16 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_digest.c: Explain DSS and DSS1 in documentation.
-
-Sun May 22 07:10:25 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_pkey_dsa.rb: Add tests for sign/verify.
-
-Sun May 22 06:07:17 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_x509cert.rb: Merge DSA-related tests from ruby_1_8
- branch.
-
-Sun May 22 04:11:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (Init_Thread): add a code comment why the meaningless
- line is necessary.
-
-Sun May 22 01:35:12 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: modified documentation.
-
-Sat May 21 22:46:26 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_strftime(date_strftime_with_tmx): "%v" means "%e-%b-%Y".
-
-Sat May 21 22:14:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_io_extract_modeenc): accept combination hash and
- File::Constants. (eg. File.open('yo', :mode => File::WRONLY))
- [Feature #4742][ruby-core:36338]
- * test/ruby/test_io.rb (TestIO#test_open_mode): new test.
-
-Sat May 21 21:44:14 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/test_switch_hitter.rb: new.
-
-Sat May 21 21:18:29 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_{core,parse}.c: moved nearly all core code from ext/date/lib.
- * ext/date/lib/{date,date/format}.rb: removed nearly all code.
-
-Sat May 21 02:58:46 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/.document: Add curses to documented extensions.
- * ext/curses/curses.c: Improve documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #4747]
-
-Sat May 21 02:51:01 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/bigdecimal/lib/bigdecimal/util.rb: Improve documentation. Patch
- by Pete Higgins. [Ruby 1.9 - Bug #4746]
-
-Sat May 21 02:44:10 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/bigdecimal/lib/bigdecimal/jacobian.rb: Document isEqual. Patch
- by Kuba Fietkiewicz. [Ruby 1.9 - Bug #4744]
-
-Sat May 21 02:22:34 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/date/lib/date/format.rb: Document date formats. Patch by
- Clinton Nixon. [Ruby 1.9 - Bug #4743]
-
-Fri May 20 05:15:19 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-
- * gc.c: Fix build on m68k by 'error: too few arguments to
- function 'mark_locations_array''.
-
-Fri May 20 04:23:42 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/scanf.rb: Improve documentation. Patch by Gabe McArthur.
- [Ruby 1.9 - Bug #4735]
-
-Fri May 20 00:58:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/trans/ibm737-tbl.rb: greek code page. fixes #4738
-
-Thu May 19 14:44:05 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_signal.rb (test_signal_requiring): skip on Windows.
- we can send SIGINT only to pid 0 and the process itself.
-
-Thu May 19 09:07:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib: revert r31635-r31638 and untabify with expand(1).
-
-Thu May 19 07:47:26 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_pkey_rsa.rb: Add tests for sign/verify.
-
-Thu May 19 07:19:16 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey.c: Add documentation.
-
-Thu May 19 07:06:56 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/benchmark.rb: Fix indentation.
- * lib/net/imap.rb: Fix indentation of regular expressions.
-
-Thu May 19 06:36:11 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/imap.rb: Fix indentation of EOF for heredoc.
- * lib/debug.rb (Commands): Fix indentation of EOHELP for heredoc.
-
-Thu May 19 06:30:38 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/mkmf.rb: Fix indentation of EOM for heredoc.
-
-Thu May 19 06:16:41 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib: Convert tabs to spaces for ruby files per
- http://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
- Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
- Patch by Jason Dew [Ruby 1.9 - Feature #4718]
-
-Thu May 19 06:06:07 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/cgi/util.rb: Improve documentation. Patch by Clinton Nixon.
- [Ruby 1.9 - Bug #4733]
- * lib/cgi/core.rb: ditto
- * lib/cgi/cookie.rb: ditto
-
-Thu May 19 06:02:21 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/tempfile.rb: Document Dir.mkdir and Dir.rmdir. Patch by Clinton
- Nixon. [Ruby 1.9 - Bug #4728]
-
-Thu May 19 05:57:52 2011 Eric Hodel <drbrain@segment7.net>
-
- * encoding.c: Improve documentation for Encoding#default_external and
- Encoding#default_internal.
-
-Wed May 18 22:45:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/lib/console/size.rb (IO#console_size): new
- method. (EXPERIMENTAL)
-
-Wed May 18 22:41:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * internal.h: add for internal use only.
-
-Wed May 18 22:36:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (setup_exception): internal exception should be hidden
-
-Wed May 18 20:25:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
- exception. [Bug #4283] [ruby-core:34534].
-
-Wed May 18 06:09:24 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/cmath.rb: Add some examples and improve documentation. Patch by
- Sandor Szucs. [Ruby 1.9 - Bug #4727]
-
-Wed May 18 05:40:31 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/benchmark.rb: Remove nodoc from Benchmark::Job and
- Benchmark::Report. Patch by Sandor Szucs. [Ruby 1.9 - Bug #4726]
-
-Wed May 18 05:29:26 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/compat.rb: Improve documentation. Patch by Sandor
- Szucs. [Ruby 1.9 - Bug #4725]
-
-Wed May 18 05:10:35 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/tracer.rb: Improve documentation. Patch by Richard Ramsden.
- [Ruby 1.9 - Feature #4720]
-
-Wed May 18 04:53:41 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/cmath.rb: Improve documentation. Patch by Jason Dew.
- [Ruby 1.9 - Feature #4717]
-
-Wed May 18 04:50:24 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/ftp.rb: Improve documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #4710]
-
-Wed May 18 03:14:49 2011 Eric Hodel <drbrain@segment7.net>
-
- * test/test_singleton.rb: Add tests from lib/singleton.rb. Patch by
- Pete Higgins. [Ruby 1.9 - Bug #4715]
-
-Wed May 18 03:03:07 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/singleton.rb: Improve documentation. Patch by Pete Higgins.
- [Ruby 1.9 - Bug #4709]
-
-Tue May 17 21:24:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_mutex_lock): remove remove_signal_thread_list() call.
- It's meaningless because lock_interrupt doesn't call
- add_signal_thread_list().
-
-Tue May 17 20:20:49 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_core.h (rb_thread_struct): add volatile to
- transition_for_lock because it is not protected by lock.
-
-Tue May 17 20:08:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * LEGAL (missing/{elf,tgamma,lgamma_r}.c): they've been replaced by
- public domain implementations.
-
- * LEGAL (vsnprintf.c): it has moved to srcdir from missing/.
-
- * LEGAL (missing/crypt.c): list its original license.
-
-Tue May 17 19:54:26 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * LEGAL (configure): add missing/setproctitle.c
-
-Tue May 17 19:35:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- Fix FreeBSD test failure.
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
- use ps -o command instead of ps -o cmd. FreeBSD doesn't support
- -o cmd option.
-
-Tue May 17 08:04:26 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_digest.c: Add documentation.
-
-Tue May 17 07:14:58 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/http.rb: Improve documentation of proxy configuration
- methods. Patch by Alf Mikula. [Ruby 1.9 - Bug #4714]
-
-Tue May 17 07:09:01 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/pop.rb: Improve documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #4711]
- * lib/net/telnet.rb: ditto
-
-Tue May 17 07:00:41 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/http.rb: Fix nodoc for Net::HTTP::version_1_1?. Patch by
- Alf Mikula. [Ruby 1.9 - Bug #4713]
-
-Tue May 17 06:56:26 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/optparse.rb: Add link to make_switch to improve documentation.
- Patch by David Copeland. [Ruby 1.9 - Bug #4708]
-
-Tue May 17 06:50:40 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/observer.rb: Improve documentation. Patch by David Copeland.
- [Ruby 1.9 - Bug #4707]
-
-Tue May 17 06:42:53 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/logger.rb: Improve documentation. Patch by David Copeland.
- [Ruby 1.9 - Bug #4706]
-
-Tue May 17 06:28:14 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/gserver.rb: Improve documentation. Patch by David Copeland.
- [Ruby 1.9 - Bug #4705]
-
-Tue May 17 06:21:15 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/cgi.rb: Add toplevel documentation to class CGI
- * lib/cgi/session.rb: Add overview documentation to CGI::Cookie
- * lib/cgi/html.rb: Don't add CGI::TagMaker documentation to CGI.
- Patch by David Copeland. [Ruby 1.9 - Bug #4704]
- * lib/cgi/core.rb: Clean up CGI documentation. Patch by David
- Copeland. [Ruby 1.9 - Bug #4704]
- * lib/cgi/cookie.rb: Clean up CGI::Cookie documentation. Patch by
- David Copeland. [Ruby 1.9 - Bug #4704]
-
-Tue May 17 05:52:30 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/digest: Improve documentation of Digest, Digest::HMAC and
- Digest::SHA2. Patch by Pete Higgins. [Ruby 1.9 - Bug #4702]
-
-Tue May 17 03:51:42 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/abbrev.rb: Hide copyright and revision information from RDoc.
- Inspired by patch from David Copeland, bug #4703.
-
-Tue May 17 03:33:21 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/timeout.rb (module Timeout): Hide internal constants. Patch by
- Pete Higgins. [Ruby 1.9 - Bug #4701]
-
-Mon May 16 11:21:09 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix
- of RUBY_SO_NAME on x64/ia64 mswin/mingw.
- [Feature #4602]
-
-Mon May 16 08:00:05 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc.rb: Update to RDoc 3.6.1, allows OpenSSL::Digest to be
- found.
-
-Mon May 16 05:49:54 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/drb/acl.rb: Add documentation.
-
-Mon May 16 05:13:20 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_asn1.c: Add documentation.
-
-Mon May 16 00:32:05 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_signal.rb (TestSignal#test_signal_process_group):
- skip if the platform doesn't have :pgroup capability. (i.e. skip
- if mswin32)
-
-Sun May 15 23:53:31 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/intern.h: resurrect old rb_fd_copy().
- * thread.c (rb_fd_copy): ditto.
-
-Sun May 15 23:45:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/intern.h: remove rb_fd_copy() to rb_fd_dup() and
- rb_w32_fdcopy() to rb_w32_fd_dup().
- * win32/win32.c: ditto.
- * thread.c: ditto.
-
-Sun May 15 22:26:39 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * signal.c (rb_f_kill): accept '-SIGXXX' style signal with Symbol or
- implicit convertion with #to_str. [ruby-dev:43169] fixes #4362
- * test/ruby/test_signal.rb (test_signal_process_group): add a test
- for send signal to process group.
-
-Sun May 15 21:22:35 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * cont.c (cont_init): clear macihne_stack_start/end of saved thread to
- prevent mark machine stack of GC'ed Thread. root Fiber is not
- initialized by fiber_init().
- based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
- * test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.
-
-Sun May 15 21:04:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (econv_init): revert r31353. [ruby-dev:43512]
-
-Sun May 15 03:39:35 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/zlib/zlib.c: Improve documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #4695]
-
-Sun May 15 03:23:46 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/erb.rb: Document ERB::Compiler. Patch by Simon Chiang.
- [Ruby 1.9 - Bug #4694]
-
-Sun May 15 00:58:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- fix mswin32 build error.
-
- * missing/setproctitle.c: add #ifdef HAVE_UNISTD_H.
- * win32/Makefile.sub (MISSING): add setproctitle.obj
-
-Sat May 14 22:45:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * missing/setproctitle.c: add to include "ruby/util.h".
-
-Sat May 14 19:52:22 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
- add for $0 test.
-
-Sat May 14 19:50:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * missing/setproctitle.c (compat_init_setproctitle): use
- ruby_strdup() instead of strdup().
-
-Sat May 14 19:37:31 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/missing.h: add setproctitle() declaration.
- * missing/setproctitle.c: added.
- * configure.in: add check for missing/setproctitle.c.
-
- * ruby.c (ruby_process_options): add to call compat_init_setproctitle().
- * ruby.c (set_arg0): remove all platform specific code. it's
- moved to missing/setproctitle.c.
- * ruby.c (origarg): remove len field. It's no longer used.
- * ruby.c (get_arglen): removed.
-
- This patch makes a lot of cleanup set_arg0 related code and fixes
- [Feature #4689].
-
-Sat May 14 17:42:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * process.c (rb_proc_times): improve documentation.
- [ruby-core:35785] fixes #4581, reported by Andrew Grimm.
-
-Sat May 14 12:12:54 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_pkey_dsa.rb: Add basic tests and tests that
- ensure new public key PEM encoding behavior and ensure backward
- compatibility.
- [Ruby 1.9 - Bug #4422] [ruby-core:35328]
- * test/openssl/test_pkey_rsa.rb: Remove line with 'puts'.
-
-Sat May 14 12:06:49 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/context.rb (class RDoc): Fix infinite loop caused by
- re-encountering BasicObject.
-
-Sat May 14 10:32:36 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * test/openssl/test_pkey_rsa.rb: Add tests that ensure new public key
- encoding behavior and also ensure backward compatibility.
- [Ruby 1.9 - Bug #4421] [ruby-core:35327]
-
-Sat May 14 09:50:10 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/yaml/dbm.rb: Add documentation. Patch by Justin Collins.
- [Ruby 1.9 - Bug #4693]
- * lib/yaml/store.rb: ditto
-
-Sat May 14 09:31:43 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc.rb: Updated to RDoc 3.6
-
-Sat May 14 07:30:29 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych.rb: released a new gem, so increasing version.
-
-Sat May 14 05:08:32 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_digest.c
- * ext/openssl/ossl_pkey.c
- * ext/openssl/ossl_pkey.h
- * test/openssl/pkey/test_pkey_rsa.rb
- Reverted premature commit. Sorry for the noise!
-
-Sat May 14 05:02:58 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/uri.rb: Add toplevel documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #4690]
-
-Sat May 14 04:19:06 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * NEWS: Describe altered behaviour for RSA and DSA public key
- encoding. [Ruby 1.9 - Bug #4421, Bug #4422]
- [ruby-core:35327,35328]
-
-Sat May 14 02:57:52 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/ipaddr.rb (unless Socket): Document valid*? methods. Patch by
- Sebastian Martinez. [Ruby 1.9 - Feature #4687]
-
-Sat May 14 02:54:04 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rexml/functions.rb: Add some documentation for REXML::Functions.
- Patch by Sebastian Martinez. [Ruby 1.9 - Feature #4688]
-
-Sat May 14 02:51:42 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/resolv.rb: Hide private method and state-tracking constants from
- RDoc. Patch by Mark Turner. [Ruby 1.9 - Feature #4691]
-
-Fri May 13 19:23:21 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * numeric.c (flo_coerce): Add #flo_coerce documentation.
- Patch by Sebastian Martinez.
- https://github.com/ruby/ruby/pull/21
-
-Fri May 13 18:42:22 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * README.EXT: fix typo. Patch by William Blackerby.
- https://github.com/ruby/ruby/pull/19
-
- * README.EXT.ja: ditto.
-
-Fri May 13 15:22:34 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_select): check invalid handle before doing
- select operations. see [ruby-dev:43513], [ruby-dev:43535]
-
-Fri May 13 08:34:00 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/rdoc.rb: Output summary after documentation report.
- * lib/rdoc/stats/normal.rb: Don't output information for users when
- we're not on a TTY
-
-Fri May 13 07:49:02 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/fileutils.rb: Hide internal methods from RDoc. Patch by Darragh
- Curran. [Ruby 1.9 - Bug #4684]
-
-Fri May 13 07:36:23 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/httpservlet/erbhandler.rb: Add documentation.
-
-Fri May 13 07:04:33 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/mathn.rb: Fix indentation. Patch by Jason Dew.
- [Ruby 1.9 - Feature #4682]
-
-Fri May 13 06:50:43 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/mathn.rb: Add documentation. Patch by Jason Dew. [Ruby 1.9 -
- Feature #4667]
-
-Fri May 13 05:44:19 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/logger.rb (class Logger): Document Logger#datetime_format.
- Patch by Sergio Gil Perez de la Manga. [Ruby 1.9 - Bug #4678]
-
-Fri May 13 05:39:11 2011 Eric Hodel <drbrain@segment7.net>
-
- * re.c (Init_Regexp): Document option constants. Patch by Vincent
- Batts. [Ruby 1.9 - Bug #4677]
- * lib/uri/common.rb (module URI): Documentation for URI. Patch by
- Vincent Batts. [Ruby 1.9- Bug #4677]
- * lib/uri/ftp.rb (module URI): ditto
- * lib/uri/generic.rb (module URI): ditto
- * lib/uri/http.rb (module URI): ditto
- * lib/uri/https.rb (module URI): ditto
- * lib/uri/ldap.rb (module URI): ditto
- * lib/uri/ldaps.rb (module URI): ditto
- * lib/uri/mailto.rb (module URI): ditto
- * process.c (Init_process): Document Process constants. Patch by
- Vincent Batts. [Ruby 1.9- Bug #4677]
-
-Fri May 13 05:16:38 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rss/atom.rb (module RSS): Document URIs. Patch by Mark Turner.
- [Ruby 1.9 - #4671]
- * lib/rss/rss.rb (module RSS): Document exception classes. Patch by
- Mark Turner. [Ruby 1.9 - #4671]
-
-Fri May 13 02:15:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (select_internal): remove unused variable (interrupt_flag).
-
-Thu May 12 18:24:34 2011 Kouhei Sutou <kou@clear-code.com>
-
- * configure.in: limit to "T" type for prefix of external symbols
- because x86_64-w64-mingw32-gcc on Debian GNU/Linux generates the
- following symbol:
- 0000000068483390 D _GLOBAL__F__conftest_external
-
- Approved by nobu.
-
-Thu May 12 14:50:52 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/dl/test_base.rb (Fiddle::LIBC_SO): its always msvc*.dll on
- mswin/mingw.
-
-Thu May 12 14:47:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (Logging.postpone): copy only when temporary logfile
- exists.
-
-Thu May 12 12:24:22 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-
- * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is
- executed.
- However, the problem is not revised in this.
- This adds the control of using function of SSLv2 in made macro by
- function check.
-
-Thu May 12 08:10:46 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/set.rb (class Set): Add nodoc to internal-use methods. Patch
- by Pete Higgins. [Ruby 1.9 - Bug #4665]
-
-Thu May 12 08:01:14 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey_ec.c: Allow encryption when PEM-encoding
- Elliptic Curve private keys.
- [ruby-core:35329] [Bug #4423]
-
-Thu May 12 07:54:59 2011 Eric Hodel <drbrain@segment7.net>
-
- * object.c (rb_obj_equal): Add documentation. Patch by Vincent Batts.
- [Ruby 1.9 - Bug #4664]
- * lib/rexml: ditto
- * lib/mkmf.rb: ditto
- * ext/socket/lib/socket.rb: ditto
-
-Thu May 12 07:30:08 2011 Eric Hodel <drbrain@segment7.net>
-
- * Various .document files: Update .document files to match files which
- have documentation.
-
-Thu May 12 07:18:45 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
- format for PEM-encoding DSA public keys.
- [ruby-core:35328] [Bug #4422]
-
-Thu May 12 06:27:31 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
-
- * ext/openssl/ossl_pkey_rsa.c: Use generic X.509 SubjectPublicKeyInfo
- format for encoding RSA public keys.
- [ruby-core:35327] [Bug #4421]
-
-Wed May 11 19:45:27 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/forwardable.rb: support 'delegate :foo => :bar' for to meet
- by specification of RDOC.
-
-Wed May 11 08:36:38 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick: Add documentation for WEBrick::HTTPAuth
-
-Wed May 11 03:06:35 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rss.rb: Add documentation for RSS. Patch by Steve Klabnik.
- [Ruby 1.9 - Bug #4663]
-
-Tue May 10 14:50:32 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Add option for hiding skip messages when test
- ends. #4657
-
- * test/testunit/test_hideskip.rb, test/testunit/test4test_hideskip.rb:
- test for above.
-
-Tue May 10 10:53:04 2011 Eric Hodel <drbrain@segment7.net>
-
- * common.mk (rdoc): Add rdoc-coverage rule
-
-Tue May 10 09:13:21 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick: Add Documentation
-
-Tue May 10 04:22:09 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/log.rb: Hide copyright info from ri
- * lib/webrick/httpstatus.rb: ditto
- * lib/webrick/htmlutils.rb: ditto
- * lib/webrick/httpversion.rb: ditto
- * lib/webrick/version.rb: ditto
- * lib/webrick/httpauth/userdb.rb: ditto
- * lib/webrick/httpauth/authenticator.rb: ditto
- * lib/webrick/accesslog.rb: ditto
-
-Mon May 9 20:57:13 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/ruby/test_{complex,rational}.rb: added tests.
-
-Mon May 9 20:29:44 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (string_to_c_internal): a refactoring.
-
-Mon May 9 18:33:05 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c: Improve documentation for String#start_with? and
- String#end_with?. fixes #4652
- patched by Andrew Grimm <andrew.j.grimm at gmail.com>
-
-Mon May 9 13:49:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * complex.c (string_to_c_internal): support scientific notation.
- patched by Tinco Andringa. https://github.com/ruby/ruby/pull/16
- [ruby-core:36046][Bug #4655]
-
-Mon May 9 11:52:48 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (int_ord): remove K&R style.
- patched by Daehyub Kim. https://github.com/ruby/ruby/pull/17
-
-Sun May 8 22:17:24 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/ruby/test_{complex2,complexrational}.rb: use skip.
- * test/date/*.rb: ditto.
-
-Sun May 8 21:02:31 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/ruby/test_{complex2,complexrational}.rb: NEVER SKIP.
-
-Sun May 8 21:01:21 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/test_date_base.rb: fixed.
-
-Sun May 8 20:54:11 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/*.rb: NEVER SKIP.
-
-Sun May 8 20:37:33 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/*.rb: reverted 31432.
-
-Sun May 8 20:32:43 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/*.rb: reverted 31483.
-
-Sun May 8 19:39:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (native_cond_timedwait): add to care EINTR.
- * thread_pthread.c (thread_timer): remove EINTR check.
-
-Sun May 8 19:04:15 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/time.rb (xmlschema): avoid passing any negative numbers.
-
-Sun May 8 18:40:03 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_{parse,strptime}.c: introduced some macros.
-
-Sun May 8 17:17:13 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/*.rb: use skip /w messages.
-
-Sun May 8 17:04:55 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb (_httpdate): omitted to call zone_to_diff.
-
-Sun May 8 16:56:19 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (date_s_test_*): use macros.
-
-Sun May 8 10:24:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c: cleanup signal_thread_list related ifdef.
- 1) we don't have to use #ifdef FOO-PLATFORM directly 2) About
- half #ifdef didn't care symbian properly.
-
-Sun May 8 05:19:37 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/io/wait/test_io_wait.rb: Linux socketpair(2) only support
- AF_UNIX, but windows socketpair doesn't support it. we can't
- avoid platform check. sigh!
-
-Sun May 8 00:13:05 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/io/wait/test_io_wait.rb: use Socket.pair instead of pipe.
- Windows can only treat a socket.
-
-Sat May 7 22:43:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_fd_zero): remove redundant zero fill.
-
-Sat May 7 22:38:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_fd_init): remove volatile qualifier.
-
-Sat May 7 22:34:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_fd_init_copy): new internal api. It provide efficient
- copy constructor semantics.
- * thread.c (do_select): use rb_fd_init_copy().
-
-Sat May 7 15:18:06 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- fix incorrect native_cond_signal call when deadlock was detected.
-
- * thread.c (lock_func): decrement cond_waiting if timeout was happen.
-
-Sat May 7 18:28:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (USE_MONOTONIC_COND): check the availability
- more strictly.
-
- * thread_pthread.h (rb_thread_cond_t): ditto.
-
-Sat May 7 15:15:10 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- fix win32 native_cond_timedwait() makes SIGSEGV.
-
- * thread_win32.h (rb_thread_cond_struct): add prev field instead of
- last. (ie cond_event_entry is now using double linked list instead of
- single)
- * thread_win32.c (cond_event_entry): add prev field.
-
- * thread_win32.c (__cond_timedwait): remove entry properly if timeout
- was happen.
-
- * thread_win32.c (native_cond_signal): change for double linked list.
- * thread_win32.c (native_cond_broadcast): ditto.
- * thread_win32.c (native_cond_initialize): ditto.
-
-Sat May 7 12:41:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- fix mutex deadlock test hang-up.
-
- * thread_win32.c (abs_timespec_to_timeout_ms): fix 1000x calculation
- mistake. (ie fix hang-up native_cond_timedwait())
-
-Sat May 7 03:14:13 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- sleep_cond use monotonic time if possible.
-
- * thread_pthread.c (native_thread_init): change sleep_cond
- attribute to monotonic.
- * thread_pthread.c (native_sleep): use native_cond_timeout().
-
- * thread_pthread.c (native_cond_timeout): add overflow care.
- * thread_win32.c (native_cond_timeout): ditto.
-
-Sat May 7 02:49:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
- fix win32 compile error.
-
- * thread_win32.c (RB_CONDATTR_CLOCK_MONOTONIC): define
- RB_CONDATTR_CLOCK_MONOTONIC always.
- * thread_pthread.c (RB_CONDATTR_CLOCK_MONOTONIC): ditto.
-
-Sat May 7 02:29:41 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- mutex: deadlock check timeout use monotonic time.
-
- * thread_pthread.c (native_cond_timeout): new internal api.
- it calculate a proper time for argument of native_cond_timedwait().
- * thread_win32.c (native_cond_timeout): ditto.
-
- * thread_pthread.c (thread_timer): use native_cond_timeout()
- instead of get_ts.
- * thread.c (lock_func): ditto.
-
- * thread_pthread.c (get_ts): removed. use native_cond_timeout().
- * thread.c (init_lock_timeout): ditto.
-
-Sat May 7 01:54:21 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (get_ts): add monotonic clock capability.
- * thread_pthread.c (rb_thread_create_timer_thread): use monotonic
- clock if possible.
-
-Sat May 7 01:43:37 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.h (rb_thread_cond_t): add clockid field. it's
- no longer an alias of pthread_cond_t.
- * thread_pthread.c: adapt new rb_thread_cond_t type.
- * thread.c (mutex_alloc): ditto.
- * thread_win32.c (native_cond_initialize): ditto.
- * configure.in: add check for pthread_cond_attr_setclock() and
- clockid_t type.
-
-Fri May 6 23:29:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_wait_for_single_fd): use ppoll() instead of poll()
- if possible. based on a patch from Eric Wong. [ruby-core:36003].
-
-Fri May 6 23:13:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: remove nanosleep check. we no longer use it.
- r20124 removed last usage.
-
-Fri May 6 22:35:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/rubyext.c (mktime_do): extra digits are not used.
-
-Fri May 6 17:43:07 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/syck/rubyext.c (mktime_do): remove unused variable offset.
-
- * ext/syck/syck.h: use #ifdef instead of #if DEBUG.
-
-Fri May 6 16:27:33 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/date_core.c (DAY_IN_NANOSECONDS): refix: 31438.
- check with LONG_MAX and cast as long; without this the calculation
- will be done as int and overflow.
-
-Fri May 6 15:01:11 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by
- silently ignoring lesser significant digits. Required buffer
- length can be computable so you might at first think of
- allocating enough memory space on the fly using alloca(). That
- is a wrong idea because when using alloca there is always risk
- of integer overflow. A function that accepts outer-process
- resources like this should not blindly trust its inputs. In
- this particular case we just want to generate milliseconds
- resolution by strtod() so the string in question needs no more
- length than what we originally have. Ignoring lesser
- significant digits should suffice I believe.
-
-Fri May 6 14:25:53 2011 Tinco Andringa <mail@tinco.nl>
-
- * ext/syck/rubyext.c (mktime_do): YAML.load time correctly parse
- usecs smaller than 1 fixes #4571
-
-Thu May 5 22:23:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (native_mutex_reinitialize_atfork): removed
- unused macro.
- * thread_win32.c (native_mutex_reinitialize_atfork): ditto.
-
-Thu May 5 22:09:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/date/date_core.c (DAY_IN_NANOSECONDS): long long int is not
- available on all platforms.
-
-Thu May 5 17:36:31 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * eval.c (frame_func_id): store result of method_entry_of_iseq() to
- cfp->me because method_entry_of_iseq() might become expensive.
-
-Thu May 5 15:03:51 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * eval.c (frame_func_id): __method__ return different name from
- methods defined by Module#define_method with a same block.
- [ruby-core:35386] fixes #4606
- * eval.c (method_entry_of_iseq): new helper function. search control
- frame stack for a method entry which has given iseq.
- * test/ruby/test_method.rb: add tests for #4606
-
-Wed May 4 22:13:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_vm4_pipe.rb: Reduced iterations. Too slow benchmark
- is bad.
- * benchmark/bm_vm4_thread_pass.rb: ditto.
-
-Wed May 4 22:08:22 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/date/test_date_base.rb: don't use no message skip().
-
-Wed May 4 21:11:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_io_select2.rb: reduce number of using file
- descriptors. because gdb need some fds.
-
-Wed May 4 19:00:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_wait_for_single_fd): Fix wrong return value.
- * test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
- (TestWaitForSingleFD#test_wait_for_closed_pipe): test for it.
-
-Wed May 4 18:46:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/-test-/wait_for_single_fd: New. for testing
- rb_wait_for_single_fd() internal function.
- The patch was written by Eric Wong. [ruby-core:35991]
-
- * test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb: ditto.
-
-Wed May 4 12:46:25 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_wait_for_single_fd): Added POLLNVAL check.
- based on a patch from Eric Wong at [ruby-core:35991].
-
-Wed May 4 11:51:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_f_select): remove useless ifdef.
-
-Wed May 4 11:42:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/socket/init.c (wait_connectable): fix error handling code.
- RB_WAITFD_OUT is turned on even though an error occur.
-
-Wed May 4 10:12:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/readline/readline.c (readline_event): use rb_wait_for_single_fd().
- The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May 4 10:10:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/socket/init.c (wait_connectable): use rb_wait_for_single_fd().
- The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
- * ext/socket/init.c (try_wait_connectable, wait_connectable_ensure):
- removed.
-
-Wed May 4 10:07:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/io/wait/wait.c (io_wait): use rb_wait_for_single_fd().
- The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May 4 10:01:27 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_wait_for_single_fd): new. poll(2) based backend for
- rb_wait_for_single_fd().
- Now only Linux uses it.
-
- The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May 4 09:56:57 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_wait_for_single_fd): new.
- * thread.c (select_single): select(2) based backend for
- rb_wait_for_single_fd().
-
- * io.c (make_writeconv): use rb_wait_for_single_fd() instead of
- rb_thread_fd_select().
- * io.c (rb_io_wait_readable): ditto.
- * thread.c (rb_thread_wait_fd_rw): ditto.
-
- * io.c (wait_readable): removed.
- * thread.c (init_set_fd): new helper function.
- * include/ruby/io.h (RB_WAITFD_IN, RB_WAITFD_PRI, RB_WAITFD_OUT):
- new constant for rb_single_wait_fd().
-
- The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May 4 08:04:59 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb: fix time dumping so that
- Syck can load UTC times that Psych dumps.
-
-Wed May 4 07:33:00 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_fd_copy): fix wrong argument.This issue was pointed
- out by Eric Wong. [ruby-core:35982]
-
-Tue May 3 20:29:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
- Skip sticky bit test if the platform is FreeBSD. It doesn't allow to
- change sticky bit if a target is regular file.
-
-Tue May 3 18:23:57 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/date/test_date.rb (TestDate#test_coerce):
- test for [ruby-core:35127].
-
-Tue May 3 04:27:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_select): preserve errno if no error
- occurred.
-
-Tue May 3 03:57:04 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_w32_fdcopy): add prototype. fixes
- #4640
-
-Mon May 2 01:02:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * lib/fileutils.rb (FileUtils#chmod): accept symbolic mode argument.
- The patch was written by takkanm. [ruby-core:26029][Feature #2190]
-
- * lib/fileutils.rb (FileUtils#fu_mode): new helper function.
- * lib/fileutils.rb (FileUtils#symbolic_modes_to_i): ditto.
- * lib/fileutils.rb (FileUtils#mode_mask): ditto.
- * lib/fileutils.rb (FileUtils#user_mask): ditto.
-
- * test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
- new test for the above symbolic mode.
- * test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_R): ditto.
-
-Mon May 2 00:36:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/socket/init.c (rsock_connect): add to care EINTR. based
- on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
-
-Sun May 1 01:06:24 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_select): release GVL while waiting select().
-
-Sat Apr 30 23:10:15 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c (rb_w32_fdcopy): New. This can copy even though
- fdset size exceed FD_SETSIZE.
- * include/ruby/intern.h (rb_fd_copy): use rb_w32_fdcopy()
-
-Sat Apr 30 20:18:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (do_select): Change argument type to rb_fdset_t.
- Now do_select() is free from unexpected hangup if
- HAVE_RB_FD_INIT=1 [Bug #4636]
-
- * thread.c (rb_thread_fd_select, rb_thread_wait_fd_rw):
- adapt new argument type.
-
- * thread.c (rb_thread_select): make dummy implementation.
-
-Sat Apr 30 20:16:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_fd_copy): Change function argument. Now
- rb_fd_copy() has fully copy semantics.
- * include/ruby/intern.h: ditto.
-
-Sat Apr 30 20:11:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/intern.h (rb_thread_select): mark as deprecated.
-
- * ext/io/wait/wait.c (wait_readable): use rb_thread_fd_select
- instead of rb_thread_select.
- * ext/socket/init.c (wait_connectable0): ditto.
- * ext/readline/readline.c (readline_event): ditto.
- * io.c (rb_io_wait_readable, wait_readable, rb_io_wait_writable,
- wait_writable): ditto.
-
-Sat Apr 30 20:06:36 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (do_select): remove useless ifdef. time calculation
- is not heavy weight.
-
-Sat Apr 30 16:48:36 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_io_select3.rb: New.
-
-Sat Apr 30 16:27:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (copy_stream_body, rb_io_s_copy_stream): move rb_fd_init()
- from copy_stream_body to rb_io_s_copy_stream. fds of passing
- rb_fd_term() have to be guaranteed initialized.
-
-Sat Apr 30 16:13:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_io_select.rb, benchmark/bm_io_select2.rb: New.
- based on a patch from Eric Wong at [Feature #4531]
-
-Sat Apr 30 03:25:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
- the patch was written by Eric Wong. [Feature #4531]
-
-Sat Apr 30 00:34:56 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/win32.h: remove redundant declaration of
- rb_w32_time_subtract().
-
-Sat Apr 30 00:16:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (gvl_init): fix hangup if GVL_SIMPLE_LOCK=1.
- We don't have to call mutex_unlock() before initialize it!
-
-Fri Apr 29 13:15:15 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_win32.c (native_cond_timedwait): New. r31373 caused
- win32 build failure.
-
- * thread_win32.c (__cond_timedwait, abs_timespec_to_timeout_ms):
- New helper functions.
-
- * win32/win32.c (rb_w32_time_subtract): rename from subtract and
- remove static.
-
-Fri Apr 29 10:43:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/bm_vm4_pipe.rb: Add two new benchmark for GVL
- performance. They was written by Koichi Sasada.
- * benchmark/bm_vm4_thread_pass.rb: ditto.
-
-Fri Apr 29 10:25:31 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_method.c (rb_clear_cache_by_class): Revert r29673. It made
- a segmentation fault regression. [Bug #4289][ruby-core:34554].
-
-Fri Apr 29 10:24:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (make_writeconv): do not add textmode newline decorator if any
- newline decorator is set already. fixes #4618, fixes #4619
-
-Fri Apr 29 10:17:42 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (lock_func): small cleanup.
-
-Fri Apr 29 10:07:13 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_mutex_lock, lock_func): Avoid busy loop and
- performance regression. bm_vm3_thread_mutex.rb performance
- change from 109.064sec to 16.331sec. [Feature #4607]
-
- * thread.c (init_lock_timeout): New helper function.
-
-Thu Apr 28 16:15:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{win32.c,dir.h} (rb_w32_uopendir): new API to pass UTF-8 path.
-
- * win32/win32.c (opendir_internal, rb_w32_opendir): extract and merge
- common part of rb_w32_opendir() and rb_w32_uopendir().
-
- * dir.c (do_opendir, glob_helper): encoding.
-
- * dir.c (dir_initialize, do_opendir): convert path to UTF-8 and call
- rb_w32_uopendir() instead of rb_w32_opendir() on Windows.
- fixes #4491, reported by Joey Zhou.
-
-Thu Apr 28 15:32:53 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
- mswin/mingw.
-
-Thu Apr 28 06:07:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/csv.rb (CSV::open): suppress universal newline decorator.
- fixes #4603
-
- * lib/csv.rb (CSV.read): no mode is needed.
-
-Thu Apr 28 06:06:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_extract_modeenc, rb_f_backquote): set default text
- mode. fixes #4619
-
- * io.c (pipe_open): set universal newline decorator if needed.
-
-Wed Apr 27 11:33:08 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/emoji_iso2022_kddi.trans: ISO-2022-JP-KDDI doesn't have
- CP932 UDA. Another reason is emacs-mule: the implementation of
- stateless-iso-2022-jp doesn't support beyond 94x94 (0x7fxx);
- but CP932 UDA is in 7Fxx-92xx.
-
-Wed Apr 27 07:42:44 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (STRIP): use proper toolchain. based on a patch
- from Jon Forums at [ruby-core:35909]. fixes #4617
-
-Wed Apr 27 01:20:59 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (date_zone_to_diff): renamed.
- * ext/date/date_parse.c: ditto.
- * ext/date/date_strptime.c: ditto.
-
-Wed Apr 27 01:16:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_find): accept Encoding objects.
-
-Wed Apr 27 00:55:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (econv_opts): add newline option.
-
- * io.c (validate_enc_binmode, rb_io_extract_modeenc): set newline
- decorator according to open mode.
-
- * transcode.c (rb_econv_prepare_options): new function, to prepare
- econv options with newline flags.
-
- * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_MASK): add.
-
-Wed Apr 27 00:51:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_truncate): fix function.
-
- * include/ruby/win32.h (ftruncate, truncate, ftello, fseeko): non-64
- versions on mingw are useless because they use int32_t. fixes #4564
-
-Wed Apr 27 00:50:33 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: modified validation methods.
- * ext/date/lib/date.rb: ditto.
-
-Wed Apr 27 00:00:37 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c (dt_lite_set_tmx): should get df value.
-
-Tue Apr 26 22:34:04 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb (_iso8601): allowed day only civil
- date. disallowed separatorless day only ordinal date.
-
-Mon Apr 25 21:31:36 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-
- * ext/openssl/extconf.rb: Should check SSLv2_*method.
- openssl compiled with "no-ssl2" the extconf don't fail
- when running `make' having this compilation errors.
- Patched by Laurent Arnoud. fixes #4562, #4556
-
-Mon Apr 25 20:53:32 2011 Tajima, Akio <artonx@yahoo.co.jp>
-
- * win32/win32.c (kill): accept 0 only sig is SIGINT #4596
-
-Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp>
-
- * win32/win32.c (kill): accept 0 as pid, fixes #4596
-
-Mon Apr 25 16:43:45 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c (random_rand): remove unused variables.
-
- * struct.c (rb_struct_define_without_accessor): ditto.
-
- * strftime.c (rb_strftime_with_timespec): ditto.
-
- * sprintf.c: ditto.
-
- * time.c (time_asctime): remove useless GetTimeval().
-
- * thread_pthread.c: cast to (void *) for %p.
-
-Mon Apr 25 11:02:11 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/ripper/lib/ripper/sexp.rb: fix rdoc around sexp.
- patched by Sho Hashimoto. fixes #4599
-
-Mon Apr 25 08:24:04 2011 Shota Fukumori <sorah@tubusu.net>
-
- * random.c (rb_f_rand, random_s_rand): RDocs for them.
-
-Mon Apr 25 07:18:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * random.c (random_s_rand, Init_Random): Random.rand should behave as
- Random::DEFAULT.rand rather than Kernel#rand.
-
- * random.c (rand_range, random_rand): rand_range function extracted
- from random_rand function.
-
- * random.c (rb_f_rand): accept a Range argument as Random#rand
- [ruby-dev:43427] #4605
-
-Mon Apr 25 03:31:06 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/time.rb: require 'date'.
- * ext/date/lib/date/format.rb: removed require line.
-
-Mon Apr 25 03:08:39 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb: require 'date'.
-
-Mon Apr 25 03:04:16 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb (_iso8601): added a pattern.
-
-Mon Apr 25 02:51:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/lib/date/format.rb: require 'date_core.so'.
- date/format needs methods which are now in date_core.so.
- This breaks make rdoc which uses Date._parse from time.rb.
-
-Mon Apr 25 02:47:46 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb (_iso8601): fixed a bug of regex.
-
-Mon Apr 25 02:12:26 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb: an adjustment of regex.
-
-Mon Apr 25 01:58:50 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib/date/format.rb: omitted to call _parse.
-
-Mon Apr 25 01:03:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * string.c (rb_to_id): remove unused variable.
-
-Sun Apr 24 22:19:05 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c, rational.c: omitted some method calls.
-
-Sun Apr 24 02:57:27 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_parse.c (n2i): takes long.
-
-Sun Apr 24 02:51:06 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_parse.c: reverted.
-
-Sun Apr 24 02:25:23 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/intern.h: pcc can't use __builtin_constant_p.
-
- * vm_exec.c: change condition.
-
-Sun Apr 24 01:58:01 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/date_core.c (leap_p): suppress warning: parentheses.
-
- * ext/date/date_core.c (date_s__parse_internal): remove unused
- variable "str".
-
- * ext/date/date_parse.c (parse_ddd_cb): use RSTRING_LENINT.
-
- * ext/date/date_strftime.c (date_strftime_with_tmx): remove unused
- variable.
-
-Sun Apr 24 00:34:23 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_parse.c: removed some unused macros. use strchr()
- instead of index().
-
-Sat Apr 23 21:29:42 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: replacement of implementation of
- _parse. [experimental]
- * ext/date/date_parse.c: new.
- * ext/date/lib/date/format.rb: removed ruby version of _parse.
-
-Fri Apr 22 12:04:15 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): fix rdoc.
- patched by burningTyger. https://github.com/ruby/ruby/pull/11
-
-Fri Apr 22 11:49:49 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
- XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit.
-
- * lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
- XML-RPC doesn't allow Infinity and NaN.
- http://www.xmlrpc.com/spec
-
-Fri Apr 22 04:16:14 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/parser.c (parse): strings from psych have proper taint
- markings.
-
- * test/psych/test_tainted.rb: test for string taint
-
-Thu Apr 21 01:30:02 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c (rb_f_srand): fix rdoc: srand(0)'s 0 is a seed.
- [ruby-core:35833] fixes #4590
-
-Thu Apr 21 01:01:28 2011 Masaya Tarui <tarui@ruby-lang.org>
-
- * win32/win32.c (CreateChild): maximum length of lpCommandLine is
- 32,768 characters, including the Unicode terminating null character.
-
-Wed Apr 20 21:32:11 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_strptime.c (date__strptime_internal): do not
- overwrite local variables.
-
-Wed Apr 20 14:41:28 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_each_line): check string's length when compare
- separator and string. [ruby-core:35815] fixes #4586
-
-Wed Apr 20 00:02:13 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-parse-partial): use position of open paren.
-
-Tue Apr 19 01:00:21 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * test/ruby/test_io.rb (TestIO#test_cross_thread_close_fd):
- skip cross thread pipe close if windows
-
-Mon Apr 18 12:15:46 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
- avoid float error. [ruby-core:35804]
-
-Sun Apr 17 00:20:14 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_{core,strftime}.c: use struct tmx instead of vtm.
- * ext/date/date_tmx.h: new.
-
-Sat Apr 16 22:23:52 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_strftime.c (date_strftime_wo_timespec): changed
- the way of validation of locale modifiers.
-
-Sat Apr 16 21:55:12 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: replacement of implementation of
- _strptime. [experimental]
- * ext/date/date_strptime.c: new.
- * ext/date/lib/date/format.rb: removed ruby version of _strptime.
-
-Sat Apr 16 10:18:30 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * vm.c (Init_VM): suppress warning: "OPT_BASIC_OPERATIONS" is not
- defined.
-
-Fri Apr 15 23:41:18 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ruby.c (proc_options): suppress warning:
- "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined.
-
-Fri Apr 15 15:10:29 2011 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/uri/generic.rb (#route_from_path): Fix a bug where
- URI('http://h/b/').route_to('http://h/b') wrongly returned './'
- (should be '../b'). [Bug #4476]
-
-Fri Apr 15 14:58:06 2011 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/fileutils.rb (FileUtils#touch): Fix corrupted output when
- mtime is specified in addition to nocreate (and verbose).
- ref [ruby-dev:43401]
-
-Thu Apr 14 23:43:43 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (ruby_float_step): wrong loop condition.
- fixes [ruby-core:35753], reported by Joey Zhou.
-
- * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
- test above change.
-
-Thu Apr 14 22:48:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::Options#setup_options): set possible
- values for completion. no conversion is needed.
-
- * lib/test/unit.rb (Test::Unit::Runner::Worker#initialize): use
- positional arguments instead of keyword arguments.
-
- * lib/test/unit.rb (Test::Unit::Runner#jobs_status): io/console may
- not be available. use 80 as the last resort if IO#winsize and
- COLUMNS are unavailable.
-
- * lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a
- verb.
-
- * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): check if worker
- is signaled and use its exit status.
-
- * lib/test/unit.rb (Test::Unit::Runner::Worker#dead): no longer @in
- and @out are separated.
-
-Thu Apr 14 21:23:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_autoload_p): search superclasses as same as actual
- loading. fixes [ruby-core:35679]
-
-Thu Apr 14 21:21:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h (frexp, modf): wrongly declared as pure in
- mingw math.h.
-
- * include/ruby/win32.h (ftruncate, truncate): mingw64 misses
- prototypes.
-
- * win32/win32.c (rb_w32_read): suppress warning.
-
-Thu Apr 14 19:55:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * lib/fileutils.rb (FileUtils#touch): fix corrupted output when
- FileUtils.touch(:nocreate => true, :verbose => true) case.
- The patch was written by Hiroyuki Iwatsuki. [ruby-dev:43401]
-
-Thu Apr 14 16:01:45 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * io.c (rb_f_syscall): suppress warning: "HAVE___SYSCALL" is not
- defined.
-
-Thu Apr 14 00:41:09 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * thread.c (thread_fd_close_i): IOError exception should be assigned
- to rb_thread_t::thrown_errinfo.
-
-Wed Apr 13 20:12:26 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * io.c (rb_io_fdatasync): remove unused variable.
-
-Tue Apr 12 20:54:12 2011 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/st.h: parenthesize macro arguments.
-
-Tue Apr 12 19:19:50 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb: avoid race condition. fixes #4572
-
-Tue Apr 12 18:07:13 2011 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/extconf.rb: --disable-libedit to disable
- libedit. fixes #4550
-
-Tue Apr 12 10:37:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h: VC doesn't have ftruncate() and others, but
- ruby needs HAVE_ macros to use our emulation functions.
- (fix the problem of 31262)
-
-Tue Apr 12 01:33:00 2011 Luis Lavena <luislavena@gmail.com>
-
- * configure.in: properly evaluate existence of truncate, ftruncate
- and ftello for MinGW. [ruby-core:35678]
- * win32/win32.c: rename truncate, ftruncate and ftello to avoid
- redefinitions.
- * win32/win32.h: ditto.
-
-Mon Apr 11 21:51:52 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c: revert r31230. Because it made a regression.
- [ruby-core:35631]
-
-Mon Apr 11 21:49:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_io.rb: Added TestIO#test_cross_thread_close_stdio
- and TestIO#test_cross_thread_close_fd.
- The patch was written by Eric Wong. [ruby-core:35669]
-
-Mon Apr 11 21:15:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * file.c (rb_group_member): kill 256K of stack usage.
- the patch was written by Eric Wong. [ruby-core:35699]
-
-Mon Apr 11 07:24:13 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl/ossl.c: Fix typo, document version constants.
-
-Sun Apr 10 22:23:45 2011 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h: parenthesize macro arguments.
-
-Sat Apr 9 23:31:47 2011 Shota Fukumori <sorah@tubusu.net>
-
- * ext/stringio/stringio.c (strio_each, strio_readlines):
- Use `NUM2LONG` instead of `FIX2INT`. Fixes [ruby-dev:43395].
-
-Sat Apr 9 23:22:27 2011 Shota Fukumori <sorah@tubusu.net>
-
- * ext/stringio/stringio.c (strio_each):
- Fix exception message and don't raise immediately if block is not
- given.
- Fixes [ruby-dev:43394].
-
- * test/stringio/test_stringio.rb (test_each_line_limit_0):
- Fix test for above.
-
-Sat Apr 9 21:54:15 2011 Shota Fukumori <sorah@tubusu.net>
-
- * ext/stringio/stringio.c (strio_each, strio_readlines):
- limit must not be zero. Fixes [ruby-dev:43392].
-
- * test/stringio/test_stringio.rb: Add tests for above.
-
-Sat Apr 9 18:01:36 2011 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/util.h: parenthesize macro arguments.
-
-Fri Apr 8 16:01:56 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_getline): check whether str is
- a string when str and lim are given.
- https://twitter.com/watson1978/status/56225052152168449
-
-Thu Apr 7 20:03:52 2011 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/io.h: parenthesize macro arguments.
-
-Wed Apr 6 21:08:31 2011 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h: parenthesize macro arguments.
-
-Wed Apr 6 15:12:40 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
- pop pushed error after each try of reading. fixes #4550
-
- * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
- * ext/openssl/ossl_pkey_ec.c (ossl_ec_initialize): ditto.
-
-Wed Apr 6 11:36:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize):
- pop pushed error after each try of reading. fixes #4550
-
-Tue Apr 5 20:33:43 2011 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/encoding.h: parenthesize macro arguments.
-
-Mon Apr 4 22:02:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/io/nonblock/nonblock.c (io_nonblock_set): Avoid F_SETFL if
- we're not changing the O_NONBLOCK bit. F_SETFL is an expensive
- operation since it needs to affect all processes with the same
- file object.
- The patch is written by Eric Wong. [ruby-core:35556]
-
-Mon Apr 4 21:41:26 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_io_syswrite): While local FS writes are usually
- buffered, the buffers can be full or the file opened with
- O_SYNC. IO#syswrite can also be used on blocking IOs
- (pipe/socket) just like IO#write.
- The patch is written by Eric Wong. [ruby-core:35554]
-
-Mon Apr 4 11:50:40 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/test_tempfile.rb: simply ignore platform dependent testcases
- instead of skipping.
-
-Sun Apr 3 22:52:22 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * ext/syslog/syslog.c: improve rdoc.
- a patch by Jonas Pfenniger. [ruby-core:35592] fixes #4545
-
-Sun Apr 3 22:10:09 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/zlib/zlib.c: parenthesize macro arguments.
-
-Sun Apr 3 21:33:58 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: disable fdatasync again on Mac OS X.
- [ruby-core:35493][Bug #4500]
-
-Sun Apr 3 21:16:20 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (io_reopen): IO#close releases GVL if possible.
- close() may block for certain file types (NFS, SO_LINGER
- sockets, inotify), so let other threads run. The patch was
- created by Eric Wong [ruby-core:35555][Bug #4527]
-
- * io.c (fptr_finalize): ditto.
-
- * io.c (maygvl_fclose): new.
- * io.c (nogvl_fclose): ditto.
- * io.c (maygvl_close): ditto.
- * io.c (nogvl_close): ditto.
-
-Fri Apr 1 22:25:50 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/syslog/syslog.c: parenthesize macro arguments.
-
-Fri Apr 1 18:53:06 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/webrick/cookie.rb (WEBrick::Cookie.parse): 'white space is
- permitted between tokens' according to RFC2965. Though 'Netscape
- spec' does not define the syntax clearly, make it tolerant as a
- server. As a real-world example, rest-client gem sends
- 'Cookie: foo=1;bar=2'
-
- * test/webrick/test_cookie.rb (test_parse_non_whitespace): test it.
-
-Fri Apr 1 13:19:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (RUBY_VM_CHECK_INTS_TH): merge a patch by ko1
- in [ruby-dev:43373].
-
-Thu Mar 31 23:15:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):
- adjust space between block beginning and block arguments
-
-Thu Mar 31 20:42:05 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/strscan/strscan.c: parenthesize macro arguments.
-
-Thu Mar 31 18:06:12 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_insnhelper.c (vm_get_ev_const): should ignore crefs with
- the NODE_FL_CREF_PUSHED_BY_EVAL flag.
-
-Thu Mar 31 16:49:56 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_insnhelper.c (vm_get_ev_const): search root cref properly.
- [ruby-dev:43365]
-
-Thu Mar 31 14:50:25 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_mod_s_constants): should ignore crefs with
- the NODE_FL_CREF_PUSHED_BY_EVAL flag.
-
-Wed Mar 30 22:55:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-toggle-block): toggle do/end and {}.
-
- * misc/ruby-mode.el (ruby-move-to-block): move to opening of
- block.
-
-Wed Mar 30 14:35:15 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_insnhelper.h (COPY_CREF): should copy
- the NODE_FL_CREF_PUSHED_BY_EVAL flag to hide constants from
- methods defined by class_eval. [ruby-dev:43365]
-
-Wed Mar 30 00:24:53 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/stringio/stringio.c: parenthesize macro arguments.
-
-Tue Mar 29 21:51:31 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * object.c (rb_String): Kernel#String should call to_str before to_s.
-
-Tue Mar 29 10:28:08 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/webrick/test_filehandler.rb
- (WEBrick::TestFileHandler#test_short_filename): the cgi doesn't exist
- on current directory.
-
-Tue Mar 29 05:19:57 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c: parenthesize macro arguments.
-
-Tue Mar 29 00:03:51 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * test/webrick/test_filehandler.rb (test_short_filename):
- read real short filename by cmd because smb mounted files
- have different naming convention.
-
-Mon Mar 28 11:38:08 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/date_core.c (date_s_today): use int for year.
-
- * ext/date/date_core.c (datetime_s_now): ditto.
-
-Mon Mar 28 11:07:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
-
-Mon Mar 28 11:07:00 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (love): all you need is love.
-
-Sun Mar 27 23:16:31 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ipsocket.c: parenthesize macro arguments.
-
-Sun Mar 27 16:55:34 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode-map): remove unnecessary
- binding. fixes
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468952
-
- * misc/ruby-mode.el: suppress warnings at byte compile. fixes
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502926
-
-Sun Mar 27 11:18:35 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: removed unused variables.
-
-Sat Mar 26 15:16:09 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/getaddrinfo.c: parenthesize macro arguments.
-
-Sat Mar 26 05:27:34 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/lib/date/format.rb (DateTime#strftime): removed because
- date_core defines it.
-
-Fri Mar 25 21:59:45 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: should not force cast with macros.
-
-Fri Mar 25 21:56:10 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/sdbm/init.c: parenthesize macro arguments.
-
-Fri Mar 25 19:39:40 2011 Ben Walton <bwalton@artsci.utoronto.ca>
-
- * test/test_syslog.rb:
- Skip syslog tests that rely on LOG_PERROR unless it's defined
-
- Instead of checking looking at the platform to determine if the tests
- relying on LOG_PERROR should be run, look for the definition of the
- constant as this will be robust against all platforms as long as the
- underlying syslog.c code sets it up correctly.
-
- This specifically addresses failures on Solaris 9.
-
- Use LOG_PID instead of LOG_PERROR in Syslog.open test
-
- LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms
- that don't define it. Solaris 9 and 10 are examples of this.
-
- Use LOG_PID instead.
-
-Fri Mar 25 15:42:17 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/sdbm/_sdbm.c (sdbm_open): use size_t.
-
- * ext/syck/bytecode.c: ditto.
-
- * ext/sdbm/_sdbm.c (delpair): use ptrdiff_t.
-
- * ext/sdbm/init.c: use RSTRING_LENINT.
-
- * ext/dl/handle.c: suppress warning: shorten-64-to-32.
-
- * ext/strscan/strscan.c: ditto.
-
- * ext/syck/emitter.c: ditto.
-
- * ext/syck/implicit.c: ditto.
-
- * ext/syck/syck.c: ditto.
-
- * ext/syck/token.c: ditto.
-
-Fri Mar 25 12:14:58 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
-
-Fri Mar 25 11:49:29 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently
- on Windows, because this tests a platform specific feature and it'll
- never be supported on ruby on Windows.
-
- * test/ruby/test_dir_m17n.rb
- (TestDir_M17N#test_filename_extutf8_invalid,
- TestDir_M17N#test_filename_as_bytes_extutf8): ditto.
-
- * test/open-uri/test_open-uri.rb
- (TestOpenURI#test_find_proxy_case_sensitive_env): ditto.
-
- * test/dl/test_handle.rb (DL::TestHandle#test_NEXT,
- DL::TestHandle#test_DEFAULT): ditto.
-
-Thu Mar 24 23:06:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_get_ev_const): should not autoload in
- defined? mode.
-
- * variable.c (rb_const_defined_0): fix autoloading base.
- [ruby-core:35509]
-
-Thu Mar 24 22:48:43 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/sdbm/_sdbm.c: parenthesize macro arguments.
-
-Thu Mar 24 14:45:57 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl.c: suppress warning: shorten-64-to-32.
-
- * ext/openssl/ossl.h: ditto.
-
- * ext/openssl/ossl_asn1.c: ditto.
-
- * ext/openssl/ossl_bio.c: ditto.
-
- * ext/openssl/ossl_bn.c: ditto.
-
- * ext/openssl/ossl_cipher.c: ditto.
-
- * ext/openssl/ossl_hmac.c: ditto.
-
- * ext/openssl/ossl_ns_spki.c: ditto.
-
- * ext/openssl/ossl_ocsp.c: ditto.
-
- * ext/openssl/ossl_pkcs5.c: ditto.
-
- * ext/openssl/ossl_pkey.c: ditto.
-
- * ext/openssl/ossl_pkey_dh.c: ditto.
-
- * ext/openssl/ossl_pkey_dsa.c: ditto.
-
- * ext/openssl/ossl_pkey_ec.c: ditto.
-
- * ext/openssl/ossl_pkey_rsa.c: ditto.
-
- * ext/openssl/ossl_rand.c: ditto.
-
- * ext/openssl/ossl_ssl.c: ditto.
-
- * ext/openssl/ossl_x509ext.c: ditto.
-
- * ext/openssl/ossl_x509name.c: ditto.
-
-Thu Mar 24 11:48:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_rand.c (ossl_rand_egd_bytes): use NUM2INT because
- the result is used with functions whose argument is int.
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): ditto.
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_purpose): ditto.
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_trust): ditto.
-
- * ext/openssl/ossl_x509store.c (ossl_x509stctx_set_purpose): ditto.
-
- * ext/openssl/ossl_x509store.c (ossl_x509stctx_set_trust): ditto.
-
-Thu Mar 24 11:36:55 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_x509name.c: id_aref's type is ID.
-
-Thu Mar 24 10:04:35 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/io/console/console.c (console_set_winsize):
- suppress warning: shorten-64-to-32.
-
-Thu Mar 24 09:56:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
- so it should use NUM2INT.
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
-
-Wed Mar 23 21:09:29 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/readline/readline.c: parenthesize macro arguments.
-
-Wed Mar 23 08:07:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_round): fix inaccurate results.
-
-Wed Mar 23 00:12:16 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * win32/win32.c: wait process real termination after reading
- exit code. fixes #4518
-
-Tue Mar 22 21:20:10 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rubygems/test_case.rb: save current dir to @current_dir
- before Dir.chdir.
-
-Tue Mar 22 20:10:04 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/psych/parser.c: parenthesize macro arguments.
-
-Tue Mar 22 20:10:01 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ruby_missing.h: parenthesize macro arguments.
-
-Tue Mar 22 13:33:22 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/openssl/lib/openssl/buffering.rb: removed circular require of
- openssl.rb.
-
- * ext/openssl/lib/openssl/*: removed following comment for transition
- measures of avoiding circular require. No one claimed about this as
- far as I know.
- ##
- # Should we care what if somebody require this file directly?
- # require "openssl"
-
-Tue Mar 22 10:57:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/runner.rb: set Gem::TestCase's @@project_dir.
-
- * lib/rubygems/test_case.rb: set Gem::TestCase's @@project_dir only
- when it is not defined.
-
-Tue Mar 22 09:38:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (flo_round): use pow instead of while-loop. fixes #4510
- patched by Alex Young [ruby-core:35526]
-
-Tue Mar 22 06:47:46 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/date_strftime.c (date_strftime_wo_timespec):
- suppress warning: shorten-64-to-32.
-
-Tue Mar 22 06:42:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/date/date_core.c: suppress warning: shorten-64-to-32.
-
-Tue Mar 22 06:41:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/test/unit/parallel.rb: remove unused variable.
-
-Tue Mar 22 06:19:42 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_16le.c: suppress warning: shorten-64-to-32.
-
- * ext/dbm/dbm.c: ditto.
-
- * ext/gdbm/gdbm.c: ditto.
-
- * parse.y (Init_ripper): suppress warning: unused value.
-
-Mon Mar 21 11:21:32 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Refactoring. Unified if and elsif.
-
-Sun Mar 20 23:09:34 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_strftime.c: checks duplicated modifiers.
-
-Sun Mar 20 22:32:30 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_strftime.c: removed unused code and arguments.
-
-Sun Mar 20 21:34:49 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: replacement of implementation of
- strftime. It has some limitations that is same as Time's
- one. [experimental]
- * ext/date/date_strftime.c: new.
- * ext/date/lib/date/format.rb: removed ruby version of strftime.
-
-Sun Mar 20 12:43:12 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509store.c: parenthesize macro arguments.
-
-Sun Mar 20 01:39:48 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * hash.c (ruby_setenv): check env process block size with OS ver.
- * win32/win32.c: export rb_w32_osver for above patch.
- * include/ruby/win32.h: declare rb_w32_osver for Win32 Libs.
-
-Sat Mar 19 18:35:05 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * hash.c (ruby_setenv): calculate total env block size for win32.
- * test/ruby/test_env.rb: add test for above patch.
-
-Sat Mar 19 17:14:46 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * hash.c (ruby_setenv): checking with max process environment
- block size for Win32. 32767 for 2000/XP, 2003. if failed to
- read the block, then checking with 5120 for earlier Windows.
-
-Sat Mar 19 12:30:25 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509revoked.c: parenthesize macro arguments.
-
-Fri Mar 18 20:44:36 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509req.c: parenthesize macro arguments.
-
-Fri Mar 18 08:48:06 2011 Oleg Shaldybin <oleg.shaldybin@gmail.com>
-
- * lib/fileutils.rb (FileUtils::Entry_#copy_file): updated FileUtils.cp
- to still copy file permissions when :preserve is false (as cp does
- this even when -p isn't set).
-
-Fri Mar 18 00:59:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/win32ole/extconf.rb (create_docfile): removed. should not
- modify source directory unnecessarily, platform dependent
- documentation should be dealt with by rdoc. [ruby-core:35495]
-
-Fri Mar 18 00:54:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_funcall_passing_block): add prototype.
- a patch by James M. Lawrence at [ruby-core:35501]
-
-Wed Mar 17 06:23:31 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509name.c: parenthesize macro arguments.
-
-Wed Mar 16 20:36:56 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ipsocket.c (init_inetsock_internal): raise an error on
- listen(2) failure.
- reported by Xavier Shay. [ruby-core:35505]
-
-Wed Mar 16 15:06:21 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
- not change sync mode on exception.
- * test/openssl/test_buffering.rb: added
-
-Wed Mar 16 13:45:28 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl/lib/openssl/buffering.rb: de-nest Buffering module
-
- * ext/openssl/lib/openssl/buffering.rb: add RDoc
-
-Wed Mar 16 08:40:39 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509ext.c: parenthesize macro arguments.
-
-Tue Mar 15 18:34:27 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509crl.c: parenthesize macro arguments.
-
-Tue Mar 15 09:49:03 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/misc/test_ruby_mode.rb (test_singleton_class): Skip for Pending.
-
-Mon Mar 14 21:20:44 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/ruby/test_require.rb (test_require_too_long_filename):
- increase path length, because MAXPATHLEN is defined as 4096 on linux.
-
- * test/ruby/test_require.rb (test_require_path_home_1): ditto.
-
- * test/ruby/test_require.rb (test_require_path_home_2): ditto.
-
-Mon Mar 14 19:54:37 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509cert.c: parenthesize macro arguments.
-
-Sun Mar 13 18:11:28 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_x509attr.c: parenthesize macro arguments.
-
-Sun Mar 13 16:07:58 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
- is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]
-
- * test/test_pstore.rb: Test for above.
- Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]
-
-Sat Mar 12 04:12:41 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ssl_session.c: parenthesize macro arguments.
-
-Sat Mar 12 02:27:07 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c ({d,dt}_lite_marshal_load): checks the given
- argument.
-
-Sat Mar 12 01:26:24 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c: changed some directives.
-
-Sat Mar 12 01:16:02 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/date_core.c, ext/date/lib/*: moved rdoc descriptions.
-
-Sat Mar 12 00:06:24 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * ext/date/lib: moved from lib.
-
-Fri Mar 11 23:32:38 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/delta*: removed undocumented delta.
-
-Fri Mar 11 18:42:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (find_executable0): should exclude directories.
-
-Fri Mar 11 01:40:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (proc_getmaxgroups, proc_setmaxgroups): Process#maxgroups
- and Process#maxgroups= now raise NotImplementedError if the
- platform don't support supplementary groups concept.
-
-Fri Mar 11 01:25:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (get_sc_ngroups_max): return -1 if platform don't
- support NGROUPS_MAX.
-
-Thu Mar 10 22:28:15 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ssl.h: parenthesize macro arguments.
-
-Thu Mar 10 21:59:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (parser_encode_length): add exception as UTF8-MAC for
- magic comment's emacs newline specifier
- patched by James M. Lawrence [ruby-core:35476] fixes #4489
-
-Thu Mar 10 16:00:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (parser_encode_length): fix typo: the length of
- "-dos" and "-mac" is not 5 but 4.
- patched by James M. Lawrence [ruby-core:35476] fixes #4489
-
-Thu Mar 10 10:52:01 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_require.rb: setting too long string to ENV causes
- Errno::EINVAL on Windows. long path name errors may causes over
- about 1024 bytes, then limit it about 4000 bytes.
-
-Thu Mar 10 10:09:35 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::Runner::Worker#read): fix for the case
- when IO#read or IO#gets returns nil.
-
-Thu Mar 10 07:12:03 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/rubygems*: Import rubygems 1.6.2 (release candidate @ 2026fbb5)
- * test/rubygems: Ditto
- * test/runner.rb: Added test to load path to fix test requires.
-
-Thu Mar 10 03:00:43 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ssl.c: parenthesize macro arguments.
-
-Wed Mar 9 23:51:26 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
- of Windows-31J.
-
-Wed Mar 9 23:06:13 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
-
-Wed Mar 9 12:50:24 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb: Rescue exceptions when
- people implement the method method. Thanks Lin Jen-Shin.
- [ruby-core:35255]
-
- * test/psych/visitors/test_yaml_tree.rb: test for implementation of
- method method.
-
-Wed Mar 9 11:53:31 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
- [ruby-dev:43027] fixes #4280
-
- * enc/shift_jis.c: Add PCK as an alias of Windows-31J.
-
-Wed Mar 9 00:45:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: nmake substitutes all occurrences in macro.
-
- * ext/extmk.rb: workaround for nmake.
-
-Tue Mar 8 23:49:45 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (proc_setgroups): cleanup.
-
-Tue Mar 8 23:40:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/misc/test_ruby_mode.rb: test for ruby-mode.el.
-
-Tue Mar 8 23:27:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (get_sc_ngroups_max): try to use NGROUPS_MAX at first if
- _SC_NGROUP_MAX is not defined.
-
-Tue Mar 8 23:10:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-parse-partial): fix for array in block.
-
-Tue Mar 8 21:44:49 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_rand.c: parenthesize macro arguments.
-
-Tue Mar 8 16:45:31 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * hash.c (ruby_setenv): MSDN says that Windows XP or earlier limits
- the total size of environment block to 5,120 chars. and on such
- OS, putenv() causes SEGV. So, ruby should limit the size of an
- environment variable to 5,120 bytes for workaround.
-
-Tue Mar 8 15:57:20 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/rubygems/test_gem_spec_fetcher.rb
- (TestGemSpecFetcher#test_cache_dir_escapes_windows_paths): cache_dir
- may have driveletter and `:' for base of cache_dir itself, so need
- to skip it for checking.
-
-Tue Mar 8 12:30:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):
- do not apply deep-indent inside parens at the beginning of
- expressions.
-
-Tue Mar 8 09:32:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (configure-ext, build-ext), ext/extmk.rb (extmake):
- support parallel-make under ext.
-
-Tue Mar 8 09:25:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_setgroups): use getgrnam() if getgrnam_r() is
- not available.
-
- * process.c: RARRAY_LEN() returns long int.
-
-Tue Mar 8 09:07:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_REPLACE_TYPE): enclose in quotes for multiple
- type names.
-
-Tue Mar 8 01:43:11 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * process.c (get_sc_ngroups_max): define to wrap sysconf(3).
- this also supports Windows which doesn't have sysconf(3).
-
- * process.c (maxgroups): use get_sc_ngroups_max.
-
- * process.c (proc_setmaxgroups): ditto.
-
-Tue Mar 8 01:16:49 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * gc.c (rb_objspace): an initializer must be a constant.
-
-Tue Mar 8 01:11:44 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * process.c (maxgroups): cast because sysconf(3)'s return value is long.
-
- * process.c (proc_setmaxgroups): ditto.
-
- * process.c (proc_setgroups): cast because RARRAY_LEN() is long.
-
-Tue Mar 8 00:02:47 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkey_rsa.c: parenthesize macro arguments.
-
-Mon Mar 7 22:59:39 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
- Masaki Matsushita (Glass_saga).
-
- * test/test_pstore.rb(test_thread_safe): Add test for #4474.
-
-Mon Mar 7 21:31:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (proc_setgroups): replace getgrnam() with getgrnam_r()
- because getgrnam() isn't thread safe.
-
-Mon Mar 7 20:49:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (proc_getmaxgroups, proc_setmaxgroups): reflect
- platform maxgroups limitation by default instead hardcoded 65536.
-
-Mon Mar 7 17:13:00 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_set_params): allow GC parameter configuration by
- environment variables. based on a patch from funny-falcon at
- https://gist.github.com/856296, but honors safe level.
-
-Mon Mar 7 09:05:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c: NUM2RLIM is defined but no getrlimit and setrlimit on
- mingw.
-
-Mon Mar 7 08:38:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/date/date_core.c (DateTimeData): should not use bare 'long long'
- and 'long double', which are not defined by C89.
-
- * ext/date/date_core.c (dt_lite_plus): get rid of overflow at casting
- down double to integer.
-
-Mon Mar 7 00:21:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (proc_getgroups): get rid of maxgroups dependency.
- ngroups can be calculated dynamically.
-
-Sun Mar 6 23:45:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: rlim_t use standard RUBY_REPLACE_TYPE mechanism.
-
-Sun Mar 6 23:26:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (proc_setmaxgroups): added negative value check.
- This was suggested by Daniel Berger. Thanks Daniel!
- [ruby-core:35426][Bug#4467]
-
-Sun Mar 6 23:18:23 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (maxgroups, proc_setmaxgroups): increase max groups
- limitation up to 65536.
-
-Sun Mar 6 22:20:59 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkey_ec.c: parenthesize macro arguments.
-
-Sun Mar 6 21:49:04 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * sample/list.rb (MyElem#initialize): initialize @head
- explicitly. Otherwise -W2 option makes following warning.
- "warning: instance variable @head not initialized".
- This issue was founded by Andrew Grimm. Thanks Andrew!
- [ruby-core:35435][Bug#4471]
-
-Sun Mar 6 05:21:41 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * class.c: fix camelCase to snake_case in documentation code examples.
- patched by Andrew Grimm. fixes Bug #4469
-
- * marshal.c: ditto.
-
- * proc.c: ditto.
-
- * sample/biorhythm.rb: ditto.
-
- * vm_eval.c: ditto.
-
- * vm_method.c: ditto.
-
-
-Sun Mar 6 03:22:27 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (io_cntl): use rb_thread_io_blocking_region() instead
- rb_thread_blocking_region().
-
-Sat Mar 5 22:54:36 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * include/ruby/intern.h: fix a typo of prototype declaration.
- rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
-
-Sat Mar 5 19:44:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_io.rb (TestIO#test_fcntl_lock): small clean up.
-
-Sat Mar 5 01:33:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (io_cntl, nogvl_io_cntl): IO.fcntl() and IO.ioctl()
- release GVL during calling kernel interface.
- Suggested by Eric Wong. [ruby-core:35417][Bug #4463]
-
- * test/ruby/test_io.rb (TestIO#test_fcntl_lock): add new test for
- IO.fcntl().
-
-Fri Mar 4 23:09:12 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/testunit/test_parallel.rb
- (test_should_run_all_without_any_leaks): consider that the order of
- testcase could change. [ruby-dev:43300] [Bug #4466]
-
-Fri Mar 4 22:01:14 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
- be passed int.
- * io.c (rb_io_ctl): ditto.
-
-Fri Mar 4 21:10:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: save warnflags. the patch is created by Eric Wong.
- [Bug #4465]
-
-Wed Mar 2 21:15:00 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkey_dsa.c: parenthesize macro arguments.
-
-Thu Mar 3 22:10:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (check_exec_redirect_fd, check_exec_redirect): raise
- ArgumentError if fd >= 3 on Windows because the feature is not
- supported.
-
- * test/ruby/test_process.rb (test_execopts_redirect): remove meaningless
- argument.
-
-Thu Mar 3 21:21:42 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
- >= 3 is not supported on Windows, so should not specify such options
- when calling spawn or others.
-
-Thu Mar 3 18:59:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_slice_bang): raise error when the string is frozen.
-
-Thu Mar 3 14:25:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * strftime.c (STRFTIME): return 0 and ERANGE when precision is too
- large. [ruby-dev:43284] fixes #4456
-
-Thu Mar 3 00:46:51 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c (uleb128): cast the value to unsigned long.
-
- * addr2line.c (fill_lines): print error when lseek fails.
-
-Thu Mar 3 00:36:29 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/encoding.rb (REXML::Encoding#encoding=): store @encoding
- a String which means the name of the encoding.
- this partially revert r29646.
-
- * lib/rexml/document.rb: follow above.
-
- * lib/rexml/output.rb: ditto.
-
- * lib/rexml/parsers/baseparser.rb: ditto.
-
- * lib/rexml/source.rb: ditto.
-
- * lib/rexml/xmldecl.rb: ditto.
-
-Wed Mar 2 23:19:56 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_byte_substr): return nil for negative length.
-
-Wed Mar 2 21:15:00 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkey_dh.c: parenthesize macro arguments.
-
-Wed Mar 2 14:24:04 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/parallel.rb: Fix name from `inclement_io` to
- `increment_io`.
-
-Wed Mar 2 14:06:01 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_slice_bang): move treatments which is only needed
- when the result is not nil.
-
-Wed Mar 2 14:02:29 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/testunit/test_parallel.rb(TestParallel#spawn_runner):
- Fix outputing empty line in running test.
-
- * test/testunit/tests_for_parallel/test_third.rb: Remove `sleep`
-
-Tue Mar 1 22:29:10 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkey.h: parenthesize macro arguments.
-
-Tue Mar 1 22:02:35 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/parallel.rb: Fix number.
-
-Tue Mar 1 21:48:22 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit/parallel.rb: For Windows.
-
- * test/testunit/test_parallel.rb(TestParallelWorker#test_quit_in_test):
- Fix for above specification change.
- * test/testunit/test_parallel.rb(TestParallel#spawn_runner):
- Fix outputing empty line in running test.
-
-Tue Mar 1 20:51:57 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_system.rb (TestSystem#test_system_at):
- remove tests for [bug#4396]. because we decided to reject this
- ticket.
-
-Tue Mar 1 19:46:19 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * test/date/{test_date.rb,test_date_attr.rb}: [ruby-dev:43280]
-
-Tue Mar 1 18:40:38 2011 Ryan Davis <ryan@YPCMC09457>
-
- * lib/rubygems*: Import rubygems 1.6.0 (released version @ 58d8a0b9)
- * test/rubygems: Ditto
-
-Tue Mar 1 16:22:22 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c: revert r30987 because it causes some failures in
- test-all, especially webrick.
-
-Tue Mar 1 15:59:53 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_byteslice): the resulted encoding should keep
- original encoding. this also fixes the encoding when the result
- shares internal string. [ruby-core:35376]
-
-Tue Mar 1 13:25:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpMemAlloc): CVE-2011-0188.
- Fixes a bug reported by Drew Yao <ayao at apple.com>
-
-Tue Mar 1 10:34:39 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_byteslice): Add String#byteslice. [ruby-core:35376]
-
-Tue Mar 1 00:12:49 2011 Tajima Akio <artonx@yahoo.co.jp>
-
- * include/ruby/win32.h: define WIN32 if neither _WIN64 nor WIN32
- defined. it forces to use push/pop for pack(4) pragma.
-
-Mon Feb 28 23:52:13 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/testunit/test_rake_integration.rb (test_with_rake_runner):
- use assert_in_out_err for suppress messages.
-
-Mon Feb 28 22:48:56 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c (rb_w32_spawn): use shell if a commandline contain
- double-quote character.
- * win32/win32.c (is_internal_cmd): similar, use shell if a commandline
- contain caret character.
-
- * test/ruby/test_system.rb (TestSystem#test_system_at): fix
- wrong test case. if system() invoke a command by using shell,
- system() never return nil. Also, "" quotation must not appear
- twice in a command line.
-
-Mon Feb 28 17:36:57 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkcs7.c: parenthesize macro arguments.
-
-Mon Feb 28 16:48:42 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_pkcs12.c: parenthesize macro arguments.
-
-Mon Feb 28 16:28:15 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_trans): when the hash for multibyte repl is empty,
- tr is inverse mode, and a character doesn't much the table, the
- character should be replaced by last replacement. Bug #4449
-
-Mon Feb 28 16:38:56 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ocsp.c: parenthesize macro arguments.
-
-Mon Feb 28 13:02:15 2011 Danial Pearce <github@tigris.id.au>
-
- * lib/tempfile.rb: Fix example file paths in docs for tempfile.
- https://github.com/ruby/ruby/pull/5
-
-Mon Feb 28 12:56:18 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * ext/openssl/ossl_cipher.c (ossl_cipher_init): typo fix.
- https://github.com/ruby/ruby/pull/8
-
-Mon Feb 28 12:28:13 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/date/date_core.c (datetime_s_now): localtime() and localtime_r()
- required time_t pointer as 1st parameter, and tv_sec member of struct
- timeval is long.
-
-Mon Feb 28 11:57:40 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/testunit/test_parallel.rb: Temporally disable test on Windows.
-
-Mon Feb 28 07:28:35 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb(Test::Unit::Runner#after_worker_quit):
- method name more be natural English.
-
- * lib/test/unit.rb(Test::Unit::Runner::Worker.launch):
- IO.sync doesn't need. Should use "b" for mode.
-
-Sun Feb 27 21:59:37 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_system.rb (TestSystem#test_system_redirect_win):
- add test for system().
-
-Sun Feb 27 18:00:09 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Refactoring; Worker never use Hash for internal
- storage.
-
- * lib/test/unit.rb: Never use Kernel#spawn. Use IO.popen instead.
-
-Sun Feb 27 13:16:48 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_ns_spki.c: parenthesize macro arguments.
-
-Sat Feb 26 17:07:53 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: [Feature #4257]
-
- * ext/date/extconf.rb: new
-
- * ext/date/date_core.c: new
-
-Sat Feb 26 16:10:23 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: --jobs-status won't puts over 2 lines.
-
- * test/testunit/test_parallel.rb: Fix test for above.
-
- * lib/test/*: refactoring.
-
-Sat Feb 26 07:10:05 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/scalar_scanner.rb: fix parsing timezone's whose
- whose format is (+/-)hhmm. Thanks Goncalo Silva!
-
- * test/psych/test_scalar_scanner.rb: test for bug.
-
-Thu Feb 24 23:02:55 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_hmac.c: parenthesize macro arguments.
-
-Thu Feb 24 22:53:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (love): for the birthday.
-
-Thu Feb 24 22:51:54 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (ruby_vm_destruct): run vm exit hooks after all objects are
- destructed.
-
-Thu Feb 24 14:40:33 2011 Shota Fukumori <sorah@tubusu.net>
-
- * ChangeLog (vim): Modeline for vim
-
-Thu Feb 24 13:39:25 2011 Shota Fukumori <sorah@tubusu.net>
-
- * common.mk: Use $RUNRUBY for worker process.
-
- * lib/test/unit.rb: Fix bug.
-
- * lib/test/unit.rb: @options[:ruby](@opts[:ruby]) is now Array.
-
- * test/testunit/parallel.rb: Fix for above.
-
-Thu Feb 24 10:05:55 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/testunit/tests_for_parallel/misc.rb: Fix bug in r30947.
-
- * lib/test/unit.rb, lib/test/unit/assertions.rb: For this test.
-
-Wed Feb 23 23:07:38 2011 Shota Fukumori <sorah@tubusu.net>
-
- * test/testunit/test_parallel.rb, test/testunit/parallel/*:
- Test for r30939.
-
- * lib/test/unit.rb: For test.
-
- * lib/test/parallel.rb: For test.
-
- * lib/test/unit/testcase.rb: For test.
-
-Wed Feb 23 22:05:13 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_engine.c: parenthesize macro arguments.
-
-Tue Feb 22 23:15:17 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Fix --ruby option doesn't effect.
-
- * lib/test/unit.rb: Fix typo.
-
-Tue Feb 22 21:39:28 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_digest.c: parenthesize macro arguments.
-
-Tue Feb 22 14:34:26 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Fix merging miss.
-
-Tue Feb 22 12:27:26 2011 Shota Fukumori <sorah@tubusu.net>
-
- * lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
- --no-retry.
- [Feature #4415] [ruby-dev:43226],[ruby-dev:43222],[ruby-core:35294]
-
- * lib/test/unit/parallel.rb: Used at test/unit --jobs(-j) option.
-
- * test/csv/test_serialization.rb: test/unit parallel running ready.
-
- * test/rake/test_file_task.rb: test/unit parallel running ready.
-
-Tue Feb 22 06:09:10 2011 Eric Hodel <drbrain@segment7.net>
-
- * ext/syslog/syslog.c: Apply documentation patch from mathew murphy.
- [Bug #4149]
-
-Tue Feb 22 03:09:10 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych.rb: increase Psych to 1.1.0 for help with
- debugging.
-
-Tue Feb 22 03:04:46 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/streaming.rb: refactor streaming methods to a
- module.
- * ext/psych/lib/psych/stream.rb: extracted streaming specific methods
- to a module.
- * ext/psych/lib/psych/json/stream.rb: JSON stream inherits from
- JSONTree and includes streaming methods.
- * ext/psych/lib/psych/visitors/json_tree.rb: JSON does not support
- object references, so remove object reference testing when building
- JSON trees.
-
-Tue Feb 22 02:41:51 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb (accept): use Hash#key?
- when looking up object references to err on the side of cache
- misses.
-
-Mon Feb 21 10:58:39 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/json/yaml_events.rb: refactoring JSON event
- handling methods to a module for reuse.
- * ext/psych/lib/psych/json/tree_builder.rb: AST builder uses JSON
- event methods.
- * ext/psych/lib/psych/json/stream.rb: stream emitter uses JSON event
- methods.
-
-Mon Feb 21 10:54:29 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
- or sequences when emitting JSON.
- * ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
- sequences when emitting JSON.
- * test/psych/json/test_stream.rb: tests for custom stream emits.
- * test/psych/test_json_tree.rb: tests for JSON emits.
-
-Mon Feb 21 10:05:10 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/json/ruby_events.rb: DRY up ruby event handling
- for JSON.
- * ext/psych/lib/psych/visitors/json_tree.rb: use ruby events module
- * ext/psych/lib/psych/json/stream.rb: ditto
-
-Mon Feb 21 10:01:01 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use
- double quotes during stream.
- * test/psych/json/test_stream.rb: tests to reflect changes.
-
-Mon Feb 21 00:38:56 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_system.rb (TestSystem#test_system_at):
- add testcase for bug4396.
-
-Sun Feb 20 19:59:32 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_cipher.c: parenthesize macro arguments.
-
-Sun Feb 20 16:26:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (exec_recursive): prevent temporary objects from GC.
-
- * prevent temporary objects from GC, and should not use
- RSTRING_PTR() for function calls since it evaluates the argument
- a couple of times.
-
-Sun Feb 20 16:22:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_flock): use rb_thread_io_blocking_region for the
- time being.
-
-Sun Feb 20 05:33:17 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 2.0.2 r6207.
- * test/minitest/*: ditto
-
-Sun Feb 20 02:14:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
- because FreeBSD don't permit it. If it's used, it behave as
- pthread_sigmask(xx, NULL, &mask).
-
- * signal.c (init_sigchld): ditto.
-
-Sun Feb 20 00:46:51 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_bn.c: parenthesize macro arguments.
-
-Sat Feb 19 22:37:42 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * vm_insnhelper.c (vm_check_if_namespace): guard temporary object
- from GC.
-
-Sat Feb 19 06:36:27 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/test/unit.rb: partial revert of r30849. [ruby-core:32864]
-
- * test/testunit/test_rake_integration.rb: adding an integration test
- with the rake loader to prevent regressions.
-
-Fri Feb 18 19:31:31 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
- race condition in the case where the given path is a directory,
- and some other user can move that directory, and create a
- symlink while this method is executing.
- Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>
-
-Fri Feb 18 00:28:39 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * compile.c (get_exception_sym2type): guard temporary object from GC.
-
-Thu Feb 17 23:54:29 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * iseq.c (prepare_iseq_build): initialize iseq_compile_data::err_info
- with nil. this fix exception in rb_iseq_load().
-
-Thu Feb 17 22:32:35 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * test/ruby/test_marshal.rb (test_marshal_dump_extra_iv):
- fix a typo of local variable. [Bug #3720] [ruby-dev:42083]
-
-Thu Feb 17 21:32:53 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl.h: parenthesize macro arguments.
-
-Wed Feb 16 20:37:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * eval_jump.c (rb_exec_end_proc): changed at_exit and END proc
- evaluation order. [Bug #4400] [ruby-core:35237]
- * eval_jump.c (rb_mark_end_proc): ditto.
-
- * test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_nested_at_exit):
- added a test for nested at_exit.
- * test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_beginendblock):
- changed the test to adopt new spec.
-
-Wed Feb 16 20:17:06 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/openssl_missing.h: parenthesize macro arguments.
-
-Tue Feb 15 21:37:45 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/gdbm/gdbm.c: parenthesize macro arguments.
-
-Tue Feb 15 20:34:53 2011 Tanaka Akira <akr@fsij.org>
-
- * array.c (ary_join_1): fix array size.
-
-Tue Feb 15 19:43:23 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: fix and resubmit r30621. [ruby-dev:43203]
-
-Tue Feb 15 15:41:30 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (array_join): copy the encoding of the first element as
- an initial encoding.
-
- * array.c (array_join_0): ditto.
-
- * array.c (array_join_1): ditto.
-
- * array.c (inspect_ary): ditto.
-
- * array.c (array_join_1): add an argument to check the appending is
- first one or not.
-
-Tue Feb 15 15:40:53 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * hash.c (inspect_i): copy the encoding of the first key as
- an initial encoding.
-
-Mon Feb 14 15:00:16 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (inspect_ary): don't taint the inspected result of a
- recursive array.
-
-Tue Feb 15 15:43:29 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_compatible): change the rule for empty strings:
- remove the special treatment of the US-ASCII encoded empty string.
- Now Encoding.compatible? usually respect the encoding of the
- receiver.
-
-Tue Feb 15 15:39:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_buf_cat): remove special treatment of
- ASCII-8BIT receivers.
-
- * string.c (str_gsub): set initial encoding of the buffer as the
- same of the receiver. [ruby-core:35141]
-
-Tue Feb 15 09:49:33 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_system.rb (TestSystem#test_system_at): use findstr
- command instead of find command, because the latter is confusing
- another famous Unix command.
-
-Mon Feb 14 23:01:19 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * thread.c (rb_thread_io_blocking_region): reset th->waiting_fd
- after blocking region, because remaining waiting_fd might
- cause unnecessary IOError.
-
-Mon Feb 14 21:06:50 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * configure.in: revert r30621. That revision introduced mkmf test
- failures and it turned out to be OK to revert. [ruby-dev:43203]
-
-Mon Feb 14 21:04:01 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/fiddle/conversions.h: parenthesize macro arguments.
-
-Mon Feb 14 18:41:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
- mswin32 port. If you changed win32/configure.bat, you should change
- setup.mak too.
-
-Mon Feb 14 17:28:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_system.rb (TestSystem#test_system_at):
- added test. [ruby-core:35218] (#4393)
-
-Mon Feb 14 13:15:35 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (is_internal_cmd): if the first char of prog is '@',
- execute it via shell. [ruby-core:35218] (#4393)
-
-Mon Feb 14 10:33:45 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit.rb: revert r30863, because it causes too many noise.
-
-Mon Feb 14 07:34:55 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/curses/curses.c: parenthesize macro arguments.
-
-Sun Feb 13 19:41:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::RequireFiles#non_options): skip
- test suites failed to load instead of mere messages.
-
-Sun Feb 13 09:56:44 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/openssl/test_config.rb (OpenSSL#test_freeze): fix error
- message assertion.
-
- * test/io/nonblock/test_flush.rb (TestIONonblock#flush_test):
- return true to finish the test.
-
- * test/syck/test_string.rb (Syck::TestString#test_non_binary_string):
- use assert_not instead of refute, unless required minitest
- explicitly.
-
- * test/test_prime.rb (TestPrime::sieve.Integer): ditto.
-
- * test/xmlrpc/webrick_testing.rb (WEBrick_Testing#start_server):
- catch IOError when server socket was closed.
-
-Sun Feb 13 07:39:51 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_inject): typo fixed. a patch from Gaku Ueda in
- [ruby-core:35216].
-
-Sun Feb 13 00:48:47 2011 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (Date#===): [ruby-core:35127]
-
-Sun Feb 13 00:29:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::Options#process_args): always
- return options.
-
- * lib/test/unit.rb (Test::Unit::RequireFiles#non_options): return
- if any test case get loaded.
-
- * lib/test/unit.rb (Test::Unit::AutoRunner#initialize): do not add
- default directory if it is nil.
-
- * lib/test/unit.rb (Test::Unit::AutoRunner#process_args): return
- true if any test cases to run.
-
-Sat Feb 12 23:17:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (assert_include): add alias.
-
-Sat Feb 12 14:44:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_io_blocking_region): new function to run
- blocking region with GIL released, for fd.
-
- * thread.c (rb_thread_fd_close): implement. [ruby-core:35203]
-
- * vm.c (th_init): rename from th_init2.
-
-Sat Feb 12 14:41:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::AutoRunner#initialize): use
- default_dir if no test case given.
-
- * lib/test/unit.rb (Test::Unit::Runner): rename from Test::Unit::Mini.
-
- * lib/test/unit.rb (Test::Unit::GlobOption#non_options): run tests
- under base directory if no argument given.
-
-Sat Feb 12 08:03:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_settracefunc.rb (TestSetTraceFunc): ensure to use
- method_added hook defined in Module.
-
-Sat Feb 12 01:04:02 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (proc_options): enable rubygems if --gem option is given.
-
- * ruby.c (process_options): load rubygems if it is disabled but
- --gem option is given.
-
-Fri Feb 11 23:27:50 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ruby.c (proc_options): add --gem=enabled as an alias of
- --enable=gems and --gem=disabled as an alias of --disable=gems.
- Gem named "enabled" or "disabled" has already been reserved
- legitimately for this purpose.
-
-Fri Feb 11 23:17:04 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/cfunc.c: parenthesize macro arguments.
-
-Fri Feb 11 21:41:53 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bin/testrb, test/runner.rb, lib/test/unit.rb: improve backward
- compatibility.
-
-Fri Feb 11 19:45:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): use rb_ary_free to free internal object.
-
- * gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
- [ruby-core:35192]
-
-Fri Feb 11 16:57:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_transcode.rb (test_from_cp50221): fix wrong
- assertion and move back.
-
-Fri Feb 11 14:33:18 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (assert_no_match): alias for
- backward compatibility.
-
-Fri Feb 11 12:06:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (add_gems, require_libraries, proc_options): add
- --require and --gem options.
-
-Fri Feb 11 12:03:24 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rubygems): add --disable-rubygems option.
-
-Fri Feb 11 11:39:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/fake.rb.in (CROSS_COMPILING): get rid of NameError.
-
-Thu Feb 10 23:12:34 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/dl/dl.h: parenthesize macro arguments.
-
-Wed Feb 9 23:11:27 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c: parenthesize macro arguments.
-
-Tue Feb 8 11:47:11 2011 Loren Sands-Ramshaw <lorensr@gmail.com>
-
- * array.c: documentation clarification in rotate, rotate!,
- index, and rindex. [ruby-core:35144]
-
-Wed Feb 9 09:45:43 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
- platform-dependent hacks.
-
-Wed Feb 9 00:47:18 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/etc/etc.c: parenthesize macro arguments.
-
-Tue Feb 8 19:38:00 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-expr-beg): fix for invalid nest errors.
-
-Tue Feb 8 19:22:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in (AC_MSG_CHECKING): fixed typo. the patch is
- created by Benoit Daloze. Thanks a lot. [Bug #4384][ruby-core:35148]
-
-Tue Feb 8 16:04:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_io_s_sysopen): use NUM2MODET() instead NUM2UINT().
-
-Tue Feb 8 15:59:23 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (rb_run_exec_options_err): use MODET2NUM() instead
- LONG2NUM().
-
-Tue Feb 8 13:59:56 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: revert r30725. Now we have proper runtime fallback.
- Therefore, no need compile time disabling. (see r30762).
-
-Tue Feb 8 01:00:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * process.c (proc_setgroups): add GC guard to prevent intermediate
- variable from GC.
-
-Tue Feb 8 00:56:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-expr-beg, ruby-in-here-doc-p): tell
- singleton class definitions from here documents.
-
- * misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword
- followed by colon is label.
-
-Mon Feb 7 22:56:16 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
- Object#tap to restore STDOUT.sync.
-
-Mon Feb 7 22:34:20 2011 Tanaka Akira <akr@fsij.org>
-
- * lib/net/http.rb (Net::HTTP#connect): support SNI (Server Name
- Indication) for HTTPS. [ruby-dev:43164]
- http://stackoverflow.com/questions/4685736/openssl-server-name-indication-support-in-ruby
-
-Mon Feb 7 16:05:32 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Upgrade to RDoc 3.5.3 Fixes [Bug #4376]
-
-Mon Feb 7 11:46:59 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (rdoc): add --encoding=UTF-8; ruby's rdoc must be UTF-8.
-
-Mon Feb 7 10:21:50 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
- there is no easy way to create owner unreadable file on Windows.
- So, skip the test.
-
-Sun Feb 6 13:48:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
- should not drop rest of the result. use Iconv.conv instead.
-
-Sun Feb 6 12:46:02 2011 Eric Hodel <drbrain@segment7.net>
-
- * string.c (gsub): Ensure result encoding is the same as input
- encoding. [Bug #4340].
-
-Sun Feb 6 12:18:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (words, qwords): dispatch array events. based on a
- patch from Michael Edgar. [Bug #4365].
-
-Sun Feb 6 12:12:59 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/fileutils/fileasserts.rb (FileAssertions): separate module.
-
-Sun Feb 6 11:29:23 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/dbm/dbm.c: parenthesize macro arguments.
-
-Sat Feb 5 22:01:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- revert r30796. r30797 and r30798 are an alternative fix.
- [ruby-dev:43174]
-
-Sat Feb 5 21:47:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (mlhs_basic): include mlhs_post for ripper. a patch
- from Michael Edgar at [ruby-core:35078].
-
-Sat Feb 5 21:22:21 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (assert_block): move from
- test/fileutils/fileasserts.rb.
-
- * test/fileutils/fileasserts.rb (assert_block): pass arguments
- as-is. [ruby-dev:43174]
-
-Sat Feb 5 16:47:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- msg can be passed nil. [Bug #4371] [ruby-dev:43174]
-
-Sat Feb 5 15:18:25 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Upgrade to RDoc 3.5.2
-
-Sat Feb 5 12:05:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_node_init_copy): SyckNode is not
- copiable. [ruby-core:35094]
-
-Sat Feb 5 11:48:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/ossl_cipher.c (ossl_cipher_alloc): leave data ptr
- NULL.
-
- * ext/openssl/ossl_cipher.c (ossl_cipher_new, ossl_cipher_initialize):
- allocate internal structure. [ruby-core:35094]
-
- * ext/openssl/ossl_cipher.c (ossl_cipher_copy): ditto.
-
-Sat Feb 5 11:29:10 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/parser/parser.h (GET_PARSER): raise TypeError.
-
- * ext/json/parser/parser.rl (cParser_initialize): ditto.
-
- * ext/json/parser/parser.h (GET_PARSER): check if initialized.
- [ruby-core:35079]
-
- * ext/json/parser/parser.rl (cParser_initialize): ditto.
-
-Sat Feb 5 10:09:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_get_expanded_load_path): always expand load paths.
-
-Sat Feb 5 09:38:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (encoded_dup): extract.
-
-Sat Feb 5 03:37:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::LowMethods): make low level methods
- in NoWrite and DryRun to do nothing. [ruby-dev:43129]
-
- * test/fileutils/fileasserts.rb: add message arguments.
-
- * test/fileutils/fileasserts.rb (Test::Unit::Assertions#assert_block):
- show the given message.
-
-Sat Feb 5 02:09:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (lex_getline, parser_set_encode): set encoding of lines
- in SCRIPT_LINES__ as source encoding. [ruby-dev:43168]
-
-Sat Feb 5 02:08:37 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (ruby_thread_data_type): add prefix.
-
-Sat Feb 5 00:59:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_core.h (GetThreadPtr): use TypedData_Get_Struct() instead
- CoreDataFromValue() because we need type check. Otherwise,
- type mismatch can cause segmentation fault crash.
- [ruby-core:35086] [Ruby 1.9-Bug#4367]
-
- * vm.c (thread_data_type): remove static.
-
-Fri Feb 4 19:14:27 2011 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/utf8_mac.trans: parenthesize macro arguments.
-
-Fri Feb 4 12:11:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * string.c (str_utf8_nth): fixed a condition of optimized lead
- byte counting. [Bug #4366][ruby-dev:43170]
-
-Fri Feb 4 01:50:13 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * string.c (count_utf8_lead_bytes_with_word): wrote function
- comments.
-
-Fri Feb 4 00:14:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
- before rb_str_resurrect.
-
-Thu Feb 3 20:04:44 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/curses/curses.c (CHECK): unused macro removed.
-
-Thu Feb 3 18:33:26 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
- because gz->z.input is hidden string. [ruby-core:35057]
-
-Thu Feb 3 16:34:10 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/shift_jis.c (code_to_mbc): cast as int from the subtraction of
- pointers.
-
- * enc/utf_16le.c (utf16le_mbc_enc_len): use ptrdiff_t.
-
- * enc/utf_32be.c (utf32be_left_adjust_char_head): ditto.
-
- * enc/utf_32le.c (utf32le_left_adjust_char_head): ditto.
-
-Thu Feb 3 16:31:43 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/missing.h: don't use HAVE_STDDEF_H because it never
- defined by configure though configure.bat defines it.
-
- * include/ruby/ruby.h: move include stddef.h to defines.h
-
- * include/ruby/defines.h: ditto.
-
-Wed Feb 2 20:25:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n'
- as int because Ruby usually treats length value as long but
- onigenc_step_back's 4th argument is int.
-
-Thu Feb 3 07:20:46 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING
- rather than magic number.
-
- * ext/syck/lib/syck/rubytypes.rb: ditto
-
-Thu Feb 3 07:16:11 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE
- [ruby-core:35054]
-
- * test/ruby/test_regexp.rb: corresponding test.
-
-Thu Feb 3 07:02:16 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
- expressions can round trip. [ruby-core:34969]
-
- * test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
-
- * ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
- expressions can round trip.
-
- * test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
-
-Wed Feb 2 17:09:22 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_io_fdatasync): Use fsync(2) if the underlying
- operating system does not support fdatasync(2).
-
-Wed Feb 2 14:51:08 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/markup/to_tt_only.rb: commit miss
- * test/rdoc/test_rdoc_markup_to_tt_only.rb: ditto
- * test/rdoc/test_rdoc_single_class.rb: ditto
-
-Wed Feb 2 09:27:53 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Upgrade to RDoc 3.5.1
-
-Wed Feb 2 00:30:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/st.h (st_table): Added comment why we need __extension__.
-
-Tue Feb 1 20:45:44 2011 Tanaka Akira <akr@fsij.org>
-
- * enc/encdb.c: parenthesize macro arguments.
-
-Tue Feb 1 15:12:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_require.rb (TestRequire#test_require_with_unc):
- use ``127.0.0.1'' instead of ``localhost'' as host name, because
- XP or earlier cannot resolv it as NBT hostname.
-
-Tue Feb 1 13:20:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/benchmark/test_benchmark.rb (#capture_bench_output):
- Added explicit sleep. Windows have imprecise time support.
- Thus Tms.new.Add!{} may be or may be not equal 0. The
- test failure started since r30747.
-
-Tue Feb 1 11:03:47 2011 Ryan Davis <ryan@lust.local>
-
- * lib/rubygems*: Import rubygems 1.5.0 (released version @ 1fb59d0)
- * test/rubygems: Ditto
-
-Tue Feb 1 08:01:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (console_set_winsize): new method to set
- console size. [EXPERIMENTAL]
-
- * ext/io/console/console.c (console_winsize): use GetWriteFD.
-
-Tue Feb 1 02:28:14 2011 Masaya Tarui <tarui@ruby-lnag.org>
-
- * include/ruby/win32.h, win32/win32.c: add rb_w32_inet_ntop.
- inet_ntop's minimum supported client is Vista.
-
-Tue Feb 1 00:10:30 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/benchmark.rb: fix benchmark to work with current ruby.
- patched by Benoit Daloze [ruby-core:33846] [ruby-dev:43143]
- merged from https://github.com/eregon/ruby/commits/benchmark
-
- * lib/benchmark (Report#width): update documentation
- * lib/benchmark: document the return value of #benchmark and the
- :list attribute in Report
- * lib/benchmark (Tms#format): rename variables, use String#%
- instead of Kernel.format
- * lib/benchmark: remove undocumented Benchmark::times (an alias
- of Process::times used twice)
- * lib/benchmark (#benchmark): use label_width for the caption
- * lib/benchmark (Tms#initialize): rename variables
- * lib/benchmark: allow title to not be a String and call #to_s
- * lib/benchmark (Benchmark#bm): return an Array of the times with
- the labels
- * lib/benchmark: correct output for Benchmark#bmbm
- (remove the extra space)
- * lib/benchmark: add a few tests for Benchmark::Tms output
- * lib/benchmark: improve style (enumerators, ljust, unused vars)
- * lib/benchmark: add spec about output and return value
- * lib/benchmark: improve basic style and consistency
- no parenthesis for print and use interpolation instead of printf
- * lib/benchmark: remove unnecessary conversions and variables
- * lib/benchmark: correct indentation
- * lib/benchmark: rename the FMTSTR constant and variable to FORMAT
- * lib/benchmark: remove useless exception
-
- * test/benchmark: remove unused variable warnings
-
-Mon Jan 31 23:27:23 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * node.c (add_id): remove duplicated rb_id2str() call.
-
-Sun Jan 30 17:19:46 2011 Tanaka Akira <akr@fsij.org>
-
- * missing/langinfo.c: parenthesize macro arguments.
-
-Mon Jan 31 21:57:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: revert r30698.
-
-Mon Jan 31 21:32:44 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * thread.c (thread_start_func_2): check deadlock condition before
- release thread stack. fix memory violation when deadlock detected.
- reported by Max Aller. [Bug #4009] [ruby-core:32982]
-
-Mon Jan 31 14:45:47 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/locale.rb (IRB::Locale::#search_file):
- Gem might be undefined if --disable-gems. [ruby-core:34990]
-
-Mon Jan 31 12:26:14 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c: suppressed shorten-64-to-32 warnings.
- * regcomp.c: ditto.
- * regexec.c: ditto.
- * regint.h: ditto.
- * regparse.c: ditto.
- * regparse.h: ditto.
- * time.c: ditto.
- * variable.c: ditto.
-
-Mon Jan 31 04:45:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
- ary_resize_capa because ary_resize_capa expects resized length is
- smaller than current array length. call rb_ary_unshare before
- ary_resize_capa because ary_resize_capa lost the reference to
- original shared array. [ruby-core:34997]
-
-Sun Jan 30 17:19:46 2011 Tanaka Akira <akr@fsij.org>
-
- * missing/crypt.c: parenthesize macro arguments.
-
-Sun Jan 30 16:40:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rubygems/test_gem_security.rb (TestGemSecurity): valid only
- if OpenSSL is available.
-
- * test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
- work on x86_64 due to the design of DL2.
-
- * test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
-
-Sun Jan 30 16:09:22 2011 Tanaka Akira <akr@fsij.org>
-
- * strftime.c (rb_strftime_with_timespec): %G produces 4 digits.
-
-Sun Jan 30 15:13:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
- byte.
-
-Sun Jan 30 13:03:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_fetch_m): use useful message for longer key, not a
- nonsense id value.
-
- * string.c (rb_str_ellipsize): new function to ellipsize a string.
-
- * include/ruby/encoding.h (rb_enc_step_back): new function to step
- back n characters.
-
-Sun Jan 30 12:53:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/emacs_mule.c (emacsmule_islead): fix inverse condition.
-
-Sun Jan 30 09:37:25 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * io.c (struct argf): char behaves like an unsigned char
- by default on AIX.
-
-Sun Jan 30 08:02:55 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: Mac OS X wrongly reports it has fdatasync(3).
-
-Sun Jan 30 03:29:47 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_bn.c (GetBNPtr): add missing nil case.
- patched by Martin Bosslet. [ruby-core:34987]
-
-Sun Jan 30 01:02:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * include/ruby/ruby.h: Added NUM2MODET() and MODET2NUM() default
- definition.
- Because r30686 introduced win32 build failure.
-
-Sat Jan 29 22:16:26 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (rb_ary_join): [].join.encoding must be US-ASCII.
- [ruby-list:47790]
-
-Sat Jan 29 20:22:39 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * benchmark/driver.rb (BenchmarkDriver#measure): Show command line
- when abnormal exiting occur.
-
-Sat Jan 29 10:53:16 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_insnhelper.c (vm_get_ev_const): no-scope reference to toplevel
- private constant has been prohibited incorrectly.
-
- * test/ruby/test_module.rb (test_toplevel_private_constant): add a
- test for above.
-
-Sat Jan 29 08:43:23 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/rubygems*: Import rubygems 1.5.0 (release candidate @ 09893d9)
- * test/rubygems: Ditto
-
-Sat Jan 29 02:02:37 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * variable.c (rb_mod_const_of, sv_i): Module#constant should exclude
- private constants. see [ruby-core:32912].
-
- * test/ruby/test_module.rb (test_constants_with_private_constant): add
- a test for above.
-
-Sat Jan 29 01:36:41 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * variable.c (rb_const_set): const_set should preserve constant
- visibility. see [ruby-core:32912].
-
- * test/ruby/test_module.rb: add a test for above.
-
-Sat Jan 29 01:24:57 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (NODE_CLASS, NODE_MODULE), insns.def (defineclass): raise
- an exception when "class Foo::Bar" is evaluated and Foo::Bar is
- private. To implement this, define_type of "defineclass" is added
- so that the instruction can distinguish whether the class definition
- is scoped (class Foo::Bar) or not (class Bar).
-
- * test/ruby/test_class.rb (test_redefine_private_class),
- test/ruby/test_module.rb
- (test_define_module_under_private_constant): add tests for above.
-
-Sat Jan 29 01:19:17 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * constant.h, variable.c: to ensure compatibility, rb_const_get_* must
- not raise an exception even when the constant is private. Instead,
- rb_public_const_get_* and rb_public_const_defined_* are introduced,
- which raise an exception when the referring constant is private.
- see [ruby-core:32912].
-
- * vm_insnhelper.c (vm_get_ev_const): use rb_public_const_get_* instead
- of rb_const_get_* to follow the constant visibility when user code
- refers a constant.
-
- * test/ruby/test_marshal.rb (test_marshal_private_class): add a test.
- This test had failed because of incompatibility of rb_const_get.
-
-Sat Jan 29 00:30:44 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * variable.c (set_const_visibility): fix typo. a patch from Tomoyuki
- Chikanaga in [ruby-core:32919].
-
-Fri Jan 28 23:20:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create,
- TestGDBM2#test_writer_open_notexist): We only need to skip libgdbm
- 1.8.0, not all 1.8.x. 1.8.1 or later don't have GDBM_WRITER sickness.
-
-Fri Jan 28 21:56:57 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/dbm/extconf.rb: Added new header places for Fedora13.
-
-Fri Jan 28 21:49:30 2011 Tanaka Akira <akr@fsij.org>
-
- * ext/zlib/zlib.c: parenthesize macro arguments.
-
-Fri Jan 28 17:47:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/gdbm/test_gdbm.rb (TestGDBM2#test_writer_open_notexist):
- gdbm 1.8.x changed GDBM::WRITER behavior. Thus our testcase need
- to be changed too.
-
-Fri Jan 28 17:33:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): skip
- the test if gdbm version is 1.8.x.
-
-Fri Jan 28 16:30:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_require.rb (TestRequire#test_require_too_long_filename):
- Added -w option because too long path error don't output a message
- by default since r30660. [Bug #4336] [ruby-dev:43134]
-
-Fri Jan 28 16:19:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2}):
- Added -w option because too long path error don't output a message
- by default since r30660. [Bug #4336] [ruby-dev:43134]
-
-Fri Jan 28 16:04:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2,3}):
- split from test_require_path_home.
-
-Fri Jan 28 13:04:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in (--with-valgrind): Fixed r29683. Now this option
- is really default on.
-
-Fri Jan 28 12:05:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: Add #include<sys/stat.h> when struct stat is
- tested. Otherwise, incomplete type dereference error will occur.
-
-Fri Jan 28 11:53:19 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: redundant variable names made strange conftest
- error. Fixed it.
-
-Fri Jan 28 11:47:00 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_process.rb (TestProcess#test_too_long_path{,2}):
- should handle Errno::E2BIG, because this test checks crash of ruby,
- not the error type system.
-
-Fri Jan 28 11:23:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_io_open): Use NUM2MODET() instead NUM2UINT().
- * io.c (rb_scan_open_args): ditto.
-
-Fri Jan 28 10:58:20 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: Added mode_t type checking.
- * process.c (rb_exec_arg_addopt): Use NUM2MODET() instead
- NUM2LONG because clang makes compile error by this narrowing
- conversion.
- * process.c (rb_run_exec_options_err): ditto.
-
-Fri Jan 28 02:37:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * re.c (rb_reg_raise): add GC guard to prevent intermediate
- variable from GC.
-
-Fri Jan 28 02:35:41 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate
- variable from GC.
-
-Fri Jan 28 01:33:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_process.rb (TestProcess#test_too_long_path)
- TestProcess#test_too_long_path): Reduced string size from 100MB
- to 10MB. 100MB may cause no memory error. It isn't intended.
-
-Fri Jan 28 01:27:42 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_process.rb (TestProcess#test_too_long_path2):
- Factored out from test_too_long_path. A test should only do
- one test.
-
-Thu Jan 27 23:29:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (st_foreach): check if unpacked.
-
-Thu Jan 27 23:14:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode-map): remove deprecated binding.
- use M-; instead.
-
-Thu Jan 27 21:58:32 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * bignum.c (rb_str_to_inum): get rid of too huge alloca().
-
-Thu Jan 27 21:43:29 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead
- rb_str_tmp_new().
-
-Thu Jan 27 21:41:47 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c: get rid of STRNDUPA(). It's dangerous API.
-
-Thu Jan 27 21:31:57 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c (rb_w32_aspawn): get rid of too huge alloca().
- [Bug #4330] [ruby-core:34898]
-
-Thu Jan 27 20:30:18 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c (rb_w32_spawn): get rid of too huge alloca().
-
-Thu Jan 27 18:49:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c (open_dir_handle): get rid of too huge alloca().
-
-Thu Jan 27 18:34:58 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * file.c (w32_io_info): get rid of too huge alloca().
- [Bug #4313] [ruby-core:34830]
-
-Thu Jan 27 18:19:51 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/win32.c (wstati64): get rid of too huge alloca().
- [Bug #4316] [ruby-core:34834]
-
-Thu Jan 27 15:11:52 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): get rid of too huge
- alloca(). this is the real fix of [ruby-core:34833].
-
-Thu Jan 27 12:46:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.
-
-Thu Jan 27 08:41:40 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_exec_v, rb_proc_exec_n, rb_proc_exec)
- (proc_spawn_n, proc_spawn): get rid of too huge alloca().
- [ruby-core:34827], [ruby-core:34833]
-
-Thu Jan 27 08:32:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (ALLOCV): new API for exception-safe
- temporary buffer. [ruby-core:34844]
-
- * string.c (rb_alloc_tmp_buffer, rb_free_tmp_buffer):
- implementation of the API.
-
-Thu Jan 27 08:22:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln_find.c (dln_find_1): use rb_warning and return immediately
- if fname is longer than buffer.
-
-Wed Jan 26 22:57:30 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * class.c (clone_method): add GC guard to prevent intermediate
- variable from GC. [Bug #4321] [ruby-dev:43107]
-
-Wed Jan 26 22:45:16 2011 Tanaka Akira <akr@fsij.org>
-
- * template/id.h.tmpl: parenthesize macro arguments.
-
-Wed Jan 26 22:28:49 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
-
- * vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
- variable from GC. [Bug #4322] [ruby-dev:43108]
-
-Wed Jan 26 17:08:59 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode0): OpenSSL::ASN1.decode
- should reject indefinite length primitive encodings as that is
- illegal. Patch by Martin Bosslet. See #4324.
-
-Wed Jan 26 10:36:28 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (=~): documentation fix; the return value is nil when
- it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
-
-Tue Jan 25 08:41:58 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln_find.c (dln_find_1): omit too long pathnames.
-
-Tue Jan 25 08:28:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_resize): get rid of out-of-bound access.
-
-Tue Jan 25 07:48:22 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_thread.rb: remove unused variables.
-
-Tue Jan 25 07:45:44 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
- rid of method redefined.
-
-Tue Jan 25 07:00:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_string_value_cstr): rb_str_modify can change
- RSTRING_PTR.
-
-Tue Jan 25 03:24:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ruby/test_thread.rb: Added various ConditionVariable tests.
-
-Mon Jan 24 22:26:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * object.c (rb_str_to_dbl): Fix again. use rb_str_tmp_new()
- instead ALLOC_N.
-
-Mon Jan 24 21:50:48 2011 Tanaka Akira <akr@fsij.org>
-
- * vm_insnhelper.h: parenthesize macro arguments.
-
-Mon Jan 24 21:28:34 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * object.c (rb_str_to_dbl): use ALLOC_N instead ALLOCA_N because
- ALLOC_N may cause stack overflow.
-
-Mon Jan 24 21:04:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_invalid_str): prevent intermediate variable from GC.
- [ruby-core:34820]
-
-Sun Jan 23 23:01:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/io/console/test_io_console.rb: Don't run test if the system
- don't support io/console.
-
-Sun Jan 23 22:17:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/fiddle/test_fiddle.rb: Don't run test if the system don't support
- fiddle.
-
- * test/fiddle/test_function.rb: ditto.
- * test/fiddle/test_closure.rb: ditto.
-
-Sun Jan 23 11:39:18 2011 Tanaka Akira <akr@fsij.org>
-
- * vm_exec.h: parenthesize macro arguments.
-
-Sun Jan 23 10:33:02 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/fake.rb.in (ruby): suppress warnings.
-
-Sun Jan 23 08:00:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_nth_len, str_utf8_nth): return the rest length together.
-
- * string.c (rb_str_substr): get rid of measure the length always
- to improve performance for huge string. [ruby-core:34648]
-
-Sun Jan 23 00:40:10 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/test_syslog.rb: Fix to make a lot of test failure if
- the platform doesn't support syslog.
-
-Sat Jan 22 11:49:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
- when multiple merge keys are specified.
-
- * test/psych/test_merge_keys.rb: tests for multi-merge key support
-
-Sat Jan 22 11:33:04 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
- part of YAML 1.1, so they should be supported. Remove warning and
- merge keys to parent. [ruby-core:34679]
-
- * test/psych/test_merge_keys.rb: test for merge keys
-
-Sat Jan 22 10:25:19 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/parser.c (parse): add the file name to the exception when
- parse errors occur.
-
- * test/psych/test_parser.rb: test for parse error file name
-
-Sat Jan 22 10:12:30 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/parser.c (parse): fix assertion error when reusing a
- parser after an exception has been raised
-
- * test/psych/test_parser.rb: test for assertion error
-
-Sat Jan 22 04:09:22 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/nodes/node.rb: Make Psych::Nodes::Node
- enumerable.
-
- * ext/psych/lib/psych/visitors/depth_first.rb: Add a depth-first
- visitor to enumerate over a YAML AST in a depth-first fashion
-
- * test/psych/nodes/test_enumerable.rb: test for enumerating nodes
-
- * test/psych/visitors/test_depth_first.rb: test for depth-first
- visitor
-
-Sat Jan 22 00:53:42 2011 Tanaka Akira <akr@fsij.org>
-
- * vm_core.h: parenthesize macro arguments.
-
-Fri Jan 21 18:15:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: should not use -Werror=* flags while conftests.
-
-Fri Jan 21 09:17:00 2011 Luis Lavena <luislavena@gmail.com>
-
- * configure.in: Fix incorrectly detected x86_64-w64-mingw32 due
- canonalization of target_os. Bug #3889 [ruby-core:32634]
-
-Thu Jan 20 23:44:00 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: Fix rb_cv_va_args_macro was broken. We are using
- -Werror=implicit-function-declaration compile option. therefore
- we need a function declaration explicitly.
-
-Thu Jan 20 23:58:02 2011 Tanaka Akira <akr@fsij.org>
-
- * node.h: parenthesize macro arguments.
-
-Thu Jan 20 23:25:28 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: Add '#include <stdlib.h>' to
- rb_cv_localtime_overflow test too. It's reported by Tomoyuki
- Chikanaga. Thanks.
-
-Thu Jan 20 16:11:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * README.EXT, README.EXT.ja: You shouldn't choose ``conftest.c'' as a
- name of a source file.
-
-Thu Jan 20 12:15:44 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: Add stdlib.h inclusion into rb_cv_negative_time_t
- test because it's required for exit(3). The patch is
- created by Tomoyuki Chikanaga. [Bug #4287] [ruby-dev:43060]
-
-Thu Jan 20 11:39:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/webrick/utils.rb (TestWEBrick::RubyBin): test CGI does not need
- to load rubygems. if it activated, ruby raises LoadError about
- rbconfig.rb.
-
-Thu Jan 20 09:19:42 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/json_tree.rb: Fix JSON emit for
- DateTime and Time classes.
-
- * test/psych/test_json_tree.rb: test for JSON emit
-
-Thu Jan 20 08:02:46 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/coder.rb (represent_object): arbitrary objects
- may be passed to the Psych::Coder object.
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb: support for visiting
- arbitrary objects set on the coder.
-
- * test/psych/test_coder.rb: supporting test case.
-
-Thu Jan 20 06:03:17 2011 Tanaka Akira <akr@fsij.org>
-
- * method.h: parenthesize macro arguments.
-
-Wed Jan 19 13:16:05 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/commands/sources_command.rb: Finish removing code,
- (fixes sources command test).
-
-Wed Jan 19 13:04:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * proc.c (proc_call): Add gc guard to avoid segfault. The fix
- is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
-
-Wed Jan 19 12:31:28 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems.rb: Since gem_prelude requires rubygems, enable
- custom_require always.
-
-Wed Jan 19 12:08:08 2011 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/commands/dependency_command.rb: Remove require of
- deleted file.
- * lib/rubygems/commands/fetch_command.rb: ditto
- * lib/rubygems/commands/setup_command.rb: ditto
- * lib/rubygems/commands/sources_command.rb: ditto
- * lib/rubygems/commands/specification_command.rb: ditto
-
-Wed Jan 19 08:13:59 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/rubygems*: Import rubygems 1.5.0 (release candidate)
- * test/rubygems: Ditto
-
-Tue Jan 18 23:31:01 2011 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y: avoid NULL reference. [ruby-dev:43067]
-
-Wed Jan 19 02:54:04 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vsnprintf.c (cvt): set first byte of buf to NUL for the case when
- no bytes are written to the buf. [ruby-dev:43062]
-
-Tue Jan 18 23:04:51 2011 Tanaka Akira <akr@fsij.org>
-
- * gc.h: parenthesize macro arguments.
-
-Tue Jan 18 18:31:14 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/completion.rb: Irb tab completion support for XX::method
- forms.
-
-Tue Jan 18 15:05:55 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: added RDoc document for logging message escape
- by Hal Brodigan. See #3869
-
-Tue Jan 18 07:53:52 2011 Tanaka Akira <akr@fsij.org>
-
- * eval_intern.h: parenthesize macro arguments.
-
-Tue Jan 18 04:42:44 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/parser.rb (Mark): Adding a class to wrap
- marker information
-
- * ext/psych/parser.c (mark): Add a method to return the mark object
- for the parser
-
- * test/psych/test_parser.rb: tests for the Mark class.
-
-Tue Jan 18 02:46:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
- strings should be dumped with double quotes. [ruby-core:34186]
-
- * test/psych/test_json_tree.rb: test for double quotes
-
-Mon Jan 17 23:36:33 2011 Tanaka Akira <akr@fsij.org>
-
- * array.c (rb_ary_times): less MEMCPY calls.
-
-Mon Jan 17 22:54:33 2011 Tanaka Akira <akr@fsij.org>
-
- * debug.h: parenthesize macro arguments.
-
-Mon Jan 17 21:40:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): revert r30549.
-
-Sun Jan 16 20:55:45 2011 Tanaka Akira <akr@fsij.org>
-
- * vsnprintf.c: parenthesize macro arguments.
-
-Sat Jan 15 11:57:30 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (warnflags): add -Werror=implicit-function-declaration
- if available.
-
- * lib/mkmf.rb (init_mkmf): ignore warnings in mkmf tests.
-
- * test/mkmf/base.rb (setup, teardown): restore config values.
-
- * test/mkmf/test_flags.rb: split from test_find_executable.rb.
-
-Sat Jan 15 10:04:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): autoload rubygems.
-
- * tool/compile_prelude.rb (Prelude#initialize): ignore empty
- preludes.
-
- * ruby.c (ruby_init_prelude): get rid of global namespace
- pollution.
-
-Sat Jan 15 09:42:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/io.h: missing prototypes.
-
-Fri Jan 14 23:25:55 2011 Tanaka Akira <akr@fsij.org>
-
- * vm_method.c: parenthesize macro arguments.
-
-Fri Jan 14 15:32:29 2011 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/net/imap/test_imap.rb: call neither logout nor disconnect
- unless connected. patch by Kazuhiro NISHIYAMA. [ruby-dev:42860]
-
-Fri Jan 14 14:56:57 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/imap.rb: use bytesize for binary strings.
- patched by Yoshimasa Niwa. [ruby-core:34222]
-
-Fri Jan 14 14:01:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * pack.c (pack_unpack): the resulted string of unpack('M') must have
- ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
-
-Fri Jan 14 13:38:58 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
- gzip's header is the size of uncompressed input data modulo 2^32.
- [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
-
-Fri Jan 14 11:36:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in, win32/Makefile.sub (RUNRUBY): require path should
- include "." because rbconfig.rb is there.
-
-Fri Jan 14 10:40:11 2011 Ryan Davis <ryan@lust.local>
-
- * gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4.
- * lib/rubygems.rb: removed all Gem::Quickloader code.
- * ruby.c: renamed ruby_init_gems to ruby_init_prelude. Set
- $disable_rubygems since there is no fine grained mechanism to
- skip parts of the prelude. Open to suggestions on how to do this
- better.
- * test/*.rb: Load path isn't set up correctly, so add
- --disable-gems as needed to failing tests that are explicitly
- testing stderr w/ ==.
-
-Fri Jan 14 07:30:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_next_argv): go advance when the next file cannot be
- read. [ruby-core:34446]
-
-Thu Jan 13 20:49:19 2011 Tanaka Akira <akr@fsij.org>
-
- * vm_insnhelper.c: parenthesize macro arguments.
-
-Thu Jan 13 13:21:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * vm_dump.c: delete dashes to make lines 80 chars, Patched by
- Shota Fukumori (sora_h). [Bug #4275] [ruby-dev:43021]
-
-Thu Jan 13 13:21:00 2011 Kenta Murata <mrkn@mrkn.jp>
-
- * vm_dump.c: fix misspelling of CrashReporter, Patched by Shota
- Fukumori (sora_h). [Bug #4275] [ruby-dev:43021]
-
-Thu Jan 13 06:27:29 2011 Ryan Davis <ryand-ruby@zenspider.com>
-
- * error.c: Exception#to_s should actually call to_s.
-
-Thu Jan 13 00:32:54 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c (get_nth_dirname): decrement the directory index
- because the index specifies the index of given included_directories
- which is separated by NUL and its index is begun from 1.
- Note that 0 specifies the current directory of the compilation.
- see also http://www.dwarfstd.org/doc/dwarf-2.0.0.pdf
-
-Thu Jan 13 00:06:38 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
-
-Thu Jan 13 00:00:07 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
- Therefore we should only check the result is -1 or not.
- [ruby-core:34062]
-
-Wed Jan 12 23:55:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
- long type arguments.
-
-Wed Jan 12 19:37:10 2011 Tanaka Akira <akr@fsij.org>
-
- * vm_dump.c: parenthesize macro arguments.
-
-Wed Jan 12 19:28:23 2011 Tanaka Akira <akr@fsij.org>
-
- * vm.c (thread_free): reset ruby_current_thread if it points the
- thread to free.
- * gc.c (slot_sweep): don't call RUBY_VM_SET_FINALIZER_INTERRUPT if
- there is no current thread.
- [ruby-dev:43000]
-
-Wed Jan 12 19:09:29 2011 Tanaka Akira <akr@fsij.org>
-
- * enum.c (sort_by_i): reenter check more strictly.
- (sort_by_cmp): ditto.
- [ruby-dev:43003] reported by Usaku NAKAMURA.
-
-Wed Jan 12 16:25:12 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/net/http.rb (Net::HTTP#connect): makes it timeout during
- SSL handshake too. [ruby-core:34203]
- Patch by Marc Slemko.
-
- * test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
- test for [ruby-core:34203]
-
- * test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
- ditto.
-
-Wed Jan 12 16:24:53 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
- and RL_PROMPT_END_IGNORE. [ruby-core:34331]
-
- * ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
- RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
- error with libedit.
-
-Wed Jan 12 15:53:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * README.EXT.ja (rb_ensure): typo.
-
-Wed Jan 12 11:33:46 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c: OpenBSD uses the elf_abi.h header file instead of the
- elf.h header file. patched by Jeremy Evans [ruby-core:34384]
-
-Wed Jan 12 03:59:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/webrick/test_cgi.rb: Removes usage of deprecated
- :RequestHandler option.
- patched by Peter Weldon [ruby-core:34010]
-
- * test/webrick/test_httpproxy.rb: ditto.
-
- * test/webrick/test_httpserver.rb: Add a test of the deprecation
- behaviour.
-
-Wed Jan 12 08:37:07 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (hash_i): return different values for inverse hash.
- [ruby-core:34334]
-
-Tue Jan 11 20:32:59 2011 Tanaka Akira <akr@fsij.org>
-
- * variable.c: parenthesize macro arguments.
-
-Tue Jan 11 13:06:38 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * array.c (rb_ary_resize): should care of embeded array when extending
- the array.
-
- * array.c (rb_ary_resize): need to set capa when changing the real
- size of the array.
- these are latent bugs.
-
-Mon Jan 10 22:46:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case
- insensitive.
-
- * load.c (loaded_feature_path, rb_feature_p, load_lock): on a
- case-insensitive filesystem, loaded features search should
- ignore case. [ruby-core:34297]
-
-Mon Jan 10 21:34:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (showflags): show LD commands.
-
-Mon Jan 10 14:32:55 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_method.rb (TestMethod#test_define_method): method
- transplanting between class and module is impossible.
-
-Mon Jan 10 13:51:17 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/rdoc-mode.el (rdoc-mode): show trailing whitespace.
-
-Mon Jan 10 11:22:02 2011 Tanaka Akira <akr@fsij.org>
-
- * util.c: parenthesize macro arguments.
-
-Mon Jan 10 07:41:31 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * misc/README: mention rdoc-mode.el and ruby-style.el.
-
-Sun Jan 9 20:37:21 2011 Tanaka Akira <akr@fsij.org>
-
- * transcode.c: parenthesize macro arguments.
-
-Sun Jan 9 16:31:53 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
- also uses __syscall if available for *BSD on 64bit architecture.
- [ruby-core:34062]
-
-Sun Jan 9 16:31:34 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
- some platform has a locale without territory but with
- encoding.
- (#each_sub_locale): ditto.
-
-Sun Jan 9 14:47:50 2011 TAKAO Kouji <kouji@takao7.net>
-
- * ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
- fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
- non-printing characters in prompt
-
-Sat Jan 8 21:47:26 2011 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_sort_by): use rb_ary_resize.
- (ary_cutoff): removed.
-
-Sat Jan 8 21:24:17 2011 Tanaka Akira <akr@fsij.org>
-
- * pack.c (swapf): compilation condition simplified.
- (swapd): ditto.
-
-Sat Jan 8 20:51:25 2011 Tanaka Akira <akr@fsij.org>
-
- * pack.c (swapd): remove duplicated code.
-
-Sat Jan 8 19:28:55 2011 Tanaka Akira <akr@fsij.org>
-
- * thread.c: parenthesize macro arguments.
-
-Fri Jan 7 23:07:40 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): backref needs to capture.
-
-Fri Jan 7 21:57:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode-variables), misc/ruby-style.el:
- show trailing whitespace.
-
- * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
- regexp after open bracket. [ruby-core:34183]
-
-Fri Jan 7 00:37:35 2011 Tanaka Akira <akr@fsij.org>
-
- * string.c: parenthesize macro arguments.
-
-Thu Jan 6 22:42:02 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
- fail in certain case. this patch is contributed from Ray Chason
- <chasonr at gmail.com> in personal communication.
-
-Thu Jan 6 20:55:49 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): ignore rest from first dot from
- TARGET to generate init function name.
- this is followup of r30464.
-
-Thu Jan 6 11:27:01 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
- should not be included in JSON mapping
-
-Thu Jan 6 09:23:33 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/net/protocol.rb (eof?): BufferedIO should proxy eof? to the
- underlying IO object.
-
-Thu Jan 6 09:12:31 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/mkmf.rb (configuration): fixing gsub when multiple error flags
- are passed to GCC.
-
-Thu Jan 6 05:25:49 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_modify): export.
-
-Thu Jan 6 05:14:41 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (get_strio, strio_set_string)
- (strio_reopen): check if frozen. [ruby-core:33648]
-
-Thu Jan 6 05:10:58 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_resize): new utility function. [ruby-dev:42912]
-
-Thu Jan 6 05:03:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (init_funcname_len): ignore rest from first dot.
- [ruby-dev:41774]
-
-Thu Jan 6 02:55:48 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb: use YAML 1.0 output
- format for serializing nil values. Thanks Eric Hodel!
-
- * test/psych/test_nil.rb: test for nil values
-
-Wed Jan 5 14:21:34 2011 Mark Dodwell <hi@mkdynamic.co.uk>
-
- * string.c: fix rdoc typo.
- https://github.com/shyouhei/ruby/pull/3
-
-Wed Jan 5 14:06:01 2011 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
- skip on Windows because chmod 0 doesn't mean unreadable by owner.
-
-Wed Jan 5 13:56:54 2011 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/net/http.rb (Net::HTTP#get): A header hash given should not
- be modified.
-
-Wed Jan 5 12:10:08 2011 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/dl/{cfunc.c,dl.h,handle.c}, ext/fiddle/fiddle.{h,c}: Use _WIN32
- rather than checking for windows.h. Thanks Jon Forums!
- [ruby-core:33977]
-
-Sat Jan 1 17:02:50 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/irb/locale.rb (IRB::Locale#search_file): make it possible
- to load a localization from a gem.
- (IRB::Locale#lc_path): obsoleted because of the change of #search_file
- (IRB::Locale#each_localized_path): new private method, based on
- lc_path
- (IRB::Locale#find): follows the change of #search_file.
- (IRB::Locale#load): removed duplicate with #find.
-
-Sat Jan 1 11:44:42 2011 Tanaka Akira <akr@fsij.org>
-
- * strftime.c: parenthesize macro arguments.
-
-Sat Jan 1 11:10:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c: take care of platforms where long is bigger
- than int.
-
-Sat Jan 1 11:03:58 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS (optparse): shell completion support.
-
- * misc/README (rb_optparse.{bash,zsh}): for shell completion.
-
- * include/ruby/intern.h (VALUE rb_ary_print_on): I have never seen
- this function anywhere.
-
-Sat Jan 1 04:20:11 2011 NARUSE, Yui <naruse@ruby-lang.org>
-
- * win32/win32.c (rb_w32_write_console): don't raise exception when
- the conversion is for writing to console.
- Patched by Heesob Park [ruby-core:33999]
-
-Fri Dec 31 12:02:06 2010 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_sort_by): use less temporary objects.
-
-Fri Dec 31 11:46:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (warnflags), lib/mkmf.rb (configuration): turn
- warnings into errors only for bundled extensions.
- [ruby-core:33815]
-
-Fri Dec 31 11:15:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (sizeof): zlib.h mistakenly assumes the result
- of sizeof to be int, not size_t.
-
-Fri Dec 31 10:27:34 2010 Tanaka Akira <akr@fsij.org>
-
- * st.c: parenthesize macro arguments.
-
-Fri Dec 31 03:23:26 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
- patched by Peter Weldon <peter.weldon AT null.net>
- [ruby-core:33985]
-
-Fri Dec 31 03:00:34 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * Makefile.in: remove unnecessary semicolons.
-
-Thu Dec 30 23:09:47 2010 wanabe <s.wanabe@gmail.com>
-
- * vm.c (vm_define_method): guard iseq from GC while method definition.
- [ruby-dev:42832]
-
-Thu Dec 30 20:18:32 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/Makefile.sub: ditto.
-
-Thu Dec 30 20:57:09 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * Makefile.in: Check V=1 argument if run "make clean" or similar.
-
-Thu Dec 30 20:41:50 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * Makefile.in: Kill ugly line continuation.
-
-Thu Dec 30 11:49:40 2010 Tanaka Akira <akr@fsij.org>
-
- * sprintf.c: parenthesize macro arguments.
-
-Wed Dec 29 21:20:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (maygvl_copy_stream_wait_readwrite): define if USE_SENDFILE
-
-Wed Dec 29 20:37:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: strip current directory prefix.
-
- * enc/depend (clean): remove name2ctype.h when out-of-place build.
-
- * win32/Makefile.sub (clean-enc): pass V to inferior make.
-
-Wed Dec 29 18:23:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): need to escape if the coderange is invalid.
-
-Wed Dec 29 10:06:51 2010 Tanaka Akira <akr@fsij.org>
-
- * signal.c: parenthesize macro arguments.
-
-Wed Dec 29 07:22:15 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rake/rdoctask.rb: Deprecate in favor of rdoc/task.
-
-Wed Dec 29 07:07:06 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Import RDoc 3.1
-
-Tue Dec 28 18:36:38 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * error.c, include/ruby/intern.h (rb_compile_error_with_enc): new
- function to raise syntax error, with source encoding'ed message.
-
- * parse.y (compile_error): use above function.
- [ruby-core:33951] (#4217)
-
-Tue Dec 28 07:37:38 2010 Tanaka Akira <akr@fsij.org>
-
- * ruby.c: parenthesize macro arguments.
-
-Tue Dec 28 07:17:11 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add ARGF.write and so on.
-
-Tue Dec 28 07:12:38 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add new magic-comment. (warn-indent) [ruby-core:25442]
-
-Tue Dec 28 04:32:37 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/fiddle/extconf.rb: check for windows.h while building fiddle.
- Thanks Jon Forums! [ruby-core:33923]
-
-Tue Dec 28 01:45:12 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: Add Zlib.deflate and Zlib.inflate.
- [ruby-dev:42833]
-
-Mon Dec 27 21:22:33 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/configure.bat: Remove obsoleted coding rule. Now, we
- don't support to build on Windows 95/98 and Me.
-
-Mon Dec 27 18:27:13 2010 Tanaka Akira <akr@fsij.org>
-
- * re.c: parenthesize macro arguments.
-
-Mon Dec 27 15:22:23 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/README.win32: note to need NT based OS to build ruby.
-
-Mon Dec 27 12:14:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (EXTMK_ARGS): specify to pass macro V, because nmake
- doesn't pass it via MAKEFLAGS.
-
-Mon Dec 27 10:33:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/zlib/zlib.c (Init_zlib): Add Zlib.deflate and Zlib.inflate.
- [ruby-dev:42833]
-
-Mon Dec 27 07:38:07 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * misc/rb_optparse.zsh: add compdef for generator.
-
-Mon Dec 27 07:32:07 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/optparse.rb (OptionParser#compsys): escape brackets too.
- [ruby-dev:42754]
-
-Mon Dec 27 01:30:08 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: add IF_NAMESIZE.
- add a default for INET6_ADDRSTRLEN.
-
-Sun Dec 26 23:49:47 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * win32/Makefile.sub: suppress a strange error message when RMALL
- found no such file.
- * win32/rmall.bat: new.
-
-Sun Dec 26 21:23:23 2010 <kosaki.motohiro@gmail.com>
-
- * win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
-
-Sun Dec 26 22:25:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/ripper/depend (ripper.y): fix messages with nmake.
- [ruby-dev:42896]
-
-Sun Dec 26 22:24:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): get rid of warnings caused by
- -Wdeclaration-after-statement on cygwin.
-
-Sun Dec 26 20:28:34 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * process.c (before_exec): add small comment.
-
-Sun Dec 26 20:52:21 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/mkconstants.rb: define INET_ADDRSTRLEN as 16 if not
- available. fix compilation error on mswin32-60. reported by nobu.
-
-Sun Dec 26 19:37:37 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c: define IFNAMSIZ if not available.
- fix compilation error on mingw32. reported by nobu.
-
-Sun Dec 26 12:16:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/paths.rb (RDoc::RI::Paths::HOMEDIR): no exception if
- HOME is not set. [ruby-core:33867]
-
-Sun Dec 26 11:39:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt): missing ripper rule. i.e., `a::B ||= c 1'.
- http://twitter.com/#!/wannabe53/status/18797576396472321
- http://twitter.com/#!/wannabe53/status/18798416150663168
-
-Sun Dec 26 11:15:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/with_different_ofs.rb (DifferentOFS): should not affect
- original classes.
-
-Sun Dec 26 09:35:07 2010 Tanaka Akira <akr@fsij.org>
-
- * rational.c: parenthesize macro arguments.
-
-Sun Dec 26 09:22:19 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (rb_if_indextoname): new function to abstract
- environments without if_indextoname.
- (inspect_ipv6_multicast_if): new function to inspect
- IPV6_MULTICAST_IF.
- Socket::Option.new(:INET6, :IPV6, :MULTICAST_IF,
- [2].pack("I!")).inspect is
- "#<Socket::Option: INET6 IPV6 MULTICAST_IF eth0>".
-
-Sun Dec 26 04:31:15 2010 Luis Lavena <luislavena@gmail.com>
-
- * ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
- Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
-
-Sun Dec 26 02:31:58 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (advice_arg_check): Change argument check.
- Now, an unsupported advice makes NotImplementedError.
- [ruby-dev:42887] [Ruby 1.9-Feature#4204]
-
-Sun Dec 26 03:00:53 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/socket/extconf.rb: Fix build error which was introduced r30372.
-
-Sun Dec 26 01:37:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: check the existence of if_indextoname().
-
- * ext/socket/option.c: yesterday's akr's commits destroyed the build of
- some unrelated platforms (such as Windows).
-
-Sat Dec 25 23:29:11 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_ipv4_add_drop_membership): new function
- to inspect struct ip_mreq and struct ip_mreqn for
- IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- Socket::Option.new(:INET, :IP, :ADD_MEMBERSHIP,
- [239,255,99,81, 0,0,0,0].pack("CCCCCCCC")).inspect is now
- "#<Socket::Option: INET IP ADD_MEMBERSHIP 239.255.99.81 0.0.0.0>".
- (inspect_ipv4_multicast_if): new function to inspect struct in_addr
- and struct ip_mreqn for IP_MULTICAST_IF.
- Socket::Option.new(:INET, :IP, :MULTICAST_IF,
- [192,168,0,7].pack("CCCC")).inspect is now
- "#<Socket::Option: INET IP MULTICAST_IF 192.168.0.7>".
-
- * ext/socket/extconf.rb: check struct ip_mreq and struct ip_mreqn.
-
-Sat Dec 25 22:49:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/csv: DifferentOFS needs to be include in each classes.
-
- * test/digest/test_digest_extend.rb (TestDigestExtend#setup):
- should not depend on the result of previous tests
-
- * test/with_different_ofs.rb (DifferentOFS::WithDifferentOFS): give
- name.
-
- * test/with_different_ofs.rb (DifferentOFS): test suite for test
- suites affected by $,.
-
- * test/digest/test_digest_extend.rb (TestDigestExtend): should not
- assume $, invariant.
-
- * test/csv/test_data_converters.rb, test/csv/test_table.rb: don't
- call setup within tests.
-
-Sat Dec 25 20:01:40 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
- GVL at new process creation.
-
-Sat Dec 25 18:26:55 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_ipv6_mreq): new function to inspect
- struct ipv6_mreq for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.
- Socket::Option.new(:INET6, :IPV6, :JOIN_GROUP,
- [0xff12,0,0,0,0,0,0,1, 2].pack("nnnnnnnnI!")).inspect is now
- "#<Socket::Option: INET6 IPV6 JOIN_GROUP ff12::1 eth0>".
-
- * ext/socket/extconf.rb: check struct ipv6_mreq.
-
-Sat Dec 25 18:04:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/csv.rb (CSV.foreach): 'rb' mode is defaulted in open.
-
- * lib/csv.rb (CSV#init_separators): cannonicalize encoding options
- as Encoding objects.
-
-Sat Dec 25 18:30:34 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (rb_thread_atfork): Add small comment why we need
- reset random seed.
-
-Sat Dec 25 17:33:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/csv/base.rb (TestCSV.with_different_ofs): give name to
- anonymous classes.
-
- * lib/csv.rb (CSV#init_separators): use IO#gets with length
- parameter to get rid of wrong convertion.
-
- * lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
-
- * lib/csv.rb, test/csv: should not assume $, invariant.
-
-Sat Dec 25 16:08:06 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * signal.c: change rb_atomic_t definition from uchar to uint.
-
-Sat Dec 25 15:04:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
- suite writing to the source directory.
-
-Sat Dec 25 15:08:08 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
- We must reinitialize GVL at new process creation. Otherwise
- we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
-
-Sat Dec 25 14:27:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_extract_encoding_option): accept Encoding object as
- encoding: optional argument. [ruby-dev:42884]
-
-Sat Dec 25 13:37:55 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 2.0.2 r6093.
-
-Sat Dec 25 13:05:59 2010 Tanaka Akira <akr@fsij.org>
-
- * random.c: parenthesize macro arguments.
-
-Sat Dec 25 12:48:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_f_require_relative): don't omit return type.
-
-Sat Dec 25 11:06:00 2010 Eric Hodel <drbrain@segment7.net>
-
- * load.c (rb_f_require_relative): Add documentation.
-
-Sat Dec 25 11:02:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzreader_gets): support optional length
- parameter.
-
- * ext/zlib/zlib.c (gzfile_read, gzfile_readpartial): length should
- be long.
-
-Sat Dec 25 10:51:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/generator/generator.{c,h} (fbuffer_free_only_buffer):
- unused.
-
- * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts.
-
-Fri Dec 24 08:46:04 2010 Tanaka Akira <akr@fsij.org>
-
- * process.c: parenthesize macro arguments.
-
-Thu Dec 23 19:17:14 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/net/imap/cacert.pem: updated because it has been expired.
-
- * test/net/imap/server.crt: signed again because CA cert was expired.
-
-Thu Dec 23 11:16:52 2010 Tanaka Akira <akr@fsij.org>
-
- * parse.y: parenthesize macro arguments.
-
-Thu Dec 23 11:00:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_check_type): check for type from extensions for ruby
- 1.8. see [ruby-core:33797].
-
-Thu Dec 23 08:12:59 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/net/smtp.rb: refactoring Net::SMTP#esmtp= to use an
- attr_accessor
-
-Thu Dec 23 06:35:41 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
- connection verification fails.
-
-Thu Dec 23 01:47:58 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: remove #object_id. [ruby-dev:42840]
-
-Wed Dec 22 08:56:39 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add Module#private_constant and Module#public_constant.
- [ruby-dev:39685][ruby-core:32698]
-
-Wed Dec 22 07:59:23 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add IO#advise. [ruby-core:33110] [Ruby 1.9-Feature#4038]
-
-Tue Dec 21 23:45:31 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]
-
-Tue Dec 21 12:45:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (target_archs): remove temporary objects.
-
- * enc/Makefile.in, enc/depend (clean): remove work directories.
-
-Tue Dec 21 07:39:12 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c: parenthesize macro arguments.
-
-Tue Dec 21 06:25:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rexml/test_contrib.rb (ContribTester#test_pos): should not
- use fixed path name for tests. [ruby-dev:42827]
-
- * test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
- fixed port for tests. [ruby-dev:42828]
-
-Tue Dec 21 06:10:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (setup_args), vm.c (invoke_block_from_c),
- vm_insnhelper.c (caller_setup_args): reverted r30241 and r30243
- except for the test.
-
-Tue Dec 21 01:41:42 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * io.c : add an extra byte to buffer for the specification of read
- in Windows. see [ruby-core:33460] and r29980. and, we have to
- discuss how to do this one byte.
-
-Tue Dec 21 01:18:06 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * error.c: Fix build error for win32. This regression was
- introduced by r30271.
-
-Tue Dec 21 00:59:40 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (thread_cleanup_func): Moved interrupted_lock
- destroying code from native_thread_destroy() to
- thread_cleanup_func() because it's platform independent logic.
-
- * thread_win32.c (native_thread_destroy): ditto.
- * thread_pthread.c (native_thread_destroy): ditto.
-
-Tue Dec 21 00:46:20 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (thread_cleanup_func): Don't touch native threading
- resource at fork. Sadly this is purely bandaid. We need to
- implement proper fix later. [Bug #4169] [ruby-core:33767]
-
-Tue Dec 21 00:22:44 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * error.c (exit_success_p): Check status code more carefully.
- status code may have garbage in upper bit.
-
-Mon Dec 20 23:12:37 2010 Tanaka Akira <akr@fsij.org>
-
- * node.c: parenthesize macro arguments.
-
-Mon Dec 20 20:04:41 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add #__id__ and #object_id. [ruby-dev:42778]
-
-Mon Dec 20 20:03:21 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread_pthread.c (native_thread_destroy): Fixed gvl_cond leak.
-
-Mon Dec 20 13:49:05 2010 Eric Hodel <drbrain@segment7.net>
-
- * NEWS: Add item for RDoc 3.0.1
-
- * lib/rdoc: Import RDoc 3.0.1, remove require for perl parser.
-
-Mon Dec 20 12:15:32 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Import RDoc 3.0.
-
-Mon Dec 20 01:55:03 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (Init_IO): Added O_DIRECT. This feature was proposed by
- Run Paint Run Run.
- [Feature #4015] [ruby-core:33018]
-
-Sun Dec 19 19:15:23 2010 Tanaka Akira <akr@fsij.org>
-
- * marshal.c: parenthesize macro arguments.
-
-Sat Dec 18 21:52:37 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * vsnprintf.c (BSD_vfprintf): suppress warning: "_WIN32" is not
- defined.
-
-Sat Dec 18 16:02:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (setup_args), vm.c (invoke_block_from_c),
- vm_insnhelper.c (caller_setup_args): fix of r30241. lambda block
- should check argument number.
-
-Sat Dec 18 14:42:29 2010 Tanaka Akira <akr@fsij.org>
-
- * load.c: parenthesize macro arguments.
-
-Sat Dec 18 10:07:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (setup_args, iseq_compile_each): optimize AMPER LAMBDA
- combination as block.
-
-Fri Dec 17 22:07:16 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (Init_GC): move #__id__ and #object_id to BasicObject.
- [ruby-dev:42778]
-
-Fri Dec 17 19:35:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/mkmf/base.rb (TestMkmf::FakeLog): capture output from mkmf.
-
- * test/mkmf/test_find_executable.rb (test_find_executable):
- suppress meaningless differences for chkbuild.
-
-Fri Dec 17 13:26:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/setup.mak (BASERUBY): quit with an error when BASERUBY was not
- able to set, just like configure.in does. [ruby-dev:42782]
-
-Fri Dec 17 07:04:09 2010 Tanaka Akira <akr@fsij.org>
-
- * iseq.c: parenthesize macro arguments.
-
-Fri Dec 17 04:18:37 2010 Eric Hodel <drbrain@segment7.net>
-
- * transcode.c (str_encode): Alter comment for better wording and ri
- output.
-
-Fri Dec 17 00:05:40 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * io.c (rb_io_advise): New API. IO#advise() allows to tell the
- ruby runtime how it expects to use a file handle. This feature
- can be improved a performance some situations.
- Note: This feature is mainly developed by Run Paint Run Run.
- Thank you! [ruby-core:33110] [Ruby 1.9-Feature#4038]
-
- * io.c (do_io_advise): Helper function.
- * io.c (io_advise_sym_to_const): ditto.
-
-Thu Dec 16 23:29:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb (bin-comm): use transformed name.
- [ruby-dev:42777]
-
-Thu Dec 16 21:52:07 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c: parenthesize macro arguments.
-
-Thu Dec 16 21:46:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/mkconfig.rb (RbConfig): honor ARCHFLAGS and RC_ARCHS to
- override embedded ARCH_FLAG value on universal-darwin.
-
-Thu Dec 16 19:50:12 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
- PROGRAM_SUFFIX): unite the differences of the names of macros of
- prefix and suffix.
- reported by HANEDA Norikatsu. [ruby-dev:42775]
-
-Thu Dec 16 08:04:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * node.h (RNode): match the type of flags to RBasic, and renamed
- nd_file as nd_reserved.
-
- * iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
- is always zero-cleared.
-
-Thu Dec 16 07:22:30 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
-
-Wed Dec 15 20:45:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit.rb (process_args): need to setup @help to print options.
-
-Wed Dec 15 11:19:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/zlib/test_zlib.rb (test_to_io): forgotten to fix with r30201.
-
-Wed Dec 15 11:07:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (simple_sendfile): enable on Mac OS X.
-
- * io.c (nogvl_copy_stream_sendfile): moved precheck of copy length.
-
- * io.c (nogvl_copy_stream_sendfile): should wait for both of
- read/write fds.
-
-Wed Dec 15 07:11:55 2010 Tanaka Akira <akr@fsij.org>
-
- * hash.c: parenthesize macro arguments.
-
-Wed Dec 15 04:02:00 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
- fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
- Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
-
-Wed Dec 15 03:41:31 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * test/ripper/test_parser_events.rb (TestRipper#test_block_variables):
- Limit address space 100MB instead 100KB. Quite frankly, This
- margin is too narrow to contain ruby. [ruby-dev:42763] [Bug#4159]
-
-Tue Dec 14 23:53:52 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (simple_sendfile): improve linux compatibility on FreeBSD,
- and now it works. But without cpuset -l 0, it still gets stuck.
-
-Tue Dec 14 20:31:33 2010 Tanaka Akira <akr@fsij.org>
-
- * gc.c: parenthesize macro arguments.
-
-Tue Dec 14 18:31:48 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/test/unit.rb: help messages.
-
-Tue Dec 14 18:19:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (help): there is no reason to use the abbreviation for here.
-
-Tue Dec 14 15:03:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_io.rb (test_reopen, test_reinitialize): should close
- the temporary files.
-
-Tue Dec 14 14:24:15 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_io.rb (make_tempfile): change the prefix from 'foo'
- to 'test_io' because the old one is meaningless and inconvenient.
-
- * test/ruby/test_io.rb (test_binmode_after_closed): the temporary file
- maked by make_temfile is already closed.
-
-Tue Dec 14 13:52:19 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_io.rb (test_flush_in_finalizer[12]): should close
- temporary file because it's only used for taking pathname and
- unlinking the file after the end of the test (in GC phase).
-
-Tue Dec 14 13:34:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzfile_s_open): should close the IO if some error
- occurs in initializing.
-
-Tue Dec 14 13:04:16 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPRequest#send_request_body_data):
- set binmode to tempfile.
-
-Tue Dec 14 12:55:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/zlib/test_zlib.rb (*): should close files associated with zlib.
-
-Tue Dec 14 11:30:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_argf.rb (test_inplace_rename_impossible): unlink
- the renamed temporary file on no_safe_rename platforms.
-
- * test/ruby/test_argf.rb (test_readlines_limit_0,
- test_each_line_limit_0): should close argf because the associated
- Tempfile object cannot unlink the temporary file when it's gc'ed
- on some platforms (Windows, etc.)
-
-Tue Dec 14 11:27:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/minitest/unit.rb (Minitest::Unit#_run_suite): split test
- name and its time. Thiw allows to know test's name when you are
- running tests and meet a test which spends long time at realtime.
-
-Tue Dec 14 11:25:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: Add -Werror=declaration-after-statement to default
- warning flag. If you are using GCC, this flag is useful to
- prevent breaking VC build.
-
-Tue Dec 14 10:25:57 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode0): how many gcc-c99isms
- must a man mend; before he can build with VC? r30178
-
-Mon Dec 13 21:26:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (simple_sendfile): disable the use of sendfile(2) on
- FreeBSD. It blocks on TestIO#test_copy_stream_socket.
-
-Mon Dec 13 18:35:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD.
- Remove Mac OS X because its argument is different from them.
-
-Mon Dec 13 12:00:09 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c: parenthesize macro arguments.
-
-Mon Dec 13 11:21:14 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (simple_sendfile): added for BSD version of sendfile(2).
-
-Mon Dec 13 09:50:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPRequest#set_form): Added to support
- both application/x-www-form-urlencoded and multipart/form-data.
- There is a similar API, Net::HTTPRequest#set_form_data, but
- to keep its compatibility this is newly added. [ruby-dev:42729]
-
-Sun Dec 12 23:45:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each): fix for __goto__ and __label__
- where were totally broken.
-
-Sun Dec 12 22:45:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (ID_H_INCLUDES): now id.h depends on vm_opts.h.
-
-Sun Dec 12 20:42:47 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * template/id.h.tmpl: suppress all warning: "SUPPORT_JOKE" is not
- defined. [ruby-dev:42730]
-
-Sun Dec 12 20:35:07 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * misc/rb_optparse.zsh: update how to install.
-
- * misc/rb_optparse.zsh: avoid error when setopt noclobber.
-
- * lib/optparse.rb: fix typo. pointed out at
- <http://d.hatena.ne.jp/nagachika/20101207>.
-
-Sun Dec 12 13:27:35 2010 Tanaka Akira <akr@fsij.org>
-
- * eval_error.c: parenthesize macro arguments.
-
-Sun Dec 12 11:53:24 2010 Tanaka Akira <akr@fsij.org>
-
- * error.c: parenthesize macro arguments.
-
-Sun Dec 12 04:01:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): fix: extra back slash is added when
- the string is dummy encoding and includes \x22 or \x5C.
-
-Sun Dec 12 02:42:24 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/openssl/ossl_asn1.c: indefinite length BER to DER encoding is
- properly supported. Thanks Martin Bosslet! [ruby-core:33082]
-
-Sat Dec 11 17:43:34 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * ext/bigdecimal/bigdecimal.h: suppress "warning: 'VPrint' declared
- 'static' but never defined".
-
-Sat Dec 11 09:24:57 2010 Tanaka Akira <akr@fsij.org>
-
- * encoding.c: parenthesize macro arguments.
-
-Sat Dec 11 08:12:48 2010 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl/ossl.c, ext/openssl/ossl_pkey_rsa.c: Document RSA, RSA
- encryption/decryption and PKCS #5 encryption/decryption.
-
-Sat Dec 11 06:23:41 2010 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl/ossl_x509name.c: include Comparable to provide #==.
- Document OpenSSL::X509::Name#<=>. [Ruby 1.9-Feature#4116]
-
-Sat Dec 11 05:48:28 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
- [ruby-dev:42716] [Ruby 1.9-Bug#4129]
-
- * ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at
- exit.
-
-Sat Dec 11 02:23:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/openssl/extconf.rb: try pkgconfig first, then fall back to
- normal have_library, etc. Thanks Erik Hollensbe. [ruby-core:32406]
-
-Fri Dec 10 22:33:39 2010 Tanaka Akira <akr@fsij.org>
-
- * dln_find.c: parenthesize macro arguments.
-
-Fri Dec 10 20:05:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/id.h.tmpl (ruby_method_ids): suppress warnings.
- [ruby-dev:42730]
-
-Fri Dec 10 18:29:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): relatively called non-shared
- binary cannot be found in PATH, so use given pathname.
-
-Fri Dec 10 18:28:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc.
-
- * cygwin/GNUmakefile.in (scriptbin): set executable bit.
-
- * tool/rbinstall.rb (install_recursive): always skip default ignored
- files. if block is given, call it instead of calling install.
-
- * tool/rbinstall.rb (bin-comm): use install_recursive.
-
-Fri Dec 10 18:12:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/mkmf/base.rb (TestMkmf#config_value): extract macro value from
- config.h.
-
- * test/mkmf/test_sizeof.rb (TestMkmf::TestSizeof#test_sizeof_builtin),
- (TestMkmf::TestSizeof#test_sizeof_struct): more tests.
-
- * lib/mkmf.rb (check_signedness): should use the prelude code.
- [ruby-dev:42731]
-
- * lib/mkmf.rb (Logging.log_close): separate from Logging.logfile.
-
- * test/mkmf/base.rb (TestMkmf::MKMFLOG): show mkmf.log at failures.
-
- * test/mkmf/base.rb (TestMkmf#teardown): close log file for each tests.
-
-Fri Dec 10 11:36:43 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * compile.c (enum): remove a comma at end of enumerator list.
-
- * constant.h (rb_const_flag_t): ditto.
-
- * iseq.h (enum catch_type): ditto.
-
- * iseq.h (enum defined_type): ditto.
-
- * vm_core.h (enum iseq_type): ditto.
-
- * vm_core.h (enum vm_special_object_type): ditto.
-
-Fri Dec 10 10:47:53 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sprintf.c (_HAVE_SANE_QUAD_): Don't forget LP64, r30156.
-
-Fri Dec 10 10:37:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * sprintf.c (_HAVE_SANE_QUAD_): if a certain platform has LONG_LONG in
- 8 byte, it might be sane quad. [ruby-core:33634]
-
-Fri Dec 10 10:07:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: remove version 1.1 features.
-
-Fri Dec 10 02:18:02 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/openssl/ossl_x509store.c (ossl_x509stctx_cleanup): removing C
- implementation of `cleanup`.
-
- * ext/openssl/lib/openssl/x509.rb: adding ruby implementation of
- `cleanup`. OpenSSL::X509::StoreContext#cleanup is deprecated since
- reusing the underlying struct doesn't make sense. [ruby-dev:42546]
-
-Thu Dec 9 20:14:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (lvar_defined_gen, shadowing_lvar_gen, dvar_defined): no
- warnings for unused method and block arguments.
- [ruby-dev:42718] [ruby-dev:42724]
-
-Thu Dec 9 19:25:49 2010 Tanaka Akira <akr@fsij.org>
-
- * dln.c: parenthesize macro arguments.
-
-Thu Dec 9 18:51:06 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/webrick/accesslog.rb (WEBrick::AccessLog#format): support
- %{remote}p for logging remote (client) port number.
- [ruby-dev:42670]
-
-Thu Dec 9 11:00:30 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_dup): should copy contents only. no instance
- variable, no class would be copied. it would affect methods
- #sort, #reject, #transpose, #uniq, #compact, and #shuffle.
- [ruby-core:33640]
-
- * array.c (rb_ary_reverse_m): ditto.
-
- * array.c (rb_ary_rotate_m): ditto.
-
-Wed Dec 8 21:38:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/dl/lib/dl/struct.rb: clean a warning: assigned but unused
- variable. patched by Kouhei Yanagita. [ruby-dev:42722]
-
- * ext/dl/lib/dl/import.rb: ditto.
-
-Wed Dec 8 21:36:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (shadowing_lvar_gen): fix line number. [ruby-dev:42718]
-
-Wed Dec 8 20:37:11 2010 Tanaka Akira <akr@fsij.org>
-
- * dir.c: parenthesize macro arguments.
-
-Tue Dec 7 22:37:15 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * io.c (io_read): duplicate string if shared. [ruby-dev:42719]
-
-Tue Dec 7 22:31:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Officious): separate completion
- options from --help. [ruby-dev:42690]
-
- * lib/optparse.rb (OptionParser::Completion#candidate),
- (OptionParser::Switch#compsys): remove unused variables.
-
-Tue Dec 7 22:05:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (transcode_loop): call default handler of the given
- hash, method, proc or [] method as fallback. [ruby-dev:42692]
-
-Tue Dec 7 21:59:37 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/light/node.rb: remove circular require.
-
-Tue Dec 7 21:56:01 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_light.rb: really suppress a warning.
-
-Tue Dec 7 21:51:57 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_light.rb: suppress a warning.
-
-Tue Dec 7 21:14:03 2010 Tanaka Akira <akr@fsij.org>
-
- * debug.c: parenthesize macro arguments.
-
-Tue Dec 7 21:06:38 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/doctype.rb, test/rexml/test_doctype.rb: suppress warnings.
- [ruby-core:33305]
- Reported by Aaron Patterson. Thanks!!!
-
-Tue Dec 7 18:56:52 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
- patched by Kouhei Yanagita [ruby-dev:42696]
-
-Tue Dec 7 20:32:11 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_doctype.rb: add Accessor to test case name.
-
-Tue Dec 7 20:31:02 2010 Kouhei Sutou <kou@clear-code.com>
-
- * test/rexml/test_doctype.rb: Doctype -> DocType.
-
-Tue Dec 7 20:29:23 2010 Kouhei Sutou <kou@clear-code.com>
-
- * test/rexml/test_doctype_mixin.rb: rename to ...
- * test/rexml/test_doctype.rb: ... this to remove needless name.
-
-Tue Dec 7 17:03:16 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (xlist): supported the XLIST command, which is an
- extension by Apple and Google. patch by Geoff Youngs.
- [ruby-core:33521]
-
-Tue Dec 7 08:00:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, win32/Makefile.sub (WERRORFLAG): flag to treat
- warnings as errors.
-
- * lib/mkmf.rb (Logging.postpone): yield log file object.
-
- * lib/mkmf.rb (xsystem): add options, :werror only right now.
-
- * lib/mkmf.rb (with_werror): check as if warnings are errors.
-
- * lib/mkmf.rb (convertible_int): make declaration conflict
- warnings errors not to pass wrong type. [ruby-dev:42684]
-
- * lib/mkmf.rb (COMMON_MACROS): get rid of conflicts.
-
- * win32/Makefile.sub (WARNFLAGS): make declaration conflict
- warnings errors if possible.
-
-Sun Dec 7 21:16:10 2010 Tanaka Akira <akr@fsij.org>
-
- * cont.c: parenthesize macro arguments.
-
-Tue Dec 7 00:27:14 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * win32/win32.c (rb_w32_read): fixed more for readline,
- and so on. [ruby-core:33511]
-
-Mon Dec 6 23:18:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/mkmf/base.rb (TestMkmf#setup): run quietly.
-
- * test/mkmf/test_find_executable.rb (test_find_executable): use
- configured results.
-
- * common.mk (test-build): test for build process.
-
-Mon Dec 6 22:47:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#candidate): skip separators.
-
- * sample/optparse/opttest.rb: should not override --help.
- [ruby-dev:42690]
-
-Mon Dec 6 19:00:48 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * misc/rb_optparse.zsh: fix typos.
-
-Mon Dec 6 18:59:04 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add new encodings.
-
-Mon Dec 6 18:56:42 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_string.rb (TestString#test_scan): add a test for
- [ruby-core:33338] #4087.
-
-Mon Dec 6 18:55:36 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/uri/test_common.rb (TestCommon#test_encode_www_form): add
- tests for r30015.
-
-Mon Dec 6 10:39:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI::Parser#initialize_pattern):
- refix for restrict the pattern.
-
-Mon Dec 6 09:45:11 2010 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl (OpenSSL): add toplevel documentation
- * ext/openssl/ossl_ssl.c (SSLContext, SSLSocket: add additional
- documentation
- * ext/openssl: move "let rdoc know about mOSSL" comments so they don't
- show up in output
-
-Mon Dec 6 09:16:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI::Parser#initialize_pattern):
- workaround fix pattern of hostname for RFC 3986. [ruby-dev:42672]
-
-Mon Dec 6 09:14:38 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/mkmf.rb (check_signedness): rename unused variable prelude.
-
-Sun Dec 5 17:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (make_metaclass): fix probable typo. builtin type flag
- cannot be used with FL_TEST.
-
-Sun Dec 5 12:09:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
-
-Sun Dec 5 11:27:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file_internal): decrement for ungotten line.
- [ruby-dev:42680]
-
-Sun Dec 5 10:32:11 2010 Tanaka Akira <akr@fsij.org>
-
- * complex.c: parenthesize macro arguments.
-
-Sat Dec 4 11:39:17 2010 Eric Hodel <drbrain@segment7.net>
-
- * ext/openssl/ossl_x509ext.c (initialize): add documentation.
-
-Sat Dec 4 11:21:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_update_by): new API for Hash#update.
-
-Sat Dec 4 11:18:10 2010 Tanaka Akira <akr@fsij.org>
-
- * class.c: parenthesize macro arguments.
-
-Sat Dec 4 11:07:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_vm_inc_const_missing_count): missing prototype.
-
-Sat Dec 4 08:50:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is nil.
-
-Sat Dec 4 08:25:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_method): revert r30064 and r30071,
- because of [ruby-core:26761]. Bug#4106 rejected.
-
-Sat Dec 4 07:46:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (String#tr_cpp): substitute * with P like as
- autoconf.
-
-Fri Dec 3 22:36:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_method): protected methods should be
- checked against the real class.
-
-Fri Dec 3 20:23:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (convertible_int): define printf format prefix too.
-
- * lib/mkmf.rb (convertible_int): detect convertible integer type.
- port RUBY_REPLACE_INT from configure.in.
-
- * lib/mkmf.rb (check_sizeof): should return integer always.
-
-Fri Dec 3 12:54:48 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (RCFLAGS): VC10 and after only. fixed the problem
- of r30015. [ruby-core:33530]
-
-Fri Dec 3 12:41:52 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * gc.c (rb_objspace_free): With our "lazy-sweep" GC engine, it is
- possible for an object to survive until its surrounding object
- space is about to be freed. Those objects, if any, remains
- leaked for the rest of a process life. This is problematic
- because for instance a T_DATA object may have its own destructor
- to terminate something.
-
- * vm.c (ruby_vm_destruct): ruby_current_vm termination should be
- somewhere after rb_objspace_free for above reason.
-
-Fri Dec 3 12:17:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_method): protected singleton methods should
- be visible from same real class methods. [ruby-core:33506]
-
-Fri Dec 3 07:08:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_getline): round upto next char
- boundary. [ruby-dev:42674]
-
-Fri Dec 3 06:52:46 2010 Tanaka Akira <akr@fsij.org>
-
- * compile.c: parenthesize macro arguments.
-
-Fri Dec 3 04:08:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_alias_internal): use st_insert2 and change return
- value to int.
-
- * encoding.c (enc_alias): follow enc_alias_internal.
-
-Fri Dec 3 01:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_alias_internal): use xfree instead of free.
-
-Thu Dec 2 23:52:26 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * NEWS: entry for ruby_vm_at_exit().
-
- * eval.c (ruby_cleanup): bug fix around at_exit (1) timing was
- wrong. (2) execution order was opposite.
-
-Thu Dec 2 23:05:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (RCFLAGS): -nologo switch is only available in
- newer versions of rc.exe. fixed the problem of r30012.
-
-Thu Dec 2 21:28:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/add/rails.rb: removed.
-
-Thu Dec 2 21:22:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_alias_internal): free the copied key and
- return NULL when given key is already registered.
-
- * encoding.c (enc_alias): call set_encoding_const only when the
- alias is not registered yet.
-
-Thu Dec 2 19:58:24 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * vm.c (ruby_vm_at_exit): new API. This enables extension libs to
- hook a VM termination. Right now, because the VM we have is
- process global, most extensions do not deallocate resources and
- leave them to Operating System's reaping userland processes. But
- in a future we plan to have multiple VMs to run simultaneously in
- a single process (MVM project). At that stage we can no longer
- rely on OSes and have to manage every resources to be reclaimed
- properly. So it is. For a forward-compatibility reason this API
- is introduced now, encouraging you to be as gentle as you can for
- your resources; that is, tidy up your room.
-
- * include/ruby/vm.h: ditto.
-
- * vm_core.h (rb_vm_struct): new field.
-
- * vm.c (vm_init2): initialize above new field.
-
- * eval.c (ruby_cleanup): trigger those hooks.
-
-Thu Dec 2 17:00:44 2010 Tanaka Akira <akr@fsij.org>
-
- * bignum.c: parenthesize macro arguments.
-
-Thu Dec 2 15:31:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): more fix. [ruby-core:33513]
-
-Thu Dec 2 13:41:43 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): workaround for console reading troubles.
- fixed [ruby-core:33511]
-
-Thu Dec 2 13:10:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.encode_www_form):
- split key-value when the value is Array like object.
-
-Thu Dec 2 10:39:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP#set_form_data):
- use URI.encode_www_form for application/x-www-form-urlencoded.
-
-Thu Dec 2 10:38:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/extmk.rb: remove $makeflags.defined?, it should be $mflags.
-
-Thu Dec 2 10:19:47 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (rc): suppress meaningless message.
-
-Thu Dec 2 10:09:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/generator/extconf.rb: remove the lines which set -O3
- when -O option is not set.
- Note that -O3 doesn't always exist.
-
- * ext/json/parser/extconf.rb: ditto.
-
-Thu Dec 2 10:01:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/extmk.rb: define $makeflags.defined? like $mflags.
-
-Thu Dec 2 07:20:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::GCStressOption): --gc-stress
- option.
-
- * lib/test/unit.rb (Test::Unit::Mini#_run_suites): show the result
- even when interrupted on the way.
-
-Thu Dec 2 07:08:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (setattr): should retry on EINTR.
- [ruby-dev:42666]
-
-Thu Dec 2 02:30:50 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/net/http.rb: fixed positional wording to match revised order.
-
-Thu Dec 2 01:24:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/lib/json/common.rb: don't use iconv on 1.9.
- patched by Shota Fukumori [ruby-core:33164]
-
-Thu Dec 2 01:02:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: Update github/flori/json from 1.4.2+ to
- e22b2f2bdfe6a9b0. this fixes some bugs.
-
-Thu Dec 2 00:05:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: improve rdoc.
- This change the order of chapter because such overview should
- begin with simple examples.
- patched by Eric Hodel [ruby-core:33469]
-
-Wed Dec 1 22:01:49 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (Init_Numeric): fixed a potential bug when using bccwin32
- ruby with Microsoft's dll, though we already gave up of supporting
- bccwin32. [ruby-core:33503]
-
-Wed Dec 1 21:43:21 2010 Tanaka Akira <akr@fsij.org>
-
- * array.c: parenthesize macro arguments.
-
-Wed Dec 1 21:41:57 2010 Tanaka Akira <akr@fsij.org>
-
- * test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
-
- * test/socket/test_socket.rb: ditto.
-
-Wed Dec 1 15:08:32 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/openssl/test_ssl.rb (test_not_started_session): non socket
- argument of SSLSocket.new is not supported on Windows.
-
-Wed Dec 1 14:36:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_memhash): zero-filled strings should return
- different values. [ruby-core:33500]
-
-Wed Dec 1 14:27:49 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 2.0.0 r5952.
- * test/minitest/*.rb: ditto.
- * lib/test/unit.rb: Compatibility fix for minitest changes.
-
-Wed Dec 1 10:16:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): fix typo (not 0xFD but 0xFE).
-
-Wed Dec 1 09:28:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c: Follow .gnu_debuglink section.
- A user of distribution provided ruby will see line
- info if s/he has a debug package for ruby.
- patched by Shinichiro Hamaji [ruby-dev:42655]
-
-Wed Dec 1 01:29:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): inspect as a dummy encoding string
- when a UTF-16/32 (not BE/LE) string does not have a BOM.
- Unicode and some RFCs say that a string labeled as UTF-16/32
- doesn't have a BOM, it should be considered big endian.
- But many Windows programs generates little endian UTF-16
- strings without a BOM. So String#inspect treats a string
- labeled UTF-16/32 without a BOM as a dummy encoding string.
- patched by Martin Duerst. [ruby-core:33461]
-
-Tue Nov 30 17:04:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c (parse_debug_line_cu): ignore DW_LNE_set_discriminator.
- To ignore, it needs to read a single unsigned LEB128 integer.
-
-Tue Nov 30 16:29:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_dump.c: undef HAVE_BACKTRACE when the OS is FreeBSD (in other
- words backtrace() is libexecinfo) and it is optimized.
- This temporary hack may be also applied to other libexecinfo
- environments.
-
-Tue Nov 30 16:23:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: improve rdoc.
- patched by Eric Hodel ref #4100
-
-Tue Nov 30 12:23:52 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): read only 1 byte at once on console.
- workaround of Windows bug. see [ruby-core:33460].
- this is not the final solution.
-
-Tue Nov 30 11:39:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: improve rdoc.
- patched by mathew murphy [ruby-core:33472] ref #4100
-
-Tue Nov 30 05:03:44 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/uri/common.rb (encode_www_form, encode_www_form_component):
- Improve English in documentation.
-
- * ext/openssl/ossl_ssl.c (ssl_version=, ciphers=): Document
- #ssl_version=, add documentation for #ciphers=.
-
-Mon Nov 29 22:55:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
- by nested repeat operators. [ruby-core:33464]
-
-Mon Nov 29 22:53:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (scriptbin.mk): fix generated rules.
-
- * win32/win32.c (rb_w32_write_console): fix argument type.
-
-Mon Nov 29 21:12:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-forward-sexp): stop after literal hash
- key labels.
-
- * misc/ruby-mode.el (ruby-font-lock-keywords): highlight literal
- hash key labels as symbols.
-
-Mon Nov 29 18:31:31 2010 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
- - Removed commented-out options that are no longer under discussion.
- - Added two more tests for forthcomming clarifications.
-
-Mon Nov 29 14:31:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_isatty): use GetConsoleMode() to determine the
- fd is console or not, just like rb_w32_write_console(). [experimental]
-
-Mon Nov 29 14:19:40 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h (rb_w32_write_console): wrong prototype.
-
-Mon Nov 29 14:10:55 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_write_console): fixed indentation.
-
-Sun Nov 28 22:13:39 2010 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (NATIVE_MUTEX_LOCK_DEBUG): move and use it.
-
- * ChangeLog: fix my timezone.
-
-Mon Nov 28 21:58:58 2010 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c: remove pthread_atfork().
-
-Mon Nov 28 21:54:22 2010 Koichi Sasada <ko1@atdot.net>
-
- * thread_pthread.c (native_cond_*): Check return code.
- (Some OSes except Linux return error code).
-
-Sun Nov 28 21:46:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (thread_start_func_1): initialize native thread
- data immediately before starting.
-
-Sun Nov 28 14:56:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (struct argf): make lineno long, and reorder members.
-
-Sun Nov 28 14:55:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_win32.c (gvl_release, gvl_init): suppress warnings.
-
-Sun Nov 28 14:48:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (gvl_release, gvl_init): suppress warnings.
-
- * vm_core.h (rb_vm_gvl_destroy): add prototype.
-
-Sun Nov 28 14:46:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (gvl_reinit): register atfork handler only in
- the parent process, to get rid of dead lock.
-
-Sun Nov 28 12:23:57 2010 Koichi Sasada <ko1@atdot.net>
-
- * thread.c, vm_core.h: make gvl_acquire/release/init/destruct
- APIs to modularize GVL implementation.
-
- * thread_pthread.c, thread_pthread.h: Two GVL implementations.
- (1) Simple locking GVL which is same as existing GVL.
- (2) Wake-up queued threads. The wake-up order is simple FIFO.
- (We can make several queues to support exact priorities, however
- this causes some issues such as priority inversion and so on.)
- This impl. prevents spin-loop (*1) caused on SMP environments.
- *1: Only one Ruby thread acquires GVL again and again.
- Bug #2359 [ruby-core:26694]
-
- * thread_win32.c, thread_win32.h: Using simple lock
- not by CRITICAL_SECTION but by Mutex.
- Bug #3890 [ruby-dev:42315]
-
- * vm.c (ruby_vm_destruct): ditto.
-
-Sun Nov 28 04:40:00 2010 Luis Lavena <luislavena@gmail.com>
-
- * io.c (io_fwrite): use rb_w32_write_console under Windows.
-
- * win32/win32.c (rb_w32_write_console): added to write to write
- Unicode using WriteConsoleW for stdout/stderr. [ruby-core:33166]
-
-Sun Nov 28 03:58:47 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: improve rdoc.
- patched by Mike Perham [ruby-core:33433]
-
-Sat Nov 27 19:12:10 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: parenthesize macro arguments.
-
-Sat Nov 27 18:08:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (leap_year_v_p): fixed typo. [ruby-dev:42631]
-
-Sat Nov 27 17:57:08 2010 Tanaka Akira <akr@fsij.org>
-
- * resolv.rb (Resolv::DNS): use the same DNS server when retry using
- TCP. reported by Julian Mehnle. [ruby-core:32970]
-
-Sat Nov 27 15:45:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_dump.c (rb_vm_bugreport): see CrashReport log on Mac OS X.
-
- * configure.in: link addr2line only for ELF.
-
-Sat Nov 27 13:58:55 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#candidate): : was missing. Thanks,
- Shota Fukumori. [ruby-dev:42634]
-
-Sat Nov 27 12:07:05 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * man/ruby.1: Ruby man page from Arthur Gunn in [ruby-core:33412]
-
-Sat Nov 27 11:29:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax
- so that BASERUBY can be 1.8.
-
-Sat Nov 27 08:16:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * addr2line.c (rb_dump_backtrace_with_lines): should close fd on
- edge case.
-
-Fri Nov 26 13:33:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c: apply a patch from shinichiro.h.
-
-Fri Nov 26 12:21:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * addr2line.c: added to show source filename and line number of
- functions in backtrace. [ruby-dev:42625]
- a patch from shinichiro.h <shinichiro.hamaji AT gmail.com>
-
- * addr2line.h: ditto.
-
- * common.mk: add addr2line.$(OBJEXT).
-
- * configure.in: check dl_iterate_phdr.
-
- * vm_dump.c (rb_vm_bugreport): use rb_dump_backtrace_with_lines in
- addr2line.c when the binary is ELF.
-
-Fri Nov 26 12:12:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (setup_tree): restart setup_tree() for a node whose
- AnchorNode's type is ANCHOR_PREC_BEHIND or ANCHOR_PREC_BEHIND_NOT
- and divide_look_behind_alternatives() divided it to NT_ALT or
- NT_LIST. [ruby-core:33370]
-
-Fri Nov 26 11:40:11 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): get only required rights of the target
- thread because THREAD_ALL_ACCESS causes an access error on XP.
- reported by Masaya TARUI via IRC.
-
-Fri Nov 26 11:09:07 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): show the displacement from the beginning
- of the symbol.
-
-Fri Nov 26 10:48:23 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): follow the output of glibc.
- see [ruby-dev:42627]
-
-Fri Nov 26 09:48:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * re.c (rb_reg_initialize_str): should succeed the taint status from
- the origin. [ruby-core:33338]
-
-Fri Nov 26 09:32:37 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): seems to be necessary the 3rd argument of
- SymGetLineFromAddr64(), even though MSDN says it can be zero.
-
-Fri Nov 26 09:03:38 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (onig_is_prelude): added to check whether ruby is still
- in prelude (or other boot processes) or not.
-
- * regcomp.c (optimize_node_left): use onig_is_prelude for printing.
-
- * regcomp.c (set_optimize_info_from_tree): ditto.
-
- * regcomp.c (onig_compile): ditto.
-
- * regcomp.c (print_compiled_byte_code_list): print its address.
-
- * regcomp.c (print_indent_tree): print its contents tree of
- ANCHOR_PREC_READ(_NOT) and ANCHOR_PREC_BEHIND(_NOT).
-
-Thu Nov 25 23:10:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (print_distance_range): use PRIuSIZE.
-
- * regcomp.c (print_optimize_info): use %ld because the type of
- calculated value of integers is long.
-
- * regexec.c (onig_print_compiled_byte_code): add prototype.
-
- * regexec.c (match_at): add 2nd argument.
-
-Thu Nov 25 10:29:55 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/callback/mkcallback.rb (gencallback): shouldn't assume that
- VALUE is the same size with long.
-
-Thu Nov 25 10:03:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
- only when it exists.
-
-Thu Nov 25 01:38:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/big5-hkscs-tbl.rb: Update table as HKSCS-2008.
- patched by oCameLo oTnTh [ruby-core:33256]
-
- * enc/big5.c: add alias Big5-HKSCS:2008 to Big5-HKSCS.
-
-Wed Nov 24 15:18:07 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vsnprintf (BSD_vfprintf): use QUADINT macro only when _HAVE_SANE_QUAD_
- macro is defined.
-
-Wed Nov 24 12:47:16 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vsnprintf (BSD_vfprintf): added VC++ compatible size specifications
- (I, I32, I64).
-
-Wed Nov 24 11:19:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): treat UTF-16 and UTF-32 as BE or LE.
-
-Wed Nov 24 06:35:32 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf_16_32.trans: add the UTF-32 converter.
-
-Wed Nov 24 05:40:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
-Wed Nov 24 06:13:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (filecp, wstr_to_mbstr, mbstr_to_wstr):
- refactored.
-
-Wed Nov 24 05:40:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf_16_32.trans: add a converter from UTF-8 to UTF-16.
-
-Wed Nov 24 03:21:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf_16_32.trans: raise error on unpaired upper
- surrogates.
-
-Wed Nov 24 01:40:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_16_32.h: add UTF-16 and UTF-32 as a dummy encoding.
-
- * enc/trans/utf_16_32.trans: add a converter from UTF-16 to UTF-8.
-
-Tue Nov 23 21:59:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (wlink, rb_w32_getppid): use typedef instead of
- repeating complicated function prototypes.
-
-Tue Nov 23 18:54:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (rb_thread_mark): should mark self in control
- frames. [ruby-core:33289]
-
-Tue Nov 23 07:57:31 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner.
-
-Tue Nov 23 07:29:24 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c, rational.c ({nucomp,nurat}_expt): added a check.
-
-Tue Nov 23 07:27:27 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (daynum): should be private.
-
-Tue Nov 23 07:22:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ChangeLog (change-log-indent-text): hanging indent.
-
-Tue Nov 23 06:30:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (SITE_DIR, VENDOR_DIR),
- version.c (ruby_initial_load_paths): exclude directories that
- are configured without them from $LOAD_PATH. [ruby-core:33267]
-
- * configure.in (rubylibprefix): No ruby, No libprefix.
-
-Tue Nov 23 01:05:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): don't output floating point
- when the precision is 0. [ruby-dev:42615]
-
-Mon Nov 22 21:30:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_inspect): fix for ascii-compatible external
- encoding and different encoding string. [ruby-core:33283]
-
-Mon Nov 22 18:45:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): should not duplicate rules.
- bug fix of r29842.
-
-Mon Nov 22 18:04:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/big5.c: split CP950 from Big5.
-
- * enc/big5.c: split CP951 from Big5-HKSCS.
-
- * enc/trans/big5.trans: import conversion table of Big5, Big5-HKSCS,
- CP950, and CP951 from ICU. they need fallback conversions.
- ref [ruby-core:33256]
- http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/
-
- * tool/transcode-tblgen.rb (import_ucm): add to import ucm files.
-
-Mon Nov 22 18:33:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_inspect): append for each chars instead of bulk
- copy if encoding conversion is needed. [ruby-core:33283]
-
-Mon Nov 22 14:22:45 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * time.c (time_zone): use rb_locale_str_new_cstr to set encoding
- as locale and convert its content to internal encoding.
- [ruby-core:33278]
-
-Mon Nov 22 11:58:11 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
- receiver is 7BIT and the argument is non ASCII.
-
-Mon Nov 22 01:48:58 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: some improvements for performance.
-
-Sat Nov 20 07:45:50 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.
- Thanks Scott Gonyea! [ruby-core:33260]
-
-Sat Nov 20 01:57:55 2010 Akio Tajima <artonx@yahoo.co.jp>
-
- * common.mk: add dependency(insns.inc) to compile.obj
-
-Fri Nov 19 23:05:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (insns_rules.mk): remove extra backslash.
-
- * cygwin/GNUmakefile.in, win32/Makefile.sub (clean): rc files are
- made at compile time, so should be removed by clean.
-
-Fri Nov 19 22:09:46 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_core.rb
- (Tester#test_pretty_format_long_text_finite): skip a test that
- uses long string on small memory system. [ruby-dev:42599]
-
-Fri Nov 19 21:07:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb: shell completion support for zsh. based on
- <http://d.hatena.ne.jp/rubikitch/20071002/zshcomplete>
-
- * lib/optparse.rb: shell completion support for bash.
-
-Fri Nov 19 00:00:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (SCRIPTPROGRAMS): no needs on cygwin.
-
- * win32/Makefile.sub (scriptbin): create script binaries.
-
-Thu Nov 18 23:21:23 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
- REXML::Formatters::Pretty#wrap used a recursive method call to
- format text. This switches it to use an iterative approach.
- [ruby-core:33245]
- Patch by Jeremy Evans. Thanks!!!
-
- * test/rexml/test_core.rb: add a test for it.
-
-Thu Nov 18 22:58:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/io.h (rb_io_buffer_t): extract from rb_io_t.
-
-Thu Nov 18 07:37:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (reconfig): force reconfigure with previous options.
-
- * common.mk (showconfig): show configure flags, like as
- `config.status --config' generated by recent autoconf.
-
-Thu Nov 18 07:16:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/langinfo.c (strncasecmp): get rid of redefinition.
-
-Thu Nov 18 00:02:17 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Upgrading output encoding with ASCII content
- as needed. [ruby-core:33229]
-
-Wed Nov 17 23:19:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/configure.bat: remove quotes from arguments to be quoted.
-
- * lib/mkmf.rb (create_makefile): use forward slashes in messages.
-
- * lib/mkmf.rb (create_makefile): make extension libraries messages
- brief.
-
- * win32/Makefile.sub (MAKEDIRS): should not include silent flag.
-
- * common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass
- Q and ECHO. [ruby-core:33226]
-
-Wed Nov 17 16:09:52 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/test_tracer.rb: new test case.
- minimal regression test for r29280.
-
-Wed Nov 17 16:04:23 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
- new assertion to assert that a particular warning message is
- displayed.
- forward port from branches/ruby_1_9_2@29795.
-
-Wed Nov 17 15:16:48 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regint.h (OnigOpInfoType): constify name.
-
- * regcomp.c (op2name): constify return value.
-
- * regcomp.c (onig_print_compiled_byte_code): use PRIuPTR and
- uintptr_t to clean warnings.
-
- * regcomp.c (print_indent_tree): use PRIxPTR and intptr_t.
-
- * regexec.c (match_at): use PRIdPTR and intptr_t.
-
-Wed Nov 17 09:49:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/shift_jis.c (property_name_to_ctype): fix memory leak.
-
- * enc/euc_jp.c (property_name_to_ctype): ditto.
-
-Wed Nov 17 08:54:04 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Upgrading output encoding as needed. [ruby-core:33135]
-
-Tue Nov 16 22:30:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
- Coverity Scan found this bug.
-
-Tue Nov 16 09:33:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/lib/bigdecimal/util.rb (to_digits): avoid unused
- variables warning, reported by Aaron Patterson.
-
-Tue Nov 16 06:39:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
- values if block is given. [ruby-core:33193]
-
-Tue Nov 16 00:21:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * regparse.c (and_cclass, or_cclass): fix memory leak. Coverity Scan
- found this bug. [ruby-dev:42579]
-
-Tue Nov 16 00:07:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c (assign_heap_slot): fix fear of memory leak and memory
- violation. Coverity Scan found this bug.
-
-Mon Nov 15 23:54:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
- size_t to a pointer typed VALUE*. Coverity Scan found this defect.
-
-Mon Nov 15 23:41:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_set_exception_local_table, iseq_set_local_table,
- rb_iseq_build_from_ary): fix type inconsistency (which is benign
- because sizeof(ID) == sizeof(ID*), though). Coverity Scan found
- these bugs.
-
-Mon Nov 15 22:47:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_funcall): ensure va_end after va_init_list. Coverity
- Scan found this bug.
-
-Mon Nov 15 08:36:12 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/racc/parser.rb (do_parse, yyparse): using class eval to define
- method and avoid __send__.
-
-Mon Nov 15 06:43:48 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
- pointer is invalid. Thanks Ippei Obayashi! [ruby-dev:42573]
-
-Sun Nov 14 17:57:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/Makefile.in (distclean): should not remove sources which are
- distributed in tarball.
-
-Sun Nov 14 16:48:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_set_token_info): turn on/off with directives.
- [ruby-core:25442]
-
-Sun Nov 14 12:05:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_readlines): forward to current_file for arguments
- check. http://twitter.com/nagachika/status/3634254856589312
-
-Sun Nov 14 08:48:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
- space and compiler command line.
-
-Sun Nov 14 04:22:32 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (config.h): Added HAVE_LABS and HAVE_LLABS to config.h.
-
- * symbian/configure.bat: Changed packaging version in line with API
- style 3 versioning.
-
-Sat Nov 13 16:37:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (showflags, help): emit messages at once.
-
- * win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I.
-
-Sat Nov 13 01:31:30 2010 Akio Tajima <artonx@yahoo.co.jp>
-
- * win32/Makefile.sub: reorder variable End Of Message (don't display it)
-
-Fri Nov 12 20:52:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (showflags, help): use caret to quote leading spaces on
- Windows.
-
- * Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
- ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up.
-
-Fri Nov 12 16:35:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: support C level backtrace information on FreeBSD.
- When devel/libexecinfo is installed on FreeBSD, now ruby
- can show C level backtrace information.
- http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/libexecinfo/
-
-Fri Nov 12 09:58:30 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/setup.mak: use findstr.exe instead of find.exe, because all
- target build platforms should have findstr.exe, and, find.exe often
- means another command such as cygwin's.
-
-Fri Nov 12 00:30:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): need PRI_LL_PREFIX.
-
-Thu Nov 11 23:38:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: ANSI C-conforming const and volatile are mandatory
-
- * configure.in (AC_C_CONST, AC_C_INLINE, AC_C_VOLATILE): check
- before used in other checks.
-
- * configure.in (RUBY_CHECK_PRINTF_PREFIX): should not break from
- RUBY_WERROR_FLAG, so that ac_c_werror_flag gets restored.
-
-Thu Nov 11 23:04:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (warn_deprecated): show caller position.
-
-Thu Nov 11 23:03:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (argf_close): untie tied io before closing.
-
- * io.c (argf_write): add ARGF.write and so on.
-
- * io.c (argf_read_nonblock): add ARGF.read_nonblock.
-
-Thu Nov 11 21:49:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/stats.rb (RDoc#print): get rid of NaN.
-
-Thu Nov 11 21:47:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (SHOWFLAGS): show compile flags.
-
- * common.mk: hide long command lines by default. verbose-mode is
- turned on by V=1 as before.
- http://jarp.does.notwork.org/diary/200605b.html#200605121
-
-Thu Nov 11 21:32:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_func): accept variable address.
-
- * ext/win32ole/extconf.rb: libuuid is needed on cygwin.
-
-Thu Nov 11 21:24:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): use cygwin_conv_path on cygwin 1.7 or
- later.
-
- * ruby.c (push_include_cygwin): ditto.
-
-Thu Nov 11 20:49:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (PRI_LL_PREFIX): format type specifier for
- LONG_LONG may vary on platforms.
-
-Thu Nov 11 20:45:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (SYMBOL_PREFIX): separate from EXPORT_PREFIX.
-
- * win32/mkexports.rb (Exports#each_export): use SYMBOL_PREFIX.
-
-Wed Nov 10 07:20:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cygwin/GNUmakefile.in (scriptbin): make executable file from
- scripts with stub.
-
- * ruby.c (load_file_internal): assume xflag for exe file as well
- as no-shebang file.
-
- * tool/rbinstall.rb: install script programs.
-
- * win32/mkexports.rb (Exports#initialize): alias ruby_sysinit for
- stub.
-
- * win32/stub.c: stub for scripts. [EXPERIMENTAL]
-
-Tue Nov 9 21:57:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (init_funcname): allocate and build initialization
- funciton name at once.
-
-Tue Nov 9 21:14:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (AC_FUNC_GETPGRP, AC_FUNC_SETPGRP): no need when
- not used.
-
- * configure.in (EXPORT_PREFIX): check generic prefix.
-
-Tue Nov 9 13:24:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regenc.c (onigenc_minimum_property_name_to_ctype):
- \p{...} should be case insensitive. [ruby-core:33000]
-
- * regenc.c (onigenc_property_list_add_property):
- ditto.
-
- * enc/euc_jp.c (init_property_list, property_name_to_ctype):
- to lowercase property names.
-
- * enc/shift_jis.c (init_property_list, property_name_to_ctype):
- ditto.
-
-Tue Nov 9 13:29:36 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (overlapped_socket_io): get rid of a warning of 64bit
- mingw.
-
-Tue Nov 9 10:44:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): this code uses FPU's rounding system.
- But x86's FPU calculates double precision floating-point
- numbers in 80bit precision, so it fails to round the value.
- So ensure the value is assigned a variable. [ruby-dev:42551]
- see also [ruby-math:00802]
- http://www.shudo.net/java-grandprix99/strictfp/
-
-Tue Nov 9 07:30:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_syserr_new): new function to make SystemCallError
- instance without errno. [EXPERIMENTAL]
-
- * error.c (rb_syserr_fail, rb_mod_syserr_fail): ditto.
-
-Tue Nov 9 05:54:57 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/*.rb: Remove unused variable warnings.
- Patch by Run Paint [ruby-core:30991]
-
- * lib/rubygems/*, lib/rdoc/*.rb, lib/rake/*.rb: ditto
-
-Mon Nov 8 18:26:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_hdtoa): fix type cast and bufsize.
-
-Mon Nov 8 15:40:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): fix precision specifier doesn't
- work well on %f. [ruby-dev:42552]
-
-Mon Nov 8 14:41:40 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (get_wsa_extension_function): typos.
-
-Mon Nov 8 13:41:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb,
- enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- Add Age property to regexp. [ruby-core:33019]
- patched by Ammar Ali, tested by Run Paint Run Run
-
-Mon Nov 8 12:16:39 2010 Ben Walton <bwalton@artsci.utoronto.ca>
-
- * configure.in: support -h for solaris linker when gcc not used
-
-Mon Nov 8 11:47:39 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (finish_overlapped_socket): refactoring.
-
-Mon Nov 8 11:02:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (get_proc_address): refactoring.
-
- * win32/win32.c (get_wsa_exetinsion_function): refactoring.
-
-Mon Nov 8 09:45:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/gbk-tbl.rb: Add euro sign. [ruby-core:33094]
- CP936, which is de facto definition of GBK, has it.
- http://msdn.microsoft.com/en-us/goglobal/cc305153.aspx
-
-Mon Nov 8 07:26:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check only the first symbol to get rid of
- duplication. [ruby-core:33084] #4031
-
-Sun Nov 7 10:13:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (NM): check on all platforms. #4031
-
-Sun Nov 7 06:16:33 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * test/openssl/test_ocsp.rb: adding test for r29699. Thanks Elise
- Huard! [ruby-core:32460]
-
-Sat Nov 6 07:33:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_export_prefix): check for prefixed
- underscore of exported symbols
-
- * tool/rbinstall.rb (bin-comm): prepend prolog shell script if
- necessary.
-
- * configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
-
-Sat Nov 6 07:24:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/ruby.pc.in (arch, sitearch): reordered.
-
- * configure.in: keep failed file.
-
-Sat Nov 6 07:03:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_fork_err): save errinfo before fdopen.
-
-Sat Nov 6 00:43:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspcid_initialize): an optional
- parameter may be used to specify the OpenSSL::OCSP::CertificateId on
- initialization. Thanks Elise Huard! [ruby-core:32460]
-
-Fri Nov 5 12:23:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_{process,system}.rb (test_fallback_to_sh):
- meaningless and wrong tests where /bin/sh does not exist.
-
- * process.c (proc_spawn_v): should spawn, not exec.
-
-Fri Nov 5 01:21:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_exec_v, proc_spawn_v): try to execute with sh if
- no shebang. [ruby-core:32745] [EXPERIMENTAL]
-
-Fri Nov 5 00:39:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_readlines, rb_io_each_line): limit must not be zero.
- a patch from Tomoyuki Chikanaga at [ruby-dev:42538]. #4024
-
-Fri Nov 5 00:14:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/fiddle/extconf.rb: fixing ffi library location on windows.
- Thanks Usa! [ruby-core:32930]
-
-Thu Nov 4 20:04:44 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
-
-Thu Nov 4 19:48:22 2010 Koichi Sasada <ko1@atdot.net>
-
- * ChangeLog: missed to write a last ChangeLog.
-
- * gc.c (gc_finalize_deferred): removed.
-
- * gc.c (rb_gc_finalize_deferred): Do not invoke a free_unused_heaps().
-
-Thu Nov 4 19:45:27 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (run_final): do not need argument obj.
-
-Thu Nov 4 19:26:10 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (before_gc_sweep): fix commit miss.
-
-Thu Nov 4 19:20:46 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (after_gc_sweep, before_gc_sweep):
- invoke rb_sweep_method_entry() as soon as possible.
-
-Thu Nov 4 19:13:58 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (after_gc_sweep, slot_sweep): finalizers should be invoked
- as soon as possible.
-
-Thu Nov 4 10:30:40 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * configure.in (--with-valgrind): Now this option is default on.
- You can still explicitly disable this feature by specifying
- --without-valgrind.
-
-Thu Nov 4 02:06:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c (fiber_t_alloc): raise an error when fiber is going to be
- initialized twice. [ruby-dev:42524]
-
-Thu Nov 4 02:04:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c (rb_fiber_resume): raise an "double resume" error when root
- fiber is going to be resumed. [ruby-dev:42523]
-
-Wed Nov 3 14:17:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/ostruct.rb (OpenStruct#delete_field): also undefine
- accessor methods. [ruby-core:33010]
-
-Wed Nov 3 14:13:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_enc_cr_str_buf_cat): concatenation of valid
- encoding string and invalid encoding string should result
- invalid encoding. [ruby-core:33027]
-
-Wed Nov 3 08:58:59 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c, vm.c, vm_core.h: remove USE_VALUE_CACHE option.
-
-Wed Nov 3 07:47:25 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
- regex options. a patch from Heesob Park in [ruby-core:32988].
-
-Wed Nov 3 07:33:57 2010 Tanaka Akira <akr@fsij.org>
-
- * vm_method.c (rb_clear_cache_by_class): just return if the class has
- no method. reported by Eric Wong. [ruby-core:32689]
-
-Tue Nov 2 22:50:25 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/visitor.rb (initialize): push accessor
- methods to subclass that actually uses them.
-
-Tue Nov 2 22:47:08 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/visitor.rb (accept): switch to
- a dispatch cache rather than case / when statement.
-
-Tue Nov 2 21:46:52 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * NEWS: fix a typo.
-
-Tue Nov 2 20:10:32 2010 Tajima Akio <artonx@yahoo.co.jp>
-
- * test/rake/test_tasks.rb: clear env var which is used by the test.
- [ruby-dev:42508]
-
-Tue Nov 2 00:25:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: win64 is just same with win32 about socket.
- notice: but wince is not same.
-
-Mon Nov 1 21:25:57 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * main.c: <stdlib.h> is needed, to introduce the getenv(3)
- prototype declaration. Without it a C compiler shall infer
- the getenv type as "int getenv(...);", but this is totally
- wrong, especially when your machine's sizeof(int) and
- sizeof(char*) differs. On such environment a return value
- of getenv(3), which is in fact a char*, might first casted
- into a int (loses data here), and then casted back to char*
- by automatic integral promotion to fit to the prototype of
- ruby_set_debug_option().
-
-Sun Oct 31 23:27:09 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (finalizer_table, objspace->final.table):
- Create finalizer_table at Init_heap().
- Remove all null checks of finalizer_table.
-
- * gc.c (mark_tbl): skip if no table entries.
-
- * gc.c (slot_swee): remove useless need_call_final check.
-
-Sun Oct 31 22:32:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_objspace_free): finalizers should be called separately
- from freeing objspace. [ruby-dev:42479]
-
-Sun Oct 31 22:24:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): free current VM and its objspace even
- when exiting by SystemExit.
-
-Sun Oct 31 22:10:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (new_child_iseq): adjust argument types.
-
- * iseq.c (prepare_iseq_build, rb_iseq_new),
- (rb_iseq_new_with_bopt_and_opt, rb_iseq_new_with_opt),
- (rb_iseq_new_with_bopt): ditto.
-
- * compile.c (iseq_set_exception_table): suppress warnings.
-
- * insns.def (putspecialobject, defined): ditto.
-
- * iseq.c (iseq_load): ditto.
-
-Sun Oct 31 09:30:51 2010 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h: some refactoring.
- - move decl. of rb_compile_option_struct to iseq.h.
- - define enum iseq_type.
- - define enum vm_special_object_type.
-
- * compile.c: some refactoring.
- - apply above changes.
- - (struct iseq_link_element): change value of type.
- - remove unused decl.
- - fix comment.
- - rename iseq_build_body and iseq_build_exception to
- iseq_build_from_ary_body and iseq_build_from_ary_exception.
-
- * iseq.h: define enum catch_type and enum defined_type.
-
- * insns.def: apply above changes.
-
- * iseq.c: define ISEQ_MAJOR_VERSION and ISEQ_MINOR_VERSION.
-
-Sat Oct 30 23:38:59 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/encoding.rb: untabify.
-
-Sat Oct 30 21:06:37 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/encoding.rb: use Ruby native encoding mechanism.
- [ruby-dev:42464]
- * lib/rexml/encodings/: remove.
-
- * lib/rexml/document.rb, lib/rexml/formatters/default.rb,
- lib/rexml/output.rb, lib/rexml/parseexception.rb,
- lib/rexml/parsers/baseparser.rb, lib/rexml/source.rb,
- lib/rexml/xmldecl.rb: use Ruby's native Encoding object.
-
- * test/rexml/, test/rss/: follow the above encoding changes.
-
- * NEWS: add REXML's incompatible change about encoding.
-
-Sat Oct 30 17:23:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_strtod): get rid of overflow/underflow as possible.
-
-Sat Oct 30 14:37:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ruby_pc): erase runtime-defined variables and
- check if generated pc file is valid.
-
- * template/ruby.pc.in (DEFFILE): need for mingw.
-
- * template/ruby.pc.in (LIBRUBY): fix the order.
-
-Sat Oct 30 11:33:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (ruby_pc): ignore missing variables.
-
- * template/ruby.pc.in: add missing variables for mswin.
-
-Sat Oct 30 10:24:35 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * object.c: Make BasicObject.new accept no parameter.
- Revert of r26135 [ruby-core:27080], as per [ruby-core:32952].
-
-Sat Oct 30 09:40:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c: use constants in id.h.
-
-Sat Oct 30 09:08:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/fiddle/closure.c (fiddle_closure): embed cif not reference
- so that the content surely get initialized. [ruby-dev:42480]
-
-Sat Oct 30 07:01:53 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv-replace.rb: suppress warning.
-
- * lib/open-uri.rb: ditto.
-
-Sat Oct 30 06:32:52 2010 Tanaka Akira <akr@fsij.org>
-
- * test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
- group of the created file is inherited from the parent
- directory on BSDs and MacOS X. Linux also inherit the group if
- the setgid bit of the directory is set. It causes the test fail.
- fixed by Shota Fukumori. [ruby-dev:42458]
-
-Sat Oct 30 05:58:54 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb: retry via TCP if UDP reply is truncated.
- fixed by Julian Mehnle. [ruby-core:32407]
-
-Sat Oct 30 00:35:13 2010 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (iseq_s_compile): fix optional argument.
- a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
-
-Sat Oct 30 00:24:42 2010 Koichi Sasada <ko1@atdot.net>
-
- * ext/objspace/objspace.c (memsize_of): take care of
- T_CLASS/const_tbl.
- a patch from nagachika <nagachika00@gmail.com> [ruby-dev:42490]
-
-Fri Oct 29 23:32:36 2010 Koichi Sasada <ko1@atdot.net>
-
- * test/profile_test_all.rb: added.
- You can use test-all profiler with the following command:
- RUBY_TEST_ALL_PROFILE=true make test-all
- This command generates ./test_all_profile and you can analyze
- which tests consume memories.
-
- * test/runner.rb: ditto.
-
-Fri Oct 29 10:02:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb,
- enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- Add 'Unknown' Script.
- patched by Run Paint Run Run. [ruby-core:32937] #3998
-
-Fri Oct 29 05:13:34 2010 Koichi Sasada <ko1@atdot.net>
-
- * ext/objspace/objspace.c (ObjectSpace.memsize_of_all): rename
- ObjectSpace.total_memsize_of_all_objects() to
- ObjectSpace.memsize_of_all([klass]).
- Accept Class object to filter the objects.
-
- * test/objspace/test_objspace.rb: fix test for above change.
-
-Fri Oct 29 03:04:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_dump): fix expected length. [ruby-core:32935]
-
-Thu Oct 28 23:31:39 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (before_gc_sweep, run_final): fix decrement timing of final_num.
-
-Thu Oct 28 20:11:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb,
- enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- Update Oniguruma for Unicode 6.
- patched by Run Paint Run Run. [ruby-core:32923] #3989
-
-Thu Oct 28 20:06:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/oniguruma.h (ONIGENC_CTYPE_SPECIAL_MASK):
- change mask from 128 to 256. [ruby-core:32931]
-
-Thu Oct 28 12:06:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httprequest.rb (read_request_line): extend max
- length to 2083. This is from Internet Explorer's max uri
- length. http://support.microsoft.com/kb/208427 [ruby-core:32924]
-
-Thu Oct 28 04:00:08 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (GC.stat): added. [ruby-dev:38607]
-
- * test/ruby/test_gc.rb: add a test for above.
-
-Thu Oct 28 03:13:06 2010 Koichi Sasada <ko1@atdot.net>
-
- * ext/objspace/objspace.c (memsize_of): fix rdoc.
-
- * ext/objspace/objspace.c (total_memsize_of_all_objects): added.
-
- * test/objspace/test_objspace.rb:
- - add a test for ObjectSpace.total_memsize_of_all_objects.
- - add two tests for ObjectSpace.memsize_of (for nil and Fixnum).
-
-Wed Oct 27 23:55:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (Init_iconv): warn deprecated use.
-
-Wed Oct 27 18:50:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bignum.c (rb_big2long, rb_big2ulong): rb2ulong() returns VALUE, but
- its real range is ulong. So, if the size of VALUE is bigger than
- ulong, upper bits are always zero even if the actual value is
- negative.
- fixed #3490
-
-Wed Oct 27 18:27:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
- before closing read end, to get rid of timing problem.
-
- * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 27 18:14:27 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_getppid): support Win64.
-
-Wed Oct 27 15:07:19 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (w32_error): should get error no only once, because
- the result of the second getting will indicate the error of the
- first FormatMessage() call.
-
-Wed Oct 27 13:51:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
- in read/write thread. fix r29541.
-
- * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 27 12:05:40 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * class.c (clone_const): need to return value. fix r29602.
-
-Wed Oct 27 11:58:58 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h (NUM2LONG_internal): add cast to get rid of a
- non GCC compiler warning. this is intentional type conversion.
-
-Wed Oct 27 09:25:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * cont.c: apply documentation patch by Run Paint Run Run.
- [ruby-core:32915]
-
-Wed Oct 27 02:12:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * object.c (Init_Object), constant.h, variable.c
- (rb_mod_private_constant, rb_mod_public_constant,
- set_const_visibility, rb_const_get_0): add Module#public_constant
- and private_constant. [ruby-dev:39685][ruby-core:32698]
-
- * test/ruby/test_module.rb: add tests for above.
-
-Wed Oct 27 02:02:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * class.c, constant.h, gc.c, method.h, object.c, variable.c,
- vm_insnhelper.c: use struct rb_constant_entry_t as entry of
- RCLASS_CONST_TBL. RCLASS_CONST_TBL has contained VALUE of constant
- directly. Now instead rb_const_entry_t is contained in
- RCLASS_CONST_TBL, rb_const_entry_t is managed by malloc, and
- have not only the value itself but also visibility flag.
- This is another preparation for private constant (see
- [ruby-dev:39685][ruby-core:32698]).
-
-Wed Oct 27 01:56:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * class.c, gc.c, object.c, variable.c, vm_insnhelper.c,
- include/ruby/ruby.h: separate RCLASS_CONST_TBL from RCLASS_IV_TBL.
- RCLASS_IV_TBL has contained not only instance variable table but
- also constant table. Now the two table are separated to
- RCLASS_CONST_TBL and RCLASS_IV_TBL. This is a preparation for
- private constant (see [ruby-dev:39685][ruby-core:32698]).
-
-Tue Oct 26 18:51:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/scanf.rb (extract_float): allow 2.e+2 style.
- [ruby-dev:42452] #3978
-
-Tue Oct 26 18:09:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (ASFLAGS): needs INCFLAGS.
-
- * configure.in (rb_cv_dynamic_alloca): check if extra source for
- dynamic size alloca.
-
- * missing/x86_64-chkstk.s (___chkstk): necessary for alloca of
- amd64-mingw32msvc-gcc on Ubuntu.
-
- * thread_win32.c (ruby_alloca_chkstk): check stack overflow
-
-Tue Oct 26 18:04:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/ruby.pc.in (Libs): needs DLDFLAGS.
-
-Tue Oct 26 12:47:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (pkgconfig-data): moved from Makefile.in.
-
- * tool/rbinstall.rb: install pc file only if non-empty.
- [ruby-core:32901] #3983
-
- * win32/Makefile.sub (ruby_pc): create pc file.
-
-Tue Oct 26 09:13:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_gcc_atomic_builtins): check for atomic
- builtins, all are not available in Apple derivative gcc.
-
-Tue Oct 26 00:29:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (pkgconfig-data): create pkg-config metadata file.
-
- * tool/rbinstall.rb: install pkg-config metadata file.
-
- * template/ruby.pc.in: template of pkg-config metadata file.
-
-Mon Oct 25 16:38:07 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * signal.c (rb_atomic_t): GCC (of at least recent versions)
- has ubiquitous support for atomic operations. On that
- compiler a C program can issue a memory barrier using these
- dedicated instructions. According to the GCC manual they
- cargo culted this feature form the Itanium ABI so chances
- are that other compilers could also support this feature.
- But so far GCC is the only compiler that I know to have it.
- Also note that this works on non-Itanium machines.
-
-Mon Oct 25 06:21:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): prec digits fractal part should be
- appended to 0 if prec is given. [ruby-dev:42453] #3979
-
-Mon Oct 25 02:57:21 2010 Koichi Sasada <ko1@atdot.net>
-
- * common.mk (run.gdb): Quit gdb on 'make gdb' when
- no signals are received.
-
-Mon Oct 25 00:25:23 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: some corrections of documentation.
-
-Sun Oct 24 17:14:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c, gc.c, hash.c, object.c, string.c, struct.c,
- transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
- replace calls to rb_error_frozen() with rb_check_frozen(). a
- patch from Run Paint Run Run at [ruby-core:32014]
-
- * include/ruby/intern.h (rb_check_frozen): optimize.
- [ruby-core:32878]
-
-Sun Oct 24 15:16:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::Mini#run): abort if interrupted.
-
- * lib/test/unit.rb (Test::Unit::Mini#run_test_suites): show the
- result even when interrupted on the way.
-
- * lib/test/unit.rb (Test::Unit::Mini#run_test_suites): ensure
- output sync mode to be restored.
-
-Sun Oct 24 14:11:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_define_method): defined method is run with the default
- public visibility regardless the visibility context of definition.
- [ruby-core:30638]
-
-Sun Oct 24 12:08:54 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/test/unit.rb: make test/unit play nicely with the rake test
- loader. [ruby-core:32864]
-
-Sun Oct 24 00:25:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_rubyoptions.rb (test_segv_test): follow up the
- change at r29556.
-
-Sat Oct 23 14:39:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb: $extmk should be true for test/runner.
-
-Sat Oct 23 10:55:37 2010 Koichi Sasada <ko1@atdot.net>
-
- * vm_dump.c (rb_vm_bugreport): fix to add bug outputs.
- - loaded script ($0)
- - loaded features ($")
- - process memory map on Linux (/proc/self/maps)
-
- * vm_dump.c (rb_vmdebug_stack_dump_raw): fix header message.
-
-Fri Oct 22 14:50:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- assertion message must not be nil.
-
-Fri Oct 22 13:59:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- treat nil case. Please run test-all before commit such change.
-
-Thu Oct 21 23:58:14 2010 Koichi Sasada <ko1@atdot.net>
-
- * gc.c (gc_lazy_sweep): Variable declarations should be at
- the head of block.
-
-Thu Oct 21 23:56:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (objspace_each_objects, rb_objspace_each_objects): use
- struct.
-
- * gc.c (objspace_each_objects): fix return with no value.
-
-Thu Oct 21 23:47:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_initialize): remove useless intermediate variable.
-
-Thu Oct 21 16:07:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_f_select): change rdoc.
- patched by Eito Katagiri [ruby-core:31805]
-
-Thu Oct 21 15:55:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httpauth/digestauth.rb
- (WEBrick::HTTPAuth::ProxyDigestAuth#check_uri): privated.
- [ruby-dev:42344]
-
-Thu Oct 21 15:50:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_f_select): add correct rdoc.
- patched by Dave Thomas [ruby-core:32467]
-
-Thu Oct 21 15:42:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/telnet.rb (Net::Telnet#close): added.
- patched by Erik Hollensbe [ruby-dev:42260] #3830
-
-Thu Oct 21 13:08:00 2010 Narihiro Nakamura <authornari@gmail.com>
-
- * gc.c (rb_objspace_each_objects): don't lazy sweep in
- rb_objspace_each_objects. [Bug #3940] [ruby-dev:42369]
-
-Thu Oct 21 00:05:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
- a patch from Tomoyuki Chikanaga at [ruby-dev:42435]. #3970
-
- * test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 20 23:54:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dbm/dbm.c: rdoc based on a patch by mathew meta AT
- pobox.com, at [ruby-core:32853].
-
-Wed Oct 20 10:47:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): reject 0x1.p+0. [ruby-dev:42432] #3966
-
-Wed Oct 20 10:00:57 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): print floating point on "%#a".
- [ruby-dev:42431] Bug#3965
-
-Tue Oct 19 19:30:11 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): clear ALT flag for %a.
- [ruby-core:32841] [ruby-core:32848]
-
-Tue Oct 19 12:19:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): fix over-count of field size.
-
-Tue Oct 19 03:08:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a.
- [ruby-core:32841]
-
-Mon Oct 18 13:18:01 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_class_init): Define
- Digest::Class.new(). [Feature #3954]
-
-Mon Oct 18 12:58:40 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (pack_pack): refine the document. [ruby-dev:42397]
- (pack_unpack): ditto.
-
-Mon Oct 18 10:19:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (transport_request): @socket may be nil.
- patched by Egbert Eich [ruby-core:32829]
-
-Mon Oct 18 09:57:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sprintf.c (BSD_vfprintf): wrong padding around prefix and
- floating point with %a. [ruby-dev:42403] Bug #3956
-
-Sun Oct 17 22:36:33 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/delta.rb: added an rdoc tag.
-
-Sun Oct 17 10:47:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_mod_remove_const): update rdoc.
- [ruby-core:31957]
-
-Sun Oct 17 10:40:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (rb_define_{class,module}_id_under): register to be
- marked, which probably are defined and used internally.
-
-Sat Oct 16 11:10:55 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
- according to GB2312. [Bug #3937] [ruby-core:32758]
-
-Sat Oct 16 10:54:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (CPP): already used in .c.i rule.
-
- * cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
- --preprocessor options explicitly. [ruby-core:32776]
-
-Sat Oct 16 10:06:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command
- line options.
-
- * ext/sdbm/_sdbm.c (makroom): suppress unused result warning.
-
- * ext/sdbm/extconf.rb: disable BADMESS, a library should not emit
- messages directly.
-
-Sat Oct 16 08:39:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (dln_strerror): get English message first, instead of
- system default. see [ruby-dev:42358].
-
-Sat Oct 16 00:08:00 2010 Koichi Sasada <ko1@atdot.net>
-
- * hash.c (rb_hash_aref): skip calling "default" method
- if it is not needed, for speed-up.
-
-Fri Oct 15 23:36:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
- unsigned int.
-
-Fri Oct 15 22:54:46 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_hresult2msg): get English message first,
- instead of system default. [ruby-core:32765]
-
-Fri Oct 15 22:47:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (VALUE): prefer long over uintptr_t,
- FIX2LONG expects VALUE to be long at least.
-
- * include/ruby/ruby.h (FIX2LONG): parenthesize the argument.
-
-Fri Oct 15 20:30:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (dev_t): use RUBY_REPLACE_TYPE.
-
- * file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
-
-Fri Oct 15 17:26:57 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * pack.c (pack_pack): simplify comparison of explicit_endian
- as pointed by nobu.
-
- * pack.c (pack_unpack): ditto.
-
-Fri Oct 15 16:40:37 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * pack.c (pack_pack): fix more than one modifiers appear in the
- format string. [ruby-core:32793]
-
- * pack.c (pack_unpack): ditto.
-
-Thu Oct 14 23:20:42 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_folderitem2_invokeverb.rb: refactoring.
-
-Thu Oct 14 22:18:29 2010 Koichi Sasada <ko1@atdot.net>
-
- * insns.def, iseq.c, vm_insnhelper.c: rename variable name
- (ip -> iseq).
-
-Thu Oct 14 20:41:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * pack.c (pack_pack): support endian modifiers: < and >.
- [ruby-dev:42376] Feature #3491
-
- * pack.c (pack_unpack): ditto.
-
-Thu Oct 14 20:50:51 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (reg_get_val): expand environment in
- the pathname. [Bug #3907]
-
-Thu Oct 14 07:35:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (DEVT2NUM): added. Size of dev_t is depend on the
- environment even if POSIX defines dev_t as unsigned integer.
- For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
- dev_t as 64bit unsigned integer.
-
- * file.c (rb_stat_dev): use DEVT2NUM.
-
- * file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
- value is int.
-
- * file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
- value is int.
-
- * configure.in: check size of dev_t.
-
-Thu Oct 14 07:22:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_and, rb_ary_or), class.c (rb_mod_init_copy),
- gc.c (undefine_final), time.c (time_mload): get rid of
- type-punning casts.
-
-Thu Oct 14 04:16:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (ruby_float_step): fix Numeric#step with infinity unit
- doesn't works well. [ruby-core:32779]
-
-Wed Oct 13 23:16:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/enc-unicode.rb: get rid of lots of warnings.
-
- * iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.
-
- * vm.c (thread_free): ditto.
-
- * numeric.c (check_uint): get rid of overflow on LLP64 platforms.
-
- * insns.def (opt_case_dispatch): use st_data_t.
-
-Wed Oct 13 22:32:34 2010 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
- string. Thanks nobu and tDiary dev members. [Bug #3909]
-
-Wed Oct 13 21:13:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (int_chr): raise error when the value is negative.
-
-Wed Oct 13 19:24:08 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * vm.c (ruby_vm_destruct): This function type was wrong; correct to the prototype.
-
-Wed Oct 13 14:58:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (rb_num_to_uint): fix 32bit logic.
-
-Wed Oct 13 12:53:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (rb_num_to_uint): added to check the range of arguments.
- Mainly for negative value with NUM2UINT on 32bit environment.
-
- * string.c (rb_str_concat): use rb_num_to_uint.
-
-Wed Oct 13 12:10:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (w32_error): get English message first, instead
- of system default. see [ruby-core:32765].
- [experimental]
-
-Wed Oct 13 11:04:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.c (ruby_set_debug_option): define always for binary
- compatibility with debug env enabled binary.
-
- * signal.c (ruby_enable_coredump): ditto.
-
-Wed Oct 13 10:52:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (ruby_executable_node): missing prototype.
-
-Wed Oct 13 05:23:04 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * missing/strchr.c: add strlen's prototype.
-
- * missing/strstr.c: ditto.
-
-Wed Oct 13 00:21:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/rubyext.c (struct mktime_arg): constified.
-
- * ext/syck/rubyext.c (mktime_do, mktime_r, rb_syck_mktime): fix
- function signatures.
-
-Wed Oct 13 00:18:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (MurmurMagic): get rid of literal overflow.
-
- * configure.in (RUBY_CHECK_PRINTF_PREFIX): check for printf format
- specifier if possible.
-
-Tue Oct 12 23:58:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
- use uintptr_t instead of long for win64.
-
- * win32/win32.c (socketpair_internal): suppress warnings.
-
- * win32/win32.c (ftruncate): use HANDLE instead of long for win64.
-
- * vsnprintf.c (BSD_vfprintf): fix cast.
-
- * numeric.c (rb_num2fix): result of rb_num2long is SIGNED_VALUE.
-
- * compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
- (syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
- (run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
- (rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
- iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
- thread.c (rb_thread_local_aref),
- variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
- (rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
- vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
- ext/iconv/iconv.c (map_charset): use st_data_t.
-
- * compile.c (iseq_build_body), insns.def (getglobal, setglobal),
- iseq.c (iseq_load, iseq_data_to_ary), util.c (valid_filename):
- use VALUE.
-
- * gc.c (obj_free, rb_objspace_call_finalizer): fix truncating
- cast.
-
- * gc.c (mark_current_machine_context): suppress warnings.
-
- * compile.c (iseq_compile_each): fix truncating cast.
-
- * cont.c (fiber_setcontext): missing variable definition.
-
-Tue Oct 12 19:25:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * error.c (exc_to_s): use OBJ_INFECT.
-
- * error.c (name_err_to_s): ditto.
-
- * error.c (name_err_mesg_to_str): ditto.
-
- * error.c (syserr_initialize): ditto.
-
-Tue Oct 12 19:07:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * error.c (syserr_initialize): taint message if mesg is given
- and it is tainted.
-
-Tue Oct 12 18:25:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
- may be a Bignum. On 64bit for errors. [ruby-dev:42366]
-
-Tue Oct 12 18:25:04 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_concat): use unsigned int for GB18030.
-
-Tue Oct 12 17:53:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric (check_uint): the mask must refer to VALUE.
-
-Tue Oct 12 17:47:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric (check_uint): set MSB for negative value.
-
- * numeric (rb_num2uint): return value's type of rb_num2ulong
- is VALUE.
-
- * numeric (int_chr): variable i can't be negative.
-
-Tue Oct 12 16:04:37 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_strerror): get English message first, instead
- of system default. see [ruby-dev:42358].
- [experimental]
-
-Tue Oct 12 15:52:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_strerror): unmap some range of errno for
- workaround of VC10's strerror() and sys_nerr problem.
- based on a patch from Akio Tajima, [ruby-dev:42355].
-
-Tue Oct 12 15:36:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_ungetc): use unsigned int for GB18030.
-
-Tue Oct 12 15:14:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_putc): support multibyte characters.
- [ruby-core:30697]
-
-Tue Oct 12 15:10:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (rb_enc_uint_chr): split from int_chr.
-
- * numeric.c (int_chr): use rb_enc_uint_chr.
-
- * include/ruby/encoding.h (rb_enc_uint_chr): added.
-
-Tue Oct 12 14:04:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
- unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
- is defined as unsigned int.
-
-Tue Oct 12 12:20:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): foolish mistake.
-
-Tue Oct 12 10:39:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_MINGW32): canonicalize only on mingw.
-
-Mon Oct 11 20:20:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
- encoding of Zlib::GzipReader.
- http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
-
-Mon Oct 11 17:42:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * error.c (syserr_initialize): use mesg's encoding when locale
- encoding is US-ASCII. If locale encoding is not US-ASCII,
- assume err has non ASCII characters. [ruby-dev:42358]
-
-Mon Oct 11 14:03:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * error.c (syserr_initialize): set the encoding of Errno::*#message
- as locale. [ruby-dev:42358]
-
-Mon Oct 11 06:38:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_set_encoding):
- StringIO#set_encoding can get 2nd argument and optional hash
- for API compatibility to IO. [ruby-dev:42356]
-
-Mon Oct 11 06:11:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
- a T_FILE. [ruby-dev:42356]
-
-Sun Oct 10 18:42:23 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#replace): Apply a bit of optimization.
-
-Sun Oct 10 10:20:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_MINGW32): canonicalize as like mswin version.
-
-Sun Oct 10 05:33:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_signal_buff_size, rb_signal_exec): moved
- declarations from thread.c.
-
-Sat Oct 9 16:54:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RSHIFT): quote to get rid of argument expansion
- for autoconf 2.68.
-
-Sat Oct 9 11:00:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_reset_event_flags, exec_event_hooks): ignore
- hooks marked as removed.
-
- * thread.c (thread_exec_event_hooks): remove hooks to be removed.
-
- * thread.c (rb_threadptr_remove_event_hook, rb_remove_event_hook):
- defer removing hooks if running the hooks. [ruby-dev:42350]
-
-Sat Oct 9 10:51:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_threadptr_exec_event_hooks): suppress each event
- hooks separately.
-
- * thread.c (thread_suppress_tracing): split from
- ruby_suppress_tracing, accepting thread pointer and event mask.
-
-Sat Oct 9 08:16:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_threadptr_remove_event_hook): fix typo.
-
-Fri Oct 8 10:52:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (RBCONFIG): depends on version.h due to
- RUBY_PATCHLEVEL. [ruby-core:32709]
-
-Fri Oct 8 00:24:54 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Fixing documentation typos. [ruby-core:32712]
-
-Thu Oct 7 09:14:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_exec.c (vm_exec_core): Treat clang as non gcc on this
- context: It has __asm__ but doesn't works well.
-
-Wed Oct 6 12:28:22 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/uri/generic.rb (URI::Generic#hostname): new method.
- (URI::Generic#hostname=): ditto.
-
- * lib/open-uri.rb: use URI#hostname
-
- * lib/net/http.rb: ditto.
-
- reported by Adam Majer. [ruby-core:32056]
-
-Wed Oct 6 11:52:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (fptr_finalize): write_mutex might have been destroyed
- already in finalization phase, as the order of finalizers is not
- guaranteed. rb_mutex_t should be used in place of Mutex object
- in the future.
-
-Tue Oct 5 22:17:02 2010 wanabe <s.wanabe@gmail.com>
-
- * win32/mkexports.rb: revert r29320 and r29402.
-
-Mon Oct 4 12:43:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (regexp): dregexp has literal string only at the head
- and successors are array. [ruby-core:32682]
-
-Mon Oct 4 10:22:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c (rand_init): This checks the value is in 32bit or not,
- so use int32_t, not int.
-
-Mon Oct 4 09:47:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c (rand_init): remove useless assignment.
-
- * re.c (update_char_offset): remove unused variable.
-
- * re.c (read_escaped_byte): ditto.
-
-Mon Oct 4 09:30:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
- accepts only Strings, so call Integer#to_s(16).
- 16 is for an optimization. [ruby-dev:42336]
-
-Mon Oct 4 07:57:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * cont.c (fiber_memsize): Return size.
- Before this change, fiber_memsize always returns 0.
-
-Mon Oct 4 07:16:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/unicode.c (onigenc_unicode_property_name_to_ctype):
- remove useless assignment.
-
- * vm.c (vm_make_proc_from_block): ditto.
-
- * variable.c (rb_ivar_count): ditto.
-
-Mon Oct 4 06:40:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * Makefile.in (clean-rdoc): Don't use \ in variable expansion.
- BSD make treats it as an escape character.
-
-Mon Oct 4 00:01:53 2010 wanabe <s.wanabe@gmail.com>
-
- * tool/config.sub: revert r29320, r29324, r29347, r29354, r29365
- to automake-1.11.1. [ruby-core:32634]
-
- * win32/mkexports.rb: no longer use 'mingw64'. a patch from Luis Lavena
- at [ruby-core:32678].
-
-Sun Oct 3 20:36:37 2010 Akio Tajima (arton) <artonx@yahoo.co.jp>
-
- * test/win32ole/test_folderitem2_invokeverb.rb: Change creating
- shortcut verb to 'Link' [Bug #3339]
-
-Sun Oct 3 19:44:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (Makefile): get rid of duplicated ruby target when
- already there it was.
-
-Sat Oct 2 22:59:32 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_thread.rb: add for win32ole with Thread.
-
-Fri Oct 1 17:03:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/webrick/test_httpproxy.rb (TestWEBrickHTTPProxy::test_upstream_proxy):
- My machine fails this test at this line, saying 503 service unavailable.
-
-Thu Sep 30 16:11:08 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_getenv): should return NULL if specified name
- is empty. a patch from Heesob Park at [ruby-core:32650]
-
-Thu Sep 30 15:18:23 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (command_asgn): allow command_call to be right hand side
- expression of chained assignment. [ruby-dev:42313]
-
-Thu Sep 30 10:55:38 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * hash.c (ruby_setenv): workaround for old Windows. a patch from
- Heesob Park. [ruby-core:32353]
-
-Thu Sep 30 09:29:06 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.encode_www_form): change treatment of
- undefined value in given array as latest internet draft for
- application/www-form-urlencoded.
- http://tools.ietf.org/html/draft-hoehrmann-urlencoded-01
-
-Thu Sep 30 09:34:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): fixed wrong type of return value of
- SymGetModuleBase64(). [ruby-dev:42306]
-
-Wed Sep 29 21:04:05 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions::test_script_from_stdin):
- As usual, PTY is not always available.
-
-Wed Sep 29 18:38:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/config.sub (x64): regularize only for pc vendor, and strip
- useless 64 suffix.
-
-Wed Sep 29 17:53:02 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BIGDECIMAL_ENABLE_VPRINT):
- VPrint is usually disabled. It's only used in debugging.
-
-Wed Sep 29 17:41:34 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_save_limit):
- return the result of a block.
-
- * test/bigdecimal/test_bigdecimal.rb (test_save_limit):
- add a test for the above change.
-
-Wed Sep 29 16:18:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (dump_thread): remove unused optional arguments.
-
-Wed Sep 29 13:26:30 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_save_rounding_mode):
- return the result of a block.
-
- * test/bigdecimal/test_bigdecimal.rb (test_save_rounding_mode):
- add a test for the above change.
-
- * test/bigdecimal/test_bigdecimal.rb (test_save_exception_mode):
- add a test for the return value of BigDecimal.save_exception_mode.
-
-Wed Sep 29 12:45:30 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_div2, BigDecimal_add2,
- BigDecimal_sub2, BigDecimal_mult2, VpLimitRound): remove meaningless
- casts to get rid of compiler warnings.
-
-Wed Sep 29 12:35:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VPrint, VpToString): fix format.
-
-Wed Sep 29 12:31:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/known_classes.rb (RDoc::KNOWN_CLASSES): add Encoding.
-
-Tue Sep 28 20:50:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/config.sub (x64): regularize same as mswin.
-
-Tue Sep 28 20:06:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * vm_dump.c (rb_vm_bugreport): add windows support.
- based on patches from Peter Weldon at [ruby-core:32551]
-
-Mon Sep 27 23:30:34 2010 Koichi Sasada <ko1@atdot.net>
-
- * insns.def (opt_case_dispatch), vm_insnhelper.c:
- execute the procedures of "when" clauses by bytecode
- instead of st_foreach() when the object does not hit
- prepared hash. [ruby-dev:42304]
-
-Mon Sep 27 15:54:03 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/net/http/test_https.rb: As always, localhost is not
- guaranteed to be resolved as 127.0.0.1. But a SSL
- certificate needs a socket to listen on a specific address
- where a CN resolves to. On situations where localhost is
- not 127.0.0.1, these tests are not possible.
-
-Mon Sep 27 15:25:05 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/net/imap/test_imap.rb: resurrection of r29259.
- this change depends on minitest 1.7.1.
-
- * lib/test/unit/assertions.rb: ditto.
-
-Sun Sep 26 22:59:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/config.sub (x86_64-pc-mingw64): regularize.
-
-Sun Sep 26 22:21:07 2010 wanabe <s.wanabe@gmail.com>
-
- * ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
- ext/openssl/ossl_pkey_ec.c (ossl_ec_group_set_seed),
- ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der),
- ext/openssl/ossl_pkcs7.c (numberof): suppress warnings.
- [ruby-core:31932]
-
-Sun Sep 26 10:25:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/config.{guess,sub}: updated to automake-1.11.1.
-
-Sat Sep 25 22:48:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBY_DLDFLAGS): fix quoting.
-
-Sat Sep 25 10:30:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBY_DLDFLAGS): use -unexported_symbol only
- when available. http://trac.macports.org/ticket/26341
-
-Sat Sep 25 10:05:49 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * configure.in: Always add -mieee for Renesas SH4.
- Thanks, Nobuhiro Iwamatsu. [Feature #3874] [ruby-core:32548]
-
-Sat Sep 25 01:34:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (install-cross): target to install cross-compiling
- stuff.
-
-Fri Sep 24 23:44:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (sym_call), vm.c (invoke_block_from_c),
- vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
- [ruby-core:32075]
-
- * vm_eval.c (rb_funcall_passing_block): new function to call
- method with passing given block.
-
-Fri Sep 24 15:50:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_to_i): fix rdoc: String#to_i raises an
- exception when base is invalid. [ruby-core:31685]
-
-Fri Sep 24 15:28:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_rindex): use rb_enc_prev_char instead of repeated
- str_nth.
- patched by Michael Selig [ruby-core:32498]
-
-Fri Sep 24 14:19:12 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/test_pty.rb: Same as 229281; existence of PTY class do not
- guarantee a successful pty operation.
-
-Fri Sep 24 06:25:55 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.7.2 r5879.
- * test/minitest/*.rb: ditto.
-
-Thu Sep 23 23:09:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_get_cref0): cref is stacked only in normal
- iseqs, so check if it is the case first.
-
-Thu Sep 23 23:08:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/config.sub: mingw64 should use x86_64. [ruby-core:32514]
-
-Thu Sep 23 21:40:40 2010 wanabe <s.wanabe@gmail.com>
-
- * ext/socket/raddrinfo.c (init_addrinfo, inspect_sockaddr): suppress
- warnings. see [ruby-core:31932].
-
-Thu Sep 23 19:27:57 2010 wanabe <s.wanabe@gmail.com>
-
- * thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
- see [ruby-core:31932].
-
-Thu Sep 23 18:54:39 2010 wanabe <s.wanabe@gmail.com>
-
- * tool/config.sub: add mingw64.
-
- * win32/mkexports.rb (Exports::Mingw64): added.
-
- * win32/mkexports.rb (Exports::Mingw32): renamed from Exports::Mingw.
-
-Thu Sep 23 09:01:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
- from method. Bug #3786, Bug #3860, [ruby-core:32501]
-
-Wed Sep 22 17:12:01 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/openssl/utils.rb (OpenSSL#silent): always restore $VERBOSE.
- [ruby-dev:42285]
-
-Wed Sep 22 16:59:40 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/test_prime.rb (TestPrime#test_new): the warning expected have
- not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
- a.k.a. sora_h. [ruby-dev:42272]
- Recovers $stderr even if StringIO.new fails. Reported by unak.
-
-Wed Sep 22 01:55:48 2010 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_method.rb: fix last commit.
-
-Wed Sep 22 01:49:52 2010 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_method.rb: add a test for [ruby-core:30534].
-
-Wed Sep 22 00:52:44 2010 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/rdoc/ri/store.rb (save_cache): remove duplicate entries.
-
-Wed Sep 22 00:00:05 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_f_pathname): Pathname() translated
- from pathname.rb.
-
-Tue Sep 21 22:18:30 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * tool/mkconfig.rb: fixed build problem on mswin64 introduced in r29278.
-
-Tue Sep 21 02:42:35 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/pathname/test_pathname.rb (TestPathname#test_mkdir): fix typo.
-
-Mon Sep 20 23:23:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (bracket): get rid of scanning at the end of the pattern
- string, not to raise an exception while globbing command line.
- [ruby-core:32478]
-
-Mon Sep 20 11:25:49 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (Init_pathname): Pathname#=~ undefinition
- translated from pathname.rb.
-
-Mon Sep 20 02:34:11 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (check_rounding_mode, BigDecimal_mode):
- raise ArgumentError instead of TypeError passing invalid modes.
-
- * test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
- change against the above modifications.
-
-Sun Sep 19 22:08:39 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/mkmf.rb (try_link): rdoc
- (try_compile): ditto
- (try_cpp): ditto
- (try_func): ditto
- (try_var): ditto
- (try_run): ditto
- (egrep_cpp): ditto
-
-Sun Sep 19 20:43:33 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * configure.in (--disable-install-doc): disables capi too, in addition
- to rdoc.
- (--disable-install-rdoc): a new option for disabling only rdoc.
- (--disable-install-capi): a new option for disabling only capi.
-
-Sun Sep 19 20:37:45 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (clean): removes all documents on cleaning.o
- (CAPIOUT): new variable.
- (clean-capi, distclean-capi, realclean-capi): new targets
-
- * Makefile.in (clean-capi, distclean-capi, realclean-capi): ditto.
-
- * win32/Makefile.sub (clean-capi, distclean-capi, realclean-capi):
- ditto.
-
-Sun Sep 19 13:44:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBY_SO): fix an oversight of replace
- RUBY_INSTALL_NAME with RUBY_SO_NAME. a patch from Jeremy Evans
- at [ruby-core:32474].
-
-Sun Sep 19 07:48:20 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_unlink): Pathname#unlink and
- Pathname#delete translated from pathname.rb.
-
-Sun Sep 19 06:06:07 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (check_rounding_mode): added for
- converting symbol to rounding mode number.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round):
- support to specify rounding mode by symbol.
-
- * test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
- add tests for above changes.
-
-Sun Sep 19 05:14:35 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c: fix rounding algorithms for half-down
- and half-even. This change is based on the patch created by Matthew
- Willson, the reporter of this bug. [Bug #3803] [ruby-core:32136]
-
- * test/bigdecimal/test_bigdecimal.rb: add tests for above changes.
-
-Sat Sep 18 20:09:51 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_each_entry): Pathname#each_entry
- translated from pathname.rb.
-
-Fri Sep 17 23:44:07 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
- add missing method availability check. [ruby-core:32447]
- Reported by Wiebe Cazemier. Thanks!!!
-
-Fri Sep 17 23:23:26 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
-
-Fri Sep 17 23:10:44 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_core.rb: enable.
-
-Fri Sep 17 22:46:02 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/: untabify.
-
-Fri Sep 17 22:29:56 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/: fix fixture data path. All REXML tests are worked.
-
-Fri Sep 17 22:15:15 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/test_listener.rb: remove needless codes.
-
-Fri Sep 17 22:12:23 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rexml/: import REXML tests from
- http://www.germane-software.com/repos/rexml/trunk/test/.
- Many tests are failed temporary. I'll fix them quickly. Sorry.
-
-Fri Sep 17 16:48:49 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/io/console/test_io_console.rb (TestIO_Console::helper):
- PTY.open is not guaranteed to work. On my machine opening a
- pty is prohibited via process control group. On those cases
- exceptions shall occur, and that doesn't mean our fault.
- Skip those tests on such situations.
-
-Fri Sep 17 08:30:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tracer.rb: count only non-internal libraries in stack trace,
- ignoring custom_require. [ruby-core:31858]
-
-Fri Sep 17 02:18:41 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * tool/mkconfig.rb: Fix build with m4 1.4.15 generating duplicate
- lines in config.status. According to nobu, the mswin32 port may
- depend on the piece of code in question, so the behavior is left
- unchanged on mswin32.
-
-Thu Sep 16 23:47:59 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_opendir): Pathname#opendir translated
- from pathname.rb.
-
-Thu Sep 16 21:40:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit::GlobOption): merged RejectOption.
-
- * test/runner.rb: utilize GlobOption.
-
-Thu Sep 16 21:31:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/driver.rb (RDoc::RI::Driver.setup_options)
- (RDoc::RI::Driver.fixup_options): split from process_args.
- libraries should not parse ARGV inside, since it's a task of
- applications, not libraries.
-
-Thu Sep 16 21:02:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/paths.rb (RDoc::RI::Paths.each): HOMEDIR can be nil
- if $HOME is unset.
-
-Thu Sep 16 14:50:42 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path):
- ENV["HOME"] might not be set. On those cases without it an
- exception raises here, which effectively disables later
- tests on this method.
-
-Thu Sep 16 08:30:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): fix rdoc. pointed out by Tomoyuki
- Chikanaga at [ruby-core:32395], and a patch from Daniel
- Bovensiepen at [ruby-core:32403].
-
-Thu Sep 16 08:27:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
- [ruby-core:32394]
-
-Thu Sep 16 06:07:24 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
- from pathname.rb.
-
-Thu Sep 16 00:36:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/extconf.rb: Remove Readline 6 check because
- Ruby's license is now GPLv3 compatible. [ruby-core:28736]
-
-Thu Sep 16 00:26:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * COPYING: change Ruby's License from a dual license with GPLv2
- to a dual license with 2-clause BSDL.
- [ruby-dev:42166] [ruby-core:31971]
- [ruby-dev:39167] [ruby-core:25272]
-
- * COPYING.ja: ditto.
-
- * BSDL: added. this is from The FreeBSD License.
-
-Wed Sep 15 21:07:06 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated
- from pathname.rb.
-
-Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * test/net/imap/test_imap.rb: "localhost" not guaranteed to
- resolve to "127.0.0.1". On my machine it is "::1" instead.
- The problem is, you have to connect to the imaps server via
- the canonical name written in a server certificate, and that
- of the server.cert is "localhost". So you have to listen to
- the address of what "localhost" resolves to. I think this
- situation cannot be resolved in a handy manner because the
- test "test_imaps_post_connection_check" is actually
- expecting to connect to a server via an address other than
- the CN. On my machine several assertions won't pass because
- the test cannot connect to the server.
-
-Wed Sep 15 09:12:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_puts): fix for wide char encoding strings.
- [ruby-dev:42212]
-
-Wed Sep 15 07:27:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_format_m): mentioned about Hash argument. a patch
- from Daniel Bovensiepen at [ruby-core:32386].
-
- * sprintf.c (get_hash): ditto, and fix typo.
-
-Wed Sep 15 07:22:20 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_entries): Pathname#entries translated
- from pathname.rb.
-
-Wed Sep 15 02:13:44 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
- Thanks Jeremy Evans! [ruby-core:32384]
-
-Tue Sep 14 20:17:48 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_s_getwd): Pathname.getwd and
- Pathname.pwd translated from pathname.rb.
-
-Tue Sep 14 05:13:04 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_s_glob): Pathname.glob translated
- from pathname.rb.
-
-Tue Sep 14 01:24:51 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * ext/socket/raddrinfo.c (ruby_getaddrinfo__aix): suppress a
- warning.
-
-Mon Sep 13 20:48:30 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_zero_p): Pathname#zero? translated
- from pathname.rb.
-
-Mon Sep 13 19:56:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
- bug in system header of darwin 9. [ruby-core:32341]
-
-Mon Sep 13 18:11:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_do): fix typo. a patch from Peter Weldon
- at [ruby-core:32327].
-
-Mon Sep 13 10:12:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): reject Float('0x0.').
- [ruby-dev:42239] Bug #3820
-
-Mon Sep 13 09:23:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
- with rb_scan_args. Before this fix, OpenSSL::BN#prime?
- is fully broken. [ruby-dev:42225]
-
-Mon Sep 13 06:45:24 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_writable_real_p):
- Pathname#writable_real? translated from pathname.rb.
-
-Sun Sep 12 21:21:50 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: [ruby-core:32096] Thanks Colin Bartlett.
-
-Sun Sep 12 19:30:27 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_world_writable_p):
- Pathname#world_writable? translated from pathname.rb.
-
-Sun Sep 12 09:16:06 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_writable_p): Pathname#writable?
- translated from pathname.rb.
-
-Sun Sep 12 08:36:15 2010 Tanaka Akira <akr@fsij.org>
-
- * process.c (rlimit_resource_name2int): support more limits:
- RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_RTTIME and
- RLIMIT_SIGPENDING.
- (Init_process): ditto.
- patch by Run Paint Run Run. [ruby-core:32262]
-
-Sun Sep 12 04:27:13 2010 Tanaka Akira <akr@fsij.org>
-
- * process.c (rlimit_resource_name2int): use STRCASECMP to avoid
- ALLOCA_N.
-
-Sat Sep 11 16:47:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (ruby_setenv): raise if putenv and SetEnvironmentVariable
- failed, because of the restriction of the size on Windows.
- based on a patch from Peter Weldon at [ruby-core:32304]. fix:
- Bug#3812, [ruby-core:32250]
-
-Sat Sep 11 15:19:57 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/webrick/httpauth/digestauth.rb (WEBrick::Config::DigestAuth):
- Add documentation
-
- * lib/webrick/config.rb (WEBrick::Config::DigestAuth): Add
- documentation
-
-Sat Sep 11 12:32:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
- zombie prototype declarations. a patch from Eric Hodel
- at [ruby-core:32305].
-
-Sat Sep 11 06:53:12 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_symlink_p): Pathname#symlink?
- translated from pathname.rb.
-
-Fri Sep 10 23:03:43 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_sticky_p): Pathname#sticky? translated
- from pathname.rb.
-
-Fri Sep 10 19:11:13 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#continue): add
- method for generating HTTP/1.1 100 continue response if the client
- expects it, otherwise does nothing. Patch by Brian Candler.
- ref #855.
-
- * test/webrick/test_httprequest.rb: test added.
-
-Fri Sep 10 17:49:34 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/openssl/lib/openssl/x509-internal.rb: removed unused local
- variable.
-
- * test/openssl/*: less warnings while test running with -w.
-
-Fri Sep 10 16:49:20 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * class.c (rb_scan_args): Add support for optional keyword
- argument hash. [ruby-dev:42221] [ruby-dev:38048]
-
- * README.EXT, README.EXT.ja: Update documentation accordingly.
-
- * dir.c (dir_initialize): Make use of the new rb_scan_args()
- feature.
-
- * io.c (rb_io_s_popen, rb_scan_open_args, rb_io_initialize)
- (rb_io_s_pipe, open_key_args, io_s_foreach, io_s_readlines)
- (rb_io_s_read, rb_io_set_encoding): Ditto.
-
- * transcode.c (str_transcode, econv_args)
- (econv_primitive_convert): Ditto.
-
- * ext/zlib/zlib.c (rb_gzreader_initialize): Ditto.
-
-Fri Sep 10 10:33:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c (rb_genrand_ulong_limited): renamed from
- rb_rand_internal and now this is public API.
-
- * include/ruby/ruby.h (rb_genrand_ulong_limited): added.
-
- * bignum.c (big_sparse_p): use rb_genrand_ulong_limited.
-
-Fri Sep 10 13:07:22 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/digest/lib/digest.rb: removed unused exception variable
- assignment to avoid a warning.
-
-Fri Sep 10 07:29:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_systmpdir): assume system default tmpdir
- safe. [ruby-dev:42089]
-
-Fri Sep 10 07:03:23 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_size_p): Pathname#size? translated from
- pathname.rb.
-
-Fri Sep 10 02:15:29 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (inspect_peercred): support OpenBSD-current.
- patch by Jeremy Evans. [ruby-core:32240]
-
-Thu Sep 9 23:25:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace_each): skip allocator frames which have no
- name. [ruby-core:32231]
-
-Thu Sep 9 22:39:08 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_size): Pathname#size translated from
- pathname.rb.
-
-Thu Sep 9 22:34:48 2010 wanabe <s.wanabe@gmail.com>
-
- * compile.c (case_when_optimizable_literal): When float value can be
- treated as integer, add to table hash of case that way.
- based on a patch from Ikuo KOBORI. [ruby-dev:42038]
-
- * insns.def (opt_case_dispatch): ditto.
-
- * test/ruby/test_case.rb: add tests.
-
-Thu Sep 9 17:15:15 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/net/http/test_https.rb (test_identity_verify_failure): follows
- the SSL hostname check error message of openssl.
-
-Thu Sep 9 10:44:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
- that it ignores characters after = in ENV.
- patched by Jeremy Evans [ruby-core:32184]
-
-Thu Sep 9 09:02:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/rbinstall.rb (install?): gemspec filename should include
- its version. patched by Luis Lavena [ruby-core:32165]
-
-Wed Sep 8 22:46:31 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
- blocked on Windows while blocking call for SSLSocket. Need to
- convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
- Patch by arton. ref #3794.
-
-Wed Sep 8 20:56:57 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_setgid_p): Pathname#setgid? translated
- from pathname.rb.
-
-Wed Sep 8 06:25:41 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_setuid_p): Pathname#setuid? translated
- from pathname.rb.
-
-Tue Sep 7 21:03:35 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_readable_real_p):
- Pathname#readable_real? translated from pathname.rb.
-
-Mon Sep 6 23:07:25 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_world_readable_p):
- Pathname#world_readable? translated from pathname.rb.
-
-Mon Sep 6 11:03:13 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * Fixed wrong check of missing functions. Patch by Adrian Quark.
- ref #3400
- The patch contains following comment:
- This patch should avoid unnecessary incompatibility with future
- versions of Openssl. Changes suggested by bmaher_at_amazon.com.
-
-Mon Sep 6 10:46:55 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * Fixed exception message for SSL post connection check failure. Patch
- by Paul Betteridge. ref [Bug #3704]
-
-Mon Sep 6 10:31:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/readline.c (readline_s_get_line_buffer):
- Readline.line_buffer should return locale string.
- [ruby-dev:42184] #3791
-
-Mon Sep 6 09:47:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): check there is at least 1 digit after
- "0x" before ".". [ruby-dev:42183] #3790
-
-Mon Sep 6 09:44:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): check integer overflow.
- [ruby-dev:42180] #3789
-
-Mon Sep 6 06:17:21 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_readable_p): Pathname#readable?
- translated from pathname.rb.
-
-Sun Sep 5 23:02:34 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_owned_p): Pathname#owned?
- translated from pathname.rb.
-
-Sat Sep 4 23:48:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_readlink): symlink target should be in
- filesystem encoding.
-
-Sat Sep 4 10:40:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (ruby_init_ext): export for golfers.
-
- * vm_core.h (rb_iseq_eval, rb_iseq_compile_with_option): ditto.
-
-Sun May 23 17:29:41 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * common.mk (capi): uses a timestamp file to get rid of
- generating twice.
-
-Fri Jun 18 01:33:21 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * enc/Makefile.in (realclean): has been missing. necessary
- for make realclean-enc.
-
-Fri Sep 3 23:51:26 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_socket_p): Pathname#socket?
- translated from pathname.rb.
-
-Fri Sep 3 06:40:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pty/pty.c (chfunc): pass through exceptions.
-
- * io.c (rb_io_bufwrite, rb_io_bufread): added.
-
- * process.c (rb_fork_err): protect from exceptions.
-
-Fri Sep 3 06:16:07 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_pipe_p): Pathname#pipe?
- translated from pathname.rb.
-
-Fri Sep 3 06:14:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pty/pty.c (chfunc): restore errno from SystemCallError and
- propagate proper exception to the parent. [ruby-dev:41965]
-
-Thu Sep 2 22:10:38 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_file_p): Pathname#file?
- translated from pathname.rb.
-
-Thu Sep 2 09:12:02 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): don't forget to free
- memory.
-
-Thu Sep 2 09:01:13 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): unicodize.
-
- * win32/win32.c (rb_w32_spawn, rb_w32_aspawn): convert arguments of
- CreateChild() from ACP to WideChar.
-
-Thu Sep 2 06:53:43 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_directory_p): Pathname#directory?
- translated from pathname.rb.
-
-Wed Sep 1 22:03:41 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_grpowned_p): Pathname#grpowned?
- translated from pathname.rb.
-
-Wed Sep 1 17:39:02 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.7.1 r5835.
- * test/minitest/*.rb: ditto.
-
-Wed Sep 1 16:50:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_setup_table): optimized. don't create hash objects
- when given pattern is ASCII only.
-
- * string.c (tr_find): ditto.
-
-Wed Sep 1 14:35:29 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (rb_ary_rotate_m): fix typo of rdoc.
- patched by Andrei Kulakov [ruby-core:31975]
-
-Wed Sep 1 14:33:36 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enum.c (enum_zip): fix typo of rdoc.
- patched by Andrei Kulakov [ruby-core:31974]
-
-Wed Sep 1 12:56:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (ruby_suppress_tracing): restore the state and invoke
- the func with normal state. a patch from Satoshi Shiba <shiba
- AT rvm.jp> at [ruby-dev:42162]. [ruby-core:31783]
-
-Tue Aug 31 21:10:23 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_exist_p): Pathname#exist? translated
- from pathname.rb.
-
-Tue Aug 31 17:32:34 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
- stubs". Thanks, Akio Tajima [ruby-dev:42159].
-
-Tue Aug 31 03:42:14 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_setup_table): fix bug in r29146.
- Initialize table even if cflag is 0; tr_find see whether
- del is empty or not.
-
- * string.c (tr_find): nodel can't be NULL; if NULL, it means
- it is not specified.
-
-Mon Aug 30 21:29:21 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_executable_real_p):
- Pathname#executable_real? translated from pathname.rb.
-
-Mon Aug 30 15:00:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (tr_setup_table): initialize negating table when
- negating string is given. [ruby-core:31851]
-
- * string.c (tr_find): add a sentence for the time when
- target characters include negating one.
-
- * string.c (rb_str_count): move definition.
-
-Mon Aug 30 07:32:41 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_executable_p): Pathname#executable?
- translated from pathname.rb.
-
-Sun Aug 29 23:54:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
- include assignment. [Bug #3759], [ruby-dev:42154]
-
- * lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
- name singleton class. [Bug #3759], [ruby-dev:42154]
-
-Sun Aug 29 23:25:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_get_path_check): clarify error message for
- ASCII-incompatible path name.
-
-Sun Aug 29 16:02:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (node_name.inc): remove command option -n and give
- file as stdin, because IronRuby 1.1 still doesn't support it.
- So now we can use ir.exe as BASERUBY.
-
- * tool/node_name.rb: read stdin with while gets.
-
-Sun Aug 29 13:22:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (rb_thread_method_id_and_class): curried proc has no
- method. [ruby-core:31871]
-
-Sun Aug 29 12:51:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_provide_feature): clarify error message for frozen
- $LOADED_FEATURES. based on a patch from Run Paint Run Run at
- [ruby-core:31913].
-
-Sun Aug 29 12:19:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (load_failed): should honor encoding. [ruby-core:31915]
-
-Sun Aug 29 09:35:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (clean): exclude *.inc. [ruby-dev:41931]
-
- * common.mk (distclean): include *.inc.
-
- * common.mk (help): change description about clean and distclean.
-
-Sat Aug 29 06:34:52 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_chardev_p): Pathname#chardev?
- translated from pathname.rb.
-
-Sat Aug 28 17:39:33 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_save_exception_mode,
- BigDecimal_save_rounding_mode, BigDecimal_save_limit): added.
-
- * test/bigdecimal/test_bigdecimal.rb: added tests for the above
- features.
-
-Sat Aug 28 08:11:05 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_blockdev_p): Pathname#blockdev?
- translated from pathname.rb.
-
-Fri Aug 27 16:20:01 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * string.c (rb_str_prepend): new method by Shota Fukumori (sora_h)
- [Feature #3765]
-
-Fri Aug 27 15:24:20 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * math.c (math_atan2): you should know that M_PI is not the feature
- of C90.
- fixed build failure caused by r29115.
-
-Fri Aug 27 15:26:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (null_device): move from io.c.
-
-Fri Aug 27 12:47:44 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * math.c (math_atan2): change the behavior when x and y are zero.
- [ruby-dev:42090] [Bug #3736] [ruby-dev:42116]
-
- * test/ruby/test_math.rb (test_atan2): add tests for the above
- changes.
-
-Fri Aug 27 12:26:23 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * object.c (rb_obj_class): remove mention of obsolete method.
- a patch from Run Paint Run Run at [ruby-core:31842].
-
-Fri Aug 27 12:25:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (null_device): the name of null device. [ruby-dev:41791]
-
-Fri Aug 27 07:57:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_shuffle_bang): bail out from modification during
- shuffle.
-
- * array.c (rb_ary_sample): ditto.
-
-Fri Aug 27 05:11:51 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_sysopen): Pathname#sysopen translated
- from pathname.rb.
-
-Thu Aug 26 22:53:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_shuffle): rdoc fix. argument name was missing.
- a patch from Run Paint Run Run at [ruby-core:31848].
-
-Thu Aug 26 21:49:46 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_readlines): Pathname#readlines
- translated from pathname.rb.
-
-Thu Aug 26 10:37:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regint.h (OnigStackIndex): the type should be intptr_t.
- Original Oniguruma assumes the size of long and that of void *
- are equal, but it's not true on LLP64 platform: mswin64.
- originally patched by shintaro kuwamoto [ruby-dev:42133]
-
-Thu Aug 26 10:38:11 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
-
- * test/fiddle/helper.rb: AIX does not have dynamically loadable lib[cm].
-
-Thu Aug 26 09:49:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_shuffle_bang): check number of argument.
-
-Tue Aug 26 09:11:40 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
- rmpd_set_thread_local_exception_mode, VpGetException,
- VpSetException): thread-local exception mode.
-
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
- rmpd_set_thread_local_precision_limit, VpGetPrecLimit,
- VpSetPrecLimit): thread-local precision limit.
-
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
- rmpd_set_thread_local_rounding_mode, VpGetRoundMode,
- VpSetRoundMode, VpException, VpInternalRound):
- thread-local rounding mode.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round,
- VpIsRoundMode, VpGetRoundMode, VpSetRoundMode, VpActiveRound,
- VpMidRound, VpLeftRound), ext/bigdecimal/bigdecimal.h:
- use unsigned short for rounding mode.
-
- * test/bigdecimal/test_bigdecimal.rb (test_mode): add test for
- setting rounding mode.
-
- * test/bigdecimal/test_bigdecimal.rb (test_thread_local_mode):
- add test for setting mode thread-locally.
-
-Thu Aug 26 07:29:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_{shuffle_bang,sample}): use Random class object.
-
- * random.c (try_get_rnd): use default_rand for Random as same as
- singleton methods.
-
- * random.c (rb_random_real): check the range of result.
-
-Wed Aug 25 22:11:11 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_binread): Pathname#binread translated
- from pathname.rb.
-
-Wed Aug 25 03:42:43 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
- reported by kuwamoto shintaro in [ruby-dev:42125].
-
-Tue Aug 24 23:28:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * .gitignore: updated.
-
-Tue Aug 24 22:07:28 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_read): Pathname#read translated from
- pathname.rb.
-
-Tue Aug 24 10:11:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: read API version from include/ruby/version.h.
-
- * {bcc,win}32/setup.mak (-version-): ditto.
-
- * version.h (RUBY_LIB_VERSION): use API version numbers.
-
-Tue Aug 24 07:07:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_shuffle_bang, rb_ary_sample): add optional
- argument random. [ruby-dev:41923] [EXPERIMENTAL]
-
- * random.c (rb_random_{int32,real,bytes}): fallback to normal
- method invocation.
-
-Tue Aug 24 06:08:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
- from version.h. [ruby-dev:42103]
-
-Tue Aug 24 05:58:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ChangeLog: flushed. [ruby-dev:42050]
-
-Tue Aug 24 01:14:58 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): to_f must underflow
- when the exponent is less than DBL_MIN_10_EXP - BASE_FIG.
-
- * test/bigdecimal/test_bigdecimal.rb (test_to_f): added test for the above changes.
-
-Mon Aug 23 23:14:21 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_each_line): Pathname#each_line
- translated from pathname.rb.
-
-Mon Aug 23 22:30:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (version.o): depends on both of version.h and
- include/ruby/version.h. [ruby-dev:42063]
-
-Mon Aug 23 13:09:27 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * backport r29071 from ruby_1_8;
-
- * ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean
- encoding issue for OpenSSL 1.0.0 compatibility.
- ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which
- means 'true'.
-
- ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false'
- but OpenSSL >= 1.0.0 treats it as 'true'. ruby-ossl was using
- 0x100 for 'false' for backward compatibility. Just use 0x0 for
- the case OpenSSL >= OpenSSL 0.9.7.
-
- * test/openssl/test_asn1.rb: test added.
-
-Mon Aug 23 12:28:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_search): fix: 4th argument should be regexp
- object. patched by shintaro kuwamoto [ruby-dev:41667] #3459
-
-Mon Aug 23 02:23:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): make sure to have digit-sequence after 'p'
- for hexadecimal-floating-constant. [ruby-dev:42105]
-
-Mon Aug 23 00:23:07 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: [ruby-core:31695]
-
-Sun Aug 22 09:08:02 2010 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (UINT2NUM): fix ifdef condition for LLP64.
- reported by Daniel Gutmanas. [ruby-core:31778]
-
-Sun Aug 22 06:46:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (RAND_UPTO): macro for random number.
-
-Sun Aug 22 05:55:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: fix typo. a patch from Eric Wong at
- [ruby-core:31810].
-
-Sat Aug 21 20:09:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm.c: add missing prototype of rb_iseq_clone for r29063.
-
-Sat Aug 21 18:54:56 2010 wanabe <s.wanabe@gmail.com>
-
- * vm.c (vm_define_method): copy iseq to avoid overwriting iseq->klass.
- #2502, #3136. see #2420.
-
-Sat Aug 21 17:36:42 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_split): Pathname#split translated from
- pathname.rb.
-
-Fri Aug 20 10:40:04 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_expand_path): Pathname#expand_path
- translated from pathname.rb.
-
-Thu Aug 19 22:44:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot (usage): add usage.
-
- * tool/make-snapshot (package): accept revision as BRANCH@REV.
-
-Thu Aug 19 19:53:26 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_timestamp): fix a constant type.
-
- * ext/socket/raddrinfo.c (get_afamily): suppress a warning.
-
-Thu Aug 19 19:28:47 2010 Tanaka Akira <akr@fsij.org>
-
- * thread_pthread.c (native_sleep): suppress a warning for platforms
- which time_t is int.
-
-Thu Aug 19 18:15:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/merger.rb: Add a tool to merge commits between branches.
- developed by URABE Shyouhei
-
-Thu Aug 19 17:19:09 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * backport r28621 and r28632 from ruby_1_8;
-
- * ext/openssl/ossl_config.c, ext/openssl/lib/openssl/config.rb,
- ext/openssl/lib/openssl.rb: reimplement OpenSSL::Config in Ruby.
- Now it should work on windows.
-
- * test/openssl/test_config.rb: added tests for OpenSSL::Config#dup.
-
- * test/openssl/test_config.rb: added tests for Config#clone.
-
-Thu Aug 19 12:04:39 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * array.c (rb_ary_permutation, rb_ary_repeated_permutation,
- rb_ary_repeated_combination, rb_ary_product):
- use ary_make_shared_copy instead of ary_make_substitution.
- [ruby-dev:42067] [Bug #3708]
-
- * test/ruby/test_array.rb (test_product, test_repeated_permutation,
- test_repeated_combination): append assertions against [Bug #3708].
-
-Thu Aug 19 11:11:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enum.c (enum_inject): fix typo of rdoc.
- patched by Andrei Kulakov [ruby-core:31768]
-
-Thu Aug 19 10:06:08 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_extname): Pathname#extname translated
- from pathname.rb.
-
-Thu Aug 19 06:03:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_push_frame): initialize block_iseq. a patch
- from Peter Weldon at [ruby-core:31757].
-
-Wed Aug 18 19:08:17 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * array.c (ary_make_shared): revert r29037, it occurs SEGV some
- situations.
-
-Wed Aug 18 18:36:32 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * array.c (ary_make_shared),
- test/ruby/test_array.rb (test_permutation):
- always return the original array when it is shared.
- [ruby-dev:42067] [Bug #3708]
-
-Wed Aug 18 01:37:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c: revert r26701; it introduces Bug #3681.
- [ruby-core:31677]
-
-Tue Aug 17 20:05:29 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_io.rb (test_threaded_flush): test "hi" is not output
- twice.
-
-Tue Aug 17 15:13:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/date.rb: Re-revert the part of r28950.
- It reverted the part of r28619.
-
-Tue Aug 17 13:00:07 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_dirname): Pathname#dirname translated
- from pathname.rb.
-
-Tue Aug 17 07:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/extconf.rb: check functions more.
- [ruby-core:31722]
-
-Tue Aug 17 07:42:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_make_independent_expand): set capacity properly. a
- patch from Peter Weldon at [ruby-core:31734]. [ruby-core:31653]
-
-Tue Aug 17 07:38:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): include empty
- suffix. [ruby-core:31730]
-
-Mon Aug 16 22:16:12 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_basename): unused variable removed.
-
-Mon Aug 16 21:39:33 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_basename): Pathname#basename translated
- from pathname.rb.
-
-Mon Aug 16 20:26:13 2010 Narihiro Nakamura <narihiro@netlab.jp>
-
- * gc.c (gc_profile_result): Index begins with 1.
-
-Mon Aug 16 20:21:17 2010 Narihiro Nakamura <authornari@gmail.com>
-
- * gc.c (gc_profile_result): use size_t. based on patches from
- Tomoaki NISHIYAMA <tomoakin@kenroku.kanazawa-u.ac.jp> at
- [ruby-dev:42042].
-
-Mon Aug 16 19:23:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_dtoa, ruby_hdtoa): use same representations for
- Infinity and NaN. a part of a patch from Peter Weldon at
- [ruby-core:31725].
-
- * util.c (ruby_hdtoa): fixed buffer overrun. based on a patch
- from Peter Weldon at [ruby-core:31725].
-
-Mon Aug 16 17:44:55 2010 Tanaka Akira <akr@fsij.org>
-
- * common.mk (capi): use -b option for doxygen. It disables stdout
- buffering and prevents wrong reordering between stdout and stderr
- even when the output of "make" is redirected.
-
-Sun Aug 15 19:59:58 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
- Fix for possible cross-site scripting (CVE-2010-0541).
- Found by Apple, reported by Hideki Yamane.
- Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>.
-
-Mon Aug 16 12:29:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (test-rubyspec-precheck): split
- from test-rubyspec.
-
- * common.mk (test-rubyspec): moved from Makefile.in.
-
-Mon Aug 16 10:00:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.h (llabs): never never never never never
- use "long long".
-
- * ext/bigdecimal.bigdecimal.c (BigDecimal_to_i): get rid of a warning.
-
-Sun Aug 15 18:14:20 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect,
- VPrint, VpToString, VpVarCheck): use PRIuSIZE, PRIdSIZE, PRIdVALUE,
- and PRIxVALUE.
-
-Sun Aug 15 16:14:31 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (Logging.postpone): close @log only when it's available.
-
-Sun Aug 15 13:30:35 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.h (VpVtoD): fix a type of e.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect):
- fix format for size_t.
-
-Sun Aug 15 00:22:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/extconf.rb, ext/bigdecimal/bigdecimal.h
- (labs, llabs): support environments missing labs and llabs.
-
- * ext/bigdecimal/bigdecimal.h (vabs): added.
-
- * ext/bigdecimal/extconf.rb, ext/bigdecimal/bigdecimal.h,
- ext/bigdecimal/bigdecimal.c, test/bigdecimal/test_bigdecimal.rb
- (TestBigDecimal#test_new): replace U_LONG, S_LONG, S_INT, and U_INT
- with appropriate standard or ruby-provided types.
-
-Sun Aug 15 00:15:45 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_utime): Pathname#utime translated
- from pathname.rb.
-
-Sat Aug 14 21:04:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_gc_mark_threads): deprecated.
-
-Sat Aug 14 19:12:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/{coverage,objspace}/extconf.rb ($INCFLAGS): explicitly add
- topdir and top_srcdir. [ruby-dev:42031]
-
-Sat Aug 14 17:48:41 2010 Narihiro Nakamura <authorNari@gmail.com>
-
- * test/objspace/test_objspace.rb: added test for objspace.
-
- * ext/objspace/objspace.c: considers T_ZOMBIE by lazy sweep GC.
-
- * gc.c: considers that dsize was 0. [ruby-dev:42022]
-
-Sat Aug 14 15:33:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, include/ruby/defines.h (RUBY_FUNC_EXPORTED): macro
- to declare exported function.
-
- * array.c (rb_ary_memsize), string.c (rb_str_memsize),
- variable.c (rb_objspace_data_type_memsize): used in
- objspace. [ruby-dev:42022]
-
- * io.c (rb_io_memsize): constified.
-
- * regcomp.c (onig_memsize): constified.
-
- * gc.h (rb_objspace_each_objects): used in objspace.
-
- * vm_core.h (rb_{get,set,reset}_coverages): used in coverage.
-
- * include/ruby/intern.h (rb_time_interval): used in io/wait.
-
- * include/ruby/intern.h (rb_make_backtrace, rb_make_exception):
- used in ripper.
-
- * node.h (rb_parser_{malloc,realloc,calloc,free}): ditto.
-
-Fri Aug 13 22:48:39 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_truncate): Pathname#truncate translated
- from pathname.rb.
-
-Fri Aug 13 16:11:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (MiniTest::Unit.new): extend before initialize.
- [ruby-dev:41970]
-
- * lib/test/unit.rb (MiniTest::Unit.autorun): use Test::Unit::Mini.
-
-Thu Aug 12 23:39:02 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_make_symlink): Pathname#make_symlink
- translated from pathname.rb.
-
-Thu Aug 12 21:18:27 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_lstat): Pathname#lstat translated
- from pathname.rb.
-
-Thu Aug 12 05:58:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_char_to_option_kcode): used in
- ripper.
-
- * node.h (rb_reserved_word): ditto.
-
-Thu Aug 12 00:19:53 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_rubyoptions.rb (test_script_from_stdin): disable
- echo. [ruby-dev:41966]
-
-Wed Aug 11 23:28:22 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * lib/cmath.rb (CMath.sqrt): use floating-point value.
- [ruby-core:31672] [Bug #3678]
-
- * test/test_cmath.rb: added for testing lib/cmath.rb.
-
-Wed Aug 11 20:57:25 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: merge from branches/ruby_1_9_2, and move io/console.
- [ruby-dev:41924]
-
-Wed Aug 11 11:01:15 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c: don't use // comment.
-
-Wed Aug 11 06:18:20 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_stat): Pathname#stat translated
- from pathname.rb.
-
-Tue Aug 10 21:18:04 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_to_[ifr]): don't allow complex with in-exact
- imaginary zero to be converted.
-
-Tue Aug 10 20:56:31 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/optparse.rb: suppress a warning.
-
- * test/test_mutex_m.rb: ditto.
-
-Tue Aug 10 20:56:13 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (Date::Format::Bag): use Struct.
- as an experimental.
-
-Tue Aug 10 20:45:35 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_rename): Pathname#rename translated
- from pathname.rb.
-
-Tue Aug 10 20:16:19 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/win32/lib/win32/resolv.rb (get_info): get rid of a warning.
-
-Tue Aug 10 19:56:13 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: [ruby-core:31658]
-
-Tue Aug 10 17:24:56 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * README.EXT.ja: rb_tainted_str_new_cstr() is an alias of
- rb_tainted_str_new2().
-
-Tue Aug 10 15:24:30 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c, ext/bigdecimal/bigdecimal.h,
- ext/bigdecimal/extconf.rb: BASE and BASE_FIG are defined
- based on the size of BDIGIT.
-
- * ext/bigdecimal/bigdecimal.c, ext/bigdecimal/bigdecimal.h:
- use BDIGIT for Real#frac.
-
-Tue Aug 10 15:19:45 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.h, ext/bigdecimal/bigdecimal.c:
- add extern declaration of rb_cBigDecimal.
-
-Tue Aug 10 14:09:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri):
- rollup leading slashes. [ruby-core:31657]
- patched by Jamison Wilde
- NOTE: //authority/path is valid relative URI both RFC2396 and
- RFC3986. So when give a relative URI-like string to URI lib,
- users must care leading slashes.
-
-Tue Aug 10 11:26:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/un.rb (httpd): SIGQUIT and SIGHUP are not guaranteed to exist.
-
-Tue Aug 10 06:26:48 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_readlink): Pathname#readlink translated
- from pathname.rb.
-
-Mon Aug 9 22:15:19 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_open): Pathname#open translated from
- pathname.rb.
-
-Mon Aug 9 22:11:09 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_signal.rb (TestSignal#test_exit_action): use
- Process.spawn instead of Process.fork.
-
-Mon Aug 9 15:59:02 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rubygems/source_index.rb: rename unused variable.
-
- * lib/rubygems/specification.rb: rename unused variable.
-
- * lib/rubygems/specification.rb: remove unused variable.
-
-Mon Aug 9 14:10:06 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: Fix type of mimeout_state.buf.
- [nkf-bug:20079]
-
-Mon Aug 9 06:52:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (sys_warning_1): show error message.
-
-Mon Aug 9 06:50:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_require.rb (test_require_too_long_filename):
- clear -w option.
-
-Mon Aug 9 00:18:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb ($ignore_error): initialize after $nmake.
-
-Sun Aug 8 19:16:26 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_make_link): Pathname#make_link
- translated from pathname.rb.
-
-Sun Aug 8 16:42:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems.rb (Gem.find_files): reverted to use globbing.
-
- * lib/rubygems.rb (Gem.find_files): fixed search order same as
- default behavior.
-
- * gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): return truly
- require-able suffixes only.
-
-Sun Aug 8 13:20:57 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_ftype): Pathname#ftype translated
- from pathname.rb.
-
-Sun Aug 8 12:41:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_tokadd_escape): no similar messages twice.
- [ruby-core:31048]
-
-Sun Aug 8 10:07:45 2010 Tanaka Akira <akr@fsij.org>
-
- * strftime.c (rb_strftime_with_timespec): suppress warnings.
-
-Sun Aug 8 08:58:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (RUBY_H_INCLUDES): add subst.h.
-
-Sun Aug 8 08:55:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (ruby_snprintf): printf attribute.
-
-Sun Aug 8 07:47:29 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/rbconfig/obsolete.rb: show the location which use Config.
-
-Sun Aug 8 07:29:55 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_fnmatch): Pathname#fnmatch and
- Pathname#fnmatch? translated from pathname.rb.
-
-Sun Aug 8 07:18:22 2010 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/subst.h (snprintf): redefinition moved from ruby.h.
- (vsnprintf): ditto.
-
-Sun Aug 8 00:41:42 2010 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/subst.h: new file for substitute standard functions.
-
- * include/ruby/missing.h: don't substitute "close", etc. here.
-
- * include/ruby/ruby.h: include ruby/subst.h at last.
- This prevents substituting "close" in unistd.h.
-
-Sat Aug 7 19:51:10 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (EnvUtil.invoke_ruby): merge stdout and stderr
- if capture_stderr is :merge_to_stdout.
- (assert_normal_exit): print abnormal output properly.
-
-Sat Aug 7 19:04:49 2010 Tanaka Akira <akr@fsij.org>
-
- * missing/close.c: undef the macros "getpeername", "getsockname" and
- "shutdown" to prevent infinite recursion.
-
-Sat Aug 7 18:37:39 2010 Tanaka Akira <akr@fsij.org>
-
- * missing/close.c: undef the macro "close" to prevent infinite
- recursion.
-
-Sat Aug 7 18:20:41 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_lchown): Pathname#lchown translated
- from pathname.rb.
-
-Sat Aug 7 17:49:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/missing.h: moved BROKEN_CLOSE replacements from
- include/ruby/ruby.h.
-
-Sat Aug 7 17:40:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb, lib/rbconfig/obsolete.rb: warn obsolete and
- deprecated Config.
-
-Sat Aug 7 17:18:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extract_makefile): follow the change of
- install-rb-default line format at r28850, which causes second
- run to create dummy makefiles.
-
-Sat Aug 7 14:08:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/mkmf.rb: change instance variable to global.
-
-Sat Aug 7 13:59:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pathname/pathname.c (path_sub_ext): don't clobber shared string.
- [ruby-core:31640]
-
-Sat Aug 7 13:33:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (vm_call0): fix for VM_METHOD_TYPE_NOTIMPLEMENTED.
- [ruby-dev:41953]
-
-Sat Aug 7 09:47:06 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: fix checking version of GCC.
-
-Sat Aug 7 09:31:48 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (Init_pathname): fix number of arguments for
- Pathname#chown.
-
-Sat Aug 7 09:28:12 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_normal_exit): use assert. fix
- faildesc.
-
- * test/pathname/test_pathname.rb (test_lchmod): test Pathname#lchmod
- using assert_normal_exit.
-
-Sat Aug 7 08:26:26 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_chown): Pathname#chown translated
- from pathname.rb.
-
-Sat Aug 7 02:09:04 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_lchmod): Pathname#lchmod translated
- from pathname.rb.
-
-Fri Aug 6 21:30:06 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_chmod): Pathname#chmod translated from
- pathname.rb.
-
-Fri Aug 6 20:13:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * rational.c (nurat_div): divided by infinity should be zero.
-
- * rational.c (nurat_div): divided by float zero should be
- infinity. [ruby-core:31626]
-
-Fri Aug 6 18:59:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (realpath_rec): rb_str_modify depends on the length, so
- resize instead.
-
-Fri Aug 6 18:56:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (clean-ext): fixed directories to be removed.
-
-Fri Aug 6 17:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/depend: add space at the beginning of @ignore_error.
-
- * lib/mkmf.rb: ditto.
-
-Fri Aug 6 17:38:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (clean): add prelude.c, config.log, and rbconfig.rb.
-
- * common.mk (distclean): remove encdb.h, config.log, and rbconfig.rb.
-
-Fri Aug 6 17:35:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * Makefile.in: ignore error from RMDIRS.
-
- * enc/depend: ditto.
-
- * lib/mkmf.rb: ditto.
-
-Fri Aug 6 05:53:32 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_mtime): Pathname#mtime translated from
- pathname.rb.
-
-Thu Aug 5 22:09:30 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_ctime): Pathname#ctime translated from
- pathname.rb.
-
-Thu Aug 5 21:20:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
- results when poped is true. [ruby-dev:41933], [Bug #3658]
- This is retry of r28870 and r28873 which were reverted.
-
-Thu Aug 5 20:13:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja (String functions): mention
- rb_str_resize and rb_str_set_len.
-
-Thu Aug 5 19:59:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_set_len): bail out when buffer overflowed
- probably.
-
-Thu Aug 5 18:36:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * complex.c (nucomp_marshal_load): should check the argument.
- [ruby-core:31622]
-
- * rational.c (nurat_marshal_load): ditto
-
- * marshal.c (w_float): should not append a dot if no fractal part
- exists. [ruby-dev:41936]
-
-Thu Aug 5 17:11:43 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (void_expr_gen): add 'possibly' to warning message.
- [ruby-core:31611]
-
-Thu Aug 5 16:57:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (glob_make_pattern): fold continuous PLAINs to get rid of
- snail at too deep path. [ruby-dev:41871]
-
-Thu Aug 5 16:42:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_set_len): should fail to modify shared string.
-
-Thu Aug 5 14:12:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): ensure sopath to be modifiable
-
-Thu Aug 5 12:39:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_make_independent_expand): fix buffer overflow
- while shrinking.
-
-Thu Aug 5 06:42:31 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c (realpath_rec): call rb_str_modify before rb_str_set_len.
-
-Wed Aug 4 19:37:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_set_len): rb_str_modify cannot work before the
- length is set, which is a precondition for rb_str_modify.
-
-Wed Aug 4 15:47:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): no need to create the directory
- at each library file. this change makes making ext faster.
-
-Wed Aug 4 06:25:04 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_atime): Pathname#atime translated from
- pathname.rb.
-
-Tue Aug 3 21:16:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (Init_Random): add Random::DEFAULT.
-
-Tue Aug 3 21:01:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_check_hash_type): added.
-
-Tue Aug 3 20:30:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_eq): never equal to infinity.
- [ruby-core:31603]
-
- * rational.c (nurat_div): hack for integral float divisor.
-
-Tue Aug 3 14:42:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/extmk.rb: remove purelib, fixes a bug in r28440, r28441.
-
- * spec/default.mspec: ditto.
-
- * template/Doxyfile.tmpl: ditto.
-
-Tue Aug 3 14:19:42 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence
- of pagers. the following code checks whether they are executable or
- not.
-
-Tue Aug 3 12:03:57 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * tool/runruby.rb: no purelib.
-
-Tue Aug 3 07:52:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/purelib.rb: no longer used since the default load path of
- miniruby is empty.
-
-Tue Aug 3 00:53:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def, vm_core.h: fixed typo. reported by Rocky Bernstein
- <rockyb AT rubyforge.org> at [ruby-core:31596].
-
-Mon Aug 2 21:51:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr
- since r26303.
-
-Mon Aug 2 21:16:03 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
- version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
- * ext/win32ole/extconf.rb: ditto.
-
-Mon Aug 2 16:34:32 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (native_thread_join): need to wait thread, of course.
- [ruby-dev:41911]
-
-Mon Aug 2 12:22:22 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (file_expand_path): wrong condition. [ruby-core:31591]
-
-Mon Aug 2 05:34:48 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_realdirpath): Pathname#realdirpath
- translated from pathname.rb.
-
-Sun Aug 1 23:04:49 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb: describe superclasses explicitly.
-
-Sun Aug 1 23:04:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_modify_expand, rb_str_resize): get rid of
- repeating malloc and realloc.
-
-Sun Aug 1 22:16:30 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_hash): use rb_memhash and
- take care of negative finite numbers properly.
- [ruby-core:31582][Bug #3640]
-
-Sun Aug 1 20:57:22 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_realpath): Pathname#realpath translated
- from pathname.rb.
-
-Sun Aug 1 17:27:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub: needs stddef.h for size_t. a patch from
- Akio Tajima at [ruby-dev:41905].
-
-Sun Aug 1 14:59:04 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_sub_ext): Pathname#sub_ext translated
- from pathname.rb.
-
-Sun Aug 1 10:23:48 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/irb/init.rb (IRB.parse_opts): set VERBOSE to true when debug
- switch called in irb. a patch from Andrew Grimm in
- [ruby-core:31558].
-
-Sun Aug 1 09:35:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (big_op): comparison of bignum and infinity has returned 1
- or -1, but it must return boolean.
-
-Sun Aug 1 09:44:25 2010 Tanaka Akira <akr@fsij.org>
-
- * class.c (rb_include_module): don't clear the method cache if the
- included module has no method.
- reported by Eric Wong. [ruby-core:31559]
-
-Sun Aug 1 09:21:32 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_sub): Pathname#sub translated
- from pathname.rb.
-
-Sun Aug 1 09:12:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h: latest x86_64 mingw defines stati64.
- [ruby-core:27516]
-
-Sun Aug 1 08:51:52 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: fix typo. [ruby-core:31564][Bug #3636]
-
-Sat Jul 31 23:15:27 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_inspect): Pathname#inspect translated
- from pathname.rb.
-
-Sat Jul 31 15:50:03 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (Init_pathname): The alias,
- Pathname#to_path, is translated from pathname.rb.
-
-Sat Jul 31 09:12:36 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_to_s): Pathname#to_s translated
- from pathname.rb.
-
-Sat Jul 31 08:20:07 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert):
- merged r28784 from ruby_1_8: wrongly created dummy SSL certificate
- with version == 3 (no such version) and serial == 0 (must be >0).
-
-Fri Jul 30 21:43:55 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_hash): Pathname#hash translated
- from pathname.rb.
-
-Fri Jul 30 12:42:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/imap.rb (example): use IO#noecho to read password if
- possible, and defer until needed. [ruby-dev:41889]
-
- * lib/net/imap.rb (example): support starttls option.
- [ruby-dev:41888]
-
-Fri Jul 30 08:51:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): home directory must be absolute.
- [ruby-core:31537]
-
-Fri Jul 30 08:33:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): should check if could find user.
- [ruby-core:31538]
-
-Fri Jul 30 07:59:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_add_suffix): fixed a bug returning uninitialized
- value.
-
-Fri Jul 30 07:48:04 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
- even if MacOS X Aqua version [ruby-dev:41883].
-
-Thu Jul 29 22:28:35 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_cmp): Pathname#<=> translated
- from pathname.rb.
-
-Thu Jul 29 06:51:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (EXT_SRCS): add ext/json/parser/parser.c.
-
-Thu Jul 29 05:52:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_basename): pass baselen to rmext.
-
-Thu Jul 29 02:38:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: not [freebsd] but [freebsd*] for AS_CASE.
-
-Wed Jul 28 22:23:59 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_eq): Pathname#{==,===,eql?} translated
- from pathname.rb.
-
-Wed Jul 28 19:37:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): VC6 or later have stddef.h.
-
- * include/ruby/missing.h: need to include stddef.h for size_t.
-
- * include/ruby/missing.h: shouldn't declare as dllimport when building
- ruby itself (for Windows).
-
-Wed Jul 28 17:11:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/*.c: include missing.h
-
-Wed Jul 28 09:38:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * cont.c: typos.
-
-Wed Jul 28 09:24:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * cont.c: (RB_PAGE_SIZE): renamed from PAGE_SIZE. [ruby-dev:41870]
-
- * cont.c: (RB_PAGE_MASK): renamed from PAGE_MASK.
-
-Tue Jul 27 23:09:09 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_taint): use rb_obj_taint.
- (path_untaint): Pathname#untaint translated from
- pathname.rb.
-
-Tue Jul 27 18:59:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (have_framework): added.
-
-Tue Jul 27 18:33:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
- config.h and defines.h for autoconf macros.
-
-Tue Jul 27 16:27:38 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (flo_cmp): typo.
-
-Tue Jul 27 16:09:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * class.c, compile.c, dir.c, file.c, iseq.c, parse.y, random.c:
- clean unused-value warnings.
-
- * cont.c, process.c, vm_exec.h: clean cast warnings.
-
-Mon Jul 26 22:34:37 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_taint): Pathname#taint translated from
- pathname.rb.
-
-Mon Jul 26 18:18:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (config.h): add include guard.
-
- * win32/Makefile.sub, bcc32/Makefile.sub (config.h): ditto.
-
-Mon Jul 26 14:38:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (XCFLAGS): missing.h needs config.h.
-
-Mon Jul 26 14:08:47 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/missing.h: revert a part of r28727. config.h is expected
- to include only once, before including defines.h.
- including it here breaks some macro definitions.
-
-Mon Jul 26 13:52:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: define BROKEN_CLOSE only on FreeBSD.
- This needs to merge to 1.9.2.
-
-Mon Jul 26 13:01:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (rb_thread_mark): should mark iseq itself other than normal
- iseq. [ruby-dev:41880]
-
-Mon Jul 26 11:51:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: define BROKEN_CLOSE on FreeBSD.
- This fixes build failure on MSVC. [ruby-core:31481]
-
- * include/ruby/ruby.h, include/ruby/missing.h:
- use BROKEN_CLOSE for replacing close(2).
-
-Mon Jul 26 09:51:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (rb_thread_mark): mark only self of normal iseqs, not
- nodes. [ruby-dev:41874]
-
-Sun Jul 25 05:37:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_cmp): honor the result of infinite? method of the
- other. [ruby-core:31470]
-
- * test/ruby/envutil.rb (EnvUtil#.suppress_warning): added.
-
- * test/ruby/test_float.rb (TestFloat#test_Float): suppress
- warnings under --verbose.
-
-Fri Jul 23 16:07:32 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/mutex_m.rb (sleep): added Mutex_m#sleep to support
- ConditionVariable.
-
-Fri Jul 23 15:09:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_MINGW32): ignore msvc suffix.
-
- * configure.in (RUBY_TRY_CFLAGS): try with werror turned on.
-
-Fri Jul 23 09:02:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): fixed out-of-boundary access at invalid
- multibyte characters.
-
-Fri Jul 23 09:00:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (XCFLAGS): reverted mistakenly removed option.
- [ruby-dev:41872]
-
- * include/ruby/missing.h: needs ruby/config.h.
-
-Thu Jul 22 20:58:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_EXTERN): unnecessary after all.
-
-Thu Jul 22 17:33:47 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * complex.c (nucomp_to_i): allow complex with imaginary zero to be
- converted.
-
- * complex.c (nucomp_to_f, nucomp_to_r): ditto.
-
-Thu Jul 22 20:12:56 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread_pthread.c (get_stack): fix memory leak; pthread_attr_destroy
- must be called even when pthread_getattr_np is used.
- [ruby-core:31269]
-
-Thu Jul 22 16:27:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): fix broken Regexp#inspect when it
- is ASCII-8BIT and non-ASCII character.
- The length of character should be from original byte string.
- [ruby-core:31431]
-
-Thu Jul 22 14:30:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/missing.h: add prototype for ruby_close().
-
-Thu Jul 22 12:58:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_EXTERN): ignore invalid attribute.
-
- * configure.in: fix for older autoconf.
-
-Thu Jul 22 12:02:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/{intern,io}.h: add missing prototypes.
-
-Thu Jul 22 06:38:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (XCFLAGS): use -fvisibility=hidden if possible.
-
- * configure.in (RMDIR): use --ignore-fail-on-non-empty if possible.
-
- * configure.in (RUBY_EXTERN): FUNCTION-BODY was missing.
-
-Thu Jul 22 03:02:55 2010 Eric Hodel <drbrain@segment7.net>
-
- * README.EXT: fix signature of rb_ensure and rb_rescue to match
- implementation.
-
-Wed Jul 21 23:07:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/fake.rb.in: get rid of embedding an absolute path.
-
-Wed Jul 21 15:22:17 2010 Evan Phoenix <evan@fallingsnow.net>
-
- * lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
- from gems properly.
-
-Wed Jul 21 15:15:02 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sprintf.c: add short documentation about named reference.
- [ruby-core:31294]
-
-Wed Jul 21 15:00:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (local_push_gen): disable unused variable warnings in
- eval. [ruby-dev:41869]
-
-Wed Jul 21 13:57:37 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_method.c (rb_method_boundp): revert r28543, r28564.
- They may be merged in Ruby 2.0. [ruby-core:31217]
-
-Wed Jul 21 13:37:35 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/uri/common.rb: Have URI#route_to, URI#route_from accept
- string-like arguments [ruby-core:30961]
-
- * lib/uri/generic.rb: ditto for URI.join, URI#merge
-
-Wed Jul 21 12:39:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/cmath.rb (CMath#cbrt): cbrt should accept a negative real
- numbers. [ruby-core:31234]
-
-Wed Jul 21 12:31:30 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/uri/common.rb: Have URI() and URI.join accept URI objects in
- addition to strings. [ruby-core:30960]
-
-Wed Jul 21 11:55:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_hdtoa): renamed from BSD__hdtoa.
-
-Tue Jul 20 11:35:11 2010 Evan Phoenix <evan@ruby-lang.org>
-
- * lib/rubygems.rb: Load the custom require if --disable-rubygems
- was used.
-
-Tue Jul 20 11:27:18 2010 Evan Phoenix <evan@ruby-lang.org>
-
- * gem_prelude.rb: Pull in rubygem's custom require
-
- * lib/rubygems.rb: Handle always having custom require available
-
-Tue Jul 20 18:39:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RSTRING_GETMEM): new macro to get ptr and
- len at once.
-
- * string.c (rb_str_cmp, str_eql, rb_str_eql): trivial improvements.
-
-Tue Jul 20 18:23:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/fiddle/closure.c (closure_data_type),
- ext/fiddle/function.c (function_data_type): rb_data_type_t has
- changed.
-
-Tue Jul 20 14:21:38 2010 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: don't call after_gc_sweep() after when garbage_collect()
- was called, because rb_sweep_method_entry() free live unlinked
- method entries. [ruby-core:31169]
-
-Tue Jul 20 12:42:06 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * ext/socket/raddrinfo.c (rb_getaddrinfo): according to my
- valgrind output this variable should be initialized beforehand.
-
-Tue Jul 20 12:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_flush_buffer): write and buffer operations should be
- monolithic. [ruby-core:31348]
-
-Tue Jul 20 12:27:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::Entry_#copy): check file name
- separator boundary. [ruby-core:31360]
-
-Mon Jul 19 18:34:12 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (get_strpath): check the type.
- (path_initialize): bypass to_path call for T_STRING.
- (path_freeze): implemented.
-
- * ext/pathname/lib/pathname.rb (Pathname#freeze): removed.
-
-Mon Jul 19 12:33:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_clear): should not unshare embedded array, and
- should make unshared array embedded.
-
-Mon Jul 19 09:00:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS (Kernel#instance_eval): add an incompatible change since
- the 1.9.1 release. [ruby-core:31336]
-
-Mon Jul 19 05:46:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_data_type_t): add new feature macros.
-
-Sun Jul 18 21:20:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_clear): no need to duplicate buffer just before
- clearing.
-
-Sun Jul 18 16:31:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_data_type_t): restructured. [ruby-dev:41862]
- add parent member.
-
- * error.c (rb_typeddata_inherited_p): new function.
-
-Sun Jul 18 01:09:27 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/pathname.c (path_initialize): return a value.
-
-Sun Jul 18 00:02:19 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/lib/pathname.rb (Pathname#initialize): removed.
-
- * ext/pathname/pathname.c (path_initialize): implemented.
- (get_strpath): new function.
- (set_strpath): ditto.
-
-Sat Jul 17 19:01:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (MiniTest::Unit#process_args): refactored.
-
-Sat Jul 17 18:30:05 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/file2lastrev.rb: don't depend on pathname.rb if File.realpath
- is available.
-
-Sat Jul 17 14:10:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_add_suffix): fixed type warnings.
-
-Sat Jul 17 13:48:22 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pathname/lib/pathname.rb: moved from lib/pathname.rb.
- require pathname.so.
-
- * ext/pathname/pathname.c: new file to define empty Pathname class.
-
- * ext/pathname/extconf.rb: new file.
-
-Sat Jul 17 13:04:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_wakeup_alive): split from rb_thread_wakeup.
- merged from r13476. c.f. [ruby-core:31320]
-
-Sat Jul 17 10:07:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb: MiniTest::Unit is different class from
- Test::Unit, and install runner before loading test/minitest.
-
-Fri Jul 16 14:58:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb (Test::Unit.setup_argv): run tests only when
- any tests have not run.
-
- * bin/testrb, test/runner.rb: use Test::Unit.start.
-
-Fri Jul 16 12:06:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb (ext-arch): prune directories start with '-'.
-
-Thu Jul 15 21:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * numeric.c (fix_divide): must not use rb_rational_new1 for coercion
- because it returns an argument itself when canonical mode is set.
- [ruby-core:31279]
-
-Thu Jul 15 21:38:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (bm_free): fix memory leak. [ruby-core:30869] [Bug #3466]
-
-Thu Jul 15 15:47:32 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regexec.c (onig_search): don't skip non-ANYCHARs when
- .* fails to match. This causes to fail matching
- ANYCHAR_STAR with LOOK_BEHIND. This fix is workaround
- and disable the optimization. [ruby-dev:41851]
-
-Thu Jul 15 06:11:29 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/rdoc/markup/attribute_manager.rb: fixing ri output when special
- characters are inside html tags. Thanks Tomo Kazahaya! [Bug #3512]
-
-Thu Jul 15 06:01:42 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (guess_local_offset): use the UTC offset of an older date on
- 64bit time_t environment.
-
-Thu Jul 15 02:42:51 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/test/unit.rb (setup_argv): convert to using optparse, adding
- --help and -I. [ruby-core:30154]
-
-Thu Jul 15 00:35:09 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (localtime_with_gmtoff_zone): renamed from
- localtime_with_gmtoff and return the timezone abbreviation name.
- (guess_local_offset): return the isdst and timezone abbreviation name.
- (localtimew): use the returned isdst and timezone abbreviation name.
- [ruby-core:31275]
-
-Wed Jul 14 20:23:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (frame_func_id), vm_eval.c (rb_iterate),
- vm_insnhelper.c (vm_yield_with_cfunc): as the name of a C-level
- block, use the current method ID at the creation point.
- [ruby-dev:41852]
-
-Wed Jul 14 18:18:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regexec.c (match_at): add end point to enclen's argument.
- This only effect on compiling with -DONIG_DEBUG_MATCH.
-
-Tue Jul 13 21:34:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/readline.c: libedit is missing declaration of
- rl_getc.
-
-Tue Jul 13 21:31:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_daemon): split from proc_daemon.
-
- * process.c (rb_fork_err): suppress gcc 4.4 warnings.
-
- * random.c (fill_random_seed): ditto.
-
-Tue Jul 13 21:01:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pty/pty.c (establishShell): chfunc must not raise any
- exceptions.
-
-Tue Jul 13 20:58:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_DEFAULT_ARCH): adjust for target
- cpu. [ruby-core:31243]
-
-Tue Jul 13 20:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/handle.c (rb_dlhandle_close): should not pass a dynamic
- string to rb_raise directly.
-
-Tue Jul 13 12:04:57 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * missing/close.c: keep original errno.
-
-Mon Jul 12 01:58:56 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/csv.rb: Fix unused variable warnings.
- Patch by Run Paint [ruby-core:30991]
-
- * lib/date.rb: ditto
-
- * lib/debug.rb: ditto
-
- * lib/drb/drb.rb: ditto
-
- * lib/drb/invokemethod.rb: ditto
-
- * lib/irb/ruby-lex.rb: ditto
-
- * lib/irb/slex.rb: ditto
-
- * lib/logger.rb: ditto
-
- * lib/pathname.rb: ditto
-
-Sun Jul 11 21:20:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT{,.ja} (rb_block_call): fixed about third/fourth
- arguments to the block. based on [ruby-core:31192] by Asher
- Haig. [Bug #3558]
-
-Sun Jul 11 17:01:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in ({,dist-,real-}clean-ext): should also omit
- semicolon when omitting "in WORDS" of FOR-statement.
-
- * tool/rmdirs: ditto.
-
-Sun Jul 11 11:07:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rdoc/test_rdoc_ri_driver.rb (test_formatter): add a test. a
- patch from caleb clausen in [ruby-core:31182].
-
-Sat Jul 10 21:43:11 2010 Tanaka Akira <akr@fsij.org>
-
- * strftime.c (rb_strftime_with_timespec): fix precision handling for
- %:z and %::z.
-
-Fri Jul 9 22:32:54 2010 Tanaka Akira <akr@fsij.org>
-
- * strftime.c: unused declarations removed.
-
-Fri Jul 9 21:20:22 2010 Tanaka Akira <akr@fsij.org>
-
- * strftime.c (rb_strftime_with_timespec): clear colons at unknown
- directive.
-
-Fri Jul 9 21:04:10 2010 Tanaka Akira <akr@fsij.org>
-
- * strftime.c: don't call tzset. strftime.c doesn't depend on
- the global timezone.
-
-Fri Jul 9 20:30:26 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): 24:00 should be the beginning of the next
- day even if the leap second, 23:59:60, exists.
-
-Fri Jul 9 01:08:46 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/emitter.rb (initialize): line_width is
- a valid option passed to the emitter.
-
- * test/psych/test_psych.rb: corresponding tests.
-
-Fri Jul 9 00:49:46 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/emitter.c (line_width, set_line_width): preferred line may
- be set on the emitter.
-
- * test/psych/test_emitter.rb: corresponding tests.
-
-Thu Jul 8 15:47:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_conv_enc_opts): fix infinite loop because
- of ISO-2022-JP conversion with empty string.
- patched by Brian Buchanan [ruby-core:31107]
-
-Thu Jul 8 08:16:57 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb (push): adding version
- and header emit options.
-
- * test/psych/test_psych.rb: corresponding test.
-
-Thu Jul 8 08:01:03 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/emitter.c: updating documentation about emit options
-
- * ext/psych/lib/psych/core_ext.rb: ditto
-
- * ext/psych/lib/psych.rb (dump): passing emit options to emitter.
-
- * ext/psych/lib/psych/nodes/node.rb: ditto
-
- * ext/psych/lib/psych/visitors/emitter.rb: sending emit options to
- YAML emitter. [ruby-core:28318]
-
-Thu Jul 8 06:05:58 2010 Tanaka Akira <akr@fsij.org>
-
- * strftime.c (rb_strftime_with_timespec): support %:z and %::z.
- [ruby-dev:41841]
-
-Thu Jul 8 00:15:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gem_prelude.rb: provide workaround for gem activation. Currently,
- gem activation does not work by default. Now it can be worked
- around by requiring "rubygems" first. [ruby-core:29486]
- a patch from Evan Phoenix in [ruby-core:31096].
-
- * lib/rubygems.rb: ditto.
-
-Wed Jul 7 10:01:34 2010 Adrian Bloomer <adrian.bloomer@gmail.com>
-
- * numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'.
-
-Wed Jul 7 13:22:20 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (ruby_find_basename): set correct baselen.
-
-Wed Jul 7 13:02:59 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * vm_method.c (rb_method_boundp): respond_to?(:protected_method,
- true) should return true. Pointed out by Marc-Andre Lafortune.
- [ruby-dev:41837]
-
-Wed Jul 7 12:00:24 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (ruby_find_basename): should initialize f.
-
-Wed Jul 7 11:44:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzfile_raise): add invalid header to
- exceptions.
-
-Wed Jul 7 10:26:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * missing/close.c: ignore ECONNRESET.
- FreeBSD wrongly sets ECONNRESET on close(2) and
- it causes false-negative exceptions. [ruby-dev:41778]
-
- * configure.in: ditto.
-Tue Jul 6 22:57:21 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly
- to avoid select() on a socket which TCP state is CLOSED.
- patch by Eric Wong. [ruby-core:31053]
-
-Tue Jul 6 21:45:34 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io/console/console.c (winsize_row): should return actual screen
- size, not buffer size.
-
-Tue Jul 6 08:35:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/dl/lib/dl/import.rb (handler): add a more helpful error message
- when calling import_symbol or import_function without calling
- dlload. Thanks nobu! [ruby-core:30996]
-
-Tue Jul 6 00:34:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (thread_free): free altstack to prevent memory leak. a patch
- from Tomoyuki Chikanaga in [ruby-dev:41815]. [Bug #3537]
-
-Tue Jul 6 00:29:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (NONASCII_MASK): NONASCII_MASK must be unsigned.
- [ruby-dev:41782]
-
-Mon Jul 5 16:05:39 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * vm_method.c (rb_method_boundp): Return false for protected
- methods when called from Kernel#respond_to?. [ruby-dev:40461]
-
-Mon Jul 5 12:32:01 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/scalar_scanner.rb (parse_string): support
- timezones that are not one hour off. [ruby-core:31023]
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
-
-Sun Jul 4 22:49:54 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_syntax.rb: split test_syntax from test_system.rb.
-
-Sun Jul 4 22:02:02 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_system.rb (test_syntax): unified with test_syntax2.
-
-Sun Jul 4 21:00:39 2010 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_system.rb (test_syntax2): moved from sample/test.rb
- [ruby-dev:41721]
-
-Sun Jul 4 17:13:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (swallow, prepare_getline_args, rb_io_getline_1): fix for
- paragraph mode reading in non-ascii-compatible encoding.
- [ruby-dev:41803]
-
-Sat Jul 3 16:14:10 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): add two new constants
- BigDecimal::INFINITY and BigDecimal::NAN.
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (BigMath.exp): modify the
- behaviors for infinity arguments as same as Math.exp.
-
-Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar):
- teaching Psych to deserialize DateTime objects. [Bug #1390]
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb(visit_DateTime): added a
- method for serializing DateTime objects.
-
- * ext/psych/lib/psych/scalar_scanner.rb(parse_time): add method for
- parsing times objects from a string.
-
- * test/psych/test_date_time.rb: tests for dumping DateTime objects.
-
-Sat Jul 3 09:13:55 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use
- Time#nsec to accurately serialize time objects. [ruby-core:29233]
-
-Fri Jul 2 23:30:23 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (argf_inplace_mode_set): prohibits an assignment of a tainted
- value.
-
- * file.c (ruby_find_basename, ruby_find_extname): split from
- rb_file_s_basename() and rb_file_s_extname().
-
- * util.c (ruby_add_suffix): support arbitrary length of the suffix
- to get rid of the potential buffer overflow.
- reported by tarui.
-
-Fri Jul 2 05:31:51 2010 Tanaka Akira <akr@fsij.org>
-
- * numeric.c (rb_num2long): accept LONG_MAX < x < LONG_MAX+1 and
- LONG_MIN-1 < x < LONG_MIN as well because they are converted
- into the valid range of long by truncation.
- (rb_num2ulong): accept ULONG_MAX < x < ULONG_MAX+1 and
- LONG_MIN-1 < x < LONG_MIN as well.
- (rb_num2ll): accept LLONG_MAX < x < LLONG_MAX+1 and
- LLONG_MIN-1 < x < LLONG_MIN.
-
-Thu Jul 1 23:10:25 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Improving documentation.
-
-Thu Jul 1 22:15:01 2010 Tanaka Akira <akr@fsij.org>
-
- * numeric.c (rb_num2ulong): fix the lower limit for float.
- [ruby-dev:41361]
-
-Thu Jul 1 21:37:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): integrated with
- runexec.
-
-Thu Jul 1 16:19:53 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * thread_pthread.c (thread_start_func_1): don't call
- native_thread_init_stack(th) on cygwin to avoid the segv
- introduced by r27789. Cygwin's signal implementation is half
- baked so USE_SIGNALSTACK is not defined and it needs another
- treatment.
-
-Thu Jul 1 13:00:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (test-knownbug): ignore known bugs.
-
-Thu Jul 1 08:40:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_object): suppress empty instance variable entry on
- compatible dump objects.
-
-Wed Jun 30 07:29:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using
- a pipe, get rid of not-well-defined behavior after the child
- process terminated in pty.
-
-Wed Jun 30 02:30:26 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * thread_pthread.c (get_stack): use pthread_getthrds_np() for AIX.
-
- * configure.in: ditto.
-
-Tue Jun 29 21:11:15 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * ext/stringio/stringio.c (strio_write): add RB_GC_GUARD.
-
-Tue Jun 29 19:39:59 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_method.rb (is_ruby64): check
- ruby binary is mswin64 or mingw64. [ruby-dev:41756]
-
-Tue Jun 29 14:18:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_realpath_internal, realpath_rec): skip UNC share root
- on DOSISH platforms.
- http://pc12.2ch.net/test/read.cgi/tech/1272248179/600
-
-Tue Jun 29 11:52:33 2010 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (unlink_heap_slot, slot_sweep): unlink heaps_slot of
- heaps_slot linked list if heaps_slot is empty at slot_sweep.
- fixed [ruby-dev:41543], [ruby-core:24894].
-
-Tue Jun 29 01:22:08 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi
- header files. Thanks Yugui! [ruby-core:30917]
-
-Mon Jun 28 22:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rdoc/test_rdoc_ri_driver.rb (TestRDocRIDriver#test_formatter):
- fix a test accordingly to r28455.
-
-Mon Jun 28 21:56:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_fd_resize, rb_fd_copy): avoid NULL dereference upon
- failed realloc by using xrealloc instead of not realloc. a patch
- from Jim Meyering <meyering at redhat.com> in [ruby-core:30920]
- [Bug #3489]
-
-Mon Jun 28 20:32:33 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
- that Ruby is 32bit or 64bit binary in order to get correct offset
- value. [ruby-dev:41741]
-
-Mon Jun 28 05:32:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rdoc/ri/driver.rb (RDoc::RI::Driver#formatter): should use bs
- format when stdout is piped. [ruby-core:30734]
-
-Mon Jun 28 03:12:03 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bootstraptest/test_class.rb: add a test for [ruby-core:30843].
-
-Mon Jun 28 02:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * class.c (rb_mod_init_copy): when class is dup'ed, a metaclass of the
- class should be attached to the dup'ed class, not the original
- class. [ruby-core:30843] [Bug #3461]
-
-Sun Jun 27 23:31:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/io.h, io.c: reverted r21709.
-
- * ruby.c (load_file_internal): nothing to read if EOF reached
- while reading shebang. [ruby-core:30910]
-
-Sun Jun 27 13:25:07 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c (simple_sendfile): don't try to send data more than SSIZE_MAX
- with single sendfile call..
- based on the patch by Eric Wong. [ruby-core:30908]
-
-Sun Jun 27 10:41:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed):
- no reason that bin directory should be included in $LOAD_PATH.
- it is for executable files, but not libraries. [ruby-core:25936]
-
-Sat Jun 26 13:07:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (enable-debug-env): option for RUBY_DEBUG env.
-
-Sat Jun 26 11:56:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (clear-installed-list): put redirection before set
- command, since it seems to be handled by nmake in special way.
- [ruby-dev:41711]
-
-Sat Jun 26 10:08:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): no needs to copy the
- original ENV, since it's done in spawn automatically.
- [ruby-dev:41733]
-
-Sat Jun 26 08:44:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * NEWS (zlib): new methods. [ruby-dev:41706] [Bug #3472]
-
-Sat Jun 26 07:59:18 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole_method.rb (test_offset_vtbl): check
- that OS is Windows 32bit or Windows 64bit in order to get
- correct offset value.
-
-Sat Jun 26 04:39:12 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * ext/dl/lib/dl/func.rb (call): don't overwrite original arguments
- to defend from GC.
- * test/dl/test_func.rb (test_string): add test for above.
-
-Fri Jun 25 11:45:36 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Fixing a bug that prevented CSV from parsing
- all multi-line fields correctly. Patch by Rob Biedenharn.
-
-Fri Jun 25 10:07:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err):
- return the exit status.
-
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): change the
- environment of spawned process only.
-
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): get rid of possible
- deadlock.
-
-Fri Jun 25 06:24:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/un.rb (httpd): MaxClients also should be integer.
- [ruby-dev:41724] [Bug #3477]
-
- * lib/un.rb (setup): fix of word splitting. [ruby-dev:41723]
- [Bug #3476]
-
-Fri Jun 25 01:07:17 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
- RB_GC_GUARD_PTR being removed by optimization.
-
-Thu Jun 24 06:22:27 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): the workaround
- for Mac OS X moved from rsock_getaddrinfo.
-
-Thu Jun 24 05:44:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (struct dump_arg, struct load_arg): merge taint and
- untrust flags into infection as bit flags.
-
- * marshal.c (w_nbyte, clear_dump_arg): infect the buffer as soon
- as appending, because it might have been finalized already at
- exit. based on a patch by Tomoyuki Chikanaga
- at [ruby-dev:41672]. [Bug #3463]
-
-Wed Jun 23 23:49:21 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (str_is_number): renamed from str_isnumber to
- avoid confusion to str_isnumber in ext/socket/getaddrinfo.c.
-
-Wed Jun 23 23:45:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * NEWS (stringio): new methods. [ruby-dev:41687] [Bug #3469]
-
-Wed Jun 23 22:52:00 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c: don't use __P.
-
-Wed Jun 23 21:32:08 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
- registry entry at first. [ruby-dev:41674] [Bug #3464]
-
-Wed Jun 23 21:17:32 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/raddrinfo.c (ruby_getaddrinfo__darwin): new workaround for
- getaddrinfo problem on Mac OS X Snow Leopard. [ruby-core:29427]
- patch by Wataru Kimura. [ruby-core:30842]
-
-Wed Jun 23 17:12:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS (ptr): new method and deprecated methods. [ruby-dev:41681]
-
- * ext/pty/{README,README.ja}: ditto.
-
- * ext/pty/pty.c (pty_check): add rdoc.
-
-Wed Jun 23 12:44:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_regexp.rb (test_dup_warn): read in UTF-8
- encoding regardless environment.
-
- * test/ruby/envutil.rb (invoke_ruby): add encoding option.
-
-Wed Jun 23 06:44:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (fchown): need to check. a patch by Eric Wong
- at [ruby-core:30818].
-
- * io.c (argf_next_argv): check for setting owner/group.
-
-Tue Jun 22 23:10:10 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (num_exact): fix for mathn. [ruby-dev:41599]
-
-Tue Jun 22 22:00:06 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb: suppress warnings.
-
-Tue Jun 22 21:33:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/optparse/test_summary.rb: fixed superclass so that it run
- solely.
-
-Tue Jun 22 19:57:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (shadowing_lvar_gen): should add lvar to vars and
- used. [ruby-dev:41666]
-
-Tue Jun 22 13:23:13 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/delegate.rb: Forward #trust, #untrust, #taint and #untaint
- to both the delegator and __getobj__ [ruby-core:26138]
-
-Mon Jun 21 23:41:08 2010 wanabe <s.wanabe@gmail.com>
-
- * eval_error.c (error_print): clear raised_flag while error-printing
- to avoid hang. [ruby-core:27608]
-
- * test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
- above.
-
-Sun Jun 20 16:17:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * id.c (Init_id): add underscore name.
-
- * parse.y (warn_unused_var): ignore underscore name.
-
- * parse.y (warn_unused_var): use same format as shadowing local
- variable.
-
- * parse.y (shadowing_lvar_gen): get rid of adding extra name for
- shadowing local variable. [ruby-dev:41628]
-
-Sat Jun 19 11:11:37 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb.rb: remove double exclamation marks. a patch from Diego
- Viola. [ruby-core:30589]
-
-Sat Jun 19 03:35:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the
- exception message when attempting to load an unknown class. Thanks
- nobu! [ruby-dev:41399]
-
- * test/psych/test_psych.rb: test for the exception message
-
-Fri Jun 18 10:37:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * gc.c (gc_lazy_sweep): clean a warning.
- "suggest parentheses around assignment used as truth value"
-
- * transcode_data.h (getGB4bt1): clean a warning.
- "suggest parentheses around arithmetic in operand of |"
-
- * transcode_data.h (getGB4bt3): ditto.
-
- * vm.c (thread_free): clean a warning. "format 'p' expects type
- 'void *', but argument 3 has type 'struct rb_mutex_struct *'"
-
-Fri Jun 18 10:15:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c: add prototype of rb_realpath_internal.
-
- * load.c: ditto.
-
-Fri Jun 18 01:50:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * object.c: Object#public_methods, private_methods, etc. returns
- method ids that belong to the class or the singleton class(es) of
- the object. [ruby-dev:41613]
-
- * class.c: on the other hand, Module#public_instance_methods, etc.
- returns method ids that belong to the module itself (even if the
- module is singleton, it does not return method ids of super
- class(es); see [ruby-core:28837]).
-
-Fri Jun 18 01:22:55 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/webrick/httpservlet/filehandler.rb
- (prevent_directory_traversal): apply filesystem encoding to path
- only during calling File.expand_path. [ruby-dev:41423]
-
-Thu Jun 17 23:20:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * load.c (rb_load_internal): remove call to rb_realpath_internal
- within rb_load_internal which caused big performance degradation.
- Instead, call rb_realpath_internal in the caller of
- rb_load_internal. [ruby-dev:41502] [ruby-dev:41610]
-
- * vm.c (rb_vm_call_cfunc): ditto.
-
- * eval_intern.h (rb_vm_call_cfunc): ditto.
-
- * ruby.c (process_options): ditto.
-
-Thu Jun 17 18:37:47 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_str_encode_ospath): when the encoding of the parameter
- is ASCII-8BIT, should recognize as filesystem encoding, and convert
- to UTF-8 on Windows.
-
- * file.c (realpath_rec): should convert to ospath encoding before
- calling lstat().
-
- * file.c (rb_realpath_internal): resolved string should take over
- the encoding of base string.
-
- * transcode.c (rb_str_encode): should return new string always.
- fixed #3444.
-
-Wed Jun 16 18:34:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y: ripper needs warn_unused_var(), too.
-
-Wed Jun 16 18:20:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (warn_unused_var): warn unused variables.
- [ruby-dev:41620]
-
-Wed Jun 16 15:40:53 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * error.c (rb_bug): existence of _set_abort_behavior() depends on
- runtime version, not compiler version.
-
-Wed Jun 16 01:38:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
- On Debian/lenny, which is a "supported" platform, ffi.h is installed
- in /usr/include/i486-linux-gnu/. This causes build error when using
- gcc whose target is not i486-linux-gnu.
-
-Wed Jun 16 00:04:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_io.rb (safe_4): does not use Timeout because
- Timeout.timeout uses Thread#kill which raises SecurityError when
- $SAFE == 4. based on a patch from Tomoyuki Chikanaga.
- [ruby-dev:41484]
-
- * test/ruby/test_io.rb (test_print_separators): use pipe (test helper
- method) instead of IO.pipe. [ruby-dev:41484]
-
-Tue Jun 15 17:14:58 2010 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/fiddle/extconf.rb: De Morgan's laws.
-
-Tue Jun 15 12:09:00 2010 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/fiddle/extconf.rb: use pkg_config to find ffi.h.
-
-Tue Jun 15 02:31:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk (clean-ext, clean-enc): clean up cleaning
- targets.
-
-Mon Jun 14 22:36:09 2010 Tanaka Akira <akr@fsij.org>
-
- * test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS
- for Windows.
-
- * test/socket/test_nonblock.rb (test_sendmsg_nonblock_error): ditto.
-
- [ruby-dev:41597] reported by Masaya Tarui.
-
-Mon Jun 14 17:44:39 2010 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: raise DRbConnError instead of ArgumentError if too
- many arguments. [ruby-dev:41481]
-
- * test/drb/test_drb.rb: ditto.
-
- * test/drb/drbtest.rb: ditto.
-
-Mon Jun 14 04:03:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/fiddle/closure.c (dealloc): refix workaround r28300.
- don't use ffi_closure_alloc, ffi_prep_closure_loc and
- ffi_closure_free on MACOSX and __linux__.
- [ruby-dev:41483] [ruby-dev:41214]
-
-Sun Jun 13 15:46:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rubyoptions.rb: add a simple test for __END__ and
- DATA.
-
-Sun Jun 13 04:24:18 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/delegate.rb: Delegate !=, eql? and hash [ruby-core:26139]
-
-Sun Jun 13 02:12:46 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf8_mac.trans (buf_apply): fix for patterns
- whose result is 2 bytes. [ruby-core:30751]
-
-Sun Jun 13 01:38:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * time.c (rb_localtime_r2): fix mixed declarations and code.
-
-Sun Jun 13 00:27:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/dl/lib/dl.rb: don't require when already loaded.
-
-Sun Jun 13 00:02:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/fiddle/closure.c (dealloc): workaround fix for libffi's
- ffi_closure_free. [ruby-dev:41483] [ruby-dev:41214]
-
-Sat Jun 12 10:02:26 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_syscall): should check argument string taint before
- invoking system calls.
-
-Sat Jun 12 09:18:31 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (uninitialized_constant): process through
- rb_class_real() to remove "Object::" from error message.
- [ruby-dev:40951]
-
-Sat Jun 12 00:38:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/dbm/extconf.rb: accept Berkley DB version 3, 4 and 5.
- a patch from Takahiro Kambe. [ruby-dev:41531]
-
-Fri Jun 11 23:21:35 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (init_leap_second_info): check the result of
- gmtime_with_leapsecond.
-
-Fri Jun 11 23:04:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_get_ciphers):
- use sk_SSL_CIPHER_num and sk_SSL_CIPHER_value instead of cast.
- patched by Takahiro Kambe [ruby-dev:41530]
-
-Fri Jun 11 22:59:31 2010 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/missing.h (isnan): fix compilation error on OpenBSD.
-
-Fri Jun 11 22:39:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rubygems/install_update_options.rb
- (Gem::InstallUpdateOptions#add_install_update_options): deprecate
- --test option which has not worked. [ruby-core:21714]
-
- * test/rubygems/test_gem_command_manager.rb: ditto.
-
-Fri Jun 11 07:34:25 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): test the result of LOCALTIME.
-
-Fri Jun 11 00:42:45 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (rb_localtime_r2): fix localtime overflow check.
-
-Thu Jun 10 23:05:44 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (rb_localtime_r2): refine localtime overflow check for
- FreeBSD 6.4.
-
-Thu Jun 10 09:10:08 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_putc): documentation updated to mention putc would
- not work well with multi-byte characters. [ruby-core:30697]
-
- * io.c (rb_f_putc): ditto.
-
-Wed Jun 9 22:51:50 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (find_time_t): always outerpolate from past.
- [ruby-core:30672] reported by Benoit Daloze.
-
-Wed Jun 9 22:13:08 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (calc_tm_yday): extracted from timegmw_noleapsecond.
-
-Tue Jun 8 06:27:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gem_prelude.rb: load full rubygems at LoadError for activation
- check. [ruby-core:29486]
-
-Tue Jun 8 06:04:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (parse_mode_enc): set set_by_bom bit. [ruby-core:30641]
-
-Sun Jun 6 22:37:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_buf_cat_escaped_char): get rid of buffer
- overflow on platforms int is bigger than 32bit, and warnings.
-
-Sun Jun 6 19:55:21 2010 Tanaka Akira <akr@fsij.org>
-
- * array.c (rb_ary_product): clear uninitialized elements in temporary
- array.
-
-Sun Jun 6 12:31:57 2010 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: set_heaps_increment is not
- called before gc_marks of lazy sweeping because live_num not
- contain finalize objects. So call set_heaps_increment after lazy
- sweeping if free_num are not enough. And move free_min to struct
- rb_objspace for above. [ruby-dev:41499]
-
-Sun Jun 6 10:44:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_product): need to set the length in order to get
- the entries marked. [ruby-dev:41540]
-
-Sun Jun 6 08:26:01 2010 Tanaka Akira <akr@fsij.org>
-
- * vm.c (Init_BareVM): call Init_native_thread here.
-
- * thread.c (Init_Thread): don't call Init_native_thread.
-
- * thread_pthread.c (Init_native_thread): exported.
-
- * thread_win32.c (Init_native_thread): ditto.
-
- [ruby-dev:41536]
-
-Sun Jun 6 08:21:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS: Enumerable#join has been reverted. [ruby-core:30604]
-
-Sat Jun 5 20:30:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): ASCII incompatible strings
- must always escape or converted.
-
- * re.c (rb_reg_expr_str): use rb_str_buf_cat_escaped_char
- when resenc is given: for Regexp#inspect or error message.
-
- * re.c (rb_reg_desc): add 'n' for ENCODING_NONE.
-
-Sat Jun 5 01:20:14 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (sym_inspect): Escape when the symbol is not
- resulted encoding and not ascii_only. It had escaped
- ascii-incompatible string, but it is wrong.
-
-Sat Jun 5 01:10:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_buf_cat_escaped_char): defined.
- Splited from rb_str_inspect.
-
-Sat Jun 5 16:39:13 2010 Tanaka Akira <akr@fsij.org>
-
- * .gdbinit (rp): show type name for RTypedData.
-
-Sat Jun 5 15:59:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options, load_file_internal): $0 seen from
- required libraries by -r option should be the main script.
- [ruby-core:23717]
-
-Sat Jun 5 15:15:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/envutil.rb (EnvUtil#invoke_ruby): support for child
- process env.
-
-Sat Jun 5 14:11:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/net/imap/test_imap.rb (test_exception_during_shutdown):
- need to raise always.
-
-Sat Jun 5 13:13:30 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (eql?, ==, minor): Fix bugs when comparing/returning
- some empty matrices.
-
-Sat Jun 5 11:00:48 2010 Tanaka Akira <akr@fsij.org>
-
- * error.c (rb_name_err_mesg_new): guard mesg, recv and method.
- The problem in [ruby-dev:41464] is caused because mesg is collected.
-
-Sat Jun 5 10:03:31 2010 Tanaka Akira <akr@fsij.org>
-
- * .gdbinit (rp): detect and show RTypedData.
-
-Sat Jun 5 08:30:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_f_test): 'W' should test writable by real uid/git,
- not world writable. [ruby-core:30587]
-
-Sat Jun 5 06:20:57 2010 Eric Hodel <drbrain@segment7.net>
-
- * dir.c: Clarification of what '*' matches. Patch by John Wells
- <john.wells at greatworx.com>
-
-Fri Jun 4 10:46:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_inspect): should taint the result.
- [ruby-dev:41533]
-
-Fri Jun 4 09:37:15 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (gc_sweep): suppress a warning on VC, again.
-
-Thu Jun 3 23:34:55 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb: Emit a deprecation warning in
- verbose mode and add a caution to the overview section of the
- document. [ruby-dev:41525]
-
-Thu Jun 3 19:33:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_inspect): suppress warnings by
- rb_sprintf.
-
- * ext/dl/cptr.c (rb_dlptr_s_malloc): suppress warnings.
-
-Thu Jun 3 18:58:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (ruby_init_ext): statically linked extensions have no
- real path. [ruby-dev:41526]
-
- * vm.c (rb_vm_call_cfunc): add filepath argument.
-
-Thu Jun 3 18:17:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rake/test_win32.rb (Rake::TestWin32): update tests.
- [ruby-core:30309]
-
- * test/io/nonblock/test_flush.rb (test_flush): try pipe and
- socketpair. [ruby-dev:41517]
-
-Thu Jun 3 09:36:43 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/dl.h (DLSTACK_TYPE): type of stack is same as VALUE.
- reported by sakiyama shin in [ruby-dev:41514]
-
-Thu Jun 3 06:30:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_path.rb (test_path): workaround for drive
- letter.
-
- * test/ruby/test_path.rb (test_path): get rid of blocking on
- access to non-existent host.
-
-Thu Jun 3 05:37:46 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs.
- Fixes rvm and multiruby installations.
-
-Thu Jun 3 01:22:45 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fix typo and race condition.
-
-Thu Jun 3 00:58:45 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/dl/lib/dl/cparser.rb (parse_ctype): add backwards compatibility
- by supporting "uint" types in the c parser. [ruby-core:29750]
- * test/dl/test_cparser.rb: adding a test for "uint" changes.
-
-Wed Jun 2 11:40:02 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compile.c (iseq_compile_each): should consider block on stack,
- if block argument is passed. [ruby-core:30534]
-
- * parse.c (arg_concat_gen): should append to nd_head, not to
- nd_iter for NODE_BLOCK_PASS.
-
-Tue Jun 1 23:12:06 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (unescape_nonascii): \P{FOO} is also Unicode property in
- regexp. [ruby-core:30540]
-
-Tue Jun 1 21:29:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb: adding support to rfc5789 patch verb.
- Added a Net::HTTP::Patch class which expects a message body
- and response body. It recycles the post method into a patch one,
- that will send the encoded representation to the server.
- Summarizing, a new class has been created, the post method
- extracted into send_entity, including a new argument,
- which defines which class to use (Post or Patch) and
- finally a patch method was created. [ruby-core:30426]
- Patched by Guilherme Silveira
- <guilherme.silveira AT caelum.com.br>
-
-Tue Jun 1 03:46:08 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/readline/extconf.rb: reject GPLv3 readline. [ruby-dev:39172]
- [ruby-core:25272] [ruby-dev:39167] [ruby-core:28736]
-
-Tue Jun 1 01:14:31 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * io.c (pipe_open): add RB_GC_GUARD.
- This caused failure when test/ruby/test_argf.rb is executed with
- GC.stress = true in mswin32_90
-
-Mon May 31 23:44:22 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: use tclConfig.sh/tkConfig.sh when frameworks
- are enabled on MacOS X.
-
- * ext/tk/stubs.c: dirty hack for frameworks and stubs on MacOS X.
-
- * ext/tk/lib/tk.rb: stop creating a dummy Tcl/Tk interpreter.
- And hide a root window before starting eventloop. (for ruby 1.9)
-
- * ext/tk/tcltklib.c: add codes to support Ruby/Tk-Kit (Rubykit).
-
-Mon May 31 21:49:42 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS::Requester#request): rescue ECONNRESET
- for Windows. reported by U.Nakamura. [ruby-dev:41477]
-
-Mon May 31 19:25:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regparse.c (onig_syntax_warn): do not use external strings as
- printf format.
-
-Mon May 31 18:22:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode-set-encoding): skip shebang line
- always regardless of ruby.
-
-Mon May 31 15:07:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (file_expand_path): Refix r28102: this breaks
- r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]
-
-Mon May 31 14:47:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): inspect as ASCII when the codepoint
- of a character in Unicode string is ASCII printable one.
-
-Mon May 31 13:44:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_unicode_p): check the encoding is Unicode
- or not by the name; not function's pointer. [ruby-dev:41479]
-
-Mon May 31 04:03:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): check if expanded dname encoding is
- compatible with fname, not just copying. [ruby-core:30516]
-
- * test/ruby/test_beginendblock.rb (test_endblockwarn): needs
- encoding comment.
-
-Mon May 31 02:17:54 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (defined): respond_to_missing? may not be available
- (for BasicObject instances).
-
-Mon May 31 01:43:42 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/delegate: Delegator: combine (public|protected) methods with
- those of the delegated object. [ruby-core:27224]
- DelegateClass: combine (public|protected) instance methods
- with those of the delegated superclass.
-
-Sun May 30 22:18:49 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/set.rb (keep_if, select!): New methods [ruby-core:29749]
-
-Sun May 30 21:51:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rake/test_application.rb: update a test because of r28089.
-
-Sun May 30 21:48:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/tempfile.rb (Tempfile#unlink): leave @data. Assigning nil to
- @data caused double closing error of the same IO in finalizer. a
- patch from Simon Nicholls. [ruby-core:29395]
-
-Sun May 30 18:47:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: updated to b856dd07.
- this cleans warnings.
-
-Sun May 30 18:25:55 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * load.c (load_failed): use more accurate error message.
- [ruby-core:23851]
-
-Sun May 30 16:54:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * file.c (rb_file_directory_p): update rdoc. a patch from Ilkka
- Laukkanen. [ruby-core:30016]
-
-Sun May 30 14:59:13 2010 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c (gc_mark_all_clear): don't call obj_free() in
- gc_mark_all_clear(), because obj_free() may make T_ZOMBIE
- objects.
-
- * gc.c (gc_clear_mark_on_sweep_slots): renamed.
-
- * gc.c (rb_objspace_call_finalizer): call
- gc_clear_mark_on_sweep_slots() before calling mark_tbl().
- [ruby-dev:41459]
-
-Sun May 30 03:40:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_tokadd_utf8, parser_tokadd_string): allow NUL
- containing symbol literals, as well as String#to_sym.
- [ruby-dev:41447]
-
-Sun May 30 03:03:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/generator/template/darkfish/classpage.rhtml:
- fix encoding value of XML declaration. [ruby-dev:41452]
-
-Sun May 30 02:20:26 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * thread.c (RB_GC_SAVE_MACHINE_CONTEXT), gc.c (ruby_gc_stress_start):
- revert r28078.
-
-Sun May 30 02:21:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
- This caused failure when test/csv is executed with GC.stress = true.
-
-Sun May 30 01:25:48 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * thread.c (RB_GC_SAVE_MACHINE_CONTEXT): start GC
- by switching the thread if gc_stress == true
-
- * gc.c (ruby_gc_stress_start): ditto.
-
-Sun May 30 00:02:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c (force_chain_object, rb_objspace_call_finalizer): delete
- finalizer entry after corresponding finalizer is executed.
- This caused SEGV when test/cgi is executed with GC.stress = true.
-
-Sat May 29 23:30:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (str_replace_shared): change embedded state atomically.
- [ruby-core:29953] [ruby-dev:41456]
-
-Sat May 29 12:56:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encindex): avoid infinite require
- loop. [ruby-core:30467]
-
-Sat May 29 12:05:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (RDoc#read_file_contents): take care of BOM.
- [ruby-dev:41452]
-
-Sat May 29 10:12:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (GC_PROF_TIMER_STOP): regularize `marked' to suppress
- warnings.
-
-Sat May 29 09:34:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/envutil.rb: fix for --disable-gems.
-
-Sat May 29 09:04:06 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS::Requester#request): rescue ECONNREFUSED.
-
-Sat May 29 08:46:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (allocate_sorted_heaps, before_gc_sweep, gc_sweep): removed
- unused variables.
-
-Fri May 28 20:35:21 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * thread.c (blocking_region_begin): avoid RUBY_VM_CHECK_INTS()
- call during GVL state transition. [Bug#3354] [ruby-dev:41435]
-
-Fri May 28 19:37:47 2010 Narihiro Nakamura <authorNari@gmail.com>
-
- * gc.c: use simple lazy sweep algorithm for response performance
- gain. See [ruby-dev:41067].
-
- * object.c: FL_MARK of some objects by lazy sweep is copied when
- RVALUE is cloned. These objects are not marked in the mark phase.
- So delete FL_MARK.
-
- * class.c: ditto.
-
-Fri May 28 18:39:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (sym_inspect): escape ASCII-compatible strings.
-
- * string.c (rb_str_inspect): escape ASCII-compatible strings.
-
-Fri May 28 17:34:48 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * array.c (rb_ary_product): Use tmpary instead, to ensure marking
- arrays by GC.
-
-Fri May 28 11:40:07 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * array.c (rb_ary_product): Do not rely on GC, t0 should be
- checked explicitly.
-
-Fri May 28 10:40:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (checking_for): ignore toplevel.
-
-Fri May 28 00:47:16 2010 Masaya Tarui <tarui@ruby-lnag.org>
-
- * error.c (rb_bug): suppress the error report dialog if report_bug()
- is finished successfully.
-
-Fri May 28 00:32:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * insns.def (invokesuper): check consistency between class of self and
- class of method being invoked by super. This is temporary measure
- for YARV. See [ruby-core:30313] in detail. See [ruby-dev:40959]
- [ruby-dev:39772] [ruby-core:27000] [ruby-core:27230]
-
- * vm_insnhelper.c (vm_search_superclass): ditto.
-
-Thu May 27 23:38:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (rb_home_dir): set filesystem encoding.
-
-Thu May 27 23:29:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (file_expand_path): set encoding as the same of fname
- when _result_ is not filesystem encoding. [ruby-dev:41429]
-
-Thu May 27 23:07:45 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (file_expand_path): use rb_enc_associate_index and
- rb_filesystem_encindex. Strings related FileSystem should
- have filesystem_encoding.
-
- * file.c (SET_EXTERNAL_ENCODING): removed.
-
-Thu May 27 23:03:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_filesystem_encindex): defined.
-
- * include/ruby/encoding.h (rb_locale_encindex): ditto.
-
- * encoding.c (rb_filesystem_encindex): remove static.
-
- * encoding.c (rb_locale_encindex): ditto.
-
-Thu May 27 22:34:27 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): call ReadFile() with len = 0 before
- reading really on console, because the first ReadFile() call after
- PeekConsoleInput() always returns broken data. (Windows's bug).
- [ruby-core:29018]
-
-Thu May 27 12:42:23 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * LGPL: Removed. We no longer have LGPL'd source files in our
- tree.
-
-Wed May 26 20:19:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): add the result of random to the
- beginning of range, not the opposite. [ruby-dev:41415]
-
-Wed May 26 19:55:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (file_expand_path): revert a part of r22392. it's commit miss.
-
-Wed May 26 18:40:23 2010 Masaya Tarui <tarui@ruby-lang.org>
-
- * test/rinda/test_rinda.rb (TupleSpaceTest, TupleSpaceProxyTest):
- kill a used thread at teardown. [ruby-dev:41397]
-
-Wed May 26 12:08:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): subtraction method of non-numeric can
- return Float. [ruby-dev:41410]
-
-Wed May 26 11:50:09 2010 Eric Hodel <drbrain@segment7.net>
-
- * marshal.c (Init_marshal): document marshal_dump and marshal_load.
-
-Wed May 26 10:35:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_large_fd_select): needed on mingw, even
- though fd_mask is not available. [ruby-core:30401]
-
-Tue May 25 14:00:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (add_code_range_to_buf0): fix false negative
- warning when given range is just before previous range.
- [ruby-dev:41406]
-
-Tue May 25 16:37:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-style.el (ruby-style-version): take revision if
- keyword is expanded. [ruby-dev:41408]
-
-Tue May 25 13:26:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/vm.h, include/ruby/encoding.h: add external
- linkage.
-
-Tue May 25 01:46:49 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_f_caller): update rdoc. a patch from Nobuhiro IMAI
- <nov at yo.rim.or.jp> in [ruby-dev:41387].
-
-Mon May 24 23:04:41 2010 Tanaka Akira <akr@fsij.org>
-
- * error.c: fix wrong exception class name in rdoc.
-
-Mon May 24 19:00:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (warn_balanced, parser_yylex): no warnings after closing
- parens.
-
-Mon May 24 12:52:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (change), tool/change_maker.rb: make a brief template
- for ChangeLog.
-
-Mon May 24 09:19:59 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (gc_sweep): suppress a warning on VC.
-
-Mon May 24 08:16:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_f_spawn): use correct command name for the error
- message. [ruby-dev:41395]
-
-Sun May 23 17:48:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/lib/openssl/x509-internal.rb, lib/forwardable.rb,
- lib/irb/cmd/fork.rb, lib/mutex_m.rb,
- lib/shell/process-controller.rb, lib/sync.rb, object.c:
- suppress warnings patched by Benoit Daloze at [ruby-core:30366].
-
- * parse.y (warn_balanced): no warning for singleton class.
- [ruby-core:30366]
-
-Sun May 23 16:56:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
- warnings with -Wconversion.
-
-Sun May 23 07:08:34 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/json/stream.rb: adding a JSON streaming API
-
- * ext/psych/lib/psych/stream.rb: ditto
-
- * ext/psych/lib/psych.rb: using autoload
-
- * ext/psych/lib/psych/json.rb: ditto
-
- * ext/psych/lib/psych/json/tree_builder.rb: refactor
-
- * ext/psych/lib/psych/visitors/json_tree.rb: refactor
-
-Sat May 22 03:53:05 2010 Satoshi Shiba <shiba@rvm.jp>
-
- * cont.c (fiber_setcontext): Use swapcontext() instead longjmp().
- [ruby-dev:41316] [Bug #3295]
-
-Fri May 21 19:11:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_convert, rb_nkf_guess): check too huge
- string.
-
-Fri May 21 18:12:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
- arguments.
-
-Fri May 21 13:55:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBRUBYARG_SHARED): shared library will not be
- created unless enable-shared.
-
- * ruby.c (ruby_init_loadpath_safe): use real path for non-shared
- build.
-
-Fri May 21 12:25:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_float): use dtoa directly instead of stripping
- needless trailing .0.
-
- * numeric.c (flo_to_s): reverted. [ruby-dev:41341]
-
-Fri May 21 01:06:05 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (subtract_tv): if the rest is zero, should finish waiting
- immediately.
-
- * win32/win32.c (subtract): ditto.
- based on a patch from Roger Pack in [ruby-core:27957].
-
-Thu May 20 22:49:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * re.c (rb_reg_s_union_m): update rdoc. [ruby-dev:41354]
-
-Thu May 20 22:08:28 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_f_caller): update rdoc. a patch from Nobuhiro IMAI
- <nov at yo.rim.or.jp> in [ruby-dev:41348].
-
-Thu May 20 22:04:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (vm_backtrace_each): now takes an init function to distinguish
- an empty stack from out of stack. [ruby-dev:41366]
-
- * vm_eval.c (print_backtrace, rb_thread_backtrace): ditto.
-
-Thu May 20 20:47:46 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_invoke): raise NoMethodError
- when COM method is not found. [ruby-core:30160] [Bug #3277]
-
- * test/win32ole/test_win32ole.rb (test_no_method_error): ditto.
-
-Thu May 20 16:17:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/psych/emitter: C99(gcc)-ism.
-
-Thu May 20 12:59:49 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/stream.rb: adding YAML streaming API for
- infinite length streams.
-
- * ext/psych/lib/psych.rb: refactoring for streaming API
-
- * ext/psych/lib/psych/{handler, stream, tree_builder}.rb: ditto
-
-Thu May 20 02:12:20 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/emitter.c: output strings are automatically transcoded
-
-Wed May 19 23:36:57 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: [ruby-dev:41334] [Bug #3307] invalid result
- on searching tcl.h/tk.h. Thanks, Masaya Tarui.
-
-Wed May 19 23:19:30 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (disconnect): closes the socket of a Net::IMAP
- object only when it is not closed. [ruby-dev:41350]
-
-Wed May 19 20:09:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_f_caller): return [] instead of nil when the function
- is called on toplevel. [ruby-dev:41348]
-
-Wed May 19 19:58:01 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: mswin/mingw ruby has socketpair(), but it's
- not exist as such name in ruby static library, so mkmf.rb cannot
- find it.
-
-Wed May 19 19:45:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * iseq_compile_each (NODE_DEFINED): put nil first to fix stack
- consistency. [ruby-core:30293]
- Now, lfinish[0] of defined_expr seems not to be used. Refactoring
- may be needed.
-
-Wed May 19 16:55:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (rb_num2ulong): use rb_big2ulong for data from
- Bignum. Without this 32bit integer on 32bit environment
- can't converted into long.
- This fixes 1) and 2) of [ruby-dev:41289]
-
-Mon May 17 22:19:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * process.c: suppress warning for signed and unsigned type
- inconsistency.
-
- * ext/psych/parser.c: ditto.
-
- * ext/sdbm/_sdbm.c: ditto.
-
- * ext/syck/rubyext.c: ditto.
-
-Mon May 17 21:30:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * .gitignore: updated.
-
-Mon May 17 21:08:53 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (argv_size): merged into join_argv() to maintain the
- agreement with it. removed code has a calculation bug.
- fixed [Bug#2388]
-
- * win32/win32.c (join_argv): calc and return the length of joined
- argv.
- the cause of the original bug was clarified by Masaya TARUI
- <tarui AT prx.jp> and the solution was suggested by him, too.
-
-Mon Apr 5 09:20:08 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/iso_2022_jp.h: add CP50220.
-
- * enc/trans/iso2022.trans: add converter for CP50220.
-
-Mon May 17 09:37:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::Entry_#entries): returns pathname in
- UTF-8 on Windows to allow FileUtils accessing all pathnames
- internally.
-
-Mon May 17 01:07:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (rb_w32_check_imported): workaround for VC6.
-
-Sun May 16 22:21:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (mnew): initialize a field. a patch from Takahiro Kambe.
- [ruby-dev:41312]
-
-Sun May 16 22:17:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (setup_exception): let SystemStackError#backtrace return an
- single element array instead of string itself. [ruby-core:30196]
-
-Sun May 16 21:51:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (parser_read_escape, parser_tokadd_escape): allow a hex or
- octal encoded character after \c. This seemed to be prohibited at
- r13836, but its ChangeLog mentions nothing about this prohibition.
- So I assume this prohibition is not intended. [ruby-core:27229]
-
-Sun May 16 21:14:04 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
- fixes "NoMethodError: undefined method `[]=' for nil:NilClass"
-
-Sun May 16 17:16:09 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (proc_binding): don't propagate filename and line_no of
- binding that is created from C level. [ruby-dev:41322]
-
- * vm_eval.c (eval_string_with_cref): ditto.
-
-Sun May 16 15:09:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (rb_w32_check_imported): check if extension library to be
- loaded imports from different ruby dll.
-
-Sun May 16 14:55:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (dln_find.o): fix dependency.
-
-Sun May 16 13:55:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_loaderror): use locale string, not ascii-8bit.
-
-Sun May 16 11:39:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/missing.h (signbit): add missing prototype.
-
-Sun May 16 10:49:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
- a patch by Masaya TARUI <tarui AT prx.jp>.
-
-Sun May 16 02:24:27 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * configure.in: can not load libruby.so if gcc is used with
- --enable-shared on AIX.
-
-Sat May 15 17:16:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
- errno is not set. [ruby-dev:41317]
-
-Fri May 14 07:27:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_float): strip ".0" from end for rubyspec.
-
-Fri May 14 01:17:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_core.c (rb_thread_struct): add a field for sigaltstack.
-
- * thread_pthread.c (thread_start_func_1): initialize machine stack
- information.
-
- * thread.c (thread_start_func_2): set sigaltstack for each sub thread.
- [ruby-core:24540] [ruby-core:30207]
-
-Thu May 13 21:40:39 2010 Tanaka Akira <akr@fsij.org>
-
- * missing/ffs.c (ffs): fixed for non-zero values.
-
-Thu May 13 18:45:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (get_write_fd): return primary fd if no
- io is tied for writing.
-
-Thu May 13 18:15:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (swallow): should use more_char() instead of fill_cbuf().
- suggested by akr.
-
-Thu May 13 17:56:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (console_set_echo, console_echo_p): use
- primary fd. [ruby-dev:41309]
-
-Thu May 13 13:30:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_float): use minimal representation.
-
- * numeric.c (ruby_dbl2cstr): split from rb_float_new.
-
-Thu May 13 13:09:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_vm_get_sourceline): moved from eval_intern.h for
- vm_dump.c.
-
-Thu May 13 12:53:13 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (swallow): support text mode and UTF-16/32 as internal encoding.
- [Bug #1576]
-
- * io.c (io_shift_cbuf): read and throw it away when str is NULL.
-
-Thu May 13 09:45:27 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: link with ffs.obj.
-
-Thu May 13 07:37:49 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/sdbm/_sdbm.c: include unistd.h before sdbm.h for off_t.
- fix compilation problem on FreeBSD 6.4.
-
-Wed May 12 23:48:37 2010 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_quad_pack): deprecated.
- (rb_quad_unpack): ditto.
-
-Wed May 12 22:22:05 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (rb_big_abs_find_minbit): use ffs().
-
- * configure.in: check ffs().
-
- * missing/ffs.c: new file.
-
- * include/ruby/missing.h (ffs): declared.
-
-Wed May 12 16:43:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_to_s): fixed broken output including nuls.
-
-Wed May 12 16:25:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_to_s): exponent needs 2 digits.
-
-Wed May 12 16:02:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_to_s): fill lower zeros.
-
-Wed May 12 15:45:36 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/generator/ri.rb (generate): should load existing cache
- before generating it.
-
-Wed May 12 15:04:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#log): improved
- precision and performance. [ruby-dev:41295]
-
-Wed May 12 11:39:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/extconf.rb: test all IPPROTO_* constants for recent Win32
- SDK.
-
-Wed May 12 10:57:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_to_s): make minimum string representation.
- [ruby-core:30145]
-
-Wed May 12 09:21:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_initialize_m): fix wrong index for the lang
- option's value 'N'. reported by Masaya TARUI via IRC.
-
-Tue May 11 23:07:22 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: test IPPROTO_IP and IPPROTO_IPV6 constants.
-
- * ext/socket/mkconstants.rb: define macros for enum.
-
- [ruby-dev:38849]
-
-Tue May 11 21:53:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/rake/test_task_arguments.rb: makes ENV empty during tests
- because ENV may change the behavior of Rake::TaskArguments.
- [ruby-core:29984]
-
-Tue May 11 15:14:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_8.c: Add new alias UTF-8-HFS for UTF8-MAC.
- http://www.gnu.org/software/emacs/NEWS.23.2
-
-Tue May 11 13:46:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (atan),
- test/bigdecimal/test_bigmath.rb (test_atan): explicitly specify
- the precision for calculating a reciprocal number of an argument.
- [Bug #3267]
-
-Tue May 11 11:49:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/sdbm/sdbm.h (DBM): large file support on win32.
- [ruby-core:23039]
-
- * ext/sdbm/depend: objects depend on sdbm.h.
-
-Tue May 11 09:57:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_intern.h (rb_vm_get_sourceline): add prototype.
-
-Tue May 11 09:53:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/psych/parser.c (PSYCH_TRANSCODE): get rid of bare use of gcc
- extension.
-
-Tue May 11 01:20:43 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/parser.c (parse): Return strings encoded as
- Encoding.default_internal if set.
-
-Mon May 10 23:50:19 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (pack_unpack): add a missing break.
-
-Mon May 10 14:13:04 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c (rb_big_abs_find_minbit): get rid of a warning of VC.
-
-Mon May 10 13:59:42 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c, include/ruby/win32.h (rb_w32_has_cancel_io): new
- function.
-
- * io.c (WAIT_FD_IN_WIN32): check only when it's not cancelable.
-
-Mon May 10 06:59:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * common.mk (rdoc): rdoc should depend main. Moreover when XRUBY
- is miniruby, it can run after miniruby is built.
-
-Mon May 10 03:36:56 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (eval_string_with_cref): propagate filename and line_no
- of binding. [ruby-dev:38767] [ruby-core:28307]
-
- * vm_core.h (rb_binding_t), proc.c: add filename and line_no fields to
- preserve them.
-
-Mon May 10 02:58:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_compile_each), vm_insnhelper.c (vm_invoke_block,
- vm_throw): allow "return" and "yield" even in singleton class
- definition. based on a patch from wanabe <s.wanabe AT gmail.com>
- for "return". [ruby-core:21379] [ruby-dev:40975]
-
- * insns.def (defineclass): ditto (straightforwardly push block ptr,
- instead of dfp ptr with special flag).
-
- * vm_core.h (RUBY_VM_CLASS_SPECIAL_P): ditto (no longer needed).
-
- * proc.c (proc_new): ditto (remove handling for special flag).
-
- * bootstraptest/test_jump.rb: add tests for above.
-
-Mon May 10 02:29:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c (fiber_switch): raise FiberError when returning to dead
- fiber. [ruby-dev:40833]
-
-Mon May 10 02:07:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/thread.rb (ConditionVariable#wait): ensure to remove the current
- thread from waiters. [ruby-core:29835]
-
-Mon May 10 00:54:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/io/console/console.c (console_set_raw): new method.
-
- * ext/io/console/console.c (ttymode): reverted previous commit.
-
-Sun May 9 23:53:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RB_GC_GUARD_PTR): get rid of removal by
- optimization.
-
-Sun May 9 23:07:53 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (proc_dup): copy blockprocval. proc_dup is used by
- define_method, which made blockprocval be GC'ed mistakenly.
- [ruby-core:30023]
-
-Sun May 9 16:28:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (fiber_initialize_machine_stack_context): try to release
- unnecessary fibers and retry to create. based on a patch from
- masaya tarui at [ruby-dev:41230].
-
-Sun May 9 08:32:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/generator/generator.c (fbuffer_inc_capa):
- fix the use of REALLOC_N. [ruby-dev:41227]
-
-Sun May 9 09:30:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
-
- * ext/json/{generator,parser}/depend: added.
-
-Sun May 9 09:15:03 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/net/imap/test_imap.rb: use IPv4 for
- test_imaps_post_connection_check. [ruby-dev:41189]
-
-Sun May 9 08:24:24 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (disconnect): terminates @receiver_thread even if
- @sock.shutdown raises an exception. [ruby-dev:34881]
-
-Sun May 9 06:15:21 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed
- declarations and code.
-
-Sun May 9 02:57:02 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
- yet. [ruby-core:30095]
-
-Sun May 9 01:15:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (stackgrowdirection): removed duplicated code, use
- STACK_UPPER macro instead.
-
- * gc.h (STACK_DIR_UPPER): moved from thread_pthread.c.
-
-Sun May 9 00:35:56 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/dl/test_base.rb (libc_so, libm_so): supports solaris.
-
-Sat May 8 19:03:31 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * spec/default.mspec (config): . is no longer in $:.
-
-Sun May 9 00:27:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_aset): fixed argument type.
-
-Sat May 8 23:09:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS (io/console): IO#noecho and IO#raw without block are
- obsolete already. [ruby-dev:41226]
-
- * ext/io/console/console.c (ttymode): save duped file descriptors
- and restore tty modes using them, so that original modes can be
- restored even if original fds are closed. [ruby-dev:41225]
-
-Sat May 8 13:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * array.c (rb_ary_fetch, rb_ary_splice, rb_ary_store): Improve
- IndexError
- messages [ruby-core:28394]
-
- * hash.c (rb_hash_fetch_m): Improve KeyError message
-
-Sat May 8 13:11:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/user_interaction.rb (Gem::StreamUI#ask_for_password):
- use io/console.
-
- * ext/io/console: imported. [ruby-dev:40897]
-
-Sat May 8 12:25:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_systmpdir): moved from ext/tmpdir.
-
- * ext/etc/etc.c (etc_sysconfdir): added.
-
- * lib/rubygems/config_file.rb, lib/tmpdir.rb: use etc.
-
-Sat May 8 11:07:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpAlloc): ensure buf does not get
- collected. based on a patch masaya tarui at [ruby-dev:41213].
-
-Sat May 8 10:03:39 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (BasicSocket#connect_address): MacOS X 10.6
- returns "::ffff:a.b.c.d" for IPv4-mapped IPv6 address.
- [ruby-dev:41215] patch by Tomoyuki Chikanaga.
-
-Fri May 7 23:51:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * version.h: bump up to 1.9.3.
-
-Fri May 7 11:30:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/rbinstall.rb (install-man): install mdocs directly without
- temporary files. [ruby-dev:41204]
-
-Fri May 7 09:16:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/extconf.rb (get_tclConfig_dirs): glob with EXEEXT.
-
- * ext/tk/extconf.rb (search_tclConfig): fixed typo.
-
-Fri May 7 06:45:28 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: search directories on PATH, only if containing
- tclsh or wish command (probably right fix for [ruby-core:30010]).
-
-Fri May 7 03:40:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpCtoV): fix to check overflow.
-
-Thu May 6 22:19:38 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * cont.c: define FIBER_USE_NATIVE only when _WIN32_WINNT >= 0x0400
- on Windows because Fiber APIs are supported only such building
- (and running) environments.
- [ruby-dev:41192]
-
-Thu May 6 19:13:43 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/openssl/test_ec.rb: added test_dsa_sign_asn1_FIPS186_3. dgst is
- truncated with ec_key.group.order.size after openssl 0.9.8m for
- FIPS 186-3 compliance.
-
- WARNING: ruby-openssl aims to wrap an OpenSSL so when you're using
- openssl 0.9.8l or earlier version, EC.dsa_sign_asn1 raises
- OpenSSL::PKey::ECError as before and EC.dsa_verify_asn1 just returns
- false when you pass dgst longer than expected (no truncation
- performed).
-
- * ext/openssl/ossl_pkey_ec.c: rdoc typo fixed.
-
-Thu May 6 18:12:43 2010 Koichi Sasada <ko1@atdot.net>
-
- * cont.c (fiber_setcontext): Fix last commit.
-
-Thu May 6 17:16:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (rb_localtime_r2): get rid of infinite loop bug of
- localtime() on x86_64-darwin. [ruby-core:30031]
-
-Thu May 6 15:56:12 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/fiddle/*: Adding fiddle library to wrap libffi
- * test/fiddle/*: testing fiddle extension
- * ext/dl/lib/dl.rb: Requiring fiddle if it is available
- * ext/dl/lib/dl/callback.rb: using Fiddle if it is available
- * ext/dl/lib/dl/func.rb: ditto
-
-Thu May 6 15:04:37 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_match_m): add description about optional
- position parameter. [ruby-list:47064]
- patched by KISHIMOTO, Makoto <ksmakoto AT dd.iij4u.or.jp>
-
-Thu May 6 14:12:39 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/tmpdir.rb: test RUBY_PLATFORM for loading tmpdir.so to avoid
- LoadError.
-
-Thu May 6 12:41:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * NEWS: add rationalize methods of Complex, Float, Integer, NilClass,
- and Rational classes.
-
-Thu May 6 12:12:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README: update.
-
-Thu May 6 03:34:29 2010 Koichi Sasada <ko1@atdot.net>
-
- * cont.c: apply FIBER_USE_NATIVE patch. This patch improve
- Fiber context switching cost using system APIs. Detail comments
- are written in cont.c.
-
-Thu May 6 02:16:48 2010 Koichi Sasada <ko1@atdot.net>
-
- * vm_method.c (rb_unlink_method_entry, rb_sweep_method_entry):
- added. Unlinked method entries are collected to
- vm->unlinked_method_entry_list. On the GC timing, mark all method
- entries which are on all living threads. Only non-marked method
- entries are collected. This hack prevents releasing living method
- entry.
- [Performance Consideration] Since this Method Entry GC (MEGC)
- doesn't occur frequently, MEGC will not be a performance bottleneck.
- However, to traverse living method entries, every control frame push
- needs to clear cfp->me field. This will be a performance issue
- (because pushing control frame is occurred frequently).
- Bug #2777 [ruby-dev:40457]
-
- * cont.c (fiber_init): init cfp->me.
-
- * gc.c (garbage_collect): kick rb_sweep_method_entry().
-
- * method.h (rb_method_entry_t): add a mark field.
-
- * vm.c (invoke_block_from_c): set passed me.
-
- * vm.c (rb_thread_mark): mark cfp->me.
-
- * vm_core.h (rb_thread_t): add a field passed_me.
-
- * vm_core.h (rb_vm_t): add a field unlinked_method_entry_list.
-
- * vm_insnhelper.c (vm_push_frame): clear cfp->me at all times.
-
- * vm_insnhelper.c (vm_call_bmethod): pass me.
-
- * bootstraptest/test_method.rb: add a test.
-
-Wed May 5 22:22:51 2010 wanabe <s.wanabe@gmail.com>
-
- * compile.c (iseq_set_sequence): fix check range of ic_index.
- a patch from Tomoyuki Chikanaga. #3236
-
-Wed May 5 21:49:31 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * dln.c (aix_loaderror): use execerror for load error on AIX.
- This can avoid SEGV reported by Perry Smith. [Bug #2063]
-
-Wed May 5 20:37:54 2010 wanabe <s.wanabe@gmail.com>
-
- * thread_win32.c (w32_wait_events): get GVL before handle interrupt
- event. [ruby-core:27199], [ruby-core:29698]
-
-Wed May 5 19:00:01 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: revert. enbugged by last commit.
- ([ruby-dev:41133], [ruby-dev:41134], [ruby-core:30010])
-
- * ext/tk/README.tcltklib: ditto.
-
-Wed May 5 15:54:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_stat): use STAT macro instead of calling stat() directly.
- reported by Bill Kelly. [ruby-core:30012]
-
-Wed May 5 11:43:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/test_io.rb (megacontent-copy_stream): get rid of
- deadlock.
-
-Wed May 5 07:27:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_mark_method_entry): renamed.
-
-Wed May 5 05:20:27 2010 Koichi Sasada <ko1@atdot.net>
-
- * method.h, vm_method.c: rename some internal functions related to
- rb_method_entry_t.
- rb_add_method_me() -> rb_method_entry_set().
- rb_get_method_entry() -> rb_method_entry_without_cache().
- rb_gc_mark_method_entry() -> rb_mark_method_entry().
-
- * class.c, proc.c: ditto.
-
-Tue May 4 22:59:48 2010 wanabe <s.wanabe@gmail.com>
-
- * compile.c (iseq_build_body): update iseq->ic_size.
- a patch from Tomoyuki Chikanaga. see #3236.
-
-Tue May 4 18:51:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (name_err_mesg_to_str): preserve encoding of inspection.
- [ruby-core:29948]
-
-Tue May 4 18:38:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/fileutils/test_fileutils.rb (test_copy_stream):
- IO.copy_stream support binmode only currently.
- [ruby-core:23724]
-
-Tue May 4 12:46:09 2010 Koichi Sasada <ko1@atdot.net>
-
- * vm_insnhelper.c (argument_error): push correct backtrace.
- Bug #2281 [ruby-core:26333]
-
-Tue May 4 12:38:40 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/option.c (sockopt_inspect): use rb_str_cat2 and
- rb_str_append.
-
- * ext/socket/ancdata.c (ancillary_inspect): refined.
-
-Tue May 4 11:48:06 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/ancdata.c (ancillary_inspect): use rb_str_cat2 and
- rb_str_append.
-
-Tue May 4 07:52:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/net/http.rb (Net::HTTPResponse#read_chunked): ensure to skip the
- last newline of chunk. [ruby-core:29229]
-
- * test/net/http/utils.rb: add an option for chunked response test.
-
- * test/net/http/test_http.rb: add tests for chunked response.
-
-Tue May 4 03:37:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: Update nkf 2010-04-28.
-
-Mon May 3 21:08:16 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * sample/README: update file list. [ruby-core:28981]
-
-Mon May 3 08:15:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/emitter.c (syck_scan_scalar): set SCAN_WHITEEDGE flag
- when scalar begins with newline. patches from Dave B <daz AT
- d10.karoo.co.uk> at [ruby-core:23019] and caleb clausen at
- [ruby-core:25851]. [ruby-core:23006][ruby-core:29925]
-
-Sun May 2 17:52:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/task.rb (RDoc::Task): should not override newer code.
-
-Sun May 2 17:25:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_call): ignore signedness.
-
-Sun May 2 12:04:30 2010 wanabe <s.wanabe@gmail.com>
-
- * iseq.c (iseq_load): allow filepath to be nil.
- a patch from Tomoyuki Chikanaga in [Bug #3229].
-
-Sun May 2 08:54:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/cgi.rb (CGI::NEEDS_BINMODE): check if O_BINARY value instead
- of fragile check by platform name.
-
-Sun May 2 07:38:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (dir_config): should not modify argument arrays
- themselves.
-
-Sat May 1 22:53:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#size): stat by path name when it is
- closed.
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- keep the first trace.
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- fixed filtering. [ruby-core:29908]
-
-Sat May 1 16:46:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_IsInfinite): don't use
- non-ascii character.
-
-Sat May 1 14:08:29 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/server.rb: Fix bug when serving gems.
-
-Sat May 1 14:05:36 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Upgrade to RDoc 2.5.8.
-
-Sat May 1 09:43:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- filter out traces in minitest directory. [ruby-core:29908]
-
-Sat May 1 06:42:57 2010 wanabe <s.wanabe@gmail.com>
-
- * win32/win32.c: add declaration of wstati64 for gcc.
-
-Sat May 1 02:41:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * merge some patches from win32-unicode-test branch.
- see #1685.
-
- * file.c, include/ruby/intern.h (rb_str_encode_ospath): new function
- to convert encoding for pathname.
-
- * win32.c, include/ruby/win32.h (rb_w32_ulink, rb_w32_urename,
- rb_w32_ustati64, rb_w32_uopen, rb_w32_uutime, rb_w32_uchdir,
- rb_w32_umkdir, rb_w32_urmdir, rb_w32_uunlink): new functions to
- accept UTF-8 path.
-
- * win32/win32.c (rb_w32_opendir, link, rb_w32_stati64, rb_w32_utime,
- rb_w32_unlink): use WCHAR path internally.
-
- * file.c (rb_stat, eaccess, access_internal, rb_file_s_ftype,
- chmod_internal, rb_file_chmod, rb_file_chown, utime_internal,
- rb_file_s_link, unlink_internal, rb_file_s_rename): use UTF-8 version
- functions on Win32.
-
- * file.c (apply2files, rb_stat, rb_file_s_lstat, rb_file_symlink_p,
- rb_file_readable_p, rb_file_writable_p, rb_file_executable_p,
- check3rdbyte, rb_file_identical_p, rb_file_chmod, rb_file_chown,
- rb_file_s_link, rb_file_s_symlink, rb_file_s_rename): call
- rb_str_encode_ospath() before passing the path to system.
-
- * io.c (rb_sysopen): ditto.
-
- * dir.c (dir_chdir, dir_s_mkdir, dir_s_rmdir): ditto.
-
-Sat May 1 00:26:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- assertion message must be String or Proc. suggested by caleb
- clausen at [ruby-core:29884].
-
-Sat May 1 00:14:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_io.rb: skip false tests on Windows.
- [ruby-core:29886]
-
-Fri Apr 30 22:46:27 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * math.c: Math::DomainError < StandardError [ruby-core:29855]
-
-Fri Apr 30 21:40:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/test_open3.rb (TestOpen3#test_commandline): use simple
- command via shell. [ruby-dev:41100]
-
-Fri Apr 30 15:38:45 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: better support for MinGW environment.
-
-Fri Apr 30 12:05:20 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c (file_expand_path): call rb_str_set_len before BUFCHECK to
- prevent rb_str_resize in BUFCHECK discard the content.
-
-Fri Apr 30 11:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * string.c (rb_str_sub_bang): String#sub! now raises an error when
- called on a frozen string, even if no change is made.
- See [ruby-core:23657]
-
-Fri Apr 30 11:40:44 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * eval.c (make_exception, rb_obj_extend): Fix error messages in case
- of wrong
- number of arguments
-
- * file.c (rb_f_test, rb_file_s_umask): ditto
-
- * numeric.c (int_chr, num_step): ditto
-
- * process.c (rb_f_sleep): ditto
-
- * re.c (rb_reg_initialize_m): ditto
-
- * signal.c (rb_f_kill, sig_trap): ditto
-
- * string.c (rb_str_aref_m, rb_str_aset_m, rb_str_count,
- rb_str_delete_bang,
- rb_str_slice_bang, rb_str_sub_bang, str_gsub): ditto
-
- * proc.c (curry): rdoc fix
-
-Fri Apr 30 04:09:30 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c (TIMET_MAX): should be time_t, not unsigned_time_t.
-
-Fri Apr 30 03:59:08 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c (rb_time_unmagnify_to_float): should cast.
-
-Fri Apr 30 03:38:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (fix_mul): the width of fixnum is same as long's on all
- platforms.
-
-Fri Apr 30 03:17:20 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Improve algorithm for Matrix#determinant and
- Matrix#rank
- {determinant,det,rank}_e are now deprecated. [ruby-core:28273]
- Also fixes a bug in Determinant#rank (e.g. [[0,1][0,1][0,1]])
- Matrix#singular?, Matrix#regular? now raise on rectangular matrices
- and use determinant instead of rank.
-
-Fri Apr 30 00:52:56 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): define some constants to select
- collect code for win64.
-
-Thu Apr 29 20:10:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/test_open3.rb (test_commandline): use dump instead of
- shellwords. [ruby-core:23797]
-
-Thu Apr 29 18:39:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/thwait.rb (ThreadsWait#join): refined rdoc again.
- [ruby-core:29863] [ruby-dev:41092]
-
-Thu Apr 29 14:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby: use more descriptive assertions.
-
- * test/ruby: fixed nonsense assertions.
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
- reverted. [ruby-core:29872]
-
-Thu Apr 29 12:33:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/thwait.rb (ThreadsWait#join): refined rdoc. [ruby-core:29863]
-
-Thu Apr 29 12:16:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): reject
- non-boolean values. [ruby-core:29868]
-
-Thu Apr 29 11:20:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (seek_before_access): renamed. see [ruby-core:29861].
-
- * io.c (rb_io_s_binread): fixed rdoc. parts of a patch from Roger
- Pack in [ruby-core:29861].
-
-Thu Apr 29 03:50:49 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/xmlrpc/utils.rb: Fixing an incompatibility with
- reflection methods returning Symbols. Patch by
- HD Moore. [ruby-core:29821]
-
-Wed Apr 28 23:53:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/thwait.rb: revise rdoc. a patch from Roger Pack in
- [ruby-core:27362].
-
-Wed Apr 28 23:21:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: Update to JSON 1.4.2.
-
-Wed Apr 28 22:53:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread. (rb_thread_terminate_all): revert r24591 which caused SEGV
- sometimes. [ruby-dev:40936] [ruby-core:27245] [ruby-core:27416]
-
-Wed Apr 28 22:26:55 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/psych/visitors/test_yaml_tree.rb (test_struct_const): remove
- Struct::Foo which affects test/ruby/test_struct to warn redefining
- constant.
-
-Wed Apr 28 18:04:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_timespec): use rb_check_funcall.
-
-Wed Apr 28 17:14:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/extconf.rb: CMSG_ macros are broken on 64bit darwin,
- because of use of __DARWIN_ALIGN.
-
-Wed Apr 28 16:44:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h ({RSTRING,RSTRUCT,RBIGNUM}_LENINT): check long
- to cast to int.
-
-Wed Apr 28 16:28:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/unixsocket.c (sendmsg_blocking, recvmsg_blocking):
- define only when used.
-
- * ext/socket/rubysocket.h: non-implemented method definitions need
- to be shared.
-
-Wed Apr 28 10:27:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vsnprintf.c (ruby_vsnprintf, ruby_snprintf): suppress warnings.
- why return int in spite of the arguments of size_t?
-
-Wed Apr 28 09:49:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/compile_prelude.rb: enable optimization.
-
-Wed Apr 28 09:43:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (warn_balanced): do not warn for EXPR_ENDFN.
-
-Tue Apr 27 23:57:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (ruby_cleanup): add exception guard around code running
- signal handler (of r27513). Absence of the guard made
- bootstraptest/test_thread.rb fail sometimes.
-
-Tue Apr 27 22:55:29 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * insns.def (onceinlinecache): add exclusion control for a region
- between onceinlinecache and setinlinecache. [ruby-dev:39768]
-
-Tue Apr 27 22:40:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * iseq.c (set_relation): do not use top_wrapper as bottom of cref,
- which caused constant lookup error when "wrapped load" is used;
- instead, use Object as bottom, and push top_wrapper on Object.
- [ruby-core:25039]
-
-Tue Apr 27 21:24:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (ruby_cleanup): before cleanup, check signal buffer and run
- handler if any. [ruby-core:20970]
-
- * thread.c (rb_threadptr_check_signal): separated from
- timer_thread_function.
-
-Tue Apr 27 18:00:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP#rcptto_list): fixed typo.
- [ruby-core:29809]
-
-Tue Apr 27 12:44:23 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Import RDoc 2.5.7. Fixes #1318 and ruby-core:29780.
-
-Tue Apr 27 10:54:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_read_escape): deny extra character escapes.
- [ruby-core:27228]
-
-Tue Apr 27 06:20:13 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c (select_internal): IO which cbuf is not empty is readable.
-
-Tue Apr 27 00:07:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (program): check void_expr when rb_parse_in_main().
- [ruby-dev:38717]
-
-Mon Apr 26 20:11:05 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c, rational.c, lib/cmath.rb, lib/date.rb lib/date/delta*:
- reverted r27484-27486. now official spec.
-
-Mon Apr 26 15:42:59 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get rid
- of a warning.
-
-Mon Apr 26 13:11:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (ripper_get_value): escape Qundef.
-
-Mon Apr 26 12:42:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (warn_balanced): warn according to last state.
-
-Mon Apr 26 09:05:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json: Update to JSON 1.4.1.
-
-Sun Apr 25 23:50:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (ruby_dup): update max fd.
-
-Sun Apr 25 21:56:49 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (fetch_internal): do not quote message data item
- names. Thanks, Eric Hodel. [ruby-core:23508]
-
-Sun Apr 25 15:59:02 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb: reverted experimental r23900.
-
-Sun Apr 25 15:51:00 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c, rational.c: reverted experimental r24565.
-
-Sun Apr 25 15:34:48 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/delta*: reverted experimental r24567 and
- r25393.
-
-Sun Apr 25 11:02:20 2010 wanabe <s.wanabe@gmail.com>
-
- * hash.c (ruby_setenv): putenv on msvcrt.dll can't remove empty value.
-
-Sat Apr 24 23:40:50 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb: use [""].pack("p").size to detect the pointer size.
-
-Sat Apr 24 21:07:27 2010 Tanaka Akira <akr@fsij.org>
-
- * test/psych/test_psych.rb: don't leave temporary files.
-
-Sat Apr 24 16:27:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (RUBY_PROGRAM_VERSION): added
-
- * tool/rbinstall.rb: expand target file name.
-
- * template/fake.rb.in: no need for hook if extmk.
-
-Sat Apr 24 14:40:20 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c: raise IOError when byte oriented operations occur with
- non-empty character buffer.
- [ruby-dev:40493] [ruby-dev:40506]
-
-Sat Apr 24 13:06:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (get_arglen): skip the last terminator of argv before
- checking environ.
-
- * ruby.c (get_arglen): duplicate environ area if setenv and unsetenv
- are provided.
-
- * ruby.c (set_arg0): keep empty strings.
-
-Sat Apr 24 09:44:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):
- removed wrong extra assignments. a patch from Marcus Rueckert
- <darix AT opensu.se> at [ruby-core:29759].
-
-Sat Apr 24 00:41:52 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * process.c (rb_f_fork): remove after_exec() which sometimes caused
- two timer threads started. [ruby-core:25217]
-
- * signal.c: use pthread_sigmask() instead of sigprocmask().
- sigprocmask() is unspecified behavior on multi-thread programs.
- [ruby-core:25217]
-
-Sat Apr 24 00:36:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/dl/test_base.rb: add kfreebsd support. based on a patch from
- Petr Salinger in [ruby-core:29769].
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560293
-
-Sat Apr 24 00:14:41 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_ssl_session.c (SSL_SESSION_cmp): remove static for
- loopy version of openssl (0.9.8l?).
-
-Fri Apr 23 23:27:17 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/openssl/ossl_config.c: fix compilation failure with
- OpenSSL 0.9.8.
-
-Fri Apr 23 17:29:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_config.c: OpenSSL 1.0.0 support.
- [ruby-core:29256]
-
- * ext/openssl/extconf.rb: check some functions added/removed at
- OpenSSL 1.0.0.
-
- * ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which
- exists.
-
- * ext/openssl/ossl_ssl_session (SSL_SESSION_cmp): removed at 1.0.0,
- so implement compatible function here.
-
-Fri Apr 23 14:37:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gem_prelude.rb (Gem::QuickLoader.load_full_rubygems_library):
- get rid of creating same regexps many times.
-
- * lib/rubygems/custom_require.rb (Kernel#require): ditto.
-
-Fri Apr 23 14:07:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * doc/etc.rd, doc/etc.rd.ja: moved from ext/etc.
-
- * ext/etc.c (Init_etc): fixed rdoc.
-
-Fri Apr 23 11:31:25 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Update to RDoc 2.5.6.
-
-Fri Apr 23 04:11:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ripper/test_parser_events.rb (test_unterminated_regexp):
- separate test.
-
-Fri Apr 23 01:47:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_wopen): shouldn't use FILE_FLAG_OVERLAPPED with
- normal file. #1807, #2510, #2549
-
-Fri Apr 23 01:28:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (ubf_handle): remove unused typedef.
-
-Thu Apr 22 23:10:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (mnew): fix wrong error message when Kernel#public_method
- receives name of private method. [Bug #2425]
-
-Thu Apr 22 22:56:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bootstraptest/test_thread.rb: fix test. [Bug #2342]
-
-Thu Apr 22 21:50:17 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/ext/multi-irb.rb: fix multi-irb running
- parallelly. [ruby-dev:41031] [Bug #3182]
-
-Thu Apr 22 17:13:34 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems: Import RubyGems 1.3.7.pre.1 (as 1.3.6.1).
-
-Thu Apr 22 16:43:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (warn_balanced): removed false warning.
-
- * parse.y (parser_yylex): skip whitespaces after method name.
-
-Wed Apr 22 02:16:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * ext/bigdecimal/bigdecimal.[ch]: replace _DEBUG with BIGDECIMAL_DEBUG
- to prevent activating debugging code when compiled with -DEBUG flag
- on Windows. [ruby-core:22989] #1308
-
-Wed Apr 21 21:24:20 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/sha2/extconf.rb: check SHA256_CTX and SHA512_CTX to fix
- compilation failure on OpenBSD 4.4.
-
-Wed Apr 21 15:13:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_getc): fix incomplete character immediately before EOF
- with newline converter. [ruby-dev:41024]
-
-Wed Apr 21 13:44:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (regexp): check each fragments. [ruby-core:27374]
-
-Wed Apr 21 13:36:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): reverted r27388 due to backward
- compatibility.
-
- * parse.y (parser_yylex): warn confusing binary operators after
- local variable.
-
-Wed Apr 21 11:53:47 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Update to RDoc 2.5.5. Fixes bugs in ri, Darkfish and
- rdoc option handling.
-
-Wed Apr 21 11:31:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): abandoned EXPR_VCALL.
-
-Wed Apr 21 03:17:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (io_getc): set read_encoding to resulted one character
- string. [ruby-dev:41023]
-
-Wed Apr 21 00:29:39 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (bigmul1_karatsuba): fix calculation order to prevent
- underflow. [ruby-core:29088]
-
-Wed Apr 21 00:26:17 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (NODE_NEXT, NODE_REDO): add dummy putnil instruction to
- fix stack consistency error. [ruby-core:28172]
-
- * bootstraptest/test_jump.rb: add a test for above.
-
-Wed Apr 21 00:16:44 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/zlib/zlib.c (rb_deflate_params): update buf_filled count because
- deflateParams writes to out buffer. And, revert r18029 because the
- flush was not needed now and emits garbage. [ruby-dev:40802]
-
-Wed Apr 21 00:01:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_method.c (rb_add_method_def): decrement alias count of
- rb_method_definition_t to prevent memory leak. see
- [ruby-dev:41021].
-
-Tue Apr 20 21:33:06 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/win32/lib/win32/registry.rb (PredefinedKey#create): root key
- name should be a string. fixed [ruby-core:28192]
-
-Tue Apr 20 19:25:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): fix for tLPAREN_ARG.
-
-Tue Apr 20 12:34:23 2010 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/{core, util}.rb (RFC822_DAYS, RFC822_MONTHS):
- move the constant because used only util.rb.
-
-Tue Apr 20 12:24:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (lex_state_e, IS_END, IS_SPCARG, parser_yylex): separate
- the state after vcall. [ruby-core:29578]
-
-Tue Apr 20 01:03:00 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bootstraptest/test_fork.rb: add a test for [ruby-core:28924].
-
-Tue Apr 20 00:43:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_extname): skip last directory separators.
- [ruby-core:29627]
-
-Tue Apr 20 00:41:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (internal_{read,write}_func, rb_{read,write}_internal):
- reverted r27265, since now rb_thread_blocking_region() preserves
- errno.
-
-Mon Apr 19 23:14:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_thread_blocking_region, rb_thread_blocking_region_end):
- preserve errno. [Bug #2606] [ruby-core:28924]
-
-Mon Apr 19 19:41:10 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::cp_r): backport r11156 from ruby_1_8.
-
-Mon Apr 19 19:18:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): reduced duplicated conditions.
-
-Mon Apr 19 13:58:04 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Update to RDoc 2.5.4. Fixes #3169, #3160, #3023.
-
-Mon Apr 19 12:46:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/timeout.rb (Timeout#timeout): propagate errors to the
- caller. [ruby-dev:41010]
-
-Mon Apr 19 00:27:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_method.c (rb_add_method_def): workaround fix for redefinition
- of methods. This is because cfp->me uses the rb_method_entry
- which is freed by redefinition of remove_method. Note that
- reusing may cause another problem when the usage is changed.
- [ruby-core:27320] [ruby-core:29464]
-
-Sun Apr 18 22:13:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (string_content): cond_stack and cmdarg_stack are VALUE.
-
-Sun Apr 18 18:07:47 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255.
- [ruby-core:29501]
-
-Sun Apr 18 12:48:51 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): seems like a symbol-literal when spaces
- are unbalanced. [ruby-core:29578]
-
-Sun Apr 18 12:32:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (string_content): preserve cond_stack and cmdarg_stack.
- [ruby-core:29579]
-
-Sun Apr 18 05:50:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/visitors/yaml_tree.rb: defaulting binary string
- format to "literal" format.
-
-Sun Apr 18 02:13:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb (identify_identifier): add '_' to the regexp.
-
-Sat Apr 17 23:21:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: use AC_TRY_LINK instead of AC_TRY_COMPILE.
- On Solaris it can compile with signbit but can't link.
-
-Sat Apr 17 20:34:09 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/envutil.rb: update Gem::ConfigMap to fake environment for
- tests. Some test of rubygems had failed because envutil.rb changed
- only RbConfig::CONFIG but not Gem::ConfigMap.
-
-Sat Apr 17 20:31:08 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/irb/ruby-lex.rb (identify_identifier): allow multibyte character
- as identifier. [ruby-core:27275]
-
-Sat Apr 17 09:19:27 2010 wanabe <s.wanabe@gmail.com>
-
- * compile.c (iseq_compile_each): fix splat condition in NODE_WHEN.
- [Bug #2226]
-
-Sat Apr 17 08:57:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP#rcptto_list): continue when at least
- one RCPT is accepted. based on a patch from Kero van Gelder at
- [ruby-core:26190].
-
-Sat Apr 17 07:43:55 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/thread/test_queue.rb (TestQueue#grind): fix typos.
-
-Sat Apr 17 07:27:53 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add Array#repeated_{combination,permutation} [Feature #2981]
-
-Sat Apr 17 05:30:22 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/core_ext.rb (yaml_as): supporting deprecated
- "yaml_as" method
- * ext/syck/lib/syck/tag.rb: ditto
-
-Sat Apr 17 05:25:15 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/coder.rb (scalar): supporting deprecated methods
- * ext/psych/lib/psych/deprecated.rb: supporting deprecated
- to_yaml_properties method
-
-Sat Apr 17 01:32:50 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (rb_io_rewind, rb_io_eof): add rdoc. based on a patch from
- Roger Pack in [ruby-core:26771] [Bug #2377].
-
-Fri Apr 16 23:42:56 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_folderitem2_invokeverb.rb (test_invokeverb):
- run test only when "Create Shortcut (&S)" menu is found.
- [ruby-core:29550] [Bug #1602]
-
-Fri Apr 16 21:52:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (string_content, etc): counts of CMDARG_PUSH and POP were
- inconsistent. [ruby-core:22637]
-
-Fri Apr 16 21:27:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): revert r23389,
- which not only is unnecessary but also causes the inconsistency of
- return type. [ruby-core:25706] [Bug #2129]
-
-Fri Apr 16 20:05:24 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/thread.rb (Queue#push, #pop, SizedQueue#push, #pop): remove
- code that kicks waiting thread twice, which caused race and
- deadlock. a patch from James M. Lawrence. [ruby-core:25537]
-
- * test/thread/test_queue.rb: added.
-
-Fri Apr 16 20:01:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * .gitignore: updated.
-
-Fri Apr 16 16:51:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/file2lastrev.rb (VCS::SVN::get_revisions.): remind about
- DOSISH, sometimes.
-
-Fri Apr 16 16:15:40 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_repeated_permutation): new method added. a patch
- from Makoto Kishimoto in [ruby-core:29267] [ruby-core:28724]
-
- * array.c (rb_ary_repeated_combination): ditto.
-
-Thu Apr 15 22:41:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (rb_thread_priority, rb_thread_priority_set): fix rdoc.
- Lower-priority thread may run even if there are higher-priority
- threads. See [ruby-dev:40977].
-
-Thu Apr 15 22:33:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/uri/ftp.rb (URI::FTP#set_path): added to correct handling of
- special case where path of ftp is relative. This converts relative
- path to absolute one, because external representation of ftp path is
- relative and internal representation is absolute. [ruby-core:24077]
-
- * lib/uri/ftp.rb (URI::FTP#initialize): converts absolute to relative.
-
- * lib/uri/generic.rb (URI::Generic#check_path): allow relative path
- when scheme is ftp.
-
-Thu Apr 15 21:54:39 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/file2lastrev.rb: use backtick for ruby 1.8.
-
-Thu Apr 15 21:13:29 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/file2lastrev.rb: this should run with ruby 1.8.
-
-Thu Apr 15 20:41:10 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/file2lastrev.rb: make -q effective for files not version
- controlled.
-
-Thu Apr 15 14:50:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_backtrace_each): get rid of use of malloc from signal
- handler by using ruby_engine_name. [ruby-core:29497]
-
- * vm_eval.c (print_backtrace): file may be nil when segfaulted in
- very early stage.
-
- * vm_dump.c (bugreport_backtrace): ditto.
-
-Thu Apr 15 11:51:49 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (help): small fix.
-
-Wed Apr 14 22:09:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/source.rb: force_encoding("UTF-8") when the input
- is already UTF-8. patched by Kouhei Sutou [ruby-core:23404]
-
-Wed Apr 14 18:23:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * configure.in (signbit): signbit is a macro in C99.
-
-Wed Apr 14 17:56:06 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_shift_cbuf): should terminate.
- http://golf.shinh.org/p.rb?DECimal+number+to+BINary#Ruby
-
-Wed Apr 14 16:29:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (GET_STACK_BOUNDS): fixed macro argument names. a patch from
- Satoshi Shiba <shiba AT rvm.jp> at [ruby-dev:40973].
-
- * gc.h (ruby_get_stack_grow_direction): fixed prototype.
-
- * thread_pthread.c (get_stack, ruby_stack_overflowed_p): both side
- should be same type. [Bug #3145]
-
-Wed Apr 14 15:58:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_string_value_cstr): make NUL terminated if it is
- not done.
-
-Wed Apr 14 12:56:21 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap (encode_utf7): encode & properly. Thanks, Kengo
- Matsuyama. [ruby-dev:38063]
-
-Wed Apr 14 11:39:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/lib/syck/basenode.rb (Syck::BaseNode#match_path): fixed
- library name.
-
- * ext/syck/lib/yaml/syck.rb: split from ext/syck/lib/syck.rb for
- backward compatibility.
-
-Wed Apr 14 09:24:07 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: Refix [nkf-bug:21393]. (explicit -X)
-
-Tue Apr 13 20:36:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: Fix: Windows Codepages wrongly convert
- Halfwidth Katakana. [nkf-bug:21393]
-
-Tue Apr 13 15:00:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (make_seed_value): fix leading-zero-guard condition on
- bdigit is smaller than 32bit.
-
-Tue Apr 13 13:57:36 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/completion.rb (CompletionProc): fix [ruby-dev:40953]
- [Bug #3126]. Thanks Kazuhiro NISHIYAMA.
-
-Tue Apr 13 09:32:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (transcode_loop): insert output the value when
- fallback hash has a related key. [ruby-dev:40540]
- [ruby-dev:40829] #3036
-
- * transcode.c (rb_econv_prepare_opts): pass to newhash
- a value with the key :fallback.
-
-Tue Apr 13 00:12:04 2010 Tanaka Akira <akr@fsij.org>
-
- * random.c (rand_init): use the absolute value of seed to
- make srand(-2**40) portable with 32bit and 64bit.
- [ruby-core:29292](2)
-
-Mon Apr 12 22:48:47 2010 Tanaka Akira <akr@fsij.org>
-
- * enumerator.c (inspect_enumerator): don't raise for uninitialized
- enumerator.
-
-Mon Apr 12 21:47:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * LEGAL: separated the section for parse.c. contributed by Paul
- Betteridge in [ruby-core:29472].
-
-Mon Apr 12 09:19:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (fu_each_src_dest): ensure src is accessible.
-
- * lib/fileutils.rb (fu_same): use File.identical? to get rid of
- exceptions. [ruby-core:28141]
-
- * lib/fileutils.rb (fu_have_st_ino): no longer used.
-
- * lib/fileutils.rb (fu_have_st_ino): check if required method is
- defined, instead of platform name.
-
-Mon Apr 12 05:10:20 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: New method Matrix.build [ruby-core:28272]
-
-Mon Apr 12 03:45:25 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Deprecate elements_to_{f/i/r}
-
-Mon Apr 12 03:30:29 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Handle coercion errors by raising TypeErrors
- [ruby-core:26736]
-
-Mon Apr 12 00:51:21 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * io.c (rb_io_getline_fast, rb_io_getline_1): fix ARGF.lineno
- behavior. [ruby-core:25205]
-
- * test/ruby/test_argf.rb (TestArgf#test_lineno3): add a test for
- above.
-
-Sun Apr 11 23:25:17 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * configure.in: can not load libraries if --with-opt-dir is used
- on AIX. [Bug #3107]
-
-Sun Apr 11 14:44:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/irb/ruby-lex.rb (RubyLex#getc): revert r10817, which caused
- regression for handling case when there is no newline at the end of
- file. [ruby-core:28248]
-
-Sun Apr 11 12:08:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_replicate): new encoding name must be valid
- c-string. [ruby-dev:40954]
-
-Sun Apr 11 11:58:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h (ftruncate): rename to get rid of conflict
- with same name but non-LFS function on MinGW. [ruby-core:24757]
-
-Sun Apr 11 10:33:34 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Update to RDoc 2.5.3. Includes r27288 and r27290.
-
-Sun Apr 11 09:31:39 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * test/syck/*: Moved test/yaml to test/syck since it's actually
- testing the syck YAML engine.
-
-Sun Apr 11 08:56:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (setup_output_dir): compare by Time#to_i.
- Cached created time doesn't have fractional times,
- but FileStat#mtime has; so rdoc almost always judged files
- are updated.
-
-Sun Apr 11 07:40:48 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (setup_output_dir): fix typo. [ruby-core:29415]
-
-Sun Apr 11 07:01:41 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (decode_www_form_component): validate.
- [ruby-dev:40938]
-
- * lib/uri/common.rb (decode_www_form): allow empty string.
-
- * lib/uri/common.rb: fix nodoc for constant. [ruby-dev:40949]
-
-Sat Apr 10 21:26:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/markup/preprocess.rb (RDoc::Markup::PreProcess#handle):
- use File.binread to avoid locale dependency.
-
-Sat Apr 10 15:18:26 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Import RDoc 2.5.2
- * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): Don't parse rdoc
- files, reverts r24976 in favor of include directive support in C
- parser.
-
-Sat Apr 10 13:14:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/openssl/ossl_ssl.c (Init_ossl_ssl): add SSLContext#ssl_timeout=,
- which allows net/https to specify timeout. [ruby-core:24812]
-
-Sat Apr 10 07:36:13 2010 wanabe <s.wanabe@gmail.com>
-
- * vm_method.c (rb_add_method): clear attr.location before rb_ary_new3.
- a patch from Masaya TARUI in [Bug #3108]
-
-Sat Apr 10 05:27:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/lib/psych/deprecated.rb: implementing Psych.quick_emit and
- adding deprecation warnings.
- * ext/psych/lib/psych/visitors/to_ruby.rb: supporting deprecated
- yaml_initialize api.
- * ext/psych/lib/psych/visitors/yaml_tree.rb: supporting deprecated
- to_yaml api.
-
-Sat Apr 10 01:08:53 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/parser.c: parse raises a TypeError when nil is passed in.
-
-Sat Apr 10 00:01:51 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/pty/lib/expect.rb: preserve buffer read, instead of discard.
- based on a patch from Luiz Angelo Daros de Luca in
- [ruby-core:23464].
-
-Fri Apr 9 23:58:58 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/pty/lib/expect.rb: raise an error when argument is unexpected
- type. based on a patch from Luiz Angelo Daros de Luca in
- [ruby-core:23464].
-
-Fri Apr 9 23:57:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/pty/lib/expect.rb: add rdoc. based on a patch from Luiz Angelo
- Daros de Luca in [ruby-core:23464].
-
-Fri Apr 9 23:54:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/irb/init.rb, lib/irb/lc/help-message,
- lib/irb/lc/ja/help-message: add -w flag. [ruby-core:24594]
-
-Fri Apr 9 23:51:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/socket/ipsocket.c (init_inetsock_internal),
- ext/socket/unixsocket.c (rsock_init_unixsock): check the result of
- listen(2). based on a patch from Mike Pomraning. [ruby-core:23698]
-
-Fri Apr 9 21:22:10 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/completion.rb (CompletionProc): irb will be stuck with
- long variable name at completion. [Bug#1969]. refix [ruby-core:28366].
-
-Fri Apr 9 20:54:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (decode_www_form): don't ignore leading '?'.
- [ruby-dev:40938]
-
- * lib/uri/common.rb (decode_www_form): check whether argument is
- valid application/x-www-form-urlencoded data.
-
-Fri Apr 9 20:29:13 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can
- precede the last reference). [ruby-dev:40942]
-
-Fri Apr 9 20:05:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * dir.c (push_glob): add RB_GC_GUARD to prevent str being free'ed.
- a patch from Masaya TARUI in [ruby-dev:40939]. [ruby-dev:40514]
-
-Fri Apr 9 10:53:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * compile.c (iseq_compile_each): stop hiding, and freeze unpopped
- string nodes to allow method redefinition. [ruby-dev:40641]
-
-Fri Apr 9 01:26:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (internal_{read,write}_func, rb_{read,write}_internal):
- preserve errno. a patch from Takehiro Kubo in [ruby-core:29340].
- [ruby-core:28924]
-
-Fri Apr 9 01:12:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/irb/completion.rb (CompletionProc): calling the method "methods"
- may raise an exception. [ruby-core:28366]
-
-Thu Apr 8 14:33:24 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * configure.in: --disable-install-doc should prohibit doxygen.
-
-Thu Apr 8 14:23:51 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h: include errno.h before defining errnos.
- see [ruby-core:29314]
-
-Thu Apr 8 11:45:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/yaml.rb: use Psych if only it is loaded already.
-
- * lib/yaml.rb (YAML::EngineManager#yamler): set the result after
- successfully switched.
-
-Thu Apr 8 07:22:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rand_init): ignore higher bits if all they are same as
- the lower sign bit. [ruby-core:29292](2)
-
-Thu Apr 8 07:16:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb/cmd/help.rb (IRB::ExtendCommand::Help#execute): use RI
- interactive mode if no argument. [ruby-dev:39839]
-
-Wed Apr 8 02:33:55 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * array.c (rb_ary_permutation): Remove limitation for lengthy permutations
- [ruby-core:29240]
-
- * test/ruby/test_array.rb: ditto
-
-Wed Apr 7 23:33:55 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * misc/ruby-mode.el (ruby-mode-map): binded C-c C-c and C-c C-c C-u
- to comment-region and uncomment-region. Thanks Michael Klishin!
- [Feature #872] [ruby-core:20552]
-
-Wed Apr 7 21:44:14 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (ASCTIME): unused macro removed.
-
-Wed Apr 7 16:45:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (Makefile): reverted r27244.
-
-Wed Apr 7 11:49:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/quickpath.rb (REXML::QuickPath::predicate):
- fix regexp.
-
-Wed Apr 7 09:44:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (Makefile): quote init-commands.
-
- * configure.in (Makefile): `make ruby` builds ruby command
- even if RUBY_INSTALL_NAME is customized or it has extension.
-
-Wed Apr 7 03:28:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (RDoc#{initialize,setup_output_dir}):
- initialize @last_created and use it.
-
-Wed Apr 7 02:05:41 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/fake.rb.in: not define $extout to make target in cwd.
-
-Tue Apr 6 23:01:35 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
-
- * vm_core.h: Introduce UNINITIALIZED_VAR() macro.
- * thread.c (do_select): Use UNINITIALIZED_VAR() instead FAKE_FD_ZERO().
- Also, remove FAKE_FD_ZERO completely. [Feature #3018]
-
-Tue Apr 6 14:53:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h: check definition existence before defining
- errno macros.
-
- * win32/win32.c (errmap): define winsock errors mappings.
- these are VC++10 support. see [ruby-core:29278]
-
-Tue Apr 6 21:55:25 2010 Tanaka Akira <akr@fsij.org>
-
- * configure.in: test localtime(3) overflow. [ruby-dev:40910]
-
- * time.c (rb_gmtime_r): renamed from rb_gmtime.
- (rb_localtime_r): renamed from rb_localtime.
- (rb_localtime_r2): call rb_localtime_r and validate the result if
- there is overflow problem.
- (rb_gmtime_r2): call rb_gmtime_r and validate the result if there
- is overflow problem.
-
-Tue Apr 6 11:21:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * template/fake.rb.in: hooks for extconf.rb.
-
-Tue Apr 6 06:19:36 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/text.rb (REXML::Text.check): comment out
- broken logic.
-
-Tue Apr 6 05:59:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rexml/parsers/baseparser.rb (LETTER, DIGIT):
- always use POSIX charclass.
-
- * lib/rexml/parsers/baseparser.rb (NAMECHAR):
- remove duplicated range.
-
- * lib/rexml/xmltokens.rb (NCNAME_STR, NAMECHAR): ditto.
-
- * lib/rexml/parsers/xpathparser.rb (PathExpr): ditto.
-
- * lib/rexml/text.rb (REXML::Text#initialize):
- initialize @parent.
-
-Mon Apr 5 19:54:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (make_regexp): use onig_new_with_source to keep
- sourcefile and sourceline.
-
- * re.c (onig_new_with_source): copied from onig_new in
- regcomp.c for keep sourcefile and sourceline.
-
-Mon Apr 5 13:20:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
- defined EWOULDBLOCK. based on a patch from Charlie Savage,
- see [ruby-core:29255]
-
-Mon Apr 5 13:10:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/psych/lib/psych/core_ext.rb: remove before alias.
-
- * ext/syck/lib/syck.rb: don't warn called by itself.
-
-Mon Apr 5 13:08:24 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/mkexports.rb (each_export): VC10 support.
- a patch from Charlie Savage in [ruby-core:29254]
-
-Sun Apr 4 22:18:32 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (cmp): optimize for fixnums.
- (lt): use cmp.
- (gt): ditto.
- (le): ditto.
- (ge): ditto.
- (wlt): use wcmp.
- (wgt): ditto.
- (wle): ditto.
- (wge): ditto.
- (time_subsec): use wmod.
-
-Sun Apr 4 10:04:28 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/ruby.h: replace snprintf and vsnprintf by
- ruby_snprintf and ruby_vsnprintf. [ruby-dev:40909]
-
- * configure.in: don't check snprintf(3) and vsnprintf(3).
-
- * include/ruby/missing.h: don't declare snprintf and vsnprintf.
-
- * include/ruby/ruby.h: include stdarg.h.
-
- * sprintf.c: include vsnprintf.c
-
- * vsnprintf.c: renamed from missing/vsnprintf.c.
-
- * vsnprintf.c: remove useless ifdefs.
-
- * win32/mkexports.rb: use ruby_snprintf and ruby_vsnprintf.
-
-Sun Apr 4 09:44:01 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (lt): call <=> instead of <.
-
-Sun Apr 4 06:46:16 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/yaml: Moved to ext/syck/lib, Syck only uses Syck constant.
- * lib/yaml.rb: Added an engine manager for choosing YAML engine.
- * ext/syck/lib/syck/rubytypes.rb: squashed warnings when using Psych
-
-Sat Apr 3 22:47:51 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: don't define STRUCT_WIDEVAL.
-
-Sat Apr 3 18:15:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (RDoc#{setup,update}_output_dir): store mtimes
- per files in the flag file.
-
- * lib/rdoc/rdoc.rb (RDoc#normalized_file_list): skip already
- processed and unmodified files.
-
-Sat Apr 3 15:09:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (rdoc): no force-update, and add RDOCFLAGS.
-
- * lib/rdoc/options.rb (RDoc#parse): no-force-update option.
-
-Sat Apr 3 10:51:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (random_rand): raise ArgumentError on nil, as the
- documentation implies. [ruby-core:29075]
-
- * random.c (rb_f_rand): mentioned the case of when max is nil.
-
-Sat Apr 3 06:56:11 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * array.c (rb_ary_product): Accept a block [ruby-core:29045]
-
-Sat Apr 3 04:46:00 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/file2lastrev.rb (VCS#relative_to): path and @srcdir may have
- different relative-ness.
-
-Sat Apr 3 03:19:01 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * lib/benchmark.rb (Benchmark::Tms#add): fix NameError.
- [ruby-dev:40906]
-
- * test/benchmark/test_benchmark.rb: add a test for above.
-
-Sat Apr 3 01:50:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parser/ruby.rb (RDoc#make_message): no empty lines.
-
- * lib/rdoc/stats.rb (RDoc::Normal#print_file): send to stdout and
- flush always
-
-Sat Apr 3 00:03:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/class_module.rb (RDoc#merge): get rid of stack overflow.
-
- * lib/rdoc/parser/c.rb (RDoc#handle_method): see source files in
- source directory.
-
-Fri Apr 2 22:13:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb: reverted r27186 to add generators.
-
-Fri Apr 2 21:17:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS: added reverse_lookup option.
-
-Fri Apr 2 15:26:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rdoc/test_rdoc_ri_driver.rb (with_dummy_pager): don't grasp
- the terminal.
-
-Fri Apr 2 14:43:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (RDoc::Generator): defer by autoload.
-
- * lib/rdoc/generator/darkfish.rb: use normal library instead of
- gem.
-
-Fri Apr 2 14:26:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
- RUBY_VERSION. reapplied r24990.
-
- * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
- are delimited by a semicolon. supported Vim style. reapplied
- r24988 with fixing a typo for shebang.
-
-Fri Apr 2 14:16:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
- files. reapplied r24976.
-
- * lib/rdoc/parser/c.rb: fixed a small error in the documentation.
- [ruby-core:24744] reapplied r24395.
-
- * lib/rdoc/parser.rb (RDoc::Parser.binary?): blksize may be nil
- and is irrelevant to whether a file is binary. TAB and newlines
- would be usually considered to be included in text data.
- reapplied r23071 and r24297.
-
-Fri Apr 2 13:59:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been
- obsolete. reapplied r24599.
-
- * lib/rdoc/ri/paths.rb: follows $ridir. reapplied r23554.
-
- * lib/rdoc/ri/paths.rb (RDoc::HOMEDIR): expand_path deals with
- platform dependent environments. reapplied r21312.
-
-Fri Apr 2 12:52:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/parser.rb (binary?): regression.
-
-Fri Apr 2 11:54:49 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (init_env): wrong calculation of the head of setenv
- string. [ruby-core:29216]
- a patch from Heesob Park in [ruby-core:29218]
-
-Fri Apr 2 08:24:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (ruby_setsid): split from proc_setsid.
-
- * process.c (proc_daemon): use EXIT_SUCCESS instead of magic number.
-
-Fri Apr 2 07:00:28 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cptr.c (rb_dlptr_inspect): fix format specifiers.
-
-Fri Apr 2 05:38:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (InitVM): calls per-VM initialization in
- single VM, but does nothing in MVM.
-
-Fri Apr 2 02:56:56 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: New instance methods:
- empty? [ruby-core:26284], each, each_with_index [ruby-core:28400],
- conjugate, conj, imaginary, imag, real, real?, rectangular, rect
- [ruby-core:26285]
-
- Removed compare_by*, inspect_org, cf [ruby-core:26268]
-
- Matrix.empty: raise on negative sizes
-
- Matrix.determinant: raise on rectangular matrices [ruby-core:28271]
-
-Thu Apr 1 17:17:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/iso2022.trans: CP50221 supports 8bit JIS.
-
-Thu Apr 1 16:44:00 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc, test/rdoc: Imported RDoc 2.5
-
-Thu Apr 1 14:30:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enc/utf_16{be,le}.c (utf16{be,le}_mbc_to_code): simplified.
-
-Thu Apr 1 14:07:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (BSD__hdtoa): don't use C99 macros. (FP_NORMAL etc)
-
-Thu Apr 1 13:30:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * sprintf.c (rb_str_format): support %a format. [ruby-dev:40650]
-
- * missing/vsnprintf.c (BSD_vfprintf): ditto.
-
- * missing/vsnprintf.c (cvt): ditto.
-
- * util.c (BSD__hdtoa): added. This is 2-clause BSDL licensed
- by David Schultz and from FreeBSD.
-
- * LEGAL: add about hdtoa() in util.c.
-
-Thu Apr 1 13:24:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): return 0.0 if hexadecimal and
- badcheck is FALSE: Float("0x1p+0") works, but "0x1p+0".to_f
- doesn't. [ruby-dev:40650]
-
- * util.c (ruby_strtod): allow hexadecimal integers.
-
-Thu Apr 1 13:20:50 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/scanf.rb: support %a format. [ruby-dev:40650]
-
-Thu Apr 1 12:04:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h (PRE_TIMET_PREFIX): define if configure doesn't
- defines it. [ruby-core:29190]
-
-Thu Apr 1 11:36:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_initialize): fixed a rdoc miss that textmode and
- binmode flag explanation was reversed each other. a patch from
- Heesob Park in [ruby-core:29166].
-
-Thu Apr 1 09:54:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RUBY_{DEFAULT,NEVER}_FREE): added.
- [ruby-dev:40889]
-
-Thu Apr 1 04:55:08 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (rb_big_abs_find_minbit): fix handling the last word.
-
-Thu Apr 1 04:30:11 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (long_mul): overflow condition changed.
- (wi_mul): ditto.
-
-Wed Mar 31 23:33:29 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (long_mul): extracted from mul and avoid integer overflow.
- (wi_mul): extracted from wmul and avoid integer overflow.
-
-Wed Mar 31 21:30:38 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: less bignum allocations.
-
- * strftime.c (rb_strftime_timespec): defined to avoid rational for
- nano second resolution time.
-
-Wed Mar 31 16:05:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/rake/test_{package_task,rules,task_manager}.rb: use
- temporary directories.
-
-Wed Mar 31 13:53:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/rubygems/gemutilities.rb (setup, teardown):
- Object#to_yaml must use syck on RubyGem.
-
-Wed Mar 31 06:57:14 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (timew2timespec): fix previous change.
-
-Wed Mar 31 00:32:19 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (wdivmod): renamed from wdivmodv. fix neg/pos and pos/neg.
- (split_second): return number of seconds as wideval_t.
- (timet2wv): new function.
- (wv2timet): new function.
- (timet2wideval): removed.
-
-Tue Mar 30 22:24:19 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: use more polymorphic operations.
-
-Tue Mar 30 22:12:38 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add URI.decode and URI.encode to Obsoleted methods,
- and fix typos. [ruby-dev:40852]
-
- * NEWS: add Time#subsec.
-
-Tue Mar 30 22:07:12 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: reorder wide value implementation.
-
-Tue Mar 30 22:00:44 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb.rb: support [Feature#988], [ruby-core:21177].
- * lib/irb/context.rb: fix Context#verbose?.
-
-Tue Mar 30 21:56:33 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: make wide value more polymorphic.
-
-Tue Mar 30 21:18:32 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/psych/extconf.rb: install psych .so to not psych/ but direct.
- This prepends to install *.rb files to psych/psych.
-
- * ext/psych/lib/psych.rb: require 'psych.so'.
-
-Tue Mar 30 20:55:14 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (w2v): renamed from w2xv.
- (v2w): renamed from xv2w.
- (rb_time_magnify): takes wideval_t.
- (rb_time_unmagnify): returns wideval_t.
-
-Tue Mar 30 19:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/psych/lib: moved external library dependent files from lib.
- [ruby-core:29129]
-
-Tue Mar 30 18:25:52 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_dirname): split from rb_file_s_dirname.
-
- * load.c (rb_f_require_relative): use absolute path instead of
- expanded path.
-
-Tue Mar 30 13:57:08 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * process.c (proc_daemon): Process.daemon should raise an error on
- failure regardless of whether the implementation uses daemon(3)
- or not. [ruby-dev:40832]
-
-Tue Mar 30 13:11:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/file2lastrev.rb (VCS::GIT_SVN): removed because git-log can
- deal with git-svn repository faster than git-svn-info.
-
- * tool/file2lastrev.rb (VCS#get_revisions): particular commands do
- not depend on instance.
-
-Tue Mar 30 08:55:50 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/extconf.rb: Making library detection more agnostic.
-
-Tue Mar 30 08:10:59 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/psych.rb: Fix problem with empty and white-space only strings.
- Thanks Peter McLain!
- * test/psych/test_psych.rb: tests for change.
-
-Tue Mar 30 05:31:39 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/psych.rb: documentation updates. Thanks Peter McLain!
- * lib/psych/{coder,tree_builder}.rb: ditto
-
-Tue Mar 30 03:56:13 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/psych/{emitter,parser,psych}.c: move variable
- declaration to the first of the block.
-
-Mon Mar 29 21:47:44 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * prelude.rb, .document: Stuff in prelude.rb should be documented
- as well.
-
-Mon Mar 29 20:23:05 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/matrix.rb(Vector#each2, Vector#collect2): add type check for
- Integer[Bug #2495].
-
-Mon Mar 29 19:45:09 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: wide value condition changed.
-
-Mon Mar 29 18:10:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (Numeric): accept rationals.
-
-Mon Mar 29 15:10:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#open): re-open with same mode and
- options as initialize.
-
-Mon Mar 29 09:16:45 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c: change include order; ruby.h should be at first.
-
-Mon Mar 29 06:47:25 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/psych/*: importing Psych to trunk
- * test/psych/*: ditto
- * lib/psych/*: ditto
-
-Sun Mar 28 10:03:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/scanf.rb: fix max width modifier for %f.
-
-Sun Mar 28 10:35:45 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.6.0 r5717.
- * test/minitest/*.rb: ditto.
-
-Sun Mar 28 10:12:28 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (rb_time_magnify): fix for LP64.
-
-Sun Mar 28 09:28:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/scanf.rb: fix %[egEFG] isn't accept.
-
-Sun Mar 28 09:53:02 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: rename small integer specialization related identifiers.
-
-Sun Mar 28 08:20:37 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (weq): specialize for small integer.
- (wne): ditto.
- (wlt): ditto.
- (wgt): ditto.
- (wle): ditto.
- (wge): ditto.
- (rb_time_magnify): ditto.
- (rb_time_unmagnify): ditto.
- (rb_time_unmagnify_to_float): new function to avoid rational for
- Time#to_f and Time#-.
-
-Sun Mar 28 07:12:41 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (mul): condition refined.
-
-Sun Mar 28 02:14:13 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: fix previous commit.
-
-Sat Mar 27 23:17:52 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c: use 64bit arithmetic even on platforms with 32bit VALUE.
-
-Fri Mar 26 23:52:07 2010 wanabe <s.wanabe@gmail.com>
-
- * NEWS: add Thread#add_trace_func and Thread#set_trace_func.
-
-Fri Mar 26 22:58:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
- store->ex_data.sk. a patch from Christian Holtje in
- [ruby-core:28907]. [ruby-core:23971] [ruby-core:18121]
-
-Fri Mar 26 19:55:41 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * Makefile.in (DOXYGEN): Define a missing variable DOXYGEN. Build
- has been failing when doxygen(1) is found by configure but the
- variable is not defined by the system and make(1) does not allow
- an empty command. ("@$(DOXYGEN)" was the cause)
-
-Fri Mar 26 19:28:03 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/ruby/test_hash.rb (test_recursive_key): recursive keys are
- permitted now. [ruby-dev:40735]
-
-Fri Mar 26 12:36:10 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/yaml/basenode.rb: deprecating YPath methods
-
- * lib/yaml/stream.rb: deprecating YAML::Stream#edit
-
-Fri Mar 26 12:29:28 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * lib/yaml/encoding.rb: YAML.encode, YAML.decode are deprecated.
-
- * lib/yaml/stringio.rb: yaml/stringio.rb is deprecated.
-
- * lib/yaml/ypath.rb: YAML::YPath is deprecated.
-
-Fri Mar 26 04:52:19 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: fix [ruby-core:28901] [Bug #2997].
- Thanks, Michael Graff.
-
- * ext/tk/tcltklib.c: use xfree() for memories allocated by ALLOC().
-
- * ext/tk/tkutil/tkutil.c: ditto.
-
- * ext/tk/lib/tkextlib/version.rb: forgot updating.
-
-Thu Mar 25 23:53:22 2010 wanabe <s.wanabe@gmail.com>
-
- * thread.c (thread_reset_event_flags): set flags to thread. [Bug #693]
-
-Thu Mar 25 23:17:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * file.c (rb_get_path_check): prefer #to_path over #to_str. a patch
- originally written by me, and modified by Nobuyoshi Nakada.
- [ruby-core:24257]
-
-Thu Mar 25 18:10:08 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: Array#{uniq,uniq!} can take a block. see [ruby-dev:37998]
-
-Thu Mar 25 17:21:49 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add IO#autoclose=, IO#autoclose?, IO#codepoints,
- IO#each_codepoint.
-
-Thu Mar 25 14:50:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_{read,write}): fix handle leaks. based on
- a patch from Heesob Park in [ruby-core:28919]. [ruby-core:28833]
-
-Thu Mar 25 12:37:37 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * NEWS: add Kernel#singleton_class.
-
-Thu Mar 25 11:34:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * bignum.c, node.h, strftime.c, enc/trans/utf8_mac.trans:
- added explicit casts for suppressing warnings.
-
-Thu Mar 25 11:34:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * test/ruby/test_dir_m17n.rb: HFS+ escapes invalid byte sequences of
- filenames.
-
-Thu Mar 25 05:44:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ruby_version): needs runnable CPP.
-
-Thu Mar 25 04:42:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot (package): take a breath for HP-UX make
- [ruby-core:28938].
-
- * tool/make-snapshot (Dir.mktmpdir): for 1.8.6 backward compatibility.
-
- * tool/make-snapshot (package): $: no longer contains ".", in trunk.
-
-Thu Mar 25 03:52:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/charset_alias.rb: update of URL. [ruby-dev:38360]
-
-Wed Mar 24 23:43:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (thread_create_core): let new thread inherit RUBY_EVENT_VM
- of event_flags. [ruby-core:25191]
-
- * thread.c (rb_threadptr_exec_event_hooks): delete RUBY_EVENT_VM if
- all event_hooks are removed.
-
-Wed Mar 24 22:58:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * configure.in: revert the previous commit, which seemed to break make
- install. The files of standard libraries are directly installed to
- $(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1
-
-Wed Mar 24 18:16:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912]
-
-Wed Mar 24 14:33:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_read): limit read size to 16KB if the file
- seems to be console. [ruby-core:28902]
-
-Wed Mar 24 10:18:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (file_expand_path): set length of string before calling
- rb_enc_check because rb_enc_check scans its content.
- This prevents warnings by valgrind.
-
-Tue Mar 23 23:58:51 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Incorporating the fixes from the recent
- FasterCSV releases: 1.5.2 and 1.5.3. New parser
- by Tim Elliott. [ruby-core:25038]
-
-Tue Mar 23 18:35:46 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * object.c (rb_obj_singleton_class): new method
- Kernel#singleton_class. [ruby-core:21702]
-
-Tue Mar 23 01:13:59 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket: use rsock_ prefix for internal initialization functions.
-
-Mon Mar 22 20:32:22 2010 wanabe <s.wanabe@gmail.com>
-
- * proc.c (rb_method_location): return attr's location if it is setup.
- [Feature #2084]
-
- * NEWS: follow above.
-
- * vm_method.c (rb_add_method): save attr's location.
-
- * gc.c (mark_method_entry): mark attr's location.
-
- * method.h (rb_method_definition_t): add member to save attr's location.
-
- * vm_eval.c (vm_call0): follow above.
-
- * vm_insnhelper.c (vm_call_method): ditto.
-
- * vm_method.c (rb_method_definition_eq): ditto.
-
-Mon Mar 22 19:31:06 2010 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (Date#>>): fixed. [ruby-core:28011]
-
-Mon Mar 22 18:01:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RMDIRS): use rmdir -p if possible.
-
- * Makefile.in ({dist,real}clean-ext): fix for removing ext
- directories.
-
-Mon Mar 22 09:06:10 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/.document: extracted from ext/.document.
-
-Mon Mar 22 00:50:33 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/rubysocket.h (rsock_revlookup_flag): declared.
-
-Mon Mar 22 00:01:24 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (config.h): RUBY_EXEC_PREFIX defined.
-
-Sun Mar 21 00:46:29 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.encode_www_form_component):
- convert strings of HTML5 ASCII incompatible encoding
- to UTF-8.
-
- * lib/uri/common.rb (URI.encode_www_form_component):
- "\x83\x41" of Shift_JIS should be encoded as "%83A".
- This follows real implementations.
-
- * lib/uri/common.rb (URI.decode_www_form_component):
- use given encoding for force_encoding. [ruby-dev:40721]
-
-Sun Mar 21 21:09:17 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv-replace.rb: specify super class for rdoc.
-
- * lib/ipaddr.rb: ditto.
-
-Sun Mar 21 19:52:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_initialize): add autoclose argument to control close
- at finalization. [ruby-core:26222]
-
- * io.c (rb_io_autoclose_p, rb_io_set_autoclose): new methods.
-
-Sun Mar 21 19:50:04 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket: make sources rdoc friendly.
-
-Sun Mar 21 17:57:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (IO_RBUF_CAPA_FOR): use large buffer as cbuf if readconv is
- needed for performance improvement. based on a patch by Roger Pack
- in [ruby-core:28163]. [ruby-core:28162]
-
-Sun Mar 21 17:14:49 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: reuse hash object.
-
-Sun Mar 21 12:32:39 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (transcode_compile_tree): make
- valid_encoding mandatory unless from_encoding is registered in
- ValidEncoding.
- (transcode_tbl_only): ditto.
- (transcode_tblgen): ditto.
- (ValidEncoding): new function.
-
- * enc/trans/escape.trans: specify valid_encoding.
-
- * enc/trans/emoji_sjis_docomo.trans: ditto.
-
- * enc/trans/emoji.trans: ditto.
-
- * enc/trans/emoji_iso2022_kddi.trans: ditto.
-
- * enc/trans/big5.trans: ditto.
-
- * enc/trans/emoji_sjis_softbank.trans: ditto.
-
- * enc/trans/emoji_sjis_kddi.trans: ditto.
-
- * enc/trans/chinese.trans: use ValidEncoding() instead of
- ValidEncoding[].
-
-Sun Mar 21 09:43:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (IO_[CRW]BUF_CAPA_MIN): replaced magic numbers.
-
-Sun Mar 21 09:22:10 2010 Tanaka Akira <akr@fsij.org>
-
- * object.c (rb_obj_hash): use LONG2FIX to avoid Bignum allocation.
-
-Sat Mar 20 22:51:46 2010 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_sum): use UCHAR_MAX.
-
-Sat Mar 20 19:16:42 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (ActionMap.unambiguous_action): use
- Array#delete.
- (ActionMap.merge2): defined.
- (ActionMap::PostMemo): removed.
- (transcode_compile_tree): use ActionMap.merge2.
-
-Sat Mar 20 13:26:09 2010 Tanaka Akira <akr@fsij.org>
-
- * array.c (rb_ary_uniq_bang): the array is already unique if the
- length is zero or one.
- (rb_ary_uniq): ditto.
-
-Sat Mar 20 12:30:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib: fixed typo. a patch by Sho Hashimoto in [ruby-dev:40716].
-
-Sat Mar 20 11:32:18 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (each_firstbyte_range): tuned for less
- method calls.
-
-Sat Mar 20 00:59:50 2010 wanabe <s.wanabe@gmail.com>
-
- * ext/dl/lib/dl/pack.rb (DL#pack): allow LLP64.
-
-Fri Mar 19 05:26:31 2010 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_sum): don't call method for each byte.
-
-Thu Mar 18 21:24:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (miniruby): link $(NORMALMAINOBJ).
-
-Thu Mar 18 19:52:27 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: scan singleton mappings sequentially.
-
-Thu Mar 18 06:28:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_EXEC_PREFIX): added to config.h.
-
- * ruby.c (ruby_init_loadpath_safe): TMP_RUBY_PREFIX should be
- exec_prefix, not rubylibprefix. [ruby-core:28718]
-
- * version.c (RUBY_LIB_PREFIX): fallback to RUBY_EXEC_PREFIX.
-
-Thu Mar 18 05:58:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_{to_i,mod,divmod,div2}):
- removed unused variables.
-
-Thu Mar 18 04:40:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_intern3): get rid of type-punning cast.
-
-Thu Mar 18 02:29:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_build_body): add mark to jump table hash of case.
-
-Thu Mar 18 00:58:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * util.c (ruby_strtod): Add support for Hexadecimal
- floating-point expression [ruby-dev:40650] #2969
-
-Thu Mar 18 00:00:58 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.{en,de}code_www_form_component):
- renamed from URI.{en,de}code_www_component. [ruby-dev:40672]
-
- * lib/uri/common.rb (URI.encode_www_form_component): %-encoded
- element should have always two hex.
-
- * lib/uri/common.rb (URI.encode_www_form_component):
- better treatment for ASCII incompatible encodings and
- encodings whose lead byte may use 7bit.
-
- * lib/uri/common.rb (URI.decode_www_form_component): add %20.
-
- * lib/uri/common.rb (URI.decode_www_form_component): add
- result's encoding as 2nd argument.
-
- * lib/uri/common.rb (URI.decode_www_form): added.
-
-Wed Mar 17 16:25:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_aset): allow recursive key. [ruby-core:24648]
-
-Wed Mar 17 06:39:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc.
- [ruby-core:28696]
-
-Wed Mar 17 02:29:46 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c, iseq.c, ruby.c, vm.c, vm_core.h, vm_eval.c: add absolute
- path field into rb_iseq_t. The field contains a string representing
- a path to corresponding source file. or nil when the iseq is created
- from -e, stdin, eval, etc. This field is used for require_relative.
- [ruby-dev:40004]
-
- * load.c (rb_f_require_relative): add C implementation of
- require_relative.
-
- * prelude.rb (require_relative): get rid of Ruby implementation of
- require_relative.
-
-Wed Mar 17 01:24:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (rb_intern3): prohibit Symbol with an invalid encoding.
- [ruby-core:24621]
-
- * test/ruby/test_m17n_comb.rb: modify a test for above.
-
-Tue Mar 16 22:51:11 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: specialize for singleton mappings.
-
-Tue Mar 16 20:13:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * enc/trans/emoji.trans: added codepoints leading 0xf4 into
- nomap_table.
-
-Tue Mar 16 17:33:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpCtoV): keep e's sign.
- When e doesn't over flow e * BASE_FIG but overflow e * 10,
- e will overflow.
-
-Tue Mar 16 17:18:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (rb_str_conv_enc_opts): missing prototype.
-
-Tue Mar 16 15:20:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tmpdir: split from lib/tmpdir.rb.
-
- * win32/win32.c (rb_w32_system_tmpdir): extracted from init_env.
-
- * win32/win32.c (rb_w32_getcwd): removed duplicated code.
-
-Tue Mar 16 14:06:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/encoding.h (ENC_TO_ENCINDEX): suppress warnings.
-
-Tue Mar 16 14:03:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RSHIFT): parenthesize the argument of cast instead
- of the result.
-
-Tue Mar 16 11:23:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): ignore dname if it has different
- drive letter or UNC.
-
-Tue Mar 16 07:16:56 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: redundant loop removed.
-
-Tue Mar 16 07:01:43 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: refactored to use tree as memo key.
-
-Tue Mar 16 04:05:13 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: more info in generating macro names.
-
-Mon Mar 15 21:58:03 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: ActionMap#each_firstbyte inlined.
-
-Mon Mar 15 21:22:49 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (transcode_tblgen): add valid_encoding
- optional argument.
-
- * enc/trans/single_byte.trans use valid_encoding argument for
- transcode_tblgen.
-
- * enc/trans/chinese.trans: ditto.
-
-Mon Mar 15 18:33:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (default_rand): removed initial buffer.
-
- * random.c (Init_RandomSeed): initialize seed of default random.
-
- * random.c (Init_RandomSeed2): turn the seed to Bignum object.
-
-Mon Mar 15 17:28:30 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_print): RDoc update. a patch from Daniel Kelley
- in [ruby-core:28643].
-
-Mon Mar 15 14:06:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (next_state): no initialization here.
-
- * random.c (default_mt): always return initialized MT.
-
-Mon Mar 15 11:49:48 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * random.c (rb_reset_random_seed): set seed in this.
- [ruby-core:28655]
-
-Mon Mar 15 10:26:02 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: import latest nkf. [master 9306cb0]
- this also fixes [ruby-dev:40607]
-
-Mon Mar 15 09:34:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.encode_www_component):
- call str.to_s at first.
-
-Mon Mar 15 09:36:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * symbian/README.SYMBIAN: fixed broken patch and converted to
- unified diff.
-
-Mon Mar 15 07:51:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (Init_File): do not define File::ALT_SEPARATOR on cygwin.
-
-Mon Mar 15 07:41:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (realpath_rec): use same cache.
-
- * file.c (realpath_internal): regulate separators in prefix.
- [ruby-core:28653]
-
- * file.c (FILE_ALT_SEPARATOR): separated condition.
-
-Mon Mar 15 04:41:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_each_codepoint): read directly when readconv is
- needed but internal encoding is not set. [ruby-core:28650]
-
-Mon Mar 15 04:18:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/file2lastrev.rb (VCS::{SVN,GIT}#get_revisions):
- use block argument 'path' to get the path given by super.
-
-Mon Mar 15 02:43:59 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (Action#hash): defined.
- (Action#eql?): ditto.
- (Action#==): ditto.
-
-Mon Mar 15 01:52:46 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: refactored.
-
-Mon Mar 15 01:18:31 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (*.pkg): Ruby Core installation separated from standard extensions.
-
- * symbian/configure.bat: ditto.
-
- * symbian/README.SYMBIAN: ditto.
-
- * symbian/setup (config.h): support for 2nd internal drive added.
-
-Mon Mar 15 00:11:23 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/file2lastrev.rb (VCS::GIT_SVN#get_revisions) :
- use block argument 'path' to get the path given by super.
-
- * tool/file2lastrev.rb (VCS::GIT#get_revisions):
- use double quotes for Windows.
- patched by Vladimir Sizikov [ruby-core:28651]
-
-Sun Mar 14 22:38:31 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: consider valid_encoding for max_input.
-
-Sun Mar 14 15:46:09 2010 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/emoji.trans: fix nomap_table.
-
-Sun Mar 14 09:50:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (insn_data_to_s_detail), iseq.c (insn_operand_intern):
- fixed format specifiers.
-
-Sun Mar 14 07:20:17 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (EXPAND_PATH_BUFFER): make it back to usascii, to prevent
- infinite loop on some platform. [ruby-dev:40629]
-
-Sun Mar 14 02:40:38 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: reject ambiguous mapping.
-
- * enc/trans/single_byte.trans: remove ambiguous mapping such as
- \xD6 -> U+05F2 and \xD6\xC7 -> U+FB1F in Windows-1255
-
-Sat Mar 13 23:48:27 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (file_expand_path): should not just copy the encoding
- from fname. [ruby-core:28635]
-
- * file.c (EXPAND_PATH_BUFFER): set filesystem_encoding, not
- usascii for path buffer.
-
-Sat Mar 13 17:48:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/file2lastrev.rb: refactored. fixed changed revision of git.
-
-Sat Mar 13 15:44:20 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_print): should not print field separator at the end
- of arguments. [ruby-talk:358633]
-
-Sat Mar 13 14:49:55 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_join): remove Enumerable#join. [ruby-core:24786]
-
- * array.c (ary_join_1): use #to_ary to detect recursive array.
-
-Sat Mar 13 12:26:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/io.h (MakeOpenFile): finalize fptr to get rid of
- memory leak.
-
-Sat Mar 13 11:14:26 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * load.c (rb_get_expanded_load_path): expand paths if any item in $:
- is not a string.
-
-Sat Mar 13 10:16:32 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * load.c (rb_get_expanded_load_path): does not expand paths if all
- the items in $: are absolute paths. [ruby-core:28113]
-
-Sat Mar 13 10:03:52 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw.
-
-Sat Mar 13 03:24:15 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb: show consumed time at last.
-
-Sat Mar 13 00:44:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_basename): check encoding of suffix.
-
-Sat Mar 13 00:11:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): mark initial load paths.
-
- * gem_prelude.rb (push_all_highest_version_gems_on_load_path):
- search insertion position by initial load path mark.
-
- * lib/rubygems.rb (Gem.load_path_insert_index): ditto.
-
-Fri Mar 12 21:34:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * NEWS: emoji encodings.
-
-Fri Mar 12 17:14:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (URI.encode_www_form): new method to
- generate URL-encoded form data. [ruby-dev:39246]
-
- * lib/uri/common.rb (URI.encode_www_component,
- URI.decode_www_component): new method for encode/decode
- a name/value of HTML form.
-
-Fri Mar 12 17:36:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httpservlet/cgihandler.rb
- (WEBrick::HTTPServlet::CGIHandler#do_GET):
- set binary mode for tempfile.
- http://pc12.2ch.net/test/read.cgi/tech/1265467681/286
-
-Fri Mar 12 13:52:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * tool/compile_prelude.rb: TMP_RUBY_PREFIX should replace
- rubylibprefix but not prefix.
-
-Fri Mar 12 09:43:11 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * complex.c (f_signbit): remove condition for signbit because
- all platforms have signbit from r26871.
-
-Fri Mar 12 07:25:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_env): get rid of alloca() for outer string.
-
-Fri Mar 12 07:17:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/racc/cparse/cparse.c: suppressed warnings for shortening on
- platforms where pointer is bigger than int.
-
-Fri Mar 12 07:15:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe, ruby_init_gems): set and remove
- TMP_RUBY_PREFIX.
-
- * variable.c (rb_const_remove): new function.
-
- * tool/compile_prelude.rb: split each preludes.
-
-Fri Mar 12 07:09:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (config.status): setup MINIRUBY environment for
- cross-compiling.
-
-Fri Mar 12 06:48:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/extconf.rb: log() is built-in in some compilers and needs
- proper declaration.
-
-Fri Mar 12 06:37:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/timeout.rb: split from lib/timeout.rb.
-
-Thu Mar 11 22:35:27 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_round): new method Time#round. [ruby-dev:40595]
-
-Thu Mar 11 17:31:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (str_transcode0): confirm the code range.
-
-Thu Mar 11 12:14:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * missing/signbit.c: added.
-
-Thu Mar 11 11:16:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check if target_archs has changed.
-
-Thu Mar 11 01:33:30 2010 wanabe <s.wanabe@gmail.com>
-
- * win32/win32.c (signbit): allow x64.
-
-Thu Mar 11 01:04:48 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * iseq.c (rb_iseq_clone): sets local_iseq and klass properly.
-
-Wed Mar 10 21:25:41 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enum.c (min_ii, max_ii, minmax_ii): remove wrong optimization that
- reuses array for yield parameter, which caused unexpected behavior.
- [ruby-core:25989]
-
-Wed Mar 10 12:10:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * enc/x_emoji.h: renamed from enc/x-emoji.c.
-
-Wed Mar 10 04:17:08 2010 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (defined_expr), insns.def (defined): fix to pass a Symbol
- object such as :$foo for the "defined?($foo)" expression
- on defined instruction. This patch fixes ISeq#to_a/load.
-
-Tue Mar 9 20:50:09 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/dl/test_method.rb: delete a residual test for dl on libffi.
-
-Tue Mar 9 18:00:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * enc/trans/EMOJI/*.src, enc/trans/emoji*,
- enc/x-emoji.c, test/ruby/enc/test_emoji.rb,
- tool/enc-emoji-citrus-gen.rb, tool/enc-emoji4unicode.rb,
- tool/jisx0208.rb, tool/test/test_jisx0208.rb:
- new encodings to support emoji charsets, which are used by
- Japanese mobile phones [ruby-dev:40528].
- Thanks Yoji Shidara for a lot of contribution.
-
- * tool/transcode-tblgen.rb: modified for enc-emoji4unicode.rb.
-
-Tue Mar 9 14:57:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/transcode-tblgen.rb (ActionMap#generate_node):
- remove useless dup.
-
- * tool/transcode-tblgen.rb (transcode_tbl_only): remove duplicated
- method call for encode_utf8.
-
-Tue Mar 9 14:55:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_reg_to_s): remove unused variable.
-
-Tue Mar 9 12:17:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * tool/transcode-tblgen.rb (StrSet#parse, ActionMap#generate_node):
- optimization (reusing object and improving memoize).
- [ruby-dev:40582]
-
-Sun Mar 7 02:27:03 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * dln.c [DLN_NEEDS_ALT_SEPARATOR] (translit_separator): small typo
- fixed.
-
- * symbian/setup (*.pkg): Shared library installation path fixed to
- match changes in version.c.
-
- * symbian/setup (ruby.mmp): SOURCE dln_find.c added.
-
-Sun Mar 7 23:14:22 2010 Tanaka Akira <akr@fsij.org>
-
- * bignum.c (rb_big_pack): use DIGSPERLONG and BITSPERDIG.
- (rb_big_unpack): use DIGSPERLONG.
-
-Sun Mar 7 19:21:10 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * io.c: Fix documentation for each/each_line/lines, bytes/each_byte,
- codepoints/each_code_point [ruby-core:23948]
-
- * string.c: ditto
-
- * ext/stringio/stringio.c: ditto
-
-Sun Mar 7 13:49:49 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c: add optional basedir argument for realpath/realdirpath.
- (realpath_internal): handle basedir.
- (rb_file_s_realpath): extract basedir from argument list.
- (rb_file_s_realdirpath): extract basedir from argument list.
-
- * lib/pathname.rb (realpath): pass basedir.
- (realdirpath): ditto.
-
-Sun Mar 7 02:05:38 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_set_filesystem_encoding):
- filesystem encoding on Mac OS X is now
- default external encoding. so Mac OS X is now
- treated as one of Unix. [ruby-dev:40439]
-
- * file.c (file_path_convert): ditto.
-
-Sat Mar 6 22:07:09 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c: fix the prototype of rb_big2ulong_pack.
-
-Sat Mar 6 13:45:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (rb_io_s_write, rb_io_s_binwrite): delete File#write and
- #binwrite. It may take a long time to make them stable, so 1.9.2
- should not include them. We need refactoring to implement them
- again.
-
- * test/ruby/test_io.rb: delete tests for them.
-
-Sat Mar 6 10:03:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (rb_io_s_binwrite): use mode "r+b" instead of "ab" to handle
- offset correctly. [ruby-core:28517]
-
- * test/ruby/test_io.rb: use assert_equal instead of assert.
-
-Sat Mar 6 01:08:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): VC6 has __int64.
-
-Fri Mar 5 19:36:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (econv_opts): set :undef => :replace when
- :replace is given and :invalid is not given. [ruby-dev:40554]
-
-Fri Mar 5 17:51:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (pipe_open): suppressed a warning.
-
- * win32/win32.c (rb_w32_map_errno, winnt_stat, rb_chsize): ditto.
-
- * win32/win32.c (rb_w32_aspawn): get rid of overflow.
-
-Fri Mar 5 11:59:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (signbit): defined on mingw.
-
-Thu Mar 4 22:49:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (setup_exception): avoid line number 0 when setting
- $DEBUG=true. [ruby-dev:39116]
-
-Thu Mar 4 22:45:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (io_s_write, io_s_binwrite): add File#write and #binwrite.
- [ruby-core:21701]
-
- * test/ruby/test_io.rb: add tests for above.
-
-Mon Mar 4 13:14:34 2010 wanabe <s.wanabe@gmail.com>
-
- * gc.c (gc_profile_total_time): add GC::Profiler.total_time.
- [ruby-core:27169]
-
- * NEWS: ditto.
-
-Thu Mar 4 10:15:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * complex.c (m_log, m_exp): remove unused functions.
-
-Thu Mar 4 02:34:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_env.rb (TestEnv#test_select_bang): add tests.
-
-Thu Mar 4 02:29:52 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_hash.rb (TestHash#test_keep_if): fix typo.
-
-Thu Mar 4 00:10:54 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/transcode-tblgen.rb (HEX2): extracted from regexps.
-
-Wed Mar 3 23:16:32 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * complex.c (nucomp_real_check): raise TypeError instead of
- ArgumentError when argument is not a real as expected
- [ruby-core:28395]
-
- * rational.c (nurat_int_check): ditto (for integers)
-
-Wed Mar 3 23:07:08 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (Vector#each): Return self and optimization
- [ruby-core:28405]
-
-Wed Mar 3 18:35:55 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_select_bang): add #select! and keep_if to Hash.
-
- * hash.c (env_select_bang): ..and to ENV.
-
-Wed Mar 3 15:54:20 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/matrix.rb (Vector#each2, collect2): small refactoring.
-
-Wed Mar 3 16:14:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/matrix.rb (Vector#each): make Vector enumerable.
- [ruby-core:28405]
-
-Wed Mar 3 14:28:23 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_select_bang): select! removes all elements for
- which block returns false. [ruby-core:27286]
-
- * array.c (rb_ary_keep_if): #keep_if, new method.
-
-Wed Mar 3 06:19:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (signbit): defined.
-
- * win32/Makefile.sub, symbian/setup (config.h): pack.c requires
- SIZEOF_INT*_T now.
-
-Tue Mar 2 21:16:48 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (rb_io_lines, rb_io_bytes, rb_io_chars, rb_io_codepoints):
- change to alias to each_*, in similar way to ARGF and String.
- [ruby-core:23948]
-
-Tue Mar 2 15:54:40 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (noname_disable_map): add NT_ANCHOR case.
- Without this change, captured groups in anchors (look-ahead,
- look-behind, and so on) are not removed and
- unintended invalid backref error occur. [ruby-core:28235]
-
- * regcomp.c (renumber_by_map): ditto.
-
-Tue Mar 2 14:42:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * test/dl/test_closure.rb: forget to revert at r26764.
-
-Tue Mar 2 14:29:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_find_file_ext_safe, rb_find_file_safe): skip argument
- checks in file_expand_path().
-
-Tue Mar 2 13:54:44 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * test/ruby/test_math.rb: Fix lgamma test
-
-Mon Mar 1 23:26:56 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/pty/pty.c (pty_open): refine the path for master IO.
-
-Mon Mar 1 20:07:06 2010 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare
- different type values warning.
-
-Mon Mar 1 17:42:45 2010 wanabe <s.wanabe@gmail.com>
-
- * configure.in (mingw): do not detect snprintf/vsnprintf.
-
-Mon Mar 1 16:54:21 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/oniguruma.h: updated to follow Oniguruma 5.9.2.
-
- * re.c (make_regexp): use onig_new() instead of onig_alloc_init().
-
- * re.c (rb_reg_to_s): ditto.
-Sun Feb 28 21:32:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pty/pty.c (get_device_once): raise on error when fail is
- non-zero.
-
-Sun Feb 28 18:58:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * math.c (rb_eMathDomainError): new exception class
- for representing mathematical domain error instead
- of Errno::EDOM.
-
- * math.c (domain_check, infinity_check): removed,
- no longer needed.
-
- * math.c (math_atan2, math_acos, math_asin, math_acosh,
- math_atanh, math_log, math_log2, math_log10, math_sqrt,
- math_gamma, math_lgamma): mathematical domain errors
- are checked and raised before calling libm's functions.
-
- * test/ruby/test_math.rb: updated for changes of math.c.
-
-Sun Feb 28 15:07:28 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (pack_pack): use union to avoid pointer cast.
- (pack_unpack): ditto.
-
-Sun Feb 28 11:49:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.
- patched by Jeroen van Meeuwen at [ruby-core:25210]
- fixed by Nobuyoshi Nakada [ruby-core:25238],
- Hongli Lai [ruby-core:27417],
- and Motohiro KOSAKI [ruby-core:28063]
-
- * ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
- split pkcs7_get_certs_or_crls.
-
-Sun Feb 28 11:42:55 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/openssl/{test_x509cert.rb,openssl,test_x509crl.rb,
- test_x509req.rb}:
- fix false positive tests because of OpenSSL spec change.
- patched by originally Hongli Lai [ruby-core:27417],
- and fixed by Motohiro KOSAKI [ruby-core:28063]
-
-Sun Feb 28 11:21:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/openssl/{test_x509cert.rb,openssl,test_x509req.rb}:
- remove false positive tests because of OpenSSL spec change.
- patched by Motohiro KOSAKI [ruby-core:28063]
- see also [ruby-dev:40077]
-
-Sun Feb 28 11:25:16 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (pack_pack): generalized integer packer implemented.
- (pack_unpack): generalized integer unpacker implemented.
-
-Sun Feb 28 06:58:53 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (swap32): use __builtin_bswap32 on gcc 4.3.0 or later.
- (swap64): ditto.
-
-Sun Feb 28 00:38:18 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c: use integer types with explicit size.
-
-Sat Feb 27 15:54:55 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c: check assumption on QUAD_SIZE and SIZEOF_LONG.
-
- * bignum.c: check assumption on SIZEOF_LONG and SIZEOF_BDIGITS.
-
-Sat Feb 27 03:48:18 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c: fix q and Q for big endian environments which have no
- 8 bytes integer type.
- (pack_pack): use rb_big_pack.
- (pack_unpack): use rb_big_unpack.
-
- * include/ruby/intern.h (rb_big_pack): declared.
- (rb_big_unpack): ditto.
-
- * bignum.c (rb_big_pack): new function.
- (rb_big_unpack): ditto.
-
-Fri Feb 26 21:36:51 2010 Tanaka Akira <akr@fsij.org>
-
- * bignum.c: fix rb_quad_pack and rb_quad_unpack for environments
- which don't have 8bytes integer type. This still depends on little
- endian.
- (rb_quad_pack): use quad_buf_complement. don't raise for large
- values.
- (rb_quad_unpack): use quad_buf_complement.
- (quad_buf_complement): new function extracted from rb_quad_pack.
- add one after bitwise negation.
-
-Fri Feb 26 21:29:48 2010 Tanaka Akira <akr@fsij.org>
-
- * configure.in (RSHIFT): add parenthesis to suppress warning.
-
-Fri Feb 26 20:51:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/socket/raddrinfo.c, ext/socket/udpsocket.c: avoid illegal cast
- from void-returning function to VALUE-returning one. It causes SEGV
- on RubySpec with mingw32.
-
-Fri Feb 26 20:07:48 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (QUAD_SIZE): it should be always 8.
-
- * bignum.c (rb_quad_pack): use LONG_LONG version only if
- SIZEOF_LONG_LONG == QUAD_SIZE.
-
-Fri Feb 26 16:49:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (swap64): fix for VC6.
-
-Fri Feb 26 14:17:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (pack_pack, pack_unpack): suppressed warnings.
-
-Fri Feb 26 07:44:51 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/dl: revert dl with libffi because it can't run on mswin now.
-
-Thu Feb 25 22:59:46 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c: consider DYNAMIC_ENDIAN. refactored.
-
-Thu Feb 25 11:17:01 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * rational.c (nurat_expt): use Float#** when Rational ** Float.
- This fixes Rational(3,1)**3.0=>26.99999999999999 on FreeBSD.
-
- * complex.c (rb_fexpt): removed.
- Note that this function is not static but is private.
-
-Thu Feb 25 00:43:57 2010 Koichi Sasada <ko1@atdot.net>
-
- * insns.def: Change the operand type of setinlinecache
- (OFFSET to IC). This IC must be same as corresponding
- getinlinecache instruction's IC operand.
- This change is for a little performance improvement
- (getting IC directly) and is for the AOT compilation development.
-
- * compile.c, iseq.c, insns.def: Change the approach to handling inline
- cache (IC) type operand to enable the above change.
- This change also affects ISeq#to_a method. The inline cache operand
- will be dumped by fixnum, the index of inline cache, in other words,
- inline cache identity.
-
- * template/insns_info.inc.tmpl, tool/instruction.rb: No need to count
- inline cache size (insn_iclen()).
-
-Thu Feb 25 00:57:59 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (swap64): don't redefine.
-
-Thu Feb 25 00:29:55 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (pack_unpack): don't use OFF32 for gcc 4.5.
-
-Wed Feb 24 22:39:15 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg.
- (Resolv::DNS::Requester#request): raise ResolvTimeout
- consistently for timeout.
-
-Wed Feb 24 14:38:16 2010 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems/indexer: Removed obsolete files.
-
-Wed Feb 24 11:52:05 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (translit_separator): moved back from load.c again.
-
- * dln_find.c: split from dln.c.
-
-Wed Feb 24 09:31:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/digest/extconf.rb: use OpenSSL only when all transform
- functions are available.
-
-Wed Feb 24 00:39:17 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (str_new_empty): String#split, partition, rpartition
- taints the resulting strings if self is tainted.
-
-Mon Feb 22 21:35:33 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/digest/sha2/sha2init.c: test OpenSSL more strictly.
-
-Mon Feb 22 11:52:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems: update to 1.3.6.
-
-Mon Feb 22 11:21:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/digest/sha2: Use OpenSSL's SHA1 engine if available.
-
-Sun Feb 21 21:20:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile, install_files): honor srcprefix
- argument if given. [ruby-dev:40449]
-
-Sun Feb 21 13:29:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems/rubygems_version.rb: outdated. [ruby-core:28275]
-
-Sun Feb 21 06:24:12 2010 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (config.h): HAVE_STRUCT_TIMEZONE, VOID_UNSETENV, and RUBY_LIB_VERSION_STYLE defined.
- * symbian/setup (ruby.mmp): SOURCE node.c added.
-
-Mon Feb 22 09:15:45 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_mark_children): lost comment added.
-
-Sat Feb 20 14:42:19 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object0): should prepare placeholder before
- processing instance variables. [ruby-dev:40414]
-
- * marshal.c (id2encidx): no longer need arg.
-
-Sat Feb 20 14:36:16 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm.c (vm_backtrace_each): use called_id when method definition
- structure is already freed. [ruby-dev:40234] [ruby-core:27959]
-
-Fri Feb 19 00:04:19 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/drb/drb.rb (DRbServer#stop_service): join killed thread to
- ensure service stops. [ruby-dev:40441]
-
-Thu Feb 18 22:31:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * math.c (math_atanh): raise ERANGE without calling atanh if absolute
- value is 1 to achieve platform-independent math. [ruby-core:28219]
-
- * math.c (math_lgamma): return [Infinity, 1] without calling lgamma_r
- if argument is infinity or -infinity. [ruby-core:28219]
-
-Thu Feb 18 22:28:00 2010 Kenta Murata <mrkn@mrkn.jp>
-
- * configure.in: new --with-ext and --with-out-ext options for extmk.
- * tool/mkconfig.rb: normalizing --with-out-ext to --without-ext.
-
-Thu Feb 18 21:50:00 2010 Tanaka Akira <akr@fsij.org>
-
- * pack.c (pack_unpack): call PACK_ITEM_ADJUST for 'Q'.
-
-Thu Feb 18 02:14:26 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (io_fread, io_getpartial, io_read, io_sysread): by using lock,
- prohibit modification of buffer string during read (which had caused
- EFAULT or SEGV). [ruby-dev:40437]
-
- * test/ruby/test_io.rb: rewrite tests for the old behavior.
-
-Wed Feb 17 21:34:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * regcomp.c (setup_tree, onig_compile): optimize .* at last by
- converting into (?>.*), which does not backtrack. [ruby-core:27791]
-
- * test/ruby/test_regexp.rb: add a test for above.
-
-Wed Feb 17 21:26:53 2010 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb (assert_normal_exit): add :timeout option.
-
-Wed Feb 17 17:05:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_cfunc): removed unused variable.
-
- * vm.c (vm_frametype_name): define only when VMDEBUG.
-
-Wed Feb 17 15:34:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/dl_conversions.c (rb_dl_type_to_ffi_type): support signed
- long long.
-
- * ext/dl/cfunc.c (rb_dlcfunc_inspect): get rid of overflow.
-
- * ext/dl/closure.c (dlc_callback, rb_dlclosure_init): ditto.
-
- * ext/dl/cptr.c (rb_dlptr_s_malloc): ditto.
-
- * ext/dl/method.c (rb_dlfunction_initialize): ditto.
-
-Wed Feb 17 01:16:12 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * hash.c (hash_update): always raise an exception when adding a new
- key during iteration. Traditionally, an exception was raised only
- when rehash occurs, but it may lead to difficult bug to reproduce.
- [ruby-core:23614]
-
-Tue Feb 16 22:09:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c (chain_finalized_object): fix precedence.
-
-Tue Feb 16 21:32:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * gc.c (rb_objspace_call_finalizer): always run finalizer at exit,
- before object is free'd. [ruby-dev:40382]
-
-Tue Feb 16 20:56:39 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c (rb_group_member): renamed from group_member.
- don't use group_member() in glibc because it's not valgrind clean.
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570047
-
-Tue Feb 16 19:19:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/cfunc.c (rb_dlcfunc_call): convert signed value to
- unsigned.
-
-Tue Feb 16 19:02:59 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/dl/test_{base,handle}.rb: use more verbose assertions.
-
- * test/dl/test_import.rb (DL::LIBC::BoundQsortCallback): renamed
- to get rid of overwriting warning.
-
-Tue Feb 16 11:03:19 2010 Aaron Patterson <aaron@tenderlovemaking.com>
-
- * ext/dl/method.c: Adding DL::Method as a superclass for DL::Function
-
-Mon Feb 15 23:37:30 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c: check lseek error by errno. NetBSD 4.0.1 may return -1 as
- a file position of tty.
-
-Mon Feb 15 23:08:56 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/pstore.rb (PStore#initialize): initialize @thread_safe.
- [ruby-core:27853]
-
-Mon Feb 15 22:45:26 2010 Tanaka Akira <akr@fsij.org>
-
- * st.c (st_foreach): don't access ptr->hash after func call.
- It may access freed area.
-
-Mon Feb 15 22:25:16 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/zlib/zlib.c (zlib_mem_alloc): suppress valgrind warnings.
- http://www.zlib.net/zlib_faq.html#faq36
-
-Mon Feb 15 22:18:49 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_add): propagate fixed time offset.
-
-Mon Feb 15 17:42:20 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * signal.c (USE_SIGALTSTACK): NetBSD can't use sigaltstack(2)
- with pthread.
- http://netbsd.gw.com/cgi-bin/man-cgi?sigaltstack++NetBSD-current
-
-Mon Feb 15 13:11:47 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * array.c (rb_ary_push_m): use rb_ary_modify instead of
- rb_ary_modify_check. This fixes regression due to r26632.
-
-Sun Feb 14 12:54:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_object0): removed duplicated entry for regexp.
- [ruby-dev:40416]
-
-Sun Feb 14 04:45:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_object0): register regexp object before encoding
- name. [ruby-dev:40414]
-
- * re.c (rb_reg_alloc, rb_reg_init_str): split from rb_reg_new_str.
-
-Sat Feb 13 17:07:20 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_delete): RDoc update. a patch from Hugh Sasse.
- [ruby-core:28128]
-
- * array.c (rb_ary_compact_bang): ditto.
-
-Sat Feb 13 15:01:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (id2encidx): duplicated entry for encoding name.
- [ruby-dev:40388]
-
-Sat Feb 13 12:17:52 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/tempfile.rb (Tempfile::Remover): new class to replace
- Tempfile.callback. port r24902 from Ruby 1.8.
-
-Fri Feb 12 17:55:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (thread_free): fixed typo.
-
-Fri Feb 12 02:27:39 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#initialize, Set#replace, Set#merge)
- (Set#subtract, Set#&): Fix duck type tests. [ruby-core:28078]
-
- * lib/set.rb (Set#initialize, Set#replace, Set#merge)
- (Set#subtract, Set#&): Try #each if #each_entry fails.
-
-Thu Feb 11 20:43:00 2010 Tanaka Akira <akr@fsij.org>
-
- * io.c (rb_io_oflags_modestr): return "r" for O_RDONLY|O_APPEND.
- [ruby-dev:40379]
-
-Thu Feb 11 19:19:21 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * missing/alloca.c: s/RUBY_LIB/RUBY_LIB_PREFIX/ [ruby-dev:40395]
-
-Thu Feb 11 17:52:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_exec): reset thread state before restarting vm loop
- from catch scope. [ruby-core:28129], [ruby-core:28143]
-
-Thu Feb 11 14:43:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_object0): read sequentially since marshal source
- may not be possible to rewind. [ruby-dev:40386]
-
- * marshal.c (r_object0): replace non-1.8 escapes directly.
-
-Thu Feb 11 09:49:31 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb: fix [ruby-core:28144] reported by Hans de Graaff.
- (Resolv::DNS#make_requester): pass nameserver_port to
- UnconnectedUDP.new.
- (Resolv::DNS.bind_random_port): change the is_ipv6 argument to
- bind_host.
- (Resolv::DNS::Requester#initialize): change instance variable to
- store multiple sockets.
- (Resolv::DNS::Requester#request): pass readable sockets to
- recv_reply.
- (Resolv::DNS::Requester#close): close all sockets.
- (Resolv::DNS::Requester::UnconnectedUDP#initialize): allocate
- a socket for each address family of name servers.
- (Resolv::DNS::Requester::UnconnectedUDP#recv_reply): read from the
- passwd readable socket.
- (Resolv::DNS::Requester::UnconnectedUDP#sender): use appropriate
- socket for the target nameserver.
- (Resolv::DNS::Requester::ConnectedUDP): follow the instance variable
- change.
- (Resolv::DNS::Requester::TCP#sender): ditto.
- (Resolv::DNS::Config#nameserver_port): new method.
-
-Thu Feb 11 01:45:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (vm_exec): temporarily revert r26628, which causes SEGV when
- executing rubyspec.
-
-Wed Feb 10 16:31:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_push_m, rb_ary_unshift_m, rb_ary_aset),
- (rb_ary_insert, rb_ary_replace, rb_ary_concat),
- (rb_ary_uniq_bang, rb_ary_flatten_bang): check if frozen after
- wrong number of arguments but before TypeError.
- [ruby-core:28140]
-
- * hash.c (rb_hash_replace): ditto.
-
- * string.c (rb_str_replace): ditto.
-
-Wed Feb 10 04:06:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_exec): reset thread state before starting vm loop.
- [ruby-core:28129]
-
-Tue Feb 9 23:48:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_divide): fix precision too.
-
-Tue Feb 9 23:26:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix precision.
- [ruby-core:17472][ruby-dev:35372][ruby-dev:40105][ruby-dev:40358]
-
-Tue Feb 9 22:23:27 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * io.c (READ_CHECK): do not select fd before reading, that had made
- TCPServer#gets stuck. [ruby-dev:40317]
-
-Tue Feb 9 21:27:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/text.rb (REXML::Text#initialize): REXML::Text.new checks
- raw text for illegal characters without entity check, for the sake
- of 1.8 compatibility. This had caused rubyspec error.
-
-Mon Feb 8 23:49:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_getline_fast): wrong calculation of new position
- from rb_str_coderange_scan_restartable(). [ruby-core:28103]
-
- * io.c (read_all): ditto.
-
- * sprintf.c (rb_str_format): ditto.
-
-Mon Feb 8 21:03:53 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (socket_s_ip_address_list): obtain the scope_id
- of IPv6 link local address on OpenSolaris.
-
-Mon Feb 8 16:27:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dmyversion.c: empty load path in miniruby.
-
- * common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
-
- * tool/eval.rb, win32/{mkexports,resource}.rb: miniruby no longer
- contains "." in $:.
-
-Mon Feb 8 15:15:07 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_clone): call initialize_clone hook method to
- call initialize_copy.
-
- * object.c (rb_obj_dup): call initialize_dup hook.
-
- * lib/delegate.rb (Delegator#initialize_clone): use new hook to
- implement deep copy. [ruby-dev:40242]
-
- * lib/delegate.rb (Delegator#initialize_dup): ditto.
-
- * test/test_delegate.rb (TestDelegateClass#test_copy_frozen): add
- a test to ensure #clone copies frozen status.
-
-Mon Feb 8 10:28:58 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: check pthread_attr_getstack to prevent obsolete
- warning for pthread_attr_getstackaddr.
-
-Sun Feb 7 23:12:34 2010 Tanaka Akira <akr@fsij.org>
-
- * sample/test.rb: sort files for syntax validation.
-
-Sun Feb 7 23:08:53 2010 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/runner.rb: sort test files.
-
-Sun Feb 7 12:53:12 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/rake.rb (Rake::FileList::ARRAY_METHODS): fix test failure by <=>
- definition at Kernel.
-
-Sun Feb 7 03:01:46 2010 Tanaka Akira <akr@fsij.org>
-
- * math.c (math_lgamma): initialize sign because
- lgamma(NaN) doesn't set the sign in OpenSolaris.
-
-Sun Feb 7 00:23:21 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * class.c (rb_class_init_copy): raise a TypeError if the argument is
- BasicObject. [ruby-core:27060]
-
-Sat Feb 6 23:37:11 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (initialize): set @sock to a NullSocket instance to
- raise FTPConnectionError when not connected. [ruby-dev:40258]
-
-Sat Feb 6 23:25:57 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/curses/view2.rb: replaced with Hugh Sasse's version.
- [ruby-core:27894]
-
-Sat Feb 6 22:57:00 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (receive_responses): does not hang when an
- unexpected BYE response received. fixed [ruby-core:27944].
- Thanks, Bob Potter.
-
-Sat Feb 6 21:31:23 2010 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb (wait): supported timeout.
-
- * test/net/imap/test_imap.rb (test_exception_during_idle): use timeout.
-
-Sat Feb 6 19:35:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * tool/compile_prelude.rb: fix require path.
-
-Sat Feb 6 12:02:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#method_missing),
- (Delegator.delegating_block): don't hide backtrace from
- __getobj__ and reduced exception messages when $DEBUG.
-
-Sat Feb 6 11:35:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/ipsocket.c (ip_addr, ip_peeraddr),
- ext/socket/socket.c (sock_s_getaddrinfo): added optional
- reverse_lookup flag. [ruby-core:28007]
-
-Sat Feb 6 01:55:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/stringio/stringio.c (strio_ungetc): pads with \000 when the
- current position is after the end. [ruby-dev:40271]
-
-Sat Feb 6 01:14:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/purelib.rb, common.mk: to simulate ruby command more precisely,
- remove "." from $: of virtual environment for build and test.
-
-Sat Feb 6 00:02:31 2010 Tanaka Akira <akr@fsij.org>
-
- * random.c (fill_random_seed): don't use O_NOFOLLOW because
- /dev/urandom is a symlink in OpenSolaris.
-
- * lib/securerandom.rb (SecureRandom.random_bytes): ditto.
-
-Fri Feb 5 16:38:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/delegate.rb (Delegator): include copy of Kernel.
- [ruby-dev:40314]
-
- * lib/delegate.rb (Delegator#{dup,clone}): class of copy should be
- Delegator. [ruby-dev:40313]
-
-Fri Feb 5 09:26:54 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * bignum.c (big_op): remove unused variables.
-
-Fri Feb 5 02:06:57 2010 Aaron Patterson <tenderlove@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb: Struct members are emitted without a leading
- colon. Thanks Yusuke Endoh! [ruby-core:28052]
-
- * test/yaml/test_struct.rb: fixed tests to go with Struct changes
-
- * test/yaml/test_yaml.rb: fixed tests to go with Struct changes
-
-Fri Feb 5 00:34:24 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (big_gt, big_ge, big_lt, big_ge): added Bignum#>, >=, < and
- <= to allow to compare with BigDecimal. [ruby-dev:40167]
-
-Thu Feb 4 15:47:27 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * thread_pthread.c (native_thread_init_stack): use get_stack.
- patched by KOSAKI Motohiro [ruby-dev:40309]
-
- * thread_pthread.c (ruby_init_stack): use get_stack
- on platforms which have pthread_attr_get_np.
- (FreeBSD, DragonFlyBSD and NetBSD)
- This is because FreeBSD and DragonFly BSD must use
- pthread_attr_get_np to get stack size of main thread,
- but Mac OS X and Linux with LinuxThreads must use getrlimit.
- <http://www.nminoru.jp/~nminoru/programming/stackoverflow_handling.html>
- <http://d.hatena.ne.jp/nurse/20100204>
-
-Thu Feb 4 09:55:38 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: FreeBSD, DragonFly BSD and OpenBSD needs
- pthread_np.h to use pthread_*_np functions.
- OpenBSD's pthread_*_np also depend sys/signal.h,
- but it is included at signal.h via vm_core.h via thread.c.
-
-Thu Feb 4 08:15:53 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/delegate.rb (Delegator): now inherits BasicObject.
- [ruby-dev:39154], [Bug #2679], [ruby-dev:40242]
-
-Thu Feb 4 03:00:59 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): get red of
- floating point exception.
-
-Thu Feb 4 01:24:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix infinity
- handling. 1 / Infinity was evaluated to NaN.
-
-Thu Feb 4 00:37:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_mdump, time_mload): dump/load utc_offset.
- [ruby-dev:40063]
-
-Wed Feb 3 22:22:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check for non-portable stack attribute functions.
-
-Wed Feb 3 20:10:52 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/iconv/charset_alias.rb: pass block argument to outer local
- variable.
-
-Wed Feb 3 20:08:05 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c (realpath_rec): rb_path_last_separator may return NULL.
-
-Wed Feb 3 13:15:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * thread_pthread.c: DragonFlyBSD is also the same as FreeBSD
- on getting the stack size of the main thread.
-
-Wed Feb 3 12:30:10 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * thread_pthread.c (ruby_init_stack): use pthread_get_attr_np
- to get the stack size of the main thread on FreeBSD.
-
- * thread_pthread.c: include pthread_np.h on FreeBSD.
-
-Wed Feb 3 11:38:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/{closure,function}.c: removed C99 features and warnings.
-
-Wed Feb 3 10:12:09 2010 Aaron Patterson <tenderlove@ruby-lang.org>
-
- * ext/dl/function.c: DL::Function now uses libffi
-
- * ext/dl/cfunc.c (rb_dl_set_last_error): set to non static so errors
- can be exposed.
-
- * ext/dl/closure.c: DL::Closure will now be used in place of
- ext/dl/callback/*.
-
- * ext/dl/dl.c: legacy callbacks removed in favor of libffi
-
- * ext/dl/dl_conversions.(c,h): used for converting ruby types to FFI
- types.
-
- * ext/dl/callback/*: replaced by libffi callbacks.
-
- * ext/dl/lib/dl/callback.rb: Converting internal callbacks to use
- DL::Closure
-
- * ext/dl/lib/dl/closure.rb: Ruby parts of the new DL::Closure object
-
- * ext/dl/lib/dl/import.rb: More conversion to use DL::Closure object
-
- * ext/dl/lib/dl/value.rb (ruby2ffi): adding private method for
- DL::CPtr to ffi value conversion.
-
-Tue Feb 2 18:15:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c: turn on do_not_reverse_lookup by default,
- which has been reverted in r9880 probably unintentionally,
- according to matz. [ruby-core:24530]
-
-Tue Feb 2 14:46:06 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c: move implementation of each_slice, each_cons,
- each_with_object to enum.c.
-
- * enum.c (each_slice_i): convert multiple values from yield into
- an array.
-
- * enum.c (each_cons_i): ditto.
-
- * enum.c (each_with_object_i): ditto.
-
-Tue Feb 2 14:30:27 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_each_entry): new method #each_entry to pack values
- from yield into an array.
-
- * lib/set.rb (Set#merge): use Enumerable#each_entry to implement
- Set compatible to 1.8 behavior. [ruby-core:27985]
-
- * lib/set.rb: replace is_a?(Enumerable) with respond_to?(:each)
- for duck typing.
-
- * lib/set.rb (SortedSet#add): typo fixed.
-
-Tue Feb 2 11:13:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#marshal_dump): exclude
- delegator-specific instance variables.
-
-Mon Feb 1 21:26:41 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/matrix.rb (Vector#each2): returns a self. [ruby-dev:40241]
-
-Mon Feb 1 17:08:42 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_minus): RDoc update. a patch from red stun
- in [ruby-core:27951]
-
-Mon Feb 1 07:36:33 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tkutil/tkutil.c: fix SEGV on TkUtil::CallbackSubst._setup_subst_table.
-
- * ext/tk/lib/tk.rb: [ruby1.9] fix freeze at exit.
-
- * ext/tk/lib/tk.rb: [POTENTIAL INCOMPATIBLE] return NoMethodError
- for TkWindow#to_ary and to_str.
-
- * ext/tk/lib/tkextlib/tcllib/plotchart.rb: wrong arguments.
-
- * ext/tk/sample/tkballoonhelp.rb: fail to support TkEntry widgets.
-
-Sun Jan 31 23:20:43 2010 wanabe <s.wanabe@gmail.com>
-
- * io.c (rb_io_each_codepoint): use cbuf when needs readconv.
-
-Sun Jan 31 23:07:23 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_dir.rb: use string instead of symbol as file name.
-
-Sun Jan 31 22:41:33 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_string_value): fix the previous commit.
-
-Sun Jan 31 21:43:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * string.c (rb_string_value): make no exception for Symbol.
- [ruby-dev:40274]
-
-Sun Jan 31 21:10:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969]
-
-Sun Jan 31 21:29:58 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
- parent is specified, since Text.check may need doctype. partially
- revert r26518.
-
-Sun Jan 31 15:50:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/text.rb (REXML::Text#initialize): fix typo and a bug that
- seems to be caused by refactoring.
-
-Sun Jan 31 15:46:37 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/parent.rb (REXML::Parent#delete): return the deleted node
- because the rdoc of REXML::Element#delete_element says it returns
- "the element that was removed." [REXMLTracker#161]
-
-Sun Jan 31 14:33:00 2010 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: A bug fix for deleting blank Table rows from Andy Hartford.
-
-Sun Jan 31 13:31:43 2010 wanabe <s.wanabe@gmail.com>
-
- * gc.c (obj_free): free rb_classext_t of eigenclass. [Bug #1392]
-
-Sun Jan 31 13:00:14 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/rexml/document.rb (REXML::Document#add): fix duplicate XMLDecls
- and bad DocTypes in REXML::Document. (Bug #19058) [ruby-core:27979]
- based on the patch by Federico Builes.
-
-Fri Jan 29 22:49:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/getoptlong.rb (set_options): ensure that the type of argument is
- Array, restoring this check that was deleted at r10239. This caused
- rubyspec error.
-
-Fri Jan 29 12:59:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (mingw): needs $(DEFFILE) for extension libraries.
- [ruby-core:27946]
-
-Fri Jan 29 11:09:49 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_do): log no source when no development env.
-
- * lib/mkmf.rb (create_makefile): srcprefix always needs $(srcdir).
-
- * lib/mkmf.rb (create_makefile): yield configuration if a block is
- given.
-
-Fri Jan 29 09:43:30 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/trans/utf8_mac.trans (buf_shift_char): don't see uninitialized
- value. [ruby-dev:40233]
-
-Fri Jan 29 01:42:24 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#initialize_copy): use initialize_copy
- instead of overriding clone/dup. [ruby-dev:40221]
- it now always clones the target, it might cause incompatibility.
-
-Fri Jan 29 01:26:53 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): update RDoc to
- denote that #to_i raises FloatDomainError for Inf and NaN.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): fast #to_i using
- BigDecimal_split().
-
- * bignum.c (conv_digit): use faster ISDIGIT() assuming ASCII.
-
-Fri Jan 29 00:18:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/cgi.rb: set autoload to CGI::HtmlExtension. [ruby-dev:40194]
-
-Thu Jan 28 09:44:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (onig_compile): initialize ScanEnv.
- mainly to initialize env->warnings_flag [ruby-dev:40196]
-
- * regparse.c (scan_env_clear): clear warnings_flag.
-
-Wed Jan 27 23:33:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/matrix/test_matrix.rb, test/matrix/test_vector.rb: add some
- tests.
-
-Wed Jan 27 23:29:36 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/thread.rb (ConditionVariable#wait, signal, broadcast): return
- self (for 1.8 compatibility).
-
-Wed Jan 27 23:27:54 2010 Keiju Ishitsuka <keiju@emperor2.pendome>
-
- * lib/matrix.rb: add exception Matrix::ErrOperationNotImplemented
- [ruby-dev:40149].
- * lib/matrix.rb: change message of exception
- Matrix::ErrOperationNotDefined [ruby-dev:40150], [ruby-dev:40176].
- * lib/matrix.rb: add method Vector#/ [ruby-dev:40151].
- * lib/matrix.rb(Matrix::Scalar#+,-,/): delete meaningless when
- switch. [ruby-dev:40149]
-
-Wed Jan 27 23:22:54 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * vm_dump.c (bugreport_backtrace): trivial change.
-
- * vm_dump.c (rb_vm_bugreport): uninitialized local variable i.
- [ruby-dev:40169]
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_segv_test):
- follow above change.
-
-Wed Jan 27 23:20:52 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_exception.rb
- (TestException#test_thread_signal_location):
- change test method name.
-
-Wed Jan 27 22:48:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/matrix.rb (determinant): fix name error.
-
-Wed Jan 27 22:26:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_backtrace): "circular require" warning was output to
- stdout except the first line. All line is output to stderr now.
- [ruby-dev:40147]
-
-Wed Jan 27 00:22:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod, BigDecimal_mod,
- BigDecimal_divmod, BigDecimal_div2): BigDecimal#% and #div returned
- an array itself that was returned by #divmod.
-
-Wed Jan 27 00:19:30 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpCtoV): do not raise infinity
- exception for BigDecimal("0E200000000000").
-
-Tue Jan 26 21:50:31 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/bigdecimal/bigdecimal.c (VpCtoV): BigDecimal("0E200000000000")
- was Infinity, not 0.
-
- * test/bigdecimal/test_bigdecimal.rb: add a test for above.
-
-Tue Jan 26 21:36:22 2010 Tanaka Akira <akr@fsij.org>
-
- * configure.in: test unsetenv returns a value.
- unsetenv is void in older BSDs (FreeBSD 6 and OpenBSD 4.5 at least).
-
- * hash.c (ruby_setenv): don't use the result of unsetenv if unsetenv
- doesn't return a value.
-
-Tue Jan 26 21:32:03 2010 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: suppress a warning.
-
- * ext/extmk.rb: ditto.
-
-Tue Jan 26 20:23:22 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (rb_vm_invoke_proc): this function must not catch TAG_RETURN
- because vm_exec does. This caused rubyspec error. [ruby-dev:40158]
-
-Tue Jan 26 20:21:28 2010 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/eq.rb: fix circular require in drb.
- reported by akr. see [ruby-dev:40156] [ruby-core:27661]
-
-Tue Jan 26 19:59:17 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/zlib/zlib.c (rb_gzfile_s_wrap): add rdoc. [Bug #2656]
- patched by Hugh Sasse [ruby-core:27692] [ruby-core:27852]
-
- * ext/zlib/doc/zlib.rd: removed.
-
-Tue Jan 26 16:43:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/strscan/strscan.c: fix rdoc. (length -> bytesize)
- reported by Kornelius Kalnbach. see [ruby-core:27792]
-
-Tue Jan 26 07:06:05 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/matrix.rb: suppress warnings.
-
-Tue Jan 26 03:16:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c, vm_core.h, eval.c: because rb_protect must not be jumped by
- callcc, revert r26407. And rename trap_tag to protect_tag and
- change exception message (across trap -> across stack rewinding
- barrier).
-
-Mon Jan 25 23:08:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (do_select): wrong conditions. [ruby-core:27753]
-
-Mon Jan 25 22:31:53 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/envutil.rb: use method_defined? instead of
- instance_methods.include?.
-
-Mon Jan 25 22:08:20 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * cont.c (rb_cont_call, cont_restore_1): remove trap_tag check because
- it seems not to make sense. [ruby-dev:40121]
-
- * vm_core.h, eval.c (rb_protect): ditto.
-
-Mon Jan 25 21:43:05 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/envutil.rb: fix the check if instance method `ruby' is
- defined or not.
-
-Mon Jan 25 21:17:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rubyoptions.rb (test_segv_test): add a test for
- bugreport trace dumper.
-
-Mon Jan 25 17:47:02 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pty/pty.c (pty_check): needs WNOHANG to poll, return $?, and
- call raise_from_check() with pid_t. [ruby-dev:40141]
-
-Mon Jan 25 17:36:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * version.c (RUBY_LIB, RUBY_*_LIB): moved from configures.
-
-Mon Jan 25 12:11:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (USE_SIGALTSTACK): only when SA_SIGINFO also is
- available. see [ruby-core:27768].
-
-Mon Jan 25 12:02:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dln.c, file.c, io.c, signal.c: add __HAIKU__.
- patched by Alexander von Gluck [ruby-core:27767]
-
-Mon Jan 25 11:45:47 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * math.c (domain_check): ignore errno if y is inf.
- r26335 is because NetBSD 5.0's asin and acos returns
- 0.0 with errno EDOM. But it breaks Linux whose gamma returns inf
- with errno ERANGE on.
-
-Sun Jan 24 22:48:05 2010 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, vm.c, vm_eval.c, vm_insnhelper.c: fix issues about
- return and c-return trace. This issue skips (c-)return event
- with global jump such as break or return. This fix make vm invoke
- hooks at stack rewind timing. fix [ruby-core:27606] [Bug #2610].
-
- * test/ruby/test_settracefunc.rb: add a test for above.
-
-Sun Jan 24 14:21:48 2010 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_enc_strlen_cr): increment by rb_enc_mbminlen(enc) for
- broken byte sequence. [ruby-core:27748]
- (rb_str_inspect): ditto.
-
-Sun Jan 24 05:18:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): unlock all locking mutexes
- before clean up. [ruby-core:26877]
-
- * thread.c (rb_thread_atfork): no other threads to be joined.
-
- * vm_core.h (rb_thread_lock_unlock, rb_thread_lock_destroy):
- new functions.
-
- * vm.c (ruby_vm_destruct): unlock and destroy global VM lock.
-
-Sun Jan 24 00:31:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/parser/ruby.rb: fix typo.
- patched by Hal Brodigan [ruby-core:21536]
-
-Sun Jan 24 00:02:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/markup/to_html_crossref.rb: fix failure of the test.
- patched by Tomoyuki Chikanaga and nobu [ruby-core:20564]
-
-Sat Jan 23 23:27:12 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * dir.c (dir_s_glob): add rdoc by Roger Pack. [ruby-core:27669]
-
-Sat Jan 23 23:12:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rdoc/generator/html.rb (RDoc::Generator::HTML#gen_into):
- make the rdoc(generating html) run faster and use less memory.
- patch by Tetsu Soh [ruby-core:27656]
-
-Sat Jan 23 19:54:48 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE.ole_initialize,
- WIN32OLE.ole_uninitialize to use in win32ole.rb.
- You must not use these methods.
-
- * ext/win32ole/lib/win32ole.rb: add win32ole.rb
- re-define Thread#initialize (fix ruby-core:27634)
-
-Sat Jan 23 00:25:19 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * sample/coverage.rb: preserve exit status.
-
-Sat Jan 23 00:21:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_dir.rb: get rid of debug print.
-
- * test/ruby/test_module.rb: fixed to make test-all work.
-
-Fri Jan 22 23:54:04 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: add a test for Array#rotate, rotate!.
-
- * test/ruby/test_dir.rb, test/ruby/test_fnmatch.rb: add some tests
- (for coverage of dir.c).
-
- * test/ruby/test_enum.rb: add a test for Enumerable#minmax.
-
- * test/ruby/test_enumerator.rb: add some tests for Enumerator#inspect,
- Enumerator::Generator and Yielder.
-
- * test/ruby/test_env.rb: add a test for ENV#index.
-
- * test/ruby/test_exception.rb: add some tests (for coverage of
- error.c).
-
- * test/ruby/test_hash.rb: add a test for recursive check.
-
- * test/ruby/test_integer.rb: add a test for number of argument of
- Integer.
-
- * test/ruby/test_method.rb: add a test for define_method.
-
- * test/ruby/test_module.rb: add a test for constant of included
- module.
-
- * test/ruby/test_proc.rb: add a test for parameters with cfunc.
-
-Fri Jan 22 23:50:03 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_regexp.rb, test/ruby/test_symbol.rb,
- test/ruby/test_variable.rb: add some tests (for coverage of
- compile.c).
-
-Fri Jan 22 21:05:34 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_mload): add submicro into vtm.subsecx. [ruby-dev:40133]
-
-Fri Jan 22 14:26:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (rdoc): needs encodings and exts.
-
-Fri Jan 22 14:16:18 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in: add missing comma.
-
-Fri Jan 22 01:07:16 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_bignum.rb, test/ruby/test_class.rb,
- test/ruby/test_defined.rb, test/ruby/test_hash.rb,
- test/ruby/test_primitive.rb, test/ruby/test_variable.rb: add some
- tests (for coverage).
-
-Fri Jan 22 01:03:28 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_require.rb (test_define_class): expect TypeError
- instead of NameError. [ruby-core:27504]
-
-Thu Jan 21 15:09:35 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * configure.in: some tidy.
-
-Thu Jan 21 11:15:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_rotate): new methods, Array#rotate! and
- Array#rotate. [ruby-dev:17194]
-
- * array.c (rb_ary_reverse_m): copy directly.
-
-Thu Jan 21 09:38:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: use AS_CASE instead of when, to get rid of
- an unintentional substitution.
-
-Thu Jan 21 08:45:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (iseq_s_disasm): check for proc first. based on the
- patch by Roger Pack in [ruby-core:27626]. [ruby-core:27227]
-
-Wed Jan 20 16:09:59 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * common.mk (compile.$(OBJEXT)): dependencies lacking.
-
- * vm_method.c (rb_add_method_cfunc): invalid initializer for C89
-
- * compile.c (iseq_insns_unification): int might be smaller than int*
-
-Tue Jan 19 20:00:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/resolv.rb (Resolv::Config.default_config_hash): return an
- empty hash when resolv.conf is not available. [ruby-core:27620]
-
- * lib/resolv.rb (Resolv::DNS::Config#lazy_initialize): fixed the
- defaults of nameserver and port.
-
-Tue Jan 19 14:29:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (clean-ext): allow glob patterns.
-
- * ext/extmk.rb: ditto.
-
-Tue Jan 19 14:19:26 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/zlib/{extconf.rb, zlib.c): crc32_combine and adler32_combine is
- supported on Zlib 1.2.2.1, so check them for old zlib.
-
-Tue Jan 19 09:03:37 2010 Aaron Patterson <tenderlove@ruby-lang.org>
-
- * ext/zlib/zlib.c: added Zlib.crc32_combine and Zlib.adler32_combine
-
- * test/zlib/test_zlib.rb: corresponding tests [ruby-core:27551]
-
-Tue Jan 19 02:02:32 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: add some tests (for coverage).
-
- * test/ruby/test_bignum.rb: ditto.
-
-Tue Jan 19 01:57:12 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_bignum.rb: some coerce definitions (for test) was
- wrong.
-
-Tue Jan 19 01:53:11 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (bigsub_int): remove nonsense loop.
-
-Tue Jan 19 01:42:36 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * parse.y (top_compstmt, top_stmts, top_stmt): prohibit BEGIN {} in
- non-toplevel scope. [ruby-core:21657]
-
- * test/ruby/test_beginendblock.rb (test_begininclass): add a test for
- above.
-
-Mon Jan 18 17:16:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/webrick/httpservlet/filehandler.rb (make_partial_content):
- add bytes-unit. [ruby-dev:40030]
-
-Mon Jan 18 15:49:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
- use inclusive range same as the header representation.
-
-Mon Jan 18 03:59:57 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_instance_hexdigest_bang): Fix
- rdoc.
-
- * ext/digest/lib/digest.rb (Digest::Class.base64digest)
- (Digest::Instance#base64digest{,!}): New methods.
-
-Sun Jan 17 22:48:44 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_instance_digest)
- (rb_digest_instance_hexdigest): Save a method call of reset()
- for a disposable clone.
-
-Sun Jan 17 19:24:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * math.c (domain_check): check errno first.
- NetBSD 5.0's asin and acos returns 0.0 with errno EDOM.
-
-Sun Jan 17 14:24:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (rb_str_derive): use long.
-
- * ext/iconv/iconv.c (iconv_convert): suppress a warning.
-
- * lib/mkmf.rb (check_signedness): new method.
-
- * lib/mkmf.rb (have_header, create_header): use String#tr_cpp.
-
-Thu Jan 14 13:06:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_hash, int_chr): fixed type.
-
-Thu Jan 14 12:50:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_concat): fixed range check for Fixnum, and
- added checks for integer overflow and invalid char code.
-
-Thu Jan 14 09:34:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_concat): raise RangeError when the argument is
- negative value. [ruby-core:27583]
-
-Thu Jan 14 08:49:59 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_to_r): convert to rational if internal representation
- is not rational.
-
-Thu Jan 14 04:01:50 2010 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_mdump): use nano_num and nano_den instead of subnano to
- avoid Rational class in marshaled data which prevent unmarshal by
- Ruby 1.8.
- (time_mload): use nano_num and nano_den.
-
-Wed Jan 13 11:57:38 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * object.c (rb_class_initialize): Make sure BasicObject doesn't get
- initialized twice [ruby-core:27577]
-
- * class.c (rb_class_init_copy): ditto
-
-Wed Jan 13 06:54:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check for if struct timezone is defined.
-
- * missing.h (struct timezone): define if not defined.
-
- * win32/win32.h (struct timezone): defined in the newer w32api.
- [ruby-core:27515]
-
-Wed Jan 13 00:33:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/shell/command-processor.rb: fix typo by Sho Hashimoto.
- reported and patched at [ruby-dev:40058] [Bug #2599]
-
-Tue Jan 12 23:48:29 2010 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb:
- accept any time format in maker. [ruby-core:26923]
-
-Tue Jan 12 21:56:00 2010 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_set_len): call rb_str_modify.
-
- * file.c (realpath_rec): don't call rb_str_modify before
- rb_str_set_len.
-
-Tue Jan 12 20:44:14 2010 Tanaka Akira <akr@fsij.org>
-
- * file.c (realpath_internal): call rb_secure.
-
-Tue Jan 12 16:48:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP.start): options may not be given.
-
-Tue Jan 12 16:48:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline): check if instream
- is closed instead of fd 0.
-
- * ext/readline/readline.c (Init_readline): use STDIN for input.
- Reported by Sora Harakami. See
- http://d.hatena.ne.jp/codnote/20100111/1263174134
-
-Tue Jan 12 16:09:02 2010 wanabe <s.wanabe@gmail.com>
-
- * test/ruby/test_process.rb (test_execopts_env): MANDATORY_ENVS might
- not be a part of ENV. e.g. TMPDIR.
-
-Tue Jan 12 14:07:31 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTP.start): add hash argument to
- set ssl related options. when use_ssl is set default value
- of verify_mode is OpenSSL::SSL::VERIFY_PEER. [ruby-dev:40003]
-
-Tue Jan 12 14:53:07 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (init_env): use _wputenv() instead of
- SetEnvironmentVariableW() because latter doesn't set msvcrt's environ
- work area, of course.
- [Bug #2552]
-
-Tue Jan 12 13:33:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (realpath_rec): trace symbolic link only when supporting
- readlink().
-
-Tue Jan 12 12:49:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
- which ends with an underscore.
-
-Tue Jan 12 09:58:03 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * hash.c: need to include errno.h for EINVAL.
-
- * hash.c (ruby_setenv): fixed typo. see [ruby-dev:40026]
-
-Tue Jan 12 09:22:43 2010 Tanaka Akira <akr@fsij.org>
-
- * prelude.rb (require_relative): use File.realpath. [ruby-dev:40040]
-
- * include/ruby/intern.h: declare rb_dir_getwd.
-
- * dir.c (rb_dir_getwd): copied from dir_s_getwd to export.
- (dir_s_getwd): use rb_dir_getwd.
-
- * file.c (rb_file_s_realpath): new method File.realpath.
- (rb_file_s_realdirpath): new method File.realdirpath.
-
- * lib/pathname.rb (Pathname#realpath): use File.realpath.
- (Pathname#realdirpath): use File.realdirpath.
-
-Mon Jan 11 22:45:08 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * hash.c (ruby_setenv): Improve the emulation of setenv(3) on
- environments where putenv(3) is used. Raise EINVAL If a
- variable name contains an '='.
-
-Mon Jan 11 18:16:38 2010 wanabe <s.wanabe@gmail.com>
-
- * vm_insnhelper.h (GET_BLOCK_PTR): return 0 when in class frame.
- [Bug #2583]
-
-Mon Jan 11 16:52:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_strlen): added. [ruby-dev:40028]
-
- * include/ruby/intern.h (rb_str_strlen): declared.
-
-Mon Jan 11 13:30:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.
-
- * lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status#initialize):
- accept 0 or more arguments. [ruby-dev:40021]
-
-Mon Jan 11 12:47:58 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * hash.c (ruby_setenv): ENV.[]= should raise an error if setenv(3)
- or putenv(3) fails. [ruby-dev:40023]
-
-Sun Jan 10 17:25:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/webrick/accesslog.rb : Escape needed.
-
- * lib/webrick/httpstatus.rb : ditto.
-
- * lib/webrick/httprequest.rb : ditto.
-
- * lib/webrick/httputils.rb : ditto.
-
- * test/webrick/test_cgi.rb (TestWEBrickCGI::test_bad_): Test for it.
-
-Sun Jan 10 04:54:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (rb_define_class): raise TypeError same as class
- statement. [ruby-core:27504]
-
-Sun Jan 10 04:41:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): needs ARCH_FLAG.
-
-Sat Jan 9 14:20:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (install-all): maybe typo.
-
-Sat Jan 9 14:01:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * missing/vsnprintf.c (BSD_vfprintf): get rid of a warning of VC++ x64.
-
-Sat Jan 9 08:40:54 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/configure.bat (WIN32DIR): regularise file separators.
-
-Fri Jan 8 23:35:18 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * proc.c (mnew): don't check visibility of method body if public
- ZSUPER method is found. [ruby-dev:39767]
-
- * test/ruby/test_method.rb: add a test for above.
-
-Fri Jan 8 22:59:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_method.c (rb_alias): skip ZSUPER method when searching body of
- source method. [ruby-dev:39760]
-
- * test/ruby/test_alias.rb: add a test for above.
-
-Fri Jan 8 21:15:21 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/http, lib/net/https: move content from net/https to
- net/http. [ruby-dev:39986]
-
-Fri Jan 8 14:06:01 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_io_s_read): close the IO if an exception is raised on
- seeking. [ruby-core:27429]
-
-Fri Jan 8 13:12:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_symbol): dump no encoding for 7bit only coderange
- symbol. [ruby-core:27375]
-
-Thu Jan 7 07:56:09 2010 Ryan Davis <ryand-ruby@zenspider.com>
-
- * lib/minitest/*.rb: Imported minitest 1.5.0 r5596.
- * test/minitest/*.rb: ditto.
-
-Tue Jan 5 19:30:53 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_exception.rb: add a test. cf [ruby-dev:39116]
-
-Tue Jan 5 02:03:34 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in (DTRACE): clear this when `dtrace -l` fails.
- Note that current FreeBSD needs privilege to call it;
- so to use DTrace on FreeBSD, you should run configure as root.
-
-Mon Jan 4 21:24:18 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * gc.c: added UNLIKELY to probes for optimization.
-
- * vm.c: ditto.
-
- * thread.c: ditto.
-
-Mon Jan 4 09:30:54 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (TRACING_MODEL): follow yugui's previous changes.
-
-Mon Jan 4 09:30:25 2010 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (InterlockedExchangePointer): old SDK support.
-
-Sun Jan 3 23:54:51 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * trace.h: new file. wraps tracing mechanisms.
-
- * defs/dtrace.d: new file. defined a dtrace provider "ruby".
-
- * include/ruby/ruby.h (LIKELY): moved from vm.c.
- (UNLIKELY): ditto.
- (OBJSETUP): probe "object-create".
- (RUBY_EVENT_RESCUE): new event.
-
- * vm_exec.c (DEBUG_ENTER_INSN): embedded a probe insn-entry into it.
- (DEBUG_END_INSN): insn-return.
-
- * vm.c (LIKELY): moved into ruby.h.
- (UNLIKELY): ditto.
- (Init_BareVM): embedded a probe "raise" into it.
-
- * variable.c (rb_class2name_without_alloc): new utility function.
-
- * tool/rbinstall.rb (install?(:ext, :arch, :'ext-arch')): installs
- dtrace.d if necessary.
-
- * thread_pthread.c (add_signal_thread_list): probe "raise".
- (rb_thread_create_timer_thread): ditto.
-
- * thread.c (rb_thread_schedule_rec): probes "thread-enter" and
- "thread-leave",
- (thread_start_func_2): ditto.
- (thread_cleanup_func): probe "thread-term"
-
- * lib/mkmf.rb: supports dtrace postprocessor on making an extension.
-
- * iseq.c (rb_vm_insn_name): new utility function.
- (rb_vm_insn_len): ditto.
-
- * insns.def (hook): probes "method-entry", "method-return", "line",
- and "rescue".
-
- * compile.c (iseq_compile_each): adds a trace op for "rescue" probe.
-
- * gc.c (garbage_collect): probes "gc-begin" and "gc-end".
- (obj_free): probe "object-free"
- (garbage_collect_with_gvl): probe "raise"
- (negative_size_allocation_error): ditto.
- (rb_memerror): ditto.
-
- * eval.c (rb_rescue2): probe "rescue"
- (rb_longjmp): probe "raise"
-
- * ext/probe/probe.c: new extension for application defined probes.
-
- * ext/probe/extconf.rb: ditto.
-
- * configure.in (--with-tracing-model): new option to choose a tracing
- mechanism.
- (DTRACE): new substitution. name of dtrace(1).
- (RUBY_TRACING_MODEL): new substitution.
- (DTRACE_OBJ): ditto.
- (MINIDTRACE_OBJ): ditto.
- (GOLFDTRACE_OBJ): ditto.
- (LIBRUBY_DTRACE_OBJ): ditto.
- (RUBY_DTRACE_POSTPROCESS): new macro. checks whether the dtrace on
- the system needs postprocessing.
- (RUBY_DTRACE_BSD_BROKEN): new macro. checks whether the dtrace
- supports USDT.
-
- * Makefile.in:
- (DTRACE): new variable. name of dtrace(1).
- (TRACING_MODEL): new variable. name of the chosen tracing mechanism.
- (DTRACE_OBJ): same as the one in configure.in.
- (MINIDTRACE_OBJ): ditto.
- (GOLFDTRACE_OBJ): ditto.
- (LIBRUBY_DTRACE_OBJ): ditto.
- (CPPOUTFILE): new substitution. necessary for generating dtrace.d
- (trace_none.h): new target for TRACING_MODEL=none
- (RUBY_H_INCLUDES): appended a header for tracing.
- (distclean-local): also removes preprocessed version of dtrace.d
- ($(LIBRUBY_A)): needs $(LIBRUBY_DTRACE_OBJ) if dtrace needs
- postprocessing.
- ($(PROGRAM)): ditto.
- (golf): ditto.
- (miniruby): ditto.
- ($(arch_hdrdir)/ruby/dtrace.d): new target. preprocessed version
- of defs/dtrace.d. generated if necessary.
- ($(arch_hdrdir)/ruby/trace_dtrace.h): new target.
- definition of probes.
- ($(LIBRUBY_DTRACE_OBJ)): new target. generated if dtrace needs
- postprocessing.
- ($(DTRACE_OBJ)): ditto.
- ($(MINIDTRACE_OBJ)): ditto.
- ($(GOLFDTRACE_OBJ)): ditto.
-
-Sun Jan 3 15:34:19 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * lib/rexml/text.rb: String no longer has #each.
- Patch by Mitsutaka Mimura (takkanm). [ruby-dev:39949].
-
-Sun Jan 3 01:29:18 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#inspect):
- implemented.
-
-Sat Jan 2 15:57:54 2010 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS#initialize): new option :nameserver_port.
- (Resolv::DNS#each_resource): pass port number.
- (Resolv::DNS#make_requester): ditto.
- (Resolv::DNS::Config#lazy_initialize): initialize @nameserver_port
- instead of @nameserver.
- (Resolv::DNS::Config#single?): return port number addition to the
- nameserver.
- (Resolv::DNS::Config#generate_timeouts): use @nameserver_port.
- (Resolv::DNS::Config#resolv): yield port number.
-
-Sat Jan 2 00:43:22 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/common.rb (initialize_regexp): allow leading
- and trailing white space, and forbid extra characters
- on another lines. [ruby-core:26223]
- RFC 3986 Appendix C. Delimiting a URI in Context
- draft-duerst-iri-bis-07 7.2. Web Address processing
-
-Fri Jan 1 23:17:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/uri/generic.rb (URI#normalize!): normalize case of
- scheme. [ruby-core:27309]
-
-Fri Jan 1 00:47:57 2010 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_instance_method_unimpl): Suppress
- compiler warnings.
-
-Fri Jan 1 00:00:00 2010 Tanaka Akira <akr@fsij.org>
-
- * tool/mkconfig.rb: generate RbConfig.ruby in rbconfig.rb.
-
- * lib/webrick/httpservlet/cgihandler.rb: use RbConfig.ruby.
-
- * test/ruby/envutil.rb: ditto.
-
- * benchmark/report.rb: ditto.
-
- * benchmark/runc.rb: ditto.
-
- * tool/eval.rb: ditto.
-
-Thu Dec 31 18:18:55 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/rubysocket.h: include addrinfo.h only when using our own
- getaddrinfo.c.
-
-Thu Dec 31 14:20:11 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (save_redirect_fd): consider EBADF that the fd is not used.
- [ruby-dev:39938]
-
-Thu Dec 31 06:03:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/raddrinfo.c (addrinfo_type): typed.
-
- * ext/socket/extconf.rb: fix for wide-getaddrinfo option.
-
- * ext/socket/addrinfo.c: rename {addr,name}info functions to ensure
- those are used on darwin.
-
-Thu Dec 31 03:27:53 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (native_thread_destroy): decreased the probability of
- using the interrupt event in the thread termination.
- see [ruby-core:27199].
-
-Thu Dec 31 02:35:57 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_win32.c (w32_error): should report the function.
-
-Thu Dec 31 01:58:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: fix for extstatic.
-
-Wed Dec 30 19:43:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/ruby.h (RREGEXP_SRC_END): added.
-
-Wed Dec 30 19:40:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/defines.h (INFINITY): this is float.
-
- * include/ruby/defines.h (NAN): ditto.
-
- * numeric.c (rb_infinity): change content as float.
-
- * numeric.c (rb_nan): ditto.
-
-Wed Dec 30 17:59:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gem_prelude.rb (push_all_highest_version_gems_on_load_path):
- simplified.
-
- * lib/rubygems/command_manager.rb (Gem#load_and_instantiate):
- rescue only NameError from const_get.
-
- * lib/rubygems/source_index.rb (Gem#load_specification): don't use
- RUBY_VERSION to branch.
-
- * lib/rubygems/validator.rb (Gem::TestRunner, Gem#alien): ditto.
-
- * lib/rubygems.rb: Kernel#gem is already defined, and workaround
- for home directory and custom_require are no longer needed.
-
-Tue Dec 29 16:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * numeric.c (Init_Numeric): Add Float::INFINITY and Float::NAN.
- [ruby-dev:1657] [ruby-dev:4760] [ruby-list:7023]
- [ruby-list:46690]
- [ruby-core:26632] [ruby-talk:41352] [ruby-talk:203333]
-
- * include/ruby/defines.h (INFINITY): defined.
-
- * include/ruby/defines.h (NAN): defined.
-
- * include/ruby/util.h (ruby_div0): removed.
-
- * numeric.c (fix_pow): use INFINITY and NAN
- instead of ruby_div0(1.0).
-
- * marshal.c (r_object0): ditto.
-
- * bignum.c (big_fdiv): ditto.
-
-Tue Dec 29 10:36:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::STANDALONE):
- any number spaces can be placed between equal-sign and the value.
- patch from Ed Howland in [ruby-core:27345].
-
-Mon Dec 28 22:33:58 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): force to inherit standard I/O handles.
- this change fixes [ruby-core:27273], but other side effects might
- exist.
-
-Mon Dec 28 22:00:10 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_marshal.rb: added tests for taintness/untrustness
- propagation.
-
-Mon Dec 28 18:13:26 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * sample/occur2.rb: reimplemented in modern style. [ruby-dev:39927].
-
-Mon Dec 28 17:19:37 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/install-sh: correction by Hiro Asari.
- https://gist.github.com/264558/58ad1cae45cde49600bbb39286af2aae23e639d5
-
-Mon Dec 28 13:18:52 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/install-sh: wrote the intention. [ruby-dev:39928]
-
-Sun Dec 27 10:45:00 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (foleparam_initialize): add foleparam_initialize
- to check argument of WIN32OLE_PARAM.new
-
- * test/win32ole/test_win32ole_param.rb (test_s_new): add some assertion
- to test WIN32OLE_PARAM.new
-
-Sun Dec 27 09:41:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * tool/rbinstall.rb (install?(:local, :comm, :bin, :'bin-comm')):
- Makes it vim friendly. __END__ in a heredoc is confusing with
- the script end for vim.
-
-Sun Dec 27 09:13:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * sample/occur2.rb: have been broken. fixed for Ruby 1.9 feature.
-
-Thu Dec 24 16:32:30 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/uri/generic.rb (eql?): Check the class of the compared object.
- Based on a patch by Peter McLain [ruby-core:27019]
-
-Thu Dec 24 15:20:03 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regexec.c (match_at): follow enclen's change.
-
-Thu Dec 24 12:08:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/delegate.rb (marshal_dump/load): dump & load instance variables
- by default [ruby-core:24211]
-
-Thu Dec 24 10:31:50 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/object.c (rb_obj_cmp): Default <=> operator returns 0 if
- objects are == [ruby-core:24063]
-
-Wed Dec 23 09:12:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
- always must be binary mode. c.f. Bug#2341
-
-Thu Dec 10 09:20:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (Init_Encoding): undef Encoding.new because
- a class which is rb_undef_alloc-func-ed can't call new method.
- [ruby-dev:39862]
-
- * vm.c (Init_VM): undef RubyVM.new and RubyVM::Env.new.
-
-Mon Dec 21 17:51:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (optimize_node_left): include equal on the condition of for-loop.
- This bug also affects original Oniguruma. [ruby-core:27247]
-
-Mon Dec 21 10:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regcomp.c (print_enc_string): follow enclen's change.
-
- * regcomp.c (onig_print_compiled_byte_code): ditto.
-
- * regcomp.c (onig_print_compiled_byte_code): change prototype.
-
- * regint.c (onig_print_compiled_byte_code): comment out.
-
-Mon Dec 21 08:04:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * object.c: BasicObject#initialize accepts any number of arguments
- [ruby-core:27080]
-
-Mon Dec 21 02:45:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_iterate): remove SEGV (retry).
-
-Sun Dec 20 23:18:23 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_iterate): remove SEGV (use the original patch).
- [ruby-dev:39874]
-
-Sun Dec 20 21:26:05 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm_eval.c (rb_iterate): pass current block when the argument bl_proc
- is NULL. This behavior can be used to make enumerator faster
- [ruby-dev:39874]
-
- * enumerator.c (enumerator_each): pass current block directly instead
- of trampoline block (enumerator_each_i).
-
- * io.c (argf_each_line, argf_each_byte, argf_each_char): ditto.
-
-Sat Dec 19 14:59:30 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gem_prelude.rb (Kernel#gem): should make gem private. a patch
- from Sho Hashimoto in [ruby-dev:39838].
-
-Sat Dec 19 14:57:17 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/webrick/config.rb (WEBrick::Config): typo fixed. a patch
- from Sho Hashimoto in [ruby-dev:39835].
-
-Sat Dec 19 11:06:48 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (each2,collect2,map2): Fix enumerator
- [ruby-core:27225]
-
-Sat Dec 19 09:58:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (check_funcall): reset method_missing_reason before
- trying the call. based on a patch from Yehuda Katz in
- [ruby-core:27219].
-
-Sat Dec 19 09:29:22 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/set.rb: Add checks that passed argument is Enumerable.
- [ruby-core:23844]
-
-Wed Dec 16 20:28:46 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/envutil.rb: fix a typo in assert message.
-
-Wed Dec 16 16:57:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/un.rb (httpd): try to convert port number to integer.
-
-Wed Dec 16 11:18:30 2009 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in(MINIRUBY): use "$BASERUBY" as a default ruby executable
- name.
-
-Wed Dec 16 00:53:14 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/find.rb (Find.find): rescue more exceptions which is possible to
- occur by other process change the directory tree.
-
-Tue Dec 15 09:06:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/find.rb (Find.find): get rid of race condition.
-
-Mon Dec 14 22:33:21 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/find.rb (Find.find): rescue only ENOENT and EACCES for lstat.
-
-Mon Dec 14 21:49:30 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/find.rb (Find.find): narrow rescue region.
-
-Mon Dec 14 09:20:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/find.rb (Find.find): removed already unnecessary code.
-
-Sun Dec 13 23:48:25 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/find.rb (Find.find): sort directory entries. [ruby-dev:39847]
-
-Sun Dec 13 20:55:30 2009 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
- reject non-string.
-
-Sun Dec 13 20:26:57 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (rb_parser_dump_tree): add prototype.
-
-Thu Dec 10 20:55:55 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode_data.h, transcode.c, tool/transcode-tblgen.rb: Added
- support for new transcoding instruction FUNsio (with Tatsuya Mizuno)
-
- * enc/trans/gb18030.trans: Significantly reduced GB18030 conversion
- table footprint using FUNsio and differences (with Tatsuya Mizuno)
-
- * test/ruby/test_transcode.rb: Minor name fix (from Tatsuya Mizuno)
-
-Thu Dec 10 17:22:36 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_eval.c (yield_under): yields self the same as 1.8.
-
-Thu Dec 10 15:49:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (native_mutex_reinitialize_atfork): release and
- re-acquire the lock at re-initialization.
-
-Thu Dec 10 12:56:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_replicate): add Encoding#replicate(name).
-
- * encoding.c (enc_replicate_with_index): renamed from old
- enc_replicate.
-
- * encoding.c (rb_enc_from_encoding_index): split from
- rb_enc_from_encoding.
-
-Thu Dec 10 09:15:00 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): CHAR_ESC_LEN should be 13.
-
-Thu Dec 10 01:12:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (dyna_pop_gen): pop dvars. [ruby-dev:39861]
-
-Thu Dec 10 00:46:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * node.c (dump_node): fixed for long members.
-
-Wed Dec 9 22:57:04 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * node.c: node management added. Currently, only pretty-dumper is
- implemented. [ruby-dev:39853]
-
- * ruby.c: --dump=parsetree and --dump=parsetree_with_comment options
- added. This is just for debug or research purpose. Note that the
- compatibility of these options are not supported at all.
-
-Wed Dec 9 09:50:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_justify): fixed the case a fill size is a
- multiple of the length of the padding. [ruby-dev:39856]
-
-Tue Dec 8 23:41:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/configure.bat: now recognize --with-*-{dir,include,lib} options
- and pass them to mkmf.
-
- * win32/configure.bat: general conversion from ``/'' to ``\'' of
- configure_args is not necessary any longer.
-
- * win32/setup.mak: BASERUBY is used as command, so always need to
- convert ``/'' to ``\'' within it.
-
-Tue Dec 8 23:39:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (flo_eq): suppress a warning on VC++ for x64.
-
-Tue Dec 8 16:19:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems: update to 1.3.5.
-
- * lib/rubygems/defaults.rb (Gem::default_dir): removed a clause
- doing nothing.
-
-Tue Dec 8 03:50:24 2009 Tanaka Akira <akr@fsij.org>
-
- * file.c (rb_f_test): use string form in unknown command error
- message.
-
-Mon Dec 7 14:11:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_object): reverted r26007. [ruby-dev:39845]
-
- * test/test_delegate.rb (test_marshal): moved from test_marshal.rb.
-
-Mon Dec 7 13:05:59 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * string.c (rb_str_justify): CVE-2009-4124.
- Fixes a bug reported by
- Emmanouel Kellinis <Emmanouel.Kellinis AT kpmg.co.uk>, KPMG London;
- Patch by nobu.
-
-Sun Dec 6 23:50:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * strftime.c: %l should be 1..12 instead of 0..12 [ruby-core:27072]
-
-Sun Dec 6 23:16:35 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/find.rb (Find.find): reduce stat system call.
-
-Sun Dec 6 16:02:15 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/webrick/httpservlet/filehandler.rb: escape filename of index.
- [ruby-dev:37768]
-
-Sun Dec 6 00:35:16 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (config.h): EXECUTABLE_EXTS moved from
- dln.c:dln_find_1().
-
-Sat Dec 5 15:35:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_object): dump instance variables when using
- marshal_dump. [ruby-core:24211]
-
- * variable.c (rb_ivar_count): added.
-
-Sat Dec 5 13:19:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: default ac_cv_prog_CC to CC.
-
-Sat Dec 5 10:18:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb/extend-command.rb (def_extend_command): fixed argument
- number for negative arity.
-
-Fri Dec 4 16:50:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (k_def): adjust the location of method definition to the
- line of def. [Bug #2427]
-
-Fri Dec 4 19:05:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (defined): should respect #respond_to_missing? as
- #respond_to? does.
-
-Fri Dec 4 15:50:18 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_eval.c (yield_under): does not yield self, and passes blockptr
- instead of &block to vm_cref_push(). [ruby-dev:39833]
-
-Fri Dec 4 15:15:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (num_exact): should not accept strings as operands, even
- though they respond to #to_r. ideally, strict rational
- conversion should be done by a method like #to_rational, not #to_r.
- [ruby-core:23729]
-
-Fri Dec 4 13:10:23 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/stringio/stringio.c (ungetc): RDoc updated. trunk allows
- pushing back behind the beginning of the pseudo stream.
-
-Fri Dec 4 03:10:38 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * compile.c (compile_cpath, iseq_compile_each): reverted
- constant/class variable lookup in instance_eval etc. to the
- behavior of 1.8.
-
- * eval.c (rb_mod_nesting): ditto.
-
- * insns.def (putspecialobject, defineclass): ditto.
-
- * node.h (NODE_FL_CREF_PUSHED_BY_EVAL): ditto.
-
- * vm_core.h (VM_SPECIAL_OBJECT_CONST_BASE): ditto.
-
- * vm_eval.c (yield_under, eval_under): ditto.
-
- * vm_insnhelper.c (vm_cref_push, vm_get_const_base,
- vm_get_ev_const, vm_get_cvar_base): ditto.
-
-Thu Dec 3 20:27:27 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/trans/gb18030-tbl.rb: Fix omission of C1 region in code table
- (from Tatsuya Mizuno)
-
- * test/ruby/test_transcode.rb: Added test for converting full range of
- Unicode codepoints from/to GB18030 (from Tatsuya Mizuno)
-
-Wed Dec 2 23:51:28 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c: initialize @hostname of SSLSocket to avoid
- warning at SSLSocket#connect.
-
-Tue Dec 1 18:01:43 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/digest/test_digest_extend.rb: added tests for digest framework.
-
-Tue Dec 1 12:01:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (dyna_push_gen, dyna_pop_gen): no needs to save both of
- args and vars. [ruby-core:26961]
-
- * parse.y (dyna_push_gen): use rb_node_newnode() for ripper.
- [ruby-core:26961]
-
- * parse.y (dyna_push_gen, dyna_pop_gen): adjust local vtable level
- for the case of syntax errors in method name or argument inside
- do block. [ruby-core:26961]
-
-Mon Nov 30 16:57:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (command_output): $makeflags are already quoted.
-
-Mon Nov 30 16:54:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, win32/Makefile.sub (EXECUTABLE_EXTS): moved from
- dln.c:dln_find_1().
-
- * lib/mkmf.rb (def find_executable0): use EXECUTABLE_EXTS, not
- only EXEEXT. [ruby-core:26821]
-
-Mon Nov 30 11:00:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): suppress an extra error message after
- numeric literal without digits. based on a patch from ujihisa .
- in [ruby-dev:39811]. [ruby-dev:39798]
-
-Sun Nov 29 16:56:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (check_funcall_failed): pass ID. [ruby-core:26934]
-
-Sun Nov 29 06:37:53 2009 Aaron Patterson <tenderlove@ruby-lang.org>
-
- * lib/rexml/formatters/default.rb (write_attribute): fix an
- exception when printing a document when duplicate namespaced
- attributes exist. Thanks, Alexey Froloff [ruby-core:26837]
-
-Sat Nov 28 09:05:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_eval.c (check_funcall_failed): should rescue user raised
- NoMethodError. rescue all NoMethodError if receiver does not
- respond to the method name. [ruby-dev:39796]
-
-Thu Nov 26 21:14:30 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_complex.rb (@unify): fix the detection if math
- loaded. This makes test_complex.rb work fine with the previous
- commit.
-
- * test/ruby/test_rational.rb (@unify): ditto.
-
-Thu Nov 26 21:13:36 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/test_mathn.rb (TestMathn): new test case.
- test for r25067.
-
-Thu Nov 26 21:11:23 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/openssl/test_config.rb (OpenSSL::TestConfig): new test case.
- test for r25017.
-
-Thu Nov 26 21:08:54 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/ruby/test_range.rb (TestRange#test_comparison_when_recursive):
- test for r25010.
-
- * test/ruby/test_struct.rb (TestStruct#test_comparison_when_recursive):
- ditto.
-
-Thu Nov 26 20:18:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * gem_prelude.rb (Gem.set_home): must dup before force_encoding
- and must force_encoding before gsub.
- cf. Yen Sign problem of SJIS [ruby-core:26910]
-
-Thu Nov 26 17:54:37 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{configure.bat, setup.mak, Makefile.sub}: add new configure
- option ``--with-ntver''.
-
-Thu Nov 26 11:42:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/mkmf/base.rb: use $INCFLAGS to add -I option. [Bug#2387]
-
-Thu Nov 26 07:17:58 2009 wanabe <s.wanabe@gmail.com>
-
- * marshal.c (mark_dump_arg): mark str. see also [ruby-dev:39735]
-
-Thu Nov 26 00:05:58 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/digest/test_digest_extend.rb: Added tests for current digest
- framework.
-
-Wed Nov 25 20:46:37 2009 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (rb_search_method_entry): refine error message.
-
-Wed Nov 25 19:29:05 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_instance_method_unimpl): Do not
- call rb_inspect() on an object that does not implement necessary
- methods; reported by NaHi.
-
-Wed Nov 25 19:30:30 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * transcode.c: Added a check for an internal error
- (with Tatsuya Mizuno)
-
-Tue Nov 24 22:57:46 2009 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (EnvUtil.invoke_ruby): raise Timeout::Error
- instead of flunk. reported by Yusuke Endoh.
-
-Tue Nov 24 22:31:44 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * vm.c (ruby_vm_destruct, thread_memsize): fix argument type to make
- RUBY_MARK_FREE_DEBUG available.
-
-Tue Nov 24 21:25:21 2009 Tanaka Akira <akr@fsij.org>
-
- * error.c: include errno.h at beginning.
-
-Tue Nov 24 20:11:37 2009 Tanaka Akira <akr@fsij.org>
-
- * strftime.c: %Y format a year with 4 digits at least.
-
- * lib/time.rb: format a year with 4 digits at least.
-
-Tue Nov 24 20:05:27 2009 Tanaka Akira <akr@fsij.org>
-
- * defs/known_errors.def: more errors.
-
-Tue Nov 24 20:01:49 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/ruby.h (rb_bug_errno): declared.
-
- * include/ruby/intern.h (rb_strerrno): declaration removed.
-
- * error.c (rb_strerrno): make it static. return NULL for unknown
- errors.
- (rb_bug_errno): defined.
-
- * thread_pthread.c: use rb_bug_errno.
-
- * signal.c (ruby_signal): use rb_bug_errno.
-
-Tue Nov 24 10:17:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (file_path_convert): fix fs_encoding is not assign.
-
-Tue Nov 24 10:00:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_strerrno): constified.
-
-Tue Nov 24 09:49:31 2009 Tanaka Akira <akr@fsij.org>
-
- * error.c (rb_strerrno): return "UNKNOWNERROR" for non-zero unknown
- error.
-
-Tue Nov 24 09:18:33 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_strerrno): declared.
-
- * template/known_errors.inc.tmpl: generate defined_error() and
- undefined_error() instead of set_syserr.
-
- * error.c (Init_syserr): define defined_error() and undefined_error()
- to follow the above change.
- (rb_strerrno): defined.
-
- * thread_pthread.c: show error message and errno macro name with
- rb_bug.
-
-Mon Nov 23 16:06:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (RUBY_STACK_MIN, RUBY_STACK_SPACE): delay for
- platforms where PTHREAD_STACK_MIN is not compile time constant.
- [ruby-dev:39751]
-
-Mon Nov 23 11:26:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (dln_find_1): removed duplication.
-
-Mon Nov 23 04:12:00 2009 Tanaka Akira <akr@fsij.org>
-
- * enc/trans/newline.trans (fun_so_universal_newline): generate \n
- after \r\n detection instead of just after \r.
- [ruby-list:45988] [ruby-core:25881] [ruby-core:26788]
-
-Sat Nov 21 18:48:35 2009 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (rb_search_method_entry): show flags and klass value in
- not implemented error message.
-
-Sat Nov 21 16:38:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (marshal_dump): use normal object as the buffer so
- that no hidden object is exposed to ruby-level. [ruby-dev:39744]
-
-Sat Nov 21 15:58:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (read_all): fix: false negative invalid byte sequence
- on reading from pipes. [ruby-dev:39743]
- fix: assign the variable 'pos' as relative value from recent pos.
-
-Sat Nov 21 14:44:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * file.c (file_path_convert): delay getting UTF8-MAC encoding
- while really needed. [ruby-core:26807]
-
-Fri Nov 20 21:16:54 2009 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (rb_search_method_entry): avoid trigraph.
-
-Thu Nov 19 23:17:06 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (putbinaryfile): use APPE for resume.
- Thanks, Tomoyuki Chikanaga.
-
-Thu Nov 19 22:50:05 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (flag_list): untaint strings to intern in the safe
- level 1.
-
- * lib/net/imap.rb (max_flag_count=): new methods to set the max
- number of flags interned to symbols.
-
-Thu Nov 19 20:43:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/getnameinfo.c: need to include extconf.h for HAVE_* macros.
- reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
-
-Thu Nov 19 17:00:59 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: nmake execute the file named echo if it exists
- in the PATH. reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
-
-Thu Nov 19 02:50:47 2009 Tanaka Akira <akr@fsij.org>
-
- * vm_eval.c (rb_search_method_entry): show the type of the hidden
- object.
- (rb_type_str): new function for above.
-
-Thu Nov 19 00:47:09 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (MORE_CHAR_SUSPENDED): renamed from MORE_CHAR_CBUF_FULL.
-
-Wed Nov 18 22:00:13 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (fill_cbuf): extracted from more_char.
- (io_shift_cbuf): fix memmove condition.
- (read_all): use fill_cbuf directly to avoid ECONV_AFTER_OUTPUT.
- [ruby-dev:39708]
-
-Wed Nov 18 18:25:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_atfork_internal): reinitialize global lock
- at fork to get rid of deadlock. based on the patch from Hongli
- Lai in [ruby-core:26783]. [ruby-core:23572]
-
-Wed Nov 18 17:48:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (terminate_atfork_i): all mutex locks by other threads
- have been abandoned at fork.
-
-Wed Nov 18 15:27:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (file_path_convert): delay getting filesystem encoding
- while really needed.
-
-Wed Nov 18 12:33:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (enc_set_default_encoding): reset filesystem
- encoding because on resetting default_external because
- Unix's filesystem encoding depends on default_external.
-
- * encoding.c (enc_set_filesystem_encoding): added.
-
- * ruby.c (process_options): don't call rb_filesystem_encoding
- because filesystem encoding is reset when default_external
- is reset.
-
-Wed Nov 18 11:57:32 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * math.c (math_gamma): fix incorrect comparison expression.
- see also [ruby-dev:39709] [Bug #2381]
-
-Wed Nov 18 11:37:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_scan_open_args): move path encoding conversion
- for filesystem encoding of Mac OS X.
-
- * file.c (file_path_convert): added for convert encoding
- of file path.
-
- * file.c (rb_get_path_check): add file_path_convert.
-
-Wed Nov 18 10:17:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_utf8_nth): no count_utf8_lead_bytes_with_word
- optimization for short string. [ruby-core:26787]
-
- * string.c (str_utf8_offset): str_utf8_nth never return NULL.
-
-Wed Nov 18 10:12:34 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_method.c (rb_undef): should raise TypeError if klass is nil.
- 1.instance_eval { undef to_s } causes SEGV before this fix.
-
- * test/ruby/test_undef.rb: new tests for undef.
-
-Wed Nov 18 08:41:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_utf8_nth): fixed overrun. [ruby-core:26787]
-
-Wed Nov 18 07:51:01 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (parse_mode_enc): fix invalid access.
-
-Tue Nov 17 23:50:06 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_method.c (rb_alias): should raise TypeError if klass is nil.
- 1.instance_eval { alias to_string to_s } causes SEGV before this
- fix.
-
- * test/ruby/test_alias.rb (test_special_const_alias): ditto.
-
-Tue Nov 17 17:53:53 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * enc/big5.c, enc/trans/big5.trans, enc/trans/big5-uao-tbl.rb,
- test/ruby/test-transcode.rb: Added Encoding 'Big5-UAO' and transcoding
- for it (from Tatsuya Mizuno) (see Bug #1784)
-
-Tue Nov 17 16:26:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (opt_case_dispatch): runtime value cannot be used as
- an element initializer.
-
- * vm_insnhelper.c (opt_case_dispatch_i): gets rid of type-punning
- calls.
-
-Mon Nov 16 15:51:53 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * vm_insnhelper.c (vm_call_method): protected singleton methods of
- an object should not be able to called from other instances of the
- class of the object. [ruby-core:26761]
-
- * vm_eval.c (rb_method_call_status): ditto.
-
- * test/ruby/test_module.rb (test_protected_singleton_method): ditto.
-
-Mon Nov 16 14:03:53 2009 wanabe <s.wanabe@gmail.com>
-
- * io.c (read_all): shift read buffer if exception occurred.
- pointed out in [ruby-dev:39702].
-
-Mon Nov 16 07:59:38 2009 wanabe <s.wanabe@gmail.com>
-
- * io.c (read_all): don't call io_shift_cbuf until buffering enough or
- econv_finished. [ruby-dev:39696]
-
- * io.c (more_char): don't call clear_readconv to read buffer after
- econv_finished.
-
- * io.c (appendline, rb_io_each_codepoint): clear readconv when done.
-
-Mon Nov 16 01:58:08 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * include/ruby/ruby.h (rb_classext_t): annotate @internal.
-
-Mon Nov 16 01:35:34 2009 Tanaka Akira <akr@fsij.org>
-
- * encoding.c (rb_filesystem_encindex): use default external encoding
- instead of locale encoding in Unix.
-
- * ruby.c (process_options): delay filesystem encoding
- initialization until default external encoding initialization.
-
-Mon Nov 16 00:06:26 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * thread.c (thread_cleanup_func): delete locking_mutex when thread
- object become dummy because of fork. [ruby-core:26744]
- [ruby-core:26745]
-
- * bootstraptest/test_thread.rb: add a test for above.
-
-Sat Nov 14 21:54:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * class.c (rb_mod_init_copy): fix memory leak of Class#dup.
- [ruby-dev:39687]
-
-Sat Nov 14 17:09:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (--with-opt-dir): ignore and suppress a warning.
- [ruby-dev:39684]
-
-Sat Nov 14 16:43:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (ruby_setenv): get rid of crash in Solaris 8 and 10.
- [ruby-core:26668]
-
-Sat Nov 14 09:16:54 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): Fix comparisons
- [ruby-core:26646]
-
- * test/bigdecimal/test_bigdecimal.rb (class): Fix and improve tests.
-
-Sat Nov 14 04:07:06 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb (TkVariable::coerce): fix bug on a
- numeric value.
-
-Sat Nov 14 03:35:29 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb: TkVariable#*(other) and /(other) have a
- bug on handling of the "other" value.
-
-Fri Nov 13 21:18:15 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ext/zlib/zlib.c (rb_zlib_adler32): fix typo.
-
-Fri Nov 13 16:22:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (thread_start_func_2): see first_func, not first_proc,
- to decide which to use.
-
- * gc.c (vm_xrealloc): use the given object space.
-
-Fri Nov 13 00:46:24 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/util.rb (CGI::pretty): fix the overflow bug
- if stripped string.[ruby-dev:37975]
-
-Thu Nov 12 23:08:11 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb (read_from_cmdline): this code is better.
- [ruby-core:25991]
-
-Thu Nov 12 22:55:42 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/net/telnet.rb: don't use simple delegate.
- because SimpleDelegate behavior changed.
-
-Thu Nov 12 14:33:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_win32.c (thread_errno): CreateThread does not set errno.
-
- * thread.c (thread_create_core): moved failure handling from
- native_thread_core().
-
- * thread_pthread.c (native_thread_create): constified.
-
-Thu Nov 12 10:08:56 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * .document: remove documents not in rdoc format until
- rdoc supports non rdoc files. [ruby-core:26459]
-
-Thu Nov 12 06:42:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#initialize): option hash may not be
- given. [ruby-core:26681]
-
-Thu Nov 12 01:29:15 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enumerator.c (yielder_yield_push): Yielder#<< should return self.
- [ruby-dev:39660]
-
-Wed Nov 11 19:17:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile#initialize): merge mode option.
-
- * lib/tmpdir.rb (Dir::Tmpname#create): splat options.
-
-Wed Nov 11 12:54:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (ruby_setenv): use ruby_strdup().
-
-Wed Nov 11 12:19:27 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * hash.c (ruby_setenv): also set CRT workarea. ref [ruby-core:25010]
-
-Wed Nov 11 09:36:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_object, r_object0): use RHASH_IFNONE but not ifnone
- directly.
-
-Wed Nov 11 08:32:45 2009 Tanaka Akira <akr@fsij.org>
-
- * thread.c (blocking_region_begin): define before BLOCKING_REGION.
- reported by Luis Lavena. [ruby-core:26670]
-
-Wed Nov 11 08:22:19 2009 Tanaka Akira <akr@fsij.org>
-
- * util.c (ruby_strtod): use dval() consistently.
-
-Wed Nov 11 02:14:48 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/matrix/test_matrix.rb (TestMatrix#test_rank):
- added a test method for r24969.
-
-Tue Nov 10 08:23:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_f_exec, rb_f_system, rb_f_spawn): mentioned about
- the shell to be used when the command line is single string.
- See [ruby-core:26652]
-
-Mon Nov 9 20:15:16 2009 Tanaka Akira <akr@fsij.org>
-
- * thread.c (rb_gc_save_machine_context): don't save the stack pointer
- in this function.
- (RB_GC_SAVE_MACHINE_CONTEXT): call rb_gc_save_machine_context and
- save the stack pointer at caller side.
- (rb_thread_schedule_rec): use RB_GC_SAVE_MACHINE_CONTEXT instead of
- rb_gc_save_machine_context.
- (blocking_region_begin): changed to a macro. use
- RB_GC_SAVE_MACHINE_CONTEXT instead of rb_gc_save_machine_context.
- [ruby-dev:39659]
-
-Mon Nov 9 11:28:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (warnflags): add -Wno-long-long.
-
-Sun Nov 8 18:13:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c: use RHASH_IFNONE but not ifnone directly.
-
-Sat Nov 7 21:02:57 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb (PP::ObjectMixin#pretty_print): use to_s regardless of
- instance variables.
-
-Sat Nov 7 20:59:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_insnhelper.c (vm_push_frame): get rid of out-of-bounds
- access.
-
-Sat Nov 7 12:41:19 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_insnhelper.c (VM_CALLEE_SETUP_ARG): revert r25521.
- [ruby-core:26427] [ruby-core:26447]
-
-Fri Nov 6 18:33:47 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_insnhelper.c (vm_push_frame): add CHECK_STACK_OVERFLOW.
- [ruby-dev:39592]
-
- * eval.c (rb_longjmp): add 1 level backtrace for sysstack_error
- without calling any method to prevent further stack overflow.
-
- * eval.c (make_exception): don't call #exception for
- sysstack_error to prevent stack overflow.
-
- * proc.c (Init_Proc): don't freeze sysstack_error.
-
- * eval.c (rb_longjmp): move reentrant check after exception
- preparation.
-
-Fri Nov 6 17:13:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_header): split the line by tabs.
-
-Fri Nov 6 12:02:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * configure.in (MINIDLNOBJ): set default as dmydln.o.
- Now LLVM clang seems to be able to build Ruby 1.9.
-
-Fri Nov 6 09:29:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encindex): add fallback to
- ASCII-8BIT on Windows.
-
-Fri Nov 6 07:29:07 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/ruby/test_case.rb: merged r25658 from ruby_1_8.
-
-Thu Nov 5 12:27:07 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * gem_prelude.rb (Gem.user_home): force_encoding(
- Encoding.find('filesystem')). [ruby-core:26525]
-
-Thu Nov 5 07:47:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (BEGIN): now local_push and local_pop are necessary in
- ripper.
-
-Wed Nov 4 21:39:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * .document: add some README files to default rdoc's of trunk.
- patched by Roger Pack [ruby-core:26459]
-
-Wed Nov 4 16:06:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/st.h (SIZEOF_ST_INDEX_T): moved from st.c for
- Init_RandomSeed().
-
-Wed Nov 4 15:50:16 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * include/ruby/ruby.h (NUM2CHR): prefix __extension__ for
- braced-groups within expressions.
-
-Wed Nov 4 15:46:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (set_{internal,external}_encoding_once): fixed typos.
-
-Wed Nov 4 12:49:18 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * proc.c (mnew): Fix scope issue [ruby-core:26069]
-
-Wed Nov 4 08:50:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * random.c (rb_hash_start): moved from string.c.
-
- * random.c (Init_RandomSeed2): register global address before set.
-
- * random.c (Init_RandomSeed): initialize hashseed.
-
-Wed Nov 4 08:26:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_check): moved other checks from GetDIR.
-
- * dir.c (GetDIR): fixed a variable name.
-
-Wed Nov 4 08:19:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (rb_fiber_start): fixed unconditional test.
-
-Wed Nov 4 02:08:14 2009 Aaron Patterson <tenderlove@ruby-lang.org>
-
- * ext/dl/cptr.c (rb_dlptr_eql, rb_dlptr_cmp): DL::CPtr#== and DL::CPtr#<=>
- should not raise an exception when compared to a different object.
-
-Wed Nov 4 00:05:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_upto): make next object before yield its block.
- fix: can modify original begin string of String#upto.
- [ruby-dev:26384] [ruby-dev:39626]
-
-Mon Nov 2 18:33:21 2009 wanabe <s.wanabe@gmail.com>
-
- * cont.c (fiber_free): don't free unallocated local_storage. see #1325.
-
- * cont.c (cont_init): clear local_storage not to use current thread's.
-
- * cont.c (fiber_t_alloc, root_fiber_alloc): link itself always for
- a case that fiber_link_remove() is called before fiber_link_join().
-
- * cont.c (fiber_init): clear cont->vm_stack and th->stack before
- root_fiber_alloc() in rb_fiber_current().
-
-Mon Nov 2 14:52:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_exc_raise, rb_exc_fatal, rb_make_exception):
- suppressed shorten-64-to-32 warnings.
-
-Mon Nov 2 14:43:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_pthread.c (native_stop_timer_thread): delay joining timer
- thread after unlocking mutex.
-
-Mon Nov 2 13:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_pthread.c (native_stop_timer_thread): need to join timer thread
- only when really stopping it.
-
-Mon Nov 2 12:55:50 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread_{pthread,win32}.c (native_stop_timer_thread): join the thread
- here.
-
- * thread_{pthread,win32}.c (native_reset_timer_thread): new function.
-
- * thread.c (rb_thread_stop_timer_thread, rb_thread_reset_timer_thread):
- call above function instead of simply setting 0.
-
-Mon Nov 2 11:22:19 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/dl/win32/lib/win32/registry.rb: update rdoc. [ruby-core:26022]
-
-Sun Nov 1 20:16:03 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c: fixed rdoc. [ruby-core:26457]
-
-Sun Nov 1 16:24:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (rb_cv_stack_grow_dir): fix for universal binary.
-
- * configure.in (sitehdrdir, vendorhdrdir): fixed default values.
-
-Sun Nov 1 13:31:16 2009 wanabe <s.wanabe@gmail.com>
-
- * win32/win32.c (overlapped_socket_io, recvmsg, sendmsg): pass handle
- instead of pointer to CloseHandle().
-
-Sun Nov 1 13:11:27 2009 wanabe <s.wanabe@gmail.com>
-
- * ext/socket/socket.c (socket_s_ip_address_list): use FreeLibrary() to
- free HMODULE.
-
-Sun Nov 1 08:17:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (GET_STACK_BOUNDS): refactored common code. based on a
- patch from Suraj N. Kurapati <sunaku AT gmail.com> in
- [ruby-core:26443].
-
-Sat Oct 31 23:44:35 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_count): remove optimization using #size.
- revert r25560.
-
- * vm_eval.c (rb_funcall_no_recursive): remove method.
-
-Sat Oct 31 23:28:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_eval.c (check_funcall): logic updated according to
- [ruby-dev:39594]. search method entry, call if it exists;
- otherwise check method_missing, call if it was overridden,
- protecting exceptions; if NoMethodError happens, check method
- name.
-
- * vm_eval.c (vm_call0): use idMethodMissing.
-
- * vm_eval.c (rb_search_method_entry): typo fixed.
-
-Sat Oct 31 17:19:28 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPResponse#each_response_header):
- cosmetic: '?\ ' -> '?\s'
-
-Fri Oct 30 22:09:47 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPResponse#each_response_header):
- accept multiline message header of HTTP response. see #1796.
- cf. RFC 2616 '4.2 Message Header'.
-
- * test/net/http/test_httpresponse.rb: added.
-
-Fri Oct 30 18:54:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (trnext): detect empty range and raise exception.
- [ruby-dev:39108]
-
-Fri Oct 30 17:01:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_eval.c (enum call_type): get rid of last comma.
-
- * vm_eval.c (vm_call0, vm_call_super, rb_f_send, rb_f_public_send):
- fixed call_type. [ruby-dev:39581]
-
- * vm_eval.c (rb_search_method_entry, rb_method_call_status): split
- from rb_call0().
-
- * vm_eval.c (rb_check_funcall): get rid of raising exceptions and
- hiding further exceptions. [ruby-dev:39584]
-
- * vm_eval.c (rb_funcall_no_recursive): ditto.
-
-Fri Oct 30 13:36:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_blocking_region): reverted r25566, and added
- description that no exception is allowed inside `func', instead.
- see [ruby-dev:39582]
-
-Fri Oct 30 13:13:16 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32.c (recvmsg, sendmsg, link): shouldn't raise ruby's exceptions
- in the functions expected as system API. see [ruby-dev:39579] and
- [ruby-dev:39582]
-
-Fri Oct 30 12:59:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * thread.c (rb_thread_blocking_region): standard C doesn't accept
- preprocessing directive within macro expansion.
-
-Fri Oct 30 10:55:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_blocking_region): must ensure to unlock GVL.
- [ruby-dev:39579]
-
-Fri Oct 30 04:47:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RSTRING_END): trivial optimization.
-
- * string.c (rb_str_sub_bang): trivial optimization.
-
-Fri Oct 30 02:11:36 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_count): call #size using rb_funcall_no_recursive()
- to prevent infinite recursive calls. [ruby-core:24794]
-
- * vm_eval.c (rb_funcall_no_recursive): utility function to check
- direct recursive call.
-
- * vm_eval.c (rb_check_funcall): move from eval.c. [refactoring]
-
-Thu Oct 29 18:37:02 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (Init_Encoding): revert previous commit.
-
- * ruby.c (process_options): ditto.
-
-Thu Oct 29 15:35:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (Init_Encoding): set locale and filesystem encindex.
-
- * ruby.c (process_options): move setting func of filesystem
- encoding to Init_Encoding.
-
-Thu Oct 29 15:43:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_name_err_mesg_new): added prototype.
-
-Thu Oct 29 13:53:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_to_ary): do not use #respond_to? to detect
- to_ary. Just call. [ruby-core:23738]
-
- * eval.c (rb_check_funcall): new function with method existence
- check. returns Qundef when the method does not exist.
-
- * enumerator.c (enumerator_rewind): just call method, using
- rb_check_funcall(). [ruby-core:23738]
-
- * error.c (exc_equal): ditto.
-
- * object.c (convert_type): ditto.
-
- * error.c (rb_name_err_mesg_new): export function.
-
- * eval.c (make_exception): ditto.
-
- * io.c (pop_last_hash): return early when the last argument is nil.
-
- * io.c (rb_io_puts): treat T_STRING specially for small
- optimization.
-
- * vm_eval.c (raise_method_missing): skip method call if possible
- using rb_method_basic_definition_p().
-
- * vm_eval.c (method_missing): ditto.
-
- * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_debug): test
- suites changed to ignore exceptions caused by just-call policy.
-
-Thu Oct 29 04:41:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ruby.c (process_options): call rb_filesystem_encoding().
-
-Thu Oct 29 04:40:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (Init_IO): rb_default_rs should be US-ASCII.
-
-Thu Oct 29 01:22:01 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * ext/socket/extconf.rb : Compilation failure on AIX.
- ss_len (a member of struct sockaddr_storage) has preceding __,
- but ss_family does not have it from AIX 5.2.
-
-Wed Oct 28 16:32:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (get_filesystem_encoding): removed.
-
- * encoding.c (rb_locale_encindex): added.
-
- * encoding.c (rb_filesystem_encindex): added.
-
- * encoding.c (rb_filesystem_encindex): add an alias 'filesystem'.
- [ruby-dev:39574]
-
- * encoding.c (enc_find): add rdoc about special aliases.
-
- * gem_prelude.rb (Gem.set_home): use Encoding.find('filesystem').
-
- * gem_prelude.rb (Gem.set_paths): ditto.
-
-Wed Oct 28 15:02:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * gem_prelude.rb (Gem.set_home):
- force_encoding(Encoding.filesystem_encoding)
- [ruby-core:25959]
-
- * gem_prelude.rb (Gem.set_paths): ditto.
-
-Wed Oct 28 14:24:45 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (get_filesystem_encoding):
- add Encoding.filesystem_encoding [ruby-dev:39546]
- also see [ruby-core:25959]
-
-Wed Oct 28 14:51:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_each_group): fixed typo.
-
-Wed Oct 28 13:02:10 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (Net::FTP#initialize): sets @binary to true.
-
- * lib/net/ftp.rb (Net::FTP#binary=): sends a TYPE command only when
- logged in. [ruby-dev:39548]
-
- * lib/net/ftp.rb (Net::FTP#send_type_command): new private method
- which sends an appropriate TYPE command according to the value of
- @binary.
-
- * lib/net/ftp.rb (Net::FTP#login): calls send_type_command instead
- of binary=.
-
-Wed Oct 28 12:26:51 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_insnhelper.c (vm_setup_method): should push call frame before
- raising exception, to put the Ruby-defined method name in the
- error message. [ruby-core:26333]
-
- * vm_insnhelper.c (VM_CALLEE_SETUP_ARG): macro modified.
-
- * vm_insnhelper.c (vm_yield_setup_args): modified for new
- VM_CALLEE_SETUP_ARG macro.
-
-Tue Oct 27 22:46:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/net/ftp.rb (Net::FTP#initialize): @sock = nil.
-
- * lib/net/ftp.rb (Net::FTP#binary=): send command only when
- socket is open. [ruby-dev:39548]
-
-Tue Oct 27 22:22:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (Init_stringio): added read_nonblock and
- write_nonblock aliases. [ruby-dev:39551]
-
- * ext/stringio/stringio.c (strio_data_type): typed.
-
-Tue Oct 27 21:20:35 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb: add TkVariable#+@ and -@ method.
-
-Tue Oct 27 16:36:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (chopped_length): get rid of unexpected exception.
- see [ruby-core:26336].
-
-Tue Oct 27 15:53:10 2009 Tanaka Akira <akr@fsij.org>
-
- * gc.h (SET_MACHINE_STACK_END): use __i386.
- Some compiler may not define __i386__.
- Solaris 64-bit Developer's Guide:
- http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view
-
-Tue Oct 27 15:44:48 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
- a Pathname instance into a string. [ruby-core:26237]
-
-Tue Oct 27 12:30:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.h (SET_MACHINE_STACK_END): use __i386__ instead of __i386,
- and explicit size qualifiers.
-
-Tue Oct 27 09:40:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * gc.h (SET_MACHINE_STACK_END): add x86_64 version by nobu.
-
-Tue Oct 27 09:27:59 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_exec.c (DECL_SC_REG): use __clang__.
-
-Tue Oct 27 08:56:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb: reverted r25443 because build_os is used in mkmf.rb
- on some platforms. [ruby-core:26332]
-
-Tue Oct 27 08:01:57 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * parse.y (ripper_filename): add Ripper#filename. [ruby-dev:37856]
-
- * test/ripper/test_filter.rb: add more tests.
-
-Tue Oct 27 07:53:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (garbage_collect_with_gvl): do not garbage_collect when
- dont_gc flag turned on. [ruby-core:26327]
-
-Tue Oct 27 07:38:39 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c,stubs.c: remove errors or warnings when compiled
- with old ruby 1.8.x.
-
- * ext/tk/tkutil/tkutil.c: ditto.
-
-Tue Oct 27 05:56:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm.c (invoke_block_from_c): return Qnil when its iseq is
- SPECIAL CONST. [ruby-core:26335]
-
-Tue Oct 27 05:11:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it.
- LLVM/clang defines __GNUC__ but doesn't have __asm__.
-
-Tue Oct 27 03:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): added RUBY_SITEARCH to use
- different name from RUBY_ARCH. [ruby-core:26324]
-
-Mon Oct 26 20:04:13 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails
- [ruby-core:26316]
-
-Mon Oct 26 18:37:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (default_proc_arity_check): new support function.
-
- * hash.c (rb_hash_initialize): should do arity check as #default_proc=.
- [ruby-core:26281]
-
-Mon Oct 26 13:24:17 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/remote-tk.rb: typo fixed.
-
-Mon Oct 26 12:34:08 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * ruby.c (usage): -T and -W descriptions updated. see
- [ruby-dev:39539]
-
- * man/ruby.1: ditto.
-
-Mon Oct 26 12:06:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_fwrite): adjust stdio file position after direct write on
- BSDish platforms. [ruby-core:26300]
-
-Sun Oct 25 15:44:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/handle.c (dlhandle_sym): fixed an invalid local variable
- declaration.
-
-Sun Oct 25 13:33:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_cntl): F_DUPFD is platform dependent.
-
-Sun Oct 25 10:19:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/dl/handle.c (rb_dlhandle_close): fixed an invalid local
- variable declaration.
-
-Sun Oct 25 05:44:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (**): Optimization (up to 45% faster)
-
-Sat Oct 24 14:28:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_set_default_proc): checks arity of default_proc
- of a Hash. [ruby-core:26087]
-
-Sat Oct 24 13:38:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_cmp): defines Object#<=>. [ruby-core:24063]
-
-Sat Oct 24 09:51:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_flat_map): new method that concatenates the values
- from given block. also provides alias #collect_concat.
-
-Sat Oct 24 00:36:47 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_cntl): update max file descriptor by the result of
- fcntl(F_DUPFD).
-
-Fri Oct 23 16:31:14 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_class_new): move class check to rb_check_inheritable().
-
- * class.c (rb_check_inheritable): should not allow subclass of
- class Class. [ruby-core:26225]
-
-Fri Oct 23 14:25:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (target, target_alias): replace with real cpu.
-
- * mkconfig.rb: build* are not needed in rbconfig.rb.
-
- * configure.in (warnflags): use -Wextra only when
- -Wno-missing-field-initializers is available.
-
- * configure.in (optflags): removed -fomit-frame-pointer by default.
-
-Fri Oct 23 09:12:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
- non-nil.
-
-Fri Oct 23 07:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable
- ruby without current libraries.
-
- * common.mk (rdoc): use XRUBY.
-
-Fri Oct 23 07:28:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (warnflags): use -Wextra instead of -Wall.
-
- * gc.c (mark_current_machine_context): get rid of warning.
-
-Thu Oct 22 21:10:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * class.c (rb_obj_basic_to_s_p): typo. Please become familiar with
- the ANSI style.
-
-Thu Oct 22 20:20:27 2009 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_in_out_err): test_stdout and
- test_stderr should be an array.
-
- * test/ruby/test_rubyoptions.rb (test_notfound): test_stdin of
- assert_in_out_err should be a string.
-
-Thu Oct 22 17:49:05 2009 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
- convert an integer back and forth.
-
-Thu Oct 22 17:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (arg_prepend): removed. a patch from Mikhail T. in
- [ruby-core:26217].
-
-Thu Oct 22 04:54:41 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_inspect): print instance variables only when
- Object#to_s is not overridden. [ruby-core:24425]
-
- * class.c (rb_obj_basic_to_s_p): new function.
-
-Wed Oct 21 19:32:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_obj_inspect): fixed rdoc about the case that to_s
- is called. [ruby-core:24425]
-
-Wed Oct 21 08:17:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/logger/test_logger.rb (TestLogDevice#test_write): check
- also error message.
-
-Wed Oct 21 03:54:41 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb:
- Creator functions now strict with their arguments
- Support for empty matrices (see new method Matrix.empty)
- Matrix#trace raises an ErrDimensionMismatch if the matrix is not square
- Enumerators are returned when no block given
- Consistent results when accessing elements with out of bounds indices
- Details in [ruby-core:23598].
-
-Wed Oct 21 00:27:15 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/webrick/httpauth/digestauth.rb: typo in exception message fixed.
-
-Wed Oct 21 00:17:28 2009 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: imported upstream version (logger/1.2.7) see #2238.
- * 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)
- * test/logger/test_logger.rb: ditto.
-
-Tue Oct 20 22:29:06 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/matrix.rb: Bug fix. See detail [ruby-core:23598].
-
-Tue Oct 20 17:57:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_symbol, r_symreal): fixed the order of symbol and
- its encoding modifier, in order to make the dump readable from
- 1.8. [ruby-dev:39515]
-
-Tue Oct 20 16:41:18 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/win32.h (finite, scalb): inline'ed non-standard
- identifier macros. [ruby-core:26166]
-
-Tue Oct 20 15:38:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (ripper_intern): enable literal optimization.
-
- * parse.y (method_call): dispatch symbols. a patch from Andy Keep in
- [ruby-core:26169]. [ruby-core:26165]
-
- * parse.y (mlhs_basic): fixed handling splat in middle of mlhs. a
- patch from Andy Keep in [ruby-core:26163]
-
- * parse.y (parser_here_document): dispatch delayed heredoc
- contents. based on a patch from Andy Keep in [ruby-core:24855].
-
-Mon Oct 19 15:17:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * .gdbinit (rb_method_entry): search method entry by class and id.
-
-Mon Oct 19 15:03:31 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (enc/unicode/name2ctype.h): no need to create
- directory if it already exists.
-
-Mon Oct 19 11:34:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * .gdbinit (rb_ps): dump all threads and their callstacks. based
- on [ruby-core:26155] by Joshua ben Jore <twists AT gmail.com>.
-
-Mon Oct 19 10:59:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (prepare_iseq_build, rb_iseq_build_for_ruby2cext):
- untrust mark array. [ruby-core:26137]
-
-Mon Oct 19 05:49:53 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/rexml/element.rb (text=): false should be converted to string.
- A patch by Teruo Oshida [ruby-dev:38351]
-
-Sun Oct 18 22:33:25 2009 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: do not require lib/delta.rb.
-
- * lib/date/delta.rb: follows the above change.
-
-Sun Oct 18 19:14:21 2009 Tanaka Akira <akr@fsij.org>
-
- * parse.y (is_special_global_name): add boundary check.
-
-Sun Oct 18 18:31:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath_safe): should not dup tmp string. a
- patch from neomjp neomjp in [ruby-core:24251].
-
-Sun Oct 18 09:49:14 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/test_prime.rb
- (TestPrime#test_eratosthenes_works_fine_after_timeout):
- test for [ruby-dev:39465].
-
- * lib/prime.rb (Prime::EratosthenesSieve):
- fixed [ruby-dev:39465].
- suppressed memory reallocation.
- constantified some magic numbers.
-
-Sat Oct 17 22:11:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (id2encidx): register encoding name.
- (r_object0): register object before encoding name.
- [ruby-core:24882]
-
-Sat Oct 17 17:56:58 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * test/rake/test_fileutils.rb (Rake::TestFileUtils#test_sh): uses
- FileUtils::RUBY instead of fixed "ruby" so that the ruby command
- works fine in Ruby's "make test-all".
- (test_sh_with_a_single_string_argument): ditto.
- (test_sh_with_multiple_arguments): ditto.
- (test_sh_failure): ditto
- (test_sh_special_handling): ditto.
-
-Sat Oct 17 17:30:06 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * bignum.c (big_split): fix off-by-one error. [ruby-dev:39501]
-
-Sat Oct 17 16:34:27 2009 Tanaka Akira <akr@fsij.org>
-
- * parse.y (parser_yylex): fix token even after trailing under score.
-
-Sat Oct 17 11:27:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_method.c (basic_obj_respond_to): call #respond_to_missing?
- always with two arguments. [ruby-core:26090]
-
-Sat Oct 17 08:51:44 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#respond_to_missing): warn only when
- specified method is a private. [ruby-dev:39498]
-
-Fri Oct 17 00:05:53 2009 wanabe <s.wanabe@gmail.com>
-
- * st.c (unpack_entries): save table->bins and never change the table
- during unpacking. Because st_insert() may cause GC and refer the
- table, i.e. st_foreach(). [Bug #2196]
-
-Fri Oct 16 22:20:25 2009 Tanaka Akira <akr@fsij.org>
-
- * prelude.rb (require_relative): defined as a module function of
- Kernel.
-
-Fri Oct 16 20:18:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#method_missing): remove backtrace
- lines _until_ `method_missing'.
-
-Fri Oct 16 20:09:55 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#freeze): #freeze should freeze self
- and the target at once. [ruby-core:26118]
-
-Fri Oct 16 19:39:28 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator#respond_to_missing): warn if optional
- include_private argument is not false. Delegator does (and
- should) not forward private methods. [ruby-core:26080]
-
- * lib/delegate.rb (Delegator#respond_to_missing): instead of
- redefining #respond_to?, use #respond_to_missing?. [ruby-core:26081]
-
-Fri Oct 16 18:42:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bootstraptest/test_gc.rb: added tests based on [ruby-dev:39484]
- from wanabe <s.wanabe AT gmail.com>.
-
-Fri Oct 16 16:09:01 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_spawn): `\'' is also quote character.
-
-Fri Oct 16 13:40:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.h (rb_gc_debug_body): constified.
-
-Fri Oct 16 13:20:39 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (VpMidRound): remove warnings.
- patch from Charlie Savage. [ruby-core:22869]
-
- * ext/digest/bubblebabble/bubblebabble.c (bubblebabble_str_new): ditto.
-
- * ext/digest/digest.c (hexencode_str_new): ditto.
-
- * ext/iconv/iconv.c (iconv_convert): ditto.
-
- * ext/socket/socket.c (inspect_sockaddr): ditto.
-
- * ext/socket/raddrinfo.c (sockaddr_obj): ditto.
-
- * ext/syck/emitter.c (syck_emitter_write): ditto.
-
- * ext/syck/emitter.c (syck_emitter_flush): ditto.
-
- * ext/syck/emitter.c (syck_emit_tag): ditto.
-
-Fri Oct 16 12:03:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io
- doesn't have encoding.
-
-Fri Oct 16 03:15:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/csv.rb (CSV#read_to_char): set encoding and verify data
- which read from io before encode it to @encoding.
-
- * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding.
-
- * lib/csv.rb (CSV#read_io): add to read string and set @io's
- encoding.
-
-Thu Oct 15 18:26:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_intern3): check symbol table overflow before generate
- next id. [ruby-core:26092]
-
-Thu Oct 15 15:14:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_encoding_set): get rid of parsing non-ascii string, and
- refine messages for invalid name encoding.
-
- * io.c (io_reopen): unread current buffer before telling the
- position, for the case of reopening same file. [ruby-dev:39479]
-
-Thu Oct 15 14:20:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_create): cannot retry with given block.
- [ruby-dev:39487]
-
-Thu Oct 15 09:25:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/init.c (rsock_init_sock): mswin doesn't have S_IFSOCK
- flag in st_mode of struct stat. so, use rb_w32_issocket() function
- instead of S_ISSOCK macro.
-
-Thu Oct 15 00:47:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb,
- enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- use UTS#18 for POSIX character class.
- http://rubyspec.org/issues/show/161
-
-Thu Oct 15 00:26:07 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/init.c (rsock_init_sock): validate file descriptor.
-
-Wed Oct 14 13:24:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): script name should not be shown in an
- error message before loaded.
-
-Wed Oct 14 09:06:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_run_node): need to call ruby_cleanup() always even
- if any error occurred so far.
-
-Wed Oct 14 08:08:12 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * proc.c (mnew): Method#new checks for respond_to_missing? with
- private set to true
- [ruby-core:26069]
-
-Tue Oct 13 21:05:01 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb,
- enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- Add DerivedCoreProperties, PropList (Binary Property),
- PropertyAlias and PropertyValueAlias.
- Now users of tool/enc-unicode.rb should specify
- the directory of UCD files.
-
-Tue Oct 13 18:54:25 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/variable.rb: bug fix. additional trace definition changes the
- option of first trace definition.
-
-Tue Oct 13 18:23:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (token_info_push, token_info_pop): reduced ifdefs.
-
- * parse.y (parser_magic_comment): fixed normalization.
-
-Tue Oct 13 09:04:14 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * thread.c: Revert changes to Thread#raise made in r25278
- [ruby-core:25367]
-
- * eval_intern.h: ditto
-
-Mon Oct 12 23:27:57 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (login): use "anonymous@" as a default password.
- [ruby-dev:39451]
-
-Mon Oct 12 22:48:25 2009 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (retrlines): added a new block parameter.
-
- * lib/net/ftp.rb (gettextfile): preserve missing end-of-line at end
- of files. [ruby-core:24590]
-
-Mon Oct 12 19:48:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_run_node): if an exception occurred in ruby_option,
- the result is not executable.
-
-Mon Oct 12 05:51:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (fetch_token): warn invalid back reference
- and subexp call. (\k and \g).
-
-Mon Oct 12 03:47:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * marshal.c (has_encoding): added for check the regexp
- is dumped by 1.8 or 1.9.
-
- * marshal.c (r_object0): use has_encoding.
-
-Sun Oct 11 15:54:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc. a patch from Justin
- Collins in [ruby-core:26050].
-
-Sun Oct 11 10:27:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
- attr_reader. [ruby-core:26047]
-
- * lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
- character class range.
-
-Sun Oct 11 10:04:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (fetch_token_in_cc): warn when \p is not
- followed by property name.
-
- * regparse.c (fetch_token): ditto.
-
-Sun Oct 11 09:44:46 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regerror.c (onig_vsnprintf_with_pattern): added.
-
- * regparse.c (onig_syntax_warn): use above.
-
-Sun Oct 11 09:04:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc
- optimization.
-
- * include/ruby/ruby.h (ruby_exec_node): declared.
-
-Sun Oct 11 03:10:50 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (onig_syntax_warn): added.
-
- * regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
- CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.
-
-Sun Oct 11 00:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (marshal_dump, marshal_load): prevent from GC.
-
-Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (path_check_0): prevent from GC.
-
-Sat Oct 10 23:51:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (rb_transcoding, str_transcoding_resize): fixed
- types.
-
-Sat Oct 10 20:35:27 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * math.c (math_atanh): reverted r25279.
-
-Sat Oct 10 19:03:29 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/curses/curses.c: use rb_thread_blocking_region to avoid
- rb_read_check. This makes other threads runnable in getstr and
- wgetstr.
- (getch_func): extracted from curses_getch.
- (curses_getch): use rb_thread_blocking_region with getch_func.
- (getstr_func): extracted from curses_getstr.
- (curses_getstr): use rb_thread_blocking_region with getstr_func.
- (wgetch_func): extracted from window_getch.
- (window_getch): use rb_thread_blocking_region with wgetch_func.
- (wgetstr_func): extracted from window_getstr.
- (window_getstr): use rb_thread_blocking_region with wgetstr_func.
-
- * include/ruby/io.h (rb_read_check): deprecated because it access
- internal of stdio.
-
-Sat Oct 10 18:59:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (cflags, cxxflags): remove duplicating options.
-
-Sat Oct 10 18:19:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, Makefile.in (LIBRUBY_SO), common.mk (ruby.imp),
- win32/mkexports.rb (each_export): exclude _threadptr_ functions.
-
-Sat Oct 10 17:55:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_threadptr_errinfo): renamed.
-
-Sat Oct 10 17:03:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_exec_node): removed unused argument.
-
-Sat Oct 10 14:55:55 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * math.c (math_atanh): Fix bug for Math.atanh(+/-1). It now returns
- +-Infinity. [ruby-core:26028]
-
-Sat Oct 10 14:09:40 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * thread.c (rb_threadptr_execute_interrupts_rec, rb_threadptr_raise):
- Thread#raise with no argument will now re-raise the current exception
- if there is one [ruby-core:25367]
-
- * eval.c (get_errinfo, rb_rubylevel_thread_errinfo): Getter for
- current exception for a given thread
-
-Fri Oct 9 23:10:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_method.c (rb_method_boundp): should exclude NOEX_RESPONDS.
- based on the patch from Nikolai Lugovoi. [ruby-core:25949]
-
-Fri Oct 9 21:14:40 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP): disable
- reverse lookup.
- (Resolv::DNS::Requester::UnconnectedUDP): ditto.
-
-Fri Oct 9 10:12:13 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/irb/context.rb (IRB::Context#initialize):
- remove warnings when $VERBOSE is set as true in .irbrc.
-
-Fri Oct 9 02:58:18 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb: optimized.
-
- * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- U+100000-U+10FFFD is assigned, not Cn.
-
-Fri Oct 9 02:12:02 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * ext/curses/curses.c: Many functions of module Curses could cause a
- crash if the ncurses library was not properly initialized.
- Fix pointed out by Alexander Beisig [ruby-core:22592]
- Functions fixed: attroff, attron, attrset, bkgd, bkgdset,
- can_change_color, close_screen, closed, color_content, curs_set,
- def_prog_mode, delch, deleteln, getmouse, getstr, has_colors,
- init_color, init_pair, insertln, keyname, mouseinterval, mousemask,
- pair_content, pair_number, reset_prog_mode, resizeterm, scrl,
- setscrreg, standend, standout, start_color, timeout, ungetmouse,
- use_default_colors
-
-Fri Oct 9 01:07:34 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (ADD_TRACE): fire coverage event in ensure clause.
- [ruby-dev:39303]
-
- * iseq.h, iseq.c: ditto.
-
-Fri Oct 9 00:33:29 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian
- Candler [ruby-core:22723]
-
-Fri Oct 9 00:01:17 2009 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/lib/socket.rb (Socket.udp_server_recv): extracted from
- Socket.udp_server_loop_on.
-
-Thu Oct 8 05:45:14 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * tool/enc-unicode.rb: parse range notation of UnicodeData.txt.
-
- * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- follow above change. [ruby-dev:39444]
-
-Thu Oct 8 02:46:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_inspect): copy by chunks.
-
-Thu Oct 8 01:23:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (iseq_s_disasm): accept proc objects. [ruby-core:18762]
-
-Wed Oct 7 16:42:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (mark_dump_arg, mark_load_arg): ignore already cleaned
- data. [ruby-core:25969]
-
- * marshal.c (clear_dump_arg, clear_load_arg): clear freed fields.
-
-Wed Oct 7 16:06:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_long2int): evaluates the argument only
- once.
-
- * struct.c (rb_struct_alloc): check array length overflow.
-
-Wed Oct 7 09:23:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): don't assign -1 to unsigned int.
-
-Wed Oct 7 00:27:01 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/resolv.rb (Resolv::DNS.bind_random_port): bind to "::" for IPv6.
- (Resolv::DNS::ConnectedUDP#initialize): specify is_ipv6 argument of
- bind_random_port.
- [ruby-core:25970]
-
-Tue Oct 6 23:32:38 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): RDoc updated. a patch from Nobuhiro
- IMAI <nov at yo.rim.or.jp> in [ruby-dev:39440]. [ruby-dev:39439]
-
-Tue Oct 6 21:30:58 2009 Tanaka Akira <akr@fsij.org>
-
- * io.c (io_reopen): avoid close if possible.
-
-Tue Oct 6 18:56:09 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_select): Struct#select should return
- enumerator when no block given.
-
-Tue Oct 6 06:26:00 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * * ext/tk/lib/tk/canvas.rb: *** POTENTIALLY INCOMPATIBLE ***
- 'tags' option of a TkcItem object should give a list of TkcTag objs.
-
- * ext/tk/lib/tkextlib/vu/dial.rb: fix logical bug.
-
- * ext/tk/lib/tk/canvas.rb, ext/tk/lib/tkextlib/blt/component.rb:
- lack of support for methodcall_optkeys.
-
-Mon Oct 5 17:19:33 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (Delegator::public_api): take snapshot of
- public method at the beginning time.
-
- * lib/delegate.rb (SimpleDelegator#initialize): use
- Delegator.public_api since public_method might be added after
- initialization. [ruby-dev:39383]
-
- * lib/delegate.rb (DelegateClass): ditto.
-
-Mon Oct 5 12:22:12 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
- calls inside of the loop by keeping pointers in local
- variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
- It was found and fixed at Security and Programming camp 2009.
-
- * string.c (rb_str_{times, split_m}): ditto.
-
- * struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
- inspect}_struct, recursive_{equal, hash, eql}): ditto.
-
-Mon Oct 5 00:09:57 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_method.c (basic_obj_respond_to): should not call
- #respond_to_missing? for not implemented methods.
- [ruby-core:25909]
-
- * vm_method.c (rb_method_boundp): returns exceptional value 2 for
- not-implemented methods when called from #respond_to? (specifies
- by new constant NOEX_RESPONDS).
-
- * method.h (enum): new constant NOEX_RESPONDS added.
-
-Sun Oct 4 22:16:29 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/cookie.rb: add default value to @@accept_charset
- if have not defined. [ruby-dev:38987]
-
- * lib/cgi/util.rb: ditto.
-
-Sun Oct 4 19:30:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (struct {dump,load}_arg): manage with dfree, instead
- of using local variable which may be moved by context switch.
- [ruby-dev:39425]
-
-Sun Oct 4 15:00:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (NATINT_LEN, pack_pack): suppressed warnings.
-
-Sun Oct 4 14:01:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rubygems.rb (Gem::binary_mode): binary mode uses binary
- encoding.
-
-Sun Oct 4 08:27:10 2009 Tanaka Akira <akr@fsij.org>
-
- * enum.c (slicebefore_ii): use id_eqq.
-
-Sun Oct 4 06:40:09 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup (ruby.mmp): added macro RUBY_EXPORT to match the
- change in dln.c
-
-Sun Oct 4 05:34:34 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb: add TkVariable#to_hash,to_proc,to_int,
- to_str,to_ary
-
-Sun Oct 4 00:59:52 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
-
- * lib/cgi/core.rb: fix command-line option of
- non-interactive terminal. [ruby-core:23016]
-
-Sun Oct 4 00:40:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake/contrib: added. [ruby-core:25918]
-
-Sat Oct 3 22:14:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (bv_decls, bvar): fix for block variables.
- [ruby-dev:39423]
-
-Sat Oct 3 21:19:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_add_method_def): no redefinition warning on
- undef.
-
-Sat Oct 3 18:51:11 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_f_integer): now Integer() takes optional base
- argument. base will be ignored for non string values.
- suggested by Sam Carr at RubyFoo Lounge at London.
-
- * test/ruby/test_integer.rb (TestInteger#test_Integer): test
- updated.
-
-Sat Oct 3 04:34:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (assignable_gen): parser_yyerror takes two arguments.
-
-Sat Oct 3 04:07:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rake: updated to rake code to rake-0.8.7 source code base.
-
- * lib/rake/loaders/makefile.rb (Rake::MakefileLoader#process_line):
- respace dependencies too.
-
-Sat Oct 3 02:59:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (assignable_gen): get rid of macro collision.
-
-Sat Oct 3 02:49:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (ary_make_shared): should count frozen array itself.
-
-Sat Oct 3 01:01:20 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/unicode/name2ctype.h: Updated to Unicode 5.2.0.
-
-Sat Oct 3 01:01:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: workaround for regexp metacharacters of expr in
- prefix path.
-
-Sat Oct 3 00:47:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ripper/dummyparser.rb (DummyParser): improvement by Magnus
- Holm in [ruby-core:25884].
- * remove scanner events which simply returned the first argument.
- * all parser events are now automatically generated.
- * simplify blocks.
-
-Sat Oct 3 00:43:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * method.h (rb_method_type_t): remove a comma at end of
- enumerator list.
-
-Sat Oct 3 00:31:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (discrete_object_p): needs the argument type to get rid
- of truncation on platforms where VALUE is larger than int.
-
-Fri Oct 2 22:30:15 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/unicode/name2ctype.h.blt, enc/unicode/name2ctype.kwd,
- enc/unicode/name2ctype.src: Updated to Unicode 5.2.0.
- NOTE: when you update these data, download UnicodeData.txt
- and Scripts.txt from http://www.unicode.org/Public/UNIDATA/
- and run
- ruby1.9 tool/enc-unicode.rb UnicodeData.txt Scripts.txt \
- > enc/unicode/name2ctype.kwd
-
- * enc/unicode/Scripts.txt: removed.
-
- * enc/unicode/UnicodeData.txt: removed.
-
-Fri Oct 2 20:49:19 2009 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_slice_before): take a pattern if no block given.
-
-Fri Oct 2 20:37:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (ripper_yylval_id, ripper_get_{id,value}): wrap ID by
- NODE to track local variable assignment.
-
- * parse.y (lvar_defined_gen, assignable_gen): enable local
- variable check. [ruby-core:24923]
-
- * parse.y (validate): use value only.
-
- * test/ripper/test_parser_events.rb (test_local_variables): tests
- based on a patch from Magnus Holm in [ruby-core:25885].
-
-Fri Oct 2 15:34:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (ruby_suppress_tracing): get rid of clobbering by
- longjmp.
-
-Fri Oct 2 09:20:35 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_origenviron): remove unused old variable.
- [ruby-dev:39412]
-
-Thu Oct 1 14:16:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{setup.mak,Makefile.sub,win32.c},include/ruby/win32.h (RT_VER):
- split compiler specification and runtime library specification.
-
- * win32/Makefile.sub (LD_SHARED*, config.status): no need to embed
- manifest if not exist.
-
-Thu Oct 1 13:23:14 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_getpid): simply call GetCurrentProcessId()
- instead of calling MSVCRT's getpid().
-
-Wed Sep 30 13:15:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_add_method_def): show the location where
- overwritten method was defined. [ruby-dev:39400]
-
-Wed Sep 30 00:37:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enumerator.c (enumerator_block_call): extracted.
-
-Wed Sep 30 00:00:25 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): escape as \x{XXXX} when the encoding is
- other than Unicode. [ruby-dev:39388]
-
-Wed Sep 30 00:00:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (THREAD_MODEL): modified message when no thread
- model is available.
-
-Tue Sep 29 23:17:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_scan_open_args): rb_utf8mac_encoding is undefined.
-
-Tue Sep 29 22:25:41 2009 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/intern.h (rb_struct_iv_get): deprecated because it is
- not used and access internal structure.
-
-Tue Sep 29 22:19:36 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/test/unit/assertions.rb (assert_equal): use Time#subsec if nsec
- is not enough to distinguish arguments.
-
-Tue Sep 29 21:16:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (rb_scan_open_args): add UTF8-MAC to no-convertion encoding.
-
-Tue Sep 29 21:21:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (--enable-pthread): deprecated.
-
-Tue Sep 29 21:03:59 2009 Yusuke Endoh <mame@tsg.ne.jp>
-
- * lib/pp.rb (Kernel#pp): returns its arguments, like Kernel#p.
- [ruby-dev:34830]
-
-Tue Sep 29 17:02:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/json/lib/json/common.rb (recurse_proc): removed needless
- module_function, since visibility is already module_function.
-
-Tue Sep 29 13:48:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_method_definition_eq): non-null definition is
- not equal to null definition.
-
- * vm_method.c (rb_add_method_def): nothing to do if old method had
- same definition. [ruby-dev:39397]
-
-Tue Sep 29 06:50:32 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): dump as \uXXXX when the
- string is in Unicode. [ruby-dev:39388]
-
-Tue Sep 29 06:49:16 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_enc_unicode_p): defined.
- Returns 1 when the encoding is Unicode series
- other than UTF-7 else 0.
-
-Tue Sep 29 04:14:08 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c (rb_filesystem_encoding): On Unix systems,
- filesystem encoding should be locale encoding.
- [ruby-dev:39393]
-
-Tue Sep 29 04:07:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * hash.c (rb_f_getenv): use rb_filesystem_str_new_cstr
- instead of rb_str_new2.
- ENV['PATH'].encoding should be Filesystem Encoding
- because its content is related to filesystem.
- see [ruby-dev:39393]
-
- * hash.c (env_fetch): ditto.
-
- * string.c (rb_filesystem_str_new): defined.
-
- * string.c (rb_filesystem_str_new_cstr): ditto.
-
- * include/ruby/intern.h (rb_filesystem_str_new): added.
-
- * include/ruby/intern.h (rb_filesystem_str_new_cstr): ditto.
-
-Tue Sep 29 04:06:18 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * include/ruby/st.h: include inttypes.h and stdint.h.
-
-Tue Sep 29 00:07:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_f_getenv, env_fetch): env string may be overwritten.
-
-Mon Sep 28 23:30:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (load_lib, dln_find_exe_r): env string may be overwritten.
-
- * dln.c (dln_{exit,loaderror,memerror,notimplement}): renamed as
- independent names.
-
- * dln.c (aix_loaderror): needs format string.
-
-Mon Sep 28 19:36:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (LK_ERR): with overlapped I/O, LockFileEx() returns
- ERROR_IO_PENDING if the file is locked.
-
-Mon Sep 28 19:05:05 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
-
- * include/ruby/st.h: aligned prototype of st_hash_uint32 with function
- definition (fixing compiling problem on cygwin)
-
-Mon Sep 28 12:13:15 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * method.h (enum): new method type VM_METHOD_TYPE_MISSING.
-
- * vm_eval.c (vm_call0): invoking VM_METHOD_TYPE_MISSING method
- objects.
-
- * vm_insnhelper.c (vm_call_method): invoking method defined from
- VM_METHOD_TYPE_MISSING.
-
- * proc.c (rb_method_entry_arity): ditto.
-
- * vm_method.c (rb_method_entry_eq): two method object wraps
- method_missing with same symbol should be equal.
- [ruby-core:25755]
-
- * proc.c (mnew): should always return method object.
-
-Mon Sep 28 11:38:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_tokadd_string): the byte after ``\'' may be a part of
- multibyte character, so pushback it. [ruby-list:46416]
-
-Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * stringio/stringio.c (strio_read): set ASCII-8BIT encoding
- when length argument is given.
-
-Mon Sep 28 01:28:17 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * Makefile.in (miniruby): suppress duplication warning on AIX.
-
-Mon Sep 28 01:13:25 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * common.mk (ruby.imp): add text section [Bug #2064].
-
- * common.mk (ruby.imp): do not export Init_*.
-
-Sun Sep 27 13:06:43 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/pp.rb (PP:ObjectMixin#pretty_print): delegates has no inspect
- method. [ruby-core:25804]
-
-Sun Sep 27 12:01:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_buf_cat2): optimize since all second arguments are
- constant literals.
-
- * string.c (str_cat_char): unused now.
-
- * string.c (rb_hash_{uint{32,},end}): removed.
-
-Sun Sep 27 11:58:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (optflags): add -fomit-frame-pointer by default.
-
-Sun Sep 27 11:28:15 2009 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_minmax): use struct for memo.
- (enum_minmax_by): ditto.
-
-Sun Sep 27 10:21:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (warnflags): check all flags if each are available.
-
-Sun Sep 27 05:35:17 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/json/ext/generator/generator.c: Documentation patch by okkez.
- [Bug #2075]
-
-Sun Sep 27 04:20:55 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): result's encoding should be fixed.
- If default_internal is not nil, the encoding is default_internal.
- Else if default_external is not nil, the encoding is default_external.
- But the encoding is not ASCII-compatible, the encoding is replaced by
- US-ASCII.
- Characters in ASCII-incompatible encoding or non ASCII characters
- in other than the encoding will be \xXX escaped.
- [ruby-dev:39343]
-
- * string.c (str_buf_cat2): defined.
-
- * string.c (prefix_escape): removed.
-
-Sun Sep 27 05:37:45 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/missing-pips.c: Updated to work with the latest PIPS 1.6.
-
- * symbian/setup: ditto.
-
- * symbian/README.SYMBIAN: ditto.
-
-Sun Sep 27 02:00:46 2009 Koichi Sasada <ko1@atdot.net>
-
- * string.c: use rename-macro instead of RUBY_ALIAS_FUNCTION_TYPE.
- Because build causes failure.
-
-Sat Sep 26 23:29:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c: moved murmur hash from string.c. [ruby-dev:39376]
-
-Sun Sep 26 00:24:14 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/setup: Updated .mmp file generation due to blockinlining.c removal.
-
-Sat Sep 26 22:39:24 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * Makefile.in(test-rubyspec): explicitly executes run subcommand of
- mspec.
-
- * spec/README: typo fix
-
-Sat Sep 26 17:53:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (COLLISION): improved collision log feature.
-
- * string.c (hash): updated to MurmurHash 2.0 2009-09-19.
-
- * string.c (rb_hash_start): fixed shift width on 128bit platform.
-
- * include/ruby/intern.h (rb_hash_{start,uint32,uint,end}): fixed
- prototypes.
-
-Sat Sep 26 13:26:55 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/net/http.rb (transport_request): Handle timeout error by
- closing socket if exception raised. [ruby-core:20976]
-
-Sat Sep 26 12:08:17 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_method.c (rb_method_entry_eq): method defined from same
- block/proc should be equal. [ruby-core:25755] [ruby-core:24791]
-
-Sat Sep 26 08:35:12 2009 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (compile_string): rename to parse_string(), because
- this function only parse String to NODE.
-
-Fri Sep 25 16:01:45 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c, include/ruby/win32.h (rb_w32_access): new function to
- replace MSVCRT's access().
- [ruby-core:25761]
-
- * file.c (eaccess): workaround for recent MSVCRT is no longer needed.
-
-Fri Sep 25 13:04:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (mnew): fix for instance method of Module, BasicObject
- and subclass of a class which overrides respond_to_missing?.
- based on a patch from Nikolai Lugovoi <nlugovoi AT gmail.com> in
- [ruby-core:25748].
-
-Fri Sep 25 11:56:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_mod_method_defined): should return true or false.
-
-Thu Sep 24 13:32:53 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * proc.c (mnew): generate method object that wraps method_missing,
- when #respond_to_missing? is defined.
-
- * test/ruby/test_object.rb (test_respond_to_missing): add test
- suites for #respond_to_missing? changes.
-
-Thu Sep 24 09:41:42 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/mathn.rb (Bignum#**): Fixed bignum**fixnum that was broken when
- requiring lib/mathn
- [ruby-core:25740]
-
-Thu Sep 24 02:21:23 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (atan): atan(Infinity) is
- PI/2.
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (atan): reduce loop with
- the double-angle formula. based on a patch from Masahiro
- Kanai (CanI) in [ruby-dev:39367].
-
-Thu Sep 24 01:14:18 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
-
- * dln.c (aix_loaderror): fixed typo. suppress warnings.
-
-Thu Sep 24 00:17:06 2009 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_minmax): reduce comparison.
- (enum_minmax_by): ditto.
-
-Wed Sep 23 22:58:57 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/thread.rb (ConditionVariable#wait): add timeout argument.
- [ruby-talk:346154]
-
-Wed Sep 23 21:25:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (atan): refined.
-
-Wed Sep 23 17:08:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (assign_in_cond): also should warn assignment to dvar in
- conditional. [ruby-dev:39363]
-
-Wed Sep 23 13:14:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_upto): keep first width. [ruby-dev:39361]
-
-Wed Sep 23 11:28:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/instruction.rb (make_header_prepare_stack): check stack
- overflow. [ruby-core:25714]
-
- * tool/instruction.rb (make_footer_stack_val): ditto.
-
-Wed Sep 23 05:03:36 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * proc.c (umethod_bind, rb_mod_define_method): Fix bug that
- disallowed methods from singleton classes to be used for
- UnboundMethod#bind, Kernel#define_singleton_method and
- Module#define_method, even when that singleton class was of the right
- kind_of. A patch by Shane O'Brien [ruby-core:25632]
-
-Tue Sep 22 22:56:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * vm_method.c (basic_obj_respond_to): new function to fundamental
- behavior for #respond_to?
-
- * vm_method.c (basic_obj_respond_to): calls #respond_to_missing
- method if overridden, to check responsiveness of methods
- implemented by #method_missing.
-
-Tue Sep 22 16:34:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (st_table_entry, st_get_key): use st_index_t.
-
-Tue Sep 22 16:28:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regenc.h (PosixBracketEntryType): constified.
-
- * regenc.h (PosixBracketEntryInit): suppress warnings.
-
- * regerror.c (onig_error_code_to_str, onig_snprintf_with_pattern):
- fixed type.
-
- * regparse.c (st_str_end_key, str_end_cmp, str_end_hash):
- constified.
-
- * tool/transcode-tblgen.rb (transcode_generated_code): fixed type.
-
-Tue Sep 22 10:29:06 2009 Tanaka Akira <akr@fsij.org>
-
- * enum.c (enum_chunk): new method Enumerable#chunk.
- * enum.c (enum_slice_before): new method Enumerable#slice_before.
- [ruby-dev:38392] [ruby-dev:39240]
-
-Tue Sep 22 05:58:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c, cont.c, gc.c, insns.def, iseq.c, iseq.h, process.c,
- thread.c, vm.c, vm_core.h, vm_dump.c, vm_eval.c,
- vm_insnhelper.c, vm_method.c, template/insns_info.inc.tmpl,
- tool/instruction.rb: fixed types.
-
-Tue Sep 22 05:04:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/{ludcmp,math}.rb: depend on
- bigdecimal.
-
- * ext/bigdecimal/lib/bigdecimal/*.rb: made module functions.
-
-Tue Sep 22 04:47:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (GetVpValue): support conversion from
- Rational. [ruby-core:25697]
-
-Tue Sep 22 04:43:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (INSNS): depend on tools.
-
-Tue Sep 22 01:10:22 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * ossl_ocsp.c (ossl_ocspres_to_der): Bug fix in Response#to_def.
- Patch by Chris Chandler [ruby-core:18411]
-
-Tue Sep 22 01:10:02 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * ossl_config.c (ossl_config_add_value_m, ossl_config_set_section):
- Check if frozen (or untrusted for $SAFE >= 4) [ruby-core:18377]
-
-Mon Sep 21 17:12:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * proc.c (proc_binding): allow proc from method. [ruby-core:25589]
-
- * vm.c (collect_local_variables_in_env): block iseq can be NULL.
-
-Mon Sep 21 10:50:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (rb_time_succ): make Time#succ obsolete since time is not
- a discrete value.
-
- * range.c (discrete_object_p): treat time objects specially to
- determine discrete values, since time objects have #succ yet are
- discrete (for now at least).
-
-Mon Sep 21 10:13:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_new, cont_capture, fiber_t_alloc): needs already
- running thread. cf. [ruby-core:25681]
-
-Mon Sep 21 00:07:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/math.rb (sin, cos, atan, exp, log):
- improved precision and performance. based on a patch from Makoto
- Yamashita in [ruby-core:25600] and [ruby-core:25602].
-
-Sun Sep 20 11:11:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * struct.c (rb_struct_equal, rb_struct_eql): Handle comparison of
- recursive structures [ruby-core:24759]
-
- * range.c (range_eq, range_eql): ditto for ranges
-
-Sat Sep 19 17:46:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (ENABLE_VM_OBJSPACE): socklist needs st_table in
- rb_w32_sysinit(), before object space initialization.
-
-Sat Sep 19 17:32:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (GlobPathValue), file.c (rb_get_path_check): path names
- must be ASCII compatible.
-
-Sat Sep 19 00:02:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_type): forward declaration to suppress a
- warning. a patch from Naohisa Goto at [ruby-dev:39350]
-
-Fri Sep 18 23:59:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (GlobPathValue): adjust return types. based on a patch
- from Naohisa Goto at [ruby-dev:39350].
-
-Fri Sep 18 23:51:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_object0): entry regexp object before its encoding
- name. [ruby-core:25625]
-
-Fri Sep 18 16:29:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (eval.o): needs vm.h.
-
- * eval.c (ruby_cleanup): destruct current VM before exit.
-
- * gc.c (rb_objspace_free): free object space.
-
- * vm.c (ruby_vm_destruct): destruct and free VM struct.
-
-Fri Sep 18 16:15:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c (iseq_compile_each), parse.y (stmt, arg): arg_concat()
- on op_asgn was inversed. [ruby-core:25629] [Bug #2050]
-
-Fri Sep 18 16:06:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (GlobPathValue): glob allows null bytes as separators.
-
-Fri Sep 18 10:11:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * doc/re.rdoc: use rdoc mode.
-
- * misc/rdoc-mode.el: added.
-
-Fri Sep 18 09:02:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
- RUBY_VERSION.
-
- * lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): emacs local variables
- are delimited by a semicolon. supported Vim style.
-
-Fri Sep 18 07:06:41 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]
-
-Fri Sep 18 06:47:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (push_glob): str should be a string always.
-
- * dir.c (rb_push_glob, dir_globs): use #to_path to convert non-
- string values. cf. [ruby-dev:39345]
-
-Fri Sep 18 06:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
- [ruby-dev:39345]
-
- * lib/mkmf.rb (create_header): open in binmode.
-
-Thu Sep 17 18:34:19 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (vm_xrealloc): free as like standard free if size is zero.
-
-Thu Sep 17 15:41:02 2009 Koichi Sasada <ko1@atdot.net>
-
- * eval_intern.h: use rb_node_newnode() directly.
-
-Thu Sep 17 15:01:32 2009 Koichi Sasada <ko1@atdot.net>
-
- * blockinlining.c: removed.
-
- * README.EXT: ditto.
-
- * README.EXT.ja: ditto.
-
-Thu Sep 17 13:50:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_thread_s_debug_set): set level, not only boolean.
-
-Thu Sep 17 13:12:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): parse also rdoc
- files.
-
- * doc/re.rdoc: renamed from re.rb.
-
-Thu Sep 17 09:37:28 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * doc/re.rb: New document for Ruby's fork of Oniguruma.
- written by Run Paint Run Run [ruby-core:25420]
-
- * re.c: import document in doc/re.rb.
-
- * .document: add doc/re.rb.
-
-Thu Sep 17 06:03:40 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (Matrix#rank): Two bug fixes. One made
- Matrix[[0,0],[0,0],[1,0]].rank raise a NoMethodError while the other
- one had Matrix[[0,1],[0,0],[1,0]].rank raise a TypeError.
-
-Thu Sep 17 06:02:04 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: Optimizations
-
-Thu Sep 17 00:36:01 2009 Tanaka Akira <akr@fsij.org>
-
- * time.c (time_mdump): error message refined.
-
-Wed Sep 16 19:27:43 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * test/ruby/test_thread.rb (TestThread#test_recursive): remove
- implementation dependent test.
-
-Wed Sep 16 17:42:52 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): install-capi needs docdir. And,
- mandir, infodir and ridir are also depend on datadir like docdir.
-
-Wed Sep 16 17:20:49 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (Matrix#/): Fix obvious bug
-
-Wed Sep 16 16:59:34 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (DOCTARGETS): rdoc is default.
-
-Wed Sep 16 16:27:40 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: typo.
-
-Wed Sep 16 16:20:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CAPITARGET): enable iff doxygen is available.
-
- * configure.in (INSTALLDOC): enable if rdoc or doxygen are enabled.
-
- * common.mk (docs): target to make documents.
-
- * Makefile.in, win32/Makefile.sub (install-{all,nodoc}): trigger
- by $(INSTALLDOC) from install.
-
-Wed Sep 16 13:39:10 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb (determinant): Bug fix where determinant failed on
- some matrices [ruby-core:23597]
-
-Wed Sep 16 13:30:20 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/matrix.rb: trivial optimizations
-
-Wed Sep 16 13:15:17 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * template/Doxyfile.tmpl: RbConfig::CONFIG['DOT'] is sometimes nil.
-
-Wed Sep 16 10:14:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja (rb_protect, rb_jump_tag): added.
-
-Wed Sep 16 10:12:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (main): makes also encs.
-
-Wed Sep 16 06:30:07 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * thread.c (rb_exec_recursive_outer, rb_exec_recursive): Added method
- to short-circuit to the outermost level in case of recursion
-
- * test/ruby/test_thread.rb (test_recursive_outer): Test for above
-
- * hash.c (rb_hash_hash): Return a sensible hash for in case of
- recursion [ruby-core:24648]
-
- * range.c (rb_range_hash): ditto
-
- * struct.c (rb_struct_hash): ditto
-
- * array.c (rb_array_hash): ditto
-
- * test/ruby/test_array.rb (test_hash2): test for above
-
-Wed Sep 16 06:17:33 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * vm_eval.c (rb_catch_obj, rb_catch, rb_f_catch): No longer use the
- obsolete function rb_iterate.
-
-Tue Sep 15 21:48:12 2009 Tanaka Akira <akr@fsij.org>
-
- * configure.in (--enable-frame-address): removed.
-
-Tue Sep 15 15:21:01 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{configure.bat,Makefile.sub} (RDOCTARGET): the meaning of this
- macro was changed at r24923.
-
-Tue Sep 15 15:16:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (install-rdoc), configure.in (RDOCTARGET): removed
- circular dependency. [ruby-dev:39339]
-
-Tue Sep 15 15:09:13 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/configure.bat: need a space before a tab to output the tab by
- echo.
-
-Tue Sep 15 14:24:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_split_m): use rb_isspace when the
- string may be ASCII-incompatible.
-
- * string.c (rb_str_lstrip_bang): ditto.
-
- * string.c (rb_str_rstrip_bang): ditto.
-
-Tue Sep 15 12:12:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_USE_BUILTIN_FRAME_ADDRESS): check after real
- target CPU is set.
-
- * configure.in (RUBY_UNIVERSAL_ARCH): check real target CPU after
- AC_PROG_CC.
-
-Tue Sep 15 06:42:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (install-all): target to install all.
-
- * tool/rbinstall.rb (parse_args): accept all install targets.
-
- * tool/rbinstall.rb (parse_args): show help message and exit if
- rbconfig could not load.
-
-Tue Sep 15 04:25:03 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RDOCTARGET): use install-all. [ruby-dev:39334]
-
-Tue Sep 15 03:00:35 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_lstrip_bang): use ascii_isspace(). [ruby-dev:39322]
-
- * string.c (rb_str_rstrip_bang): ditto.
-
- * string.c (rb_str_split_m): ditto.
-
-Mon Sep 14 16:39:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * debug.c, parse.y: fixed types.
-
- * node.h (nd_line): limit to int.
-
-Mon Sep 14 11:23:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, common.mk, */configure.bat (rdoc): make before
- install if rdoc is enabled. [ruby-dev:39325]
-
-Mon Sep 14 10:56:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (check-ruby): run all test of ruby itself.
-
-Mon Sep 14 10:44:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (RB_TYPE_P): should not use BUILTIN_TYPE for
- special constants.
-
-Mon Sep 14 10:08:19 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_inspect): use rb_enc_mbc_to_codepoint
- because we already knew char is found and got length.
-
-Mon Sep 14 09:59:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
- (LONG2NUM, ULONG2NUM, NUM2CHR): get rid of backward references of
- macros. the code couldn't compile by VC.
-
-Mon Sep 14 08:33:11 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/net/http.rb (each_*): return enumerator if no block present.
- Patch by Arthur Schreiber [ruby-core:18310]
-
-Mon Sep 14 06:42:21 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
- cookie itself. Based on a patch by Arthur Schreiber [ruby-core:17634]
-
-Mon Sep 14 05:21:12 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/net/http.rb (fetch): Handle properly default values; a patch by
- Arthur Schreiber [ruby-core:18308]
-
-Mon Sep 14 04:07:09 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/set.rb (==): Optimization; patch by Arthur Schreiber [ruby-core:17203]
-
-Mon Sep 14 03:30:23 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
-
- * symbian/pre-build: added rule to generate id.h for Symbian build.
-
- * symbian/configure.bat: fixed harmless error message.
-
-Sun Sep 13 22:18:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_mod_remove_const): do not change VM state when an
- exception will occur.
-
-Sun Sep 13 21:25:01 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (oletypelib_get_libattr): some refactoring
- by adding oletypelib_get_libattr.
-
-Sun Sep 13 20:55:19 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (oletypelib_get_typelib): some refactoring
- by adding oletypelib_get_typelib.
-
-Sun Sep 13 20:18:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_sflag, proc_options, load_file_internal): fixed
- types.
-
-Sun Sep 13 19:39:59 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: some refactoring.
-
-Sun Sep 13 19:38:34 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (load_file_internal): no need to define DATA when error.
-
-Sun Sep 13 18:48:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (XLDFLAGS): link startup code with ObjC support.
-
-Sun Sep 13 13:38:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * thread.c (recursive_*): refactored the access to the inspect
- table used by rb_exec_recursive_*. The functions recursive_push,
- pop and check now assume a valid hash table as their first
- argument. Added documentation.
-
-Sun Sep 13 12:07:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (SYM2ID): needs parens.
-
- * include/ruby/ruby.h (NUM2INT, NUM2LL, INT2NUM, UINT2NUM),
- (LONG2NUM, ULONG2NUM, NUM2CHR, rb_type_p, rb_special_const_p):
- GCC specific optimization.
-
-Sun Sep 13 11:06:12 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (OpenURI::Meta#content_type_parse): strip quotes.
-
-Sun Sep 13 09:38:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/prime.rb (EratosthenesGenerator#initialize): call super.
- (TrialDivisionGenerator, Generator23): ditto. [ruby-core:25539]
-
-Sun Sep 13 09:34:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (rb_add_method_def): no warning for inherited
- method.
-
-Sun Sep 13 08:30:30 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: fix WIN32OLE_TYPELIB.new when the 1st
- argument is the non-registered file.
-
-Sun Sep 13 02:08:43 2009 Koichi Sasada <ko1@atdot.net>
-
- * vm_core.h: change members of iseq_inline_cache_entry.
- make cache value members to one union member "ic_value".
-
- * insns.def: ditto.
-
- * vm_insnhelper.c: ditto.
-
-Sun Sep 13 01:15:49 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (URI::FTP#buffer_open): fix the %2F handling.
-
-Sun Sep 13 00:46:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_method.c (CALL_METHOD_HOOK): refined with macro.
-
- * vm_method.c (rb_remove_method_id): no definition body is
- undefined.
-
- * vm_method.c (rb_add_method, rb_add_method_me): call method added
- hook after definition. [ruby-core:25536]
-
- * vm_method.c (rb_alias): hooks are called from rb_add_method_def.
-
-Sat Sep 12 22:47:24 2009 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (URI::FTP#buffer_open): use the port specified in
- the URI.
-
-Sat Sep 12 17:31:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (GCC): subst for GCC depending extension libraries.
-
-Sat Sep 12 07:52:59 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (EVENTSINK_Invoke): initialize result
- variant value.
-
-Fri Sep 11 21:52:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * NEWS: update for 1.9.2. based on a patch from Run Paint Run Run
- in [ruby-core:25534].
-
-Fri Sep 11 21:38:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check for real target cpu on darwin 10.
-
-Fri Sep 11 18:51:57 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test/fileutils: use require_relative to require fileasserts.
-
-Fri Sep 11 14:22:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (debugflags): use gdb by default on linux and
- darwin.
-
- * configure.in (XLDFLAGS): keep ARCHFILE macro on AIX.
-
- * configure.in (RUBY_REPLACE_TYPE): define typename to default
- type if the latter is found.
-
-Fri Sep 11 13:57:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/win32.h (fstat): override if large file support is
- enabled.
-
-Fri Sep 11 11:33:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/config.{guess,sub}: updated to automake-1.11.
-
-Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s
- to k. A patch from swdyh <youhei@gmail.com>
- http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39
-
-Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (aix_loaderror): get rid of using uninitialized value in the
- case loadquery fails. fixed wrong index variable usage. see
- [ruby-core:25479].
-
-Fri Sep 11 07:52:43 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * unicode.c (onigenc_unicode_property_name_to_ctype):
- ignore case of properties.
-
- * tool/enc-unicode.rb: downcase properties list.
-
- * enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
- enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
- follow above.
-
-Fri Sep 11 05:00:19 2009 Koichi Sasada <ko1@atdot.net>
-
- * include/ruby/ruby.h (rb_data_type_t): Add comments.
- And add a member variable "data", a multi-purpose storage
- area for rb_data_type.
-
-Fri Sep 11 02:14:21 2009 Tanaka Akira <akr@fsij.org>
-
- * test/dl: use require_relative to require test_base.rb.
-
-Fri Sep 11 02:06:44 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * parse.y (rb_char_to_option_kcode): ASCII-8BIT should
- also delay.
-
- * re.c (parser_regx_options): return rb_ascii8bit_encindex on
- ASCII-8BIT. [ruby-dev:39300]
-
-Fri Sep 11 01:14:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
-
- * lib/net/http.rb (fetch): rdoc fix, patch by Arthur Schreiber.
- [ruby-core:18309].
-
-Thu Sep 10 23:00:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): fix for parallel execution.
- [ruby-core:25509]
-
-Thu Sep 10 21:22:01 2009 Tanaka Akira <akr@fsij.org>
-
- * test/dl/test_cptr.rb (test_free=): test SEGV at first.
- [ruby-dev:39269]
-
-Thu Sep 10 21:20:59 2009 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/envutil.rb (assert_normal_exit): Don't use
- AssertionMessage.
-
-Thu Sep 10 15:59:05 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * regparse.c (UNKNOWN_ESC_WARN): added.
-
- * regparse.c (conv_backslash_value): Warn unknown
- escaped chars in regexp. [ruby-dev:39104]
-
-Wed Sep 9 22:02:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::Entry_#copy_file): open the source
- file first to ensure it can be copied. [ruby-core:25498]
-
-Wed Sep 9 21:20:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_data_type): typed.
-
- * ext/dl/cfunc.c (dlcfunc_data_type): typed.
-
- * ext/dl/cptr.c (dlptr_data_type): ditto.
-
- * ext/dl/handle.c (dlhandle_data_type): ditto.
-
-Wed Sep 9 17:17:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (parser_regx_options): only one kcode should effect
- options [ruby-core:25411]
-
-Wed Sep 9 15:46:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_feature_provided): fixed for autoloading extension
- library without suffix.
-
-Wed Sep 9 15:24:32 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * include/ruby/st.h : revert previous commit.
-
- * ext/objspace/objspace.c : remove st_memsize declare.
-
-Wed Sep 9 14:07:19 2009 TAKANO Mitsuhiro (takano32) <tak@no32.tk>
-
- * include/ruby/st.h : fix duplicate st_memsize declare.
-
-Wed Sep 9 13:33:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_autoload): initialize typed data.
-
-Wed Sep 9 13:10:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (st_free_table): constified.
-
-Wed Sep 9 13:09:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_data_type): typed.
-
- * enumerator.c (enumerator_data_type): typed.
- (yielder_data_type, generator_data_type): ditto.
-
- * error.c (name_err_mesg_data_type): typed.
-
- * file.c (stat_data_type): typed.
-
- * thread.c (thgroup_data_type, mutex_data_type, barrier_data_type):
- typed.
-
- * time.c (time_data_type): typed.
-
- * transcode.c (econv_data_type): typed.
-
- * variable.c (autoload_data_type): typed.
-
-Wed Sep 9 11:11:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * include/ruby/ruby.h (rb_data_type_struct): constified dsize.
-
-Wed Sep 9 11:07:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_memsize): fixed wrong expression on IA64.
-
-Wed Sep 9 10:51:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_restore_1, rb_cont_call): should be Fiber.
-
-Wed Sep 9 00:27:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * cont.c (cont_data_type, fiber_data_type): typed.
-
-Tue Sep 8 22:37:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/tempfile.rb, lib/tmpdir.rb (Tmpname): extracted new module.
- [ruby-dev:39197]
-
-Tue Sep 8 22:18:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.c (st_init_*table_with_size): use st_index_t.
-
- * include/ruby/st.h (st_hash_func): use st_index_t.
-
-Tue Sep 8 21:48:15 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (rb_thread_mark): mark callers iseqs. [ruby-core:25474]
- [Bug #2062]
-
-Tue Sep 8 11:53:58 2009 Koichi Sasada <ko1@atdot.net>
-
- * iseq.c (iseq_mark): no need to mark inline cache entries.
-
- * insns.def (onceinlinecache, setinlinecache): save a value
- to mark cached value.
-
-Tue Sep 8 08:32:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/dl/test_{cfunc,ptr}.rb: added tests from Aaron Patterson.
- see [ruby-dev:39249].
-
-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
- switches 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> in
- [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 some 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> in
- [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>
-
- * 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.
-
- * parse.y (parser_yylex): unified warnings at space between method
- name and argument parenthesis. [ruby-dev:33943]
-
-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>
-
- * 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>
-
- * configure.in: check if fork works with pthread.
-
-Sat Jun 21 15:31:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * tool/make-snapshot: ported to ruby.
-
- * tool/make-snapshot: fixed digests.
-
-Sat Jun 21 04:36:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian::dfdxi):
- typo fixed (raize -> raise). [ruby-list:45101]
-
- * enumerator.c (enum_each_cons): typo in RDoc fixed.
-
-Sat Jun 21 00:45:34 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * tool/make-snapshot: do not use sha256sum; use BASERUBY instead
-
- * common.mk (dist): use tool/make-snapshot instead
-
-Fri Jun 20 16:34:14 2008 Tanaka Akira <akr@fsij.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.
-
-Fri Jun 20 15:40:02 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>
-
- * array.c (ary_new, rb_ary_initialize, rb_ary_store,
- rb_ary_splice, 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,
- 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>
-
- * 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].
-
-Sat Jun 14 16:55: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>
-
- * 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.
-
-Mon Jun 9 17:56:30 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#delete_if): Call to_a.
- (SortedSet#delete_if, TC_SortedSet#test_sortedset): Use super to
- yield elements in sorted order; [ruby-core:17144] by Arthur
- Schreiber.
- (SortedSet#each, SortedSet#each, TC_Set#test_each)
- (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 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>
-
- * 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).
-
- * 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.
-
-Sun Jun 8 01:15:11 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>
-
- * 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().
-
-Sat Jun 7 16:06:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CFLAGS, CXXFLAGS): append default flags.
-
-Sat Jun 7 01:23:59 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>
-
- * win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
-
- * ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
- 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.
-
-Fri Jun 6 12:43:41 2008 Yukihiro Matsumoto <matz@ruby-lang.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.
-
- * vm.c: ditto.
-
-Thu Jun 5 23:31:21 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/stringio/test_stringio.rb: add tests to achieve over 95% test
- coverage of stringio.
-
- * test/strscan/test_stringscanner.rb: ditto for strscan.
-
-Thu Jun 5 23:25:34 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval.c (ruby_finalize_0): clear trace_func after executing END
- procs.
-
- * thread.c: fix typo.
-
-Thu Jun 5 22:50:50 2008 Tanaka Akira <akr@fsij.org>
-
- * gc.c (os_obj_of): heaps may be modified in yield.
-
-Thu Jun 5 21:46:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * st.c (st_reverse_foreach): comment out unused function.
-
- * util.c (dtoa): ditto.
-
-Thu Jun 5 20:30:46 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
- Add a null check for ssl; submitted by akira yamada
- in [ruby-dev:34950].
-
- * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
- SSL_OP_NO_TICKET is present; submitted by akira yamada
- in [ruby-dev:34944].
-
- * test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
- 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>
-
- * 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>
-
- * test/ruby/test_dir.rb: add tests to achieve over 90% test coverage
- of dir.c.
-
- * 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.
-
-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.
-
-Tue Jun 3 12:51:57 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (enumerator_allocate, enumerator_ptr): Properly
- detect if the object is initialized and raise error when
- 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>
-
- * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
- where tokens are not yielded one by one.
-
- * test/erb/test_erb.rb (TestERBCore#_test_01)
- (TestERBCore#test_02_safe_04): The expected value should come
- first for assert_equal().
-
-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>
-
- * insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
- this is not int on 64bit system.
-
- * vm_dump.c (control_frame_dump): ditto.
-
- * 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.
-
-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 20:28:10 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_regexp.rb: add tests.
-
-Sat May 31 19:11:39 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * enc/utf_16{be,le}.c (utf16{be,le}_code_to_mbc):
- fix codepoint to bytes.
-
-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]
-
- * enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.
-
-Fri May 30 10:55:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.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.
-
-Fri May 30 03:12:18 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand):
- Int should be enough here.
-
-Fri May 30 02:35:00 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand),
- ext/openssl/ossl_pkey_dh.c (ossl_dh_s_generate)
- (ossl_dh_initialize),
- ext/openssl/ossl_pkey_dsa.c (ossl_dsa_s_generate),
- ext/openssl/ossl_rand.c (ossl_rand_bytes)
- (ossl_rand_pseudo_bytes, ossl_rand_egd_bytes),
- ext/openssl/ossl_x509store.c (ossl_x509stctx_set_error): Do not
- 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>
-
- * 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.
-
-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:50:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/mkexports.rb (Exports#objdump, Exports#each_line): extracted.
-
-Wed May 28 17:41:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (MKPREP): appended $(RBCONFIG).
-
- * 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>
-
- * array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
- beginning. [rubyspec]
-
-Wed May 28 16:12:44 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
- Set the HTTP status code to 302 if a Location header field is
- 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
- private methods too. [ruby-dev:34671]
-
- * 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.
-
- * thread.c (rb_thread_execute_interrupts): delay interrupts during
- raising exceptions. [ruby-dev:34855]
-
-Tue May 27 20:18:30 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>
-
- * Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
- rid of depending PREP with nmake.
-
- * common.mk (encs): depends on libruby.
-
-Tue May 27 19:00:22 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>
-
- * ext/stringio/stringio.c (strio_each_byte): Return self instead
- of nil as the rdoc says.
-
-Tue May 27 15:36:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (check_int): use PRIxVALUE format specifier.
-
- * numeric.c (check_uint, rb_num2fix, int_chr): ditto.
-
- * numeric.c (num_fdiv): fallback to_f should always return float
- result. should not use #quo that may return rational.
-
- * numeric.c (num_div): should raise ZeroDivisionError.
-
- * numeric.c (fix_divide): ditto.
-
- * test/ruby/test_numeric.rb (TestNumeric::test_divmod): avoid
- ZeroDivisionError in tests.
-
-Tue May 27 13:14:53 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 13:12:37 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
-
-Tue May 27 12:06:37 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (BUFCHECK): wrong condition. [ruby-core:16921]
-
- * file.c (file_expand_buf): shouldn't use buflen for length of string.
-
-Mon May 26 18:24:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (BUFCHECK): no resize if enough room.
-
- * 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>
-
- * 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 00:52:52 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * hash.c (env_each_key, env_each_value, env_reject_bang)
- (rb_env_clear, env_replace): Omit duplicated secure level check.
-
-Mon May 26 00:37:16 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * hash.c (env_each_value): Do not call env_values() twice.
-
-Sun May 25 17:54:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_compile): set local_table for
- ISEQ_TYPE_DEFINED_GUARD.
-
-Sun May 25 17:52:25 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_build_body): remove side effect from
- VM::InstructionSequence.load.
-
-Sun May 25 04:30:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_module.rb (remove_json_mixins): change judgment
- condition.
-
-Sun May 25 03:54:39 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_module.rb (test_ancestors, test_included_modules):
- ignore json mixins.
-
-Sun May 25 02:37:25 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval_method.c: renamed from vm_method.c. "vm_method.c" is included
- by "vm.c".
-
- * vm_eval.c: added. Some codes are moved from "eval.c"
-
- * common.mk: fix for above changes.
-
- * compile.c: make a vm_eval(0)
-
- * 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.
-
-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]
-
-Sat May 24 15:26:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * compile.c (iseq_set_exception_table, NODE_WHILE, NODE_NEXT): remove
- special handling that decrements sp in CATCH_TYPE_NEXT for NODE_WHILE.
-
- * vm.c (vm_eval_body), vm_insnhelper.c (vm_throw): remove unused code.
-
-Sat May 24 08:13:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * transcode.c (rb_str_transcode): argc is 1, and argv is &to.
-
-Fri May 23 17:55:11 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * 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:44:34 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enumerator.c (Init_Enumerator): Override
- Enumerable::Enumerator#each_with_index with #with_index.
-
-Fri May 23 12:23:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (rb_num_t): moved form vm.h.
-
- * tool/instruction.rb (RubyVM::Instruction#sp_increase_c_expr),
- tool/instruction.rb (RubyVM::VmBodyGenerator#make_header_operands):
- omit unused variables.
-
-Fri May 23 08:47:02 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (exc_equal): == operator should be transitional.
- [ruby-dev:34808]
-
- * 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>
-
- * 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>
-
- * iseq.c (iseq_load, iseq_data_to_ary): support
- ISEQ_TYPE_DEFINED_GUARD.
-
-Thu May 22 19:01:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.
-
- * vm.c (sdr, nsdr): define methods only if VMDEBUG is defined.
-
-Thu May 22 17:18:35 2008 Tanaka Akira <akr@fsij.org>
-
- * array.c (rb_ary_compact_bang): fix reallocation size.
-
-Thu May 22 15:20:20 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,
- vm.c: need to add const to prototypes, of course.
-
-Thu May 22 13:24:43 2008 Koichi Sasada <ko1@atdot.net>
-
- * eval.c, vm.c, vm_core.h, vm_insnhelper.c: specify "const".
-
- * vm_opts.h: add a OPT_TOKEN_THREADED_CODE macro.
-
-Thu May 22 12:51:41 2008 Tanaka Akira <akr@fsij.org>
-
- * insns.def (newhash): fix a variable definition: "const k".
-
-Thu May 22 12:40: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.
- [ruby-dev:34789]
-
-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>
-
- * encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
-
- * encoding.c, include/ruby/encoding.h (rb_ascii8bit_encindex):
- added.
-
- * encoding.c (rb_locale_encoding): use rb_usascii_encoding().
-
-Wed May 21 01:45:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_file_exhaustive.rb (setup): workaround for Windows
- Vista.
-
- * 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]
-
-Mon May 19 18:22:35 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
- 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.
-
- * re.c (match_init_copy): avoid unnecessary onig_region_free()
- before onig_region_copy.
-
- * encoding.c (rb_enc_get_index): remove implicit enc_capable check
- each time.
-
- * encoding.c (rb_enc_set_index): ditto.
-
- * encoding.c (enc_compatible_p): small refactoring.
-
- * include/ruby/encoding.h (rb_enc_dummy_p): inline
- rb_enc_dummy_p() and export related code.
-
-Mon May 19 14:32:03 2008 Koichi Sasada <ko1@atdot.net>
-
- * version.h: fix strange change by version.h update tool.
-
-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.
-
- * include/ruby/ruby.h, gc.c: remove T_VALUES because of above
- changes.
-
- * bootstraptest/test_eval.rb, test_knownbug.rb: move solved test.
-
-Sun May 18 22:26:51 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpservlet/filehandler.rb: should normalize path
- name in path_info to prevent script disclosure vulnerability on
- DOSISH filesystems. (fix: CVE-2008-1891)
- Note: NTFS/FAT filesystem should not be published by the platforms
- other than Windows. Pathname interpretation (including short
- filename) is less than perfect.
-
- * lib/webrick/httpservlet/abstract.rb
- (WEBrick::HTTPServlet::AbstractServlet#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]
-
- * 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 12:48:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (to_flo): rb_Float() accepts even strings for input.
-
- * complex.c (nucomp_to_f): fix wrong message.
-
- * complex.c (nucomp_to_r): ditto.
-
- * object.c (rb_Float): do not check NaN for error. NaN is a part
- of valid float values.
-
-Thu May 15 23:36:09 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_string.rb: add tests to achieve over 90% test
- coverage of string.c.
-
- * test/ruby/test_m17n.rb: ditto.
-
- * test/ruby/test_symbol.rb: ditto.
-
- * test/ruby/test_pack.rb: ditto.
-
-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.
-
- * test/ruby/test_m17n.rb (test_delete): add a test for above.
-
-Thu May 15 22:37:56 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (ripper_warningS): now used.
-
-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.
-
- * 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>
-
- * array.c (rb_ary_count): Override Enumerable#count for better
- performance.
-
-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.
-
- * test/ruby/test_rational.rb: ditto.
-
-Wed May 14 00:45:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * eval_method.c (rb_add_method): fix check for warning when
- Object#initialize is redefined. (same as 1.8)
-
-Tue May 13 23:32:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_yield): use rb_yield_values2.
-
- * enum.c (DEFINE_ENUMFUNCS): macro to define enumerator and yielding
- functions.
-
- * enum.c (enum_all_func, enum_any_func, enum_one_func,
- enum_none_func): reduced duplicate code.
-
-Tue May 13 15:09:38 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.
-
-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>
-
- * 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>
-
- * gc.c (assign_heap_slot): fix condition for number of objects in
- a heap.
-
-Mon May 12 12:24:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_to_i): really removed. [ruby-dev:34641]
-
-Mon May 12 11:15:55 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
- * gc.c (assign_heap_slot): put the binary search routine in order.
-
-Mon May 12 10:52:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
- instead of Gem::Enable.
-
- * gem_prelude.rb (load_full_rubygems_library, const_missing): prevent
- infinite recursion. [ruby-dev:34539]
-
-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>
-
- * string.c (tr_trans): single '^' does not mean negation.
- [ruby-dev:34632]
-
- * string.c (tr_trans): should check src size, not str size.
- [ruby-dev:34637]
-
- * string.c (tr_trans): should not turn on modify flag if no
- modification happens. [ruby-dev:34631]
-
-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]
-
-Wed May 7 18:02:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (sym_to_i): remove obsolete method. preparation for
- symbol GC.
-
- * numeric.c (fix_to_sym): ditto.
-
- * numeric.c (fix_id2name): ditto.
-
-Wed May 7 17:43:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_puts_ary): check recursion first. [ruby-dev:34580]
-
-Wed May 7 17:41:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm.c (vm_eval_body): initialize retval. [ruby-dev:34576]
-
-Wed May 7 13:02:56 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_fdiv): flo.fdiv(NaN) should result NaN.
-
- * numeric.c (num_quo): renamed and moved from bignum.c.
- [ruby-dev:34582]
-
- * bignum.c (rb_big_fdiv): update RDoc description
-
- * rational.c (nurat_s_new_m): small refactoring.
-
- * bignum.c (rb_big2dbl): no need for forceful warning when
- converting to float. overflow is a nature of float values.
-
-Wed May 7 00:54:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
- 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>
-
- * compile.c (compile_cpath): use Qundef to denote cbase lookup.
-
- * insns.def (defineclass): Qundef is passed for cbase.
-
- * 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]
-
-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:52:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (Init_Regexp): remove MatchData#select. [ruby-dev:34563]
-
-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]
-
-Thu May 1 23:57:06 2008 James Edward Gray II <jeg2@ruby-lang.org>
-
- * 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
- remote connection is closed. The default behavior remains unchanged though.
-
-Thu May 1 23:43:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (range_step): check if step can be converted to an integer.
- [ruby-dev:34558]
-
- * 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.
-
-Thu May 1 16:10:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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
- 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.
-
- * include/ruby/ruby.h: re-number T_xxx.
-
-Sat Apr 26 17:31:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_cProcessTms, rb_cProcessStatus): renamed.
-
- * error.c (builtin_types), signal.c (siglist), st.c (primes),
- struct.c (ref_func), time.c (months): constified.
-
-Sat Apr 26 13:00:41 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/open3.rb: double fork is replaced by spawn with Process.detach.
- (Open3.popen3w): new method to access the thread returned by
- Process.detach.
-
-Sat Apr 26 00:47:43 2008 Tanaka Akira <akr@fsij.org>
-
- * 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 17:54:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (HEAP_SIZE): use smaller heap segment (2K) for more chance
- to be freed. based on patch from authorNari <authornari at gmail.com>.
-
- * gc.c (rb_newobj_from_heap): eventually allocate heap segments.
-
-Fri Apr 25 15:35:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in
- earg.
-
-Fri Apr 25 12:37:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (flatten): returns an instance of same class.
- [ruby-core:16554]
-
-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]
-
-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.
-
-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.
-
-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 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>
-
- * test/openssl/test_ssl.rb (start_server): add timeout to server.join.
-
-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>
-
- * misc/ruby-style.el (ruby-style-{case,label}-indent): up list from
- indentation point.
-
-Tue Apr 22 21:09:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
- type of content is unsigned char.
-
- * ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.
-
- * ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.
-
- * 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>
-
- * 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>
-
- * vm_evalbody.c (DECL_SC_REG): typo fixed.
-
-Tue Apr 22 15:25:04 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (struct timespec): needs time.h according to POSIX.
-
-Tue Apr 22 13:19:48 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * thread.c (rb_thread_stop_timer_thread): should clear
- timer_thread_id after stopping it.
-
-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>
-
- * 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.
-
- * ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
- which are aliases to #each_line and #each_byte, respectively.
-
- * ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
- enumerator if no block is given.
-
- * 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.
-
- * 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:01:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * iseq.c (rb_iseq_compile_with_option): check if src is a string.
- [ruby-core:16453]
-
-Mon Apr 21 16:06:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enumerator.c (enumerator_init): preserve the method name in ID.
-
- * enumerator.c (enumerator_each): need not to call rb_to_id().
-
- * enumerator.c (enumerator_with_index): ditto.
-
-Mon Apr 21 11:00:27 2008 Yukihiro Matsumoto <matz@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]
-
-Mon Apr 21 10:06:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c: should include <errno.h> to refer to errno.
-
-Mon Apr 21 09:58:04 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>
-
- * gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
-
-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>
-
- * 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 15:01:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (struct iseq_compile_data): moved label_no from
- new_label_body().
-
- * compile.c (iseq_set_exception_table): allocates catch_table only
- when entries exist.
-
- * compile.c (struct iseq_link_element, struct iseq_insn_data): made
- enum for debuggers.
-
-Sun Apr 20 14:44:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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]
-
-Sun Apr 20 13:55:37 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_fallback): write directly (bypassing write method)
- if possible.
-
-Sun Apr 20 12:49:03 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_fallback): read directly (bypassing readpartial
- method) if possible.
-
-Sun Apr 20 04:45:13 2008 Tanaka Akira <akr@fsij.org>
-
- * io.c (copy_stream_body): use readpartial and write method for
- non-IOs such as StringIO and ARGF.
-
-Fri Apr 18 20:57:33 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_array.rb: add tests to achieve over 95% test coverage
- of array.c.
-
-Fri Apr 18 17:37:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_gc_mark_locations): get rid of underflow.
-
- * gc.c (mark_current_machine_context): check if the main thread stack
- position may shrink under the initialized position. [ruby-core:16436]
-
-Thu Apr 17 22:20:52 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * enc/trans/utf_16_32.c (fun_so_to_utf_16be, fun_so_to_utf_16le): add
- parentheses to remove warnings of gcc.
-
- * io.c (rb_io_getc): remove unused variables.
-
- * compile.c (NODE_NEXT, NODE_REDO): remove unused labels.
-
- * ext/nkf/nkf.c (rb_nkf_convert): remove unused variables.
-
- * 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>
-
- * 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>
-
- * test/ruby/test_rubyoptions.rb (ruby): run in C locale.
-
- * test/ruby/test_rubyoptions.rb (test_encoding): --encoding does not
- affect source code.
-
-Thu Apr 17 00:45:41 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_process.rb (test_rlimit_nofile): reset RLIMIT_NOFILE
- before exit (for gcov).
-
- * test/ruby/test_rubyoptions.rb: new tests for option of ruby
- interpreter, to achieve over 95% test coverage of ruby.c.
-
-Wed Apr 16 02:40:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): preludes and parser need to run in safe
- level 0. [ruby-dev:34407]
-
-Wed Apr 16 02:26:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_options): dln_find_file returns the pointer to a
- static buffer, so should copy it. [ruby-dev:34409]
-
-Tue Apr 15 23:08:46 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>
-
- * lib/net/http.rb, lib/net/smtp.rb, lib/net/pop.rb: update
- URLs of Japanese documents.
-
-Tue Apr 15 16:45:14 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * 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.
-
- * 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.
-
- * misc/ruby-mode.el (ruby-mode): use write-contents-functions or
- write-contents-hooks for older versions.
-
-Tue Apr 15 07:21:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * complex.c (nucomp_div): [ruby-dev:34357]
-
- * complex.c (nucomp_abs): use hypot.
-
- * complex.c (nucomp_quo): do not force conversion.
-
- * test/ruby/test_complex.rb: omitted some meaningless tests.
-
-Mon Apr 14 23:25:50 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_objectspace.rb: add a test for
- ObjectSpace.count_objects.
-
-Mon Apr 14 22:44:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
- half-baked result string.
-
- * re.c (rb_reg_search): make search reentrant. [ruby-dev:34223]
-
- * test/ruby/test_parse.rb (TestParse::test_global_variable):
- should preserve $& variable.
-
-Mon Apr 14 17:23:27 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
- env_reject_bang): Return an enumerator if no block is given.
-
-Mon Apr 14 14:33:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * compile.c, compile.h (compile_debug): made runtime option.
-
- * debug.c (ruby_debug_print_indent): returns if debug_level exceeds
- the threshold.
-
- * debug.c (ruby_debug_printf): printf to stderr.
-
- * iseq.c (make_compile_option, make_compile_option_value): added
- debug_level option.
-
- * vm_core.h (rb_compile_option_t): added debug_level.
-
- * vm_core.h (struct iseq_compile_data): added node_level.
-
-Mon Apr 14 12:52:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (Init_stack): use ruby_init_stack. [ruby-dev:34350]
-
- * gc.c (rb_objspace_t): packed globals. [ruby-dev:34348]
-
- * gc.c (finalizers): removed. [ruby-dev:34349]
-
-Mon Apr 14 11:30:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (ary_new): new integer overflow check condition.
- suggested by TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
- [ruby-dev:34156].
-
- * array.c (rb_ary_initialize): ditto.
-
-Mon Apr 14 00:51:40 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_parse.rb: add tests to achieve over 95% test coverage
- of parse.y.
-
-Sun Apr 13 23:53:58 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enum.c (enum_cycle): Make Enumerable#cycle do a finite loop when
- the number of cycles is specified.
-
- * array.c (rb_ary_cycle): Ditto for Array#cycle.
-
-Sun Apr 13 18:52:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (lock_func): should not check interrupts in
- blocking region. [ruby-dev:34378]
-
-Sat Apr 12 12:41:49 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
- use iseq instead of NODE.
-
- * gc.c (source_filenames): removed.
-
- * include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
- ripper_initialize): rb_source_filename() is no longer used.
-
- * 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.
-
-Sat Apr 12 12:17:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * prelude.rb (require_relative): move require_relative from
- lib/require_relative.rb. [ruby-core:16356]
-
- * lib/require_relative.rb: removed.
-
-Sat Apr 12 05:55:57 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rubygems*, test/rubygems*: Update to RubyGems 1.1.1 r1701.
-
-Sat Apr 12 03:13:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): set external encoding.
-
- * file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
- copy encoding.
-
-Fri Apr 11 17:35:06 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (count_i): modified to shut warning up.
-
-Fri Apr 11 17:25:09 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enum.c (count_i, count_iter_i, enum_count, enum_find_index):
- Reduce code.
-
-Fri Apr 11 17:06:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (find_index_i): modified to shut warning up.
-
- * enum.c (find_index_iter_i): ditto.
-
-Fri Apr 11 16:44:43 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * enum.c (enum_find_index): Add support for find_index(obj);
- [ruby-dev:34313].
-
- * array.c (rb_ary_index): Define find_index as an alias to index.
-
-Fri Apr 11 16:42:33 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/yaml/store.rb (YAML::load): modified to support empty
- database.
-
-Fri Apr 11 08:05:12 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:34312].
-
-Thu Apr 10 23:08:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/pstore.rb (PStore::dump, PStore::load): allow subclass
- overriding. [ruby-dev:34305]
-
- * lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
- add a method to support faster PStore.
-
-Thu Apr 10 20:36:45 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * 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.
-
-Thu Apr 10 19:41:00 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * eval.c (rb_f_loop): Mention StopIteration in the document.
-
-Thu Apr 10 19:23:55 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * array.c (rb_ary_pop_m, rb_ary_shift_m): Update documents for
- #pop() and #shift().
-
- * array.c (rb_ary_slice_bang): Update document. Assigning
- array[*args]= nil no longer removes elements.
-
-Thu Apr 10 16:58:44 2008 Tanaka Akira <akr@fsij.org>
-
- * marshal.c (w_object): TYPE_USERDEF assigns id for ivars first.
- [ruby-dev:34159] by nagachika.
-
-Thu Apr 10 15:03:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/generator.rb: removed obsolete library. [ruby-core:16233]
-
- * test/test_generator.rb: removed as well. [ruby-dev:34306]
-
- * lib/pstore.rb: replaced by Hongli Lai's faster version.
-
-Thu Apr 10 10:27:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread_pthread.c (native_sleep): sleep_cond is initialized at
- creation. [ruby-Patches-19361].
-
-Wed Apr 9 14:43:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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].
-
-Wed Apr 9 12:12:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_thread.rb: new tests from Sylvain Joyeux in
- [ruby-Patches-19361].
-
-Tue Apr 8 21:36:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.c (rb_mutex_sleep): ensures to re-acquire at waking up.
- [ruby-Patches-19361]
-
-Tue Apr 8 11:00:14 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/complex.rb: remove Math first before overwriting by CMath.
-
-Tue Apr 8 10:34:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * load.c (rb_require_safe): should check fname path after $SAFE is
- properly set. [ruby-dev:34268]
-
- * re.c (rb_reg_quote): should always copy the quoting string.
- [ruby-core:16235]
-
-Tue Apr 8 10:30:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (prelude.c): depends on enc/prelude.rb.
-
- * enc/prelude.rb: fixed initial library names.
-
-Tue Apr 8 03:39:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * load.c (rb_provided): check expanded path for relative path
- features, loading or loaded features are already expanded in 1.9.
-
- * variable.c (rb_autoload_load): no needs to check if provided before
- rb_require_safe. [ruby-dev:34266]
-
-Mon Apr 7 22:41:21 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * numeric.c: cancelled recent changes (except to remove rdiv).
-
- * bignum.c: ditto.
-
- * bignum.c: added rb_big_idiv.
-
-Mon Apr 7 15:51:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (enc_init_db): moved to enc/encdb.c.
-
- * transcode.c (init_transcoder_table): moved to enc/trans/transdb.c.
-
- * enc/depend (enc/encdb.o enc/trans/transdb.o): depend on
- corresponding headers.
-
- * common.mk (COMMONOBJS): moved transcode.o from OBJS
-
-Mon Apr 7 12:26:32 2008 Koichi Sasada <ko1@atdot.net>
-
- * bootstraptest/test_knownbug.rb: add a known-bug.
-
-Mon Apr 7 12:15:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * range.c (range_each_func): should not leave a variable
- uninitialized, which could cause SEGV.
-
- * range.c (range_step): removed duplicated and unreachable code.
-
-Mon Apr 7 02:12:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_intern): need not to check if tainted.
- [ruby-dev:34219]
-
-Sun Apr 6 09:45:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (dir_tell): check if closed. [ruby-core:16223]
-
-Sat Apr 5 23:17:20 2008 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/cmath.rb: new.
-
- * lib/complex.rb: depends lib/cmath.rb.
-
- * lib/rational.rb: added rdiv.
-
- * complex.c: removed some math functions.
-
-Sat Apr 5 05:50:57 2008 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
-
- * lib/rdoc/generator/html.rb: ditto.
-
- * lib/rdoc/options.rb: Fix shadowed variable warning.
-
- * lib/webrick/httprequest.rb: Fix redefined method warning.
-
-Sat Apr 5 02:13:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cmpint): moved from compar.c, to check bignum
- zero.
-
-Fri Apr 4 23:24:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * re.c (rb_memsearch_qs): wrong boundary condition.
-
- * re.c (rb_memsearch_qs_utf8): ditto.
-
-Fri Apr 4 14:11:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_memsearch_qs): wrong boundary condition. a patch from
- wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248].
-
-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]
-
- * 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]
-
-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>
-
- * lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
-
-Tue Apr 1 03:20:40 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_SETJMP, RUBY_LONGJMP, RUBY_JMP_BUF): prefers
- _setjmp over setjmp and sigsetjmp. [ruby-core:16023]
- __builtin_setjmp cannot handle a variable.
-
- * configure.in (--with-setjmp-type): new option to override the
- default rule in the above.
-
- * eval_intern.h (ruby_setjmp, ruby_longjmp), gc.c (rb_setjmp),
- vm_core.h (rb_jmpbuf_t): use RUBY_SETJMP, RUBY_LONGJMP and
- RUBY_JMP_BUF.
-
-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>
-
- * complex.c: adopted the ruby's style.
-
- * rational.c: ditto.
-
-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.
-
-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'
- 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
- "require 'tkextlib/tile'".
-
- * ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
- 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
- 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
- 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
- Ttk (Tile) widgets as default.
-
- * 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
- are replaced to "instance_exec(self)".
-
- * 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/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/tcltklib.c: decrease 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/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
- (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/timer.rb: sometimes 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
- 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.
-
-Wed Mar 26 18:11:26 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_constants): rdoc updated. a patch from
- Florian Gilcher <flo AT andersground.net> in [ruby-core:16009].
-
-Wed Mar 26 00:55:28 2008 Yusuke Endoh <mame@tsg.ne.jp>
-
- * test/ruby/test_rand.rb: add tests to achieve over 95% test coverage
- of random.c.
-
-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
- #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.
-
-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]
-
-Fri Mar 21 21:26:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
- [ruby-dev:29945], [ruby-dev:34095]
-
- * lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
- name too for cygwin. [ruby-dev:29945]
-
- * lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
-
-Fri Mar 21 21:10:00 2008 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/ipaddr.rb: Say that I am the current maintainer.
-
- * lib/set.rb: Ditto.
-
- * lib/shellwords.rb: Ditto.
-
- * ext/syslog/syslog.txt: Ditto.
-
-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 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]
-
-Wed Mar 19 14:53:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * complex.c (nucomp_to_s, nucomp_inspect): get rid of making
- unnecessary intermediate objects.
-
- * complex.c (make_patterns, string_to_c): do not treat successive
- underscores as a part of numeric like as literals. [ruby-dev:34085]
-
- * rational.c (make_patterns, string_to_r): ditto.
-
-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.
-
- * 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.
-
-Mon Mar 17 17:11:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
- of calling `run-hooks' directly to run the mode hook. patch from
- Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]
-
-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.
-
-Fri Mar 14 16:35:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::Cookie::initialize): performance patch from
- Makoto Kuwata <kwa@kuwata-lab.com> in [ruby-dev:34048].
-
-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>
-
- * string.c (UNALIGNED_WORD_ACCESS): IA64 cannot access unaligned word.
-
-Thu Mar 13 21:00:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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.
-
-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>
-
- * version.c (MKSTR): make US-ASCII. [ruby-dev:34010]
-
-Mon Mar 10 02:08:21 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * string.c (rb_str_index): if t == s + pos, the character beginning
- from s + pos is valid.
-
-Sun Mar 9 13:51:21 2008 Eric Hodel <drbrain@segment7.net>
-
- * 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.
-
-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>
-
- * {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>
-
- * 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]
-
-Tue Mar 4 05:30:31 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * io.c (open_key_args): use rb_io_open instead of rb_f_open.
- [ruby-core:15746]
-
-Mon Mar 3 23:28:37 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.
- 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_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:
- Commit patch #9280 from Akinori MUSHA.
- Simplify the OpenSSL::Digest class and make use of the
- 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>
-
- * 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.
-
- * 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]
-
-Thu Feb 21 00:01:34 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
- load path. [ruby-list:44600]
-
-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
- --cmd-type options. [ruby-dev:33816]
-
- * instruby.rb (parse_args): added bin-arch and bin-comm to install
- 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_.
-
- * instruby.rb (makedirs): use $dir_mode. [ruby-dev:33805]
-
- * instruby.rb (open_for_install): set file mode, which is now
- permission mode instead of access mode.
-
- * 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]
-
-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>
-
- * eval.c (ruby_exec_node): no thread starts inside iseq compilation.
-
- * eval.c (rb_f_raise): skip current control frame. [ruby-core:15589]
-
- * 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.
-
-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 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.
-
-Fri Feb 15 15:34:47 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_getbyte): new method.
- (rb_str_setbyte): new method.
-
-Fri Feb 15 15:29:03 2008 Tanaka Akira <akr@fsij.org>
-
- * lib/require_relative.rb: new file.
-
-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.
-
- * file.c (rb_file_truncate): check if ftruncate instead of truncate.
-
-Fri Feb 15 02:40:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (sigsetmask): check when signal semantics is not POSIX.
-
- * 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>
-
- * 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].
-
-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
- stack. [ruby-core:15458]
-
-Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766]
-
- * 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.
-
- * numeric.c (rb_num_coerce_relop): ditto.
-
- * ext/bigdecimal/bigdecimal.c (DoSomeOne): add function name argument.
-
-Tue Feb 12 10:25:02 2008 Eric Hodel <drbrain@segment7.net>
-
- * 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:
- 0.2.3 -> 0.2.4.
-
- * lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
- fixed a bug that RSS::Maker.make("0.9")'s item doesn't make some
- elements if description is missed.
- Reported by Michael Auzenne. Thanks!!!
-
- * 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>
-
- * 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.
-
- * test/ruby/test_time.rb: ditto.
-
- * test/ruby/test_numeric.rb: ditto.
-
- * test/ruby/test_fixnum.rb: ditto.
-
-Mon Feb 11 00:18:57 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
- precision. [ruby-talk:290296]
-
- * ext/bigdecimal/bigdecimal.c (BASE_FIG): made constant.
-
- * 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.
-
- * lib/mkmf.rb (install_files): rejects files matching to
- $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]
-
-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
- configure much, since ``universal'' implies hidden cross-compiling.
- TODO: ruby and libruby.bundle might be possible to bound with `lipo'
- 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
- consistent with the library implementation of MacOS X 10.5.
- [ruby-dev:33461]
-
- * 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>
-
- * parse.y (dsym): allow empty symbols. [ruby-core:15248]
-
-Thu Jan 31 00:01:51 2008 Tanaka Akira <akr@fsij.org>
-
- * 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 17:32:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * 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>
-
- * 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>
-
- * enc/trans/japanese.c (rb_to_Windows_31J): to 'Windows-31J'.
-
- * common.mk: add rules for transdb.h.
-
- * 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.
-
-Mon Jan 28 01:21:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_open_file): should check NUL in path.
- <http://www.rubyist.net/~matz/20080125.html#c01>.
-
- * io.c (rb_io_s_popen): ditto.
-
- * io.c (rb_io_reopen): ditto.
-
- * 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.
-
-Sun Jan 27 17:20:10 2008 Tanaka Akira <akr@fsij.org>
-
- * string.c (rb_str_succ): don't increment/decrement codepoint.
-
-Sun Jan 27 16:03:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * 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]
-
-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 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.
-
-Mon Jan 21 14:36:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (str_transcode): initialize transcoder in
- rb_transcoding. [ruby-dev:33234]
-
- * transcode_data.h (rb_transcoding): transcoder constified.
-
-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.
-
- * eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
-
-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>
-
- * lib/date.rb (Date::Infinity#<=>): didn't work. A patch from
- Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
- This is a bug obviously. However it didn't affect the library's
- functions.
-
- * 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]
-
-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>
-
- * 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]
-
-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>
-
- * 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.
-
- * 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>
-
- * encoding.c (rb_enc_init): UTF-{16,32}{BE,LE} are not builtin.
-
-Tue Jan 8 22:33:03 2008 NARUSE, Yui <naruse@ruby-lang.org>
-
- * encoding.c, Makefile.in, include/ruby/oniguruma.h,
- enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
-
-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>
-
- * lib/date.rb, lib/date/format.rb: introduced some constants
- (for internal use) and aliases (minute and second).
-
- * 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>
-
- * sample/time.rb: use Process.times instead of Time.times.
-
-Wed Jan 2 09:09:53 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>
-
- * 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
- 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>
-
- * 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/rdoc/dot/dot.rb: Move to lib/rdoc/dot.rb. Fix namespacing.
-
- * 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/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.
-
- * include/ruby/encoding.h (rb_enc_codelen): comment it returns
- positive integer.
-
- * string.c (rb_str_concat): rb_enc_codelen doesn't return 0.
-
-Thu Dec 27 15:18:44 2007 Tanaka Akira <akr@fsij.org>
-
- * 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>
-
- * lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES
- occurs. this is a workaround for mswin32.
-
-Wed Dec 26 22:47:31 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
- Resolv::DNS::Label::Str.
-
- * lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
- 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.
-
-Wed Dec 26 13:55:02 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
- * lib/csv.rb: Cleaned up some code with Ruby 1.9 idioms.
-
-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.
-
-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>
-
- * 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.
-
-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.
-
- * 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.
-
-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>
-
- * 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.
-
-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
- and its type.
-
- * configure.in (timezone, altzone): check for recent cygwin.
-
- * missing/strftime.c (strftime): fix for timezone. [ruby-dev:32536]
-
- * lib/mkmf.rb (try_var): should fail for functions.
-
- * 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.
-
-Fri Dec 14 02:29:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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.
-
-Mon Dec 10 21:47:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * transcode.c (str_transcode): allow non-registered encodings.
- [ruby-dev:32520]
-
-Mon Dec 10 21:00:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_slice_bang): should return nil if position out
- 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.
-
-Sat Dec 8 11:06:29 2007 Tanaka Akira <akr@fsij.org>
-
- * 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.
-
- * 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.
-
-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.
-
-Sun Dec 2 15:47:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_tokadd_mbchar): check insufficient multibyte char.
- [ruby-dev:32429]
-
-Sun Dec 2 15:42:16 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb, test/rss/test_version.rb: 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
- of consistency.
-
- * 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>
-
- * 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>
-
- * 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.
-
- * bootstraptest/test_block.rb: ditto.
-
-Sat Dec 1 10:45:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_open): use to_open for every non-string object. path
- object may use method_missing.
-
-Sat Dec 1 09:44:32 2007 Yukihiro Matsumoto <matz@ruby-lang.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>
-
- * enum.c (enum_take_while): returns Enumerator if no block given.
-
- * enum.c (enum_drop_while): ditto.
-
-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
- get rid of mixing $LDFLAGS and $ARCH_FLAG.
-
- * lib/mkmf.rb (configuration): ditto.
-
- * 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>
-
- * bignum.c (big2str_find_n1): removed extraneous element.
- [ruby-dev:32351], [ruby-dev:32365]
-
- * bignum.c (big2str_find_n1): returns necessary digits now.
-
- * 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]
-
-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>
-
- * 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
- the top.
-
- * ext/iconv/iconv.c (iconv_s_iconv): Document-method: needs class
- prefix for class method. [ruby-core:13542]
-
- * 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>
-
- * 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>
-
- * 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.
-
- * 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 21:41:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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.
-
-Tue Nov 13 16:33:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flodivmod): work around for infinity.
-
- * 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.
-
- * 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.
-
-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>
-
- * 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.
-
-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
- option with very long argument. a patch from Kobayashi Noritada
- <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
-
-Mon Nov 5 01:20:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (call_args): remove "parenthesize argument(s) for future
- version" warning. when I added this warning, I had a plan to
- 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>
-
- * 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>
-
- * encoding.c (rb_enc_compatible): ASCII encoding is compatible with
- ASCII-compatible encoding, even for non-string objects.
-
-Sun Oct 28 21:50:02 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb: :redirect option implemented to disable redirects.
- (OpenURI::HTTPRedirect): new exception class for redirection.
-
-Fri Oct 26 17:38:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (int_chr): take an optional encoding parameter.
- [ruby-core:12816]
-
-Fri Oct 26 17:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (fix_pow): returns 1.0 for 0**0.0.
-
- * 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:12:03 2007 James Edward Gray II <jeg2@ruby-lang.org>
-
- * 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>
-
- * 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>
-
- * 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>
-
- * 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]
-
- * 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.
-
- * re.c (rb_reg_initialize): set fixed option if none is set.
-
- * re.c (rb_reg_regcomp): ditto.
-
- * re.c (rb_reg_equal): check if encodings are equal.
-
- * re.c (rb_reg_initialize_m): encoding option is obsolete.
-
- * re.c (rb_kcode, rb_get_kcode, rb_set_kcode): removed.
-
- * re.c (Init_Regexp): removed Regexp#kcode method.
-
- * ruby.c (proc_options): allow long encoding name.
-
-Tue Oct 16 14:03:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_s_union): encoding of all regexp objects should
- match. [ruby-dev:32076]
-
-Tue Oct 16 13:49:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (enc_to_s): rename function.
-
-Tue Oct 16 13:25:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_new4): should copy encoding. a patch from NARUSE,
- Yui <naruse AT airemix.com>. [ruby-dev:32076]
-
-Tue Oct 16 01:31:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_inject): RDoc update. a patch from David Flanagan
- <david AT davidflanagan.com> in [ruby-core:12710].
-
-Tue Oct 16 01:25:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * encoding.c (Init_Encoding): define #to_s to show encoding name
- in to_s representation as well as #inspect.
-
-Mon Oct 15 13:24:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_round): should be number but not rounding factor.
- [ruby-dev:32060]
-
-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.
- [ruby-dev:32054]
-
-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
- options, to vail out of mismatch. [ruby-list:44114]
-
- * mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
-
-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>
-
- * 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.
-
-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>
-
- * array.c: remove to_a completely.
-
- * array.c (tmpbuf): keep DRY to clear klass of temporary objects.
-
-Tue Oct 9 16:33:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_permutation, rb_ary_combination, rb_ary_product):
- hide internal buffer objects. [ruby-dev:31982]
-
-Tue Oct 9 16:00:32 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (parser_read_escape, parser_tokadd_escape): check code range.
- [ruby-dev:31980]
-
-Tue Oct 9 15:40:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (STR_NEW3): check for if single byte sequence.
-
-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]
-
- * 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 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]
-
- * ext/fiber/fiber.c: enable Fiber#transfer.
-
-Wed Sep 26 18:38:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * encoding.c (rb_enc_check): check for ASCII-compatibilities.
-
- * parse.y (parser_tokadd_string, parser_parse_string,
- parser_here_document, parser_yylex): set encoding to US-ASCII.
-
- * parse.y (rb_enc_symname_p): check if valid with encoding.
-
- * parse.y (rb_intern3): let symbols have encoding.
-
- * string.c (rb_str_hash): add encoding index.
-
- * string.c (rb_str_comparable, rb_str_equal, rb_str_eql): check if
- compatible encoding.
-
- * string.c (sym_inspect): made encoding aware.
-
- * insns.def (opt_eq): compare with encoding.
-
- * include/ruby/encoding.h (rb_enc_asciicompat): check if ASCII
- compatible.
-
- * include/ruby/encoding.h (rb_enc_get_index): added prototype.
-
- * include/ruby/intern.h (rb_str_comparable, rb_str_equal): ditto.
-
-Wed Sep 26 15:01:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval_method.ci (rb_get_alloc_func): cast to suppress a warning.
-
- * eval_method.ci (remove_method): local variable to be initialized.
-
-Wed Sep 26 08:36:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
- objects. [ruby-Bugs-14228]
-
-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]
-
- * eval.c (ruby_finalize_0): clear trace_func before finalization.
-
-Mon Sep 24 22:36:13 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]
-
-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>
-
- * lib/net/http.rb: an SSL verification (the server hostname should
- be matched with its certificate's commonName) is added.
- this verification can be skipped by
- "Net::HTTP#enable_post_connection_check=(false)".
- suggested by Chris Clark <cclark at isecpartners.com>
-
- * lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
- perform SSL post connection check.
-
- * ext/openssl/lib/openssl/ssl.c
- (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
-
-Sun Sep 23 09:05:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
- [ruby-dev:31810]
-
-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]
-
- * 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
- changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
-
-Sat Sep 22 06:02:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::List::summarize): use each_line if
- defined rather than each. [ruby-Patches-14096]
-
-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]
-
- * gc.c (run_final): freeze temporary argument array.
-
-Fri Sep 21 04:58:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-style.el (ruby-style-label-indent): fix for function top
- level labels.
-
-Fri Sep 21 02:11:22 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_match_m): evaluate a block if match. it would make
- condition statement much shorter, if no else clause is needed.
-
- * string.c (rb_str_match_m): ditto.
-
-Fri Sep 21 02:02:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (hash_equal): should call rb_eql when argument eql is set.
-
-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.
-
-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>
-
- * 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>
-
- * 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.
-
- * 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]
-
-Thu Sep 6 12:42:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_succ, rb_str_chop_bang, rb_str_chop): m17n support.
- [ruby-dev:31734]
-
-Wed Sep 5 22:02:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_subseq): need integer overflow check.
- [ruby-dev:31736]
-
- * array.c (rb_ary_splice): ditto. [ruby-dev:31737]
-
- * array.c (rb_ary_fill): ditto. [ruby-dev:31738]
-
- * 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>
-
- * 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.
-
- * numeric.c: replace direct bignum field accessor by abstract field
- accessor such as RBIGNUM(val)->sign to RBIGNUM_SIGN(val).
-
- * 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]
-
- * 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.
-
- * 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]
-
-Wed Aug 29 11:30:10 2007 Tanaka Akira <akr@fsij.org>
-
- * include/ruby/st.h (struct st_table): add entries_packed 1-bit
- bitfield. decrease num_bins 1-bit.
-
- * 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.
-
- [ruby-list:43954]
-
-Wed Aug 29 10:46:37 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.
-
-Mon Aug 27 20:27:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
- [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]
-
- * io.c (rb_io_s_foreach): argument count check before making
- Enumerator. [ruby-dev:31525]
-
-Mon Aug 20 23:17:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * vm_core.h (struct rb_thread_struct): removed first_func_arg and
- reuse first_args instead.
-
-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]
-
-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.
-
- * configure.in (aix): for 64bit-mode AIX. [ruby-dev:31401]
- + use CC for LDSHARED if non-gcc,
- + moved -G option from *LDFLAGS to LDSHARED,
- + set -brtl only in XLDFLAGS.
-
-Thu Aug 16 13:06:08 2007 Tanaka Akira <akr@fsij.org>
-
- * bignum.c (big_lshift): make shift offset long type.
- (big_rshift): ditto.
- (rb_big_lshift): ditto.
- (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 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.
-
-Wed Aug 15 13:50:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_delete_key): delete the entry without calling block.
-
- * hash.c (rb_hash_shift): should consider iter_lev too.
-
- * 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>
-
- * bootstraptest/runner.rb (assert_check): new method.
- (assert_match): new method.
- (assert_equal): use assert_check.
- (pretty): give failure description as an argument.
-
- * 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]
-
-Sat Aug 11 07:24:55 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
- device. [ruby-talk:263410]
-
- * ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): constified.
-
- * ext/pty/pty.c (SlaveName): removed static buffer.
-
- * 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.
-
- * ext/extmk.rb (extmake): remove mkmf.log at clean, and extconf.h at
- distclean, respectively.
-
- * ext/extmk.rb: remove rdoc at clean, and installed list file at
- distclean, respectively.
-
-Fri Aug 3 07:09:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb: more verbose message. [ruby-Bugs-12766]
-
- * lib/mkmf.rb (have_type): suppress a warning with -Wall.
-
- * 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.
- [ruby-dev:31271]
-
-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.
-
- * dln.c (conv_to_posix_path): removed.
-
- * ruby.c (usage): constified.
-
- * ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
- VALUE instead of a pointer to static buffer.
-
- * ruby.c (push_include_cygwin): fixed buffer overflow.
- [ruby-dev:31297]
-
- * 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.
-
- * include/ruby/ruby.h (is_ruby_native_thread): moved prototype
- from intern.h as well as version 1.8.
-
-Sun Jul 22 14:33:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_rename): deleted code to get rid of a bug of
- old Cygwin.
-
- * file.c (rb_file_truncate): added prototype of GetLastError()
- on cygwin. [ruby-dev:31239]
-
- * include/ruby/intern.h (is_ruby_native_thread): prototype.
-
- * missing/strftime.c (strftime): fix printf format and actual
- arguments.
-
- * ext/Win32API/Win32API.c (Win32API_initialize): ditto.
-
- * ext/tk/tcltklib.c (ip_finalize): ditto.
-
- * ext/win32ole/win32ole.c (lcid_installed): ditto.
-
- * 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]
-
- * lib/date.rb, lib/date/format.rb (Date._parse): now completes
- truncated year as default action. [experimental]
-
- * lib/date.rb, lib/date/format.rb: added ::iso8601, ::rfc3339,
- ::xmlschema, ::rfc2822, ::httpdate, ::jisx0301, #xmlschema,
- #httpdate. [experimental]
-
-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.
-
- * bcc32/setup.mak: check runtime version.
-
- * win32/win32.c (rb_w32_open_osfhandle): prototype has changed
- in bcc 5.82.
-
- * {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
-
- * win32/resource.rb: include patchlevel number.
-
-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>
-
- * 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.
- [ruby-dev:31261] [ruby-bugs-12398]
-
-Thu Jul 19 14:38:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_lshift, rb_big_rshift): separated functions
- to get rid of infinite recursion. fixed calculation in edge
- cases. [ruby-dev:31244]
-
- * numeric.c (rb_fix_lshift, rb_fix_rshift): ditto.
-
-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]
-
-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.
- [ruby-core:11569], [ruby-core:11570], [ruby-core:11571],
- [ruby-core:11573]
-
-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>
-
- * ext/dl/cfunc.c (rb_dlcfunc_call): adjust format. [ruby-dev:31222]
-
- * ext/digest/digest.c (rb_digest_instance_update,
- rb_digest_instance_finish, rb_digest_instance_reset,
- rb_digest_instance_block_length): %s in rb_raise() expects char*.
- [ruby-dev:31222]
-
- * ext/openssl/ossl.h: include ossl_pkcs5.h. [ruby-dev:31231]
-
- * ext/openssl/ossl_pkcs5.h: new file for PKCS5. [ruby-dev:31231]
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
- instead of rb_raise(). [ruby-dev:31222]
-
- * ext/sdbm/_sdbm.c: DOSISH platforms need io.h. [ruby-dev:31232]
-
- * ext/syck/syck.h: include stdlib.h for malloc() and free().
- [ruby-dev:31232]
-
- * ext/syck/syck.h (syck_parser_set_input_type): prototype added.
- [ruby-dev:31231]
-
- * win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232]
-
- * include/ruby/win32.h (rb_w32_getcwd): prototype added.
- [ruby-dev:31232]
-
-Sun Jul 15 21:07:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (bigtrunc): do not empty Bignum. [ruby-dev:31229]
-
-Sun Jul 15 19:05:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_cstr_to_inum): check leading non-digits.
- [ruby-core:11691]
-
-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 02:27:43 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_pow): overflow detection using FIT_SQRT_LONG().
- [ruby-dev:31215]
-
-Sat Jul 14 02:05:53 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * insns.def (opt_div): LONG2FIX() may not work for corner cases,
- use LONG2NUM() instead. [ruby-dev:31210]
-
-Sat Jul 14 00:34:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_round): should not return false, but self.
- [ruby-dev:31212]
-
-Fri Jul 13 18:31:27 2007 Koichi Sasada <ko1@atdot.net>
-
- * 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.
-
-Fri Jul 13 16:10:00 2007 Tanaka Akira <akr@fsij.org>
-
- * lib/open-uri.rb (URI::Generic#find_proxy): use ENV.to_hash to access
- http_proxy environment variable to avoid case insensitive
- environment search.
-
-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.
-
- * 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.
-
-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>
-
- * 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>
-
- * numeric.c (int_pow): fix previous nubu's commit.
-
- * test/ruby/test_fixnum.rb: new test.
-
-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]
-
-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.
-
- * vm_evalbody.ci: ditto.
-
- * insns.def: add opt_call_native_compiled instruction
- instead of opt_call_native_compiled.
-
-Sat Jun 30 00:17:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_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>
-
- * gc.c (rb_obj_id): use SIGNED_VALUE instead of long.
-
-Thu Jun 28 05:01:56 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk (run.gdb): fix to load $(srcdir)/.gdbinit
-
- * vm.c (rb_vm_set_finish_env): add a cast.
-
- * 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]
-
-Mon Jun 18 08:47:54 2007 Technorama Ltd. <oss-ruby@technorama.net>
-
- * ext/openssl/{extconf.rb,ossl_ssl_session.c}:
- Fix ruby-Bugs-11513.
-
- * ext/openssl/ossl_pkey_ec.c
- New methods EC::Point.[eql,make_affine!,invert!,on_curve?,infinity?]
- By default output the same key form as the openssl command.
-
- * 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
- 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
- optimized out value.
-
- * variable.c (rb_global_entry, rb_f_untrace_var, rb_alias_variable,
- rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
- generic_ivar_defined, generic_ivar_remove, rb_mark_generic_ivar,
- 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>
-
- * 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]
-
-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>
-
- * parse.y (call_args): no allow splat after assocs. takes
- consistency over compatibility.
-
- * parse.y (call_args2): ditto
-
-Tue Jun 12 14:53:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and
- use it. [ruby-core:10909]
-
- * 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.
-
- * 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>
-
- * enum.c (each_with_index_i): should work well with continuation.
- a patch from sheepman <sheepman AT sheepman.sakura.ne.jp>.
- [ruby-dev:30846]
-
-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>
-
- * cont.c (cont_capture): store all local variables in heap
- ([ruby-dev:30832]).
-
- * vm.c (th_stack_to_heap): added.
-
- * 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/imap.rb (ResponseParser#next_token): fixed
- error message.
-
- * lib/net/imap.rb (ResponseParser#parse_error): fixed
- the condition not to refer to @token.symbol unexpectedly.
- Thanks, Dick Monahan.
-
-Wed May 30 13:24:33 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
- responses for some FTP servers.
-
-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
-
-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, 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.
-
-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]
-
-Sat May 26 00:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
- 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.
- [ruby-dev:30740], Thanks Kentaro KAWAMOTO.
-
-Wed May 23 05:49:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb, ext/purelib.rb, lib/mkmf.rb, runruby.rb: clear default
- 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>
-
- * 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>
-
- * enum.c (enum_inject): it is now can work without block. you
- have to specify two argument method name as the first argument.
-
- * enum.c (Init_Enumerable): reduce is new alias to inject.
-
-Sat May 19 01:05:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (Init_File): method definition mismatch.
-
-Fri May 18 16:44:04 2007 Yukihiro Matsumoto <matz@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>
-
- * 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.
-
-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>
-
- * 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 01:54:15 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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>
-
- * 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:13:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * thread.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>
-
- * 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>
-
- * 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.
-
- * 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.
-
-Wed May 2 05:40:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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]).
-
-Fri Apr 27 00:03:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
-
-Thu Apr 26 17:31:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_pow): reduce multiplying for even number.
-
- * numeric.c (int_pow): calculate power in Fixnum as possible.
- [ruby-dev:30726]
-
-Thu Apr 26 17:18:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y: fixes for ripper.
-
- * parse.y (primary): reduced duplicated code.
-
- * parse.y (f_arg_item): should not override by meaningless value.
-
- * parse.y (f_arg, assocs): should not use $$ before assigned.
-
- * parse.y (assoc_list): dispatch assoclist_from_args for assocs as
- well as args.
-
- * parse.y (assoc): return assoc if dispatched result is $1.
-
-Thu Apr 26 13:54:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-style.el: new file. C/C++ style for ruby source code.
-
-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.
- [ruby-talk:248288]
-
-Mon Apr 23 22:14:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb ($ruby): add extout directory to include path.
- [ruby-core:11003]
-
- * lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
- directory.
-
- * lib/mkmf.rb (init_mkmf): add current directory to default
- library path with highest priority. [ruby-core:10960]
-
- * lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
-
-Fri Apr 20 16:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
- it is done by libpathflag in mkmf.rb.
-
-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.
-
- * intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
-
- * signal.c (esignal_init): takes a signal number and an optional
- signal name.
-
- * 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.
-
-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
- XLDFLAGS. [ruby-core:10933]
-
- * configure.in (Makefile): remove $U for automake from MISSING.
- [ruby-talk:248171]
-
-Mon Apr 16 22:56:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/pty/expect_sample.rb: avoid symbolic link representation for
- expect. a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
- [ruby-dev:30714]
-
-Mon Apr 16 22:51:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample: replace TRUE, FALSE with true, false respectively.
- a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
- [ruby-dev:30713]
-
-Mon Apr 16 17:08:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (make_switch): do not clobber converter if pattern
- has no convert method. reported by sheepman in [ruby-dev:30709].
-
-Mon Apr 16 16:49:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_seek): consistent behavior with
- IO#seek. patch by sheepman in [ruby-dev:30710].
-
-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>
-
- * 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>
-
- * 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>
-
- * 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
- articles and UNIX manual section from messages. [ruby-dev:30690]
-
-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>
-
- * 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.
-
-Mon Apr 2 21:55:12 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed
- typo.
-
-Fri Mar 30 11:46:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by
- wanabe [ruby-dev:30672]
-
- * win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
- instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]
-
-Fri Mar 30 02:29:04 2007 Technorama <oss-ruby@technorama.net>
-
- * ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c:
- Add Documentation for various methods.
-
- * 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).
-
-Thu Mar 22 13:32:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (LIBS): remove an unnecessary library.
-
-Thu Mar 22 10:27:58 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.
-
- * test/testunit/collector/test_objectspace.rb: Ditto.
-
-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>
-
- * 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>
-
- * 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>
-
- * regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan
- Huehner <stefan at huehner.org>. [ruby-core:10543]
-
-Mon Mar 19 11:27:13 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
-
-Sun Mar 18 08:31:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/dir.h, win32/win32.c (rb_w32_opendir, rb_w32_readdir,
- rb_w32_closedir): get rid of possible buffer-overflows.
-
-Sat Mar 17 19:10:39 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * 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 22:32:20 2007 Minero Aoki <aamine@loveruby.net>
-
- * 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 22:19:24 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize,
- a little bit supporting ActiveX control. [ruby-talk:241188]
-
-Fri Mar 16 22:16:58 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: merge Ruby-SSPI patch contributed by Justin
- Bailey.
-
- * ext/Win32API/lib/win32/sspi.rb: new file.
-
-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>
-
- * lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock.
- Thanks, Keiju ISHITSUKA. [ruby-dev:30507]
-
-Tue Mar 13 02:42:58 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>
-
- * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
- externally defined modules; submitted by Technorama
- Ltd. <oss-ruby AT technorama.net> in [ruby-bugs:PR#4704].
-
- * ext/openssl/ossl_bn.c (Init_ossl_bn): Ditto.
-
- * ext/openssl/ossl_cipher.c (Init_ossl_cipher): Ditto.
-
- * ext/openssl/ossl_digest.c (Init_ossl_digest): Ditto.
-
- * ext/openssl/ossl_hmac.c (Init_ossl_hmac): Ditto.
-
- * ext/openssl/ossl_pkey.c (Init_ossl_pkey): Ditto.
-
- * ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): Ditto.
-
- * ext/openssl/ossl_pkey_dsa.c (Init_ossl_dsa): Ditto.
-
- * ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): Ditto.
-
- * ext/openssl/ossl_rand.c (Init_ossl_rand): Ditto.
-
- * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
-
-Sun Mar 11 18:42:01 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * misc/ruby-mode.el (ruby-block-end-re): Support for the
- experimental ';;' terminator had been dropped.
-
-Sun Mar 11 05:45:46 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * 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.
-
-Thu Mar 8 09:17:59 2007 Minero Aoki <aamine@loveruby.net>
-
- * compile.c: iseq_compile -> rb_iseq_compile.
-
- * iseq.c: ditto.
-
- * intern.h: provide function prototype of Init_jump.
-
- * eval_jump.h (Init_jump): declare function type.
-
- * 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.
-
- * vm_dump.c: ditto.
-
-Tue Mar 6 16:35:04 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
-
-Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/irbtkw.rbw: fails to exit process.
-
-Tue Mar 6 10:23:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: added --pure (turned on by default) and --debugger
- options.
-
-Mon Mar 5 09:19:33 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/timeout.rb (Timeout.timeout): should return the block value
- always.
-
- * lib/timeout.rb (Timeout.timeout): should yield sec argument
- always.
-
- * lib/timeout.rb (Timeout.timeout): fix document.
-
-Mon Mar 5 09:16:40 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: support automatic STARTTLS.
-
- * lib/net/smtp.rb: check server advertisement.
-
- * lib/net/smtp.rb: introduce new class SMTP::Response.
-
- * lib/net/smtp.rb (getok): should not use sprintf.
-
- * lib/net/smtp.rb (get_response): ditto.
-
- * lib/net/protocol.rb: reduce syntax warning on 1.9.
-
-Mon Mar 5 07:13:28 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: reconstruct SMTPS/STARTTLS interface. New
- interface is incompatible from current 1.9 interface at all.
-
- * lib/net/smtp.rb: All SSL-related class methods are removed; use
- instance methods instead.
-
- * lib/net/smtp.rb: rename methods: *ssl -> *tls (with alias
- "ssl").
-
- * lib/net/smtp.rb: rename methods: *tls -> *starttls.
-
-Mon Mar 5 01:36:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
- indentation broken at YARV merger.
-
-Sun Mar 4 23:41:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
- rb_gid_t instead of int.
-
- * file.c (rb_stat_s_utime): fixed a commit miss for the platforms
- where utimes() does not exist.
-
- * lib/fileutils.rb (touch): ditto.
-
-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>
-
- * 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>
-
- * lib/fileutils.rb (touch): last #touch change causes error when
- :mtime option was not given.
-
-Sat Mar 3 22:51:29 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mv): could not move directory between
- different file systems. [ruby-dev:30411]
-
-Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_utime): allow nil to set the current time.
-
- * 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>
-
- * object.c (instance_variable_get): Restore rdoc markups lost in
- the last commit.
-
-Fri Mar 2 21:17:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * 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.
-
- * ext/win32ole/win32ole.c (folevariant_s_array, folevariant_initialize):
- WIN32OLE_VARIANT#[], WIN32OLE_VARIANT#[]=, WIN32OLE_VARIANT#value=
- is defined as instance method of WIN32OLE_VARIANT.
-
- * test/win32ole/test_win32ole_variant.rb: add some test for
- VT_ARRAY, VT_BYREF variant type.
-
-Fri Mar 2 07:58:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_ivar_set): RDoc updated according to a
- suggestion from Brian Candler <B.Candler AT pobox.com>.
- [ruby-core:10469]
-
-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>
-
- * ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
- Digest::Base subclasses, which was unintentionally made
- impossible while restructuring Digest classes.
-
-Thu Mar 1 02:05:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb (patchlevel): read from version.h.
-
-Wed Feb 28 21:15:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
-
- * missing/flock.c: workaround for MinGW.
-
-Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * pack.c (pack_unpack): properly ignore non-base64 octets such as
- 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>
-
- * 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>
-
- * 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 04:03:03 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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>
-
- * test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
- target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-
-Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
-
- * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
-
- * common.mk: new target dist
-
- * distruby.rb: new file
-
-Tue Feb 27 22:18:45 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (--enable-auto-image-base): avoid the necessity to
- rebase the shared libs as much as possible;
- submitted by Corinna Vinschen <spam at vinschen.de> in
- [ruby-talk:240964].
-
-Tue Feb 27 21:36:47 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
-
-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>
-
- * 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>
-
- * 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].
-
- * ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
-
- * ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto.
-
- * 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, ->]
-
- * vm_macro.def: ditto.
-
- * gc.c: ditto.
-
- * iseq.c: ditto.
-
- * compile.h: fix debug function name.
-
- * test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
-
- * test/ruby/test_lambda.rb: disable test temporarily.
-
-Sat Feb 24 10:46:28 2007 Koichi Sasada <ko1@atdot.net>
-
- * test/testunit/test_testcase.rb: catch up with current instance
- variable spec.
-
-Sat Feb 24 10:32:59 2007 Koichi Sasada <ko1@atdot.net>
-
- * common.mk: change vm_macro.def rule.
-
-Sat Feb 24 10:38:05 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.
-
- * 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).
-
-Fri Feb 23 15:58:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * signal.c (sighandler): need to re-install sighandler on some
- platforms.
-
-Fri Feb 23 15:05:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (set_pioinfo_extra): simplified.
-
-Fri Feb 23 14:23:20 2007 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_literal.rb: new test.
-
-Fri Feb 23 12:40:12 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
- xmlrpc/client.rb; suggested by Daniel Berger
- <Daniel.Berger@qwest.com> and approved by the maintainer.
-
- * 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>
-
- * 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.
-
-Mon Feb 19 17:14:28 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
- 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>
-
- * 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
- <hgs at dmu.ac.uk> from [ruby-core:10135]
-
- * lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
-
-Thu Feb 15 20:48:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
- workaround. [ruby-core:10259]
-
- * win32/win32.c (NtInitialize): call above function.
-
-Thu Feb 15 16:25:54 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.
-
-Wed Feb 14 22:52:43 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * 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>
-
- * lib/uri/generic.rb (URI::Generic::userinfo): should support
- empty password. [ruby-core:10290]
-
- * 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>
-
- * parse.y (struct local_vars): no need to warn out-of-scope
- variables; remove dnames member from struct.
-
-Wed Feb 14 03:04:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: RVarmap no longer used as yytype; removed.
-
- * parse.y (dyna_push_gen): no longer need return value.
-
- * parse.y (dyna_pop_gen): no longer need argument.
-
- * parse.y (local_push_gen): initialize nofree.
-
-Wed Feb 14 00:30:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (init_unixsock): path may contain NUL for
- abstract unix sockets. [ruby-core:10288]
-
-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>
-
- * lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
- -> dc_rights_list. dc_rightses still exists for backward
- compatibility. [ruby-core:8350]
-
- * test/rss/test_maker_dc.rb: added tests for dc_rights_list.
-
-Sun Feb 11 22:40:17 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_ptrtype2val): ole_type, ole_type_detail
- should not return "VARIANT,VARIANT".
-
-Sun Feb 11 22:11:05 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#initialize):
- kept backward compatibility.
-
-Sun Feb 11 22:10:08 2007 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb (RSS::ListenerMixin#start_else_element): used
- const_defined? instead of constants.include?.
-
-Sun Feb 11 18:47:14 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_val2olevariantdata):
- WIN32OLE_VARIANT#new accepts nil when variant type is VT_ARRAY.
-
- * test/win32ole/test_win32ole_variant.rb: ditto.
-
- * ext/win32ole/win32ole.c: small refactoring.
-
-Sun Feb 11 07:42:25 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
- a quoted-string in a Content-Disposition value.
-
-Sat Feb 10 20:21:29 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE#ole_query_interface.
- thanks to Mikael Pahmp.
-
- * test/win32ole/test_win32ole.rb: ditto.
-
-Sat Feb 10 17:46:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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.
-
-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>
-
- * process.c: fix to use rb_status_line_set/get/clear().
-
- * eval_intern.h: fix line break.
-
-Thu Feb 8 15:00:14 2007 Koichi Sasada <ko1@atdot.net>
-
- * 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).
-
- * eval_intern.h: remove unused definitions.
-
- * common.mk: fix around vm_opts.h path
- and remove harmful argument passed to insns2vm.rb.
-
-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>
-
- * 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.
- * 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>
-
- * 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>
-
- * 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>
-
- * lib/date/format.rb (Date::Format::Bag::method_missing): add
- prefix to avoid making t class-local instance variable.
-
-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.
-
-Fri Jan 26 12:03:39 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb (TkConfigMethod#__confinfo_cmd,
- __conv_keyonly_optkeys): make them private [ruby-dev:30074].
-
- * ext/tk/lib/tk/txtwin_abst.rb: fix typo [ruby-dev:30073].
-
- * ext/tk/lib/tk/canvas.rb (TkCanvas#scan_dragto): lack of an argument.
-
- * ext/tk/lib/tk/canvas.rb: clarify the including module name
- [ruby-dev:30080].
-
- * 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 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>
-
- * Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
- setup.mak}: add --with-baseruby configure option.
-
-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>
-
- * 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>
-
- * 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().
-
-Sun Jan 7 18:36:05 2007 Koichi Sasada <ko1@atdot.net>
-
- * thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),
- rb_thread_start_timer_thread()): added.
-
- * thread_pthread.ci: add a native_thread_join() and move
- rb_thread_reset_timer_thread() definition to thread.c.
-
- * thread_win32.ci: ditto
-
- * 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>
-
- * common.mk: add a "compare" rule and fix MATZRUBY variable
-
-Sun Jan 7 17:47:16 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * test/win32ole/test_win32ole.rb: add test for WIN32OLE#[],
- WIN32OLE#[]=.
-
- * ext/win32ole/win32ole.c: update comment for rdoc of
- WIN32OLE#[] and WIN32OLE#[]=.
-
-Sun Jan 7 12:13:26 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment):
- Look for class and module comments above rb_define_class and
- rb_define_module. Patch by Daniel Berger <djberg96 at gmail.com>
-
-Sun Jan 7 10:32:12 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
- Properly handle escaping of : in comments.
- * 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>
-
- * 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.
-
- * 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):
- 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
- 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>
-
- * 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
- rl_username_completion_function() and rl_completion_matches().
- a patch from Takahiro Kambe <taca at back-street.net>.
- [ruby-dev:30008]
-
-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>
-
- * ext/digest/sha2/lib/sha2.rb: Moved one level up from under
- the superfluous subdirectory digest/.
-
-Mon Dec 11 11:46:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_define_const): typo fixed.
-
-Mon Dec 11 09:36:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_aset): index double decode problem.
- [ruby-core:09695]
-
-Sat Dec 9 21:39:24 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): keep the exception till after END blocks.
- [ruby-core:09675]
-
-Sat Dec 9 11:22:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/locale.rb (IRB::Locale::search_file): use 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>
-
- * 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>
-
- * configure.in (SITE_DIR): fixed to empty 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>
-
- * ext/digest/lib/digest/hmac.rb: Fix problems with update
- timing. [Reported by: oss-ruby@technorama.net]
-
-Sat Dec 2 07:33:53 2006 GOTOU Yuuzou <gotoyuzo@notwork.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.
-
-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 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>
-
- * 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]
-
-Sun Nov 26 16:36:46 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * version.h: addition of RUBY_PATCHLEVEL.
- * version.c: ditto.
-
-Wed Nov 22 16:00:49 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: support --with-X11/--without-X11 option.
-
- * ext/tk/README.tcltklib: add description about --with-X11-* option
- [ruby-talk:225166] and --with-X11/--without-X11 option.
-
- * 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.
-
-Mon Nov 6 18:54:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (svalue_to_avalue): need to splat but no error.
-
- * eval.c: new macros - YIELD_CALL, YIELD_VALUES.
-
- * eval.c (rb_yield_values): specify YIELD_VALUES.
-
- * eval.c (rb_yield_0): use new macros.
-
- * eval.c (proc_invoke): slightly modified to separate YIELD_CALL
- and YIELD_VALUES from YIELD_ARY_ARGS.
-
- * object.c (Init_Object): add nil.to_splat => [].
-
-Mon Nov 6 15:41:55 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/itemconfig.rb: ext/tk/lib/tk/itemconfig.rb: bug
- 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/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
-
- * ext/tk/lib/tkextlib/SUPPORT_STATUS: update.
-
- * ext/tk/sample/editable_listbox.rb: [new] the listbox with editable
- items. It's one of the example about usage of Place geometry manager.
-
- * ext/tk/sample/tktextio.rb: improve the functions of TkTextIO class.
- Those are required by 'irbtkw.rbw'.
-
- * ext/tk/sample/irbtkw.rbw: [new] IRB on Ruby/Tk. It doesn't need any
- 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>
-
- * lib/date.rb: updated based on date2 3.9.7.
-
-Sat Nov 4 13:09:31 2006 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
-
-Fri Nov 3 00:16:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_getnameinfo__aix): AF_INET6 workaround
- 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 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.
-
- * lib/set.rb (TC_Set::test_s_new): strings are no longer
- Enumerable
-
- * 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.
-
-Wed Nov 1 02:22:31 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
- optimization.
-
- * ext/digest/digest.c (rb_digest_instance_equal): Allow comparing
- a digest instance with another of a different class.
-
-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]
-
-Tue Oct 31 17:03:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_dup): duplicate the class of original time.
- [ruby-core:09357]
-
- * 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.
-
- * configure.in (aix): use -bE option for miniruby. [ruby-dev:29698]
-
- * dir.c (glob_helper): get rid of possible memory leak.
-
- * 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>
-
- * bignum.c (rb_big2str0): use better approximation.
-
-Mon Oct 30 18:35:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2str0): wrong allocation length. a patch from
- U.Nakamura <usa at garbagecollect.jp> [ruby-dev:29710]
-
-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 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>
-
- * 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>
-
- * 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>
-
- * 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 (Init_signal): avoid duplicated installation of SIGCHLD
- handler.
-
-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 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.
-
-Fri Oct 20 08:42:38 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (NULLCMD): dummy command.
-
- * bcc32/Makefile.sub (post-install-*): Borland make cannot ignore
- command-less double-colon rules. [ruby-dev:29676]
-
-Fri Oct 20 00:37:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.
-
- * ext/extmk.rb: workaround for Borland make.
-
-Wed Oct 18 23:02:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (rb_ary_shift): shorten copy size. fixed: [ruby-list:42907]
-
- * signal.c (Init_signal): handle SIGTERM. fixed: [ruby-list:42895]
-
- * 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.
-
- * {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
- directory but not prepend.
-
- * lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): do not
- join with dot. fixed: [ruby-core:09179]
-
-Sat Oct 14 23:39:50 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (singleton): no need to re-create NODE_SELF() again.
- [ruby-core:09177]
-
-Sat Oct 14 23:25:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_warning, parser_warn): some error message may
- 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>
-
- * 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().
-
-Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bcc32/Makefile.sub (post-install-ext): no longer needed.
-
- * 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>
-
- * 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 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.
-
-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
- base directory to load path.
-
- * lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): should
- use the given File-like interface, but not File directly.
-
- * test/testunit/collector/test_dir.rb (TestDir::FileSystem): implement
- File-like methods correctly.
-
-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
- Mauricio Fernandez <mfp at acm.org>. [ruby-core:09158]
-
- * object.c (rb_mod_cvar_get): typo fixed. [ruby-core:09168]
-
- * 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.
-
- * ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
-
- * ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
-
- * ext/digest/depend, ext/digest/extconf.rb: Use $INSTALLFILES
- rather than adding make targets. [Pointed out by: nobu]
-
-Tue Oct 10 16:39:08 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/sha1/depend, ext/digest/sha2/depend: Remove obsolete
- dependencies.
-
-Mon Oct 9 23:46:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/parsedate.rb: documentation patch from Konrad Meyer
- <konrad.meyer@gmail.com>. [ruby-doc:1238]
-
- * 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
- are allowed around equal sign. [ruby-core:09032]
-
- * 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.
- [ruby-core:09007]
-
-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.
-
- * 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
- (see ext/tk/ChangeLog.tkextlib).
-
-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.
-
- * 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.
-
-Mon Oct 2 23:47:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::COLLECTORS):
- base directory should be lower precedence. fixed: [ruby-dev:29622]
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): typo.
-
- * 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>
-
- * instruby.rb: batfile should be CRLF'ed.
-
-Mon Oct 2 01:24:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (test-all): separate directory where running test cases
- from source tree.
-
- * lib/test/unit/autorunner.rb (options): added --basedir, --workdir
- and --load-path options.
-
- * lib/test/unit/collector/dir.rb (recursive_collect, collect_file):
- base directory support.
-
-Sun Oct 1 23:56:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk, ext/extmk.rb, win{32,ce}/Makefile.in: keep
- LIBRUBY_SO unless need to be removed.
-
-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>
-
- * 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'.
- fixed: [ruby-talk:216845]
-
-Fri Sep 29 11:43:40 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (try_func): revert fallback checking undeclared function.
- fixed: [ruby-core:08949]
-
-Fri Sep 29 09:56:56 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: extout is needed for also clean.
- fixed: [ruby-core:08944]
-
- * lib/optparse.rb (OptionParser::Switch#conv_arg): unsplat by
- Proc#call if no conversion is given.
-
-Thu Sep 28 23:59:31 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * node.h (struct thread): declare win32_exception_list on cygwin and
- 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>
-
- * 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>
-
- * {win32,wince}/Makefile.sub (CPP): check predefined value.
-
-Tue Sep 26 07:55:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_shift): should not move memory region if array
- 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.
- [ruby-talk:216055]
-
- * array.c (rb_ary_shift): avoid creating shared object if array
- size is small.
-
-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>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
-
-Sun Sep 24 06:55:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_print): no special handling for nil as well as puts.
- fixed: [ruby-dev:29586]
-
-Sun Sep 24 06:25:53 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.
-
- * eval.c (thread_no_ensure): added THREAD_NO_ENSURE thread flag.
-
- * 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]
-
- * eval.c (rb_thread_kill): fix Thread#kill docs, which returns
- the thread object in all cases.
-
- * node.h: expose the rb_jmpbuf_t and rb_thread_t structs, along
- with the thread flags. used by the sandbox extension.
-
- * ruby.h: extern rb_eThreadError, so sandbox can swap it.
-
-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>
-
- * 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.
-
-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.
-
- * common.mk (install-doc, no-install-doc): use instruby.rb.
-
- * instruby.rb: rdoc installation.
-
- * 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
- 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.
-
- * lib/mkmf.rb (dir_re): fixed typo.
-
- * 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>
-
- * {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
- this macro to install.
-
-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.
-
-Wed Sep 20 09:25:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/gdbm/gdbm.c: add RDoc documentation. a patch from Peter
- Adolphs <futzilogik at users dot sourceforge dot net>.
- [ruby-doc:1223]
-
-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,
- Kernel#instance_variable_defined? and Module#class_variable_defined?.
- [ruby-dev:29587]
-
- * lib/date/format.rb (Date::Bag#method_missing): use new method,
- instance_variable_defined? to check if an instance variable is
- 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
- after the previous generation.
-
-Sun Sep 17 17:42:13 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk (install-doc): reverted.
-
- * instruby.rb: stores file name list without destdir prefix.
-
- * 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>
-
- * README.EXT: should mention new macros: RSTRING_PTR, RSTRING_LEN,
- RARRAY_PTR, RARRAY_LEN.
-
- * README.EXT.ja: ditto.
-
-Sat Sep 16 16:39:23 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.
-
- * instruby.rb: store installed list into the file.
-
- * ext/dbm/extconf.rb: allow multiple candidates for dbm-type.
-
- * ext/io/wait/extconf.rb: suspicious checking_for.
-
- * ext/pty/pty.c (establishShell): parent pid is not used.
-
- * 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/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]
-
-Thu Sep 14 16:11:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_intern): raise SecurityError only when $SAFE
- level is greater than zero. [ruby-core:08862]
-
- * 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]
-
-Wed Sep 13 18:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * README.EXT: English adjustment. [ruby-core:08851] and
- [ruby-core:08852]
-
-Wed Sep 13 18:25:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
- a patch from Marshall T. Vandegrift <llasram at gmail.com>.
- [ruby-core:08804]
-
-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>
-
- * 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>
-
- * 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 (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>
-
- * file.c (rb_f_test): test(0) should not have any special
- meaning. [ruby-dev:29425]
-
- * file.c (rb_f_test): properer error message.
-
-Sat Sep 9 14:08:38 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/test/unit/testcase.rb (Test::Unit::TestCase#run): Rescue
- Exception in Test::Unit::TestCase#run. [ruby-core:08783]
-
-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>
-
- * 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.
-
- * lib/mkmf.rb (create_makefile): ditto.
-
- * win32/resource.rb: ditto.
-
-Fri Sep 8 10:00:12 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.
- Thanks to Aaron Patterson <aaron_patterson at speakeasy.net>.
- [ruby-core:08802]
-
-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.
-
- * lib/mkmf.rb (create_makefile): replace "print array" by
- "print *array".
-
- * 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]
-
-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 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::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:49:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (path_check_0): check if sticky bit is set on parent
- directories for executable path. fixed: [ruby-dev:29415]
-
-Tue Sep 5 05:03:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_plus): addition in Fixnum will never overflow
- long. a patch from Ondrej Bilka <neleai at seznam.cz>.
- [ruby-core:08794]
-
- * numeric.c (fix_minus): ditto.
-
- * bignum.c (rb_big_pow): eagerly truncate resulting bignum.
- [ruby-core:08794]
-
-Mon Sep 4 23:15:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_to_s): make it conform to RFC2822 date format.
- [ruby-dev:29467]
-
-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>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
-
-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 06:46:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (rb_id2sym): intern if id is attrset_id.
- [ruby-dev:29420] [ruby-dev:29447]
-
-Mon Sep 4 01:25:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_local_variables): list symbols.
-
- * struct.c (rb_struct_s_members_m): 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.
-
-Sun Sep 3 15:32:44 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb: get rid of nil.to_s.
-
-Sun Sep 3 06:24:38 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (ruby_connect): sockerrlen should be socklen_t.
-
-Sun Sep 3 04:40:42 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/extconf.rb: check arpa/inet.h for ntohs.
-
- * 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.
-
- * parse.y (rb_intern2): handle symbol as strings.
-
- * 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.
-
- * array.c: use RARRAY_LEN and RARRAY_PTR.
-
-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]
-
-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.
-
-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>
-
- * 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>
-
- * 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]
-
-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.
-
- * regcomp.c ditto.
-
- * regparse.c: ditto.
-
-Sat Aug 26 08:03:03 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 20:35:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/wsdl/document/echo.rb: removed.
-
- * test/wsdl/document/test_rpc.rb: remove echo.rb after test.
- [ruby-dev:29337]
-
-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>
-
- * ext/win32ole/win32ole.c (hash2named_arg): accept hash argument
- of symbol key.
-
- * test/win32ole/test_win32ole.rb
- ditto.
-
-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>
-
- * lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode. a
- patch from Fujioka <fuj at rabbix.jp>. [ruby-dev:29284]
-
-Thu Aug 17 19:15:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_stat_[rRwWxX]): check for super user.
- fixed: [ruby-core:08616]
-
-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]
-
-Wed Aug 16 17:22:44 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * common.mk (pre-install-local): remove unnecessary code.
- [ruby-dev:29249]
-
-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.
-
-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.
-
- * 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]
-
-Tue Aug 8 23:49:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
- 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]
-
- * 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]
-
-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
- Kanemoto <kinpoco at gmail.com>. [ruby-dev:29197]
-
-Mon Aug 7 15:55:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/syck.c (syck_move_tokens): should avoid negative
- memmove. [ruby-list:42625]
-
-Mon Aug 7 14:37:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in, common.mk: AIX link issue. a patch from Yutaka
- Kanemoto <kinpoco at gmail.com>. [ruby-dev:29190]
-
- * ext/socket/socket.c: AIX socket support. [ruby-dev:29190]
-
-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>.
- [ruby-dev:29191]
-
-Sun Aug 6 20:34:24 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>
-
- * lib/date/format.rb (str[fp]time): "%\n" means "\n".
-
-Fri Aug 4 12:13:22 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/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
-
-Fri Aug 4 18:59:49 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
-
-Fri Aug 4 14:02:14 2006 James Edward Gray II <james@grayproductions.net>
-
- * lib/date/format.rb (__strptime, strftime): allow multi-line patterns
- in Date#strftime the same as Time#strftime accepts.
- fixed: [ruby-core:08466]
-
-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.
-
-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.
-
-Thu Aug 3 15:16:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_include): should always call Enumerable#include?
- (not #===) for non numeric end points. [ruby-core:08477]
- [ruby-core:08496]
-
-Mon Jul 31 16:51:40 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (exit_handler): new function; release winsock and
- environment work area.
-
- * win32/win32.c (NTInitialize): setup exit_handler.
-
- * win32/win32.c (StartSockets): use exit_handler.
-
- * win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
- of GetEnvironmentVariable(), because the latter cannot distinguish
- whether a null environment variable exists or not.
- fixed: [ruby-talk:205123]
-
-Mon Jul 31 16:15:13 2006 Tanaka Akira <akr@fsij.org>
-
- * test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
- setrlimit may fail with EINVAL.
- reported by MIYAMUKO Katsuyuki. [ruby-dev:29174]
-
-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>
-
- * eval.c (rb_call0): trace call/return of method defined from block.
- fixed: [ruby-core:08329]
-
- * eval.c (rb_trap_eval): make the current thread runnable to deal with
- exceptions which occurred within the trap. fixed: [ruby-dev:27729]
-
- * lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
- fixed: [ruby-talk:204896]
-
-Sat Jul 29 06:12:06 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
-
-Sat Jul 29 01:23:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/logger.rb: improves the amount of documentation that Rdoc
- picks up when processing logger.rb by moving the require
- 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
-
- * math.c (math_log): too few argument to domain_check().
-
-Thu Jul 27 21:19:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (domain_check): a new function to check domain error
- explicitly for systems that return NaN like FreeBSD.
- [ruby-core:07019]
-
- * math.c (math_acos, math_asin, math_acosh, math_atanh, math_log,
- math_log10, math_sqrt): use domain_check().
-
- * 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.
-
-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: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>
-
- * lib/net/http.rb (Net::HTTP#post, request_post, request): should
- set Content-Type: x-www-form-urlencoded by default.
-
- * lib/net/http.rb (Net::HTTPHeader#content_type): should return
- nil when there's no Content-Type.
-
- * lib/net/http.rb (Net::HTTPHeader#sub_type): should return nil
- when there's no sub Content-Type (e.g. "Content-Type: text").
-
- * 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!.
-
- * eval.c (rb_eval): prohibit redefining __send and __send!.
-
- * lib/delegate.rb (Delegator): preserve __send.
-
-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,
- but not "-". fixed: [ruby-core:08167]
-
-Wed Jul 26 16:39:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_scan): add string modification check.
- [ruby-core:7216]
-
-Wed Jul 26 16:06:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): check
- multipart boundary end. a patch from Fujioka <fuj at rabbix.jp>
- [ruby-dev:28470]
-
-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>
-
- * lib/mkmf.rb (configuration): typo.
-
-Tue Jul 25 13:14:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_proc_times): rename hz to hertz to avoid name
- crash on AIX. [ruby-dev:29126]
-
-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 15:51:52 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/readline/readline.c (readline_readline): rl_deprep_term_function
- may be NULL with libedit. reported by Ryan Davis. [ruby-dev:29070]
-
-Mon Jul 24 15:19:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): revert last change. [ruby-dev:29112]
- [ruby-core:08374]
-
-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>
-
- * eval.c (rb_yield_0): should check args_args before lambda
- argument check. [ruby-dev:29029]
-
-Tue Jul 18 23:53:59 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_f_system): shouldn't block SIGCHLD if it's not
- exist.
-
-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>
-
- * win32/win32.c (open_ifs_socket): should not use plain malloc.
-
- * win32/win32.c (rb_w32_opendir): should not use plain realloc.
-
-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
- string. [ruby-core:08223]
-
- * pack.c (pack_unpack): return referenced string itself if it has
- same length as specified. a patch from <nobu at ruby-lang.org>
- in [ruby-core:08225].
-
- * 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
- inpect argument from sprintf. [ruby-dev:29039]
-
-Tue Jul 18 10:53:37 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_cstr_to_dbl): limit out-of-range message.
-
- * util.c (ruby_strtod): return end pointer even if ERANGE occurred.
- fixed: [ruby-dev:29041]
-
-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]
-
-Tue Jul 18 00:01:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
-
-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>
-
- * st.c: still need to include config.h on some platforms.
-
-Sat Jul 15 01:09:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.c (malloc): use xmalloc/xcalloc instead of plain
- malloc/calloc, to detect memory allocation failure. see
- <http://www.nongnu.org/failmalloc/>.
-
-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.
-
- * ext/tk/lib/tk/namespace.rb: ditto.
-
-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 00:10:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_pop): may cause realloc oscillation. a patch
- from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>.
- [ruby-dev:29028]
-
-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.
-
-Wed Jul 12 20:05:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_args): allow post mandatory arguments after optional
- arguments. [ruby-dev:29014]
-
- * 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.
-
-Tue Jul 11 20:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h: export rb_cMethod. [ruby-talk:201259]
-
-Tue Jul 11 19:13:33 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: remove restriction on the class of
- pseudo-toplevel.
-
-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>
-
- * 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
- digits. [ruby-dev:28872]
-
- * ext/bigdecimal/lib/bigdecimal/util.rb: Bug in to_r reported by
- [ruby-list:42533] fixed.
-
-Mon Jul 10 19:22:19 2006 Tanaka Akira <akr@fsij.org>
-
- * gc.c (gc_sweep): expand heap earlier.
- reported by MORITA Naoyuki. [ruby-dev:28960]
-
-Mon Jul 10 18:59:34 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/font.rb: sorry. mistaken to patch.
-
-Mon Jul 10 18:46:52 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: make SEGV risk lower at exit.
-
- * ext/tk/lib/tk.rb: ditto.
-
- * ext/tk/lib/multi-tk.rb: fail to call function-style methods on slave
- interpreters. The strategy (MultiTkIp_PseudoToplevel_Evaluable) to
- fix the problem is a little tricky. You may have to take care of
- conflicting with it.
-
- * ext/tk/lib/tk.rb: a little change for the pseudo-toplevel strategy.
-
- * ext/tk/lib/tk/font.rb: ditto.
-
- * ext/tk/lib/tk/msgcat.rb: ditto.
-
- * ext/tk/lib/tkextlib/itk/incr_tk.rb: ditto.
-
- * ext/tk/sample/demos-en/widget: fail to call function-style methods
- on sample scripts. To fix it, a strategy which similar to the way
- on MultiTiIp is used. Please take care when re-write and re-run a
- demo script on the Widget-Demo code viewer.
-
- * ext/tk/sample/demos-jp/widget: ditto.
-
-Mon Jul 10 17:32:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/test.rb: update test suites.
-
- * test/ruby/test_assignment.rb (TestAssignment::test_yield): ditto.
-
- * test/ruby/test_iterator.rb (TestIterator::test_itertest): 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-ruby@zenspider.com>
-
- * lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
- Morikawa including new file suffixes, function support, public
- variables and constants, derived-types, defined operators and
- assignments, namelists, and subroutine and function
- arguments. Truly massive.
-
- * lib/rdoc/diagram.rb: diagrams are now cached.
-
- * lib/irb/completion.rb: fixed a crasher when completing against
- an unnamed class/module.
-
- * lib/rdoc/parsers/parse_c.rb: private comment (--/++) support in
- C-file rdoc.
-
- * lib/debug.rb: minor clarification in help.
-
- * lib/pp.rb: minor clarification on exception.
-
-Sun Jul 9 00:54:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (next_jump): deal with destination of next.
- fixed: [ruby-core:08169]
-
-Fri Jul 7 17:49:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_ord): extract lower byte. fixed: [ruby-dev:28980]
-
- * lib/jcode.rb (String#succ!): fix for 1.9. fixed: [ruby-dev:28979]
-
-Fri Jul 7 14:05:03 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
- from [ruby-dev:28970].
-
-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>
-
- * 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>
-
- * ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
-
- * ext/racc/cparse/cparse.c: should mark CparseParams objects.
-
- * lib/racc/parser.rb: sync with original code, rev 1.8.
-
- * 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
- bindings for general use.
-
- * ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
- Tk.callback_continue don't work on MultiTkIp.
-
- * ext/tk/lib/multi-tk.rb: ditto.
-
- * ext/tk/lib/tk.rb: lack of Tk.callback_return.
-
- * ext/tk/lib/tk/menu.rb: improve creating clone menus.
-
-Mon Jul 3 14:42:06 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
- 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.
- [ruby-dev:28927]
-
- * 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>
-
- * ext/racc/cparse/cparse.c: sync with original source code, rev
- 1.6.
-
- * 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]
-
-Sat Jul 1 15:15:49 2006 Tanaka Akira <akr@m17n.org>
-
- * test/socket/test_nonblock.rb: add timeout to send/receive
- an empty UDP packet.
- [ruby-dev:28820]
-
-Fri Jun 30 23:46:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: should test isinf for Solaris with GCC compiler.
- a patch from <ville.mattila at stonesoft.com>. [ruby-core:07791]
-
- * 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
- failure.
-
-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>
-
- * 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
- <alex at blackkettle.org>. [ruby-core:08068]
-
-Tue Jun 27 22:47:18 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
-
- * 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.
-
- * configure.in: set ac_cv_header_sys_time_h=no on MinGW
- for msvcrt compatibility.
-
-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>
-
- * eval.c (rb_yield_0): avoid core dump. [ruby-dev:28840]
-
-Mon Jun 26 11:03:00 2006 Eric Hodel <drbrain@segment7.net>
-
- * 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]
-
-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]
-
-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>
-
- * parse.y (paren_args): wrap $2 by escape_Qundef because it may be
- Qundef. [ruby-dev:28843]
-
-Sun Jun 25 17:18:33 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(ole_invoke): support some kind of
- method of word. [ruby-Bugs#3237]
-
- * test/win32ole/test_word.rb: ditto.
-
-Sat Jun 24 23:48:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: replace terminal token names with more descriptive
- name, i.e. kEND to keyword_end. [ruby-list:42477]
-
-Sat Jun 24 23:37:41 2006 Tanaka Akira <akr@m17n.org>
-
- * 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.
-
- * array.c (rb_ary_new4): don't set len as n if contents is not
- initialized. make it safe with GC.
-
- [ruby-dev:28826]
-
-Fri Jun 23 23:35:32 2006 Tanaka Akira <akr@m17n.org>
-
- * ruby.h, lib/drb/drb.rb, lib/drb/invokemethod.rb: remove Values class.
- [ruby-dev:28805]
-
-Fri Jun 23 17:27:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_block_pass): removed.
-
- * eval.c (rb_thread_start_1): use rb_proc_yield() instead of
- rb_block_pass(). fixed: [ruby-dev:28794]
-
-Thu Jun 22 11:52:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
- HTTPInternalServerError should be error 500. [ruby-core:08037]
-
-Thu Jun 22 11:47:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_name): returns nil for anonymous modules.
- [ruby-talk:198440]
-
-Thu Jun 22 10:31:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_aref): "abc"[3] should not return an empty
- string but nil. [ruby-dev:28786]
-
-Thu Jun 22 05:15:58 2006 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c (sock_s_socketpair): try GC only once.
- [ruby-dev:28778]
-
-Wed Jun 21 21:20:31 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (jd_to_commercial): now works fine even if in
- mathn-ized context.
-
-Wed Jun 21 17:29:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo.
-
- * ext/tk/tcltklib.c (tcl_eval, tcl_global_eval): ditto.
-
- * ext/zlib/zlib.c (rscheck): constified.
-
-Wed Jun 21 17:18:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/pp.rb (PP::PPMethods::seplist): should have preserved
- original reference to the array. [ruby-dev:28747]
-
-Wed Jun 21 14:35:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (block_param): do not use multiple assignment for a sole
- block parameter. [ruby-dev:28710]
-
- * eval.c (rb_yield_0): pass a raw yielded value to a sole block
- parameter if a value is passed by yield.
-
- * eval.c (proc_invoke): args may not be an array.
-
- * eval.c (rb_proc_yield): pass original value without wrapping
- it in an array.
-
-Wed Jun 21 14:06:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (method_call): remove (fn)(args) style lambda
- invocation, add fn.(args) instead.
-
-Wed Jun 21 08:39:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
- and Time processing. [ruby-core:08033]
-
-Wed Jun 21 03:01:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c, file.c, etc.: code-cleanup patch from Stefan Huehner
- <stefan at huehner.org>. [ruby-core:08029]
-
-Wed Jun 21 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reswords): modifier token is no longer returned in fname
- state. fixed: [ruby-dev:28775]
-
-Tue Jun 20 23:28:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
-
- * lib/optparse.rb (OptionParser::List#summarize, OptionParser#order!): ditto.
-
-Tue Jun 20 11:07:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): intercept break and return from lambda
- Proc objects. [ruby-dev:28742]
-
- * eval.c (proc_invoke): remove unnecessary YIELD_PROC_CALL flag.
-
- * eval.c (YIELD_EXACT_ARGS): renamed from YIELD_LAMBDA_CALL, which
- is no longer related to the behavior turned on by this flag.
-
- * eval.c (return_jump): no need to care about PROT_YIELD.
-
- * eval.c (break_jump): no jump to toplevel PROT_THREAD tag.
-
- * 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).
-
- * eval.c (rb_thread_yield): no need to specify YIELD_LAMBDA_CALL.
-
- * eval.c (rb_block_pass): update blkid in prot_tag.
-
-Mon Jun 19 23:40:59 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
-
- * ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
- imported nkf 2.0.7.
-
-Mon Jun 19 17:02:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sample/test.rb (proc_return3): return within non lambda block
- should terminate surrounding method. [ruby-dev:28741]
-
-Mon Jun 19 13:22:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (unix_sysaccept): typo fixed.
-
- * ext/socket/socket.c (sock_connect): remove an unused local
- variable tmpaddr.
-
-Mon Jun 19 02:10:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (tcp_accept_nonblock): forgot to remove
- abandoned hacks. [ruby-dev:28740]
-
-Mon Jun 19 00:00:17 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
-
-Sun Jun 18 20:28:43 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (fole_methods): The return value
- of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
-
- * ext/win32ole/win32ole.c (fole_put_methods): The return value
- of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
-
- * test/win32ole/test_ole_methods.rb: ditto.
-
- * ext/win32ole/win32ole.c (ole_propertyput): support
- PROPERTYPUTREF. [ruby-talk:183042]
-
- * test/win32ole/test_propertyputref.rb: ditto.
-
-Sat Jun 17 23:42:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_eval): add aliases invoke_method and
- invoke_functional_method corresponding send and funcall
- respectively. [ruby-talk:197512]
-
- * parse.y (parser_yylex): returns the most typical keyword token
- on EXPR_FNAME. [ruby-core:7995]
-
- * ext/socket/socket.c: protoize.
-
-Sat Jun 17 22:17:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mathn.rb (Integer::prime_division): raise ZeroDivisionError
- on zeros. [ruby-dev:28739]
-
-Sat Jun 17 14:53:32 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Kernel#Pathname): new method.
-
-Sat Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
- string.
-
-Fri Jun 16 01:41:00 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_proc_arity): get rid of segfault for mere splat.
-
- * gc.c (gc_mark_children): NODE_BLOCK_PASS needs u3 to be marked.
-
-Thu Jun 15 22:06:56 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (then): remove ':' from 'then' and 'do' rules.
-
-Wed Jun 14 18:00:20 2006 Eric Hodel <drbrain@segment7.net>
-
- * enum.c (enum_any): Documentation typo.
-
-Wed Jun 14 15:01:09 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
- warnings when -q is set.
-
-Wed Jun 14 16:11:37 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_f_method_name, rb_f_callee_name): document typo.
-
-Wed Jun 14 15:19:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (env_aset): raise TypeError on nil with more descriptive
- message. [ruby-core:07990]
-
-Tue Jun 13 17:22:19 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (Init_socket): remove obsolete constants:
- IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
- UNIXsocket, UNIXserver.
-
-Tue Jun 13 09:07:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (formal_assign): post splat arguments should have had
- higher priority than optional arguments, since they are
- mandatory. [ruby-dev:28715]
-
- * eval.c (VIS_MASK): broken. should be 15. [ruby-dev:28715]
-
- * io.c (argf_getc): should return one-character string.
- [ruby-dev:28715]
-
- * io.c (rb_io_readchar): ditto.
-
-Sun Jun 11 23:20:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (sym_call): disallow to call private methods.
-
- * lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
- parser.
-
-Sun Jun 11 09:56:41 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.
-
-Sun Jun 11 07:27:11 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/rdoc/ri/ri_writer.rb: use String#ord.
-
-Sun Jun 11 04:38:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (sym_to_proc): imported Symbol#to_proc from ActiveSupport.
-
-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]
-
-Sat Jun 10 17:49:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_ord): new method.
-
- * parse.y (rbracket): allow optional newline before closing
- brackets.
-
-Sat Jun 10 15:12:29 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_f_method_name, rb_f_callee_name): new functions.
- new global method `__method__' and `__callee__'.
-
-Sat Jun 10 10:13:13 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/getoptlong.rb (GetoptLong#set_options): receive arguments
- as Array.
-
- * lib/irb/slex.rb: use Proc#yield.
-
- * lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
- of String#[].
-
- * lib/rdoc/ri/ri_writer.rb: ditto.
-
-Sat Jun 10 08:17:23 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * math.c (log2): may be a macro.
-
- * parse.y (args, block_param, f_args): pass f_post_arg to #params.
-
- * util.c (powersOf10): constified.
-
- * ext/readline/readline.c: include extconf.h first.
-
- * ext/ripper/eventids2.c: removed tLAMBDA_ARG.
-
- * ext/tk/tcltklib.c (lib_fromUTF8_core): removed conflict.
-
- * ext/tk/tkutil/tkutil.c (cbsubst_get_subst_arg): rb_id2name() is
- defined as const now.
-
- * ext/win32ole/win32ole.c (fole_missing): ditto.
-
- * lib/mkmf.rb (create_makefile): force to create extconf header.
-
- * lib/optparse.rb (order!): use Proc#yield.
-
-Sat Jun 10 06:53:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (CALLARGS): remove last semicolon. C90 compiler doesn't
- allow any lines (even if they're empty) within variable
- declarations.
-
-Fri Jun 9 09:56:32 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): allow %c to print one character
- string (e.g. ?x).
-
-Thu Jun 8 14:00:02 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]
-
-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>
-
- * parse.y (do_block): remove -> style block.
-
- * parse.y (parser_yylex): remove tLAMBDA_ARG.
-
-Wed Jun 7 14:51:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (errmap): add some winsock errors.
-
-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.
-
-Mon Jun 5 18:12:12 2006 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
- non-AF_INET/AF_INET6 sockaddr.
- (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
- [ruby-dev:28691]
-
-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.
-
-Sat Jun 3 13:10:41 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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>
-
- * ext/openssl/extconf.rb: use create_header.
-
- * ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
- include RUBY_EXTCONF_H.
-
-Fri Jun 2 17:16:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created.
-
-Fri Jun 2 00:11:19 2006 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c (s_recvfrom): alen may be zero with UNIXSocket
- too. (tested on NetBSD 3.0)
- (s_recvfrom_nonblock): extracted from sock_recvfrom_nonblock.
- (sock_recvfrom_nonblock): use s_recvfrom_nonblock.
- (ip_recvfrom_nonblock): new method: IPSocket#recvfrom_nonblock
- (unix_recvfrom_nonblock): new method: UNIXSocket#recvfrom_nonblock
- (s_accept_nonblock): extracted from sock_accept_nonblock.
- (sock_accept_nonblock): use s_accept_nonblock.
- (tcp_accept_nonblock): new method: TCPServer#accept_nonblock
- (unix_accept_nonblock): new method: UNIXServer#accept_nonblock
-
-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>
-
- * 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>
-
- * 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>
-
- * 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>
-
- * ruby.h, lib/mkmf.rb (create_header): clear command line options for
- macros moved to extconf.h.
-
- * ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
- EXTSTATIC permanent.
-
- * ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
-
- * {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
- $(INCFLAGS).
-
- * lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
-
-Thu May 25 01:52:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (pkg_config): particular config commands support.
-
- * ext/extmk.rb: deal with $static set in extconf.rb.
-
- * mkconfig.rb: merge multiple entries to an entry with multiple lines.
-
- * lib/mkmf.rb: allow a series of commands to link.
-
- * win32/Makefile.sub: embed manifests.
-
- * win32/setup.mak: suffix OS name by runtime version.
-
-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>
-
- * 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>
-
- * rubyio.h (rb_io_set_nonblock): declared.
-
- * io.c (rb_io_set_nonblock): new function.
- (io_getpartial): nonblocking read support.
- (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].
- (sock_connect_nonblock): new method: Socket#connect_nonblock.
- (sock_accept_nonblock): new method: Socket#accept_nonblock.
- (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
-
- [ruby-core:7917]
-
-Mon May 22 15:57:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (umethod_bind): should not update original class.
- [ruby-dev:28636]
-
-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
- number. [ruby-core:07896]
-
- * time.c (time_add): ditto.
-
-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]
-
-Tue May 16 17:23:19 2006 Shin-ichiro HARA <sinara@blade.nagaokaut.ac.jp>
-
- * 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.
-
-Tue May 16 15:34:18 2006 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.
-
-Tue May 16 09:20:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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.
-
-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):
- typo fixed. a patch from Florian Gross <florg at florg.net>.
-
-Sat May 13 16:14:05 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (PP.mcall): new method.
- (Struct#pretty_print): call Kernel#class and Struct#members even if
- overridden.
- (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>
-
- * ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): should return
- value. [ruby-dev:28627]
-
-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
- <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]
-
- * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
- type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
- [ruby-core:07808]
-
-Wed May 3 02:12:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (make_hostent_internal): accept ai_family
- 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>
-
- * ext/win32ole/win32ole.c (add_event_call_back): should not
- delete event handler when the event name is not entried.
-
-Mon May 1 08:32:10 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_param_ole_type): should return
- "unknown type" string when ITypeInfo::GetFuncDesc failed.
-
-Sat Apr 29 22:43:37 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
- flag. [ruby-core:07785]
-
-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]
-
-Thu Apr 27 01:38:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fill): internalize local variable "beg" to
- pacify Coverity. [ruby-core:07770]
-
-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]
-
-Tue Apr 25 18:00:05 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
- count of a NULL Tcl_Obj [ruby-core:07759].
-
-Tue Apr 25 07:55:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/jcode.rb (String::tr_s): should have translated non
- squeezing character sequence (i.e. a character) as well. thanks
- to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
-
-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.
-
-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()
-
- * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
-
-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 (arg): use NODE_ARGSCAT for placeholder.
-
-Wed Apr 19 11:13:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
- mathew <meta at pobox.com>. [ruby-core:07738]
-
-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]
-
-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.
-
- * ext/tk/lib/tk.rb: update RELEASE_DATE.
-
- * ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
-
- * ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
-
-Mon Apr 10 01:03:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * prec.c (prec_prec_f): documentation patch from
- <gerardo.santana at gmail.com>. [ruby-core:07689]
-
-Sat Apr 8 02:34:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_pow): second operand may be too big even if
- it's a Fixnum. [ruby-talk:187984]
-
-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]
-
-Thu Apr 6 01:04:47 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: fix SEGV when embedding to an application.
- [ruby-core:7600]
-
- * ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
-
- * ext/tk/tkutil/tkutil.c: follow to changing specification of
- instance_eval on ruby-1.9.x.
-
- * ext/tk/lib/tk.rb: ditto.
-
- * ext/tk/lib/multi-tk.rb: ditto.
-
- * ext/tk/lib/tk.rb: remove warning about redefinition of methods.
-
- * 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.
-
- * add test/win32ole
-
-Fri Mar 31 14:24:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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>
-
- * 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>
-
- * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: imported nkf 2.0.6.
- * Add --ic / --oc option and mapping tables.
- * Add fallback option.
- * Add --no-best-fit-chars option.
- * Fix some bugs.
-
- * ext/nkf/nkf.c (nkf_split_options): added for parse option string.
-
- * 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
- NODE_SCOPE method invocations too.
-
- * 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.
-
- * string.c (rb_str_gsub): ditto.
-
-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.
-
-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.
-
-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.
-
- * ext/win32ole/tests/testOLEVARIANT.rb: ditto.
-
-Wed Mar 15 16:51:11 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>
-
- * 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>
-
- * 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.
-
-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>.
- [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.
-
- * ext/socket/.cvsignore: ignore constants.h.
-
-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>
-
- * 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>
-
- * 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>
-
- * 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>
-
- * object.c (Init_Object): add BasicObject class as a top level
- BlankSlate class.
-
-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>
-
- * 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>
-
- * 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>
-
- * win32/win32.c (NtInitialize): need to set a handler for VC++8.
-
-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
- memory manager cannot handle large memory block properly.
- ex: 10000.times { "" << "." * 529671; GC.start } # crash
- [ruby-dev:28230]
-
-Thu Feb 23 13:23:03 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.
-
-Wed Feb 22 16:24:05 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * 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.
-
-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 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]
-
-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
- [ruby-core:07390]. [ruby-core:07377]
-
-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.
- [ruby-talk:180420]
-
-Sat Feb 18 23:58:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
- only when caller() level size is one. [ruby-core:07389]
-
- * lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
- [ruby-core:07389]
-
- * sample/rtags.rb: ditto.
-
-Sat Feb 18 21:16:27 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.
-
-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>
-
- * util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
-
- * pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
- [ruby-talk:180024]
-
- * pack.c (pack_unpack): fixed integer overflow on template "w".
- [ruby-talk:180126]
-
-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]
-
-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
- argument list. [ruby-core:07366]
-
- * parse.y (arg): avoid unnecessary extra argument.
- [ruby-core:07366]
-
- * 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
- the block for instance_eval. [ruby-core:07364]
-
-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 13:47:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * 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>
-
- * time.c (search_time_t): support non 32bit time_t environments.
-
- * win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
-
- * 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]
-
-Mon Feb 13 13:49:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parser_parse_string): mention "regexp" in a error
- message. a patch from Mauricio Fernandez <mfp at acm.org>
- [ruby-core:07340]
-
-Mon Feb 13 00:01:32 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
-
- * oniguruma.h: Version 4.0.1
-
- * regparse.c (onig_free_shared_cclass_table): fix memory leaks.
-
- * regcomp.c (optimize_node_left): change from IS_POSIXLINE() to IS_MULTILINE().
-
- * regint.h: rename ANCHOR_ANYCHAR_STAR_PL to ANCHOR_ANYCHAR_STAR_ML.
-
- * regparse.h: ditto.
-
- * regexec.c: ditto.
-
-Sat Feb 11 21:57:29 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: add WIN32OLE.create_guid.
-
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Sat Feb 11 01:57:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_autoload): check if ruby_cbase is nil (during
- 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>
-
- * 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>
-
- * ruby.h (struct RStruct): embed 3 or less elements structs.
- (RSTRUCT_LEN): defined for accessing struct members.
- (RSTRUCT_PTR): ditto.
-
- * 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>
-
- * 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>
-
- * lib/net/http.rb (add_field, get_fields): keep 1.8.2
- compatibility. This patch is contributed by Rob Pitt.
-
-Sun Feb 5 16:33:50 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/mkmf.rb (create_makefile): Kernel#sub! was removed on HEAD.
-
-Sun Feb 5 14:26:54 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/pstore.rb: should return default value if name is not found.
- [ruby-core:7304]
-
- * lib/pstore.rb: should raise PStore::Error if not in transaction.
-
-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>
-
- * 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>
-
- * 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>
-
- * 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>
-
- * 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
- 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
- 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
- segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
-
- * ruby.c (set_arg0): if use setenv(3), environ space cannot be used
- for altering argv[0].
-
-Tue Jan 31 14:46:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_select): update RDoc description.
- [ruby-core:7254]
-
-Tue Jan 31 11:58:51 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
-
- * 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>
-
- * 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>
-
- * 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
- system routine if provided. fixed: [ruby-core:07195]
-
-Sun Jan 22 23:27:13 2006 Go Noguchi <gonoguti@yahoo.co.jp>
-
- * lib/test/unit/autorunner.rb (process_args): ignore arguments after
- '--' so that test scripts can handle them. fixed: [ruby-dev:28258]
-
-Sun Jan 22 22:09:52 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (POST_GETCONTEXT): define separately from PRE_GETCONTEXT on
- IA64 to avoid reusing variable address.
-
-Sun Jan 22 20:03:35 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (ruby_setjmp): define PRE_GETCONTEXT and POST_GETCONTEXT
- instead of FUNCTION_CALL_MAY_RETURN_TWICE.
- define PRE_GETCONTEXT to clear carry flag for workaround of
- FreeBSD/i386 getcontext/setcontext bug.
- [ruby-dev:28263]
-
-Thu Jan 19 22:19:18 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mv): should remove file after copying.
- [ruby-dev:28223]
-
-Wed Jan 18 23:37:06 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
- if enable-shared.
- (ruby_setjmp): call FUNCTION_CALL_MAY_RETURN_TWICE after getcontext
- too.
- 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>
-
- * win32/setup.mak (MAKE): workaround for nmake 8.
-
-Tue Jan 17 11:06:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
-
-Mon Jan 16 10:13:38 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>
-
- * 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>
-
- * lib/rdoc/diagram.rb:
- - properly quote bare element attributes
- - terminates dangling elements (e.g. <img>, <br>, <link>, etc)
- - converts "CVS" to the more HTML-friendly acronym element
- - adds missing type attributes to style elements
-
- based on Paul Duncan's patch <pabs@pablotron.org> [ruby-core:7028]
-
- * lib/rdoc/generators/html_generator.rb: ditto.
- * lib/rdoc/generators/template/html/hefss.rb: ditto.
- * lib/rdoc/generators/template/html/html.rb: ditto.
- * lib/rdoc/generators/template/html/kilmer.rb: ditto.
-
-Thu Jan 12 11:53:08 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tkballoonhelp.rb: [bug fix] couldn't add to a widget
- which is constructed with TkComposite module.
- [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>
-
- * lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
- change <%='s behavior.
-
-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
- rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
- collected ruby_current_node and mark_source_filename may corrupt
- memory.
-
-Tue Jan 10 13:30:34 2006 akira yamada <akira@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
- !ruby/object:Bignum syntax 1.8.3 dumped. [ruby-core:6159]
-
-Tue Jan 10 12:47:41 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
- ruby 1.8.3/1.8.4. [ruby-core:6115]
-
- * lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
- be dumped properly. [ruby-core:7047]
-
-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>
-
- * 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>
-
- * 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>
-
- * 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.
-
- * 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]
-
-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>
-
- * 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')
-
- * test/ruby/test_dir.rb: added.
-
-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.
- [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 12:20:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * 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 01:04:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/generator.rb: should work with another thread. (more robust code)
- [ruby-dev:28177]
-
-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
- up alone, and mark threads in the loading table. [ruby-dev:28154]
-
- * eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
- threads. [ruby-dev:28172]
-
-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.
-
- * 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]
-
-Tue Dec 27 08:22:15 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_check):
- treat wildcard character in commonName. [ruby-dev:28121]
-
-Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ev_const_get): fixed a bug in constant reference during
- instance_eval. [yarv-dev:707]
-
- * eval.c (ev_const_defined): ditto.
-
- * lib/yaml.rb (YAML::add_domain_type): typo fixed. a patch from
- Joel VanderWerf <vjoel at path.berkeley.edu>.
- [ruby-talk:165285] [ruby-core:6995]
-
-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>
-
- * 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>
-
- * test/pathname/test_pathname.rb (test_kernel_open): use
- File.identical?.
- [ruby-talk:171804]
-
-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>
-
- * Makefile.in (XCFLAGS): separated as well as win32/Makefile.sub.
-
- * main.c (always_gc): dllimport is required for VC to import a DLL
- symbol. fixed: [ruby-dev:28051]
-
- * 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>
-
- * 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.
-
- * 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>
-
- * ext/syck/rubyext.c (syck_emitter_reset): should initialize
- emitter->bonus->oid. otherwise rb_gc_mark crashes.
-
- * ext/syck/rubyext.c (syck_mark_parser): should mark anchor nodes
- because they hold ruby objects. (ie: rb_syck_bad_anchor_handler)
-
-Sat Dec 17 11:00:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (rb_syck_compile): avoid potential memory
- leak.
-
- * ext/syck/rubyext.c (syck_set_ivars): avoid potential memory
- leak by explicit symbol allocation.
-
-Sat Dec 17 03:57:01 2005 Tanaka Akira <akr@m17n.org>
-
- * bignum.c (rb_big_rshift): fix a GC problem on
- IA64 with gcc 4.0.3 20051216 (prerelease).
-
-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>
-
- * 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 $_.
-
-Thu Dec 15 12:35:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
- segment7.net>. [ruby-core:06894]
-
-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>
-
- * 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]
-
-Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org>
-
- * marshal.c (r_object0): fix a GC problem for reading a bignum on
- IA64 with gcc 3.3.5 (Debian 1:3.3.5-13).
-
-Tue Dec 13 12:23:47 2005 Tanaka Akira <akr@m17n.org>
-
- * re.c (rb_reg_regcomp): fix a GC problem on x86_64 with
- gcc 3.3.5 (Debian 1:3.3.5-13).
-
-Tue Dec 13 01:44:16 2005 Tanaka Akira <akr@m17n.org>
-
- * array.c (rb_ary_diff): fix a GC problem on IA64 with
- gcc 3.3.5 (Debian 1:3.3.5-13).
- When rb_ary_push is called, there was no register which contains
- `hash' but `&RHASH(hash)->tbl' instead.
-
-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>
-
- * 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
- protect temporary context object. [ruby-dev:27979]
-
- * ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
- 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.
- [ruby-dev:27964]
-
-Thu Dec 8 00:40:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (call_trace_func): klass parameter should be a
- class/module that defines calling method. [ruby-talk:169307]
-
-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.
-
- * sprintf.c (GETASTER): ditto.
-
-Wed Dec 7 01:02:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/README.macosx-aqua: [new document] tips to avoid the known
- bug on platform specific dialogs of Tcl/Tk Aqua on MacOS X.
-
- * ext/tk/tcltklib.c: fix bug on switching threads and waiting on the
- deleted interpreter on vwait and tkwait command.
-
- * ext/tk/lib/multi-tk.rb: kill the meaningless loop for the deleted Tk
- interpreter.
-
- * ext/tk/sample/demos-jp/image3.rb: [bug fix] wrong argument.
-
- * ext/tk/sample/demos-en/image3.rb: ditto.
-
- * ext/tk/sample/demos-jp/menu.rb: fix message for MacOS X.
-
- * ext/tk/sample/demos-jp/menu8x.rb: ditto.
-
- * 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.
- fixed: [ruby-dev:27890]
-
-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]
-
-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>
-
- * 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>
-
- * 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>
-
- * lib/mkmf.rb (create_makefile): should not change sodir with
- dir.gsub!. (bccwin32 failed to install third party extensions)
- [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
- ComplexContent#elementformdefault method.
-
-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.
-
-Fri Nov 25 14:34:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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>
-
- * 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
- widget [Tk8.5 feature].
-
- * ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
-
- * ext/tk/lib/tk/autoload.rb: ditto.
-
- * 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>
-
- * file.c (w32_io_info): should not call GetFileInformationByHandle
- for pipe.
-
- * file.c (w32_io_info): checks return value from rb_w32_get_osfhandle.
-
- * 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 07:26:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
-
- * ext/openssl/ossl_x509ext.c (MakeX509ExtFactory): should use
- OPENSSL_malloc to allocate X509V3_CTX.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): use
- X509V3_EXT_nconf_nid to avoid SEGV (and to build extensions which
- values are placed in separate section).
-
- * test/openssl/test_x509ext.rb: new file.
-
-Wed Nov 23 01:22:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (test_identical): test if two files are identical.
-
- * file.c (rb_f_test): support DOSISH systems where st_ino is not
- reliable. fixed: [ruby-core:06672]
-
- * win32.h, win32.c (rb_w32_osid): check the running platform.
-
-Tue Nov 22 23:52:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb: match incomplete (in current enconding) multibyte
- string. http://inamode6.tokuhirom.dnsalias.org/show/1551
-
-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>
-
- * 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>
-
- * win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
- p Dir.glob('*') should work on WinNT. (implemented our own
- stat(2) on WinNT) [ruby-list:41552] [ruby-dev:27711]
-
-Tue Nov 22 02:31:53 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
- is not defined).
-
-Tue Nov 22 01:45:21 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
- DOSISH is not. fixed: [ruby-dev:27797]
-
-Mon Nov 21 22:50:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path
- should not be splitted. fixed: [ruby-dev:27776] [ruby-dev:27786]
-
- * parse.y (dsym): prohibit empty symbol literal by interpolation.
- fixed: [ruby-talk:166529]
-
-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.
- fixed: [ruby-talk:166520]
-
-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
- or 1.9).
-
- * ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
-
- * ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
-
-Fri Nov 18 18:07:05 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]
-
-Fri Nov 18 17:35:09 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: add restriction to access the entried
- command table and manipulate other IPs (for reason of security).
- Now, a IP object can be controlled by only its master IP or the
- default IP.
-
- * ext/tk/lib/remote-tk.rb: add restriction to manipulate.
-
- * ext/tk/tcltklib.c (ip_is_slave_of_p): add TclTkIp#slave_of?(ip)
- to check manipulability.
-
- * ext/tk/lib/tk.rb: bug fix on handling of Tcl's namespaces.
-
- * ext/tk/lib/tk/namespace.rb: ditto.
-
-Fri Nov 18 16:47:33 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]
-
- * 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>
-
- * 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.
-
- * ext/extmk.rb (parse_args): force to link extensions statically only
- if static is given for extstatic.
-
- * 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>
-
- * lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-
- * test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
-
-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>
-
- * array.c (rb_ary_fill): previous commit disabled this usage:
-
- a = [0,1,2,3,4,5,6,7,8,9]
- 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>
-
- * 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>
-
- * 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])
-
- * test/ruby/test_array.rb (test_fill): added.
-
-Tue Nov 15 14:39:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fill): should adjust array length correctly when
- an array is expanded in the fill process. [ruby-core:06625]
-
-Mon Nov 14 23:49:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
- [ruby-dev:27699]
-
-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.
-
- * 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.
-
-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.
-
-Fri Nov 11 07:39:49 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
- 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.
-
-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
- (low cost) way to check whether the Tcl interpreter was compiled
- with threads enabled of not.
-
- * ext/tk/tcltklib.c: reduce warnings.
-
- * ext/tk/tkutil/tkutil.c: ditto.
-
-Mon Nov 7 00:06:12 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
-
-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>
-
- * ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
- interpreter after initialization is done. [ruby-dev:27638]
-
-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 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/tk/tkutil/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>
-
- * eval.c (rb_call_super): should call method_missing if super is
- called from Kernel method.
-
- * eval.c (exec_under): frame during eval should preserve external
- information.
-
-Tue Nov 1 10:48:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: should check ERR_peek_last_error().
- [ruby-dev:27597]
-
- * ext/openssl/ossl.c (ossl_raise): ditto.
-
-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>
-
- * 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>
-
- * lib/webrick/httpservlet/cgihandler.rb
- (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
- header field should be splited into each cookie. [ruby-Bugs:2199]
-
- * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
- to parse the value of Set-Cookie: header field.
-
- * 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>
-
- * 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>
-
- * test/ruby/test_float.rb (test_precision): test by assert_in_delta.
- [ruby-dev:27575]
-
-Sat Oct 29 01:58:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/etc/etc.c: document update from mathew <meta@pobox.com>.
- [ruby-core:06473]
-
- * 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>
-
- * 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 01:58:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_EXTERN): macro to export symbols in shared
- library. [ruby-core:05528]
-
- * defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
- configuration pass.
-
- * 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
- <gsinclair@gmail.com>. [ruby-core:06364]
-
- * 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>
-
- * lib/rinda/*: RDoc documentation from Eric Hodel
- <drbrain@segment7.net> added.
-
-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>
-
- * 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):
- typo fixed. [ruby-talk:162187]
-
- * 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]
-
-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]
-
-Sun Oct 23 07:11:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/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,
- ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
- ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
- ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
- ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
- ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
-
- * ext/tk/lib/tkextlib/*: ditto.
-
- * ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
-
- * ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
-
- * ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
-
- * ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
-
- * ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
-
-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
- if valid as a symbol name more strictly. [ruby-dev:27478]
-
- * test/ruby/test_symbol.rb: tests for [ruby-core:03573].
-
- * 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>
-
- * rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
-
-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>
-
- * bignum.c (bignew_1): convertion from `int' to `char' discards
- upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
- nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
- (but I believe this won't cause actual bug in current implementation)
- [ruby-dev:27055]
-
- * 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>
-
- * lib/mkmf.rb (create_makefile): Borland make seems not to allow
- empty dependency list. If this change is not good, please correct
- it.
-
-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.
-
-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 08:28:32 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_join): elements may contain null pointer strings.
- report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
-
-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.
-
- * win32/Makefile.sub (distclean-local): should remove .config.h.time.
-
-Mon Oct 17 09:42:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * mkconfig.rb: fixup configure_args for mswin32 configure.
-
- * win32/configure.bat (srcdir, target): ditto.
-
-Mon Oct 17 05:01:50 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * env.h: move struct METHOD and struct BLOCK from eval.c to
- support NodeWrap and ParseTree.
-
-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>
-
- * lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
- tuple. fixed: [ruby-list:41227]
-
- * test/rinda/test_rinda.rb: test it.
-
-Sun Oct 16 03:38:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * rubysig.h (CHECK_INTS): prevent signal handler to run during
- critical section. [ruby-core:04039]
-
- * eval.c (load_wait): need not to call rb_thread_schedule()
- explicitly. [ruby-core:04039]
-
- * 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>
-
- * 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>
-
- * win32/win32.c (ioctl): should set errno.
-
-Fri Oct 14 16:39:37 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.
- fixed: [ruby-core:06261]
-
- * 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>
-
- * ext/openssl/ossl.c (Init_openssl): should call
- OpenSSL_add_ssl_algorithms().
-
-Wed Oct 12 11:08:54 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * file.c (rb_f_test): typo in RDoc comments.
-
-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]
-
- * eval.c (rb_respond_to): conform to Object#respond_to?. [ruby-dev:27411]
-
-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>
-
- * 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>
-
- * 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.
-
-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>
-
- * lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
- of "join".
-
-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).
- [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.
- fixed by Doug Kearns. [ruby-core:06053]
-
-Thu Sep 29 00:57:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
- autoload succeeded.
-
- * 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>
-
- * file.c (rb_stat_inspect): constified.
-
-Wed Sep 28 15:12:28 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]
-
- * 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].
-
-Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
- [ruby-dev:27237], [ruby-core:05854]
-
- * lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
-
- * lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
-
-Wed Sep 28 03:16:41 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * rubysig.h: fixed build problem with --enable-pthread on platforms
- which don't have setitimer().
-
-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>
-
- * 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.
- fixed: [ruby-list:41168]
-
- * misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
- 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>
-
- * 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.
-
-Sat Sep 24 08:54:05 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.
-
-Sat Sep 24 08:29:36 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
- DryRun. [ruby-core:05954]
-
- * test/fileutils/test_nowrite.rb: test it.
-
- * test/fileutils/test_dryrun.rb: new file.
-
- * 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>
-
- * 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>
-
- * 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>
-
- * ext/ripper/depend (SUFFIXES): no longer needed.
-
- * ext/ripper/depend (c): avoid nmake problem. fixed [ruby-dev:27191]
-
-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
- scalar's parent node. [ruby-talk:150620]
-
-Wed Sep 21 08:20:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * README.EXT, README.EXT.ja: add new features.
-
-Wed Sep 21 07:43:58 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (default_argv, Arguable#options): defaults strings
- to be parsed to Arguable instance.
-
-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>
-
- * numeric.c (fix_idiv): 1.div(1.0) should return integer value.
- [ruby-dev:27235]
-
-Tue Sep 20 22:25:43 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]
-
-Tue Sep 20 18:20:33 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/yaml.rb: require 'yaml/constants'. [ruby-core:5776]
-
-Tue Sep 20 17:48:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
- information to content-type header.[ruby-core:5127]
-
- * lib/xmlrpc/server.rb (CGIServer::serve): ditto.
-
- * lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
-
- * lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
-
-Tue Sep 20 17:26:42 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 15:39:40 2005 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
- appearing alone or at the end of plain scalars. [ruby-core:5826]
-
- * ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
- as complex keys.
-
- * lib/syck.h: version 0.60.
-
- * lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
- key searches.
-
- * 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>
-
- * 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>
-
- * file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
-
-Mon Sep 19 18:29:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (file_expand_path): allow pathnames to expand.
- [ruby-dev:27152]
-
-Mon Sep 19 15:12:15 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/depend: do not make ripper/core.rb. [ruby-dev:26462]
-
-Mon Sep 19 14:49:19 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/ripper/eventids2.c: add prefix `t' to tLAMBDA-related lexer
- events.
-
- * ext/ripper/lib/ripper/core.rb: updated.
-
-Mon Sep 19 14:39:46 2005 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (do_block): do_block event dispatches 2 args.
- [ruby-dev:26964]
-
- * ext/ripper/lib/ripper/core.rb: updated.
-
- * ext/ripper/tools/list-parser-event-ids.rb: check arity mismatch.
-
-Mon Sep 19 07:45:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:
- an instance variable "private" is added to OpenSSL::PKey class.
- this ivar is a flag that shows whether there is a private key
- in the instance.
-
- * 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:38:03 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: method renaming: collect_methods ->
- collect_method.
-
-Mon Sep 19 05:58:59 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: use module_function instead of single extend.
-
- * test/fileutils/test_fileutils.rb: test existence of singleton
- methods.
-
-Mon Sep 19 05:32:41 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (remove_entry_secure): does not use chdir(2).
-
-Mon Sep 19 03:17:48 2005 Tanaka Akira <akr@m17n.org>
-
- * file.c (rb_thread_flock): wrap the flock system call by
- TRAP_BEG/TRAP_END to enable signals. [ruby-dev:27122]
-
- * ext/socket/socket.c (bsock_send): wrap the sendto and send system
- call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
- 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]
-
- * file.c (rb_file_join): call FilePathValue() to all Pathnames to
- join. [ruby-dev:27127]
-
- * 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]
-
-Sun Sep 18 02:10:47 2005 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb: remove comments that are bungling up
- the rdoc and ri output. output symbols as plain scalars.
-
- * ext/syck/rubyext.c (syck_emitter_reset): emit headless
- documents always.
-
- * ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
- kind of surrounding line space, tabs or spaces alike.
-
- * ext/syck/token.c: accept tabs as whitespace, not for indentation,
- but strip from plain scalars.
-
- * 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
- operand. [ruby-core:05806]
-
-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
- should call Kernel.eval on caller's safe-level instead of slave's
- safe-level (Of course, the given script should be evaluated on
- slave's safe-level).
-
-Sat Sep 17 09:45:26 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_substr): should propagate taintness even for
- empty strings. [ruby-dev:27121]
-
- * string.c (rb_str_aref): should infect result if range argument
- is tainted. [ruby-dev:27121]
-
-Sat Sep 17 08:35:39 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
- strange RSS::Maker::Item#max_size behavior.
- Thanks to Kazuhiko <kazuhiko@fdiary.net>.
-
- * 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>
-
- * lib/net/imap.rb: supported DIGEST-MD5. Thanks, Mathieu Arnold.
-
- * lib/net/imap.rb: use fcall instead of send. Thanks, Satoru
- Takabayashi.
-
-Fri Sep 16 22:45:49 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]
-
- * 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
- void function. a patch from MIYAMUKO Katsuyuki
- <miyamuko at mtb.biglobe.ne.jp>. [ruby-dev:27111]
-
-Fri Sep 16 14:48:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
-
-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>
-
- * test/logger/test_logger.rb: unintentionally overwritten changes by
- Usa. reverted.
-
-Fri Sep 16 00:03:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
- $stdout.binmode.
-
-Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
-
- #nnn is a ticket number at http://dev.ctor.org/soap4r
-
- * 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
- @client.options["soap.envelope.responsenamespace"] =
- TemporaryNamespace
- @client.do_proc(...)
-
- * let SOAP request XML indent space configurable. see
- "soap.envelope.no_indent" option. (#130)
-
- * let external CES configurable.
- ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used
- by default. (#133)
- external CES ::= CES used in Ruby object of client and server
- internal CES ::= CES used in SOAP/OM
-
- * add iso-8859-1 external CES support. (#106)
-
- * fixed illegal 'qualified' handling of elements. it caused
- ASP.NET interoperability problem. (#144)
-
- * added 'soap.envelope.use_numeric_character_reference' (boolean)
- option to let query XML use numeric character reference in XML,
- not plain UTF-8 character. !GoogleSearch server seems to not
- allow plain UTF-8 character since 2005-08-15 update. (#147)
-
- * SOAP::Header::SimpleHeader (de)serialization throws an exception
- on !SimpleHeader.on_(in|out)bound when header is a String. so we
- could not use a simple single element headerItem. fixed. thanks
- to emil. (#129)
-
- * out parameter of rpc operation did not work. (#132)
-
- * follow HTTP redirect only if using http-access2. (#125) (#145)
-
- * add a workaround for importing an WSDL whose path begins with
- drive letter. (#115)
-
- * WSDL
-
- * SOAP Data which is defined as a simpletype was not mapped
- correctly to Ruby obj when using wsdl2ruby.rb generated classdef
- file. (#123)
-
- * rpc/literal support. (#118)
-
- * re-implemented local element qualify/unqualify control. handles
- elementFormDefault and form in WSDL. (#119)
-
- * Array of an element which has simpleType causes a crash. (#128)
-
- * parameterOrder may not contain return part so it can be shorter
- than parts size. Thanks to Hugh. (#139)
-
- * Samples
-
- * added !BasicAuth client sample. (#117)
-
- * added Base64 client/server sample.
-
- * added Flickr SOAP interface client sample. (#122)
-
- * added !SalesForce client sample. (#135)
-
- * updated Thawte CA certificate for !GoogleAdWords sample.
-
- * updated a client script with the newer version made by Johan.
- thanks!
-
- * shortened long file names. (#120)
-
- * fixed typo in authheader sample. (#129)
-
- * updated deprecated method usage. (#138)
-
-Thu Sep 15 22:40:27 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_signal.rb (test_exit_action): skip the test using
- fork on fork-less platforms.
-
-Thu Sep 15 13:54:33 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: add :read_timeout option.
- [ruby-core:4848]
-
-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>
-
- * 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.
-
-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>
-
- * dir.c: changed `foo (*bar)_((boo))' to `foo (*bar)(boo)`.
-
- * enumerator.c, eval.c, gc.c, intern.h, io.c, process.c, ruby.c,
- ruby.h, signal.c: ditto.
-
-Wed Sep 14 15:06:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * 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.
-
-Tue Sep 13 22:09:40 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb (Logger): added formatter accessor to logger for
- dictating the way in which the logger should format the messages it
- displays. Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and
- Daniel Berger.
-
- * lib/logger.rb (Logger): added VERSION constant.
-
- * lib/logger.rb: removed document for LogDevice. It is an
- implementation detail and is not a public interface.
-
- * test/logger/test_logger.rb: added tests.
-
-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>
-
- * ruby.h (PRINTF_ARGS): new macro for printf style argument checking.
-
-Tue Sep 13 15:41:29 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: wrote documentation of HTTPRequest/HTTPResponse
- classes.
-
-Tue Sep 13 14:27:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * 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)
-
-Tue Sep 13 12:33:05 2005 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml.rb: reworking YAML::Stream to use the new
- emitter.
-
- * lib/yaml/stream.rb: ditto.
-
- * lib/yaml/rubytypes.rb: added Object#yaml_new.
-
- * lib/yaml/tag.rb: the tag_subclasses? method now
- shows up in the class. allow taguri to be set using an accessor.
- 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,
- 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.
- new Resolver#tagurize converts type ids to taguris.
-
- * ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
-
- * ext/syck/emitter.c: renovated emitter, walks the tree in advance.
- consolidated redundant block_styles struct into
- the scalar_style struct. (this means loaded nodes can now
- be sent back to emitter and preserve at least its very basic
- formatting.)
-
- * ext/syck/gram.c: headless documents of any kind allowed.
-
- * ext/syck/node.c: new syck_replace_str methods and syck_empty_*
- methods for rewriting node contents, while keeping the ID
- and other setup info. added syck_seq_assign.
-
- * 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
- 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>
-
- * lib/net/imap.rb (starttls): supported the STARTTLS command.
-
-Sun Sep 11 22:18:07 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>
-
- * 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.
-
- require "openssl"
- pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
- e.ctrl_cmd("SO_PATH", "/usr/lib/opensc/engine_pkcs11.so")
- e.ctrl_cmd("LIST_ADD", "1")
- e.ctrl_cmd("LOAD")
- }
- pkcs11.ctrl_cmd("PIN", "secret")
- key = pkcs11.load_private_key
-
- * ext/openssl/ossl_engine.c (ossl_engine_ctrl_cmd): new method
- 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.
-
-Wed Sep 7 15:48:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
-
- * ext/openssl/ossl_pkcs7.c: new class OpenSSL::PKCS7::RecipientInfo.
- this class wraps PKCS7_RECIP_INFO struct.
-
- * ext/openssl/ossl_pkcs7.c: OpenSSL::PKCS7::Signer is renamed to
- OpenSSL::PKCS7::SignerInfo. ("Signer" remains as an alias of
- SignerInfo.)
-
- * test/openssl/test_pkcs7.rb: new file.
-
-Wed Sep 7 12:55:08 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: abolish mod === tempfile to avoid a problem
- [ruby-dev:26967].
-
-Wed Sep 7 10:45:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_switch): convert all exceptions to
- SystemExit. fixed: [ruby-core:05724]
-
- * 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
- extension libraries.
-
- * bignum.c (bignew_1, bigadd): K&R style argument actually can't be
- defined as char.
-
- * missing/vsnprintf.c: ANSI compiler supports const keyword.
-
- * ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
- but no 64bit integer.
-
- * lib/mkmf.rb (what_type?): guesstimate type.
-
- * 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]
-
-Mon Sep 5 22:28:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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]
-
-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>
-
- * lib/pathname.rb (Pathname#descend): Pathname.new("./a/b/c").descend
- didn't yield "."
- (Pathname#ascend): ditto.
-
-Fri Sep 2 23:51:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID.
- fixed: [ruby-dev:26942]
-
- * lib: do not use __send__ to access private methods. [ruby-dev:26935]
-
-Thu Sep 1 17:11:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): wrong condition for $SAFE restoration.
-
-Thu Sep 1 14:12:45 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
- work (gives wrong order of arguments).
-
- * ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
- to support '-namespace' option of 'interp invokehidden' command
- on Tcl8.5.
-
-Wed Aug 31 14:41:30 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>
-
- * 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.
-
-Tue Aug 30 23:25:45 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/debug.rb: no need to restart at exit.
-
-Tue Aug 30 23:20:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_rescue2): initialization miss. fixed: [ruby-dev:26917]
-
- * lib/mkmf.rb (xsystem, xpopen): no longer expand by Config.
-
- * lib/mkmf.rb (link_command, cc_command, cpp_command): expand
- variables at once, and quote hdrdir. fixed: [ruby-core:05680]
-
- * lib/mkmf.rb (libpathflag): quote paths.
-
-Tue Aug 30 19:34:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/digest/md5/md5ossl.h, ext/digest/rmd160/rmd160ossl.h,
- 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>
-
- * 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>
-
- * lib/pathname.rb (Pathname#descend): new method.
- (Pathname#ascend): ditto.
-
-Mon Aug 29 00:35:09 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]
-
-Sat Aug 27 20:13:31 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'.
- [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>
-
- * 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>
-
- * 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
- condition bug fixed. [ruby-dev:26764]
-
- * test/logger/test_logger.rb: tests.
-
-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>
-
- * win32/win32.c (socketpair_internal): need to call open_ifs_socket()
- to create sockets instead of winsock's socket().
- fixed: [yarv-dev:581]
-
-Wed Aug 17 23:58:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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
- where a method is defined .
-
- * 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.
- [ruby-dev:26800]
-
- * 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.
- fixed: [ruby-dev:26274]
-
- * 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]
-
- * lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
- removed self.
-
- * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
- instead of @date.
- (RSS::Maker::Base::self.def_array_element): added #size.
-
- * lib/rss/maker/1.0.rb
- (RSS::Maker::RSS10::Channel#to_rss,
- RSS::Maker::RSS10::Items::Item#to_rss): cleared dc_dates set
- upped by using #date.
-
- * lib/rss/maker/dublincore.rb
- (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
- fixed opposite alias.
-
- * test/rss/test_setup_maker_1.0.rb
- (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().
-
- * ext/tk/lib/tk/itemconfig.rb: fix bug on handling
- __item_ruby2val_optkeys().
-
- * ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
-
- * 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/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
- help to convert option values between ruby and tcl.
-
- * ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
- __item_ruby2val_optkeys to help to convert option values between
- ruby and tcl.
-
- * ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
- option (for the reason of backward compatibility).
-
- * ext/tk/lib/tk/composite.rb: clarify the arguments of super().
-
- * ext/tk/lib/tk/spinbox.rb: ditto.
-
- * ext/tk/lib/tk/text.rb: ditto.
-
- * ext/tk/lib/tk/validation.rb: ditto.
-
- * 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>
-
- * test/ruby/test_fnmatch.rb: separated from test_file.rb.
-
-Mon Aug 8 20:40:35 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>
-
- * parse.y (f_larglist): mistake in syntax rule. [ruby-core:05535]
-
-Mon Aug 8 05:16:55 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
- 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]
-
- * lib/webrick/httputils.rb: add a media-type "text/html" for .xhtml.
-
-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.
-
-Sat Aug 6 12:35:24 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
- TkVariable if key name is 'variable' or 'textvariable'
- by default. [ruby-dev:26749]
-
- * ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
- {variable,textvariable} function.
-
- * ext/tk/lib/tk/variable.rb: retains backward compatibility.
-
-Fri Aug 5 12:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/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>
-
- * lib/mkmf.rb (create_makefile): need to convert path separator
- 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>
-
- * ext/tk/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/tk/tcltklib.c: add nativethread consistency check.
-
- * ext/tk/stubs.c: ditto.
-
- * ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
- when Tcl is 7.6 or 8.0.
-
- * ext/tk/lib/tk/wm.rb: support to make some methods as options of
- root or toplevel widget. [ruby-talk:150336]
-
- * ext/tk/lib/tk/root.rb: ditto.
-
- * 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]
-
-Thu Aug 4 08:03:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): should not modify $mflags for each
- extensions.
-
-Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
- macro definitions.
-
- * bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
-
- * {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]
-
-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]
-
- * 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
- Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
-
- * ext/tk/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.
-
-Tue Aug 2 01:40:38 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>
-
- * ext/tk/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>
-
- * ext/tk/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>
-
- * ext/tk/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>
-
- * lib/drb/drb.rb (check_insecure_method): use private_methods and
- protected_methods instead of respond_to? to check method visibility.
- [ruby-dev:26616]
-
- * test/drb/drbtest.rb: ditto.
-
- * 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.
-
- * 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]
-
-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
- 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.
-
- * ext/tk/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/tk/tcltklib.c: Show friendly error messages for errors on
- initialization.
-
- * ext/tk/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/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
- don't work properly.
-
- * 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>
-
- * 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
- <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]
-
-Sat Jul 23 10:01:41 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_vsprintf, rb_sprintf): new functions return new String,
- using missing/vsnprintf.c. [ruby-dev:26580]
-
- * missing/vsnprintf.c: made the output changeable.
-
-Fri Jul 22 21:06:08 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
-
- * bignum.c (rb_big_eq): reduce isnan(). [ruby-dev:26600]
-
- * numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
-
-Fri Jul 22 15:02:39 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: moved copyright description to lib/rss.rb.
-
- * lib/rss.rb: added for convenience.
-
- * sample/rss/re_read.rb: added #to_s sample.
-
- * sample/rss/blend.rb: use 'require "rss"' instead of
- 'require "rss/*"'.
- * sample/rss/list_description.rb: ditto.
- * sample/rss/rss_recent.rb: ditto.
- * sample/rss/tdiary-plugin/rss-recent.rb: ditto.
-
- * sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
-
-Fri Jul 22 14:37:43 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
- URI and local file path too.
-
- * test/rss/test_parser.rb (RSS::TestParser#test_parse): test
- for the above.
-
-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/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
-
- * ext/tk/tcltklib.c: add TclTkIp#has_mainwindow? method.
-
- * ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
-
- * ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
-
- * ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
-
- * ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
-
- * ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
- avoid access from external.
-
- * ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
- mainloop.
-
- * ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
- with $SAFE==4.
-
- * ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
- properly.
-
- * ext/tk/lib/multi-tk.rb: add MultiTkIp#set_cb_error(proc) and
- cb_error(exc) to log errors at callbacks on safe slave IPs.
-
- * ext/tk/lib/multi-tk.rb: fail to get an available slave IP object
- when call Tk.mainloop in the block which is given to new_* method,
- because cannot finish initialize while the root widget is alive.
-
- * 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>
-
- * 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>
-
- * io.c (wsplit_p): patch for the environment where
- fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
- set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
-
-Wed Jul 20 18:07:11 2005 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
- by F_SETFL.
-
-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]
-
-Wed Jul 20 03:58:52 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
- so reverted.
-
- * 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>
-
- * ext/socket/socket.c: should not undef close() on win32.
- it's defined to rb_w32_close(), otherwise handle leaks.
- [ruby-Bugs-2131]
-
-Wed Jul 20 00:48:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (syserr_initialize): don't use str before StringValue()
- check. [ruby-dev:26579]
-
-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]
-
- * 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>
-
- * ext/tk/tcltklib.c: rbtk_eventloop_depth is used as int.
-
- * ext/tk/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
- ip is deleted.
-
-Tue Jul 19 13:19:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb: For symmetry, add TkVariable#string. It
- 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>
-
- * 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.
- [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]
-
-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
- 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
- module enclosed in a built-in module. fixed: [ruby-talk:148239]
-
- * lib/rdoc/parsers/parse_c.rb (find_body): allow macros as methods.
-
- * 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>
-
- * enumerator.c (Init_Enumerator): use an internal directly.
-
-Fri Jul 15 07:58:10 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.
-
- * enumerator.c: moved from ext/enumerator.
-
-Thu Jul 14 18:27:35 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]
-
- * win32/win32.c (rb_w32_strerror): stripped CR LF on the tail.
- (bcc32) [ruby-dev:26533]
-
-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>
-
- * win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
- if file or directory already exists. (bcc32) [ruby-dev:26508]
-
- * win32/win32.c (rb_w32_rmdir): should set ENOTDIR (not EINVAL)
- if it is not directory. (bcc32, win32)
-
- * win32/win32.c (rb_w32_rmdir, rb_w32_unlink): restore
- FILE_ATTRIBUTE_READONLY flag on function failure.
-
-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/tk/lib/tk.rb: Tk.thread_update is available.
-
-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
- 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>
-
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
- mistook to merge the patch of [ruby-dev:26235] at
- revision 1.11.
-
-Sun Jul 10 23:58:04 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
- avoid unlink a directory by root.
- cf. [ruby-dev:26237]
-
-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>
-
- * ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
- in Ruby and C by INT2NUM and NUM2INT.
-
- * ext/win32ole/win32ole.c (ole_invoke2): ditto.
-
- * ext/win32ole/test/testWIN32OLE.rb: ditto.
-
- * ext/win32ole/test/testOLEMETHOD.rb: ditto.
-
-Fri Jul 8 15:45:04 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::VERSION): 0.1.4 -> 0.1.5.
-
- * test/rss/test_version.rb (RSS::TestVersion#test_version):
- ditto.
-
- * lib/rss/0.9.rb (RSS::Rss::Channel::Item::Category):
- domain attribute of <category> is optional. Thanks to
- Chris Lee <clee@kde.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.
-
-Tue Jul 5 23:27:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * array.c (sort_2): get rid of yet another bcc's bug.
- fixed: [ruby-core:05152]
-
- * eval.c (rb_thread_save_context): must not switch contexts during
- re-allocating stack. fixed: [ruby-core:05219]
-
-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>
-
- * ext/tk/tcltklib.c: bug fix on treating Unicode strings.
-
- * ext/tk/tcltklib.c: add methods to treat encoding mode.
-
- * ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding,
- encoding_system, and so on.
-
- * ext/tk/MANUAL_tcltklib.eucj: 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/lib/tk.rb: ditto.
-
- * ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible.
-
- * ext/tk/lib/remote-tk.rb: ditto.
-
- * ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to
- use TkCore::INTERP.encoding and encoding=.
-
- * ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check
- DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode.
-
- * ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and
- Tk.encoding_system. Tk.encoding has higher priority.
-
- * ext/tk/lib/tk/optiondb.rb: ditto.
-
- * ext/tk/lib/tk/spinbox.rb: ditto.
-
- * ext/tk/lib/tk/validation.rb: ditto.
-
- * 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>
-
- * lib/set.rb: test change to follow revision 1.28. (duck typing?)
-
-Mon Jul 4 11:23:50 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.
-
-Sun Jul 3 23:26:30 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/wsdl/document/test_rpc.rb: compare formatted time string of
- Time objects instead of comparing Time objects itself to avoid
- unintended conflict of usec part. [ruby-dev:26220]
-
-Sat Jul 2 22:41:04 2005 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64 and
- IA64.
-
-Sat Jul 2 17:06:23 2005 Tanaka Akira <akr@m17n.org>
-
- * defines.h (FLUSH_REGISTER_WINDOWS): defined for IA64.
- (flush_register_windows): declare flush_register_windows.
-
- * 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:55:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_neg): may be accessing bogus pointer value.
-
-Fri Jul 1 15:50:12 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * missing/erf.c: need to include some headers for some platforms.
-
- * win32/win32.h (copysign, scalb): define for compatibility with
- other platforms. [ruby-dev:26430]
-
-Fri Jul 1 15:37:42 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * missing/crypt.c: modified to make it compilable on platforms
- other than BSD. [ruby-dev:26430]
-
- * missing/erf.c: ditto. code from <exp.c> merged.
-
-Fri Jul 1 12:44:56 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI.open_http): refine post_connection_check
- call.
-
-Fri Jul 1 11:34:08 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * missing/crypt.c: replaced with 4.4BSD version.
-
- * missing/erf.c: ditto.
-
- * missing/vsnprintf.c: removed the third provision from the old
- BSD license. [ruby-core:05177]
-
-Fri Jul 1 01:45:21 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_min, enum_max): must not return Qundef.
- fixed: [ruby-core:05299]
-
-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
- for [ruby-dev:26410]. And support a numeric form of 0d99999.
-
-Thu Jun 30 17:28:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat
- plain zero as an octal number. [ruby-dev:26410]
-
-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
- variable" [ruby-dev:26387]
-
- * dir.c (glob_helper): avoid warning "enumeration value `RECURSIVE'
- not handled in switch" [ruby-dev:26392]
-
-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
-
-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.
-
-Sat Jun 25 15:13:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/set.rb (Set#==): [ruby-dev:25206] (ported from ruby_1_8 branch)
-
-Sat Jun 25 11:37:00 2005 NARUSE, Yui <naruse@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_*
-
-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>
-
- * lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
- replaced some existent domain name with "example.com".
-
-Fri Jun 24 12:23:19 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fix typo on Tk.grid_propagate.
-
- * ext/tk/lib/tk.rb: Tk.event_generate and TkWindow#event_generate
- accept TkEvent::Event object as context argument.
-
- * ext/tk/lib/tk/event.rb: add TkEvent::Event#valid_fields and
- valid_for_generate to get field parameters of event_generate.
-
-Thu Jun 23 23:55:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: should load built rbconfig.rb.
-
-Thu Jun 23 16:53:15 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
- TkcGroup#exclude calls wrong method.
- Add alias TkcGroup#add [ruby-talk:146049].
-
- * ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
- TkCanvas#addtag fail to treat a TkcTag argument.
-
- * ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
- current event to other widgets.
-
-Mon Jun 20 18:44:04 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): DUMMY_SETJMP is replaced
- 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>
-
- * ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
-
- * ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
-
- * ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
-
- * test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
- (teardown): close all db objects before deleting data files.
-
- * win32/win32.{ch} (unlink): hook runtime function to change
- file attribute before unlinking.
- merge from 1.8, see [ruby-dev:26360]
-
-Mon Jun 20 02:15:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (define_final): document fix: finalizers never get called
- before target object is destroyed.
-
-Mon Jun 20 01:26:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
- ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
- 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
- finalization.
-
- * 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>
-
- * 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
- was missing.
-
-Thu Jun 16 13:34:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add Tk.getMultiple{Open|Save}File() which return
- an Array of selected files.
-
-Thu Jun 16 12:53:24 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/time.rb (Time.parse): "Fri Jan 1 08:59:60 +0900 1999" was
- parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment
- which supports leap seconds.
- (Time.rfc2822): ditto.
- (Time.xmlschema): ditto.
-
-Thu Jun 16 00:13:41 2005 Tanaka Akira <akr@m17n.org>
-
- * 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.
-
-Wed Jun 15 18:26:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: support "tk inactive" sub-command [for Tcl/Tk8.5a3]
-
- * ext/tk/lib/tk/namespace.rb: support "namespace path" sub-command and
- 'namespace ensemble' sub-command [for Tcl/Tk8.5a3]
-
-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
- 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>
-
- * hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
-
-Mon Jun 13 01:54:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (sigexit): call rb_thread_signal_exit() instead of
- rb_exit(). [ruby-dev:26347]
-
- * eval.c (rb_thread_signal_exit): a new function to exit on main
- thread.
-
- * eval.c (rb_thread_switch): exit status should be retrieved from
- ruby_errinfo.
-
- * eval.c (rb_f_exit): ensure exit(0) should call
- exit(EXIT_SUCCESS).
-
-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>
-
- * missing.h: fd_set stuffs need sys/types.h. fixed: [ruby-core:05179]
-
-Thu Jun 9 23:58:12 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/Win32API/Win32API.c (Win32API_Call): disable global
- optimization. fixed: [ruby-core:05143]
-
-Thu Jun 9 23:35:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_inject): default the result value to Qundef to use
- first element as initial value if not given.
-
-Thu Jun 9 19:55:41 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc.
- (ruby_setjmp): new macro to call setjmp, getcontext, etc.
- (ruby_setjmp): call setjmp before getcontext to avoid IA64 register
- stack problem.
- [ruby-talk:144939]
-
- * 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.
-
-Wed Jun 8 08:33:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_min_by, enum_max_by): return nil if no iteration.
- fixed: [ruby-dev:26245]
-
- * eval.c (rb_need_block): ensure a block is given.
-
- * 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
- KUBO Takehiro <kubo at jiubao.org> to support AIX. [ruby-list:40832]
-
-Wed Jun 8 00:09:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb (Array::to_yaml): merged a patch from
- Tilman Sauerbeck <tilman at code-monkey.de>. [ruby-core:05055]
-
- * lib/yaml/rubytypes.rb (Hash::to_yaml): ditto.
-
-Wed Jun 8 00:00:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c (curses_insertln): merged a patch from
- TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>. [ruby-ext:02305]
-
-Tue Jun 7 19:34:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
- IRB.rc_file_generators. [ruby-core:05163]
-
-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]
-
-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]
-
- * parse.y (parser_yylex): small error fixed.
-
-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]
-
-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.
-
- * test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
-
- * 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>
-
- * 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
- Extension.
-
- * ext/tk/lib/tk/msgcat.rb: ditto.
-
- * ext/tk/lib/tk/winpkg.rb: ditto.
-
- * ext/tk/lib/tkextlib/*: ditto.
-
-Sat May 28 16:39:21 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>
-
- * ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
- not set internal flag directry.
-
-Sat May 28 02:00:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
- ENV["REQUEST_URI"] is better to get correct Request-URI
- than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"]. [ruby-dev:26235]
-
-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)
-
- * lib/fileutils.rb (cp_r): should copy symlink as symlink, for
- also tree root. (feature change)
-
- * lib/fileutils.rb (cp_r): new option :dereference_root.
-
- * lib/fileutils.rb: new method remove_entry.
-
- * lib/fileutils.rb: new method remove_entry_secure.
-
- * lib/fileutils.rb: add documentation.
-
-Thu May 26 06:08:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
-
-Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
- strings. To avoid the trouble, add arguments to control converting
- encoding, and do split on a UTF8 string.
-
- * ext/tk/lib/multi-tk.rb: modify to attend encoding.
-
- * ext/tk/lib/remote-tk.rb: ditto.
-
- * ext/tk/lib/tk/itemconfig.rb: ditto.
-
- * ext/tk/lib/tk/listbox.rb: ditto.
-
- * ext/tk/lib/tk/namespace.rb: ditto.
-
- * ext/tk/lib/tk/panedwindow.rb: ditto.
-
- * ext/tk/lib/tk/text.rb: ditto.
-
- * ext/tk/lib/tk/textmark.rb: ditto.
-
- * ext/tk/lib/tk/texttag.rb: ditto.
-
- * ext/tk/lib/tk/variable.rb: ditto.
-
- * ext/tk/lib/tk/winfo.rb: ditto.
-
- * ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
-
- * ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
-
- * ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and
- Tk#lower_window/raise_window by reason of method-name conflict
-
- * ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given
- non-TkcItem arguments.
-
- * 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
- quoted-string should be zero or more characters.
-
-Tue May 24 23:42:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_pow): support Fixnum ** Float case directly
- without coercing. [ruby-talk:142697] [ruby-talk:143054]
-
-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>
-
- * test/readline/test_readline.rb: do not test libedit.
- fixed: [ruby-dev:26217]
-
-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>
-
- * test/soap/calc: method name 'set' was able to crash with a class Set.
- [ruby-dev:26210]
-
- * 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.
-
- * ext/tk/README.tcltklib: add description of Framework support options.
-
-Mon May 23 15:07:34 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO).
- [experimental]
-
-Mon May 23 12:21:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (make_regexp): should not return junk address during
- compile time. [ruby-dev:26206]
-
-Sun May 22 21:54:06 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
-
- == SOAP client and server ==
-
- === for both client side and server side ===
-
- * improved document/literal service support.
- style(rpc,document)/use(encoding, literal) combination are all
- supported. for the detail about combination, see
- test/soap/test_style.rb.
-
- * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
- WSDL as well as obj2soap. closes #70.
-
- * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
- you can set/get XML attribute via accessor methods which as a name
- 'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).
-
- === client side ===
-
- * WSDLDriver capitalized name operation bug fixed. from
- 1.5.3-ruby1.8.2, operation which has capitalized name (such as
- KeywordSearchRequest in AWS) is defined as a method having
- uncapitalized name. (converted with GenSupport.safemethodname
- to handle operation name 'foo-bar'). it introduced serious
- incompatibility; in the past, it was defined as a capitalized.
- define capitalized method as well under that circumstance.
-
- * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
- to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
- are merged). 'WSDLDriverFactory#create_driver' still creates
- WSDLDriver for compatibility but it warns that the method is
- deprecated. please use create_rpc_driver instead of create_driver.
-
- * allow to use an URI object as an endpoint_url even with net/http,
- not http-access2.
-
- === server side ===
-
- * added mod_ruby support to SOAP::CGIStub. rename a CGI script
- server.cgi to server.rb and let mod_ruby's RubyHandler handles the
- script. CGIStub detects if it's running under mod_ruby environment
- or not.
-
- * added fcgi support to SOAP::CGIStub. see the sample at
- sample/soap/calc/server.fcgi. (almost same as server.cgi but has
- fcgi handler at the bottom.)
-
- * allow to return a SOAPFault object to respond customized SOAP fault.
-
- * added the interface 'generate_explicit_type' for server side
- (CGIStub, HTTPServer). call 'self.generate_explicit_type = true'
- if you want to return simplified XML even if it's rpc/encoded
- service.
-
- == WSDL ==
-
- === WSDL definition ===
-
- * improved XML Schema support such as extension, restriction,
- simpleType, complexType + simpleContent, ref, length, import,
- include.
-
- * reduced "unknown element/attribute" warnings (warn only 1 time for
- each QName).
-
- * importing XSD file at schemaLocation with xsd:import.
-
- === code generation from WSDL ===
-
- * generator crashed when there's '-' in defined element/attribute
- name.
-
- * added ApacheMap WSDL definition.
-
- * sample/{soap,wsdl}: removed.
-
-Sun May 22 19:11:35 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
- should initialize session id context. [ruby-core:4663]
-
- * 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>
-
- * 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>
-
- * 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.
-
-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>
-
- * dir.c (glob_helper): get rid of using String. [ruby-dev:26180]
-
- * 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>
-
- * 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>
-
- * win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
- to get rid of redefinition warnings on mingw.
-
- * 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>
-
- * win32/win32.{h,c}: define rb_[pgu]id_t.
-
-Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
- 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>
-
- * lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
- [ruby-dev:26164]
-
-Sun May 15 18:56:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
- to get rid of types which might not be defined yet. [ruby-dev:26165]
-
-Sun May 15 14:35:46 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
- was failed. [ruby-core:4992]
-
-Sun May 15 09:57:30 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (unixtime_to_filetime): deal with DST.
- [ruby-talk:141817]
-
-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>
-
- * configure.in: Check for the availability of pid_t, gid_t and uid_t and
- remove AC_TYPE_UID_T. fixed: [ruby-core:04745]
-
- * defines.h: Remove pid_t typedef.
-
- * ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
- the available system types.
-
- * process.c: Change instances of pid_t and gid_t to their rb_*
- counterparts.
-
- * ext/pty/pty.c: Change pid_t to rb_pid_t.
-
- * vms/config.h: Define HAVE_{P,G,U}ID_T to 1.
-
- * win32/Makefile.sub: Remove #define for {g,u}id_t.
-
- * win32/win32.c: Change pid_t to rb_pid_t.
-
- * wince/Makefile.sub: Remove #define for {g,u}id_t.
-
- * 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.
-
- * lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
- fixed: [ruby-core:04932]
-
- * lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
- 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>
-
- * 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>
-
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
-
-Thu May 12 16:50:40 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>
-
- * lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
- [ruby-core:4341]
-
-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 01:23:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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 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>
-
- * lib/tempfile.rb (Tempfile#unlink): fixed typo.
-
-Wed May 11 01:03:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (TMP_ALLOC): use macro NEW_NODE() to get rid of warnings on
- platforms which have no alloca(). fixed: [ruby-talk:141301]
-
-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>
-
- * lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
- [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
-
-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>
-
- * 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]
-
-Wed Apr 27 23:42:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/Makefile.sub (OPTFLAGS): default global optimization to
- disabled only for VC++6.
-
-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"
- 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]
-
-Sat Apr 23 19:49:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/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.
-
-Thu Apr 21 06:45:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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.
-
-Thu Apr 21 00:07:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): support platforms have file separator
- other than /.
-
- * {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
- of building platform.
-
- * {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
-
-Wed Apr 20 23:22:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk: miniruby depends on MINIOBJS.
-
- * dmydln.c (dln_load): dummy function to raise LoadError.
-
- * cygwin/GNUmakefile.in, {bcc32,win32,wince}/Makefile.sub: miniruby
- can't load extensions on Windows.
-
-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:
- add extout option.
-
- * bcc32/setup.mak: make configuration variables overridable.
-
-Tue Apr 19 23:37:09 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
-
-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>
-
- * eval.c (search_required, rb_require_safe): expand path in
- rb_features. [ruby-dev:26079]
-
- * file.c (rb_find_file_ext): return absolute path.
-
- * 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]
-
-Sun Apr 17 23:57:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake, parse_args): do not expand destdir.
-
- * ext/extmk.rb (relative_from): treat mere drive letter as an absolute
- path.
-
-Sat Apr 16 17:01:16 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):
- use the first date information of items as site date information
- if channel doesn't have date information.
-
-Sat Apr 16 15:27:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.
- files need timestamps to be kept are only ar-archive on a few
- platforms, and be installed by instruby.rb but not INSTALL.
- fixed: [ruby-core:04721]
-
- * mkconfig.rb: purge autoconf value variables.
-
-Sat Apr 16 10:33:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub: quick hack... prepend DESTDIR.
- still have restriction on DESTDIR ("", "/", "e:")
-
-Sat Apr 16 03:59:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: check for OPENSSL_cleanse.
-
- * 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>
-
- * 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.
-
- * lib/irb/slex.rb: bug fix by [ruby-core:04707].
-
-Thu Apr 14 00:20:31 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * bin/irb lib/irb.rb lib/irb/...: IRB 0.9.5.
-
-Wed Apr 13 23:40:21 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
-
- * 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>
-
- * 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
- 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()
- 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
- Tcl commands before calling Tcl_GlobalEval().
-
-Mon Apr 11 23:36:04 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.
-
- * test/drb/test_drb.rb: ditto.
-
-Mon Apr 11 22:18:23 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c, file.c (lstat): avoid warnings for mingw.
-
-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.
-
-Mon Apr 11 15:24:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
-
-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
- creating a new image object on Tk.
-
- * ext/tk/lib/tk/menu.rb: use TkCommandNames on create_self()
-
- * ext/tk/lib/tk/root.rb: TkRoot.to_eval() returns '.'.
-
- * ext/tk/lib/tk/text.rb: add methods to create a TkText::IndexString
- from (x, y) coords.
-
- * ext/tk/lib/tkextlib/tile/: add demo and update support status.
-
-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>
-
- * ext/extmk.rb (extmake): hdrdir needs to be defined also in
- Config::CONFIG.
-
- * lib/mkmf.rb (configuration, create_makefile): get rid of recursive
- macro reference.
-
-Fri Apr 8 01:55:20 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
- [ruby-dev:25992]
-
-Thu Apr 7 23:58:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): keep directory names in Makefile as macros.
-
- * lib/mkmf.rb (configuration, create_makefile): ditto.
-
- * lib/mkmf.rb (CXX_EXT): separate C++ extensions.
-
-Thu Apr 7 17:24:17 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_call0): "return" event hook should be always executed
- if event_hooks is set.
-
-Thu Apr 7 14:33:09 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_maker_dc.rb (test_date): added a test for #date=
- and #dc_date=.
-
-Thu Apr 7 11:49:53 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/maker/dublincore.rb: _really_ supported multiple Dublin
- Core items.
-
- * test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
- an assertion for testing multiple Dublin Core items.
-
- * 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>
-
- * sample/rss/tdiary_plugin/rss-recent.rb:
- new option: @options['rss-recent.use-image-link']:
- use image as link instread of text if available.
-
- * 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>
-
- * lib/rss/dublincore.rb: supported multiple Dublin Core items.
-
- * 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/rss/maker/base.rb: added default current_element implementation.
-
- * lib/rss/maker/dublincore.rb: supported multiple Dublin Core
- items.
-
- * lib/rss/maker/image.rb: supproted new Dublin Core API.
-
- * lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
- moved to RSS::Utils.
-
- * lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
- moved from RSS::TrackBackUtils.
-
- * 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.
-
- * lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
- for date value.
-
- * 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.
-
-Mon Apr 4 23:17:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
- decide whether convert encoding of each element or not.
-
- * ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the
- encoding of array elements when assign an array to an TkVariable
- object.
-
-Mon Apr 4 10:26:48 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/lib/tk/dialog.rb: fixed typo.
-
-Sat Apr 2 23:38:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CP, INSTALL): get rid of less portable options.
-
- * lib/mkmf.rb (configuration, create_makefile): correct configuration
- variable.
-
- * wince/configure.bat, wince/setup.mak: add prefix, extstatic and
- rdoc options.
-
- * lib/mkmf.rb (create_makefile): ensure library directories get made
- before copying libraries there.
-
-Sat Apr 2 16:59:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
-
- * ext/tk/lib/tk/variable.rb: fix namespace trouble when autoloading
-
- * ext/tk/lib/tk/palette.rb: define Tcl variable 'tkPalette' as global
-
- * ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
- Tk.ip_eval.
-
- * 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'
- option without 'widgetname' option to allow creating a widget object
- which is used as an argument of Tcl/Tk's widget allocation commands.
-
- * ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
- option to create a image object by the given name.
-
-Thu Mar 31 22:23:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case
- insensitive file system platforms.
-
- * README.EXT, README.EXT.ja (Appendix C): utility functions.
-
-Thu Mar 31 14:08:43 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>
-
- * common.mk (RUBYOPT): clear for the environment RubyGems installed.
-
- * common.mk (clean-local): keep $(PREP) files till distclean.
-
- * common.mk (check): do all tests.
-
-Thu Mar 31 06:00:20 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise
- error even if the specified engine could not be loaded. (Dynamic
- engines don't have fixed name to load.)
-
-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/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
-
- * ext/tk/lib/remote-tk.rb: ditto.
-
- * ext/tk/lib/tk/console.rb: ditto.
-
- * ext/tk/lib/tk.rb: update RELEASE_DATE
-
- * ext/tk/sample/demo-*/check2.rb: use 'return' in the Proc object.
-
- * ext/tk/sample/tkextlib/**: ditto.
-
-Tue Mar 29 22:20:49 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>
-
- * lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
- extract method DRbObject.prepare_backtrace. add DRb.regist_server,
- remove_server, fetch_server. change server in thread variable if
- in-proc server. [druby-ja:113]
-
- * 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.
-
- * ext/extmk.rb (extmake): restore srcdir.
-
-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
- a class is available for a callback entry.
-
- * ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
-
- * ext/tk/lib/tk.rb (array2tk_list): change from private module method
- of TkComm to public module method.
-
- * ext/tk/lib/tk.rb (cget): add check that slot argument is not
- empty string.
-
- * ext/tk/lib/tk.rb (configinfo): ditto.
-
- * ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
- is not empty string.
-
- * ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
-
- * ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
- cursor and cursor= method).
-
- * ext/tk/lib/tk/font.rb: improve font treatment when the font name is
- empty string.
-
- * ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure
- type.
-
- * ext/tk/lib/tk/variable.rb: improve treatment of array-type
- tkvariable.
-
- * ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
-
- * ext/tk/lib/tkextlib/blt/*: bug fix.
-
- * ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
- to call TreeCtrl commands for bindings.
-
- * ext/tk/sample/tkextlib/blt/*: new sample scripts.
-
- * ext/tk/sample/tkextlib/treectrl/*: ditto.
-
-Fri Mar 25 10:53:16 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (WIN32_LEAN_AND_MEAN): removed because a lot of
- troubles. [ruby-list:40721]
-
-Thu Mar 24 23:10:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (macro_defined?): try to compile for an old compiler
- which doesn't bail out at #error directive. [ruby-dev:25818]
-
- * lib/mkmf.rb (check_sizeof): refine logging messages.
-
-Wed Mar 23 19:08:10 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.
-
- * 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>
-
- * parse.y (primary): fix lineno of rescue and ensure.
-
-Wed Mar 23 00:39:05 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/ruby/test_settracefunc.rb (test_event): added tests for
- "class" and "end" and "raise".
-
-Sun Mar 20 22:51:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (mkmf_failed): check if Makefile is created without
- create_makefile.
-
-Sat Mar 19 23:48:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-expr-beg): returned true always.
- fixed: [ruby-list:40683]
-
-Sat Mar 19 00:41:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/font.rb: add some TkFont class methods to get font
- information without creating a TkFont object.
-
- * ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
- classes for components of Tk::TreeCtrl
-
-Thu Mar 17 17:42:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (make_struct): allow non local-id field
- names. [ruby-core:04575]
-
- * 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>
-
- * eval.c (rb_call0): call_cfunc() should be protected.
-
- * eval.c (rb_add_event_hook): use K&R style.
-
- * eval.c (rb_remove_event_hook): ditto.
-
-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.
-
-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>
-
- * 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()
-
-Mon Mar 14 19:39:33 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/timer.rb (TkTimer): forgot to clear @return_value
- when restarting
-
- * ext/tk/lib/tk/sample/cd_timer.rb: new sample of TkRTTimer
-
-Mon Mar 14 12:21:03 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/timer.rb (TkRTTimer): forgot to reset the callback
- time. So, 'continue' do all callbacks between 'stop' and 'continue'.
-
-Mon Mar 14 08:14:56 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (str_to_id): raise ArgumentError for NUL containing
- strings.
-
-Mon Mar 14 00:13:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset
- value. get a little better accuracy.
-
- * ext/tk/sample/demos-en/widget: use a binding with no local variables
- when eval a sample script.
-
- * ext/tk/sample/demos-en/bind.rb: ditto.
-
- * ext/tk/sample/demos-en/tcolor: ditto.
-
- * ext/tk/sample/demos-jp/widget: ditto.
-
- * ext/tk/sample/demos-jp/bind.rb: ditto.
-
- * 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>
-
- * 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: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/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
- realtime operation
-
- * ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
-
- * ext/tk/lib/tk/textmark.rb: move TkTextMark#+ and TkTextMark#- to
- TkText::IndexModMethods
-
- * ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
- add them to TkText::IndexModMethods module
-
- * ext/tk/sample/tktextio.rb: add test part of "seek by text index
- modifiers"
-
-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.
-
- * ext/openssl/ossl_pkey.h: ditto.
-
- * 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]
-
- * parse.y (opt_bv_decl): add explicit block local variable
- declaration. raises error for name conflicts. [EXPERIMENTAL]
-
-Wed Mar 9 13:37:57 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
- support initial text, overwrite setting and pos_gravity control.
-
-Tue Mar 8 18:16:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tktextio.rb: New sample script. TkTextIO class in this
- 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>
-
- * ext/socket/mkconstants.rb: workaround for some of 4.4BSD-Lite
- derived OSs.
-
-Tue Mar 8 12:36:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c: document from Sam Roberts
- <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>
-
- * 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]
-
- * 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>
-
- * 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/lib/openssl/buffering.rb
- (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#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/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)
-
-Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
-
-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>
-
- * 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.
-
-Fri Mar 4 19:39:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
- also locally defined modules.
-
- * ext/iconv/iconv.c: rdocified.
-
- * ext/strscan/strscan.c: moved misplaced rdoc.
-
-Fri Mar 4 16:11:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_exec_recursive): matched the declaration to prototype.
-
- * ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
- window_color_set().
-
- * ext/tk/tcltklib.c: fixed commit mistakes.
-
-Fri Mar 4 12:45:17 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]
-
-Fri Mar 4 12:45:17 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]
-
-Fri Mar 4 12:45:17 2005 Florian Gross <florgro@gmail.com>
-
- * lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
- [ruby-core:4302]
-
-Fri Mar 4 12:45:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c: replace rb_protect_inspect() and rb_inspecting_p() by
- rb_exec_recursive() in eval.c.
-
- * eval.c (rb_exec_recursive): new function.
-
- * array.c (rb_ary_join): use rb_exec_recursive().
-
- * array.c (rb_ary_inspect, rb_ary_hash): ditto.
-
- * file.c (rb_file_join): ditto.
-
- * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
-
- * io.c (rb_io_puts): ditto.
-
- * object.c (rb_obj_inspect): ditto
-
- * struct.c (rb_struct_inspect): 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>
-
- * 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>
-
- * eval.c (ruby_native_thread_kill): call pthread_kill() to send a
- signal to ruby's native thread
-
- * ruby.h: add definition of ruby_native_thread_kill()
-
- * 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
-
-Wed Mar 2 16:03:08 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: enforce thread-check and exception-handling to
- avoid SEGV trouble.
-
- * 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
- protect from namespace crash.
-
- * ext/tk/lib/multi-tk.rb: enforce exception-handling.
-
- * ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
-
- * ext/tk/lib/tk.rb: ditto.
-
- * ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
-
- * ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
-
- * ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
-
- * ext/tk/lib/clock.rb: fix 'no method error'.
-
- * ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
-
- * ext/tk/lib/variable.rb: be able to set default_value_type; :numeric,
- :bool, :string, :symbol, :list, :numlist or nil (default; same to
- :string). If set a type, TkVariable#value returns a value of the
- type.
-
- * ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
- risk of using TclX extension's 'signal' command.
-
- * ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
-
- * ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
-
- * ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
-
- * ext/tk/sample/demos-*/pendulum.rb: ditto.
-
- * ext/tk/sample/demos-*/goldberg.rb: ditto.
-
- * ext/tk/sample/demos-*/widget: add entries of animation demos.
-
-Wed Mar 2 12:21:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): [EXPERIMENTAL] NODE_LAMBDA implemented.
- [ruby-dev:25780]
-
- * 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>
-
- * 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]
-
-Mon Feb 28 09:03:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (Init_socket): add bunch of Socket
- 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 ""
- and "pass". [ruby-dev:25667]
-
-Wed Feb 23 08:00:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_s_create): no need for negative argc check.
- [ruby-core:04463]
-
- * array.c (rb_ary_unshift_m): ditto.
-
-Wed Feb 23 01:53:29 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.
-
- * {bcc32,win32,wince}/Makefile.sub (COMPILE_RULES, RULE_SUBST):
- include $(topdir) and $(hdrdir) to search path.
-
-Tue Feb 22 23:51:45 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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.
-
-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>
-
- * parse.y (parser_yylex): identifier after dot must not be a variable.
-
-Mon Feb 21 18:31:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * 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.
-
-Sun Feb 20 00:48:48 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
- 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>
-
- * lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
- [ruby-dev:25722]
-
- * test/drb/drbtest.rb: ditto.
-
-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>
-
- * ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
- [ruby-dev:25685]
-
- * ext/bigdecimal/sample/linear.rb: ditto.
-
- * ext/bigdecimal/sample/nlsolve.rb: ditto.
-
- * ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
- is sample script and same file exists in ext/bigdecimal/sample.
-
-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>
-
- * lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
-
-Thu Feb 17 20:09:23 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>
-
- * lib/test/unit/collector.rb (collect_file): now deletes paths added
- to $LOAD_PATH instead of restoring it verbatim.
-
- * lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
- 'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
- collector again. Also tried to simplify the calling convention.
-
- * test/runner.rb: adjusted for new AutoRunner semantics.
-
- * lib/test/unit.rb: ditto.
-
-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:02:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): NODE_IASGN is an assignment.
-
-Wed Feb 16 23:54:14 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_start_1): outer block variables wasn't linked to
- threads. fixed: [ruby-dev:25700]
-
-Wed Feb 16 15:11:43 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::Nonblock#initialize):
- native win32 platform doesn't have F_GETFL.
-
-Wed Feb 16 02:47:45 2005 GOTOU Yuuzou <gotoyuzo@notwork.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.
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#fill_rbuff):
- should rescue Errno::EAGAIN.
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#each): fix typo.
- suggested by Brian Ollenberger.
-
- * ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
- underlying IO.
-
-Tue Feb 15 22:14:34 2005 sheepman <sheepman@tcn.zaq.ne.jp>
-
- * ext/readline/readline.c (Readline.readline): use rl_outstream
- and rl_instream. [ruby-dev:25699]
-
-Mon Feb 14 23:58:17 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
- fixed invalid namespace handling bug.
-
-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.
-
-Mon Feb 14 00:10:17 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])
-
- * test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
-
-Sun Feb 13 23:13:46 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
- convenient methods.
-
- * lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
-
- * lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
-
- * test/rss/: added tests for the convenient methods.
-
-Sun Feb 13 23:12:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): restore prot_tag before rewinding.
-
-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>
-
- * 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
- the URI directly specified.
-
-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
- certificates.
-
-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
- [ruby-dev:25675]
-
-Fri Feb 11 17:37:50 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
- new method OpenSSL::X509::Store#set_default_paths.
-
-Fri Feb 11 11:33:53 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
- :http_basic_authentication.
- suggested by Kent Sibilev. [ruby-core:4392]
-
-Fri Feb 11 06:30:07 2005 George Ogata <g_ogata@optushome.com.au>
-
- * misc/ruby-mode.el: ignore parenthesis inside heredoc.
- [ruby-core:04415]
-
-Fri Feb 11 04:54:13 2005 Tilman Sauerbeck <tilman@code-monkey.de>
-
- * lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
-
- * 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 12:09:16 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extract_makefile): default to true if not compiled
- previously.
-
- * ext/extmk.rb (extmake): create dummy makefile if extconf failed.
-
-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.
-
-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>
-
- * 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 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>
-
- * 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>
-
- * ext/extmk.rb (extract_makefile): extract previously collected
- informations from existing Makefile.
-
- * 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.
-
- * lib/mkmf.rb (try_constant): make sure if really a constant, reduce
- the number of times of compile.
-
- * lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
-
- * lib/mkmf.rb (find_library): allow directory list with separators.
-
- * lib/mkmf.rb (arg_config): manage provided configuration options.
-
- * 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.
-
-Sun Feb 6 19:20:05 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.
-
-Sun Feb 6 13:56:19 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>
-
- * ext/dl/dl.c (Init_dl): function declaration should precede
- statements before C99.
-
-Sun Feb 6 03:24:20 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb (Resolv::DNS::Resource::TXT): multiple strings was not
- handled.
- (Resolv::DNS::Resource::TXT#strings): new method to return all
- strings.
- (Resolv::DNS::Message::MessageEncoder#put_string_list): new method.
- (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>
-
- * lib/rss: supported Image module.
- http://web.resource.org/rss/1.0/modules/image/
-
-Thu Feb 3 23:42:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_close, strio_close_read, strio_close_write):
- should return nil instead of self as well as IO. [ruby-dev:25623]
-
- * 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
- part. [ruby-dev:25618]
-
-Wed Feb 2 21:56:01 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (RSS::Element#convert): added.
-
- * lib/rss/rss.rb: convert -> need_convert.
-
- * lib/rss/1.0.rb: ditto.
-
- * lib/rss/0.9.rb: ditto.
-
- * lib/rss/2.0.rb: ditto.
-
- * 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>
-
- * 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>
-
- * ext/tk/tcltklib.c: add invalid namespace check
-
- * ext/tk/lib/multi-tk.rb: add invalid_namespace? method
-
- * ext/tk/lib/remote-tk.rb: ditto
-
-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):
- parse options line for ndots option.
- (Resolv::Hosts#lazy_initialize): return self.
- (Resolv::DNS#lazy_initialize): ditto.
- (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>
-
- * 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/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]
-
-Wed Jan 26 14:12:58 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Setup*: remove tcltklib.
-
-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>
-
- * 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>
-
- * ext/tk: merge tcltklib for Ruby/Tk installation control
-
- * 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]
-
-Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
- after scripts [ruby-dev:25479]: NULL current namespace when deleting
- Tk interpreter [ruby-talk:126225]
-
- * ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
- [ruby-talk:126360]
-
- * ext/tcltklib/extconf.rb: add yet another native-thread check
-
- * ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
- Ruby interpreter
-
- * ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
-
- * ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
- doesn't return the created object [ruby-dev:25479]
-
- * ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
-
- * ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
- a command argument [ruby-dev:25479]
-
- * ext/tk/lib/multi-tk.rb: ditto
-
- * ext/tk/lib/tk/*.rb: ditto
-
- * ext/tk/lib/tkextlib/*.rb: ditto
-
- * ext/tk/sample/demos-jp/anilabel.rb: new demo script
-
- * ext/tk/sample/demos-en/anilabel.rb: ditto
-
- * 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>
-
- * 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 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>
-
- * lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
- capitalized name (such as KeywordSearchRequest in AWS) is defined as
- a method having uncapitalized name. (converted with
- GenSupport.safemethodname to handle operation name 'foo-bar'). it
- introduced serious incompatibility; in the past, it was defined as a
- capitalized.
-
- define capitalized method as well under that circumstance.
-
-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>
-
- * 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>
-
- * lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
-
-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]
-
-Fri Jan 21 00:37:09 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 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>
-
- * lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
-
-Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
- domain and search directive without an argument.
- reported by Sam Roberts. [ruby-talk:126781]
-
-Mon Jan 17 23:33:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (aix): fix typo. [ruby-talk:126401]
-
-Mon Jan 17 07:08:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/readline/readline.c: suppress warnings.
-
- * lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
- ditto.
-
- * lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
-
- * lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
-
- * lib/irb/locale.rb (IRB::Locale::real_load): ditto.
-
- * lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
-
-Mon Jan 17 00:09:42 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
-
-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>
-
- * 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]
-
- * class.c (rb_make_metaclass): class of metaclasses should be
- plain Class. [ruby-list:40524]
-
-Tue Jan 11 20:58:52 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]
-
-Tue Jan 11 09:37:53 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>
-
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
- escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
-
- * 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.
-
- * test/webrick/{test_cgi.rb,webrick.cgi}: new file.
-
- * test/webrick/utils.rb: require "webrick/https.h".
-
-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: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]
-
-Sat Jan 8 04:38:47 2005 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml.rb: Kernel#y requires an argument.
-
-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>
-
- * ext/zlib/zlib.c (zstream_end): should return value.
-
-Thu Jan 6 19:59:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_close): didn't close socket handle.
- [ruby-dev:25414]
-
- * 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>
-
- * random.c (random_seed): O_NONBLOCK isn't defined on some
- platforms. [ruby-dev:25417]
-
-Thu Jan 6 13:45:35 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/time.rb: recognize +00:00 and GMT as a localtime.
-
-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.
- [ruby-dev:25408]
-
- * 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 02:30:11 2005 Tanaka Akira <akr@m17n.org>
-
- * random.c (init_by_array): imported from mt19937ar-cok.tgz.
- (genrand_int32): ditto.
- (genrand_real): replaced with genrand_res53 in mt19937ar-cok.
- (rand_init): support bignum for longer seed.
- (random_seed): generate longer seed.
- (make_mask): new function.
- (limited_rand): ditto.
- (limited_big_rand): ditto.
- (rb_f_rand): call limited_rand and limited_big_rand.
- [ruby-dev:25403]
-
-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>
-
- * test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
- DRbService.ext_service. reduce sleep.
-
-Mon Jan 3 14:01:54 2005 Tanaka Akira <akr@m17n.org>
-
- * random.c (random_seed): don't use /dev/urandom if it is not
- character device.
-
-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>
-
- * lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
- raise NotImplementedError if password is encrypted by digest
- algorithms. This patch is contributed by sheepman. [ruby-list:40467]
-
- * lib/webrick/httpauth/digestauth.rb
- (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
- This patch is contributed by sheepman. [ruby-list:40482]
-
- * lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
- pack/unpack-template char "m" instead of lib/base64.rb to do base64
- encoding/decoding. fixed: [ruby-dev:25336]
-
- * 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
- StringValue before GetSPKI. fixed: [ruby-dev:25359].
-
-Sat Jan 1 01:13:28 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_autoload): [ruby-dev:25373]
-
-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.
-
-Thu Dec 30 00:41:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (svalue_to_avalue): [ruby-dev:25366]
-
- * string.c (rb_str_justify): [ruby-dev:25367]
-
-Wed Dec 29 11:07:07 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/template/html/kilmer.rb: Update to use new
- sections.
-
-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
- variables. fixed: [ruby-list:40445]
-
-Tue Dec 28 15:25:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
- 0xfe.
-
- * ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
- properly.
-
-Tue Dec 28 13:35:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
- freeing internal zstreams. fixed: [ruby-dev:25309]
-
- * ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
-
-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>
-
- * 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>
-
- * test/fileutils/test_fileutils.rb (cp_r): tested wrong file name.
- [ruby-dev:25339]
-
-Mon Dec 27 15:15:18 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mv): should raise error when moving a
- directory to the (empty) directory. [ruby-talk:124368]
-
- * lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
- platforms.
-
-Mon Dec 27 14:36:20 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not error.
- fixed: [ruby-dev:25346]
-
-Sun Dec 26 16:21:39 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new class
- to support the PLAIN authentication mechanism. Thanks, Benjamin
- Stiglitz.
-
-Sat Dec 25 01:28:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_select): [ruby-dev:25312]
-
-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>
-
- * 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 (syck_loader_transfer): check type conversion.
-
- * ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
- typing.
-
- * ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
- allocation framework.
-
- * ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
- ditto.
-
-Fri Dec 24 01:21:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkextlib/blt.rb: add BLT extension support
-
- * ext/tk/lib/tkextlib/blt/*.rb: ditto
-
- * ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
-
-Thu Dec 23 23:43:24 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_setgroups): check if the argument length 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
- RELEASE_DATE
-
- * ext/tcltklib/extconf.rb: ditto
-
- * ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
-
- * ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
-
-Thu Dec 23 00:16:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (bsdi): use $(CC) for LDSHARED. fixed [ruby-dev:25270]
-
-Wed Dec 22 11:14:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
- fixed: [ruby-dev:25273]
-
-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>
-
- * 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.
-
- * 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>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode):
- 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: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>
-
- * added samples for the previous soap4r's commit.
-
-Mon Dec 20 22:56:39 2004 Tanaka Akira <akr@m17n.org>
-
- * gc.c (set_stack_end): gcc noinline attribute is available since
- gcc-3.1.
-
-Mon Dec 20 22:40:31 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * added files:
- * lib/soap/mapping/wsdl*.rb
- * lib/wsdl/soap/element.rb
- * lib/wsdl/xmlSchema/simpleContent.rb
-
- * modified files:
- * lib/soap/*
- * lib/wsdl/*
- * lib/xsd/*
- * test/soap/*
- * test/wsdl/*
- * test/xsd/*
-
- * summary
- * imported from the soap4r repository. Version: 1.5.3-ruby1.8.2
-
- * added several XSD basetype support: nonPositiveInteger,
- negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
- unsignedShort, unsignedByte, positiveInteger
-
- * HTTP client connection/send/receive timeout support.
-
- * 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>
-
- * lib/net/https.rb: delete descriptions about key_file and cert_file.
- fixed: [ruby-dev:25243]
-
- * ext/openssl/lib/net/telnets.rb: ditto.
-
-Mon Dec 20 14:07:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
-
- * ext/tk/lib/tk/clock.rb: ditto
-
- * ext/tk/lib/tk/text.rb: ditto
-
- * ext/tk/lib/tk/panedwindow.rb: ditto
-
-Mon Dec 20 13:51:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
-
-Mon Dec 20 10:51:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (special_local_set): prevent the parser object from GC.
- fixed: [ruby-dev:25252]
-
-Mon Dec 20 03:30:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/cgi/session.rb (CGI::Session#initialize): empty session id was
- used if request had no session key. fixed: [ruby-core:03981]
-
-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>
-
- * lib/rexml/encodings/SHIFT_JIS.rb: fixed LoadError bug.
- [ruby-core:3958]
-
-Sun Dec 19 17:24:59 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (enable_rpath): use rpath flag to embed the library
- path into extensions on ELF environment. [ruby-dev:25035]
-
-Sun Dec 19 11:01:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit.rb: use standalone runner for -e.
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
- multiple -p and -x options.
-
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
- ditto.
-
-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>
-
- * lib/webrick/httpauth.rb,
- lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
- pack/unpack-template char "m" instead of lib/base64.rb to do base64
- encoding/decoding.
-
-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 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]
-
-Fri Dec 17 16:28:12 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fix bug on setting up system encoding
-
- * ext/tk/lib/tk/event.rb: fix error on require process
-
- * ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
-
- * ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
- accepts event-sequence arguments
-
- * ext/tk/lib/tk/text.rb: fail to dump embedded images
-
- * ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
- types of values
-
- * ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
- types of values
-
- * ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
- TkText::IndexString class to treat text index modifiers
-
- * ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
-
- * ext/tk/lib/tk/textmark.rb: ditto
-
- * ext/tk/lib/tk/textimage.rb: ditto
-
- * ext/tk/lib/tk/textwindow.rb: ditto
-
- * ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
- image
-
- * ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
- embedded window
-
-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>
-
- * 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 23:31:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): create RUBYARCHDIR also when no extension
- is installed. fixed: [ruby-dev:25215]
-
-Thu Dec 16 22:36:57 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/test_drb.rb: adjust and reduce sleep.
-
-Thu Dec 16 18:37:08 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.c (ossl_raise): refine message format.
-
-Thu Dec 16 16:29:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/demos-en/widget: modify version check for
- supporting features
-
-Thu Dec 16 16:03:50 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
-
- * ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
-
- * ext/tk/lib/tk.rb: add TkComm._callback_entry?()
-
- * ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
-
- * ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
-
- * ext/tk/lib/tk/canvastag.rb: ditto
-
- * ext/tk/lib/tk/dialog.rb: ditto
-
- * ext/tk/lib/tk/optiondb.rb: ditto
-
- * ext/tk/lib/tk/text.rb: ditto
-
- * ext/tk/lib/tk/texttag.rb: ditto
-
- * ext/tk/lib/tk/textwindow.rb: ditto
-
- * ext/tk/lib/tk/timer.rb: ditto
-
- * ext/tk/lib/tk/validation.rb: ditto
-
- * 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:27:10 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: remove junk.
-
-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]
-
-Thu Dec 16 00:43:29 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: changed default binded address family to use an
- available address family of host name. [druby-ja:101]
-
- * lib/drb/ssl.rb: ditto
-
-Wed Dec 15 17:47:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
- should log about all accepted socket. [ruby-core:03962]
-
- * lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
- "%%" and "%u" are supported. [webricken:135]
-
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#check_filename):
- :NondisclosureName is acceptable if it is Enumerable.
-
- * lib/webrick/config.rb (WEBrick::Config::FileHandler):
- default value of :NondisclosureName is [".ht*", "*~"].
-
-Wed Dec 15 16:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_id_obsolete): warn always.
-
-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>
-
- * win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
-
-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>
-
- * win32/win32.c (rb_w32_close): need to reset osfhnd().
-
-Tue Dec 14 14:03:57 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
- [ruby-dev:25187]
-
-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.
- 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>
-
- * test/ruby/test_super.rb (TestSuper#test_define_method): now methods
- from procs can call super.
-
-Sun Dec 12 10:35:10 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
- show an accessor's r/w flag if none was specified
-
-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>
-
- * lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
- [ruby-list:40390]
-
- * test/drb/drbtest.rb: ditto.
-
- * test/drb/ut_drb.rb: ditto.
-
-Sat Dec 11 13:08:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/optparse/subcommand.rb: a sample for sub commands like
- cvs. contributed by Minero Aoki.
-
-Fri Dec 10 08:39:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (sock_listen): get OpenFile just before calling
- listen(2).
-
-Thu Dec 9 16:28:35 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/sdbm/init.c (GetDBM): typo.
-
-Thu Dec 9 16:21:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI#setup_header): avoid
- SecurityError. [ruby-dev:24970]
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
- for reading request till data arrive. [ruby-talk:121068]
-
-Thu Dec 9 14:38:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_inspect): escape # which starts an expression
- substitution. fixed: [ruby-core:03922]
-
- * 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]
-
- * ext/sdbm/init.c: ditto.
-
- * 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
- the running script is '-e one-liner' or '-' (stdin).
-
- * ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for
- stub libs
-
- * ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
- have a wrong parent class.
-
- * ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
- TkWarning2 --> TkWarningObj (old names are changed to alias names)
-
- * ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
- option and hashes for configuration
-
- * ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the
- button name
-
- * ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==>
- get_value() and value=(val) ==> set_value(val).
-
- * ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
-
- * ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
- TkOptionMenuButton = TkOptionMenubutton)
-
- * ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
- event_generate) for Event object
-
- * ext/tk/lib/tk/font.rb: configinfo returns proper types of values
-
- * ext/tk/lib/tk.rb: bind methods accept subst_args + block
-
- * ext/tk/lib/tk/canvas.rb: ditto
-
- * ext/tk/lib/tk/canvastag.rb: ditto
-
- * ext/tk/lib/tk/frame.rb: ditto
-
- * ext/tk/lib/tk/text.rb: ditto
-
- * ext/tk/lib/tk/texttag.rb: ditto
-
- * ext/tk/lib/tk/toplevel.rb: ditto
-
- * ext/tk/lib/tkextlib/*: ditto and bug fix
-
-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.
-
- * 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.
-
-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 (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.
-
- * win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
- interface.
-
- * win32/win32.[ch] (rb_w32_rmdir): new function.
-
-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:32:38 2004 Tanaka Akira <akr@m17n.org>
-
- * 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]
-
- * 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]
-
-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>
-
- * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
- ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
- ossl_rsa_private_decrypt): should take an optional argument
- to specify padding mode. [ruby-talk:122539]
-
- * ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): add new constants
- PKCS1_PADDING, SSLV23_PADDING, NO_PADDING and PKCS1_OAEP_PADDING
- under OpenSSL::PKey::RSA.
-
- * test/openssl/test_pkey_rsa.rb: new file.
-
-Sun Dec 5 19:39:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Completion#complete): new parameter
- to direct case insensitiveness.
-
- * 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]
-
- * io.c (io_fwrite): takes VALUE string as an argument.
- [ruby-dev:25050]
-
- * ext/socket/socket.c (sock_connect): remove rb_str_locktmp().
- [ruby-dev:25050]
-
- * ext/socket/socket.c (udp_connect): [ruby-dev:25045]
-
- * ext/socket/socket.c (udp_bind): ditto.
-
- * ext/socket/socket.c (udp_send): ditto.
-
- * ext/socket/socket.c (bsock_send): ditto.
-
- * ext/socket/socket.c (s_recvfrom): ditto.
-
- * 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.
-
- * 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.
-
-Sat Dec 4 14:28:56 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/code_objects.rb (RDoc::Context::Section::set_comment):
- Section comments may now be bracketed by lines which are
- ignored. You can now write
- # -----------
- # :section: Dave's Section
- # comment material
- # -----------
- The lines before :section: are removed, and identical lines at the end are
- also removed if present.
-
-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>
-
- * st.h: fix prototype for C++.
-
-Fri Dec 3 01:55:24 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing
- returns proper object. "widget.option = val" returns val, and
- "widget.option(val)" returns self.
-
- * ext/tk/lib/tk/font.rb: TkFont#replace accepts only one font argument.
-
- * ext/tk/lib/tk/radiobutton.rb: add TkRadiobutton#value and
- TkRadiobutton#value=(val).
-
- * ext/tk/lib/tk/spinbox.rb: callback substitution support on
- command option.
-
- * ext/tk/sample/demos-en/widget: bug fix (wrong image height)
-
- * 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]
-
-Thu Dec 2 16:41:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_protect): prevent continuations created inside from being
- called from the outside. [ruby-dev:25003]
-
- * 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>
-
- * eval.c (thread_mark): mark thread group. [ruby-dev:25020]
-
- * eval.c (thgroup_add): check whether the argument is really a Thread.
-
-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>
-
- * 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]
-
- * io.c (io_readpartial): ditto.
-
- * io.c (io_read): ditto.
-
-Tue Nov 30 14:58:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb (install): add arguments explicitly to "super".
-
-Tue Nov 30 00:49:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (PUSH_FRAME): flags should have been initialized.
-
- * eval.c (rb_eval): [ruby-core:03856]
-
- * 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
- being extended when overwriting. [ruby-core:03836]
-
-Mon Nov 29 15:59:05 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/ostruct.rb (OpenStruct::method_missing): check method
- duplication for -d.
-
- * lib/ostruct.rb (OpenStruct::initialize): ditto.
-
-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]
-
- * eval.c (rb_funcall_rescue): new function.
-
- * object.c (rb_Array): avoid using rb_respond_to().
-
- * 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]).
-
-Sun Nov 28 12:08:15 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regparse.c, test/ruby/test_regexp.rb: fixed problem with UTF-8
- characters that have U+00FE or invalid characters.
-
-Sun Nov 28 12:07:04 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regexec.c, test/ruby/test_regexp.rb: fixed segmentation fault
- ([ruby-dev:24887]).
-
-Sun Nov 28 12:05:48 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * regcomp.c, regint.h: fixed PLATFORM_UNALIGNED_WORD_ACCESS
- problem ([ruby-dev:24802] and [ruby-core:3733])
-
-Sat Nov 27 23:43:39 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_initialize): [ruby-dev:24972]
-
-Sat Nov 27 21:43:39 2004 Tanaka Akira <akr@m17n.org>
-
- * io.c: avoid data lost with nonblocking fd and
- stdio buffering in sync mode. [ruby-dev:24966]
- based on matz's patch [ruby-dev:24967]
- (io_fwrite): new primitive writing function which writes
- directly if sync mode.
- (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]
-
-Sat Nov 27 09:41:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fread): old rb_io_fread with file closing checking.
- (rb_io_fread): wrapper for io_fread now.
- [ruby-dev:24964]
-
-Fri Nov 26 18:02:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath
-
- * ext/tk/lib/tk/image.rb: bug fix
-
- * ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
-
- * 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]
-
- * lib/erb.rb: add RDoc by James Edward Gray II. [ruby-core:03786]
-
-Fri Nov 26 13:29:02 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break
- out of preprocessing when we find a :section: directive (previously cleared out the
- comment, but this apparently now generates an error in gsub!)
-
-Fri Nov 26 00:17:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_read): move StringValue() check before GetOpenFile().
- [ruby-dev:24959]
-
-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>
-
- * 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]
-
-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]
-
-Wed Nov 24 01:01:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_read): integer conversion should be prior to
- GetOpenFile(). [ruby-dev:24952]
-
- * configure.in, io.c: cancel [ ruby-Patches-1074 ].
-
-Tue Nov 23 08:09:50 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/menu.rb: improve usability of TkOptionMenubutton
-
-Tue Nov 23 02:00:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_chown): integer conversion should be prior to
- GetOpenFile(). [ruby-dev:24949]
-
-Tue Nov 23 00:10:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_chown): integer conversion should be prior to
- GetOpenFile(). [ruby-dev:24947]
-
- * file.c (rb_file_truncate): ditto.
-
- * file.c (rb_file_s_truncate): ditto.
-
- * dir.c (dir_seek): use NUM2OFFT().
-
- * misc/ruby-mode.el (ruby-non-block-do-re): [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'
-
-Mon Nov 22 00:13:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_seek): should retrieve dir_data after NUM2INT().
- [ruby-dev:24941]
-
-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
- group together methods, attributes, constants, etc under
- headings in the output. If used, a table of contents is
- generated.
-
-Sat Nov 20 23:56:54 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/options.rb (Options::parse): Force --inline-source if
- --one-file option given
-
-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 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.
-
-Sat Nov 20 05:34:24 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: original nkf.c rev:1.40
-
- * 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.
- [ruby-core:03774]
-
-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
- exception if data corresponding to session specified from the
- client does not exist.
-
-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.
-
-Thu Nov 18 00:21:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_getpgrp): prohibit for $SAFE=2.
- [ruby-dev:24899]
-
- * process.c (get_pid): ditto. [ruby-dev:24904]
-
- * process.c (get_ppid): ditto.
-
- * array.c (rb_ary_delete): defer rb_ary_modify() until actual
- modification. [ruby-dev:24901]
-
-Thu Nov 18 10:10:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c, rubyio.h (rb_io_modenum_flags): exported.
-
- * 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>
-
- * 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]
-
- * parse.y (string_content): should not use FL_UNSET.
-
- * 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>
-
- * dir.c (rb_push_glob): fix overrun. [ruby-dev:24886]
-
-Wed Nov 17 11:48:17 2004 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/parser.rb, test/xmlrpc/test_features.rb: fixed "assigning
- to constants" warnings
-
-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]
-
-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>
-
- * {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
- config.status to force updating them.
-
-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
- Regexp conversion.
-
-Tue Nov 16 01:41:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_mod_check): frozen check should be separated.
- [ruby-core:3742]
-
- * 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>
-
- * configure.in: check rlim_t more portably. [ruby-core:3735]
-
-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>
-
- * 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>
-
- * 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
- export it.
-
-Fri Nov 12 14:08:01 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/event.rb: remove $LOADED_FEATURES trick
-
- * ext/tk/lib/tk.rb: ditto
-
-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>
-
- * dir.c (rb_glob): should have called rb_glob_caller().
- [ruby-dev:24773]
-
-Thu Nov 11 16:56:10 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).
-
-Thu Nov 11 01:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (syserr_initialize): use stringified object.
- [ruby-dev:24768]
-
-Wed Nov 10 22:49:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (SimpleDelegator::dup): wrong number of
- arguments.
-
- * 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.
-
-Wed Nov 10 03:33:36 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x
- or older
-
- * 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
- memory leaks. use string object for buffering instead.
- [ruby-dev:24738]
-
- * dir.c (join_path): ditto.
-
- * io.c (io_read): external input buffer may be modified even after
- rb_str_locktmp(). [ruby-dev:24735]
-
- * 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>
-
- * lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
- [ruby-dev:24743]
-
-Mon Nov 8 22:20:19 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
- Fix bug where parent class wasn't being detected if the
- child class was defined using the A::B notation.
-
-Mon Nov 8 00:14:13 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: add setup for mingw32 cross compiling.
- [ruby-talk:119413]
-
-Sun Nov 7 23:49:26 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bind-event methods accept multi substitution
- arguments.
-
- * ext/tk/lib/tk/canvas.rb: ditto.
-
- * ext/tk/lib/tk/canvastag.rb: ditto.
-
- * ext/tk/lib/tk/text.rb: ditto.
-
- * ext/tk/lib/tk/texttag.rb: ditto.
-
- * ext/tk/lib/tkextlib: ditto.
-
-Sat Nov 6 20:40:16 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c: rename WIN32OLE#ole_obj_help to
- WIN32OLE#ole_type. alias ole_obj_help to ole_type.
-
- * ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Sat Nov 6 11:18:59 2004 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb (_parse): checks whether zone was given.
-
-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
- X_Scrollable and Y_Scrollable
-
- * ext/tk/lib/tk/entry.rb: include X_Scrollable instead of Scrollable
-
- * ext/tk/lib/tk/autoload.rb: define autoload for X_Scrollable and
- Y_Scrollable
-
-Fri Nov 5 16:05:32 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: TkComm._at() supprts both of "@x,y" and "@x"
-
-Fri Nov 5 13:22:58 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/text.rb: sorry. bug fix again.
-
-Fri Nov 5 13:17:54 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/text.rb: bug fix
-
-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>
-
- * 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.
-
-Thu Nov 4 15:02:14 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb: forget to initialize instance_variables
- of TkVarAccess objects
-
-Thu Nov 4 09:11:35 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_mark): enable GC stack checking.
-
-Thu Nov 4 03:11:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_gsub): lock strings temporarily. [ruby-dev:24687]
-
- * ext/socket/socket.c (s_recvfrom): tmplock input buffer.
- [ruby-dev:24705]
-
-Wed Nov 3 22:24:17 2004 Daigo Moriwaki <techml@sgtpepper.net>
-
- * lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
- avoid warnings.
-
-Wed Nov 3 17:19:59 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_uniq_bang): do not push frozen string from hash
- table. [ruby-dev:24695]
-
- * array.c (rb_ary_and): ditto.
-
- * array.c (rb_ary_or): ditto.
-
-Wed Nov 3 17:02:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: support to use different Tcl commands between
- configure and configinfo
-
- * ext/tk/lib/font.rb: ditto.
-
- * ext/tk/lib/itemconfig.rb: support to use different Tcl commands
- between item_configure and item_configinfo
-
- * ext/tk/lib/itemfont.rb: ditto.
-
- * ext/tk/extconf.rb: install SUPPORT_STATUS
-
- * 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.
-
- * lib/rss/maker/*.rb: changed API to RSS version independence.
-
- * lib/rss/maker/base.rb
- (RSS::Maker::XMLStyleSheets::XMLStyleSheet): checked required
- (pseudo) attributes.
-
- * lib/rss/maker/base.rb (RSS::Maker::Items): sort -> do_sort.
-
- * lib/rss/rss.rb (RSS::BaseModel.install_date_element): avoided
- warning.
-
- * lib/rss/0.9.rb (RSS::Rss#textinput): added convenience method.
-
-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>
-
- * io.c (pipe_open): need to set cmd if argc == 0 (win32).
-
-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.
-
- * ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
- ext/stringio/extconf.rb: added.
-
- * MANIFEST, ext/**/MANIFEST: removed.
-
- * 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 03:14:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_get_method_body): store ICLASS in the cache.
- [ruby-core:03672]
-
- * eval.c (rb_provided): should return true for loading library
- too for autoloading. [ruby-core:03655]
-
-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]
-
- * string.c (rb_str_locktmp): lock string temporarily.
-
- * string.c (str_independent): add tmplock check.
-
- * io.c (io_write): lock output string temporarily.
- [ruby-dev:24649]
-
- * io.c (io_write): use rb_str_locktmp().
-
- * 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
- object. [ruby-talk:118234]
-
- * 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.
- [ruby-core:03611]
-
- * eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
- should be wrapped by PUSH_TAG/POP_TAG(). [ruby-dev:24627]
-
-Thu Oct 28 08:42:02 2004 Tanaka Akira <akr@m17n.org>
-
- * io.c (argf_forward): use ANSI style.
- (argf_read): call argf_forward with argv argument.
- [ruby-dev:24624]
-
-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.
-
- * io.c (ARGF_FORWARD): should have specified argv explicitly,
- since we no longer have frame->argv saved. [ruby-dev:24602]
-
-Tue Oct 26 23:30:39 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module):
- Restore correct :nopdoc: behavior with nested classes and modules.
-
-Tue Oct 26 18:21:29 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (RESIZE_CAPA): check string attribute before modifying
- capacity member of string structure. [ruby-dev:24594]
-
-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 '.'.
- [ruby-dev:24590]
-
- * win32/win32.c (isUNCRoot): fixed buffer overrun.
-
-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>
-
- * 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.
- Thanks. [ruby-core:03549]
-
-Sat Oct 23 00:20:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c (zstream_append_input): clear klass for z->input
- to avoid potential vulnerability.
-
- * ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
- to avoid SEGV. [ruby-dev:24568]
-
-Fri Oct 22 12:02:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_alias): was warning for wrong condition.
- [ruby-dev:24565]
-
-Fri Oct 22 10:36:37 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars):
- should check if path_info is not nil.
-
-Fri Oct 22 00:22:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/zlib/zlib.c (zstream_shift_buffer): should restore class
- field of a buffer. [ruby-dev:24562]
-
-Fri Oct 22 00:20:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_include): should not treat char as negative value.
- [ruby-dev:24558]
-
-Thu Oct 21 21:32:30 2004 IWATSUKI Hiroyuki <don@na.rim.or.jp>
-
- * lib/pstore.rb (PStore#transaction): Use the empty content when a
- file is not found. [ruby-dev:24561]
-
-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.
- [ruby-dev:24546]
-
- * 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.
-
-Wed Oct 20 04:17:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dbm/dbm.c (fdbm_delete_if): should check if deleting element
- is a string. [ruby-dev:24490]
-
- * ext/sdbm/init.c (fsdbm_delete_if): ditto.
-
-Wed Oct 20 01:37:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_times): Array#* should return an instance of
- the class of right operand. [ruby-dev:24526]
-
- * ext/zlib/zlib.c (zstream_detach_buffer): should not expose
- class-less object to Ruby world. [ruby-dev:24530]
-
- * eval.c (proc_dup): provide Proc#dup as well. [ruby-talk:116915]
-
- * 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>
-
- * ext/win32ole.c(ole_invoke): retrieve the result value when
- retrying the IDispatch::invoke.
-
-Tue Oct 19 17:24:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): block string buffer modification during
- rb_io_fread() by freezing it temporarily. [ruby-dev:24479]
-
- * dir.c (rb_push_glob): block call at once the end of method.
- [ruby-dev:24487]
-
- * ext/enumerator/enumerator.c (enum_each_slice): remove
- rb_gc_force_recycle() to prevent potential SEGV.
- [ruby-dev:24499]
-
- * 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>
-
- * string.c (rb_str_upto): method result must be checked. [ruby-dev:24504]
-
- * eval.c (error_print): ditto. [ruby-dev:24519]
-
-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>
-
- * io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether file
- not existing is created. [ruby-dev:24505]
-
-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>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#initialize):
- initial value of accpet-* should be array.
-
-Mon Oct 18 00:42:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_getservbyaname): protocol string
- might be altered. [ruby-dev:24503]
-
- * string.c (rb_str_upto): check if return value from succ is a
- string. [ruby-dev:24504]
-
-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>
-
- * ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
- * ext/win32ole/win32ole.c (fole_get_methods): ditto.
- * ext/win32ole/win32ole.c (fole_put_methods): ditto.
- * ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE#ole_func_methods
- WIN32OLE#ole_get_methods, WIN32OLE#ole_put_methods
-
-Sat Oct 16 14:45:28 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/0.9.rb (RSS::Rss#to_s): removed garbage.
-
-Sat Oct 16 13:42:49 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/: untabified.
- * test/rss/: untabified.
- * lib/rss/0.9.rb (RSS::Rss#to_s): inent -> indent.
-
-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
- acceptable. Add TkTimer.start ( == new + start ).
-
-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>
-
- * 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]
-
- * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
- prevent access to recycled object (via continuation for
- example). [ruby-dev:24463]
-
-Mon Oct 11 13:48:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/*: untabify
-
-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
- conversion.
-
- * lib/rss/rss.rb: 0.0.9 -> 0.1.0.
-
-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
- iteration. [ruby-dev:24445]
-
-Fri Oct 8 01:13:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/optiondb.rb: make it more secure
-
-Thu Oct 7 23:47:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/scrollbar.rb: When 'set' operation, a scrollbar
- cannot propagate view port information from the source widget
- (that calls 'set') to other assigned widgets.
-
-Thu Oct 7 17:36:25 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: When CHILDKILLED and so on, Tk.errorCode returns
- a Fixnum for 2nd element (it's pid) of the return value.
-
-Thu Oct 7 12:55:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_read): should freeze buffer before thread context
- switch. [ruby-dev:24442]
-
- * pack.c (pack_unpack): string conversion should at the top of the
- method. [ruby-dev:24439]
-
- * io.c (io_read): buffer should be frozen only after the length
- check. [ruby-dev:24440]
-
-Thu Oct 7 02:56:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c: use FMODE_APPEND.
-
-Thu Oct 7 01:05:33 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add Tk.errorInfo and Tk.errorCode
-
-Thu Oct 7 00:08:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_sysopen): preserve path in the buffer allocated by
- ALLOCA_N() to prevent modification. [ruby-dev:24438]
-
-Wed Oct 6 09:21:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_mode_flags): preserve append mode flag.
- [ruby-dev:24436]
-
- * io.c (rb_io_modenum_mode): do not use external output buffer.
-
- * string.c (rb_str_justify): differ pointer retrieval to prevent
- padding string modification. [ruby-dev:24434]
-
- * range.c (range_each_func): allow func to terminate loop by
- returning RANGE_EACH_BREAK.
-
- * 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>
-
- * io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
- while GC. [ruby-dev:24408]
-
-Mon Oct 4 12:53:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/optiondb.rb: support definition of command
- resources on widgets
-
- * ext/tk/lib/tk/image.rb: bug fix
-
-Sun Oct 3 21:16:05 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.
-
- * 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]
-
- * node.h (NEW_DVAR): extra semicolon.
-
-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]
-
-Fri Oct 1 11:40:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
- sourcefile string modification. [ruby-dev:24373]
-
- * io.c (io_read): block string buffer modification during
- rb_io_fread() by freezing it temporarily. [ruby-dev:24366]
-
- * io.c (rb_io_s_popen): mode argument may be altered.
- [ruby-dev:24375]
-
- * file.c (rb_file_s_basename): ext argument may be altered.
- [ruby-dev:24377]
-
- * enum.c (enum_sort_by): use NODE instead of 2 element arrays.
- [ruby-dev:24378]
-
- * string.c (rb_str_chomp_bang): StringValue() may change the
- receiver. [ruby-dev:24371]
-
-Fri Oct 1 11:25:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/grid.rb: revive TkGrid.grid
-
- * ext/tk/lib/tk/pack.rb: revive TkPack.pack
-
- * ext/tk/lib/tk/place.rb: revive TkPlace.place
-
-Thu Sep 30 00:50:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_init): bug fix
-
- * ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
-
- * ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation
-
- * ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a
- matting pattern argument
-
-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
- accessors. [ruby-dev:24342]
-
- * marshal.c (w_object, r_object0): use accessors.
-
-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
- to avoid double call to rb_gc_force_recycle(). [ruby-dev:24311]
-
-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]
-
- * array.c (rb_ary_replace): ditto.
-
- * array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
-
- * 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
- during iteration. [ruby-dev:24315]
-
- * 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.
-
- * hash.c (env_fetch): ditto.
-
-Wed Sep 22 13:02:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
-
-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]
-
- * array.c (rb_ary_reject_bang): ditto. [ruby-dev:24300]
-
- * 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_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
- rb_ary_sort_bang() instead. [ruby-dev:24291]
-
- * enum.c (enum_sort_by): pedantic type check added.
- [ruby-dev:24291]
-
- * hash.c (rb_hash_foreach_iter): check iter_lev after each
- iteration. [ruby-dev:24289]
-
- * array.c (rb_ary_and): element size might change during
- comparison. [ruby-dev:24290]
-
- * array.c (rb_ary_or): ditto. [ruby-dev:24292]
-
- * array.c (rb_ary_equal): wrong fix. [ruby-dev:24286]
-
-Sat Sep 18 15:02:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_equal): element size might change during
- comparison. [ruby-dev:24254]
-
- * array.c (rb_ary_diff): ditto. [ruby-dev:24274]
-
- * array.c (rb_ary_select): ditto. [ruby-dev:24278]
-
- * array.c (rb_ary_delete): ditto. [ruby-dev:24283]
-
- * array.c (rb_ary_rindex): ditto. [ruby-dev:24275]
-
- * array.c (rb_ary_initialize): element size might change during
- initializing block. [ruby-dev:24284]
-
-Sat Sep 18 14:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
- the original directory when exception has caused in changing
- 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.
-
- * ext/ripper/depend (parse.obj): lex.c exists at hdrdir.
-
- * {bcc32,win32,wince}/Makefile.sub (YACC, YFLAGS, parse.c):
- use bison.
-
-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]
-
- * ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
- which might return singleton class. [ruby-dev:24202]
-
-Fri Sep 17 16:07:09 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: improve exit operation
-
-Fri Sep 17 15:01:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or
- (thread_)tkwait
-
- * ext/tk/lib/tk.rb: add alias wait_window to wait_destroy
-
- * ext/tk/lib/multi-tk.rb: support calling 'mainloop' on slave
- interpreters (however, the 'real' eventloop must be run on the
- Default Master IP)
-
- * ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb
-
- * ext/tk/sample/remote-ip_sample2.rb: ditto
-
- * ext/tk/sample/tkoptdb-safeTk.rb: ditto
-
-Thu Sep 16 18:12:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
- to request.user attribute.
-
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#initialize): should expand
- the pathname of document root directory.
-
-Thu Sep 16 15:49:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_intern): protect string argument from GC.
- [ruby-core:03411]
-
-Wed Sep 15 20:22:23 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
- of MultiTkIp
-
-Tue Sep 14 23:54:11 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by
- the previous changes.
-
-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
-
- * ext/tk/lib/multi-tk.rb: improve safe-level handling of argument proc
-
- * ext/tk/sample/multi-ip_sample.rb: rename of old 'safe-tk.rb'
-
- * ext/tk/sample/safe-tk.rb: new sample script
-
-Mon Sep 13 21:33:40 2004 GOTOU Yuuzou <gotoyuzo@notwork.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.
-
-Mon Sep 13 19:16:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (blk_copy_prev): need frame_dup(). [ruby-dev:24103]
-
-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>
-
- * 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
-
- * ext/tcltklib/tcltklib.c: store original 'exit' command
-
- * 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>
-
- * util.c (ruby_strdup): remove unnecessary code. (xmalloc never
- returns NULL.)
-
- * util.c (ruby_getcwd): fix memory leak on failure.
-
-Sun Sep 12 02:41:58 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
- allow_ruby_exit=
-
- * ext/tk/lib/multi-tk.rb: ditto.
-
- * ext/tk/lib/remote-tk.rb: ditto.
-
- * ext/tcltklib/MANUAL.euc: ditto.
-
- * ext/tcltklib/MANUAL.eng: ditto.
-
- * ext/tcltklib/tcltklib.c: fix some reasons of SEGV
-
- * ext/tk/tkutil.c: ditto.
-
- * ext/tk/lib/multi-tk.rb: ditto.
-
- * ext/tk/lib/tk/timer.rb: ditto.
-
-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>
-
- * 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
- patch for call-seq.
-
-Thu Sep 9 13:58:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
- 'argv' and 'argv0' variable
-
- * ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
-
-Thu Sep 9 11:46:18 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow
- spaces aroun parameter to define_method_under (James Buck)
-
-Wed Sep 8 18:44:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_write): zero fill a gap if exsts.
- [ruby-dev:24190]
-
-Wed Sep 8 15:19:49 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
-
- * ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
- and error treatment
-
- * ext/tk/lib/multi-tk.rb: allow a trusted slave IP to create slave IPs
-
- * ext/tk/lib/tk/listbox.rb: add TkListbox#value, value=, clear, and
- erase
-
- * ext/tk/lib/tk/text.rb: add TkText#clear and erase
-
-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.
-
- * ext/socket/socket.c (wait_connectable, ruby_connect): support
- nonblocking connect on various platforms.
-
-Mon Sep 6 11:00:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_chdir): the patch to shut up false warning when
- 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.
- [ruby-dev:24223]
-
- * eval.c (rb_load): should preserve previous ruby_wrapper value.
- [ruby-dev:24226]
-
-Sat Sep 4 01:14:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (cvar_cbase): class variables cause SEGV in
- instance_eval() for fixnums and symbols. [ruby-dev:24213]
-
-Fri Sep 3 17:47:58 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (make_struct): remove redefining constant when
- conflict. [ruby-dev:24210]
-
-Fri Sep 3 11:31:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow
- [ruby-dev:24207]
-
-Fri Sep 3 02:12:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266]
-
- * ext/tk/lib/tk/text.rb: fix typo
-
- * ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs
-
-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>
-
- * ext/tk/lib/tk/spinbox.rb: fix typo
-
-Wed Sep 1 19:28:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_proc_exec): label cannot precede variable declarations.
-
-Tue Aug 31 18:20:49 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/tkutil.c (cbsubst_init): fix memory leak
-
- * ext/tk/tkutil.c (cbsubst_get_all_subst_keys): fix SEGV
-
-Tue Aug 31 16:04:22 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_delete): when a tcltkip is deleted,
- destroy its root widget
-
-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
- if it finds the same class in multiple places.
-
-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 15:10:46 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
-
-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]
-
- * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
-
-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>
-
- * lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
- use a session id as a filename.
-
- * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
-
- * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
- Dir::tmpdir.
-
-Tue Aug 24 14:32:17 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
- session id after check.
-
-Tue Aug 24 08:57:51 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.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
-
- * 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>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read):
- - should return an empty string if specified length to read is 0.
- - should check for pending data and wait for fd before reading.
- - call underlying IO's sysread if SSL session is not started.
- [ruby-dev:24072], [ruby-dev:24075]
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_write):
- - call underlying IO's syswrite if SSL session is not started.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_pending): new method
- OpenSSL::SSL#pending.
-
- * ext/openssl/lib/openssl/buffering.rb: should not use select.
-
-Sun Aug 22 01:10:36 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
- should call :ProxyContentHandler before finishing CONNECT.
-
-Sat Aug 21 06:41:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
-
- * 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.
-
- * ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
-
- * ext/tk/lib/menu.rb: typo bug.
-
-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>
-
- * configure.in, win32/Makefile.sub (LIBS): need to link shell32
- library for SH* functions on mswin32 and mingw32.
-
- * wince/Makefile.sub (LIBS): need to link ceshell library for SH*
- functions on mswince.
-
-Thu Aug 19 03:07:00 2004 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
- fixed problem with extra line feeds at end of folding, whitespace
- opening scalar blocks.
-
- * 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>
-
- * lib/net/protocol.rb (rbuf_fill): OpenSSL::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>
-
- * ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
- Tcl_FindExecutable() for Tcl/Tk 8.4.
-
-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
- out by Guy Decoux. [ruby-core:03288]
-
-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 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>
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
- fix regex for range-spec.
-
- * lib/webrick/httpservlet/filehandler.rb
- (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/fileutils.rb: new method FileUtils.copy_entry.
-
- * test/fileutils/test_fileutils.rb: more cp_r tests.
-
-Sun Aug 8 00:43:31 2004 why the lucky stiff <why@ruby-lang.org>
-
- * lib/implicit.c: added sexagecimal float#base60.
-
- * ext/syck/rubyext.c (yaml_org_handler): ditto.
-
- * lib/token.c: indentation absolutely ignored when processing flow
- 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>
-
- * 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
- looking up some top level symbols (batsman)
-
-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>
-
- * 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>
-
- * 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/rubytypes.rb: exceptions were using an older
- YAML.object_maker. [ruby-core:03080]
-
- * ext/syck/token.c (sycklex_yaml_utf8): using newline_len to
- 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]
-
-Fri Jul 30 16:10:54 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (lib_fromUTF8_core): raise ArgumentError when
- the unknown encoding name is given.
-
- * ext/tcltklib/tcltklib.c (lib_toUTF8_core): ditto.
-
- * ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertfrom): bug fix.
-
- * ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertto): ditto.
-
-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>
-
- * eval.c (rb_eval): copy on write for argument local variable
- assignment.
-
- * eval.c (assign): ditto.
-
- * eval.c (rb_call0): update ruby_frame->argv with the default
- value used for the optional arguments.
-
- * object.c (Init_Object): "===" calls rb_obj_equal() directly.
- [ruby-list:39937]
-
-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>
-
- * 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
- outside of a range. No boundary check for "end".
-
-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>
-
- * lib/net/imap.rb (disconnected?): new method.
-
-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.
-
- * lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
- ditto.
-
-Mon Jul 19 00:53:46 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]
-
-Sun Jul 18 16:14:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
- ( wrong number of argument )
-
-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>
-
- * dir.c (bracket): 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.
-
-Sat Jul 17 23:59:01 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (send_string_data): wait command continuation
- requests before sending octet data of literals.
-
-Sat Jul 17 23:54:59 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/variable.rb: TkVariable#ref returns a TkVariable object
-
-Sat Jul 17 22:04:44 2004 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/ldap.rb: method hierarchical? should be in URI::LDAP.
-
-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
- process expression interpolation. [ruby-talk:106691]
-
-Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/diagram.rb: Incorporate Micheal Neumann's
- client-side imagemao patch
-
-Sat Jul 17 01:57:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (THREAD_ALLOC): th->thread should be initialized to NULL.
- [ruby-talk:106657] The solution was found by Guy Decoux.
-
-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 11:17:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
- [ruby-dev:23913]
-
- * error.c (exit_success_p): new method SystemExit#success?.
- [ruby-dev:23912]
-
- * error.c (syserr_initialize): initialization for subclasses.
- [ruby-dev:23912]
-
-Thu Jul 15 23:53:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception
- no longer has to_str method.
-
-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
-
-Thu Jul 15 14:12:34 2004 why the lucky stiff <why@ruby-lang.org>
-
- * 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.
-
-Thu Jul 15 10:15:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/, ext/tcltklib/: bug fix
-
- * ext/tk/lib/tk.rb: better operation for SIGINT when processing
- callbacks.
- * ext/tk/lib/tk/msgcat.rb: ditto.
- * ext/tk/lib/tk/variable.rb: ditto.
- * ext/tk/lib/tk/timer.rb: ditto.
-
- * ext/tk/lib/tk/validation.rb: add Tk::ValidateConfigure.__def_validcmd
- to define validatecommand methods easier
-
- * ext/tk/lib/tk.rb (_genobj_for_tkwidget): support autoload Tk ext
- classes
-
- * ext/tk/lib/tk/canvas.rb and so on: remove the parent widget type
- check for items (e.g. canvas items; depends on the class) to
- avoid some troubles on Tk extension widget class definition.
-
- * ext/tk/lib/tkextlib/: add Iwidget and TkTable extension support
-
- * 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>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
- argument. [ruby-dev:23891]
-
- * 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>
-
- * 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>
-
- * array.c: rdoc patch. merged patch from Johan Holmberg
- <holmberg@iar.se> [ruby-core:3170]
-
-Tue Jul 13 19:39:12 2004 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/generic.rb (URI::Generic#merge_path):
- "URI('http://www.example.com/foo/..') + './'" should return
- "URI('http://www.example.com/')". [ruby-list:39838]
- "URI('http://www.example.com/') + './foo/bar/..'" should return
- "URI('http://www.example.com/foo/')". [ruby-list:39844]
-
- * test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
-
-Tue Jul 13 15:48:56 2004 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
- extmk mode.
-
- * lib/mkmf.rb (dir_config): Prepend a new library path instead of
- appending so it is tried first.
-
-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>
-
- * 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
- (::Struct) to avoid name crash.
-
-Sat Jul 10 04:21:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: better operation for SIGINT when processing
- callbacks.
- * ext/tk/lib/tk/msgcat.rb: ditto.
- * ext/tk/lib/tk/variable.rb: ditto.
- * ext/tk/lib/tk/timer.rb: ditto.
-
- * ext/tk/lib/tk/validation.rb (__def_validcmd): add a module
- function of Tk::ValidateConfigure to define validatecommand
- methods easier
-
-Fri Jul 9 22:18:59 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]
-
- * numeric.c: rdoc patch.
-
-Fri Jul 9 19:26:39 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::HTTPS#proxy_open): raise ArgumentError to
- notice https is not supported.
-
-Fri Jul 9 14:28:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_raise): accept third argument as well as
- Kernel#raise, and evaluate the arguments to create an exception in
- the caller's context. [ruby-talk:105507]
-
-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
- [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]
-
- * gc.c (Init_stack): use system provided address if possible.
-
-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>
-
- * 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.
-
-Wed Jul 7 00:48:34 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/tk/lib/tkextlib/tktrans.rb,
- ext/tk/lib/tkextlib/treectrl.rb: fix syntax errors.
-
-Tue Jul 6 18:38:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib: improve framework of developping Tcl/Tk extension
- wrappers
-
-Mon Jul 5 23:56:42 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/{trackback,syndication,dublincore,content}.rb: worked
- with ruby 1.6 again.
-
- * test/rss/rss-assertions.rb: ditto.
-
-Mon Jul 5 22:54:39 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/uri/common.rb (Kernel#URI): new global method for parsing URIs.
-
-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>
-
- * 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)
- [ruby-dev:23860]
-
-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>
-
- * added files:
- * lib/soap/header/*
- * lib/soap/rpc/httpserver.rb
- * lib/wsdl/soap/cgiStubCreator.rb
- * lib/wsdl/soap/classDefCreator.rb
- * lib/wsdl/soap/classDefCreatorSupport.rb
- * lib/wsdl/soap/clientSkeltonCreator.rb
- * lib/wsdl/soap/driverCreator.rb
- * lib/wsdl/soap/mappingRegistryCreator.rb
- * lib/wsdl/soap/methodDefCreator.rb
- * lib/wsdl/soap/servantSkeltonCreator.rb
- * lib/wsdl/soap/standaloneServerStubCreator.rb
- * lib/wsdl/xmlSchema/enumeration.rb
- * lib/wsdl/xmlSchema/simpleRestriction.rb
- * lib/wsdl/xmlSchema/simpleType.rb
- * lib/xsd/codegen/*
- * lib/xsd/codegen.rb
- * 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/*
- * test/wsdl/multiplefault.wsdl
- * test/wsdl/simpletype/*
- * test/wsdl/test_multiplefault.rb
-
- * modified files:
- * lib/soap/baseData.rb
- * lib/soap/element.rb
- * lib/soap/generator.rb
- * lib/soap/netHttpClient.rb
- * lib/soap/parser.rb
- * lib/soap/property.rb
- * lib/soap/soap.rb
- * lib/soap/streamHandler.rb
- * lib/soap/wsdlDriver.rb
- * lib/soap/encodingstyle/handler.rb
- * lib/soap/encodingstyle/literalHandler.rb
- * lib/soap/encodingstyle/soapHandler.rb
- * lib/soap/mapping/factory.rb
- * lib/soap/mapping/mapping.rb
- * lib/soap/mapping/registry.rb
- * lib/soap/mapping/rubytypeFactory.rb
- * lib/soap/mapping/wsdlRegistry.rb
- * lib/soap/rpc/cgistub.rb
- * lib/soap/rpc/driver.rb
- * lib/soap/rpc/proxy.rb
- * lib/soap/rpc/router.rb
- * lib/soap/rpc/soaplet.rb
- * lib/soap/rpc/standaloneServer.rb
- * lib/wsdl/data.rb
- * lib/wsdl/definitions.rb
- * lib/wsdl/operation.rb
- * lib/wsdl/parser.rb
- * lib/wsdl/soap/definitions.rb
- * lib/wsdl/xmlSchema/complexContent.rb
- * lib/wsdl/xmlSchema/complexType.rb
- * lib/wsdl/xmlSchema/data.rb
- * lib/wsdl/xmlSchema/parser.rb
- * lib/wsdl/xmlSchema/schema.rb
- * lib/xsd/datatypes.rb
- * lib/xsd/qname.rb
- * sample/soap/sampleStruct/server.rb
- * sample/wsdl/amazon/AmazonSearch.rb
- * sample/wsdl/amazon/AmazonSearchDriver.rb
- * test/soap/test_property.rb
- * test/soap/calc/test_calc_cgi.rb
- * test/wsdl/test_emptycomplextype.rb
-
- * summary
- * add SOAP Header mustUnderstand support.
-
- * add HTTP client SSL configuration and Cookies support (works
- completely with http-access2).
-
- * add header handler for handling sending/receiving SOAP Header.
-
- * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
- Model. it caused error.
-
- * add WSDL simpleType support to restrict lexical value space.
-
-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>
-
- * ext/tk/lib/tcltklib: bug fix
-
- * ext/tk/lib/tk: bug fix and add Tcl/Tk extension support libraries
-
-Thu Jul 1 18:31:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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>
-
- * 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_set_key_length): new method
- OpenSSL::Cipher::Cipher#key_len=.
-
-Wed Jun 30 19:48:09 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,
- EVP_DigestFinal_ex and EVP_DigestInit_ex.
-
- * ext/openssl/openssl_missing.c (EVP_CIPHER_CTX_copy): new function.
-
- * ext/openssl/openssl_missing.h (EVP_DigestInit_ex, EVP_DigestFinal_ex,
- EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
- OpenSSL 0.9.6.
-
- * 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.
- 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 (Init_ossl_cipher): Cipher#<< is deprecated.
-
- * ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
- EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
- and EVP_MD_CTX_init should only be called once.
-
- * ext/openssl/ossl_digest.c (digest_final): should call
- EVP_MD_CTX_cleanup to avoid memory leak.
-
- * ext/openssl/ossl_hmac.c (ossl_hmac_initialize): repalce HMAC_init
- into HMAC_init_ex. and HMAC_CTX_init is moved to ossl_hmac_alloc.
-
- * ext/openssl/ossl_hmac.c (hmac_final): should call
- HMAC_CTX_cleanup to avoid memory leak.
-
- * 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>
-
- * test/ruby/test_file.rb (test_fnmatch): some tests for File.fnmatch
- are added.
-
-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>
-
- * ext/syck/rubyext.c (syck_emitter_new): set buffer after
- Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
-
-Tue Jun 29 10:31:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
-
- * gc.c (define_final, run_final): preserve and restore safe level for
- finalizers. [ruby-core:03058]
-
- * signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
- safe level for signal handlers. [ruby-dev:23829]
-
-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>
-
- * sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
-
-Sun Jun 27 22:36:47 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>
-
- * variable.c (rb_mod_class_variables): class variables are no longer
- inherited. [ruby-dev:23808]
-
-Sat Jun 26 11:07:20 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]
-
-Sat Jun 26 00:13:08 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]
-
-Fri Jun 25 18:07:15 2004 Michal Rokos <michal@ruby-lang.org>
-
- * gc.c: bring back _stklen for DJGPP [ruby-core:3084]
-
-Fri Jun 25 15:33:01 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/extconf.rb: check stricter. [ruby-talk:104501]
-
-Fri Jun 25 01:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
- including version.h. [ruby-talk:104456]
-
-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>
-
- * version.h: added declarations of ruby_version,
- ruby_release_date, ruby_platform.
-
-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>
-
- * 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>
-
- * 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-
- dLibraries().
-
- * ext/win32ole/win32ole.c (ole_event_free): ditto.
-
- * 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 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.
-
-Sun Jun 20 21:12:54 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (binary=): send TYPE commands only once.
-
-Sat Jun 19 13:27:01 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
- safe level.
-
-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]
-
- * 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]
-
-Wed Jun 16 16:01:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (stack_grow_direction): memoize the direction.
-
- * gc.c (Init_stack): should always move to end of VALUE.
-
-Tue Jun 15 12:10:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
-
-Mon Jun 14 18:23:27 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/remote-tk.rb: bug fix
-
-Sun Jun 13 00:23:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
-
- * ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
- eliminate warning about instance variable access
-
- * ext/tk/lib/tk/menubar.rb: improve supported menu_spec
-
- * ext/tk/lib/tk/menuspec.rb: [add] menu_spec support library
-
- * ext/tk/lib/tk/root.rb: add menu_spec support
-
- * ext/tk/lib/tk/text.rb: bug fix
-
- * ext/tk/lib/tk/toplevel.rb: add menu_spec support
-
- * 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.
-
- * hash.c: ditto.
-
- * ext/dbm/dbm.c: remove #indexes, #indices, "values_at" warning
- from #select.
-
- * ext/gdbm/gdbm.c: ditto.
-
- * ext/sdbm/init.c: ditto.
-
- * ext/dbm/dbm.c (Init_dbm): set VERSION constant as "unknown" when
- DB_VERSION_STRING is not available.
-
-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>
-
- * lib/uri/generic.rb (URI::Generic::merge,
- URI::Generic::route_from): accepts non-hierarchical URI.
- [ruby-dev:23631]
-
- * 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>
-
- * 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.
-
-Wed Jun 2 20:16:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (str_new4): should share shared instance if it already
- exists. [ruby-dev:23665]
-
-Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_gets_m): set lastline ($_) even when read line is
- nil. [ruby-dev:23663]
-
-Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): bad influence on frame node.
-
- * eval.c (eval): reverted wrongly removed condition. [ruby-dev:23638]
-
-Thu May 27 21:37:50 2004 Tanaka Akira <akr@m17n.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>
-
- * io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
-
-Thu May 27 15:54:02 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
- Thanks, Rutger Nijlunsing.
-
-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]
-
- * io.c (rb_io_fwrite): should check if errno == ENOENT, too.
-
-Thu May 27 11:25:03 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/csv/test_csv.rb: illegal require module name (../lib/csv.rb).
-
-Wed May 26 23:12:13 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * 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']]
-
- * test/csv/test_csv.rb: follow above changes.
-
-Wed May 26 14:19:42 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval, eval): make line number consistent on eval with
- Proc. [ruby-talk:101253]
-
-Wed May 26 13:59:17 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for
- 'do' after for statement
-
-Wed May 26 13:56:03 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb (Generators::MarkUp::style_url): Fix
- relative path to code CSS file
-
-Wed May 26 13:14:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_init_copy): copy also positions. [ruby-talk:100910]
-
-Wed May 26 00:00:00 2004 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/syck.c (syck_new_parser): clear parser on init.
- thanks, ts. [ruby-core:02931]
-
- * ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
- thanks, ts. [ruby-core:02929]
-
- * 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.
-
-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>
-
- * MANIFEST: add test/openssl/test_x509store.rb.
-
- * ext/tk/MANIFEST: add recent files.
-
-Sat May 22 05:37:11 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
- on the other processes by Tcl/Tk's 'send' command
-
-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]
-
- * lib/mkmf.rb (create_header): macro name should not include equal
- sign.
-
-Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c: check SCM_RIGHTS macro addition to
- the msg_control field to test existence of file descriptor passing
- by msg_control.
-
-Thu May 20 12:38:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_eq): always check if operands are NaN.
- [ruby-list:39685]
-
-Thu May 20 12:34:39 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
- At Ryan Davis' suggestion, honor visibility modifers if guarded by a
- statement modifier
-
-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]
-
-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>
-
- * 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>
-
- * numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
- instead of "0.0e+00". [ruby-dev:23480]
-
- * numeric.c (flo_to_s): it's preferable that "p 0.00000000000000000001"
- outputs "1.0e-20" instead of "9.999999999999999e-21". (the precision
- is considered, but there is assumption DBL_DIG == 15 in current
- implementation)
-
-Mon May 17 10:13:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (setup_domain_and_type): honor duck typing.
- [ruby-dev:23522]
-
- * ext/socket/socket.c (sock_s_getnameinfo): ditto.
-
-Mon May 17 00:36:21 2004 why the lucky stiff <why@ruby-lang.org>
-
- * 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
- single-, or double-quoted.
-
- * ext/syck/syck.c: ditto.
-
- * ext/syck/gram.c: ditto.
-
- * ext/syck/node.c: ditto.
-
- * ext/syck/token.c: ditto.
-
- * ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
- if scalar style is plain.
-
- * test/yaml/test_yaml.rb (test_perl_regexp): updated test to
- match new regexp serialization.
-
-Sat May 15 01:41:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): forgot to restore $SAFE value before evaluating
- compiled node. [ruby-core:02872]
-
-Sat May 15 01:33:12 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_each_func): terminates loop if generating value
- is same to @end. [ruby-talk:100269]
-
-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>
-
- * 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>
-
- * util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
- [ruby-dev:23498]
-
-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>
-
- * ext/syck/rubyext.c (yaml_org_handler): some empty strings were
- loaded as symbols.
-
-Thu May 13 11:04:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * pack.c (pack_pack): always add with null for 'Z'.
-
- * pack.c (pack_unpack): terminated by null for 'Z'. [ruby-talk:98281]
-
-Wed May 12 19:59:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
- [ruby-talk:99788]
-
-Wed May 12 17:41:42 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb (Resolv::DNS::Config): make it configurable without
- external file such as /etc/resolv.conf.
-
-Wed May 12 14:37:27 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509name.c: attribute value of DC (short name of
- domainComponent) should be IA5String.
-
-Wed May 12 13:20:19 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/composite.rb: improve configure methods (based on
- the proposal of [ruby-talk:99671]).
-
-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
- looking up symbols in HTML generator.
-
-Mon May 10 16:45:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): warning during eval should not cause deadlock.
- [ruby-talk:98651]
-
- * eval.c (rb_eval): raise TypeError exception for superclass
- mismatch. [ruby-list:39567]
-
-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
-
- * 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>
-
- * 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>
-
- * 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>
-
- * ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
- hostname.
-
-Thu May 6 22:09:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
-
-Thu May 6 14:22:29 2004 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
- for Ranges, Strings, Structs, Regexps.
-
- * lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
- String's flow style.
-
- * lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
-
- * 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.
-
- * lib/net/imap.rb (body_type_basic): allow body-fields omissions.
-
-Thu May 6 01:59:04 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
- 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>
-
- * lib/rinda/ring.rb: use recv instead of recvfrom.
-
-Wed May 5 00:38:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/gserver.rb: documented
- * lib/xmlrpc/README.txt: introduced for documentation purposes
-
-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
-
-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>
-
- * common.mk: LIBURUBY_A is needed for extconf.rb even when
- cross-compiling.
-
-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>
-
- * lib/yaml/rubytypes.rb: passing Range tests.
-
- * ext/syck/syck.h: version 0.44.
-
- * ext/syck/gram.c: transfers no longer open an indentation.
- fixed transfers which precede blocks.
-
- * ext/syck/token.c: ditto.
-
- * ext/syck/syck.c: fixed segfault if an anchor has been released already.
-
- * ext/syck/node.c (syck_free_members): organized order of free'd nodes.
-
- * ext/syck/rubyext.c (syck_emitter_write_m): test for proper string with
- StringValue.
-
-Mon Apr 26 23:56:54 2004 Daniel Kelley <news-1082945587@dkelley.gmp.san-jose.ca.us>
-
- * README.EXT, README.EXT.ja: fixed wrong function signature.
- [ruby-talk:98349]
-
-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>
-
- * 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.
-
-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>
-
- * parse.y (stmt, arg, aref_args): should not make sole splat into
- array, in aref_args other than aref with op_asgn.
-
-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]
-
- * parse.y (aref_args): should pass expanded list. [ruby-core:02793]
-
-Thu Apr 22 01:12:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_to_s): tweak output string based to preserve
- decimal point and to remove trailing zeros. [ruby-talk:97891]
-
- * 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>
-
- * lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
-
-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
- of key-value set. [ruby-talk:97559]
-
- * 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>
-
- * 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.
-
-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 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>
-
- * 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>
-
- * 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 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>
-
- * 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>
-
- * 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>
-
- * bcc32/Makefile.sub (PHONY): Borland make disallows empty command
- rules.
-
-Tue Apr 13 17:55:16 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (begin_transport): should not overwrite HTTP
- request header. [ruby-list:39543]
-
-Tue Apr 13 16:48:00 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: merge POP3S patch. This patch is contributed by
- Daniel Hobe.
-
-Tue Apr 13 02:56:29 2004 Kazuo Saito <ksaito@uranus.dti.ne.jp>
-
- * common.mk: changed the order of ascii.c alphabetically.
-
-Mon Apr 12 19:11:21 2004 Eric Hodel <drbrain@segment7.net>
-
- * gc.c (rb_gc_copy_finalizer): typo. [ruby-core:02774]
-
-Mon Apr 12 18:45:58 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
- a value.
-
-Mon Apr 12 10:39:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (rb_glob2, rb_glob, push_globs, push_braces, rb_push_glob):
- fix memory leak. (leaked when block was interrupted)
-
-Sun Apr 11 19:10:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (require_libraries): restore source file/line after
- statically linked extensions initialized. [ruby-dev:23357]
-
-Sun Apr 11 10:47:04 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
- classes and modules are a special case too... (handle extending existing
- classes with or without :enddoc:)
-
-Sat Apr 10 23:51:13 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
- made one too many assumptions...
-
-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>
-
- * lib/rinda/rinda.rb: fix hash tuple bug.
-
- * lib/rinda/tuplespace.rb: ditto.
-
- * test/rinda/test_rinda.rb
-
-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>
-
- * configure.in: check the size of time_t.
-
- * time.c (time_add): new function.
- (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.
-
- * 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>
-
- * 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>
-
- * regparse.c, oniguruma.h: imported Oni Guruma 2.2.6.
-
-Mon Apr 5 12:12:09 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (raise_socket_error): some platforms don't have
- EAI_SYSTEM.
-
-Mon Apr 5 08:18:23 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
- references work properly.
-
-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
-
-Sat Apr 3 09:36:38 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]
-
- * 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>
-
- * bcc32/Makefile.sub (OUTFLAG): needed for static-linked-ext.
-
-Fri Apr 2 18:00:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): extract necessary variables for static link
- from Makefile.
-
- * lib/mkmf.rb (create_makefile): save preload and libpath for next
- compile.
-
-Fri Apr 2 17:27:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (top_include): include in the wrapped load is done for
- the wrapper, not for a singleton class for wrapped main.
- [ruby-dev:23305]
-
-Fri Apr 2 15:13:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_eq): use temporary double variable to save the
- result (internal float register may be bigger than 64 bits, for
- example, 80 bits on x86). [ruby-dev:23311]
-
-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>.
-
-Thu Apr 1 22:55:33 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb: Allow rdoc comments in
- =begin rdoc/=end
-
- * lib/rdoc/parsers/parse_rb.rb: Fix problem with comment in
- top-level method being taken as file comment.
-
-Thu Apr 1 22:55:04 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
-
-Thu Apr 1 19:58:37 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
- object with soap/marshal.
- added URIFactory class for URI mapping. BasetypeFactory checks
- instance_variables when original mapping is not allowed (ivar must
- be empty). Instance of URI have instance_variables but it must be
- llowed whenever original mapping is allowed or not.
-
-Wed Mar 31 19:06:23 2004 Tanaka Akira <akr@m17n.org>
-
- * time.c (year_leap_p): new function.
- (timegm_noleapsecond): ditto.
- (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>
-
- * lib/delegate.rb (DelegateClass): define internal methods of the
- result class, but not metaclass of the caller. [ruby-talk:96156]
-
- * intern.h: provide proper prototypes. [ruby-core:02724]
-
- * 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>
-
- * lib/net/pop.rb (auth): failed when account/password include "%".
- [ruby-talk:95933]
-
-Sat Mar 27 21:40:41 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: permit extra semicolon in content-type field.
-
-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.
-
- * sample/openssl/gen_csr.rb: fixed wrong usage text.
-
-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,
- which dumps our all known names
-
-Thu Mar 25 03:57:47 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
- allow nested classes to be designated using "."--you must
- now use "::"
-
-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>
-
- * lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
- * lib/uri/common.rb: Ditto.
- * lib/uri/ftp.rb: Ditto.
- * lib/uri/generic.rb: Ditto.
- * lib/uri/http.rb: Ditto.
- * lib/uri/https.rb: Ditto.
- * lib/uri/ldap.rb: Ditto.
- * lib/uri/mailto.rb: Ditto.
-
-Wed Mar 24 18:48:05 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.
-
-Wed Mar 24 12:32:56 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_class_module):
- Don't document methods if we don't know for sure the
- class or module.
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
- Don't store documentation for singleton classes if we
- don't know the real class.
-
-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.
-
- * 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.
-
-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.
-
-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.
-
-Sat Mar 20 23:51:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (rb_require_safe): preserve old ruby_errinfo.
- [ruby-talk:95409]
-
- * 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>
-
- * 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 18:50:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb: no longer embed srcdir and compile_dir into
- rbconfig.rb.
-
- * ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
- paths.
-
-Thu Mar 18 17:46:35 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: do not undef :to_a.
-
-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.
-
-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.
-
-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.
-
- * ruby.c (ruby_init_loadpath): buffer for path name should have
- MAXPATHLEN.
-
- * 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]
-
-Wed Mar 10 22:26:25 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]
-
-Wed Mar 10 16:28:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (return_jump): set return value to the return
- destination. separated from localjump_destination().
-
- * eval.c (break_jump): break innermost loop (or thread or proc).
-
- * 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-ruby@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>
-
- * 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>
-
- * dir.c (range): treat incomplete '[' as ordinary character (like
- has_magic does). fix buffer overrun at incomplete escape like '[\'.
-
-Mon Mar 8 13:35:32 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * regparse.c (parse_exp): need to separate initialization for bcc32.
- [ruby-dev:23169]
-
- * 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.
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use
- :RequestCallback and warn if :RequestHandler is in server's option.
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print
- error message for WEBrick::HTTPSataus::Error.
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
- lookup for hostname from :ServerAlias if the req.host is not match
- to :ServerName.
-
- * lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
- use $?.exitstatus and refine log message.
-
-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>
-
- * 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
- 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>
-
- * 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):
- Allow aliases to have parentheses
-
-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>
-
- * 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>
-
- * 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>
-
- * 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>
-
- * lib/cgi-lib.rb, lib/getopts.rb, lib/importenv.rb, lib/parsearg.rb:
- warn with caller position.
-
- * 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.
-
-Tue Feb 24 18:42:03 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
- heuristics on which files to include and exclude. Now only include
- non-standard files if they are explicitly named in ARGV.
-
-Tue Feb 24 07:23:30 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb: Deal with :stopdoc: when
- choosing a default main page to display (ie. don't select a page
- if we don't have documentation for it).
-
-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
- aliases in C files.
-
-Tue Feb 24 06:16:22 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
- parsing files.
-
-Tue Feb 24 06:08:47 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
- Start collecting text of constant values earlier: was missing
- values in output if there was no space after '='
-
-Tue Feb 24 06:08:25 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb: Escape contant values.
-
-Tue Feb 24 03:45:06 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_config.c (ossl_config_each): add new method
- OpenSSL::Config#each. it iterates with section name, field name
- and value.
-
- * 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.
-
- * 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]
-
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: terminate options.
-
- * 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>
-
- * re.c: corrected documentation format (rb_reg_initialize_m)
-
-Sat Feb 21 22:41: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>
-
- * 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>
-
- * lib/ostruct.rb: documented
-
-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>
-
- * 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)
-
-Thu Feb 19 18:08:18 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 02:37:28 2004 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: merge documentation from 1.8 branch.
- Thanks Gavin Sinclair.
-
-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
-
-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>
-
- * lib/drb/unix.rb: remove O_NONBLOCk, thanks \ay
-
-Wed Feb 18 22:42:19 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_rinda.rb: improt test_rinda.rb
-
-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.
-
-Tue Feb 17 23:40:34 2004 Guy Decoux <ts@moulon.inra.fr>
-
- * sprintf.c (rb_f_sprintf): preserve original val for
- format_integer. [ruby-talk:92975]
-
-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.
-
- * test/soap/marshal/test_marshal.rb: ditto.
-
- * 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.
-
- * ext/strscan/strscan.c: #empty? is obsolete, use #eos?.
-
- * ext/strscan/strscan.c: #clear is obsolete, use #terminate.
-
- * ext/strscan/strscan.c: #getbyte is obsolete, use #get_byte.
-
-Tue Feb 17 12:12:47 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (parse_args): delay expanding $(extout) until invoking
- make.
-
- * lib/mkmf.rb (CLEANLIBS): should remove files have specific
- extensions.
-
-Tue Feb 17 11:33:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rss/rexmlparser.rb: REXML version may be 4 digits.
-
-Tue Feb 17 10:45:59 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
-
-Tue Feb 17 07:48:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rexml/encodings/SHIFT_JIS: wrong library name.
-
-Tue Feb 17 01:35:28 2004 Tanaka Akira <akr@m17n.org>
-
- * 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.
-
-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>
-
- * 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>
-
- * 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.
-
- * lib/mkmf.rb (create_makefile): now don't need to remove
- $(TARGET).lib.
-
-Mon Feb 16 15:45:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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>
-
- * 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>
-
- * 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.
-
- * 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>
-
- * 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>
-
- * sample/drb/*: import lib/drb/sample
-
-Sat Feb 14 11:14:12 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.
-
- * lib/rss/parser.rb, lib/rss/rss.rb: replaced $DEBUG by RSS::DEBUG.
-
- * 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>
-
- * 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>
-
- * lib/net/protocol.rb (WriteAdapater#puts): must append "\n" to
- the string, don't prepend. (ruby-bugs:PR#1280)
-
-Thu Feb 12 20:31:43 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.
-
- * lib/pp.rb: ditto.
-
- * lib/time.rb: ditto.
-
- * 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>
-
- * 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/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
- added tests. [ruby-core:02306] [ruby-core:02311]
-
-Sun Feb 8 14:24:35 2004 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTP#request): should not overwrite Connection
- header. (ruby-bugs:PR#1274)
-
-Sun Feb 8 10:11:21 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (glob_helper): Dir.glob('**/') did not work. [ruby-dev:22832]
-
-Sun Feb 8 00:29:26 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
- [ruby-dev:22815]
-
- * dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
- [ruby-dev:22819]
-
- * dir.c: Did some styles (no change to behavior)
-
-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]
-
-Fri Feb 6 22:48:16 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb (gen_url): Support
- https in RDoc hyperlinks
-
-Fri Feb 6 22:41:22 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
- commit. [ruby-dev:22813]
-
-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.
-
-Thu Feb 5 23:56:55 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/prettyprint.rb (PrettyPrint#seplist): added.
-
- * lib/pp.rb (PPMethods#pp_object): use seplist.
- (PPMethods#pp_hash): ditto.
- (Array#pretty_print): ditto.
- (Struct#pretty_print): ditto.
- (MatchData#pretty_print): ditto.
-
- * 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.
- (test_S): ditto.
- (test_b): ditto.
- (test_c): ditto.
- (test_suid): ditto.
- (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>
-
- * parse.y (block_append, new_evstr, void_expr0): remove no longer used
- labels.
-
-Mon Feb 2 18:45:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dln.c (dln_load): don't specify RTLD_GLOBAL on Interix,
- because it caused SEGV when running runner.rb.
-
-Mon Feb 2 01:54:00 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (Struct#pretty_print): make it 1.8 style.
- (Numeric#pretty_print, FalseClass#pretty_print)
- (TrueClass#pretty_print, Module#pretty_print): fix pp for objects
- with instance variables. [ruby-talk:91157]
-
- * lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
- address.
-
- * lib/resolv-replace.rb (BasicSocket#send): don't replace because
- it has no hostname argument.
- (IPSocket.getaddress): raise SocketError instead of
- Resolv::ResolvError for errors.
- (TCPSocket#initialize, UDPSocket#bind, UDPSocket#connect)
- (SOCKSSocket#initialize): use IPSocket.getaddress instead of
- Resolv.getaddress.
- (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>
-
- * ext/bigdecimal.c: Bug in BigDecimal("1e#{n}").add BigDecimal('.5'),n)
- reported and fixed by Javier Goizueta.
-
-Sun Feb 1 18:21: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.
-
-Sun Feb 1 05:30:06 2004 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
- 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 02:28:15 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RPATHFLAG): set to -Wl,-R like NetBSD on Interix.
-
-Sat Jan 31 01:09:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: leading 0 padding of timestamp usec part.
-
-Fri Jan 30 18:53:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (KR_REHASH): wrong hash value on sizeof(long) > sizeof(int).
-
-Thu Jan 29 23:11:57 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (DLEXT2): removed. Ruby does not treat
- ".dll" as a extension library anymore.
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub (DLEXT2):
- ditto.
-
- * util.c (mblen): fix overrun. [ruby-dev:22672]
-
-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.
-
- * 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>
-
- * test/rss/*.rb: remove "test/" prefix.
-
-Wed Jan 28 13:07:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]
-
-Wed Jan 28 12:43:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rss: rss library imported. [ruby-dev:22726]
-
-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>
-
- * 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>
-
- * ext/win32ole/win32ole.c (set_argv): fix condition.
-
-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.
-
-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>
-
- * lib/weakref.rb (WeakRef::initialize): set up @__id before
- calling "super".
-
- * lib/delegate.rb (Delegator::initialize): preserve
- singleton_method_added method [ruby-dev:22685]
-
- * 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>
-
- * ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
-
-Mon Jan 26 11:30:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
- (ruby-bugs:PR#1256)
-
- * 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>
-
- * 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>
-
- * lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
- * lib/drb/extserv.rb: typo
-
-Wed Jan 21 17:57:56 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (envelope): allow NIL.
- * lib/net/imap.rb (body): ditto.
- * lib/net/imap.rb (number): ditto.
- * 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>
-
- * 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>
-
- * 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>
-
- * ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
- of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
-
-Tue Jan 20 14:43:17 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/base64.rb: Add RDoc
-
-Tue Jan 20 14:25:51 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/abbrev.rb: Add RDoc
-
-Tue Jan 20 13:22:39 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb: Document aliases at
- top-most level.
-
- * 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.
-
- * eval.c (rb_method_missing): use hidden constant.
-
-Mon Jan 19 16:30:53 2004 akira yamada <akira@ruby-lang.org>
-
- * test/ruby/test_time.rb: added tests for [ruby-dev:22614] and
- [ruby-dev:22617].
-
-Mon Jan 19 13:09:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/extmk.rb, win32/Makefile.sub, win32/configure.bat,
- win32/setup.mak: --with-static-linked-ext support on mswin32.
-
-Mon Jan 19 06:49:07 2004 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: zone was wrong when it was behind UTC.
- Thanks Mark J. Reed.
-
- * lib/date/format.rb: %z is now always replaced by four digits
- with a leading plus or minus sign.
-
- * 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.
-
-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>
-
- * 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>
-
- * 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>
-
- * 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]
-
- * ruby.h (rb_class_of): reduce branch. [ruby-dev:22577]
-
- * ruby.h (rb_type): ditto.
-
-Tue Jan 13 14:26:59 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>
-
- * 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):
- Someone changed the "// in eval.c" comments to "/*...*/" style,
- so the parsing of the source file name broke.
-
- * object.c: Remove spurious space in TrueClass documentation.
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Fix
- bad regexp: if the code before a documented method contained
- a comment that wasn't terminated by whitespace, that comment
- and all intervening code was included in the following
- method's documentation.
-
- * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
- HTML formats need explicit line breaks.
-
-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]
-
-Sun Jan 11 02:35:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (make_hostent): a bug in brace position.
-
- * configure.in: install rdoc by default. if you do not want to
- install rdoc, specify --disable-install-doc.
-
-Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
- Also accept command line options via the 'RI' environment variable.
-
-Sat Jan 10 21:27:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): need to add message delimiter. [ruby-dev:22561]
-
-Sat Jan 10 01:54:50 2004 Eric Sunshine <sunshine@sunshineco.com>
-
- * defines.h (__NeXT__): Ensure that all standard S_IRUSR, S_IWGRP,
- S_IRWXO, etc. macros are defined since future code might require
- them (even though present code only requires a subset).
-
- * defines.h (__NeXT__): Bug fix: WORDS_BIGENDIAN was not being set
- 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>
-
- * lib/mkmf.rb (libpathflag): use single quotes. [ruby-dev:22440]
-
-Thu Jan 8 23:49:21 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RDOCTARGET): new macro. if you want to install
- rdoc documentation, you need to run configure with
- --enable-install-doc.
-
-Thu Jan 8 21:17:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
- public key only.
-
- * ext/openssl/ossl_pkey_dh.c (ossl_dh_to_der): new function for
- OpenSSL::PKey::DH#to_der.
-
- * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_to_der): new function for
- OpenSSL::PKey::DSA#to_der.
-
- * 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
- dumps "E" at month-end.
-
-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>
-
- * 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
- being too eager to find matches of ambiguous method
- names (such as "ri Thread.join" would return both
- Thread.join and ThreadsWait.join)
-
-Wed Jan 7 12:35:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/debug.rb: revert command parse regexps. [ruby-list:39014] by
- Shirai,Kaoru.
-
-Wed Jan 7 08:21:04 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parserfactory.rb: Check for shebang
- line in files that would otherwise be treated as
- plain text.
-
-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>
-
- * 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
-
- * lib/.document: Update with list of files that seem to have
- documentation
-
- * lib/test/unit.rb: Reorder comment to make it RDoc friendly.
-
- * Makefile.in: add install-nodoc target, and make it
- generate RDoc on default install.
-
- * lib/rdoc/ri/ri_options.rb (RI::Options::parse): Add
- --doc-dir option to ri.
-
-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
- help messages to be paged too.
-
- * bin/rdoc: Add statistics.
-
- * process.c: (MG) Added Process documentation
-
- * lib/rdoc/ri/ri_formatter.rb (RI::AttributeFormatter::wrap):
- Fix problem with labels not displaying in RI labeled
- lists using BS and ANSI modes.
-
-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
- file referenced in "// in sss.c" relative to current file.
-
-Wed Dec 31 11:17:37 2003 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/generators/html_generator.rb: Fix problem when
- a public method was aliased, but the alias is then
- made private, and hence doesn't appear in RDoc output.
-
-Wed Dec 31 01:33:05 2003 Dave Thomas <dave@pragprog.com>
-
- * array.c, error.c, eval.c, io.c, prec.c, range.c, re.c,
- string.c, time.c: Add RDoc for Kernel functions, and tidy.
-
-Tue Dec 30 19:39:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_readline): should raise EOFError at the end of
- files. [ruby-dev:22458]
-
- * io.c (argf_read): should concatenate input files when length
- argument is nil. [ruby-dev:22450]
-
- * io.c (argf_read): should update supplied string buffer (2nd
- argument) even when IO#read is called multiple times.
-
- * io.c: should initialize lineno by zero. [ruby-dev:22460]
-
-Tue Dec 30 12:30:30 2003 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a
- class and a method have the same name, finding Xxx.abc was trying
- to find 'abc' in method 'Xxx', not class 'Xxx'.
-
-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
-
-Tue Dec 30 07:30:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/pathname.rb: Added documentation.
-
-Mon Dec 29 20:08:17 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (GenericRequest#initialize): check if path
- begins with '/'.
-
- * lib/net/http.rb: def m( arg ) -> def m(arg)
-
-Mon Dec 29 12:51:02 2003 Dave Thomas <dave@pragprog.com>
-
- * eval.c: Add RDoc for Kernel global functions.
-
-Mon Dec 29 11:00:16 2003 Dave Thomas <dave@pragprog.com>
-
- * array.c: Tidy up RDoc loose ends.
-
-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
-
-Sun Dec 28 20:19:11 2003 Tanaka Akira <akr@m17n.org>
-
- * ext/stringio/stringio.c (strio_sysread): StringIO.new.sysread didn't
- raise EOFError.
-
- * ext/zlib/zlib.c (gzreader_gets): don't increment lineno when
- gzfile_read_all returns "".
-
-Sun Dec 28 15:25:08 2003 Dave Thomas <dave@pragprog.com>
-
- * class.c,object.c,parse.y,sprintf.c,variable.c: Document classes
- Object, Module, etc...
-
-Sun Dec 28 11:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
- [ruby-talk:88852]
-
- * test/csv/{bom.csv,mac.csv}: removed.
-
-Sun Dec 28 08:56:51 2003 Dave Thomas <dave@pragprog.com>
-
- * eval.c: Thead[Group] RDoc (thanks to MG)
-
-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>
-
- * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
- Add support for rules in 'ri' output.
-
-Sun Dec 28 01:35:35 2003 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body):
- Sometimes the Ruby source aliases two otherwise
- unrelated methods (for example Kernel#object_id and
- Kernel#hash are both the same C function). Provide a
- facility to allow the methods to be documented
- separately.
-
-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>
-
- * 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.
-
-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>
-
- * time.c: Add RDoc comments for Time class.
-
-Sat Dec 27 15:07:26 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>
-
- * numeric.c (Init_Numeric): Add RDoc comments.
-
-Sat Dec 27 00:44:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (next_argv): warn always for stdin on inplace edit mode.
-
- * io.c (read_all): need to check string value.
-
- * io.c (argf_read): allow ARGF.read(nil). [ruby-dev:22433]
-
-Fri Dec 26 23:02:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_backquote): need not to check nil result.
- [ruby-core:02078]
-
- * 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>
-
- * configure.in: check if getcontext and setcontext are available.
-
- * eval.c: use presence of getcontext/setcontext.
-
-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>
-
- * 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>
-
- * string.c (rb_str_update): don't return any value.
-
-Thu Dec 25 15:30:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_update): call rb_str_modify().
-
-Thu Dec 25 05:08:09 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (search_required): search actual file name once when no
- extension specified.
-
-Thu Dec 25 04:00:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.8.1 released.
-
-Thu Dec 25 00:17:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: check for nanosleep, -lrt if required.
- [ruby-core:02059]
-
- * eval.c (thread_timer): use select(2) if nanosleep(2) is not
- available.
-
- * eval.c: check __stub_getcontext for glibc on some platforms.
- [ruby-list:38984]
-
-Wed Dec 24 23:48:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * 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"
- to express -0.0. [ruby-talk:88786]
-
-Wed Dec 24 23:29:30 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/tsort.rb (test_orphaned_break): removed.
-
-Wed Dec 24 20:53:06 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tkmulticolumnlist.rb: new sample
-
- * ext/tk/sample/tkmultilistframe.rb: bug fix
-
-Wed Dec 24 20:37:37 2003 Eric Sunshine <sunshine@sunshineco.com>
-
- * configure.in (LDSHARED): Fixed typographical error in assignment of
- LDSHARED for Rhapsody which caused linking of extension modules to
- fail.
-
-Wed Dec 24 17:51:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_thread_flock): enable thread support again.
-
-Wed Dec 24 16:46:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (catch_timer): do not call rb_thread_schedule() inside to
- avoid pthread_mutex_lock() deadlock. interrupts to system calls
- are detected by TRAP_END via EINTR error.
-
- * eval.c (thread_timer): do not post signal unless it is
- absolutely necessary.
-
- * rubysig.h (TRAP_END): add CHECK_INTS to switch thread.
-
- * regex.c (re_compile_pattern): check if nextp is smaller than
- pend. [ruby-dev:22372]
-
- * eval.c (umethod_bind): remove method overridden check.
- [ruby-dev:22366]
-
-Wed Dec 24 16:13:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read): should check for error
- status by SSL_get_error().
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_write): ditto.
-
-Wed Dec 24 14:23:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): clear the buffer argument
- when returning nil. [ruby-dev:22363]
-
- * test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
- add buffer argument tests.
-
-Wed Dec 24 14:07:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: Modules are allowed to rescue.
-
- * lib/test/unit/autorunner.rb: show output_level in order.
-
- * lib/test/unit/collector/dir.rb: get rid of successive same
- directories in load path.
-
- * test/testunit/test_assertions.rb (test_assert_nothing_raised,
- test_assert_raise): test for modules.
-
-Wed Dec 24 13:43:34 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (authenticate): remove "\n" from base64 encoded
- strings.
-
-Wed Dec 24 11:26:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/fileutils/test_fileutils.rb: should not create any
- files or directories in current directory. [ruby-talk:88724]
-
-Wed Dec 24 10:29:53 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): never return nil at
- unlimited read. [ruby-dev:22334]
-
- * ext/stringio/stringio.c (strio_read): support second
- argument. [ruby-dev:22350]
-
-Wed Dec 24 09:38:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (arg): should return 0 after error. [ruby-dev:22360]
-
-Wed Dec 24 00:56:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): do not return nil at the end of file.
- [ruby-dev:22334]
-
- * io.c (argf_read): do not depend on nil at eof behavior of
- IO#read().
-
- * eval.c (rb_thread_join): dup exception before re-raising it.
-
- * io.c (rb_io_eof): call clearerr() to prevent side effect. this
- patch is supplied by Masahiro Sakai <sakai@tom.sfc.keio.ac.jp>.
- [ruby-dev:22234]
-
- * pack.c (OFF16): get offset for big endian machines.
-
- * pack.c (pack_pack): use OFF16 instead of OFF16B.
- [ruby-dev:22344]
-
- * pack.c (pack_unpack): ditto.
-
-Tue Dec 23 22:47:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_check_readable): set FMODE_RBUF always, even if
- NEED_IO_SEEK_BETWEEN_RW is not defined. [ruby-dev:22340]
-
- * io.c (rb_io_check_writable): clear FMODE_RBUF before writing
- something.
-
-Tue Dec 23 22:25:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/optparse.rb: incomplete RDoc documentation added in place of
- existing RD comments. Tabs converted to spaces.
-
-Tue Dec 23 19:44:47 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/test_streamhandler.rb (test_basic_auth): removed.
- soap4r + basic_auth is not officially supported in ruby/1.8.1 even
- though soap4r + basic_auth + http-access2 should run fine.
-
-Tue Dec 23 19:42:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_ungetc): raise an exception at unread stream to
- avoid unspecified behavior. [ruby-dev:22330]
-
- * test/ruby/test_system.rb (test_syntax): glob relatively from
- __FILE__.
-
-Tue Dec 23 18:09:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): remove unnecessary negative value check.
- [ruby-dev:22329]
-
-Tue Dec 23 17:26:55 2003 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
-
-Tue Dec 23 16:08:16 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/rexml/encodings/US-ASCII.rb: typo. [ruby-talk:88650]
-
- * test/ruby/test_system.rb: num of asserts depended on running dir.
-
- * test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
- handle euc-jp. install iconv, uconv or xmlscan.
-
-Tue Dec 23 14:13:51 2003 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/generic.rb (URI::Generic::check_userinfo,
- URI::Generic::check_user, URI::Generic::check_password): tests
- conflicts/depends with other components closely.
-
- * test/uri/test_generic.rb (TestGeneric::test_set_component):
- added tets.
-
-Tue Dec 23 11:08:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/xsd/test_noencoding.rb: rescue Errno::EINVAL and do not test.
- "euc-jp" might not be in supported encoding name list.
- [ruby-talk:88650]
-
-Tue Dec 23 06:10:31 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (CGI): add support for mod_ruby.
-
- * lib/webrick/cgi.rb (CGI::Socket): add check for existence of
- OpenSSL module in all HTTPS related methods.
-
- * lib/webrick/cgi.rb (CGI::Socket#cipher): should create similar
- value to OpenSSL::SSLSocket#cipher.
-
- * lib/webrick/httpresponse.rb (HTTPResponse#setup_header): should
- set "connection: close" if @keep_alive is false.
-
- * lib/webrick/https.rb (HTTPrequest#meta_vars): add supprt for
- SSL_PROTOCOL, SSL_CIPHER_USEKEYSIZE and SSL_CIPHER_ALGKEYSIZE.
-
-Mon Dec 22 23:00:05 2003 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/generic.rb (URI::Generic::check_opaque): fixed typo.
-
-Mon Dec 22 21:59:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (map_charset): always ensure code is a String.
-
-Mon Dec 22 21:15:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (rb_mod_init_copy): always copy singleton class.
- [ruby-dev:22325]
-
-Mon Dec 22 20:44:36 2003 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
- has no host-part.
-
- * test/uri/test_generic.rb (TestGeneric::test_route): added a test.
-
-Mon Dec 22 20:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/cgi.rb: reduce eval.
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): alias path to
- local_path. [ruby-list:38883]
-
-Mon Dec 22 20:09:31 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/test_property.rb: remove duplicated test method.
-
-Mon Dec 22 18:22:04 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub (config.h): remove
- HAVE_ISINF definition to follow previous commits of missing.h
- and win32/win32.h.
-
-Mon Dec 22 17:23:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ac_cv_func_setitimer): moved from defines.h
-
- * defines.h, rubysig.h, signal.c: removed macro handling which
- should be done in configure.
-
- * configure.in (intrinsics.h): check if present.
-
- * ruby.h: include intrinsics.h if available.
-
- * bignum.c, marshal.c: include ieeefp.h if available.
-
- * missing.h (isinf): define as a macro if finite() and isnan()
- are available. [ruby-core:02032]
-
-Mon Dec 22 17:07:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (mingw): set isnan, finite and isinf to yes.
-
-Mon Dec 22 13:40:19 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/property.rb: passing block by reference.
-
-Mon Dec 22 00:32:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_with_disable_interrupt): use ENABLE_INTS instead of
- ALLOW_INTS which may switch context. [ruby-dev:22319]
-
- * ext/syck/emitter.c (syck_emitter_write): str bigger than
- e->bufsize causes buffer overflow. [ruby-dev:22307]
-
-Sun Dec 21 17:29:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * class.c (rb_check_inheritable): new function. [ruby-dev:22316]
-
- * intern.h: add prototype.
-
- * eval.c (superclass): use rb_check_inheritable().
-
- * object.c (rb_class_initialize): check argument validity.
-
-Sun Dec 21 16:25:10 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#+): re-implemented to resolve ".." in
- beginning of the argument.
- (Pathname#join): concatenate from the last argument.
- (Pathname#parent): just use Pathname#+.
-
-Sun Dec 21 00:12:37 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add new methods (TkScrollbar#assign, assign_list)
-
- * ext/tk/sample/tkmultilistframe.rb: use TkScrollbar#assign method
-
-Sat Dec 20 21:59:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): refine regexp.
-
- * lib/webrick/cgi.rb (CGI#start): NPH scripts return status line
- instead of Status: header field.
-
- * lib/webrick/cgi.rb (CGI::Socket): refine some coditions.
-
-Sat Dec 20 16:07:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Completion::complete): wrong
- Regexp for word boundary. pointed out by Gavin Sinclair.
-
- * lib/optparse.rb (OptionParser::make_switch): [no-] prefix was
- missing.
-
-Sat Dec 20 11:40:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/yaml.rb (YAML::YAML): adjust Marshal version.
-
-Sat Dec 20 03:56:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_with_disable_interrupt): prohibit thread context
- switch during proc execution. [ruby-dev:21899]
-
-Sat Dec 20 02:41:02 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb: add file. (yet another CGI library)
-
- * MANIFEST: add lib/webrick/cgi.rb.
-
-Sat Dec 20 02:18:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-calculate-indent): proper indentation
- inside of parentheses. [ruby-dev:22308]
-
-Fri Dec 19 21:24:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): should not set
- HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
-
- * lib/webrick/https.rb (HTTPRequest#parse): should check presence
- of cert() method to detect SSLSocket.
-
-Fri Dec 19 22:56:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/property.rb (SOAP::Property#load): new method for loading
- property value into existing property tree.
-
- * test/soap/test_property.rb: add test.
-
-Fri Dec 19 19:21:49 2003 akira yamada <akira@ruby-lang.org>
-
- * lib/runit/cui/testrunner.rb (RUNIT::CUI::TestRunner::run):
- should use Test::Unit::UI::{PROGRESS_ONLY,VERBOSE}.
-
-Fri Dec 19 17:36:49 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tkmultilistbox.rb: bug fix
-
- * ext/tk/sample/tkmultilistframe.rb: new sample script
-
-Fri Dec 19 03:44:27 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httputils.rb (parse_form_data): should return an
- empty Hash if the body is empty.
-
-Thu Dec 18 21:47:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): should remove deffile if it's
- made by miniruby. based on nobu's patch.
-
-Thu Dec 18 21:44:21 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (stack_extend): ignore inline optimization on VC7.
-
- * win32/Makefile.sub (OS, RT): can override.
-
- * win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
- option. based on Tietew's patch [ruby-dev:22289]
-
-Thu Dec 18 16:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never
- return NULL.
-
-Thu Dec 18 15:27:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
- [ruby-dev:21678]
-
-Wed Dec 17 15:15:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
- String#[] if more than one arguments are specified.
-
- * lib/delegate.rb: avoid using common instance name as "@obj".
-
- * lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
- subclass of String, but DelegateClass(String).
-
- * ext/curses/extconf.rb: restore function check for init_color.
- [ruby-list:38905]
-
- * Makefile.in: need to specify $(MAINLIBS) for the miniruby
- generation rule.
-
- * configure.in: better FreeBSD -lc_r support.
-
-Wed Dec 17 00:16:14 2003 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: new method
- StringScanner#beginning_of_line? (alias #bol?)
-
- * ext/strscan/strscan.c: new method StringScanner#concat and #<<.
-
- * ext/strscan/strscan.c: StringScanner#new(str) does not duplicate
- nor freeze STR (allow destructive modification).
-
- * test/strscan/test_stringscanner.rb: test new methods above.
-
- * test/strscan/test_stringscanner.rb: test destructive string
- modification.
-
-Tue Dec 16 21:20:47 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb: don't use local variable `pp'.
-
- * lib/prettyprint.rb: ditto.
-
-Tue Dec 16 13:20:43 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: condition bug of if statement on
- {pack,grid}_propagate methods
-
-Tue Dec 16 03:17:29 2003 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb: comments in strings. [ruby-talk:88012]
-
- * test/yaml/test_yaml.rb: add test.
-
-Tue Dec 16 01:14:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (catch_timer): check rb_thread_crtical in main native
- thread.
-
- * eval.c (thread_timer): just sends signals periodically, to
- prevent main native thread from receiving them in critical
- section. [ruby-core:01959]
-
-Mon Dec 15 13:32:22 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (check_dirname): check string safety and remove extraneous
- trailing directory separators. [ruby-dev:22279]
-
- * file.c: renamed and externalized rb_path_next,
- rb_path_skip_prefix, rb_path_last_separator, rb_path_end.
-
- * intern.h: prototypes for rb_path_next, rb_path_skip_prefix,
- rb_path_last_separator, rb_path_end.
-
-Mon Dec 15 09:27:46 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): first argument
- of rb_protect should take an argument of VALUE.
-
-Sun Dec 14 18:46:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/socket.c (Init_socket): IPv6 is not supported although
- AF_INET6 is defined on MinGW.
-
- * lib/ipaddr.rb (AF_INET6): workaround in the environment which does
- not support IPv6.
-
-Sat Dec 13 18:55:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/charset_alias.rb: preserve original order.
-
- * ext/iconv/extconf.rb: remove wrapper file at clean.
-
-Sat Dec 13 18:09:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (thread_timer): use timer by sub-thread and nanosleep.
- [ruby-talk:87519]
-
- * gc.c (Init_stack): no stack adjustment for THREAD_SAFE.
-
-Sat Dec 13 17:17:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (proc_alloc): cache the created object at first time.
- [ruby-talk:61288], [ruby-dev:22240]
-
-Sat Dec 13 09:01:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in: check ucontext.h.
-
- * eval.c: use getcontext/setcontext() instead of setjmp/longjmp()
- on ia64 or with native thread enabled. [ruby-core:01932]
-
-Sat Dec 13 03:09:14 2003 why the lucky stiff <why@ruby-lang.org>
-
- * lib/yaml/rubytypes.rb: anonymous struct fix. [ruby-core:01946]
-
- * test/yaml/test_yaml.rb: add test.
-
-Fri Dec 12 22:36:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb: add Cell#to_str and Cell#to_s for /.../ =~ aCell,
- "#{aCell}" and so on.
-
- * test/csv/test_csv.rb: add tests.
-
-Fri Dec 12 19:33:06 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mkdir): remove trailing `/' from pathes.
-
- * lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
-
- * lib/fileutils.rb (rmdir_r): ditto.
-
- * lib/fileutils.rb (fu_copy_dir): check if it is a directory after
- mkdir(2).
-
-Fri Dec 12 06:06:09 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (proc_invoke): fix class name in warning message for
- define_method. [ruby-dev:22235]
-
-Thu Dec 11 21:24:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
-
- * ext/openssl/ossl.[ch]: ditto.
-
- * ext/openssl/MANIFEST: add ossl_pkcs12.[ch].
-
-Thu Dec 11 20:54:28 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mkdir_p): remove trailing `/' befere mkdir(2).
- mkdir("nonexistdir/") does not work on NetBSD/Alpha 1.6.1.
-
- * lib/fileutils.rb (fu_list): call to_str for all arguments.
-
-Thu Dec 11 20:07:01 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ftools.rb (makedirs): sync with fileutils.
-
-Thu Dec 11 19:53:03 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
- (mkdir("C:\") causes EACCESS on Windows 2000/NTFS)
-
-Thu Dec 11 19:08:02 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mkdir_p): check if it is a directory after
- mkdir(2) instead of before mkdir(2), to avoid race condition.
- [ruby-talk:87730]
- Refer: mkinstalldirs sh script, GNU mkdir(1) (coreutils 5.0)
-
-Thu Dec 11 18:49:30 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: def m( arg ) -> def m(arg).
-
-Thu Dec 11 11:39:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ieeefp.h), numeric.c: needed for finite() on
- Solaris. [ruby-core:01921]
-
- * file.c (rb_stat_inspect): adjust format specifier.
-
- * parse.c (arg_prepend): nodetype() is for debug use.
-
- * ruby.h (ISASCII, etc): cast to int to get rid of warning.
-
- * ruby.h (alloca.h): include even in GCC. [ruby-core:01925]
-
- * ext/bigdecimal/bigdecimal.c (GetVpValue): adjust format
- specifier.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_prec, BigDecimal_coerce,
- BigDecimal_divmod): use rb_assoc_new() to suppress memory usage.
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_split): ditto.
-
- * ext/dl/sym.c (rb_dlsym_guardcall): guard itself should be
- volatile.
-
- * ext/iconv/iconv.c (iconv_convert): ensure actual parameter with
- format specifier.
-
- * ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): do not
- define unless used.
-
- * ext/pty/pty.c (getDevice): get rid of warning.
-
- * ext/socket/socket.c (port_str, sock_s_getaddrinfo,
- sock_s_getnameinfo): FIX2INT() now returns long.
-
- * ext/socket/socket.c (init_inetsock_internal): uninitialized
- variable.
-
- * ext/syck/rubyext.c (syck_parser_assign_io): add prototype.
-
- * ext/syck/rubyext.c (rb_syck_mktime, yaml_org_handler): use
- ISDIGIT() instead of isdigit() to avoid warnings and for
- platforms which don't support non-ascii charater.
-
-Wed Dec 10 19:28:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): set EOF flag at short read.
- [ruby-dev:22223], [ruby-dev:22224]
-
-Wed Dec 10 18:07:25 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
-
-Wed Dec 10 17:54:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): do not set EOF flag when
- requested length is zero. [ruby-dev:22214]
-
-Wed Dec 10 17:17:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): should return given string even if data read is
- empty. [ruby-dev:22207]
-
-Wed Dec 10 17:16:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): adjust behavior at reading
- beyond EOF to IO. [ruby-dev:22205]
-
- * test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading
- beyond EOF.
-
- * test/ruby/test_file.rb, test/stringio/test_stringio.rb: include
- TestEOF::Seek test case.
-
-Wed Dec 10 15:01:19 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/monitor/test_monitor.rb (test_cond): use Queue#deq
- instead of sleep.
-
-Wed Dec 10 14:45:39 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/pty/pty.c (HAVE_SYS_IOCTL_H): need to include <sys/ioctl.h>
- for TIOCSCTTY on *BSD. based on gotoyuzo's patch.
- (ruby-bugs:PR#1211)
-
- * ext/pty/pty.c (establishShell): should close descriptors if fork
- failed.
-
-Wed Dec 10 12:53:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.h: define execv() using do_aspawn().
-
- * process.c (proc_exec_v): remove #ifdef's which stopped needing.
-
-Tue Dec 9 23:32:23 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tkcanvas.rb, ext/tk/lib/tkdialog.rb,
- ext/tk/lib/tkentry.rb, ext/tk/lib/tkscrollbox.rb, ext/tk/lib/tktext.rb,
- ext/tk/sample/tkalignbox.rb, ext/tk/sample/tkcombobox.rb,
- ext/tk/sample/tkmultilistbox.rb, ext/tk/sample/tkoptdb.rb, ext/tk/sample/tktextframe.rb,
- ext/tk/sample/demos-en/dialog1.rb, ext/tk/sample/demos-en/dialog2.rb,
- ext/tk/sample/demos-jp/dialog1.rb, ext/tk/sample/demos-jp/dialog2.rb:
- overrided instance methods, which are private methods on the super
- class, are changed to 'private'
-
-Tue Dec 9 19:53:02 2003 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/generic.rb (URI::Generic#route_from0): make case insensitive
- for host-part.
-
- * test/uri/test_generic.rb (test_route): added tests for the above
- change.
-
-Tue Dec 9 14:10:48 2003 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_check_readable): don't call io_seek if EOF flag is set,
- to avoid clearing EOF flag.
- (rb_io_check_writable): ditto.
-
-Tue Dec 9 02:53:55 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tkalignbox.rb: new sample script
-
-Tue Dec 9 00:45:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: renamed #assert_raises to #assert_raise
- and made the former call the latter. [ruby-core:01890]
-
- * test/testunit/test_assertions.rb: ditto.
-
-Tue Dec 9 00:07:35 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
- methods as delegates to WEBrick.
-
- * test/soap/calc/{test_calc.rb,test_calc2.rb},
- test/soap/helloworld/test_helloworld.rb,
- test/wsdl/datetime/test_datetime.rb, test/wsdl/raa/test_raa.rb:
- follow the change.
-
-Mon Dec 8 22:48:03 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/autorunner.rb: remove dependency to a particular
- runner. [ruby-core:01901], [ruby-list:38869]
-
- * lib/test/unit/ui/testrunnerutilities.rb: moved output level
- constants from Console.
-
- * lib/test/unit/ui/console/testrunner.rb: ditto.
-
- * lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
- accept output_level.
-
-Mon Dec 8 15:03:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/syck.c (syck_io_str_read): get rid of buffer overflow.
-
-Mon Dec 8 13:02:11 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
-
- * test/uri/test_common.rb: add test for URI.regexp.
-
-Mon Dec 8 12:44:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c: define swap16 and swap32 only if they are not
- defined. OpenBSD defines these macros. [ruby-dev:22181]
-
-Sun Dec 7 20:54:17 2003 Tanaka Akira <akr@m17n.org>
-
- * ext/iconv/iconv.c (map_charset): make case sensitive.
- ext/iconv/charset_alias.rb (charset_alias): don't ignore
- config.charset's information. sort aliases.
-
-Sat Dec 6 22:58:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_start_ssl): new function to wrap
- SSL_connect and SSL_accept; if SSL_connect (or SSL_accept) returned
- but not finished the handshake process, we should retry it.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_connect): call ossl_start_ssl.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_read): allow signal traps.
-
-Sat Dec 6 21:45:10 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (flush_before_seek): flush before seek on any platform.
-
- * configure.in: ditto.
-
-Sat Dec 6 17:23:00 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable
- as well as downcase one.
-
- * lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI.
-
-Fri Dec 5 23:22:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises,
- Test::Unit::Assertions::assert_nothing_raised): use the last
- argument as message unless class object.
-
- * test/testunit/test_assertions.rb (test_assert_raises): test for
- multiple exception list. [ruby-core:01891]
-
- * test/testunit/test_assertions.rb (test_assert_nothing_raised): test
- for non-exception classes.
-
-Fri Dec 5 22:23:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/netHttpClient.rb: proxy support did not work. fixed.
-
- * lib/soap/property.rb: add class methods for loading property from
- stream/file/propertyfile. propertyfile is a file which is located at
- somedir in $:.
-
- * lib/soap/soap.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb,
- lib/wsdl/importer.rb: load property from propertyfile 'soap/property'
- e.g. /usr/local/lib/ruby/site_ruby/1.8/soap/property.
-
- * test/soap/test_property.rb, test/soap/test_streamhandler.rb: new file.
-
-Fri Dec 5 17:26:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_exec_end_proc): maintain tmp_end_procs.
- [ruby-dev:22154]
-
-Fri Dec 5 13:36:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_exec_end_proc): should not clear end_procs and
- ephemeral_end_procs before execution. [ruby-dev:22144]
-
- * eval.c (rb_obj_extend): call Module#extended hook after
- extended_object. [ruby-list:38866]
-
- * object.c (Init_Object): Module#extended defined.
-
-Fri Dec 5 13:17:30 2003 Tanaka Akira <akr@m17n.org>
-
- * test/ruby/test_pipe.rb: use IO.pipe instead of IO.popen.
-
-Fri Dec 5 11:54:45 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): follow IO#read.
-
- * test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
- test/stringio/test_stringio.rb: add EOF test.
-
-Fri Dec 5 02:49:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
- allow multiple exception list. [ruby-core:01884]
-
- * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
- check whether arguments are subclass of Exception.
-
-Thu Dec 4 23:54:00 2003 Rick Ohnemus <rick.ohnemus@systemware.com>
-
- * dln.c (aix_loaderror): should not use member named 'errno' which
- might be a macro (e.g. on AIX).
-
-Thu Dec 4 23:32:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): do not depend on lseek position.
- [ruby-dev:22026]
-
-Thu Dec 4 22:37:26 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): preserve $! value when retry happens in the
- rescue clause. [ruby-talk:86697]
-
-Thu Dec 4 21:50:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):
- should rescue errors and re-raise DRbConnError on write too.
- [ruby-dev:22132]
-
-Thu Dec 4 16:41:17 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (exc_list): allow expanding list. [ruby-dev:22134]
-
-Thu Dec 4 14:09:24 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb (test_cp): test if the error is
- kind of SystemCallError. It is needless details that which errno
- is set on each systems.
-
-Thu Dec 4 13:24:13 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb: use Object#__send__ instead of Object#send.
-
-Thu Dec 4 13:17:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/streamHandler.rb: support latest released version of
- http-access2.
-
-Thu Dec 4 13:04:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/soap.rb: add SOAP::Env module for environment repository
- such as HTTP_PROXY.
-
- * lib/soap/property.rb: property implementation.
-
- * lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
- lib/soap/rpc/driver.rb: use soap/property.rb.
-
- * lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
- use SOAP::Env.
-
- * lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
- management interface, but ignored for now.
-
- * lib/xsd/charset.rb: add XSD::Charset.encoding= interface to set
- wiredump charset explicitly. it was fixed to 'utf-8' when iconv or
- uconv module was found.
-
-Thu Dec 4 10:43:58 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/sym.c (rb_dlsym_guardcall): __declspec(noinline) is VC7
- feature.
-
-Thu Dec 4 10:27:12 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: update hyperlink to the Japanese document.
-
-Thu Dec 4 09:12:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (asn1time_to_time): should check that
- the underlying value of ASN1_TIME isn't NULL. [ruby-core:01881]
-
-Thu Dec 4 08:29:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (GenericServer#start): should rescue
- Exception to avoid unexpected aborting. [ruby-core:01853]
-
- * lib/webrick/server.rb (GenericServer#start_thread): should check
- that peeraddr isn't nil before printing.
-
- * lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should
- rescue Exception to avoid unexpected aborting of thread.
-
-Thu Dec 4 03:48:59 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#link, Pathname#symlink): obsoleted.
- (Pathname#make_link, Pathname#make_symlink): new method.
-
-Thu Dec 4 01:45:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_read): should not terminate on empty string; wait
- until real EOF. [ruby-dev:21969]
-
- * io.c (argf_read): should adjust length to read, when length is
- specified and read spans command line argument files.
-
-Wed Dec 3 19:38:36 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
-
-Wed Dec 3 13:49:07 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
-
- * ext/tk/lib/tkafter.rb: ditto.
-
- * ext/tk/lib/tkcanvas.rb: ditto.
-
- * ext/tk/lib/tkdialog.rb: ditto.
-
- * ext/tk/lib/tktext.rb: ditto.
-
-Wed Dec 3 13:28:13 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (lex.c): try gperf first, and copy from the source
- directory if failed. [ruby-dev:22123]
-
- * ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
-
- * lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
-
-Tue Dec 2 23:18:12 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: wrote the warning about HTTP_PROXY environment
- variable.
-
-Tue Dec 2 21:31:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bin/testrb: new test runner. [ruby-core:01845]
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner.run,
- Test::Unit::AutoRunner#process_args): take test list to run and
- options.
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::RUNNERS,
- Test::Unit::AutoRunner#run): should not exit inside a library,
- just return the result instead.
-
- * lib/test/unit.rb: ditto.
-
- * test/runner.rb: exit with the test result.
-
-Tue Dec 2 20:18:48 2003 Eric Sunshine <sunshine@sunshineco.com>
-
- * configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
- instead of Bison or byacc.
-
- * parse.y: If OLD_YACC is defined, ensure that YYMAXDEPTH is at least
- 10000 (Bison's default) since some old versions of Yacc define it as
- low as 150 by default, which is too low for Ruby to parse some files,
- such as date/format.rb. Among other issues, the parse problem causes
- "make test" to fail.
-
-Tue Dec 2 20:03:20 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: check if Pathnames are usable
- for arguments.
-
-Tue Dec 2 04:22:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: fixed #assert_no_match message.
-
- * test/testunit/test_assertions.rb: ditto.
-
-Tue Dec 2 00:43:00 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/syck.c: string buffering bug. decrementing by full
- max_size now. [ruby-core:01834]
-
-Mon Dec 1 21:33:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_sadded): prohibit singleton method definition for
- Numerics. fill yet another gap between Fixnum and Bignum.
-
-Mon Dec 1 17:33:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (htov16): converts endian using swap16. htov32(), hton16,
- hton32 as well. [ruby-talk:85377]
-
- * pack.c (swap16): swap 2 bytes no matter how big short is on the
- platform. swap32() is also prepared.
-
- * numeric.c (rb_num2int): returns long to preserve information.
- rb_fix2int(), rb_num2uint(), rb_fix2uint() as well.
- [ruby-talk:85377]
-
- * numeric.c (rb_num2uint): should not check for value range if the
- source value is negative.
-
-Mon Dec 1 17:14:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/optparse/opttest.rb: added.
-
-Mon Dec 1 16:10:52 2003 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/rdoc.rb: (etc) initial merge into main tree.
-
-Mon Dec 1 14:17:49 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow
- Pathname for arguments. [ruby-core:01795]
-
- * test/fileutils/test_fileutils.rb: does much strict test on
- "same" files detecting.
-
-Mon Dec 1 09:28:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (XCFLAGS): re-export $(XCFLAGS).
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (ARCH_FLAG): export $(ARCH_FLAG) (perhaps empty value).
-
-Mon Dec 1 01:03:27 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
- and ARCH_FLAG. [ruby-dev:22085]
-
-Sun Nov 30 20:18:07 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
- [ruby-core:01819]
-
- * Makefile.in: add ARCH_FLAG to CFLAGS.
-
- * Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
-
- * lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
-
- * lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS.
-
- * Makefile.in: add ARCH_FLAG to DLDFLAGS.
-
- * configure.in: should put getcwd in AC_CHECK_FUNCS, not
- AC_REPLACE_FUNCS. [ruby-core:01826]
-
-Sun Nov 30 18:22:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
- DLDFLAGS and LDSHARED.
-
- * configure.in: XCFLAGS for compiling ruby itself. ARCH_FLAG is
- reflected in CFLAGS.
-
- * lib/mkmf.rb: ditto. do not import XCFLAGS from config.status.
-
-Sun Nov 30 17:37:36 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix [ruby-talk:86746]
-
-Sun Nov 30 13:02:00 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/encodingstyle/soapHandler.rb: refactoring - Simplifying
- Conditional Expressions.
-
- * lib/wsdl/soap/definitions.rb: refactoring - Move Method.
-
- * test/xsd/{test_noencoding.rb,noencoding.xml}: new files. test for
- encoding unspecified XML file parsing.
-
- * test/wsdl/{test_fault.rb,map,datetime}: new files. test of
- SOAPFault, dateTime and Apache's Map.
-
-Sun Nov 30 09:35:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * string.c (rb_str_update): get rid of SEGV at just allocated String.
- [ruby-core:01812]
-
-Fri Nov 28 23:19:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_mark): explicitly check mark recursion levels, instead
- of unreliable stack length.
-
-Fri Nov 28 22:49:56 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/rinda.rb: fix TupleSpaceProxy#read, read_all.
-
-Fri Nov 28 21:44:40 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/fileutils/test_fileutils.rb (test_ln_s): should be a file, not
- a directory for FreeBSD.
-
-Fri Nov 28 19:37:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (env_has_value, env_index): must match exactly.
-
- * test/ruby/test_env.rb (test_has_value, test_index): condition for
- aboves.
-
-Fri Nov 28 17:59:20 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_env.rb: add tests for ENV.
-
-Fri Nov 28 17:47:46 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb (DRbMessage#load): rescue Errno::* and raise
- DRbConnError.
-
-Fri Nov 28 15:41:15 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#realpath): obsolete the force_absolute
- argument.
-
-Fri Nov 28 14:41:52 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/streamHandler.rb: drop unused http parameters.
-
- * lib/soap/encodingstyle/soapHandler.rb, lib/soap/mapping/factory.rb,
- lib/soap/mapping/mapping.rb, lib/soap/mapping/registry.rb,
- lib/wsdl/soap/complexType.rb: ApacheSOAP's map support was broken
- under WSDL dynanic client environment. fixed.
-
- * test/wsdl/raa/*: add tests.
-
- * lib/xsd/datatypes.rb: dateTime precision bug fix (at least, I hope.)
- bug of soap4r. XSDDateTimeImple.to_time passed a Float to
- Time.local/Time.gm as an usec, and NUM2LONG(rb_num2long for Float)
- causes rounding error.
-
- * test/soap/test_basetype.rb, test/xsd/test_xsd.rb: add tests.
-
-Fri Nov 28 04:15:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (method_arity): used wrong Proc object. [ruby-talk:86504]
-
-Fri Nov 28 00:47:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_f_exit), process.c (rb_f_exit_bang): treat true as
- success, false as failure. [ruby-dev:22067]
-
- * eval.c (rb_f_abort, rb_thread_switch), process.c (rb_f_system): use
- ANSI macro instead of hard coded value.
-
- * eval.c (rb_f_exit), process.c (rb_f_exit_bang): use VALUEs not but
- TYPEs.
-
-Thu Nov 27 22:05:48 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * eval.c, gc.c: FreeBSD/ia64 currently does not have a way for a
- process to get the base address for the RSE backing store, so
- hardcode it for the moment.
- [submitted by: Marcel Moolenaar <marcel@FreeBSD.org>]
-
-Thu Nov 27 17:36:42 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode).
- TkTimer#wait recieves the exception of the callback.
- The exception is kept on @return_value.
-
-Thu Nov 27 16:58:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (rb_w32_stat): remove _fullpath() for NUL: device.
-
-Wed Nov 26 15:38:47 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/fileutils/test_fileutils.rb (test_ln_s): should take the
- existing symbolic link for OpenBSD.
-
-Wed Nov 26 04:48:42 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/token.c: removed YYTOKTMP references which
- were causing buffer overflows on large block scalars,
- comments, quoted scalars and plain scalars.
-
- * ext/syck/rubyext.c: dynamic changing of buffer size.
-
- * ext/syck/syck.h: default buffer size of 4k.
-
-Wed Nov 26 00:55:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
-
- * lib/webrick/httpserver.rb (HTTPServer#run): should pass the
- request's keep_alive flag to the response.
-
-Tue Nov 25 21:41:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * defines.h (ENV_IGNORECASE): should define when DOSISH without
- human68k. [ruby-dev:22047]
-
- * hash.c (env_has_value, env_index): don't ignore case of value.
- [ruby-dev:22048]
-
-Tue Nov 25 21:39:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (path_check_1): honor sticky bits always.
- [ruby-talk:86273]
-
-Tue Nov 25 20:02:14 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: do test in more deep
- directory.
-
- * test/fileutils/test_nowrite.rb: ditto.
-
-Tue Nov 25 19:04:23 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
- refined.
-
-Tue Nov 25 18:13:30 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
- test. [ruby-dev:22045]
-
- * test/fileutils/test_nowrite.rb: ditto.
-
-Tue Nov 25 17:52:11 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
- if the environment variable is case sensitive.
-
-Tue Nov 25 16:41:33 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb:
- removed. this test requires extra libraries in soap4r/1.5.*.
-
-Tue Nov 25 16:24:42 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license;
- GPL2 -> Ruby's.
-
- * lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb,
- lib/soap/streamHandler.rb: add interface to streamhandler.
-
- * lib/soap/marshal.rb: raise error if parse fails.
-
- * lib/soap/netHttpClient.rb: add https support. Patched by
- Oliver M. Bolzer.
-
- * lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
-
- * lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb,
- lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce
- using charset for parsing response from buggy server.
-
- * lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half
- typed multi-ref array.
-
- * lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map
- SOAPStruct which has multi-accessors which name are the same, to an
- array.
-
- * lib/soap/rpc/element.rb: fixed illegal parameter order.
-
- * lib/soap/rpc/element.rb: element name of response message could have
- the name other than 'return'.
-
- * lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb,
- lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb,
- lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural
- fault definition in a operation. [ruby-talk:84948]
-
- * test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add
- test for above fix.
-
- * lib/wsdl/soap/complexType.rb: support WSDL array definition with
- maxOccures="unbound".
-
- * lib/xsd/charset.rb: use cp932 under emx. Patched by
- Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
-
- * lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means
- 'follow encoding declaration in XML'.
-
- * sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb,
- sample/wsdl/googleSearch/sampleClient.rb,
- sample/wsdl/googleSearch/wsdlDriver.rb,
- test/wsdl/test_emptycomplextype.rb,
- test/wsdl/marshal/test_wsdlmarshal.rb,
- test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read }
- instead of File.open(...).read. [ruby-dev:21964]
-
- * test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb:
- simplify the test case.
-
- * test/wsdl/axisArray/*: add tests for axis's array encoding.
-
-Tue Nov 25 16:15:29 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ruby.h: don't treat Cygwin as Windows.
-
-Tue Nov 25 15:18:28 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * configure.in: change default value of --enable-pthread (default: no)
-
-Tue Nov 25 07:31:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (primary): allow newlines just before right argument
- parenthesis. (ruby-bugs:PR#1221)
-
-Mon Nov 24 23:32:06 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI.open_loop, URI::HTTP#proxy_open): use
- catch/throw for redirection instead of exception.
- (OpenURI.open_loop, OpenURI.redirectable?): restrict redirection.
-
-Mon Nov 24 19:59:48 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (URI::Generic#find_proxy): use CGI_HTTP_PROXY
- instead of HTTP_PROXY in the CGI environment.
-
-Mon Nov 24 19:32:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/etc/extconf.rb: check for pw_passwd in struct passwd and
- gr_passwd in struct group for DJGPP.
-
- * ext/etc/etc.c: ditto.
-
- * ext/Setup.dj: support for curses, etc, zlib.
-
-Mon Nov 24 17:00:00 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: validate option names.
- :content_length_proc and :progress_proc option implemented.
-
-Mon Nov 24 14:53:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
-
-Sat Nov 22 23:09:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: set enable_pthread to no on MinGW.
-
-Sat Nov 22 22:56:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * configure.in: add --enable-pthread option (default: yes)
-
-Sat Nov 22 22:48:46 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite
-
- * ext/tk/lib/tkafter.rb: bug fix of TkAfter#start
-
- * ext/tk/sample/tkcombobox.rb: new sample script
-
- * ext/tcltklib/tcltklib.c: add native thread check
-
-Sat Nov 22 18:49:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
- libcruses returns no value, just like keypad().
-
-Sat Nov 22 17:36:36 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (HAVE_GETCWD): output to config.h.
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (XCFLAGS): output to config.status.
-
-Sat Nov 22 13:10:10 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (have_st_ino?): djgpp has valid st_ino.
-
-Sat Nov 22 11:28:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (Init_stack): stack region is far smaller than usual if
- pthread is used.
-
-Sat Nov 22 07:30:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/util/backtracefilter.rb: fixed a bug that occurred
- when an exception had no backtrace.
-
- * test/testunit/util/test_backtracefilter.rb: ditto.
-
-Fri Nov 21 16:44:18 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkentry.rb: fix the encoding trouble of percent
- substitutions on validatecommand option of TkEntry widget
-
- * ext/tk/lib/tk.rb: fix bug on {pack|grid}_propagate() method
-
-Fri Nov 21 16:12:11 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ruby.1: Fix markups and grammar.
-
-Fri Nov 21 14:49:42 2003 Minero Aoki <aamine@loveruby.net>
-
- * ruby.1: wrote about ruby related environment variables.
-
-Fri Nov 21 12:28:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_extended): singleton methods should not be checked
- when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
-
-Fri Nov 21 01:40:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * configure.in: check <pthread.h>
-
- * ruby.h: include pthread.h if existence.
- define is_ruby_native() macro when not HAVE_NATIVETHREAD
-
- * eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
-
-Fri Nov 21 00:43:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: use #__send__ instead of #send.
-
- * lib/test/unit/testcase.rb: ditto.
-
-Thu Nov 20 19:19:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: don't find the Cygwin's pthread library on MinGW.
-
-Thu Nov 20 19:15:50 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not
- have st_ino (always 0). [ruby-dev:21972]
-
- * lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not
- allow overwriting files by rename(2).
-
- * test/fileutils/test_fileutils.rb: windows? ->
- have_drive_letter?, have_file_perm?
-
-Thu Nov 20 17:50:58 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/tkballoonhelp.rb: new sample script
-
- * ext/tk/sample/tkmultilistbox.rb: ditto
-
- * ext/tk/sample/tktextframe.rb: ditto
-
-Thu Nov 20 13:37:34 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ruby.h: define is_ruby_native_thread() for no native thread
- environment
-
- * eval.c: ditto
-
-Thu Nov 20 12:42:47 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * configure.in: always check existence of the pthread library
-
- * ruby.h: define macros for ruby's native thread check
-
- * eval.c: add ruby's native thread check
-
- * gc.c: ditto
-
-Wed Nov 19 14:45:18 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (to_ary): print more friendly warning message.
-
-Wed Nov 19 14:32:08 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_same?): add djgpp and wince.
-
- * lib/fileutils.rb (cannot_overwrite_file?): add wince.
-
-Wed Nov 19 11:04:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
- is same as mswin32.
-
-Wed Nov 19 07:54:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit.rb: do not run tests if $! is set.
-
- * lib/test/unit/assertionfailederror.rb: extend StandardError instead
- Exception (irb catches the former but not the latter).
-
-Tue Nov 18 23:31:36 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * missing/memmove.c (memmove): take void *, not char *.
-
- * missing.h (memmove): ditto.
-
- * missing.h (strchr, strrchr): return char *, not int.
-
-Tue Nov 18 22:20:10 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_same?): temporal fix for windows.
-
-Tue Nov 18 19:05:04 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_same?): check by inode instead of path
- name, to detect two hard links pointing to the same content.
-
- * test/fileutils.rb: did not create correctly looped symlinks.
-
-Tue Nov 18 18:23:05 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_read): behave as IO at empty string.
- [ruby-dev:21939], [ruby-dev:21941]
-
- * ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
-
- * ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
- clear EOF flag.
-
- * test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
-
-Tue Nov 18 14:06:35 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
- [ruby-talk:85344] [ruby-core:01699]
-
- * lib/fileutils.rb: use Object#is_a? instead of Class#=== to allow
- e.g. remote objects for receivers.
-
- * lib/fileutils.rb: FileTest -> File.
-
- * lib/fileutils.rb: put parentheses for arguments of File.xxxx?
-
- * test/fileutils/test_fileutils.rb (test_cp): test "cp a a".
-
- * test/fileutils/test_fileutils.rb (test_mv): test "mv a a".
-
- * test/fileutils/test_fileutils.rb (test_ln): test "ln a a".
-
- * test/fileutils/test_fileutils.rb (test_ln_s): test "ln_s a a".
-
- * test/fileutils/test_fileutils.rb (test_install): test "install a a".
-
- * test/fileutils/fileasserts.rb: new method assert_symlink.
-
- * test/fileutils/fileasserts.rb: assert_is_directory -> assert_directory.
-
-Mon Nov 17 19:38:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (getcwdofdrv): avoid using getcwd() directly, use
- my_getcwd() instead.
-
- * merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
- <sunshine@sunshineco.com>. [ruby-core:01596]
-
-Mon Nov 17 10:50:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Completion::complete): allow least
- common completion for three or more candidates.
-
-Mon Nov 17 09:41:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/ui/tk/testrunner.rb,
- lib/test/unit/ui/gtk/testrunner.rb:
- run GUI main loop in sub thread.
-
- * lib/test/unit/ui/gtk2/testrunner.rb: imported from rough.
-
- * lib/test/unit/autorunner.rb (keyword_display): sort keywords.
-
-Sun Nov 16 18:10:57 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): iterator should return value from next inside
- begin/rescue/end. (ruby-bugs:PR#1218)
-
-Sun Nov 16 13:26:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): LINK check earlier than anything else,
- i.e. do not dump TYPE_IVAR for already dumped objects.
- (ruby-bugs:PR#1220)
-
- * eval.c (rb_eval): call "inherited" only when a new class is
- generated; not on reopening.
-
- * eval.c (eval): prepend error position in evaluating string to
- "mesg" attribute string only when it's available and is a
- string.
-
-Sun Nov 16 12:16:10 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: logging response body. [experimental]
- [ruby-list:38800]
-
-Sun Nov 16 10:49:38 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
-
- * lib/thread.rb (Thread.exclusive): wrap method definition in
- class Thread to enable rdoc to process.
-
-Sun Nov 16 09:45:23 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (set_debug_output): warn if method is called
- after #start. [ruby-dev:38798]
-
-Sun Nov 16 04:41:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): do not re-raise exception to avoid unnecessary
- exception copying, instead modify exception and internal
- information to adjust eval().
-
- * eval.c (backtrace): can return the current frame information
- only if lev < -1.
-
-Sat Nov 15 22:16:42 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * /ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext):
- refine error message.
-
-Sat Nov 15 10:05:40 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI.open_loop, OpenURI::HTTP#proxy_open):
- refactored to support options.
- (Buffer): maintain size by this class.
-
-Sat Nov 15 07:40:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_method_node): new API to retrieve method body.
-
-Fri Nov 14 13:21:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
-
- * ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget
- argument [ruby-talk:85066]
-
-Thu Nov 13 20:53:35 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed.
- [ruby-ext:02251]
-
-Thu Nov 13 19:17:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * lib/test/unit/ui/tk/testrunner.rb: use grid and panedwindow
- (if available)
-
-Thu Nov 13 17:56:41 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI.open_uri): use File::RDONLY.
- reported by Take_tk <ggb03124@nifty.ne.jp>.
- [ruby-ext:02245]
-
-Thu Nov 13 16:45:53 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509req.c (ossl_x509req_to_der): add function for
- X509::Request#to_der.
-
-Thu Nov 13 11:31:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Completion#complete): prior shorter
- name to containing longer name.
-
-Thu Nov 13 06:08:54 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: stop freezing some classes
-
- * ext/tk/lib/multi-tk.rb: ditto.
-
-Wed Nov 12 17:32:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/assertions.rb (assert_throws, assert_nothing_thrown):
- uncaught throw in sub thread raises ThreadError.
-
- * lib/test/unit/ui/tk/testrunner.rb (setup_ui): "expand" is not
- necessary.
-
-Wed Nov 12 14:09:43 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/monitor/test_monitor.rb: fix the timing problem by Queue.
-
-Wed Nov 12 12:59:44 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/monitor/test_monitor.rb: added.
-
-Wed Nov 12 10:14:28 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb: refactored. Thanks, Gennady Bystritsky.
-
-Wed Nov 12 06:11:39 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary):
- add functions to convert STACK into Array.
-
- * ext/openssl/ossl.h: add prototypes.
-
- * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_set_certificates,
- ossl_pkcs7_get_certificates, ossl_pkcs7_get_crls,
- ossl_pkcs7_set_crls): add functions for PKCS7#certificates=
- PKCS7#certificates, PKCS7#crls= and PKCS7#crls.
-
-Wed Nov 12 00:47:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/ui/testrunnermediator.rb: should require 'test/unit'.
-
-Tue Nov 11 23:54:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/ui/gtk/testrunner.rb: added a rescue clause to handle
- the case when the requested font is not available.
-
-Tue Nov 11 22:44:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (appendline): file may not end with newline. a bug if
- READ_DATA_PENDING_PTR is defined. [ruby-talk:84925]
-
-Tue Nov 11 10:42:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: raise an exception when creating TkWindow
- object, because TkWindow class is an abstract class.
-
-Tue Nov 11 03:30:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
- if the specified value doesn't exist.
-
- * lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
- a empty hash if the specified section doesn't exist.
-
-Mon Nov 10 11:40:29 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb (wait): return true on signal/broadcastfalse and
- false on timeout. Thanks Gennady Bystritsky.
-
-Mon Nov 10 00:07:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (primary): primary_value may be 0 when syntax error.
- [ruby-talk:84893]
-
-Sun Nov 9 02:05:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
- maintain symmetry with #assert_nil. Also added better output for
- #assert_kind_of.
-
- * test/testunit/tc_assertions.rb: ditto.
-
-Sat Nov 8 18:50:20 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/wsdl/raa/*: add new testcase for WSDL loading, parsing and
- reading.
-
- * test/soap/marshal/*: backport from soap4r/1.5.1. all differences are
- for ruby/1.6.
-
- * lib/soap/*: backport from soap4r/1.5.1. all differences are for
- ruby/1.6.
-
- * lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of
- ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*.
- [ruby-talk:84813]
-
- * lib/wsdl/soap/definitions.rb: element name typo in custom exception
- struct definition which is needed for wsdlDriver; camelCase ->
- underscore_name.
-
-Sat Nov 8 13:49:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * configure.in: improvement of pthread check
-
-Sat Nov 8 13:28:46 2003 Takaaki Tateishi <ttate@ttsky.net>
-
- * ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
- Thanks, Kaoru Shirai.
-
-Sat Nov 8 06:19:38 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
- TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
- (queueing a handler to the EventQueue).
-
- * ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
-
-Fri Nov 7 23:23:04 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#+): if self or the argument is `.', return
- another.
- (Pathname#parent): if self is `.', return `..'.
- (Pathname#children): if self is `.', don't prepend self for a
- pathname in a result.
- (Pathname#join): re-implemented using Pathname#+.
- (Pathname#find): if self is `.', remove `./' prefix of yielding
- pathname.
-
-Fri Nov 7 10:23:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (make_hostent): get rid of SEGV on aliases
- lookup failure. (ruby-bugs:PR#1215)
-
-Fri Nov 7 04:08:05 2003 UENO Katsuhiro <katsu@blue.sky.or.jp>
-
- * ext/zlib/zlib.c (Init_zlib): define Zlib::GzipReader#each_line as
- an alias of Zlib::GzipReader#each.
-
-Fri Nov 7 01:03:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): save and restore rb_prohibit_interrupt.
- [ruby-dev:21857]
-
-Thu Nov 6 18:05:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_inspect): show the path also at a closed file.
- [ruby-dev:21851]
-
-Thu Nov 6 11:42:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_set_string, strio_reopen): check
- tainted.
-
- * ext/stringio/stringio.c (strio_copy, strio_ungetc, strio_write,
- strio_putc): add infection.
-
- * ext/stringio/stringio.c (strio_path): just nil. [ruby-dev:21846]
-
- * ruby.c (proc_options): reserve searched script path in the
- source file name table. [ruby-list:38765]
-
- * lib/optparse.rb (OptionParser::Completion#complete): default not to
- ignore case on completion. [ruby-talk:84726]
-
- * win32/win32.c (make_cmdvector): process backslashes even if a quote
- is not enclosed.
-
-Wed Nov 5 23:49:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * sample/openssl/gen_csr.rb: there (at least) is a CA which does not
- accept DN in UTF8STRING format. it's a sample.
-
-Wed Nov 5 22:55:16 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * configure.in, eval.c, signal.c: : add '--with-pthread-ext'
- option to fix the pthread trouble on 'tcltklib'
-
- * ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
-
- * 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
- tk_menuSetFocus
-
-Wed Nov 5 17:33:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): allow interrupt during loaded program
- evaluation. [ruby-dev:21834]
-
- * hash.c (rb_hash_fetch): always warn if default argument and a
- block are supplied at the same time. [ruby-dev:21842]
-
- * hash.c (env_fetch): ditto.
-
- * array.c (rb_ary_fetch): ditto.
-
-Wed Nov 5 19:08:47 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
- do not remove next argument if empty value is placed.
-
- * test/optparse: added.
-
-Wed Nov 5 17:05:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/ui/gtk/testrunner.rb: typo.
-
-Wed Nov 5 11:13:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c: add #include "version.h". this file still depends on it.
-
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
- wince/Makefile.sub: add version.h dependency to string.c.
-
-Wed Nov 5 09:14:23 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb: revert to the previous revision.
-
-Wed Nov 5 08:39:51 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/https.rb (HTTPRequest#parse): set @client_cert_chain.
-
- * lib/webrick/https.rb (HTTPRequest#meta_vars): create
- SSL_CLIENT_CERT_CHAIN_n from @client_cert_chain.
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
- if no cert-chain was given.
-
-Tue Nov 4 23:44:48 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
- remove needless version.h dependency.
-
-Tue Nov 4 23:38:43 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * class.c, hash.c, string.c: remove #include "version.h".
-
- * Makefile.in: remove needless version.h dependency.
-
-Tue Nov 4 06:54:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): fptr->f may be NULL, if IO is closed in the
- signal handler.
-
- * io.c (io_read): ditto.
-
- * string.c (get_pat): remove 1.8.0 warning code.
-
- * string.c (rb_str_match): extend warning until 1.8.2.
-
- * string.c (rb_str_match2): ditto.
-
- * class.c (class_instance_method_list): remove 1.8.0 warnings.
- method_list now recurs. [ruby-dev:21816]
-
- * class.c (rb_obj_singleton_methods): ditto.
-
- * array.c (rb_ary_select): remove select with block.
- [ruby-dev:21824]
-
- * hash.c (rb_hash_select): ditto.
-
- * hash.c (env_select): ditto.
-
- * re.c (match_select): ditto.
-
- * struct.c (rb_struct_select): ditto.
-
-Mon Nov 3 22:53:21 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/racc/parser.rb: synchronize with Racc 1.4.4.
-
- * ext/racc/cparse/cparse.c: ditto.
-
- * ext/racc/cparse/cparse.c (parse_main): should abort when
- the length of LR state stack <=1, not ==0.
-
-Mon Nov 3 08:50:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (check_uid_switch): remove duplicated error messages.
-
- * process.c (check_gid_switch): ditto.
-
-Sun Nov 2 02:28:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/ssl.rb: new option :SSLExtraChainCert.
-
-Sun Nov 2 01:02:04 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * string.c (rb_str_hash): Update the HASH_PERL alternative hash
- algorithm in sync with Perl 5.8.
-
- * st.c (strhash): Ditto.
-
-Sat Nov 1 18:21:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
- SSLSocket#peer_cert_chain.
-
- * ext/openssl/ossl_x509req.c (GetX509ReqPtr): new function
- which returns underlying X509_REQ.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_issuer_cert,
- ossl_x509extfactory_set_subject_cert, ossl_x509extfactory_set_crl,
- ossl_x509extfactory_set_subject_req, ossl_x509extfactory_set_config):
- use underlying C struct without duplication not to leak momory.
-
-Sat Nov 1 01:49:03 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/mapping/factory.rb: mark marshalled basetype objects when
- @allow_original_mapping is true. multi-referencing basetype node is
- prohibited in SOAP/1.1 encoding but soap4r's original ruby object
- mapping requires basetype to be marked to detect self referencing
- loop. e.g. o = 1; o.instance_eval { @iv = o } soap4r's original
- mapping is only used through soap/marshal API.
-
- * test/soap/marshal/test_marshal.rb: add tests for self referencing
- immutable objects.
-
- * test/soap/calc/test_calc_cgi.rb: fix test name.
-
-Fri Oct 31 22:26:29 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/string_wce.c (strrchr): should decrement pointer.
-
- * wince/Makefile.sub: correct a range of isdigit().
-
-Fri Oct 31 12:55:24 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
- [ruby-dev:21791]
-
- * bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
-
-Fri Oct 31 01:38:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces
- at the beginning of line to remove by sed. (ruby-bugs-ja:PR#580)
-
-Fri Oct 31 01:02:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compar.c (cmp_equal): protect exceptions from <=> comparison
- again. returns nil if any exception or error happened during
- comparison.
-
- * eval.c (search_required): should update *featurep when DLEXT2 is
- defined. (ruby-bugs-ja:PR#581)
-
-Thu Oct 30 23:41:04 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: add DRbArray
-
- * lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
-
- * lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
-
-Thu Oct 30 23:19:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/generator.rb: better XML pretty printing.
-
- * lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
- assignment in the element which has "encodingStyle" attribute, and
- add necessary namespace assignment for "arrayType" attribute.
-
- * test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
- through CGI.
-
-Thu Oct 30 22:59:39 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/yaml2byte.c: HASH const too long. Thanks, matz.
-
-Thu Oct 30 19:13:53 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syck/MANIFEST: Add yamlbyte.h.
-
-Thu Oct 30 14:25:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
- buffer filled.
-
- * io.c (rb_io_fptr_cleanup): move path deallocation to
- rb_io_fptr_finalize (finalizer called by GC).
-
-Thu Oct 30 13:23:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (logop): left may be NULL. [ruby-talk:84539]
-
- * eval.c (rb_eval): NODE_CASE nd_head may be NULL.
-
-Thu Oct 30 10:14:51 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/test/unit/autorunner.rb: make fox runner work.
-
-Thu Oct 30 09:32:26 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_f_system): fixed lack of security check before
- calling do_spawn() on win32. [ruby-talk:84555]
-
-Thu Oct 30 02:46:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): single array value to normal Proc#call
- (i.e. not via lambda call), should be treated just like yield.
- [ruby-dev:21726]
-
-Thu Oct 30 02:25:48 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
- add new method to inherit @sync from @io.sync.
-
- * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
- set sync flag explicitly.
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
- certificates in @extra_chain_cert.
-
-Wed Oct 29 22:02:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
- interpreter to exec, instead of test/ruby/envutil.rb,
-
-Wed Oct 29 19:58:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
- defined and TCL_MAJOR_VERSION >= 8.
-
- * ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
- rb_threadVwaitProc): use CONST84 instead of CONST.
-
- * ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
- ip_rb_threadTkWaitCommand): use CONST84 always.
-
-Wed Oct 29 17:27:05 2003 Tanaka Akira <akr@m17n.org>
-
- * re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
-
- * lib/pathname.rb (realpath): examine Dir.pwd because it may have
- symlinks.
-
-Wed Oct 29 17:16:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_longjmp): must not disturb original jump.
- [ruby-dev:21733]
-
-Wed Oct 29 15:28:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_Proc): taint preallocated exception object
- sysstack_error. [ruby-talk:84534]
-
-Wed Oct 29 11:27:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (ret_args): node may be NULL. [ruby-talk:84530]
-
-Tue Oct 28 15:20:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd,
- WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
- ip_rbTkWaitObjCmd, ip_rbTkWaitCommand, rb_threadVwaitProc,
- rb_threadWaitVisibilityProc, rb_threadWaitWindowProc,
- ip_rb_threadVwaitObjCmd, ip_rb_threadTkWaitObjCmd): prototype;
- avoid VC++ warnings.
-
-Mon Oct 27 19:19:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_longjmp): ignore reentering error while warning.
- [ruby-dev:21730]
-
-Mon Oct 27 00:23:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
- calling 'exit' in the Tk callback procedure. [ruby-list:38656]
-
-Sat Oct 25 09:18:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_method_missing): protect exception from within
- "inspect". (ruby-bugs:PR#1204)
-
-Fri Oct 24 23:26:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_each): Hash#each should yield single value.
- [ruby-talk:84420]
-
- * hash.c (env_each): ditto for ENV.each.
-
-Thu Oct 23 20:25:32 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (GenericServer#start): should rescue
- IOError from IO::accept. [ruby-dev:21692]
-
-Thu Oct 23 17:59:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): initialize stack bottom for embedding.
- [ruby-dev:21686]
-
- * ext/dl/extconf.rb: move list of files to clean from DEPEND file,
- to get rid of macro redefinitions.
-
-Thu Oct 23 13:44:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y: integrate operations for stack_type. [ruby-dev:21681]
-
-Thu Oct 23 00:41:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/calc/*, test/soap/helloworld/*: set logging threshold
- to ERROR.
-
-Wed Oct 22 12:53:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
- ignore tests which raised LoadError.
-
- * test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
- test/ruby/test_system.rb: avoid requiring same file twice.
-
- * test/drb/test_drbssl.rb, test/drb/test_drbunix.rb: should not use
- ARGV unless invoked directly. do not create test cases unless
- required libraries are available.
-
-Wed Oct 22 02:31:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_cleanup): should not ignore exit_value in END
- execution. [ruby-dev:21670]
-
-Tue Oct 21 23:16:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_cleanup): call finalizers and exit procs before
- terminating threads.
-
- * eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
-
-Tue Oct 21 15:57:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
- prepend the directory of target file to the load path.
-
-Tue Oct 21 15:08:53 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (do_spawn, do_aspawn): should wait child process even
- if callded with P_OVERLAY.
-
- * win32/win32.c (do_spawn, do_aspawn): should return child's exit
- status to parent.
-
-Tue Oct 21 00:35:02 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/calc/*, test/soap/helloworld/*: catch the exception from
- test server thread and recover.
-
-Tue Oct 21 00:22:57 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/*: import drb/runit.
-
-Mon Oct 20 23:55:47 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): set current node after arguments evaluation.
- [ruby-dev:21632]
-
- * eval.c (rb_yield_0): set current node and keep it at local jump.
-
-Mon Oct 20 22:01:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_cleanup): keep thread group for main thread.
- [ruby-dev:21644]
-
-Mon Oct 20 18:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_catch): backout.
-
-Mon Oct 20 17:31:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
- destination.
-
- * eval.c (localjump_destination): use unique number in ruby_frame
- for localjump destination.
-
-Mon Oct 20 11:31:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_signal.rb (test_signal): restore old trap.
-
-Mon Oct 20 11:00:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_sweep): loosen page free condition to avoid add_heap()
- race condition. [ruby-dev:21633]
-
- * gc.c (gc_sweep): do not update malloc_limit when malloc_increase
- is smaller than malloc_limit.
-
-Mon Oct 20 09:45:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/debug.rb (debug_command): remove debug print.
-
-Sun Oct 19 13:12:30 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
-
-Sun Oct 19 00:14:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
- server. (17171)
-
-Sat Oct 18 23:01:32 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
-
-Sat Oct 18 05:48:59 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/rubyext.c: YAML::Syck::compile method.
-
- * ext/syck/syck.c: Buffer edge bug.
-
- * ext/syck/yaml2byte.c: YAML to bytecode converter.
-
- * ext/syck/yamlbyte.h: Ditto.
-
- * ext/syck/bytecode.c: Bytecode parser fixes to empty collections
- and empty strings.
-
- * ext/syck/token.c: Ditto.
-
-Fri Oct 17 23:07:38 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/enumerator/enumerator.c, ext/enumerator/enumerator.txt:
- Provide Kernel#to_enum as an alias for Kernel#enum_for. Maybe
- this is a better name.
-
-Fri Oct 17 23:00:30 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/generator.rb: Add rdoc documentation.
-
-Fri Oct 17 22:16:42 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: Reword and fix Overview.
-
- * lib/set.rb: It is not necessary to require
- 'test/unit/ui/console/testrunner'.
-
-Fri Oct 17 11:15:22 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_range.rb: added.
-
- * MANIFEST: add test/ruby/test_range.rb.
-
-Fri Oct 17 03:21:23 2003 William Sobel <will.sobel@barra.com>
-
- * ext/socket/socket.c (make_hostent): h_aliases may be NULL.
- (ruby-bugs:PR#1195)
-
- * ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
-
-Fri Oct 17 00:12:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
- without initializing on TkComposite module.
-
-Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
- in a callback operation, Ruby/Tk shows a (verbose) backtrace
- information on the callback process.
-
-Thu Oct 16 17:09:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
- debug_silent_eval() when $1 is not set. (ruby-bugs:PR#1194)
-
-Thu Oct 16 16:54:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): ("a"..."a").to_a should return [].
- [ruby-core:01634]
-
-Thu Oct 16 16:40:51 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb:
- Add Tk::EncodedString and Tk::UTF8_String class to support
- characters using the \uXXXX escape to the UNICODE string.
-
- * ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
- new demo-scripts (samples of Tk::UTF8_String)
-
- * ext/tk/sample/{demos-en,demos-jp}/widget
- add entries for 'unicodeout.rb'
-
-Thu Oct 16 08:38:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/digest/test_digest.rb (test_eq): show failed class.
-
- * test/ruby/test_iterator.rb (test_break, test_return_trace_func):
- test localjump destination.
-
-Wed Oct 15 20:22:31 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
- instance_eval('path_query'). [ruby-list:38575]
-
-Wed Oct 15 17:24:45 2003 URABE Shyouhei <root@mput.dip.jp>
-
- * lib/cgi.rb (CGI::Cookie): tiny typo fix.
-
-Wed Oct 15 15:00:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_run): just return FAILURE instead of parse error
- count. [ruby-list:38569]
-
-Wed Oct 15 13:17:02 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/digest/digest.c (rb_digest_base_alloc): need to initialize
- buffer. [ruby-dev:21622]
-
-Wed Oct 15 11:23:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): dump extended modules as well.
-
- * marshal.c (r_object0): TYPE_USRMARSHAL should restore extended
- modules before invoking marshal_load. these two fixes are done
- by Masatoshi Seki <m_seki@mva.biglobe.ne.jp>.
-
-Wed Oct 15 09:30:34 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
-
- * ext/syck/syck.h: include stdio.h for definition of FILE.
-
-Wed Oct 15 08:09:07 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/bytecode.c: Checkin of YAML bytecode support.
-
- * ext/syck/gram.c: Ditto.
-
- * ext/syck/syck.c: Ditto.
-
- * ext/syck/token.c: Ditto.
-
- * ext/syck/handler.c: Ditto.
-
- * ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
-
- * ext/syck/rubyext.c: Ditto (on both counts).
-
-Wed Oct 15 05:05:53 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/generator.rb: A new library which converts an internal
- iterator to an external iterator.
-
- * lib/abbrev.rb: A new library which creates an abbreviation table
- from a list.
-
-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:
- new demo-scripts
-
- * 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>
-
- * test/digest/test_digest.rb: Moved from ext/digest/test.rb.
-
-Wed Oct 15 03:53:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
- on the last commit).
-
-Wed Oct 15 00:25:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): argument parentheses preceded by spaces should
- be warned; not error. [ruby-talk:84103]
-
-Wed Oct 15 00:20:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
- switch on threads smoothly and avoid seg-fault.
-
- * ext/tcltklib/tcltklib.c: add TclTkIp._thread_vwait and
- _thread_tkwait for waiting on a thread. (Because Tcl/Tk's vwait
- and tkwait command wait on an eventloop.)
-
- * ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
- _thread_tkwait.
-
- * ext/tk/lib/tk.rb: now, TkVariable#wait has 2 arguments.
- If 1st argument is true, waits on a thread. If false, waits on
- an eventloop. If 2nd argument is true, checks existence of
- rootwidgets. If false, doesn't. Default is wait(true, false).
-
- * ext/tk/lib/tk.rb: add TkVariable#tkwait(arg) which is equal to
- TkVariable#wait(arg, true). wait_visibility and wait_destroy
- have an argument for waiting on a thread or an eventloop.
-
- * ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
-
- * ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
- an eventloop'.
-
-Wed Oct 15 00:10:24 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
- SOAPBasetype and SOAPCompoundtype.
-
- * lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
- Encoding methods signature change. Pass SOAPGenerator as a parameter.
-
- * lib/soap/mapping/*, test/soap/marshal/test_marshal.rb: Refactoring
- for better marshalling/unmarshalling support. Now I think SOAP
- marshaller supports all kind of object graph which is supported by
- Ruby's original marshaller. Of course there could be bugs as always.
- Find it. :-)
-
- * lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
- DEBUG is too noisy.
-
- * lib/xsd/datatypes.rb: DateTime#of is obsoleted. Use DateTime#offset.
-
- * test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
- useless warning.
-
-Tue Oct 14 19:09:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_finalize_0): return the given exit status unless
- SystemExit got raised.
-
-Tue Oct 14 11:53:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (ruby_stop): never return.
-
- * ruby.h (ruby_run): ditto.
-
-Tue Oct 14 04:43:55 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (realpath): make ELOOP check bit more robust.
- (children): prepend self by default.
- (chroot): obsoleted.
-
-Tue Oct 14 02:29:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_require_safe): segfault after loading .so.
-
-Tue Oct 14 02:05:23 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
- module for the Enumerable interface.
-
-Mon Oct 13 23:55:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
- not "ruby".
-
-Mon Oct 13 23:57:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_feature_p): match by classified suffix.
-
- * eval.c (rb_require_safe): require library in the specified safe
- level.
-
- * variable.c (rb_autoload, rb_autoload_load): restore safe level
- when autoload was called. [ruby-dev:21338]
-
- * intern.h: prototypes; rb_require_safe.
-
- * test/runner.rb: accept non-option arguments.
-
-Mon Oct 13 20:49:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_new4): should not preserve FL_TAINT status in the
- internal shared string. [ruby-dev:21601]
-
- * string.c (rb_str_new4): ditto.
-
- * eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
-
- * process.c: ditto. [ruby-list:38521]
-
-Mon Oct 13 19:51:02 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * lib/debug.rb (debug_command): should enter emacs mode when
- assigned any value to the environment variable "EMACS".
- On Meadow, (getenv "EMACS") is "meadow".
-
-Sun Oct 12 14:45:03 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/win32ole/extconf.rb: check "windows.h", not "windows".
- [ruby-talk:84051]
-
-Sat Oct 11 20:41:03 2003 Corinna Vinschen <corinna@vinschen.de>
-
- * file.c (eaccess): Use access(2) on Cygwin.
-
-Sat Oct 11 17:09:21 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/rexml/quickpath.rb (REXML::QuickPath::match):
- escape '[' to avoid warning.
-
-Sat Oct 11 16:08:41 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (realpath): check existence of the file.
-
- * lib/pathname.rb (realpath): re-implemented.
- (realpath_root?, realpath_rec): removed
-
-Sat Oct 11 10:19:39 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
- Bystritsky.
-
-Fri Oct 10 07:50:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (is_defined): inheritance line adjustment as like as
- rb_call_super().
-
-Fri Oct 10 01:19:00 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): add
- optional argument to specify the DirectoryString type
- (ASN1::UTF8STRING by default). RFC3280 deprecates PrintableString
- for DirectoryString, and strongly requires to use UTF8String for
- all certificates issued after December, 31 2003.
-
- * ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
-
-Thu Oct 9 23:50:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): prevent thread from GC.
- [ruby-dev:21572]
-
-Thu Oct 9 19:11:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): non-volatile should be restored from
- volatile.
-
-Thu Oct 9 17:43:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (proc_save_safe_level, proc_get_safe_level,
- proc_set_safe_level): save/restore safe level 1..4.
-
-Thu Oct 9 16:33:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object0): remove unnecessary iv restoration for
- USRMARSHAL. [ruby-dev:21582]
-
- * marshal.c (w_object): dump generic instance variables from
- a string from '_dump'.
-
- * variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
- is not set.
-
- * time.c (time_dump): copy instance variables to dumped string, to
- be included in the marshaled data.
-
- * bignum.c (rb_big2ulong): add range check to ensure round trip.
-
-Thu Oct 9 15:45:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (uv_to_utf8): change message to "out of range", since
- negative values are not "too big". [ruby-dev:21567]
-
-Thu Oct 9 14:05:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
- [ruby-dev:21557]
-
-Thu Oct 9 10:51:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_yield_0): no error if block is empty.
-
-Thu Oct 9 06:43:33 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (localjump_error): id should be ID.
-
- * eval.c (rb_eval): nd_rval is set in copy_node_scope().
-
- * eval.c (rb_yield_0): unused variable.
-
- * eval.c (rb_yield_0): nothing to do for empty node.
-
- * eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
- [ruby-dev:21551]
-
- * eval.c (rb_thread_start_0): set the value by break as the result.
- [ruby-dev:21552]
-
- * eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
- variables across THREAD_SAVE_CONTEXT.
-
-Thu Oct 9 12:05:46 2003 Eric Sunshine <sunshine@sunshineco.com>
-
- * configure.in: revived NextStep, OpenStep, and Rhapsody ports which
- had become unbuildable; enhanced --enable-fat-binary option so that
- it accepts a list of desired architectures (rather than assuming a
- fixed list), or defaults to a platform-appropriate list if user does
- not provide an explicit list; made the default list of architectures
- for MAB (fat binary) more comprehensive; now uses -fno-common even
- when building the interpreter (in addition to using it for
- extensions), thus allowing the interpreter to be embedded into a
- plugin module of an external project (in addition to allowing
- embedding directly into an application); added checks for
- <netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
- ensures that -I/usr/local/include is employed when extensions'
- extconf.rb scripts invoke have_header() since extension checks on
- NextStep and OpenStep will fail without it if the desired resource
- resides in the /usr/local tree; fixed formatting of --help message.
-
- * Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
- invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
- (see configure's --enable-fat-binary option); added rule for new
- missing/getcwd.c.
-
- * defines.h: fixed endian handling during MAB build (see configure's
- --enable-fat-binary option) to ensure that all portions of the
- project see the correct WORDS_BIGENDIAN value (some extension modules
- were getting the wrong endian setting); added missing constants
- GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
- and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
- define in NeXT section.
-
- * dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
- NextStep since, on some installations, this value always resolves
- uselessly to zero.
-
- * dln.c: added error reporting to NextStep extension loader since the
- previous behavior of failing silently was not useful; now ensures
- that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
- for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
- on Rhapsody since this header lacks multiple-include protection,
- which resulted in "redefinition" compilation errors.
-
- * main.c: also create hard reference to objc_msgSend() on NeXT
- platforms (in addition to Apple platforms).
-
- * lib/mkmf.rb: now exports XCFLAGS from configure script to extension
- makefiles so that extensions can be built MAB (see configure's
- --enable-fat-binary option); also utilize XCFLAGS in cc_command()
- (but not cpp_command() because MAB flags are incompatible with
- direct invocation of `cpp').
-
- * ext/curses/extconf.rb: now additionally checks for presence of these
- curses functions which are not present on NextStep or Openstep:
- bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
- setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
- wscrl(), wsetscrreg()
-
- * ext/curses/curses.c: added appropriate #ifdef's for additional set of
- curses functions now checked by extconf.rb; fixed curses_bkgd() and
- window_bkgd() to correctly return boolean result rather than numeric
- result; fixed window_getbkgd() to correctly signal an error by
- returning nil rather than -1.
-
- * ext/etc/etc.c: setup_passwd() and setup_group() now check for null
- pointers before invoking rb_tainted_str_new2() upon fields extracted
- from `struct passwd' and `struct group' since null pointers in some
- fields are common on NextStep/OpenStep (especially so for the
- `pw_comment' field) and rb_tainted_str_new2() throws an exception
- when it receives a null pointer.
-
- * ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
- platforms such as NextStep and OpenStep which lack strdup().
-
- * ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
- gethostbyaddr(), and gethostbyname() from (const char*) to non-const
- (char*) for older platforms such as NextStep and OpenStep.
-
- * ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
- platforms such as NextStep and OpenStep which lack strdup(); include
- <netinet/in_systm.h> if present for NextStep and OpenStep; cast first
- argument of gethostbyaddr() and getservbyname() from (const char*) to
- non-const (char*) for older platforms.
-
- * ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
- platforms such as NextStep and OpenStep which lack strdup().
-
-Wed Oct 8 22:19:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit.rb: removed installation instructions.
-
- * lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
- central location.
-
- * lib/test/unit.rb: ditto.
-
- * lib/test/unit.rb: extracted the running code in to AutoRunner.
-
- * lib/test/unit/autorunner.rb: added.
-
- * lib/test/unit/collector/objectspace.rb: extracted common test
- collection functionality in to a module.
-
- * lib/test/unit/collector.rb: ditto; added.
-
- * test/testunit/collector/test_objectspace.rb: ditto.
-
- * lib/test/unit/collector/dir.rb: added. Supports collecting tests out
- of a directory structure.
-
- * test/testunit/collector/test_dir.rb: added.
-
- * test/runner.rb: simplified to use the new capabilities.
-
-Tue Oct 7 15:23:09 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
-
- * test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
-
- * test/ruby/endblockwarn.rb: new file added to test of END-in-method
- warning.
-
-Tue Oct 7 12:23:47 2003 Tanaka Akira <akr@m17n.org>
-
- * ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
-
- * ext/socket/extconf.rb: useless assignment removed.
-
-Tue Oct 7 09:13:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
- allowed in eval.
-
-Tue Oct 7 04:15:25 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt): should not expand mrhs if lhs is solely starred.
-
-Tue Oct 7 02:57:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt): rhs of multiple assignment should not be
- expanded using "to_a". [ruby-dev:21527]
-
-Tue Oct 7 01:42:34 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
- free function for ASN1_OBJECT.
-
- * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
- ASN1::ObjectId#sn; it returns short name text representation of OID.
-
- * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
- ASN1::ObjectId#ln; it returns long name text representation of OID.
-
- * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
- ASN1::ObjectId#oid; it returns numerical representation of OID.
-
-Mon Oct 6 22:59:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb (IOReader, BasicWriter): call binmode when a given IO
- respond_to?(:binmode). record separator was wrong when you gave
- text mode IO to Reader.parse and Writer.generate.
-
- * test/csv/test_csv.rb: add tests for above change.
-
-Mon Oct 6 16:23:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_object): wrong method name in the message.
-
-Mon Oct 6 16:02:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt): END in method should cause warning.
- [ruby-dev:21519]
-
-Mon Oct 6 15:17:23 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_iterator.rb (test_block_argument_without_paren):
- added. (follows sample/test.rb)
-
-Mon Oct 6 11:57:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
- test for eval-ed BEGIN END order.
-
-Mon Oct 6 09:19:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): should pass "weak" value to next level.
- [ruby-dev:21496]
-
- * eval.c (proc_alloc): should not use cached object if klass is
- different. [ruby-talk:83685]
-
-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>
-
- * eval.c (rb_f_END): block should be given. [ruby-dev:21497]
-
-Sun Oct 5 22:51:23 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/ext/openssl/extconf.rb: add check for some engine functions
- unavailable in OpenSSL-0.9.6.
-
- * lib/ext/openssl/ossl_engine.c: ditto.
-
-Sun Oct 5 17:56:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): fix evaluation order. [ruby-list:38431]
-
-Sun Oct 5 15:05:06 2003 akira yamada <akira@ruby-lang.org>
-
- * test/uri/*: translated RUNIT to Test::Unit.
-
-Sun Oct 5 14:37:39 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
-
- * test/soap/marshal/test_marshal.rb: ditto.
-
- * test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
- RUBYBIN.
-
-Sun Oct 5 13:47:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
- about scope, order and allowed syntax.
-
-Sun Oct 5 11:54:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/envutil.rb: added. split "rubybin" from test_system.rb.
-
- * test/ruby/test_system.rb: use envutil.rb
-
- * test/ruby/test_beginendblock.rb: added.
-
- * test/ruby/beginmainend.rb: added. used in test_beginendblock.rb.
-
-Sun Oct 5 11:23:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * test/testunit/runit/test_testresult.rb: removed some unnecessary
- cruft.
-
-Sun Oct 5 11:14:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/rubyunit.rb: aliasing TestCase into the top level is
- problematic.
-
- * lib/runit/assert.rb: fixed a couple of bugs caused by recent
- refactoring in Test::Unit.
-
- * test/testunit/runit/*: added.
-
-Sun Oct 5 10:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
- work. [ruby-dev:21484]
-
-Sun Oct 5 09:52:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: will use pp for output if available.
- Can be disabled by setting Assertions.use_pp = false.
-
- * test/testunit/test_assertions.rb: made a small change to exception
- formatting.
-
-Sun Oct 5 07:42:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: made small improvements to assertion
- messages. Deprecated Assertions#assert_not_nil; use #assert instead.
-
- * test/testunit/test_assertions.rb: ditto.
-
- * test/testunit/util/test_procwrapper.rb: use #assert instead of
- #assert_not_nil.
-
-Sun Oct 5 04:10:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: refactored message building.
-
-Sun Oct 5 03:40:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.h: global symbols should be declared
- as external.
-
-Sun Oct 5 03:03:20 2003 akira yamada <akira@ruby-lang.org>
-
- * test/ruby/test_exception.rb (test_else): added.
-
-Sun Oct 5 02:12:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: changed assertion messages to rely more
- heavily on #inspect. Added backtrace filtering for exceptions in
- assertion messages.
-
- * test/testunit/test_assertions.rb: ditto.
-
-Sun Oct 5 02:12:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/acl.rb, lib/drb/ssl.rb: added.
-
- * lib/drb/drb.rb: exit from a thread using 'break'.
-
-Sat Oct 4 21:49:14 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * gc.c (Init_stack): the type of space is changed to unsigned int
- from double. [ruby-dev:21483]
-
-Sat Oct 4 17:52:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/netHttpClient.rb: follow http-access2. hosts which matches
- ENV['no_proxy'] or ENV['NO_PROXY'] are not proxyed.
- - [,:] separated. ("ruby-lang.org:rubyist.net")
- - no regexp. (give "ruby-lang.org", not "*.ruby-lang.org")
- - if you want specify host by IP address, give full address.
- ("192.168.1.1, 192.168.1.2")
-
- * lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
-
- * test/runner.rb: give testsuite name.
-
-Sat Oct 4 15:16:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): instance variable dump do not cause error
- for objects that cannot be dumped, if they traversed from
- marshal_dump. they are just ignored.
-
- * gc.c (Init_stack): cast "space" (doble value) into unsigned
- int. should run on PowerPC.
-
- * eval.c (rb_eval): should not execute else part if any exception
- is caught. [ruby-dev:21482]
-
- * parse.y (f_args): should allow unparenthesized block argument.
-
- * parse.y (f_rest_arg): should allow unparenthesized rest
- argument.
-
-Sat Oct 4 14:59:51 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (initialize): raise ArgumentError if argument has
- '\0' character.
- (relative_path_from): new method.
- (each_entry): new method for replacement of dir_foreach.
- (foreach, foreachline, dir_foreach, chdir): obsoleted.
-
-Sat Oct 4 12:58:48 2003 akira yamada <akira@ruby-lang.org>
-
- * test/uri/* (6 files): added.
-
-Sat Oct 4 12:44:45 2003 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
-
-Sat Oct 4 07:33:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/testsuite.rb: changed #<< to return self, and added
- #delete.
-
- * test/testunit/test_testsuite.rb: ditto. Also slightly refactored
- #test_size.
-
- * lib/test/unit/collector/objectspace.rb: collector now preserves the
- hierarchy of suites.
-
- * test/testunit/collector/test_objectspace.rb: ditto.
-
-Sat Oct 4 04:48:49 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/rubyext.c: default keys handled.
-
- * ext/syck/syck.h: lowered default buffer size to 16k for increased
- performance.
-
- * test/yaml: checkin of basic unit tests.
-
-Sat Oct 4 04:24:19 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: add check for X509V3_set_nconf.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
- cannot implement if X509V3_set_nconf doesn't exist.
-
-Sat Oct 4 02:12:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/xsd/datatypes.rb: dump sign by itself. under the problematic
- platform, sprintf("%+.10g", -0.0) => +0. sigh.
-
- * sample/wsdl/amazon/*: update schema ver2 to ver3.
-
-Sat Oct 4 01:33:46 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (initialize): duplicate and freeze argument.
- (to_s): return duplicated string.
- (children): new method.
- (each_line): new alias to foreachline.
-
-Fri Oct 3 16:13:19 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c: add DER encoder and decoder.
-
- * ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
-
- * ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
-
- * ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
-
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
- DER encoded data argument.
-
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
- DER encoded data in OpenSSL::ASN1 types.
-
-Fri Oct 3 13:02:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit.rb: refactored to use optparse.
-
- * lib/test/unit.rb: added support for selecting the output
- level from the command-line.
-
- * lib/test/unit.rb: added a command-line switch to stop processing
- the command-line, allowing arguments to be passed to tests.
-
- * lib/test/unit.rb: changed the method for specifying a runner or a
- filter from the command-line.
-
- * lib/test/unit/collector/objectspace.rb: fixed a bug causing all
- tests to be excluded when the filter was set to an empty array.
-
- * test/testunit/collector/test_objectspace.rb: ditto.
-
-Fri Oct 3 08:14:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
- 'class ::Foo' syntax. [ruby-talk:83514]
-
-Fri Oct 3 08:01:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: added a default message for #assert,
- #assert_block, and #flunk.
-
- * test/testunit/test_assertions.rb: ditto.
-
- * lib/test/unit/failure.rb: failures now show a better trace of where
- they occurred.
-
- * test/testunit/test_failure.rb: ditto (added).
-
- * lib/test/unit/testcase.rb: ditto.
-
- * test/testunit/test_testcase.rb: ditto.
-
- * lib/test/unit/util/backtracefilter.rb: added.
-
- * test/testunit/util/test_backtracefilter.rb: added.
-
- * lib/test/unit/error.rb: changed to use BacktraceFilter and improved
- output.
-
- * test/testunit/test_error.rb: ditto.
-
-Thu Oct 2 20:33:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_failure_initialize): conform with
- orthodox initialization method.
-
- * ext/iconv/iconv.c (iconv_fail): initialize exception instance
- from the class, and do not share instance variables with the
- others. [ruby-dev:21470]
-
-Thu Oct 2 18:20:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (Init_Time): define initialize. [ruby-dev:21469]
-
-Thu Oct 2 17:39:38 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
- it supports OpenSSL hardware cryptographic engine interface.
-
- * ext/openssl/ossl_engine.h: ditto.
-
- * ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
-
- * ext/openssl/extconf.rb: add check for openssl/engine.h.
-
- * ext/openssl/ossl.c: call Init_ossl_engine().
-
- * ext/openssl/ossl.h: include openssl/engine.h.
-
- * ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
- EVP_PKEY referes engine.
-
-Thu Oct 2 17:22:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_load): restore instance variables (if any) before
- loading from marshaled data.
-
-Thu Oct 2 14:19:15 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
- set error object to $!.
-
- * ext/iconv/iconv.c (iconv_convert): error handler block should
- return appended part and the rest. if rest is nil, the
- conversion stops.
-
-Thu Oct 2 12:00:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_const_defined_0): look up constants in Object as
- well. [ruby-dev:21458]
-
- * test/ruby/test_defined.rb (TestDefined::test_defined): test for
- constants.
-
-Thu Oct 2 11:17:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/assertions.rb: should not capture an
- AssertionFailedError unless explicitly requested.
-
- * test/testunit/test_assertions.rb: ditto.
-
- * test/testunit/collector/test_objectspace.rb: fixed a test failure
- caused by methods being returned in different orders on different
- platforms by moving test sorting from TestSuite into the locations
- where suites are constructed. [ruby-talk:83156]
-
- * lib/test/unit/testcase.rb: ditto.
-
- * lib/test/unit/testsuite.rb: ditto.
-
- * lib/test/unit/collector/objectspace.rb: ditto.
-
-Thu Oct 2 03:25:01 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_thread_raise): prototype; avoid VC++ warning.
-
-Thu Oct 2 01:37:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_mdump): new marshal dumper. _dump is still
- available for compatibility.
-
- * time.c (time_mload): new marshal loader.
-
- * marshal.c (w_object): preserve instance variables for objects
- with marshal_dump.
-
- * marshal.c (r_object0): restore instance variables before calling
- marshal_load.
-
- * error.c (rb_warn_m): always return nil.
-
-Thu Oct 2 01:32:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_block_given_p): real required condition is
- ruby_frame->prev->iter == ITER_CUR.
-
- * eval.c (rb_block_given_p): ditto.
-
- * eval.c (block_pass): update ruby_frame->iter only when previous
- value is ITER_NOT.
-
-Thu Oct 2 01:02:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_defined_at): should exclude constants from
- Object when TYPE(klass) == T_MODULE *and* exclude is on.
- [ruby-dev:21458]
-
- * variable.c (rb_const_get_0): do not lookup constants from Object
- when TYPE(klass) == T_MODULE *and* exclude is on.
-
-Thu Oct 2 00:21:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/logger/test_logger.rb: unlinking file before close causes
- problem under win32 box.
-
- * lib/xsd/datatypes.rb(XSDFloat, XSDDouble): add +/- sign explicitly
- when stringified and embedded into XML instance. Ruby's sprintf may
- format -0.0 as "0.0" (no minus sign) depending on underlying C
- sprintf implementation.
-
- * test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
-
- * test/soap/calc/*: give httpd config param "CGIInterpreter".
- "/usr/bin/env ruby" thing does not work under non-Unix boxes.
-
-Thu Oct 2 00:25:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * signal.c (ruby_signal_name): adjust to the prototype.
-
- * process.c (pst_inspect): ditto.
-
- * ext/etc/etc.c (etc_getgrent, Init_etc): typo.
-
-Wed Oct 1 20:49:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (heaps): manage slots and limits together. [ruby-dev:21453]
-
- * gc.c (add_heap): should not clear heaps slot even if realloc()
- failed.
-
-Wed Oct 1 20:36:49 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * MANIFEST: add wince/mkconfig_wce.rb.
-
-Wed Oct 1 17:22:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
- setgrent, getgrent, endgrent.
-
- * ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
-
-Wed Oct 1 17:01:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_load): Object scope had priority over required file
- scope. [ruby-dev:21415]
-
-Wed Oct 1 14:09:53 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/mkconfig_wce.rb: sorry, forget to commit.
-
-Wed Oct 1 10:08:42 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/setup.mak: add sigmarionIII SDK support.
-
- * wince/Makefile.sub: ditto.
-
- * wince/mkexports.rb: fix linker error in SH4.
-
- * wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
-
-Wed Oct 1 08:02:52 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/time_wce.c (time): add zero check.
-
-Tue Sep 30 16:11:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * Makefile.in: copy lex.c from $(srcdir) if it's not the current
- directory. [ruby-dev:21437]
-
-Tue Sep 30 11:29:23 2003 Tanaka Akira <akr@m17n.org>
-
- * process.c (pst_inspect): describe stopped process "stopped".
-
-Tue Sep 30 09:31:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/runner.rb: glob for directories.
-
-Tue Sep 30 09:11:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): while/until should not capture break unless
- they are destination of the break.
-
-Tue Sep 30 03:12:02 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (finish): revert to 1.93.
-
- * lib/net/pop.rb (finish): revert to 1.60.
-
- * lib/net/smtp.rb (finish): revert to 1.67.
-
- * lib/net/http.rb (do_start): ensure to close socket if failed to
- start session.
-
- * lib/net/pop.rb (do_start): ditto.
-
- * lib/net/smtp.rb (do_start): ditto.
-
- * lib/net/smtp.rb: SMTP#started? wrongly returned false always.
-
-Tue Sep 30 02:54:49 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/ruby/test_iterator.rb: new test
- test_break__nested_loop[123].
-
-Mon Sep 29 23:39:13 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (finish): does not raise IOError even if
- !started?, to allow closing socket which was opened before
- session started.
-
- * lib/net/pop.rb (finish): ditto.
-
- * lib/net/smtp.rb (finish): ditto.
-
-Mon Sep 29 19:06:51 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/win32ole/extconf.rb: add windows.h checking.
- (ruby-bugs:PR#1185)
-
-Mon Sep 29 16:18:30 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: check if the given logdevice object respond_to :write
- and :close, not is_a? IO. duck duck.
-
- * test/logger/test_logger.rb: self IO.pipe reading/writing may be
- locked by the flood. use tempfile.
-
- * lib/wsdl/xmlSchema/data.rb: wrong constant reference.
-
-Mon Sep 29 16:11:23 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: clean up temporary symlink.
- Patched by NaHi. [ruby-dev:21420]
-
-Mon Sep 29 11:16:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_atfork): wrong format specifier.
- [ruby-dev:21428]
-
- * process.c (pst_inspect): better description.
-
-Mon Sep 29 02:31:44 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/utils.rb (Utils::su): use setgid and setuid to
- set real and effective IDs. and setup group access list by
- initgroups.
-
-Sun Sep 28 11:14:19 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
- `initialize_copy' should be defined.
-
- * ext/stringio/stringio.c (Init_stringio): ditto.
-
-Sat Sep 27 18:25:13 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
- $KCODE = "NONE" environment. check added.
-
- * test/xsd/test_xsd.rb: add tests for above fix.
-
-Sat Sep 27 15:58:50 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
-
- * lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
- a chance to reset logging severity threshold.
-
- * test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
- silent.
-
-Sat Sep 27 09:44:18 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/test_fileutils.rb: clear all errors on Windows.
- [ruby-dev:21417]
-
- * test/fileutils/test_nowrite.rb: ditto.
-
-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
- behaviour now.
-
- * test/soap/marshal/test_digraph.rb: should close before unlink.
- unlink-before-close pattern is not needed here.
-
-Sat Sep 27 03:32:37 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into
- each module namespace. TestMarshal in
- test/soap/marshal/test_marshal.rb crashed with
- test/ruby/test_marshal.rb.
-
-Sat Sep 27 01:30:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect): on win32, type of the 4th
- argument of getsockopt is char *.
-
-Fri Sep 26 18:35:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/resolv-replace.rb: 1.8 compliance. [ruby-talk:82946]
-
-Fri Sep 26 17:39:27 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_marshal.rb: add test for ruby's objects.
-
-Fri Sep 26 09:52:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * defines.h (flush_register_windows): use volatile only for gcc on
- Solaris. [ruby-dev:21403]
-
- * lib/mkmf.rb (xsystem): use system directly to honor shell meta
- charaters.
-
-Fri Sep 26 00:10:13 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/README: updated.
-
-Thu Sep 25 17:48:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
- rb_protect.
-
- * ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
- value.
-
-Thu Sep 25 09:00:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/ostruct.rb: Added OpenStruct#==.
-
- * test/ostruct/test_ostruct.rb: Added.
-
-Thu Sep 25 07:55:26 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/win32ole/win32ole.c, ext/openssl/ossl_pkey_dsa.c,
- ext/openssl/ossl_pkey_rsa.c, ext/bigdecimal/bigdecimal.h: must
- not use C++ or C99 style comment yet. (ruby-bugs:PR#1184)
-
-Thu Sep 25 00:23:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * MANIFEST: add SOAP4R.
-
-Thu Sep 25 00:13:15 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/soap/* (29 files): SOAP4R added.
-
- * lib/wsdl/* (42 files): WSDL4R added.
-
- * lib/xsd/* (12 files): XSD4R added.
-
- * test/soap/* (16 files): added.
-
- * test/wsdl/* (2 files): added.
-
- * test/xsd/* (3 files): added.
-
- * sample/soap/* (27 files): added.
-
- * sample/wsdl/* (13 files): added.
-
-Wed Sep 24 02:08:11 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
- [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
-
-Tue Sep 23 23:10:16 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: add Logger#<<(msg) for writing msg without any
- formatting.
-
- * test/logger/test_logger.rb: ditto.
-
-Tue Sep 23 20:47:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_warn_m): should not warn if -W0 is specified.
- [ruby-talk:82675]
-
-Mon Sep 22 21:28:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * MANIFEST: updated.
-
-Mon Sep 22 19:22:26 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * configure.in (AC_CHECK_FUNCS): add setuid and setgid.
-
-Mon Sep 22 12:34:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_strtod): skip preceding zeros before counting
- digits in the mantissa. (ruby-bugs:PR#1181)
-
-Sun Sep 21 04:12:36 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
- should be a String.
-
- * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
-
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
-
-Sat Sep 20 11:49:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: typo fixed.
-
- * test/logger/test_logger.rb: new file.
-
-Fri Sep 19 11:39:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * test/testunit/*: Added.
-
- * lib/test/unit.rb: Documentation update.
-
- * lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
- Ditto.
-
- * lib/test/unit.rb: Factored out an ObjectSpace collector.
-
- * lib/test/unit/collector/objectspace.rb: Ditto.
-
- * sample/testunit/*: Added.
-
-Fri Sep 19 01:00:48 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
- condition.
-
- * lib/webrick/log.rb (BasicLog#format): add "\n" to message.
-
-Thu Sep 18 22:43:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
-
- * eval.c (proc_invoke): should update "result" for orphans.
-
-Thu Sep 18 20:33:03 2003 Tietew <tietew-ml-ruby-list@tietew.net>
-
- * parse.y (str_xquote): do not prepend escapes in
- backqoute literals. [ruby-list:38409]
-
-Thu Sep 18 20:30:17 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb: update document.
-
-Thu Sep 18 15:27:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/logger.rb: new file. Logger, formerly called devel-logger or
- Devel::Logger.
-
- * sample/logger/*: new file. samples of logger.rb.
-
-Wed Sep 17 23:41:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (localjump_destination): should not raise ThreadError
- exception for "break". [ruby-dev:21348]
-
- * eval.c (proc_invoke): use result instead of prot_tag->retval.
- retval is no longer propagated to the ancestors.
-
-Wed Sep 17 20:34:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (tokadd_string, parse_string, yylex): escaped terminator
- is now interpreted as is. [ruby-talk:82206]
-
-Wed Sep 17 18:52:36 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/fileutils/fileassertions.rb: new file.
-
- * test/fileutils/test_fileutils.rb: new file.
-
- * test/fileutils/test_nowrite.rb: new file.
-
-Wed Sep 17 18:51:02 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/strscan/test_stringscanner.rb: require test/unit.
-
-Wed Sep 17 18:35:34 2003 Minero Aoki <aamine@loveruby.net>
-
- * test/strscan/test_stringscanner.rb: new file.
-
-Wed Sep 17 18:03:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl: all files are reviewed to simplify and avoid memory leak.
-
- * ext/openssl/extconf.rb: add check for assert.h.
-
- * ext/openssl/ossl.c (ossl_buf2str): new function to convert
- C buffer to String and free buffer.
-
- * ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
- Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
-
- * ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
- functions to convert object to DER string.
-
- * ext/openssl/ossl.h: ditto.
-
- * ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
- BIO to String object and free BIO.
-
- * ext/openssl/ossl_bio.h: ditto.
-
- * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
-
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
-
- * ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
- and reimplement in openssl/x509.rb.
-
- * ext/openssl/ossl_x509attr.c: reimplemented and disable some
- method temporarily. this class doesn't work fine without ASN.1
- data support;-) I'll rewrite in near future.
-
- * ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
- unused code.
-
- * ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
-
-Tue Sep 16 22:25:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/csv/test_csv.rb: add negative tests of row_sep.
-
-Tue Sep 16 18:02:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): should not translate character
- class range edge. [ruby-list:38393]
-
-Tue Sep 16 16:47:56 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * MANIFEST: add test/csv/mac.csv.
-
- * win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
-
-Mon Sep 15 19:02:52 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb: add extra pamameter to specify row(record) separater
- character. To parse Mac's CR separated CSV, do like this.
- CSV.open("mac.csv", "r", ?,, ?\r) { |row| p row.to_a }
- The 3rd parameter in this example ?, is for column separater and the
- 4th ?\r is for row separater. Row separater is nil by default. Nil
- separater means "\r\n" or "\n".
-
- * test/csv/test_csv.rb: add tests for above feature.
-
- * test/csv/mac.csv: added. Sample CR separated CSV file.
-
-Fri Sep 12 22:41:48 2003 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
-
- * ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
-
- * ext/openssl/ossl_asn1.[ch]: new files
-
- * ext/openssl/ossl_bio.[ch]: new files
-
-Fri Sep 12 12:30:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (rb_disable_super, rb_enable_super): replace with dummy
- expressions instead of prototypes. the functions remain yet for
- binary compatibility. [ruby-talk:81758]
-
-Fri Sep 12 12:09:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_and): convert argument using 'to_int'.
-
- * bignum.c (rb_big_or): ditto.
-
- * bignum.c (rb_big_xor): ditto.
-
-Fri Sep 12 07:06:14 2003 David Black <dblack@superlink.net>
-
- * lib/scanf.rb: Took out useless @matched_item variable; some small
- refactoring.
-
-Thu Sep 11 08:43:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
- name is not tainted.
-
- * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
- Supports StringIO.
-
-Wed Sep 10 22:47:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.h: add a workaround for win32 platform.
- libeay32.dll doesn't export functions defined in conf_api.h.
-
- * ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
-
- * ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
-
- * ext/openssl/ossl_config.c (set_conf_section_i): should check
- if the argument is Array.
-
-Wed Sep 10 22:41:54 2003 Tietew <tietew@tietew.net>
-
- * eval.c (win32_get_exception_list): avoid VC7 warning.
- [ruby-win32:577]
-
-Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (struct tag): dst should be VALUE.
-
- * eval.c (localjump_destination): stop at the scope where the current
- block was created. [ruby-dev:21353]
-
-Tue Sep 9 05:17:04 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
-
-Tue Sep 9 02:41:35 2003 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * ext/openssl/ossl_config.c: Refine compatibility.
-
-Tue Sep 9 01:50:45 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
- the message.
-
- * lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
-
-Mon Sep 8 22:15:33 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/multi-tk.rb: modify security check at creating
- a new interpreter
-
-Mon Sep 8 20:00:12 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb, lib/optparse/version.rb: search also all
- capital versions.
-
-Mon Sep 8 19:26:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
-
- * ext/openssl/ossl_config.c: refine all with backward compatibility.
-
- * ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
-
- * ext/openssl/ossl_x509.c: added new constants under X509 module.
- DEFAULT_CERT_AREA, DEFAULT_CERT_DIR, DEFAULT_CERT_FILE,
- DEFAULT_CERT_DIR_ENV, DEFAULT_CERT_FILE_ENV and DEFAULT_PRIVATE_DIR.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
- the members of the struct. it's left to GC.
-
- * ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
-
- * ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
- add attr readers: issuer_certificate, subject_certificate,
- subject_request, crl and config.
-
-Mon Sep 8 18:26:41 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
- instead of config[:Port] or req.request_uri.port.
-
- * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
-
- * lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
-
- * lib/webrick/config.rb: :Listen option never be used.
-
- * lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
- option and add warning message.
-
- * lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
-
- * lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
-
-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
-
-Sat Sep 6 02:26:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_*.rb: assert_same, assert_match, and so on.
-
-Sat Sep 6 18:45:46 2003 Mauricio Fernandez <batsman.geo@yahoo.com>
-
- * parse.y (assignable): call rb_compile_error(), not rb_bug().
- [ruby-core:01523]
-
-Sat Sep 6 17:40:41 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ruby_missing.c: rid of unnecessary backward
- compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
- all sources.
-
- * ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
-
- * ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
-
- * ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
-
- * ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
-
-Sat Sep 6 01:23:22 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
-
- * win32/win32.c (CreateChild): fix condition about whether to call
- shell or not.
-
-Sat Sep 6 00:36:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * Makefile.in (test): phony target.
-
- * lib/mkmf.rb (have_library, find_library): configure by library
- name.
-
- * lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
- array as argument.
-
- * test/ruby/test_*.rb: moved invariants to left side in
- assert_equal, and use assert_nil, assert_raises and so on.
-
- * win32/win32.c (isInternalCmd): distinguish command.com and
- cmd.exe.
-
- * win32/win32.c (make_cmdvector): a character just after wildcard
- was ignored. [ruby-core:01518]
-
-Fri Sep 5 20:27:08 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
-
-Fri Sep 5 18:00:51 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
-
- * ext/openssl/ossl_digest.c: add ossl_digest_new().
-
- * ext/openssl/ossl_digest.h: ditto.
-
- * ext/openssl/ossl_cipher.c: add ossl_cipher_new().
-
- * ext/openssl/ossl_cipher.h: ditto.
-
-Fri Sep 5 15:32:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
- search delimiter forward if found in backward.
-
-Fri Sep 5 13:32:48 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/runner.rb: arguments should be keys.
-
-Fri Sep 5 12:09:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/ruby/test_system.rb (test_system): check existence of ruby
- interpreter.
-
-Fri Sep 5 11:32:17 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (--version): fix assignment/reference order.
-
- * lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
- be deprecated in future.
-
- * lib/optparse/version.rb (OptionParser#show_version): hide Object.
-
- * test/runner.rb: fix optparse usage.
-
- * test/runner.rb: glob all testsuits if no tests given.
-
-Fri Sep 5 10:42:58 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/runner.rb: added. gets testcases from command line and runs it.
-
- * test/ruby/test_gc.rb: remove useless part which was for dumping test
- result.
-
-Fri Sep 5 09:28:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_gc.rb: added. splitter.rb which I made to split
- sample/test.rb into test/ruby/test_* kindly removed GC test (the
- last section in the original test) to reduce things to be worried.
-
-Fri Sep 5 03:00:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/ruby/test_iterator.rb (test_block_in_arg): add no block
- given tests.
-
- * test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
- test.
-
-Fri Sep 5 01:10:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby: tests for ruby itself.
-
- * test/ruby/test_*.rb: split sample/test.rb into 28 test/unit testcases.
- some tests could not be translates... search '!!' mark to see it.
-
- * test/csv/test_csv.rb: should require 'csv', not '../lib/csv'. test
- runner should set load path correctly.
-
-Fri Sep 5 01:03:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/csv/test_csv.rb: close opened files for CSV::IOBuf explicitly.
- opened file cannot be removed under win32 box.
-
-Thu Sep 4 23:59:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (tokadd_string): newlines have no special meanings in
- %w/%W, otherwise they are ignored only when interpolation is
- enabled. [ruby-dev:21325]
-
-Thu Sep 4 19:38:25 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * ext/io/wait/.cvsignore: added.
-
- * ext/openssl/.cvsignore: added.
-
-Thu Sep 4 19:28:24 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * sample/openssl: added. Sample of standard distribution library
- should be locate in sample/{module_name}/*.
-
- * ext/openssl/sample/*: removed. move to sample/openssl/*.
-
-Thu Sep 4 18:02:15 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/csv/test_csv.rb: use remove_const to reduce warnings. use
- Dir.tmpdir to locate working files.
-
-Thu Sep 4 17:41:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
- valid delimiter.
-
- * misc/ruby-mode.el (ruby-here-doc-end-match): must quote
- arbitrary string to use as regexp.
-
- * misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): must not
- call `ruby-here-doc-end-match' unless `ruby-here-doc-beg-re'
- matched.
-
-Thu Sep 4 15:40:07 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/csv/test_csv.rb: run on test/unit original layer.
-
-Thu Sep 4 12:54:50 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/token.c: headerless documents with root-level spacing now
- honored.
-
-Thu Sep 4 00:06:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (mark_frame_adj): need to adjust argv pointer if using
- system's alloca. [ruby-core:01503]
-
-Wed Sep 3 21:33:20 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test: add test directory. Test::Unit aware testcases and needed
- files should be located in this directory. dir/file name convention;
- test/{module_name}/test_{testcase_name}.rb
- test/{module_name}/{needed_files}
- someday, someone will write testrunner which searches test_*.rb and
- run testcases automatically.
-
- * test/csv/*: add testcase for lib/csv.rb.
-
-Wed Sep 3 01:37:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_gets): should call next_argv() before type check
- current_file. [ruby-list:38336]
-
-Tue Sep 2 20:37:15 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
- for skipping server verification.
-
-Tue Sep 2 23:36:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should retrieve retval when pcall is true.
-
-Tue Sep 2 14:09:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
- the patch is submitted by nmu <nmu@users.sourceforge.jp>.
-
- * ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
- some platforms.
-
- * ext/socket/getnameinfo.c (getnameinfo): ditto.
-
-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}:
- bug fix and improvement of font control
-
-Tue Sep 2 09:51:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): should not handle exceptions within rescue
- argument. [ruby-talk:80804]
-
-Tue Sep 2 00:44:37 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * re.c (rb_memsearch): fix overrun. [ruby-talk:80759]
-
-Tue Sep 2 00:41:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (map_charset): use lower case keys.
-
- * ext/iconv/iconv.c (iconv_fail): just yield error and return the
- result if a block is given.
-
- * ext/iconv/iconv.c (iconv_convert): yield error and append the
- result if a block is given.
-
- * ext/iconv/charset_alias.rb (charset_alias): optional third
- argument.
-
- * ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
- SHIFT_JIS on cygwin.
-
-Mon Sep 1 18:34:25 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): make tail recursion in ELSE clause of
- RESCUE a jump.
-
-Mon Sep 1 18:00:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
- Dave Butcher.
-
- * eval.c (Init_Thread): protect thgroup_default. suggested by Guy
- Decoux in [ruby-talk:80623]
-
-Mon Sep 1 16:59:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
- thread termination.
-
- * eval.c (rb_thread_start_0): should not error_print() within
- terminated thread, because $stderr used by it might be
- overriden now. [ruby-dev:21280]
-
-Sun Aug 31 22:46:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (TAG_DST()): take no argument.
-
- * process.c (p_gid_sw_ensure): return VALUE.
-
-Sun Aug 31 22:27:10 2003 Hidetoshi NAGAI <nagai@dumbo.ai.kyutech.ac.jp>
-
- * process.c (p_gid_sw_ensure): lack of function type
-
-Sun Aug 31 12:25:06 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb: --version takes an optional argument; "all" or
- a list of package names.
-
-Sun Aug 31 10:17:02 2003 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: yyyy/mm is not an acceptable format.
-
- * lib/time.rb: follow above.
-
-Sat Aug 30 14:25:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_iter_break): should not call TAG_JUMP directly.
-
-Sat Aug 30 03:58:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
-
- * eval.c (POP_TAG): no longer propagate retval. retval is now set
- directly by localjump_destination().
-
- * eval.c (localjump_destination): new function to cast
- return/break local jump.
-
- * eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
-
-Fri Aug 29 22:35:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
- then result will be the same as +,-,*,/ respectively.
-
-Fri Aug 29 17:30:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * process.c: bug fix
-
- * process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
-
- * 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: can create a interpreter without Tk
-
- * ext/tcltklib/tcltklib.c: bug fix on handling exceptions
-
- * ext/tcltklib/MANUAL.euc: modify
-
- * ext/tk/lib/tk.rb: freeze some core modules
-
- * ext/tk/lib/multi-tk.rb: more secure
-
- * ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
- Tk's list
-
- * 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/tkfont.rb: TkFont.new() accepts compound fonts
-
-Thu Aug 28 22:07:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_autoload_load): call const_missing if autoloading
- constant is not defined to allow hook.
-
- * eval.c (rb_eval): use rb_const_get_from() instead of
- rb_const_get_at().
-
- * eval.c (is_defined): forgot to check NODE_COLON3.
-
-Thu Aug 28 17:30:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_get_0): should check constants defined in
- included modules, if klass is Object. [ruby-talk:79302]
-
- * numeric.c (check_uint): check should be done using UINT_MAX, not
- INT_MAX. this fix is submitted by Lyle Johnson
- <lyle@knology.net> in [ruby-core:01486]
-
-Thu Aug 28 05:02:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (singleton): typo fixed (ruby-bugs-ja:PR#562)
-
-Thu Aug 28 02:37:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
- consistent with *a = [1], which set [[1]] to a.
-
- * node.h: merge NODE_RESTARY to NODE_SPLAT.
-
- * parse.y: rules simplified a bit by removing NODE_RESTARY.
-
- * sample/test.rb: updated for new assignment behavior.
-
-Wed Aug 27 22:33:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (rb_bug): should not use other methods; this function is
- not for ordinary use. [ruby-dev:21259]
-
-Wed Aug 27 15:07:57 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
- response. [ruby-list:38279]
-
-Wed Aug 27 05:10:15 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (map_errno): support winsock error.
-
- * win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
- kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime):
- pass errno to map_errno().
-
- * win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
- rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
- rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
- rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
- rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
- rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
- rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
- rb_w32_fclose, rb_w32_close): use map_errno().
-
- * win32/win32.h: add winsock errors.
-
-Tue Aug 26 23:53:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
- frozen OpenStruct. [ruby-talk:80214]
-
-Tue Aug 26 20:03:50 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_tmpsrc): add the hook for source.
- [ruby-list:38122]
-
-Tue Aug 26 15:59:53 2003 why the lucky stiff <why@ruby-lang.org>
-
- * implicit.c (syck_type_id_to_taguri): corrected detection of
- x-private types.
-
-Sun Aug 24 01:02:48 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): performance improvement.
- [ruby-talk:79748]
-
-Sat Aug 23 23:41:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
- apparent cases. [ruby-talk:79748]
-
-Sat Aug 23 18:56:53 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/nkf/nkf.c (rb_nkf_putchar): should use rb_str_resize() to just
- resize a string, rb_str_cat() disallows NULL. [ruby-dev:21237]
-
-Sat Aug 23 16:48:41 2003 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
-
-Sat Aug 23 15:59:58 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
- EXEC_TAG() for retry. [ruby-dev:21216]
-
-Sat Aug 23 02:32:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_splat): should check if "values" is array.
-
- * enum.c (each_with_index_i): typo.
-
-Fri Aug 22 17:07:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (inject_i): use rb_yield_values.
-
- * enum.c (each_with_index_i): ditto.
-
- * eval.c (rb_yield_splat): new function to call "yield *values".
-
- * string.c (rb_str_scan): use rb_yield_splat().
-
-Fri Aug 22 06:13:22 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/rubyext.c: refactoring of the transfer method
- dispatch. added yaml_org_handler for faster dispatch of
- transfers to base types.
-
- * lib/yaml/rubytypes.rb: removed handling of builtins from
- Ruby library.
-
- * ext/syck/token.c: quoted and block scalars are now implicit !str
-
- * ext/syck/implicit.c: empty string detected as !null.
-
-Fri Aug 22 01:00:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (block_pass): improve passing current block.
-
-Fri Aug 22 00:13:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
- fixed, and VpNmlz() speed up.
-
-Wed Aug 20 16:44:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect): many systems seem to have
- a problem in select() after EINPROGRESS. [ruby-list:38080]
-
-Wed Aug 20 01:31:17 2003 why the lucky stiff <why@ruby-lang.org>
-
- * ext/syck/syck.h: Parser definition problems on HP-UX.
- [ruby-talk:79389]
-
- * ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
-
- * ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
-
- * ext/syck/rubyext.c: Tainting issues.
-
-Tue Aug 19 23:20:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
-
- * 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>
-
- * lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
-
- * lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
-
- * lib/webrick/compat.rb (File::fnmatch): remove old migration code.
-
- * lib/webrick/httpserver.rb (HTTPServer#run): ditto.
-
- * lib/webrick/server.rb (GenericServer#listen): the body of this
- method is pull out as Utils::create_lisnteners.
-
- * lib/webrick/utils.rb (Utils::create_lisnteners): new method.
-
- * lib/webrick/server.rb (GenericServer#start): should rescue
- unknown errors. and refine comments.
-
- * ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
- socket if SSLSocket raises error.
-
-Tue Aug 19 07:47:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
- a builtin.
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
-
- * ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
- add a return to the tails of each line.
-
- * ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
-
- * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
-
- * ext/openssl/sample/echo_svr.rb: use SSLServer.
-
- * ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
-
-Tue Aug 19 01:24:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
- headers are inconsistent at this macro. [ruby-core:01432]
-
- * ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
-
- * ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
- winspool.h
-
- * instruby.rb: make list at first instead of iterator.
- [ruby-talk:79347]
-
-Mon Aug 18 11:23:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (glob_helper): preserve raw order for **.
-
-Sun Aug 17 23:39:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
-
-Sun Aug 17 17:10:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (SSLSocket#sync_close=): add a
- method to specify if the underlying IO will be closed in
- SSLSocket#close.
-
- * ext/openssl/lib/openssl/buffering.rb: add forwarders to
- setsockopt, getsockopt and fcntl.
-
- * ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
-
-Sun Aug 17 11:32:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): should not force to remake Makefile when
- installation and so on.
-
-Sat Aug 16 23:58:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (w_symbol, w_object): get rid of warnings.
-
- * re.c (rb_memsearch): ditto.
-
- * time.c (time_dump): ditto.
-
- * ext/extmk.rb (extmake): not continue making when extconf.rb
- failed.
-
- * ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
-
- * ext/openssl/ossl.h: remove version.h dependency.
-
- * ext/openssl/ruby_missing.h: ditto.
-
- * lib/mkmf.rb (pkg_config): use --libs output except with
- only-L for other options. [ruby-list:38099]
-
- * lib/mkmf.rb (create_makefile): separate rule for static
- library from shared object.
-
- * win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
- define exec_prefix and libdir.
-
-Fri Aug 15 23:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
- method fixed.
-
- * ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
-
-Fri Aug 15 12:01:44 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]
- http://www.geocities.co.jp/SiliconValley-PaloAlto/1409/ruby/beos.html
-
- * error.c (syserr_eqq): errno might exceed Fixnum limit.
-
- * error.c (Init_Exception): moved base initialization from
- init_syserr().
-
- * inits.c (rb_call_inits): postpone initializing errnos until
- Bignum is available.
-
-Fri Aug 15 12:01:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
- keyname() and so on be declared.
-
- * ext/curses/curses.c (curses_resizeterm, window_resize):
- arguments conflicted with macros in term.h.
-
- * ext/curses/curses.c (Curses module methods): ensure
- initialized. [ruby-dev:21191]
-
-Fri Aug 15 02:08:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (id2ref): recycle check should be done by klass == 0.
- [ruby-core:01408]
-
-Fri Aug 15 01:34:23 2003 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * ext/openssl/ossl_pkey.c: move generate_cb here
-
- * ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
-
- * ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
-
- * ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
-
-Fri Aug 15 00:38:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
-
- * ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
-
- * ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
-
-Thu Aug 14 21:19:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_Thread): Continuation#[] added. [ruby-talk:79028]
-
-Thu Aug 14 20:03:34 2003 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (OLE_FREE): should not call
- ole_message_loop.
-
- * ext/win32ole/win32ole.c (ole_event_free): ditto.
-
- * ext/win32ole/win32ole.c (ole_initialize): stop calling
- OleUninitialize at exit.
-
-Thu Aug 14 11:27:37 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (rb_data_object_alloc): check type of 1st argument.
- [ruby-dev:21192]
-
-Thu Aug 14 00:21:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
-
- * parse.y (lhs): ditto.
-
- * parse.y (yylex): should return tCOLON3 right after kCLASS.
- [ruby-talk:78918]
-
- * error.c (exc_initialize): was converting argument to string too
- eagerly. Only check was needed. [ruby-talk:78958]
-
-Wed Aug 13 23:31:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
- BigDecimal::limit removed.
-
-Wed Aug 13 19:21:34 2003 Christian Neukirchen <chneukirchen@yahoo.de>
-
- * lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
- to SSLSocket. [ruby-talk:78919]
-
-Wed Aug 13 18:13:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
-
- * eval.c (proc_invoke): unpack return/break destination when block
- is already left.
-
-Wed Aug 13 15:58:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * object.c (rb_class_s_alloc): add function prototype to avoid VC++
- warning.
-
-Wed Aug 13 13:50:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Win32API/Win32API.c (Win32API_initialize): should pass some
- class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
-
-Tue Aug 12 16:55:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in: static link libraries to LIBRUBY_SO with static linked
- ext. [ruby-dev:21157]
-
- * ext/extmk.rb (extmake): sort extension library initialization order.
-
- * ext/extmk.rb (extmake): compact $extlibs.
-
-Tue Aug 12 02:48:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
- flag before calling getcontext(2).
-
- * eval.c (struct thread): add member to save backing store on
- IA64. (ruby-bugs PR1086)
-
- * eval.c (thread_mark): mark IA64 backing store region.
-
- * eval.c (thread_free): free saved IA64 backing store.
-
- * eval.c (rb_thread_save_context): save IA64 backing store as well.
-
- * eval.c (rb_thread_restore_context): restore IA64 backing store.
-
- * eval.c (THREAD_ALLOC): initialize IA64 members.
-
-Mon Aug 11 22:31:50 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/debug.rb(debug_command): inspection command should inspect
- resulting value even if it's nil. [ruby-dev:21180] by OMAE, jun
- <jun66j5@ybb.ne.jp>.
-
- * lib/debug.rb(debug_command): incomplete regexp.
-
-Mon Aug 11 17:33:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call_super): do not use rb_block_given_p() for
- check. [ruby-talk:78656]
-
- * eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
-
-Sun Aug 10 10:43:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
- from 1k to 16k bytes. [ruby-talk:78603]
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
- partial write to allow interruption in SSLSocket#write.
-
-Sun Aug 10 00:34:16 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
- for ccache.
-
-Sat Aug 9 10:36:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): do not dump generic instance variable when
- marshal_dump is defined.
-
-Sat Aug 9 00:35:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal.c: F style output(like 1234.56789) implemented
- to to_s method.
- * ext/bigdecimal_??.html: F style output(like 1234.56789)
- implemented to to_s method.
-
-Fri Aug 8 12:33:17 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
- add the -aa option to WLDFLAGS.
-
-Fri Aug 8 11:29:26 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * marshal.c (w_object): should set `c_arg' at first.
-
-Fri Aug 8 03:22:28 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httputils.rb (FormData#list): should not take
- a side effect for the receiver.
-
-Thu Aug 7 14:40:37 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * cygwin/GNUmakefile: better --disbale-shared option support.
-
- * cygwin/GNUmakefile: add forwarding DLL target for cygwin.
-
-Thu Aug 7 14:21:05 2003 Corinna Vinschen <vinschen@redhat.com>
-
- * configure.in: Fix Cygwin specific naming of libraries to
- be net distribution compliant. (ruby-bugs:PR#1077)
- cygwin-ruby18.dll -> cygruby18.dll
-
-Thu Aug 7 12:51:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_at_exit): should not be called without a block.
- block_given check added.
-
-Thu Aug 7 06:46:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): forgot to pop ruby_class.
-
- * eval.c (rb_call0): update ruby_class as well as ruby_cref.
- (ruby-bugs-ja:PR#540)
-
-Thu Aug 7 04:52:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
- ruby_cref. [ruby-talk:78141]
-
-Thu Aug 7 04:19:15 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of
- Linux/ia64. This makes gc.c compile but miniruby coredumps for
- the moment.
-
-Thu Aug 7 00:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
-
- * ext/bigdecimal.c: Comparison results adjusted to Float's.
- * ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
-
-Wed Aug 6 22:58:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/testcase.rb: Added equality checking.
- * lib/test/unit/testsuite.rb: Added equality checking.
- * lib/test/unit/assertions.rb: Fixed a warning.
-
-Wed Aug 6 17:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137]
-
- * ext/extmk.rb (extmake): set library name as source file name in
- Init_ext(). [ruby-dev:21137]
-
- * lib/mkmf.rb (Logging::postpone): postpone logging messages after
- heading message as the result of the block.
-
- * lib/mkmf.rb (macro_defined?): append newline to src unless ended
- with it.
-
- * lib/mkmf.rb (have_library): treat nil function name as "main".
- (ruby-bugs:PR#1083)
-
- * lib/mkmf.rb (pkg_config): should append additional libraries to
- $libs but not $LIBS. [ruby-dev:21137]
-
- * ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
-
- * ext/digest/sha1/extconf.rb: have_library already appends library
- name.
-
-Wed Aug 6 17:23:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: initialize /* OK */ variables by Qnil to stop warnings.
-
-Wed Aug 6 04:58:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Setup*: add io/wait and openssl.
-
-Wed Aug 6 01:13:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
-
- * eval.c (rb_f_autoload_p): ditto.
-
- * class.c (rb_mod_init_copy): no longer implements independent
- clone and dup methods. override "initialize_copy" instead.
- [ruby-core:01352]
-
- * object.c (rb_class_s_alloc): define Class allocation function.
- this makes Classes to follow clone framework that uses
- initialize_copy.
-
- * object.c (rb_class_initialize): separate instantiation and
- initialization.
-
- * object.c (rb_obj_alloc): prohibit instantiation from
- uninitialized class.
-
- * object.c (rb_class_superclass): check uninitialized class.
-
- * array.c (rb_ary_fill): wrong index processing with block. this
- fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
-
- * marshal.c (w_object): should preserve generic ivar for nil,
- true, false, symbols, and fixnums.
-
- * marshal.c (w_uclass): base_klass check should be done after
- rb_class_real().
-
-Wed Aug 6 01:18:50 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: update document.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/protocol.rb: ditto.
-
-Wed Aug 6 00:48:37 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * marshal.c (w_object): should recommend marshal_dump rather than
- _dump_data.
-
-Tue Aug 5 17:58:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils.rb (install): should preserve timestamp only.
-
-Tue Aug 5 17:31:59 2003 Ian Macdonald <ian@caliban.org>
-
- * lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
- simple typo.
-
-Tue Aug 5 15:47:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_load): should preserve current source file/line.
-
-Tue Aug 5 10:04:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_new4): ptr may refer to null_str.
-
-Mon Aug 4 17:25:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.8.0 released.
-
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
-
-Local variables:
-add-log-time-format: (lambda ()
- (let* ((time (current-time))
- (system-time-locale "C")
- (diff (+ (cadr time) 32400))
- (lo (% diff 65536))
- (hi (+ (car time) (/ diff 65536))))
- (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
index cbc51c5593..c9d32916cf 100644
--- a/doc/ChangeLog-YARV
+++ b/doc/ChangeLog-YARV
@@ -4538,7 +4538,7 @@ Sun Dec 31 17:42:05 2006 Koichi Sasada <ko1@atdot.net>
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_sourceline(),
+ add rb_sourcefile(), rb_souceline(),
* compile.c : support postposition while/until,
diff --git a/doc/NEWS-1.8.7 b/doc/NEWS-1.8.7
index 51fb5f1c6a..460a7c9328 100644
--- a/doc/NEWS-1.8.7
+++ b/doc/NEWS-1.8.7
@@ -1,6 +1,4 @@
-# -*- rdoc -*-
-
-= NEWS for Ruby 1.8.7
+= NEWS
This document is a list of user visible feature changes made between
releases except for bug fixes.
@@ -54,7 +52,7 @@ with all sufficient information, see the ChangeLog file.
* Array#flatten
* Array#flatten!
- Takes an optional argument that determines the level of recursion
+ Take an optional argument that determines the level of recursion
to flatten.
* Array#eql?
@@ -77,7 +75,6 @@ with all sufficient information, see the ChangeLog file.
* Array#reject
* Array#reject!
* Array#delete_if
- * Array#select
Return an enumerator if no block is given.
@@ -162,10 +159,6 @@ with all sufficient information, see the ChangeLog file.
New alias to #inject.
- * Enumerable#to_a
-
- Can take optional arguments and pass them to #each.
-
* Hash#eql?
* Hash#hash
* Hash#==
@@ -267,17 +260,12 @@ with all sufficient information, see the ChangeLog file.
* Regexp.union accepts an array of patterns.
- * String#bytes
-
- New method
-
* String#bytesize
New method, returning the size in bytes. (alias length and size)
* String#chars
* String#each_char
- * String#lines
* String#partition
* String#rpartition
* String#start_with?
@@ -511,15 +499,6 @@ with all sufficient information, see the ChangeLog file.
always use Date.strptime() when you know what you are dealing
with.
-* REXML
-
- * REXML::Document.entity_expansion_limit=
-
- New method to set the entity expansion limit. By default the limit is
- set to 10000. See the following URL for details.
-
- http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
-
* stringio
* StringIO#each_byte
diff --git a/doc/NEWS-1.9.1 b/doc/NEWS-1.9.1
index fb11026d60..f2afa00bdc 100644
--- a/doc/NEWS-1.9.1
+++ b/doc/NEWS-1.9.1
@@ -1,6 +1,4 @@
-# -*- rdoc -*-
-
-= NEWS for Ruby 1.9.1
+= NEWS
This document is a list of user visible feature changes made between
releases except for bug fixes.
@@ -33,18 +31,18 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
* builtin classes and objects
* Kernel and Object
- o Kernel#methods and #singleton_methods used to return an
+ 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
+ #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
+ 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.
@@ -73,7 +71,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
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
+ 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
@@ -96,7 +94,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
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
+ 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,
@@ -170,7 +168,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
* Pathname
o No longer has #to_str nor #=~.
* time and date
- o Time.parse and Date.parse interprets slashed numerical dates
+ 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
@@ -211,15 +209,15 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
* 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 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
+ 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
@@ -265,7 +263,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
* Enumerable and Enumerator
o Enumerator#enum_cons and Enumerator#enum_slice are
- removed. Use #each_cons and #each_slice without a block.
+ 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
@@ -335,11 +333,6 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
o Numeric#upto, #downto, #times, #step
o Numeric#real?, Complex#real?
o Numeric#magnitude
- o Numeric#round
- * Float
- o Float#round
- * Integer
- o Integer#round
* Rational / Complex
o They are in the core library now
* Math
@@ -393,7 +386,7 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
o Readline.emacs_editing_mode?
o Readline::HISTORY.clear
* Tk
- o TkXXX widget classes are removed and redefined as aliases of
+ o TkXXX widget classes are removed and redefined as aliases of
Tk::XXX classes.
* RDoc
o Updated to version 2.2.2. See:
diff --git a/doc/NEWS-1.9.2 b/doc/NEWS-1.9.2
deleted file mode 100644
index 9cf58c9aff..0000000000
--- a/doc/NEWS-1.9.2
+++ /dev/null
@@ -1,509 +0,0 @@
-# -*- rdoc -*-
-= NEWS for Ruby 1.9.2
-
-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.9.1 release
-=== Library updates (outstanding ones only)
-
-* builtin classes
-
- * Array
- * new methods:
- * Array#keep_if
- * Array#repeated_combination
- * Array#repeated_permutation
- * Array#rotate
- * Array#rotate!
- * Array#select!
- * Array#sort_by!
-
- * extended method:
- * Array#{uniq,uniq!,product} can take a block.
-
- * Complex
- * new method:
- * Complex#rationalize
-
- * Dir
- * new method:
- * Dir.home
-
- * Encoding
- * new encodings:
- * Big5
- * Big5-UAO
- * ISO-2022-JP-KDDI
- * SJIS-DoCoMo
- * SJIS-KDDI
- * SJIS-SoftBank
- * UTF8-DoCoMo
- * UTF8-KDDI
- * UTF8-SoftBank
-
- * new method:
- * ascii_compatible?
-
- * Enumerable
- * new methods:
- * Enumerable#chunk
- * Enumerable#collect_concat
- * Enumerable#each_entry
- * Enumerable#flat_map
- * Enumerable#slice_before
-
- * Enumerator
- * new methods:
- * Enumerator#peek
- * Enumerator#next_values
- * Enumerator#peek_values
- * Enumerator#feed
- * StopIteration#result
-
- * extended method:
- * #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.
-
- * ENV
- * Uses locale's encoding
- * ENV.[]= raises Errno::{EINVAL,ENOMEM} etc. on failure.
- * new methods:
- * ENV.keep_if
- * ENV.select!
-
- * Float
- * new constants:
- * Float::INFINITY
- * Float::NAN
- * new method:
- * Float#rationalize
-
- * File
- * new methods:
- * File.realpath
- * File.realdirpath
-
- * GC::Profiler
- * new method:
- * GC::Profiler.total_time
-
- * Hash
- * new methods:
- * Hash#keep_if
- * Hash#select!
-
- * IO
- * new methods:
- * IO#autoclose=
- * IO#autoclose?
- * IO#fdatasync
- * IO#codepoints
- * IO#each_codepoint
-
- * extended method:
- * IO.pipe can take a block.
-
- * new modules:
- * IO::WaitReadable
- * IO::WaitWritable
- They are used to extend non-blocking exceptions.
-
- * Integer
- * new method:
- * Integer#rationalize
-
- * Kernel
- * new methods:
- * Kernel#respond_to_missing?
- * Kernel#singleton_class
- * Kernel#require_relative
-
- * extended method:
- * Kernel#respond_to? can be used to detect methods not implemented.
- For example, Process.respond_to?(:fork) returns false on Windows.
-
- * incompatible changes:
- * Kernel#instance_eval yields the receiver.
-
- * Kernel#exec
- * Kernel#spawn
- * Kernel#system
- * Kernel#` (`...`)
- ..etc.
-
- On Windows, the current directory is no longer implicitly
- prepended to the default command search path, just like other
- platforms.
-
- * MatchData
- * new method:
- * MatchData#==
-
- * Method
- * new method:
- * Method#parameters
-
- * NilClass
- * new method:
- * NilClass#rationalize
-
- * Object
- * extended methods:
- * Float() supports hexadecimal floating point format.
- * printf() supports %a/%A format.
-
- * Proc
- * new method:
- * Proc#parameters
- * extended method:
- * Proc#source_location returns location even if receiver is a method
- defined by attr_reader / attr_writer / attr_accessor.
-
- * Process
- * extended method:
- * Process.spawn accepts [:child, FD] for a redirect target.
-
- * Random (new class to generate pseudo-random numbers)
-
- * Rational
- * new method:
- * Rational#rationalize
-
- * String
- * extended methods:
- * string[regexp, name] is supported for named capture.
-
- * Thread
- * new methods:
- * Thread#add_trace_func
- * Thread#set_trace_func
-
- * Time
- * extended features:
- * 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 methods:
- * Time#to_r
- * Time#subsec
- * Time#round
-
- * incompatible change:
- * 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.
-
- * UnboundMethod
- * new method:
- * UnboundMethod#parameters
-
-
-* digest
- * new methods:
- * Digest::Class.base64digest
- * Digest::Instance#base64digest
- * Digest::Instance#base64digest!
-
- * Digest::HMAC (digest/hmac) has been marked as deprecated because
- it was unintentional for the experimental library to be included
- in the final release of 1.9.1. Please use OpenSSL::HMAC instead.
-
-* rss
-
- * 0.2.4 -> 0.2.7.
-
- * RSS::Maker.make
- * raise an exception not returns nil for invalid feed making.
- * requires block.
-
- * RSS::Maker.[]
- * new method to return maker class.
-
- * RSS::Maker.supported?(version)
- * new method to check whether given version is supported.
-
- * RSS::Maker: item.guid.permanent_link?
- * new alias of item.guid.isPermaLink
- * RSS::Maker: item.guid.permanent_link=
- * new alias of item.guid.isPermaLink=
-
-* DL
- * Now uses libffi as a backend if avaiable.
- It means DL works fine on more platforms.
-
-* Fiddle
- * A lightweight wrapper for libffi.
-
-* YAML
- * Now uses libyaml as a backend if available.
- It means YAML library supports new standards for YAML.
-
-* Psych
- * A wrapper for libyaml.
-
-* JSON
- * Update to JSON 1.1.9
-
-* REXML
-
- * REXML::Document.entity_expansion_limit=
-
- New method to set the entity expansion limit. By default the limit is
- set to 10000. See the following URL for details.
-
- http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
-
-* RDoc
-
- * Updated to RDoc 2.5.8
-
-* RubyGems
-
- * Updated to RubyGems 1.3.7
-
-* logger
-
- * 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)
-
-* matrix
- * API change to adhere strictly to mathematical definitions:
- * Matrices must now be rectangular.
- * trace, regular?, singular? are defined only for square matrices
- * support for empty matrices
- * all integer matrices now have the right determinant (also an integer)
-
- * Matrix and Vector include Enumerable.
-
- * new methods:
- * Matrix.build
- * Matrix.empty
- * Matrix#conj
- * Matrix#conjugate
- * Matrix#each
- * Matrix#each_with_index
- * Matrix#empty?
- * Matrix#imag
- * Matrix#imaginary
- * Matrix#real
- * Matrix#real?
- * Matrix#rect
- * Matrix#rectangular
-
-* net/http
- * merged net/https.
-
-* 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
-
-* pty
- * new methods:
- * PTY.open
- * PTY.check
- * deprecated methods:
- * protect_signal
- * reset_signal
-
-* openssl
- * new methods:
- * OpenSSL::Buffering#read_nonblock
- * OpenSSL::Buffering#write_nonblock
- * OpenSSL::SSL::SSLSocket#connect_nonblock
- * OpenSSL::SSL::SSLSocket#accept_nonblock
-
-* scanf
- * support %a/%A format.
-
-
-* 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.
- * Socket.do_not_reverse_lookup is turned on by default now.
-
- * 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.
- * Socket.getaddrinfo and IPSocket#{addr,peeraddr} accept an optional
- argument to turn reverse lookup on/off.
-
- * 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
-
-* stringio
- * new methods:
- * StringIO#read_nonblock
- * StringIO#write_nonblock
-* pathname
- * new methods:
- * Pathname#binread
- * Pathname#realdirpath
- * Pathname#each_child
-
- * extended methods:
- * Pathname#realpath and Pathname#realdirpath takes optional basedir
- argument.
-
-* 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.
-
-* set
- * new methods:
- * Set#keep_if
- * Set#select!
-
-* time
- * incompatible changes:
- * Time.parse raises ArgumentError when no date information.
-
-* thread
- * extended method:
- * ConditionVariable#wait takes timeout argument.
-
-* securerandom
- * new methods:
- * SecureRandom.urlsafe_base64
-
-* URI
- * new methods:
- * URI.encode_www_form
- * URI.decode_www_form
- * URI.encode_www_form_component
- * URI.decode_www_form_component
- * Obsoleted methods:
- * URI.decode
- * URI.encode
- * URI.escape
- * URI.unescape
-
-* etc
- * new methods:
- * Etc::Passwd.each
- * Etc::Group.each
-
-* zlib
- * new methods:
- * Zlib::GzipFile#path
- * Zlib.#adler32_combine
- * Zlib.#crc32_combine
-
-* rbconfig
- * new methods:
- * RbConfig.ruby
-
-=== Language changes
-
-* Regexp properties (\p{}) names now ignore underscores, spaces, and case, so
- \p{ol chiki} is the same as \p{Ol_Chiki}
-* Regexps now support Unicode 5.2 (new characters and scripts)
-* \d, \s, and \w are now ASCII only; use POSIX bracket classes and \p{} for
- Unicode semantics
-* $: no longer includes the current directory, use require_relative
-* Symbol with an invalid encoding is forbidden to exist.
-
-=== 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.
-
-* --with-arch is added for universal binary, instead of
- --enable-fat-binary option.
-
-=== 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
- * --enable-fat-binary
- * $:
-
- See above.
-
- * Digest::HMAC
-
- Deprecated. See above.
diff --git a/doc/NEWS-1.9.3 b/doc/NEWS-1.9.3
deleted file mode 100644
index 484660f420..0000000000
--- a/doc/NEWS-1.9.3
+++ /dev/null
@@ -1,341 +0,0 @@
-# -*- rdoc -*-
-= NEWS for Ruby 1.9.3
-
-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.9.2 release
-=== License
-
-* Ruby's License is changed from a dual license with GPLv2
- to a dual license with 2-clause BSDL.
-
-=== Known platform dependent issues
-==== OS X Lion
-
-* You have to configure ruby with '--with-gcc=gcc-4.2' if you're using
- Xcode 4.1, or, if you're using Xcode 4.2, you have to configure ruby
- with '--with-gcc=clang'.
-
-=== C API updates
-
-* rb_scan_args() is enhanced with support for option hash argument
- extraction.
-
-* ruby_vm_at_exit() added. This enables extension libs to hook a VM
- termination.
-
-* rb_reserved_fd_p() added. If you want to close all file descriptors,
- check using this API. [ruby-core:37759]
-
-=== Library updates (outstanding ones only)
-
-* builtin classes
-
- * ARGF
- * new methods:
- * ARGF.print
- * ARGF.printf
- * ARGF.putc
- * ARGF.puts
- * ARGF.read_nonblock
- * ARGF.to_write_io
- * ARGF.write
-
- * Array
- * extended method:
- * Array#pack supports endian modifiers
-
- * Bignum
- * Multiplication algorithm for Bignums with a large number of digits over
- 150 BDIGITs is changed in order to reduce its calculation time.
- Now such large Bignums are multiplied by using Toom-3 algorithm.
-
- * Encoding
- * new encodings:
- * CP950
- * CP951
- * UTF-16
- * UTF-32
- * change alias:
- * SJIS is Windows-31J
-
- * File
- * new constant:
- * File::NULL
- name of NULL device.
- * File::DIRECT
- name of O_DIRECT.
-
- * IO
- * extended method:
- * IO#putc supports multibyte characters
- * new methods:
- * IO#advise
- * IO.write(name, string, [offset] )
- Write `string` to file `name`.
- Opposite with File.read.
- * IO.binwrite(name, string, [offset] )
- binary version of IO.write.
-
- * Kernel
- * move #__id__ to BasicObject.
- * extended method:
- * Kernel#rand supports range argument
-
- * Module
- * new methods:
- * Module#private_constant
- * Module#public_constant
-
- * Random
- * extended method:
- * Random.rand supports range argument
-
- * String
- * extended method:
- * String#unpack supports endian modifiers
- * new method:
- * String#prepend
- * String#byteslice
-
- * Time
- * extended method:
- * Time#strftime supports %:z and %::z.
-
- * Process
- * Process#maxgroups and Process#maxgroups= now raise NotImplementedError if
- the platform don't support supplementary groups concept.
-
-* bigdecimal
-
- * BigDecimal#power and BigDecimal#** support non-integral exponent.
-
- * Kernel.BigDecimal and BigDecimal.new now accept instances of Integer,
- Rational, Float, and BigDecimal. If you pass a Rational or a Float to
- them, you must specify the precision to produce the digits of a BigDecimal.
-
- * The behavior of BigDecimal#coerce with a Rational is changed. It uses
- the precision of the receiver BigDecimal to produce the digits of a
- BigDecimal from the given Rational.
-
-* bigdecimal/util
-
- * BigDecimal#to_d and Integer#to_d are added.
-
- * Float#to_d accepts a precision.
-
- * Rational#to_d raises ArgumentError when passing zero or negative
- precision.
-
- * Rational#to_d
-
- * Zero and an implicit precision is deprecated.
- This feature is removed at the next release of bigdecimal.
-
- * A negative precision isn't supported.
- Be careful it is an incompatible change.
-
-* date
-
- * Accepts flonum explicitly with limitations.
- * If the given offset is flonum, DateTime assumes its precision is
- at most second.
-
- DateTime.new(2001,2,3,0,0,0,3.0/24) ==
- DateTime.new(2001,2,3,0,0,0,'+03:00')
- #=> true
-
- * If the given operand for -/+ is flonum, DateTime assumes its
- precision is at most nanosecond.
-
- DateTime.new(2001,2,3) + 0.5 == DateTime.new(2001,2,3,12)
- #=> true
-
- * Precision of offset is always at most second.
-
- Rational('0.5') == Rational('0.500001') #=> false
- DateTime.new(2001,2,3,0,0,0,Rational('0.5')) ==
- DateTime.new(2001,2,3,0,0,0,Rational('0.500001'))
- #=> true
-
- * Ignores long offset and far reform day (with warning).
-
- * Now accepts only:
-
- -1<=offset<=1 (-24:00..+24:00)
- 2298874<=start<=2426355 or -/+oo
- (proleptic Gregorian/Julian mean -/+oo)
-
- * A method strftime cannot produce huge output (same as Time's one).
-
- * Even though Date/DateTime can handle far dates, the following causes
- an exception.
-
- DateTime.new(1<<10000).strftime('%Y') # Errno::ERANGE
-
- * Changed the format of inspect.
- * Changed the format of marshal (but, can load old dumps).
-
-* io/console
- * new methods:
- * IO#noecho {|io| }
- * IO#echo=
- * IO#echo?
- * IO#raw {|io| }
- * IO#raw!
- * IO#getch
- * IO#winsize
- * IO.console
-
-* json
- * updated to v1.5.4.
-
-* matrix
- * new classes:
- * Matrix::EigenvalueDecomposition
- * Matrix::LUPDecomposition
- * new methods:
- * Matrix#diagonal?
- * Matrix#eigen
- * Matrix#eigensystem
- * Matrix#hermitian?
- * Matrix#lower_triangular?
- * Matrix#lup
- * Matrix#lup_decomposition
- * Matrix#normal?
- * Matrix#orthogonal?
- * Matrix#permutation?
- * Matrix#round
- * Matrix#symmetric?
- * Matrix#unitary?
- * Matrix#upper_triangular?
- * Matrix#zero?
- * Vector#magnitude, #norm
- * Vector#normalize
- * extended methods:
- * Matrix#each and #each_with_index can iterate on a subset of the elements
- * Matrix#find_index returns [row, column] and can iterate on a subset
- of the elements
- * Matrix#** implements Numeric exponents (using the eigensystem)
- * Matrix.zero can build rectangular matrices
-
-* minitest
- * Minitest has been updated to version 2.2.2.
- * For full details, see https://github.com/seattlerb/minitest/blob/master/History.txt
-
-* net/http
- * SNI (Server Name Indication) supported for HTTPS.
-
- * Allow to configure to wait server returning '100 continue' response
- before sending HTTP request body. Set Net::HTTP#continue_timeout AND pass
- 'expect' => '100-continue' to a extra HTTP header.
-
- For example, the following code sends HTTP header and waits for getting
- '100 continue' response before sending HTTP request body. When 0.5 [sec]
- timeout occurs or the server send '100 continue', the client sends HTTP
- request body.
- http.continue_timeout = 0.5
- http.request_post('/continue', 'body=BODY', 'expect' => '100-continue')
-
- * new method:
- * Net::HTTPRequest#set_form): Added to support
- both application/x-www-form-urlencoded and multipart/form-data.
-
-* objspace
- * new method:
- * ObjectSpace::memsize_of_all
-
-* openssl
- * PKey::RSA and PKey::DSA now use the generic X.509 encoding scheme
- (e.g. used in a X.509 certificate's Subject Public Key Info) when
- exporting public keys to DER or PEM. Backward compatibility is
- ensured by (already existing) fallbacks during creation.
- * OpenSSL::ASN1::Constructive#new and OpenSSL::ASN1::Primitive#new
- (and the constructors of their sub-classes) will no longer force
- tagging to be set to :EXPLICIT when tag and/or tag_class are passed
- as parameters. tagging must be set explicitly.
- * Support for infinite length encodings via infinite_length attribute.
- * OpenSSL::PKey.read( file | string [, pwd] ) allows to read arbitrary
- public/private keys in DER-/PEM-encoded form with an optional password
- for encrypted PEM encodings.
- * Add new method OpenSSL::X509::Name#hash_old as a wrapper of
- X509_NAME_hash_old() defined from OpenSSL 1.0.0. It returns OpenSSL 0.9.8
- compatible hash value.
-
-* optparse
- * support for bash/zsh completion.
-
-* Rake
- * Rake has been upgraded from 0.8.7 to 0.9.2.2. For full release notes see
- https://github.com/jimweirich/rake/blob/master/CHANGES
-
-* RDoc
- * RDoc has been upgraded to version 3.9.4. For full release notes see
- http://docs.seattlerb.org/rdoc/History_txt.html
-
-* rexml
- * Support Ruby native encoding mechanism and iconv dependency is dropped.
-
-* RubyGems
- * RubyGems has been upgraded to version 1.8.10. For full release notes see
- http://rubygems.rubyforge.org/rubygems-update/History_txt.html
-
-* stringio
- * extended method:
- * StringIO#set_encoding can get 2nd argument and optional hash.
-
-* test/unit
- * New arguments:
- * -j N, --jobs=N: Allow run N testcases at once.
- * --jobs-status: Show status of jobs when parallel running.
- * --no-retry: Don't retry testcases which failed when parallel running.
- * --ruby=RUBY: path to ruby for job(worker) process. optional.
- * --hide-skip: Hide skip messages. You'll see the number of skips at end of
- test result.
-
-* uri
- * new methods:
- * URI::Generic#hostname
- * URI::Generic#hostname=
-
-* webrick
- * new method:
- * WEBrick::HTTPRequest#continue for generating '100 continue' response.
- * new logging directive:
- * %{remote}p for remote (client) port number.
-
-* yaml
- * The default YAML engine is now Psych. You may downgrade to syck by setting
- YAML::ENGINE.yamler = 'syck'.
-
-* zlib
- * new methods:
- * Zlib.deflate
- * Zlib.inflate
-
-* FileUtils
- * extended method:
- * FileUtils#chmod supports symbolic mode argument.
-
-=== Language changes
-
-* Regexps now support Unicode 6.0. (new characters and scripts)
-
-* [experimental] Regexps now support Age property.
- Unlike Perl, current implementation takes interpretation of the
- interpretation of UTS #18.
- http://www.unicode.org/reports/tr18/
-
-* Turning on/off indentation warnings with directives.
- ("# -*- warn-indent: true -*-" / "# -*- warn-indent: false -*-")
-
-=== Compatibility issues (excluding feature bug fixes)
-
- * Rational#to_d
-
- See above.
diff --git a/doc/etc.rd b/doc/etc.rd
new file mode 100644
index 0000000000..b69f9884ad
--- /dev/null
+++ b/doc/etc.rd
@@ -0,0 +1,75 @@
+# etc.rd - -*- mode: rd; coding: us-ascii -*- created at: Fri Jul 14 00:47:15 JST 1995
+=begin
+
+= Etc(Module)
+
+The module to retrieve information from running OS. All operations
+defined in this module are module functions, so that you can include
+Etc module into your class.
+
+== Module Function
+
+--- getlogin
+
+ returns login name of the user. It this fails, try getpwuid().
+
+--- getpwnam(name)
+
+ searches in /etc/passwd file (or equivalent database), and
+ returns password entry for the user. The return value is an
+ passwd structure, which has members described below.
+
+ struct passwd
+ name # user name(string)
+ passwd # encrypted password(string)
+ uid # user ID(integer)
+ gid # group ID(integer)
+ gecos # gecos field(string)
+ dir # home directory(string)
+ shell # login shell(string)
+ # members below are optional
+ change # password change time(integer)
+ quota # quota value(integer)
+ age # password age(integer)
+ class # user access class(string)
+ comment # comment(string)
+ expire # account expiration time(integer)
+ end
+
+ See getpwnam(3) for detail.
+
+--- getpwuid([uid])
+
+ returns passwd entry for the specified user id. If uid is
+ ommitted, use the value from getuid(). See getpwuid(3) for
+ detail.
+
+--- getgrgid(gid)
+
+ searches in /etc/group file (or equivalent database), and
+ returns group entry for the group id. The return value is an
+ group structure, which has members described below.
+
+ struct group
+ name # group name(string)
+ passwd # group password(string)
+ gid # group ID(integer)
+ mem # array of the group member names
+ end
+
+ See getgrgid(3) for detail.
+
+--- getgrnam(name)
+
+ returns the group entry for the specified name. The return
+ value is the group structure. See getgrnam(3) for detail.
+
+--- group
+
+ iterates over all group entries.
+
+--- passwd
+
+ iterates over all passwd entries.
+
+=end
diff --git a/doc/etc.rd.ja b/doc/etc.rd.ja
index b36e05c994..39a1efbff1 100644
--- a/doc/etc.rd.ja
+++ b/doc/etc.rd.ja
@@ -1,75 +1,75 @@
# etc.rd.ja - -*- mode: rd; coding: euc-jp; -*- created at: Fri Jul 14 00:47:15 JST 1995
=begin
-= Etc(モジュール)
+= Etc(¥â¥¸¥å¡¼¥ë)
-実行ã—ã¦ã„ã‚‹OSã‹ã‚‰ã®æƒ…報を得るãŸã‚ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ï¼Žã‚¯ãƒ©ã‚¹ã«ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰
-ã—ã¦ä½¿ã†ã“ã¨ã‚‚ã§ãる.
+¼Â¹Ô¤·¤Æ¤¤¤ëOS¤«¤é¤Î¾ðÊó¤òÆÀ¤ë¤¿¤á¤Î¥â¥¸¥å¡¼¥ë¡¥¥¯¥é¥¹¤Ë¥¤¥ó¥¯¥ë¡¼¥É
+¤·¤Æ»È¤¦¤³¤È¤â¤Ç¤­¤ë¡¥
== Module Function
--- getlogin
- 自分ã®loginåã‚’è¿”ã™ï¼Žã“れãŒå¤±æ•—ã—ãŸå ´åˆã¯getpwuid()を用ã„ã‚‹ã¨
- 良ã„.
+ ¼«Ê¬¤Îlogin̾¤òÊÖ¤¹¡¥¤³¤ì¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤Ïgetpwuid()¤òÍѤ¤¤ë¤È
+ Îɤ¤¡¥
--- getpwnam(name)
- /etc/passwdファイル(ã‚ã‚‹ã„ã¯DBMファイルやNISデータベース)を検
- ç´¢ã—,nameã®åå‰ã‚’æŒã¤passwdエントリを返ã™ï¼Žæˆ»ã‚Šå€¤ã¯passwd構造
- 体ã§ä»¥ä¸‹ã®ãƒ¡ãƒ³ãƒã‚’æŒã¤ï¼Ž
+ /etc/passwd¥Õ¥¡¥¤¥ë(¤¢¤ë¤¤¤ÏDBM¥Õ¥¡¥¤¥ë¤äNIS¥Ç¡¼¥¿¥Ù¡¼¥¹)¤ò¸¡
+ º÷¤·¡¤name¤Î̾Á°¤ò»ý¤Äpasswd¥¨¥ó¥È¥ê¤òÊÖ¤¹¡¥Ìá¤êÃͤÏpasswd¹½Â¤
+ ÂΤǰʲ¼¤Î¥á¥ó¥Ð¤ò»ý¤Ä¡¥
struct passwd
- name # ユーザå(文字列)
- passwd # パスワード(文字列)
- uid # ユーザID(整数)
- gid # グループID(整数)
- gecos # gecosフィールド(文字列)
- dir # ホームディレクトリ(文字列)
- shell # ログインシェル(文字列)
- # 以é™ã®ãƒ¡ãƒ³ãƒã¯ã‚·ã‚¹ãƒ†ãƒ ã«ã‚ˆã£ã¦ã¯æä¾›ã•れãªã„.
- change # パスワード変更時間(整数)
- quota # クォータ(整数)
- age # エージ(整数)
- class # ユーザアクセスクラス(文字列)
- comment # コメント(文字列)
- expire # アカウント有効期é™(æ•´æ•°)
+ name # ¥æ¡¼¥¶Ì¾(ʸ»úÎó)
+ passwd # ¥Ñ¥¹¥ï¡¼¥É(ʸ»úÎó)
+ uid # ¥æ¡¼¥¶ID(À°¿ô)
+ gid # ¥°¥ë¡¼¥×ID(À°¿ô)
+ gecos # gecos¥Õ¥£¡¼¥ë¥É(ʸ»úÎó)
+ dir # ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê(ʸ»úÎó)
+ shell # ¥í¥°¥¤¥ó¥·¥§¥ë(ʸ»úÎó)
+ # °Ê¹ß¤Î¥á¥ó¥Ð¤Ï¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¤ÏÄ󶡤µ¤ì¤Ê¤¤¡¥
+ change # ¥Ñ¥¹¥ï¡¼¥ÉÊѹ¹»þ´Ö(À°¿ô)
+ quota # ¥¯¥©¡¼¥¿(À°¿ô)
+ age # ¥¨¡¼¥¸(À°¿ô)
+ class # ¥æ¡¼¥¶¥¢¥¯¥»¥¹¥¯¥é¥¹(ʸ»úÎó)
+ comment # ¥³¥á¥ó¥È(ʸ»úÎó)
+ expire # ¥¢¥«¥¦¥ó¥ÈÍ­¸ú´ü¸Â(À°¿ô)
end
- 詳細ã¯getpwnam(3)ã‚’å‚ç…§ã®ã“ã¨ï¼Ž
+ ¾ÜºÙ¤Ïgetpwnam(3)¤ò»²¾È¤Î¤³¤È¡¥
--- getpwuid([uid])
- uidをユーザIDã¨ã™ã‚‹passwdエントリを返ã™ï¼Žæˆ»ã‚Šå€¤ã¯getpwnam()ã¨
- åŒæ§˜ã§ã‚る.引数をçœç•¥ã—ãŸå ´åˆã«ã¯getuid()ã®å€¤ã‚’用ã„る.詳細ã¯
- getpwuid(3)ã‚’å‚ç…§ã®ã“ã¨ï¼Ž
+ uid¤ò¥æ¡¼¥¶ID¤È¤¹¤ëpasswd¥¨¥ó¥È¥ê¤òÊÖ¤¹¡¥Ìá¤êÃͤÏgetpwnam()¤È
+ ƱÍͤǤ¢¤ë¡¥°ú¿ô¤ò¾Êά¤·¤¿¾ì¹ç¤Ë¤Ïgetuid()¤ÎÃͤòÍѤ¤¤ë¡¥¾ÜºÙ¤Ï
+ getpwuid(3)¤ò»²¾È¤Î¤³¤È¡¥
--- getgrgid(gid)
- /etc/groupファイル(ã‚ã‚‹ã„ã¯â€¦getpwnamå‚ç…§)を検索ã—,gidをグルー
- プIDã¨ã™ã‚‹ã‚°ãƒ«ãƒ¼ãƒ—エントリを返ã™ï¼Žæˆ»ã‚Šå€¤ã¯group構造体ã§ä»¥ä¸‹ã®
- メンãƒã‚’æŒã¤ï¼Ž
+ /etc/group¥Õ¥¡¥¤¥ë(¤¢¤ë¤¤¤Ï¡Ägetpwnam»²¾È)¤ò¸¡º÷¤·¡¤gid¤ò¥°¥ë¡¼
+ ¥×ID¤È¤¹¤ë¥°¥ë¡¼¥×¥¨¥ó¥È¥ê¤òÊÖ¤¹¡¥Ìá¤êÃͤÏgroup¹½Â¤ÂΤǰʲ¼¤Î
+ ¥á¥ó¥Ð¤ò»ý¤Ä¡¥
struct group
- name # グループå(文字列)
- passwd # グループã®ãƒ‘スワード(文字列)
- gid # グループID(整数)
- mem # グループメンãƒåã®é…列
+ name # ¥°¥ë¡¼¥×̾(ʸ»úÎó)
+ passwd # ¥°¥ë¡¼¥×¤Î¥Ñ¥¹¥ï¡¼¥É(ʸ»úÎó)
+ gid # ¥°¥ë¡¼¥×ID(À°¿ô)
+ mem # ¥°¥ë¡¼¥×¥á¥ó¥Ð̾¤ÎÇÛÎó
end
- 詳細ã¯getgrgid(3)ã‚’å‚ç…§ã®ã“ã¨ï¼Ž
+ ¾ÜºÙ¤Ïgetgrgid(3)¤ò»²¾È¤Î¤³¤È¡¥
--- getgrnam(name)
- nameã¨ã„ã†åå‰ã®ã‚°ãƒ«ãƒ¼ãƒ—エントリを返ã™ï¼Žæˆ»ã‚Šå€¤ã¯getgrgid()ã¨åŒ
- 様ã§ã‚る.詳細ã¯getgrnam(3)ã‚’å‚照.
+ name¤È¤¤¤¦Ì¾Á°¤Î¥°¥ë¡¼¥×¥¨¥ó¥È¥ê¤òÊÖ¤¹¡¥Ìá¤êÃͤÏgetgrgid()¤ÈƱ
+ ÍͤǤ¢¤ë¡¥¾ÜºÙ¤Ïgetgrnam(3)¤ò»²¾È¡¥
--- group
- å…¨ã¦ã®ã‚°ãƒ«ãƒ¼ãƒ—エントリを順ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãŸã‚ã®ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ï¼Ž
+ Á´¤Æ¤Î¥°¥ë¡¼¥×¥¨¥ó¥È¥ê¤ò½ç¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Î¥¤¥Æ¥ì¡¼¥¿¡¥
--- passwd
- å…¨ã¦ã®passwdエントリを順ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãŸã‚ã®ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ï¼Ž
+ Á´¤Æ¤Îpasswd¥¨¥ó¥È¥ê¤ò½ç¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Î¥¤¥Æ¥ì¡¼¥¿¡¥
=end
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
new file mode 100644
index 0000000000..0eca25b90a
--- /dev/null
+++ b/doc/forwardable.rd
@@ -0,0 +1,83 @@
+ -- forwardable.rb
+
+ $Release Version: 1.1 $
+ $Revision$
+ Original version by Tosh
+
+=begin
+
+= Forwardable
+
+A Module to define delegations for selected methods to a class.
+
+== Usage
+
+Using through extending the class.
+
+ class Foo
+ extend Forwardable
+
+ def_delegators("@out", "printf", "print")
+ def_delegators(:@in, :gets)
+ def_delegator(:@contents, :[], "content_at")
+ end
+ f = Foo.new
+ f.printf ...
+ f.gets
+ f.content_at(1)
+
+== Methods
+
+--- Forwardable#def_instance_delegators(accessor, *methods)
+
+ adding the delegations for each method of ((|methods|)) to
+ ((|accessor|)).
+
+--- Forwardable#def_instance_delegator(accessor, method, ali = method)
+
+ adding the delegation for ((|method|)) to ((|accessor|)). When
+ you give optional argument ((|ali|)), ((|ali|)) is used as the
+ name of the delegation method, instead of ((|method|)).
+
+--- Forwardable#def_delegators(accessor, *methods)
+
+ the alias of ((|Forwardable#def_instance_delegators|)).
+
+--- Forwardable#def_delegator(accessor, method, ali = method)
+
+ the alias of ((|Forwardable#def_instance_delegator|)).
+
+= SingleForwardable
+
+a Module to define delegations for selected methods to an object.
+
+== Usage
+
+Using through extending the object.
+
+ g = Goo.new
+ g.extend SingleForwardable
+ g.def_delegator("@out", :puts)
+ g.puts ...
+
+== Methods
+
+--- SingleForwardable#def_singleton_delegators(accessor, *methods)
+
+ adding the delegations for each method of ((|methods|)) to
+ ((|accessor|)).
+
+--- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
+
+ adding the delegation for ((|method|)) to ((|accessor|)). When
+ you give optional argument ((|ali|)), ((|ali|)) is used as the
+ name of the delegation method, instead of ((|method|)).
+
+--- SingleForwardable#def_delegators(accessor, *methods)
+
+ the alias of ((|SingleForwardable#def_instance_delegators|)).
+
+--- SingleForwardable#def_delegator(accessor, method, ali = method)
+
+ the alias of ((|SingleForwardable#def_instance_delegator|)).
+=end
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 6a5ff2e236..48186b111f 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -5,11 +5,11 @@
=begin
= Forwardable
-クラスã«å¯¾ã—メソッドã®å§”譲機能を定義ã—ã¾ã™.
+¥¯¥é¥¹¤ËÂФ·¥á¥½¥Ã¥É¤Î°Ñ¾ùµ¡Ç½¤òÄêµÁ¤·¤Þ¤¹.
-== ä½¿ã„æ–¹
+== »È¤¤Êý
-クラスã«å¯¾ã—ã¦extendã—ã¦ä½¿ã„ã¾ã™.
+¥¯¥é¥¹¤ËÂФ·¤Æextend¤·¤Æ»È¤¤¤Þ¤¹.
class Foo
extend Forwardable
@@ -23,58 +23,58 @@
f.gets
f.content_at(1)
-== メソッド
+== ¥á¥½¥Ã¥É
--- Forwardable#def_instance_delegators(accessor, *methods)
- ((|methods|))ã§æ¸¡ã•れãŸãƒ¡ã‚½ãƒƒãƒ‰ã®ãƒªã‚¹ãƒˆã‚’((|accessorã«|))委譲ã™ã‚‹
- よã†ã«ã—ã¾ã™.
+ ((|methods|))¤ÇÅϤµ¤ì¤¿¥á¥½¥Ã¥É¤Î¥ê¥¹¥È¤ò((|accessor¤Ë|))°Ñ¾ù¤¹¤ë
+ ¤è¤¦¤Ë¤·¤Þ¤¹.
--- Forwardable#def_instance_delegator(accessor, method, ali = method)
- ((||method|))ã§æ¸¡ã•れãŸãƒ¡ã‚½ãƒƒãƒ‰ã‚’((|accessor|))ã«å§”è­²ã™ã‚‹ã‚ˆã†ã«ã—
- ã¾ã™. ((|ali|))ãŒå¼•æ•°ã¨ã—ã¦æ¸¡ã•れãŸã¨ãã¯, メソッド((|ali|))ãŒå‘¼ã°
- れãŸã¨ãã«ã¯, ((|accessor|))ã«å¯¾ã—((|method|))を呼ã³å‡ºã—ã¾ã™.
+ ((||method|))¤ÇÅϤµ¤ì¤¿¥á¥½¥Ã¥É¤ò((|accessor|))¤Ë°Ñ¾ù¤¹¤ë¤è¤¦¤Ë¤·
+ ¤Þ¤¹. ((|ali|))¤¬°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤¿¤È¤­¤Ï, ¥á¥½¥Ã¥É((|ali|))¤¬¸Æ¤Ð
+ ¤ì¤¿¤È¤­¤Ë¤Ï, ((|accessor|))¤ËÂФ·((|method|))¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹.
--- Forwardable#def_delegators(accessor, *methods)
- ((|Forwardable#def_instance_delegators|))ã®åˆ¥åã§ã™.
+ ((|Forwardable#def_instance_delegators|))¤ÎÊÌ̾¤Ç¤¹.
--- Forwardable#def_delegator(accessor, method, ali = method)
- ((|Forwardable#def_instance_delegator|))ã®åˆ¥åã§ã™.
+ ((|Forwardable#def_instance_delegator|))¤ÎÊÌ̾¤Ç¤¹.
= SingleForwardable
-オブジェクトã«å¯¾ã—, メソッドã®å§”譲機能を定義ã—ã¾ã™.
+¥ª¥Ö¥¸¥§¥¯¥È¤ËÂФ·, ¥á¥½¥Ã¥É¤Î°Ñ¾ùµ¡Ç½¤òÄêµÁ¤·¤Þ¤¹.
-== ä½¿ã„æ–¹
+== »È¤¤Êý
-オブジェクトã«å¯¾ã—ã¦((|extend|))ã—ã¦ä½¿ã„ã¾ã™.
+¥ª¥Ö¥¸¥§¥¯¥È¤ËÂФ·¤Æ((|extend|))¤·¤Æ»È¤¤¤Þ¤¹.
g = Goo.new
g.extend SingleForwardable
g.def_delegator("@out", :puts)
g.puts ...
-== メソッド
+== ¥á¥½¥Ã¥É
--- SingleForwardable#def_singleton_delegators(accessor, *methods)
- ((|methods|))ã§æ¸¡ã•れãŸãƒ¡ã‚½ãƒƒãƒ‰ã®ãƒªã‚¹ãƒˆã‚’((|accessor|))ã«å§”è­²ã™ã‚‹
- よã†ã«ã—ã¾ã™.
+ ((|methods|))¤ÇÅϤµ¤ì¤¿¥á¥½¥Ã¥É¤Î¥ê¥¹¥È¤ò((|accessor|))¤Ë°Ñ¾ù¤¹¤ë
+ ¤è¤¦¤Ë¤·¤Þ¤¹.
--- SingleForwardable#def_singleton_delegator(accessor, method, ali = method)
- ((|method|))ã§æ¸¡ã•れãŸãƒ¡ã‚½ãƒƒãƒ‰ã‚’((|accessor|))ã«å§”è­²ã™ã‚‹ã‚ˆã†ã«ã—ã¾
- ã™. ((|ali|))ãŒå¼•æ•°ã¨ã—ã¦æ¸¡ã•れãŸã¨ãã¯, メソッド((|ali|))ãŒå‘¼ã°ã‚Œ
- ãŸã¨ãã«ã¯, ((|accessor|))ã«å¯¾ã—((|method|))を呼ã³å‡ºã—ã¾ã™.
+ ((|method|))¤ÇÅϤµ¤ì¤¿¥á¥½¥Ã¥É¤ò((|accessor|))¤Ë°Ñ¾ù¤¹¤ë¤è¤¦¤Ë¤·¤Þ
+ ¤¹. ((|ali|))¤¬°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤¿¤È¤­¤Ï, ¥á¥½¥Ã¥É((|ali|))¤¬¸Æ¤Ð¤ì
+ ¤¿¤È¤­¤Ë¤Ï, ((|accessor|))¤ËÂФ·((|method|))¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹.
--- SingleForwardable#def_delegators(accessor, *methods)
- ((|SingleForwardable#def_singleton_delegators|))ã®åˆ¥åã§ã™.
+ ((|SingleForwardable#def_singleton_delegators|))¤ÎÊÌ̾¤Ç¤¹.
--- SingleForwardable#def_delegator(accessor, method, ali = method)
- ((|SingleForwardable#def_singleton_delegator|))ã®åˆ¥åã§ã™.
+ ((|SingleForwardable#def_singleton_delegator|))¤ÎÊÌ̾¤Ç¤¹.
=end
diff --git a/doc/globals.rdoc b/doc/globals.rdoc
deleted file mode 100644
index 060764f54e..0000000000
--- a/doc/globals.rdoc
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-== Pre-defined variables
-
-$!:: The exception information message set by 'raise'.
-$@:: Array of backtrace of the last exception thrown.
-$&:: The string matched by the last successful match.
-$`:: The string to the left of the last successful match.
-$':: The string to the right of the last successful match.
-$+:: The highest group matched by the last successful match.
-$1:: The Nth group of the last successful match. May be > 1.
-$~:: The information about the last match in the current scope.
-$=:: The flag for case insensitive, nil by default.
-$/:: The input record separator, newline by default.
-$\:: The output record separator for the print and IO#write. Default is nil.
-$,:: The output field separator for the print and Array#join.
-$;:: The default separator for String#split.
-$.:: The current input line number of the last file that was read.
-$<:: The virtual concatenation file of the files given on command line (or from $stdin if no files were given).
-$>:: The default output for print, printf. $stdout by default.
-$_:: The last input line of string by gets or readline.
-$0:: Contains the name of the script being executed. May be assignable.
-$*:: Command line arguments given for the script sans args.
-$$:: The process number of the Ruby running this script.
-$?:: The status of the last executed child process.
-$::: Load path for scripts and binary modules by load or require.
-$":: The array contains the module names loaded by require.
-$DEBUG:: The debug flag, which is set by the -d switch. Enabling debug
- output prints each exception raised to $stderr (but not its
- backtrace). Setting this to a true value enables debug output as
- if -d were given on the command line. Setting this to a false
- value disables debug output.
-$FILENAME:: Current input file from $<. Same as $<.filename.
-$LOAD_PATH:: The alias to the $:.
-$stderr:: The current standard error output.
-$stdin:: The current standard input.
-$stdout:: The current standard output.
-$VERBOSE:: The verbose flag, which is set by the -w or -v switch. Setting
- this to a true value enables warnings as if -w or -v were given
- on the command line. Setting this to nil disables warnings,
- including from Kernel#warn.
-$-0:: The alias to $/.
-$-a:: True if option -a is set. Read-only variable.
-$-d:: The alias of $DEBUG. See $DEBUG above for further discusison.
-$-F:: The alias to $;.
-$-i:: In in-place-edit mode, this variable holds the extension, otherwise nil.
-$-I:: The alias to $:.
-$-l:: True if option -l is set. Read-only variable.
-$-p:: True if option -p is set. Read-only variable.
-$-v:: An alias of $VERBOSE. See $VERBOSE above for further discussion.
-$-w:: An alias of $VERBOSE. See $VERBOSE above for further discussion.
-
-== Pre-defined global constants
-
-TRUE:: The typical true value.
-FALSE:: The false itself.
-NIL:: The nil itself.
-STDIN:: The standard input. The default value for $stdin.
-STDOUT:: The standard output. The default value for $stdout.
-STDERR:: The standard error output. The default value for $stderr.
-ENV:: The hash contains current environment variables.
-ARGF:: The alias to the $<.
-ARGV:: The alias to the $*.
-DATA:: The file object of the script, pointing just after __END__.
-RUBY_VERSION:: The ruby version string (VERSION was deprecated).
-RUBY_RELEASE_DATE:: The release date string.
-RUBY_PLATFORM:: The platform identifier.
-
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 3c95faeb8a..7711f96e08 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,70 +1,70 @@
-irb関連ãŠã¾ã‘コマンドã¨ãƒ©ã‚¤ãƒ–ラリ
+irb´ØÏ¢¤ª¤Þ¤±¥³¥Þ¥ó¥É¤È¥é¥¤¥Ö¥é¥ê
$Release Version: 0.7.1 $
$Revision$
by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
=begin
-:コマンド:
+:¥³¥Þ¥ó¥É:
* rtags -- ruby tags command
-:関数ライブラリ:
+:´Ø¿ô¥é¥¤¥Ö¥é¥ê:
* xmp -- irb version of gotoken xmp-function
-:クラスライブラリ:
+:¥¯¥é¥¹¥é¥¤¥Ö¥é¥ê:
* frame.rb -- frame tracer
* completion.rb -- irb completor
= rtags
-rtagsã¯emacsåŠã³vi用ã®, TAGファイルをã¤ãるコマンドã§ã™.
+rtags¤ÏemacsµÚ¤ÓviÍѤÎ, TAG¥Õ¥¡¥¤¥ë¤ò¤Ä¤¯¤ë¥³¥Þ¥ó¥É¤Ç¤¹.
-== ä½¿ã„æ–¹
+== »È¤¤Êý
rtags [-vi] file....
-カレントディレクトリã«emacs用ã®TAGSファイルãŒã§ãã¾ã™. -viオプションを
-ã¤ã‘ãŸæ™‚ã«ã¯vi用ã®tagsファイルを作æˆã—ã¾ã™.
+¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ËemacsÍѤÎTAGS¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤Þ¤¹. -vi¥ª¥×¥·¥ç¥ó¤ò
+¤Ä¤±¤¿»þ¤Ë¤ÏviÍѤÎtags¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹.
-emacsã®å ´åˆ, 通常ã®etags.elãŒãã®ã¾ã¾ä½¿ãˆã¾ã™. 検索å¯èƒ½ãªã®ã¯,
+emacs¤Î¾ì¹ç, Ä̾ï¤Îetags.el¤¬¤½¤Î¤Þ¤Þ»È¤¨¤Þ¤¹. ¸¡º÷²Äǽ¤Ê¤Î¤Ï,
-* クラス
-* メソッド
-* 特異メソッド
+* ¥¯¥é¥¹
+* ¥á¥½¥Ã¥É
+* ÆÃ°Û¥á¥½¥Ã¥É
* alias
-* attrã§å®£è¨€ã•れãŸã‚¢ã‚¯ã‚»ã‚µ(パラメータãŒã‚·ãƒ³ãƒœãƒ«ã‹æ–‡å­—列リテラルã«é™ã‚‹)
-* attr_XXXã§å®£è¨€ã•れãŸã‚¢ã‚¯ã‚»ã‚µ(パラメータãŒã‚·ãƒ³ãƒœãƒ«ã‹æ–‡å­—列リテラルã«é™ã‚‹)
+* attr¤ÇÀë¸À¤µ¤ì¤¿¥¢¥¯¥»¥µ(¥Ñ¥é¥á¡¼¥¿¤¬¥·¥ó¥Ü¥ë¤«Ê¸»úÎó¥ê¥Æ¥é¥ë¤Ë¸Â¤ë)
+* attr_XXX¤ÇÀë¸À¤µ¤ì¤¿¥¢¥¯¥»¥µ(¥Ñ¥é¥á¡¼¥¿¤¬¥·¥ó¥Ü¥ë¤«Ê¸»úÎó¥ê¥Æ¥é¥ë¤Ë¸Â¤ë)
-ã§ã™.
+¤Ç¤¹.
-Cãªã©ã§ä½¿ã£ã¦ã„ã‚‹ã®ã¨é•ã†ã®ã¯, コンプリーションã«é–¢ã™ã‚‹éƒ¨åˆ†ã§,
+C¤Ê¤É¤Ç»È¤Ã¤Æ¤¤¤ë¤Î¤È°ã¤¦¤Î¤Ï, ¥³¥ó¥×¥ê¡¼¥·¥ç¥ó¤Ë´Ø¤¹¤ëÉôʬ¤Ç,
-関数åã¯,
+´Ø¿ô̾¤Ï,
- 関数å(
+ ´Ø¿ô̾(
-クラスã¯,
+¥¯¥é¥¹¤Ï,
- ::クラスå::....::クラスå
+ ::¥¯¥é¥¹Ì¾::....::¥¯¥é¥¹Ì¾
-メソッドã¯,
+¥á¥½¥Ã¥É¤Ï,
- ::クラスå::....::クラスå#メソッドå
+ ::¥¯¥é¥¹Ì¾::....::¥¯¥é¥¹Ì¾#¥á¥½¥Ã¥É̾
-特異メソッド(クラスメソッド)ã¯
+ÆÃ°Û¥á¥½¥Ã¥É(¥¯¥é¥¹¥á¥½¥Ã¥É)¤Ï
- ::クラスå::....::クラスå.メソッドå
+ ::¥¯¥é¥¹Ì¾::....::¥¯¥é¥¹Ì¾.¥á¥½¥Ã¥É̾
-ã§ã‚³ãƒ³ãƒ—リーションを行ãªã†ã¨ã“ã‚ã§ã™.
+¤Ç¥³¥ó¥×¥ê¡¼¥·¥ç¥ó¤ò¹Ô¤Ê¤¦¤È¤³¤í¤Ç¤¹.
= xmp.rb
-ã”ã¨ã‘ã‚“xmpã®ä¸Šä½äº’æ›ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™. ãŸã , éžå¸¸ã«é‡ã„ã®ã§ã”ã¨ã‘ã‚“xmpã§
-ã¯å¯¾å¿œã§ããªã„時ã«, 使用ã™ã‚‹ã¨è‰¯ã„ã§ã—ょã†.
+¤´¤È¤±¤óxmp¤Î¾å°Ì¸ß´¹¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹. ¤¿¤À, Èó¾ï¤Ë½Å¤¤¤Î¤Ç¤´¤È¤±¤óxmp¤Ç
+¤ÏÂбþ¤Ç¤­¤Ê¤¤»þ¤Ë, »ÈÍѤ¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦.
-== ä½¿ã„æ–¹
+== »È¤¤Êý
-=== 関数ã¨ã—ã¦ä½¿ã†.
+=== ´Ø¿ô¤È¤·¤Æ»È¤¦.
require "irb/xmp"
xmp <<END
@@ -77,10 +77,10 @@ Cãªã©ã§ä½¿ã£ã¦ã„ã‚‹ã®ã¨é•ã†ã®ã¯, コンプリーションã«é–¢ã™ã‚
foo
==>1
-=== XMPインスタンスを用ã„ã‚‹.
+=== XMP¥¤¥ó¥¹¥¿¥ó¥¹¤òÍѤ¤¤ë.
-ã“ã®å ´åˆã¯, XMPãŒã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆæƒ…報をæŒã¤ã®ã§, 変数ã®å€¤ãªã©ã‚’ä¿æŒã—ã¦ã„
-ã¾ã™.
+¤³¤Î¾ì¹ç¤Ï, XMP¤¬¥³¥ó¥Æ¥­¥¹¥È¾ðÊó¤ò»ý¤Ä¤Î¤Ç, ÊÑ¿ô¤ÎÃͤʤɤòÊÝ»ý¤·¤Æ¤¤
+¤Þ¤¹.
require "irb/xmp"
xmp = XMP.new
@@ -99,50 +99,50 @@ Cãªã©ã§ä½¿ã£ã¦ã„ã‚‹ã®ã¨é•ã†ã®ã¯, コンプリーションã«é–¢ã™ã‚
foo
==>1
-== コンテキストã«é–¢ã—ã¦
+== ¥³¥ó¥Æ¥­¥¹¥È¤Ë´Ø¤·¤Æ
-XMPメソッド群ã®ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã¯, 呼ã³å‡ºã™å‰ã®ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã§è©•価ã•れã¾ã™.
-明示的ã«ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã‚’指定ã™ã‚‹ã¨ãã®ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã§è©•価ã—ã¾ã™.
+XMP¥á¥½¥Ã¥É·²¤Î¥³¥ó¥Æ¥­¥¹¥È¤Ï, ¸Æ¤Ó½Ð¤¹Á°¤Î¥³¥ó¥Æ¥­¥¹¥È¤Çɾ²Á¤µ¤ì¤Þ¤¹.
+ÌÀ¼¨Åª¤Ë¥³¥ó¥Æ¥­¥¹¥È¤ò»ØÄꤹ¤ë¤È¤½¤Î¥³¥ó¥Æ¥­¥¹¥È¤Çɾ²Á¤·¤Þ¤¹.
-例:
+Îã:
xmp "foo", an_binding
-:注:
-マルãƒã‚¹ãƒ¬ãƒƒãƒ‰ã«ã¯å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“.
+:Ãí:
+¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó.
= frame.rb
-ç¾åœ¨å®Ÿè¡Œä¸­ã®ãƒ•レーム情報をå–り扱ã†ãŸã‚ã®ã‚¯ãƒ©ã‚¹ã§ã™.
+¸½ºß¼Â¹ÔÃæ¤Î¥Õ¥ì¡¼¥à¾ðÊó¤ò¼è¤ê°·¤¦¤¿¤á¤Î¥¯¥é¥¹¤Ç¤¹.
* IRB::Frame.top(n = 0)
- 上ã‹ã‚‰n番目ã®ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã‚’å–り出ã—ã¾ã™. nã¯0ãŒæœ€ä¸Šä½ã«ãªã‚Šã¾ã™.
+ ¾å¤«¤énÈÖÌܤΥ³¥ó¥Æ¥­¥¹¥È¤ò¼è¤ê½Ð¤·¤Þ¤¹. n¤Ï0¤¬ºÇ¾å°Ì¤Ë¤Ê¤ê¤Þ¤¹.
* IRB::Frame.bottom(n = 0)
- 下ã‹ã‚‰n番目ã®ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã‚’å–り出ã—ã¾ã™. nã¯0ãŒæœ€ä¸‹ä½ã«ãªã‚Šã¾ã™.
+ ²¼¤«¤énÈÖÌܤΥ³¥ó¥Æ¥­¥¹¥È¤ò¼è¤ê½Ð¤·¤Þ¤¹. n¤Ï0¤¬ºÇ²¼°Ì¤Ë¤Ê¤ê¤Þ¤¹.
* IRB::Frame.sender
- センダã«ãªã£ã¦ã„るオブジェクトをå–り出ã—ã¾ã™. センダã¨ã¯, ãã®ãƒ¡ã‚½ãƒƒ
- ドを呼ã³å‡ºã—ãŸå´ã®selfã®ã“ã¨ã§ã™.
+ ¥»¥ó¥À¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ò¼è¤ê½Ð¤·¤Þ¤¹. ¥»¥ó¥À¤È¤Ï, ¤½¤Î¥á¥½¥Ã
+ ¥É¤ò¸Æ¤Ó½Ð¤·¤¿Â¦¤Îself¤Î¤³¤È¤Ç¤¹.
-:注:
-set_trace_funcを用ã„ã¦Rubyã®å®Ÿè¡Œã‚’トレースã—ã¦ã„ã¾ã™. マルãƒã‚¹ãƒ¬ãƒƒãƒ‰ã«
-ã¯å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“.
+:Ãí:
+set_trace_func¤òÍѤ¤¤ÆRuby¤Î¼Â¹Ô¤ò¥È¥ì¡¼¥¹¤·¤Æ¤¤¤Þ¤¹. ¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Ë
+¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó.
= completion.rb
-irbã®completion機能をæä¾›ã™ã‚‹ã‚‚ã®ã§ã™.
+irb¤Îcompletionµ¡Ç½¤òÄ󶡤¹¤ë¤â¤Î¤Ç¤¹.
-== ä½¿ã„æ–¹
+== »È¤¤Êý
% irb -r irb/completion
-ã¨ã™ã‚‹ã‹, ~/.irbrc 中ã«
+¤È¤¹¤ë¤«, ~/.irbrc Ãæ¤Ë
require "irb/completion"
-を入れã¦ãã ã•ã„. irb実行中㫠require "irb/completion" ã—ã¦ã‚‚よã„ã§ã™.
+¤òÆþ¤ì¤Æ¤¯¤À¤µ¤¤. irb¼Â¹ÔÃæ¤Ë require "irb/completion" ¤·¤Æ¤â¤è¤¤¤Ç¤¹.
-irb実行中㫠(TAB) を押ã™ã¨ã‚³ãƒ³ãƒ—レーションã—ã¾ã™.
+irb¼Â¹ÔÃæ¤Ë (TAB) ¤ò²¡¤¹¤È¥³¥ó¥×¥ì¡¼¥·¥ç¥ó¤·¤Þ¤¹.
-トップレベルã§(TAB)を押ã™ã¨ã™ã¹ã¦ã®æ§‹æ–‡è¦ç´ , クラス, メソッドã®å€™è£œãŒã§
-ã¾ã™. 候補ãŒå”¯ä¸€ãªã‚‰ã°å®Œå…¨ã«è£œå®Œã—ã¾ã™.
+¥È¥Ã¥×¥ì¥Ù¥ë¤Ç(TAB)¤ò²¡¤¹¤È¤¹¤Ù¤Æ¤Î¹½Ê¸Í×ÁÇ, ¥¯¥é¥¹, ¥á¥½¥Ã¥É¤Î¸õÊ䤬¤Ç
+¤Þ¤¹. ¸õÊ䤬ͣ°ì¤Ê¤é¤Ð´°Á´¤ËÊä´°¤·¤Þ¤¹.
irb(main):001:0> in
in inspect instance_eval
@@ -153,8 +153,8 @@ irb実行中㫠(TAB) を押ã™ã¨ã‚³ãƒ³ãƒ—レーションã—ã¾ã™.
irb(main):002:0> foo = Object.new
#<Object:0x4027146c>
- ((|変数å.|))ã®å¾Œã«(TAB)を押ã™ã¨, ãã®ã‚ªãƒ–ジェクトã®ãƒ¡ã‚½ãƒƒãƒ‰ä¸€è¦§ãŒã§ã¾
- ã™.
+ ((|ÊÑ¿ô̾.|))¤Î¸å¤Ë(TAB)¤ò²¡¤¹¤È, ¤½¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î¥á¥½¥Ã¥É°ìÍ÷¤¬¤Ç¤Þ
+ ¤¹.
irb(main):003:0> foo.
foo.== foo.frozen? foo.protected_methods
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
new file mode 100644
index 0000000000..8468809d2b
--- /dev/null
+++ b/doc/irb/irb.rd
@@ -0,0 +1,391 @@
+irb -- interactive ruby
+ $Release Version: 0.9 $
+ $Revision$
+ by Keiju ISHITSUKA(keiju@ishitsuka.com)
+ by gotoken-san who is original translater from japanese version
+
+=begin
+= What is irb?
+
+irb stands for `interactive ruby'. irb is a tool to execute interactively
+ruby expressions read from stdin.
+
+= Invoking
+
+ % irb
+
+= Usage
+
+Use of irb is easy if you know ruby. Executing irb, prompts are
+displayed as follows. Then, enter expression of ruby. A input is
+executed when it is syntacticaly completed.
+
+ dim% irb
+ irb(main):001:0> 1+2
+ 3
+ irb(main):002:0> class Foo
+ irb(main):003:1> def foo
+ irb(main):004:2> print 1
+ irb(main):005:2> end
+ irb(main):006:1> end
+ nil
+ irb(main):007:0>
+
+And, Readline extesion module can be used with irb. Using Readline
+is the standard default action if Readline is installed.
+
+= Command line option
+
+ irb.rb [options] file_name opts
+ options:
+ -f suppress read ~/.irbrc
+ -m bc mode (fraction or matrix are available)
+ -d set $DEBUG to true (same as `ruby -d')
+ -Kc same as `ruby -Kc'
+ -r load-module same as `ruby -r'
+ --verbose command input is echoed(default)
+ --noverbose command input isn't echoed
+ --echo commands are echoed immediately before execution(default)
+ --noecho commands aren't echoed immediately before execution
+ --inspect uses `inspect' for output (the default except bc mode)
+ --noinspect doesn't uses inspect for output
+ --readline uses Readline extension module
+ --noreadline doesn't use Readline extension module
+ --prompt prompt-mode
+ --prompt-mode prompt-mode
+ switches prompt mode. Pre-defined prompt modes are
+ `default', `simple', `xmp' and `inf-ruby'
+
+ --inf-ruby-mode uses prompt appreciate for inf-ruby-mode on emacs.
+ Suppresses --readline.
+ --simple-prompt simple prompt mode
+ --noprompt no prompt
+ --tracer display trace for each execution of commands.
+ --back-trace-limit n
+ displayes backtrace top n and tail n. The default
+ value is 16.
+ --irb_debug n sets internal debug level to n (It shouldn't be used)
+ -v, --version prints the version of irb
+
+= Configurations
+
+irb reads `~/.irbrc' when it is invoked. If `~/.irbrb' doesn't exist
+irb try to read in the order `.irbrc', `irb.rc', `_irbrc' then `$irbrc'.
+
+The following is altanative to the command line option. To use them
+type as follows in an irb session.
+
+ IRB.conf[:IRB_NAME]="irb"
+ IRB.conf[:MATH_MODE]=false
+ IRB.conf[:USE_TRACER]=false
+ IRB.conf[:USE_LOADER]=false
+ IRB.conf[:IGNORE_SIGINT]=true
+ IRB.conf[:IGNORE_EOF]=false
+ IRB.conf[:INSPECT_MODE]=nil
+ IRB.conf[:IRB_RC] = nil
+ IRB.conf[:BACK_TRACE_LIMIT]=16
+ IRB.conf[:USE_LOADER] = false
+ IRB.conf[:USE_READLINE] = nil
+ IRB.conf[:USE_TRACER] = false
+ IRB.conf[:IGNORE_SIGINT] = true
+ IRB.conf[:IGNORE_EOF] = false
+ IRB.conf[:PROMPT_MODE] = :DEFALUT
+ IRB.conf[:PROMPT] = {...}
+ IRB.conf[:DEBUG_LEVEL]=0
+ IRB.conf[:VERBOSE]=true
+
+== Customizing prompt
+
+To costomize the prompt you set a variable
+
+ IRB.conf[:PROMPT]
+
+For example, describe as follows in `.irbrc'.
+
+ IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
+ :PROMPT_I => nil, # normal prompt
+ :PROMPT_S => nil, # prompt for continuated strings
+ :PROMPT_C => nil, # prompt for continuated statement
+ :RETURN => " ==>%s\n" # format to return value
+ }
+
+Then, invoke irb with the above prompt mode by
+
+ % irb --prompt my-prompt
+
+Or add the following in `.irbrc'.
+
+ IRB.conf[:PROMPT_MODE] = :MY_PROMPT
+
+Constants PROMPT_I, PROMPT_S and PROMPT_C specifies the format.
+In the prompt specification, some special strings are available.
+
+ %N command name which is running
+ %m to_s of main object (self)
+ %M inspect of main object (self)
+ %l type of string(", ', /, ]), `]' is inner %w[...]
+ %NNi indent level. NN is degits and means as same as printf("%NNd").
+ It can be ommited
+ %NNn line number.
+ %% %
+
+For instance, the default prompt mode is defined as follows:
+
+IRB.conf[:PROMPT_MODE][:DEFAULT] = {
+ :PROMPT_I => "%N(%m):%03n:%i> ",
+ :PROMPT_S => "%N(%m):%03n:%i%l ",
+ :PROMPT_C => "%N(%m):%03n:%i* ",
+ :RETURN => "%s\n"
+}
+
+RETURN is used to printf.
+
+== Configurating subirb
+
+The command line option or IRB.conf specify the default behavior of
+(sub)irb. On the other hand, each conf of in the next sction `6. Command'
+is used to individually configurate (sub)irb.
+
+If proc is set to IRB.conf[:IRB_RC], its subirb will be invoked after
+execution of that proc under giving the context of irb as its
+aregument. By this mechanism each subirb can be configurated.
+
+= Command
+
+For irb commands, both simple name and `irb_'-prefixed name are prepared.
+
+--- exit, quit, irb_exit
+ Quits (sub)irb.
+
+--- conf, irb_context
+ Displays current configuration. Modifing the configuration is
+ achieved by sending message to `conf'.
+
+--- conf.eval_history = N
+ Sets execution result history.
+ N is a integer or nil. If N > 0, the number of historys is N.
+ If N == 0, the number of historys is unlimited. If N is nill,
+ execution result history isn't used(default).
+
+--- conf.back_trace_limit
+ Sets display lines of backtrace as top n and tail n.
+ The default value is 16.
+
+--- conf.debug_level = N
+ Sets debug level of irb.
+
+--- conf.ignore_eof = true/false
+ Whether ^D (control-d) will be ignored or not.
+ If false is set, ^D means quit.
+
+--- conf.ignore_sigint= true/false
+ Whether ^C (control-c) will be ignored or not.
+ If false is set, ^D means quit. If true,
+ during input: cancel inputing then return to top level.
+ during execute: abondon current execution.
+
+--- conf.inf_ruby_mode = true/false
+ Whether inf-ruby-mode or not. The default value is false.
+
+--- conf.inspect_mode = true/false/nil
+ Specifies inspect mode.
+ true: display inspect
+ false: display to_s
+ nil: inspect mode in non math mode,
+ non inspect mode in math mode.
+
+--- conf.math_mode
+ Whether bc mode or not.
+
+--- conf.use_loader = true/false
+ Whether irb's own file reader method is used when load/require or not.
+ This mode is globaly affected (irb wide).
+
+--- conf.prompt_c
+ prompt for a continuating statement (e.g, immediately after of `if')
+
+--- conf.prompt_i
+ standard prompt
+
+--- conf.prompt_s
+ prompt for a continuating string
+
+--- conf.rc
+ Whether ~/.irbrc is read or not.
+
+--- conf.use_prompt = true/false
+ Prompting or not.
+
+--- conf.use_readline = true/false/nil
+ Whether readline is used or not.
+ true: uses
+ false: doen't use
+ nil: intends to use readline except for inf-ruby-mode (default)
+#
+#--- conf.verbose=T/F
+# Whether verbose messages are display or not.
+
+--- cws, chws, irb_change_workspace [obj]
+ obj will be self. If obj is omitted, self will be home-object, or
+ the main object of first started irb.
+
+--- pushws, irb_pushws, irb_push_workspace [obj]
+ same as UNIX-shell command pushd.
+
+--- popws, irb_popws, irb_pop_workspace
+ same as UNIX-shell command popd
+
+--- irb [obj]
+ Invoke subirb. If obj is given, obj will be self.
+
+--- jobs, irb_jobs
+ List of subirb
+
+--- fg n, irb_fg n
+ Switch into specified subirb. The following is candidates of n:
+
+ irb number
+ thhread
+ irb object
+ self(obj which is specified of irb obj)
+
+--- kill n, irb_kill n
+ Kill subirb. The means of n is as same as the case of irb_fg.
+
+--- souce, irb_source path
+ This is a like UNIX-shell command source. evaluate script in path
+ on current context.
+
+--- irb_load path, prev
+ irb-version of Ruby's load.
+
+= System variable
+
+--- _ The latest value of evaluation (it is local)
+--- __ The history of evaluation values.
+ __[line_no] return an evaluation value of line number<line_no>. If
+ line_no is a negative, return value before -<line_no> from latest
+ value.
+
+= Session Example
+
+ dim% ruby irb.rb
+ irb(main):001:0> irb # invoke subirb
+ irb#1(main):001:0> jobs # list of subirbs
+ #0->irb on main (#<Thread:0x400fb7e4> : stop)
+ #1->irb#1 on main (#<Thread:0x40125d64> : running)
+ nil
+ irb#1(main):002:0> fg 0 # switch job
+ nil
+ irb(main):002:0> class Foo;end
+ nil
+ irb(main):003:0> irb Foo # invoke subirb which has the
+ # context of Foo
+ irb#2(Foo):001:0> def foo # define Foo#foo
+ irb#2(Foo):002:1> print 1
+ irb#2(Foo):003:1> end
+ nil
+ irb#2(Foo):004:0> fg 0 # switch job
+ nil
+ irb(main):004:0> jobs # list of job
+ #0->irb on main (#<Thread:0x400fb7e4> : running)
+ #1->irb#1 on main (#<Thread:0x40125d64> : stop)
+ #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
+ nil
+ irb(main):005:0> Foo.instance_methods # Foo#foo is defined asurely
+ ["foo"]
+ irb(main):006:0> fg 2 # switch job
+ nil
+ irb#2(Foo):005:0> def bar # define Foo#bar
+ irb#2(Foo):006:1> print "bar"
+ irb#2(Foo):007:1> end
+ nil
+ irb#2(Foo):010:0> Foo.instance_methods
+ ["bar", "foo"]
+ irb#2(Foo):011:0> fg 0
+ nil
+ irb(main):007:0> f = Foo.new
+ #<Foo:0x4010af3c>
+ irb(main):008:0> irb f # invoke subirb which has the
+ # context of f (instance of Foo)
+ irb#3(#<Foo:0x4010af3c>):001:0> jobs
+ #0->irb on main (#<Thread:0x400fb7e4> : stop)
+ #1->irb#1 on main (#<Thread:0x40125d64> : stop)
+ #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
+ #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
+ nil
+ irb#3(#<Foo:0x4010af3c>):002:0> foo # evaluate f.foo
+ 1nil
+ irb#3(#<Foo:0x4010af3c>):003:0> bar # evaluate f.bar
+ barnil
+ irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# kill job
+ nil
+ irb(main):009:0> jobs
+ #0->irb on main (#<Thread:0x400fb7e4> : running)
+ nil
+ irb(main):010:0> exit # exit
+ dim%
+
+= Restrictions
+
+Because irb evaluates the inputs immediately after the imput is
+syntactically completed, irb gives slight different result than
+directly use ruby. Known difference is pointed out here.
+
+
+== Declaration of the local variable
+
+The following causes an error in ruby:
+
+ eval "foo = 0"
+ foo
+ --
+ -:2: undefined local variable or method `foo' for #<Object:0x40283118> (NameError)
+ ---
+ NameError
+
+Though, the above will successfully done by irb.
+
+ >> eval "foo = 0"
+ => 0
+ >> foo
+ => 0
+
+Ruby evaluates a code after reading entire of code and determination
+of the scope of local variables. On the other hand, irb do
+immediately. More precisely, irb evaluate at first
+
+ evel "foo = 0"
+
+then foo is defined on this timing. It is because of this
+incompatibility.
+
+If you'd like to detect those differences, begin...end can be used:
+
+ >> begin
+ ?> eval "foo = 0"
+ >> foo
+ >> end
+ NameError: undefined local variable or method `foo' for #<Object:0x4013d0f0>
+ (irb):3
+ (irb_local_binding):1:in `eval'
+
+== Here-document
+
+Implementation of Here-document is incomplete.
+
+== Symbol
+
+Irb can not always recognize a symbol as to be Symbol. Concretely, an
+expression have completed, however Irb regard it as continuation line.
+
+=end
+
+% Begin Emacs Environment
+% Local Variables:
+% mode: text
+% comment-column: 0
+% comment-start: "%"
+% comment-end: "\n"
+% End:
+%
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 6c213a178c..53f76180ec 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -3,23 +3,23 @@ irb -- interactive ruby
$Revision$
by Keiju ISHITSUKA(keiju@ruby-lang.org)
=begin
-= irbã¨ã¯?
+= irb¤È¤Ï?
-irbã¯interactive rubyã®ç•¥ã§ã™. rubyã®å¼ã‚’標準入力ã‹ã‚‰ç°¡å˜ã«å…¥åŠ›/実行ã™ã‚‹
-ãŸã‚ã®ãƒ„ールã§ã™.
+irb¤Ïinteractive ruby¤Îά¤Ç¤¹. ruby¤Î¼°¤òɸ½àÆþÎϤ«¤é´Êñ¤ËÆþÎÏ/¼Â¹Ô¤¹¤ë
+¤¿¤á¤Î¥Ä¡¼¥ë¤Ç¤¹.
-= èµ·å‹•
+= µ¯Æ°
% irb
-ã§è¡Œãªã„ã¾ã™.
+¤Ç¹Ô¤Ê¤¤¤Þ¤¹.
-= ä½¿ã„æ–¹
+= »È¤¤Êý
-irbã®ä½¿ã„æ–¹ã¯, Rubyã•ãˆçŸ¥ã£ã¦ã„れã°ã„ãŸã£ã¦ç°¡å˜ã§ã™. 基本的ã«ã¯ irb ã¨
-ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã ã‘ã§ã™. irbを実行ã™ã‚‹ã¨, 以下ã®ã‚ˆã†ãªãƒ—ロンプ
-トãŒè¡¨ã‚Œã¦ãã¾ã™. 後ã¯, rubyã®å¼ã‚’入れã¦ä¸‹ã•ã„. å¼ãŒå®Œçµã—ãŸæ™‚点ã§å®Ÿè¡Œ
-ã•れã¾ã™.
+irb¤Î»È¤¤Êý¤Ï, Ruby¤µ¤¨ÃΤäƤ¤¤ì¤Ð¤¤¤¿¤Ã¤Æ´Êñ¤Ç¤¹. ´ðËÜŪ¤Ë¤Ï irb ¤È
+¤¤¤¦¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤À¤±¤Ç¤¹. irb¤ò¼Â¹Ô¤¹¤ë¤È, °Ê²¼¤Î¤è¤¦¤Ê¥×¥í¥ó¥×
+¥È¤¬É½¤ì¤Æ¤­¤Þ¤¹. ¸å¤Ï, ruby¤Î¼°¤òÆþ¤ì¤Æ²¼¤µ¤¤. ¼°¤¬´°·ë¤·¤¿»þÅÀ¤Ç¼Â¹Ô
+¤µ¤ì¤Þ¤¹.
dim% irb
irb(main):001:0> 1+2
@@ -32,55 +32,55 @@ irbã®ä½¿ã„æ–¹ã¯, Rubyã•ãˆçŸ¥ã£ã¦ã„れã°ã„ãŸã£ã¦ç°¡å˜ã§ã™. 基本
nil
irb(main):007:0>
-ã¾ãŸ, irbã¯Readlineモジュールã«ã‚‚対応ã—ã¦ã„ã¾ã™. ReadlineモジュールãŒ
-インストールã•れã¦ã„る時ã«ã¯, ãれを使ã†ã®ãŒæ¨™æº–ã®å‹•作ã«ãªã‚Šã¾ã™.
+¤Þ¤¿, irb¤ÏReadline¥â¥¸¥å¡¼¥ë¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹. Readline¥â¥¸¥å¡¼¥ë¤¬
+¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë»þ¤Ë¤Ï, ¤½¤ì¤ò»È¤¦¤Î¤¬É¸½à¤Îưºî¤Ë¤Ê¤ê¤Þ¤¹.
-= コマンドオプション
+= ¥³¥Þ¥ó¥É¥ª¥×¥·¥ç¥ó
irb.rb [options] file_name opts
options:
- -f ~/.irbrc を読ã¿è¾¼ã¾ãªã„.
- -m bcモード(分数, 行列ã®è¨ˆç®—ãŒã§ãã‚‹)
- -d $DEBUG ã‚’trueã«ã™ã‚‹(ruby -d ã¨åŒã˜)
- -Kc ruby -Kcã¨åŒã˜
- -r load-module ruby -r ã¨åŒã˜.
- --verbose ã“れã‹ã‚‰å®Ÿè¡Œã™ã‚‹è¡Œã‚’表示ã™ã‚‹(デフォルト)
- --noverbose ã“れã‹ã‚‰å®Ÿè¡Œã™ã‚‹è¡Œã‚’表示ã—ãªã„
- --echo å®Ÿè¡Œçµæžœã‚’表示ã™ã‚‹(デフォルト)
- --noecho å®Ÿè¡Œçµæžœã‚’表示ã—ãªã„
- --inspect çµæžœå‡ºåŠ›ã«inspectを用ã„ã‚‹(bcモード以外ã¯ãƒ‡ãƒ•ォルト).
- --noinspect çµæžœå‡ºåŠ›ã«inspectを用ã„ãªã„.
- --readline readlineライブラリを利用ã™ã‚‹.
- --noreadline readlineライブラリを利用ã—ãªã„. デフォルトã®å‹•作ã¯,
- inf-ruby-mode以外ã§readlineライブラリを利用ã—よã†
- ã¨ã™ã‚‹.
+ -f ~/.irbrc ¤òÆÉ¤ß¹þ¤Þ¤Ê¤¤.
+ -m bc¥â¡¼¥É(ʬ¿ô, ¹ÔÎó¤Î·×»»¤¬¤Ç¤­¤ë)
+ -d $DEBUG ¤òtrue¤Ë¤¹¤ë(ruby -d ¤ÈƱ¤¸)
+ -Kc ruby -Kc¤ÈƱ¤¸
+ -r load-module ruby -r ¤ÈƱ¤¸.
+ --verbose ¤³¤ì¤«¤é¼Â¹Ô¤¹¤ë¹Ô¤òɽ¼¨¤¹¤ë(¥Ç¥Õ¥©¥ë¥È)
+ --noverbose ¤³¤ì¤«¤é¼Â¹Ô¤¹¤ë¹Ô¤òɽ¼¨¤·¤Ê¤¤
+ --echo ¼Â¹Ô·ë²Ì¤òɽ¼¨¤¹¤ë(¥Ç¥Õ¥©¥ë¥È)
+ --noecho ¼Â¹Ô·ë²Ì¤òɽ¼¨¤·¤Ê¤¤
+ --inspect ·ë²Ì½ÐÎϤËinspect¤òÍѤ¤¤ë(bc¥â¡¼¥É°Ê³°¤Ï¥Ç¥Õ¥©¥ë¥È).
+ --noinspect ·ë²Ì½ÐÎϤËinspect¤òÍѤ¤¤Ê¤¤.
+ --readline readline¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ¹¤ë.
+ --noreadline readline¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Ê¤¤. ¥Ç¥Õ¥©¥ë¥È¤Îưºî¤Ï,
+ inf-ruby-mode°Ê³°¤Çreadline¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤è¤¦
+ ¤È¤¹¤ë.
--prompt prompt-mode
--prompt-mode prompt-mode
- プロンプトモードを切替ãˆã¾ã™. ç¾åœ¨å®šç¾©ã•れã¦ã„るプ
- ロンプトモードã¯, default, simple, xmp, inf-rubyãŒ
- 用æ„ã•れã¦ã„ã¾ã™. デフォルトã¯defaultプロンプトモー
- ドã«ãªã£ã¦ã„ã¾ã™.
+ ¥×¥í¥ó¥×¥È¥â¡¼¥É¤òÀÚÂØ¤¨¤Þ¤¹. ¸½ºßÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥×
+ ¥í¥ó¥×¥È¥â¡¼¥É¤Ï, default, simple, xmp, inf-ruby¤¬
+ ÍѰդµ¤ì¤Æ¤¤¤Þ¤¹. ¥Ç¥Õ¥©¥ë¥È¤Ïdefault¥×¥í¥ó¥×¥È¥â¡¼
+ ¥É¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹.
- --inf-ruby-mode emacsã®inf-ruby-mode用ã®ãƒ—ロンプト表示を行ãªã†. 特
- ã«æŒ‡å®šãŒãªã„é™ã‚Š, readlineライブラリã¯ä½¿ã‚ãªããªã‚‹.
+ --inf-ruby-mode emacs¤Îinf-ruby-modeÍѤΥץí¥ó¥×¥Èɽ¼¨¤ò¹Ô¤Ê¤¦. ÆÃ
+ ¤Ë»ØÄ꤬¤Ê¤¤¸Â¤ê, readline¥é¥¤¥Ö¥é¥ê¤Ï»È¤ï¤Ê¤¯¤Ê¤ë.
--simple-prompt
- éžå¸¸ã«ã‚·ãƒ³ãƒ—ルãªãƒ—ロンプトを用ã„るモードã§ã™.
- --noprompt プロンプト表示を行ãªã‚ãªã„.
- --tracer コマンド実行時ã«ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’行ãªã†.
+ Èó¾ï¤Ë¥·¥ó¥×¥ë¤Ê¥×¥í¥ó¥×¥È¤òÍѤ¤¤ë¥â¡¼¥É¤Ç¤¹.
+ --noprompt ¥×¥í¥ó¥×¥Èɽ¼¨¤ò¹Ô¤Ê¤ï¤Ê¤¤.
+ --tracer ¥³¥Þ¥ó¥É¼Â¹Ô»þ¤Ë¥È¥ì¡¼¥¹¤ò¹Ô¤Ê¤¦.
--back-trace-limit n
- ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹è¡¨ç¤ºã‚’ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã®é ­ã‹ã‚‰ n, 後ã‚
- ã‹ã‚‰nã ã‘行ãªã†. デフォルトã¯16
- --irb_debug n irbã®ãƒ‡ãƒãƒƒã‚°ãƒ‡ãƒãƒƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’nã«è¨­å®šã™ã‚‹(利用ã—ãª
- ã„æ–¹ãŒç„¡é›£ã§ã—ょã†).
- -v, --version irbã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹
+ ¥Ð¥Ã¥¯¥È¥ì¡¼¥¹É½¼¨¤ò¥Ð¥Ã¥¯¥È¥ì¡¼¥¹¤ÎƬ¤«¤é n, ¸å¤í
+ ¤«¤én¤À¤±¹Ô¤Ê¤¦. ¥Ç¥Õ¥©¥ë¥È¤Ï16
+ --irb_debug n irb¤Î¥Ç¥Ð¥Ã¥°¥Ç¥Ð¥Ã¥°¥ì¥Ù¥ë¤òn¤ËÀßÄꤹ¤ë(ÍøÍѤ·¤Ê
+ ¤¤Êý¤¬ÌµÆñ¤Ç¤·¤ç¤¦).
+ -v, --version irb¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë
-= コンフィギュレーション
+= ¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó
-irb起動時ã«``~/.irbrc''を読ã¿è¾¼ã¿ã¾ã™. ã‚‚ã—存在ã—ãªã„å ´åˆã¯,
-``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''ã®é †ã«loadを試ã¿ã¾ã™.
+irbµ¯Æ°»þ¤Ë``~/.irbrc''¤òÆÉ¤ß¹þ¤ß¤Þ¤¹. ¤â¤·Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï,
+``.irbrc'', ``irb.rc'', ``_irbrc'', ``$irbrc''¤Î½ç¤Ëload¤ò»î¤ß¤Þ¤¹.
-オプションを設定ã™ã‚‹ä»£ã‚りã«, 以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§ã‚‚デフォルトã®å‹•作を設定
-ã§ãã¾ã™.
+¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ëÂå¤ï¤ê¤Ë, °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¤â¥Ç¥Õ¥©¥ë¥È¤Îưºî¤òÀßÄê
+¤Ç¤­¤Þ¤¹.
IRB.conf[:IRB_NAME]="irb"
IRB.conf[:MATH_MODE]=false
@@ -101,43 +101,43 @@ irb起動時ã«``~/.irbrc''を読ã¿è¾¼ã¿ã¾ã™. ã‚‚ã—存在ã—ãªã„å ´åˆã¯
IRB.conf[:DEBUG_LEVEL]=0
IRB.conf[:VERBOSE]=true
-== プロンプトã®è¨­å®š
+== ¥×¥í¥ó¥×¥È¤ÎÀßÄê
-プロンプトをカスタマイズã—ãŸã„時ã«ã¯,
+¥×¥í¥ó¥×¥È¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤¿¤¤»þ¤Ë¤Ï,
IRB.conf[:PROMPT]
-を用ã„ã¾ã™. 例ãˆã°, .irbrcã®ä¸­ã§ä¸‹ã®ã‚ˆã†ãªå¼ã‚’記述ã—ã¾ã™:
+¤òÍѤ¤¤Þ¤¹. Î㤨¤Ð, .irbrc¤ÎÃæ¤Ç²¼¤Î¤è¤¦¤Ê¼°¤òµ­½Ò¤·¤Þ¤¹:
- IRB.conf[:PROMPT][:MY_PROMPT] = { # プロンプトモードã®åå‰
- :PROMPT_I => nil, # 通常ã®ãƒ—ロンプト
- :PROMPT_N => nil, # 継続行ã®ãƒ—ロンプト
- :PROMPT_S => nil, # 文字列ãªã©ã®ç¶™ç¶šè¡Œã®ãƒ—ロンプト
- :PROMPT_C => nil, # å¼ãŒç¶™ç¶šã—ã¦ã„る時ã®ãƒ—ロンプト
- :RETURN => " ==>%s\n" # リターン時ã®ãƒ—ロンプト
+ IRB.conf[:PROMPT][:MY_PROMPT] = { # ¥×¥í¥ó¥×¥È¥â¡¼¥É¤Î̾Á°
+ :PROMPT_I => nil, # Ä̾ï¤Î¥×¥í¥ó¥×¥È
+ :PROMPT_N => nil, # ·Ñ³¹Ô¤Î¥×¥í¥ó¥×¥È
+ :PROMPT_S => nil, # ʸ»úÎó¤Ê¤É¤Î·Ñ³¹Ô¤Î¥×¥í¥ó¥×¥È
+ :PROMPT_C => nil, # ¼°¤¬·Ñ³¤·¤Æ¤¤¤ë»þ¤Î¥×¥í¥ó¥×¥È
+ :RETURN => " ==>%s\n" # ¥ê¥¿¡¼¥ó»þ¤Î¥×¥í¥ó¥×¥È
}
-プロンプトモードを指定ã—ãŸã„時ã«ã¯,
+¥×¥í¥ó¥×¥È¥â¡¼¥É¤ò»ØÄꤷ¤¿¤¤»þ¤Ë¤Ï,
irb --prompt my-prompt
-ã§ãã®ãƒ—ロンプトモードã§èµ·å‹•ã•れã¾ã™. ã¾ãŸã¯, .irbrcã«ä¸‹å¼ã‚’記述ã—ã¦ã‚‚
-OKã§ã™.
+¤Ç¤½¤Î¥×¥í¥ó¥×¥È¥â¡¼¥É¤Çµ¯Æ°¤µ¤ì¤Þ¤¹. ¤Þ¤¿¤Ï, .irbrc¤Ë²¼¼°¤òµ­½Ò¤·¤Æ¤â
+OK¤Ç¤¹.
IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cã¯, フォーマットを指定ã—ã¾ã™.
+PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C¤Ï, ¥Õ¥©¡¼¥Þ¥Ã¥È¤ò»ØÄꤷ¤Þ¤¹.
- %N èµ·å‹•ã—ã¦ã„るコマンドåãŒå‡ºåŠ›ã•れる.
- %m mainオブジェクト(self)ãŒto_sã§å‡ºåŠ›ã•れる.
- %M mainオブジェクト(self)ãŒinspectã•れã¦å‡ºåŠ›ã•れる.
- %l 文字列中ã®ã‚¿ã‚¤ãƒ—を表ã™(", ', /, ], `]'ã¯%wã®ä¸­ã®æ™‚)
- %NNi インデントã®ãƒ¬ãƒ™ãƒ«ã‚’表ã™. NNã¯æ•°å­—ãŒå…¥ã‚Šprintfã®%NNdã¨åŒã˜. çœ
- ç•¥å¯èƒ½
- %NNn 行番å·ã‚’表ã—ã¾ã™.
+ %N µ¯Æ°¤·¤Æ¤¤¤ë¥³¥Þ¥ó¥É̾¤¬½ÐÎϤµ¤ì¤ë.
+ %m main¥ª¥Ö¥¸¥§¥¯¥È(self)¤¬to_s¤Ç½ÐÎϤµ¤ì¤ë.
+ %M main¥ª¥Ö¥¸¥§¥¯¥È(self)¤¬inspect¤µ¤ì¤Æ½ÐÎϤµ¤ì¤ë.
+ %l ʸ»úÎóÃæ¤Î¥¿¥¤¥×¤òɽ¤¹(", ', /, ], `]'¤Ï%w¤ÎÃæ¤Î»þ)
+ %NNi ¥¤¥ó¥Ç¥ó¥È¤Î¥ì¥Ù¥ë¤òɽ¤¹. NN¤Ï¿ô»ú¤¬Æþ¤êprintf¤Î%NNd¤ÈƱ¤¸. ¾Ê
+ ά²Äǽ
+ %NNn ¹ÔÈÖ¹æ¤òɽ¤·¤Þ¤¹.
%% %
-例ãˆã°, デフォルトã®ãƒ—ロンプトモードã¯:
+Î㤨¤Ð, ¥Ç¥Õ¥©¥ë¥È¤Î¥×¥í¥ó¥×¥È¥â¡¼¥É¤Ï:
IRB.conf[:PROMPT_MODE][:DEFAULT] = {
:PROMPT_I => "%N(%m):%03n:%i> ",
@@ -147,175 +147,175 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cã¯, フォーマットを指定ã—ã¾ã™.
:RETURN => "%s\n"
}
-ã¨ãªã£ã¦ã„ã¾ã™.
+¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹.
-RETURNã¯, ç¾åœ¨ã®ã¨ã“ã‚printfå½¢å¼ã§ã™. å°†æ¥ä»•様ãŒå¤‰ã‚ã‚‹ã‹ã‚‚知れã¾ã›ã‚“.
+RETURN¤Ï, ¸½ºß¤Î¤È¤³¤íprintf·Á¼°¤Ç¤¹. ¾­Íè»ÅÍͤ¬ÊѤï¤ë¤«¤âÃΤì¤Þ¤»¤ó.
-== サブirbã®è¨­å®š
+== ¥µ¥Öirb¤ÎÀßÄê
-コマンドラインオプションãŠã‚ˆã³IRB.confã¯(サブ)irb起動時ã®ãƒ‡ãƒ•ォルトã®
-設定を決ã‚ã‚‹ã‚‚ã®ã§, `5. コマンド'ã«ã‚ã‚‹confã§å€‹åˆ¥ã®(サブ)irbã®è¨­å®šãŒã§
-ãるよã†ã«ãªã£ã¦ã„ã¾ã™.
+¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ª¤è¤ÓIRB.conf¤Ï(¥µ¥Ö)irbµ¯Æ°»þ¤Î¥Ç¥Õ¥©¥ë¥È¤Î
+ÀßÄê¤ò·è¤á¤ë¤â¤Î¤Ç, `5. ¥³¥Þ¥ó¥É'¤Ë¤¢¤ëconf¤Ç¸ÄÊ̤Î(¥µ¥Ö)irb¤ÎÀßÄ꤬¤Ç
+¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹.
-IRB.conf[:IRB_RC]ã«procãŒè¨­å®šã•れã¦ã„ã‚‹ã¨, サブirbã‚’èµ·å‹•ã™ã‚‹æ™‚ã«ãã®
-procã‚’irbã®ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã‚’引数ã¨ã—ã¦å‘¼ã³å‡ºã—ã¾ã™. ã“れã«ã‚ˆã£ã¦å€‹åˆ¥ã®ã‚µ
-ブirbã”ã¨ã«è¨­å®šã‚’変ãˆã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™.
+IRB.conf[:IRB_RC]¤Ëproc¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È, ¥µ¥Öirb¤òµ¯Æ°¤¹¤ë»þ¤Ë¤½¤Î
+proc¤òirb¤Î¥³¥ó¥Æ¥­¥¹¥È¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ó½Ð¤·¤Þ¤¹. ¤³¤ì¤Ë¤è¤Ã¤Æ¸ÄÊ̤Υµ
+¥Öirb¤´¤È¤ËÀßÄê¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹.
-= コマンド
+= ¥³¥Þ¥ó¥É
-irb拡張コマンドã¯, ç°¡å˜ãªåå‰ã¨é ­ã«`irb_'ã‚’ã¤ã‘ãŸåå‰ã¨ä¸¡æ–¹å®šç¾©ã•れã¦
-ã„ã¾ã™. ã“れã¯, ç°¡å˜ãªåå‰ãŒoverrideã•ã‚ŒãŸæ™‚ã®ãŸã‚ã§ã™.
+irb³ÈÄ¥¥³¥Þ¥ó¥É¤Ï, ´Êñ¤Ê̾Á°¤ÈƬ¤Ë`irb_'¤ò¤Ä¤±¤¿Ì¾Á°¤ÈξÊýÄêµÁ¤µ¤ì¤Æ
+¤¤¤Þ¤¹. ¤³¤ì¤Ï, ´Êñ¤Ê̾Á°¤¬override¤µ¤ì¤¿»þ¤Î¤¿¤á¤Ç¤¹.
--- exit, quit, irb_exit
- 終了ã™ã‚‹.
- サブirbã®å ´åˆ, ãã®ã‚µãƒ–irbを終了ã™ã‚‹.
+ ½ªÎ»¤¹¤ë.
+ ¥µ¥Öirb¤Î¾ì¹ç, ¤½¤Î¥µ¥Öirb¤ò½ªÎ»¤¹¤ë.
--- conf, irb_context
- irbã®ç¾åœ¨ã®è¨­å®šã‚’表示ã™ã‚‹. 設定ã®å¤‰æ›´ã¯, confã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“
- ã¨ã«ã‚ˆã£ã¦è¡Œãªãˆã‚‹.
+ irb¤Î¸½ºß¤ÎÀßÄê¤òɽ¼¨¤¹¤ë. ÀßÄê¤ÎÊѹ¹¤Ï, conf¤Ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë¤³
+ ¤È¤Ë¤è¤Ã¤Æ¹Ô¤Ê¤¨¤ë.
--- conf.eval_history = N
- å®Ÿè¡Œçµæžœã®ãƒ’ストリ機能ã®è¨­å®š.
- nnã¯æ•´æ•°ã‹nilã§ nn>0 ã§ã‚れã°ãã®æ•°ã ã‘ヒストリã«ãŸã‚る。nn==0ã®æ™‚ã¯
- 無制é™ã«è¨˜æ†¶ã™ã‚‹ã€nilã ã¨ãƒ’ストリ機能ã¯ã‚„ã‚ã‚‹(デフォルト).
+ ¼Â¹Ô·ë²Ì¤Î¥Ò¥¹¥È¥êµ¡Ç½¤ÎÀßÄê.
+ nn¤ÏÀ°¿ô¤«nil¤Ç nn>0 ¤Ç¤¢¤ì¤Ð¤½¤Î¿ô¤À¤±¥Ò¥¹¥È¥ê¤Ë¤¿¤á¤ë¡£nn==0¤Î»þ¤Ï
+ ̵À©¸Â¤Ëµ­²±¤¹¤ë¡¢nil¤À¤È¥Ò¥¹¥È¥êµ¡Ç½¤Ï¤ä¤á¤ë(¥Ç¥Õ¥©¥ë¥È).
--- Conf.back_trace_limit
- ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹è¡¨ç¤ºã‚’ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã®é ­ã‹ã‚‰n, 後ã‚ã‹ã‚‰nã ã‘行ãªã†.
- デフォルトã¯16
+ ¥Ð¥Ã¥¯¥È¥ì¡¼¥¹É½¼¨¤ò¥Ð¥Ã¥¯¥È¥ì¡¼¥¹¤ÎƬ¤«¤én, ¸å¤í¤«¤én¤À¤±¹Ô¤Ê¤¦.
+ ¥Ç¥Õ¥©¥ë¥È¤Ï16
--- conf.debug_level = N
- irb用ã®ãƒ‡ãƒãƒƒã‚°ãƒ¬ãƒ™ãƒ«ã®è¨­å®š
+ irbÍѤΥǥХå°¥ì¥Ù¥ë¤ÎÀßÄê
--- conf.ignore_eof = true/false
- ^DãŒå…¥åŠ›ã•ã‚ŒãŸæ™‚ã®å‹•作を設定ã™ã‚‹. trueã®æ™‚ã¯^Dを無視ã™ã‚‹, falseã®
- 時ã¯irbを終了ã™ã‚‹.
+ ^D¤¬ÆþÎϤµ¤ì¤¿»þ¤Îưºî¤òÀßÄꤹ¤ë. true¤Î»þ¤Ï^D¤ò̵»ë¤¹¤ë, false¤Î
+ »þ¤Ïirb¤ò½ªÎ»¤¹¤ë.
--- conf.ignore_sigint= true/false
- ^CãŒå…¥åŠ›ã•ã‚ŒãŸæ™‚ã®å‹•作を設定ã™ã‚‹. false時ã¯, irbを終了ã™ã‚‹. trueã®
- 時ã®å‹•作ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹:
- 入力中: ã“れã¾ã§å…¥åŠ›ã—ãŸã‚‚ã®ã‚’キャンセルã—ãƒˆãƒƒãƒ—ãƒ¬ãƒ™ãƒ«ã«æˆ»ã‚‹.
- 実行中: 実行を中止ã™ã‚‹.
+ ^C¤¬ÆþÎϤµ¤ì¤¿»þ¤Îưºî¤òÀßÄꤹ¤ë. false»þ¤Ï, irb¤ò½ªÎ»¤¹¤ë. true¤Î
+ »þ¤Îưºî¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ë:
+ ÆþÎÏÃæ: ¤³¤ì¤Þ¤ÇÆþÎϤ·¤¿¤â¤Î¤ò¥­¥ã¥ó¥»¥ë¤·¥È¥Ã¥×¥ì¥Ù¥ë¤ËÌá¤ë.
+ ¼Â¹ÔÃæ: ¼Â¹Ô¤òÃæ»ß¤¹¤ë.
--- conf.inf_ruby_mode = true/false
- inf-ruby-mode用ã®ãƒ—ロンプト表示を行ãªã†. デフォルトã¯false.
+ inf-ruby-modeÍѤΥץí¥ó¥×¥Èɽ¼¨¤ò¹Ô¤Ê¤¦. ¥Ç¥Õ¥©¥ë¥È¤Ïfalse.
--- conf.inspect_mode = true/false/nil
- インスペクトモードを設定ã™ã‚‹.
- true: インスペクトã—ã¦è¡¨ç¤ºã™ã‚‹.
- false: 通常ã®printã§è¡¨ç¤ºã™ã‚‹.
- nil: 通常モードã§ã‚れã°, inspect modeã¨ãªã‚Š, mathãƒ¢ãƒ¼ãƒ‰ã®æ™‚ã¯, non
- inspect modeã¨ãªã‚‹.
+ ¥¤¥ó¥¹¥Ú¥¯¥È¥â¡¼¥É¤òÀßÄꤹ¤ë.
+ true: ¥¤¥ó¥¹¥Ú¥¯¥È¤·¤ÆÉ½¼¨¤¹¤ë.
+ false: Ä̾ï¤Îprint¤Çɽ¼¨¤¹¤ë.
+ nil: Ä̾ï¥â¡¼¥É¤Ç¤¢¤ì¤Ð, inspect mode¤È¤Ê¤ê, math¥â¡¼¥É¤Î»þ¤Ï, non
+ inspect mode¤È¤Ê¤ë.
--- conf.math_mode
- å‚ç…§ã®ã¿. bcモード(分数, 行列ã®è¨ˆç®—ãŒã§ãã¾ã™)ã‹ã©ã†ã‹?
+ »²¾È¤Î¤ß. bc¥â¡¼¥É(ʬ¿ô, ¹ÔÎó¤Î·×»»¤¬¤Ç¤­¤Þ¤¹)¤«¤É¤¦¤«?
--- conf.use_loader = true/false
- load/require時ã«irbã®file読ã¿è¾¼ã¿æ©Ÿèƒ½ã‚’用ã„るモードã®ã‚¹ã‚¤ãƒƒãƒ(デフォ
- ルトã¯ç”¨ã„ãªã„). ã“ã®ãƒ¢ãƒ¼ãƒ‰ã¯IRB全体ã«å映ã•れる.
+ load/require»þ¤Ëirb¤ÎfileÆÉ¤ß¹þ¤ßµ¡Ç½¤òÍѤ¤¤ë¥â¡¼¥É¤Î¥¹¥¤¥Ã¥Á(¥Ç¥Õ¥©
+ ¥ë¥È¤ÏÍѤ¤¤Ê¤¤). ¤³¤Î¥â¡¼¥É¤ÏIRBÁ´ÂΤËÈ¿±Ç¤µ¤ì¤ë.
--- conf.prompt_c
- ifã®ç›´å¾Œãªã©, 行ãŒç¶™ç¶šã—ã¦ã„る時ã®ãƒ—ロンプト.
+ if¤Îľ¸å¤Ê¤É, ¹Ô¤¬·Ñ³¤·¤Æ¤¤¤ë»þ¤Î¥×¥í¥ó¥×¥È.
--- conf.prompt_i
- 通常ã®ãƒ—ロンプト.
+ Ä̾ï¤Î¥×¥í¥ó¥×¥È.
--- conf.prompt_s
- 文字列中ãªã©ã‚’表ã™ãƒ—ロンプト.
+ ʸ»úÎóÃæ¤Ê¤É¤òɽ¤¹¥×¥í¥ó¥×¥È.
--- conf.rc
- ~/.irbrcを読ã¿è¾¼ã‚“ã ã‹ã©ã†ã‹?
+ ~/.irbrc¤òÆÉ¤ß¹þ¤ó¤À¤«¤É¤¦¤«?
--- conf.use_prompt = true/false
- プロンプト表示ã™ã‚‹ã‹ã©ã†ã‹? デフォルトã§ã¯ãƒ—ロンプトを表示ã™ã‚‹.
+ ¥×¥í¥ó¥×¥Èɽ¼¨¤¹¤ë¤«¤É¤¦¤«? ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥×¥í¥ó¥×¥È¤òɽ¼¨¤¹¤ë.
--- conf.use_readline = true/false/nil
- readlineを使ã†ã‹ã©ã†ã‹?
- true: readlineを使ã†.
- false: readlineを使ã‚ãªã„.
- nil: (デフォルト)inf-ruby-mode以外ã§readlineライブラリを利用ã—よ
- ã†ã¨ã™ã‚‹.
+ readline¤ò»È¤¦¤«¤É¤¦¤«?
+ true: readline¤ò»È¤¦.
+ false: readline¤ò»È¤ï¤Ê¤¤.
+ nil: (¥Ç¥Õ¥©¥ë¥È)inf-ruby-mode°Ê³°¤Çreadline¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤è
+ ¤¦¤È¤¹¤ë.
#
#--- conf.verbose=T/F
-# irbã‹ã‚‰ã„ã‚ã„ã‚ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’出力ã™ã‚‹ã‹?
+# irb¤«¤é¤¤¤í¤¤¤í¤Ê¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ¹¤ë¤«?
--- cws, chws, irb_cws, irb_chws, irb_change_workspace [obj]
- objã‚’selfã¨ã™ã‚‹. objãŒçœç•¥ã•れãŸã¨ãã¯, home workspace, ã™ãªã‚ã¡
- irbã‚’èµ·å‹•ã—ãŸã¨ãã®main objectã‚’selfã¨ã™ã‚‹.
+ obj¤òself¤È¤¹¤ë. obj¤¬¾Êά¤µ¤ì¤¿¤È¤­¤Ï, home workspace, ¤¹¤Ê¤ï¤Á
+ irb¤òµ¯Æ°¤·¤¿¤È¤­¤Îmain object¤òself¤È¤¹¤ë.
--- pushws, irb_pushws, irb_push_workspace [obj]
- UNIXシェルコマンドã®pushdã¨åŒæ§˜.
+ UNIX¥·¥§¥ë¥³¥Þ¥ó¥É¤Îpushd¤ÈƱÍÍ.
--- popws, irb_popws, irb_pop_workspace
- UNIXシェルコマンドã®popdã¨åŒæ§˜.
+ UNIX¥·¥§¥ë¥³¥Þ¥ó¥É¤Îpopd¤ÈƱÍÍ.
--- irb [obj]
- サブirbã‚’ç«‹ã¡ã‚ã’ã‚‹. objãŒæŒ‡å®šã•ã‚ŒãŸæ™‚ã¯, ãã®objã‚’selfã¨ã™ã‚‹.
+ ¥µ¥Öirb¤òΩ¤Á¤¢¤²¤ë. obj¤¬»ØÄꤵ¤ì¤¿»þ¤Ï, ¤½¤Îobj¤òself¤È¤¹¤ë.
--- jobs, irb_jobs
- サブirbã®ãƒªã‚¹ãƒˆ
+ ¥µ¥Öirb¤Î¥ê¥¹¥È
--- fg n, irb_fg n
- 指定ã—ãŸã‚µãƒ–irbã«ã‚¹ã‚¤ãƒƒãƒã™ã‚‹. nã¯, 次ã®ã‚‚ã®ã‚’指定ã™ã‚‹.
+ »ØÄꤷ¤¿¥µ¥Öirb¤Ë¥¹¥¤¥Ã¥Á¤¹¤ë. n¤Ï, ¼¡¤Î¤â¤Î¤ò»ØÄꤹ¤ë.
- irb番å·
- スレッド
- irbオブジェクト
- self(irb objã§èµ·å‹•ã—ãŸæ™‚ã®obj)
+ irbÈÖ¹æ
+ ¥¹¥ì¥Ã¥É
+ irb¥ª¥Ö¥¸¥§¥¯¥È
+ self(irb obj¤Çµ¯Æ°¤·¤¿»þ¤Îobj)
--- kill n, irb_kill n
- サブirbã‚’killã™ã‚‹. nã¯fgã¨åŒã˜.
+ ¥µ¥Öirb¤òkill¤¹¤ë. n¤Ïfg¤ÈƱ¤¸.
---- source, irb_source path
- UNIXシェルコマンドã®sourceã¨ä¼¼ã¦ã„ã‚‹. ç¾åœ¨ã®ç’°å¢ƒä¸Šã§path内ã®ã‚¹ã‚¯ãƒª
- プトを評価ã™ã‚‹.
+--- souce, irb_source path
+ UNIX¥·¥§¥ë¥³¥Þ¥ó¥É¤Îsource¤È»÷¤Æ¤¤¤ë. ¸½ºß¤Î´Ä¶­¾å¤ÇpathÆâ¤Î¥¹¥¯¥ê
+ ¥×¥È¤òɾ²Á¤¹¤ë.
--- irb_load path, prev
- Rubyã®loadã®irb版.
+ Ruby¤Îload¤ÎirbÈÇ.
-= システム変数
+= ¥·¥¹¥Æ¥àÊÑ¿ô
--- _
- å‰ã®è¨ˆç®—ã®å®Ÿè¡Œçµæžœã‚’覚ãˆã¦ã„ã‚‹(ローカル変数).
+ Á°¤Î·×»»¤Î¼Â¹Ô·ë²Ì¤ò³Ð¤¨¤Æ¤¤¤ë(¥í¡¼¥«¥ëÊÑ¿ô).
--- __
- å®Ÿè¡Œçµæžœã®å±¥æ­´ã‚’覚ãˆã¦ã„ã‚‹.
- __[line_no]ã§ã€ãã®è¡Œã§å®Ÿè¡Œã—ãŸçµæžœã‚’å¾—ã‚‹ã“ã¨ãŒã§ãã‚‹. line_noãŒè² ã®
- 時ã«ã¯ã€æœ€æ–°ã®çµæžœã‹ã‚‰-line_noå‰ã®çµæžœã‚’å¾—ã‚‹ã“ã¨ãŒã§ãã‚‹.
+ ¼Â¹Ô·ë²Ì¤ÎÍúÎò¤ò³Ð¤¨¤Æ¤¤¤ë.
+ __[line_no]¤Ç¡¢¤½¤Î¹Ô¤Ç¼Â¹Ô¤·¤¿·ë²Ì¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤ë. line_no¤¬Éé¤Î
+ »þ¤Ë¤Ï¡¢ºÇ¿·¤Î·ë²Ì¤«¤é-line_noÁ°¤Î·ë²Ì¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤ë.
-= 使用例
+= »ÈÍÑÎã
-以下ã®ã‚ˆã†ãªæ„Ÿã˜ã§ã™.
+°Ê²¼¤Î¤è¤¦¤Ê´¶¤¸¤Ç¤¹.
dim% ruby irb.rb
- irb(main):001:0> irb # サブirbã®ç«‹ã¡ã‚ã’
- irb#1(main):001:0> jobs # サブirbã®ãƒªã‚¹ãƒˆ
+ irb(main):001:0> irb # ¥µ¥Öirb¤ÎΩ¤Á¤¢¤²
+ irb#1(main):001:0> jobs # ¥µ¥Öirb¤Î¥ê¥¹¥È
#0->irb on main (#<Thread:0x400fb7e4> : stop)
#1->irb#1 on main (#<Thread:0x40125d64> : running)
nil
- irb#1(main):002:0> fg 0 # jobã®ã‚¹ã‚¤ãƒƒãƒ
+ irb#1(main):002:0> fg 0 # job¤Î¥¹¥¤¥Ã¥Á
nil
irb(main):002:0> class Foo;end
nil
- irb(main):003:0> irb Foo # Fooをコンテキストã—ã¦irb
- # ç«‹ã¡ã‚ã’
- irb#2(Foo):001:0> def foo # Foo#fooã®å®šç¾©
+ irb(main):003:0> irb Foo # Foo¤ò¥³¥ó¥Æ¥­¥¹¥È¤·¤Æirb
+ # Ω¤Á¤¢¤²
+ irb#2(Foo):001:0> def foo # Foo#foo¤ÎÄêµÁ
irb#2(Foo):002:1> print 1
irb#2(Foo):003:1> end
nil
- irb#2(Foo):004:0> fg 0 # jobをスイッãƒ
+ irb#2(Foo):004:0> fg 0 # job¤ò¥¹¥¤¥Ã¥Á
nil
- irb(main):004:0> jobs # jobã®ãƒªã‚¹ãƒˆ
+ irb(main):004:0> jobs # job¤Î¥ê¥¹¥È
#0->irb on main (#<Thread:0x400fb7e4> : running)
#1->irb#1 on main (#<Thread:0x40125d64> : stop)
#2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
nil
- irb(main):005:0> Foo.instance_methods # Foo#fooãŒã¡ã‚ƒã‚“ã¨å®šç¾©ã•
- # れã¦ã„ã‚‹
+ irb(main):005:0> Foo.instance_methods # Foo#foo¤¬¤Á¤ã¤ó¤ÈÄêµÁ¤µ
+ # ¤ì¤Æ¤¤¤ë
["foo"]
- irb(main):006:0> fg 2 # jobをスイッãƒ
+ irb(main):006:0> fg 2 # job¤ò¥¹¥¤¥Ã¥Á
nil
- irb#2(Foo):005:0> def bar # Foo#barを定義
+ irb#2(Foo):005:0> def bar # Foo#bar¤òÄêµÁ
irb#2(Foo):006:1> print "bar"
irb#2(Foo):007:1> end
nil
@@ -325,36 +325,36 @@ irb拡張コマンドã¯, ç°¡å˜ãªåå‰ã¨é ­ã«`irb_'ã‚’ã¤ã‘ãŸåå‰ã¨ä¸¡
nil
irb(main):007:0> f = Foo.new
#<Foo:0x4010af3c>
- irb(main):008:0> irb f # Fooã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§irbã‚’
- # ç«‹ã¡ã‚ã’ã‚‹.
+ irb(main):008:0> irb f # Foo¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Çirb¤ò
+ # Ω¤Á¤¢¤²¤ë.
irb#3(#<Foo:0x4010af3c>):001:0> jobs
#0->irb on main (#<Thread:0x400fb7e4> : stop)
#1->irb#1 on main (#<Thread:0x40125d64> : stop)
#2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
#3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
nil
- irb#3(#<Foo:0x4010af3c>):002:0> foo # f.fooã®å®Ÿè¡Œ
+ irb#3(#<Foo:0x4010af3c>):002:0> foo # f.foo¤Î¼Â¹Ô
nil
- irb#3(#<Foo:0x4010af3c>):003:0> bar # f.barã®å®Ÿè¡Œ
+ irb#3(#<Foo:0x4010af3c>):003:0> bar # f.bar¤Î¼Â¹Ô
barnil
- irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# jobã®kill
+ irb#3(#<Foo:0x4010af3c>):004:0> kill 1, 2, 3# job¤Îkill
nil
irb(main):009:0> jobs
#0->irb on main (#<Thread:0x400fb7e4> : running)
nil
- irb(main):010:0> exit # 終了
+ irb(main):010:0> exit # ½ªÎ»
dim%
-= 使用上ã®åˆ¶é™
+= »ÈÍѾå¤ÎÀ©¸Â
-irbã¯, 評価ã§ãる時点(å¼ãŒé–‰ã˜ãŸæ™‚点)ã§ã®é€æ¬¡å®Ÿè¡Œã‚’行ãªã„ã¾ã™. ã—ãŸãŒã£
-ã¦, rubyを直接使ã£ãŸæ™‚ã¨, 若干異ãªã‚‹å‹•作を行ãªã†å ´åˆãŒã‚りã¾ã™.
+irb¤Ï, ɾ²Á¤Ç¤­¤ë»þÅÀ(¼°¤¬ÊĤ¸¤¿»þÅÀ)¤Ç¤ÎÃ༡¼Â¹Ô¤ò¹Ô¤Ê¤¤¤Þ¤¹. ¤·¤¿¤¬¤Ã
+¤Æ, ruby¤òľÀܻȤä¿»þ¤È, ¼ã´³°Û¤Ê¤ëưºî¤ò¹Ô¤Ê¤¦¾ì¹ç¤¬¤¢¤ê¤Þ¤¹.
-ç¾åœ¨æ˜Žã‚‰ã‹ã«ãªã£ã¦ã„ã‚‹å•題点を説明ã—ã¾ã™.
+¸½ºßÌÀ¤é¤«¤Ë¤Ê¤Ã¤Æ¤¤¤ëÌäÂêÅÀ¤òÀâÌÀ¤·¤Þ¤¹.
-== ローカル変数ã®å®£è¨€
+== ¥í¡¼¥«¥ëÊÑ¿ô¤ÎÀë¸À
-rubyã§ã¯, 以下ã®ãƒ—ログラムã¯ã‚¨ãƒ©ãƒ¼ã«ãªã‚Šã¾ã™.
+ruby¤Ç¤Ï, °Ê²¼¤Î¥×¥í¥°¥é¥à¤Ï¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹.
eval "foo = 0"
foo
@@ -363,24 +363,24 @@ rubyã§ã¯, 以下ã®ãƒ—ログラムã¯ã‚¨ãƒ©ãƒ¼ã«ãªã‚Šã¾ã™.
---
NameError
-ã¨ã“ã‚ãŒ, irbを用ã„ã‚‹ã¨
+¤È¤³¤í¤¬, irb¤òÍѤ¤¤ë¤È
>> eval "foo = 0"
=> 0
>> foo
=> 0
-ã¨ãªã‚Š, エラーを起ã“ã—ã¾ã›ã‚“. ã“れã¯, rubyãŒæœ€åˆã«ã‚¹ã‚¯ãƒªãƒ—ト全体をコン
-パイルã—ã¦ãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã‚’決定ã™ã‚‹ã‹ã‚‰ã§ã™. ãれã«å¯¾ã—, irbã¯å®Ÿè¡Œå¯èƒ½ã«
-ãªã‚‹(å¼ãŒé–‰ã˜ã‚‹)ã¨è‡ªå‹•çš„ã«è©•価ã—ã¦ã„ã‚‹ã‹ã‚‰ã§ã™. 上記ã®ä¾‹ã§ã¯,
+¤È¤Ê¤ê, ¥¨¥é¡¼¤òµ¯¤³¤·¤Þ¤»¤ó. ¤³¤ì¤Ï, ruby¤¬ºÇ½é¤Ë¥¹¥¯¥ê¥×¥ÈÁ´ÂΤò¥³¥ó
+¥Ñ¥¤¥ë¤·¤Æ¥í¡¼¥«¥ëÊÑ¿ô¤ò·èÄꤹ¤ë¤«¤é¤Ç¤¹. ¤½¤ì¤ËÂФ·, irb¤Ï¼Â¹Ô²Äǽ¤Ë
+¤Ê¤ë(¼°¤¬ÊĤ¸¤ë)¤È¼«Æ°Åª¤Ëɾ²Á¤·¤Æ¤¤¤ë¤«¤é¤Ç¤¹. ¾åµ­¤ÎÎã¤Ç¤Ï,
evel "foo = 0"
-を行ãªã£ãŸæ™‚点ã§è©•価を行ãªã„, ãã®æ™‚点ã§å¤‰æ•°ãŒå®šç¾©ã•れるãŸã‚, 次å¼ã§
-変数fooã¯å®šç¾©ã•れã¦ã„ã‚‹ã‹ã‚‰ã§ã™.
+¤ò¹Ô¤Ê¤Ã¤¿»þÅÀ¤Çɾ²Á¤ò¹Ô¤Ê¤¤, ¤½¤Î»þÅÀ¤ÇÊÑ¿ô¤¬ÄêµÁ¤µ¤ì¤ë¤¿¤á, ¼¡¼°¤Ç
+ÊÑ¿ôfoo¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤«¤é¤Ç¤¹.
-ã“ã®ã‚ˆã†ãªrubyã¨irbã®å‹•作ã®é•ã„を解決ã—ãŸã„å ´åˆã¯, begin...endã§æ‹¬ã£ã¦
-ãƒãƒƒãƒçš„ã«å®Ÿè¡Œã—ã¦ä¸‹ã•ã„:
+¤³¤Î¤è¤¦¤Êruby¤Èirb¤Îưºî¤Î°ã¤¤¤ò²ò·è¤·¤¿¤¤¾ì¹ç¤Ï, begin...end¤Ç³ç¤Ã¤Æ
+¥Ð¥Ã¥ÁŪ¤Ë¼Â¹Ô¤·¤Æ²¼¤µ¤¤:
>> begin
?> eval "foo = 0"
@@ -390,14 +390,14 @@ rubyã§ã¯, 以下ã®ãƒ—ログラムã¯ã‚¨ãƒ©ãƒ¼ã«ãªã‚Šã¾ã™.
(irb):3
(irb_local_binding):1:in `eval'
-== ヒアドキュメント
+== ¥Ò¥¢¥É¥­¥å¥á¥ó¥È
-ç¾åœ¨ã®ã¨ã“ã‚ヒアドキュメントã®å®Ÿè£…ã¯ä¸å®Œå…¨ã§ã™.
+¸½ºß¤Î¤È¤³¤í¥Ò¥¢¥É¥­¥å¥á¥ó¥È¤Î¼ÂÁõ¤ÏÉÔ´°Á´¤Ç¤¹.
-== シンボル
+== ¥·¥ó¥Ü¥ë
-シンボルã§ã‚ã‚‹ã‹ã©ã†ã‹ã®åˆ¤æ–­ã‚’é–“é•ãˆã‚‹ã“ã¨ãŒã‚りã¾ã™. 具体的ã«ã¯å¼ãŒå®Œäº†
-ã—ã¦ã„ã‚‹ã®ã«ç¶™ç¶šè¡Œã¨è¦‹ãªã™ã“ã¨ãŒã‚りã¾ã™.
+¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¤«¤É¤¦¤«¤ÎȽÃǤò´Ö°ã¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹. ¶ñÂÎŪ¤Ë¤Ï¼°¤¬´°Î»
+¤·¤Æ¤¤¤ë¤Î¤Ë·Ñ³¹Ô¤È¸«¤Ê¤¹¤³¤È¤¬¤¢¤ê¤Þ¤¹.
=end
diff --git a/doc/pty/README b/doc/pty/README
new file mode 100644
index 0000000000..d6368f3758
--- /dev/null
+++ b/doc/pty/README
@@ -0,0 +1,84 @@
+pty extension version 0.3 by A.ito
+
+1. Introduction
+
+This extension module adds ruby a functionality to execute an
+arbitrary command through pseudo tty (pty).
+
+2. Install
+
+Follow the instruction below.
+
+(1) Execute
+
+ ruby extconf.rb
+
+ then Makefile is generated.
+
+(3) Do make; make install.
+
+3. What you can do
+
+This extension module defines a module named PTY, which contains
+following module fungtions:
+
+ getpty(command)
+ spawn(command)
+
+ This function reserves a pty, executes command over the pty
+ and returns an array. The return value is an array with three
+ elements. The first element in the array is for reading and the
+ second for writing. The third element is the process ID of the
+ child process. If this function is called with an iterator block,
+ the array is passed to the block as block parameters, and the
+ function itself returns nil.
+
+ When the child process is suspended or finished, an exception is
+ raised. If this function is called with an iterator block,
+ exception is raised only within the block. Child process
+ monitor is terminated on block exit.
+
+ protect_signal
+ reset_signal
+
+ These functions are obsolete in this version of pty.
+
+ PTY.open
+
+ 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.
+
+ PTY.check(pid[, raise=false])
+
+ checks the status of the child process specified by pid, and
+ returns nil if the process is still alive and active.
+ Otherwise, returns Process::Status about the process if raise is
+ false, or PTY::ChildExited exception is raised.
+
+4. License
+
+(C) Copyright 1998 by Akinori Ito.
+
+This software may be redistributed freely for this purpose, in full
+or in part, provided that this entire copyright notice is included
+on any copies of this software and applications and derivations thereof.
+
+This software is provided on an "as is" basis, without warranty of any
+kind, either expressed or implied, as to any matter including, but not
+limited to warranty of fitness of purpose, or merchantability, or
+results obtained from use of this software.
+
+5. Bug report
+
+Please feel free to send E-mail to
+
+ aito@ei5sun.yz.yamagata-u.ac.jp
+
+for any bug report, opinion, contribution, etc.
diff --git a/doc/pty/README.expect b/doc/pty/README.expect
new file mode 100644
index 0000000000..fddbb6fdad
--- /dev/null
+++ b/doc/pty/README.expect
@@ -0,0 +1,22 @@
+ README for expect
+ by A. Ito, 28 October, 1998
+
+ Expect library adds IO class a method called expect(), which
+does similar act to tcl's expect extension.
+
+The usage of the method is:
+
+ IO#expect(pattern,timeout=9999999)
+
+where `pattern' is an instance of String or Regexp and `timeout'
+is Fixnum, which can be omitted.
+ When the method is called without block, it waits until the
+input which matches the pattern is obtained from the IO or the time
+specified as the timeout passes. When the pattern is obtained from the
+IO, the method returns an array. The first element of the array is the
+entire string obtained from the IO until the pattern matches. The
+following elements indicates the specific pattern which matched to the
+anchor in the regular expression. If the method ends because of
+timeout, it returns nil.
+ When the method is called with block, the array is passed as
+the block parameter.
diff --git a/doc/pty/README.expect.ja b/doc/pty/README.expect.ja
index 7c0456f24f..db84695ee5 100644
--- a/doc/pty/README.expect.ja
+++ b/doc/pty/README.expect.ja
@@ -1,21 +1,21 @@
README for expect
by A. Ito, 28 October, 1998
- Expectライブラリã¯ï¼Œtcl ã® expect パッケージã¨ä¼¼ãŸã‚ˆã†ãªæ©Ÿèƒ½ã‚’
-IOクラスã«è¿½åŠ ã—ã¾ã™ï¼Ž
+ Expect¥é¥¤¥Ö¥é¥ê¤Ï¡¤tcl ¤Î expect ¥Ñ¥Ã¥±¡¼¥¸¤È»÷¤¿¤è¤¦¤Êµ¡Ç½¤ò
+IO¥¯¥é¥¹¤ËÄɲä·¤Þ¤¹¡¥
- 追加ã•れるメソッドã®ä½¿ã„æ–¹ã¯æ¬¡ã®é€šã‚Šã§ã™ï¼Ž
+ Äɲ䵤ì¤ë¥á¥½¥Ã¥É¤Î»È¤¤Êý¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡¥
IO#expect(pattern,timeout=9999999)
-pattern 㯠String ã‹ Regexp ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ï¼Œtimeout 㯠Fixnum
-ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§ã™ï¼Žtimeout ã¯çœç•¥ã§ãã¾ã™ï¼Ž
- ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ãŒãƒ–ロックãªã—ã§å‘¼ã°ã‚ŒãŸå ´åˆï¼Œã¾ãšãƒ¬ã‚·ãƒ¼ãƒã§ã‚ã‚‹
-IOオブジェクトã‹ã‚‰ pattern ã«ãƒžãƒƒãƒã™ã‚‹ãƒ‘ターンãŒèª­ã¿ã“ã¾ã‚Œã‚‹
-ã¾ã§å¾…ã¡ã¾ã™ï¼Žãƒ‘ターンãŒå¾—られãŸã‚‰ï¼Œãã®ãƒ‘ターンã«é–¢ã™ã‚‹é…列を
-è¿”ã—ã¾ã™ï¼Žé…åˆ—ã®æœ€åˆã®è¦ç´ ã¯ï¼Œpattern ã«ãƒžãƒƒãƒã™ã‚‹ã¾ã§ã«èª­ã¿ã“
-ã¾ã‚ŒãŸå†…å®¹ã®æ–‡å­—列ã§ã™ï¼Ž2番目以é™ã®è¦ç´ ã¯ï¼Œpattern ã®æ­£è¦è¡¨ç¾
-ã®ä¸­ã«ã‚¢ãƒ³ã‚«ãƒ¼ãŒã‚ã£ãŸå ´åˆã«ï¼Œãã®ã‚¢ãƒ³ã‚«ãƒ¼ã«ãƒžãƒƒãƒã™ã‚‹éƒ¨åˆ†ã§ã™ï¼Ž
-ã‚‚ã—タイムアウトãŒèµ·ããŸå ´åˆã¯ï¼Œã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯nilã‚’è¿”ã—ã¾ã™ï¼Ž
- ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ãŒãƒ–ロック付ãã§å‘¼ã°ã‚ŒãŸå ´åˆã«ã¯ï¼Œãƒžãƒƒãƒã—ãŸè¦ç´ ã®
-é…列ãŒãƒ–ロック引数ã¨ã—ã¦æ¸¡ã•れ,ブロックãŒè©•価ã•れã¾ã™ï¼Ž
+pattern ¤Ï String ¤« Regexp ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¡¤timeout ¤Ï Fixnum
+¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ç¤¹¡¥timeout ¤Ï¾Êά¤Ç¤­¤Þ¤¹¡¥
+ ¤³¤Î¥á¥½¥Ã¥É¤¬¥Ö¥í¥Ã¥¯¤Ê¤·¤Ç¸Æ¤Ð¤ì¤¿¾ì¹ç¡¤¤Þ¤º¥ì¥·¡¼¥Ð¤Ç¤¢¤ë
+IO¥ª¥Ö¥¸¥§¥¯¥È¤«¤é pattern ¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Ñ¥¿¡¼¥ó¤¬ÆÉ¤ß¤³¤Þ¤ì¤ë
+¤Þ¤ÇÂÔ¤Á¤Þ¤¹¡¥¥Ñ¥¿¡¼¥ó¤¬ÆÀ¤é¤ì¤¿¤é¡¤¤½¤Î¥Ñ¥¿¡¼¥ó¤Ë´Ø¤¹¤ëÇÛÎó¤ò
+ÊÖ¤·¤Þ¤¹¡¥ÇÛÎó¤ÎºÇ½é¤ÎÍ×ÁǤϡ¤pattern ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤Þ¤Ç¤ËÆÉ¤ß¤³
+¤Þ¤ì¤¿ÆâÍÆ¤Îʸ»úÎó¤Ç¤¹¡¥2ÈÖÌܰʹߤÎÍ×ÁǤϡ¤pattern ¤ÎÀµµ¬É½¸½
+¤ÎÃæ¤Ë¥¢¥ó¥«¡¼¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¡¤¤½¤Î¥¢¥ó¥«¡¼¤Ë¥Þ¥Ã¥Á¤¹¤ëÉôʬ¤Ç¤¹¡¥
+¤â¤·¥¿¥¤¥à¥¢¥¦¥È¤¬µ¯¤­¤¿¾ì¹ç¤Ï¡¤¤³¤Î¥á¥½¥Ã¥É¤Ïnil¤òÊÖ¤·¤Þ¤¹¡¥
+ ¤³¤Î¥á¥½¥Ã¥É¤¬¥Ö¥í¥Ã¥¯ÉÕ¤­¤Ç¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¤¥Þ¥Ã¥Á¤·¤¿Í×ÁǤÎ
+ÇÛÎ󤬥֥í¥Ã¥¯°ú¿ô¤È¤·¤ÆÅϤµ¤ì¡¤¥Ö¥í¥Ã¥¯¤¬É¾²Á¤µ¤ì¤Þ¤¹¡¥
diff --git a/doc/pty/README.ja b/doc/pty/README.ja
index 9b9d306bf7..ca2a01442a 100644
--- a/doc/pty/README.ja
+++ b/doc/pty/README.ja
@@ -1,76 +1,76 @@
-pty 拡張モジュール version 0.3 by A.ito
+pty ³ÈÄ¥¥â¥¸¥å¡¼¥ë version 0.3 by A.ito
-1. ã¯ã˜ã‚ã«
+1. ¤Ï¤¸¤á¤Ë
-ã“ã®æ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯ï¼Œä»®æƒ³tty (pty) を通ã—ã¦é©å½“ãªã‚³ãƒžãƒ³ãƒ‰ã‚’
-実行ã™ã‚‹æ©Ÿèƒ½ã‚’ ruby ã«æä¾›ã—ã¾ã™ï¼Ž
+¤³¤Î³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Ï¡¤²¾ÁÛtty (pty) ¤òÄ̤·¤ÆÅ¬Åö¤Ê¥³¥Þ¥ó¥É¤ò
+¼Â¹Ô¤¹¤ëµ¡Ç½¤ò ruby ¤ËÄ󶡤·¤Þ¤¹¡¥
-2. インストール
+2. ¥¤¥ó¥¹¥È¡¼¥ë
-次ã®ã‚ˆã†ã«ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„.
+¼¡¤Î¤è¤¦¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡¥
(1) ruby extconf.rb
- を実行ã™ã‚‹ã¨ Makefile ãŒç”Ÿæˆã•れã¾ã™ï¼Ž
+ ¤ò¼Â¹Ô¤¹¤ë¤È Makefile ¤¬À¸À®¤µ¤ì¤Þ¤¹¡¥
-(2) make; make install を実行ã—ã¦ãã ã•ã„.
+(2) make; make install ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡¥
-3. 何ãŒã§ãã‚‹ã‹
+3. ²¿¤¬¤Ç¤­¤ë¤«
-ã“ã®æ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯ï¼ŒPTY ã¨ã„ã†ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’定義ã—ã¾ã™ï¼Žãã®ä¸­
-ã«ã¯ï¼Œæ¬¡ã®ã‚ˆã†ãªãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«é–¢æ•°ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ï¼Ž
+¤³¤Î³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Ï¡¤PTY ¤È¤¤¤¦¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤·¤Þ¤¹¡¥¤½¤ÎÃæ
+¤Ë¤Ï¡¤¼¡¤Î¤è¤¦¤Ê¥â¥¸¥å¡¼¥ë´Ø¿ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡¥
getpty(command)
spawn(command)
- ã“ã®é–¢æ•°ã¯ï¼Œä»®æƒ³ttyを確ä¿ã—,指定ã•れãŸã‚³ãƒžãƒ³ãƒ‰ã‚’ãã®ä»®æƒ³tty
- ã®å‘ã“ã†ã§å®Ÿè¡Œã—,é…列を返ã—ã¾ã™ï¼Žæˆ»ã‚Šå€¤ã¯3ã¤ã®è¦ç´ ã‹ã‚‰ãªã‚‹
- é…列ã§ã™ï¼Žæœ€åˆã®è¦ç´ ã¯ä»®æƒ³ttyã‹ã‚‰èª­ã¿å‡ºã™ãŸã‚ã®IOオブジェクト,
- 2ç•ªç›®ã¯æ›¸ãã“ã‚€ãŸã‚ã®IOオブジェクト,3番目ã¯å­ãƒ—ロセスã®ãƒ—ロ
- セスIDã§ã™ï¼Žã“ã®é–¢æ•°ãŒã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã¨ã—ã¦å‘¼ã°ã‚ŒãŸå ´åˆï¼Œã“れらã®
- è¦ç´ ã¯ãƒ–ロックパラメータã¨ã—ã¦æ¸¡ã•れ,関数自体ã¯nilã‚’è¿”ã—ã¾ã™ï¼Ž
-
- å­ãƒ—ロセスãŒçµ‚了ã—ãŸã‚Šåœæ­¢ã—ãŸå ´åˆã«ã¯ï¼Œä¾‹å¤–ãŒç™ºç”Ÿã—ã¾ã™ï¼Žã“ã®é–¢
- æ•°ãŒãƒ–ロックパラメータ付ãã§å‘¼ã°ã‚ŒãŸå ´åˆã«ã¯ï¼Œãã®ãƒ–ロックã®ä¸­ã§
- ã®ã¿ä¾‹å¤–ãŒç™ºç”Ÿã—ã¾ã™ï¼Žå­ãƒ—ロセスをモニターã—ã¦ã„るスレッドã¯ãƒ–ロッ
- クを抜ã‘ã‚‹ã¨ãã«çµ‚了ã—ã¾ã™ï¼Ž
+ ¤³¤Î´Ø¿ô¤Ï¡¤²¾ÁÛtty¤ò³ÎÊݤ·¡¤»ØÄꤵ¤ì¤¿¥³¥Þ¥ó¥É¤ò¤½¤Î²¾ÁÛtty
+ ¤Î¸þ¤³¤¦¤Ç¼Â¹Ô¤·¡¤ÇÛÎó¤òÊÖ¤·¤Þ¤¹¡¥Ìá¤êÃͤÏ3¤Ä¤ÎÍ×ÁǤ«¤é¤Ê¤ë
+ ÇÛÎó¤Ç¤¹¡¥ºÇ½é¤ÎÍ×ÁǤϲ¾ÁÛtty¤«¤éÆÉ¤ß½Ð¤¹¤¿¤á¤ÎIO¥ª¥Ö¥¸¥§¥¯¥È¡¤
+ 2ÈÖÌܤϽñ¤­¤³¤à¤¿¤á¤ÎIO¥ª¥Ö¥¸¥§¥¯¥È¡¤3ÈÖÌÜ¤Ï»Ò¥×¥í¥»¥¹¤Î¥×¥í
+ ¥»¥¹ID¤Ç¤¹¡¥¤³¤Î´Ø¿ô¤¬¥¤¥Æ¥ì¡¼¥¿¤È¤·¤Æ¸Æ¤Ð¤ì¤¿¾ì¹ç¡¤¤³¤ì¤é¤Î
+ Í×ÁǤϥ֥í¥Ã¥¯¥Ñ¥é¥á¡¼¥¿¤È¤·¤ÆÅϤµ¤ì¡¤´Ø¿ô¼«ÂΤÏnil¤òÊÖ¤·¤Þ¤¹¡¥
+
+ »Ò¥×¥í¥»¥¹¤¬½ªÎ»¤·¤¿¤êÄä»ß¤·¤¿¾ì¹ç¤Ë¤Ï¡¤Îã³°¤¬È¯À¸¤·¤Þ¤¹¡¥¤³¤Î´Ø
+ ¿ô¤¬¥Ö¥í¥Ã¥¯¥Ñ¥é¥á¡¼¥¿ÉÕ¤­¤Ç¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¤¤½¤Î¥Ö¥í¥Ã¥¯¤ÎÃæ¤Ç
+ ¤Î¤ßÎã³°¤¬È¯À¸¤·¤Þ¤¹¡¥»Ò¥×¥í¥»¥¹¤ò¥â¥Ë¥¿¡¼¤·¤Æ¤¤¤ë¥¹¥ì¥Ã¥É¤Ï¥Ö¥í¥Ã
+ ¥¯¤òÈ´¤±¤ë¤È¤­¤Ë½ªÎ»¤·¤Þ¤¹¡¥
protect_signal
reset_signal
- 廃止予定ã§ã™ï¼Ž
+ ÇÑ»ßͽÄê¤Ç¤¹¡¥
PTY.open
- 仮想ttyを確ä¿ã—,マスターå´ã«å¯¾å¿œã™ã‚‹IOオブジェクトã¨ã‚¹ãƒ¬ãƒ¼ãƒ–å´ã«
- 対応ã™ã‚‹Fileオブジェクトã®é…列を返ã—ã¾ã™ï¼Žãƒ–ロック付ãã§å‘¼ã³å‡ºã•
- れãŸå ´åˆã¯ï¼Œã“れらã®è¦ç´ ã¯ãƒ–ロックパラメータã¨ã—ã¦æ¸¡ã•れ,ブロッ
- クã‹ã‚‰è¿”ã•れãŸçµæžœã‚’è¿”ã—ã¾ã™ï¼Žã¾ãŸã€ã“ã®ãƒžã‚¹ã‚¿ãƒ¼IOã¨ã‚¹ãƒ¬ãƒ¼ãƒ–File
- ã¯ã€ãƒ–ロックを抜ã‘ã‚‹ã¨ãã«ã‚¯ãƒ­ãƒ¼ã‚ºæ¸ˆã¿ã§ãªã‘れã°ã‚¯ãƒ­ãƒ¼ã‚ºã•れã¾ã™ï¼Ž
+ ²¾ÁÛtty¤ò³ÎÊݤ·¡¤¥Þ¥¹¥¿¡¼Â¦¤ËÂбþ¤¹¤ëIO¥ª¥Ö¥¸¥§¥¯¥È¤È¥¹¥ì¡¼¥Ö¦¤Ë
+ Âбþ¤¹¤ëFile¥ª¥Ö¥¸¥§¥¯¥È¤ÎÇÛÎó¤òÊÖ¤·¤Þ¤¹¡¥¥Ö¥í¥Ã¥¯ÉÕ¤­¤Ç¸Æ¤Ó½Ð¤µ
+ ¤ì¤¿¾ì¹ç¤Ï¡¤¤³¤ì¤é¤ÎÍ×ÁǤϥ֥í¥Ã¥¯¥Ñ¥é¥á¡¼¥¿¤È¤·¤ÆÅϤµ¤ì¡¤¥Ö¥í¥Ã
+ ¥¯¤«¤éÊÖ¤µ¤ì¤¿·ë²Ì¤òÊÖ¤·¤Þ¤¹¡¥¤Þ¤¿¡¢¤³¤Î¥Þ¥¹¥¿¡¼IO¤È¥¹¥ì¡¼¥ÖFile
+ ¤Ï¡¢¥Ö¥í¥Ã¥¯¤òÈ´¤±¤ë¤È¤­¤Ë¥¯¥í¡¼¥ººÑ¤ß¤Ç¤Ê¤±¤ì¤Ð¥¯¥í¡¼¥º¤µ¤ì¤Þ¤¹¡¥
PTY.check(pid[, raise=false])
- pidã§æŒ‡å®šã•れãŸå­ãƒ—ロセスã®çŠ¶æ…‹ã‚’ãƒã‚§ãƒƒã‚¯ã—,実行中ã§ã‚れã°nilã‚’
- è¿”ã—ã¾ã™ï¼Žçµ‚了ã—ã¦ã„ã‚‹ã‹åœæ­¢ã—ã¦ã„ã‚‹å ´åˆã€ç¬¬äºŒå¼•æ•°ãŒå½ã§ã‚れã°ã€
- 対応ã™ã‚‹Process::Statusオブジェクトを返ã—ã¾ã™ã€‚真ã§ã‚れã°
- PTY::ChildExited例外ãŒç™ºç”Ÿã—ã¾ã™ï¼Ž
+ pid¤Ç»ØÄꤵ¤ì¤¿»Ò¥×¥í¥»¥¹¤Î¾õÂÖ¤ò¥Á¥§¥Ã¥¯¤·¡¤¼Â¹ÔÃæ¤Ç¤¢¤ì¤Ðnil¤ò
+ ÊÖ¤·¤Þ¤¹¡¥½ªÎ»¤·¤Æ¤¤¤ë¤«Ää»ß¤·¤Æ¤¤¤ë¾ì¹ç¡¢ÂèÆó°ú¿ô¤¬µ¶¤Ç¤¢¤ì¤Ð¡¢
+ Âбþ¤¹¤ëProcess::Status¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤¹¡£¿¿¤Ç¤¢¤ì¤Ð
+ PTY::ChildExitedÎã³°¤¬È¯À¸¤·¤Þ¤¹¡¥
-4. 利用ã«ã¤ã„ã¦
+4. ÍøÍѤˤĤ¤¤Æ
-伊藤彰則ãŒè‘—ä½œæ¨©ã‚’ä¿æœ‰ã—ã¾ã™ï¼Ž
+°ËÆ£¾´Â§¤¬Ãøºî¸¢¤òÊÝÍ­¤·¤Þ¤¹¡¥
-ソースプログラムã¾ãŸã¯ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã«å…ƒã®è‘—ä½œæ¨©è¡¨ç¤ºãŒæ”¹å¤‰ã•れãšã«
-表示ã•れã¦ã„ã‚‹å ´åˆã«é™ã‚Šï¼Œèª°ã§ã‚‚,ã“ã®ã‚½ãƒ•トウェアを無償ã‹ã¤è‘—作
-権者ã«ç„¡æ–­ã§åˆ©ç”¨ãƒ»é…布・改変ã§ãã¾ã™ï¼Žåˆ©ç”¨ç›®çš„ã¯é™å®šã•れã¦ã„ã¾ã›
-ん.
+¥½¡¼¥¹¥×¥í¥°¥é¥à¤Þ¤¿¤Ï¥É¥­¥å¥á¥ó¥È¤Ë¸µ¤ÎÃøºî¸¢É½¼¨¤¬²þÊѤµ¤ì¤º¤Ë
+ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¸Â¤ê¡¤Ã¯¤Ç¤â¡¤¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò̵½þ¤«¤ÄÃøºî
+¸¢¼Ô¤Ë̵ÃǤÇÍøÍÑ¡¦ÇÛÉÛ¡¦²þÊѤǤ­¤Þ¤¹¡¥ÍøÍÑÌÜŪ¤Ï¸ÂÄꤵ¤ì¤Æ¤¤¤Þ¤»
+¤ó¡¥
-ã“ã®ãƒ—ログラムã®åˆ©ç”¨ãƒ»é…布ãã®ä»–ã“ã®ãƒ—ログラムã«é–¢ä¿‚ã™ã‚‹è¡Œç‚ºã«ã‚ˆ
-ã£ã¦ç”Ÿã˜ãŸã„ã‹ãªã‚‹æå®³ã«å¯¾ã—ã¦ã‚‚,作者ã¯ä¸€åˆ‡è²¬ä»»ã‚’è² ã„ã¾ã›ã‚“.
+¤³¤Î¥×¥í¥°¥é¥à¤ÎÍøÍÑ¡¦ÇÛÉÛ¤½¤Î¾¤³¤Î¥×¥í¥°¥é¥à¤Ë´Ø·¸¤¹¤ë¹Ô°Ù¤Ë¤è
+¤Ã¤ÆÀ¸¤¸¤¿¤¤¤«¤Ê¤ë»³²¤ËÂФ·¤Æ¤â¡¤ºî¼Ô¤Ï°ìÀÚÀÕǤ¤òÉ餤¤Þ¤»¤ó¡¥
-5. ãƒã‚°å ±å‘Šç­‰
+5. ¥Ð¥°Êó¹ðÅù
-ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã¯æ­“迎ã—ã¾ã™ï¼Ž
+¥Ð¥°¥ì¥Ý¡¼¥È¤Ï´¿·Þ¤·¤Þ¤¹¡¥
aito@ei5sun.yz.yamagata-u.ac.jp
-ã¾ã§é›»å­ãƒ¡ãƒ¼ãƒ«ã§ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã‚’ãŠé€ã‚Šãã ã•ã„.
+¤Þ¤ÇÅŻҥ᡼¥ë¤Ç¥Ð¥°¥ì¥Ý¡¼¥È¤ò¤ªÁ÷¤ê¤¯¤À¤µ¤¤¡¥
diff --git a/doc/rake/CHANGES b/doc/rake/CHANGES
index 1caac6f024..3b1a02b812 100644
--- a/doc/rake/CHANGES
+++ b/doc/rake/CHANGES
@@ -66,7 +66,7 @@
symbol/string differences. (Patch supplied by Edwin Pratomo)
* Fixed bug with rules involving multiple source (Patch supplied by
- Emanuel Indermühle)
+ Emanuel Indermühle)
* Switched from getoptlong to optparse (patches supplied by Edwin
Pratomo)
diff --git a/doc/rake/command_line_usage.rdoc b/doc/rake/command_line_usage.rdoc
index 688e55a9af..c60e53f51a 100644
--- a/doc/rake/command_line_usage.rdoc
+++ b/doc/rake/command_line_usage.rdoc
@@ -2,26 +2,14 @@
Rake is invoked from the command line using:
- % rake [options ...] [VAR=VALUE ...] [targets ...]
+ % rake [<em>options</em> ...] [<em>VAR</em>=<em>VALUE</em>] [<em>targets</em> ...]
Options are:
[<tt><em>name</em>=<em>value</em></tt>]
Set the environment variable <em>name</em> to <em>value</em>
during the execution of the <b>rake</b> command. You can access
- the value by using ENV['<em>name</em>'].
-
-[<tt>--all</tt> (-A)]
- Used in combination with the -T and -D options, will force
- those options to show all the tasks, even the ones without comments.
-
-[<tt>--backtrace</tt>{=_output_} (-n)]
- Enable a full backtrace (i.e. like --trace, but without the task
- tracing details). The _output_ parameter is optional, but if
- specified it controls where the backtrace output is sent. If
- _output_ is <tt>stdout</tt>, then backtrace output is directed to
- stardard output. If _output_ is <tt>stderr</tt>, or if it is
- missing, then the backtrace output is sent to standard error.
+ the value by using ENV['<em>name</em>'].
[<tt>--classic-namespace</tt> (-n)]
Import the Task, FileTask, and FileCreateTask into the top-level
@@ -30,11 +18,6 @@ Options are:
'rake/classic_namespace'</code> in your Rakefile to get the
classic behavior.
-[<tt>--comments</tt>]
- Used in combination with the -W options to force the output to
- contain commented options only. This is the reverse of
- <tt>--all</tt>.
-
[<tt>--describe</tt> _pattern_ (-D)]
Describe the tasks (matching optional PATTERN), then exit.
@@ -48,40 +31,15 @@ Options are:
[<tt>--execute-print</tt> _code_ (-p)]
Execute some Ruby code, print the result, and exit.
-[<tt>--execute-continue</tt> _code_ (-E)]
+[<tt>--execute-continue</tt> _code_ (-p)]
Execute some Ruby code, then continue with normal task processing.
[<tt>--help</tt> (-H)]
Display some help text and exit.
-[<tt>--jobs</tt> _number_ (-j)]
- Specifies the number of active concurrent tasks used. The
- suggested value is equal to the number of CPUs. The concurrent
- tasks are used to execute the <tt>multitask</tt> prerequisites.
- Also see the <tt>-m</tt> option which turns all tasks into
- multitasks.
-
- Sample values:
- (no -j) : unlimited concurrent tasks (standard rake behavior)
- -j : 2 concurrent tasks (exact number may change)
- -j 16 : 16 concurrent tasks
-
-[<tt>--job-stats</tt> _level_]
-
- Display job statistics at the completion of the run. By default,
- this will display the requested number of active tasks (from the
- -j options) and the maximum number of tasks in play at any given
- time.
-
- If the optional _level_ is <tt>history</tt>, then a complete trace
- of task history will be displayed on standard output.
-
[<tt>--libdir</tt> _directory_ (-I)]
Add _directory_ to the list of directories searched for require.
-[<tt>--multitask</tt> (-m)]
- Treat all tasks as multitasks. ('make/drake' semantics)
-
[<tt>--nosearch</tt> (-N)]
Do not search for a Rakefile in parent directories.
@@ -102,16 +60,6 @@ Options are:
[<tt>--rakelibdir</tt> _rakelibdir_ (-R)]
Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')
-[<tt>--reduce-compat</tt>]
-
- Remove the DSL commands from the Object inheritance hierarchy and
- do not define top level constants. This reduces the backwards
- compatibility of Rake, but allows rake to be used with software
- that would otherwise have conflicting definitions.
-
- *NOTE:* The next major version of Rake will only be able to be run
- in "reduce-compat" mode.
-
[<tt>--require</tt> _name_ (-r)]
Require _name_ before executing the Rakefile.
@@ -121,11 +69,6 @@ Options are:
[<tt>--silent (-s)</tt>]
Like --quiet, but also suppresses the 'in directory' announcement.
-[<tt>--suppress-backtrace _pattern_ </tt>]
- Line matching the regular expression _pattern_ will be removed
- from the backtrace output. Note that the --backtrace option is the
- full backtrace without these lines suppressed.
-
[<tt>--system</tt> (-g)]
Use the system wide (global) rakefiles. The project Rakefile is
ignored. By default, the system wide rakefiles are used only if no
@@ -137,18 +80,16 @@ Options are:
Use the project level Rakefile, ignoring the system-wide (global)
rakefiles.
-[<tt>--tasks</tt> <em>pattern</em> (-T)]
+[<tt>--tasks</tt> (-T)]
Display a list of the major tasks and their comments. Comments
- are defined using the "desc" command. If a pattern is given, then
- only tasks matching the pattern are displayed.
+ are defined using the "desc" command.
-[<tt>--trace</tt>{=_output_} (-t)]
+[<tt>--trace</tt> (-t)]
Turn on invoke/execute tracing. Also enable full backtrace on
- errors. The _output_ parameter is optional, but if specified it
- controls where the trace output is sent. If _output_ is
- <tt>stdout</tt>, then trace output is directed to stardard output.
- If _output_ is <tt>stderr</tt>, or if it is missing, then trace
- output is sent to standard error.
+ errors.
+
+[<tt>--usage</tt> (-h)]
+ Display a usage message and exit.
[<tt>--verbose</tt> (-v)]
Echo the Sys commands to standard output.
@@ -156,14 +97,6 @@ Options are:
[<tt>--version</tt> (-V)]
Display the program version and exit.
-[<tt>--where</tt> <em>pattern</em> (-W)]
- Display tasks that match <em>pattern</em> and the file and line
- number where the task is defined. By default this option will
- display all tasks, not just the tasks that have descriptions.
-
-[<tt>--no-deprecation-warnings</tt> (-W)]
- Do not display the deprecation warnings.
-
In addition, any command line option of the form
<em>VAR</em>=<em>VALUE</em> will be added to the environment hash
<tt>ENV</tt> and may be tested in the Rakefile.
diff --git a/doc/rake/glossary.rdoc b/doc/rake/glossary.rdoc
index a811764091..0ca1869306 100644
--- a/doc/rake/glossary.rdoc
+++ b/doc/rake/glossary.rdoc
@@ -37,9 +37,9 @@
not needed. This may change in the future.
[<b>prerequisites</b>]
- Every task has a set (possibly empty) of prerequisites. A
+ Every task has a set (possiblity empty) of prerequisites. A
prerequisite P to Task T is itself a task that must be invoked
- before Task T.
+ before Task T.
[<b>rule</b>]
A rule is a recipe for synthesizing a task when no task is
diff --git a/doc/rake/jamis.rb b/doc/rake/jamis.rb
index c7bc84ac5b..c7439d88ea 100644
--- a/doc/rake/jamis.rb
+++ b/doc/rake/jamis.rb
@@ -183,7 +183,7 @@ h3, h4, h5, h6 {
CSS
XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
-<!DOCTYPE html
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
}
@@ -510,7 +510,7 @@ FILE_INDEX = XHTML_PREAMBLE + <<HTML
<!--
body {
background-color: #EEE;
- font-family: #{FONTS};
+ font-family: #{FONTS};
color: #000;
margin: 0px;
}
diff --git a/doc/rake/proto_rake.rdoc b/doc/rake/proto_rake.rdoc
index a9e33d11da..39b9b88c1f 100644
--- a/doc/rake/proto_rake.rdoc
+++ b/doc/rake/proto_rake.rdoc
@@ -4,54 +4,54 @@ This is the original 100 line prototype rake program.
---
#!/usr/bin/env ruby
-
+
require 'ftools'
-
+
class Task
TASKS = Hash.new
-
+
attr_reader :prerequisites
-
+
def initialize(task_name)
@name = task_name
@prerequisites = []
@actions = []
end
-
+
def enhance(deps=nil, &block)
@prerequisites |= deps if deps
@actions << block if block_given?
self
end
-
+
def name
@name.to_s
end
-
+
def invoke
@prerequisites.each { |n| Task[n].invoke }
execute if needed?
end
-
+
def execute
return if @triggered
@triggered = true
@actions.collect { |act| result = act.call(self) }.last
end
-
+
def needed?
true
end
-
+
def timestamp
Time.now
end
-
+
class << self
def [](task_name)
TASKS[intern(task_name)] or fail "Don't know how to rake #{task_name}"
end
-
+
def define_task(args, &block)
case args
when Hash
@@ -66,18 +66,18 @@ This is the original 100 line prototype rake program.
deps = deps.collect {|d| intern(d) }
get(task_name).enhance(deps, &block)
end
-
+
def get(task_name)
name = intern(task_name)
TASKS[name] ||= self.new(name)
end
-
+
def intern(task_name)
(Symbol === task_name) ? task_name : task_name.intern
end
end
end
-
+
class FileTask < Task
def needed?
return true unless File.exist?(name)
@@ -85,25 +85,25 @@ This is the original 100 line prototype rake program.
return false if latest_prereq.nil?
timestamp < latest_prereq
end
-
+
def timestamp
File.new(name.to_s).mtime
end
end
-
+
def task(args, &block)
Task.define_task(args, &block)
end
-
+
def file(args, &block)
FileTask.define_task(args, &block)
end
-
+
def sys(cmd)
puts cmd
system(cmd) or fail "Command Failed: [#{cmd}]"
end
-
+
def rake
begin
here = Dir.pwd
@@ -119,9 +119,9 @@ This is the original 100 line prototype rake program.
rescue Exception => ex
puts "rake aborted ... #{ex.message}"
puts ex.backtrace.find {|str| str =~ /Rakefile/ } || ""
- end
+ end
end
-
+
if __FILE__ == $0 then
rake
end
diff --git a/doc/rake/rakefile.rdoc b/doc/rake/rakefile.rdoc
index a00c9fd21e..f8ae72c32a 100644
--- a/doc/rake/rakefile.rdoc
+++ b/doc/rake/rakefile.rdoc
@@ -1,4 +1,4 @@
-= Rakefile Format (as of version 0.8.7)
+= Rakefile Format (as of version 0.8.3)
First of all, there is no special format for a Rakefile. A Rakefile
contains executable Ruby code. Anything legal in a ruby script is
@@ -27,7 +27,7 @@ parameter that is the name of the task.
=== Tasks with Prerequisites
-Any prerequisites are given as a list (enclosed in square brackets)
+Any prerequisites are given as a list (inclosed in square brackets)
following the name and an arrow (=>).
task :name => [:prereq1, :prereq2]
@@ -45,7 +45,7 @@ following ...
Actions are defined by passing a block to the +task+ method. Any Ruby
code can be placed in the block. The block may reference the task
-object via the block parameter.
+object via the block paramter..
task :name => [:prereq1, :prereq2] do |t|
# actions (may reference t)
@@ -119,14 +119,14 @@ Rake allows parallel execution of prerequisites using the following syntax:
end
In this example, +copy_files+ is a normal rake task. Its actions are
-executed whenever all of its prerequisites are done. The big
+executed whereever all of its prerequisites are done. The big
difference is that the prerequisites (+copy_src+, +copy_bin+ and
+copy_doc+) are executed in parallel. Each of the prerequisites are
run in their own Ruby thread, possibly allowing faster overall runtime.
=== Secondary Prerequisites
-If any of the primary prerequisites of a multitask have common secondary
+If any of the primary prerequites of a multitask have common secondary
prerequisites, all of the primary/parallel prerequisites will wait
until the common prerequisites have been run.
@@ -183,22 +183,6 @@ argument string should be quoted. Something like this:
(Quoting rules vary between operating systems and shells, so make sure
you consult the proper docs for your OS/shell).
-=== Tasks Arguments and the Environment
-
-Task argument values can also be picked up from the environment. For
-example, if the "release" task expected a parameter named
-"release_version", then either
-
- rake release[0.8.2]
-
-or
-
- RELEASE_VERSION rake release
-
-will work. Environment variable names must either match the task
-parameter exactly, or match an all-uppercase version of the task
-parameter.
-
=== Tasks that Expect Parameters
Parameters are only given to tasks that are setup to expect them. In
@@ -211,10 +195,10 @@ declared as:
task :name, [:first_name, :last_name]
The first argument is still the name of the task (:name in this case).
-The next two arguments are the names of the parameters expected by
+The next to argumements are the names of the parameters expected by
:name in an array (:first_name and :last_name in the example).
-To access the values of the parameters, the block defining the task
+To access the values of the paramters, the block defining the task
behaviour can now accept a second parameter:
task :name, [:first_name, :last_name] do |t, args|
@@ -226,8 +210,7 @@ The first argument of the block "t" is always bound to the current
task object. The second argument "args" is an open-struct like object
that allows access to the task arguments. Extra command line
arguments to a task are ignored. Missing command line arguments are
-picked up from matching environment variables. If there are no
-matching environment variables, they are given the nil value.
+given the nil value.
If you wish to specify default values for the arguments, you can use
the with_defaults method in the task body. Here is the above example
@@ -256,12 +239,11 @@ for tasks with arguments. For example:
There is an older format for declaring task parameters that omitted
the task argument array and used the :needs keyword to introduce the
dependencies. That format is still supported for compatibility, but
-is not recommended for use. The older format may be dropped in future
-versions of rake.
+is not recommended for use.
-== Accessing Task Programmatically
+== Accessing Task Programatically
-Sometimes it is useful to manipulate tasks programmatically in a
+Sometimes it is useful to manipulate tasks programatically in a
Rakefile. To find a task object, use the <tt>:[]</tt> operator on the
<tt>Rake::Task</tt>.
@@ -278,7 +260,7 @@ actions.
task :dont do
Rake::Task[:doit].clear
- end
+ end
Running this example:
@@ -287,7 +269,7 @@ Running this example:
DONE
$ rake dont doit
(in /Users/jim/working/git/rake/x)
- $
+ $
The ability to programmatically manipulate tasks gives rake very
powerful meta-programming capabilities w.r.t. task execution, but
@@ -312,7 +294,7 @@ Rake is able to find a file named "mycode.c", it will automatically
create a task that builds "mycode.o" from "mycode.c".
If the file "mycode.c" does not exist, rake will attempt
-to recursively synthesize a rule for it.
+to recursively synthesize a rule for it.
When a task is synthesized from a rule, the +source+ attribute of the
task is set to the matching source file. This allows us to write
@@ -330,7 +312,7 @@ The following rule is equivalent to the example above.
proc {|task_name| task_name.sub(/\.[^.]+$/, '.c') }
]) do |t|
sh "cc #{t.source} -c -o #{t.name}"
- end
+ end
<b>NOTE:</b> Because of a _quirk_ in Ruby syntax, parenthesis are
required on *rule* when the first argument is a regular expression.
@@ -340,7 +322,7 @@ The following rule might be used for Java files ...
rule '.java' => [
proc { |tn| tn.sub(/\.class$/, '.java').sub(/^classes\//, 'src/') }
] do |t|
- java_compile(t.source, t.name)
+ java_compile(t.source, t.name)
end
<b>NOTE:</b> +java_compile+ is a hypothetical method that invokes the
@@ -358,17 +340,12 @@ invoked. This make generated dependency files difficult to use. By
the time rake gets around to updating the dependencies file, it is too
late to load it.
-The +Rake.import+ command addresses this by specifying a file to be
-loaded _after_ the main rakefile is loaded, but _before_ any targets
-on the command line are invoked. In addition, if the file name
-matches an explicit task, that task is invoked before loading the
-file. This allows dependency files to be generated and used in a
-single rake command invocation.
-
-<b>NOTE:</b> Starting in Rake version 0.9.0, the top level +import+
-command is deprecated and we recommend using the scoped
-"+Rake.import+" command mentioned above. Future versions of Rake will
-drop support for the top level +import+ command.
+The +import+ command addresses this by specifying a file to be loaded
+_after_ the main rakefile is loaded, but _before_ any targets on the
+command line are specified. In addition, if the file name matches an
+explicit task, that task is invoked before loading the file. This
+allows dependency files to be generated and used in a single rake
+command invocation.
=== Example:
@@ -378,7 +355,7 @@ drop support for the top level +import+ command.
sh "makedepend -f- -- #{CFLAGS} -- #{t.prerequisites} > #{t.name}"
end
- Rake.import ".depends.mf"
+ import ".depends.mf"
If ".depends" does not exist, or is out of date w.r.t. the source
files, a new ".depends" file is generated using +makedepend+ before
@@ -397,9 +374,9 @@ then you need to use the +desc+ command to describe the task.
task :package => [ ... ] do ... end
The "-T" switch (or "--tasks" if you like to spell things out) will
-display a list of tasks that have a description. If you use +desc+ to
-describe your major tasks, you have a semi-automatic way of generating
-a summary of your Rake file.
+display a list of tasks that have a defined comment. If you use
++desc+ to describe your major tasks, you have a semi-automatic way of
+generating a summary of your Rake file.
traken$ rake -T
(in /home/.../rake)
@@ -426,12 +403,12 @@ common for task names to begin to clash. For example, if you might
have a main program and a set of sample programs built by a single
Rakefile. By placing the tasks related to the main program in one
namespace, and the tasks for building the sample programs in a
-different namespace, the task names will not will not interfere with
+different namespace, the task names will not will not interfer with
each other.
For example:
- namespace "main" do
+ namespace "main"
task :build do
# Build the main program
end
@@ -452,7 +429,7 @@ Nested namespaces are supported, so
Note that the name given in the +task+ command is always the unadorned
task name without any namespace prefixes. The +task+ command always
-defines a task in the current namespace.
+defines a task in the current namespace.
=== FileTasks
@@ -522,17 +499,17 @@ Or give it a glob pattern:
== Odds and Ends
-=== do/end versus { }
+=== do/end verses { }
Blocks may be specified with either a +do+/+end+ pair, or with curly
braces in Ruby. We _strongly_ recommend using +do+/+end+ to specify the
actions for tasks and rules. Because the rakefile idiom tends to
-leave off parentheses on the task/file/rule methods, unusual
+leave off parenthesis on the task/file/rule methods, unusual
ambiguities can arise when using curly braces.
For example, suppose that the method +object_files+ returns a list of
object files in a project. Now we use +object_files+ as the
-prerequisites in a rule specified with actions in curly braces.
+prerequistes in a rule specified with actions in curly braces.
# DON'T DO THIS!
file "prog" => object_files {
@@ -554,4 +531,4 @@ This is the proper way to specify the task ...
== See
-* README.rdoc -- Main documentation for Rake.
+* README -- Main documentation for Rake.
diff --git a/doc/rake/rational.rdoc b/doc/rake/rational.rdoc
index 0e1c33873d..f741e65bf8 100644
--- a/doc/rake/rational.rdoc
+++ b/doc/rake/rational.rdoc
@@ -38,13 +38,13 @@ too much work. And that was the end of that!
... Except I couldn't get the thought out of my head. What exactly
would be needed to make the about syntax work as a make file? Hmmm, you
would need to register the tasks, you need some way of specifying
-dependencies between tasks, and some way of kicking off the process.
+dependencies between tasks, and some way of kicking off the process.
Hey! What if we did ... and fifteen minutes later I had a working
prototype of Ruby make, complete with dependencies and actions.
I showed the code to my coworker and we had a good laugh. It was just
about a page worth of code that reproduced an amazing amount of the
-functionality of make. We were both truly stunned with the power of
+functionality of make. We were both truely stunned with the power of
Ruby.
But it didn't do everything make did. In particular, it didn't have
@@ -53,7 +53,7 @@ prerequisite files have a later timestamp). Obviously THAT would be a
pain to add and so Ruby Make would remain an interesting experiment.
... Except as I walked back to my desk, I started thinking about what
-file based dependencies would really need. Rats! I was hooked again,
+file based dependecies would really need. Rats! I was hooked again,
and by adding a new class and two new methods, file/timestamp
dependencies were implemented.
@@ -97,7 +97,7 @@ Here's another task with dependencies ...
end
Task :clobber depends upon task :clean, so :clean will be run before
-:clobber is executed.
+:clobber is executed.
Files are specified by using the "file" command. It is similar to the
task command, except that the task name represents a file, and the task
@@ -115,7 +115,7 @@ Here is a file based dependency that will compile "hello.cc" to
I normally specify file tasks with string (rather than symbols). Some
file names can't be represented by symbols. Plus it makes the
-distinction between them more clear to the casual reader.
+distinction between them more clear to the casual reader.
Currently writing a task for each and every file in the project would be
tedious at best. I envision a set of libraries to make this job
@@ -133,7 +133,7 @@ created for rake.
That's it. There's no documentation (other than whats in this
message). Does this sound interesting to anyone? If so, I'll continue
to clean it up and write it up and publish it on RAA. Otherwise, I'll
-leave it as an interesting exercise and a tribute to the power of Ruby.
+leave it as an interesting excerise and a tribute to the power of Ruby.
Why /might/ rake be interesting to Ruby programmers. I don't know,
perhaps ...
diff --git a/doc/rake/release_notes/rake-0.8.7.rdoc b/doc/rake/release_notes/rake-0.8.7.rdoc
index 884f4c659e..fb0c5d4e36 100644
--- a/doc/rake/release_notes/rake-0.8.7.rdoc
+++ b/doc/rake/release_notes/rake-0.8.7.rdoc
@@ -42,7 +42,7 @@ Otherwise, you can get it from the more traditional places:
Home Page:: http://rake.rubyforge.org/
Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
+GitHub:: git://github.com/jimweirich/rake.git
== Thanks
diff --git a/doc/rake/release_notes/rake-0.9.0.rdoc b/doc/rake/release_notes/rake-0.9.0.rdoc
deleted file mode 100644
index 823483cc27..0000000000
--- a/doc/rake/release_notes/rake-0.9.0.rdoc
+++ /dev/null
@@ -1,112 +0,0 @@
-= Rake 0.9.0 Released
-
-Rake version 0.9.0 has a number of bug fixes and enhancments (see
-below for more details). Additionally, the internals have be slightly
-restructured and improved.
-
-== Changes
-
-=== New Features / Enhancements / Bug Fixes in Version 0.9.0
-
-* Rake now warns when the deprecated :needs syntax used (and suggests
- the proper syntax in the warning).
-
-* Moved Rake DSL commands to top level ruby object 'main'. Rake DSL
- commands are no longer private methods in Object. (Suggested by
- James M. Lawrence/quix)
-
-* Rake now uses case-insensitive comparisons to find the Rakefile on Windows.
- Based on patch by Roger Pack.
-
-* Rake now requires (instead of loads) files in the test task. Patch by Cezary
- Baginski.
-
-* Fixed typos. Patches by Sean Scot August Moon and R.T. Lechow.
-
-* Rake now prints the Rakefile directory only when it's different from the
- current directory. Patch by Alex Chaffee.
-
-* Improved rakefile_location discovery on Windows. Patch by James Tucker.
-
-* Rake now recognizes "Windows Server" as a windows system. Patch by Matthias
- Lüdtke
-
-* Rake::RDocTask is deprecated. Use RDoc::Task from RDoc 2.4.2+ (require
- 'rdoc/task')
-
-* Rake::GemPackageTask is deprecated. Use Gem::PackageTask (require
- 'rubygems/package_task')
-
-* Rake now outputs various messages to $stderr instead of $stdout.
-
-* Rake no longer emits warnings for Config. Patch by Santiago Pastorino.
-
-* Removed Rake's DSL methods from the top level scope. If you need to
- call 'task :xzy' in your code, include Rake::DSL into your class, or
- put the code in a Rake::DSL.environment do ... end block.
-
-* Split rake.rb into individual files.
-
-* Support for the --where (-W) flag for showing where a task is defined.
-
-* Fixed quoting in test task.
- (http://onestepback.org/redmine/issues/show/44,
- http://www.pivotaltracker.com/story/show/1223138)
-
-* Fixed the silent option parsing problem.
- (http://onestepback.org/redmine/issues/show/47)
-
-* Fixed :verbose=>false flag on sh and ruby commands.
-
-* Rake command line options may be given by default in a RAKEOPT
- environment variable.
-
-* Errors in Rake will now display the task invocation chain in effect
- at the time of the error.
-
-* Accepted change by warnickr to not expand test patterns in shell
- (allowing more files in the test suite).
-
-* Fixed that file tasks did not perform prereq lookups in scope
- (Redmine #57).
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://rake.rubyforge.org/
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* James M. Lawrence (quix)
-* Roger Pack
-* Cezary Baginski
-* Sean Scot August Moon
-* R.T. Lechow
-* Alex Chaffee
-* James Tucker
-* Matthias Lüdtke
-* Santiago Pastorino
-
-Also, bit thanks to Eric Hodel for assisting with getting this release
-out the door (where "assisting" includes, but is not by any means
-limited to, "pushing" me to get it done).
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.1.rdoc b/doc/rake/release_notes/rake-0.9.1.rdoc
deleted file mode 100644
index 70be8b5688..0000000000
--- a/doc/rake/release_notes/rake-0.9.1.rdoc
+++ /dev/null
@@ -1,52 +0,0 @@
-= Rake 0.9.1 Released
-
-Rake version 0.9.1 has a number of bug fixes and enhancments (see
-below for more details). Additionally, the internals have be slightly
-restructured and improved.
-
-== Changes
-
-Rake 0.9.1 adds back the global DSL methods, but with deprecation
-messages. This allows Rake 0.9.1 to be used with older rakefiles with
-warning messages.
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://rake.rubyforge.org/
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* James M. Lawrence (quix)
-* Roger Pack
-* Cezary Baginski
-* Sean Scot August Moon
-* R.T. Lechow
-* Alex Chaffee
-* James Tucker
-* Matthias Lüdtke
-* Santiago Pastorino
-
-Also, bit thanks to Eric Hodel for assisting with getting this release
-out the door (where "assisting" includes, but is not by any means
-limited to, "pushing" me to get it done).
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.2.2.rdoc b/doc/rake/release_notes/rake-0.9.2.2.rdoc
deleted file mode 100644
index d804aba81c..0000000000
--- a/doc/rake/release_notes/rake-0.9.2.2.rdoc
+++ /dev/null
@@ -1,55 +0,0 @@
-= Rake 0.9.3 Released
-
-Rake version 0.9.3 is mainly bug fixes.
-
-== Changes
-
-* The rake test loader now removes arguments it has processed. Issue #51
-* Rake::TaskArguments now responds to #values_at
-* RakeFileUtils.verbose_flag = nil silences output the same as 0.8.7
-* Rake tests are now directory-independent
-* Rake tests are no longer require flexmock
-* Commands constant is no longer polluting top level namespace.
-* Show only the interesting portion of the backtrace by default (James M. Lawrence).
-* Added --reduce-compat option to remove backward compatible DSL hacks (James M. Lawrence).
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://rake.rubyforge.org/
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* James M. Lawrence (quix)
-* Roger Pack
-* Cezary Baginski
-* Sean Scot August Moon
-* R.T. Lechow
-* Alex Chaffee
-* James Tucker
-* Matthias Lüdtke
-* Santiago Pastorino
-
-Also, bit thanks to Eric Hodel for assisting with getting this release
-out the door (where "assisting" includes, but is not by any means
-limited to, "pushing" me to get it done).
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.2.rdoc b/doc/rake/release_notes/rake-0.9.2.rdoc
deleted file mode 100644
index 2314193f5e..0000000000
--- a/doc/rake/release_notes/rake-0.9.2.rdoc
+++ /dev/null
@@ -1,49 +0,0 @@
-= Rake 0.9.2 Released
-
-Rake version 0.9.2 has a few small fixes. See below for details.
-
-== Changes
-
-* Support for Ruby 1.8.6 was fixed.
-* Global DSL warnings now honor --no-deprecate
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://rake.rubyforge.org/
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* James M. Lawrence (quix)
-* Roger Pack
-* Cezary Baginski
-* Sean Scot August Moon
-* R.T. Lechow
-* Alex Chaffee
-* James Tucker
-* Matthias Lüdtke
-* Santiago Pastorino
-
-Also, bit thanks to Eric Hodel for assisting with getting this release
-out the door (where "assisting" includes, but is not by any means
-limited to, "pushing" me to get it done).
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.3.rdoc b/doc/rake/release_notes/rake-0.9.3.rdoc
deleted file mode 100644
index 4476b4f184..0000000000
--- a/doc/rake/release_notes/rake-0.9.3.rdoc
+++ /dev/null
@@ -1,102 +0,0 @@
-= Rake 0.9.3 Released
-
-Rake version 0.9.3 contains some new, backwards compatible features and
-a number of bug fixes.
-
-== Changes
-
-=== New Features
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
- available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
- programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
- --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
- output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
- special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
- prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
- with and without descriptions.
-
-=== Bug Fixes
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
- Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
- description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
- of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://github.com/jimweirich/rake
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* Aaron Patterson
-* Dylan Smith
-* Jo Liss
-* Jonas Pfenniger
-* Kazuki Tsujimoto
-* Michael Bishop
-* Michael Elufimov
-* NAKAMURA Usaku
-* Ryan Davis
-* Sam Grönblom
-* Sam Phippen
-* Sergio Wong
-* Tay Ray Chuan
-* grosser
-* quix
-
-Also, many thanks to Eric Hodel for assisting with getting this release
-out the door.
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.4.rdoc b/doc/rake/release_notes/rake-0.9.4.rdoc
deleted file mode 100644
index e5d45b46ab..0000000000
--- a/doc/rake/release_notes/rake-0.9.4.rdoc
+++ /dev/null
@@ -1,110 +0,0 @@
-= Rake 0.9.4 Released
-
-Rake version 0.9.4 contains a number of bug fixes.
-
-== Changes
-
-=== New Features (in 0.9.3)
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
- available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
- programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
- --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
- output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
- special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
- prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
- with and without descriptions.
-
-=== Bug Fixes (0.9.3)
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
- Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
- description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
- of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-=== Bug Fixes (0.9.4)
-
-* Exit status with failing tests is not correctly set to non-zero.
-
-* Simplified syntax for phony task (for older versions of RDoc).
-
-* Stand alone FileList usage gets glob function (without loading in
- extra dependencies)
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://github.com/jimweirich/rake
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* Aaron Patterson
-* Dylan Smith
-* Jo Liss
-* Jonas Pfenniger
-* Kazuki Tsujimoto
-* Michael Bishop
-* Michael Elufimov
-* NAKAMURA Usaku
-* Ryan Davis
-* Sam Grönblom
-* Sam Phippen
-* Sergio Wong
-* Tay Ray Chuan
-* grosser
-* quix
-
-Also, many thanks to Eric Hodel for assisting with getting this release
-out the door.
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.5.rdoc b/doc/rake/release_notes/rake-0.9.5.rdoc
deleted file mode 100644
index 88e2d7cf3b..0000000000
--- a/doc/rake/release_notes/rake-0.9.5.rdoc
+++ /dev/null
@@ -1,114 +0,0 @@
-= Rake 0.9.5 Released
-
-Rake version 0.9.5 contains a number of bug fixes.
-
-== Changes
-
-=== New Features (in 0.9.3)
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
- available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
- programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
- --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
- output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
- special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
- prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
- with and without descriptions.
-
-=== Bug Fixes (0.9.3)
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
- Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
- description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
- of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-=== Bug Fixes (0.9.4)
-
-* Exit status with failing tests is not correctly set to non-zero.
-
-* Simplified syntax for phony task (for older versions of RDoc).
-
-* Stand alone FileList usage gets glob function (without loading in
- extra dependencies)
-
-=== Bug Fixes (0.9.5)
-
-* --trace and --backtrace no longer swallow following task names.
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://github.com/jimweirich/rake
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* Aaron Patterson
-* Dylan Smith
-* Jo Liss
-* Jonas Pfenniger
-* Kazuki Tsujimoto
-* Michael Bishop
-* Michael Elufimov
-* NAKAMURA Usaku
-* Ryan Davis
-* Sam Grönblom
-* Sam Phippen
-* Sergio Wong
-* Tay Ray Chuan
-* grosser
-* quix
-
-Also, many thanks to Eric Hodel for assisting with getting this release
-out the door.
-
--- Jim Weirich
diff --git a/doc/rake/release_notes/rake-0.9.6.rdoc b/doc/rake/release_notes/rake-0.9.6.rdoc
deleted file mode 100644
index e1c5f88ca7..0000000000
--- a/doc/rake/release_notes/rake-0.9.6.rdoc
+++ /dev/null
@@ -1,127 +0,0 @@
-= Rake 0.9.6 Released
-
-Rake version 0.9.6 contains a number of fixes mainly for merging
-Rake into the Ruby source tree and fixing tests.
-
-== Changes
-
-=== New Features (in 0.9.3)
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
- available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
- programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
- --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
- output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
- special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
- prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
- with and without descriptions.
-
-=== Bug Fixes (0.9.3)
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
- Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
- description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
- of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-=== Bug Fixes (0.9.4)
-
-* Exit status with failing tests is not correctly set to non-zero.
-
-* Simplified syntax for phony task (for older versions of RDoc).
-
-* Stand alone FileList usage gets glob function (without loading in
- extra dependencies)
-
-=== Bug Fixes (0.9.5)
-
-* --trace and --backtrace no longer swallow following task names.
-
-=== Bug Fixes (0.9.6)
-
-* Better trace output when using a multi-threaded Rakefile.
-* Arg parsing is now consistent for tasks and multitasks.
-* Skip exit code test in versions of Ruby that don't support it well.
-
-Changes for better integration with the Ruby source tree:
-
-* Fix version literal for Ruby source tree build.
-* Better loading of libraries for testing in Ruby build.
-* Use the ruby version provided by Ruby's tests.
-
-== What is Rake
-
-Rake is a build tool similar to the make program in many ways. But
-instead of cryptic make recipes, Rake uses standard Ruby code to
-declare tasks and dependencies. You have the full power of a modern
-scripting language built right into your build tool.
-
-== Availability
-
-The easiest way to get and install rake is via RubyGems ...
-
- gem install rake (you may need root/admin privileges)
-
-Otherwise, you can get it from the more traditional places:
-
-Home Page:: http://github.com/jimweirich/rake
-Download:: http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub:: git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments. Thanks to ...
-
-* Aaron Patterson
-* Dylan Smith
-* Jo Liss
-* Jonas Pfenniger
-* Kazuki Tsujimoto
-* Michael Bishop
-* Michael Elufimov
-* NAKAMURA Usaku
-* Ryan Davis
-* Sam Grönblom
-* Sam Phippen
-* Sergio Wong
-* Tay Ray Chuan
-* grosser
-* quix
-
-Also, many thanks to Eric Hodel for assisting with getting this release
-out the door.
-
--- Jim Weirich
diff --git a/doc/re.rdoc b/doc/re.rdoc
index 1c68533a8d..04481268c3 100644
--- a/doc/re.rdoc
+++ b/doc/re.rdoc
@@ -24,36 +24,6 @@ string matches itself.
Specifically, <tt>/st/</tt> requires that the string contains the letter
_s_ followed by the letter _t_, so it matches _haystack_, also.
-== <tt>=~</tt> and Regexp#match
-
-Pattern matching may be achieved by using <tt>=~</tt> operator or Regexp#match
-method.
-
-=== <tt>=~</tt> operator
-
-<tt>=~</tt> is Ruby's basic pattern-matching operator. When one operand is a
-regular expression and the other is a string then the regular expression is
-used as a pattern to match against the string. (This operator is equivalently
-defined by Regexp and String so the order of String and Regexp do not matter.
-Other classes may have different implementations of <tt>=~</tt>.) If a match
-is found, the operator returns index of first match in string, otherwise it
-returns +nil+.
-
- /hay/ =~ 'haystack' #=> 0
- 'haystack' =~ /hay/ #=> 0
- /a/ =~ 'haystack' #=> 1
- /u/ =~ 'haystack' #=> nil
-
-Using <tt>=~</tt> operator with a String and Regexp the <tt>$~</tt> global
-variable is set after a successful match. <tt>$~</tt> holds a MatchData
-object. Regexp.last_match is equivalent to <tt>$~</tt>.
-
-=== Regexp#match method
-
-#match method return a MatchData object :
-
- /st/.match('haystack') #=> #<MatchData "st">
-
== Metacharacters and Escapes
The following are <i>metacharacters</i> <tt>(</tt>, <tt>)</tt>,
@@ -141,7 +111,7 @@ matches any character in the Unicode _Nd_ category.
* <tt>/[[:print:]]/</tt> - Like [:graph:], but includes the space character
* <tt>/[[:punct:]]/</tt> - Punctuation character
* <tt>/[[:space:]]/</tt> - Whitespace character (<tt>[:blank:]</tt>, newline,
- carriage return, etc.)
+ carriage return, etc.)
* <tt>/[[:upper:]]/</tt> - Uppercase alphabetical
* <tt>/[[:xdigit:]]/</tt> - Digit allowed in a hexadecimal number (i.e.,
0-9a-fA-F)
@@ -150,7 +120,7 @@ Ruby also supports the following non-POSIX character classes:
* <tt>/[[:word:]]/</tt> - A character in one of the following Unicode
general categories _Letter_, _Mark_, _Number_,
- <i>Connector_Punctuation</i>
+ <i>Connector_Punctuation<i/i>
* <tt>/[[:ascii:]]/</tt> - A character in the ASCII character set
# U+06F2 is "EXTENDED ARABIC-INDIC DIGIT TWO"
@@ -199,7 +169,7 @@ jeopardises the overall match.
Parentheses can be used for <i>capturing</i>. The text enclosed by the
<i>n</i><sup>th</sup> group of parentheses can be subsequently referred to
with <i>n</i>. Within a pattern use the <i>backreference</i>
-<tt>\n</tt>; outside of the pattern use
+<tt>\</tt><i>n</i>; outside of the pattern use
<tt>MatchData[</tt><i>n</i><tt>]</tt>.
# 'at' is captured by the first group of parentheses, then referred to
@@ -250,7 +220,7 @@ quantified as one <i>atomic</i> whole.
The <tt>(?:</tt>...<tt>)</tt> construct provides grouping without
capturing. That is, it combines the terms it contains into an atomic whole
without creating a backreference. This benefits performance at the slight
-expense of readability.
+expense of readabilty.
# The group of parentheses captures 'n' and the second 'ti'. The
# second group is referred to later with the backreference \2
@@ -271,7 +241,7 @@ it matches becomes fixed for the remainder of the match, unless the entire
subexpression must be abandoned and subsequently revisited. In this
way <i>pat</i> is treated as a non-divisible whole. Atomic grouping is
typically used to optimise patterns so as to prevent the regular
-expression engine from backtracking needlessly.
+expression engine from backtracking needlesly.
# The <tt>"</tt> in the pattern below matches the first character of
# the string, then <tt>.*</tt> matches <i>Quote"</i>. This causes the
@@ -449,8 +419,8 @@ characters, <i>anchoring</i> the match to a specific position.
it matches just before newline
* <tt>\z</tt> - Matches end of string
* <tt>\G</tt> - Matches point where last match finished
-* <tt>\b</tt> - Matches word boundaries when outside brackets;
- backspace (0x08) when inside brackets
+* <tt>\b</tt> - Matches word boundaries when outside brackets; backspace
+ (0x08) inside brackets
* <tt>\B</tt> - Matches non-word boundaries
* <tt>(?=</tt><i>pat</i><tt>)</tt> - <i>Positive lookahead</i> assertion:
ensures that the following characters match <i>pat</i>, but doesn't
@@ -503,13 +473,6 @@ expression enclosed by the parentheses.
/a(?i:b)c/.match('aBc') #=> #<MatchData "aBc">
/a(?i:b)c/.match('abc') #=> #<MatchData "abc">
-Options may also be used with <tt>Regexp.new</tt>:
-
- Regexp.new("abc", Regexp::IGNORECASE) #=> /abc/i
- Regexp.new("abc", Regexp::MULTILINE) #=> /abc/m
- Regexp.new("abc # Comment", Regexp::EXTENDED) #=> /abc # Comment/x
- Regexp.new("abc", Regexp::IGNORECASE | Regexp::MULTILINE) #=> /abc/mi
-
== Free-Spacing Mode and Comments
As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i>
@@ -562,40 +525,6 @@ regexp's encoding can be explicitly fixed by supplying
#=> Encoding::CompatibilityError: incompatible encoding regexp match
(ISO-8859-1 regexp with UTF-8 string)
-== Special global variables
-
-Pattern matching sets some global variables :
-* <tt>$~</tt> is equivalent to Regexp.last_match;
-* <tt>$&</tt> contains the complete matched text;
-* <tt>$`</tt> contains string before match;
-* <tt>$'</tt> contains string after match;
-* <tt>$1</tt>, <tt>$2</tt> and so on contain text matching first, second, etc
- capture group;
-* <tt>$+</tt> contains last capture group.
-
-Example:
-
- m = /s(\w{2}).*(c)/.match('haystack') #=> #<MatchData "stac" 1:"ta" 2:"c">
- $~ #=> #<MatchData "stac" 1:"ta" 2:"c">
- Regexp.latch_match #=> #<MatchData "stac" 1:"ta" 2:"c">
-
- $& #=> "stac"
- # same as m[0]
- $` #=> "hay"
- # same as m.pre_match
- $' #=> "k"
- # same as m.post_match
- $1 #=> "ta"
- # same as m[1]
- $2 #=> "c"
- # same as m[2]
- $3 #=> nil
- # no third group in pattern
- $+ #=> "c"
- # same as m[-1]
-
-These global variables are thread-local and method-local variables.
-
== Performance
Certain pathological combinations of constructs can lead to abysmally bad
@@ -604,8 +533,8 @@ performance.
Consider a string of 25 <i>a</i>s, a <i>d</i>, 4 <i>a</i>s, and a
<i>c</i>.
- s = 'a' * 25 + 'd' + 'a' * 4 + 'c'
- #=> "aaaaaaaaaaaaaaaaaaaaaaaaadaaaac"
+ s = 'a' * 25 + 'd' 'a' * 4 + 'c'
+ #=> "aaaaaaaaaaaaaaaaaaaaaaaaadadadadac"
The following patterns match instantly as you would expect:
@@ -615,7 +544,7 @@ The following patterns match instantly as you would expect:
However, the following pattern takes appreciably longer:
- /(b|a+)*c/ =~ s #=> 26
+ /(b|a+)*c/ =~ s #=> 32
This happens because an atom in the regexp is quantified by both an
immediate <tt>+</tt> and an enclosing <tt>*</tt> with nothing to
@@ -644,10 +573,10 @@ repeatedly so as to satisfy as many of the optional matches as it can
while still matching the mandatory 29. It is plain to us that none of the
optional matches can succeed, but this fact unfortunately eludes Ruby.
-The best way to improve performance is to significantly reduce the amount of
-backtracking needed. For this case, instead of individually matching 29
-optional <i>a</i>s, a range of optional <i>a</i>s can be matched all at once
-with <i>a{0,29}</i>:
+One approach for improving performance is to anchor the match to the
+beginning of the string, thus significantly reducing the amount of
+backtracking needed.
- Regexp.new('a{0,29}' + 'a' * 29) =~ 'a' * 29
+ Regexp.new('\A' 'a?' * 29 + 'a' * 29).match('a' * 29)
+ #=> #<MatchData "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa">
diff --git a/doc/rubygems/ChangeLog b/doc/rubygems/ChangeLog
new file mode 100644
index 0000000000..2e67a4c2c5
--- /dev/null
+++ b/doc/rubygems/ChangeLog
@@ -0,0 +1,5689 @@
+# -*- coding: utf-8 -*-
+
+2010-02-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: 1.3.6.
+ * test/*: Windows test fixes
+ * lib/rubygems/remote_fetcher.rb: Fix same file detection on windows.
+
+2010-02-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/config_file.rb: Fix use of ConfigFile#api_key= vs
+ #rubygems_api_key=. Patch by Nick Quaranto.
+
+2010-02-12 Eric Hodel <drbrain@segment7.net>
+
+ * Rakefile: RubyGems doesn't depend on previous RubyGems.
+
+2010-02-11 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: http://rubygems.org is now the default source.
+ * lib/rubygems/dependency.rb: Only warn once about
+ #version_requirement
+
+2010-02-09 Eric Hodel <drbrain@segment7.net>
+
+ * bin/update_rubygems: Use system, exec more correctly, remove
+ useless puts.
+ * lib/rubygems/commands/query_command.rb: List every version when
+ --prerelease --all is given.
+
+2010-02-08 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/dependency_command.rb: Support --prerelease.
+ * lib/rubygems/commands/fetch_command.rb: Support --prerelease.
+ * lib/rubygems/format.rb: Don't crash on empty files. Bug #27292 by
+ Ian Ragsdale.
+ * lib/rubygems/server.rb: Fix markup. Bug #27045 by Eric Young.
+ * History.txt: RubyGems 1.3.6 release notes.
+
+2010-02-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Allow prerelease gems to
+ depend on non-prerelease gems.
+
+2010-02-06 Eric Hodel <drbrain@segment7.net>
+
+ * test/test_gem_commands_specification_command.rb: Don't enforce YAML
+ format. Patch #27791 by Aaron Patterson.
+ * lib/rubygems/version.rb: Allow captial letters in prerelease
+ versions.
+ * lib/rubygems/config_file.rb: Explain format of ~/.gemrc. Bug
+ #27698 by J Smith.
+ * lib/rubygems/gem_path_searcher.rb: Handle nil require_paths.
+ Patch #27334 by Roger Pack.
+ * lib/rubygems/server.rb: Handle --bind option. Patch #27357 by
+ Bruno Michel.
+ * lib/rubygems/doc_manager: gem rdoc --overwrite to preserve built
+ rdoc. Patch #25982 by Akinori MUSHA.
+ * lib/rubygems/commands/which_command.rb: Fail if no paths were
+ found. Adapted patch #27681 by Caio Chassot.
+ * lib/rubygems/remote_fetcher.rb: Don't copy if the file is where we
+ want it. Patch #27409 by Jakub Šťastný.
+
+2010-02-01 John Barnette <jbarnette@rubygems.org>
+
+ * lib/rubygems/command*: Add 'gem push' and 'gem owner' for
+ interacting with modern/Gemcutter sources [Nick Quaranto]
+
+2010-01-18 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_list.rb: Ignore development dependencies
+ unless explicitly needed. Bug #27608 by Roger Pack.
+
+2010-01-12 John Barnette <jbarnette@rubygems.org>
+
+ * Rakefile: Don't add development deps when building the
+ rubygems-update gem, it borks older versions when they're updating
+ from a stub index.
+
+2009-12-22 Evan Phoenix <evan@fallingsnow.net>
+
+ * lib/rubygems/spec_fetcher.rb: Don't bother re-Marshaling the spec
+ YAML list.
+
+2009-11-04 John Barnette <jbarnette@rubygems.org>
+
+ * lib/rubygems/timer.rb: Removed. The deprecation sun set in July.
+
+2009-10-14 John Barnette <jbarnette@rubygems.org>
+
+ * lib/rubygems/dependency.rb: Burndown/cleanup. Refactored code
+ and tests. Gem::Dependency.version_requirement(s) is deprecated in
+ favor of Gem::Dependency.requirement.
+
+ * lib/rubygems/requirement.rb: Burndown/cleanup. Refactored code
+ and tests. See test/support/shortcuts.rb for some new test helpers.
+
+2009-10-13 John Barnette <jbarnette@rubygems.org>
+
+ * lib/rubygems/local_remote_options.rb: Make --source additive,
+ not exclusive. If exclusive sources are desired, use
+ --clear-sources first.
+
+2009-09-29 John Barnette <jbarnette@rubyforge.org>
+
+ * lib/rubygems/spec_fetcher.rb: Be slightly more robust when faced
+ with corrupted indexes.
+
+2009-09-03 John Barnette <jbarnette@rubyforge.org>
+
+ * LOTS: Use "raise" consistently, not "fail".
+
+2009-09-01 John Barnette <jbarnette@rubyforge.org>
+
+ * lib/rubygems/version.rb: Gem::Version immutability
+ burndown. Changed canonical internal representation to an
+ Array. Refactored significant amounts of the internals for
+ clarity. Breaking change: Gem::Version::Requirement is no longer
+ available, use Gem::Requirement instead. Breaking change: custom
+ YAML marshaling is gone. Credit to Yehuda Katz for certain bits of
+ a related patch.
+ * test/test_gem_dependency.rb: Moved a bunch of tests over from
+ test_gem_version.rb. Work in progress.
+ * test/test_gem_specification.rb: Removed a failing YAML
+ test. Many more will be going away shortly.
+ * test/test_gem_version.rb: Significant refactoring for
+ maintainability and clarity. Moved a ton of poorly-placed tests to
+ test_gem_dependency.rb for future refactoring.
+
+2009-08-19 Ryan Davis <ryand-ruby@zenspider.com>
+
+ * lib/rubygems.rb: Cleanup of rdoc and file layout.
+ * lib/rubygems/versions.rb: Added Version#spermy_recommendation
+ and fixed bug in Version::Part#inspect. General cleanup.
+
+2009-07-29 John Barnette <jbarnette@rubyforge.org>
+
+ * lib/rubygems/package/tar_input.rb: Add Maglev to the list of
+ implementations with working Zlib. Bug #26790 by Peter McLain.
+
+2009-07-21 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: 1.3.5.
+ * lib/rubygems/package.rb: Remove dangling digest require. Reported
+ by Jeremy Kemper.
+
+2009-06-25 Eric Hodel <drbrain@segment7.net>
+
+ * release_notes/: Merged into History.txt for Hoe.
+ * lib/rubygems/commands/setup_command.rb: Streamlined install text.
+
+2009-06-23 Eric Hodel <drbrain@segment7.net>
+
+ * release_notes/rel_1_3_5.rdoc: RubyGems 1.3.5 release notes.
+ * lib/rubygems/builder.rb: Only print out with verbose.
+ * lib/rubygems/package_task.rb: Only print out with -t.
+
+2009-06-12 Ryan Davis <ryand@zenspider.com>
+
+ * Rakefile: Switched to Hoe.
+
+2009-06-10 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems/installer.rb: --user-install is no longer enabled by
+ default.
+ * lib/rubygems/source_index.rb: Fix use of prerelease gems.
+
+2009-06-04 Eric Hodel <drbrain@segment7.net>
+
+ * util/gem_prelude.rb.template: Backports from 1.9.
+
+2009-06-03 Eric Hodel <drbrain@segment7.net>
+
+ * bin/gem: Support 1.8.6+
+ * lib/rubygems/digest*: Removed, support dropped for Ruby < 1.8.6
+ * lib/rubygems/installer.rb: Support env(1) in wrong path, use
+ /bin/sh if shebang has options. By Nobu, ruby trunk r22853.
+ * lib/rubygems/config_file.rb: Switch to stdcall for appdata folder.
+ [ruby-core:22601].
+ * lib/rubygems.rb: Use only File::expand_path on 1.9 for home dir.
+ Don't recklessly create directories. Simplify RbConfig::datadir
+ definition.
+
+2009-05-30 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/which_command.rb: Only print out directory
+ information to a TTY.
+ * lib/rubygems/rubygems_version.rb: 1.3.4.
+ * doc/release_notes/rel_1_3_4.rdoc: RubyGems 1.3.4 release notes.
+
+2009-05-28 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/setup_command.rb: Fix --format-executable
+ option name.
+ * lib/rubygems/requirement.rb: Fix typo in #parse. Bug #26000 by
+ Mike Gunderloy.
+
+2009-05-21 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Add 'dev' and svn revision for -1 RUBY_PATCHLEVEL
+ and RUBY_REVISION.
+
+2009-05-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/defaults.rb: Restore 1.9.1 path behavior.
+ * lib/rubygems/specification.rb: Fix undefined ivar warning.
+ * lib/rubygems/indexer.rb: Force loading of builder gem.
+ * test/gemutilities.rb: Remove gem_prelude code by hand to avoid 1.9
+ warnings.
+
+2009-05-19 Luis Lavena <luislavena@gmail.com>
+
+ * test/test_gem_specification.rb: skip symlinks tests on Windows.
+ * test/test_gem_commands_install_command.rb: skip chmod test on
+ Windows.
+
+2009-05-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems*: Fix 1.9 warnings about circular require.
+
+2009-05-12 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/remote_fetcher.rb: Fixed the download method in the
+ remote_fetcher.rb file so that it handles local installs on MS
+ Windows when using explicit paths that aren't on the 'C:' drive.
+ Bug #25882 by Lars Christensen.
+ * lib/rubygems/commands/update_command.rb: Replaced deprecated
+ Gem::SourceIndex method 'search' with 'find_name' in the 'execute'
+ method.
+
+2009-05-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/query_command.rb: Support prerelease version
+ listing (--prerelease), list locally installed prereleases.
+ * lib/rubygems/source_info_cache.rb: Gem::SourceInfoCache is
+ officially unsupported, maintaining its tests is hard.
+ * lib/rubygems/source_index.rb: Add #all_gems, fix #remove_spec,
+ #search to work with it. Prerelease gems can now be used.
+
+2009-05-04 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb: 1.3.3.
+ * doc/release_notes/rel_1_3_3.rdoc: RubyGems 1.3.3 release notes.
+ * lib/rubygems/specification.rb: Default has_rdoc to true, ignore
+ its value.
+ * lib/rubygems/doc_manager.rb: Always generate RDoc regardless of
+ #has_rdoc?
+ * lib/rubygems.rb: Raise Gem::LoadError if Kernel#gem fails due to
+ previously-loaded gem. Bug reported by Alf Mikula.
+
+2009-05-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/server_command.rb: Allow port names with
+ --port.
+ * lib/rubygems/requirement.rb: Match prerelease versions and ~>
+ correctly. Patch #25759 by Yossef Mendelssohn.
+
+2009-05-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Check bindir for executables, not
+ root. Bug reported by David Chelimsky. Remove Time.today, no way
+ to override it before RubyGems loads. Bug #25564 by Emanuele
+ Vicentini. Raise Gem::Exception for #installation_path when not
+ installed. Bug #25741 by Daniel Berger. Don't error in #validate
+ when homepage is nil. Bug #25677 by Mike Burrows.
+ * lib/rubygems/commands/cleanup_command.rb: Clean up --user-install
+ gems. Bug #25516 by Brett Eisenberg.
+ * lib/rubygems/uninstaller.rb: Uninstall executables from the correct
+ directory. Bug #25555 by Brett Eisenberg.
+ * lib/rubygems/server.rb: Add search that jumps to RDoc. Patch
+ #22959 by Vladimir Dobriakov.
+
+2009-05-01 James Tucker <jftucker@gmail.com>
+
+ * lib/rubygems.rb: Gem.bin_path now escapes paths with spaces.
+
+2009-04-30 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/commands/install_command.rb: Replaced deprecated
+ Gem::SourceIndex method 'search' with 'find_name' when using
+ the -t option. Fixes bug # 25632 by Daniel Berger.
+
+2009-04-30 James Tucker <jftucker@gmail.com>
+
+ * lib/rubygems/ext/rake_builder.rb: Use explicit ruby command loading
+ rubygems to invoke rake.
+
+2009-04-24 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/specification_command.rb: Added requesting
+ single fields from a spec.
+
+2009-04-23 James Tucker <jftucker@gmail.com>
+
+ * lib/rubygems/ext/configure_builder.rb: Support Gem::Command.build_args.
+
+2009-04-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb: 1.3.2.
+
+2009-04-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Complain when summary and
+ description are identical.
+
+2009-04-08 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Strip directories, complain for
+ non-files in #validate.
+
+2009-04-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Implement #initialize_copy.
+ * lib/rubygems/commands/contents_command.rb: Add --no-prefix and
+ --all.
+
+2009-04-06 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/defaults.rb: Don't allow gem to overwrite ruby on
+ install. Fixes bug #24958 by Michael Soulier.
+ * doc/release_notes/rel_1_3_2.rdoc: Preliminary 1.3.2 release notes.
+ * Rakefile: Trim off some stale code, switch to Manifest.txt, one
+ step closer to Hoe!
+
+2009-04-06 Daniel Berger <djberg96@gmail.com>
+
+ * test/test_gem_ext_configure_builder.rb: Better handling for MS
+ Windows.
+ * test/gemutilities.rb: Added the make_command and vc_windows? helper
+ methods.
+
+2009-04-03 Eric Hodel <drbrain@segment7.net>
+
+ * lib/: RDoc improvements.
+
+2009-04-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/setup_command.rb: Fix --destdir. Patch
+ #24970 by Richard Brown.
+
+2009-04-02 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems/version.rb: Documentation of prerelease
+ versions. See http://technomancy.us/123 for details.
+
+2009-03-31 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/spec_fetcher.rb: If the cached specs file won't load,
+ refetch. Bug #24961 by Dylan Stamat.
+ * lib/rubygems/defaults.rb: Add a sanity check to
+ Gem.default_exec_format. Workaround for bug #24958 by Michael
+ Soulier.
+ * lib/rubygems/commands/setup_command.rb: Fix confusion with option
+ names. Patch #24971 by Richard Brown.
+ * lib/rubygems/specification.rb: Make #validate complain about
+ not-files.
+ * lib/gauntlet_rubygems.rb: For verification of the validator.
+
+2009-03-27 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: RubyGems now loads plugins from rubygems_plugin.rb
+ in installed gems. This can be used to add commands (See
+ Gem::CommandManager) or add install/uninstall hooks (See
+ Gem::Installer and Gem::Uninstaller).
+ * setup.rb: Ensure we're in a RubyGems dir when installing.
+
+2009-03-26 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/package_task.rb: Import from Rake's
+ rake/gempackagetask.rb
+ * Rakefile: Switched to RDoc::Task from RDoc 2.4.2.
+ * lib/rubygems.rb: Gem.find_files now returns paths in $LOAD_PATH.
+ * lib/rubygems/commands/sources_command.rb: Allow sources to be added
+ behind proxies. Bug #24785 by Elia Schito.
+
+2009-03-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/install_command.rb: Fix typo. Patch #24446
+ by Luis Parravicini.
+ * lib/rubygems/version.rb: Handle non-String versions by calling
+ #to_s. Patch #24392 by Stephen Bannasch.
+
+2009-03-22 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/remote_fetcher.rb: Always escape URI's to deal with spaces
+ and such, regardless of platform.
+ * lib/rubygesm/validator.rb: Use the test-unit gem if installed.
+ Part of the fix for RF #24261 by Daniel Berger
+ * lib/rubygems/commands/install_command.rb: Explictly require
+ rubygems/uninstaller.rb if the user wants to bail because of failed
+ tests.
+ Part of the fix for RF #24261 by Daniel Berger
+
+2009-03-17 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/query_command.rb: Make `gem unpack` work with
+ more than one gem name, fix warning about installation location.
+
+2009-03-16 James Tucker <jftucker@gmail.com>
+
+ * lib/rubygems.rb: Deprecate ConfigMap[:RUBY_INSTALL_NAME]
+ * lib/rubygems/defaults.rb: Gem.default_exec_format to use
+ ConfigMap[:ruby_install_name].
+ Fixes Bug #24457
+ * util/gem_prelude.rb.template: Fix potential bug in
+ Gem.default_exec_format when ConfigMap[:BASERUBY] is not 'ruby'.
+
+2009-03-14 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems/installer.rb: Cleanup quotes on Windows stub scripts.
+ Fixes Bug #24039.
+ * lib/rubygems/commands/setup_command.rb: ditto.
+
+2008-03-13 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/uninstall_command.rb: Add --user-install to
+ allow uninstallation from ~/.gem. Bug #23760 by Roger Pack.
+ * lib/rubygems/uninstaller.rb: Automatically uninstall from
+ Gem.user_dir.
+ * lib/rubygems/commands/update_command.rb: Rescue InstallError
+ and continue. Bug #19268 by Gabriel Wilkins.
+ * lib/rubygems/doc_manager.rb: Remove some options from the args list
+ that RDoc no longer supports.
+
+2008-03-12 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: #description no longer removes
+ newlines.
+ * lib/rubygems/indexer.rb: Wrap description in a pre and force-wrap
+ lines to 78 characters for prettier display.
+ * lib/rubygems/commands/setup_command.rb: Clarify RubyGems RDoc
+ installation location. Bug #22656 by Gian Marco Gherardi.
+
+2008-03-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/query_command.rb: Add platforms to gem list
+ -d.
+ * lib/rubygems/commands/setup_command.rb: Allow setup to run from
+ read-only location. Patch #21862 by Luis Herrera.
+ * lib/rubygems/package/tar_input.rb: Use real File methods. Bug
+ #23966 by Mike Furr.
+ * lib/rubygems.rb: Don't add PATCHLEVEL if it's -1. Patch #24048 by
+ Jeremy Kemper.
+ * lib/rubygems/package/tar_input.rb: Choose security policy
+ correctly. Bug #24001 by Mike Furr.
+ * lib/rubygems/remote_fetcher.rb: Handle local paths with spaces.
+ Bug #24169 by Ryan Davis.
+ * lib/rubygems/specification.rb: Removed Gem::Specification::list,
+ causes leaks. Bug #23668 by Steve Purcell.
+
+2008-03-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Use Gem::bin_path in executable stubs to
+ work around Kernel#load bug.
+ * lib/rubygems/commands/install_command.rb: Copy user_install down to
+ Gem::DependencyInstaller. Patch #23573 by Alf Mikula.
+ * lib/rubygems/command.rb: Add info on gem server directly to `gem
+ help`. Patch #22271 by Hugh Sasse.
+
+2008-03-06 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Don't allow FIXME in specs.
+ * lib/rubygems/commands/spec_command.rb: Add --ruby and --marshal
+ formats.
+ * lib/rubygems.rb: Add Gem::bin_path. Patch #24114 by James Tucker.
+
+2008-03-04 Eric Hodel <drbrain@segment7.net>
+
+ * setup.rb: Moved guts to lib/rubygems/commands/setup_command.rb.
+ * lib/rubygems/indexer.rb: Added RSS feed generation on full index
+ update.
+
+2008-03-04 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/*: Prerelease gems go into their own index now and are excluded
+ from other indices. InstallCommand only gets prereleases if explicitly
+ requested. Thanks to Alex Vollmer.
+
+2008-03-04 Eric Hodel <drbrain@segment7.net>
+
+ * lib/*: Add lots of pretty pretty_print stuff!
+
+2008-02-25 Ryan Davis <ryand@zenspider.com>
+
+ * lib/rubygems/commands/check_command.rb: Fix various usability
+ issues.
+
+2009-02-10 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/specification: Refactored and fixed the installation_path
+ method. It was overwrought and it now no longer uses File::SEPARATOR
+ explicitly.
+ [RubyForge: bug #23879 by Daniel Berger]
+
+2009-02-10 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/validator.rb: The Gem::Validator#verify_gem_file method
+ now explicitly rescues Errno::EINVAL as well as Errno::ENOENT because
+ MS Windows raises a different SystemCallError for empty paths.
+
+2009-01-21 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/remote_fetcher.rb: Split out nil and file handling in
+ the download method. Modified file URI handling to work properly.
+ [RubyForge: bug #16495 by Paul Sadauskas]
+
+2009-01-19 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/remote_fetcher.rb: Added uri scheme validation back
+ into the open_uri_or_path method, though it now accepts 'https' and
+ 'file' as well.
+ * test/test_gem_remote_fetcher.rb: Updated the test_fetch_size_bad_uri
+ to reflect the updated error message.
+
+2009-01-15 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/remote_fetcher.rb: Removed the open_file_uri_path method
+ since the URI#path method already does the same thing, and changed
+ the file_uri? method so that it explicitly calls .to_s.
+ * lib/rubygems/local_remote_options.rb: Allow file urls.
+
+2009-01-15 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/commands/generate_index_command.rb: Fixed a typo in
+ the description.
+ * test/test_gem_doc_manager.rb: The test_uninstall_doc_unwritable
+ test is now skipped on Windows.
+ * test/test_gem_install_update_options.rb: The
+ test_user_install_disabled_read_only test is now skipped on Windows.
+ * test/test_gem_installer.rb: The test_generate_bin_symlink_no_perms
+ and test_generate_bin_script_no_perms tests are now skipped on Windows.
+
+2009-01-14 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/specification.rb: Added support for a license attribute.
+ [RubyForge: feature #11041 (partial) by Kevin Williams]
+ * lib/rubygems/commands/query_command.rb: Gem detail information now
+ includes license information.
+ * test/test_gem_specification.rb: Added tests for the license attribute.
+
+2009-01-05 Chad Woolley <thewoolleyman@gmail.com>
+
+ * move processing of build args out of gem binary so they are handled correctly via API usage.
+ * lib/rubygems/command.rb: Add class accessor for build_args.
+ * lib/rubygems/ext/rake_builder.rb: Use Gem::Command.build_args instead of ARGV.
+ * lib/rubygems/ext/ext_conf_builder.rb: Use Gem::Command.build_args instead of ARGV.
+ * lib/rubygems/gem_runner.rb: Move build arg processing from gem binary.
+ * lib/rubygems/commands/contents_command.rb: Use nonzero return code (required to make tests pass).
+ * bin/gem: Move build arg processing to gem_runner.rb.
+ [RubyForge: bug #23210]
+
+ * lib/rubygems/config_file.rb: Fix --config-file option with no
+ equals and subsequent options to properly assign config file.
+ Previously config file was overwritten by subsequent option.
+ Fixes bug #16688.
+
+2009-1-4 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/installer.rb: Remove existing path if it already
+ exists before installing.
+ [RubyForge: patch #22837 by Eric Wong]
+ * lib/rubygems.rb: Minor modification to the location_of_caller
+ method - deal with possible characters after line number
+
+2009-1-3 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems.rb: Better activation error message.
+ [RubyForge: patch #23082 by Tim Carey-Smith]
+
+2009-1-2 Daniel Berger <djberg96@gmail.com>
+ * lib/rubygems/ext/rake_builder.rb: Quote path if it contains spaces
+ [RubyForge: patch #23003 by Charlie Savage]
+ * lib/rubygems/local_remote_options.rb: Ignore duplicate sources
+ [RubyForge: bug #22277 by Elliot Temple]
+ * lib/rubygems/remote_fetcher.rb: Automatically normalize the URI
+ [RubyForge: bug #22151 by Alex Legler]
+ * lib/rubygems/specification.rb: Ensure that specification_version is
+ a Fixnum [RubyForge: bug #22598 by Tsutomu Kuroda]
+ * lib/rubygems/specification.rb: Bumped the CURRENT_SPECIFICATION_VERSION
+ and added an entry to the SPECIFICATION_VERSION_HISTORY
+
+2009-1-1 Daniel Berger <djberg96@gmail.com>
+
+ * test/test_gem_dependency.rb: Removed a duplicate "def dep" that
+ was causing a warning.
+ * lib/rubygems/platform.rb: Added an empty? method in order to
+ better handle gem indexing when dealing with gems created
+ prior to 0.9.5. [Rubyforge: bug #22603 by Johnathan Conley]
+ * lib/rubygems.rb: Added an explicit 'require "etc"'.
+ [RubyForge: bug #22313 by Matthew Boedicker]
+
+2008-12-31 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/local_remote_options: Allow 'https' as a valid scheme
+ in addition to 'http' [RubyForge: patch #22485 by Duarte Henriques]
+ * setup.rb: Deal with extraneous quotation mark when autogenerating
+ .bat file on MS Windows [RubyForge: bug #22712 Takayuki Ishikawa]
+ * lib/rubygems/commands/unpack_command.rb: Fixed the --target option
+ [RubyForge: patch #22532 by Bryan Ash]
+
+2008-12-30 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/builder.rb: Don't allow .gem file to be added back
+ onto itself [RubyForge: bug #19136, patch #23346 by Daniel Berger]
+ * lib/rubygems/defaults.rb: The default_path now only returns the
+ default_dir if the Gem.user_home doesn't exist
+ [RubyForge: bug #23037 by Pierre PLR]
+ * lib/rubygems.rb: Handle the possibility that Etc.getpwuid might
+ return nil on platforms other than Windows
+ [RubyForge: bug #22764 by Dudley Flanders]
+
+2008-12-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/doc_manager.rb: Set title for generated documentation.
+ * lib/rubygems/dependency.rb: Make #=~ work with Gem::Specification.
+
+2008-12-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Fix documentation for
+ Gem::Installer#write_spec. Issue by okkez.
+
+2008-12-12 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/local_remote_options.rb: Merge documentation fix by
+ okkez [ruby-dev:37271].
+ * lib/rubygems/source_info_cache_entry.rb: Merge documentation fix
+ from [ruby-dev:37255].
+
+2008-12-08 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Add Gem::promote_load_path
+
+2008-12-01 Ryan Davis <ryand-ruby@zenspider.com>
+
+ * lib/rubygems/remote_fetcher.rb: made threadsafe.
+
+2008-11-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/install_command.rb: Don't do any post-install
+ stuff if no gems were installed. Issue by Daniel Berger.
+
+2008-11-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Read the file outside the exception
+ block so we raise a sane error.
+ * lib/rubygems/indexer.rb: Allow the modern index to be updated
+ incrementally. Allow the legacy and modern indicies to be updated
+ separately.
+
+2008-11-17 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Added ability to only generate modern or
+ legacy indicies.
+
+2008-11-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/timer.rb: Deprecate and move methods to Gem and
+ Gem::StreamUI.
+
+2008-11-11 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems/, test/: Make Version understand prerelease
+ versions using letters. (eg. '1.2.1.b') Thanks to Josh Susser and
+ Alex Vollmer.
+
+2008-11-03 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Gem name must be a String.
+
+2008-10-31 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/defaults.rb: Update to support 1.9 libdir.
+ * util/gem_prelude.rb: Move to .template, automatically fold in
+ defaults.
+
+2008-10-29 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Handle nonexistent home directory. Bug #22229 by
+ Alexey Verkhovsky.
+
+2008-10-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb, lib/rubygems/custom_require.rb: Make kernel
+ methods private. Patch #20801 by James M. Lawrence. Expose
+ our kernel extensions to RDoc. Make Gem::location_of_caller behave on
+ Windows. Patch by Daniel Berger.
+ * doc/release_notes/rel_1_3_1.rdoc: Final release notes for 1.3.1.
+ * lib/rubygems/rubygems_version.rb: 1.3.1.
+
+2008-10-10 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/unpack_command.rb: Silence PATH warning.
+
+2008-10-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Fix requires for inflate, deflate, etc.
+ * test/*: Convert to minitest/unit.
+ * lib/rubygems/validator.rb: Fix for MiniTest instead of test/unit
+ classic in 1.9.
+
+2008-10-03 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems.rb: Make Gem.dir respect :gemhome value from config.
+ * lib/rubygems/config_file.rb: Expose :gemhome value.
+
+2008-09-26 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems.rb: Disregard ownership of ~ under Windows while
+ creating ~/.gem. Fixes issues related to no uid support under
+ Windows.
+
+2008-09-24 Eric Hodel <drbrain@segment7.net>
+
+ * doc/release_notes/rel_1_3_0.rdoc: Final release notes for 1.3.0.
+ * lib/rubygems/rubygems_version.rb: 1.3.0.
+ * lib/rubygems/builder.rb: Examine process status correctly. Patch
+ by Nobu.
+ * test/test_gem_ext_rake_builder.rb: Override Gem.ruby and
+ ENV['rake'] for 1.9 integration. Patch by Nobu.
+
+2008-09-16 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems.rb: Use the path set in the config file if
+ applicable.
+ * lib/rubygems/config_file.rb: Expose the path.
+
+2008-09-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Only create ~/.gem by user owning ~. Bug #21561
+ by Neil Wilson.
+
+2008-09-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Autoload SpecFetcher to improve load
+ time. Patch #21577 by Simon Chiang.
+ * lib/rubygems/commands/lock_command.rb: Modernize. Fix --strict.
+ Patch #21814 by Sven Engelhardt.
+ * lib/rubygems/platform.rb: Fix for solaris platform. Patch #21911
+ by Bob Remeika.
+
+2008-09-10 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/install_command.rb: Describe _version_ in `gem
+ help install`.
+ * lib/rubygems/commands/environment_command.rb: Describe environment
+ variables and gemrc in `gem help env`.
+ * lib/rubygems.rb: Warn when executing Gem::manage_gems.
+ * lib/rubygems/doc_manager.rb: Have RubyGems update the ri cache.
+ * lib/rubygems/source_index.rb: Ensure specs are read as UTF-8.
+ * lib/rubygems/specification.rb: Add magic comment to .gemspec files
+ so they are read in as UTF-8.
+
+2008-08-22 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems.rb: Corrected usage of HOMEDRIVE and HOMEPATH on Windows.
+ Escape Gem.ruby if spaces in the path are present. Solves bug related to
+ extensions compile process.
+ * test/test_gem.rb: Added test to verify both conditions.
+
+2008-08-17 Eric Hodel <drbrain@segment7.net>
+
+ * doc/release_notes/rel_1_3_0.rdoc: Initial release notes for 1.3.0.
+ * util/CL2notes: Release note creation helper script.
+
+2008-08-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/local_remote_options.rb: Added #both? to complement
+ #local? and #remote?.
+ * lib/rubygems/commands/query_command.rb: Print out LOCAL/REMOTE with
+ --both, even without a TTY.
+ * lib/rubygems.rb: Add Gem.find_files, allows a gem to discover
+ features provided by other gems.
+
+2008-08-14 Wilson Bilkovich <wilson@supremetyrant.com>
+
+ * lib/rubygems/source_index.rb: Deprecate options to 'search' other than
+ Gem::Dependency instances and issue warning until November 2008.
+ * lib/rubygems/platform.rb: Remove deprecated constant warnings
+ and really deprecate them.
+ * Rakefile: If the SETUP_OPTIONS environment variable is set, pass its
+ contents as arguments to setup.rb
+ * test/test_gem_commands_uninstall_command.rb: Added
+
+2008-08-13 Wilson Bilkovich <wilson@supremetyrant.com>
+
+ * lib/rubygems/uninstaller.rb: Fix binary script uninstallation.
+ Bug #21234 by Neil Wilson.
+ * test/test_gem_commands_uninstall_command.rb: Added
+
+2008-08-12 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Try to create directory before diverting
+ to ~/.gems.
+ * lib/rubygems/uninstaller.rb: Fix uninstallation with -i. Bug
+ #20812 by John Clayton. Have #remove_all call #uninstall_gem so hooks
+ get called. Bug #21242 by Neil Wilson.
+ * lib/rubygems/commands/update_command.rb: Fix updating RubyGems when
+ no previous rubygems-update is installed. Bug #20775 by Hemant Kumar.
+
+2008-08-11 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Fix HTTPS support. Patch #21072 by
+ Alex Arnell. Fix Not Modified handling. Bug #21310 by Gordon
+ Thiesfeld.
+
+2008-07-11 Luis Lavena <luislavena@gmail.com>
+
+ * setup.rb: Properly build --destdir folder structure using Pathname.
+ * test/mockgemui.rb: Fix warnings about instance variables in a module.
+
+2008-07-02 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems/defaults.rb: Add Gem.user_dir to use paths like
+ ~/.gem/ruby/1.8/gems and the like instead of just ~/.gem. Update
+ remote fetcher and installer to use it.
+
+2008-07-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Add #gem_home, #bin_dir for hooks. Use
+ DependencyInstaller's source_index so reinstallation via -i does not
+ fail.
+ * lib/rubygems/uninstaller.rb: Add #gem_home, #bin_dir for hooks.
+ * lib/rubygems/commands/query_command.rb: Don't print LOCAL/REMOTE
+ gems if stdout is not a TTY.
+ * lib/rubygems/commands/query_command.rb: Use the regexp we already
+ have for `gem list --installed`. Bug #20876 by Nick Hoffman.
+ * lib/rubygems/commands/which_command.rb: Clarify what `gem which` is
+ for.
+
+2008-06-30 Eric Hodel <drbrain@segment7.net>
+
+ * test/test_ext_configure_builder.rb: Locale-free patch by Yusuke
+ Endoh [ruby-core:17444].
+ * lib/rubygems.rb: Add pre/post (un)install hooks.
+ * lib/rubygems/installer.rb: Call pre/post install hooks as
+ appropriate.
+ * lib/rubygems/uninstaller.rb: Call pre/post uninstall hooks as
+ appropriate. Minor refactoring of #uninstall.
+ * lib/rubygems/package/tar_reader.rb: Some OSs raise EINVAL on seek.
+ Based on patch in bug #20791 by Neil Wilson.
+ * lib/rubygems/specification.rb: Correctly check for support of
+ development dependencies for #to_ruby. Bug #20778 by Evan Weaver.
+ * lib/rubygems/spec_fetcher.rb: Correctly load all cache file even if
+ latest has been loaded. Bug #20776 by Uwe Kubosch.
+
+2008-06-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/config_file.rb: Add Gem::ConfigFile constants for
+ packagers and implementors to override defaults.
+ * test/*: Fixes to run tests when under test/rubygems/. Patch by
+ Yusuke ENDOH [ruby-core:17353].
+
+2008-06-24 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Cleanup to support
+ if-modified-since requests. pair: Ryan Davis
+ * lib/rubygems/indexer: Force platform to Gem::Platform::RUBY when
+ nil or blank. Fixes various uninstallable gems.
+
+2008-06-24 Phil Hagelberg <technomancy@gmail.com>
+
+ * lib/rubygems/installer.rb: Fall back on ~/.gem if GEM_HOME is
+ not writable.
+ * lib/rubygems/install_update_options.rb: Allow --user-install or
+ --no-user-install command-line switch to explicitly force whether
+ or not ~/.gem should be used.
+ * lib/rubygems/remote_fetcher.rb: Use ~/.gem/cache if cache dir is
+ not writable.
+ * test/gemutilities.rb: Use MockGemUi for all tests.
+
+2008-06-21 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Load specifications from the future.
+ Roll back specification version change.
+ * lib/rubygems/remote_fetcher.rb: Reset connection when an HTTP
+ server misbehaves.
+ * setup.rb: Fix --destdir for windows.
+ * doc/release_notes/rel_1_2_0.rdoc: Bugs in RubyGems were
+ unintentionally added, order bug fixes by importance.
+ * lib/rubygems/rubygems_version.rb: 1.2.0.
+
+2008-06-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/uninstaller.rb: Improve output when a gem to uninstall
+ isn't found. Bug #20746 reported by Chad Wooley.
+ * setup.rb: Fix rdoc installation with --destdir. Patch #20739 by
+ Matthew Kent.
+ * lib/rubygems/commands/install_command.rb: Don't reset GEM_PATH when
+ installing. Fixes Bug #20746 by Chad Wooley.
+
+2008-06-20 Luis Lavena <luislavena@gmail.com>
+
+ * setup.rb: Only prepend install_destdir when especified. Fixes
+ installation issues related to Windows paths (/C:/...)
+
+2008-06-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Ensure that the entire
+ dependency chain is installed. Fixes bug reported by Chad Woolley.
+
+2008-06-18 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/dependency_command.rb: Restore matching
+ everything when no name is specified, regexp matching. Fixes bug
+ #20716, bug #20717 by Chad Woolley.
+
+2008-06-18 Chad Woolley <thewoolleyman@gmail.com>
+
+ * lib/rubygems/config_file.rb: Fix --config-file option with no
+ equals and subsequent options to properly assign config file.
+ Previously config file was overwritten by subsequent option.
+ Fixes bug #16688.
+
+2008-06-17 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/version.rb: Gem::Version #hash and #eql? now operate
+ on the version string, terms of the version string, so "1" and "1.0"
+ no longer correspond to the same slot. Fixes indexer bug reported by
+ Chad Woolley.
+ * setup.rb: Fix --format-executable. Patch #20698 by Richard Brown.
+ * util/gem_prelude.rb: Prevent infinite recursion, check for Gem now.
+ Patch from ruby trunk by nobu.
+ * lib/*: Spelling cleanup. Patch from trunk by Evan Farrar.
+ * test/*: Fixes for win32 test failures reported by Luis Lavena.
+ * util/gem_prelude.rb: Only remove methods added by gem_prelude.rb.
+
+2008-06-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Fix quick_index generation.
+ * lib/rubygems/specification.rb: Correctly guard new spec features
+ for older RubyGems.
+ * lib/rubygems/config_file.rb: Add system-wide config file
+ (/etc/gemrc). Patch #14723 by Phil Hagelberg. Add windows code to
+ use appropriate directory. Code by Daniel Berger.
+ * doc/release_notes/rel_1_2_0.rdoc: Draft of 1.2.0 release notes.
+
+2008-06-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/server.rb: Store off if we are returning Marshal
+ format before running =~ again. Fixes bug reported by Chad Woolley.
+ * lib/rubygems/commands/stale_command.rb: `gem stale` lists gems by
+ last access time. Patch #20593 by Aaron Patterson.
+ * lib/rubygems/setup.rb: Add --vendor and --destdir to setup.rb for
+ packagers. Patch #20610 by Richard Brown. Don't look for stub
+ files to remove any more.
+ * lib/rubygems/specification.rb: Bump specification version and be
+ backwards compatible with type 2 specs.
+ * lib/rubygems/commands/query_command.rb: Add installed location to
+ details for installed gems.
+
+2008-06-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Only install all dependencies
+ when install_dir option is set. Don't include satisfied dependencies
+ when gathering dependencies.
+ * lib/rubygems/commands/query_command.rb: Display authors, rubyforge
+ and homepage urls with details.
+ * lib/rubygems/commands/environment_command.rb: Add executable
+ directory (from Rubinius).
+ * lib/rubygems/commands/install_command.rb: Don't set install_dir by
+ default.
+ * lib/rubygems/commands/update_command.rb: Don't set install_dir by
+ default. Use #find_missing for efficiency.
+
+2008-06-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/server.rb: Fully mirror Gem::Indexer indexes, set
+ correct content-type headers, always refresh the source index.
+ * lib/rubygems/source_index.rb: Add spec_dirs so that #refresh! will
+ always reload from the same locations. #refresh! on manually-built
+ SourceIndex now raises. Fixes #20509 by Chad Woolley.
+
+2008-06-06 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Remove previous bin_script_path in case
+ it is a symlink.
+ * lib/rubygems/commands/pristine_command.rb: Force reinstallation of
+ the gem using the installer. Fixes bug #20387 by Erik Persson.
+ * lib/rubygems/doc_manager.rb: Ensure args to RDoc are all strings.
+ * lib/rubygems/source_index.rb: Use find_matching to discover updated
+ specs instead of fetch.
+ * lib/rubygems/commands/query_command.rb: Platform, not name in spec
+ tuples.
+
+2008-06-05 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/local_remote_options.rb: Ensure remote repository URLs
+ reference directories. Fixes bug #20134 by Neil Wilson.
+ * lib/rubygems/source_index.rb: Gracefully handle ^C or explicit exit
+ while loading .gemspec files from disk. Fixes bug #20523 by Joel
+ VanderWerf.
+ * lib/rubygems/specification.rb: Use File#expand_path in
+ installation_path. Fixes bug #19317 by Hemant Kumar.
+ * lib/rubygems/spec_fetcher.rb: Fix legacy test against URI.
+ * lib/rubygems/remote_fetcher.rb: Always raise FetchError from
+ RemoteFetcher. Fix FetchErrors without URIs. Refactor Net::HTTP
+ request code to use persistent connections for HEAD requests. Feature
+ Request #7973 by Christian Schachtzabel.
+ * lib/rubygems.rb: Don't load custom_require until after the OS and
+ implementation have had a chance to set paths.
+
+2008-06-04 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/source_index.rb: Only fetch specs we need in
+ #outdated.
+ * lib/rubygems.rb: Fix typo in ::activate exception.
+ * lib/rubygems/dependency.rb: For #to_s, display dependency type when
+ nil.
+ * lib/rubygems/dependency_installer.rb: Reset #installed_gems for
+ every #install. Fixes bug #19444 by Glenn Rempe.
+ * lib/rubygems/installer.rb: Don't re-read the disk to check for new
+ gems, add them by hand on install.
+
+2008-06-03 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Add ::gzip, ::gunzip, ::deflate and ::inflate.
+ * lib/rubygems/server.rb: Add specs and latest_specs indicies.
+ * setup.rb: Don't require rdoc until needed. Patch #20414 by Brian
+ Candler.
+ * lib/uninstaller.rb: Correctly uninstall gems installed with a
+ legacy platform. Patch #19877 by Luis Lavena.
+ * lib/rubygems/commands/update_command.rb: Only fetch remote specs
+ when we know what we're looking for.
+
+2008-06-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Remove double slash in
+ #installation_path. Fixes bug #19896 by Heiko Seebach.
+ * lib/rubygems/remote_fetcher.rb: Require StringIO. Fixes bug #19866
+ by Caleb Land.
+ * lib/rubygems.rb: Require rubygems/defaults/#{RBX_ENGINE}.rb and
+ rubygem/defaults/operating_system.rb if they exist. (OS require comes
+ first and may be overridden by operating system.)
+
+2008-06-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Ensure identical names, versions and
+ platforms are identical for a smaller index.
+ * lib/rubygems/spec_fetcher.rb: Only write to cache when we own it.
+ * lib/rubygems.rb: Honor default_path if GEM_PATH environment
+ variable is not set. Patch #19502 by Donavan Pantke.
+ * lib/rubygems/installer.rb: Set file mode indicated by tar file.
+ Patch #19737 by Jason Roelofs.
+
+2008-06-01 John Barnette <jbarnette@rubyforge.org>
+
+ * lib/rubygems.rb: Add Gem.available?(gem, *specs) for easy availability
+ checks at runtime.
+
+2008-05-31 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/dependency_command.rb: Delay fetching specs
+ until needed. Reverse dependencies can no longer be calculated for
+ remote sources. Add backwards compatibility.
+ * lib/rubygems/commands/fetch_command.rb: Add backwards
+ compatibility.
+
+2008-05-30 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/local_remote_options.rb: --sources option should not
+ add URIs to Gem.sources.
+ * lib/rubygems/spec_fetcher.rb: Add #warn_legacy to help handling
+ legacy sources.
+ * luby/rubygems/commands/query_command.rb: Add backwards
+ compatibility with legacy sources.
+
+2008-05-28 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Add #uri to
+ Gem::RemoteFetcher::FetchError.
+ * lib/rubygems/user_interaction.rb: Improve RDoc slightly.
+ * lib/rubygems/spec_fetcher.rb: Introduce backwards compatibility for
+ legacy (pre 1.2) repositories
+ * lib/rubygems/commands/sources_command.rb: Backwards compatibility
+ and restoration of --update.
+ * lib/rubygems/specification.rb: Ensure nil-typed dependencies become
+ runtime dependencies.
+
+2008-05-27 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/spec_fetcher.rb: Switch #fetch, #find_matching to be
+ compatible with Gem::SourceInfoCache#search_with_source. Add caching
+ for .gemspec files.
+ * lib/rubygems/dependency_installer.rb: Switch to SpecFetcher.
+ * lib/rubygems/source_index.rb: Switch #outdated to use SpecFetcher.
+ * lib/rubygems/commands/dependency_command.rb: Switch to SpecFetcher.
+ * lib/rubygems/commands/outdated_command.rb: Switch to SpecFetcher.
+ * lib/rubygems/commands/query_command.rb: Switch to SpecFetcher.
+ * lib/rubygems/commands/sources_command.rb: Switch to SpecFetcher.
+ * lib/rubygems/commands/update_command.rb: Switch to SpecFetcher.
+ * lib/rubygems/version.rb: Handle comparisons with non-Gem::Version
+ objects.
+
+2008-05-13 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/spec_fetcher.rb: Add caching of specs, latest_specs
+ files.
+ * test/gemutilities.rb: Ensure Gem.user_home doesn't point to ~.
+
+2008-05-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Add Marshal format index of spec names,
+ versions and platforms. WIP.
+ * lib/rubygems/spec_fetcher.rb: WIP for replacement of
+ Gem::SourceInfoCache and SourceInfoCacheEntry.
+ * lib/rubygems/dependency.rb: Add #=~.
+
+2008-05-07 John Barnette <jbarnette@gmail.com>
+
+ * lib/rubygems/specification.rb, et. al: Let gems have development
+ dependencies, which aren't installed (except when --development is
+ supplied) or activated.
+
+2008-05-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Refactored into simpler more imperative
+ code.
+ * lib/rubygems.rb: Leave rbconfig/datadir.rb for non-RubyGems use.
+
+2008-04-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/server.rb: Refresh the source index per request so new
+ gems will be found after server startup.
+
+2008-04-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Only print out "Bulk updating" when
+ verbose, fix #latest_specs documentation.
+ * lib/rubygems/dependency_installer.rb: Add :cache_dir option for
+ Tinderbox.
+
+2008-04-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/test_utilities.rb: Expose some internal testing
+ utilities that are of general use.
+
+2008-04-10 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Fix Gem.prefix so it reports nil when rubygems.rb
+ is in sitelibdir, libdir, or doesn't have 'lib' as a parent directory.
+ * doc/release_notes/rel_1_1_1.rdoc: RubyGems 1.1.1 release notes.
+ * lib/rubygems/rubygems_version.rb: 1.1.1.
+
+2008-04-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/server.rb: Fix fragment URIs. Patch by James Tucker.
+ * lib/rubygems/commands/update_command.rb: Pass
+ --no-format-executable to setup.rb. Patch by Stephen Bannasch.
+
+2008-04-06 Chad Woolley <thewoolleyman@gmail.com>
+
+ * lib/rubygems.rb: Add setter Gems.platforms=, to allow platforms
+ to be set/reset when invoking or testing RubyGems programatically.
+ Also force Gems.platforms to automatically reset to default of
+ [Gem::Platform::RUBY, Gem::Platform.local] if cleared.
+ * lib/rubygems/version_option.rb: Change add_platform_option
+ to initialize Gem.platforms to contain only Gem::Platform::RUBY
+
+2008-04-04 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Make Gem::SourceIndex#refresh!
+ more-correct. Reported by Paul Haddad.
+ * lib/rubygems.rb: Add Gem::refresh. Bug #19176 by Hongli Lai.
+ * lib/rubygems/dependency_installer.rb: Put downloaded gems into
+ install_dir's cache. Patch #19182 by Richard Brown.
+
+2008-04-03 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache.rb: Merge full cache file into
+ latest data. Don't write cache files when checking for them. Only
+ update full cache file when we've read it. Refresh all data when
+ loading all data.
+ * lib/rubygems/dependency_installer.rb: Fix --force to work without
+ network for dependent gems. Fix all-fetching test.
+ * lib/rubygems/commands/query_command.rb: Obey --all flag for gem
+ query.
+ * lib/rubygems/commands/environment_command.rb: Don't display
+ RubyGemsPackageVersion.
+ * lib/rubygems/indexer.rb: Fix typo. Patch by Tom Copeland.
+ * lib/rubygems/command_manager.rb: Display RubyGemsVersion with
+ --version.
+ * lib/rubygems/commands/pristine_command.rb: Rebuild extensions along
+ with everything else. Patch #19281 by Dr. Nic Williams.
+
+2008-04-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Fix prefix to point to directory above RubyGems,
+ so RubyGems will be installed into lib/.
+ * setup.rb: Work around apple's libdir-installed RubyGems, by
+ installing into sitelibdir.
+ * Rakefile: Add svnversion to RubyGems version number for `rake
+ install`.
+
+2008-03-31 Luis Lavena <luislavena@gmail.com>
+
+ * test/: Allow tests to use a random (but controlled) port number
+ instead of a hardcoded one. This helps CI tools when running
+ parallels builds.
+
+2008-03-30 Luis Lavena <luislavena@gmail.com>
+
+ * test/test_gem.rb: Leave APPLE_GEM_HOME tests only to *nixes.
+ * lib/rubygems/remote_fetcher.rb: Errno::ECONNABORTED raised on Windows
+ on closed Keep-Alive connections.
+
+2008-03-29 Eric Hodel <drbrain@segment7.net>
+
+ * gemspecs/: Removed.
+ * examples/: Removed.
+ * doc/design/: Removed.
+ * doc/rdoc_templates/: Removed.
+ * Rakefile: Package doc/release_notes/.
+ * setup.rb: Use full path to release_notes, ensure RDoc can be
+ both removed and installed.
+
+2008-03-28 Eric Hodel <drbrain@segment7.net>
+
+ * bin/gem, Rakefile: RubyGems now requires Ruby > 1.8.3.
+ * lib/rubygems.rb: Added Gem.ruby_version, Gem.read_binary,
+ Gem.binary_mode.
+ * lib/, test/: Read files in binary mode for windows and ruby 1.9.
+ * lib/rubygems/commands/update_command.rb: Only update once.
+ * lib/rubygems/commands/sources_command.rb: Ditto.
+ * lib/rubygems/source_index.rb: Fix #remove_extra, #find_missing so
+ legacy platform gems don't get updated repeatedly.
+ * doc/release_notes/rel_1_1_0.rdoc: RubyGems 1.1.0 release notes.
+ * lib/rubygems/rubygems_version.rb: 1.1.0.
+
+2008-03-28 Ryan Woodrum <rwoodrum@avvo.com>
+
+ * lib/rubygems/commands/query_command.rb: Add --installed
+ subcommand to check if a gem and/or version is installed.
+ * test/test_gem_commands_query_command.rb: Add relevant tests.
+ * test/gemutilities.rb: Override exit() for query tests.
+ * test/mockgemui.rb: Add =() to manipulate output values (clear).
+
+2008-03-28 Chad Woolley <thewoolleyman@gmail.com>
+
+ * lib/rubygems/source_info_cache.rb: Add reset_cache_file.
+
+2008-03-27 Chad Woolley <thewoolleyman@gmail.com>
+
+ * lib/rubygems/user_interaction.rb: Raise Gem::SystemExitException
+ instead of exiting, kill unused terminate_interaction!.
+ * lib/rubygems/exceptions.rb: Add Gem::SystemExitException.
+ * lib/rubygems/commands/install_command.rb: Raise
+ Gem::SystemExitException instead of exiting.
+ * bin/gem: Rescue Gem::SystemExitException and exit with
+ specified exit_code.
+ * test/test_gem_commands_install_command.rb: Assert on
+ Gem::SystemExitException and exit_code in tests.
+
+2008-03-27 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/sources_command.rb: Allow sources to be
+ removed without network. Fixes bug #18644 by Mikel Lindsaar.
+
+2008-03-27 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems/commands/environment_command.rb: Use platform specific
+ PATH_SEPARATOR instead of hardcoded ':'
+ * test/test_gem_commands_unpack_command.rb: Ditto.
+ * test/test_gem_commands_environment_command.rb: Ditto.
+ * test/gemutilities.rb: Fix binary file reads being truncated on
+ Windows.
+ * test/test_gem_commands_install_command.rb: Switch to read_binary.
+ * test/test_gem_commands_update_command.rb: Ditto.
+ * test/test_gem_commands_server_command.rb: Consider full path when
+ evaluating location (instead of hardcoded or missing drive leter).
+ * test/test_gem_installer.rb: Ditto.
+ * test/test_gem_dependency_installer.rb: exclude no-wrapper tests for
+ Windows.
+
+2008-03-26 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems.rb: Handle backslashes that came from GEM_HOME and
+ GEM_PATH on Windows.
+
+2008-03-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Add updating from latest index,
+ default to updating from latest index. Reduces common-case update
+ to under 3,000 gems at present.
+ * lib/rubygems/remote_fetcher: Fix error reporting from net/http.
+ * lib/rubygems.rb: Sort methods, remove last vestiges of autorequire,
+ RDoc cleanup.
+
+2008-03-23 Luis Lavena <luislavena@gmail.com>
+
+ * setup.rb: generated Windows stubs will honors prefix using Gem.ruby
+ instead of hardcoded 'ruby.exe'
+ * lib/rubygems/installer.rb: generated Windows stubs scripts will now
+ work from differnt directories than Gem::bindir. Fixes bug #16259 by
+ Claus Folke Brobak
+
+2008-03-20 Eric Hodel <drbrain@segment7.net>
+
+ * test/test_gem_source_info_cache.rb: Test with real objects now.
+ * lib/rubygems/source_index.rb: #latest_specs now has latest specs
+ for all platforms.
+ * lib/rubygems/source_info_cache.rb: Add latest cache data, only load
+ full cache data when needed.
+
+2008-03-20 Luis Lavena <luislavena@gmail.com>
+
+ * test/gemutilities.rb: Change all the file processing mechanism to
+ enable binary mode by default (required for Windows file operations
+ dealing with non-printable characters).
+
+2008-03-19 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems/package/tar_output.rb: Adapted code to use #wrap instead
+ of #new when dealing with Zlib::GzipWriter (fixes SEGV and warnings due
+ GzipWriter object not being closed explicitly).
+
+2008-03-12 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Add latest_index.
+
+2008-03-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/defaults.rb: Add special case for RUBY_ENGINE constant
+ when setting default gem dir.
+ * Rakefile: Add update_rubinius and diff_rubinius.
+
+2008-03-08 Lincoln Stoll <lstoll@lstoll.net>
+
+ * lib/rubygems/server.rb: Drop use of RDoc's TemplatePage in favor of
+ ERB.
+
+2008-03-04 Ryan Davis <ryan@wrath.local>
+
+ * lib/rubygems/remote_fetcher.rb: Moved #download from
+ DependencyInstaller.
+ * lib/rubygems/commands/fetch_command.rb: Updated to use #download.
+ * lib/rubygems/dependency_installer.rb: install now takes name or dep.
+ Renamed gather_specs_to_download to find_spec_by_name_and_version.
+ Modifed #initialize to not take gem name or version.
+
+2008-03-04 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/package*: Removed #open_from_io and friends, switched
+ to #open, no special handling for file names.
+ * lib/rubygems/package/tar_output.rb: Refactored ::open to use
+ instance methods.
+ * lib/rubygems/remote_fetcher.rb: Print out number of requests made
+ before connection reset.
+
+2008-02-29 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/package/tar_reader/entry.rb: Removed is_directory and
+ is_file? in favor of file? and directory?.
+
+2008-02-28 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/package.rb: Broke up Tar bits into separate files.
+ * lib/rubygems/package/tar_reader/entry.rb: Don't copy TarHeader data
+ into Entry, go through #header instead. Better tests for
+ TarReader::Entry.
+
+2008-02-27 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Automatically fall back to
+ local-only install on network error. Fixes bug #15759 by Chauk-Mean P.
+ * lib/rubygems/source_index.rb: Process spec dirs so that earlier
+ dirs override later dirs. Fixes bug #14816 by Kurt Stephens.
+
+2008-02-26 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/update_command.rb: Only update gems that need
+ updates. Fixes bug #14780 by Mathieu Lajugie. Don't force
+ remote-only updates. Properly handle dependencies when updating.
+ Fixes bug #17488 by Hongli Lai.
+ * lib/rubygems/commands/environment_command.rb: Display path as a
+ usable path.
+ * lib/rubygems.rb: Don't add APPLE_GEM_HOME with ENV['GEM_HOME'].
+
+2008-02-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Expand sitelibdir when checking prefix. Fixes bug
+ #17983 by Hemant Kumar.
+ * setup.rb: Print release notes on installation. Tell people where
+ `gem` was installed.
+ * bin/update_rubygems: Added --help output to explain how to install
+ earlier versions of RubyGems. Added --version option workaround.
+ Fixes bug #16842 by Chad Woolley.
+ * lib/rubygems/install_command.rb: Give proper exit code on failure.
+ Fixes bug #17438 by Josh Nichols.
+
+2008-02-23 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Change hosts correctly when
+ redirecting. Handle EOFError from Net::HTTP.
+ * lib/rubygems/commands/specification_command.rb: Pull specifications
+ from gem files.
+ * lib/rubygems/uninstaller.rb: When :executable is set, don't ask the
+ user. Fixes bug #16812 by Matt Mower. Raise exception instead of
+ printing message when gem is not in GEM_HOME.
+ * lib/rubygems/uninstall_command.rb: Print message when gem is not in
+ GEM_HOME.
+ * lib/rubygems/commands/cleanup_command.rb: Clean up all old gems.
+ * lib/rubygems/commands/unpack_command.rb: Scan every gem path when
+ unpacking. Fixes bug #17602 by Ryan Davis.
+
+2008-02-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/install_update_options.rb: Add --bindir option to
+ specify destination to install executables into. Patch #17937 by
+ Donavan Pantke.
+ * lib/rubygems/specification.rb: Fix Time.today == Time.today. Bug
+ #17413 by Andrei Bocan.
+ * setup.rb: Properly check for deletablitily of user and system
+ caches. Bug #17869 by Alexey Verkhovsky. Fix --no-format-executable.
+ Fixes bug #16879 by Charles Nutter.
+
+2008-02-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Add persistent connection support.
+ Patch #18180 by Aaron Patterson.
+ * lib/rubygems/installer.rb: Fix #shebang to use the ruby install
+ name. Patch #16878 by Donavan Pantke.
+ * lib/rubygems/defaults.rb, lib/rubygems.rb: Enable defaults for
+ Gem.path and Gem.bindir. Patch #17886 by Donavan Pantke.
+ * test/test_gem_ext_configure_builder.rb: Make test_self_build_fail
+ more platform independent. Patch #17599 by Martin Krauskopf.
+
+2008-02-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/fetch_command.rb: Fix a bug when fetching
+ from non-default sources. Report non-existent gems instead of
+ crashing.
+
+2008-01-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/update_command.rb: Use portable and safe ENV
+ operation. Patch by usa in ruby SVN revision 14739.
+ * lib/rubygems/open-uri.rb: Fix tests. Patch by NARUSE Yui.
+ [ruby-dev:33336]
+
+2007-12-23 Eric Hodel <drbrain@segment7.net>
+
+ * util/gem_prelude.rb: Remove methods from Gem, not QuickLoader, to
+ fix warnings.
+
+2007-12-22 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/environment_command.rb: Put GEM PATHS in the
+ correct order.
+ * lib/rubygems/commands/uninstall_command.rb: Add --install-dir to
+ specify which local repository to uninstall from. Patch #15151 by
+ Donavan Pantke.
+ * lib/rubygems/uninstaller.rb: Only allow uninstallation of gems from
+ specified directory. Properly clean up executables on uninstall.
+ Patch #15151 by Donavan Pantke.
+ * lib/rubygems/install_update_options.rb: Add --no-env-shebang
+ option. Patch #16508 by Donavan Pantke.
+ * util/gem_prelude.rb: Use require to load rubygems.rb to make
+ $LOADED_FEATURES correct on RubyGems update.
+
+2007-12-21 Eric Hodel <drbrain@segment7.net>
+
+ * util/gem_prelude.rb: Place bin before lib so bin stubs work.
+
+2007-12-20 Eric Hodel <drbrain@segment7.net>
+
+ * Rakefile: Require Ruby > 1.8.2. Enable CERT_DIR.
+ * lib/rubygems.rb: Work with RbConfig and Config. Bug #16457 by
+ Christian Ramilo, John Barnette.
+ * lib/rubygems/commands/build_command.rb: Relax yaml? test to work
+ with Ruby 1.8.3.
+ * lib/rubygems/rubygems_version.rb: 1.0.1.
+ * doc/release_notes/rel_1_0_1.rdoc: RubyGems 1.0.1 release notes.
+
+2007-12-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Revert change that only wrapped
+ executables with #!.
+ * lib/rubygems/specification.rb: Warn about a lot of things that
+ could be wrong with gemspecs on build, including missing #!. Use
+ 'x86-mswin32' for legacy 'mswin32' platform, fix CURRENT platform.
+ Paired with Luis Lavena.
+ * lib/rubygems/remote_installer.rb: Deleted.
+ * lib/rubygems.rb: Removed Kernel#require_gem.
+ * doc/release_notes/rel_1_0_0.rdoc: RubyGems 1.0 release notes.
+ * lib/rubygems/rubygems_version.rb: 1.0.0.
+
+2007-12-18 Luis Lavena <luislavena@gmail.com>
+
+ * lib/rubygems/commands/mirror_command.rb: Work around URI::parse
+ processing file:// scheme and drive paths on Windows.
+ * test/test_gem_commands_mirror_command.rb: ditto.
+
+2007-12-17 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Copy files into bindir if they don't
+ have a shebang. Bug reported by Luis Lavena.
+ * lib/rubygems/server.rb: Handle platforms in Gem::Server#quick.
+ Exactly match gem names. Bugs reported by Chad Woolley.
+ * lib/rubygems/platform.rb: Remove platform constants in favor of
+ Gem::Platform::CURRENT. Bug reported by Luis Lavena.
+ * lib/rubygems/dependency_installer.rb: Work around Dir::glob not
+ understanding File::ALT_SEPARATOR. Bug submitted by Luis Lavena.
+
+2007-12-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Be more verbose in error messages
+ from OpenURI.
+ * lib/rubygems/server.rb: Be more verbose in error/missing responses.
+
+2007-12-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Output extension build results when
+ really verbose. From bug #15853 John Croisant.
+ * lib/rubygems/specification.rb: Fix backwards compatibility with
+ 0.9.4, don't allow the platform to be nil or an empty string. Bug
+ #16177 by Dan Manges.
+ * setup.rb: Re-exec setup.rb if rubygems is loaded and RUBYOPT is
+ set. Fixes bug #15974 by Joshua Sierles.
+ * lib/rubygems/update_command.rb: Tweak formatting of updated
+ message. Bug #15625 by Bil Kleb.
+ * lib/rubygems/remote_fetcher.rb: Add URI to exception message for
+ Gem::RemoteFetcher#fetch_size. Bug #14801 by Bil Kleb.
+
+2007-12-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/query_command.rb: Don't display duplicate
+ version numbers. Bug #15828 by Tim Fletcher.
+ * setup.rb: Fix my stupidity with --help. Patch #16308 by Stephen
+ Bannasch. Fix --prefix= argument. Bug #16002 by Piglop.
+
+2007-12-13 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/server_command.rb: Fix --no-daemon. Bug by
+ Chad Woolley.
+ * lib/rubygems/server.rb: Fix Marshal quick index. Bug by Chad
+ Woolley.
+ * lib/rubygems/installer.rb: Respect Gem::Specification#bindir. Bug
+ #16202 by Suraj Kurapati.
+ * lib/rubygems/commands/update_command.rb: Fix `gem update mysql`.
+ Bug #16244 by Stephen Bannasch.
+
+2007-12-12 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Add --format-executable option to
+ install executables with ruby's program-suffix and prefix. Patch
+ #14688 by Jeremy Kemper. Also, installing in really-verbose mode
+ prints out written files.
+ * setup.rb: Add --format-executable option to install gem with ruby's
+ program-suffix and prefix. Add --help. Fixes bug #16056 by Chad
+ Woolley.
+ * lib/rubygems/uninstaller.rb: Fallback to original_platform_name
+ correctly. Patch #15960 by Nicola Piccinini's friend.
+
+2007-12-11 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/validator.rb: Correct test run failures when no tests
+ are provided. Patch #15701 by Jérémy Zurcher.
+ * lib/rubygems/commands/mirror_command.rb: Don't File.join a
+ URI::HTTP. Patch #16116 by Morgan Nelson.
+ * lib/rubygems/commands/unpack_command.rb: Add --target option to
+ `gem unpack`. Patch #16154 by Kevin Barnes.
+
+2007-12-10 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Revert to nil for the default
+ security policy to avoid requiring OpenSSL.
+ * lib/rubygems/defaults.rb: Consolidate defaults for easier editing.
+ Patch #15150 by Donavan Pantke.
+
+2007-11-27 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Remove dependency on forwadable.
+ Patch by Koichi Sasada.
+ * lib/rubygems/specification.rb: Reduce dependency on time.rb. Patch
+ by Koichi Sasada.
+
+2007-11-26 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems/version.rb: Fix bug 15948 with version bump
+ * test/test_gem_version.rb: Test for bug 15948 with version bump
+ * util/gem_prelude.rb: wrap init code with exception handler
+ and skip badly formed directory names
+
+2007-11-23 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems.rb: Centralize all CONFIG options into Hash
+ Gem::ConfigMap with keys as symbols, change all references
+ to CONFIG to ConfigMap
+ * lib/rubygems/require_paths_builder.rb: Added to support
+ building .require_paths file
+ * lib/rubygems/installer.rb: Add building of .require_paths if
+ needed
+ * lib/rubygems/platform.rb: Use new ConfigMap hash for arch
+ * lib/rubygems
+ * util/gem_prelude.rb: new gem prelude for Ruby 1.9
+ * test/test_gem_installer.rb: change to use ConfigMap hash
+ * test/gemutilities.rb: change to use ConfigMap hash
+
+2007-11-21 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/platform.rb: Gem::Platform.new now returns
+ Gem::Platform.local if the arch matches Gem::Platform::CURRENT.
+ Bugs #15815 and #15782 submitted by Daniel Berger.
+
+2007-11-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/platform.rb: Handle bare 'mswin32' platform's CPU.
+
+2007-11-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb: 0.9.5.
+
+2007-11-16 Eric Hodel <drbrain@segment7.net>
+
+ * test/gemutilities: Add a legacy platform gem to the default test
+ gems list.
+ * lib/rubygems/specification.rb: Add Gem::Specification#original_name
+ for legacy purposes
+ * lib/rubygems/indexer.rb: Use #original_name to make the indexer
+ backwards compatible.
+ * lib/rubygems/master_index_builder.rb: Reduce memory consumption.
+
+2007-11-13 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb: 0.9.4.7 beta.
+ * lib/rubygems.rb: Patch for RUBY_FRAMEWORK for OS X 10.5. Patch
+ submitted by Laurent Sansonetti.
+ * lib/rubygems.rb: cygwin, djgpp, mingw are Windows platforms. Fixes
+ bug #15537 by Roger Pack.
+
+2007-11-11 Eric Hodel <drbrain@segment7.net>
+
+ * Rakefile: Tasks for maintaining ruby trunk export of RubyGems.
+ * lib/rubygems/specification.rb: Preserve original platform across
+ serialization.
+ * lib/rubygems/dependency_installer.rb: Retry with original platform
+ name on fetch error.
+
+2007-11-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Set #original_platform only once.
+ * lib/rubygems/indexer.rb: Handle legacy platforms.
+ * lib/rubygems/platform.rb: Gem::Platform is a valid argument. Bug
+ #15511 submitted by Daniel Berger.
+ * lib/rubygems/custom_require.rb: Fix compatibility with 1.8.2. Bug
+ #14933 submitted by Aaron Patterson.
+ * lib/rubygems/command.rb: Now '-V' enables verbose. Bug #14951
+ submitted by Sasa Ebach.
+ * lib/rubygems/commands/check_command.rb: Change use of '-v', '-V' to
+ match above.
+ * lib/rubygems/package.rb: #send! is gone again.
+ * lib/rubygems.rb: Don't add custom_require for 1.9.
+ * test/*: Make compatible with 1.9 import.
+
+2007-10-30 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Don't re-use @platform to maintain
+ backwards compatibility.
+ * lib/rubygems/platform.rb: Handle nil and 'ruby' platforms in ::new.
+
+2007-10-20 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/uninstaller.rb: Changed '.cmd' to '.bat' in the
+ remove_executables method for MS Windows. Patch from Luis Lavena.
+
+2007-10-18 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb: 0.9.4.6 beta.
+
+2007-10-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/update_command.rb: Don't install with
+ dependencies when updating. This is a hack.
+
+2007-10-19 Daniel Berger <djberg96@gmail.com>
+
+ * setup.rb: gem.cmd stub is now gem.cmd, and the stub generation was
+ changed - now better for NT. Patch #14725 (Luis Lavena).
+ * lib/rubygems/installer.rb: Same as for setup.rb.
+
+2007-10-18 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/platform.rb: Modified the Platform.local method for MS
+ Windows for versions built with VC++ 6. Patch #14727 (Luis Lavena).
+ * test/test_gem_specification.rb: Added version independent tests for
+ MS Windows. Patch #14727 (Luis Lavena).
+
+2007-10-18 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb: Add platform to User-Agent.
+ * lib/rubygems/commands/install_command.rb: Fix typo. Debian bug
+ #443135 submitted by Reuben Thomas.
+ * lib/rubygems/dependency_installer.rb: Don't install dropped
+ dependencies. Fixes bug #14724 submitted by Luis Lavena.
+
+2007-10-17 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/update_command.rb: Unset RUBYOPT when running
+ setup.rb
+ * setup.rb: Re-exec without RUBYOPT if it is set. Fixes bug #14683
+ submitted by Lyle Johnson.
+
+2007-10-16 Daniel Berger <djberg96@gmail.com>
+
+ * lib/rubygems/indexer/abstract_index_builder.rb: The compress method
+ now does a binary read to make MS Windows happy.
+
+2007-10-16 Eric Hodel <drbrain@segment7.net>
+
+ * setup.rb: Installs bin stubs that warn when you try to use the old
+ commands. Simple mswin deprecation stubs by Luis Lavena.
+
+2007-10-12 Eric Hodel <drbrain@segment7.net>
+
+ * setup.rb: Remove source caches on install.
+ * doc/release_notes/rel_0_9_5.rdoc: Draft added.
+ * lib/rubygems/rubygems_version.rb: 0.9.4.5 beta.
+
+2007-10-10 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Fix small bug found by Alan C.
+ Francis.
+
+2007-10-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Use install_dir so custom gem
+ repos can be used.
+ * lib/rubygems/specification.rb: Always set required attributes, even
+ if they match the default.
+
+2007-10-08 Ryan Davis <ryan@wrath.local>
+
+ * lib/rubygems.rb: Fixed require order so custom_require is
+ last. Added HACK tag to remind Jim to release rake.
+ * test/test_gem_source_index.rb: Fixed latest_specs' tests so
+ failures were much more readable.
+ * lib/rubygems/source_index.rb: Fixed latest_specs to deal with
+ platforms appropriately. Returns array again.
+
+2007-10-08 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/config_file.rb: Boost bulk_threshold to 1000, Marshal
+ format is smaller than yaml format quick index.
+ * lib/rubygems/installer.rb: Make #shebang correctly rewrite env
+ shebangs.
+ * lib/rubygems/specification.rb: Mark Time.today for removal, too much
+ depends upon it now.
+
+2007-10-07 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Sped up ::_load.
+ * lib/rubygems/source_index.rb: Sped up #search.
+ * lib/rubygems/version.rb: Replace #to_ints with #ints, and cache
+ result.
+ * lib/rubygems/source_info_cache.rb: Only flush cache when it changes.
+
+2007-10-05 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/user_interaction.rb: Allow customization of completion
+ message for progress reporters.
+ * lib/rubygems/command.rb: Add --quiet option.
+ * lib/rubygems/commands/generate_index_command.rb: Add description.
+
+2007-10-04 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/uninstaller.rb: Also check and uninstall old platform
+ name to ensure legacy platform gems are uninstalled.
+ * lib/rubygems/doc_manager.rb: Remove existing rdoc and ri directory
+ so regenerating docs succeeds even if previously interrupted.
+
+2007-10-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb: Make #outdated search only for gems
+ matching the current platform.
+ * lib/rubygems/commands/dependency_command.rb: Add --platform.
+ * lib/rubygems/commands/outdated_command.rb: Ditto.
+ * lib/rubygems/commands/specification_command.rb: Ditto.
+ * lib/rubygems/commands/update_command.rb: Ditto.
+
+2007-10-02 Wilson Bilkovich <wilson@supremetyrant.com>
+
+ * lib/rubygems/specification.rb: Custom Marshal format to reduce index
+ size.
+ * lib/rubygems/requirement.rb: Ditto
+ * lib/rubygems/version.rb: Ditto
+
+2007-10-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/platform.rb: Handle mswin32 on VC6. Partial patch and
+ assistance by Luis Lavena. Handle cpu-os-version style platforms for
+ command-line arguments.
+
+2007-09-30 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Gem::Specification is now
+ forward-compatible while loading.
+
+2007-09-29 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache_entry.rb: Correctly handle URIs.
+ * lib/rubygems/remote_fetcher.rb: ditto.
+ * lib/rubygems/remote_options.rb: Add --update-sources option. Patch
+ #14246 submitted by Alan Francis.
+ * lib/rubygems/config_file.rb: Add update_sources setting to control
+ automatic refreshing of sources (patch #14246). Fix bug where things
+ would be overwritten in ~/.gemrc when they shouldn't.
+
+2007-09-28 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems.rb: Gem.ruby now returns the full path. Added
+ Gem.prefix to make self updating work right.
+ * setup.rb, pre-install.rb, post-install.rb: Replace with a small,
+ simple setup script that works.
+ * lib/rubygems/commands/update_command.rb: Pass rdoc, ri and prefix
+ flags down to setup.rb when self updating.
+
+2007-09-26 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/version_option.rb: Always include RUBY platform,
+ allow RUBY platform as an option.
+ * lib/rubygems/specification.rb: Gems with non-ruby platform sort
+ last (first in preference for installation).
+ * lib/rubygems/platform.rb: Allow matching of legacy platforms.
+ * lib/rubygems/source_index.rb: Add only_platform option to #search.
+
+2007-09-24 Wilson Bilkovich <wilson@supremetyrant.com>
+ * lib/rubygems/indexer.rb: Generate a Marshal index in parallel to YAML
+ * lib/rubygems/source_index.rb: Fetch a Marshal index if it exists, to
+ avoid the memory cost of parsing a huge YAML file
+ * lib/rubygems/commands/mirror_command.rb: Check for Marshal first
+ * lib/rubygems/indexer/abstract_index_builder.rb: Index refactoring
+ * lib/rubygems/indexer/marshal_index_builder.rb: Build Marshal index
+ * lib/rubygems/indexer/master_index_builder.rb: Simplify YAML generation
+ * lib/rubygems/indexer/quick_index_builder.rb: Build Marshal quickindex
+ * lib/rubygems/server.rb: Serve up Marshal index as well as YAML
+ * lib/rubygems/source_info_cache_entry.rb: Expect a Marshal index
+
+2007-09-23 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/fetch_command.rb: `gem fetch` downloads a gem
+ to the current directory. Feature request #10752 by Bret Pettichord.
+ * lib/rubygems/commands/local_remote_options.rb, etc.: Fix spelling of
+ 'threshold'.
+ * lib/rubygems/installer.rb: Revert feature request #8818, it
+ interferes with `ruby -S` and multiple versions of ruby (1.8 and 1.9).
+ * lib/rubygems/dependency_installer.rb: Fix a bug where the wrong
+ platform gem would be installed.
+ * lib/rubygems/version_option.rb: Add --platform.
+ * lib/rubygems/install_update_options.rb: Verify --security-policy.
+ * lib/rubygems/local_remote_options.rb: Verify --source, --http-proxy.
+
+2007-09-22 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/open-uri.rb: Don't document our OpenURI.
+ * lib/rubygems/commands/generate_index_command.rb: Fix Indexer class
+ change.
+ * lib/rubygems/commands/mirror_command.rb: Fix for 1.9.
+ * lib/rubygems/commands/pristine_command.rb: Have `gem pristine`
+ give a better report of what it accomplished.
+ * lib/rubygems/command.rb: Add optional description field.
+ * lib/rubygems/installer.rb: Hack around broken Pathname#absolute? on
+ windows. Patch #14139 by Jim Hughes.
+
+2007-09-20 Eric Hodel <drbrain@segment7.net>
+
+ * misc files: Tests pass on 1.9.
+ * test/gemutilities.rb: Added Object#send! stub for 1.8.
+ * test/test_open_uri.rb: Require gem_open_uri.rb to avoid warnings.
+ * lib/rubygems/commands/sources_command.rb: Clarify `gem sources -c`
+ and what `gem sources` does. Patch by Hugh Sasse.
+
+2007-09-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/platform.rb: Make Gem::Platform a class.
+ * lib/rubygems/specification.rb: Gem::Specification#validate returns
+ true, non-Gem::Platform platforms are no longer allowed.
+ * test/gemutilities.rb: 1.9 compatiblity fixes.
+ * lib/rubygems/dependency_installer.rb: Work around a bug in URI.parse
+ which misinterprets "C:/". Patch #13537 submitted by Daniel Berger.
+ * lib/rubygems/format.rb: Ensure file handles are closed. Patch
+ #13533 submitted by Daniel Berger.
+ * test/test_gem_installer.rb: Win32 path fix. Patch #13528 submitted
+ by Daniel Berger.
+ * test/gemutilities.rb: Make the platform be a win32 platform on
+ win32. Fixes confusion in generate_bin_symlink tests. Patch #13529
+ submitted by Daniel Berger.
+ * test/test_gem_specification.rb: Sequel to above. Patch
+ #13535 submitted by Daniel Berger.
+ * lib/rubygems/source_index.rb: Make the updating cache message more
+ clear. Patch #12778 submitted by Bil Kleb.
+ * lib/rubygems/server.rb: Allow gem's rdoc-style.css to be used.
+ Patch #13589 by Stephen Bannasch.
+ * lib/rubygems/indexer.rb: Fail on missing builder gem only when
+ trying to use the indexer. Fixes bug #13939 by Bryan Stearns.
+ * lib/rubygems/indexer/indexer.rb: Move Indexer up one level in
+ nesting.
+ * lib/rubygems/indexer/compressor.rb: Only used in
+ Gem::Indexer::AbstractIndexBuilder subclasses, merged there.
+ * lib/rubygems/command_aids.rb: Merged Gem::CommandAids into
+ Gem::Command since that's the only place it gets used.
+ * misc other files: mswin fixes. Paired with Daniel Berger.
+
+2007-08-24 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb: Fix #full_name for versionless
+ platforms.
+ * lib/rubygems/command_manager.rb: We're only looking for NameError.
+ * lib/rubygems/command.rb: 1.9 fix.
+ * lib/rubygems/format.rb: ditto.
+ * lib/rubygems/installer.rb: ditto.
+
+2007-08-24 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb: 0.9.4.4
+
+2007-08-23 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/platform.rb: Add HPUX, AIX and NetBSD. Thanks to
+ Daniel Berger, Yutaka KANEMOTO and Andre Nathan respectively.
+ * lib/rubygems/installer.rb: Move all option setting to #initialize to
+ make `gem pristine` work again.
+ * lib/rubygems/commands/environment_command.rb: Include platforms.
+ * lib/rubygems/dependency_installer.rb: Support local non-root
+ installation.
+
+2007-08-22 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Don't reinstall dependencies
+ existing in the install dir. Don't install dependencies for older
+ versions of the gem we're installing. #installed_gems now contains
+ loaded gemspecs. Always prefer local gems. Handle globs correctly.
+ All deps are now installed into the install_dir.
+ * lib/rubygems/commands/install_command.rb: Switch to
+ Gem::DependencyInstaller. Warn when -y is given, it will be removed.
+ Try our best to install everything the user asked.
+ * lib/rubygems.rb: Gem.bindir now handles Pathname correctly.
+ * lib/rubygems/remote_fetcher.rb: Don't downcase anymore.
+
+2007-08-21 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Add installation from local
+ gems. Install gems in the correct order. Handle -E, -f,
+ --ignore-dependencies, -i, -r, -l, -b, -P, -w, -v options for `gem
+ install`
+ * test/gemutilities.rb: Work around OS X /private/tmp.
+ * lib/rubygems/platform.rb: Switch to using arch instead of target_*
+ for JRuby compatibility. Thanks to Nick Sieger.
+
+2007-08-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_installer.rb: Add working but unfinished
+ Gem::DependencyInstaller.
+ * lib/rubygems/source_info_cache.rb: Add #search_with_source.
+ * lib/rubygems/dependency_list.rb: Move #fill_dependencies to
+ Gem::DependencyInstaller
+ * lib/rubygems/platform.rb: Split from specification.rb. Add methods
+ to recognize platforms from Config::CONFIG.
+ * lib/rubygems.rb: Add Gem::platforms.
+ * lib/rubygems/specification.rb: Disallow String platforms.
+
+2007-08-18 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache.rb: Search by Gem::Dependenency.
+ * lib/rubygems/source_index: Search by Gem::Dependenency.
+ * lib/rubygems/version.rb: Version can be String or Integer.
+ Gem::Requirement::default is now >= 0. Gem::Requirement can be built
+ from a Gem::Dependency.
+ * lib/rubygems/dependency_list.rb: Uses TSort now. Add
+ Gem::DependencyList#fill_dependencies.
+ * lib/rubygems/server.rb: Support quick index.
+
+2007-08-17 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/dependency_list.rb: For diamond dependencies with
+ different versions on the bottom of the diamond, trim all but the
+ latest dependency. This will prevent gems like hoe from being
+ installed multiple times.
+
+2007-08-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb: Support building mkrf extensions. Fixes
+ bug #11313. Patch by Jeremy Hinegardner.
+ * lib/rubygems/installer.rb: Ensure bin files are executable. Fixes
+ bug #8985 submitted by Ara Howard.
+ * lib/rubygems/installer.rb: Insert installing gem home dir into bin
+ wrapper. Patch #8818 by Ara Howard.
+
+2007-08-13 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/uninstall_command.rb: Gems with version of 0
+ can now be uninstalled.
+
+2007-08-11 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/config_file.rb: Command-line args override ~/.gemrc
+ now. Gem.sources is pulled from ~/.gemrc now. Gem::ConfigFile can
+ write itself out now.
+ * lib/rubygems/commands/sources_command.rb: Now writes out
+ Gem.configuration on changes. No longer checks source cache on
+ --list.
+
+2007-08-09 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache.rb: Make Gem::SourceInfoCache#search
+ only search gems in Gem.sources.
+ * lib/rubygems.rb: Make Gem::configuration a real Gem::ConfigFile
+ object.
+ * lib/rubygems/commands/query_command.rb: Fix `gem query --details`.
+ Add `gem query --no-versions`.
+ * lib/rubygems/local_remote_options.rb: Make `gem mumble --source URL`
+ only use that source.
+ * lib/rubygems/config_file.rb: Fix Gem::ConfigFile#[]= to match
+ Gem::ConfigFile#[].
+
+2007-08-08 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/commands/specification_command.rb: Match only exact gem
+ names. Fixes bug #9681. Patch by Michael DeCandia.
+ * lib/rubygems/commands/unpack_command.rb: Match only exact gem names.
+ Fixes bug #9681. Patch by Michael DeCandia.
+ * lib/rubygems/commands/contents_command.rb: Match only exact gem
+ names. Fixes bug #9681. Patch by Michael DeCandia
+ * lib/rubygems/remote_fetcher.rb: Perform a GET request if the HEAD
+ request doesn't have Content-Length. Fixes bug #9771. Patch by Ben
+ Bleything.
+ * lib/rubygems.rb: Clear Gem::searcher when we Gem::clear_paths.
+ Fixes bug #12886. Submitted by Peter Williams.
+ * lib/rubygems.rb: Add #default_sources and rework #sources to use it.
+ * post-install.rb: No longer runs install_sources.
+ * pkgs/sources: Updated to something what a 0.0.2 would look like, if
+ we ever make one.
+
+2007-08-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/gem_commands.rb: Removed and broken up into individual
+ files.
+ * lib/rubygems/command_manager.rb: Lazily loads gem commands. Now to
+ use CommandManager just "require 'rubygems/command_manager'" and
+ everything will be there.
+
+2007-08-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/*, test/*: Pushed down dependencies as far as reasonable.
+ Removed Gem::manage_gems. Now only 14 files are loaded with "require
+ 'rubygems'". Added tests for `gem build` and `gem cert`.
+ * lib/rubygems/extensions.rb: Added common place for all extensions.
+
+2007-07-26 Eric Hodel <drbrain@segment7.net>
+
+ * test/test_gem_ext_configure_builder.rb: Linux has different behavior
+ for `sh ./configure` when configure is missing. Fix adapted from
+ Patch #10019 by Donavan Pantke.
+ * lib/rubygems/commands/pristine_command.rb: Compare fully-qualified
+ paths. Fixes bug #7976 by Lyle Johnson.
+ * lib/rubygems/config_file.rb: Add ConfigFile#[]=, so --proxy
+ command-line option works. Fixes #8152 by Justin Sabelkko.
+ * lib/rubygems/post-install.rb: Make sure we use the
+ latest-and-greatest RubyGems when running post-install.rb. Fixes Bug
+ #8411 by Duy Nguyen.
+ * lib/rubygems/remote_fetcher.rb: An empty HTTP_PROXY means no proxy.
+ Fixes Bug #9042 by Michael Brodhead.
+ * lib/rubygems/version.rb: Disallow newlines in version string. Strip
+ spaces from version string. Fixes Bug #9499 by Bryce Kerley.
+ * lib/rubygems/commands/sources_command.rb: Fix spelling error. Fixes
+ Bug #11064 by Chris Eskow.
+
+2007-07-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/indexer.rb: Create the index in /tmp, then move it into
+ place when we're done. This will prevent spurious bulk index updates
+ from occurring while the quick index is missing. Remove the option to
+ not build the quick index.
+ * lib/rubygems/commands/generate_index_command.rb: --no-quick is gone.
+ * lib/rubygems/user_interaction.rb: If stdin is not a tty, it is
+ unlikely that gem is going to get a response when asking a question.
+ Patch #10660 by Paul Brannan.
+ * lib/rubygems/validator.rb: Output test failures when using install
+ -t. Patch #10659 by Paul Brannan.
+ * lib/rubygems/custom_require.rb (Kernel#require): Only rescue a
+ LoadError that matches the file we are requiring. Patch #10723 by
+ Tyler Rick.
+ * lib/rubygems/remote_fetcher.rb: Support HTTP basic authentication.
+ Patch #8121 by Max Dunn.
+ * lib/rubygems/commands/install_command.rb: Don't raise an error when
+ a gem has no tests. Patch #11824 by Katsuyuki MIYAMUKO.
+
+2007-07-23 Eric Hodel <drbrain@segment7.net>
+
+ * lib/commands/contents_command.rb: Add --lib-only option, remove
+ useless --list option. Feature request #9498 by Martin DeMello.
+ * lib/rubygems/specification.rb: Restrict to only files in
+ #require_paths. Add #required_rubygems_version. Feature request
+ #7780 by Eric Hodel.
+ * lib/rubygems/commands/dependency_command.rb: Display dependencies for
+ remote gems. Feature request #12133 by Eric Hodel. -r for reverse
+ dependencies is now -R.
+ * lib/rubygems/commands/specification_command.rb: Display
+ specifications for remote gems. Feature request #12133 by Eric Hodel.
+ * lib/rubygems/installer.rb (Gem::Installer#install): Check
+ required_rubygems_version.
+ * lib/rubygems/user_interaction.rb
+ (Gem::UserInteraction#choose_from_list): Check result for EOF. Fixes
+ bug #8018. Patch by Jos Backus.
+ * post-install.rb: Install using absolute path. Fixes bug #10675.
+ Patch by Jeremy Burks.
+ * lib/rubygems/commands/environment_command.rb: Add RUBY VERSION to
+ environment output.
+ * lib/rubygems/command.rb: Don't worry about duplicated command-line
+ options, OptionParser takes care of them for us.
+
+2007-07-22 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb (Gem::Specification#files): Make it
+ faster
+ * lib/rubygems/command.rb: Better documentation. -v flag now lets you
+ get to "really verbose" mode which makes the verbose progress meter
+ work. Add command groups to separate types of commands easily.
+ * lib/rubygems/commands/which_command.rb, bin/gemwhich: Move `gemwhich`
+ under `gem`.
+ * lib/rubygems/commands/mirror_command.rb, bin/gem_mirror: Move
+ `gem_mirror` under `gem`.
+ * lib/rubygems/commands/lock_command.rb, bin/gemlock: Move `gemlock`
+ under `gem`.
+ * lib/rubygems/commands/server_command.rb, bin/gem_server: Move
+ `gem_server` under `gem`.
+ * lib/rubygems/doc_manager.rb (Gem::DocManager#initialize): Only raise
+ when operating on the filesystem.
+ * lib/rubygems/server.rb: Remove option processing, now in
+ Gem::Commands::ServerCommand.
+ * lib/rubygems/commands/generate_index.rb, bin/index_gem_repository.rb:
+ Move `index_gem_repository.rb` to `gem generate_index`.
+ * lib/rubygems/indexer (Gem::Indexer): Extract from
+ index_gem_repository.rb and merge RubyForge changes.
+ * lib/rubygems/command_manager.rb (Gem::CommandManager#run): Print
+ backtrace when --debug is set too.
+ * lib/rubygems/command_manager.rb (Gem::CommandManager#load_and_instantiate):
+ Don't infinitely loop in retry.
+ * bin/gemri: Removed. Everybody should have ri integration now.
+ * lib/rubygems/config_file.rb: Allow settings to be examined. Pull
+ settings from .gemrc.
+ * lib/rubygems/commands/environment_command.rb: Add ruby executable
+ and configuration settings to `gem env`.
+ * lib/rubygems/indexer/indexer.rb (Gem::Indexer::Indexer#build_index):
+ Now uses UserInteraction.
+ * various: Use UserInteraction for output.
+ * lib/gemconfigure.rb: Removed. Same as multiple gem commands.
+ * lib/rubygems/commands/contents_command.rb: Removed extra --verbose
+ option.
+ * lib/rubygems/gem_commands.rb (Gem::LocalRemoteOptions): Moved -B,
+ --source, -p from Gem::Commands::common_options.
+
+2007-07-22 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/gem_commands.rb: Added another example to the gem
+ example output (Gile Bowkett)
+ * test/test_documentation_generation.rb, lib/rubygems/doc_manager.rb:
+ Added a test for documentation generation and fixed a bug when doc
+ location is not writable.
+
+2007-06-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/gem_path_searcher.rb (Gem::GemPathSearcher): Moved out
+ of lib/rubygems/custom_require.rb and added tests.
+
+2007-06-02 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/source_info_cache.rb (Gem::try_file): Fix for issue
+ where a non-existing source cache file causes the gem command to
+ not find a gem. This fixes it by marshalling out an empty
+ hash. (Thanks to Nick Sieger for this fix).
+
+2007-06-01 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems.rb
+ (Gem::OperationNotSupportedError::latest_partials): Changed from
+ match data style to $1 style regexp (on the recommendation of
+ better performance).
+
+2007-05-30 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/source_index.rb (Gem::SourceIndex::update):
+ Modified to get the bulk_threshhold from the configuration.
+ (Gem::SourceIndex::convert_specs): Ryan removed the "reduce_specs"
+ method because it is not needed any more and is creating memory
+ overhead.
+
+ * lib/rubygems/config_file.rb (Gem::ConfigFile): Added
+ bulk_threshhold field to ConfigFile.
+ (Gem::ConfigFile::initialize): Initialize bulk threshhold to 500.
+
+ * lib/rubygems/command.rb
+ (Gem::Command::specific_extra_args_hash): Added
+ -B (--bulk-threshhold) option to allow user specified bulk
+ download threshhold.
+
+2007-05-23 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/commands/sources_command.rb
+ (Gem::Commands::SourcesCommand::initialize): Added a --clear-all
+ option to the sources subcommand. Clear-all will remove the cache
+ files.
+
+ * lib/rubygems/source_info_cache.rb (Gem): Moved system_cache_file
+ and user_cache_file to class methods so that we can get the file
+ names without creating a SourceInfoCache instance.
+
+2007-05-23 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache.rb: Teach SIC to repair itself
+ when it encounters a bad cache file.
+
+2007-05-14 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/command_manager.rb: Re-added registration for
+ gem cleanup command which I accidentally removed during refactoring.
+
+2007-05-10 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb: Uncommented the require
+ 'sources' line.
+
+ * lib/rubygems/source_info_cache.rb: Uncommented the require
+ 'sources' line.
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.3
+ in preparation for release.
+
+ * lib/rubygems/package.rb (Gem::TarInput::zipped_stream):
+ Zipped_stream now always uses the in memory string IO buffer.
+ There were just too many problems with ZLib (on windows)
+ otherwise.
+
+2007-03-26 Jim Weirich <jim@weirichhouse.org>
+
+ * (Index): new digest technique.
+
+ * lib/rubygems/validator.rb (Gem::Validator::verify_gem): Removed
+ really old MD5 and replaced with gem based digests.
+
+ * experimental/deployment.rb (Gem::Deployment::Manager::initialize):
+ New digest technique.
+
+ * experimental/test_deployment.rb (TestDeployment::test_deployed_file):
+ New digest technique.
+
+2007-03-26 Chad Fowler <chad@chadfowler.com>
+
+ * Extracted the big ball of mud that was gem_commands.rb into
+ separate files.
+
+2007-03-17 Chad Fowler <chad@chadfowler.com>
+
+ * Various ruby 1.8.6 fixes for failing tests.
+
+ * Updated setup.rb to 3.4.1
+
+ * Renamed cmd_manager to command_manager to keep names consistent
+
+ * lib/installer.rb: Rework path checking to use Pathname (ara howard bug #8811)
+
+2007-03-02 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems.rb: Add bin directory before library directory,
+ otherwise gems like rake don't work.
+
+2007-03-01 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/open-uri.rb: Fix all the infinite loop errors.
+
+ * lib/rubygems.rb: Add dirs from activate after -I and ENV['RUBYLIB']
+ dirs. Otherwise gems won't allow -I to work when #gem is called.
+
+2007-02-11 Chad Fowler <chad@chadfowler.com>
+
+ * test/gemutilities.rb: Fix to make Windows tests pass. (Anatol Pomozov)
+
+2007-02-05 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.2
+ and made a release.
+
+2007-02-04 Chad Fowler <chad@chadfowler.com>
+
+ * Fixed failing tests (changed from assert_equal to assert_match to
+ deal with ARGV inconsistencies in test vs. production).
+
+2007-02-03 Jim Weirich <jim@weirichhouse.org>
+
+ * Bumped version to 0.9.1.1.
+
+ * lib/rubygems/gem_open_uri.rb: Added the patched open-uri back
+ into the gems software. Evidently, the 1.8 version of open-uri
+ does not handle authenticating proxies with username and password.
+
+ * lib/rubygems/source_info_cache.rb (Gem::cache_data): Added
+ rescue block to capture bad file loads. The original rescue was
+ only around the marshal load (bug was probably introduced when the
+ file data was preloaded into a string).
+ (Gem::set_cache_data): Added set_cache_data to be used during
+ testing to avoid reload the cache file over and over.
+
+ * lib/rubygems/gem_commands.rb: Added require for command class so
+ that this file can be loaded independently.
+
+ * lib/rubygems/source_index.rb (Gem::SourceIndex::outdated): Minor
+ cleanup.
+
+ * test/gemutilities.rb
+ (RubyGemTestCase::util_setup_source_info_cache): Minor cleanup
+
+ * test/test_gem_source_info_cache.rb
+ (TestGemSourceInfoCache::test_write_cache_user): Switched to using
+ set_cache_data here and several other places to avoid rereading
+ the cache data over and over again.
+
+2007-02-02 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/gem_commands.rb:
+ Fixed gem unpack (broken since 0.9.1)
+
+2007-01-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache.rb (Gem::SourceInfoCache#cache_data):
+ Read the source_cache in binary mode for mswin.
+
+2007-01-16 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Released 0.9.1.
+
+2007-01-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb (Gem::Installer#extract_files): Only allow
+ installation to absolute directories. (Call File::expand_path first).
+ More informative message for attempting to install with bad path.
+ * post-install.rb: Install sources first, since its rather important.
+
+2007-01-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_info_cache.rb: require 'fileutils', as its
+ needed.
+
+2007-01-12 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb (Gem::Installer#extract_files): Don't
+ allow gems to place files outside the installation directory. Fixes
+ bug 7751 by Gavin Sinclair.
+
+2007-01-08 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/specification.rb
+ (Gem::Specification::test_suite_file): Added rescue clause for
+ default_executable.
+ (Gem::Specification::add_bindir): Added rescue clause for
+ add_bindir.
+
+ * test/test_specification.rb
+ (TestSpecification::test_pathologically_bad_non_array_stuff_doesnt_goof_up_files):
+ Added a sanity check on hash for some pathologically bad case.
+ (TestSpecification::test_pathologically_bad_exectuables_doesnt_goof_up_hash):
+ Added sanity check for pathologically bad executables field.
+
+2007-01-08 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/gem_commands.rb (Gem::PristineCommand#execute): Better
+ messaging.
+ * lib/rubygems.rb, lib/rubygems/custom_require.rb: Correctly include
+ documentation for methods added to Kernel.
+
+2007-01-07 Eric Hodel <drbrain@segment7.net>
+
+ * Rakefile: Include GPL.txt. Fixes bug #7572 by David Lee.
+
+2007-01-06 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+ 0.9.0.9.
+
+ * lib/rubygems/specification.rb
+ (Gem::Specification::test_suite_file): Rewrote default_executable
+ to be a bit more explicit.
+ (Gem::Specification::add_bindir): Rewrote the 'files' accessor to
+ handle pathologically bad input.
+ (Gem::Specification::copy_of): Added as_array private method.
+
+ * Rakefile (package_version): Added '*.out' to clobber list.
+ Removed the broken-1.0.0.gem file from the clobber list.
+
+ * test/test_specification.rb
+ (TestSpecification::test_default_executable):
+ Seriously beefed up tests for certain specification issues.
+
+ * test/gemenvironment.rb (TestEnvironment::create): Added the 'f'
+ flag to deleting 'gemhome'.
+
+2006-12-30 Eric Hodel <drbrain@segment7.net>
+
+ * post-install.rb, lib/rubygems/server.rb: RubyGems now installs RDoc
+ and ri for itself.
+
+2006-12-28 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb (Gem::Installer#build_extensions):
+ Extension build failures now raise Gem::Installer::ExtensionBuildErrors.
+
+2006-12-26 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/package.rb (Gem::Package::TarInput#initialize): Bad
+ packages now raise FormatError instead of a generic RuntimeError.
+ * lib/rubygems/installer.rb (Gem::Installer#install): Raise an
+ InstallError when we have a bad gem file.
+
+2006-12-25 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/custom_require.rb (Gem::GemPathSearcher::find):
+ Removed SUFFIX_PATTERN. Evidently this was miss during an earlier
+ attempt to remove it.
+ (Gem::GemPathSearcher::matching_file): Changed reference to
+ SUFFIX_PATTERN into a call to Gem.suffix_pattern.
+
+ * Removed tab characters from numerous source files.
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): Removed
+ stray tab characters.
+
+ * lib/rubygems.rb (Kernel::require_gem): Added file and line
+ number information to require_gem worning (makes it easier to
+ track down those offending lines of code).
+ (Kernel::location_of_caller): Added helper function to determine
+ file and line number of caller.
+
+2006-12-25 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb (Gem::Installer#app_script_text):
+ Simpler, more readable bin script.
+ * lib/rubygems/gem_commands.rb (Gem::PristineCommand#execute):
+ Regenerate bin scripts. This will clean up require_gem in scripts.
+
+2006-12-24 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#fetch_path):
+ Rescue various errors and return a more-friendly error.
+
+2006-12-23 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/command.rb lib/rubygems/gem_commands.rb: Make help
+ output fit in 80 columns.
+ * lib/rubygems/rubygems_version.rb: Bump version to 0.9.0.8, beta
+ time! (Oops, didn't go into beta.)
+
+2006-12-20 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#fetch_size): Give
+ a sensible error on bad URIs.
+ * lib/rubygems/gem_commands.rb (Gem::SourceCommand): Allow management
+ of sources in source_cache. Fixes bug #1128.
+ * lib/rubygems.rb (Kernel#require_gem): Add deprecation warning in
+ favor of gem.
+
+2006-12-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb (Gem::ExtBuilder): Refactored for
+ uniformity.
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller#specs_n_sources_matching): Don't display gems
+ that can't be installed.
+ * lib/rubygems.rb, pre-install.rb: Fix installation errors on 1.9.
+ Fixes bug #4536 by Ryan Davis.
+ * lib/rubygems/source_index.rb, lib/rubygems/gem_commands.rb,
+ lib/rubygems-custom_require.rb: Use File.join with glob strings.
+ Fixes bug #1096 submitted by Chad Fowler.
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller#install_dependencies): Make --force actually
+ force. Fixes bug #7365 by Robert James.
+
+2006-12-18 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/gem_commands (Gem::OutdatedCommand): Add a way to see
+ which gems are out-of-date.
+
+ * setup.rb: Ignore errors for .config and InstalledFiles when
+ the source path is read-only/NFS. Fixes bugs #1395 and #1374. Patch
+ by Ryan Davis.
+
+ * bin/gem_server: Pull code out into lib/rubygems/server.rb for
+ reusability. Closes Feature Request #2220 by Chris Morris.
+
+2006-12-16 Chad Fowler <chad@chadfowler.com>
+
+ * test/: Added functional test for extension gems proving that
+ non-compiling extensions don't result in success message.
+
+ * lib/rubygems/specification.rb: Raise exception if loaded spec is
+ nil. Closes bug #7299.
+
+ * test/gemenvironment.rb: Clean out gemhome every time to avoid dirty
+ directory failing tests.
+
+ * lib/rubygems/installer.rb: Change uninstall to require a full gem
+ name (not a partial match). Fixes bug #6007 and related unreported
+ issues.
+
+2006-12-15 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller): Correctly uninstall
+ executables if GEM_HOME is set. Patch #2264 by Sylvain Joyeux.
+
+ * lib/rubygems.rb (Gem::loaded_specs): Expose list of currently loaded
+ gems.
+
+ * lib/rubygems/gem_commands (Gem::UninstallCommand): Allow multiple
+ gems to be uninstalled at once.
+
+2006-12-14 Eric Hodel <drbrain@segment7.net>
+
+ * post-install.rb: Don't attempt to read unreadable files. Fixes
+ bug #2851.
+
+2006-12-13 Eric Hodel <drbrain@segment7.net>
+
+ * pre-install.rb.rb, post-install.rb: Don't call manage_gems because
+ we don't have sources installed yet. Bump version requirement to
+ 1.8.2 since rubygems/open-uri.rb was removed. Should fix bug #6206.
+
+ * lib/rubygems/installer.rb (Gem::Installer#build_extensions): Capture
+ stderr into results when building extensions.
+
+ * lib/rubygems/gem_commands.rb (Gem::ContentsCommand): Allow version
+ to be passed to gem contents. Not backwards compatible, -v now -V and
+ vice versa. Select newest gem for contents. Fixes bugs #2723, #7225.
+ Patches by Sava Chankov, Tom Pollard.
+
+ * lib/rubygems/gem_commands.rb (Gem::InstallCommand#execute): Allow
+ install errors to result in non-zero exit code. Fixes bug #2773.
+
+2006-12-03 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#install):
+ Add :cache_dir option to override the default.
+
+ * lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#download_gem):
+ Check cache to see if the gem has been cached before downloading.
+
+2006-12-02 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems.rb (Gem::OperationNotSupportedError::suffixes,
+ Gem::OperationNotSupportedError::suffix_pattern): Removed
+ duplicate copies of the SUFFIX_PATTERN by providing a global
+ method Gem.suffixes and Gem.suffix_pattern.
+
+ * lib/rubygems/remote_fetcher.rb (Gem::open_uri_or_path): Reworked
+ the connection options for the open-uri call. Since we are not
+ using the rubygems supplied open_uri, we can use some new options
+ available that make proxy handling much easier.
+ (Gem::file_uri): Renamed is_file_uri to file_uri?.
+
+ * lib/rubygems/loadpath_manager.rb (Gem::LoadPathManager::self):
+ Added .jar to list of suffixes.
+
+ * test/functional.rb (FunctionalTest::test_env_remotesources):
+ Changed test to uses Gem.sources (the sources method on
+ remote_fetcher was removed).
+
+ * test/test_remote_fetcher.rb (TestRemoteFetcher): Renamed some of
+ the test constants and instance variables so that they were more
+ consistent and explained the tests a wee bit better.
+ (TestRemoteFetcher::test_no_proxy): Added assert_data_from_server
+ and assert_data_from_proxy to make it clear what the test was
+ doing and give better error messages on errors.
+ (TestRemoteFetcher::assert_data_from_server): Added
+ assert_data_from_server.
+ (TestRemoteFetcher::assert_data_from_proxy): Added
+ assert_data_from_proxy.
+
+2006-11-30 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/open-uri.rb: Removed the duplicated library.
+
+2006-11-30 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification (Gem::Specification#eql?): Allow gemspecs
+ to be used intelligently with Array#- and Array#uniq.
+
+ * lib/rubygems/installer.rb: Return extension-building results in
+ Exception on build failure.
+
+ * lib/rubygems/remote_installer.rb: Ensure gems with similar names
+ cannot be matched for install. (Broken when searching was removed
+ from RemoteInstaller.)
+
+2006-11-29 Eric Hodel <drbrain@segment7.net>
+
+ * post-install.rb: Now requires rbconfig.
+
+ * lib/rubygems/specification.rb, lib/rubygems/version.rb: Fixed many
+ ivar warnings due to YAML specs.
+
+ * lib/rubygems/validator.rb, lib/rubygems/validator.rb
+ (Gem::Validator#unit_test Gem::RemoteInstaller::): Ensure the
+ current directory is restored.
+
+ * lib/rubygems/remote_fetcher.rb, lib/rubygems/remote_installer.rb,
+ lib/rubygems/installer.rb: Raise more-friendly and less-deadly errors.
+
+ * lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#install):
+ Create version requirement correctly.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller#find_gem_to_install): Allow RemoteInstaller to
+ work with SilentUI.
+
+ * lib/rubygems/remote_fetcher.rb (RemoteFetcher#open_uri_or_path):
+ Don't double-require open-uri.
+
+2006-11-27 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/specification.rb
+ (Gem::Specification#default_executable): Fixed bug where @executables
+ could be nil when loaded from index.
+
+2006-11-21 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/source_index.rb (Gem::SourceIndex#latest_specs): Grab
+ the latest versions of everything in the index. Written by Ryan
+ Davis.
+
+2006-11-20 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems/cmd_manager.rb: Added PristineCommand
+
+ * lib/rubygems/gem_commands.rb: Added PristineCommand to restore
+ gems to pristine condition in the event of files begin deleted
+ based on the cached .gem file
+
+2006-11-19 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/*_fetcher.rb: Removed code specific to remote source
+ index updating.
+
+ * lib/rubygems/remote_installer.rb (Gem::RemoteInstaller#search):
+ Moved to Gem::SourceInfoCache#search
+
+ * lib/rubygems/source_info_cache.rb: Taught to update itself
+
+ * lib/rubygems/source_info_cache_entry.rb: Taught to update itself
+
+ * lib/rubygems/source_index.rb: Taught to update itself from a uri.
+
+2006-11-18 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/installer.rb: Applied Kevin Clark's patch to make
+ RubyGems recognize mkrf files.
+
+2006-11-17 Eric Hodel <drbrain@segment7.net>
+
+ * test/test_remote_fetcher.rb: Don't allow files in Dir.pwd to make
+ tests fail. Spotted by Chad Fowler.
+
+ * lib/rubygems/remote_installer.rb (Gem::RemoteFetcher,
+ Gem::CacheFetcher): Break out of remote_installer.rb into separate
+ files.
+
+ * lib/rubygems/remote_installer.rb (Gem::SourceInfoCache,
+ Gem::SourceInfoCacheEntry): Allow requiring just the source cache
+ without the remote fetcher.
+
+2006-11-16 Eric Hodel <drbrain@segment7.net>
+
+ * test/test_local_cache.rb: Moved to better name
+
+ * test/test_gem_source_info_cache.rb: Renamed test methods to match
+ implementations. Sorted test names.
+
+ * lib/rubygems/remote_installer (Gem::SourceInfoCache): cache_data no
+ longer resets dirty flag. Sped up source cache loading. Exposed
+ cache file name in use.
+
+2006-11-15 Eric Hodel <drbrain@segment7.net>
+
+ * test/, lib/: Made files -w clean.
+
+ * test/: Made tests run independently.
+
+ * Rakefile: Tests now run with warnings on.
+
+2006-11-14 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/user_interaction.rb (Gem::StreamUI#progress_reporter):
+ Fix for Gem.configuration.verbose = nil, false
+
+ * lib/rubygems.rb (Gem::configuration): Fix RakeFileUtils pollution.
+
+2006-10-05 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/installer.rb (Gem::Installer::shebang): Updated to
+ optionally call env_shebang if the command line option is set.
+ (Gem::Installer::shebang_env): Added this method.
+
+2006-09-25 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+ 0.9.0.6.
+
+ * lib/rubygems/security.rb (Gem::Security::Exception): Added
+ permissions for cert files and directories.
+ (Gem::Security::Policy::verify_gem): File.exists? => File.exist?
+ (Gem::Security::self.verify_trust_dir): Beefed up code to create
+ trust directory structure.
+ (Gem::Security::self): Apply permissions when creating trust
+ files.
+
+ * lib/rubygems/package.rb (TarInput::initialize): File.exists? =>
+ File.exist?
+
+2006-09-24 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems.rb
+ (Gem::OperationNotSupportedError::configuration): Added
+ method_missing to configuration hash to allow nicer reference
+ syntax.
+
+2006-09-22 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::initialize): Proxy patch fixup to
+ escape user/password from Anatol Pomozov.
+ (Gem::RemoteSourceFetcher::connect_to): Proxy patch fixup to
+ escape user/password from Anatol Pomozov.
+
+ * test/test_remote_fetcher.rb (TestRemoteFetcher::setup): Proxy
+ patch fixup to escape user/password from Anatol Pomozov.
+ (TestRemoteFetcher::test_no_proxy): Proxy patch fixup to escape
+ user/password from Anatol Pomozov.
+
+ * test/io_capture.rb (Gem::IoCapture): Created new IoCapture
+ module to handle capturing output of code under test.
+
+ * test/test_installer.rb
+ (TestInstaller::test_generate_bin_symlinks_win32): Removed ugly
+ $TESTING hack and substituted new io capture module.
+ (TestInstaller::test_install_with_message): Removed one-off stdout
+ capture and replaced with new IO Capture module.
+
+2006-09-19 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+ 0.9.0.3.
+
+ * test/test_version_comparison.rb (TestRequirementEquality): Added
+ more tests for Dependency equality testing and one additions check
+ for requirement vs non-requirement equality.
+
+ * lib/rubygems/version.rb (Gem::Dependency::==) Fixed '=' bug in
+ '==' code.
+
+2006-09-18 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/remote_installer.rb
+ Only show the last 3 gem versions on a multiplatform remote
+ install list.
+
+2006-09-18 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller::install): Added Hugh Sasse's patch for
+ skipping gems on install.
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to 0.9.0.2.
+
+ * lib/rubygems/version.rb (Gem::Dependency::hash): Added hash code
+ --http-proxy, the ENV var http_proxy and with no proxy.
+
+2006-08-26 Jim Weirich <jim@weirichhouse.org>
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller::download_gem): Fixed download_gems so that
+ it properly passes the proxy option to the fetcher class. (based
+ on patch by Andy Shen).
+
+2006-08-12 Jim Weirich <jim@weirichhouse.org>
+
+ * bin/index_gem_repository.rb (Indexer::sanitize): Added a
+ sanitize step to the gem index generation in the hope of avoiding
+ problems with non-ASCII names in the yaml data.
+
+2006-06-14 Jim Weirich <jim@weirichhouse.org>
+
+ * Rakefile (announce): Added 1.9 hack for ENV['CERT_DIR']. Remove
+ this in the future if 1.9 behavior changes.
+
+2006-06-13 Jim Weirich <jim@weirichhouse.org>
+
+ * Rakefile: ENV['CERT_DIR'] is now '' rather than nil.
+
+ * lib/rubygems/specification.rb (Gem::Specification::initialize):
+ Eric added some 1.9 compatibility code (funcall vs send).
+
+ * lib/rubygems/package.rb (TarOutput::self): Eric added some 1.9
+ compatibility code (funcall vs send).
+
+ * experimental/deployment.rb (Gem::Deployment): Moved the
+ deployment code out of the live code base into the experimental
+ directory. The code wasn't used and the tests were not all
+ passing.
+
+2006-06-11 Jim Weirich <jim@weirichhouse.org>
+
+ * bin/gemri: Added gemri to bin directory.
+
+ * lib/rubygems/custom_require.rb (Gem::GemPathSearcher::find):
+ Added .rbw to suffix pattern in custom_require.
+
+2006-06-07 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems.rb: Added copyright notices to all Ruby files.
+
+2006-04-07 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_commands.rb (Gem::RDocCommand::execute): Added
+ RI option to the rdoc subcommand.
+
+2006-04-05 Jim Weirich <jim@weirichhouse.org>
+
+ * test/test_parse_commands.rb
+ (TestParseCommands::test_parsing_update_options): Fixed unit tests
+ to assert that the install dir is expanded.
+
+ * lib/rubygems/doc_manager.rb (Gem::DocManager::generate_ri):
+ Break out from generate_rdoc to support installing all RI docs
+ first.
+
+ * lib/rubygems/gem_commands.rb
+ (Gem::InstallUpdateOptions::add_install_update_options): Expanded
+ repository directory to absolute path.
+ (Gem::InstallCommand::execute): Make sure that *all* of the RI
+ documents are generated before generating any RDocs (due to a bug
+ in the RDoc library).
+
+ * lib/rubygems/installer.rb (Gem::ExtExtConfBuilder::self): Fixed
+ typo in ExtExtConfBuilder that prevented C based gems to install.
+ (Gem::ExtExtConfBuilder::self): Installed patch to prevent the
+ overriding of target_prefix in native extensions (thanks to Aaron
+ Patterson for the patch).
+
+2006-04-04 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped to version
+ 0.8.11.10.
+
+ * lib/rubygems/incremental_fetcher.rb
+ (Gem::IncrementalFetcher::update_cache): Now falls back to bulk
+ updates if the number of gems if over 50.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::source_index): Added "bulk" to the
+ update message to differentiate it from the incremental message.
+
+ * lib/rubygems/specification.rb
+ (Gem::Specification::Specification): Modified to add dashes to
+ gemspecs generated under Ruby 1.8.3. This makes it easier to run
+ RubyGems on a 1.8.2 system.
+
+2006-04-01 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/doc_manager.rb (Gem::DocManager::run_rdoc): Changed
+ exception handler to print error message if document generation
+ fails, but then to continue with the rest of the installation.
+ Permission errors still terminate the install because if one
+ install fails because of permission problems, chances are that all
+ will fail.
+ (Gem::DocManager::install_ri): Removed wrapping of exceptions with
+ DocumentError. Most exceptions now don't propagate out of
+ run_rdoc.
+ (Gem::DocManager::install_rdoc): Removed wrapping of exceptions
+ with DocumentError. Most exceptions now don't propagate out of
+ run_rdoc.
+
+2006-02-23 Jim Weirich <jim@weirichhouse.org>
+
+ * bin/index_gem_repository.rb (MasterIndexBuilder::cleanup): Fixed
+ bug where we were trying to read the index file (to compress it)
+ before it was closed, often leading to a truncated index file.
+
+Tue Jan 24 16:26:13 2006 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/config_file.rb
+ Luca Pireddu reported a fatal error when permissions on
+ .gemrc were too restrictive. Fixed.
+
+Tue Dec 6 14:51:13 2005 Jim Weirich <jim@tardis>
+
+ * lib/rubygems/source_index.rb
+ (Gem::SourceIndex::load_specification): Added an untaint call to
+ make the code run in SAFE=1 mode under 1.8.3.
+ (Gem::SourceIndex::load_gems_in): Untaint here too.
+
+ * lib/rubygems/installer.rb (Gem::Installer::install): Untaint
+ here too.
+ (Gem::Installer::extract_files): Untaint here too.
+
+ * lib/rubygems/custom_require.rb
+ (Gem::GemPathSearcher::matching_file): Untaint here too.
+
+ * test/gemenvironment.rb: Added $SAFE=1 to the test environment to
+ make sure we can run in $SAFE mode.
+
+2005-12-03 Jim Weirich <jim@tardis>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Bumped version to
+ 0.8.11.6'
+
+ * lib/rubygems/user_interaction.rb
+ (Gem::StreamUI::SimpleProgressReporter::done): Added several new
+ progress reporters.
+
+ * lib/rubygems/command.rb
+ (Gem::Command::specific_extra_args_hash): Added --verbose
+ processing.
+
+ * lib/rubygems/config_file.rb (Gem::ConfigFile::handle_arguments):
+ Added --traceback as alias for --backtrace (I always get them
+ confused).
+ (Gem::ConfigFile::initialize): Added a verbose option.
+
+2005-11-28 Jim Weirich <jim@tardis>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::SourceInfoCacheEntry::replace_source_index): Fixed the
+ SourceIndexCacheEntry so that it will manufacture an empty source
+ index if given a nil value for the +si+ value.
+
+2005-11-08 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems.rb: Ara Howard's fix to allow 0.0.0 to be a valid gem
+ version.
+
+2005-11-08 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: Fixed bug in gem unpack. It was
+ sorting incorrectly, resulting in the wrong version being unpacked in
+ some edge cases. Thanks to Jakob Skjerning for the detailed bug report.
+
+2005-11-03 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/installer.rb: Fixed bug that would cause the executables
+ from the wrong gem to be uninstalled if the names matched the same
+ regex. Thanks Eric Hodel.
+
+2005-11-01 Jim Weirich <jim@tardis>
+ * lib/rubygems/gem_commands.rb (Gem::UpdateCommand::initialize):
+ Upgrade => Update change.
+ (Gem::UpdateCommand::execute): Upgrade => Update change.
+ (Gem::UpdateCommand::execute): Upgrade => Update change.
+
+2005-11-01 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: Allow gem unpack to accept a gem file
+ path instead of gem name: gem unpack mygem-1.0.0.gem.
+
+2005-10-31 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/installer.rb: Tilman Sauerbeck's patch to support
+ extensions built with Rake!
+
+2005-09-13 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/package.rb (TarInput::initialize): Removed
+ requirement for SSL when signatures are found in a gem. Only
+ require SSL if the security policy requires checking the
+ signatures.
+
+ * lib/rubygems/custom_require.rb (Kernel::require): Disabled
+ autorequire during custom require.
+
+2005-09-07 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_openssl.rb (Gem::ensure_ssl_available): Added a
+ test in gem_openssl to make sure the ruby portion of ssl is also
+ loaded.
+
+2005-08-31 Jim Weirich <jim@weirichhouse.org>
+
+ * Rakefile (install): Changed the rake install task to use setup.rb.
+
+2005-07-08 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/remote_installer.rb: Applied Daniel Roux's patch
+ to make RubyGems work with authenticating proxies.
+
+2005-07-08 Jim Weirich <jim@weirichhouse.org>
+
+ * Preparing for release 0.8.11.
+
+2005-06-12 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/installer.rb
+ (Gem::Installer::installation_satisfies_dependency): Refactored
+ dependency check into ensure_dependency! and
+ installation_satisfies_dependency?.
+
+2005-06-12 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems.rb,lib/rubygems/installer.rb: Applied Mark Hubbart's
+ * lib/rubygems/remote_installer.rb: Applied David Glasser's install-
+ * Applied Paul Duncan's incredibly complete gem signing patch.
+ Thanks, Paul!
+ * lib/rubygems/installer.rb: Fixed bug in installer that caused
+ dependency installation not to work.
+
+2005-06-06 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/specification.rb: Fixed Erik hatcher's reported bug
+ of gem directories having "-" at the end of their names (e.g.
+ "BlueCloth-1.0.0-".
+
+2005-06-01 Jim Weirich <jim@weirichhouse.org>
+
+ * scripts/specdoc.rb (_resolve_links): Updated to generate hieraki
+ format so it can be included in the docs.rubygems.org site.
+
+ * test/test_specification.rb (TestSpecification::test_to_ruby):
+ Fixed test on date that hard-coded a specific date.
+
+2005-05-29 Jim Weirich <jim@weirichhouse.org>
+
+ * Changes from the Seattle Code fest: (1) Package list command
+ (e.g. gem inspect GEM). (2) .gemrc settings now allow cvsrc like
+ options to set defaults per subcommand. (3) The autorequire spec
+ attribute will now accept a list. (4) Binwrappers vs symlinks
+ (more info to follow). (5) Substituted Time for Date in specs,
+ increasing performance dramatically in an important area.
+
+2005-05-04 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems.rb (Gem::Exception::find_home): Changed rescue
+ clause from Exception to StandardError. Exception doesn't seem to
+ catch everything ... I'm not sure I understand why.
+
+2005-04-29 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/specifiation.rb: Marcel Molina's patch to discover
+ which attributes in the spec are Array attributes.
+
+2005-04-27 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: -y is now a synonym for
+ --include-dependencies
+
+2005-04-21 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/installer.rb: Added non-require_gem dependency check
+ for installation.
+
+2005-04-03 Chad Fowler <chad@chadfowler.com>
+
+ * pre-install.rb: Added version check to RubyGems installation.
+
+2005-03-25 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/rubygems_version.rb (Gem): Created release for
+ 0.8.10.
+
+ * lib/rubygems/gem_commands.rb
+ (Gem::UpdateCommand::do_rubygems_update): Update --system now runs
+ the ruby command directly rather than trying to load the
+ update-rubygems command. There were too many things to go wrong
+ with the old way.
+
+2005-03-24 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller::find_dependencies_not_installed): Fixed to
+ reload source index before attempting to detect dependencies.
+
+2005-03-23 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller::find_dependencies_not_installed): Switched
+ to using SourceIndex#find_name to detect missing dependencies,
+ avoiding a gem activation during an install.
+
+ * lib/rubygems/installer.rb (Gem::Installer::install): Removed
+ activate call from install step. If we need to do something about
+ dependencies at this time, then we need a better way to do them.
+
+ * lib/rubygems.rb: Removed the require for rubygems/timer.
+
+2005-03-16 Jim Weirich <jim@weirichhouse.org>
+
+ * test/gemenvironment.rb (TestEnvironment::create): Added require
+ on gem/builder.
+
+ * lib/rubygems/source_index.rb (Gem::SourceIndex::initialize):
+ Allowing default argument to new to be an empty hash.
+ (Gem::SourceIndex::from_installed_gems): Refactored into a class
+ method that invokes a instance method.
+ (Gem::SourceIndex::refresh): Refresh now does a complete reload
+ from disk. This should be more accurate that the earlier version.
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): removed
+ unneeded refresh!.
+
+ * lib/rubygems.rb (Gem::Exception::source_index): Removed
+ automatic refresh from Gem.source_index ... it wasn't reliable
+ when removing installed gems.
+ (Gem::Exception::activate): Added detection of previously loaded
+ gems.
+
+2005-03-15 Chad Fowler <chad@chadfowler.com>
+
+ * bin/gem_server: (htonl) rdoc opens in existing browser window.
+
+2005-03-14 Jim Weirich <jim@weirichhouse.org>
+
+ * Released 0.8.8
+
+2005-03-14 Jim Weirich <jim@weirichhouse.org>
+
+ * Released 0.8.7
+
+2005-03-13 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/installer.rb (Gem::Installer#shebang): Refactored and
+ stripped result to avoid ^M issues.
+
+2005-03-11 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_commands.rb (Gem::DependencyCommand): Added a
+ new command "gem dependency" to show the dependencies of an
+ installed gem.
+
+ * lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
+ Added DependencyCommand to the command manager registrar.
+
+ * lib/rubygems/version.rb (Gem::Requirement): Unnested Requirement
+ from the Version class. There was no benefit to having it nested.
+ Gem::Version::Requirement is set to point to the new class so to
+ be compatible with old gems.
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::ask_if_ok): Changed
+ uninstaller confirm message to read 'Continue with uninstall'.
+ Its clearer that way.
+
+ * lib/rubygems.rb (Gem::Exception::required_location): Switch to
+ use SourceIndex#find_name rather than search. Made sure a nil
+ value is returned with a path is not found.
+
+ * lib/rubygems/source_index.rb (Gem::SourceIndex::search): Changed
+ parameter name to gem_pattern to emphasize using Regex in search.
+ (Gem::SourceIndex::find_name): Added find_name to handle the
+ common case of searching for an exact match on the short name.
+
+ * lib/rubygems.rb (Gem::Exception::activate): Make sure that
+ activate more closely adheres to honoring the auto_require=>false
+ request.
+ (Gem::Exception::report_activate_error): Out of line error
+ reporting for activate.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller::find_dependencies_not_installed): Found
+ another location that was using require_gem with auto_require.
+ Fixed to use :auto_require=>false.
+
+ * lib/rubygems/gem_commands.rb
+ (Gem::InstallUpdateOptions::add_install_update_options): Added
+ --ignore-dependencies option. Still needs to be wired to logic.
+
+ * lib/rubygems/installer.rb (Gem::Installer::install): Added call
+ to require_gem_with_options.
+
+ * lib/rubygems.rb (Kernel::require_gem_with_options): Added to
+ allow easier specification of the autorequire flag for
+ Gem.activate.
+
+2005-03-10 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::normalize_uri): Normialize a URI to
+ start with http:// if it does not already.
+
+ * test/test_deployment.rb (TestDeployment::xtest_deploy_sources):
+ Disabled this test. It is part of the new deployment software and
+ is not working yet.
+
+2005-03-09 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/gemconfigure.rb (Gem::self): Added to aid dynamic
+ versioning.
+
+ * lib/rubygems/command.rb (Gem::Command::command_manager): Moved
+ command_manager to base class.
+
+ * lib/rubygems/gem_commands.rb (Gem::CleanupCommand::execute):
+ Both implicit and explicit gems now work with cleanup.
+
+2005-03-08 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
+ Fixed source index to be loaded from the installed gems when doing
+ an "OK TO REMOVE" dependency check.
+
+2005-03-06 Rich Kilmer <rich@infoether.com>
+ * lib/rubygems/deployment.rb: beginning of a deployment capability
+
+ * test/test_deployment.rb: first tests of new deployment system
+
+2005-03-04 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: Small bugfix for the case when you
+ pass in a gem name (or more) to cleanup for the cleanup command.
+
+2005-03-04 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::ok_to_remove):
+ Reworked logic in uninstall to be intelligent about dependencies.
+ We only complain about dependencies if removing a gem will cause a
+ dependency error. The uninstaller now checks for :ignore, :all
+ and :executables options.
+
+ * lib/rubygems/cmd_manager.rb (Gem::CommandManager::initialize):
+ Registered Cleanup command.
+
+ * lib/rubygems/gem_commands.rb (Gem::CleanupCommand): Added
+ Cleanup command to gem.
+ (Gem::UninstallCommand::initialize): Added --all, --ignore and
+ --executables options to uninstall. This helps to avoid excessive
+ YESes all the time.
+
+2005-02-28 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::LocalSourceInfoCache::write_cache): Open cache file in
+ binary mode.
+
+2005-02-28 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/config_file.rb: don't warn about not being able to
+ find config file.
+ * lib/rubygems/doc_manager.rb: (for DHH) don't install rdoc docs for
+ * lib/rubygems/gem_commands.rb: Print which gems are updated on 'gem
+ update'. If --system is used, report that the rubygems system
+ software has been updated.
+ * lib/rubygems/installer.rb: Cleaned up the uninstall has_dependents
+ logic and output. It was misleading and buggy before.
+
+2005-02-27 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/config_file.rb
+ (Gem::ConfigFile::default_config_file_name): Fixed bug in finding
+ home directory for the .gemrc file.
+
+2005-02-27 Chad Fowler <chad@chadfowler.com>
+
+ * Released 0.8.6
+
+ * Fixed a small bug with shebang construction
+
+2005-02-26 Jim Weirich <jim@weirichhouse.org>
+
+ * Released 0.8.5
+
+ * lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+ Removed warning about generating rdocs on gems w/o an rdoc flag.
+
+ * lib/rubygems/gem_commands.rb
+ (Gem::UpdateCommand::do_rubygems_update): Added --system option to
+ update to specifically update the version of rubygems.
+ (Gem::UpdateCommand::which_to_update): Fixed some refactoring bugs
+ in the which_to_update method.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::LocalSourceInfoCache::read_cache): switched to Marshal
+ rather than Yaml for local cache.
+
+ * bin/gem: Added requirement for Ruby >= 1.8.0.
+
+2005-02-10 Chad Fowler <chad@chadfowler.com>
+ * bin/gem_server: Added Martin Ankerl's wonderful new gem_server
+ template
+
+2005-01-27 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: Fixed
+ `gem update` so it accepts a list of gems to update and _only_
+ updates those.
+ * lib/rubygems/installer.rb: Fixed a bug in the new shebang code.
+ * lib/rubygems/remote_installer.rb: Attempt to fix Curt Hibbs'
+ reported Proxy bug without actually having a proxy to test with.
+
+2005-01-22 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/custom_require.rb: Lyle Johnson's fix for Bug #1379
+
+2005-01-20 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/validator.rb: Applied Austin Ziegler/Kasper Schiess's
+ patch to fix unit test running bug.
+
+2005-01-14 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/installer.rb: attempt at fixing Ryan Davis's
+ reported Shebang bug. STILL NOT WORKING, because it doesn't work
+ with ^M characters.
+ * lib/rubygems/config_file.rb: small but ugly error fixed if no
+ config file exists.
+ * lib/rubygems/remote_installer.rb: Fixed bug http://rubyforge.org/tracker/index.php?func=detail&aid=1331&group_id=126&atid=575.
+
+2005-01-01 Chad Fowler <chad@chadfowler.com>
+ * Released 0.8.4
+
+2004-12-31 Jim Weirich <jim@weirichhouse.org>
+
+ * Rakefile: Switch to standard Rake test tasks.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::read_data): Added a retry to try a
+ lower case gem name if the open failed. This fixes a problem
+ where case differences are preventing some gems from installing.
+
+2004-12-29 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
+ Changed the RemoteInstaller to take an options hash rather than
+ individual options. This will leave the interface more resilient
+ to changes as more options are added
+ (e.g. --install_dependencies).
+
+ * lib/rubygems/specification.rb (Gem::Specification): Marked array
+ attributes explicitly. This allows for explicit conversion to
+ arrays when assigned.
+
+ * test/test_specification.rb
+ (TestSimpleSpecification::test_array_attributes): Added test for
+ array_attributes forcing values to arrays.
+
+2004-12-28 Jim Weirich <jim@tardis>
+
+ * lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
+ Fixed the Ryan Davis patch to work correctly when directories are
+ not writable.
+
+2004-12-18 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/version.rb: Erik Veenstra's sort patch.
+ * lib/rubygems.rb: Ryan Davis's installation bug fix.
+
+2004-12-14 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * test/test_loadmanager.rb: invalidated it as a unit test; it's
+ incompatible with custom_require.rb.
+
+2004-12-12 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/custom_require.rb: simple bug fix.
+
+2004-12-12 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/custom_require.rb: new file to replace
+ loadpath_manager.rb and speed up the custom require functionality.
+
+ * lib/rubygems/timer.rb: new file; simple benchmarking tool that's
+ useful at the moment but needn't stay in RubyGems permanently.
+
+ * lib/rubygems/source_index.rb: include Enumerable and implement #size
+ and #length.
+
+ * lib/rubygems/specification.rb: removed lazy initialisation of
+ attributes to reduce #copy_of invocations; folded
+ Specification.copy_of into Specification#copy_of.
+
+ * lib/rubygems.rb: require 'rubygems/custom_require' instead of
+ 'rubygems/loadpath_manager'; removed out of date documentation; added
+ "require 'rubygems/timer'" to temporarily assist with benchmarks.
+
+2004-12-07 Jim Weirich <jim@weirichhouse.org>
+
+ * Released 0.8.3
+
+2004-12-06 Jim Weirich <jim@weirichhouse.org>
+
+ * test/test_specification.rb
+ (TestLegacyYamlSpecification::test_load): Fixed test to avoid the
+ __FILE__ stuff. Running tests from rakefile guarantees that the
+ file paths start from the right location.
+
+ * pkgs/sources/sources.gemspec: Made Gem.sources_spec idempotent.
+
+ * lib/rubygems/specification.rb (Gem::Specification::initialize):
+ Added @@gather to Gem::Specification to facilitate proper loads.
+ (Gem::Specification::Specification): Added Specification.load.
+
+ * lib/rubygems/source_index.rb (Gem::SourceIndex): Fixed comments
+ 'long name' => 'full name'.
+
+ * lib/rubygems/gem_commands.rb (Gem::BuildCommand::load_gemspecs):
+ Changed to use Gem.Specification.load.
+
+ * Rakefile: Added sources-*.gem to clobber list.
+ (egrep): Upgraded the DBG finder to include breakpoint.
+
+ * post-install.rb (install_sources): Using block version of chdir.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::LocalSourceInfoCache::read_cache): Fixed initialization of
+ cache.
+
+ * lib/rubygems.rb: Updated version to 0.8.2.
+
+2004-12-04 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::LocalSourceInfoCache::writable_file): Now just returns the
+ selected cache file (which was selected based on writability).
+ (Gem::LocalSourceInfoCache::try_file): Added try_file to determine
+ if a file is a candidate for a cache file.
+ (Gem::LocalSourceInfoCache::select_cache_file): Added failure if
+ there are not valid cache file candidates.
+
+ * lib/rubygems.rb (Gem::Exception): Renamed @@cache to
+ @@source_index.
+ (Gem::Exception::source_index): Renamed Gem.cache to
+ Gem.source_index (but left cache as an alias).
+
+2004-12-03 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb (Gem::LocalSourceInfoCache):
+ Added a local cache manager object to implement the read/write
+ policies on the system and user cache files.
+ (Gem::LocalSourceInfoCache::update): Added update and flush to the
+ caching fetcher so that it knows when it needs to update the local
+ cache files.
+ (Gem::RemoteInstaller::initialize): Switched to using a cached
+ fetcher in the remote installer. All the caching logic was
+ removed from the installer. User writable cache files are now
+ supported.
+ (Gem::RemoteInstaller::write_gem_to_file): write_gem_to_file now
+ will create the path if needed.
+
+2004-12-02 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/package.rb (TarInput::zipped_stream): To workaround
+ a problem with earlier than 1.2.1, we read the zipped data into a
+ string, and then return an IO object on that string.
+ (TarInput::each): Refactored getting a stream to the zipped data
+ into <tt>zipped_stream</tt>.
+
+2004-12-01 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::convert_spec): We now proprocess the
+ yaml string data to reduce it in size. This was done to
+ workaround a problem with large YAML files (although it is just a
+ temporary fix because our yaml data keeps growing and growing).
+
+ * Rakefile: Added more targets to the clobber target.
+
+ * test/test_remote_fetcher.rb
+ (TestRemoteFetcher::test_explicit_proxy): Added tests for proxy
+ support.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::connect_to): Refactored to add proxy
+ support.
+
+2004-11-28 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/loadpath_manager.rb: Added Mauricio's patch to work
+ around string contains null byte issue.
+
+2004-11-27 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteSourceFetcher::get_size): Switched from open-uri with
+ early abort to an HTTP.head call to get the size of the yaml file
+ on the server.
+
+2004-11-26 Jim Weirich <jim@weirichhouse.org>
+
+ * test/test_specification.rb
+ (TestDefaultSpecification::test_defaults): Added test for some
+ basic defaults in a gem spec.
+
+ * test/test_remote_installer.rb (MockFetcher::source_info): Made
+ the fake test data more realistic.
+ (TestRemoteInstaller::test_source_info): Improved tests.
+
+2004-11-26 Jim Weirich <jim@tardis>
+
+ * test/test_remote_installer.rb (MockFetcher): Added MockFetcher
+ to make testing the remote installer easier. Currently there are
+ two remote installer test classes. Eventually TestRemoteInstaller
+ will succeed RemoteInstallerTest, which is very incomplete.
+
+ * test/test_package.rb (TC_TarReader::TC_TarInput): Made the unit
+ test ignore the setgid bit. The setgid bit doesn't work on my
+ laptop for some reason. This may be a problem with my laptop
+ rather than with this code. Should investigate further.
+
+ * lib/rubygems/remote_installer.rb (Gem::RemoteSourceFetcher):
+ Added a Fetcher object to the remote installer to handle all the
+ details of getting the remote information. This allows testing
+ the logic of the remote installer without actually doing remote
+ calls.
+ (Gem::RemoteInstaller::sources): Renamed get_caches to
+ source_info. The problem is that cache is too generic and there
+ are actually several things that we will cache in the system.
+
+ * lib/rubygems/cache.rb (Gem::Cache::self): Changed interface to
+ from_installed_gems slightly.
+ (Gem::Cache::self): Reordered rescue clauses so that the syntax
+ exception might actually be handled.
+
+ * lib/rubygems.rb (Gem::Exception::ensure_gem_subdirectories):
+ Dumped the check_gem_subdirectories method to use the almost
+ identical ensure_gem_subdirectories method.
+ (Gem::Exception::ensure_gem_subdirectories): Only attempt to
+ create the gem subdirectories if we can actually write them.
+
+ * bin/gem_server: Added date of last file modification to header
+ of /yaml. This is in preparation for using a head command with
+ date/time stamping in fetching the source cache.
+
+2004-11-25 Ryan Davis <ryand@zenspider.com>
+ * lib/rubygems.rb: Added GEM_SKIP functionality, which will tell
+ loadpath_manager not to load specific libs from gems. For
+ testing/ development purposes. Created by Ryan Davis.
+
+2004-11-24 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/specification.rb: Allow multiple authors per gem.
+ * lib/rubygems/gem_commands.rb: command line error message if you
+ run 'gem install' with no args.
+ * lib/rubygems/loadpath_manager.rb: Fixed @specs bug as reported by
+ Lothar Schulz on ruby-talk.
+
+2004-11-07 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems.rb,lib/rubygems/installer.rb,lib/rubygems/cache.rb
+ lib/rubygems/remote_installer.rb,lib/rubygems/gem_commands.rb:
+ Fixes to make non-root installation work properly. Still need to
+ fix uninstallation.
+ * lib/rubygems/gem_commands.rb: Allow multiple gems/gem names on the
+ command line for install.
+
+2004-10-31 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/version.rb,test/test_version_comparison.rb: Patrick May's
+ * post-install.rb: Patrick May's fix for rubygems lib not being found
+ during install.
+
+2004-10-29 Chad Fowler <chad@chadfowler.com>
+ * packages/,pkgs,install.rb: renamed "packages" to "pkgs" to avoid
+ * remote_installer.rb: Added user-agent reporting for remote
+ operations
+ * setup.rb,install.rb,bin/update_rubygems: removed install.rb and
+ added setup.rb and post-install.rb. Changed update_rubygems so that
+ params passed to it can be passed on to setup.rb
+
+2004-10-25 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/installer.rb
+ (Gem::Uninstaller::remove_executables): Corrected spelling of
+ "addtion".
+
+2004-10-24 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/version.rb (Gem::Version::Requirement::self): Now
+ properly handles arrays of version constraints.
+
+ * lib/rubygems/loadpath_manager.rb
+ (Gem::LoadPathManager::Gem::Specification): Added comments
+ describing the fast Spec class purpose. Added to_s to
+ Gem::Specification (both fast and slow versions).
+ (Gem::LoadPathManager.paths): Returns (cached) list of gem paths.
+ (Gem::LoadPathManager::self): Refactored to use glob_over in
+ search_loadpaths and search_gempaths.
+
+ * lib/rubygems/installer.rb: Added some requires.
+
+ * lib/rubygems/cache.rb (Gem::Cache::refresh): Fixed refresh! to
+ call load_specification on the Cache class, not on itself.
+
+ * lib/rubygems.rb (Gem::Exception::activate): added comments to
+ activate. Also made sure that partial name matches in the gem
+ cache search were avoided.
+ (Gem::Exception::clear_paths): Added code to clear the gem cache
+ when reseting the gem paths.
+ (Gem::Exception::require): Added a function to take a gem name and
+ a library file name (in that gem) and return a path to the library
+ in the gem. David HH was interested in this in order to speed up
+ some require statements under ModRuby. Eventually I hope we won't
+ need these special tricks.
+ (Gem::Exception::latest_partials): Fixed bug that assumed exactly
+ three digits in a version number.
+
+ * Rakefile (egrep): Added two tasks to find all the FIXME/TODO
+ markers in the source code comments and to find the DBG print
+ lines.
+
+2004-10-23 Jim Weirich <jim@weirichhouse.org>
+
+ * test/test_specification.rb
+ (TestSimpleSpecification::test_add_bindir_to_list_of_files):
+ Verify that an executable doesn't need the bindir if bindir is
+ set.
+ (TestSimpleSpecification::test_no_bindir_in_list_of_files): Added
+ test the verify that exectuable can be written without a default
+ binder.
+
+ * lib/rubygems/installer.rb
+ (Gem::Installer::generate_bin_scripts): Added check so that the
+ bindir is access only when there are actually executables to
+ install. Checking for an installable bindir was giving permission
+ errors when installing test gems.
+
+2004-10-21 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/installer.rb: Show extension build errors during install
+ in addition to logging them to gem_make.out
+
+2004-10-02 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/validator.rb,lib/rubygems/gem_commands.rb: Added
+ --test option for "gem check" that runs unit tests on already-
+ installed gems.
+
+2004-09-30 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems/specification.rb - externalized the loaded_from runtime
+ var on specification
+ * lib/rubygems/cache.rb - optimized cache refresh! method and refactored
+ processing of files when building cache.
+ * lib/rubygems/loadpath_manager.rb - fixed bug in loadpath manager in
+ finding native extensions that have ext on os x, win32 and solaris
+
+2004-09-20 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: If file match during local install is
+ a directory, don't try to treat it erroneously as a gem (bug reported
+ by Rich).
+ * lib/rubygems.rb: Fixed small bug in #latest_load_paths
+
+ (NOTE: It looks like 0.8.0/0.8.1 was released in this timeframe)
+
+2004-09-14 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems.rb: Fixed bug in require_gem (thanks Jamis Buck!)
+ that would require a gem based on an inexact search of its name
+ in the local cache. This caused copland-webrick to be loaded
+ when a request was made for "copland".
+
+2004-09-12 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/specification.rb, test/test_specification.rb: Removed
+ library_stubs attribute.
+
+2004-09-12 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * scripts/specdoc.rb: Check that all attributes are documented; and
+ improved formatting.
+ * scripts/specdoc.yaml: test_suite_file -> test_files; finished
+ documentation.
+ * scripts/specdoc.data: misc changes.
+
+2004-09-11 Chad Fowler <chad@chadfowler.com>
+
+ * test/test_parse_commands.rb: Fix failing unit tests due to Rich's fix from
+
+ * lib/rubygems/specification.rb: Add bindir to executable path on file list
+
+2004-09-11 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems/gem_commands.rb - got rid of stub options
+
+ * lib/rubygems/install.rb - changed output of messages so the UI would format
+ better
+
+ * bin/gem_server - exit! from ^c
+
+2004-09-09 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/loadpath_manager.rb: Small bug when gem specs have ruby
+ version requirements.
+ * lib/rubygems/specification.rb, lib/rubygems/gem_commands.rb: Fixed failing
+ functional test.
+
+2004-09-08 Chad Fowler <chad@chadfowler.com>
+ * install.rb: added stub removal to the install process
+
+2004-09-06 Chad Fowler <chad@chadfowler.com>
+ * test/test_package.rb: Fixed failing unit test as per Mauricio's email to
+ the rubygems list.
+ * Fixed minor issues with Windows cmd file generation.
+
+2004-09-06 Rich Kilmer <rich@infoether.com>
+ * lib/rubygems/remote_installer.rb - enabled caching of source caches
+ based on the size of the yaml.Z/yaml file.
+
+2004-08-29 Chad Fowler <chad@chadfowler.com>
+ * /lib/rubygems/gem_command.rb: small big fix for local gem installs
+ on Windows.
+
+2004-08-28 Rich Kilmer <rich@infoether.com>
+
+ * /lib/rubygems/installer.rb, /lib/rubygems/doc_manager.rb,
+ /lib/rubygems/cmd_manager.rb - Added an exception: FilePermissionError
+ which checks to ensure write access to the install/uninstall/rdoc
+ destination directories and raises a nice error instead of the standard
+ one.
+
+2004-08-28 Rich Kilmer <rich@infoether.com>
+
+ * /lib/rubygems/installer.rb - commented out stub addition and removal
+
+2004-08-28 Rich Kilmer <rich@infoether.com>
+
+ * /lib/rubygems.rb, /lib/rubygems/loadpath_manager.rb -
+ this adds all the loadpath_manager stuff with the 'ultimate require hack' to
+ rubygems.rb. Also, require_gem methods body has been extracted into a method
+ Gem.activate that differs in the calling signature in that the second param is
+ a boolean that determines whether to autorequire or not.
+
+2004-08-27 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems/user_interaction - added ask_yes_no as a method
+ which returns true/false and formats/processes the [yn] stuff.
+ it also has an optional second parameter of true/false for the
+ default value.
+
+ * lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
+ lib/rubygems/command_manager.rb - changed all places where ask
+ was used with [Yn] to ask_yes_no
+
+2004-08-24 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/installer.rb: Library stubs are now installed as per
+ 'library_stubs' gemspec attribute. A stub is (still) also installed
+ for the 'autorequire' attribute. All library stub handling
+ refactored into two new classes: LibraryStubs and LibraryStub.
+
+ * test/test_parse_commands.rb: as per 2004-08-17 below, the 'update'
+ command takes --rdoc as its default now.
+
+2004-08-22 Rich Kilmer <rich@infoether.com>
+ * lib/rubygems/installer.rb: fixed stub generation...i added the version
+ stuff that only app stubs should have...sorry!
+
+2004-08-17 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb: --rdoc is default on 'update' command,
+ consistent with 'install'. 'default_str' methods changed to reflect
+ --rdoc being default now.
+
+2004-08-21 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: Proper checking for gems in local
+ directory on local install. rescue Gem::LoadError to avoid ugly
+ backtrace.
+ * lib/rubygems/installer.rb: created Gem::LoadError to hold extra
+ metadata. Setting up for proper dependency installation on local
+ installs.
+
+2004-08-20 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/specification.rb: Fixed small bug in the previous spec
+ change commit.
+
+ * lib/rubygems/cache.rb: Prevent catastrophic failure if a gemspec is
+ corrupted.
+
+ * lib/rubygems/installer.rb: Fixed (in not a great way) a bug that would
+ cause a zero-length spec file to be written to the gem specifications
+ directory.
+
+2004-08-19 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/specification.rb: #files auto-includes any #extensions,
+ #extra_rdoc_files, #test_files, etc. that weren't explicitly added
+ to the file list.
+
+2004-08-18 Chad Fowler <chad@chadfowler.com>
+
+ * lib/rubygems/specification.rb: One more bug with #test_files.
+ Default value of [] wasn't set, resulting in an attempt to call
+ #empty? on nil.
+
+ * lib/rubygems/gem_commands.rb: Unit tests appear to be working now.
+ Still more testing to do.
+
+ * lib/rubygems/remote_installer.rb, lib/rubygems/installer.rb: Fixed
+ minor bugs in default selections for questions asked during
+ installation and uninstallation
+
+2004-08-17 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/specification.rb:
+ - #test_suite_file and #test_files now work on older gems.
+ - Added Specification.from_yaml for loading YAML gemspecs
+ - #to_ruby doesn't emit 'specification_version'
+
+ * lib/rubygems/gem_commands.rb: Updated test-on-install code to use
+ Specification#test_files instead of #unit_test_suite.
+
+ * lib/rubygems/old_format.rb: Use Specification.from_yaml
+ * lib/rubygems/package.rb: Ditto
+
+2004-08-17 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/command.rb: --debug option to turn on $DEBUG
+ * lib/rubygems/config_file.rb: ditto
+
+2004-08-11 Rich Kilmer <rich@infoether.com>
+ * lib/rubygems/installer.rb: The application stub now defaults to
+ the latest version of the library, and optionally allows an initial
+ parameter conforming to _VERSION_ to be passed to select a prior
+ version of the library (this initial parameter, if present, is shifted
+ off of ARGV). This change was re-added...I erased it somehow :(
+
+2004-08-11 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb:
+ - 'gem spec X' displays spec for _latest_ version of X. Added
+ '--all' option if you want to see all versions.
+ - RDocCommand code cleanup and slight change: document _all_
+ versions of the gem by default, not just the first.
+
+ * lib/rubygems/doc_manager.rb: removed 'kilmer' default template
+ option and obsolete error message.
+
+2004-08-12 Chad Fowler <chad@chadfowler.com>
+ * Added "gem rdoc" command for generating docs for already-installed
+ gems
+
+2004-08-11 Rich Kilmer <rich@infoether.com>
+ * bin/generate_yaml_index: updated to work with new gem format (and use the Gem::Format
+ class to read). Will deploy after testing on RubyForge.
+ * lib/rubygems/gem_commands.rb: generate rdoc by default on installs (I think this is
+ just good practice.
+ * lib/rubygems/remote_install.rb: raise an exception if dependent gems cannot be found
+ on remote_install
+
+2004-08-11 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/gem_commands.rb: query is now case insensitive (as it used to be)
+ * lib/rubygems/installer.rb: gem_make.out wasn't being written when an extension failed to compile.
+
+2004-08-11 Rich Kilmer <rich@infoether.com>
+
+ * removed String.to_requirement...we should not modify
+ base classes in Ruby! modified to get rid of said to_requirement
+ with Gem::Version::Requirement.create(obj)
+
+ * specification.rb - fixed constructor bug of version requirement...
+ it now defaults to Requirement.default
+
+2004-08-11 Chad Fowler <chad@chadfowler.com>
+
+ * One more specification.rb bug fixed.
+
+2004-08-11 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/specification.rb:
+ - Added convenience class methods: attribute_names,
+ attribute_defaults, default_value, required_attributes, and
+ required_attribute?.
+
+ - IMPORTANT: attribute readers now use lazy initialization, just
+ like some of them did before the 2004-08-01 change. This was done
+ to fix the breakage when loading older gemspecs.
+
+ - IMPORTANT: replaced instance variable access with attribute reader
+ method calls in many cases. This is in line with the above change.
+
+ - Good documentation for the "attribute" method.
+
+ - Renamed _copy -> _copy_of.
+
+ * lib/rubygems/cache.rb:
+ - Some fairly shallow changes. Exception handling needs improvement.
+
+ * lib/rubygems/version.rb:
+ - (Version.create) new method (for convenience)
+ - (Version::Requirement.create) new method (for convenience)
+ - (Version::Requirement.default) new method (for consistency)
+
+ * test/test_specification.rb: test attribute_names instead of
+ attributes. Other "class convenience" methods remain to be tested
+ at this stage. Also added test classes for legacy gemspecs.
+
+ * test/data/legacy/keyedlist-0.4.0.ruby: added.
+ * test/data/legacy/keyedlist-0.4.0.yaml: added.
+
+2004-08-06 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/specification.rb:
+ - Added convenience class methods: attribute_names,
+ attribute_defaults, default_value, required_attributes, and
+ required_attribute?.
+
+ - IMPORTANT: attribute readers now use lazy initialization, just
+ like some of them did before the 2004-08-01 change. This was done
+ to fix the breakage when loading older gemspecs.
+
+ - Good documentation for the "attribute" method.
+
+ - Renamed _copy -> _copy_of.
+
+ * test/test_specification.rb: test attribute_names instead of
+ attributes. Other "class convenience" methods remain to be tested
+ at this stage.
+
+2004-08-01 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/specification.rb:
+ - (Re)defined class methods: attribute, attributes,
+ required_attribute, read_only, overwrite_accessor. @@attributes
+ contains a list of attribute names and default values. This
+ allows higher-level specification of gemspec attributes, and the
+ handling of them in a DRY fashion.
+
+ - to_yaml_properties now includes all properties, to ensure
+ correct deserialization of a Gem::Specification object.
+
+ - #to_ruby and #to_yaml_properties rewritten to use @@attributes
+
+ - Introduced 'specification_version' attribute and three constants:
+ NONEXISTENT_SPECIFICATION_VERSION, CURRENT_SPECIFICATION_VERSION, and
+ SPECIFICATION_VERSION_HISTORY. This allows us to track changes to
+ the spec format.
+
+ - Refactored several "helper" methods, using the new class method
+ 'attribute_alias_singular', which provides a "singular" alias for
+ a "plural" attribute (e.g. require_path and require_paths).
+
+ - All gemspec attributes now defined in a uniform fashion, which
+ implies that they all have valid instance variables on
+ initialization. Previously, some attributes were lazily
+ initialized.
+
+ - Introduced attribute 'library_stubs', to allow the specification
+ of several stub files. (That feature not implemented, though.)
+
+ - Introduced attribute 'test_files' and deprecated 'test_suite_file'.
+
+ - Provided #warn_deprecated stub of a method, but don't know what to
+ do with it.
+
+ - Deprecated #has_test_suite? in favour of (new) #has_unit_tests?
+
+ - Used overwrite_accessor to provide special behaviour for the
+ setting of some attributes.
+
+ - The 'date' attribute is now a Date object. We don't need high
+ resolution, and Time objects, being system-dependent, are not nice
+ to deal with.
+
+ - Various code style changes.
+
+ - Summary: uniform treatment of gemspec attributes; reduced code by
+ refactoring; 'test_suite_file' deprecated for 'test_files';
+ 'library_stubs' introduced; spec versioning introduced.
+
+ * lib/rubygems/version.rb: (Dependency) added #to_s, #==, and an
+ alias (requirements_list -> requirement_list).
+
+ * test/test_specification.rb: several new tests: _singular_attributes,
+ _deprecated_attributes, _defaults, _to_{yaml,ruby}_and_back,
+ _directly_setting_dependencies_doesnt_work, and more. Plus a new
+ class to give Specification a more thorough workout (TestSpecificationComplex).
+
+ * scripts/runtest.rb: require 'pp' so it's always available in unit
+ tests.
+
+2004-07-30 Rich Kilmer <rich@infoether.com>
+
+ * lib/rubygems/installer.rb The application stub now defaults
+ to the latest version of the library, and optionally allows
+ an initial parameter conforming to _VERSION_ to be passed
+ to select a prior version of the library (this initial
+ parameter, if present, is shifted off of ARGV).
+
+ * lib/rubygems/version.rb correct? is now a class method on
+ Version enabling Gem::Version.correct?(...)
+
+ * lib/rubygems/install.rb make it so uninstalling a gem will
+ not remove executables if another version of that gem is
+ installed and needs those executables
+
+2004-07-26 Jim Weirich <jim@tardis>
+
+ * lib/rubygems.rb (Gem::Exception::latest_load_paths): Added
+ latest_load_paths and refactored all_load_paths to use common
+ code.
+
+2004-07-25 Rich Kilmer <rich@infoether.com>
+ * fixed bug in using --source in command.rb (removed short -s version)
+
+ * changed spec to use the RUBY_PLATFORM for Platform::CURRENT
+
+ * added ability to choose from list of available gems on remote install
+ if (1) some of the gems are binary and (2) there are move than one.
+ If the gems are all source gems, the latest is selected.
+
+2004-07-25 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems.rb (Gem::Exception::all_load_paths): Added
+ all_load_paths utility function.
+
+ * bin/update_rubygems: Added a command to update the gem
+ installation based on a update gem.
+
+ * Rakefile: Pulled package file list out into a constant so it can
+ be reused between the package command and the gem package command.
+ Added a gem package target to support rubygems updates.
+
+2004-07-22 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/version.rb:
+ * (Requirement#initialize) initialize @version to avoid warning
+ * (Dependency#initialize) initialize @version_requirement to avoid
+ warning
+
+2004-07-19 Chad Fowler <chad@chadfowler.com>
+ * install.rb: Shebang line should point to the ruby version used during
+ installation.
+
+2004-07-19 Assaph Mehr <assaph@avaya.com>
+ * lib/rubygems/command.rb, packages/sources/lib/sources.rb: Added
+ command-line-configurable sources.
+
+2004-07-18 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/validator.rb: Fixed a bug that would cause "managed"
+ files to appear to be unmanaged due to differences in how the paths
+ were formatted.
+
+2004-07-17 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb (InstallCommand#execute): removed clear
+ bug (name -> gem.name).
+
+2004-07-14 Rich Kilmer <rich@infoether.com>
+ * added old_format.rb which is used in the (hack) in format.rb
+ to detect the older version of a gem, and if present, switches
+ to that class instead.
+ * fixed the ARGV passing in bin/gem to ingore args past -- which
+ are used for passing params to source gems (extconf.rb)
+
+2004-07-13 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/installer.rb, lib/rubygems/package.rb,
+ lib/rubygems/format.rb, test/test_package.rb: Added Mauricio
+ Fernandez's patch to replace old gem format with tar.gz format.
+ Fixed some failing unit tests that resulted. Still a couple left.
+ * lib/rubygems.rb: Fixed a bug introduced by the previous patch.
+
+2004-07-13 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems.rb: (#require_gem) added the ability to do
+ "require_gem 'rake/packagetask'", for instance, which is a
+ shortcut for "require_gem 'rake'; require 'rake/packagetask'".
+
+2004-07-13 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb: refactored --version option
+ in all cases to the new VersionOption module.
+
+2004-07-13 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/cmd_manager.rb: added 'unpack' command.
+
+ * lib/rubygems/gem_commands.rb (UnpackCommand): added.
+
+ * lib/rubygems/installer.rb (Installer#unpack): added.
+
+2004-07-09 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/user_interaction.rb (Gem::StreamUI::ask and
+ Gem::StreamUI::choose_from_list): Added flush before each gets.
+
+2004-07-05 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/command.rb (Gem::Command#defaults_str): added.
+
+ * lib/rubygems/command.rb (Gem::Command#create_option_parser):
+ Defaults for the options are included in the parser output.
+
+ * lib/rubygems/gem_commands.rb: all commands which have options
+ and defaults now have #defaults_str implemented.
+
+2004-07-05 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/command.rb (Gem::Command#create_option_parser):
+ Make the argument and option sections optional. They are only
+ printed if there are options or arguments defined.
+
+2004-07-05 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb:
+ - scrubbed up the 'help' command a bit, removing its options
+ - added information to 'help commands'
+
+2004-07-04 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb:
+ - modified generic help and examples
+ - improved 'list' and 'search' help, and fixed bug in 'search'
+
+ * lib/rubygems/cmd_manager.rb:
+ - explicit support for top-level commands --help and --version
+ - no more support for --examples and --commands
+
+2004-07-04 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * lib/rubygems/gem_commands.rb:
+ - added 'list' and 'search' commands ('list' is no longer an alias
+ for 'query')
+ - modified return value from all 'arguments' methods (see command.rb)
+
+ * lib/rubygems/cmd_manager.rb: added 'search' command.
+
+ * lib/rubygems/command.rb:
+ (Command#create_option_parser): enhanced the option parser for 'help'
+ display
+ (Command#remove_option): added (to support 'list' and 'search')
+
+ * Rakefile: added 'gem' target. Runs "local" (not installed) command
+ and libraries.
+
+2004-07-04 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * Rakefile: added 'install' target.
+
+ * lib/rubygems/cmd_manager.rb: code formatting.
+
+ * lib/rubygems/gem_commands.rb:
+ - refactored common install and update options into new module
+ InstallUpdateOptions
+ . consolidated option pairs (e.g. --test & --no-test ==> --[no-]test)
+ . --gen-rdoc is now --rdoc
+ - (UninstallCommand) corrected typo
+ - (InstallCommand) corrected output with local install
+
+ * test/test_parse_commands.rb: :%s/--gen-rdoc/--rdoc/g
+
+2004-07-03 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_commands.rb (Gem::InstallCommand::initialize):
+ Added --no-gen-rdoc and --no-test to allow the user to override
+ .gemrc default options.
+
+ * lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+ Concatenate the local rdoc options to the end of the spec's rdoc
+ options.
+ (Gem::DocManager::configured_args): Added configured_args as a
+ place to store local rdoc options.
+
+ * lib/rubygems/gem_runner.rb (Gem::GemRunner::do_configuration):
+ Configuration handled in do_configuration now.
+ (Gem::GemRunner::do_configuration): Set the local rdoc
+ configuration from the config file.
+
+ * lib/rubygems/command.rb (Gem::Command::handles): Added a
+ handles? method to Command so that we can detect which extra
+ arguments can be used with a command.
+ (Gem::Command::add_extra_args): New method to add the config
+ file's extra arguments to the front of the argument list.
+ (Gem::Command::extra_args): Added extra_args to Command class to
+ hold the extra args discovered in the config file.
+
+ * Rakefile: Added TEST=filename option to all the test targets.
+
+ * test/functional.rb (FunctionalTest::test_gemrc): Added
+ functional test for gemrc.
+
+ * scripts/gemdoc.data: Added an example to the specification command.
+
+ * lib/rubygems.rb (Gem::Exception::manage_gems): Added gem_runner
+ and config_file to manage_gems.
+ (Gem::Exception::use_paths): use_paths now accepts (and ignores)
+ nil parameters.
+
+ * bin/gem: Make Gem::GemRunner the top level object. It now
+ creates and calls the CommandManager /after/ the arguments are
+ processed.
+
+ * Rakefile: Added test/data/gemhome to clobber list.
+
+2004-07-01 Jim Weirich <jim@weirichhouse.org>
+
+ * test/test_specification.rb
+ (TestSpecification::test_rdoc_files_included): Test for rdoc files
+ included in file list. Test for redundent file removal.
+
+ * lib/rubygems/specification.rb (Gem::Specification::validate):
+ Added gem version to validation requirement. Added normalize to
+ remove redundent files in lists.
+
+ * lib/rubygems/gem_commands.rb (Gem::InfoCommand::usage): Added
+ usage and arguments methods for InfoCommand.
+ (Gem::SpecificationCommand::usage): Fixed several usage comments.
+
+2004-06-30 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_commands.rb (Gem::InstallCommand::usage):
+ Upcased the comment on the usage statement (and corresponding
+ option). This makes the variable part of the command
+ (e.g. GEMNAME) stand out from the static parts.
+
+ * lib/rubygems/cmd_manager.rb (Gem::CommandManager::process_args):
+ Downcased commands before searching (allows upper case or mixed
+ case for commands on command line).
+
+ * install.rb (install_rb): Fixed bug where the installer falsely
+ triggered the old repository upgrade when the directory part of
+ the file contained the matching "-digits." pattern. Now the
+ pattern must be in the file's base name.
+
+2004-06-26 Gavin Sinclair <gsinclair@soyabean.com.au>
+
+ * scripts/specdoc.rb: added (to generate gem specificiation document)
+ * scripts/specdoc.data: added (supports specdoc.rb)
+ * scripts/specdoc.yaml: added (supports specdoc.rb)
+
+2004-06-27 Jim Weirich <jim@weirichhouse.org>
+
+ * scripts/gemdoc.data Removed extraneous <em> marker.
+
+ * lib/rubygems/specification.rb
+ (Gem::Specification::satisfies_requirement): HA! Caught another
+ version_requirement vs version_requirements error. (I really
+ regret the decision to change that name.)
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::has_dependents):
+ Changed call to alert to alert_warning.
+
+ * lib/rubygems/gem_commands.rb (Gem::UninstallCommand::execute):
+ Again, remove local error handling to allow the error to perculate
+ up the chain to the top level.
+
+ * lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+ Removed one level of exception handling. Only catching RDocErrors
+ at the outermost level. And instead of reporting the error and
+ swallowing it, I convert it to a Gem::DocumentError (with the same
+ error message). This is for better error handling.
+
+ * lib/rubygems/command.rb (Gem::Command::handle_options): Removed
+ exception handling from handle_options. This allows errors to be
+ handled at the top level. Makes for a more consistent error
+ interface.
+
+ * lib/rubygems/doc_manager.rb (Gem::DocumentError): Added
+ DocumentError to wrap RDocErrors (which derive from Exception
+ ... yuck).
+
+ * lib/rubygems/cmd_manager.rb (Gem::RemoteError): RemoteError and
+ LocalInstallationError are now Gem::Exceptions (rather than
+ StandardErrors).
+
+ * lib/rubygems.rb (Gem::Exception): Changed base of Gem::Exception
+ to RuntimeError (was ::Exception). Apps using gem as a library
+ would have to catch Gem::Exceptions explicitly (yuck), or catch
+ Exceptions generically. Catching Exceptions will catch
+ EVERYTHING, including things like SystemExit. By makeing
+ Gem::Exception a RuntimeError, apps can catch RuntimeError or even
+ StandardError.
+
+2004-06-26 Jim Weirich <jim@weirichhouse.org>
+
+ * test/functional.rb (FunctionalTest::test_all_command_helps):
+ Added functional test to show all commands have usage messaegs.
+
+ * lib/rubygems/gem_commands.rb (Gem::HelpCommand::execute): Added
+ version option to help (gem help version).
+ (Gem): Cleaned up the help text. Dropped unneeded verbage.
+
+ * lib/rubygems/cmd_manager.rb
+ (Gem::CommandManager::find_command_possibilities): Added
+ find_command_possibilities to help the Help command look for
+ commands.
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::uninstall): Fixed
+ null pointer bug where a list was destroyed in a method.
+
+ * lib/rubygems/gem_commands.rb (Gem::BuildCommand::load_gemspecs):
+ yaml gemspec files are now accepted by the build command.
+
+ * lib/rubygems/command.rb (Gem::Command::parser): Created an
+ on-demand option parser for all commands.
+ (Gem::Command::handle_options): Command line option hash is now
+ and instance variable with a reader.
+
+ * Rakefile: Linked package version to the value in the rubygems.rb
+ file. The gem env command now shows both gem version (e.g. 0.6)
+ and the package version (e.g. 0.6.1).
+
+2004-06-25 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/gem_commands.rb (Gem::InfoCommand): Dropped the
+ version command (its available via gem env). Added a gem info
+ command to extract the yaml from a gemfile.
+ (Gem::LocalRemoteOptions): Refactored the local/remote options
+ (adding and testing) into a mixin module.
+
+ * test/test_version_comparison.rb
+ (TestDependencies::test_normalization): Added some tests for the
+ normalization issues mentions below.
+
+ * lib/rubygems/version.rb (Gem::Dependency::normalize): Old gems
+ have requirements and dependencies incoded in the Yaml spec in an
+ out of date format. When loaded, they have incorrect instance
+ variables for modern objects. I added a normalize call to handle
+ transforming out dated objects in to modern objects. (Remember
+ this next time we change the data structure of something in the
+ spec file.)
+ (Gem::Version::Requirement::parse): Requirements are comparable
+ now, just so that we can test them with asserts.
+
+ * lib/rubygems/remote_installer.rb
+ (Gem::RemoteInstaller::find_dependencies_not_installed): Fixed
+ recursive call to require_gem to properly pass dependency
+ information.
+
+ * lib/rubygems/installer.rb (Gem::Uninstaller::has_dependents):
+ Fixed reference to version_requirement (needs to be plural).
+
+ * lib/rubygems/command.rb (Gem::Command::invoke): Command now
+ handles it own help messages. Commands no longer have to return
+ true/false to trigger help messages.
+
+ * lib/rubygems/cmd_manager.rb (Gem::CommandManager::process_args):
+ Moved help handling into the help command.
+
+ * lib/rubygems/gem_commands.rb (Gem::HelpCommand): Renamed the
+ base command to HelpCommand and made it handle a lot of the help
+ options. Still need work on individual command helps.
+
+ * test/functional.rb (FunctionalTest::test_env_version): Added a
+ bunch of new functional tests for the environment command.
+
+ * lib/rubygems/gem_commands.rb (Gem::InstallCommand::execute):
+ Made multiple gem names an error for now. Should look at later.
+
+ * lib/rubygems/cmd_manager.rb (Gem::ListCommand): Added list as an
+ alias to query.
+ (Gem::UpdateCommand::initialize): Corrected spelling of install
+ (intall) in several places.
+
+ * bin/gem_server: Added Gem.manage_gems to the gem_server to fix
+ missing requirements.
+
+ * lib/rubygems/cmd_manager.rb (Gem::InstallCommand::initialize):
+ Added missing --both option to install.
+
+ * test/test_command.rb
+ (TestCommand::test_invode_with_bad_options): Catch the termination
+ request.
+
+ * test/mockgemui.rb (MockGemUi::terminate_interaction): Make the
+ mock UI throw an exception when a termination is requested. This
+ makes sure that we don't miss accidental terminations.
+
+ * lib/rubygems/cmd_manager.rb (Gem::CommandManager::find_command):
+ Added find_command to handle best matching command names.
+
+ * test/functional.rb (FunctionalTest::test_build): Updated
+ functional tests to use the new command structure.
+
+ * lib/rubygems/version.rb (Gem::Version::Requirement): Changed the
+ pessimistic version comparison operator to "~>". I like to think
+ of it as "approximately greater than". (It was ">*").
+
+ * bin/gem: Moved gem2 into the standard gem script location. It
+ is now stable enough to use as the standard command.
+
+ * lib/rubygems/cmd_manager.rb (Gem::CommandManager::run): Added
+ run method to trap errors while running commands. Makes for
+ prettier output.
+ (Gem::CommandManager): Move *all* commands to their own classes.
+ Simplified CommandManager. Lowered the coupling between
+ CommandManager and the Commands (the commands don't even need to
+ know about the manager anymore). CommandManager maybe created
+ with "new" for testing (the script will continue to use
+ "instance").
+ (Gem::RubyGemsInfoCommand): New command.
+ (Gem::VersionCommand): New command.
+
+2004-06-24 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/user_interaction.rb (Gem::UserInteraction):
+ Significantly rewrote the whole user interaction scheme. We are
+ now using an UI object that responds to the standard list of UI
+ commands (e.g. say, alert, ask). The UserInteraction module
+ defines all the interaction methods to be forwarded to the default
+ UI objects. The "ui" method returns that default object (and you
+ can use self.ui=(new_ui) to change it). Also the use_ui(new_ui) {
+ } command is convienent for switching the UI object for a short
+ period of time.
+
+2004-06-18 Rich Kilmer <rich@infoether.com>
+ * broke test_cmd_manager.rb into test_parse_commands and
+ test_process_commands to test the parsing of command line options
+ and the funtionality, respectively.
+
+2004-06-18 Rich Kilmer <rich@infoether.com>
+ * added new unit test file: test/test_cmd_manager.rb to test the
+ command manager classes. this is just the first few tests which
+ will be expanded to a full test suite.
+
+2004-06-17 Chad FOwler <chad@chadfowler.com>
+
+ * lib/rubygems/installer.rb: Fixed bug in windows batch file generation
+ which was causing file not found errors.
+ * lib/rubygems/installer.rb: Uninstall now removes scripts and batch
+ * lib/rubygems/specification.rb: Fixed install bug. Thanks to Mark
+ Sparshatt for the fix (via the rubyforge bug tracker).
+
+2004-06-17 Jim Weirich <jim@weirichhouse.org>
+
+ * lib/rubygems/doc_manager.rb (Gem::DocManager::generate_rdoc):
+ Changed rdoc generation to do a chdir into the base source
+ directory and then to use a relative path for all the source
+ files. This makes the generated RDOC html look better and may fix
+ the windows drive/rdoc bug as a side effect.
+
+2004-06-17 Rich Kilmer <rich@infoether.com>
+ * Added ability to capture the UserInteraction with:
+ c = Gem::UserInteraction.capture
+ and then you can override specific methods like 'say':
+ c.on_say {|statement| puts "you said: #{statement}"}
+
+2004-06-15 Rich Kilmer <rich@infoether.com>
+ * Added refactored command handling in rubygems/cmd_manager.rb and a
+ (temporary) bin/gem2 command file to test things out. Once we feel
+ comfortable, we can replace gem with gem2.
+
+2004-06-10 Rich Kilmer <rich@infoether.com>
+ * Isolated all user interaction to pass through module methods on a new
+ Gem::UserInteraction module. Those methods will be the method of abstracting
+ the interaction of RubyGems for use in a GUI-based solution.
+
+2004-06-10 Rich Kilmer <rich@infoether.com>
+ * require 'rubygems' now minimally requires only the files needed
+ for runtime access to gems...not management of gems. To manage
+ gems you now additionally need to execute Gem::manage_gems prior
+ to using the builder/installer/etc. This makes gemspecs not
+ backward compatible unless they add that line to the gemspec
+ after the require 'rubygems' line.
+
+2004-06-10 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * bin/gem: --upgrade-all was broken, probably as a result of the
+ search changes listed below.
+
+2004-06-09 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/remote_install.rb: delegate search functionality to
+ Cache class, bringing remote and local search and list together into
+ one piece of code.
+ * bin/gem, lib/rubygems/validator.rb: move all STDIO work to bin/gem.
+ Validator.alien now returns a hash of ErrorData objects.
+ * bin/gem, lib/rubygems/installer.rb: move most of the STDIO stuff to
+ bin/gem, communicating via exceptions in this case.
+
+2004-06-08 Rich Kilmer <rich@infoether.com>
+ * Fixed the drive problem on win32 (hopefully) so multiple drives
+ should now work. Its still a hack until rdoc is fixed.
+
+2004-06-08 Chad Fowler <chad@chadfowler.com>
+ * Fixed bug caused by method change on Version::Requirement
+
+2004-06-08 Rich Kilmer <rich@infoether.com>
+ * fixed bug in doc_manager.rb whereby the extra_rdoc_files should
+ be appended to the list of directories prior to prepending the
+ full path.
+
+2004-06-08 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * bin/gem_server: List installed gems in [name,version] order.
+
+2004-06-08 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * lib/rubygems/installer.rb: don't warn about not being able to
+ install a library stub if a library stub is already installed.
+ Still warn if it's not a library stub that's there already.
+
+2004-06-08 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * bin/gem: renamed --upgrade-dist to --upgrade--all and fixed bug.
+ * lib/rubygems/installer.rb: fixed bug with Ruby version assertion.
+
+2004-06-07 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/remote_installer.rb, lib/rubygems/version.rb: Fixed old
+ dependency on #version method for Gem::Version::Requirement
+ * bin/gem: new --upgrade-dist option allows one to upgrade every
+ installed gem
+ * lib/rubygems/specification.rb,lib/rubygems/installer.rb: new
+ #required_ruby_version attribute added to gem specification for specifying a
+ dependency on which version of ruby the gem needs. Format it accepts is
+ the same as the Gem::Version::Requirement format.
+
+2004-06-06 Chad Fowler <chad@chadfowler.com>
+ * bin/gem: install_stub is once again the default due to requests.
+
+2004-06-04 Chad Fowler <chad@chadfowler.com>
+ * lib/rubygems/specification.rb, lib/rubygems/doc_manager.rb:
+ Allow arbitrary files to be added for rdoc to run over them (as per
+ Jim's request).
+
+2004-06-04 Chad Fowler <chad@chadfowler.com>
+ * bin/gem: Reformatted --search and --list output such that
+ multiple versions of a gem are compressed into a single entry
+ (with version numbers in parentheses)
+
+2004-05-31 Jim Weirich <jweirich@one.net>
+
+ * lib/rubygems/version.rb (Gem::Dependency): Dependency attribute
+ renamed to version_requirements (made plural).
+ (Gem::Version::bump): Added bump to implement pessimistic
+ operator.
+ (Gem::Version::Requirement): Added pessimistic operator to list of
+ operators. Operators now implemented using lambda.
+
+ * lib/rubygems.rb (Kernel::require_gem): require_gem now takes an
+ array of requirement strings.
+
+ * lib/rubygems/version.rb (Gem::Version::Requirement::initialize):
+ Simplified initialization by making parse a bit smarter.
+ (Gem::Version::Requirement::satisfied_by): Simplified by using
+ all?
+ (Gem::Version::Requirement::satisfy): Added explicit one
+ requirement satisfy test.
+ (Gem::Version::Requirement::parse): parse now returns a two
+ element string array (operator and version string). We don't
+ bother converting to an integer array during parsing.
+
+2004-05-31 18:38 chadfowler
+
+ * gemspec now supports #rdoc_options, to which you can append
+ strings that will be passed to rdoc as additional options.
+
+2004-05-08 21:57 chadfowler
+
+ * Using Gem::RubyGemsVersion to match the release number. If we
+ need to use this as an internal version format specifier in the
+ future, we can use the Gem::Version semantics.
+
+2004-05-30 14:33 gsinclair
+
+ * bin/gem: Split --help into --help (basic), --help-options (what
+ --help used to be), and --help-examples.
+
+2004-04-30 15:57 chadfowler
+
+ * bin/gem: --install-stub is no longer the default ;)
+
+2004-04-30 15:51 chadfowler
+
+ * lib/rubygems/installer.rb: Rich Kilmer (who kicks butt) figured
+ out how to fix the library stub stuff.
+
+2004-04-29 19:12 chadfowler
+
+ * lib/rubygems/doc_manager.rb: Dick Davies fixed a bug in the doc
+ generator.
+
+2004-04-29 13:41 gsinclair
+
+ * lib/rubygems/installer.rb: Added skeleton code and comments to
+ uninstall stub apps and libs
+
+2004-04-29 12:20 gsinclair
+
+ * install.rb: Don't install library stub for 'sources'
+
+2004-04-29 12:20 gsinclair
+
+ * lib/rubygems/installer.rb: Improvements to library stub
+ installation: * don't overwrite existing file (emit warning) *
+ nice warning if there's a permission problem * observe
+ --[no-]install-stub flag (rather, observe the argument to
+ #install)
+
+2004-04-29 12:16 gsinclair
+
+ * bin/gem: --install-stub is now the default
+
+2004-04-26 20:20 chadfowler
+
+ * test/test_remote_installer.rb: Cleaning up after Gavin and his
+ test-breaking self. ;)
+
+2004-04-26 12:06 gsinclair
+
+ * bin/gem, lib/rubygems/installer.rb,
+ lib/rubygems/remote_installer.rb: Installing a gem now causes a
+ library stub to be installed as well, allowing you to require
+ 'package' without knowing it's a gem.
+
+2004-04-25 23:18 chadfowler
+
+ * lib/rubygems/: installer.rb, specification.rb: Prompt user if
+ trying to uninstall a gem that other gems *may* depend on.
+
+2004-04-25 09:27 chadfowler
+
+ * test/test_remote_installer.rb: Changed expected test results to
+ match new (old) gem naming scheme--"ruby" doesn't appear as a
+ platform in the gem name.
+
+2004-04-25 05:50 gsinclair
+
+ * bin/gem: Changed @directory -> @install_dir for clarity
+
+2004-04-25 05:47 gsinclair
+
+ * bin/gem: Improved display of gems, platform-wise
+
+2004-04-25 05:46 gsinclair
+
+ * lib/rubygems/specification.rb: Added documentation
+
+2004-04-25 04:17 jimweirich
+
+ * test/functional.rb: Fixed functional test to properly name a Ruby
+ platform gem.
+
+2004-04-25 04:17 jimweirich
+
+ * packages/sources/.cvsignore, test/data/one/.cvsignore: Ignore the
+ proper gem name.
+
+2004-04-25 04:17 jimweirich
+
+ * lib/rubygems/specification.rb: Undefined several attributes that
+ were redefined to avoid warnings.
+
+2004-04-25 04:17 jimweirich
+
+ * lib/rubygems.rb: Need to initialize @gem_home and @gem_path with
+ ||= to avoid warning.
+
+2004-04-25 03:40 gsinclair
+
+ * lib/rubygems.rb, test/test_gempaths.rb: RUBY_GEMS -> GEM_PATH
+ (environment variable)
+
+2004-04-25 03:33 gsinclair
+
+ * lib/rubygems/specification.rb: Pretty-print the specification
+
+2004-04-25 03:18 gsinclair
+
+ * lib/rubygems/specification.rb: Handle platform in a (hopefully)
+ consistent manner
+
+2004-04-25 03:16 gsinclair
+
+ * install.rb: Use return value from Builder#build to locate gem
+ file
+
+2004-04-25 03:09 gsinclair
+
+ * lib/rubygems/builder.rb: Return file name from #build
+
+2004-04-25 02:32 gsinclair
+
+ * lib/rubygems/specification.rb: Platform goes at the *end* of the
+ full name now.
+
+2004-04-22 06:19 chadfowler
+
+ * test/test_remote_installer.rb: Fixed test to reflect fewer cache
+ sources :(
+
+2004-04-21 17:19 rich
+
+ * lib/rubygems/remote_installer.rb: added support to download the
+ yaml index as a .Z (zlib compressed) file if it exists, then move
+ on to the plain yaml file if it does not
+
+2004-04-20 20:23 chadfowler
+
+ * examples/application/an-app.gemspec, lib/rubygems/format.rb,
+ packages/sources/lib/sources.rb: Committed Dick Davies' patch to
+ fix broken tests.
+
+2004-04-18 01:51 gsinclair
+
+ * bin/gem, lib/rubygems/doc_manager.rb: RDoc generation observes
+ 'rdoc' config file value
+
+2004-04-17 12:15 gsinclair
+
+ * bin/gem: Improved 'build' error output
+
+2004-04-17 12:12 gsinclair
+
+ * lib/: rubygems.rb, rubygems/remote_installer.rb,
+ rubygems/specification.rb, rubygems/validator.rb: All
+ gems-related exceptions now extend Gem::Exception
+
+2004-04-17 12:11 gsinclair
+
+ * lib/rubygems/specification.rb: Improved handling of summary and
+ decription strings - convert to single line
+
+2004-04-17 01:09 gsinclair
+
+ * bin/gem: Prevent remote install attempt if local install was
+ successful
+
+2004-04-17 00:49 gsinclair
+
+ * lib/rubygems/builder.rb: Better formatted the output code
+
+2004-04-16 21:31 gsinclair
+
+ * lib/rubygems/remote_installer.rb: Stoopid coding error (thanks
+ Kent Sibilev)
+
+2004-04-16 00:00 rich
+
+ * lib/rubygems/installer.rb: added code to optionally use nmake
+ instead of make on win32 systems
+
+2004-04-15 20:12 gsinclair
+
+ * bin/gem, lib/rubygems/remote_installer.rb: Clarified proxy
+ handling and interface: --[no-]http-proxy [URL]
+
+2004-04-13 00:16 jimweirich
+
+ * bin/gem, test/bogussources.rb, test/functional.rb: Oops, missed
+ an instance of GEM_PATH in the gem binary.
+
+2004-04-12 21:28 jimweirich
+
+ * lib/rubygems/cache.rb: Oops. Missed a GEM_PATH.
+
+2004-04-12 21:11 jimweirich
+
+ * test/test_remote_installer.rb: removed setting of environment
+ variable for now.
+
+2004-04-12 21:09 jimweirich
+
+ * Rakefile, lib/rubygems.rb, lib/rubygems/cache.rb,
+ lib/rubygems/installer.rb, packages/sources/.cvsignore,
+ scripts/runtest.rb, test/.cvsignore, test/bogussources.rb,
+ test/test_format.rb, test/test_gempaths.rb,
+ test/test_remote_installer.rb, test/test_validator.rb: Added
+ test/temp to the clobber list. Broke out tests into inline to
+ avoid test dependencies on rubygem.
+
+2004-04-12 07:52 chadfowler
+
+ * lib/: rubygems.rb, rubygems/installer.rb,
+ rubygems/remote_installer.rb: Cleaning up output strings wrt
+ formating of "gem (version)".
+
+2004-04-12 07:41 chadfowler
+
+ * lib/rubygems/installer.rb: Gavin Sinclair's uninstall bug.
+
+2004-04-11 15:26 jimweirich
+
+ * test/data/one/: .cvsignore, one-ruby-0.0.1.gem: removed
+ one-ruby*.gem from source control. This gem is automatically
+ generated in testing.
+
+2004-04-11 10:50 chadfowler
+
+ * bin/gem: Gavin Sinclair's test code enhancements
+
+2004-04-11 07:50 chadfowler
+
+ * bin/gem, lib/rubygems/installer.rb,
+ lib/rubygems/remote_installer.rb, lib/rubygems/specification.rb,
+ test/insure_session.rb, test/test_remote_installer.rb,
+ test/data/one/one-ruby-0.0.1.gem: Gavin Sinclair patches to make
+ installer return types less ambiguous.
+
+2004-04-09 10:29 chadfowler
+
+ * lib/rubygems/installer.rb, test/data/one/one-ruby-0.0.1.gem: gem
+ -u input validation patch by Ville Aine
+
+2004-04-07 07:49 chadfowler
+
+ * bin/gem, lib/rubygems/cache.rb, test/data/one/one-ruby-0.0.1.gem:
+ Finally have passing tests.
+
+2004-04-07 07:24 chadfowler
+
+ * lib/rubygems/remote_installer.rb,
+ test/data/one/one-ruby-0.0.1.gem: Allow default option to work on
+ remote dependency prompt.
+
+2004-04-07 07:05 chadfowler
+
+ * lib/rubygems/remote_installer.rb, test/test_remote_installer.rb,
+ test/data/one/one-ruby-0.0.1.gem: Applied George Marrows' patch
+ to remote_install
+
+2004-04-07 06:23 chadfowler
+
+ * bin/gem, test/data/one/one-ruby-0.0.1.gem: No longer "seeing"
+ double on remote searches
+
+2004-04-05 07:39 chadfowler
+
+ * Rakefile, test/test_remote_installer.rb,
+ test/data/one/one-ruby-0.0.1.gem: remote_installer tests aren't
+ completely hosed anymore.
+
+2004-04-05 06:16 chadfowler
+
+ * Rakefile, test/data/one/one-ruby-0.0.1.gem: Rake target for
+ running all tests (unit + functional) "alltests"
+
+2004-04-05 00:48 jimweirich
+
+ * test/: insure_session.rb, data/one/README.one,
+ data/one/one-ruby-0.0.1.gem, data/one/one.gemspec,
+ data/one/lib/one.rb: added for functional tests
+
+2004-04-05 00:48 jimweirich
+
+ * test/functional.rb: Moved session gem detection to insure_session
+ file. Modified functional tests to use gem command. Removed
+ some directory stuff because rake guarantees the starting
+ directory. Added test_info functional test. Added test_build
+ functional test. Added assert status.
+
+2004-04-05 00:48 jimweirich
+
+ * lib/rubygems/remote_installer.rb: Changed exceptions to inherit
+ from RunTimeError
+
+2004-04-05 00:48 jimweirich
+
+ * bin/gem: Changed Installer to RemoteInstaller in rubygems-info.
+
+2004-04-05 00:48 jimweirich
+
+ * Rakefile: Added generated test gem to clobber list. Added
+ functional test target to rakefile.
+
+2004-04-04 21:17 chadfowler
+
+ * packages/sources/lib/sources.rb: Added gems mirror at
+ http://gems.chadfowler.com
+
+2004-04-04 20:51 chadfowler
+
+ * bin/gem, lib/rubygems/remote_installer.rb, test/functional.rb:
+ More improved error messages (don't show stack trace when using
+ bin/gem)
+
+2004-04-04 20:43 chadfowler
+
+ * lib/rubygems/cache.rb: Only read specs that end in "gemspec".
+ The code doesn't handle non-gemspecs very well at all.
+
+2004-04-04 20:15 chadfowler
+
+ * test/mock/gems/specifications/sources-0.0.1.gemspec: [no log
+ message]
+
+2004-04-04 20:09 chadfowler
+
+ * test/mock/gems/gems/sources-0.0.1/lib/sources.rb: Rearranging
+ things a bit
+
+2004-04-04 20:02 chadfowler
+
+ * bin/gem, lib/rubygems/remote_installer.rb, test/bogussources.rb,
+ test/functional.rb: Better error messages on unresolvable host.
+
+2004-04-04 12:50 chadfowler
+
+ * redist/session.gem, test/bogussources.rb, test/functional.rb:
+ Added the beginnings of a functional test suite.
+
+2004-04-03 22:02 chadfowler
+
+ * lib/rubygems/validator.rb: Just had to explicitly rescue
+ VerificationError. All is well.
+
+2004-04-03 22:01 chadfowler
+
+ * lib/rubygems/validator.rb: Mauricio fixed a problem with alien
+ (just failed to update it when we changed the gem directory), but
+ now there's another issue I can't find. Anyway, this fix is
+ obviously needed. But alien is broken anyway.
+
+2004-04-03 21:57 chadfowler
+
+ * install.rb, lib/rubygems/builder.rb: Batsman's bug report and
+ code for the bugs I introduced today. :)
+
+2004-04-03 09:50 chadfowler
+
+ * lib/rubygems/specification.rb: Defaulting a spec's require_path
+ to [] to avoid downstream errors.
+
+2004-04-03 09:06 chadfowler
+
+ * lib/rubygems/builder.rb, test/test_builder.rb: builder now
+ validates the gemspec.
+
+2004-04-03 08:48 chadfowler
+
+ * lib/rubygems/specification.rb, test/test_specification.rb: Added
+ checking for gem specs to make sure they have all required
+ attributes.
+
+2004-04-03 08:06 chadfowler
+
+ * gemspecs/rublog.gemspec: My original rublog gem was broken, in
+ that it didn't have a require_path.
+
+2004-04-02 07:48 chadfowler
+
+ * lib/rubygems/remote_installer.rb: Prompt for installation of
+ dependencies.
+
+ For now, there is a puts/gets in the middle of
+ remote_installer.rb This should probably be cleaned up later
+ (return control flow to the gem program to install the
+ dependencies, for example.
+
+2004-04-02 07:37 chadfowler
+
+ * TODO: [no log message]
+
+2004-04-02 07:34 chadfowler
+
+ * test/: simple_gem.rb, test_format.rb: Some things I forgot to cvs
+ add earlier.
+
+2004-04-02 07:29 chadfowler
+
+ * example/: test.gemspec, lib/test.rb, lib/test/wow.rb: Removing
+ example directory in favor of "examples" directory (just better
+ organized).
+
+2004-04-02 07:26 chadfowler
+
+ * test/test_all.rb: Removed test_all.rb. Rake is obviously a
+ better way to do it.
+
+2004-03-31 19:13 chadfowler
+
+ * lib/rubygems/format.rb, lib/rubygems/installer.rb,
+ lib/rubygems/validator.rb, test/test_all.rb,
+ test/test_validator.rb: More tests and refactoring to support
+ them.
+
+2004-03-30 02:41 rich
+
+ * lib/rubygems/installer.rb: allow passing parameters to extconf.rb
+ with:
+
+ ruby -i blah.gem --local -- --with-option
+
+ everything past the -- will go to the extconf.rb...just like
+ setup.rb
+
+2004-03-30 02:34 rich
+
+ * lib/rubygems/: installer.rb, specification.rb: very initial
+ capability to build source gems. this only lets you build native
+ extensions so long as you do not have to specify --with-
+ directories
+
+2004-03-29 08:31 rich
+
+ * install.rb: switched migration of old gems to new ./gems subdir
+ to use FileUtils rather than ftools...hope to fix reported win32
+ error.
+
+2004-03-29 01:04 rich
+
+ * lib/rubygems/doc_manager.rb: fixed bug in pathing based on new
+ directory structure
+
+2004-03-29 01:03 rich
+
+ * lib/rubygems/remote_installer.rb: fixed bug in default for proxy
+ (should default to nil not true)
+
+2004-03-29 01:03 rich
+
+ * bin/gem: updated with patch to allow for config file with minor
+ difference from gavin's patch which passes a nil to the
+ RemoteInstaller if the proxy does not exist
+
+2004-03-28 23:22 rich
+
+ * install.rb: added code to migrate gems if they are in the old
+ directory structure
+
+2004-03-28 21:30 rich
+
+ * install.rb, lib/rubygems.rb, lib/rubygems/installer.rb,
+ lib/rubygems/specification.rb: changed path of installed gems to
+ be:
+
+ ruby/gems/1.8/gems
+
+ which cleans up the root.
+
+2004-03-28 18:53 chadfowler
+
+ * test/test_all.rb: This is the file to run for all of the tests.
+
+ test_remote_installer is commented out for now. The open URI
+ patch that George gave us makes the code a lot nicer to look at,
+ but a little harder to test.
+
+2004-03-28 18:50 chadfowler
+
+ * lib/rubygems/remote_installer.rb, test/test_cache.rb,
+ test/test_remote_installer.rb: Added some tests for cache search
+
+2004-03-28 12:19 chadfowler
+
+ * bin/gem, lib/rubygems/validator.rb, test/test_validator.rb: Some
+ tests for the validator.
+
+ Made the validator more testable.
+
+2004-03-28 09:30 chadfowler
+
+ * bin/gem, lib/rubygems/validator.rb: Fixed a problem with false
+ alarms in the validator.
+
+2004-03-27 08:23 chadfowler
+
+ * bin/gem: No longer have an option to pass http proxy host into
+ the gem program. Only reads it from the environment. This is
+ because George's patch (and open-uri) work this way, and I'm lazy
+ right now.
+
+2004-03-27 08:17 chadfowler
+
+ * lib/rubygems/remote_installer.rb: George Marrows' nice patch to
+ remove a bunch of code from remote_installer.
+
+ Our remote_installer tests are failing. We really need to start
+ paying attention to the test directory. :(`
+
+2004-03-24 23:26 jimweirich
+
+ * install.rb: Do not install commands ending in ~.
+
+2004-03-24 23:25 jimweirich
+
+ * lib/rubygems/specification.rb: Changed executables from accessor
+ to writer to avoid redefinition.
+
+2004-03-21 21:10 jimweirich
+
+ * bin/gem: fixed uninitialized directory option
+
+2004-03-21 15:34 jimweirich
+
+ * bin/gem: removed carriage returns that screwed up the #! line
+
+2004-03-21 09:02 chadfowler
+
+ * bin/gem: Gavin's bin/gem refactoring.
+
+2004-03-20 17:03 jimweirich
+
+ * bin/gem: added wrapping to gem listing
+
+2004-03-20 12:22 chadfowler
+
+ * install.rb: More cleaning by Gavin Sinclair
+
+2004-03-20 12:08 chadfowler
+
+ * examples/application/an-app.gemspec,
+ examples/application/bin/myapp,
+ examples/application/lib/somefunctionality.rb, lib/rubygems.rb,
+ lib/rubygems/installer.rb, lib/rubygems/specification.rb: Added
+ functionality for installing applications into the system bindir.
+ Needs cleaning and refactoring.
+
+2004-03-20 07:53 chadfowler
+
+ * bin/gem: [no log message]
+
+2004-03-19 23:03 chadfowler
+
+ * bin/gem: More intuitive default.
+
+2004-03-19 10:45 chadfowler
+
+ * bin/gem: * Some minor rearranging of the test stuff so that
+ installation errors will also abort the test run * Don't try to
+ run tests if none are included with the gem
+
+2004-03-18 22:27 chadfowler
+
+ * bin/gem, example/lib/test.rb, lib/rubygems/cache.rb,
+ lib/rubygems/specification.rb: * Preliminary support for: gem -i
+ blah-0.0.1.gem --run-tests Needs to be cleaned up considerably.
+ * Introduction of new gemspec metadata "unit_test_suite", which
+ will be require'd in order to load all unit tests
+
+2004-03-17 09:33 chadfowler
+
+ * bin/gem: Applied Gavin Sinclair's patch to make help output
+ better.
+
+2004-03-16 21:55 chadfowler
+
+ * bin/gem: Added --remote-list option for gem command to display
+ all gems on server.
+
+2004-03-16 21:50 chadfowler
+
+ * bin/gem, doc/UserDoc.html: Fixed --help case inconsistencies and
+ documentation typos as per Scott Harper's email.
+
+2004-03-16 21:41 chadfowler
+
+ * bin/gem: --list and --search display are the same.
+
+2004-03-16 21:33 chadfowler
+
+ * bin/gem: Implemented some of Scott Harper's search suggestions:
+ case insensitive sort of returned gems and display description
+ with gem name in search results.
+
+2004-03-16 21:20 chadfowler
+
+ * bin/gem, lib/rubygems/remote_installer.rb: http_proxy option
+ implemented
+
+2004-03-15 07:19 chadfowler
+
+ * lib/rubygems/remote_installer.rb: Installation is now case
+ insensitive (like search)
+
+2004-03-15 07:07 chadfowler
+
+ * TODO, bin/gem, lib/rubygems/remote_installer.rb: Better error
+ messages. updated TODO list.
+
+2004-03-14 21:02 chadfowler
+
+ * bin/gem, lib/rubygems/remote_installer.rb: --dir didn't work with
+ remote-install. Now it does.
+
+2004-03-14 17:48 rich
+
+ * bin/gem: fixed uninstall bug
+
+2004-03-14 17:18 rich
+
+ * lib/rubygems/doc_manager.rb: changed to remove <drive>: on
+ win32...ug
+
+2004-03-14 16:15 rich
+
+ * install.rb: fixed typo
+
+2004-03-14 16:13 rich
+
+ * install.rb: generate cmd files
+
+2004-03-14 16:13 rich
+
+ * bin/: gem.cmd, gem_server.cmd: now generate cmd files
+
+2004-03-14 15:52 chadfowler
+
+ * bin/gem: Fixed a small bug with --gen-rdoc and the remote
+ installer.
+
+2004-03-14 15:38 chadfowler
+
+ * lib/rubygems.rb: Back to version 1.0 ;)
+
+2004-03-14 15:36 chadfowler
+
+ * lib/rubygems.rb: Updated rubygemsversion
+
+2004-03-14 15:31 chadfowler
+
+ * README: credits
+
+2004-03-14 15:24 rich
+
+ * README: initial readme
+
+2004-03-14 15:12 rich
+
+ * doc/UserDoc.html: updated w/doc on documentation ;-)
+
+2004-03-14 15:01 rich
+
+ * gemspecs/jabber4r.gemspec: added jabber4r gemspec
+
+2004-03-14 14:58 rich
+
+ * bin/gem_server: change the documentation path to /
+
+2004-03-14 14:57 rich
+
+ * install.rb: remove installing .rb files from ./bin
+
+2004-03-14 14:32 rich
+
+ * doc/: DevDoc.txt, GemSpecification.txt, UserDoc.html,
+ UserDoc.txt: updated with latest docs
+
+2004-03-14 12:05 chadfowler
+
+ * test/test_remote_installer.rb: Fixed tests.
+
+2004-03-14 11:31 chadfowler
+
+ * lib/rubygems/specification.rb: Fixed bug that would manifest
+ itself if a gem creator put apostrophes/single-quotes in the gem
+ spec.
+
+2004-03-14 00:04 rich
+
+ * doc/: UserDoc.html, UserDoc.txt: finished user's guide
+
+2004-03-13 21:48 rich
+
+ * doc/: DevDoc.html, UserDoc.html, UserDoc.txt: updated user's
+ guide...will finish section on ruby's library mgt soon ;-)
+
+2004-03-13 20:48 chadfowler
+
+ * doc/DevDoc.txt: Added documentation on making and distributing
+ gems
+
+2004-03-13 20:20 chadfowler
+
+ * TODO: [no log message]
+
+2004-03-13 19:51 rich
+
+ * doc/: DevDoc.html, DevDoc.txt, GemSpecification.html,
+ GemSpecification.txt, UserDoc.html, UserDoc.txt, doc.css,
+ makedoc.rb: added these doc (wiki) files from
+ http://rubygems.rubyforge.org/
+
+2004-03-13 17:56 chadfowler
+
+ * TODO, gemspecs/README, gemspecs/cgikit-1.1.0.gemspec,
+ gemspecs/linguistics.gemspec, gemspecs/ook.gemspec,
+ gemspecs/progressbar.gemspec, gemspecs/redcloth.gemspec,
+ gemspecs/rublog.gemspec, gemspecs/ruby-doom.gemspec,
+ gemspecs/rubyjdwp.gemspec, gemspecs/statistics.gemspec: Added
+ some gemspecs for actual RAA packages.
+
+2004-03-13 14:35 chadfowler
+
+ * TODO, lib/rubygems/remote_installer.rb: Preliminary HTTP Proxy
+ support. Untested.
+
+2004-03-13 09:11 chadfowler
+
+ * packages/sources/lib/sources.rb: Changed to point to rubyforge
+
+2004-03-12 22:40 rich
+
+ * bin/generate_yaml_index.rb: generates a yaml index for a gems
+ repository
+
+2004-03-12 22:02 chadfowler
+
+ * bin/gem_server: No longer serving gem specs.
+
+2004-03-12 21:42 chadfowler
+
+ * TODO, bin/gem_server.cgi: We decided to trash gem_server.cgi in
+ favor of the static content generator Rich is working on.
+
+2004-03-12 21:15 chadfowler
+
+ * TODO: [no log message]
+
+2004-03-12 20:11 chadfowler
+
+ * bin/gem, lib/rubygems/installer.rb,
+ lib/rubygems/remote_installer.rb: Basic search funtionality in.
+
+ Slight refactoring of Installer and RemoteInstaller
+
+2004-03-12 18:28 chadfowler
+
+ * TODO: [no log message]
+
+2004-03-12 16:37 chadfowler
+
+ * TODO: [no log message]
+
+2004-03-12 16:14 chadfowler
+
+ * TODO: More TODO items
+
+2004-03-08 13:50 chadfowler
+
+ * TODO, bin/gem_server, example/test.gemspec: Use rdoc templates
+ for HTML. Nearly XHTML compliant.
+
+2004-03-08 08:21 chadfowler
+
+ * TODO: Added TODO list
+
+2004-03-08 08:12 chadfowler
+
+ * lib/rubygems/validator.rb: Fixed a small (but crippling) bug in
+ the validator.
+
+2004-01-24 13:49 chadfowler
+
+ * bin/gem, lib/rubygems.rb, lib/rubygems/cache.rb,
+ lib/rubygems/validator.rb, lib/rubygems/version.rb: More cleanup.
+
+2004-01-24 13:29 chadfowler
+
+ * bin/gem, lib/rubygems/remote_installer.rb: A little cleaning of
+ (Remote)Installer inconsistencies
+
+2004-01-24 13:23 chadfowler
+
+ * bin/gem: Removed the weird instance variable thing we had going
+ on. :)
+
+2004-01-07 17:34 chadfowler
+
+ * bin/gem: removed old cruft
+
+2003-12-24 11:32 chadfowler
+
+ * lib/rubygems/validator.rb: Gem validation was returning false
+ negatives (corrupted gems were not reporting their corruption).
+
+2003-12-18 14:18 chadfowler
+
+ * lib/rubygems/cache.rb: Lyle noticed some out of date rdoc
+ documentation. Thanks Lyle!
+
+2003-12-03 08:05 chadfowler
+
+ * install.rb: Gavin's patch for installing the files in bin/ on
+ rubygems installation.
+
+2003-11-30 00:36 chadfowler
+
+ * lib/rubygems/specification.rb: Little warnings adjustment
+
+2003-11-29 17:27 jimweirich
+
+ * Rakefile: added Rakefile to package
+
+2003-11-29 16:23 jimweirich
+
+ * lib/rubygems/specification.rb: Removed defined? and initialized
+ @platform
+
+2003-11-29 16:08 jimweirich
+
+ * lib/rubygems/specification.rb: Initialized @loaded and check
+ defined?(@platform) to silence some -w warnings.
+
+2003-11-29 09:26 rich
+
+ * bin/gem_server, lib/rubygems/doc_manager.rb: updated to support
+ /doc URL to generate list of installed gems w/doc link for rdoc
+ generated links.
+
+2003-11-29 08:30 rich
+
+ * lib/rubygems/doc_manager.rb: minor format change of error message
+
+2003-11-29 08:29 rich
+
+ * bin/gem, lib/rubygems/builder.rb, lib/rubygems/doc_manager.rb,
+ lib/rubygems/installer.rb: instantiates DocManager now. errors
+ out on no install of RDoc. warns if .gemspec does not specify
+ having rdoc, but rdoc is generated
+
+2003-11-29 02:13 rich
+
+ * bin/gem, lib/rubygems.rb, lib/rubygems/doc_manager.rb,
+ lib/rubygems/format.rb, lib/rubygems/installer.rb,
+ lib/rubygems/specification.rb: added capability to generate rdoc
+ on install of gem (--gen-rdoc). this doc is placed in
+ Gem.dir+doc+gem.full_name fixed but in installer when moving to
+ format (not calling each) added doc manager to add/remove
+ documenatation (right now only rdoc)
+
+2003-11-29 01:28 rich
+
+ * lib/rubygems/specification.rb: should not define the attr_readers
+ for requirements/dependencies so undef is unnecessary
+
+2003-11-29 00:12 jimweirich
+
+ * lib/rubygems/specification.rb: Undefing dependencies and
+ requirements removes warning when used with -w.
+
+2003-11-29 00:12 jimweirich
+
+ * lib/rubygems.rb: Using defined?($GEM_PATH) avoids warning when
+ used with -w switch.
+
+2003-11-28 15:58 chadfowler
+
+ * bin/gem, example/test.gemspec, lib/rubygems.rb,
+ lib/rubygems/installer.rb, lib/rubygems/validator.rb,
+ lib/rubygems/format.rb: Separated gem file reading into a
+ separate class/file.
+
+2003-11-28 15:20 rich
+
+ * lib/rubygems/specification.rb: added has_rdoc?/has_rdoc methods
+ ... will be used to autogenerate rdoc
+
+2003-11-28 12:30 chadfowler
+
+ * lib/rubygems/validator.rb: Rdoc added
+
+2003-11-28 11:51 chadfowler
+
+ * bin/gem, lib/rubygems.rb, lib/rubygems/validator.rb: A little
+ rearranging of the validation/alien code. It's still ugly, but
+ at least it's in its own file now. :)
+
+2003-11-28 11:40 chadfowler
+
+ * bin/gem: Removed a little cruft.
+
+2003-11-27 11:04 chadfowler
+
+ * bin/gem: Print success message for each gem *not* containing
+ errors.
+
+2003-11-27 11:00 chadfowler
+
+ * bin/gem, lib/rubygems/installer.rb: Preliminary support for gem
+ directory validation (--alien). Looks for bad or missing gem
+ files, missing spec files, files installed that aren't part of
+ the gem, checksum mismatches, etc.
+
+ Very ugly code. Very ugly output. Work in progress.
+
+2003-11-24 11:58 rich
+
+ * lib/rubygems/specification.rb: change full_name to include
+ platform
+
+2003-11-24 09:15 chadfowler
+
+ * bin/gem: Option for HTTP Proxy server for remote-install. Not
+ yet implemented.
+
+2003-11-23 20:22 chadfowler
+
+ * lib/rubygems/builder.rb: Removed a stray \" in builder's success
+ message
+
+2003-11-23 20:16 chadfowler
+
+ * lib/rubygems/specification.rb: Leaving escape in but commenting
+ out its functionality because it hosed some other things up.
+ Need to revisit this for the case where:
+
+ s.summary = "Chad's Thing" # It's the apostrophe
+
+2003-11-23 20:08 chadfowler
+
+ * lib/rubygems/specification.rb: Escape quotes to avoid invalid
+ gemspecs in the #{Gem.dir}/specifications directory
+
+2003-11-23 19:21 chadfowler
+
+ * bin/gem: Less ugly error message on file IO problems.
+
+2003-11-22 22:34 chadfowler
+
+ * bin/gem: Very simple support for validating a gem. Will probably
+ move this into the libs eventually.
+
+2003-11-22 20:53 chadfowler
+
+ * example/test.gemspec, lib/rubygems/builder.rb: Generate MD5
+ checksum for gem and store it in the file. Will be used to
+ validate gem file before installation.
+
+2003-11-22 13:58 chadfowler
+
+ * install.rb, lib/rubygems/remote_installer.rb,
+ packages/sources/sources.gemspec,
+ packages/sources/lib/sources.rb: remote-install sources are now
+ installed as a ruby gem at the time of rubygems installation.
+ sources gemspec included in the rubygems distribution.
+
+2003-11-22 12:52 chadfowler
+
+ * bin/gem: Allow gem info by --version
+
+2003-11-22 11:50 chadfowler
+
+ * lib/: rubygems.rb, rubygems/cache.rb: Fixed the bug I introduced
+ by fixing Rich's bug with gem cache caching. ;)
+
+ Gem::Cache now has a #refresh! method.
+
+2003-11-22 10:16 chadfowler
+
+ * bin/gem, lib/rubygems.rb, lib/rubygems/installer.rb,
+ lib/rubygems/remote_installer.rb: - Fixed bug in Gem.cache
+ (though we may want to revisit it for in-memory caching - Command
+ line configurable version for uninstall
+
+2003-11-22 00:28 rich
+
+ * lib/rubygems/cache.rb: rdoc'd search method
+
+2003-11-22 00:24 rich
+
+ * bin/gem, lib/rubygems/cache.rb, lib/rubygems/version.rb,
+ test/test_version_comparison.rb: removed search_by_name because
+ search does the same thing. version::requirement was updated to
+ that if you did not specific a version operation, it assumes an =
+ sign. updated tests accordingly
+
+2003-11-21 23:58 rich
+
+ * lib/rubygems/: cache.rb, installer.rb: allow version to be
+ specified in uninstall (if called programatically)
+
+2003-11-21 23:52 rich
+
+ * lib/: rubygems.rb, rubygems/cache.rb, rubygems/installer.rb,
+ rubygems/specification.rb: > moved all searching into cache..and
+ now search by name/version and return an
+ ordered list (.last == highest version).
+ > modified uninstaller to allow selecting a specific version to
+ uninstall if
+ multiple versions are installed.
+ > implemented comparison function on specification.
+ > changed require_gem to use new search of cache function
+
+2003-11-21 21:06 chadfowler
+
+ * bin/gem, lib/rubygems/remote_installer.rb: Added ability to
+ specify optional version requirement for remote installations
+
+2003-11-21 20:25 chadfowler
+
+ * test/test_remote_installer.rb: Removed carriage returns
+
+2003-11-21 19:04 chadfowler
+
+ * bin/gem_server: Converted from getopts to optparse.
+
+2003-11-21 18:31 rich
+
+ * lib/rubygems.rb: changed the order in which operations are
+ performed in require_gem. it now requires dependent gems prior
+ to adding the require_paths to a gem. otherwise we could have
+ had a LoadError on a dependent gem but the paths were already
+ added...potential problem
+
+2003-11-21 18:21 rich
+
+ * lib/rubygems/installer.rb: updated to ensure
+ (specifications/cache) directories exist for a provided path
+
+2003-11-21 18:01 rich
+
+ * lib/rubygems/specification.rb: updated rdoc
+
+2003-11-21 17:59 rich
+
+ * bin/gem, lib/rubygems/builder.rb, lib/rubygems/installer.rb,
+ lib/rubygems/specification.rb: fixed various bugs with the
+ $GEM_PATH stuff, specifically on uninstall. Also, changed to
+ allow specifying a directory on install (--dir) and force install
+ (--force). Changed the builder generated ruby header to use
+ optparse.
+
+2003-11-21 07:03 chadfowler
+
+ * lib/: rubygems.rb, rubygems/cache.rb,
+ rubygems/remote_installer.rb: Remote installation of dependencies
+ now works. It downloads all dependent gems or errors out.
+
+ Fixed bug in require_gem. Wrong call to cache.
+
+2003-11-21 00:59 rich
+
+ * bin/gem, example/test.gemspec, lib/rubygems.rb,
+ lib/rubygems/cache.rb, lib/rubygems/installer.rb,
+ lib/rubygems/specification.rb: added capability to support
+ multiple paths $GEM_PATH in Ruby and RUBY_GEMS in the ARGV. Lots
+ of changes were needed to support this. also added the --force
+ and --dir options to gem installtion
+
+2003-11-20 22:50 chadfowler
+
+ * bin/gem: Switched to optparse. Not a whole lot gained, but it
+ seems to be the way Ruby is going. It's nice not to have to do
+ the "when" stuff, I guess.
+
+2003-11-19 23:41 chadfowler
+
+ * lib/rubygems/: installer.rb, remote_installer.rb: Added
+ chadfowler.com to the hardcoded remote install list.
+
+ Fixed a dangling YAML.load that broke uninstall.
+
+2003-11-19 22:56 rich
+
+ * lib/rubygems.rb: fixed bug in loading rubygems
+
+2003-11-19 22:51 chadfowler
+
+ * bin/: gem_server, gem_server.cgi: require 'yaml' :)
+
+2003-11-19 22:44 rich
+
+ * lib/: rubygems.rb, rubygems/cache.rb, rubygems/specification.rb:
+ changed the format of stuff stored in the spec directory to ruby
+ instead of YAML. This allows us to not have to load yaml in
+ 'require_gem'. switched the specification list to a Cache
+ object.
+
+2003-11-19 21:56 rich
+
+ * lib/rubygems/installer.rb: write the spec file in ruby and not in
+ yaml format (in the spec dir)
+
+2003-11-19 20:32 rich
+
+ * lib/rubygems/specification.rb: added to_ruby method to generate a
+ ruby string that can be eval'ed in to build a Gem Specification
+
+2003-11-17 21:37 jimweirich
+
+ * bin/: gem_server, gem_server.cgi: removed carriage returns
+
+2003-11-17 21:19 chadfowler
+
+ * install.rb: Accidentally left some junk in the file.
+
+2003-11-17 19:50 dblack
+
+ * test/test_version_comparison.rb: * Test cases for Version.rb
+
+2003-11-17 19:50 dblack
+
+ * lib/rubygems/version.rb: * Split off tests into
+ rubygems/tests/test_version_comparison.rb
+
+2003-11-17 12:37 chadfowler
+
+ * install.rb: Create File.join(Config::CONFIG['libdir'], "ruby",
+ "gems") + "specifications" and + "cache" during installation.
+
+ Need to remove this from rubygems.rb and replace with
+ ensure_directory call.
+
+2003-11-17 12:29 rich
+
+ * lib/rubygems/version.rb: rdoc added
+
+2003-11-17 11:31 rich
+
+ * lib/rubygems/specification.rb: rdoc added
+
+2003-11-17 10:38 rich
+
+ * lib/rubygems/: cache.rb, installer.rb: made rdoc comments and
+ renamed some variables
+
+2003-11-17 08:48 dblack
+
+ * lib/rubygems/version.rb: * Added stricter checking of incoming
+ Requirement string
+
+ * Added unit tests at end of file
+
+2003-11-17 07:32 chadfowler
+
+ * bin/: gem_server, gem_server.cgi: Refactored gem_server program
+ and added an equivalent CGI version.
+
+2003-11-17 00:14 rich
+
+ * lib/: rubygems.rb, rubygems/builder.rb, rubygems/cache.rb: added
+ rdoc documentation
+
+2003-11-16 17:15 chadfowler
+
+ * bin/: gem.cmd, gem_server.cmd: Added some batch files for Windows
+
+2003-11-16 17:08 rich
+
+ * install.rb, bin/gem, bin/gem_server, example/test.gemspec,
+ example/lib/test.rb, example/lib/test/wow.rb, lib/rubygems.rb,
+ lib/rubygems/builder.rb, lib/rubygems/cache.rb,
+ lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
+ lib/rubygems/specification.rb, lib/rubygems/version.rb,
+ test/test_remote_installer.rb: Initial import developed at
+ RubyConf 2003 by:
+
+ Rich Kilmer Chad Fowler David Black Paul Brannon Jim Weirich
+
+2003-11-16 17:08 rich
+
+ * install.rb, bin/gem, bin/gem_server, example/test.gemspec,
+ example/lib/test.rb, example/lib/test/wow.rb, lib/rubygems.rb,
+ lib/rubygems/builder.rb, lib/rubygems/cache.rb,
+ lib/rubygems/installer.rb, lib/rubygems/remote_installer.rb,
+ lib/rubygems/specification.rb, lib/rubygems/version.rb,
+ test/test_remote_installer.rb: Initial revision
+
+Local variables:
+indent-tabs-mode: t
+tab-width: 8
+end:
diff --git a/doc/rubygems/History.txt b/doc/rubygems/History.txt
new file mode 100644
index 0000000000..4a80b1bfb4
--- /dev/null
+++ b/doc/rubygems/History.txt
@@ -0,0 +1,852 @@
+# -*- coding: utf-8 -*-
+
+=== 1.3.6 / 2010-02-17
+
+NOTE:
+
+http://rubygems.org is now the default source for downloading gems.
+
+You may have sources set via ~/.gemrc, so you should replace
+http://gems.rubyforge.org with http://rubygems.org
+
+http://gems.rubyforge.org will continue to work for the forseeable future.
+
+New features:
+
+* `gem` commands
+ * Added `gem push` and `gem owner` for interacting with modern/Gemcutter
+ sources
+ * `gem dep` now supports --prerelease.
+ * `gem fetch` now supports --prerelease.
+ * `gem server` now supports --bind. Patch #27357 by Bruno Michel.
+ * `gem rdoc` no longer overwrites built documentation. Use --overwrite
+ force rebuilding. Patch #25982 by Akinori MUSHA.
+* Captial letters are now allowed in prerelease versions.
+
+Bug fixes:
+
+* Development deps are no longer added to rubygems-update gem so older
+ versions can update sucessfully.
+* Installer bugs:
+ * Prerelease gems can now depend on non-prerelease gems.
+ * Development dependencies are ignored unless explicitly needed. Bug #27608
+ by Roger Pack.
+* `gem` commands
+ * `gem which` now fails if no paths were found. Adapted patch #27681 by
+ Caio Chassot.
+ * `gem server` no longer has invalid markup. Bug #27045 by Eric Young.
+ * `gem list` and friends show both prerelease and regular gems when
+ --prerelease --all is given
+* Gem::Format no longer crashes on empty files. Bug #27292 by Ian Ragsdale.
+* Gem::GemPathSearcher handles nil require_paths. Patch #27334 by Roger Pack.
+* Gem::RemoteFetcher no longer copies the file if it is where we want it.
+ Patch #27409 by Jakub Šťastný.
+
+Deprecation Notices:
+
+* lib/rubygems/timer.rb has been removed.
+* Gem::Dependency#version_requirements is deprecated and will be removed on or
+ after August 2010.
+* Bulk index update is no longer supported.
+* Gem::manage_gems was removed in 1.3.3.
+* Time::today was removed in 1.3.3.
+
+=== 1.3.5 / 2009-07-21
+
+Bug fixes:
+
+* Fix use of prerelease gems.
+* Gem.bin_path no longer escapes path with spaces. Bug #25935 and #26458.
+
+Deprecation Notices:
+
+* Bulk index update is no longer supported (the code currently remains, but not
+ the tests)
+* Gem::manage_gems was removed in 1.3.3.
+* Time::today was removed in 1.3.3.
+
+=== 1.3.4 / 2009-05-03
+
+Bug Fixes:
+
+* Fixed various warnings
+* Gem::ruby_version works correctly for 1.8 branch and trunk
+* Prerelease gems now show up in `gem list` and can be used
+* Fixed option name for `gem setup --format-executable`
+* RubyGems now matches Ruby > 1.9.1 gem paths
+* Gem::RemoteFetcher#download now works for explicit Windows paths across
+ drives. Bug #25882 by Lars Christensen
+* Fix typo in Gem::Requirement#parse. Bug #26000 by Mike Gunderloy.
+
+Deprecation Notices:
+
+* Bulk index update is no longer supported (the code currently remains, but not
+ the tests)
+* Gem::manage_gems was removed in 1.3.3.
+* Time::today was removed in 1.3.3.
+
+=== 1.3.3 / 2009-05-04
+
+New Features:
+
+* `gem server` allows port names (from /etc/services) with --port.
+* `gem server` now has search that jumps to RDoc. Patch #22959 by Vladimir
+ Dobriakov.
+* `gem spec` can retrieve single fields from a spec (like `gem spec rake
+ authors`).
+* Gem::Specification#has_rdoc= is deprecated and ignored (defaults to true)
+* RDoc is now generated regardless of Gem::Specification#has_rdoc?
+
+Bug Fixes:
+
+* `gem clean` now cleans up --user-install gems. Bug #25516 by Brett
+ Eisenberg.
+* Gem.bin_path now escapes paths with spaces.
+* Rake extension builder uses explicit correctly loads rubygems when invoking
+ rake.
+* Prerelease versions now match "~>" correctly. Patch #25759 by Yossef
+ Mendelssohn.
+* Check bindir for executables, not root when validating. Bug reported by
+ David Chelimsky.
+* Remove Time.today, no way to override it before RubyGems loads. Bug #25564
+ by Emanuele Vicentini
+* Raise Gem::Exception for #installation_path when not installed. Bug #25741
+ by Daniel Berger.
+* Don't raise in Gem::Specification#validate when homepage is nil. Bug #25677
+ by Mike Burrows.
+* Uninstall executables from the correct directory. Bug #25555 by Brett
+ Eisenberg.
+* Raise Gem::LoadError if Kernel#gem fails due to previously-loaded gem. Bug
+ reported by Alf Mikula.
+
+Deprecation Notices:
+
+* Gem::manage_gems has been removed.
+* Time::today has been removed early. There was no way to make it warn and be
+ easy to override with user code.
+
+=== 1.3.2 / 2009-04-15
+
+Select New Features:
+
+* RubyGems now loads plugins from rubygems_plugin.rb in installed gems.
+ This can be used to add commands (See Gem::CommandManager) or add
+ install/uninstall hooks (See Gem::Installer and Gem::Uninstaller).
+* Gem::Version now understands prerelease versions using letters. (eg.
+ '1.2.1.b') Thanks to Josh Susser, Alex Vollmer and Phil Hagelberg.
+* RubyGems now includes a Rake task for creating gems which replaces rake's
+ Rake::GemPackageTask. See Gem::PackageTask.
+* Gem::find_files now returns paths in $LOAD_PATH.
+* Added Gem::promote_load_path for use with Gem::find_files
+* Added Gem::bin_path to make finding executables easier. Patch #24114 by
+ James Tucker.
+* Various improvements to build arguments for installing gems.
+* `gem contents` added --all and --no-prefix.
+* Gem::Specification
+ * #validate strips directories and errors on not-files.
+ * #description no longer removes newlines.
+ * #name must be a String.
+ * FIXME and TODO are no longer allowed in various fields.
+ * Added support for a license attribute. Feature #11041 (partial).
+ * Removed Gem::Specification::list, too much process growth. Bug #23668 by
+ Steve Purcell.
+* `gem generate_index`
+ * Can now generate an RSS feed.
+ * Modern indicies can now be updated incrementally.
+ * Legacy indicies can be updated separately from modern.
+
+Select Bugs Fixed:
+
+* Better gem activation error message. Patch #23082.
+* Kernel methods are now private. Patch #20801 by James M. Lawrence.
+* Fixed various usability issues with `gem check`.
+* `gem update` now rescues InstallError and continues. Bug #19268 by Gabriel
+ Wilkins.
+* Allow 'https', 'file' as a valid schemes for --source. Patch #22485.
+* `gem install`
+ * Now removes existing path before installing. Bug #22837.
+ * Uses Gem::bin_path in executable stubs to work around Kernel#load bug in
+ 1.9.
+ * Correctly handle build args (after --) via the API. Bug #23210.
+* --user-install
+ * `gem install --no-user-install` now works. Patch #23573 by Alf Mikula.
+ * `gem uninstall` can now uninstall from ~/.gem. Bug #23760 by Roger Pack.
+* setup.rb
+ * Clarify RubyGems RDoc installation location. Bug #22656 by Gian Marco
+ Gherardi.
+ * Allow setup to run from read-only location. Patch #21862 by Luis Herrera.
+ * Fixed overwriting ruby executable when BASERUBY was not set. Bug #24958
+ by Michael Soulier.
+ * Ensure we're in a RubyGems dir when installing.
+ * Deal with extraneous quotation mark when autogenerating .bat file on MS
+ Windows. Bug #22712.
+
+Deprecation Notices:
+
+* Gem::manage_gems has been removed.
+* Time::today will be removed in RubyGems 1.4.
+
+Special thanks to Chad Wooley for backwards compatibility testing and Luis
+Lavena and Daniel Berger for continuing windows support.
+
+=== 1.3.1 / 2008-10-28
+
+Bugs fixed:
+
+* Disregard ownership of ~ under Windows while creating ~/.gem. Fixes
+ issues related to no uid support under Windows.
+* Fix requires for Gem::inflate, Gem::deflate, etc.
+* Make Gem.dir respect :gemhome value from config. (Note: this feature may be
+ removed since it is hard to implement on 1.9.)
+* Kernel methods are now private. Patch #20801 by James M. Lawrence.
+* Gem::location_of_caller now behaves on Windows. Patch by Daniel Berger.
+* Silence PATH warning.
+
+Deprecation Notices:
+
+* Gem::manage_gems will be removed on or after March 2009.
+
+=== 1.3.0 / 2008-09-25
+
+New features:
+
+* RubyGems doesn't print LOCAL/REMOTE titles for `gem query` and friends if
+ stdout is not a TTY, except with --both.
+* Added Gem.find_files, allows a gem to discover features provided by other
+ gems.
+* Added pre/post (un)install hooks for packagers of RubyGems. (Not for gems
+ themselves).
+* RubyGems now installs gems into ~/.gem if GEM_HOME is not writable. Use
+ --no-user-install command-line switch to disable this behavior.
+* Fetching specs for update now uses If-Modified-Since requests.
+* RubyGems now updates the ri cache when the rdoc gem is installed and
+ documentation is generated.
+
+Deprecation Notices:
+
+* Gem::manage_gems now warns when called. It will be removed on or after March
+ 2009.
+
+Bugs Fixed:
+
+* RubyGems 1.3.0+ now updates when no previous rubygems-update is installed.
+ Bug #20775 by Hemant Kumar.
+* RubyGems now uses the regexp we already have for `gem list --installed`. Bug
+ #20876 by Nick Hoffman.
+* Platform is now forced to Gem::Platform::RUBY when nil or blank in the
+ indexer. Fixes various uninstallable gems.
+* Handle EINVAL on seek. Based on patch in bug #20791 by Neil Wilson.
+* Fix HTTPS support. Patch #21072 by Alex Arnell.
+* RubyGems now loads all cache files even if latest has been loaded. Bug
+ #20776 by Uwe Kubosch.
+* RubyGems checks for support of development dependencies for #to_ruby. Bug
+ #20778 by Evan Weaver.
+* Now specifications from the future can be loaded.
+* Binary script uninstallation fixed. Bug #21234 by Neil Wilson.
+* Uninstallation with -i fixed. Bug #20812 by John Clayton.
+* Gem::Uninstaller#remove_all now calls Gem::Uninstaller#uninstall_gem so hooks
+ get called. Bug #21242 by Neil Wilson.
+* Gem.ruby now properly escaped on windows. Fixes problem with extension
+ compilation.
+* `gem lock --strict` works again. Patch #21814 by Sven Engelhardt.
+* Platform detection for Solaris was improved. Patch #21911 by Bob Remeika.
+
+Other Changes Include:
+
+* `gem help install` now describes _version_ argument to executable stubs
+* `gem help environment` describes environment variables and ~/.gemrc and
+ /etc/gemrc
+* On-disk gemspecs are now read in UTF-8 and written with a UTF-8 magic comment
+* Rakefile
+ * If the SETUP_OPTIONS environment variable is set, pass its contents as
+ arguments to setup.rb
+* lib/rubygems/platform.rb
+ * Remove deprecated constant warnings and really deprecate them. (WIN32,
+ etc).
+* lib/rubygems/remote_fetcher.rb
+ * Now uses ~/.gem/cache if the cache dir in GEM_HOME is not writable.
+* lib/rubygems/source_index.rb
+ * Deprecate options to 'search' other than Gem::Dependency instances and
+ issue warning until November 2008.
+* setup.rb
+ * --destdir folder structure now built using Pathname, so it works for
+ Windows platforms.
+* test/*
+ * Fixes to run tests when under test/rubygems/. Patch by Yusuke ENDOH
+ [ruby-core:17353].
+* test/test_ext_configure_builder.rb
+ * Locale-free patch by Yusuke Endoh [ruby-core:17444].
+
+=== 1.2.0 / 2008-06-21
+
+New features:
+
+* RubyGems no longer performs bulk updates and instead only fetches the gemspec
+ files it needs. Alternate sources will need to upgrade to RubyGems 1.2 to
+ allow RubyGems to take advantage of the new metadata updater. If a pre 1.2
+ remote source is in the sources list, RubyGems will revert to the bulk update
+ code for compatibility.
+* RubyGems now has runtime and development dependency types. Use
+ #add_development_dependency and #add_runtime_dependency. All typeless
+ dependencies are considered to be runtime dependencies.
+* RubyGems will now require rubygems/defaults/operating_system.rb and
+ rubygems/defaults/#{RBX_ENGINE}.rb if they exist. This allows packagers and
+ ruby implementers to add custom behavior to RubyGems via these files. (If
+ the RubyGems API is insufficient, please suggest improvements via the
+ RubyGems list.)
+* /etc/gemrc (and windows equivalent) for global settings
+* setup.rb now handles --vendor and --destdir for packagers
+* `gem stale` command that lists gems by last access time
+
+Bugs Fixed:
+
+* File modes from gems are now honored, patch #19737
+* Marshal Gem::Specification objects from the future can now be loaded.
+* A trailing / is now added to remote sources when missing, bug #20134
+* Gems with legacy platforms will now be correctly uninstalled, patch #19877
+* `gem install --no-wrappers` followed by `gem install --wrappers` no longer
+ overwrites executables
+* `gem pristine` now forces reinstallation of gems, bug #20387
+* RubyGems gracefully handles ^C while loading .gemspec files from disk, bug
+ #20523
+* Paths are expanded in more places, bug #19317, bug #19896
+* Gem::DependencyInstaller resets installed gems every install, bug #19444
+* Gem.default_path is now honored if GEM_PATH is not set, patch #19502
+
+Other Changes Include:
+
+* setup.rb
+ * stub files created by RubyGems 0.7.x and older are no longer removed. When
+ upgrading from these ancient versions, upgrade to 1.1.x first to clean up
+ stubs.
+ * RDoc is no longer required until necessary, patch #20414
+* `gem server`
+ * Now completely matches the output of `gem generate_index` and
+ has correct content types
+ * Refreshes from source directories for every hit. The server will no longer
+ need to be restarted after installing gems.
+* `gem query --details` and friends now display author, homepage, rubyforge url
+ and installed location
+* `gem install` without -i no longer reinstalls dependencies if they are in
+ GEM_PATH but not in GEM_HOME
+* Gem::RemoteFetcher now performs persistent connections for HEAD requests,
+ bug #7973
+
+=== 1.1.1 / 2008-04-11
+
+Bugs Fixed:
+
+* Gem.prefix now returns non-nil only when RubyGems was installed outside
+ sitelibdir or libdir.
+* The `gem server` gem list now correctly links to gem details.
+* `gem update --system` now passes --no-format-executable to setup.rb.
+* Gem::SourceIndex#refresh! now works with multiple gem repositories.
+* Downloaded gems now go into --install-dir's cache directory.
+* Various fixes to downloading gem metadata.
+* `gem install --force` now ignores network errors too.
+* `gem pristine` now rebuilds extensions.
+* `gem update --system` now works on virgin Apple ruby.
+* Gem::RemoteFetcher handles Errno::ECONNABORTED.
+* Printing of release notes fixed.
+
+=== 1.1.0 / 2008-03-29
+
+New features:
+
+* RubyGems now uses persistent connections on index updates. Index updates are
+ much faster now.
+* RubyGems only updates from a latest index by default, cutting candidate gems
+ for updates to roughly 1/4 (at present). Index updates are even faster
+ still.
+ * `gem list -r` may only show the latest version of a gem, add --all to see
+ all gems.
+* `gem spec` now extracts specifications from .gem files.
+* `gem query --installed` to aid automation of checking for gems.
+
+Bugs Fixed:
+
+* RubyGems works with both Config and RbConfig now.
+* Executables are now cleaned upon uninstall.
+* You can now uninstall from a particular directory.
+* Updating from non-default sources fixed.
+* Executable stubs now use ruby install name in shebang.
+* `gem unpack` checks every directory in Gem.path now.
+* `gem install` now exits with non-zero exit code when appropriate.
+* `gem update` only updates gems that need updates.
+* `gem update` doesn't force remote-only updates.
+* `gem update` handles dependencies properly when updating.
+* Gems are now loaded in Gem.path order.
+* Gem stub scripts on windows now work outside Gem.bindir.
+* `gem sources -r` now works without network access.
+
+Other Changes Include:
+
+* RubyGems now requires Ruby > 1.8.3.
+* Release notes are now printed upon installation.
+* `gem env path` now prints a usable path.
+* `gem install` reverts to local-only installation upon network error.
+* Tar handling code refactoring and cleanup.
+* Gem::DependencyInstaller's API has changed.
+
+For a full list of changes to RubyGems, see the ChangeLog file.
+
+=== 1.0.1 / 2007-12-20
+
+Bugs Fixed:
+
+* Installation on Ruby 1.8.3 through 1.8.5 fixed
+* `gem build` on 1.8.3 fixed
+
+Other Changes Include:
+
+* Since RubyGems 0.9.5, RubyGems is no longer supported on Ruby 1.8.2 or older,
+ this is official in RubyGems 1.0.1.
+
+=== 1.0.0 / 2007-12-20
+
+Major New Features Include:
+
+* RubyGems warns about various problems with gemspecs during gem building
+* More-consistent versioning for the RubyGems software
+
+Other Changes Include:
+
+* Fixed various bugs and problems with installing gems on Windows
+* Fixed using `gem server` for installing gems
+* Various operations are even more verbose with --verbose
+* Built gems are now backwards compatible with 0.9.4
+* Improved detection of RUBYOPT loading rubygems
+* `ruby setup.rb` now has a --help option
+* Gem::Specification#bindir is now respected on installation
+* Executable stubs can now be installed to match ruby's name, so if ruby is
+ installed as 'ruby18', foo_exec will be installed as 'foo_exec18'
+* `gem unpack` can now unpack into a specific directory with --target
+* OpenSSL is no longer required by default
+
+Deprecations and Deletions:
+
+* Kernel#require_gem has been removed
+* Executables without a shebang will not be wrapped in a future version, this
+ may cause such executables to fail to operate on installation
+* Gem::Platform constants other than RUBY and CURRENT have been removed
+* Gem::RemoteInstaller was removed
+* Gem::Specification#test_suite_file and #test_suite_file= are deprecated in
+ favor of #test_file and #test_file=
+* Gem::Specification#autorequire= has been deprecated
+* Time::today will be removed in a future version
+
+=== 0.9.5 / 2007-11-19
+
+Major New Features Include:
+
+* Platform support
+* Automatic installation of platform gems
+* New bandwidth and memory friendlier index file format
+* "Offline" mode (--no-update-sources)
+* Bulk update threshold can be specified (-B, --bulk-threshold)
+* New `gem fetch` command
+* `gem` now has "really verbose" output when you specify -v
+* Improved stubs and `gem.bat` on mswin, including better compatiblity
+ with the One-Click Installer.
+
+Other Changes Include:
+
+* Time::today is deprecated and will be removed at a future date
+* Gem::manage_gems is deprecated and will be removed at a future date
+* `gem install --include-dependencies` (-y) is now deprecated since it is the
+ default, use --ignore-dependencies to turn off automatic dependency
+ installation
+* Multi-version diamond dependencies only are installed once
+* Processing a YAML bulk index update takes less memory
+* `gem install -i` makes sure all depenencies are installed
+* `gem update --system` reinstalls into the prefix it was originally installed
+ in
+* `gem update --system` respects --no-rdoc and --no-ri flags
+* HTTP basic authentication support for proxies
+* Gem::Specification#platforms should no longer be a String, use
+ Gem::Platform::CURRENT when building binary gems instead
+* `gem env` has more diagnostic information
+* require 'rubygems' loads less code
+* sources.gem is gone, RubyGems now uses built-in defaults
+* `gem install --source` will no longer add --source by default, use `gem
+ sources --add` to make it a permanent extra source
+* `gem query` (list) no longer prints details by default
+* Exact gem names are matched in various places
+* mkrf extensions are now supported
+* A gem can depend on a specific RubyGems version
+* `gem_server` is now `gem server`
+* `gemlock` is now `gem lock`
+* `gem_mirror` is now `gem mirror`
+* `gemwhich` is now `gem which`
+* `gemri` is no longer included with RubyGems
+* `index_gem_repository.rb` is now `gem generate_index`
+* `gem` performs more validation of parameters
+* Custom rdoc styles are now supported
+* Gem indexer no longer removes quick index during index creation
+* Kernel#require only rescues a LoadError for the file being required now
+* `gem dependencies` can now display some information for remote gems
+* Updating RubyGems now works with RUBYOPT=-rubygems
+
+Special thanks to:
+
+* Daniel Berger
+* Luis Lavena
+* Tom Copeland
+* Wilson Bilkovich
+
+=== 0.9.4 / 2007-05-23
+
+If you are experiencing problems with the source index (e.g. strange
+"No Method" errors), or problems with zlib (e.g. "Buffer Error"
+messsage), we recommend upgrading to RubyGems 0.9.4.
+
+Bug Fixes Include:
+
+* Several people have been experiencing problems with no method errors
+ on the source index cache. The source index cache is now a bit more
+ self healing. Furthermore, if the source index cache is
+ irreparable, then it is automatically dropped and reloaded.
+* The source cache files may now be dropped with the "gem sources
+ --clear-all" command. (This command may require root is the system
+ source cache is in a root protected area).
+* Several sub-commands were accidently dropped from the "gem" command.
+ These commands have been restored.
+
+=== 0.9.3 / 2007-05-10
+
+Bug Fixes Include:
+
+The ZLib library on Windows will occasionally complains about a buffer error
+when unpacking gems. The Gems software has a workaround for that problem, but
+the workaround was only enabled for versions of ZLib 1.2.1 or earlier. We
+have received several reports of the error occuring with ZLib 1.2.3, so we
+have permanently enabled the work around on all versions.
+
+=== 0.9.2 / 2007-02-05
+
+Bug Fixes Include:
+
+* The "unpack" command now works properly.
+* User name and password are now passed properly to the authenticating
+ proxy when downloading gems.
+
+=== 0.9.1 / 2007-01-16
+
+See ChangeLog
+
+=== 0.9.0 / 2006-06-28
+
+Finally, the much anticipated RubyGems version 0.9.0 is now available.
+This release includes a number of new features and bug fixes. The
+number one change is that we can now download the gem index
+incrementally. This will greatly speed up the gem command when only a
+few gems are out of date.
+
+Major Enhancments include:
+
+* The gem index is now downloaded incrementally, only updating entries
+ that are out of date. If more than 50 entries are out of date, we
+ revert back to a bulk download.
+* Several patches related to allowing RubyGems to work with
+ authenticating proxies (from Danie Roux and Anatol Pomozov). Just
+ put the user and password in the proxy URL (e.g. -p
+ http://user:password@proxy.address.com:8080) or use the
+ HTTP_PROXY_USER and HTTP_PROXY_PASS environment variables.
+* The gem unpack command can now accept a file path rather than just a
+ install gem name.
+* Both RI and RDOC documents are now generated by default.
+* A gemri command is included to read gem RI docs (only needed for
+ Ruby 1.8.4 or earlier).
+
+Minor enhancements include:
+
+* Verison 0.0.0 is now a valid gem version.
+* Better detection of missing SSL functionality.
+* SSL is not required if the security policy does not require
+ signature checking.
+* Rake built extensions are now supported (Tilman Sauerbeck).
+* Several autorequire bug fixes.
+* --traceback is now an alias for --backtrace (I can never remember
+ which one it is).
+* SAFE=1 compatibility fixes.
+* .rbw is now a supported suffix for RubyGem's custom require.
+* Several Ruby 1.9 compatibility fixes (Eric Hodel).
+
+Bug Fixes:
+
+* Added dashes to gemspecs generated in Ruby 1.8.3. This solves some
+ cross-Ruby version compatibility issues.
+* Fixed bug where the wrong executables could be uninstalled (Eric
+ Hodel).
+* Fixed bug where gem unpack occasionally unpacked the wrong gem.
+* Fixed bug where a fatal error occured when permissions on .gemrc
+ were too restrictive (reported by Luca Pireddu).
+* Fixed prefix handling for native expressions (patch by Aaron Patterson).
+* Fixed several Upgrade => Update typos.
+
+=== 0.8.11 / 2005-07-13
+
+* -y is a synonym for --include-dependencies.
+* Better handling of errors in the top level rescue clause.
+* Package list command (e.g. gem inspect GEM).
+* .gemrc now allows cvsrc-like options to set defaults per subcommand.
+* The autorequire gem spec field will now accept a list.
+* Substituted Time for Date in specs, increasing performance
+ dramatically.
+* Fixed reported bug of gem directories ending in "-" (reported by
+ Erik Hatcher).
+* Fixed but in installer that caused dependency installation to not
+ work.
+* Added Paul Duncan's gem signing patch.
+* Added Mark Hubbart's Framework patch (for better integration with OS
+ X).
+* Added David Glasser's install-from-mirror patch.
+* Additional internal structural cleanup and test reorganization.
+
+=== 0.8.10 / 2005-03-27
+
+* In multi-user environments, it is common to supply mulitple versions of gems
+ (for example Rails), allowing individual users to select the version of the
+ gem they desire. This allows a user to be insulated from updates to that
+ gem. RubyGems 0.8.10 fixes a problem where gems could occasionally become
+ confused about the current versions of libraries selected by the user.
+* The other annoying bug is that if there are any existing rubygems-update gems
+ installed, then the "gem update --system" command will download a new
+ update, but install the latest update prior to the download.
+
+=== 0.8.9
+
+Never released
+
+=== 0.8.8 / 2005-03-14
+
+* Moved the master definition of class Requirement back under version.
+ Kept the body of Requirement under Gem.
+
+=== 0.8.7 / 2005-03-14
+
+Even though it has only been a few weeks since that last release,
+there are quite a number of new features in 0.8.7. A complete list of
+new features will be given below, but here is a summary of the hot
+items.
+
+* The bug that prevented some users from installing rails has been
+ squashed. A big thanks to Bill Guindon (aGorilla) for helping track
+ that one down.
+
+There are several new commands available on the gem command:
+
+* gem cleanup GEMNAME -- Cleanup (uninstall) all the old versions of
+ gem. If the gem name is omitted, the entire repository is cleaned.
+* gem dependency GEMNAME -- Show the dependencies for the named gems.
+ This is really helpful when trying to figure out what gem needs what
+ other gem.
+
+There changes to the existing commands as well.
+
+* gem uninstall is much smarter about removing gems from the
+ repository. Lists of gems are now uninstalled in proper dependency
+ order (ie. if A depends on B, A is uninstalled first). Also,
+ warnings about broken dependencies occur only when removing the
+ *last* gem that supports a dependency is removed.
+
+Both gem install and gem uninstall support some new command line
+options that can reduce the amount of yes/no queries given the user.
+For install we have:
+
+* --ignore-dependencies -- Only install requests gems, no
+ dependendecies are automatically installed.
+* --include-dependencies -- Automatically install dependencies,
+ without confirmation.
+
+For gem uninstall, the new options are:
+
+* --all -- Uninstall all matching gems without confirmation.
+* --ignore-dependencies -- Uninstall, even if dependencies are broken.
+* --executables -- Remove executables without confirmation
+
+Under general cleanup, gems will not, by default, run RDoc on packages
+that do not have the RDoc flag set.
+
+And finally there is a new library file 'gemconfigure' to aid in
+writing version sensitive applications (without undue dependencies on
+RubyGems); and 'gemwhich', a short script to locate libraries in the
+file system. You can read more about them here:
+
+* gemconfigure: http://docs.rubygems.org/read/chapter/4#page73
+* gemwhich: http://docs.rubygems.org/read/chapter/17
+
+=== 0.8.6 / 2005-02-27
+
+* Fixed a small bug with shebang construction
+
+=== 0.8.5 / 2005-02-26
+
+Do you know how you used to dread getting the following message while
+installing gems?
+
+ Updating Gem source index for: http://gems.rubyforge.org
+
+It could take up to 30 seconds (on my machine, even worse on others) for
+that crazy source index to update.
+
+This latest release of RubyGems speeds that wait time up considerably.
+The following table gives the following times for installing RedCloth
+with a required source index update on three system we had available to
+us. No RDoc generation was included in the following times.
+
+ RubyGems Linux Mac OSX Windows
+ 0.8.4 33 secs 73 secs 58 secs
+ 0.8.5 8 secs 14 secs 21 secs
+
+The new caching code is at least 3x faster than previous versions. Woo
+Hoo!
+
+=== 0.8.4 / 2005-01-01
+
+* Rubygems 0.8.3's installer was broken unless you already had an older
+ version of RubyGems installed. That's fixed.
+* Change in the way Gem::Specification internally deals with lazy attributes
+ and defaults, bringing (with some loadpath_manager changes) a fairly
+ significant increase in speed.
+* Support for lower-cased Gem file names (for you, Paul Duncan :)
+* Erik Veenstra's patch for making Gem versions sortable.
+
+=== 0.8.3 / 2004-12-07
+
+No real earth shattering news here, but there were a number of really
+annoying issues involving other libraries that RubyGems depends upon.
+0.8.3 contains some workarounds for these issues. In particular:
+
+* Added workaround for the null byte in Dir string issue. (see
+ http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121702).
+ (Thanks to Mauricio Fernández for the quick response on this one).
+* Added workaround for old version of Zlib on windows that caused
+ Ruwiki to fail to install. (see
+ http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/121770)
+* Added workaround for large YAML file issues. (We dynamically cut
+ down the size of the source index YAML file and seem to have worked
+ around immediate issues.
+
+There has been some minor usability enhancements and changes ...
+
+* A user specific source index cache can be used when the site-wide
+ cache is unwritable (i.e. because you are running as a non-admin).
+ This *greatly* speeds up gem commands run in non-admin mode when the
+ site-wide cache is out of date.
+* The gem command now used an HTTP HEAD command to detect if the
+ server's source index needs to be downloaed.
+* gem check gemname --test will run unit tests on installed gems that
+ have unit tests.
+* Multiple gem names are allowed on the gem install command line.
+ This means you can do:
+
+ gem install rake rails needle postgres-pr pimki
+
+ (Ok, you get the idea)
+* Multiple authors my be specified in a Gem spec.
+* Switched to using setup.rb (rather than a custom install script) for
+ the installation of RubyGems itself. If you have installed RubyGems
+ before, double check the installation instructions and make sure you
+ use setup.rb instead of install.rb.
+* Ryan Davis has provided a patch so you can use an env variable
+ (GEM_SKIP), to tell loadpath_manager not to load gems of those
+ names. This was useful for him while testing libs that he had in
+ development.
+
+=== 0.8.1 / 2009-09-14
+
+* Quick release to capture some bug fixes.
+
+=== 0.8.0 / 2009-09-12
+
+* Remove need for library stubs. Set the RUBYOPT environment variable to
+ include "rrubygems", and a normal require will find gem files. Continue to
+ use 'require_gem gem_name, version' to specify gem versions.
+* Deprecated "test_suite_file" gemspec attribute in favor of "test_files" array.
+* Generates rdoc by default on installs.
+* Adopted tar/gzip file format, thanks to Mauricio Fernandez.
+* "gem rdoc" allows generation of rdoc after gem installation (will add a "gem
+ test"
+* Application stubs can now accept an optional parameter of _VERSION_ that will
+ run an arbitrary version of the application requested.
+* Various bug fixes
+* Various platform-independency improvements
+* "gem spec --all" displays spec info for all installed version of a given gem.
+* Dynamic caching of sources
+* Support for user-definable sources on the command line (thanks Assaph Mehr)
+* More intelligent support for platform-dependent gems. Use Platform::CURRENT
+ when building a gem to set its platform to the one you're building on.
+ Installation displays a choice of platform-dependent gems, allowing the user
+ to pick.
+* Added "gem unpack" for "unpacking" a gem to the current directory
+
+=== 0.7.0 / 2004-07-09
+
+See ChangeLog
+
+=== 0.6.0 / 2004-06-08
+
+* Collapse output of --search and --list (and gem_server) operations so that
+ each gem is listed only once, with each of its versions listed on the same
+ line.
+* bin/gem: new --upgrade-all option allows one to upgrade every installed gem
+* new #required_ruby_version attribute added to gem specification for
+ specifying a dependency on which version of ruby the gem needs. Format it
+ accepts is the same as the Gem::Version::Requirement format:
+
+ spec.required_ruby_version = "> 1.8.0"
+* --install-stub defaults to true, so library stubs are created
+
+=== 0.5.0 / 2004-06-06
+
+* Jim added the ability to specify version constraints to avoid API
+ incompatibilities. This has been the subject of much debate for the past
+ couple of months, with many ideas and code contributed by Eivind Eklund and
+ Mauricio Fernandez. The following set of assertions shows how it works:
+
+ assert_inadequate("1.3", "~> 1.4")
+ assert_adequate( "1.4", "~> 1.4")
+ assert_adequate( "1.5", "~> 1.4")
+ assert_inadequate("2.0", "~> 1.4") # This one is key--the new operator
+ # disallows major version number
+ # differences.
+* Group gem search output when multiple versions exist for a given gem:
+
+ activerecord (0.7.8, 0.7.7, 0.7.6, 0.7.5)
+ Implements the ActiveRecord pattern for ORM.
+* Add arbitrary RDoc-able files via gemspec (not just Ruby source files) for
+ people who have, for example, README.rdoc in their distributions. Add to
+ gemspec via: spec.extra_rdoc_files = ["list", "of", "files"]. Ruby files are
+ automatically included.
+* Some small bug fixes
+
+=== 0.4.0 / 2004-05-31
+
+* Minor bug fixes including Windows compatability issues
+
+=== 0.3.0 / 2004-04-30
+
+* Cleanup of command-line arguments and handling. Most commands accept a
+ --local or --remote modifier.
+* Creation of Application Gems (packages that include executable programs).
+ See http://rubygems.rubyforge.org/wiki/wiki.pl?DeveloperGuide for information
+ on how to use it.
+* Basic functionality for installing binary gems from source (:extensions
+ property of gem specification holds an array of paths to extconf.rb files to
+ be used for compilation)
+* Install library "stub" allowing a normal 'require' to work (which then does
+ the rubygems require and 'require_gem'
+* --run-tests runs the test suite specified by the "test_suite_file" property
+ of a gem specification
+* HTTP Proxy support works. Rewrite of HTTP code.
+* Unit and functional tests added (see Rakefile).
+* Prompt before remote-installing dependencies during gem installation.
+* Config file for storing preferences for 'gem' command usage.
+* Generally improved error messages (still more work to do)
+* Rearranged gem directory structure for cleanliness.
+
+=== 0.2.0 / 2004-03-14
+
+* Initial public release
+
diff --git a/lib/rubygems/LICENSE.txt b/doc/rubygems/LICENSE.txt
index db88c5e118..db88c5e118 100644
--- a/lib/rubygems/LICENSE.txt
+++ b/doc/rubygems/LICENSE.txt
diff --git a/doc/rubygems/README b/doc/rubygems/README
new file mode 100644
index 0000000000..68a52593d4
--- /dev/null
+++ b/doc/rubygems/README
@@ -0,0 +1,41 @@
+= RubyGems
+
+* http://rubygems.org/
+* http://docs.rubygems.org/
+* http://rubygems.rubyforge.org/
+* http://rubyforge.org/projects/rubygems
+
+== DESCRIPTION
+
+RubyGems is a package management framework for Ruby.
+
+This gem is an update for the RubyGems software. You must have an
+installation of RubyGems before this update can be applied.
+
+See Gem for information on RubyGems (or `ri Gem`)
+
+To upgrade to the latest RubyGems, run:
+
+ $ gem update --system # you might need to be an administrator or root
+
+NOTE: RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed. You will need to use the following instructions
+if you see "Nothing to update".
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
+
+ $ gem install rubygems-update # again, might need to be admin/root
+ $ update_rubygems # ... here too
+
+If you don't have any RubyGems install, there is still the pre-gem approach to
+getting software, doing it manually:
+
+1. Download from: http://rubyforge.org/frs/?group_id=126
+2. Unpack into a directory and cd there
+3. Install with: ruby setup.rb # you may need admin/root privilege
+
+For more details and other options, see:
+
+ ruby setup.rb --help
+
diff --git a/doc/security.rdoc b/doc/security.rdoc
deleted file mode 100644
index 2cf6531785..0000000000
--- a/doc/security.rdoc
+++ /dev/null
@@ -1,149 +0,0 @@
-= Ruby Security
-
-The Ruby programming language is large and complex and there are many security
-pitfalls often encountered by newcomers and experienced Rubyists alike.
-
-This document aims to discuss many of these pitfalls and provide more secure
-alternatives where applicable.
-
-Please check the full list of publicly known CVEs and how to correctly report a
-security vulnerability, at: http://www.ruby-lang.org/en/security/
-Japanese version is here: http://www.ruby-lang.org/ja/security/
-
-Security vulnerabilities should be reported via an email to
-mailto:security@ruby-lang.org ({the PGP public
-key}[http://www.ruby-lang.org/security.asc]), which is a private mailing list.
-Reported problems will be published after fixes.
-
-== <code>$SAFE</code>
-
-Ruby provides a mechanism to restrict what operations can be performed by Ruby
-code in the form of the <code>$SAFE</code> variable.
-
-However, <code>$SAFE</code> does not provide a secure environment for executing
-untrusted code even at its maximum level of +4+. <code>$SAFE</code> is
-inherently flawed as a security mechanism, as it relies on every unsafe
-operation performed by any C method to be guarded by a <code>$SAFE</code>
-check. If this check is ever missed, the entire security of the system is
-compromised. <code>$SAFE</code> also does not offer any protection against
-denial of service attacks.
-
-If you need to execute untrusted code, you should use an operating system level
-sandboxing mechanism. On Linux, ptrace or LXC can be used to sandbox
-potentially malicious code. Other similar mechanisms exist on every major
-operating system.
-
-== +Marshal.load+
-
-Ruby's +Marshal+ module provides methods for serializing and deserializing Ruby
-object trees to and from a binary data format.
-
-Never use +Marshal.load+ to deserialize untrusted or user supplied data.
-Because +Marshal+ can deserialize to almost any Ruby object and has full
-control over instance variables, it is possible to craft a malicious payload
-that executes code shortly after deserialization.
-
-If you need to deserialize untrusted data, you should use JSON as it is only
-capable of returning 'primitive' types such as strings, arrays, hashes, numbers
-and nil. If you need to deserialize other classes, you should handle this
-manually. Never deserialize to a user specified class.
-
-== YAML
-
-YAML is a popular human readable data serialization format used by many Ruby
-programs for configuration and database persistance of Ruby object trees.
-
-Similar to +Marshal+, it is able to deserialize into arbitrary Ruby classes.
-For example, the following YAML data will create an +ERB+ object when
-deserialized:
-
- !ruby/object:ERB
- src: puts `uname`
-
-Because of this, many of the security considerations applying to Marshal are
-also applicable to YAML. Do not use YAML to deserialize untrusted data.
-
-== Symbols
-
-Symbols are often seen as syntax sugar for simple strings, but they play a much
-more crucial role. The MRI Ruby implementation uses Symbols internally for
-method, variable and constant names. The reason for this is that symbols are
-simply integers with names attached to them, so they are faster to look up in
-hashtables.
-
-Once a symbol is created, the memory used by it is never freed. If you convert
-user input to symbols with +to_sym+ or +intern+, it is possible for an attacker
-to mount a denial of service attack against your application by flooding it
-with unique strings. Because each string is kept in memory until the Ruby
-process exits, this will cause memory consumption to grow and grow until Ruby
-runs out of memory and crashes.
-
-Be careful with passing user input to methods such as +send+,
-+instance_variable_get+ or +_set+, +const_get+ or +_set+, etc. as these methods
-will convert string parameters to symbols internally and pose the same DoS
-potential as direct conversion through +to_sym+/+intern+.
-
-The workaround to this is simple - don't convert user input to symbols. You
-should attempt to leave user input in string form instead.
-
-== Regular expressions
-
-Ruby's regular expression syntax has some minor differences when compared to
-other languages. In Ruby, the <code>^</code> and <code>$</code> anchors do not
-refer to the beginning and end of the string, rather the beginning and end of a
-*line*.
-
-This means that if you're using a regular expression like
-<code>/^[a-z]+$/</code> to restrict a string to only letters, an attacker can
-bypass this check by passing a string containing a letter, then a newline, then
-any string of their choosing.
-
-If you want to match the beginning and end of the entire string in Ruby, use
-the anchors +\A+ and +\z+.
-
-== +eval+
-
-Never pass untrusted or user controlled input to +eval+.
-
-Unless you are implementing a REPL like +irb+ or +pry+, +eval+ is almost
-certainly not what you want. Do not attempt to filter user input before passing
-it to +eval+ - this approach is fraught with danger and will most likely open
-your application up to a serious remote code execution vulnerability.
-
-== +send+
-
-'Global functions' in Ruby (+puts+, +exit+, etc.) are actually private instance
-methods on +Object+. This means it is possible to invoke these methods with
-+send+, even if the call to +send+ has an explicit receiver.
-
-For example, the following code snippet writes "Hello world" to the terminal:
-
- 1.send(:puts, "Hello world")
-
-You should never call +send+ with user supplied input as the first parameter.
-Doing so can introduce a denial of service vulnerability:
-
- foo.send(params[:bar]) # params[:bar] is "exit!"
-
-If an attacker can control the first two arguments to +send+, remote code
-execution is possible:
-
- # params is { :a => "eval", :b => "...ruby code to be executed..." }
- foo.send(params[:a], params[:b])
-
-When dispatching a method call based on user input, carefully verify that the
-method name. If possible, check it against a whitelist of safe method names.
-
-Note that the use of +public_send+ is also dangerous, as +send+ itself is
-public:
-
- 1.public_send("send", "eval", "...ruby code to be executed...")
-
-== DRb
-
-As DRb allows remote clients to invoke arbitrary methods, it is not suitable to
-expose to untrusted clients.
-
-When using DRb, try to avoid exposing it over the network if possible. If this
-isn't possible and you need to expose DRb to the world, you *must* configure an
-appropriate security policy with <code>DRb::ACL</code>.
diff --git a/doc/shell.rd b/doc/shell.rd
new file mode 100644
index 0000000000..8a1f7c5a80
--- /dev/null
+++ b/doc/shell.rd
@@ -0,0 +1,347 @@
+ -- shell.rb
+ $Release Version: 0.6.0 $
+ $Revision$
+ by Keiju ISHITSUKA(keiju@ishitsuka.com)
+
+=begin
+
+= What's shell.rb?
+
+It realizes a wish to do execution of commands with filters and pipes
+like sh/csh by using just native facilities of ruby.
+
+= Main classes
+
+== Shell
+
+Every shell object has its own current working directory, and executes
+each command as if it stands in the directory.
+
+--- Shell#cwd
+--- Shell#dir
+--- Shell#getwd
+--- Shell#pwd
+
+ Returns the current directory
+
+--- Shell#system_path
+
+ Returns the command search path in an array
+
+--- Shell#umask
+
+ Returns the umask
+
+== Filter
+
+Any result of command exection is a Filter. Filter include
+Enumerable, therefore a Filter object can use all Enumerable
+facilities.
+
+= Main methods
+
+== Command definitions
+
+In order to execute a command on your OS, you need to define it as a
+Shell method.
+
+Alternatively, you can execute any command via Shell#system even if it
+is not defined.
+
+--- Shell.def_system_command(command, path = command)
+
+ Defines a command. Registers <path> as a Shell method
+ <command>.
+
+ ex)
+ Shell.def_system_command "ls"
+ Defines ls.
+
+ Shell.def_system_command "sys_sort", "sort"
+ Defines sys_sort as sort.
+
+--- Shell.undef_system_command(command)
+
+ Undefines a commmand
+
+--- Shell.alias_command(ali, command, *opts) {...}
+
+ Aliases a command.
+
+ ex)
+ Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
+ Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
+
+--- Shell.unalias_command(ali)
+
+ Unaliases a command.
+
+--- Shell.install_system_commands(pre = "sys_")
+
+ Defines all commands in the default_system_path as Shell method,
+ all with <pre> prefixed to their names.
+
+== Creation
+
+--- Shell.new
+
+ Creates a Shell object which current directory is set to the
+ process current directory.
+
+--- Shell.cd(path)
+
+ Creates a Shell object which current directory is set to
+ <path>.
+
+== Process management
+
+--- Shell#jobs
+
+ Returns a list of scheduled jobs.
+
+--- Shell#kill sig, job
+
+ Sends a signal <sig> to <job>.
+
+== Current directory operations
+
+--- Shell#cd(path, &block)
+--- Shell#chdir
+
+ Changes the current directory to <path>. If a block is given,
+ it restores the current directory when the block ends.
+
+--- Shell#pushd(path = nil, &block)
+--- Shell#pushdir
+
+ Pushes the current directory to the directory stack, changing
+ the current directory to <path>. If <path> is omitted, it
+ exchanges its current directory and the top of its directory
+ stack. If a block is given, it restores the current directory
+ when the block ends.
+
+--- Shell#popd
+--- Shell#popdir
+
+ Pops a directory from the directory stack, and sets the current
+ directory to it.
+
+== File and directory operations
+
+--- Shell#foreach(path = nil, &block)
+
+ Same as:
+ File#foreach (when path is a file)
+ Dir#foreach (when path is a directory)
+
+--- Shell#open(path, mode)
+
+ Same as:
+ File#open (when path is a file)
+ Dir#open (when path is a directory)
+
+--- Shell#unlink(path)
+
+ Same as:
+ Dir#open (when path is a file)
+ Dir#unlink (when path is a directory)
+
+--- Shell#test(command, file1, file2)
+--- Shell#[command, file1, file2]
+
+ Same as test().
+ ex)
+ sh[?e, "foo"]
+ sh[:e, "foo"]
+ sh["e", "foo"]
+ sh[:exists?, "foo"]
+ sh["exists?", "foo"]
+
+--- Shell#mkdir(*path)
+
+ Same as Dir.mkdir (with multiple directories allowed)
+
+--- Shell#rmdir(*path)
+
+ Same as Dir.rmdir (with multiple directories allowed)
+
+== Command execution
+
+--- System#system(command, *opts)
+
+ Executes <command> with <opts>.
+
+ ex)
+ print sh.system("ls", "-l")
+ sh.system("ls", "-l") | sh.head > STDOUT
+
+--- System#rehash
+
+ Does rehash.
+
+--- Shell#transact &block
+
+ Executes a block as self.
+ ex)
+ sh.transact{system("ls", "-l") | head > STDOUT}
+
+--- Shell#out(dev = STDOUT, &block)
+
+ Does transact, with redirecting the result output to <dev>.
+
+== Internal commands
+
+--- Shell#echo(*strings)
+--- Shell#cat(*files)
+--- Shell#glob(patten)
+--- Shell#tee(file)
+
+ Return Filter objects, which are results of their execution.
+
+--- Filter#each &block
+
+ Iterates a block for each line of it.
+
+--- Filter#<(src)
+
+ Inputs from <src>, which is either a string of a file name or an
+ IO.
+
+--- Filter#>(to)
+
+ Outputs to <to>, which is either a string of a file name or an
+ IO.
+
+--- Filter#>>(to)
+
+ Appends the ouput to <to>, which is either a string of a file
+ name or an IO.
+
+--- Filter#|(filter)
+
+ Processes a pipeline.
+
+--- Filter#+(filter)
+
+ (filter1 + filter2) outputs filter1, and then outputs filter2.
+
+--- Filter#to_a
+--- Filter#to_s
+
+== Built-in commands
+
+--- Shell#atime(file)
+--- Shell#basename(file, *opt)
+--- Shell#chmod(mode, *files)
+--- Shell#chown(owner, group, *file)
+--- Shell#ctime(file)
+--- Shell#delete(*file)
+--- Shell#dirname(file)
+--- Shell#ftype(file)
+--- Shell#join(*file)
+--- Shell#link(file_from, file_to)
+--- Shell#lstat(file)
+--- Shell#mtime(file)
+--- Shell#readlink(file)
+--- Shell#rename(file_from, file_to)
+--- Shell#split(file)
+--- Shell#stat(file)
+--- Shell#symlink(file_from, file_to)
+--- Shell#truncate(file, length)
+--- Shell#utime(atime, mtime, *file)
+
+ Equivalent to the class methods of File with the same names.
+
+--- Shell#blockdev?(file)
+--- Shell#chardev?(file)
+--- Shell#directory?(file)
+--- Shell#executable?(file)
+--- Shell#executable_real?(file)
+--- Shell#exist?(file)/Shell#exists?(file)
+--- Shell#file?(file)
+--- Shell#grpowned?(file)
+--- Shell#owned?(file)
+--- Shell#pipe?(file)
+--- Shell#readable?(file)
+--- Shell#readable_real?(file)
+--- Shell#setgid?(file)
+--- Shell#setuid?(file)
+--- Shell#size(file)/Shell#size?(file)
+--- Shell#socket?(file)
+--- Shell#sticky?(file)
+--- Shell#symlink?(file)
+--- Shell#writable?(file)
+--- Shell#writable_real?(file)
+--- Shell#zero?(file)
+
+ Equivalent to the class methods of FileTest with the same names.
+
+--- Shell#syscopy(filename_from, filename_to)
+--- Shell#copy(filename_from, filename_to)
+--- Shell#move(filename_from, filename_to)
+--- Shell#compare(filename_from, filename_to)
+--- Shell#safe_unlink(*filenames)
+--- Shell#makedirs(*filenames)
+--- Shell#install(filename_from, filename_to, mode)
+
+ Equivalent to the class methods of FileTools with the same
+ names.
+
+ And also, there are some aliases for convenience:
+
+--- Shell#cmp <- Shell#compare
+--- Shell#mv <- Shell#move
+--- Shell#cp <- Shell#copy
+--- Shell#rm_f <- Shell#safe_unlink
+--- Shell#mkpath <- Shell#makedirs
+
+= Samples
+
+== ex1
+
+ sh = Shell.cd("/tmp")
+ sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
+ sh.cd("shell-test-1")
+ for dir in ["dir1", "dir3", "dir5"]
+ if !sh.exists?(dir)
+ sh.mkdir dir
+ sh.cd(dir) do
+ f = sh.open("tmpFile", "w")
+ f.print "TEST\n"
+ f.close
+ end
+ print sh.pwd
+ end
+ end
+
+== ex2
+
+ sh = Shell.cd("/tmp")
+ sh.transact do
+ mkdir "shell-test-1" unless exists?("shell-test-1")
+ cd("shell-test-1")
+ for dir in ["dir1", "dir3", "dir5"]
+ if !exists?(dir)
+ mkdir dir
+ cd(dir) do
+ f = open("tmpFile", "w")
+ f.print "TEST\n"
+ f.close
+ end
+ print pwd
+ end
+ end
+ end
+
+== ex3
+
+ sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
+ (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
+ sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
+ (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
+
+== ex4
+
+ print sh.cat("/etc/passwd").head.collect{|l| l =~ /keiju/}
+
+=end
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index 053b11fb99..33e5a9ed9b 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -5,142 +5,142 @@
=begin
-= 目的
+= ÌÜŪ
-ruby上ã§sh/cshã®ã‚ˆã†ã«ã‚³ãƒžãƒ³ãƒ‰ã®å®Ÿè¡ŒåŠã³ãƒ•ィルタリングを手軽ã«è¡Œã†.
-sh/cshã®åˆ¶å¾¡æ–‡ã¯rubyã®æ©Ÿèƒ½ã‚’用ã„ã¦å®Ÿç¾ã™ã‚‹.
+ruby¾å¤Çsh/csh¤Î¤è¤¦¤Ë¥³¥Þ¥ó¥É¤Î¼Â¹ÔµÚ¤Ó¥Õ¥£¥ë¥¿¥ê¥ó¥°¤ò¼ê·Ú¤Ë¹Ô¤¦.
+sh/csh¤ÎÀ©¸æÊ¸¤Ïruby¤Îµ¡Ç½¤òÍѤ¤¤Æ¼Â¸½¤¹¤ë.
-= 主ãªã‚¯ãƒ©ã‚¹ä¸€è¦§
+= ¼ç¤Ê¥¯¥é¥¹°ìÍ÷
== Shell
-Shellオブジェクトã¯ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’æŒã¡, コマンド実行ã¯ãã“ã‹ã‚‰ã®
-相対パスã«ãªã‚Šã¾ã™.
+Shell¥ª¥Ö¥¸¥§¥¯¥È¤Ï¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò»ý¤Á, ¥³¥Þ¥ó¥É¼Â¹Ô¤Ï¤½¤³¤«¤é¤Î
+ÁêÂХѥ¹¤Ë¤Ê¤ê¤Þ¤¹.
--- Shell#cwd
--- Shell#dir
--- Shell#getwd
--- Shell#pwd
- カレントディレクトリを返ã™ã€‚
+ ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÊÖ¤¹¡£
--- Shell#system_path
- コマンドサーãƒãƒ‘スã®é…列を返ã™ã€‚
+ ¥³¥Þ¥ó¥É¥µ¡¼¥Á¥Ñ¥¹¤ÎÇÛÎó¤òÊÖ¤¹¡£
--- Shell#umask
- umaskã‚’è¿”ã™ã€‚
+ umask¤òÊÖ¤¹¡£
== Filter
-コマンドã®å®Ÿè¡Œçµæžœã¯ã™ã¹ã¦Filterã¨ã—ã¦ã‹ãˆã‚Šã¾ã™. Enumerableã‚’includeã—
-ã¦ã„ã¾ã™.
+¥³¥Þ¥ó¥É¤Î¼Â¹Ô·ë²Ì¤Ï¤¹¤Ù¤ÆFilter¤È¤·¤Æ¤«¤¨¤ê¤Þ¤¹. Enumerable¤òinclude¤·
+¤Æ¤¤¤Þ¤¹.
-= 主ãªãƒ¡ã‚½ãƒƒãƒ‰ä¸€è¦§
+= ¼ç¤Ê¥á¥½¥Ã¥É°ìÍ÷
-== コマンド定義
+== ¥³¥Þ¥ó¥ÉÄêµÁ
-OS上ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã«ã¯ã¾ãš, Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦å®šç¾©ã—ã¾ã™.
+OS¾å¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¤Þ¤º, Shell¤Î¥á¥½¥Ã¥É¤È¤·¤ÆÄêµÁ¤·¤Þ¤¹.
-注) コマンドを定義ã—ãªãã¨ã‚‚直接実行ã§ãã‚‹Shell#systemコマンドもã‚りã¾ã™.
+Ãí) ¥³¥Þ¥ó¥É¤òÄêµÁ¤·¤Ê¤¯¤È¤âľÀܼ¹ԤǤ­¤ëShell#system¥³¥Þ¥ó¥É¤â¤¢¤ê¤Þ¤¹.
--- Shell.def_system_command(command, path = command)
- Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦commandを登録ã—ã¾ã™.
+ Shell¤Î¥á¥½¥Ã¥É¤È¤·¤Æcommand¤òÅÐÏ¿¤·¤Þ¤¹.
- 例)
+ Îã)
Shell.def_system_command "ls"
- ls を定義
+ ls ¤òÄêµÁ
Shell.def_system_command "sys_sort", "sort"
- sortコマンドをsys_sortã¨ã—ã¦å®šç¾©
+ sort¥³¥Þ¥ó¥É¤òsys_sort¤È¤·¤ÆÄêµÁ
--- Shell.undef_system_command(command)
- commandを削除ã—ã¾ã™.
+ command¤òºï½ü¤·¤Þ¤¹.
--- Shell.alias_command(ali, command, *opts) {...}
- commandã®aliasã‚’ã—ã¾ã™.
+ command¤Îalias¤ò¤·¤Þ¤¹.
- 例)
+ Îã)
Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
Shell.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
--- Shell.unalias_command(ali)
- commandã®aliasを削除ã—ã¾ã™.
+ command¤Îalias¤òºï½ü¤·¤Þ¤¹.
--- Shell.install_system_commands(pre = "sys_")
- system_path上ã«ã‚ã‚‹å…¨ã¦ã®å®Ÿè¡Œå¯èƒ½ãƒ•ァイルをShellã«å®šç¾©ã™ã‚‹. メソッ
- ドåã¯å…ƒã®ãƒ•ァイルåã®é ­ã«preã‚’ã¤ã‘ãŸã‚‚ã®ã¨ãªã‚‹.
+ system_path¾å¤Ë¤¢¤ëÁ´¤Æ¤Î¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¤òShell¤ËÄêµÁ¤¹¤ë. ¥á¥½¥Ã
+ ¥É̾¤Ï¸µ¤Î¥Õ¥¡¥¤¥ë̾¤ÎƬ¤Ëpre¤ò¤Ä¤±¤¿¤â¤Î¤È¤Ê¤ë.
-== 生æˆ
+== À¸À®
--- Shell.new
- プロセスã®ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’カレントディレクトリã¨ã™ã‚‹Shellオ
- ブジェクトを生æˆã—ã¾ã™.
+ ¥×¥í¥»¥¹¤Î¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤È¤¹¤ëShell¥ª
+ ¥Ö¥¸¥§¥¯¥È¤òÀ¸À®¤·¤Þ¤¹.
--- Shell.cd(path)
- pathをカレントディレクトリã¨ã™ã‚‹Shellオブジェクトを生æˆã—ã¾ã™.
+ path¤ò¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤È¤¹¤ëShell¥ª¥Ö¥¸¥§¥¯¥È¤òÀ¸À®¤·¤Þ¤¹.
-== プロセス管ç†
+== ¥×¥í¥»¥¹´ÉÍý
--- Shell#jobs
- スケジューリングã•れã¦ã„ã‚‹jobã®ä¸€è¦§ã‚’è¿”ã™.
+ ¥¹¥±¥¸¥å¡¼¥ê¥ó¥°¤µ¤ì¤Æ¤¤¤ëjob¤Î°ìÍ÷¤òÊÖ¤¹.
--- Shell#kill sig, job
- jobã«ã‚·ã‚°ãƒŠãƒ«sigã‚’é€ã‚‹
+ job¤Ë¥·¥°¥Ê¥ësig¤òÁ÷¤ë
-== カレントディレクトリæ“作
+== ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥êÁàºî
--- Shell#cd(path, &block)
--- Shell#chdir
- カレントディレクトリをpathã«ã™ã‚‹. イテレータã¨ã—ã¦å‘¼ã°ã‚ŒãŸã¨ãã«ã¯
- ブロック実行中ã®ã¿ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’変更ã™ã‚‹.
+ ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òpath¤Ë¤¹¤ë. ¥¤¥Æ¥ì¡¼¥¿¤È¤·¤Æ¸Æ¤Ð¤ì¤¿¤È¤­¤Ë¤Ï
+ ¥Ö¥í¥Ã¥¯¼Â¹ÔÃæ¤Î¤ß¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤¹¤ë.
--- Shell#pushd(path = nil, &block)
--- Shell#pushdir
- カレントディレクトリをディレクトリスタックã«ã¤ã¿, カレントディレク
- トリをpathã«ã™ã‚‹. pathãŒçœç•¥ã•れãŸã¨ãã«ã¯, カレントディレクトリã¨
- ディレクトリスタックã®ãƒˆãƒƒãƒ—を交æ›ã™ã‚‹. イテレータã¨ã—ã¦å‘¼ã°ã‚ŒãŸã¨
- ãã«ã¯, ブロック実行中ã®ã¿pushdã™ã‚‹.
+ ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò¥Ç¥£¥ì¥¯¥È¥ê¥¹¥¿¥Ã¥¯¤Ë¤Ä¤ß, ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯
+ ¥È¥ê¤òpath¤Ë¤¹¤ë. path¤¬¾Êά¤µ¤ì¤¿¤È¤­¤Ë¤Ï, ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤È
+ ¥Ç¥£¥ì¥¯¥È¥ê¥¹¥¿¥Ã¥¯¤Î¥È¥Ã¥×¤ò¸ò´¹¤¹¤ë. ¥¤¥Æ¥ì¡¼¥¿¤È¤·¤Æ¸Æ¤Ð¤ì¤¿¤È
+ ¤­¤Ë¤Ï, ¥Ö¥í¥Ã¥¯¼Â¹ÔÃæ¤Î¤ßpushd¤¹¤ë.
--- Shell#popd
--- Shell#popdir
- ディレクトリスタックã‹ã‚‰ãƒãƒƒãƒ—ã—, ãれをカレントディレクトリã«ã™ã‚‹.
+ ¥Ç¥£¥ì¥¯¥È¥ê¥¹¥¿¥Ã¥¯¤«¤é¥Ý¥Ã¥×¤·, ¤½¤ì¤ò¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¹¤ë.
-== ファイル/ディレクトリæ“作
+== ¥Õ¥¡¥¤¥ë/¥Ç¥£¥ì¥¯¥È¥êÁàºî
--- Shell#foreach(path = nil, &block)
- pathãŒãƒ•ァイルãªã‚‰, File#foreach
- pathãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã‚‰, Dir#foreach
+ path¤¬¥Õ¥¡¥¤¥ë¤Ê¤é, File#foreach
+ path¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ê¤é, Dir#foreach
--- Shell#open(path, mode)
- pathãŒãƒ•ァイルãªã‚‰, File#open
- pathãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã‚‰, Dir#open
+ path¤¬¥Õ¥¡¥¤¥ë¤Ê¤é, File#open
+ path¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ê¤é, Dir#open
--- Shell#unlink(path)
- pathãŒãƒ•ァイルãªã‚‰, File#unlink
- pathãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã‚‰, Dir#unlink
+ path¤¬¥Õ¥¡¥¤¥ë¤Ê¤é, File#unlink
+ path¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ê¤é, Dir#unlink
--- Shell#test(command, file1, file2)
--- Shell#[command, file1, file2]
- ファイルテスト関数testã¨åŒã˜.
- 例)
+ ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È´Ø¿ôtest¤ÈƱ¤¸.
+ Îã)
sh[?e, "foo"]
sh[:e, "foo"]
sh["e", "foo"]
@@ -149,75 +149,75 @@ OS上ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã«ã¯ã¾ãš, Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦å®
--- Shell#mkdir(*path)
- Dir.mkdirã¨åŒã˜(複数å¯)
+ Dir.mkdir¤ÈƱ¤¸(Ê£¿ô²Ä)
--- Shell#rmdir(*path)
- Dir.rmdirã¨åŒã˜(複数å¯)
+ Dir.rmdir¤ÈƱ¤¸(Ê£¿ô²Ä)
-== コマンド実行
+== ¥³¥Þ¥ó¥É¼Â¹Ô
--- System#system(command, *opts)
- commandを実行ã™ã‚‹.
- 例)
+ command¤ò¼Â¹Ô¤¹¤ë.
+ Îã)
print sh.system("ls", "-l")
sh.system("ls", "-l") | sh.head > STDOUT
--- System#rehash
- リãƒãƒƒã‚·ãƒ¥ã™ã‚‹
+ ¥ê¥Ï¥Ã¥·¥å¤¹¤ë
--- Shell#transact &block
- ブロック中ã§ã¯shellã‚’selfã¨ã—ã¦å®Ÿè¡Œã™ã‚‹.
- 例)
+ ¥Ö¥í¥Ã¥¯Ãæ¤Ç¤Ïshell¤òself¤È¤·¤Æ¼Â¹Ô¤¹¤ë.
+ Îã)
sh.transact{system("ls", "-l") | head > STDOUT}
--- Shell#out(dev = STDOUT, &block)
- transactを呼ã³å‡ºã—ãã®çµæžœã‚’devã«å‡ºåŠ›ã™ã‚‹.
+ transact¤ò¸Æ¤Ó½Ð¤·¤½¤Î·ë²Ì¤òdev¤Ë½ÐÎϤ¹¤ë.
-== 内部コマンド
+== ÆâÉô¥³¥Þ¥ó¥É
--- Shell#echo(*strings)
--- Shell#cat(*files)
--- Shell#glob(patten)
--- Shell#tee(file)
- ã“れらã¯å®Ÿè¡Œã™ã‚‹ã¨, ãれらを内容ã¨ã™ã‚‹Filterオブジェクトを返ã—ã¾ã™.
+ ¤³¤ì¤é¤Ï¼Â¹Ô¤¹¤ë¤È, ¤½¤ì¤é¤òÆâÍÆ¤È¤¹¤ëFilter¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤·¤Þ¤¹.
--- Filter#each &block
- フィルタã®ä¸€è¡Œãšã¤ã‚’blockã«æ¸¡ã™.
+ ¥Õ¥£¥ë¥¿¤Î°ì¹Ô¤º¤Ä¤òblock¤ËÅϤ¹.
--- Filter#<(src)
- srcをフィルタã®å…¥åŠ›ã¨ã™ã‚‹. srcãŒ, 文字列ãªã‚‰ã°ãƒ•ァイルを, IOã§ã‚れ
- ã°ãれをãã®ã¾ã¾å…¥åŠ›ã¨ã™ã‚‹.
+ src¤ò¥Õ¥£¥ë¥¿¤ÎÆþÎϤȤ¹¤ë. src¤¬, ʸ»úÎó¤Ê¤é¤Ð¥Õ¥¡¥¤¥ë¤ò, IO¤Ç¤¢¤ì
+ ¤Ð¤½¤ì¤ò¤½¤Î¤Þ¤ÞÆþÎϤȤ¹¤ë.
--- Filter#>(to)
- srcをフィルタã®å‡ºåŠ›ã¨ã™ã‚‹. toãŒ, 文字列ãªã‚‰ã°ãƒ•ァイルã«, IOã§ã‚れ
- ã°ãれをãã®ã¾ã¾å‡ºåŠ›ã¨ã™ã‚‹.
+ src¤ò¥Õ¥£¥ë¥¿¤Î½ÐÎϤȤ¹¤ë. to¤¬, ʸ»úÎó¤Ê¤é¤Ð¥Õ¥¡¥¤¥ë¤Ë, IO¤Ç¤¢¤ì
+ ¤Ð¤½¤ì¤ò¤½¤Î¤Þ¤Þ½ÐÎϤȤ¹¤ë.
--- Filter#>>(to)
- srcをフィルタã«è¿½åŠ ã™ã‚‹. toãŒ, 文字列ãªã‚‰ã°ãƒ•ァイルã«, IOã§ã‚れã°
- ãれをãã®ã¾ã¾å‡ºåŠ›ã¨ã™ã‚‹.
+ src¤ò¥Õ¥£¥ë¥¿¤ËÄɲ乤ë. to¤¬, ʸ»úÎó¤Ê¤é¤Ð¥Õ¥¡¥¤¥ë¤Ë, IO¤Ç¤¢¤ì¤Ð
+ ¤½¤ì¤ò¤½¤Î¤Þ¤Þ½ÐÎϤȤ¹¤ë.
--- Filter#|(filter)
- パイプçµåˆ
+ ¥Ñ¥¤¥×·ë¹ç
--- Filter#+(filter)
- filter1 + filter2 㯠filter1ã®å‡ºåŠ›ã®å¾Œ, filter2ã®å‡ºåŠ›ã‚’è¡Œã†.
+ filter1 + filter2 ¤Ï filter1¤Î½ÐÎϤθå, filter2¤Î½ÐÎϤò¹Ô¤¦.
--- Filter#to_a
--- Filter#to_s
-== 組込ã¿ã‚³ãƒžãƒ³ãƒ‰
+== Áȹþ¤ß¥³¥Þ¥ó¥É
--- Shell#atime(file)
--- Shell#basename(file, *opt)
@@ -239,7 +239,7 @@ OS上ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã«ã¯ã¾ãš, Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦å®
--- Shell#truncate(file, length)
--- Shell#utime(atime, mtime, *file)
- ã“れらã¯Fileクラスã«ã‚ã‚‹åŒåã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã¨åŒã˜ã§ã™.
+ ¤³¤ì¤é¤ÏFile¥¯¥é¥¹¤Ë¤¢¤ëƱ̾¤Î¥¯¥é¥¹¥á¥½¥Ã¥É¤ÈƱ¤¸¤Ç¤¹.
--- Shell#blockdev?(file)
--- Shell#chardev?(file)
@@ -263,7 +263,7 @@ OS上ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã«ã¯ã¾ãš, Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦å®
--- Shell#writable_real?(file)
--- Shell#zero?(file)
- ã“れらã¯FileTestクラスã«ã‚ã‚‹åŒåã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã¨åŒã˜ã§ã™.
+ ¤³¤ì¤é¤ÏFileTest¥¯¥é¥¹¤Ë¤¢¤ëƱ̾¤Î¥¯¥é¥¹¥á¥½¥Ã¥É¤ÈƱ¤¸¤Ç¤¹.
--- Shell#syscopy(filename_from, filename_to)
--- Shell#copy(filename_from, filename_to)
@@ -273,9 +273,9 @@ OS上ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã«ã¯ã¾ãš, Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦å®
--- Shell#makedirs(*filenames)
--- Shell#install(filename_from, filename_to, mode)
- ã“れらã¯FileToolsクラスã«ã‚ã‚‹åŒåã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã¨åŒã˜ã§ã™.
+ ¤³¤ì¤é¤ÏFileTools¥¯¥é¥¹¤Ë¤¢¤ëƱ̾¤Î¥¯¥é¥¹¥á¥½¥Ã¥É¤ÈƱ¤¸¤Ç¤¹.
- ãã®ä»–, 以下ã®ã‚‚ã®ãŒã‚¨ã‚¤ãƒªã‚¢ã‚¹ã•れã¦ã„ã¾ã™.
+ ¤½¤Î¾, °Ê²¼¤Î¤â¤Î¤¬¥¨¥¤¥ê¥¢¥¹¤µ¤ì¤Æ¤¤¤Þ¤¹.
--- Shell#cmp <- Shell#compare
--- Shell#mv <- Shell#move
@@ -283,7 +283,7 @@ OS上ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã™ã‚‹ã«ã¯ã¾ãš, Shellã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦å®
--- Shell#rm_f <- Shell#safe_unlink
--- Shell#mkpath <- Shell#makedirs
-= サンプル
+= ¥µ¥ó¥×¥ë
== ex1
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
deleted file mode 100644
index e94727f913..0000000000
--- a/doc/standard_library.rdoc
+++ /dev/null
@@ -1,126 +0,0 @@
-= Ruby Standard Library
-
-The Ruby Standard Library is a vast collection of classes and modules that you
-can require in your code for additional features.
-
-Below is an overview of libraries and extensions followed by a brief
-description.
-
-== Libraries
-
-Abbrev:: Calculates a set of unique abbreviations for a given set of strings
-Base64:: Support for encoding and decoding binary data using a Base64 representation
-Benchmark:: Provides methods to measure and report the time used to execute code
-CGI:: Support for the Common Gateway Interface protocol
-CMath:: Provides Trigonometric and Transcendental functions for complex numbers
-complex.rb:: Deprecated library replaced by C implementation in core
-ConditionVariable:: Augments the Mutex class, provided by thread.rb
-CSV:: Provides an interface to read and write CSV files and data
-DEBUGGER__:: Debugging functionality for Ruby
-Delegator:: Provides three abilities to delegate method calls to an object
-DRb:: Distributed object system for Ruby
-E2MM:: Module for defining custom exceptions with specific messages
-English.rb:: Require 'English.rb' to reference global variables with less cryptic names
-ERB:: An easy to use but powerful templating system for Ruby
-FileUtils:: Several file utility methods for copying, moving, removing, etc
-Find:: This module supports top-down traversal of a set of file paths
-Forwardable:: Provides delegation of specified methods to a designated object
-GetoptLong:: Parse command line options similar to the GNU C getopt_long()
-GServer:: HTTP server with logging, thread pooling and multi-server management
-IPAddr:: Provides methods to manipulate IPv4 and IPv6 IP addresses
-IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop)
-Logger:: Provides a simple logging utility for outputing messages
-mathn.rb:: Deprecated library that extends math operations
-MakeMakefile:: Module used to generate a Makefile for C extensions
-Matrix:: Represents a mathematical matrix.
-MiniTest:: A test suite with TDD, BDD, mocking and benchmarking
-Monitor:: Provides an object or module to use safely by more than one thread
-Mutex_m:: Mixin to extend objects to be handled like a Mutex
-Net::FTP:: Support for the File Transfer Protocol
-Net::HTTP:: HTTP client api for Ruby
-Net::IMAP:: Ruby client api for Internet Message Access Protocol
-Net::POP3:: Ruby client library for POP3
-Net::SMTP:: Simple Mail Transfer Protocol client library for Ruby
-Net::Telnet:: Telnet client library for Ruby
-Observable:: Provides a mechanism for publich/subscribe pattern in Ruby
-OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
-Open3:: Provides access to stdin, stdout and stderr when running other programs
-OptionParser:: Ruby-oriented class for command-line option analysis
-OpenStruct:: Class to build custom data structures, similar to a Hash
-PP:: Provides a PrettyPrinter for Ruby objects
-PrettyPrinter:: Implements a pretty printing algorithm for readable structure
-Prime:: Prime numbers and factorization library
-profile.rb:: Runs the Ruby Profiler__
-Profiler__:: Provides a way to profile your Ruby application
-PStore:: Implements a file based persistence mechanism based on a Hash
-Queue:: Synchronized communication between threads, provided by thread.rb
-Racc:: A LALR(1) parser generator written in Ruby.
-Rake:: Ruby build program with capabilities similar to make
-rational.rb:: Deprecated library replaced by C implementation in core
-RbConfig:: Information of your configure and build of Ruby
-RDoc:: Produces HTML and command-line documentation for Ruby
-resolv-replace.rb:: Replace Socket DNS with Resolv
-Resolv:: Thread-aware DNS resolver library in Ruby
-REXML:: An XML toolkit for Ruby
-Rinda:: The Linda distributed computing paradigm in Ruby
-RSS:: Family of libraries that support various formats of XML "feeds"
-Gem:: Package management framework for Ruby
-Scanf:: A Ruby implementation of the C function scanf(3)
-SecureRandom:: Interface for secure random number generator
-Set:: Provides a class to deal with collections of unordered, unique values
-Shell:: An idiomatic Ruby interface for common UNIX shell commands
-Shellwords:: Manipulates strings with word parsing rules of UNIX Bourne shell
-Singleton:: Implementation of the Singleton pattern for Ruby
-Synchronizer:: A module that provides a two-phase lock with a counter
-Tempfile:: A utility class for managing temporary files
-Test::Unit:: A compatibility layer for MiniTest
-Thread:: Provides support classes for threaded programs
-ThreadsWait:: Watches for termination of multiple threads
-Time:: Extends the Time class with methods for parsing and conversion
-Timeout:: Auto-terminate potentially long-running operations in Ruby
-tmpdir.rb:: Extends the Dir class to manage the OS temporary file path
-Tracer:: Outputs a source level execution trace of a Ruby program
-TSort:: Topological sorting using Tarjan's algorithm
-un.rb:: Utilities to replace common UNIX commands
-URI:: A Ruby module providing support for Uniform Resource Identifiers
-WeakRef:: Allows a referenced object to be garbage-collected
-WEBrick:: An HTTP server toolkit for Ruby
-XMLRPC:: Remote Procedure Call over HTTP support for Ruby
-YAML:: Ruby client library for the Psych YAML implementation
-
-== Extensions
-
-BigDecimal:: Provides arbitrary-precision floating point decimal arithmetic
-Coverage:: Provides coverage measurement for Ruby
-Curses:: Implements the CRT screen handling and optimization library
-Date:: A subclass of Object includes Comparable module for handling dates
-DateTime:: Subclass of Date to handling dates, hours, minutes, seconds, offsets
-DBM:: Provides a wrapper for the UNIX-style Database Manager Library
-Digest:: Provides a framework for message digest libraries
-DL:: Provides a wrapper for the UNIX dlopen() library
-Etc:: Provides access to information typically stored in UNIX /etc directory
-Fcntl:: Loads constants defined in the OS fcntl.h C header file
-Fiddle:: A libffi wrapper for Ruby
-GDBM:: Ruby extension for the GNU dbm (gdbm) library
-IO:: Extensions for Ruby IO class, including #wait and ::console
-JSON:: Implements Javascript Object Notation for Ruby
-NKF:: Ruby extension for Network Kanji Filter
-objspace:: Extends ObjectSpace module to add methods for internal statistics
-OpenSSL:: Provides SSL, TSL and general purpose cryptography for Ruby
-Pathname:: Representation of the name of a file or directory on the filesystem
-Psych:: A YAML parser and emitter for Ruby
-PTY:: Creates and manages pseudo terminals
-Readline:: Provides an interface for GNU Readline and Edit Line (libedit)
-Ripper:: Provides an interface for parsing Ruby programs into S-expressions
-SBDM:: Provides a simple file-based key-value store with String keys and values
-Socket:: Access underlying OS socket implementations
-StringIO:: Pseudo I/O on String objects
-StringScanner:: Provides lexical scanning operations on a String
-Syslog:: Ruby interface for the POSIX system logging facility
-Tk:: Provides a framework for building a Graphical User Interface (GUI)
-WIN32OLE:: Provides an interface for OLE Automation in Ruby
-Zlib:: Ruby interface for the zlib compression/decompression library
-
-
-
-
diff --git a/doc/syntax.rdoc b/doc/syntax.rdoc
deleted file mode 100644
index fe0f98ce4c..0000000000
--- a/doc/syntax.rdoc
+++ /dev/null
@@ -1,34 +0,0 @@
-= Ruby Syntax
-
-The Ruby syntax is large and is split up into the following sections:
-
-Literals[rdoc-ref:syntax/literals.rdoc] ::
- Numbers, Strings, Arrays, Hashes, etc.
-
-Assignment[rdoc-ref:syntax/assignment.rdoc] ::
- Assignment and variables
-
-{Control Expressions}[rdoc-ref:syntax/control_expressions.rdoc] ::
- +if+, +unless+, +while+, +until+, +for+, +break+, +next+, +redo+
-
-Methods[rdoc-ref:syntax/methods.rdoc] ::
- Method and method argument syntax
-
-{Calling Methods}[rdoc-ref:syntax/calling_methods.rdoc] ::
- How to call a method (or send a message to a method)
-
-{Modules and Classes}[rdoc-ref:syntax/modules_and_classes.rdoc] ::
- Creating modules and classes including inheritance
-
-Exceptions[rdoc-ref:syntax/exceptions.rdoc] ::
- Exception handling syntax
-
-Precedence[rdoc-ref:syntax/precedence.rdoc] ::
- Precedence of ruby operators
-
-Refinements[rdoc-ref:syntax/refinements.rdoc] ::
- Use and behavior of the experimental refinements feature
-
-Miscellaneous[rdoc-ref:syntax/miscellaneous.rdoc] ::
- +alias+, +undef+, +BEGIN+, +END+
-
diff --git a/doc/syntax/assignment.rdoc b/doc/syntax/assignment.rdoc
deleted file mode 100644
index 7424d4885f..0000000000
--- a/doc/syntax/assignment.rdoc
+++ /dev/null
@@ -1,455 +0,0 @@
-= Assignment
-
-In Ruby assignment uses the <code>=</code> (equals sign) character. This
-example assigns the number five to the local variable +v+:
-
- v = 5
-
-Assignment creates a local variable if the variable was not previously
-referenced.
-
-== Local Variable Names
-
-A local variable name must start with a lowercase US-ASCII letter or a
-character with the eight bit set. Typically local variables are US-ASCII
-compatible since the keys to type them exist on all keyboards.
-
-(Ruby programs must be written in a US-ASCII-compatible character set. In
-such character sets if the eight bit is set it indicates an extended
-character. Ruby allows local variables to contain such characters.)
-
-A local variable name may contain letters, numbers, an <code>_</code>
-(underscore or low line) or a character with the eighth bit set.
-
-== Local Variable Scope
-
-Once a local variable name has been assigned-to all uses of the name for the
-rest of the scope are considered local variables.
-
-Here is an example:
-
- 1.times do
- a = 1
- puts "local variables in the block: #{local_variables.join ", "}"
- end
-
- puts "no local variables outside the block" if local_variables.empty?
-
-This prints:
-
- local variables in the block: a
- no local variables outside the block
-
-Since the block creates a new scope, any local variables created inside it do
-not leak to the surrounding scope.
-
-Variables defined in an outer scope appear inner scope:
-
- a = 0
-
- 1.times do
- puts "local variables: #{local_variables.join ", "}"
- end
-
-This prints:
-
- local variables: a
-
-You may isolate variables in a block from the outer scope by listing them
-following a <code>;</code> in the block's arguments. See the documentation
-for block local variables in the {calling
-methods}[rdoc-ref:syntax/calling_methods.rdoc] documentation for an example.
-
-See also Kernel#local_variables, but note that a +for+ loop does not create a
-new scope like a block does.
-
-== Local Variables and Methods
-
-In Ruby local variable names and method names are nearly identical. If you
-have not assigned to one of these ambiguous names ruby will assume you wish to
-call a method. Once you have assigned to the name ruby will assume you wish
-to reference a local variable.
-
-The local variable is created when the parser encounters the assignment, not
-when the assignment occurs:
-
- a = 0 if false # does not assign to a
-
- p local_variables # prints [:a]
-
- p a # prints nil
-
-The similarity between method and local variable names can lead to confusing
-code, for example:
-
- def big_calculation
- 42 # pretend this takes a long time
- end
-
- big_calculation = big_calculation()
-
-Now any reference to +big_calculation+ is considered a local variable and will
-be cached. To call the method, use <code>self.big_calculation</code>.
-
-You can force a method call by using empty argument parentheses as shown above
-or by using an explicit receiver like <code>self.</code>. Using an explicit
-receiver may raise a NameError if the method's visibility is not public.
-
-Another commonly confusing case is when using a modifier +if+:
-
- p a if a = 0.zero?
-
-Rather than printing "true" you receive a NameError, "undefined local variable
-or method `a'". Since ruby parses the bare +a+ left of the +if+ first and has
-not yet seen an assignment to +a+ it assumes you wish to call a method. Ruby
-then sees the assignment to +a+ and will assume you are referencing a local
-method.
-
-The confusion comes from the out-of-order execution of the expression. First
-the local variable is assigned-to then you attempt to call a nonexistent
-method.
-
-== Instance Variables
-
-Instance variables are shared across all methods for the same object.
-
-An instance variable must start with a <code>@</code> ("at" sign or
-commercial at). Otherwise instance variable names follow the rules as local
-variable names. Since the instance variable starts with an <code>@</code> the
-second character may be an upper-case letter.
-
-Here is an example of instance variable usage:
-
- class C
- def initialize(value)
- @instance_variable = value
- end
-
- def value
- @instance_variable
- end
- end
-
- object1 = C.new "some value"
- object2 = C.new "other value"
-
- p object1.value # prints "some value"
- p object2.value # prints "other value"
-
-An uninitialized instance variable has a value of +nil+. If you run Ruby with
-warnings enabled you will get a warning when accessing an uninitialized
-instance variable.
-
-The +value+ method has access to the value set by the +initialize+ method, but
-only for the same object.
-
-== Class Variables
-
-Class variables are shared between a class, its subclasses and its instances.
-
-A class variable must start with a <code>@@</code> (two "at" signs). The rest
-of the name follows the same rules as instance variables.
-
-Here is an example:
-
- class A
- @@class_variable = 0
-
- def value
- @@class_variable
- end
-
- def update
- @@class_variable = @@class_variable + 1
- end
- end
-
- class B < A
- def update
- @@class_variable = @@class_variable + 2
- end
- end
-
- a = A.new
- b = B.new
-
- puts "A value: #{a.value}"
- puts "B value: #{b.value}"
-
-This prints:
-
- A value: 0
- B value: 0
-
-Continuing with the same example, we can update using objects from either
-class and the value is shared:
-
- puts "update A"
- a.update
-
- puts "A value: #{a.value}"
- puts "B value: #{b.value}"
-
- puts "update B"
- b.update
-
- puts "A value: #{a.value}"
- puts "B value: #{b.value}"
-
- puts "update A"
- a.update
-
- puts "A value: #{a.value}"
- puts "B value: #{b.value}"
-
-This prints:
-
- update A
- A value: 1
- B value: 1
- update B
- A value: 3
- B value: 3
- update A
- A value: 4
- B value: 4
-
-Accessing an uninitialized class variable will raise a NameError exception.
-
-Note that classes have instance variables because classes are objects, so
-try not to confuse class and instance variables.
-
-== Global Variables
-
-Global variables are accessible everywhere.
-
-Global variables start with a <code>$</code> (dollar sign). The rest of the
-name follows the same rules as instance variables.
-
-Here is an example:
-
- $global = 0
-
- class C
- puts "in a class: #{$global}"
-
- def my_method
- puts "in a method: #{$global}"
-
- $global = $global + 1
- $other_global = 3
- end
- end
-
- C.new.my_method
-
- puts "at top-level, $global: #{$global}, $other_global: #{$other_global}"
-
-This prints:
-
- in a class: 0
- in a method: 0
- at top-level, $global: 1, $other_global: 3
-
-An uninitialized global variable has a value of +nil+.
-
-Ruby has some special globals that behave differently depending on context
-such as the regular expression match variables or that have a side-effect when
-assigned to. See the {global variables documentation}[rdoc-ref:globals.rdoc]
-for details.
-
-== Assignment Methods
-
-You can define methods that will behave like assignment, for example:
-
- class C
- def value=(value)
- @value = value
- end
- end
-
- c = C.new
- c.value = 42
-
-Using assignment methods allows your programs to look nicer. When assigning
-to an instance variable most people use Module#attr_accessor:
-
- class C
- attr_accessor :value
- end
-
-When using method assignment you must always have a receiver. If you do not
-have a receiver Ruby assumes you are assigning to a local variable:
-
- class C
- attr_accessor :value
-
- def my_method
- value = 42
-
- puts "local_variables: #{local_variables.join ", "}"
- puts "@value: #{@value.inspect}"
- end
- end
-
- C.new.my_method
-
-This prints:
-
- local_variables: value
- @value: nil
-
-To use the assignment method you must set the receiver:
-
- class C
- attr_accessor :value
-
- def my_method
- self.value = 42
-
- puts "local_variables: #{local_variables.join ", "}"
- puts "@value: #{@value.inspect}"
- end
- end
-
- C.new.my_method
-
-This prints:
-
- local_variables:
- @value: 42
-
-== Abbreviated Assignment
-
-You can mix several of the operators and assignment. To add 1 to an object
-you can write:
-
- a = 1
-
- a += 2
-
- p a # prints 3
-
-This is equivalent to:
-
- a = 1
-
- a = a + 2
-
- p a # prints 3
-
-You can use the following operators this way: <code>+</code>, <code>-</code>,
-<code>*</code>, <code>/</code>, <code>%</code>, <code>**</code>,
-<code>&</code>, <code>|</code>, <code>^</code>, <code><<</code>,
-<code>>></code>
-
-There are also <code>||=</code> and <code>&&=</code>. The former makes an
-assignment if the value was +nil+ or +false+ while the latter makes an
-assignment if the value was not +nil+ or +false+.
-
-Here is an example:
-
- a ||= 0
- a &&= 1
-
- p a # prints 1
-
-Note that these two operators behave more like <code>a || a = 0<code> than
-<code>a = a || 0</code>.
-
-== Implicit Array Assignment
-
-You can implicitly create an array by listing multiple values when assigning:
-
- a = 1, 2, 3
-
- p a # prints [1, 2, 3]
-
-This implicitly creates an Array.
-
-You can use <code>*</code> or the "splat" operator or unpack an Array when
-assigning. This is similar to multiple assignment:
-
- a = *[1, 2, 3]
-
- p a # prints [1, 2, 3]
-
-You can splat anywhere in the left-hand side of the assignment:
-
- a = 1, *[2, 3]
-
- p a # prints [1, 2, 3]
-
-== Multiple Assignment
-
-You can assign multiple values on the left-hand side to multiple variables:
-
- a, b = 1, 2
-
- p a: a, b: b # prints {:a=>1, :b=>2}
-
-In the following sections any place "variable" is used an assignment method,
-instance, class or global will also work:
-
- def value=(value)
- p assigned: value
- end
-
- self.value, $global = 1, 2 # prints {:assigned=>1}
-
- p $global # prints 2
-
-You can use multiple assignment to swap two values in-place:
-
- old_value = 1
-
- new_value, old_value = old_value, 2
-
- p new_value: new_value, old_value: old_value
- # prints {:new_value=>1, :old_value=>2}
-
-If you have more values on the left hand side of the assignment than variables
-on the right hand side the extra values are ignored:
-
- a, b = 1, 2, 3
-
- p a: a, b: b # prints {:a=>1, :b=>2}
-
-You can use <code>*</code> to gather extra values on the right-hand side of
-the assignment.
-
- a, *b = 1, 2, 3
-
- p a: a, b: b # prints {:a=>1, :b=>[2, 3]}
-
-The <code>*</code> can appear anywhere on the right-hand side:
-
- *a, b = 1, 2, 3
-
- p a: a, b: b # prints {:a=>[1, 2], :b=>3}
-
-But you may only use one <code>*</code> in an assignment.
-
-== Array Decomposition
-
-Like Array decomposition in {method arguments}[rdoc-ref:syntax/methods.rdoc]
-you can decompose an Array during assignment using parenthesis:
-
- (a, b) = [1, 2]
-
- p a: a, b: b # prints {:a=>1, :b=>2}
-
-You can decompose an Array as part of a larger multiple assignment:
-
- a, (b, c) = 1, [2, 3]
-
- p a: a, b: b, c: c # prints {:a=>1, :b=>2, :c=>3}
-
-Since each decomposition is considered its own multiple assignment you can use
-<code>*</code> to gather arguments in the decomposition:
-
- a, (b, *c), *d = 1, [2, 3, 4], 5, 6
-
- p a: a, b: b, c: c, d: d
- # prints {:a=>1, :b=>2, :c=>[3, 4], :d=>[5, 6]}
-
diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc
deleted file mode 100644
index 79c0de59dc..0000000000
--- a/doc/syntax/calling_methods.rdoc
+++ /dev/null
@@ -1,349 +0,0 @@
-= Calling Methods
-
-Calling a method sends a message to an object so it can perform some work.
-
-In ruby you send a message to an object like this:
-
- my_method()
-
-Note that the parenthesis are optional:
-
- my_method
-
-Except when there is difference between using and omitting parentheses, this
-document uses parenthesis when arguments are present to avoid confusion.
-
-This section only covers calling methods. See also the {syntax documentation
-on defining methods}[rdoc-ref:syntax/methods.rdoc].
-
-== Receiver
-
-+self+ is the default receiver. If you don't specify any receiver +self+ will
-be used. To specify a receiver use <code>.</code>:
-
- my_object.my_method
-
-This sends the +my_method+ message to +my_object+. Any object can be a
-receiver but depending on the method's visibility sending a message may raise a
-NoMethodError.
-
-You may also use <code>::</code> to designate a receiver, but this is rarely
-used due to the potential for confusion with <code>::</code> for namespaces.
-
-== Arguments
-
-There are three types of arguments when sending a message, the positional
-arguments, keyword (or named) arguments and the block argument. Each message
-sent may use one, two or all types of arguments, but the arguments must be
-supplied in this order.
-
-All arguments in ruby are passed by reference and are not lazily evaluated.
-
-Each argument is separated by a <code>,</code>:
-
- my_method(1, '2', :three)
-
-Arguments may be an expression, a hash argument:
-
- 'key' => value
-
-or a keyword argument:
-
- key: value
-
-Hash and keyword arguments must be contiguous and must appear after all
-positional arguments, but may be mixed:
-
- my_method('a' => 1, b: 2, 'c' => 3)
-
-=== Positional Arguments
-
-The positional arguments for the message follow the method name:
-
- my_method(argument1, argument2)
-
-In many cases parenthesis are not necessary when sending a message:
-
- my_method argument1, argument2
-
-However, parenthesis are necessary to avoid ambiguity. This will raise a
-SyntaxError because ruby does not know which method argument3 should be sent
-to:
-
- method_one argument1, method_two argument2, argument3
-
-If the method definition has a <code>*argument</code> extra positional
-arguments will be assigned to +argument+ in the method as an Array.
-
-If the method definition doesn't include keyword arguments the keyword or
-hash-type arguments are assigned as a single hash to the last argument:
-
- def my_method(options)
- p options
- end
-
- my_method('a' => 1, b: 2) # prints: {'a'=>1, :b=>2}
-
-If too many positional arguments are given an ArgumentError is raised.
-
-=== Default Positional Arguments
-
-When the method defines default arguments you do not need to supply all the
-arguments to the method. Ruby will fill in the missing arguments in-order.
-
-First we'll cover the simple case where the default arguments appear on the
-right. Consider this method:
-
- def my_method(a, b, c = 3, d = 4)
- p [a, b, c, d]
- end
-
-Here +c+ and +d+ have default values which ruby will apply for you. If you
-send only two arguments to this method:
-
- my_method(1, 2)
-
-You will see ruby print <code>[1, 2, 3, 4]</code>.
-
-If you send three arguments:
-
- my_method(1, 2, 5)
-
-You will see ruby print <code>[1, 2, 5, 4]</code>
-
-Ruby fills in the missing arguments from left to right.
-
-Ruby allows default values to appear in the middle of positional arguments.
-Consider this more complicated method:
-
- def my_method(a, b = 2, c = 3, d)
- p [a, b, c, d]
- end
-
-Here +b+ and +c+ have default values. If you send only two arguments to this
-method:
-
- my_method(1, 4)
-
-You will see ruby print <code>[1, 2, 3, 4]</code>.
-
-If you send three arguments:
-
- my_method(1, 5, 6)
-
-You will see ruby print <code>[1, 5, 3, 6]</code>.
-
-Describing this in words gets complicated and confusing. I'll describe it
-in variables and values instead.
-
-First <code>1</code> is assigned to +a+, then <code>6</code> is assigned to
-+d+. This leaves only the arguments with default values. Since
-<code>5</code> has not been assigned to a value yet, it is given to +b+ and
-+c+ uses its default value of <code>3</code>.
-
-=== Keyword Arguments
-
-Keyword arguments follow any positional arguments and are separated by commas
-like positional arguments:
-
- my_method(positional1, keyword1: value1, keyword2: value2)
-
-Any keyword arguments not given will use the default value from the method
-definition. If a keyword argument is given that the method did not list an
-ArgumentError will be raised.
-
-=== Block Argument
-
-The block argument sends a closure from the calling scope to the method.
-
-The block argument is always last when sending a message to a method. A block
-is sent to a method using <code>do ... end</code> or <code>{ ... }</code>:
-
- my_method do
- # ...
- end
-
-or:
-
- my_method {
- # ...
- }
-
-<code>do end</code> has lower precedence than <code>{ }</code> so:
-
- method_1 method_2 {
- # ...
- }
-
-Sends the block to +method_2+ while:
-
- method_1 method_2 do
- # ...
- end
-
-Sends the block to +method_1+. Note that in the first case if parentheses are
-used the block is sent to +method_1+.
-
-A block will accept arguments from the method it was sent to. Arguments are
-defined similar to the way a method defines arguments. The block's arguments
-go in <code>| ... |</code> following the opening <code>do</code> or
-<code>{</code>:
-
- my_method do |argument1, argument2|
- # ...
- end
-
-==== Block Local Arguments
-
-You may also declare block-local arguments to a block using <code>;</code> in
-the block arguments list. Assigning to a block-local argument will not
-override local arguments outside the block in the caller's scope:
-
- def my_method
- yield self
- end
-
- place = "world"
-
- my_method do |obj; place|
- place = "block"
- puts "hello #{obj} this is #{place}"
- end
-
- puts "place is: #{place}"
-
-This prints:
-
- hello main this is block
- place is world
-
-So the +place+ variable in the block is not the same +place+ variable as
-outside the block. Removing <code>; place</code> from the block arguments
-gives this result:
-
- hello main this is block
- place is block
-
-=== Array to Arguments Conversion
-
-Given the following method:
-
- def my_method(argument1, argument2, argument3)
- end
-
-You can turn an Array into an argument list with <code>*</code> (or splat)
-operator:
-
- arguments = [1, 2, 3]
- my_method(*arguments)
-
-or:
-
- arguments = [2, 3]
- my_method(1, *arguments)
-
-Both are equivalent to:
-
- my_method(1, 2, 3)
-
-If the method accepts keyword arguments the splat operator will convert a hash
-at the end of the array into keyword arguments:
-
- def my_method(a, b, c: 3)
- end
-
- arguments = [1, 2, { c: 4 }]
- my_method(*arguments)
-
-You may also use the <code>**</code> (described next) to convert a Hash into
-keyword arguments.
-
-If the number of objects in the Array do not match the number of arguments for
-the method an ArgumentError will be raised.
-
-If the splat operator comes first in the call, parentheses must be used to
-avoid a warning.
-
-=== Hash to Keyword Arguments Conversion
-
-Given the following method:
-
- def my_method(first: 1, second: 2, third: 3)
- end
-
-You can turn a Hash into keyword arguments with the <code>**</code> operator:
-
- arguments = { first: 3, second: 4, third: 5 }
- my_method(**arguments)
-
-or:
-
- arguments = { first: 3, second: 4 }
- my_method(third: 5, **arguments)
-
-Both are equivalent to:
-
- my_method(first: 3, second: 4, third: 5)
-
-If the method definition uses <code>**</code> to gather arbitrary keyword
-arguments they will not be gathered by <code>*</code>:
-
- def my_method(*a, **kw)
- p arguments: a, keywords: kw
- end
-
- my_method(1, 2, '3' => 4, five: 6)
-
-Prints:
-
- {:arguments=>[1, 2], :keywords=>{"3"=>4, :five=>6}}
-
-Unlike the splat operator described above the <code>**</code> operator has no
-commonly recognized name.
-
-=== Proc to Block Conversion
-
-Given a method that use a block:
-
- def my_method
- yield self
- end
-
-You can convert a proc or lambda to a block argument with the <code>&</code>
-operator:
-
- argument = proc { |a| puts "#{a.inspect} was yielded" }
-
- my_method(&argument)
-
-If the splat operator comes first in the call, parenthesis must be used to
-avoid a warning.
-
-Unlike the splat operator described above the <code>&</code> operator has no
-commonly recognized name.
-
-== Method Lookup
-
-When you send a message Ruby looks up the method that matches the name of the
-message for the receiver. Methods are stored in classes and modules so method
-lookup walks these, not the objects themselves.
-
-Here is the order of method lookup for the receiver's class or module +R+:
-
-* The prepended modules of +R+ in reverse order
-* For a matching method in +R+
-* The included modules of +R+ in reverse order
-
-If +R+ is a class with a superclass, this is repeated with +R+'s superclass
-until a method is found.
-
-Once a match is found method lookup stops.
-
-If no match is found this repeats from the beginning, but looking for
-+method_missing+. The default +method_missing+ is BasicObject#method_missing
-which raises a NameError when invoked.
-
-If refinements (an experimental feature) are active the method lookup changes.
-See the {refinements documentation}[rdoc-ref:syntax/refinements.rdoc] for
-details.
-
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
deleted file mode 100644
index 0efc1668ad..0000000000
--- a/doc/syntax/control_expressions.rdoc
+++ /dev/null
@@ -1,500 +0,0 @@
-= Control Expressions
-
-Ruby has a variety of ways to control execution. All the expressions described
-here return a value.
-
-For the tests in these control expressions, +nil+ and +false+ are false-values
-and +true+ and any other object are true-values. In this document "true" will
-mean "true-value" and "false" will mean "false-value".
-
-== +if+ Expression
-
-The simplest +if+ expression has two parts, a "test" expression and a "then"
-expression. If the "test" expression evaluates to a true then the "then"
-expression is evaluated.
-
-Here is a simple if statement:
-
- if true then
- puts "the test resulted in a true-value"
- end
-
-This will print "the test resulted in a true-value".
-
-The +then+ is optional:
-
- if true
- puts "the test resulted in a true-value"
- end
-
-This document will omit the optional +then+ for all expressions as that is the
-most common usage of +if+.
-
-You may also add an +else+ expression. If the test does not evaluate to true
-the +else+ expression will be executed:
-
- if false
- puts "the test resulted in a true-value"
- else
- puts "the test resulted in a false-value"
- end
-
-This will print "the test resulted in a false-value".
-
-You may add an arbitrary number of extra tests to an if expression using
-+elsif+. An +elsif+ executes when all tests above the +elsif+ are false.
-
- a = 1
-
- if a == 0
- puts "a is zero"
- elsif a == 1
- puts "a is one"
- else
- puts "a is some other value"
- end
-
-This will print "a is one" as <code>1</code> is not equal to <code>0</code>.
-Since +else+ is only executed when there are no matching conditions.
-
-Once a condition matches, either the +if+ condition or any +elsif+ condition,
-the +if+ expression is complete and no further tests will be performed.
-
-Like an +if+, an +elsif+ condition may be followed by a +then+.
-
-In this example only "a is one" is printed:
-
- a = 1
-
- if a == 0
- puts "a is zero"
- elsif a == 1
- puts "a is one"
- elsif a >= 1
- puts "a is greater than or equal to one"
- else
- puts "a is some other value"
- end
-
-The tests for +if+ and +elsif+ may have side-effects. The most common use of
-side-effect is to cache a value into a local variable:
-
- if a = object.some_value
- # do something to a
- end
-
-The result value of an +if+ expression is the last value executed in the
-expression.
-
-== Ternary if
-
-You may also write a if-then-else expression using <code>?</code> and
-<code>:</code>. This ternary if:
-
- input_type = gets =~ /hello/i ? "greeting" : "other"
-
-Is the same as this +if+ expression:
-
- input_type =
- if gets =~ /hello/i
- "greeting"
- else
- "other"
- end
-
-While the ternary if is much shorter to write than the more verbose form, for
-readability it is recommended that the ternary if is only used for simple
-conditionals. Also, avoid using multiple ternary conditions in the same
-expression as this can be confusing.
-
-== +unless+ Expression
-
-The +unless+ expression is the opposite of the +if+ expression. If the value
-is false the "then" expression is executed:
-
- unless true
- puts "the value is a false-value"
- end
-
-This prints nothing as true is not a false-value.
-
-You may use an optional +then+ with +unless+ just like +if+.
-
-Note that the above +unless+ expression is the same as:
-
- if not true
- puts "the value is a false-value"
- end
-
-Like an +if+ expression you may use an +else+ condition with +unless+:
-
- unless true
- puts "the value is false"
- else
- puts "the value is true"
- end
-
-This prints "the value is true" from the +else+ condition.
-
-You may not use +elsif+ with an +unless+ expression.
-
-The result value of an +unless+ expression is the last value executed in the
-expression.
-
-== Modifier +if+ and +unless+
-
-+if+ and +unless+ can also be used to modify an expression. When used as a
-modifier the left-hand side is the "then" expression and the right-hand side
-is the "test" expression:
-
- a = 0
-
- a += 1 if a.zero?
-
- p a
-
-This will print 1.
-
- a = 0
-
- a += 1 unless a.zero?
-
- p a
-
-This will print 0.
-
-While the modifier and standard versions have both a "test" expression and a
-"then" expression, they are not exact transformations of each other due to
-parse order. Here is an example that shows the difference:
-
- p a if a = 0.zero?
-
-This raises the NameError "undefined local variable or method `a'".
-
-When ruby parses this expression it first encounters +a+ as a method call in
-the "then" expression, then later it sees the assignment to +a+ in the "test"
-expression and marks +a+ as a local variable.
-
-When running this line it first executes the "test" expression, <code>a =
-0.zero?</code>.
-
-Since the test is true it executes the "then" expression, <code>p a</code>.
-Since the +a+ in the body was recorded as a method which does not exist the
-NameError is raised.
-
-The same is true for +unless+.
-
-== +case+ Expression
-
-The +case+ expression can be used in two ways.
-
-The most common way is to compare an object against multiple patterns. The
-patterns are matched using the +===+ method which is aliased to +==+ on
-Object. Other classes must override it to give meaningful behavior. See
-Module#=== and Regexp#=== for examples.
-
-Here is an example of using +case+ to compare a String against a pattern:
-
- case "12345"
- when /^1/
- puts "the string starts with one"
- else
- puts "I don't know what the string starts with"
- end
-
-Here the string <code>"12345"</code> is compared with <code>/^1/</code> by
-calling <code>/^1/ === "12345"</code> which returns +true+. Like the +if+
-expression the first +when+ that matches is executed and all other matches are
-ignored.
-
-If no matches are found the +else+ is executed.
-
-The +else+ and +then+ are optional, this +case+ expression gives the same
-result as the one above:
-
- case "12345"
- when /^1/
- puts "the string starts with one"
- end
-
-You may place multiple conditions on the same +when+:
-
- case "2"
- when /^1/, "2"
- puts "the string starts with one or is '2'"
- end
-
-Ruby will try each condition in turn, so first <code>/^1/ === "2"</code>
-returns +false+, then <code>"2" === "2"</code> returns +true+, so "the string
-starts with one or is '2'" is printed.
-
-You may use +then+ after the +when+ condition. This is most frequently used
-to place the body of the +when+ on a single line.
-
- case a
- when 1, 2 then puts "a is one or two
- when 3 then puts "a is three"
- else puts "I don't know what a is"
- end
-
-The other way to use a +case+ expression is like an if-elsif expression:
-
- a = 2
-
- case
- when a == 1, a == 2
- puts "a is one or two"
- when a == 3
- puts "a is three"
- else
- puts "I don't know what a is"
- end
-
-Again, the +then+ and +else+ are optional.
-
-The result value of a +case+ expression is the last value executed in the
-expression.
-
-== +while+ Loop
-
-The +while+ loop executes while a condition is true:
-
- a = 0
-
- while a < 10 do
- p a
- a += 1
- end
-
- p a
-
-Prints the numbers 0 through 10. The condition <code>a < 10</code> is checked
-before the loop is entered, then the body executes, then the condition is
-checked again. When the condition results in false the loop is terminated.
-
-The +do+ keyword is optional. The following loop is equivalent to the loop
-above:
-
- while a < 10
- p a
- a += 1
- end
-
-The result of a +while+ loop is +nil+ unless +break+ is used to supply a
-value.
-
-== +until+ Loop
-
-The +until+ loop executes while a condition is false:
-
- a = 0
-
- until a > 10 do
- p a
- a += 1
- end
-
- p a
-
-This prints the numbers 0 through 11. Like a while loop the condition <code>a
-> 10</code> is checked when entering the loop and each time the loop body
-executes. If the condition is false the loop will continue to execute.
-
-Like a +while+ loop the +do+ is optional.
-
-Like a +while+ loop the result of an +until+ loop is nil unless +break+ is
-used.
-
-== +for+ Loop
-
-The +for+ loop consists of +for+ followed by a variable to contain the
-iteration argument followed by +in+ and the value to iterate over using #each.
-The +do+ is optional:
-
- for value in [1, 2, 3] do
- puts value
- end
-
-Prints 1, 2 and 3.
-
-Like +while+ and +until+, the +do+ is optional.
-
-The +for+ loop is similar to using #each, but does not create a new variable
-scope.
-
-The result value of a +for+ loop is the value iterated over unless +break+ is
-used.
-
-The +for+ loop is rarely used in modern ruby programs.
-
-== Modifier +while+ and +until+
-
-Like +if+ and +unless+, +while+ and +until+ can be used as modifiers:
-
- a = 0
-
- a += 1 while a < 10
-
- p a # prints 10
-
-+until+ used as a modifier:
-
- a = 0
-
- a += 1 until a > 10
-
- p a # prints 11
-
-You can use +begin+ and +end+ to create a +while+ loop that runs the body once
-before the condition:
-
- a = 0
-
- begin
- a += 1
- end while a < 10
-
- p a # prints 10
-
-If you don't use +rescue+ or +ensure+ Ruby optimizes away any exception
-handling overhead.
-
-== +break+ Statement
-
-Use +break+ to leave a block early. This will stop iterating over the items in +values+ if one of them is even:
-
- values.each do |value|
- break if value.even?
-
- # ...
- end
-
-You can also terminate from a +while+ loop using +break+:
-
- a = 0
-
- while true do
- p a
- a += 1
-
- break if a < 10
- end
-
- p a
-
-This prints the numbers 0 and 1.
-
-+break+ accepts a value that supplies the result of the expression it is
-"breaking" out of:
-
- result = [1, 2, 3].each do |value|
- break value * 2 if value.even?
- end
-
- p result # prints 4
-
-== +next+ Statement
-
-Use +next+ to skip the rest of the current iteration:
-
- result = [1, 2, 3].map do |value|
- next if value.even?
-
- value * 2
- end
-
- p result # prints [2, nil, 6]
-
-+next+ accepts an argument that can be used the result of the current block
-iteration:
-
- result = [1, 2, 3].map do |value|
- next value if value.even?
-
- value * 2
- end
-
- p result # prints [2, 2, 6]
-
-== +redo+ Statement
-
-Use +redo+ to redo the current iteration:
-
- result = []
-
- while result.length < 10 do
- result << result.length
-
- redo if result.last.even?
-
- result << result.length + 1
- end
-
- p result
-
-This prints [0, 1, 3, 3, 5, 5, 7, 7, 9, 9, 11]
-
-In Ruby 1.8 you could also use +retry+ where you used +redo+. This is no
-longer true, now you will receive a SyntaxError when you use +retry+ outside
-of a +rescue+ block. See {Exceptions}[rdoc-ref:syntax/exceptions.rdoc]
-for proper usage of +retry+.
-
-== Flip-Flop
-
-The flip-flop is rarely seen conditional expression. It's primary use is
-for processing text from ruby one-line programs used with <code>ruby -n</code>
-or <code>ruby -p</code>.
-
-The form of the flip-flop is an expression that indicates when the
-flip-flop turns on, <code>..</code> (or <code>...</code>), then an expression
-that indicates when the flip-flop will turn off. While the flip-flop is on it
-will continue to evaluate to +true+, and +false+ when off.
-
-Here is an example:
-
-
- selected = []
-
- 0.upto 10 do |value|
- selected << value if value==2..value==8
- end
-
- p selected # prints [2, 3, 4, 5, 6, 7, 8]
-
-In the above example the on condition is <code>n==2</code>. The flip-flop
-is initially off (false) for 0 and 1, but becomes on (true) for 2 and remains
-on through 8. After 8 it turns off and remains off for 9 and 10.
-
-The flip-flop must be used inside a conditional such as +if+, +while+,
-+unless+, +until+ etc. including the modifier forms.
-
-When you use an inclusive range (<code>..</code>) the off condition is
-evaluated when the on condition changes:
-
- selected = []
-
- 0.upto 5 do |value|
- selected << value if value==2..value==2
- end
-
- p selected # prints [2]
-
-Here both sides of the flip-flop are evaluated so the flip-flop turns on and
-off only when +value+ equals 2. Since the flip-flop turned on in the
-iteration it returns true.
-
-When you use an exclusive range (<code>...</code>) the off condition is
-evaluated on the following iteration:
-
- selected = []
-
- 0.upto 5 do |value|
- selected << value if value==2...value==2
- end
-
- p selected # prints [2, 3, 4, 5]
-
-Here the flip-flop turns on when +value+ equals 2 but doesn't turn off on the
-same iteration. The off condition isn't evaluated until the following
-iteration and +value+ will never be two again.
-
diff --git a/doc/syntax/exceptions.rdoc b/doc/syntax/exceptions.rdoc
deleted file mode 100644
index 0efc35a59f..0000000000
--- a/doc/syntax/exceptions.rdoc
+++ /dev/null
@@ -1,96 +0,0 @@
-= Exception Handling
-
-Exceptions are rescued in a +begin+/+end+ block:
-
- begin
- # code that might raise
- rescue
- # handle exception
- end
-
-If you are inside a method you do not need to use +begin+ or +end+ unless you
-wish to limit the scope of rescued exceptions:
-
- def my_method
- # ...
- rescue
- # ...
- end
-
-The same is true for a +class+ or +module+.
-
-You can assign the exception to a local variable by using <tt>=>
-variable_name</tt> at the end of the +rescue+ line:
-
- begin
- # ...
- rescue => exception
- warn exception.message
- raise # re-raise the current exception
- end
-
-By default StandardError and its subclasses are rescued. You can rescue a
-specific set of exception classes (and their subclasses) by listing them after
-+rescue+:
-
- begin
- # ...
- rescue ArgumentError, NameError
- # handle ArgumentError or NameError
- end
-
-You may rescue different types of exceptions in different ways:
-
- begin
- # ...
- rescue ArgumentError
- # handle ArgumentError
- rescue NameError
- # handle NameError
- rescue
- # handle any StandardError
- end
-
-The exception is matched to the rescue section starting at the top, and matches
-only once. If an ArgumentError is raised in the begin section it will not be
-handled in the StandardError section.
-
-You may retry rescued exceptions:
-
- begin
- # ...
- rescue
- # do something that may change the result of the begin block
- retry
- end
-
-Execution will resume at the start of the begin block, so be careful not to
-create an infinite loop.
-
-Inside a rescue block is the only valid location for +retry+, all other uses
-will raise a SyntaxError. If you wish to retry a block iteration use +redo+.
-See {Control Expressions}[rdoc-ref:syntax/control_expressions.rdoc] for
-details.
-
-To always run some code whether an exception was raised or not, use +ensure+:
-
- begin
- # ...
- rescue
- # ...
- ensure
- # this always runs
- end
-
-You may also run some code when an exception is not raised:
-
- begin
- # ...
- rescue
- # ...
- else
- # this runs only when no exception was raised
- ensure
- # ...
- end
-
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
deleted file mode 100644
index bfe070b0ab..0000000000
--- a/doc/syntax/literals.rdoc
+++ /dev/null
@@ -1,295 +0,0 @@
-= Literals
-
-Literals create objects you can use in your program. Literals include:
-
-* Booleans and nil
-* Numbers
-* Strings
-* Symbols
-* Arrays
-* Hashes
-* Ranges
-* Regular Expressions
-* Procs
-
-== Booleans and nil
-
-+nil+ and +false+ are both false values. +nil+ is sometimes used to indicate
-"no value" or "unknown" but evaluates to +false+ in conditional expressions.
-
-+true+ is a true value. All objects except +nil+ and +false+ evaluate to a
-true value in conditional expressions.
-
-(There are also the constants +TRUE+, +FALSE+ and +NIL+, but the lowercase
-literal forms are preferred.)
-
-== Numbers
-
-You can write integers of any size as follows:
-
- 1234
- 1_234
-
-These numbers have the same value, 1,234. The underscore may be used to
-enhance readability for humans. You may place an underscore anywhere in the
-number.
-
-Floating point numbers may be written as follows:
-
- 12.34
- 1234e-2
- 1.234E1
-
-These numbers have the same value, 12.34. You may use underscores in floating
-point numbers as well.
-
-You can use a special prefix to write numbers in decimal, hexadecimal, octal
-or binary formats. For decimal numbers use a prefix of <tt>0d</tt>, for
-hexadecimal numbers use a prefix of <tt>0x</tt>, for octal numbers use a
-prefix of <tt>0</tt> or <tt>0o</tt>, for binary numbers use a prefix of
-<tt>0b</tt>. The alphabetic component of the number is not case-sensitive.
-
-Examples:
-
- 0d170
- 0D170
-
- 0xaa
- 0xAa
- 0xAA
- 0Xaa
- 0XAa
- 0XaA
-
- 0252
- 0o252
- 0O252
-
- 0b10101010
- 0B10101010
-
-All these numbers have the same decimal value, 170. Like integers and floats
-you may use an underscore for readability.
-
-== Strings
-
-The most common way of writing strings is using <tt>"</tt>:
-
- "This is a string."
-
-The string may be many lines long.
-
-Any internal <tt>"</tt> must be escaped:
-
- "This string has a quote: \". As you can see, it is escaped"
-
-Double-quote strings allow escaped characters such as <tt>\n</tt> for newline,
-<tt>\t</tt> for tab, etc.
-
-Double-quote strings allow interpolation of other values using
-<tt>#{...}</tt>:
-
- "One plus one is two: #{1 + 1}"
-
-Any expression may be placed inside the interpolated section, but it's best to
-keep the expression small for readability.
-
-Interpolation may be disabled by escaping the "#" character or using
-single-quote strings:
-
- '#{1 + 1}' #=> "\#{1 + 1}"
-
-In addition to disabling interpolation, single-quoted strings also disable all
-escape sequences except for the single-quote (<tt>\'</tt>).
-
-You may also create strings using <tt>%</tt>:
-
- %(1 + 1 is #{1 + 1}) #=> "1 + 1 is 2"
-
-There are two different types of <tt>%</tt> strings <tt>%q(...)</tt> behaves
-like a single-quote string (no interpolation or character escaping) while
-<tt>%Q</tt> behaves as a double-quote string. See Percent Strings below for
-more discussion of the syntax of percent strings.
-
-=== Here Documents
-
-If you are writing a large block of text you may use a "here document" or
-"heredoc":
-
- expected_result = <<HEREDOC
- This would contain specially formatted text.
-
- That might span many lines
- HEREDOC
-
-The heredoc starts on the line following <tt><<HEREDOC</tt> and ends with the
-next line that starts with <tt>HEREDOC</tt>. The result includes the ending
-newline.
-
-You may use any identifier with a heredoc, but all-uppercase identifiers are
-typically used.
-
-You may indent the ending identifier if you place a "-" after <tt><<</tt>:
-
- expected_result = <<-INDENTED_HEREDOC
- This would contain specially formatted text.
-
- That might span many lines
- INDENTED_HEREDOC
-
-Note that the while the closing identifier may be indented, the content is
-always treated as if it is flush left. If you indent the content those spaces
-will appear in the output.
-
-A heredoc allows interpolation and escaped characters. You may disable
-interpolation and escaping by surrounding the opening identifier with single
-quotes:
-
- expected_result = <<-'EXPECTED'
- One plus one is #{1 + 1}
- EXPECTED
-
- p expected_result # prints: "One plus one is \#{1 + 1}\n"
-
-The identifier may also be surrounded with double quotes (which is the same as
-no quotes) or with backticks. When surrounded by backticks the HEREDOC
-behaves like Kernel#`:
-
- puts <<-`HEREDOC`
- cat #{__FILE__}
- HEREDOC
-
-To call a method on a heredoc place it after the opening identifier:
-
- expected_result = <<-EXPECTED.chomp
- One plus one is #{1 + 1}
- EXPECTED
-
-You may open multiple heredocs on the same line, but this can be difficult to
-read:
-
- puts(<<-ONE, <<-TWO)
- content for heredoc one
- ONE
- content for heredoc two
- TWO
-
-== Symbols
-
-A Symbol represents a name inside the ruby interpreter. See Symbol for more
-details on what symbols are and when ruby creates them internally.
-
-You may reference a symbol using a colon: <tt>:my_symbol</tt>.
-
-You may also create symbols by interpolation:
-
- :"my_symbol1"
- :"my_symbol#{1 + 1}"
-
-Note that symbols are never garbage collected so be careful when referencing
-symbols using interpolation.
-
-Like strings, a single-quote may be used to disable interpolation:
-
- :"my_symbol#{1 + 1}" #=> :"my_symbol\#{1 + 1}"
-
-When creating a Hash there is a special syntax for referencing a Symbol as
-well.
-
-== Arrays
-
-An array is created using the objects between <tt>[</tt> and <tt>]</tt>:
-
- [1, 2, 3]
-
-You may place expressions inside the array:
-
- [1, 1 + 1, 1 + 2]
- [1, [1 + 1, [1 + 2]]]
-
-See Array for the methods you may use with an array.
-
-== Hashes
-
-A hash is created using key-value pairs between <tt>{</tt> and <tt>}</tt>:
-
- { "a" => 1, "b" => 2 }
-
-Both the key and value may be any object.
-
-You can create a hash using symbol keys with the following syntax:
-
- { a: 1, b: 2 }
-
-This same syntax is used for keyword arguments for a method.
-
-See Hash for the methods you may use with a hash.
-
-== Ranges
-
-A range represents an interval of values. The range may include or exclude
-its ending value.
-
- (1..2) # includes its ending value
- (1...2) # excludes its ending value
-
-You may create a range of any object. See the Range documentation for details
-on the methods you need to implement.
-
-== Regular Expressions
-
-A regular expression is created using "/":
-
- /my regular expression/
-
-The regular expression may be followed by flags which adjust the matching
-behavior of the regular expression. The "i" flag makes the regular expression
-case-insensitive:
-
- /my regular expression/i
-
-Interpolation may be used inside regular expressions along with escaped
-characters. Note that a regular expression may require additional escaped
-characters than a string.
-
-See Regexp for a description of the syntax of regular expressions.
-
-== Procs
-
-A proc can be created with <tt>-></tt>:
-
- -> { 1 + 1 }
-
-Calling the above proc will give a result of <tt>2</tt>.
-
-You can require arguments for the proc as follows:
-
- ->(v) { 1 + v }
-
-This proc will add one to its argument.
-
-== Percent Strings
-
-Besides <tt>%(...)</tt> which creates a String, The <tt>%</tt> may create
-other types of object. As with strings, an uppercase letter allows
-interpolation and escaped characters while a lowercase letter disables them.
-
-These are the types of percent strings in ruby:
-
-<tt>%i</tt> :: Array of Symbols
-<tt>%q</tt> :: String
-<tt>%r</tt> :: Regular Expression
-<tt>%s</tt> :: Symbol
-<tt>%w</tt> :: Array of Strings
-<tt>%x</tt> :: Backtick (capture subshell result)
-
-For the two array forms of percent string, if you wish to include a space in
-one of the array entries you must escape it with a "\\" character:
-
- %w[one one-hundred\ one]
- #=> ["one", "one-hundred one"]
-
-If you are using "(", "[", "{", "<" you must close it with ")", "]", "}", ">"
-respectively. You may use most other non-alphanumeric characters for percent
-string delimiters such as "%", "|", "^", etc.
-
diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc
deleted file mode 100644
index 7fd69983f3..0000000000
--- a/doc/syntax/methods.rdoc
+++ /dev/null
@@ -1,414 +0,0 @@
-= Methods
-
-Methods implement the functionality of your program. Here is a simple method
-definition:
-
- def one_plus_one
- 1 + 1
- end
-
-A method definition consists of the +def+ keyword, a method name, the body of
-the method, then the +end+ keyword. When called the method will execute the
-body of the method. This method returns +2+.
-
-This section only covers defining methods. See also the {syntax documentation
-on calling methods}[rdoc-ref:syntax/calling_methods.rdoc].
-
-== Method Names
-
-Method names may be one of the operators or must start a letter or a character
-with the eight bit set. Typically method names are US-ASCII compatible since
-the keys to type them exist on all keyboards.
-
-(Ruby programs must be written in a US-ASCII-compatible character set. In
-such character sets if the eight bit is set it indicates an extended
-character. Ruby allows method names and other identifiers to contain such
-characters.)
-
-Method names may contain letters, numbers, an <code>_</code> (underscore or
-low line) or a character with the eight bit set.
-
-Method names may end with a <code>!</code> (bang or exclamation mark), a
-<code>?</code> (question mark) or <code>=</code> equals sign.
-
-In the ruby core library when a method ends with a bang it indicates there is
-a non-bang method that has does not modify the receiver. This is typically
-true for the standard library but does not hold true for other ruby libraries.
-
-Methods that end with a question mark do not always return just +true+ or
-+false+. Often they will may return an object to indicate a true value (or
-"truthy" value).
-
-Methods that end with an equals sign indicate an assignment method. For
-assignment methods the return value is ignored, the arguments are returned
-instead.
-
-These are method names for the various ruby operators. Each of these
-operators accept only one argument. Following the operator is the typical
-use or name of the operator. Creating an alternate meaning for the operator
-may lead to confusion as the user expects plus to add things, minus to
-subtract things, etc. Additionally, you cannot alter the precedence of the
-operators.
-
-<code>+</code> :: add
-<code>-</code> :: subtract
-<code>*</code> :: multiply
-<code>**</code> :: power
-<code>/</code> :: divide
-<code>%</code> :: modulus division, String#%
-<code>&</code> :: AND
-<code>^</code> :: XOR (exclusive OR)
-<code>>></code> :: right-shift
-<code><<</code> :: left-shift, append
-<code>==</code> :: equal
-<code>!=</code> :: not equal
-<code>===</code> :: case equality. See Object#===
-<code>=~</code> :: pattern match. (Not just for regular expressions)
-<code>!~</code> :: does not match
-<code><=></code> :: comparison aka spaceship operator. See Comparable
-<code><</code> :: less-than
-<code><=</code> :: less-than or equal
-<code>></code> :: greater-than
-<code>>=</code> :: greater-than or equal
-
-To define unary methods minus, plus, tilde and not (<code>!</code>) follow the
-operator with an <code>@</code> as in <code>+@</code> or <code>!@</code>:
-
- class C
- def -@
- puts "you inverted this object"
- end
- end
-
- obj = C.new
-
- -obj # prints "you inverted this object"
-
-Unary methods accept zero arguments.
-
-== Return Values
-
-By default, a method returns the last expression that was evaluated in the body
-of the method. In the example above, the last (and only) expression evaluated
-was the simple sum <code>1 + 1</code>. The +return+ keyword can be used to
-make it explicit that a method returns a value.
-
- def one_plus_one
- return 1 + 1
- end
-
-It can also be used to make a method return before the last expression is
-evaluated.
-
- def two_plus_two
- return 2 + 2
- 1 + 1 # this expression is never evaluated
- end
-
-Note that for assignment methods the return value will always be ignored.
-Instead the argument will be returned:
-
- def a=(value)
- return 1 + value
- end
-
- p(a = 5) # prints 5
-
-== Scope
-
-The standard syntax to define a method:
-
- def my_method
- # ...
- end
-
-adds the method to a class. You can define an instance method on a specific
-class with the +class+ keyword:
-
- class C
- def my_method
- # ...
- end
- end
-
-A method may be defined on another object. You may define a "class method" (a
-method that is defined on the class, not an instance of the class) like this:
-
- class C
- def self.my_method
- # ...
- end
- end
-
-However, this is simply a special case of a greater syntactical power in Ruby,
-the ability to add methods to any object. Classes are objects, so adding
-class methods is simply adding methods to the Class object.
-
-The syntax for adding a method to an object is as follows:
-
- greeting = "Hello"
-
- def greeting.broaden
- self + ", world!"
- end
-
- greeting.broaden # returns "Hello, world!"
-
-+self+ is a keyword referring to the current object under consideration
-by the compiler, which might make the use of +self+ in defining a class
-method above a little clearer. Indeed, the example of adding a +hello+
-method to the class +String+ can be rewritten thus:
-
- def String.hello
- "Hello, world!"
- end
-
-A method defined like this is called a "singleton method". +broaden+ will only
-exist on the string instance +greeting+. Other strings will not have +broaden+.
-
-== Overriding
-
-When Ruby encounters the +def+ keyword, it doesn't consider it an error if the
-method already exists: it simply redefines it. This is called
-_overriding_. Rather like extending core classes, this is a potentially
-dangerous ability, and should be used sparingly because it can cause unexpected
-results. For example, consider this irb session:
-
- >> "43".to_i
- => 43
- >> class String
- >> def to_i
- >> 42
- >> end
- >> end
- => nil
- >> "43".to_i
- => 42
-
-This will effectively sabotage any code which makes use of the method
-<code>String#to_i</code> to parse numbers from strings.
-
-== Arguments
-
-A method may accept arguments. The argument list follows the method name:
-
- def add_one(value)
- value + 1
- end
-
-When called, the user of the +add_one+ method must provide an argument. The
-argument is a local variable in the method body. The method will then add one
-to this argument and return the value. If given +1+ this method will
-return +2+.
-
-The parentheses around the arguments are optional:
-
- def add_one value
- value + 1
- end
-
-Multiple arguments are separated by a comma:
-
- def add_values(a, b)
- a + b
- end
-
-When called, the arguments must be provided in the exact order. In other
-words, the arguments are positional.
-
-=== Default Values
-
-Arguments may have default values:
-
- def add_values(a, b = 1)
- a + b
- end
-
-The default value does not need to appear first, but arguments with defaults
-must be grouped together. This is ok:
-
- def add_values(a = 1, b = 2, c)
- a + b + c
- end
-
-This will raise a SyntaxError:
-
- def add_values(a = 1, b, c = 1)
- a + b + c
- end
-
-=== Array Decomposition
-
-You can decompose (unpack or extract values from) an Array using extra
-parentheses in the arguments:
-
- def my_method((a, b))
- p a: a, b: b
- end
-
- my_method([1, 2])
-
-This prints:
-
- {:a=>1, :b=>2}
-
-If the argument has extra elements in the Array they will be ignored:
-
- def my_method((a, b))
- p a: a, b: b
- end
-
- my_method([1, 2, 3])
-
-This has the same output as above.
-
-You can use a <code>*</code> to collect the remaining arguments. This splits
-an Array into a first element and the rest:
-
- def my_method((a, *b))
- p a: a, b: b
- end
-
- my_method([1, 2, 3])
-
-This prints:
-
- {:a=>1, :b=>[2, 3]}
-
-The argument will be decomposed if it responds to #to_ary. You should only
-define #to_ary if you can use your object in place of an Array.
-
-Use of the inner parentheses only uses one of the sent arguments. If the
-argument is not an Array it will be assigned to the first argument in the
-decomposition and the remaining arguments in the decomposition will be +nil+:
-
- def my_method(a, (b, c), d)
- p a: a, b: b, c: c, d: d
- end
-
- my_method(1, 2, 3)
-
-This prints:
-
- {:a=>1, :b=>2, :c=>nil, :d=>3}
-
-You can nest decomposition arbitrarily:
-
- def my_method(((a, b), c))
- # ...
- end
-
-=== Array/Hash Argument
-
-Prefixing an argument with <code>*</code> causes any remaining arguments to be
-converted to an Array:
-
- def gather_arguments(*arguments)
- p arguments
- end
-
- gather_arguments 1, 2, 3 # prints [1, 2, 3]
-
-The array argument must be the last positional argument, it must appear before
-any keyword arguments.
-
-The array argument will capture a Hash as the last entry if a hash was sent by
-the caller after all positional arguments.
-
- gather_arguments 1, a: 2 # prints [1, {:a=>2}]
-
-However, this only occurs if the method does not declare any keyword arguments.
-
- def gather_arguments_keyword(*positional, keyword: nil)
- p positional: positional, keyword: keyword
- end
-
- gather_arguments_keyword 1, 2, three: 3
- #=> raises: unknown keyword: three (ArgumentError)
-
-Also, note that a bare <code>*</code> can be used to ignore arguments:
-
- def ignore_arguments(*)
- end
-
-=== Keyword Arguments
-
-Keyword arguments are similar to positional arguments with default values:
-
- def add_values(first: 1, second: 2)
- first + second
- end
-
-Arbitrary keyword arguments will be accepted with <code>**</code>:
-
- def gather_arguments(first: nil, **rest)
- p first, rest
- end
-
- gather_arguments first: 1, second: 2, third: 3
- # prints 1 then {:second=>2, :third=>3}
-
-When calling a method with keyword arguments the arguments may appear in any
-order. If an unknown keyword argument is sent by the caller an ArgumentError
-is raised.
-
-When mixing keyword arguments and positional arguments, all positional
-arguments must appear before any keyword arguments.
-
-== Block Argument
-
-The block argument is indicated by <code>&</code> and must come last:
-
- def my_method(&my_block)
- my_method.call(self)
- end
-
-Most frequently the block argument is used to pass a block to another method:
-
- def each_item(&block)
- @items.each(&block)
- end
-
-If you are only going to call the block and will not otherwise manipulate it
-or send it to another method using <code>yield</code> without an explicit
-block parameter is preferred. This method is equivalent to the first method
-in this section:
-
- def my_method
- yield self
- end
-
-There is also a performance benefit to using yield over a calling a block
-parameter. When a block argument is assigned to a variable a Proc object is
-created which holds the block. When using yield this Proc object is not
-created.
-
-If you only need to use the block sometimes you can use Proc.new to create a
-proc from the block that was passed to your method. See Proc.new for further
-details.
-
-== Exception Handling
-
-Methods have an implied exception handling block so you do not need to use
-+begin+ or +end+ to handle exceptions. This:
-
- def my_method
- begin
- # code that may raise an exception
- rescue
- # handle exception
- end
- end
-
-May be written as:
-
- def my_method
- # code that may raise an exception
- rescue
- # handle exception
- end
-
-If you wish to rescue an exception for only part of your method use +begin+ and
-+end+. For more details see the page on {exception
-handling}[rdoc-ref:syntax/exceptions.rdoc].
-
diff --git a/doc/syntax/miscellaneous.rdoc b/doc/syntax/miscellaneous.rdoc
deleted file mode 100644
index 8f424f019f..0000000000
--- a/doc/syntax/miscellaneous.rdoc
+++ /dev/null
@@ -1,107 +0,0 @@
-= Miscellaneous Syntax
-
-== Ending an Expression
-
-Ruby uses a newline as the end of an expression. When ending a line with an
-operator, open parentheses, comma, etc. the expression will continue.
-
-You can end an expression with a <code>;</code> (semicolon). Semicolons are
-most frequently used with <code>ruby -e</code>.
-
-== Indentation
-
-Ruby does not require any indentation. Typically ruby programs are indented
-two spaces.
-
-If you run ruby with warnings enabled and have an indentation mis-match you
-will receive a warning.
-
-== +alias+
-
-The +alias+ keyword is most frequently used to alias methods. When aliasing a
-method you can use either its name or a symbol:
-
- alias new_name old_name
- alias :new_name :old_name
-
-For methods, Module#alias_method can often be used instead of +alias+.
-
-You can also use +alias+ to alias global variables:
-
- $old = 0
-
- alias $new $old
-
- p $new # prints 0
-
-You may use +alias+ in any scope.
-
-== +undef+
-
-The +undef+ keyword prevents the current class from responding to calls to the
-named methods.
-
- undef my_method
-
-You may use symbols instead of method names:
-
- undef :my_method
-
-You may undef multiple methods:
-
- undef method1, method2
-
-You may use +undef+ in any scope. See also Module#undef_method
-
-== +defined?+
-
-+defined?+ is a keyword that returns a string describing its argument:
-
- p defined?(UNDEFINED_CONSTANT) # prints nil
- p defined?(RUBY_VERSION) # prints "constant"
- p defined?(1 + 1) # prints "method"
-
-You don't need to use parenthesis with +defined?+ but they are recommended due
-to the {low precedence}[rdoc-ref:syntax/precedence.rdoc] of +defined?+.
-
-For example, if you wish to check if an instance variable exists and that the
-instance variable is zero:
-
- defined? @instance_variable && @instance_variable.zero?
-
-This returns <code>"expression"</code> which is not what you want if the
-instance variable is not defined.
-
- @instance_variable = 1
- defined?(@instance_variable) && @instance_variable.zero?
-
-Adding parentheses when checking if the instance variable is defined is a
-better check. This correctly returns +nil+ when the instance variable is not
-defined and +false+ when the instance variable is not zero.
-
-Using the specific reflection methods such as instance_variable_defined? for
-instance variables or const_defined? for constants is less error prone than
-using +defined?+.
-
-== +BEGIN+ and +END+
-
-+BEGIN+ defines a block that is run before any other code in the current file.
-It is typically used in one-liners with <code>ruby -e</code>. Similarly +END+
-defines a block that is run after any other code.
-
-+BEGIN+ must appear at top-level and +END+ will issue a warning when you use it
-inside a method.
-
-Here is an example:
-
- BEGIN {
- count = 0
- }
-
-You must use <code>{</code> and <code>}</code> you may not use +do+ and +end+.
-
-Here is an example one-liner that adds numbers from standard input or any files
-in the argument list:
-
- ruby -ne 'BEGIN { count = 0 }; END { puts count }; count += gets.to_i'
-
diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc
deleted file mode 100644
index f4ab1ea6f9..0000000000
--- a/doc/syntax/modules_and_classes.rdoc
+++ /dev/null
@@ -1,345 +0,0 @@
-= Modules
-
-Modules serve two purposes in Ruby, namespacing and mix-in functionality.
-
-A namespace can be used to organize code by package or functionality that
-separates common names from interference by other packages. For example, the
-Curses namespace provides functionality for curses that prevents a collision
-for the common name "Window".
-
-Mix-in functionality allows sharing common methods across multiple classes or
-modules. Ruby comes with the Enumerable mix-in module which provides many
-enumeration methods based on the +each+ method and Comparable allows comparison
-of objects based on the <code><=></code> comparison method.
-
-Note that there are many similarities between modules and classes. Besides the
-ability to mix-in a module, the description of modules below also applies to
-classes.
-
-== Module Definition
-
-A module is created using the +module+ keyword:
-
- module MyModule
- # ...
- end
-
-A module may be reopened any number of times to add, change or remove
-functionality:
-
- module MyModule
- def my_method
- end
- end
-
- module MyModule
- alias my_alias my_method
- end
-
- module MyModule
- remove_method :my_method
- end
-
-Reopening classes is a very powerful feature of Ruby, but it is best to only
-reopen classes you own. Reopening classes you do not own may lead to naming
-conflicts or difficult to diagnose bugs.
-
-== Nesting
-
-Modules may be nested:
-
- module Outer
- module Inner
- end
- end
-
-Many packages create a single outermost module (or class) to provide a
-namespace for their functionality.
-
-You may also define inner modules using <code>::</code> provided the outer
-modules (or classes) are already defined:
-
- module Outer::Inner::GrandChild
- end
-
-Note that this will raise a +NameError+ if +Outer+ and
-<code>Outer::Inner</code> are not already defined.
-
-This style has the benefit of allowing the author to reduce the amount
-of indentation. Instead of 3 levels of indentation only one is necessary.
-However, the scope of constant lookup is different for creating a namespace
-using this syntax instead of the more verbose syntax.
-
-== Scope
-
-=== +self+
-
-+self+ refers to the object that defines the current scope. +self+ will change
-when entering a different method or when defining a new module.
-
-=== Constants
-
-Accessible constants are different depending on the module nesting (which
-syntax was used to define the module). In the following example
-the constant <code>A::Z</code> is accessible from B as A is part of the
-nesting:
-
- module A
- Z = 1
-
- module B
- p Module.nesting #=> [A::B, A]
- p Z #=> 1
- end
- end
-
-However, if you use <code>::</code> to define <code>A::B</code> without
-nesting it inside +A+ a NameError exception will be raised because the nesting
-does not include +A+:
-
- module A
- Z = 1
- end
-
- module A::B
- p Module.nesting #=> [A::B]
- p Z #=> raises NameError
- end
-
-If a constant is defined at the top-level you may preceded it with
-<code>::</code> to reference it:
-
- Z = 0
-
- module A
- Z = 1
-
- module B
- p ::Z #=> 0
- end
- end
-
-=== Methods
-
-For method definition documentation see the {syntax documentation for
-methods}[rdoc-ref:syntax/methods.rdoc].
-
-Class methods may be called directly. (This is slightly confusing, but a
-method on a module is often called a "class method" instead of a "module
-method". See also Module#module_function which can convert an instance method
-into a class method.)
-
-When a class method references a constant it uses the same rules as referencing
-it outside the method as the scope is the same.
-
-Instance methods defined in a module are only callable when included. These
-methods have access to the constants defined when they were included through
-the ancestors list:
-
- module A
- Z = 1
-
- def z
- Z
- end
- end
-
- include A
-
- p self.class.ancestors #=> [Object, A, Kernel, BasicObject]
- p z #=> 1
-
-=== Visibility
-
-Ruby has three types of visibility. The default is +public+. A public method
-may be called from any other object.
-
-The second visibility is +protected+. When calling a protected method the
-sender must be a subclass of the receiver or the receiver must be a subclass of
-the sender. Otherwise a NoMethodError will be raised.
-
-Protected visibility is most frequently used to define <code>==</code> and
-other comparison methods where the author does not wish to expose an object's
-state to any caller and would like to restrict it only to inherited classes.
-
-Here is an example:
-
- class A
- def n(other)
- other.m
- end
- end
-
- class B < A
- def m
- 1
- end
-
- protected :m
-
- end
-
- class C < B
- end
-
- a = A.new
- b = B.new
- c = C.new
-
- c.n b #=> 1 -- C is a subclass of B
- b.n b #=> 1 -- m called on defining class
- a.n b # raises NoMethodError A is not a subclass of B
-
-The third visibility is +private+. A private method may not be called with a
-receiver, not even +self+. If a private method is called with a receiver a
-NoMethodError will be raised.
-
-=== +alias+ and +undef+
-
-You may also alias or undefine methods, but these operations are not
-restricted to modules or classes. See the {miscellaneous syntax
-section}[rdoc-ref:syntax/miscellaneous.rdoc] for documentation.
-
-= Classes
-
-Every class is also a module, but unlike modules a class may not be mixed-in to
-another module (or class). Like a module, a class can be used as a namespace.
-A class also inherits methods and constants from its superclass.
-
-== Defining a class
-
-Use the +class+ keyword to create a class:
-
- class MyClass
- # ...
- end
-
-If you do not supply a superclass your new class will inherit from Object. You
-may inherit from a different class using <code><</code> followed by a class
-name:
-
- class MySubclass < MyClass
- # ...
- end
-
-There is a special class BasicObject which is designed as a blank class and
-includes a minimum of built-in methods. You can use BasicObject to create an
-independent inheritance structure. See the BasicObject documentation for
-further details.
-
-== Inheritance
-
-Any method defined on a class is callable from its subclass:
-
- class A
- Z = 1
-
- def z
- Z
- end
- end
-
- class B < A
- end
-
- p B.new.z #=> 1
-
-The same is true for constants:
-
- class A
- Z = 1
- end
-
- class B < A
- def z
- Z
- end
- end
-
- p B.new.z #=> 1
-
-You can override the functionality of a superclass method by redefining the
-method:
-
- class A
- def m
- 1
- end
- end
-
- class B < A
- def m
- 2
- end
- end
-
- p B.new.m #=> 2
-
-If you wish to invoke the superclass functionality from a method use +super+:
-
- class A
- def m
- 1
- end
- end
-
- class B < A
- def m
- 2 + super
- end
- end
-
- p B.new.m #=> 3
-
-When used without any arguments +super+ uses the arguments given to the
-subclass method. To send no arguments to the superclass method use
-<code>super()</code>. To send specific arguments to the superclass method
-provide them manually like <code>super(2)</code>.
-
-+super+ may be called as many times as you like in the subclass method.
-
-= Singleton Classes
-
-The singleton class (also known as the metaclass or eigenclass) of an object is
-a class that holds methods for only that instance. You can access the
-singleton class of an object using <code>class << object</code> like this:
-
- class C
- end
-
- class << C
- # self is the singleton class here
- end
-
-Most frequently you'll see the singleton class accessed like this:
-
- class C
- class << self
- # ...
- end
- end
-
-This allows definition of methods and attributes on a class (or module) without
-needing to write <code>def self.my_method</code>.
-
-Since you can open the singleton class of any object this means that this code
-block:
-
- o = Object.new
-
- def o.my_method
- 1 + 1
- end
-
-is equivalent to this code block:
-
- o = Object.new
-
- class << o
- def my_method
- 1 + 1
- end
- end
-
-Both objects will have a +my_method+ that returns +2+.
-
diff --git a/doc/syntax/precedence.rdoc b/doc/syntax/precedence.rdoc
deleted file mode 100644
index 515626c74f..0000000000
--- a/doc/syntax/precedence.rdoc
+++ /dev/null
@@ -1,60 +0,0 @@
-= Precedence
-
-From highest to lowest, this is the precedence table for ruby. High precedence
-operations happen before low precedence operations.
-
- !, ~, unary +
-
- **
-
- unary -
-
- *, /, %
-
- +, -
-
- <<, >>
-
- &
-
- |, ^
-
- >, >=, <, <=
-
- <=>, ==, ===, !=, =~, !~
-
- &&
-
- ||
-
- .., ...
-
- ?, :
-
- modifier-rescue
-
- =, +=, -=, etc.
-
- defined?
-
- not
-
- or, and
-
- modifier-if, modifier-unless, modifier-while, modifier-until
-
- { } blocks
-
-Unary <code>+</code> and unary <code>-</code> are for <code>+1</code>,
-<code>-1</code> or <code>-(a + b)</code>.
-
-Modifier-if, modifier-unless, etc. are for the modifier versions of those
-keywords. For example, this is a modifier-unless expression:
-
- a += 1 unless a.zero?
-
-<code>{ ... }</code> blocks have priority below all listed operations, but
-<code>do ... end</code> blocks have lower priority.
-
-All other words in the precedence table above are keywords.
-
diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc
deleted file mode 100644
index 7b3f0f6127..0000000000
--- a/doc/syntax/refinements.rdoc
+++ /dev/null
@@ -1,240 +0,0 @@
-= Refinements
-
-Due to Ruby's open classes you can redefine or add functionality to existing
-classes. This is called a "monkey patch". Unfortunately the scope of such
-changes is global. All users of the monkey-patched class see the same
-changes. This can cause unintended side-effects or breakage of programs.
-
-Refinements are designed to reduce the impact of monkey patching on other
-users of the monkey-patched class. Refinements provide a way to extend a
-class locally.
-
-Refinements are an experimental feature in Ruby 2.0. At the time of writing,
-refinements are expected to exist in future versions of Ruby but the
-specification of refinements may change. You will receive a warning the first
-time you define or activate a refinement.
-
-Here is a basic refinement:
-
- class C
- def foo
- puts "C#foo"
- end
- end
-
- module M
- refine C do
- def foo
- puts "C#foo in M"
- end
- end
- end
-
-First, a class +C+ is defined. Next a refinement for +C+ is created using
-Module#refine. Refinements only modify classes, not modules so the argument
-must be a class.
-
-Module#refine creates an anonymous module that contains the changes or
-refinements to the class (+C+ in the example). +self+ in the refine block is
-this anonymous module similar to Module#module_eval.
-
-Activate the refinement with #using:
-
- using M
-
- x = C.new
-
- c.foo # prints "C#foo in M"
-
-== Scope
-
-You may only activate refinements at top-level to the end of the file or in a
-string passed to Kernel#eval, Kernel#instance_eval or Kernel#module_eval until
-the end of the string.
-
-Refinements are lexical in scope. When control is transferred outside the
-scope the refinement is deactivated. This means that if you require or load a
-file or call a method that is defined outside the current scope the refinement
-will be deactivated:
-
- class C
- end
-
- module M
- refine C do
- def foo
- puts "C#foo in M"
- end
- end
- end
-
- def call_foo(x)
- x.foo
- end
-
- using M
-
- x = C.new
- x.foo # prints "C#foo in M"
- call_foo(x) #=> raises NoMethodError
-
-If a method is defined in a scope where a refinement is active the refinement
-will be active when the method is called. This example spans multiple files:
-
-c.rb:
-
- class C
- end
-
-m.rb:
-
- require "c"
-
- module M
- refine C do
- def foo
- puts "C#foo in M"
- end
- end
- end
-
-m_user.rb:
-
- require "m"
-
- using M
-
- class MUser
- def call_foo(x)
- x.foo
- end
- end
-
-main.rb:
-
- require "m_user"
-
- x = C.new
- m_user = MUser.new
- m_user.call_foo(x) # prints "C#foo in M"
- x.foo #=> raises NoMethodError
-
-Since the refinement +M+ is active in <code>m_user.rb</code> where
-<code>MUser#call_foo</code> is defined it is also active when
-<code>main.rb</code> calls +call_foo+.
-
-Since #using is a method, refinements are only active when it is called. Here
-are examples of where a refinement +M+ is and is not active.
-
-In a file:
-
- # not activated here
- using M
- # activated here
- class Foo
- # activated here
- def foo
- # activated here
- end
- # activated here
- end
- # activated here
-
-In eval:
-
- # not activated here
- eval <<EOF
- # not activated here
- using M
- # activated here
- EOF
- # not activated here
-
-When not evaluated:
-
- # not activated here
- if false
- using M
- end
- # not activated here
-
-When defining multiple refinements in the same module, inside a refine block
-all refinements from the same module are active when a refined method is
-called:
-
- module ToJSON
- refine Integer do
- def to_json
- to_s
- end
- end
-
- refine Array do
- def to_json
- "[" + map { |i| i.to_json }.join(",") + "]"
- end
- end
-
- refine Hash do
- def to_json
- "{" + map { |k, v| k.to_s.dump + ":" + v.to_json }.join(",") + "}"
- end
- end
- end
-
- using ToJSON
-
- p [{1=>2}, {3=>4}].to_json # prints "[{\"1\":2},{\"3\":4}]"
-
-== Method Lookup
-
-When looking up a method for an instance of class +C+ Ruby checks:
-
-* If refinements are active for +C+, in the reverse order they were activated:
- * The prepended modules from the refinement for +C+
- * The refinement for +C+
- * The included modules from the refinement for +C+
-* The prepended modules of +C+
-* +C+
-* The included modules of +C+
-
-If no method was found at any point this repeats with the superclass of +C+.
-
-Note that methods in a subclass have priority over refinements in a
-superclass. For example, if the method <code>/</code> is defined in a
-refinement for Integer <code>1 / 2</code> invokes the original Fixnum#/
-because Fixnum is a subclass of Integer and is searched before the refinements
-for the superclass Integer.
-
-If a method +foo+ is defined on Integer in a refinement, <code>1.foo</code>
-invokes that method since +foo+ does not exist on Fixnum.
-
-== +super+
-
-When +super+ is invoked method lookup checks:
-
-* The included modules of the current class. Note that the current class may
- be a refinement.
-* If the current class is a refinement, the method lookup proceeds as in the
- Method Lookup section above.
-* If the current class has a direct superclass, the method proceeds as in the
- Method Lookup section above using the superclass.
-
-Note that +super+ in a method of a refinement invokes the method in the
-refined class even if there is another refinement which has been activated in
-the same context.
-
-== Indirect Method Calls
-
-When using indirect method access such as Kernel#send, Kernel#method or
-Kernel#respond_to? refinements are not honored for the caller context during
-method lookup.
-
-This behavior may be changed in the future.
-
-== Further Reading
-
-See http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the
-current specification for implementing refinements. The specification also
-contains more details.
-
diff --git a/enc/Makefile.in b/enc/Makefile.in
index a64785d1c5..2a7807d9b7 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -1,10 +1,3 @@
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
-ECHO = $(ECHO1:0=@echo)
-
encsrcdir = @srcdir@
topdir = .
prefix = @prefix@
@@ -20,7 +13,6 @@ ENCSODIR = $(EXTOUT)/$(arch)/enc
TRANSSODIR = $(ENCSODIR)/trans
DLEXT = @DLEXT@
OBJEXT = @OBJEXT@
-LIBEXT = @LIBEXT@
BUILTIN_ENCS = ascii.c us_ascii.c\
unicode.c utf_8.c
@@ -33,10 +25,7 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
empty =
-AR = @AR@
CC = @CC@
-ARFLAGS = @ARFLAGS@$(empty)
-RANLIB = @RANLIB@
OUTFLAG = @OUTFLAG@$(empty)
COUTFLAG = @COUTFLAG@$(empty)
CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@
@@ -52,20 +41,13 @@ LDFLAGS = @LDFLAGS@
LDSHARED = @LDSHARED@
ldflags = $(LDFLAGS)
dldflags = @DLDFLAGS@
-extdldflags = @EXTDLDFLAGS@
archflag = @ARCH_FLAG@
-DLDFLAGS = $(ldflags) $(dldflags) $(extdldflags) $(archflag)
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
RUBY = $(MINIRUBY)
-TARGET_NAME_ = $(@F) # BSD make seems unable to deal with @F with substitution
-TARGET_NAME = $(TARGET_NAME_:.@DLEXT@=)
-TARGET_ENTRY = @EXPORT_PREFIX@Init_$(TARGET_NAME)
-WORKDIRS = @WORKDIRS@
+WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans
-NULLCMD = @NULLCMD@
RM = @RM@
-RMDIR = @RMDIR@
-RMDIRS = @RMDIRS@
MAKEDIRS = @MAKEDIRS@
.SUFFIXES: .trans
@@ -73,10 +55,10 @@ MAKEDIRS = @MAKEDIRS@
all: make-workdir
make-workdir:
- $(Q)$(MAKEDIRS) $(WORKDIRS)
+ $(MAKEDIRS) $(WORKDIRS)
clean:
-distclean: clean
- $(Q)$(RM) enc.mk
-realclean: distclean clean-srcs
+distclean: clean clean-srcs
+ @$(RM) enc.mk
+realclean: distclean
diff --git a/enc/ascii.c b/enc/ascii.c
index 72150c037c..3d62ec9bf7 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -1,9 +1,8 @@
/**********************************************************************
- ascii.c - Onigmo (Oniguruma-mod) (regular expression library)
+ ascii.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2006 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,9 +45,7 @@ OnigEncodingDefine(ascii, ASCII) = {
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,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("BINARY", "ASCII-8BIT")
ENC_REPLICATE("IBM437", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
index 9d7738d8f9..c4a088d531 100644
--- a/enc/big5.c
+++ b/enc/big5.c
@@ -107,7 +107,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -125,7 +125,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -260,7 +260,7 @@ big5_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
p++;
break;
}
- }
+ }
}
len = enclen(enc, p, end);
if (p + len > s) return (UChar* )p;
@@ -299,22 +299,14 @@ OnigEncodingDefine(big5, BIG5) = {
big5_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
big5_left_adjust_char_head,
- big5_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ big5_is_allowed_reverse_match
};
-
-/*
- * Name: CP950
- * Source: http://msdn.microsoft.com/en-us/goglobal/cc305155.aspx
- */
-ENC_REPLICATE("CP950", "Big5")
+ENC_ALIAS("CP950", "Big5")
/*
* Name: Big5-HKSCS
* MIBenum: 2101
- * Source: http://www.iana.org/assignments/charset-reg/Big5-HKSCS
- * Source: http://www.ogcio.gov.hk/ccli/eng/hkscs/mapping_table_2008.html
+ * Source: See (http://www.iana.org/assignments/charset-reg/Big5-HKSCS)
* Alias: None
*/
OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
@@ -333,19 +325,9 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
big5_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
big5_left_adjust_char_head,
- big5_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ big5_is_allowed_reverse_match
};
-ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS")
-
-/*
- * Name: CP951
- * Source: http://www.microsoft.com/hk/hkscs/default.aspx
- * Source: http://www.microsoft.com/downloads/en/details.aspx?FamilyID=0e6f5ac8-7baa-4571-b8e8-78b3b776afd7&DisplayLang=en
- * Source: http://blogs.msdn.com/b/shawnste/archive/2007/03/12/cp-951-hkscs.aspx
- */
-ENC_REPLICATE("CP951", "Big5-HKSCS")
+ENC_ALIAS("CP951", "Big5-HKSCS")
/*
* Name: Big5-UAO [NOT registered by IANA!]
@@ -367,7 +349,5 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = {
big5_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
big5_left_adjust_char_head,
- big5_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ big5_is_allowed_reverse_match
};
diff --git a/enc/cp949.c b/enc/cp949.c
index bf1c2637a3..009443aed4 100644
--- a/enc/cp949.c
+++ b/enc/cp949.c
@@ -90,7 +90,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -108,7 +108,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
}
};
#undef A
@@ -179,7 +179,7 @@ cp949_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end
p++;
break;
}
- }
+ }
}
len = enclen(enc, p, end);
if (p + len > s) return (UChar* )p;
@@ -210,9 +210,7 @@ OnigEncodingDefine(cp949, CP949) = {
cp949_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
cp949_left_adjust_char_head,
- cp949_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ cp949_is_allowed_reverse_match
};
/*
* Name: CP949
diff --git a/enc/depend b/enc/depend
index 014fc4f584..7186179ef0 100644
--- a/enc/depend
+++ b/enc/depend
@@ -1,17 +1,41 @@
-% inplace = File.identical?($top_srcdir, ".")
-% workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans"
-% CONFIG["WORKDIRS"] = workdirs.join(' ')
+% 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"])
-% dependencies = ENCS + TRANS
+% 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)}') || "%s") % ""
-% CONFIG['ARFLAGS'] = 'rcu ' if (CONFIG['ARFLAGS'] || "").empty?
-% CONFIG['RANLIB'] = ':' if (CONFIG['RANLIB'] || "").empty?
+% 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
@@ -27,109 +51,77 @@ 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%>
+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(" ")%>
-LIBENC=enc/libenc.$(LIBEXT)
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%>
+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(" ")%>
-LIBTRANS=enc/libtrans.$(LIBEXT)
encs: all
-% if MODULE_TYPE == :static
-all: libenc libtrans
-% else
all: enc trans
-%end
-libencs: libenc libtrans
enc: $(ENCSOS)
-libenc: $(LIBENC)
trans: $(TRANSSOS)
-libtrans: $(LIBTRANS)
-
-$(LIBENC): $(ENCOBJS)
- @$(RM) $@
- $(ECHO) linking statically-linked encoding library $@
- $(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS)
- @-$(RANLIB) $@ 2> /dev/null || true
-$(LIBTRANS): $(TRANSOBJS)
- @$(RM) $@
- $(ECHO) linking statically-linked transcoder library $@
- $(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS)
- @-$(RANLIB) $@ 2> /dev/null || true
srcs: $(TRANSCSRCS)
<%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
- $(ECHO) generating table from $@
- $(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
+ $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
-% unless ENCS.empty? or TRANS.empty?
+% unless encs.empty? or trans.empty?
-% unless ENCS.empty?
+% unless encs.empty?
$(ENCOBJS): regenc.h oniguruma.h config.h defines.h
% end
-% ENC_DEPS.each do |e, deps|
-enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
-% end
-% unless TRANS.empty?
+% 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|
+% 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 {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
+<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
% end
% end
-% link_so = LINK_SO.gsub(/([^\\])\n/, "\\1\n$(Q) ").gsub(/\n/, "\n\t")
+% 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)
-% target = e.dup
-% if target.sub!(/\Atrans\//, '$(TRANSSODIR)/')
-% mesg = "transcoder"
-% else
-% target = "$(ENCSODIR)/#{e}"
-% mesg = "encoding"
-% end
-<%=target%>.$(DLEXT): <%=obj%>
- $(ECHO) linking <%=mesg%> $(@F)
+$(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
- $(Q)echo> <%=df%> EXPORTS
- $(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
+ echo> <%=df%> EXPORTS
+ echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
% cmd.sub!(/\$\(DEFFILE\)/) {df}
% cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
% end
- $(Q)$(MAKEDIRS) "$(@D)"
- $(Q)<%=cmd%>
+ @$(MAKEDIRS) "$(@D)"
+ <%=cmd%>
% end
% dependencies.each do |e|
<%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
- -$(Q)$(MAKEDIRS) "$(@D)"
- $(ECHO) compiling <%= "$(encsrcdir)/#{e}.c"%>
- $(Q)<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
+ -@$(MAKEDIRS) "$(@D)"
+ <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
% end
@@ -137,23 +129,15 @@ enc/encdb.$(OBJEXT): encdb.h
enc/trans/transdb.$(OBJEXT): transdb.h
clean:
-% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
- $(Q)$(RM) <%=pathrep[clean]%>
+% %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
+ @$(RM) <%=pathrep[clean]%>
% end
-% @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
-% unless inplace
- $(Q)$(RM) enc/unicode/name2ctype.h
- -$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
-% end
-% workdirs.reverse_each do|d|
- -$(Q)$(RMDIR) <%=pathrep[d]%><%=@ignore_error%>
+% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
+ @-rmdir <%=pathrep[dir]%>
% end
clean-srcs:
- $(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
- -$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
- $(Q)$(RM) enc/unicode/name2ctype.h
- -$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
- -$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
-
-<%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%>
+ @$(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
index 275c8f47dc..63087541c5 100644
--- a/enc/emacs_mule.c
+++ b/enc/emacs_mule.c
@@ -103,7 +103,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -121,7 +121,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -264,7 +264,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
if (enclen(enc, buf, p) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
- return (int)(p - buf);
+ return p - buf;
}
static int
@@ -334,8 +334,7 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
onigenc_not_support_get_ctype_code_range,
left_adjust_char_head,
onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 0
};
ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")
diff --git a/enc/encdb.c b/enc/encdb.c
index 32def53aeb..11f80e8640 100644
--- a/enc/encdb.c
+++ b/enc/encdb.c
@@ -14,13 +14,11 @@ 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);
-void rb_encdb_set_unicode(int index);
-#define ENC_REPLICATE(name, orig) rb_encdb_replicate((name), (orig))
-#define ENC_ALIAS(name, orig) rb_encdb_alias((name), (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))
-#define ENC_DUMMY_UNICODE(name) rb_encdb_set_unicode(ENC_DUMMY(name))
+#define ENC_SET_BASE(name, orig) rb_enc_set_base(name, orig)
void
Init_encdb(void)
diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb
deleted file mode 100644
index fd3ade0c4b..0000000000
--- a/enc/encinit.c.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2012 Google Inc. Some Rights Reserved.
- * Author: yugui@google.com (Yugui Sonoda)
- */
-#include <stdio.h>
-
-#define init(func, name) { \
- extern void func(void); \
- ruby_init_ext(name, func); \
-}
-
-void ruby_init_ext(const char *name, void (*init)(void));
-
-void
-Init_enc(void)
-{
-% ENCS.each do |enc|
- init(Init_<%= enc %>, "enc/<%= enc %>.so");
-% end
-
- init(Init_transdb, "enc/trans/transdb.so");
-% TRANS.each do |trans|
-% next if trans == 'trans/transdb'
- init(Init_trans_<%= File.basename trans %>, "enc/<%= trans %>.so");
-% end
-}
-<%# vim: set ft=eruby sw=2 : -%>
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index d794145b49..21f30ad2f3 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -1,9 +1,8 @@
/**********************************************************************
- euc_jp.c - Onigmo (Oniguruma-mod) (regular expression library)
+ euc_jp.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
- * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
+ * 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
@@ -30,6 +29,7 @@
#include "regint.h"
+
#define eucjp_islead(c) ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
static const int EncLen_EUCJP[] = {
@@ -71,7 +71,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -89,7 +89,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -107,104 +107,13 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
},
};
#undef A
#undef F
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- /* Fullwidth Alphabet */
- { 0xa3c1, 0xa3e1 },
- { 0xa3c2, 0xa3e2 },
- { 0xa3c3, 0xa3e3 },
- { 0xa3c4, 0xa3e4 },
- { 0xa3c5, 0xa3e5 },
- { 0xa3c6, 0xa3e6 },
- { 0xa3c7, 0xa3e7 },
- { 0xa3c8, 0xa3e8 },
- { 0xa3c9, 0xa3e9 },
- { 0xa3ca, 0xa3ea },
- { 0xa3cb, 0xa3eb },
- { 0xa3cc, 0xa3ec },
- { 0xa3cd, 0xa3ed },
- { 0xa3ce, 0xa3ee },
- { 0xa3cf, 0xa3ef },
- { 0xa3d0, 0xa3f0 },
- { 0xa3d1, 0xa3f1 },
- { 0xa3d2, 0xa3f2 },
- { 0xa3d3, 0xa3f3 },
- { 0xa3d4, 0xa3f4 },
- { 0xa3d5, 0xa3f5 },
- { 0xa3d6, 0xa3f6 },
- { 0xa3d7, 0xa3f7 },
- { 0xa3d8, 0xa3f8 },
- { 0xa3d9, 0xa3f9 },
- { 0xa3da, 0xa3fa },
-
- /* Greek */
- { 0xa6a1, 0xa6c1 },
- { 0xa6a2, 0xa6c2 },
- { 0xa6a3, 0xa6c3 },
- { 0xa6a4, 0xa6c4 },
- { 0xa6a5, 0xa6c5 },
- { 0xa6a6, 0xa6c6 },
- { 0xa6a7, 0xa6c7 },
- { 0xa6a8, 0xa6c8 },
- { 0xa6a9, 0xa6c9 },
- { 0xa6aa, 0xa6ca },
- { 0xa6ab, 0xa6cb },
- { 0xa6ac, 0xa6cc },
- { 0xa6ad, 0xa6cd },
- { 0xa6ae, 0xa6ce },
- { 0xa6af, 0xa6cf },
- { 0xa6b0, 0xa6d0 },
- { 0xa6b1, 0xa6d1 },
- { 0xa6b2, 0xa6d2 },
- { 0xa6b3, 0xa6d3 },
- { 0xa6b4, 0xa6d4 },
- { 0xa6b5, 0xa6d5 },
- { 0xa6b6, 0xa6d6 },
- { 0xa6b7, 0xa6d7 },
- { 0xa6b8, 0xa6d8 },
-
- /* Cyrillic */
- { 0xa7a1, 0xa7d1 },
- { 0xa7a2, 0xa7d2 },
- { 0xa7a3, 0xa7d3 },
- { 0xa7a4, 0xa7d4 },
- { 0xa7a5, 0xa7d5 },
- { 0xa7a6, 0xa7d6 },
- { 0xa7a7, 0xa7d7 },
- { 0xa7a8, 0xa7d8 },
- { 0xa7a9, 0xa7d9 },
- { 0xa7aa, 0xa7da },
- { 0xa7ab, 0xa7db },
- { 0xa7ac, 0xa7dc },
- { 0xa7ad, 0xa7dd },
- { 0xa7ae, 0xa7de },
- { 0xa7af, 0xa7df },
- { 0xa7b0, 0xa7e0 },
- { 0xa7b1, 0xa7e1 },
- { 0xa7b2, 0xa7e2 },
- { 0xa7b3, 0xa7e3 },
- { 0xa7b4, 0xa7e4 },
- { 0xa7b5, 0xa7e5 },
- { 0xa7b6, 0xa7e6 },
- { 0xa7b7, 0xa7e7 },
- { 0xa7b8, 0xa7e8 },
- { 0xa7b9, 0xa7e9 },
- { 0xa7ba, 0xa7ea },
- { 0xa7bb, 0xa7eb },
- { 0xa7bc, 0xa7ec },
- { 0xa7bd, 0xa7ed },
- { 0xa7be, 0xa7ee },
- { 0xa7bf, 0xa7ef },
- { 0xa7c0, 0xa7f0 },
- { 0xa7c1, 0xa7f1 },
-};
-
static int
mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
{
@@ -229,7 +138,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
int c, i, len;
OnigCodePoint n;
- len = mbc_enc_len(p, end, enc);
+ len = enclen(enc, p, end);
n = (OnigCodePoint )*p++;
if (len == 1) return n;
@@ -245,10 +154,9 @@ static int
code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
{
if (ONIGENC_IS_CODE_ASCII(code)) return 1;
- else if (code > 0x00ffffff)
- return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
- else if ((code & 0xff808080) == 0x00808080) return 3;
- else if ((code & 0xffff8080) == 0x00008080) return 2;
+ 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;
}
@@ -282,87 +190,10 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
*p++ = (UChar )(code & 0xff);
#if 1
- if (mbc_enc_len(buf, p, enc) != (p - buf))
+ if (enclen(enc, buf, p) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
-#endif
- return (int )(p - buf);
-}
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static OnigCodePoint
-get_lower_case(OnigCodePoint code)
-{
- if (ONIGENC_IS_IN_RANGE(code, 0xa3c1, 0xa3da)) {
- /* Fullwidth Alphabet */
- return (OnigCodePoint )(code + 0x0020);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0xa6a1, 0xa6b8)) {
- /* Greek */
- return (OnigCodePoint )(code + 0x0020);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0xa7a1, 0xa7c1)) {
- /* Cyrillic */
- return (OnigCodePoint )(code + 0x0030);
- }
- return code;
-}
-
-static OnigCodePoint
-get_upper_case(OnigCodePoint code)
-{
- if (ONIGENC_IS_IN_RANGE(code, 0xa3e1, 0xa3fa)) {
- /* Fullwidth Alphabet */
- return (OnigCodePoint )(code - 0x0020);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0xa6c1, 0xa6d8)) {
- /* Greek */
- return (OnigCodePoint )(code - 0x0020);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0xa7d1, 0xa7f1)) {
- /* Cyrillic */
- return (OnigCodePoint )(code - 0x0030);
- }
- return code;
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[], OnigEncoding enc)
-{
- int len;
- OnigCodePoint code, code_lo, code_up;
-
- code = mbc_to_code(p, end, enc);
- if (ONIGENC_IS_ASCII_CODE(code))
- return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc);
-
- len = mbc_enc_len(p, end, enc);
- code_lo = get_lower_case(code);
- code_up = get_upper_case(code);
-
- if (code != code_lo) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = code_lo;
- return 1;
- }
- else if (code != code_up) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = code_up;
- return 1;
- }
-
- return 0;
+#endif
+ return p - buf;
}
static int
@@ -370,6 +201,7 @@ 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)) {
@@ -378,11 +210,12 @@ mbc_case_fold(OnigCaseFoldType flag,
return 1;
}
else {
- OnigCodePoint code;
- int len;
+ int i;
- code = get_lower_case(mbc_to_code(p, end, enc));
- len = code_to_mbc(code, lower, enc);
+ 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 */
}
@@ -401,7 +234,7 @@ left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, Onig
p = s;
while (!eucjp_islead(*p) && p > start) p--;
- len = mbc_enc_len(p, end, enc);
+ len = enclen(enc, p, end);
if (p + len > s) return (UChar* )p;
p += len;
return (UChar* )(p + ((s - p) & ~1));
@@ -426,95 +259,23 @@ static hash_table_type* PropertyNameTable;
static const OnigCodePoint CR_Hiragana[] = {
1,
-#ifdef ENC_EUC_JIS_2004
- 0xa4a1, 0xa4fb
-#else
0xa4a1, 0xa4f3
-#endif
}; /* CR_Hiragana */
-#ifdef ENC_EUC_JIS_2004
-static const OnigCodePoint CR_Katakana[] = {
- 5,
- 0x8ea6, 0x8eaf, /* JIS X 0201 Katakana */
- 0x8eb1, 0x8edd, /* JIS X 0201 Katakana */
- 0xa5a1, 0xa5fe,
- 0xa6ee, 0xa6fe,
- 0xa7f2, 0xa7f5,
-}; /* CR_Katakana */
-#else
static const OnigCodePoint CR_Katakana[] = {
3,
- 0x8ea6, 0x8eaf, /* JIS X 0201 Katakana */
- 0x8eb1, 0x8edd, /* JIS X 0201 Katakana */
0xa5a1, 0xa5f6,
+ 0xaaa6, 0xaaaf,
+ 0xaab1, 0xaadd
}; /* CR_Katakana */
-#endif
-
-#ifdef ENC_EUC_JIS_2004
-static const OnigCodePoint CR_Han[] = {
- /* EUC-JIS-2004 (JIS X 0213:2004) */
- 7,
- /* plane 1 */
- 0xa1b8, 0xa1b8,
- 0xaea1, 0xfefe, /* Kanji level 1, 2 and 3 */
- /* plane 2 */
- 0x8fa1a1, 0x8fa1fe, /* row 1 */
- 0x8fa3a1, 0x8fa5fe, /* row 3 .. 5 */
- 0x8fa8a1, 0x8fa8fe, /* row 8 */
- 0x8faca1, 0x8faffe, /* row 12 .. 15 */
- 0x8feea1, 0x8ffef6, /* row 78 .. 94 */
-}; /* CR_Han */
-#else
-static const OnigCodePoint CR_Han[] = {
- /* EUC-JP (JIS X 0208 based) */
- 4,
- 0xa1b8, 0xa1b8,
- 0xb0a1, 0xcfd3, /* Kanji level 1 */
- 0xd0a1, 0xf4a6, /* Kanji level 2 */
- 0x8fb0a1, 0x8fedf3 /* JIS X 0212 Supplemental Kanji (row 16 .. 77) */
-}; /* CR_Han */
-#endif
-
-static const OnigCodePoint CR_Latin[] = {
- 4,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0xa3c1, 0xa3da,
- 0xa3e1, 0xa3fa,
- /* TODO: add raw 8 .. 11 to support EUC-JIS-2004 */
- /* TODO: add JIS X 0212 row 9 .. 11 */
-}; /* CR_Latin */
-
-static const OnigCodePoint CR_Greek[] = {
- 2,
- 0xa6a1, 0xa6b8,
-#ifdef ENC_EUC_JIS_2004
- 0xa6c1, 0xa6d9,
-#else
- 0xa6c1, 0xa6d8,
- /* TODO: add JIS X 0212 row 6 */
-#endif
-}; /* CR_Greek */
-
-static const OnigCodePoint CR_Cyrillic[] = {
- 2,
- 0xa7a1, 0xa7c1,
- 0xa7d1, 0xa7f1,
- /* TODO: add JIS X 0212 row 7 */
-}; /* CR_Cyrillic */
static int
init_property_list(void)
{
int r;
- PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
- PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
- PROPERTY_LIST_ADD_PROP("han", CR_Han);
- PROPERTY_LIST_ADD_PROP("latin", CR_Latin);
- PROPERTY_LIST_ADD_PROP("greek", CR_Greek);
- PROPERTY_LIST_ADD_PROP("cyrillic", CR_Cyrillic);
+ PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
+ PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
PropertyInited = 1;
end:
@@ -525,20 +286,14 @@ static int
property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
{
st_data_t ctype;
- UChar *s, *e;
PROPERTY_LIST_INIT_CHECK;
- s = e = ALLOCA_N(UChar, end-p+1);
- for (; p < end; p++) {
- *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- }
-
- if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
- return onigenc_minimum_property_name_to_ctype(enc, s, e);
+ if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
+ return onigenc_minimum_property_name_to_ctype(enc, p, end);
}
- return (int )ctype;
+ return ctype;
}
static int
@@ -598,22 +353,20 @@ OnigEncodingDefine(euc_jp, EUC_JP) = {
code_to_mbclen,
code_to_mbc,
mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
+ 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,
- ONIGENC_FLAG_NONE,
+ 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
- * Link: http://home.m05.itscom.net/numa/uocjleE.pdf
*/
ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */
@@ -628,17 +381,8 @@ ENC_ALIAS("euc-jp-ms", "eucJP-ms")
/*
* Name: CP51932
- * MIBenum: 2108
- * Link: http://www.iana.org/assignments/charset-reg/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")
-
-/*
- * Name: EUC-JP-2004
- * Link: http://ja.wikipedia.org/wiki/EUC-JP-2004
- */
-ENC_REPLICATE("EUC-JP-2004", "EUC-JP") /* defined at JIS X 0213:2004 */
-ENC_ALIAS("EUC-JISX0213", "EUC-JP-2004") /* defined at JIS X 0213:2000, and obsolete at JIS X 0213:2004 */
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
index 55acf00168..f20a57e69a 100644
--- a/enc/euc_kr.c
+++ b/enc/euc_kr.c
@@ -68,7 +68,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -86,7 +86,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
}
};
#undef A
@@ -187,8 +187,6 @@ OnigEncodingDefine(euc_kr, EUC_KR) = {
euckr_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
euckr_left_adjust_char_head,
- euckr_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ euckr_is_allowed_reverse_match
};
ENC_ALIAS("eucKR", "EUC-KR")
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
index 6d193b745e..cf95954bc5 100644
--- a/enc/euc_tw.c
+++ b/enc/euc_tw.c
@@ -68,7 +68,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -86,7 +86,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -104,7 +104,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -122,7 +122,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F
}
};
#undef A
@@ -220,8 +220,6 @@ OnigEncodingDefine(euc_tw, EUC_TW) = {
euctw_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
euctw_left_adjust_char_head,
- euctw_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ euctw_is_allowed_reverse_match
};
ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
index d4184333f5..16c8c1c17f 100644
--- a/enc/gb18030.c
+++ b/enc/gb18030.c
@@ -82,7 +82,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -100,7 +100,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -118,7 +118,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -136,7 +136,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
}
};
#undef A
@@ -575,11 +575,6 @@ gb18030_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, On
return GB18030_MAP[*s] == C1 ? TRUE : FALSE;
}
-/*
- * Name: GB18030
- * MIBenum: 114
- * Link: http://www.iana.org/assignments/charset-reg/GB18030
- */
OnigEncodingDefine(gb18030, GB18030) = {
gb18030_mbc_enc_len,
"GB18030", /* name */
@@ -596,8 +591,6 @@ OnigEncodingDefine(gb18030, GB18030) = {
gb18030_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
gb18030_left_adjust_char_head,
- gb18030_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ gb18030_is_allowed_reverse_match
};
diff --git a/enc/gbk.c b/enc/gbk.c
index 7be60a0de9..3efb1bf636 100644
--- a/enc/gbk.c
+++ b/enc/gbk.c
@@ -90,7 +90,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -108,7 +108,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F
}
};
#undef A
@@ -179,7 +179,7 @@ gbk_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
p++;
break;
}
- }
+ }
}
len = enclen(enc, p, end);
if (p + len > s) return (UChar* )p;
@@ -210,9 +210,7 @@ OnigEncodingDefine(gbk, GBK) = {
gbk_is_code_ctype,
onigenc_not_support_get_ctype_code_range,
gbk_left_adjust_char_head,
- gbk_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ gbk_is_allowed_reverse_match
};
/*
* Name: GBK
diff --git a/enc/iso_2022_jp.h b/enc/iso_2022_jp.h
index 399c2f56a5..8cfad0be06 100644
--- a/enc/iso_2022_jp.h
+++ b/enc/iso_2022_jp.h
@@ -5,12 +5,7 @@ ENC_ALIAS("ISO2022-JP", "ISO-2022-JP");
ENC_REPLICATE("ISO-2022-JP-2", "ISO-2022-JP");
ENC_ALIAS("ISO2022-JP2", "ISO-2022-JP-2");
-/*
- * Name: CP50220
- * MIBenum: 2260
- * Link: http://www.iana.org/assignments/charset-reg/CP50220
- *
- * Windows Codepage 50220
+/* Windows Codepage 50220
* a ISO-2022-JP variant.
* This includes
* * US-ASCII
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index 92dc14f978..b73f8ca379 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -29,8 +29,6 @@
#include "regenc.h"
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
#define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
@@ -109,7 +107,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
OnigEncoding enc ARG_UNUSED)
{
return onigenc_apply_all_case_fold_with_map(
- numberof(CaseFoldMap), CaseFoldMap, 1,
+ sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
flag, f, arg);
}
@@ -272,9 +270,7 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-1", "ISO-8859-1")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
index ec20a15baa..1643278dfd 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -239,8 +239,6 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index ec9840e127..257d9d8919 100644
--- a/enc/iso_8859_11.c
+++ b/enc/iso_8859_11.c
@@ -92,9 +92,7 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-11", "ISO-8859-11")
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index 4d7b328818..f29cb2e281 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -228,9 +228,7 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-13", "ISO-8859-13")
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
index 1271c8a7a6..be83f93f80 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -241,8 +241,6 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index 451033e158..2ec41b66c0 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -235,8 +235,6 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index 5234cf0e7f..3ddc1d91c6 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -237,8 +237,6 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index f4cb9100df..9783f1cd02 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -29,8 +29,6 @@
#include "regenc.h"
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
#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)
@@ -197,7 +195,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
OnigEncoding enc ARG_UNUSED)
{
return onigenc_apply_all_case_fold_with_map(
- numberof(CaseFoldMap), CaseFoldMap, 1,
+ sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
flag, f, arg);
}
@@ -208,7 +206,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
OnigEncoding enc ARG_UNUSED)
{
return onigenc_get_case_fold_codes_by_str_with_map(
- numberof(CaseFoldMap), CaseFoldMap, 1,
+ sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
flag, p, end, items);
}
@@ -237,9 +235,7 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-2", "ISO-8859-2")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
index 85572574b8..81c0c742b6 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -235,8 +235,6 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index 771a2cf6e7..ec71c4bcbf 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -237,8 +237,6 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index 4ee27b10d8..81cc8e5b32 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -225,8 +225,6 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ 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
index 638a181dc2..7384061a1f 100644
--- a/enc/iso_8859_6.c
+++ b/enc/iso_8859_6.c
@@ -92,9 +92,7 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-6", "ISO-8859-6")
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
index aa82f880f9..2f916171db 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -222,9 +222,7 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-7", "ISO-8859-7")
diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c
index 87a6e7bc9b..bd0754c2b1 100644
--- a/enc/iso_8859_8.c
+++ b/enc/iso_8859_8.c
@@ -92,9 +92,7 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-8", "ISO-8859-8")
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
index 0adafa3ed4..4d46e742e2 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -228,9 +228,7 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
is_code_ctype,
onigenc_not_support_get_ctype_code_range,
onigenc_single_byte_left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ISO8859-9", "ISO-8859-9")
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
index 8ec48747f8..f5b7d22349 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -213,9 +213,7 @@ OnigEncodingDefine(koi8_r, KOI8_R) = {
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,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("CP878", "KOI8-R")
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
index 0e51b6eb80..dfbaa9ac36 100644
--- a/enc/koi8_u.c
+++ b/enc/koi8_u.c
@@ -217,7 +217,5 @@ OnigEncodingDefine(koi8_u, KOI8_U) = {
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,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index b917eca0bd..107a387571 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -9,13 +9,12 @@ if $".grep(/mkmf/).empty?
end
require 'erb'
-CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p'
+CONFIG["MAKEDIRS"] ||= '@$(MINIRUBY) -run -e mkdir -- -p'
BUILTIN_ENCS = []
BUILTIN_TRANSES = []
ENC_PATTERNS = []
NOENC_PATTERNS = []
-module_type = :dynamic
until ARGV.empty?
case ARGV[0]
@@ -31,81 +30,11 @@ until ARGV.empty?
when /\A--no-encs=/
NOENC_PATTERNS.concat $'.split
ARGV.shift
- when /\A--module$/
- ARGV.shift
- when /\A--modulestatic$/
- module_type = :static
- ARGV.shift
else
break
end
end
-ALPHANUMERIC_ORDER = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
-def target_encodings
- encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c"]
- 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)}}
- encs = encs.sort_by(&ALPHANUMERIC_ORDER)
- deps = Hash.new {[]}
- inc_srcs = Hash.new {[]}
- default_deps = %w[regenc.h oniguruma.h config.h defines.h]
- db = encs.delete("encdb")
- encs.each do |e|
- File.foreach("#$srcdir/#{e}.c") do |l|
- if /^\s*#\s*include\s+(?:"([^\"]+)"|<(ruby\/\sw+.h)>)/ =~ l
- n = $1 || $2
- if /\.c$/ =~ n
- inc_srcs[e] <<= $`
- n = "enc/#{n}"
- end
- deps[e] <<= n unless default_deps.include?(n)
- end
- end
- end
- class << inc_srcs; self; end.class_eval do
- define_method(:expand) do |d|
- d.map {|n| deps[n] | self.expand(self[n])}.flatten
- end
- end
- inc_srcs.each do |e, d|
- deps[e].concat(inc_srcs.expand(d))
- end
- encs.unshift(db)
- return encs, deps
-end
-
-def target_transcoders
- 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}"}
-
- return atrans, trans
-end
-
-# Constants that "depend" needs.
-MODULE_TYPE = module_type
-ENCS, ENC_DEPS = target_encodings
-ATRANS, TRANS = target_transcoders
-
if File.exist?(depend = File.join($srcdir, "depend"))
erb = ERB.new(File.read(depend), nil, '%')
erb.filename = depend
@@ -119,18 +48,3 @@ mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
open(ARGV[0], 'wb') {|f|
f.puts mkin, dep
}
-if MODULE_TYPE == :static
- erb = ERB.new(File.read(File.join($srcdir, "encinit.c.erb")), nil, '%-')
- erb.filename = "enc/encinit.c.cerb"
- tmp = erb.result(binding)
- begin
- Dir.mkdir 'enc'
- rescue Errno::EEXIST
- end
- File.open("enc/encinit.c", "w") {|f|
- f.puts "/* Automatically generated from enc/encinit.c.erb"
- f.puts " * Do not edit."
- f.puts " */"
- f.puts tmp
- }
-end
diff --git a/enc/mktable.c b/enc/mktable.c
deleted file mode 100644
index 49acf628d0..0000000000
--- a/enc/mktable.c
+++ /dev/null
@@ -1,1162 +0,0 @@
-/**********************************************************************
- mktable.c
-**********************************************************************/
-/*-
- * 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 <stdlib.h>
-#include <stdio.h>
-#include <locale.h>
-
-#define __USE_ISOC99
-#include <ctype.h>
-
-#include "regenc.h"
-
-#define ASCII 0
-#define UNICODE_ISO_8859_1 1
-#define ISO_8859_1 2
-#define ISO_8859_2 3
-#define ISO_8859_3 4
-#define ISO_8859_4 5
-#define ISO_8859_5 6
-#define ISO_8859_6 7
-#define ISO_8859_7 8
-#define ISO_8859_8 9
-#define ISO_8859_9 10
-#define ISO_8859_10 11
-#define ISO_8859_11 12
-#define ISO_8859_13 13
-#define ISO_8859_14 14
-#define ISO_8859_15 15
-#define ISO_8859_16 16
-#define KOI8 17
-#define KOI8_R 18
-
-typedef struct {
- int num;
- const char* name;
-} ENC_INFO;
-
-static ENC_INFO Info[] = {
- { ASCII, "ASCII" },
- { UNICODE_ISO_8859_1, "UNICODE_ISO_8859_1" },
- { ISO_8859_1, "ISO_8859_1" },
- { ISO_8859_2, "ISO_8859_2" },
- { ISO_8859_3, "ISO_8859_3" },
- { ISO_8859_4, "ISO_8859_4" },
- { ISO_8859_5, "ISO_8859_5" },
- { ISO_8859_6, "ISO_8859_6" },
- { ISO_8859_7, "ISO_8859_7" },
- { ISO_8859_8, "ISO_8859_8" },
- { ISO_8859_9, "ISO_8859_9" },
- { ISO_8859_10, "ISO_8859_10" },
- { ISO_8859_11, "ISO_8859_11" },
- { ISO_8859_13, "ISO_8859_13" },
- { ISO_8859_14, "ISO_8859_14" },
- { ISO_8859_15, "ISO_8859_15" },
- { ISO_8859_16, "ISO_8859_16" },
- { KOI8, "KOI8" },
- { KOI8_R, "KOI8_R" }
-};
-
-
-static int IsAlpha(int enc, int c)
-{
- if (enc == ASCII)
- return isalpha(c);
-
- if (c >= 0x41 && c <= 0x5a) return 1;
- if (c >= 0x61 && c <= 0x7a) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- case ISO_8859_1:
- case ISO_8859_9:
- if (c == 0xaa) return 1;
- if (c == 0xb5) return 1;
- if (c == 0xba) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xff) return 1;
- break;
-
- case ISO_8859_2:
- if (c == 0xa1 || c == 0xa3) return 1;
- if (c == 0xa5 || c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c >= 0xae && c <= 0xaf) return 1;
- if (c == 0xb1 || c == 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbc) return 1;
- if (c >= 0xbe && c <= 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_3:
- if (c == 0xa1) return 1;
- if (c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xb1) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbc) return 1;
- if (c == 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xc2) return 1;
- if (c >= 0xc4 && c <= 0xcf) return 1;
- if (c >= 0xd1 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xe2) return 1;
- if (c >= 0xe4 && c <= 0xef) return 1;
- if (c >= 0xf1 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_4:
- if (c >= 0xa1 && c <= 0xa3) return 1;
- if (c == 0xa5 || c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c == 0xae) return 1;
- if (c == 0xb1 || c == 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_5:
- if (c >= 0xa1 && c <= 0xcf && c != 0xad) return 1;
- if (c >= 0xd0 && c <= 0xff && c != 0xf0 && c != 0xfd) return 1;
- break;
-
- case ISO_8859_6:
- if (c >= 0xc1 && c <= 0xda) return 1;
- if (c >= 0xe0 && c <= 0xf2) return 1;
- break;
-
- case ISO_8859_7:
- if (c == 0xb6) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c == 0xbc) return 1;
- if (c >= 0xbe && c <= 0xbf) return 1;
- if (c == 0xc0) return 1;
- if (c >= 0xc1 && c <= 0xdb && c != 0xd2) return 1;
- if (c >= 0xdc && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_8:
- if (c == 0xb5) return 1;
- if (c >= 0xe0 && c <= 0xfa) return 1;
- break;
-
- case ISO_8859_10:
- if (c >= 0xa1 && c <= 0xa6) return 1;
- if (c >= 0xa8 && c <= 0xac) return 1;
- if (c == 0xae || c == 0xaf) return 1;
- if (c >= 0xb1 && c <= 0xb6) return 1;
- if (c >= 0xb8 && c <= 0xbc) return 1;
- if (c >= 0xbe && c <= 0xff) return 1;
- break;
-
- case ISO_8859_11:
- if (c >= 0xa1 && c <= 0xda) return 1;
- if (c >= 0xdf && c <= 0xfb) return 1;
- break;
-
- case ISO_8859_13:
- if (c == 0xa8) return 1;
- if (c == 0xaa) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xb5) return 1;
- if (c == 0xb8) return 1;
- if (c == 0xba) return 1;
- if (c >= 0xbf && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_14:
- if (c == 0xa1 || c == 0xa2) return 1;
- if (c == 0xa4 || c == 0xa5) return 1;
- if (c == 0xa6 || c == 0xa8) return 1;
- if (c >= 0xaa && c <= 0xac) return 1;
- if (c >= 0xaf && c <= 0xb5) return 1;
- if (c >= 0xb7 && c <= 0xff) return 1;
- break;
-
- case ISO_8859_15:
- if (c == 0xaa) return 1;
- if (c == 0xb5) return 1;
- if (c == 0xba) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xff) return 1;
- if (c == 0xa6) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xb4) return 1;
- if (c == 0xb8) return 1;
- if (c == 0xbc) return 1;
- if (c == 0xbd) return 1;
- if (c == 0xbe) return 1;
- break;
-
- case ISO_8859_16:
- if (c == 0xa1) return 1;
- if (c == 0xa2) return 1;
- if (c == 0xa3) return 1;
- if (c == 0xa6) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xaa) return 1;
- if (c == 0xac) return 1;
- if (c == 0xae) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xb2) return 1;
- if (c == 0xb3) return 1;
- if (c == 0xb4) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c == 0xbc) return 1;
- if (c == 0xbd) return 1;
- if (c == 0xbe) return 1;
- if (c == 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xde) return 1;
- if (c >= 0xdf && c <= 0xff) return 1;
- break;
-
- case KOI8_R:
- if (c == 0xa3 || c == 0xb3) return 1;
- /* fall */
- case KOI8:
- if (c >= 0xc0 && c <= 0xff) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsBlank(int enc, int c)
-{
- if (enc == ASCII)
- return isblank(c);
-
- if (c == 0x09 || c == 0x20) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- case ISO_8859_1:
- case ISO_8859_2:
- case ISO_8859_3:
- case ISO_8859_4:
- case ISO_8859_5:
- case ISO_8859_6:
- case ISO_8859_7:
- case ISO_8859_8:
- case ISO_8859_9:
- case ISO_8859_10:
- case ISO_8859_11:
- case ISO_8859_13:
- case ISO_8859_14:
- case ISO_8859_15:
- case ISO_8859_16:
- case KOI8:
- if (c == 0xa0) return 1;
- break;
-
- case KOI8_R:
- if (c == 0x9a) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsCntrl(int enc, int c)
-{
- if (enc == ASCII)
- return iscntrl(c);
-
- if (c >= 0x00 && c <= 0x1F) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- if (c == 0xad) return 1;
- /* fall */
- case ISO_8859_1:
- case ISO_8859_2:
- case ISO_8859_3:
- case ISO_8859_4:
- case ISO_8859_5:
- case ISO_8859_6:
- case ISO_8859_7:
- case ISO_8859_8:
- case ISO_8859_9:
- case ISO_8859_10:
- case ISO_8859_11:
- case ISO_8859_13:
- case ISO_8859_14:
- case ISO_8859_15:
- case ISO_8859_16:
- case KOI8:
- if (c >= 0x7f && c <= 0x9F) return 1;
- break;
-
-
- case KOI8_R:
- if (c == 0x7f) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsDigit(int enc ARG_UNUSED, int c)
-{
- if (c >= 0x30 && c <= 0x39) return 1;
- return 0;
-}
-
-static int IsGraph(int enc, int c)
-{
- if (enc == ASCII)
- return isgraph(c);
-
- if (c >= 0x21 && c <= 0x7e) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- case ISO_8859_1:
- case ISO_8859_2:
- case ISO_8859_4:
- case ISO_8859_5:
- case ISO_8859_9:
- case ISO_8859_10:
- case ISO_8859_13:
- case ISO_8859_14:
- case ISO_8859_15:
- case ISO_8859_16:
- if (c >= 0xa1 && c <= 0xff) return 1;
- break;
-
- case ISO_8859_3:
- if (c >= 0xa1) {
- if (c == 0xa5 || c == 0xae || c == 0xbe || c == 0xc3 || c == 0xd0 ||
- c == 0xe3 || c == 0xf0)
- return 0;
- else
- return 1;
- }
- break;
-
- case ISO_8859_6:
- if (c == 0xa4 || c == 0xac || c == 0xad || c == 0xbb || c == 0xbf)
- return 1;
- if (c >= 0xc1 && c <= 0xda) return 1;
- if (c >= 0xe0 && c <= 0xf2) return 1;
- break;
-
- case ISO_8859_7:
- if (c >= 0xa1 && c <= 0xfe &&
- c != 0xa4 && c != 0xa5 && c != 0xaa &&
- c != 0xae && c != 0xd2) return 1;
- break;
-
- case ISO_8859_8:
- if (c >= 0xa2 && c <= 0xfa) {
- if (c >= 0xbf && c <= 0xde) return 0;
- return 1;
- }
- break;
-
- case ISO_8859_11:
- if (c >= 0xa1 && c <= 0xda) return 1;
- if (c >= 0xdf && c <= 0xfb) return 1;
- break;
-
- case KOI8:
- if (c >= 0xc0 && c <= 0xff) return 1;
- break;
-
- case KOI8_R:
- if (c >= 0x80 && c <= 0xff && c != 0x9a) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsLower(int enc, int c)
-{
- if (enc == ASCII)
- return islower(c);
-
- if (c >= 0x61 && c <= 0x7a) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- case ISO_8859_1:
- case ISO_8859_9:
- if (c == 0xaa) return 1;
- if (c == 0xb5) return 1;
- if (c == 0xba) return 1;
- if (c >= 0xdf && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xff) return 1;
- break;
-
- case ISO_8859_2:
- if (c == 0xb1 || c == 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbc) return 1;
- if (c >= 0xbe && c <= 0xbf) return 1;
- if (c >= 0xdf && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_3:
- if (c == 0xb1) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbc) return 1;
- if (c == 0xbf) return 1;
- if (c == 0xdf) return 1;
- if (c >= 0xe0 && c <= 0xe2) return 1;
- if (c >= 0xe4 && c <= 0xef) return 1;
- if (c >= 0xf1 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_4:
- if (c == 0xa2) return 1;
- if (c == 0xb1 || c == 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbc) return 1;
- if (c >= 0xbe && c <= 0xbf) return 1;
- if (c == 0xdf) return 1;
- if (c >= 0xe0 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_5:
- if (c >= 0xd0 && c <= 0xff && c != 0xf0 && c != 0xfd) return 1;
- break;
-
- case ISO_8859_6:
- break;
-
- case ISO_8859_7:
- if (c == 0xc0) return 1;
- if (c >= 0xdc && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_8:
- if (c == 0xb5) return 1;
- break;
-
- case ISO_8859_10:
- if (c >= 0xb1 && c <= 0xb6) return 1;
- if (c >= 0xb8 && c <= 0xbc) return 1;
- if (c == 0xbe || c == 0xbf) return 1;
- if (c >= 0xdf && c <= 0xff) return 1;
- break;
-
- case ISO_8859_11:
- break;
-
- case ISO_8859_13:
- if (c == 0xb5) return 1;
- if (c == 0xb8) return 1;
- if (c == 0xba) return 1;
- if (c == 0xbf) return 1;
- if (c >= 0xdf && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_14:
- if (c == 0xa2) return 1;
- if (c == 0xa5) return 1;
- if (c == 0xab) return 1;
- if (c == 0xb1 || c == 0xb3 || c == 0xb5) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c == 0xbc) return 1;
- if (c == 0xbe || c == 0xbf) return 1;
- if (c >= 0xdf && c <= 0xff) return 1;
- break;
-
- case ISO_8859_15:
- if (c == 0xaa) return 1;
- if (c == 0xb5) return 1;
- if (c == 0xba) return 1;
- if (c >= 0xdf && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xff) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xb8) return 1;
- if (c == 0xbd) return 1;
- break;
-
- case ISO_8859_16:
- if (c == 0xa2) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xae) return 1;
- if (c == 0xb3) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c == 0xbd) return 1;
- if (c == 0xbf) return 1;
- if (c >= 0xdf && c <= 0xff) return 1;
- break;
-
- case KOI8_R:
- if (c == 0xa3) return 1;
- /* fall */
- case KOI8:
- if (c >= 0xc0 && c <= 0xdf) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsPrint(int enc, int c)
-{
- if (enc == ASCII)
- return isprint(c);
-
- if (c >= 0x20 && c <= 0x7e) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- /* if (c >= 0x09 && c <= 0x0d) return 1; */
- if (c == 0x85) return 1;
- /* fall */
- case ISO_8859_1:
- case ISO_8859_2:
- case ISO_8859_4:
- case ISO_8859_5:
- case ISO_8859_9:
- case ISO_8859_10:
- case ISO_8859_13:
- case ISO_8859_14:
- case ISO_8859_15:
- case ISO_8859_16:
- if (c >= 0xa0 && c <= 0xff) return 1;
- break;
-
- case ISO_8859_3:
- if (c >= 0xa0) {
- if (c == 0xa5 || c == 0xae || c == 0xbe || c == 0xc3 || c == 0xd0 ||
- c == 0xe3 || c == 0xf0)
- return 0;
- else
- return 1;
- }
- break;
-
- case ISO_8859_6:
- if (c == 0xa0) return 1;
- if (c == 0xa4 || c == 0xac || c == 0xad || c == 0xbb || c == 0xbf)
- return 1;
- if (c >= 0xc1 && c <= 0xda) return 1;
- if (c >= 0xe0 && c <= 0xf2) return 1;
- break;
-
- case ISO_8859_7:
- if (c >= 0xa0 && c <= 0xfe &&
- c != 0xa4 && c != 0xa5 && c != 0xaa &&
- c != 0xae && c != 0xd2) return 1;
- break;
-
- case ISO_8859_8:
- if (c >= 0xa0 && c <= 0xfa) {
- if (c >= 0xbf && c <= 0xde) return 0;
- if (c == 0xa1) return 0;
- return 1;
- }
- break;
-
- case ISO_8859_11:
- if (c >= 0xa0 && c <= 0xda) return 1;
- if (c >= 0xdf && c <= 0xfb) return 1;
- break;
-
- case KOI8:
- if (c == 0xa0) return 1;
- if (c >= 0xc0 && c <= 0xff) return 1;
- break;
-
- case KOI8_R:
- if (c >= 0x80 && c <= 0xff) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsPunct(int enc, int c)
-{
- if (enc == ASCII)
- return ispunct(c);
-
- if (enc == UNICODE_ISO_8859_1) {
- if (c == 0x24 || c == 0x2b || c == 0x5e || c == 0x60 ||
- c == 0x7c || c == 0x7e) return 1;
- if (c >= 0x3c && c <= 0x3e) return 1;
- }
-
- if (c >= 0x21 && c <= 0x2f) return 1;
- if (c >= 0x3a && c <= 0x40) return 1;
- if (c >= 0x5b && c <= 0x60) return 1;
- if (c >= 0x7b && c <= 0x7e) return 1;
-
- switch (enc) {
- case ISO_8859_1:
- case ISO_8859_9:
- case ISO_8859_15:
- if (c == 0xad) return 1;
- /* fall */
- case UNICODE_ISO_8859_1:
- if (c == 0xa1) return 1;
- if (c == 0xab) return 1;
- if (c == 0xb7) return 1;
- if (c == 0xbb) return 1;
- if (c == 0xbf) return 1;
- break;
-
- case ISO_8859_2:
- case ISO_8859_4:
- case ISO_8859_5:
- case ISO_8859_14:
- if (c == 0xad) return 1;
- break;
-
- case ISO_8859_3:
- case ISO_8859_10:
- if (c == 0xad) return 1;
- if (c == 0xb7) return 1;
- if (c == 0xbd) return 1;
- break;
-
- case ISO_8859_6:
- if (c == 0xac) return 1;
- if (c == 0xad) return 1;
- if (c == 0xbb) return 1;
- if (c == 0xbf) return 1;
- break;
-
- case ISO_8859_7:
- if (c == 0xa1 || c == 0xa2) return 1;
- if (c == 0xab) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xad) return 1;
- if (c == 0xb7 || c == 0xbb) return 1;
- break;
-
- case ISO_8859_8:
- if (c == 0xab) return 1;
- if (c == 0xad) return 1;
- if (c == 0xb7) return 1;
- if (c == 0xbb) return 1;
- if (c == 0xdf) return 1;
- break;
-
- case ISO_8859_13:
- if (c == 0xa1 || c == 0xa5) return 1;
- if (c == 0xab || c == 0xad) return 1;
- if (c == 0xb4 || c == 0xb7) return 1;
- if (c == 0xbb) return 1;
- if (c == 0xff) return 1;
- break;
-
- case ISO_8859_16:
- if (c == 0xa5) return 1;
- if (c == 0xab) return 1;
- if (c == 0xad) return 1;
- if (c == 0xb5) return 1;
- if (c == 0xb7) return 1;
- if (c == 0xbb) return 1;
- break;
-
- case KOI8_R:
- if (c == 0x9e) return 1;
- break;
-
- case ISO_8859_11:
- case KOI8:
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsSpace(int enc, int c)
-{
- if (enc == ASCII)
- return isspace(c);
-
- if (c >= 0x09 && c <= 0x0d) return 1;
- if (c == 0x20) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- if (c == 0x85) return 1;
- /* fall */
- case ISO_8859_1:
- case ISO_8859_2:
- case ISO_8859_3:
- case ISO_8859_4:
- case ISO_8859_5:
- case ISO_8859_6:
- case ISO_8859_7:
- case ISO_8859_8:
- case ISO_8859_9:
- case ISO_8859_10:
- case ISO_8859_11:
- case ISO_8859_13:
- case ISO_8859_14:
- case ISO_8859_15:
- case ISO_8859_16:
- case KOI8:
- if (c == 0xa0) return 1;
- break;
-
- case KOI8_R:
- if (c == 0x9a) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsUpper(int enc, int c)
-{
- if (enc == ASCII)
- return isupper(c);
-
- if (c >= 0x41 && c <= 0x5a) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- case ISO_8859_1:
- case ISO_8859_9:
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_2:
- if (c == 0xa1 || c == 0xa3) return 1;
- if (c == 0xa5 || c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c >= 0xae && c <= 0xaf) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_3:
- if (c == 0xa1) return 1;
- if (c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c == 0xaf) return 1;
- if (c >= 0xc0 && c <= 0xc2) return 1;
- if (c >= 0xc4 && c <= 0xcf) return 1;
- if (c >= 0xd1 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_4:
- if (c == 0xa1 || c == 0xa3) return 1;
- if (c == 0xa5 || c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c == 0xae) return 1;
- if (c == 0xbd) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_5:
- if (c >= 0xa1 && c <= 0xcf && c != 0xad) return 1;
- break;
-
- case ISO_8859_6:
- break;
-
- case ISO_8859_7:
- if (c == 0xb6) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c == 0xbc) return 1;
- if (c >= 0xbe && c <= 0xbf) return 1;
- if (c >= 0xc1 && c <= 0xdb && c != 0xd2) return 1;
- break;
-
- case ISO_8859_8:
- case ISO_8859_11:
- break;
-
- case ISO_8859_10:
- if (c >= 0xa1 && c <= 0xa6) return 1;
- if (c >= 0xa8 && c <= 0xac) return 1;
- if (c == 0xae || c == 0xaf) return 1;
- if (c >= 0xc0 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_13:
- if (c == 0xa8) return 1;
- if (c == 0xaa) return 1;
- if (c == 0xaf) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_14:
- if (c == 0xa1) return 1;
- if (c == 0xa4 || c == 0xa6) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xaa || c == 0xac) return 1;
- if (c == 0xaf || c == 0xb0) return 1;
- if (c == 0xb2 || c == 0xb4 || c == 0xb7) return 1;
- if (c == 0xbb || c == 0xbd) return 1;
- if (c >= 0xc0 && c <= 0xde) return 1;
- break;
-
- case ISO_8859_15:
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xde) return 1;
- if (c == 0xa6) return 1;
- if (c == 0xb4) return 1;
- if (c == 0xbc) return 1;
- if (c == 0xbe) return 1;
- break;
-
- case ISO_8859_16:
- if (c == 0xa1) return 1;
- if (c == 0xa3) return 1;
- if (c == 0xa6) return 1;
- if (c == 0xaa) return 1;
- if (c == 0xac) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xb2) return 1;
- if (c == 0xb4) return 1;
- if (c == 0xbc) return 1;
- if (c == 0xbe) return 1;
- if (c >= 0xc0 && c <= 0xde) return 1;
- break;
-
- case KOI8_R:
- if (c == 0xb3) return 1;
- /* fall */
- case KOI8:
- if (c >= 0xe0 && c <= 0xff) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsXDigit(int enc, int c)
-{
- if (enc == ASCII)
- return isxdigit(c);
-
- if (c >= 0x30 && c <= 0x39) return 1;
- if (c >= 0x41 && c <= 0x46) return 1;
- if (c >= 0x61 && c <= 0x66) return 1;
- return 0;
-}
-
-static int IsWord(int enc, int c)
-{
- if (enc == ASCII) {
- return (isalpha(c) || isdigit(c) || c == 0x5f);
- }
-
- if (c >= 0x30 && c <= 0x39) return 1;
- if (c >= 0x41 && c <= 0x5a) return 1;
- if (c == 0x5f) return 1;
- if (c >= 0x61 && c <= 0x7a) return 1;
-
- switch (enc) {
- case UNICODE_ISO_8859_1:
- case ISO_8859_1:
- case ISO_8859_9:
- if (c == 0xaa) return 1;
- if (c >= 0xb2 && c <= 0xb3) return 1;
- if (c == 0xb5) return 1;
- if (c >= 0xb9 && c <= 0xba) return 1;
- if (c >= 0xbc && c <= 0xbe) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xff) return 1;
- break;
-
- case ISO_8859_2:
- if (c == 0xa1 || c == 0xa3) return 1;
- if (c == 0xa5 || c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c >= 0xae && c <= 0xaf) return 1;
- if (c == 0xb1 || c == 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbc) return 1;
- if (c >= 0xbe && c <= 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_3:
- if (c == 0xa1) return 1;
- if (c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c == 0xaf) return 1;
- if (c >= 0xb1 && c <= 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbd) return 1;
- if (c == 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xc2) return 1;
- if (c >= 0xc4 && c <= 0xcf) return 1;
- if (c >= 0xd1 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xe2) return 1;
- if (c >= 0xe4 && c <= 0xef) return 1;
- if (c >= 0xf1 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_4:
- if (c >= 0xa1 && c <= 0xa3) return 1;
- if (c == 0xa5 || c == 0xa6) return 1;
- if (c >= 0xa9 && c <= 0xac) return 1;
- if (c == 0xae) return 1;
- if (c == 0xb1 || c == 0xb3) return 1;
- if (c == 0xb5 || c == 0xb6) return 1;
- if (c >= 0xb9 && c <= 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_5:
- if (c >= 0xa1 && c <= 0xcf && c != 0xad) return 1;
- if (c >= 0xd0 && c <= 0xff && c != 0xf0 && c != 0xfd) return 1;
- break;
-
- case ISO_8859_6:
- if (c >= 0xc1 && c <= 0xda) return 1;
- if (c >= 0xe0 && c <= 0xea) return 1;
- if (c >= 0xeb && c <= 0xf2) return 1;
- break;
-
- case ISO_8859_7:
- if (c == 0xb2 || c == 0xb3) return 1;
- if (c == 0xb6) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c >= 0xbc && c <= 0xbf) return 1;
- if (c == 0xc0) return 1;
- if (c >= 0xc1 && c <= 0xdb && c != 0xd2) return 1;
- if (c >= 0xdc && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_8:
- if (c == 0xb2 || c == 0xb3 || c == 0xb5 || c == 0xb9) return 1;
- if (c >= 0xbc && c <= 0xbe) return 1;
- if (c >= 0xe0 && c <= 0xfa) return 1;
- break;
-
- case ISO_8859_10:
- if (c >= 0xa1 && c <= 0xff) {
- if (c != 0xa7 && c != 0xad && c != 0xb0 && c != 0xb7 && c != 0xbd)
- return 1;
- }
- break;
-
- case ISO_8859_11:
- if (c >= 0xa1 && c <= 0xda) return 1;
- if (c >= 0xdf && c <= 0xfb) return 1;
- break;
-
- case ISO_8859_13:
- if (c == 0xa8) return 1;
- if (c == 0xaa) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xb2 || c == 0xb3 || c == 0xb5 || c == 0xb9) return 1;
- if (c >= 0xbc && c <= 0xbe) return 1;
- if (c == 0xb8) return 1;
- if (c == 0xba) return 1;
- if (c >= 0xbf && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xfe) return 1;
- break;
-
- case ISO_8859_14:
- if (c >= 0xa1 && c <= 0xff) {
- if (c == 0xa3 || c == 0xa7 || c == 0xa9 || c == 0xad || c == 0xae ||
- c == 0xb6) return 0;
- return 1;
- }
- break;
-
- case ISO_8859_15:
- if (c == 0xaa) return 1;
- if (c >= 0xb2 && c <= 0xb3) return 1;
- if (c == 0xb5) return 1;
- if (c >= 0xb9 && c <= 0xba) return 1;
- if (c >= 0xbc && c <= 0xbe) return 1;
- if (c >= 0xc0 && c <= 0xd6) return 1;
- if (c >= 0xd8 && c <= 0xf6) return 1;
- if (c >= 0xf8 && c <= 0xff) return 1;
- if (c == 0xa6) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xb4) return 1;
- if (c == 0xb8) return 1;
- break;
-
- case ISO_8859_16:
- if (c == 0xa1) return 1;
- if (c == 0xa2) return 1;
- if (c == 0xa3) return 1;
- if (c == 0xa6) return 1;
- if (c == 0xa8) return 1;
- if (c == 0xaa) return 1;
- if (c == 0xac) return 1;
- if (c == 0xae) return 1;
- if (c == 0xaf) return 1;
- if (c == 0xb2) return 1;
- if (c == 0xb3) return 1;
- if (c == 0xb4) return 1;
- if (c >= 0xb8 && c <= 0xba) return 1;
- if (c == 0xbc) return 1;
- if (c == 0xbd) return 1;
- if (c == 0xbe) return 1;
- if (c == 0xbf) return 1;
- if (c >= 0xc0 && c <= 0xde) return 1;
- if (c >= 0xdf && c <= 0xff) return 1;
- break;
-
- case KOI8_R:
- if (c == 0x9d) return 1;
- if (c == 0xa3 || c == 0xb3) return 1;
- /* fall */
- case KOI8:
- if (c >= 0xc0 && c <= 0xff) return 1;
- break;
-
- default:
- exit(-1);
- }
-
- return 0;
-}
-
-static int IsAscii(int enc ARG_UNUSED, int c)
-{
- if (c >= 0x00 && c <= 0x7f) return 1;
- return 0;
-}
-
-static int IsNewline(int enc ARG_UNUSED, int c)
-{
- if (c == 0x0a) return 1;
- return 0;
-}
-
-static int exec(FILE* fp, ENC_INFO* einfo)
-{
-#define NCOL 8
-
- int c, val, enc;
-
- enc = einfo->num;
-
- fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
- einfo->name);
-
- for (c = 0; c < 256; c++) {
- val = 0;
- if (IsNewline(enc, c)) val |= BIT_CTYPE_NEWLINE;
- if (IsAlpha (enc, c)) val |= (BIT_CTYPE_ALPHA | BIT_CTYPE_ALNUM);
- if (IsBlank (enc, c)) val |= BIT_CTYPE_BLANK;
- if (IsCntrl (enc, c)) val |= BIT_CTYPE_CNTRL;
- if (IsDigit (enc, c)) val |= (BIT_CTYPE_DIGIT | BIT_CTYPE_ALNUM);
- if (IsGraph (enc, c)) val |= BIT_CTYPE_GRAPH;
- if (IsLower (enc, c)) val |= BIT_CTYPE_LOWER;
- if (IsPrint (enc, c)) val |= BIT_CTYPE_PRINT;
- if (IsPunct (enc, c)) val |= BIT_CTYPE_PUNCT;
- if (IsSpace (enc, c)) val |= BIT_CTYPE_SPACE;
- if (IsUpper (enc, c)) val |= BIT_CTYPE_UPPER;
- if (IsXDigit(enc, c)) val |= BIT_CTYPE_XDIGIT;
- if (IsWord (enc, c)) val |= BIT_CTYPE_WORD;
- if (IsAscii (enc, c)) val |= BIT_CTYPE_ASCII;
-
- if (c % NCOL == 0) fputs(" ", fp);
- fprintf(fp, "0x%04x", val);
- if (c != 255) fputs(",", fp);
- if (c != 0 && c % NCOL == (NCOL-1))
- fputs("\n", fp);
- else
- fputs(" ", fp);
- }
- fprintf(fp, "};\n");
- return 0;
-}
-
-extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
-{
- int i;
- FILE* fp = stdout;
-
- setlocale(LC_ALL, "C");
- /* setlocale(LC_ALL, "POSIX"); */
- /* setlocale(LC_ALL, "en_GB.iso88591"); */
- /* setlocale(LC_ALL, "de_BE.iso88591"); */
- /* setlocale(LC_ALL, "fr_FR.iso88591"); */
-
- for (i = 0; i < (int )(sizeof(Info)/sizeof(ENC_INFO)); i++) {
- exec(fp, &Info[i]);
- }
-
- return 0;
-}
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
index 5f5a802874..f7614205af 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -1,9 +1,8 @@
/**********************************************************************
- sjis.c - Onigmo (Oniguruma-mod) (regular expression library)
+ sjis.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,97 +67,6 @@ static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
};
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- /* Fullwidth Alphabet */
- { 0x8260, 0x8281 },
- { 0x8261, 0x8282 },
- { 0x8262, 0x8283 },
- { 0x8263, 0x8284 },
- { 0x8264, 0x8285 },
- { 0x8265, 0x8286 },
- { 0x8266, 0x8287 },
- { 0x8267, 0x8288 },
- { 0x8268, 0x8289 },
- { 0x8269, 0x828a },
- { 0x826a, 0x828b },
- { 0x826b, 0x828c },
- { 0x826c, 0x828d },
- { 0x826d, 0x828e },
- { 0x826e, 0x828f },
- { 0x826f, 0x8290 },
- { 0x8270, 0x8291 },
- { 0x8271, 0x8292 },
- { 0x8272, 0x8293 },
- { 0x8273, 0x8294 },
- { 0x8274, 0x8295 },
- { 0x8275, 0x8296 },
- { 0x8276, 0x8297 },
- { 0x8277, 0x8298 },
- { 0x8278, 0x8299 },
- { 0x8279, 0x829a },
-
- /* Greek */
- { 0x839f, 0x83bf },
- { 0x83a0, 0x83c0 },
- { 0x83a1, 0x83c1 },
- { 0x83a2, 0x83c2 },
- { 0x83a3, 0x83c3 },
- { 0x83a4, 0x83c4 },
- { 0x83a5, 0x83c5 },
- { 0x83a6, 0x83c6 },
- { 0x83a7, 0x83c7 },
- { 0x83a8, 0x83c8 },
- { 0x83a9, 0x83c9 },
- { 0x83aa, 0x83ca },
- { 0x83ab, 0x83cb },
- { 0x83ac, 0x83cc },
- { 0x83ad, 0x83cd },
- { 0x83ae, 0x83ce },
- { 0x83af, 0x83cf },
- { 0x83b0, 0x83d0 },
- { 0x83b1, 0x83d1 },
- { 0x83b2, 0x83d2 },
- { 0x83b3, 0x83d3 },
- { 0x83b4, 0x83d4 },
- { 0x83b5, 0x83d5 },
- { 0x83b6, 0x83d6 },
-
- /* Cyrillic */
- { 0x8440, 0x8470 },
- { 0x8441, 0x8471 },
- { 0x8442, 0x8472 },
- { 0x8443, 0x8473 },
- { 0x8444, 0x8474 },
- { 0x8445, 0x8475 },
- { 0x8446, 0x8476 },
- { 0x8447, 0x8477 },
- { 0x8448, 0x8478 },
- { 0x8449, 0x8479 },
- { 0x844a, 0x847a },
- { 0x844b, 0x847b },
- { 0x844c, 0x847c },
- { 0x844d, 0x847d },
- { 0x844e, 0x847e },
- { 0x844f, 0x8480 },
- { 0x8450, 0x8481 },
- { 0x8451, 0x8482 },
- { 0x8452, 0x8483 },
- { 0x8453, 0x8484 },
- { 0x8454, 0x8485 },
- { 0x8455, 0x8486 },
- { 0x8456, 0x8487 },
- { 0x8457, 0x8488 },
- { 0x8458, 0x8489 },
- { 0x8459, 0x848a },
- { 0x845a, 0x848b },
- { 0x845b, 0x848c },
- { 0x845c, 0x848d },
- { 0x845d, 0x848e },
- { 0x845e, 0x848f },
- { 0x845f, 0x8490 },
- { 0x8460, 0x8491 },
-};
-
#define SJIS_ISMB_FIRST(byte) (EncLen_SJIS[byte] > 1)
#define SJIS_ISMB_TRAIL(byte) SJIS_CAN_BE_TRAIL_TABLE[(byte)]
@@ -227,16 +135,13 @@ code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
if (EncLen_SJIS[(int )code] == 1)
return 1;
else
- return ONIGERR_INVALID_CODE_POINT_VALUE;
+ return 0;
}
else if (code <= 0xffff) {
- int low = code & 0xff;
- if (! SJIS_ISMB_TRAIL(low))
- return ONIGERR_INVALID_CODE_POINT_VALUE;
return 2;
}
else
- return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+ return ONIGERR_INVALID_CODE_POINT_VALUE;
}
static OnigCodePoint
@@ -245,7 +150,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
int c, i, len;
OnigCodePoint n;
- len = mbc_enc_len(p, end, enc);
+ len = enclen(enc, p, end);
c = *p++;
n = c;
if (len == 1) return n;
@@ -267,90 +172,10 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
*p++ = (UChar )(code & 0xff);
#if 0
- if (mbc_enc_len(buf, p, enc) != (p - buf))
+ if (enclen(enc, buf) != (p - buf))
return REGERR_INVALID_CODE_POINT_VALUE;
#endif
- return (int )(p - buf);
-}
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
- OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
-{
- return onigenc_apply_all_case_fold_with_map(
- sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
- flag, f, arg);
-}
-
-static OnigCodePoint
-get_lower_case(OnigCodePoint code)
-{
- if (ONIGENC_IS_IN_RANGE(code, 0x8260, 0x8279)) {
- /* Fullwidth Alphabet */
- return (OnigCodePoint )(code + 0x0021);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0x839f, 0x83b6)) {
- /* Greek */
- return (OnigCodePoint )(code + 0x0020);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0x8440, 0x8460)) {
- /* Cyrillic */
- int d = (code >= 0x844f) ? 1 : 0;
- return (OnigCodePoint )(code + (0x0030 + d));
- }
- return code;
-}
-
-static OnigCodePoint
-get_upper_case(OnigCodePoint code)
-{
- if (ONIGENC_IS_IN_RANGE(code, 0x8281, 0x829a)) {
- /* Fullwidth Alphabet */
- return (OnigCodePoint )(code - 0x0021);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0x83bf, 0x83d6)) {
- /* Greek */
- return (OnigCodePoint )(code - 0x0020);
- }
- else if (ONIGENC_IS_IN_RANGE(code, 0x8470, 0x847e) ||
- ONIGENC_IS_IN_RANGE(code, 0x8480, 0x8491)) {
- /* Cyrillic */
- int d = (code >= 0x8480) ? 1 : 0;
- return (OnigCodePoint )(code - (0x0030 - d));
- }
- return code;
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
- const OnigUChar* p, const OnigUChar* end,
- OnigCaseFoldCodeItem items[], OnigEncoding enc)
-{
- int len;
- OnigCodePoint code, code_lo, code_up;
-
- code = mbc_to_code(p, end, enc);
- if (ONIGENC_IS_ASCII_CODE(code))
- return onigenc_ascii_get_case_fold_codes_by_str(flag, p, end, items, enc);
-
- len = mbc_enc_len(p, end, enc);
- code_lo = get_lower_case(code);
- code_up = get_upper_case(code);
-
- if (code != code_lo) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = code_lo;
- return 1;
- }
- else if (code != code_up) {
- items[0].byte_len = len;
- items[0].code_len = 1;
- items[0].code[0] = code_up;
- return 1;
- }
-
- return 0;
+ return p - buf;
}
static int
@@ -366,11 +191,12 @@ mbc_case_fold(OnigCaseFoldType flag,
return 1;
}
else {
- OnigCodePoint code;
- int len;
+ int i;
+ int len = enclen(enc, p, end);
- code = get_lower_case(mbc_to_code(p, end, enc));
- len = code_to_mbc(code, lower, enc);
+ for (i = 0; i < len; i++) {
+ *lower++ = *p++;
+ }
(*pp) += len;
return len; /* return byte length of converted char to lower */
}
@@ -382,7 +208,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
const UChar** pp, const UChar* end)
{
return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-
+
}
#endif
@@ -417,9 +243,9 @@ left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end, Onig
p++;
break;
}
- }
+ }
}
- len = mbc_enc_len(p, end, enc);
+ len = enclen(enc, p, end);
if (p + len > s) return (UChar* )p;
p += len;
return (UChar* )(p + ((s - p) & ~1));
@@ -452,58 +278,13 @@ static const OnigCodePoint CR_Katakana[] = {
0x8380, 0x8396,
}; /* CR_Katakana */
-#ifdef ENC_CP932
-static const OnigCodePoint CR_Han[] = {
- 6,
- 0x8157, 0x8157,
- 0x889f, 0x9872, /* Kanji level 1 */
- 0x989f, 0x9ffc, /* Kanji level 2 */
- 0xe040, 0xeaa4, /* Kanji level 2 */
- 0xed40, 0xeeec, /* NEC-selected IBM extended characters (without symbols) */
- 0xfa5c, 0xfc4b, /* IBM extended characters (without symbols) */
-}; /* CR_Han */
-#else
-static const OnigCodePoint CR_Han[] = {
- 4,
- 0x8157, 0x8157,
- 0x889f, 0x9872, /* Kanji level 1 */
- 0x989f, 0x9ffc, /* Kanji level 2 */
- 0xe040, 0xeaa4, /* Kanji level 2 */
-}; /* CR_Han */
-#endif
-
-static const OnigCodePoint CR_Latin[] = {
- 4,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x8260, 0x8279,
- 0x8281, 0x829a,
-}; /* CR_Latin */
-
-static const OnigCodePoint CR_Greek[] = {
- 2,
- 0x839f, 0x83b6,
- 0x83bf, 0x83d6,
-}; /* CR_Greek */
-
-static const OnigCodePoint CR_Cyrillic[] = {
- 3,
- 0x8440, 0x8460,
- 0x8470, 0x847f,
- 0x8480, 0x8491,
-}; /* CR_Cyrillic */
-
static int
init_property_list(void)
{
int r;
- PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
- PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
- PROPERTY_LIST_ADD_PROP("han", CR_Han);
- PROPERTY_LIST_ADD_PROP("latin", CR_Latin);
- PROPERTY_LIST_ADD_PROP("greek", CR_Greek);
- PROPERTY_LIST_ADD_PROP("cyrillic", CR_Cyrillic);
+ PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
+ PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
PropertyInited = 1;
end:
@@ -514,20 +295,14 @@ static int
property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
{
hash_data_type ctype;
- UChar *s, *e;
PROPERTY_LIST_INIT_CHECK;
- s = e = ALLOCA_N(UChar, end-p+1);
- for (; p < end; p++) {
- *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
- }
-
- if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
- return onigenc_minimum_property_name_to_ctype(enc, s, e);
+ if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
+ return onigenc_minimum_property_name_to_ctype(enc, p, end);
}
- return (int )ctype;
+ return (int)ctype;
}
static int
@@ -576,7 +351,6 @@ get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
}
}
-#ifndef ENC_CP932
OnigEncodingDefine(shift_jis, Shift_JIS) = {
mbc_enc_len,
"Shift_JIS", /* name */
@@ -587,15 +361,14 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
code_to_mbclen,
code_to_mbc,
mbc_case_fold,
- apply_all_case_fold,
- get_case_fold_codes_by_str,
+ 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,
- ONIGENC_FLAG_NONE,
+ 0
};
/*
* Name: Shift_JIS
@@ -603,6 +376,19 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
* 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
@@ -611,4 +397,3 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
*/
ENC_REPLICATE("MacJapanese", "Shift_JIS")
ENC_ALIAS("MacJapan", "MacJapanese")
-#endif
diff --git a/enc/trans/JIS/JISX0213-1%UCS@BMP.src b/enc/trans/JIS/JISX0213-1%UCS@BMP.src
deleted file mode 100644
index 09377be66b..0000000000
--- a/enc/trans/JIS/JISX0213-1%UCS@BMP.src
+++ /dev/null
@@ -1,1926 +0,0 @@
-# $NetBSD: JISX0213-1%UCS@BMP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "JISX0213-1/UCS:BMP"
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## JIS X 0213:2004 vs Unicode mapping table
-##
-## Date: 22 May 2006
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## Copyright (C) 2006 Project X0213, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## 3-XXXX JIS X 0213:2004 plane 1 (GL encoding)
-## 4-XXXX JIS X 0213:2000 plane 2 (GL encoding)
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-## JIS Unicode Name Note
-0x222F = 0xFF07 # 0x0027
-0x2230 = 0xFF02 # 0x0022
-0x2231 = 0xFF0D # 0x002D
-0x2232 = 0xFF5E # 0x007E
-0x2233 = 0x3033
-0x2234 = 0x3034
-0x2235 = 0x3035
-0x2236 = 0x303B
-0x2237 = 0x303C
-0x2238 = 0x30FF
-0x2239 = 0x309F
-0x2242 = 0x2284
-0x2243 = 0x2285
-0x2244 = 0x228A
-0x2245 = 0x228B
-0x2246 = 0x2209
-0x2247 = 0x2205
-0x2248 = 0x2305
-0x2249 = 0x2306
-0x2251 = 0x2295
-0x2252 = 0x2296
-0x2253 = 0x2297
-0x2254 = 0x2225
-0x2255 = 0x2226
-0x2256 = 0xFF5F
-0x2257 = 0xFF60
-0x2258 = 0x3018
-0x2259 = 0x3019
-0x225A = 0x3016
-0x225B = 0x3017
-0x226B = 0x2262
-0x226C = 0x2243
-0x226D = 0x2245
-0x226E = 0x2248
-0x226F = 0x2276
-0x2270 = 0x2277
-0x2271 = 0x2194
-0x227A = 0x266E
-0x227B = 0x266B
-0x227C = 0x266C
-0x227D = 0x2669
-0x2321 = 0x25B7
-0x2322 = 0x25B6
-0x2323 = 0x25C1
-0x2324 = 0x25C0
-0x2325 = 0x2197
-0x2326 = 0x2198
-0x2327 = 0x2196
-0x2328 = 0x2199
-0x2329 = 0x21C4
-0x232A = 0x21E8
-0x232B = 0x21E6
-0x232C = 0x21E7
-0x232D = 0x21E9
-0x232E = 0x2934
-0x232F = 0x2935
-0x233A = 0x29BF
-0x233B = 0x25C9
-0x233C = 0x303D
-0x233D = 0xFE46
-0x233E = 0xFE45
-0x233F = 0x25E6
-0x2340 = 0x2022
-0x235B = 0x2213
-0x235C = 0x2135
-0x235D = 0x210F
-0x235E = 0x33CB
-0x235F = 0x2113
-0x2360 = 0x2127
-0x237B = 0x30A0
-0x237C = 0x2013
-0x237D = 0x29FA
-0x237E = 0x29FB
-0x2474 = 0x3094
-0x2475 = 0x3095
-0x2476 = 0x3096
-#0x2477 = 0x304B + 0x309A
-#0x2478 = 0x304D + 0x309A
-#0x2479 = 0x304F + 0x309A
-#0x247A = 0x3051 + 0x309A
-#0x247B = 0x3053 + 0x309A
-#0x2577 = 0x30AB + 0x309A
-#0x2578 = 0x30AD + 0x309A
-#0x2579 = 0x30AF + 0x309A
-#0x257A = 0x30B1 + 0x309A
-#0x257B = 0x30B3 + 0x309A
-#0x257C = 0x30BB + 0x309A
-#0x257D = 0x30C4 + 0x309A
-#0x257E = 0x30C8 + 0x309A
-0x2639 = 0x2664
-0x263A = 0x2660
-0x263B = 0x2662
-0x263C = 0x2666
-0x263D = 0x2661
-0x263E = 0x2665
-0x263F = 0x2667
-0x2640 = 0x2663
-0x2659 = 0x03C2
-0x265A = 0x24F5
-0x265B = 0x24F6
-0x265C = 0x24F7
-0x265D = 0x24F8
-0x265E = 0x24F9
-0x265F = 0x24FA
-0x2660 = 0x24FB
-0x2661 = 0x24FC
-0x2662 = 0x24FD
-0x2663 = 0x24FE
-0x2664 = 0x2616
-0x2665 = 0x2617
-0x2666 = 0x3020
-0x2667 = 0x260E
-0x2668 = 0x2600
-0x2669 = 0x2601
-0x266A = 0x2602
-0x266B = 0x2603
-0x266C = 0x2668
-0x266D = 0x25B1
-0x266E = 0x31F0
-0x266F = 0x31F1
-0x2670 = 0x31F2
-0x2671 = 0x31F3
-0x2672 = 0x31F4
-0x2673 = 0x31F5
-0x2674 = 0x31F6
-0x2675 = 0x31F7
-0x2676 = 0x31F8
-0x2677 = 0x31F9
-#0x2678 = 0x31F7 + 0x309A
-0x2679 = 0x31FA
-0x267A = 0x31FB
-0x267B = 0x31FC
-0x267C = 0x31FD
-0x267D = 0x31FE
-0x267E = 0x31FF
-0x2742 = 0x23BE
-0x2743 = 0x23BF
-0x2744 = 0x23C0
-0x2745 = 0x23C1
-0x2746 = 0x23C2
-0x2747 = 0x23C3
-0x2748 = 0x23C4
-0x2749 = 0x23C5
-0x274A = 0x23C6
-0x274B = 0x23C7
-0x274C = 0x23C8
-0x274D = 0x23C9
-0x274E = 0x23CA
-0x274F = 0x23CB
-0x2750 = 0x23CC
-0x2772 = 0x30F7
-0x2773 = 0x30F8
-0x2774 = 0x30F9
-0x2775 = 0x30FA
-0x2776 = 0x22DA
-0x2777 = 0x22DB
-0x2778 = 0x2153
-0x2779 = 0x2154
-0x277A = 0x2155
-0x277B = 0x2713
-0x277C = 0x2318
-0x277D = 0x2423
-0x277E = 0x23CE
-0x2841 = 0x3251
-0x2842 = 0x3252
-0x2843 = 0x3253
-0x2844 = 0x3254
-0x2845 = 0x3255
-0x2846 = 0x3256
-0x2847 = 0x3257
-0x2848 = 0x3258
-0x2849 = 0x3259
-0x284A = 0x325A
-0x284B = 0x325B
-0x284C = 0x325C
-0x284D = 0x325D
-0x284E = 0x325E
-0x284F = 0x325F
-0x2850 = 0x32B1
-0x2851 = 0x32B2
-0x2852 = 0x32B3
-0x2853 = 0x32B4
-0x2854 = 0x32B5
-0x2855 = 0x32B6
-0x2856 = 0x32B7
-0x2857 = 0x32B8
-0x2858 = 0x32B9
-0x2859 = 0x32BA
-0x285A = 0x32BB
-0x285B = 0x32BC
-0x285C = 0x32BD
-0x285D = 0x32BE
-0x285E = 0x32BF
-0x2867 = 0x25D0
-0x2868 = 0x25D1
-0x2869 = 0x25D2
-0x286A = 0x25D3
-0x286B = 0x203C
-0x286C = 0x2047
-0x286D = 0x2048
-0x286E = 0x2049
-0x286F = 0x01CD
-0x2870 = 0x01CE
-0x2871 = 0x01D0
-0x2872 = 0x1E3E
-0x2873 = 0x1E3F
-0x2874 = 0x01F8
-0x2875 = 0x01F9
-0x2876 = 0x01D1
-0x2877 = 0x01D2
-0x2878 = 0x01D4
-0x2879 = 0x01D6
-0x287A = 0x01D8
-0x287B = 0x01DA
-0x287C = 0x01DC
-0x2921 = 0x20AC
-0x2922 = 0x00A0
-0x2923 = 0x00A1
-0x2924 = 0x00A4
-0x2925 = 0x00A6
-0x2926 = 0x00A9
-0x2927 = 0x00AA
-0x2928 = 0x00AB
-0x2929 = 0x00AD
-0x292A = 0x00AE
-0x292B = 0x00AF
-0x292C = 0x00B2
-0x292D = 0x00B3
-0x292E = 0x00B7
-0x292F = 0x00B8
-0x2930 = 0x00B9
-0x2931 = 0x00BA
-0x2932 = 0x00BB
-0x2933 = 0x00BC
-0x2934 = 0x00BD
-0x2935 = 0x00BE
-0x2936 = 0x00BF
-0x2937 = 0x00C0
-0x2938 = 0x00C1
-0x2939 = 0x00C2
-0x293A = 0x00C3
-0x293B = 0x00C4
-0x293C = 0x00C5
-0x293D = 0x00C6
-0x293E = 0x00C7
-0x293F = 0x00C8
-0x2940 = 0x00C9
-0x2941 = 0x00CA
-0x2942 = 0x00CB
-0x2943 = 0x00CC
-0x2944 = 0x00CD
-0x2945 = 0x00CE
-0x2946 = 0x00CF
-0x2947 = 0x00D0
-0x2948 = 0x00D1
-0x2949 = 0x00D2
-0x294A = 0x00D3
-0x294B = 0x00D4
-0x294C = 0x00D5
-0x294D = 0x00D6
-0x294E = 0x00D8
-0x294F = 0x00D9
-0x2950 = 0x00DA
-0x2951 = 0x00DB
-0x2952 = 0x00DC
-0x2953 = 0x00DD
-0x2954 = 0x00DE
-0x2955 = 0x00DF
-0x2956 = 0x00E0
-0x2957 = 0x00E1
-0x2958 = 0x00E2
-0x2959 = 0x00E3
-0x295A = 0x00E4
-0x295B = 0x00E5
-0x295C = 0x00E6
-0x295D = 0x00E7
-0x295E = 0x00E8
-0x295F = 0x00E9
-0x2960 = 0x00EA
-0x2961 = 0x00EB
-0x2962 = 0x00EC
-0x2963 = 0x00ED
-0x2964 = 0x00EE
-0x2965 = 0x00EF
-0x2966 = 0x00F0
-0x2967 = 0x00F1
-0x2968 = 0x00F2
-0x2969 = 0x00F3
-0x296A = 0x00F4
-0x296B = 0x00F5
-0x296C = 0x00F6
-0x296D = 0x00F8
-0x296E = 0x00F9
-0x296F = 0x00FA
-0x2970 = 0x00FB
-0x2971 = 0x00FC
-0x2972 = 0x00FD
-0x2973 = 0x00FE
-0x2974 = 0x00FF
-0x2975 = 0x0100
-0x2976 = 0x012A
-0x2977 = 0x016A
-0x2978 = 0x0112
-0x2979 = 0x014C
-0x297A = 0x0101
-0x297B = 0x012B
-0x297C = 0x016B
-0x297D = 0x0113
-0x297E = 0x014D
-0x2A21 = 0x0104
-0x2A22 = 0x02D8
-0x2A23 = 0x0141
-0x2A24 = 0x013D
-0x2A25 = 0x015A
-0x2A26 = 0x0160
-0x2A27 = 0x015E
-0x2A28 = 0x0164
-0x2A29 = 0x0179
-0x2A2A = 0x017D
-0x2A2B = 0x017B
-0x2A2C = 0x0105
-0x2A2D = 0x02DB
-0x2A2E = 0x0142
-0x2A2F = 0x013E
-0x2A30 = 0x015B
-0x2A31 = 0x02C7
-0x2A32 = 0x0161
-0x2A33 = 0x015F
-0x2A34 = 0x0165
-0x2A35 = 0x017A
-0x2A36 = 0x02DD
-0x2A37 = 0x017E
-0x2A38 = 0x017C
-0x2A39 = 0x0154
-0x2A3A = 0x0102
-0x2A3B = 0x0139
-0x2A3C = 0x0106
-0x2A3D = 0x010C
-0x2A3E = 0x0118
-0x2A3F = 0x011A
-0x2A40 = 0x010E
-0x2A41 = 0x0143
-0x2A42 = 0x0147
-0x2A43 = 0x0150
-0x2A44 = 0x0158
-0x2A45 = 0x016E
-0x2A46 = 0x0170
-0x2A47 = 0x0162
-0x2A48 = 0x0155
-0x2A49 = 0x0103
-0x2A4A = 0x013A
-0x2A4B = 0x0107
-0x2A4C = 0x010D
-0x2A4D = 0x0119
-0x2A4E = 0x011B
-0x2A4F = 0x010F
-0x2A50 = 0x0111
-0x2A51 = 0x0144
-0x2A52 = 0x0148
-0x2A53 = 0x0151
-0x2A54 = 0x0159
-0x2A55 = 0x016F
-0x2A56 = 0x0171
-0x2A57 = 0x0163
-0x2A58 = 0x02D9
-0x2A59 = 0x0108
-0x2A5A = 0x011C
-0x2A5B = 0x0124
-0x2A5C = 0x0134
-0x2A5D = 0x015C
-0x2A5E = 0x016C
-0x2A5F = 0x0109
-0x2A60 = 0x011D
-0x2A61 = 0x0125
-0x2A62 = 0x0135
-0x2A63 = 0x015D
-0x2A64 = 0x016D
-0x2A65 = 0x0271
-0x2A66 = 0x028B
-0x2A67 = 0x027E
-0x2A68 = 0x0283
-0x2A69 = 0x0292
-0x2A6A = 0x026C
-0x2A6B = 0x026E
-0x2A6C = 0x0279
-0x2A6D = 0x0288
-0x2A6E = 0x0256
-0x2A6F = 0x0273
-0x2A70 = 0x027D
-0x2A71 = 0x0282
-0x2A72 = 0x0290
-0x2A73 = 0x027B
-0x2A74 = 0x026D
-0x2A75 = 0x025F
-0x2A76 = 0x0272
-0x2A77 = 0x029D
-0x2A78 = 0x028E
-0x2A79 = 0x0261
-0x2A7A = 0x014B
-0x2A7B = 0x0270
-0x2A7C = 0x0281
-0x2A7D = 0x0127
-0x2A7E = 0x0295
-0x2B21 = 0x0294
-0x2B22 = 0x0266
-0x2B23 = 0x0298
-0x2B24 = 0x01C2
-0x2B25 = 0x0253
-0x2B26 = 0x0257
-0x2B27 = 0x0284
-0x2B28 = 0x0260
-0x2B29 = 0x0193
-0x2B2A = 0x0153
-0x2B2B = 0x0152
-0x2B2C = 0x0268
-0x2B2D = 0x0289
-0x2B2E = 0x0258
-0x2B2F = 0x0275
-0x2B30 = 0x0259
-0x2B31 = 0x025C
-0x2B32 = 0x025E
-0x2B33 = 0x0250
-0x2B34 = 0x026F
-0x2B35 = 0x028A
-0x2B36 = 0x0264
-0x2B37 = 0x028C
-0x2B38 = 0x0254
-0x2B39 = 0x0251
-0x2B3A = 0x0252
-0x2B3B = 0x028D
-0x2B3C = 0x0265
-0x2B3D = 0x02A2
-0x2B3E = 0x02A1
-0x2B3F = 0x0255
-0x2B40 = 0x0291
-0x2B41 = 0x027A
-0x2B42 = 0x0267
-0x2B43 = 0x025A
-#0x2B44 = 0x00E6 + 0x0300
-0x2B45 = 0x01FD
-0x2B46 = 0x1F70
-0x2B47 = 0x1F71
-#0x2B48 = 0x0254 + 0x0300
-#0x2B49 = 0x0254 + 0x0301
-#0x2B4A = 0x028C + 0x0300
-#0x2B4B = 0x028C + 0x0301
-#0x2B4C = 0x0259 + 0x0300
-#0x2B4D = 0x0259 + 0x0301
-#0x2B4E = 0x025A + 0x0300
-#0x2B4F = 0x025A + 0x0301
-0x2B50 = 0x1F72
-0x2B51 = 0x1F73
-0x2B52 = 0x0361
-0x2B53 = 0x02C8
-0x2B54 = 0x02CC
-0x2B55 = 0x02D0
-0x2B56 = 0x02D1
-0x2B57 = 0x0306
-0x2B58 = 0x203F
-0x2B59 = 0x030B
-0x2B5A = 0x0301
-0x2B5B = 0x0304
-0x2B5C = 0x0300
-0x2B5D = 0x030F
-0x2B5E = 0x030C
-0x2B5F = 0x0302
-0x2B60 = 0x02E5
-0x2B61 = 0x02E6
-0x2B62 = 0x02E7
-0x2B63 = 0x02E8
-0x2B64 = 0x02E9
-#0x2B65 = 0x02E9 + 0x02E5
-#0x2B66 = 0x02E5 + 0x02E9
-0x2B67 = 0x0325
-0x2B68 = 0x032C
-0x2B69 = 0x0339
-0x2B6A = 0x031C
-0x2B6B = 0x031F
-0x2B6C = 0x0320
-0x2B6D = 0x0308
-0x2B6E = 0x033D
-0x2B6F = 0x0329
-0x2B70 = 0x032F
-0x2B71 = 0x02DE
-0x2B72 = 0x0324
-0x2B73 = 0x0330
-0x2B74 = 0x033C
-0x2B75 = 0x0334
-0x2B76 = 0x031D
-0x2B77 = 0x031E
-0x2B78 = 0x0318
-0x2B79 = 0x0319
-0x2B7A = 0x032A
-0x2B7B = 0x033A
-0x2B7C = 0x033B
-0x2B7D = 0x0303
-0x2B7E = 0x031A
-0x2C21 = 0x2776
-0x2C22 = 0x2777
-0x2C23 = 0x2778
-0x2C24 = 0x2779
-0x2C25 = 0x277A
-0x2C26 = 0x277B
-0x2C27 = 0x277C
-0x2C28 = 0x277D
-0x2C29 = 0x277E
-0x2C2A = 0x277F
-0x2C2B = 0x24EB
-0x2C2C = 0x24EC
-0x2C2D = 0x24ED
-0x2C2E = 0x24EE
-0x2C2F = 0x24EF
-0x2C30 = 0x24F0
-0x2C31 = 0x24F1
-0x2C32 = 0x24F2
-0x2C33 = 0x24F3
-0x2C34 = 0x24F4
-0x2C35 = 0x2170
-0x2C36 = 0x2171
-0x2C37 = 0x2172
-0x2C38 = 0x2173
-0x2C39 = 0x2174
-0x2C3A = 0x2175
-0x2C3B = 0x2176
-0x2C3C = 0x2177
-0x2C3D = 0x2178
-0x2C3E = 0x2179
-0x2C3F = 0x217A
-0x2C40 = 0x217B
-0x2C41 = 0x24D0
-0x2C42 = 0x24D1
-0x2C43 = 0x24D2
-0x2C44 = 0x24D3
-0x2C45 = 0x24D4
-0x2C46 = 0x24D5
-0x2C47 = 0x24D6
-0x2C48 = 0x24D7
-0x2C49 = 0x24D8
-0x2C4A = 0x24D9
-0x2C4B = 0x24DA
-0x2C4C = 0x24DB
-0x2C4D = 0x24DC
-0x2C4E = 0x24DD
-0x2C4F = 0x24DE
-0x2C50 = 0x24DF
-0x2C51 = 0x24E0
-0x2C52 = 0x24E1
-0x2C53 = 0x24E2
-0x2C54 = 0x24E3
-0x2C55 = 0x24E4
-0x2C56 = 0x24E5
-0x2C57 = 0x24E6
-0x2C58 = 0x24E7
-0x2C59 = 0x24E8
-0x2C5A = 0x24E9
-0x2C5B = 0x32D0
-0x2C5C = 0x32D1
-0x2C5D = 0x32D2
-0x2C5E = 0x32D3
-0x2C5F = 0x32D4
-0x2C60 = 0x32D5
-0x2C61 = 0x32D6
-0x2C62 = 0x32D7
-0x2C63 = 0x32D8
-0x2C64 = 0x32D9
-0x2C65 = 0x32DA
-0x2C66 = 0x32DB
-0x2C67 = 0x32DC
-0x2C68 = 0x32DD
-0x2C69 = 0x32DE
-0x2C6A = 0x32DF
-0x2C6B = 0x32E0
-0x2C6C = 0x32E1
-0x2C6D = 0x32E2
-0x2C6E = 0x32E3
-0x2C6F = 0x32FA
-0x2C70 = 0x32E9
-0x2C71 = 0x32E5
-0x2C72 = 0x32ED
-0x2C73 = 0x32EC
-0x2C7D = 0x2051
-0x2C7E = 0x2042
-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
-0x2D3F = 0x216A
-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
-0x2D57 = 0x216B
-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
-0x2D73 = 0x222E
-0x2D78 = 0x221F
-0x2D79 = 0x22BF
-0x2D7D = 0x2756
-0x2D7E = 0x261E
-0x2E21 = 0x4FF1
-0x2E23 = 0x3402
-0x2E24 = 0x4E28
-0x2E25 = 0x4E2F
-0x2E26 = 0x4E30
-0x2E27 = 0x4E8D
-0x2E28 = 0x4EE1
-0x2E29 = 0x4EFD
-0x2E2A = 0x4EFF
-0x2E2B = 0x4F03
-0x2E2C = 0x4F0B
-0x2E2D = 0x4F60
-0x2E2E = 0x4F48
-0x2E2F = 0x4F49
-0x2E30 = 0x4F56
-0x2E31 = 0x4F5F
-0x2E32 = 0x4F6A
-0x2E33 = 0x4F6C
-0x2E34 = 0x4F7E
-0x2E35 = 0x4F8A
-0x2E36 = 0x4F94
-0x2E37 = 0x4F97
-0x2E38 = 0xFA30
-0x2E39 = 0x4FC9
-0x2E3A = 0x4FE0
-0x2E3B = 0x5001
-0x2E3C = 0x5002
-0x2E3D = 0x500E
-0x2E3E = 0x5018
-0x2E3F = 0x5027
-0x2E40 = 0x502E
-0x2E41 = 0x5040
-0x2E42 = 0x503B
-0x2E43 = 0x5041
-0x2E44 = 0x5094
-0x2E45 = 0x50CC
-0x2E46 = 0x50F2
-0x2E47 = 0x50D0
-0x2E48 = 0x50E6
-0x2E49 = 0xFA31
-0x2E4A = 0x5106
-0x2E4B = 0x5103
-0x2E4C = 0x510B
-0x2E4D = 0x511E
-0x2E4E = 0x5135
-0x2E4F = 0x514A
-0x2E50 = 0xFA32
-0x2E51 = 0x5155
-0x2E52 = 0x5157
-0x2E53 = 0x34B5
-0x2E54 = 0x519D
-0x2E55 = 0x51C3
-0x2E56 = 0x51CA
-0x2E57 = 0x51DE
-0x2E58 = 0x51E2
-0x2E59 = 0x51EE
-0x2E5A = 0x5201
-0x2E5B = 0x34DB
-0x2E5C = 0x5213
-0x2E5D = 0x5215
-0x2E5E = 0x5249
-0x2E5F = 0x5257
-0x2E60 = 0x5261
-0x2E61 = 0x5293
-0x2E62 = 0x52C8
-0x2E63 = 0xFA33
-0x2E64 = 0x52CC
-0x2E65 = 0x52D0
-0x2E66 = 0x52D6
-0x2E67 = 0x52DB
-0x2E68 = 0xFA34
-0x2E69 = 0x52F0
-0x2E6A = 0x52FB
-0x2E6B = 0x5300
-0x2E6C = 0x5307
-0x2E6D = 0x531C
-0x2E6E = 0xFA35
-0x2E6F = 0x5361
-0x2E70 = 0x5363
-0x2E71 = 0x537D
-0x2E72 = 0x5393
-0x2E73 = 0x539D
-0x2E74 = 0x53B2
-0x2E75 = 0x5412
-0x2E76 = 0x5427
-0x2E77 = 0x544D
-0x2E78 = 0x549C
-0x2E79 = 0x546B
-0x2E7A = 0x5474
-0x2E7B = 0x547F
-0x2E7C = 0x5488
-0x2E7D = 0x5496
-0x2E7E = 0x54A1
-0x2F21 = 0x54A9
-0x2F22 = 0x54C6
-0x2F23 = 0x54FF
-0x2F24 = 0x550E
-0x2F25 = 0x552B
-0x2F26 = 0x5535
-0x2F27 = 0x5550
-0x2F28 = 0x555E
-0x2F29 = 0x5581
-0x2F2A = 0x5586
-0x2F2B = 0x558E
-0x2F2C = 0xFA36
-0x2F2D = 0x55AD
-0x2F2E = 0x55CE
-0x2F2F = 0xFA37
-0x2F30 = 0x5608
-0x2F31 = 0x560E
-0x2F32 = 0x563B
-0x2F33 = 0x5649
-0x2F34 = 0x5676
-0x2F35 = 0x5666
-0x2F36 = 0xFA38
-0x2F37 = 0x566F
-0x2F38 = 0x5671
-0x2F39 = 0x5672
-0x2F3A = 0x5699
-0x2F3B = 0x569E
-0x2F3C = 0x56A9
-0x2F3D = 0x56AC
-0x2F3E = 0x56B3
-0x2F3F = 0x56C9
-0x2F40 = 0x56CA
-0x2F41 = 0x570A
-0x2F43 = 0x5721
-0x2F44 = 0x572F
-0x2F45 = 0x5733
-0x2F46 = 0x5734
-0x2F47 = 0x5770
-0x2F48 = 0x5777
-0x2F49 = 0x577C
-0x2F4A = 0x579C
-0x2F4B = 0xFA0F
-0x2F4D = 0x57B8
-0x2F4E = 0x57C7
-0x2F4F = 0x57C8
-0x2F50 = 0x57CF
-0x2F51 = 0x57E4
-0x2F52 = 0x57ED
-0x2F53 = 0x57F5
-0x2F54 = 0x57F6
-0x2F55 = 0x57FF
-0x2F56 = 0x5809
-0x2F57 = 0xFA10
-0x2F58 = 0x5861
-0x2F59 = 0x5864
-0x2F5A = 0xFA39
-0x2F5B = 0x587C
-0x2F5C = 0x5889
-0x2F5D = 0x589E
-0x2F5E = 0xFA3A
-0x2F5F = 0x58A9
-0x2F61 = 0x58D2
-0x2F62 = 0x58CE
-0x2F63 = 0x58D4
-0x2F64 = 0x58DA
-0x2F65 = 0x58E0
-0x2F66 = 0x58E9
-0x2F67 = 0x590C
-0x2F68 = 0x8641
-0x2F69 = 0x595D
-0x2F6A = 0x596D
-0x2F6B = 0x598B
-0x2F6C = 0x5992
-0x2F6D = 0x59A4
-0x2F6E = 0x59C3
-0x2F6F = 0x59D2
-0x2F70 = 0x59DD
-0x2F71 = 0x5A13
-0x2F72 = 0x5A23
-0x2F73 = 0x5A67
-0x2F74 = 0x5A6D
-0x2F75 = 0x5A77
-0x2F76 = 0x5A7E
-0x2F77 = 0x5A84
-0x2F78 = 0x5A9E
-0x2F79 = 0x5AA7
-0x2F7A = 0x5AC4
-0x2F7C = 0x5B19
-0x2F7D = 0x5B25
-0x2F7E = 0x525D
-0x4F55 = 0x5B41
-0x4F56 = 0x5B56
-0x4F57 = 0x5B7D
-0x4F58 = 0x5B93
-0x4F59 = 0x5BD8
-0x4F5A = 0x5BEC
-0x4F5B = 0x5C12
-0x4F5C = 0x5C1E
-0x4F5D = 0x5C23
-0x4F5E = 0x5C2B
-0x4F5F = 0x378D
-0x4F60 = 0x5C62
-0x4F61 = 0xFA3B
-0x4F62 = 0xFA3C
-0x4F64 = 0x5C7A
-0x4F65 = 0x5C8F
-0x4F66 = 0x5C9F
-0x4F67 = 0x5CA3
-0x4F68 = 0x5CAA
-0x4F69 = 0x5CBA
-0x4F6A = 0x5CCB
-0x4F6B = 0x5CD0
-0x4F6C = 0x5CD2
-0x4F6D = 0x5CF4
-0x4F6F = 0x37E2
-0x4F70 = 0x5D0D
-0x4F71 = 0x5D27
-0x4F72 = 0xFA11
-0x4F73 = 0x5D46
-0x4F74 = 0x5D47
-0x4F75 = 0x5D53
-0x4F76 = 0x5D4A
-0x4F77 = 0x5D6D
-0x4F78 = 0x5D81
-0x4F79 = 0x5DA0
-0x4F7A = 0x5DA4
-0x4F7B = 0x5DA7
-0x4F7C = 0x5DB8
-0x4F7D = 0x5DCB
-0x4F7E = 0x541E
-0x7427 = 0x5653
-0x7428 = 0x5DE2
-0x7429 = 0x5E14
-0x742A = 0x5E18
-0x742B = 0x5E58
-0x742C = 0x5E5E
-0x742D = 0x5EBE
-0x742E = 0xF928
-0x742F = 0x5ECB
-0x7430 = 0x5EF9
-0x7431 = 0x5F00
-0x7432 = 0x5F02
-0x7433 = 0x5F07
-0x7434 = 0x5F1D
-0x7435 = 0x5F23
-0x7436 = 0x5F34
-0x7437 = 0x5F36
-0x7438 = 0x5F3D
-0x7439 = 0x5F40
-0x743A = 0x5F45
-0x743B = 0x5F54
-0x743C = 0x5F58
-0x743D = 0x5F64
-0x743E = 0x5F67
-0x743F = 0x5F7D
-0x7440 = 0x5F89
-0x7441 = 0x5F9C
-0x7442 = 0x5FA7
-0x7443 = 0x5FAF
-0x7444 = 0x5FB5
-0x7445 = 0x5FB7
-0x7446 = 0x5FC9
-0x7447 = 0x5FDE
-0x7448 = 0x5FE1
-0x7449 = 0x5FE9
-0x744A = 0x600D
-0x744B = 0x6014
-0x744C = 0x6018
-0x744D = 0x6033
-0x744E = 0x6035
-0x744F = 0x6047
-0x7450 = 0xFA3D
-0x7451 = 0x609D
-0x7452 = 0x609E
-0x7453 = 0x60CB
-0x7454 = 0x60D4
-0x7455 = 0x60D5
-0x7456 = 0x60DD
-0x7457 = 0x60F8
-0x7458 = 0x611C
-0x7459 = 0x612B
-0x745A = 0x6130
-0x745B = 0x6137
-0x745C = 0xFA3E
-0x745D = 0x618D
-0x745E = 0xFA3F
-0x745F = 0x61BC
-0x7460 = 0x61B9
-0x7461 = 0xFA40
-0x7462 = 0x6222
-0x7463 = 0x623E
-0x7464 = 0x6243
-0x7465 = 0x6256
-0x7466 = 0x625A
-0x7467 = 0x626F
-0x7468 = 0x6285
-0x7469 = 0x62C4
-0x746A = 0x62D6
-0x746B = 0x62FC
-0x746C = 0x630A
-0x746D = 0x6318
-0x746E = 0x6339
-0x746F = 0x6343
-0x7470 = 0x6365
-0x7471 = 0x637C
-0x7472 = 0x63E5
-0x7473 = 0x63ED
-0x7474 = 0x63F5
-0x7475 = 0x6410
-0x7476 = 0x6414
-0x7477 = 0x6422
-0x7478 = 0x6479
-0x7479 = 0x6451
-0x747A = 0x6460
-0x747B = 0x646D
-0x747C = 0x64CE
-0x747D = 0x64BE
-0x747E = 0x64BF
-0x7521 = 0x64C4
-0x7522 = 0x64CA
-0x7523 = 0x64D0
-0x7524 = 0x64F7
-0x7525 = 0x64FB
-0x7526 = 0x6522
-0x7527 = 0x6529
-0x7528 = 0xFA41
-0x7529 = 0x6567
-0x752A = 0x659D
-0x752B = 0xFA42
-0x752C = 0x6600
-0x752D = 0x6609
-0x752E = 0x6615
-0x752F = 0x661E
-0x7530 = 0x663A
-0x7531 = 0x6622
-0x7532 = 0x6624
-0x7533 = 0x662B
-0x7534 = 0x6630
-0x7535 = 0x6631
-0x7536 = 0x6633
-0x7537 = 0x66FB
-0x7538 = 0x6648
-0x7539 = 0x664C
-0x753B = 0x6659
-0x753C = 0x665A
-0x753D = 0x6661
-0x753E = 0x6665
-0x753F = 0x6673
-0x7540 = 0x6677
-0x7541 = 0x6678
-0x7542 = 0x668D
-0x7543 = 0xFA43
-0x7544 = 0x66A0
-0x7545 = 0x66B2
-0x7546 = 0x66BB
-0x7547 = 0x66C6
-0x7548 = 0x66C8
-0x7549 = 0x3B22
-0x754A = 0x66DB
-0x754B = 0x66E8
-0x754C = 0x66FA
-0x754D = 0x6713
-0x754E = 0xF929
-0x754F = 0x6733
-0x7550 = 0x6766
-0x7551 = 0x6747
-0x7552 = 0x6748
-0x7553 = 0x677B
-0x7554 = 0x6781
-0x7555 = 0x6793
-0x7556 = 0x6798
-0x7557 = 0x679B
-0x7558 = 0x67BB
-0x7559 = 0x67F9
-0x755A = 0x67C0
-0x755B = 0x67D7
-0x755C = 0x67FC
-0x755D = 0x6801
-0x755E = 0x6852
-0x755F = 0x681D
-0x7560 = 0x682C
-0x7561 = 0x6831
-0x7562 = 0x685B
-0x7563 = 0x6872
-0x7564 = 0x6875
-0x7565 = 0xFA44
-0x7566 = 0x68A3
-0x7567 = 0x68A5
-0x7568 = 0x68B2
-0x7569 = 0x68C8
-0x756A = 0x68D0
-0x756B = 0x68E8
-0x756C = 0x68ED
-0x756D = 0x68F0
-0x756E = 0x68F1
-0x756F = 0x68FC
-0x7570 = 0x690A
-0x7571 = 0x6949
-0x7573 = 0x6935
-0x7574 = 0x6942
-0x7575 = 0x6957
-0x7576 = 0x6963
-0x7577 = 0x6964
-0x7578 = 0x6968
-0x7579 = 0x6980
-0x757A = 0xFA14
-0x757B = 0x69A5
-0x757C = 0x69AD
-0x757D = 0x69CF
-0x757E = 0x3BB6
-0x7621 = 0x3BC3
-0x7622 = 0x69E2
-0x7623 = 0x69E9
-0x7624 = 0x69EA
-0x7625 = 0x69F5
-0x7626 = 0x69F6
-0x7627 = 0x6A0F
-0x7628 = 0x6A15
-0x762A = 0x6A3B
-0x762B = 0x6A3E
-0x762C = 0x6A45
-0x762D = 0x6A50
-0x762E = 0x6A56
-0x762F = 0x6A5B
-0x7630 = 0x6A6B
-0x7631 = 0x6A73
-0x7633 = 0x6A89
-0x7634 = 0x6A94
-0x7635 = 0x6A9D
-0x7636 = 0x6A9E
-0x7637 = 0x6AA5
-0x7638 = 0x6AE4
-0x7639 = 0x6AE7
-0x763A = 0x3C0F
-0x763B = 0xF91D
-0x763C = 0x6B1B
-0x763D = 0x6B1E
-0x763E = 0x6B2C
-0x763F = 0x6B35
-0x7640 = 0x6B46
-0x7641 = 0x6B56
-0x7642 = 0x6B60
-0x7643 = 0x6B65
-0x7644 = 0x6B67
-0x7645 = 0x6B77
-0x7646 = 0x6B82
-0x7647 = 0x6BA9
-0x7648 = 0x6BAD
-0x7649 = 0xF970
-0x764A = 0x6BCF
-0x764B = 0x6BD6
-0x764C = 0x6BD7
-0x764D = 0x6BFF
-0x764E = 0x6C05
-0x764F = 0x6C10
-0x7650 = 0x6C33
-0x7651 = 0x6C59
-0x7652 = 0x6C5C
-0x7653 = 0x6CAA
-0x7654 = 0x6C74
-0x7655 = 0x6C76
-0x7656 = 0x6C85
-0x7657 = 0x6C86
-0x7658 = 0x6C98
-0x7659 = 0x6C9C
-0x765A = 0x6CFB
-0x765B = 0x6CC6
-0x765C = 0x6CD4
-0x765D = 0x6CE0
-0x765E = 0x6CEB
-0x765F = 0x6CEE
-0x7661 = 0x6D04
-0x7662 = 0x6D0E
-0x7663 = 0x6D2E
-0x7664 = 0x6D31
-0x7665 = 0x6D39
-0x7666 = 0x6D3F
-0x7667 = 0x6D58
-0x7668 = 0x6D65
-0x7669 = 0xFA45
-0x766A = 0x6D82
-0x766B = 0x6D87
-0x766C = 0x6D89
-0x766D = 0x6D94
-0x766E = 0x6DAA
-0x766F = 0x6DAC
-0x7670 = 0x6DBF
-0x7671 = 0x6DC4
-0x7672 = 0x6DD6
-0x7673 = 0x6DDA
-0x7674 = 0x6DDB
-0x7675 = 0x6DDD
-0x7676 = 0x6DFC
-0x7677 = 0xFA46
-0x7678 = 0x6E34
-0x7679 = 0x6E44
-0x767A = 0x6E5C
-0x767B = 0x6E5E
-0x767C = 0x6EAB
-0x767D = 0x6EB1
-0x767E = 0x6EC1
-0x7721 = 0x6EC7
-0x7722 = 0x6ECE
-0x7723 = 0x6F10
-0x7724 = 0x6F1A
-0x7725 = 0xFA47
-0x7726 = 0x6F2A
-0x7727 = 0x6F2F
-0x7728 = 0x6F33
-0x7729 = 0x6F51
-0x772A = 0x6F59
-0x772B = 0x6F5E
-0x772C = 0x6F61
-0x772D = 0x6F62
-0x772E = 0x6F7E
-0x772F = 0x6F88
-0x7730 = 0x6F8C
-0x7731 = 0x6F8D
-0x7732 = 0x6F94
-0x7733 = 0x6FA0
-0x7734 = 0x6FA7
-0x7735 = 0x6FB6
-0x7736 = 0x6FBC
-0x7737 = 0x6FC7
-0x7738 = 0x6FCA
-0x7739 = 0x6FF9
-0x773A = 0x6FF0
-0x773B = 0x6FF5
-0x773C = 0x7005
-0x773D = 0x7006
-0x773E = 0x7028
-0x773F = 0x704A
-0x7740 = 0x705D
-0x7741 = 0x705E
-0x7742 = 0x704E
-0x7743 = 0x7064
-0x7744 = 0x7075
-0x7745 = 0x7085
-0x7746 = 0x70A4
-0x7747 = 0x70AB
-0x7748 = 0x70B7
-0x7749 = 0x70D4
-0x774A = 0x70D8
-0x774B = 0x70E4
-0x774C = 0x710F
-0x774D = 0x712B
-0x774E = 0x711E
-0x774F = 0x7120
-0x7750 = 0x712E
-0x7751 = 0x7130
-0x7752 = 0x7146
-0x7753 = 0x7147
-0x7754 = 0x7151
-0x7755 = 0xFA48
-0x7756 = 0x7152
-0x7757 = 0x715C
-0x7758 = 0x7160
-0x7759 = 0x7168
-0x775A = 0xFA15
-0x775B = 0x7185
-0x775C = 0x7187
-0x775D = 0x7192
-0x775E = 0x71C1
-0x775F = 0x71BA
-0x7760 = 0x71C4
-0x7761 = 0x71FE
-0x7762 = 0x7200
-0x7763 = 0x7215
-0x7764 = 0x7255
-0x7765 = 0x7256
-0x7766 = 0x3E3F
-0x7767 = 0x728D
-0x7768 = 0x729B
-0x7769 = 0x72BE
-0x776A = 0x72C0
-0x776B = 0x72FB
-0x776D = 0x7327
-0x776E = 0x7328
-0x776F = 0xFA16
-0x7770 = 0x7350
-0x7771 = 0x7366
-0x7772 = 0x737C
-0x7773 = 0x7395
-0x7774 = 0x739F
-0x7775 = 0x73A0
-0x7776 = 0x73A2
-0x7777 = 0x73A6
-0x7778 = 0x73AB
-0x7779 = 0x73C9
-0x777A = 0x73CF
-0x777B = 0x73D6
-0x777C = 0x73D9
-0x777D = 0x73E3
-0x777E = 0x73E9
-0x7821 = 0x7407
-0x7822 = 0x740A
-0x7823 = 0x741A
-0x7824 = 0x741B
-0x7825 = 0xFA4A
-0x7826 = 0x7426
-0x7827 = 0x7428
-0x7828 = 0x742A
-0x7829 = 0x742B
-0x782A = 0x742C
-0x782B = 0x742E
-0x782C = 0x742F
-0x782D = 0x7430
-0x782E = 0x7444
-0x782F = 0x7446
-0x7830 = 0x7447
-0x7831 = 0x744B
-0x7832 = 0x7457
-0x7833 = 0x7462
-0x7834 = 0x746B
-0x7835 = 0x746D
-0x7836 = 0x7486
-0x7837 = 0x7487
-0x7838 = 0x7489
-0x7839 = 0x7498
-0x783A = 0x749C
-0x783B = 0x749F
-0x783C = 0x74A3
-0x783D = 0x7490
-0x783E = 0x74A6
-0x783F = 0x74A8
-0x7840 = 0x74A9
-0x7841 = 0x74B5
-0x7842 = 0x74BF
-0x7843 = 0x74C8
-0x7844 = 0x74C9
-0x7845 = 0x74DA
-0x7846 = 0x74FF
-0x7847 = 0x7501
-0x7848 = 0x7517
-0x7849 = 0x752F
-0x784A = 0x756F
-0x784B = 0x7579
-0x784C = 0x7592
-0x784D = 0x3F72
-0x784E = 0x75CE
-0x784F = 0x75E4
-0x7850 = 0x7600
-0x7851 = 0x7602
-0x7852 = 0x7608
-0x7853 = 0x7615
-0x7854 = 0x7616
-0x7855 = 0x7619
-0x7856 = 0x761E
-0x7857 = 0x762D
-0x7858 = 0x7635
-0x7859 = 0x7643
-0x785A = 0x764B
-0x785B = 0x7664
-0x785C = 0x7665
-0x785D = 0x766D
-0x785E = 0x766F
-0x785F = 0x7671
-0x7860 = 0x7681
-0x7861 = 0x769B
-0x7862 = 0x769D
-0x7863 = 0x769E
-0x7864 = 0x76A6
-0x7865 = 0x76AA
-0x7866 = 0x76B6
-0x7867 = 0x76C5
-0x7868 = 0x76CC
-0x7869 = 0x76CE
-0x786A = 0x76D4
-0x786B = 0x76E6
-0x786C = 0x76F1
-0x786D = 0x76FC
-0x786E = 0x770A
-0x786F = 0x7719
-0x7870 = 0x7734
-0x7871 = 0x7736
-0x7872 = 0x7746
-0x7873 = 0x774D
-0x7874 = 0x774E
-0x7875 = 0x775C
-0x7876 = 0x775F
-0x7877 = 0x7762
-0x7878 = 0x777A
-0x7879 = 0x7780
-0x787A = 0x7794
-0x787B = 0x77AA
-0x787C = 0x77E0
-0x787D = 0x782D
-0x7921 = 0x7843
-0x7922 = 0x784E
-0x7923 = 0x784F
-0x7924 = 0x7851
-0x7925 = 0x7868
-0x7926 = 0x786E
-0x7927 = 0xFA4B
-0x7928 = 0x78B0
-0x792A = 0x78AD
-0x792B = 0x78E4
-0x792C = 0x78F2
-0x792D = 0x7900
-0x792E = 0x78F7
-0x792F = 0x791C
-0x7930 = 0x792E
-0x7931 = 0x7931
-0x7932 = 0x7934
-0x7933 = 0xFA4C
-0x7934 = 0xFA4D
-0x7935 = 0x7945
-0x7936 = 0x7946
-0x7937 = 0xFA4E
-0x7938 = 0xFA4F
-0x7939 = 0xFA50
-0x793A = 0x795C
-0x793B = 0xFA51
-0x793C = 0xFA19
-0x793D = 0xFA1A
-0x793E = 0x7979
-0x793F = 0xFA52
-0x7940 = 0xFA53
-0x7941 = 0xFA1B
-0x7942 = 0x7998
-0x7943 = 0x79B1
-0x7944 = 0x79B8
-0x7945 = 0x79C8
-0x7946 = 0x79CA
-0x7948 = 0x79D4
-0x7949 = 0x79DE
-0x794A = 0x79EB
-0x794B = 0x79ED
-0x794C = 0x7A03
-0x794D = 0xFA54
-0x794E = 0x7A39
-0x794F = 0x7A5D
-0x7950 = 0x7A6D
-0x7951 = 0xFA55
-0x7952 = 0x7A85
-0x7953 = 0x7AA0
-0x7955 = 0x7AB3
-0x7956 = 0x7ABB
-0x7957 = 0x7ACE
-0x7958 = 0x7AEB
-0x7959 = 0x7AFD
-0x795A = 0x7B12
-0x795B = 0x7B2D
-0x795C = 0x7B3B
-0x795D = 0x7B47
-0x795E = 0x7B4E
-0x795F = 0x7B60
-0x7960 = 0x7B6D
-0x7961 = 0x7B6F
-0x7962 = 0x7B72
-0x7963 = 0x7B9E
-0x7964 = 0xFA56
-0x7965 = 0x7BD7
-0x7966 = 0x7BD9
-0x7967 = 0x7C01
-0x7968 = 0x7C31
-0x7969 = 0x7C1E
-0x796A = 0x7C20
-0x796B = 0x7C33
-0x796C = 0x7C36
-0x796D = 0x4264
-0x796F = 0x7C59
-0x7970 = 0x7C6D
-0x7971 = 0x7C79
-0x7972 = 0x7C8F
-0x7973 = 0x7C94
-0x7974 = 0x7CA0
-0x7975 = 0x7CBC
-0x7976 = 0x7CD5
-0x7977 = 0x7CD9
-0x7978 = 0x7CDD
-0x7979 = 0x7D07
-0x797A = 0x7D08
-0x797B = 0x7D13
-0x797C = 0x7D1D
-0x797D = 0x7D23
-0x797E = 0x7D31
-0x7A21 = 0x7D41
-0x7A22 = 0x7D48
-0x7A23 = 0x7D53
-0x7A24 = 0x7D5C
-0x7A25 = 0x7D7A
-0x7A26 = 0x7D83
-0x7A27 = 0x7D8B
-0x7A28 = 0x7DA0
-0x7A29 = 0x7DA6
-0x7A2A = 0x7DC2
-0x7A2B = 0x7DCC
-0x7A2C = 0x7DD6
-0x7A2D = 0x7DE3
-0x7A2E = 0xFA57
-0x7A2F = 0x7E28
-0x7A30 = 0x7E08
-0x7A31 = 0x7E11
-0x7A32 = 0x7E15
-0x7A33 = 0xFA59
-0x7A34 = 0x7E47
-0x7A35 = 0x7E52
-0x7A36 = 0x7E61
-0x7A37 = 0x7E8A
-0x7A38 = 0x7E8D
-0x7A39 = 0x7F47
-0x7A3A = 0xFA5A
-0x7A3B = 0x7F91
-0x7A3C = 0x7F97
-0x7A3D = 0x7FBF
-0x7A3E = 0x7FCE
-0x7A3F = 0x7FDB
-0x7A40 = 0x7FDF
-0x7A41 = 0x7FEC
-0x7A42 = 0x7FEE
-0x7A43 = 0x7FFA
-0x7A44 = 0xFA5B
-0x7A45 = 0x8014
-0x7A46 = 0x8026
-0x7A47 = 0x8035
-0x7A48 = 0x8037
-0x7A49 = 0x803C
-0x7A4A = 0x80CA
-0x7A4B = 0x80D7
-0x7A4C = 0x80E0
-0x7A4D = 0x80F3
-0x7A4E = 0x8118
-0x7A4F = 0x814A
-0x7A50 = 0x8160
-0x7A51 = 0x8167
-0x7A52 = 0x8168
-0x7A53 = 0x816D
-0x7A54 = 0x81BB
-0x7A55 = 0x81CA
-0x7A56 = 0x81CF
-0x7A57 = 0x81D7
-0x7A58 = 0xFA5C
-0x7A59 = 0x4453
-0x7A5A = 0x445B
-0x7A5B = 0x8260
-0x7A5C = 0x8274
-0x7A5E = 0x828E
-0x7A5F = 0x82A1
-0x7A60 = 0x82A3
-0x7A61 = 0x82A4
-0x7A62 = 0x82A9
-0x7A63 = 0x82AE
-0x7A64 = 0x82B7
-0x7A65 = 0x82BE
-0x7A66 = 0x82BF
-0x7A67 = 0x82C6
-0x7A68 = 0x82D5
-0x7A69 = 0x82FD
-0x7A6A = 0x82FE
-0x7A6B = 0x8300
-0x7A6C = 0x8301
-0x7A6D = 0x8362
-0x7A6E = 0x8322
-0x7A6F = 0x832D
-0x7A70 = 0x833A
-0x7A71 = 0x8343
-0x7A72 = 0x8347
-0x7A73 = 0x8351
-0x7A74 = 0x8355
-0x7A75 = 0x837D
-0x7A76 = 0x8386
-0x7A77 = 0x8392
-0x7A78 = 0x8398
-0x7A79 = 0x83A7
-0x7A7A = 0x83A9
-0x7A7B = 0x83BF
-0x7A7C = 0x83C0
-0x7A7D = 0x83C7
-0x7A7E = 0x83CF
-0x7B21 = 0x83D1
-0x7B22 = 0x83E1
-0x7B23 = 0x83EA
-0x7B24 = 0x8401
-0x7B25 = 0x8406
-0x7B26 = 0x840A
-0x7B27 = 0xFA5F
-0x7B28 = 0x8448
-0x7B29 = 0x845F
-0x7B2A = 0x8470
-0x7B2B = 0x8473
-0x7B2C = 0x8485
-0x7B2D = 0x849E
-0x7B2E = 0x84AF
-0x7B2F = 0x84B4
-0x7B30 = 0x84BA
-0x7B31 = 0x84C0
-0x7B32 = 0x84C2
-0x7B34 = 0x8532
-0x7B35 = 0x851E
-0x7B36 = 0x8523
-0x7B37 = 0x852F
-0x7B38 = 0x8559
-0x7B39 = 0x8564
-0x7B3A = 0xFA1F
-0x7B3B = 0x85AD
-0x7B3C = 0x857A
-0x7B3D = 0x858C
-0x7B3E = 0x858F
-0x7B3F = 0x85A2
-0x7B40 = 0x85B0
-0x7B41 = 0x85CB
-0x7B42 = 0x85CE
-0x7B43 = 0x85ED
-0x7B44 = 0x8612
-0x7B45 = 0x85FF
-0x7B46 = 0x8604
-0x7B47 = 0x8605
-0x7B48 = 0x8610
-0x7B4A = 0x8618
-0x7B4B = 0x8629
-0x7B4C = 0x8638
-0x7B4D = 0x8657
-0x7B4E = 0x865B
-0x7B4F = 0xF936
-0x7B50 = 0x8662
-0x7B51 = 0x459D
-0x7B52 = 0x866C
-0x7B53 = 0x8675
-0x7B54 = 0x8698
-0x7B55 = 0x86B8
-0x7B56 = 0x86FA
-0x7B57 = 0x86FC
-0x7B58 = 0x86FD
-0x7B59 = 0x870B
-0x7B5A = 0x8771
-0x7B5B = 0x8787
-0x7B5C = 0x8788
-0x7B5D = 0x87AC
-0x7B5E = 0x87AD
-0x7B5F = 0x87B5
-0x7B60 = 0x45EA
-0x7B61 = 0x87D6
-0x7B62 = 0x87EC
-0x7B63 = 0x8806
-0x7B64 = 0x880A
-0x7B65 = 0x8810
-0x7B66 = 0x8814
-0x7B67 = 0x881F
-0x7B68 = 0x8898
-0x7B69 = 0x88AA
-0x7B6A = 0x88CA
-0x7B6B = 0x88CE
-0x7B6D = 0x88F5
-0x7B6E = 0x891C
-0x7B6F = 0xFA60
-0x7B70 = 0x8918
-0x7B71 = 0x8919
-0x7B72 = 0x891A
-0x7B73 = 0x8927
-0x7B74 = 0x8930
-0x7B75 = 0x8932
-0x7B76 = 0x8939
-0x7B77 = 0x8940
-0x7B78 = 0x8994
-0x7B79 = 0xFA61
-0x7B7A = 0x89D4
-0x7B7B = 0x89E5
-0x7B7C = 0x89F6
-0x7B7D = 0x8A12
-0x7B7E = 0x8A15
-0x7C21 = 0x8A22
-0x7C22 = 0x8A37
-0x7C23 = 0x8A47
-0x7C24 = 0x8A4E
-0x7C25 = 0x8A5D
-0x7C26 = 0x8A61
-0x7C27 = 0x8A75
-0x7C28 = 0x8A79
-0x7C29 = 0x8AA7
-0x7C2A = 0x8AD0
-0x7C2B = 0x8ADF
-0x7C2C = 0x8AF4
-0x7C2D = 0x8AF6
-0x7C2E = 0xFA22
-0x7C2F = 0xFA62
-0x7C30 = 0xFA63
-0x7C31 = 0x8B46
-0x7C32 = 0x8B54
-0x7C33 = 0x8B59
-0x7C34 = 0x8B69
-0x7C35 = 0x8B9D
-0x7C36 = 0x8C49
-0x7C37 = 0x8C68
-0x7C38 = 0xFA64
-0x7C39 = 0x8CE1
-0x7C3A = 0x8CF4
-0x7C3B = 0x8CF8
-0x7C3C = 0x8CFE
-0x7C3D = 0xFA65
-0x7C3E = 0x8D12
-0x7C3F = 0x8D1B
-0x7C40 = 0x8DAF
-0x7C41 = 0x8DCE
-0x7C42 = 0x8DD1
-0x7C43 = 0x8DD7
-0x7C44 = 0x8E20
-0x7C45 = 0x8E23
-0x7C46 = 0x8E3D
-0x7C47 = 0x8E70
-0x7C48 = 0x8E7B
-0x7C4A = 0x8EC0
-0x7C4B = 0x4844
-0x7C4C = 0x8EFA
-0x7C4D = 0x8F1E
-0x7C4E = 0x8F2D
-0x7C4F = 0x8F36
-0x7C50 = 0x8F54
-0x7C52 = 0x8FA6
-0x7C53 = 0x8FB5
-0x7C54 = 0x8FE4
-0x7C55 = 0x8FE8
-0x7C56 = 0x8FEE
-0x7C57 = 0x9008
-0x7C58 = 0x902D
-0x7C59 = 0xFA67
-0x7C5A = 0x9088
-0x7C5B = 0x9095
-0x7C5C = 0x9097
-0x7C5D = 0x9099
-0x7C5E = 0x909B
-0x7C5F = 0x90A2
-0x7C60 = 0x90B3
-0x7C61 = 0x90BE
-0x7C62 = 0x90C4
-0x7C63 = 0x90C5
-0x7C64 = 0x90C7
-0x7C65 = 0x90D7
-0x7C66 = 0x90DD
-0x7C67 = 0x90DE
-0x7C68 = 0x90EF
-0x7C69 = 0x90F4
-0x7C6A = 0xFA26
-0x7C6B = 0x9114
-0x7C6C = 0x9115
-0x7C6D = 0x9116
-0x7C6E = 0x9122
-0x7C6F = 0x9123
-0x7C70 = 0x9127
-0x7C71 = 0x912F
-0x7C72 = 0x9131
-0x7C73 = 0x9134
-0x7C74 = 0x913D
-0x7C75 = 0x9148
-0x7C76 = 0x915B
-0x7C77 = 0x9183
-0x7C78 = 0x919E
-0x7C79 = 0x91AC
-0x7C7A = 0x91B1
-0x7C7B = 0x91BC
-0x7C7C = 0x91D7
-0x7C7D = 0x91FB
-0x7C7E = 0x91E4
-0x7D21 = 0x91E5
-0x7D22 = 0x91ED
-0x7D23 = 0x91F1
-0x7D24 = 0x9207
-0x7D25 = 0x9210
-0x7D26 = 0x9238
-0x7D27 = 0x9239
-0x7D28 = 0x923A
-0x7D29 = 0x923C
-0x7D2A = 0x9240
-0x7D2B = 0x9243
-0x7D2C = 0x924F
-0x7D2D = 0x9278
-0x7D2E = 0x9288
-0x7D2F = 0x92C2
-0x7D30 = 0x92CB
-0x7D31 = 0x92CC
-0x7D32 = 0x92D3
-0x7D33 = 0x92E0
-0x7D34 = 0x92FF
-0x7D35 = 0x9304
-0x7D36 = 0x931F
-0x7D37 = 0x9321
-0x7D38 = 0x9325
-0x7D39 = 0x9348
-0x7D3A = 0x9349
-0x7D3B = 0x934A
-0x7D3C = 0x9364
-0x7D3D = 0x9365
-0x7D3E = 0x936A
-0x7D3F = 0x9370
-0x7D40 = 0x939B
-0x7D41 = 0x93A3
-0x7D42 = 0x93BA
-0x7D43 = 0x93C6
-0x7D44 = 0x93DE
-0x7D45 = 0x93DF
-0x7D46 = 0x9404
-0x7D47 = 0x93FD
-0x7D48 = 0x9433
-0x7D49 = 0x944A
-0x7D4A = 0x9463
-0x7D4B = 0x946B
-0x7D4C = 0x9471
-0x7D4D = 0x9472
-0x7D4E = 0x958E
-0x7D4F = 0x959F
-0x7D50 = 0x95A6
-0x7D51 = 0x95A9
-0x7D52 = 0x95AC
-0x7D53 = 0x95B6
-0x7D54 = 0x95BD
-0x7D55 = 0x95CB
-0x7D56 = 0x95D0
-0x7D57 = 0x95D3
-0x7D58 = 0x49B0
-0x7D59 = 0x95DA
-0x7D5A = 0x95DE
-0x7D5B = 0x9658
-0x7D5C = 0x9684
-0x7D5D = 0xF9DC
-0x7D5E = 0x969D
-0x7D5F = 0x96A4
-0x7D60 = 0x96A5
-0x7D61 = 0x96D2
-0x7D62 = 0x96DE
-0x7D63 = 0xFA68
-0x7D64 = 0x96E9
-0x7D65 = 0x96EF
-0x7D66 = 0x9733
-0x7D67 = 0x973B
-0x7D68 = 0x974D
-0x7D69 = 0x974E
-0x7D6A = 0x974F
-0x7D6B = 0x975A
-0x7D6C = 0x976E
-0x7D6D = 0x9773
-0x7D6E = 0x9795
-0x7D6F = 0x97AE
-0x7D70 = 0x97BA
-0x7D71 = 0x97C1
-0x7D72 = 0x97C9
-0x7D73 = 0x97DE
-0x7D74 = 0x97DB
-0x7D75 = 0x97F4
-0x7D76 = 0xFA69
-0x7D77 = 0x980A
-0x7D78 = 0x981E
-0x7D79 = 0x982B
-0x7D7A = 0x9830
-0x7D7B = 0xFA6A
-0x7D7C = 0x9852
-0x7D7D = 0x9853
-0x7D7E = 0x9856
-0x7E21 = 0x9857
-0x7E22 = 0x9859
-0x7E23 = 0x985A
-0x7E24 = 0xF9D0
-0x7E25 = 0x9865
-0x7E26 = 0x986C
-0x7E27 = 0x98BA
-0x7E28 = 0x98C8
-0x7E29 = 0x98E7
-0x7E2A = 0x9958
-0x7E2B = 0x999E
-0x7E2C = 0x9A02
-0x7E2D = 0x9A03
-0x7E2E = 0x9A24
-0x7E2F = 0x9A2D
-0x7E30 = 0x9A2E
-0x7E31 = 0x9A38
-0x7E32 = 0x9A4A
-0x7E33 = 0x9A4E
-0x7E34 = 0x9A52
-0x7E35 = 0x9AB6
-0x7E36 = 0x9AC1
-0x7E37 = 0x9AC3
-0x7E38 = 0x9ACE
-0x7E39 = 0x9AD6
-0x7E3A = 0x9AF9
-0x7E3B = 0x9B02
-0x7E3C = 0x9B08
-0x7E3D = 0x9B20
-0x7E3E = 0x4C17
-0x7E3F = 0x9B2D
-0x7E40 = 0x9B5E
-0x7E41 = 0x9B79
-0x7E42 = 0x9B66
-0x7E43 = 0x9B72
-0x7E44 = 0x9B75
-0x7E45 = 0x9B84
-0x7E46 = 0x9B8A
-0x7E47 = 0x9B8F
-0x7E48 = 0x9B9E
-0x7E49 = 0x9BA7
-0x7E4A = 0x9BC1
-0x7E4B = 0x9BCE
-0x7E4C = 0x9BE5
-0x7E4D = 0x9BF8
-0x7E4E = 0x9BFD
-0x7E4F = 0x9C00
-0x7E50 = 0x9C23
-0x7E51 = 0x9C41
-0x7E52 = 0x9C4F
-0x7E53 = 0x9C50
-0x7E54 = 0x9C53
-0x7E55 = 0x9C63
-0x7E56 = 0x9C65
-0x7E57 = 0x9C77
-0x7E58 = 0x9D1D
-0x7E59 = 0x9D1E
-0x7E5A = 0x9D43
-0x7E5B = 0x9D47
-0x7E5C = 0x9D52
-0x7E5D = 0x9D63
-0x7E5E = 0x9D70
-0x7E5F = 0x9D7C
-0x7E60 = 0x9D8A
-0x7E61 = 0x9D96
-0x7E62 = 0x9DC0
-0x7E63 = 0x9DAC
-0x7E64 = 0x9DBC
-0x7E65 = 0x9DD7
-0x7E67 = 0x9DE7
-0x7E68 = 0x9E07
-0x7E69 = 0x9E15
-0x7E6A = 0x9E7C
-0x7E6B = 0x9E9E
-0x7E6C = 0x9EA4
-0x7E6D = 0x9EAC
-0x7E6E = 0x9EAF
-0x7E6F = 0x9EB4
-0x7E70 = 0x9EB5
-0x7E71 = 0x9EC3
-0x7E72 = 0x9ED1
-0x7E73 = 0x9F10
-0x7E74 = 0x9F39
-0x7E75 = 0x9F57
-0x7E76 = 0x9F90
-0x7E77 = 0x9F94
-0x7E78 = 0x9F97
-0x7E79 = 0x9FA2
-0x7E7A = 0x59F8
-0x7E7B = 0x5C5B
-0x7E7C = 0x5E77
-0x7E7D = 0x7626
-0x7E7E = 0x7E6B
-END_MAP
diff --git a/enc/trans/JIS/JISX0213-1%UCS@SIP.src b/enc/trans/JIS/JISX0213-1%UCS@SIP.src
deleted file mode 100644
index da7eab62a7..0000000000
--- a/enc/trans/JIS/JISX0213-1%UCS@SIP.src
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: JISX0213-1%UCS@SIP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "JISX0213-1/UCS:SIP"
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## JIS X 0213:2004 vs Unicode mapping table
-##
-## Date: 22 May 2006
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## Copyright (C) 2006 Project X0213, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## 3-XXXX JIS X 0213:2004 plane 1 (GL encoding)
-## 4-XXXX JIS X 0213:2000 plane 2 (GL encoding)
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-## JIS Unicode Name Note
-0x2E22 = 0x000B
-0x2F42 = 0x123D
-0x2F4C = 0x131B
-0x2F60 = 0x146E
-0x2F7B = 0x18BD
-0x4F54 = 0x0B9F
-0x4F63 = 0x16B4
-0x4F6E = 0x1E34
-0x753A = 0x31C4
-0x7572 = 0x35C4
-0x7629 = 0x373F
-0x7632 = 0x3763
-0x7660 = 0x3CFE
-0x776C = 0x47F1
-0x787E = 0x548E
-0x7929 = 0x550E
-0x7947 = 0x5771
-0x7954 = 0x59C4
-0x796E = 0x5DA1
-0x7A5D = 0x6AFF
-0x7B33 = 0x6E40
-0x7B49 = 0x70F4
-0x7B6C = 0x7684
-0x7C49 = 0x8277
-0x7C51 = 0x83CD
-0x7E66 = 0xA190
-END_MAP
diff --git a/enc/trans/JIS/JISX0213-2%UCS@BMP.src b/enc/trans/JIS/JISX0213-2%UCS@BMP.src
deleted file mode 100644
index e22ef8aa26..0000000000
--- a/enc/trans/JIS/JISX0213-2%UCS@BMP.src
+++ /dev/null
@@ -1,2193 +0,0 @@
-# $NetBSD: JISX0213-2%UCS@BMP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "JISX0213-2/UCS:BMP"
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## JIS X 0213:2004 vs Unicode mapping table
-##
-## Date: 22 May 2006
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## Copyright (C) 2006 Project X0213, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## 3-XXXX JIS X 0213:2004 plane 1 (GL encoding)
-## 4-XXXX JIS X 0213:2000 plane 2 (GL encoding)
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-## JIS Unicode Name Note
-0x2122 = 0x4E02
-0x2123 = 0x4E0F
-0x2124 = 0x4E12
-0x2125 = 0x4E29
-0x2126 = 0x4E2B
-0x2127 = 0x4E2E
-0x2128 = 0x4E40
-0x2129 = 0x4E47
-0x212A = 0x4E48
-0x212C = 0x4E51
-0x212D = 0x3406
-0x212F = 0x4E5A
-0x2130 = 0x4E69
-0x2131 = 0x4E9D
-0x2132 = 0x342C
-0x2133 = 0x342E
-0x2134 = 0x4EB9
-0x2135 = 0x4EBB
-0x2137 = 0x4EBC
-0x2138 = 0x4EC3
-0x2139 = 0x4EC8
-0x213A = 0x4ED0
-0x213B = 0x4EEB
-0x213C = 0x4EDA
-0x213D = 0x4EF1
-0x213E = 0x4EF5
-0x213F = 0x4F00
-0x2140 = 0x4F16
-0x2141 = 0x4F64
-0x2142 = 0x4F37
-0x2143 = 0x4F3E
-0x2144 = 0x4F54
-0x2145 = 0x4F58
-0x2147 = 0x4F77
-0x2148 = 0x4F78
-0x2149 = 0x4F7A
-0x214A = 0x4F7D
-0x214B = 0x4F82
-0x214C = 0x4F85
-0x214D = 0x4F92
-0x214E = 0x4F9A
-0x214F = 0x4FE6
-0x2150 = 0x4FB2
-0x2151 = 0x4FBE
-0x2152 = 0x4FC5
-0x2153 = 0x4FCB
-0x2154 = 0x4FCF
-0x2155 = 0x4FD2
-0x2156 = 0x346A
-0x2157 = 0x4FF2
-0x2158 = 0x5000
-0x2159 = 0x5010
-0x215A = 0x5013
-0x215B = 0x501C
-0x215C = 0x501E
-0x215D = 0x5022
-0x215E = 0x3468
-0x215F = 0x5042
-0x2160 = 0x5046
-0x2161 = 0x504E
-0x2162 = 0x5053
-0x2163 = 0x5057
-0x2164 = 0x5063
-0x2165 = 0x5066
-0x2166 = 0x506A
-0x2167 = 0x5070
-0x2168 = 0x50A3
-0x2169 = 0x5088
-0x216A = 0x5092
-0x216B = 0x5093
-0x216C = 0x5095
-0x216D = 0x5096
-0x216E = 0x509C
-0x216F = 0x50AA
-0x2171 = 0x50B1
-0x2172 = 0x50BA
-0x2173 = 0x50BB
-0x2174 = 0x50C4
-0x2175 = 0x50C7
-0x2176 = 0x50F3
-0x2178 = 0x50CE
-0x217A = 0x50D4
-0x217B = 0x50D9
-0x217C = 0x50E1
-0x217D = 0x50E9
-0x217E = 0x3492
-0x2321 = 0x5108
-0x2323 = 0x5117
-0x2324 = 0x511B
-0x2326 = 0x5160
-0x2328 = 0x5173
-0x2329 = 0x5183
-0x232A = 0x518B
-0x232B = 0x34BC
-0x232C = 0x5198
-0x232D = 0x51A3
-0x232E = 0x51AD
-0x232F = 0x34C7
-0x2330 = 0x51BC
-0x2333 = 0x51F3
-0x2334 = 0x51F4
-0x2335 = 0x5202
-0x2336 = 0x5212
-0x2337 = 0x5216
-0x2339 = 0x5255
-0x233A = 0x525C
-0x233B = 0x526C
-0x233C = 0x5277
-0x233D = 0x5284
-0x233E = 0x5282
-0x2340 = 0x5298
-0x2342 = 0x52A4
-0x2343 = 0x52A6
-0x2344 = 0x52AF
-0x2345 = 0x52BA
-0x2346 = 0x52BB
-0x2347 = 0x52CA
-0x2348 = 0x351F
-0x2349 = 0x52D1
-0x234B = 0x52F7
-0x234C = 0x530A
-0x234D = 0x530B
-0x234E = 0x5324
-0x234F = 0x5335
-0x2350 = 0x533E
-0x2351 = 0x5342
-0x2354 = 0x5367
-0x2355 = 0x536C
-0x2356 = 0x537A
-0x2357 = 0x53A4
-0x2358 = 0x53B4
-0x235A = 0x53B7
-0x235B = 0x53C0
-0x235D = 0x355D
-0x235E = 0x355E
-0x235F = 0x53D5
-0x2360 = 0x53DA
-0x2361 = 0x3563
-0x2362 = 0x53F4
-0x2363 = 0x53F5
-0x2364 = 0x5455
-0x2365 = 0x5424
-0x2366 = 0x5428
-0x2367 = 0x356E
-0x2368 = 0x5443
-0x2369 = 0x5462
-0x236A = 0x5466
-0x236B = 0x546C
-0x236C = 0x548A
-0x236D = 0x548D
-0x236E = 0x5495
-0x236F = 0x54A0
-0x2370 = 0x54A6
-0x2371 = 0x54AD
-0x2372 = 0x54AE
-0x2373 = 0x54B7
-0x2374 = 0x54BA
-0x2375 = 0x54BF
-0x2376 = 0x54C3
-0x2378 = 0x54EC
-0x2379 = 0x54EF
-0x237A = 0x54F1
-0x237B = 0x54F3
-0x237C = 0x5500
-0x237D = 0x5501
-0x237E = 0x5509
-0x2421 = 0x553C
-0x2422 = 0x5541
-0x2423 = 0x35A6
-0x2424 = 0x5547
-0x2425 = 0x554A
-0x2426 = 0x35A8
-0x2427 = 0x5560
-0x2428 = 0x5561
-0x2429 = 0x5564
-0x242B = 0x557D
-0x242C = 0x5582
-0x242D = 0x5588
-0x242E = 0x5591
-0x242F = 0x35C5
-0x2430 = 0x55D2
-0x2433 = 0x55BF
-0x2434 = 0x55C9
-0x2435 = 0x55CC
-0x2436 = 0x55D1
-0x2437 = 0x55DD
-0x2438 = 0x35DA
-0x2439 = 0x55E2
-0x243B = 0x55E9
-0x243C = 0x5628
-0x243E = 0x5607
-0x243F = 0x5610
-0x2440 = 0x5630
-0x2441 = 0x5637
-0x2442 = 0x35F4
-0x2443 = 0x563D
-0x2444 = 0x563F
-0x2445 = 0x5640
-0x2446 = 0x5647
-0x2447 = 0x565E
-0x2448 = 0x5660
-0x2449 = 0x566D
-0x244A = 0x3605
-0x244B = 0x5688
-0x244C = 0x568C
-0x244D = 0x5695
-0x244E = 0x569A
-0x244F = 0x569D
-0x2450 = 0x56A8
-0x2451 = 0x56AD
-0x2452 = 0x56B2
-0x2453 = 0x56C5
-0x2454 = 0x56CD
-0x2455 = 0x56DF
-0x2456 = 0x56E8
-0x2457 = 0x56F6
-0x2458 = 0x56F7
-0x245A = 0x5715
-0x245B = 0x5723
-0x245D = 0x5729
-0x245F = 0x5745
-0x2460 = 0x5746
-0x2461 = 0x574C
-0x2462 = 0x574D
-0x2464 = 0x5768
-0x2465 = 0x576F
-0x2466 = 0x5773
-0x2467 = 0x5774
-0x2468 = 0x5775
-0x2469 = 0x577B
-0x246C = 0x57AC
-0x246D = 0x579A
-0x246E = 0x579D
-0x246F = 0x579E
-0x2470 = 0x57A8
-0x2471 = 0x57D7
-0x2473 = 0x57CC
-0x2476 = 0x57DE
-0x2477 = 0x57E6
-0x2478 = 0x57F0
-0x2479 = 0x364A
-0x247A = 0x57F8
-0x247B = 0x57FB
-0x247C = 0x57FD
-0x247D = 0x5804
-0x247E = 0x581E
-0x2521 = 0x5820
-0x2522 = 0x5827
-0x2523 = 0x5832
-0x2524 = 0x5839
-0x2526 = 0x5849
-0x2527 = 0x584C
-0x2528 = 0x5867
-0x2529 = 0x588A
-0x252A = 0x588B
-0x252B = 0x588D
-0x252C = 0x588F
-0x252D = 0x5890
-0x252E = 0x5894
-0x252F = 0x589D
-0x2530 = 0x58AA
-0x2531 = 0x58B1
-0x2533 = 0x58C3
-0x2534 = 0x58CD
-0x2535 = 0x58E2
-0x2536 = 0x58F3
-0x2537 = 0x58F4
-0x2538 = 0x5905
-0x2539 = 0x5906
-0x253A = 0x590B
-0x253B = 0x590D
-0x253C = 0x5914
-0x253D = 0x5924
-0x253F = 0x3691
-0x2540 = 0x593D
-0x2541 = 0x3699
-0x2542 = 0x5946
-0x2543 = 0x3696
-0x2545 = 0x595B
-0x2546 = 0x595F
-0x2548 = 0x5975
-0x2549 = 0x5976
-0x254A = 0x597C
-0x254B = 0x599F
-0x254C = 0x59AE
-0x254D = 0x59BC
-0x254E = 0x59C8
-0x254F = 0x59CD
-0x2550 = 0x59DE
-0x2551 = 0x59E3
-0x2552 = 0x59E4
-0x2553 = 0x59E7
-0x2554 = 0x59EE
-0x2557 = 0x36CF
-0x2558 = 0x5A0C
-0x2559 = 0x5A0D
-0x255A = 0x5A17
-0x255B = 0x5A27
-0x255C = 0x5A2D
-0x255D = 0x5A55
-0x255E = 0x5A65
-0x255F = 0x5A7A
-0x2560 = 0x5A8B
-0x2561 = 0x5A9C
-0x2562 = 0x5A9F
-0x2563 = 0x5AA0
-0x2564 = 0x5AA2
-0x2565 = 0x5AB1
-0x2566 = 0x5AB3
-0x2567 = 0x5AB5
-0x2568 = 0x5ABA
-0x2569 = 0x5ABF
-0x256A = 0x5ADA
-0x256B = 0x5ADC
-0x256C = 0x5AE0
-0x256D = 0x5AE5
-0x256E = 0x5AF0
-0x256F = 0x5AEE
-0x2570 = 0x5AF5
-0x2571 = 0x5B00
-0x2572 = 0x5B08
-0x2573 = 0x5B17
-0x2574 = 0x5B34
-0x2575 = 0x5B2D
-0x2576 = 0x5B4C
-0x2577 = 0x5B52
-0x2578 = 0x5B68
-0x2579 = 0x5B6F
-0x257A = 0x5B7C
-0x257B = 0x5B7F
-0x257C = 0x5B81
-0x257D = 0x5B84
-0x2821 = 0x5B96
-0x2822 = 0x5BAC
-0x2823 = 0x3761
-0x2824 = 0x5BC0
-0x2825 = 0x3762
-0x2826 = 0x5BCE
-0x2827 = 0x5BD6
-0x2828 = 0x376C
-0x2829 = 0x376B
-0x282A = 0x5BF1
-0x282B = 0x5BFD
-0x282C = 0x3775
-0x282D = 0x5C03
-0x282E = 0x5C29
-0x282F = 0x5C30
-0x2831 = 0x5C5F
-0x2832 = 0x5C63
-0x2833 = 0x5C67
-0x2834 = 0x5C68
-0x2835 = 0x5C69
-0x2836 = 0x5C70
-0x2839 = 0x5C7C
-0x283C = 0x5C88
-0x283D = 0x5C8A
-0x283E = 0x37C1
-0x2841 = 0x5CA0
-0x2842 = 0x5CA2
-0x2843 = 0x5CA6
-0x2844 = 0x5CA7
-0x2846 = 0x5CAD
-0x2847 = 0x5CB5
-0x2849 = 0x5CC9
-0x284C = 0x5D06
-0x284D = 0x5D10
-0x284E = 0x5D2B
-0x284F = 0x5D1D
-0x2850 = 0x5D20
-0x2851 = 0x5D24
-0x2852 = 0x5D26
-0x2853 = 0x5D31
-0x2854 = 0x5D39
-0x2855 = 0x5D42
-0x2856 = 0x37E8
-0x2857 = 0x5D61
-0x2858 = 0x5D6A
-0x2859 = 0x37F4
-0x285A = 0x5D70
-0x285C = 0x37FD
-0x285D = 0x5D88
-0x285E = 0x3800
-0x285F = 0x5D92
-0x2860 = 0x5D94
-0x2861 = 0x5D97
-0x2862 = 0x5D99
-0x2863 = 0x5DB0
-0x2864 = 0x5DB2
-0x2865 = 0x5DB4
-0x2867 = 0x5DB9
-0x2868 = 0x5DD1
-0x2869 = 0x5DD7
-0x286A = 0x5DD8
-0x286B = 0x5DE0
-0x286D = 0x5DE4
-0x286E = 0x5DE9
-0x286F = 0x382F
-0x2870 = 0x5E00
-0x2871 = 0x3836
-0x2872 = 0x5E12
-0x2873 = 0x5E15
-0x2874 = 0x3840
-0x2875 = 0x5E1F
-0x2876 = 0x5E2E
-0x2877 = 0x5E3E
-0x2878 = 0x5E49
-0x2879 = 0x385C
-0x287A = 0x5E56
-0x287B = 0x3861
-0x287C = 0x5E6B
-0x287D = 0x5E6C
-0x287E = 0x5E6D
-0x2C21 = 0x5E6E
-0x2C23 = 0x5EA5
-0x2C24 = 0x5EAA
-0x2C25 = 0x5EAC
-0x2C26 = 0x5EB9
-0x2C27 = 0x5EBF
-0x2C28 = 0x5EC6
-0x2C29 = 0x5ED2
-0x2C2A = 0x5ED9
-0x2C2C = 0x5EFD
-0x2C2D = 0x5F08
-0x2C2E = 0x5F0E
-0x2C2F = 0x5F1C
-0x2C31 = 0x5F1E
-0x2C32 = 0x5F47
-0x2C33 = 0x5F63
-0x2C34 = 0x5F72
-0x2C35 = 0x5F7E
-0x2C36 = 0x5F8F
-0x2C37 = 0x5FA2
-0x2C38 = 0x5FA4
-0x2C39 = 0x5FB8
-0x2C3A = 0x5FC4
-0x2C3B = 0x38FA
-0x2C3C = 0x5FC7
-0x2C3D = 0x5FCB
-0x2C3E = 0x5FD2
-0x2C3F = 0x5FD3
-0x2C40 = 0x5FD4
-0x2C41 = 0x5FE2
-0x2C42 = 0x5FEE
-0x2C43 = 0x5FEF
-0x2C44 = 0x5FF3
-0x2C45 = 0x5FFC
-0x2C46 = 0x3917
-0x2C47 = 0x6017
-0x2C48 = 0x6022
-0x2C49 = 0x6024
-0x2C4A = 0x391A
-0x2C4B = 0x604C
-0x2C4C = 0x607F
-0x2C4D = 0x608A
-0x2C4E = 0x6095
-0x2C4F = 0x60A8
-0x2C51 = 0x60B0
-0x2C52 = 0x60B1
-0x2C53 = 0x60BE
-0x2C54 = 0x60C8
-0x2C55 = 0x60D9
-0x2C56 = 0x60DB
-0x2C57 = 0x60EE
-0x2C58 = 0x60F2
-0x2C59 = 0x60F5
-0x2C5A = 0x6110
-0x2C5B = 0x6112
-0x2C5C = 0x6113
-0x2C5D = 0x6119
-0x2C5E = 0x611E
-0x2C5F = 0x613A
-0x2C60 = 0x396F
-0x2C61 = 0x6141
-0x2C62 = 0x6146
-0x2C63 = 0x6160
-0x2C64 = 0x617C
-0x2C66 = 0x6192
-0x2C67 = 0x6193
-0x2C68 = 0x6197
-0x2C69 = 0x6198
-0x2C6A = 0x61A5
-0x2C6B = 0x61A8
-0x2C6C = 0x61AD
-0x2C6E = 0x61D5
-0x2C6F = 0x61DD
-0x2C70 = 0x61DF
-0x2C71 = 0x61F5
-0x2C73 = 0x6215
-0x2C74 = 0x6223
-0x2C75 = 0x6229
-0x2C76 = 0x6246
-0x2C77 = 0x624C
-0x2C78 = 0x6251
-0x2C79 = 0x6252
-0x2C7A = 0x6261
-0x2C7B = 0x6264
-0x2C7C = 0x627B
-0x2C7D = 0x626D
-0x2C7E = 0x6273
-0x2D21 = 0x6299
-0x2D22 = 0x62A6
-0x2D23 = 0x62D5
-0x2D25 = 0x62FD
-0x2D26 = 0x6303
-0x2D27 = 0x630D
-0x2D28 = 0x6310
-0x2D2B = 0x6332
-0x2D2C = 0x6335
-0x2D2D = 0x633B
-0x2D2E = 0x633C
-0x2D2F = 0x6341
-0x2D30 = 0x6344
-0x2D31 = 0x634E
-0x2D33 = 0x6359
-0x2D36 = 0x636C
-0x2D37 = 0x6384
-0x2D38 = 0x6399
-0x2D3A = 0x6394
-0x2D3B = 0x63BD
-0x2D3C = 0x63F7
-0x2D3D = 0x63D4
-0x2D3E = 0x63D5
-0x2D3F = 0x63DC
-0x2D40 = 0x63E0
-0x2D41 = 0x63EB
-0x2D42 = 0x63EC
-0x2D43 = 0x63F2
-0x2D44 = 0x6409
-0x2D45 = 0x641E
-0x2D46 = 0x6425
-0x2D47 = 0x6429
-0x2D48 = 0x642F
-0x2D49 = 0x645A
-0x2D4A = 0x645B
-0x2D4B = 0x645D
-0x2D4C = 0x6473
-0x2D4D = 0x647D
-0x2D4E = 0x6487
-0x2D4F = 0x6491
-0x2D50 = 0x649D
-0x2D51 = 0x649F
-0x2D52 = 0x64CB
-0x2D53 = 0x64CC
-0x2D54 = 0x64D5
-0x2D55 = 0x64D7
-0x2D57 = 0x64E4
-0x2D58 = 0x64E5
-0x2D59 = 0x64FF
-0x2D5A = 0x6504
-0x2D5B = 0x3A6E
-0x2D5C = 0x650F
-0x2D5D = 0x6514
-0x2D5E = 0x6516
-0x2D5F = 0x3A73
-0x2D60 = 0x651E
-0x2D61 = 0x6532
-0x2D62 = 0x6544
-0x2D63 = 0x6554
-0x2D64 = 0x656B
-0x2D65 = 0x657A
-0x2D66 = 0x6581
-0x2D67 = 0x6584
-0x2D68 = 0x6585
-0x2D69 = 0x658A
-0x2D6A = 0x65B2
-0x2D6B = 0x65B5
-0x2D6C = 0x65B8
-0x2D6D = 0x65BF
-0x2D6E = 0x65C2
-0x2D6F = 0x65C9
-0x2D70 = 0x65D4
-0x2D71 = 0x3AD6
-0x2D72 = 0x65F2
-0x2D73 = 0x65F9
-0x2D74 = 0x65FC
-0x2D75 = 0x6604
-0x2D76 = 0x6608
-0x2D77 = 0x6621
-0x2D78 = 0x662A
-0x2D79 = 0x6645
-0x2D7A = 0x6651
-0x2D7B = 0x664E
-0x2D7C = 0x3AEA
-0x2D7E = 0x6657
-0x2E21 = 0x665B
-0x2E22 = 0x6663
-0x2E25 = 0x666A
-0x2E26 = 0x666B
-0x2E27 = 0x666C
-0x2E28 = 0x666D
-0x2E29 = 0x667B
-0x2E2A = 0x6680
-0x2E2B = 0x6690
-0x2E2C = 0x6692
-0x2E2D = 0x6699
-0x2E2E = 0x3B0E
-0x2E2F = 0x66AD
-0x2E30 = 0x66B1
-0x2E31 = 0x66B5
-0x2E32 = 0x3B1A
-0x2E33 = 0x66BF
-0x2E34 = 0x3B1C
-0x2E35 = 0x66EC
-0x2E36 = 0x3AD7
-0x2E37 = 0x6701
-0x2E38 = 0x6705
-0x2E39 = 0x6712
-0x2E3B = 0x6719
-0x2E3E = 0x674C
-0x2E3F = 0x674D
-0x2E40 = 0x6754
-0x2E41 = 0x675D
-0x2E45 = 0x6774
-0x2E46 = 0x6776
-0x2E48 = 0x6792
-0x2E4A = 0x8363
-0x2E4B = 0x6810
-0x2E4C = 0x67B0
-0x2E4D = 0x67B2
-0x2E4E = 0x67C3
-0x2E4F = 0x67C8
-0x2E50 = 0x67D2
-0x2E51 = 0x67D9
-0x2E52 = 0x67DB
-0x2E53 = 0x67F0
-0x2E54 = 0x67F7
-0x2E58 = 0x6818
-0x2E59 = 0x681F
-0x2E5A = 0x682D
-0x2E5C = 0x6833
-0x2E5D = 0x683B
-0x2E5E = 0x683E
-0x2E5F = 0x6844
-0x2E60 = 0x6845
-0x2E61 = 0x6849
-0x2E62 = 0x684C
-0x2E63 = 0x6855
-0x2E64 = 0x6857
-0x2E65 = 0x3B77
-0x2E66 = 0x686B
-0x2E67 = 0x686E
-0x2E68 = 0x687A
-0x2E69 = 0x687C
-0x2E6A = 0x6882
-0x2E6B = 0x6890
-0x2E6C = 0x6896
-0x2E6D = 0x3B6D
-0x2E6E = 0x6898
-0x2E6F = 0x6899
-0x2E70 = 0x689A
-0x2E71 = 0x689C
-0x2E72 = 0x68AA
-0x2E73 = 0x68AB
-0x2E74 = 0x68B4
-0x2E75 = 0x68BB
-0x2E76 = 0x68FB
-0x2E79 = 0xFA13
-0x2E7A = 0x68C3
-0x2E7B = 0x68C5
-0x2E7C = 0x68CC
-0x2E7D = 0x68CF
-0x2E7E = 0x68D6
-0x2F21 = 0x68D9
-0x2F22 = 0x68E4
-0x2F23 = 0x68E5
-0x2F24 = 0x68EC
-0x2F25 = 0x68F7
-0x2F26 = 0x6903
-0x2F27 = 0x6907
-0x2F28 = 0x3B87
-0x2F29 = 0x3B88
-0x2F2B = 0x693B
-0x2F2C = 0x3B8D
-0x2F2D = 0x6946
-0x2F2E = 0x6969
-0x2F2F = 0x696C
-0x2F30 = 0x6972
-0x2F31 = 0x697A
-0x2F32 = 0x697F
-0x2F33 = 0x6992
-0x2F34 = 0x3BA4
-0x2F35 = 0x6996
-0x2F36 = 0x6998
-0x2F37 = 0x69A6
-0x2F38 = 0x69B0
-0x2F39 = 0x69B7
-0x2F3A = 0x69BA
-0x2F3B = 0x69BC
-0x2F3C = 0x69C0
-0x2F3D = 0x69D1
-0x2F3E = 0x69D6
-0x2F41 = 0x6A30
-0x2F44 = 0x69E3
-0x2F45 = 0x69EE
-0x2F46 = 0x69EF
-0x2F47 = 0x69F3
-0x2F48 = 0x3BCD
-0x2F49 = 0x69F4
-0x2F4A = 0x69FE
-0x2F4B = 0x6A11
-0x2F4C = 0x6A1A
-0x2F4D = 0x6A1D
-0x2F4F = 0x6A32
-0x2F50 = 0x6A33
-0x2F51 = 0x6A34
-0x2F52 = 0x6A3F
-0x2F53 = 0x6A46
-0x2F54 = 0x6A49
-0x2F55 = 0x6A7A
-0x2F56 = 0x6A4E
-0x2F57 = 0x6A52
-0x2F58 = 0x6A64
-0x2F5A = 0x6A7E
-0x2F5B = 0x6A83
-0x2F5C = 0x6A8B
-0x2F5D = 0x3BF0
-0x2F5E = 0x6A91
-0x2F5F = 0x6A9F
-0x2F60 = 0x6AA1
-0x2F62 = 0x6AAB
-0x2F63 = 0x6ABD
-0x2F64 = 0x6AC6
-0x2F65 = 0x6AD4
-0x2F66 = 0x6AD0
-0x2F67 = 0x6ADC
-0x2F68 = 0x6ADD
-0x2F6B = 0x6AEC
-0x2F6C = 0x6AF1
-0x2F6D = 0x6AF2
-0x2F6E = 0x6AF3
-0x2F6F = 0x6AFD
-0x2F71 = 0x6B0B
-0x2F72 = 0x6B0F
-0x2F73 = 0x6B10
-0x2F74 = 0x6B11
-0x2F76 = 0x6B17
-0x2F77 = 0x3C26
-0x2F78 = 0x6B2F
-0x2F79 = 0x6B4A
-0x2F7A = 0x6B58
-0x2F7B = 0x6B6C
-0x2F7C = 0x6B75
-0x2F7D = 0x6B7A
-0x2F7E = 0x6B81
-0x6E21 = 0x6B9B
-0x6E22 = 0x6BAE
-0x6E24 = 0x6BBD
-0x6E25 = 0x6BBE
-0x6E26 = 0x6BC7
-0x6E27 = 0x6BC8
-0x6E28 = 0x6BC9
-0x6E29 = 0x6BDA
-0x6E2A = 0x6BE6
-0x6E2B = 0x6BE7
-0x6E2C = 0x6BEE
-0x6E2D = 0x6BF1
-0x6E2E = 0x6C02
-0x6E2F = 0x6C0A
-0x6E30 = 0x6C0E
-0x6E31 = 0x6C35
-0x6E32 = 0x6C36
-0x6E33 = 0x6C3A
-0x6E35 = 0x6C3F
-0x6E36 = 0x6C4D
-0x6E37 = 0x6C5B
-0x6E38 = 0x6C6D
-0x6E39 = 0x6C84
-0x6E3A = 0x6C89
-0x6E3B = 0x3CC3
-0x6E3C = 0x6C94
-0x6E3D = 0x6C95
-0x6E3E = 0x6C97
-0x6E3F = 0x6CAD
-0x6E40 = 0x6CC2
-0x6E41 = 0x6CD0
-0x6E42 = 0x3CD2
-0x6E43 = 0x6CD6
-0x6E44 = 0x6CDA
-0x6E45 = 0x6CDC
-0x6E46 = 0x6CE9
-0x6E47 = 0x6CEC
-0x6E48 = 0x6CED
-0x6E4A = 0x6D00
-0x6E4B = 0x6D0A
-0x6E4C = 0x6D24
-0x6E4D = 0x6D26
-0x6E4E = 0x6D27
-0x6E4F = 0x6C67
-0x6E50 = 0x6D2F
-0x6E51 = 0x6D3C
-0x6E52 = 0x6D5B
-0x6E53 = 0x6D5E
-0x6E54 = 0x6D60
-0x6E55 = 0x6D70
-0x6E56 = 0x6D80
-0x6E57 = 0x6D81
-0x6E58 = 0x6D8A
-0x6E59 = 0x6D8D
-0x6E5A = 0x6D91
-0x6E5B = 0x6D98
-0x6E5D = 0x6E17
-0x6E61 = 0x6DAB
-0x6E62 = 0x6DAE
-0x6E63 = 0x6DB4
-0x6E64 = 0x6DC2
-0x6E65 = 0x6D34
-0x6E66 = 0x6DC8
-0x6E67 = 0x6DCE
-0x6E68 = 0x6DCF
-0x6E69 = 0x6DD0
-0x6E6A = 0x6DDF
-0x6E6B = 0x6DE9
-0x6E6C = 0x6DF6
-0x6E6D = 0x6E36
-0x6E6E = 0x6E1E
-0x6E6F = 0x6E22
-0x6E70 = 0x6E27
-0x6E71 = 0x3D11
-0x6E72 = 0x6E32
-0x6E73 = 0x6E3C
-0x6E74 = 0x6E48
-0x6E75 = 0x6E49
-0x6E76 = 0x6E4B
-0x6E77 = 0x6E4C
-0x6E78 = 0x6E4F
-0x6E79 = 0x6E51
-0x6E7A = 0x6E53
-0x6E7B = 0x6E54
-0x6E7C = 0x6E57
-0x6E7D = 0x6E63
-0x6E7E = 0x3D1E
-0x6F21 = 0x6E93
-0x6F22 = 0x6EA7
-0x6F23 = 0x6EB4
-0x6F24 = 0x6EBF
-0x6F25 = 0x6EC3
-0x6F26 = 0x6ECA
-0x6F27 = 0x6ED9
-0x6F28 = 0x6F35
-0x6F29 = 0x6EEB
-0x6F2A = 0x6EF9
-0x6F2B = 0x6EFB
-0x6F2C = 0x6F0A
-0x6F2D = 0x6F0C
-0x6F2E = 0x6F18
-0x6F2F = 0x6F25
-0x6F30 = 0x6F36
-0x6F31 = 0x6F3C
-0x6F33 = 0x6F52
-0x6F34 = 0x6F57
-0x6F35 = 0x6F5A
-0x6F36 = 0x6F60
-0x6F37 = 0x6F68
-0x6F38 = 0x6F98
-0x6F39 = 0x6F7D
-0x6F3A = 0x6F90
-0x6F3B = 0x6F96
-0x6F3C = 0x6FBE
-0x6F3D = 0x6F9F
-0x6F3E = 0x6FA5
-0x6F3F = 0x6FAF
-0x6F40 = 0x3D64
-0x6F41 = 0x6FB5
-0x6F42 = 0x6FC8
-0x6F43 = 0x6FC9
-0x6F44 = 0x6FDA
-0x6F45 = 0x6FDE
-0x6F46 = 0x6FE9
-0x6F48 = 0x6FFC
-0x6F49 = 0x7000
-0x6F4A = 0x7007
-0x6F4B = 0x700A
-0x6F4C = 0x7023
-0x6F4E = 0x7039
-0x6F4F = 0x703A
-0x6F50 = 0x703C
-0x6F51 = 0x7043
-0x6F52 = 0x7047
-0x6F53 = 0x704B
-0x6F54 = 0x3D9A
-0x6F55 = 0x7054
-0x6F56 = 0x7065
-0x6F57 = 0x7069
-0x6F58 = 0x706C
-0x6F59 = 0x706E
-0x6F5A = 0x7076
-0x6F5B = 0x707E
-0x6F5C = 0x7081
-0x6F5D = 0x7086
-0x6F5E = 0x7095
-0x6F5F = 0x7097
-0x6F60 = 0x70BB
-0x6F62 = 0x709F
-0x6F63 = 0x70B1
-0x6F65 = 0x70EC
-0x6F66 = 0x70CA
-0x6F67 = 0x70D1
-0x6F68 = 0x70D3
-0x6F69 = 0x70DC
-0x6F6A = 0x7103
-0x6F6B = 0x7104
-0x6F6C = 0x7106
-0x6F6D = 0x7107
-0x6F6E = 0x7108
-0x6F6F = 0x710C
-0x6F70 = 0x3DC0
-0x6F71 = 0x712F
-0x6F72 = 0x7131
-0x6F73 = 0x7150
-0x6F74 = 0x714A
-0x6F75 = 0x7153
-0x6F76 = 0x715E
-0x6F77 = 0x3DD4
-0x6F78 = 0x7196
-0x6F79 = 0x7180
-0x6F7A = 0x719B
-0x6F7B = 0x71A0
-0x6F7C = 0x71A2
-0x6F7D = 0x71AE
-0x6F7E = 0x71AF
-0x7021 = 0x71B3
-0x7023 = 0x71CB
-0x7024 = 0x71D3
-0x7025 = 0x71D9
-0x7026 = 0x71DC
-0x7027 = 0x7207
-0x7028 = 0x3E05
-0x7029 = 0xFA49
-0x702A = 0x722B
-0x702B = 0x7234
-0x702C = 0x7238
-0x702D = 0x7239
-0x702E = 0x4E2C
-0x702F = 0x7242
-0x7030 = 0x7253
-0x7031 = 0x7257
-0x7032 = 0x7263
-0x7034 = 0x726E
-0x7035 = 0x726F
-0x7036 = 0x7278
-0x7037 = 0x727F
-0x7038 = 0x728E
-0x703A = 0x72AD
-0x703B = 0x72AE
-0x703C = 0x72B0
-0x703D = 0x72B1
-0x703E = 0x72C1
-0x703F = 0x3E60
-0x7040 = 0x72CC
-0x7041 = 0x3E66
-0x7042 = 0x3E68
-0x7043 = 0x72F3
-0x7044 = 0x72FA
-0x7045 = 0x7307
-0x7046 = 0x7312
-0x7047 = 0x7318
-0x7048 = 0x7319
-0x7049 = 0x3E83
-0x704A = 0x7339
-0x704B = 0x732C
-0x704C = 0x7331
-0x704D = 0x7333
-0x704E = 0x733D
-0x704F = 0x7352
-0x7050 = 0x3E94
-0x7051 = 0x736B
-0x7052 = 0x736C
-0x7054 = 0x736E
-0x7055 = 0x736F
-0x7056 = 0x7371
-0x7057 = 0x7377
-0x7058 = 0x7381
-0x7059 = 0x7385
-0x705A = 0x738A
-0x705B = 0x7394
-0x705C = 0x7398
-0x705D = 0x739C
-0x705E = 0x739E
-0x705F = 0x73A5
-0x7060 = 0x73A8
-0x7061 = 0x73B5
-0x7062 = 0x73B7
-0x7063 = 0x73B9
-0x7064 = 0x73BC
-0x7065 = 0x73BF
-0x7066 = 0x73C5
-0x7067 = 0x73CB
-0x7068 = 0x73E1
-0x7069 = 0x73E7
-0x706A = 0x73F9
-0x706B = 0x7413
-0x706C = 0x73FA
-0x706D = 0x7401
-0x706E = 0x7424
-0x706F = 0x7431
-0x7070 = 0x7439
-0x7071 = 0x7453
-0x7072 = 0x7440
-0x7073 = 0x7443
-0x7074 = 0x744D
-0x7075 = 0x7452
-0x7076 = 0x745D
-0x7077 = 0x7471
-0x7078 = 0x7481
-0x7079 = 0x7485
-0x707A = 0x7488
-0x707C = 0x7492
-0x707D = 0x7497
-0x707E = 0x7499
-0x7121 = 0x74A0
-0x7122 = 0x74A1
-0x7123 = 0x74A5
-0x7124 = 0x74AA
-0x7125 = 0x74AB
-0x7126 = 0x74B9
-0x7127 = 0x74BB
-0x7128 = 0x74BA
-0x7129 = 0x74D6
-0x712A = 0x74D8
-0x712B = 0x74DE
-0x712C = 0x74EF
-0x712D = 0x74EB
-0x712F = 0x74FA
-0x7131 = 0x7520
-0x7132 = 0x7524
-0x7133 = 0x752A
-0x7134 = 0x3F57
-0x7136 = 0x753D
-0x7137 = 0x753E
-0x7138 = 0x7540
-0x7139 = 0x7548
-0x713A = 0x754E
-0x713B = 0x7550
-0x713C = 0x7552
-0x713D = 0x756C
-0x713E = 0x7572
-0x713F = 0x7571
-0x7140 = 0x757A
-0x7141 = 0x757D
-0x7142 = 0x757E
-0x7143 = 0x7581
-0x7145 = 0x758C
-0x7146 = 0x3F75
-0x7147 = 0x75A2
-0x7148 = 0x3F77
-0x7149 = 0x75B0
-0x714A = 0x75B7
-0x714B = 0x75BF
-0x714C = 0x75C0
-0x714D = 0x75C6
-0x714E = 0x75CF
-0x714F = 0x75D3
-0x7150 = 0x75DD
-0x7151 = 0x75DF
-0x7152 = 0x75E0
-0x7153 = 0x75E7
-0x7154 = 0x75EC
-0x7155 = 0x75EE
-0x7156 = 0x75F1
-0x7157 = 0x75F9
-0x7158 = 0x7603
-0x7159 = 0x7618
-0x715A = 0x7607
-0x715B = 0x760F
-0x715C = 0x3FAE
-0x715E = 0x7613
-0x715F = 0x761B
-0x7160 = 0x761C
-0x7162 = 0x7625
-0x7163 = 0x7628
-0x7164 = 0x763C
-0x7165 = 0x7633
-0x7167 = 0x3FC9
-0x7168 = 0x7641
-0x716A = 0x7649
-0x716B = 0x7655
-0x716C = 0x3FD7
-0x716D = 0x766E
-0x716E = 0x7695
-0x716F = 0x769C
-0x7170 = 0x76A1
-0x7171 = 0x76A0
-0x7172 = 0x76A7
-0x7173 = 0x76A8
-0x7174 = 0x76AF
-0x7176 = 0x76C9
-0x7178 = 0x76E8
-0x7179 = 0x76EC
-0x717B = 0x7717
-0x717C = 0x771A
-0x717D = 0x772D
-0x717E = 0x7735
-0x7222 = 0x4039
-0x7225 = 0x7758
-0x7226 = 0x7760
-0x7227 = 0x776A
-0x7229 = 0x7772
-0x722A = 0x777C
-0x722B = 0x777D
-0x722D = 0x4058
-0x722E = 0x779A
-0x722F = 0x779F
-0x7230 = 0x77A2
-0x7231 = 0x77A4
-0x7232 = 0x77A9
-0x7233 = 0x77DE
-0x7234 = 0x77DF
-0x7235 = 0x77E4
-0x7236 = 0x77E6
-0x7237 = 0x77EA
-0x7238 = 0x77EC
-0x7239 = 0x4093
-0x723A = 0x77F0
-0x723B = 0x77F4
-0x723C = 0x77FB
-0x723E = 0x7805
-0x723F = 0x7806
-0x7240 = 0x7809
-0x7241 = 0x780D
-0x7242 = 0x7819
-0x7243 = 0x7821
-0x7244 = 0x782C
-0x7245 = 0x7847
-0x7246 = 0x7864
-0x7247 = 0x786A
-0x7249 = 0x788A
-0x724A = 0x7894
-0x724B = 0x78A4
-0x724C = 0x789D
-0x724D = 0x789E
-0x724E = 0x789F
-0x724F = 0x78BB
-0x7250 = 0x78C8
-0x7251 = 0x78CC
-0x7252 = 0x78CE
-0x7253 = 0x78D5
-0x7254 = 0x78E0
-0x7255 = 0x78E1
-0x7256 = 0x78E6
-0x7257 = 0x78F9
-0x7258 = 0x78FA
-0x7259 = 0x78FB
-0x725A = 0x78FE
-0x725C = 0x7910
-0x725D = 0x791B
-0x725E = 0x7930
-0x725F = 0x7925
-0x7260 = 0x793B
-0x7261 = 0x794A
-0x7262 = 0x7958
-0x7263 = 0x795B
-0x7264 = 0x4105
-0x7265 = 0x7967
-0x7266 = 0x7972
-0x7267 = 0x7994
-0x7268 = 0x7995
-0x7269 = 0x7996
-0x726A = 0x799B
-0x726B = 0x79A1
-0x726C = 0x79A9
-0x726D = 0x79B4
-0x726E = 0x79BB
-0x726F = 0x79C2
-0x7270 = 0x79C7
-0x7271 = 0x79CC
-0x7272 = 0x79CD
-0x7273 = 0x79D6
-0x7274 = 0x4148
-0x7277 = 0x414F
-0x7278 = 0x7A0A
-0x7279 = 0x7A11
-0x727A = 0x7A15
-0x727B = 0x7A1B
-0x727C = 0x7A1E
-0x727D = 0x4163
-0x727E = 0x7A2D
-0x7321 = 0x7A38
-0x7322 = 0x7A47
-0x7323 = 0x7A4C
-0x7324 = 0x7A56
-0x7325 = 0x7A59
-0x7326 = 0x7A5C
-0x7327 = 0x7A5F
-0x7328 = 0x7A60
-0x7329 = 0x7A67
-0x732A = 0x7A6A
-0x732B = 0x7A75
-0x732C = 0x7A78
-0x732D = 0x7A82
-0x732E = 0x7A8A
-0x732F = 0x7A90
-0x7330 = 0x7AA3
-0x7331 = 0x7AAC
-0x7333 = 0x41B4
-0x7334 = 0x7AB9
-0x7335 = 0x7ABC
-0x7336 = 0x7ABE
-0x7337 = 0x41BF
-0x7338 = 0x7ACC
-0x7339 = 0x7AD1
-0x733A = 0x7AE7
-0x733B = 0x7AE8
-0x733C = 0x7AF4
-0x733F = 0x7B07
-0x7341 = 0x7B3D
-0x7342 = 0x7B27
-0x7343 = 0x7B2A
-0x7344 = 0x7B2E
-0x7345 = 0x7B2F
-0x7346 = 0x7B31
-0x7347 = 0x41E6
-0x7348 = 0x41F3
-0x7349 = 0x7B7F
-0x734A = 0x7B41
-0x734B = 0x41EE
-0x734C = 0x7B55
-0x734D = 0x7B79
-0x734E = 0x7B64
-0x734F = 0x7B66
-0x7350 = 0x7B69
-0x7351 = 0x7B73
-0x7353 = 0x4207
-0x7354 = 0x7B90
-0x7355 = 0x7B91
-0x7356 = 0x7B9B
-0x7357 = 0x420E
-0x7358 = 0x7BAF
-0x7359 = 0x7BB5
-0x735A = 0x7BBC
-0x735B = 0x7BC5
-0x735C = 0x7BCA
-0x735F = 0x7BD4
-0x7360 = 0x7BD6
-0x7361 = 0x7BDA
-0x7362 = 0x7BEA
-0x7363 = 0x7BF0
-0x7364 = 0x7C03
-0x7365 = 0x7C0B
-0x7366 = 0x7C0E
-0x7367 = 0x7C0F
-0x7368 = 0x7C26
-0x7369 = 0x7C45
-0x736A = 0x7C4A
-0x736B = 0x7C51
-0x736C = 0x7C57
-0x736D = 0x7C5E
-0x736E = 0x7C61
-0x736F = 0x7C69
-0x7370 = 0x7C6E
-0x7371 = 0x7C6F
-0x7372 = 0x7C70
-0x7376 = 0x7CA6
-0x7378 = 0x7CB6
-0x7379 = 0x7CB7
-0x737A = 0x7CBF
-0x737C = 0x7CC4
-0x737E = 0x7CC8
-0x7421 = 0x7CCD
-0x7423 = 0x7CD7
-0x7425 = 0x7CE6
-0x7426 = 0x7CEB
-0x7428 = 0x7CF5
-0x7429 = 0x7D03
-0x742A = 0x7D09
-0x742B = 0x42C6
-0x742C = 0x7D12
-0x742D = 0x7D1E
-0x7430 = 0x7D3D
-0x7431 = 0x7D3E
-0x7432 = 0x7D40
-0x7433 = 0x7D47
-0x7436 = 0x42D6
-0x7437 = 0x7D59
-0x7438 = 0x7D5A
-0x7439 = 0x7D6A
-0x743A = 0x7D70
-0x743B = 0x42DD
-0x743C = 0x7D7F
-0x743E = 0x7D86
-0x743F = 0x7D88
-0x7440 = 0x7D8C
-0x7441 = 0x7D97
-0x7443 = 0x7D9D
-0x7444 = 0x7DA7
-0x7445 = 0x7DAA
-0x7446 = 0x7DB6
-0x7447 = 0x7DB7
-0x7448 = 0x7DC0
-0x7449 = 0x7DD7
-0x744A = 0x7DD9
-0x744B = 0x7DE6
-0x744C = 0x7DF1
-0x744D = 0x7DF9
-0x744E = 0x4302
-0x7450 = 0xFA58
-0x7451 = 0x7E10
-0x7452 = 0x7E17
-0x7453 = 0x7E1D
-0x7454 = 0x7E20
-0x7455 = 0x7E27
-0x7456 = 0x7E2C
-0x7457 = 0x7E45
-0x7458 = 0x7E73
-0x7459 = 0x7E75
-0x745A = 0x7E7E
-0x745B = 0x7E86
-0x745C = 0x7E87
-0x745D = 0x432B
-0x745E = 0x7E91
-0x745F = 0x7E98
-0x7460 = 0x7E9A
-0x7461 = 0x4343
-0x7462 = 0x7F3C
-0x7463 = 0x7F3B
-0x7464 = 0x7F3E
-0x7465 = 0x7F43
-0x7466 = 0x7F44
-0x7467 = 0x7F4F
-0x7468 = 0x34C1
-0x746A = 0x7F52
-0x746C = 0x7F61
-0x746D = 0x7F63
-0x746E = 0x7F64
-0x746F = 0x7F6D
-0x7470 = 0x7F7D
-0x7471 = 0x7F7E
-0x7473 = 0x7F90
-0x7474 = 0x517B
-0x7476 = 0x7F96
-0x7477 = 0x7F9C
-0x7478 = 0x7FAD
-0x747A = 0x7FC3
-0x747B = 0x7FCF
-0x747C = 0x7FE3
-0x747D = 0x7FE5
-0x747E = 0x7FEF
-0x7521 = 0x7FF2
-0x7522 = 0x8002
-0x7523 = 0x800A
-0x7524 = 0x8008
-0x7525 = 0x800E
-0x7526 = 0x8011
-0x7527 = 0x8016
-0x7528 = 0x8024
-0x7529 = 0x802C
-0x752A = 0x8030
-0x752B = 0x8043
-0x752C = 0x8066
-0x752D = 0x8071
-0x752E = 0x8075
-0x752F = 0x807B
-0x7530 = 0x8099
-0x7531 = 0x809C
-0x7532 = 0x80A4
-0x7533 = 0x80A7
-0x7534 = 0x80B8
-0x7536 = 0x80C5
-0x7537 = 0x80D5
-0x7538 = 0x80D8
-0x7539 = 0x80E6
-0x753B = 0x810D
-0x753C = 0x80F5
-0x753D = 0x80FB
-0x753E = 0x43EE
-0x753F = 0x8135
-0x7540 = 0x8116
-0x7541 = 0x811E
-0x7542 = 0x43F0
-0x7543 = 0x8124
-0x7544 = 0x8127
-0x7545 = 0x812C
-0x7547 = 0x813D
-0x7548 = 0x4408
-0x7549 = 0x8169
-0x754A = 0x4417
-0x754B = 0x8181
-0x754C = 0x441C
-0x754D = 0x8184
-0x754E = 0x8185
-0x754F = 0x4422
-0x7550 = 0x8198
-0x7551 = 0x81B2
-0x7552 = 0x81C1
-0x7553 = 0x81C3
-0x7554 = 0x81D6
-0x7555 = 0x81DB
-0x7557 = 0x81E4
-0x7559 = 0x81EC
-0x755B = 0x81FD
-0x755C = 0x81FF
-0x755E = 0x8204
-0x7560 = 0x8219
-0x7561 = 0x8221
-0x7562 = 0x8222
-0x7564 = 0x8232
-0x7565 = 0x8234
-0x7566 = 0x823C
-0x7567 = 0x8246
-0x7568 = 0x8249
-0x7569 = 0x8245
-0x756B = 0x824B
-0x756C = 0x4476
-0x756D = 0x824F
-0x756E = 0x447A
-0x756F = 0x8257
-0x7571 = 0x825C
-0x7572 = 0x8263
-0x7574 = 0xFA5D
-0x7575 = 0xFA5E
-0x7576 = 0x8279
-0x7577 = 0x4491
-0x7578 = 0x827D
-0x7579 = 0x827F
-0x757A = 0x8283
-0x757B = 0x828A
-0x757C = 0x8293
-0x757D = 0x82A7
-0x757E = 0x82A8
-0x7621 = 0x82B2
-0x7622 = 0x82B4
-0x7623 = 0x82BA
-0x7624 = 0x82BC
-0x7625 = 0x82E2
-0x7626 = 0x82E8
-0x7627 = 0x82F7
-0x7628 = 0x8307
-0x7629 = 0x8308
-0x762A = 0x830C
-0x762B = 0x8354
-0x762C = 0x831B
-0x762D = 0x831D
-0x762E = 0x8330
-0x762F = 0x833C
-0x7630 = 0x8344
-0x7631 = 0x8357
-0x7632 = 0x44BE
-0x7633 = 0x837F
-0x7634 = 0x44D4
-0x7635 = 0x44B3
-0x7636 = 0x838D
-0x7637 = 0x8394
-0x7638 = 0x8395
-0x7639 = 0x839B
-0x763A = 0x839D
-0x763B = 0x83C9
-0x763C = 0x83D0
-0x763D = 0x83D4
-0x763E = 0x83DD
-0x763F = 0x83E5
-0x7640 = 0x83F9
-0x7641 = 0x840F
-0x7642 = 0x8411
-0x7643 = 0x8415
-0x7645 = 0x8417
-0x7646 = 0x8439
-0x7647 = 0x844A
-0x7648 = 0x844F
-0x7649 = 0x8451
-0x764A = 0x8452
-0x764B = 0x8459
-0x764C = 0x845A
-0x764D = 0x845C
-0x764F = 0x8465
-0x7650 = 0x8476
-0x7651 = 0x8478
-0x7652 = 0x847C
-0x7653 = 0x8481
-0x7654 = 0x450D
-0x7655 = 0x84DC
-0x7656 = 0x8497
-0x7657 = 0x84A6
-0x7658 = 0x84BE
-0x7659 = 0x4508
-0x765A = 0x84CE
-0x765B = 0x84CF
-0x765C = 0x84D3
-0x765E = 0x84E7
-0x765F = 0x84EA
-0x7660 = 0x84EF
-0x7661 = 0x84F0
-0x7662 = 0x84F1
-0x7663 = 0x84FA
-0x7664 = 0x84FD
-0x7665 = 0x850C
-0x7666 = 0x851B
-0x7667 = 0x8524
-0x7668 = 0x8525
-0x7669 = 0x852B
-0x766A = 0x8534
-0x766B = 0x854F
-0x766C = 0x856F
-0x766D = 0x4525
-0x766E = 0x4543
-0x766F = 0x853E
-0x7670 = 0x8551
-0x7671 = 0x8553
-0x7672 = 0x855E
-0x7673 = 0x8561
-0x7674 = 0x8562
-0x7676 = 0x857B
-0x7677 = 0x857D
-0x7678 = 0x857F
-0x7679 = 0x8581
-0x767A = 0x8586
-0x767B = 0x8593
-0x767C = 0x859D
-0x767D = 0x859F
-0x7723 = 0x85B7
-0x7724 = 0x85BC
-0x7725 = 0x85C7
-0x7726 = 0x85CA
-0x7727 = 0x85D8
-0x7728 = 0x85D9
-0x7729 = 0x85DF
-0x772A = 0x85E1
-0x772B = 0x85E6
-0x772C = 0x85F6
-0x772D = 0x8600
-0x772E = 0x8611
-0x772F = 0x861E
-0x7730 = 0x8621
-0x7731 = 0x8624
-0x7732 = 0x8627
-0x7734 = 0x8639
-0x7735 = 0x863C
-0x7737 = 0x8640
-0x7738 = 0xFA20
-0x7739 = 0x8653
-0x773A = 0x8656
-0x773B = 0x866F
-0x773C = 0x8677
-0x773D = 0x867A
-0x773E = 0x8687
-0x773F = 0x8689
-0x7740 = 0x868D
-0x7741 = 0x8691
-0x7742 = 0x869C
-0x7743 = 0x869D
-0x7744 = 0x86A8
-0x7745 = 0xFA21
-0x7746 = 0x86B1
-0x7747 = 0x86B3
-0x7748 = 0x86C1
-0x7749 = 0x86C3
-0x774A = 0x86D1
-0x774B = 0x86D5
-0x774C = 0x86D7
-0x774D = 0x86E3
-0x774E = 0x86E6
-0x774F = 0x45B8
-0x7750 = 0x8705
-0x7751 = 0x8707
-0x7752 = 0x870E
-0x7753 = 0x8710
-0x7754 = 0x8713
-0x7755 = 0x8719
-0x7756 = 0x871F
-0x7757 = 0x8721
-0x7758 = 0x8723
-0x7759 = 0x8731
-0x775A = 0x873A
-0x775B = 0x873E
-0x775C = 0x8740
-0x775D = 0x8743
-0x775E = 0x8751
-0x775F = 0x8758
-0x7760 = 0x8764
-0x7761 = 0x8765
-0x7762 = 0x8772
-0x7763 = 0x877C
-0x7766 = 0x87A7
-0x7767 = 0x8789
-0x7768 = 0x878B
-0x7769 = 0x8793
-0x776A = 0x87A0
-0x776C = 0x45E5
-0x776D = 0x87BE
-0x776F = 0x87C1
-0x7770 = 0x87CE
-0x7771 = 0x87F5
-0x7772 = 0x87DF
-0x7774 = 0x87E3
-0x7775 = 0x87E5
-0x7776 = 0x87E6
-0x7777 = 0x87EA
-0x7778 = 0x87EB
-0x7779 = 0x87ED
-0x777A = 0x8801
-0x777B = 0x8803
-0x777C = 0x880B
-0x777D = 0x8813
-0x777E = 0x8828
-0x7821 = 0x882E
-0x7822 = 0x8832
-0x7823 = 0x883C
-0x7824 = 0x460F
-0x7825 = 0x884A
-0x7826 = 0x8858
-0x7827 = 0x885F
-0x7828 = 0x8864
-0x782B = 0x8869
-0x782D = 0x886F
-0x782E = 0x88A0
-0x782F = 0x88BC
-0x7830 = 0x88BD
-0x7831 = 0x88BE
-0x7832 = 0x88C0
-0x7833 = 0x88D2
-0x7835 = 0x88D1
-0x7836 = 0x88D3
-0x7837 = 0x88DB
-0x7838 = 0x88F0
-0x7839 = 0x88F1
-0x783A = 0x4641
-0x783B = 0x8901
-0x783D = 0x8937
-0x783F = 0x8942
-0x7840 = 0x8945
-0x7841 = 0x8949
-0x7843 = 0x4665
-0x7844 = 0x8962
-0x7845 = 0x8980
-0x7846 = 0x8989
-0x7847 = 0x8990
-0x7848 = 0x899F
-0x7849 = 0x89B0
-0x784A = 0x89B7
-0x784B = 0x89D6
-0x784C = 0x89D8
-0x784D = 0x89EB
-0x784E = 0x46A1
-0x784F = 0x89F1
-0x7850 = 0x89F3
-0x7851 = 0x89FD
-0x7852 = 0x89FF
-0x7853 = 0x46AF
-0x7854 = 0x8A11
-0x7855 = 0x8A14
-0x7857 = 0x8A21
-0x7858 = 0x8A35
-0x7859 = 0x8A3E
-0x785A = 0x8A45
-0x785B = 0x8A4D
-0x785C = 0x8A58
-0x785D = 0x8AAE
-0x785E = 0x8A90
-0x785F = 0x8AB7
-0x7860 = 0x8ABE
-0x7861 = 0x8AD7
-0x7862 = 0x8AFC
-0x7864 = 0x8B0A
-0x7865 = 0x8B05
-0x7866 = 0x8B0D
-0x7867 = 0x8B1C
-0x7868 = 0x8B1F
-0x7869 = 0x8B2D
-0x786A = 0x8B43
-0x786B = 0x470C
-0x786C = 0x8B51
-0x786D = 0x8B5E
-0x786E = 0x8B76
-0x786F = 0x8B7F
-0x7870 = 0x8B81
-0x7871 = 0x8B8B
-0x7872 = 0x8B94
-0x7873 = 0x8B95
-0x7874 = 0x8B9C
-0x7875 = 0x8B9E
-0x7876 = 0x8C39
-0x7878 = 0x8C3D
-0x787B = 0x8C45
-0x787C = 0x8C47
-0x787D = 0x8C4F
-0x787E = 0x8C54
-0x7921 = 0x8C57
-0x7922 = 0x8C69
-0x7923 = 0x8C6D
-0x7924 = 0x8C73
-0x7926 = 0x8C93
-0x7927 = 0x8C92
-0x7928 = 0x8C99
-0x7929 = 0x4764
-0x792A = 0x8C9B
-0x792B = 0x8CA4
-0x792C = 0x8CD6
-0x792D = 0x8CD5
-0x792E = 0x8CD9
-0x7930 = 0x8CF0
-0x7931 = 0x8CF1
-0x7933 = 0x8D09
-0x7934 = 0x8D0E
-0x7935 = 0x8D6C
-0x7936 = 0x8D84
-0x7937 = 0x8D95
-0x7938 = 0x8DA6
-0x793A = 0x8DC6
-0x793B = 0x8DC8
-0x793C = 0x8DD9
-0x793D = 0x8DEC
-0x793E = 0x8E0C
-0x793F = 0x47FD
-0x7940 = 0x8DFD
-0x7941 = 0x8E06
-0x7943 = 0x8E14
-0x7944 = 0x8E16
-0x7945 = 0x8E21
-0x7946 = 0x8E22
-0x7947 = 0x8E27
-0x7949 = 0x4816
-0x794A = 0x8E36
-0x794B = 0x8E39
-0x794C = 0x8E4B
-0x794D = 0x8E54
-0x794E = 0x8E62
-0x794F = 0x8E6C
-0x7950 = 0x8E6D
-0x7951 = 0x8E6F
-0x7952 = 0x8E98
-0x7953 = 0x8E9E
-0x7954 = 0x8EAE
-0x7955 = 0x8EB3
-0x7956 = 0x8EB5
-0x7957 = 0x8EB6
-0x7958 = 0x8EBB
-0x795A = 0x8ED1
-0x795B = 0x8ED4
-0x795C = 0x484E
-0x795D = 0x8EF9
-0x795F = 0x8F00
-0x7960 = 0x8F08
-0x7961 = 0x8F17
-0x7962 = 0x8F2B
-0x7963 = 0x8F40
-0x7964 = 0x8F4A
-0x7965 = 0x8F58
-0x7967 = 0x8FA4
-0x7968 = 0x8FB4
-0x7969 = 0xFA66
-0x796A = 0x8FB6
-0x796C = 0x8FC1
-0x796D = 0x8FC6
-0x796E = 0xFA24
-0x796F = 0x8FCA
-0x7970 = 0x8FCD
-0x7971 = 0x8FD3
-0x7972 = 0x8FD5
-0x7973 = 0x8FE0
-0x7974 = 0x8FF1
-0x7975 = 0x8FF5
-0x7976 = 0x8FFB
-0x7977 = 0x9002
-0x7978 = 0x900C
-0x7979 = 0x9037
-0x797B = 0x9043
-0x797C = 0x9044
-0x797D = 0x905D
-0x7A22 = 0x9085
-0x7A23 = 0x908C
-0x7A24 = 0x9090
-0x7A25 = 0x961D
-0x7A26 = 0x90A1
-0x7A27 = 0x48B5
-0x7A28 = 0x90B0
-0x7A29 = 0x90B6
-0x7A2A = 0x90C3
-0x7A2B = 0x90C8
-0x7A2D = 0x90DC
-0x7A2E = 0x90DF
-0x7A30 = 0x90F6
-0x7A31 = 0x90F2
-0x7A32 = 0x9100
-0x7A33 = 0x90EB
-0x7A34 = 0x90FE
-0x7A35 = 0x90FF
-0x7A36 = 0x9104
-0x7A37 = 0x9106
-0x7A38 = 0x9118
-0x7A39 = 0x911C
-0x7A3A = 0x911E
-0x7A3B = 0x9137
-0x7A3C = 0x9139
-0x7A3D = 0x913A
-0x7A3E = 0x9146
-0x7A3F = 0x9147
-0x7A40 = 0x9157
-0x7A41 = 0x9159
-0x7A42 = 0x9161
-0x7A43 = 0x9164
-0x7A44 = 0x9174
-0x7A45 = 0x9179
-0x7A46 = 0x9185
-0x7A47 = 0x918E
-0x7A48 = 0x91A8
-0x7A49 = 0x91AE
-0x7A4A = 0x91B3
-0x7A4B = 0x91B6
-0x7A4C = 0x91C3
-0x7A4D = 0x91C4
-0x7A4E = 0x91DA
-0x7A51 = 0x91EC
-0x7A52 = 0x91EE
-0x7A53 = 0x9201
-0x7A54 = 0x920A
-0x7A55 = 0x9216
-0x7A56 = 0x9217
-0x7A58 = 0x9233
-0x7A59 = 0x9242
-0x7A5A = 0x9247
-0x7A5B = 0x924A
-0x7A5C = 0x924E
-0x7A5D = 0x9251
-0x7A5E = 0x9256
-0x7A5F = 0x9259
-0x7A60 = 0x9260
-0x7A61 = 0x9261
-0x7A62 = 0x9265
-0x7A63 = 0x9267
-0x7A64 = 0x9268
-0x7A67 = 0x927C
-0x7A68 = 0x927D
-0x7A69 = 0x927F
-0x7A6A = 0x9289
-0x7A6B = 0x928D
-0x7A6C = 0x9297
-0x7A6D = 0x9299
-0x7A6E = 0x929F
-0x7A6F = 0x92A7
-0x7A70 = 0x92AB
-0x7A73 = 0x92B2
-0x7A74 = 0x92BF
-0x7A75 = 0x92C0
-0x7A76 = 0x92C6
-0x7A77 = 0x92CE
-0x7A78 = 0x92D0
-0x7A79 = 0x92D7
-0x7A7A = 0x92D9
-0x7A7B = 0x92E5
-0x7A7C = 0x92E7
-0x7A7D = 0x9311
-0x7B22 = 0x92F7
-0x7B23 = 0x92F9
-0x7B24 = 0x92FB
-0x7B25 = 0x9302
-0x7B26 = 0x930D
-0x7B27 = 0x9315
-0x7B28 = 0x931D
-0x7B29 = 0x931E
-0x7B2A = 0x9327
-0x7B2B = 0x9329
-0x7B2E = 0x9347
-0x7B2F = 0x9351
-0x7B30 = 0x9357
-0x7B31 = 0x935A
-0x7B32 = 0x936B
-0x7B33 = 0x9371
-0x7B34 = 0x9373
-0x7B35 = 0x93A1
-0x7B38 = 0x9388
-0x7B39 = 0x938B
-0x7B3A = 0x938F
-0x7B3B = 0x939E
-0x7B3C = 0x93F5
-0x7B3F = 0x93F1
-0x7B40 = 0x93C1
-0x7B41 = 0x93C7
-0x7B42 = 0x93DC
-0x7B43 = 0x93E2
-0x7B44 = 0x93E7
-0x7B45 = 0x9409
-0x7B46 = 0x940F
-0x7B47 = 0x9416
-0x7B48 = 0x9417
-0x7B49 = 0x93FB
-0x7B4A = 0x9432
-0x7B4B = 0x9434
-0x7B4C = 0x943B
-0x7B4D = 0x9445
-0x7B50 = 0x946D
-0x7B51 = 0x946F
-0x7B52 = 0x9578
-0x7B53 = 0x9579
-0x7B54 = 0x9586
-0x7B55 = 0x958C
-0x7B56 = 0x958D
-0x7B58 = 0x95AB
-0x7B59 = 0x95B4
-0x7B5B = 0x95C8
-0x7B5E = 0x962C
-0x7B5F = 0x9633
-0x7B60 = 0x9634
-0x7B62 = 0x963C
-0x7B63 = 0x9641
-0x7B64 = 0x9661
-0x7B66 = 0x9682
-0x7B68 = 0x969A
-0x7B6A = 0x49E7
-0x7B6B = 0x96A9
-0x7B6C = 0x96AF
-0x7B6D = 0x96B3
-0x7B6E = 0x96BA
-0x7B6F = 0x96BD
-0x7B70 = 0x49FA
-0x7B72 = 0x96D8
-0x7B73 = 0x96DA
-0x7B74 = 0x96DD
-0x7B75 = 0x4A04
-0x7B76 = 0x9714
-0x7B77 = 0x9723
-0x7B78 = 0x4A29
-0x7B79 = 0x9736
-0x7B7A = 0x9741
-0x7B7B = 0x9747
-0x7B7C = 0x9755
-0x7B7D = 0x9757
-0x7B7E = 0x975B
-0x7C21 = 0x976A
-0x7C24 = 0x9796
-0x7C25 = 0x979A
-0x7C26 = 0x979E
-0x7C27 = 0x97A2
-0x7C28 = 0x97B1
-0x7C29 = 0x97B2
-0x7C2A = 0x97BE
-0x7C2B = 0x97CC
-0x7C2C = 0x97D1
-0x7C2D = 0x97D4
-0x7C2E = 0x97D8
-0x7C2F = 0x97D9
-0x7C30 = 0x97E1
-0x7C31 = 0x97F1
-0x7C32 = 0x9804
-0x7C33 = 0x980D
-0x7C34 = 0x980E
-0x7C35 = 0x9814
-0x7C36 = 0x9816
-0x7C37 = 0x4ABC
-0x7C39 = 0x9823
-0x7C3A = 0x9832
-0x7C3B = 0x9833
-0x7C3C = 0x9825
-0x7C3D = 0x9847
-0x7C3E = 0x9866
-0x7C3F = 0x98AB
-0x7C40 = 0x98AD
-0x7C41 = 0x98B0
-0x7C43 = 0x98B7
-0x7C44 = 0x98B8
-0x7C45 = 0x98BB
-0x7C46 = 0x98BC
-0x7C47 = 0x98BF
-0x7C48 = 0x98C2
-0x7C49 = 0x98C7
-0x7C4A = 0x98CB
-0x7C4B = 0x98E0
-0x7C4D = 0x98E1
-0x7C4E = 0x98E3
-0x7C4F = 0x98E5
-0x7C50 = 0x98EA
-0x7C51 = 0x98F0
-0x7C52 = 0x98F1
-0x7C53 = 0x98F3
-0x7C54 = 0x9908
-0x7C55 = 0x4B3B
-0x7C57 = 0x9916
-0x7C58 = 0x9917
-0x7C5A = 0x991A
-0x7C5B = 0x991B
-0x7C5C = 0x991C
-0x7C5E = 0x9931
-0x7C5F = 0x9932
-0x7C60 = 0x9933
-0x7C61 = 0x993A
-0x7C62 = 0x993B
-0x7C63 = 0x993C
-0x7C64 = 0x9940
-0x7C65 = 0x9941
-0x7C66 = 0x9946
-0x7C67 = 0x994D
-0x7C68 = 0x994E
-0x7C69 = 0x995C
-0x7C6A = 0x995F
-0x7C6B = 0x9960
-0x7C6C = 0x99A3
-0x7C6D = 0x99A6
-0x7C6E = 0x99B9
-0x7C6F = 0x99BD
-0x7C70 = 0x99BF
-0x7C71 = 0x99C3
-0x7C72 = 0x99C9
-0x7C73 = 0x99D4
-0x7C74 = 0x99D9
-0x7C75 = 0x99DE
-0x7C77 = 0x99F0
-0x7C78 = 0x99F9
-0x7C79 = 0x99FC
-0x7C7A = 0x9A0A
-0x7C7B = 0x9A11
-0x7C7C = 0x9A16
-0x7C7D = 0x9A1A
-0x7C7E = 0x9A20
-0x7D21 = 0x9A31
-0x7D22 = 0x9A36
-0x7D23 = 0x9A44
-0x7D24 = 0x9A4C
-0x7D25 = 0x9A58
-0x7D26 = 0x4BC2
-0x7D27 = 0x9AAF
-0x7D28 = 0x4BCA
-0x7D29 = 0x9AB7
-0x7D2A = 0x4BD2
-0x7D2B = 0x9AB9
-0x7D2D = 0x9AC6
-0x7D2E = 0x9AD0
-0x7D2F = 0x9AD2
-0x7D30 = 0x9AD5
-0x7D31 = 0x4BE8
-0x7D32 = 0x9ADC
-0x7D33 = 0x9AE0
-0x7D34 = 0x9AE5
-0x7D35 = 0x9AE9
-0x7D36 = 0x9B03
-0x7D37 = 0x9B0C
-0x7D38 = 0x9B10
-0x7D39 = 0x9B12
-0x7D3A = 0x9B16
-0x7D3B = 0x9B1C # 0x9B1D
-0x7D3C = 0x9B2B
-0x7D3D = 0x9B33
-0x7D3E = 0x9B3D
-0x7D3F = 0x4C20
-0x7D40 = 0x9B4B
-0x7D41 = 0x9B63
-0x7D42 = 0x9B65
-0x7D43 = 0x9B6B
-0x7D44 = 0x9B6C
-0x7D45 = 0x9B73
-0x7D46 = 0x9B76
-0x7D47 = 0x9B77
-0x7D48 = 0x9BA6
-0x7D49 = 0x9BAC
-0x7D4A = 0x9BB1
-0x7D4D = 0x9BB2
-0x7D4E = 0x9BB8
-0x7D4F = 0x9BBE
-0x7D50 = 0x9BC7
-0x7D51 = 0x9BF3
-0x7D52 = 0x9BD8
-0x7D53 = 0x9BDD
-0x7D54 = 0x9BE7
-0x7D55 = 0x9BEA
-0x7D56 = 0x9BEB
-0x7D57 = 0x9BEF
-0x7D58 = 0x9BEE
-0x7D5A = 0x9BFA
-0x7D5C = 0x9BF7
-0x7D5E = 0x9C16
-0x7D5F = 0x9C18
-0x7D60 = 0x9C19
-0x7D61 = 0x9C1A
-0x7D62 = 0x9C1D
-0x7D63 = 0x9C22
-0x7D64 = 0x9C27
-0x7D65 = 0x9C29
-0x7D66 = 0x9C2A
-0x7D68 = 0x9C31
-0x7D69 = 0x9C36
-0x7D6A = 0x9C37
-0x7D6B = 0x9C45
-0x7D6C = 0x9C5C
-0x7D6E = 0x9C49
-0x7D6F = 0x9C4A
-0x7D71 = 0x9C54
-0x7D72 = 0x9C58
-0x7D73 = 0x9C5B
-0x7D74 = 0x9C5D
-0x7D75 = 0x9C5F
-0x7D76 = 0x9C69
-0x7D77 = 0x9C6A
-0x7D78 = 0x9C6B
-0x7D79 = 0x9C6D
-0x7D7A = 0x9C6E
-0x7D7B = 0x9C70
-0x7D7C = 0x9C72
-0x7D7D = 0x9C75
-0x7D7E = 0x9C7A
-0x7E21 = 0x9CE6
-0x7E22 = 0x9CF2
-0x7E23 = 0x9D0B
-0x7E24 = 0x9D02
-0x7E26 = 0x9D11
-0x7E27 = 0x9D17
-0x7E28 = 0x9D18
-0x7E2A = 0x4CC4
-0x7E2C = 0x9D32
-0x7E2D = 0x4CD1
-0x7E2E = 0x9D42
-0x7E2F = 0x9D4A
-0x7E30 = 0x9D5F
-0x7E31 = 0x9D62
-0x7E33 = 0x9D69
-0x7E34 = 0x9D6B
-0x7E36 = 0x9D73
-0x7E37 = 0x9D76
-0x7E38 = 0x9D77
-0x7E39 = 0x9D7E
-0x7E3A = 0x9D84
-0x7E3B = 0x9D8D
-0x7E3C = 0x9D99
-0x7E3D = 0x9DA1
-0x7E3E = 0x9DBF
-0x7E3F = 0x9DB5
-0x7E40 = 0x9DB9
-0x7E41 = 0x9DBD
-0x7E42 = 0x9DC3
-0x7E43 = 0x9DC7
-0x7E44 = 0x9DC9
-0x7E45 = 0x9DD6
-0x7E46 = 0x9DDA
-0x7E47 = 0x9DDF
-0x7E48 = 0x9DE0
-0x7E49 = 0x9DE3
-0x7E4A = 0x9DF4
-0x7E4B = 0x4D07
-0x7E4C = 0x9E0A
-0x7E4D = 0x9E02
-0x7E4E = 0x9E0D
-0x7E4F = 0x9E19
-0x7E50 = 0x9E1C
-0x7E51 = 0x9E1D
-0x7E52 = 0x9E7B
-0x7E54 = 0x9E80
-0x7E55 = 0x9E85
-0x7E56 = 0x9E9B
-0x7E57 = 0x9EA8
-0x7E59 = 0x9EBD
-0x7E5B = 0x9EDF
-0x7E5C = 0x9EE7
-0x7E5D = 0x9EEE
-0x7E5E = 0x9EFF
-0x7E5F = 0x9F02
-0x7E60 = 0x4D77
-0x7E61 = 0x9F03
-0x7E62 = 0x9F17
-0x7E63 = 0x9F19
-0x7E64 = 0x9F2F
-0x7E65 = 0x9F37
-0x7E66 = 0x9F3A
-0x7E67 = 0x9F3D
-0x7E68 = 0x9F41
-0x7E69 = 0x9F45
-0x7E6A = 0x9F46
-0x7E6B = 0x9F53
-0x7E6C = 0x9F55
-0x7E6D = 0x9F58
-0x7E6F = 0x9F5D
-0x7E71 = 0x9F69
-0x7E73 = 0x9F6D
-0x7E74 = 0x9F70
-0x7E75 = 0x9F75
-END_MAP
diff --git a/enc/trans/JIS/JISX0213-2%UCS@SIP.src b/enc/trans/JIS/JISX0213-2%UCS@SIP.src
deleted file mode 100644
index 15f8d317e6..0000000000
--- a/enc/trans/JIS/JISX0213-2%UCS@SIP.src
+++ /dev/null
@@ -1,311 +0,0 @@
-# $NetBSD: JISX0213-2%UCS@SIP.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "JISX0213-2/UCS:SIP"
-SRC_ZONE 0x21-0x7E / 0x21-0x7E / 8
-OOB_MODE INVALID
-DST_INVALID 0xFFFE
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## JIS X 0213:2004 vs Unicode mapping table
-##
-## Date: 22 May 2006
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## Copyright (C) 2006 Project X0213, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## 3-XXXX JIS X 0213:2004 plane 1 (GL encoding)
-## 4-XXXX JIS X 0213:2000 plane 2 (GL encoding)
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-## JIS Unicode Name Note
-0x2121 = 0x0089
-0x212B = 0x00A2
-0x212E = 0x00A4
-0x2136 = 0x01A2
-0x2146 = 0x0213
-0x2170 = 0x032B
-0x2177 = 0x0381
-0x2179 = 0x0371
-0x2322 = 0x03F9
-0x2325 = 0x044A
-0x2327 = 0x0509
-0x2331 = 0x05D6
-0x2332 = 0x0628
-0x2338 = 0x074F
-0x233F = 0x0807
-0x2341 = 0x083A
-0x234A = 0x08B9
-0x2352 = 0x097C
-0x2353 = 0x099D
-0x2359 = 0x0AD3
-0x235C = 0x0B1D
-0x2377 = 0x0D45
-0x242A = 0x0DE1
-0x2431 = 0x0E95
-0x2432 = 0x0E6D
-0x243A = 0x0E64
-0x243D = 0x0F5F
-0x2459 = 0x1201
-0x245C = 0x1255
-0x245E = 0x127B
-0x2463 = 0x1274
-0x246A = 0x12E4
-0x246B = 0x12D7
-0x2472 = 0x12FD
-0x2474 = 0x1336
-0x2475 = 0x1344
-0x2525 = 0x13C4
-0x2532 = 0x146D
-0x253E = 0x15D7
-0x2544 = 0x6C29
-0x2547 = 0x1647
-0x2555 = 0x1706
-0x2556 = 0x1742
-0x257E = 0x19C3
-0x2830 = 0x1C56
-0x2837 = 0x1D2D
-0x2838 = 0x1D45
-0x283A = 0x1D78
-0x283B = 0x1D62
-0x283F = 0x1DA1
-0x2840 = 0x1D9C
-0x2845 = 0x1D92
-0x2848 = 0x1DB7
-0x284A = 0x1DE0
-0x284B = 0x1E33
-0x285B = 0x1F1E
-0x2866 = 0x1F76
-0x286C = 0x1FFA
-0x2C22 = 0x217B
-0x2C2B = 0x231E
-0x2C30 = 0x23AD
-0x2C50 = 0x26F3
-0x2C65 = 0x285B
-0x2C6D = 0x28AB
-0x2C72 = 0x298F
-0x2D24 = 0x2AB8
-0x2D29 = 0x2B4F
-0x2D2A = 0x2B50
-0x2D32 = 0x2B46
-0x2D34 = 0x2C1D
-0x2D35 = 0x2BA6
-0x2D39 = 0x2C24
-0x2D56 = 0x2DE1
-0x2D7D = 0x31C3
-0x2E23 = 0x31F5
-0x2E24 = 0x31B6
-0x2E3A = 0x3372
-0x2E3C = 0x33D3
-0x2E3D = 0x33D2
-0x2E42 = 0x33D0
-0x2E43 = 0x33E4
-0x2E44 = 0x33D5
-0x2E47 = 0x33DA
-0x2E49 = 0x33DF
-0x2E55 = 0x344A
-0x2E56 = 0x3451
-0x2E57 = 0x344B
-0x2E5B = 0x3465
-0x2E77 = 0x34E4
-0x2E78 = 0x355A
-0x2F2A = 0x3594
-0x2F3F = 0x3639
-0x2F40 = 0x3647
-0x2F42 = 0x3638
-0x2F43 = 0x363A
-0x2F4E = 0x371C
-0x2F59 = 0x370C
-0x2F61 = 0x3764
-0x2F69 = 0x37FF
-0x2F6A = 0x37E7
-0x2F70 = 0x3824
-0x2F75 = 0x383D
-0x6E23 = 0x3A98
-0x6E34 = 0x3C7F
-0x6E49 = 0x3D00
-0x6E5C = 0x3D40
-0x6E5E = 0x3DFA
-0x6E5F = 0x3DF9
-0x6E60 = 0x3DD3
-0x6F32 = 0x3F7E
-0x6F47 = 0x4096
-0x6F4D = 0x4103
-0x6F61 = 0x41C6
-0x6F64 = 0x41FE
-0x7022 = 0x43BC
-0x7033 = 0x4629
-0x7039 = 0x46A5
-0x7053 = 0x4896
-0x707B = 0x4A4D
-0x712E = 0x4B56
-0x7130 = 0x4B6F
-0x7135 = 0x4C16
-0x7144 = 0x4D14
-0x715D = 0x4E0E
-0x7161 = 0x4E37
-0x7166 = 0x4E6A
-0x7169 = 0x4E8B
-0x7175 = 0x504A
-0x7177 = 0x5055
-0x717A = 0x5122
-0x7221 = 0x51A9
-0x7223 = 0x51E5
-0x7224 = 0x51CD
-0x7228 = 0x521E
-0x722C = 0x524C
-0x723D = 0x542E
-0x7248 = 0x54D9
-0x725B = 0x55A7
-0x7275 = 0x57A9
-0x7276 = 0x57B4
-0x7332 = 0x59D4
-0x733D = 0x5AE4
-0x733E = 0x5AE3
-0x7340 = 0x5AF1
-0x7352 = 0x5BB2
-0x735D = 0x5C4B
-0x735E = 0x5C64
-0x7373 = 0x5E2E
-0x7374 = 0x5E56
-0x7375 = 0x5E65
-0x7377 = 0x5E62
-0x737B = 0x5ED8
-0x737D = 0x5EC2
-0x7422 = 0x5EE8
-0x7424 = 0x5F23
-0x7427 = 0x5F5C
-0x742E = 0x5FE0
-0x742F = 0x5FD4
-0x7434 = 0x600C
-0x7435 = 0x5FFB
-0x743D = 0x6017
-0x7442 = 0x6060
-0x744F = 0x60ED
-0x7469 = 0x6270
-0x746B = 0x6286
-0x7472 = 0x634C
-0x7475 = 0x3D0E
-0x7479 = 0x6402
-0x7535 = 0x667E
-0x753A = 0x66B0
-0x7546 = 0x671D
-0x7556 = 0x68DD
-0x7558 = 0x68EA
-0x755A = 0x6951
-0x755D = 0x696F
-0x755F = 0x69DD
-0x7563 = 0x6A1E
-0x756A = 0x6A58
-0x7570 = 0x6A8C
-0x7573 = 0x6AB7
-0x7644 = 0x6C73
-0x764E = 0x6CDD
-0x765D = 0x6E65
-0x7675 = 0x6F94
-0x767E = 0x6FF8
-0x7721 = 0x6FF6
-0x7722 = 0x6FF7
-0x7733 = 0x710D
-0x7736 = 0x7139
-0x7764 = 0x73DB
-0x7765 = 0x73DA
-0x776B = 0x73FE
-0x776E = 0x7410
-0x7773 = 0x7449
-0x7829 = 0x7615
-0x782A = 0x7614
-0x782C = 0x7631
-0x7834 = 0x7693
-0x783C = 0x770E
-0x783E = 0x7723
-0x7842 = 0x7752
-0x7856 = 0x7985
-0x7863 = 0x7A84
-0x7877 = 0x7BB3
-0x7879 = 0x7BBE
-0x787A = 0x7BC7
-0x7925 = 0x7CB8
-0x792F = 0x7DA0
-0x7932 = 0x7E10
-0x7939 = 0x7FB7
-0x7942 = 0x808A
-0x7948 = 0x80BB
-0x7959 = 0x8282
-0x795E = 0x82F3
-0x7966 = 0x840C
-0x796B = 0x8455
-0x797A = 0x856B
-0x797E = 0x85C8
-0x7A21 = 0x85C9
-0x7A2C = 0x86D7
-0x7A2F = 0x86FA
-0x7A4F = 0x8949
-0x7A50 = 0x8946
-0x7A57 = 0x896B
-0x7A65 = 0x8987
-0x7A66 = 0x8988
-0x7A71 = 0x89BA
-0x7A72 = 0x89BB
-0x7A7E = 0x8A1E
-0x7B21 = 0x8A29
-0x7B2C = 0x8A71
-0x7B2D = 0x8A43
-0x7B36 = 0x8A99
-0x7B37 = 0x8ACD
-0x7B3D = 0x8AE4
-0x7B3E = 0x8ADD
-0x7B4E = 0x8BC1
-0x7B4F = 0x8BEF
-0x7B57 = 0x8D10
-0x7B5A = 0x8D71
-0x7B5C = 0x8DFB
-0x7B5D = 0x8E1F
-0x7B61 = 0x8E36
-0x7B65 = 0x8E89
-0x7B67 = 0x8EEB
-0x7B69 = 0x8F32
-0x7B71 = 0x8FF8
-0x7C22 = 0x92A0
-0x7C23 = 0x92B1
-0x7C38 = 0x9490
-0x7C42 = 0x95CF
-0x7C4C = 0x967F
-0x7C56 = 0x96F0
-0x7C59 = 0x9719
-0x7C5D = 0x9750
-0x7C76 = 0x98C6
-0x7D2C = 0x9A72
-0x7D4B = 0x9DDB
-0x7D4C = 0x9E3D
-0x7D59 = 0x9E15
-0x7D5B = 0x9E8A
-0x7D5D = 0x9E49
-0x7D67 = 0x9EC4
-0x7D6D = 0x9EE9
-0x7D70 = 0x9EDB
-0x7E25 = 0x9FCE
-0x7E29 = 0xA02F
-0x7E2B = 0xA01A
-0x7E32 = 0xA0F9
-0x7E35 = 0xA082
-0x7E53 = 0x2218
-0x7E58 = 0xA38C
-0x7E5A = 0xA437
-0x7E6E = 0xA5F1
-0x7E70 = 0xA602
-0x7E72 = 0xA61A
-0x7E76 = 0xA6B2
-END_MAP
diff --git a/enc/trans/JIS/UCS@BMP%JISX0213-1.src b/enc/trans/JIS/UCS@BMP%JISX0213-1.src
deleted file mode 100644
index 953e361738..0000000000
--- a/enc/trans/JIS/UCS@BMP%JISX0213-1.src
+++ /dev/null
@@ -1,1922 +0,0 @@
-# $NetBSD: UCS@BMP%JISX0213-1.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS:BMP/JISX0213-1"
-SRC_ZONE 0x007E - 0xFF60
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
-##
-## Date: 12 Feb 2005 10:15:00 GMT
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-0x00A0 = 0x2922
-0x00A1 = 0x2923
-0x00A4 = 0x2924
-0x00A6 = 0x2925
-0x00A9 = 0x2926
-0x00AA = 0x2927
-0x00AB = 0x2928
-0x00AD = 0x2929
-0x00AE = 0x292A
-0x00AF = 0x292B
-0x00B2 = 0x292C
-0x00B3 = 0x292D
-0x00B7 = 0x292E
-0x00B8 = 0x292F
-0x00B9 = 0x2930
-0x00BA = 0x2931
-0x00BB = 0x2932
-0x00BC = 0x2933
-0x00BD = 0x2934
-0x00BE = 0x2935
-0x00BF = 0x2936
-0x00C0 = 0x2937
-0x00C1 = 0x2938
-0x00C2 = 0x2939
-0x00C3 = 0x293A
-0x00C4 = 0x293B
-0x00C5 = 0x293C
-0x00C6 = 0x293D
-0x00C7 = 0x293E
-0x00C8 = 0x293F
-0x00C9 = 0x2940
-0x00CA = 0x2941
-0x00CB = 0x2942
-0x00CC = 0x2943
-0x00CD = 0x2944
-0x00CE = 0x2945
-0x00CF = 0x2946
-0x00D0 = 0x2947
-0x00D1 = 0x2948
-0x00D2 = 0x2949
-0x00D3 = 0x294A
-0x00D4 = 0x294B
-0x00D5 = 0x294C
-0x00D6 = 0x294D
-0x00D8 = 0x294E
-0x00D9 = 0x294F
-0x00DA = 0x2950
-0x00DB = 0x2951
-0x00DC = 0x2952
-0x00DD = 0x2953
-0x00DE = 0x2954
-0x00DF = 0x2955
-0x00E0 = 0x2956
-0x00E1 = 0x2957
-0x00E2 = 0x2958
-0x00E3 = 0x2959
-0x00E4 = 0x295A
-0x00E5 = 0x295B
-#0x00E6 + 0x0300 = 0x2B44
-0x00E6 = 0x295C
-0x00E7 = 0x295D
-0x00E8 = 0x295E
-0x00E9 = 0x295F
-0x00EA = 0x2960
-0x00EB = 0x2961
-0x00EC = 0x2962
-0x00ED = 0x2963
-0x00EE = 0x2964
-0x00EF = 0x2965
-0x00F0 = 0x2966
-0x00F1 = 0x2967
-0x00F2 = 0x2968
-0x00F3 = 0x2969
-0x00F4 = 0x296A
-0x00F5 = 0x296B
-0x00F6 = 0x296C
-0x00F8 = 0x296D
-0x00F9 = 0x296E
-0x00FA = 0x296F
-0x00FB = 0x2970
-0x00FC = 0x2971
-0x00FD = 0x2972
-0x00FE = 0x2973
-0x00FF = 0x2974
-0x0100 = 0x2975
-0x0101 = 0x297A
-0x0102 = 0x2A3A
-0x0103 = 0x2A49
-0x0104 = 0x2A21
-0x0105 = 0x2A2C
-0x0106 = 0x2A3C
-0x0107 = 0x2A4B
-0x0108 = 0x2A59
-0x0109 = 0x2A5F
-0x010C = 0x2A3D
-0x010D = 0x2A4C
-0x010E = 0x2A40
-0x010F = 0x2A4F
-0x0111 = 0x2A50
-0x0112 = 0x2978
-0x0113 = 0x297D
-0x0118 = 0x2A3E
-0x0119 = 0x2A4D
-0x011A = 0x2A3F
-0x011B = 0x2A4E
-0x011C = 0x2A5A
-0x011D = 0x2A60
-0x0124 = 0x2A5B
-0x0125 = 0x2A61
-0x0127 = 0x2A7D
-0x012A = 0x2976
-0x012B = 0x297B
-0x0134 = 0x2A5C
-0x0135 = 0x2A62
-0x0139 = 0x2A3B
-0x013A = 0x2A4A
-0x013D = 0x2A24
-0x013E = 0x2A2F
-0x0141 = 0x2A23
-0x0142 = 0x2A2E
-0x0143 = 0x2A41
-0x0144 = 0x2A51
-0x0147 = 0x2A42
-0x0148 = 0x2A52
-0x014B = 0x2A7A
-0x014C = 0x2979
-0x014D = 0x297E
-0x0150 = 0x2A43
-0x0151 = 0x2A53
-0x0152 = 0x2B2B
-0x0153 = 0x2B2A
-0x0154 = 0x2A39
-0x0155 = 0x2A48
-0x0158 = 0x2A44
-0x0159 = 0x2A54
-0x015A = 0x2A25
-0x015B = 0x2A30
-0x015C = 0x2A5D
-0x015D = 0x2A63
-0x015E = 0x2A27
-0x015F = 0x2A33
-0x0160 = 0x2A26
-0x0161 = 0x2A32
-0x0162 = 0x2A47
-0x0163 = 0x2A57
-0x0164 = 0x2A28
-0x0165 = 0x2A34
-0x016A = 0x2977
-0x016B = 0x297C
-0x016C = 0x2A5E
-0x016D = 0x2A64
-0x016E = 0x2A45
-0x016F = 0x2A55
-0x0170 = 0x2A46
-0x0171 = 0x2A56
-0x0179 = 0x2A29
-0x017A = 0x2A35
-0x017B = 0x2A2B
-0x017C = 0x2A38
-0x017D = 0x2A2A
-0x017E = 0x2A37
-0x0193 = 0x2B29
-0x01C2 = 0x2B24
-0x01CD = 0x286F
-0x01CE = 0x2870
-0x01D0 = 0x2871
-0x01D1 = 0x2876
-0x01D2 = 0x2877
-0x01D4 = 0x2878
-0x01D6 = 0x2879
-0x01D8 = 0x287A
-0x01DA = 0x287B
-0x01DC = 0x287C
-0x01F8 = 0x2874
-0x01F9 = 0x2875
-0x01FD = 0x2B45
-0x0250 = 0x2B33
-0x0251 = 0x2B39
-0x0252 = 0x2B3A
-0x0253 = 0x2B25
-#0x0254 + 0x0300 = 0x2B48
-#0x0254 + 0x0301 = 0x2B49
-0x0254 = 0x2B38
-0x0255 = 0x2B3F
-0x0256 = 0x2A6E
-0x0257 = 0x2B26
-0x0258 = 0x2B2E
-#0x0259 + 0x0300 = 0x2B4C
-#0x0259 + 0x0301 = 0x2B4D
-0x0259 = 0x2B30
-#0x025A + 0x0300 = 0x2B4E
-#0x025A + 0x0301 = 0x2B4F
-0x025A = 0x2B43
-0x025C = 0x2B31
-0x025E = 0x2B32
-0x025F = 0x2A75
-0x0260 = 0x2B28
-0x0261 = 0x2A79
-0x0264 = 0x2B36
-0x0265 = 0x2B3C
-0x0266 = 0x2B22
-0x0267 = 0x2B42
-0x0268 = 0x2B2C
-0x026C = 0x2A6A
-0x026D = 0x2A74
-0x026E = 0x2A6B
-0x026F = 0x2B34
-0x0270 = 0x2A7B
-0x0271 = 0x2A65
-0x0272 = 0x2A76
-0x0273 = 0x2A6F
-0x0275 = 0x2B2F
-0x0279 = 0x2A6C
-0x027A = 0x2B41
-0x027B = 0x2A73
-0x027D = 0x2A70
-0x027E = 0x2A67
-0x0281 = 0x2A7C
-0x0282 = 0x2A71
-0x0283 = 0x2A68
-0x0284 = 0x2B27
-0x0288 = 0x2A6D
-0x0289 = 0x2B2D
-0x028A = 0x2B35
-0x028B = 0x2A66
-#0x028C + 0x0300 = 0x2B4A
-#0x028C + 0x0301 = 0x2B4B
-0x028C = 0x2B37
-0x028D = 0x2B3B
-0x028E = 0x2A78
-0x0290 = 0x2A72
-0x0291 = 0x2B40
-0x0292 = 0x2A69
-0x0294 = 0x2B21
-0x0295 = 0x2A7E
-0x0298 = 0x2B23
-0x029D = 0x2A77
-0x02A1 = 0x2B3E
-0x02A2 = 0x2B3D
-0x02C7 = 0x2A31
-0x02C8 = 0x2B53
-0x02CC = 0x2B54
-0x02D0 = 0x2B55
-0x02D1 = 0x2B56
-0x02D8 = 0x2A22
-0x02D9 = 0x2A58
-0x02DB = 0x2A2D
-0x02DD = 0x2A36
-0x02DE = 0x2B71
-#0x02E5 + 0x02E9 = 0x2B66
-0x02E5 = 0x2B60
-0x02E6 = 0x2B61
-0x02E7 = 0x2B62
-0x02E8 = 0x2B63
-#0x02E9 + 0x02E5 = 0x2B65
-0x02E9 = 0x2B64
-0x0300 = 0x2B5C
-0x0301 = 0x2B5A
-0x0302 = 0x2B5F
-0x0303 = 0x2B7D
-0x0304 = 0x2B5B
-0x0306 = 0x2B57
-0x0308 = 0x2B6D
-0x030B = 0x2B59
-0x030C = 0x2B5E
-0x030F = 0x2B5D
-0x0318 = 0x2B78
-0x0319 = 0x2B79
-0x031A = 0x2B7E
-0x031C = 0x2B6A
-0x031D = 0x2B76
-0x031E = 0x2B77
-0x031F = 0x2B6B
-0x0320 = 0x2B6C
-0x0324 = 0x2B72
-0x0325 = 0x2B67
-0x0329 = 0x2B6F
-0x032A = 0x2B7A
-0x032C = 0x2B68
-0x032F = 0x2B70
-0x0330 = 0x2B73
-0x0334 = 0x2B75
-0x0339 = 0x2B69
-0x033A = 0x2B7B
-0x033B = 0x2B7C
-0x033C = 0x2B74
-0x033D = 0x2B6E
-0x0361 = 0x2B52
-0x03C2 = 0x2659
-0x1E3E = 0x2872
-0x1E3F = 0x2873
-0x1F70 = 0x2B46
-0x1F71 = 0x2B47
-0x1F72 = 0x2B50
-0x1F73 = 0x2B51
-0x2013 = 0x237C
-0x2022 = 0x2340
-0x203C = 0x286B
-0x203F = 0x2B58
-0x2042 = 0x2C7E
-0x2047 = 0x286C
-0x2048 = 0x286D
-0x2049 = 0x286E
-0x2051 = 0x2C7D
-0x20AC = 0x2921
-0x210F = 0x235D
-0x2113 = 0x235F
-0x2116 = 0x2D62
-0x2121 = 0x2D64
-0x2127 = 0x2360
-0x2135 = 0x235C
-0x2153 = 0x2778
-0x2154 = 0x2779
-0x2155 = 0x277A
-0x2160 = 0x2D35
-0x2161 = 0x2D36
-0x2162 = 0x2D37
-0x2163 = 0x2D38
-0x2164 = 0x2D39
-0x2165 = 0x2D3A
-0x2166 = 0x2D3B
-0x2167 = 0x2D3C
-0x2168 = 0x2D3D
-0x2169 = 0x2D3E
-0x216A = 0x2D3F
-0x216B = 0x2D57
-0x2170 = 0x2C35
-0x2171 = 0x2C36
-0x2172 = 0x2C37
-0x2173 = 0x2C38
-0x2174 = 0x2C39
-0x2175 = 0x2C3A
-0x2176 = 0x2C3B
-0x2177 = 0x2C3C
-0x2178 = 0x2C3D
-0x2179 = 0x2C3E
-0x217A = 0x2C3F
-0x217B = 0x2C40
-0x2194 = 0x2271
-0x2196 = 0x2327
-0x2197 = 0x2325
-0x2198 = 0x2326
-0x2199 = 0x2328
-0x21C4 = 0x2329
-0x21E6 = 0x232B
-0x21E7 = 0x232C
-0x21E8 = 0x232A
-0x21E9 = 0x232D
-0x2205 = 0x2247
-0x2209 = 0x2246
-0x2213 = 0x235B
-0x221F = 0x2D78
-0x2225 = 0x2254
-0x2226 = 0x2255
-0x222E = 0x2D73
-0x2243 = 0x226C
-0x2245 = 0x226D
-0x2248 = 0x226E
-0x2262 = 0x226B
-0x2276 = 0x226F
-0x2277 = 0x2270
-0x2284 = 0x2242
-0x2285 = 0x2243
-0x228A = 0x2244
-0x228B = 0x2245
-0x2295 = 0x2251
-0x2296 = 0x2252
-0x2297 = 0x2253
-0x22BF = 0x2D79
-0x22DA = 0x2776
-0x22DB = 0x2777
-0x2305 = 0x2248
-0x2306 = 0x2249
-0x2318 = 0x277C
-0x23BE = 0x2742
-0x23BF = 0x2743
-0x23C0 = 0x2744
-0x23C1 = 0x2745
-0x23C2 = 0x2746
-0x23C3 = 0x2747
-0x23C4 = 0x2748
-0x23C5 = 0x2749
-0x23C6 = 0x274A
-0x23C7 = 0x274B
-0x23C8 = 0x274C
-0x23C9 = 0x274D
-0x23CA = 0x274E
-0x23CB = 0x274F
-0x23CC = 0x2750
-0x23CE = 0x277E
-0x2423 = 0x277D
-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
-0x24D0 = 0x2C41
-0x24D1 = 0x2C42
-0x24D2 = 0x2C43
-0x24D3 = 0x2C44
-0x24D4 = 0x2C45
-0x24D5 = 0x2C46
-0x24D6 = 0x2C47
-0x24D7 = 0x2C48
-0x24D8 = 0x2C49
-0x24D9 = 0x2C4A
-0x24DA = 0x2C4B
-0x24DB = 0x2C4C
-0x24DC = 0x2C4D
-0x24DD = 0x2C4E
-0x24DE = 0x2C4F
-0x24DF = 0x2C50
-0x24E0 = 0x2C51
-0x24E1 = 0x2C52
-0x24E2 = 0x2C53
-0x24E3 = 0x2C54
-0x24E4 = 0x2C55
-0x24E5 = 0x2C56
-0x24E6 = 0x2C57
-0x24E7 = 0x2C58
-0x24E8 = 0x2C59
-0x24E9 = 0x2C5A
-0x24EB = 0x2C2B
-0x24EC = 0x2C2C
-0x24ED = 0x2C2D
-0x24EE = 0x2C2E
-0x24EF = 0x2C2F
-0x24F0 = 0x2C30
-0x24F1 = 0x2C31
-0x24F2 = 0x2C32
-0x24F3 = 0x2C33
-0x24F4 = 0x2C34
-0x24F5 = 0x265A
-0x24F6 = 0x265B
-0x24F7 = 0x265C
-0x24F8 = 0x265D
-0x24F9 = 0x265E
-0x24FA = 0x265F
-0x24FB = 0x2660
-0x24FC = 0x2661
-0x24FD = 0x2662
-0x24FE = 0x2663
-0x25B1 = 0x266D
-0x25B6 = 0x2322
-0x25B7 = 0x2321
-0x25C0 = 0x2324
-0x25C1 = 0x2323
-0x25C9 = 0x233B
-0x25D0 = 0x2867
-0x25D1 = 0x2868
-0x25D2 = 0x2869
-0x25D3 = 0x286A
-0x25E6 = 0x233F
-0x2600 = 0x2668
-0x2601 = 0x2669
-0x2602 = 0x266A
-0x2603 = 0x266B
-0x260E = 0x2667
-0x2616 = 0x2664
-0x2617 = 0x2665
-0x261E = 0x2D7E
-0x2660 = 0x263A
-0x2661 = 0x263D
-0x2662 = 0x263B
-0x2663 = 0x2640
-0x2664 = 0x2639
-0x2665 = 0x263E
-0x2666 = 0x263C
-0x2667 = 0x263F
-0x2668 = 0x266C
-0x2669 = 0x227D
-0x266B = 0x227B
-0x266C = 0x227C
-0x266E = 0x227A
-0x2713 = 0x277B
-0x2756 = 0x2D7D
-0x2776 = 0x2C21
-0x2777 = 0x2C22
-0x2778 = 0x2C23
-0x2779 = 0x2C24
-0x277A = 0x2C25
-0x277B = 0x2C26
-0x277C = 0x2C27
-0x277D = 0x2C28
-0x277E = 0x2C29
-0x277F = 0x2C2A
-0x2934 = 0x232E
-0x2935 = 0x232F
-0x29BF = 0x233A
-0x29FA = 0x237D
-0x29FB = 0x237E
-0x3016 = 0x225A
-0x3017 = 0x225B
-0x3018 = 0x2258
-0x3019 = 0x2259
-0x301D = 0x2D60
-0x301F = 0x2D61
-0x3020 = 0x2666
-0x3033 = 0x2233
-0x3034 = 0x2234
-0x3035 = 0x2235
-0x303B = 0x2236
-0x303C = 0x2237
-0x303D = 0x233C
-#0x304B + 0x309A = 0x2477
-#0x304D + 0x309A = 0x2478
-#0x304F + 0x309A = 0x2479
-#0x3051 + 0x309A = 0x247A
-#0x3053 + 0x309A = 0x247B
-0x3094 = 0x2474
-0x3095 = 0x2475
-0x3096 = 0x2476
-0x309F = 0x2239
-0x30A0 = 0x237B
-#0x30AB + 0x309A = 0x2577
-#0x30AD + 0x309A = 0x2578
-#0x30AF + 0x309A = 0x2579
-#0x30B1 + 0x309A = 0x257A
-#0x30B3 + 0x309A = 0x257B
-#0x30BB + 0x309A = 0x257C
-#0x30C4 + 0x309A = 0x257D
-#0x30C8 + 0x309A = 0x257E
-0x30F7 = 0x2772
-0x30F8 = 0x2773
-0x30F9 = 0x2774
-0x30FA = 0x2775
-0x30FF = 0x2238
-0x31F0 = 0x266E
-0x31F1 = 0x266F
-0x31F2 = 0x2670
-0x31F3 = 0x2671
-0x31F4 = 0x2672
-0x31F5 = 0x2673
-0x31F6 = 0x2674
-#0x31F7 + 0x309A = 0x2678
-0x31F7 = 0x2675
-0x31F8 = 0x2676
-0x31F9 = 0x2677
-0x31FA = 0x2679
-0x31FB = 0x267A
-0x31FC = 0x267B
-0x31FD = 0x267C
-0x31FE = 0x267D
-0x31FF = 0x267E
-0x3231 = 0x2D6A
-0x3232 = 0x2D6B
-0x3239 = 0x2D6C
-0x3251 = 0x2841
-0x3252 = 0x2842
-0x3253 = 0x2843
-0x3254 = 0x2844
-0x3255 = 0x2845
-0x3256 = 0x2846
-0x3257 = 0x2847
-0x3258 = 0x2848
-0x3259 = 0x2849
-0x325A = 0x284A
-0x325B = 0x284B
-0x325C = 0x284C
-0x325D = 0x284D
-0x325E = 0x284E
-0x325F = 0x284F
-0x32A4 = 0x2D65
-0x32A5 = 0x2D66
-0x32A6 = 0x2D67
-0x32A7 = 0x2D68
-0x32A8 = 0x2D69
-0x32B1 = 0x2850
-0x32B2 = 0x2851
-0x32B3 = 0x2852
-0x32B4 = 0x2853
-0x32B5 = 0x2854
-0x32B6 = 0x2855
-0x32B7 = 0x2856
-0x32B8 = 0x2857
-0x32B9 = 0x2858
-0x32BA = 0x2859
-0x32BB = 0x285A
-0x32BC = 0x285B
-0x32BD = 0x285C
-0x32BE = 0x285D
-0x32BF = 0x285E
-0x32D0 = 0x2C5B
-0x32D1 = 0x2C5C
-0x32D2 = 0x2C5D
-0x32D3 = 0x2C5E
-0x32D4 = 0x2C5F
-0x32D5 = 0x2C60
-0x32D6 = 0x2C61
-0x32D7 = 0x2C62
-0x32D8 = 0x2C63
-0x32D9 = 0x2C64
-0x32DA = 0x2C65
-0x32DB = 0x2C66
-0x32DC = 0x2C67
-0x32DD = 0x2C68
-0x32DE = 0x2C69
-0x32DF = 0x2C6A
-0x32E0 = 0x2C6B
-0x32E1 = 0x2C6C
-0x32E2 = 0x2C6D
-0x32E3 = 0x2C6E
-0x32E5 = 0x2C71
-0x32E9 = 0x2C70
-0x32EC = 0x2C73
-0x32ED = 0x2C72
-0x32FA = 0x2C6F
-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
-0x33CB = 0x235E
-0x33CD = 0x2D63
-0x3402 = 0x2E23
-0x34B5 = 0x2E53
-0x34DB = 0x2E5B
-0x378D = 0x4F5F
-0x37E2 = 0x4F6F
-0x3B22 = 0x7549
-0x3BB6 = 0x757E
-0x3BC3 = 0x7621
-0x3C0F = 0x763A
-0x3E3F = 0x7766
-0x3F72 = 0x784D
-0x4264 = 0x796D
-0x4453 = 0x7A59
-0x445B = 0x7A5A
-0x459D = 0x7B51
-0x45EA = 0x7B60
-0x4844 = 0x7C4B
-0x49B0 = 0x7D58
-0x4C17 = 0x7E3E
-0x4E28 = 0x2E24
-0x4E2F = 0x2E25
-0x4E30 = 0x2E26
-0x4E8D = 0x2E27
-0x4EE1 = 0x2E28
-0x4EFD = 0x2E29
-0x4EFF = 0x2E2A
-0x4F03 = 0x2E2B
-0x4F0B = 0x2E2C
-0x4F48 = 0x2E2E
-0x4F49 = 0x2E2F
-0x4F56 = 0x2E30
-0x4F5F = 0x2E31
-0x4F60 = 0x2E2D
-0x4F6A = 0x2E32
-0x4F6C = 0x2E33
-0x4F7E = 0x2E34
-0x4F8A = 0x2E35
-0x4F94 = 0x2E36
-0x4F97 = 0x2E37
-0x4FC9 = 0x2E39
-0x4FE0 = 0x2E3A
-0x4FF1 = 0x2E21
-0x5001 = 0x2E3B
-0x5002 = 0x2E3C
-0x500E = 0x2E3D
-0x5018 = 0x2E3E
-0x5027 = 0x2E3F
-0x502E = 0x2E40
-0x503B = 0x2E42
-0x5040 = 0x2E41
-0x5041 = 0x2E43
-0x5094 = 0x2E44
-0x50CC = 0x2E45
-0x50D0 = 0x2E47
-0x50E6 = 0x2E48
-0x50F2 = 0x2E46
-0x5103 = 0x2E4B
-0x5106 = 0x2E4A
-0x510B = 0x2E4C
-0x511E = 0x2E4D
-0x5135 = 0x2E4E
-0x514A = 0x2E4F
-0x5155 = 0x2E51
-0x5157 = 0x2E52
-0x519D = 0x2E54
-0x51C3 = 0x2E55
-0x51CA = 0x2E56
-0x51DE = 0x2E57
-0x51E2 = 0x2E58
-0x51EE = 0x2E59
-0x5201 = 0x2E5A
-0x5213 = 0x2E5C
-0x5215 = 0x2E5D
-0x5249 = 0x2E5E
-0x5257 = 0x2E5F
-0x525D = 0x2F7E
-0x5261 = 0x2E60
-0x5293 = 0x2E61
-0x52C8 = 0x2E62
-0x52CC = 0x2E64
-0x52D0 = 0x2E65
-0x52D6 = 0x2E66
-0x52DB = 0x2E67
-0x52F0 = 0x2E69
-0x52FB = 0x2E6A
-0x5300 = 0x2E6B
-0x5307 = 0x2E6C
-0x531C = 0x2E6D
-0x5361 = 0x2E6F
-0x5363 = 0x2E70
-0x537D = 0x2E71
-0x5393 = 0x2E72
-0x539D = 0x2E73
-0x53B2 = 0x2E74
-0x5412 = 0x2E75
-0x541E = 0x4F7E
-0x5427 = 0x2E76
-0x544D = 0x2E77
-0x546B = 0x2E79
-0x5474 = 0x2E7A
-0x547F = 0x2E7B
-0x5488 = 0x2E7C
-0x5496 = 0x2E7D
-0x549C = 0x2E78
-0x54A1 = 0x2E7E
-0x54A9 = 0x2F21
-0x54C6 = 0x2F22
-0x54FF = 0x2F23
-0x550E = 0x2F24
-0x552B = 0x2F25
-0x5535 = 0x2F26
-0x5550 = 0x2F27
-0x555E = 0x2F28
-0x5581 = 0x2F29
-0x5586 = 0x2F2A
-0x558E = 0x2F2B
-0x55AD = 0x2F2D
-0x55CE = 0x2F2E
-0x5608 = 0x2F30
-0x560E = 0x2F31
-0x563B = 0x2F32
-0x5649 = 0x2F33
-0x5653 = 0x7427
-0x5666 = 0x2F35
-0x566F = 0x2F37
-0x5671 = 0x2F38
-0x5672 = 0x2F39
-0x5676 = 0x2F34
-0x5699 = 0x2F3A
-0x569E = 0x2F3B
-0x56A9 = 0x2F3C
-0x56AC = 0x2F3D
-0x56B3 = 0x2F3E
-0x56C9 = 0x2F3F
-0x56CA = 0x2F40
-0x570A = 0x2F41
-0x5721 = 0x2F43
-0x572F = 0x2F44
-0x5733 = 0x2F45
-0x5734 = 0x2F46
-0x5770 = 0x2F47
-0x5777 = 0x2F48
-0x577C = 0x2F49
-0x579C = 0x2F4A
-0x57B8 = 0x2F4D
-0x57C7 = 0x2F4E
-0x57C8 = 0x2F4F
-0x57CF = 0x2F50
-0x57E4 = 0x2F51
-0x57ED = 0x2F52
-0x57F5 = 0x2F53
-0x57F6 = 0x2F54
-0x57FF = 0x2F55
-0x5809 = 0x2F56
-0x5861 = 0x2F58
-0x5864 = 0x2F59
-0x587C = 0x2F5B
-0x5889 = 0x2F5C
-0x589E = 0x2F5D
-0x58A9 = 0x2F5F
-0x58CE = 0x2F62
-0x58D2 = 0x2F61
-0x58D4 = 0x2F63
-0x58DA = 0x2F64
-0x58E0 = 0x2F65
-0x58E9 = 0x2F66
-0x590C = 0x2F67
-0x595D = 0x2F69
-0x596D = 0x2F6A
-0x598B = 0x2F6B
-0x5992 = 0x2F6C
-0x59A4 = 0x2F6D
-0x59C3 = 0x2F6E
-0x59D2 = 0x2F6F
-0x59DD = 0x2F70
-0x59F8 = 0x7E7A
-0x5A13 = 0x2F71
-0x5A23 = 0x2F72
-0x5A67 = 0x2F73
-0x5A6D = 0x2F74
-0x5A77 = 0x2F75
-0x5A7E = 0x2F76
-0x5A84 = 0x2F77
-0x5A9E = 0x2F78
-0x5AA7 = 0x2F79
-0x5AC4 = 0x2F7A
-0x5B19 = 0x2F7C
-0x5B25 = 0x2F7D
-0x5B41 = 0x4F55
-0x5B56 = 0x4F56
-0x5B7D = 0x4F57
-0x5B93 = 0x4F58
-0x5BD8 = 0x4F59
-0x5BEC = 0x4F5A
-0x5C12 = 0x4F5B
-0x5C1E = 0x4F5C
-0x5C23 = 0x4F5D
-0x5C2B = 0x4F5E
-0x5C5B = 0x7E7B
-0x5C62 = 0x4F60
-0x5C7A = 0x4F64
-0x5C8F = 0x4F65
-0x5C9F = 0x4F66
-0x5CA3 = 0x4F67
-0x5CAA = 0x4F68
-0x5CBA = 0x4F69
-0x5CCB = 0x4F6A
-0x5CD0 = 0x4F6B
-0x5CD2 = 0x4F6C
-0x5CF4 = 0x4F6D
-0x5D0D = 0x4F70
-0x5D27 = 0x4F71
-0x5D46 = 0x4F73
-0x5D47 = 0x4F74
-0x5D4A = 0x4F76
-0x5D53 = 0x4F75
-0x5D6D = 0x4F77
-0x5D81 = 0x4F78
-0x5DA0 = 0x4F79
-0x5DA4 = 0x4F7A
-0x5DA7 = 0x4F7B
-0x5DB8 = 0x4F7C
-0x5DCB = 0x4F7D
-0x5DE2 = 0x7428
-0x5E14 = 0x7429
-0x5E18 = 0x742A
-0x5E58 = 0x742B
-0x5E5E = 0x742C
-0x5E77 = 0x7E7C
-0x5EBE = 0x742D
-0x5ECB = 0x742F
-0x5EF9 = 0x7430
-0x5F00 = 0x7431
-0x5F02 = 0x7432
-0x5F07 = 0x7433
-0x5F1D = 0x7434
-0x5F23 = 0x7435
-0x5F34 = 0x7436
-0x5F36 = 0x7437
-0x5F3D = 0x7438
-0x5F40 = 0x7439
-0x5F45 = 0x743A
-0x5F54 = 0x743B
-0x5F58 = 0x743C
-0x5F64 = 0x743D
-0x5F67 = 0x743E
-0x5F7D = 0x743F
-0x5F89 = 0x7440
-0x5F9C = 0x7441
-0x5FA7 = 0x7442
-0x5FAF = 0x7443
-0x5FB5 = 0x7444
-0x5FB7 = 0x7445
-0x5FC9 = 0x7446
-0x5FDE = 0x7447
-0x5FE1 = 0x7448
-0x5FE9 = 0x7449
-0x600D = 0x744A
-0x6014 = 0x744B
-0x6018 = 0x744C
-0x6033 = 0x744D
-0x6035 = 0x744E
-0x6047 = 0x744F
-0x609D = 0x7451
-0x609E = 0x7452
-0x60CB = 0x7453
-0x60D4 = 0x7454
-0x60D5 = 0x7455
-0x60DD = 0x7456
-0x60F8 = 0x7457
-0x611C = 0x7458
-0x612B = 0x7459
-0x6130 = 0x745A
-0x6137 = 0x745B
-0x618D = 0x745D
-0x61B9 = 0x7460
-0x61BC = 0x745F
-0x6222 = 0x7462
-0x623E = 0x7463
-0x6243 = 0x7464
-0x6256 = 0x7465
-0x625A = 0x7466
-0x626F = 0x7467
-0x6285 = 0x7468
-0x62C4 = 0x7469
-0x62D6 = 0x746A
-0x62FC = 0x746B
-0x630A = 0x746C
-0x6318 = 0x746D
-0x6339 = 0x746E
-0x6343 = 0x746F
-0x6365 = 0x7470
-0x637C = 0x7471
-0x63E5 = 0x7472
-0x63ED = 0x7473
-0x63F5 = 0x7474
-0x6410 = 0x7475
-0x6414 = 0x7476
-0x6422 = 0x7477
-0x6451 = 0x7479
-0x6460 = 0x747A
-0x646D = 0x747B
-0x6479 = 0x7478
-0x64BE = 0x747D
-0x64BF = 0x747E
-0x64C4 = 0x7521
-0x64CA = 0x7522
-0x64CE = 0x747C
-0x64D0 = 0x7523
-0x64F7 = 0x7524
-0x64FB = 0x7525
-0x6522 = 0x7526
-0x6529 = 0x7527
-0x6567 = 0x7529
-0x659D = 0x752A
-0x6600 = 0x752C
-0x6609 = 0x752D
-0x6615 = 0x752E
-0x661E = 0x752F
-0x6622 = 0x7531
-0x6624 = 0x7532
-0x662B = 0x7533
-0x6630 = 0x7534
-0x6631 = 0x7535
-0x6633 = 0x7536
-0x663A = 0x7530
-0x6648 = 0x7538
-0x664C = 0x7539
-0x6659 = 0x753B
-0x665A = 0x753C
-0x6661 = 0x753D
-0x6665 = 0x753E
-0x6673 = 0x753F
-0x6677 = 0x7540
-0x6678 = 0x7541
-0x668D = 0x7542
-0x66A0 = 0x7544
-0x66B2 = 0x7545
-0x66BB = 0x7546
-0x66C6 = 0x7547
-0x66C8 = 0x7548
-0x66DB = 0x754A
-0x66E8 = 0x754B
-0x66FA = 0x754C
-0x66FB = 0x7537
-0x6713 = 0x754D
-0x6733 = 0x754F
-0x6747 = 0x7551
-0x6748 = 0x7552
-0x6766 = 0x7550
-0x677B = 0x7553
-0x6781 = 0x7554
-0x6793 = 0x7555
-0x6798 = 0x7556
-0x679B = 0x7557
-0x67BB = 0x7558
-0x67C0 = 0x755A
-0x67D7 = 0x755B
-0x67F9 = 0x7559
-0x67FC = 0x755C
-0x6801 = 0x755D
-0x681D = 0x755F
-0x682C = 0x7560
-0x6831 = 0x7561
-0x6852 = 0x755E
-0x685B = 0x7562
-0x6872 = 0x7563
-0x6875 = 0x7564
-0x68A3 = 0x7566
-0x68A5 = 0x7567
-0x68B2 = 0x7568
-0x68C8 = 0x7569
-0x68D0 = 0x756A
-0x68E8 = 0x756B
-0x68ED = 0x756C
-0x68F0 = 0x756D
-0x68F1 = 0x756E
-0x68FC = 0x756F
-0x690A = 0x7570
-0x6935 = 0x7573
-0x6942 = 0x7574
-0x6949 = 0x7571
-0x6957 = 0x7575
-0x6963 = 0x7576
-0x6964 = 0x7577
-0x6968 = 0x7578
-0x6980 = 0x7579
-0x69A5 = 0x757B
-0x69AD = 0x757C
-0x69CF = 0x757D
-0x69E2 = 0x7622
-0x69E9 = 0x7623
-0x69EA = 0x7624
-0x69F5 = 0x7625
-0x69F6 = 0x7626
-0x6A0F = 0x7627
-0x6A15 = 0x7628
-0x6A3B = 0x762A
-0x6A3E = 0x762B
-0x6A45 = 0x762C
-0x6A50 = 0x762D
-0x6A56 = 0x762E
-0x6A5B = 0x762F
-0x6A6B = 0x7630
-0x6A73 = 0x7631
-0x6A89 = 0x7633
-0x6A94 = 0x7634
-0x6A9D = 0x7635
-0x6A9E = 0x7636
-0x6AA5 = 0x7637
-0x6AE4 = 0x7638
-0x6AE7 = 0x7639
-0x6B1B = 0x763C
-0x6B1E = 0x763D
-0x6B2C = 0x763E
-0x6B35 = 0x763F
-0x6B46 = 0x7640
-0x6B56 = 0x7641
-0x6B60 = 0x7642
-0x6B65 = 0x7643
-0x6B67 = 0x7644
-0x6B77 = 0x7645
-0x6B82 = 0x7646
-0x6BA9 = 0x7647
-0x6BAD = 0x7648
-0x6BCF = 0x764A
-0x6BD6 = 0x764B
-0x6BD7 = 0x764C
-0x6BFF = 0x764D
-0x6C05 = 0x764E
-0x6C10 = 0x764F
-0x6C33 = 0x7650
-0x6C59 = 0x7651
-0x6C5C = 0x7652
-0x6C74 = 0x7654
-0x6C76 = 0x7655
-0x6C85 = 0x7656
-0x6C86 = 0x7657
-0x6C98 = 0x7658
-0x6C9C = 0x7659
-0x6CAA = 0x7653
-0x6CC6 = 0x765B
-0x6CD4 = 0x765C
-0x6CE0 = 0x765D
-0x6CEB = 0x765E
-0x6CEE = 0x765F
-0x6CFB = 0x765A
-0x6D04 = 0x7661
-0x6D0E = 0x7662
-0x6D2E = 0x7663
-0x6D31 = 0x7664
-0x6D39 = 0x7665
-0x6D3F = 0x7666
-0x6D58 = 0x7667
-0x6D65 = 0x7668
-0x6D82 = 0x766A
-0x6D87 = 0x766B
-0x6D89 = 0x766C
-0x6D94 = 0x766D
-0x6DAA = 0x766E
-0x6DAC = 0x766F
-0x6DBF = 0x7670
-0x6DC4 = 0x7671
-0x6DD6 = 0x7672
-0x6DDA = 0x7673
-0x6DDB = 0x7674
-0x6DDD = 0x7675
-0x6DFC = 0x7676
-0x6E34 = 0x7678
-0x6E44 = 0x7679
-0x6E5C = 0x767A
-0x6E5E = 0x767B
-0x6EAB = 0x767C
-0x6EB1 = 0x767D
-0x6EC1 = 0x767E
-0x6EC7 = 0x7721
-0x6ECE = 0x7722
-0x6F10 = 0x7723
-0x6F1A = 0x7724
-0x6F2A = 0x7726
-0x6F2F = 0x7727
-0x6F33 = 0x7728
-0x6F51 = 0x7729
-0x6F59 = 0x772A
-0x6F5E = 0x772B
-0x6F61 = 0x772C
-0x6F62 = 0x772D
-0x6F7E = 0x772E
-0x6F88 = 0x772F
-0x6F8C = 0x7730
-0x6F8D = 0x7731
-0x6F94 = 0x7732
-0x6FA0 = 0x7733
-0x6FA7 = 0x7734
-0x6FB6 = 0x7735
-0x6FBC = 0x7736
-0x6FC7 = 0x7737
-0x6FCA = 0x7738
-0x6FF0 = 0x773A
-0x6FF5 = 0x773B
-0x6FF9 = 0x7739
-0x7005 = 0x773C
-0x7006 = 0x773D
-0x7028 = 0x773E
-0x704A = 0x773F
-0x704E = 0x7742
-0x705D = 0x7740
-0x705E = 0x7741
-0x7064 = 0x7743
-0x7075 = 0x7744
-0x7085 = 0x7745
-0x70A4 = 0x7746
-0x70AB = 0x7747
-0x70B7 = 0x7748
-0x70D4 = 0x7749
-0x70D8 = 0x774A
-0x70E4 = 0x774B
-0x710F = 0x774C
-0x711E = 0x774E
-0x7120 = 0x774F
-0x712B = 0x774D
-0x712E = 0x7750
-0x7130 = 0x7751
-0x7146 = 0x7752
-0x7147 = 0x7753
-0x7151 = 0x7754
-0x7152 = 0x7756
-0x715C = 0x7757
-0x7160 = 0x7758
-0x7168 = 0x7759
-0x7185 = 0x775B
-0x7187 = 0x775C
-0x7192 = 0x775D
-0x71BA = 0x775F
-0x71C1 = 0x775E
-0x71C4 = 0x7760
-0x71FE = 0x7761
-0x7200 = 0x7762
-0x7215 = 0x7763
-0x7255 = 0x7764
-0x7256 = 0x7765
-0x728D = 0x7767
-0x729B = 0x7768
-0x72BE = 0x7769
-0x72C0 = 0x776A
-0x72FB = 0x776B
-0x7327 = 0x776D
-0x7328 = 0x776E
-0x7350 = 0x7770
-0x7366 = 0x7771
-0x737C = 0x7772
-0x7395 = 0x7773
-0x739F = 0x7774
-0x73A0 = 0x7775
-0x73A2 = 0x7776
-0x73A6 = 0x7777
-0x73AB = 0x7778
-0x73C9 = 0x7779
-0x73CF = 0x777A
-0x73D6 = 0x777B
-0x73D9 = 0x777C
-0x73E3 = 0x777D
-0x73E9 = 0x777E
-0x7407 = 0x7821
-0x740A = 0x7822
-0x741A = 0x7823
-0x741B = 0x7824
-0x7426 = 0x7826
-0x7428 = 0x7827
-0x742A = 0x7828
-0x742B = 0x7829
-0x742C = 0x782A
-0x742E = 0x782B
-0x742F = 0x782C
-0x7430 = 0x782D
-0x7444 = 0x782E
-0x7446 = 0x782F
-0x7447 = 0x7830
-0x744B = 0x7831
-0x7457 = 0x7832
-0x7462 = 0x7833
-0x746B = 0x7834
-0x746D = 0x7835
-0x7486 = 0x7836
-0x7487 = 0x7837
-0x7489 = 0x7838
-0x7490 = 0x783D
-0x7498 = 0x7839
-0x749C = 0x783A
-0x749F = 0x783B
-0x74A3 = 0x783C
-0x74A6 = 0x783E
-0x74A8 = 0x783F
-0x74A9 = 0x7840
-0x74B5 = 0x7841
-0x74BF = 0x7842
-0x74C8 = 0x7843
-0x74C9 = 0x7844
-0x74DA = 0x7845
-0x74FF = 0x7846
-0x7501 = 0x7847
-0x7517 = 0x7848
-0x752F = 0x7849
-0x756F = 0x784A
-0x7579 = 0x784B
-0x7592 = 0x784C
-0x75CE = 0x784E
-0x75E4 = 0x784F
-0x7600 = 0x7850
-0x7602 = 0x7851
-0x7608 = 0x7852
-0x7615 = 0x7853
-0x7616 = 0x7854
-0x7619 = 0x7855
-0x761E = 0x7856
-0x7626 = 0x7E7D
-0x762D = 0x7857
-0x7635 = 0x7858
-0x7643 = 0x7859
-0x764B = 0x785A
-0x7664 = 0x785B
-0x7665 = 0x785C
-0x766D = 0x785D
-0x766F = 0x785E
-0x7671 = 0x785F
-0x7681 = 0x7860
-0x769B = 0x7861
-0x769D = 0x7862
-0x769E = 0x7863
-0x76A6 = 0x7864
-0x76AA = 0x7865
-0x76B6 = 0x7866
-0x76C5 = 0x7867
-0x76CC = 0x7868
-0x76CE = 0x7869
-0x76D4 = 0x786A
-0x76E6 = 0x786B
-0x76F1 = 0x786C
-0x76FC = 0x786D
-0x770A = 0x786E
-0x7719 = 0x786F
-0x7734 = 0x7870
-0x7736 = 0x7871
-0x7746 = 0x7872
-0x774D = 0x7873
-0x774E = 0x7874
-0x775C = 0x7875
-0x775F = 0x7876
-0x7762 = 0x7877
-0x777A = 0x7878
-0x7780 = 0x7879
-0x7794 = 0x787A
-0x77AA = 0x787B
-0x77E0 = 0x787C
-0x782D = 0x787D
-0x7843 = 0x7921
-0x784E = 0x7922
-0x784F = 0x7923
-0x7851 = 0x7924
-0x7868 = 0x7925
-0x786E = 0x7926
-0x78AD = 0x792A
-0x78B0 = 0x7928
-0x78E4 = 0x792B
-0x78F2 = 0x792C
-0x78F7 = 0x792E
-0x7900 = 0x792D
-0x791C = 0x792F
-0x792E = 0x7930
-0x7931 = 0x7931
-0x7934 = 0x7932
-0x7945 = 0x7935
-0x7946 = 0x7936
-0x795C = 0x793A
-0x7979 = 0x793E
-0x7998 = 0x7942
-0x79B1 = 0x7943
-0x79B8 = 0x7944
-0x79C8 = 0x7945
-0x79CA = 0x7946
-0x79D4 = 0x7948
-0x79DE = 0x7949
-0x79EB = 0x794A
-0x79ED = 0x794B
-0x7A03 = 0x794C
-0x7A39 = 0x794E
-0x7A5D = 0x794F
-0x7A6D = 0x7950
-0x7A85 = 0x7952
-0x7AA0 = 0x7953
-0x7AB3 = 0x7955
-0x7ABB = 0x7956
-0x7ACE = 0x7957
-0x7AEB = 0x7958
-0x7AFD = 0x7959
-0x7B12 = 0x795A
-0x7B2D = 0x795B
-0x7B3B = 0x795C
-0x7B47 = 0x795D
-0x7B4E = 0x795E
-0x7B60 = 0x795F
-0x7B6D = 0x7960
-0x7B6F = 0x7961
-0x7B72 = 0x7962
-0x7B9E = 0x7963
-0x7BD7 = 0x7965
-0x7BD9 = 0x7966
-0x7C01 = 0x7967
-0x7C1E = 0x7969
-0x7C20 = 0x796A
-0x7C31 = 0x7968
-0x7C33 = 0x796B
-0x7C36 = 0x796C
-0x7C59 = 0x796F
-0x7C6D = 0x7970
-0x7C79 = 0x7971
-0x7C8F = 0x7972
-0x7C94 = 0x7973
-0x7CA0 = 0x7974
-0x7CBC = 0x7975
-0x7CD5 = 0x7976
-0x7CD9 = 0x7977
-0x7CDD = 0x7978
-0x7D07 = 0x7979
-0x7D08 = 0x797A
-0x7D13 = 0x797B
-0x7D1D = 0x797C
-0x7D23 = 0x797D
-0x7D31 = 0x797E
-0x7D41 = 0x7A21
-0x7D48 = 0x7A22
-0x7D53 = 0x7A23
-0x7D5C = 0x7A24
-0x7D7A = 0x7A25
-0x7D83 = 0x7A26
-0x7D8B = 0x7A27
-0x7DA0 = 0x7A28
-0x7DA6 = 0x7A29
-0x7DC2 = 0x7A2A
-0x7DCC = 0x7A2B
-0x7DD6 = 0x7A2C
-0x7DE3 = 0x7A2D
-0x7E08 = 0x7A30
-0x7E11 = 0x7A31
-0x7E15 = 0x7A32
-0x7E28 = 0x7A2F
-0x7E47 = 0x7A34
-0x7E52 = 0x7A35
-0x7E61 = 0x7A36
-0x7E6B = 0x7E7E
-0x7E8A = 0x7A37
-0x7E8D = 0x7A38
-0x7F47 = 0x7A39
-0x7F91 = 0x7A3B
-0x7F97 = 0x7A3C
-0x7FBF = 0x7A3D
-0x7FCE = 0x7A3E
-0x7FDB = 0x7A3F
-0x7FDF = 0x7A40
-0x7FEC = 0x7A41
-0x7FEE = 0x7A42
-0x7FFA = 0x7A43
-0x8014 = 0x7A45
-0x8026 = 0x7A46
-0x8035 = 0x7A47
-0x8037 = 0x7A48
-0x803C = 0x7A49
-0x80CA = 0x7A4A
-0x80D7 = 0x7A4B
-0x80E0 = 0x7A4C
-0x80F3 = 0x7A4D
-0x8118 = 0x7A4E
-0x814A = 0x7A4F
-0x8160 = 0x7A50
-0x8167 = 0x7A51
-0x8168 = 0x7A52
-0x816D = 0x7A53
-0x81BB = 0x7A54
-0x81CA = 0x7A55
-0x81CF = 0x7A56
-0x81D7 = 0x7A57
-0x8260 = 0x7A5B
-0x8274 = 0x7A5C
-0x828E = 0x7A5E
-0x82A1 = 0x7A5F
-0x82A3 = 0x7A60
-0x82A4 = 0x7A61
-0x82A9 = 0x7A62
-0x82AE = 0x7A63
-0x82B7 = 0x7A64
-0x82BE = 0x7A65
-0x82BF = 0x7A66
-0x82C6 = 0x7A67
-0x82D5 = 0x7A68
-0x82FD = 0x7A69
-0x82FE = 0x7A6A
-0x8300 = 0x7A6B
-0x8301 = 0x7A6C
-0x8322 = 0x7A6E
-0x832D = 0x7A6F
-0x833A = 0x7A70
-0x8343 = 0x7A71
-0x8347 = 0x7A72
-0x8351 = 0x7A73
-0x8355 = 0x7A74
-0x8362 = 0x7A6D
-0x837D = 0x7A75
-0x8386 = 0x7A76
-0x8392 = 0x7A77
-0x8398 = 0x7A78
-0x83A7 = 0x7A79
-0x83A9 = 0x7A7A
-0x83BF = 0x7A7B
-0x83C0 = 0x7A7C
-0x83C7 = 0x7A7D
-0x83CF = 0x7A7E
-0x83D1 = 0x7B21
-0x83E1 = 0x7B22
-0x83EA = 0x7B23
-0x8401 = 0x7B24
-0x8406 = 0x7B25
-0x840A = 0x7B26
-0x8448 = 0x7B28
-0x845F = 0x7B29
-0x8470 = 0x7B2A
-0x8473 = 0x7B2B
-0x8485 = 0x7B2C
-0x849E = 0x7B2D
-0x84AF = 0x7B2E
-0x84B4 = 0x7B2F
-0x84BA = 0x7B30
-0x84C0 = 0x7B31
-0x84C2 = 0x7B32
-0x851E = 0x7B35
-0x8523 = 0x7B36
-0x852F = 0x7B37
-0x8532 = 0x7B34
-0x8559 = 0x7B38
-0x8564 = 0x7B39
-0x857A = 0x7B3C
-0x858C = 0x7B3D
-0x858F = 0x7B3E
-0x85A2 = 0x7B3F
-0x85AD = 0x7B3B
-0x85B0 = 0x7B40
-0x85CB = 0x7B41
-0x85CE = 0x7B42
-0x85ED = 0x7B43
-0x85FF = 0x7B45
-0x8604 = 0x7B46
-0x8605 = 0x7B47
-0x8610 = 0x7B48
-0x8612 = 0x7B44
-0x8618 = 0x7B4A
-0x8629 = 0x7B4B
-0x8638 = 0x7B4C
-0x8641 = 0x2F68
-0x8657 = 0x7B4D
-0x865B = 0x7B4E
-0x8662 = 0x7B50
-0x866C = 0x7B52
-0x8675 = 0x7B53
-0x8698 = 0x7B54
-0x86B8 = 0x7B55
-0x86FA = 0x7B56
-0x86FC = 0x7B57
-0x86FD = 0x7B58
-0x870B = 0x7B59
-0x8771 = 0x7B5A
-0x8787 = 0x7B5B
-0x8788 = 0x7B5C
-0x87AC = 0x7B5D
-0x87AD = 0x7B5E
-0x87B5 = 0x7B5F
-0x87D6 = 0x7B61
-0x87EC = 0x7B62
-0x8806 = 0x7B63
-0x880A = 0x7B64
-0x8810 = 0x7B65
-0x8814 = 0x7B66
-0x881F = 0x7B67
-0x8898 = 0x7B68
-0x88AA = 0x7B69
-0x88CA = 0x7B6A
-0x88CE = 0x7B6B
-0x88F5 = 0x7B6D
-0x8918 = 0x7B70
-0x8919 = 0x7B71
-0x891A = 0x7B72
-0x891C = 0x7B6E
-0x8927 = 0x7B73
-0x8930 = 0x7B74
-0x8932 = 0x7B75
-0x8939 = 0x7B76
-0x8940 = 0x7B77
-0x8994 = 0x7B78
-0x89D4 = 0x7B7A
-0x89E5 = 0x7B7B
-0x89F6 = 0x7B7C
-0x8A12 = 0x7B7D
-0x8A15 = 0x7B7E
-0x8A22 = 0x7C21
-0x8A37 = 0x7C22
-0x8A47 = 0x7C23
-0x8A4E = 0x7C24
-0x8A5D = 0x7C25
-0x8A61 = 0x7C26
-0x8A75 = 0x7C27
-0x8A79 = 0x7C28
-0x8AA7 = 0x7C29
-0x8AD0 = 0x7C2A
-0x8ADF = 0x7C2B
-0x8AF4 = 0x7C2C
-0x8AF6 = 0x7C2D
-0x8B46 = 0x7C31
-0x8B54 = 0x7C32
-0x8B59 = 0x7C33
-0x8B69 = 0x7C34
-0x8B9D = 0x7C35
-0x8C49 = 0x7C36
-0x8C68 = 0x7C37
-0x8CE1 = 0x7C39
-0x8CF4 = 0x7C3A
-0x8CF8 = 0x7C3B
-0x8CFE = 0x7C3C
-0x8D12 = 0x7C3E
-0x8D1B = 0x7C3F
-0x8DAF = 0x7C40
-0x8DCE = 0x7C41
-0x8DD1 = 0x7C42
-0x8DD7 = 0x7C43
-0x8E20 = 0x7C44
-0x8E23 = 0x7C45
-0x8E3D = 0x7C46
-0x8E70 = 0x7C47
-0x8E7B = 0x7C48
-0x8EC0 = 0x7C4A
-0x8EFA = 0x7C4C
-0x8F1E = 0x7C4D
-0x8F2D = 0x7C4E
-0x8F36 = 0x7C4F
-0x8F54 = 0x7C50
-0x8FA6 = 0x7C52
-0x8FB5 = 0x7C53
-0x8FE4 = 0x7C54
-0x8FE8 = 0x7C55
-0x8FEE = 0x7C56
-0x9008 = 0x7C57
-0x902D = 0x7C58
-0x9088 = 0x7C5A
-0x9095 = 0x7C5B
-0x9097 = 0x7C5C
-0x9099 = 0x7C5D
-0x909B = 0x7C5E
-0x90A2 = 0x7C5F
-0x90B3 = 0x7C60
-0x90BE = 0x7C61
-0x90C4 = 0x7C62
-0x90C5 = 0x7C63
-0x90C7 = 0x7C64
-0x90D7 = 0x7C65
-0x90DD = 0x7C66
-0x90DE = 0x7C67
-0x90EF = 0x7C68
-0x90F4 = 0x7C69
-0x9114 = 0x7C6B
-0x9115 = 0x7C6C
-0x9116 = 0x7C6D
-0x9122 = 0x7C6E
-0x9123 = 0x7C6F
-0x9127 = 0x7C70
-0x912F = 0x7C71
-0x9131 = 0x7C72
-0x9134 = 0x7C73
-0x913D = 0x7C74
-0x9148 = 0x7C75
-0x915B = 0x7C76
-0x9183 = 0x7C77
-0x919E = 0x7C78
-0x91AC = 0x7C79
-0x91B1 = 0x7C7A
-0x91BC = 0x7C7B
-0x91D7 = 0x7C7C
-0x91E4 = 0x7C7E
-0x91E5 = 0x7D21
-0x91ED = 0x7D22
-0x91F1 = 0x7D23
-0x91FB = 0x7C7D
-0x9207 = 0x7D24
-0x9210 = 0x7D25
-0x9238 = 0x7D26
-0x9239 = 0x7D27
-0x923A = 0x7D28
-0x923C = 0x7D29
-0x9240 = 0x7D2A
-0x9243 = 0x7D2B
-0x924F = 0x7D2C
-0x9278 = 0x7D2D
-0x9288 = 0x7D2E
-0x92C2 = 0x7D2F
-0x92CB = 0x7D30
-0x92CC = 0x7D31
-0x92D3 = 0x7D32
-0x92E0 = 0x7D33
-0x92FF = 0x7D34
-0x9304 = 0x7D35
-0x931F = 0x7D36
-0x9321 = 0x7D37
-0x9325 = 0x7D38
-0x9348 = 0x7D39
-0x9349 = 0x7D3A
-0x934A = 0x7D3B
-0x9364 = 0x7D3C
-0x9365 = 0x7D3D
-0x936A = 0x7D3E
-0x9370 = 0x7D3F
-0x939B = 0x7D40
-0x93A3 = 0x7D41
-0x93BA = 0x7D42
-0x93C6 = 0x7D43
-0x93DE = 0x7D44
-0x93DF = 0x7D45
-0x93FD = 0x7D47
-0x9404 = 0x7D46
-0x9433 = 0x7D48
-0x944A = 0x7D49
-0x9463 = 0x7D4A
-0x946B = 0x7D4B
-0x9471 = 0x7D4C
-0x9472 = 0x7D4D
-0x958E = 0x7D4E
-0x959F = 0x7D4F
-0x95A6 = 0x7D50
-0x95A9 = 0x7D51
-0x95AC = 0x7D52
-0x95B6 = 0x7D53
-0x95BD = 0x7D54
-0x95CB = 0x7D55
-0x95D0 = 0x7D56
-0x95D3 = 0x7D57
-0x95DA = 0x7D59
-0x95DE = 0x7D5A
-0x9658 = 0x7D5B
-0x9684 = 0x7D5C
-0x969D = 0x7D5E
-0x96A4 = 0x7D5F
-0x96A5 = 0x7D60
-0x96D2 = 0x7D61
-0x96DE = 0x7D62
-0x96E9 = 0x7D64
-0x96EF = 0x7D65
-0x9733 = 0x7D66
-0x973B = 0x7D67
-0x974D = 0x7D68
-0x974E = 0x7D69
-0x974F = 0x7D6A
-0x975A = 0x7D6B
-0x976E = 0x7D6C
-0x9773 = 0x7D6D
-0x9795 = 0x7D6E
-0x97AE = 0x7D6F
-0x97BA = 0x7D70
-0x97C1 = 0x7D71
-0x97C9 = 0x7D72
-0x97DB = 0x7D74
-0x97DE = 0x7D73
-0x97F4 = 0x7D75
-0x980A = 0x7D77
-0x981E = 0x7D78
-0x982B = 0x7D79
-0x9830 = 0x7D7A
-0x9852 = 0x7D7C
-0x9853 = 0x7D7D
-0x9856 = 0x7D7E
-0x9857 = 0x7E21
-0x9859 = 0x7E22
-0x985A = 0x7E23
-0x9865 = 0x7E25
-0x986C = 0x7E26
-0x98BA = 0x7E27
-0x98C8 = 0x7E28
-0x98E7 = 0x7E29
-0x9958 = 0x7E2A
-0x999E = 0x7E2B
-0x9A02 = 0x7E2C
-0x9A03 = 0x7E2D
-0x9A24 = 0x7E2E
-0x9A2D = 0x7E2F
-0x9A2E = 0x7E30
-0x9A38 = 0x7E31
-0x9A4A = 0x7E32
-0x9A4E = 0x7E33
-0x9A52 = 0x7E34
-0x9AB6 = 0x7E35
-0x9AC1 = 0x7E36
-0x9AC3 = 0x7E37
-0x9ACE = 0x7E38
-0x9AD6 = 0x7E39
-0x9AF9 = 0x7E3A
-0x9B02 = 0x7E3B
-0x9B08 = 0x7E3C
-0x9B20 = 0x7E3D
-0x9B2D = 0x7E3F
-0x9B5E = 0x7E40
-0x9B66 = 0x7E42
-0x9B72 = 0x7E43
-0x9B75 = 0x7E44
-0x9B79 = 0x7E41
-0x9B84 = 0x7E45
-0x9B8A = 0x7E46
-0x9B8F = 0x7E47
-0x9B9E = 0x7E48
-0x9BA7 = 0x7E49
-0x9BC1 = 0x7E4A
-0x9BCE = 0x7E4B
-0x9BE5 = 0x7E4C
-0x9BF8 = 0x7E4D
-0x9BFD = 0x7E4E
-0x9C00 = 0x7E4F
-0x9C23 = 0x7E50
-0x9C41 = 0x7E51
-0x9C4F = 0x7E52
-0x9C50 = 0x7E53
-0x9C53 = 0x7E54
-0x9C63 = 0x7E55
-0x9C65 = 0x7E56
-0x9C77 = 0x7E57
-0x9D1D = 0x7E58
-0x9D1E = 0x7E59
-0x9D43 = 0x7E5A
-0x9D47 = 0x7E5B
-0x9D52 = 0x7E5C
-0x9D63 = 0x7E5D
-0x9D70 = 0x7E5E
-0x9D7C = 0x7E5F
-0x9D8A = 0x7E60
-0x9D96 = 0x7E61
-0x9DAC = 0x7E63
-0x9DBC = 0x7E64
-0x9DC0 = 0x7E62
-0x9DD7 = 0x7E65
-0x9DE7 = 0x7E67
-0x9E07 = 0x7E68
-0x9E15 = 0x7E69
-0x9E7C = 0x7E6A
-0x9E9E = 0x7E6B
-0x9EA4 = 0x7E6C
-0x9EAC = 0x7E6D
-0x9EAF = 0x7E6E
-0x9EB4 = 0x7E6F
-0x9EB5 = 0x7E70
-0x9EC3 = 0x7E71
-0x9ED1 = 0x7E72
-0x9F10 = 0x7E73
-0x9F39 = 0x7E74
-0x9F57 = 0x7E75
-0x9F90 = 0x7E76
-0x9F94 = 0x7E77
-0x9F97 = 0x7E78
-0x9FA2 = 0x7E79
-0xF91D = 0x763B
-0xF928 = 0x742E
-0xF929 = 0x754E
-0xF936 = 0x7B4F
-0xF970 = 0x7649
-0xF9D0 = 0x7E24
-0xF9DC = 0x7D5D
-0xFA0F = 0x2F4B
-0xFA10 = 0x2F57
-0xFA11 = 0x4F72
-0xFA14 = 0x757A
-0xFA15 = 0x775A
-0xFA16 = 0x776F
-0xFA19 = 0x793C
-0xFA1A = 0x793D
-0xFA1B = 0x7941
-0xFA1F = 0x7B3A
-0xFA22 = 0x7C2E
-0xFA26 = 0x7C6A
-0xFA30 = 0x2E38
-0xFA31 = 0x2E49
-0xFA32 = 0x2E50
-0xFA33 = 0x2E63
-0xFA34 = 0x2E68
-0xFA35 = 0x2E6E
-0xFA36 = 0x2F2C
-0xFA37 = 0x2F2F
-0xFA38 = 0x2F36
-0xFA39 = 0x2F5A
-0xFA3A = 0x2F5E
-0xFA3B = 0x4F61
-0xFA3C = 0x4F62
-0xFA3D = 0x7450
-0xFA3E = 0x745C
-0xFA3F = 0x745E
-0xFA40 = 0x7461
-0xFA41 = 0x7528
-0xFA42 = 0x752B
-0xFA43 = 0x7543
-0xFA44 = 0x7565
-0xFA45 = 0x7669
-0xFA46 = 0x7677
-0xFA47 = 0x7725
-0xFA48 = 0x7755
-0xFA4A = 0x7825
-0xFA4B = 0x7927
-0xFA4C = 0x7933
-0xFA4D = 0x7934
-0xFA4E = 0x7937
-0xFA4F = 0x7938
-0xFA50 = 0x7939
-0xFA51 = 0x793B
-0xFA52 = 0x793F
-0xFA53 = 0x7940
-0xFA54 = 0x794D
-0xFA55 = 0x7951
-0xFA56 = 0x7964
-0xFA57 = 0x7A2E
-0xFA59 = 0x7A33
-0xFA5A = 0x7A3A
-0xFA5B = 0x7A44
-0xFA5C = 0x7A58
-0xFA5F = 0x7B27
-0xFA60 = 0x7B6F
-0xFA61 = 0x7B79
-0xFA62 = 0x7C2F
-0xFA63 = 0x7C30
-0xFA64 = 0x7C38
-0xFA65 = 0x7C3D
-0xFA67 = 0x7C59
-0xFA68 = 0x7D63
-0xFA69 = 0x7D76
-0xFA6A = 0x7D7B
-0xFE45 = 0x233E
-0xFE46 = 0x233D
-0xFF02 = 0x2230 # 0x0022
-0xFF07 = 0x222F # 0x0027
-0xFF0D = 0x2231 # 0x002D
-0xFF5E = 0x2232 # 0x007E
-0xFF5F = 0x2256
-0xFF60 = 0x2257
-END_MAP
diff --git a/enc/trans/JIS/UCS@BMP%JISX0213-2.src b/enc/trans/JIS/UCS@BMP%JISX0213-2.src
deleted file mode 100644
index ba53d7d72f..0000000000
--- a/enc/trans/JIS/UCS@BMP%JISX0213-2.src
+++ /dev/null
@@ -1,2189 +0,0 @@
-# $NetBSD: UCS@BMP%JISX0213-2.src,v 1.1 2007/03/05 16:58:33 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS:BMP/JISX0213-2"
-SRC_ZONE 0x3406 - 0xFA66
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
-##
-## Date: 12 Feb 2005 10:15:00 GMT
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-0x3406 = 0x212D
-0x342C = 0x2132
-0x342E = 0x2133
-0x3468 = 0x215E
-0x346A = 0x2156
-0x3492 = 0x217E
-0x34BC = 0x232B
-0x34C1 = 0x7468
-0x34C7 = 0x232F
-0x351F = 0x2348
-0x355D = 0x235D
-0x355E = 0x235E
-0x3563 = 0x2361
-0x356E = 0x2367
-0x35A6 = 0x2423
-0x35A8 = 0x2426
-0x35C5 = 0x242F
-0x35DA = 0x2438
-0x35F4 = 0x2442
-0x3605 = 0x244A
-0x364A = 0x2479
-0x3691 = 0x253F
-0x3696 = 0x2543
-0x3699 = 0x2541
-0x36CF = 0x2557
-0x3761 = 0x2823
-0x3762 = 0x2825
-0x376B = 0x2829
-0x376C = 0x2828
-0x3775 = 0x282C
-0x37C1 = 0x283E
-0x37E8 = 0x2856
-0x37F4 = 0x2859
-0x37FD = 0x285C
-0x3800 = 0x285E
-0x382F = 0x286F
-0x3836 = 0x2871
-0x3840 = 0x2874
-0x385C = 0x2879
-0x3861 = 0x287B
-0x38FA = 0x2C3B
-0x3917 = 0x2C46
-0x391A = 0x2C4A
-0x396F = 0x2C60
-0x3A6E = 0x2D5B
-0x3A73 = 0x2D5F
-0x3AD6 = 0x2D71
-0x3AD7 = 0x2E36
-0x3AEA = 0x2D7C
-0x3B0E = 0x2E2E
-0x3B1A = 0x2E32
-0x3B1C = 0x2E34
-0x3B6D = 0x2E6D
-0x3B77 = 0x2E65
-0x3B87 = 0x2F28
-0x3B88 = 0x2F29
-0x3B8D = 0x2F2C
-0x3BA4 = 0x2F34
-0x3BCD = 0x2F48
-0x3BF0 = 0x2F5D
-0x3C26 = 0x2F77
-0x3CC3 = 0x6E3B
-0x3CD2 = 0x6E42
-0x3D11 = 0x6E71
-0x3D1E = 0x6E7E
-0x3D64 = 0x6F40
-0x3D9A = 0x6F54
-0x3DC0 = 0x6F70
-0x3DD4 = 0x6F77
-0x3E05 = 0x7028
-0x3E60 = 0x703F
-0x3E66 = 0x7041
-0x3E68 = 0x7042
-0x3E83 = 0x7049
-0x3E94 = 0x7050
-0x3F57 = 0x7134
-0x3F75 = 0x7146
-0x3F77 = 0x7148
-0x3FAE = 0x715C
-0x3FC9 = 0x7167
-0x3FD7 = 0x716C
-0x4039 = 0x7222
-0x4058 = 0x722D
-0x4093 = 0x7239
-0x4105 = 0x7264
-0x4148 = 0x7274
-0x414F = 0x7277
-0x4163 = 0x727D
-0x41B4 = 0x7333
-0x41BF = 0x7337
-0x41E6 = 0x7347
-0x41EE = 0x734B
-0x41F3 = 0x7348
-0x4207 = 0x7353
-0x420E = 0x7357
-0x42C6 = 0x742B
-0x42D6 = 0x7436
-0x42DD = 0x743B
-0x4302 = 0x744E
-0x432B = 0x745D
-0x4343 = 0x7461
-0x43EE = 0x753E
-0x43F0 = 0x7542
-0x4408 = 0x7548
-0x4417 = 0x754A
-0x441C = 0x754C
-0x4422 = 0x754F
-0x4476 = 0x756C
-0x447A = 0x756E
-0x4491 = 0x7577
-0x44B3 = 0x7635
-0x44BE = 0x7632
-0x44D4 = 0x7634
-0x4508 = 0x7659
-0x450D = 0x7654
-0x4525 = 0x766D
-0x4543 = 0x766E
-0x45B8 = 0x774F
-0x45E5 = 0x776C
-0x460F = 0x7824
-0x4641 = 0x783A
-0x4665 = 0x7843
-0x46A1 = 0x784E
-0x46AF = 0x7853
-0x470C = 0x786B
-0x4764 = 0x7929
-0x47FD = 0x793F
-0x4816 = 0x7949
-0x484E = 0x795C
-0x48B5 = 0x7A27
-0x49E7 = 0x7B6A
-0x49FA = 0x7B70
-0x4A04 = 0x7B75
-0x4A29 = 0x7B78
-0x4ABC = 0x7C37
-0x4B3B = 0x7C55
-0x4BC2 = 0x7D26
-0x4BCA = 0x7D28
-0x4BD2 = 0x7D2A
-0x4BE8 = 0x7D31
-0x4C20 = 0x7D3F
-0x4CC4 = 0x7E2A
-0x4CD1 = 0x7E2D
-0x4D07 = 0x7E4B
-0x4D77 = 0x7E60
-0x4E02 = 0x2122
-0x4E0F = 0x2123
-0x4E12 = 0x2124
-0x4E29 = 0x2125
-0x4E2B = 0x2126
-0x4E2C = 0x702E
-0x4E2E = 0x2127
-0x4E40 = 0x2128
-0x4E47 = 0x2129
-0x4E48 = 0x212A
-0x4E51 = 0x212C
-0x4E5A = 0x212F
-0x4E69 = 0x2130
-0x4E9D = 0x2131
-0x4EB9 = 0x2134
-0x4EBB = 0x2135
-0x4EBC = 0x2137
-0x4EC3 = 0x2138
-0x4EC8 = 0x2139
-0x4ED0 = 0x213A
-0x4EDA = 0x213C
-0x4EEB = 0x213B
-0x4EF1 = 0x213D
-0x4EF5 = 0x213E
-0x4F00 = 0x213F
-0x4F16 = 0x2140
-0x4F37 = 0x2142
-0x4F3E = 0x2143
-0x4F54 = 0x2144
-0x4F58 = 0x2145
-0x4F64 = 0x2141
-0x4F77 = 0x2147
-0x4F78 = 0x2148
-0x4F7A = 0x2149
-0x4F7D = 0x214A
-0x4F82 = 0x214B
-0x4F85 = 0x214C
-0x4F92 = 0x214D
-0x4F9A = 0x214E
-0x4FB2 = 0x2150
-0x4FBE = 0x2151
-0x4FC5 = 0x2152
-0x4FCB = 0x2153
-0x4FCF = 0x2154
-0x4FD2 = 0x2155
-0x4FE6 = 0x214F
-0x4FF2 = 0x2157
-0x5000 = 0x2158
-0x5010 = 0x2159
-0x5013 = 0x215A
-0x501C = 0x215B
-0x501E = 0x215C
-0x5022 = 0x215D
-0x5042 = 0x215F
-0x5046 = 0x2160
-0x504E = 0x2161
-0x5053 = 0x2162
-0x5057 = 0x2163
-0x5063 = 0x2164
-0x5066 = 0x2165
-0x506A = 0x2166
-0x5070 = 0x2167
-0x5088 = 0x2169
-0x5092 = 0x216A
-0x5093 = 0x216B
-0x5095 = 0x216C
-0x5096 = 0x216D
-0x509C = 0x216E
-0x50A3 = 0x2168
-0x50AA = 0x216F
-0x50B1 = 0x2171
-0x50BA = 0x2172
-0x50BB = 0x2173
-0x50C4 = 0x2174
-0x50C7 = 0x2175
-0x50CE = 0x2178
-0x50D4 = 0x217A
-0x50D9 = 0x217B
-0x50E1 = 0x217C
-0x50E9 = 0x217D
-0x50F3 = 0x2176
-0x5108 = 0x2321
-0x5117 = 0x2323
-0x511B = 0x2324
-0x5160 = 0x2326
-0x5173 = 0x2328
-0x517B = 0x7474
-0x5183 = 0x2329
-0x518B = 0x232A
-0x5198 = 0x232C
-0x51A3 = 0x232D
-0x51AD = 0x232E
-0x51BC = 0x2330
-0x51F3 = 0x2333
-0x51F4 = 0x2334
-0x5202 = 0x2335
-0x5212 = 0x2336
-0x5216 = 0x2337
-0x5255 = 0x2339
-0x525C = 0x233A
-0x526C = 0x233B
-0x5277 = 0x233C
-0x5282 = 0x233E
-0x5284 = 0x233D
-0x5298 = 0x2340
-0x52A4 = 0x2342
-0x52A6 = 0x2343
-0x52AF = 0x2344
-0x52BA = 0x2345
-0x52BB = 0x2346
-0x52CA = 0x2347
-0x52D1 = 0x2349
-0x52F7 = 0x234B
-0x530A = 0x234C
-0x530B = 0x234D
-0x5324 = 0x234E
-0x5335 = 0x234F
-0x533E = 0x2350
-0x5342 = 0x2351
-0x5367 = 0x2354
-0x536C = 0x2355
-0x537A = 0x2356
-0x53A4 = 0x2357
-0x53B4 = 0x2358
-0x53B7 = 0x235A
-0x53C0 = 0x235B
-0x53D5 = 0x235F
-0x53DA = 0x2360
-0x53F4 = 0x2362
-0x53F5 = 0x2363
-0x5424 = 0x2365
-0x5428 = 0x2366
-0x5443 = 0x2368
-0x5455 = 0x2364
-0x5462 = 0x2369
-0x5466 = 0x236A
-0x546C = 0x236B
-0x548A = 0x236C
-0x548D = 0x236D
-0x5495 = 0x236E
-0x54A0 = 0x236F
-0x54A6 = 0x2370
-0x54AD = 0x2371
-0x54AE = 0x2372
-0x54B7 = 0x2373
-0x54BA = 0x2374
-0x54BF = 0x2375
-0x54C3 = 0x2376
-0x54EC = 0x2378
-0x54EF = 0x2379
-0x54F1 = 0x237A
-0x54F3 = 0x237B
-0x5500 = 0x237C
-0x5501 = 0x237D
-0x5509 = 0x237E
-0x553C = 0x2421
-0x5541 = 0x2422
-0x5547 = 0x2424
-0x554A = 0x2425
-0x5560 = 0x2427
-0x5561 = 0x2428
-0x5564 = 0x2429
-0x557D = 0x242B
-0x5582 = 0x242C
-0x5588 = 0x242D
-0x5591 = 0x242E
-0x55BF = 0x2433
-0x55C9 = 0x2434
-0x55CC = 0x2435
-0x55D1 = 0x2436
-0x55D2 = 0x2430
-0x55DD = 0x2437
-0x55E2 = 0x2439
-0x55E9 = 0x243B
-0x5607 = 0x243E
-0x5610 = 0x243F
-0x5628 = 0x243C
-0x5630 = 0x2440
-0x5637 = 0x2441
-0x563D = 0x2443
-0x563F = 0x2444
-0x5640 = 0x2445
-0x5647 = 0x2446
-0x565E = 0x2447
-0x5660 = 0x2448
-0x566D = 0x2449
-0x5688 = 0x244B
-0x568C = 0x244C
-0x5695 = 0x244D
-0x569A = 0x244E
-0x569D = 0x244F
-0x56A8 = 0x2450
-0x56AD = 0x2451
-0x56B2 = 0x2452
-0x56C5 = 0x2453
-0x56CD = 0x2454
-0x56DF = 0x2455
-0x56E8 = 0x2456
-0x56F6 = 0x2457
-0x56F7 = 0x2458
-0x5715 = 0x245A
-0x5723 = 0x245B
-0x5729 = 0x245D
-0x5745 = 0x245F
-0x5746 = 0x2460
-0x574C = 0x2461
-0x574D = 0x2462
-0x5768 = 0x2464
-0x576F = 0x2465
-0x5773 = 0x2466
-0x5774 = 0x2467
-0x5775 = 0x2468
-0x577B = 0x2469
-0x579A = 0x246D
-0x579D = 0x246E
-0x579E = 0x246F
-0x57A8 = 0x2470
-0x57AC = 0x246C
-0x57CC = 0x2473
-0x57D7 = 0x2471
-0x57DE = 0x2476
-0x57E6 = 0x2477
-0x57F0 = 0x2478
-0x57F8 = 0x247A
-0x57FB = 0x247B
-0x57FD = 0x247C
-0x5804 = 0x247D
-0x581E = 0x247E
-0x5820 = 0x2521
-0x5827 = 0x2522
-0x5832 = 0x2523
-0x5839 = 0x2524
-0x5849 = 0x2526
-0x584C = 0x2527
-0x5867 = 0x2528
-0x588A = 0x2529
-0x588B = 0x252A
-0x588D = 0x252B
-0x588F = 0x252C
-0x5890 = 0x252D
-0x5894 = 0x252E
-0x589D = 0x252F
-0x58AA = 0x2530
-0x58B1 = 0x2531
-0x58C3 = 0x2533
-0x58CD = 0x2534
-0x58E2 = 0x2535
-0x58F3 = 0x2536
-0x58F4 = 0x2537
-0x5905 = 0x2538
-0x5906 = 0x2539
-0x590B = 0x253A
-0x590D = 0x253B
-0x5914 = 0x253C
-0x5924 = 0x253D
-0x593D = 0x2540
-0x5946 = 0x2542
-0x595B = 0x2545
-0x595F = 0x2546
-0x5975 = 0x2548
-0x5976 = 0x2549
-0x597C = 0x254A
-0x599F = 0x254B
-0x59AE = 0x254C
-0x59BC = 0x254D
-0x59C8 = 0x254E
-0x59CD = 0x254F
-0x59DE = 0x2550
-0x59E3 = 0x2551
-0x59E4 = 0x2552
-0x59E7 = 0x2553
-0x59EE = 0x2554
-0x5A0C = 0x2558
-0x5A0D = 0x2559
-0x5A17 = 0x255A
-0x5A27 = 0x255B
-0x5A2D = 0x255C
-0x5A55 = 0x255D
-0x5A65 = 0x255E
-0x5A7A = 0x255F
-0x5A8B = 0x2560
-0x5A9C = 0x2561
-0x5A9F = 0x2562
-0x5AA0 = 0x2563
-0x5AA2 = 0x2564
-0x5AB1 = 0x2565
-0x5AB3 = 0x2566
-0x5AB5 = 0x2567
-0x5ABA = 0x2568
-0x5ABF = 0x2569
-0x5ADA = 0x256A
-0x5ADC = 0x256B
-0x5AE0 = 0x256C
-0x5AE5 = 0x256D
-0x5AEE = 0x256F
-0x5AF0 = 0x256E
-0x5AF5 = 0x2570
-0x5B00 = 0x2571
-0x5B08 = 0x2572
-0x5B17 = 0x2573
-0x5B2D = 0x2575
-0x5B34 = 0x2574
-0x5B4C = 0x2576
-0x5B52 = 0x2577
-0x5B68 = 0x2578
-0x5B6F = 0x2579
-0x5B7C = 0x257A
-0x5B7F = 0x257B
-0x5B81 = 0x257C
-0x5B84 = 0x257D
-0x5B96 = 0x2821
-0x5BAC = 0x2822
-0x5BC0 = 0x2824
-0x5BCE = 0x2826
-0x5BD6 = 0x2827
-0x5BF1 = 0x282A
-0x5BFD = 0x282B
-0x5C03 = 0x282D
-0x5C29 = 0x282E
-0x5C30 = 0x282F
-0x5C5F = 0x2831
-0x5C63 = 0x2832
-0x5C67 = 0x2833
-0x5C68 = 0x2834
-0x5C69 = 0x2835
-0x5C70 = 0x2836
-0x5C7C = 0x2839
-0x5C88 = 0x283C
-0x5C8A = 0x283D
-0x5CA0 = 0x2841
-0x5CA2 = 0x2842
-0x5CA6 = 0x2843
-0x5CA7 = 0x2844
-0x5CAD = 0x2846
-0x5CB5 = 0x2847
-0x5CC9 = 0x2849
-0x5D06 = 0x284C
-0x5D10 = 0x284D
-0x5D1D = 0x284F
-0x5D20 = 0x2850
-0x5D24 = 0x2851
-0x5D26 = 0x2852
-0x5D2B = 0x284E
-0x5D31 = 0x2853
-0x5D39 = 0x2854
-0x5D42 = 0x2855
-0x5D61 = 0x2857
-0x5D6A = 0x2858
-0x5D70 = 0x285A
-0x5D88 = 0x285D
-0x5D92 = 0x285F
-0x5D94 = 0x2860
-0x5D97 = 0x2861
-0x5D99 = 0x2862
-0x5DB0 = 0x2863
-0x5DB2 = 0x2864
-0x5DB4 = 0x2865
-0x5DB9 = 0x2867
-0x5DD1 = 0x2868
-0x5DD7 = 0x2869
-0x5DD8 = 0x286A
-0x5DE0 = 0x286B
-0x5DE4 = 0x286D
-0x5DE9 = 0x286E
-0x5E00 = 0x2870
-0x5E12 = 0x2872
-0x5E15 = 0x2873
-0x5E1F = 0x2875
-0x5E2E = 0x2876
-0x5E3E = 0x2877
-0x5E49 = 0x2878
-0x5E56 = 0x287A
-0x5E6B = 0x287C
-0x5E6C = 0x287D
-0x5E6D = 0x287E
-0x5E6E = 0x2C21
-0x5EA5 = 0x2C23
-0x5EAA = 0x2C24
-0x5EAC = 0x2C25
-0x5EB9 = 0x2C26
-0x5EBF = 0x2C27
-0x5EC6 = 0x2C28
-0x5ED2 = 0x2C29
-0x5ED9 = 0x2C2A
-0x5EFD = 0x2C2C
-0x5F08 = 0x2C2D
-0x5F0E = 0x2C2E
-0x5F1C = 0x2C2F
-0x5F1E = 0x2C31
-0x5F47 = 0x2C32
-0x5F63 = 0x2C33
-0x5F72 = 0x2C34
-0x5F7E = 0x2C35
-0x5F8F = 0x2C36
-0x5FA2 = 0x2C37
-0x5FA4 = 0x2C38
-0x5FB8 = 0x2C39
-0x5FC4 = 0x2C3A
-0x5FC7 = 0x2C3C
-0x5FCB = 0x2C3D
-0x5FD2 = 0x2C3E
-0x5FD3 = 0x2C3F
-0x5FD4 = 0x2C40
-0x5FE2 = 0x2C41
-0x5FEE = 0x2C42
-0x5FEF = 0x2C43
-0x5FF3 = 0x2C44
-0x5FFC = 0x2C45
-0x6017 = 0x2C47
-0x6022 = 0x2C48
-0x6024 = 0x2C49
-0x604C = 0x2C4B
-0x607F = 0x2C4C
-0x608A = 0x2C4D
-0x6095 = 0x2C4E
-0x60A8 = 0x2C4F
-0x60B0 = 0x2C51
-0x60B1 = 0x2C52
-0x60BE = 0x2C53
-0x60C8 = 0x2C54
-0x60D9 = 0x2C55
-0x60DB = 0x2C56
-0x60EE = 0x2C57
-0x60F2 = 0x2C58
-0x60F5 = 0x2C59
-0x6110 = 0x2C5A
-0x6112 = 0x2C5B
-0x6113 = 0x2C5C
-0x6119 = 0x2C5D
-0x611E = 0x2C5E
-0x613A = 0x2C5F
-0x6141 = 0x2C61
-0x6146 = 0x2C62
-0x6160 = 0x2C63
-0x617C = 0x2C64
-0x6192 = 0x2C66
-0x6193 = 0x2C67
-0x6197 = 0x2C68
-0x6198 = 0x2C69
-0x61A5 = 0x2C6A
-0x61A8 = 0x2C6B
-0x61AD = 0x2C6C
-0x61D5 = 0x2C6E
-0x61DD = 0x2C6F
-0x61DF = 0x2C70
-0x61F5 = 0x2C71
-0x6215 = 0x2C73
-0x6223 = 0x2C74
-0x6229 = 0x2C75
-0x6246 = 0x2C76
-0x624C = 0x2C77
-0x6251 = 0x2C78
-0x6252 = 0x2C79
-0x6261 = 0x2C7A
-0x6264 = 0x2C7B
-0x626D = 0x2C7D
-0x6273 = 0x2C7E
-0x627B = 0x2C7C
-0x6299 = 0x2D21
-0x62A6 = 0x2D22
-0x62D5 = 0x2D23
-0x62FD = 0x2D25
-0x6303 = 0x2D26
-0x630D = 0x2D27
-0x6310 = 0x2D28
-0x6332 = 0x2D2B
-0x6335 = 0x2D2C
-0x633B = 0x2D2D
-0x633C = 0x2D2E
-0x6341 = 0x2D2F
-0x6344 = 0x2D30
-0x634E = 0x2D31
-0x6359 = 0x2D33
-0x636C = 0x2D36
-0x6384 = 0x2D37
-0x6394 = 0x2D3A
-0x6399 = 0x2D38
-0x63BD = 0x2D3B
-0x63D4 = 0x2D3D
-0x63D5 = 0x2D3E
-0x63DC = 0x2D3F
-0x63E0 = 0x2D40
-0x63EB = 0x2D41
-0x63EC = 0x2D42
-0x63F2 = 0x2D43
-0x63F7 = 0x2D3C
-0x6409 = 0x2D44
-0x641E = 0x2D45
-0x6425 = 0x2D46
-0x6429 = 0x2D47
-0x642F = 0x2D48
-0x645A = 0x2D49
-0x645B = 0x2D4A
-0x645D = 0x2D4B
-0x6473 = 0x2D4C
-0x647D = 0x2D4D
-0x6487 = 0x2D4E
-0x6491 = 0x2D4F
-0x649D = 0x2D50
-0x649F = 0x2D51
-0x64CB = 0x2D52
-0x64CC = 0x2D53
-0x64D5 = 0x2D54
-0x64D7 = 0x2D55
-0x64E4 = 0x2D57
-0x64E5 = 0x2D58
-0x64FF = 0x2D59
-0x6504 = 0x2D5A
-0x650F = 0x2D5C
-0x6514 = 0x2D5D
-0x6516 = 0x2D5E
-0x651E = 0x2D60
-0x6532 = 0x2D61
-0x6544 = 0x2D62
-0x6554 = 0x2D63
-0x656B = 0x2D64
-0x657A = 0x2D65
-0x6581 = 0x2D66
-0x6584 = 0x2D67
-0x6585 = 0x2D68
-0x658A = 0x2D69
-0x65B2 = 0x2D6A
-0x65B5 = 0x2D6B
-0x65B8 = 0x2D6C
-0x65BF = 0x2D6D
-0x65C2 = 0x2D6E
-0x65C9 = 0x2D6F
-0x65D4 = 0x2D70
-0x65F2 = 0x2D72
-0x65F9 = 0x2D73
-0x65FC = 0x2D74
-0x6604 = 0x2D75
-0x6608 = 0x2D76
-0x6621 = 0x2D77
-0x662A = 0x2D78
-0x6645 = 0x2D79
-0x664E = 0x2D7B
-0x6651 = 0x2D7A
-0x6657 = 0x2D7E
-0x665B = 0x2E21
-0x6663 = 0x2E22
-0x666A = 0x2E25
-0x666B = 0x2E26
-0x666C = 0x2E27
-0x666D = 0x2E28
-0x667B = 0x2E29
-0x6680 = 0x2E2A
-0x6690 = 0x2E2B
-0x6692 = 0x2E2C
-0x6699 = 0x2E2D
-0x66AD = 0x2E2F
-0x66B1 = 0x2E30
-0x66B5 = 0x2E31
-0x66BF = 0x2E33
-0x66EC = 0x2E35
-0x6701 = 0x2E37
-0x6705 = 0x2E38
-0x6712 = 0x2E39
-0x6719 = 0x2E3B
-0x674C = 0x2E3E
-0x674D = 0x2E3F
-0x6754 = 0x2E40
-0x675D = 0x2E41
-0x6774 = 0x2E45
-0x6776 = 0x2E46
-0x6792 = 0x2E48
-0x67B0 = 0x2E4C
-0x67B2 = 0x2E4D
-0x67C3 = 0x2E4E
-0x67C8 = 0x2E4F
-0x67D2 = 0x2E50
-0x67D9 = 0x2E51
-0x67DB = 0x2E52
-0x67F0 = 0x2E53
-0x67F7 = 0x2E54
-0x6810 = 0x2E4B
-0x6818 = 0x2E58
-0x681F = 0x2E59
-0x682D = 0x2E5A
-0x6833 = 0x2E5C
-0x683B = 0x2E5D
-0x683E = 0x2E5E
-0x6844 = 0x2E5F
-0x6845 = 0x2E60
-0x6849 = 0x2E61
-0x684C = 0x2E62
-0x6855 = 0x2E63
-0x6857 = 0x2E64
-0x686B = 0x2E66
-0x686E = 0x2E67
-0x687A = 0x2E68
-0x687C = 0x2E69
-0x6882 = 0x2E6A
-0x6890 = 0x2E6B
-0x6896 = 0x2E6C
-0x6898 = 0x2E6E
-0x6899 = 0x2E6F
-0x689A = 0x2E70
-0x689C = 0x2E71
-0x68AA = 0x2E72
-0x68AB = 0x2E73
-0x68B4 = 0x2E74
-0x68BB = 0x2E75
-0x68C3 = 0x2E7A
-0x68C5 = 0x2E7B
-0x68CC = 0x2E7C
-0x68CF = 0x2E7D
-0x68D6 = 0x2E7E
-0x68D9 = 0x2F21
-0x68E4 = 0x2F22
-0x68E5 = 0x2F23
-0x68EC = 0x2F24
-0x68F7 = 0x2F25
-0x68FB = 0x2E76
-0x6903 = 0x2F26
-0x6907 = 0x2F27
-0x693B = 0x2F2B
-0x6946 = 0x2F2D
-0x6969 = 0x2F2E
-0x696C = 0x2F2F
-0x6972 = 0x2F30
-0x697A = 0x2F31
-0x697F = 0x2F32
-0x6992 = 0x2F33
-0x6996 = 0x2F35
-0x6998 = 0x2F36
-0x69A6 = 0x2F37
-0x69B0 = 0x2F38
-0x69B7 = 0x2F39
-0x69BA = 0x2F3A
-0x69BC = 0x2F3B
-0x69C0 = 0x2F3C
-0x69D1 = 0x2F3D
-0x69D6 = 0x2F3E
-0x69E3 = 0x2F44
-0x69EE = 0x2F45
-0x69EF = 0x2F46
-0x69F3 = 0x2F47
-0x69F4 = 0x2F49
-0x69FE = 0x2F4A
-0x6A11 = 0x2F4B
-0x6A1A = 0x2F4C
-0x6A1D = 0x2F4D
-0x6A30 = 0x2F41
-0x6A32 = 0x2F4F
-0x6A33 = 0x2F50
-0x6A34 = 0x2F51
-0x6A3F = 0x2F52
-0x6A46 = 0x2F53
-0x6A49 = 0x2F54
-0x6A4E = 0x2F56
-0x6A52 = 0x2F57
-0x6A64 = 0x2F58
-0x6A7A = 0x2F55
-0x6A7E = 0x2F5A
-0x6A83 = 0x2F5B
-0x6A8B = 0x2F5C
-0x6A91 = 0x2F5E
-0x6A9F = 0x2F5F
-0x6AA1 = 0x2F60
-0x6AAB = 0x2F62
-0x6ABD = 0x2F63
-0x6AC6 = 0x2F64
-0x6AD0 = 0x2F66
-0x6AD4 = 0x2F65
-0x6ADC = 0x2F67
-0x6ADD = 0x2F68
-0x6AEC = 0x2F6B
-0x6AF1 = 0x2F6C
-0x6AF2 = 0x2F6D
-0x6AF3 = 0x2F6E
-0x6AFD = 0x2F6F
-0x6B0B = 0x2F71
-0x6B0F = 0x2F72
-0x6B10 = 0x2F73
-0x6B11 = 0x2F74
-0x6B17 = 0x2F76
-0x6B2F = 0x2F78
-0x6B4A = 0x2F79
-0x6B58 = 0x2F7A
-0x6B6C = 0x2F7B
-0x6B75 = 0x2F7C
-0x6B7A = 0x2F7D
-0x6B81 = 0x2F7E
-0x6B9B = 0x6E21
-0x6BAE = 0x6E22
-0x6BBD = 0x6E24
-0x6BBE = 0x6E25
-0x6BC7 = 0x6E26
-0x6BC8 = 0x6E27
-0x6BC9 = 0x6E28
-0x6BDA = 0x6E29
-0x6BE6 = 0x6E2A
-0x6BE7 = 0x6E2B
-0x6BEE = 0x6E2C
-0x6BF1 = 0x6E2D
-0x6C02 = 0x6E2E
-0x6C0A = 0x6E2F
-0x6C0E = 0x6E30
-0x6C35 = 0x6E31
-0x6C36 = 0x6E32
-0x6C3A = 0x6E33
-0x6C3F = 0x6E35
-0x6C4D = 0x6E36
-0x6C5B = 0x6E37
-0x6C67 = 0x6E4F
-0x6C6D = 0x6E38
-0x6C84 = 0x6E39
-0x6C89 = 0x6E3A
-0x6C94 = 0x6E3C
-0x6C95 = 0x6E3D
-0x6C97 = 0x6E3E
-0x6CAD = 0x6E3F
-0x6CC2 = 0x6E40
-0x6CD0 = 0x6E41
-0x6CD6 = 0x6E43
-0x6CDA = 0x6E44
-0x6CDC = 0x6E45
-0x6CE9 = 0x6E46
-0x6CEC = 0x6E47
-0x6CED = 0x6E48
-0x6D00 = 0x6E4A
-0x6D0A = 0x6E4B
-0x6D24 = 0x6E4C
-0x6D26 = 0x6E4D
-0x6D27 = 0x6E4E
-0x6D2F = 0x6E50
-0x6D34 = 0x6E65
-0x6D3C = 0x6E51
-0x6D5B = 0x6E52
-0x6D5E = 0x6E53
-0x6D60 = 0x6E54
-0x6D70 = 0x6E55
-0x6D80 = 0x6E56
-0x6D81 = 0x6E57
-0x6D8A = 0x6E58
-0x6D8D = 0x6E59
-0x6D91 = 0x6E5A
-0x6D98 = 0x6E5B
-0x6DAB = 0x6E61
-0x6DAE = 0x6E62
-0x6DB4 = 0x6E63
-0x6DC2 = 0x6E64
-0x6DC8 = 0x6E66
-0x6DCE = 0x6E67
-0x6DCF = 0x6E68
-0x6DD0 = 0x6E69
-0x6DDF = 0x6E6A
-0x6DE9 = 0x6E6B
-0x6DF6 = 0x6E6C
-0x6E17 = 0x6E5D
-0x6E1E = 0x6E6E
-0x6E22 = 0x6E6F
-0x6E27 = 0x6E70
-0x6E32 = 0x6E72
-0x6E36 = 0x6E6D
-0x6E3C = 0x6E73
-0x6E48 = 0x6E74
-0x6E49 = 0x6E75
-0x6E4B = 0x6E76
-0x6E4C = 0x6E77
-0x6E4F = 0x6E78
-0x6E51 = 0x6E79
-0x6E53 = 0x6E7A
-0x6E54 = 0x6E7B
-0x6E57 = 0x6E7C
-0x6E63 = 0x6E7D
-0x6E93 = 0x6F21
-0x6EA7 = 0x6F22
-0x6EB4 = 0x6F23
-0x6EBF = 0x6F24
-0x6EC3 = 0x6F25
-0x6ECA = 0x6F26
-0x6ED9 = 0x6F27
-0x6EEB = 0x6F29
-0x6EF9 = 0x6F2A
-0x6EFB = 0x6F2B
-0x6F0A = 0x6F2C
-0x6F0C = 0x6F2D
-0x6F18 = 0x6F2E
-0x6F25 = 0x6F2F
-0x6F35 = 0x6F28
-0x6F36 = 0x6F30
-0x6F3C = 0x6F31
-0x6F52 = 0x6F33
-0x6F57 = 0x6F34
-0x6F5A = 0x6F35
-0x6F60 = 0x6F36
-0x6F68 = 0x6F37
-0x6F7D = 0x6F39
-0x6F90 = 0x6F3A
-0x6F96 = 0x6F3B
-0x6F98 = 0x6F38
-0x6F9F = 0x6F3D
-0x6FA5 = 0x6F3E
-0x6FAF = 0x6F3F
-0x6FB5 = 0x6F41
-0x6FBE = 0x6F3C
-0x6FC8 = 0x6F42
-0x6FC9 = 0x6F43
-0x6FDA = 0x6F44
-0x6FDE = 0x6F45
-0x6FE9 = 0x6F46
-0x6FFC = 0x6F48
-0x7000 = 0x6F49
-0x7007 = 0x6F4A
-0x700A = 0x6F4B
-0x7023 = 0x6F4C
-0x7039 = 0x6F4E
-0x703A = 0x6F4F
-0x703C = 0x6F50
-0x7043 = 0x6F51
-0x7047 = 0x6F52
-0x704B = 0x6F53
-0x7054 = 0x6F55
-0x7065 = 0x6F56
-0x7069 = 0x6F57
-0x706C = 0x6F58
-0x706E = 0x6F59
-0x7076 = 0x6F5A
-0x707E = 0x6F5B
-0x7081 = 0x6F5C
-0x7086 = 0x6F5D
-0x7095 = 0x6F5E
-0x7097 = 0x6F5F
-0x709F = 0x6F62
-0x70B1 = 0x6F63
-0x70BB = 0x6F60
-0x70CA = 0x6F66
-0x70D1 = 0x6F67
-0x70D3 = 0x6F68
-0x70DC = 0x6F69
-0x70EC = 0x6F65
-0x7103 = 0x6F6A
-0x7104 = 0x6F6B
-0x7106 = 0x6F6C
-0x7107 = 0x6F6D
-0x7108 = 0x6F6E
-0x710C = 0x6F6F
-0x712F = 0x6F71
-0x7131 = 0x6F72
-0x714A = 0x6F74
-0x7150 = 0x6F73
-0x7153 = 0x6F75
-0x715E = 0x6F76
-0x7180 = 0x6F79
-0x7196 = 0x6F78
-0x719B = 0x6F7A
-0x71A0 = 0x6F7B
-0x71A2 = 0x6F7C
-0x71AE = 0x6F7D
-0x71AF = 0x6F7E
-0x71B3 = 0x7021
-0x71CB = 0x7023
-0x71D3 = 0x7024
-0x71D9 = 0x7025
-0x71DC = 0x7026
-0x7207 = 0x7027
-0x722B = 0x702A
-0x7234 = 0x702B
-0x7238 = 0x702C
-0x7239 = 0x702D
-0x7242 = 0x702F
-0x7253 = 0x7030
-0x7257 = 0x7031
-0x7263 = 0x7032
-0x726E = 0x7034
-0x726F = 0x7035
-0x7278 = 0x7036
-0x727F = 0x7037
-0x728E = 0x7038
-0x72AD = 0x703A
-0x72AE = 0x703B
-0x72B0 = 0x703C
-0x72B1 = 0x703D
-0x72C1 = 0x703E
-0x72CC = 0x7040
-0x72F3 = 0x7043
-0x72FA = 0x7044
-0x7307 = 0x7045
-0x7312 = 0x7046
-0x7318 = 0x7047
-0x7319 = 0x7048
-0x732C = 0x704B
-0x7331 = 0x704C
-0x7333 = 0x704D
-0x7339 = 0x704A
-0x733D = 0x704E
-0x7352 = 0x704F
-0x736B = 0x7051
-0x736C = 0x7052
-0x736E = 0x7054
-0x736F = 0x7055
-0x7371 = 0x7056
-0x7377 = 0x7057
-0x7381 = 0x7058
-0x7385 = 0x7059
-0x738A = 0x705A
-0x7394 = 0x705B
-0x7398 = 0x705C
-0x739C = 0x705D
-0x739E = 0x705E
-0x73A5 = 0x705F
-0x73A8 = 0x7060
-0x73B5 = 0x7061
-0x73B7 = 0x7062
-0x73B9 = 0x7063
-0x73BC = 0x7064
-0x73BF = 0x7065
-0x73C5 = 0x7066
-0x73CB = 0x7067
-0x73E1 = 0x7068
-0x73E7 = 0x7069
-0x73F9 = 0x706A
-0x73FA = 0x706C
-0x7401 = 0x706D
-0x7413 = 0x706B
-0x7424 = 0x706E
-0x7431 = 0x706F
-0x7439 = 0x7070
-0x7440 = 0x7072
-0x7443 = 0x7073
-0x744D = 0x7074
-0x7452 = 0x7075
-0x7453 = 0x7071
-0x745D = 0x7076
-0x7471 = 0x7077
-0x7481 = 0x7078
-0x7485 = 0x7079
-0x7488 = 0x707A
-0x7492 = 0x707C
-0x7497 = 0x707D
-0x7499 = 0x707E
-0x74A0 = 0x7121
-0x74A1 = 0x7122
-0x74A5 = 0x7123
-0x74AA = 0x7124
-0x74AB = 0x7125
-0x74B9 = 0x7126
-0x74BA = 0x7128
-0x74BB = 0x7127
-0x74D6 = 0x7129
-0x74D8 = 0x712A
-0x74DE = 0x712B
-0x74EB = 0x712D
-0x74EF = 0x712C
-0x74FA = 0x712F
-0x7520 = 0x7131
-0x7524 = 0x7132
-0x752A = 0x7133
-0x753D = 0x7136
-0x753E = 0x7137
-0x7540 = 0x7138
-0x7548 = 0x7139
-0x754E = 0x713A
-0x7550 = 0x713B
-0x7552 = 0x713C
-0x756C = 0x713D
-0x7571 = 0x713F
-0x7572 = 0x713E
-0x757A = 0x7140
-0x757D = 0x7141
-0x757E = 0x7142
-0x7581 = 0x7143
-0x758C = 0x7145
-0x75A2 = 0x7147
-0x75B0 = 0x7149
-0x75B7 = 0x714A
-0x75BF = 0x714B
-0x75C0 = 0x714C
-0x75C6 = 0x714D
-0x75CF = 0x714E
-0x75D3 = 0x714F
-0x75DD = 0x7150
-0x75DF = 0x7151
-0x75E0 = 0x7152
-0x75E7 = 0x7153
-0x75EC = 0x7154
-0x75EE = 0x7155
-0x75F1 = 0x7156
-0x75F9 = 0x7157
-0x7603 = 0x7158
-0x7607 = 0x715A
-0x760F = 0x715B
-0x7613 = 0x715E
-0x7618 = 0x7159
-0x761B = 0x715F
-0x761C = 0x7160
-0x7625 = 0x7162
-0x7628 = 0x7163
-0x7633 = 0x7165
-0x763C = 0x7164
-0x7641 = 0x7168
-0x7649 = 0x716A
-0x7655 = 0x716B
-0x766E = 0x716D
-0x7695 = 0x716E
-0x769C = 0x716F
-0x76A0 = 0x7171
-0x76A1 = 0x7170
-0x76A7 = 0x7172
-0x76A8 = 0x7173
-0x76AF = 0x7174
-0x76C9 = 0x7176
-0x76E8 = 0x7178
-0x76EC = 0x7179
-0x7717 = 0x717B
-0x771A = 0x717C
-0x772D = 0x717D
-0x7735 = 0x717E
-0x7758 = 0x7225
-0x7760 = 0x7226
-0x776A = 0x7227
-0x7772 = 0x7229
-0x777C = 0x722A
-0x777D = 0x722B
-0x779A = 0x722E
-0x779F = 0x722F
-0x77A2 = 0x7230
-0x77A4 = 0x7231
-0x77A9 = 0x7232
-0x77DE = 0x7233
-0x77DF = 0x7234
-0x77E4 = 0x7235
-0x77E6 = 0x7236
-0x77EA = 0x7237
-0x77EC = 0x7238
-0x77F0 = 0x723A
-0x77F4 = 0x723B
-0x77FB = 0x723C
-0x7805 = 0x723E
-0x7806 = 0x723F
-0x7809 = 0x7240
-0x780D = 0x7241
-0x7819 = 0x7242
-0x7821 = 0x7243
-0x782C = 0x7244
-0x7847 = 0x7245
-0x7864 = 0x7246
-0x786A = 0x7247
-0x788A = 0x7249
-0x7894 = 0x724A
-0x789D = 0x724C
-0x789E = 0x724D
-0x789F = 0x724E
-0x78A4 = 0x724B
-0x78BB = 0x724F
-0x78C8 = 0x7250
-0x78CC = 0x7251
-0x78CE = 0x7252
-0x78D5 = 0x7253
-0x78E0 = 0x7254
-0x78E1 = 0x7255
-0x78E6 = 0x7256
-0x78F9 = 0x7257
-0x78FA = 0x7258
-0x78FB = 0x7259
-0x78FE = 0x725A
-0x7910 = 0x725C
-0x791B = 0x725D
-0x7925 = 0x725F
-0x7930 = 0x725E
-0x793B = 0x7260
-0x794A = 0x7261
-0x7958 = 0x7262
-0x795B = 0x7263
-0x7967 = 0x7265
-0x7972 = 0x7266
-0x7994 = 0x7267
-0x7995 = 0x7268
-0x7996 = 0x7269
-0x799B = 0x726A
-0x79A1 = 0x726B
-0x79A9 = 0x726C
-0x79B4 = 0x726D
-0x79BB = 0x726E
-0x79C2 = 0x726F
-0x79C7 = 0x7270
-0x79CC = 0x7271
-0x79CD = 0x7272
-0x79D6 = 0x7273
-0x7A0A = 0x7278
-0x7A11 = 0x7279
-0x7A15 = 0x727A
-0x7A1B = 0x727B
-0x7A1E = 0x727C
-0x7A2D = 0x727E
-0x7A38 = 0x7321
-0x7A47 = 0x7322
-0x7A4C = 0x7323
-0x7A56 = 0x7324
-0x7A59 = 0x7325
-0x7A5C = 0x7326
-0x7A5F = 0x7327
-0x7A60 = 0x7328
-0x7A67 = 0x7329
-0x7A6A = 0x732A
-0x7A75 = 0x732B
-0x7A78 = 0x732C
-0x7A82 = 0x732D
-0x7A8A = 0x732E
-0x7A90 = 0x732F
-0x7AA3 = 0x7330
-0x7AAC = 0x7331
-0x7AB9 = 0x7334
-0x7ABC = 0x7335
-0x7ABE = 0x7336
-0x7ACC = 0x7338
-0x7AD1 = 0x7339
-0x7AE7 = 0x733A
-0x7AE8 = 0x733B
-0x7AF4 = 0x733C
-0x7B07 = 0x733F
-0x7B27 = 0x7342
-0x7B2A = 0x7343
-0x7B2E = 0x7344
-0x7B2F = 0x7345
-0x7B31 = 0x7346
-0x7B3D = 0x7341
-0x7B41 = 0x734A
-0x7B55 = 0x734C
-0x7B64 = 0x734E
-0x7B66 = 0x734F
-0x7B69 = 0x7350
-0x7B73 = 0x7351
-0x7B79 = 0x734D
-0x7B7F = 0x7349
-0x7B90 = 0x7354
-0x7B91 = 0x7355
-0x7B9B = 0x7356
-0x7BAF = 0x7358
-0x7BB5 = 0x7359
-0x7BBC = 0x735A
-0x7BC5 = 0x735B
-0x7BCA = 0x735C
-0x7BD4 = 0x735F
-0x7BD6 = 0x7360
-0x7BDA = 0x7361
-0x7BEA = 0x7362
-0x7BF0 = 0x7363
-0x7C03 = 0x7364
-0x7C0B = 0x7365
-0x7C0E = 0x7366
-0x7C0F = 0x7367
-0x7C26 = 0x7368
-0x7C45 = 0x7369
-0x7C4A = 0x736A
-0x7C51 = 0x736B
-0x7C57 = 0x736C
-0x7C5E = 0x736D
-0x7C61 = 0x736E
-0x7C69 = 0x736F
-0x7C6E = 0x7370
-0x7C6F = 0x7371
-0x7C70 = 0x7372
-0x7CA6 = 0x7376
-0x7CB6 = 0x7378
-0x7CB7 = 0x7379
-0x7CBF = 0x737A
-0x7CC4 = 0x737C
-0x7CC8 = 0x737E
-0x7CCD = 0x7421
-0x7CD7 = 0x7423
-0x7CE6 = 0x7425
-0x7CEB = 0x7426
-0x7CF5 = 0x7428
-0x7D03 = 0x7429
-0x7D09 = 0x742A
-0x7D12 = 0x742C
-0x7D1E = 0x742D
-0x7D3D = 0x7430
-0x7D3E = 0x7431
-0x7D40 = 0x7432
-0x7D47 = 0x7433
-0x7D59 = 0x7437
-0x7D5A = 0x7438
-0x7D6A = 0x7439
-0x7D70 = 0x743A
-0x7D7F = 0x743C
-0x7D86 = 0x743E
-0x7D88 = 0x743F
-0x7D8C = 0x7440
-0x7D97 = 0x7441
-0x7D9D = 0x7443
-0x7DA7 = 0x7444
-0x7DAA = 0x7445
-0x7DB6 = 0x7446
-0x7DB7 = 0x7447
-0x7DC0 = 0x7448
-0x7DD7 = 0x7449
-0x7DD9 = 0x744A
-0x7DE6 = 0x744B
-0x7DF1 = 0x744C
-0x7DF9 = 0x744D
-0x7E10 = 0x7451
-0x7E17 = 0x7452
-0x7E1D = 0x7453
-0x7E20 = 0x7454
-0x7E27 = 0x7455
-0x7E2C = 0x7456
-0x7E45 = 0x7457
-0x7E73 = 0x7458
-0x7E75 = 0x7459
-0x7E7E = 0x745A
-0x7E86 = 0x745B
-0x7E87 = 0x745C
-0x7E91 = 0x745E
-0x7E98 = 0x745F
-0x7E9A = 0x7460
-0x7F3B = 0x7463
-0x7F3C = 0x7462
-0x7F3E = 0x7464
-0x7F43 = 0x7465
-0x7F44 = 0x7466
-0x7F4F = 0x7467
-0x7F52 = 0x746A
-0x7F61 = 0x746C
-0x7F63 = 0x746D
-0x7F64 = 0x746E
-0x7F6D = 0x746F
-0x7F7D = 0x7470
-0x7F7E = 0x7471
-0x7F90 = 0x7473
-0x7F96 = 0x7476
-0x7F9C = 0x7477
-0x7FAD = 0x7478
-0x7FC3 = 0x747A
-0x7FCF = 0x747B
-0x7FE3 = 0x747C
-0x7FE5 = 0x747D
-0x7FEF = 0x747E
-0x7FF2 = 0x7521
-0x8002 = 0x7522
-0x8008 = 0x7524
-0x800A = 0x7523
-0x800E = 0x7525
-0x8011 = 0x7526
-0x8016 = 0x7527
-0x8024 = 0x7528
-0x802C = 0x7529
-0x8030 = 0x752A
-0x8043 = 0x752B
-0x8066 = 0x752C
-0x8071 = 0x752D
-0x8075 = 0x752E
-0x807B = 0x752F
-0x8099 = 0x7530
-0x809C = 0x7531
-0x80A4 = 0x7532
-0x80A7 = 0x7533
-0x80B8 = 0x7534
-0x80C5 = 0x7536
-0x80D5 = 0x7537
-0x80D8 = 0x7538
-0x80E6 = 0x7539
-0x80F5 = 0x753C
-0x80FB = 0x753D
-0x810D = 0x753B
-0x8116 = 0x7540
-0x811E = 0x7541
-0x8124 = 0x7543
-0x8127 = 0x7544
-0x812C = 0x7545
-0x8135 = 0x753F
-0x813D = 0x7547
-0x8169 = 0x7549
-0x8181 = 0x754B
-0x8184 = 0x754D
-0x8185 = 0x754E
-0x8198 = 0x7550
-0x81B2 = 0x7551
-0x81C1 = 0x7552
-0x81C3 = 0x7553
-0x81D6 = 0x7554
-0x81DB = 0x7555
-0x81E4 = 0x7557
-0x81EC = 0x7559
-0x81FD = 0x755B
-0x81FF = 0x755C
-0x8204 = 0x755E
-0x8219 = 0x7560
-0x8221 = 0x7561
-0x8222 = 0x7562
-0x8232 = 0x7564
-0x8234 = 0x7565
-0x823C = 0x7566
-0x8245 = 0x7569
-0x8246 = 0x7567
-0x8249 = 0x7568
-0x824B = 0x756B
-0x824F = 0x756D
-0x8257 = 0x756F
-0x825C = 0x7571
-0x8263 = 0x7572
-0x8279 = 0x7576
-0x827D = 0x7578
-0x827F = 0x7579
-0x8283 = 0x757A
-0x828A = 0x757B
-0x8293 = 0x757C
-0x82A7 = 0x757D
-0x82A8 = 0x757E
-0x82B2 = 0x7621
-0x82B4 = 0x7622
-0x82BA = 0x7623
-0x82BC = 0x7624
-0x82E2 = 0x7625
-0x82E8 = 0x7626
-0x82F7 = 0x7627
-0x8307 = 0x7628
-0x8308 = 0x7629
-0x830C = 0x762A
-0x831B = 0x762C
-0x831D = 0x762D
-0x8330 = 0x762E
-0x833C = 0x762F
-0x8344 = 0x7630
-0x8354 = 0x762B
-0x8357 = 0x7631
-0x8363 = 0x2E4A
-0x837F = 0x7633
-0x838D = 0x7636
-0x8394 = 0x7637
-0x8395 = 0x7638
-0x839B = 0x7639
-0x839D = 0x763A
-0x83C9 = 0x763B
-0x83D0 = 0x763C
-0x83D4 = 0x763D
-0x83DD = 0x763E
-0x83E5 = 0x763F
-0x83F9 = 0x7640
-0x840F = 0x7641
-0x8411 = 0x7642
-0x8415 = 0x7643
-0x8417 = 0x7645
-0x8439 = 0x7646
-0x844A = 0x7647
-0x844F = 0x7648
-0x8451 = 0x7649
-0x8452 = 0x764A
-0x8459 = 0x764B
-0x845A = 0x764C
-0x845C = 0x764D
-0x8465 = 0x764F
-0x8476 = 0x7650
-0x8478 = 0x7651
-0x847C = 0x7652
-0x8481 = 0x7653
-0x8497 = 0x7656
-0x84A6 = 0x7657
-0x84BE = 0x7658
-0x84CE = 0x765A
-0x84CF = 0x765B
-0x84D3 = 0x765C
-0x84DC = 0x7655
-0x84E7 = 0x765E
-0x84EA = 0x765F
-0x84EF = 0x7660
-0x84F0 = 0x7661
-0x84F1 = 0x7662
-0x84FA = 0x7663
-0x84FD = 0x7664
-0x850C = 0x7665
-0x851B = 0x7666
-0x8524 = 0x7667
-0x8525 = 0x7668
-0x852B = 0x7669
-0x8534 = 0x766A
-0x853E = 0x766F
-0x854F = 0x766B
-0x8551 = 0x7670
-0x8553 = 0x7671
-0x855E = 0x7672
-0x8561 = 0x7673
-0x8562 = 0x7674
-0x856F = 0x766C
-0x857B = 0x7676
-0x857D = 0x7677
-0x857F = 0x7678
-0x8581 = 0x7679
-0x8586 = 0x767A
-0x8593 = 0x767B
-0x859D = 0x767C
-0x859F = 0x767D
-0x85B7 = 0x7723
-0x85BC = 0x7724
-0x85C7 = 0x7725
-0x85CA = 0x7726
-0x85D8 = 0x7727
-0x85D9 = 0x7728
-0x85DF = 0x7729
-0x85E1 = 0x772A
-0x85E6 = 0x772B
-0x85F6 = 0x772C
-0x8600 = 0x772D
-0x8611 = 0x772E
-0x861E = 0x772F
-0x8621 = 0x7730
-0x8624 = 0x7731
-0x8627 = 0x7732
-0x8639 = 0x7734
-0x863C = 0x7735
-0x8640 = 0x7737
-0x8653 = 0x7739
-0x8656 = 0x773A
-0x866F = 0x773B
-0x8677 = 0x773C
-0x867A = 0x773D
-0x8687 = 0x773E
-0x8689 = 0x773F
-0x868D = 0x7740
-0x8691 = 0x7741
-0x869C = 0x7742
-0x869D = 0x7743
-0x86A8 = 0x7744
-0x86B1 = 0x7746
-0x86B3 = 0x7747
-0x86C1 = 0x7748
-0x86C3 = 0x7749
-0x86D1 = 0x774A
-0x86D5 = 0x774B
-0x86D7 = 0x774C
-0x86E3 = 0x774D
-0x86E6 = 0x774E
-0x8705 = 0x7750
-0x8707 = 0x7751
-0x870E = 0x7752
-0x8710 = 0x7753
-0x8713 = 0x7754
-0x8719 = 0x7755
-0x871F = 0x7756
-0x8721 = 0x7757
-0x8723 = 0x7758
-0x8731 = 0x7759
-0x873A = 0x775A
-0x873E = 0x775B
-0x8740 = 0x775C
-0x8743 = 0x775D
-0x8751 = 0x775E
-0x8758 = 0x775F
-0x8764 = 0x7760
-0x8765 = 0x7761
-0x8772 = 0x7762
-0x877C = 0x7763
-0x8789 = 0x7767
-0x878B = 0x7768
-0x8793 = 0x7769
-0x87A0 = 0x776A
-0x87A7 = 0x7766
-0x87BE = 0x776D
-0x87C1 = 0x776F
-0x87CE = 0x7770
-0x87DF = 0x7772
-0x87E3 = 0x7774
-0x87E5 = 0x7775
-0x87E6 = 0x7776
-0x87EA = 0x7777
-0x87EB = 0x7778
-0x87ED = 0x7779
-0x87F5 = 0x7771
-0x8801 = 0x777A
-0x8803 = 0x777B
-0x880B = 0x777C
-0x8813 = 0x777D
-0x8828 = 0x777E
-0x882E = 0x7821
-0x8832 = 0x7822
-0x883C = 0x7823
-0x884A = 0x7825
-0x8858 = 0x7826
-0x885F = 0x7827
-0x8864 = 0x7828
-0x8869 = 0x782B
-0x886F = 0x782D
-0x88A0 = 0x782E
-0x88BC = 0x782F
-0x88BD = 0x7830
-0x88BE = 0x7831
-0x88C0 = 0x7832
-0x88D1 = 0x7835
-0x88D2 = 0x7833
-0x88D3 = 0x7836
-0x88DB = 0x7837
-0x88F0 = 0x7838
-0x88F1 = 0x7839
-0x8901 = 0x783B
-0x8937 = 0x783D
-0x8942 = 0x783F
-0x8945 = 0x7840
-0x8949 = 0x7841
-0x8962 = 0x7844
-0x8980 = 0x7845
-0x8989 = 0x7846
-0x8990 = 0x7847
-0x899F = 0x7848
-0x89B0 = 0x7849
-0x89B7 = 0x784A
-0x89D6 = 0x784B
-0x89D8 = 0x784C
-0x89EB = 0x784D
-0x89F1 = 0x784F
-0x89F3 = 0x7850
-0x89FD = 0x7851
-0x89FF = 0x7852
-0x8A11 = 0x7854
-0x8A14 = 0x7855
-0x8A21 = 0x7857
-0x8A35 = 0x7858
-0x8A3E = 0x7859
-0x8A45 = 0x785A
-0x8A4D = 0x785B
-0x8A58 = 0x785C
-0x8A90 = 0x785E
-0x8AAE = 0x785D
-0x8AB7 = 0x785F
-0x8ABE = 0x7860
-0x8AD7 = 0x7861
-0x8AFC = 0x7862
-0x8B05 = 0x7865
-0x8B0A = 0x7864
-0x8B0D = 0x7866
-0x8B1C = 0x7867
-0x8B1F = 0x7868
-0x8B2D = 0x7869
-0x8B43 = 0x786A
-0x8B51 = 0x786C
-0x8B5E = 0x786D
-0x8B76 = 0x786E
-0x8B7F = 0x786F
-0x8B81 = 0x7870
-0x8B8B = 0x7871
-0x8B94 = 0x7872
-0x8B95 = 0x7873
-0x8B9C = 0x7874
-0x8B9E = 0x7875
-0x8C39 = 0x7876
-0x8C3D = 0x7878
-0x8C45 = 0x787B
-0x8C47 = 0x787C
-0x8C4F = 0x787D
-0x8C54 = 0x787E
-0x8C57 = 0x7921
-0x8C69 = 0x7922
-0x8C6D = 0x7923
-0x8C73 = 0x7924
-0x8C92 = 0x7927
-0x8C93 = 0x7926
-0x8C99 = 0x7928
-0x8C9B = 0x792A
-0x8CA4 = 0x792B
-0x8CD5 = 0x792D
-0x8CD6 = 0x792C
-0x8CD9 = 0x792E
-0x8CF0 = 0x7930
-0x8CF1 = 0x7931
-0x8D09 = 0x7933
-0x8D0E = 0x7934
-0x8D6C = 0x7935
-0x8D84 = 0x7936
-0x8D95 = 0x7937
-0x8DA6 = 0x7938
-0x8DC6 = 0x793A
-0x8DC8 = 0x793B
-0x8DD9 = 0x793C
-0x8DEC = 0x793D
-0x8DFD = 0x7940
-0x8E06 = 0x7941
-0x8E0C = 0x793E
-0x8E14 = 0x7943
-0x8E16 = 0x7944
-0x8E21 = 0x7945
-0x8E22 = 0x7946
-0x8E27 = 0x7947
-0x8E36 = 0x794A
-0x8E39 = 0x794B
-0x8E4B = 0x794C
-0x8E54 = 0x794D
-0x8E62 = 0x794E
-0x8E6C = 0x794F
-0x8E6D = 0x7950
-0x8E6F = 0x7951
-0x8E98 = 0x7952
-0x8E9E = 0x7953
-0x8EAE = 0x7954
-0x8EB3 = 0x7955
-0x8EB5 = 0x7956
-0x8EB6 = 0x7957
-0x8EBB = 0x7958
-0x8ED1 = 0x795A
-0x8ED4 = 0x795B
-0x8EF9 = 0x795D
-0x8F00 = 0x795F
-0x8F08 = 0x7960
-0x8F17 = 0x7961
-0x8F2B = 0x7962
-0x8F40 = 0x7963
-0x8F4A = 0x7964
-0x8F58 = 0x7965
-0x8FA4 = 0x7967
-0x8FB4 = 0x7968
-0x8FB6 = 0x796A
-0x8FC1 = 0x796C
-0x8FC6 = 0x796D
-0x8FCA = 0x796F
-0x8FCD = 0x7970
-0x8FD3 = 0x7971
-0x8FD5 = 0x7972
-0x8FE0 = 0x7973
-0x8FF1 = 0x7974
-0x8FF5 = 0x7975
-0x8FFB = 0x7976
-0x9002 = 0x7977
-0x900C = 0x7978
-0x9037 = 0x7979
-0x9043 = 0x797B
-0x9044 = 0x797C
-0x905D = 0x797D
-0x9085 = 0x7A22
-0x908C = 0x7A23
-0x9090 = 0x7A24
-0x90A1 = 0x7A26
-0x90B0 = 0x7A28
-0x90B6 = 0x7A29
-0x90C3 = 0x7A2A
-0x90C8 = 0x7A2B
-0x90DC = 0x7A2D
-0x90DF = 0x7A2E
-0x90EB = 0x7A33
-0x90F2 = 0x7A31
-0x90F6 = 0x7A30
-0x90FE = 0x7A34
-0x90FF = 0x7A35
-0x9100 = 0x7A32
-0x9104 = 0x7A36
-0x9106 = 0x7A37
-0x9118 = 0x7A38
-0x911C = 0x7A39
-0x911E = 0x7A3A
-0x9137 = 0x7A3B
-0x9139 = 0x7A3C
-0x913A = 0x7A3D
-0x9146 = 0x7A3E
-0x9147 = 0x7A3F
-0x9157 = 0x7A40
-0x9159 = 0x7A41
-0x9161 = 0x7A42
-0x9164 = 0x7A43
-0x9174 = 0x7A44
-0x9179 = 0x7A45
-0x9185 = 0x7A46
-0x918E = 0x7A47
-0x91A8 = 0x7A48
-0x91AE = 0x7A49
-0x91B3 = 0x7A4A
-0x91B6 = 0x7A4B
-0x91C3 = 0x7A4C
-0x91C4 = 0x7A4D
-0x91DA = 0x7A4E
-0x91EC = 0x7A51
-0x91EE = 0x7A52
-0x9201 = 0x7A53
-0x920A = 0x7A54
-0x9216 = 0x7A55
-0x9217 = 0x7A56
-0x9233 = 0x7A58
-0x9242 = 0x7A59
-0x9247 = 0x7A5A
-0x924A = 0x7A5B
-0x924E = 0x7A5C
-0x9251 = 0x7A5D
-0x9256 = 0x7A5E
-0x9259 = 0x7A5F
-0x9260 = 0x7A60
-0x9261 = 0x7A61
-0x9265 = 0x7A62
-0x9267 = 0x7A63
-0x9268 = 0x7A64
-0x927C = 0x7A67
-0x927D = 0x7A68
-0x927F = 0x7A69
-0x9289 = 0x7A6A
-0x928D = 0x7A6B
-0x9297 = 0x7A6C
-0x9299 = 0x7A6D
-0x929F = 0x7A6E
-0x92A7 = 0x7A6F
-0x92AB = 0x7A70
-0x92B2 = 0x7A73
-0x92BF = 0x7A74
-0x92C0 = 0x7A75
-0x92C6 = 0x7A76
-0x92CE = 0x7A77
-0x92D0 = 0x7A78
-0x92D7 = 0x7A79
-0x92D9 = 0x7A7A
-0x92E5 = 0x7A7B
-0x92E7 = 0x7A7C
-0x92F7 = 0x7B22
-0x92F9 = 0x7B23
-0x92FB = 0x7B24
-0x9302 = 0x7B25
-0x930D = 0x7B26
-0x9311 = 0x7A7D
-0x9315 = 0x7B27
-0x931D = 0x7B28
-0x931E = 0x7B29
-0x9327 = 0x7B2A
-0x9329 = 0x7B2B
-0x9347 = 0x7B2E
-0x9351 = 0x7B2F
-0x9357 = 0x7B30
-0x935A = 0x7B31
-0x936B = 0x7B32
-0x9371 = 0x7B33
-0x9373 = 0x7B34
-0x9388 = 0x7B38
-0x938B = 0x7B39
-0x938F = 0x7B3A
-0x939E = 0x7B3B
-0x93A1 = 0x7B35
-0x93C1 = 0x7B40
-0x93C7 = 0x7B41
-0x93DC = 0x7B42
-0x93E2 = 0x7B43
-0x93E7 = 0x7B44
-0x93F1 = 0x7B3F
-0x93F5 = 0x7B3C
-0x93FB = 0x7B49
-0x9409 = 0x7B45
-0x940F = 0x7B46
-0x9416 = 0x7B47
-0x9417 = 0x7B48
-0x9432 = 0x7B4A
-0x9434 = 0x7B4B
-0x943B = 0x7B4C
-0x9445 = 0x7B4D
-0x946D = 0x7B50
-0x946F = 0x7B51
-0x9578 = 0x7B52
-0x9579 = 0x7B53
-0x9586 = 0x7B54
-0x958C = 0x7B55
-0x958D = 0x7B56
-0x95AB = 0x7B58
-0x95B4 = 0x7B59
-0x95C8 = 0x7B5B
-0x961D = 0x7A25
-0x962C = 0x7B5E
-0x9633 = 0x7B5F
-0x9634 = 0x7B60
-0x963C = 0x7B62
-0x9641 = 0x7B63
-0x9661 = 0x7B64
-0x9682 = 0x7B66
-0x969A = 0x7B68
-0x96A9 = 0x7B6B
-0x96AF = 0x7B6C
-0x96B3 = 0x7B6D
-0x96BA = 0x7B6E
-0x96BD = 0x7B6F
-0x96D8 = 0x7B72
-0x96DA = 0x7B73
-0x96DD = 0x7B74
-0x9714 = 0x7B76
-0x9723 = 0x7B77
-0x9736 = 0x7B79
-0x9741 = 0x7B7A
-0x9747 = 0x7B7B
-0x9755 = 0x7B7C
-0x9757 = 0x7B7D
-0x975B = 0x7B7E
-0x976A = 0x7C21
-0x9796 = 0x7C24
-0x979A = 0x7C25
-0x979E = 0x7C26
-0x97A2 = 0x7C27
-0x97B1 = 0x7C28
-0x97B2 = 0x7C29
-0x97BE = 0x7C2A
-0x97CC = 0x7C2B
-0x97D1 = 0x7C2C
-0x97D4 = 0x7C2D
-0x97D8 = 0x7C2E
-0x97D9 = 0x7C2F
-0x97E1 = 0x7C30
-0x97F1 = 0x7C31
-0x9804 = 0x7C32
-0x980D = 0x7C33
-0x980E = 0x7C34
-0x9814 = 0x7C35
-0x9816 = 0x7C36
-0x9823 = 0x7C39
-0x9825 = 0x7C3C
-0x9832 = 0x7C3A
-0x9833 = 0x7C3B
-0x9847 = 0x7C3D
-0x9866 = 0x7C3E
-0x98AB = 0x7C3F
-0x98AD = 0x7C40
-0x98B0 = 0x7C41
-0x98B7 = 0x7C43
-0x98B8 = 0x7C44
-0x98BB = 0x7C45
-0x98BC = 0x7C46
-0x98BF = 0x7C47
-0x98C2 = 0x7C48
-0x98C7 = 0x7C49
-0x98CB = 0x7C4A
-0x98E0 = 0x7C4B
-0x98E1 = 0x7C4D
-0x98E3 = 0x7C4E
-0x98E5 = 0x7C4F
-0x98EA = 0x7C50
-0x98F0 = 0x7C51
-0x98F1 = 0x7C52
-0x98F3 = 0x7C53
-0x9908 = 0x7C54
-0x9916 = 0x7C57
-0x9917 = 0x7C58
-0x991A = 0x7C5A
-0x991B = 0x7C5B
-0x991C = 0x7C5C
-0x9931 = 0x7C5E
-0x9932 = 0x7C5F
-0x9933 = 0x7C60
-0x993A = 0x7C61
-0x993B = 0x7C62
-0x993C = 0x7C63
-0x9940 = 0x7C64
-0x9941 = 0x7C65
-0x9946 = 0x7C66
-0x994D = 0x7C67
-0x994E = 0x7C68
-0x995C = 0x7C69
-0x995F = 0x7C6A
-0x9960 = 0x7C6B
-0x99A3 = 0x7C6C
-0x99A6 = 0x7C6D
-0x99B9 = 0x7C6E
-0x99BD = 0x7C6F
-0x99BF = 0x7C70
-0x99C3 = 0x7C71
-0x99C9 = 0x7C72
-0x99D4 = 0x7C73
-0x99D9 = 0x7C74
-0x99DE = 0x7C75
-0x99F0 = 0x7C77
-0x99F9 = 0x7C78
-0x99FC = 0x7C79
-0x9A0A = 0x7C7A
-0x9A11 = 0x7C7B
-0x9A16 = 0x7C7C
-0x9A1A = 0x7C7D
-0x9A20 = 0x7C7E
-0x9A31 = 0x7D21
-0x9A36 = 0x7D22
-0x9A44 = 0x7D23
-0x9A4C = 0x7D24
-0x9A58 = 0x7D25
-0x9AAF = 0x7D27
-0x9AB7 = 0x7D29
-0x9AB9 = 0x7D2B
-0x9AC6 = 0x7D2D
-0x9AD0 = 0x7D2E
-0x9AD2 = 0x7D2F
-0x9AD5 = 0x7D30
-0x9ADC = 0x7D32
-0x9AE0 = 0x7D33
-0x9AE5 = 0x7D34
-0x9AE9 = 0x7D35
-0x9B03 = 0x7D36
-0x9B0C = 0x7D37
-0x9B10 = 0x7D38
-0x9B12 = 0x7D39
-0x9B16 = 0x7D3A
-0x9B1C = 0x7D3B # 0x9B1D
-0x9B2B = 0x7D3C
-0x9B33 = 0x7D3D
-0x9B3D = 0x7D3E
-0x9B4B = 0x7D40
-0x9B63 = 0x7D41
-0x9B65 = 0x7D42
-0x9B6B = 0x7D43
-0x9B6C = 0x7D44
-0x9B73 = 0x7D45
-0x9B76 = 0x7D46
-0x9B77 = 0x7D47
-0x9BA6 = 0x7D48
-0x9BAC = 0x7D49
-0x9BB1 = 0x7D4A
-0x9BB2 = 0x7D4D
-0x9BB8 = 0x7D4E
-0x9BBE = 0x7D4F
-0x9BC7 = 0x7D50
-0x9BD8 = 0x7D52
-0x9BDD = 0x7D53
-0x9BE7 = 0x7D54
-0x9BEA = 0x7D55
-0x9BEB = 0x7D56
-0x9BEE = 0x7D58
-0x9BEF = 0x7D57
-0x9BF3 = 0x7D51
-0x9BF7 = 0x7D5C
-0x9BFA = 0x7D5A
-0x9C16 = 0x7D5E
-0x9C18 = 0x7D5F
-0x9C19 = 0x7D60
-0x9C1A = 0x7D61
-0x9C1D = 0x7D62
-0x9C22 = 0x7D63
-0x9C27 = 0x7D64
-0x9C29 = 0x7D65
-0x9C2A = 0x7D66
-0x9C31 = 0x7D68
-0x9C36 = 0x7D69
-0x9C37 = 0x7D6A
-0x9C45 = 0x7D6B
-0x9C49 = 0x7D6E
-0x9C4A = 0x7D6F
-0x9C54 = 0x7D71
-0x9C58 = 0x7D72
-0x9C5B = 0x7D73
-0x9C5C = 0x7D6C
-0x9C5D = 0x7D74
-0x9C5F = 0x7D75
-0x9C69 = 0x7D76
-0x9C6A = 0x7D77
-0x9C6B = 0x7D78
-0x9C6D = 0x7D79
-0x9C6E = 0x7D7A
-0x9C70 = 0x7D7B
-0x9C72 = 0x7D7C
-0x9C75 = 0x7D7D
-0x9C7A = 0x7D7E
-0x9CE6 = 0x7E21
-0x9CF2 = 0x7E22
-0x9D02 = 0x7E24
-0x9D0B = 0x7E23
-0x9D11 = 0x7E26
-0x9D17 = 0x7E27
-0x9D18 = 0x7E28
-0x9D32 = 0x7E2C
-0x9D42 = 0x7E2E
-0x9D4A = 0x7E2F
-0x9D5F = 0x7E30
-0x9D62 = 0x7E31
-0x9D69 = 0x7E33
-0x9D6B = 0x7E34
-0x9D73 = 0x7E36
-0x9D76 = 0x7E37
-0x9D77 = 0x7E38
-0x9D7E = 0x7E39
-0x9D84 = 0x7E3A
-0x9D8D = 0x7E3B
-0x9D99 = 0x7E3C
-0x9DA1 = 0x7E3D
-0x9DB5 = 0x7E3F
-0x9DB9 = 0x7E40
-0x9DBD = 0x7E41
-0x9DBF = 0x7E3E
-0x9DC3 = 0x7E42
-0x9DC7 = 0x7E43
-0x9DC9 = 0x7E44
-0x9DD6 = 0x7E45
-0x9DDA = 0x7E46
-0x9DDF = 0x7E47
-0x9DE0 = 0x7E48
-0x9DE3 = 0x7E49
-0x9DF4 = 0x7E4A
-0x9E02 = 0x7E4D
-0x9E0A = 0x7E4C
-0x9E0D = 0x7E4E
-0x9E19 = 0x7E4F
-0x9E1C = 0x7E50
-0x9E1D = 0x7E51
-0x9E7B = 0x7E52
-0x9E80 = 0x7E54
-0x9E85 = 0x7E55
-0x9E9B = 0x7E56
-0x9EA8 = 0x7E57
-0x9EBD = 0x7E59
-0x9EDF = 0x7E5B
-0x9EE7 = 0x7E5C
-0x9EEE = 0x7E5D
-0x9EFF = 0x7E5E
-0x9F02 = 0x7E5F
-0x9F03 = 0x7E61
-0x9F17 = 0x7E62
-0x9F19 = 0x7E63
-0x9F2F = 0x7E64
-0x9F37 = 0x7E65
-0x9F3A = 0x7E66
-0x9F3D = 0x7E67
-0x9F41 = 0x7E68
-0x9F45 = 0x7E69
-0x9F46 = 0x7E6A
-0x9F53 = 0x7E6B
-0x9F55 = 0x7E6C
-0x9F58 = 0x7E6D
-0x9F5D = 0x7E6F
-0x9F69 = 0x7E71
-0x9F6D = 0x7E73
-0x9F70 = 0x7E74
-0x9F75 = 0x7E75
-0xFA13 = 0x2E79
-0xFA20 = 0x7738
-0xFA21 = 0x7745
-0xFA24 = 0x796E
-0xFA49 = 0x7029
-0xFA58 = 0x7450
-0xFA5D = 0x7574
-0xFA5E = 0x7575
-0xFA66 = 0x7969
-END_MAP
diff --git a/enc/trans/JIS/UCS@SIP%JISX0213-1.src b/enc/trans/JIS/UCS@SIP%JISX0213-1.src
deleted file mode 100644
index f4469c60d7..0000000000
--- a/enc/trans/JIS/UCS@SIP%JISX0213-1.src
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: UCS@SIP%JISX0213-1.src,v 1.1 2007/03/05 16:58:34 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS:SIP/JISX0213-1"
-SRC_ZONE 0x000B - 0xA190
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
-##
-## Date: 12 Feb 2005 10:15:00 GMT
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-0x000B = 0x2E22
-0x0B9F = 0x4F54
-0x123D = 0x2F42
-0x131B = 0x2F4C
-0x146E = 0x2F60
-0x16B4 = 0x4F63
-0x18BD = 0x2F7B
-0x1E34 = 0x4F6E
-0x31C4 = 0x753A
-0x35C4 = 0x7572
-0x373F = 0x7629
-0x3763 = 0x7632
-0x3CFE = 0x7660
-0x47F1 = 0x776C
-0x548E = 0x787E
-0x550E = 0x7929
-0x5771 = 0x7947
-0x59C4 = 0x7954
-0x5DA1 = 0x796E
-0x6AFF = 0x7A5D
-0x6E40 = 0x7B33
-0x70F4 = 0x7B49
-0x7684 = 0x7B6C
-0x8277 = 0x7C49
-0x83CD = 0x7C51
-0xA190 = 0x7E66
-END_MAP
diff --git a/enc/trans/JIS/UCS@SIP%JISX0213-2.src b/enc/trans/JIS/UCS@SIP%JISX0213-2.src
deleted file mode 100644
index 7a33430ee9..0000000000
--- a/enc/trans/JIS/UCS@SIP%JISX0213-2.src
+++ /dev/null
@@ -1,307 +0,0 @@
-# $NetBSD: UCS@SIP%JISX0213-2.src,v 1.1 2007/03/05 16:58:34 tnozaki Exp $
-
-TYPE ROWCOL
-NAME "UCS:SIP/JISX0213-2"
-SRC_ZONE 0x0089 - 0xA6B2
-OOB_MODE INVALID
-DST_INVALID 0xFFFF
-DST_UNIT_BITS 16
-
-BEGIN_MAP
-## Shift_JIS-2004 (JIS X 0213:2004) vs Unicode mapping table
-##
-## Date: 12 Feb 2005 10:15:00 GMT
-## License:
-## Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
-## Copyright (C) 2001 I'O, All Rights Reserved.
-## You can use, modify, distribute this table freely.
-## Note:
-## [1983] JIS codepoint defined by JIS X 0208-1983
-## [1990] JIS codepoint defined by JIS X 0208-1990
-## [2000] JIS codepoint defined by JIS X 0213:2000
-## [2004] JIS codepoint defined by JIS X 0213:2004
-## [Unicode3.1] UCS codepoint defined by Unicode 3.1
-## [Unicode3.2] UCS codepoint defined by Unicode 3.2
-## Fullwidth UCS fullwidth form (U+Fxxx)
-## Windows Windows (CP932) mapping
-## Some 0213 character can't represent by one UCS character.
-## In this table, such characters are described as 'U+xxxx+xxxx'.
-##
-0x0089 = 0x2121
-0x00A2 = 0x212B
-0x00A4 = 0x212E
-0x01A2 = 0x2136
-0x0213 = 0x2146
-0x032B = 0x2170
-0x0371 = 0x2179
-0x0381 = 0x2177
-0x03F9 = 0x2322
-0x044A = 0x2325
-0x0509 = 0x2327
-0x05D6 = 0x2331
-0x0628 = 0x2332
-0x074F = 0x2338
-0x0807 = 0x233F
-0x083A = 0x2341
-0x08B9 = 0x234A
-0x097C = 0x2352
-0x099D = 0x2353
-0x0AD3 = 0x2359
-0x0B1D = 0x235C
-0x0D45 = 0x2377
-0x0DE1 = 0x242A
-0x0E64 = 0x243A
-0x0E6D = 0x2432
-0x0E95 = 0x2431
-0x0F5F = 0x243D
-0x1201 = 0x2459
-0x1255 = 0x245C
-0x1274 = 0x2463
-0x127B = 0x245E
-0x12D7 = 0x246B
-0x12E4 = 0x246A
-0x12FD = 0x2472
-0x1336 = 0x2474
-0x1344 = 0x2475
-0x13C4 = 0x2525
-0x146D = 0x2532
-0x15D7 = 0x253E
-0x1647 = 0x2547
-0x1706 = 0x2555
-0x1742 = 0x2556
-0x19C3 = 0x257E
-0x1C56 = 0x2830
-0x1D2D = 0x2837
-0x1D45 = 0x2838
-0x1D62 = 0x283B
-0x1D78 = 0x283A
-0x1D92 = 0x2845
-0x1D9C = 0x2840
-0x1DA1 = 0x283F
-0x1DB7 = 0x2848
-0x1DE0 = 0x284A
-0x1E33 = 0x284B
-0x1F1E = 0x285B
-0x1F76 = 0x2866
-0x1FFA = 0x286C
-0x217B = 0x2C22
-0x2218 = 0x7E53
-0x231E = 0x2C2B
-0x23AD = 0x2C30
-0x26F3 = 0x2C50
-0x285B = 0x2C65
-0x28AB = 0x2C6D
-0x298F = 0x2C72
-0x2AB8 = 0x2D24
-0x2B46 = 0x2D32
-0x2B4F = 0x2D29
-0x2B50 = 0x2D2A
-0x2BA6 = 0x2D35
-0x2C1D = 0x2D34
-0x2C24 = 0x2D39
-0x2DE1 = 0x2D56
-0x31B6 = 0x2E24
-0x31C3 = 0x2D7D
-0x31F5 = 0x2E23
-0x3372 = 0x2E3A
-0x33D0 = 0x2E42
-0x33D2 = 0x2E3D
-0x33D3 = 0x2E3C
-0x33D5 = 0x2E44
-0x33DA = 0x2E47
-0x33DF = 0x2E49
-0x33E4 = 0x2E43
-0x344A = 0x2E55
-0x344B = 0x2E57
-0x3451 = 0x2E56
-0x3465 = 0x2E5B
-0x34E4 = 0x2E77
-0x355A = 0x2E78
-0x3594 = 0x2F2A
-0x3638 = 0x2F42
-0x3639 = 0x2F3F
-0x363A = 0x2F43
-0x3647 = 0x2F40
-0x370C = 0x2F59
-0x371C = 0x2F4E
-0x3764 = 0x2F61
-0x37E7 = 0x2F6A
-0x37FF = 0x2F69
-0x3824 = 0x2F70
-0x383D = 0x2F75
-0x3A98 = 0x6E23
-0x3C7F = 0x6E34
-0x3D00 = 0x6E49
-0x3D0E = 0x7475
-0x3D40 = 0x6E5C
-0x3DD3 = 0x6E60
-0x3DF9 = 0x6E5F
-0x3DFA = 0x6E5E
-0x3F7E = 0x6F32
-0x4096 = 0x6F47
-0x4103 = 0x6F4D
-0x41C6 = 0x6F61
-0x41FE = 0x6F64
-0x43BC = 0x7022
-0x4629 = 0x7033
-0x46A5 = 0x7039
-0x4896 = 0x7053
-0x4A4D = 0x707B
-0x4B56 = 0x712E
-0x4B6F = 0x7130
-0x4C16 = 0x7135
-0x4D14 = 0x7144
-0x4E0E = 0x715D
-0x4E37 = 0x7161
-0x4E6A = 0x7166
-0x4E8B = 0x7169
-0x504A = 0x7175
-0x5055 = 0x7177
-0x5122 = 0x717A
-0x51A9 = 0x7221
-0x51CD = 0x7224
-0x51E5 = 0x7223
-0x521E = 0x7228
-0x524C = 0x722C
-0x542E = 0x723D
-0x54D9 = 0x7248
-0x55A7 = 0x725B
-0x57A9 = 0x7275
-0x57B4 = 0x7276
-0x59D4 = 0x7332
-0x5AE3 = 0x733E
-0x5AE4 = 0x733D
-0x5AF1 = 0x7340
-0x5BB2 = 0x7352
-0x5C4B = 0x735D
-0x5C64 = 0x735E
-0x5E2E = 0x7373
-0x5E56 = 0x7374
-0x5E62 = 0x7377
-0x5E65 = 0x7375
-0x5EC2 = 0x737D
-0x5ED8 = 0x737B
-0x5EE8 = 0x7422
-0x5F23 = 0x7424
-0x5F5C = 0x7427
-0x5FD4 = 0x742F
-0x5FE0 = 0x742E
-0x5FFB = 0x7435
-0x600C = 0x7434
-0x6017 = 0x743D
-0x6060 = 0x7442
-0x60ED = 0x744F
-0x6270 = 0x7469
-0x6286 = 0x746B
-0x634C = 0x7472
-0x6402 = 0x7479
-0x667E = 0x7535
-0x66B0 = 0x753A
-0x671D = 0x7546
-0x68DD = 0x7556
-0x68EA = 0x7558
-0x6951 = 0x755A
-0x696F = 0x755D
-0x69DD = 0x755F
-0x6A1E = 0x7563
-0x6A58 = 0x756A
-0x6A8C = 0x7570
-0x6AB7 = 0x7573
-0x6C29 = 0x2544
-0x6C73 = 0x7644
-0x6CDD = 0x764E
-0x6E65 = 0x765D
-0x6F94 = 0x7675
-0x6FF6 = 0x7721
-0x6FF7 = 0x7722
-0x6FF8 = 0x767E
-0x710D = 0x7733
-0x7139 = 0x7736
-0x73DA = 0x7765
-0x73DB = 0x7764
-0x73FE = 0x776B
-0x7410 = 0x776E
-0x7449 = 0x7773
-0x7614 = 0x782A
-0x7615 = 0x7829
-0x7631 = 0x782C
-0x7693 = 0x7834
-0x770E = 0x783C
-0x7723 = 0x783E
-0x7752 = 0x7842
-0x7985 = 0x7856
-0x7A84 = 0x7863
-0x7BB3 = 0x7877
-0x7BBE = 0x7879
-0x7BC7 = 0x787A
-0x7CB8 = 0x7925
-0x7DA0 = 0x792F
-0x7E10 = 0x7932
-0x7FB7 = 0x7939
-0x808A = 0x7942
-0x80BB = 0x7948
-0x8282 = 0x7959
-0x82F3 = 0x795E
-0x840C = 0x7966
-0x8455 = 0x796B
-0x856B = 0x797A
-0x85C8 = 0x797E
-0x85C9 = 0x7A21
-0x86D7 = 0x7A2C
-0x86FA = 0x7A2F
-0x8946 = 0x7A50
-0x8949 = 0x7A4F
-0x896B = 0x7A57
-0x8987 = 0x7A65
-0x8988 = 0x7A66
-0x89BA = 0x7A71
-0x89BB = 0x7A72
-0x8A1E = 0x7A7E
-0x8A29 = 0x7B21
-0x8A43 = 0x7B2D
-0x8A71 = 0x7B2C
-0x8A99 = 0x7B36
-0x8ACD = 0x7B37
-0x8ADD = 0x7B3E
-0x8AE4 = 0x7B3D
-0x8BC1 = 0x7B4E
-0x8BEF = 0x7B4F
-0x8D10 = 0x7B57
-0x8D71 = 0x7B5A
-0x8DFB = 0x7B5C
-0x8E1F = 0x7B5D
-0x8E36 = 0x7B61
-0x8E89 = 0x7B65
-0x8EEB = 0x7B67
-0x8F32 = 0x7B69
-0x8FF8 = 0x7B71
-0x92A0 = 0x7C22
-0x92B1 = 0x7C23
-0x9490 = 0x7C38
-0x95CF = 0x7C42
-0x967F = 0x7C4C
-0x96F0 = 0x7C56
-0x9719 = 0x7C59
-0x9750 = 0x7C5D
-0x98C6 = 0x7C76
-0x9A72 = 0x7D2C
-0x9DDB = 0x7D4B
-0x9E15 = 0x7D59
-0x9E3D = 0x7D4C
-0x9E49 = 0x7D5D
-0x9E8A = 0x7D5B
-0x9EC4 = 0x7D67
-0x9EDB = 0x7D70
-0x9EE9 = 0x7D6D
-0x9FCE = 0x7E25
-0xA01A = 0x7E2B
-0xA02F = 0x7E29
-0xA082 = 0x7E35
-0xA0F9 = 0x7E32
-0xA38C = 0x7E58
-0xA437 = 0x7E5A
-0xA5F1 = 0x7E6E
-0xA602 = 0x7E70
-0xA61A = 0x7E72
-0xA6B2 = 0x7E76
-END_MAP
diff --git a/enc/trans/big5-hkscs-tbl.rb b/enc/trans/big5-hkscs-tbl.rb
index aa9f3b55fa..5a82d3b3d2 100644
--- a/enc/trans/big5-hkscs-tbl.rb
+++ b/enc/trans/big5-hkscs-tbl.rb
@@ -18382,18921 +18382,4 @@ BIG5_HKSCS_TO_UCS_TBL= [
["8FA8",0x2F9B2],
["957A",0x2F9BC],
["8FF0",0x2F9D4],
-]
-
-UCS_TO_BIG5_HKSCS_TBL = [
- [0xA7,"A1B1"],
- [0xA8,"C6D8"],
- [0xAF,"A1C2"],
- [0xB0,"A258"],
- [0xB1,"A1D3"],
- [0xB7,"A150"],
- [0xC0,"8859"],
- [0xC1,"8857"],
- [0xC8,"885D"],
- [0xC9,"885B"],
- [0xCA,"8866"],
- [0xD2,"8861"],
- [0xD3,"885F"],
- [0xD7,"A1D1"],
- [0xE0,"886A"],
- [0xE1,"8868"],
- [0xE8,"886F"],
- [0xE9,"886D"],
- [0xEA,"88A7"],
- [0xEC,"8873"],
- [0xED,"8871"],
- [0xF2,"8877"],
- [0xF3,"8875"],
- [0xF7,"A1D2"],
- [0xF8,"C8FB"],
- [0xF9,"887B"],
- [0xFA,"8879"],
- [0xFC,"88A2"],
- [0x100,"8856"],
- [0x101,"8867"],
- [0x112,"885A"],
- [0x113,"886C"],
- [0x11A,"885C"],
- [0x11B,"886E"],
- [0x12B,"8870"],
- [0x14B,"C8FC"],
- [0x14C,"885E"],
- [0x14D,"8874"],
- [0x153,"C8FA"],
- [0x16B,"8878"],
- [0x1CD,"8858"],
- [0x1CE,"8869"],
- [0x1D0,"8872"],
- [0x1D1,"8860"],
- [0x1D2,"8876"],
- [0x1D4,"887A"],
- [0x1D6,"887C"],
- [0x1D8,"887D"],
- [0x1DA,"887E"],
- [0x1DC,"88A1"],
- [0x250,"C8F6"],
- [0x251,"886B"],
- [0x254,"C8F8"],
- [0x25B,"C8F7"],
- [0x261,"88A8"],
- [0x26A,"C8FE"],
- [0x275,"C8F9"],
- [0x283,"C8F5"],
- [0x28A,"C8FD"],
- [0x2C6,"C6D9"],
- [0x2C7,"A3BE"],
- [0x2C9,"A3BC"],
- [0x2CA,"A3BD"],
- [0x2CB,"A3BF"],
- [0x2CD,"A1C5"],
- [0x2D9,"A3BB"],
- [0x391,"A344"],
- [0x392,"A345"],
- [0x393,"A346"],
- [0x394,"A347"],
- [0x395,"A348"],
- [0x396,"A349"],
- [0x397,"A34A"],
- [0x398,"A34B"],
- [0x399,"A34C"],
- [0x39A,"A34D"],
- [0x39B,"A34E"],
- [0x39C,"A34F"],
- [0x39D,"A350"],
- [0x39E,"A351"],
- [0x39F,"A352"],
- [0x3A0,"A353"],
- [0x3A1,"A354"],
- [0x3A3,"A355"],
- [0x3A4,"A356"],
- [0x3A5,"A357"],
- [0x3A6,"A358"],
- [0x3A7,"A359"],
- [0x3A8,"A35A"],
- [0x3A9,"A35B"],
- [0x3B1,"A35C"],
- [0x3B2,"A35D"],
- [0x3B3,"A35E"],
- [0x3B4,"A35F"],
- [0x3B5,"A360"],
- [0x3B6,"A361"],
- [0x3B7,"A362"],
- [0x3B8,"A363"],
- [0x3B9,"A364"],
- [0x3BA,"A365"],
- [0x3BB,"A366"],
- [0x3BC,"A367"],
- [0x3BD,"A368"],
- [0x3BE,"A369"],
- [0x3BF,"A36A"],
- [0x3C0,"A36B"],
- [0x3C1,"A36C"],
- [0x3C3,"A36D"],
- [0x3C4,"A36E"],
- [0x3C5,"A36F"],
- [0x3C6,"A370"],
- [0x3C7,"A371"],
- [0x3C8,"A372"],
- [0x3C9,"A373"],
- [0x401,"C7F9"],
- [0x410,"C7F3"],
- [0x411,"C7F4"],
- [0x412,"C7F5"],
- [0x413,"C7F6"],
- [0x414,"C7F7"],
- [0x415,"C7F8"],
- [0x416,"C7FA"],
- [0x417,"C7FB"],
- [0x418,"C7FC"],
- [0x419,"C7FD"],
- [0x41A,"C7FE"],
- [0x41B,"C840"],
- [0x41C,"C841"],
- [0x41D,"C842"],
- [0x41E,"C843"],
- [0x41F,"C844"],
- [0x420,"C845"],
- [0x421,"C846"],
- [0x422,"C847"],
- [0x423,"C848"],
- [0x424,"C849"],
- [0x425,"C84A"],
- [0x426,"C84B"],
- [0x427,"C84C"],
- [0x428,"C84D"],
- [0x429,"C84E"],
- [0x42A,"C84F"],
- [0x42B,"C850"],
- [0x42C,"C851"],
- [0x42D,"C852"],
- [0x42E,"C853"],
- [0x42F,"C854"],
- [0x430,"C855"],
- [0x431,"C856"],
- [0x432,"C857"],
- [0x433,"C858"],
- [0x434,"C859"],
- [0x435,"C85A"],
- [0x436,"C85C"],
- [0x437,"C85D"],
- [0x438,"C85E"],
- [0x439,"C85F"],
- [0x43A,"C860"],
- [0x43B,"C861"],
- [0x43C,"C862"],
- [0x43D,"C863"],
- [0x43E,"C864"],
- [0x43F,"C865"],
- [0x440,"C866"],
- [0x441,"C867"],
- [0x442,"C868"],
- [0x443,"C869"],
- [0x444,"C86A"],
- [0x445,"C86B"],
- [0x446,"C86C"],
- [0x447,"C86D"],
- [0x448,"C86E"],
- [0x449,"C86F"],
- [0x44A,"C870"],
- [0x44B,"C871"],
- [0x44C,"C872"],
- [0x44D,"C873"],
- [0x44E,"C874"],
- [0x44F,"C875"],
- [0x451,"C85B"],
- [0x1EBE,"8863"],
- [0x1EBF,"88A4"],
- [0x1EC0,"8865"],
- [0x1EC1,"88A6"],
- [0x2013,"A156"],
- [0x2014,"A158"],
- [0x2018,"A1A5"],
- [0x2019,"A1A6"],
- [0x201C,"A1A7"],
- [0x201D,"A1A8"],
- [0x2025,"A14C"],
- [0x2026,"A14B"],
- [0x2027,"A145"],
- [0x2032,"A1AC"],
- [0x2035,"A1AB"],
- [0x203B,"A1B0"],
- [0x20AC,"A3E1"],
- [0x2103,"A24A"],
- [0x2105,"A1C1"],
- [0x2109,"A24B"],
- [0x2116,"C8D2"],
- [0x2121,"C8D3"],
- [0x2160,"A2B9"],
- [0x2161,"A2BA"],
- [0x2162,"A2BB"],
- [0x2163,"A2BC"],
- [0x2164,"A2BD"],
- [0x2165,"A2BE"],
- [0x2166,"A2BF"],
- [0x2167,"A2C0"],
- [0x2168,"A2C1"],
- [0x2169,"A2C2"],
- [0x2170,"C6B5"],
- [0x2171,"C6B6"],
- [0x2172,"C6B7"],
- [0x2173,"C6B8"],
- [0x2174,"C6B9"],
- [0x2175,"C6BA"],
- [0x2176,"C6BB"],
- [0x2177,"C6BC"],
- [0x2178,"C6BD"],
- [0x2179,"C6BE"],
- [0x2190,"A1F6"],
- [0x2191,"A1F4"],
- [0x2192,"A1F7"],
- [0x2193,"A1F5"],
- [0x2196,"A1F8"],
- [0x2197,"A1F9"],
- [0x2198,"A1FB"],
- [0x2199,"A1FA"],
- [0x21B8,"C877"],
- [0x21B9,"C878"],
- [0x21E7,"C876"],
- [0x2215,"A241"],
- [0x221A,"A1D4"],
- [0x221E,"A1DB"],
- [0x221F,"A1E8"],
- [0x2220,"A1E7"],
- [0x2223,"A1FD"],
- [0x2225,"A1FC"],
- [0x2229,"A1E4"],
- [0x222A,"A1E5"],
- [0x222B,"A1EC"],
- [0x222E,"A1ED"],
- [0x2234,"A1EF"],
- [0x2235,"A1EE"],
- [0x2252,"A1DC"],
- [0x2260,"A1DA"],
- [0x2261,"A1DD"],
- [0x2266,"A1D8"],
- [0x2267,"A1D9"],
- [0x2295,"A1F2"],
- [0x2299,"A1F3"],
- [0x22A5,"A1E6"],
- [0x22BF,"A1E9"],
- [0x23DA,"88A9"],
- [0x23DB,"88AA"],
- [0x2460,"C6A1"],
- [0x2461,"C6A2"],
- [0x2462,"C6A3"],
- [0x2463,"C6A4"],
- [0x2464,"C6A5"],
- [0x2465,"C6A6"],
- [0x2466,"C6A7"],
- [0x2467,"C6A8"],
- [0x2468,"C6A9"],
- [0x2469,"C6AA"],
- [0x2474,"C6AB"],
- [0x2475,"C6AC"],
- [0x2476,"C6AD"],
- [0x2477,"C6AE"],
- [0x2478,"C6AF"],
- [0x2479,"C6B0"],
- [0x247A,"C6B1"],
- [0x247B,"C6B2"],
- [0x247C,"C6B3"],
- [0x247D,"C6B4"],
- [0x2500,"A277"],
- [0x2502,"A278"],
- [0x250C,"A27A"],
- [0x2510,"A27B"],
- [0x2514,"A27C"],
- [0x2518,"A27D"],
- [0x251C,"A275"],
- [0x2524,"A274"],
- [0x252C,"A273"],
- [0x2534,"A272"],
- [0x253C,"A271"],
- [0x2550,"F9F9"],
- [0x2551,"F9F8"],
- [0x2552,"F9E6"],
- [0x2553,"F9EF"],
- [0x2554,"F9DD"],
- [0x2555,"F9E8"],
- [0x2556,"F9F1"],
- [0x2557,"F9DF"],
- [0x2558,"F9EC"],
- [0x2559,"F9F5"],
- [0x255A,"F9E3"],
- [0x255B,"F9EE"],
- [0x255C,"F9F7"],
- [0x255D,"F9E5"],
- [0x255E,"F9E9"],
- [0x255F,"F9F2"],
- [0x2560,"F9E0"],
- [0x2561,"F9EB"],
- [0x2562,"F9F4"],
- [0x2563,"F9E2"],
- [0x2564,"F9E7"],
- [0x2565,"F9F0"],
- [0x2566,"F9DE"],
- [0x2567,"F9ED"],
- [0x2568,"F9F6"],
- [0x2569,"F9E4"],
- [0x256A,"F9EA"],
- [0x256B,"F9F3"],
- [0x256C,"F9E1"],
- [0x256D,"F9FA"],
- [0x256E,"F9FB"],
- [0x256F,"F9FD"],
- [0x2570,"F9FC"],
- [0x2571,"A2AC"],
- [0x2572,"A2AD"],
- [0x2573,"A2AE"],
- [0x2574,"A15A"],
- [0x2581,"A262"],
- [0x2582,"A263"],
- [0x2583,"A264"],
- [0x2584,"A265"],
- [0x2585,"A266"],
- [0x2586,"A267"],
- [0x2587,"A268"],
- [0x2588,"A269"],
- [0x2589,"A270"],
- [0x258A,"A26F"],
- [0x258B,"A26E"],
- [0x258C,"A26D"],
- [0x258D,"A26C"],
- [0x258E,"A26B"],
- [0x258F,"A26A"],
- [0x2594,"A276"],
- [0x2595,"A279"],
- [0x25A0,"A1BD"],
- [0x25A1,"A1BC"],
- [0x25B2,"A1B6"],
- [0x25B3,"A1B5"],
- [0x25BC,"A1BF"],
- [0x25BD,"A1BE"],
- [0x25C6,"A1BB"],
- [0x25C7,"A1BA"],
- [0x25CB,"A1B3"],
- [0x25CE,"A1B7"],
- [0x25CF,"A1B4"],
- [0x25E2,"A2A8"],
- [0x25E3,"A2A9"],
- [0x25E4,"A2AB"],
- [0x25E5,"A2AA"],
- [0x2605,"A1B9"],
- [0x2606,"A1B8"],
- [0x2640,"A1F0"],
- [0x2642,"A1F1"],
- [0x273D,"C6E6"],
- [0x2E80,"C8D6"],
- [0x2E84,"C8D7"],
- [0x2E86,"C8D8"],
- [0x2E87,"C8D9"],
- [0x2E88,"C8DA"],
- [0x2E8A,"C8DB"],
- [0x2E8C,"C8DC"],
- [0x2E8D,"C8DD"],
- [0x2E95,"C8DE"],
- [0x2E9C,"C8DF"],
- [0x2E9D,"C8E0"],
- [0x2EA5,"C8E1"],
- [0x2EA7,"C8E2"],
- [0x2EAA,"C8E3"],
- [0x2EAC,"C8E4"],
- [0x2EAE,"C8E5"],
- [0x2EB6,"C8E6"],
- [0x2EBC,"C8E7"],
- [0x2EBE,"C8E8"],
- [0x2EC6,"C8E9"],
- [0x2ECA,"C8EA"],
- [0x2ECC,"C8EB"],
- [0x2ECD,"C8EC"],
- [0x2ECF,"C8ED"],
- [0x2ED6,"C8EE"],
- [0x2ED7,"C8EF"],
- [0x2EDE,"C8F0"],
- [0x2EE3,"C8F1"],
- [0x2F33,"C6CD"],
- [0x3000,"A140"],
- [0x3001,"A142"],
- [0x3002,"A143"],
- [0x3003,"A1B2"],
- [0x3005,"C6E0"],
- [0x3006,"C6E1"],
- [0x3007,"C6E2"],
- [0x3008,"A171"],
- [0x3009,"A172"],
- [0x300A,"A16D"],
- [0x300B,"A16E"],
- [0x300C,"A175"],
- [0x300D,"A176"],
- [0x300E,"A179"],
- [0x300F,"A17A"],
- [0x3010,"A169"],
- [0x3011,"A16A"],
- [0x3012,"A245"],
- [0x3014,"A165"],
- [0x3015,"A166"],
- [0x301D,"A1A9"],
- [0x301E,"A1AA"],
- [0x3021,"A2C3"],
- [0x3022,"A2C4"],
- [0x3023,"A2C5"],
- [0x3024,"A2C6"],
- [0x3025,"A2C7"],
- [0x3026,"A2C8"],
- [0x3027,"A2C9"],
- [0x3028,"A2CA"],
- [0x3029,"A2CB"],
- [0x3041,"C6E7"],
- [0x3042,"C6E8"],
- [0x3043,"C6E9"],
- [0x3044,"C6EA"],
- [0x3045,"C6EB"],
- [0x3046,"C6EC"],
- [0x3047,"C6ED"],
- [0x3048,"C6EE"],
- [0x3049,"C6EF"],
- [0x304A,"C6F0"],
- [0x304B,"C6F1"],
- [0x304C,"C6F2"],
- [0x304D,"C6F3"],
- [0x304E,"C6F4"],
- [0x304F,"C6F5"],
- [0x3050,"C6F6"],
- [0x3051,"C6F7"],
- [0x3052,"C6F8"],
- [0x3053,"C6F9"],
- [0x3054,"C6FA"],
- [0x3055,"C6FB"],
- [0x3056,"C6FC"],
- [0x3057,"C6FD"],
- [0x3058,"C6FE"],
- [0x3059,"C740"],
- [0x305A,"C741"],
- [0x305B,"C742"],
- [0x305C,"C743"],
- [0x305D,"C744"],
- [0x305E,"C745"],
- [0x305F,"C746"],
- [0x3060,"C747"],
- [0x3061,"C748"],
- [0x3062,"C749"],
- [0x3063,"C74A"],
- [0x3064,"C74B"],
- [0x3065,"C74C"],
- [0x3066,"C74D"],
- [0x3067,"C74E"],
- [0x3068,"C74F"],
- [0x3069,"C750"],
- [0x306A,"C751"],
- [0x306B,"C752"],
- [0x306C,"C753"],
- [0x306D,"C754"],
- [0x306E,"C755"],
- [0x306F,"C756"],
- [0x3070,"C757"],
- [0x3071,"C758"],
- [0x3072,"C759"],
- [0x3073,"C75A"],
- [0x3074,"C75B"],
- [0x3075,"C75C"],
- [0x3076,"C75D"],
- [0x3077,"C75E"],
- [0x3078,"C75F"],
- [0x3079,"C760"],
- [0x307A,"C761"],
- [0x307B,"C762"],
- [0x307C,"C763"],
- [0x307D,"C764"],
- [0x307E,"C765"],
- [0x307F,"C766"],
- [0x3080,"C767"],
- [0x3081,"C768"],
- [0x3082,"C769"],
- [0x3083,"C76A"],
- [0x3084,"C76B"],
- [0x3085,"C76C"],
- [0x3086,"C76D"],
- [0x3087,"C76E"],
- [0x3088,"C76F"],
- [0x3089,"C770"],
- [0x308A,"C771"],
- [0x308B,"C772"],
- [0x308C,"C773"],
- [0x308D,"C774"],
- [0x308E,"C775"],
- [0x308F,"C776"],
- [0x3090,"C777"],
- [0x3091,"C778"],
- [0x3092,"C779"],
- [0x3093,"C77A"],
- [0x309B,"C8D4"],
- [0x309C,"C8D5"],
- [0x309D,"C6DC"],
- [0x309E,"C6DD"],
- [0x30A1,"C77B"],
- [0x30A2,"C77C"],
- [0x30A3,"C77D"],
- [0x30A4,"C77E"],
- [0x30A5,"C7A1"],
- [0x30A6,"C7A2"],
- [0x30A7,"C7A3"],
- [0x30A8,"C7A4"],
- [0x30A9,"C7A5"],
- [0x30AA,"C7A6"],
- [0x30AB,"C7A7"],
- [0x30AC,"C7A8"],
- [0x30AD,"C7A9"],
- [0x30AE,"C7AA"],
- [0x30AF,"C7AB"],
- [0x30B0,"C7AC"],
- [0x30B1,"C7AD"],
- [0x30B2,"C7AE"],
- [0x30B3,"C7AF"],
- [0x30B4,"C7B0"],
- [0x30B5,"C7B1"],
- [0x30B6,"C7B2"],
- [0x30B7,"C7B3"],
- [0x30B8,"C7B4"],
- [0x30B9,"C7B5"],
- [0x30BA,"C7B6"],
- [0x30BB,"C7B7"],
- [0x30BC,"C7B8"],
- [0x30BD,"C7B9"],
- [0x30BE,"C7BA"],
- [0x30BF,"C7BB"],
- [0x30C0,"C7BC"],
- [0x30C1,"C7BD"],
- [0x30C2,"C7BE"],
- [0x30C3,"C7BF"],
- [0x30C4,"C7C0"],
- [0x30C5,"C7C1"],
- [0x30C6,"C7C2"],
- [0x30C7,"C7C3"],
- [0x30C8,"C7C4"],
- [0x30C9,"C7C5"],
- [0x30CA,"C7C6"],
- [0x30CB,"C7C7"],
- [0x30CC,"C7C8"],
- [0x30CD,"C7C9"],
- [0x30CE,"C7CA"],
- [0x30CF,"C7CB"],
- [0x30D0,"C7CC"],
- [0x30D1,"C7CD"],
- [0x30D2,"C7CE"],
- [0x30D3,"C7CF"],
- [0x30D4,"C7D0"],
- [0x30D5,"C7D1"],
- [0x30D6,"C7D2"],
- [0x30D7,"C7D3"],
- [0x30D8,"C7D4"],
- [0x30D9,"C7D5"],
- [0x30DA,"C7D6"],
- [0x30DB,"C7D7"],
- [0x30DC,"C7D8"],
- [0x30DD,"C7D9"],
- [0x30DE,"C7DA"],
- [0x30DF,"C7DB"],
- [0x30E0,"C7DC"],
- [0x30E1,"C7DD"],
- [0x30E2,"C7DE"],
- [0x30E3,"C7DF"],
- [0x30E4,"C7E0"],
- [0x30E5,"C7E1"],
- [0x30E6,"C7E2"],
- [0x30E7,"C7E3"],
- [0x30E8,"C7E4"],
- [0x30E9,"C7E5"],
- [0x30EA,"C7E6"],
- [0x30EB,"C7E7"],
- [0x30EC,"C7E8"],
- [0x30ED,"C7E9"],
- [0x30EE,"C7EA"],
- [0x30EF,"C7EB"],
- [0x30F0,"C7EC"],
- [0x30F1,"C7ED"],
- [0x30F2,"C7EE"],
- [0x30F3,"C7EF"],
- [0x30F4,"C7F0"],
- [0x30F5,"C7F1"],
- [0x30F6,"C7F2"],
- [0x30FC,"C6E3"],
- [0x30FD,"C6DA"],
- [0x30FE,"C6DB"],
- [0x3105,"A374"],
- [0x3106,"A375"],
- [0x3107,"A376"],
- [0x3108,"A377"],
- [0x3109,"A378"],
- [0x310A,"A379"],
- [0x310B,"A37A"],
- [0x310C,"A37B"],
- [0x310D,"A37C"],
- [0x310E,"A37D"],
- [0x310F,"A37E"],
- [0x3110,"A3A1"],
- [0x3111,"A3A2"],
- [0x3112,"A3A3"],
- [0x3113,"A3A4"],
- [0x3114,"A3A5"],
- [0x3115,"A3A6"],
- [0x3116,"A3A7"],
- [0x3117,"A3A8"],
- [0x3118,"A3A9"],
- [0x3119,"A3AA"],
- [0x311A,"A3AB"],
- [0x311B,"A3AC"],
- [0x311C,"A3AD"],
- [0x311D,"A3AE"],
- [0x311E,"A3AF"],
- [0x311F,"A3B0"],
- [0x3120,"A3B1"],
- [0x3121,"A3B2"],
- [0x3122,"A3B3"],
- [0x3123,"A3B4"],
- [0x3124,"A3B5"],
- [0x3125,"A3B6"],
- [0x3126,"A3B7"],
- [0x3127,"A3B8"],
- [0x3128,"A3B9"],
- [0x3129,"A3BA"],
- [0x31C0,"8840"],
- [0x31C1,"8841"],
- [0x31C2,"8842"],
- [0x31C3,"8843"],
- [0x31C4,"8844"],
- [0x31C5,"8846"],
- [0x31C6,"8849"],
- [0x31C7,"884A"],
- [0x31C8,"884D"],
- [0x31C9,"884F"],
- [0x31CA,"8850"],
- [0x31CB,"8851"],
- [0x31CC,"8852"],
- [0x31CD,"8854"],
- [0x31CE,"8855"],
- [0x31CF,"C879"],
- [0x3231,"C8D1"],
- [0x32A3,"A1C0"],
- [0x338E,"A255"],
- [0x338F,"A256"],
- [0x339C,"A250"],
- [0x339D,"A251"],
- [0x339E,"A252"],
- [0x33A1,"A254"],
- [0x33C4,"A257"],
- [0x33CE,"A253"],
- [0x33D1,"A1EB"],
- [0x33D2,"A1EA"],
- [0x33D5,"A24F"],
- [0x3435,"9277"],
- [0x3440,"96DF"],
- [0x344A,"8CF4"],
- [0x344C,"89D5"],
- [0x3464,"93CD"],
- [0x3473,"9BDF"],
- [0x347A,"FA68"],
- [0x347D,"89DA"],
- [0x347E,"8F59"],
- [0x3493,"89DB"],
- [0x3496,"8F5D"],
- [0x34A5,"89DC"],
- [0x34AF,"96F7"],
- [0x34BC,"8ADA"],
- [0x34C1,"8BDC"],
- [0x34C8,"97DB"],
- [0x34DF,"9E53"],
- [0x34E4,"9DAA"],
- [0x34E6,"87BE"],
- [0x34FB,"9BEA"],
- [0x3506,"8A6E"],
- [0x353E,"8BC8"],
- [0x3551,"89E8"],
- [0x3553,"89EA"],
- [0x3559,"8C4B"],
- [0x3561,"FB70"],
- [0x356D,"89ED"],
- [0x3570,"94DD"],
- [0x3572,"89EE"],
- [0x3577,"9EB4"],
- [0x3578,"8AD3"],
- [0x3584,"92DB"],
- [0x3597,"94DB"],
- [0x3598,"89F9"],
- [0x35A1,"FB7A"],
- [0x35A5,"89FB"],
- [0x35AD,"9EFC"],
- [0x35BF,"89FC"],
- [0x35C1,"89BF"],
- [0x35C5,"89FE"],
- [0x35C7,"89E6"],
- [0x35CA,"9D46"],
- [0x35CE,"9DEE"],
- [0x35D2,"A07E"],
- [0x35D6,"A068"],
- [0x35DB,"98E9"],
- [0x35DD,"8B68"],
- [0x35F1,"8DFD"],
- [0x35F2,"8BBE"],
- [0x35F3,"9FD9"],
- [0x35FB,"8AEB"],
- [0x35FE,"9FD7"],
- [0x3609,"8B6A"],
- [0x3618,"9C5C"],
- [0x361A,"8BB1"],
- [0x3623,"FB5E"],
- [0x3625,"8770"],
- [0x362D,"9DF3"],
- [0x3635,"A0D0"],
- [0x3639,"FC66"],
- [0x363E,"92E9"],
- [0x3647,"9AEC"],
- [0x3648,"8FAB"],
- [0x3649,"FA48"],
- [0x364E,"8E45"],
- [0x365F,"9C6F"],
- [0x3661,"8D5C"],
- [0x367A,"9EDE"],
- [0x3681,"89EF"],
- [0x369A,"96E9"],
- [0x36A5,"9EBB"],
- [0x36AA,"94DE"],
- [0x36AC,"9EB8"],
- [0x36B0,"97BA"],
- [0x36B1,"FB65"],
- [0x36B5,"95D6"],
- [0x36B9,"9CBB"],
- [0x36BC,"97DA"],
- [0x36C1,"8F45"],
- [0x36C3,"FB7D"],
- [0x36C4,"9158"],
- [0x36C5,"FE64"],
- [0x36C7,"9856"],
- [0x36C8,"9B4D"],
- [0x36D3,"935B"],
- [0x36D4,"95C7"],
- [0x36D6,"97E7"],
- [0x36DD,"9359"],
- [0x36E1,"91F5"],
- [0x36E2,"97B8"],
- [0x36E5,"FDA2"],
- [0x36E6,"FBB6"],
- [0x36F5,"92FA"],
- [0x3701,"9357"],
- [0x3703,"8BA6"],
- [0x3708,"FBB9"],
- [0x370A,"97B0"],
- [0x370D,"FDC4"],
- [0x371C,"9CA1"],
- [0x3722,"91F2"],
- [0x3723,"91F9"],
- [0x3725,"8FF1"],
- [0x372C,"9745"],
- [0x372D,"9853"],
- [0x3730,"FE78"],
- [0x3732,"FBC1"],
- [0x3733,"9251"],
- [0x373A,"9DAD"],
- [0x3740,"FD6C"],
- [0x3743,"FA6B"],
- [0x3762,"9BC2"],
- [0x376F,"9A7B"],
- [0x3797,"8B60"],
- [0x37A0,"934B"],
- [0x37B9,"9ABD"],
- [0x37BE,"91B7"],
- [0x37D6,"8D4B"],
- [0x37F2,"95B4"],
- [0x37F8,"FEC5"],
- [0x37FB,"9EF0"],
- [0x380F,"8D64"],
- [0x3819,"9269"],
- [0x3820,"8D67"],
- [0x382D,"FBEA"],
- [0x3836,"FBEF"],
- [0x3838,"8D68"],
- [0x3863,"93EB"],
- [0x3875,"877A"],
- [0x38A0,"FC42"],
- [0x38C3,"9166"],
- [0x38CC,"FACD"],
- [0x38D1,"93DD"],
- [0x38D4,"8D52"],
- [0x38FA,"8BCC"],
- [0x3908,"8D6D"],
- [0x3914,"8D6E"],
- [0x3927,"96A8"],
- [0x3932,"FCA6"],
- [0x393F,"8D6F"],
- [0x394D,"8D70"],
- [0x3963,"FC64"],
- [0x3978,"8CF3"],
- [0x3980,"9060"],
- [0x3989,"8D74"],
- [0x398A,"97C3"],
- [0x3992,"8AD0"],
- [0x3999,"9274"],
- [0x399B,"9BBE"],
- [0x39A1,"9CC8"],
- [0x39A4,"9CBA"],
- [0x39B8,"8D78"],
- [0x39DC,"9EB9"],
- [0x39E2,"955A"],
- [0x39E5,"91B4"],
- [0x39EC,"8A48"],
- [0x39F8,"8D7D"],
- [0x39FB,"8A7D"],
- [0x39FE,"8AC2"],
- [0x3A01,"FD4A"],
- [0x3A03,"8DA1"],
- [0x3A06,"8AD1"],
- [0x3A17,"FCB4"],
- [0x3A18,"8B47"],
- [0x3A29,"93A4"],
- [0x3A2A,"9EDA"],
- [0x3A34,"8A51"],
- [0x3A4B,"8DA6"],
- [0x3A52,"9EC5"],
- [0x3A57,"FCC4"],
- [0x3A5C,"A078"],
- [0x3A5E,"94B5"],
- [0x3A66,"FCC2"],
- [0x3A67,"8A6B"],
- [0x3A97,"8DAB"],
- [0x3AAB,"FAE8"],
- [0x3ABD,"8DAD"],
- [0x3ADE,"FC49"],
- [0x3AE0,"93C1"],
- [0x3AF0,"906F"],
- [0x3AF2,"8DB0"],
- [0x3AF5,"87A2"],
- [0x3AFB,"947E"],
- [0x3B0E,"90FA"],
- [0x3B19,"9479"],
- [0x3B22,"8DB2"],
- [0x3B2B,"FCEE"],
- [0x3B39,"997B"],
- [0x3B42,"8DB4"],
- [0x3B58,"8DB7"],
- [0x3B60,"91B3"],
- [0x3B71,"8DBB"],
- [0x3B72,"8DBA"],
- [0x3B7B,"8DBC"],
- [0x3B7C,"9044"],
- [0x3B80,"FD4C"],
- [0x3B95,"874B"],
- [0x3B96,"93E4"],
- [0x3B99,"93E0"],
- [0x3BA1,"FD53"],
- [0x3BBC,"8DC3"],
- [0x3BBE,"9BB8"],
- [0x3BC2,"FBF0"],
- [0x3BC4,"93E9"],
- [0x3BD7,"93F6"],
- [0x3BDD,"8DC5"],
- [0x3BEC,"8DCA"],
- [0x3BF2,"8DCC"],
- [0x3BF3,"FD5D"],
- [0x3BF4,"93B5"],
- [0x3C0D,"FD61"],
- [0x3C11,"9CF8"],
- [0x3C15,"9252"],
- [0x3C18,"A0E8"],
- [0x3C54,"9CA5"],
- [0x3C8B,"8C56"],
- [0x3CCB,"8DD6"],
- [0x3CCD,"97C0"],
- [0x3CD1,"A0DE"],
- [0x3CD6,"97D2"],
- [0x3CDC,"FAA5"],
- [0x3CEB,"FDA3"],
- [0x3CEF,"8DDB"],
- [0x3D12,"8CEA"],
- [0x3D13,"8EAF"],
- [0x3D1D,"91B5"],
- [0x3D32,"FD49"],
- [0x3D3B,"FDD1"],
- [0x3D46,"8DEB"],
- [0x3D4C,"97C6"],
- [0x3D4E,"FDCE"],
- [0x3D51,"90FC"],
- [0x3D5F,"FC59"],
- [0x3D62,"96D6"],
- [0x3D69,"97C5"],
- [0x3D6A,"8DEF"],
- [0x3D6F,"97D7"],
- [0x3D75,"8DF0"],
- [0x3D7D,"96A6"],
- [0x3D85,"FBBF"],
- [0x3D88,"8CDF"],
- [0x3D8A,"8DF3"],
- [0x3D8F,"9449"],
- [0x3D91,"8DF5"],
- [0x3DA5,"9872"],
- [0x3DAD,"8E6B"],
- [0x3DB4,"FAFD"],
- [0x3DBF,"8F50"],
- [0x3DC6,"9DCC"],
- [0x3DC7,"FC65"],
- [0x3DC9,"8C44"],
- [0x3DCC,"996E"],
- [0x3DCD,"94A1"],
- [0x3DD3,"8F63"],
- [0x3DDB,"A0DA"],
- [0x3DE7,"9253"],
- [0x3DE8,"FDE9"],
- [0x3DEB,"9DB5"],
- [0x3DF3,"9879"],
- [0x3DF4,"876A"],
- [0x3DF7,"9D5D"],
- [0x3DFC,"8D63"],
- [0x3DFD,"9669"],
- [0x3E06,"9F70"],
- [0x3E40,"FC6A"],
- [0x3E43,"8AC7"],
- [0x3E48,"89D7"],
- [0x3E55,"FE4D"],
- [0x3E74,"9EDD"],
- [0x3EA8,"FEFB"],
- [0x3EA9,"98BC"],
- [0x3EAA,"FACC"],
- [0x3EAD,"95B0"],
- [0x3EB1,"9464"],
- [0x3EB8,"936F"],
- [0x3EBF,"94B9"],
- [0x3EC2,"95EC"],
- [0x3EC7,"91EE"],
- [0x3ECA,"98C3"],
- [0x3ECC,"95F6"],
- [0x3ED0,"8FFD"],
- [0x3ED1,"98C5"],
- [0x3ED6,"9766"],
- [0x3ED7,"FE6E"],
- [0x3EDA,"97DD"],
- [0x3EDB,"8CAA"],
- [0x3EDE,"92D2"],
- [0x3EE1,"9761"],
- [0x3EE2,"98CB"],
- [0x3EE7,"95F0"],
- [0x3EE9,"975D"],
- [0x3EEB,"91E3"],
- [0x3EEC,"877E"],
- [0x3EF0,"98CC"],
- [0x3EF3,"9469"],
- [0x3EF4,"98CD"],
- [0x3EFA,"98CE"],
- [0x3EFC,"95FC"],
- [0x3EFF,"94A3"],
- [0x3F00,"9662"],
- [0x3F04,"FEB6"],
- [0x3F06,"9463"],
- [0x3F07,"8D47"],
- [0x3F0E,"98D0"],
- [0x3F53,"98D1"],
- [0x3F58,"9475"],
- [0x3F59,"FAE0"],
- [0x3F63,"9472"],
- [0x3F7C,"98D6"],
- [0x3F93,"8AF0"],
- [0x3FC0,"98D9"],
- [0x3FC8,"8D5A"],
- [0x3FD7,"98DB"],
- [0x3FDC,"98DD"],
- [0x3FE5,"98A8"],
- [0x3FED,"8A6D"],
- [0x3FF9,"8AFB"],
- [0x3FFA,"8AAE"],
- [0x4004,"FBC9"],
- [0x4009,"8C5D"],
- [0x401D,"98E4"],
- [0x4039,"98E6"],
- [0x4045,"98E8"],
- [0x4053,"8A4D"],
- [0x4057,"9257"],
- [0x4062,"95DF"],
- [0x4065,"A0AC"],
- [0x406A,"98EB"],
- [0x406F,"98EC"],
- [0x4071,"8CC3"],
- [0x40A8,"98F4"],
- [0x40B4,"87D9"],
- [0x40BB,"8AB8"],
- [0x40BF,"9EE7"],
- [0x40C8,"94BC"],
- [0x40D8,"FCD1"],
- [0x40DF,"9CC6"],
- [0x40F8,"8D4A"],
- [0x40FA,"9E7E"],
- [0x4102,"8D44"],
- [0x4103,"98FE"],
- [0x4104,"FDE8"],
- [0x4109,"9940"],
- [0x410E,"94C9"],
- [0x4131,"87C6"],
- [0x4132,"94D3"],
- [0x4167,"9946"],
- [0x416C,"90C0"],
- [0x416E,"94D1"],
- [0x417C,"8D4E"],
- [0x417F,"9573"],
- [0x4181,"87CE"],
- [0x4190,"93C2"],
- [0x41B2,"9948"],
- [0x41C4,"994B"],
- [0x41CA,"8E55"],
- [0x41CF,"994E"],
- [0x41DB,"8EFE"],
- [0x41ED,"8D5F"],
- [0x41EF,"8E59"],
- [0x41F9,"94EC"],
- [0x4211,"94EF"],
- [0x4223,"8C60"],
- [0x4240,"8F74"],
- [0x4260,"9955"],
- [0x426A,"9544"],
- [0x4276,"8CCB"],
- [0x427A,"9956"],
- [0x428C,"9959"],
- [0x4294,"995B"],
- [0x42A2,"8CC4"],
- [0x42B5,"FA45"],
- [0x42B9,"90B7"],
- [0x42BC,"9743"],
- [0x42F4,"95CD"],
- [0x42FB,"97C9"],
- [0x42FC,"FD50"],
- [0x430A,"87AA"],
- [0x432B,"8EB9"],
- [0x436E,"95C6"],
- [0x4397,"9967"],
- [0x439A,"8CE3"],
- [0x43BA,"8AB9"],
- [0x43C1,"8DFC"],
- [0x43D9,"8A76"],
- [0x43DF,"9D51"],
- [0x43ED,"9973"],
- [0x43F0,"8740"],
- [0x43F2,"9D4F"],
- [0x4401,"997A"],
- [0x4402,"9564"],
- [0x4413,"99A1"],
- [0x4425,"99A5"],
- [0x442D,"99A7"],
- [0x447A,"8EED"],
- [0x448F,"99AD"],
- [0x4491,"C87E"],
- [0x449F,"946E"],
- [0x44A0,"8F70"],
- [0x44A2,"FAD0"],
- [0x44B0,"99B3"],
- [0x44B7,"A053"],
- [0x44BD,"8D5E"],
- [0x44C0,"965C"],
- [0x44C3,"8CE0"],
- [0x44C5,"FD7A"],
- [0x44CE,"97FE"],
- [0x44DD,"92BD"],
- [0x44DE,"8D5D"],
- [0x44DF,"97FD"],
- [0x44E1,"87DB"],
- [0x44E4,"8F64"],
- [0x44E9,"FCF7"],
- [0x44EA,"9562"],
- [0x44EB,"97CD"],
- [0x44EC,"9E64"],
- [0x44F4,"924C"],
- [0x4503,"8EC9"],
- [0x4504,"99BC"],
- [0x4509,"9DA5"],
- [0x450B,"8F54"],
- [0x4516,"8F7C"],
- [0x451B,"8D55"],
- [0x451D,"8EA2"],
- [0x4527,"8F7A"],
- [0x452E,"97AE"],
- [0x4533,"96C8"],
- [0x4536,"8CE4"],
- [0x453B,"99C3"],
- [0x453D,"90D6"],
- [0x453F,"9CBE"],
- [0x4543,"8F76"],
- [0x4551,"9470"],
- [0x4552,"FB4B"],
- [0x4555,"FDCA"],
- [0x4558,"8CEF"],
- [0x455C,"8EC7"],
- [0x4561,"8D54"],
- [0x4562,"A0F9"],
- [0x456A,"8FA9"],
- [0x456D,"8D51"],
- [0x4577,"99C7"],
- [0x4578,"8744"],
- [0x4585,"90D7"],
- [0x45A6,"8743"],
- [0x45B3,"8747"],
- [0x45DA,"8758"],
- [0x45E9,"9EDF"],
- [0x45EA,"8D59"],
- [0x4603,"8742"],
- [0x4606,"99CE"],
- [0x460F,"8FBA"],
- [0x4615,"8FEB"],
- [0x4617,"99CF"],
- [0x465B,"8FC2"],
- [0x467A,"92C9"],
- [0x4680,"97DC"],
- [0x46A1,"875D"],
- [0x46AE,"87CC"],
- [0x46BB,"8D45"],
- [0x46CF,"95B3"],
- [0x46D0,"9C79"],
- [0x46F5,"95B2"],
- [0x46F7,"8D4C"],
- [0x4713,"8FDB"],
- [0x4718,"9BE3"],
- [0x4736,"874C"],
- [0x4744,"874D"],
- [0x474E,"9E7A"],
- [0x474F,"8757"],
- [0x477C,"9BEE"],
- [0x4798,"99DE"],
- [0x47A6,"FAFA"],
- [0x47D5,"8A52"],
- [0x47ED,"99E1"],
- [0x47F4,"8A67"],
- [0x4800,"8BB5"],
- [0x480B,"8AAC"],
- [0x4837,"99E9"],
- [0x485D,"FBCA"],
- [0x4871,"97DE"],
- [0x489B,"95D1"],
- [0x48AD,"99F5"],
- [0x48AE,"FC4A"],
- [0x48D0,"9BA9"],
- [0x48DD,"FBDC"],
- [0x48ED,"FE56"],
- [0x48F3,"9EA4"],
- [0x48FA,"9D49"],
- [0x4906,"95DB"],
- [0x4911,"89C5"],
- [0x491E,"99F8"],
- [0x4925,"9664"],
- [0x492A,"9055"],
- [0x492D,"96D4"],
- [0x492F,"87C4"],
- [0x4930,"87AE"],
- [0x4935,"977C"],
- [0x493C,"964D"],
- [0x493E,"97E1"],
- [0x4945,"9A48"],
- [0x4951,"9A49"],
- [0x4953,"FE7D"],
- [0x4965,"90AA"],
- [0x496A,"9A50"],
- [0x4972,"9347"],
- [0x4989,"8ED8"],
- [0x49A1,"90C9"],
- [0x49A7,"9A55"],
- [0x49DF,"90BC"],
- [0x49E5,"9A58"],
- [0x49E7,"8BB8"],
- [0x4A0F,"90D5"],
- [0x4A1D,"9641"],
- [0x4A24,"9A5A"],
- [0x4A35,"9A5C"],
- [0x4A96,"97C2"],
- [0x4AA4,"875C"],
- [0x4AB4,"8ABB"],
- [0x4AB8,"9BAA"],
- [0x4AD1,"90F5"],
- [0x4AE4,"9A60"],
- [0x4AFF,"9145"],
- [0x4B10,"8C58"],
- [0x4B19,"9A63"],
- [0x4B20,"8C49"],
- [0x4B2C,"8BB6"],
- [0x4B37,"FCCF"],
- [0x4B6F,"966B"],
- [0x4B70,"9A6E"],
- [0x4B72,"914F"],
- [0x4B7B,"9746"],
- [0x4B7E,"A0E6"],
- [0x4B8E,"92D7"],
- [0x4B90,"9675"],
- [0x4B93,"93D4"],
- [0x4B96,"91BB"],
- [0x4B97,"9679"],
- [0x4B9D,"9A70"],
- [0x4BBD,"9678"],
- [0x4BBE,"91CD"],
- [0x4BC0,"9C4A"],
- [0x4C04,"A06F"],
- [0x4C07,"A06A"],
- [0x4C0E,"915F"],
- [0x4C32,"8741"],
- [0x4C3B,"9FA5"],
- [0x4C3E,"89BA"],
- [0x4C40,"874F"],
- [0x4C47,"874E"],
- [0x4C57,"8755"],
- [0x4C5B,"9ECD"],
- [0x4C6D,"9A79"],
- [0x4C77,"8CF2"],
- [0x4C7B,"8D57"],
- [0x4C7D,"9DCE"],
- [0x4C81,"8CD2"],
- [0x4C85,"8759"],
- [0x4CA4,"9D73"],
- [0x4CAE,"96B9"],
- [0x4CB0,"96BC"],
- [0x4CB7,"9CD1"],
- [0x4CCD,"89B7"],
- [0x4CE1,"9EEE"],
- [0x4CE2,"8749"],
- [0x4CED,"FB43"],
- [0x4D07,"875B"],
- [0x4D09,"9EC9"],
- [0x4D10,"FBD3"],
- [0x4D34,"91AE"],
- [0x4D76,"8D58"],
- [0x4D77,"8746"],
- [0x4D89,"8D56"],
- [0x4D91,"9D78"],
- [0x4D9C,"9D7B"],
- [0x4E00,"A440"],
- [0x4E01,"A442"],
- [0x4E03,"A443"],
- [0x4E04,"9EB3"],
- [0x4E07,"C945"],
- [0x4E08,"A456"],
- [0x4E09,"A454"],
- [0x4E0A,"A457"],
- [0x4E0B,"A455"],
- [0x4E0C,"C946"],
- [0x4E0D,"A4A3"],
- [0x4E0E,"C94F"],
- [0x4E0F,"C94D"],
- [0x4E10,"A4A2"],
- [0x4E11,"A4A1"],
- [0x4E14,"A542"],
- [0x4E15,"A541"],
- [0x4E16,"A540"],
- [0x4E18,"A543"],
- [0x4E19,"A4FE"],
- [0x4E1A,"9EB2"],
- [0x4E1C,"9DD6"],
- [0x4E1E,"A5E0"],
- [0x4E1F,"A5E1"],
- [0x4E21,"994F"],
- [0x4E24,"89CE"],
- [0x4E26,"A8C3"],
- [0x4E28,"8BC0"],
- [0x4E2A,"9FC4"],
- [0x4E2B,"A458"],
- [0x4E2C,"8BD4"],
- [0x4E2D,"A4A4"],
- [0x4E2E,"C950"],
- [0x4E2F,"8C72"],
- [0x4E30,"A4A5"],
- [0x4E31,"C963"],
- [0x4E32,"A6EA"],
- [0x4E33,"CBB1"],
- [0x4E36,"C6BF"],
- [0x4E37,"8BF9"],
- [0x4E38,"A459"],
- [0x4E39,"A4A6"],
- [0x4E3B,"A544"],
- [0x4E3C,"C964"],
- [0x4E3D,"8946"],
- [0x4E3F,"C6C0"],
- [0x4E42,"C940"],
- [0x4E43,"A444"],
- [0x4E45,"A45B"],
- [0x4E47,"C947"],
- [0x4E48,"A45C"],
- [0x4E49,"FAE5"],
- [0x4E4B,"A4A7"],
- [0x4E4D,"A545"],
- [0x4E4E,"A547"],
- [0x4E4F,"A546"],
- [0x4E52,"A5E2"],
- [0x4E53,"A5E3"],
- [0x4E56,"A8C4"],
- [0x4E58,"ADBC"],
- [0x4E59,"A441"],
- [0x4E5A,"C87B"],
- [0x4E5B,"8BC6"],
- [0x4E5C,"C941"],
- [0x4E5D,"A445"],
- [0x4E5E,"A45E"],
- [0x4E5F,"A45D"],
- [0x4E69,"A5E4"],
- [0x4E6A,"9C57"],
- [0x4E73,"A8C5"],
- [0x4E78,"9AFB"],
- [0x4E7E,"B0AE"],
- [0x4E7F,"D44B"],
- [0x4E80,"89D0"],
- [0x4E81,"89CF"],
- [0x4E82,"B6C3"],
- [0x4E83,"DCB1"],
- [0x4E84,"DCB2"],
- [0x4E85,"C6C1"],
- [0x4E86,"A446"],
- [0x4E87,"89D1"],
- [0x4E88,"A4A9"],
- [0x4E89,"89E2"],
- [0x4E8B,"A8C6"],
- [0x4E8C,"A447"],
- [0x4E8D,"C948"],
- [0x4E8E,"A45F"],
- [0x4E91,"A4AA"],
- [0x4E92,"A4AC"],
- [0x4E93,"C951"],
- [0x4E94,"A4AD"],
- [0x4E95,"A4AB"],
- [0x4E98,"927E"],
- [0x4E99,"A5E5"],
- [0x4E9A,"9DBA"],
- [0x4E9B,"A8C7"],
- [0x4E9E,"A8C8"],
- [0x4E9F,"AB45"],
- [0x4EA0,"C6C2"],
- [0x4EA1,"A460"],
- [0x4EA2,"A4AE"],
- [0x4EA3,"8C6F"],
- [0x4EA4,"A5E6"],
- [0x4EA5,"A5E8"],
- [0x4EA6,"A5E7"],
- [0x4EA8,"A6EB"],
- [0x4EAB,"A8C9"],
- [0x4EAC,"A8CA"],
- [0x4EAD,"AB46"],
- [0x4EAE,"AB47"],
- [0x4EB3,"ADBD"],
- [0x4EB6,"DCB3"],
- [0x4EB7,"FBF8"],
- [0x4EB9,"F6D6"],
- [0x4EBA,"A448"],
- [0x4EBB,"8BC7"],
- [0x4EBC,"926B"],
- [0x4EBF,"89D2"],
- [0x4EC0,"A4B0"],
- [0x4EC1,"A4AF"],
- [0x4EC2,"C952"],
- [0x4EC3,"A4B1"],
- [0x4EC4,"A4B7"],
- [0x4EC6,"A4B2"],
- [0x4EC7,"A4B3"],
- [0x4EC8,"C954"],
- [0x4EC9,"C953"],
- [0x4ECA,"A4B5"],
- [0x4ECB,"A4B6"],
- [0x4ECD,"A4B4"],
- [0x4ECE,"9FCF"],
- [0x4ED4,"A54A"],
- [0x4ED5,"A54B"],
- [0x4ED6,"A54C"],
- [0x4ED7,"A54D"],
- [0x4ED8,"A549"],
- [0x4ED9,"A550"],
- [0x4EDA,"C96A"],
- [0x4EDC,"C966"],
- [0x4EDD,"C969"],
- [0x4EDE,"A551"],
- [0x4EDF,"A561"],
- [0x4EE1,"C968"],
- [0x4EE3,"A54E"],
- [0x4EE4,"A54F"],
- [0x4EE5,"A548"],
- [0x4EE8,"C965"],
- [0x4EE9,"C967"],
- [0x4EEA,"9DA9"],
- [0x4EEB,"89D3"],
- [0x4EEE,"99E2"],
- [0x4EF0,"A5F5"],
- [0x4EF1,"C9B0"],
- [0x4EF2,"A5F2"],
- [0x4EF3,"A5F6"],
- [0x4EF4,"C9BA"],
- [0x4EF5,"C9AE"],
- [0x4EF6,"A5F3"],
- [0x4EF7,"C9B2"],
- [0x4EF8,"9267"],
- [0x4EFB,"A5F4"],
- [0x4EFD,"A5F7"],
- [0x4EFF,"A5E9"],
- [0x4F00,"C9B1"],
- [0x4F01,"A5F8"],
- [0x4F02,"C9B5"],
- [0x4F03,"92A4"],
- [0x4F04,"C9B9"],
- [0x4F05,"C9B6"],
- [0x4F08,"C9B3"],
- [0x4F09,"A5EA"],
- [0x4F0A,"A5EC"],
- [0x4F0B,"A5F9"],
- [0x4F0D,"A5EE"],
- [0x4F0E,"C9AB"],
- [0x4F0F,"A5F1"],
- [0x4F10,"A5EF"],
- [0x4F11,"A5F0"],
- [0x4F12,"C9BB"],
- [0x4F13,"C9B8"],
- [0x4F14,"C9AF"],
- [0x4F15,"A5ED"],
- [0x4F17,"8C73"],
- [0x4F18,"C9AC"],
- [0x4F19,"A5EB"],
- [0x4F1A,"894E"],
- [0x4F1D,"C9B4"],
- [0x4F22,"C9B7"],
- [0x4F28,"894F"],
- [0x4F29,"9278"],
- [0x4F2C,"C9AD"],
- [0x4F2D,"CA66"],
- [0x4F2F,"A742"],
- [0x4F30,"A6F4"],
- [0x4F32,"91B6"],
- [0x4F33,"CA67"],
- [0x4F34,"A6F1"],
- [0x4F36,"A744"],
- [0x4F37,"89D4"],
- [0x4F38,"A6F9"],
- [0x4F39,"9FD2"],
- [0x4F3A,"A6F8"],
- [0x4F3B,"CA5B"],
- [0x4F3C,"A6FC"],
- [0x4F3D,"A6F7"],
- [0x4F3E,"CA60"],
- [0x4F3F,"CA68"],
- [0x4F41,"CA64"],
- [0x4F42,"92A7"],
- [0x4F43,"A6FA"],
- [0x4F45,"95A2"],
- [0x4F46,"A6FD"],
- [0x4F47,"A6EE"],
- [0x4F48,"A747"],
- [0x4F49,"CA5D"],
- [0x4F4B,"926E"],
- [0x4F4C,"CBBD"],
- [0x4F4D,"A6EC"],
- [0x4F4E,"A743"],
- [0x4F4F,"A6ED"],
- [0x4F50,"A6F5"],
- [0x4F51,"A6F6"],
- [0x4F52,"CA62"],
- [0x4F53,"CA5E"],
- [0x4F54,"A6FB"],
- [0x4F55,"A6F3"],
- [0x4F56,"CA5A"],
- [0x4F57,"A6EF"],
- [0x4F58,"CA65"],
- [0x4F59,"A745"],
- [0x4F5A,"A748"],
- [0x4F5B,"A6F2"],
- [0x4F5C,"A740"],
- [0x4F5D,"A746"],
- [0x4F5E,"A6F0"],
- [0x4F5F,"CA63"],
- [0x4F60,"A741"],
- [0x4F61,"CA69"],
- [0x4F62,"CA5C"],
- [0x4F63,"A6FE"],
- [0x4F64,"CA5F"],
- [0x4F67,"CA61"],
- [0x4F69,"A8D8"],
- [0x4F6A,"CBBF"],
- [0x4F6B,"CBCB"],
- [0x4F6C,"A8D0"],
- [0x4F6E,"CBCC"],
- [0x4F6F,"A8CB"],
- [0x4F70,"A8D5"],
- [0x4F72,"96EA"],
- [0x4F73,"A8CE"],
- [0x4F74,"CBB9"],
- [0x4F75,"A8D6"],
- [0x4F76,"CBB8"],
- [0x4F77,"CBBC"],
- [0x4F78,"CBC3"],
- [0x4F79,"CBC1"],
- [0x4F7A,"A8DE"],
- [0x4F7B,"A8D9"],
- [0x4F7C,"CBB3"],
- [0x4F7D,"CBB5"],
- [0x4F7E,"A8DB"],
- [0x4F7F,"A8CF"],
- [0x4F80,"CBB6"],
- [0x4F81,"CBC2"],
- [0x4F82,"CBC9"],
- [0x4F83,"A8D4"],
- [0x4F84,"CBBB"],
- [0x4F85,"CBB4"],
- [0x4F86,"A8D3"],
- [0x4F87,"CBB7"],
- [0x4F88,"A8D7"],
- [0x4F89,"CBBA"],
- [0x4F8A,"926F"],
- [0x4F8B,"A8D2"],
- [0x4F8D,"A8CD"],
- [0x4F8F,"A8DC"],
- [0x4F90,"CBC4"],
- [0x4F91,"A8DD"],
- [0x4F92,"CBC8"],
- [0x4F94,"CBC6"],
- [0x4F95,"CBCA"],
- [0x4F96,"A8DA"],
- [0x4F97,"CBBE"],
- [0x4F98,"CBB2"],
- [0x4F9A,"CBC0"],
- [0x4F9B,"A8D1"],
- [0x4F9C,"CBC5"],
- [0x4F9D,"A8CC"],
- [0x4F9E,"CBC7"],
- [0x4FA2,"92A3"],
- [0x4FA8,"8950"],
- [0x4FAB,"FA57"],
- [0x4FAE,"AB56"],
- [0x4FAF,"AB4A"],
- [0x4FB0,"9866"],
- [0x4FB2,"CDE0"],
- [0x4FB3,"CDE8"],
- [0x4FB4,"8CF8"],
- [0x4FB5,"AB49"],
- [0x4FB6,"AB51"],
- [0x4FB7,"AB5D"],
- [0x4FB9,"CDEE"],
- [0x4FBA,"CDEC"],
- [0x4FBB,"CDE7"],
- [0x4FBD,"89D6"],
- [0x4FBF,"AB4B"],
- [0x4FC0,"CDED"],
- [0x4FC1,"CDE3"],
- [0x4FC2,"AB59"],
- [0x4FC3,"AB50"],
- [0x4FC4,"AB58"],
- [0x4FC5,"CDDE"],
- [0x4FC7,"CDEA"],
- [0x4FC8,"98B2"],
- [0x4FC9,"CDE1"],
- [0x4FCA,"AB54"],
- [0x4FCB,"CDE2"],
- [0x4FCC,"92AB"],
- [0x4FCD,"CDDD"],
- [0x4FCE,"AB5B"],
- [0x4FCF,"AB4E"],
- [0x4FD0,"AB57"],
- [0x4FD1,"AB4D"],
- [0x4FD3,"CDDF"],
- [0x4FD4,"CDE4"],
- [0x4FD6,"CDEB"],
- [0x4FD7,"AB55"],
- [0x4FD8,"AB52"],
- [0x4FD9,"CDE6"],
- [0x4FDA,"AB5A"],
- [0x4FDB,"CDE9"],
- [0x4FDC,"CDE5"],
- [0x4FDD,"AB4F"],
- [0x4FDE,"AB5C"],
- [0x4FDF,"AB53"],
- [0x4FE0,"AB4C"],
- [0x4FE1,"AB48"],
- [0x4FE4,"96DE"],
- [0x4FE5,"92AC"],
- [0x4FEC,"CDEF"],
- [0x4FEE,"ADD7"],
- [0x4FEF,"ADC1"],
- [0x4FF0,"8C70"],
- [0x4FF1,"ADD1"],
- [0x4FF2,"9F6E"],
- [0x4FF3,"ADD6"],
- [0x4FF4,"D0D0"],
- [0x4FF5,"D0CF"],
- [0x4FF6,"D0D4"],
- [0x4FF7,"D0D5"],
- [0x4FF8,"ADC4"],
- [0x4FF9,"8EF2"],
- [0x4FFA,"ADCD"],
- [0x4FFD,"9F6C"],
- [0x4FFE,"ADDA"],
- [0x5000,"ADCE"],
- [0x5003,"89D8"],
- [0x5005,"D0C9"],
- [0x5006,"ADC7"],
- [0x5007,"D0CA"],
- [0x5008,"FA59"],
- [0x5009,"ADDC"],
- [0x500B,"ADD3"],
- [0x500C,"ADBE"],
- [0x500D,"ADBF"],
- [0x500E,"D0DD"],
- [0x500F,"B0BF"],
- [0x5011,"ADCC"],
- [0x5012,"ADCB"],
- [0x5013,"D0CB"],
- [0x5014,"ADCF"],
- [0x5015,"D45B"],
- [0x5016,"ADC6"],
- [0x5017,"D0D6"],
- [0x5018,"ADD5"],
- [0x5019,"ADD4"],
- [0x501A,"ADCA"],
- [0x501B,"D0CE"],
- [0x501C,"D0D7"],
- [0x501E,"D0C8"],
- [0x501F,"ADC9"],
- [0x5020,"D0D8"],
- [0x5021,"ADD2"],
- [0x5022,"D0CC"],
- [0x5023,"ADC0"],
- [0x5025,"ADC3"],
- [0x5026,"ADC2"],
- [0x5027,"D0D9"],
- [0x5028,"ADD0"],
- [0x5029,"ADC5"],
- [0x502A,"ADD9"],
- [0x502B,"ADDB"],
- [0x502C,"D0D3"],
- [0x502D,"ADD8"],
- [0x502E,"92A8"],
- [0x502F,"D0DB"],
- [0x5030,"D0CD"],
- [0x5031,"D0DC"],
- [0x5033,"D0D1"],
- [0x5034,"9163"],
- [0x5035,"D0DA"],
- [0x5037,"D0D2"],
- [0x503B,"8C40"],
- [0x503C,"ADC8"],
- [0x5040,"D463"],
- [0x5041,"D457"],
- [0x5043,"B0B3"],
- [0x5045,"D45C"],
- [0x5046,"D462"],
- [0x5047,"B0B2"],
- [0x5048,"D455"],
- [0x5049,"B0B6"],
- [0x504A,"D459"],
- [0x504B,"D452"],
- [0x504C,"B0B4"],
- [0x504D,"D456"],
- [0x504E,"B0B9"],
- [0x504F,"B0BE"],
- [0x5051,"D467"],
- [0x5053,"D451"],
- [0x5055,"B0BA"],
- [0x5056,"9F73"],
- [0x5057,"D466"],
- [0x5058,"92AD"],
- [0x505A,"B0B5"],
- [0x505B,"D458"],
- [0x505C,"B0B1"],
- [0x505D,"D453"],
- [0x505E,"D44F"],
- [0x505F,"D45D"],
- [0x5060,"D450"],
- [0x5061,"D44E"],
- [0x5062,"D45A"],
- [0x5063,"D460"],
- [0x5064,"D461"],
- [0x5065,"B0B7"],
- [0x5066,"9BE9"],
- [0x5068,"D85B"],
- [0x5069,"D45E"],
- [0x506A,"D44D"],
- [0x506B,"D45F"],
- [0x506C,"92A9"],
- [0x506D,"B0C1"],
- [0x506E,"D464"],
- [0x506F,"B0C0"],
- [0x5070,"D44C"],
- [0x5072,"D454"],
- [0x5073,"D465"],
- [0x5074,"B0BC"],
- [0x5075,"B0BB"],
- [0x5076,"B0B8"],
- [0x5077,"B0BD"],
- [0x507A,"B0AF"],
- [0x507D,"B0B0"],
- [0x5080,"B3C8"],
- [0x5081,"92AA"],
- [0x5082,"D85E"],
- [0x5083,"D857"],
- [0x5085,"B3C5"],
- [0x5087,"D85F"],
- [0x5088,"89D9"],
- [0x508B,"D855"],
- [0x508C,"D858"],
- [0x508D,"B3C4"],
- [0x508E,"D859"],
- [0x5090,"FD56"],
- [0x5091,"B3C7"],
- [0x5092,"D85D"],
- [0x5094,"D853"],
- [0x5095,"D852"],
- [0x5096,"B3C9"],
- [0x5098,"B3CA"],
- [0x5099,"B3C6"],
- [0x509A,"B3CB"],
- [0x509B,"D851"],
- [0x509C,"D85C"],
- [0x509D,"D85A"],
- [0x509E,"D854"],
- [0x50A2,"B3C3"],
- [0x50A3,"D856"],
- [0x50A6,"9FA8"],
- [0x50AC,"B6CA"],
- [0x50AD,"B6C4"],
- [0x50AE,"DCB7"],
- [0x50AF,"B6CD"],
- [0x50B0,"DCBD"],
- [0x50B1,"DCC0"],
- [0x50B2,"B6C6"],
- [0x50B3,"B6C7"],
- [0x50B4,"DCBA"],
- [0x50B5,"B6C5"],
- [0x50B6,"DCC3"],
- [0x50B7,"B6CB"],
- [0x50B8,"DCC4"],
- [0x50BA,"DCBF"],
- [0x50BB,"B6CC"],
- [0x50BC,"8C71"],
- [0x50BD,"DCB4"],
- [0x50BE,"B6C9"],
- [0x50BF,"DCB5"],
- [0x50C1,"DCBE"],
- [0x50C2,"DCBC"],
- [0x50C4,"DCB8"],
- [0x50C5,"B6C8"],
- [0x50C6,"DCB6"],
- [0x50C7,"B6CE"],
- [0x50C8,"DCBB"],
- [0x50C9,"DCC2"],
- [0x50CA,"DCB9"],
- [0x50CB,"DCC1"],
- [0x50CD,"92A1"],
- [0x50CE,"B9B6"],
- [0x50CF,"B9B3"],
- [0x50D0,"90E3"],
- [0x50D1,"B9B4"],
- [0x50D3,"E0F9"],
- [0x50D4,"E0F1"],
- [0x50D5,"B9B2"],
- [0x50D6,"B9AF"],
- [0x50D7,"E0F2"],
- [0x50D9,"A0A6"],
- [0x50DA,"B9B1"],
- [0x50DB,"E0F5"],
- [0x50DD,"E0F7"],
- [0x50DF,"94AB"],
- [0x50E0,"E0FE"],
- [0x50E1,"FC72"],
- [0x50E3,"E0FD"],
- [0x50E4,"E0F8"],
- [0x50E5,"B9AE"],
- [0x50E6,"E0F0"],
- [0x50E7,"B9AC"],
- [0x50E8,"E0F3"],
- [0x50E9,"B9B7"],
- [0x50EA,"E0F6"],
- [0x50EC,"E0FA"],
- [0x50ED,"B9B0"],
- [0x50EE,"B9AD"],
- [0x50EF,"E0FC"],
- [0x50F0,"E0FB"],
- [0x50F1,"B9B5"],
- [0x50F3,"E0F4"],
- [0x50F4,"97C4"],
- [0x50F5,"BBF8"],
- [0x50F6,"E4EC"],
- [0x50F8,"E4E9"],
- [0x50F9,"BBF9"],
- [0x50FB,"BBF7"],
- [0x50FC,"92AE"],
- [0x50FD,"E4F0"],
- [0x50FE,"E4ED"],
- [0x50FF,"E4E6"],
- [0x5100,"BBF6"],
- [0x5101,"FA67"],
- [0x5102,"BBFA"],
- [0x5103,"E4E7"],
- [0x5104,"BBF5"],
- [0x5105,"BBFD"],
- [0x5106,"E4EA"],
- [0x5107,"E4EB"],
- [0x5108,"BBFB"],
- [0x5109,"BBFC"],
- [0x510A,"E4F1"],
- [0x510B,"E4EE"],
- [0x510C,"E4EF"],
- [0x510D,"92A2"],
- [0x510E,"FA69"],
- [0x5110,"BEAA"],
- [0x5111,"E8F8"],
- [0x5112,"BEA7"],
- [0x5113,"E8F5"],
- [0x5114,"BEA9"],
- [0x5115,"BEAB"],
- [0x5117,"E8F6"],
- [0x5118,"BEA8"],
- [0x511A,"E8F7"],
- [0x511C,"E8F4"],
- [0x511F,"C076"],
- [0x5120,"ECBD"],
- [0x5121,"C077"],
- [0x5122,"ECBB"],
- [0x5124,"ECBC"],
- [0x5125,"ECBA"],
- [0x5126,"ECB9"],
- [0x5129,"ECBE"],
- [0x512A,"C075"],
- [0x512B,"9268"],
- [0x512D,"EFB8"],
- [0x512E,"EFB9"],
- [0x5130,"E4E8"],
- [0x5131,"EFB7"],
- [0x5132,"C078"],
- [0x5133,"C35F"],
- [0x5134,"F1EB"],
- [0x5135,"F1EC"],
- [0x5137,"C4D7"],
- [0x5138,"C4D8"],
- [0x5139,"F5C1"],
- [0x513A,"F5C0"],
- [0x513B,"C56C"],
- [0x513C,"C56B"],
- [0x513D,"F7D0"],
- [0x513F,"A449"],
- [0x5140,"A461"],
- [0x5141,"A4B9"],
- [0x5143,"A4B8"],
- [0x5144,"A553"],
- [0x5145,"A552"],
- [0x5146,"A5FC"],
- [0x5147,"A5FB"],
- [0x5148,"A5FD"],
- [0x5149,"A5FA"],
- [0x514B,"A74A"],
- [0x514C,"A749"],
- [0x514D,"A74B"],
- [0x5152,"A8E0"],
- [0x5154,"A8DF"],
- [0x5155,"A8E1"],
- [0x5156,"8951"],
- [0x5157,"AB5E"],
- [0x5159,"A259"],
- [0x515A,"D0DE"],
- [0x515B,"A25A"],
- [0x515C,"B0C2"],
- [0x515D,"A25C"],
- [0x515E,"A25B"],
- [0x515F,"D860"],
- [0x5160,"FA6F"],
- [0x5161,"A25D"],
- [0x5162,"B9B8"],
- [0x5163,"A25E"],
- [0x5165,"A44A"],
- [0x5167,"A4BA"],
- [0x5168,"A5FE"],
- [0x5169,"A8E2"],
- [0x516A,"FA71"],
- [0x516B,"A44B"],
- [0x516C,"A4BD"],
- [0x516D,"A4BB"],
- [0x516E,"A4BC"],
- [0x5171,"A640"],
- [0x5174,"8952"],
- [0x5175,"A74C"],
- [0x5176,"A8E4"],
- [0x5177,"A8E3"],
- [0x5178,"A8E5"],
- [0x5179,"945A"],
- [0x517C,"ADDD"],
- [0x5180,"BEAC"],
- [0x5182,"C6C3"],
- [0x5186,"89DD"],
- [0x5187,"C94E"],
- [0x5188,"C8A2"],
- [0x5189,"A554"],
- [0x518A,"A555"],
- [0x518D,"A641"],
- [0x518F,"CA6A"],
- [0x5191,"AB60"],
- [0x5192,"AB5F"],
- [0x5193,"D0E0"],
- [0x5194,"D0DF"],
- [0x5195,"B0C3"],
- [0x5196,"C6C4"],
- [0x5197,"A4BE"],
- [0x5198,"C955"],
- [0x519A,"9E52"],
- [0x519C,"8953"],
- [0x519E,"CBCD"],
- [0x51A0,"AB61"],
- [0x51A2,"ADE0"],
- [0x51A4,"ADDE"],
- [0x51A5,"ADDF"],
- [0x51A7,"9E55"],
- [0x51A8,"92BA"],
- [0x51AA,"BEAD"],
- [0x51AB,"C6C5"],
- [0x51AC,"A556"],
- [0x51AE,"8C5B"],
- [0x51B0,"A642"],
- [0x51B1,"C9BC"],
- [0x51B2,"FA7D"],
- [0x51B3,"FAA8"],
- [0x51B4,"9A68"],
- [0x51B5,"FA47"],
- [0x51B6,"A74D"],
- [0x51B7,"A74E"],
- [0x51B8,"FA7E"],
- [0x51B9,"CA6B"],
- [0x51BC,"CBCE"],
- [0x51BD,"A8E6"],
- [0x51BE,"CBCF"],
- [0x51C3,"92BB"],
- [0x51C4,"D0E2"],
- [0x51C5,"D0E3"],
- [0x51C6,"ADE3"],
- [0x51C7,"FDB6"],
- [0x51C8,"D0E4"],
- [0x51C9,"FAA2"],
- [0x51CA,"D0E1"],
- [0x51CB,"ADE4"],
- [0x51CC,"ADE2"],
- [0x51CD,"ADE1"],
- [0x51CE,"D0E5"],
- [0x51CF,"FAA3"],
- [0x51D0,"D468"],
- [0x51D1,"FAA4"],
- [0x51D2,"9BB4"],
- [0x51D3,"FAA6"],
- [0x51D4,"D861"],
- [0x51D7,"DCC5"],
- [0x51D8,"E140"],
- [0x51DB,"89DF"],
- [0x51DC,"BBFE"],
- [0x51DD,"BEAE"],
- [0x51DE,"E8F9"],
- [0x51DF,"FDDB"],
- [0x51E0,"A44C"],
- [0x51E1,"A45A"],
- [0x51E2,"FAA9"],
- [0x51E4,"8954"],
- [0x51ED,"FAAB"],
- [0x51F0,"B0C4"],
- [0x51F1,"B3CD"],
- [0x51F3,"B9B9"],
- [0x51F4,"FC7A"],
- [0x51F5,"C942"],
- [0x51F6,"A4BF"],
- [0x51F8,"A559"],
- [0x51F9,"A557"],
- [0x51FA,"A558"],
- [0x51FC,"89E0"],
- [0x51FD,"A8E7"],
- [0x51FE,"9F4F"],
- [0x5200,"A44D"],
- [0x5201,"A44E"],
- [0x5202,"C87D"],
- [0x5203,"A462"],
- [0x5205,"89E1"],
- [0x5206,"A4C0"],
- [0x5207,"A4C1"],
- [0x5208,"A4C2"],
- [0x5209,"C9BE"],
- [0x520A,"A55A"],
- [0x520B,"FAB0"],
- [0x520C,"C96B"],
- [0x520E,"A646"],
- [0x5210,"C9BF"],
- [0x5211,"A644"],
- [0x5212,"A645"],
- [0x5213,"C9BD"],
- [0x5216,"A647"],
- [0x5217,"A643"],
- [0x521C,"CA6C"],
- [0x521D,"AAEC"],
- [0x521E,"CA6D"],
- [0x521F,"9FCD"],
- [0x5220,"A0E7"],
- [0x5221,"CA6E"],
- [0x5224,"A750"],
- [0x5225,"A74F"],
- [0x5226,"FAB1"],
- [0x5227,"89A6"],
- [0x5228,"A753"],
- [0x5229,"A751"],
- [0x522A,"A752"],
- [0x522E,"A8ED"],
- [0x5230,"A8EC"],
- [0x5231,"CBD4"],
- [0x5232,"CBD1"],
- [0x5233,"CBD2"],
- [0x5234,"9EFA"],
- [0x5235,"CBD0"],
- [0x5236,"A8EE"],
- [0x5237,"A8EA"],
- [0x5238,"A8E9"],
- [0x523A,"A8EB"],
- [0x523B,"A8E8"],
- [0x523C,"FAB2"],
- [0x5241,"A8EF"],
- [0x5243,"AB63"],
- [0x5244,"CDF0"],
- [0x5246,"CBD3"],
- [0x5247,"AB68"],
- [0x5249,"CDF1"],
- [0x524A,"AB64"],
- [0x524B,"AB67"],
- [0x524C,"AB66"],
- [0x524D,"AB65"],
- [0x524E,"AB62"],
- [0x524F,"87BC"],
- [0x5252,"D0E8"],
- [0x5254,"ADE7"],
- [0x5255,"D0EB"],
- [0x5256,"ADE5"],
- [0x5257,"FAB4"],
- [0x5259,"92C4"],
- [0x525A,"D0E7"],
- [0x525B,"ADE8"],
- [0x525C,"ADE6"],
- [0x525D,"ADE9"],
- [0x525E,"D0E9"],
- [0x525F,"D0EA"],
- [0x5260,"9F6F"],
- [0x5261,"D0E6"],
- [0x5262,"D0EC"],
- [0x5268,"8BB0"],
- [0x5269,"B3D1"],
- [0x526A,"B0C5"],
- [0x526B,"D469"],
- [0x526C,"D46B"],
- [0x526D,"D46A"],
- [0x526E,"D46C"],
- [0x526F,"B0C6"],
- [0x5272,"B3CE"],
- [0x5273,"9FAC"],
- [0x5274,"B3CF"],
- [0x5275,"B3D0"],
- [0x5277,"B6D0"],
- [0x5278,"DCC7"],
- [0x5279,"89E3"],
- [0x527A,"DCC6"],
- [0x527B,"DCC8"],
- [0x527C,"DCC9"],
- [0x527D,"B6D1"],
- [0x527F,"B6CF"],
- [0x5280,"E141"],
- [0x5281,"E142"],
- [0x5282,"B9BB"],
- [0x5283,"B9BA"],
- [0x5284,"E35A"],
- [0x5287,"BC40"],
- [0x5288,"BC41"],
- [0x5289,"BC42"],
- [0x528A,"BC44"],
- [0x528B,"E4F2"],
- [0x528C,"E4F3"],
- [0x528D,"BC43"],
- [0x528F,"9BD3"],
- [0x5290,"89E4"],
- [0x5291,"BEAF"],
- [0x5293,"BEB0"],
- [0x5294,"FAB5"],
- [0x5296,"F1ED"],
- [0x5297,"F5C3"],
- [0x5298,"F5C2"],
- [0x5299,"F7D1"],
- [0x529A,"9FD5"],
- [0x529B,"A44F"],
- [0x529F,"A55C"],
- [0x52A0,"A55B"],
- [0x52A1,"8955"],
- [0x52A3,"A648"],
- [0x52A4,"92C5"],
- [0x52A6,"C9C0"],
- [0x52A8,"8956"],
- [0x52A9,"A755"],
- [0x52AA,"A756"],
- [0x52AB,"A754"],
- [0x52AC,"A757"],
- [0x52AD,"CA6F"],
- [0x52AE,"CA70"],
- [0x52B5,"FAB3"],
- [0x52B9,"FAB6"],
- [0x52BB,"A8F1"],
- [0x52BC,"CBD5"],
- [0x52BE,"A8F0"],
- [0x52C0,"CDF2"],
- [0x52C1,"AB6C"],
- [0x52C2,"CDF3"],
- [0x52C3,"AB6B"],
- [0x52C5,"FAB7"],
- [0x52C7,"AB69"],
- [0x52C9,"AB6A"],
- [0x52CC,"9EDC"],
- [0x52CD,"D0ED"],
- [0x52D0,"FBC4"],
- [0x52D1,"9F71"],
- [0x52D2,"B0C7"],
- [0x52D3,"D46E"],
- [0x52D5,"B0CA"],
- [0x52D6,"D46D"],
- [0x52D7,"B1E5"],
- [0x52D8,"B0C9"],
- [0x52D9,"B0C8"],
- [0x52DB,"B3D4"],
- [0x52DD,"B3D3"],
- [0x52DE,"B3D2"],
- [0x52DF,"B6D2"],
- [0x52E0,"FABA"],
- [0x52E1,"92C7"],
- [0x52E2,"B6D5"],
- [0x52E3,"B6D6"],
- [0x52E4,"B6D4"],
- [0x52E6,"B6D3"],
- [0x52E9,"E143"],
- [0x52EB,"E144"],
- [0x52EF,"E4F5"],
- [0x52F0,"BC45"],
- [0x52F1,"E4F4"],
- [0x52F3,"BEB1"],
- [0x52F4,"ECBF"],
- [0x52F5,"C079"],
- [0x52F7,"F1EE"],
- [0x52F8,"C455"],
- [0x52F9,"C6C6"],
- [0x52FA,"A463"],
- [0x52FB,"A4C3"],
- [0x52FC,"C956"],
- [0x52FE,"A4C4"],
- [0x52FF,"A4C5"],
- [0x5301,"9A4C"],
- [0x5305,"A55D"],
- [0x5306,"A55E"],
- [0x5308,"A649"],
- [0x5309,"CA71"],
- [0x530A,"CBD6"],
- [0x530B,"CBD7"],
- [0x530D,"AB6D"],
- [0x530E,"D0EE"],
- [0x530F,"B0CC"],
- [0x5310,"B0CB"],
- [0x5311,"D863"],
- [0x5312,"D862"],
- [0x5315,"A450"],
- [0x5316,"A4C6"],
- [0x5317,"A55F"],
- [0x5319,"B0CD"],
- [0x531A,"C943"],
- [0x531C,"C96C"],
- [0x531D,"A560"],
- [0x531F,"C9C2"],
- [0x5320,"A64B"],
- [0x5321,"A64A"],
- [0x5322,"C9C1"],
- [0x5323,"A758"],
- [0x5324,"8C68"],
- [0x5327,"89E5"],
- [0x532A,"ADEA"],
- [0x532C,"9F7D"],
- [0x532D,"D46F"],
- [0x532F,"B6D7"],
- [0x5330,"E145"],
- [0x5331,"B9BC"],
- [0x5332,"A0A9"],
- [0x5333,"FAC4"],
- [0x5334,"E8FA"],
- [0x5337,"F3FD"],
- [0x5338,"C6C7"],
- [0x5339,"A4C7"],
- [0x533B,"8957"],
- [0x533C,"CBD8"],
- [0x533D,"CDF4"],
- [0x533E,"B0D0"],
- [0x533F,"B0CE"],
- [0x5340,"B0CF"],
- [0x5341,"A451"],
- [0x5342,"FAAA"],
- [0x5343,"A464"],
- [0x5344,"A2CD"],
- [0x5345,"A4CA"],
- [0x5347,"A4C9"],
- [0x5348,"A4C8"],
- [0x5349,"A563"],
- [0x534A,"A562"],
- [0x534C,"C96D"],
- [0x534D,"C9C3"],
- [0x534E,"8958"],
- [0x5351,"A8F5"],
- [0x5352,"A8F2"],
- [0x5353,"A8F4"],
- [0x5354,"A8F3"],
- [0x5357,"AB6E"],
- [0x535A,"B3D5"],
- [0x535C,"A452"],
- [0x535D,"8BE3"],
- [0x535E,"A4CB"],
- [0x535F,"8B61"],
- [0x5360,"A565"],
- [0x5361,"A564"],
- [0x5363,"CA72"],
- [0x5364,"9AF1"],
- [0x5366,"A8F6"],
- [0x5367,"9EB7"],
- [0x5369,"C6C8"],
- [0x536C,"C957"],
- [0x536D,"FAD1"],
- [0x536E,"A567"],
- [0x536F,"A566"],
- [0x5370,"A64C"],
- [0x5371,"A64D"],
- [0x5372,"CA73"],
- [0x5373,"A759"],
- [0x5374,"FAD2"],
- [0x5375,"A75A"],
- [0x5377,"A8F7"],
- [0x5378,"A8F8"],
- [0x5379,"A8F9"],
- [0x537B,"AB6F"],
- [0x537C,"CDF5"],
- [0x537D,"9EBA"],
- [0x537E,"FAD4"],
- [0x537F,"ADEB"],
- [0x5382,"C944"],
- [0x5384,"A4CC"],
- [0x538A,"C9C4"],
- [0x538E,"CA74"],
- [0x538F,"CA75"],
- [0x5392,"CBD9"],
- [0x5393,"FAD9"],
- [0x5394,"CBDA"],
- [0x5396,"CDF7"],
- [0x5397,"CDF6"],
- [0x5398,"CDF9"],
- [0x5399,"CDF8"],
- [0x539A,"AB70"],
- [0x539C,"D470"],
- [0x539D,"ADED"],
- [0x539E,"D0EF"],
- [0x539F,"ADEC"],
- [0x53A0,"FADB"],
- [0x53A2,"9CE0"],
- [0x53A4,"D864"],
- [0x53A5,"B3D6"],
- [0x53A6,"FBF7"],
- [0x53A7,"D865"],
- [0x53A8,"FBFA"],
- [0x53A9,"89E7"],
- [0x53AA,"A07A"],
- [0x53AB,"FADC"],
- [0x53AC,"E146"],
- [0x53AD,"B9BD"],
- [0x53AE,"FADD"],
- [0x53B0,"89E9"],
- [0x53B2,"BC46"],
- [0x53B4,"F1EF"],
- [0x53B6,"C6C9"],
- [0x53B9,"C958"],
- [0x53BB,"A568"],
- [0x53C1,"FAE2"],
- [0x53C2,"89EB"],
- [0x53C3,"B0D1"],
- [0x53C5,"FAE3"],
- [0x53C8,"A453"],
- [0x53C9,"A465"],
- [0x53CA,"A4CE"],
- [0x53CB,"A4CD"],
- [0x53CC,"90C8"],
- [0x53CD,"A4CF"],
- [0x53D0,"92DA"],
- [0x53D1,"8959"],
- [0x53D2,"9CF5"],
- [0x53D4,"A8FB"],
- [0x53D6,"A8FA"],
- [0x53D7,"A8FC"],
- [0x53D8,"895A"],
- [0x53D9,"FAE7"],
- [0x53DA,"9FA2"],
- [0x53DB,"AB71"],
- [0x53DF,"ADEE"],
- [0x53E0,"FAEA"],
- [0x53E1,"E8FB"],
- [0x53E2,"C24F"],
- [0x53E3,"A466"],
- [0x53E4,"A56A"],
- [0x53E5,"A579"],
- [0x53E6,"A574"],
- [0x53E8,"A56F"],
- [0x53E9,"A56E"],
- [0x53EA,"A575"],
- [0x53EB,"A573"],
- [0x53EC,"A56C"],
- [0x53ED,"A57A"],
- [0x53EE,"A56D"],
- [0x53EF,"A569"],
- [0x53F0,"A578"],
- [0x53F1,"A577"],
- [0x53F2,"A576"],
- [0x53F3,"A56B"],
- [0x53F5,"A572"],
- [0x53F6,"FAED"],
- [0x53F7,"8FAD"],
- [0x53F8,"A571"],
- [0x53FB,"A57B"],
- [0x53FC,"A570"],
- [0x53FE,"FB59"],
- [0x5401,"A653"],
- [0x5403,"A659"],
- [0x5404,"A655"],
- [0x5406,"A65B"],
- [0x5407,"C9C5"],
- [0x5408,"A658"],
- [0x5409,"A64E"],
- [0x540A,"A651"],
- [0x540B,"A654"],
- [0x540C,"A650"],
- [0x540D,"A657"],
- [0x540E,"A65A"],
- [0x540F,"A64F"],
- [0x5410,"A652"],
- [0x5411,"A656"],
- [0x5412,"A65C"],
- [0x5413,"FAEF"],
- [0x5414,"96EF"],
- [0x5416,"9DEC"],
- [0x5418,"CA7E"],
- [0x5419,"CA7B"],
- [0x541A,"9DCA"],
- [0x541B,"A767"],
- [0x541C,"CA7C"],
- [0x541D,"A75B"],
- [0x541E,"A75D"],
- [0x541F,"A775"],
- [0x5420,"A770"],
- [0x5421,"FD6D"],
- [0x5423,"89EC"],
- [0x5424,"CAA5"],
- [0x5425,"CA7D"],
- [0x5426,"A75F"],
- [0x5427,"A761"],
- [0x5428,"CAA4"],
- [0x5429,"A768"],
- [0x542A,"CA78"],
- [0x542B,"A774"],
- [0x542C,"A776"],
- [0x542D,"A75C"],
- [0x542E,"A76D"],
- [0x542F,"FB44"],
- [0x5430,"CA76"],
- [0x5431,"A773"],
- [0x5432,"9DE2"],
- [0x5433,"A764"],
- [0x5434,"8C75"],
- [0x5435,"A76E"],
- [0x5436,"A76F"],
- [0x5437,"CA77"],
- [0x5438,"A76C"],
- [0x5439,"A76A"],
- [0x543B,"A76B"],
- [0x543C,"A771"],
- [0x543D,"CAA1"],
- [0x543E,"A75E"],
- [0x5440,"A772"],
- [0x5441,"CAA3"],
- [0x5442,"A766"],
- [0x5443,"A763"],
- [0x5445,"CA7A"],
- [0x5446,"A762"],
- [0x5447,"CAA6"],
- [0x5448,"A765"],
- [0x544A,"A769"],
- [0x544B,"9EC0"],
- [0x544C,"87C5"],
- [0x544D,"9E56"],
- [0x544E,"A760"],
- [0x544F,"CAA2"],
- [0x5454,"CA79"],
- [0x5460,"CBEB"],
- [0x5461,"CBEA"],
- [0x5462,"A94F"],
- [0x5463,"CBED"],
- [0x5464,"CBEF"],
- [0x5465,"CBE4"],
- [0x5466,"CBE7"],
- [0x5467,"CBEE"],
- [0x5468,"A950"],
- [0x5469,"9F79"],
- [0x546A,"9AC7"],
- [0x546B,"CBE1"],
- [0x546C,"CBE5"],
- [0x546D,"FAF4"],
- [0x546F,"CBE9"],
- [0x5470,"CE49"],
- [0x5471,"A94B"],
- [0x5472,"CE4D"],
- [0x5473,"A8FD"],
- [0x5474,"CBE6"],
- [0x5475,"A8FE"],
- [0x5476,"A94C"],
- [0x5477,"A945"],
- [0x5478,"A941"],
- [0x547A,"CBE2"],
- [0x547B,"A944"],
- [0x547C,"A949"],
- [0x547D,"A952"],
- [0x547E,"CBE3"],
- [0x547F,"CBDC"],
- [0x5480,"A943"],
- [0x5481,"CBDD"],
- [0x5482,"CBDF"],
- [0x5484,"A946"],
- [0x5485,"98A1"],
- [0x5486,"A948"],
- [0x5487,"CBDB"],
- [0x5488,"CBE0"],
- [0x548B,"A951"],
- [0x548C,"A94D"],
- [0x548D,"CBE8"],
- [0x548E,"A953"],
- [0x548F,"FAF8"],
- [0x5490,"A94A"],
- [0x5491,"CBDE"],
- [0x5492,"A947"],
- [0x5493,"89F0"],
- [0x5494,"9E47"],
- [0x5495,"A942"],
- [0x5496,"A940"],
- [0x5497,"9DF7"],
- [0x5498,"CBEC"],
- [0x549A,"A94E"],
- [0x549C,"9FD3"],
- [0x549E,"9ACA"],
- [0x54A0,"CE48"],
- [0x54A1,"CDFB"],
- [0x54A2,"CE4B"],
- [0x54A3,"89F1"],
- [0x54A4,"FAF9"],
- [0x54A5,"CDFD"],
- [0x54A6,"AB78"],
- [0x54A7,"ABA8"],
- [0x54A8,"AB74"],
- [0x54A9,"ABA7"],
- [0x54AA,"AB7D"],
- [0x54AB,"ABA4"],
- [0x54AC,"AB72"],
- [0x54AD,"CDFC"],
- [0x54AE,"CE43"],
- [0x54AF,"ABA3"],
- [0x54B0,"CE4F"],
- [0x54B1,"ABA5"],
- [0x54B2,"8E5A"],
- [0x54B3,"AB79"],
- [0x54B4,"89F2"],
- [0x54B6,"CE45"],
- [0x54B7,"CE42"],
- [0x54B8,"AB77"],
- [0x54B9,"89F3"],
- [0x54BA,"CDFA"],
- [0x54BB,"ABA6"],
- [0x54BC,"CE4A"],
- [0x54BD,"AB7C"],
- [0x54BE,"CE4C"],
- [0x54BF,"ABA9"],
- [0x54C0,"AB73"],
- [0x54C1,"AB7E"],
- [0x54C2,"AB7B"],
- [0x54C3,"CE40"],
- [0x54C4,"ABA1"],
- [0x54C5,"CE46"],
- [0x54C6,"CE47"],
- [0x54C7,"AB7A"],
- [0x54C8,"ABA2"],
- [0x54C9,"AB76"],
- [0x54CB,"925D"],
- [0x54CC,"8B51"],
- [0x54CD,"92E0"],
- [0x54CE,"AB75"],
- [0x54CF,"CDFE"],
- [0x54D0,"89F4"],
- [0x54D6,"CE44"],
- [0x54DA,"9FD4"],
- [0x54DE,"CE4E"],
- [0x54E0,"D144"],
- [0x54E1,"ADFB"],
- [0x54E2,"D0F1"],
- [0x54E3,"8A79"],
- [0x54E4,"D0F6"],
- [0x54E5,"ADF4"],
- [0x54E6,"AE40"],
- [0x54E7,"D0F4"],
- [0x54E8,"ADEF"],
- [0x54E9,"ADF9"],
- [0x54EA,"ADFE"],
- [0x54EB,"D0FB"],
- [0x54ED,"ADFA"],
- [0x54EE,"ADFD"],
- [0x54EF,"89F5"],
- [0x54F1,"D0FE"],
- [0x54F2,"ADF5"],
- [0x54F3,"D0F5"],
- [0x54F7,"D142"],
- [0x54F8,"D143"],
- [0x54FA,"ADF7"],
- [0x54FB,"D141"],
- [0x54FC,"ADF3"],
- [0x54FD,"AE43"],
- [0x54FF,"D0F8"],
- [0x5501,"ADF1"],
- [0x5502,"97A7"],
- [0x5503,"D146"],
- [0x5504,"D0F9"],
- [0x5505,"D0FD"],
- [0x5506,"ADF6"],
- [0x5507,"AE42"],
- [0x5508,"D0FA"],
- [0x5509,"ADFC"],
- [0x550A,"D140"],
- [0x550B,"D147"],
- [0x550C,"D4A1"],
- [0x550D,"93BA"],
- [0x550E,"D145"],
- [0x550F,"AE44"],
- [0x5510,"ADF0"],
- [0x5511,"D0FC"],
- [0x5512,"D0F3"],
- [0x5513,"9E58"],
- [0x5514,"ADF8"],
- [0x5517,"D0F2"],
- [0x5518,"89F6"],
- [0x551A,"D0F7"],
- [0x551E,"9E57"],
- [0x5523,"89F7"],
- [0x5525,"8A41"],
- [0x5526,"D0F0"],
- [0x5527,"AE41"],
- [0x5528,"89F8"],
- [0x552A,"D477"],
- [0x552B,"FAF1"],
- [0x552C,"B0E4"],
- [0x552D,"D4A7"],
- [0x552E,"B0E2"],
- [0x552F,"B0DF"],
- [0x5530,"D47C"],
- [0x5531,"B0DB"],
- [0x5532,"D4A2"],
- [0x5533,"B0E6"],
- [0x5534,"D476"],
- [0x5535,"D47B"],
- [0x5536,"D47A"],
- [0x5537,"ADF2"],
- [0x5538,"B0E1"],
- [0x5539,"D4A5"],
- [0x553B,"D4A8"],
- [0x553C,"D473"],
- [0x553E,"B3E8"],
- [0x553F,"89FA"],
- [0x5540,"D4A9"],
- [0x5541,"B0E7"],
- [0x5543,"B0D9"],
- [0x5544,"B0D6"],
- [0x5545,"D47E"],
- [0x5546,"B0D3"],
- [0x5547,"FB42"],
- [0x5548,"D4A6"],
- [0x5549,"FABF"],
- [0x554A,"B0DA"],
- [0x554B,"D4AA"],
- [0x554D,"D474"],
- [0x554E,"D4A4"],
- [0x554F,"B0DD"],
- [0x5550,"D475"],
- [0x5551,"D478"],
- [0x5552,"D47D"],
- [0x5553,"FBA3"],
- [0x5555,"B0DE"],
- [0x5556,"B0DC"],
- [0x5557,"B0E8"],
- [0x555C,"B0E3"],
- [0x555D,"FAF7"],
- [0x555E,"B0D7"],
- [0x555F,"B1D2"],
- [0x5561,"B0D8"],
- [0x5562,"D479"],
- [0x5563,"B0E5"],
- [0x5564,"B0E0"],
- [0x5565,"D4A3"],
- [0x5566,"B0D5"],
- [0x5569,"9E4E"],
- [0x556A,"B0D4"],
- [0x556B,"94DC"],
- [0x5571,"95DA"],
- [0x5572,"9DF8"],
- [0x5573,"9F6A"],
- [0x5575,"D471"],
- [0x5576,"D472"],
- [0x5577,"D86A"],
- [0x5579,"8AB7"],
- [0x557B,"B3D7"],
- [0x557C,"B3DA"],
- [0x557D,"D875"],
- [0x557E,"B3EE"],
- [0x557F,"D878"],
- [0x5580,"B3D8"],
- [0x5581,"D871"],
- [0x5582,"B3DE"],
- [0x5583,"B3E4"],
- [0x5584,"B5BD"],
- [0x5586,"FB46"],
- [0x5587,"B3E2"],
- [0x5588,"D86E"],
- [0x5589,"B3EF"],
- [0x558A,"B3DB"],
- [0x558B,"B3E3"],
- [0x558C,"D876"],
- [0x558D,"DCD7"],
- [0x558E,"D87B"],
- [0x558F,"D86F"],
- [0x5590,"8A46"],
- [0x5591,"D866"],
- [0x5592,"D873"],
- [0x5593,"D86D"],
- [0x5594,"B3E1"],
- [0x5595,"D879"],
- [0x5598,"B3DD"],
- [0x5599,"B3F1"],
- [0x559A,"B3EA"],
- [0x559C,"B3DF"],
- [0x559D,"B3DC"],
- [0x559F,"B3E7"],
- [0x55A1,"D87A"],
- [0x55A2,"D86C"],
- [0x55A3,"D872"],
- [0x55A4,"D874"],
- [0x55A5,"D868"],
- [0x55A6,"D877"],
- [0x55A7,"B3D9"],
- [0x55A8,"D867"],
- [0x55A9,"FB47"],
- [0x55AA,"B3E0"],
- [0x55AB,"B3F0"],
- [0x55AC,"B3EC"],
- [0x55AD,"D869"],
- [0x55AE,"B3E6"],
- [0x55B0,"9148"],
- [0x55B1,"B3ED"],
- [0x55B2,"B3E9"],
- [0x55B3,"B3E5"],
- [0x55B4,"92DE"],
- [0x55B5,"D870"],
- [0x55B9,"8B53"],
- [0x55BA,"9DF6"],
- [0x55BB,"B3EB"],
- [0x55BC,"9BDA"],
- [0x55BF,"DCD5"],
- [0x55C0,"DCD1"],
- [0x55C1,"9D7E"],
- [0x55C2,"DCE0"],
- [0x55C3,"DCCA"],
- [0x55C4,"DCD3"],
- [0x55C5,"B6E5"],
- [0x55C6,"B6E6"],
- [0x55C7,"B6DE"],
- [0x55C8,"DCDC"],
- [0x55C9,"B6E8"],
- [0x55CA,"DCCF"],
- [0x55CB,"DCCE"],
- [0x55CC,"DCCC"],
- [0x55CD,"DCDE"],
- [0x55CE,"B6DC"],
- [0x55CF,"DCD8"],
- [0x55D0,"DCCD"],
- [0x55D1,"B6DF"],
- [0x55D2,"DCD6"],
- [0x55D3,"B6DA"],
- [0x55D4,"DCD2"],
- [0x55D5,"DCD9"],
- [0x55D6,"DCDB"],
- [0x55D7,"89FD"],
- [0x55D8,"99E4"],
- [0x55D9,"DCDF"],
- [0x55DA,"B6E3"],
- [0x55DB,"DCCB"],
- [0x55DC,"B6DD"],
- [0x55DD,"DCD0"],
- [0x55DE,"9E43"],
- [0x55DF,"B6D8"],
- [0x55E1,"B6E4"],
- [0x55E2,"DCDA"],
- [0x55E3,"B6E0"],
- [0x55E4,"B6E1"],
- [0x55E5,"B6E7"],
- [0x55E6,"B6DB"],
- [0x55E7,"A25F"],
- [0x55E8,"B6D9"],
- [0x55E9,"DCD4"],
- [0x55EA,"9DE9"],
- [0x55EC,"8F52"],
- [0x55EF,"B6E2"],
- [0x55F0,"9DF5"],
- [0x55F1,"9DF0"],
- [0x55F2,"DCDD"],
- [0x55F5,"99E7"],
- [0x55F6,"B9CD"],
- [0x55F7,"B9C8"],
- [0x55F9,"E155"],
- [0x55FA,"E151"],
- [0x55FB,"8BBD"],
- [0x55FC,"E14B"],
- [0x55FD,"B9C2"],
- [0x55FE,"B9BE"],
- [0x55FF,"E154"],
- [0x5600,"B9BF"],
- [0x5601,"E14E"],
- [0x5602,"E150"],
- [0x5604,"E153"],
- [0x5605,"9DEF"],
- [0x5606,"B9C4"],
- [0x5608,"B9CB"],
- [0x5609,"B9C5"],
- [0x560C,"E149"],
- [0x560D,"B9C6"],
- [0x560E,"B9C7"],
- [0x560F,"E14C"],
- [0x5610,"B9CC"],
- [0x5611,"9FB7"],
- [0x5612,"E14A"],
- [0x5613,"E14F"],
- [0x5614,"B9C3"],
- [0x5615,"E148"],
- [0x5616,"B9C9"],
- [0x5617,"B9C1"],
- [0x561B,"B9C0"],
- [0x561C,"E14D"],
- [0x561D,"E152"],
- [0x561E,"9DD0"],
- [0x561F,"B9CA"],
- [0x5620,"9FEB"],
- [0x5621,"8DA9"],
- [0x5622,"9DCF"],
- [0x5623,"98E1"],
- [0x5625,"9DE5"],
- [0x5627,"E147"],
- [0x5629,"BC4D"],
- [0x562A,"E547"],
- [0x562C,"E544"],
- [0x562D,"9DC8"],
- [0x562E,"BC47"],
- [0x562F,"BC53"],
- [0x5630,"BC54"],
- [0x5632,"BC4A"],
- [0x5633,"E542"],
- [0x5634,"BC4C"],
- [0x5635,"E4F9"],
- [0x5636,"BC52"],
- [0x5637,"FB4F"],
- [0x5638,"E546"],
- [0x5639,"BC49"],
- [0x563A,"E548"],
- [0x563B,"BC48"],
- [0x563D,"E543"],
- [0x563E,"E545"],
- [0x563F,"BC4B"],
- [0x5640,"E541"],
- [0x5641,"E4FA"],
- [0x5642,"E4F7"],
- [0x5643,"9DEB"],
- [0x5645,"D86B"],
- [0x5646,"E4FD"],
- [0x5648,"E4F6"],
- [0x5649,"E4FC"],
- [0x564A,"E4FB"],
- [0x564C,"E4F8"],
- [0x564D,"FB54"],
- [0x564E,"BC4F"],
- [0x564F,"FB55"],
- [0x5650,"9AA2"],
- [0x5652,"8AD6"],
- [0x5653,"BC4E"],
- [0x5654,"9A5F"],
- [0x5657,"BC50"],
- [0x5658,"E4FE"],
- [0x5659,"BEB2"],
- [0x565A,"E540"],
- [0x565D,"9EF5"],
- [0x565E,"E945"],
- [0x5660,"E8FD"],
- [0x5661,"8FB7"],
- [0x5662,"BEBE"],
- [0x5663,"E942"],
- [0x5664,"BEB6"],
- [0x5665,"BEBA"],
- [0x5666,"E941"],
- [0x5668,"BEB9"],
- [0x5669,"BEB5"],
- [0x566A,"BEB8"],
- [0x566B,"BEB3"],
- [0x566C,"BEBD"],
- [0x566D,"E943"],
- [0x566E,"E8FE"],
- [0x566F,"BEBC"],
- [0x5670,"E8FC"],
- [0x5671,"BEBB"],
- [0x5672,"E944"],
- [0x5673,"E940"],
- [0x5674,"BC51"],
- [0x5676,"BEBF"],
- [0x5677,"E946"],
- [0x5678,"BEB7"],
- [0x5679,"BEB4"],
- [0x567A,"9AD2"],
- [0x567B,"9E6A"],
- [0x567C,"9EE8"],
- [0x567E,"ECC6"],
- [0x567F,"ECC8"],
- [0x5680,"C07B"],
- [0x5681,"ECC9"],
- [0x5682,"ECC7"],
- [0x5683,"ECC5"],
- [0x5684,"ECC4"],
- [0x5685,"C07D"],
- [0x5686,"ECC3"],
- [0x5687,"C07E"],
- [0x5689,"8BBF"],
- [0x568A,"91C2"],
- [0x568B,"9D62"],
- [0x568C,"ECC1"],
- [0x568D,"ECC2"],
- [0x568E,"C07A"],
- [0x568F,"C0A1"],
- [0x5690,"C07C"],
- [0x5692,"9260"],
- [0x5693,"ECC0"],
- [0x5695,"C250"],
- [0x5697,"EFBC"],
- [0x5698,"EFBA"],
- [0x5699,"EFBF"],
- [0x569A,"EFBD"],
- [0x569C,"EFBB"],
- [0x569D,"EFBE"],
- [0x569E,"925E"],
- [0x569F,"91C1"],
- [0x56A1,"8AC5"],
- [0x56A4,"97A3"],
- [0x56A5,"C360"],
- [0x56A6,"F1F2"],
- [0x56A7,"F1F3"],
- [0x56A8,"C456"],
- [0x56AA,"F1F4"],
- [0x56AB,"F1F0"],
- [0x56AC,"F1F5"],
- [0x56AD,"F1F1"],
- [0x56AE,"C251"],
- [0x56AF,"8B6C"],
- [0x56B1,"8D7E"],
- [0x56B2,"F3FE"],
- [0x56B3,"F441"],
- [0x56B4,"C459"],
- [0x56B5,"F440"],
- [0x56B6,"C458"],
- [0x56B7,"C457"],
- [0x56B9,"9C54"],
- [0x56BC,"C45A"],
- [0x56BD,"F5C5"],
- [0x56BE,"F5C6"],
- [0x56BF,"9DBD"],
- [0x56C0,"C4DA"],
- [0x56C1,"C4D9"],
- [0x56C2,"C4DB"],
- [0x56C3,"F5C4"],
- [0x56C5,"F6D8"],
- [0x56C6,"F6D7"],
- [0x56C8,"C56D"],
- [0x56C9,"C56F"],
- [0x56CA,"C56E"],
- [0x56CB,"F6D9"],
- [0x56CC,"C5C8"],
- [0x56CD,"F8A6"],
- [0x56D1,"C5F1"],
- [0x56D3,"F8A5"],
- [0x56D4,"F8EE"],
- [0x56D6,"9CC5"],
- [0x56D7,"C949"],
- [0x56DA,"A57D"],
- [0x56DB,"A57C"],
- [0x56DD,"A65F"],
- [0x56DE,"A65E"],
- [0x56DF,"C9C7"],
- [0x56E0,"A65D"],
- [0x56E1,"C9C6"],
- [0x56E2,"895B"],
- [0x56E4,"A779"],
- [0x56E5,"CAA9"],
- [0x56E7,"CAA8"],
- [0x56EA,"A777"],
- [0x56EB,"A77A"],
- [0x56ED,"FB5C"],
- [0x56EE,"CAA7"],
- [0x56EF,"FB5B"],
- [0x56F0,"A778"],
- [0x56F1,"FB57"],
- [0x56F7,"CBF0"],
- [0x56F9,"CBF1"],
- [0x56FA,"A954"],
- [0x56FB,"8765"],
- [0x56FD,"98C7"],
- [0x56FF,"ABAA"],
- [0x5700,"FB5A"],
- [0x5701,"D148"],
- [0x5702,"D149"],
- [0x5703,"AE45"],
- [0x5704,"AE46"],
- [0x5707,"D4AC"],
- [0x5708,"B0E9"],
- [0x5709,"B0EB"],
- [0x570A,"D4AB"],
- [0x570B,"B0EA"],
- [0x570C,"D87C"],
- [0x570D,"B3F2"],
- [0x5712,"B6E9"],
- [0x5713,"B6EA"],
- [0x5714,"DCE1"],
- [0x5715,"9CEE"],
- [0x5716,"B9CF"],
- [0x5718,"B9CE"],
- [0x571A,"E549"],
- [0x571B,"E948"],
- [0x571C,"E947"],
- [0x571D,"92E2"],
- [0x571E,"F96B"],
- [0x571F,"A467"],
- [0x5720,"C959"],
- [0x5722,"C96E"],
- [0x5723,"C96F"],
- [0x5728,"A662"],
- [0x5729,"A666"],
- [0x572A,"C9C9"],
- [0x572C,"A664"],
- [0x572D,"A663"],
- [0x572E,"C9C8"],
- [0x572F,"A665"],
- [0x5730,"A661"],
- [0x5732,"94A7"],
- [0x5733,"A660"],
- [0x5734,"C9CA"],
- [0x573B,"A7A6"],
- [0x573D,"8CCC"],
- [0x573E,"A7A3"],
- [0x573F,"9BD4"],
- [0x5740,"A77D"],
- [0x5741,"CAAA"],
- [0x5742,"FB64"],
- [0x5743,"FB76"],
- [0x5745,"CAAB"],
- [0x5746,"FB60"],
- [0x5747,"A7A1"],
- [0x5749,"CAAD"],
- [0x574A,"A77B"],
- [0x574B,"CAAE"],
- [0x574C,"CAAC"],
- [0x574D,"A77E"],
- [0x574E,"A7A2"],
- [0x574F,"A7A5"],
- [0x5750,"A7A4"],
- [0x5751,"A77C"],
- [0x5752,"CAAF"],
- [0x5754,"99E5"],
- [0x5757,"9AC2"],
- [0x575B,"91FB"],
- [0x575F,"A073"],
- [0x5761,"A959"],
- [0x5762,"CBFE"],
- [0x5764,"A95B"],
- [0x5766,"A95A"],
- [0x5767,"9F72"],
- [0x5768,"CC40"],
- [0x5769,"A958"],
- [0x576A,"A957"],
- [0x576B,"CBF5"],
- [0x576D,"CBF4"],
- [0x576F,"CBF2"],
- [0x5770,"CBF7"],
- [0x5771,"CBF6"],
- [0x5772,"CBF3"],
- [0x5773,"CBFC"],
- [0x5774,"CBFD"],
- [0x5775,"CBFA"],
- [0x5776,"CBF8"],
- [0x5777,"A956"],
- [0x577A,"9FCC"],
- [0x577B,"CBFB"],
- [0x577C,"A95C"],
- [0x577D,"CC41"],
- [0x577E,"98A5"],
- [0x577F,"92E8"],
- [0x5780,"CBF9"],
- [0x5782,"ABAB"],
- [0x5783,"A955"],
- [0x5788,"9BBC"],
- [0x578A,"96F3"],
- [0x578B,"ABAC"],
- [0x578C,"CE54"],
- [0x578D,"92E7"],
- [0x578F,"CE5A"],
- [0x5790,"FC67"],
- [0x5793,"ABB2"],
- [0x5794,"CE58"],
- [0x5795,"CE5E"],
- [0x5797,"CE55"],
- [0x5798,"CE59"],
- [0x5799,"CE5B"],
- [0x579A,"CE5D"],
- [0x579B,"CE57"],
- [0x579C,"8B7D"],
- [0x579D,"CE56"],
- [0x579E,"CE51"],
- [0x579F,"CE52"],
- [0x57A0,"ABAD"],
- [0x57A1,"9BF4"],
- [0x57A2,"ABAF"],
- [0x57A3,"ABAE"],
- [0x57A4,"CE53"],
- [0x57A5,"CE5C"],
- [0x57A7,"9EF7"],
- [0x57AA,"9EC1"],
- [0x57AE,"ABB1"],
- [0x57B3,"87C3"],
- [0x57B4,"996F"],
- [0x57B5,"CE50"],
- [0x57B6,"D153"],
- [0x57B8,"D152"],
- [0x57B9,"D157"],
- [0x57BA,"D14E"],
- [0x57BB,"96F1"],
- [0x57BC,"D151"],
- [0x57BD,"D150"],
- [0x57BE,"8E41"],
- [0x57BF,"D154"],
- [0x57C1,"D158"],
- [0x57C2,"AE47"],
- [0x57C3,"AE4A"],
- [0x57C4,"954A"],
- [0x57C6,"D14F"],
- [0x57C7,"D155"],
- [0x57C8,"97E6"],
- [0x57CB,"AE49"],
- [0x57CC,"D14A"],
- [0x57CE,"ABB0"],
- [0x57CF,"D4BA"],
- [0x57D0,"D156"],
- [0x57D2,"D14D"],
- [0x57D4,"AE48"],
- [0x57D5,"D14C"],
- [0x57D7,"96F5"],
- [0x57DC,"D4B1"],
- [0x57DD,"92E6"],
- [0x57DE,"9F42"],
- [0x57DF,"B0EC"],
- [0x57E0,"B0F0"],
- [0x57E1,"D4C1"],
- [0x57E2,"D4AF"],
- [0x57E3,"D4BD"],
- [0x57E4,"B0F1"],
- [0x57E5,"D4BF"],
- [0x57E6,"FB67"],
- [0x57E7,"D4C5"],
- [0x57E9,"D4C9"],
- [0x57EC,"D4C0"],
- [0x57ED,"D4B4"],
- [0x57EE,"D4BC"],
- [0x57EF,"99A9"],
- [0x57F0,"D4CA"],
- [0x57F1,"D4C8"],
- [0x57F2,"D4BE"],
- [0x57F3,"D4B9"],
- [0x57F4,"D4B2"],
- [0x57F5,"D8A6"],
- [0x57F6,"D4B0"],
- [0x57F7,"B0F5"],
- [0x57F8,"D4B7"],
- [0x57F9,"B0F6"],
- [0x57FA,"B0F2"],
- [0x57FB,"D4AD"],
- [0x57FC,"D4C3"],
- [0x57FD,"D4B5"],
- [0x57FE,"FAE6"],
- [0x5800,"D4B3"],
- [0x5801,"D4C6"],
- [0x5802,"B0F3"],
- [0x5803,"FB69"],
- [0x5804,"D4CC"],
- [0x5805,"B0ED"],
- [0x5806,"B0EF"],
- [0x5807,"D4BB"],
- [0x5808,"D4B6"],
- [0x5809,"AE4B"],
- [0x580A,"B0EE"],
- [0x580B,"D4B8"],
- [0x580C,"D4C7"],
- [0x580D,"D4CB"],
- [0x580E,"D4C2"],
- [0x5810,"D4C4"],
- [0x5812,"97E5"],
- [0x5814,"D4AE"],
- [0x5818,"87C8"],
- [0x5819,"D8A1"],
- [0x581B,"D8AA"],
- [0x581C,"D8A9"],
- [0x581D,"B3FA"],
- [0x581E,"D8A2"],
- [0x5820,"B3FB"],
- [0x5821,"B3F9"],
- [0x5822,"967D"],
- [0x5823,"D8A4"],
- [0x5824,"B3F6"],
- [0x5825,"D8A8"],
- [0x5826,"FB6C"],
- [0x5827,"D8A3"],
- [0x5828,"D8A5"],
- [0x5829,"D87D"],
- [0x582A,"B3F4"],
- [0x582C,"D8B2"],
- [0x582D,"D8B1"],
- [0x582E,"D8AE"],
- [0x582F,"B3F3"],
- [0x5830,"B3F7"],
- [0x5831,"B3F8"],
- [0x5832,"D14B"],
- [0x5833,"D8AB"],
- [0x5834,"B3F5"],
- [0x5835,"B0F4"],
- [0x5836,"D8AD"],
- [0x5837,"D87E"],
- [0x5838,"D8B0"],
- [0x5839,"D8AF"],
- [0x583A,"99A2"],
- [0x583B,"D8B3"],
- [0x583D,"DCEF"],
- [0x583F,"D8AC"],
- [0x5840,"9ABB"],
- [0x5844,"9A65"],
- [0x5847,"944E"],
- [0x5848,"D8A7"],
- [0x5849,"DCE7"],
- [0x584A,"B6F4"],
- [0x584B,"B6F7"],
- [0x584C,"B6F2"],
- [0x584D,"DCE6"],
- [0x584E,"DCEA"],
- [0x584F,"DCE5"],
- [0x5851,"B6EC"],
- [0x5852,"B6F6"],
- [0x5853,"DCE2"],
- [0x5854,"B6F0"],
- [0x5855,"DCE9"],
- [0x5857,"B6EE"],
- [0x5858,"B6ED"],
- [0x5859,"DCEC"],
- [0x585A,"B6EF"],
- [0x585B,"DCEE"],
- [0x585C,"FB6E"],
- [0x585D,"DCEB"],
- [0x585E,"B6EB"],
- [0x585F,"99DF"],
- [0x5862,"B6F5"],
- [0x5863,"DCF0"],
- [0x5864,"DCE4"],
- [0x5865,"DCED"],
- [0x5868,"DCE3"],
- [0x5869,"98E3"],
- [0x586B,"B6F1"],
- [0x586C,"9254"],
- [0x586D,"B6F3"],
- [0x586F,"DCE8"],
- [0x5871,"DCF1"],
- [0x5872,"967B"],
- [0x5873,"8AAF"],
- [0x5874,"E15D"],
- [0x5875,"B9D0"],
- [0x5876,"E163"],
- [0x5879,"B9D5"],
- [0x587A,"E15F"],
- [0x587B,"E166"],
- [0x587C,"E157"],
- [0x587D,"B9D7"],
- [0x587E,"B9D1"],
- [0x587F,"E15C"],
- [0x5880,"BC55"],
- [0x5881,"E15B"],
- [0x5882,"E164"],
- [0x5883,"B9D2"],
- [0x5885,"B9D6"],
- [0x5886,"E15A"],
- [0x5887,"E160"],
- [0x5888,"E165"],
- [0x5889,"E156"],
- [0x588A,"B9D4"],
- [0x588B,"E15E"],
- [0x588E,"E162"],
- [0x588F,"E168"],
- [0x5890,"E158"],
- [0x5891,"E161"],
- [0x5892,"8C77"],
- [0x5893,"B9D3"],
- [0x5894,"E167"],
- [0x5896,"87B0"],
- [0x5898,"E159"],
- [0x5899,"8BAF"],
- [0x589A,"9EBD"],
- [0x589C,"BC59"],
- [0x589D,"E54B"],
- [0x589E,"BC57"],
- [0x589F,"BC56"],
- [0x58A0,"E54D"],
- [0x58A1,"E552"],
- [0x58A3,"E54E"],
- [0x58A5,"E551"],
- [0x58A6,"BC5C"],
- [0x58A7,"9EE6"],
- [0x58A8,"BEA5"],
- [0x58A9,"BC5B"],
- [0x58AA,"FB6F"],
- [0x58AB,"E54A"],
- [0x58AC,"E550"],
- [0x58AE,"BC5A"],
- [0x58AF,"E54F"],
- [0x58B0,"8EE1"],
- [0x58B1,"E54C"],
- [0x58B3,"BC58"],
- [0x58B5,"9B7D"],
- [0x58B6,"9C7E"],
- [0x58BA,"E94D"],
- [0x58BB,"F9D9"],
- [0x58BC,"E94F"],
- [0x58BD,"E94A"],
- [0x58BE,"BEC1"],
- [0x58BF,"E94C"],
- [0x58C1,"BEC0"],
- [0x58C2,"E94E"],
- [0x58C5,"BEC3"],
- [0x58C6,"E950"],
- [0x58C7,"BEC2"],
- [0x58C8,"E949"],
- [0x58C9,"E94B"],
- [0x58CB,"92EA"],
- [0x58CE,"C0A5"],
- [0x58CF,"ECCC"],
- [0x58D0,"8C78"],
- [0x58D1,"C0A4"],
- [0x58D2,"ECCD"],
- [0x58D3,"C0A3"],
- [0x58D4,"ECCB"],
- [0x58D5,"C0A2"],
- [0x58D6,"ECCA"],
- [0x58D8,"C253"],
- [0x58D9,"C252"],
- [0x58DA,"F1F6"],
- [0x58DB,"F1F8"],
- [0x58DC,"FB72"],
- [0x58DD,"F1F7"],
- [0x58DE,"C361"],
- [0x58DF,"C362"],
- [0x58E0,"FB71"],
- [0x58E2,"C363"],
- [0x58E3,"F442"],
- [0x58E4,"C45B"],
- [0x58E7,"F7D3"],
- [0x58E8,"F7D2"],
- [0x58E9,"C5F2"],
- [0x58EB,"A468"],
- [0x58EC,"A4D0"],
- [0x58EF,"A7A7"],
- [0x58F0,"895C"],
- [0x58F2,"98F0"],
- [0x58F3,"96F2"],
- [0x58F4,"CE5F"],
- [0x58F9,"B3FC"],
- [0x58FA,"B3FD"],
- [0x58FB,"FB74"],
- [0x58FC,"DCF2"],
- [0x58FD,"B9D8"],
- [0x58FE,"E169"],
- [0x58FF,"E553"],
- [0x5902,"8BC1"],
- [0x5903,"C95A"],
- [0x5904,"895D"],
- [0x5905,"89DE"],
- [0x5906,"CAB0"],
- [0x5907,"895E"],
- [0x590A,"C6CA"],
- [0x590C,"CC42"],
- [0x590D,"CE60"],
- [0x590E,"D159"],
- [0x590F,"AE4C"],
- [0x5911,"FE42"],
- [0x5912,"F1F9"],
- [0x5914,"C4DC"],
- [0x5915,"A469"],
- [0x5916,"A57E"],
- [0x5917,"C970"],
- [0x5919,"A667"],
- [0x591A,"A668"],
- [0x591C,"A95D"],
- [0x591D,"8768"],
- [0x591F,"FB7B"],
- [0x5920,"B0F7"],
- [0x5922,"B9DA"],
- [0x5924,"B9DB"],
- [0x5925,"B9D9"],
- [0x5927,"A46A"],
- [0x5929,"A4D1"],
- [0x592A,"A4D3"],
- [0x592B,"A4D2"],
- [0x592C,"C95B"],
- [0x592D,"A4D4"],
- [0x592E,"A5A1"],
- [0x592F,"C971"],
- [0x5931,"A5A2"],
- [0x5932,"895F"],
- [0x5934,"8960"],
- [0x5937,"A669"],
- [0x5938,"A66A"],
- [0x593C,"C9CB"],
- [0x593E,"A7A8"],
- [0x5940,"CAB1"],
- [0x5944,"A961"],
- [0x5945,"CC43"],
- [0x5947,"A95F"],
- [0x5948,"A960"],
- [0x5949,"A95E"],
- [0x594A,"D15A"],
- [0x594E,"ABB6"],
- [0x594F,"ABB5"],
- [0x5950,"ABB7"],
- [0x5951,"ABB4"],
- [0x5953,"CE61"],
- [0x5954,"A962"],
- [0x5955,"ABB3"],
- [0x5957,"AE4D"],
- [0x5958,"AE4E"],
- [0x595A,"AE4F"],
- [0x595C,"D4CD"],
- [0x5960,"B3FE"],
- [0x5961,"D8B4"],
- [0x5962,"B0F8"],
- [0x5965,"9BCD"],
- [0x5967,"B6F8"],
- [0x5969,"B9DD"],
- [0x596A,"B9DC"],
- [0x596B,"E16A"],
- [0x596D,"BC5D"],
- [0x596E,"BEC4"],
- [0x5970,"EFC0"],
- [0x5971,"F6DA"],
- [0x5972,"F7D4"],
- [0x5973,"A46B"],
- [0x5974,"A5A3"],
- [0x5975,"9DD3"],
- [0x5976,"A5A4"],
- [0x5977,"C9D1"],
- [0x5978,"A66C"],
- [0x5979,"A66F"],
- [0x597B,"C9CF"],
- [0x597C,"C9CD"],
- [0x597D,"A66E"],
- [0x597E,"C9D0"],
- [0x597F,"C9D2"],
- [0x5980,"C9CC"],
- [0x5981,"A671"],
- [0x5982,"A670"],
- [0x5983,"A66D"],
- [0x5984,"A66B"],
- [0x5985,"C9CE"],
- [0x5989,"984C"],
- [0x598A,"A7B3"],
- [0x598D,"A7B0"],
- [0x598E,"CAB6"],
- [0x598F,"CAB9"],
- [0x5990,"CAB8"],
- [0x5992,"A7AA"],
- [0x5993,"A7B2"],
- [0x5994,"9752"],
- [0x5996,"A7AF"],
- [0x5997,"CAB5"],
- [0x5998,"CAB3"],
- [0x5999,"A7AE"],
- [0x599A,"95C3"],
- [0x599D,"A7A9"],
- [0x599E,"A7AC"],
- [0x599F,"9BB6"],
- [0x59A0,"CAB4"],
- [0x59A1,"CABB"],
- [0x59A2,"CAB7"],
- [0x59A3,"A7AD"],
- [0x59A4,"A7B1"],
- [0x59A5,"A7B4"],
- [0x59A6,"CAB2"],
- [0x59A7,"CABA"],
- [0x59A8,"A7AB"],
- [0x59AC,"9AB9"],
- [0x59AE,"A967"],
- [0x59AF,"A96F"],
- [0x59B0,"97B3"],
- [0x59B1,"CC4F"],
- [0x59B2,"CC48"],
- [0x59B3,"A970"],
- [0x59B4,"CC53"],
- [0x59B5,"CC44"],
- [0x59B6,"CC4B"],
- [0x59B7,"9F74"],
- [0x59B8,"92F1"],
- [0x59B9,"A966"],
- [0x59BA,"CC45"],
- [0x59BB,"A964"],
- [0x59BC,"CC4C"],
- [0x59BD,"CC50"],
- [0x59BE,"A963"],
- [0x59BF,"8CFA"],
- [0x59C0,"CC51"],
- [0x59C1,"CC4A"],
- [0x59C3,"CC4D"],
- [0x59C4,"97DF"],
- [0x59C5,"A972"],
- [0x59C6,"A969"],
- [0x59C7,"CC54"],
- [0x59C8,"CC52"],
- [0x59C9,"FBA6"],
- [0x59CA,"A96E"],
- [0x59CB,"A96C"],
- [0x59CC,"CC49"],
- [0x59CD,"A96B"],
- [0x59CE,"CC47"],
- [0x59CF,"CC46"],
- [0x59D0,"A96A"],
- [0x59D1,"A968"],
- [0x59D2,"A971"],
- [0x59D3,"A96D"],
- [0x59D4,"A965"],
- [0x59D6,"CC4E"],
- [0x59D8,"ABB9"],
- [0x59D9,"FBAB"],
- [0x59DA,"ABC0"],
- [0x59DB,"CE6F"],
- [0x59DC,"ABB8"],
- [0x59DD,"CE67"],
- [0x59DE,"CE63"],
- [0x59E0,"CE73"],
- [0x59E1,"CE62"],
- [0x59E3,"ABBB"],
- [0x59E4,"CE6C"],
- [0x59E5,"ABBE"],
- [0x59E6,"ABC1"],
- [0x59E8,"ABBC"],
- [0x59E9,"CE70"],
- [0x59EA,"ABBF"],
- [0x59EB,"9877"],
- [0x59EC,"AE56"],
- [0x59ED,"CE76"],
- [0x59EE,"CE64"],
- [0x59EF,"9854"],
- [0x59F0,"95C5"],
- [0x59F1,"CE66"],
- [0x59F2,"CE6D"],
- [0x59F3,"CE71"],
- [0x59F4,"CE75"],
- [0x59F5,"CE72"],
- [0x59F6,"CE6B"],
- [0x59F7,"CE6E"],
- [0x59F8,"9D55"],
- [0x59F9,"FBB2"],
- [0x59FA,"CE68"],
- [0x59FB,"ABC3"],
- [0x59FC,"CE6A"],
- [0x59FD,"CE69"],
- [0x59FE,"CE74"],
- [0x59FF,"ABBA"],
- [0x5A00,"CE65"],
- [0x5A01,"ABC2"],
- [0x5A02,"957E"],
- [0x5A03,"ABBD"],
- [0x5A09,"AE5C"],
- [0x5A0A,"D162"],
- [0x5A0B,"9742"],
- [0x5A0C,"AE5B"],
- [0x5A0D,"94E6"],
- [0x5A0F,"D160"],
- [0x5A11,"AE50"],
- [0x5A12,"92F5"],
- [0x5A13,"AE55"],
- [0x5A15,"D15F"],
- [0x5A16,"D15C"],
- [0x5A17,"D161"],
- [0x5A18,"AE51"],
- [0x5A19,"D15B"],
- [0x5A1A,"8CC5"],
- [0x5A1B,"AE54"],
- [0x5A1C,"AE52"],
- [0x5A1E,"D163"],
- [0x5A1F,"AE53"],
- [0x5A20,"AE57"],
- [0x5A21,"92FD"],
- [0x5A23,"AE58"],
- [0x5A24,"FBA2"],
- [0x5A25,"AE5A"],
- [0x5A27,"9C51"],
- [0x5A29,"AE59"],
- [0x5A2A,"94E9"],
- [0x5A2B,"985C"],
- [0x5A2C,"92F0"],
- [0x5A2D,"D15D"],
- [0x5A2E,"D15E"],
- [0x5A33,"D164"],
- [0x5A35,"D4D4"],
- [0x5A36,"B0F9"],
- [0x5A37,"D8C2"],
- [0x5A38,"D4D3"],
- [0x5A39,"D4E6"],
- [0x5A3C,"B140"],
- [0x5A3D,"944C"],
- [0x5A3E,"D4E4"],
- [0x5A40,"B0FE"],
- [0x5A41,"B0FA"],
- [0x5A42,"D4ED"],
- [0x5A43,"D4DD"],
- [0x5A44,"D4E0"],
- [0x5A45,"916B"],
- [0x5A46,"B143"],
- [0x5A47,"D4EA"],
- [0x5A48,"D4E2"],
- [0x5A49,"B0FB"],
- [0x5A4A,"B144"],
- [0x5A4C,"D4E7"],
- [0x5A4D,"D4E5"],
- [0x5A50,"D4D6"],
- [0x5A51,"D4EB"],
- [0x5A52,"D4DF"],
- [0x5A53,"D4DA"],
- [0x5A54,"8B78"],
- [0x5A55,"D4D0"],
- [0x5A56,"D4EC"],
- [0x5A57,"D4DC"],
- [0x5A58,"D4CF"],
- [0x5A59,"94E2"],
- [0x5A5A,"B142"],
- [0x5A5B,"D4E1"],
- [0x5A5C,"D4EE"],
- [0x5A5D,"D4DE"],
- [0x5A5E,"D4D2"],
- [0x5A5F,"D4D7"],
- [0x5A60,"D4CE"],
- [0x5A61,"984F"],
- [0x5A62,"B141"],
- [0x5A63,"FBB5"],
- [0x5A64,"D4DB"],
- [0x5A65,"D4D8"],
- [0x5A66,"B0FC"],
- [0x5A67,"D4D1"],
- [0x5A68,"9271"],
- [0x5A69,"D4E9"],
- [0x5A6A,"B0FD"],
- [0x5A6B,"9365"],
- [0x5A6C,"D4D9"],
- [0x5A6D,"D4D5"],
- [0x5A6E,"985B"],
- [0x5A70,"D4E8"],
- [0x5A71,"9850"],
- [0x5A77,"B440"],
- [0x5A78,"D8BB"],
- [0x5A79,"97BC"],
- [0x5A7A,"D8B8"],
- [0x5A7B,"D8C9"],
- [0x5A7C,"D8BD"],
- [0x5A7D,"D8CA"],
- [0x5A7E,"92F3"],
- [0x5A7F,"B442"],
- [0x5A81,"9340"],
- [0x5A82,"984D"],
- [0x5A83,"D8C6"],
- [0x5A84,"D8C3"],
- [0x5A86,"9572"],
- [0x5A88,"FDEF"],
- [0x5A8A,"D8C4"],
- [0x5A8B,"D8C7"],
- [0x5A8C,"D8CB"],
- [0x5A8E,"D4E3"],
- [0x5A8F,"D8CD"],
- [0x5A90,"DD47"],
- [0x5A91,"FDC1"],
- [0x5A92,"B443"],
- [0x5A93,"D8CE"],
- [0x5A94,"D8B6"],
- [0x5A95,"D8C0"],
- [0x5A96,"FBBA"],
- [0x5A97,"D8C5"],
- [0x5A99,"92EB"],
- [0x5A9A,"B441"],
- [0x5A9B,"B444"],
- [0x5A9C,"D8CC"],
- [0x5A9D,"D8CF"],
- [0x5A9E,"D8BA"],
- [0x5A9F,"D8B7"],
- [0x5AA0,"FC73"],
- [0x5AA1,"97B7"],
- [0x5AA2,"D8B9"],
- [0x5AA4,"876F"],
- [0x5AA5,"D8BE"],
- [0x5AA6,"D8BC"],
- [0x5AA7,"B445"],
- [0x5AA9,"D8C8"],
- [0x5AAB,"FBB4"],
- [0x5AAC,"D8BF"],
- [0x5AAE,"D8C1"],
- [0x5AAF,"D8B5"],
- [0x5AB0,"DCFA"],
- [0x5AB1,"DCF8"],
- [0x5AB2,"B742"],
- [0x5AB3,"B740"],
- [0x5AB4,"DD43"],
- [0x5AB5,"DCF9"],
- [0x5AB6,"DD44"],
- [0x5AB7,"DD40"],
- [0x5AB8,"DCF7"],
- [0x5AB9,"DD46"],
- [0x5ABA,"DCF6"],
- [0x5ABB,"DCFD"],
- [0x5ABC,"B6FE"],
- [0x5ABD,"B6FD"],
- [0x5ABE,"B6FC"],
- [0x5ABF,"DCFB"],
- [0x5AC0,"DD41"],
- [0x5AC1,"B6F9"],
- [0x5AC2,"B741"],
- [0x5AC3,"90A7"],
- [0x5AC4,"DCF4"],
- [0x5AC6,"DCFE"],
- [0x5AC7,"DCF3"],
- [0x5AC8,"DCFC"],
- [0x5AC9,"B6FA"],
- [0x5ACA,"DD42"],
- [0x5ACB,"DCF5"],
- [0x5ACC,"B6FB"],
- [0x5ACD,"DD45"],
- [0x5ACE,"9741"],
- [0x5ACF,"92F4"],
- [0x5AD1,"8772"],
- [0x5AD3,"FBBC"],
- [0x5AD5,"E16E"],
- [0x5AD6,"B9E2"],
- [0x5AD7,"B9E1"],
- [0x5AD8,"B9E3"],
- [0x5AD9,"E17A"],
- [0x5ADA,"E170"],
- [0x5ADB,"E176"],
- [0x5ADC,"E16B"],
- [0x5ADD,"E179"],
- [0x5ADE,"E178"],
- [0x5ADF,"E17C"],
- [0x5AE0,"E175"],
- [0x5AE1,"B9DE"],
- [0x5AE2,"E174"],
- [0x5AE3,"B9E4"],
- [0x5AE4,"9577"],
- [0x5AE5,"E16D"],
- [0x5AE6,"B9DF"],
- [0x5AE8,"E17B"],
- [0x5AE9,"B9E0"],
- [0x5AEA,"E16F"],
- [0x5AEB,"E172"],
- [0x5AEC,"E177"],
- [0x5AED,"E171"],
- [0x5AEE,"E16C"],
- [0x5AF0,"9EE2"],
- [0x5AF2,"8F78"],
- [0x5AF3,"E173"],
- [0x5AF4,"E555"],
- [0x5AF5,"BC61"],
- [0x5AF6,"E558"],
- [0x5AF7,"E557"],
- [0x5AF8,"E55A"],
- [0x5AF9,"E55C"],
- [0x5AFA,"F9DC"],
- [0x5AFB,"BC5F"],
- [0x5AFD,"E556"],
- [0x5AFE,"9672"],
- [0x5AFF,"E554"],
- [0x5B01,"E55D"],
- [0x5B02,"E55B"],
- [0x5B03,"E559"],
- [0x5B05,"E55F"],
- [0x5B07,"E55E"],
- [0x5B08,"BC63"],
- [0x5B09,"BC5E"],
- [0x5B0B,"BC60"],
- [0x5B0C,"BC62"],
- [0x5B0D,"9EB5"],
- [0x5B0F,"E560"],
- [0x5B10,"E957"],
- [0x5B11,"964B"],
- [0x5B13,"E956"],
- [0x5B14,"E955"],
- [0x5B15,"8CAC"],
- [0x5B16,"E958"],
- [0x5B17,"E951"],
- [0x5B19,"E952"],
- [0x5B1A,"E95A"],
- [0x5B1B,"E953"],
- [0x5B1D,"BEC5"],
- [0x5B1E,"E95C"],
- [0x5B1F,"A0FA"],
- [0x5B20,"E95B"],
- [0x5B21,"E954"],
- [0x5B23,"ECD1"],
- [0x5B24,"C0A8"],
- [0x5B25,"ECCF"],
- [0x5B26,"ECD4"],
- [0x5B27,"ECD3"],
- [0x5B28,"E959"],
- [0x5B2A,"C0A7"],
- [0x5B2B,"9575"],
- [0x5B2C,"ECD2"],
- [0x5B2D,"ECCE"],
- [0x5B2E,"ECD6"],
- [0x5B2F,"ECD5"],
- [0x5B30,"C0A6"],
- [0x5B32,"ECD0"],
- [0x5B34,"BEC6"],
- [0x5B38,"C254"],
- [0x5B3C,"EFC1"],
- [0x5B3D,"F1FA"],
- [0x5B3E,"F1FB"],
- [0x5B3F,"F1FC"],
- [0x5B40,"C45C"],
- [0x5B41,"90DA"],
- [0x5B43,"C45D"],
- [0x5B44,"9367"],
- [0x5B45,"F443"],
- [0x5B46,"FEA4"],
- [0x5B47,"F5C8"],
- [0x5B48,"F5C7"],
- [0x5B4A,"90DF"],
- [0x5B4B,"F6DB"],
- [0x5B4C,"F6DC"],
- [0x5B4D,"F7D5"],
- [0x5B4E,"F8A7"],
- [0x5B4F,"9354"],
- [0x5B50,"A46C"],
- [0x5B51,"A46D"],
- [0x5B53,"A46E"],
- [0x5B54,"A4D5"],
- [0x5B55,"A5A5"],
- [0x5B56,"C9D3"],
- [0x5B57,"A672"],
- [0x5B58,"A673"],
- [0x5B5A,"A7B7"],
- [0x5B5B,"A7B8"],
- [0x5B5C,"A7B6"],
- [0x5B5D,"A7B5"],
- [0x5B5F,"A973"],
- [0x5B62,"CC55"],
- [0x5B63,"A975"],
- [0x5B64,"A974"],
- [0x5B65,"CC56"],
- [0x5B66,"8961"],
- [0x5B68,"8BB4"],
- [0x5B69,"ABC4"],
- [0x5B6B,"AE5D"],
- [0x5B6C,"D165"],
- [0x5B6D,"9DC0"],
- [0x5B6E,"D4F0"],
- [0x5B70,"B145"],
- [0x5B71,"B447"],
- [0x5B72,"D4EF"],
- [0x5B73,"B446"],
- [0x5B74,"8E48"],
- [0x5B75,"B9E5"],
- [0x5B76,"FBC5"],
- [0x5B77,"E17D"],
- [0x5B78,"BEC7"],
- [0x5B7A,"C0A9"],
- [0x5B7B,"ECD7"],
- [0x5B7C,"FBC7"],
- [0x5B7D,"C45E"],
- [0x5B7F,"C570"],
- [0x5B80,"C6CB"],
- [0x5B81,"C972"],
- [0x5B82,"FA79"],
- [0x5B83,"A5A6"],
- [0x5B84,"C973"],
- [0x5B85,"A676"],
- [0x5B87,"A674"],
- [0x5B88,"A675"],
- [0x5B89,"A677"],
- [0x5B8B,"A7BA"],
- [0x5B8C,"A7B9"],
- [0x5B8E,"CABC"],
- [0x5B8F,"A7BB"],
- [0x5B90,"9E67"],
- [0x5B92,"CABD"],
- [0x5B93,"CC57"],
- [0x5B95,"CC58"],
- [0x5B96,"8CD9"],
- [0x5B97,"A976"],
- [0x5B98,"A978"],
- [0x5B99,"A97A"],
- [0x5B9A,"A977"],
- [0x5B9B,"A97B"],
- [0x5B9C,"A979"],
- [0x5B9D,"FBD2"],
- [0x5B9E,"8962"],
- [0x5B9F,"8963"],
- [0x5BA2,"ABC8"],
- [0x5BA3,"ABC5"],
- [0x5BA4,"ABC7"],
- [0x5BA5,"ABC9"],
- [0x5BA6,"ABC6"],
- [0x5BA7,"D166"],
- [0x5BA8,"CE77"],
- [0x5BAA,"FC7D"],
- [0x5BAC,"D168"],
- [0x5BAD,"D167"],
- [0x5BAE,"AE63"],
- [0x5BB0,"AE5F"],
- [0x5BB3,"AE60"],
- [0x5BB4,"AE62"],
- [0x5BB5,"AE64"],
- [0x5BB6,"AE61"],
- [0x5BB7,"8773"],
- [0x5BB8,"AE66"],
- [0x5BB9,"AE65"],
- [0x5BBF,"B14A"],
- [0x5BC0,"D4F2"],
- [0x5BC1,"D4F1"],
- [0x5BC2,"B149"],
- [0x5BC3,"9F6B"],
- [0x5BC4,"B148"],
- [0x5BC5,"B147"],
- [0x5BC6,"B14B"],
- [0x5BC7,"B146"],
- [0x5BCA,"D8D5"],
- [0x5BCB,"D8D2"],
- [0x5BCC,"B449"],
- [0x5BCD,"D8D1"],
- [0x5BCE,"D8D6"],
- [0x5BD0,"B44B"],
- [0x5BD1,"D8D4"],
- [0x5BD2,"B448"],
- [0x5BD3,"B44A"],
- [0x5BD4,"D8D3"],
- [0x5BD5,"FBCC"],
- [0x5BD6,"DD48"],
- [0x5BD7,"FEAE"],
- [0x5BD8,"DD49"],
- [0x5BD9,"DD4A"],
- [0x5BDB,"876D"],
- [0x5BDE,"B9E6"],
- [0x5BDF,"B9EE"],
- [0x5BE0,"E17E"],
- [0x5BE1,"B9E8"],
- [0x5BE2,"B9EC"],
- [0x5BE3,"E1A1"],
- [0x5BE4,"B9ED"],
- [0x5BE5,"B9E9"],
- [0x5BE6,"B9EA"],
- [0x5BE7,"B9E7"],
- [0x5BE8,"B9EB"],
- [0x5BE9,"BC66"],
- [0x5BEA,"D8D0"],
- [0x5BEB,"BC67"],
- [0x5BEC,"BC65"],
- [0x5BEE,"BC64"],
- [0x5BEF,"E95D"],
- [0x5BF0,"BEC8"],
- [0x5BF1,"ECD8"],
- [0x5BF2,"ECD9"],
- [0x5BF3,"FBD1"],
- [0x5BF5,"C364"],
- [0x5BF6,"C45F"],
- [0x5BF8,"A46F"],
- [0x5BFA,"A678"],
- [0x5BFF,"FB75"],
- [0x5C01,"ABCA"],
- [0x5C03,"D169"],
- [0x5C04,"AE67"],
- [0x5C05,"FBD4"],
- [0x5C07,"B14E"],
- [0x5C08,"B14D"],
- [0x5C09,"B14C"],
- [0x5C0A,"B44C"],
- [0x5C0B,"B44D"],
- [0x5C0C,"D8D7"],
- [0x5C0D,"B9EF"],
- [0x5C0E,"BEC9"],
- [0x5C0F,"A470"],
- [0x5C10,"C95C"],
- [0x5C11,"A4D6"],
- [0x5C12,"C974"],
- [0x5C13,"FBD6"],
- [0x5C14,"FBD8"],
- [0x5C15,"C9D4"],
- [0x5C16,"A679"],
- [0x5C1A,"A97C"],
- [0x5C1C,"8B5D"],
- [0x5C1E,"934C"],
- [0x5C1F,"DD4B"],
- [0x5C20,"9AE2"],
- [0x5C22,"A471"],
- [0x5C23,"8BC9"],
- [0x5C24,"A4D7"],
- [0x5C25,"C9D5"],
- [0x5C28,"CABE"],
- [0x5C2A,"CABF"],
- [0x5C2C,"A7BC"],
- [0x5C30,"D8D8"],
- [0x5C31,"B44E"],
- [0x5C33,"DD4C"],
- [0x5C37,"C0AA"],
- [0x5C38,"A472"],
- [0x5C39,"A4A8"],
- [0x5C3A,"A4D8"],
- [0x5C3B,"C975"],
- [0x5C3C,"A5A7"],
- [0x5C3E,"A7C0"],
- [0x5C3F,"A7BF"],
- [0x5C40,"A7BD"],
- [0x5C41,"A7BE"],
- [0x5C44,"CC59"],
- [0x5C45,"A97E"],
- [0x5C46,"A9A1"],
- [0x5C47,"CC5A"],
- [0x5C48,"A97D"],
- [0x5C49,"FBDB"],
- [0x5C4A,"9FC9"],
- [0x5C4B,"ABCE"],
- [0x5C4C,"CE78"],
- [0x5C4D,"ABCD"],
- [0x5C4E,"ABCB"],
- [0x5C4F,"ABCC"],
- [0x5C50,"AE6A"],
- [0x5C51,"AE68"],
- [0x5C53,"9F44"],
- [0x5C54,"D16B"],
- [0x5C55,"AE69"],
- [0x5C56,"D16A"],
- [0x5C58,"AE5E"],
- [0x5C59,"D4F3"],
- [0x5C5C,"B150"],
- [0x5C5D,"B151"],
- [0x5C5E,"98ED"],
- [0x5C60,"B14F"],
- [0x5C62,"B9F0"],
- [0x5C63,"E1A2"],
- [0x5C64,"BC68"],
- [0x5C65,"BC69"],
- [0x5C67,"E561"],
- [0x5C68,"C0AB"],
- [0x5C69,"EFC2"],
- [0x5C6A,"EFC3"],
- [0x5C6C,"C4DD"],
- [0x5C6D,"F8A8"],
- [0x5C6E,"C94B"],
- [0x5C6F,"A4D9"],
- [0x5C71,"A473"],
- [0x5C73,"C977"],
- [0x5C74,"C976"],
- [0x5C78,"8CE9"],
- [0x5C79,"A67A"],
- [0x5C7A,"C9D7"],
- [0x5C7B,"C9D8"],
- [0x5C7C,"C9D6"],
- [0x5C7E,"C9D9"],
- [0x5C85,"FBDD"],
- [0x5C86,"CAC7"],
- [0x5C88,"CAC2"],
- [0x5C89,"CAC4"],
- [0x5C8A,"CAC6"],
- [0x5C8B,"CAC3"],
- [0x5C8C,"A7C4"],
- [0x5C8D,"CAC0"],
- [0x5C8F,"CAC1"],
- [0x5C90,"A7C1"],
- [0x5C91,"A7C2"],
- [0x5C92,"CAC5"],
- [0x5C93,"CAC8"],
- [0x5C94,"A7C3"],
- [0x5C95,"CAC9"],
- [0x5C99,"8DF2"],
- [0x5C9A,"8964"],
- [0x5C9C,"FDF2"],
- [0x5C9D,"CC68"],
- [0x5C9E,"934D"],
- [0x5C9F,"CC62"],
- [0x5CA0,"CC5D"],
- [0x5CA1,"A9A3"],
- [0x5CA2,"CC65"],
- [0x5CA3,"CC63"],
- [0x5CA4,"CC5C"],
- [0x5CA5,"CC69"],
- [0x5CA6,"CC6C"],
- [0x5CA7,"CC67"],
- [0x5CA8,"CC60"],
- [0x5CA9,"A9A5"],
- [0x5CAA,"CC66"],
- [0x5CAB,"A9A6"],
- [0x5CAC,"CC61"],
- [0x5CAD,"CC64"],
- [0x5CAE,"CC5B"],
- [0x5CAF,"CC5F"],
- [0x5CB0,"CC6B"],
- [0x5CB1,"A9A7"],
- [0x5CB3,"A9A8"],
- [0x5CB5,"CC5E"],
- [0x5CB6,"CC6A"],
- [0x5CB7,"A9A2"],
- [0x5CB8,"A9A4"],
- [0x5CBA,"FBE7"],
- [0x5CC1,"A0F2"],
- [0x5CC2,"9868"],
- [0x5CC6,"CEAB"],
- [0x5CC7,"CEA4"],
- [0x5CC8,"CEAA"],
- [0x5CC9,"CEA3"],
- [0x5CCA,"CEA5"],
- [0x5CCB,"CE7D"],
- [0x5CCC,"CE7B"],
- [0x5CCE,"CEAC"],
- [0x5CCF,"CEA9"],
- [0x5CD0,"CE79"],
- [0x5CD1,"9F58"],
- [0x5CD2,"ABD0"],
- [0x5CD3,"CEA7"],
- [0x5CD4,"CEA8"],
- [0x5CD5,"8CE6"],
- [0x5CD6,"CEA6"],
- [0x5CD7,"CE7C"],
- [0x5CD8,"CE7A"],
- [0x5CD9,"ABCF"],
- [0x5CDA,"CEA2"],
- [0x5CDB,"CE7E"],
- [0x5CDE,"CEA1"],
- [0x5CDF,"CEAD"],
- [0x5CE5,"8D73"],
- [0x5CE8,"AE6F"],
- [0x5CE9,"FBDE"],
- [0x5CEA,"AE6E"],
- [0x5CEC,"D16C"],
- [0x5CED,"AE6B"],
- [0x5CEE,"D16E"],
- [0x5CEF,"FBDF"],
- [0x5CF0,"AE70"],
- [0x5CF1,"D16F"],
- [0x5CF4,"AE73"],
- [0x5CF5,"8C48"],
- [0x5CF6,"AE71"],
- [0x5CF7,"D170"],
- [0x5CF8,"CEAE"],
- [0x5CF9,"D172"],
- [0x5CFB,"AE6D"],
- [0x5CFC,"8774"],
- [0x5CFD,"AE6C"],
- [0x5CFF,"D16D"],
- [0x5D00,"D171"],
- [0x5D01,"AE72"],
- [0x5D06,"B153"],
- [0x5D07,"B152"],
- [0x5D0B,"D4F5"],
- [0x5D0C,"D4F9"],
- [0x5D0D,"D4FB"],
- [0x5D0E,"B154"],
- [0x5D0F,"D4FE"],
- [0x5D10,"FBE3"],
- [0x5D11,"B158"],
- [0x5D12,"D541"],
- [0x5D14,"B15A"],
- [0x5D15,"8DA8"],
- [0x5D16,"B156"],
- [0x5D17,"B15E"],
- [0x5D18,"FBE4"],
- [0x5D19,"B15B"],
- [0x5D1A,"D4F7"],
- [0x5D1B,"B155"],
- [0x5D1D,"D4F6"],
- [0x5D1E,"D4F4"],
- [0x5D1F,"D543"],
- [0x5D20,"D4F8"],
- [0x5D22,"B157"],
- [0x5D23,"D542"],
- [0x5D24,"B15C"],
- [0x5D25,"D4FD"],
- [0x5D26,"D4FC"],
- [0x5D27,"B15D"],
- [0x5D28,"D4FA"],
- [0x5D29,"B159"],
- [0x5D2C,"9C75"],
- [0x5D2E,"D544"],
- [0x5D2F,"9878"],
- [0x5D30,"D540"],
- [0x5D31,"D8E7"],
- [0x5D32,"D8EE"],
- [0x5D33,"D8E3"],
- [0x5D34,"B451"],
- [0x5D35,"D8DF"],
- [0x5D36,"D8EF"],
- [0x5D37,"D8D9"],
- [0x5D38,"D8EC"],
- [0x5D39,"D8EA"],
- [0x5D3A,"D8E4"],
- [0x5D3C,"D8ED"],
- [0x5D3D,"D8E6"],
- [0x5D3E,"8D60"],
- [0x5D3F,"D8DE"],
- [0x5D40,"D8F0"],
- [0x5D41,"D8DC"],
- [0x5D42,"D8E9"],
- [0x5D43,"D8DA"],
- [0x5D45,"D8F1"],
- [0x5D46,"FBE5"],
- [0x5D47,"B452"],
- [0x5D48,"8D61"],
- [0x5D49,"D8EB"],
- [0x5D4A,"DD4F"],
- [0x5D4B,"D8DD"],
- [0x5D4C,"B44F"],
- [0x5D4E,"D8E1"],
- [0x5D50,"B450"],
- [0x5D51,"D8E0"],
- [0x5D52,"D8E5"],
- [0x5D55,"D8E2"],
- [0x5D56,"8D62"],
- [0x5D57,"A0A1"],
- [0x5D59,"D8E8"],
- [0x5D5B,"9C40"],
- [0x5D5E,"DD53"],
- [0x5D62,"DD56"],
- [0x5D63,"DD4E"],
- [0x5D65,"DD50"],
- [0x5D67,"DD55"],
- [0x5D68,"DD54"],
- [0x5D69,"B743"],
- [0x5D6B,"D8DB"],
- [0x5D6C,"DD52"],
- [0x5D6F,"B744"],
- [0x5D70,"98AD"],
- [0x5D71,"DD4D"],
- [0x5D72,"DD51"],
- [0x5D74,"9EEA"],
- [0x5D77,"E1A9"],
- [0x5D78,"8CEC"],
- [0x5D79,"E1B0"],
- [0x5D7A,"E1A7"],
- [0x5D7B,"8CD4"],
- [0x5D7C,"E1AE"],
- [0x5D7D,"E1A5"],
- [0x5D7E,"E1AD"],
- [0x5D7F,"E1B1"],
- [0x5D80,"E1A4"],
- [0x5D81,"E1A8"],
- [0x5D82,"E1A3"],
- [0x5D84,"B9F1"],
- [0x5D85,"9CEB"],
- [0x5D86,"E1A6"],
- [0x5D87,"B9F2"],
- [0x5D88,"E1AC"],
- [0x5D89,"E1AB"],
- [0x5D8A,"E1AA"],
- [0x5D8B,"FBE0"],
- [0x5D8D,"E1AF"],
- [0x5D8E,"9F51"],
- [0x5D92,"E565"],
- [0x5D93,"E567"],
- [0x5D94,"BC6B"],
- [0x5D95,"E568"],
- [0x5D97,"E563"],
- [0x5D99,"E562"],
- [0x5D9A,"E56C"],
- [0x5D9C,"E56A"],
- [0x5D9D,"BC6A"],
- [0x5D9E,"E56D"],
- [0x5D9F,"E564"],
- [0x5DA0,"E569"],
- [0x5DA1,"E56B"],
- [0x5DA2,"E566"],
- [0x5DA4,"8D65"],
- [0x5DA7,"E961"],
- [0x5DA8,"E966"],
- [0x5DA9,"E960"],
- [0x5DAA,"E965"],
- [0x5DAB,"9CF1"],
- [0x5DAC,"E95E"],
- [0x5DAD,"E968"],
- [0x5DAE,"E964"],
- [0x5DAF,"E969"],
- [0x5DB0,"E963"],
- [0x5DB1,"E95F"],
- [0x5DB2,"E967"],
- [0x5DB4,"E96A"],
- [0x5DB5,"E962"],
- [0x5DB6,"FC58"],
- [0x5DB7,"ECDA"],
- [0x5DB8,"C0AF"],
- [0x5DB9,"8D66"],
- [0x5DBA,"C0AD"],
- [0x5DBC,"C0AC"],
- [0x5DBD,"C0AE"],
- [0x5DC0,"EFC4"],
- [0x5DC1,"9654"],
- [0x5DC2,"F172"],
- [0x5DC3,"F1FD"],
- [0x5DC6,"F444"],
- [0x5DC7,"F445"],
- [0x5DC9,"C460"],
- [0x5DCB,"F5C9"],
- [0x5DCD,"C4DE"],
- [0x5DCF,"F5CA"],
- [0x5DD1,"F6DE"],
- [0x5DD2,"C572"],
- [0x5DD4,"C571"],
- [0x5DD5,"F6DD"],
- [0x5DD6,"C5C9"],
- [0x5DD7,"FBE8"],
- [0x5DD8,"F7D6"],
- [0x5DDB,"C6CC"],
- [0x5DDD,"A474"],
- [0x5DDE,"A67B"],
- [0x5DDF,"C9DA"],
- [0x5DE0,"CACA"],
- [0x5DE1,"A8B5"],
- [0x5DE2,"B15F"],
- [0x5DE5,"A475"],
- [0x5DE6,"A5AA"],
- [0x5DE7,"A5A9"],
- [0x5DE8,"A5A8"],
- [0x5DEB,"A7C5"],
- [0x5DEE,"AE74"],
- [0x5DF0,"DD57"],
- [0x5DF1,"A476"],
- [0x5DF2,"A477"],
- [0x5DF3,"A478"],
- [0x5DF4,"A4DA"],
- [0x5DF5,"9FCE"],
- [0x5DF7,"ABD1"],
- [0x5DF9,"CEAF"],
- [0x5DFD,"B453"],
- [0x5DFE,"A479"],
- [0x5DFF,"C95D"],
- [0x5E02,"A5AB"],
- [0x5E03,"A5AC"],
- [0x5E04,"C978"],
- [0x5E06,"A67C"],
- [0x5E09,"FBFC"],
- [0x5E0A,"CACB"],
- [0x5E0B,"9AE4"],
- [0x5E0C,"A7C6"],
- [0x5E0E,"CACC"],
- [0x5E11,"A9AE"],
- [0x5E12,"9F75"],
- [0x5E14,"CC6E"],
- [0x5E15,"A9AC"],
- [0x5E16,"A9AB"],
- [0x5E17,"CC6D"],
- [0x5E18,"A9A9"],
- [0x5E19,"CC6F"],
- [0x5E1A,"A9AA"],
- [0x5E1B,"A9AD"],
- [0x5E1D,"ABD2"],
- [0x5E1F,"ABD4"],
- [0x5E20,"CEB3"],
- [0x5E21,"CEB0"],
- [0x5E22,"CEB1"],
- [0x5E23,"CEB2"],
- [0x5E24,"CEB4"],
- [0x5E25,"ABD3"],
- [0x5E28,"D174"],
- [0x5E29,"D173"],
- [0x5E2B,"AE76"],
- [0x5E2D,"AE75"],
- [0x5E2E,"FBF1"],
- [0x5E33,"B162"],
- [0x5E34,"D546"],
- [0x5E36,"B161"],
- [0x5E37,"B163"],
- [0x5E38,"B160"],
- [0x5E3D,"B455"],
- [0x5E3E,"D545"],
- [0x5E40,"B456"],
- [0x5E41,"D8F3"],
- [0x5E42,"8D69"],
- [0x5E43,"B457"],
- [0x5E44,"D8F2"],
- [0x5E45,"B454"],
- [0x5E48,"934F"],
- [0x5E4A,"DD5A"],
- [0x5E4B,"DD5C"],
- [0x5E4C,"B745"],
- [0x5E4D,"DD5B"],
- [0x5E4E,"DD59"],
- [0x5E4F,"DD58"],
- [0x5E53,"E1B4"],
- [0x5E54,"B9F7"],
- [0x5E55,"B9F5"],
- [0x5E57,"B9F6"],
- [0x5E58,"E1B2"],
- [0x5E59,"E1B3"],
- [0x5E5B,"B9F3"],
- [0x5E5C,"E571"],
- [0x5E5D,"E56F"],
- [0x5E5E,"934E"],
- [0x5E5F,"BC6D"],
- [0x5E60,"E570"],
- [0x5E61,"BC6E"],
- [0x5E62,"BC6C"],
- [0x5E63,"B9F4"],
- [0x5E66,"E96D"],
- [0x5E67,"E96B"],
- [0x5E68,"E96C"],
- [0x5E69,"E56E"],
- [0x5E6A,"ECDC"],
- [0x5E6B,"C0B0"],
- [0x5E6C,"ECDB"],
- [0x5E6D,"EFC5"],
- [0x5E6E,"EFC6"],
- [0x5E6F,"E96E"],
- [0x5E70,"F1FE"],
- [0x5E72,"A47A"],
- [0x5E73,"A5AD"],
- [0x5E74,"A67E"],
- [0x5E75,"C9DB"],
- [0x5E76,"A67D"],
- [0x5E78,"A9AF"],
- [0x5E79,"B746"],
- [0x5E7A,"FBF4"],
- [0x5E7B,"A4DB"],
- [0x5E7C,"A5AE"],
- [0x5E7D,"ABD5"],
- [0x5E7E,"B458"],
- [0x5E7F,"C6CE"],
- [0x5E80,"C979"],
- [0x5E82,"C97A"],
- [0x5E83,"FBC3"],
- [0x5E84,"C9DC"],
- [0x5E86,"8965"],
- [0x5E87,"A7C8"],
- [0x5E88,"CAD0"],
- [0x5E89,"CACE"],
- [0x5E8A,"A7C9"],
- [0x5E8B,"CACD"],
- [0x5E8C,"CACF"],
- [0x5E8D,"CAD1"],
- [0x5E8F,"A7C7"],
- [0x5E92,"8C7A"],
- [0x5E95,"A9B3"],
- [0x5E96,"A9B4"],
- [0x5E97,"A9B1"],
- [0x5E99,"8C7B"],
- [0x5E9A,"A9B0"],
- [0x5E9B,"CEB8"],
- [0x5E9C,"A9B2"],
- [0x5EA0,"ABD6"],
- [0x5EA2,"CEB7"],
- [0x5EA3,"CEB9"],
- [0x5EA4,"CEB6"],
- [0x5EA5,"CEBA"],
- [0x5EA6,"ABD7"],
- [0x5EA7,"AE79"],
- [0x5EA8,"D175"],
- [0x5EAA,"D177"],
- [0x5EAB,"AE77"],
- [0x5EAC,"D178"],
- [0x5EAD,"AE78"],
- [0x5EAE,"D176"],
- [0x5EB0,"CEB5"],
- [0x5EB1,"D547"],
- [0x5EB2,"D54A"],
- [0x5EB3,"D54B"],
- [0x5EB4,"D548"],
- [0x5EB5,"B167"],
- [0x5EB6,"B166"],
- [0x5EB7,"B164"],
- [0x5EB8,"B165"],
- [0x5EB9,"D549"],
- [0x5EBD,"8D6A"],
- [0x5EBE,"B168"],
- [0x5EC1,"B45A"],
- [0x5EC2,"B45B"],
- [0x5EC4,"B45C"],
- [0x5EC5,"DD5D"],
- [0x5EC6,"DD5F"],
- [0x5EC7,"DD61"],
- [0x5EC8,"B748"],
- [0x5EC9,"B747"],
- [0x5ECA,"B459"],
- [0x5ECB,"DD60"],
- [0x5ECC,"DD5E"],
- [0x5ECD,"9353"],
- [0x5ECE,"E1B8"],
- [0x5ED0,"9DFB"],
- [0x5ED1,"E1B6"],
- [0x5ED2,"E1BC"],
- [0x5ED3,"B9F8"],
- [0x5ED4,"E1BD"],
- [0x5ED5,"E1BA"],
- [0x5ED6,"B9F9"],
- [0x5ED7,"E1B7"],
- [0x5ED8,"E1B5"],
- [0x5ED9,"E1BB"],
- [0x5EDA,"BC70"],
- [0x5EDB,"E573"],
- [0x5EDC,"E1B9"],
- [0x5EDD,"BC72"],
- [0x5EDE,"E574"],
- [0x5EDF,"BC71"],
- [0x5EE0,"BC74"],
- [0x5EE1,"E575"],
- [0x5EE2,"BC6F"],
- [0x5EE3,"BC73"],
- [0x5EE5,"E973"],
- [0x5EE6,"E971"],
- [0x5EE7,"E970"],
- [0x5EE8,"E972"],
- [0x5EE9,"E96F"],
- [0x5EEC,"C366"],
- [0x5EEE,"F446"],
- [0x5EEF,"F447"],
- [0x5EF1,"F5CB"],
- [0x5EF2,"F6DF"],
- [0x5EF3,"C655"],
- [0x5EF4,"FBFD"],
- [0x5EF6,"A9B5"],
- [0x5EF7,"A7CA"],
- [0x5EF8,"9059"],
- [0x5EF9,"FC40"],
- [0x5EFA,"ABD8"],
- [0x5EFB,"FC41"],
- [0x5EFC,"FC43"],
- [0x5EFE,"A47B"],
- [0x5EFF,"A4DC"],
- [0x5F01,"A5AF"],
- [0x5F02,"C9DD"],
- [0x5F04,"A7CB"],
- [0x5F05,"CAD2"],
- [0x5F07,"CEBB"],
- [0x5F08,"ABD9"],
- [0x5F0A,"B9FA"],
- [0x5F0B,"A47C"],
- [0x5F0C,"9361"],
- [0x5F0D,"FC46"],
- [0x5F0E,"9362"],
- [0x5F0F,"A6A1"],
- [0x5F12,"B749"],
- [0x5F13,"A47D"],
- [0x5F14,"A4DD"],
- [0x5F15,"A4DE"],
- [0x5F17,"A5B1"],
- [0x5F18,"A5B0"],
- [0x5F1A,"C9DE"],
- [0x5F1B,"A6A2"],
- [0x5F1D,"CAD3"],
- [0x5F1F,"A7CC"],
- [0x5F22,"CC71"],
- [0x5F23,"CC72"],
- [0x5F24,"CC73"],
- [0x5F25,"8D6B"],
- [0x5F26,"A9B6"],
- [0x5F27,"A9B7"],
- [0x5F28,"CC70"],
- [0x5F29,"A9B8"],
- [0x5F2D,"ABDA"],
- [0x5F2E,"CEBC"],
- [0x5F30,"D17A"],
- [0x5F31,"AE7A"],
- [0x5F33,"D179"],
- [0x5F35,"B169"],
- [0x5F36,"D54C"],
- [0x5F37,"B16A"],
- [0x5F38,"D54D"],
- [0x5F3A,"FC4C"],
- [0x5F3B,"8CFE"],
- [0x5F3C,"B45D"],
- [0x5F40,"DD62"],
- [0x5F43,"E1BF"],
- [0x5F44,"E1BE"],
- [0x5F46,"B9FB"],
- [0x5F48,"BC75"],
- [0x5F49,"E576"],
- [0x5F4A,"BECA"],
- [0x5F4B,"E974"],
- [0x5F4C,"C0B1"],
- [0x5F4D,"95B8"],
- [0x5F4E,"C573"],
- [0x5F4F,"F7D8"],
- [0x5F50,"C6D0"],
- [0x5F51,"8BCA"],
- [0x5F54,"CC74"],
- [0x5F56,"CEBD"],
- [0x5F57,"B16B"],
- [0x5F58,"D8F4"],
- [0x5F59,"B74A"],
- [0x5F5C,"987A"],
- [0x5F5D,"C255"],
- [0x5F61,"C6D1"],
- [0x5F62,"A7CE"],
- [0x5F63,"FC51"],
- [0x5F64,"A7CD"],
- [0x5F65,"ABDB"],
- [0x5F67,"D17B"],
- [0x5F69,"B16D"],
- [0x5F6A,"B343"],
- [0x5F6B,"B16E"],
- [0x5F6C,"B16C"],
- [0x5F6D,"B45E"],
- [0x5F6F,"E1C0"],
- [0x5F70,"B9FC"],
- [0x5F71,"BC76"],
- [0x5F72,"FC54"],
- [0x5F73,"C94C"],
- [0x5F74,"C9DF"],
- [0x5F76,"CAD5"],
- [0x5F77,"A7CF"],
- [0x5F78,"CAD4"],
- [0x5F79,"A7D0"],
- [0x5F7B,"FAAF"],
- [0x5F7C,"A9BC"],
- [0x5F7D,"CC77"],
- [0x5F7E,"CC76"],
- [0x5F7F,"A9BB"],
- [0x5F80,"A9B9"],
- [0x5F81,"A9BA"],
- [0x5F82,"CC75"],
- [0x5F83,"8D6C"],
- [0x5F85,"ABDD"],
- [0x5F86,"CEBE"],
- [0x5F87,"ABE0"],
- [0x5F88,"ABDC"],
- [0x5F89,"ABE2"],
- [0x5F8A,"ABDE"],
- [0x5F8B,"ABDF"],
- [0x5F8C,"ABE1"],
- [0x5F90,"AE7D"],
- [0x5F91,"AE7C"],
- [0x5F92,"AE7B"],
- [0x5F96,"D54F"],
- [0x5F97,"B16F"],
- [0x5F98,"B172"],
- [0x5F99,"B170"],
- [0x5F9B,"D54E"],
- [0x5F9C,"B175"],
- [0x5F9E,"B171"],
- [0x5F9F,"D550"],
- [0x5FA0,"B174"],
- [0x5FA1,"B173"],
- [0x5FA4,"FA61"],
- [0x5FA5,"D8F6"],
- [0x5FA6,"D8F5"],
- [0x5FA7,"FC57"],
- [0x5FA8,"B461"],
- [0x5FA9,"B45F"],
- [0x5FAA,"B460"],
- [0x5FAB,"D8F7"],
- [0x5FAC,"B74B"],
- [0x5FAD,"DD64"],
- [0x5FAE,"B74C"],
- [0x5FAF,"DD63"],
- [0x5FB1,"9B70"],
- [0x5FB2,"E577"],
- [0x5FB5,"BC78"],
- [0x5FB6,"E1C1"],
- [0x5FB7,"BC77"],
- [0x5FB9,"B9FD"],
- [0x5FBA,"A051"],
- [0x5FBB,"ECDE"],
- [0x5FBC,"E975"],
- [0x5FBD,"C0B2"],
- [0x5FBE,"ECDD"],
- [0x5FBF,"F240"],
- [0x5FC0,"F448"],
- [0x5FC1,"F449"],
- [0x5FC2,"8C7C"],
- [0x5FC3,"A4DF"],
- [0x5FC4,"8BCB"],
- [0x5FC5,"A5B2"],
- [0x5FC9,"C97B"],
- [0x5FCC,"A7D2"],
- [0x5FCD,"A7D4"],
- [0x5FCF,"C9E2"],
- [0x5FD0,"CAD8"],
- [0x5FD1,"CAD7"],
- [0x5FD2,"CAD6"],
- [0x5FD4,"C9E1"],
- [0x5FD5,"C9E0"],
- [0x5FD6,"A6A4"],
- [0x5FD7,"A7D3"],
- [0x5FD8,"A7D1"],
- [0x5FD9,"A6A3"],
- [0x5FDB,"936E"],
- [0x5FDD,"A9BD"],
- [0x5FDE,"CC78"],
- [0x5FDF,"FCD5"],
- [0x5FE0,"A9BE"],
- [0x5FE1,"CADD"],
- [0x5FE3,"CADF"],
- [0x5FE4,"CADE"],
- [0x5FE5,"CC79"],
- [0x5FE8,"CADA"],
- [0x5FEA,"A7D8"],
- [0x5FEB,"A7D6"],
- [0x5FED,"CAD9"],
- [0x5FEE,"CADB"],
- [0x5FEF,"CAE1"],
- [0x5FF1,"A7D5"],
- [0x5FF3,"CADC"],
- [0x5FF4,"CAE5"],
- [0x5FF5,"A9C0"],
- [0x5FF7,"CAE2"],
- [0x5FF8,"A7D7"],
- [0x5FFA,"CAE0"],
- [0x5FFB,"CAE3"],
- [0x5FFD,"A9BF"],
- [0x5FFF,"A9C1"],
- [0x6000,"CAE4"],
- [0x6009,"CCAF"],
- [0x600A,"CCA2"],
- [0x600B,"CC7E"],
- [0x600C,"CCAE"],
- [0x600D,"CCA9"],
- [0x600E,"ABE7"],
- [0x600F,"A9C2"],
- [0x6010,"CCAA"],
- [0x6011,"CCAD"],
- [0x6012,"ABE3"],
- [0x6013,"CCAC"],
- [0x6014,"A9C3"],
- [0x6015,"A9C8"],
- [0x6016,"A9C6"],
- [0x6017,"CCA3"],
- [0x6019,"CC7C"],
- [0x601A,"CCA5"],
- [0x601B,"A9CD"],
- [0x601C,"CCB0"],
- [0x601D,"ABE4"],
- [0x601E,"CCA6"],
- [0x6020,"ABE5"],
- [0x6021,"A9C9"],
- [0x6022,"CCA8"],
- [0x6023,"FCA9"],
- [0x6024,"CECD"],
- [0x6025,"ABE6"],
- [0x6026,"CC7B"],
- [0x6027,"A9CA"],
- [0x6028,"ABE8"],
- [0x6029,"A9CB"],
- [0x602A,"A9C7"],
- [0x602B,"A9CC"],
- [0x602C,"CCA7"],
- [0x602D,"CC7A"],
- [0x602E,"CCAB"],
- [0x602F,"A9C4"],
- [0x6031,"FC61"],
- [0x6032,"CC7D"],
- [0x6033,"CCA4"],
- [0x6034,"CCA1"],
- [0x6035,"A9C5"],
- [0x6037,"CEBF"],
- [0x6039,"CEC0"],
- [0x603B,"8966"],
- [0x6040,"CECA"],
- [0x6041,"D1A1"],
- [0x6042,"CECB"],
- [0x6043,"ABEE"],
- [0x6044,"CECE"],
- [0x6045,"CEC4"],
- [0x6046,"ABED"],
- [0x6047,"CEC6"],
- [0x6049,"CEC7"],
- [0x604A,"FACB"],
- [0x604C,"CEC9"],
- [0x604D,"ABE9"],
- [0x6050,"AEA3"],
- [0x6052,"F9DA"],
- [0x6053,"CEC5"],
- [0x6054,"CEC1"],
- [0x6055,"AEA4"],
- [0x6058,"CECF"],
- [0x6059,"AE7E"],
- [0x605A,"D17D"],
- [0x605B,"CEC8"],
- [0x605D,"D17C"],
- [0x605E,"CEC3"],
- [0x605F,"CECC"],
- [0x6062,"ABEC"],
- [0x6063,"AEA1"],
- [0x6064,"ABF2"],
- [0x6065,"AEA2"],
- [0x6066,"CED0"],
- [0x6067,"D17E"],
- [0x6068,"ABEB"],
- [0x6069,"AEA6"],
- [0x606A,"ABF1"],
- [0x606B,"ABF0"],
- [0x606C,"ABEF"],
- [0x606D,"AEA5"],
- [0x606E,"CED1"],
- [0x606F,"AEA7"],
- [0x6070,"ABEA"],
- [0x6072,"CEC2"],
- [0x6075,"937A"],
- [0x6077,"A0E0"],
- [0x607E,"936B"],
- [0x607F,"B176"],
- [0x6080,"D1A4"],
- [0x6081,"D1A6"],
- [0x6083,"D1A8"],
- [0x6084,"AEA8"],
- [0x6085,"AEAE"],
- [0x6086,"D553"],
- [0x6087,"D1AC"],
- [0x6088,"D1A3"],
- [0x6089,"B178"],
- [0x608A,"D551"],
- [0x608C,"AEAD"],
- [0x608D,"AEAB"],
- [0x608E,"D1AE"],
- [0x6090,"D552"],
- [0x6092,"D1A5"],
- [0x6094,"AEAC"],
- [0x6095,"D1A9"],
- [0x6096,"AEAF"],
- [0x6097,"D1AB"],
- [0x609A,"AEAA"],
- [0x609B,"D1AA"],
- [0x609C,"D1AD"],
- [0x609D,"D1A7"],
- [0x609E,"FC6B"],
- [0x609F,"AEA9"],
- [0x60A0,"B179"],
- [0x60A2,"D1A2"],
- [0x60A3,"B177"],
- [0x60A4,"A0DC"],
- [0x60A7,"9468"],
- [0x60A8,"B17A"],
- [0x60B0,"D555"],
- [0x60B1,"D55E"],
- [0x60B2,"B464"],
- [0x60B3,"FC6D"],
- [0x60B4,"B17C"],
- [0x60B5,"B1A3"],
- [0x60B6,"B465"],
- [0x60B7,"D560"],
- [0x60B8,"B1AA"],
- [0x60B9,"D8F9"],
- [0x60BA,"D556"],
- [0x60BB,"B1A2"],
- [0x60BC,"B1A5"],
- [0x60BD,"B17E"],
- [0x60BE,"D554"],
- [0x60BF,"D562"],
- [0x60C0,"D565"],
- [0x60C1,"D949"],
- [0x60C3,"D563"],
- [0x60C4,"D8FD"],
- [0x60C5,"B1A1"],
- [0x60C6,"B1A8"],
- [0x60C7,"B1AC"],
- [0x60C8,"D55D"],
- [0x60C9,"D8F8"],
- [0x60CA,"D561"],
- [0x60CB,"B17B"],
- [0x60CC,"D8FA"],
- [0x60CD,"D564"],
- [0x60CE,"D8FC"],
- [0x60CF,"D559"],
- [0x60D1,"B462"],
- [0x60D3,"D557"],
- [0x60D4,"D558"],
- [0x60D5,"B1A7"],
- [0x60D7,"8D71"],
- [0x60D8,"B1A6"],
- [0x60D9,"D55B"],
- [0x60DA,"B1AB"],
- [0x60DB,"D55F"],
- [0x60DC,"B1A4"],
- [0x60DD,"D55C"],
- [0x60DE,"FD64"],
- [0x60DF,"B1A9"],
- [0x60E0,"B466"],
- [0x60E1,"B463"],
- [0x60E2,"D8FB"],
- [0x60E3,"99BA"],
- [0x60E4,"D55A"],
- [0x60E6,"B17D"],
- [0x60E7,"9AD0"],
- [0x60E8,"9A61"],
- [0x60E9,"A0E5"],
- [0x60F0,"B46B"],
- [0x60F1,"B46F"],
- [0x60F2,"D940"],
- [0x60F3,"B751"],
- [0x60F4,"B46D"],
- [0x60F5,"D944"],
- [0x60F6,"B471"],
- [0x60F7,"DD65"],
- [0x60F8,"D946"],
- [0x60F9,"B753"],
- [0x60FA,"B469"],
- [0x60FB,"B46C"],
- [0x60FC,"D947"],
- [0x60FD,"A05B"],
- [0x60FE,"D948"],
- [0x60FF,"D94E"],
- [0x6100,"B473"],
- [0x6101,"B754"],
- [0x6103,"D94A"],
- [0x6104,"D94F"],
- [0x6105,"D943"],
- [0x6106,"B75E"],
- [0x6107,"96AC"],
- [0x6108,"B755"],
- [0x6109,"B472"],
- [0x610A,"D941"],
- [0x610B,"D950"],
- [0x610C,"9740"],
- [0x610D,"B75D"],
- [0x610E,"B470"],
- [0x610F,"B74E"],
- [0x6110,"D94D"],
- [0x6112,"B474"],
- [0x6113,"D945"],
- [0x6114,"D8FE"],
- [0x6115,"B46A"],
- [0x6116,"D942"],
- [0x6118,"D94B"],
- [0x6119,"9EF1"],
- [0x611A,"B74D"],
- [0x611B,"B752"],
- [0x611C,"B467"],
- [0x611D,"D94C"],
- [0x611F,"B750"],
- [0x6122,"8C4D"],
- [0x6123,"B468"],
- [0x6127,"B75C"],
- [0x6128,"E1C3"],
- [0x6129,"DD70"],
- [0x612B,"DD68"],
- [0x612C,"E1C2"],
- [0x612E,"DD6C"],
- [0x612F,"DD6E"],
- [0x6130,"9F7E"],
- [0x6132,"DD6B"],
- [0x6134,"B75B"],
- [0x6136,"DD6A"],
- [0x6137,"B75F"],
- [0x613B,"E1D2"],
- [0x613D,"8D72"],
- [0x613E,"B75A"],
- [0x613F,"BA40"],
- [0x6140,"DD71"],
- [0x6141,"E1C4"],
- [0x6142,"FC76"],
- [0x6144,"B758"],
- [0x6145,"DD69"],
- [0x6146,"DD6D"],
- [0x6147,"B9FE"],
- [0x6148,"B74F"],
- [0x6149,"DD66"],
- [0x614A,"DD67"],
- [0x614B,"BA41"],
- [0x614C,"B757"],
- [0x614D,"B759"],
- [0x614E,"B756"],
- [0x614F,"DD6F"],
- [0x6150,"96A9"],
- [0x6152,"E1C8"],
- [0x6153,"E1C9"],
- [0x6154,"E1CE"],
- [0x6155,"BC7D"],
- [0x6156,"E1D5"],
- [0x6158,"BA47"],
- [0x6159,"A06E"],
- [0x615A,"BA46"],
- [0x615B,"E1D0"],
- [0x615C,"FCAA"],
- [0x615D,"BC7C"],
- [0x615E,"E1C5"],
- [0x615F,"BA45"],
- [0x6160,"FBCD"],
- [0x6161,"E1D4"],
- [0x6162,"BA43"],
- [0x6163,"BA44"],
- [0x6164,"FC74"],
- [0x6165,"E1D1"],
- [0x6166,"E5AA"],
- [0x6167,"BC7A"],
- [0x6168,"B46E"],
- [0x616A,"E1D3"],
- [0x616B,"BCA3"],
- [0x616C,"E1CB"],
- [0x616E,"BC7B"],
- [0x616F,"A074"],
- [0x6170,"BCA2"],
- [0x6171,"E1C6"],
- [0x6172,"E1CA"],
- [0x6173,"E1C7"],
- [0x6174,"E1CD"],
- [0x6175,"BA48"],
- [0x6176,"BC79"],
- [0x6177,"BA42"],
- [0x6179,"E57A"],
- [0x617A,"E1CF"],
- [0x617C,"BCA1"],
- [0x617D,"A071"],
- [0x617E,"BCA4"],
- [0x6180,"E1CC"],
- [0x6181,"FC79"],
- [0x6182,"BC7E"],
- [0x6183,"E579"],
- [0x6187,"FC7C"],
- [0x6189,"E57E"],
- [0x618A,"BECE"],
- [0x618B,"E578"],
- [0x618C,"E9A3"],
- [0x618D,"E5A9"],
- [0x618E,"BCA8"],
- [0x6190,"BCA6"],
- [0x6191,"BECC"],
- [0x6192,"E5A6"],
- [0x6193,"E5A2"],
- [0x6194,"BCAC"],
- [0x6195,"9C50"],
- [0x6196,"E978"],
- [0x6198,"9379"],
- [0x6199,"9378"],
- [0x619A,"BCAA"],
- [0x619B,"E5A1"],
- [0x619C,"A0DD"],
- [0x619D,"E976"],
- [0x619F,"E5A5"],
- [0x61A1,"E5A8"],
- [0x61A2,"E57D"],
- [0x61A4,"BCAB"],
- [0x61A7,"BCA5"],
- [0x61A8,"E977"],
- [0x61A9,"BECD"],
- [0x61AA,"E5A7"],
- [0x61AB,"BCA7"],
- [0x61AC,"BCA9"],
- [0x61AD,"E5A4"],
- [0x61AE,"BCAD"],
- [0x61AF,"E5A3"],
- [0x61B0,"E57C"],
- [0x61B1,"E57B"],
- [0x61B2,"BECB"],
- [0x61B3,"E5AB"],
- [0x61B4,"E97A"],
- [0x61B5,"ECE0"],
- [0x61B6,"BED0"],
- [0x61B7,"8D75"],
- [0x61B8,"E9A2"],
- [0x61B9,"8D76"],
- [0x61BA,"E97E"],
- [0x61BC,"ECE1"],
- [0x61BE,"BED1"],
- [0x61BF,"E9A1"],
- [0x61C0,"9374"],
- [0x61C1,"E97C"],
- [0x61C2,"C0B4"],
- [0x61C3,"ECDF"],
- [0x61C5,"E979"],
- [0x61C6,"E97B"],
- [0x61C7,"C0B5"],
- [0x61C8,"BED3"],
- [0x61C9,"C0B3"],
- [0x61CA,"BED2"],
- [0x61CB,"C0B7"],
- [0x61CC,"E97D"],
- [0x61CD,"BECF"],
- [0x61CF,"8D77"],
- [0x61D0,"FCA5"],
- [0x61D3,"FCA2"],
- [0x61D6,"EFCF"],
- [0x61D8,"EFC7"],
- [0x61DA,"90C3"],
- [0x61DE,"ECE7"],
- [0x61DF,"EFC8"],
- [0x61E0,"ECE3"],
- [0x61E2,"A079"],
- [0x61E3,"C256"],
- [0x61E4,"ECE5"],
- [0x61E5,"ECE4"],
- [0x61E6,"C0B6"],
- [0x61E7,"ECE2"],
- [0x61E8,"ECE6"],
- [0x61E9,"EFD0"],
- [0x61EA,"EFCC"],
- [0x61EB,"EFCE"],
- [0x61ED,"EFC9"],
- [0x61EE,"EFCA"],
- [0x61F0,"EFCD"],
- [0x61F1,"EFCB"],
- [0x61F2,"C367"],
- [0x61F5,"C36A"],
- [0x61F6,"C369"],
- [0x61F7,"C368"],
- [0x61F8,"C461"],
- [0x61F9,"F44A"],
- [0x61FA,"C462"],
- [0x61FB,"F241"],
- [0x61FC,"C4DF"],
- [0x61FD,"F5CC"],
- [0x61FE,"C4E0"],
- [0x61FF,"C574"],
- [0x6200,"C5CA"],
- [0x6201,"F7D9"],
- [0x6203,"F7DA"],
- [0x6204,"F7DB"],
- [0x6207,"F9BA"],
- [0x6208,"A4E0"],
- [0x6209,"C97C"],
- [0x620A,"A5B3"],
- [0x620C,"A6A6"],
- [0x620D,"A6A7"],
- [0x620E,"A6A5"],
- [0x6210,"A6A8"],
- [0x6211,"A7DA"],
- [0x6212,"A7D9"],
- [0x6214,"CCB1"],
- [0x6215,"A9CF"],
- [0x6216,"A9CE"],
- [0x6219,"D1AF"],
- [0x621A,"B1AD"],
- [0x621B,"B1AE"],
- [0x621F,"B475"],
- [0x6220,"DD72"],
- [0x6221,"B760"],
- [0x6222,"B761"],
- [0x6223,"DD74"],
- [0x6224,"DD76"],
- [0x6225,"DD75"],
- [0x6227,"E1D7"],
- [0x6229,"E1D6"],
- [0x622A,"BA49"],
- [0x622B,"E1D8"],
- [0x622C,"8D79"],
- [0x622D,"E5AC"],
- [0x622E,"BCAE"],
- [0x6230,"BED4"],
- [0x6232,"C0B8"],
- [0x6233,"C257"],
- [0x6234,"C0B9"],
- [0x6236,"A4E1"],
- [0x6237,"8BFC"],
- [0x6239,"A076"],
- [0x623A,"CAE6"],
- [0x623D,"CCB2"],
- [0x623E,"A9D1"],
- [0x623F,"A9D0"],
- [0x6240,"A9D2"],
- [0x6241,"ABF3"],
- [0x6242,"CED2"],
- [0x6243,"CED3"],
- [0x6246,"D1B0"],
- [0x6247,"AEB0"],
- [0x6248,"B1AF"],
- [0x6249,"B476"],
- [0x624A,"D951"],
- [0x624B,"A4E2"],
- [0x624C,"8BCD"],
- [0x624D,"A47E"],
- [0x624E,"A4E3"],
- [0x6250,"C97D"],
- [0x6251,"A5B7"],
- [0x6252,"A5B6"],
- [0x6253,"A5B4"],
- [0x6254,"A5B5"],
- [0x6258,"A6AB"],
- [0x6259,"C9E9"],
- [0x625A,"C9EB"],
- [0x625B,"A6AA"],
- [0x625C,"C9E3"],
- [0x625E,"C9E4"],
- [0x6260,"C9EA"],
- [0x6261,"C9E6"],
- [0x6262,"C9E8"],
- [0x6263,"A6A9"],
- [0x6264,"C9E5"],
- [0x6265,"C9EC"],
- [0x6266,"C9E7"],
- [0x6268,"9F5A"],
- [0x626D,"A7E1"],
- [0x626E,"A7EA"],
- [0x626F,"A7E8"],
- [0x6270,"CAF0"],
- [0x6271,"CAED"],
- [0x6272,"CAF5"],
- [0x6273,"A7E6"],
- [0x6274,"CAF6"],
- [0x6276,"A7DF"],
- [0x6277,"CAF3"],
- [0x6279,"A7E5"],
- [0x627A,"CAEF"],
- [0x627B,"CAEE"],
- [0x627C,"A7E3"],
- [0x627D,"CAF4"],
- [0x627E,"A7E4"],
- [0x627F,"A9D3"],
- [0x6280,"A7DE"],
- [0x6281,"CAF1"],
- [0x6282,"9FF4"],
- [0x6283,"CAE7"],
- [0x6284,"A7DB"],
- [0x6285,"9FBA"],
- [0x6286,"A7EE"],
- [0x6287,"CAEC"],
- [0x6288,"CAF2"],
- [0x6289,"A7E0"],
- [0x628A,"A7E2"],
- [0x628C,"CAE8"],
- [0x628E,"CAE9"],
- [0x628F,"CAEA"],
- [0x6290,"8D7A"],
- [0x6291,"A7ED"],
- [0x6292,"A7E7"],
- [0x6293,"A7EC"],
- [0x6294,"CAEB"],
- [0x6295,"A7EB"],
- [0x6296,"A7DD"],
- [0x6297,"A7DC"],
- [0x6298,"A7E9"],
- [0x629D,"9E45"],
- [0x62A4,"93B0"],
- [0x62A6,"A075"],
- [0x62A8,"A9E1"],
- [0x62A9,"CCBE"],
- [0x62AA,"CCB7"],
- [0x62AB,"A9DC"],
- [0x62AC,"A9EF"],
- [0x62AD,"CCB3"],
- [0x62AE,"CCBA"],
- [0x62AF,"CCBC"],
- [0x62B0,"CCBF"],
- [0x62B1,"A9EA"],
- [0x62B3,"CCBB"],
- [0x62B4,"CCB4"],
- [0x62B5,"A9E8"],
- [0x62B6,"CCB8"],
- [0x62B8,"CCC0"],
- [0x62B9,"A9D9"],
- [0x62BB,"CCBD"],
- [0x62BC,"A9E3"],
- [0x62BD,"A9E2"],
- [0x62BE,"CCB6"],
- [0x62BF,"A9D7"],
- [0x62C1,"87DD"],
- [0x62C2,"A9D8"],
- [0x62C3,"9B46"],
- [0x62C4,"A9D6"],
- [0x62C5,"FCAE"],
- [0x62C6,"A9EE"],
- [0x62C7,"A9E6"],
- [0x62C8,"A9E0"],
- [0x62C9,"A9D4"],
- [0x62CA,"CCB9"],
- [0x62CB,"A9DF"],
- [0x62CC,"A9D5"],
- [0x62CD,"A9E7"],
- [0x62CE,"A9F0"],
- [0x62CF,"CED4"],
- [0x62D0,"A9E4"],
- [0x62D1,"CCB5"],
- [0x62D2,"A9DA"],
- [0x62D3,"A9DD"],
- [0x62D4,"A9DE"],
- [0x62D5,"FCB0"],
- [0x62D6,"A9EC"],
- [0x62D7,"A9ED"],
- [0x62D8,"A9EB"],
- [0x62D9,"A9E5"],
- [0x62DA,"A9E9"],
- [0x62DB,"A9DB"],
- [0x62DC,"ABF4"],
- [0x62DF,"FA51"],
- [0x62E5,"8D7B"],
- [0x62EB,"CEDA"],
- [0x62EC,"AC41"],
- [0x62ED,"ABF8"],
- [0x62EE,"ABFA"],
- [0x62EF,"AC40"],
- [0x62F0,"CEE6"],
- [0x62F1,"ABFD"],
- [0x62F2,"D1B1"],
- [0x62F3,"AEB1"],
- [0x62F4,"AC43"],
- [0x62F5,"CED7"],
- [0x62F6,"CEDF"],
- [0x62F7,"ABFE"],
- [0x62F8,"CEDE"],
- [0x62F9,"CEDB"],
- [0x62FA,"CEE3"],
- [0x62FB,"CEE5"],
- [0x62FC,"ABF7"],
- [0x62FD,"ABFB"],
- [0x62FE,"AC42"],
- [0x62FF,"AEB3"],
- [0x6300,"CEE0"],
- [0x6301,"ABF9"],
- [0x6302,"AC45"],
- [0x6303,"CED9"],
- [0x6307,"ABFC"],
- [0x6308,"AEB2"],
- [0x6309,"ABF6"],
- [0x630B,"CED6"],
- [0x630C,"CEDD"],
- [0x630D,"CED5"],
- [0x630E,"CED8"],
- [0x630F,"CEDC"],
- [0x6310,"D1B2"],
- [0x6311,"AC44"],
- [0x6313,"CEE1"],
- [0x6314,"CEE2"],
- [0x6315,"CEE4"],
- [0x6316,"ABF5"],
- [0x6318,"8D7C"],
- [0x6328,"AEC1"],
- [0x6329,"D1BE"],
- [0x632A,"AEBF"],
- [0x632B,"AEC0"],
- [0x632C,"D1B4"],
- [0x632D,"D1C4"],
- [0x632E,"9ED6"],
- [0x632F,"AEB6"],
- [0x6331,"93AC"],
- [0x6332,"D566"],
- [0x6333,"D1C6"],
- [0x6334,"D1C0"],
- [0x6335,"9F5B"],
- [0x6336,"D1B7"],
- [0x6337,"93A9"],
- [0x6338,"D1C9"],
- [0x6339,"D1BA"],
- [0x633A,"AEBC"],
- [0x633B,"D57D"],
- [0x633C,"D1BD"],
- [0x633D,"AEBE"],
- [0x633E,"AEB5"],
- [0x6340,"D1CB"],
- [0x6341,"D1BF"],
- [0x6342,"AEB8"],
- [0x6343,"D1B8"],
- [0x6344,"D1B5"],
- [0x6345,"D1B6"],
- [0x6346,"AEB9"],
- [0x6347,"D1C5"],
- [0x6348,"D1CC"],
- [0x6349,"AEBB"],
- [0x634A,"D1BC"],
- [0x634B,"D1BB"],
- [0x634C,"AEC3"],
- [0x634D,"AEC2"],
- [0x634E,"AEB4"],
- [0x634F,"AEBA"],
- [0x6350,"AEBD"],
- [0x6351,"D1C8"],
- [0x6354,"D1C2"],
- [0x6355,"AEB7"],
- [0x6356,"D1B3"],
- [0x6357,"D1CA"],
- [0x6358,"D1C1"],
- [0x6359,"D1C3"],
- [0x635A,"D1C7"],
- [0x6364,"A07C"],
- [0x6365,"D567"],
- [0x6367,"B1B7"],
- [0x6368,"B1CB"],
- [0x6369,"B1CA"],
- [0x636B,"B1BF"],
- [0x636C,"FCB2"],
- [0x636D,"D579"],
- [0x636E,"D575"],
- [0x636F,"D572"],
- [0x6370,"D5A6"],
- [0x6371,"B1BA"],
- [0x6372,"B1B2"],
- [0x6375,"D577"],
- [0x6376,"B4A8"],
- [0x6377,"B1B6"],
- [0x6378,"D5A1"],
- [0x6379,"8AC1"],
- [0x637A,"B1CC"],
- [0x637B,"B1C9"],
- [0x637C,"D57B"],
- [0x637D,"D56A"],
- [0x637F,"9FB4"],
- [0x6380,"B1C8"],
- [0x6381,"D5A3"],
- [0x6382,"D569"],
- [0x6383,"B1BD"],
- [0x6384,"B1C1"],
- [0x6385,"D5A2"],
- [0x6387,"D573"],
- [0x6388,"B1C2"],
- [0x6389,"B1BC"],
- [0x638A,"D568"],
- [0x638B,"FCAC"],
- [0x638C,"B478"],
- [0x638D,"D5A5"],
- [0x638E,"D571"],
- [0x638F,"B1C7"],
- [0x6390,"D574"],
- [0x6391,"D5A4"],
- [0x6392,"B1C6"],
- [0x6394,"D952"],
- [0x6396,"B1B3"],
- [0x6397,"D56F"],
- [0x6398,"B1B8"],
- [0x6399,"B1C3"],
- [0x639B,"B1BE"],
- [0x639C,"D578"],
- [0x639D,"D56E"],
- [0x639E,"D56C"],
- [0x639F,"D57E"],
- [0x63A0,"B1B0"],
- [0x63A1,"B1C4"],
- [0x63A2,"B1B4"],
- [0x63A3,"B477"],
- [0x63A4,"D57C"],
- [0x63A5,"B1B5"],
- [0x63A7,"B1B1"],
- [0x63A8,"B1C0"],
- [0x63A9,"B1BB"],
- [0x63AA,"B1B9"],
- [0x63AB,"D570"],
- [0x63AC,"B1C5"],
- [0x63AD,"D56D"],
- [0x63AE,"D57A"],
- [0x63AF,"D576"],
- [0x63B0,"D954"],
- [0x63B1,"D953"],
- [0x63B9,"9E4C"],
- [0x63BD,"D56B"],
- [0x63BE,"D964"],
- [0x63C0,"B47A"],
- [0x63C1,"8FC5"],
- [0x63C2,"D96A"],
- [0x63C3,"D959"],
- [0x63C4,"D967"],
- [0x63C5,"DD77"],
- [0x63C6,"B47D"],
- [0x63C7,"D96B"],
- [0x63C8,"D96E"],
- [0x63C9,"B47C"],
- [0x63CA,"D95C"],
- [0x63CB,"D96D"],
- [0x63CC,"D96C"],
- [0x63CD,"B47E"],
- [0x63CE,"D955"],
- [0x63CF,"B479"],
- [0x63D0,"B4A3"],
- [0x63D1,"93AD"],
- [0x63D2,"B4A1"],
- [0x63D3,"D969"],
- [0x63D5,"D95F"],
- [0x63D6,"B4A5"],
- [0x63D7,"D970"],
- [0x63D8,"D968"],
- [0x63D9,"D971"],
- [0x63DA,"B4AD"],
- [0x63DB,"B4AB"],
- [0x63DC,"D966"],
- [0x63DD,"D965"],
- [0x63DE,"9DC3"],
- [0x63DF,"D963"],
- [0x63E0,"D95D"],
- [0x63E1,"B4A4"],
- [0x63E2,"8DA2"],
- [0x63E3,"B4A2"],
- [0x63E4,"D1B9"],
- [0x63E5,"D956"],
- [0x63E6,"9D4A"],
- [0x63E7,"DDB7"],
- [0x63E8,"D957"],
- [0x63E9,"B47B"],
- [0x63EA,"B4AA"],
- [0x63EB,"DD79"],
- [0x63ED,"B4A6"],
- [0x63EE,"B4A7"],
- [0x63EF,"D958"],
- [0x63F0,"D96F"],
- [0x63F1,"DD78"],
- [0x63F2,"D960"],
- [0x63F3,"D95B"],
- [0x63F4,"B4A9"],
- [0x63F5,"D961"],
- [0x63F6,"D95E"],
- [0x63F8,"FCB6"],
- [0x63F9,"B4AE"],
- [0x63FB,"8DA3"],
- [0x63FC,"9E4B"],
- [0x63FE,"9E4D"],
- [0x6406,"B770"],
- [0x6407,"8DA4"],
- [0x6409,"DD7C"],
- [0x640A,"DDB1"],
- [0x640B,"DDB6"],
- [0x640C,"DDAA"],
- [0x640D,"B76C"],
- [0x640E,"DDBB"],
- [0x640F,"B769"],
- [0x6410,"DD7A"],
- [0x6412,"DD7B"],
- [0x6413,"B762"],
- [0x6414,"B76B"],
- [0x6415,"DDA4"],
- [0x6416,"B76E"],
- [0x6417,"B76F"],
- [0x6418,"DDA5"],
- [0x641A,"DDB2"],
- [0x641B,"DDB8"],
- [0x641C,"B76A"],
- [0x641E,"B764"],
- [0x641F,"DDA3"],
- [0x6420,"DD7D"],
- [0x6421,"DDBA"],
- [0x6422,"DDA8"],
- [0x6423,"DDA9"],
- [0x6424,"DD7E"],
- [0x6425,"DDB4"],
- [0x6426,"DDAB"],
- [0x6427,"DDB5"],
- [0x6428,"DDAD"],
- [0x642A,"B765"],
- [0x642B,"E1D9"],
- [0x642C,"B768"],
- [0x642D,"B766"],
- [0x642E,"DDB9"],
- [0x642F,"DDB0"],
- [0x6430,"DDAC"],
- [0x6432,"8AFD"],
- [0x6433,"DDA1"],
- [0x6434,"BA53"],
- [0x6435,"DDAF"],
- [0x6436,"B76D"],
- [0x6437,"DDA7"],
- [0x6438,"FCB5"],
- [0x6439,"DDA6"],
- [0x643A,"FCC3"],
- [0x643B,"93B2"],
- [0x643D,"B767"],
- [0x643E,"B763"],
- [0x643F,"E1EE"],
- [0x6440,"DDB3"],
- [0x6441,"DDAE"],
- [0x6443,"DDA2"],
- [0x644B,"E1E9"],
- [0x644D,"E1DA"],
- [0x644E,"E1E5"],
- [0x6450,"E1EC"],
- [0x6451,"BA51"],
- [0x6452,"B4AC"],
- [0x6453,"E1EA"],
- [0x6454,"BA4C"],
- [0x6458,"BA4B"],
- [0x6459,"E1F1"],
- [0x645A,"8DA5"],
- [0x645B,"E1DB"],
- [0x645C,"E1E8"],
- [0x645D,"E1DC"],
- [0x645E,"E1E7"],
- [0x645F,"BA4F"],
- [0x6460,"E1EB"],
- [0x6461,"D962"],
- [0x6465,"E1F2"],
- [0x6466,"E1E3"],
- [0x6467,"BA52"],
- [0x6468,"E5BA"],
- [0x6469,"BCAF"],
- [0x646B,"E1F0"],
- [0x646C,"E1EF"],
- [0x646D,"BA54"],
- [0x646E,"E5AD"],
- [0x646F,"BCB0"],
- [0x6470,"E5AE"],
- [0x6471,"93A1"],
- [0x6472,"E1DF"],
- [0x6473,"E1E0"],
- [0x6474,"E1DD"],
- [0x6475,"E1E2"],
- [0x6476,"E1DE"],
- [0x6477,"E1F3"],
- [0x6478,"BA4E"],
- [0x6479,"BCB1"],
- [0x647A,"BA50"],
- [0x647B,"BA55"],
- [0x647C,"8AC6"],
- [0x647D,"E1E1"],
- [0x647F,"E1ED"],
- [0x6482,"E1E6"],
- [0x6485,"E5B1"],
- [0x6487,"BA4A"],
- [0x6488,"BCB4"],
- [0x6489,"E9AA"],
- [0x648A,"E5B6"],
- [0x648B,"E5B5"],
- [0x648C,"E5B7"],
- [0x648D,"8A5B"],
- [0x648F,"E5B4"],
- [0x6490,"BCB5"],
- [0x6491,"894D"],
- [0x6492,"BCBB"],
- [0x6493,"BCB8"],
- [0x6495,"BCB9"],
- [0x6496,"E5AF"],
- [0x6497,"E5B2"],
- [0x6498,"E5BC"],
- [0x6499,"BCC1"],
- [0x649A,"BCBF"],
- [0x649C,"E5B3"],
- [0x649D,"D95A"],
- [0x649E,"BCB2"],
- [0x649F,"E5B9"],
- [0x64A0,"E5B0"],
- [0x64A2,"BCC2"],
- [0x64A3,"E5B8"],
- [0x64A4,"BA4D"],
- [0x64A5,"BCB7"],
- [0x64A6,"E1E4"],
- [0x64A9,"BCBA"],
- [0x64AB,"BCBE"],
- [0x64AC,"BCC0"],
- [0x64AD,"BCBD"],
- [0x64AE,"BCBC"],
- [0x64AF,"FED4"],
- [0x64B0,"BCB6"],
- [0x64B1,"E5BB"],
- [0x64B2,"BCB3"],
- [0x64B3,"BCC3"],
- [0x64B4,"8A78"],
- [0x64B6,"93AB"],
- [0x64BB,"BED8"],
- [0x64BC,"BED9"],
- [0x64BD,"E9A9"],
- [0x64BE,"BEE2"],
- [0x64BF,"BEDF"],
- [0x64C0,"8DA7"],
- [0x64C1,"BED6"],
- [0x64C2,"BEDD"],
- [0x64C3,"E9AB"],
- [0x64C4,"BEDB"],
- [0x64C5,"BED5"],
- [0x64C7,"BEDC"],
- [0x64C9,"E9A8"],
- [0x64CA,"C0BB"],
- [0x64CB,"BED7"],
- [0x64CD,"BEDE"],
- [0x64CE,"C0BA"],
- [0x64CF,"E9A7"],
- [0x64D0,"E9A6"],
- [0x64D2,"BEE0"],
- [0x64D3,"9F45"],
- [0x64D4,"BEE1"],
- [0x64D6,"E9A5"],
- [0x64D7,"E9A4"],
- [0x64D8,"C0BC"],
- [0x64D9,"E9AE"],
- [0x64DA,"BEDA"],
- [0x64DB,"E9AC"],
- [0x64DD,"8A56"],
- [0x64E0,"C0BD"],
- [0x64E1,"FCBF"],
- [0x64E2,"C0C2"],
- [0x64E3,"ECEA"],
- [0x64E4,"ECEC"],
- [0x64E5,"FCC0"],
- [0x64E6,"C0BF"],
- [0x64E7,"8EE6"],
- [0x64E8,"ECED"],
- [0x64E9,"ECE9"],
- [0x64EA,"8AA4"],
- [0x64EB,"ECEB"],
- [0x64EC,"C0C0"],
- [0x64ED,"C0C3"],
- [0x64EF,"ECE8"],
- [0x64F0,"C0BE"],
- [0x64F1,"C0C1"],
- [0x64F2,"C259"],
- [0x64F3,"E9AD"],
- [0x64F4,"C258"],
- [0x64F7,"C25E"],
- [0x64F8,"EFD4"],
- [0x64FA,"C25C"],
- [0x64FB,"C25D"],
- [0x64FC,"EFD7"],
- [0x64FD,"EFD3"],
- [0x64FE,"C25A"],
- [0x64FF,"EFD1"],
- [0x6500,"C36B"],
- [0x6501,"EFD5"],
- [0x6503,"EFD6"],
- [0x6504,"EFD2"],
- [0x6506,"C25B"],
- [0x6507,"F242"],
- [0x6509,"F245"],
- [0x650A,"8943"],
- [0x650C,"F246"],
- [0x650D,"F244"],
- [0x650E,"F247"],
- [0x650F,"C36C"],
- [0x6510,"F243"],
- [0x6511,"93F3"],
- [0x6513,"F44E"],
- [0x6514,"C464"],
- [0x6515,"F44D"],
- [0x6516,"F44C"],
- [0x6517,"F44B"],
- [0x6518,"C463"],
- [0x6519,"C465"],
- [0x651B,"F5CD"],
- [0x651C,"C4E2"],
- [0x651D,"C4E1"],
- [0x651E,"FCAB"],
- [0x651F,"9EA2"],
- [0x6520,"F6E1"],
- [0x6521,"F6E0"],
- [0x6522,"F6E3"],
- [0x6523,"C5CB"],
- [0x6524,"C575"],
- [0x6525,"F7DD"],
- [0x6526,"F6E2"],
- [0x6529,"F7DC"],
- [0x652A,"C5CD"],
- [0x652B,"C5CC"],
- [0x652C,"C5F3"],
- [0x652D,"F8A9"],
- [0x652E,"F8EF"],
- [0x652F,"A4E4"],
- [0x6530,"9DC7"],
- [0x6532,"D972"],
- [0x6533,"E9AF"],
- [0x6534,"C6D2"],
- [0x6535,"8BCE"],
- [0x6536,"A6AC"],
- [0x6537,"CAF7"],
- [0x6538,"A7F1"],
- [0x6539,"A7EF"],
- [0x653B,"A7F0"],
- [0x653D,"CCC1"],
- [0x653E,"A9F1"],
- [0x653F,"AC46"],
- [0x6541,"CEE7"],
- [0x6543,"CEE8"],
- [0x6545,"AC47"],
- [0x6546,"D1CE"],
- [0x6548,"AEC4"],
- [0x6549,"AEC5"],
- [0x654A,"D1CD"],
- [0x654D,"FCC5"],
- [0x654F,"B1D3"],
- [0x6551,"B1CF"],
- [0x6553,"D5A7"],
- [0x6554,"B1D6"],
- [0x6555,"B1D5"],
- [0x6556,"B1CE"],
- [0x6557,"B1D1"],
- [0x6558,"B1D4"],
- [0x6559,"B1D0"],
- [0x655C,"D976"],
- [0x655D,"B1CD"],
- [0x655E,"B4AF"],
- [0x655F,"FCCB"],
- [0x6562,"B4B1"],
- [0x6563,"B4B2"],
- [0x6564,"D975"],
- [0x6565,"D978"],
- [0x6566,"B4B0"],
- [0x6567,"D973"],
- [0x6568,"D977"],
- [0x656A,"D974"],
- [0x656B,"93B3"],
- [0x656C,"B771"],
- [0x656D,"FCCA"],
- [0x656F,"DDBC"],
- [0x6572,"BA56"],
- [0x6573,"E1F4"],
- [0x6574,"BEE3"],
- [0x6575,"BCC4"],
- [0x6576,"E5BD"],
- [0x6577,"BCC5"],
- [0x6578,"BCC6"],
- [0x6579,"E5BF"],
- [0x657A,"E5BE"],
- [0x657B,"E5C0"],
- [0x657C,"E9B1"],
- [0x657F,"E9B0"],
- [0x6580,"ECEF"],
- [0x6581,"ECEE"],
- [0x6582,"C0C4"],
- [0x6583,"C0C5"],
- [0x6584,"F248"],
- [0x6585,"FCC9"],
- [0x6586,"8DAC"],
- [0x6587,"A4E5"],
- [0x6588,"FBC6"],
- [0x6589,"8967"],
- [0x658B,"8C7E"],
- [0x658C,"D979"],
- [0x6590,"B4B4"],
- [0x6591,"B4B3"],
- [0x6592,"DDBD"],
- [0x6594,"EFD8"],
- [0x6595,"C4E3"],
- [0x6596,"F7DE"],
- [0x6597,"A4E6"],
- [0x6599,"AEC6"],
- [0x659B,"B1D8"],
- [0x659C,"B1D7"],
- [0x659D,"D97A"],
- [0x659E,"D97B"],
- [0x659F,"B772"],
- [0x65A0,"E1F5"],
- [0x65A1,"BA57"],
- [0x65A2,"E9B2"],
- [0x65A4,"A4E7"],
- [0x65A5,"A5B8"],
- [0x65A7,"A9F2"],
- [0x65A8,"CCC2"],
- [0x65AA,"CEE9"],
- [0x65AB,"AC48"],
- [0x65AC,"B1D9"],
- [0x65AE,"D97C"],
- [0x65AF,"B4B5"],
- [0x65B0,"B773"],
- [0x65B2,"E5C1"],
- [0x65B3,"E5C2"],
- [0x65B5,"FCCD"],
- [0x65B6,"ECF0"],
- [0x65B7,"C25F"],
- [0x65B8,"F8F0"],
- [0x65B9,"A4E8"],
- [0x65BB,"CCC3"],
- [0x65BC,"A9F3"],
- [0x65BD,"AC49"],
- [0x65BE,"9CF3"],
- [0x65BF,"CEEA"],
- [0x65C1,"AEC7"],
- [0x65C2,"D1D2"],
- [0x65C3,"D1D0"],
- [0x65C4,"D1D1"],
- [0x65C5,"AEC8"],
- [0x65C6,"D1CF"],
- [0x65CB,"B1DB"],
- [0x65CC,"B1DC"],
- [0x65CD,"D5A8"],
- [0x65CE,"B1DD"],
- [0x65CF,"B1DA"],
- [0x65D0,"D97D"],
- [0x65D1,"FCD0"],
- [0x65D2,"D97E"],
- [0x65D3,"DDBE"],
- [0x65D4,"95BB"],
- [0x65D6,"BA59"],
- [0x65D7,"BA58"],
- [0x65DA,"ECF1"],
- [0x65DB,"EFD9"],
- [0x65DD,"F24A"],
- [0x65DE,"F249"],
- [0x65DF,"F44F"],
- [0x65E0,"FCD3"],
- [0x65E1,"C95E"],
- [0x65E2,"AC4A"],
- [0x65E3,"FCD4"],
- [0x65E5,"A4E9"],
- [0x65E6,"A5B9"],
- [0x65E8,"A6AE"],
- [0x65E9,"A6AD"],
- [0x65EC,"A6AF"],
- [0x65ED,"A6B0"],
- [0x65EE,"C9EE"],
- [0x65EF,"C9ED"],
- [0x65F0,"CAF8"],
- [0x65F1,"A7F2"],
- [0x65F2,"CAFB"],
- [0x65F3,"CAFA"],
- [0x65F4,"CAF9"],
- [0x65F5,"CAFC"],
- [0x65FA,"A9F4"],
- [0x65FB,"CCC9"],
- [0x65FC,"CCC5"],
- [0x65FD,"CCCE"],
- [0x65FF,"8DAE"],
- [0x6600,"A9FB"],
- [0x6602,"A9F9"],
- [0x6603,"CCCA"],
- [0x6604,"CCC6"],
- [0x6605,"CCCD"],
- [0x6606,"A9F8"],
- [0x6607,"AA40"],
- [0x6608,"CCC8"],
- [0x6609,"CCC4"],
- [0x660A,"A9FE"],
- [0x660B,"CCCB"],
- [0x660C,"A9F7"],
- [0x660D,"CCCC"],
- [0x660E,"A9FA"],
- [0x660F,"A9FC"],
- [0x6610,"CCD0"],
- [0x6611,"CCCF"],
- [0x6612,"CCC7"],
- [0x6613,"A9F6"],
- [0x6614,"A9F5"],
- [0x6615,"A9FD"],
- [0x6618,"FCD7"],
- [0x661C,"CEEF"],
- [0x661D,"CEF5"],
- [0x661E,"93DB"],
- [0x661F,"AC50"],
- [0x6620,"AC4D"],
- [0x6621,"CEEC"],
- [0x6622,"CEF1"],
- [0x6623,"FE63"],
- [0x6624,"AC53"],
- [0x6625,"AC4B"],
- [0x6626,"CEF0"],
- [0x6627,"AC4E"],
- [0x6628,"AC51"],
- [0x662B,"CEF3"],
- [0x662D,"AC4C"],
- [0x662E,"CEF8"],
- [0x662F,"AC4F"],
- [0x6630,"93D5"],
- [0x6631,"AC52"],
- [0x6632,"CEED"],
- [0x6633,"CEF2"],
- [0x6634,"CEF6"],
- [0x6635,"CEEE"],
- [0x6636,"CEEB"],
- [0x6639,"CEF7"],
- [0x663A,"CEF4"],
- [0x6641,"AED0"],
- [0x6642,"AEC9"],
- [0x6643,"AECC"],
- [0x6644,"FCDA"],
- [0x6645,"AECF"],
- [0x6647,"D1D5"],
- [0x6648,"9B71"],
- [0x6649,"AECA"],
- [0x664A,"D1D3"],
- [0x664B,"FCDD"],
- [0x664C,"AECE"],
- [0x664D,"8764"],
- [0x664F,"AECB"],
- [0x6651,"D1D6"],
- [0x6652,"AECD"],
- [0x6653,"8DAF"],
- [0x6657,"FAF2"],
- [0x6659,"D5AC"],
- [0x665A,"B1DF"],
- [0x665B,"D5AB"],
- [0x665C,"D5AD"],
- [0x665D,"B1DE"],
- [0x665E,"B1E3"],
- [0x665F,"D1D4"],
- [0x6660,"87B5"],
- [0x6661,"D5AA"],
- [0x6662,"D5AE"],
- [0x6663,"93D8"],
- [0x6664,"B1E0"],
- [0x6665,"D5A9"],
- [0x6666,"B1E2"],
- [0x6667,"FCDF"],
- [0x6668,"B1E1"],
- [0x666A,"D9A7"],
- [0x666B,"93D3"],
- [0x666C,"D9A2"],
- [0x666E,"B4B6"],
- [0x666F,"B4BA"],
- [0x6670,"B4B7"],
- [0x6671,"D9A5"],
- [0x6672,"D9A8"],
- [0x6673,"FCE1"],
- [0x6674,"B4B8"],
- [0x6676,"B4B9"],
- [0x6677,"B4BE"],
- [0x6678,"DDC7"],
- [0x6679,"D9A6"],
- [0x667A,"B4BC"],
- [0x667B,"D9A3"],
- [0x667C,"D9A1"],
- [0x667D,"8E76"],
- [0x667E,"B4BD"],
- [0x6680,"D9A4"],
- [0x6684,"B779"],
- [0x6685,"FC62"],
- [0x6686,"DDBF"],
- [0x6687,"B776"],
- [0x6688,"B777"],
- [0x6689,"B775"],
- [0x668A,"DDC4"],
- [0x668B,"DDC3"],
- [0x668C,"DDC0"],
- [0x668D,"B77B"],
- [0x668E,"93D1"],
- [0x6690,"DDC2"],
- [0x6691,"B4BB"],
- [0x6692,"8DB1"],
- [0x6694,"DDC6"],
- [0x6695,"DDC1"],
- [0x6696,"B778"],
- [0x6697,"B774"],
- [0x6698,"B77A"],
- [0x6699,"DDC5"],
- [0x669A,"9859"],
- [0x669D,"BA5C"],
- [0x669F,"E1F8"],
- [0x66A0,"E1F7"],
- [0x66A1,"E1F6"],
- [0x66A2,"BA5A"],
- [0x66A4,"FB52"],
- [0x66A8,"BA5B"],
- [0x66A9,"E5C5"],
- [0x66AA,"E5C8"],
- [0x66AB,"BCC8"],
- [0x66AD,"FB53"],
- [0x66AE,"BCC7"],
- [0x66AF,"E5C9"],
- [0x66B0,"E5C4"],
- [0x66B1,"BCCA"],
- [0x66B2,"E5C6"],
- [0x66B3,"FB4D"],
- [0x66B4,"BCC9"],
- [0x66B5,"E5C3"],
- [0x66B6,"9CBF"],
- [0x66B7,"E5C7"],
- [0x66B8,"BEE9"],
- [0x66B9,"BEE6"],
- [0x66BA,"E9BB"],
- [0x66BB,"E9BA"],
- [0x66BD,"E9B9"],
- [0x66BE,"E9B4"],
- [0x66BF,"9B72"],
- [0x66C0,"E9B5"],
- [0x66C4,"BEE7"],
- [0x66C6,"BEE4"],
- [0x66C7,"BEE8"],
- [0x66C8,"E9B3"],
- [0x66C9,"BEE5"],
- [0x66CA,"E9B6"],
- [0x66CB,"E9B7"],
- [0x66CC,"E9BC"],
- [0x66CD,"FB50"],
- [0x66CE,"93BE"],
- [0x66CF,"E9B8"],
- [0x66D2,"ECF2"],
- [0x66D6,"C0C7"],
- [0x66D8,"EFDC"],
- [0x66D9,"C0C6"],
- [0x66DA,"EFDA"],
- [0x66DB,"EFDB"],
- [0x66DC,"C260"],
- [0x66DD,"C36E"],
- [0x66DE,"F24B"],
- [0x66E0,"C36D"],
- [0x66E3,"F451"],
- [0x66E4,"F452"],
- [0x66E6,"C466"],
- [0x66E7,"8CDB"],
- [0x66E8,"F450"],
- [0x66E9,"C4E4"],
- [0x66EB,"F7DF"],
- [0x66EC,"C5CE"],
- [0x66ED,"F8AA"],
- [0x66EE,"F8AB"],
- [0x66F0,"A4EA"],
- [0x66F1,"9DF1"],
- [0x66F2,"A6B1"],
- [0x66F3,"A6B2"],
- [0x66F4,"A7F3"],
- [0x66F6,"CCD1"],
- [0x66F7,"AC54"],
- [0x66F8,"AED1"],
- [0x66F9,"B1E4"],
- [0x66FC,"B0D2"],
- [0x66FE,"B4BF"],
- [0x66FF,"B4C0"],
- [0x6700,"B3CC"],
- [0x6701,"D9A9"],
- [0x6702,"FCEB"],
- [0x6703,"B77C"],
- [0x6704,"E1FA"],
- [0x6705,"E1F9"],
- [0x6708,"A4EB"],
- [0x6709,"A6B3"],
- [0x670A,"CCD2"],
- [0x670B,"AA42"],
- [0x670C,"A0BB"],
- [0x670D,"AA41"],
- [0x670E,"9B7E"],
- [0x670F,"CEF9"],
- [0x6710,"CEFA"],
- [0x6712,"D1D7"],
- [0x6713,"D1D8"],
- [0x6714,"AED2"],
- [0x6715,"AED3"],
- [0x6716,"8DB3"],
- [0x6717,"AED4"],
- [0x6718,"D5AF"],
- [0x6719,"8C52"],
- [0x671B,"B1E6"],
- [0x671D,"B4C2"],
- [0x671E,"9AE8"],
- [0x671F,"B4C1"],
- [0x6720,"DDC8"],
- [0x6721,"DF7A"],
- [0x6722,"E1FB"],
- [0x6723,"E9BD"],
- [0x6725,"8EDC"],
- [0x6726,"C261"],
- [0x6727,"C467"],
- [0x6728,"A4EC"],
- [0x672A,"A5BC"],
- [0x672B,"A5BD"],
- [0x672C,"A5BB"],
- [0x672D,"A5BE"],
- [0x672E,"A5BA"],
- [0x6731,"A6B6"],
- [0x6733,"C9F6"],
- [0x6734,"A6B5"],
- [0x6735,"A6B7"],
- [0x6736,"9CF9"],
- [0x6738,"C9F1"],
- [0x6739,"C9F0"],
- [0x673A,"C9F3"],
- [0x673B,"C9F2"],
- [0x673C,"C9F5"],
- [0x673D,"A6B4"],
- [0x673E,"C9EF"],
- [0x673F,"C9F4"],
- [0x6744,"FA50"],
- [0x6745,"CAFD"],
- [0x6746,"A7FD"],
- [0x6747,"CAFE"],
- [0x6748,"CB43"],
- [0x6749,"A7FC"],
- [0x674B,"CB47"],
- [0x674C,"CB42"],
- [0x674D,"CB45"],
- [0x674E,"A7F5"],
- [0x674F,"A7F6"],
- [0x6750,"A7F7"],
- [0x6751,"A7F8"],
- [0x6753,"A840"],
- [0x6755,"CB41"],
- [0x6756,"A7FA"],
- [0x6757,"A841"],
- [0x6759,"CB40"],
- [0x675A,"CB46"],
- [0x675C,"A7F9"],
- [0x675D,"CB44"],
- [0x675E,"A7FB"],
- [0x675F,"A7F4"],
- [0x6760,"A7FE"],
- [0x6761,"98E7"],
- [0x6762,"FCF3"],
- [0x6767,"FCF2"],
- [0x676A,"AA57"],
- [0x676B,"8CCA"],
- [0x676C,"CCD4"],
- [0x676D,"AA43"],
- [0x676E,"8775"],
- [0x676F,"AA4D"],
- [0x6770,"AA4E"],
- [0x6771,"AA46"],
- [0x6772,"AA58"],
- [0x6773,"AA48"],
- [0x6774,"CCDC"],
- [0x6775,"AA53"],
- [0x6776,"CCD7"],
- [0x6777,"AA49"],
- [0x6778,"CCE6"],
- [0x6779,"CCE7"],
- [0x677A,"CCDF"],
- [0x677B,"CCD8"],
- [0x677C,"AA56"],
- [0x677D,"CCE4"],
- [0x677E,"AA51"],
- [0x677F,"AA4F"],
- [0x6781,"CCE5"],
- [0x6782,"87BA"],
- [0x6783,"CCE3"],
- [0x6784,"CCDB"],
- [0x6785,"CCD3"],
- [0x6786,"CCDA"],
- [0x6787,"AA4A"],
- [0x6789,"AA50"],
- [0x678B,"AA44"],
- [0x678C,"CCDE"],
- [0x678D,"CCDD"],
- [0x678E,"CCD5"],
- [0x678F,"93E5"],
- [0x6790,"AA52"],
- [0x6791,"CCE1"],
- [0x6792,"CCD6"],
- [0x6793,"AA55"],
- [0x6794,"CCE8"],
- [0x6795,"AA45"],
- [0x6797,"AA4C"],
- [0x6798,"CCD9"],
- [0x6799,"CCE2"],
- [0x679A,"AA54"],
- [0x679C,"AA47"],
- [0x679D,"AA4B"],
- [0x679F,"CCE0"],
- [0x67A0,"9A59"],
- [0x67A4,"8DB5"],
- [0x67AC,"FD4D"],
- [0x67AE,"CF5B"],
- [0x67AF,"AC5C"],
- [0x67B0,"AC69"],
- [0x67B1,"FD5E"],
- [0x67B2,"CF56"],
- [0x67B3,"CF4C"],
- [0x67B4,"AC62"],
- [0x67B5,"CF4A"],
- [0x67B6,"AC5B"],
- [0x67B7,"CF45"],
- [0x67B8,"AC65"],
- [0x67B9,"CF52"],
- [0x67BA,"CEFE"],
- [0x67BB,"CF41"],
- [0x67BF,"8F7D"],
- [0x67C0,"CF44"],
- [0x67C1,"CEFB"],
- [0x67C2,"CF51"],
- [0x67C3,"CF61"],
- [0x67C4,"AC60"],
- [0x67C5,"CF46"],
- [0x67C6,"CF58"],
- [0x67C8,"CEFD"],
- [0x67C9,"CF5F"],
- [0x67CA,"CF60"],
- [0x67CB,"CF63"],
- [0x67CC,"CF5A"],
- [0x67CD,"CF4B"],
- [0x67CE,"CF53"],
- [0x67CF,"AC66"],
- [0x67D0,"AC59"],
- [0x67D1,"AC61"],
- [0x67D2,"AC6D"],
- [0x67D3,"AC56"],
- [0x67D4,"AC58"],
- [0x67D6,"9547"],
- [0x67D7,"FCF6"],
- [0x67D8,"CF43"],
- [0x67D9,"AC6A"],
- [0x67DA,"AC63"],
- [0x67DB,"CF5D"],
- [0x67DC,"CF40"],
- [0x67DD,"AC6C"],
- [0x67DE,"AC67"],
- [0x67DF,"CF49"],
- [0x67E2,"AC6B"],
- [0x67E3,"CF50"],
- [0x67E4,"CF48"],
- [0x67E5,"AC64"],
- [0x67E6,"CF5C"],
- [0x67E7,"CF54"],
- [0x67E9,"AC5E"],
- [0x67EA,"CF62"],
- [0x67EB,"CF47"],
- [0x67EC,"AC5A"],
- [0x67ED,"CF59"],
- [0x67EE,"CF4F"],
- [0x67EF,"AC5F"],
- [0x67F0,"CF55"],
- [0x67F1,"AC57"],
- [0x67F2,"CEFC"],
- [0x67F3,"AC68"],
- [0x67F4,"AEE3"],
- [0x67F5,"AC5D"],
- [0x67F6,"CF4E"],
- [0x67F7,"CF4D"],
- [0x67F8,"CF42"],
- [0x67F9,"9250"],
- [0x67FA,"CF5E"],
- [0x67FC,"CF57"],
- [0x67FE,"8968"],
- [0x67FF,"AC55"],
- [0x6800,"8DB6"],
- [0x6801,"FCFB"],
- [0x6802,"A07D"],
- [0x6803,"98FC"],
- [0x6804,"8969"],
- [0x680D,"FE4F"],
- [0x6810,"9256"],
- [0x6812,"D1EC"],
- [0x6813,"AEEA"],
- [0x6814,"D1ED"],
- [0x6816,"D1E1"],
- [0x6817,"AEDF"],
- [0x6818,"AEEB"],
- [0x681A,"D1DA"],
- [0x681B,"FAC9"],
- [0x681C,"D1E3"],
- [0x681D,"D1EB"],
- [0x681E,"93E8"],
- [0x681F,"D1D9"],
- [0x6820,"D1F4"],
- [0x6821,"AED5"],
- [0x6822,"FCF8"],
- [0x6825,"D1F3"],
- [0x6826,"D1EE"],
- [0x6828,"D1EF"],
- [0x6829,"AEDD"],
- [0x682A,"AEE8"],
- [0x682B,"D1E5"],
- [0x682D,"D1E6"],
- [0x682E,"D1F0"],
- [0x682F,"D1E7"],
- [0x6831,"D1E2"],
- [0x6832,"D1DC"],
- [0x6833,"D1DD"],
- [0x6834,"D1EA"],
- [0x6835,"D1E4"],
- [0x6836,"9CE3"],
- [0x6837,"FDA9"],
- [0x6838,"AED6"],
- [0x6839,"AEDA"],
- [0x683A,"D1F2"],
- [0x683B,"D1DE"],
- [0x683C,"AEE6"],
- [0x683D,"AEE2"],
- [0x683E,"FC44"],
- [0x6840,"AEE5"],
- [0x6841,"AEEC"],
- [0x6842,"AEDB"],
- [0x6843,"AEE7"],
- [0x6844,"D1E9"],
- [0x6845,"AEE9"],
- [0x6846,"AED8"],
- [0x6847,"9640"],
- [0x6848,"AED7"],
- [0x6849,"D1DB"],
- [0x684A,"8DB8"],
- [0x684B,"D1DF"],
- [0x684C,"AEE0"],
- [0x684D,"D1F1"],
- [0x684E,"D1E8"],
- [0x684F,"D1E0"],
- [0x6850,"AEE4"],
- [0x6851,"AEE1"],
- [0x6853,"AED9"],
- [0x6854,"AEDC"],
- [0x6855,"9B4A"],
- [0x6856,"8FB9"],
- [0x685D,"FCFE"],
- [0x6865,"896A"],
- [0x686B,"D5C4"],
- [0x686D,"D5B4"],
- [0x686E,"D5B5"],
- [0x686F,"D5B9"],
- [0x6871,"D5C8"],
- [0x6872,"D5C5"],
- [0x6874,"D5BE"],
- [0x6875,"D5BD"],
- [0x6876,"B1ED"],
- [0x6877,"D5C1"],
- [0x6878,"D5D0"],
- [0x6879,"D5B0"],
- [0x687B,"D5D1"],
- [0x687C,"D5C3"],
- [0x687D,"D5D5"],
- [0x687E,"D5C9"],
- [0x687F,"B1EC"],
- [0x6880,"D5C7"],
- [0x6881,"B1E7"],
- [0x6882,"B1FC"],
- [0x6883,"B1F2"],
- [0x6884,"8DB9"],
- [0x6885,"B1F6"],
- [0x6886,"B1F5"],
- [0x6887,"D5B1"],
- [0x6888,"917E"],
- [0x6889,"D5CE"],
- [0x688A,"D5D4"],
- [0x688B,"D5CC"],
- [0x688C,"D5D3"],
- [0x688F,"D5C0"],
- [0x6890,"D5B2"],
- [0x6891,"D5D2"],
- [0x6892,"D5C2"],
- [0x6893,"B1EA"],
- [0x6894,"B1F7"],
- [0x6896,"D5CB"],
- [0x6897,"B1F0"],
- [0x6898,"93F4"],
- [0x689B,"D5CA"],
- [0x689C,"D5B3"],
- [0x689D,"B1F8"],
- [0x689F,"B1FA"],
- [0x68A0,"D5CD"],
- [0x68A1,"B1FB"],
- [0x68A2,"B1E9"],
- [0x68A3,"D5BA"],
- [0x68A4,"D5CF"],
- [0x68A6,"FB7C"],
- [0x68A7,"B1EF"],
- [0x68A8,"B1F9"],
- [0x68A9,"D5BC"],
- [0x68AA,"D5C6"],
- [0x68AB,"D5B7"],
- [0x68AC,"D5BB"],
- [0x68AD,"B1F4"],
- [0x68AE,"D5B6"],
- [0x68AF,"B1E8"],
- [0x68B0,"B1F1"],
- [0x68B1,"B1EE"],
- [0x68B2,"D5BF"],
- [0x68B3,"AEDE"],
- [0x68B4,"D9C0"],
- [0x68B5,"B1EB"],
- [0x68B6,"93E7"],
- [0x68B9,"97EF"],
- [0x68BD,"FE4A"],
- [0x68C3,"FD45"],
- [0x68C4,"B1F3"],
- [0x68C5,"96A5"],
- [0x68C6,"D9C3"],
- [0x68C7,"D9D9"],
- [0x68C8,"D9CE"],
- [0x68C9,"B4D6"],
- [0x68CA,"FEE0"],
- [0x68CB,"B4D1"],
- [0x68CC,"D9BD"],
- [0x68CD,"B4D2"],
- [0x68CE,"D9CD"],
- [0x68D0,"D9C6"],
- [0x68D1,"D9D3"],
- [0x68D2,"B4CE"],
- [0x68D3,"D9AB"],
- [0x68D4,"D9D5"],
- [0x68D5,"B4C4"],
- [0x68D6,"D9B3"],
- [0x68D7,"B4C7"],
- [0x68D8,"B4C6"],
- [0x68DA,"B4D7"],
- [0x68DC,"D9AD"],
- [0x68DD,"D9CF"],
- [0x68DE,"D9D0"],
- [0x68DF,"B4C9"],
- [0x68E0,"B4C5"],
- [0x68E1,"D9BB"],
- [0x68E3,"B4D0"],
- [0x68E4,"D9B6"],
- [0x68E6,"D9D1"],
- [0x68E7,"B4CC"],
- [0x68E8,"D9C9"],
- [0x68E9,"D9D6"],
- [0x68EA,"D9B0"],
- [0x68EB,"D9B5"],
- [0x68EC,"D9AF"],
- [0x68EE,"B4CB"],
- [0x68EF,"D9C2"],
- [0x68F0,"DDDE"],
- [0x68F1,"D9B1"],
- [0x68F2,"B4CF"],
- [0x68F3,"D9BA"],
- [0x68F4,"D9D2"],
- [0x68F5,"B4CA"],
- [0x68F6,"D9B7"],
- [0x68F7,"D9B4"],
- [0x68F8,"D9C5"],
- [0x68F9,"B4CD"],
- [0x68FA,"B4C3"],
- [0x68FB,"B4D9"],
- [0x68FC,"D9C8"],
- [0x68FD,"D9C7"],
- [0x6900,"FD48"],
- [0x6901,"FD47"],
- [0x6902,"FEF2"],
- [0x6903,"FE6A"],
- [0x6904,"D9AC"],
- [0x6905,"B4C8"],
- [0x6906,"D9D4"],
- [0x6907,"D9BC"],
- [0x6908,"D9BE"],
- [0x6909,"8DBD"],
- [0x690A,"D9CB"],
- [0x690B,"D9CA"],
- [0x690C,"D9AA"],
- [0x690D,"B4D3"],
- [0x690E,"B4D5"],
- [0x690F,"D9B2"],
- [0x6910,"D9B9"],
- [0x6911,"D9C1"],
- [0x6912,"B4D4"],
- [0x6913,"D9B8"],
- [0x6914,"D9C4"],
- [0x6915,"D9D7"],
- [0x6917,"D9CC"],
- [0x6918,"9BA1"],
- [0x6919,"8CA2"],
- [0x691A,"9AB7"],
- [0x691B,"8EFC"],
- [0x6925,"D9D8"],
- [0x692A,"D9AE"],
- [0x692C,"9FA1"],
- [0x692F,"DDF2"],
- [0x6930,"B7A6"],
- [0x6932,"DDF0"],
- [0x6933,"DDDB"],
- [0x6934,"DDE0"],
- [0x6935,"DDD9"],
- [0x6936,"FD51"],
- [0x6937,"DDEC"],
- [0x6938,"DDCB"],
- [0x6939,"DDD2"],
- [0x693B,"DDEA"],
- [0x693C,"DDF4"],
- [0x693D,"DDDC"],
- [0x693E,"FAAD"],
- [0x693F,"DDCF"],
- [0x6940,"DDE2"],
- [0x6941,"DDE7"],
- [0x6942,"DDD3"],
- [0x6943,"8DBE"],
- [0x6944,"DDE4"],
- [0x6945,"DDD0"],
- [0x6946,"89A4"],
- [0x6948,"DDD7"],
- [0x6949,"DDD8"],
- [0x694A,"B7A8"],
- [0x694B,"DDEB"],
- [0x694C,"DDE9"],
- [0x694E,"DDCC"],
- [0x694F,"DDEE"],
- [0x6951,"DDEF"],
- [0x6952,"DDF1"],
- [0x6953,"B7AC"],
- [0x6954,"B7A4"],
- [0x6955,"9AD9"],
- [0x6956,"D5B8"],
- [0x6957,"DDD4"],
- [0x6958,"DDE6"],
- [0x6959,"DDD5"],
- [0x695A,"B7A1"],
- [0x695B,"B7B1"],
- [0x695C,"DDED"],
- [0x695D,"B7AF"],
- [0x695E,"B7AB"],
- [0x695F,"DDCA"],
- [0x6960,"B7A3"],
- [0x6961,"FD4E"],
- [0x6962,"DDCD"],
- [0x6963,"B7B0"],
- [0x6964,"8DC0"],
- [0x6965,"DDDD"],
- [0x6966,"DDC9"],
- [0x6967,"97F0"],
- [0x6968,"B7A9"],
- [0x6969,"DDE1"],
- [0x696A,"DDD1"],
- [0x696B,"B7AA"],
- [0x696C,"DDDA"],
- [0x696D,"B77E"],
- [0x696E,"B4D8"],
- [0x696F,"DDE3"],
- [0x6970,"D9BF"],
- [0x6971,"DDCE"],
- [0x6972,"93B4"],
- [0x6973,"FD44"],
- [0x6974,"DDE8"],
- [0x6975,"B7A5"],
- [0x6976,"DDE5"],
- [0x6977,"B7A2"],
- [0x6978,"DDDF"],
- [0x6979,"B7AD"],
- [0x697A,"DDD6"],
- [0x697B,"DDF3"],
- [0x6980,"9FA7"],
- [0x6982,"B7A7"],
- [0x6983,"DEC6"],
- [0x6985,"8DC2"],
- [0x6986,"B7AE"],
- [0x698A,"99B6"],
- [0x698D,"E24A"],
- [0x698E,"E248"],
- [0x6990,"E25E"],
- [0x6991,"E246"],
- [0x6993,"E258"],
- [0x6994,"B77D"],
- [0x6995,"BA5F"],
- [0x6996,"E242"],
- [0x6997,"E25D"],
- [0x6998,"FD52"],
- [0x6999,"E247"],
- [0x699A,"E255"],
- [0x699B,"BA64"],
- [0x699C,"BA5D"],
- [0x699E,"E25B"],
- [0x699F,"8DC1"],
- [0x69A0,"E240"],
- [0x69A1,"E25A"],
- [0x69A2,"8E46"],
- [0x69A3,"BA6F"],
- [0x69A4,"E251"],
- [0x69A5,"E261"],
- [0x69A6,"BA6D"],
- [0x69A7,"E249"],
- [0x69A8,"BA5E"],
- [0x69A9,"E24B"],
- [0x69AA,"E259"],
- [0x69AB,"BA67"],
- [0x69AC,"E244"],
- [0x69AD,"BA6B"],
- [0x69AE,"BA61"],
- [0x69AF,"E24D"],
- [0x69B0,"E243"],
- [0x69B1,"E1FC"],
- [0x69B2,"A0D1"],
- [0x69B3,"E257"],
- [0x69B4,"BA68"],
- [0x69B5,"E260"],
- [0x69B6,"E1FD"],
- [0x69B7,"BA65"],
- [0x69B9,"E253"],
- [0x69BB,"BA66"],
- [0x69BC,"E245"],
- [0x69BD,"E250"],
- [0x69BE,"E24C"],
- [0x69BF,"E24E"],
- [0x69C0,"9FCA"],
- [0x69C1,"BA60"],
- [0x69C2,"E25F"],
- [0x69C3,"BA6E"],
- [0x69C4,"E24F"],
- [0x69C6,"E262"],
- [0x69C9,"E1FE"],
- [0x69CA,"E254"],
- [0x69CB,"BA63"],
- [0x69CC,"BA6C"],
- [0x69CD,"BA6A"],
- [0x69CE,"E241"],
- [0x69CF,"E256"],
- [0x69D0,"BA69"],
- [0x69D1,"92CF"],
- [0x69D3,"BA62"],
- [0x69D4,"E252"],
- [0x69D5,"9CF4"],
- [0x69D6,"8DC4"],
- [0x69D9,"E25C"],
- [0x69E1,"FD41"],
- [0x69E2,"E5D5"],
- [0x69E4,"E5D1"],
- [0x69E5,"E5CD"],
- [0x69E6,"E5E1"],
- [0x69E7,"E5DE"],
- [0x69E8,"BCCD"],
- [0x69E9,"9B4C"],
- [0x69EB,"E5E5"],
- [0x69EC,"E5D4"],
- [0x69ED,"BCD8"],
- [0x69EE,"E5DB"],
- [0x69F1,"E5D0"],
- [0x69F2,"E5DA"],
- [0x69F3,"BCD5"],
- [0x69F4,"E5EE"],
- [0x69F6,"E5EB"],
- [0x69F7,"E5DD"],
- [0x69F8,"E5CE"],
- [0x69F9,"FD57"],
- [0x69FA,"FCEF"],
- [0x69FB,"E5E2"],
- [0x69FC,"E5E4"],
- [0x69FD,"BCD1"],
- [0x69FE,"E5D8"],
- [0x69FF,"E5D3"],
- [0x6A00,"E5CA"],
- [0x6A01,"BCCE"],
- [0x6A02,"BCD6"],
- [0x6A03,"9CDE"],
- [0x6A04,"E5E7"],
- [0x6A05,"BCD7"],
- [0x6A06,"E5CB"],
- [0x6A07,"E5ED"],
- [0x6A08,"E5E0"],
- [0x6A09,"E5E6"],
- [0x6A0A,"BCD4"],
- [0x6A0B,"FD42"],
- [0x6A0C,"986C"],
- [0x6A0D,"E5E3"],
- [0x6A0F,"E5EA"],
- [0x6A11,"BCD9"],
- [0x6A13,"BCD3"],
- [0x6A14,"E5DC"],
- [0x6A15,"E5CF"],
- [0x6A16,"E5EF"],
- [0x6A17,"E5CC"],
- [0x6A18,"E5E8"],
- [0x6A19,"BCD0"],
- [0x6A1A,"97F9"],
- [0x6A1B,"E5D6"],
- [0x6A1C,"9558"],
- [0x6A1D,"E5D7"],
- [0x6A1E,"BCCF"],
- [0x6A1F,"BCCC"],
- [0x6A20,"E5D2"],
- [0x6A21,"BCD2"],
- [0x6A23,"BCCB"],
- [0x6A25,"E5E9"],
- [0x6A26,"E5EC"],
- [0x6A27,"E5D9"],
- [0x6A28,"E9CA"],
- [0x6A29,"87B6"],
- [0x6A2B,"985E"],
- [0x6A2C,"FE7B"],
- [0x6A2D,"94CD"],
- [0x6A32,"E9C2"],
- [0x6A33,"93EE"],
- [0x6A34,"E9BE"],
- [0x6A35,"BEF6"],
- [0x6A38,"BEEB"],
- [0x6A39,"BEF0"],
- [0x6A3A,"BEEC"],
- [0x6A3B,"E9CC"],
- [0x6A3C,"E9D7"],
- [0x6A3D,"BEEA"],
- [0x6A3E,"E9C4"],
- [0x6A3F,"E9CD"],
- [0x6A40,"E5DF"],
- [0x6A41,"E9CE"],
- [0x6A43,"8CA3"],
- [0x6A44,"BEF1"],
- [0x6A45,"FD5A"],
- [0x6A46,"E9DD"],
- [0x6A47,"BEF5"],
- [0x6A48,"BEF8"],
- [0x6A49,"E9C0"],
- [0x6A4B,"BEF4"],
- [0x6A4C,"93F5"],
- [0x6A4D,"E9DB"],
- [0x6A4E,"E9DC"],
- [0x6A4F,"E9D2"],
- [0x6A50,"E9D1"],
- [0x6A51,"E9C9"],
- [0x6A52,"93EF"],
- [0x6A53,"8EEA"],
- [0x6A54,"E9D3"],
- [0x6A55,"E9DA"],
- [0x6A56,"E9D9"],
- [0x6A57,"8F5B"],
- [0x6A58,"BEEF"],
- [0x6A59,"BEED"],
- [0x6A5A,"E9CB"],
- [0x6A5B,"E9C8"],
- [0x6A5D,"E9C5"],
- [0x6A5E,"E9D8"],
- [0x6A5F,"BEF7"],
- [0x6A60,"E9D6"],
- [0x6A61,"BEF3"],
- [0x6A62,"BEF2"],
- [0x6A63,"8C5E"],
- [0x6A64,"E9D0"],
- [0x6A65,"8DC6"],
- [0x6A66,"E9BF"],
- [0x6A67,"E9C1"],
- [0x6A68,"E9C3"],
- [0x6A69,"E9D5"],
- [0x6A6A,"E9CF"],
- [0x6A6B,"BEEE"],
- [0x6A6D,"E9C6"],
- [0x6A6F,"E9D4"],
- [0x6A71,"8DC8"],
- [0x6A74,"8DC7"],
- [0x6A76,"E9C7"],
- [0x6A7A,"93F7"],
- [0x6A7E,"C0CF"],
- [0x6A7F,"ED45"],
- [0x6A80,"C0C8"],
- [0x6A81,"ECF5"],
- [0x6A82,"8DC9"],
- [0x6A83,"ED41"],
- [0x6A84,"C0CA"],
- [0x6A85,"ED48"],
- [0x6A87,"ECFC"],
- [0x6A89,"ECF7"],
- [0x6A8A,"FBF2"],
- [0x6A8C,"ED49"],
- [0x6A8D,"ECF3"],
- [0x6A8E,"ECFE"],
- [0x6A8F,"9670"],
- [0x6A90,"C0D1"],
- [0x6A91,"ED44"],
- [0x6A92,"ED4A"],
- [0x6A93,"ECFD"],
- [0x6A94,"C0C9"],
- [0x6A95,"ED40"],
- [0x6A96,"ECF4"],
- [0x6A97,"C0D0"],
- [0x6A99,"8DCB"],
- [0x6A9A,"ED47"],
- [0x6A9B,"ECF9"],
- [0x6A9C,"C0CC"],
- [0x6A9D,"FD5C"],
- [0x6A9E,"ECFB"],
- [0x6A9F,"ECF8"],
- [0x6AA0,"C0D2"],
- [0x6AA1,"ECFA"],
- [0x6AA2,"C0CB"],
- [0x6AA3,"C0CE"],
- [0x6AA4,"ED43"],
- [0x6AA5,"ECF6"],
- [0x6AA6,"ED46"],
- [0x6AA7,"8F65"],
- [0x6AA8,"ED42"],
- [0x6AAB,"8DCD"],
- [0x6AAC,"C263"],
- [0x6AAD,"EFE7"],
- [0x6AAE,"C268"],
- [0x6AAF,"C269"],
- [0x6AB1,"9DA8"],
- [0x6AB2,"94F9"],
- [0x6AB3,"C262"],
- [0x6AB4,"EFE6"],
- [0x6AB5,"8DCE"],
- [0x6AB6,"EFE3"],
- [0x6AB7,"EFE4"],
- [0x6AB8,"C266"],
- [0x6AB9,"EFDE"],
- [0x6ABA,"EFE2"],
- [0x6ABB,"C265"],
- [0x6ABD,"EFDF"],
- [0x6ABE,"93EA"],
- [0x6AC2,"C267"],
- [0x6AC3,"C264"],
- [0x6AC5,"EFDD"],
- [0x6AC6,"EFE1"],
- [0x6AC7,"EFE5"],
- [0x6AC8,"FD5F"],
- [0x6AC9,"93F0"],
- [0x6ACA,"9FB6"],
- [0x6ACB,"F251"],
- [0x6ACC,"F24E"],
- [0x6ACD,"F257"],
- [0x6ACF,"F256"],
- [0x6AD0,"F254"],
- [0x6AD1,"F24F"],
- [0x6AD3,"C372"],
- [0x6AD4,"8DCF"],
- [0x6AD8,"9763"],
- [0x6AD9,"F250"],
- [0x6ADA,"C371"],
- [0x6ADB,"C0CD"],
- [0x6ADC,"F253"],
- [0x6ADD,"C370"],
- [0x6ADE,"F258"],
- [0x6ADF,"F252"],
- [0x6AE0,"F24D"],
- [0x6AE1,"EFE0"],
- [0x6AE5,"C36F"],
- [0x6AE7,"F24C"],
- [0x6AE8,"F456"],
- [0x6AEA,"F455"],
- [0x6AEB,"F255"],
- [0x6AEC,"C468"],
- [0x6AEE,"F459"],
- [0x6AEF,"F45A"],
- [0x6AF0,"F454"],
- [0x6AF1,"F458"],
- [0x6AF3,"F453"],
- [0x6AF6,"8DD0"],
- [0x6AF8,"F5D1"],
- [0x6AF9,"F457"],
- [0x6AFA,"C4E7"],
- [0x6AFB,"C4E5"],
- [0x6AFC,"F5CF"],
- [0x6B00,"F5D2"],
- [0x6B02,"F5CE"],
- [0x6B03,"F5D0"],
- [0x6B04,"C4E6"],
- [0x6B05,"93F1"],
- [0x6B08,"F6E5"],
- [0x6B09,"F6E6"],
- [0x6B0A,"C576"],
- [0x6B0B,"F6E4"],
- [0x6B0F,"F7E2"],
- [0x6B10,"C5CF"],
- [0x6B11,"F7E0"],
- [0x6B12,"F7E1"],
- [0x6B13,"F8AC"],
- [0x6B16,"C656"],
- [0x6B17,"F8F3"],
- [0x6B18,"F8F1"],
- [0x6B19,"F8F2"],
- [0x6B1A,"F8F4"],
- [0x6B1D,"FD62"],
- [0x6B1E,"F9BB"],
- [0x6B20,"A4ED"],
- [0x6B21,"A6B8"],
- [0x6B23,"AA59"],
- [0x6B25,"CCE9"],
- [0x6B28,"CF64"],
- [0x6B2C,"D1F5"],
- [0x6B2D,"D1F7"],
- [0x6B2F,"D1F6"],
- [0x6B31,"D1F8"],
- [0x6B32,"B1FD"],
- [0x6B33,"D5D7"],
- [0x6B34,"D1F9"],
- [0x6B35,"FD65"],
- [0x6B36,"D5D6"],
- [0x6B37,"D5D8"],
- [0x6B38,"D5D9"],
- [0x6B39,"D9DA"],
- [0x6B3A,"B4DB"],
- [0x6B3B,"D9DB"],
- [0x6B3C,"D9DD"],
- [0x6B3D,"B4DC"],
- [0x6B3E,"B4DA"],
- [0x6B3F,"D9DC"],
- [0x6B41,"DDFA"],
- [0x6B42,"DDF8"],
- [0x6B43,"DDF7"],
- [0x6B45,"DDF6"],
- [0x6B46,"DDF5"],
- [0x6B47,"B7B2"],
- [0x6B48,"DDF9"],
- [0x6B49,"BA70"],
- [0x6B4A,"E263"],
- [0x6B4B,"E265"],
- [0x6B4C,"BA71"],
- [0x6B4D,"E264"],
- [0x6B4E,"BCDB"],
- [0x6B50,"BCDA"],
- [0x6B51,"E5F0"],
- [0x6B52,"9FDB"],
- [0x6B54,"E9DF"],
- [0x6B55,"E9DE"],
- [0x6B56,"E9E0"],
- [0x6B57,"93F8"],
- [0x6B59,"BEF9"],
- [0x6B5B,"ED4B"],
- [0x6B5C,"C0D3"],
- [0x6B5E,"EFE8"],
- [0x6B5F,"C26A"],
- [0x6B60,"F259"],
- [0x6B61,"C577"],
- [0x6B62,"A4EE"],
- [0x6B63,"A5BF"],
- [0x6B64,"A6B9"],
- [0x6B65,"A842"],
- [0x6B66,"AA5A"],
- [0x6B67,"AA5B"],
- [0x6B6A,"AC6E"],
- [0x6B6D,"D1FA"],
- [0x6B6F,"8BF7"],
- [0x6B72,"B7B3"],
- [0x6B74,"FD66"],
- [0x6B76,"E6D1"],
- [0x6B77,"BEFA"],
- [0x6B78,"C26B"],
- [0x6B79,"A4EF"],
- [0x6B7A,"8BCF"],
- [0x6B7B,"A6BA"],
- [0x6B7E,"CCEB"],
- [0x6B7F,"AA5C"],
- [0x6B80,"CCEA"],
- [0x6B81,"8DD1"],
- [0x6B82,"CF65"],
- [0x6B83,"AC6F"],
- [0x6B84,"CF66"],
- [0x6B86,"AC70"],
- [0x6B88,"D1FC"],
- [0x6B89,"AEEE"],
- [0x6B8A,"AEED"],
- [0x6B8C,"D5DE"],
- [0x6B8D,"D5DC"],
- [0x6B8E,"D5DD"],
- [0x6B8F,"D5DB"],
- [0x6B91,"D5DA"],
- [0x6B94,"D9DE"],
- [0x6B95,"D9E1"],
- [0x6B96,"B4DE"],
- [0x6B97,"D9DF"],
- [0x6B98,"B4DD"],
- [0x6B99,"D9E0"],
- [0x6B9B,"DDFB"],
- [0x6B9E,"E266"],
- [0x6B9F,"E267"],
- [0x6BA0,"E268"],
- [0x6BA2,"E5F3"],
- [0x6BA3,"E5F2"],
- [0x6BA4,"BCDC"],
- [0x6BA5,"E5F1"],
- [0x6BA6,"E5F4"],
- [0x6BA7,"E9E1"],
- [0x6BAA,"E9E2"],
- [0x6BAB,"E9E3"],
- [0x6BAD,"ED4C"],
- [0x6BAE,"C0D4"],
- [0x6BAF,"C26C"],
- [0x6BB0,"F25A"],
- [0x6BB2,"C4E8"],
- [0x6BB3,"C95F"],
- [0x6BB5,"AC71"],
- [0x6BB6,"CF67"],
- [0x6BB7,"AEEF"],
- [0x6BBA,"B1FE"],
- [0x6BBC,"B4DF"],
- [0x6BBD,"D9E2"],
- [0x6BBF,"B7B5"],
- [0x6BC0,"B7B4"],
- [0x6BC1,"8DD2"],
- [0x6BC3,"E269"],
- [0x6BC4,"E26A"],
- [0x6BC5,"BCDD"],
- [0x6BC6,"BCDE"],
- [0x6BC7,"E9E5"],
- [0x6BC8,"E9E4"],
- [0x6BC9,"EFE9"],
- [0x6BCA,"F7E3"],
- [0x6BCB,"A4F0"],
- [0x6BCC,"C960"],
- [0x6BCD,"A5C0"],
- [0x6BCF,"A843"],
- [0x6BD0,"CB48"],
- [0x6BD2,"AC72"],
- [0x6BD3,"B7B6"],
- [0x6BD4,"A4F1"],
- [0x6BD6,"CF68"],
- [0x6BD7,"AC73"],
- [0x6BD8,"CF69"],
- [0x6BDA,"C0D5"],
- [0x6BDB,"A4F2"],
- [0x6BDC,"FD71"],
- [0x6BDE,"CCEC"],
- [0x6BE0,"CF6A"],
- [0x6BE1,"FD6F"],
- [0x6BE2,"D242"],
- [0x6BE3,"D241"],
- [0x6BE4,"D1FE"],
- [0x6BE6,"D1FD"],
- [0x6BE7,"D243"],
- [0x6BE8,"D240"],
- [0x6BEA,"8DD3"],
- [0x6BEB,"B240"],
- [0x6BEC,"B241"],
- [0x6BEF,"B4E0"],
- [0x6BF0,"D9E3"],
- [0x6BF2,"D9E4"],
- [0x6BF3,"D9E5"],
- [0x6BF7,"DE41"],
- [0x6BF8,"DE42"],
- [0x6BF9,"DE40"],
- [0x6BFA,"9FE7"],
- [0x6BFB,"DDFD"],
- [0x6BFC,"DDFE"],
- [0x6BFD,"B7B7"],
- [0x6BFE,"E26B"],
- [0x6BFF,"E5F7"],
- [0x6C00,"E5F6"],
- [0x6C01,"E5F5"],
- [0x6C02,"E5F8"],
- [0x6C03,"E9E7"],
- [0x6C04,"E9E6"],
- [0x6C05,"BEFB"],
- [0x6C06,"E9E8"],
- [0x6C08,"C0D6"],
- [0x6C09,"ED4D"],
- [0x6C0B,"EFEA"],
- [0x6C0C,"F25B"],
- [0x6C0D,"F6E7"],
- [0x6C0F,"A4F3"],
- [0x6C10,"A5C2"],
- [0x6C11,"A5C1"],
- [0x6C13,"AA5D"],
- [0x6C14,"C961"],
- [0x6C15,"C97E"],
- [0x6C16,"A6BB"],
- [0x6C18,"C9F7"],
- [0x6C19,"CB49"],
- [0x6C1A,"CB4A"],
- [0x6C1B,"AA5E"],
- [0x6C1C,"90BD"],
- [0x6C1D,"CCED"],
- [0x6C1F,"AC74"],
- [0x6C20,"CF6B"],
- [0x6C21,"CF6C"],
- [0x6C23,"AEF0"],
- [0x6C24,"AEF4"],
- [0x6C25,"D244"],
- [0x6C26,"AEF3"],
- [0x6C27,"AEF1"],
- [0x6C28,"AEF2"],
- [0x6C2A,"D5DF"],
- [0x6C2B,"B242"],
- [0x6C2C,"B4E3"],
- [0x6C2E,"B4E1"],
- [0x6C2F,"B4E2"],
- [0x6C30,"D9E6"],
- [0x6C31,"9FD0"],
- [0x6C33,"BA72"],
- [0x6C34,"A4F4"],
- [0x6C35,"8BD0"],
- [0x6C36,"C9A1"],
- [0x6C37,"FD72"],
- [0x6C38,"A5C3"],
- [0x6C39,"9CAE"],
- [0x6C3A,"8BD1"],
- [0x6C3B,"C9A4"],
- [0x6C3D,"8ADB"],
- [0x6C3E,"A5C6"],
- [0x6C3F,"C9A3"],
- [0x6C40,"A5C5"],
- [0x6C41,"A5C4"],
- [0x6C42,"A844"],
- [0x6C43,"C9A2"],
- [0x6C46,"C9F8"],
- [0x6C49,"FAE4"],
- [0x6C4A,"C9FC"],
- [0x6C4B,"C9FE"],
- [0x6C4C,"CA40"],
- [0x6C4D,"A6C5"],
- [0x6C4E,"A6C6"],
- [0x6C4F,"C9FB"],
- [0x6C50,"A6C1"],
- [0x6C52,"C9F9"],
- [0x6C54,"C9FD"],
- [0x6C55,"A6C2"],
- [0x6C57,"A6BD"],
- [0x6C58,"95CE"],
- [0x6C59,"A6BE"],
- [0x6C5A,"FD76"],
- [0x6C5B,"A6C4"],
- [0x6C5C,"C9FA"],
- [0x6C5D,"A6BC"],
- [0x6C5E,"A845"],
- [0x6C5F,"A6BF"],
- [0x6C60,"A6C0"],
- [0x6C61,"A6C3"],
- [0x6C65,"CB5B"],
- [0x6C66,"CB59"],
- [0x6C67,"CB4C"],
- [0x6C68,"A851"],
- [0x6C69,"CB53"],
- [0x6C6A,"A84C"],
- [0x6C6B,"CB4D"],
- [0x6C6D,"CB55"],
- [0x6C6E,"FB62"],
- [0x6C6F,"CB52"],
- [0x6C70,"A84F"],
- [0x6C71,"CB51"],
- [0x6C72,"A856"],
- [0x6C73,"CB5A"],
- [0x6C74,"A858"],
- [0x6C75,"8DD4"],
- [0x6C76,"A85A"],
- [0x6C78,"CB4B"],
- [0x6C79,"FD78"],
- [0x6C7A,"A84D"],
- [0x6C7B,"CB5C"],
- [0x6C7D,"A854"],
- [0x6C7E,"A857"],
- [0x6C7F,"8EE3"],
- [0x6C80,"CD45"],
- [0x6C81,"A847"],
- [0x6C82,"A85E"],
- [0x6C83,"A855"],
- [0x6C84,"CB4E"],
- [0x6C85,"A84A"],
- [0x6C86,"A859"],
- [0x6C87,"CB56"],
- [0x6C88,"A848"],
- [0x6C89,"A849"],
- [0x6C8A,"CD43"],
- [0x6C8B,"CB4F"],
- [0x6C8C,"A850"],
- [0x6C8D,"A85B"],
- [0x6C8E,"CB5D"],
- [0x6C8F,"CB50"],
- [0x6C90,"A84E"],
- [0x6C92,"A853"],
- [0x6C93,"CCEE"],
- [0x6C94,"A85C"],
- [0x6C95,"CB57"],
- [0x6C96,"A852"],
- [0x6C98,"A85D"],
- [0x6C99,"A846"],
- [0x6C9A,"CB54"],
- [0x6C9B,"A84B"],
- [0x6C9C,"CB58"],
- [0x6C9D,"CD44"],
- [0x6C9F,"9076"],
- [0x6CA2,"98C6"],
- [0x6CAA,"8DD5"],
- [0x6CAB,"AA6A"],
- [0x6CAC,"AA7A"],
- [0x6CAD,"CCF5"],
- [0x6CAE,"AA71"],
- [0x6CAF,"97D1"],
- [0x6CB0,"CD4B"],
- [0x6CB1,"AA62"],
- [0x6CB2,"9EB6"],
- [0x6CB3,"AA65"],
- [0x6CB4,"CD42"],
- [0x6CB6,"CCF3"],
- [0x6CB7,"CCF7"],
- [0x6CB8,"AA6D"],
- [0x6CB9,"AA6F"],
- [0x6CBA,"CCFA"],
- [0x6CBB,"AA76"],
- [0x6CBC,"AA68"],
- [0x6CBD,"AA66"],
- [0x6CBE,"AA67"],
- [0x6CBF,"AA75"],
- [0x6CC0,"CD47"],
- [0x6CC1,"AA70"],
- [0x6CC2,"CCF9"],
- [0x6CC3,"CCFB"],
- [0x6CC4,"AA6E"],
- [0x6CC5,"AA73"],
- [0x6CC6,"CCFC"],
- [0x6CC7,"CD4A"],
- [0x6CC9,"AC75"],
- [0x6CCA,"AA79"],
- [0x6CCB,"FAC7"],
- [0x6CCC,"AA63"],
- [0x6CCD,"CD49"],
- [0x6CCE,"A042"],
- [0x6CCF,"CD4D"],
- [0x6CD0,"CCF8"],
- [0x6CD1,"CD4F"],
- [0x6CD2,"CD40"],
- [0x6CD3,"AA6C"],
- [0x6CD4,"CCF4"],
- [0x6CD5,"AA6B"],
- [0x6CD6,"AA7D"],
- [0x6CD7,"AA72"],
- [0x6CD9,"CCF2"],
- [0x6CDA,"CF75"],
- [0x6CDB,"AA78"],
- [0x6CDC,"AA7C"],
- [0x6CDD,"CD41"],
- [0x6CDE,"CD46"],
- [0x6CDF,"9873"],
- [0x6CE0,"AA7E"],
- [0x6CE1,"AA77"],
- [0x6CE2,"AA69"],
- [0x6CE3,"AA5F"],
- [0x6CE5,"AA64"],
- [0x6CE7,"CCF6"],
- [0x6CE8,"AA60"],
- [0x6CE9,"CD4E"],
- [0x6CEA,"9FFC"],
- [0x6CEB,"CCF0"],
- [0x6CEC,"CCEF"],
- [0x6CED,"CCFD"],
- [0x6CEE,"CCF1"],
- [0x6CEF,"AA7B"],
- [0x6CF0,"AEF5"],
- [0x6CF1,"AA74"],
- [0x6CF2,"CCFE"],
- [0x6CF3,"AA61"],
- [0x6CF5,"ACA6"],
- [0x6CF9,"CD4C"],
- [0x6CFF,"8CA5"],
- [0x6D00,"CF7C"],
- [0x6D01,"CFA1"],
- [0x6D02,"8DD7"],
- [0x6D03,"CFA4"],
- [0x6D04,"CF77"],
- [0x6D05,"92FB"],
- [0x6D06,"8DD8"],
- [0x6D07,"CFA7"],
- [0x6D08,"CFAA"],
- [0x6D09,"CFAC"],
- [0x6D0A,"CF74"],
- [0x6D0B,"AC76"],
- [0x6D0C,"AC7B"],
- [0x6D0D,"D249"],
- [0x6D0E,"ACAD"],
- [0x6D0F,"CFA5"],
- [0x6D10,"CFAD"],
- [0x6D11,"CF7B"],
- [0x6D12,"CF73"],
- [0x6D16,"D264"],
- [0x6D17,"AC7E"],
- [0x6D18,"CFA2"],
- [0x6D19,"CF78"],
- [0x6D1A,"CF7A"],
- [0x6D1B,"ACA5"],
- [0x6D1D,"CF7D"],
- [0x6D1E,"AC7D"],
- [0x6D1F,"CF70"],
- [0x6D20,"CFA8"],
- [0x6D22,"CFAB"],
- [0x6D24,"944F"],
- [0x6D25,"AC7A"],
- [0x6D26,"8DD9"],
- [0x6D27,"ACA8"],
- [0x6D28,"CF6D"],
- [0x6D29,"ACAA"],
- [0x6D2A,"AC78"],
- [0x6D2B,"ACAE"],
- [0x6D2C,"CFA9"],
- [0x6D2D,"CF6F"],
- [0x6D2E,"ACAB"],
- [0x6D2F,"D25E"],
- [0x6D30,"CD48"],
- [0x6D31,"AC7C"],
- [0x6D32,"AC77"],
- [0x6D33,"CF76"],
- [0x6D34,"CF6E"],
- [0x6D35,"ACAC"],
- [0x6D36,"ACA4"],
- [0x6D37,"CFA3"],
- [0x6D38,"ACA9"],
- [0x6D39,"ACA7"],
- [0x6D3A,"CF79"],
- [0x6D3B,"ACA1"],
- [0x6D3C,"CF71"],
- [0x6D3D,"ACA2"],
- [0x6D3E,"ACA3"],
- [0x6D3F,"CF72"],
- [0x6D40,"CFA6"],
- [0x6D41,"AC79"],
- [0x6D42,"CF7E"],
- [0x6D4E,"896B"],
- [0x6D57,"97CE"],
- [0x6D58,"D24C"],
- [0x6D59,"AEFD"],
- [0x6D5A,"AF43"],
- [0x6D5B,"FAF3"],
- [0x6D5C,"FDAE"],
- [0x6D5E,"D255"],
- [0x6D5F,"D25B"],
- [0x6D60,"D257"],
- [0x6D61,"D24A"],
- [0x6D62,"D24D"],
- [0x6D63,"D246"],
- [0x6D64,"D247"],
- [0x6D65,"AF4A"],
- [0x6D66,"AEFA"],
- [0x6D67,"D256"],
- [0x6D68,"D25F"],
- [0x6D69,"AF45"],
- [0x6D6A,"AEF6"],
- [0x6D6C,"AF40"],
- [0x6D6D,"D24E"],
- [0x6D6E,"AF42"],
- [0x6D6F,"D24F"],
- [0x6D70,"D259"],
- [0x6D71,"FBAF"],
- [0x6D72,"92B7"],
- [0x6D74,"AF44"],
- [0x6D75,"D268"],
- [0x6D76,"D248"],
- [0x6D77,"AEFC"],
- [0x6D78,"AEFB"],
- [0x6D79,"AF48"],
- [0x6D7A,"D245"],
- [0x6D7B,"D266"],
- [0x6D7C,"D25A"],
- [0x6D7D,"D267"],
- [0x6D7E,"D261"],
- [0x6D7F,"D253"],
- [0x6D80,"D262"],
- [0x6D81,"8DDA"],
- [0x6D82,"D25C"],
- [0x6D83,"D265"],
- [0x6D84,"D263"],
- [0x6D85,"AF49"],
- [0x6D86,"D254"],
- [0x6D87,"AEF9"],
- [0x6D88,"AEF8"],
- [0x6D89,"AF41"],
- [0x6D8A,"AF47"],
- [0x6D8B,"D260"],
- [0x6D8C,"AF46"],
- [0x6D8D,"D251"],
- [0x6D8E,"B243"],
- [0x6D8F,"9C5A"],
- [0x6D90,"D269"],
- [0x6D91,"D250"],
- [0x6D92,"D24B"],
- [0x6D93,"AEFE"],
- [0x6D94,"AF4B"],
- [0x6D95,"AEF7"],
- [0x6D96,"FDAD"],
- [0x6D97,"D258"],
- [0x6D98,"D25D"],
- [0x6DA4,"8DDC"],
- [0x6DA5,"9444"],
- [0x6DAA,"B265"],
- [0x6DAB,"D5E1"],
- [0x6DAC,"D5E5"],
- [0x6DAE,"B252"],
- [0x6DAF,"B250"],
- [0x6DB1,"8DDD"],
- [0x6DB2,"B247"],
- [0x6DB3,"D5E3"],
- [0x6DB4,"D5E2"],
- [0x6DB5,"B25B"],
- [0x6DB7,"D5E8"],
- [0x6DB8,"B255"],
- [0x6DB9,"A0D6"],
- [0x6DBA,"D5FA"],
- [0x6DBB,"D647"],
- [0x6DBC,"B244"],
- [0x6DBD,"D5F7"],
- [0x6DBE,"D5F0"],
- [0x6DBF,"B267"],
- [0x6DC0,"D5E0"],
- [0x6DC2,"D5FC"],
- [0x6DC4,"B264"],
- [0x6DC5,"B258"],
- [0x6DC6,"B263"],
- [0x6DC7,"B24E"],
- [0x6DC8,"D5EC"],
- [0x6DC9,"D5FE"],
- [0x6DCA,"D5F6"],
- [0x6DCB,"B24F"],
- [0x6DCC,"B249"],
- [0x6DCD,"D645"],
- [0x6DCF,"D5FD"],
- [0x6DD0,"D640"],
- [0x6DD1,"B251"],
- [0x6DD2,"B259"],
- [0x6DD3,"D642"],
- [0x6DD4,"D5EA"],
- [0x6DD5,"D5FB"],
- [0x6DD6,"D5EF"],
- [0x6DD7,"D644"],
- [0x6DD8,"B25E"],
- [0x6DD9,"B246"],
- [0x6DDA,"B25C"],
- [0x6DDB,"D5F4"],
- [0x6DDC,"D5F2"],
- [0x6DDD,"D5F3"],
- [0x6DDE,"B253"],
- [0x6DDF,"D5EE"],
- [0x6DE0,"D5ED"],
- [0x6DE1,"B248"],
- [0x6DE2,"D5E7"],
- [0x6DE3,"D646"],
- [0x6DE4,"B24A"],
- [0x6DE5,"D5F1"],
- [0x6DE6,"B268"],
- [0x6DE8,"B262"],
- [0x6DE9,"D5E6"],
- [0x6DEA,"B25F"],
- [0x6DEB,"B25D"],
- [0x6DEC,"B266"],
- [0x6DED,"D5F8"],
- [0x6DEE,"B261"],
- [0x6DEF,"D252"],
- [0x6DF0,"D5F9"],
- [0x6DF1,"B260"],
- [0x6DF2,"D641"],
- [0x6DF3,"B245"],
- [0x6DF4,"D5F5"],
- [0x6DF5,"B257"],
- [0x6DF6,"D5E9"],
- [0x6DF7,"B256"],
- [0x6DF9,"B254"],
- [0x6DFA,"B24C"],
- [0x6DFB,"B24B"],
- [0x6DFC,"D9E7"],
- [0x6DFD,"D643"],
- [0x6DFE,"8C41"],
- [0x6E00,"D5EB"],
- [0x6E02,"97D5"],
- [0x6E03,"D9FC"],
- [0x6E04,"944A"],
- [0x6E05,"B24D"],
- [0x6E0A,"944D"],
- [0x6E0F,"97CB"],
- [0x6E15,"8DDE"],
- [0x6E18,"8DDF"],
- [0x6E19,"B541"],
- [0x6E1A,"B25A"],
- [0x6E1B,"B4EE"],
- [0x6E1C,"D9F6"],
- [0x6E1D,"B4FC"],
- [0x6E1F,"D9EA"],
- [0x6E20,"B4EB"],
- [0x6E21,"B4E7"],
- [0x6E22,"DA49"],
- [0x6E23,"B4ED"],
- [0x6E24,"B4F1"],
- [0x6E25,"B4EC"],
- [0x6E26,"B4F5"],
- [0x6E27,"DA4D"],
- [0x6E28,"DA44"],
- [0x6E29,"8DE0"],
- [0x6E2A,"FEF9"],
- [0x6E2B,"D9F1"],
- [0x6E2C,"B4FA"],
- [0x6E2D,"B4F4"],
- [0x6E2E,"D9FD"],
- [0x6E2F,"B4E4"],
- [0x6E30,"DA4A"],
- [0x6E31,"DA43"],
- [0x6E32,"B4E8"],
- [0x6E33,"D9F7"],
- [0x6E34,"B4F7"],
- [0x6E35,"DA55"],
- [0x6E36,"DA56"],
- [0x6E38,"B4E5"],
- [0x6E39,"DA48"],
- [0x6E3A,"B4F9"],
- [0x6E3B,"D9FB"],
- [0x6E3C,"D9ED"],
- [0x6E3D,"D9EE"],
- [0x6E3E,"B4FD"],
- [0x6E3F,"D9F2"],
- [0x6E40,"D9F9"],
- [0x6E41,"D9F3"],
- [0x6E43,"B4FB"],
- [0x6E44,"B544"],
- [0x6E45,"D9EF"],
- [0x6E46,"D9E8"],
- [0x6E47,"D9E9"],
- [0x6E49,"D9EB"],
- [0x6E4A,"B4EA"],
- [0x6E4B,"D9F8"],
- [0x6E4D,"B4F8"],
- [0x6E4E,"B542"],
- [0x6E4F,"FDC0"],
- [0x6E50,"FCF9"],
- [0x6E51,"D9FA"],
- [0x6E52,"DA53"],
- [0x6E53,"DA4B"],
- [0x6E54,"B4E6"],
- [0x6E55,"DA51"],
- [0x6E56,"B4F2"],
- [0x6E57,"8CDD"],
- [0x6E58,"B4F0"],
- [0x6E59,"FB7E"],
- [0x6E5A,"DA57"],
- [0x6E5B,"B4EF"],
- [0x6E5C,"DA41"],
- [0x6E5D,"D9F4"],
- [0x6E5E,"D9FE"],
- [0x6E5F,"B547"],
- [0x6E60,"DA45"],
- [0x6E61,"DA42"],
- [0x6E62,"D9F0"],
- [0x6E63,"B543"],
- [0x6E64,"DA4F"],
- [0x6E65,"DA4C"],
- [0x6E66,"DA54"],
- [0x6E67,"B4E9"],
- [0x6E68,"DA40"],
- [0x6E69,"B546"],
- [0x6E6B,"DA47"],
- [0x6E6E,"B4F3"],
- [0x6E6F,"B4F6"],
- [0x6E71,"DA46"],
- [0x6E72,"B545"],
- [0x6E73,"D9F5"],
- [0x6E74,"D5E4"],
- [0x6E76,"92B3"],
- [0x6E77,"DA50"],
- [0x6E78,"DA4E"],
- [0x6E79,"DA52"],
- [0x6E7C,"FDAF"],
- [0x6E86,"8DE1"],
- [0x6E88,"D9EC"],
- [0x6E89,"B540"],
- [0x6E8B,"95D3"],
- [0x6E8D,"DE61"],
- [0x6E8E,"DE60"],
- [0x6E8F,"DE46"],
- [0x6E90,"B7BD"],
- [0x6E92,"DE5F"],
- [0x6E93,"DE49"],
- [0x6E94,"DE4A"],
- [0x6E96,"B7C7"],
- [0x6E97,"DE68"],
- [0x6E98,"B7C2"],
- [0x6E99,"DE5E"],
- [0x6E9A,"89C1"],
- [0x6E9B,"DE43"],
- [0x6E9C,"B7C8"],
- [0x6E9D,"B7BE"],
- [0x6E9E,"DE52"],
- [0x6E9F,"DE48"],
- [0x6EA0,"DE4B"],
- [0x6EA1,"DE63"],
- [0x6EA2,"B7B8"],
- [0x6EA3,"DE6A"],
- [0x6EA4,"DE62"],
- [0x6EA5,"B7C1"],
- [0x6EA6,"DE57"],
- [0x6EA7,"B7CC"],
- [0x6EAA,"B7CB"],
- [0x6EAB,"B7C5"],
- [0x6EAE,"DE69"],
- [0x6EAF,"B7B9"],
- [0x6EB0,"DE55"],
- [0x6EB1,"DE4C"],
- [0x6EB2,"DE59"],
- [0x6EB3,"DE65"],
- [0x6EB4,"B7CD"],
- [0x6EB5,"FD68"],
- [0x6EB6,"B7BB"],
- [0x6EB7,"DE54"],
- [0x6EB8,"9CB7"],
- [0x6EB9,"DE4D"],
- [0x6EBA,"B7C4"],
- [0x6EBB,"8DE3"],
- [0x6EBC,"B7C3"],
- [0x6EBD,"DE50"],
- [0x6EBE,"DE5A"],
- [0x6EBF,"DE64"],
- [0x6EC0,"DE47"],
- [0x6EC1,"DE51"],
- [0x6EC2,"B7BC"],
- [0x6EC3,"DE5B"],
- [0x6EC4,"B7C9"],
- [0x6EC5,"B7C0"],
- [0x6EC6,"DE4E"],
- [0x6EC7,"B7BF"],
- [0x6EC8,"DE45"],
- [0x6EC9,"DE53"],
- [0x6ECA,"DE67"],
- [0x6ECB,"B4FE"],
- [0x6ECC,"BAB0"],
- [0x6ECD,"DE56"],
- [0x6ECE,"E26C"],
- [0x6ECF,"DE58"],
- [0x6ED0,"DE66"],
- [0x6ED1,"B7C6"],
- [0x6ED2,"DE4F"],
- [0x6ED3,"B7BA"],
- [0x6ED4,"B7CA"],
- [0x6ED5,"BCF0"],
- [0x6ED6,"DE44"],
- [0x6ED8,"DE5D"],
- [0x6ED9,"FAC0"],
- [0x6EDA,"8DE5"],
- [0x6EDB,"FA64"],
- [0x6EDC,"DE5C"],
- [0x6EDD,"8947"],
- [0x6EE2,"8DE4"],
- [0x6EE8,"8DE7"],
- [0x6EE9,"8DE8"],
- [0x6EEB,"E2AA"],
- [0x6EEC,"BAAD"],
- [0x6EED,"E27D"],
- [0x6EEE,"E2A4"],
- [0x6EEF,"BAA2"],
- [0x6EF1,"E26E"],
- [0x6EF2,"BAAF"],
- [0x6EF4,"BA77"],
- [0x6EF5,"E26D"],
- [0x6EF6,"E2B0"],
- [0x6EF7,"BAB1"],
- [0x6EF8,"E271"],
- [0x6EF9,"E2A3"],
- [0x6EFA,"FDC7"],
- [0x6EFB,"E273"],
- [0x6EFC,"E2B3"],
- [0x6EFD,"E2AF"],
- [0x6EFE,"BA75"],
- [0x6EFF,"BAA1"],
- [0x6F00,"E653"],
- [0x6F01,"BAAE"],
- [0x6F02,"BA7D"],
- [0x6F03,"E26F"],
- [0x6F04,"FDB0"],
- [0x6F05,"E2AE"],
- [0x6F06,"BAA3"],
- [0x6F07,"E2AB"],
- [0x6F08,"E2B8"],
- [0x6F09,"E275"],
- [0x6F0A,"E27E"],
- [0x6F0B,"9445"],
- [0x6F0C,"97D6"],
- [0x6F0D,"E2B6"],
- [0x6F0E,"E2AC"],
- [0x6F0F,"BA7C"],
- [0x6F12,"E27C"],
- [0x6F13,"BA76"],
- [0x6F14,"BA74"],
- [0x6F15,"BAA8"],
- [0x6F16,"FCC6"],
- [0x6F17,"9844"],
- [0x6F18,"E27A"],
- [0x6F19,"E277"],
- [0x6F1A,"E278"],
- [0x6F1C,"E2B2"],
- [0x6F1E,"E2B7"],
- [0x6F1F,"E2B5"],
- [0x6F20,"BA7A"],
- [0x6F21,"E2B9"],
- [0x6F22,"BA7E"],
- [0x6F23,"BAA7"],
- [0x6F24,"8DE9"],
- [0x6F25,"E270"],
- [0x6F26,"E5FA"],
- [0x6F27,"E279"],
- [0x6F29,"BA78"],
- [0x6F2A,"BAAC"],
- [0x6F2B,"BAA9"],
- [0x6F2C,"BA7B"],
- [0x6F2D,"E2A5"],
- [0x6F2E,"E274"],
- [0x6F2F,"BAAA"],
- [0x6F30,"E2A7"],
- [0x6F31,"BAA4"],
- [0x6F32,"BAA6"],
- [0x6F33,"BA73"],
- [0x6F34,"8DEA"],
- [0x6F35,"E2A9"],
- [0x6F36,"E2A1"],
- [0x6F37,"E272"],
- [0x6F38,"BAA5"],
- [0x6F39,"E2B1"],
- [0x6F3A,"E2B4"],
- [0x6F3B,"E27B"],
- [0x6F3C,"E2A8"],
- [0x6F3D,"FE50"],
- [0x6F3E,"BA79"],
- [0x6F3F,"BCDF"],
- [0x6F40,"E2A6"],
- [0x6F41,"E5F9"],
- [0x6F43,"E2AD"],
- [0x6F44,"FDCC"],
- [0x6F4E,"E276"],
- [0x6F4F,"E644"],
- [0x6F50,"E64E"],
- [0x6F51,"BCE2"],
- [0x6F52,"E64D"],
- [0x6F53,"E659"],
- [0x6F54,"BCE4"],
- [0x6F55,"E64B"],
- [0x6F56,"9DA7"],
- [0x6F57,"E64F"],
- [0x6F58,"BCEF"],
- [0x6F5A,"E646"],
- [0x6F5B,"BCE7"],
- [0x6F5C,"FDCD"],
- [0x6F5D,"E652"],
- [0x6F5E,"E9F0"],
- [0x6F5F,"BCF3"],
- [0x6F60,"BCF2"],
- [0x6F61,"E654"],
- [0x6F62,"E643"],
- [0x6F63,"E65E"],
- [0x6F64,"BCED"],
- [0x6F66,"BCE3"],
- [0x6F67,"E657"],
- [0x6F69,"E65B"],
- [0x6F6A,"E660"],
- [0x6F6B,"E655"],
- [0x6F6C,"E649"],
- [0x6F6D,"BCE6"],
- [0x6F6E,"BCE9"],
- [0x6F6F,"BCF1"],
- [0x6F70,"BCEC"],
- [0x6F72,"E64C"],
- [0x6F73,"E2A2"],
- [0x6F74,"FDCF"],
- [0x6F76,"E648"],
- [0x6F77,"E65F"],
- [0x6F78,"BCE8"],
- [0x6F79,"95D2"],
- [0x6F7A,"BCEB"],
- [0x6F7B,"E661"],
- [0x6F7C,"BCE0"],
- [0x6F7D,"E656"],
- [0x6F7E,"E5FB"],
- [0x6F7F,"E65C"],
- [0x6F80,"C0DF"],
- [0x6F81,"8DED"],
- [0x6F82,"E64A"],
- [0x6F84,"BCE1"],
- [0x6F85,"E645"],
- [0x6F86,"BCE5"],
- [0x6F87,"E5FC"],
- [0x6F88,"BAAB"],
- [0x6F89,"E641"],
- [0x6F8A,"FCBA"],
- [0x6F8B,"E65A"],
- [0x6F8C,"E642"],
- [0x6F8D,"E640"],
- [0x6F8E,"BCEA"],
- [0x6F90,"E658"],
- [0x6F92,"E5FE"],
- [0x6F93,"E651"],
- [0x6F94,"E650"],
- [0x6F95,"E65D"],
- [0x6F96,"E647"],
- [0x6F97,"BCEE"],
- [0x6F9D,"FDC5"],
- [0x6F9E,"E9F3"],
- [0x6F9F,"FDD2"],
- [0x6FA0,"BF49"],
- [0x6FA1,"BEFE"],
- [0x6FA2,"EA40"],
- [0x6FA3,"E9EB"],
- [0x6FA4,"BF41"],
- [0x6FA5,"E9F7"],
- [0x6FA6,"BF48"],
- [0x6FA7,"BF43"],
- [0x6FA8,"E9F5"],
- [0x6FA9,"ED4F"],
- [0x6FAA,"E9FB"],
- [0x6FAB,"EA42"],
- [0x6FAC,"E9FA"],
- [0x6FAD,"E9E9"],
- [0x6FAE,"E9F8"],
- [0x6FAF,"EA44"],
- [0x6FB0,"EA46"],
- [0x6FB1,"BEFD"],
- [0x6FB2,"EA45"],
- [0x6FB3,"BF44"],
- [0x6FB4,"BF4A"],
- [0x6FB5,"9CDC"],
- [0x6FB6,"BF47"],
- [0x6FB8,"E9FE"],
- [0x6FB9,"BF46"],
- [0x6FBA,"E9F9"],
- [0x6FBB,"95CF"],
- [0x6FBC,"E9ED"],
- [0x6FBD,"E9F2"],
- [0x6FBE,"8DEE"],
- [0x6FBF,"E9FD"],
- [0x6FC0,"BF45"],
- [0x6FC1,"BF42"],
- [0x6FC2,"BEFC"],
- [0x6FC3,"BF40"],
- [0x6FC4,"E9F1"],
- [0x6FC6,"E5FD"],
- [0x6FC7,"E9EC"],
- [0x6FC8,"E9EF"],
- [0x6FC9,"EA41"],
- [0x6FCA,"E9F4"],
- [0x6FCB,"E9EA"],
- [0x6FCC,"ED4E"],
- [0x6FCD,"EA43"],
- [0x6FCE,"E9EE"],
- [0x6FCF,"E9FC"],
- [0x6FD3,"FDD4"],
- [0x6FD4,"ED51"],
- [0x6FD5,"C0E3"],
- [0x6FD8,"C0D7"],
- [0x6FD9,"96EC"],
- [0x6FDA,"96EB"],
- [0x6FDB,"C0DB"],
- [0x6FDC,"ED53"],
- [0x6FDD,"ED59"],
- [0x6FDE,"ED57"],
- [0x6FDF,"C0D9"],
- [0x6FE0,"C0DA"],
- [0x6FE1,"C0E1"],
- [0x6FE2,"ED5A"],
- [0x6FE3,"ED52"],
- [0x6FE4,"C0DC"],
- [0x6FE6,"ED56"],
- [0x6FE7,"ED55"],
- [0x6FE8,"ED5B"],
- [0x6FE9,"C0E2"],
- [0x6FEB,"C0DD"],
- [0x6FEC,"C0E0"],
- [0x6FED,"ED54"],
- [0x6FEE,"C0E4"],
- [0x6FEF,"C0DE"],
- [0x6FF0,"C0E5"],
- [0x6FF1,"C0D8"],
- [0x6FF2,"ED58"],
- [0x6FF4,"ED50"],
- [0x6FF6,"90B6"],
- [0x6FF7,"EFF7"],
- [0x6FF8,"FDC3"],
- [0x6FFA,"C271"],
- [0x6FFB,"EFF4"],
- [0x6FFC,"EFF6"],
- [0x6FFE,"C26F"],
- [0x6FFF,"EFF2"],
- [0x7000,"EFF3"],
- [0x7001,"EFEE"],
- [0x7003,"98AB"],
- [0x7004,"E9F6"],
- [0x7005,"EFEF"],
- [0x7006,"C270"],
- [0x7007,"EFEB"],
- [0x7009,"C26D"],
- [0x700A,"EFF8"],
- [0x700B,"C26E"],
- [0x700C,"EFEC"],
- [0x700D,"EFED"],
- [0x700E,"EFF1"],
- [0x700F,"C273"],
- [0x7011,"C272"],
- [0x7014,"EFF0"],
- [0x7015,"C378"],
- [0x7016,"F25F"],
- [0x7017,"F265"],
- [0x7018,"C379"],
- [0x7019,"F25C"],
- [0x701A,"C376"],
- [0x701B,"C373"],
- [0x701C,"F267"],
- [0x701D,"C377"],
- [0x701E,"96EE"],
- [0x701F,"C374"],
- [0x7020,"F25E"],
- [0x7021,"F261"],
- [0x7022,"F262"],
- [0x7023,"F263"],
- [0x7024,"F266"],
- [0x7026,"EFF5"],
- [0x7027,"F25D"],
- [0x7028,"C375"],
- [0x7029,"F264"],
- [0x702A,"F268"],
- [0x702B,"F260"],
- [0x702C,"8DF4"],
- [0x702F,"F45D"],
- [0x7030,"C46A"],
- [0x7031,"F460"],
- [0x7032,"C46B"],
- [0x7033,"F468"],
- [0x7034,"F45F"],
- [0x7035,"F45C"],
- [0x7037,"F45E"],
- [0x7038,"F462"],
- [0x7039,"F465"],
- [0x703A,"F464"],
- [0x703B,"F467"],
- [0x703C,"F45B"],
- [0x703E,"C469"],
- [0x703F,"F463"],
- [0x7040,"F466"],
- [0x7041,"F469"],
- [0x7042,"F461"],
- [0x7043,"F5D3"],
- [0x7044,"F5D4"],
- [0x7045,"F5D8"],
- [0x7046,"F5D9"],
- [0x7048,"F5D6"],
- [0x7049,"F5D7"],
- [0x704A,"F5D5"],
- [0x704B,"FDE0"],
- [0x704C,"C4E9"],
- [0x704D,"8C67"],
- [0x7050,"8DF6"],
- [0x7051,"C578"],
- [0x7052,"F6EB"],
- [0x7054,"8DF7"],
- [0x7055,"F6E8"],
- [0x7056,"F6E9"],
- [0x7057,"F6EA"],
- [0x7058,"C579"],
- [0x705A,"F7E5"],
- [0x705B,"F7E4"],
- [0x705C,"8FFA"],
- [0x705D,"F8AF"],
- [0x705E,"C5F4"],
- [0x705F,"F8AD"],
- [0x7060,"F8B0"],
- [0x7061,"F8AE"],
- [0x7062,"F8F5"],
- [0x7063,"C657"],
- [0x7064,"C665"],
- [0x7065,"F9A3"],
- [0x7066,"F96C"],
- [0x7067,"97D0"],
- [0x7068,"F9A2"],
- [0x7069,"F9D0"],
- [0x706A,"F9D1"],
- [0x706B,"A4F5"],
- [0x706C,"8BD2"],
- [0x706E,"87DE"],
- [0x706F,"8DF8"],
- [0x7070,"A6C7"],
- [0x7071,"CA41"],
- [0x7074,"CB5E"],
- [0x7075,"90D9"],
- [0x7076,"A85F"],
- [0x7077,"8C47"],
- [0x7078,"A862"],
- [0x7079,"FAF0"],
- [0x707A,"CB5F"],
- [0x707C,"A860"],
- [0x707D,"A861"],
- [0x707E,"FDE1"],
- [0x707F,"8DF9"],
- [0x7081,"FDE3"],
- [0x7082,"CD58"],
- [0x7083,"CD5A"],
- [0x7084,"CD55"],
- [0x7085,"CD52"],
- [0x7086,"CD54"],
- [0x7089,"8DFA"],
- [0x708A,"AAA4"],
- [0x708B,"FB63"],
- [0x708E,"AAA2"],
- [0x708F,"90A6"],
- [0x7091,"CD56"],
- [0x7092,"AAA3"],
- [0x7093,"CD53"],
- [0x7094,"CD50"],
- [0x7095,"AAA1"],
- [0x7096,"CD57"],
- [0x7098,"CD51"],
- [0x7099,"AAA5"],
- [0x709A,"CD59"],
- [0x709F,"CFAF"],
- [0x70A0,"9970"],
- [0x70A1,"CFB3"],
- [0x70A3,"91EB"],
- [0x70A4,"ACB7"],
- [0x70A5,"9770"],
- [0x70A6,"986F"],
- [0x70A7,"FDE2"],
- [0x70A9,"CFB6"],
- [0x70AB,"ACAF"],
- [0x70AC,"ACB2"],
- [0x70AD,"ACB4"],
- [0x70AE,"ACB6"],
- [0x70AF,"ACB3"],
- [0x70B0,"CFB2"],
- [0x70B1,"CFB1"],
- [0x70B3,"ACB1"],
- [0x70B4,"CFB4"],
- [0x70B5,"CFB5"],
- [0x70B7,"CFAE"],
- [0x70B8,"ACB5"],
- [0x70B9,"98F2"],
- [0x70BA,"ACB0"],
- [0x70BB,"9AFC"],
- [0x70BC,"896C"],
- [0x70BD,"FDFD"],
- [0x70BE,"CFB0"],
- [0x70C0,"995E"],
- [0x70C4,"95BD"],
- [0x70C5,"D277"],
- [0x70C6,"D278"],
- [0x70C7,"D279"],
- [0x70C8,"AF50"],
- [0x70CA,"AF4C"],
- [0x70CB,"D26E"],
- [0x70CC,"FDE4"],
- [0x70CD,"D276"],
- [0x70CE,"D27B"],
- [0x70CF,"AF51"],
- [0x70D0,"91E6"],
- [0x70D1,"D26C"],
- [0x70D2,"D272"],
- [0x70D3,"D26B"],
- [0x70D4,"D275"],
- [0x70D5,"FDE5"],
- [0x70D6,"FDE6"],
- [0x70D7,"D271"],
- [0x70D8,"AF4D"],
- [0x70D9,"AF4F"],
- [0x70DA,"D27A"],
- [0x70DC,"D26A"],
- [0x70DD,"D26D"],
- [0x70DE,"D273"],
- [0x70DF,"FDE7"],
- [0x70E0,"D274"],
- [0x70E1,"D27C"],
- [0x70E2,"D270"],
- [0x70E4,"AF4E"],
- [0x70EF,"B26D"],
- [0x70F0,"D64E"],
- [0x70F1,"9454"],
- [0x70F3,"D650"],
- [0x70F4,"D64C"],
- [0x70F5,"99B8"],
- [0x70F6,"D658"],
- [0x70F7,"D64A"],
- [0x70F8,"D657"],
- [0x70F9,"B269"],
- [0x70FA,"D648"],
- [0x70FB,"DA5B"],
- [0x70FC,"D652"],
- [0x70FD,"B26C"],
- [0x70FE,"97E9"],
- [0x70FF,"D653"],
- [0x7100,"D656"],
- [0x7102,"D65A"],
- [0x7104,"D64F"],
- [0x7105,"9346"],
- [0x7106,"D654"],
- [0x7109,"B26A"],
- [0x710A,"B26B"],
- [0x710B,"D659"],
- [0x710C,"D64D"],
- [0x710D,"D649"],
- [0x710E,"D65B"],
- [0x7110,"D651"],
- [0x7113,"D655"],
- [0x7117,"D64B"],
- [0x7119,"B548"],
- [0x711A,"B549"],
- [0x711B,"DA65"],
- [0x711C,"B54F"],
- [0x711D,"9863"],
- [0x711E,"DA59"],
- [0x711F,"DA62"],
- [0x7120,"DA58"],
- [0x7121,"B54C"],
- [0x7122,"DA60"],
- [0x7123,"DA5E"],
- [0x7125,"DA5F"],
- [0x7126,"B54A"],
- [0x7128,"DA63"],
- [0x7129,"95BC"],
- [0x712B,"FDED"],
- [0x712C,"FDF7"],
- [0x712E,"DA5C"],
- [0x712F,"DA5A"],
- [0x7130,"B54B"],
- [0x7131,"DA5D"],
- [0x7132,"DA61"],
- [0x7133,"9870"],
- [0x7134,"96F6"],
- [0x7135,"8EA9"],
- [0x7136,"B54D"],
- [0x713A,"DA64"],
- [0x713B,"9451"],
- [0x713E,"8E43"],
- [0x7140,"8B5A"],
- [0x7141,"DE70"],
- [0x7142,"DE77"],
- [0x7143,"DE79"],
- [0x7144,"DEA1"],
- [0x7145,"FDEE"],
- [0x7146,"B7DA"],
- [0x7147,"DE6B"],
- [0x7149,"B7D2"],
- [0x714A,"FDF0"],
- [0x714B,"DE7A"],
- [0x714C,"B7D7"],
- [0x714D,"DEA2"],
- [0x714E,"B7CE"],
- [0x714F,"FDF4"],
- [0x7150,"DE7D"],
- [0x7151,"9BF5"],
- [0x7152,"DE6D"],
- [0x7153,"DE7E"],
- [0x7154,"DE6C"],
- [0x7156,"B7DC"],
- [0x7157,"8CEE"],
- [0x7158,"DE78"],
- [0x7159,"B7CF"],
- [0x715A,"DEA3"],
- [0x715C,"B7D4"],
- [0x715D,"DE71"],
- [0x715E,"B7D9"],
- [0x715F,"DE7C"],
- [0x7160,"DE6F"],
- [0x7161,"DE76"],
- [0x7162,"DE72"],
- [0x7163,"DE6E"],
- [0x7164,"B7D1"],
- [0x7165,"B7D8"],
- [0x7166,"B7D6"],
- [0x7167,"B7D3"],
- [0x7168,"B7DB"],
- [0x7169,"B7D0"],
- [0x716A,"DE75"],
- [0x716B,"977E"],
- [0x716C,"B7D5"],
- [0x716E,"B54E"],
- [0x7170,"DE7B"],
- [0x7171,"9BD5"],
- [0x7172,"DE73"],
- [0x7173,"9AC3"],
- [0x7175,"97C8"],
- [0x7176,"A0DB"],
- [0x7177,"91D0"],
- [0x7178,"DE74"],
- [0x717A,"9FE4"],
- [0x717B,"E2C1"],
- [0x717C,"8FDD"],
- [0x717D,"BAB4"],
- [0x717E,"91E9"],
- [0x7180,"E2BD"],
- [0x7181,"E2C3"],
- [0x7182,"E2BF"],
- [0x7184,"BAB6"],
- [0x7185,"E2BE"],
- [0x7186,"E2C2"],
- [0x7187,"E2BA"],
- [0x7188,"98E0"],
- [0x7189,"E2BC"],
- [0x718A,"BAB5"],
- [0x718C,"92CA"],
- [0x718E,"9857"],
- [0x718F,"E2C0"],
- [0x7190,"E2BB"],
- [0x7191,"8C51"],
- [0x7192,"BAB7"],
- [0x7194,"BAB2"],
- [0x7196,"FDEB"],
- [0x7197,"E2C4"],
- [0x7198,"9B49"],
- [0x7199,"BAB3"],
- [0x719A,"E667"],
- [0x719B,"E664"],
- [0x719C,"E670"],
- [0x719D,"E66A"],
- [0x719E,"E66C"],
- [0x719F,"BCF4"],
- [0x71A0,"E666"],
- [0x71A1,"E66E"],
- [0x71A2,"9D76"],
- [0x71A3,"9EAF"],
- [0x71A4,"E66D"],
- [0x71A5,"E66B"],
- [0x71A7,"E671"],
- [0x71A8,"BCF7"],
- [0x71A9,"E668"],
- [0x71AA,"E66F"],
- [0x71AC,"BCF5"],
- [0x71AD,"9CCC"],
- [0x71AF,"E663"],
- [0x71B0,"E665"],
- [0x71B1,"BCF6"],
- [0x71B2,"E662"],
- [0x71B3,"E672"],
- [0x71B4,"FDEA"],
- [0x71B5,"E669"],
- [0x71B7,"8DF1"],
- [0x71B8,"EA4A"],
- [0x71B9,"BF51"],
- [0x71BA,"FDFB"],
- [0x71BC,"EA55"],
- [0x71BD,"EA53"],
- [0x71BE,"BF4B"],
- [0x71BF,"EA49"],
- [0x71C0,"EA4C"],
- [0x71C1,"EA4D"],
- [0x71C2,"EA48"],
- [0x71C3,"BF55"],
- [0x71C4,"BF56"],
- [0x71C5,"EA47"],
- [0x71C6,"EA56"],
- [0x71C7,"EA51"],
- [0x71C8,"BF4F"],
- [0x71C9,"BF4C"],
- [0x71CA,"EA50"],
- [0x71CB,"EA4E"],
- [0x71CE,"BF52"],
- [0x71CF,"EA52"],
- [0x71D0,"BF4D"],
- [0x71D1,"8E53"],
- [0x71D2,"BF4E"],
- [0x71D4,"EA4F"],
- [0x71D5,"BF50"],
- [0x71D6,"EA4B"],
- [0x71D8,"EA54"],
- [0x71D9,"BF53"],
- [0x71DA,"EA57"],
- [0x71DB,"EA58"],
- [0x71DC,"BF54"],
- [0x71DD,"FACF"],
- [0x71DF,"C0E7"],
- [0x71E0,"C0EE"],
- [0x71E1,"ED5C"],
- [0x71E2,"ED62"],
- [0x71E4,"ED60"],
- [0x71E5,"C0EA"],
- [0x71E6,"C0E9"],
- [0x71E7,"C0E6"],
- [0x71E8,"ED5E"],
- [0x71EB,"96F9"],
- [0x71EC,"C0EC"],
- [0x71ED,"C0EB"],
- [0x71EE,"C0E8"],
- [0x71F0,"ED61"],
- [0x71F1,"ED5D"],
- [0x71F2,"ED5F"],
- [0x71F4,"C0ED"],
- [0x71F5,"98BF"],
- [0x71F6,"9E49"],
- [0x71F8,"C277"],
- [0x71F9,"EFFB"],
- [0x71FB,"C274"],
- [0x71FC,"C275"],
- [0x71FD,"EFFD"],
- [0x71FE,"C276"],
- [0x71FF,"EFFA"],
- [0x7200,"8CA7"],
- [0x7201,"EFF9"],
- [0x7202,"F26C"],
- [0x7203,"EFFC"],
- [0x7205,"F26D"],
- [0x7206,"C37A"],
- [0x7207,"F26B"],
- [0x7209,"9BCA"],
- [0x720A,"F26A"],
- [0x720C,"F269"],
- [0x720D,"C37B"],
- [0x720E,"FDFE"],
- [0x720F,"92DC"],
- [0x7210,"C46C"],
- [0x7213,"F46A"],
- [0x7214,"F46B"],
- [0x7215,"FE41"],
- [0x7216,"91CC"],
- [0x7217,"91E2"],
- [0x7219,"F5DC"],
- [0x721A,"F5DB"],
- [0x721B,"C4EA"],
- [0x721D,"F5DA"],
- [0x721E,"F6EC"],
- [0x721F,"F6ED"],
- [0x7222,"F7E6"],
- [0x7223,"F8B1"],
- [0x7224,"FE44"],
- [0x7225,"875F"],
- [0x7226,"F8F6"],
- [0x7227,"F9BC"],
- [0x7228,"C679"],
- [0x7229,"F9C6"],
- [0x722A,"A4F6"],
- [0x722B,"8BD3"],
- [0x722C,"AAA6"],
- [0x722D,"AAA7"],
- [0x722E,"FE47"],
- [0x7230,"ACB8"],
- [0x7235,"C0EF"],
- [0x7236,"A4F7"],
- [0x7238,"AAA8"],
- [0x7239,"AF52"],
- [0x723A,"B7DD"],
- [0x723B,"A4F8"],
- [0x723D,"B26E"],
- [0x723E,"BAB8"],
- [0x723F,"C962"],
- [0x7240,"FE48"],
- [0x7241,"CFB7"],
- [0x7242,"D27D"],
- [0x7244,"E2C5"],
- [0x7246,"C0F0"],
- [0x7247,"A4F9"],
- [0x7248,"AAA9"],
- [0x7249,"CFB8"],
- [0x724A,"CFB9"],
- [0x724B,"DA66"],
- [0x724C,"B550"],
- [0x724F,"DEA4"],
- [0x7250,"9455"],
- [0x7252,"B7DE"],
- [0x7253,"E2C6"],
- [0x7255,"FE4B"],
- [0x7256,"BCF8"],
- [0x7257,"FE4C"],
- [0x7258,"C37C"],
- [0x7259,"A4FA"],
- [0x725A,"DA67"],
- [0x725B,"A4FB"],
- [0x725C,"8DBF"],
- [0x725D,"A6C9"],
- [0x725E,"CA42"],
- [0x725F,"A6C8"],
- [0x7260,"A865"],
- [0x7261,"A864"],
- [0x7262,"A863"],
- [0x7263,"CB60"],
- [0x7266,"9E78"],
- [0x7267,"AAAA"],
- [0x7269,"AAAB"],
- [0x726A,"CD5B"],
- [0x726C,"CFBA"],
- [0x726E,"CFBD"],
- [0x726F,"ACBA"],
- [0x7270,"CFBB"],
- [0x7272,"ACB9"],
- [0x7273,"CFBC"],
- [0x7274,"ACBB"],
- [0x7276,"D2A2"],
- [0x7277,"D2A1"],
- [0x7278,"D27E"],
- [0x7279,"AF53"],
- [0x727B,"D65D"],
- [0x727C,"D65E"],
- [0x727D,"B26F"],
- [0x727E,"D65C"],
- [0x727F,"D65F"],
- [0x7280,"B552"],
- [0x7281,"B270"],
- [0x7282,"FE51"],
- [0x7284,"B551"],
- [0x7285,"DA6B"],
- [0x7286,"DA6A"],
- [0x7287,"9456"],
- [0x7288,"DA68"],
- [0x7289,"DA69"],
- [0x728B,"DA6C"],
- [0x728C,"DEA6"],
- [0x728D,"DEA5"],
- [0x728E,"DEA9"],
- [0x728F,"9D61"],
- [0x7290,"DEA8"],
- [0x7291,"DEA7"],
- [0x7292,"BAB9"],
- [0x7293,"E2C9"],
- [0x7294,"9457"],
- [0x7295,"E2C8"],
- [0x7296,"BABA"],
- [0x7297,"E2C7"],
- [0x7298,"E673"],
- [0x729A,"E674"],
- [0x729B,"BCF9"],
- [0x729D,"EA59"],
- [0x729E,"EA5A"],
- [0x729F,"9966"],
- [0x72A1,"F272"],
- [0x72A2,"C37D"],
- [0x72A3,"F271"],
- [0x72A4,"F270"],
- [0x72A5,"F26E"],
- [0x72A6,"F26F"],
- [0x72A7,"C4EB"],
- [0x72A8,"F46C"],
- [0x72A9,"F6EE"],
- [0x72AA,"F8F7"],
- [0x72AC,"A4FC"],
- [0x72AD,"8BD5"],
- [0x72AE,"C9A5"],
- [0x72AF,"A5C7"],
- [0x72B0,"C9A6"],
- [0x72B2,"A069"],
- [0x72B4,"CA43"],
- [0x72B5,"CA44"],
- [0x72BA,"CB66"],
- [0x72BD,"CB62"],
- [0x72BF,"CB61"],
- [0x72C0,"AAAC"],
- [0x72C1,"CB65"],
- [0x72C2,"A867"],
- [0x72C3,"CB63"],
- [0x72C4,"A866"],
- [0x72C5,"CB67"],
- [0x72C6,"CB64"],
- [0x72C9,"CD5F"],
- [0x72CA,"CFBE"],
- [0x72CB,"CD5D"],
- [0x72CC,"CD64"],
- [0x72CD,"98B4"],
- [0x72CE,"AAAD"],
- [0x72D0,"AAB0"],
- [0x72D1,"CD65"],
- [0x72D2,"CD61"],
- [0x72D4,"CD62"],
- [0x72D6,"CD5C"],
- [0x72D7,"AAAF"],
- [0x72D8,"CD5E"],
- [0x72D9,"AAAE"],
- [0x72DA,"CD63"],
- [0x72DC,"CD60"],
- [0x72DF,"CFC2"],
- [0x72E0,"ACBD"],
- [0x72E1,"ACBE"],
- [0x72E2,"A049"],
- [0x72E3,"CFC5"],
- [0x72E4,"CFBF"],
- [0x72E6,"CFC4"],
- [0x72E8,"CFC0"],
- [0x72E9,"ACBC"],
- [0x72EA,"CFC3"],
- [0x72EB,"CFC1"],
- [0x72F3,"D2A8"],
- [0x72F4,"D2A5"],
- [0x72F6,"D2A7"],
- [0x72F7,"AF58"],
- [0x72F8,"AF57"],
- [0x72F9,"AF55"],
- [0x72FA,"D2A4"],
- [0x72FB,"D2A9"],
- [0x72FC,"AF54"],
- [0x72FD,"AF56"],
- [0x72FE,"D2A6"],
- [0x72FF,"D667"],
- [0x7300,"D2A3"],
- [0x7301,"D2AA"],
- [0x7302,"A04C"],
- [0x7304,"9E65"],
- [0x7307,"D662"],
- [0x7308,"D666"],
- [0x730A,"D665"],
- [0x730B,"DA6E"],
- [0x730C,"DA79"],
- [0x730F,"D668"],
- [0x7310,"98B5"],
- [0x7311,"D663"],
- [0x7312,"DA6D"],
- [0x7313,"B274"],
- [0x7316,"B273"],
- [0x7317,"D661"],
- [0x7318,"D664"],
- [0x7319,"B275"],
- [0x731B,"B272"],
- [0x731C,"B271"],
- [0x731D,"D660"],
- [0x731E,"D669"],
- [0x7322,"DA70"],
- [0x7323,"DA77"],
- [0x7325,"B554"],
- [0x7326,"DA76"],
- [0x7327,"DA73"],
- [0x7328,"FE58"],
- [0x7329,"B556"],
- [0x732A,"9975"],
- [0x732B,"FE53"],
- [0x732C,"A065"],
- [0x732D,"DA75"],
- [0x732E,"FE59"],
- [0x7330,"DA6F"],
- [0x7331,"DA71"],
- [0x7332,"DA74"],
- [0x7333,"DA72"],
- [0x7334,"B555"],
- [0x7335,"DA78"],
- [0x7336,"B553"],
- [0x7337,"B7DF"],
- [0x7338,"98B7"],
- [0x7339,"98B8"],
- [0x733A,"DEAD"],
- [0x733B,"DEAC"],
- [0x733C,"DEAA"],
- [0x733E,"B7E2"],
- [0x733F,"B7E1"],
- [0x7340,"DEAE"],
- [0x7341,"98BA"],
- [0x7342,"DEAB"],
- [0x7343,"E2CA"],
- [0x7344,"BABB"],
- [0x7345,"B7E0"],
- [0x7348,"98BB"],
- [0x7349,"DEB0"],
- [0x734A,"DEAF"],
- [0x734C,"E2CD"],
- [0x734D,"E2CB"],
- [0x734E,"BCFA"],
- [0x734F,"9FBC"],
- [0x7350,"BABC"],
- [0x7351,"E2CC"],
- [0x7352,"E676"],
- [0x7357,"BCFB"],
- [0x7358,"E675"],
- [0x7359,"E67E"],
- [0x735A,"E67D"],
- [0x735B,"E67B"],
- [0x735D,"E67A"],
- [0x735E,"E677"],
- [0x735F,"E678"],
- [0x7360,"E679"],
- [0x7361,"E67C"],
- [0x7362,"E6A1"],
- [0x7365,"EA5F"],
- [0x7366,"EA5C"],
- [0x7367,"EA5D"],
- [0x7368,"BF57"],
- [0x7369,"EA5B"],
- [0x736A,"EA61"],
- [0x736B,"EA60"],
- [0x736C,"EA5E"],
- [0x736E,"ED64"],
- [0x736F,"ED65"],
- [0x7370,"C0F1"],
- [0x7371,"A04A"],
- [0x7372,"C0F2"],
- [0x7373,"ED63"],
- [0x7374,"9EC7"],
- [0x7375,"C279"],
- [0x7376,"EFFE"],
- [0x7377,"C278"],
- [0x7378,"C37E"],
- [0x737A,"C3A1"],
- [0x737B,"C46D"],
- [0x737C,"F46E"],
- [0x737D,"F46D"],
- [0x737E,"F5DD"],
- [0x737F,"F6EF"],
- [0x7380,"C57A"],
- [0x7381,"F7E8"],
- [0x7382,"F7E7"],
- [0x7383,"F7E9"],
- [0x7384,"A5C8"],
- [0x7385,"CFC6"],
- [0x7386,"AF59"],
- [0x7387,"B276"],
- [0x7388,"D66A"],
- [0x7389,"A5C9"],
- [0x738A,"C9A7"],
- [0x738B,"A4FD"],
- [0x738C,"8CA9"],
- [0x738E,"CA45"],
- [0x738F,"98AE"],
- [0x7392,"CB6C"],
- [0x7393,"CB6A"],
- [0x7394,"CB6B"],
- [0x7395,"CB68"],
- [0x7396,"A868"],
- [0x7397,"CB69"],
- [0x7398,"92D6"],
- [0x739C,"FAE1"],
- [0x739D,"CD6D"],
- [0x739E,"91D4"],
- [0x739F,"AAB3"],
- [0x73A0,"CD6B"],
- [0x73A1,"CD67"],
- [0x73A2,"CD6A"],
- [0x73A4,"CD66"],
- [0x73A5,"AAB5"],
- [0x73A6,"CD69"],
- [0x73A7,"FADE"],
- [0x73A8,"AAB2"],
- [0x73A9,"AAB1"],
- [0x73AA,"FE5B"],
- [0x73AB,"AAB4"],
- [0x73AC,"CD6C"],
- [0x73AD,"CD68"],
- [0x73B2,"ACC2"],
- [0x73B3,"ACC5"],
- [0x73B4,"CFCE"],
- [0x73B5,"CFCD"],
- [0x73B6,"CFCC"],
- [0x73B7,"ACBF"],
- [0x73B8,"CFD5"],
- [0x73B9,"CFCB"],
- [0x73BA,"8C53"],
- [0x73BB,"ACC1"],
- [0x73BC,"D2AF"],
- [0x73BE,"CFD2"],
- [0x73BF,"CFD0"],
- [0x73C0,"ACC4"],
- [0x73C2,"CFC8"],
- [0x73C3,"CFD3"],
- [0x73C4,"87BF"],
- [0x73C5,"CFCA"],
- [0x73C6,"CFD4"],
- [0x73C7,"CFD1"],
- [0x73C8,"CFC9"],
- [0x73C9,"FE5E"],
- [0x73CA,"ACC0"],
- [0x73CB,"CFD6"],
- [0x73CC,"CFC7"],
- [0x73CD,"ACC3"],
- [0x73CE,"FBD7"],
- [0x73CF,"FE5A"],
- [0x73D0,"94C5"],
- [0x73D2,"D2B4"],
- [0x73D3,"D2AB"],
- [0x73D4,"D2B6"],
- [0x73D5,"FACA"],
- [0x73D6,"D2AE"],
- [0x73D7,"D2B9"],
- [0x73D8,"D2BA"],
- [0x73D9,"D2AC"],
- [0x73DA,"D2B8"],
- [0x73DB,"D2B5"],
- [0x73DC,"D2B3"],
- [0x73DD,"D2B7"],
- [0x73DE,"AF5F"],
- [0x73E0,"AF5D"],
- [0x73E1,"98C1"],
- [0x73E2,"975C"],
- [0x73E3,"D2B1"],
- [0x73E4,"FE74"],
- [0x73E5,"D2AD"],
- [0x73E6,"9773"],
- [0x73E7,"D2B0"],
- [0x73E8,"D2BB"],
- [0x73E9,"D2B2"],
- [0x73EA,"AF5E"],
- [0x73EB,"CFCF"],
- [0x73ED,"AF5A"],
- [0x73EE,"AF5C"],
- [0x73EF,"FA46"],
- [0x73F3,"9764"],
- [0x73F4,"D678"],
- [0x73F5,"D66D"],
- [0x73F6,"D66B"],
- [0x73F7,"FE68"],
- [0x73F8,"D66C"],
- [0x73F9,"964E"],
- [0x73FA,"D673"],
- [0x73FB,"9765"],
- [0x73FC,"D674"],
- [0x73FD,"D670"],
- [0x73FE,"B27B"],
- [0x73FF,"D675"],
- [0x7400,"D672"],
- [0x7401,"D66F"],
- [0x7402,"8C5A"],
- [0x7403,"B279"],
- [0x7404,"D66E"],
- [0x7405,"B277"],
- [0x7406,"B27A"],
- [0x7407,"D671"],
- [0x7408,"D679"],
- [0x7409,"AF5B"],
- [0x740A,"B278"],
- [0x740B,"D677"],
- [0x740C,"D676"],
- [0x740D,"B27C"],
- [0x7411,"89A1"],
- [0x7412,"95FA"],
- [0x7414,"92D4"],
- [0x7415,"FE69"],
- [0x7416,"DA7E"],
- [0x7417,"FB45"],
- [0x7419,"98C8"],
- [0x741A,"DAA1"],
- [0x741B,"B560"],
- [0x741C,"90EF"],
- [0x741D,"DAA7"],
- [0x741E,"98C9"],
- [0x741F,"98CA"],
- [0x7420,"DAA9"],
- [0x7421,"DAA2"],
- [0x7422,"B55A"],
- [0x7423,"DAA6"],
- [0x7424,"DAA5"],
- [0x7425,"B55B"],
- [0x7426,"B561"],
- [0x7428,"B562"],
- [0x7429,"DAA8"],
- [0x742A,"B558"],
- [0x742B,"DA7D"],
- [0x742C,"DA7B"],
- [0x742D,"DAA3"],
- [0x742E,"DA7A"],
- [0x742F,"B55F"],
- [0x7430,"DA7C"],
- [0x7431,"DAA4"],
- [0x7432,"DAAA"],
- [0x7433,"B559"],
- [0x7434,"B55E"],
- [0x7435,"B55C"],
- [0x7436,"B55D"],
- [0x7437,"946D"],
- [0x7438,"94B7"],
- [0x7439,"FE6C"],
- [0x743A,"B557"],
- [0x743C,"946B"],
- [0x743F,"B7E9"],
- [0x7440,"DEB7"],
- [0x7441,"B7E8"],
- [0x7442,"DEBB"],
- [0x7443,"92FC"],
- [0x7444,"DEB1"],
- [0x7445,"95EB"],
- [0x7446,"DEBC"],
- [0x7447,"FE73"],
- [0x7448,"976E"],
- [0x7449,"FE5F"],
- [0x744A,"DEB2"],
- [0x744B,"DEB3"],
- [0x744C,"87B8"],
- [0x744D,"DEBD"],
- [0x744E,"DEBA"],
- [0x744F,"DEB8"],
- [0x7450,"DEB9"],
- [0x7451,"DEB5"],
- [0x7452,"DEB4"],
- [0x7453,"FDBD"],
- [0x7454,"DEBE"],
- [0x7455,"B7E5"],
- [0x7456,"92D5"],
- [0x7457,"DEB6"],
- [0x7459,"B7EA"],
- [0x745A,"B7E4"],
- [0x745B,"B7EB"],
- [0x745C,"B7EC"],
- [0x745D,"FEB9"],
- [0x745E,"B7E7"],
- [0x745F,"B7E6"],
- [0x7460,"FE71"],
- [0x7461,"8778"],
- [0x7462,"E2CE"],
- [0x7463,"BABE"],
- [0x7464,"BABD"],
- [0x7465,"FBBB"],
- [0x7467,"E2D3"],
- [0x7468,"947A"],
- [0x7469,"BCFC"],
- [0x746A,"BABF"],
- [0x746B,"95FB"],
- [0x746C,"FE77"],
- [0x746D,"BAC1"],
- [0x746E,"E2D4"],
- [0x746F,"B7E3"],
- [0x7470,"BAC0"],
- [0x7471,"E2D0"],
- [0x7472,"E2D2"],
- [0x7473,"E2CF"],
- [0x7474,"FE79"],
- [0x7475,"E2D1"],
- [0x7476,"FE75"],
- [0x7479,"E6AB"],
- [0x747A,"945D"],
- [0x747C,"E6AA"],
- [0x747D,"E6A7"],
- [0x747E,"BD40"],
- [0x747F,"EA62"],
- [0x7480,"BD41"],
- [0x7481,"E6A6"],
- [0x7482,"FE7C"],
- [0x7483,"BCFE"],
- [0x7485,"E6A8"],
- [0x7486,"E6A5"],
- [0x7487,"E6A2"],
- [0x7488,"E6A9"],
- [0x7489,"E6A3"],
- [0x748A,"E6A4"],
- [0x748B,"BCFD"],
- [0x748C,"9344"],
- [0x748D,"8EA6"],
- [0x7490,"ED69"],
- [0x7492,"EA66"],
- [0x7494,"EA65"],
- [0x7495,"EA67"],
- [0x7497,"ED66"],
- [0x7498,"BF5A"],
- [0x7499,"92D3"],
- [0x749A,"EA63"],
- [0x749B,"94B8"],
- [0x749C,"BF58"],
- [0x749D,"8779"],
- [0x749E,"BF5C"],
- [0x749F,"BF5B"],
- [0x74A0,"EA64"],
- [0x74A1,"EA68"],
- [0x74A3,"BF59"],
- [0x74A4,"FC71"],
- [0x74A5,"ED6D"],
- [0x74A6,"C0F5"],
- [0x74A7,"C27A"],
- [0x74A8,"C0F6"],
- [0x74A9,"C0F3"],
- [0x74AA,"ED6A"],
- [0x74AB,"ED68"],
- [0x74AD,"ED6B"],
- [0x74AF,"ED6E"],
- [0x74B0,"C0F4"],
- [0x74B1,"ED6C"],
- [0x74B2,"ED67"],
- [0x74B4,"975E"],
- [0x74B5,"F042"],
- [0x74B6,"F045"],
- [0x74B7,"F275"],
- [0x74B8,"F040"],
- [0x74B9,"8CAD"],
- [0x74BA,"F46F"],
- [0x74BB,"F046"],
- [0x74BD,"C3A2"],
- [0x74BE,"F044"],
- [0x74BF,"C27B"],
- [0x74C0,"F041"],
- [0x74C1,"F043"],
- [0x74C2,"F047"],
- [0x74C3,"F276"],
- [0x74C5,"F274"],
- [0x74C6,"87C1"],
- [0x74C8,"FEA7"],
- [0x74CA,"C3A3"],
- [0x74CB,"F273"],
- [0x74CC,"946A"],
- [0x74CF,"C46E"],
- [0x74D0,"93E3"],
- [0x74D3,"98CF"],
- [0x74D4,"C4ED"],
- [0x74D5,"F6F1"],
- [0x74D6,"C4EC"],
- [0x74D7,"F6F3"],
- [0x74D8,"F6F0"],
- [0x74D9,"F6F2"],
- [0x74DA,"C5D0"],
- [0x74DB,"F8B2"],
- [0x74DC,"A5CA"],
- [0x74DD,"CD6E"],
- [0x74DE,"D2BC"],
- [0x74DF,"D2BD"],
- [0x74E0,"B27D"],
- [0x74E1,"DEBF"],
- [0x74E2,"BF5D"],
- [0x74E3,"C3A4"],
- [0x74E4,"C57B"],
- [0x74E5,"F8B3"],
- [0x74E6,"A5CB"],
- [0x74E7,"A0D9"],
- [0x74E8,"CD6F"],
- [0x74E9,"A260"],
- [0x74EC,"CFD7"],
- [0x74EE,"CFD8"],
- [0x74F0,"A0BF"],
- [0x74F1,"A04D"],
- [0x74F2,"A0B8"],
- [0x74F4,"D2BE"],
- [0x74F5,"D2BF"],
- [0x74F6,"B27E"],
- [0x74F7,"B2A1"],
- [0x74F8,"A0CE"],
- [0x74FB,"DAAB"],
- [0x74FD,"DEC2"],
- [0x74FE,"DEC1"],
- [0x74FF,"DEC0"],
- [0x7500,"E2D5"],
- [0x7502,"E2D6"],
- [0x7503,"E2D7"],
- [0x7504,"BAC2"],
- [0x7505,"A0B7"],
- [0x7507,"E6AD"],
- [0x7508,"E6AC"],
- [0x750B,"EA69"],
- [0x750C,"BF5E"],
- [0x750D,"BF5F"],
- [0x750E,"FEA9"],
- [0x750F,"ED72"],
- [0x7510,"ED6F"],
- [0x7511,"ED70"],
- [0x7512,"ED71"],
- [0x7513,"F049"],
- [0x7514,"F048"],
- [0x7515,"C27C"],
- [0x7516,"F277"],
- [0x7517,"F5DE"],
- [0x7518,"A5CC"],
- [0x7519,"89C3"],
- [0x751A,"ACC6"],
- [0x751C,"B2A2"],
- [0x751D,"DEC3"],
- [0x751E,"FEAB"],
- [0x751F,"A5CD"],
- [0x7521,"D2C0"],
- [0x7522,"B2A3"],
- [0x7525,"B563"],
- [0x7526,"B564"],
- [0x7528,"A5CE"],
- [0x7529,"A5CF"],
- [0x752A,"CA46"],
- [0x752B,"A86A"],
- [0x752C,"A869"],
- [0x752D,"ACC7"],
- [0x752E,"CFD9"],
- [0x752F,"DAAC"],
- [0x7530,"A5D0"],
- [0x7531,"A5D1"],
- [0x7532,"A5D2"],
- [0x7533,"A5D3"],
- [0x7534,"9DF4"],
- [0x7535,"896D"],
- [0x7537,"A86B"],
- [0x7538,"A86C"],
- [0x7539,"CB6E"],
- [0x753A,"CB6D"],
- [0x753B,"9C7B"],
- [0x753D,"AAB6"],
- [0x753E,"CD72"],
- [0x753F,"CD70"],
- [0x7540,"CD71"],
- [0x7542,"98D2"],
- [0x7546,"9FA9"],
- [0x7547,"CFDA"],
- [0x7548,"CFDB"],
- [0x754A,"FEB2"],
- [0x754B,"ACCB"],
- [0x754C,"ACC9"],
- [0x754D,"FEB1"],
- [0x754E,"ACCA"],
- [0x754F,"ACC8"],
- [0x7551,"97D9"],
- [0x7553,"A0C4"],
- [0x7554,"AF60"],
- [0x7555,"9476"],
- [0x7559,"AF64"],
- [0x755A,"AF63"],
- [0x755B,"D2C1"],
- [0x755C,"AF62"],
- [0x755D,"AF61"],
- [0x755F,"D2C2"],
- [0x7560,"9978"],
- [0x7562,"B2A6"],
- [0x7563,"D67B"],
- [0x7564,"D67A"],
- [0x7565,"B2A4"],
- [0x7566,"B2A5"],
- [0x7567,"FEB3"],
- [0x756A,"B566"],
- [0x756B,"B565"],
- [0x756C,"DAAE"],
- [0x756D,"98D3"],
- [0x756E,"FEB4"],
- [0x756F,"DAAD"],
- [0x7570,"B2A7"],
- [0x7572,"98D4"],
- [0x7576,"B7ED"],
- [0x7577,"DEC5"],
- [0x7578,"B7EE"],
- [0x7579,"DEC4"],
- [0x757A,"9FB9"],
- [0x757D,"E2D8"],
- [0x757E,"E6AE"],
- [0x757F,"BD42"],
- [0x7580,"EA6A"],
- [0x7583,"9471"],
- [0x7584,"ED73"],
- [0x7586,"C3A6"],
- [0x7587,"C3A5"],
- [0x758A,"C57C"],
- [0x758B,"A5D4"],
- [0x758C,"CD73"],
- [0x758D,"98D5"],
- [0x758E,"FEB8"],
- [0x758F,"B2A8"],
- [0x7590,"E2D9"],
- [0x7591,"BAC3"],
- [0x7592,"C6D4"],
- [0x7594,"CB6F"],
- [0x7595,"CB70"],
- [0x7598,"CD74"],
- [0x7599,"AAB8"],
- [0x759A,"AAB9"],
- [0x759D,"AAB7"],
- [0x759E,"FEBA"],
- [0x75A2,"ACCF"],
- [0x75A3,"ACD0"],
- [0x75A4,"ACCD"],
- [0x75A5,"ACCE"],
- [0x75A7,"CFDC"],
- [0x75AA,"CFDD"],
- [0x75AB,"ACCC"],
- [0x75B0,"D2C3"],
- [0x75B1,"9E5C"],
- [0x75B2,"AF68"],
- [0x75B3,"AF69"],
- [0x75B4,"FEBB"],
- [0x75B5,"B2AB"],
- [0x75B6,"D2C9"],
- [0x75B8,"AF6E"],
- [0x75B9,"AF6C"],
- [0x75BA,"D2CA"],
- [0x75BB,"D2C5"],
- [0x75BC,"AF6B"],
- [0x75BD,"AF6A"],
- [0x75BE,"AF65"],
- [0x75BF,"D2C8"],
- [0x75C0,"D2C7"],
- [0x75C1,"D2C4"],
- [0x75C2,"AF6D"],
- [0x75C3,"A044"],
- [0x75C4,"D2C6"],
- [0x75C5,"AF66"],
- [0x75C7,"AF67"],
- [0x75C8,"98D7"],
- [0x75CA,"B2AC"],
- [0x75CB,"D6A1"],
- [0x75CC,"D6A2"],
- [0x75CD,"B2AD"],
- [0x75CE,"D67C"],
- [0x75CF,"D67E"],
- [0x75D0,"D6A4"],
- [0x75D1,"D6A3"],
- [0x75D2,"D67D"],
- [0x75D4,"B2A9"],
- [0x75D5,"B2AA"],
- [0x75D7,"DAB6"],
- [0x75D8,"B56B"],
- [0x75D9,"B56A"],
- [0x75DA,"DAB0"],
- [0x75DB,"B568"],
- [0x75DC,"98D8"],
- [0x75DD,"DAB3"],
- [0x75DE,"B56C"],
- [0x75DF,"DAB4"],
- [0x75E0,"B56D"],
- [0x75E1,"DAB1"],
- [0x75E2,"B567"],
- [0x75E3,"B569"],
- [0x75E4,"DAB5"],
- [0x75E6,"DAB2"],
- [0x75E7,"DAAF"],
- [0x75ED,"DED2"],
- [0x75EF,"DEC7"],
- [0x75F0,"B7F0"],
- [0x75F1,"B7F3"],
- [0x75F2,"B7F2"],
- [0x75F3,"B7F7"],
- [0x75F4,"B7F6"],
- [0x75F5,"DED3"],
- [0x75F6,"DED1"],
- [0x75F7,"DECA"],
- [0x75F8,"DECE"],
- [0x75F9,"DECD"],
- [0x75FA,"B7F4"],
- [0x75FB,"DED0"],
- [0x75FC,"DECC"],
- [0x75FD,"DED4"],
- [0x75FE,"DECB"],
- [0x75FF,"B7F5"],
- [0x7600,"B7EF"],
- [0x7601,"B7F1"],
- [0x7602,"FEBC"],
- [0x7603,"DEC9"],
- [0x7607,"9FFE"],
- [0x7608,"E2DB"],
- [0x7609,"BAC7"],
- [0x760A,"E2DF"],
- [0x760B,"BAC6"],
- [0x760C,"E2DC"],
- [0x760D,"BAC5"],
- [0x760F,"DEC8"],
- [0x7610,"DECF"],
- [0x7611,"E2DE"],
- [0x7613,"BAC8"],
- [0x7614,"E2E0"],
- [0x7615,"E2DD"],
- [0x7616,"E2DA"],
- [0x7619,"E6B1"],
- [0x761A,"E6B5"],
- [0x761B,"E6B7"],
- [0x761C,"E6B3"],
- [0x761D,"E6B2"],
- [0x761E,"E6B0"],
- [0x761F,"BD45"],
- [0x7620,"BD43"],
- [0x7621,"BD48"],
- [0x7622,"BD49"],
- [0x7623,"E6B4"],
- [0x7624,"BD46"],
- [0x7625,"E6AF"],
- [0x7626,"BD47"],
- [0x7627,"BAC4"],
- [0x7628,"E6B6"],
- [0x7629,"BD44"],
- [0x762C,"FEBD"],
- [0x762D,"EA6C"],
- [0x762F,"EA6B"],
- [0x7630,"EA73"],
- [0x7631,"EA6D"],
- [0x7632,"EA72"],
- [0x7633,"EA6F"],
- [0x7634,"BF60"],
- [0x7635,"EA71"],
- [0x7638,"BF61"],
- [0x763A,"BF62"],
- [0x763B,"9DDD"],
- [0x763C,"EA70"],
- [0x763D,"EA6E"],
- [0x7640,"9EE1"],
- [0x7642,"C0F8"],
- [0x7643,"ED74"],
- [0x7646,"C0F7"],
- [0x7647,"ED77"],
- [0x7648,"ED75"],
- [0x7649,"ED76"],
- [0x764C,"C0F9"],
- [0x764D,"98DA"],
- [0x764E,"9DDF"],
- [0x764F,"FEBF"],
- [0x7650,"F04D"],
- [0x7651,"FEBE"],
- [0x7652,"C2A1"],
- [0x7653,"F04E"],
- [0x7654,"9EEB"],
- [0x7656,"C27D"],
- [0x7657,"F04F"],
- [0x7658,"C27E"],
- [0x7659,"F04C"],
- [0x765A,"F050"],
- [0x765C,"F04A"],
- [0x765F,"C3A7"],
- [0x7660,"F278"],
- [0x7661,"C3A8"],
- [0x7662,"C46F"],
- [0x7664,"F04B"],
- [0x7665,"C470"],
- [0x7666,"9E59"],
- [0x7667,"A05C"],
- [0x7669,"C4EE"],
- [0x766A,"F5DF"],
- [0x766C,"C57E"],
- [0x766D,"F6F4"],
- [0x766E,"C57D"],
- [0x766F,"FEC0"],
- [0x7670,"F7EA"],
- [0x7671,"C5F5"],
- [0x7672,"C5F6"],
- [0x7673,"9477"],
- [0x7674,"98DC"],
- [0x7675,"F9CC"],
- [0x7676,"FEC1"],
- [0x7678,"ACD1"],
- [0x7679,"CFDE"],
- [0x767A,"98DE"],
- [0x767B,"B56E"],
- [0x767C,"B56F"],
- [0x767D,"A5D5"],
- [0x767E,"A6CA"],
- [0x767F,"CA47"],
- [0x7681,"CB71"],
- [0x7682,"A86D"],
- [0x7684,"AABA"],
- [0x7686,"ACD2"],
- [0x7687,"ACD3"],
- [0x7688,"ACD4"],
- [0x7689,"D6A6"],
- [0x768A,"D2CB"],
- [0x768B,"AF6F"],
- [0x768E,"B2AE"],
- [0x768F,"D6A5"],
- [0x7690,"FEC3"],
- [0x7692,"DAB8"],
- [0x7693,"B571"],
- [0x7695,"DAB7"],
- [0x7696,"B570"],
- [0x7699,"DED5"],
- [0x769A,"BD4A"],
- [0x769B,"E6BB"],
- [0x769C,"E6B8"],
- [0x769D,"E6B9"],
- [0x769E,"E6BA"],
- [0x76A1,"FEC8"],
- [0x76A4,"ED78"],
- [0x76A5,"FEC9"],
- [0x76A6,"F051"],
- [0x76AA,"F471"],
- [0x76AB,"F470"],
- [0x76AD,"F6F5"],
- [0x76AE,"A5D6"],
- [0x76AF,"CD75"],
- [0x76B0,"AF70"],
- [0x76B4,"B572"],
- [0x76B5,"DED6"],
- [0x76B7,"FECA"],
- [0x76B8,"E2E1"],
- [0x76BA,"BD4B"],
- [0x76BB,"EA74"],
- [0x76BD,"F052"],
- [0x76BE,"F472"],
- [0x76BF,"A5D7"],
- [0x76C2,"AABB"],
- [0x76C3,"ACD7"],
- [0x76C4,"CFDF"],
- [0x76C5,"ACD8"],
- [0x76C6,"ACD6"],
- [0x76C8,"ACD5"],
- [0x76C9,"D2CC"],
- [0x76CA,"AF71"],
- [0x76CC,"FECB"],
- [0x76CD,"AF72"],
- [0x76CE,"AF73"],
- [0x76D2,"B2B0"],
- [0x76D3,"D6A7"],
- [0x76D4,"B2AF"],
- [0x76D6,"9FC2"],
- [0x76D9,"8C6B"],
- [0x76DA,"DAB9"],
- [0x76DB,"B2B1"],
- [0x76DC,"B573"],
- [0x76DD,"DED7"],
- [0x76DE,"B7F8"],
- [0x76DF,"B7F9"],
- [0x76E1,"BAC9"],
- [0x76E3,"BACA"],
- [0x76E4,"BD4C"],
- [0x76E5,"BF64"],
- [0x76E6,"EA75"],
- [0x76E7,"BF63"],
- [0x76E9,"ED79"],
- [0x76EA,"C0FA"],
- [0x76EC,"F053"],
- [0x76ED,"F473"],
- [0x76EE,"A5D8"],
- [0x76EF,"A86E"],
- [0x76F0,"CD78"],
- [0x76F1,"CD77"],
- [0x76F2,"AABC"],
- [0x76F3,"CD76"],
- [0x76F4,"AABD"],
- [0x76F5,"CD79"],
- [0x76F7,"CFE5"],
- [0x76F8,"ACDB"],
- [0x76F9,"ACDA"],
- [0x76FA,"CFE7"],
- [0x76FB,"CFE6"],
- [0x76FC,"ACDF"],
- [0x76FE,"ACDE"],
- [0x7701,"ACD9"],
- [0x7703,"CFE1"],
- [0x7704,"CFE2"],
- [0x7705,"CFE3"],
- [0x7707,"ACE0"],
- [0x7708,"CFE0"],
- [0x7709,"ACDC"],
- [0x770A,"CFE4"],
- [0x770B,"ACDD"],
- [0x770C,"98C4"],
- [0x770E,"94B0"],
- [0x770F,"94B1"],
- [0x7710,"D2CF"],
- [0x7711,"D2D3"],
- [0x7712,"D2D1"],
- [0x7713,"D2D0"],
- [0x7715,"D2D4"],
- [0x7719,"D2D5"],
- [0x771A,"D2D6"],
- [0x771B,"D2CE"],
- [0x771D,"D2CD"],
- [0x771E,"FED1"],
- [0x771F,"AF75"],
- [0x7720,"AF76"],
- [0x7722,"D2D7"],
- [0x7723,"D2D2"],
- [0x7724,"A0C1"],
- [0x7725,"D6B0"],
- [0x7726,"FED2"],
- [0x7727,"D2D8"],
- [0x7728,"AF77"],
- [0x7729,"AF74"],
- [0x772B,"A0CD"],
- [0x772D,"D6AA"],
- [0x772F,"D6A9"],
- [0x7731,"D6AB"],
- [0x7732,"D6AC"],
- [0x7733,"D6AE"],
- [0x7734,"D6AD"],
- [0x7735,"D6B2"],
- [0x7736,"B2B5"],
- [0x7737,"B2B2"],
- [0x7738,"B2B6"],
- [0x7739,"D6A8"],
- [0x773A,"B2B7"],
- [0x773B,"D6B1"],
- [0x773C,"B2B4"],
- [0x773D,"D6AF"],
- [0x773E,"B2B3"],
- [0x7740,"FED3"],
- [0x7743,"98E5"],
- [0x7744,"DABC"],
- [0x7745,"DABE"],
- [0x7746,"DABA"],
- [0x7747,"DABB"],
- [0x774A,"DABF"],
- [0x774B,"DAC1"],
- [0x774C,"DAC2"],
- [0x774D,"DABD"],
- [0x774E,"DAC0"],
- [0x774F,"B574"],
- [0x7752,"DEDB"],
- [0x7754,"DEE0"],
- [0x7755,"DED8"],
- [0x7756,"DEDC"],
- [0x7758,"FED6"],
- [0x7759,"DEE1"],
- [0x775A,"DEDD"],
- [0x775B,"B7FA"],
- [0x775C,"B843"],
- [0x775E,"B7FD"],
- [0x775F,"DED9"],
- [0x7760,"DEDA"],
- [0x7761,"BACE"],
- [0x7762,"B846"],
- [0x7763,"B7FE"],
- [0x7765,"B844"],
- [0x7766,"B7FC"],
- [0x7767,"DEDF"],
- [0x7768,"B845"],
- [0x7769,"DEDE"],
- [0x776A,"B841"],
- [0x776B,"B7FB"],
- [0x776C,"B842"],
- [0x776D,"DEE2"],
- [0x776E,"E2E6"],
- [0x776F,"E2E8"],
- [0x7772,"91E4"],
- [0x7777,"8FC7"],
- [0x7778,"94AE"],
- [0x7779,"B840"],
- [0x777A,"8A4F"],
- [0x777B,"94B2"],
- [0x777C,"E2E3"],
- [0x777D,"BACC"],
- [0x777E,"E2E9"],
- [0x777F,"BACD"],
- [0x7780,"E2E7"],
- [0x7781,"E2E2"],
- [0x7782,"E2E5"],
- [0x7783,"E2EA"],
- [0x7784,"BACB"],
- [0x7785,"E2E4"],
- [0x7787,"BD4E"],
- [0x7788,"E6BF"],
- [0x7789,"E6BE"],
- [0x778B,"BD51"],
- [0x778C,"BD4F"],
- [0x778D,"E6BC"],
- [0x778E,"BD4D"],
- [0x778F,"E6BD"],
- [0x7791,"BD50"],
- [0x7793,"8FD4"],
- [0x7795,"EA7D"],
- [0x7797,"EAA1"],
- [0x7798,"98EA"],
- [0x7799,"EA7E"],
- [0x779A,"EA76"],
- [0x779B,"EA7A"],
- [0x779C,"EA79"],
- [0x779D,"EA77"],
- [0x779E,"BF66"],
- [0x779F,"BF67"],
- [0x77A0,"BF65"],
- [0x77A1,"EA78"],
- [0x77A2,"EA7B"],
- [0x77A3,"EA7C"],
- [0x77A5,"BF68"],
- [0x77A7,"C140"],
- [0x77A8,"EDA3"],
- [0x77AA,"C0FC"],
- [0x77AB,"ED7B"],
- [0x77AC,"C0FE"],
- [0x77AD,"C141"],
- [0x77AF,"FED8"],
- [0x77B0,"C0FD"],
- [0x77B1,"EDA2"],
- [0x77B2,"ED7C"],
- [0x77B3,"C0FB"],
- [0x77B4,"EDA1"],
- [0x77B5,"ED7A"],
- [0x77B6,"ED7E"],
- [0x77B7,"ED7D"],
- [0x77B9,"9DE0"],
- [0x77BA,"F055"],
- [0x77BB,"C2A4"],
- [0x77BC,"C2A5"],
- [0x77BD,"C2A2"],
- [0x77BE,"98EE"],
- [0x77BF,"C2A3"],
- [0x77C2,"F054"],
- [0x77C3,"95C4"],
- [0x77C4,"F27B"],
- [0x77C5,"FCE8"],
- [0x77C7,"C3A9"],
- [0x77C9,"F279"],
- [0x77CA,"F27A"],
- [0x77CB,"98EF"],
- [0x77CC,"F474"],
- [0x77CD,"F477"],
- [0x77CE,"F475"],
- [0x77CF,"F476"],
- [0x77D0,"F5E0"],
- [0x77D3,"C4EF"],
- [0x77D4,"F7EB"],
- [0x77D5,"F8B4"],
- [0x77D7,"C5F7"],
- [0x77D8,"F8F8"],
- [0x77D9,"F8F9"],
- [0x77DA,"C666"],
- [0x77DB,"A5D9"],
- [0x77DC,"ACE1"],
- [0x77DD,"8C6E"],
- [0x77DE,"DAC3"],
- [0x77E0,"DEE3"],
- [0x77E2,"A5DA"],
- [0x77E3,"A86F"],
- [0x77E5,"AABE"],
- [0x77E6,"FAD8"],
- [0x77E7,"CFE8"],
- [0x77E8,"CFE9"],
- [0x77E9,"AF78"],
- [0x77EC,"DAC4"],
- [0x77ED,"B575"],
- [0x77EE,"B847"],
- [0x77EF,"C142"],
- [0x77F0,"EDA4"],
- [0x77F1,"F27C"],
- [0x77F2,"F478"],
- [0x77F3,"A5DB"],
- [0x77F4,"FEDC"],
- [0x77F7,"CDA1"],
- [0x77F8,"CD7A"],
- [0x77F9,"CD7C"],
- [0x77FA,"CD7E"],
- [0x77FB,"CD7D"],
- [0x77FC,"CD7B"],
- [0x77FD,"AABF"],
- [0x77FE,"A0AE"],
- [0x7802,"ACE2"],
- [0x7803,"CFF2"],
- [0x7805,"CFED"],
- [0x7806,"CFEA"],
- [0x7808,"9D4C"],
- [0x7809,"CFF1"],
- [0x780C,"ACE4"],
- [0x780D,"ACE5"],
- [0x780E,"CFF0"],
- [0x780F,"CFEF"],
- [0x7810,"CFEE"],
- [0x7811,"CFEB"],
- [0x7812,"CFEC"],
- [0x7813,"CFF3"],
- [0x7814,"ACE3"],
- [0x7818,"98F1"],
- [0x781C,"98F3"],
- [0x781D,"AF7C"],
- [0x781E,"94C1"],
- [0x781F,"AFA4"],
- [0x7820,"AFA3"],
- [0x7821,"D2E1"],
- [0x7822,"D2DB"],
- [0x7823,"D2D9"],
- [0x7825,"AFA1"],
- [0x7826,"D6B9"],
- [0x7827,"AF7A"],
- [0x7828,"D2DE"],
- [0x7829,"D2E2"],
- [0x782A,"D2E4"],
- [0x782B,"D2E0"],
- [0x782C,"D2DA"],
- [0x782D,"AFA2"],
- [0x782E,"D2DF"],
- [0x782F,"D2DD"],
- [0x7830,"AF79"],
- [0x7831,"D2E5"],
- [0x7832,"AFA5"],
- [0x7833,"D2E3"],
- [0x7834,"AF7D"],
- [0x7835,"D2DC"],
- [0x7837,"AF7E"],
- [0x7838,"AF7B"],
- [0x7839,"98F5"],
- [0x783C,"FA4F"],
- [0x783D,"96E2"],
- [0x7842,"9450"],
- [0x7843,"B2B9"],
- [0x7844,"96A2"],
- [0x7845,"D6BA"],
- [0x7847,"98F6"],
- [0x7848,"D6B3"],
- [0x7849,"D6B5"],
- [0x784A,"D6B7"],
- [0x784B,"96E5"],
- [0x784C,"D6B8"],
- [0x784D,"D6B6"],
- [0x784E,"B2BA"],
- [0x7850,"D6BB"],
- [0x7851,"98F7"],
- [0x7852,"D6B4"],
- [0x7853,"A046"],
- [0x7854,"96E3"],
- [0x785C,"DAC8"],
- [0x785D,"B576"],
- [0x785E,"DAD0"],
- [0x7860,"DAC5"],
- [0x7862,"DAD1"],
- [0x7864,"DAC6"],
- [0x7865,"DAC7"],
- [0x7866,"98F8"],
- [0x7868,"DACF"],
- [0x7869,"DACE"],
- [0x786A,"DACB"],
- [0x786B,"B2B8"],
- [0x786C,"B577"],
- [0x786D,"DAC9"],
- [0x786E,"DACC"],
- [0x786F,"B578"],
- [0x7870,"DACD"],
- [0x7871,"DACA"],
- [0x7879,"DEEE"],
- [0x787A,"9EE4"],
- [0x787B,"DEF2"],
- [0x787C,"B84E"],
- [0x787E,"E2F0"],
- [0x787F,"B851"],
- [0x7880,"DEF0"],
- [0x7881,"F9D6"],
- [0x7883,"DEED"],
- [0x7884,"DEE8"],
- [0x7885,"DEEA"],
- [0x7886,"DEEB"],
- [0x7887,"DEE4"],
- [0x7888,"94C3"],
- [0x7889,"B84D"],
- [0x788C,"B84C"],
- [0x788D,"94C2"],
- [0x788E,"B848"],
- [0x788F,"DEE7"],
- [0x7891,"B84F"],
- [0x7893,"B850"],
- [0x7894,"DEE6"],
- [0x7895,"DEE9"],
- [0x7896,"DEF1"],
- [0x7897,"B84A"],
- [0x7898,"B84B"],
- [0x7899,"DEEF"],
- [0x789A,"DEE5"],
- [0x789E,"E2F2"],
- [0x789F,"BAD0"],
- [0x78A0,"E2F4"],
- [0x78A1,"DEEC"],
- [0x78A2,"E2F6"],
- [0x78A3,"BAD4"],
- [0x78A4,"E2F7"],
- [0x78A5,"E2F3"],
- [0x78A7,"BAD1"],
- [0x78A8,"E2EF"],
- [0x78A9,"BAD3"],
- [0x78AA,"E2EC"],
- [0x78AB,"E2F1"],
- [0x78AC,"E2F5"],
- [0x78AD,"E2EE"],
- [0x78AF,"FEE1"],
- [0x78B0,"B849"],
- [0x78B1,"FEE9"],
- [0x78B2,"E2EB"],
- [0x78B3,"BAD2"],
- [0x78B4,"E2ED"],
- [0x78B6,"96E4"],
- [0x78B8,"89AC"],
- [0x78B9,"96DB"],
- [0x78BA,"BD54"],
- [0x78BB,"E6C1"],
- [0x78BC,"BD58"],
- [0x78BE,"BD56"],
- [0x78C1,"BACF"],
- [0x78C3,"E6C8"],
- [0x78C4,"E6C9"],
- [0x78C5,"BD53"],
- [0x78C7,"FEE2"],
- [0x78C8,"E6C7"],
- [0x78C9,"E6CA"],
- [0x78CA,"BD55"],
- [0x78CB,"BD52"],
- [0x78CC,"E6C3"],
- [0x78CD,"E6C0"],
- [0x78CE,"E6C5"],
- [0x78CF,"E6C2"],
- [0x78D0,"BD59"],
- [0x78D1,"E6C4"],
- [0x78D2,"94C4"],
- [0x78D3,"FEE3"],
- [0x78D4,"E6C6"],
- [0x78D5,"BD57"],
- [0x78D7,"FEE7"],
- [0x78D8,"9FFB"],
- [0x78DA,"BF6A"],
- [0x78DB,"EAA8"],
- [0x78DD,"EAA2"],
- [0x78DE,"EAA6"],
- [0x78DF,"EAAC"],
- [0x78E0,"EAAD"],
- [0x78E1,"EAA9"],
- [0x78E2,"EAAA"],
- [0x78E3,"EAA7"],
- [0x78E4,"8C59"],
- [0x78E5,"EAA4"],
- [0x78E7,"BF6C"],
- [0x78E8,"BF69"],
- [0x78E9,"EAA3"],
- [0x78EA,"EAA5"],
- [0x78EC,"BF6B"],
- [0x78ED,"EAAB"],
- [0x78EE,"93C9"],
- [0x78EF,"C146"],
- [0x78F0,"94E8"],
- [0x78F1,"FB56"],
- [0x78F2,"EDAA"],
- [0x78F3,"EDA5"],
- [0x78F4,"C145"],
- [0x78F5,"90C5"],
- [0x78F7,"C143"],
- [0x78F9,"EDAC"],
- [0x78FA,"C144"],
- [0x78FB,"EDA8"],
- [0x78FC,"EDA9"],
- [0x78FD,"EDA6"],
- [0x78FE,"EDAD"],
- [0x78FF,"F056"],
- [0x7901,"C147"],
- [0x7902,"EDA7"],
- [0x7904,"EDAE"],
- [0x7905,"EDAB"],
- [0x7906,"A0A8"],
- [0x7909,"F05A"],
- [0x790C,"F057"],
- [0x790E,"C2A6"],
- [0x7910,"F05B"],
- [0x7911,"F05D"],
- [0x7912,"F05C"],
- [0x7913,"F058"],
- [0x7914,"F059"],
- [0x7917,"F2A3"],
- [0x7919,"C3AA"],
- [0x791B,"F27E"],
- [0x791C,"F2A2"],
- [0x791D,"F27D"],
- [0x791E,"F2A4"],
- [0x7921,"F2A1"],
- [0x7923,"F47A"],
- [0x7924,"F47D"],
- [0x7925,"F479"],
- [0x7926,"C471"],
- [0x7927,"F47B"],
- [0x7928,"F47C"],
- [0x7929,"F47E"],
- [0x792A,"C472"],
- [0x792B,"C474"],
- [0x792C,"C473"],
- [0x792D,"F5E1"],
- [0x792E,"FEE5"],
- [0x792F,"F5E3"],
- [0x7931,"F5E2"],
- [0x7932,"98FD"],
- [0x7933,"98FB"],
- [0x7934,"FEE8"],
- [0x7935,"F6F6"],
- [0x7936,"8EBF"],
- [0x7938,"F8B5"],
- [0x7939,"F8FA"],
- [0x793A,"A5DC"],
- [0x793B,"8BD8"],
- [0x793C,"FEF7"],
- [0x793D,"CB72"],
- [0x793E,"AAC0"],
- [0x793F,"CDA3"],
- [0x7940,"AAC1"],
- [0x7941,"AAC2"],
- [0x7942,"CDA2"],
- [0x7944,"CFF8"],
- [0x7945,"CFF7"],
- [0x7946,"ACE6"],
- [0x7947,"ACE9"],
- [0x7948,"ACE8"],
- [0x7949,"ACE7"],
- [0x794A,"CFF4"],
- [0x794B,"CFF6"],
- [0x794C,"CFF5"],
- [0x794F,"D2E8"],
- [0x7950,"AFA7"],
- [0x7951,"D2EC"],
- [0x7952,"D2EB"],
- [0x7953,"D2EA"],
- [0x7954,"D2E6"],
- [0x7955,"AFA6"],
- [0x7956,"AFAA"],
- [0x7957,"AFAD"],
- [0x7958,"8F68"],
- [0x7959,"94C6"],
- [0x795A,"AFAE"],
- [0x795B,"D2E7"],
- [0x795C,"D2E9"],
- [0x795D,"AFAC"],
- [0x795E,"AFAB"],
- [0x795F,"AFA9"],
- [0x7960,"AFA8"],
- [0x7961,"D6C2"],
- [0x7962,"9DEA"],
- [0x7963,"D6C0"],
- [0x7964,"D6BC"],
- [0x7965,"B2BB"],
- [0x7967,"D6BD"],
- [0x7968,"B2BC"],
- [0x7969,"D6BE"],
- [0x796A,"D6BF"],
- [0x796B,"D6C1"],
- [0x796D,"B2BD"],
- [0x7970,"DAD5"],
- [0x7971,"FC69"],
- [0x7972,"DAD4"],
- [0x7973,"DAD3"],
- [0x7974,"DAD2"],
- [0x7979,"DEF6"],
- [0x797A,"B852"],
- [0x797C,"DEF3"],
- [0x797D,"DEF5"],
- [0x797E,"9CDA"],
- [0x797F,"B853"],
- [0x7980,"FEF3"],
- [0x7981,"B854"],
- [0x7982,"DEF4"],
- [0x7983,"9C72"],
- [0x7986,"FEF0"],
- [0x7987,"89C9"],
- [0x7988,"E341"],
- [0x798A,"E2F9"],
- [0x798B,"E2FA"],
- [0x798D,"BAD7"],
- [0x798E,"BAD5"],
- [0x798F,"BAD6"],
- [0x7990,"E343"],
- [0x7991,"9941"],
- [0x7992,"E342"],
- [0x7993,"E2FE"],
- [0x7994,"E2FD"],
- [0x7995,"E2FC"],
- [0x7996,"E2FB"],
- [0x7997,"E340"],
- [0x7998,"E2F8"],
- [0x7999,"9942"],
- [0x799A,"E6CB"],
- [0x799B,"E6D0"],
- [0x799C,"E6CE"],
- [0x799D,"FEF5"],
- [0x799F,"91D7"],
- [0x79A0,"E6CD"],
- [0x79A1,"E6CC"],
- [0x79A2,"E6CF"],
- [0x79A4,"EAAE"],
- [0x79A5,"94CC"],
- [0x79A6,"BF6D"],
- [0x79A7,"C148"],
- [0x79A8,"EDB0"],
- [0x79A9,"FEF8"],
- [0x79AA,"C149"],
- [0x79AB,"EDAF"],
- [0x79AC,"F05F"],
- [0x79AD,"F05E"],
- [0x79AE,"C2A7"],
- [0x79B0,"F2A5"],
- [0x79B1,"C3AB"],
- [0x79B2,"F4A1"],
- [0x79B3,"C5A1"],
- [0x79B4,"F6F7"],
- [0x79B6,"F8B7"],
- [0x79B7,"F8B6"],
- [0x79B8,"C9A8"],
- [0x79B9,"ACEA"],
- [0x79BA,"ACEB"],
- [0x79BB,"D6C3"],
- [0x79BD,"B856"],
- [0x79BE,"A5DD"],
- [0x79BF,"A872"],
- [0x79C0,"A871"],
- [0x79C1,"A870"],
- [0x79C4,"97A8"],
- [0x79C5,"CDA4"],
- [0x79C6,"FEFC"],
- [0x79C8,"AAC4"],
- [0x79C9,"AAC3"],
- [0x79CA,"8CDE"],
- [0x79CB,"ACEE"],
- [0x79CC,"FDBF"],
- [0x79CD,"CFFA"],
- [0x79CE,"CFFD"],
- [0x79CF,"CFFB"],
- [0x79D0,"87B3"],
- [0x79D1,"ACEC"],
- [0x79D2,"ACED"],
- [0x79D4,"FEFE"],
- [0x79D5,"CFF9"],
- [0x79D6,"CFFC"],
- [0x79D8,"AFB5"],
- [0x79DC,"D2F3"],
- [0x79DD,"D2F5"],
- [0x79DE,"D2F4"],
- [0x79DF,"AFB2"],
- [0x79E0,"D2EF"],
- [0x79E2,"96D1"],
- [0x79E3,"AFB0"],
- [0x79E4,"AFAF"],
- [0x79E6,"AFB3"],
- [0x79E7,"AFB1"],
- [0x79E9,"AFB4"],
- [0x79EA,"D2F2"],
- [0x79EB,"D2ED"],
- [0x79EC,"D2EE"],
- [0x79ED,"D2F1"],
- [0x79EE,"D2F0"],
- [0x79F1,"94D5"],
- [0x79F4,"94D0"],
- [0x79F6,"D6C6"],
- [0x79F7,"D6C7"],
- [0x79F8,"D6C5"],
- [0x79FA,"D6C4"],
- [0x79FB,"B2BE"],
- [0x7A00,"B57D"],
- [0x7A02,"DAD6"],
- [0x7A03,"DAD8"],
- [0x7A04,"DADA"],
- [0x7A05,"B57C"],
- [0x7A06,"9944"],
- [0x7A08,"B57A"],
- [0x7A0A,"DAD7"],
- [0x7A0B,"B57B"],
- [0x7A0C,"DAD9"],
- [0x7A0D,"B579"],
- [0x7A10,"DF41"],
- [0x7A11,"DEF7"],
- [0x7A12,"DEFA"],
- [0x7A13,"DEFE"],
- [0x7A14,"B85A"],
- [0x7A15,"DEFC"],
- [0x7A17,"DEFB"],
- [0x7A18,"DEF8"],
- [0x7A19,"DEF9"],
- [0x7A1A,"B858"],
- [0x7A1B,"DF40"],
- [0x7A1C,"B857"],
- [0x7A1E,"B85C"],
- [0x7A1F,"B85B"],
- [0x7A20,"B859"],
- [0x7A22,"DEFD"],
- [0x7A26,"E349"],
- [0x7A28,"E348"],
- [0x7A2A,"8C63"],
- [0x7A2B,"E344"],
- [0x7A2C,"87BB"],
- [0x7A2D,"A0B3"],
- [0x7A2E,"BAD8"],
- [0x7A2F,"E347"],
- [0x7A30,"E346"],
- [0x7A31,"BAD9"],
- [0x7A32,"87B4"],
- [0x7A37,"BD5E"],
- [0x7A39,"E6D2"],
- [0x7A3A,"94CF"],
- [0x7A3B,"BD5F"],
- [0x7A3C,"BD5B"],
- [0x7A3D,"BD5D"],
- [0x7A3E,"9FFA"],
- [0x7A3F,"BD5A"],
- [0x7A40,"BD5C"],
- [0x7A43,"91E5"],
- [0x7A44,"EAAF"],
- [0x7A45,"9C6A"],
- [0x7A46,"BF70"],
- [0x7A47,"EAB1"],
- [0x7A48,"EAB0"],
- [0x7A49,"8E49"],
- [0x7A4A,"E345"],
- [0x7A4B,"BF72"],
- [0x7A4C,"BF71"],
- [0x7A4D,"BF6E"],
- [0x7A4E,"BF6F"],
- [0x7A54,"EDB5"],
- [0x7A56,"EDB3"],
- [0x7A57,"C14A"],
- [0x7A58,"EDB4"],
- [0x7A5A,"EDB6"],
- [0x7A5B,"EDB2"],
- [0x7A5C,"EDB1"],
- [0x7A5F,"F060"],
- [0x7A60,"C2AA"],
- [0x7A61,"C2A8"],
- [0x7A62,"C2A9"],
- [0x7A65,"8E4C"],
- [0x7A67,"F2A6"],
- [0x7A68,"F2A7"],
- [0x7A69,"C3AD"],
- [0x7A6B,"C3AC"],
- [0x7A6C,"F4A3"],
- [0x7A6D,"F4A4"],
- [0x7A6E,"F4A2"],
- [0x7A70,"F6F8"],
- [0x7A71,"F6F9"],
- [0x7A72,"87C9"],
- [0x7A74,"A5DE"],
- [0x7A75,"CA48"],
- [0x7A76,"A873"],
- [0x7A78,"CDA5"],
- [0x7A79,"AAC6"],
- [0x7A7A,"AAC5"],
- [0x7A7B,"CDA6"],
- [0x7A7D,"8E4D"],
- [0x7A7E,"D040"],
- [0x7A7F,"ACEF"],
- [0x7A80,"CFFE"],
- [0x7A81,"ACF0"],
- [0x7A83,"9A73"],
- [0x7A84,"AFB6"],
- [0x7A85,"D2F8"],
- [0x7A86,"D2F6"],
- [0x7A87,"D2FC"],
- [0x7A88,"AFB7"],
- [0x7A89,"D2F7"],
- [0x7A8A,"D2FB"],
- [0x7A8B,"D2F9"],
- [0x7A8C,"D2FA"],
- [0x7A8F,"D6C8"],
- [0x7A90,"D6CA"],
- [0x7A91,"9947"],
- [0x7A92,"B2BF"],
- [0x7A93,"8CB1"],
- [0x7A94,"D6C9"],
- [0x7A95,"B2C0"],
- [0x7A96,"B5A2"],
- [0x7A97,"B5A1"],
- [0x7A98,"B57E"],
- [0x7A99,"DADB"],
- [0x7A9E,"DF44"],
- [0x7A9F,"B85D"],
- [0x7AA0,"B85E"],
- [0x7AA2,"DF43"],
- [0x7AA3,"DF42"],
- [0x7AA8,"E34A"],
- [0x7AA9,"BADB"],
- [0x7AAA,"BADA"],
- [0x7AAB,"E34B"],
- [0x7AAC,"E34C"],
- [0x7AAE,"BD61"],
- [0x7AAF,"BD60"],
- [0x7AB0,"8E50"],
- [0x7AB1,"EAB5"],
- [0x7AB2,"E6D3"],
- [0x7AB3,"E6D5"],
- [0x7AB4,"E6D4"],
- [0x7AB5,"EAB4"],
- [0x7AB6,"EAB2"],
- [0x7AB7,"EAB6"],
- [0x7AB8,"EAB3"],
- [0x7ABA,"BF73"],
- [0x7ABB,"8E4F"],
- [0x7ABC,"9949"],
- [0x7ABE,"EDB7"],
- [0x7ABF,"C14B"],
- [0x7AC0,"EDB8"],
- [0x7AC1,"EDB9"],
- [0x7AC2,"8E51"],
- [0x7AC3,"8E52"],
- [0x7AC4,"C2AB"],
- [0x7AC5,"C2AC"],
- [0x7AC7,"C475"],
- [0x7AC8,"9AB2"],
- [0x7AC9,"89A5"],
- [0x7ACA,"C5D1"],
- [0x7ACB,"A5DF"],
- [0x7ACF,"994C"],
- [0x7AD1,"D041"],
- [0x7AD3,"9FF8"],
- [0x7AD8,"D2FD"],
- [0x7AD9,"AFB8"],
- [0x7ADA,"8E56"],
- [0x7ADB,"994D"],
- [0x7ADC,"91CA"],
- [0x7ADD,"8E57"],
- [0x7ADF,"B3BA"],
- [0x7AE0,"B3B9"],
- [0x7AE2,"94E1"],
- [0x7AE3,"B5A4"],
- [0x7AE4,"DADD"],
- [0x7AE5,"B5A3"],
- [0x7AE6,"DADC"],
- [0x7AE7,"9047"],
- [0x7AE9,"8FD8"],
- [0x7AEA,"8E58"],
- [0x7AEB,"DF45"],
- [0x7AED,"BADC"],
- [0x7AEE,"E34D"],
- [0x7AEF,"BADD"],
- [0x7AF6,"C476"],
- [0x7AF7,"F4A5"],
- [0x7AF9,"A6CB"],
- [0x7AFA,"AAC7"],
- [0x7AFB,"CDA7"],
- [0x7AFC,"87A3"],
- [0x7AFD,"ACF2"],
- [0x7AFE,"94EB"],
- [0x7AFF,"ACF1"],
- [0x7B00,"D042"],
- [0x7B01,"D043"],
- [0x7B04,"D340"],
- [0x7B05,"D342"],
- [0x7B06,"AFB9"],
- [0x7B08,"D344"],
- [0x7B09,"D347"],
- [0x7B0A,"D345"],
- [0x7B0B,"8E5C"],
- [0x7B0C,"9553"],
- [0x7B0E,"D346"],
- [0x7B0F,"D343"],
- [0x7B10,"D2FE"],
- [0x7B11,"AFBA"],
- [0x7B12,"D348"],
- [0x7B13,"D341"],
- [0x7B14,"9FE5"],
- [0x7B18,"D6D3"],
- [0x7B19,"B2C6"],
- [0x7B1A,"D6DC"],
- [0x7B1B,"B2C3"],
- [0x7B1D,"D6D5"],
- [0x7B1E,"B2C7"],
- [0x7B1F,"9F56"],
- [0x7B20,"B2C1"],
- [0x7B22,"D6D0"],
- [0x7B23,"D6DD"],
- [0x7B24,"D6D1"],
- [0x7B25,"D6CE"],
- [0x7B26,"B2C5"],
- [0x7B27,"954F"],
- [0x7B28,"B2C2"],
- [0x7B29,"8E5E"],
- [0x7B2A,"D6D4"],
- [0x7B2B,"D6D7"],
- [0x7B2C,"B2C4"],
- [0x7B2D,"D6D8"],
- [0x7B2E,"B2C8"],
- [0x7B2F,"D6D9"],
- [0x7B30,"D6CF"],
- [0x7B31,"D6D6"],
- [0x7B32,"D6DA"],
- [0x7B33,"D6D2"],
- [0x7B34,"D6CD"],
- [0x7B35,"D6CB"],
- [0x7B38,"D6DB"],
- [0x7B39,"996A"],
- [0x7B3B,"DADF"],
- [0x7B40,"DAE4"],
- [0x7B42,"9C64"],
- [0x7B43,"9CD9"],
- [0x7B44,"DAE0"],
- [0x7B45,"DAE6"],
- [0x7B46,"B5A7"],
- [0x7B47,"D6CC"],
- [0x7B48,"DAE1"],
- [0x7B49,"B5A5"],
- [0x7B4A,"DADE"],
- [0x7B4B,"B5AC"],
- [0x7B4C,"DAE2"],
- [0x7B4D,"B5AB"],
- [0x7B4E,"DAE3"],
- [0x7B4F,"B5AD"],
- [0x7B50,"B5A8"],
- [0x7B51,"B5AE"],
- [0x7B52,"B5A9"],
- [0x7B54,"B5AA"],
- [0x7B55,"8E5D"],
- [0x7B56,"B5A6"],
- [0x7B58,"DAE5"],
- [0x7B60,"B861"],
- [0x7B61,"DF50"],
- [0x7B62,"9950"],
- [0x7B63,"DF53"],
- [0x7B64,"DF47"],
- [0x7B65,"DF4C"],
- [0x7B66,"DF46"],
- [0x7B67,"B863"],
- [0x7B69,"DF4A"],
- [0x7B6C,"9951"],
- [0x7B6D,"DF48"],
- [0x7B6E,"B862"],
- [0x7B6F,"8E62"],
- [0x7B70,"DF4F"],
- [0x7B71,"DF4E"],
- [0x7B72,"DF4B"],
- [0x7B73,"DF4D"],
- [0x7B74,"DF49"],
- [0x7B75,"BAE1"],
- [0x7B76,"DF52"],
- [0x7B77,"B85F"],
- [0x7B78,"DF51"],
- [0x7B7B,"9952"],
- [0x7B82,"E35D"],
- [0x7B84,"BAE8"],
- [0x7B85,"E358"],
- [0x7B87,"BAE7"],
- [0x7B88,"E34E"],
- [0x7B8A,"E350"],
- [0x7B8B,"BAE0"],
- [0x7B8C,"E355"],
- [0x7B8D,"E354"],
- [0x7B8E,"E357"],
- [0x7B8F,"BAE5"],
- [0x7B90,"E352"],
- [0x7B91,"E351"],
- [0x7B92,"8E68"],
- [0x7B94,"BAE4"],
- [0x7B95,"BADF"],
- [0x7B96,"E353"],
- [0x7B97,"BAE2"],
- [0x7B98,"E359"],
- [0x7B99,"E35B"],
- [0x7B9B,"E356"],
- [0x7B9C,"E34F"],
- [0x7B9D,"BAE3"],
- [0x7BA0,"BD69"],
- [0x7BA1,"BADE"],
- [0x7BA2,"8E61"],
- [0x7BA3,"9F59"],
- [0x7BA4,"E35C"],
- [0x7BAC,"E6D9"],
- [0x7BAD,"BD62"],
- [0x7BAE,"87D0"],
- [0x7BAF,"E6DB"],
- [0x7BB1,"BD63"],
- [0x7BB2,"8BB3"],
- [0x7BB4,"BD65"],
- [0x7BB5,"E6DE"],
- [0x7BB7,"E6D6"],
- [0x7BB8,"BAE6"],
- [0x7BB9,"E6DC"],
- [0x7BBE,"E6D8"],
- [0x7BC0,"B860"],
- [0x7BC1,"BD68"],
- [0x7BC4,"BD64"],
- [0x7BC5,"87B9"],
- [0x7BC6,"BD66"],
- [0x7BC7,"BD67"],
- [0x7BC9,"BF76"],
- [0x7BCA,"E6DD"],
- [0x7BCB,"E6D7"],
- [0x7BCC,"BD6A"],
- [0x7BCE,"E6DA"],
- [0x7BCF,"9F5D"],
- [0x7BD0,"8E66"],
- [0x7BD4,"EAC0"],
- [0x7BD5,"EABB"],
- [0x7BD8,"EAC5"],
- [0x7BD9,"BF74"],
- [0x7BDA,"EABD"],
- [0x7BDB,"BF78"],
- [0x7BDC,"EAC3"],
- [0x7BDD,"EABA"],
- [0x7BDE,"EAB7"],
- [0x7BDF,"EAC6"],
- [0x7BE0,"C151"],
- [0x7BE1,"BF79"],
- [0x7BE2,"EAC2"],
- [0x7BE3,"EAB8"],
- [0x7BE4,"BF77"],
- [0x7BE5,"EABC"],
- [0x7BE6,"BF7B"],
- [0x7BE7,"EAB9"],
- [0x7BE8,"EABE"],
- [0x7BE9,"BF7A"],
- [0x7BEA,"EAC1"],
- [0x7BEB,"EAC4"],
- [0x7BEC,"8CB2"],
- [0x7BF0,"EDCB"],
- [0x7BF1,"EDCC"],
- [0x7BF2,"EDBC"],
- [0x7BF3,"EDC3"],
- [0x7BF4,"EDC1"],
- [0x7BF7,"C14F"],
- [0x7BF8,"EDC8"],
- [0x7BF9,"EABF"],
- [0x7BFA,"8E6E"],
- [0x7BFB,"EDBF"],
- [0x7BFC,"9F64"],
- [0x7BFD,"EDC9"],
- [0x7BFE,"C14E"],
- [0x7BFF,"EDBE"],
- [0x7C00,"EDBD"],
- [0x7C01,"EDC7"],
- [0x7C02,"EDC4"],
- [0x7C03,"EDC6"],
- [0x7C05,"EDBA"],
- [0x7C06,"EDCA"],
- [0x7C07,"C14C"],
- [0x7C09,"EDC5"],
- [0x7C0A,"EDCE"],
- [0x7C0B,"EDC2"],
- [0x7C0C,"C150"],
- [0x7C0D,"C14D"],
- [0x7C0E,"EDC0"],
- [0x7C0F,"EDBB"],
- [0x7C10,"EDCD"],
- [0x7C11,"BF75"],
- [0x7C12,"9953"],
- [0x7C15,"FAB8"],
- [0x7C19,"F063"],
- [0x7C1B,"9954"],
- [0x7C1C,"F061"],
- [0x7C1D,"F067"],
- [0x7C1E,"C2B0"],
- [0x7C1F,"F065"],
- [0x7C20,"F064"],
- [0x7C21,"C2B2"],
- [0x7C22,"F06A"],
- [0x7C23,"C2B1"],
- [0x7C25,"F06B"],
- [0x7C26,"F068"],
- [0x7C27,"C2AE"],
- [0x7C28,"F069"],
- [0x7C29,"F062"],
- [0x7C2A,"C2AF"],
- [0x7C2B,"C2AD"],
- [0x7C2C,"F2AB"],
- [0x7C2D,"F066"],
- [0x7C30,"F06C"],
- [0x7C33,"F2A8"],
- [0x7C35,"8E70"],
- [0x7C37,"C3B2"],
- [0x7C38,"C3B0"],
- [0x7C39,"F2AA"],
- [0x7C3B,"F2AC"],
- [0x7C3C,"F2A9"],
- [0x7C3D,"C3B1"],
- [0x7C3E,"C3AE"],
- [0x7C3F,"C3AF"],
- [0x7C40,"C3B3"],
- [0x7C42,"9F61"],
- [0x7C43,"C478"],
- [0x7C44,"8E72"],
- [0x7C45,"F4AA"],
- [0x7C47,"F4A9"],
- [0x7C48,"F4A7"],
- [0x7C49,"F4A6"],
- [0x7C4A,"F4A8"],
- [0x7C4C,"C477"],
- [0x7C4D,"C479"],
- [0x7C50,"C4F0"],
- [0x7C51,"A06B"],
- [0x7C53,"F5E5"],
- [0x7C54,"F5E4"],
- [0x7C56,"9F40"],
- [0x7C57,"F6FA"],
- [0x7C59,"F6FC"],
- [0x7C5A,"F6FE"],
- [0x7C5B,"F6FD"],
- [0x7C5C,"F6FB"],
- [0x7C5D,"94ED"],
- [0x7C5F,"C5A3"],
- [0x7C60,"C5A2"],
- [0x7C63,"C5D3"],
- [0x7C64,"C5D2"],
- [0x7C65,"C5D4"],
- [0x7C66,"F7ED"],
- [0x7C67,"F7EC"],
- [0x7C69,"F8FB"],
- [0x7C6A,"F8B8"],
- [0x7C6B,"F8FC"],
- [0x7C6C,"C658"],
- [0x7C6D,"94EE"],
- [0x7C6E,"C659"],
- [0x7C6F,"F96D"],
- [0x7C70,"9FBD"],
- [0x7C72,"C67E"],
- [0x7C73,"A6CC"],
- [0x7C74,"8E7B"],
- [0x7C75,"CDA8"],
- [0x7C78,"D045"],
- [0x7C79,"D046"],
- [0x7C7A,"D044"],
- [0x7C7B,"9957"],
- [0x7C7C,"94F7"],
- [0x7C7D,"ACF3"],
- [0x7C7E,"9F5F"],
- [0x7C7F,"D047"],
- [0x7C80,"D048"],
- [0x7C81,"D049"],
- [0x7C83,"8E73"],
- [0x7C84,"D349"],
- [0x7C85,"D34F"],
- [0x7C86,"9F62"],
- [0x7C88,"D34D"],
- [0x7C89,"AFBB"],
- [0x7C8A,"D34B"],
- [0x7C8C,"D34C"],
- [0x7C8D,"D34E"],
- [0x7C8E,"94F6"],
- [0x7C91,"D34A"],
- [0x7C92,"B2C9"],
- [0x7C94,"D6DE"],
- [0x7C95,"B2CB"],
- [0x7C96,"D6E0"],
- [0x7C97,"B2CA"],
- [0x7C98,"D6DF"],
- [0x7C9C,"9958"],
- [0x7C9E,"DAE8"],
- [0x7C9F,"B5AF"],
- [0x7CA1,"DAEA"],
- [0x7CA2,"DAE7"],
- [0x7CA3,"D6E1"],
- [0x7CA5,"B5B0"],
- [0x7CA6,"8E75"],
- [0x7CA7,"F9DB"],
- [0x7CA8,"DAE9"],
- [0x7CAC,"9072"],
- [0x7CAE,"94F8"],
- [0x7CAF,"DF56"],
- [0x7CB1,"B864"],
- [0x7CB2,"DF54"],
- [0x7CB3,"B865"],
- [0x7CB4,"DF55"],
- [0x7CB5,"B866"],
- [0x7CB8,"995A"],
- [0x7CB9,"BAE9"],
- [0x7CBA,"E361"],
- [0x7CBB,"E35E"],
- [0x7CBC,"E360"],
- [0x7CBD,"BAEA"],
- [0x7CBE,"BAEB"],
- [0x7CBF,"E35F"],
- [0x7CC2,"A0B0"],
- [0x7CC3,"8CB3"],
- [0x7CC5,"E6DF"],
- [0x7CC7,"8E79"],
- [0x7CC8,"E6E0"],
- [0x7CC9,"8E78"],
- [0x7CCA,"BD6B"],
- [0x7CCB,"E6E2"],
- [0x7CCC,"E6E1"],
- [0x7CCD,"94F3"],
- [0x7CCE,"A261"],
- [0x7CD0,"EACA"],
- [0x7CD1,"EACB"],
- [0x7CD2,"EAC7"],
- [0x7CD3,"98AF"],
- [0x7CD4,"EAC8"],
- [0x7CD5,"BF7C"],
- [0x7CD6,"BF7D"],
- [0x7CD7,"EAC9"],
- [0x7CD9,"C157"],
- [0x7CDA,"A0B2"],
- [0x7CDC,"C153"],
- [0x7CDD,"C158"],
- [0x7CDE,"C154"],
- [0x7CDF,"C156"],
- [0x7CE0,"C152"],
- [0x7CE2,"C155"],
- [0x7CE6,"8E7A"],
- [0x7CE7,"C2B3"],
- [0x7CE8,"EDCF"],
- [0x7CEA,"F2AE"],
- [0x7CEC,"F2AD"],
- [0x7CED,"995C"],
- [0x7CEE,"F4AB"],
- [0x7CEF,"C47A"],
- [0x7CF0,"C47B"],
- [0x7CF1,"F741"],
- [0x7CF2,"F5E6"],
- [0x7CF3,"8E7C"],
- [0x7CF4,"F740"],
- [0x7CF5,"8E7D"],
- [0x7CF6,"F8FD"],
- [0x7CF7,"F9A4"],
- [0x7CF8,"A6CD"],
- [0x7CF9,"8BD9"],
- [0x7CFB,"A874"],
- [0x7CFC,"89A2"],
- [0x7CFD,"CDA9"],
- [0x7CFE,"AAC8"],
- [0x7D00,"ACF6"],
- [0x7D01,"D04C"],
- [0x7D02,"ACF4"],
- [0x7D03,"D04A"],
- [0x7D04,"ACF9"],
- [0x7D05,"ACF5"],
- [0x7D06,"ACFA"],
- [0x7D07,"ACF8"],
- [0x7D08,"D04B"],
- [0x7D09,"ACF7"],
- [0x7D0A,"AFBF"],
- [0x7D0B,"AFBE"],
- [0x7D0C,"D35A"],
- [0x7D0D,"AFC7"],
- [0x7D0E,"D353"],
- [0x7D0F,"D359"],
- [0x7D10,"AFC3"],
- [0x7D11,"D352"],
- [0x7D12,"D358"],
- [0x7D13,"D356"],
- [0x7D14,"AFC2"],
- [0x7D15,"AFC4"],
- [0x7D16,"D355"],
- [0x7D17,"AFBD"],
- [0x7D18,"D354"],
- [0x7D19,"AFC8"],
- [0x7D1A,"AFC5"],
- [0x7D1B,"AFC9"],
- [0x7D1C,"AFC6"],
- [0x7D1D,"D351"],
- [0x7D1E,"D350"],
- [0x7D1F,"D357"],
- [0x7D20,"AFC0"],
- [0x7D21,"AFBC"],
- [0x7D22,"AFC1"],
- [0x7D25,"9ED7"],
- [0x7D28,"D6F0"],
- [0x7D29,"D6E9"],
- [0x7D2B,"B5B5"],
- [0x7D2C,"D6E8"],
- [0x7D2E,"B2CF"],
- [0x7D2F,"B2D6"],
- [0x7D30,"B2D3"],
- [0x7D31,"B2D9"],
- [0x7D32,"B2D8"],
- [0x7D33,"B2D4"],
- [0x7D35,"D6E2"],
- [0x7D36,"D6E5"],
- [0x7D38,"D6E4"],
- [0x7D39,"B2D0"],
- [0x7D3A,"D6E6"],
- [0x7D3B,"D6EF"],
- [0x7D3C,"B2D1"],
- [0x7D3D,"D6E3"],
- [0x7D3E,"D6EC"],
- [0x7D3F,"D6ED"],
- [0x7D40,"B2D2"],
- [0x7D41,"D6EA"],
- [0x7D42,"B2D7"],
- [0x7D43,"B2CD"],
- [0x7D44,"B2D5"],
- [0x7D45,"D6E7"],
- [0x7D46,"B2CC"],
- [0x7D47,"D6EB"],
- [0x7D4A,"D6EE"],
- [0x7D4D,"A0B6"],
- [0x7D4E,"DAFB"],
- [0x7D4F,"DAF2"],
- [0x7D50,"B5B2"],
- [0x7D51,"DAF9"],
- [0x7D52,"DAF6"],
- [0x7D53,"DAEE"],
- [0x7D54,"DAF7"],
- [0x7D55,"B5B4"],
- [0x7D56,"DAEF"],
- [0x7D58,"DAEB"],
- [0x7D5A,"9E42"],
- [0x7D5B,"B86C"],
- [0x7D5C,"DAF4"],
- [0x7D5D,"8EA4"],
- [0x7D5E,"B5B1"],
- [0x7D5F,"DAFA"],
- [0x7D61,"B5B8"],
- [0x7D62,"B5BA"],
- [0x7D63,"DAED"],
- [0x7D66,"B5B9"],
- [0x7D67,"DAF0"],
- [0x7D68,"B5B3"],
- [0x7D69,"DAF8"],
- [0x7D6A,"DAF1"],
- [0x7D6B,"DAF5"],
- [0x7D6D,"DAF3"],
- [0x7D6E,"B5B6"],
- [0x7D6F,"DAEC"],
- [0x7D70,"B5BB"],
- [0x7D71,"B2CE"],
- [0x7D72,"B5B7"],
- [0x7D73,"B5BC"],
- [0x7D79,"B868"],
- [0x7D7A,"DF5D"],
- [0x7D7B,"DF5F"],
- [0x7D7C,"DF61"],
- [0x7D7D,"DF65"],
- [0x7D7F,"DF5B"],
- [0x7D80,"DF59"],
- [0x7D81,"B86A"],
- [0x7D83,"DF60"],
- [0x7D84,"DF64"],
- [0x7D85,"DF5C"],
- [0x7D86,"DF58"],
- [0x7D88,"DF57"],
- [0x7D89,"8EA7"],
- [0x7D8B,"8C76"],
- [0x7D8C,"DF62"],
- [0x7D8D,"DF5A"],
- [0x7D8E,"DF5E"],
- [0x7D8F,"B86B"],
- [0x7D91,"B869"],
- [0x7D92,"DF66"],
- [0x7D93,"B867"],
- [0x7D94,"DF63"],
- [0x7D95,"8767"],
- [0x7D96,"E372"],
- [0x7D97,"9542"],
- [0x7D9C,"BAEE"],
- [0x7D9D,"E36A"],
- [0x7D9E,"BD78"],
- [0x7D9F,"E374"],
- [0x7DA0,"BAF1"],
- [0x7DA1,"E378"],
- [0x7DA2,"BAF7"],
- [0x7DA3,"E365"],
- [0x7DA4,"987D"],
- [0x7DA6,"E375"],
- [0x7DA7,"E362"],
- [0x7DA8,"9755"],
- [0x7DA9,"E377"],
- [0x7DAA,"E366"],
- [0x7DAB,"8EA8"],
- [0x7DAC,"BAFE"],
- [0x7DAD,"BAFB"],
- [0x7DAE,"E376"],
- [0x7DAF,"E370"],
- [0x7DB0,"BAED"],
- [0x7DB1,"BAF5"],
- [0x7DB2,"BAF4"],
- [0x7DB3,"8EAA"],
- [0x7DB4,"BAF3"],
- [0x7DB5,"BAF9"],
- [0x7DB7,"E363"],
- [0x7DB8,"BAFA"],
- [0x7DB9,"E371"],
- [0x7DBA,"BAF6"],
- [0x7DBB,"BAEC"],
- [0x7DBC,"E373"],
- [0x7DBD,"BAEF"],
- [0x7DBE,"BAF0"],
- [0x7DBF,"BAF8"],
- [0x7DC0,"E368"],
- [0x7DC1,"E367"],
- [0x7DC2,"E364"],
- [0x7DC4,"E36C"],
- [0x7DC5,"E369"],
- [0x7DC6,"E36D"],
- [0x7DC7,"BAFD"],
- [0x7DC9,"E379"],
- [0x7DCA,"BAF2"],
- [0x7DCB,"E36E"],
- [0x7DCC,"E36F"],
- [0x7DCD,"89A3"],
- [0x7DCE,"E36B"],
- [0x7DCF,"9960"],
- [0x7DD0,"9962"],
- [0x7DD2,"BAFC"],
- [0x7DD3,"94FC"],
- [0x7DD4,"9961"],
- [0x7DD7,"E6E7"],
- [0x7DD8,"BD70"],
- [0x7DD9,"BD79"],
- [0x7DDA,"BD75"],
- [0x7DDB,"E6E4"],
- [0x7DDC,"94FA"],
- [0x7DDD,"BD72"],
- [0x7DDE,"BD76"],
- [0x7DDF,"E6F0"],
- [0x7DE0,"BD6C"],
- [0x7DE1,"E6E8"],
- [0x7DE3,"BD74"],
- [0x7DE4,"8EAE"],
- [0x7DE5,"8EB2"],
- [0x7DE6,"E6EB"],
- [0x7DE7,"E6E6"],
- [0x7DE8,"BD73"],
- [0x7DE9,"BD77"],
- [0x7DEA,"E6E5"],
- [0x7DEC,"BD71"],
- [0x7DEE,"E6EF"],
- [0x7DEF,"BD6E"],
- [0x7DF0,"E6EE"],
- [0x7DF1,"E6ED"],
- [0x7DF2,"BD7A"],
- [0x7DF3,"E572"],
- [0x7DF4,"BD6D"],
- [0x7DF5,"8EB0"],
- [0x7DF6,"E6EC"],
- [0x7DF7,"E6E3"],
- [0x7DF9,"BD7B"],
- [0x7DFA,"E6EA"],
- [0x7DFB,"BD6F"],
- [0x7DFD,"9963"],
- [0x7DFE,"97AA"],
- [0x7E03,"E6E9"],
- [0x7E07,"94FB"],
- [0x7E08,"BFA2"],
- [0x7E09,"BFA7"],
- [0x7E0A,"BF7E"],
- [0x7E0B,"EAD8"],
- [0x7E0C,"EACF"],
- [0x7E0D,"EADB"],
- [0x7E0E,"EAD3"],
- [0x7E0F,"EAD9"],
- [0x7E10,"BFA8"],
- [0x7E11,"BFA1"],
- [0x7E12,"EACC"],
- [0x7E13,"EAD2"],
- [0x7E14,"EADC"],
- [0x7E15,"EAD5"],
- [0x7E16,"EADA"],
- [0x7E17,"EACE"],
- [0x7E1A,"EAD6"],
- [0x7E1B,"BFA3"],
- [0x7E1C,"EAD4"],
- [0x7E1D,"BFA6"],
- [0x7E1E,"BFA5"],
- [0x7E1F,"EAD0"],
- [0x7E20,"EAD1"],
- [0x7E21,"EACD"],
- [0x7E22,"EAD7"],
- [0x7E23,"BFA4"],
- [0x7E24,"EADE"],
- [0x7E25,"EADD"],
- [0x7E27,"8EBB"],
- [0x7E29,"EDDA"],
- [0x7E2A,"EDD6"],
- [0x7E2B,"C15F"],
- [0x7E2D,"EDD0"],
- [0x7E2E,"C159"],
- [0x7E2F,"C169"],
- [0x7E30,"EDDC"],
- [0x7E31,"C161"],
- [0x7E32,"C15D"],
- [0x7E33,"EDD3"],
- [0x7E34,"C164"],
- [0x7E35,"C167"],
- [0x7E36,"EDDE"],
- [0x7E37,"C15C"],
- [0x7E38,"EDD5"],
- [0x7E39,"C165"],
- [0x7E3A,"EDE0"],
- [0x7E3B,"EDDD"],
- [0x7E3C,"EDD1"],
- [0x7E3D,"C160"],
- [0x7E3E,"C15A"],
- [0x7E3F,"C168"],
- [0x7E40,"EDD8"],
- [0x7E41,"C163"],
- [0x7E42,"EDD2"],
- [0x7E43,"C15E"],
- [0x7E44,"EDDF"],
- [0x7E45,"C162"],
- [0x7E46,"C15B"],
- [0x7E47,"EDD9"],
- [0x7E48,"C166"],
- [0x7E49,"EDD7"],
- [0x7E4C,"EDDB"],
- [0x7E50,"F06E"],
- [0x7E51,"F074"],
- [0x7E52,"C2B9"],
- [0x7E53,"F077"],
- [0x7E54,"C2B4"],
- [0x7E55,"C2B5"],
- [0x7E56,"F06F"],
- [0x7E57,"F076"],
- [0x7E58,"F071"],
- [0x7E59,"C2BA"],
- [0x7E5A,"C2B7"],
- [0x7E5B,"8CDC"],
- [0x7E5C,"F06D"],
- [0x7E5E,"C2B6"],
- [0x7E5F,"F073"],
- [0x7E60,"F075"],
- [0x7E61,"C2B8"],
- [0x7E62,"F072"],
- [0x7E63,"F070"],
- [0x7E65,"9876"],
- [0x7E67,"8EA1"],
- [0x7E68,"F2B8"],
- [0x7E69,"C3B7"],
- [0x7E6A,"C3B8"],
- [0x7E6B,"C3B4"],
- [0x7E6C,"8CB4"],
- [0x7E6D,"C3B5"],
- [0x7E6E,"8EB7"],
- [0x7E6F,"F2B4"],
- [0x7E70,"F2B2"],
- [0x7E72,"F2B6"],
- [0x7E73,"C3BA"],
- [0x7E74,"F2B7"],
- [0x7E75,"F2B0"],
- [0x7E76,"F2AF"],
- [0x7E77,"F2B3"],
- [0x7E78,"F2B1"],
- [0x7E79,"C3B6"],
- [0x7E7A,"F2B5"],
- [0x7E7B,"F4AC"],
- [0x7E7C,"C47E"],
- [0x7E7D,"C47D"],
- [0x7E7E,"F4AD"],
- [0x7E7F,"9DA6"],
- [0x7E80,"F4AF"],
- [0x7E81,"F4AE"],
- [0x7E82,"C4A1"],
- [0x7E86,"F5EB"],
- [0x7E87,"F5E8"],
- [0x7E88,"F5E9"],
- [0x7E8A,"F5E7"],
- [0x7E8B,"F5EA"],
- [0x7E8C,"C4F2"],
- [0x7E8D,"F5EC"],
- [0x7E8E,"9EB0"],
- [0x7E8F,"C4F1"],
- [0x7E91,"F742"],
- [0x7E92,"8EB8"],
- [0x7E93,"C5D5"],
- [0x7E94,"C5D7"],
- [0x7E95,"F7EE"],
- [0x7E96,"C5D6"],
- [0x7E97,"F8B9"],
- [0x7E98,"F940"],
- [0x7E99,"F942"],
- [0x7E9A,"F8FE"],
- [0x7E9B,"F941"],
- [0x7E9C,"C66C"],
- [0x7E9F,"9D70"],
- [0x7EA4,"896E"],
- [0x7EAC,"896F"],
- [0x7EBA,"8970"],
- [0x7EC7,"8971"],
- [0x7ECF,"8972"],
- [0x7EDF,"8973"],
- [0x7F06,"8974"],
- [0x7F36,"A6CE"],
- [0x7F37,"8975"],
- [0x7F38,"ACFB"],
- [0x7F39,"D26F"],
- [0x7F3A,"AFCA"],
- [0x7F3D,"B2DA"],
- [0x7F3E,"DAFC"],
- [0x7F3F,"DAFD"],
- [0x7F40,"8EBC"],
- [0x7F41,"8EBD"],
- [0x7F43,"EADF"],
- [0x7F44,"C16A"],
- [0x7F45,"EDE1"],
- [0x7F47,"8EBE"],
- [0x7F48,"C2BB"],
- [0x7F49,"9DD1"],
- [0x7F4A,"F2BA"],
- [0x7F4B,"F2B9"],
- [0x7F4C,"C4A2"],
- [0x7F4D,"F5ED"],
- [0x7F4E,"94FD"],
- [0x7F4F,"F743"],
- [0x7F50,"C5F8"],
- [0x7F51,"CA49"],
- [0x7F52,"8BD7"],
- [0x7F53,"8BDA"],
- [0x7F54,"AAC9"],
- [0x7F55,"A875"],
- [0x7F58,"D04D"],
- [0x7F5B,"D360"],
- [0x7F5C,"D35B"],
- [0x7F5D,"D35F"],
- [0x7F5E,"D35D"],
- [0x7F5F,"AFCB"],
- [0x7F60,"D35E"],
- [0x7F61,"D35C"],
- [0x7F63,"D6F1"],
- [0x7F65,"DAFE"],
- [0x7F66,"DB40"],
- [0x7F67,"DF69"],
- [0x7F68,"DF6A"],
- [0x7F69,"B86E"],
- [0x7F6A,"B86F"],
- [0x7F6B,"DF68"],
- [0x7F6C,"DF6B"],
- [0x7F6D,"DF67"],
- [0x7F6E,"B86D"],
- [0x7F70,"BB40"],
- [0x7F71,"A0E2"],
- [0x7F72,"B870"],
- [0x7F73,"E37A"],
- [0x7F75,"BD7C"],
- [0x7F76,"E6F1"],
- [0x7F77,"BD7D"],
- [0x7F78,"9FE9"],
- [0x7F79,"BFA9"],
- [0x7F7A,"EAE2"],
- [0x7F7B,"EAE0"],
- [0x7F7C,"EAE1"],
- [0x7F7D,"EDE4"],
- [0x7F7E,"EDE3"],
- [0x7F7F,"EDE2"],
- [0x7F83,"F2BB"],
- [0x7F85,"C3B9"],
- [0x7F86,"F2BC"],
- [0x7F87,"F744"],
- [0x7F88,"C5F9"],
- [0x7F89,"F8BA"],
- [0x7F8A,"A6CF"],
- [0x7F8B,"AACB"],
- [0x7F8C,"AACA"],
- [0x7F8D,"D04F"],
- [0x7F8E,"ACFC"],
- [0x7F8F,"FDA8"],
- [0x7F91,"D04E"],
- [0x7F92,"D362"],
- [0x7F93,"8AE7"],
- [0x7F94,"AFCC"],
- [0x7F95,"D6F2"],
- [0x7F96,"D361"],
- [0x7F97,"8EC2"],
- [0x7F9A,"B2DC"],
- [0x7F9B,"D6F5"],
- [0x7F9C,"D6F3"],
- [0x7F9D,"D6F4"],
- [0x7F9E,"B2DB"],
- [0x7FA0,"DB42"],
- [0x7FA1,"DB43"],
- [0x7FA2,"DB41"],
- [0x7FA3,"8EC4"],
- [0x7FA4,"B873"],
- [0x7FA5,"DF6D"],
- [0x7FA6,"DF6C"],
- [0x7FA7,"DF6E"],
- [0x7FA8,"B872"],
- [0x7FA9,"B871"],
- [0x7FAC,"E6F2"],
- [0x7FAD,"E6F4"],
- [0x7FAE,"9964"],
- [0x7FAF,"BD7E"],
- [0x7FB0,"E6F3"],
- [0x7FB1,"EAE3"],
- [0x7FB2,"BFAA"],
- [0x7FB3,"F079"],
- [0x7FB4,"9965"],
- [0x7FB5,"F078"],
- [0x7FB6,"C3BB"],
- [0x7FB7,"F2BD"],
- [0x7FB8,"C3BD"],
- [0x7FB9,"C3BC"],
- [0x7FBA,"F4B0"],
- [0x7FBB,"F5EE"],
- [0x7FBC,"C4F3"],
- [0x7FBD,"A6D0"],
- [0x7FBE,"D050"],
- [0x7FBF,"ACFD"],
- [0x7FC0,"D365"],
- [0x7FC1,"AFCE"],
- [0x7FC2,"D364"],
- [0x7FC3,"D363"],
- [0x7FC5,"AFCD"],
- [0x7FC7,"D6FB"],
- [0x7FC9,"D6FD"],
- [0x7FCA,"D6F6"],
- [0x7FCB,"D6F7"],
- [0x7FCC,"B2DD"],
- [0x7FCD,"D6F8"],
- [0x7FCE,"B2DE"],
- [0x7FCF,"D6FC"],
- [0x7FD0,"D6F9"],
- [0x7FD1,"D6FA"],
- [0x7FD2,"B2DF"],
- [0x7FD4,"B5BE"],
- [0x7FD5,"B5BF"],
- [0x7FD7,"DB44"],
- [0x7FDB,"DF6F"],
- [0x7FDC,"DF70"],
- [0x7FDD,"954E"],
- [0x7FDE,"E37E"],
- [0x7FDF,"BB43"],
- [0x7FE0,"BB41"],
- [0x7FE1,"BB42"],
- [0x7FE2,"E37B"],
- [0x7FE3,"E37C"],
- [0x7FE5,"E37D"],
- [0x7FE6,"E6F9"],
- [0x7FE7,"98B3"],
- [0x7FE8,"E6FA"],
- [0x7FE9,"BDA1"],
- [0x7FEA,"E6F7"],
- [0x7FEB,"E6F6"],
- [0x7FEC,"E6F8"],
- [0x7FED,"E6F5"],
- [0x7FEE,"BFAD"],
- [0x7FEF,"EAE4"],
- [0x7FF0,"BFAB"],
- [0x7FF1,"BFAC"],
- [0x7FF2,"EDE6"],
- [0x7FF3,"C16B"],
- [0x7FF4,"EDE5"],
- [0x7FF5,"EFA8"],
- [0x7FF7,"F07A"],
- [0x7FF8,"F07B"],
- [0x7FF9,"C2BC"],
- [0x7FFA,"8ECB"],
- [0x7FFB,"C2BD"],
- [0x7FFC,"C16C"],
- [0x7FFD,"F2BE"],
- [0x7FFE,"F2BF"],
- [0x7FFF,"F4B1"],
- [0x8000,"C4A3"],
- [0x8001,"A6D1"],
- [0x8002,"8BDF"],
- [0x8003,"A6D2"],
- [0x8004,"ACFE"],
- [0x8005,"AACC"],
- [0x8006,"AFCF"],
- [0x8007,"D051"],
- [0x8008,"8ECE"],
- [0x800B,"B5C0"],
- [0x800C,"A6D3"],
- [0x800D,"AD41"],
- [0x800E,"D052"],
- [0x800F,"D053"],
- [0x8010,"AD40"],
- [0x8011,"AD42"],
- [0x8012,"A6D4"],
- [0x8014,"D054"],
- [0x8015,"AFD1"],
- [0x8016,"D366"],
- [0x8017,"AFD3"],
- [0x8018,"AFD0"],
- [0x8019,"AFD2"],
- [0x801B,"D741"],
- [0x801C,"B2E0"],
- [0x801D,"8ECF"],
- [0x801E,"D740"],
- [0x801F,"D6FE"],
- [0x8020,"9968"],
- [0x8021,"DF71"],
- [0x8024,"E3A1"],
- [0x8025,"9969"],
- [0x8026,"BDA2"],
- [0x8028,"BFAE"],
- [0x8029,"EAE6"],
- [0x802A,"EAE5"],
- [0x802C,"EDE7"],
- [0x802E,"996B"],
- [0x802F,"8ED1"],
- [0x8030,"F5EF"],
- [0x8031,"996C"],
- [0x8033,"A6D5"],
- [0x8034,"CB73"],
- [0x8035,"CDAA"],
- [0x8036,"AD43"],
- [0x8037,"D055"],
- [0x8039,"D368"],
- [0x803B,"8ED4"],
- [0x803C,"8ED5"],
- [0x803D,"AFD4"],
- [0x803E,"D367"],
- [0x803F,"AFD5"],
- [0x8043,"D743"],
- [0x8046,"B2E2"],
- [0x8047,"D742"],
- [0x8048,"D744"],
- [0x804A,"B2E1"],
- [0x804F,"DB46"],
- [0x8050,"DB47"],
- [0x8051,"DB45"],
- [0x8052,"B5C1"],
- [0x8054,"996D"],
- [0x8056,"B874"],
- [0x8058,"B875"],
- [0x805A,"BB45"],
- [0x805B,"A0BE"],
- [0x805C,"E3A3"],
- [0x805D,"E3A2"],
- [0x805E,"BB44"],
- [0x8061,"8ED6"],
- [0x8062,"A0BC"],
- [0x8063,"A0B5"],
- [0x8064,"E6FB"],
- [0x8066,"A0B4"],
- [0x8067,"E6FC"],
- [0x806C,"EAE7"],
- [0x806F,"C170"],
- [0x8070,"C16F"],
- [0x8071,"C16D"],
- [0x8072,"C16E"],
- [0x8073,"C171"],
- [0x8075,"F07C"],
- [0x8076,"C2BF"],
- [0x8077,"C2BE"],
- [0x8078,"F2C0"],
- [0x8079,"F4B2"],
- [0x807D,"C5A5"],
- [0x807E,"C5A4"],
- [0x807F,"A6D6"],
- [0x8080,"8BE0"],
- [0x8082,"D1FB"],
- [0x8084,"B877"],
- [0x8085,"B5C2"],
- [0x8086,"B876"],
- [0x8087,"BB46"],
- [0x8089,"A6D7"],
- [0x808A,"C9A9"],
- [0x808B,"A6D8"],
- [0x808C,"A6D9"],
- [0x808F,"CDAB"],
- [0x8090,"CB76"],
- [0x8092,"CB77"],
- [0x8093,"A877"],
- [0x8095,"CB74"],
- [0x8096,"A876"],
- [0x8098,"A879"],
- [0x8099,"CB75"],
- [0x809A,"A87B"],
- [0x809B,"A87A"],
- [0x809C,"CB78"],
- [0x809D,"A878"],
- [0x809F,"89B5"],
- [0x80A1,"AAD1"],
- [0x80A2,"AACF"],
- [0x80A3,"CDAD"],
- [0x80A5,"AACE"],
- [0x80A7,"8EDD"],
- [0x80A9,"AAD3"],
- [0x80AA,"AAD5"],
- [0x80AB,"AAD2"],
- [0x80AD,"CDB0"],
- [0x80AE,"CDAC"],
- [0x80AF,"AAD6"],
- [0x80B1,"AAD0"],
- [0x80B2,"A87C"],
- [0x80B4,"AAD4"],
- [0x80B5,"CDAF"],
- [0x80B6,"9E5D"],
- [0x80B7,"9971"],
- [0x80B8,"CDAE"],
- [0x80BA,"AACD"],
- [0x80BC,"89AE"],
- [0x80BD,"9DE8"],
- [0x80C2,"D05B"],
- [0x80C3,"AD47"],
- [0x80C4,"AD48"],
- [0x80C5,"D05D"],
- [0x80C6,"9565"],
- [0x80C7,"D057"],
- [0x80C8,"D05A"],
- [0x80C9,"D063"],
- [0x80CA,"D061"],
- [0x80CC,"AD49"],
- [0x80CD,"D067"],
- [0x80CE,"AD4C"],
- [0x80CF,"D064"],
- [0x80D0,"D05C"],
- [0x80D1,"D059"],
- [0x80D4,"DB49"],
- [0x80D5,"D062"],
- [0x80D6,"AD44"],
- [0x80D7,"D065"],
- [0x80D8,"D056"],
- [0x80D9,"D05F"],
- [0x80DA,"AD46"],
- [0x80DB,"AD4B"],
- [0x80DC,"D060"],
- [0x80DD,"AD4F"],
- [0x80DE,"AD4D"],
- [0x80E0,"D058"],
- [0x80E1,"AD4A"],
- [0x80E3,"D05E"],
- [0x80E4,"AD4E"],
- [0x80E5,"AD45"],
- [0x80E6,"D066"],
- [0x80E9,"9972"],
- [0x80EC,"8B5C"],
- [0x80ED,"AFDA"],
- [0x80EF,"AFE3"],
- [0x80F0,"AFD8"],
- [0x80F1,"AFD6"],
- [0x80F2,"D36A"],
- [0x80F3,"AFDE"],
- [0x80F4,"AFDB"],
- [0x80F5,"D36C"],
- [0x80F6,"89B1"],
- [0x80F8,"AFDD"],
- [0x80F9,"D36B"],
- [0x80FA,"D369"],
- [0x80FB,"D36E"],
- [0x80FC,"AFE2"],
- [0x80FD,"AFE0"],
- [0x80FE,"DB48"],
- [0x8100,"D36F"],
- [0x8101,"D36D"],
- [0x8102,"AFD7"],
- [0x8103,"A0C0"],
- [0x8105,"AFD9"],
- [0x8106,"AFDC"],
- [0x8107,"8EDF"],
- [0x8108,"AFDF"],
- [0x8109,"9566"],
- [0x810A,"AFE1"],
- [0x810C,"9974"],
- [0x810E,"9976"],
- [0x8112,"9977"],
- [0x8114,"9979"],
- [0x8115,"D74E"],
- [0x8116,"B2E4"],
- [0x8117,"9DDA"],
- [0x8118,"D745"],
- [0x8119,"D747"],
- [0x811A,"8EE0"],
- [0x811B,"D748"],
- [0x811D,"D750"],
- [0x811E,"D74C"],
- [0x811F,"D74A"],
- [0x8121,"D74D"],
- [0x8122,"D751"],
- [0x8123,"B2E5"],
- [0x8124,"B2E9"],
- [0x8125,"D746"],
- [0x8127,"D74F"],
- [0x8129,"B2E7"],
- [0x812A,"935C"],
- [0x812B,"B2E6"],
- [0x812C,"D74B"],
- [0x812D,"D749"],
- [0x812F,"B2E3"],
- [0x8130,"B2E8"],
- [0x8132,"9DE6"],
- [0x8134,"8B5F"],
- [0x8137,"9563"],
- [0x8139,"B5C8"],
- [0x813A,"DB51"],
- [0x813D,"DB4F"],
- [0x813E,"B5CA"],
- [0x8142,"9567"],
- [0x8143,"DB4A"],
- [0x8144,"DFA1"],
- [0x8146,"B5C9"],
- [0x8147,"DB4E"],
- [0x8148,"9DE3"],
- [0x814A,"DB4B"],
- [0x814B,"B5C5"],
- [0x814C,"B5CB"],
- [0x814D,"DB50"],
- [0x814E,"B5C7"],
- [0x814F,"DB4D"],
- [0x8150,"BB47"],
- [0x8151,"B5C6"],
- [0x8152,"DB4C"],
- [0x8153,"B5CC"],
- [0x8154,"B5C4"],
- [0x8155,"B5C3"],
- [0x8156,"997C"],
- [0x8159,"997D"],
- [0x815A,"997E"],
- [0x815B,"DF77"],
- [0x815C,"DF75"],
- [0x815E,"DF7B"],
- [0x8160,"DF73"],
- [0x8161,"DFA2"],
- [0x8162,"DF78"],
- [0x8164,"DF72"],
- [0x8165,"B87B"],
- [0x8166,"B8A3"],
- [0x8167,"DF7D"],
- [0x8169,"DF76"],
- [0x816B,"B87E"],
- [0x816C,"8CFB"],
- [0x816D,"8B5B"],
- [0x816E,"B87C"],
- [0x816F,"DF7E"],
- [0x8170,"B879"],
- [0x8171,"B878"],
- [0x8172,"DF79"],
- [0x8173,"B87D"],
- [0x8174,"B5CD"],
- [0x8176,"DF7C"],
- [0x8177,"DF74"],
- [0x8178,"B87A"],
- [0x8179,"B8A1"],
- [0x817A,"B8A2"],
- [0x817C,"99A3"],
- [0x817F,"BB4C"],
- [0x8180,"BB48"],
- [0x8182,"BB4D"],
- [0x8183,"E3A6"],
- [0x8184,"99A4"],
- [0x8186,"E3A5"],
- [0x8187,"E3A7"],
- [0x8188,"BB4A"],
- [0x8189,"E3A4"],
- [0x818A,"BB4B"],
- [0x818B,"E3AA"],
- [0x818C,"E3A9"],
- [0x818D,"E3A8"],
- [0x818F,"BB49"],
- [0x8193,"99A6"],
- [0x8195,"E741"],
- [0x8197,"E744"],
- [0x8198,"BDA8"],
- [0x8199,"E743"],
- [0x819A,"BDA7"],
- [0x819B,"BDA3"],
- [0x819C,"BDA4"],
- [0x819D,"BDA5"],
- [0x819E,"E740"],
- [0x819F,"E6FE"],
- [0x81A0,"BDA6"],
- [0x81A2,"E742"],
- [0x81A3,"E6FD"],
- [0x81A5,"99A8"],
- [0x81A6,"EAE9"],
- [0x81A7,"EAF3"],
- [0x81A8,"BFB1"],
- [0x81A9,"BFB0"],
- [0x81AA,"8ABE"],
- [0x81AB,"EAED"],
- [0x81AC,"EAEF"],
- [0x81AE,"EAEA"],
- [0x81B0,"EAEE"],
- [0x81B1,"EAE8"],
- [0x81B2,"EAF1"],
- [0x81B3,"BFAF"],
- [0x81B4,"EAF0"],
- [0x81B5,"EAEC"],
- [0x81B6,"9E61"],
- [0x81B7,"EAF2"],
- [0x81B9,"EAEB"],
- [0x81BA,"C174"],
- [0x81BB,"EDE8"],
- [0x81BC,"EDEE"],
- [0x81BD,"C178"],
- [0x81BE,"C17A"],
- [0x81BF,"C177"],
- [0x81C0,"C176"],
- [0x81C1,"99AA"],
- [0x81C2,"C175"],
- [0x81C3,"C173"],
- [0x81C4,"EDE9"],
- [0x81C5,"EDEC"],
- [0x81C6,"C172"],
- [0x81C7,"EDED"],
- [0x81C8,"A0C8"],
- [0x81C9,"C179"],
- [0x81CA,"EDEB"],
- [0x81CC,"EDEA"],
- [0x81CD,"C2C0"],
- [0x81CF,"C2C1"],
- [0x81D0,"F0A1"],
- [0x81D1,"F07D"],
- [0x81D2,"F07E"],
- [0x81D5,"F2C2"],
- [0x81D7,"F2C1"],
- [0x81D8,"C3BE"],
- [0x81D9,"F4B4"],
- [0x81DA,"C4A4"],
- [0x81DB,"F4B3"],
- [0x81DD,"F5F0"],
- [0x81DE,"F745"],
- [0x81DF,"C5A6"],
- [0x81E0,"F943"],
- [0x81E1,"F944"],
- [0x81E2,"C5D8"],
- [0x81E3,"A6DA"],
- [0x81E4,"99AB"],
- [0x81E5,"AAD7"],
- [0x81E6,"DB52"],
- [0x81E7,"BB4E"],
- [0x81E8,"C17B"],
- [0x81E9,"EDEF"],
- [0x81EA,"A6DB"],
- [0x81EC,"AFE5"],
- [0x81ED,"AFE4"],
- [0x81EE,"DB53"],
- [0x81EF,"FEC4"],
- [0x81F2,"EAF4"],
- [0x81F3,"A6DC"],
- [0x81F4,"AD50"],
- [0x81F6,"98C2"],
- [0x81F7,"DB54"],
- [0x81F8,"DB55"],
- [0x81F9,"DB56"],
- [0x81FA,"BB4F"],
- [0x81FB,"BFB2"],
- [0x81FC,"A6DD"],
- [0x81FE,"AAD8"],
- [0x81FF,"D068"],
- [0x8200,"AFE6"],
- [0x8201,"D370"],
- [0x8202,"B2EA"],
- [0x8204,"DB57"],
- [0x8205,"B8A4"],
- [0x8207,"BB50"],
- [0x8208,"BFB3"],
- [0x8209,"C17C"],
- [0x820A,"C2C2"],
- [0x820B,"F4B5"],
- [0x820C,"A6DE"],
- [0x820D,"AAD9"],
- [0x8210,"AFE7"],
- [0x8211,"D752"],
- [0x8212,"B5CE"],
- [0x8214,"BB51"],
- [0x8215,"E3AB"],
- [0x8216,"E745"],
- [0x8218,"8EE8"],
- [0x821A,"A0BA"],
- [0x821B,"A6DF"],
- [0x821C,"B5CF"],
- [0x821D,"DFA3"],
- [0x821E,"BB52"],
- [0x821F,"A6E0"],
- [0x8220,"CDB1"],
- [0x8221,"D069"],
- [0x8222,"AD51"],
- [0x8225,"D372"],
- [0x8226,"FD77"],
- [0x8228,"AFEA"],
- [0x8229,"8EEE"],
- [0x822A,"AFE8"],
- [0x822B,"AFE9"],
- [0x822C,"AFEB"],
- [0x822D,"9EBF"],
- [0x822F,"D371"],
- [0x8232,"D757"],
- [0x8233,"D754"],
- [0x8234,"D756"],
- [0x8235,"B2EB"],
- [0x8236,"B2ED"],
- [0x8237,"B2EC"],
- [0x8238,"D753"],
- [0x8239,"B2EE"],
- [0x823A,"D755"],
- [0x823C,"DB58"],
- [0x823D,"DB59"],
- [0x823E,"89C2"],
- [0x823F,"DB5A"],
- [0x8240,"DFA6"],
- [0x8242,"DFA7"],
- [0x8244,"DFA5"],
- [0x8245,"DFA8"],
- [0x8247,"B8A5"],
- [0x8249,"DFA4"],
- [0x824B,"BB53"],
- [0x824E,"E74A"],
- [0x824F,"E746"],
- [0x8250,"E749"],
- [0x8251,"E74B"],
- [0x8252,"E748"],
- [0x8253,"E747"],
- [0x8254,"99AC"],
- [0x8255,"EAF5"],
- [0x8256,"EAF6"],
- [0x8257,"EAF7"],
- [0x8258,"BFB4"],
- [0x8259,"BFB5"],
- [0x825A,"EDF1"],
- [0x825B,"EDF0"],
- [0x825C,"EDF2"],
- [0x825E,"F0A3"],
- [0x825F,"F0A2"],
- [0x8261,"F2C4"],
- [0x8262,"956B"],
- [0x8263,"F2C5"],
- [0x8264,"F2C3"],
- [0x8265,"956C"],
- [0x8266,"C4A5"],
- [0x8268,"F4B6"],
- [0x8269,"F4B7"],
- [0x826B,"F746"],
- [0x826C,"F7EF"],
- [0x826D,"F8BB"],
- [0x826E,"A6E1"],
- [0x826F,"A87D"],
- [0x8271,"C17D"],
- [0x8272,"A6E2"],
- [0x8274,"D758"],
- [0x8275,"DB5B"],
- [0x8276,"99AF"],
- [0x8277,"C641"],
- [0x8278,"CA4A"],
- [0x8279,"994A"],
- [0x827A,"8976"],
- [0x827B,"8F48"],
- [0x827C,"CA4B"],
- [0x827D,"CA4D"],
- [0x827E,"A6E3"],
- [0x827F,"CA4E"],
- [0x8280,"CA4C"],
- [0x8283,"CBA2"],
- [0x8284,"CBA3"],
- [0x8285,"CB7B"],
- [0x8287,"FBEE"],
- [0x828A,"CBA1"],
- [0x828B,"A8A1"],
- [0x828D,"A8A2"],
- [0x828E,"CB7C"],
- [0x828F,"CB7A"],
- [0x8290,"CB79"],
- [0x8291,"CB7D"],
- [0x8292,"A87E"],
- [0x8293,"CB7E"],
- [0x8294,"D06A"],
- [0x8298,"CDB6"],
- [0x8299,"AADC"],
- [0x829A,"CDB5"],
- [0x829B,"CDB7"],
- [0x829D,"AADB"],
- [0x829E,"CDBC"],
- [0x829F,"AADF"],
- [0x82A0,"CDB2"],
- [0x82A1,"CDC0"],
- [0x82A2,"CDC6"],
- [0x82A3,"AAE6"],
- [0x82A4,"CDC3"],
- [0x82A5,"AAE3"],
- [0x82A6,"99AE"],
- [0x82A7,"CDB9"],
- [0x82A8,"CDBF"],
- [0x82A9,"CDC1"],
- [0x82AA,"8EFB"],
- [0x82AB,"CDB4"],
- [0x82AC,"AAE2"],
- [0x82AD,"AADD"],
- [0x82AE,"CDBA"],
- [0x82AF,"AAE4"],
- [0x82B0,"AAE7"],
- [0x82B1,"AAE1"],
- [0x82B3,"AADA"],
- [0x82B4,"CDBE"],
- [0x82B5,"CDB8"],
- [0x82B6,"CDC5"],
- [0x82B7,"AAE9"],
- [0x82B8,"AAE5"],
- [0x82B9,"AAE0"],
- [0x82BA,"CDBD"],
- [0x82BB,"AFEC"],
- [0x82BC,"CDBB"],
- [0x82BD,"AADE"],
- [0x82BE,"AAE8"],
- [0x82BF,"8CD0"],
- [0x82C0,"CDB3"],
- [0x82C2,"CDC2"],
- [0x82C3,"CDC4"],
- [0x82C4,"8B52"],
- [0x82CA,"99B0"],
- [0x82CF,"8977"],
- [0x82D0,"8F41"],
- [0x82D1,"AD62"],
- [0x82D2,"AD5C"],
- [0x82D3,"AD64"],
- [0x82D4,"AD61"],
- [0x82D5,"D071"],
- [0x82D6,"D074"],
- [0x82D7,"AD5D"],
- [0x82D8,"99B1"],
- [0x82D9,"D06B"],
- [0x82DB,"AD56"],
- [0x82DC,"AD60"],
- [0x82DE,"AD63"],
- [0x82DF,"AD65"],
- [0x82E0,"D0A2"],
- [0x82E1,"D077"],
- [0x82E2,"8F49"],
- [0x82E3,"AD55"],
- [0x82E4,"D0A1"],
- [0x82E5,"AD59"],
- [0x82E6,"AD57"],
- [0x82E7,"AD52"],
- [0x82E8,"D06F"],
- [0x82EA,"D07E"],
- [0x82EB,"D073"],
- [0x82EC,"D076"],
- [0x82ED,"D0A5"],
- [0x82EE,"FA4D"],
- [0x82EF,"AD66"],
- [0x82F0,"D07D"],
- [0x82F1,"AD5E"],
- [0x82F2,"D078"],
- [0x82F3,"D0A4"],
- [0x82F4,"D075"],
- [0x82F5,"D079"],
- [0x82F6,"D07C"],
- [0x82F7,"9DE4"],
- [0x82F8,"8CB5"],
- [0x82F9,"D06D"],
- [0x82FA,"D0A3"],
- [0x82FB,"D07B"],
- [0x82FC,"FBE9"],
- [0x82FD,"9B54"],
- [0x82FE,"D06C"],
- [0x82FF,"99B2"],
- [0x8300,"D070"],
- [0x8301,"AD5F"],
- [0x8302,"AD5A"],
- [0x8303,"AD53"],
- [0x8304,"AD58"],
- [0x8305,"AD54"],
- [0x8306,"AD67"],
- [0x8307,"D06E"],
- [0x8308,"D3A5"],
- [0x8309,"AD5B"],
- [0x830B,"9E68"],
- [0x830C,"D07A"],
- [0x830D,"CE41"],
- [0x8316,"D3A8"],
- [0x8317,"AFFA"],
- [0x8318,"8F4A"],
- [0x8319,"D376"],
- [0x831A,"8F42"],
- [0x831B,"D3A3"],
- [0x831C,"D37D"],
- [0x831D,"8F51"],
- [0x831E,"D3B2"],
- [0x8320,"D3AA"],
- [0x8322,"D37E"],
- [0x8324,"D3A9"],
- [0x8325,"D378"],
- [0x8326,"D37C"],
- [0x8327,"D3B5"],
- [0x8328,"AFFD"],
- [0x8329,"D3AD"],
- [0x832A,"D3A4"],
- [0x832B,"AFED"],
- [0x832C,"D3B3"],
- [0x832D,"D374"],
- [0x832F,"D3AC"],
- [0x8331,"AFFC"],
- [0x8332,"AFF7"],
- [0x8333,"D373"],
- [0x8334,"AFF5"],
- [0x8335,"AFF4"],
- [0x8336,"AFF9"],
- [0x8337,"D3AB"],
- [0x8338,"AFF1"],
- [0x8339,"AFF8"],
- [0x833A,"D072"],
- [0x833B,"DB5C"],
- [0x833C,"D3A6"],
- [0x833D,"9846"],
- [0x833F,"D37A"],
- [0x8340,"AFFB"],
- [0x8341,"D37B"],
- [0x8342,"D3A1"],
- [0x8343,"AFFE"],
- [0x8344,"D375"],
- [0x8345,"D3AF"],
- [0x8347,"D3AE"],
- [0x8348,"D3B6"],
- [0x8349,"AFF3"],
- [0x834A,"AFF0"],
- [0x834B,"D3B4"],
- [0x834C,"D3B0"],
- [0x834D,"D3A7"],
- [0x834E,"D3A2"],
- [0x834F,"AFF6"],
- [0x8350,"AFF2"],
- [0x8351,"D377"],
- [0x8352,"AFEE"],
- [0x8353,"D3B1"],
- [0x8354,"AFEF"],
- [0x8356,"D379"],
- [0x8357,"99B4"],
- [0x8362,"8EF5"],
- [0x8363,"FD55"],
- [0x8366,"9CCD"],
- [0x836F,"8978"],
- [0x8373,"D75E"],
- [0x8374,"D760"],
- [0x8375,"D765"],
- [0x8376,"D779"],
- [0x8377,"B2FC"],
- [0x8378,"B2F2"],
- [0x837A,"D75D"],
- [0x837B,"B2FD"],
- [0x837C,"B2FE"],
- [0x837D,"D768"],
- [0x837E,"D76F"],
- [0x837F,"D775"],
- [0x8381,"D762"],
- [0x8383,"D769"],
- [0x8385,"8F53"],
- [0x8386,"B340"],
- [0x8387,"D777"],
- [0x8388,"D772"],
- [0x8389,"B2FA"],
- [0x838A,"B2F8"],
- [0x838B,"D76E"],
- [0x838C,"D76A"],
- [0x838D,"D75C"],
- [0x838E,"B2EF"],
- [0x838F,"D761"],
- [0x8390,"D759"],
- [0x8391,"8F6F"],
- [0x8392,"B2F7"],
- [0x8393,"B2F9"],
- [0x8394,"D766"],
- [0x8395,"D763"],
- [0x8396,"B2F4"],
- [0x8397,"D773"],
- [0x8398,"B2F1"],
- [0x8399,"D764"],
- [0x839A,"D77A"],
- [0x839B,"D76C"],
- [0x839C,"8E63"],
- [0x839D,"D76B"],
- [0x839E,"B2F0"],
- [0x83A0,"B2FB"],
- [0x83A2,"B2F3"],
- [0x83A3,"D75A"],
- [0x83A4,"D75F"],
- [0x83A5,"D770"],
- [0x83A6,"D776"],
- [0x83A7,"B341"],
- [0x83A8,"D75B"],
- [0x83A9,"D767"],
- [0x83AA,"D76D"],
- [0x83AB,"B2F6"],
- [0x83AC,"8F56"],
- [0x83AE,"D778"],
- [0x83AF,"D771"],
- [0x83B0,"D774"],
- [0x83B9,"FE76"],
- [0x83BD,"B2F5"],
- [0x83BE,"9FC6"],
- [0x83BF,"DB6C"],
- [0x83C0,"DB60"],
- [0x83C1,"B5D7"],
- [0x83C2,"DB7D"],
- [0x83C3,"DBA7"],
- [0x83C4,"DBAA"],
- [0x83C5,"B5D5"],
- [0x83C6,"DB68"],
- [0x83C7,"DBA3"],
- [0x83C8,"DB69"],
- [0x83C9,"DB77"],
- [0x83CA,"B5E2"],
- [0x83CB,"DB73"],
- [0x83CC,"B5DF"],
- [0x83CD,"FAAC"],
- [0x83CE,"DB74"],
- [0x83CF,"DB5D"],
- [0x83D1,"DBA4"],
- [0x83D3,"8F58"],
- [0x83D4,"B5E8"],
- [0x83D5,"DBA1"],
- [0x83D6,"DB75"],
- [0x83D7,"DBAC"],
- [0x83D8,"DB70"],
- [0x83D9,"DFC8"],
- [0x83DB,"DBAF"],
- [0x83DC,"B5E6"],
- [0x83DD,"DB6E"],
- [0x83DE,"DB7A"],
- [0x83DF,"B5E9"],
- [0x83E0,"B5D4"],
- [0x83E1,"DB72"],
- [0x83E2,"DBAD"],
- [0x83E3,"DB6B"],
- [0x83E4,"DB64"],
- [0x83E5,"DB6F"],
- [0x83E7,"DB63"],
- [0x83E8,"DB61"],
- [0x83E9,"B5D0"],
- [0x83EA,"DBA5"],
- [0x83EB,"DB6A"],
- [0x83EC,"DBA8"],
- [0x83ED,"9848"],
- [0x83EE,"DBA9"],
- [0x83EF,"B5D8"],
- [0x83F0,"B5DD"],
- [0x83F1,"B5D9"],
- [0x83F2,"B5E1"],
- [0x83F3,"DB7E"],
- [0x83F4,"B5DA"],
- [0x83F5,"DB76"],
- [0x83F6,"DB66"],
- [0x83F8,"B5D2"],
- [0x83F9,"DB5E"],
- [0x83FA,"DBA2"],
- [0x83FB,"DBAB"],
- [0x83FC,"DB65"],
- [0x83FD,"B5E0"],
- [0x83FE,"DBB0"],
- [0x83FF,"DB71"],
- [0x8401,"DB6D"],
- [0x8403,"B5D1"],
- [0x8404,"B5E5"],
- [0x8405,"99B7"],
- [0x8406,"DB7C"],
- [0x8407,"B5E7"],
- [0x8409,"DB78"],
- [0x840A,"B5DC"],
- [0x840B,"B5D6"],
- [0x840C,"B5DE"],
- [0x840D,"B5D3"],
- [0x840E,"B5E4"],
- [0x840F,"DB79"],
- [0x8410,"DB67"],
- [0x8411,"DB7B"],
- [0x8412,"DB62"],
- [0x8413,"DBA6"],
- [0x8414,"9665"],
- [0x8416,"FA6C"],
- [0x8418,"9DE7"],
- [0x841B,"DBAE"],
- [0x841C,"9E62"],
- [0x8420,"96CC"],
- [0x8421,"8E67"],
- [0x8423,"DB5F"],
- [0x8424,"FC75"],
- [0x8426,"987E"],
- [0x8429,"DFC7"],
- [0x842B,"DFDD"],
- [0x842C,"B855"],
- [0x842D,"DFCC"],
- [0x842E,"FDB9"],
- [0x842F,"DFCA"],
- [0x8430,"DFB5"],
- [0x8431,"B8A9"],
- [0x8432,"DFC5"],
- [0x8433,"DFD9"],
- [0x8434,"DFC1"],
- [0x8435,"B8B1"],
- [0x8436,"DFD8"],
- [0x8437,"DFBF"],
- [0x8438,"B5E3"],
- [0x8439,"DFCF"],
- [0x843A,"DFC0"],
- [0x843B,"DFD6"],
- [0x843C,"B8B0"],
- [0x843D,"B8A8"],
- [0x843E,"97FC"],
- [0x843F,"DFAA"],
- [0x8440,"DFB2"],
- [0x8442,"DFCB"],
- [0x8443,"DFC3"],
- [0x8444,"DFDC"],
- [0x8445,"DFC6"],
- [0x8446,"B8B6"],
- [0x8447,"DFD7"],
- [0x8448,"98F9"],
- [0x8449,"B8AD"],
- [0x844A,"8F66"],
- [0x844B,"DFC9"],
- [0x844C,"DFD1"],
- [0x844D,"DFB6"],
- [0x844E,"DFD0"],
- [0x8450,"DFE1"],
- [0x8451,"DFB1"],
- [0x8452,"DFD2"],
- [0x8453,"956E"],
- [0x8454,"DFDF"],
- [0x8455,"9245"],
- [0x8456,"DFAB"],
- [0x8457,"B5DB"],
- [0x8458,"8F60"],
- [0x8459,"DFB9"],
- [0x845A,"DFB8"],
- [0x845B,"B8AF"],
- [0x845C,"9ED1"],
- [0x845D,"DFBC"],
- [0x845E,"DFBE"],
- [0x845F,"DFCD"],
- [0x8460,"DFDE"],
- [0x8461,"B8B2"],
- [0x8462,"FECD"],
- [0x8463,"B8B3"],
- [0x8464,"99B9"],
- [0x8465,"DFB0"],
- [0x8466,"B8AB"],
- [0x8467,"DFB4"],
- [0x8468,"DFDA"],
- [0x8469,"B8B4"],
- [0x846B,"B8AC"],
- [0x846C,"B8AE"],
- [0x846D,"B8B5"],
- [0x846E,"DFE0"],
- [0x846F,"DFD3"],
- [0x8470,"DFCE"],
- [0x8471,"8F62"],
- [0x8472,"974C"],
- [0x8473,"DFBB"],
- [0x8474,"DFBA"],
- [0x8475,"B8AA"],
- [0x8476,"DFAC"],
- [0x8477,"B8A7"],
- [0x8478,"DFC4"],
- [0x8479,"DFAD"],
- [0x847A,"DFC2"],
- [0x847D,"DFB7"],
- [0x847E,"DFDB"],
- [0x847F,"91C7"],
- [0x8480,"955F"],
- [0x8482,"B8A6"],
- [0x8484,"87AB"],
- [0x8486,"DFB3"],
- [0x8488,"99BB"],
- [0x848D,"DFAF"],
- [0x848E,"DFD5"],
- [0x848F,"DFAE"],
- [0x8490,"BB60"],
- [0x8491,"E3D3"],
- [0x8492,"8E6D"],
- [0x8493,"8F71"],
- [0x8494,"E3C2"],
- [0x8496,"94CB"],
- [0x8497,"E3AC"],
- [0x8498,"E3CA"],
- [0x8499,"BB58"],
- [0x849A,"E3BB"],
- [0x849B,"E3C5"],
- [0x849C,"BB5B"],
- [0x849D,"E3BE"],
- [0x849E,"BB59"],
- [0x849F,"E3AF"],
- [0x84A0,"E3CD"],
- [0x84A1,"E3AE"],
- [0x84A2,"E3C1"],
- [0x84A3,"95B1"],
- [0x84A4,"E3AD"],
- [0x84A7,"E3BF"],
- [0x84A8,"E3C8"],
- [0x84A9,"E3C6"],
- [0x84AA,"E3BA"],
- [0x84AB,"E3B5"],
- [0x84AC,"E3B3"],
- [0x84AD,"9AF2"],
- [0x84AE,"E3B4"],
- [0x84AF,"E3C7"],
- [0x84B0,"E3D2"],
- [0x84B1,"E3BC"],
- [0x84B2,"BB5A"],
- [0x84B4,"E3B7"],
- [0x84B6,"E3CB"],
- [0x84B8,"BB5D"],
- [0x84B9,"E3B6"],
- [0x84BA,"E3B0"],
- [0x84BB,"E3C0"],
- [0x84BC,"BB61"],
- [0x84BD,"96C3"],
- [0x84BE,"99BD"],
- [0x84BF,"BB55"],
- [0x84C0,"BB5E"],
- [0x84C1,"E3B8"],
- [0x84C2,"E3B2"],
- [0x84C4,"BB57"],
- [0x84C5,"DFD4"],
- [0x84C6,"BB56"],
- [0x84C7,"E3C3"],
- [0x84C9,"BB54"],
- [0x84CA,"BB63"],
- [0x84CB,"BB5C"],
- [0x84CC,"E3C4"],
- [0x84CD,"E3B9"],
- [0x84CE,"E3B1"],
- [0x84CF,"E3CC"],
- [0x84D0,"E3BD"],
- [0x84D1,"BB62"],
- [0x84D2,"E3D0"],
- [0x84D3,"BB5F"],
- [0x84D4,"E3CF"],
- [0x84D6,"E3C9"],
- [0x84D7,"E3CE"],
- [0x84DA,"A0CF"],
- [0x84DB,"E3D1"],
- [0x84DE,"8F6D"],
- [0x84E1,"99BE"],
- [0x84E2,"8EF4"],
- [0x84E4,"8F72"],
- [0x84E5,"95E4"],
- [0x84E7,"E773"],
- [0x84E8,"E774"],
- [0x84E9,"E767"],
- [0x84EA,"E766"],
- [0x84EB,"E762"],
- [0x84EC,"BDB4"],
- [0x84EE,"BDAC"],
- [0x84EF,"E776"],
- [0x84F0,"E775"],
- [0x84F1,"DFA9"],
- [0x84F2,"E75F"],
- [0x84F3,"E763"],
- [0x84F4,"E75D"],
- [0x84F6,"E770"],
- [0x84F7,"E761"],
- [0x84F8,"99BF"],
- [0x84F9,"E777"],
- [0x84FA,"E75A"],
- [0x84FB,"E758"],
- [0x84FC,"E764"],
- [0x84FD,"E76E"],
- [0x84FE,"E769"],
- [0x84FF,"BDB6"],
- [0x8500,"E74F"],
- [0x8502,"E76D"],
- [0x8503,"9242"],
- [0x8504,"87D7"],
- [0x8505,"FBA5"],
- [0x8506,"BDB7"],
- [0x8507,"DFBD"],
- [0x8508,"E75B"],
- [0x8509,"E752"],
- [0x850A,"E755"],
- [0x850B,"E77B"],
- [0x850C,"E75C"],
- [0x850D,"E753"],
- [0x850E,"E751"],
- [0x850F,"E74E"],
- [0x8510,"99C0"],
- [0x8511,"BDB0"],
- [0x8512,"E765"],
- [0x8513,"BDAF"],
- [0x8514,"BDB3"],
- [0x8515,"E760"],
- [0x8516,"E768"],
- [0x8517,"BDA9"],
- [0x8518,"E778"],
- [0x8519,"E77C"],
- [0x851A,"BDAB"],
- [0x851C,"E757"],
- [0x851D,"E76B"],
- [0x851E,"E76F"],
- [0x851F,"E754"],
- [0x8520,"E779"],
- [0x8521,"BDB2"],
- [0x8523,"BDB1"],
- [0x8524,"E74C"],
- [0x8525,"BDB5"],
- [0x8526,"E772"],
- [0x8527,"E756"],
- [0x8528,"E76A"],
- [0x8529,"E750"],
- [0x852A,"E75E"],
- [0x852B,"E759"],
- [0x852C,"BDAD"],
- [0x852D,"BDAE"],
- [0x852E,"E76C"],
- [0x852F,"E77D"],
- [0x8530,"E77A"],
- [0x8531,"E771"],
- [0x8533,"FDB4"],
- [0x8534,"8F77"],
- [0x8538,"99C1"],
- [0x853B,"E74D"],
- [0x853D,"BDAA"],
- [0x853E,"EB49"],
- [0x8540,"EB40"],
- [0x8541,"EB43"],
- [0x8542,"FAB9"],
- [0x8543,"BFBB"],
- [0x8544,"EB45"],
- [0x8545,"EAF9"],
- [0x8546,"EB41"],
- [0x8547,"EB47"],
- [0x8548,"BFB8"],
- [0x8549,"BFBC"],
- [0x854A,"BFB6"],
- [0x854B,"8F40"],
- [0x854C,"FA44"],
- [0x854D,"EAFB"],
- [0x854E,"EB4C"],
- [0x8551,"EB46"],
- [0x8552,"99C2"],
- [0x8553,"EAFC"],
- [0x8554,"EB55"],
- [0x8555,"EB4F"],
- [0x8556,"EAF8"],
- [0x8557,"EE46"],
- [0x8558,"EAFE"],
- [0x8559,"BFB7"],
- [0x855A,"8F5C"],
- [0x855B,"EB4A"],
- [0x855D,"EB54"],
- [0x855E,"BFBF"],
- [0x855F,"8CBD"],
- [0x8560,"EB51"],
- [0x8561,"EAFD"],
- [0x8562,"EB44"],
- [0x8563,"EB48"],
- [0x8564,"EB42"],
- [0x8565,"EB56"],
- [0x8566,"EB53"],
- [0x8567,"EB50"],
- [0x8568,"BFB9"],
- [0x8569,"BFBA"],
- [0x856A,"BFBE"],
- [0x856B,"EAFA"],
- [0x856C,"EB57"],
- [0x856D,"BFBD"],
- [0x856E,"EB4D"],
- [0x856F,"99C4"],
- [0x8570,"99C5"],
- [0x8571,"EB4B"],
- [0x8573,"8F7B"],
- [0x8575,"EB4E"],
- [0x8576,"EE53"],
- [0x8577,"EE40"],
- [0x8578,"EE45"],
- [0x8579,"EE52"],
- [0x857A,"EE44"],
- [0x857B,"EDFB"],
- [0x857C,"EE41"],
- [0x857E,"C1A2"],
- [0x8580,"EDF4"],
- [0x8581,"EE4D"],
- [0x8582,"EE4F"],
- [0x8583,"EDF3"],
- [0x8584,"C1A1"],
- [0x8585,"EE51"],
- [0x8586,"EE49"],
- [0x8587,"C1A8"],
- [0x8588,"EE50"],
- [0x8589,"EE42"],
- [0x858A,"C1AA"],
- [0x858B,"EDF9"],
- [0x858C,"EB52"],
- [0x858D,"EE4A"],
- [0x858E,"EE47"],
- [0x858F,"EDF5"],
- [0x8590,"EE55"],
- [0x8591,"C1A4"],
- [0x8593,"8776"],
- [0x8594,"C1A5"],
- [0x8595,"EDF7"],
- [0x8596,"EE48"],
- [0x8597,"8CB6"],
- [0x8598,"EE54"],
- [0x8599,"EE4B"],
- [0x859A,"EDFD"],
- [0x859B,"C1A7"],
- [0x859C,"C1A3"],
- [0x859D,"EE4C"],
- [0x859E,"EDFE"],
- [0x859F,"EE56"],
- [0x85A0,"EDF8"],
- [0x85A1,"EE43"],
- [0x85A2,"EE4E"],
- [0x85A3,"EDFA"],
- [0x85A4,"EDFC"],
- [0x85A6,"C2CB"],
- [0x85A7,"EDF6"],
- [0x85A8,"C1A9"],
- [0x85A9,"C2C4"],
- [0x85AA,"C17E"],
- [0x85AF,"C1A6"],
- [0x85B0,"C2C8"],
- [0x85B1,"F0B3"],
- [0x85B3,"F0A9"],
- [0x85B4,"F0A4"],
- [0x85B5,"F0AA"],
- [0x85B6,"F0B4"],
- [0x85B7,"F0B8"],
- [0x85B8,"F0B7"],
- [0x85B9,"C2CA"],
- [0x85BA,"C2C9"],
- [0x85BD,"F0AB"],
- [0x85BE,"F0B9"],
- [0x85BF,"F0AE"],
- [0x85C0,"F0A6"],
- [0x85C1,"8FA3"],
- [0x85C2,"F0A8"],
- [0x85C3,"F0A7"],
- [0x85C4,"F0AD"],
- [0x85C5,"F0B2"],
- [0x85C6,"F0A5"],
- [0x85C7,"F0AC"],
- [0x85C8,"F0B1"],
- [0x85C9,"C2C7"],
- [0x85CB,"F0AF"],
- [0x85CD,"C2C5"],
- [0x85CE,"F0B0"],
- [0x85CF,"C2C3"],
- [0x85D0,"C2C6"],
- [0x85D1,"F2D5"],
- [0x85D2,"F0B5"],
- [0x85D5,"C3C2"],
- [0x85D6,"8CCE"],
- [0x85D7,"F2CD"],
- [0x85D8,"F2D1"],
- [0x85D9,"F2C9"],
- [0x85DA,"F2CC"],
- [0x85DC,"F2D4"],
- [0x85DD,"C3C0"],
- [0x85DE,"F2D9"],
- [0x85DF,"F2D2"],
- [0x85E0,"99C6"],
- [0x85E1,"F2CA"],
- [0x85E2,"F2DA"],
- [0x85E3,"F2D3"],
- [0x85E4,"C3C3"],
- [0x85E5,"C3C4"],
- [0x85E6,"F2D7"],
- [0x85E8,"F2CB"],
- [0x85E9,"C3BF"],
- [0x85EA,"C3C1"],
- [0x85EB,"F2C6"],
- [0x85EC,"F2CE"],
- [0x85ED,"F2C8"],
- [0x85EE,"96CD"],
- [0x85EF,"F2D8"],
- [0x85F0,"F2D6"],
- [0x85F1,"F2C7"],
- [0x85F2,"F2CF"],
- [0x85F6,"F4BE"],
- [0x85F7,"C3C5"],
- [0x85F8,"F2D0"],
- [0x85F9,"C4A7"],
- [0x85FA,"C4A9"],
- [0x85FB,"C4A6"],
- [0x85FC,"96C7"],
- [0x85FD,"F4C3"],
- [0x85FE,"F4BB"],
- [0x85FF,"F4B9"],
- [0x8600,"F4BD"],
- [0x8601,"F4BA"],
- [0x8602,"8FA5"],
- [0x8604,"F4BF"],
- [0x8605,"F4C1"],
- [0x8606,"C4AA"],
- [0x8607,"C4AC"],
- [0x8609,"F4C0"],
- [0x860A,"C4AD"],
- [0x860B,"C4AB"],
- [0x860C,"F4C2"],
- [0x860D,"FABB"],
- [0x860F,"8C61"],
- [0x8610,"9570"],
- [0x8611,"C4A8"],
- [0x8613,"87AF"],
- [0x8614,"9368"],
- [0x8616,"8F7E"],
- [0x8617,"C4F4"],
- [0x8618,"F5F1"],
- [0x8619,"F5F7"],
- [0x861A,"C4F6"],
- [0x861B,"F4BC"],
- [0x861C,"F5F6"],
- [0x861E,"F5FD"],
- [0x861F,"F5F4"],
- [0x8620,"F5FB"],
- [0x8621,"F5FA"],
- [0x8622,"F4B8"],
- [0x8623,"F5F5"],
- [0x8624,"F0B6"],
- [0x8625,"F5FE"],
- [0x8626,"F5F3"],
- [0x8627,"F5F8"],
- [0x8628,"8FAA"],
- [0x8629,"F5FC"],
- [0x862A,"F5F2"],
- [0x862C,"F74A"],
- [0x862D,"C4F5"],
- [0x862E,"F5F9"],
- [0x862F,"A050"],
- [0x8631,"F7F4"],
- [0x8632,"F74B"],
- [0x8633,"F749"],
- [0x8634,"F747"],
- [0x8635,"F748"],
- [0x8636,"F74C"],
- [0x8638,"C5D9"],
- [0x8639,"F7F2"],
- [0x863A,"F7F0"],
- [0x863B,"F7F5"],
- [0x863C,"F7F3"],
- [0x863E,"F7F6"],
- [0x863F,"C5DA"],
- [0x8640,"F7F1"],
- [0x8642,"90D3"],
- [0x8643,"F8BC"],
- [0x8645,"9556"],
- [0x8646,"F945"],
- [0x8647,"F946"],
- [0x8648,"F947"],
- [0x864B,"F9C7"],
- [0x864C,"F9BD"],
- [0x864D,"CA4F"],
- [0x864E,"AAEA"],
- [0x8650,"AD68"],
- [0x8652,"D3B8"],
- [0x8653,"D3B7"],
- [0x8654,"B040"],
- [0x8655,"B342"],
- [0x8656,"D77C"],
- [0x8659,"D77B"],
- [0x865B,"B5EA"],
- [0x865C,"B8B8"],
- [0x865E,"B8B7"],
- [0x865F,"B8B9"],
- [0x8661,"E3D4"],
- [0x8662,"E77E"],
- [0x8663,"EB58"],
- [0x8664,"EB5A"],
- [0x8665,"EB59"],
- [0x8667,"C1AB"],
- [0x8668,"EE57"],
- [0x8669,"F0BA"],
- [0x866A,"F9A5"],
- [0x866B,"A6E4"],
- [0x866C,"8FB8"],
- [0x866D,"CDC9"],
- [0x866E,"CDCA"],
- [0x866F,"CDC8"],
- [0x8670,"CDC7"],
- [0x8671,"AAEB"],
- [0x8672,"99C8"],
- [0x8673,"D0A9"],
- [0x8674,"D0A7"],
- [0x8677,"D0A6"],
- [0x8679,"AD69"],
- [0x867A,"AD6B"],
- [0x867B,"AD6A"],
- [0x867C,"D0A8"],
- [0x867E,"8FAF"],
- [0x8685,"D3C4"],
- [0x8686,"D3C1"],
- [0x8687,"D3BF"],
- [0x868A,"B041"],
- [0x868B,"D3C2"],
- [0x868C,"B046"],
- [0x868D,"D3BC"],
- [0x868E,"D3CB"],
- [0x8690,"D3CD"],
- [0x8691,"D3BD"],
- [0x8692,"99C9"],
- [0x8693,"B043"],
- [0x8694,"D3CE"],
- [0x8695,"D3C9"],
- [0x8696,"D3BB"],
- [0x8697,"D3C0"],
- [0x8698,"D3CA"],
- [0x8699,"D3C6"],
- [0x869A,"D3C3"],
- [0x869C,"B048"],
- [0x869D,"D3CC"],
- [0x869E,"D3BE"],
- [0x86A0,"9579"],
- [0x86A1,"D3C7"],
- [0x86A2,"D3B9"],
- [0x86A3,"B047"],
- [0x86A4,"B044"],
- [0x86A5,"D3C5"],
- [0x86A7,"D3C8"],
- [0x86A8,"D3BA"],
- [0x86A9,"B045"],
- [0x86AA,"B042"],
- [0x86AD,"9F49"],
- [0x86AF,"B34C"],
- [0x86B0,"D7A5"],
- [0x86B1,"B34B"],
- [0x86B2,"99CA"],
- [0x86B3,"D7A8"],
- [0x86B4,"D7AB"],
- [0x86B5,"B348"],
- [0x86B6,"B346"],
- [0x86B7,"D77E"],
- [0x86B8,"D7A9"],
- [0x86B9,"D7A7"],
- [0x86BA,"D7A4"],
- [0x86BB,"D7AC"],
- [0x86BC,"D7AD"],
- [0x86BD,"D7AF"],
- [0x86BE,"D7B0"],
- [0x86BF,"D77D"],
- [0x86C0,"B345"],
- [0x86C1,"D7A2"],
- [0x86C2,"D7A1"],
- [0x86C3,"D7AE"],
- [0x86C4,"B347"],
- [0x86C5,"D7A3"],
- [0x86C6,"B349"],
- [0x86C7,"B344"],
- [0x86C8,"D7A6"],
- [0x86C9,"B34D"],
- [0x86CB,"B34A"],
- [0x86CC,"D7AA"],
- [0x86D0,"B5F1"],
- [0x86D1,"DBBF"],
- [0x86D3,"DBB4"],
- [0x86D4,"B5EE"],
- [0x86D6,"DFE7"],
- [0x86D7,"DBBD"],
- [0x86D8,"DBB1"],
- [0x86D9,"B5EC"],
- [0x86DA,"DBB6"],
- [0x86DB,"B5EF"],
- [0x86DC,"DBBA"],
- [0x86DD,"DBB8"],
- [0x86DE,"B5F2"],
- [0x86DF,"B5EB"],
- [0x86E2,"DBB2"],
- [0x86E3,"DBB5"],
- [0x86E4,"B5F0"],
- [0x86E6,"DBB3"],
- [0x86E8,"DBBE"],
- [0x86E9,"DBBC"],
- [0x86EA,"DBB7"],
- [0x86EB,"DBB9"],
- [0x86EC,"DBBB"],
- [0x86ED,"B5ED"],
- [0x86EF,"99CB"],
- [0x86F5,"DFE8"],
- [0x86F6,"DFEE"],
- [0x86F7,"DFE4"],
- [0x86F8,"DFEA"],
- [0x86F9,"B8BA"],
- [0x86FA,"DFE6"],
- [0x86FB,"B8C0"],
- [0x86FE,"B8BF"],
- [0x8700,"B8BE"],
- [0x8701,"DFED"],
- [0x8702,"B8C1"],
- [0x8703,"B8C2"],
- [0x8704,"DFE3"],
- [0x8705,"DFF0"],
- [0x8706,"B8C3"],
- [0x8707,"B8BD"],
- [0x8708,"B8BC"],
- [0x8709,"DFEC"],
- [0x870A,"B8C4"],
- [0x870B,"DFE2"],
- [0x870C,"DFE5"],
- [0x870D,"DFEF"],
- [0x870E,"DFEB"],
- [0x8711,"E3F4"],
- [0x8712,"E3E9"],
- [0x8713,"B8BB"],
- [0x8718,"BB6A"],
- [0x8719,"E3DD"],
- [0x871A,"E3F2"],
- [0x871B,"E3DE"],
- [0x871C,"BB65"],
- [0x871E,"E3DB"],
- [0x8720,"E3E4"],
- [0x8721,"E3DC"],
- [0x8722,"BB67"],
- [0x8723,"E3D6"],
- [0x8724,"E3F1"],
- [0x8725,"BB68"],
- [0x8726,"E3EE"],
- [0x8727,"E3EF"],
- [0x8728,"E3D7"],
- [0x8729,"BB6D"],
- [0x872A,"E3E6"],
- [0x872C,"E3E0"],
- [0x872D,"E3E7"],
- [0x872E,"E3DA"],
- [0x8730,"E3F3"],
- [0x8731,"E3EB"],
- [0x8732,"E3E5"],
- [0x8733,"E3D5"],
- [0x8734,"BB69"],
- [0x8735,"E3EC"],
- [0x8737,"BB6C"],
- [0x8738,"E3F0"],
- [0x873A,"E3EA"],
- [0x873B,"BB66"],
- [0x873C,"E3E8"],
- [0x873E,"E3E2"],
- [0x873F,"BB64"],
- [0x8740,"E3D9"],
- [0x8741,"E3E1"],
- [0x8742,"E3ED"],
- [0x8743,"E3DF"],
- [0x8746,"E3E3"],
- [0x874C,"BDC1"],
- [0x874D,"DFE9"],
- [0x874E,"E7B2"],
- [0x874F,"E7BB"],
- [0x8750,"E7B1"],
- [0x8751,"E7AD"],
- [0x8752,"E7AA"],
- [0x8753,"BDC2"],
- [0x8754,"E7A8"],
- [0x8755,"BB6B"],
- [0x8756,"E7A1"],
- [0x8757,"BDC0"],
- [0x8758,"E7A7"],
- [0x8759,"BDBF"],
- [0x875A,"E7AC"],
- [0x875B,"E7A9"],
- [0x875C,"E7B9"],
- [0x875D,"E7B4"],
- [0x875E,"E7AE"],
- [0x875F,"E7B3"],
- [0x8760,"BDBB"],
- [0x8761,"E7AB"],
- [0x8762,"E7BE"],
- [0x8763,"E7A2"],
- [0x8764,"E7A3"],
- [0x8765,"E7BA"],
- [0x8766,"BDBC"],
- [0x8767,"E7BF"],
- [0x8768,"BDBE"],
- [0x8769,"E7C0"],
- [0x876A,"E7B0"],
- [0x876B,"E3D8"],
- [0x876C,"E7B6"],
- [0x876D,"E7AF"],
- [0x876E,"E7B8"],
- [0x876F,"E7B5"],
- [0x8770,"9DD5"],
- [0x8771,"8FB0"],
- [0x8773,"E7A6"],
- [0x8774,"BDB9"],
- [0x8775,"E7BD"],
- [0x8776,"BDBA"],
- [0x8777,"E7A4"],
- [0x8778,"BDBD"],
- [0x8779,"EB64"],
- [0x877A,"E7B7"],
- [0x877B,"E7BC"],
- [0x877D,"FA7A"],
- [0x8781,"EB61"],
- [0x8782,"BDB8"],
- [0x8783,"BFC0"],
- [0x8784,"EB6B"],
- [0x8785,"EB67"],
- [0x8786,"9E5F"],
- [0x8787,"EB65"],
- [0x8788,"EB60"],
- [0x8789,"EB6F"],
- [0x878B,"99CD"],
- [0x878C,"A0C9"],
- [0x878D,"BFC4"],
- [0x878F,"EB5C"],
- [0x8790,"EB68"],
- [0x8791,"EB69"],
- [0x8792,"EB5F"],
- [0x8793,"EB5E"],
- [0x8794,"EB6C"],
- [0x8796,"EB62"],
- [0x8797,"EB5D"],
- [0x8798,"EB63"],
- [0x879A,"EB6E"],
- [0x879B,"EB5B"],
- [0x879C,"EB6D"],
- [0x879D,"EB6A"],
- [0x879E,"BFC2"],
- [0x879F,"BFC1"],
- [0x87A2,"BFC3"],
- [0x87A3,"EB66"],
- [0x87A4,"F0CB"],
- [0x87A5,"9ADB"],
- [0x87A9,"A0C6"],
- [0x87AA,"EE59"],
- [0x87AB,"C1B1"],
- [0x87AC,"EE5D"],
- [0x87AD,"EE5A"],
- [0x87AE,"EE61"],
- [0x87AF,"EE67"],
- [0x87B0,"EE5C"],
- [0x87B1,"8FB4"],
- [0x87B2,"EE70"],
- [0x87B3,"C1AE"],
- [0x87B4,"EE6A"],
- [0x87B5,"EE5F"],
- [0x87B6,"EE6B"],
- [0x87B7,"EE66"],
- [0x87B8,"EE6D"],
- [0x87B9,"EE5E"],
- [0x87BA,"C1B3"],
- [0x87BB,"C1B2"],
- [0x87BC,"EE60"],
- [0x87BD,"EE6E"],
- [0x87BE,"EE58"],
- [0x87BF,"EE6C"],
- [0x87C0,"C1AC"],
- [0x87C1,"A0D7"],
- [0x87C2,"EE64"],
- [0x87C3,"EE63"],
- [0x87C4,"EE68"],
- [0x87C5,"EE5B"],
- [0x87C6,"C1B0"],
- [0x87C8,"C1B4"],
- [0x87C9,"EE62"],
- [0x87CA,"EE69"],
- [0x87CB,"C1B5"],
- [0x87CC,"EE65"],
- [0x87CE,"A0C7"],
- [0x87D1,"C1AD"],
- [0x87D2,"C1AF"],
- [0x87D3,"F0C7"],
- [0x87D4,"F0C5"],
- [0x87D6,"A043"],
- [0x87D7,"F0CC"],
- [0x87D8,"F0C9"],
- [0x87D9,"F0CD"],
- [0x87DA,"8FB5"],
- [0x87DB,"F0BE"],
- [0x87DC,"F0C6"],
- [0x87DD,"F0D1"],
- [0x87DE,"EE6F"],
- [0x87DF,"F0C2"],
- [0x87E0,"C2CF"],
- [0x87E1,"E7A5"],
- [0x87E2,"F0BD"],
- [0x87E3,"F0CA"],
- [0x87E4,"F0C4"],
- [0x87E5,"F0C1"],
- [0x87E6,"F0BC"],
- [0x87E7,"F0BB"],
- [0x87E8,"F0D0"],
- [0x87EA,"F0C0"],
- [0x87EB,"F0BF"],
- [0x87EC,"C2CD"],
- [0x87ED,"F0C8"],
- [0x87EE,"8FB2"],
- [0x87EF,"C2CC"],
- [0x87F2,"C2CE"],
- [0x87F3,"F0C3"],
- [0x87F4,"F0CF"],
- [0x87F5,"A061"],
- [0x87F6,"F2DE"],
- [0x87F7,"F2DF"],
- [0x87F9,"C3C9"],
- [0x87FA,"F2DC"],
- [0x87FB,"C3C6"],
- [0x87FC,"F2E4"],
- [0x87FE,"C3CA"],
- [0x87FF,"F2E6"],
- [0x8800,"F2DB"],
- [0x8801,"F0CE"],
- [0x8802,"F2E8"],
- [0x8803,"F2DD"],
- [0x8804,"9E5E"],
- [0x8805,"C3C7"],
- [0x8806,"F2E3"],
- [0x8808,"F2E5"],
- [0x8809,"F2E0"],
- [0x880A,"F2E7"],
- [0x880B,"F2E2"],
- [0x880C,"F2E1"],
- [0x880D,"C3C8"],
- [0x880F,"8FB6"],
- [0x8810,"F4C5"],
- [0x8811,"F4C6"],
- [0x8813,"F4C8"],
- [0x8814,"C4AE"],
- [0x8815,"C4AF"],
- [0x8816,"F4C9"],
- [0x8817,"F4C7"],
- [0x8818,"9FE8"],
- [0x8819,"F4C4"],
- [0x881B,"F642"],
- [0x881C,"F645"],
- [0x881D,"F641"],
- [0x881F,"C4FA"],
- [0x8820,"F643"],
- [0x8821,"C4F9"],
- [0x8822,"C4F8"],
- [0x8823,"C4F7"],
- [0x8824,"F644"],
- [0x8825,"F751"],
- [0x8826,"F74F"],
- [0x8827,"9CB2"],
- [0x8828,"F74E"],
- [0x8829,"F640"],
- [0x882A,"F750"],
- [0x882B,"F646"],
- [0x882C,"F74D"],
- [0x882D,"957C"],
- [0x882E,"F7F9"],
- [0x882F,"F7D7"],
- [0x8830,"F7F7"],
- [0x8831,"C5DB"],
- [0x8832,"F7F8"],
- [0x8833,"F7FA"],
- [0x8835,"F8BF"],
- [0x8836,"C5FA"],
- [0x8837,"F8BE"],
- [0x8838,"F8BD"],
- [0x8839,"C5FB"],
- [0x883B,"C65A"],
- [0x883C,"F96E"],
- [0x883D,"F9A7"],
- [0x883E,"F9A6"],
- [0x883F,"F9A8"],
- [0x8840,"A6E5"],
- [0x8841,"D0AA"],
- [0x8842,"9FC7"],
- [0x8843,"D3CF"],
- [0x8844,"D3D0"],
- [0x8845,"8FBB"],
- [0x8846,"8FBC"],
- [0x8848,"DBC0"],
- [0x884A,"F647"],
- [0x884B,"F8C0"],
- [0x884C,"A6E6"],
- [0x884D,"AD6C"],
- [0x884E,"D0AB"],
- [0x884F,"8FEC"],
- [0x8852,"D7B1"],
- [0x8853,"B34E"],
- [0x8855,"DBC2"],
- [0x8856,"DBC1"],
- [0x8857,"B5F3"],
- [0x8859,"B8C5"],
- [0x885A,"E7C1"],
- [0x885B,"BDC3"],
- [0x885D,"BDC4"],
- [0x885E,"8FC0"],
- [0x8860,"936A"],
- [0x8861,"BFC5"],
- [0x8862,"C5FC"],
- [0x8863,"A6E7"],
- [0x8864,"8BE4"],
- [0x8865,"9C7C"],
- [0x8867,"D0AC"],
- [0x8868,"AAED"],
- [0x8869,"D0AE"],
- [0x886A,"D0AD"],
- [0x886B,"AD6D"],
- [0x886D,"D3D1"],
- [0x886E,"95A1"],
- [0x886F,"D3D8"],
- [0x8870,"B049"],
- [0x8871,"D3D6"],
- [0x8872,"D3D4"],
- [0x8874,"D3DB"],
- [0x8875,"D3D2"],
- [0x8876,"D3D3"],
- [0x8877,"B04A"],
- [0x8879,"B04E"],
- [0x887C,"D3DC"],
- [0x887D,"B04D"],
- [0x887E,"D3DA"],
- [0x887F,"D3D7"],
- [0x8880,"D3D5"],
- [0x8881,"B04B"],
- [0x8882,"B04C"],
- [0x8883,"D3D9"],
- [0x8884,"FEEC"],
- [0x8887,"95A3"],
- [0x8888,"B350"],
- [0x8889,"D7B2"],
- [0x888B,"B355"],
- [0x888C,"D7C2"],
- [0x888D,"B354"],
- [0x888E,"D7C4"],
- [0x888F,"8C45"],
- [0x8890,"8CB8"],
- [0x8891,"D7B8"],
- [0x8892,"B352"],
- [0x8893,"D7C3"],
- [0x8895,"D7B3"],
- [0x8896,"B353"],
- [0x8897,"D7BF"],
- [0x8898,"D7BB"],
- [0x8899,"D7BD"],
- [0x889A,"D7B7"],
- [0x889B,"D7BE"],
- [0x889C,"8FC1"],
- [0x889D,"87B7"],
- [0x889E,"B34F"],
- [0x889F,"D7BA"],
- [0x88A0,"A052"],
- [0x88A1,"D7B9"],
- [0x88A2,"D7B5"],
- [0x88A4,"D7C0"],
- [0x88A7,"D7BC"],
- [0x88A8,"D7B4"],
- [0x88AA,"D7B6"],
- [0x88AB,"B351"],
- [0x88AC,"D7C1"],
- [0x88AE,"99D0"],
- [0x88B1,"B5F6"],
- [0x88B2,"DBCD"],
- [0x88B4,"8FC3"],
- [0x88B5,"8FC4"],
- [0x88B6,"DBC9"],
- [0x88B7,"DBCB"],
- [0x88B8,"DBC6"],
- [0x88B9,"DBC5"],
- [0x88BA,"DBC3"],
- [0x88BC,"DBCA"],
- [0x88BD,"DBCC"],
- [0x88BE,"DBC8"],
- [0x88BF,"95A4"],
- [0x88C0,"DBC7"],
- [0x88C1,"B5F4"],
- [0x88C2,"B5F5"],
- [0x88C5,"8FC6"],
- [0x88C7,"9E60"],
- [0x88C9,"DBCF"],
- [0x88CA,"B8CD"],
- [0x88CB,"DFF2"],
- [0x88CC,"DFF8"],
- [0x88CD,"DFF3"],
- [0x88CE,"DFF4"],
- [0x88CF,"F9D8"],
- [0x88D0,"DFF9"],
- [0x88D2,"B8CF"],
- [0x88D4,"B8C7"],
- [0x88D5,"B8CE"],
- [0x88D6,"DFF1"],
- [0x88D7,"DBC4"],
- [0x88D8,"B8CA"],
- [0x88D9,"B8C8"],
- [0x88DA,"DFF7"],
- [0x88DB,"DFF6"],
- [0x88DC,"B8C9"],
- [0x88DD,"B8CB"],
- [0x88DE,"DFF5"],
- [0x88DF,"B8C6"],
- [0x88E1,"B8CC"],
- [0x88E6,"95A5"],
- [0x88E7,"E3F6"],
- [0x88E8,"BB74"],
- [0x88EB,"E442"],
- [0x88EC,"E441"],
- [0x88EE,"E3FB"],
- [0x88EF,"BB76"],
- [0x88F0,"E440"],
- [0x88F1,"E3F7"],
- [0x88F2,"E3F8"],
- [0x88F3,"BB6E"],
- [0x88F4,"BB70"],
- [0x88F5,"9CB3"],
- [0x88F6,"E3FD"],
- [0x88F7,"E3F5"],
- [0x88F8,"BB72"],
- [0x88F9,"BB71"],
- [0x88FA,"E3F9"],
- [0x88FB,"E3FE"],
- [0x88FC,"E3FC"],
- [0x88FD,"BB73"],
- [0x88FE,"E3FA"],
- [0x88FF,"99D1"],
- [0x8900,"FEF1"],
- [0x8901,"DBCE"],
- [0x8902,"BB6F"],
- [0x8905,"E7C2"],
- [0x8906,"E7C9"],
- [0x8907,"BDC6"],
- [0x8909,"E7CD"],
- [0x890A,"BDCA"],
- [0x890B,"E7C5"],
- [0x890C,"E7C3"],
- [0x890E,"E7CC"],
- [0x8910,"BDC5"],
- [0x8911,"E7CB"],
- [0x8912,"BDC7"],
- [0x8913,"BDC8"],
- [0x8914,"E7C4"],
- [0x8915,"BDC9"],
- [0x8916,"E7CA"],
- [0x8917,"E7C6"],
- [0x8918,"E7C7"],
- [0x8919,"E7C8"],
- [0x891A,"BB75"],
- [0x891E,"EB70"],
- [0x891F,"EB7C"],
- [0x8921,"BFCA"],
- [0x8922,"EB77"],
- [0x8923,"EB79"],
- [0x8924,"99D2"],
- [0x8925,"BFC8"],
- [0x8926,"EB71"],
- [0x8927,"EB75"],
- [0x8929,"EB78"],
- [0x892A,"BFC6"],
- [0x892B,"BFC9"],
- [0x892C,"EB7B"],
- [0x892D,"EB73"],
- [0x892E,"EB74"],
- [0x892F,"EB7A"],
- [0x8930,"EB72"],
- [0x8931,"EB76"],
- [0x8932,"BFC7"],
- [0x8933,"EE72"],
- [0x8935,"EE71"],
- [0x8936,"C1B7"],
- [0x8937,"EE77"],
- [0x8938,"C1B9"],
- [0x893B,"C1B6"],
- [0x893C,"EE73"],
- [0x893D,"C1BA"],
- [0x893E,"EE74"],
- [0x8941,"EE75"],
- [0x8942,"EE78"],
- [0x8943,"9CC2"],
- [0x8944,"C1B8"],
- [0x8946,"F0D6"],
- [0x8947,"99D3"],
- [0x8949,"F0D9"],
- [0x894B,"F0D3"],
- [0x894C,"F0D5"],
- [0x894D,"95A7"],
- [0x894F,"F0D4"],
- [0x8950,"F0D7"],
- [0x8951,"F0D8"],
- [0x8952,"EE76"],
- [0x8953,"F0D2"],
- [0x8954,"95A9"],
- [0x8956,"C3CD"],
- [0x8957,"F2EC"],
- [0x8958,"F2EF"],
- [0x8959,"F2F1"],
- [0x895A,"F2EA"],
- [0x895B,"F2EB"],
- [0x895C,"F2EE"],
- [0x895D,"F2F0"],
- [0x895E,"C3CE"],
- [0x895F,"C3CC"],
- [0x8960,"C3CB"],
- [0x8961,"F2ED"],
- [0x8962,"F2E9"],
- [0x8963,"F4CA"],
- [0x8964,"C4B0"],
- [0x8965,"95A6"],
- [0x8966,"F4CB"],
- [0x8969,"F649"],
- [0x896A,"C4FB"],
- [0x896B,"F64B"],
- [0x896C,"C4FC"],
- [0x896D,"F648"],
- [0x896E,"F64A"],
- [0x896F,"C5A8"],
- [0x8971,"F752"],
- [0x8972,"C5A7"],
- [0x8973,"F7FD"],
- [0x8974,"F7FC"],
- [0x8976,"F7FB"],
- [0x8977,"9C5D"],
- [0x8979,"F948"],
- [0x897A,"F949"],
- [0x897B,"F94B"],
- [0x897C,"F94A"],
- [0x897E,"CA50"],
- [0x897F,"A6E8"],
- [0x8980,"98E2"],
- [0x8981,"AD6E"],
- [0x8982,"D7C5"],
- [0x8983,"B5F7"],
- [0x8985,"DFFA"],
- [0x8986,"C2D0"],
- [0x8987,"8FC9"],
- [0x8988,"F2F2"],
- [0x8989,"A0C2"],
- [0x898A,"8FCA"],
- [0x898B,"A8A3"],
- [0x898F,"B357"],
- [0x8991,"99D4"],
- [0x8993,"B356"],
- [0x8994,"A0B9"],
- [0x8995,"DBD0"],
- [0x8996,"B5F8"],
- [0x8997,"DBD2"],
- [0x8998,"DBD1"],
- [0x899B,"DFFB"],
- [0x899C,"B8D0"],
- [0x899D,"E443"],
- [0x899E,"E446"],
- [0x899F,"E445"],
- [0x89A1,"E444"],
- [0x89A2,"E7CE"],
- [0x89A3,"E7D0"],
- [0x89A4,"E7CF"],
- [0x89A5,"9B58"],
- [0x89A6,"BFCC"],
- [0x89A7,"8FCD"],
- [0x89A9,"A0D4"],
- [0x89AA,"BFCB"],
- [0x89AC,"C1BB"],
- [0x89AD,"EE79"],
- [0x89AE,"EE7B"],
- [0x89AF,"EE7A"],
- [0x89B2,"C2D1"],
- [0x89B6,"F2F4"],
- [0x89B7,"F2F3"],
- [0x89B9,"F4CC"],
- [0x89BA,"C4B1"],
- [0x89BC,"8FCE"],
- [0x89BD,"C4FD"],
- [0x89BE,"F754"],
- [0x89BF,"F753"],
- [0x89C0,"C65B"],
- [0x89C1,"8BE5"],
- [0x89C6,"8979"],
- [0x89D2,"A8A4"],
- [0x89D3,"D0AF"],
- [0x89D4,"AD6F"],
- [0x89D5,"D7C8"],
- [0x89D6,"D7C6"],
- [0x89D9,"D7C7"],
- [0x89DA,"DBD4"],
- [0x89DB,"DBD5"],
- [0x89DC,"E043"],
- [0x89DD,"DBD3"],
- [0x89DF,"DFFC"],
- [0x89E0,"E041"],
- [0x89E1,"E040"],
- [0x89E2,"E042"],
- [0x89E3,"B8D1"],
- [0x89E4,"DFFE"],
- [0x89E5,"DFFD"],
- [0x89E6,"E044"],
- [0x89E7,"8FD0"],
- [0x89E8,"E449"],
- [0x89E9,"E447"],
- [0x89EB,"E448"],
- [0x89EC,"E7D3"],
- [0x89ED,"E7D1"],
- [0x89F0,"E7D2"],
- [0x89F1,"EB7D"],
- [0x89F2,"EE7C"],
- [0x89F3,"EE7D"],
- [0x89F4,"C2D2"],
- [0x89F6,"F2F5"],
- [0x89F7,"F4CD"],
- [0x89F8,"C4B2"],
- [0x89FA,"F64C"],
- [0x89FB,"F755"],
- [0x89FC,"C5A9"],
- [0x89FE,"F7FE"],
- [0x89FF,"F94C"],
- [0x8A00,"A8A5"],
- [0x8A02,"AD71"],
- [0x8A03,"AD72"],
- [0x8A04,"D0B0"],
- [0x8A07,"D0B1"],
- [0x8A08,"AD70"],
- [0x8A0A,"B054"],
- [0x8A0C,"B052"],
- [0x8A0E,"B051"],
- [0x8A0F,"B058"],
- [0x8A10,"B050"],
- [0x8A11,"B059"],
- [0x8A12,"D3DD"],
- [0x8A13,"B056"],
- [0x8A15,"B053"],
- [0x8A16,"B057"],
- [0x8A17,"B055"],
- [0x8A18,"B04F"],
- [0x8A1B,"B35F"],
- [0x8A1C,"95B6"],
- [0x8A1D,"B359"],
- [0x8A1E,"D7CC"],
- [0x8A1F,"B35E"],
- [0x8A22,"B360"],
- [0x8A23,"B35A"],
- [0x8A25,"B35B"],
- [0x8A27,"D7CA"],
- [0x8A29,"99D6"],
- [0x8A2A,"B358"],
- [0x8A2B,"95E5"],
- [0x8A2C,"D7CB"],
- [0x8A2D,"B35D"],
- [0x8A30,"D7C9"],
- [0x8A31,"B35C"],
- [0x8A34,"B644"],
- [0x8A36,"B646"],
- [0x8A38,"99D7"],
- [0x8A39,"DBD8"],
- [0x8A3A,"B645"],
- [0x8A3B,"B5F9"],
- [0x8A3C,"B5FD"],
- [0x8A3D,"95B5"],
- [0x8A3E,"B8E4"],
- [0x8A3F,"E049"],
- [0x8A40,"DBDA"],
- [0x8A41,"B5FE"],
- [0x8A44,"DBDD"],
- [0x8A45,"DBDE"],
- [0x8A46,"B643"],
- [0x8A48,"DBE0"],
- [0x8A49,"A0CA"],
- [0x8A4A,"DBE2"],
- [0x8A4C,"DBE3"],
- [0x8A4D,"DBD7"],
- [0x8A4E,"DBD6"],
- [0x8A4F,"DBE4"],
- [0x8A50,"B642"],
- [0x8A51,"DBE1"],
- [0x8A52,"DBDF"],
- [0x8A54,"B640"],
- [0x8A55,"B5FB"],
- [0x8A56,"B647"],
- [0x8A57,"DBDB"],
- [0x8A58,"DBDC"],
- [0x8A59,"DBD9"],
- [0x8A5B,"B641"],
- [0x8A5E,"B5FC"],
- [0x8A60,"B5FA"],
- [0x8A61,"E048"],
- [0x8A62,"B8DF"],
- [0x8A63,"B8DA"],
- [0x8A66,"B8D5"],
- [0x8A67,"9FFD"],
- [0x8A68,"B8E5"],
- [0x8A69,"B8D6"],
- [0x8A6B,"B8D2"],
- [0x8A6C,"B8E1"],
- [0x8A6D,"B8DE"],
- [0x8A6E,"B8E0"],
- [0x8A70,"B8D7"],
- [0x8A71,"B8DC"],
- [0x8A72,"B8D3"],
- [0x8A73,"B8D4"],
- [0x8A74,"E050"],
- [0x8A75,"E04D"],
- [0x8A76,"E045"],
- [0x8A77,"E04A"],
- [0x8A79,"B8E2"],
- [0x8A7A,"E051"],
- [0x8A7B,"B8E3"],
- [0x8A7C,"B8D9"],
- [0x8A7E,"A058"],
- [0x8A7F,"E047"],
- [0x8A81,"E04F"],
- [0x8A82,"E04B"],
- [0x8A83,"E04E"],
- [0x8A84,"E04C"],
- [0x8A85,"B8DD"],
- [0x8A86,"E046"],
- [0x8A87,"B8D8"],
- [0x8A8B,"E44C"],
- [0x8A8C,"BB78"],
- [0x8A8D,"BB7B"],
- [0x8A8F,"E44E"],
- [0x8A90,"8FD6"],
- [0x8A91,"BBA5"],
- [0x8A92,"E44D"],
- [0x8A93,"BB7D"],
- [0x8A94,"99D8"],
- [0x8A95,"BDCF"],
- [0x8A96,"E44F"],
- [0x8A98,"BBA4"],
- [0x8A99,"E44B"],
- [0x8A9A,"BBA6"],
- [0x8A9C,"8FD3"],
- [0x8A9E,"BB79"],
- [0x8AA0,"B8DB"],
- [0x8AA1,"BB7C"],
- [0x8AA3,"BB7A"],
- [0x8AA4,"BB7E"],
- [0x8AA5,"BBA2"],
- [0x8AA6,"BB77"],
- [0x8AA7,"BBA7"],
- [0x8AA8,"BBA3"],
- [0x8AA9,"8FE5"],
- [0x8AAA,"BBA1"],
- [0x8AAB,"E44A"],
- [0x8AAF,"8FE9"],
- [0x8AB0,"BDD6"],
- [0x8AB2,"BDD2"],
- [0x8AB4,"99D9"],
- [0x8AB6,"BDD9"],
- [0x8AB8,"E7D6"],
- [0x8AB9,"BDDA"],
- [0x8ABA,"E7E2"],
- [0x8ABB,"E7DB"],
- [0x8ABC,"BDCB"],
- [0x8ABD,"E7E3"],
- [0x8ABE,"E7DD"],
- [0x8ABF,"BDD5"],
- [0x8AC0,"E7DE"],
- [0x8AC2,"BDD4"],
- [0x8AC3,"E7E1"],
- [0x8AC4,"BDCE"],
- [0x8AC5,"E7DF"],
- [0x8AC6,"E7D5"],
- [0x8AC7,"BDCD"],
- [0x8AC8,"EBAA"],
- [0x8AC9,"BDD3"],
- [0x8ACB,"BDD0"],
- [0x8ACC,"8CF7"],
- [0x8ACD,"BDD8"],
- [0x8ACF,"E7D4"],
- [0x8AD1,"E7D8"],
- [0x8AD2,"BDCC"],
- [0x8AD3,"E7D7"],
- [0x8AD4,"E7D9"],
- [0x8AD5,"E7DA"],
- [0x8AD6,"BDD7"],
- [0x8AD7,"E7DC"],
- [0x8AD8,"E7E0"],
- [0x8AD9,"E7E4"],
- [0x8ADA,"927C"],
- [0x8ADB,"BDDB"],
- [0x8ADC,"BFD2"],
- [0x8ADD,"EBA5"],
- [0x8ADE,"EBAB"],
- [0x8ADF,"EBA8"],
- [0x8AE0,"EB7E"],
- [0x8AE1,"EBAC"],
- [0x8AE2,"EBA1"],
- [0x8AE4,"EBA7"],
- [0x8AE6,"BFCD"],
- [0x8AE7,"BFD3"],
- [0x8AE8,"EBAD"],
- [0x8AEA,"9C45"],
- [0x8AEB,"BFCF"],
- [0x8AED,"BFD9"],
- [0x8AEE,"BFD4"],
- [0x8AEF,"EBAF"],
- [0x8AF0,"EBA9"],
- [0x8AF1,"BFD0"],
- [0x8AF2,"EBA2"],
- [0x8AF3,"BFDA"],
- [0x8AF4,"EBA3"],
- [0x8AF5,"EBA4"],
- [0x8AF6,"BFDB"],
- [0x8AF7,"BFD8"],
- [0x8AF8,"BDD1"],
- [0x8AF9,"8CE8"],
- [0x8AFA,"BFCE"],
- [0x8AFB,"EBB0"],
- [0x8AFC,"BFDC"],
- [0x8AFE,"BFD5"],
- [0x8AFF,"EBAE"],
- [0x8B00,"BFD1"],
- [0x8B01,"BFD6"],
- [0x8B02,"BFD7"],
- [0x8B04,"C1C3"],
- [0x8B05,"EEA4"],
- [0x8B06,"EEAD"],
- [0x8B07,"EEAA"],
- [0x8B08,"EEAC"],
- [0x8B0A,"C1C0"],
- [0x8B0B,"EEA5"],
- [0x8B0C,"8FDE"],
- [0x8B0D,"EEAB"],
- [0x8B0E,"C1BC"],
- [0x8B0F,"EEA7"],
- [0x8B10,"C1C4"],
- [0x8B11,"EEA3"],
- [0x8B12,"EEA8"],
- [0x8B13,"EEAF"],
- [0x8B14,"EBA6"],
- [0x8B15,"EEA9"],
- [0x8B16,"EEA2"],
- [0x8B17,"C1BD"],
- [0x8B18,"EEA1"],
- [0x8B19,"C1BE"],
- [0x8B1A,"EEB0"],
- [0x8B1B,"C1BF"],
- [0x8B1C,"EEAE"],
- [0x8B1D,"C1C2"],
- [0x8B1E,"EE7E"],
- [0x8B1F,"8FDF"],
- [0x8B20,"C1C1"],
- [0x8B22,"EEA6"],
- [0x8B23,"F0DC"],
- [0x8B24,"F0EA"],
- [0x8B25,"F0E5"],
- [0x8B26,"F0E7"],
- [0x8B27,"F0DB"],
- [0x8B28,"C2D3"],
- [0x8B2A,"F0DA"],
- [0x8B2B,"C2D6"],
- [0x8B2C,"C2D5"],
- [0x8B2D,"A04B"],
- [0x8B2E,"F0E9"],
- [0x8B2F,"F0E1"],
- [0x8B30,"F0DE"],
- [0x8B31,"F0E4"],
- [0x8B33,"F0DD"],
- [0x8B35,"F0DF"],
- [0x8B36,"F0E8"],
- [0x8B37,"F0E6"],
- [0x8B39,"C2D4"],
- [0x8B3A,"F0ED"],
- [0x8B3B,"F0EB"],
- [0x8B3C,"F0E2"],
- [0x8B3D,"F0EC"],
- [0x8B3E,"F0E3"],
- [0x8B3F,"8FE2"],
- [0x8B40,"F2F9"],
- [0x8B41,"C3CF"],
- [0x8B42,"F341"],
- [0x8B43,"A0CC"],
- [0x8B45,"F64F"],
- [0x8B46,"C3D6"],
- [0x8B47,"F0E0"],
- [0x8B48,"F2F7"],
- [0x8B49,"C3D2"],
- [0x8B4A,"F2F8"],
- [0x8B4B,"F2FD"],
- [0x8B4C,"8FE3"],
- [0x8B4D,"8FE4"],
- [0x8B4E,"C3D4"],
- [0x8B4F,"C3D5"],
- [0x8B50,"F2F6"],
- [0x8B51,"F340"],
- [0x8B52,"F342"],
- [0x8B53,"F2FA"],
- [0x8B54,"F2FC"],
- [0x8B55,"F2FE"],
- [0x8B56,"F2FB"],
- [0x8B57,"F343"],
- [0x8B58,"C3D1"],
- [0x8B59,"C3D7"],
- [0x8B5A,"C3D3"],
- [0x8B5C,"C3D0"],
- [0x8B5D,"F4D0"],
- [0x8B5E,"9BC4"],
- [0x8B5F,"C4B7"],
- [0x8B60,"F4CE"],
- [0x8B62,"9BFC"],
- [0x8B63,"F4D2"],
- [0x8B65,"F4D3"],
- [0x8B66,"C4B5"],
- [0x8B67,"F4D4"],
- [0x8B68,"F4D1"],
- [0x8B69,"964C"],
- [0x8B6A,"F4CF"],
- [0x8B6B,"C4B8"],
- [0x8B6C,"C4B4"],
- [0x8B6D,"F4D5"],
- [0x8B6F,"C4B6"],
- [0x8B70,"C4B3"],
- [0x8B74,"C4FE"],
- [0x8B77,"C540"],
- [0x8B78,"F64E"],
- [0x8B79,"F64D"],
- [0x8B7A,"F650"],
- [0x8B7B,"F651"],
- [0x8B7D,"C541"],
- [0x8B7E,"F756"],
- [0x8B7F,"F75B"],
- [0x8B80,"C5AA"],
- [0x8B81,"9AF6"],
- [0x8B82,"F758"],
- [0x8B83,"8CAE"],
- [0x8B84,"F757"],
- [0x8B85,"F75A"],
- [0x8B86,"F759"],
- [0x8B88,"F843"],
- [0x8B8A,"C5DC"],
- [0x8B8B,"F842"],
- [0x8B8C,"F840"],
- [0x8B8E,"F841"],
- [0x8B8F,"87CB"],
- [0x8B90,"8FE7"],
- [0x8B92,"C5FE"],
- [0x8B93,"C5FD"],
- [0x8B94,"F8C1"],
- [0x8B95,"F8C2"],
- [0x8B96,"C640"],
- [0x8B98,"F94D"],
- [0x8B99,"F94E"],
- [0x8B9A,"C667"],
- [0x8B9B,"8FE8"],
- [0x8B9C,"C66D"],
- [0x8B9E,"F9A9"],
- [0x8B9F,"F9C8"],
- [0x8BA0,"8BE7"],
- [0x8BBE,"897A"],
- [0x8BE2,"897B"],
- [0x8C37,"A8A6"],
- [0x8C39,"D7CD"],
- [0x8C3B,"D7CE"],
- [0x8C3C,"E052"],
- [0x8C3D,"E450"],
- [0x8C3E,"E7E5"],
- [0x8C3F,"C1C6"],
- [0x8C41,"C1C5"],
- [0x8C42,"F0EE"],
- [0x8C43,"F344"],
- [0x8C45,"F844"],
- [0x8C46,"A8A7"],
- [0x8C47,"D3DE"],
- [0x8C48,"B05A"],
- [0x8C49,"B361"],
- [0x8C4A,"E054"],
- [0x8C4B,"E053"],
- [0x8C4C,"BDDC"],
- [0x8C4D,"E7E6"],
- [0x8C4E,"BDDD"],
- [0x8C4F,"EEB1"],
- [0x8C50,"C2D7"],
- [0x8C51,"99DA"],
- [0x8C54,"C676"],
- [0x8C55,"A8A8"],
- [0x8C56,"CDCB"],
- [0x8C57,"D3DF"],
- [0x8C5A,"B362"],
- [0x8C5C,"D7CF"],
- [0x8C5D,"D7D0"],
- [0x8C5F,"DBE5"],
- [0x8C61,"B648"],
- [0x8C62,"B8E6"],
- [0x8C64,"E056"],
- [0x8C65,"E055"],
- [0x8C66,"E057"],
- [0x8C68,"E451"],
- [0x8C69,"E452"],
- [0x8C6A,"BBA8"],
- [0x8C6B,"BFDD"],
- [0x8C6C,"BDDE"],
- [0x8C6D,"BFDE"],
- [0x8C6F,"EEB5"],
- [0x8C70,"EEB2"],
- [0x8C71,"EEB4"],
- [0x8C72,"EEB3"],
- [0x8C73,"C1C7"],
- [0x8C75,"F0EF"],
- [0x8C76,"F346"],
- [0x8C77,"F345"],
- [0x8C78,"CBA4"],
- [0x8C79,"B05C"],
- [0x8C7A,"B05B"],
- [0x8C7B,"D3E0"],
- [0x8C7D,"D7D1"],
- [0x8C80,"DBE7"],
- [0x8C81,"DBE6"],
- [0x8C82,"B649"],
- [0x8C84,"E059"],
- [0x8C85,"E05A"],
- [0x8C86,"E058"],
- [0x8C89,"B8E8"],
- [0x8C8A,"B8E7"],
- [0x8C8C,"BBAA"],
- [0x8C8D,"BBA9"],
- [0x8C8F,"E7E7"],
- [0x8C90,"EBB3"],
- [0x8C91,"EBB1"],
- [0x8C92,"EBB2"],
- [0x8C93,"BFDF"],
- [0x8C94,"EEB7"],
- [0x8C95,"EEB6"],
- [0x8C97,"F0F2"],
- [0x8C98,"F0F1"],
- [0x8C99,"F0F0"],
- [0x8C9A,"F347"],
- [0x8C9B,"8FED"],
- [0x8C9C,"F9AA"],
- [0x8C9D,"A8A9"],
- [0x8C9E,"AD73"],
- [0x8C9F,"95C0"],
- [0x8CA0,"AD74"],
- [0x8CA1,"B05D"],
- [0x8CA2,"B05E"],
- [0x8CA3,"D3E2"],
- [0x8CA4,"D3E1"],
- [0x8CA5,"D7D2"],
- [0x8CA7,"B368"],
- [0x8CA8,"B366"],
- [0x8CA9,"B363"],
- [0x8CAA,"B367"],
- [0x8CAB,"B365"],
- [0x8CAC,"B364"],
- [0x8CAD,"A0CB"],
- [0x8CAF,"B64A"],
- [0x8CB0,"DBEA"],
- [0x8CB2,"B8ED"],
- [0x8CB3,"B64C"],
- [0x8CB4,"B651"],
- [0x8CB5,"DBEC"],
- [0x8CB6,"B653"],
- [0x8CB7,"B652"],
- [0x8CB8,"B655"],
- [0x8CB9,"DBEB"],
- [0x8CBA,"DBE8"],
- [0x8CBB,"B64F"],
- [0x8CBC,"B64B"],
- [0x8CBD,"B64D"],
- [0x8CBE,"DBE9"],
- [0x8CBF,"B654"],
- [0x8CC0,"B650"],
- [0x8CC1,"B64E"],
- [0x8CC2,"B8EF"],
- [0x8CC3,"B8EE"],
- [0x8CC4,"B8EC"],
- [0x8CC5,"B8F0"],
- [0x8CC7,"B8EA"],
- [0x8CC8,"B8EB"],
- [0x8CCA,"B8E9"],
- [0x8CCC,"E05B"],
- [0x8CCD,"9E48"],
- [0x8CCF,"E454"],
- [0x8CD1,"BBAC"],
- [0x8CD2,"BBAD"],
- [0x8CD3,"BBAB"],
- [0x8CD4,"99DB"],
- [0x8CD5,"E453"],
- [0x8CD6,"8FF3"],
- [0x8CD7,"E455"],
- [0x8CD9,"E7EA"],
- [0x8CDA,"E7EC"],
- [0x8CDB,"8FF9"],
- [0x8CDC,"BDE7"],
- [0x8CDD,"E7ED"],
- [0x8CDE,"BDE0"],
- [0x8CDF,"E7E9"],
- [0x8CE0,"BDDF"],
- [0x8CE1,"BDE9"],
- [0x8CE2,"BDE5"],
- [0x8CE3,"BDE6"],
- [0x8CE4,"BDE2"],
- [0x8CE5,"E7E8"],
- [0x8CE6,"BDE1"],
- [0x8CE7,"E7EE"],
- [0x8CE8,"E7EB"],
- [0x8CE9,"95C1"],
- [0x8CEA,"BDE8"],
- [0x8CEB,"A04E"],
- [0x8CEC,"BDE3"],
- [0x8CED,"BDE4"],
- [0x8CEE,"EBB5"],
- [0x8CF0,"EBB7"],
- [0x8CF1,"EBB6"],
- [0x8CF2,"99DC"],
- [0x8CF3,"EBB8"],
- [0x8CF4,"BFE0"],
- [0x8CF5,"EBB4"],
- [0x8CF7,"A064"],
- [0x8CF8,"C1CB"],
- [0x8CF9,"EEB8"],
- [0x8CFA,"C1C8"],
- [0x8CFB,"C1CC"],
- [0x8CFC,"C1CA"],
- [0x8CFD,"C1C9"],
- [0x8CFE,"F0F3"],
- [0x8D00,"F0F6"],
- [0x8D02,"F0F5"],
- [0x8D03,"8FF7"],
- [0x8D04,"F0F4"],
- [0x8D05,"C2D8"],
- [0x8D06,"F348"],
- [0x8D07,"F349"],
- [0x8D08,"C3D8"],
- [0x8D09,"F34A"],
- [0x8D0A,"C3D9"],
- [0x8D0B,"89B0"],
- [0x8D0C,"A048"],
- [0x8D0D,"C4BA"],
- [0x8D0F,"C4B9"],
- [0x8D10,"F652"],
- [0x8D11,"8FFB"],
- [0x8D12,"8FF6"],
- [0x8D13,"C542"],
- [0x8D14,"F653"],
- [0x8D15,"F75C"],
- [0x8D16,"C5AB"],
- [0x8D17,"C5AC"],
- [0x8D18,"9DDC"],
- [0x8D19,"F845"],
- [0x8D1B,"C642"],
- [0x8D1C,"99DD"],
- [0x8D1D,"8BE8"],
- [0x8D64,"A8AA"],
- [0x8D66,"B36A"],
- [0x8D67,"B369"],
- [0x8D68,"E05C"],
- [0x8D69,"E05D"],
- [0x8D6B,"BBAE"],
- [0x8D6C,"EBB9"],
- [0x8D6D,"BDEA"],
- [0x8D6E,"EBBA"],
- [0x8D6F,"EEB9"],
- [0x8D70,"A8AB"],
- [0x8D72,"D0B2"],
- [0x8D73,"AD76"],
- [0x8D74,"AD75"],
- [0x8D76,"D3E3"],
- [0x8D77,"B05F"],
- [0x8D78,"D3E4"],
- [0x8D79,"D7D5"],
- [0x8D7A,"92C1"],
- [0x8D7B,"D7D4"],
- [0x8D7D,"D7D3"],
- [0x8D80,"DBEE"],
- [0x8D81,"B658"],
- [0x8D82,"9FD6"],
- [0x8D84,"DBED"],
- [0x8D85,"B657"],
- [0x8D89,"DBEF"],
- [0x8D8A,"B656"],
- [0x8D8C,"E05F"],
- [0x8D8D,"E062"],
- [0x8D8E,"E060"],
- [0x8D8F,"E061"],
- [0x8D90,"E065"],
- [0x8D91,"E05E"],
- [0x8D92,"E066"],
- [0x8D93,"E063"],
- [0x8D94,"E064"],
- [0x8D95,"BBB0"],
- [0x8D96,"E456"],
- [0x8D99,"BBAF"],
- [0x8D9B,"E7F2"],
- [0x8D9C,"E7F0"],
- [0x8D9F,"BDEB"],
- [0x8DA0,"E7EF"],
- [0x8DA1,"E7F1"],
- [0x8DA3,"BDEC"],
- [0x8DA5,"EBBB"],
- [0x8DA6,"A0D2"],
- [0x8DA7,"EBBC"],
- [0x8DA8,"C1CD"],
- [0x8DA9,"9040"],
- [0x8DAA,"F34C"],
- [0x8DAB,"F34E"],
- [0x8DAC,"F34B"],
- [0x8DAD,"F34D"],
- [0x8DAE,"F4D6"],
- [0x8DAF,"F654"],
- [0x8DB2,"F96F"],
- [0x8DB3,"A8AC"],
- [0x8DB4,"AD77"],
- [0x8DB5,"D3E5"],
- [0x8DB6,"D3E7"],
- [0x8DB7,"D3E6"],
- [0x8DB9,"D7D8"],
- [0x8DBA,"B36C"],
- [0x8DBC,"D7D6"],
- [0x8DBE,"B36B"],
- [0x8DBF,"D7D9"],
- [0x8DC0,"8AC4"],
- [0x8DC1,"D7DA"],
- [0x8DC2,"D7D7"],
- [0x8DC3,"99E0"],
- [0x8DC5,"DBFB"],
- [0x8DC6,"B660"],
- [0x8DC7,"DBF3"],
- [0x8DC8,"DBF9"],
- [0x8DCB,"B65B"],
- [0x8DCC,"B65E"],
- [0x8DCD,"DBF2"],
- [0x8DCE,"B659"],
- [0x8DCF,"DBF6"],
- [0x8DD0,"E06C"],
- [0x8DD1,"B65D"],
- [0x8DD3,"DBF1"],
- [0x8DD4,"9FF0"],
- [0x8DD5,"DBF7"],
- [0x8DD6,"DBF4"],
- [0x8DD7,"DBFA"],
- [0x8DD8,"DBF0"],
- [0x8DD9,"DBF8"],
- [0x8DDA,"B65C"],
- [0x8DDB,"B65F"],
- [0x8DDC,"DBF5"],
- [0x8DDD,"B65A"],
- [0x8DDF,"B8F2"],
- [0x8DE0,"E068"],
- [0x8DE1,"B8F1"],
- [0x8DE2,"E06F"],
- [0x8DE3,"E06E"],
- [0x8DE4,"B8F8"],
- [0x8DE6,"B8F9"],
- [0x8DE7,"E070"],
- [0x8DE8,"B8F3"],
- [0x8DE9,"E06D"],
- [0x8DEA,"B8F7"],
- [0x8DEB,"E072"],
- [0x8DEC,"E069"],
- [0x8DEE,"E06B"],
- [0x8DEF,"B8F4"],
- [0x8DF0,"E067"],
- [0x8DF1,"E06A"],
- [0x8DF2,"E071"],
- [0x8DF3,"B8F5"],
- [0x8DF4,"E073"],
- [0x8DFA,"B8F6"],
- [0x8DFC,"BBB1"],
- [0x8DFD,"E45B"],
- [0x8DFE,"E461"],
- [0x8DFF,"E459"],
- [0x8E00,"E462"],
- [0x8E01,"9FF3"],
- [0x8E02,"E458"],
- [0x8E03,"E45D"],
- [0x8E04,"E463"],
- [0x8E05,"E460"],
- [0x8E06,"E45F"],
- [0x8E07,"E45E"],
- [0x8E09,"E457"],
- [0x8E0A,"E45C"],
- [0x8E0D,"E45A"],
- [0x8E0E,"9DBF"],
- [0x8E0F,"BDF1"],
- [0x8E10,"BDEE"],
- [0x8E11,"E7FB"],
- [0x8E12,"E841"],
- [0x8E13,"E843"],
- [0x8E14,"E840"],
- [0x8E15,"E7F8"],
- [0x8E16,"E7FA"],
- [0x8E17,"E845"],
- [0x8E18,"E842"],
- [0x8E19,"E7FC"],
- [0x8E1A,"E846"],
- [0x8E1B,"E7F9"],
- [0x8E1C,"E844"],
- [0x8E1D,"BDEF"],
- [0x8E1E,"BDF5"],
- [0x8E1F,"BDF3"],
- [0x8E20,"E7F3"],
- [0x8E21,"BDF4"],
- [0x8E22,"BDF0"],
- [0x8E23,"E7F4"],
- [0x8E24,"E7F6"],
- [0x8E25,"E7F5"],
- [0x8E26,"E7FD"],
- [0x8E27,"E7FE"],
- [0x8E28,"9FF6"],
- [0x8E29,"BDF2"],
- [0x8E2A,"95C8"],
- [0x8E2B,"BDED"],
- [0x8E2D,"9E5A"],
- [0x8E2E,"E7F7"],
- [0x8E30,"EBC6"],
- [0x8E31,"BFE2"],
- [0x8E33,"EBBD"],
- [0x8E34,"BFE3"],
- [0x8E35,"BFE6"],
- [0x8E36,"EBC2"],
- [0x8E38,"EBBF"],
- [0x8E39,"BFE5"],
- [0x8E3A,"99E3"],
- [0x8E3C,"EBC3"],
- [0x8E3D,"EBC4"],
- [0x8E3E,"EBBE"],
- [0x8E3F,"EBC7"],
- [0x8E40,"EBC0"],
- [0x8E41,"EBC5"],
- [0x8E42,"BFE4"],
- [0x8E44,"BFE1"],
- [0x8E45,"EBC1"],
- [0x8E46,"8A4A"],
- [0x8E47,"EEBF"],
- [0x8E48,"C1D0"],
- [0x8E49,"C1CE"],
- [0x8E4A,"C1D1"],
- [0x8E4B,"C1CF"],
- [0x8E4C,"EEBE"],
- [0x8E4D,"EEBB"],
- [0x8E4E,"EEBA"],
- [0x8E4F,"9FF1"],
- [0x8E50,"EEBD"],
- [0x8E53,"EEBC"],
- [0x8E54,"F145"],
- [0x8E55,"C2DE"],
- [0x8E56,"F0FB"],
- [0x8E57,"F0FA"],
- [0x8E59,"C2D9"],
- [0x8E5A,"F141"],
- [0x8E5B,"F140"],
- [0x8E5C,"F0F7"],
- [0x8E5D,"F143"],
- [0x8E5E,"F0FC"],
- [0x8E5F,"C2DD"],
- [0x8E60,"F0F9"],
- [0x8E61,"F142"],
- [0x8E62,"F0F8"],
- [0x8E63,"C2DA"],
- [0x8E64,"C2DC"],
- [0x8E65,"F0FD"],
- [0x8E66,"C2DB"],
- [0x8E67,"F0FE"],
- [0x8E68,"8AA7"],
- [0x8E69,"F144"],
- [0x8E6A,"F352"],
- [0x8E6C,"C3DE"],
- [0x8E6D,"F34F"],
- [0x8E6F,"F353"],
- [0x8E71,"99E6"],
- [0x8E72,"C3DB"],
- [0x8E73,"F351"],
- [0x8E74,"C3E0"],
- [0x8E75,"9FF7"],
- [0x8E76,"C3DD"],
- [0x8E77,"9FED"],
- [0x8E78,"F350"],
- [0x8E7A,"C3DF"],
- [0x8E7B,"F354"],
- [0x8E7C,"C3DA"],
- [0x8E7E,"8A5C"],
- [0x8E80,"9DAE"],
- [0x8E81,"C4BC"],
- [0x8E82,"C4BE"],
- [0x8E84,"F4D9"],
- [0x8E85,"C4BD"],
- [0x8E86,"F4D7"],
- [0x8E87,"C3DC"],
- [0x8E88,"F4D8"],
- [0x8E89,"C4BB"],
- [0x8E8A,"C543"],
- [0x8E8B,"C545"],
- [0x8E8C,"F656"],
- [0x8E8D,"C544"],
- [0x8E8E,"F655"],
- [0x8E90,"F761"],
- [0x8E91,"C5AD"],
- [0x8E92,"F760"],
- [0x8E93,"C5AE"],
- [0x8E94,"F75E"],
- [0x8E95,"F75D"],
- [0x8E96,"F762"],
- [0x8E97,"F763"],
- [0x8E98,"F846"],
- [0x8E9A,"F75F"],
- [0x8E9D,"F8C6"],
- [0x8E9E,"F8C3"],
- [0x8E9F,"F8C4"],
- [0x8EA0,"F8C5"],
- [0x8EA1,"C65C"],
- [0x8EA3,"F951"],
- [0x8EA4,"F950"],
- [0x8EA5,"F94F"],
- [0x8EA6,"F970"],
- [0x8EA7,"95C9"],
- [0x8EA8,"F9BE"],
- [0x8EA9,"F9AB"],
- [0x8EAA,"C66E"],
- [0x8EAB,"A8AD"],
- [0x8EAC,"B060"],
- [0x8EAD,"9048"],
- [0x8EB0,"99E8"],
- [0x8EB2,"B8FA"],
- [0x8EB6,"9049"],
- [0x8EB9,"8CBA"],
- [0x8EBA,"BDF6"],
- [0x8EBC,"90B1"],
- [0x8EBD,"EBC8"],
- [0x8EC0,"C2DF"],
- [0x8EC2,"F355"],
- [0x8EC3,"904A"],
- [0x8EC9,"F9AC"],
- [0x8ECA,"A8AE"],
- [0x8ECB,"AAEE"],
- [0x8ECC,"AD79"],
- [0x8ECD,"AD78"],
- [0x8ECE,"99EA"],
- [0x8ECF,"B063"],
- [0x8ED1,"D3E8"],
- [0x8ED2,"B061"],
- [0x8ED3,"D3E9"],
- [0x8ED4,"B062"],
- [0x8ED7,"D7DF"],
- [0x8ED8,"D7DB"],
- [0x8EDA,"9BD1"],
- [0x8EDB,"B36D"],
- [0x8EDC,"D7DE"],
- [0x8EDD,"D7DD"],
- [0x8EDE,"D7DC"],
- [0x8EDF,"B36E"],
- [0x8EE0,"D7E0"],
- [0x8EE1,"D7E1"],
- [0x8EE2,"99EB"],
- [0x8EE4,"99EC"],
- [0x8EE5,"DC43"],
- [0x8EE6,"DC41"],
- [0x8EE7,"DC45"],
- [0x8EE8,"DC46"],
- [0x8EE9,"DC4C"],
- [0x8EEB,"DC48"],
- [0x8EEC,"DC4A"],
- [0x8EED,"99ED"],
- [0x8EEE,"DC42"],
- [0x8EEF,"DBFC"],
- [0x8EF1,"DC49"],
- [0x8EF2,"99EE"],
- [0x8EF4,"DC4B"],
- [0x8EF5,"DC44"],
- [0x8EF6,"DC47"],
- [0x8EF7,"DBFD"],
- [0x8EF8,"B662"],
- [0x8EF9,"DC40"],
- [0x8EFA,"DBFE"],
- [0x8EFB,"B661"],
- [0x8EFC,"B663"],
- [0x8EFE,"B8FD"],
- [0x8EFF,"E075"],
- [0x8F00,"E077"],
- [0x8F01,"E076"],
- [0x8F02,"E07B"],
- [0x8F03,"B8FB"],
- [0x8F05,"E078"],
- [0x8F06,"E074"],
- [0x8F07,"E079"],
- [0x8F08,"E07A"],
- [0x8F09,"B8FC"],
- [0x8F0A,"B8FE"],
- [0x8F0B,"E07C"],
- [0x8F0D,"E467"],
- [0x8F0E,"E466"],
- [0x8F10,"E464"],
- [0x8F11,"E465"],
- [0x8F12,"BBB3"],
- [0x8F13,"BBB5"],
- [0x8F14,"BBB2"],
- [0x8F15,"BBB4"],
- [0x8F16,"E84D"],
- [0x8F17,"E84E"],
- [0x8F18,"E849"],
- [0x8F19,"904C"],
- [0x8F1A,"E84A"],
- [0x8F1B,"BDF8"],
- [0x8F1C,"BDFD"],
- [0x8F1D,"BDF7"],
- [0x8F1E,"BDFE"],
- [0x8F1F,"BDF9"],
- [0x8F20,"E84B"],
- [0x8F23,"E84C"],
- [0x8F24,"E848"],
- [0x8F25,"BE40"],
- [0x8F26,"BDFB"],
- [0x8F29,"BDFA"],
- [0x8F2A,"BDFC"],
- [0x8F2C,"E847"],
- [0x8F2D,"904D"],
- [0x8F2E,"EBCA"],
- [0x8F2F,"BFE8"],
- [0x8F30,"95CB"],
- [0x8F32,"EBCC"],
- [0x8F33,"BFEA"],
- [0x8F34,"EBCF"],
- [0x8F35,"EBCB"],
- [0x8F36,"EBC9"],
- [0x8F37,"EBCE"],
- [0x8F38,"BFE9"],
- [0x8F39,"EBCD"],
- [0x8F3B,"BFE7"],
- [0x8F3E,"C1D3"],
- [0x8F3F,"C1D6"],
- [0x8F40,"EEC1"],
- [0x8F41,"97E2"],
- [0x8F42,"C1D4"],
- [0x8F43,"EEC0"],
- [0x8F44,"C1D2"],
- [0x8F45,"C1D5"],
- [0x8F46,"F146"],
- [0x8F47,"F147"],
- [0x8F48,"F148"],
- [0x8F49,"C2E0"],
- [0x8F4A,"95CC"],
- [0x8F4B,"F149"],
- [0x8F4D,"C2E1"],
- [0x8F4E,"C3E2"],
- [0x8F4F,"F358"],
- [0x8F50,"F359"],
- [0x8F51,"F357"],
- [0x8F52,"F356"],
- [0x8F53,"F35A"],
- [0x8F54,"C3E1"],
- [0x8F55,"F4DD"],
- [0x8F56,"F4DB"],
- [0x8F57,"F4DC"],
- [0x8F58,"F4DE"],
- [0x8F59,"F4DA"],
- [0x8F5A,"F4DF"],
- [0x8F5B,"F658"],
- [0x8F5C,"9F78"],
- [0x8F5D,"F659"],
- [0x8F5E,"F657"],
- [0x8F5F,"C546"],
- [0x8F60,"F764"],
- [0x8F61,"C5AF"],
- [0x8F62,"F765"],
- [0x8F63,"F848"],
- [0x8F64,"F847"],
- [0x8F66,"897C"],
- [0x8F67,"897D"],
- [0x8F6E,"897E"],
- [0x8F93,"995D"],
- [0x8F9B,"A8AF"],
- [0x8F9C,"B664"],
- [0x8F9F,"B940"],
- [0x8FA0,"9B5A"],
- [0x8FA3,"BBB6"],
- [0x8FA5,"9050"],
- [0x8FA6,"BFEC"],
- [0x8FA7,"8C4F"],
- [0x8FA8,"BFEB"],
- [0x8FAD,"C3E3"],
- [0x8FAE,"C47C"],
- [0x8FAF,"C547"],
- [0x8FB0,"A8B0"],
- [0x8FB1,"B064"],
- [0x8FB2,"B941"],
- [0x8FB3,"9054"],
- [0x8FB4,"F35B"],
- [0x8FB5,"C6D6"],
- [0x8FB6,"9AA8"],
- [0x8FB7,"99EF"],
- [0x8FB8,"FEEB"],
- [0x8FB9,"9DA3"],
- [0x8FBA,"9DA1"],
- [0x8FBB,"9943"],
- [0x8FBC,"9945"],
- [0x8FBE,"9D7D"],
- [0x8FBF,"CBA6"],
- [0x8FC1,"99F0"],
- [0x8FC2,"A8B1"],
- [0x8FC4,"A8B4"],
- [0x8FC5,"A8B3"],
- [0x8FC6,"A8B2"],
- [0x8FC9,"CBA5"],
- [0x8FCA,"99F1"],
- [0x8FCB,"CDCD"],
- [0x8FCC,"99F2"],
- [0x8FCD,"CDCF"],
- [0x8FCE,"AAEF"],
- [0x8FCF,"8CBC"],
- [0x8FD0,"9D60"],
- [0x8FD1,"AAF1"],
- [0x8FD2,"CDCC"],
- [0x8FD3,"CDCE"],
- [0x8FD4,"AAF0"],
- [0x8FD5,"CDD1"],
- [0x8FD6,"CDD0"],
- [0x8FD7,"CDD2"],
- [0x8FDA,"A0A3"],
- [0x8FE0,"D0B6"],
- [0x8FE1,"D0B4"],
- [0x8FE2,"AD7C"],
- [0x8FE3,"D0B3"],
- [0x8FE4,"ADA3"],
- [0x8FE5,"AD7E"],
- [0x8FE6,"AD7B"],
- [0x8FE8,"ADA4"],
- [0x8FEA,"AD7D"],
- [0x8FEB,"ADA2"],
- [0x8FED,"ADA1"],
- [0x8FEE,"D0B5"],
- [0x8FF0,"AD7A"],
- [0x8FF4,"B06A"],
- [0x8FF5,"D3EB"],
- [0x8FF6,"D3F1"],
- [0x8FF7,"B067"],
- [0x8FF8,"B06E"],
- [0x8FF9,"905B"],
- [0x8FFA,"B069"],
- [0x8FFB,"D3EE"],
- [0x8FFC,"D3F0"],
- [0x8FFD,"B06C"],
- [0x8FFE,"D3EA"],
- [0x8FFF,"D3ED"],
- [0x9000,"B068"],
- [0x9001,"B065"],
- [0x9002,"D3EC"],
- [0x9003,"B06B"],
- [0x9004,"D3EF"],
- [0x9005,"B06D"],
- [0x9006,"B066"],
- [0x9008,"9EDB"],
- [0x900B,"D7E3"],
- [0x900C,"D7E6"],
- [0x900D,"B370"],
- [0x900F,"B37A"],
- [0x9010,"B376"],
- [0x9011,"D7E4"],
- [0x9012,"9D79"],
- [0x9014,"B37E"],
- [0x9015,"B377"],
- [0x9016,"B37C"],
- [0x9017,"B372"],
- [0x9019,"B36F"],
- [0x901A,"B371"],
- [0x901B,"B37D"],
- [0x901C,"D7E5"],
- [0x901D,"B375"],
- [0x901E,"B378"],
- [0x901F,"B374"],
- [0x9020,"B379"],
- [0x9021,"D7E7"],
- [0x9022,"B37B"],
- [0x9023,"B373"],
- [0x9024,"D7E2"],
- [0x902D,"DC4D"],
- [0x902E,"B665"],
- [0x902F,"DC4F"],
- [0x9031,"B667"],
- [0x9032,"B669"],
- [0x9033,"99F3"],
- [0x9034,"DC4E"],
- [0x9035,"B666"],
- [0x9036,"B66A"],
- [0x9037,"9062"],
- [0x9038,"B668"],
- [0x903C,"B947"],
- [0x903D,"E0A3"],
- [0x903E,"B94F"],
- [0x903F,"E07E"],
- [0x9041,"B950"],
- [0x9042,"B945"],
- [0x9044,"E0A1"],
- [0x9046,"87BD"],
- [0x9047,"B94A"],
- [0x9049,"E0A2"],
- [0x904A,"B943"],
- [0x904B,"B942"],
- [0x904C,"9F55"],
- [0x904D,"B94D"],
- [0x904E,"B94C"],
- [0x904F,"B94B"],
- [0x9050,"B949"],
- [0x9051,"B94E"],
- [0x9052,"E07D"],
- [0x9053,"B944"],
- [0x9054,"B946"],
- [0x9055,"B948"],
- [0x9056,"9BF9"],
- [0x9058,"BBB8"],
- [0x9059,"BBBB"],
- [0x905B,"BBBF"],
- [0x905C,"BBB9"],
- [0x905D,"BBBE"],
- [0x905E,"BBBC"],
- [0x9060,"BBB7"],
- [0x9061,"9065"],
- [0x9062,"BBBD"],
- [0x9063,"BBBA"],
- [0x9064,"96E0"],
- [0x9067,"E852"],
- [0x9068,"BE43"],
- [0x9069,"BE41"],
- [0x906B,"E853"],
- [0x906C,"98BE"],
- [0x906D,"BE44"],
- [0x906E,"BE42"],
- [0x906F,"E851"],
- [0x9070,"E850"],
- [0x9072,"BFF0"],
- [0x9073,"E84F"],
- [0x9074,"BFEE"],
- [0x9075,"BFED"],
- [0x9076,"EBD0"],
- [0x9077,"BE45"],
- [0x9078,"BFEF"],
- [0x9079,"EBD1"],
- [0x907A,"BFF2"],
- [0x907B,"EBD2"],
- [0x907C,"BFF1"],
- [0x907D,"C1D8"],
- [0x907E,"EEC3"],
- [0x907F,"C1D7"],
- [0x9080,"C1DC"],
- [0x9081,"C1DA"],
- [0x9082,"C1DB"],
- [0x9083,"C2E3"],
- [0x9084,"C1D9"],
- [0x9085,"EEC2"],
- [0x9086,"EBD3"],
- [0x9087,"C2E2"],
- [0x9088,"C2E4"],
- [0x908A,"C3E4"],
- [0x908B,"C3E5"],
- [0x908D,"F4E0"],
- [0x908F,"C5DE"],
- [0x9090,"C5DD"],
- [0x9091,"A8B6"],
- [0x9094,"CA55"],
- [0x9095,"B06F"],
- [0x9097,"CA52"],
- [0x9098,"CA53"],
- [0x9099,"CA51"],
- [0x909B,"CA54"],
- [0x909E,"CBAA"],
- [0x909F,"CBA7"],
- [0x90A0,"CBAC"],
- [0x90A1,"CBA8"],
- [0x90A2,"A8B7"],
- [0x90A3,"A8BA"],
- [0x90A5,"CBA9"],
- [0x90A6,"A8B9"],
- [0x90A7,"CBAB"],
- [0x90A8,"9068"],
- [0x90AA,"A8B8"],
- [0x90AE,"906C"],
- [0x90AF,"CDD5"],
- [0x90B0,"CDD7"],
- [0x90B1,"AAF4"],
- [0x90B2,"CDD3"],
- [0x90B3,"CDD6"],
- [0x90B4,"CDD4"],
- [0x90B5,"AAF2"],
- [0x90B6,"AAF5"],
- [0x90B8,"AAF3"],
- [0x90BB,"95D8"],
- [0x90BD,"D0B8"],
- [0x90BE,"D0BC"],
- [0x90BF,"D0B9"],
- [0x90C1,"ADA7"],
- [0x90C3,"ADA8"],
- [0x90C4,"906A"],
- [0x90C5,"D0BB"],
- [0x90C7,"D0BD"],
- [0x90C8,"D0BF"],
- [0x90CA,"ADA5"],
- [0x90CB,"D0BE"],
- [0x90CE,"ADA6"],
- [0x90D4,"D7EE"],
- [0x90D5,"D0BA"],
- [0x90D6,"D3F2"],
- [0x90D7,"D3FB"],
- [0x90D8,"D3F9"],
- [0x90D9,"D3F4"],
- [0x90DA,"D3F5"],
- [0x90DB,"D3FA"],
- [0x90DC,"D3FC"],
- [0x90DD,"B071"],
- [0x90DF,"D3F7"],
- [0x90E0,"D3F3"],
- [0x90E1,"B070"],
- [0x90E2,"B072"],
- [0x90E3,"D3F6"],
- [0x90E4,"D3FD"],
- [0x90E5,"D3F8"],
- [0x90E8,"B3A1"],
- [0x90E9,"D7F1"],
- [0x90EA,"D7E9"],
- [0x90EB,"D7EF"],
- [0x90EC,"D7F0"],
- [0x90ED,"B3A2"],
- [0x90EF,"D7E8"],
- [0x90F0,"D7EA"],
- [0x90F1,"D0B7"],
- [0x90F2,"D7EC"],
- [0x90F3,"D7ED"],
- [0x90F4,"D7EB"],
- [0x90F5,"B66C"],
- [0x90F9,"DC56"],
- [0x90FA,"EBD4"],
- [0x90FB,"DC57"],
- [0x90FC,"DC54"],
- [0x90FD,"B3A3"],
- [0x90FE,"B66E"],
- [0x90FF,"DC53"],
- [0x9100,"DC59"],
- [0x9101,"DC58"],
- [0x9102,"B66B"],
- [0x9103,"DC5C"],
- [0x9104,"DC52"],
- [0x9105,"DC5B"],
- [0x9106,"DC50"],
- [0x9107,"DC5A"],
- [0x9108,"DC55"],
- [0x9109,"B66D"],
- [0x910B,"E0AA"],
- [0x910D,"E0A5"],
- [0x910E,"E0AB"],
- [0x910F,"E0A6"],
- [0x9110,"E0A4"],
- [0x9111,"E0A7"],
- [0x9112,"B951"],
- [0x9114,"E0A9"],
- [0x9116,"E0A8"],
- [0x9117,"B952"],
- [0x9118,"BBC1"],
- [0x9119,"BBC0"],
- [0x911A,"E46E"],
- [0x911B,"E471"],
- [0x911C,"E469"],
- [0x911D,"E46D"],
- [0x911E,"BBC2"],
- [0x911F,"E46C"],
- [0x9120,"E46A"],
- [0x9121,"E470"],
- [0x9122,"E46B"],
- [0x9123,"E468"],
- [0x9124,"E46F"],
- [0x9126,"E859"],
- [0x9127,"BE48"],
- [0x9128,"F14A"],
- [0x9129,"E856"],
- [0x912A,"E857"],
- [0x912B,"E855"],
- [0x912C,"DC51"],
- [0x912D,"BE47"],
- [0x912E,"E85A"],
- [0x912F,"E854"],
- [0x9130,"BE46"],
- [0x9131,"BE49"],
- [0x9132,"E858"],
- [0x9133,"EBD5"],
- [0x9134,"BFF3"],
- [0x9135,"EBD6"],
- [0x9136,"EBD7"],
- [0x9138,"EEC4"],
- [0x9139,"C1DD"],
- [0x913A,"F14B"],
- [0x913B,"F14C"],
- [0x913E,"F14D"],
- [0x913F,"F35D"],
- [0x9140,"F35C"],
- [0x9141,"F4E2"],
- [0x9143,"F4E1"],
- [0x9144,"F65B"],
- [0x9145,"F65C"],
- [0x9146,"F65A"],
- [0x9147,"F766"],
- [0x9148,"C5B0"],
- [0x9149,"A8BB"],
- [0x914A,"ADAA"],
- [0x914B,"ADA9"],
- [0x914C,"B075"],
- [0x914D,"B074"],
- [0x914E,"D440"],
- [0x914F,"D441"],
- [0x9150,"D3FE"],
- [0x9151,"9FB2"],
- [0x9152,"B073"],
- [0x9153,"D7F5"],
- [0x9155,"D7F6"],
- [0x9156,"D7F2"],
- [0x9157,"B3A4"],
- [0x9158,"D7F3"],
- [0x9159,"9FAE"],
- [0x915A,"D7F4"],
- [0x915C,"9FB0"],
- [0x915E,"89AD"],
- [0x915F,"DC5F"],
- [0x9160,"DC61"],
- [0x9161,"DC5D"],
- [0x9162,"DC60"],
- [0x9163,"B66F"],
- [0x9164,"DC5E"],
- [0x9165,"B670"],
- [0x9167,"906E"],
- [0x9168,"DD73"],
- [0x9169,"B955"],
- [0x916A,"B954"],
- [0x916C,"B953"],
- [0x916E,"E0AC"],
- [0x916F,"E0AD"],
- [0x9170,"9E71"],
- [0x9172,"E473"],
- [0x9173,"E475"],
- [0x9174,"BBC6"],
- [0x9175,"BBC3"],
- [0x9176,"9E4A"],
- [0x9177,"BBC5"],
- [0x9178,"BBC4"],
- [0x9179,"E474"],
- [0x917A,"E472"],
- [0x917C,"9FDC"],
- [0x9180,"E861"],
- [0x9181,"E85E"],
- [0x9182,"E85F"],
- [0x9183,"BE4D"],
- [0x9184,"E860"],
- [0x9185,"E85B"],
- [0x9186,"E85C"],
- [0x9187,"BE4A"],
- [0x9189,"BE4B"],
- [0x918A,"E85D"],
- [0x918B,"BE4C"],
- [0x918C,"89AB"],
- [0x918D,"EBDB"],
- [0x918E,"9FB8"],
- [0x918F,"EBDC"],
- [0x9190,"EBD9"],
- [0x9191,"EBDA"],
- [0x9192,"BFF4"],
- [0x9193,"EBD8"],
- [0x9199,"EEC8"],
- [0x919A,"EEC5"],
- [0x919B,"EEC7"],
- [0x919C,"C1E0"],
- [0x919D,"EECB"],
- [0x919E,"C1DF"],
- [0x919F,"EEC9"],
- [0x91A0,"EECC"],
- [0x91A1,"EECA"],
- [0x91A2,"EEC6"],
- [0x91A3,"C1DE"],
- [0x91A5,"F14F"],
- [0x91A7,"F150"],
- [0x91A8,"F14E"],
- [0x91A9,"9070"],
- [0x91AA,"F152"],
- [0x91AB,"C2E5"],
- [0x91AC,"C2E6"],
- [0x91AD,"F35F"],
- [0x91AE,"C3E7"],
- [0x91AF,"F151"],
- [0x91B0,"F35E"],
- [0x91B1,"C3E6"],
- [0x91B2,"F4E5"],
- [0x91B3,"F4E6"],
- [0x91B4,"C4BF"],
- [0x91B5,"F4E4"],
- [0x91B6,"8B63"],
- [0x91B7,"F4E3"],
- [0x91B9,"F65D"],
- [0x91BA,"C548"],
- [0x91BB,"95DC"],
- [0x91BC,"F849"],
- [0x91BD,"F8C8"],
- [0x91BE,"F8C7"],
- [0x91C0,"C643"],
- [0x91C1,"C65D"],
- [0x91C2,"F8C9"],
- [0x91C3,"F971"],
- [0x91C4,"9071"],
- [0x91C5,"C66F"],
- [0x91C6,"A8BC"],
- [0x91C7,"AAF6"],
- [0x91C9,"B956"],
- [0x91CB,"C4C0"],
- [0x91CC,"A8BD"],
- [0x91CD,"ADAB"],
- [0x91CE,"B3A5"],
- [0x91CF,"B671"],
- [0x91D0,"C2E7"],
- [0x91D1,"AAF7"],
- [0x91D3,"D0C1"],
- [0x91D4,"D0C0"],
- [0x91D5,"D442"],
- [0x91D6,"FC5E"],
- [0x91D7,"B078"],
- [0x91D8,"B076"],
- [0x91D9,"B07A"],
- [0x91DA,"D444"],
- [0x91DC,"B079"],
- [0x91DD,"B077"],
- [0x91DF,"8949"],
- [0x91E2,"D443"],
- [0x91E3,"B3A8"],
- [0x91E4,"D7FC"],
- [0x91E5,"965B"],
- [0x91E6,"B3A7"],
- [0x91E7,"B3A9"],
- [0x91E8,"D842"],
- [0x91E9,"B3AB"],
- [0x91EA,"D7FE"],
- [0x91EB,"D840"],
- [0x91EC,"D7F7"],
- [0x91ED,"B3AA"],
- [0x91EE,"D843"],
- [0x91F1,"D7F9"],
- [0x91F3,"D7FA"],
- [0x91F4,"D7F8"],
- [0x91F5,"B3A6"],
- [0x91F6,"8C50"],
- [0x91F7,"D841"],
- [0x91F8,"D7FB"],
- [0x91F9,"D7FD"],
- [0x91FA,"94A6"],
- [0x91FD,"DC6D"],
- [0x91FE,"8FD5"],
- [0x91FF,"DC6C"],
- [0x9200,"DC6A"],
- [0x9201,"DC62"],
- [0x9202,"DC71"],
- [0x9203,"DC65"],
- [0x9204,"DC6F"],
- [0x9205,"DC76"],
- [0x9206,"DC6E"],
- [0x9207,"B679"],
- [0x9208,"9E73"],
- [0x9209,"B675"],
- [0x920A,"DC63"],
- [0x920C,"DC69"],
- [0x920D,"B677"],
- [0x920E,"9075"],
- [0x920F,"DC68"],
- [0x9210,"B678"],
- [0x9211,"B67A"],
- [0x9212,"DC6B"],
- [0x9213,"99F7"],
- [0x9214,"B672"],
- [0x9215,"B673"],
- [0x9216,"DC77"],
- [0x9217,"DC75"],
- [0x9218,"87B2"],
- [0x9219,"DC74"],
- [0x921A,"DC66"],
- [0x921C,"DC72"],
- [0x921E,"B676"],
- [0x9221,"8CBF"],
- [0x9223,"B674"],
- [0x9224,"DC73"],
- [0x9225,"DC64"],
- [0x9226,"DC67"],
- [0x9227,"DC70"],
- [0x9228,"99F9"],
- [0x922A,"9663"],
- [0x922B,"95B9"],
- [0x922D,"E4BA"],
- [0x922E,"E0B7"],
- [0x9230,"E0B0"],
- [0x9231,"E0C3"],
- [0x9232,"E0CC"],
- [0x9233,"E0B3"],
- [0x9234,"B961"],
- [0x9235,"94D4"],
- [0x9236,"E0C0"],
- [0x9237,"B957"],
- [0x9238,"B959"],
- [0x9239,"B965"],
- [0x923A,"E0B1"],
- [0x923C,"FCFA"],
- [0x923D,"B95A"],
- [0x923E,"B95C"],
- [0x923F,"B966"],
- [0x9240,"B95B"],
- [0x9241,"9077"],
- [0x9244,"90AB"],
- [0x9245,"B964"],
- [0x9246,"E0B9"],
- [0x9248,"E0AE"],
- [0x9249,"B962"],
- [0x924A,"E0B8"],
- [0x924B,"B95E"],
- [0x924C,"E0CA"],
- [0x924D,"B963"],
- [0x924E,"E0C8"],
- [0x924F,"E0BC"],
- [0x9250,"E0C6"],
- [0x9251,"B960"],
- [0x9252,"E0AF"],
- [0x9253,"E0C9"],
- [0x9254,"E0C4"],
- [0x9255,"9D4D"],
- [0x9256,"E0CB"],
- [0x9257,"B958"],
- [0x9258,"99FA"],
- [0x925A,"B967"],
- [0x925B,"B95D"],
- [0x925D,"92E3"],
- [0x925E,"E0B5"],
- [0x925F,"97BB"],
- [0x9260,"E0BD"],
- [0x9261,"E0C1"],
- [0x9262,"9078"],
- [0x9263,"E0C5"],
- [0x9264,"B95F"],
- [0x9265,"E0B4"],
- [0x9266,"E0B2"],
- [0x9267,"E0BE"],
- [0x926B,"99FB"],
- [0x926C,"E0BB"],
- [0x926D,"E0BA"],
- [0x926E,"97E0"],
- [0x926F,"E0BF"],
- [0x9270,"E0C2"],
- [0x9272,"E0C7"],
- [0x9276,"E478"],
- [0x9277,"96DC"],
- [0x9278,"BBC7"],
- [0x9279,"E4A4"],
- [0x927A,"E47A"],
- [0x927B,"BBCC"],
- [0x927C,"BBD0"],
- [0x927D,"E4AD"],
- [0x927E,"E4B5"],
- [0x927F,"E4A6"],
- [0x9280,"BBC8"],
- [0x9281,"9CA8"],
- [0x9282,"E4AA"],
- [0x9283,"E0B6"],
- [0x9284,"9772"],
- [0x9285,"BBC9"],
- [0x9286,"E4B1"],
- [0x9287,"E4B6"],
- [0x9288,"E4AE"],
- [0x9289,"9440"],
- [0x928A,"E4B0"],
- [0x928B,"E4B9"],
- [0x928C,"E4B2"],
- [0x928D,"E47E"],
- [0x928E,"E4A9"],
- [0x928F,"92F2"],
- [0x9291,"BBD1"],
- [0x9293,"BBCD"],
- [0x9294,"E47C"],
- [0x9295,"E4AB"],
- [0x9296,"BBCB"],
- [0x9297,"E4A5"],
- [0x9298,"BBCA"],
- [0x9299,"E4B3"],
- [0x929A,"E4A2"],
- [0x929B,"E479"],
- [0x929C,"BBCE"],
- [0x929D,"E4B8"],
- [0x92A0,"E47B"],
- [0x92A1,"E4AF"],
- [0x92A2,"E4AC"],
- [0x92A3,"E4A7"],
- [0x92A4,"E477"],
- [0x92A5,"E476"],
- [0x92A6,"E4A1"],
- [0x92A7,"E4B4"],
- [0x92A8,"BBCF"],
- [0x92A9,"E4B7"],
- [0x92AA,"E47D"],
- [0x92AB,"E4A3"],
- [0x92AC,"BE52"],
- [0x92AE,"99FD"],
- [0x92B1,"99FC"],
- [0x92B2,"BE5A"],
- [0x92B3,"BE55"],
- [0x92B4,"E8A4"],
- [0x92B5,"E8A1"],
- [0x92B6,"E867"],
- [0x92B7,"BE50"],
- [0x92B9,"F9D7"],
- [0x92BA,"964A"],
- [0x92BB,"BE4F"],
- [0x92BC,"BE56"],
- [0x92BE,"96D8"],
- [0x92BF,"99FE"],
- [0x92C0,"E865"],
- [0x92C1,"BE54"],
- [0x92C2,"E871"],
- [0x92C3,"E863"],
- [0x92C4,"E864"],
- [0x92C5,"BE4E"],
- [0x92C6,"E8A3"],
- [0x92C7,"BE58"],
- [0x92C8,"E874"],
- [0x92C9,"E879"],
- [0x92CA,"E873"],
- [0x92CB,"EBEE"],
- [0x92CC,"E86F"],
- [0x92CD,"E877"],
- [0x92CE,"E875"],
- [0x92CF,"E868"],
- [0x92D0,"E862"],
- [0x92D1,"E87D"],
- [0x92D2,"BE57"],
- [0x92D3,"E87E"],
- [0x92D4,"904B"],
- [0x92D5,"E878"],
- [0x92D7,"E86D"],
- [0x92D8,"E86B"],
- [0x92D9,"E866"],
- [0x92DB,"FA41"],
- [0x92DD,"E86E"],
- [0x92DE,"E87B"],
- [0x92DF,"E86A"],
- [0x92E0,"E87A"],
- [0x92E1,"E8A2"],
- [0x92E3,"9A40"],
- [0x92E4,"BE53"],
- [0x92E5,"975B"],
- [0x92E6,"E876"],
- [0x92E7,"E87C"],
- [0x92E8,"E872"],
- [0x92E9,"E86C"],
- [0x92EA,"BE51"],
- [0x92EB,"9A41"],
- [0x92EC,"91DD"],
- [0x92EE,"E4A8"],
- [0x92EF,"E870"],
- [0x92F0,"BE59"],
- [0x92F1,"E869"],
- [0x92F2,"93FC"],
- [0x92F3,"9A42"],
- [0x92F4,"9A43"],
- [0x92F6,"9659"],
- [0x92F7,"EBF4"],
- [0x92F8,"BFF7"],
- [0x92F9,"EBF3"],
- [0x92FA,"EBF0"],
- [0x92FB,"EC44"],
- [0x92FC,"BFFB"],
- [0x92FD,"9A44"],
- [0x92FE,"EC41"],
- [0x92FF,"EBF8"],
- [0x9300,"EC43"],
- [0x9301,"EBE9"],
- [0x9302,"EBF6"],
- [0x9303,"9051"],
- [0x9304,"BFFD"],
- [0x9306,"EBE1"],
- [0x9307,"94BF"],
- [0x9308,"EBDF"],
- [0x9309,"EC42"],
- [0x930B,"EC40"],
- [0x930C,"EBFE"],
- [0x930D,"EBED"],
- [0x930E,"EBEC"],
- [0x930F,"EBE2"],
- [0x9310,"C040"],
- [0x9312,"EBE8"],
- [0x9313,"EBF2"],
- [0x9314,"EBFD"],
- [0x9315,"C043"],
- [0x9316,"EC45"],
- [0x9318,"C1E8"],
- [0x9319,"C045"],
- [0x931A,"BFFE"],
- [0x931B,"EBE6"],
- [0x931D,"EBEF"],
- [0x931E,"EBDE"],
- [0x931F,"EBE0"],
- [0x9320,"BFF5"],
- [0x9321,"C042"],
- [0x9322,"BFFA"],
- [0x9323,"EBE7"],
- [0x9324,"EBF7"],
- [0x9325,"EBF1"],
- [0x9326,"C041"],
- [0x9327,"EBDD"],
- [0x9328,"C1E3"],
- [0x9329,"EBF9"],
- [0x932A,"EBFC"],
- [0x932B,"BFFC"],
- [0x932C,"90A2"],
- [0x932D,"EBEB"],
- [0x932E,"C044"],
- [0x932F,"BFF9"],
- [0x9330,"9CAB"],
- [0x9331,"9776"],
- [0x9333,"BFF8"],
- [0x9334,"EBF5"],
- [0x9335,"EBFB"],
- [0x9336,"BFF6"],
- [0x9338,"EBE4"],
- [0x9339,"EBFA"],
- [0x933C,"EBE5"],
- [0x9340,"FC55"],
- [0x9341,"FE45"],
- [0x9342,"94A8"],
- [0x9343,"9A45"],
- [0x9344,"FA4B"],
- [0x9345,"9DE1"],
- [0x9346,"EBEA"],
- [0x9347,"EED2"],
- [0x9348,"96D9"],
- [0x9349,"EED7"],
- [0x934A,"C1E5"],
- [0x934B,"C1E7"],
- [0x934C,"EEDD"],
- [0x934D,"C1E1"],
- [0x934E,"EEEC"],
- [0x934F,"EEE3"],
- [0x9350,"EED8"],
- [0x9351,"EED9"],
- [0x9352,"EEE2"],
- [0x9354,"C1EE"],
- [0x9355,"EEE1"],
- [0x9356,"EED1"],
- [0x9357,"EEE0"],
- [0x9358,"EED4"],
- [0x9359,"EEED"],
- [0x935A,"C1ED"],
- [0x935B,"C1EB"],
- [0x935C,"EED5"],
- [0x935E,"EEE8"],
- [0x935F,"9774"],
- [0x9360,"EEDA"],
- [0x9361,"EEE7"],
- [0x9362,"FDF5"],
- [0x9363,"EEE9"],
- [0x9364,"EED0"],
- [0x9365,"C1E6"],
- [0x9366,"92E5"],
- [0x9367,"EEEA"],
- [0x9368,"9645"],
- [0x9369,"91DA"],
- [0x936A,"EEDE"],
- [0x936B,"90A3"],
- [0x936C,"C1EA"],
- [0x936D,"EEDB"],
- [0x936E,"A05F"],
- [0x9370,"C1EC"],
- [0x9371,"EEE4"],
- [0x9373,"90AF"],
- [0x9374,"97BF"],
- [0x9375,"C1E4"],
- [0x9376,"EED6"],
- [0x9377,"EEE5"],
- [0x9378,"914C"],
- [0x9379,"EEDF"],
- [0x937A,"EBE3"],
- [0x937B,"EEE6"],
- [0x937C,"EED3"],
- [0x937D,"967A"],
- [0x937E,"C1E9"],
- [0x9380,"EEEB"],
- [0x9381,"91DE"],
- [0x9382,"C1E2"],
- [0x9383,"EECE"],
- [0x9384,"9A46"],
- [0x9385,"FEB0"],
- [0x9386,"9779"],
- [0x9387,"946C"],
- [0x9388,"F160"],
- [0x9389,"F159"],
- [0x938A,"C2E9"],
- [0x938C,"F154"],
- [0x938D,"F163"],
- [0x938E,"F15B"],
- [0x938F,"EEDC"],
- [0x9390,"9858"],
- [0x9391,"F165"],
- [0x9392,"F155"],
- [0x9394,"C2E8"],
- [0x9395,"F15F"],
- [0x9396,"C2EA"],
- [0x9397,"C2F2"],
- [0x9398,"C2F0"],
- [0x9399,"F161"],
- [0x939A,"C2F1"],
- [0x939B,"F157"],
- [0x939C,"9266"],
- [0x939D,"F158"],
- [0x939E,"F15D"],
- [0x939F,"F162"],
- [0x93A0,"93FB"],
- [0x93A1,"EECD"],
- [0x93A2,"C2EB"],
- [0x93A3,"F16A"],
- [0x93A4,"F167"],
- [0x93A5,"F16B"],
- [0x93A6,"F15E"],
- [0x93A7,"F15A"],
- [0x93A8,"F168"],
- [0x93A9,"F36A"],
- [0x93AA,"F15C"],
- [0x93AC,"C2EE"],
- [0x93AD,"9A47"],
- [0x93AE,"C2ED"],
- [0x93AF,"EECF"],
- [0x93B0,"C2EF"],
- [0x93B1,"F164"],
- [0x93B2,"F166"],
- [0x93B3,"C2EC"],
- [0x93B4,"F169"],
- [0x93B5,"F153"],
- [0x93B7,"F156"],
- [0x93B8,"9749"],
- [0x93BB,"9748"],
- [0x93BD,"934A"],
- [0x93BF,"9CE2"],
- [0x93C0,"F373"],
- [0x93C2,"F363"],
- [0x93C3,"C3EB"],
- [0x93C4,"F371"],
- [0x93C6,"9264"],
- [0x93C7,"F361"],
- [0x93C8,"C3EC"],
- [0x93CA,"F36C"],
- [0x93CB,"91DF"],
- [0x93CC,"F368"],
- [0x93CD,"C3F1"],
- [0x93CE,"F372"],
- [0x93CF,"F362"],
- [0x93D0,"F365"],
- [0x93D1,"C3E9"],
- [0x93D2,"F374"],
- [0x93D3,"FB79"],
- [0x93D4,"F36D"],
- [0x93D5,"F370"],
- [0x93D6,"C3EF"],
- [0x93D7,"C3F4"],
- [0x93D8,"C3F2"],
- [0x93D9,"F369"],
- [0x93DA,"F364"],
- [0x93DB,"96D7"],
- [0x93DC,"C3ED"],
- [0x93DD,"C3EE"],
- [0x93DE,"F360"],
- [0x93DF,"C3EA"],
- [0x93E0,"9343"],
- [0x93E1,"C3E8"],
- [0x93E2,"C3F0"],
- [0x93E3,"F36F"],
- [0x93E4,"C3F3"],
- [0x93E6,"F36B"],
- [0x93E7,"F375"],
- [0x93E8,"C3F5"],
- [0x93EC,"F367"],
- [0x93EE,"F36E"],
- [0x93F0,"FDCB"],
- [0x93F1,"FE7A"],
- [0x93F3,"91DB"],
- [0x93F4,"8C6A"],
- [0x93F5,"F4F3"],
- [0x93F6,"F542"],
- [0x93F7,"F4F5"],
- [0x93F8,"F4FC"],
- [0x93F9,"F366"],
- [0x93FA,"F4FA"],
- [0x93FB,"F4E9"],
- [0x93FC,"F540"],
- [0x93FD,"C4C3"],
- [0x93FE,"F4ED"],
- [0x93FF,"F4FE"],
- [0x9400,"F4F4"],
- [0x9401,"97AF"],
- [0x9403,"C4C2"],
- [0x9404,"95DD"],
- [0x9406,"F544"],
- [0x9407,"F4F6"],
- [0x9408,"9348"],
- [0x9409,"F4FB"],
- [0x940A,"F4FD"],
- [0x940B,"F4E7"],
- [0x940C,"F541"],
- [0x940D,"F4F2"],
- [0x940E,"F4F7"],
- [0x940F,"F4EB"],
- [0x9410,"F4EF"],
- [0x9411,"F543"],
- [0x9412,"F4F9"],
- [0x9413,"F4E8"],
- [0x9414,"F4EC"],
- [0x9415,"F4EE"],
- [0x9416,"F4F8"],
- [0x9417,"9A4B"],
- [0x9418,"C4C1"],
- [0x9419,"F4F1"],
- [0x941B,"FC45"],
- [0x941D,"9A4D"],
- [0x9420,"F4EA"],
- [0x9424,"91BC"],
- [0x9425,"90E2"],
- [0x9426,"90B4"],
- [0x9427,"95E1"],
- [0x9428,"F4F0"],
- [0x9429,"F661"],
- [0x942A,"F666"],
- [0x942B,"C54F"],
- [0x942C,"F668"],
- [0x942D,"9A4E"],
- [0x942E,"C549"],
- [0x942F,"87AD"],
- [0x9430,"F664"],
- [0x9431,"F66A"],
- [0x9432,"C54E"],
- [0x9433,"C54A"],
- [0x9435,"C54B"],
- [0x9436,"F660"],
- [0x9437,"F667"],
- [0x9438,"C54D"],
- [0x9439,"F665"],
- [0x943A,"C54C"],
- [0x943B,"F65F"],
- [0x943C,"F663"],
- [0x943D,"F662"],
- [0x943E,"9A4F"],
- [0x943F,"F65E"],
- [0x9440,"F669"],
- [0x9442,"FE40"],
- [0x9443,"FE43"],
- [0x9444,"C5B1"],
- [0x9445,"F76D"],
- [0x9446,"F770"],
- [0x9447,"F76C"],
- [0x9448,"F76E"],
- [0x9449,"F76F"],
- [0x944A,"F769"],
- [0x944B,"F76A"],
- [0x944C,"F767"],
- [0x944D,"96DD"],
- [0x944F,"F76B"],
- [0x9450,"F768"],
- [0x9451,"C5B2"],
- [0x9452,"C5B3"],
- [0x9454,"9A51"],
- [0x9455,"F84B"],
- [0x9457,"F84D"],
- [0x9458,"96A7"],
- [0x945B,"90B0"],
- [0x945D,"F84C"],
- [0x945E,"F84E"],
- [0x9460,"C5E0"],
- [0x9462,"F84A"],
- [0x9463,"C5DF"],
- [0x9464,"C5E1"],
- [0x9465,"9C4E"],
- [0x9467,"9443"],
- [0x9468,"F8CB"],
- [0x9469,"F8CC"],
- [0x946A,"C644"],
- [0x946B,"F8CA"],
- [0x946C,"8EBA"],
- [0x946D,"F953"],
- [0x946E,"F952"],
- [0x946F,"F954"],
- [0x9470,"C65F"],
- [0x9471,"F955"],
- [0x9472,"C65E"],
- [0x9473,"F956"],
- [0x9474,"F972"],
- [0x9475,"F975"],
- [0x9476,"F974"],
- [0x9477,"C668"],
- [0x9478,"F973"],
- [0x9479,"9A52"],
- [0x947B,"FCC1"],
- [0x947C,"C672"],
- [0x947D,"C670"],
- [0x947E,"C671"],
- [0x947F,"C677"],
- [0x9480,"F9C0"],
- [0x9481,"F9C1"],
- [0x9482,"F9BF"],
- [0x9483,"F9C9"],
- [0x9485,"8BE9"],
- [0x949F,"9CAF"],
- [0x94A2,"8BFD"],
- [0x94C1,"9ABC"],
- [0x94C3,"9AB8"],
- [0x94DC,"9AAE"],
- [0x94F6,"9AA7"],
- [0x952D,"9A53"],
- [0x9547,"9D74"],
- [0x9577,"AAF8"],
- [0x9578,"8BEA"],
- [0x957A,"D844"],
- [0x957B,"DC78"],
- [0x957C,"E8A5"],
- [0x957D,"F376"],
- [0x957F,"8BEB"],
- [0x9580,"AAF9"],
- [0x9582,"ADAC"],
- [0x9583,"B07B"],
- [0x9585,"90B2"],
- [0x9586,"D845"],
- [0x9588,"D846"],
- [0x9589,"B3AC"],
- [0x958B,"B67D"],
- [0x958C,"DC7A"],
- [0x958D,"DC79"],
- [0x958E,"B6A3"],
- [0x958F,"B67C"],
- [0x9590,"DC7B"],
- [0x9591,"B67E"],
- [0x9592,"B6A2"],
- [0x9593,"B6A1"],
- [0x9594,"B67B"],
- [0x9596,"95E9"],
- [0x9597,"95E8"],
- [0x9598,"B968"],
- [0x9599,"95E6"],
- [0x959B,"E0D0"],
- [0x959C,"E0CE"],
- [0x959E,"E0CF"],
- [0x959F,"E0CD"],
- [0x95A0,"90B5"],
- [0x95A1,"BBD2"],
- [0x95A2,"9A54"],
- [0x95A3,"BBD5"],
- [0x95A4,"BBD7"],
- [0x95A5,"BBD6"],
- [0x95A6,"90B3"],
- [0x95A7,"95E7"],
- [0x95A8,"BBD3"],
- [0x95A9,"BBD4"],
- [0x95AA,"8B50"],
- [0x95AB,"E8A7"],
- [0x95AC,"E8A6"],
- [0x95AD,"BE5B"],
- [0x95AE,"E8A8"],
- [0x95B0,"E8A9"],
- [0x95B1,"BE5C"],
- [0x95B5,"EC4D"],
- [0x95B6,"EC4B"],
- [0x95B7,"EEF3"],
- [0x95B9,"EC49"],
- [0x95BA,"EC4A"],
- [0x95BB,"C046"],
- [0x95BC,"EC46"],
- [0x95BD,"EC4E"],
- [0x95BE,"EC48"],
- [0x95BF,"EC4C"],
- [0x95C0,"EEEF"],
- [0x95C3,"EEF1"],
- [0x95C5,"EEF2"],
- [0x95C6,"C1F3"],
- [0x95C7,"EEEE"],
- [0x95C8,"C1F2"],
- [0x95C9,"EEF0"],
- [0x95CA,"C1EF"],
- [0x95CB,"C1F0"],
- [0x95CC,"C1F1"],
- [0x95CD,"EC47"],
- [0x95D0,"C2F5"],
- [0x95D1,"F16E"],
- [0x95D2,"F16C"],
- [0x95D3,"F16D"],
- [0x95D4,"C2F3"],
- [0x95D5,"C2F6"],
- [0x95D6,"C2F4"],
- [0x95DA,"F377"],
- [0x95DB,"F378"],
- [0x95DC,"C3F6"],
- [0x95DE,"F545"],
- [0x95DF,"F547"],
- [0x95E0,"F546"],
- [0x95E1,"C4C4"],
- [0x95E2,"C550"],
- [0x95E3,"F66D"],
- [0x95E4,"F66C"],
- [0x95E5,"F66B"],
- [0x95E8,"8BEC"],
- [0x95F4,"9A56"],
- [0x961C,"AAFA"],
- [0x961D,"8BFB"],
- [0x961E,"C9AA"],
- [0x9620,"CA58"],
- [0x9621,"A6E9"],
- [0x9622,"CA56"],
- [0x9623,"CA59"],
- [0x9624,"CA57"],
- [0x9628,"CBAE"],
- [0x962A,"A8C1"],
- [0x962C,"A8C2"],
- [0x962D,"CBB0"],
- [0x962E,"A8BF"],
- [0x962F,"CBAF"],
- [0x9630,"CBAD"],
- [0x9631,"A8C0"],
- [0x9632,"A8BE"],
- [0x9633,"9A57"],
- [0x9638,"A0AA"],
- [0x9639,"CDD8"],
- [0x963A,"CDDB"],
- [0x963B,"AAFD"],
- [0x963C,"CDDA"],
- [0x963D,"CDD9"],
- [0x963F,"AAFC"],
- [0x9640,"AAFB"],
- [0x9641,"9FA6"],
- [0x9642,"AB40"],
- [0x9643,"CDDC"],
- [0x9644,"AAFE"],
- [0x9645,"99CC"],
- [0x964A,"D0C6"],
- [0x964B,"ADAE"],
- [0x964C,"ADAF"],
- [0x964D,"ADB0"],
- [0x964E,"D0C7"],
- [0x964F,"D0C3"],
- [0x9650,"ADAD"],
- [0x9651,"D0C4"],
- [0x9653,"D0C5"],
- [0x9654,"D0C2"],
- [0x9656,"9C59"],
- [0x9658,"B0A4"],
- [0x965B,"B0A1"],
- [0x965C,"D445"],
- [0x965D,"B0A2"],
- [0x965E,"B0A5"],
- [0x965F,"D446"],
- [0x9661,"B07E"],
- [0x9662,"B07C"],
- [0x9663,"B07D"],
- [0x9664,"B0A3"],
- [0x9669,"99B5"],
- [0x966A,"B3AD"],
- [0x966B,"D849"],
- [0x966C,"B3B5"],
- [0x966D,"D848"],
- [0x966F,"D84B"],
- [0x9670,"B3B1"],
- [0x9671,"D84A"],
- [0x9672,"B6AB"],
- [0x9673,"B3AF"],
- [0x9674,"B3B2"],
- [0x9675,"B3AE"],
- [0x9676,"B3B3"],
- [0x9677,"B3B4"],
- [0x9678,"B3B0"],
- [0x967B,"90BE"],
- [0x967C,"D847"],
- [0x967D,"B6A7"],
- [0x967E,"DC7D"],
- [0x9680,"DCA3"],
- [0x9681,"9FAF"],
- [0x9683,"DCA2"],
- [0x9684,"B6AC"],
- [0x9685,"B6A8"],
- [0x9686,"B6A9"],
- [0x9687,"DC7C"],
- [0x9688,"DC7E"],
- [0x9689,"DCA1"],
- [0x968A,"B6A4"],
- [0x968B,"B6A6"],
- [0x968D,"B6AA"],
- [0x968E,"B6A5"],
- [0x968F,"95F2"],
- [0x9691,"E0D3"],
- [0x9692,"E0D1"],
- [0x9693,"E0D2"],
- [0x9694,"B96A"],
- [0x9695,"B96B"],
- [0x9696,"90BF"],
- [0x9697,"E0D4"],
- [0x9698,"B969"],
- [0x9699,"BBD8"],
- [0x969B,"BBDA"],
- [0x969C,"BBD9"],
- [0x969E,"E4BB"],
- [0x96A1,"E4BC"],
- [0x96A2,"E8AB"],
- [0x96A3,"90C1"],
- [0x96A4,"E8AA"],
- [0x96A5,"FEE4"],
- [0x96A7,"C047"],
- [0x96A8,"C048"],
- [0x96A9,"EC4F"],
- [0x96AA,"C049"],
- [0x96AC,"EEF6"],
- [0x96AE,"EEF4"],
- [0x96B0,"EEF5"],
- [0x96B1,"C1F4"],
- [0x96B3,"F16F"],
- [0x96B4,"C3F7"],
- [0x96B6,"90C4"],
- [0x96B8,"C1F5"],
- [0x96B9,"AB41"],
- [0x96BB,"B0A6"],
- [0x96BC,"D447"],
- [0x96BD,"90C7"],
- [0x96BF,"D84C"],
- [0x96C0,"B3B6"],
- [0x96C1,"B6AD"],
- [0x96C2,"DCA4"],
- [0x96C3,"DCA6"],
- [0x96C4,"B6AF"],
- [0x96C5,"B6AE"],
- [0x96C6,"B6B0"],
- [0x96C7,"B6B1"],
- [0x96C8,"DCA5"],
- [0x96C9,"B96E"],
- [0x96CA,"B96F"],
- [0x96CB,"B96D"],
- [0x96CC,"BBDB"],
- [0x96CD,"B96C"],
- [0x96CE,"E0D5"],
- [0x96D2,"BBDC"],
- [0x96D3,"E8AC"],
- [0x96D4,"EC50"],
- [0x96D5,"C04A"],
- [0x96D6,"C1F6"],
- [0x96D7,"F170"],
- [0x96D8,"F174"],
- [0x96D9,"C2F9"],
- [0x96DA,"F171"],
- [0x96DB,"C2FA"],
- [0x96DC,"C2F8"],
- [0x96DD,"F175"],
- [0x96DE,"C2FB"],
- [0x96DF,"F173"],
- [0x96E1,"F379"],
- [0x96E2,"C2F7"],
- [0x96E3,"C3F8"],
- [0x96E5,"F8CD"],
- [0x96E8,"AB42"],
- [0x96E9,"B3B8"],
- [0x96EA,"B3B7"],
- [0x96EF,"B6B2"],
- [0x96F0,"DCA8"],
- [0x96F1,"DCA7"],
- [0x96F2,"B6B3"],
- [0x96F4,"92E4"],
- [0x96F5,"E0D9"],
- [0x96F6,"B973"],
- [0x96F7,"B970"],
- [0x96F8,"E0D8"],
- [0x96F9,"B972"],
- [0x96FA,"E0D6"],
- [0x96FB,"B971"],
- [0x96FD,"E0D7"],
- [0x96FF,"E4BD"],
- [0x9700,"BBDD"],
- [0x9702,"E8AF"],
- [0x9703,"9F52"],
- [0x9704,"BE5D"],
- [0x9705,"E8AD"],
- [0x9706,"BE5E"],
- [0x9707,"BE5F"],
- [0x9708,"E8AE"],
- [0x9709,"BE60"],
- [0x970B,"EC51"],
- [0x970D,"C04E"],
- [0x970E,"C04B"],
- [0x970F,"C050"],
- [0x9710,"EC53"],
- [0x9711,"C04C"],
- [0x9712,"EC52"],
- [0x9713,"C04F"],
- [0x9716,"C04D"],
- [0x9718,"EEF9"],
- [0x9719,"EEFB"],
- [0x971B,"90DB"],
- [0x971C,"C1F7"],
- [0x971D,"EEFA"],
- [0x971E,"C1F8"],
- [0x971F,"EEF8"],
- [0x9720,"EEF7"],
- [0x9721,"A066"],
- [0x9722,"F177"],
- [0x9723,"F176"],
- [0x9724,"C2FC"],
- [0x9725,"F178"],
- [0x9726,"F37E"],
- [0x9727,"C3FA"],
- [0x9728,"F37D"],
- [0x9729,"F37A"],
- [0x972A,"C3F9"],
- [0x972B,"F37B"],
- [0x972C,"F37C"],
- [0x972E,"F548"],
- [0x972F,"F549"],
- [0x9730,"C4C5"],
- [0x9731,"90D2"],
- [0x9732,"C553"],
- [0x9734,"876B"],
- [0x9735,"F66E"],
- [0x9736,"90D4"],
- [0x9738,"C551"],
- [0x9739,"C552"],
- [0x973A,"F66F"],
- [0x973D,"C5B4"],
- [0x973E,"C5B5"],
- [0x973F,"F771"],
- [0x9740,"9A5B"],
- [0x9741,"95FD"],
- [0x9742,"C645"],
- [0x9743,"F8CF"],
- [0x9744,"C647"],
- [0x9746,"F8CE"],
- [0x9747,"F8D0"],
- [0x9748,"C646"],
- [0x9749,"F957"],
- [0x974A,"87B1"],
- [0x974B,"F9AD"],
- [0x9751,"8BC4"],
- [0x9752,"AB43"],
- [0x9755,"8C66"],
- [0x9756,"B974"],
- [0x9757,"90DE"],
- [0x9758,"E4BE"],
- [0x975A,"E8B0"],
- [0x975B,"C051"],
- [0x975C,"C052"],
- [0x975D,"9CE4"],
- [0x975E,"AB44"],
- [0x975F,"90E1"],
- [0x9760,"BE61"],
- [0x9761,"C3FB"],
- [0x9762,"ADB1"],
- [0x9766,"C053"],
- [0x9768,"C5E2"],
- [0x9769,"ADB2"],
- [0x976A,"D84D"],
- [0x976C,"DCA9"],
- [0x976D,"9E46"],
- [0x976E,"DCAB"],
- [0x9770,"DCAA"],
- [0x9771,"9651"],
- [0x9772,"E0DD"],
- [0x9773,"E0DA"],
- [0x9774,"B975"],
- [0x9776,"B976"],
- [0x9777,"E0DB"],
- [0x9778,"E0DC"],
- [0x977A,"E4C0"],
- [0x977B,"E4C5"],
- [0x977C,"BBDE"],
- [0x977D,"E4BF"],
- [0x977E,"E4C1"],
- [0x977F,"E4C8"],
- [0x9780,"E4C3"],
- [0x9781,"E4C7"],
- [0x9782,"E4C4"],
- [0x9783,"E4C2"],
- [0x9784,"E4C6"],
- [0x9785,"BBDF"],
- [0x9787,"FB58"],
- [0x9788,"E8B3"],
- [0x9789,"90E6"],
- [0x978A,"E8B1"],
- [0x978B,"BE63"],
- [0x978D,"BE62"],
- [0x978E,"E8B2"],
- [0x978F,"BE64"],
- [0x9794,"EC56"],
- [0x9797,"EC55"],
- [0x9798,"C054"],
- [0x9799,"EC54"],
- [0x979A,"EEFC"],
- [0x979B,"9650"],
- [0x979C,"EEFE"],
- [0x979D,"EF41"],
- [0x979E,"EF40"],
- [0x979F,"90E7"],
- [0x97A0,"C1F9"],
- [0x97A1,"EEFD"],
- [0x97A2,"F1A1"],
- [0x97A3,"C2FD"],
- [0x97A4,"F17D"],
- [0x97A5,"F1A2"],
- [0x97A6,"C2FE"],
- [0x97A8,"F17B"],
- [0x97AA,"F17E"],
- [0x97AB,"F17C"],
- [0x97AC,"F179"],
- [0x97AD,"C340"],
- [0x97AE,"F17A"],
- [0x97B1,"90E8"],
- [0x97B2,"9A5D"],
- [0x97B3,"F3A1"],
- [0x97B4,"9F7A"],
- [0x97B6,"F3A3"],
- [0x97B7,"F3A2"],
- [0x97B8,"9B5C"],
- [0x97B9,"F54A"],
- [0x97BA,"9F7C"],
- [0x97BB,"F54B"],
- [0x97BD,"FC52"],
- [0x97BE,"90E9"],
- [0x97BF,"F670"],
- [0x97C0,"90EA"],
- [0x97C1,"C5B7"],
- [0x97C2,"9A5E"],
- [0x97C3,"C5B6"],
- [0x97C4,"F84F"],
- [0x97C5,"F850"],
- [0x97C6,"C648"],
- [0x97C7,"F8D1"],
- [0x97C8,"9F76"],
- [0x97C9,"C669"],
- [0x97CB,"ADB3"],
- [0x97CC,"B6B4"],
- [0x97CD,"E4CA"],
- [0x97CE,"E4C9"],
- [0x97CF,"E8B5"],
- [0x97D0,"E8B4"],
- [0x97D2,"90EB"],
- [0x97D3,"C1FA"],
- [0x97D4,"EF43"],
- [0x97D5,"EF42"],
- [0x97D6,"F1A5"],
- [0x97D7,"F1A3"],
- [0x97D8,"F1A6"],
- [0x97D9,"F1A4"],
- [0x97DC,"C3FC"],
- [0x97DD,"F3A4"],
- [0x97DE,"F3A5"],
- [0x97DF,"F3A6"],
- [0x97E0,"90EC"],
- [0x97E1,"F671"],
- [0x97E3,"F772"],
- [0x97E5,"F8D2"],
- [0x97E6,"8BEE"],
- [0x97ED,"ADB4"],
- [0x97EE,"90EE"],
- [0x97F0,"EC57"],
- [0x97F1,"EF44"],
- [0x97F2,"91C6"],
- [0x97F3,"ADB5"],
- [0x97F5,"90F2"],
- [0x97F6,"BBE0"],
- [0x97F8,"EC58"],
- [0x97F9,"C341"],
- [0x97FA,"F1A7"],
- [0x97FB,"C3FD"],
- [0x97FD,"F54C"],
- [0x97FE,"F54D"],
- [0x97FF,"C554"],
- [0x9800,"F851"],
- [0x9801,"ADB6"],
- [0x9802,"B3BB"],
- [0x9803,"B3BC"],
- [0x9804,"D84E"],
- [0x9805,"B6B5"],
- [0x9806,"B6B6"],
- [0x9807,"DCAC"],
- [0x9808,"B6B7"],
- [0x980A,"B97A"],
- [0x980C,"B97C"],
- [0x980D,"E0DF"],
- [0x980E,"E0E0"],
- [0x980F,"E0DE"],
- [0x9810,"B977"],
- [0x9811,"B978"],
- [0x9812,"B97B"],
- [0x9813,"B979"],
- [0x9814,"FCBC"],
- [0x9815,"8A74"],
- [0x9816,"E4CB"],
- [0x9817,"BBE1"],
- [0x9818,"BBE2"],
- [0x981B,"E8BC"],
- [0x981C,"BE67"],
- [0x981D,"E8B7"],
- [0x981E,"E8B6"],
- [0x981F,"9657"],
- [0x9820,"E8BB"],
- [0x9821,"BE65"],
- [0x9823,"9CEF"],
- [0x9824,"C05B"],
- [0x9826,"E8B8"],
- [0x9827,"E8BD"],
- [0x9828,"E8BA"],
- [0x9829,"E8B9"],
- [0x982B,"BE66"],
- [0x982D,"C059"],
- [0x982E,"9FDF"],
- [0x982F,"EC5A"],
- [0x9830,"C055"],
- [0x9832,"EC5B"],
- [0x9833,"90F7"],
- [0x9834,"90F6"],
- [0x9835,"EC59"],
- [0x9837,"C058"],
- [0x9838,"C056"],
- [0x9839,"C05A"],
- [0x983B,"C057"],
- [0x9841,"EF45"],
- [0x9843,"EF4A"],
- [0x9844,"EF46"],
- [0x9845,"EF49"],
- [0x9846,"C1FB"],
- [0x9847,"9B5E"],
- [0x9848,"EDD4"],
- [0x9849,"EF48"],
- [0x984A,"EF47"],
- [0x984B,"90F8"],
- [0x984C,"C344"],
- [0x984D,"C342"],
- [0x984E,"C345"],
- [0x984F,"C343"],
- [0x9850,"F1A8"],
- [0x9851,"F1A9"],
- [0x9852,"F1AA"],
- [0x9853,"C346"],
- [0x9856,"8CFC"],
- [0x9857,"F3AA"],
- [0x9858,"C440"],
- [0x9859,"F3A8"],
- [0x985B,"C441"],
- [0x985C,"F3A7"],
- [0x985D,"F3A9"],
- [0x985E,"C3FE"],
- [0x985F,"F551"],
- [0x9860,"F54E"],
- [0x9862,"F54F"],
- [0x9863,"F550"],
- [0x9864,"F672"],
- [0x9865,"C556"],
- [0x9866,"90F9"],
- [0x9867,"C555"],
- [0x9868,"8CC9"],
- [0x9869,"F774"],
- [0x986A,"F773"],
- [0x986B,"C5B8"],
- [0x986C,"FA6A"],
- [0x986F,"C5E3"],
- [0x9870,"C649"],
- [0x9871,"C660"],
- [0x9872,"F958"],
- [0x9873,"F9AE"],
- [0x9874,"F9AF"],
- [0x9875,"8BEF"],
- [0x98A8,"ADB7"],
- [0x98A9,"DCAD"],
- [0x98AC,"E0E1"],
- [0x98AD,"E4CC"],
- [0x98AE,"E4CD"],
- [0x98AF,"BBE3"],
- [0x98B1,"BBE4"],
- [0x98B2,"E8BE"],
- [0x98B3,"BE68"],
- [0x98B4,"9FE0"],
- [0x98B6,"C1FC"],
- [0x98B7,"9142"],
- [0x98B8,"F1AB"],
- [0x98B9,"9A62"],
- [0x98BA,"C347"],
- [0x98BB,"F3AD"],
- [0x98BC,"C442"],
- [0x98BD,"F3AC"],
- [0x98BE,"F3AE"],
- [0x98BF,"F3AB"],
- [0x98C0,"F675"],
- [0x98C1,"F552"],
- [0x98C2,"F553"],
- [0x98C3,"9569"],
- [0x98C4,"C4C6"],
- [0x98C6,"F674"],
- [0x98C7,"9144"],
- [0x98C8,"9143"],
- [0x98C9,"F673"],
- [0x98CA,"9141"],
- [0x98CB,"F775"],
- [0x98CC,"F9B0"],
- [0x98CE,"8BF0"],
- [0x98DB,"ADB8"],
- [0x98DC,"9660"],
- [0x98DE,"8BF1"],
- [0x98DF,"ADB9"],
- [0x98E0,"99F6"],
- [0x98E1,"9149"],
- [0x98E2,"B0A7"],
- [0x98E3,"D448"],
- [0x98E5,"D84F"],
- [0x98E6,"914A"],
- [0x98E7,"B6B8"],
- [0x98E9,"B6BB"],
- [0x98EA,"B6B9"],
- [0x98EB,"DCAE"],
- [0x98EC,"914B"],
- [0x98ED,"B6BD"],
- [0x98EF,"B6BA"],
- [0x98F1,"9A64"],
- [0x98F2,"B6BC"],
- [0x98F4,"B97E"],
- [0x98F5,"8ABF"],
- [0x98F6,"E0E2"],
- [0x98F9,"E0E3"],
- [0x98FA,"E8C0"],
- [0x98FC,"B97D"],
- [0x98FD,"B9A1"],
- [0x98FE,"B9A2"],
- [0x9900,"E4CF"],
- [0x9902,"E4CE"],
- [0x9903,"BBE5"],
- [0x9905,"BBE6"],
- [0x9907,"E4D0"],
- [0x9908,"E8BF"],
- [0x9909,"BBE8"],
- [0x990A,"BE69"],
- [0x990C,"BBE7"],
- [0x990E,"9A66"],
- [0x9910,"C05C"],
- [0x9911,"E8C1"],
- [0x9912,"BE6B"],
- [0x9913,"BE6A"],
- [0x9914,"E8C2"],
- [0x9915,"E8C5"],
- [0x9916,"E8C3"],
- [0x9917,"E8C4"],
- [0x9918,"BE6C"],
- [0x9919,"9A67"],
- [0x991A,"C061"],
- [0x991B,"C05F"],
- [0x991C,"9A69"],
- [0x991E,"C05E"],
- [0x991F,"EC5D"],
- [0x9921,"C060"],
- [0x9924,"EC5C"],
- [0x9925,"EF4B"],
- [0x9927,"EC5E"],
- [0x9928,"C05D"],
- [0x9929,"EC5F"],
- [0x992A,"EF4E"],
- [0x992B,"EF4C"],
- [0x992C,"EF4D"],
- [0x992D,"EF52"],
- [0x992E,"C34B"],
- [0x992F,"EF51"],
- [0x9930,"EF54"],
- [0x9931,"EF53"],
- [0x9932,"EF50"],
- [0x9933,"EF4F"],
- [0x9935,"C1FD"],
- [0x9937,"9A6A"],
- [0x9938,"9652"],
- [0x9939,"914D"],
- [0x993A,"F1AE"],
- [0x993B,"9666"],
- [0x993C,"F1AD"],
- [0x993D,"C34A"],
- [0x993E,"C348"],
- [0x993F,"C349"],
- [0x9940,"9F7B"],
- [0x9941,"F1AC"],
- [0x9942,"9A6B"],
- [0x9943,"F3B1"],
- [0x9945,"C443"],
- [0x9947,"F3B0"],
- [0x9948,"F3AF"],
- [0x9949,"C444"],
- [0x994A,"A06C"],
- [0x994B,"F558"],
- [0x994C,"F557"],
- [0x994D,"9667"],
- [0x994E,"F555"],
- [0x9950,"F554"],
- [0x9951,"C4C8"],
- [0x9952,"C4C7"],
- [0x9953,"F559"],
- [0x9954,"F776"],
- [0x9955,"C5B9"],
- [0x9956,"F677"],
- [0x9957,"C557"],
- [0x9958,"F676"],
- [0x9959,"F556"],
- [0x995B,"F777"],
- [0x995C,"C5E4"],
- [0x995D,"9A6C"],
- [0x995E,"C661"],
- [0x995F,"F959"],
- [0x9961,"F9B1"],
- [0x9962,"9A6D"],
- [0x9963,"8BF2"],
- [0x9996,"ADBA"],
- [0x9997,"D850"],
- [0x9998,"EF55"],
- [0x9999,"ADBB"],
- [0x999B,"966A"],
- [0x999C,"E4D2"],
- [0x999D,"E4D1"],
- [0x999E,"EC60"],
- [0x99A1,"EF57"],
- [0x99A3,"EF56"],
- [0x99A4,"FCEA"],
- [0x99A5,"C34C"],
- [0x99A6,"F3B2"],
- [0x99A7,"F3B3"],
- [0x99A8,"C4C9"],
- [0x99AA,"966C"],
- [0x99AB,"F9B2"],
- [0x99AC,"B0A8"],
- [0x99AD,"B6BF"],
- [0x99AE,"B6BE"],
- [0x99AF,"E0E4"],
- [0x99B0,"E0E6"],
- [0x99B1,"B9A4"],
- [0x99B2,"E0E5"],
- [0x99B3,"B9A3"],
- [0x99B4,"B9A5"],
- [0x99B5,"E0E7"],
- [0x99B8,"91C4"],
- [0x99B9,"E4D4"],
- [0x99BA,"E4D6"],
- [0x99BB,"E4D5"],
- [0x99BC,"9677"],
- [0x99BD,"E4D8"],
- [0x99C1,"BBE9"],
- [0x99C2,"E4D7"],
- [0x99C3,"E4D3"],
- [0x99C4,"99F4"],
- [0x99C5,"9A6F"],
- [0x99C7,"E4D9"],
- [0x99C9,"E8CC"],
- [0x99CB,"E8CF"],
- [0x99CC,"E8D1"],
- [0x99CD,"E8C7"],
- [0x99CE,"E8CB"],
- [0x99CF,"E8C8"],
- [0x99D0,"BE6E"],
- [0x99D1,"BE71"],
- [0x99D2,"BE73"],
- [0x99D3,"E8C9"],
- [0x99D4,"E8CA"],
- [0x99D5,"BE72"],
- [0x99D6,"E8CD"],
- [0x99D7,"E8D0"],
- [0x99D8,"E8CE"],
- [0x99D9,"BE74"],
- [0x99DA,"9FAB"],
- [0x99DB,"BE70"],
- [0x99DC,"E8C6"],
- [0x99DD,"BE6D"],
- [0x99DF,"BE6F"],
- [0x99E0,"8CBE"],
- [0x99E1,"8EC1"],
- [0x99E2,"C063"],
- [0x99E3,"EC66"],
- [0x99E4,"EC64"],
- [0x99E5,"EC63"],
- [0x99E6,"9555"],
- [0x99E7,"EC69"],
- [0x99E9,"EC68"],
- [0x99EA,"EC67"],
- [0x99EC,"EC62"],
- [0x99ED,"C062"],
- [0x99EE,"EC61"],
- [0x99F0,"EC65"],
- [0x99F1,"C064"],
- [0x99F4,"EF5A"],
- [0x99F5,"9152"],
- [0x99F6,"EF5E"],
- [0x99F7,"EF5B"],
- [0x99F8,"EF5D"],
- [0x99F9,"EF5C"],
- [0x99FA,"EF59"],
- [0x99FB,"EF5F"],
- [0x99FC,"EF62"],
- [0x99FD,"EF60"],
- [0x99FE,"EF61"],
- [0x99FF,"C240"],
- [0x9A01,"C1FE"],
- [0x9A02,"EF58"],
- [0x9A03,"EF63"],
- [0x9A04,"F1B3"],
- [0x9A05,"F1B6"],
- [0x9A06,"F1B8"],
- [0x9A07,"F1B7"],
- [0x9A09,"F1B1"],
- [0x9A0A,"F1B5"],
- [0x9A0B,"F1B0"],
- [0x9A0C,"9153"],
- [0x9A0D,"F1B2"],
- [0x9A0E,"C34D"],
- [0x9A0F,"F1AF"],
- [0x9A10,"9155"],
- [0x9A11,"F1B4"],
- [0x9A14,"F3C0"],
- [0x9A15,"F3B5"],
- [0x9A16,"C445"],
- [0x9A19,"C446"],
- [0x9A1A,"F3B4"],
- [0x9A1B,"F3B9"],
- [0x9A1C,"F3BF"],
- [0x9A1D,"F3B7"],
- [0x9A1E,"F3BE"],
- [0x9A1F,"955D"],
- [0x9A20,"F3BB"],
- [0x9A21,"9671"],
- [0x9A22,"F3BA"],
- [0x9A23,"F3BD"],
- [0x9A24,"F3B8"],
- [0x9A25,"F3B6"],
- [0x9A26,"9C6D"],
- [0x9A27,"F3BC"],
- [0x9A29,"F560"],
- [0x9A2A,"F55E"],
- [0x9A2B,"C4CA"],
- [0x9A2C,"F55D"],
- [0x9A2D,"F563"],
- [0x9A2E,"F561"],
- [0x9A2F,"9673"],
- [0x9A30,"C4CB"],
- [0x9A31,"F55C"],
- [0x9A32,"F55A"],
- [0x9A34,"F55B"],
- [0x9A35,"C4CD"],
- [0x9A36,"F55F"],
- [0x9A37,"C4CC"],
- [0x9A38,"F562"],
- [0x9A39,"F678"],
- [0x9A3A,"F67E"],
- [0x9A3B,"9154"],
- [0x9A3C,"9A71"],
- [0x9A3D,"F679"],
- [0x9A3E,"C55B"],
- [0x9A3F,"F6A1"],
- [0x9A40,"C55A"],
- [0x9A41,"F67D"],
- [0x9A42,"F67C"],
- [0x9A43,"C559"],
- [0x9A44,"F67B"],
- [0x9A45,"C558"],
- [0x9A46,"F67A"],
- [0x9A48,"F77D"],
- [0x9A49,"F7A1"],
- [0x9A4A,"F77E"],
- [0x9A4C,"F77B"],
- [0x9A4D,"C5BB"],
- [0x9A4E,"F778"],
- [0x9A4F,"F77C"],
- [0x9A50,"F7A3"],
- [0x9A52,"F7A2"],
- [0x9A53,"F779"],
- [0x9A54,"F77A"],
- [0x9A55,"C5BA"],
- [0x9A56,"F852"],
- [0x9A57,"C5E7"],
- [0x9A58,"9156"],
- [0x9A59,"F853"],
- [0x9A5A,"C5E5"],
- [0x9A5B,"C5E6"],
- [0x9A5C,"966D"],
- [0x9A5E,"F8D3"],
- [0x9A5F,"C64A"],
- [0x9A60,"F976"],
- [0x9A62,"C66A"],
- [0x9A63,"9557"],
- [0x9A64,"F9B3"],
- [0x9A65,"C66B"],
- [0x9A66,"F9B4"],
- [0x9A67,"F9B5"],
- [0x9A68,"F9C3"],
- [0x9A69,"F9C2"],
- [0x9A6A,"C67A"],
- [0x9A6B,"F9CD"],
- [0x9A6C,"89C6"],
- [0x9A8F,"89C7"],
- [0x9AA8,"B0A9"],
- [0x9AAB,"E0E9"],
- [0x9AAD,"E0E8"],
- [0x9AAF,"BBEA"],
- [0x9AB0,"BBEB"],
- [0x9AB1,"E4DA"],
- [0x9AB2,"8A6A"],
- [0x9AB3,"E8D2"],
- [0x9AB4,"EC6C"],
- [0x9AB6,"8B57"],
- [0x9AB7,"BE75"],
- [0x9AB8,"C065"],
- [0x9AB9,"EC6A"],
- [0x9ABA,"9FE1"],
- [0x9ABB,"EC6D"],
- [0x9ABC,"C066"],
- [0x9ABD,"9B5F"],
- [0x9ABE,"EF64"],
- [0x9ABF,"EC6B"],
- [0x9AC0,"F1B9"],
- [0x9AC1,"C34E"],
- [0x9AC2,"F3C1"],
- [0x9AC6,"F566"],
- [0x9AC7,"F564"],
- [0x9ACA,"F565"],
- [0x9ACD,"F6A2"],
- [0x9ACF,"C55C"],
- [0x9AD0,"F7A4"],
- [0x9AD1,"C5EA"],
- [0x9AD2,"C5BC"],
- [0x9AD3,"C5E8"],
- [0x9AD4,"C5E9"],
- [0x9AD5,"F8D4"],
- [0x9AD6,"C662"],
- [0x9AD7,"A05D"],
- [0x9AD8,"B0AA"],
- [0x9ADC,"F1BA"],
- [0x9ADF,"D449"],
- [0x9AE0,"915B"],
- [0x9AE1,"B9A6"],
- [0x9AE2,"915C"],
- [0x9AE3,"E4DB"],
- [0x9AE6,"BBEC"],
- [0x9AE7,"E4DC"],
- [0x9AEB,"E8D4"],
- [0x9AEC,"E8D3"],
- [0x9AED,"C068"],
- [0x9AEE,"BE76"],
- [0x9AEF,"BE77"],
- [0x9AF1,"E8D7"],
- [0x9AF2,"E8D6"],
- [0x9AF3,"E8D5"],
- [0x9AF4,"915E"],
- [0x9AF6,"EC6E"],
- [0x9AF7,"EC71"],
- [0x9AF9,"EC70"],
- [0x9AFA,"EC6F"],
- [0x9AFB,"C067"],
- [0x9AFC,"EF68"],
- [0x9AFD,"EF66"],
- [0x9AFE,"EF65"],
- [0x9AFF,"9F5C"],
- [0x9B01,"EF67"],
- [0x9B02,"9F57"],
- [0x9B03,"C34F"],
- [0x9B04,"F1BC"],
- [0x9B05,"F1BD"],
- [0x9B06,"C350"],
- [0x9B08,"F1BB"],
- [0x9B09,"9F65"],
- [0x9B0A,"F3C3"],
- [0x9B0B,"F3C2"],
- [0x9B0C,"F3C5"],
- [0x9B0D,"C447"],
- [0x9B0E,"F3C4"],
- [0x9B0F,"9A72"],
- [0x9B10,"F567"],
- [0x9B11,"F569"],
- [0x9B12,"F568"],
- [0x9B14,"9160"],
- [0x9B15,"F6A3"],
- [0x9B16,"F6A6"],
- [0x9B17,"F6A4"],
- [0x9B18,"F6A5"],
- [0x9B19,"F7A5"],
- [0x9B1A,"C5BD"],
- [0x9B1E,"F854"],
- [0x9B1F,"F855"],
- [0x9B20,"F856"],
- [0x9B22,"C64B"],
- [0x9B23,"C663"],
- [0x9B24,"F9B6"],
- [0x9B25,"B0AB"],
- [0x9B27,"BE78"],
- [0x9B28,"C069"],
- [0x9B29,"F1BE"],
- [0x9B2A,"9F5E"],
- [0x9B2B,"F7A6"],
- [0x9B2D,"9161"],
- [0x9B2E,"F9C4"],
- [0x9B2F,"D44A"],
- [0x9B31,"C67B"],
- [0x9B32,"B0AC"],
- [0x9B33,"EC72"],
- [0x9B34,"9164"],
- [0x9B35,"F1BF"],
- [0x9B37,"F3C6"],
- [0x9B39,"9F41"],
- [0x9B3A,"F6A7"],
- [0x9B3B,"F7A7"],
- [0x9B3C,"B0AD"],
- [0x9B3E,"E4DD"],
- [0x9B3F,"E4DE"],
- [0x9B40,"9169"],
- [0x9B41,"BBED"],
- [0x9B42,"BBEE"],
- [0x9B43,"E8D9"],
- [0x9B44,"BE7A"],
- [0x9B45,"BE79"],
- [0x9B46,"E8D8"],
- [0x9B48,"EF69"],
- [0x9B4A,"F1C0"],
- [0x9B4B,"F1C2"],
- [0x9B4C,"F1C1"],
- [0x9B4D,"C353"],
- [0x9B4E,"C352"],
- [0x9B4F,"C351"],
- [0x9B50,"9168"],
- [0x9B51,"C55E"],
- [0x9B52,"F6A8"],
- [0x9B54,"C55D"],
- [0x9B55,"F7A9"],
- [0x9B56,"F7A8"],
- [0x9B58,"C64C"],
- [0x9B59,"F8D5"],
- [0x9B5A,"B3BD"],
- [0x9B5B,"E0EA"],
- [0x9B5F,"E4E1"],
- [0x9B60,"E4DF"],
- [0x9B61,"E4E0"],
- [0x9B64,"E8E2"],
- [0x9B66,"E8DD"],
- [0x9B67,"E8DA"],
- [0x9B68,"E8E1"],
- [0x9B69,"9A74"],
- [0x9B6C,"E8E3"],
- [0x9B6F,"BE7C"],
- [0x9B70,"E8E0"],
- [0x9B71,"E8DC"],
- [0x9B74,"E8DB"],
- [0x9B75,"E8DF"],
- [0x9B76,"E8DE"],
- [0x9B77,"BE7B"],
- [0x9B7A,"EC7D"],
- [0x9B7B,"EC78"],
- [0x9B7C,"EC76"],
- [0x9B7D,"ECA1"],
- [0x9B7E,"EC77"],
- [0x9B7F,"96B2"],
- [0x9B80,"EC73"],
- [0x9B81,"9A75"],
- [0x9B82,"EC79"],
- [0x9B83,"FDA5"],
- [0x9B85,"EC74"],
- [0x9B86,"EF72"],
- [0x9B87,"EC75"],
- [0x9B88,"ECA2"],
- [0x9B8B,"9EE9"],
- [0x9B8D,"8BBA"],
- [0x9B8E,"916D"],
- [0x9B8F,"A060"],
- [0x9B90,"EC7C"],
- [0x9B91,"C06A"],
- [0x9B92,"EC7B"],
- [0x9B93,"EC7A"],
- [0x9B95,"EC7E"],
- [0x9B97,"9FDE"],
- [0x9B9A,"EF6A"],
- [0x9B9B,"EF6D"],
- [0x9B9D,"9FC3"],
- [0x9B9E,"EF6C"],
- [0x9B9F,"96B5"],
- [0x9BA0,"EF74"],
- [0x9BA1,"EF6F"],
- [0x9BA2,"EF73"],
- [0x9BA4,"EF71"],
- [0x9BA5,"EF70"],
- [0x9BA6,"EF6E"],
- [0x9BA8,"EF6B"],
- [0x9BAA,"C243"],
- [0x9BAB,"C242"],
- [0x9BAD,"C244"],
- [0x9BAE,"C241"],
- [0x9BAF,"EF75"],
- [0x9BB0,"A067"],
- [0x9BB5,"F1C8"],
- [0x9BB6,"F1CB"],
- [0x9BB8,"F1C9"],
- [0x9BB9,"F1CD"],
- [0x9BBD,"F1CE"],
- [0x9BBF,"F1C6"],
- [0x9BC0,"C358"],
- [0x9BC1,"F1C7"],
- [0x9BC3,"F1C5"],
- [0x9BC4,"F1CC"],
- [0x9BC6,"F1C4"],
- [0x9BC7,"F1C3"],
- [0x9BC8,"C357"],
- [0x9BC9,"C355"],
- [0x9BCA,"C354"],
- [0x9BCF,"96B3"],
- [0x9BD3,"F1CA"],
- [0x9BD4,"F3CF"],
- [0x9BD5,"F3D5"],
- [0x9BD6,"C44A"],
- [0x9BD7,"F3D0"],
- [0x9BD9,"F3D3"],
- [0x9BDA,"F3D7"],
- [0x9BDB,"C44B"],
- [0x9BDC,"F3D2"],
- [0x9BDD,"9A76"],
- [0x9BDE,"F3CA"],
- [0x9BE0,"F3C9"],
- [0x9BE1,"F3D6"],
- [0x9BE2,"F3CD"],
- [0x9BE4,"F3CB"],
- [0x9BE5,"F3D4"],
- [0x9BE6,"F3CC"],
- [0x9BE7,"C449"],
- [0x9BE8,"C448"],
- [0x9BE9,"95D5"],
- [0x9BEA,"F3C7"],
- [0x9BEB,"F3C8"],
- [0x9BEC,"F3D1"],
- [0x9BED,"9ECA"],
- [0x9BF0,"F3CE"],
- [0x9BF1,"9A77"],
- [0x9BF4,"9A78"],
- [0x9BF7,"F56C"],
- [0x9BF8,"F56F"],
- [0x9BFD,"C356"],
- [0x9BFF,"9170"],
- [0x9C02,"916F"],
- [0x9C05,"F56D"],
- [0x9C06,"F573"],
- [0x9C07,"F571"],
- [0x9C08,"F56B"],
- [0x9C09,"F576"],
- [0x9C0A,"9FA3"],
- [0x9C0B,"F56A"],
- [0x9C0C,"9171"],
- [0x9C0D,"C4CF"],
- [0x9C0E,"F572"],
- [0x9C10,"96B1"],
- [0x9C12,"F56E"],
- [0x9C13,"C4CE"],
- [0x9C14,"F575"],
- [0x9C15,"9F63"],
- [0x9C17,"F574"],
- [0x9C1B,"9F67"],
- [0x9C1C,"F6AB"],
- [0x9C1D,"F6AA"],
- [0x9C1F,"8BB9"],
- [0x9C20,"9A7A"],
- [0x9C21,"F6B1"],
- [0x9C23,"F6AD"],
- [0x9C24,"F6B0"],
- [0x9C25,"C560"],
- [0x9C26,"8B56"],
- [0x9C28,"F6AE"],
- [0x9C29,"F6AF"],
- [0x9C2B,"F6A9"],
- [0x9C2C,"F6AC"],
- [0x9C2D,"C55F"],
- [0x9C2F,"9ADA"],
- [0x9C31,"C5BF"],
- [0x9C32,"F7B4"],
- [0x9C33,"F7AF"],
- [0x9C34,"F7B3"],
- [0x9C35,"96B0"],
- [0x9C36,"F7B6"],
- [0x9C37,"F7B2"],
- [0x9C39,"F7AE"],
- [0x9C3A,"9A7E"],
- [0x9C3B,"C5C1"],
- [0x9C3C,"F7B1"],
- [0x9C3D,"F7B5"],
- [0x9C3E,"C5C0"],
- [0x9C3F,"F7AC"],
- [0x9C40,"F570"],
- [0x9C41,"F7B0"],
- [0x9C44,"F7AD"],
- [0x9C45,"9DDE"],
- [0x9C46,"F7AA"],
- [0x9C48,"F7AB"],
- [0x9C49,"C5BE"],
- [0x9C4A,"F85A"],
- [0x9C4B,"F85C"],
- [0x9C4C,"F85F"],
- [0x9C4D,"F85B"],
- [0x9C4E,"F860"],
- [0x9C4F,"96AD"],
- [0x9C50,"F859"],
- [0x9C52,"F857"],
- [0x9C53,"96AE"],
- [0x9C54,"C5EB"],
- [0x9C55,"F85D"],
- [0x9C56,"C5ED"],
- [0x9C57,"C5EC"],
- [0x9C58,"F858"],
- [0x9C59,"F85E"],
- [0x9C5D,"9EA1"],
- [0x9C5E,"F8DA"],
- [0x9C5F,"C64D"],
- [0x9C60,"F8DB"],
- [0x9C62,"F8D9"],
- [0x9C63,"F8D6"],
- [0x9C66,"F8D8"],
- [0x9C67,"F8D7"],
- [0x9C68,"F95A"],
- [0x9C6D,"F95C"],
- [0x9C6E,"F95B"],
- [0x9C71,"F979"],
- [0x9C72,"9E50"],
- [0x9C73,"F978"],
- [0x9C74,"F977"],
- [0x9C75,"F97A"],
- [0x9C77,"C673"],
- [0x9C78,"C674"],
- [0x9C79,"F9CA"],
- [0x9C7A,"F9CE"],
- [0x9C7B,"96AF"],
- [0x9C7C,"8BF4"],
- [0x9CE5,"B3BE"],
- [0x9CE6,"DCAF"],
- [0x9CE7,"E0ED"],
- [0x9CE9,"B9A7"],
- [0x9CEA,"E0EB"],
- [0x9CED,"E0EC"],
- [0x9CF1,"E4E2"],
- [0x9CF2,"E4E3"],
- [0x9CF3,"BBF1"],
- [0x9CF4,"BBEF"],
- [0x9CF5,"E4E4"],
- [0x9CF6,"BBF0"],
- [0x9CF7,"E8E8"],
- [0x9CF9,"E8EB"],
- [0x9CFA,"E8E5"],
- [0x9CFB,"E8EC"],
- [0x9CFC,"E8E4"],
- [0x9CFD,"E8E6"],
- [0x9CFF,"E8E7"],
- [0x9D00,"E8EA"],
- [0x9D02,"9FA4"],
- [0x9D03,"BEA1"],
- [0x9D04,"E8EF"],
- [0x9D05,"E8EE"],
- [0x9D06,"BE7D"],
- [0x9D07,"E8E9"],
- [0x9D08,"E8ED"],
- [0x9D09,"BE7E"],
- [0x9D0C,"96BD"],
- [0x9D10,"ECAC"],
- [0x9D12,"C06F"],
- [0x9D14,"ECA7"],
- [0x9D15,"C06B"],
- [0x9D16,"96F4"],
- [0x9D17,"ECA4"],
- [0x9D18,"ECAA"],
- [0x9D19,"ECAD"],
- [0x9D1B,"C070"],
- [0x9D1D,"ECA9"],
- [0x9D1E,"ECA6"],
- [0x9D1F,"ECAE"],
- [0x9D20,"ECA5"],
- [0x9D21,"96B8"],
- [0x9D22,"ECAB"],
- [0x9D23,"C06C"],
- [0x9D25,"ECA3"],
- [0x9D26,"C06D"],
- [0x9D28,"C06E"],
- [0x9D29,"ECA8"],
- [0x9D2D,"EFA9"],
- [0x9D2E,"EF7A"],
- [0x9D2F,"EF7B"],
- [0x9D30,"EF7E"],
- [0x9D31,"EF7C"],
- [0x9D33,"EF76"],
- [0x9D34,"FAA1"],
- [0x9D36,"EF79"],
- [0x9D37,"EFA5"],
- [0x9D38,"EF7D"],
- [0x9D39,"91A7"],
- [0x9D3B,"C245"],
- [0x9D3D,"EFA7"],
- [0x9D3E,"EFA4"],
- [0x9D3F,"C246"],
- [0x9D40,"EFA6"],
- [0x9D41,"EF77"],
- [0x9D42,"EFA2"],
- [0x9D43,"EFA3"],
- [0x9D44,"A05E"],
- [0x9D45,"EFA1"],
- [0x9D49,"9A7D"],
- [0x9D4A,"F1D2"],
- [0x9D4B,"F1D4"],
- [0x9D4C,"F1D7"],
- [0x9D4E,"8948"],
- [0x9D4F,"F1D1"],
- [0x9D50,"9EB1"],
- [0x9D51,"C359"],
- [0x9D52,"F1D9"],
- [0x9D53,"F1D0"],
- [0x9D54,"F1DA"],
- [0x9D56,"F1D6"],
- [0x9D57,"F1D8"],
- [0x9D58,"F1DC"],
- [0x9D59,"F1D5"],
- [0x9D5A,"F1DD"],
- [0x9D5B,"F1D3"],
- [0x9D5C,"F1CF"],
- [0x9D5D,"C35A"],
- [0x9D5E,"9DDB"],
- [0x9D5F,"F1DB"],
- [0x9D60,"C35B"],
- [0x9D61,"C44D"],
- [0x9D67,"EF78"],
- [0x9D68,"F3F1"],
- [0x9D69,"F3E8"],
- [0x9D6A,"C44F"],
- [0x9D6B,"F3E4"],
- [0x9D6C,"C450"],
- [0x9D6D,"95BF"],
- [0x9D6E,"8A73"],
- [0x9D6F,"F3ED"],
- [0x9D70,"F3E7"],
- [0x9D71,"F3DD"],
- [0x9D72,"C44E"],
- [0x9D73,"F3EA"],
- [0x9D74,"F3E5"],
- [0x9D75,"F3E6"],
- [0x9D77,"F3D8"],
- [0x9D78,"F3DF"],
- [0x9D79,"F3EE"],
- [0x9D7B,"F3EB"],
- [0x9D7C,"9EFE"],
- [0x9D7D,"F3E3"],
- [0x9D7E,"917A"],
- [0x9D7F,"F3EF"],
- [0x9D80,"F3DE"],
- [0x9D81,"F3D9"],
- [0x9D82,"F3EC"],
- [0x9D83,"917B"],
- [0x9D84,"F3DB"],
- [0x9D85,"F3E9"],
- [0x9D86,"F3E0"],
- [0x9D87,"F3F0"],
- [0x9D88,"F3DC"],
- [0x9D89,"C44C"],
- [0x9D8A,"F3DA"],
- [0x9D8B,"F3E1"],
- [0x9D8C,"F3E2"],
- [0x9D90,"F57D"],
- [0x9D92,"F57B"],
- [0x9D93,"9AA3"],
- [0x9D94,"F5A2"],
- [0x9D96,"F5AE"],
- [0x9D97,"F5A5"],
- [0x9D98,"F57C"],
- [0x9D99,"F578"],
- [0x9D9A,"F5A7"],
- [0x9D9B,"F57E"],
- [0x9D9C,"F5A3"],
- [0x9D9D,"F57A"],
- [0x9D9E,"F5AA"],
- [0x9D9F,"F577"],
- [0x9DA0,"F5A1"],
- [0x9DA1,"F5A6"],
- [0x9DA2,"F5A8"],
- [0x9DA3,"F5AB"],
- [0x9DA4,"F579"],
- [0x9DA5,"96C2"],
- [0x9DA6,"F5AF"],
- [0x9DA7,"F5B0"],
- [0x9DA8,"F5A9"],
- [0x9DA9,"F5AD"],
- [0x9DAA,"F5A4"],
- [0x9DAB,"9F77"],
- [0x9DAC,"F6C1"],
- [0x9DAD,"F6C4"],
- [0x9DAF,"C561"],
- [0x9DB1,"F6C3"],
- [0x9DB2,"F6C8"],
- [0x9DB3,"F6C6"],
- [0x9DB4,"C562"],
- [0x9DB5,"F6BD"],
- [0x9DB6,"F6B3"],
- [0x9DB7,"F6B2"],
- [0x9DB8,"C564"],
- [0x9DB9,"F6BF"],
- [0x9DBA,"F6C0"],
- [0x9DBB,"F6BC"],
- [0x9DBC,"F6B4"],
- [0x9DBD,"9AA4"],
- [0x9DBE,"F6B9"],
- [0x9DBF,"F5AC"],
- [0x9DC0,"9AA5"],
- [0x9DC1,"F6B5"],
- [0x9DC2,"C563"],
- [0x9DC3,"F6BB"],
- [0x9DC4,"91A1"],
- [0x9DC5,"F6BA"],
- [0x9DC7,"F6B6"],
- [0x9DC8,"F6C2"],
- [0x9DC9,"89B8"],
- [0x9DCA,"F6B7"],
- [0x9DCB,"F7BB"],
- [0x9DCC,"F6C5"],
- [0x9DCD,"F6C7"],
- [0x9DCE,"F6BE"],
- [0x9DCF,"F6B8"],
- [0x9DD0,"F7BC"],
- [0x9DD1,"F7BE"],
- [0x9DD2,"F7B8"],
- [0x9DD3,"C5C2"],
- [0x9DD4,"9173"],
- [0x9DD5,"F7C5"],
- [0x9DD6,"F7C3"],
- [0x9DD7,"C5C3"],
- [0x9DD8,"F7C2"],
- [0x9DD9,"F7C1"],
- [0x9DDA,"F7BA"],
- [0x9DDB,"F7B7"],
- [0x9DDC,"F7BD"],
- [0x9DDD,"F7C6"],
- [0x9DDE,"F7B9"],
- [0x9DDF,"F7BF"],
- [0x9DE1,"F869"],
- [0x9DE2,"F86E"],
- [0x9DE3,"F864"],
- [0x9DE4,"F867"],
- [0x9DE5,"C5EE"],
- [0x9DE6,"F86B"],
- [0x9DE8,"F872"],
- [0x9DE9,"F7C0"],
- [0x9DEB,"F865"],
- [0x9DEC,"F86F"],
- [0x9DED,"F873"],
- [0x9DEE,"F86A"],
- [0x9DEF,"F863"],
- [0x9DF0,"F86D"],
- [0x9DF2,"F86C"],
- [0x9DF3,"F871"],
- [0x9DF4,"F870"],
- [0x9DF5,"F7C4"],
- [0x9DF6,"F868"],
- [0x9DF7,"F862"],
- [0x9DF8,"F866"],
- [0x9DF9,"C64E"],
- [0x9DFA,"C64F"],
- [0x9DFB,"F861"],
- [0x9DFC,"9AA6"],
- [0x9DFD,"F8E6"],
- [0x9DFE,"F8DD"],
- [0x9DFF,"F8E5"],
- [0x9E00,"F8E2"],
- [0x9E01,"F8E3"],
- [0x9E02,"F8DC"],
- [0x9E03,"F8DF"],
- [0x9E04,"F8E7"],
- [0x9E05,"F8E1"],
- [0x9E06,"F8E0"],
- [0x9E07,"F8DE"],
- [0x9E09,"F8E4"],
- [0x9E0A,"89BD"],
- [0x9E0B,"F95D"],
- [0x9E0C,"89B9"],
- [0x9E0D,"F95E"],
- [0x9E0E,"917D"],
- [0x9E0F,"F960"],
- [0x9E10,"F95F"],
- [0x9E11,"F962"],
- [0x9E12,"F961"],
- [0x9E13,"F97C"],
- [0x9E14,"F97B"],
- [0x9E15,"F9B7"],
- [0x9E17,"F9B8"],
- [0x9E18,"96BB"],
- [0x9E19,"F9C5"],
- [0x9E1A,"C678"],
- [0x9E1B,"C67C"],
- [0x9E1C,"9FF2"],
- [0x9E1D,"F9CF"],
- [0x9E1E,"C67D"],
- [0x9E1F,"8BF5"],
- [0x9E75,"B3BF"],
- [0x9E79,"C4D0"],
- [0x9E7A,"F6C9"],
- [0x9E7B,"9AA9"],
- [0x9E7C,"C650"],
- [0x9E7D,"C651"],
- [0x9E7F,"B3C0"],
- [0x9E80,"E0EE"],
- [0x9E81,"9F54"],
- [0x9E82,"B9A8"],
- [0x9E83,"E8F0"],
- [0x9E84,"9FE3"],
- [0x9E85,"9EED"],
- [0x9E86,"ECB0"],
- [0x9E87,"ECB1"],
- [0x9E88,"ECAF"],
- [0x9E89,"EFAB"],
- [0x9E8A,"EFAA"],
- [0x9E8B,"C247"],
- [0x9E8C,"F1DF"],
- [0x9E8D,"EFAC"],
- [0x9E8E,"F1DE"],
- [0x9E90,"91AA"],
- [0x9E91,"F3F3"],
- [0x9E92,"C451"],
- [0x9E93,"C453"],
- [0x9E94,"F3F2"],
- [0x9E95,"91AB"],
- [0x9E96,"A070"],
- [0x9E97,"C452"],
- [0x9E98,"9F6D"],
- [0x9E99,"F5B1"],
- [0x9E9A,"F5B3"],
- [0x9E9B,"F5B2"],
- [0x9E9C,"F6CA"],
- [0x9E9D,"C565"],
- [0x9E9E,"91AC"],
- [0x9E9F,"C5EF"],
- [0x9EA0,"F8E8"],
- [0x9EA1,"F963"],
- [0x9EA2,"91AD"],
- [0x9EA4,"F9D2"],
- [0x9EA5,"B3C1"],
- [0x9EA6,"A0FD"],
- [0x9EA7,"E4E5"],
- [0x9EA8,"9FE2"],
- [0x9EA9,"BEA2"],
- [0x9EAA,"91AF"],
- [0x9EAB,"9E41"],
- [0x9EAC,"9AAA"],
- [0x9EAD,"ECB3"],
- [0x9EAE,"ECB2"],
- [0x9EAF,"91B0"],
- [0x9EB0,"EFAD"],
- [0x9EB1,"9AAB"],
- [0x9EB4,"C454"],
- [0x9EB5,"C4D1"],
- [0x9EB6,"F7C7"],
- [0x9EB7,"F9CB"],
- [0x9EBB,"B3C2"],
- [0x9EBC,"BBF2"],
- [0x9EBD,"9AAC"],
- [0x9EBE,"BEA3"],
- [0x9EBF,"9A4A"],
- [0x9EC0,"F3F4"],
- [0x9EC1,"91B2"],
- [0x9EC2,"F874"],
- [0x9EC3,"B6C0"],
- [0x9EC4,"8BF6"],
- [0x9EC6,"9AAD"],
- [0x9EC7,"89B6"],
- [0x9EC8,"EFAE"],
- [0x9ECC,"C664"],
- [0x9ECD,"B6C1"],
- [0x9ECE,"BEA4"],
- [0x9ECF,"C248"],
- [0x9ED0,"F875"],
- [0x9ED1,"B6C2"],
- [0x9ED3,"E8F1"],
- [0x9ED4,"C072"],
- [0x9ED5,"ECB4"],
- [0x9ED6,"ECB5"],
- [0x9ED8,"C071"],
- [0x9EDA,"EFAF"],
- [0x9EDB,"C24C"],
- [0x9EDC,"C24A"],
- [0x9EDD,"C24B"],
- [0x9EDE,"C249"],
- [0x9EDF,"F1E0"],
- [0x9EE0,"C35C"],
- [0x9EE2,"9AAF"],
- [0x9EE4,"F5B5"],
- [0x9EE5,"F5B4"],
- [0x9EE6,"F5B7"],
- [0x9EE7,"F5B6"],
- [0x9EE8,"C4D2"],
- [0x9EEB,"F6CB"],
- [0x9EED,"F6CD"],
- [0x9EEE,"F6CC"],
- [0x9EEF,"C566"],
- [0x9EF0,"F7C8"],
- [0x9EF1,"9AB0"],
- [0x9EF2,"F876"],
- [0x9EF3,"F877"],
- [0x9EF4,"C5F0"],
- [0x9EF5,"F964"],
- [0x9EF6,"F97D"],
- [0x9EF7,"C675"],
- [0x9EF8,"9AB1"],
- [0x9EF9,"DCB0"],
- [0x9EFA,"ECB6"],
- [0x9EFB,"EFB0"],
- [0x9EFC,"F3F5"],
- [0x9EFD,"E0EF"],
- [0x9EFE,"9AA1"],
- [0x9EFF,"EFB1"],
- [0x9F00,"F1E2"],
- [0x9F01,"F1E1"],
- [0x9F02,"91B9"],
- [0x9F06,"F878"],
- [0x9F07,"C652"],
- [0x9F08,"91BA"],
- [0x9F09,"F965"],
- [0x9F0A,"F97E"],
- [0x9F0E,"B9A9"],
- [0x9F0F,"E8F2"],
- [0x9F10,"E8F3"],
- [0x9F12,"ECB7"],
- [0x9F13,"B9AA"],
- [0x9F15,"C35D"],
- [0x9F16,"F1E3"],
- [0x9F17,"91BE"],
- [0x9F18,"F6CF"],
- [0x9F19,"C567"],
- [0x9F1A,"F6D0"],
- [0x9F1B,"F6CE"],
- [0x9F1C,"F879"],
- [0x9F1E,"F8E9"],
- [0x9F20,"B9AB"],
- [0x9F22,"EFB4"],
- [0x9F23,"EFB3"],
- [0x9F24,"EFB2"],
- [0x9F25,"F1E4"],
- [0x9F26,"A041"],
- [0x9F27,"8BB7"],
- [0x9F28,"F1E8"],
- [0x9F29,"F1E7"],
- [0x9F2A,"F1E6"],
- [0x9F2B,"F1E5"],
- [0x9F2C,"C35E"],
- [0x9F2D,"F3F6"],
- [0x9F2E,"F5B9"],
- [0x9F2F,"C4D3"],
- [0x9F30,"F5B8"],
- [0x9F31,"F6D1"],
- [0x9F32,"F7CB"],
- [0x9F33,"F7CA"],
- [0x9F34,"C5C4"],
- [0x9F35,"F7C9"],
- [0x9F36,"F87C"],
- [0x9F37,"F87B"],
- [0x9F38,"F87A"],
- [0x9F39,"91C0"],
- [0x9F3B,"BBF3"],
- [0x9F3D,"ECB8"],
- [0x9F3E,"C24D"],
- [0x9F40,"F3F7"],
- [0x9F41,"F3F8"],
- [0x9F42,"F7CC"],
- [0x9F43,"F87D"],
- [0x9F44,"9AB3"],
- [0x9F45,"91C3"],
- [0x9F46,"F8EA"],
- [0x9F47,"F966"],
- [0x9F48,"F9B9"],
- [0x9F49,"F9D4"],
- [0x9F4A,"BBF4"],
- [0x9F4B,"C24E"],
- [0x9F4C,"F1E9"],
- [0x9F4D,"F3F9"],
- [0x9F4E,"F6D2"],
- [0x9F4F,"F87E"],
- [0x9F50,"A0FC"],
- [0x9F52,"BEA6"],
- [0x9F53,"9FEE"],
- [0x9F54,"EFB5"],
- [0x9F55,"F1EA"],
- [0x9F56,"F3FA"],
- [0x9F57,"F3FB"],
- [0x9F58,"F3FC"],
- [0x9F59,"F5BE"],
- [0x9F5A,"9F69"],
- [0x9F5B,"F5BA"],
- [0x9F5C,"C568"],
- [0x9F5D,"F5BD"],
- [0x9F5E,"F5BC"],
- [0x9F5F,"C4D4"],
- [0x9F60,"F5BB"],
- [0x9F61,"C4D6"],
- [0x9F62,"91C8"],
- [0x9F63,"C4D5"],
- [0x9F64,"F6D4"],
- [0x9F65,"F6D3"],
- [0x9F66,"C569"],
- [0x9F67,"C56A"],
- [0x9F69,"91C9"],
- [0x9F6A,"C5C6"],
- [0x9F6B,"F7CD"],
- [0x9F6C,"C5C5"],
- [0x9F6E,"F8A3"],
- [0x9F6F,"F8A4"],
- [0x9F70,"F8A2"],
- [0x9F71,"F8A1"],
- [0x9F72,"C654"],
- [0x9F74,"F8EB"],
- [0x9F75,"F8EC"],
- [0x9F76,"F8ED"],
- [0x9F77,"C653"],
- [0x9F78,"F967"],
- [0x9F79,"F96A"],
- [0x9F7A,"F969"],
- [0x9F7B,"F968"],
- [0x9F7E,"F9D3"],
- [0x9F7F,"8DE6"],
- [0x9F8D,"C073"],
- [0x9F8E,"91CB"],
- [0x9F90,"C365"],
- [0x9F91,"F5BF"],
- [0x9F92,"F6D5"],
- [0x9F94,"C5C7"],
- [0x9F95,"F7CE"],
- [0x9F96,"87AC"],
- [0x9F97,"87A4"],
- [0x9F98,"F9D5"],
- [0x9F99,"89C8"],
- [0x9F9C,"C074"],
- [0x9F9F,"8DAA"],
- [0x9FA0,"EFB6"],
- [0x9FA2,"F7CF"],
- [0x9FA4,"F9A1"],
- [0x9FA5,"9FDD"],
- [0x9FA6,"8C43"],
- [0x9FA7,"8C6D"],
- [0x9FA8,"8C74"],
- [0x9FA9,"8CB7"],
- [0x9FAA,"8CB9"],
- [0x9FAB,"8CBB"],
- [0x9FAC,"8CC0"],
- [0x9FAD,"8CD7"],
- [0x9FAE,"8CD8"],
- [0x9FAF,"8CDA"],
- [0x9FB0,"C8A1"],
- [0x9FB1,"C8A3"],
- [0x9FB2,"8CED"],
- [0x9FB3,"8D48"],
- [0x9FC7,"87C2"],
- [0x9FC8,"87D2"],
- [0x9FC9,"87D6"],
- [0x9FCA,"87DA"],
- [0x9FCB,"87DF"],
- [0xF907,"8BF8"],
- [0xFA0C,"C94A"],
- [0xFA0D,"DDFC"],
- [0xFE30,"A14A"],
- [0xFE31,"A157"],
- [0xFE33,"A159"],
- [0xFE34,"A15B"],
- [0xFE35,"A15F"],
- [0xFE36,"A160"],
- [0xFE37,"A163"],
- [0xFE38,"A164"],
- [0xFE39,"A167"],
- [0xFE3A,"A168"],
- [0xFE3B,"A16B"],
- [0xFE3C,"A16C"],
- [0xFE3D,"A16F"],
- [0xFE3E,"A170"],
- [0xFE3F,"A173"],
- [0xFE40,"A174"],
- [0xFE41,"A177"],
- [0xFE42,"A178"],
- [0xFE43,"A17B"],
- [0xFE44,"A17C"],
- [0xFE49,"A1C6"],
- [0xFE4A,"A1C7"],
- [0xFE4B,"A1CA"],
- [0xFE4C,"A1CB"],
- [0xFE4D,"A1C8"],
- [0xFE4E,"A1C9"],
- [0xFE4F,"A15C"],
- [0xFE50,"A14D"],
- [0xFE51,"A14E"],
- [0xFE52,"A14F"],
- [0xFE54,"A151"],
- [0xFE55,"A152"],
- [0xFE56,"A153"],
- [0xFE57,"A154"],
- [0xFE59,"A17D"],
- [0xFE5A,"A17E"],
- [0xFE5B,"A1A1"],
- [0xFE5C,"A1A2"],
- [0xFE5D,"A1A3"],
- [0xFE5E,"A1A4"],
- [0xFE5F,"A1CC"],
- [0xFE60,"A1CD"],
- [0xFE61,"A1CE"],
- [0xFE62,"A1DE"],
- [0xFE63,"A1DF"],
- [0xFE64,"A1E0"],
- [0xFE65,"A1E1"],
- [0xFE66,"A1E2"],
- [0xFE68,"A242"],
- [0xFE69,"A24C"],
- [0xFE6A,"A24D"],
- [0xFE6B,"A24E"],
- [0xFF01,"A149"],
- [0xFF02,"C8D0"],
- [0xFF03,"A1AD"],
- [0xFF04,"A243"],
- [0xFF05,"A248"],
- [0xFF06,"A1AE"],
- [0xFF07,"C8CF"],
- [0xFF08,"A15D"],
- [0xFF09,"A15E"],
- [0xFF0A,"A1AF"],
- [0xFF0B,"A1CF"],
- [0xFF0C,"A141"],
- [0xFF0D,"A1D0"],
- [0xFF0E,"A144"],
- [0xFF0F,"A1FE"],
- [0xFF10,"A2AF"],
- [0xFF11,"A2B0"],
- [0xFF12,"A2B1"],
- [0xFF13,"A2B2"],
- [0xFF14,"A2B3"],
- [0xFF15,"A2B4"],
- [0xFF16,"A2B5"],
- [0xFF17,"A2B6"],
- [0xFF18,"A2B7"],
- [0xFF19,"A2B8"],
- [0xFF1A,"A147"],
- [0xFF1B,"A146"],
- [0xFF1C,"A1D5"],
- [0xFF1D,"A1D7"],
- [0xFF1E,"A1D6"],
- [0xFF1F,"A148"],
- [0xFF20,"A249"],
- [0xFF21,"A2CF"],
- [0xFF22,"A2D0"],
- [0xFF23,"A2D1"],
- [0xFF24,"A2D2"],
- [0xFF25,"A2D3"],
- [0xFF26,"A2D4"],
- [0xFF27,"A2D5"],
- [0xFF28,"A2D6"],
- [0xFF29,"A2D7"],
- [0xFF2A,"A2D8"],
- [0xFF2B,"A2D9"],
- [0xFF2C,"A2DA"],
- [0xFF2D,"A2DB"],
- [0xFF2E,"A2DC"],
- [0xFF2F,"A2DD"],
- [0xFF30,"A2DE"],
- [0xFF31,"A2DF"],
- [0xFF32,"A2E0"],
- [0xFF33,"A2E1"],
- [0xFF34,"A2E2"],
- [0xFF35,"A2E3"],
- [0xFF36,"A2E4"],
- [0xFF37,"A2E5"],
- [0xFF38,"A2E6"],
- [0xFF39,"A2E7"],
- [0xFF3A,"A2E8"],
- [0xFF3B,"C6E4"],
- [0xFF3C,"A240"],
- [0xFF3D,"C6E5"],
- [0xFF3F,"A1C4"],
- [0xFF41,"A2E9"],
- [0xFF42,"A2EA"],
- [0xFF43,"A2EB"],
- [0xFF44,"A2EC"],
- [0xFF45,"A2ED"],
- [0xFF46,"A2EE"],
- [0xFF47,"A2EF"],
- [0xFF48,"A2F0"],
- [0xFF49,"A2F1"],
- [0xFF4A,"A2F2"],
- [0xFF4B,"A2F3"],
- [0xFF4C,"A2F4"],
- [0xFF4D,"A2F5"],
- [0xFF4E,"A2F6"],
- [0xFF4F,"A2F7"],
- [0xFF50,"A2F8"],
- [0xFF51,"A2F9"],
- [0xFF52,"A2FA"],
- [0xFF53,"A2FB"],
- [0xFF54,"A2FC"],
- [0xFF55,"A2FD"],
- [0xFF56,"A2FE"],
- [0xFF57,"A340"],
- [0xFF58,"A341"],
- [0xFF59,"A342"],
- [0xFF5A,"A343"],
- [0xFF5B,"A161"],
- [0xFF5C,"A155"],
- [0xFF5D,"A162"],
- [0xFF5E,"A1E3"],
- [0xFFE0,"A246"],
- [0xFFE1,"A247"],
- [0xFFE2,"C8CD"],
- [0xFFE3,"A1C3"],
- [0xFFE4,"C8CE"],
- [0xFFE5,"A244"],
- [0xFFED,"F9FE"],
- [0x20021,"9C71"],
- [0x2003E,"9375"],
- [0x20046,"9376"],
- [0x2004E,"9548"],
- [0x20068,"8EC6"],
- [0x20086,"8BC5"],
- [0x20087,"8BFA"],
- [0x2008A,"C87C"],
- [0x20094,"9AB4"],
- [0x200CA,"884E"],
- [0x200CB,"884B"],
- [0x200CC,"C87A"],
- [0x200CD,"8848"],
- [0x200D1,"8847"],
- [0x200EE,"A0F6"],
- [0x2010C,"8845"],
- [0x2010E,"8853"],
- [0x20118,"FCAD"],
- [0x201A4,"8CF5"],
- [0x201A9,"8AAD"],
- [0x201AB,"9272"],
- [0x201C1,"FC47"],
- [0x201D4,"94DF"],
- [0x201F2,"9FD1"],
- [0x20204,"FBCB"],
- [0x2020C,"927D"],
- [0x20214,"98A4"],
- [0x20239,"8CF9"],
- [0x2025B,"94E7"],
- [0x20274,"90CB"],
- [0x20275,"927B"],
- [0x20299,"94D8"],
- [0x2029E,"FC5F"],
- [0x202A0,"FA54"],
- [0x202B7,"9AB5"],
- [0x202BF,"96DA"],
- [0x202C0,"9279"],
- [0x202E5,"FA74"],
- [0x2030A,"9275"],
- [0x20325,"8DFB"],
- [0x20341,"8A49"],
- [0x20345,"92DF"],
- [0x20346,"9B7C"],
- [0x20347,"FA63"],
- [0x2037E,"FA60"],
- [0x2037F,"926D"],
- [0x20380,"FA62"],
- [0x203A0,"9AB6"],
- [0x203A7,"976B"],
- [0x203B5,"FD6A"],
- [0x203C9,"FD54"],
- [0x203CB,"9273"],
- [0x203F5,"97D8"],
- [0x203FC,"9FBB"],
- [0x20413,"9342"],
- [0x20414,"9276"],
- [0x2041F,"FA65"],
- [0x20465,"926C"],
- [0x20487,"FA6E"],
- [0x2048E,"9EE0"],
- [0x20491,"92C0"],
- [0x20492,"92BF"],
- [0x204A3,"92BE"],
- [0x204D7,"9ABA"],
- [0x204FC,"8AB3"],
- [0x204FE,"9775"],
- [0x20547,"FA40"],
- [0x2058E,"FA76"],
- [0x205A5,"FBD0"],
- [0x205B3,"FA7B"],
- [0x205C3,"FE6D"],
- [0x205CA,"9BB3"],
- [0x205D0,"89CC"],
- [0x205D5,"9ABE"],
- [0x205DF,"FA42"],
- [0x205E0,"92BC"],
- [0x205EB,"945C"],
- [0x20611,"9BB5"],
- [0x20615,"9ABF"],
- [0x20619,"98A7"],
- [0x2061A,"97A4"],
- [0x20630,"90FD"],
- [0x20656,"FC7B"],
- [0x20676,"9AC0"],
- [0x2070E,"92C3"],
- [0x20731,"8AAA"],
- [0x20779,"9BD0"],
- [0x2082C,"9550"],
- [0x20873,"92C6"],
- [0x208D5,"98A6"],
- [0x20916,"9546"],
- [0x20923,"FD63"],
- [0x20954,"FAC2"],
- [0x20979,"9EC3"],
- [0x209E7,"89B2"],
- [0x20A11,"9C66"],
- [0x20A50,"9053"],
- [0x20A6F,"8C62"],
- [0x20A8A,"87A8"],
- [0x20AB4,"97C1"],
- [0x20AC2,"9AC4"],
- [0x20ACD,"9AC5"],
- [0x20B0D,"8EEF"],
- [0x20B8F,"FAE9"],
- [0x20B9F,"8D40"],
- [0x20BA8,"9262"],
- [0x20BA9,"8AF7"],
- [0x20BBF,"9AC6"],
- [0x20BC6,"92E1"],
- [0x20BCB,"9AC9"],
- [0x20BE2,"FAC6"],
- [0x20BEB,"97A5"],
- [0x20BFB,"9ACB"],
- [0x20BFF,"FA72"],
- [0x20C0B,"8A5E"],
- [0x20C0D,"94E0"],
- [0x20C20,"92CC"],
- [0x20C34,"8AE5"],
- [0x20C3A,"FE5C"],
- [0x20C3B,"9ACC"],
- [0x20C41,"9DF9"],
- [0x20C42,"8A43"],
- [0x20C43,"8AA6"],
- [0x20C53,"9ACD"],
- [0x20C65,"9ACE"],
- [0x20C77,"FAEE"],
- [0x20C78,"9BCC"],
- [0x20C7C,"9ACF"],
- [0x20C8D,"9AD1"],
- [0x20C96,"9DFA"],
- [0x20C9C,"9D7C"],
- [0x20CB5,"9AD3"],
- [0x20CB8,"97A6"],
- [0x20CCF,"995F"],
- [0x20CD3,"FBF6"],
- [0x20CD4,"9FC5"],
- [0x20CD5,"8A59"],
- [0x20CD6,"8B6B"],
- [0x20CDD,"9AD4"],
- [0x20CED,"9AD5"],
- [0x20CFF,"97A2"],
- [0x20D15,"8A44"],
- [0x20D28,"9F4A"],
- [0x20D31,"90A1"],
- [0x20D32,"FDA4"],
- [0x20D46,"8A64"],
- [0x20D47,"8AF2"],
- [0x20D48,"8AF8"],
- [0x20D49,"9DD8"],
- [0x20D4C,"94D6"],
- [0x20D4D,"FAFE"],
- [0x20D4E,"FBA7"],
- [0x20D6F,"9AD6"],
- [0x20D71,"9F4D"],
- [0x20D74,"FAF6"],
- [0x20D7C,"8A57"],
- [0x20D7E,"8B43"],
- [0x20D7F,"8B44"],
- [0x20D96,"8AB6"],
- [0x20D9C,"8AC0"],
- [0x20DA7,"9E54"],
- [0x20DB2,"9AD7"],
- [0x20DC8,"9AD8"],
- [0x20E04,"9ADC"],
- [0x20E09,"8ACA"],
- [0x20E0A,"9EA8"],
- [0x20E0D,"9263"],
- [0x20E0E,"9ADD"],
- [0x20E0F,"8B65"],
- [0x20E10,"8B6F"],
- [0x20E11,"8B7E"],
- [0x20E16,"8F43"],
- [0x20E1D,"92D0"],
- [0x20E4C,"8AF4"],
- [0x20E6D,"9DBE"],
- [0x20E73,"9AE1"],
- [0x20E75,"FCDE"],
- [0x20E76,"9DFD"],
- [0x20E77,"8B66"],
- [0x20E78,"8B70"],
- [0x20E79,"8B75"],
- [0x20E7A,"8AE4"],
- [0x20E7B,"8BA4"],
- [0x20E8C,"8AED"],
- [0x20E96,"8A5D"],
- [0x20E98,"8B48"],
- [0x20E9D,"9DED"],
- [0x20EA2,"9E40"],
- [0x20EAA,"8AEF"],
- [0x20EAB,"8AF6"],
- [0x20EAC,"9E76"],
- [0x20EB6,"9EE3"],
- [0x20ED7,"9ADE"],
- [0x20ED8,"8DFE"],
- [0x20EDD,"FAFC"],
- [0x20EF8,"9CB1"],
- [0x20EF9,"9E77"],
- [0x20EFA,"8B64"],
- [0x20EFB,"8B67"],
- [0x20F1D,"974B"],
- [0x20F26,"9653"],
- [0x20F2D,"9AE0"],
- [0x20F2E,"8B4A"],
- [0x20F30,"8AF1"],
- [0x20F31,"8AD7"],
- [0x20F3B,"A0AB"],
- [0x20F4C,"8AB5"],
- [0x20F64,"8A5F"],
- [0x20F8D,"8AEE"],
- [0x20F90,"9ADF"],
- [0x20FAD,"8AFE"],
- [0x20FB4,"8A58"],
- [0x20FB5,"8BA3"],
- [0x20FB6,"8BA7"],
- [0x20FBC,"9AE3"],
- [0x20FDF,"9261"],
- [0x20FEA,"9DD7"],
- [0x20FEB,"9E7D"],
- [0x20FEC,"9EA7"],
- [0x20FED,"9EAB"],
- [0x21014,"9042"],
- [0x2101D,"8B79"],
- [0x2101E,"8B7A"],
- [0x2104F,"9AE6"],
- [0x2105C,"9AE5"],
- [0x2106F,"8A7E"],
- [0x21075,"9E44"],
- [0x21076,"9AE7"],
- [0x21077,"8A7C"],
- [0x21078,"8B71"],
- [0x2107B,"9AE9"],
- [0x21088,"9AEA"],
- [0x21096,"9AEB"],
- [0x2109D,"8ABD"],
- [0x210B4,"FB4E"],
- [0x210BF,"9AED"],
- [0x210C0,"8AF9"],
- [0x210C1,"9E63"],
- [0x210C7,"8B49"],
- [0x210C8,"8ACE"],
- [0x210C9,"8B6E"],
- [0x210CF,"8AE8"],
- [0x210D3,"9AEE"],
- [0x210E4,"92CE"],
- [0x210F4,"8A5A"],
- [0x210F5,"8B7B"],
- [0x210F6,"8B7C"],
- [0x2112F,"9AEF"],
- [0x2113B,"9AF0"],
- [0x2113D,"8AFA"],
- [0x21145,"8941"],
- [0x21148,"8B72"],
- [0x2114F,"8AF3"],
- [0x21180,"8BA8"],
- [0x21187,"9EAE"],
- [0x211D9,"9E72"],
- [0x2123C,"FB73"],
- [0x2124F,"FB5F"],
- [0x2127C,"90BA"],
- [0x212A8,"91FE"],
- [0x212A9,"9EF6"],
- [0x212B0,"97ED"],
- [0x212E3,"9AF3"],
- [0x212FE,"A0EE"],
- [0x21302,"967C"],
- [0x21303,"9345"],
- [0x21304,"986E"],
- [0x21305,"FA56"],
- [0x21336,"9AF5"],
- [0x2133A,"FC4B"],
- [0x21375,"9AF4"],
- [0x21376,"FEDE"],
- [0x2138E,"FCB7"],
- [0x21398,"97F1"],
- [0x2139C,"97C7"],
- [0x213C5,"9CCB"],
- [0x213C6,"9240"],
- [0x213ED,"9CE8"],
- [0x213FE,"91FD"],
- [0x21413,"974E"],
- [0x21416,"FB68"],
- [0x21424,"976C"],
- [0x2143F,"8CC2"],
- [0x21452,"97E8"],
- [0x21454,"FB6A"],
- [0x21455,"8B74"],
- [0x2148A,"8EE7"],
- [0x21497,"FDC8"],
- [0x214B6,"9241"],
- [0x214E8,"96A1"],
- [0x214FD,"8EF3"],
- [0x21577,"9AF7"],
- [0x21582,"8FA6"],
- [0x21596,"FAD6"],
- [0x2160A,"9CC7"],
- [0x21613,"FAD7"],
- [0x21619,"9AF8"],
- [0x2163E,"FBA1"],
- [0x21661,"8EC5"],
- [0x21692,"FBA4"],
- [0x216B8,"FBC2"],
- [0x216BA,"9AC1"],
- [0x216C0,"91FA"],
- [0x216C1,"FEDB"],
- [0x216C2,"97AB"],
- [0x216D3,"9147"],
- [0x216D5,"FBB1"],
- [0x216DF,"8FEA"],
- [0x216E6,"94D2"],
- [0x216E7,"FE61"],
- [0x216E8,"FACE"],
- [0x216FA,"92ED"],
- [0x216FB,"91F3"],
- [0x216FC,"93C6"],
- [0x216FE,"935A"],
- [0x2170D,"FAFB"],
- [0x21710,"92EF"],
- [0x21726,"FAC8"],
- [0x2173A,"9847"],
- [0x2173B,"9366"],
- [0x2173C,"9855"],
- [0x21757,"96E6"],
- [0x2176C,"9F43"],
- [0x2176D,"9FAA"],
- [0x2176E,"94DA"],
- [0x2176F,"92EE"],
- [0x21770,"FCAF"],
- [0x21771,"FBFB"],
- [0x21773,"8EF9"],
- [0x21774,"91F6"],
- [0x217AB,"9364"],
- [0x217B0,"94F5"],
- [0x217B1,"9CB6"],
- [0x217B2,"FBAD"],
- [0x217B3,"984E"],
- [0x217B4,"8F44"],
- [0x217B5,"96FD"],
- [0x217C3,"9AF9"],
- [0x217C7,"9AFA"],
- [0x217D9,"9769"],
- [0x217DA,"95D4"],
- [0x217DB,"984B"],
- [0x217DC,"FBAA"],
- [0x217DF,"987C"],
- [0x217EF,"91EA"],
- [0x217F5,"9DAF"],
- [0x217F6,"9DC5"],
- [0x217F8,"91F1"],
- [0x217F9,"8EB1"],
- [0x217FA,"97A9"],
- [0x217FB,"FBAC"],
- [0x217FC,"FCB8"],
- [0x21820,"9CB9"],
- [0x21828,"FBB0"],
- [0x21829,"FCD2"],
- [0x2182A,"93CB"],
- [0x2182D,"9AFD"],
- [0x21839,"91F4"],
- [0x2183A,"8BAC"],
- [0x2183B,"A055"],
- [0x21840,"9574"],
- [0x21845,"95BE"],
- [0x21852,"97AD"],
- [0x2185E,"8EE9"],
- [0x21861,"92F8"],
- [0x21862,"97BE"],
- [0x21863,"916C"],
- [0x21864,"94AA"],
- [0x21877,"FC63"],
- [0x2187B,"9DC6"],
- [0x21883,"97B5"],
- [0x21884,"92B8"],
- [0x21885,"91EF"],
- [0x2189E,"FEA6"],
- [0x2189F,"9760"],
- [0x218A0,"9358"],
- [0x218A1,"9576"],
- [0x218A2,"8FAC"],
- [0x218BE,"91EC"],
- [0x218BF,"97B4"],
- [0x218D1,"91F7"],
- [0x218D6,"974A"],
- [0x218D7,"FB49"],
- [0x218D8,"9578"],
- [0x218D9,"93BC"],
- [0x218FA,"91D6"],
- [0x21903,"9355"],
- [0x21904,"9356"],
- [0x21905,"9851"],
- [0x21910,"8FF8"],
- [0x21911,"FBC0"],
- [0x21912,"93F2"],
- [0x21915,"90D0"],
- [0x2191C,"9C44"],
- [0x21922,"9255"],
- [0x21927,"9363"],
- [0x2193B,"91A5"],
- [0x21944,"A0ED"],
- [0x21958,"FD6B"],
- [0x2196A,"9AFE"],
- [0x2197C,"9351"],
- [0x21980,"8C57"],
- [0x21983,"FA78"],
- [0x21988,"FEA8"],
- [0x21996,"9350"],
- [0x219DB,"FA4C"],
- [0x219F3,"92F7"],
- [0x21A2D,"9B40"],
- [0x21A34,"FBCE"],
- [0x21A45,"9B41"],
- [0x21A4B,"FEAD"],
- [0x21A63,"8761"],
- [0x21B44,"FBD5"],
- [0x21BC1,"8BC2"],
- [0x21BC2,"9A7C"],
- [0x21C2A,"9B42"],
- [0x21C70,"9B43"],
- [0x21CA2,"9E79"],
- [0x21CA5,"FBD9"],
- [0x21CAC,"9B44"],
- [0x21D46,"A0A7"],
- [0x21D53,"877B"],
- [0x21D5E,"876E"],
- [0x21D90,"9BF3"],
- [0x21DB6,"8C79"],
- [0x21DBA,"935E"],
- [0x21DCA,"89CB"],
- [0x21DD1,"9F53"],
- [0x21DEB,"93D7"],
- [0x21DF9,"FBE1"],
- [0x21E1C,"FED0"],
- [0x21E23,"8CF1"],
- [0x21E37,"FBE2"],
- [0x21E3D,"FCE3"],
- [0x21E89,"9074"],
- [0x21EA4,"FBE6"],
- [0x21EA8,"9BB7"],
- [0x21EC8,"9B45"],
- [0x21ED5,"9B47"],
- [0x21F0F,"9F50"],
- [0x21F15,"9B48"],
- [0x21F6A,"FC5B"],
- [0x21F9E,"98A9"],
- [0x21FA1,"9CFD"],
- [0x21FE8,"884C"],
- [0x22045,"9B4B"],
- [0x22049,"FBEC"],
- [0x2207E,"8C69"],
- [0x2209A,"9BA8"],
- [0x220C7,"8AD5"],
- [0x220FC,"FA73"],
- [0x2212A,"FD59"],
- [0x2215B,"91A2"],
- [0x22173,"FBED"],
- [0x2217A,"9CA9"],
- [0x221A1,"8AA8"],
- [0x221C1,"8D42"],
- [0x221C3,"9BC3"],
- [0x22208,"8AE1"],
- [0x2227C,"9B4E"],
- [0x22321,"95D0"],
- [0x22325,"905F"],
- [0x223BD,"97EE"],
- [0x223D0,"FC4E"],
- [0x223D7,"9B4F"],
- [0x223FA,"9B50"],
- [0x22465,"9EC6"],
- [0x22471,"FC50"],
- [0x2248B,"FD73"],
- [0x22491,"FDA7"],
- [0x224B0,"9DA2"],
- [0x224BC,"87D1"],
- [0x224C1,"87D3"],
- [0x224C9,"87D4"],
- [0x224CC,"87D5"],
- [0x224ED,"FA58"],
- [0x22513,"FA5E"],
- [0x2251B,"A059"],
- [0x22530,"FA75"],
- [0x22554,"FBBE"],
- [0x2258D,"9CA2"],
- [0x225AF,"9370"],
- [0x225BE,"9371"],
- [0x2261B,"9377"],
- [0x2261C,"FEEF"],
- [0x2262B,"936D"],
- [0x22668,"FC5D"],
- [0x2267A,"90B8"],
- [0x22696,"8AFC"],
- [0x22698,"FB41"],
- [0x226F4,"9E6B"],
- [0x226F5,"94E3"],
- [0x226F6,"8EE2"],
- [0x22712,"8C7D"],
- [0x22714,"8ED7"],
- [0x2271B,"9C4D"],
- [0x2271F,"96A3"],
- [0x2272A,"9B51"],
- [0x22775,"8AC3"],
- [0x22781,"96AA"],
- [0x22796,"8CE2"],
- [0x227B4,"FC68"],
- [0x227B5,"8B6D"],
- [0x227CD,"FD67"],
- [0x22803,"8AE9"],
- [0x2285F,"FCA1"],
- [0x22860,"936C"],
- [0x22871,"9B52"],
- [0x228AD,"FE70"],
- [0x228C1,"FCA8"],
- [0x228F7,"FCE9"],
- [0x22926,"9CB4"],
- [0x22939,"8AEA"],
- [0x2294F,"9B53"],
- [0x22967,"9B55"],
- [0x2296B,"96AB"],
- [0x22980,"FCA7"],
- [0x22993,"9B56"],
- [0x22A66,"8ABC"],
- [0x22ACF,"8ACB"],
- [0x22AD5,"9B57"],
- [0x22AE6,"89CD"],
- [0x22AE8,"9B59"],
- [0x22B0E,"9B5B"],
- [0x22B22,"93A5"],
- [0x22B3F,"9B5D"],
- [0x22B43,"9E4F"],
- [0x22B6A,"93A3"],
- [0x22BCA,"8A7B"],
- [0x22BCE,"8B42"],
- [0x22C26,"9750"],
- [0x22C27,"8FB3"],
- [0x22C38,"8A50"],
- [0x22C4C,"9B60"],
- [0x22C51,"8B45"],
- [0x22C55,"8B46"],
- [0x22C62,"9DFE"],
- [0x22C88,"9B62"],
- [0x22C9B,"937B"],
- [0x22CA1,"93B1"],
- [0x22CA9,"8A60"],
- [0x22CB2,"8AD8"],
- [0x22CB7,"9B63"],
- [0x22CC2,"8A69"],
- [0x22CC6,"8A47"],
- [0x22CC9,"8ACC"],
- [0x22D07,"937C"],
- [0x22D08,"9B65"],
- [0x22D12,"9B66"],
- [0x22D44,"8A72"],
- [0x22D4C,"8A7A"],
- [0x22D67,"93AF"],
- [0x22D8D,"8AB0"],
- [0x22D95,"9B68"],
- [0x22DA0,"9EA3"],
- [0x22DA3,"FAEC"],
- [0x22DA4,"8B77"],
- [0x22DB7,"9B67"],
- [0x22DEE,"8B59"],
- [0x22E0D,"FCB1"],
- [0x22E36,"FCBB"],
- [0x22E42,"9B69"],
- [0x22E78,"93A8"],
- [0x22E8B,"8AE0"],
- [0x22EB3,"9E51"],
- [0x22EEF,"8F5F"],
- [0x22F74,"9B6A"],
- [0x22FCC,"9B6B"],
- [0x22FE3,"97EC"],
- [0x23033,"9B6C"],
- [0x23044,"FE4E"],
- [0x2304B,"FDC2"],
- [0x23066,"9B6D"],
- [0x2307D,"9167"],
- [0x2307E,"FCCC"],
- [0x2308E,"93B6"],
- [0x230B7,"90E4"],
- [0x230BC,"90E5"],
- [0x230DA,"9EF2"],
- [0x23103,"93CA"],
- [0x2313D,"8BBC"],
- [0x2317D,"8F46"],
- [0x23182,"93CF"],
- [0x231A4,"FCDB"],
- [0x231A5,"FCDC"],
- [0x231B3,"93C0"],
- [0x231C8,"FCE6"],
- [0x231C9,"96E7"],
- [0x231EA,"87A7"],
- [0x231F7,"FCD8"],
- [0x231F8,"FCD9"],
- [0x231F9,"FDA6"],
- [0x2320F,"93CE"],
- [0x23225,"95F1"],
- [0x2322F,"9CE9"],
- [0x23231,"FCE4"],
- [0x23232,"94AF"],
- [0x23233,"FA77"],
- [0x23234,"93CC"],
- [0x23256,"8CE1"],
- [0x2325E,"87A9"],
- [0x23262,"905A"],
- [0x23281,"8C54"],
- [0x23289,"93BF"],
- [0x2328A,"FB51"],
- [0x232AB,"93B9"],
- [0x232AC,"FED7"],
- [0x232AD,"93B7"],
- [0x232D2,"93D9"],
- [0x232E0,"93BB"],
- [0x232E1,"93DA"],
- [0x23300,"98A3"],
- [0x2330A,"90D1"],
- [0x2331F,"9B6E"],
- [0x233B4,"FA70"],
- [0x233CC,"9BEB"],
- [0x233DE,"9B6F"],
- [0x233E6,"FCFC"],
- [0x233F4,"8B40"],
- [0x233F5,"A07B"],
- [0x233F9,"8CA1"],
- [0x233FA,"97F7"],
- [0x233FE,"93E2"],
- [0x23400,"FCD6"],
- [0x2343F,"9559"],
- [0x23450,"93A6"],
- [0x2346F,"FD40"],
- [0x23472,"935F"],
- [0x234E5,"97F2"],
- [0x23519,"9C76"],
- [0x23530,"8EF8"],
- [0x23551,"8CEB"],
- [0x2355A,"8F47"],
- [0x23567,"9B74"],
- [0x23595,"92B4"],
- [0x23599,"91ED"],
- [0x2359C,"96D2"],
- [0x235BB,"87D8"],
- [0x235CD,"FD46"],
- [0x235CE,"8F4F"],
- [0x235CF,"9549"],
- [0x235F3,"9B75"],
- [0x23600,"FA5C"],
- [0x23617,"8751"],
- [0x2361A,"9B79"],
- [0x2363C,"FD4B"],
- [0x23640,"96D3"],
- [0x23659,"FD58"],
- [0x2365F,"945F"],
- [0x23677,"A0F5"],
- [0x2368E,"87C7"],
- [0x2369E,"877C"],
- [0x236A6,"9243"],
- [0x236AD,"97FA"],
- [0x236BA,"9DD9"],
- [0x236DF,"97F4"],
- [0x236EE,"924D"],
- [0x23703,"FD5B"],
- [0x23716,"9B7A"],
- [0x23720,"9ED5"],
- [0x2372D,"FAAE"],
- [0x2372F,"9CC9"],
- [0x2373F,"9258"],
- [0x23766,"8EC8"],
- [0x23781,"94B4"],
- [0x237A2,"93E1"],
- [0x237BC,"93DF"],
- [0x237C2,"FCF0"],
- [0x237D5,"93EC"],
- [0x237D6,"97F6"],
- [0x237D7,"96CF"],
- [0x2383A,"93DE"],
- [0x239C2,"8ACF"],
- [0x23AA7,"9BA2"],
- [0x23ADB,"FD69"],
- [0x23AEE,"9352"],
- [0x23AFA,"98A2"],
- [0x23B1A,"8CE7"],
- [0x23B5A,"FD6E"],
- [0x23C63,"8CA4"],
- [0x23C99,"FA7C"],
- [0x23C9A,"93FA"],
- [0x23C9B,"907C"],
- [0x23CB5,"8F67"],
- [0x23CB7,"9DB7"],
- [0x23CC7,"A0E9"],
- [0x23CC8,"FA4E"],
- [0x23CC9,"FDA1"],
- [0x23CFC,"9E74"],
- [0x23CFD,"9FBF"],
- [0x23CFE,"9ECB"],
- [0x23CFF,"9BB9"],
- [0x23D40,"9DD4"],
- [0x23D5B,"97B9"],
- [0x23D7E,"8EF1"],
- [0x23D8F,"957B"],
- [0x23DB6,"9ED2"],
- [0x23DB7,"9753"],
- [0x23DB8,"96A4"],
- [0x23DB9,"8FBE"],
- [0x23DBA,"94D9"],
- [0x23DBB,"9058"],
- [0x23DBC,"FD79"],
- [0x23DBD,"FD7B"],
- [0x23DE3,"8EDA"],
- [0x23DF8,"8EFA"],
- [0x23E06,"8762"],
- [0x23E11,"9BA5"],
- [0x23E2C,"9ED9"],
- [0x23E2D,"97D4"],
- [0x23E2E,"90BB"],
- [0x23E2F,"FDBC"],
- [0x23E30,"FDC6"],
- [0x23E31,"9248"],
- [0x23E39,"92B5"],
- [0x23E88,"9DC1"],
- [0x23E89,"92B9"],
- [0x23E8A,"92A6"],
- [0x23E8B,"8F4B"],
- [0x23EB9,"9BA6"],
- [0x23EBF,"92B6"],
- [0x23ED7,"8E40"],
- [0x23EF7,"9ED8"],
- [0x23EF8,"945E"],
- [0x23EF9,"985F"],
- [0x23EFA,"94CE"],
- [0x23EFB,"924A"],
- [0x23EFC,"FD70"],
- [0x23F35,"9467"],
- [0x23F41,"8DEC"],
- [0x23F4A,"9BD8"],
- [0x23F61,"8763"],
- [0x23F7F,"9448"],
- [0x23F80,"FAC1"],
- [0x23F81,"9CF7"],
- [0x23F82,"FDBE"],
- [0x23F8F,"8FDA"],
- [0x23FB4,"FDD9"],
- [0x23FB7,"FC7E"],
- [0x23FC0,"93F9"],
- [0x23FC5,"FA43"],
- [0x23FEB,"FAEB"],
- [0x23FEC,"FAC3"],
- [0x23FED,"97D3"],
- [0x23FEE,"95F9"],
- [0x23FEF,"9C48"],
- [0x23FF0,"FDD8"],
- [0x24011,"A0D8"],
- [0x24039,"FDD7"],
- [0x2403A,"FB4A"],
- [0x2403B,"9BAF"],
- [0x2403C,"944B"],
- [0x2403D,"FDC9"],
- [0x24057,"8EAC"],
- [0x24085,"FDB2"],
- [0x2408B,"925A"],
- [0x2408C,"FCBD"],
- [0x2408D,"92D9"],
- [0x24091,"FDD5"],
- [0x240C9,"92DD"],
- [0x240E1,"9259"],
- [0x240EC,"8CF0"],
- [0x24104,"96BA"],
- [0x2410F,"925B"],
- [0x24119,"9BAB"],
- [0x2413F,"FDDA"],
- [0x24140,"FDDE"],
- [0x24144,"FDD3"],
- [0x2414E,"8C46"],
- [0x24155,"FDD6"],
- [0x24156,"FDDC"],
- [0x24157,"FDDD"],
- [0x2415C,"90FE"],
- [0x2415F,"FEA1"],
- [0x24161,"87A5"],
- [0x24177,"8BAD"],
- [0x2417A,"9CD8"],
- [0x241A3,"9E6D"],
- [0x241A4,"FD7C"],
- [0x241A5,"FB61"],
- [0x241AC,"96F8"],
- [0x241B5,"96F0"],
- [0x241CD,"FCF4"],
- [0x241E2,"FE60"],
- [0x241FC,"9852"],
- [0x2421B,"964F"],
- [0x2424B,"916E"],
- [0x24256,"986D"],
- [0x24259,"9864"],
- [0x24276,"9453"],
- [0x24277,"FDEC"],
- [0x24278,"FB78"],
- [0x24284,"95BA"],
- [0x24293,"985D"],
- [0x24295,"92F9"],
- [0x242A5,"985A"],
- [0x242BF,"8750"],
- [0x242C1,"FDF6"],
- [0x242C9,"93D0"],
- [0x242CA,"9862"],
- [0x242EE,"9BAD"],
- [0x242FA,"974F"],
- [0x2430D,"9BAE"],
- [0x2431A,"9452"],
- [0x24334,"9BB0"],
- [0x24348,"91D2"],
- [0x24362,"97EA"],
- [0x24363,"FB6B"],
- [0x24364,"91B1"],
- [0x24365,"FDF3"],
- [0x2438C,"92CB"],
- [0x24396,"9BB1"],
- [0x2439C,"FCEC"],
- [0x243BD,"986B"],
- [0x243C1,"9751"],
- [0x243E9,"9871"],
- [0x243EA,"95EF"],
- [0x243F2,"9EF3"],
- [0x243F8,"91E8"],
- [0x24404,"9BBA"],
- [0x24435,"FB4C"],
- [0x24436,"926A"],
- [0x2445A,"FDF8"],
- [0x2445B,"9861"],
- [0x24473,"91E7"],
- [0x24487,"93ED"],
- [0x24488,"9744"],
- [0x244B9,"91E1"],
- [0x244BC,"FBF5"],
- [0x244CE,"9869"],
- [0x244D3,"8A62"],
- [0x244D6,"9BBB"],
- [0x24505,"8CA8"],
- [0x24521,"9C55"],
- [0x24578,"8E77"],
- [0x245C8,"8AB2"],
- [0x24618,"9EBC"],
- [0x2462A,"93E6"],
- [0x24665,"93A2"],
- [0x24674,"9BBD"],
- [0x24697,"94B3"],
- [0x246D4,"937D"],
- [0x24706,"9E66"],
- [0x24725,"9459"],
- [0x2472F,"9BBF"],
- [0x2478F,"9458"],
- [0x247E0,"9EA5"],
- [0x24812,"9BC7"],
- [0x24823,"FE54"],
- [0x24882,"8E74"],
- [0x248E9,"8BD6"],
- [0x248F0,"94B6"],
- [0x248F1,"FD74"],
- [0x248F2,"98C0"],
- [0x248F3,"94A5"],
- [0x248FB,"9BC8"],
- [0x248FF,"95ED"],
- [0x24900,"FD7E"],
- [0x24901,"FBEB"],
- [0x2490C,"FD7D"],
- [0x24916,"976F"],
- [0x24917,"9461"],
- [0x24919,"9FC1"],
- [0x2492F,"95D7"],
- [0x24933,"FA52"],
- [0x24934,"9C58"],
- [0x2493E,"9F68"],
- [0x2493F,"9BE7"],
- [0x24940,"FCCE"],
- [0x24941,"96E8"],
- [0x24942,"FA49"],
- [0x24943,"97A1"],
- [0x24962,"954D"],
- [0x24963,"9EF8"],
- [0x24974,"FE49"],
- [0x24975,"91CE"],
- [0x24976,"9771"],
- [0x2497B,"8CCF"],
- [0x2497F,"FDB1"],
- [0x24982,"FC6E"],
- [0x24988,"9CF2"],
- [0x24989,"93B8"],
- [0x2498A,"9043"],
- [0x2498B,"9759"],
- [0x2498C,"94D7"],
- [0x2498D,"FE66"],
- [0x2498E,"947D"],
- [0x2498F,"FC6F"],
- [0x24994,"9246"],
- [0x249A4,"FA6D"],
- [0x249A7,"8EF7"],
- [0x249A9,"FBB7"],
- [0x249AB,"947C"],
- [0x249AC,"92CD"],
- [0x249AD,"97B2"],
- [0x249B7,"FE65"],
- [0x249B8,"967E"],
- [0x249B9,"9758"],
- [0x249BA,"9B77"],
- [0x249BB,"91CF"],
- [0x249C5,"94A4"],
- [0x249D0,"9CAD"],
- [0x249DA,"8BAB"],
- [0x249DE,"96D5"],
- [0x249DF,"FCB3"],
- [0x249E3,"93AE"],
- [0x249E5,"976D"],
- [0x249EC,"9446"],
- [0x249ED,"95F7"],
- [0x249F6,"9C46"],
- [0x249F7,"955B"],
- [0x249F8,"91D1"],
- [0x249F9,"94F4"],
- [0x249FB,"FE67"],
- [0x24A0E,"92A5"],
- [0x24A12,"FEDF"],
- [0x24A13,"8CAB"],
- [0x24A15,"9BC9"],
- [0x24A21,"FCED"],
- [0x24A22,"FDFA"],
- [0x24A23,"FCC8"],
- [0x24A24,"FE62"],
- [0x24A25,"91FC"],
- [0x24A26,"FE6B"],
- [0x24A27,"FDF9"],
- [0x24A28,"FCC7"],
- [0x24A29,"914E"],
- [0x24A2A,"9CB8"],
- [0x24A3E,"9767"],
- [0x24A42,"95EE"],
- [0x24A45,"9BB2"],
- [0x24A4A,"9460"],
- [0x24A4E,"94A2"],
- [0x24A4F,"9875"],
- [0x24A50,"97AC"],
- [0x24A51,"91D3"],
- [0x24A5D,"987B"],
- [0x24A65,"8EEB"],
- [0x24A66,"976A"],
- [0x24A67,"965E"],
- [0x24A71,"97EB"],
- [0x24A77,"9FF9"],
- [0x24A78,"95F8"],
- [0x24A79,"FEA2"],
- [0x24A7A,"8FE6"],
- [0x24A8C,"FE7E"],
- [0x24A93,"9DA4"],
- [0x24A94,"9768"],
- [0x24A95,"8EEC"],
- [0x24A96,"94BD"],
- [0x24AA4,"945B"],
- [0x24AA5,"9CF6"],
- [0x24AA6,"FAA7"],
- [0x24AA7,"9BD9"],
- [0x24AB1,"FA5D"],
- [0x24AB2,"9656"],
- [0x24AB3,"9762"],
- [0x24ABA,"94BA"],
- [0x24ABB,"A04F"],
- [0x24ABC,"92D8"],
- [0x24AC0,"9BCB"],
- [0x24AC7,"94BB"],
- [0x24ACA,"9D5F"],
- [0x24AD1,"90CF"],
- [0x24ADF,"9465"],
- [0x24AE2,"9F4C"],
- [0x24AE9,"90D8"],
- [0x24B0F,"8D5B"],
- [0x24B6E,"9EBE"],
- [0x24BF5,"FB6D"],
- [0x24C09,"95CA"],
- [0x24C9E,"9DC2"],
- [0x24C9F,"97F8"],
- [0x24CC9,"8FFC"],
- [0x24CD9,"9473"],
- [0x24D06,"9474"],
- [0x24D13,"FEB7"],
- [0x24DB8,"8A4B"],
- [0x24DEA,"8A55"],
- [0x24DEB,"8B69"],
- [0x24E3B,"8ADC"],
- [0x24E50,"8B76"],
- [0x24EA5,"9BCE"],
- [0x24EA7,"8A68"],
- [0x24F0E,"A0F8"],
- [0x24F5C,"98DF"],
- [0x24F82,"FEB5"],
- [0x24F86,"9BCF"],
- [0x24F97,"96FB"],
- [0x24F9A,"9BFB"],
- [0x24FA9,"9ECE"],
- [0x24FB8,"8EE5"],
- [0x24FC2,"9E7B"],
- [0x2502C,"9BD2"],
- [0x25052,"8AA5"],
- [0x2509D,"FECE"],
- [0x2512B,"8A45"],
- [0x25148,"9DFC"],
- [0x2517D,"FECF"],
- [0x2517E,"8BA5"],
- [0x251CD,"8C4A"],
- [0x251E3,"8AEC"],
- [0x251E6,"FCE0"],
- [0x251E7,"94AD"],
- [0x25220,"FED5"],
- [0x25221,"94AC"],
- [0x25250,"FC5A"],
- [0x25299,"9BD6"],
- [0x252C7,"8A6F"],
- [0x252D8,"8BA9"],
- [0x2530E,"8E5F"],
- [0x25311,"9DCB"],
- [0x25313,"FCE7"],
- [0x25419,"9BD7"],
- [0x25425,"93C8"],
- [0x2542F,"91F0"],
- [0x25430,"8FE0"],
- [0x25446,"9BDB"],
- [0x2546C,"90ED"],
- [0x2546E,"9BDC"],
- [0x2549A,"8D53"],
- [0x25531,"A0EC"],
- [0x25535,"98FA"],
- [0x2553F,"9BE0"],
- [0x2555B,"93C7"],
- [0x2555C,"9249"],
- [0x2555D,"96E1"],
- [0x2555E,"9BE2"],
- [0x25562,"9BE4"],
- [0x25565,"8FE1"],
- [0x25566,"9BE5"],
- [0x25581,"94C0"],
- [0x25584,"93C3"],
- [0x2558F,"93C5"],
- [0x255B9,"9079"],
- [0x255D5,"977B"],
- [0x255DB,"907E"],
- [0x255E0,"FEE6"],
- [0x25605,"FE46"],
- [0x25635,"9DB8"],
- [0x25651,"9270"],
- [0x25683,"95A8"],
- [0x25695,"8CB0"],
- [0x256E3,"94C8"],
- [0x256F6,"98B9"],
- [0x25706,"9140"],
- [0x2571D,"FCBE"],
- [0x25725,"9157"],
- [0x2573D,"8BB2"],
- [0x25772,"FADF"],
- [0x257C7,"9BE6"],
- [0x257DF,"9643"],
- [0x257E0,"8E44"],
- [0x257E1,"9C4F"],
- [0x25857,"FEF4"],
- [0x2585D,"9BE8"],
- [0x25872,"93DC"],
- [0x258C8,"966F"],
- [0x258DE,"87A1"],
- [0x258E1,"8E4A"],
- [0x25903,"9BED"],
- [0x25946,"92F6"],
- [0x25956,"9DB9"],
- [0x259AC,"8E4E"],
- [0x259CC,"FBCF"],
- [0x25A54,"8760"],
- [0x25A95,"9EC2"],
- [0x25A9C,"94E5"],
- [0x25AAE,"9BF0"],
- [0x25AAF,"94E4"],
- [0x25AE9,"9551"],
- [0x25B74,"8BBB"],
- [0x25B89,"9BF1"],
- [0x25BB3,"94F0"],
- [0x25BB4,"8E64"],
- [0x25BC6,"94EA"],
- [0x25BE4,"8F61"],
- [0x25BE8,"9B64"],
- [0x25C01,"8E5B"],
- [0x25C06,"9BF2"],
- [0x25C21,"9FBE"],
- [0x25C4A,"9DC9"],
- [0x25C65,"8E6C"],
- [0x25C91,"8F73"],
- [0x25CA4,"8CAF"],
- [0x25CC0,"8F75"],
- [0x25CC1,"8E71"],
- [0x25CFE,"8E60"],
- [0x25D20,"8E6A"],
- [0x25D30,"8C4C"],
- [0x25D43,"9552"],
- [0x25D99,"87CF"],
- [0x25DB9,"87C0"],
- [0x25E0E,"9554"],
- [0x25E49,"8AD4"],
- [0x25E81,"9DBB"],
- [0x25E82,"9543"],
- [0x25E83,"92FE"],
- [0x25EA6,"94F2"],
- [0x25EBC,"94F1"],
- [0x25ED7,"A0EA"],
- [0x25ED8,"9DD2"],
- [0x25F1A,"A0B1"],
- [0x25F4B,"91F8"],
- [0x25FE1,"9462"],
- [0x25FE2,"9BA4"],
- [0x26021,"877D"],
- [0x26029,"8EAD"],
- [0x26048,"9EAD"],
- [0x26064,"96D0"],
- [0x26083,"FEEE"],
- [0x26097,"8AB4"],
- [0x260A4,"9757"],
- [0x260A5,"8A77"],
- [0x26102,"9BF7"],
- [0x26121,"8EB5"],
- [0x26159,"A06D"],
- [0x2615A,"8EB6"],
- [0x2615B,"9756"],
- [0x2615C,"9540"],
- [0x261AD,"A0F3"],
- [0x261AE,"94BE"],
- [0x261B2,"9BFA"],
- [0x261DD,"FDDF"],
- [0x26258,"9DBC"],
- [0x26261,"94FE"],
- [0x2626A,"8BDB"],
- [0x2626B,"A0FE"],
- [0x262D0,"8EC0"],
- [0x26335,"9F47"],
- [0x2634B,"8BDE"],
- [0x2634C,"A0FB"],
- [0x26351,"8EC3"],
- [0x263BE,"9649"],
- [0x263F5,"FEC2"],
- [0x263F8,"954C"],
- [0x26402,"9BFD"],
- [0x26410,"90CC"],
- [0x26411,"9C60"],
- [0x26412,"954B"],
- [0x2644A,"9BFE"],
- [0x26469,"9C70"],
- [0x26484,"9C43"],
- [0x26488,"9C47"],
- [0x26489,"8ECC"],
- [0x2648D,"8E54"],
- [0x26498,"8EE4"],
- [0x26512,"9C49"],
- [0x26572,"8B5E"],
- [0x265A0,"955E"],
- [0x265AD,"955C"],
- [0x265BF,"9C4B"],
- [0x26612,"8BE1"],
- [0x26626,"8ED9"],
- [0x266AF,"9DB4"],
- [0x266B1,"925F"],
- [0x266B5,"9C4C"],
- [0x266DA,"8AA1"],
- [0x266E8,"8EDB"],
- [0x266FC,"9C56"],
- [0x26716,"8AA2"],
- [0x26741,"9754"],
- [0x26799,"9C5E"],
- [0x267B3,"9ED4"],
- [0x267B4,"9568"],
- [0x267CC,"A0C3"],
- [0x2681C,"8AE6"],
- [0x26846,"A0F7"],
- [0x2685E,"9C61"],
- [0x2686E,"9C5F"],
- [0x26888,"FC4D"],
- [0x2688A,"9E5B"],
- [0x26893,"9E69"],
- [0x268C7,"9C63"],
- [0x2690E,"FEC7"],
- [0x26911,"FEC6"],
- [0x26926,"9C67"],
- [0x26939,"9C69"],
- [0x26951,"8BE2"],
- [0x269A8,"9165"],
- [0x269B5,"9CE7"],
- [0x269F2,"8A54"],
- [0x269FA,"9C6C"],
- [0x26A2D,"9C6E"],
- [0x26A2E,"FE5D"],
- [0x26A34,"9C73"],
- [0x26A42,"956A"],
- [0x26A51,"956D"],
- [0x26A52,"8EF0"],
- [0x26B05,"8F4D"],
- [0x26B0A,"8EF6"],
- [0x26B13,"FABC"],
- [0x26B15,"8CD5"],
- [0x26B23,"875E"],
- [0x26B28,"FBDA"],
- [0x26B50,"8B4C"],
- [0x26B51,"FD75"],
- [0x26B52,"9BDD"],
- [0x26B53,"FAF5"],
- [0x26B5B,"9C74"],
- [0x26B75,"9545"],
- [0x26B82,"96C6"],
- [0x26B96,"8F6A"],
- [0x26B97,"8F4E"],
- [0x26B9D,"9C78"],
- [0x26BB3,"FA55"],
- [0x26BC0,"97E4"],
- [0x26BF7,"9C41"],
- [0x26C21,"925C"],
- [0x26C40,"96FA"],
- [0x26C41,"8CF6"],
- [0x26C46,"8D4D"],
- [0x26C7E,"FB66"],
- [0x26C7F,"8E65"],
- [0x26C80,"9849"],
- [0x26C81,"FBA8"],
- [0x26C82,"9842"],
- [0x26CA4,"9C7A"],
- [0x26CB7,"97FB"],
- [0x26CB8,"90CA"],
- [0x26CBD,"9C5B"],
- [0x26CC0,"974D"],
- [0x26CC3,"8ED3"],
- [0x26CD1,"9561"],
- [0x26D22,"9F4B"],
- [0x26D23,"9FB5"],
- [0x26D24,"93D2"],
- [0x26D25,"FDAA"],
- [0x26D26,"9840"],
- [0x26D27,"9146"],
- [0x26D28,"9867"],
- [0x26D29,"FA5A"],
- [0x26D2A,"FBA9"],
- [0x26D51,"9841"],
- [0x26D74,"8CD3"],
- [0x26DA0,"FCFD"],
- [0x26DA1,"FDAB"],
- [0x26DA2,"91BD"],
- [0x26DA3,"8F4C"],
- [0x26DA4,"96C9"],
- [0x26DA5,"8F55"],
- [0x26DA6,"FBAE"],
- [0x26DA7,"956F"],
- [0x26DAE,"9C7D"],
- [0x26DDC,"A0F0"],
- [0x26DEA,"946F"],
- [0x26DEB,"FDAC"],
- [0x26DF0,"96CB"],
- [0x26E00,"96CE"],
- [0x26E05,"A056"],
- [0x26E07,"9CE1"],
- [0x26E12,"96C4"],
- [0x26E42,"8F5E"],
- [0x26E43,"8F6C"],
- [0x26E44,"8EA3"],
- [0x26E45,"FBB3"],
- [0x26E6E,"FC53"],
- [0x26E72,"FDB3"],
- [0x26E77,"8F6B"],
- [0x26E84,"96CA"],
- [0x26E88,"87CD"],
- [0x26E8B,"8753"],
- [0x26E99,"8F79"],
- [0x26ED0,"9E6F"],
- [0x26ED1,"A0C5"],
- [0x26ED2,"FC78"],
- [0x26ED3,"8E42"],
- [0x26ED4,"8F5A"],
- [0x26ED5,"90C2"],
- [0x26ED6,"8EA5"],
- [0x26ED7,"9061"],
- [0x26F26,"924F"],
- [0x26F73,"9373"],
- [0x26F74,"FDB5"],
- [0x26F9F,"FECC"],
- [0x26FA1,"FBBD"],
- [0x26FBE,"8CD6"],
- [0x26FDE,"9843"],
- [0x26FDF,"96C5"],
- [0x2700E,"89BC"],
- [0x2704B,"9CA3"],
- [0x27052,"924B"],
- [0x27053,"984A"],
- [0x27088,"8FA4"],
- [0x270AD,"A0F1"],
- [0x270AE,"9EFB"],
- [0x270AF,"9CD2"],
- [0x270CD,"8FA7"],
- [0x270D2,"8754"],
- [0x270F8,"FC5C"],
- [0x27109,"9845"],
- [0x2710C,"9046"],
- [0x2710D,"8CD1"],
- [0x27126,"FEFA"],
- [0x27127,"9560"],
- [0x27164,"9F48"],
- [0x27165,"9247"],
- [0x27175,"90FB"],
- [0x271CD,"9CA4"],
- [0x2721B,"9571"],
- [0x27267,"8745"],
- [0x27280,"9CA6"],
- [0x27285,"9CA7"],
- [0x2728B,"9CAA"],
- [0x272B2,"9ED3"],
- [0x272B6,"9E70"],
- [0x272E6,"9CAC"],
- [0x27352,"8752"],
- [0x2739A,"8FAE"],
- [0x273FF,"8D50"],
- [0x27422,"957D"],
- [0x27450,"9CB0"],
- [0x27484,"97B6"],
- [0x27486,"A0BD"],
- [0x27574,"8ADF"],
- [0x275A3,"9EAA"],
- [0x275E0,"8FBD"],
- [0x275E4,"8FBF"],
- [0x275FD,"9369"],
- [0x275FE,"9BA7"],
- [0x27607,"C8A4"],
- [0x2760C,"FEEA"],
- [0x27632,"9BE1"],
- [0x27639,"8B41"],
- [0x27655,"9DB6"],
- [0x27656,"A0EB"],
- [0x27657,"9BA3"],
- [0x27694,"8BA1"],
- [0x2770F,"8FC8"],
- [0x27735,"894C"],
- [0x27736,"9860"],
- [0x27741,"94C7"],
- [0x2775E,"8B58"],
- [0x27784,"95AB"],
- [0x27785,"95AA"],
- [0x277CC,"9CC3"],
- [0x27858,"9CC4"],
- [0x27870,"93D6"],
- [0x2789D,"9DAC"],
- [0x278B2,"8BE6"],
- [0x278C8,"8A71"],
- [0x27924,"8FD1"],
- [0x27967,"99D5"],
- [0x2797A,"90F4"],
- [0x279A0,"8AA3"],
- [0x279DD,"9CCE"],
- [0x279FD,"9CD4"],
- [0x27A0A,"9CD5"],
- [0x27A0E,"FBC8"],
- [0x27A3E,"9DB3"],
- [0x27A53,"FC70"],
- [0x27A59,"8FD7"],
- [0x27A79,"9B73"],
- [0x27A84,"FA5B"],
- [0x27ABD,"8FD2"],
- [0x27ABE,"9064"],
- [0x27AF4,"98B6"],
- [0x27B06,"9668"],
- [0x27B0B,"9CD6"],
- [0x27B18,"98BD"],
- [0x27B38,"8FDC"],
- [0x27B39,"FEF6"],
- [0x27B3A,"8FD9"],
- [0x27B48,"9541"],
- [0x27B65,"87CA"],
- [0x27BEF,"876C"],
- [0x27BF4,"97F3"],
- [0x27C12,"9BF8"],
- [0x27C6C,"875A"],
- [0x27CB1,"8748"],
- [0x27CC5,"874A"],
- [0x27D2F,"9E6C"],
- [0x27D53,"8FF2"],
- [0x27D54,"8FEE"],
- [0x27D66,"9CD7"],
- [0x27D73,"9E6E"],
- [0x27D84,"8A40"],
- [0x27D8F,"8FEF"],
- [0x27D98,"8FF4"],
- [0x27DBD,"8FF5"],
- [0x27DDC,"95C2"],
- [0x27E4D,"986A"],
- [0x27E4F,"97CF"],
- [0x27F2E,"9EE5"],
- [0x27FF9,"9E7C"],
- [0x28002,"9041"],
- [0x28009,"9CDB"],
- [0x2801E,"9441"],
- [0x28023,"9CE6"],
- [0x28024,"9DB0"],
- [0x28048,"9CEA"],
- [0x28083,"9CED"],
- [0x28090,"9CFA"],
- [0x280BD,"8B62"],
- [0x280BE,"8A4E"],
- [0x280E8,"9CCA"],
- [0x280E9,"8A66"],
- [0x280F4,"9CFB"],
- [0x2812E,"9CFC"],
- [0x2814F,"9CFE"],
- [0x2815D,"8A53"],
- [0x2816F,"9CE5"],
- [0x28189,"9D40"],
- [0x281AF,"9D41"],
- [0x281BC,"9045"],
- [0x28207,"8B73"],
- [0x28218,"97CA"],
- [0x2821A,"9D42"],
- [0x28256,"8A61"],
- [0x2827C,"8BAE"],
- [0x2829B,"8AD2"],
- [0x282CD,"8BA2"],
- [0x282E2,"9DF2"],
- [0x28306,"9D43"],
- [0x28318,"9CDF"],
- [0x2832F,"9D44"],
- [0x2833A,"8ECA"],
- [0x28365,"904E"],
- [0x2836D,"8EB3"],
- [0x2837D,"9FF5"],
- [0x2838A,"9D45"],
- [0x28412,"904F"],
- [0x28468,"9D47"],
- [0x2846C,"89CA"],
- [0x28473,"9CB5"],
- [0x28482,"FBFE"],
- [0x28501,"905E"],
- [0x2853C,"9063"],
- [0x2853D,"9057"],
- [0x2856C,"9066"],
- [0x285E8,"9BC0"],
- [0x285F4,"FCE5"],
- [0x28600,"9162"],
- [0x2860B,"9067"],
- [0x28625,"8FA1"],
- [0x2863B,"8FA2"],
- [0x286AA,"9D48"],
- [0x286AB,"FAD3"],
- [0x286B2,"8D4F"],
- [0x286BC,"905D"],
- [0x286D8,"90B9"],
- [0x286E6,"906B"],
- [0x2870F,"8C5C"],
- [0x28713,"9069"],
- [0x28804,"FE57"],
- [0x2882B,"FE55"],
- [0x2890D,"87A6"],
- [0x28933,"9073"],
- [0x28948,"9BEF"],
- [0x28949,"9CF0"],
- [0x28956,"9D4B"],
- [0x28964,"FED9"],
- [0x28968,"FEDA"],
- [0x2896C,"91E0"],
- [0x2896D,"8D43"],
- [0x2897E,"91D8"],
- [0x28989,"9646"],
- [0x289A8,"9360"],
- [0x289AA,"FA53"],
- [0x289AB,"9CD3"],
- [0x289B8,"9D4E"],
- [0x289BC,"FB40"],
- [0x289C0,"8DE2"],
- [0x289DC,"9442"],
- [0x289DE,"9056"],
- [0x289E1,"9865"],
- [0x289E3,"8C6C"],
- [0x289E4,"FA4A"],
- [0x289E7,"9D50"],
- [0x289E8,"9D52"],
- [0x289F9,"95AF"],
- [0x289FA,"975A"],
- [0x289FB,"9349"],
- [0x289FC,"9747"],
- [0x28A0F,"A0F4"],
- [0x28A16,"9778"],
- [0x28A25,"8FCF"],
- [0x28A29,"FC60"],
- [0x28A32,"8C4E"],
- [0x28A36,"FC56"],
- [0x28A44,"91DC"],
- [0x28A45,"9661"],
- [0x28A46,"92EC"],
- [0x28A47,"935D"],
- [0x28A48,"8EDE"],
- [0x28A49,"96FE"],
- [0x28A4A,"FD4F"],
- [0x28A4B,"95DE"],
- [0x28A59,"98B0"],
- [0x28A5A,"A040"],
- [0x28A81,"97BD"],
- [0x28A82,"977D"],
- [0x28A83,"97F5"],
- [0x28A9A,"9BAC"],
- [0x28A9B,"FADA"],
- [0x28A9C,"92C2"],
- [0x28AC0,"97B1"],
- [0x28AC6,"907B"],
- [0x28ACB,"93FE"],
- [0x28ACC,"947B"],
- [0x28ACE,"9777"],
- [0x28ADE,"FABE"],
- [0x28ADF,"FD43"],
- [0x28AE0,"90C6"],
- [0x28AE1,"90A4"],
- [0x28AE2,"90A8"],
- [0x28AE3,"94A9"],
- [0x28AE5,"90A9"],
- [0x28AEA,"8C65"],
- [0x28AFC,"95E0"],
- [0x28B0C,"907D"],
- [0x28B13,"9265"],
- [0x28B21,"FDBA"],
- [0x28B22,"93C4"],
- [0x28B2B,"FEED"],
- [0x28B2C,"9DAB"],
- [0x28B2D,"A0E3"],
- [0x28B2F,"9648"],
- [0x28B46,"9D53"],
- [0x28B4C,"8AA9"],
- [0x28B4E,"9BC5"],
- [0x28B50,"965D"],
- [0x28B63,"975F"],
- [0x28B64,"965F"],
- [0x28B65,"966E"],
- [0x28B66,"FB5D"],
- [0x28B6C,"9DB1"],
- [0x28B8F,"FEA3"],
- [0x28B99,"9DB2"],
- [0x28B9C,"95AE"],
- [0x28B9D,"FCA3"],
- [0x28BB9,"8769"],
- [0x28BC2,"A0A2"],
- [0x28BC5,"9655"],
- [0x28BD4,"9D54"],
- [0x28BD7,"9341"],
- [0x28BD9,"95AD"],
- [0x28BDA,"91D5"],
- [0x28BE7,"977A"],
- [0x28BE8,"FDFC"],
- [0x28BE9,"8E47"],
- [0x28BEA,"93FD"],
- [0x28BEB,"90A5"],
- [0x28BEC,"90AC"],
- [0x28BF5,"95AC"],
- [0x28BFF,"90AE"],
- [0x28C03,"FEA5"],
- [0x28C09,"9D56"],
- [0x28C1C,"97E3"],
- [0x28C1D,"95E2"],
- [0x28C23,"9466"],
- [0x28C26,"9647"],
- [0x28C2B,"91B8"],
- [0x28C30,"9CEC"],
- [0x28C39,"90AD"],
- [0x28C3B,"95E3"],
- [0x28CCA,"8B4F"],
- [0x28CCD,"8AE3"],
- [0x28CD2,"8B4D"],
- [0x28D34,"95EA"],
- [0x28D99,"8B4E"],
- [0x28DB9,"8CC1"],
- [0x28E0F,"8BED"],
- [0x28E36,"91D9"],
- [0x28E39,"A0A4"],
- [0x28E65,"95F5"],
- [0x28E66,"95F4"],
- [0x28E97,"9FB3"],
- [0x28EAC,"FEAF"],
- [0x28EB2,"FE72"],
- [0x28EB3,"927A"],
- [0x28ED9,"FEAC"],
- [0x28EE7,"95F3"],
- [0x28FC5,"9D58"],
- [0x29079,"8D46"],
- [0x29088,"9372"],
- [0x2908B,"91C5"],
- [0x29093,"9642"],
- [0x290AF,"90CD"],
- [0x290B0,"95FE"],
- [0x290B1,"9159"],
- [0x290C0,"9C65"],
- [0x290E4,"97CC"],
- [0x290E5,"90CE"],
- [0x290EC,"9D59"],
- [0x290ED,"FCF5"],
- [0x2910D,"FEFD"],
- [0x29110,"9D5B"],
- [0x2913C,"9D5C"],
- [0x2914D,"937E"],
- [0x2915B,"98AC"],
- [0x2915E,"9D5E"],
- [0x29170,"FDD0"],
- [0x2919C,"FD60"],
- [0x291A8,"9CCF"],
- [0x291D5,"90DD"],
- [0x291EB,"90E0"],
- [0x2941D,"90F3"],
- [0x29420,"98B1"],
- [0x29433,"90F0"],
- [0x2943F,"93BD"],
- [0x29448,"95B7"],
- [0x294D0,"9F46"],
- [0x294D9,"8E4B"],
- [0x294DA,"9658"],
- [0x294E5,"8A4C"],
- [0x294E7,"9D63"],
- [0x2959E,"9ECF"],
- [0x295B0,"9D65"],
- [0x295B8,"9D66"],
- [0x295D7,"965A"],
- [0x295E9,"9D64"],
- [0x295F4,"8A6C"],
- [0x29720,"8AD9"],
- [0x29732,"9D67"],
- [0x297D4,"8A70"],
- [0x29810,"8BF3"],
- [0x29857,"9150"],
- [0x298A4,"9CC1"],
- [0x298D1,"9D68"],
- [0x298EA,"93A7"],
- [0x298F1,"9674"],
- [0x298FA,"8CFD"],
- [0x29903,"A0EF"],
- [0x29905,"9151"],
- [0x2992F,"96C1"],
- [0x29945,"8777"],
- [0x29947,"8C64"],
- [0x29948,"9676"],
- [0x29949,"9D69"],
- [0x2995D,"FCA4"],
- [0x2996A,"9D6A"],
- [0x2999D,"924E"],
- [0x299C3,"9D6B"],
- [0x299C9,"9BC1"],
- [0x29A28,"9D6C"],
- [0x29A4D,"8A65"],
- [0x29B05,"915D"],
- [0x29B0E,"9D6D"],
- [0x29BD5,"915A"],
- [0x29C73,"8C42"],
- [0x29CAD,"9CC0"],
- [0x29D3E,"916A"],
- [0x29D5A,"9D6E"],
- [0x29D7C,"9EA6"],
- [0x29D98,"9DCD"],
- [0x29D9B,"9D6F"],
- [0x29DF6,"89BB"],
- [0x29E06,"9EF9"],
- [0x29E2D,"96B4"],
- [0x29E68,"9172"],
- [0x29EAC,"9EC8"],
- [0x29EB0,"8771"],
- [0x29EC3,"8B55"],
- [0x29EF8,"9D71"],
- [0x29F23,"9D72"],
- [0x29F30,"9ECC"],
- [0x29FB7,"9174"],
- [0x29FDE,"9ED0"],
- [0x2A014,"905C"],
- [0x2A087,"8ED2"],
- [0x2A0B9,"91A8"],
- [0x2A0E1,"9177"],
- [0x2A0ED,"96BF"],
- [0x2A0F3,"96C0"],
- [0x2A0F8,"8FB1"],
- [0x2A0FE,"96B7"],
- [0x2A107,"8C55"],
- [0x2A123,"9178"],
- [0x2A133,"89BE"],
- [0x2A134,"917C"],
- [0x2A150,"FB77"],
- [0x2A192,"9175"],
- [0x2A193,"91A3"],
- [0x2A1AB,"9176"],
- [0x2A1B4,"96BE"],
- [0x2A1B5,"8D49"],
- [0x2A1DF,"9179"],
- [0x2A1F5,"96B6"],
- [0x2A220,"91A4"],
- [0x2A233,"91A6"],
- [0x2A293,"9D75"],
- [0x2A29F,"9052"],
- [0x2A2B2,"A045"],
- [0x2A2B4,"91A9"],
- [0x2A2B6,"98AA"],
- [0x2A2BA,"8C5F"],
- [0x2A2BD,"8BAA"],
- [0x2A2DF,"9CDD"],
- [0x2A2FF,"9D77"],
- [0x2A351,"8756"],
- [0x2A3A9,"8940"],
- [0x2A434,"9EEC"],
- [0x2A45B,"93AA"],
- [0x2A5C6,"9478"],
- [0x2A5CB,"9D7A"],
- [0x2A601,"8AC9"],
- [0x2A632,"8B4B"],
- [0x2A64A,"9FEC"],
- [0x2A65B,"8AE2"],
- [0x2A6A9,"9E75"],
- [0x2ADFF,"87DC"],
- [0x2F825,"9874"],
- [0x2F83B,"9AC8"],
- [0x2F840,"A047"],
- [0x2F878,"8BC3"],
- [0x2F894,"FC48"],
- [0x2F8A6,"FC77"],
- [0x2F8CD,"9C52"],
- [0x2F994,"8EFD"],
- [0x2F9B2,"8FA8"],
- [0x2F9BC,"957A"],
- [0x2F9D4,"8FF0"],
-
- # defined by CP951 but not both-way mapping
- #[0xA1,"0021"],
- #[0xA2,"A246"],
- #[0xA3,"A247"],
- #[0xA5,"A244"],
- #[0xA6,"007C"],
- #[0xA9,"0063"],
- #[0xAA,"0061"],
- #[0xAD,"002D"],
- #[0xAE,"0052"],
- #[0xB2,"0032"],
- #[0xB3,"0033"],
- #[0xB4,"A1A6"],
- #[0xB5,"A367"],
- #[0xB8,"A14D"],
- #[0xB9,"0031"],
- #[0xBA,"006F"],
- #[0xC2,"0041"],
- #[0xC3,"0041"],
- #[0xC4,"0041"],
- #[0xC5,"0041"],
- #[0xC6,"0041"],
- #[0xC7,"0043"],
- #[0xCB,"0045"],
- #[0xCC,"0049"],
- #[0xCD,"0049"],
- #[0xCE,"0049"],
- #[0xCF,"0049"],
- #[0xD0,"0044"],
- #[0xD1,"004E"],
- #[0xD4,"004F"],
- #[0xD5,"004F"],
- #[0xD6,"004F"],
- #[0xD8,"004F"],
- #[0xD9,"0055"],
- #[0xDA,"0055"],
- #[0xDB,"0055"],
- #[0xDC,"0055"],
- #[0xDD,"0059"],
- #[0xDE,"0054"],
- #[0xDF,"0073"],
- #[0xE2,"0061"],
- #[0xE3,"0061"],
- #[0xE4,"0061"],
- #[0xE5,"0061"],
- #[0xE6,"0061"],
- #[0xE7,"0063"],
- #[0xEB,"0065"],
- #[0xEE,"0069"],
- #[0xEF,"0069"],
- #[0xF0,"0065"],
- #[0xF1,"006E"],
- #[0xF4,"006F"],
- #[0xF5,"006F"],
- #[0xF6,"006F"],
- #[0xFB,"0075"],
- #[0xFD,"0079"],
- #[0xFE,"0074"],
- #[0xFF,"0079"],
- #[0x305,"A1C2"],
- #[0x2015,"A277"],
- #[0x2016,"A1FC"],
- #[0x2022,"A145"],
- #[0x2024,"A3BB"],
- #[0x2033,"A1B2"],
- #[0x203E,"A1C3"],
- #[0x2216,"A242"],
- #[0x2218,"A258"],
- #[0x2263,"A1DD"],
- #[0x2307,"A15B"],
- #[0x2593,"F9FE"],
- #[0x2609,"A1F3"],
- #[0x2641,"A1F2"],
- #[0x301C,"A1E3"],
- #[0x3030,"A1CA"],
- #[0x3192,"A440"],
- #[0x3193,"A447"],
- #[0x3194,"A454"],
- #[0x3195,"A57C"],
- #[0x3196,"A457"],
- #[0x3197,"A4A4"],
- #[0x3198,"A455"],
- #[0x3199,"A5D2"],
- #[0x319A,"A441"],
- #[0x319B,"A4FE"],
- #[0x319C,"A442"],
- #[0x319D,"A4D1"],
- #[0x319E,"A661"],
- #[0x319F,"A448"],
- #[0x3220,"A440"],
- #[0x3221,"A447"],
- #[0x3222,"A454"],
- #[0x3223,"A57C"],
- #[0x3224,"A4AD"],
- #[0x3225,"A4BB"],
- #[0x3226,"A443"],
- #[0x3227,"A44B"],
- #[0x3228,"A445"],
- #[0x3229,"A451"],
- #[0x322A,"A4EB"],
- #[0x322B,"A4F5"],
- #[0x322C,"A4F4"],
- #[0x322D,"A4EC"],
- #[0x322E,"AAF7"],
- #[0x322F,"A467"],
- #[0x3230,"A4E9"],
- #[0x3232,"A6B3"],
- #[0x3233,"AAC0"],
- #[0x3234,"A657"],
- #[0x3235,"AF53"],
- #[0x3236,"B05D"],
- #[0x3237,"AFAC"],
- #[0x3238,"B3D2"],
- #[0x3239,"A54E"],
- #[0x323A,"A949"],
- #[0x323B,"BEC7"],
- #[0x323C,"BACA"],
- #[0x323D,"A5F8"],
- #[0x323E,"B8EA"],
- #[0x323F,"A8F3"],
- #[0x3240,"B2BD"],
- #[0x3241,"A5F0"],
- #[0x3242,"A6DB"],
- #[0x3243,"A6DC"],
- #[0x3280,"A440"],
- #[0x3281,"A447"],
- #[0x3282,"A454"],
- #[0x3283,"A57C"],
- #[0x3284,"A4AD"],
- #[0x3285,"A4BB"],
- #[0x3286,"A443"],
- #[0x3287,"A44B"],
- #[0x3288,"A445"],
- #[0x3289,"A451"],
- #[0x328A,"A4EB"],
- #[0x328B,"A4F5"],
- #[0x328C,"A4F4"],
- #[0x328D,"A4EC"],
- #[0x328E,"AAF7"],
- #[0x328F,"A467"],
- #[0x3290,"A4E9"],
- #[0x3291,"AEE8"],
- #[0x3292,"A6B3"],
- #[0x3293,"AAC0"],
- #[0x3294,"A657"],
- #[0x3295,"AF53"],
- #[0x3296,"B05D"],
- #[0x3297,"AFAC"],
- #[0x3298,"B3D2"],
- #[0x3299,"AFB5"],
- #[0x329A,"A86B"],
- #[0x329B,"A46B"],
- #[0x329C,"BE41"],
- #[0x329D,"C075"],
- #[0x329E,"A64C"],
- #[0x329F,"AA60"],
- #[0x32A0,"B6B5"],
- #[0x32A1,"A5F0"],
- #[0x32A2,"BC67"],
- #[0x32A4,"A457"],
- #[0x32A5,"A4A4"],
- #[0x32A6,"A455"],
- #[0x32A7,"A5AA"],
- #[0x32A8,"A56B"],
- #[0x32A9,"C2E5"],
- #[0x32AA,"A976"],
- #[0x32AB,"BEC7"],
- #[0x32AC,"BACA"],
- #[0x32AD,"A5F8"],
- #[0x32AE,"B8EA"],
- #[0x32AF,"A8F3"],
- #[0x32B0,"A95D"],
- #[0x47B6,"9EE5"],
- #[0xF900,"B05A"],
- #[0xF901,"A7F3"],
- #[0xF902,"A8AE"],
- #[0xF903,"B8EB"],
- #[0xF904,"B7C6"],
- #[0xF905,"A6EA"],
- #[0xF906,"A579"],
- #[0xF908,"C074"],
- #[0xF909,"ABB4"],
- #[0xF90A,"AAF7"],
- #[0xF90B,"B3E2"],
- #[0xF90C,"A960"],
- #[0xF90D,"C369"],
- #[0xF90E,"C4EE"],
- #[0xF90F,"C3B9"],
- #[0xF910,"C5DA"],
- #[0xF911,"C1B3"],
- #[0xF912,"BB72"],
- #[0xF913,"C5DE"],
- #[0xF914,"BCD6"],
- #[0xF915,"ACA5"],
- #[0xF916,"AF4F"],
- #[0xF917,"AF5F"],
- #[0xF918,"B8A8"],
- #[0xF919,"B954"],
- #[0xF91A,"C064"],
- #[0xF91B,"B6C3"],
- #[0xF91C,"A75A"],
- #[0xF91D,"C4E6"],
- #[0xF91E,"C4EA"],
- #[0xF91F,"C4F5"],
- #[0xF920,"C67D"],
- #[0xF921,"B450"],
- #[0xF922,"C0DD"],
- #[0xF923,"C2C5"],
- #[0xF924,"C4B0"],
- #[0xF925,"A9D4"],
- #[0xF926,"C3BE"],
- #[0xF927,"C4FA"],
- #[0xF928,"B459"],
- #[0xF929,"AED4"],
- #[0xF92A,"AEF6"],
- #[0xF92B,"AF54"],
- #[0xF92D,"A8D3"],
- #[0xF92E,"A74E"],
- #[0xF92F,"B3D2"],
- #[0xF930,"BEDB"],
- #[0xF931,"C372"],
- #[0xF932,"C46C"],
- #[0xF933,"BF63"],
- #[0xF934,"A6D1"],
- #[0xF935,"C4AA"],
- #[0xF936,"B8B8"],
- #[0xF937,"B8F4"],
- #[0xF938,"C553"],
- #[0xF939,"BE7C"],
- #[0xF93A,"C64F"],
- #[0xF93B,"B84C"],
- #[0xF93C,"B853"],
- #[0xF93D,"BAF1"],
- #[0xF93E,"DB77"],
- #[0xF93F,"BFFD"],
- #[0xF940,"B3C0"],
- #[0xF941,"BDD7"],
- #[0xF942,"C362"],
- #[0xF943,"A7CB"],
- #[0xF944,"C5A2"],
- #[0xF945,"C5A4"],
- #[0xF946,"A863"],
- #[0xF947,"BD55"],
- #[0xF948,"B8EF"],
- #[0xF949,"B970"],
- #[0xF94A,"C253"],
- #[0xF94B,"B9F0"],
- #[0xF94C,"BCD3"],
- #[0xF94D,"B25C"],
- #[0xF94E,"BA7C"],
- #[0xF94F,"B2D6"],
- #[0xF950,"C15C"],
- #[0xF951,"ADAE"],
- #[0xF952,"B0C7"],
- #[0xF953,"A6D8"],
- #[0xF954,"BBFE"],
- #[0xF955,"ADE2"],
- #[0xF956,"B857"],
- #[0xF957,"BAF0"],
- #[0xF958,"B5D9"],
- #[0xF959,"B3AE"],
- #[0xF95A,"C5AA"],
- #[0xF95B,"CED4"],
- #[0xF95C,"BCD6"],
- #[0xF95D,"BFD5"],
- #[0xF95E,"A4A6"],
- #[0xF95F,"B9E7"],
- #[0xF960,"ABE3"],
- #[0xF961,"B276"],
- #[0xF962,"B2A7"],
- #[0xF963,"A55F"],
- #[0xF964,"EDA8"],
- #[0xF965,"AB4B"],
- #[0xF966,"B45F"],
- #[0xF967,"A4A3"],
- #[0xF968,"AA63"],
- #[0xF969,"BCC6"],
- #[0xF96A,"AFC1"],
- #[0xF96B,"B0D1"],
- #[0xF96C,"B6EB"],
- #[0xF96D,"ACD9"],
- #[0xF96E,"B8AD"],
- #[0xF96F,"BBA1"],
- #[0xF970,"B1FE"],
- #[0xF971,"A8B0"],
- #[0xF972,"A848"],
- #[0xF973,"AC42"],
- #[0xF974,"AD59"],
- #[0xF975,"B1B0"],
- #[0xF976,"B2A4"],
- #[0xF977,"AB47"],
- #[0xF978,"A8E2"],
- #[0xF97A,"B1E7"],
- #[0xF97B,"C2B3"],
- #[0xF97C,"A87D"],
- #[0xF97D,"BDCC"],
- #[0xF97E,"B671"],
- #[0xF97F,"C079"],
- #[0xF980,"A766"],
- #[0xF981,"A46B"],
- #[0xF982,"C366"],
- #[0xF983,"AEC8"],
- #[0xF984,"C26F"],
- #[0xF985,"C472"],
- #[0xF986,"BE5B"],
- #[0xF987,"C67A"],
- #[0xF988,"C452"],
- #[0xF989,"BEA4"],
- #[0xF98A,"A44F"],
- #[0xF98B,"BEE4"],
- #[0xF98C,"BEFA"],
- #[0xF98D,"F765"],
- #[0xF98E,"A67E"],
- #[0xF98F,"BCA6"],
- #[0xF990,"C5CA"],
- #[0xF991,"BCBF"],
- #[0xF992,"BAA7"],
- #[0xF993,"B7D2"],
- #[0xF994,"E6A3"],
- #[0xF996,"BD6D"],
- #[0xF997,"C170"],
- #[0xF998,"BDFB"],
- #[0xF999,"BDAC"],
- #[0xF99A,"B373"],
- #[0xF99B,"C1E5"],
- #[0xF99C,"A643"],
- #[0xF99D,"A648"],
- #[0xF99E,"AB7C"],
- #[0xF99F,"AF50"],
- #[0xF9A0,"B5F5"],
- #[0xF9A1,"BBA1"],
- #[0xF9A2,"B747"],
- #[0xF9A3,"A9C0"],
- #[0xF9A4,"B1C9"],
- #[0xF9A5,"C0D4"],
- #[0xF9A6,"C3AE"],
- #[0xF9A7,"C279"],
- #[0xF9A8,"A54F"],
- #[0xF9A9,"CBF1"],
- #[0xF9AA,"B9E7"],
- #[0xF9AB,"C0AD"],
- #[0xF9AC,"CCB0"],
- #[0xF9AD,"ACC2"],
- #[0xF9AE,"BCFC"],
- #[0xF9AF,"B2DC"],
- #[0xF9B0,"B2E2"],
- #[0xF9B1,"B961"],
- #[0xF9B2,"B973"],
- #[0xF9B3,"C646"],
- #[0xF9B4,"BBE2"],
- #[0xF9B5,"A8D2"],
- #[0xF9B6,"C2A7"],
- #[0xF9B7,"C4BF"],
- #[0xF9B8,"C1F5"],
- #[0xF9B9,"B463"],
- #[0xF9BA,"A446"],
- #[0xF9BB,"B9B1"],
- #[0xF9BC,"BC64"],
- #[0xF9BD,"A7BF"],
- #[0xF9BE,"AEC6"],
- #[0xF9BF,"BCD6"],
- #[0xF9C0,"BF52"],
- #[0xF9C1,"C0F8"],
- #[0xF9C2,"E764"],
- #[0xF9C3,"BFF1"],
- #[0xF9C4,"C073"],
- #[0xF9C5,"B777"],
- #[0xF9C6,"A8BF"],
- #[0xF9C7,"BC42"],
- #[0xF9C8,"CCD8"],
- #[0xF9C9,"AC68"],
- #[0xF9CA,"AC79"],
- #[0xF9CB,"B7C8"],
- #[0xF9CC,"AF5B"],
- #[0xF9CD,"AF64"],
- #[0xF9CE,"B2B8"],
- #[0xF9CF,"AFC3"],
- #[0xF9D0,"C3FE"],
- #[0xF9D1,"A4BB"],
- #[0xF9D2,"BCAE"],
- #[0xF9D3,"B3B0"],
- #[0xF9D4,"ADDB"],
- #[0xF9D5,"B15B"],
- #[0xF9D6,"B25F"],
- #[0xF9D7,"BDFC"],
- #[0xF9D8,"ABDF"],
- #[0xF9D9,"B758"],
- #[0xF9DA,"AEDF"],
- #[0xF9DB,"B276"],
- #[0xF9DC,"B6A9"],
- #[0xF9DD,"A751"],
- #[0xF9DE,"A64F"],
- #[0xF9DF,"BC69"],
- #[0xF9E0,"A9F6"],
- #[0xF9E1,"A7F5"],
- #[0xF9E2,"B1F9"],
- #[0xF9E3,"AA64"],
- #[0xF9E4,"B27A"],
- #[0xF9E5,"B567"],
- #[0xF9E6,"BFA9"],
- #[0xF9E8,"B8CC"],
- #[0xF9E9,"A8BD"],
- #[0xF9EA,"C2F7"],
- #[0xF9EB,"B0CE"],
- #[0xF9EC,"B7C4"],
- #[0xF9ED,"A75B"],
- #[0xF9EE,"BF4D"],
- #[0xF9EF,"BF5A"],
- #[0xF9F0,"C4A9"],
- #[0xF9F2,"C5EC"],
- #[0xF9F3,"C5EF"],
- #[0xF9F4,"AA4C"],
- #[0xF9F5,"B24F"],
- #[0xF9F6,"C17B"],
- #[0xF9F7,"A5DF"],
- #[0xF9F8,"B2C1"],
- #[0xF9F9,"B2C9"],
- #[0xF9FA,"AAAC"],
- #[0xF9FB,"AAA5"],
- #[0xF9FC,"C3D1"],
- #[0xF9FD,"A4B0"],
- #[0xF9FE,"AFF9"],
- #[0xF9FF,"A8EB"],
- #[0xFA00,"A4C1"],
- #[0xFA01,"ABD7"],
- #[0xFA02,"A9DD"],
- #[0xFA03,"BF7D"],
- #[0xFA04,"A676"],
- #[0xFA05,"AC7D"],
- #[0xFA06,"BCC9"],
- #[0xFA07,"BFE7"],
- #[0xFA08,"A6E6"],
- #[0xFA09,"ADB0"],
- #[0xFA0A,"A8A3"],
- #[0xFA0B,"B9F8"],
- #[0xFA10,"B6EF"],
- #[0xFA12,"B4B8"],
- #[0xFA15,"E8F9"],
- #[0xFA16,"BDDE"],
- #[0xFA17,"AF71"],
- #[0xFA19,"AFAB"],
- #[0xFA1A,"B2BB"],
- #[0xFA1B,"BAD6"],
- #[0xFA1C,"B974"],
- #[0xFA1D,"BAEB"],
- #[0xFA1E,"A6D0"],
- #[0xFA22,"BDD1"],
- #[0xFA25,"B668"],
- #[0xFA26,"B3A3"],
- #[0xFA2A,"B6BA"],
- #[0xFA2B,"B97D"],
- #[0xFA2C,"C05D"],
- #[0xFA2D,"C562"],
- #[0xFF3E,"A173"],
- #[0xFF40,"A1A5"],
- #[0xFF64,"A14E"],
-]
+] \ No newline at end of file
diff --git a/enc/trans/big5-tbl.rb b/enc/trans/big5-tbl.rb
new file mode 100644
index 0000000000..b093cb0d77
--- /dev/null
+++ b/enc/trans/big5-tbl.rb
@@ -0,0 +1,13705 @@
+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
index c85ada3731..fa96746068 100644
--- a/enc/trans/big5.trans
+++ b/enc/trans/big5.trans
@@ -1,23 +1,15 @@
#include "transcode_data.h"
<%
+ require "big5-tbl"
require "big5-hkscs-tbl"
require "big5-uao-tbl"
- tbls = import_ucm("glibc-BIG5-2.3.3.ucm")
- transcode_tblgen "Big5", "UTF-8", [["{00-7f}", :nomap]] + tbls[0]
- transcode_tblgen "UTF-8", "Big5", [["{00-7f}", :nomap]] + tbls[1]
-
- tbls = import_ucm("windows-950-2000.ucm")
- transcode_tblgen "CP950", "UTF-8", [["{00-7f}", :nomap]] + tbls[0], ValidEncoding('Big5')
- transcode_tblgen "UTF-8", "CP950", [["{00-7f}", :nomap]] + tbls[1]
+ 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], ValidEncoding('Big5')
- transcode_tblgen "UTF-8", "Big5-HKSCS", [["{00-7f}", :nomap], *UCS_TO_BIG5_HKSCS_TBL]
-
- tbls = import_ucm("windows-950_hkscs-2001.ucm")
- transcode_tblgen "CP951", "UTF-8", [["{00-7f}", :nomap]] + tbls[0], ValidEncoding('Big5')
- transcode_tblgen "UTF-8", "CP951", [["{00-7f}", :nomap]] + tbls[1]
+ transcode_tblgen "UTF-8", "Big5-HKSCS", [["{00-7f}", :nomap], *BIG5_HKSCS_TO_UCS_TBL.map {|a,b| [b,a] }]
transcode_tblgen "Big5-UAO", "UTF-8", [["{00-7f}", :nomap], *BIG5_UAO_TO_UCS_TBL], ValidEncoding('Big5')
transcode_tblgen "UTF-8", "Big5-UAO", [["{00-7f}", :nomap], *BIG5_UAO_TO_UCS_TBL.map {|a,b| [b,a] }]
@@ -26,7 +18,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(big5)
+void
+Init_big5(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/chinese.trans b/enc/trans/chinese.trans
index 282c91aba7..0662a3bebc 100644
--- a/enc/trans/chinese.trans
+++ b/enc/trans/chinese.trans
@@ -25,7 +25,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(chinese)
+void
+Init_chinese(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/emoji.trans b/enc/trans/emoji.trans
index 25d9fdd4d8..1cf13743a2 100644
--- a/enc/trans/emoji.trans
+++ b/enc/trans/emoji.trans
@@ -30,7 +30,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(emoji)
+void
+Init_emoji(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/emoji_iso2022_kddi.trans b/enc/trans/emoji_iso2022_kddi.trans
index ea180c1e42..97629db278 100644
--- a/enc/trans/emoji_iso2022_kddi.trans
+++ b/enc/trans/emoji_iso2022_kddi.trans
@@ -31,6 +31,7 @@
JISX0208VDC:NEC/UCS
CP932VDC:NEC_IBM/UCS
CP932VDC:IBM/UCS
+ CP932UDA/UCS
JISX0208:MS/UCS).join(",")),
nil
@@ -42,6 +43,7 @@
UCS/JISX0208VDC:NEC
UCS/CP932VDC:NEC_IBM
UCS/CP932VDC:IBM
+ UCS/CP932UDA
UCS/JISX0208:MS).join(",")),
ValidEncoding('UTF-8')
%>
@@ -208,7 +210,8 @@ rb_iso2022jp_kddi_encoder = {
iso2022jp_kddi_encoder_reset_sequence_size, finish_iso2022jp_kddi_encoder
};
-TRANS_INIT(emoji_iso2022_kddi)
+void
+Init_emoji_iso2022_kddi(void)
{
rb_register_transcoder(&rb_iso2022jp_kddi_decoder);
rb_register_transcoder(&rb_iso2022jp_kddi_encoder);
diff --git a/enc/trans/emoji_sjis_docomo.trans b/enc/trans/emoji_sjis_docomo.trans
index 5dd9c7a1e3..36e6e20339 100644
--- a/enc/trans/emoji_sjis_docomo.trans
+++ b/enc/trans/emoji_sjis_docomo.trans
@@ -26,7 +26,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(emoji_sjis_docomo)
+void
+Init_emoji_sjis_docomo(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/emoji_sjis_kddi.trans b/enc/trans/emoji_sjis_kddi.trans
index 6df62f14d1..654bed134e 100644
--- a/enc/trans/emoji_sjis_kddi.trans
+++ b/enc/trans/emoji_sjis_kddi.trans
@@ -27,7 +27,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(emoji_sjis_kddi)
+void
+Init_emoji_sjis_kddi(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/emoji_sjis_softbank.trans b/enc/trans/emoji_sjis_softbank.trans
index c520035347..c152d99c76 100644
--- a/enc/trans/emoji_sjis_softbank.trans
+++ b/enc/trans/emoji_sjis_softbank.trans
@@ -26,7 +26,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(emoji_sjis_softbank)
+void
+Init_emoji_sjis_softbank(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
index 550e4ac767..a2fbebac33 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -85,7 +85,8 @@ rb_escape_xml_attr_quote = {
escape_xml_attr_quote_finish
};
-TRANS_INIT(escape)
+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
index 4ce8521a8a..773cd90122 100644
--- a/enc/trans/euckr-tbl.rb
+++ b/enc/trans/euckr-tbl.rb
@@ -162,8 +162,6 @@ EUCKR_TO_UCS_TBL = [
["A2E3",0x33C2],
["A2E4",0x33D8],
["A2E5",0x2121],
- ["A2E6",0x20AC],
- ["A2E7",0x00AE],
["A3A1",0xFF01],
["A3A2",0xFF02],
["A3A3",0xFF03],
diff --git a/enc/trans/gb18030.trans b/enc/trans/gb18030.trans
index 94c866eb39..c7da4c64b4 100644
--- a/enc/trans/gb18030.trans
+++ b/enc/trans/gb18030.trans
@@ -176,7 +176,8 @@ rb_to_GB18030 = {
};
-TRANS_INIT(gb18030)
+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
index 26f5078c45..5b4374bb61 100644
--- a/enc/trans/gbk-tbl.rb
+++ b/enc/trans/gbk-tbl.rb
@@ -172,7 +172,6 @@ GBK_TO_UCS_TBL= [
["A1E5",0x2033],
["A846",0x2035],
["A1F9",0x203B],
- ["80",0x20AC],
["A1E6",0x2103],
["A847",0x2105],
["A848",0x2109],
diff --git a/enc/trans/gbk.trans b/enc/trans/gbk.trans
index 3c2cf0c1af..0df148198e 100644
--- a/enc/trans/gbk.trans
+++ b/enc/trans/gbk.trans
@@ -9,7 +9,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(gbk)
+void
+Init_gbk(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/ibm737-tbl.rb b/enc/trans/ibm737-tbl.rb
deleted file mode 100644
index 44036ce15f..0000000000
--- a/enc/trans/ibm737-tbl.rb
+++ /dev/null
@@ -1,130 +0,0 @@
-IBM737_TO_UCS_TBL = [
- ["80",0x391],
- ["81",0x392],
- ["82",0x393],
- ["83",0x394],
- ["84",0x395],
- ["85",0x396],
- ["86",0x397],
- ["87",0x398],
- ["88",0x399],
- ["89",0x39A],
- ["8A",0x39B],
- ["8B",0x39C],
- ["8C",0x39D],
- ["8D",0x39E],
- ["8E",0x39F],
- ["8F",0x3A0],
- ["90",0x3A1],
- ["91",0x3A3],
- ["92",0x3A4],
- ["93",0x3A5],
- ["94",0x3A6],
- ["95",0x3A7],
- ["96",0x3A8],
- ["97",0x3A9],
- ["98",0x3B1],
- ["99",0x3B2],
- ["9A",0x3B3],
- ["9B",0x3B4],
- ["9C",0x3B5],
- ["9D",0x3B6],
- ["9E",0x3B7],
- ["9F",0x3B8],
- ["A0",0x3B9],
- ["A1",0x3BA],
- ["A2",0x3BB],
- ["A3",0x3BC],
- ["A4",0x3BD],
- ["A5",0x3BE],
- ["A6",0x3BF],
- ["A7",0x3C0],
- ["A8",0x3C1],
- ["A9",0x3C3],
- ["AA",0x3C2],
- ["AB",0x3C4],
- ["AC",0x3C5],
- ["AD",0x3C6],
- ["AE",0x3C7],
- ["AF",0x3C8],
- ["B0",0x2591],
- ["B1",0x2592],
- ["B2",0x2593],
- ["B3",0x2502],
- ["B4",0x2524],
- ["B5",0x2561],
- ["B6",0x2562],
- ["B7",0x2556],
- ["B8",0x2555],
- ["B9",0x2563],
- ["BA",0x2551],
- ["BB",0x2557],
- ["BC",0x255D],
- ["BD",0x255C],
- ["BE",0x255B],
- ["BF",0x2510],
- ["C0",0x2514],
- ["C1",0x2534],
- ["C2",0x252C],
- ["C3",0x251C],
- ["C4",0x2500],
- ["C5",0x253C],
- ["C6",0x255E],
- ["C7",0x255F],
- ["C8",0x255A],
- ["C9",0x2554],
- ["CA",0x2569],
- ["CB",0x2566],
- ["CC",0x2560],
- ["CD",0x2550],
- ["CE",0x256C],
- ["CF",0x2567],
- ["D0",0x2568],
- ["D1",0x2564],
- ["D2",0x2565],
- ["D3",0x2559],
- ["D4",0x2558],
- ["D5",0x2552],
- ["D6",0x2553],
- ["D7",0x256B],
- ["D8",0x256A],
- ["D9",0x2518],
- ["DA",0x250C],
- ["DB",0x2588],
- ["DC",0x2584],
- ["DD",0x258C],
- ["DE",0x2590],
- ["DF",0x2580],
- ["E0",0x3C9],
- ["E1",0x3AC],
- ["E2",0x3AD],
- ["E3",0x3AE],
- ["E4",0x3CA],
- ["E5",0x3AF],
- ["E6",0x3CC],
- ["E7",0x3CD],
- ["E8",0x3CB],
- ["E9",0x3CE],
- ["EA",0x386],
- ["EB",0x388],
- ["EC",0x389],
- ["ED",0x38A],
- ["EE",0x38C],
- ["EF",0x38E],
- ["F0",0x38F],
- ["F1",0xB1],
- ["F2",0x2265],
- ["F3",0x2264],
- ["F4",0x3AA],
- ["F5",0x3AB],
- ["F6",0xF7],
- ["F7",0x2248],
- ["F8",0xB0],
- ["F9",0x2219],
- ["FA",0xB7],
- ["FB",0x221A],
- ["FC",0x207F],
- ["FD",0xB2],
- ["FE",0x25A0],
- ["FF",0xA0],
-]
diff --git a/enc/trans/iso-8859-16-tbl.rb b/enc/trans/iso-8859-16-tbl.rb
deleted file mode 100644
index 27f1e49935..0000000000
--- a/enc/trans/iso-8859-16-tbl.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-ISO_8859_16_TO_UCS_TBL = [
- ["A0", 0x00A0],
- ["A1", 0x0104],
- ["A2", 0x0105],
- ["A3", 0x0141],
- ["A4", 0x20AC],
- ["A5", 0x201E],
- ["A6", 0x0160],
- ["A7", 0x00A7],
- ["A8", 0x0161],
- ["A9", 0x00A9],
- ["AA", 0x0218],
- ["AB", 0x00AB],
- ["AC", 0x0179],
- ["AD", 0x00AD],
- ["AE", 0x017A],
- ["AF", 0x017B],
- ["B0", 0x00B0],
- ["B1", 0x00B1],
- ["B2", 0x010C],
- ["B3", 0x0142],
- ["B4", 0x017D],
- ["B5", 0x201D],
- ["B6", 0x00B6],
- ["B7", 0x00B7],
- ["B8", 0x017E],
- ["B9", 0x010D],
- ["BA", 0x0219],
- ["BB", 0x00BB],
- ["BC", 0x0152],
- ["BD", 0x0153],
- ["BE", 0x0178],
- ["BF", 0x017C],
- ["C0", 0x00C0],
- ["C1", 0x00C1],
- ["C2", 0x00C2],
- ["C3", 0x0102],
- ["C4", 0x00C4],
- ["C5", 0x0106],
- ["C6", 0x00C6],
- ["C7", 0x00C7],
- ["C8", 0x00C8],
- ["C9", 0x00C9],
- ["CA", 0x00CA],
- ["CB", 0x00CB],
- ["CC", 0x00CC],
- ["CD", 0x00CD],
- ["CE", 0x00CE],
- ["CF", 0x00CF],
- ["D0", 0x0110],
- ["D1", 0x0143],
- ["D2", 0x00D2],
- ["D3", 0x00D3],
- ["D4", 0x00D4],
- ["D5", 0x0150],
- ["D6", 0x00D6],
- ["D7", 0x015A],
- ["D8", 0x0170],
- ["D9", 0x00D9],
- ["DA", 0x00DA],
- ["DB", 0x00DB],
- ["DC", 0x00DC],
- ["DD", 0x0118],
- ["DE", 0x021A],
- ["DF", 0x00DF],
- ["E0", 0x00E0],
- ["E1", 0x00E1],
- ["E2", 0x00E2],
- ["E3", 0x0103],
- ["E4", 0x00E4],
- ["E5", 0x0107],
- ["E6", 0x00E6],
- ["E7", 0x00E7],
- ["E8", 0x00E8],
- ["E9", 0x00E9],
- ["EA", 0x00EA],
- ["EB", 0x00EB],
- ["EC", 0x00EC],
- ["ED", 0x00ED],
- ["EE", 0x00EE],
- ["EF", 0x00EF],
- ["F0", 0x0111],
- ["F1", 0x0144],
- ["F2", 0x00F2],
- ["F3", 0x00F3],
- ["F4", 0x00F4],
- ["F5", 0x0151],
- ["F6", 0x00F6],
- ["F7", 0x015B],
- ["F8", 0x0171],
- ["F9", 0x00F9],
- ["FA", 0x00FA],
- ["FB", 0x00FB],
- ["FC", 0x00FC],
- ["FD", 0x0119],
- ["FE", 0x021B],
- ["FF", 0x00FF],
-]
diff --git a/enc/trans/iso2022.trans b/enc/trans/iso2022.trans
index a441f1596d..3f40cce3c8 100644
--- a/enc/trans/iso2022.trans
+++ b/enc/trans/iso2022.trans
@@ -553,7 +553,8 @@ rb_cp50220_encoder = {
iso2022jp_encoder_reset_sequence_size, finish_cp50220_encoder
};
-TRANS_INIT(iso2022)
+void
+Init_iso2022(void)
{
rb_register_transcoder(&rb_iso2022jp_decoder);
rb_register_transcoder(&rb_iso2022jp_encoder);
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans
index 7ff024fa8d..ce5d0bb70f 100644
--- a/enc/trans/japanese.trans
+++ b/enc/trans/japanese.trans
@@ -90,7 +90,8 @@ rb_sjis2eucjp = {
NULL, NULL, NULL, fun_so_sjis2eucjp
};
-TRANS_INIT(japanese)
+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
index 0f63272321..a976fe57d3 100644
--- a/enc/trans/japanese_euc.trans
+++ b/enc/trans/japanese_euc.trans
@@ -18,12 +18,6 @@
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 "EUC-JP-2004", "UTF-8",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "JISX0208:1990/UCS,JISX0213-1/UCS@BMP,JISX0213-1/UCS@SIP") +
- citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") +
- citrus_decode_mapsrc("euc", 0x8000, "JISX0213-2/UCS@BMP,JISX0213-2/UCS@SIP")
-
transcode_tblgen "UTF-8", "EUC-JP",
[["{00-7f}", :nomap]] +
@@ -41,17 +35,12 @@
[["{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_tblgen "UTF-8", "EUC-JP-2004",
- [["{00-7f}", :nomap]] +
- citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:1990,UCS@BMP/JISX0213-1,UCS@SIP/JISX0213-1") +
- citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") +
- citrus_decode_mapsrc("euc", 0x8000, "UCS@BMP/JISX0213-2,UCS@SIP/JISX0213-2")
%>
<%= transcode_generated_code %>
-TRANS_INIT(japanese_euc)
+void
+Init_japanese_euc(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/japanese_sjis.trans b/enc/trans/japanese_sjis.trans
index 8e1e13056d..00eace27a3 100644
--- a/enc/trans/japanese_sjis.trans
+++ b/enc/trans/japanese_sjis.trans
@@ -27,7 +27,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(japanese_sjis)
+void
+Init_japanese_sjis(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/korean.trans b/enc/trans/korean.trans
index fda1a3eeda..ef1cdfcb8e 100644
--- a/enc/trans/korean.trans
+++ b/enc/trans/korean.trans
@@ -12,7 +12,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(korean)
+void
+Init_korean(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
index 50f568cb94..55d8430932 100644
--- a/enc/trans/single_byte.trans
+++ b/enc/trans/single_byte.trans
@@ -43,7 +43,6 @@
transcode_tblgen_singlebyte "ISO-8859-13"
transcode_tblgen_singlebyte "ISO-8859-14"
transcode_tblgen_singlebyte "ISO-8859-15"
- transcode_tblgen_singlebyte "ISO-8859-16"
transcode_tblgen_singlebyte "WINDOWS-874"
transcode_tblgen_singlebyte "WINDOWS-1250"
transcode_tblgen_singlebyte "WINDOWS-1251"
@@ -55,7 +54,6 @@
transcode_tblgen_singlebyte "WINDOWS-1257"
transcode_tblgen_singlebyte "IBM437"
transcode_tblgen_singlebyte "IBM775"
- transcode_tblgen_singlebyte "IBM737"
transcode_tblgen_singlebyte "IBM852"
transcode_tblgen_singlebyte "IBM855"
transcode_tblgen_singlebyte "IBM857"
@@ -84,7 +82,8 @@
<%= transcode_generated_code %>
-TRANS_INIT(single_byte)
+void
+Init_single_byte(void)
{
<%= transcode_register_code %>
}
diff --git a/enc/trans/ucm/glibc-BIG5-2.3.3.ucm b/enc/trans/ucm/glibc-BIG5-2.3.3.ucm
deleted file mode 100644
index 912f84d6ca..0000000000
--- a/enc/trans/ucm/glibc-BIG5-2.3.3.ucm
+++ /dev/null
@@ -1,14087 +0,0 @@
-# ***************************************************************************
-# *
-# * Copyright (C) 2001-2005, International Business Machines
-# * Corporation and others. All Rights Reserved.
-# *
-# ***************************************************************************
-#
-# File created on Aug 10 10:03 PDT 2005
-#
-# File created by genucm tool.
-# from glibc 2.3.3 using Linux with glibc 2.3.3
-#
-# Table Version : 1.0
-# The 1st column is the Unicode scalar value.
-# The 2nd column is the codepage byte sequence.
-# The 3rd column is the fallback indicator.
-# The fallback indicator can have one of the following values:
-# |0 for exact 1-1 roundtrip mapping
-# |1 for the best fallback codepage byte sequence.
-# |2 for the substitution character
-# |3 for the best reverse fallback Unicode scaler value
-#
-# Encoding description:
-# Encoding name: BIG5
-#
-<code_set_name> "glibc-BIG5-2.3.3"
-<mb_cur_max> 2
-<mb_cur_min> 1
-<uconv_class> "MBCS"
-<subchar> \x1A
-<icu:charsetFamily> "ASCII"
-# Suggested ICU specific alias information
-#<icu:alias> "glibc-BIG5_VPUA"
-
-
-# The following was the generated state table.
-# This does not account for unassigned characters
-#<icu:state> 0-80, a1-f9:1
-#<icu:state> 40-7e, a1-fe
-#
-CHARMAP
-#
-#UNICODE BIG5
-#_______ _________
-<U0000> \x00 |0
-<U0001> \x01 |0
-<U0002> \x02 |0
-<U0003> \x03 |0
-<U0004> \x04 |0
-<U0005> \x05 |0
-<U0006> \x06 |0
-<U0007> \x07 |0
-<U0008> \x08 |0
-<U0009> \x09 |0
-<U000A> \x0A |0
-<U000B> \x0B |0
-<U000C> \x0C |0
-<U000D> \x0D |0
-<U000E> \x0E |0
-<U000F> \x0F |0
-<U0010> \x10 |0
-<U0011> \x11 |0
-<U0012> \x12 |0
-<U0013> \x13 |0
-<U0014> \x14 |0
-<U0015> \x15 |0
-<U0016> \x16 |0
-<U0017> \x17 |0
-<U0018> \x18 |0
-<U0019> \x19 |0
-<U001A> \x1A |0
-<U001B> \x1B |0
-<U001C> \x1C |0
-<U001D> \x1D |0
-<U001E> \x1E |0
-<U001F> \x1F |0
-<U0020> \x20 |0
-<U0021> \x21 |0
-<U0022> \x22 |0
-<U0023> \x23 |0
-<U0024> \x24 |0
-<U0025> \x25 |0
-<U0026> \x26 |0
-<U0027> \x27 |0
-<U0028> \x28 |0
-<U0029> \x29 |0
-<U002A> \x2A |0
-<U002B> \x2B |0
-<U002C> \x2C |0
-<U002D> \x2D |0
-<U002E> \x2E |0
-<U002F> \x2F |0
-<U0030> \x30 |0
-<U0031> \x31 |0
-<U0032> \x32 |0
-<U0033> \x33 |0
-<U0034> \x34 |0
-<U0035> \x35 |0
-<U0036> \x36 |0
-<U0037> \x37 |0
-<U0038> \x38 |0
-<U0039> \x39 |0
-<U003A> \x3A |0
-<U003B> \x3B |0
-<U003C> \x3C |0
-<U003D> \x3D |0
-<U003E> \x3E |0
-<U003F> \x3F |0
-<U0040> \x40 |0
-<U0041> \x41 |0
-<U0042> \x42 |0
-<U0043> \x43 |0
-<U0044> \x44 |0
-<U0045> \x45 |0
-<U0046> \x46 |0
-<U0047> \x47 |0
-<U0048> \x48 |0
-<U0049> \x49 |0
-<U004A> \x4A |0
-<U004B> \x4B |0
-<U004C> \x4C |0
-<U004D> \x4D |0
-<U004E> \x4E |0
-<U004F> \x4F |0
-<U0050> \x50 |0
-<U0051> \x51 |0
-<U0052> \x52 |0
-<U0053> \x53 |0
-<U0054> \x54 |0
-<U0055> \x55 |0
-<U0056> \x56 |0
-<U0057> \x57 |0
-<U0058> \x58 |0
-<U0059> \x59 |0
-<U005A> \x5A |0
-<U005B> \x5B |0
-<U005C> \x5C |0
-<U005D> \x5D |0
-<U005E> \x5E |0
-<U005F> \x5F |0
-<U0060> \x60 |0
-<U0061> \x61 |0
-<U0062> \x62 |0
-<U0063> \x63 |0
-<U0064> \x64 |0
-<U0065> \x65 |0
-<U0066> \x66 |0
-<U0067> \x67 |0
-<U0068> \x68 |0
-<U0069> \x69 |0
-<U006A> \x6A |0
-<U006B> \x6B |0
-<U006C> \x6C |0
-<U006D> \x6D |0
-<U006E> \x6E |0
-<U006F> \x6F |0
-<U0070> \x70 |0
-<U0071> \x71 |0
-<U0072> \x72 |0
-<U0073> \x73 |0
-<U0074> \x74 |0
-<U0075> \x75 |0
-<U0076> \x76 |0
-<U0077> \x77 |0
-<U0078> \x78 |0
-<U0079> \x79 |0
-<U007A> \x7A |0
-<U007B> \x7B |0
-<U007C> \x7C |0
-<U007D> \x7D |0
-<U007E> \x7E |0
-<U007F> \x7F |0
-#<U0080> \x80 |0
-<U00A7> \xA1\xB1 |0
-<U00AF> \xA1\xC2 |0
-<U00B0> \xA2\x58 |0
-<U00B1> \xA1\xD3 |0
-<U00B7> \xA1\x50 |0
-<U00D7> \xA1\xD1 |0
-<U00F7> \xA1\xD2 |0
-<U02C7> \xA3\xBE |0
-<U02C9> \xA3\xBC |0
-<U02CA> \xA3\xBD |0
-<U02CB> \xA3\xBF |0
-<U02CD> \xA1\xC5 |0
-<U02D9> \xA3\xBB |0
-<U0391> \xA3\x44 |0
-<U0392> \xA3\x45 |0
-<U0393> \xA3\x46 |0
-<U0394> \xA3\x47 |0
-<U0395> \xA3\x48 |0
-<U0396> \xA3\x49 |0
-<U0397> \xA3\x4A |0
-<U0398> \xA3\x4B |0
-<U0399> \xA3\x4C |0
-<U039A> \xA3\x4D |0
-<U039B> \xA3\x4E |0
-<U039C> \xA3\x4F |0
-<U039D> \xA3\x50 |0
-<U039E> \xA3\x51 |0
-<U039F> \xA3\x52 |0
-<U03A0> \xA3\x53 |0
-<U03A1> \xA3\x54 |0
-<U03A3> \xA3\x55 |0
-<U03A4> \xA3\x56 |0
-<U03A5> \xA3\x57 |0
-<U03A6> \xA3\x58 |0
-<U03A7> \xA3\x59 |0
-<U03A8> \xA3\x5A |0
-<U03A9> \xA3\x5B |0
-<U03B1> \xA3\x5C |0
-<U03B2> \xA3\x5D |0
-<U03B3> \xA3\x5E |0
-<U03B4> \xA3\x5F |0
-<U03B5> \xA3\x60 |0
-<U03B6> \xA3\x61 |0
-<U03B7> \xA3\x62 |0
-<U03B8> \xA3\x63 |0
-<U03B9> \xA3\x64 |0
-<U03BA> \xA3\x65 |0
-<U03BB> \xA3\x66 |0
-<U03BC> \xA3\x67 |0
-<U03BD> \xA3\x68 |0
-<U03BE> \xA3\x69 |0
-<U03BF> \xA3\x6A |0
-<U03C0> \xA3\x6B |0
-<U03C1> \xA3\x6C |0
-<U03C3> \xA3\x6D |0
-<U03C4> \xA3\x6E |0
-<U03C5> \xA3\x6F |0
-<U03C6> \xA3\x70 |0
-<U03C7> \xA3\x71 |0
-<U03C8> \xA3\x72 |0
-<U03C9> \xA3\x73 |0
-<U2013> \xA1\x56 |0
-<U2014> \xA1\x58 |0
-<U2018> \xA1\xA5 |0
-<U2019> \xA1\xA6 |0
-<U201C> \xA1\xA7 |0
-<U201D> \xA1\xA8 |0
-<U2025> \xA1\x4C |0
-<U2026> \xA1\x4B |0
-<U2027> \xA1\x45 |0
-<U2032> \xA1\xAC |0
-<U2035> \xA1\xAB |0
-<U203B> \xA1\xB0 |0
-<U20AC> \xA3\xE1 |0
-<U2103> \xA2\x4A |0
-<U2105> \xA1\xC1 |0
-<U2109> \xA2\x4B |0
-<U2160> \xA2\xB9 |0
-<U2161> \xA2\xBA |0
-<U2162> \xA2\xBB |0
-<U2163> \xA2\xBC |0
-<U2164> \xA2\xBD |0
-<U2165> \xA2\xBE |0
-<U2166> \xA2\xBF |0
-<U2167> \xA2\xC0 |0
-<U2168> \xA2\xC1 |0
-<U2169> \xA2\xC2 |0
-<U2190> \xA1\xF6 |0
-<U2191> \xA1\xF4 |0
-<U2192> \xA1\xF7 |0
-<U2193> \xA1\xF5 |0
-<U2196> \xA1\xF8 |0
-<U2197> \xA1\xF9 |0
-<U2198> \xA1\xFB |0
-<U2199> \xA1\xFA |0
-<U2215> \xA2\x41 |0
-<U221A> \xA1\xD4 |0
-<U221E> \xA1\xDB |0
-<U221F> \xA1\xE8 |0
-<U2220> \xA1\xE7 |0
-<U2223> \xA1\xFD |0
-<U2225> \xA1\xFC |0
-<U2229> \xA1\xE4 |0
-<U222A> \xA1\xE5 |0
-<U222B> \xA1\xEC |0
-<U222E> \xA1\xED |0
-<U2234> \xA1\xEF |0
-<U2235> \xA1\xEE |0
-<U2252> \xA1\xDC |0
-<U2260> \xA1\xDA |0
-<U2261> \xA1\xDD |0
-<U2266> \xA1\xD8 |0
-<U2267> \xA1\xD9 |0
-<U2295> \xA1\xF2 |0
-<U2299> \xA1\xF3 |0
-<U22A5> \xA1\xE6 |0
-<U22BF> \xA1\xE9 |0
-<U2500> \xA2\x77 |0
-<U2502> \xA2\x78 |0
-<U250C> \xA2\x7A |0
-<U2510> \xA2\x7B |0
-<U2514> \xA2\x7C |0
-<U2518> \xA2\x7D |0
-<U251C> \xA2\x75 |0
-<U2524> \xA2\x74 |0
-<U252C> \xA2\x73 |0
-<U2534> \xA2\x72 |0
-<U253C> \xA2\x71 |0
-<U2550> \xA2\xA4 |0
-<U2550> \xF9\xF9 |3
-<U2551> \xF9\xF8 |0
-<U2552> \xF9\xE6 |0
-<U2553> \xF9\xEF |0
-<U2554> \xF9\xDD |0
-<U2555> \xF9\xE8 |0
-<U2556> \xF9\xF1 |0
-<U2557> \xF9\xDF |0
-<U2558> \xF9\xEC |0
-<U2559> \xF9\xF5 |0
-<U255A> \xF9\xE3 |0
-<U255B> \xF9\xEE |0
-<U255C> \xF9\xF7 |0
-<U255D> \xF9\xE5 |0
-<U255E> \xA2\xA5 |0
-<U255E> \xF9\xE9 |3
-<U255F> \xF9\xF2 |0
-<U2560> \xF9\xE0 |0
-<U2561> \xA2\xA7 |0
-<U2561> \xF9\xEB |3
-<U2562> \xF9\xF4 |0
-<U2563> \xF9\xE2 |0
-<U2564> \xF9\xE7 |0
-<U2565> \xF9\xF0 |0
-<U2566> \xF9\xDE |0
-<U2567> \xF9\xED |0
-<U2568> \xF9\xF6 |0
-<U2569> \xF9\xE4 |0
-<U256A> \xA2\xA6 |0
-<U256A> \xF9\xEA |3
-<U256B> \xF9\xF3 |0
-<U256C> \xF9\xE1 |0
-<U256D> \xA2\x7E |0
-<U256D> \xF9\xFA |3
-<U256E> \xA2\xA1 |0
-<U256E> \xF9\xFB |3
-<U256F> \xA2\xA3 |0
-<U256F> \xF9\xFD |3
-<U2570> \xA2\xA2 |0
-<U2570> \xF9\xFC |3
-<U2571> \xA2\xAC |0
-<U2572> \xA2\xAD |0
-<U2573> \xA2\xAE |0
-<U2574> \xA1\x5A |0
-<U2581> \xA2\x62 |0
-<U2582> \xA2\x63 |0
-<U2583> \xA2\x64 |0
-<U2584> \xA2\x65 |0
-<U2585> \xA2\x66 |0
-<U2586> \xA2\x67 |0
-<U2587> \xA2\x68 |0
-<U2588> \xA2\x69 |0
-<U2589> \xA2\x70 |0
-<U258A> \xA2\x6F |0
-<U258B> \xA2\x6E |0
-<U258C> \xA2\x6D |0
-<U258D> \xA2\x6C |0
-<U258E> \xA2\x6B |0
-<U258F> \xA2\x6A |0
-<U2593> \xF9\xFE |0
-<U2594> \xA2\x76 |0
-<U2595> \xA2\x79 |0
-<U25A0> \xA1\xBD |0
-<U25A1> \xA1\xBC |0
-<U25B2> \xA1\xB6 |0
-<U25B3> \xA1\xB5 |0
-<U25BC> \xA1\xBF |0
-<U25BD> \xA1\xBE |0
-<U25C6> \xA1\xBB |0
-<U25C7> \xA1\xBA |0
-<U25CB> \xA1\xB3 |0
-<U25CE> \xA1\xB7 |0
-<U25CF> \xA1\xB4 |0
-<U25E2> \xA2\xA8 |0
-<U25E3> \xA2\xA9 |0
-<U25E4> \xA2\xAB |0
-<U25E5> \xA2\xAA |0
-<U2605> \xA1\xB9 |0
-<U2606> \xA1\xB8 |0
-<U2640> \xA1\xF0 |0
-<U2642> \xA1\xF1 |0
-<U3000> \xA1\x40 |0
-<U3001> \xA1\x42 |0
-<U3002> \xA1\x43 |0
-<U3003> \xA1\xB2 |0
-<U3008> \xA1\x71 |0
-<U3009> \xA1\x72 |0
-<U300A> \xA1\x6D |0
-<U300B> \xA1\x6E |0
-<U300C> \xA1\x75 |0
-<U300D> \xA1\x76 |0
-<U300E> \xA1\x79 |0
-<U300F> \xA1\x7A |0
-<U3010> \xA1\x69 |0
-<U3011> \xA1\x6A |0
-<U3012> \xA2\x45 |0
-<U3014> \xA1\x65 |0
-<U3015> \xA1\x66 |0
-<U301D> \xA1\xA9 |0
-<U301E> \xA1\xAA |0
-<U3021> \xA2\xC3 |0
-<U3022> \xA2\xC4 |0
-<U3023> \xA2\xC5 |0
-<U3024> \xA2\xC6 |0
-<U3025> \xA2\xC7 |0
-<U3026> \xA2\xC8 |0
-<U3027> \xA2\xC9 |0
-<U3028> \xA2\xCA |0
-<U3029> \xA2\xCB |0
-<U3105> \xA3\x74 |0
-<U3106> \xA3\x75 |0
-<U3107> \xA3\x76 |0
-<U3108> \xA3\x77 |0
-<U3109> \xA3\x78 |0
-<U310A> \xA3\x79 |0
-<U310B> \xA3\x7A |0
-<U310C> \xA3\x7B |0
-<U310D> \xA3\x7C |0
-<U310E> \xA3\x7D |0
-<U310F> \xA3\x7E |0
-<U3110> \xA3\xA1 |0
-<U3111> \xA3\xA2 |0
-<U3112> \xA3\xA3 |0
-<U3113> \xA3\xA4 |0
-<U3114> \xA3\xA5 |0
-<U3115> \xA3\xA6 |0
-<U3116> \xA3\xA7 |0
-<U3117> \xA3\xA8 |0
-<U3118> \xA3\xA9 |0
-<U3119> \xA3\xAA |0
-<U311A> \xA3\xAB |0
-<U311B> \xA3\xAC |0
-<U311C> \xA3\xAD |0
-<U311D> \xA3\xAE |0
-<U311E> \xA3\xAF |0
-<U311F> \xA3\xB0 |0
-<U3120> \xA3\xB1 |0
-<U3121> \xA3\xB2 |0
-<U3122> \xA3\xB3 |0
-<U3123> \xA3\xB4 |0
-<U3124> \xA3\xB5 |0
-<U3125> \xA3\xB6 |0
-<U3126> \xA3\xB7 |0
-<U3127> \xA3\xB8 |0
-<U3128> \xA3\xB9 |0
-<U3129> \xA3\xBA |0
-<U32A3> \xA1\xC0 |0
-<U338E> \xA2\x55 |0
-<U338F> \xA2\x56 |0
-<U339C> \xA2\x50 |0
-<U339D> \xA2\x51 |0
-<U339E> \xA2\x52 |0
-<U33A1> \xA2\x54 |0
-<U33C4> \xA2\x57 |0
-<U33CE> \xA2\x53 |0
-<U33D1> \xA1\xEB |0
-<U33D2> \xA1\xEA |0
-<U33D5> \xA2\x4F |0
-<U4E00> \xA4\x40 |0
-<U4E01> \xA4\x42 |0
-<U4E03> \xA4\x43 |0
-<U4E07> \xC9\x45 |0
-<U4E08> \xA4\x56 |0
-<U4E09> \xA4\x54 |0
-<U4E0A> \xA4\x57 |0
-<U4E0B> \xA4\x55 |0
-<U4E0C> \xC9\x46 |0
-<U4E0D> \xA4\xA3 |0
-<U4E0E> \xC9\x4F |0
-<U4E0F> \xC9\x4D |0
-<U4E10> \xA4\xA2 |0
-<U4E11> \xA4\xA1 |0
-<U4E14> \xA5\x42 |0
-<U4E15> \xA5\x41 |0
-<U4E16> \xA5\x40 |0
-<U4E18> \xA5\x43 |0
-<U4E19> \xA4\xFE |0
-<U4E1E> \xA5\xE0 |0
-<U4E1F> \xA5\xE1 |0
-<U4E26> \xA8\xC3 |0
-<U4E2B> \xA4\x58 |0
-<U4E2D> \xA4\xA4 |0
-<U4E2E> \xC9\x50 |0
-<U4E30> \xA4\xA5 |0
-<U4E31> \xC9\x63 |0
-<U4E32> \xA6\xEA |0
-<U4E33> \xCB\xB1 |0
-<U4E38> \xA4\x59 |0
-<U4E39> \xA4\xA6 |0
-<U4E3B> \xA5\x44 |0
-<U4E3C> \xC9\x64 |0
-<U4E42> \xC9\x40 |0
-<U4E43> \xA4\x44 |0
-<U4E45> \xA4\x5B |0
-<U4E47> \xC9\x47 |0
-<U4E48> \xA4\x5C |0
-<U4E4B> \xA4\xA7 |0
-<U4E4D> \xA5\x45 |0
-<U4E4E> \xA5\x47 |0
-<U4E4F> \xA5\x46 |0
-<U4E52> \xA5\xE2 |0
-<U4E53> \xA5\xE3 |0
-<U4E56> \xA8\xC4 |0
-<U4E58> \xAD\xBC |0
-<U4E59> \xA4\x41 |0
-<U4E5C> \xC9\x41 |0
-<U4E5D> \xA4\x45 |0
-<U4E5E> \xA4\x5E |0
-<U4E5F> \xA4\x5D |0
-<U4E69> \xA5\xE4 |0
-<U4E73> \xA8\xC5 |0
-<U4E7E> \xB0\xAE |0
-<U4E7F> \xD4\x4B |0
-<U4E82> \xB6\xC3 |0
-<U4E83> \xDC\xB1 |0
-<U4E84> \xDC\xB2 |0
-<U4E86> \xA4\x46 |0
-<U4E88> \xA4\xA9 |0
-<U4E8B> \xA8\xC6 |0
-<U4E8C> \xA4\x47 |0
-<U4E8D> \xC9\x48 |0
-<U4E8E> \xA4\x5F |0
-<U4E91> \xA4\xAA |0
-<U4E92> \xA4\xAC |0
-<U4E93> \xC9\x51 |0
-<U4E94> \xA4\xAD |0
-<U4E95> \xA4\xAB |0
-<U4E99> \xA5\xE5 |0
-<U4E9B> \xA8\xC7 |0
-<U4E9E> \xA8\xC8 |0
-<U4E9F> \xAB\x45 |0
-<U4EA1> \xA4\x60 |0
-<U4EA2> \xA4\xAE |0
-<U4EA4> \xA5\xE6 |0
-<U4EA5> \xA5\xE8 |0
-<U4EA6> \xA5\xE7 |0
-<U4EA8> \xA6\xEB |0
-<U4EAB> \xA8\xC9 |0
-<U4EAC> \xA8\xCA |0
-<U4EAD> \xAB\x46 |0
-<U4EAE> \xAB\x47 |0
-<U4EB3> \xAD\xBD |0
-<U4EB6> \xDC\xB3 |0
-<U4EB9> \xF6\xD6 |0
-<U4EBA> \xA4\x48 |0
-<U4EC0> \xA4\xB0 |0
-<U4EC1> \xA4\xAF |0
-<U4EC2> \xC9\x52 |0
-<U4EC3> \xA4\xB1 |0
-<U4EC4> \xA4\xB7 |0
-<U4EC6> \xA4\xB2 |0
-<U4EC7> \xA4\xB3 |0
-<U4EC8> \xC9\x54 |0
-<U4EC9> \xC9\x53 |0
-<U4ECA> \xA4\xB5 |0
-<U4ECB> \xA4\xB6 |0
-<U4ECD> \xA4\xB4 |0
-<U4ED4> \xA5\x4A |0
-<U4ED5> \xA5\x4B |0
-<U4ED6> \xA5\x4C |0
-<U4ED7> \xA5\x4D |0
-<U4ED8> \xA5\x49 |0
-<U4ED9> \xA5\x50 |0
-<U4EDA> \xC9\x6A |0
-<U4EDC> \xC9\x66 |0
-<U4EDD> \xC9\x69 |0
-<U4EDE> \xA5\x51 |0
-<U4EDF> \xA5\x61 |0
-<U4EE1> \xC9\x68 |0
-<U4EE3> \xA5\x4E |0
-<U4EE4> \xA5\x4F |0
-<U4EE5> \xA5\x48 |0
-<U4EE8> \xC9\x65 |0
-<U4EE9> \xC9\x67 |0
-<U4EF0> \xA5\xF5 |0
-<U4EF1> \xC9\xB0 |0
-<U4EF2> \xA5\xF2 |0
-<U4EF3> \xA5\xF6 |0
-<U4EF4> \xC9\xBA |0
-<U4EF5> \xC9\xAE |0
-<U4EF6> \xA5\xF3 |0
-<U4EF7> \xC9\xB2 |0
-<U4EFB> \xA5\xF4 |0
-<U4EFD> \xA5\xF7 |0
-<U4EFF> \xA5\xE9 |0
-<U4F00> \xC9\xB1 |0
-<U4F01> \xA5\xF8 |0
-<U4F02> \xC9\xB5 |0
-<U4F04> \xC9\xB9 |0
-<U4F05> \xC9\xB6 |0
-<U4F08> \xC9\xB3 |0
-<U4F09> \xA5\xEA |0
-<U4F0A> \xA5\xEC |0
-<U4F0B> \xA5\xF9 |0
-<U4F0D> \xA5\xEE |0
-<U4F0E> \xC9\xAB |0
-<U4F0F> \xA5\xF1 |0
-<U4F10> \xA5\xEF |0
-<U4F11> \xA5\xF0 |0
-<U4F12> \xC9\xBB |0
-<U4F13> \xC9\xB8 |0
-<U4F14> \xC9\xAF |0
-<U4F15> \xA5\xED |0
-<U4F18> \xC9\xAC |0
-<U4F19> \xA5\xEB |0
-<U4F1D> \xC9\xB4 |0
-<U4F22> \xC9\xB7 |0
-<U4F2C> \xC9\xAD |0
-<U4F2D> \xCA\x66 |0
-<U4F2F> \xA7\x42 |0
-<U4F30> \xA6\xF4 |0
-<U4F33> \xCA\x67 |0
-<U4F34> \xA6\xF1 |0
-<U4F36> \xA7\x44 |0
-<U4F38> \xA6\xF9 |0
-<U4F3A> \xA6\xF8 |0
-<U4F3B> \xCA\x5B |0
-<U4F3C> \xA6\xFC |0
-<U4F3D> \xA6\xF7 |0
-<U4F3E> \xCA\x60 |0
-<U4F3F> \xCA\x68 |0
-<U4F41> \xCA\x64 |0
-<U4F43> \xA6\xFA |0
-<U4F46> \xA6\xFD |0
-<U4F47> \xA6\xEE |0
-<U4F48> \xA7\x47 |0
-<U4F49> \xCA\x5D |0
-<U4F4C> \xCB\xBD |0
-<U4F4D> \xA6\xEC |0
-<U4F4E> \xA7\x43 |0
-<U4F4F> \xA6\xED |0
-<U4F50> \xA6\xF5 |0
-<U4F51> \xA6\xF6 |0
-<U4F52> \xCA\x62 |0
-<U4F53> \xCA\x5E |0
-<U4F54> \xA6\xFB |0
-<U4F55> \xA6\xF3 |0
-<U4F56> \xCA\x5A |0
-<U4F57> \xA6\xEF |0
-<U4F58> \xCA\x65 |0
-<U4F59> \xA7\x45 |0
-<U4F5A> \xA7\x48 |0
-<U4F5B> \xA6\xF2 |0
-<U4F5C> \xA7\x40 |0
-<U4F5D> \xA7\x46 |0
-<U4F5E> \xA6\xF0 |0
-<U4F5F> \xCA\x63 |0
-<U4F60> \xA7\x41 |0
-<U4F61> \xCA\x69 |0
-<U4F62> \xCA\x5C |0
-<U4F63> \xA6\xFE |0
-<U4F64> \xCA\x5F |0
-<U4F67> \xCA\x61 |0
-<U4F69> \xA8\xD8 |0
-<U4F6A> \xCB\xBF |0
-<U4F6B> \xCB\xCB |0
-<U4F6C> \xA8\xD0 |0
-<U4F6E> \xCB\xCC |0
-<U4F6F> \xA8\xCB |0
-<U4F70> \xA8\xD5 |0
-<U4F73> \xA8\xCE |0
-<U4F74> \xCB\xB9 |0
-<U4F75> \xA8\xD6 |0
-<U4F76> \xCB\xB8 |0
-<U4F77> \xCB\xBC |0
-<U4F78> \xCB\xC3 |0
-<U4F79> \xCB\xC1 |0
-<U4F7A> \xA8\xDE |0
-<U4F7B> \xA8\xD9 |0
-<U4F7C> \xCB\xB3 |0
-<U4F7D> \xCB\xB5 |0
-<U4F7E> \xA8\xDB |0
-<U4F7F> \xA8\xCF |0
-<U4F80> \xCB\xB6 |0
-<U4F81> \xCB\xC2 |0
-<U4F82> \xCB\xC9 |0
-<U4F83> \xA8\xD4 |0
-<U4F84> \xCB\xBB |0
-<U4F85> \xCB\xB4 |0
-<U4F86> \xA8\xD3 |0
-<U4F87> \xCB\xB7 |0
-<U4F88> \xA8\xD7 |0
-<U4F89> \xCB\xBA |0
-<U4F8B> \xA8\xD2 |0
-<U4F8D> \xA8\xCD |0
-<U4F8F> \xA8\xDC |0
-<U4F90> \xCB\xC4 |0
-<U4F91> \xA8\xDD |0
-<U4F92> \xCB\xC8 |0
-<U4F94> \xCB\xC6 |0
-<U4F95> \xCB\xCA |0
-<U4F96> \xA8\xDA |0
-<U4F97> \xCB\xBE |0
-<U4F98> \xCB\xB2 |0
-<U4F9A> \xCB\xC0 |0
-<U4F9B> \xA8\xD1 |0
-<U4F9C> \xCB\xC5 |0
-<U4F9D> \xA8\xCC |0
-<U4F9E> \xCB\xC7 |0
-<U4FAE> \xAB\x56 |0
-<U4FAF> \xAB\x4A |0
-<U4FB2> \xCD\xE0 |0
-<U4FB3> \xCD\xE8 |0
-<U4FB5> \xAB\x49 |0
-<U4FB6> \xAB\x51 |0
-<U4FB7> \xAB\x5D |0
-<U4FB9> \xCD\xEE |0
-<U4FBA> \xCD\xEC |0
-<U4FBB> \xCD\xE7 |0
-<U4FBF> \xAB\x4B |0
-<U4FC0> \xCD\xED |0
-<U4FC1> \xCD\xE3 |0
-<U4FC2> \xAB\x59 |0
-<U4FC3> \xAB\x50 |0
-<U4FC4> \xAB\x58 |0
-<U4FC5> \xCD\xDE |0
-<U4FC7> \xCD\xEA |0
-<U4FC9> \xCD\xE1 |0
-<U4FCA> \xAB\x54 |0
-<U4FCB> \xCD\xE2 |0
-<U4FCD> \xCD\xDD |0
-<U4FCE> \xAB\x5B |0
-<U4FCF> \xAB\x4E |0
-<U4FD0> \xAB\x57 |0
-<U4FD1> \xAB\x4D |0
-<U4FD3> \xCD\xDF |0
-<U4FD4> \xCD\xE4 |0
-<U4FD6> \xCD\xEB |0
-<U4FD7> \xAB\x55 |0
-<U4FD8> \xAB\x52 |0
-<U4FD9> \xCD\xE6 |0
-<U4FDA> \xAB\x5A |0
-<U4FDB> \xCD\xE9 |0
-<U4FDC> \xCD\xE5 |0
-<U4FDD> \xAB\x4F |0
-<U4FDE> \xAB\x5C |0
-<U4FDF> \xAB\x53 |0
-<U4FE0> \xAB\x4C |0
-<U4FE1> \xAB\x48 |0
-<U4FEC> \xCD\xEF |0
-<U4FEE> \xAD\xD7 |0
-<U4FEF> \xAD\xC1 |0
-<U4FF1> \xAD\xD1 |0
-<U4FF3> \xAD\xD6 |0
-<U4FF4> \xD0\xD0 |0
-<U4FF5> \xD0\xCF |0
-<U4FF6> \xD0\xD4 |0
-<U4FF7> \xD0\xD5 |0
-<U4FF8> \xAD\xC4 |0
-<U4FFA> \xAD\xCD |0
-<U4FFE> \xAD\xDA |0
-<U5000> \xAD\xCE |0
-<U5005> \xD0\xC9 |0
-<U5006> \xAD\xC7 |0
-<U5007> \xD0\xCA |0
-<U5009> \xAD\xDC |0
-<U500B> \xAD\xD3 |0
-<U500C> \xAD\xBE |0
-<U500D> \xAD\xBF |0
-<U500E> \xD0\xDD |0
-<U500F> \xB0\xBF |0
-<U5011> \xAD\xCC |0
-<U5012> \xAD\xCB |0
-<U5013> \xD0\xCB |0
-<U5014> \xAD\xCF |0
-<U5015> \xD4\x5B |0
-<U5016> \xAD\xC6 |0
-<U5017> \xD0\xD6 |0
-<U5018> \xAD\xD5 |0
-<U5019> \xAD\xD4 |0
-<U501A> \xAD\xCA |0
-<U501B> \xD0\xCE |0
-<U501C> \xD0\xD7 |0
-<U501E> \xD0\xC8 |0
-<U501F> \xAD\xC9 |0
-<U5020> \xD0\xD8 |0
-<U5021> \xAD\xD2 |0
-<U5022> \xD0\xCC |0
-<U5023> \xAD\xC0 |0
-<U5025> \xAD\xC3 |0
-<U5026> \xAD\xC2 |0
-<U5027> \xD0\xD9 |0
-<U5028> \xAD\xD0 |0
-<U5029> \xAD\xC5 |0
-<U502A> \xAD\xD9 |0
-<U502B> \xAD\xDB |0
-<U502C> \xD0\xD3 |0
-<U502D> \xAD\xD8 |0
-<U502F> \xD0\xDB |0
-<U5030> \xD0\xCD |0
-<U5031> \xD0\xDC |0
-<U5033> \xD0\xD1 |0
-<U5035> \xD0\xDA |0
-<U5037> \xD0\xD2 |0
-<U503C> \xAD\xC8 |0
-<U5040> \xD4\x63 |0
-<U5041> \xD4\x57 |0
-<U5043> \xB0\xB3 |0
-<U5045> \xD4\x5C |0
-<U5046> \xD4\x62 |0
-<U5047> \xB0\xB2 |0
-<U5048> \xD4\x55 |0
-<U5049> \xB0\xB6 |0
-<U504A> \xD4\x59 |0
-<U504B> \xD4\x52 |0
-<U504C> \xB0\xB4 |0
-<U504D> \xD4\x56 |0
-<U504E> \xB0\xB9 |0
-<U504F> \xB0\xBE |0
-<U5051> \xD4\x67 |0
-<U5053> \xD4\x51 |0
-<U5055> \xB0\xBA |0
-<U5057> \xD4\x66 |0
-<U505A> \xB0\xB5 |0
-<U505B> \xD4\x58 |0
-<U505C> \xB0\xB1 |0
-<U505D> \xD4\x53 |0
-<U505E> \xD4\x4F |0
-<U505F> \xD4\x5D |0
-<U5060> \xD4\x50 |0
-<U5061> \xD4\x4E |0
-<U5062> \xD4\x5A |0
-<U5063> \xD4\x60 |0
-<U5064> \xD4\x61 |0
-<U5065> \xB0\xB7 |0
-<U5068> \xD8\x5B |0
-<U5069> \xD4\x5E |0
-<U506A> \xD4\x4D |0
-<U506B> \xD4\x5F |0
-<U506D> \xB0\xC1 |0
-<U506E> \xD4\x64 |0
-<U506F> \xB0\xC0 |0
-<U5070> \xD4\x4C |0
-<U5072> \xD4\x54 |0
-<U5073> \xD4\x65 |0
-<U5074> \xB0\xBC |0
-<U5075> \xB0\xBB |0
-<U5076> \xB0\xB8 |0
-<U5077> \xB0\xBD |0
-<U507A> \xB0\xAF |0
-<U507D> \xB0\xB0 |0
-<U5080> \xB3\xC8 |0
-<U5082> \xD8\x5E |0
-<U5083> \xD8\x57 |0
-<U5085> \xB3\xC5 |0
-<U5087> \xD8\x5F |0
-<U508B> \xD8\x55 |0
-<U508C> \xD8\x58 |0
-<U508D> \xB3\xC4 |0
-<U508E> \xD8\x59 |0
-<U5091> \xB3\xC7 |0
-<U5092> \xD8\x5D |0
-<U5094> \xD8\x53 |0
-<U5095> \xD8\x52 |0
-<U5096> \xB3\xC9 |0
-<U5098> \xB3\xCA |0
-<U5099> \xB3\xC6 |0
-<U509A> \xB3\xCB |0
-<U509B> \xD8\x51 |0
-<U509C> \xD8\x5C |0
-<U509D> \xD8\x5A |0
-<U509E> \xD8\x54 |0
-<U50A2> \xB3\xC3 |0
-<U50A3> \xD8\x56 |0
-<U50AC> \xB6\xCA |0
-<U50AD> \xB6\xC4 |0
-<U50AE> \xDC\xB7 |0
-<U50AF> \xB6\xCD |0
-<U50B0> \xDC\xBD |0
-<U50B1> \xDC\xC0 |0
-<U50B2> \xB6\xC6 |0
-<U50B3> \xB6\xC7 |0
-<U50B4> \xDC\xBA |0
-<U50B5> \xB6\xC5 |0
-<U50B6> \xDC\xC3 |0
-<U50B7> \xB6\xCB |0
-<U50B8> \xDC\xC4 |0
-<U50BA> \xDC\xBF |0
-<U50BB> \xB6\xCC |0
-<U50BD> \xDC\xB4 |0
-<U50BE> \xB6\xC9 |0
-<U50BF> \xDC\xB5 |0
-<U50C1> \xDC\xBE |0
-<U50C2> \xDC\xBC |0
-<U50C4> \xDC\xB8 |0
-<U50C5> \xB6\xC8 |0
-<U50C6> \xDC\xB6 |0
-<U50C7> \xB6\xCE |0
-<U50C8> \xDC\xBB |0
-<U50C9> \xDC\xC2 |0
-<U50CA> \xDC\xB9 |0
-<U50CB> \xDC\xC1 |0
-<U50CE> \xB9\xB6 |0
-<U50CF> \xB9\xB3 |0
-<U50D1> \xB9\xB4 |0
-<U50D3> \xE0\xF9 |0
-<U50D4> \xE0\xF1 |0
-<U50D5> \xB9\xB2 |0
-<U50D6> \xB9\xAF |0
-<U50D7> \xE0\xF2 |0
-<U50DA> \xB9\xB1 |0
-<U50DB> \xE0\xF5 |0
-<U50DD> \xE0\xF7 |0
-<U50E0> \xE0\xFE |0
-<U50E3> \xE0\xFD |0
-<U50E4> \xE0\xF8 |0
-<U50E5> \xB9\xAE |0
-<U50E6> \xE0\xF0 |0
-<U50E7> \xB9\xAC |0
-<U50E8> \xE0\xF3 |0
-<U50E9> \xB9\xB7 |0
-<U50EA> \xE0\xF6 |0
-<U50EC> \xE0\xFA |0
-<U50ED> \xB9\xB0 |0
-<U50EE> \xB9\xAD |0
-<U50EF> \xE0\xFC |0
-<U50F0> \xE0\xFB |0
-<U50F1> \xB9\xB5 |0
-<U50F3> \xE0\xF4 |0
-<U50F5> \xBB\xF8 |0
-<U50F6> \xE4\xEC |0
-<U50F8> \xE4\xE9 |0
-<U50F9> \xBB\xF9 |0
-<U50FB> \xBB\xF7 |0
-<U50FD> \xE4\xF0 |0
-<U50FE> \xE4\xED |0
-<U50FF> \xE4\xE6 |0
-<U5100> \xBB\xF6 |0
-<U5102> \xBB\xFA |0
-<U5103> \xE4\xE7 |0
-<U5104> \xBB\xF5 |0
-<U5105> \xBB\xFD |0
-<U5106> \xE4\xEA |0
-<U5107> \xE4\xEB |0
-<U5108> \xBB\xFB |0
-<U5109> \xBB\xFC |0
-<U510A> \xE4\xF1 |0
-<U510B> \xE4\xEE |0
-<U510C> \xE4\xEF |0
-<U5110> \xBE\xAA |0
-<U5111> \xE8\xF8 |0
-<U5112> \xBE\xA7 |0
-<U5113> \xE8\xF5 |0
-<U5114> \xBE\xA9 |0
-<U5115> \xBE\xAB |0
-<U5117> \xE8\xF6 |0
-<U5118> \xBE\xA8 |0
-<U511A> \xE8\xF7 |0
-<U511C> \xE8\xF4 |0
-<U511F> \xC0\x76 |0
-<U5120> \xEC\xBD |0
-<U5121> \xC0\x77 |0
-<U5122> \xEC\xBB |0
-<U5124> \xEC\xBC |0
-<U5125> \xEC\xBA |0
-<U5126> \xEC\xB9 |0
-<U5129> \xEC\xBE |0
-<U512A> \xC0\x75 |0
-<U512D> \xEF\xB8 |0
-<U512E> \xEF\xB9 |0
-<U5130> \xE4\xE8 |0
-<U5131> \xEF\xB7 |0
-<U5132> \xC0\x78 |0
-<U5133> \xC3\x5F |0
-<U5134> \xF1\xEB |0
-<U5135> \xF1\xEC |0
-<U5137> \xC4\xD7 |0
-<U5138> \xC4\xD8 |0
-<U5139> \xF5\xC1 |0
-<U513A> \xF5\xC0 |0
-<U513B> \xC5\x6C |0
-<U513C> \xC5\x6B |0
-<U513D> \xF7\xD0 |0
-<U513F> \xA4\x49 |0
-<U5140> \xA4\x61 |0
-<U5141> \xA4\xB9 |0
-<U5143> \xA4\xB8 |0
-<U5144> \xA5\x53 |0
-<U5145> \xA5\x52 |0
-<U5146> \xA5\xFC |0
-<U5147> \xA5\xFB |0
-<U5148> \xA5\xFD |0
-<U5149> \xA5\xFA |0
-<U514B> \xA7\x4A |0
-<U514C> \xA7\x49 |0
-<U514D> \xA7\x4B |0
-<U5152> \xA8\xE0 |0
-<U5154> \xA8\xDF |0
-<U5155> \xA8\xE1 |0
-<U5157> \xAB\x5E |0
-<U5159> \xA2\x59 |0
-<U515A> \xD0\xDE |0
-<U515B> \xA2\x5A |0
-<U515C> \xB0\xC2 |0
-<U515D> \xA2\x5C |0
-<U515E> \xA2\x5B |0
-<U515F> \xD8\x60 |0
-<U5161> \xA2\x5D |0
-<U5162> \xB9\xB8 |0
-<U5163> \xA2\x5E |0
-<U5165> \xA4\x4A |0
-<U5167> \xA4\xBA |0
-<U5168> \xA5\xFE |0
-<U5169> \xA8\xE2 |0
-<U516B> \xA4\x4B |0
-<U516C> \xA4\xBD |0
-<U516D> \xA4\xBB |0
-<U516E> \xA4\xBC |0
-<U5171> \xA6\x40 |0
-<U5175> \xA7\x4C |0
-<U5176> \xA8\xE4 |0
-<U5177> \xA8\xE3 |0
-<U5178> \xA8\xE5 |0
-<U517C> \xAD\xDD |0
-<U5180> \xBE\xAC |0
-<U5187> \xC9\x4E |0
-<U5189> \xA5\x54 |0
-<U518A> \xA5\x55 |0
-<U518D> \xA6\x41 |0
-<U518F> \xCA\x6A |0
-<U5191> \xAB\x60 |0
-<U5192> \xAB\x5F |0
-<U5193> \xD0\xE0 |0
-<U5194> \xD0\xDF |0
-<U5195> \xB0\xC3 |0
-<U5197> \xA4\xBE |0
-<U5198> \xC9\x55 |0
-<U519E> \xCB\xCD |0
-<U51A0> \xAB\x61 |0
-<U51A2> \xAD\xE0 |0
-<U51A4> \xAD\xDE |0
-<U51A5> \xAD\xDF |0
-<U51AA> \xBE\xAD |0
-<U51AC> \xA5\x56 |0
-<U51B0> \xA6\x42 |0
-<U51B1> \xC9\xBC |0
-<U51B6> \xA7\x4D |0
-<U51B7> \xA7\x4E |0
-<U51B9> \xCA\x6B |0
-<U51BC> \xCB\xCE |0
-<U51BD> \xA8\xE6 |0
-<U51BE> \xCB\xCF |0
-<U51C4> \xD0\xE2 |0
-<U51C5> \xD0\xE3 |0
-<U51C6> \xAD\xE3 |0
-<U51C8> \xD0\xE4 |0
-<U51CA> \xD0\xE1 |0
-<U51CB> \xAD\xE4 |0
-<U51CC> \xAD\xE2 |0
-<U51CD> \xAD\xE1 |0
-<U51CE> \xD0\xE5 |0
-<U51D0> \xD4\x68 |0
-<U51D4> \xD8\x61 |0
-<U51D7> \xDC\xC5 |0
-<U51D8> \xE1\x40 |0
-<U51DC> \xBB\xFE |0
-<U51DD> \xBE\xAE |0
-<U51DE> \xE8\xF9 |0
-<U51E0> \xA4\x4C |0
-<U51E1> \xA4\x5A |0
-<U51F0> \xB0\xC4 |0
-<U51F1> \xB3\xCD |0
-<U51F3> \xB9\xB9 |0
-<U51F5> \xC9\x42 |0
-<U51F6> \xA4\xBF |0
-<U51F8> \xA5\x59 |0
-<U51F9> \xA5\x57 |0
-<U51FA> \xA5\x58 |0
-<U51FD> \xA8\xE7 |0
-<U5200> \xA4\x4D |0
-<U5201> \xA4\x4E |0
-<U5203> \xA4\x62 |0
-<U5206> \xA4\xC0 |0
-<U5207> \xA4\xC1 |0
-<U5208> \xA4\xC2 |0
-<U5209> \xC9\xBE |0
-<U520A> \xA5\x5A |0
-<U520C> \xC9\x6B |0
-<U520E> \xA6\x46 |0
-<U5210> \xC9\xBF |0
-<U5211> \xA6\x44 |0
-<U5212> \xA6\x45 |0
-<U5213> \xC9\xBD |0
-<U5216> \xA6\x47 |0
-<U5217> \xA6\x43 |0
-<U521C> \xCA\x6C |0
-<U521D> \xAA\xEC |0
-<U521E> \xCA\x6D |0
-<U5221> \xCA\x6E |0
-<U5224> \xA7\x50 |0
-<U5225> \xA7\x4F |0
-<U5228> \xA7\x53 |0
-<U5229> \xA7\x51 |0
-<U522A> \xA7\x52 |0
-<U522E> \xA8\xED |0
-<U5230> \xA8\xEC |0
-<U5231> \xCB\xD4 |0
-<U5232> \xCB\xD1 |0
-<U5233> \xCB\xD2 |0
-<U5235> \xCB\xD0 |0
-<U5236> \xA8\xEE |0
-<U5237> \xA8\xEA |0
-<U5238> \xA8\xE9 |0
-<U523A> \xA8\xEB |0
-<U523B> \xA8\xE8 |0
-<U5241> \xA8\xEF |0
-<U5243> \xAB\x63 |0
-<U5244> \xCD\xF0 |0
-<U5246> \xCB\xD3 |0
-<U5247> \xAB\x68 |0
-<U5249> \xCD\xF1 |0
-<U524A> \xAB\x64 |0
-<U524B> \xAB\x67 |0
-<U524C> \xAB\x66 |0
-<U524D> \xAB\x65 |0
-<U524E> \xAB\x62 |0
-<U5252> \xD0\xE8 |0
-<U5254> \xAD\xE7 |0
-<U5255> \xD0\xEB |0
-<U5256> \xAD\xE5 |0
-<U525A> \xD0\xE7 |0
-<U525B> \xAD\xE8 |0
-<U525C> \xAD\xE6 |0
-<U525D> \xAD\xE9 |0
-<U525E> \xD0\xE9 |0
-<U525F> \xD0\xEA |0
-<U5261> \xD0\xE6 |0
-<U5262> \xD0\xEC |0
-<U5269> \xB3\xD1 |0
-<U526A> \xB0\xC5 |0
-<U526B> \xD4\x69 |0
-<U526C> \xD4\x6B |0
-<U526D> \xD4\x6A |0
-<U526E> \xD4\x6C |0
-<U526F> \xB0\xC6 |0
-<U5272> \xB3\xCE |0
-<U5274> \xB3\xCF |0
-<U5275> \xB3\xD0 |0
-<U5277> \xB6\xD0 |0
-<U5278> \xDC\xC7 |0
-<U527A> \xDC\xC6 |0
-<U527B> \xDC\xC8 |0
-<U527C> \xDC\xC9 |0
-<U527D> \xB6\xD1 |0
-<U527F> \xB6\xCF |0
-<U5280> \xE1\x41 |0
-<U5281> \xE1\x42 |0
-<U5282> \xB9\xBB |0
-<U5283> \xB9\xBA |0
-<U5284> \xE3\x5A |0
-<U5287> \xBC\x40 |0
-<U5288> \xBC\x41 |0
-<U5289> \xBC\x42 |0
-<U528A> \xBC\x44 |0
-<U528B> \xE4\xF2 |0
-<U528C> \xE4\xF3 |0
-<U528D> \xBC\x43 |0
-<U5291> \xBE\xAF |0
-<U5293> \xBE\xB0 |0
-<U5296> \xF1\xED |0
-<U5297> \xF5\xC3 |0
-<U5298> \xF5\xC2 |0
-<U5299> \xF7\xD1 |0
-<U529B> \xA4\x4F |0
-<U529F> \xA5\x5C |0
-<U52A0> \xA5\x5B |0
-<U52A3> \xA6\x48 |0
-<U52A6> \xC9\xC0 |0
-<U52A9> \xA7\x55 |0
-<U52AA> \xA7\x56 |0
-<U52AB> \xA7\x54 |0
-<U52AC> \xA7\x57 |0
-<U52AD> \xCA\x6F |0
-<U52AE> \xCA\x70 |0
-<U52BB> \xA8\xF1 |0
-<U52BC> \xCB\xD5 |0
-<U52BE> \xA8\xF0 |0
-<U52C0> \xCD\xF2 |0
-<U52C1> \xAB\x6C |0
-<U52C2> \xCD\xF3 |0
-<U52C3> \xAB\x6B |0
-<U52C7> \xAB\x69 |0
-<U52C9> \xAB\x6A |0
-<U52CD> \xD0\xED |0
-<U52D2> \xB0\xC7 |0
-<U52D3> \xD4\x6E |0
-<U52D5> \xB0\xCA |0
-<U52D6> \xD4\x6D |0
-<U52D7> \xB1\xE5 |0
-<U52D8> \xB0\xC9 |0
-<U52D9> \xB0\xC8 |0
-<U52DB> \xB3\xD4 |0
-<U52DD> \xB3\xD3 |0
-<U52DE> \xB3\xD2 |0
-<U52DF> \xB6\xD2 |0
-<U52E2> \xB6\xD5 |0
-<U52E3> \xB6\xD6 |0
-<U52E4> \xB6\xD4 |0
-<U52E6> \xB6\xD3 |0
-<U52E9> \xE1\x43 |0
-<U52EB> \xE1\x44 |0
-<U52EF> \xE4\xF5 |0
-<U52F0> \xBC\x45 |0
-<U52F1> \xE4\xF4 |0
-<U52F3> \xBE\xB1 |0
-<U52F4> \xEC\xBF |0
-<U52F5> \xC0\x79 |0
-<U52F7> \xF1\xEE |0
-<U52F8> \xC4\x55 |0
-<U52FA> \xA4\x63 |0
-<U52FB> \xA4\xC3 |0
-<U52FC> \xC9\x56 |0
-<U52FE> \xA4\xC4 |0
-<U52FF> \xA4\xC5 |0
-<U5305> \xA5\x5D |0
-<U5306> \xA5\x5E |0
-<U5308> \xA6\x49 |0
-<U5309> \xCA\x71 |0
-<U530A> \xCB\xD6 |0
-<U530B> \xCB\xD7 |0
-<U530D> \xAB\x6D |0
-<U530E> \xD0\xEE |0
-<U530F> \xB0\xCC |0
-<U5310> \xB0\xCB |0
-<U5311> \xD8\x63 |0
-<U5312> \xD8\x62 |0
-<U5315> \xA4\x50 |0
-<U5316> \xA4\xC6 |0
-<U5317> \xA5\x5F |0
-<U5319> \xB0\xCD |0
-<U531A> \xC9\x43 |0
-<U531C> \xC9\x6C |0
-<U531D> \xA5\x60 |0
-<U531F> \xC9\xC2 |0
-<U5320> \xA6\x4B |0
-<U5321> \xA6\x4A |0
-<U5322> \xC9\xC1 |0
-<U5323> \xA7\x58 |0
-<U532A> \xAD\xEA |0
-<U532D> \xD4\x6F |0
-<U532F> \xB6\xD7 |0
-<U5330> \xE1\x45 |0
-<U5331> \xB9\xBC |0
-<U5334> \xE8\xFA |0
-<U5337> \xF3\xFD |0
-<U5339> \xA4\xC7 |0
-<U533C> \xCB\xD8 |0
-<U533D> \xCD\xF4 |0
-<U533E> \xB0\xD0 |0
-<U533F> \xB0\xCE |0
-<U5340> \xB0\xCF |0
-<U5341> \xA4\x51 |0
-<U5341> \xA2\xCC |3
-<U5343> \xA4\x64 |0
-<U5344> \xA2\xCD |0
-<U5345> \xA4\xCA |0
-<U5345> \xA2\xCE |3
-<U5347> \xA4\xC9 |0
-<U5348> \xA4\xC8 |0
-<U5349> \xA5\x63 |0
-<U534A> \xA5\x62 |0
-<U534C> \xC9\x6D |0
-<U534D> \xC9\xC3 |0
-<U5351> \xA8\xF5 |0
-<U5352> \xA8\xF2 |0
-<U5353> \xA8\xF4 |0
-<U5354> \xA8\xF3 |0
-<U5357> \xAB\x6E |0
-<U535A> \xB3\xD5 |0
-<U535C> \xA4\x52 |0
-<U535E> \xA4\xCB |0
-<U5360> \xA5\x65 |0
-<U5361> \xA5\x64 |0
-<U5363> \xCA\x72 |0
-<U5366> \xA8\xF6 |0
-<U536C> \xC9\x57 |0
-<U536E> \xA5\x67 |0
-<U536F> \xA5\x66 |0
-<U5370> \xA6\x4C |0
-<U5371> \xA6\x4D |0
-<U5372> \xCA\x73 |0
-<U5373> \xA7\x59 |0
-<U5375> \xA7\x5A |0
-<U5377> \xA8\xF7 |0
-<U5378> \xA8\xF8 |0
-<U5379> \xA8\xF9 |0
-<U537B> \xAB\x6F |0
-<U537C> \xCD\xF5 |0
-<U537F> \xAD\xEB |0
-<U5382> \xC9\x44 |0
-<U5384> \xA4\xCC |0
-<U538A> \xC9\xC4 |0
-<U538E> \xCA\x74 |0
-<U538F> \xCA\x75 |0
-<U5392> \xCB\xD9 |0
-<U5394> \xCB\xDA |0
-<U5396> \xCD\xF7 |0
-<U5397> \xCD\xF6 |0
-<U5398> \xCD\xF9 |0
-<U5399> \xCD\xF8 |0
-<U539A> \xAB\x70 |0
-<U539C> \xD4\x70 |0
-<U539D> \xAD\xED |0
-<U539E> \xD0\xEF |0
-<U539F> \xAD\xEC |0
-<U53A4> \xD8\x64 |0
-<U53A5> \xB3\xD6 |0
-<U53A7> \xD8\x65 |0
-<U53AC> \xE1\x46 |0
-<U53AD> \xB9\xBD |0
-<U53B2> \xBC\x46 |0
-<U53B4> \xF1\xEF |0
-<U53B9> \xC9\x58 |0
-<U53BB> \xA5\x68 |0
-<U53C3> \xB0\xD1 |0
-<U53C8> \xA4\x53 |0
-<U53C9> \xA4\x65 |0
-<U53CA> \xA4\xCE |0
-<U53CB> \xA4\xCD |0
-<U53CD> \xA4\xCF |0
-<U53D4> \xA8\xFB |0
-<U53D6> \xA8\xFA |0
-<U53D7> \xA8\xFC |0
-<U53DB> \xAB\x71 |0
-<U53DF> \xAD\xEE |0
-<U53E1> \xE8\xFB |0
-<U53E2> \xC2\x4F |0
-<U53E3> \xA4\x66 |0
-<U53E4> \xA5\x6A |0
-<U53E5> \xA5\x79 |0
-<U53E6> \xA5\x74 |0
-<U53E8> \xA5\x6F |0
-<U53E9> \xA5\x6E |0
-<U53EA> \xA5\x75 |0
-<U53EB> \xA5\x73 |0
-<U53EC> \xA5\x6C |0
-<U53ED> \xA5\x7A |0
-<U53EE> \xA5\x6D |0
-<U53EF> \xA5\x69 |0
-<U53F0> \xA5\x78 |0
-<U53F1> \xA5\x77 |0
-<U53F2> \xA5\x76 |0
-<U53F3> \xA5\x6B |0
-<U53F5> \xA5\x72 |0
-<U53F8> \xA5\x71 |0
-<U53FB> \xA5\x7B |0
-<U53FC> \xA5\x70 |0
-<U5401> \xA6\x53 |0
-<U5403> \xA6\x59 |0
-<U5404> \xA6\x55 |0
-<U5406> \xA6\x5B |0
-<U5407> \xC9\xC5 |0
-<U5408> \xA6\x58 |0
-<U5409> \xA6\x4E |0
-<U540A> \xA6\x51 |0
-<U540B> \xA6\x54 |0
-<U540C> \xA6\x50 |0
-<U540D> \xA6\x57 |0
-<U540E> \xA6\x5A |0
-<U540F> \xA6\x4F |0
-<U5410> \xA6\x52 |0
-<U5411> \xA6\x56 |0
-<U5412> \xA6\x5C |0
-<U5418> \xCA\x7E |0
-<U5419> \xCA\x7B |0
-<U541B> \xA7\x67 |0
-<U541C> \xCA\x7C |0
-<U541D> \xA7\x5B |0
-<U541E> \xA7\x5D |0
-<U541F> \xA7\x75 |0
-<U5420> \xA7\x70 |0
-<U5424> \xCA\xA5 |0
-<U5425> \xCA\x7D |0
-<U5426> \xA7\x5F |0
-<U5427> \xA7\x61 |0
-<U5428> \xCA\xA4 |0
-<U5429> \xA7\x68 |0
-<U542A> \xCA\x78 |0
-<U542B> \xA7\x74 |0
-<U542C> \xA7\x76 |0
-<U542D> \xA7\x5C |0
-<U542E> \xA7\x6D |0
-<U5430> \xCA\x76 |0
-<U5431> \xA7\x73 |0
-<U5433> \xA7\x64 |0
-<U5435> \xA7\x6E |0
-<U5436> \xA7\x6F |0
-<U5437> \xCA\x77 |0
-<U5438> \xA7\x6C |0
-<U5439> \xA7\x6A |0
-<U543B> \xA7\x6B |0
-<U543C> \xA7\x71 |0
-<U543D> \xCA\xA1 |0
-<U543E> \xA7\x5E |0
-<U5440> \xA7\x72 |0
-<U5441> \xCA\xA3 |0
-<U5442> \xA7\x66 |0
-<U5443> \xA7\x63 |0
-<U5445> \xCA\x7A |0
-<U5446> \xA7\x62 |0
-<U5447> \xCA\xA6 |0
-<U5448> \xA7\x65 |0
-<U544A> \xA7\x69 |0
-<U544E> \xA7\x60 |0
-<U544F> \xCA\xA2 |0
-<U5454> \xCA\x79 |0
-<U5460> \xCB\xEB |0
-<U5461> \xCB\xEA |0
-<U5462> \xA9\x4F |0
-<U5463> \xCB\xED |0
-<U5464> \xCB\xEF |0
-<U5465> \xCB\xE4 |0
-<U5466> \xCB\xE7 |0
-<U5467> \xCB\xEE |0
-<U5468> \xA9\x50 |0
-<U546B> \xCB\xE1 |0
-<U546C> \xCB\xE5 |0
-<U546F> \xCB\xE9 |0
-<U5470> \xCE\x49 |0
-<U5471> \xA9\x4B |0
-<U5472> \xCE\x4D |0
-<U5473> \xA8\xFD |0
-<U5474> \xCB\xE6 |0
-<U5475> \xA8\xFE |0
-<U5476> \xA9\x4C |0
-<U5477> \xA9\x45 |0
-<U5478> \xA9\x41 |0
-<U547A> \xCB\xE2 |0
-<U547B> \xA9\x44 |0
-<U547C> \xA9\x49 |0
-<U547D> \xA9\x52 |0
-<U547E> \xCB\xE3 |0
-<U547F> \xCB\xDC |0
-<U5480> \xA9\x43 |0
-<U5481> \xCB\xDD |0
-<U5482> \xCB\xDF |0
-<U5484> \xA9\x46 |0
-<U5486> \xA9\x48 |0
-<U5487> \xCB\xDB |0
-<U5488> \xCB\xE0 |0
-<U548B> \xA9\x51 |0
-<U548C> \xA9\x4D |0
-<U548D> \xCB\xE8 |0
-<U548E> \xA9\x53 |0
-<U5490> \xA9\x4A |0
-<U5491> \xCB\xDE |0
-<U5492> \xA9\x47 |0
-<U5495> \xA9\x42 |0
-<U5496> \xA9\x40 |0
-<U5498> \xCB\xEC |0
-<U549A> \xA9\x4E |0
-<U54A0> \xCE\x48 |0
-<U54A1> \xCD\xFB |0
-<U54A2> \xCE\x4B |0
-<U54A5> \xCD\xFD |0
-<U54A6> \xAB\x78 |0
-<U54A7> \xAB\xA8 |0
-<U54A8> \xAB\x74 |0
-<U54A9> \xAB\xA7 |0
-<U54AA> \xAB\x7D |0
-<U54AB> \xAB\xA4 |0
-<U54AC> \xAB\x72 |0
-<U54AD> \xCD\xFC |0
-<U54AE> \xCE\x43 |0
-<U54AF> \xAB\xA3 |0
-<U54B0> \xCE\x4F |0
-<U54B1> \xAB\xA5 |0
-<U54B3> \xAB\x79 |0
-<U54B6> \xCE\x45 |0
-<U54B7> \xCE\x42 |0
-<U54B8> \xAB\x77 |0
-<U54BA> \xCD\xFA |0
-<U54BB> \xAB\xA6 |0
-<U54BC> \xCE\x4A |0
-<U54BD> \xAB\x7C |0
-<U54BE> \xCE\x4C |0
-<U54BF> \xAB\xA9 |0
-<U54C0> \xAB\x73 |0
-<U54C1> \xAB\x7E |0
-<U54C2> \xAB\x7B |0
-<U54C3> \xCE\x40 |0
-<U54C4> \xAB\xA1 |0
-<U54C5> \xCE\x46 |0
-<U54C6> \xCE\x47 |0
-<U54C7> \xAB\x7A |0
-<U54C8> \xAB\xA2 |0
-<U54C9> \xAB\x76 |0
-<U54CE> \xAB\x75 |0
-<U54CF> \xCD\xFE |0
-<U54D6> \xCE\x44 |0
-<U54DE> \xCE\x4E |0
-<U54E0> \xD1\x44 |0
-<U54E1> \xAD\xFB |0
-<U54E2> \xD0\xF1 |0
-<U54E4> \xD0\xF6 |0
-<U54E5> \xAD\xF4 |0
-<U54E6> \xAE\x40 |0
-<U54E7> \xD0\xF4 |0
-<U54E8> \xAD\xEF |0
-<U54E9> \xAD\xF9 |0
-<U54EA> \xAD\xFE |0
-<U54EB> \xD0\xFB |0
-<U54ED> \xAD\xFA |0
-<U54EE> \xAD\xFD |0
-<U54F1> \xD0\xFE |0
-<U54F2> \xAD\xF5 |0
-<U54F3> \xD0\xF5 |0
-<U54F7> \xD1\x42 |0
-<U54F8> \xD1\x43 |0
-<U54FA> \xAD\xF7 |0
-<U54FB> \xD1\x41 |0
-<U54FC> \xAD\xF3 |0
-<U54FD> \xAE\x43 |0
-<U54FF> \xD0\xF8 |0
-<U5501> \xAD\xF1 |0
-<U5503> \xD1\x46 |0
-<U5504> \xD0\xF9 |0
-<U5505> \xD0\xFD |0
-<U5506> \xAD\xF6 |0
-<U5507> \xAE\x42 |0
-<U5508> \xD0\xFA |0
-<U5509> \xAD\xFC |0
-<U550A> \xD1\x40 |0
-<U550B> \xD1\x47 |0
-<U550C> \xD4\xA1 |0
-<U550E> \xD1\x45 |0
-<U550F> \xAE\x44 |0
-<U5510> \xAD\xF0 |0
-<U5511> \xD0\xFC |0
-<U5512> \xD0\xF3 |0
-<U5514> \xAD\xF8 |0
-<U5517> \xD0\xF2 |0
-<U551A> \xD0\xF7 |0
-<U5526> \xD0\xF0 |0
-<U5527> \xAE\x41 |0
-<U552A> \xD4\x77 |0
-<U552C> \xB0\xE4 |0
-<U552D> \xD4\xA7 |0
-<U552E> \xB0\xE2 |0
-<U552F> \xB0\xDF |0
-<U5530> \xD4\x7C |0
-<U5531> \xB0\xDB |0
-<U5532> \xD4\xA2 |0
-<U5533> \xB0\xE6 |0
-<U5534> \xD4\x76 |0
-<U5535> \xD4\x7B |0
-<U5536> \xD4\x7A |0
-<U5537> \xAD\xF2 |0
-<U5538> \xB0\xE1 |0
-<U5539> \xD4\xA5 |0
-<U553B> \xD4\xA8 |0
-<U553C> \xD4\x73 |0
-<U553E> \xB3\xE8 |0
-<U5540> \xD4\xA9 |0
-<U5541> \xB0\xE7 |0
-<U5543> \xB0\xD9 |0
-<U5544> \xB0\xD6 |0
-<U5545> \xD4\x7E |0
-<U5546> \xB0\xD3 |0
-<U5548> \xD4\xA6 |0
-<U554A> \xB0\xDA |0
-<U554B> \xD4\xAA |0
-<U554D> \xD4\x74 |0
-<U554E> \xD4\xA4 |0
-<U554F> \xB0\xDD |0
-<U5550> \xD4\x75 |0
-<U5551> \xD4\x78 |0
-<U5552> \xD4\x7D |0
-<U5555> \xB0\xDE |0
-<U5556> \xB0\xDC |0
-<U5557> \xB0\xE8 |0
-<U555C> \xB0\xE3 |0
-<U555E> \xB0\xD7 |0
-<U555F> \xB1\xD2 |0
-<U5561> \xB0\xD8 |0
-<U5562> \xD4\x79 |0
-<U5563> \xB0\xE5 |0
-<U5564> \xB0\xE0 |0
-<U5565> \xD4\xA3 |0
-<U5566> \xB0\xD5 |0
-<U556A> \xB0\xD4 |0
-<U5575> \xD4\x71 |0
-<U5576> \xD4\x72 |0
-<U5577> \xD8\x6A |0
-<U557B> \xB3\xD7 |0
-<U557C> \xB3\xDA |0
-<U557D> \xD8\x75 |0
-<U557E> \xB3\xEE |0
-<U557F> \xD8\x78 |0
-<U5580> \xB3\xD8 |0
-<U5581> \xD8\x71 |0
-<U5582> \xB3\xDE |0
-<U5583> \xB3\xE4 |0
-<U5584> \xB5\xBD |0
-<U5587> \xB3\xE2 |0
-<U5588> \xD8\x6E |0
-<U5589> \xB3\xEF |0
-<U558A> \xB3\xDB |0
-<U558B> \xB3\xE3 |0
-<U558C> \xD8\x76 |0
-<U558D> \xDC\xD7 |0
-<U558E> \xD8\x7B |0
-<U558F> \xD8\x6F |0
-<U5591> \xD8\x66 |0
-<U5592> \xD8\x73 |0
-<U5593> \xD8\x6D |0
-<U5594> \xB3\xE1 |0
-<U5595> \xD8\x79 |0
-<U5598> \xB3\xDD |0
-<U5599> \xB3\xF1 |0
-<U559A> \xB3\xEA |0
-<U559C> \xB3\xDF |0
-<U559D> \xB3\xDC |0
-<U559F> \xB3\xE7 |0
-<U55A1> \xD8\x7A |0
-<U55A2> \xD8\x6C |0
-<U55A3> \xD8\x72 |0
-<U55A4> \xD8\x74 |0
-<U55A5> \xD8\x68 |0
-<U55A6> \xD8\x77 |0
-<U55A7> \xB3\xD9 |0
-<U55A8> \xD8\x67 |0
-<U55AA> \xB3\xE0 |0
-<U55AB> \xB3\xF0 |0
-<U55AC> \xB3\xEC |0
-<U55AD> \xD8\x69 |0
-<U55AE> \xB3\xE6 |0
-<U55B1> \xB3\xED |0
-<U55B2> \xB3\xE9 |0
-<U55B3> \xB3\xE5 |0
-<U55B5> \xD8\x70 |0
-<U55BB> \xB3\xEB |0
-<U55BF> \xDC\xD5 |0
-<U55C0> \xDC\xD1 |0
-<U55C2> \xDC\xE0 |0
-<U55C3> \xDC\xCA |0
-<U55C4> \xDC\xD3 |0
-<U55C5> \xB6\xE5 |0
-<U55C6> \xB6\xE6 |0
-<U55C7> \xB6\xDE |0
-<U55C8> \xDC\xDC |0
-<U55C9> \xB6\xE8 |0
-<U55CA> \xDC\xCF |0
-<U55CB> \xDC\xCE |0
-<U55CC> \xDC\xCC |0
-<U55CD> \xDC\xDE |0
-<U55CE> \xB6\xDC |0
-<U55CF> \xDC\xD8 |0
-<U55D0> \xDC\xCD |0
-<U55D1> \xB6\xDF |0
-<U55D2> \xDC\xD6 |0
-<U55D3> \xB6\xDA |0
-<U55D4> \xDC\xD2 |0
-<U55D5> \xDC\xD9 |0
-<U55D6> \xDC\xDB |0
-<U55D9> \xDC\xDF |0
-<U55DA> \xB6\xE3 |0
-<U55DB> \xDC\xCB |0
-<U55DC> \xB6\xDD |0
-<U55DD> \xDC\xD0 |0
-<U55DF> \xB6\xD8 |0
-<U55E1> \xB6\xE4 |0
-<U55E2> \xDC\xDA |0
-<U55E3> \xB6\xE0 |0
-<U55E4> \xB6\xE1 |0
-<U55E5> \xB6\xE7 |0
-<U55E6> \xB6\xDB |0
-<U55E7> \xA2\x5F |0
-<U55E8> \xB6\xD9 |0
-<U55E9> \xDC\xD4 |0
-<U55EF> \xB6\xE2 |0
-<U55F2> \xDC\xDD |0
-<U55F6> \xB9\xCD |0
-<U55F7> \xB9\xC8 |0
-<U55F9> \xE1\x55 |0
-<U55FA> \xE1\x51 |0
-<U55FC> \xE1\x4B |0
-<U55FD> \xB9\xC2 |0
-<U55FE> \xB9\xBE |0
-<U55FF> \xE1\x54 |0
-<U5600> \xB9\xBF |0
-<U5601> \xE1\x4E |0
-<U5602> \xE1\x50 |0
-<U5604> \xE1\x53 |0
-<U5606> \xB9\xC4 |0
-<U5608> \xB9\xCB |0
-<U5609> \xB9\xC5 |0
-<U560C> \xE1\x49 |0
-<U560D> \xB9\xC6 |0
-<U560E> \xB9\xC7 |0
-<U560F> \xE1\x4C |0
-<U5610> \xB9\xCC |0
-<U5612> \xE1\x4A |0
-<U5613> \xE1\x4F |0
-<U5614> \xB9\xC3 |0
-<U5615> \xE1\x48 |0
-<U5616> \xB9\xC9 |0
-<U5617> \xB9\xC1 |0
-<U561B> \xB9\xC0 |0
-<U561C> \xE1\x4D |0
-<U561D> \xE1\x52 |0
-<U561F> \xB9\xCA |0
-<U5627> \xE1\x47 |0
-<U5629> \xBC\x4D |0
-<U562A> \xE5\x47 |0
-<U562C> \xE5\x44 |0
-<U562E> \xBC\x47 |0
-<U562F> \xBC\x53 |0
-<U5630> \xBC\x54 |0
-<U5632> \xBC\x4A |0
-<U5633> \xE5\x42 |0
-<U5634> \xBC\x4C |0
-<U5635> \xE4\xF9 |0
-<U5636> \xBC\x52 |0
-<U5638> \xE5\x46 |0
-<U5639> \xBC\x49 |0
-<U563A> \xE5\x48 |0
-<U563B> \xBC\x48 |0
-<U563D> \xE5\x43 |0
-<U563E> \xE5\x45 |0
-<U563F> \xBC\x4B |0
-<U5640> \xE5\x41 |0
-<U5641> \xE4\xFA |0
-<U5642> \xE4\xF7 |0
-<U5645> \xD8\x6B |0
-<U5646> \xE4\xFD |0
-<U5648> \xE4\xF6 |0
-<U5649> \xE4\xFC |0
-<U564A> \xE4\xFB |0
-<U564C> \xE4\xF8 |0
-<U564E> \xBC\x4F |0
-<U5653> \xBC\x4E |0
-<U5657> \xBC\x50 |0
-<U5658> \xE4\xFE |0
-<U5659> \xBE\xB2 |0
-<U565A> \xE5\x40 |0
-<U565E> \xE9\x45 |0
-<U5660> \xE8\xFD |0
-<U5662> \xBE\xBE |0
-<U5663> \xE9\x42 |0
-<U5664> \xBE\xB6 |0
-<U5665> \xBE\xBA |0
-<U5666> \xE9\x41 |0
-<U5668> \xBE\xB9 |0
-<U5669> \xBE\xB5 |0
-<U566A> \xBE\xB8 |0
-<U566B> \xBE\xB3 |0
-<U566C> \xBE\xBD |0
-<U566D> \xE9\x43 |0
-<U566E> \xE8\xFE |0
-<U566F> \xBE\xBC |0
-<U5670> \xE8\xFC |0
-<U5671> \xBE\xBB |0
-<U5672> \xE9\x44 |0
-<U5673> \xE9\x40 |0
-<U5674> \xBC\x51 |0
-<U5676> \xBE\xBF |0
-<U5677> \xE9\x46 |0
-<U5678> \xBE\xB7 |0
-<U5679> \xBE\xB4 |0
-<U567E> \xEC\xC6 |0
-<U567F> \xEC\xC8 |0
-<U5680> \xC0\x7B |0
-<U5681> \xEC\xC9 |0
-<U5682> \xEC\xC7 |0
-<U5683> \xEC\xC5 |0
-<U5684> \xEC\xC4 |0
-<U5685> \xC0\x7D |0
-<U5686> \xEC\xC3 |0
-<U5687> \xC0\x7E |0
-<U568C> \xEC\xC1 |0
-<U568D> \xEC\xC2 |0
-<U568E> \xC0\x7A |0
-<U568F> \xC0\xA1 |0
-<U5690> \xC0\x7C |0
-<U5693> \xEC\xC0 |0
-<U5695> \xC2\x50 |0
-<U5697> \xEF\xBC |0
-<U5698> \xEF\xBA |0
-<U5699> \xEF\xBF |0
-<U569A> \xEF\xBD |0
-<U569C> \xEF\xBB |0
-<U569D> \xEF\xBE |0
-<U56A5> \xC3\x60 |0
-<U56A6> \xF1\xF2 |0
-<U56A7> \xF1\xF3 |0
-<U56A8> \xC4\x56 |0
-<U56AA> \xF1\xF4 |0
-<U56AB> \xF1\xF0 |0
-<U56AC> \xF1\xF5 |0
-<U56AD> \xF1\xF1 |0
-<U56AE> \xC2\x51 |0
-<U56B2> \xF3\xFE |0
-<U56B3> \xF4\x41 |0
-<U56B4> \xC4\x59 |0
-<U56B5> \xF4\x40 |0
-<U56B6> \xC4\x58 |0
-<U56B7> \xC4\x57 |0
-<U56BC> \xC4\x5A |0
-<U56BD> \xF5\xC5 |0
-<U56BE> \xF5\xC6 |0
-<U56C0> \xC4\xDA |0
-<U56C1> \xC4\xD9 |0
-<U56C2> \xC4\xDB |0
-<U56C3> \xF5\xC4 |0
-<U56C5> \xF6\xD8 |0
-<U56C6> \xF6\xD7 |0
-<U56C8> \xC5\x6D |0
-<U56C9> \xC5\x6F |0
-<U56CA> \xC5\x6E |0
-<U56CB> \xF6\xD9 |0
-<U56CC> \xC5\xC8 |0
-<U56CD> \xF8\xA6 |0
-<U56D1> \xC5\xF1 |0
-<U56D3> \xF8\xA5 |0
-<U56D4> \xF8\xEE |0
-<U56D7> \xC9\x49 |0
-<U56DA> \xA5\x7D |0
-<U56DB> \xA5\x7C |0
-<U56DD> \xA6\x5F |0
-<U56DE> \xA6\x5E |0
-<U56DF> \xC9\xC7 |0
-<U56E0> \xA6\x5D |0
-<U56E1> \xC9\xC6 |0
-<U56E4> \xA7\x79 |0
-<U56E5> \xCA\xA9 |0
-<U56E7> \xCA\xA8 |0
-<U56EA> \xA7\x77 |0
-<U56EB> \xA7\x7A |0
-<U56EE> \xCA\xA7 |0
-<U56F0> \xA7\x78 |0
-<U56F7> \xCB\xF0 |0
-<U56F9> \xCB\xF1 |0
-<U56FA> \xA9\x54 |0
-<U56FF> \xAB\xAA |0
-<U5701> \xD1\x48 |0
-<U5702> \xD1\x49 |0
-<U5703> \xAE\x45 |0
-<U5704> \xAE\x46 |0
-<U5707> \xD4\xAC |0
-<U5708> \xB0\xE9 |0
-<U5709> \xB0\xEB |0
-<U570A> \xD4\xAB |0
-<U570B> \xB0\xEA |0
-<U570C> \xD8\x7C |0
-<U570D> \xB3\xF2 |0
-<U5712> \xB6\xE9 |0
-<U5713> \xB6\xEA |0
-<U5714> \xDC\xE1 |0
-<U5716> \xB9\xCF |0
-<U5718> \xB9\xCE |0
-<U571A> \xE5\x49 |0
-<U571B> \xE9\x48 |0
-<U571C> \xE9\x47 |0
-<U571E> \xF9\x6B |0
-<U571F> \xA4\x67 |0
-<U5720> \xC9\x59 |0
-<U5722> \xC9\x6E |0
-<U5723> \xC9\x6F |0
-<U5728> \xA6\x62 |0
-<U5729> \xA6\x66 |0
-<U572A> \xC9\xC9 |0
-<U572C> \xA6\x64 |0
-<U572D> \xA6\x63 |0
-<U572E> \xC9\xC8 |0
-<U572F> \xA6\x65 |0
-<U5730> \xA6\x61 |0
-<U5733> \xA6\x60 |0
-<U5734> \xC9\xCA |0
-<U573B> \xA7\xA6 |0
-<U573E> \xA7\xA3 |0
-<U5740> \xA7\x7D |0
-<U5741> \xCA\xAA |0
-<U5745> \xCA\xAB |0
-<U5747> \xA7\xA1 |0
-<U5749> \xCA\xAD |0
-<U574A> \xA7\x7B |0
-<U574B> \xCA\xAE |0
-<U574C> \xCA\xAC |0
-<U574D> \xA7\x7E |0
-<U574E> \xA7\xA2 |0
-<U574F> \xA7\xA5 |0
-<U5750> \xA7\xA4 |0
-<U5751> \xA7\x7C |0
-<U5752> \xCA\xAF |0
-<U5761> \xA9\x59 |0
-<U5762> \xCB\xFE |0
-<U5764> \xA9\x5B |0
-<U5766> \xA9\x5A |0
-<U5768> \xCC\x40 |0
-<U5769> \xA9\x58 |0
-<U576A> \xA9\x57 |0
-<U576B> \xCB\xF5 |0
-<U576D> \xCB\xF4 |0
-<U576F> \xCB\xF2 |0
-<U5770> \xCB\xF7 |0
-<U5771> \xCB\xF6 |0
-<U5772> \xCB\xF3 |0
-<U5773> \xCB\xFC |0
-<U5774> \xCB\xFD |0
-<U5775> \xCB\xFA |0
-<U5776> \xCB\xF8 |0
-<U5777> \xA9\x56 |0
-<U577B> \xCB\xFB |0
-<U577C> \xA9\x5C |0
-<U577D> \xCC\x41 |0
-<U5780> \xCB\xF9 |0
-<U5782> \xAB\xAB |0
-<U5783> \xA9\x55 |0
-<U578B> \xAB\xAC |0
-<U578C> \xCE\x54 |0
-<U578F> \xCE\x5A |0
-<U5793> \xAB\xB2 |0
-<U5794> \xCE\x58 |0
-<U5795> \xCE\x5E |0
-<U5797> \xCE\x55 |0
-<U5798> \xCE\x59 |0
-<U5799> \xCE\x5B |0
-<U579A> \xCE\x5D |0
-<U579B> \xCE\x57 |0
-<U579D> \xCE\x56 |0
-<U579E> \xCE\x51 |0
-<U579F> \xCE\x52 |0
-<U57A0> \xAB\xAD |0
-<U57A2> \xAB\xAF |0
-<U57A3> \xAB\xAE |0
-<U57A4> \xCE\x53 |0
-<U57A5> \xCE\x5C |0
-<U57AE> \xAB\xB1 |0
-<U57B5> \xCE\x50 |0
-<U57B6> \xD1\x53 |0
-<U57B8> \xD1\x52 |0
-<U57B9> \xD1\x57 |0
-<U57BA> \xD1\x4E |0
-<U57BC> \xD1\x51 |0
-<U57BD> \xD1\x50 |0
-<U57BF> \xD1\x54 |0
-<U57C1> \xD1\x58 |0
-<U57C2> \xAE\x47 |0
-<U57C3> \xAE\x4A |0
-<U57C6> \xD1\x4F |0
-<U57C7> \xD1\x55 |0
-<U57CB> \xAE\x49 |0
-<U57CC> \xD1\x4A |0
-<U57CE> \xAB\xB0 |0
-<U57CF> \xD4\xBA |0
-<U57D0> \xD1\x56 |0
-<U57D2> \xD1\x4D |0
-<U57D4> \xAE\x48 |0
-<U57D5> \xD1\x4C |0
-<U57DC> \xD4\xB1 |0
-<U57DF> \xB0\xEC |0
-<U57E0> \xB0\xF0 |0
-<U57E1> \xD4\xC1 |0
-<U57E2> \xD4\xAF |0
-<U57E3> \xD4\xBD |0
-<U57E4> \xB0\xF1 |0
-<U57E5> \xD4\xBF |0
-<U57E7> \xD4\xC5 |0
-<U57E9> \xD4\xC9 |0
-<U57EC> \xD4\xC0 |0
-<U57ED> \xD4\xB4 |0
-<U57EE> \xD4\xBC |0
-<U57F0> \xD4\xCA |0
-<U57F1> \xD4\xC8 |0
-<U57F2> \xD4\xBE |0
-<U57F3> \xD4\xB9 |0
-<U57F4> \xD4\xB2 |0
-<U57F5> \xD8\xA6 |0
-<U57F6> \xD4\xB0 |0
-<U57F7> \xB0\xF5 |0
-<U57F8> \xD4\xB7 |0
-<U57F9> \xB0\xF6 |0
-<U57FA> \xB0\xF2 |0
-<U57FB> \xD4\xAD |0
-<U57FC> \xD4\xC3 |0
-<U57FD> \xD4\xB5 |0
-<U5800> \xD4\xB3 |0
-<U5801> \xD4\xC6 |0
-<U5802> \xB0\xF3 |0
-<U5804> \xD4\xCC |0
-<U5805> \xB0\xED |0
-<U5806> \xB0\xEF |0
-<U5807> \xD4\xBB |0
-<U5808> \xD4\xB6 |0
-<U5809> \xAE\x4B |0
-<U580A> \xB0\xEE |0
-<U580B> \xD4\xB8 |0
-<U580C> \xD4\xC7 |0
-<U580D> \xD4\xCB |0
-<U580E> \xD4\xC2 |0
-<U5810> \xD4\xC4 |0
-<U5814> \xD4\xAE |0
-<U5819> \xD8\xA1 |0
-<U581B> \xD8\xAA |0
-<U581C> \xD8\xA9 |0
-<U581D> \xB3\xFA |0
-<U581E> \xD8\xA2 |0
-<U5820> \xB3\xFB |0
-<U5821> \xB3\xF9 |0
-<U5823> \xD8\xA4 |0
-<U5824> \xB3\xF6 |0
-<U5825> \xD8\xA8 |0
-<U5827> \xD8\xA3 |0
-<U5828> \xD8\xA5 |0
-<U5829> \xD8\x7D |0
-<U582A> \xB3\xF4 |0
-<U582C> \xD8\xB2 |0
-<U582D> \xD8\xB1 |0
-<U582E> \xD8\xAE |0
-<U582F> \xB3\xF3 |0
-<U5830> \xB3\xF7 |0
-<U5831> \xB3\xF8 |0
-<U5832> \xD1\x4B |0
-<U5833> \xD8\xAB |0
-<U5834> \xB3\xF5 |0
-<U5835> \xB0\xF4 |0
-<U5836> \xD8\xAD |0
-<U5837> \xD8\x7E |0
-<U5838> \xD8\xB0 |0
-<U5839> \xD8\xAF |0
-<U583B> \xD8\xB3 |0
-<U583D> \xDC\xEF |0
-<U583F> \xD8\xAC |0
-<U5848> \xD8\xA7 |0
-<U5849> \xDC\xE7 |0
-<U584A> \xB6\xF4 |0
-<U584B> \xB6\xF7 |0
-<U584C> \xB6\xF2 |0
-<U584D> \xDC\xE6 |0
-<U584E> \xDC\xEA |0
-<U584F> \xDC\xE5 |0
-<U5851> \xB6\xEC |0
-<U5852> \xB6\xF6 |0
-<U5853> \xDC\xE2 |0
-<U5854> \xB6\xF0 |0
-<U5855> \xDC\xE9 |0
-<U5857> \xB6\xEE |0
-<U5858> \xB6\xED |0
-<U5859> \xDC\xEC |0
-<U585A> \xB6\xEF |0
-<U585B> \xDC\xEE |0
-<U585D> \xDC\xEB |0
-<U585E> \xB6\xEB |0
-<U5862> \xB6\xF5 |0
-<U5863> \xDC\xF0 |0
-<U5864> \xDC\xE4 |0
-<U5865> \xDC\xED |0
-<U5868> \xDC\xE3 |0
-<U586B> \xB6\xF1 |0
-<U586D> \xB6\xF3 |0
-<U586F> \xDC\xE8 |0
-<U5871> \xDC\xF1 |0
-<U5874> \xE1\x5D |0
-<U5875> \xB9\xD0 |0
-<U5876> \xE1\x63 |0
-<U5879> \xB9\xD5 |0
-<U587A> \xE1\x5F |0
-<U587B> \xE1\x66 |0
-<U587C> \xE1\x57 |0
-<U587D> \xB9\xD7 |0
-<U587E> \xB9\xD1 |0
-<U587F> \xE1\x5C |0
-<U5880> \xBC\x55 |0
-<U5881> \xE1\x5B |0
-<U5882> \xE1\x64 |0
-<U5883> \xB9\xD2 |0
-<U5885> \xB9\xD6 |0
-<U5886> \xE1\x5A |0
-<U5887> \xE1\x60 |0
-<U5888> \xE1\x65 |0
-<U5889> \xE1\x56 |0
-<U588A> \xB9\xD4 |0
-<U588B> \xE1\x5E |0
-<U588E> \xE1\x62 |0
-<U588F> \xE1\x68 |0
-<U5890> \xE1\x58 |0
-<U5891> \xE1\x61 |0
-<U5893> \xB9\xD3 |0
-<U5894> \xE1\x67 |0
-<U5898> \xE1\x59 |0
-<U589C> \xBC\x59 |0
-<U589D> \xE5\x4B |0
-<U589E> \xBC\x57 |0
-<U589F> \xBC\x56 |0
-<U58A0> \xE5\x4D |0
-<U58A1> \xE5\x52 |0
-<U58A3> \xE5\x4E |0
-<U58A5> \xE5\x51 |0
-<U58A6> \xBC\x5C |0
-<U58A8> \xBE\xA5 |0
-<U58A9> \xBC\x5B |0
-<U58AB> \xE5\x4A |0
-<U58AC> \xE5\x50 |0
-<U58AE> \xBC\x5A |0
-<U58AF> \xE5\x4F |0
-<U58B1> \xE5\x4C |0
-<U58B3> \xBC\x58 |0
-<U58BA> \xE9\x4D |0
-<U58BB> \xF9\xD9 |0
-<U58BC> \xE9\x4F |0
-<U58BD> \xE9\x4A |0
-<U58BE> \xBE\xC1 |0
-<U58BF> \xE9\x4C |0
-<U58C1> \xBE\xC0 |0
-<U58C2> \xE9\x4E |0
-<U58C5> \xBE\xC3 |0
-<U58C6> \xE9\x50 |0
-<U58C7> \xBE\xC2 |0
-<U58C8> \xE9\x49 |0
-<U58C9> \xE9\x4B |0
-<U58CE> \xC0\xA5 |0
-<U58CF> \xEC\xCC |0
-<U58D1> \xC0\xA4 |0
-<U58D2> \xEC\xCD |0
-<U58D3> \xC0\xA3 |0
-<U58D4> \xEC\xCB |0
-<U58D5> \xC0\xA2 |0
-<U58D6> \xEC\xCA |0
-<U58D8> \xC2\x53 |0
-<U58D9> \xC2\x52 |0
-<U58DA> \xF1\xF6 |0
-<U58DB> \xF1\xF8 |0
-<U58DD> \xF1\xF7 |0
-<U58DE> \xC3\x61 |0
-<U58DF> \xC3\x62 |0
-<U58E2> \xC3\x63 |0
-<U58E3> \xF4\x42 |0
-<U58E4> \xC4\x5B |0
-<U58E7> \xF7\xD3 |0
-<U58E8> \xF7\xD2 |0
-<U58E9> \xC5\xF2 |0
-<U58EB> \xA4\x68 |0
-<U58EC> \xA4\xD0 |0
-<U58EF> \xA7\xA7 |0
-<U58F4> \xCE\x5F |0
-<U58F9> \xB3\xFC |0
-<U58FA> \xB3\xFD |0
-<U58FC> \xDC\xF2 |0
-<U58FD> \xB9\xD8 |0
-<U58FE> \xE1\x69 |0
-<U58FF> \xE5\x53 |0
-<U5903> \xC9\x5A |0
-<U5906> \xCA\xB0 |0
-<U590C> \xCC\x42 |0
-<U590D> \xCE\x60 |0
-<U590E> \xD1\x59 |0
-<U590F> \xAE\x4C |0
-<U5912> \xF1\xF9 |0
-<U5914> \xC4\xDC |0
-<U5915> \xA4\x69 |0
-<U5916> \xA5\x7E |0
-<U5917> \xC9\x70 |0
-<U5919> \xA6\x67 |0
-<U591A> \xA6\x68 |0
-<U591C> \xA9\x5D |0
-<U5920> \xB0\xF7 |0
-<U5922> \xB9\xDA |0
-<U5924> \xB9\xDB |0
-<U5925> \xB9\xD9 |0
-<U5927> \xA4\x6A |0
-<U5929> \xA4\xD1 |0
-<U592A> \xA4\xD3 |0
-<U592B> \xA4\xD2 |0
-<U592C> \xC9\x5B |0
-<U592D> \xA4\xD4 |0
-<U592E> \xA5\xA1 |0
-<U592F> \xC9\x71 |0
-<U5931> \xA5\xA2 |0
-<U5937> \xA6\x69 |0
-<U5938> \xA6\x6A |0
-<U593C> \xC9\xCB |0
-<U593E> \xA7\xA8 |0
-<U5940> \xCA\xB1 |0
-<U5944> \xA9\x61 |0
-<U5945> \xCC\x43 |0
-<U5947> \xA9\x5F |0
-<U5948> \xA9\x60 |0
-<U5949> \xA9\x5E |0
-<U594A> \xD1\x5A |0
-<U594E> \xAB\xB6 |0
-<U594F> \xAB\xB5 |0
-<U5950> \xAB\xB7 |0
-<U5951> \xAB\xB4 |0
-<U5953> \xCE\x61 |0
-<U5954> \xA9\x62 |0
-<U5955> \xAB\xB3 |0
-<U5957> \xAE\x4D |0
-<U5958> \xAE\x4E |0
-<U595A> \xAE\x4F |0
-<U595C> \xD4\xCD |0
-<U5960> \xB3\xFE |0
-<U5961> \xD8\xB4 |0
-<U5962> \xB0\xF8 |0
-<U5967> \xB6\xF8 |0
-<U5969> \xB9\xDD |0
-<U596A> \xB9\xDC |0
-<U596B> \xE1\x6A |0
-<U596D> \xBC\x5D |0
-<U596E> \xBE\xC4 |0
-<U5970> \xEF\xC0 |0
-<U5971> \xF6\xDA |0
-<U5972> \xF7\xD4 |0
-<U5973> \xA4\x6B |0
-<U5974> \xA5\xA3 |0
-<U5976> \xA5\xA4 |0
-<U5977> \xC9\xD1 |0
-<U5978> \xA6\x6C |0
-<U5979> \xA6\x6F |0
-<U597B> \xC9\xCF |0
-<U597C> \xC9\xCD |0
-<U597D> \xA6\x6E |0
-<U597E> \xC9\xD0 |0
-<U597F> \xC9\xD2 |0
-<U5980> \xC9\xCC |0
-<U5981> \xA6\x71 |0
-<U5982> \xA6\x70 |0
-<U5983> \xA6\x6D |0
-<U5984> \xA6\x6B |0
-<U5985> \xC9\xCE |0
-<U598A> \xA7\xB3 |0
-<U598D> \xA7\xB0 |0
-<U598E> \xCA\xB6 |0
-<U598F> \xCA\xB9 |0
-<U5990> \xCA\xB8 |0
-<U5992> \xA7\xAA |0
-<U5993> \xA7\xB2 |0
-<U5996> \xA7\xAF |0
-<U5997> \xCA\xB5 |0
-<U5998> \xCA\xB3 |0
-<U5999> \xA7\xAE |0
-<U599D> \xA7\xA9 |0
-<U599E> \xA7\xAC |0
-<U59A0> \xCA\xB4 |0
-<U59A1> \xCA\xBB |0
-<U59A2> \xCA\xB7 |0
-<U59A3> \xA7\xAD |0
-<U59A4> \xA7\xB1 |0
-<U59A5> \xA7\xB4 |0
-<U59A6> \xCA\xB2 |0
-<U59A7> \xCA\xBA |0
-<U59A8> \xA7\xAB |0
-<U59AE> \xA9\x67 |0
-<U59AF> \xA9\x6F |0
-<U59B1> \xCC\x4F |0
-<U59B2> \xCC\x48 |0
-<U59B3> \xA9\x70 |0
-<U59B4> \xCC\x53 |0
-<U59B5> \xCC\x44 |0
-<U59B6> \xCC\x4B |0
-<U59B9> \xA9\x66 |0
-<U59BA> \xCC\x45 |0
-<U59BB> \xA9\x64 |0
-<U59BC> \xCC\x4C |0
-<U59BD> \xCC\x50 |0
-<U59BE> \xA9\x63 |0
-<U59C0> \xCC\x51 |0
-<U59C1> \xCC\x4A |0
-<U59C3> \xCC\x4D |0
-<U59C5> \xA9\x72 |0
-<U59C6> \xA9\x69 |0
-<U59C7> \xCC\x54 |0
-<U59C8> \xCC\x52 |0
-<U59CA> \xA9\x6E |0
-<U59CB> \xA9\x6C |0
-<U59CC> \xCC\x49 |0
-<U59CD> \xA9\x6B |0
-<U59CE> \xCC\x47 |0
-<U59CF> \xCC\x46 |0
-<U59D0> \xA9\x6A |0
-<U59D1> \xA9\x68 |0
-<U59D2> \xA9\x71 |0
-<U59D3> \xA9\x6D |0
-<U59D4> \xA9\x65 |0
-<U59D6> \xCC\x4E |0
-<U59D8> \xAB\xB9 |0
-<U59DA> \xAB\xC0 |0
-<U59DB> \xCE\x6F |0
-<U59DC> \xAB\xB8 |0
-<U59DD> \xCE\x67 |0
-<U59DE> \xCE\x63 |0
-<U59E0> \xCE\x73 |0
-<U59E1> \xCE\x62 |0
-<U59E3> \xAB\xBB |0
-<U59E4> \xCE\x6C |0
-<U59E5> \xAB\xBE |0
-<U59E6> \xAB\xC1 |0
-<U59E8> \xAB\xBC |0
-<U59E9> \xCE\x70 |0
-<U59EA> \xAB\xBF |0
-<U59EC> \xAE\x56 |0
-<U59ED> \xCE\x76 |0
-<U59EE> \xCE\x64 |0
-<U59F1> \xCE\x66 |0
-<U59F2> \xCE\x6D |0
-<U59F3> \xCE\x71 |0
-<U59F4> \xCE\x75 |0
-<U59F5> \xCE\x72 |0
-<U59F6> \xCE\x6B |0
-<U59F7> \xCE\x6E |0
-<U59FA> \xCE\x68 |0
-<U59FB> \xAB\xC3 |0
-<U59FC> \xCE\x6A |0
-<U59FD> \xCE\x69 |0
-<U59FE> \xCE\x74 |0
-<U59FF> \xAB\xBA |0
-<U5A00> \xCE\x65 |0
-<U5A01> \xAB\xC2 |0
-<U5A03> \xAB\xBD |0
-<U5A09> \xAE\x5C |0
-<U5A0A> \xD1\x62 |0
-<U5A0C> \xAE\x5B |0
-<U5A0F> \xD1\x60 |0
-<U5A11> \xAE\x50 |0
-<U5A13> \xAE\x55 |0
-<U5A15> \xD1\x5F |0
-<U5A16> \xD1\x5C |0
-<U5A17> \xD1\x61 |0
-<U5A18> \xAE\x51 |0
-<U5A19> \xD1\x5B |0
-<U5A1B> \xAE\x54 |0
-<U5A1C> \xAE\x52 |0
-<U5A1E> \xD1\x63 |0
-<U5A1F> \xAE\x53 |0
-<U5A20> \xAE\x57 |0
-<U5A23> \xAE\x58 |0
-<U5A25> \xAE\x5A |0
-<U5A29> \xAE\x59 |0
-<U5A2D> \xD1\x5D |0
-<U5A2E> \xD1\x5E |0
-<U5A33> \xD1\x64 |0
-<U5A35> \xD4\xD4 |0
-<U5A36> \xB0\xF9 |0
-<U5A37> \xD8\xC2 |0
-<U5A38> \xD4\xD3 |0
-<U5A39> \xD4\xE6 |0
-<U5A3C> \xB1\x40 |0
-<U5A3E> \xD4\xE4 |0
-<U5A40> \xB0\xFE |0
-<U5A41> \xB0\xFA |0
-<U5A42> \xD4\xED |0
-<U5A43> \xD4\xDD |0
-<U5A44> \xD4\xE0 |0
-<U5A46> \xB1\x43 |0
-<U5A47> \xD4\xEA |0
-<U5A48> \xD4\xE2 |0
-<U5A49> \xB0\xFB |0
-<U5A4A> \xB1\x44 |0
-<U5A4C> \xD4\xE7 |0
-<U5A4D> \xD4\xE5 |0
-<U5A50> \xD4\xD6 |0
-<U5A51> \xD4\xEB |0
-<U5A52> \xD4\xDF |0
-<U5A53> \xD4\xDA |0
-<U5A55> \xD4\xD0 |0
-<U5A56> \xD4\xEC |0
-<U5A57> \xD4\xDC |0
-<U5A58> \xD4\xCF |0
-<U5A5A> \xB1\x42 |0
-<U5A5B> \xD4\xE1 |0
-<U5A5C> \xD4\xEE |0
-<U5A5D> \xD4\xDE |0
-<U5A5E> \xD4\xD2 |0
-<U5A5F> \xD4\xD7 |0
-<U5A60> \xD4\xCE |0
-<U5A62> \xB1\x41 |0
-<U5A64> \xD4\xDB |0
-<U5A65> \xD4\xD8 |0
-<U5A66> \xB0\xFC |0
-<U5A67> \xD4\xD1 |0
-<U5A69> \xD4\xE9 |0
-<U5A6A> \xB0\xFD |0
-<U5A6C> \xD4\xD9 |0
-<U5A6D> \xD4\xD5 |0
-<U5A70> \xD4\xE8 |0
-<U5A77> \xB4\x40 |0
-<U5A78> \xD8\xBB |0
-<U5A7A> \xD8\xB8 |0
-<U5A7B> \xD8\xC9 |0
-<U5A7C> \xD8\xBD |0
-<U5A7D> \xD8\xCA |0
-<U5A7F> \xB4\x42 |0
-<U5A83> \xD8\xC6 |0
-<U5A84> \xD8\xC3 |0
-<U5A8A> \xD8\xC4 |0
-<U5A8B> \xD8\xC7 |0
-<U5A8C> \xD8\xCB |0
-<U5A8E> \xD4\xE3 |0
-<U5A8F> \xD8\xCD |0
-<U5A90> \xDD\x47 |0
-<U5A92> \xB4\x43 |0
-<U5A93> \xD8\xCE |0
-<U5A94> \xD8\xB6 |0
-<U5A95> \xD8\xC0 |0
-<U5A97> \xD8\xC5 |0
-<U5A9A> \xB4\x41 |0
-<U5A9B> \xB4\x44 |0
-<U5A9C> \xD8\xCC |0
-<U5A9D> \xD8\xCF |0
-<U5A9E> \xD8\xBA |0
-<U5A9F> \xD8\xB7 |0
-<U5AA2> \xD8\xB9 |0
-<U5AA5> \xD8\xBE |0
-<U5AA6> \xD8\xBC |0
-<U5AA7> \xB4\x45 |0
-<U5AA9> \xD8\xC8 |0
-<U5AAC> \xD8\xBF |0
-<U5AAE> \xD8\xC1 |0
-<U5AAF> \xD8\xB5 |0
-<U5AB0> \xDC\xFA |0
-<U5AB1> \xDC\xF8 |0
-<U5AB2> \xB7\x42 |0
-<U5AB3> \xB7\x40 |0
-<U5AB4> \xDD\x43 |0
-<U5AB5> \xDC\xF9 |0
-<U5AB6> \xDD\x44 |0
-<U5AB7> \xDD\x40 |0
-<U5AB8> \xDC\xF7 |0
-<U5AB9> \xDD\x46 |0
-<U5ABA> \xDC\xF6 |0
-<U5ABB> \xDC\xFD |0
-<U5ABC> \xB6\xFE |0
-<U5ABD> \xB6\xFD |0
-<U5ABE> \xB6\xFC |0
-<U5ABF> \xDC\xFB |0
-<U5AC0> \xDD\x41 |0
-<U5AC1> \xB6\xF9 |0
-<U5AC2> \xB7\x41 |0
-<U5AC4> \xDC\xF4 |0
-<U5AC6> \xDC\xFE |0
-<U5AC7> \xDC\xF3 |0
-<U5AC8> \xDC\xFC |0
-<U5AC9> \xB6\xFA |0
-<U5ACA> \xDD\x42 |0
-<U5ACB> \xDC\xF5 |0
-<U5ACC> \xB6\xFB |0
-<U5ACD> \xDD\x45 |0
-<U5AD5> \xE1\x6E |0
-<U5AD6> \xB9\xE2 |0
-<U5AD7> \xB9\xE1 |0
-<U5AD8> \xB9\xE3 |0
-<U5AD9> \xE1\x7A |0
-<U5ADA> \xE1\x70 |0
-<U5ADB> \xE1\x76 |0
-<U5ADC> \xE1\x6B |0
-<U5ADD> \xE1\x79 |0
-<U5ADE> \xE1\x78 |0
-<U5ADF> \xE1\x7C |0
-<U5AE0> \xE1\x75 |0
-<U5AE1> \xB9\xDE |0
-<U5AE2> \xE1\x74 |0
-<U5AE3> \xB9\xE4 |0
-<U5AE5> \xE1\x6D |0
-<U5AE6> \xB9\xDF |0
-<U5AE8> \xE1\x7B |0
-<U5AE9> \xB9\xE0 |0
-<U5AEA> \xE1\x6F |0
-<U5AEB> \xE1\x72 |0
-<U5AEC> \xE1\x77 |0
-<U5AED> \xE1\x71 |0
-<U5AEE> \xE1\x6C |0
-<U5AF3> \xE1\x73 |0
-<U5AF4> \xE5\x55 |0
-<U5AF5> \xBC\x61 |0
-<U5AF6> \xE5\x58 |0
-<U5AF7> \xE5\x57 |0
-<U5AF8> \xE5\x5A |0
-<U5AF9> \xE5\x5C |0
-<U5AFA> \xF9\xDC |0
-<U5AFB> \xBC\x5F |0
-<U5AFD> \xE5\x56 |0
-<U5AFF> \xE5\x54 |0
-<U5B01> \xE5\x5D |0
-<U5B02> \xE5\x5B |0
-<U5B03> \xE5\x59 |0
-<U5B05> \xE5\x5F |0
-<U5B07> \xE5\x5E |0
-<U5B08> \xBC\x63 |0
-<U5B09> \xBC\x5E |0
-<U5B0B> \xBC\x60 |0
-<U5B0C> \xBC\x62 |0
-<U5B0F> \xE5\x60 |0
-<U5B10> \xE9\x57 |0
-<U5B13> \xE9\x56 |0
-<U5B14> \xE9\x55 |0
-<U5B16> \xE9\x58 |0
-<U5B17> \xE9\x51 |0
-<U5B19> \xE9\x52 |0
-<U5B1A> \xE9\x5A |0
-<U5B1B> \xE9\x53 |0
-<U5B1D> \xBE\xC5 |0
-<U5B1E> \xE9\x5C |0
-<U5B20> \xE9\x5B |0
-<U5B21> \xE9\x54 |0
-<U5B23> \xEC\xD1 |0
-<U5B24> \xC0\xA8 |0
-<U5B25> \xEC\xCF |0
-<U5B26> \xEC\xD4 |0
-<U5B27> \xEC\xD3 |0
-<U5B28> \xE9\x59 |0
-<U5B2A> \xC0\xA7 |0
-<U5B2C> \xEC\xD2 |0
-<U5B2D> \xEC\xCE |0
-<U5B2E> \xEC\xD6 |0
-<U5B2F> \xEC\xD5 |0
-<U5B30> \xC0\xA6 |0
-<U5B32> \xEC\xD0 |0
-<U5B34> \xBE\xC6 |0
-<U5B38> \xC2\x54 |0
-<U5B3C> \xEF\xC1 |0
-<U5B3D> \xF1\xFA |0
-<U5B3E> \xF1\xFB |0
-<U5B3F> \xF1\xFC |0
-<U5B40> \xC4\x5C |0
-<U5B43> \xC4\x5D |0
-<U5B45> \xF4\x43 |0
-<U5B47> \xF5\xC8 |0
-<U5B48> \xF5\xC7 |0
-<U5B4B> \xF6\xDB |0
-<U5B4C> \xF6\xDC |0
-<U5B4D> \xF7\xD5 |0
-<U5B4E> \xF8\xA7 |0
-<U5B50> \xA4\x6C |0
-<U5B51> \xA4\x6D |0
-<U5B53> \xA4\x6E |0
-<U5B54> \xA4\xD5 |0
-<U5B55> \xA5\xA5 |0
-<U5B56> \xC9\xD3 |0
-<U5B57> \xA6\x72 |0
-<U5B58> \xA6\x73 |0
-<U5B5A> \xA7\xB7 |0
-<U5B5B> \xA7\xB8 |0
-<U5B5C> \xA7\xB6 |0
-<U5B5D> \xA7\xB5 |0
-<U5B5F> \xA9\x73 |0
-<U5B62> \xCC\x55 |0
-<U5B63> \xA9\x75 |0
-<U5B64> \xA9\x74 |0
-<U5B65> \xCC\x56 |0
-<U5B69> \xAB\xC4 |0
-<U5B6B> \xAE\x5D |0
-<U5B6C> \xD1\x65 |0
-<U5B6E> \xD4\xF0 |0
-<U5B70> \xB1\x45 |0
-<U5B71> \xB4\x47 |0
-<U5B72> \xD4\xEF |0
-<U5B73> \xB4\x46 |0
-<U5B75> \xB9\xE5 |0
-<U5B77> \xE1\x7D |0
-<U5B78> \xBE\xC7 |0
-<U5B7A> \xC0\xA9 |0
-<U5B7B> \xEC\xD7 |0
-<U5B7D> \xC4\x5E |0
-<U5B7F> \xC5\x70 |0
-<U5B81> \xC9\x72 |0
-<U5B83> \xA5\xA6 |0
-<U5B84> \xC9\x73 |0
-<U5B85> \xA6\x76 |0
-<U5B87> \xA6\x74 |0
-<U5B88> \xA6\x75 |0
-<U5B89> \xA6\x77 |0
-<U5B8B> \xA7\xBA |0
-<U5B8C> \xA7\xB9 |0
-<U5B8E> \xCA\xBC |0
-<U5B8F> \xA7\xBB |0
-<U5B92> \xCA\xBD |0
-<U5B93> \xCC\x57 |0
-<U5B95> \xCC\x58 |0
-<U5B97> \xA9\x76 |0
-<U5B98> \xA9\x78 |0
-<U5B99> \xA9\x7A |0
-<U5B9A> \xA9\x77 |0
-<U5B9B> \xA9\x7B |0
-<U5B9C> \xA9\x79 |0
-<U5BA2> \xAB\xC8 |0
-<U5BA3> \xAB\xC5 |0
-<U5BA4> \xAB\xC7 |0
-<U5BA5> \xAB\xC9 |0
-<U5BA6> \xAB\xC6 |0
-<U5BA7> \xD1\x66 |0
-<U5BA8> \xCE\x77 |0
-<U5BAC> \xD1\x68 |0
-<U5BAD> \xD1\x67 |0
-<U5BAE> \xAE\x63 |0
-<U5BB0> \xAE\x5F |0
-<U5BB3> \xAE\x60 |0
-<U5BB4> \xAE\x62 |0
-<U5BB5> \xAE\x64 |0
-<U5BB6> \xAE\x61 |0
-<U5BB8> \xAE\x66 |0
-<U5BB9> \xAE\x65 |0
-<U5BBF> \xB1\x4A |0
-<U5BC0> \xD4\xF2 |0
-<U5BC1> \xD4\xF1 |0
-<U5BC2> \xB1\x49 |0
-<U5BC4> \xB1\x48 |0
-<U5BC5> \xB1\x47 |0
-<U5BC6> \xB1\x4B |0
-<U5BC7> \xB1\x46 |0
-<U5BCA> \xD8\xD5 |0
-<U5BCB> \xD8\xD2 |0
-<U5BCC> \xB4\x49 |0
-<U5BCD> \xD8\xD1 |0
-<U5BCE> \xD8\xD6 |0
-<U5BD0> \xB4\x4B |0
-<U5BD1> \xD8\xD4 |0
-<U5BD2> \xB4\x48 |0
-<U5BD3> \xB4\x4A |0
-<U5BD4> \xD8\xD3 |0
-<U5BD6> \xDD\x48 |0
-<U5BD8> \xDD\x49 |0
-<U5BD9> \xDD\x4A |0
-<U5BDE> \xB9\xE6 |0
-<U5BDF> \xB9\xEE |0
-<U5BE0> \xE1\x7E |0
-<U5BE1> \xB9\xE8 |0
-<U5BE2> \xB9\xEC |0
-<U5BE3> \xE1\xA1 |0
-<U5BE4> \xB9\xED |0
-<U5BE5> \xB9\xE9 |0
-<U5BE6> \xB9\xEA |0
-<U5BE7> \xB9\xE7 |0
-<U5BE8> \xB9\xEB |0
-<U5BE9> \xBC\x66 |0
-<U5BEA> \xD8\xD0 |0
-<U5BEB> \xBC\x67 |0
-<U5BEC> \xBC\x65 |0
-<U5BEE> \xBC\x64 |0
-<U5BEF> \xE9\x5D |0
-<U5BF0> \xBE\xC8 |0
-<U5BF1> \xEC\xD8 |0
-<U5BF2> \xEC\xD9 |0
-<U5BF5> \xC3\x64 |0
-<U5BF6> \xC4\x5F |0
-<U5BF8> \xA4\x6F |0
-<U5BFA> \xA6\x78 |0
-<U5C01> \xAB\xCA |0
-<U5C03> \xD1\x69 |0
-<U5C04> \xAE\x67 |0
-<U5C07> \xB1\x4E |0
-<U5C08> \xB1\x4D |0
-<U5C09> \xB1\x4C |0
-<U5C0A> \xB4\x4C |0
-<U5C0B> \xB4\x4D |0
-<U5C0C> \xD8\xD7 |0
-<U5C0D> \xB9\xEF |0
-<U5C0E> \xBE\xC9 |0
-<U5C0F> \xA4\x70 |0
-<U5C10> \xC9\x5C |0
-<U5C11> \xA4\xD6 |0
-<U5C12> \xC9\x74 |0
-<U5C15> \xC9\xD4 |0
-<U5C16> \xA6\x79 |0
-<U5C1A> \xA9\x7C |0
-<U5C1F> \xDD\x4B |0
-<U5C22> \xA4\x71 |0
-<U5C24> \xA4\xD7 |0
-<U5C25> \xC9\xD5 |0
-<U5C28> \xCA\xBE |0
-<U5C2A> \xCA\xBF |0
-<U5C2C> \xA7\xBC |0
-<U5C30> \xD8\xD8 |0
-<U5C31> \xB4\x4E |0
-<U5C33> \xDD\x4C |0
-<U5C37> \xC0\xAA |0
-<U5C38> \xA4\x72 |0
-<U5C39> \xA4\xA8 |0
-<U5C3A> \xA4\xD8 |0
-<U5C3B> \xC9\x75 |0
-<U5C3C> \xA5\xA7 |0
-<U5C3E> \xA7\xC0 |0
-<U5C3F> \xA7\xBF |0
-<U5C40> \xA7\xBD |0
-<U5C41> \xA7\xBE |0
-<U5C44> \xCC\x59 |0
-<U5C45> \xA9\x7E |0
-<U5C46> \xA9\xA1 |0
-<U5C47> \xCC\x5A |0
-<U5C48> \xA9\x7D |0
-<U5C4B> \xAB\xCE |0
-<U5C4C> \xCE\x78 |0
-<U5C4D> \xAB\xCD |0
-<U5C4E> \xAB\xCB |0
-<U5C4F> \xAB\xCC |0
-<U5C50> \xAE\x6A |0
-<U5C51> \xAE\x68 |0
-<U5C54> \xD1\x6B |0
-<U5C55> \xAE\x69 |0
-<U5C56> \xD1\x6A |0
-<U5C58> \xAE\x5E |0
-<U5C59> \xD4\xF3 |0
-<U5C5C> \xB1\x50 |0
-<U5C5D> \xB1\x51 |0
-<U5C60> \xB1\x4F |0
-<U5C62> \xB9\xF0 |0
-<U5C63> \xE1\xA2 |0
-<U5C64> \xBC\x68 |0
-<U5C65> \xBC\x69 |0
-<U5C67> \xE5\x61 |0
-<U5C68> \xC0\xAB |0
-<U5C69> \xEF\xC2 |0
-<U5C6A> \xEF\xC3 |0
-<U5C6C> \xC4\xDD |0
-<U5C6D> \xF8\xA8 |0
-<U5C6E> \xC9\x4B |0
-<U5C6F> \xA4\xD9 |0
-<U5C71> \xA4\x73 |0
-<U5C73> \xC9\x77 |0
-<U5C74> \xC9\x76 |0
-<U5C79> \xA6\x7A |0
-<U5C7A> \xC9\xD7 |0
-<U5C7B> \xC9\xD8 |0
-<U5C7C> \xC9\xD6 |0
-<U5C7E> \xC9\xD9 |0
-<U5C86> \xCA\xC7 |0
-<U5C88> \xCA\xC2 |0
-<U5C89> \xCA\xC4 |0
-<U5C8A> \xCA\xC6 |0
-<U5C8B> \xCA\xC3 |0
-<U5C8C> \xA7\xC4 |0
-<U5C8D> \xCA\xC0 |0
-<U5C8F> \xCA\xC1 |0
-<U5C90> \xA7\xC1 |0
-<U5C91> \xA7\xC2 |0
-<U5C92> \xCA\xC5 |0
-<U5C93> \xCA\xC8 |0
-<U5C94> \xA7\xC3 |0
-<U5C95> \xCA\xC9 |0
-<U5C9D> \xCC\x68 |0
-<U5C9F> \xCC\x62 |0
-<U5CA0> \xCC\x5D |0
-<U5CA1> \xA9\xA3 |0
-<U5CA2> \xCC\x65 |0
-<U5CA3> \xCC\x63 |0
-<U5CA4> \xCC\x5C |0
-<U5CA5> \xCC\x69 |0
-<U5CA6> \xCC\x6C |0
-<U5CA7> \xCC\x67 |0
-<U5CA8> \xCC\x60 |0
-<U5CA9> \xA9\xA5 |0
-<U5CAA> \xCC\x66 |0
-<U5CAB> \xA9\xA6 |0
-<U5CAC> \xCC\x61 |0
-<U5CAD> \xCC\x64 |0
-<U5CAE> \xCC\x5B |0
-<U5CAF> \xCC\x5F |0
-<U5CB0> \xCC\x6B |0
-<U5CB1> \xA9\xA7 |0
-<U5CB3> \xA9\xA8 |0
-<U5CB5> \xCC\x5E |0
-<U5CB6> \xCC\x6A |0
-<U5CB7> \xA9\xA2 |0
-<U5CB8> \xA9\xA4 |0
-<U5CC6> \xCE\xAB |0
-<U5CC7> \xCE\xA4 |0
-<U5CC8> \xCE\xAA |0
-<U5CC9> \xCE\xA3 |0
-<U5CCA> \xCE\xA5 |0
-<U5CCB> \xCE\x7D |0
-<U5CCC> \xCE\x7B |0
-<U5CCE> \xCE\xAC |0
-<U5CCF> \xCE\xA9 |0
-<U5CD0> \xCE\x79 |0
-<U5CD2> \xAB\xD0 |0
-<U5CD3> \xCE\xA7 |0
-<U5CD4> \xCE\xA8 |0
-<U5CD6> \xCE\xA6 |0
-<U5CD7> \xCE\x7C |0
-<U5CD8> \xCE\x7A |0
-<U5CD9> \xAB\xCF |0
-<U5CDA> \xCE\xA2 |0
-<U5CDB> \xCE\x7E |0
-<U5CDE> \xCE\xA1 |0
-<U5CDF> \xCE\xAD |0
-<U5CE8> \xAE\x6F |0
-<U5CEA> \xAE\x6E |0
-<U5CEC> \xD1\x6C |0
-<U5CED> \xAE\x6B |0
-<U5CEE> \xD1\x6E |0
-<U5CF0> \xAE\x70 |0
-<U5CF1> \xD1\x6F |0
-<U5CF4> \xAE\x73 |0
-<U5CF6> \xAE\x71 |0
-<U5CF7> \xD1\x70 |0
-<U5CF8> \xCE\xAE |0
-<U5CF9> \xD1\x72 |0
-<U5CFB> \xAE\x6D |0
-<U5CFD> \xAE\x6C |0
-<U5CFF> \xD1\x6D |0
-<U5D00> \xD1\x71 |0
-<U5D01> \xAE\x72 |0
-<U5D06> \xB1\x53 |0
-<U5D07> \xB1\x52 |0
-<U5D0B> \xD4\xF5 |0
-<U5D0C> \xD4\xF9 |0
-<U5D0D> \xD4\xFB |0
-<U5D0E> \xB1\x54 |0
-<U5D0F> \xD4\xFE |0
-<U5D11> \xB1\x58 |0
-<U5D12> \xD5\x41 |0
-<U5D14> \xB1\x5A |0
-<U5D16> \xB1\x56 |0
-<U5D17> \xB1\x5E |0
-<U5D19> \xB1\x5B |0
-<U5D1A> \xD4\xF7 |0
-<U5D1B> \xB1\x55 |0
-<U5D1D> \xD4\xF6 |0
-<U5D1E> \xD4\xF4 |0
-<U5D1F> \xD5\x43 |0
-<U5D20> \xD4\xF8 |0
-<U5D22> \xB1\x57 |0
-<U5D23> \xD5\x42 |0
-<U5D24> \xB1\x5C |0
-<U5D25> \xD4\xFD |0
-<U5D26> \xD4\xFC |0
-<U5D27> \xB1\x5D |0
-<U5D28> \xD4\xFA |0
-<U5D29> \xB1\x59 |0
-<U5D2E> \xD5\x44 |0
-<U5D30> \xD5\x40 |0
-<U5D31> \xD8\xE7 |0
-<U5D32> \xD8\xEE |0
-<U5D33> \xD8\xE3 |0
-<U5D34> \xB4\x51 |0
-<U5D35> \xD8\xDF |0
-<U5D36> \xD8\xEF |0
-<U5D37> \xD8\xD9 |0
-<U5D38> \xD8\xEC |0
-<U5D39> \xD8\xEA |0
-<U5D3A> \xD8\xE4 |0
-<U5D3C> \xD8\xED |0
-<U5D3D> \xD8\xE6 |0
-<U5D3F> \xD8\xDE |0
-<U5D40> \xD8\xF0 |0
-<U5D41> \xD8\xDC |0
-<U5D42> \xD8\xE9 |0
-<U5D43> \xD8\xDA |0
-<U5D45> \xD8\xF1 |0
-<U5D47> \xB4\x52 |0
-<U5D49> \xD8\xEB |0
-<U5D4A> \xDD\x4F |0
-<U5D4B> \xD8\xDD |0
-<U5D4C> \xB4\x4F |0
-<U5D4E> \xD8\xE1 |0
-<U5D50> \xB4\x50 |0
-<U5D51> \xD8\xE0 |0
-<U5D52> \xD8\xE5 |0
-<U5D55> \xD8\xE2 |0
-<U5D59> \xD8\xE8 |0
-<U5D5E> \xDD\x53 |0
-<U5D62> \xDD\x56 |0
-<U5D63> \xDD\x4E |0
-<U5D65> \xDD\x50 |0
-<U5D67> \xDD\x55 |0
-<U5D68> \xDD\x54 |0
-<U5D69> \xB7\x43 |0
-<U5D6B> \xD8\xDB |0
-<U5D6C> \xDD\x52 |0
-<U5D6F> \xB7\x44 |0
-<U5D71> \xDD\x4D |0
-<U5D72> \xDD\x51 |0
-<U5D77> \xE1\xA9 |0
-<U5D79> \xE1\xB0 |0
-<U5D7A> \xE1\xA7 |0
-<U5D7C> \xE1\xAE |0
-<U5D7D> \xE1\xA5 |0
-<U5D7E> \xE1\xAD |0
-<U5D7F> \xE1\xB1 |0
-<U5D80> \xE1\xA4 |0
-<U5D81> \xE1\xA8 |0
-<U5D82> \xE1\xA3 |0
-<U5D84> \xB9\xF1 |0
-<U5D86> \xE1\xA6 |0
-<U5D87> \xB9\xF2 |0
-<U5D88> \xE1\xAC |0
-<U5D89> \xE1\xAB |0
-<U5D8A> \xE1\xAA |0
-<U5D8D> \xE1\xAF |0
-<U5D92> \xE5\x65 |0
-<U5D93> \xE5\x67 |0
-<U5D94> \xBC\x6B |0
-<U5D95> \xE5\x68 |0
-<U5D97> \xE5\x63 |0
-<U5D99> \xE5\x62 |0
-<U5D9A> \xE5\x6C |0
-<U5D9C> \xE5\x6A |0
-<U5D9D> \xBC\x6A |0
-<U5D9E> \xE5\x6D |0
-<U5D9F> \xE5\x64 |0
-<U5DA0> \xE5\x69 |0
-<U5DA1> \xE5\x6B |0
-<U5DA2> \xE5\x66 |0
-<U5DA7> \xE9\x61 |0
-<U5DA8> \xE9\x66 |0
-<U5DA9> \xE9\x60 |0
-<U5DAA> \xE9\x65 |0
-<U5DAC> \xE9\x5E |0
-<U5DAD> \xE9\x68 |0
-<U5DAE> \xE9\x64 |0
-<U5DAF> \xE9\x69 |0
-<U5DB0> \xE9\x63 |0
-<U5DB1> \xE9\x5F |0
-<U5DB2> \xE9\x67 |0
-<U5DB4> \xE9\x6A |0
-<U5DB5> \xE9\x62 |0
-<U5DB7> \xEC\xDA |0
-<U5DB8> \xC0\xAF |0
-<U5DBA> \xC0\xAD |0
-<U5DBC> \xC0\xAC |0
-<U5DBD> \xC0\xAE |0
-<U5DC0> \xEF\xC4 |0
-<U5DC2> \xF1\x72 |0
-<U5DC3> \xF1\xFD |0
-<U5DC6> \xF4\x44 |0
-<U5DC7> \xF4\x45 |0
-<U5DC9> \xC4\x60 |0
-<U5DCB> \xF5\xC9 |0
-<U5DCD> \xC4\xDE |0
-<U5DCF> \xF5\xCA |0
-<U5DD1> \xF6\xDE |0
-<U5DD2> \xC5\x72 |0
-<U5DD4> \xC5\x71 |0
-<U5DD5> \xF6\xDD |0
-<U5DD6> \xC5\xC9 |0
-<U5DD8> \xF7\xD6 |0
-<U5DDD> \xA4\x74 |0
-<U5DDE> \xA6\x7B |0
-<U5DDF> \xC9\xDA |0
-<U5DE0> \xCA\xCA |0
-<U5DE1> \xA8\xB5 |0
-<U5DE2> \xB1\x5F |0
-<U5DE5> \xA4\x75 |0
-<U5DE6> \xA5\xAA |0
-<U5DE7> \xA5\xA9 |0
-<U5DE8> \xA5\xA8 |0
-<U5DEB> \xA7\xC5 |0
-<U5DEE> \xAE\x74 |0
-<U5DF0> \xDD\x57 |0
-<U5DF1> \xA4\x76 |0
-<U5DF2> \xA4\x77 |0
-<U5DF3> \xA4\x78 |0
-<U5DF4> \xA4\xDA |0
-<U5DF7> \xAB\xD1 |0
-<U5DF9> \xCE\xAF |0
-<U5DFD> \xB4\x53 |0
-<U5DFE> \xA4\x79 |0
-<U5DFF> \xC9\x5D |0
-<U5E02> \xA5\xAB |0
-<U5E03> \xA5\xAC |0
-<U5E04> \xC9\x78 |0
-<U5E06> \xA6\x7C |0
-<U5E0A> \xCA\xCB |0
-<U5E0C> \xA7\xC6 |0
-<U5E0E> \xCA\xCC |0
-<U5E11> \xA9\xAE |0
-<U5E14> \xCC\x6E |0
-<U5E15> \xA9\xAC |0
-<U5E16> \xA9\xAB |0
-<U5E17> \xCC\x6D |0
-<U5E18> \xA9\xA9 |0
-<U5E19> \xCC\x6F |0
-<U5E1A> \xA9\xAA |0
-<U5E1B> \xA9\xAD |0
-<U5E1D> \xAB\xD2 |0
-<U5E1F> \xAB\xD4 |0
-<U5E20> \xCE\xB3 |0
-<U5E21> \xCE\xB0 |0
-<U5E22> \xCE\xB1 |0
-<U5E23> \xCE\xB2 |0
-<U5E24> \xCE\xB4 |0
-<U5E25> \xAB\xD3 |0
-<U5E28> \xD1\x74 |0
-<U5E29> \xD1\x73 |0
-<U5E2B> \xAE\x76 |0
-<U5E2D> \xAE\x75 |0
-<U5E33> \xB1\x62 |0
-<U5E34> \xD5\x46 |0
-<U5E36> \xB1\x61 |0
-<U5E37> \xB1\x63 |0
-<U5E38> \xB1\x60 |0
-<U5E3D> \xB4\x55 |0
-<U5E3E> \xD5\x45 |0
-<U5E40> \xB4\x56 |0
-<U5E41> \xD8\xF3 |0
-<U5E43> \xB4\x57 |0
-<U5E44> \xD8\xF2 |0
-<U5E45> \xB4\x54 |0
-<U5E4A> \xDD\x5A |0
-<U5E4B> \xDD\x5C |0
-<U5E4C> \xB7\x45 |0
-<U5E4D> \xDD\x5B |0
-<U5E4E> \xDD\x59 |0
-<U5E4F> \xDD\x58 |0
-<U5E53> \xE1\xB4 |0
-<U5E54> \xB9\xF7 |0
-<U5E55> \xB9\xF5 |0
-<U5E57> \xB9\xF6 |0
-<U5E58> \xE1\xB2 |0
-<U5E59> \xE1\xB3 |0
-<U5E5B> \xB9\xF3 |0
-<U5E5C> \xE5\x71 |0
-<U5E5D> \xE5\x6F |0
-<U5E5F> \xBC\x6D |0
-<U5E60> \xE5\x70 |0
-<U5E61> \xBC\x6E |0
-<U5E62> \xBC\x6C |0
-<U5E63> \xB9\xF4 |0
-<U5E66> \xE9\x6D |0
-<U5E67> \xE9\x6B |0
-<U5E68> \xE9\x6C |0
-<U5E69> \xE5\x6E |0
-<U5E6A> \xEC\xDC |0
-<U5E6B> \xC0\xB0 |0
-<U5E6C> \xEC\xDB |0
-<U5E6D> \xEF\xC5 |0
-<U5E6E> \xEF\xC6 |0
-<U5E6F> \xE9\x6E |0
-<U5E70> \xF1\xFE |0
-<U5E72> \xA4\x7A |0
-<U5E73> \xA5\xAD |0
-<U5E74> \xA6\x7E |0
-<U5E75> \xC9\xDB |0
-<U5E76> \xA6\x7D |0
-<U5E78> \xA9\xAF |0
-<U5E79> \xB7\x46 |0
-<U5E7B> \xA4\xDB |0
-<U5E7C> \xA5\xAE |0
-<U5E7D> \xAB\xD5 |0
-<U5E7E> \xB4\x58 |0
-<U5E80> \xC9\x79 |0
-<U5E82> \xC9\x7A |0
-<U5E84> \xC9\xDC |0
-<U5E87> \xA7\xC8 |0
-<U5E88> \xCA\xD0 |0
-<U5E89> \xCA\xCE |0
-<U5E8A> \xA7\xC9 |0
-<U5E8B> \xCA\xCD |0
-<U5E8C> \xCA\xCF |0
-<U5E8D> \xCA\xD1 |0
-<U5E8F> \xA7\xC7 |0
-<U5E95> \xA9\xB3 |0
-<U5E96> \xA9\xB4 |0
-<U5E97> \xA9\xB1 |0
-<U5E9A> \xA9\xB0 |0
-<U5E9B> \xCE\xB8 |0
-<U5E9C> \xA9\xB2 |0
-<U5EA0> \xAB\xD6 |0
-<U5EA2> \xCE\xB7 |0
-<U5EA3> \xCE\xB9 |0
-<U5EA4> \xCE\xB6 |0
-<U5EA5> \xCE\xBA |0
-<U5EA6> \xAB\xD7 |0
-<U5EA7> \xAE\x79 |0
-<U5EA8> \xD1\x75 |0
-<U5EAA> \xD1\x77 |0
-<U5EAB> \xAE\x77 |0
-<U5EAC> \xD1\x78 |0
-<U5EAD> \xAE\x78 |0
-<U5EAE> \xD1\x76 |0
-<U5EB0> \xCE\xB5 |0
-<U5EB1> \xD5\x47 |0
-<U5EB2> \xD5\x4A |0
-<U5EB3> \xD5\x4B |0
-<U5EB4> \xD5\x48 |0
-<U5EB5> \xB1\x67 |0
-<U5EB6> \xB1\x66 |0
-<U5EB7> \xB1\x64 |0
-<U5EB8> \xB1\x65 |0
-<U5EB9> \xD5\x49 |0
-<U5EBE> \xB1\x68 |0
-<U5EC1> \xB4\x5A |0
-<U5EC2> \xB4\x5B |0
-<U5EC4> \xB4\x5C |0
-<U5EC5> \xDD\x5D |0
-<U5EC6> \xDD\x5F |0
-<U5EC7> \xDD\x61 |0
-<U5EC8> \xB7\x48 |0
-<U5EC9> \xB7\x47 |0
-<U5ECA> \xB4\x59 |0
-<U5ECB> \xDD\x60 |0
-<U5ECC> \xDD\x5E |0
-<U5ECE> \xE1\xB8 |0
-<U5ED1> \xE1\xB6 |0
-<U5ED2> \xE1\xBC |0
-<U5ED3> \xB9\xF8 |0
-<U5ED4> \xE1\xBD |0
-<U5ED5> \xE1\xBA |0
-<U5ED6> \xB9\xF9 |0
-<U5ED7> \xE1\xB7 |0
-<U5ED8> \xE1\xB5 |0
-<U5ED9> \xE1\xBB |0
-<U5EDA> \xBC\x70 |0
-<U5EDB> \xE5\x73 |0
-<U5EDC> \xE1\xB9 |0
-<U5EDD> \xBC\x72 |0
-<U5EDE> \xE5\x74 |0
-<U5EDF> \xBC\x71 |0
-<U5EE0> \xBC\x74 |0
-<U5EE1> \xE5\x75 |0
-<U5EE2> \xBC\x6F |0
-<U5EE3> \xBC\x73 |0
-<U5EE5> \xE9\x73 |0
-<U5EE6> \xE9\x71 |0
-<U5EE7> \xE9\x70 |0
-<U5EE8> \xE9\x72 |0
-<U5EE9> \xE9\x6F |0
-<U5EEC> \xC3\x66 |0
-<U5EEE> \xF4\x46 |0
-<U5EEF> \xF4\x47 |0
-<U5EF1> \xF5\xCB |0
-<U5EF2> \xF6\xDF |0
-<U5EF3> \xC6\x55 |0
-<U5EF6> \xA9\xB5 |0
-<U5EF7> \xA7\xCA |0
-<U5EFA> \xAB\xD8 |0
-<U5EFE> \xA4\x7B |0
-<U5EFF> \xA4\xDC |0
-<U5F01> \xA5\xAF |0
-<U5F02> \xC9\xDD |0
-<U5F04> \xA7\xCB |0
-<U5F05> \xCA\xD2 |0
-<U5F07> \xCE\xBB |0
-<U5F08> \xAB\xD9 |0
-<U5F0A> \xB9\xFA |0
-<U5F0B> \xA4\x7C |0
-<U5F0F> \xA6\xA1 |0
-<U5F12> \xB7\x49 |0
-<U5F13> \xA4\x7D |0
-<U5F14> \xA4\xDD |0
-<U5F15> \xA4\xDE |0
-<U5F17> \xA5\xB1 |0
-<U5F18> \xA5\xB0 |0
-<U5F1A> \xC9\xDE |0
-<U5F1B> \xA6\xA2 |0
-<U5F1D> \xCA\xD3 |0
-<U5F1F> \xA7\xCC |0
-<U5F22> \xCC\x71 |0
-<U5F23> \xCC\x72 |0
-<U5F24> \xCC\x73 |0
-<U5F26> \xA9\xB6 |0
-<U5F27> \xA9\xB7 |0
-<U5F28> \xCC\x70 |0
-<U5F29> \xA9\xB8 |0
-<U5F2D> \xAB\xDA |0
-<U5F2E> \xCE\xBC |0
-<U5F30> \xD1\x7A |0
-<U5F31> \xAE\x7A |0
-<U5F33> \xD1\x79 |0
-<U5F35> \xB1\x69 |0
-<U5F36> \xD5\x4C |0
-<U5F37> \xB1\x6A |0
-<U5F38> \xD5\x4D |0
-<U5F3C> \xB4\x5D |0
-<U5F40> \xDD\x62 |0
-<U5F43> \xE1\xBF |0
-<U5F44> \xE1\xBE |0
-<U5F46> \xB9\xFB |0
-<U5F48> \xBC\x75 |0
-<U5F49> \xE5\x76 |0
-<U5F4A> \xBE\xCA |0
-<U5F4B> \xE9\x74 |0
-<U5F4C> \xC0\xB1 |0
-<U5F4E> \xC5\x73 |0
-<U5F4F> \xF7\xD8 |0
-<U5F54> \xCC\x74 |0
-<U5F56> \xCE\xBD |0
-<U5F57> \xB1\x6B |0
-<U5F58> \xD8\xF4 |0
-<U5F59> \xB7\x4A |0
-<U5F5D> \xC2\x55 |0
-<U5F62> \xA7\xCE |0
-<U5F64> \xA7\xCD |0
-<U5F65> \xAB\xDB |0
-<U5F67> \xD1\x7B |0
-<U5F69> \xB1\x6D |0
-<U5F6A> \xB3\x43 |0
-<U5F6B> \xB1\x6E |0
-<U5F6C> \xB1\x6C |0
-<U5F6D> \xB4\x5E |0
-<U5F6F> \xE1\xC0 |0
-<U5F70> \xB9\xFC |0
-<U5F71> \xBC\x76 |0
-<U5F73> \xC9\x4C |0
-<U5F74> \xC9\xDF |0
-<U5F76> \xCA\xD5 |0
-<U5F77> \xA7\xCF |0
-<U5F78> \xCA\xD4 |0
-<U5F79> \xA7\xD0 |0
-<U5F7C> \xA9\xBC |0
-<U5F7D> \xCC\x77 |0
-<U5F7E> \xCC\x76 |0
-<U5F7F> \xA9\xBB |0
-<U5F80> \xA9\xB9 |0
-<U5F81> \xA9\xBA |0
-<U5F82> \xCC\x75 |0
-<U5F85> \xAB\xDD |0
-<U5F86> \xCE\xBE |0
-<U5F87> \xAB\xE0 |0
-<U5F88> \xAB\xDC |0
-<U5F89> \xAB\xE2 |0
-<U5F8A> \xAB\xDE |0
-<U5F8B> \xAB\xDF |0
-<U5F8C> \xAB\xE1 |0
-<U5F90> \xAE\x7D |0
-<U5F91> \xAE\x7C |0
-<U5F92> \xAE\x7B |0
-<U5F96> \xD5\x4F |0
-<U5F97> \xB1\x6F |0
-<U5F98> \xB1\x72 |0
-<U5F99> \xB1\x70 |0
-<U5F9B> \xD5\x4E |0
-<U5F9C> \xB1\x75 |0
-<U5F9E> \xB1\x71 |0
-<U5F9F> \xD5\x50 |0
-<U5FA0> \xB1\x74 |0
-<U5FA1> \xB1\x73 |0
-<U5FA5> \xD8\xF6 |0
-<U5FA6> \xD8\xF5 |0
-<U5FA8> \xB4\x61 |0
-<U5FA9> \xB4\x5F |0
-<U5FAA> \xB4\x60 |0
-<U5FAB> \xD8\xF7 |0
-<U5FAC> \xB7\x4B |0
-<U5FAD> \xDD\x64 |0
-<U5FAE> \xB7\x4C |0
-<U5FAF> \xDD\x63 |0
-<U5FB2> \xE5\x77 |0
-<U5FB5> \xBC\x78 |0
-<U5FB6> \xE1\xC1 |0
-<U5FB7> \xBC\x77 |0
-<U5FB9> \xB9\xFD |0
-<U5FBB> \xEC\xDE |0
-<U5FBC> \xE9\x75 |0
-<U5FBD> \xC0\xB2 |0
-<U5FBE> \xEC\xDD |0
-<U5FBF> \xF2\x40 |0
-<U5FC0> \xF4\x48 |0
-<U5FC1> \xF4\x49 |0
-<U5FC3> \xA4\xDF |0
-<U5FC5> \xA5\xB2 |0
-<U5FC9> \xC9\x7B |0
-<U5FCC> \xA7\xD2 |0
-<U5FCD> \xA7\xD4 |0
-<U5FCF> \xC9\xE2 |0
-<U5FD0> \xCA\xD8 |0
-<U5FD1> \xCA\xD7 |0
-<U5FD2> \xCA\xD6 |0
-<U5FD4> \xC9\xE1 |0
-<U5FD5> \xC9\xE0 |0
-<U5FD6> \xA6\xA4 |0
-<U5FD7> \xA7\xD3 |0
-<U5FD8> \xA7\xD1 |0
-<U5FD9> \xA6\xA3 |0
-<U5FDD> \xA9\xBD |0
-<U5FDE> \xCC\x78 |0
-<U5FE0> \xA9\xBE |0
-<U5FE1> \xCA\xDD |0
-<U5FE3> \xCA\xDF |0
-<U5FE4> \xCA\xDE |0
-<U5FE5> \xCC\x79 |0
-<U5FE8> \xCA\xDA |0
-<U5FEA> \xA7\xD8 |0
-<U5FEB> \xA7\xD6 |0
-<U5FED> \xCA\xD9 |0
-<U5FEE> \xCA\xDB |0
-<U5FEF> \xCA\xE1 |0
-<U5FF1> \xA7\xD5 |0
-<U5FF3> \xCA\xDC |0
-<U5FF4> \xCA\xE5 |0
-<U5FF5> \xA9\xC0 |0
-<U5FF7> \xCA\xE2 |0
-<U5FF8> \xA7\xD7 |0
-<U5FFA> \xCA\xE0 |0
-<U5FFB> \xCA\xE3 |0
-<U5FFD> \xA9\xBF |0
-<U5FFF> \xA9\xC1 |0
-<U6000> \xCA\xE4 |0
-<U6009> \xCC\xAF |0
-<U600A> \xCC\xA2 |0
-<U600B> \xCC\x7E |0
-<U600C> \xCC\xAE |0
-<U600D> \xCC\xA9 |0
-<U600E> \xAB\xE7 |0
-<U600F> \xA9\xC2 |0
-<U6010> \xCC\xAA |0
-<U6011> \xCC\xAD |0
-<U6012> \xAB\xE3 |0
-<U6013> \xCC\xAC |0
-<U6014> \xA9\xC3 |0
-<U6015> \xA9\xC8 |0
-<U6016> \xA9\xC6 |0
-<U6017> \xCC\xA3 |0
-<U6019> \xCC\x7C |0
-<U601A> \xCC\xA5 |0
-<U601B> \xA9\xCD |0
-<U601C> \xCC\xB0 |0
-<U601D> \xAB\xE4 |0
-<U601E> \xCC\xA6 |0
-<U6020> \xAB\xE5 |0
-<U6021> \xA9\xC9 |0
-<U6022> \xCC\xA8 |0
-<U6024> \xCE\xCD |0
-<U6025> \xAB\xE6 |0
-<U6026> \xCC\x7B |0
-<U6027> \xA9\xCA |0
-<U6028> \xAB\xE8 |0
-<U6029> \xA9\xCB |0
-<U602A> \xA9\xC7 |0
-<U602B> \xA9\xCC |0
-<U602C> \xCC\xA7 |0
-<U602D> \xCC\x7A |0
-<U602E> \xCC\xAB |0
-<U602F> \xA9\xC4 |0
-<U6032> \xCC\x7D |0
-<U6033> \xCC\xA4 |0
-<U6034> \xCC\xA1 |0
-<U6035> \xA9\xC5 |0
-<U6037> \xCE\xBF |0
-<U6039> \xCE\xC0 |0
-<U6040> \xCE\xCA |0
-<U6041> \xD1\xA1 |0
-<U6042> \xCE\xCB |0
-<U6043> \xAB\xEE |0
-<U6044> \xCE\xCE |0
-<U6045> \xCE\xC4 |0
-<U6046> \xAB\xED |0
-<U6047> \xCE\xC6 |0
-<U6049> \xCE\xC7 |0
-<U604C> \xCE\xC9 |0
-<U604D> \xAB\xE9 |0
-<U6050> \xAE\xA3 |0
-<U6052> \xF9\xDA |0
-<U6053> \xCE\xC5 |0
-<U6054> \xCE\xC1 |0
-<U6055> \xAE\xA4 |0
-<U6058> \xCE\xCF |0
-<U6059> \xAE\x7E |0
-<U605A> \xD1\x7D |0
-<U605B> \xCE\xC8 |0
-<U605D> \xD1\x7C |0
-<U605E> \xCE\xC3 |0
-<U605F> \xCE\xCC |0
-<U6062> \xAB\xEC |0
-<U6063> \xAE\xA1 |0
-<U6064> \xAB\xF2 |0
-<U6065> \xAE\xA2 |0
-<U6066> \xCE\xD0 |0
-<U6067> \xD1\x7E |0
-<U6068> \xAB\xEB |0
-<U6069> \xAE\xA6 |0
-<U606A> \xAB\xF1 |0
-<U606B> \xAB\xF0 |0
-<U606C> \xAB\xEF |0
-<U606D> \xAE\xA5 |0
-<U606E> \xCE\xD1 |0
-<U606F> \xAE\xA7 |0
-<U6070> \xAB\xEA |0
-<U6072> \xCE\xC2 |0
-<U607F> \xB1\x76 |0
-<U6080> \xD1\xA4 |0
-<U6081> \xD1\xA6 |0
-<U6083> \xD1\xA8 |0
-<U6084> \xAE\xA8 |0
-<U6085> \xAE\xAE |0
-<U6086> \xD5\x53 |0
-<U6087> \xD1\xAC |0
-<U6088> \xD1\xA3 |0
-<U6089> \xB1\x78 |0
-<U608A> \xD5\x51 |0
-<U608C> \xAE\xAD |0
-<U608D> \xAE\xAB |0
-<U608E> \xD1\xAE |0
-<U6090> \xD5\x52 |0
-<U6092> \xD1\xA5 |0
-<U6094> \xAE\xAC |0
-<U6095> \xD1\xA9 |0
-<U6096> \xAE\xAF |0
-<U6097> \xD1\xAB |0
-<U609A> \xAE\xAA |0
-<U609B> \xD1\xAA |0
-<U609C> \xD1\xAD |0
-<U609D> \xD1\xA7 |0
-<U609F> \xAE\xA9 |0
-<U60A0> \xB1\x79 |0
-<U60A2> \xD1\xA2 |0
-<U60A3> \xB1\x77 |0
-<U60A8> \xB1\x7A |0
-<U60B0> \xD5\x55 |0
-<U60B1> \xD5\x5E |0
-<U60B2> \xB4\x64 |0
-<U60B4> \xB1\x7C |0
-<U60B5> \xB1\xA3 |0
-<U60B6> \xB4\x65 |0
-<U60B7> \xD5\x60 |0
-<U60B8> \xB1\xAA |0
-<U60B9> \xD8\xF9 |0
-<U60BA> \xD5\x56 |0
-<U60BB> \xB1\xA2 |0
-<U60BC> \xB1\xA5 |0
-<U60BD> \xB1\x7E |0
-<U60BE> \xD5\x54 |0
-<U60BF> \xD5\x62 |0
-<U60C0> \xD5\x65 |0
-<U60C1> \xD9\x49 |0
-<U60C3> \xD5\x63 |0
-<U60C4> \xD8\xFD |0
-<U60C5> \xB1\xA1 |0
-<U60C6> \xB1\xA8 |0
-<U60C7> \xB1\xAC |0
-<U60C8> \xD5\x5D |0
-<U60C9> \xD8\xF8 |0
-<U60CA> \xD5\x61 |0
-<U60CB> \xB1\x7B |0
-<U60CC> \xD8\xFA |0
-<U60CD> \xD5\x64 |0
-<U60CE> \xD8\xFC |0
-<U60CF> \xD5\x59 |0
-<U60D1> \xB4\x62 |0
-<U60D3> \xD5\x57 |0
-<U60D4> \xD5\x58 |0
-<U60D5> \xB1\xA7 |0
-<U60D8> \xB1\xA6 |0
-<U60D9> \xD5\x5B |0
-<U60DA> \xB1\xAB |0
-<U60DB> \xD5\x5F |0
-<U60DC> \xB1\xA4 |0
-<U60DD> \xD5\x5C |0
-<U60DF> \xB1\xA9 |0
-<U60E0> \xB4\x66 |0
-<U60E1> \xB4\x63 |0
-<U60E2> \xD8\xFB |0
-<U60E4> \xD5\x5A |0
-<U60E6> \xB1\x7D |0
-<U60F0> \xB4\x6B |0
-<U60F1> \xB4\x6F |0
-<U60F2> \xD9\x40 |0
-<U60F3> \xB7\x51 |0
-<U60F4> \xB4\x6D |0
-<U60F5> \xD9\x44 |0
-<U60F6> \xB4\x71 |0
-<U60F7> \xDD\x65 |0
-<U60F8> \xD9\x46 |0
-<U60F9> \xB7\x53 |0
-<U60FA> \xB4\x69 |0
-<U60FB> \xB4\x6C |0
-<U60FC> \xD9\x47 |0
-<U60FE> \xD9\x48 |0
-<U60FF> \xD9\x4E |0
-<U6100> \xB4\x73 |0
-<U6101> \xB7\x54 |0
-<U6103> \xD9\x4A |0
-<U6104> \xD9\x4F |0
-<U6105> \xD9\x43 |0
-<U6106> \xB7\x5E |0
-<U6108> \xB7\x55 |0
-<U6109> \xB4\x72 |0
-<U610A> \xD9\x41 |0
-<U610B> \xD9\x50 |0
-<U610D> \xB7\x5D |0
-<U610E> \xB4\x70 |0
-<U610F> \xB7\x4E |0
-<U6110> \xD9\x4D |0
-<U6112> \xB4\x74 |0
-<U6113> \xD9\x45 |0
-<U6114> \xD8\xFE |0
-<U6115> \xB4\x6A |0
-<U6116> \xD9\x42 |0
-<U6118> \xD9\x4B |0
-<U611A> \xB7\x4D |0
-<U611B> \xB7\x52 |0
-<U611C> \xB4\x67 |0
-<U611D> \xD9\x4C |0
-<U611F> \xB7\x50 |0
-<U6123> \xB4\x68 |0
-<U6127> \xB7\x5C |0
-<U6128> \xE1\xC3 |0
-<U6129> \xDD\x70 |0
-<U612B> \xDD\x68 |0
-<U612C> \xE1\xC2 |0
-<U612E> \xDD\x6C |0
-<U612F> \xDD\x6E |0
-<U6132> \xDD\x6B |0
-<U6134> \xB7\x5B |0
-<U6136> \xDD\x6A |0
-<U6137> \xB7\x5F |0
-<U613B> \xE1\xD2 |0
-<U613E> \xB7\x5A |0
-<U613F> \xBA\x40 |0
-<U6140> \xDD\x71 |0
-<U6141> \xE1\xC4 |0
-<U6144> \xB7\x58 |0
-<U6145> \xDD\x69 |0
-<U6146> \xDD\x6D |0
-<U6147> \xB9\xFE |0
-<U6148> \xB7\x4F |0
-<U6149> \xDD\x66 |0
-<U614A> \xDD\x67 |0
-<U614B> \xBA\x41 |0
-<U614C> \xB7\x57 |0
-<U614D> \xB7\x59 |0
-<U614E> \xB7\x56 |0
-<U614F> \xDD\x6F |0
-<U6152> \xE1\xC8 |0
-<U6153> \xE1\xC9 |0
-<U6154> \xE1\xCE |0
-<U6155> \xBC\x7D |0
-<U6156> \xE1\xD5 |0
-<U6158> \xBA\x47 |0
-<U615A> \xBA\x46 |0
-<U615B> \xE1\xD0 |0
-<U615D> \xBC\x7C |0
-<U615E> \xE1\xC5 |0
-<U615F> \xBA\x45 |0
-<U6161> \xE1\xD4 |0
-<U6162> \xBA\x43 |0
-<U6163> \xBA\x44 |0
-<U6165> \xE1\xD1 |0
-<U6166> \xE5\xAA |0
-<U6167> \xBC\x7A |0
-<U6168> \xB4\x6E |0
-<U616A> \xE1\xD3 |0
-<U616B> \xBC\xA3 |0
-<U616C> \xE1\xCB |0
-<U616E> \xBC\x7B |0
-<U6170> \xBC\xA2 |0
-<U6171> \xE1\xC6 |0
-<U6172> \xE1\xCA |0
-<U6173> \xE1\xC7 |0
-<U6174> \xE1\xCD |0
-<U6175> \xBA\x48 |0
-<U6176> \xBC\x79 |0
-<U6177> \xBA\x42 |0
-<U6179> \xE5\x7A |0
-<U617A> \xE1\xCF |0
-<U617C> \xBC\xA1 |0
-<U617E> \xBC\xA4 |0
-<U6180> \xE1\xCC |0
-<U6182> \xBC\x7E |0
-<U6183> \xE5\x79 |0
-<U6189> \xE5\x7E |0
-<U618A> \xBE\xCE |0
-<U618B> \xE5\x78 |0
-<U618C> \xE9\xA3 |0
-<U618D> \xE5\xA9 |0
-<U618E> \xBC\xA8 |0
-<U6190> \xBC\xA6 |0
-<U6191> \xBE\xCC |0
-<U6192> \xE5\xA6 |0
-<U6193> \xE5\xA2 |0
-<U6194> \xBC\xAC |0
-<U6196> \xE9\x78 |0
-<U619A> \xBC\xAA |0
-<U619B> \xE5\xA1 |0
-<U619D> \xE9\x76 |0
-<U619F> \xE5\xA5 |0
-<U61A1> \xE5\xA8 |0
-<U61A2> \xE5\x7D |0
-<U61A4> \xBC\xAB |0
-<U61A7> \xBC\xA5 |0
-<U61A8> \xE9\x77 |0
-<U61A9> \xBE\xCD |0
-<U61AA> \xE5\xA7 |0
-<U61AB> \xBC\xA7 |0
-<U61AC> \xBC\xA9 |0
-<U61AD> \xE5\xA4 |0
-<U61AE> \xBC\xAD |0
-<U61AF> \xE5\xA3 |0
-<U61B0> \xE5\x7C |0
-<U61B1> \xE5\x7B |0
-<U61B2> \xBE\xCB |0
-<U61B3> \xE5\xAB |0
-<U61B4> \xE9\x7A |0
-<U61B5> \xEC\xE0 |0
-<U61B6> \xBE\xD0 |0
-<U61B8> \xE9\xA2 |0
-<U61BA> \xE9\x7E |0
-<U61BC> \xEC\xE1 |0
-<U61BE> \xBE\xD1 |0
-<U61BF> \xE9\xA1 |0
-<U61C1> \xE9\x7C |0
-<U61C2> \xC0\xB4 |0
-<U61C3> \xEC\xDF |0
-<U61C5> \xE9\x79 |0
-<U61C6> \xE9\x7B |0
-<U61C7> \xC0\xB5 |0
-<U61C8> \xBE\xD3 |0
-<U61C9> \xC0\xB3 |0
-<U61CA> \xBE\xD2 |0
-<U61CB> \xC0\xB7 |0
-<U61CC> \xE9\x7D |0
-<U61CD> \xBE\xCF |0
-<U61D6> \xEF\xCF |0
-<U61D8> \xEF\xC7 |0
-<U61DE> \xEC\xE7 |0
-<U61DF> \xEF\xC8 |0
-<U61E0> \xEC\xE3 |0
-<U61E3> \xC2\x56 |0
-<U61E4> \xEC\xE5 |0
-<U61E5> \xEC\xE4 |0
-<U61E6> \xC0\xB6 |0
-<U61E7> \xEC\xE2 |0
-<U61E8> \xEC\xE6 |0
-<U61E9> \xEF\xD0 |0
-<U61EA> \xEF\xCC |0
-<U61EB> \xEF\xCE |0
-<U61ED> \xEF\xC9 |0
-<U61EE> \xEF\xCA |0
-<U61F0> \xEF\xCD |0
-<U61F1> \xEF\xCB |0
-<U61F2> \xC3\x67 |0
-<U61F5> \xC3\x6A |0
-<U61F6> \xC3\x69 |0
-<U61F7> \xC3\x68 |0
-<U61F8> \xC4\x61 |0
-<U61F9> \xF4\x4A |0
-<U61FA> \xC4\x62 |0
-<U61FB> \xF2\x41 |0
-<U61FC> \xC4\xDF |0
-<U61FD> \xF5\xCC |0
-<U61FE> \xC4\xE0 |0
-<U61FF> \xC5\x74 |0
-<U6200> \xC5\xCA |0
-<U6201> \xF7\xD9 |0
-<U6203> \xF7\xDA |0
-<U6204> \xF7\xDB |0
-<U6207> \xF9\xBA |0
-<U6208> \xA4\xE0 |0
-<U6209> \xC9\x7C |0
-<U620A> \xA5\xB3 |0
-<U620C> \xA6\xA6 |0
-<U620D> \xA6\xA7 |0
-<U620E> \xA6\xA5 |0
-<U6210> \xA6\xA8 |0
-<U6211> \xA7\xDA |0
-<U6212> \xA7\xD9 |0
-<U6214> \xCC\xB1 |0
-<U6215> \xA9\xCF |0
-<U6216> \xA9\xCE |0
-<U6219> \xD1\xAF |0
-<U621A> \xB1\xAD |0
-<U621B> \xB1\xAE |0
-<U621F> \xB4\x75 |0
-<U6220> \xDD\x72 |0
-<U6221> \xB7\x60 |0
-<U6222> \xB7\x61 |0
-<U6223> \xDD\x74 |0
-<U6224> \xDD\x76 |0
-<U6225> \xDD\x75 |0
-<U6227> \xE1\xD7 |0
-<U6229> \xE1\xD6 |0
-<U622A> \xBA\x49 |0
-<U622B> \xE1\xD8 |0
-<U622D> \xE5\xAC |0
-<U622E> \xBC\xAE |0
-<U6230> \xBE\xD4 |0
-<U6232> \xC0\xB8 |0
-<U6233> \xC2\x57 |0
-<U6234> \xC0\xB9 |0
-<U6236> \xA4\xE1 |0
-<U623A> \xCA\xE6 |0
-<U623D> \xCC\xB2 |0
-<U623E> \xA9\xD1 |0
-<U623F> \xA9\xD0 |0
-<U6240> \xA9\xD2 |0
-<U6241> \xAB\xF3 |0
-<U6242> \xCE\xD2 |0
-<U6243> \xCE\xD3 |0
-<U6246> \xD1\xB0 |0
-<U6247> \xAE\xB0 |0
-<U6248> \xB1\xAF |0
-<U6249> \xB4\x76 |0
-<U624A> \xD9\x51 |0
-<U624B> \xA4\xE2 |0
-<U624D> \xA4\x7E |0
-<U624E> \xA4\xE3 |0
-<U6250> \xC9\x7D |0
-<U6251> \xA5\xB7 |0
-<U6252> \xA5\xB6 |0
-<U6253> \xA5\xB4 |0
-<U6254> \xA5\xB5 |0
-<U6258> \xA6\xAB |0
-<U6259> \xC9\xE9 |0
-<U625A> \xC9\xEB |0
-<U625B> \xA6\xAA |0
-<U625C> \xC9\xE3 |0
-<U625E> \xC9\xE4 |0
-<U6260> \xC9\xEA |0
-<U6261> \xC9\xE6 |0
-<U6262> \xC9\xE8 |0
-<U6263> \xA6\xA9 |0
-<U6264> \xC9\xE5 |0
-<U6265> \xC9\xEC |0
-<U6266> \xC9\xE7 |0
-<U626D> \xA7\xE1 |0
-<U626E> \xA7\xEA |0
-<U626F> \xA7\xE8 |0
-<U6270> \xCA\xF0 |0
-<U6271> \xCA\xED |0
-<U6272> \xCA\xF5 |0
-<U6273> \xA7\xE6 |0
-<U6274> \xCA\xF6 |0
-<U6276> \xA7\xDF |0
-<U6277> \xCA\xF3 |0
-<U6279> \xA7\xE5 |0
-<U627A> \xCA\xEF |0
-<U627B> \xCA\xEE |0
-<U627C> \xA7\xE3 |0
-<U627D> \xCA\xF4 |0
-<U627E> \xA7\xE4 |0
-<U627F> \xA9\xD3 |0
-<U6280> \xA7\xDE |0
-<U6281> \xCA\xF1 |0
-<U6283> \xCA\xE7 |0
-<U6284> \xA7\xDB |0
-<U6286> \xA7\xEE |0
-<U6287> \xCA\xEC |0
-<U6288> \xCA\xF2 |0
-<U6289> \xA7\xE0 |0
-<U628A> \xA7\xE2 |0
-<U628C> \xCA\xE8 |0
-<U628E> \xCA\xE9 |0
-<U628F> \xCA\xEA |0
-<U6291> \xA7\xED |0
-<U6292> \xA7\xE7 |0
-<U6293> \xA7\xEC |0
-<U6294> \xCA\xEB |0
-<U6295> \xA7\xEB |0
-<U6296> \xA7\xDD |0
-<U6297> \xA7\xDC |0
-<U6298> \xA7\xE9 |0
-<U62A8> \xA9\xE1 |0
-<U62A9> \xCC\xBE |0
-<U62AA> \xCC\xB7 |0
-<U62AB> \xA9\xDC |0
-<U62AC> \xA9\xEF |0
-<U62AD> \xCC\xB3 |0
-<U62AE> \xCC\xBA |0
-<U62AF> \xCC\xBC |0
-<U62B0> \xCC\xBF |0
-<U62B1> \xA9\xEA |0
-<U62B3> \xCC\xBB |0
-<U62B4> \xCC\xB4 |0
-<U62B5> \xA9\xE8 |0
-<U62B6> \xCC\xB8 |0
-<U62B8> \xCC\xC0 |0
-<U62B9> \xA9\xD9 |0
-<U62BB> \xCC\xBD |0
-<U62BC> \xA9\xE3 |0
-<U62BD> \xA9\xE2 |0
-<U62BE> \xCC\xB6 |0
-<U62BF> \xA9\xD7 |0
-<U62C2> \xA9\xD8 |0
-<U62C4> \xA9\xD6 |0
-<U62C6> \xA9\xEE |0
-<U62C7> \xA9\xE6 |0
-<U62C8> \xA9\xE0 |0
-<U62C9> \xA9\xD4 |0
-<U62CA> \xCC\xB9 |0
-<U62CB> \xA9\xDF |0
-<U62CC> \xA9\xD5 |0
-<U62CD> \xA9\xE7 |0
-<U62CE> \xA9\xF0 |0
-<U62CF> \xCE\xD4 |0
-<U62D0> \xA9\xE4 |0
-<U62D1> \xCC\xB5 |0
-<U62D2> \xA9\xDA |0
-<U62D3> \xA9\xDD |0
-<U62D4> \xA9\xDE |0
-<U62D6> \xA9\xEC |0
-<U62D7> \xA9\xED |0
-<U62D8> \xA9\xEB |0
-<U62D9> \xA9\xE5 |0
-<U62DA> \xA9\xE9 |0
-<U62DB> \xA9\xDB |0
-<U62DC> \xAB\xF4 |0
-<U62EB> \xCE\xDA |0
-<U62EC> \xAC\x41 |0
-<U62ED> \xAB\xF8 |0
-<U62EE> \xAB\xFA |0
-<U62EF> \xAC\x40 |0
-<U62F0> \xCE\xE6 |0
-<U62F1> \xAB\xFD |0
-<U62F2> \xD1\xB1 |0
-<U62F3> \xAE\xB1 |0
-<U62F4> \xAC\x43 |0
-<U62F5> \xCE\xD7 |0
-<U62F6> \xCE\xDF |0
-<U62F7> \xAB\xFE |0
-<U62F8> \xCE\xDE |0
-<U62F9> \xCE\xDB |0
-<U62FA> \xCE\xE3 |0
-<U62FB> \xCE\xE5 |0
-<U62FC> \xAB\xF7 |0
-<U62FD> \xAB\xFB |0
-<U62FE> \xAC\x42 |0
-<U62FF> \xAE\xB3 |0
-<U6300> \xCE\xE0 |0
-<U6301> \xAB\xF9 |0
-<U6302> \xAC\x45 |0
-<U6303> \xCE\xD9 |0
-<U6307> \xAB\xFC |0
-<U6308> \xAE\xB2 |0
-<U6309> \xAB\xF6 |0
-<U630B> \xCE\xD6 |0
-<U630C> \xCE\xDD |0
-<U630D> \xCE\xD5 |0
-<U630E> \xCE\xD8 |0
-<U630F> \xCE\xDC |0
-<U6310> \xD1\xB2 |0
-<U6311> \xAC\x44 |0
-<U6313> \xCE\xE1 |0
-<U6314> \xCE\xE2 |0
-<U6315> \xCE\xE4 |0
-<U6316> \xAB\xF5 |0
-<U6328> \xAE\xC1 |0
-<U6329> \xD1\xBE |0
-<U632A> \xAE\xBF |0
-<U632B> \xAE\xC0 |0
-<U632C> \xD1\xB4 |0
-<U632D> \xD1\xC4 |0
-<U632F> \xAE\xB6 |0
-<U6332> \xD5\x66 |0
-<U6333> \xD1\xC6 |0
-<U6334> \xD1\xC0 |0
-<U6336> \xD1\xB7 |0
-<U6338> \xD1\xC9 |0
-<U6339> \xD1\xBA |0
-<U633A> \xAE\xBC |0
-<U633B> \xD5\x7D |0
-<U633C> \xD1\xBD |0
-<U633D> \xAE\xBE |0
-<U633E> \xAE\xB5 |0
-<U6340> \xD1\xCB |0
-<U6341> \xD1\xBF |0
-<U6342> \xAE\xB8 |0
-<U6343> \xD1\xB8 |0
-<U6344> \xD1\xB5 |0
-<U6345> \xD1\xB6 |0
-<U6346> \xAE\xB9 |0
-<U6347> \xD1\xC5 |0
-<U6348> \xD1\xCC |0
-<U6349> \xAE\xBB |0
-<U634A> \xD1\xBC |0
-<U634B> \xD1\xBB |0
-<U634C> \xAE\xC3 |0
-<U634D> \xAE\xC2 |0
-<U634E> \xAE\xB4 |0
-<U634F> \xAE\xBA |0
-<U6350> \xAE\xBD |0
-<U6351> \xD1\xC8 |0
-<U6354> \xD1\xC2 |0
-<U6355> \xAE\xB7 |0
-<U6356> \xD1\xB3 |0
-<U6357> \xD1\xCA |0
-<U6358> \xD1\xC1 |0
-<U6359> \xD1\xC3 |0
-<U635A> \xD1\xC7 |0
-<U6365> \xD5\x67 |0
-<U6367> \xB1\xB7 |0
-<U6368> \xB1\xCB |0
-<U6369> \xB1\xCA |0
-<U636B> \xB1\xBF |0
-<U636D> \xD5\x79 |0
-<U636E> \xD5\x75 |0
-<U636F> \xD5\x72 |0
-<U6370> \xD5\xA6 |0
-<U6371> \xB1\xBA |0
-<U6372> \xB1\xB2 |0
-<U6375> \xD5\x77 |0
-<U6376> \xB4\xA8 |0
-<U6377> \xB1\xB6 |0
-<U6378> \xD5\xA1 |0
-<U637A> \xB1\xCC |0
-<U637B> \xB1\xC9 |0
-<U637C> \xD5\x7B |0
-<U637D> \xD5\x6A |0
-<U6380> \xB1\xC8 |0
-<U6381> \xD5\xA3 |0
-<U6382> \xD5\x69 |0
-<U6383> \xB1\xBD |0
-<U6384> \xB1\xC1 |0
-<U6385> \xD5\xA2 |0
-<U6387> \xD5\x73 |0
-<U6388> \xB1\xC2 |0
-<U6389> \xB1\xBC |0
-<U638A> \xD5\x68 |0
-<U638C> \xB4\x78 |0
-<U638D> \xD5\xA5 |0
-<U638E> \xD5\x71 |0
-<U638F> \xB1\xC7 |0
-<U6390> \xD5\x74 |0
-<U6391> \xD5\xA4 |0
-<U6392> \xB1\xC6 |0
-<U6394> \xD9\x52 |0
-<U6396> \xB1\xB3 |0
-<U6397> \xD5\x6F |0
-<U6398> \xB1\xB8 |0
-<U6399> \xB1\xC3 |0
-<U639B> \xB1\xBE |0
-<U639C> \xD5\x78 |0
-<U639D> \xD5\x6E |0
-<U639E> \xD5\x6C |0
-<U639F> \xD5\x7E |0
-<U63A0> \xB1\xB0 |0
-<U63A1> \xB1\xC4 |0
-<U63A2> \xB1\xB4 |0
-<U63A3> \xB4\x77 |0
-<U63A4> \xD5\x7C |0
-<U63A5> \xB1\xB5 |0
-<U63A7> \xB1\xB1 |0
-<U63A8> \xB1\xC0 |0
-<U63A9> \xB1\xBB |0
-<U63AA> \xB1\xB9 |0
-<U63AB> \xD5\x70 |0
-<U63AC> \xB1\xC5 |0
-<U63AD> \xD5\x6D |0
-<U63AE> \xD5\x7A |0
-<U63AF> \xD5\x76 |0
-<U63B0> \xD9\x54 |0
-<U63B1> \xD9\x53 |0
-<U63BD> \xD5\x6B |0
-<U63BE> \xD9\x64 |0
-<U63C0> \xB4\x7A |0
-<U63C2> \xD9\x6A |0
-<U63C3> \xD9\x59 |0
-<U63C4> \xD9\x67 |0
-<U63C5> \xDD\x77 |0
-<U63C6> \xB4\x7D |0
-<U63C7> \xD9\x6B |0
-<U63C8> \xD9\x6E |0
-<U63C9> \xB4\x7C |0
-<U63CA> \xD9\x5C |0
-<U63CB> \xD9\x6D |0
-<U63CC> \xD9\x6C |0
-<U63CD> \xB4\x7E |0
-<U63CE> \xD9\x55 |0
-<U63CF> \xB4\x79 |0
-<U63D0> \xB4\xA3 |0
-<U63D2> \xB4\xA1 |0
-<U63D3> \xD9\x69 |0
-<U63D5> \xD9\x5F |0
-<U63D6> \xB4\xA5 |0
-<U63D7> \xD9\x70 |0
-<U63D8> \xD9\x68 |0
-<U63D9> \xD9\x71 |0
-<U63DA> \xB4\xAD |0
-<U63DB> \xB4\xAB |0
-<U63DC> \xD9\x66 |0
-<U63DD> \xD9\x65 |0
-<U63DF> \xD9\x63 |0
-<U63E0> \xD9\x5D |0
-<U63E1> \xB4\xA4 |0
-<U63E3> \xB4\xA2 |0
-<U63E4> \xD1\xB9 |0
-<U63E5> \xD9\x56 |0
-<U63E7> \xDD\xB7 |0
-<U63E8> \xD9\x57 |0
-<U63E9> \xB4\x7B |0
-<U63EA> \xB4\xAA |0
-<U63EB> \xDD\x79 |0
-<U63ED> \xB4\xA6 |0
-<U63EE> \xB4\xA7 |0
-<U63EF> \xD9\x58 |0
-<U63F0> \xD9\x6F |0
-<U63F1> \xDD\x78 |0
-<U63F2> \xD9\x60 |0
-<U63F3> \xD9\x5B |0
-<U63F4> \xB4\xA9 |0
-<U63F5> \xD9\x61 |0
-<U63F6> \xD9\x5E |0
-<U63F9> \xB4\xAE |0
-<U6406> \xB7\x70 |0
-<U6409> \xDD\x7C |0
-<U640A> \xDD\xB1 |0
-<U640B> \xDD\xB6 |0
-<U640C> \xDD\xAA |0
-<U640D> \xB7\x6C |0
-<U640E> \xDD\xBB |0
-<U640F> \xB7\x69 |0
-<U6410> \xDD\x7A |0
-<U6412> \xDD\x7B |0
-<U6413> \xB7\x62 |0
-<U6414> \xB7\x6B |0
-<U6415> \xDD\xA4 |0
-<U6416> \xB7\x6E |0
-<U6417> \xB7\x6F |0
-<U6418> \xDD\xA5 |0
-<U641A> \xDD\xB2 |0
-<U641B> \xDD\xB8 |0
-<U641C> \xB7\x6A |0
-<U641E> \xB7\x64 |0
-<U641F> \xDD\xA3 |0
-<U6420> \xDD\x7D |0
-<U6421> \xDD\xBA |0
-<U6422> \xDD\xA8 |0
-<U6423> \xDD\xA9 |0
-<U6424> \xDD\x7E |0
-<U6425> \xDD\xB4 |0
-<U6426> \xDD\xAB |0
-<U6427> \xDD\xB5 |0
-<U6428> \xDD\xAD |0
-<U642A> \xB7\x65 |0
-<U642B> \xE1\xD9 |0
-<U642C> \xB7\x68 |0
-<U642D> \xB7\x66 |0
-<U642E> \xDD\xB9 |0
-<U642F> \xDD\xB0 |0
-<U6430> \xDD\xAC |0
-<U6433> \xDD\xA1 |0
-<U6434> \xBA\x53 |0
-<U6435> \xDD\xAF |0
-<U6436> \xB7\x6D |0
-<U6437> \xDD\xA7 |0
-<U6439> \xDD\xA6 |0
-<U643D> \xB7\x67 |0
-<U643E> \xB7\x63 |0
-<U643F> \xE1\xEE |0
-<U6440> \xDD\xB3 |0
-<U6441> \xDD\xAE |0
-<U6443> \xDD\xA2 |0
-<U644B> \xE1\xE9 |0
-<U644D> \xE1\xDA |0
-<U644E> \xE1\xE5 |0
-<U6450> \xE1\xEC |0
-<U6451> \xBA\x51 |0
-<U6452> \xB4\xAC |0
-<U6453> \xE1\xEA |0
-<U6454> \xBA\x4C |0
-<U6458> \xBA\x4B |0
-<U6459> \xE1\xF1 |0
-<U645B> \xE1\xDB |0
-<U645C> \xE1\xE8 |0
-<U645D> \xE1\xDC |0
-<U645E> \xE1\xE7 |0
-<U645F> \xBA\x4F |0
-<U6460> \xE1\xEB |0
-<U6461> \xD9\x62 |0
-<U6465> \xE1\xF2 |0
-<U6466> \xE1\xE3 |0
-<U6467> \xBA\x52 |0
-<U6468> \xE5\xBA |0
-<U6469> \xBC\xAF |0
-<U646B> \xE1\xF0 |0
-<U646C> \xE1\xEF |0
-<U646D> \xBA\x54 |0
-<U646E> \xE5\xAD |0
-<U646F> \xBC\xB0 |0
-<U6470> \xE5\xAE |0
-<U6472> \xE1\xDF |0
-<U6473> \xE1\xE0 |0
-<U6474> \xE1\xDD |0
-<U6475> \xE1\xE2 |0
-<U6476> \xE1\xDE |0
-<U6477> \xE1\xF3 |0
-<U6478> \xBA\x4E |0
-<U6479> \xBC\xB1 |0
-<U647A> \xBA\x50 |0
-<U647B> \xBA\x55 |0
-<U647D> \xE1\xE1 |0
-<U647F> \xE1\xED |0
-<U6482> \xE1\xE6 |0
-<U6485> \xE5\xB1 |0
-<U6487> \xBA\x4A |0
-<U6488> \xBC\xB4 |0
-<U6489> \xE9\xAA |0
-<U648A> \xE5\xB6 |0
-<U648B> \xE5\xB5 |0
-<U648C> \xE5\xB7 |0
-<U648F> \xE5\xB4 |0
-<U6490> \xBC\xB5 |0
-<U6492> \xBC\xBB |0
-<U6493> \xBC\xB8 |0
-<U6495> \xBC\xB9 |0
-<U6496> \xE5\xAF |0
-<U6497> \xE5\xB2 |0
-<U6498> \xE5\xBC |0
-<U6499> \xBC\xC1 |0
-<U649A> \xBC\xBF |0
-<U649C> \xE5\xB3 |0
-<U649D> \xD9\x5A |0
-<U649E> \xBC\xB2 |0
-<U649F> \xE5\xB9 |0
-<U64A0> \xE5\xB0 |0
-<U64A2> \xBC\xC2 |0
-<U64A3> \xE5\xB8 |0
-<U64A4> \xBA\x4D |0
-<U64A5> \xBC\xB7 |0
-<U64A6> \xE1\xE4 |0
-<U64A9> \xBC\xBA |0
-<U64AB> \xBC\xBE |0
-<U64AC> \xBC\xC0 |0
-<U64AD> \xBC\xBD |0
-<U64AE> \xBC\xBC |0
-<U64B0> \xBC\xB6 |0
-<U64B1> \xE5\xBB |0
-<U64B2> \xBC\xB3 |0
-<U64B3> \xBC\xC3 |0
-<U64BB> \xBE\xD8 |0
-<U64BC> \xBE\xD9 |0
-<U64BD> \xE9\xA9 |0
-<U64BE> \xBE\xE2 |0
-<U64BF> \xBE\xDF |0
-<U64C1> \xBE\xD6 |0
-<U64C2> \xBE\xDD |0
-<U64C3> \xE9\xAB |0
-<U64C4> \xBE\xDB |0
-<U64C5> \xBE\xD5 |0
-<U64C7> \xBE\xDC |0
-<U64C9> \xE9\xA8 |0
-<U64CA> \xC0\xBB |0
-<U64CB> \xBE\xD7 |0
-<U64CD> \xBE\xDE |0
-<U64CE> \xC0\xBA |0
-<U64CF> \xE9\xA7 |0
-<U64D0> \xE9\xA6 |0
-<U64D2> \xBE\xE0 |0
-<U64D4> \xBE\xE1 |0
-<U64D6> \xE9\xA5 |0
-<U64D7> \xE9\xA4 |0
-<U64D8> \xC0\xBC |0
-<U64D9> \xE9\xAE |0
-<U64DA> \xBE\xDA |0
-<U64DB> \xE9\xAC |0
-<U64E0> \xC0\xBD |0
-<U64E2> \xC0\xC2 |0
-<U64E3> \xEC\xEA |0
-<U64E4> \xEC\xEC |0
-<U64E6> \xC0\xBF |0
-<U64E8> \xEC\xED |0
-<U64E9> \xEC\xE9 |0
-<U64EB> \xEC\xEB |0
-<U64EC> \xC0\xC0 |0
-<U64ED> \xC0\xC3 |0
-<U64EF> \xEC\xE8 |0
-<U64F0> \xC0\xBE |0
-<U64F1> \xC0\xC1 |0
-<U64F2> \xC2\x59 |0
-<U64F3> \xE9\xAD |0
-<U64F4> \xC2\x58 |0
-<U64F7> \xC2\x5E |0
-<U64F8> \xEF\xD4 |0
-<U64FA> \xC2\x5C |0
-<U64FB> \xC2\x5D |0
-<U64FC> \xEF\xD7 |0
-<U64FD> \xEF\xD3 |0
-<U64FE> \xC2\x5A |0
-<U64FF> \xEF\xD1 |0
-<U6500> \xC3\x6B |0
-<U6501> \xEF\xD5 |0
-<U6503> \xEF\xD6 |0
-<U6504> \xEF\xD2 |0
-<U6506> \xC2\x5B |0
-<U6507> \xF2\x42 |0
-<U6509> \xF2\x45 |0
-<U650C> \xF2\x46 |0
-<U650D> \xF2\x44 |0
-<U650E> \xF2\x47 |0
-<U650F> \xC3\x6C |0
-<U6510> \xF2\x43 |0
-<U6513> \xF4\x4E |0
-<U6514> \xC4\x64 |0
-<U6515> \xF4\x4D |0
-<U6516> \xF4\x4C |0
-<U6517> \xF4\x4B |0
-<U6518> \xC4\x63 |0
-<U6519> \xC4\x65 |0
-<U651B> \xF5\xCD |0
-<U651C> \xC4\xE2 |0
-<U651D> \xC4\xE1 |0
-<U6520> \xF6\xE1 |0
-<U6521> \xF6\xE0 |0
-<U6522> \xF6\xE3 |0
-<U6523> \xC5\xCB |0
-<U6524> \xC5\x75 |0
-<U6525> \xF7\xDD |0
-<U6526> \xF6\xE2 |0
-<U6529> \xF7\xDC |0
-<U652A> \xC5\xCD |0
-<U652B> \xC5\xCC |0
-<U652C> \xC5\xF3 |0
-<U652D> \xF8\xA9 |0
-<U652E> \xF8\xEF |0
-<U652F> \xA4\xE4 |0
-<U6532> \xD9\x72 |0
-<U6533> \xE9\xAF |0
-<U6536> \xA6\xAC |0
-<U6537> \xCA\xF7 |0
-<U6538> \xA7\xF1 |0
-<U6539> \xA7\xEF |0
-<U653B> \xA7\xF0 |0
-<U653D> \xCC\xC1 |0
-<U653E> \xA9\xF1 |0
-<U653F> \xAC\x46 |0
-<U6541> \xCE\xE7 |0
-<U6543> \xCE\xE8 |0
-<U6545> \xAC\x47 |0
-<U6546> \xD1\xCE |0
-<U6548> \xAE\xC4 |0
-<U6549> \xAE\xC5 |0
-<U654A> \xD1\xCD |0
-<U654F> \xB1\xD3 |0
-<U6551> \xB1\xCF |0
-<U6553> \xD5\xA7 |0
-<U6554> \xB1\xD6 |0
-<U6555> \xB1\xD5 |0
-<U6556> \xB1\xCE |0
-<U6557> \xB1\xD1 |0
-<U6558> \xB1\xD4 |0
-<U6559> \xB1\xD0 |0
-<U655C> \xD9\x76 |0
-<U655D> \xB1\xCD |0
-<U655E> \xB4\xAF |0
-<U6562> \xB4\xB1 |0
-<U6563> \xB4\xB2 |0
-<U6564> \xD9\x75 |0
-<U6565> \xD9\x78 |0
-<U6566> \xB4\xB0 |0
-<U6567> \xD9\x73 |0
-<U6568> \xD9\x77 |0
-<U656A> \xD9\x74 |0
-<U656C> \xB7\x71 |0
-<U656F> \xDD\xBC |0
-<U6572> \xBA\x56 |0
-<U6573> \xE1\xF4 |0
-<U6574> \xBE\xE3 |0
-<U6575> \xBC\xC4 |0
-<U6576> \xE5\xBD |0
-<U6577> \xBC\xC5 |0
-<U6578> \xBC\xC6 |0
-<U6579> \xE5\xBF |0
-<U657A> \xE5\xBE |0
-<U657B> \xE5\xC0 |0
-<U657C> \xE9\xB1 |0
-<U657F> \xE9\xB0 |0
-<U6580> \xEC\xEF |0
-<U6581> \xEC\xEE |0
-<U6582> \xC0\xC4 |0
-<U6583> \xC0\xC5 |0
-<U6584> \xF2\x48 |0
-<U6587> \xA4\xE5 |0
-<U658C> \xD9\x79 |0
-<U6590> \xB4\xB4 |0
-<U6591> \xB4\xB3 |0
-<U6592> \xDD\xBD |0
-<U6594> \xEF\xD8 |0
-<U6595> \xC4\xE3 |0
-<U6596> \xF7\xDE |0
-<U6597> \xA4\xE6 |0
-<U6599> \xAE\xC6 |0
-<U659B> \xB1\xD8 |0
-<U659C> \xB1\xD7 |0
-<U659D> \xD9\x7A |0
-<U659E> \xD9\x7B |0
-<U659F> \xB7\x72 |0
-<U65A0> \xE1\xF5 |0
-<U65A1> \xBA\x57 |0
-<U65A2> \xE9\xB2 |0
-<U65A4> \xA4\xE7 |0
-<U65A5> \xA5\xB8 |0
-<U65A7> \xA9\xF2 |0
-<U65A8> \xCC\xC2 |0
-<U65AA> \xCE\xE9 |0
-<U65AB> \xAC\x48 |0
-<U65AC> \xB1\xD9 |0
-<U65AE> \xD9\x7C |0
-<U65AF> \xB4\xB5 |0
-<U65B0> \xB7\x73 |0
-<U65B2> \xE5\xC1 |0
-<U65B3> \xE5\xC2 |0
-<U65B6> \xEC\xF0 |0
-<U65B7> \xC2\x5F |0
-<U65B8> \xF8\xF0 |0
-<U65B9> \xA4\xE8 |0
-<U65BB> \xCC\xC3 |0
-<U65BC> \xA9\xF3 |0
-<U65BD> \xAC\x49 |0
-<U65BF> \xCE\xEA |0
-<U65C1> \xAE\xC7 |0
-<U65C2> \xD1\xD2 |0
-<U65C3> \xD1\xD0 |0
-<U65C4> \xD1\xD1 |0
-<U65C5> \xAE\xC8 |0
-<U65C6> \xD1\xCF |0
-<U65CB> \xB1\xDB |0
-<U65CC> \xB1\xDC |0
-<U65CD> \xD5\xA8 |0
-<U65CE> \xB1\xDD |0
-<U65CF> \xB1\xDA |0
-<U65D0> \xD9\x7D |0
-<U65D2> \xD9\x7E |0
-<U65D3> \xDD\xBE |0
-<U65D6> \xBA\x59 |0
-<U65D7> \xBA\x58 |0
-<U65DA> \xEC\xF1 |0
-<U65DB> \xEF\xD9 |0
-<U65DD> \xF2\x4A |0
-<U65DE> \xF2\x49 |0
-<U65DF> \xF4\x4F |0
-<U65E1> \xC9\x5E |0
-<U65E2> \xAC\x4A |0
-<U65E5> \xA4\xE9 |0
-<U65E6> \xA5\xB9 |0
-<U65E8> \xA6\xAE |0
-<U65E9> \xA6\xAD |0
-<U65EC> \xA6\xAF |0
-<U65ED> \xA6\xB0 |0
-<U65EE> \xC9\xEE |0
-<U65EF> \xC9\xED |0
-<U65F0> \xCA\xF8 |0
-<U65F1> \xA7\xF2 |0
-<U65F2> \xCA\xFB |0
-<U65F3> \xCA\xFA |0
-<U65F4> \xCA\xF9 |0
-<U65F5> \xCA\xFC |0
-<U65FA> \xA9\xF4 |0
-<U65FB> \xCC\xC9 |0
-<U65FC> \xCC\xC5 |0
-<U65FD> \xCC\xCE |0
-<U6600> \xA9\xFB |0
-<U6602> \xA9\xF9 |0
-<U6603> \xCC\xCA |0
-<U6604> \xCC\xC6 |0
-<U6605> \xCC\xCD |0
-<U6606> \xA9\xF8 |0
-<U6607> \xAA\x40 |0
-<U6608> \xCC\xC8 |0
-<U6609> \xCC\xC4 |0
-<U660A> \xA9\xFE |0
-<U660B> \xCC\xCB |0
-<U660C> \xA9\xF7 |0
-<U660D> \xCC\xCC |0
-<U660E> \xA9\xFA |0
-<U660F> \xA9\xFC |0
-<U6610> \xCC\xD0 |0
-<U6611> \xCC\xCF |0
-<U6612> \xCC\xC7 |0
-<U6613> \xA9\xF6 |0
-<U6614> \xA9\xF5 |0
-<U6615> \xA9\xFD |0
-<U661C> \xCE\xEF |0
-<U661D> \xCE\xF5 |0
-<U661F> \xAC\x50 |0
-<U6620> \xAC\x4D |0
-<U6621> \xCE\xEC |0
-<U6622> \xCE\xF1 |0
-<U6624> \xAC\x53 |0
-<U6625> \xAC\x4B |0
-<U6626> \xCE\xF0 |0
-<U6627> \xAC\x4E |0
-<U6628> \xAC\x51 |0
-<U662B> \xCE\xF3 |0
-<U662D> \xAC\x4C |0
-<U662E> \xCE\xF8 |0
-<U662F> \xAC\x4F |0
-<U6631> \xAC\x52 |0
-<U6632> \xCE\xED |0
-<U6633> \xCE\xF2 |0
-<U6634> \xCE\xF6 |0
-<U6635> \xCE\xEE |0
-<U6636> \xCE\xEB |0
-<U6639> \xCE\xF7 |0
-<U663A> \xCE\xF4 |0
-<U6641> \xAE\xD0 |0
-<U6642> \xAE\xC9 |0
-<U6643> \xAE\xCC |0
-<U6645> \xAE\xCF |0
-<U6647> \xD1\xD5 |0
-<U6649> \xAE\xCA |0
-<U664A> \xD1\xD3 |0
-<U664C> \xAE\xCE |0
-<U664F> \xAE\xCB |0
-<U6651> \xD1\xD6 |0
-<U6652> \xAE\xCD |0
-<U6659> \xD5\xAC |0
-<U665A> \xB1\xDF |0
-<U665B> \xD5\xAB |0
-<U665C> \xD5\xAD |0
-<U665D> \xB1\xDE |0
-<U665E> \xB1\xE3 |0
-<U665F> \xD1\xD4 |0
-<U6661> \xD5\xAA |0
-<U6662> \xD5\xAE |0
-<U6664> \xB1\xE0 |0
-<U6665> \xD5\xA9 |0
-<U6666> \xB1\xE2 |0
-<U6668> \xB1\xE1 |0
-<U666A> \xD9\xA7 |0
-<U666C> \xD9\xA2 |0
-<U666E> \xB4\xB6 |0
-<U666F> \xB4\xBA |0
-<U6670> \xB4\xB7 |0
-<U6671> \xD9\xA5 |0
-<U6672> \xD9\xA8 |0
-<U6674> \xB4\xB8 |0
-<U6676> \xB4\xB9 |0
-<U6677> \xB4\xBE |0
-<U6678> \xDD\xC7 |0
-<U6679> \xD9\xA6 |0
-<U667A> \xB4\xBC |0
-<U667B> \xD9\xA3 |0
-<U667C> \xD9\xA1 |0
-<U667E> \xB4\xBD |0
-<U6680> \xD9\xA4 |0
-<U6684> \xB7\x79 |0
-<U6686> \xDD\xBF |0
-<U6687> \xB7\x76 |0
-<U6688> \xB7\x77 |0
-<U6689> \xB7\x75 |0
-<U668A> \xDD\xC4 |0
-<U668B> \xDD\xC3 |0
-<U668C> \xDD\xC0 |0
-<U668D> \xB7\x7B |0
-<U6690> \xDD\xC2 |0
-<U6691> \xB4\xBB |0
-<U6694> \xDD\xC6 |0
-<U6695> \xDD\xC1 |0
-<U6696> \xB7\x78 |0
-<U6697> \xB7\x74 |0
-<U6698> \xB7\x7A |0
-<U6699> \xDD\xC5 |0
-<U669D> \xBA\x5C |0
-<U669F> \xE1\xF8 |0
-<U66A0> \xE1\xF7 |0
-<U66A1> \xE1\xF6 |0
-<U66A2> \xBA\x5A |0
-<U66A8> \xBA\x5B |0
-<U66A9> \xE5\xC5 |0
-<U66AA> \xE5\xC8 |0
-<U66AB> \xBC\xC8 |0
-<U66AE> \xBC\xC7 |0
-<U66AF> \xE5\xC9 |0
-<U66B0> \xE5\xC4 |0
-<U66B1> \xBC\xCA |0
-<U66B2> \xE5\xC6 |0
-<U66B4> \xBC\xC9 |0
-<U66B5> \xE5\xC3 |0
-<U66B7> \xE5\xC7 |0
-<U66B8> \xBE\xE9 |0
-<U66B9> \xBE\xE6 |0
-<U66BA> \xE9\xBB |0
-<U66BB> \xE9\xBA |0
-<U66BD> \xE9\xB9 |0
-<U66BE> \xE9\xB4 |0
-<U66C0> \xE9\xB5 |0
-<U66C4> \xBE\xE7 |0
-<U66C6> \xBE\xE4 |0
-<U66C7> \xBE\xE8 |0
-<U66C8> \xE9\xB3 |0
-<U66C9> \xBE\xE5 |0
-<U66CA> \xE9\xB6 |0
-<U66CB> \xE9\xB7 |0
-<U66CC> \xE9\xBC |0
-<U66CF> \xE9\xB8 |0
-<U66D2> \xEC\xF2 |0
-<U66D6> \xC0\xC7 |0
-<U66D8> \xEF\xDC |0
-<U66D9> \xC0\xC6 |0
-<U66DA> \xEF\xDA |0
-<U66DB> \xEF\xDB |0
-<U66DC> \xC2\x60 |0
-<U66DD> \xC3\x6E |0
-<U66DE> \xF2\x4B |0
-<U66E0> \xC3\x6D |0
-<U66E3> \xF4\x51 |0
-<U66E4> \xF4\x52 |0
-<U66E6> \xC4\x66 |0
-<U66E8> \xF4\x50 |0
-<U66E9> \xC4\xE4 |0
-<U66EB> \xF7\xDF |0
-<U66EC> \xC5\xCE |0
-<U66ED> \xF8\xAA |0
-<U66EE> \xF8\xAB |0
-<U66F0> \xA4\xEA |0
-<U66F2> \xA6\xB1 |0
-<U66F3> \xA6\xB2 |0
-<U66F4> \xA7\xF3 |0
-<U66F6> \xCC\xD1 |0
-<U66F7> \xAC\x54 |0
-<U66F8> \xAE\xD1 |0
-<U66F9> \xB1\xE4 |0
-<U66FC> \xB0\xD2 |0
-<U66FE> \xB4\xBF |0
-<U66FF> \xB4\xC0 |0
-<U6700> \xB3\xCC |0
-<U6701> \xD9\xA9 |0
-<U6703> \xB7\x7C |0
-<U6704> \xE1\xFA |0
-<U6705> \xE1\xF9 |0
-<U6708> \xA4\xEB |0
-<U6709> \xA6\xB3 |0
-<U670A> \xCC\xD2 |0
-<U670B> \xAA\x42 |0
-<U670D> \xAA\x41 |0
-<U670F> \xCE\xF9 |0
-<U6710> \xCE\xFA |0
-<U6712> \xD1\xD7 |0
-<U6713> \xD1\xD8 |0
-<U6714> \xAE\xD2 |0
-<U6715> \xAE\xD3 |0
-<U6717> \xAE\xD4 |0
-<U6718> \xD5\xAF |0
-<U671B> \xB1\xE6 |0
-<U671D> \xB4\xC2 |0
-<U671F> \xB4\xC1 |0
-<U6720> \xDD\xC8 |0
-<U6721> \xDF\x7A |0
-<U6722> \xE1\xFB |0
-<U6723> \xE9\xBD |0
-<U6726> \xC2\x61 |0
-<U6727> \xC4\x67 |0
-<U6728> \xA4\xEC |0
-<U672A> \xA5\xBC |0
-<U672B> \xA5\xBD |0
-<U672C> \xA5\xBB |0
-<U672D> \xA5\xBE |0
-<U672E> \xA5\xBA |0
-<U6731> \xA6\xB6 |0
-<U6733> \xC9\xF6 |0
-<U6734> \xA6\xB5 |0
-<U6735> \xA6\xB7 |0
-<U6738> \xC9\xF1 |0
-<U6739> \xC9\xF0 |0
-<U673A> \xC9\xF3 |0
-<U673B> \xC9\xF2 |0
-<U673C> \xC9\xF5 |0
-<U673D> \xA6\xB4 |0
-<U673E> \xC9\xEF |0
-<U673F> \xC9\xF4 |0
-<U6745> \xCA\xFD |0
-<U6746> \xA7\xFD |0
-<U6747> \xCA\xFE |0
-<U6748> \xCB\x43 |0
-<U6749> \xA7\xFC |0
-<U674B> \xCB\x47 |0
-<U674C> \xCB\x42 |0
-<U674D> \xCB\x45 |0
-<U674E> \xA7\xF5 |0
-<U674F> \xA7\xF6 |0
-<U6750> \xA7\xF7 |0
-<U6751> \xA7\xF8 |0
-<U6753> \xA8\x40 |0
-<U6755> \xCB\x41 |0
-<U6756> \xA7\xFA |0
-<U6757> \xA8\x41 |0
-<U6759> \xCB\x40 |0
-<U675A> \xCB\x46 |0
-<U675C> \xA7\xF9 |0
-<U675D> \xCB\x44 |0
-<U675E> \xA7\xFB |0
-<U675F> \xA7\xF4 |0
-<U6760> \xA7\xFE |0
-<U676A> \xAA\x57 |0
-<U676C> \xCC\xD4 |0
-<U676D> \xAA\x43 |0
-<U676F> \xAA\x4D |0
-<U6770> \xAA\x4E |0
-<U6771> \xAA\x46 |0
-<U6772> \xAA\x58 |0
-<U6773> \xAA\x48 |0
-<U6774> \xCC\xDC |0
-<U6775> \xAA\x53 |0
-<U6776> \xCC\xD7 |0
-<U6777> \xAA\x49 |0
-<U6778> \xCC\xE6 |0
-<U6779> \xCC\xE7 |0
-<U677A> \xCC\xDF |0
-<U677B> \xCC\xD8 |0
-<U677C> \xAA\x56 |0
-<U677D> \xCC\xE4 |0
-<U677E> \xAA\x51 |0
-<U677F> \xAA\x4F |0
-<U6781> \xCC\xE5 |0
-<U6783> \xCC\xE3 |0
-<U6784> \xCC\xDB |0
-<U6785> \xCC\xD3 |0
-<U6786> \xCC\xDA |0
-<U6787> \xAA\x4A |0
-<U6789> \xAA\x50 |0
-<U678B> \xAA\x44 |0
-<U678C> \xCC\xDE |0
-<U678D> \xCC\xDD |0
-<U678E> \xCC\xD5 |0
-<U6790> \xAA\x52 |0
-<U6791> \xCC\xE1 |0
-<U6792> \xCC\xD6 |0
-<U6793> \xAA\x55 |0
-<U6794> \xCC\xE8 |0
-<U6795> \xAA\x45 |0
-<U6797> \xAA\x4C |0
-<U6798> \xCC\xD9 |0
-<U6799> \xCC\xE2 |0
-<U679A> \xAA\x54 |0
-<U679C> \xAA\x47 |0
-<U679D> \xAA\x4B |0
-<U679F> \xCC\xE0 |0
-<U67AE> \xCF\x5B |0
-<U67AF> \xAC\x5C |0
-<U67B0> \xAC\x69 |0
-<U67B2> \xCF\x56 |0
-<U67B3> \xCF\x4C |0
-<U67B4> \xAC\x62 |0
-<U67B5> \xCF\x4A |0
-<U67B6> \xAC\x5B |0
-<U67B7> \xCF\x45 |0
-<U67B8> \xAC\x65 |0
-<U67B9> \xCF\x52 |0
-<U67BA> \xCE\xFE |0
-<U67BB> \xCF\x41 |0
-<U67C0> \xCF\x44 |0
-<U67C1> \xCE\xFB |0
-<U67C2> \xCF\x51 |0
-<U67C3> \xCF\x61 |0
-<U67C4> \xAC\x60 |0
-<U67C5> \xCF\x46 |0
-<U67C6> \xCF\x58 |0
-<U67C8> \xCE\xFD |0
-<U67C9> \xCF\x5F |0
-<U67CA> \xCF\x60 |0
-<U67CB> \xCF\x63 |0
-<U67CC> \xCF\x5A |0
-<U67CD> \xCF\x4B |0
-<U67CE> \xCF\x53 |0
-<U67CF> \xAC\x66 |0
-<U67D0> \xAC\x59 |0
-<U67D1> \xAC\x61 |0
-<U67D2> \xAC\x6D |0
-<U67D3> \xAC\x56 |0
-<U67D4> \xAC\x58 |0
-<U67D8> \xCF\x43 |0
-<U67D9> \xAC\x6A |0
-<U67DA> \xAC\x63 |0
-<U67DB> \xCF\x5D |0
-<U67DC> \xCF\x40 |0
-<U67DD> \xAC\x6C |0
-<U67DE> \xAC\x67 |0
-<U67DF> \xCF\x49 |0
-<U67E2> \xAC\x6B |0
-<U67E3> \xCF\x50 |0
-<U67E4> \xCF\x48 |0
-<U67E5> \xAC\x64 |0
-<U67E6> \xCF\x5C |0
-<U67E7> \xCF\x54 |0
-<U67E9> \xAC\x5E |0
-<U67EA> \xCF\x62 |0
-<U67EB> \xCF\x47 |0
-<U67EC> \xAC\x5A |0
-<U67ED> \xCF\x59 |0
-<U67EE> \xCF\x4F |0
-<U67EF> \xAC\x5F |0
-<U67F0> \xCF\x55 |0
-<U67F1> \xAC\x57 |0
-<U67F2> \xCE\xFC |0
-<U67F3> \xAC\x68 |0
-<U67F4> \xAE\xE3 |0
-<U67F5> \xAC\x5D |0
-<U67F6> \xCF\x4E |0
-<U67F7> \xCF\x4D |0
-<U67F8> \xCF\x42 |0
-<U67FA> \xCF\x5E |0
-<U67FC> \xCF\x57 |0
-<U67FF> \xAC\x55 |0
-<U6812> \xD1\xEC |0
-<U6813> \xAE\xEA |0
-<U6814> \xD1\xED |0
-<U6816> \xD1\xE1 |0
-<U6817> \xAE\xDF |0
-<U6818> \xAE\xEB |0
-<U681A> \xD1\xDA |0
-<U681C> \xD1\xE3 |0
-<U681D> \xD1\xEB |0
-<U681F> \xD1\xD9 |0
-<U6820> \xD1\xF4 |0
-<U6821> \xAE\xD5 |0
-<U6825> \xD1\xF3 |0
-<U6826> \xD1\xEE |0
-<U6828> \xD1\xEF |0
-<U6829> \xAE\xDD |0
-<U682A> \xAE\xE8 |0
-<U682B> \xD1\xE5 |0
-<U682D> \xD1\xE6 |0
-<U682E> \xD1\xF0 |0
-<U682F> \xD1\xE7 |0
-<U6831> \xD1\xE2 |0
-<U6832> \xD1\xDC |0
-<U6833> \xD1\xDD |0
-<U6834> \xD1\xEA |0
-<U6835> \xD1\xE4 |0
-<U6838> \xAE\xD6 |0
-<U6839> \xAE\xDA |0
-<U683A> \xD1\xF2 |0
-<U683B> \xD1\xDE |0
-<U683C> \xAE\xE6 |0
-<U683D> \xAE\xE2 |0
-<U6840> \xAE\xE5 |0
-<U6841> \xAE\xEC |0
-<U6842> \xAE\xDB |0
-<U6843> \xAE\xE7 |0
-<U6844> \xD1\xE9 |0
-<U6845> \xAE\xE9 |0
-<U6846> \xAE\xD8 |0
-<U6848> \xAE\xD7 |0
-<U6849> \xD1\xDB |0
-<U684B> \xD1\xDF |0
-<U684C> \xAE\xE0 |0
-<U684D> \xD1\xF1 |0
-<U684E> \xD1\xE8 |0
-<U684F> \xD1\xE0 |0
-<U6850> \xAE\xE4 |0
-<U6851> \xAE\xE1 |0
-<U6853> \xAE\xD9 |0
-<U6854> \xAE\xDC |0
-<U686B> \xD5\xC4 |0
-<U686D> \xD5\xB4 |0
-<U686E> \xD5\xB5 |0
-<U686F> \xD5\xB9 |0
-<U6871> \xD5\xC8 |0
-<U6872> \xD5\xC5 |0
-<U6874> \xD5\xBE |0
-<U6875> \xD5\xBD |0
-<U6876> \xB1\xED |0
-<U6877> \xD5\xC1 |0
-<U6878> \xD5\xD0 |0
-<U6879> \xD5\xB0 |0
-<U687B> \xD5\xD1 |0
-<U687C> \xD5\xC3 |0
-<U687D> \xD5\xD5 |0
-<U687E> \xD5\xC9 |0
-<U687F> \xB1\xEC |0
-<U6880> \xD5\xC7 |0
-<U6881> \xB1\xE7 |0
-<U6882> \xB1\xFC |0
-<U6883> \xB1\xF2 |0
-<U6885> \xB1\xF6 |0
-<U6886> \xB1\xF5 |0
-<U6887> \xD5\xB1 |0
-<U6889> \xD5\xCE |0
-<U688A> \xD5\xD4 |0
-<U688B> \xD5\xCC |0
-<U688C> \xD5\xD3 |0
-<U688F> \xD5\xC0 |0
-<U6890> \xD5\xB2 |0
-<U6891> \xD5\xD2 |0
-<U6892> \xD5\xC2 |0
-<U6893> \xB1\xEA |0
-<U6894> \xB1\xF7 |0
-<U6896> \xD5\xCB |0
-<U6897> \xB1\xF0 |0
-<U689B> \xD5\xCA |0
-<U689C> \xD5\xB3 |0
-<U689D> \xB1\xF8 |0
-<U689F> \xB1\xFA |0
-<U68A0> \xD5\xCD |0
-<U68A1> \xB1\xFB |0
-<U68A2> \xB1\xE9 |0
-<U68A3> \xD5\xBA |0
-<U68A4> \xD5\xCF |0
-<U68A7> \xB1\xEF |0
-<U68A8> \xB1\xF9 |0
-<U68A9> \xD5\xBC |0
-<U68AA> \xD5\xC6 |0
-<U68AB> \xD5\xB7 |0
-<U68AC> \xD5\xBB |0
-<U68AD> \xB1\xF4 |0
-<U68AE> \xD5\xB6 |0
-<U68AF> \xB1\xE8 |0
-<U68B0> \xB1\xF1 |0
-<U68B1> \xB1\xEE |0
-<U68B2> \xD5\xBF |0
-<U68B3> \xAE\xDE |0
-<U68B4> \xD9\xC0 |0
-<U68B5> \xB1\xEB |0
-<U68C4> \xB1\xF3 |0
-<U68C6> \xD9\xC3 |0
-<U68C7> \xD9\xD9 |0
-<U68C8> \xD9\xCE |0
-<U68C9> \xB4\xD6 |0
-<U68CB> \xB4\xD1 |0
-<U68CC> \xD9\xBD |0
-<U68CD> \xB4\xD2 |0
-<U68CE> \xD9\xCD |0
-<U68D0> \xD9\xC6 |0
-<U68D1> \xD9\xD3 |0
-<U68D2> \xB4\xCE |0
-<U68D3> \xD9\xAB |0
-<U68D4> \xD9\xD5 |0
-<U68D5> \xB4\xC4 |0
-<U68D6> \xD9\xB3 |0
-<U68D7> \xB4\xC7 |0
-<U68D8> \xB4\xC6 |0
-<U68DA> \xB4\xD7 |0
-<U68DC> \xD9\xAD |0
-<U68DD> \xD9\xCF |0
-<U68DE> \xD9\xD0 |0
-<U68DF> \xB4\xC9 |0
-<U68E0> \xB4\xC5 |0
-<U68E1> \xD9\xBB |0
-<U68E3> \xB4\xD0 |0
-<U68E4> \xD9\xB6 |0
-<U68E6> \xD9\xD1 |0
-<U68E7> \xB4\xCC |0
-<U68E8> \xD9\xC9 |0
-<U68E9> \xD9\xD6 |0
-<U68EA> \xD9\xB0 |0
-<U68EB> \xD9\xB5 |0
-<U68EC> \xD9\xAF |0
-<U68EE> \xB4\xCB |0
-<U68EF> \xD9\xC2 |0
-<U68F0> \xDD\xDE |0
-<U68F1> \xD9\xB1 |0
-<U68F2> \xB4\xCF |0
-<U68F3> \xD9\xBA |0
-<U68F4> \xD9\xD2 |0
-<U68F5> \xB4\xCA |0
-<U68F6> \xD9\xB7 |0
-<U68F7> \xD9\xB4 |0
-<U68F8> \xD9\xC5 |0
-<U68F9> \xB4\xCD |0
-<U68FA> \xB4\xC3 |0
-<U68FB> \xB4\xD9 |0
-<U68FC> \xD9\xC8 |0
-<U68FD> \xD9\xC7 |0
-<U6904> \xD9\xAC |0
-<U6905> \xB4\xC8 |0
-<U6906> \xD9\xD4 |0
-<U6907> \xD9\xBC |0
-<U6908> \xD9\xBE |0
-<U690A> \xD9\xCB |0
-<U690B> \xD9\xCA |0
-<U690C> \xD9\xAA |0
-<U690D> \xB4\xD3 |0
-<U690E> \xB4\xD5 |0
-<U690F> \xD9\xB2 |0
-<U6910> \xD9\xB9 |0
-<U6911> \xD9\xC1 |0
-<U6912> \xB4\xD4 |0
-<U6913> \xD9\xB8 |0
-<U6914> \xD9\xC4 |0
-<U6915> \xD9\xD7 |0
-<U6917> \xD9\xCC |0
-<U6925> \xD9\xD8 |0
-<U692A> \xD9\xAE |0
-<U692F> \xDD\xF2 |0
-<U6930> \xB7\xA6 |0
-<U6932> \xDD\xF0 |0
-<U6933> \xDD\xDB |0
-<U6934> \xDD\xE0 |0
-<U6935> \xDD\xD9 |0
-<U6937> \xDD\xEC |0
-<U6938> \xDD\xCB |0
-<U6939> \xDD\xD2 |0
-<U693B> \xDD\xEA |0
-<U693C> \xDD\xF4 |0
-<U693D> \xDD\xDC |0
-<U693F> \xDD\xCF |0
-<U6940> \xDD\xE2 |0
-<U6941> \xDD\xE7 |0
-<U6942> \xDD\xD3 |0
-<U6944> \xDD\xE4 |0
-<U6945> \xDD\xD0 |0
-<U6948> \xDD\xD7 |0
-<U6949> \xDD\xD8 |0
-<U694A> \xB7\xA8 |0
-<U694B> \xDD\xEB |0
-<U694C> \xDD\xE9 |0
-<U694E> \xDD\xCC |0
-<U694F> \xDD\xEE |0
-<U6951> \xDD\xEF |0
-<U6952> \xDD\xF1 |0
-<U6953> \xB7\xAC |0
-<U6954> \xB7\xA4 |0
-<U6956> \xD5\xB8 |0
-<U6957> \xDD\xD4 |0
-<U6958> \xDD\xE6 |0
-<U6959> \xDD\xD5 |0
-<U695A> \xB7\xA1 |0
-<U695B> \xB7\xB1 |0
-<U695C> \xDD\xED |0
-<U695D> \xB7\xAF |0
-<U695E> \xB7\xAB |0
-<U695F> \xDD\xCA |0
-<U6960> \xB7\xA3 |0
-<U6962> \xDD\xCD |0
-<U6963> \xB7\xB0 |0
-<U6965> \xDD\xDD |0
-<U6966> \xDD\xC9 |0
-<U6968> \xB7\xA9 |0
-<U6969> \xDD\xE1 |0
-<U696A> \xDD\xD1 |0
-<U696B> \xB7\xAA |0
-<U696C> \xDD\xDA |0
-<U696D> \xB7\x7E |0
-<U696E> \xB4\xD8 |0
-<U696F> \xDD\xE3 |0
-<U6970> \xD9\xBF |0
-<U6971> \xDD\xCE |0
-<U6974> \xDD\xE8 |0
-<U6975> \xB7\xA5 |0
-<U6976> \xDD\xE5 |0
-<U6977> \xB7\xA2 |0
-<U6978> \xDD\xDF |0
-<U6979> \xB7\xAD |0
-<U697A> \xDD\xD6 |0
-<U697B> \xDD\xF3 |0
-<U6982> \xB7\xA7 |0
-<U6983> \xDE\xC6 |0
-<U6986> \xB7\xAE |0
-<U698D> \xE2\x4A |0
-<U698E> \xE2\x48 |0
-<U6990> \xE2\x5E |0
-<U6991> \xE2\x46 |0
-<U6993> \xE2\x58 |0
-<U6994> \xB7\x7D |0
-<U6995> \xBA\x5F |0
-<U6996> \xE2\x42 |0
-<U6997> \xE2\x5D |0
-<U6999> \xE2\x47 |0
-<U699A> \xE2\x55 |0
-<U699B> \xBA\x64 |0
-<U699C> \xBA\x5D |0
-<U699E> \xE2\x5B |0
-<U69A0> \xE2\x40 |0
-<U69A1> \xE2\x5A |0
-<U69A3> \xBA\x6F |0
-<U69A4> \xE2\x51 |0
-<U69A5> \xE2\x61 |0
-<U69A6> \xBA\x6D |0
-<U69A7> \xE2\x49 |0
-<U69A8> \xBA\x5E |0
-<U69A9> \xE2\x4B |0
-<U69AA> \xE2\x59 |0
-<U69AB> \xBA\x67 |0
-<U69AC> \xE2\x44 |0
-<U69AD> \xBA\x6B |0
-<U69AE> \xBA\x61 |0
-<U69AF> \xE2\x4D |0
-<U69B0> \xE2\x43 |0
-<U69B1> \xE1\xFC |0
-<U69B3> \xE2\x57 |0
-<U69B4> \xBA\x68 |0
-<U69B5> \xE2\x60 |0
-<U69B6> \xE1\xFD |0
-<U69B7> \xBA\x65 |0
-<U69B9> \xE2\x53 |0
-<U69BB> \xBA\x66 |0
-<U69BC> \xE2\x45 |0
-<U69BD> \xE2\x50 |0
-<U69BE> \xE2\x4C |0
-<U69BF> \xE2\x4E |0
-<U69C1> \xBA\x60 |0
-<U69C2> \xE2\x5F |0
-<U69C3> \xBA\x6E |0
-<U69C4> \xE2\x4F |0
-<U69C6> \xE2\x62 |0
-<U69C9> \xE1\xFE |0
-<U69CA> \xE2\x54 |0
-<U69CB> \xBA\x63 |0
-<U69CC> \xBA\x6C |0
-<U69CD> \xBA\x6A |0
-<U69CE> \xE2\x41 |0
-<U69CF> \xE2\x56 |0
-<U69D0> \xBA\x69 |0
-<U69D3> \xBA\x62 |0
-<U69D4> \xE2\x52 |0
-<U69D9> \xE2\x5C |0
-<U69E2> \xE5\xD5 |0
-<U69E4> \xE5\xD1 |0
-<U69E5> \xE5\xCD |0
-<U69E6> \xE5\xE1 |0
-<U69E7> \xE5\xDE |0
-<U69E8> \xBC\xCD |0
-<U69EB> \xE5\xE5 |0
-<U69EC> \xE5\xD4 |0
-<U69ED> \xBC\xD8 |0
-<U69EE> \xE5\xDB |0
-<U69F1> \xE5\xD0 |0
-<U69F2> \xE5\xDA |0
-<U69F3> \xBC\xD5 |0
-<U69F4> \xE5\xEE |0
-<U69F6> \xE5\xEB |0
-<U69F7> \xE5\xDD |0
-<U69F8> \xE5\xCE |0
-<U69FB> \xE5\xE2 |0
-<U69FC> \xE5\xE4 |0
-<U69FD> \xBC\xD1 |0
-<U69FE> \xE5\xD8 |0
-<U69FF> \xE5\xD3 |0
-<U6A00> \xE5\xCA |0
-<U6A01> \xBC\xCE |0
-<U6A02> \xBC\xD6 |0
-<U6A04> \xE5\xE7 |0
-<U6A05> \xBC\xD7 |0
-<U6A06> \xE5\xCB |0
-<U6A07> \xE5\xED |0
-<U6A08> \xE5\xE0 |0
-<U6A09> \xE5\xE6 |0
-<U6A0A> \xBC\xD4 |0
-<U6A0D> \xE5\xE3 |0
-<U6A0F> \xE5\xEA |0
-<U6A11> \xBC\xD9 |0
-<U6A13> \xBC\xD3 |0
-<U6A14> \xE5\xDC |0
-<U6A15> \xE5\xCF |0
-<U6A16> \xE5\xEF |0
-<U6A17> \xE5\xCC |0
-<U6A18> \xE5\xE8 |0
-<U6A19> \xBC\xD0 |0
-<U6A1B> \xE5\xD6 |0
-<U6A1D> \xE5\xD7 |0
-<U6A1E> \xBC\xCF |0
-<U6A1F> \xBC\xCC |0
-<U6A20> \xE5\xD2 |0
-<U6A21> \xBC\xD2 |0
-<U6A23> \xBC\xCB |0
-<U6A25> \xE5\xE9 |0
-<U6A26> \xE5\xEC |0
-<U6A27> \xE5\xD9 |0
-<U6A28> \xE9\xCA |0
-<U6A32> \xE9\xC2 |0
-<U6A34> \xE9\xBE |0
-<U6A35> \xBE\xF6 |0
-<U6A38> \xBE\xEB |0
-<U6A39> \xBE\xF0 |0
-<U6A3A> \xBE\xEC |0
-<U6A3B> \xE9\xCC |0
-<U6A3C> \xE9\xD7 |0
-<U6A3D> \xBE\xEA |0
-<U6A3E> \xE9\xC4 |0
-<U6A3F> \xE9\xCD |0
-<U6A40> \xE5\xDF |0
-<U6A41> \xE9\xCE |0
-<U6A44> \xBE\xF1 |0
-<U6A46> \xE9\xDD |0
-<U6A47> \xBE\xF5 |0
-<U6A48> \xBE\xF8 |0
-<U6A49> \xE9\xC0 |0
-<U6A4B> \xBE\xF4 |0
-<U6A4D> \xE9\xDB |0
-<U6A4E> \xE9\xDC |0
-<U6A4F> \xE9\xD2 |0
-<U6A50> \xE9\xD1 |0
-<U6A51> \xE9\xC9 |0
-<U6A54> \xE9\xD3 |0
-<U6A55> \xE9\xDA |0
-<U6A56> \xE9\xD9 |0
-<U6A58> \xBE\xEF |0
-<U6A59> \xBE\xED |0
-<U6A5A> \xE9\xCB |0
-<U6A5B> \xE9\xC8 |0
-<U6A5D> \xE9\xC5 |0
-<U6A5E> \xE9\xD8 |0
-<U6A5F> \xBE\xF7 |0
-<U6A60> \xE9\xD6 |0
-<U6A61> \xBE\xF3 |0
-<U6A62> \xBE\xF2 |0
-<U6A64> \xE9\xD0 |0
-<U6A66> \xE9\xBF |0
-<U6A67> \xE9\xC1 |0
-<U6A68> \xE9\xC3 |0
-<U6A69> \xE9\xD5 |0
-<U6A6A> \xE9\xCF |0
-<U6A6B> \xBE\xEE |0
-<U6A6D> \xE9\xC6 |0
-<U6A6F> \xE9\xD4 |0
-<U6A76> \xE9\xC7 |0
-<U6A7E> \xC0\xCF |0
-<U6A7F> \xED\x45 |0
-<U6A80> \xC0\xC8 |0
-<U6A81> \xEC\xF5 |0
-<U6A83> \xED\x41 |0
-<U6A84> \xC0\xCA |0
-<U6A85> \xED\x48 |0
-<U6A87> \xEC\xFC |0
-<U6A89> \xEC\xF7 |0
-<U6A8C> \xED\x49 |0
-<U6A8D> \xEC\xF3 |0
-<U6A8E> \xEC\xFE |0
-<U6A90> \xC0\xD1 |0
-<U6A91> \xED\x44 |0
-<U6A92> \xED\x4A |0
-<U6A93> \xEC\xFD |0
-<U6A94> \xC0\xC9 |0
-<U6A95> \xED\x40 |0
-<U6A96> \xEC\xF4 |0
-<U6A97> \xC0\xD0 |0
-<U6A9A> \xED\x47 |0
-<U6A9B> \xEC\xF9 |0
-<U6A9C> \xC0\xCC |0
-<U6A9E> \xEC\xFB |0
-<U6A9F> \xEC\xF8 |0
-<U6AA0> \xC0\xD2 |0
-<U6AA1> \xEC\xFA |0
-<U6AA2> \xC0\xCB |0
-<U6AA3> \xC0\xCE |0
-<U6AA4> \xED\x43 |0
-<U6AA5> \xEC\xF6 |0
-<U6AA6> \xED\x46 |0
-<U6AA8> \xED\x42 |0
-<U6AAC> \xC2\x63 |0
-<U6AAD> \xEF\xE7 |0
-<U6AAE> \xC2\x68 |0
-<U6AAF> \xC2\x69 |0
-<U6AB3> \xC2\x62 |0
-<U6AB4> \xEF\xE6 |0
-<U6AB6> \xEF\xE3 |0
-<U6AB7> \xEF\xE4 |0
-<U6AB8> \xC2\x66 |0
-<U6AB9> \xEF\xDE |0
-<U6ABA> \xEF\xE2 |0
-<U6ABB> \xC2\x65 |0
-<U6ABD> \xEF\xDF |0
-<U6AC2> \xC2\x67 |0
-<U6AC3> \xC2\x64 |0
-<U6AC5> \xEF\xDD |0
-<U6AC6> \xEF\xE1 |0
-<U6AC7> \xEF\xE5 |0
-<U6ACB> \xF2\x51 |0
-<U6ACC> \xF2\x4E |0
-<U6ACD> \xF2\x57 |0
-<U6ACF> \xF2\x56 |0
-<U6AD0> \xF2\x54 |0
-<U6AD1> \xF2\x4F |0
-<U6AD3> \xC3\x72 |0
-<U6AD9> \xF2\x50 |0
-<U6ADA> \xC3\x71 |0
-<U6ADB> \xC0\xCD |0
-<U6ADC> \xF2\x53 |0
-<U6ADD> \xC3\x70 |0
-<U6ADE> \xF2\x58 |0
-<U6ADF> \xF2\x52 |0
-<U6AE0> \xF2\x4D |0
-<U6AE1> \xEF\xE0 |0
-<U6AE5> \xC3\x6F |0
-<U6AE7> \xF2\x4C |0
-<U6AE8> \xF4\x56 |0
-<U6AEA> \xF4\x55 |0
-<U6AEB> \xF2\x55 |0
-<U6AEC> \xC4\x68 |0
-<U6AEE> \xF4\x59 |0
-<U6AEF> \xF4\x5A |0
-<U6AF0> \xF4\x54 |0
-<U6AF1> \xF4\x58 |0
-<U6AF3> \xF4\x53 |0
-<U6AF8> \xF5\xD1 |0
-<U6AF9> \xF4\x57 |0
-<U6AFA> \xC4\xE7 |0
-<U6AFB> \xC4\xE5 |0
-<U6AFC> \xF5\xCF |0
-<U6B00> \xF5\xD2 |0
-<U6B02> \xF5\xCE |0
-<U6B03> \xF5\xD0 |0
-<U6B04> \xC4\xE6 |0
-<U6B08> \xF6\xE5 |0
-<U6B09> \xF6\xE6 |0
-<U6B0A> \xC5\x76 |0
-<U6B0B> \xF6\xE4 |0
-<U6B0F> \xF7\xE2 |0
-<U6B10> \xC5\xCF |0
-<U6B11> \xF7\xE0 |0
-<U6B12> \xF7\xE1 |0
-<U6B13> \xF8\xAC |0
-<U6B16> \xC6\x56 |0
-<U6B17> \xF8\xF3 |0
-<U6B18> \xF8\xF1 |0
-<U6B19> \xF8\xF2 |0
-<U6B1A> \xF8\xF4 |0
-<U6B1E> \xF9\xBB |0
-<U6B20> \xA4\xED |0
-<U6B21> \xA6\xB8 |0
-<U6B23> \xAA\x59 |0
-<U6B25> \xCC\xE9 |0
-<U6B28> \xCF\x64 |0
-<U6B2C> \xD1\xF5 |0
-<U6B2D> \xD1\xF7 |0
-<U6B2F> \xD1\xF6 |0
-<U6B31> \xD1\xF8 |0
-<U6B32> \xB1\xFD |0
-<U6B33> \xD5\xD7 |0
-<U6B34> \xD1\xF9 |0
-<U6B36> \xD5\xD6 |0
-<U6B37> \xD5\xD8 |0
-<U6B38> \xD5\xD9 |0
-<U6B39> \xD9\xDA |0
-<U6B3A> \xB4\xDB |0
-<U6B3B> \xD9\xDB |0
-<U6B3C> \xD9\xDD |0
-<U6B3D> \xB4\xDC |0
-<U6B3E> \xB4\xDA |0
-<U6B3F> \xD9\xDC |0
-<U6B41> \xDD\xFA |0
-<U6B42> \xDD\xF8 |0
-<U6B43> \xDD\xF7 |0
-<U6B45> \xDD\xF6 |0
-<U6B46> \xDD\xF5 |0
-<U6B47> \xB7\xB2 |0
-<U6B48> \xDD\xF9 |0
-<U6B49> \xBA\x70 |0
-<U6B4A> \xE2\x63 |0
-<U6B4B> \xE2\x65 |0
-<U6B4C> \xBA\x71 |0
-<U6B4D> \xE2\x64 |0
-<U6B4E> \xBC\xDB |0
-<U6B50> \xBC\xDA |0
-<U6B51> \xE5\xF0 |0
-<U6B54> \xE9\xDF |0
-<U6B55> \xE9\xDE |0
-<U6B56> \xE9\xE0 |0
-<U6B59> \xBE\xF9 |0
-<U6B5B> \xED\x4B |0
-<U6B5C> \xC0\xD3 |0
-<U6B5E> \xEF\xE8 |0
-<U6B5F> \xC2\x6A |0
-<U6B60> \xF2\x59 |0
-<U6B61> \xC5\x77 |0
-<U6B62> \xA4\xEE |0
-<U6B63> \xA5\xBF |0
-<U6B64> \xA6\xB9 |0
-<U6B65> \xA8\x42 |0
-<U6B66> \xAA\x5A |0
-<U6B67> \xAA\x5B |0
-<U6B6A> \xAC\x6E |0
-<U6B6D> \xD1\xFA |0
-<U6B72> \xB7\xB3 |0
-<U6B76> \xE6\xD1 |0
-<U6B77> \xBE\xFA |0
-<U6B78> \xC2\x6B |0
-<U6B79> \xA4\xEF |0
-<U6B7B> \xA6\xBA |0
-<U6B7E> \xCC\xEB |0
-<U6B7F> \xAA\x5C |0
-<U6B80> \xCC\xEA |0
-<U6B82> \xCF\x65 |0
-<U6B83> \xAC\x6F |0
-<U6B84> \xCF\x66 |0
-<U6B86> \xAC\x70 |0
-<U6B88> \xD1\xFC |0
-<U6B89> \xAE\xEE |0
-<U6B8A> \xAE\xED |0
-<U6B8C> \xD5\xDE |0
-<U6B8D> \xD5\xDC |0
-<U6B8E> \xD5\xDD |0
-<U6B8F> \xD5\xDB |0
-<U6B91> \xD5\xDA |0
-<U6B94> \xD9\xDE |0
-<U6B95> \xD9\xE1 |0
-<U6B96> \xB4\xDE |0
-<U6B97> \xD9\xDF |0
-<U6B98> \xB4\xDD |0
-<U6B99> \xD9\xE0 |0
-<U6B9B> \xDD\xFB |0
-<U6B9E> \xE2\x66 |0
-<U6B9F> \xE2\x67 |0
-<U6BA0> \xE2\x68 |0
-<U6BA2> \xE5\xF3 |0
-<U6BA3> \xE5\xF2 |0
-<U6BA4> \xBC\xDC |0
-<U6BA5> \xE5\xF1 |0
-<U6BA6> \xE5\xF4 |0
-<U6BA7> \xE9\xE1 |0
-<U6BAA> \xE9\xE2 |0
-<U6BAB> \xE9\xE3 |0
-<U6BAD> \xED\x4C |0
-<U6BAE> \xC0\xD4 |0
-<U6BAF> \xC2\x6C |0
-<U6BB0> \xF2\x5A |0
-<U6BB2> \xC4\xE8 |0
-<U6BB3> \xC9\x5F |0
-<U6BB5> \xAC\x71 |0
-<U6BB6> \xCF\x67 |0
-<U6BB7> \xAE\xEF |0
-<U6BBA> \xB1\xFE |0
-<U6BBC> \xB4\xDF |0
-<U6BBD> \xD9\xE2 |0
-<U6BBF> \xB7\xB5 |0
-<U6BC0> \xB7\xB4 |0
-<U6BC3> \xE2\x69 |0
-<U6BC4> \xE2\x6A |0
-<U6BC5> \xBC\xDD |0
-<U6BC6> \xBC\xDE |0
-<U6BC7> \xE9\xE5 |0
-<U6BC8> \xE9\xE4 |0
-<U6BC9> \xEF\xE9 |0
-<U6BCA> \xF7\xE3 |0
-<U6BCB> \xA4\xF0 |0
-<U6BCC> \xC9\x60 |0
-<U6BCD> \xA5\xC0 |0
-<U6BCF> \xA8\x43 |0
-<U6BD0> \xCB\x48 |0
-<U6BD2> \xAC\x72 |0
-<U6BD3> \xB7\xB6 |0
-<U6BD4> \xA4\xF1 |0
-<U6BD6> \xCF\x68 |0
-<U6BD7> \xAC\x73 |0
-<U6BD8> \xCF\x69 |0
-<U6BDA> \xC0\xD5 |0
-<U6BDB> \xA4\xF2 |0
-<U6BDE> \xCC\xEC |0
-<U6BE0> \xCF\x6A |0
-<U6BE2> \xD2\x42 |0
-<U6BE3> \xD2\x41 |0
-<U6BE4> \xD1\xFE |0
-<U6BE6> \xD1\xFD |0
-<U6BE7> \xD2\x43 |0
-<U6BE8> \xD2\x40 |0
-<U6BEB> \xB2\x40 |0
-<U6BEC> \xB2\x41 |0
-<U6BEF> \xB4\xE0 |0
-<U6BF0> \xD9\xE3 |0
-<U6BF2> \xD9\xE4 |0
-<U6BF3> \xD9\xE5 |0
-<U6BF7> \xDE\x41 |0
-<U6BF8> \xDE\x42 |0
-<U6BF9> \xDE\x40 |0
-<U6BFB> \xDD\xFD |0
-<U6BFC> \xDD\xFE |0
-<U6BFD> \xB7\xB7 |0
-<U6BFE> \xE2\x6B |0
-<U6BFF> \xE5\xF7 |0
-<U6C00> \xE5\xF6 |0
-<U6C01> \xE5\xF5 |0
-<U6C02> \xE5\xF8 |0
-<U6C03> \xE9\xE7 |0
-<U6C04> \xE9\xE6 |0
-<U6C05> \xBE\xFB |0
-<U6C06> \xE9\xE8 |0
-<U6C08> \xC0\xD6 |0
-<U6C09> \xED\x4D |0
-<U6C0B> \xEF\xEA |0
-<U6C0C> \xF2\x5B |0
-<U6C0D> \xF6\xE7 |0
-<U6C0F> \xA4\xF3 |0
-<U6C10> \xA5\xC2 |0
-<U6C11> \xA5\xC1 |0
-<U6C13> \xAA\x5D |0
-<U6C14> \xC9\x61 |0
-<U6C15> \xC9\x7E |0
-<U6C16> \xA6\xBB |0
-<U6C18> \xC9\xF7 |0
-<U6C19> \xCB\x49 |0
-<U6C1A> \xCB\x4A |0
-<U6C1B> \xAA\x5E |0
-<U6C1D> \xCC\xED |0
-<U6C1F> \xAC\x74 |0
-<U6C20> \xCF\x6B |0
-<U6C21> \xCF\x6C |0
-<U6C23> \xAE\xF0 |0
-<U6C24> \xAE\xF4 |0
-<U6C25> \xD2\x44 |0
-<U6C26> \xAE\xF3 |0
-<U6C27> \xAE\xF1 |0
-<U6C28> \xAE\xF2 |0
-<U6C2A> \xD5\xDF |0
-<U6C2B> \xB2\x42 |0
-<U6C2C> \xB4\xE3 |0
-<U6C2E> \xB4\xE1 |0
-<U6C2F> \xB4\xE2 |0
-<U6C30> \xD9\xE6 |0
-<U6C33> \xBA\x72 |0
-<U6C34> \xA4\xF4 |0
-<U6C36> \xC9\xA1 |0
-<U6C38> \xA5\xC3 |0
-<U6C3B> \xC9\xA4 |0
-<U6C3E> \xA5\xC6 |0
-<U6C3F> \xC9\xA3 |0
-<U6C40> \xA5\xC5 |0
-<U6C41> \xA5\xC4 |0
-<U6C42> \xA8\x44 |0
-<U6C43> \xC9\xA2 |0
-<U6C46> \xC9\xF8 |0
-<U6C4A> \xC9\xFC |0
-<U6C4B> \xC9\xFE |0
-<U6C4C> \xCA\x40 |0
-<U6C4D> \xA6\xC5 |0
-<U6C4E> \xA6\xC6 |0
-<U6C4F> \xC9\xFB |0
-<U6C50> \xA6\xC1 |0
-<U6C52> \xC9\xF9 |0
-<U6C54> \xC9\xFD |0
-<U6C55> \xA6\xC2 |0
-<U6C57> \xA6\xBD |0
-<U6C59> \xA6\xBE |0
-<U6C5B> \xA6\xC4 |0
-<U6C5C> \xC9\xFA |0
-<U6C5D> \xA6\xBC |0
-<U6C5E> \xA8\x45 |0
-<U6C5F> \xA6\xBF |0
-<U6C60> \xA6\xC0 |0
-<U6C61> \xA6\xC3 |0
-<U6C65> \xCB\x5B |0
-<U6C66> \xCB\x59 |0
-<U6C67> \xCB\x4C |0
-<U6C68> \xA8\x51 |0
-<U6C69> \xCB\x53 |0
-<U6C6A> \xA8\x4C |0
-<U6C6B> \xCB\x4D |0
-<U6C6D> \xCB\x55 |0
-<U6C6F> \xCB\x52 |0
-<U6C70> \xA8\x4F |0
-<U6C71> \xCB\x51 |0
-<U6C72> \xA8\x56 |0
-<U6C73> \xCB\x5A |0
-<U6C74> \xA8\x58 |0
-<U6C76> \xA8\x5A |0
-<U6C78> \xCB\x4B |0
-<U6C7A> \xA8\x4D |0
-<U6C7B> \xCB\x5C |0
-<U6C7D> \xA8\x54 |0
-<U6C7E> \xA8\x57 |0
-<U6C80> \xCD\x45 |0
-<U6C81> \xA8\x47 |0
-<U6C82> \xA8\x5E |0
-<U6C83> \xA8\x55 |0
-<U6C84> \xCB\x4E |0
-<U6C85> \xA8\x4A |0
-<U6C86> \xA8\x59 |0
-<U6C87> \xCB\x56 |0
-<U6C88> \xA8\x48 |0
-<U6C89> \xA8\x49 |0
-<U6C8A> \xCD\x43 |0
-<U6C8B> \xCB\x4F |0
-<U6C8C> \xA8\x50 |0
-<U6C8D> \xA8\x5B |0
-<U6C8E> \xCB\x5D |0
-<U6C8F> \xCB\x50 |0
-<U6C90> \xA8\x4E |0
-<U6C92> \xA8\x53 |0
-<U6C93> \xCC\xEE |0
-<U6C94> \xA8\x5C |0
-<U6C95> \xCB\x57 |0
-<U6C96> \xA8\x52 |0
-<U6C98> \xA8\x5D |0
-<U6C99> \xA8\x46 |0
-<U6C9A> \xCB\x54 |0
-<U6C9B> \xA8\x4B |0
-<U6C9C> \xCB\x58 |0
-<U6C9D> \xCD\x44 |0
-<U6CAB> \xAA\x6A |0
-<U6CAC> \xAA\x7A |0
-<U6CAD> \xCC\xF5 |0
-<U6CAE> \xAA\x71 |0
-<U6CB0> \xCD\x4B |0
-<U6CB1> \xAA\x62 |0
-<U6CB3> \xAA\x65 |0
-<U6CB4> \xCD\x42 |0
-<U6CB6> \xCC\xF3 |0
-<U6CB7> \xCC\xF7 |0
-<U6CB8> \xAA\x6D |0
-<U6CB9> \xAA\x6F |0
-<U6CBA> \xCC\xFA |0
-<U6CBB> \xAA\x76 |0
-<U6CBC> \xAA\x68 |0
-<U6CBD> \xAA\x66 |0
-<U6CBE> \xAA\x67 |0
-<U6CBF> \xAA\x75 |0
-<U6CC0> \xCD\x47 |0
-<U6CC1> \xAA\x70 |0
-<U6CC2> \xCC\xF9 |0
-<U6CC3> \xCC\xFB |0
-<U6CC4> \xAA\x6E |0
-<U6CC5> \xAA\x73 |0
-<U6CC6> \xCC\xFC |0
-<U6CC7> \xCD\x4A |0
-<U6CC9> \xAC\x75 |0
-<U6CCA> \xAA\x79 |0
-<U6CCC> \xAA\x63 |0
-<U6CCD> \xCD\x49 |0
-<U6CCF> \xCD\x4D |0
-<U6CD0> \xCC\xF8 |0
-<U6CD1> \xCD\x4F |0
-<U6CD2> \xCD\x40 |0
-<U6CD3> \xAA\x6C |0
-<U6CD4> \xCC\xF4 |0
-<U6CD5> \xAA\x6B |0
-<U6CD6> \xAA\x7D |0
-<U6CD7> \xAA\x72 |0
-<U6CD9> \xCC\xF2 |0
-<U6CDA> \xCF\x75 |0
-<U6CDB> \xAA\x78 |0
-<U6CDC> \xAA\x7C |0
-<U6CDD> \xCD\x41 |0
-<U6CDE> \xCD\x46 |0
-<U6CE0> \xAA\x7E |0
-<U6CE1> \xAA\x77 |0
-<U6CE2> \xAA\x69 |0
-<U6CE3> \xAA\x5F |0
-<U6CE5> \xAA\x64 |0
-<U6CE7> \xCC\xF6 |0
-<U6CE8> \xAA\x60 |0
-<U6CE9> \xCD\x4E |0
-<U6CEB> \xCC\xF0 |0
-<U6CEC> \xCC\xEF |0
-<U6CED> \xCC\xFD |0
-<U6CEE> \xCC\xF1 |0
-<U6CEF> \xAA\x7B |0
-<U6CF0> \xAE\xF5 |0
-<U6CF1> \xAA\x74 |0
-<U6CF2> \xCC\xFE |0
-<U6CF3> \xAA\x61 |0
-<U6CF5> \xAC\xA6 |0
-<U6CF9> \xCD\x4C |0
-<U6D00> \xCF\x7C |0
-<U6D01> \xCF\xA1 |0
-<U6D03> \xCF\xA4 |0
-<U6D04> \xCF\x77 |0
-<U6D07> \xCF\xA7 |0
-<U6D08> \xCF\xAA |0
-<U6D09> \xCF\xAC |0
-<U6D0A> \xCF\x74 |0
-<U6D0B> \xAC\x76 |0
-<U6D0C> \xAC\x7B |0
-<U6D0D> \xD2\x49 |0
-<U6D0E> \xAC\xAD |0
-<U6D0F> \xCF\xA5 |0
-<U6D10> \xCF\xAD |0
-<U6D11> \xCF\x7B |0
-<U6D12> \xCF\x73 |0
-<U6D16> \xD2\x64 |0
-<U6D17> \xAC\x7E |0
-<U6D18> \xCF\xA2 |0
-<U6D19> \xCF\x78 |0
-<U6D1A> \xCF\x7A |0
-<U6D1B> \xAC\xA5 |0
-<U6D1D> \xCF\x7D |0
-<U6D1E> \xAC\x7D |0
-<U6D1F> \xCF\x70 |0
-<U6D20> \xCF\xA8 |0
-<U6D22> \xCF\xAB |0
-<U6D25> \xAC\x7A |0
-<U6D27> \xAC\xA8 |0
-<U6D28> \xCF\x6D |0
-<U6D29> \xAC\xAA |0
-<U6D2A> \xAC\x78 |0
-<U6D2B> \xAC\xAE |0
-<U6D2C> \xCF\xA9 |0
-<U6D2D> \xCF\x6F |0
-<U6D2E> \xAC\xAB |0
-<U6D2F> \xD2\x5E |0
-<U6D30> \xCD\x48 |0
-<U6D31> \xAC\x7C |0
-<U6D32> \xAC\x77 |0
-<U6D33> \xCF\x76 |0
-<U6D34> \xCF\x6E |0
-<U6D35> \xAC\xAC |0
-<U6D36> \xAC\xA4 |0
-<U6D37> \xCF\xA3 |0
-<U6D38> \xAC\xA9 |0
-<U6D39> \xAC\xA7 |0
-<U6D3A> \xCF\x79 |0
-<U6D3B> \xAC\xA1 |0
-<U6D3C> \xCF\x71 |0
-<U6D3D> \xAC\xA2 |0
-<U6D3E> \xAC\xA3 |0
-<U6D3F> \xCF\x72 |0
-<U6D40> \xCF\xA6 |0
-<U6D41> \xAC\x79 |0
-<U6D42> \xCF\x7E |0
-<U6D58> \xD2\x4C |0
-<U6D59> \xAE\xFD |0
-<U6D5A> \xAF\x43 |0
-<U6D5E> \xD2\x55 |0
-<U6D5F> \xD2\x5B |0
-<U6D60> \xD2\x57 |0
-<U6D61> \xD2\x4A |0
-<U6D62> \xD2\x4D |0
-<U6D63> \xD2\x46 |0
-<U6D64> \xD2\x47 |0
-<U6D65> \xAF\x4A |0
-<U6D66> \xAE\xFA |0
-<U6D67> \xD2\x56 |0
-<U6D68> \xD2\x5F |0
-<U6D69> \xAF\x45 |0
-<U6D6A> \xAE\xF6 |0
-<U6D6C> \xAF\x40 |0
-<U6D6D> \xD2\x4E |0
-<U6D6E> \xAF\x42 |0
-<U6D6F> \xD2\x4F |0
-<U6D70> \xD2\x59 |0
-<U6D74> \xAF\x44 |0
-<U6D75> \xD2\x68 |0
-<U6D76> \xD2\x48 |0
-<U6D77> \xAE\xFC |0
-<U6D78> \xAE\xFB |0
-<U6D79> \xAF\x48 |0
-<U6D7A> \xD2\x45 |0
-<U6D7B> \xD2\x66 |0
-<U6D7C> \xD2\x5A |0
-<U6D7D> \xD2\x67 |0
-<U6D7E> \xD2\x61 |0
-<U6D7F> \xD2\x53 |0
-<U6D80> \xD2\x62 |0
-<U6D82> \xD2\x5C |0
-<U6D83> \xD2\x65 |0
-<U6D84> \xD2\x63 |0
-<U6D85> \xAF\x49 |0
-<U6D86> \xD2\x54 |0
-<U6D87> \xAE\xF9 |0
-<U6D88> \xAE\xF8 |0
-<U6D89> \xAF\x41 |0
-<U6D8A> \xAF\x47 |0
-<U6D8B> \xD2\x60 |0
-<U6D8C> \xAF\x46 |0
-<U6D8D> \xD2\x51 |0
-<U6D8E> \xB2\x43 |0
-<U6D90> \xD2\x69 |0
-<U6D91> \xD2\x50 |0
-<U6D92> \xD2\x4B |0
-<U6D93> \xAE\xFE |0
-<U6D94> \xAF\x4B |0
-<U6D95> \xAE\xF7 |0
-<U6D97> \xD2\x58 |0
-<U6D98> \xD2\x5D |0
-<U6DAA> \xB2\x65 |0
-<U6DAB> \xD5\xE1 |0
-<U6DAC> \xD5\xE5 |0
-<U6DAE> \xB2\x52 |0
-<U6DAF> \xB2\x50 |0
-<U6DB2> \xB2\x47 |0
-<U6DB3> \xD5\xE3 |0
-<U6DB4> \xD5\xE2 |0
-<U6DB5> \xB2\x5B |0
-<U6DB7> \xD5\xE8 |0
-<U6DB8> \xB2\x55 |0
-<U6DBA> \xD5\xFA |0
-<U6DBB> \xD6\x47 |0
-<U6DBC> \xB2\x44 |0
-<U6DBD> \xD5\xF7 |0
-<U6DBE> \xD5\xF0 |0
-<U6DBF> \xB2\x67 |0
-<U6DC0> \xD5\xE0 |0
-<U6DC2> \xD5\xFC |0
-<U6DC4> \xB2\x64 |0
-<U6DC5> \xB2\x58 |0
-<U6DC6> \xB2\x63 |0
-<U6DC7> \xB2\x4E |0
-<U6DC8> \xD5\xEC |0
-<U6DC9> \xD5\xFE |0
-<U6DCA> \xD5\xF6 |0
-<U6DCB> \xB2\x4F |0
-<U6DCC> \xB2\x49 |0
-<U6DCD> \xD6\x45 |0
-<U6DCF> \xD5\xFD |0
-<U6DD0> \xD6\x40 |0
-<U6DD1> \xB2\x51 |0
-<U6DD2> \xB2\x59 |0
-<U6DD3> \xD6\x42 |0
-<U6DD4> \xD5\xEA |0
-<U6DD5> \xD5\xFB |0
-<U6DD6> \xD5\xEF |0
-<U6DD7> \xD6\x44 |0
-<U6DD8> \xB2\x5E |0
-<U6DD9> \xB2\x46 |0
-<U6DDA> \xB2\x5C |0
-<U6DDB> \xD5\xF4 |0
-<U6DDC> \xD5\xF2 |0
-<U6DDD> \xD5\xF3 |0
-<U6DDE> \xB2\x53 |0
-<U6DDF> \xD5\xEE |0
-<U6DE0> \xD5\xED |0
-<U6DE1> \xB2\x48 |0
-<U6DE2> \xD5\xE7 |0
-<U6DE3> \xD6\x46 |0
-<U6DE4> \xB2\x4A |0
-<U6DE5> \xD5\xF1 |0
-<U6DE6> \xB2\x68 |0
-<U6DE8> \xB2\x62 |0
-<U6DE9> \xD5\xE6 |0
-<U6DEA> \xB2\x5F |0
-<U6DEB> \xB2\x5D |0
-<U6DEC> \xB2\x66 |0
-<U6DED> \xD5\xF8 |0
-<U6DEE> \xB2\x61 |0
-<U6DEF> \xD2\x52 |0
-<U6DF0> \xD5\xF9 |0
-<U6DF1> \xB2\x60 |0
-<U6DF2> \xD6\x41 |0
-<U6DF3> \xB2\x45 |0
-<U6DF4> \xD5\xF5 |0
-<U6DF5> \xB2\x57 |0
-<U6DF6> \xD5\xE9 |0
-<U6DF7> \xB2\x56 |0
-<U6DF9> \xB2\x54 |0
-<U6DFA> \xB2\x4C |0
-<U6DFB> \xB2\x4B |0
-<U6DFC> \xD9\xE7 |0
-<U6DFD> \xD6\x43 |0
-<U6E00> \xD5\xEB |0
-<U6E03> \xD9\xFC |0
-<U6E05> \xB2\x4D |0
-<U6E19> \xB5\x41 |0
-<U6E1A> \xB2\x5A |0
-<U6E1B> \xB4\xEE |0
-<U6E1C> \xD9\xF6 |0
-<U6E1D> \xB4\xFC |0
-<U6E1F> \xD9\xEA |0
-<U6E20> \xB4\xEB |0
-<U6E21> \xB4\xE7 |0
-<U6E22> \xDA\x49 |0
-<U6E23> \xB4\xED |0
-<U6E24> \xB4\xF1 |0
-<U6E25> \xB4\xEC |0
-<U6E26> \xB4\xF5 |0
-<U6E27> \xDA\x4D |0
-<U6E28> \xDA\x44 |0
-<U6E2B> \xD9\xF1 |0
-<U6E2C> \xB4\xFA |0
-<U6E2D> \xB4\xF4 |0
-<U6E2E> \xD9\xFD |0
-<U6E2F> \xB4\xE4 |0
-<U6E30> \xDA\x4A |0
-<U6E31> \xDA\x43 |0
-<U6E32> \xB4\xE8 |0
-<U6E33> \xD9\xF7 |0
-<U6E34> \xB4\xF7 |0
-<U6E35> \xDA\x55 |0
-<U6E36> \xDA\x56 |0
-<U6E38> \xB4\xE5 |0
-<U6E39> \xDA\x48 |0
-<U6E3A> \xB4\xF9 |0
-<U6E3B> \xD9\xFB |0
-<U6E3C> \xD9\xED |0
-<U6E3D> \xD9\xEE |0
-<U6E3E> \xB4\xFD |0
-<U6E3F> \xD9\xF2 |0
-<U6E40> \xD9\xF9 |0
-<U6E41> \xD9\xF3 |0
-<U6E43> \xB4\xFB |0
-<U6E44> \xB5\x44 |0
-<U6E45> \xD9\xEF |0
-<U6E46> \xD9\xE8 |0
-<U6E47> \xD9\xE9 |0
-<U6E49> \xD9\xEB |0
-<U6E4A> \xB4\xEA |0
-<U6E4B> \xD9\xF8 |0
-<U6E4D> \xB4\xF8 |0
-<U6E4E> \xB5\x42 |0
-<U6E51> \xD9\xFA |0
-<U6E52> \xDA\x53 |0
-<U6E53> \xDA\x4B |0
-<U6E54> \xB4\xE6 |0
-<U6E55> \xDA\x51 |0
-<U6E56> \xB4\xF2 |0
-<U6E58> \xB4\xF0 |0
-<U6E5A> \xDA\x57 |0
-<U6E5B> \xB4\xEF |0
-<U6E5C> \xDA\x41 |0
-<U6E5D> \xD9\xF4 |0
-<U6E5E> \xD9\xFE |0
-<U6E5F> \xB5\x47 |0
-<U6E60> \xDA\x45 |0
-<U6E61> \xDA\x42 |0
-<U6E62> \xD9\xF0 |0
-<U6E63> \xB5\x43 |0
-<U6E64> \xDA\x4F |0
-<U6E65> \xDA\x4C |0
-<U6E66> \xDA\x54 |0
-<U6E67> \xB4\xE9 |0
-<U6E68> \xDA\x40 |0
-<U6E69> \xB5\x46 |0
-<U6E6B> \xDA\x47 |0
-<U6E6E> \xB4\xF3 |0
-<U6E6F> \xB4\xF6 |0
-<U6E71> \xDA\x46 |0
-<U6E72> \xB5\x45 |0
-<U6E73> \xD9\xF5 |0
-<U6E74> \xD5\xE4 |0
-<U6E77> \xDA\x50 |0
-<U6E78> \xDA\x4E |0
-<U6E79> \xDA\x52 |0
-<U6E88> \xD9\xEC |0
-<U6E89> \xB5\x40 |0
-<U6E8D> \xDE\x61 |0
-<U6E8E> \xDE\x60 |0
-<U6E8F> \xDE\x46 |0
-<U6E90> \xB7\xBD |0
-<U6E92> \xDE\x5F |0
-<U6E93> \xDE\x49 |0
-<U6E94> \xDE\x4A |0
-<U6E96> \xB7\xC7 |0
-<U6E97> \xDE\x68 |0
-<U6E98> \xB7\xC2 |0
-<U6E99> \xDE\x5E |0
-<U6E9B> \xDE\x43 |0
-<U6E9C> \xB7\xC8 |0
-<U6E9D> \xB7\xBE |0
-<U6E9E> \xDE\x52 |0
-<U6E9F> \xDE\x48 |0
-<U6EA0> \xDE\x4B |0
-<U6EA1> \xDE\x63 |0
-<U6EA2> \xB7\xB8 |0
-<U6EA3> \xDE\x6A |0
-<U6EA4> \xDE\x62 |0
-<U6EA5> \xB7\xC1 |0
-<U6EA6> \xDE\x57 |0
-<U6EA7> \xB7\xCC |0
-<U6EAA> \xB7\xCB |0
-<U6EAB> \xB7\xC5 |0
-<U6EAE> \xDE\x69 |0
-<U6EAF> \xB7\xB9 |0
-<U6EB0> \xDE\x55 |0
-<U6EB1> \xDE\x4C |0
-<U6EB2> \xDE\x59 |0
-<U6EB3> \xDE\x65 |0
-<U6EB4> \xB7\xCD |0
-<U6EB6> \xB7\xBB |0
-<U6EB7> \xDE\x54 |0
-<U6EB9> \xDE\x4D |0
-<U6EBA> \xB7\xC4 |0
-<U6EBC> \xB7\xC3 |0
-<U6EBD> \xDE\x50 |0
-<U6EBE> \xDE\x5A |0
-<U6EBF> \xDE\x64 |0
-<U6EC0> \xDE\x47 |0
-<U6EC1> \xDE\x51 |0
-<U6EC2> \xB7\xBC |0
-<U6EC3> \xDE\x5B |0
-<U6EC4> \xB7\xC9 |0
-<U6EC5> \xB7\xC0 |0
-<U6EC6> \xDE\x4E |0
-<U6EC7> \xB7\xBF |0
-<U6EC8> \xDE\x45 |0
-<U6EC9> \xDE\x53 |0
-<U6ECA> \xDE\x67 |0
-<U6ECB> \xB4\xFE |0
-<U6ECC> \xBA\xB0 |0
-<U6ECD> \xDE\x56 |0
-<U6ECE> \xE2\x6C |0
-<U6ECF> \xDE\x58 |0
-<U6ED0> \xDE\x66 |0
-<U6ED1> \xB7\xC6 |0
-<U6ED2> \xDE\x4F |0
-<U6ED3> \xB7\xBA |0
-<U6ED4> \xB7\xCA |0
-<U6ED5> \xBC\xF0 |0
-<U6ED6> \xDE\x44 |0
-<U6ED8> \xDE\x5D |0
-<U6EDC> \xDE\x5C |0
-<U6EEB> \xE2\xAA |0
-<U6EEC> \xBA\xAD |0
-<U6EED> \xE2\x7D |0
-<U6EEE> \xE2\xA4 |0
-<U6EEF> \xBA\xA2 |0
-<U6EF1> \xE2\x6E |0
-<U6EF2> \xBA\xAF |0
-<U6EF4> \xBA\x77 |0
-<U6EF5> \xE2\x6D |0
-<U6EF6> \xE2\xB0 |0
-<U6EF7> \xBA\xB1 |0
-<U6EF8> \xE2\x71 |0
-<U6EF9> \xE2\xA3 |0
-<U6EFB> \xE2\x73 |0
-<U6EFC> \xE2\xB3 |0
-<U6EFD> \xE2\xAF |0
-<U6EFE> \xBA\x75 |0
-<U6EFF> \xBA\xA1 |0
-<U6F00> \xE6\x53 |0
-<U6F01> \xBA\xAE |0
-<U6F02> \xBA\x7D |0
-<U6F03> \xE2\x6F |0
-<U6F05> \xE2\xAE |0
-<U6F06> \xBA\xA3 |0
-<U6F07> \xE2\xAB |0
-<U6F08> \xE2\xB8 |0
-<U6F09> \xE2\x75 |0
-<U6F0A> \xE2\x7E |0
-<U6F0D> \xE2\xB6 |0
-<U6F0E> \xE2\xAC |0
-<U6F0F> \xBA\x7C |0
-<U6F12> \xE2\x7C |0
-<U6F13> \xBA\x76 |0
-<U6F14> \xBA\x74 |0
-<U6F15> \xBA\xA8 |0
-<U6F18> \xE2\x7A |0
-<U6F19> \xE2\x77 |0
-<U6F1A> \xE2\x78 |0
-<U6F1C> \xE2\xB2 |0
-<U6F1E> \xE2\xB7 |0
-<U6F1F> \xE2\xB5 |0
-<U6F20> \xBA\x7A |0
-<U6F21> \xE2\xB9 |0
-<U6F22> \xBA\x7E |0
-<U6F23> \xBA\xA7 |0
-<U6F25> \xE2\x70 |0
-<U6F26> \xE5\xFA |0
-<U6F27> \xE2\x79 |0
-<U6F29> \xBA\x78 |0
-<U6F2A> \xBA\xAC |0
-<U6F2B> \xBA\xA9 |0
-<U6F2C> \xBA\x7B |0
-<U6F2D> \xE2\xA5 |0
-<U6F2E> \xE2\x74 |0
-<U6F2F> \xBA\xAA |0
-<U6F30> \xE2\xA7 |0
-<U6F31> \xBA\xA4 |0
-<U6F32> \xBA\xA6 |0
-<U6F33> \xBA\x73 |0
-<U6F35> \xE2\xA9 |0
-<U6F36> \xE2\xA1 |0
-<U6F37> \xE2\x72 |0
-<U6F38> \xBA\xA5 |0
-<U6F39> \xE2\xB1 |0
-<U6F3A> \xE2\xB4 |0
-<U6F3B> \xE2\x7B |0
-<U6F3C> \xE2\xA8 |0
-<U6F3E> \xBA\x79 |0
-<U6F3F> \xBC\xDF |0
-<U6F40> \xE2\xA6 |0
-<U6F41> \xE5\xF9 |0
-<U6F43> \xE2\xAD |0
-<U6F4E> \xE2\x76 |0
-<U6F4F> \xE6\x44 |0
-<U6F50> \xE6\x4E |0
-<U6F51> \xBC\xE2 |0
-<U6F52> \xE6\x4D |0
-<U6F53> \xE6\x59 |0
-<U6F54> \xBC\xE4 |0
-<U6F55> \xE6\x4B |0
-<U6F57> \xE6\x4F |0
-<U6F58> \xBC\xEF |0
-<U6F5A> \xE6\x46 |0
-<U6F5B> \xBC\xE7 |0
-<U6F5D> \xE6\x52 |0
-<U6F5E> \xE9\xF0 |0
-<U6F5F> \xBC\xF3 |0
-<U6F60> \xBC\xF2 |0
-<U6F61> \xE6\x54 |0
-<U6F62> \xE6\x43 |0
-<U6F63> \xE6\x5E |0
-<U6F64> \xBC\xED |0
-<U6F66> \xBC\xE3 |0
-<U6F67> \xE6\x57 |0
-<U6F69> \xE6\x5B |0
-<U6F6A> \xE6\x60 |0
-<U6F6B> \xE6\x55 |0
-<U6F6C> \xE6\x49 |0
-<U6F6D> \xBC\xE6 |0
-<U6F6E> \xBC\xE9 |0
-<U6F6F> \xBC\xF1 |0
-<U6F70> \xBC\xEC |0
-<U6F72> \xE6\x4C |0
-<U6F73> \xE2\xA2 |0
-<U6F76> \xE6\x48 |0
-<U6F77> \xE6\x5F |0
-<U6F78> \xBC\xE8 |0
-<U6F7A> \xBC\xEB |0
-<U6F7B> \xE6\x61 |0
-<U6F7C> \xBC\xE0 |0
-<U6F7D> \xE6\x56 |0
-<U6F7E> \xE5\xFB |0
-<U6F7F> \xE6\x5C |0
-<U6F80> \xC0\xDF |0
-<U6F82> \xE6\x4A |0
-<U6F84> \xBC\xE1 |0
-<U6F85> \xE6\x45 |0
-<U6F86> \xBC\xE5 |0
-<U6F87> \xE5\xFC |0
-<U6F88> \xBA\xAB |0
-<U6F89> \xE6\x41 |0
-<U6F8B> \xE6\x5A |0
-<U6F8C> \xE6\x42 |0
-<U6F8D> \xE6\x40 |0
-<U6F8E> \xBC\xEA |0
-<U6F90> \xE6\x58 |0
-<U6F92> \xE5\xFE |0
-<U6F93> \xE6\x51 |0
-<U6F94> \xE6\x50 |0
-<U6F95> \xE6\x5D |0
-<U6F96> \xE6\x47 |0
-<U6F97> \xBC\xEE |0
-<U6F9E> \xE9\xF3 |0
-<U6FA0> \xBF\x49 |0
-<U6FA1> \xBE\xFE |0
-<U6FA2> \xEA\x40 |0
-<U6FA3> \xE9\xEB |0
-<U6FA4> \xBF\x41 |0
-<U6FA5> \xE9\xF7 |0
-<U6FA6> \xBF\x48 |0
-<U6FA7> \xBF\x43 |0
-<U6FA8> \xE9\xF5 |0
-<U6FA9> \xED\x4F |0
-<U6FAA> \xE9\xFB |0
-<U6FAB> \xEA\x42 |0
-<U6FAC> \xE9\xFA |0
-<U6FAD> \xE9\xE9 |0
-<U6FAE> \xE9\xF8 |0
-<U6FAF> \xEA\x44 |0
-<U6FB0> \xEA\x46 |0
-<U6FB1> \xBE\xFD |0
-<U6FB2> \xEA\x45 |0
-<U6FB3> \xBF\x44 |0
-<U6FB4> \xBF\x4A |0
-<U6FB6> \xBF\x47 |0
-<U6FB8> \xE9\xFE |0
-<U6FB9> \xBF\x46 |0
-<U6FBA> \xE9\xF9 |0
-<U6FBC> \xE9\xED |0
-<U6FBD> \xE9\xF2 |0
-<U6FBF> \xE9\xFD |0
-<U6FC0> \xBF\x45 |0
-<U6FC1> \xBF\x42 |0
-<U6FC2> \xBE\xFC |0
-<U6FC3> \xBF\x40 |0
-<U6FC4> \xE9\xF1 |0
-<U6FC6> \xE5\xFD |0
-<U6FC7> \xE9\xEC |0
-<U6FC8> \xE9\xEF |0
-<U6FC9> \xEA\x41 |0
-<U6FCA> \xE9\xF4 |0
-<U6FCB> \xE9\xEA |0
-<U6FCC> \xED\x4E |0
-<U6FCD> \xEA\x43 |0
-<U6FCE> \xE9\xEE |0
-<U6FCF> \xE9\xFC |0
-<U6FD4> \xED\x51 |0
-<U6FD5> \xC0\xE3 |0
-<U6FD8> \xC0\xD7 |0
-<U6FDB> \xC0\xDB |0
-<U6FDC> \xED\x53 |0
-<U6FDD> \xED\x59 |0
-<U6FDE> \xED\x57 |0
-<U6FDF> \xC0\xD9 |0
-<U6FE0> \xC0\xDA |0
-<U6FE1> \xC0\xE1 |0
-<U6FE2> \xED\x5A |0
-<U6FE3> \xED\x52 |0
-<U6FE4> \xC0\xDC |0
-<U6FE6> \xED\x56 |0
-<U6FE7> \xED\x55 |0
-<U6FE8> \xED\x5B |0
-<U6FE9> \xC0\xE2 |0
-<U6FEB> \xC0\xDD |0
-<U6FEC> \xC0\xE0 |0
-<U6FED> \xED\x54 |0
-<U6FEE> \xC0\xE4 |0
-<U6FEF> \xC0\xDE |0
-<U6FF0> \xC0\xE5 |0
-<U6FF1> \xC0\xD8 |0
-<U6FF2> \xED\x58 |0
-<U6FF4> \xED\x50 |0
-<U6FF7> \xEF\xF7 |0
-<U6FFA> \xC2\x71 |0
-<U6FFB> \xEF\xF4 |0
-<U6FFC> \xEF\xF6 |0
-<U6FFE> \xC2\x6F |0
-<U6FFF> \xEF\xF2 |0
-<U7000> \xEF\xF3 |0
-<U7001> \xEF\xEE |0
-<U7004> \xE9\xF6 |0
-<U7005> \xEF\xEF |0
-<U7006> \xC2\x70 |0
-<U7007> \xEF\xEB |0
-<U7009> \xC2\x6D |0
-<U700A> \xEF\xF8 |0
-<U700B> \xC2\x6E |0
-<U700C> \xEF\xEC |0
-<U700D> \xEF\xED |0
-<U700E> \xEF\xF1 |0
-<U700F> \xC2\x73 |0
-<U7011> \xC2\x72 |0
-<U7014> \xEF\xF0 |0
-<U7015> \xC3\x78 |0
-<U7016> \xF2\x5F |0
-<U7017> \xF2\x65 |0
-<U7018> \xC3\x79 |0
-<U7019> \xF2\x5C |0
-<U701A> \xC3\x76 |0
-<U701B> \xC3\x73 |0
-<U701C> \xF2\x67 |0
-<U701D> \xC3\x77 |0
-<U701F> \xC3\x74 |0
-<U7020> \xF2\x5E |0
-<U7021> \xF2\x61 |0
-<U7022> \xF2\x62 |0
-<U7023> \xF2\x63 |0
-<U7024> \xF2\x66 |0
-<U7026> \xEF\xF5 |0
-<U7027> \xF2\x5D |0
-<U7028> \xC3\x75 |0
-<U7029> \xF2\x64 |0
-<U702A> \xF2\x68 |0
-<U702B> \xF2\x60 |0
-<U702F> \xF4\x5D |0
-<U7030> \xC4\x6A |0
-<U7031> \xF4\x60 |0
-<U7032> \xC4\x6B |0
-<U7033> \xF4\x68 |0
-<U7034> \xF4\x5F |0
-<U7035> \xF4\x5C |0
-<U7037> \xF4\x5E |0
-<U7038> \xF4\x62 |0
-<U7039> \xF4\x65 |0
-<U703A> \xF4\x64 |0
-<U703B> \xF4\x67 |0
-<U703C> \xF4\x5B |0
-<U703E> \xC4\x69 |0
-<U703F> \xF4\x63 |0
-<U7040> \xF4\x66 |0
-<U7041> \xF4\x69 |0
-<U7042> \xF4\x61 |0
-<U7043> \xF5\xD3 |0
-<U7044> \xF5\xD4 |0
-<U7045> \xF5\xD8 |0
-<U7046> \xF5\xD9 |0
-<U7048> \xF5\xD6 |0
-<U7049> \xF5\xD7 |0
-<U704A> \xF5\xD5 |0
-<U704C> \xC4\xE9 |0
-<U7051> \xC5\x78 |0
-<U7052> \xF6\xEB |0
-<U7055> \xF6\xE8 |0
-<U7056> \xF6\xE9 |0
-<U7057> \xF6\xEA |0
-<U7058> \xC5\x79 |0
-<U705A> \xF7\xE5 |0
-<U705B> \xF7\xE4 |0
-<U705D> \xF8\xAF |0
-<U705E> \xC5\xF4 |0
-<U705F> \xF8\xAD |0
-<U7060> \xF8\xB0 |0
-<U7061> \xF8\xAE |0
-<U7062> \xF8\xF5 |0
-<U7063> \xC6\x57 |0
-<U7064> \xC6\x65 |0
-<U7065> \xF9\xA3 |0
-<U7066> \xF9\x6C |0
-<U7068> \xF9\xA2 |0
-<U7069> \xF9\xD0 |0
-<U706A> \xF9\xD1 |0
-<U706B> \xA4\xF5 |0
-<U7070> \xA6\xC7 |0
-<U7071> \xCA\x41 |0
-<U7074> \xCB\x5E |0
-<U7076> \xA8\x5F |0
-<U7078> \xA8\x62 |0
-<U707A> \xCB\x5F |0
-<U707C> \xA8\x60 |0
-<U707D> \xA8\x61 |0
-<U7082> \xCD\x58 |0
-<U7083> \xCD\x5A |0
-<U7084> \xCD\x55 |0
-<U7085> \xCD\x52 |0
-<U7086> \xCD\x54 |0
-<U708A> \xAA\xA4 |0
-<U708E> \xAA\xA2 |0
-<U7091> \xCD\x56 |0
-<U7092> \xAA\xA3 |0
-<U7093> \xCD\x53 |0
-<U7094> \xCD\x50 |0
-<U7095> \xAA\xA1 |0
-<U7096> \xCD\x57 |0
-<U7098> \xCD\x51 |0
-<U7099> \xAA\xA5 |0
-<U709A> \xCD\x59 |0
-<U709F> \xCF\xAF |0
-<U70A1> \xCF\xB3 |0
-<U70A4> \xAC\xB7 |0
-<U70A9> \xCF\xB6 |0
-<U70AB> \xAC\xAF |0
-<U70AC> \xAC\xB2 |0
-<U70AD> \xAC\xB4 |0
-<U70AE> \xAC\xB6 |0
-<U70AF> \xAC\xB3 |0
-<U70B0> \xCF\xB2 |0
-<U70B1> \xCF\xB1 |0
-<U70B3> \xAC\xB1 |0
-<U70B4> \xCF\xB4 |0
-<U70B5> \xCF\xB5 |0
-<U70B7> \xCF\xAE |0
-<U70B8> \xAC\xB5 |0
-<U70BA> \xAC\xB0 |0
-<U70BE> \xCF\xB0 |0
-<U70C5> \xD2\x77 |0
-<U70C6> \xD2\x78 |0
-<U70C7> \xD2\x79 |0
-<U70C8> \xAF\x50 |0
-<U70CA> \xAF\x4C |0
-<U70CB> \xD2\x6E |0
-<U70CD> \xD2\x76 |0
-<U70CE> \xD2\x7B |0
-<U70CF> \xAF\x51 |0
-<U70D1> \xD2\x6C |0
-<U70D2> \xD2\x72 |0
-<U70D3> \xD2\x6B |0
-<U70D4> \xD2\x75 |0
-<U70D7> \xD2\x71 |0
-<U70D8> \xAF\x4D |0
-<U70D9> \xAF\x4F |0
-<U70DA> \xD2\x7A |0
-<U70DC> \xD2\x6A |0
-<U70DD> \xD2\x6D |0
-<U70DE> \xD2\x73 |0
-<U70E0> \xD2\x74 |0
-<U70E1> \xD2\x7C |0
-<U70E2> \xD2\x70 |0
-<U70E4> \xAF\x4E |0
-<U70EF> \xB2\x6D |0
-<U70F0> \xD6\x4E |0
-<U70F3> \xD6\x50 |0
-<U70F4> \xD6\x4C |0
-<U70F6> \xD6\x58 |0
-<U70F7> \xD6\x4A |0
-<U70F8> \xD6\x57 |0
-<U70F9> \xB2\x69 |0
-<U70FA> \xD6\x48 |0
-<U70FB> \xDA\x5B |0
-<U70FC> \xD6\x52 |0
-<U70FD> \xB2\x6C |0
-<U70FF> \xD6\x53 |0
-<U7100> \xD6\x56 |0
-<U7102> \xD6\x5A |0
-<U7104> \xD6\x4F |0
-<U7106> \xD6\x54 |0
-<U7109> \xB2\x6A |0
-<U710A> \xB2\x6B |0
-<U710B> \xD6\x59 |0
-<U710C> \xD6\x4D |0
-<U710D> \xD6\x49 |0
-<U710E> \xD6\x5B |0
-<U7110> \xD6\x51 |0
-<U7113> \xD6\x55 |0
-<U7117> \xD6\x4B |0
-<U7119> \xB5\x48 |0
-<U711A> \xB5\x49 |0
-<U711B> \xDA\x65 |0
-<U711C> \xB5\x4F |0
-<U711E> \xDA\x59 |0
-<U711F> \xDA\x62 |0
-<U7120> \xDA\x58 |0
-<U7121> \xB5\x4C |0
-<U7122> \xDA\x60 |0
-<U7123> \xDA\x5E |0
-<U7125> \xDA\x5F |0
-<U7126> \xB5\x4A |0
-<U7128> \xDA\x63 |0
-<U712E> \xDA\x5C |0
-<U712F> \xDA\x5A |0
-<U7130> \xB5\x4B |0
-<U7131> \xDA\x5D |0
-<U7132> \xDA\x61 |0
-<U7136> \xB5\x4D |0
-<U713A> \xDA\x64 |0
-<U7141> \xDE\x70 |0
-<U7142> \xDE\x77 |0
-<U7143> \xDE\x79 |0
-<U7144> \xDE\xA1 |0
-<U7146> \xB7\xDA |0
-<U7147> \xDE\x6B |0
-<U7149> \xB7\xD2 |0
-<U714B> \xDE\x7A |0
-<U714C> \xB7\xD7 |0
-<U714D> \xDE\xA2 |0
-<U714E> \xB7\xCE |0
-<U7150> \xDE\x7D |0
-<U7152> \xDE\x6D |0
-<U7153> \xDE\x7E |0
-<U7154> \xDE\x6C |0
-<U7156> \xB7\xDC |0
-<U7158> \xDE\x78 |0
-<U7159> \xB7\xCF |0
-<U715A> \xDE\xA3 |0
-<U715C> \xB7\xD4 |0
-<U715D> \xDE\x71 |0
-<U715E> \xB7\xD9 |0
-<U715F> \xDE\x7C |0
-<U7160> \xDE\x6F |0
-<U7161> \xDE\x76 |0
-<U7162> \xDE\x72 |0
-<U7163> \xDE\x6E |0
-<U7164> \xB7\xD1 |0
-<U7165> \xB7\xD8 |0
-<U7166> \xB7\xD6 |0
-<U7167> \xB7\xD3 |0
-<U7168> \xB7\xDB |0
-<U7169> \xB7\xD0 |0
-<U716A> \xDE\x75 |0
-<U716C> \xB7\xD5 |0
-<U716E> \xB5\x4E |0
-<U7170> \xDE\x7B |0
-<U7172> \xDE\x73 |0
-<U7178> \xDE\x74 |0
-<U717B> \xE2\xC1 |0
-<U717D> \xBA\xB4 |0
-<U7180> \xE2\xBD |0
-<U7181> \xE2\xC3 |0
-<U7182> \xE2\xBF |0
-<U7184> \xBA\xB6 |0
-<U7185> \xE2\xBE |0
-<U7186> \xE2\xC2 |0
-<U7187> \xE2\xBA |0
-<U7189> \xE2\xBC |0
-<U718A> \xBA\xB5 |0
-<U718F> \xE2\xC0 |0
-<U7190> \xE2\xBB |0
-<U7192> \xBA\xB7 |0
-<U7194> \xBA\xB2 |0
-<U7197> \xE2\xC4 |0
-<U7199> \xBA\xB3 |0
-<U719A> \xE6\x67 |0
-<U719B> \xE6\x64 |0
-<U719C> \xE6\x70 |0
-<U719D> \xE6\x6A |0
-<U719E> \xE6\x6C |0
-<U719F> \xBC\xF4 |0
-<U71A0> \xE6\x66 |0
-<U71A1> \xE6\x6E |0
-<U71A4> \xE6\x6D |0
-<U71A5> \xE6\x6B |0
-<U71A7> \xE6\x71 |0
-<U71A8> \xBC\xF7 |0
-<U71A9> \xE6\x68 |0
-<U71AA> \xE6\x6F |0
-<U71AC> \xBC\xF5 |0
-<U71AF> \xE6\x63 |0
-<U71B0> \xE6\x65 |0
-<U71B1> \xBC\xF6 |0
-<U71B2> \xE6\x62 |0
-<U71B3> \xE6\x72 |0
-<U71B5> \xE6\x69 |0
-<U71B8> \xEA\x4A |0
-<U71B9> \xBF\x51 |0
-<U71BC> \xEA\x55 |0
-<U71BD> \xEA\x53 |0
-<U71BE> \xBF\x4B |0
-<U71BF> \xEA\x49 |0
-<U71C0> \xEA\x4C |0
-<U71C1> \xEA\x4D |0
-<U71C2> \xEA\x48 |0
-<U71C3> \xBF\x55 |0
-<U71C4> \xBF\x56 |0
-<U71C5> \xEA\x47 |0
-<U71C6> \xEA\x56 |0
-<U71C7> \xEA\x51 |0
-<U71C8> \xBF\x4F |0
-<U71C9> \xBF\x4C |0
-<U71CA> \xEA\x50 |0
-<U71CB> \xEA\x4E |0
-<U71CE> \xBF\x52 |0
-<U71CF> \xEA\x52 |0
-<U71D0> \xBF\x4D |0
-<U71D2> \xBF\x4E |0
-<U71D4> \xEA\x4F |0
-<U71D5> \xBF\x50 |0
-<U71D6> \xEA\x4B |0
-<U71D8> \xEA\x54 |0
-<U71D9> \xBF\x53 |0
-<U71DA> \xEA\x57 |0
-<U71DB> \xEA\x58 |0
-<U71DC> \xBF\x54 |0
-<U71DF> \xC0\xE7 |0
-<U71E0> \xC0\xEE |0
-<U71E1> \xED\x5C |0
-<U71E2> \xED\x62 |0
-<U71E4> \xED\x60 |0
-<U71E5> \xC0\xEA |0
-<U71E6> \xC0\xE9 |0
-<U71E7> \xC0\xE6 |0
-<U71E8> \xED\x5E |0
-<U71EC> \xC0\xEC |0
-<U71ED> \xC0\xEB |0
-<U71EE> \xC0\xE8 |0
-<U71F0> \xED\x61 |0
-<U71F1> \xED\x5D |0
-<U71F2> \xED\x5F |0
-<U71F4> \xC0\xED |0
-<U71F8> \xC2\x77 |0
-<U71F9> \xEF\xFB |0
-<U71FB> \xC2\x74 |0
-<U71FC> \xC2\x75 |0
-<U71FD> \xEF\xFD |0
-<U71FE> \xC2\x76 |0
-<U71FF> \xEF\xFA |0
-<U7201> \xEF\xF9 |0
-<U7202> \xF2\x6C |0
-<U7203> \xEF\xFC |0
-<U7205> \xF2\x6D |0
-<U7206> \xC3\x7A |0
-<U7207> \xF2\x6B |0
-<U720A> \xF2\x6A |0
-<U720C> \xF2\x69 |0
-<U720D> \xC3\x7B |0
-<U7210> \xC4\x6C |0
-<U7213> \xF4\x6A |0
-<U7214> \xF4\x6B |0
-<U7219> \xF5\xDC |0
-<U721A> \xF5\xDB |0
-<U721B> \xC4\xEA |0
-<U721D> \xF5\xDA |0
-<U721E> \xF6\xEC |0
-<U721F> \xF6\xED |0
-<U7222> \xF7\xE6 |0
-<U7223> \xF8\xB1 |0
-<U7226> \xF8\xF6 |0
-<U7227> \xF9\xBC |0
-<U7228> \xC6\x79 |0
-<U7229> \xF9\xC6 |0
-<U722A> \xA4\xF6 |0
-<U722C> \xAA\xA6 |0
-<U722D> \xAA\xA7 |0
-<U7230> \xAC\xB8 |0
-<U7235> \xC0\xEF |0
-<U7236> \xA4\xF7 |0
-<U7238> \xAA\xA8 |0
-<U7239> \xAF\x52 |0
-<U723A> \xB7\xDD |0
-<U723B> \xA4\xF8 |0
-<U723D> \xB2\x6E |0
-<U723E> \xBA\xB8 |0
-<U723F> \xC9\x62 |0
-<U7241> \xCF\xB7 |0
-<U7242> \xD2\x7D |0
-<U7244> \xE2\xC5 |0
-<U7246> \xC0\xF0 |0
-<U7247> \xA4\xF9 |0
-<U7248> \xAA\xA9 |0
-<U7249> \xCF\xB8 |0
-<U724A> \xCF\xB9 |0
-<U724B> \xDA\x66 |0
-<U724C> \xB5\x50 |0
-<U724F> \xDE\xA4 |0
-<U7252> \xB7\xDE |0
-<U7253> \xE2\xC6 |0
-<U7256> \xBC\xF8 |0
-<U7258> \xC3\x7C |0
-<U7259> \xA4\xFA |0
-<U725A> \xDA\x67 |0
-<U725B> \xA4\xFB |0
-<U725D> \xA6\xC9 |0
-<U725E> \xCA\x42 |0
-<U725F> \xA6\xC8 |0
-<U7260> \xA8\x65 |0
-<U7261> \xA8\x64 |0
-<U7262> \xA8\x63 |0
-<U7263> \xCB\x60 |0
-<U7267> \xAA\xAA |0
-<U7269> \xAA\xAB |0
-<U726A> \xCD\x5B |0
-<U726C> \xCF\xBA |0
-<U726E> \xCF\xBD |0
-<U726F> \xAC\xBA |0
-<U7270> \xCF\xBB |0
-<U7272> \xAC\xB9 |0
-<U7273> \xCF\xBC |0
-<U7274> \xAC\xBB |0
-<U7276> \xD2\xA2 |0
-<U7277> \xD2\xA1 |0
-<U7278> \xD2\x7E |0
-<U7279> \xAF\x53 |0
-<U727B> \xD6\x5D |0
-<U727C> \xD6\x5E |0
-<U727D> \xB2\x6F |0
-<U727E> \xD6\x5C |0
-<U727F> \xD6\x5F |0
-<U7280> \xB5\x52 |0
-<U7281> \xB2\x70 |0
-<U7284> \xB5\x51 |0
-<U7285> \xDA\x6B |0
-<U7286> \xDA\x6A |0
-<U7288> \xDA\x68 |0
-<U7289> \xDA\x69 |0
-<U728B> \xDA\x6C |0
-<U728C> \xDE\xA6 |0
-<U728D> \xDE\xA5 |0
-<U728E> \xDE\xA9 |0
-<U7290> \xDE\xA8 |0
-<U7291> \xDE\xA7 |0
-<U7292> \xBA\xB9 |0
-<U7293> \xE2\xC9 |0
-<U7295> \xE2\xC8 |0
-<U7296> \xBA\xBA |0
-<U7297> \xE2\xC7 |0
-<U7298> \xE6\x73 |0
-<U729A> \xE6\x74 |0
-<U729B> \xBC\xF9 |0
-<U729D> \xEA\x59 |0
-<U729E> \xEA\x5A |0
-<U72A1> \xF2\x72 |0
-<U72A2> \xC3\x7D |0
-<U72A3> \xF2\x71 |0
-<U72A4> \xF2\x70 |0
-<U72A5> \xF2\x6E |0
-<U72A6> \xF2\x6F |0
-<U72A7> \xC4\xEB |0
-<U72A8> \xF4\x6C |0
-<U72A9> \xF6\xEE |0
-<U72AA> \xF8\xF7 |0
-<U72AC> \xA4\xFC |0
-<U72AE> \xC9\xA5 |0
-<U72AF> \xA5\xC7 |0
-<U72B0> \xC9\xA6 |0
-<U72B4> \xCA\x43 |0
-<U72B5> \xCA\x44 |0
-<U72BA> \xCB\x66 |0
-<U72BD> \xCB\x62 |0
-<U72BF> \xCB\x61 |0
-<U72C0> \xAA\xAC |0
-<U72C1> \xCB\x65 |0
-<U72C2> \xA8\x67 |0
-<U72C3> \xCB\x63 |0
-<U72C4> \xA8\x66 |0
-<U72C5> \xCB\x67 |0
-<U72C6> \xCB\x64 |0
-<U72C9> \xCD\x5F |0
-<U72CA> \xCF\xBE |0
-<U72CB> \xCD\x5D |0
-<U72CC> \xCD\x64 |0
-<U72CE> \xAA\xAD |0
-<U72D0> \xAA\xB0 |0
-<U72D1> \xCD\x65 |0
-<U72D2> \xCD\x61 |0
-<U72D4> \xCD\x62 |0
-<U72D6> \xCD\x5C |0
-<U72D7> \xAA\xAF |0
-<U72D8> \xCD\x5E |0
-<U72D9> \xAA\xAE |0
-<U72DA> \xCD\x63 |0
-<U72DC> \xCD\x60 |0
-<U72DF> \xCF\xC2 |0
-<U72E0> \xAC\xBD |0
-<U72E1> \xAC\xBE |0
-<U72E3> \xCF\xC5 |0
-<U72E4> \xCF\xBF |0
-<U72E6> \xCF\xC4 |0
-<U72E8> \xCF\xC0 |0
-<U72E9> \xAC\xBC |0
-<U72EA> \xCF\xC3 |0
-<U72EB> \xCF\xC1 |0
-<U72F3> \xD2\xA8 |0
-<U72F4> \xD2\xA5 |0
-<U72F6> \xD2\xA7 |0
-<U72F7> \xAF\x58 |0
-<U72F8> \xAF\x57 |0
-<U72F9> \xAF\x55 |0
-<U72FA> \xD2\xA4 |0
-<U72FB> \xD2\xA9 |0
-<U72FC> \xAF\x54 |0
-<U72FD> \xAF\x56 |0
-<U72FE> \xD2\xA6 |0
-<U72FF> \xD6\x67 |0
-<U7300> \xD2\xA3 |0
-<U7301> \xD2\xAA |0
-<U7307> \xD6\x62 |0
-<U7308> \xD6\x66 |0
-<U730A> \xD6\x65 |0
-<U730B> \xDA\x6E |0
-<U730C> \xDA\x79 |0
-<U730F> \xD6\x68 |0
-<U7311> \xD6\x63 |0
-<U7312> \xDA\x6D |0
-<U7313> \xB2\x74 |0
-<U7316> \xB2\x73 |0
-<U7317> \xD6\x61 |0
-<U7318> \xD6\x64 |0
-<U7319> \xB2\x75 |0
-<U731B> \xB2\x72 |0
-<U731C> \xB2\x71 |0
-<U731D> \xD6\x60 |0
-<U731E> \xD6\x69 |0
-<U7322> \xDA\x70 |0
-<U7323> \xDA\x77 |0
-<U7325> \xB5\x54 |0
-<U7326> \xDA\x76 |0
-<U7327> \xDA\x73 |0
-<U7329> \xB5\x56 |0
-<U732D> \xDA\x75 |0
-<U7330> \xDA\x6F |0
-<U7331> \xDA\x71 |0
-<U7332> \xDA\x74 |0
-<U7333> \xDA\x72 |0
-<U7334> \xB5\x55 |0
-<U7335> \xDA\x78 |0
-<U7336> \xB5\x53 |0
-<U7337> \xB7\xDF |0
-<U733A> \xDE\xAD |0
-<U733B> \xDE\xAC |0
-<U733C> \xDE\xAA |0
-<U733E> \xB7\xE2 |0
-<U733F> \xB7\xE1 |0
-<U7340> \xDE\xAE |0
-<U7342> \xDE\xAB |0
-<U7343> \xE2\xCA |0
-<U7344> \xBA\xBB |0
-<U7345> \xB7\xE0 |0
-<U7349> \xDE\xB0 |0
-<U734A> \xDE\xAF |0
-<U734C> \xE2\xCD |0
-<U734D> \xE2\xCB |0
-<U734E> \xBC\xFA |0
-<U7350> \xBA\xBC |0
-<U7351> \xE2\xCC |0
-<U7352> \xE6\x76 |0
-<U7357> \xBC\xFB |0
-<U7358> \xE6\x75 |0
-<U7359> \xE6\x7E |0
-<U735A> \xE6\x7D |0
-<U735B> \xE6\x7B |0
-<U735D> \xE6\x7A |0
-<U735E> \xE6\x77 |0
-<U735F> \xE6\x78 |0
-<U7360> \xE6\x79 |0
-<U7361> \xE6\x7C |0
-<U7362> \xE6\xA1 |0
-<U7365> \xEA\x5F |0
-<U7366> \xEA\x5C |0
-<U7367> \xEA\x5D |0
-<U7368> \xBF\x57 |0
-<U7369> \xEA\x5B |0
-<U736A> \xEA\x61 |0
-<U736B> \xEA\x60 |0
-<U736C> \xEA\x5E |0
-<U736E> \xED\x64 |0
-<U736F> \xED\x65 |0
-<U7370> \xC0\xF1 |0
-<U7372> \xC0\xF2 |0
-<U7373> \xED\x63 |0
-<U7375> \xC2\x79 |0
-<U7376> \xEF\xFE |0
-<U7377> \xC2\x78 |0
-<U7378> \xC3\x7E |0
-<U737A> \xC3\xA1 |0
-<U737B> \xC4\x6D |0
-<U737C> \xF4\x6E |0
-<U737D> \xF4\x6D |0
-<U737E> \xF5\xDD |0
-<U737F> \xF6\xEF |0
-<U7380> \xC5\x7A |0
-<U7381> \xF7\xE8 |0
-<U7382> \xF7\xE7 |0
-<U7383> \xF7\xE9 |0
-<U7384> \xA5\xC8 |0
-<U7385> \xCF\xC6 |0
-<U7386> \xAF\x59 |0
-<U7387> \xB2\x76 |0
-<U7388> \xD6\x6A |0
-<U7389> \xA5\xC9 |0
-<U738A> \xC9\xA7 |0
-<U738B> \xA4\xFD |0
-<U738E> \xCA\x45 |0
-<U7392> \xCB\x6C |0
-<U7393> \xCB\x6A |0
-<U7394> \xCB\x6B |0
-<U7395> \xCB\x68 |0
-<U7396> \xA8\x68 |0
-<U7397> \xCB\x69 |0
-<U739D> \xCD\x6D |0
-<U739F> \xAA\xB3 |0
-<U73A0> \xCD\x6B |0
-<U73A1> \xCD\x67 |0
-<U73A2> \xCD\x6A |0
-<U73A4> \xCD\x66 |0
-<U73A5> \xAA\xB5 |0
-<U73A6> \xCD\x69 |0
-<U73A8> \xAA\xB2 |0
-<U73A9> \xAA\xB1 |0
-<U73AB> \xAA\xB4 |0
-<U73AC> \xCD\x6C |0
-<U73AD> \xCD\x68 |0
-<U73B2> \xAC\xC2 |0
-<U73B3> \xAC\xC5 |0
-<U73B4> \xCF\xCE |0
-<U73B5> \xCF\xCD |0
-<U73B6> \xCF\xCC |0
-<U73B7> \xAC\xBF |0
-<U73B8> \xCF\xD5 |0
-<U73B9> \xCF\xCB |0
-<U73BB> \xAC\xC1 |0
-<U73BC> \xD2\xAF |0
-<U73BE> \xCF\xD2 |0
-<U73BF> \xCF\xD0 |0
-<U73C0> \xAC\xC4 |0
-<U73C2> \xCF\xC8 |0
-<U73C3> \xCF\xD3 |0
-<U73C5> \xCF\xCA |0
-<U73C6> \xCF\xD4 |0
-<U73C7> \xCF\xD1 |0
-<U73C8> \xCF\xC9 |0
-<U73CA> \xAC\xC0 |0
-<U73CB> \xCF\xD6 |0
-<U73CC> \xCF\xC7 |0
-<U73CD> \xAC\xC3 |0
-<U73D2> \xD2\xB4 |0
-<U73D3> \xD2\xAB |0
-<U73D4> \xD2\xB6 |0
-<U73D6> \xD2\xAE |0
-<U73D7> \xD2\xB9 |0
-<U73D8> \xD2\xBA |0
-<U73D9> \xD2\xAC |0
-<U73DA> \xD2\xB8 |0
-<U73DB> \xD2\xB5 |0
-<U73DC> \xD2\xB3 |0
-<U73DD> \xD2\xB7 |0
-<U73DE> \xAF\x5F |0
-<U73E0> \xAF\x5D |0
-<U73E3> \xD2\xB1 |0
-<U73E5> \xD2\xAD |0
-<U73E7> \xD2\xB0 |0
-<U73E8> \xD2\xBB |0
-<U73E9> \xD2\xB2 |0
-<U73EA> \xAF\x5E |0
-<U73EB> \xCF\xCF |0
-<U73ED> \xAF\x5A |0
-<U73EE> \xAF\x5C |0
-<U73F4> \xD6\x78 |0
-<U73F5> \xD6\x6D |0
-<U73F6> \xD6\x6B |0
-<U73F8> \xD6\x6C |0
-<U73FA> \xD6\x73 |0
-<U73FC> \xD6\x74 |0
-<U73FD> \xD6\x70 |0
-<U73FE> \xB2\x7B |0
-<U73FF> \xD6\x75 |0
-<U7400> \xD6\x72 |0
-<U7401> \xD6\x6F |0
-<U7403> \xB2\x79 |0
-<U7404> \xD6\x6E |0
-<U7405> \xB2\x77 |0
-<U7406> \xB2\x7A |0
-<U7407> \xD6\x71 |0
-<U7408> \xD6\x79 |0
-<U7409> \xAF\x5B |0
-<U740A> \xB2\x78 |0
-<U740B> \xD6\x77 |0
-<U740C> \xD6\x76 |0
-<U740D> \xB2\x7C |0
-<U7416> \xDA\x7E |0
-<U741A> \xDA\xA1 |0
-<U741B> \xB5\x60 |0
-<U741D> \xDA\xA7 |0
-<U7420> \xDA\xA9 |0
-<U7421> \xDA\xA2 |0
-<U7422> \xB5\x5A |0
-<U7423> \xDA\xA6 |0
-<U7424> \xDA\xA5 |0
-<U7425> \xB5\x5B |0
-<U7426> \xB5\x61 |0
-<U7428> \xB5\x62 |0
-<U7429> \xDA\xA8 |0
-<U742A> \xB5\x58 |0
-<U742B> \xDA\x7D |0
-<U742C> \xDA\x7B |0
-<U742D> \xDA\xA3 |0
-<U742E> \xDA\x7A |0
-<U742F> \xB5\x5F |0
-<U7430> \xDA\x7C |0
-<U7431> \xDA\xA4 |0
-<U7432> \xDA\xAA |0
-<U7433> \xB5\x59 |0
-<U7434> \xB5\x5E |0
-<U7435> \xB5\x5C |0
-<U7436> \xB5\x5D |0
-<U743A> \xB5\x57 |0
-<U743F> \xB7\xE9 |0
-<U7440> \xDE\xB7 |0
-<U7441> \xB7\xE8 |0
-<U7442> \xDE\xBB |0
-<U7444> \xDE\xB1 |0
-<U7446> \xDE\xBC |0
-<U744A> \xDE\xB2 |0
-<U744B> \xDE\xB3 |0
-<U744D> \xDE\xBD |0
-<U744E> \xDE\xBA |0
-<U744F> \xDE\xB8 |0
-<U7450> \xDE\xB9 |0
-<U7451> \xDE\xB5 |0
-<U7452> \xDE\xB4 |0
-<U7454> \xDE\xBE |0
-<U7455> \xB7\xE5 |0
-<U7457> \xDE\xB6 |0
-<U7459> \xB7\xEA |0
-<U745A> \xB7\xE4 |0
-<U745B> \xB7\xEB |0
-<U745C> \xB7\xEC |0
-<U745E> \xB7\xE7 |0
-<U745F> \xB7\xE6 |0
-<U7462> \xE2\xCE |0
-<U7463> \xBA\xBE |0
-<U7464> \xBA\xBD |0
-<U7467> \xE2\xD3 |0
-<U7469> \xBC\xFC |0
-<U746A> \xBA\xBF |0
-<U746D> \xBA\xC1 |0
-<U746E> \xE2\xD4 |0
-<U746F> \xB7\xE3 |0
-<U7470> \xBA\xC0 |0
-<U7471> \xE2\xD0 |0
-<U7472> \xE2\xD2 |0
-<U7473> \xE2\xCF |0
-<U7475> \xE2\xD1 |0
-<U7479> \xE6\xAB |0
-<U747C> \xE6\xAA |0
-<U747D> \xE6\xA7 |0
-<U747E> \xBD\x40 |0
-<U747F> \xEA\x62 |0
-<U7480> \xBD\x41 |0
-<U7481> \xE6\xA6 |0
-<U7483> \xBC\xFE |0
-<U7485> \xE6\xA8 |0
-<U7486> \xE6\xA5 |0
-<U7487> \xE6\xA2 |0
-<U7488> \xE6\xA9 |0
-<U7489> \xE6\xA3 |0
-<U748A> \xE6\xA4 |0
-<U748B> \xBC\xFD |0
-<U7490> \xED\x69 |0
-<U7492> \xEA\x66 |0
-<U7494> \xEA\x65 |0
-<U7495> \xEA\x67 |0
-<U7497> \xED\x66 |0
-<U7498> \xBF\x5A |0
-<U749A> \xEA\x63 |0
-<U749C> \xBF\x58 |0
-<U749E> \xBF\x5C |0
-<U749F> \xBF\x5B |0
-<U74A0> \xEA\x64 |0
-<U74A1> \xEA\x68 |0
-<U74A3> \xBF\x59 |0
-<U74A5> \xED\x6D |0
-<U74A6> \xC0\xF5 |0
-<U74A7> \xC2\x7A |0
-<U74A8> \xC0\xF6 |0
-<U74A9> \xC0\xF3 |0
-<U74AA> \xED\x6A |0
-<U74AB> \xED\x68 |0
-<U74AD> \xED\x6B |0
-<U74AF> \xED\x6E |0
-<U74B0> \xC0\xF4 |0
-<U74B1> \xED\x6C |0
-<U74B2> \xED\x67 |0
-<U74B5> \xF0\x42 |0
-<U74B6> \xF0\x45 |0
-<U74B7> \xF2\x75 |0
-<U74B8> \xF0\x40 |0
-<U74BA> \xF4\x6F |0
-<U74BB> \xF0\x46 |0
-<U74BD> \xC3\xA2 |0
-<U74BE> \xF0\x44 |0
-<U74BF> \xC2\x7B |0
-<U74C0> \xF0\x41 |0
-<U74C1> \xF0\x43 |0
-<U74C2> \xF0\x47 |0
-<U74C3> \xF2\x76 |0
-<U74C5> \xF2\x74 |0
-<U74CA> \xC3\xA3 |0
-<U74CB> \xF2\x73 |0
-<U74CF> \xC4\x6E |0
-<U74D4> \xC4\xED |0
-<U74D5> \xF6\xF1 |0
-<U74D6> \xC4\xEC |0
-<U74D7> \xF6\xF3 |0
-<U74D8> \xF6\xF0 |0
-<U74D9> \xF6\xF2 |0
-<U74DA> \xC5\xD0 |0
-<U74DB> \xF8\xB2 |0
-<U74DC> \xA5\xCA |0
-<U74DD> \xCD\x6E |0
-<U74DE> \xD2\xBC |0
-<U74DF> \xD2\xBD |0
-<U74E0> \xB2\x7D |0
-<U74E1> \xDE\xBF |0
-<U74E2> \xBF\x5D |0
-<U74E3> \xC3\xA4 |0
-<U74E4> \xC5\x7B |0
-<U74E5> \xF8\xB3 |0
-<U74E6> \xA5\xCB |0
-<U74E8> \xCD\x6F |0
-<U74E9> \xA2\x60 |0
-<U74EC> \xCF\xD7 |0
-<U74EE> \xCF\xD8 |0
-<U74F4> \xD2\xBE |0
-<U74F5> \xD2\xBF |0
-<U74F6> \xB2\x7E |0
-<U74F7> \xB2\xA1 |0
-<U74FB> \xDA\xAB |0
-<U74FD> \xDE\xC2 |0
-<U74FE> \xDE\xC1 |0
-<U74FF> \xDE\xC0 |0
-<U7500> \xE2\xD5 |0
-<U7502> \xE2\xD6 |0
-<U7503> \xE2\xD7 |0
-<U7504> \xBA\xC2 |0
-<U7507> \xE6\xAD |0
-<U7508> \xE6\xAC |0
-<U750B> \xEA\x69 |0
-<U750C> \xBF\x5E |0
-<U750D> \xBF\x5F |0
-<U750F> \xED\x72 |0
-<U7510> \xED\x6F |0
-<U7511> \xED\x70 |0
-<U7512> \xED\x71 |0
-<U7513> \xF0\x49 |0
-<U7514> \xF0\x48 |0
-<U7515> \xC2\x7C |0
-<U7516> \xF2\x77 |0
-<U7517> \xF5\xDE |0
-<U7518> \xA5\xCC |0
-<U751A> \xAC\xC6 |0
-<U751C> \xB2\xA2 |0
-<U751D> \xDE\xC3 |0
-<U751F> \xA5\xCD |0
-<U7521> \xD2\xC0 |0
-<U7522> \xB2\xA3 |0
-<U7525> \xB5\x63 |0
-<U7526> \xB5\x64 |0
-<U7528> \xA5\xCE |0
-<U7529> \xA5\xCF |0
-<U752A> \xCA\x46 |0
-<U752B> \xA8\x6A |0
-<U752C> \xA8\x69 |0
-<U752D> \xAC\xC7 |0
-<U752E> \xCF\xD9 |0
-<U752F> \xDA\xAC |0
-<U7530> \xA5\xD0 |0
-<U7531> \xA5\xD1 |0
-<U7532> \xA5\xD2 |0
-<U7533> \xA5\xD3 |0
-<U7537> \xA8\x6B |0
-<U7538> \xA8\x6C |0
-<U7539> \xCB\x6E |0
-<U753A> \xCB\x6D |0
-<U753D> \xAA\xB6 |0
-<U753E> \xCD\x72 |0
-<U753F> \xCD\x70 |0
-<U7540> \xCD\x71 |0
-<U7547> \xCF\xDA |0
-<U7548> \xCF\xDB |0
-<U754B> \xAC\xCB |0
-<U754C> \xAC\xC9 |0
-<U754E> \xAC\xCA |0
-<U754F> \xAC\xC8 |0
-<U7554> \xAF\x60 |0
-<U7559> \xAF\x64 |0
-<U755A> \xAF\x63 |0
-<U755B> \xD2\xC1 |0
-<U755C> \xAF\x62 |0
-<U755D> \xAF\x61 |0
-<U755F> \xD2\xC2 |0
-<U7562> \xB2\xA6 |0
-<U7563> \xD6\x7B |0
-<U7564> \xD6\x7A |0
-<U7565> \xB2\xA4 |0
-<U7566> \xB2\xA5 |0
-<U756A> \xB5\x66 |0
-<U756B> \xB5\x65 |0
-<U756C> \xDA\xAE |0
-<U756F> \xDA\xAD |0
-<U7570> \xB2\xA7 |0
-<U7576> \xB7\xED |0
-<U7577> \xDE\xC5 |0
-<U7578> \xB7\xEE |0
-<U7579> \xDE\xC4 |0
-<U757D> \xE2\xD8 |0
-<U757E> \xE6\xAE |0
-<U757F> \xBD\x42 |0
-<U7580> \xEA\x6A |0
-<U7584> \xED\x73 |0
-<U7586> \xC3\xA6 |0
-<U7587> \xC3\xA5 |0
-<U758A> \xC5\x7C |0
-<U758B> \xA5\xD4 |0
-<U758C> \xCD\x73 |0
-<U758F> \xB2\xA8 |0
-<U7590> \xE2\xD9 |0
-<U7591> \xBA\xC3 |0
-<U7594> \xCB\x6F |0
-<U7595> \xCB\x70 |0
-<U7598> \xCD\x74 |0
-<U7599> \xAA\xB8 |0
-<U759A> \xAA\xB9 |0
-<U759D> \xAA\xB7 |0
-<U75A2> \xAC\xCF |0
-<U75A3> \xAC\xD0 |0
-<U75A4> \xAC\xCD |0
-<U75A5> \xAC\xCE |0
-<U75A7> \xCF\xDC |0
-<U75AA> \xCF\xDD |0
-<U75AB> \xAC\xCC |0
-<U75B0> \xD2\xC3 |0
-<U75B2> \xAF\x68 |0
-<U75B3> \xAF\x69 |0
-<U75B5> \xB2\xAB |0
-<U75B6> \xD2\xC9 |0
-<U75B8> \xAF\x6E |0
-<U75B9> \xAF\x6C |0
-<U75BA> \xD2\xCA |0
-<U75BB> \xD2\xC5 |0
-<U75BC> \xAF\x6B |0
-<U75BD> \xAF\x6A |0
-<U75BE> \xAF\x65 |0
-<U75BF> \xD2\xC8 |0
-<U75C0> \xD2\xC7 |0
-<U75C1> \xD2\xC4 |0
-<U75C2> \xAF\x6D |0
-<U75C4> \xD2\xC6 |0
-<U75C5> \xAF\x66 |0
-<U75C7> \xAF\x67 |0
-<U75CA> \xB2\xAC |0
-<U75CB> \xD6\xA1 |0
-<U75CC> \xD6\xA2 |0
-<U75CD> \xB2\xAD |0
-<U75CE> \xD6\x7C |0
-<U75CF> \xD6\x7E |0
-<U75D0> \xD6\xA4 |0
-<U75D1> \xD6\xA3 |0
-<U75D2> \xD6\x7D |0
-<U75D4> \xB2\xA9 |0
-<U75D5> \xB2\xAA |0
-<U75D7> \xDA\xB6 |0
-<U75D8> \xB5\x6B |0
-<U75D9> \xB5\x6A |0
-<U75DA> \xDA\xB0 |0
-<U75DB> \xB5\x68 |0
-<U75DD> \xDA\xB3 |0
-<U75DE> \xB5\x6C |0
-<U75DF> \xDA\xB4 |0
-<U75E0> \xB5\x6D |0
-<U75E1> \xDA\xB1 |0
-<U75E2> \xB5\x67 |0
-<U75E3> \xB5\x69 |0
-<U75E4> \xDA\xB5 |0
-<U75E6> \xDA\xB2 |0
-<U75E7> \xDA\xAF |0
-<U75ED> \xDE\xD2 |0
-<U75EF> \xDE\xC7 |0
-<U75F0> \xB7\xF0 |0
-<U75F1> \xB7\xF3 |0
-<U75F2> \xB7\xF2 |0
-<U75F3> \xB7\xF7 |0
-<U75F4> \xB7\xF6 |0
-<U75F5> \xDE\xD3 |0
-<U75F6> \xDE\xD1 |0
-<U75F7> \xDE\xCA |0
-<U75F8> \xDE\xCE |0
-<U75F9> \xDE\xCD |0
-<U75FA> \xB7\xF4 |0
-<U75FB> \xDE\xD0 |0
-<U75FC> \xDE\xCC |0
-<U75FD> \xDE\xD4 |0
-<U75FE> \xDE\xCB |0
-<U75FF> \xB7\xF5 |0
-<U7600> \xB7\xEF |0
-<U7601> \xB7\xF1 |0
-<U7603> \xDE\xC9 |0
-<U7608> \xE2\xDB |0
-<U7609> \xBA\xC7 |0
-<U760A> \xE2\xDF |0
-<U760B> \xBA\xC6 |0
-<U760C> \xE2\xDC |0
-<U760D> \xBA\xC5 |0
-<U760F> \xDE\xC8 |0
-<U7610> \xDE\xCF |0
-<U7611> \xE2\xDE |0
-<U7613> \xBA\xC8 |0
-<U7614> \xE2\xE0 |0
-<U7615> \xE2\xDD |0
-<U7616> \xE2\xDA |0
-<U7619> \xE6\xB1 |0
-<U761A> \xE6\xB5 |0
-<U761B> \xE6\xB7 |0
-<U761C> \xE6\xB3 |0
-<U761D> \xE6\xB2 |0
-<U761E> \xE6\xB0 |0
-<U761F> \xBD\x45 |0
-<U7620> \xBD\x43 |0
-<U7621> \xBD\x48 |0
-<U7622> \xBD\x49 |0
-<U7623> \xE6\xB4 |0
-<U7624> \xBD\x46 |0
-<U7625> \xE6\xAF |0
-<U7626> \xBD\x47 |0
-<U7627> \xBA\xC4 |0
-<U7628> \xE6\xB6 |0
-<U7629> \xBD\x44 |0
-<U762D> \xEA\x6C |0
-<U762F> \xEA\x6B |0
-<U7630> \xEA\x73 |0
-<U7631> \xEA\x6D |0
-<U7632> \xEA\x72 |0
-<U7633> \xEA\x6F |0
-<U7634> \xBF\x60 |0
-<U7635> \xEA\x71 |0
-<U7638> \xBF\x61 |0
-<U763A> \xBF\x62 |0
-<U763C> \xEA\x70 |0
-<U763D> \xEA\x6E |0
-<U7642> \xC0\xF8 |0
-<U7643> \xED\x74 |0
-<U7646> \xC0\xF7 |0
-<U7647> \xED\x77 |0
-<U7648> \xED\x75 |0
-<U7649> \xED\x76 |0
-<U764C> \xC0\xF9 |0
-<U7650> \xF0\x4D |0
-<U7652> \xC2\xA1 |0
-<U7653> \xF0\x4E |0
-<U7656> \xC2\x7D |0
-<U7657> \xF0\x4F |0
-<U7658> \xC2\x7E |0
-<U7659> \xF0\x4C |0
-<U765A> \xF0\x50 |0
-<U765C> \xF0\x4A |0
-<U765F> \xC3\xA7 |0
-<U7660> \xF2\x78 |0
-<U7661> \xC3\xA8 |0
-<U7662> \xC4\x6F |0
-<U7664> \xF0\x4B |0
-<U7665> \xC4\x70 |0
-<U7669> \xC4\xEE |0
-<U766A> \xF5\xDF |0
-<U766C> \xC5\x7E |0
-<U766D> \xF6\xF4 |0
-<U766E> \xC5\x7D |0
-<U7670> \xF7\xEA |0
-<U7671> \xC5\xF5 |0
-<U7672> \xC5\xF6 |0
-<U7675> \xF9\xCC |0
-<U7678> \xAC\xD1 |0
-<U7679> \xCF\xDE |0
-<U767B> \xB5\x6E |0
-<U767C> \xB5\x6F |0
-<U767D> \xA5\xD5 |0
-<U767E> \xA6\xCA |0
-<U767F> \xCA\x47 |0
-<U7681> \xCB\x71 |0
-<U7682> \xA8\x6D |0
-<U7684> \xAA\xBA |0
-<U7686> \xAC\xD2 |0
-<U7687> \xAC\xD3 |0
-<U7688> \xAC\xD4 |0
-<U7689> \xD6\xA6 |0
-<U768A> \xD2\xCB |0
-<U768B> \xAF\x6F |0
-<U768E> \xB2\xAE |0
-<U768F> \xD6\xA5 |0
-<U7692> \xDA\xB8 |0
-<U7693> \xB5\x71 |0
-<U7695> \xDA\xB7 |0
-<U7696> \xB5\x70 |0
-<U7699> \xDE\xD5 |0
-<U769A> \xBD\x4A |0
-<U769B> \xE6\xBB |0
-<U769C> \xE6\xB8 |0
-<U769D> \xE6\xB9 |0
-<U769E> \xE6\xBA |0
-<U76A4> \xED\x78 |0
-<U76A6> \xF0\x51 |0
-<U76AA> \xF4\x71 |0
-<U76AB> \xF4\x70 |0
-<U76AD> \xF6\xF5 |0
-<U76AE> \xA5\xD6 |0
-<U76AF> \xCD\x75 |0
-<U76B0> \xAF\x70 |0
-<U76B4> \xB5\x72 |0
-<U76B5> \xDE\xD6 |0
-<U76B8> \xE2\xE1 |0
-<U76BA> \xBD\x4B |0
-<U76BB> \xEA\x74 |0
-<U76BD> \xF0\x52 |0
-<U76BE> \xF4\x72 |0
-<U76BF> \xA5\xD7 |0
-<U76C2> \xAA\xBB |0
-<U76C3> \xAC\xD7 |0
-<U76C4> \xCF\xDF |0
-<U76C5> \xAC\xD8 |0
-<U76C6> \xAC\xD6 |0
-<U76C8> \xAC\xD5 |0
-<U76C9> \xD2\xCC |0
-<U76CA> \xAF\x71 |0
-<U76CD> \xAF\x72 |0
-<U76CE> \xAF\x73 |0
-<U76D2> \xB2\xB0 |0
-<U76D3> \xD6\xA7 |0
-<U76D4> \xB2\xAF |0
-<U76DA> \xDA\xB9 |0
-<U76DB> \xB2\xB1 |0
-<U76DC> \xB5\x73 |0
-<U76DD> \xDE\xD7 |0
-<U76DE> \xB7\xF8 |0
-<U76DF> \xB7\xF9 |0
-<U76E1> \xBA\xC9 |0
-<U76E3> \xBA\xCA |0
-<U76E4> \xBD\x4C |0
-<U76E5> \xBF\x64 |0
-<U76E6> \xEA\x75 |0
-<U76E7> \xBF\x63 |0
-<U76E9> \xED\x79 |0
-<U76EA> \xC0\xFA |0
-<U76EC> \xF0\x53 |0
-<U76ED> \xF4\x73 |0
-<U76EE> \xA5\xD8 |0
-<U76EF> \xA8\x6E |0
-<U76F0> \xCD\x78 |0
-<U76F1> \xCD\x77 |0
-<U76F2> \xAA\xBC |0
-<U76F3> \xCD\x76 |0
-<U76F4> \xAA\xBD |0
-<U76F5> \xCD\x79 |0
-<U76F7> \xCF\xE5 |0
-<U76F8> \xAC\xDB |0
-<U76F9> \xAC\xDA |0
-<U76FA> \xCF\xE7 |0
-<U76FB> \xCF\xE6 |0
-<U76FC> \xAC\xDF |0
-<U76FE> \xAC\xDE |0
-<U7701> \xAC\xD9 |0
-<U7703> \xCF\xE1 |0
-<U7704> \xCF\xE2 |0
-<U7705> \xCF\xE3 |0
-<U7707> \xAC\xE0 |0
-<U7708> \xCF\xE0 |0
-<U7709> \xAC\xDC |0
-<U770A> \xCF\xE4 |0
-<U770B> \xAC\xDD |0
-<U7710> \xD2\xCF |0
-<U7711> \xD2\xD3 |0
-<U7712> \xD2\xD1 |0
-<U7713> \xD2\xD0 |0
-<U7715> \xD2\xD4 |0
-<U7719> \xD2\xD5 |0
-<U771A> \xD2\xD6 |0
-<U771B> \xD2\xCE |0
-<U771D> \xD2\xCD |0
-<U771F> \xAF\x75 |0
-<U7720> \xAF\x76 |0
-<U7722> \xD2\xD7 |0
-<U7723> \xD2\xD2 |0
-<U7725> \xD6\xB0 |0
-<U7727> \xD2\xD8 |0
-<U7728> \xAF\x77 |0
-<U7729> \xAF\x74 |0
-<U772D> \xD6\xAA |0
-<U772F> \xD6\xA9 |0
-<U7731> \xD6\xAB |0
-<U7732> \xD6\xAC |0
-<U7733> \xD6\xAE |0
-<U7734> \xD6\xAD |0
-<U7735> \xD6\xB2 |0
-<U7736> \xB2\xB5 |0
-<U7737> \xB2\xB2 |0
-<U7738> \xB2\xB6 |0
-<U7739> \xD6\xA8 |0
-<U773A> \xB2\xB7 |0
-<U773B> \xD6\xB1 |0
-<U773C> \xB2\xB4 |0
-<U773D> \xD6\xAF |0
-<U773E> \xB2\xB3 |0
-<U7744> \xDA\xBC |0
-<U7745> \xDA\xBE |0
-<U7746> \xDA\xBA |0
-<U7747> \xDA\xBB |0
-<U774A> \xDA\xBF |0
-<U774B> \xDA\xC1 |0
-<U774C> \xDA\xC2 |0
-<U774D> \xDA\xBD |0
-<U774E> \xDA\xC0 |0
-<U774F> \xB5\x74 |0
-<U7752> \xDE\xDB |0
-<U7754> \xDE\xE0 |0
-<U7755> \xDE\xD8 |0
-<U7756> \xDE\xDC |0
-<U7759> \xDE\xE1 |0
-<U775A> \xDE\xDD |0
-<U775B> \xB7\xFA |0
-<U775C> \xB8\x43 |0
-<U775E> \xB7\xFD |0
-<U775F> \xDE\xD9 |0
-<U7760> \xDE\xDA |0
-<U7761> \xBA\xCE |0
-<U7762> \xB8\x46 |0
-<U7763> \xB7\xFE |0
-<U7765> \xB8\x44 |0
-<U7766> \xB7\xFC |0
-<U7767> \xDE\xDF |0
-<U7768> \xB8\x45 |0
-<U7769> \xDE\xDE |0
-<U776A> \xB8\x41 |0
-<U776B> \xB7\xFB |0
-<U776C> \xB8\x42 |0
-<U776D> \xDE\xE2 |0
-<U776E> \xE2\xE6 |0
-<U776F> \xE2\xE8 |0
-<U7779> \xB8\x40 |0
-<U777C> \xE2\xE3 |0
-<U777D> \xBA\xCC |0
-<U777E> \xE2\xE9 |0
-<U777F> \xBA\xCD |0
-<U7780> \xE2\xE7 |0
-<U7781> \xE2\xE2 |0
-<U7782> \xE2\xE5 |0
-<U7783> \xE2\xEA |0
-<U7784> \xBA\xCB |0
-<U7785> \xE2\xE4 |0
-<U7787> \xBD\x4E |0
-<U7788> \xE6\xBF |0
-<U7789> \xE6\xBE |0
-<U778B> \xBD\x51 |0
-<U778C> \xBD\x4F |0
-<U778D> \xE6\xBC |0
-<U778E> \xBD\x4D |0
-<U778F> \xE6\xBD |0
-<U7791> \xBD\x50 |0
-<U7795> \xEA\x7D |0
-<U7797> \xEA\xA1 |0
-<U7799> \xEA\x7E |0
-<U779A> \xEA\x76 |0
-<U779B> \xEA\x7A |0
-<U779C> \xEA\x79 |0
-<U779D> \xEA\x77 |0
-<U779E> \xBF\x66 |0
-<U779F> \xBF\x67 |0
-<U77A0> \xBF\x65 |0
-<U77A1> \xEA\x78 |0
-<U77A2> \xEA\x7B |0
-<U77A3> \xEA\x7C |0
-<U77A5> \xBF\x68 |0
-<U77A7> \xC1\x40 |0
-<U77A8> \xED\xA3 |0
-<U77AA> \xC0\xFC |0
-<U77AB> \xED\x7B |0
-<U77AC> \xC0\xFE |0
-<U77AD> \xC1\x41 |0
-<U77B0> \xC0\xFD |0
-<U77B1> \xED\xA2 |0
-<U77B2> \xED\x7C |0
-<U77B3> \xC0\xFB |0
-<U77B4> \xED\xA1 |0
-<U77B5> \xED\x7A |0
-<U77B6> \xED\x7E |0
-<U77B7> \xED\x7D |0
-<U77BA> \xF0\x55 |0
-<U77BB> \xC2\xA4 |0
-<U77BC> \xC2\xA5 |0
-<U77BD> \xC2\xA2 |0
-<U77BF> \xC2\xA3 |0
-<U77C2> \xF0\x54 |0
-<U77C4> \xF2\x7B |0
-<U77C7> \xC3\xA9 |0
-<U77C9> \xF2\x79 |0
-<U77CA> \xF2\x7A |0
-<U77CC> \xF4\x74 |0
-<U77CD> \xF4\x77 |0
-<U77CE> \xF4\x75 |0
-<U77CF> \xF4\x76 |0
-<U77D0> \xF5\xE0 |0
-<U77D3> \xC4\xEF |0
-<U77D4> \xF7\xEB |0
-<U77D5> \xF8\xB4 |0
-<U77D7> \xC5\xF7 |0
-<U77D8> \xF8\xF8 |0
-<U77D9> \xF8\xF9 |0
-<U77DA> \xC6\x66 |0
-<U77DB> \xA5\xD9 |0
-<U77DC> \xAC\xE1 |0
-<U77DE> \xDA\xC3 |0
-<U77E0> \xDE\xE3 |0
-<U77E2> \xA5\xDA |0
-<U77E3> \xA8\x6F |0
-<U77E5> \xAA\xBE |0
-<U77E7> \xCF\xE8 |0
-<U77E8> \xCF\xE9 |0
-<U77E9> \xAF\x78 |0
-<U77EC> \xDA\xC4 |0
-<U77ED> \xB5\x75 |0
-<U77EE> \xB8\x47 |0
-<U77EF> \xC1\x42 |0
-<U77F0> \xED\xA4 |0
-<U77F1> \xF2\x7C |0
-<U77F2> \xF4\x78 |0
-<U77F3> \xA5\xDB |0
-<U77F7> \xCD\xA1 |0
-<U77F8> \xCD\x7A |0
-<U77F9> \xCD\x7C |0
-<U77FA> \xCD\x7E |0
-<U77FB> \xCD\x7D |0
-<U77FC> \xCD\x7B |0
-<U77FD> \xAA\xBF |0
-<U7802> \xAC\xE2 |0
-<U7803> \xCF\xF2 |0
-<U7805> \xCF\xED |0
-<U7806> \xCF\xEA |0
-<U7809> \xCF\xF1 |0
-<U780C> \xAC\xE4 |0
-<U780D> \xAC\xE5 |0
-<U780E> \xCF\xF0 |0
-<U780F> \xCF\xEF |0
-<U7810> \xCF\xEE |0
-<U7811> \xCF\xEB |0
-<U7812> \xCF\xEC |0
-<U7813> \xCF\xF3 |0
-<U7814> \xAC\xE3 |0
-<U781D> \xAF\x7C |0
-<U781F> \xAF\xA4 |0
-<U7820> \xAF\xA3 |0
-<U7821> \xD2\xE1 |0
-<U7822> \xD2\xDB |0
-<U7823> \xD2\xD9 |0
-<U7825> \xAF\xA1 |0
-<U7826> \xD6\xB9 |0
-<U7827> \xAF\x7A |0
-<U7828> \xD2\xDE |0
-<U7829> \xD2\xE2 |0
-<U782A> \xD2\xE4 |0
-<U782B> \xD2\xE0 |0
-<U782C> \xD2\xDA |0
-<U782D> \xAF\xA2 |0
-<U782E> \xD2\xDF |0
-<U782F> \xD2\xDD |0
-<U7830> \xAF\x79 |0
-<U7831> \xD2\xE5 |0
-<U7832> \xAF\xA5 |0
-<U7833> \xD2\xE3 |0
-<U7834> \xAF\x7D |0
-<U7835> \xD2\xDC |0
-<U7837> \xAF\x7E |0
-<U7838> \xAF\x7B |0
-<U7843> \xB2\xB9 |0
-<U7845> \xD6\xBA |0
-<U7848> \xD6\xB3 |0
-<U7849> \xD6\xB5 |0
-<U784A> \xD6\xB7 |0
-<U784C> \xD6\xB8 |0
-<U784D> \xD6\xB6 |0
-<U784E> \xB2\xBA |0
-<U7850> \xD6\xBB |0
-<U7852> \xD6\xB4 |0
-<U785C> \xDA\xC8 |0
-<U785D> \xB5\x76 |0
-<U785E> \xDA\xD0 |0
-<U7860> \xDA\xC5 |0
-<U7862> \xDA\xD1 |0
-<U7864> \xDA\xC6 |0
-<U7865> \xDA\xC7 |0
-<U7868> \xDA\xCF |0
-<U7869> \xDA\xCE |0
-<U786A> \xDA\xCB |0
-<U786B> \xB2\xB8 |0
-<U786C> \xB5\x77 |0
-<U786D> \xDA\xC9 |0
-<U786E> \xDA\xCC |0
-<U786F> \xB5\x78 |0
-<U7870> \xDA\xCD |0
-<U7871> \xDA\xCA |0
-<U7879> \xDE\xEE |0
-<U787B> \xDE\xF2 |0
-<U787C> \xB8\x4E |0
-<U787E> \xE2\xF0 |0
-<U787F> \xB8\x51 |0
-<U7880> \xDE\xF0 |0
-<U7881> \xF9\xD6 |0
-<U7883> \xDE\xED |0
-<U7884> \xDE\xE8 |0
-<U7885> \xDE\xEA |0
-<U7886> \xDE\xEB |0
-<U7887> \xDE\xE4 |0
-<U7889> \xB8\x4D |0
-<U788C> \xB8\x4C |0
-<U788E> \xB8\x48 |0
-<U788F> \xDE\xE7 |0
-<U7891> \xB8\x4F |0
-<U7893> \xB8\x50 |0
-<U7894> \xDE\xE6 |0
-<U7895> \xDE\xE9 |0
-<U7896> \xDE\xF1 |0
-<U7897> \xB8\x4A |0
-<U7898> \xB8\x4B |0
-<U7899> \xDE\xEF |0
-<U789A> \xDE\xE5 |0
-<U789E> \xE2\xF2 |0
-<U789F> \xBA\xD0 |0
-<U78A0> \xE2\xF4 |0
-<U78A1> \xDE\xEC |0
-<U78A2> \xE2\xF6 |0
-<U78A3> \xBA\xD4 |0
-<U78A4> \xE2\xF7 |0
-<U78A5> \xE2\xF3 |0
-<U78A7> \xBA\xD1 |0
-<U78A8> \xE2\xEF |0
-<U78A9> \xBA\xD3 |0
-<U78AA> \xE2\xEC |0
-<U78AB> \xE2\xF1 |0
-<U78AC> \xE2\xF5 |0
-<U78AD> \xE2\xEE |0
-<U78B0> \xB8\x49 |0
-<U78B2> \xE2\xEB |0
-<U78B3> \xBA\xD2 |0
-<U78B4> \xE2\xED |0
-<U78BA> \xBD\x54 |0
-<U78BB> \xE6\xC1 |0
-<U78BC> \xBD\x58 |0
-<U78BE> \xBD\x56 |0
-<U78C1> \xBA\xCF |0
-<U78C3> \xE6\xC8 |0
-<U78C4> \xE6\xC9 |0
-<U78C5> \xBD\x53 |0
-<U78C8> \xE6\xC7 |0
-<U78C9> \xE6\xCA |0
-<U78CA> \xBD\x55 |0
-<U78CB> \xBD\x52 |0
-<U78CC> \xE6\xC3 |0
-<U78CD> \xE6\xC0 |0
-<U78CE> \xE6\xC5 |0
-<U78CF> \xE6\xC2 |0
-<U78D0> \xBD\x59 |0
-<U78D1> \xE6\xC4 |0
-<U78D4> \xE6\xC6 |0
-<U78D5> \xBD\x57 |0
-<U78DA> \xBF\x6A |0
-<U78DB> \xEA\xA8 |0
-<U78DD> \xEA\xA2 |0
-<U78DE> \xEA\xA6 |0
-<U78DF> \xEA\xAC |0
-<U78E0> \xEA\xAD |0
-<U78E1> \xEA\xA9 |0
-<U78E2> \xEA\xAA |0
-<U78E3> \xEA\xA7 |0
-<U78E5> \xEA\xA4 |0
-<U78E7> \xBF\x6C |0
-<U78E8> \xBF\x69 |0
-<U78E9> \xEA\xA3 |0
-<U78EA> \xEA\xA5 |0
-<U78EC> \xBF\x6B |0
-<U78ED> \xEA\xAB |0
-<U78EF> \xC1\x46 |0
-<U78F2> \xED\xAA |0
-<U78F3> \xED\xA5 |0
-<U78F4> \xC1\x45 |0
-<U78F7> \xC1\x43 |0
-<U78F9> \xED\xAC |0
-<U78FA> \xC1\x44 |0
-<U78FB> \xED\xA8 |0
-<U78FC> \xED\xA9 |0
-<U78FD> \xED\xA6 |0
-<U78FE> \xED\xAD |0
-<U78FF> \xF0\x56 |0
-<U7901> \xC1\x47 |0
-<U7902> \xED\xA7 |0
-<U7904> \xED\xAE |0
-<U7905> \xED\xAB |0
-<U7909> \xF0\x5A |0
-<U790C> \xF0\x57 |0
-<U790E> \xC2\xA6 |0
-<U7910> \xF0\x5B |0
-<U7911> \xF0\x5D |0
-<U7912> \xF0\x5C |0
-<U7913> \xF0\x58 |0
-<U7914> \xF0\x59 |0
-<U7917> \xF2\xA3 |0
-<U7919> \xC3\xAA |0
-<U791B> \xF2\x7E |0
-<U791C> \xF2\xA2 |0
-<U791D> \xF2\x7D |0
-<U791E> \xF2\xA4 |0
-<U7921> \xF2\xA1 |0
-<U7923> \xF4\x7A |0
-<U7924> \xF4\x7D |0
-<U7925> \xF4\x79 |0
-<U7926> \xC4\x71 |0
-<U7927> \xF4\x7B |0
-<U7928> \xF4\x7C |0
-<U7929> \xF4\x7E |0
-<U792A> \xC4\x72 |0
-<U792B> \xC4\x74 |0
-<U792C> \xC4\x73 |0
-<U792D> \xF5\xE1 |0
-<U792F> \xF5\xE3 |0
-<U7931> \xF5\xE2 |0
-<U7935> \xF6\xF6 |0
-<U7938> \xF8\xB5 |0
-<U7939> \xF8\xFA |0
-<U793A> \xA5\xDC |0
-<U793D> \xCB\x72 |0
-<U793E> \xAA\xC0 |0
-<U793F> \xCD\xA3 |0
-<U7940> \xAA\xC1 |0
-<U7941> \xAA\xC2 |0
-<U7942> \xCD\xA2 |0
-<U7944> \xCF\xF8 |0
-<U7945> \xCF\xF7 |0
-<U7946> \xAC\xE6 |0
-<U7947> \xAC\xE9 |0
-<U7948> \xAC\xE8 |0
-<U7949> \xAC\xE7 |0
-<U794A> \xCF\xF4 |0
-<U794B> \xCF\xF6 |0
-<U794C> \xCF\xF5 |0
-<U794F> \xD2\xE8 |0
-<U7950> \xAF\xA7 |0
-<U7951> \xD2\xEC |0
-<U7952> \xD2\xEB |0
-<U7953> \xD2\xEA |0
-<U7954> \xD2\xE6 |0
-<U7955> \xAF\xA6 |0
-<U7956> \xAF\xAA |0
-<U7957> \xAF\xAD |0
-<U795A> \xAF\xAE |0
-<U795B> \xD2\xE7 |0
-<U795C> \xD2\xE9 |0
-<U795D> \xAF\xAC |0
-<U795E> \xAF\xAB |0
-<U795F> \xAF\xA9 |0
-<U7960> \xAF\xA8 |0
-<U7961> \xD6\xC2 |0
-<U7963> \xD6\xC0 |0
-<U7964> \xD6\xBC |0
-<U7965> \xB2\xBB |0
-<U7967> \xD6\xBD |0
-<U7968> \xB2\xBC |0
-<U7969> \xD6\xBE |0
-<U796A> \xD6\xBF |0
-<U796B> \xD6\xC1 |0
-<U796D> \xB2\xBD |0
-<U7970> \xDA\xD5 |0
-<U7972> \xDA\xD4 |0
-<U7973> \xDA\xD3 |0
-<U7974> \xDA\xD2 |0
-<U7979> \xDE\xF6 |0
-<U797A> \xB8\x52 |0
-<U797C> \xDE\xF3 |0
-<U797D> \xDE\xF5 |0
-<U797F> \xB8\x53 |0
-<U7981> \xB8\x54 |0
-<U7982> \xDE\xF4 |0
-<U7988> \xE3\x41 |0
-<U798A> \xE2\xF9 |0
-<U798B> \xE2\xFA |0
-<U798D> \xBA\xD7 |0
-<U798E> \xBA\xD5 |0
-<U798F> \xBA\xD6 |0
-<U7990> \xE3\x43 |0
-<U7992> \xE3\x42 |0
-<U7993> \xE2\xFE |0
-<U7994> \xE2\xFD |0
-<U7995> \xE2\xFC |0
-<U7996> \xE2\xFB |0
-<U7997> \xE3\x40 |0
-<U7998> \xE2\xF8 |0
-<U799A> \xE6\xCB |0
-<U799B> \xE6\xD0 |0
-<U799C> \xE6\xCE |0
-<U79A0> \xE6\xCD |0
-<U79A1> \xE6\xCC |0
-<U79A2> \xE6\xCF |0
-<U79A4> \xEA\xAE |0
-<U79A6> \xBF\x6D |0
-<U79A7> \xC1\x48 |0
-<U79A8> \xED\xB0 |0
-<U79AA> \xC1\x49 |0
-<U79AB> \xED\xAF |0
-<U79AC> \xF0\x5F |0
-<U79AD> \xF0\x5E |0
-<U79AE> \xC2\xA7 |0
-<U79B0> \xF2\xA5 |0
-<U79B1> \xC3\xAB |0
-<U79B2> \xF4\xA1 |0
-<U79B3> \xC5\xA1 |0
-<U79B4> \xF6\xF7 |0
-<U79B6> \xF8\xB7 |0
-<U79B7> \xF8\xB6 |0
-<U79B8> \xC9\xA8 |0
-<U79B9> \xAC\xEA |0
-<U79BA> \xAC\xEB |0
-<U79BB> \xD6\xC3 |0
-<U79BD> \xB8\x56 |0
-<U79BE> \xA5\xDD |0
-<U79BF> \xA8\x72 |0
-<U79C0> \xA8\x71 |0
-<U79C1> \xA8\x70 |0
-<U79C5> \xCD\xA4 |0
-<U79C8> \xAA\xC4 |0
-<U79C9> \xAA\xC3 |0
-<U79CB> \xAC\xEE |0
-<U79CD> \xCF\xFA |0
-<U79CE> \xCF\xFD |0
-<U79CF> \xCF\xFB |0
-<U79D1> \xAC\xEC |0
-<U79D2> \xAC\xED |0
-<U79D5> \xCF\xF9 |0
-<U79D6> \xCF\xFC |0
-<U79D8> \xAF\xB5 |0
-<U79DC> \xD2\xF3 |0
-<U79DD> \xD2\xF5 |0
-<U79DE> \xD2\xF4 |0
-<U79DF> \xAF\xB2 |0
-<U79E0> \xD2\xEF |0
-<U79E3> \xAF\xB0 |0
-<U79E4> \xAF\xAF |0
-<U79E6> \xAF\xB3 |0
-<U79E7> \xAF\xB1 |0
-<U79E9> \xAF\xB4 |0
-<U79EA> \xD2\xF2 |0
-<U79EB> \xD2\xED |0
-<U79EC> \xD2\xEE |0
-<U79ED> \xD2\xF1 |0
-<U79EE> \xD2\xF0 |0
-<U79F6> \xD6\xC6 |0
-<U79F7> \xD6\xC7 |0
-<U79F8> \xD6\xC5 |0
-<U79FA> \xD6\xC4 |0
-<U79FB> \xB2\xBE |0
-<U7A00> \xB5\x7D |0
-<U7A02> \xDA\xD6 |0
-<U7A03> \xDA\xD8 |0
-<U7A04> \xDA\xDA |0
-<U7A05> \xB5\x7C |0
-<U7A08> \xB5\x7A |0
-<U7A0A> \xDA\xD7 |0
-<U7A0B> \xB5\x7B |0
-<U7A0C> \xDA\xD9 |0
-<U7A0D> \xB5\x79 |0
-<U7A10> \xDF\x41 |0
-<U7A11> \xDE\xF7 |0
-<U7A12> \xDE\xFA |0
-<U7A13> \xDE\xFE |0
-<U7A14> \xB8\x5A |0
-<U7A15> \xDE\xFC |0
-<U7A17> \xDE\xFB |0
-<U7A18> \xDE\xF8 |0
-<U7A19> \xDE\xF9 |0
-<U7A1A> \xB8\x58 |0
-<U7A1B> \xDF\x40 |0
-<U7A1C> \xB8\x57 |0
-<U7A1E> \xB8\x5C |0
-<U7A1F> \xB8\x5B |0
-<U7A20> \xB8\x59 |0
-<U7A22> \xDE\xFD |0
-<U7A26> \xE3\x49 |0
-<U7A28> \xE3\x48 |0
-<U7A2B> \xE3\x44 |0
-<U7A2E> \xBA\xD8 |0
-<U7A2F> \xE3\x47 |0
-<U7A30> \xE3\x46 |0
-<U7A31> \xBA\xD9 |0
-<U7A37> \xBD\x5E |0
-<U7A39> \xE6\xD2 |0
-<U7A3B> \xBD\x5F |0
-<U7A3C> \xBD\x5B |0
-<U7A3D> \xBD\x5D |0
-<U7A3F> \xBD\x5A |0
-<U7A40> \xBD\x5C |0
-<U7A44> \xEA\xAF |0
-<U7A46> \xBF\x70 |0
-<U7A47> \xEA\xB1 |0
-<U7A48> \xEA\xB0 |0
-<U7A4A> \xE3\x45 |0
-<U7A4B> \xBF\x72 |0
-<U7A4C> \xBF\x71 |0
-<U7A4D> \xBF\x6E |0
-<U7A4E> \xBF\x6F |0
-<U7A54> \xED\xB5 |0
-<U7A56> \xED\xB3 |0
-<U7A57> \xC1\x4A |0
-<U7A58> \xED\xB4 |0
-<U7A5A> \xED\xB6 |0
-<U7A5B> \xED\xB2 |0
-<U7A5C> \xED\xB1 |0
-<U7A5F> \xF0\x60 |0
-<U7A60> \xC2\xAA |0
-<U7A61> \xC2\xA8 |0
-<U7A62> \xC2\xA9 |0
-<U7A67> \xF2\xA6 |0
-<U7A68> \xF2\xA7 |0
-<U7A69> \xC3\xAD |0
-<U7A6B> \xC3\xAC |0
-<U7A6C> \xF4\xA3 |0
-<U7A6D> \xF4\xA4 |0
-<U7A6E> \xF4\xA2 |0
-<U7A70> \xF6\xF8 |0
-<U7A71> \xF6\xF9 |0
-<U7A74> \xA5\xDE |0
-<U7A75> \xCA\x48 |0
-<U7A76> \xA8\x73 |0
-<U7A78> \xCD\xA5 |0
-<U7A79> \xAA\xC6 |0
-<U7A7A> \xAA\xC5 |0
-<U7A7B> \xCD\xA6 |0
-<U7A7E> \xD0\x40 |0
-<U7A7F> \xAC\xEF |0
-<U7A80> \xCF\xFE |0
-<U7A81> \xAC\xF0 |0
-<U7A84> \xAF\xB6 |0
-<U7A85> \xD2\xF8 |0
-<U7A86> \xD2\xF6 |0
-<U7A87> \xD2\xFC |0
-<U7A88> \xAF\xB7 |0
-<U7A89> \xD2\xF7 |0
-<U7A8A> \xD2\xFB |0
-<U7A8B> \xD2\xF9 |0
-<U7A8C> \xD2\xFA |0
-<U7A8F> \xD6\xC8 |0
-<U7A90> \xD6\xCA |0
-<U7A92> \xB2\xBF |0
-<U7A94> \xD6\xC9 |0
-<U7A95> \xB2\xC0 |0
-<U7A96> \xB5\xA2 |0
-<U7A97> \xB5\xA1 |0
-<U7A98> \xB5\x7E |0
-<U7A99> \xDA\xDB |0
-<U7A9E> \xDF\x44 |0
-<U7A9F> \xB8\x5D |0
-<U7AA0> \xB8\x5E |0
-<U7AA2> \xDF\x43 |0
-<U7AA3> \xDF\x42 |0
-<U7AA8> \xE3\x4A |0
-<U7AA9> \xBA\xDB |0
-<U7AAA> \xBA\xDA |0
-<U7AAB> \xE3\x4B |0
-<U7AAC> \xE3\x4C |0
-<U7AAE> \xBD\x61 |0
-<U7AAF> \xBD\x60 |0
-<U7AB1> \xEA\xB5 |0
-<U7AB2> \xE6\xD3 |0
-<U7AB3> \xE6\xD5 |0
-<U7AB4> \xE6\xD4 |0
-<U7AB5> \xEA\xB4 |0
-<U7AB6> \xEA\xB2 |0
-<U7AB7> \xEA\xB6 |0
-<U7AB8> \xEA\xB3 |0
-<U7ABA> \xBF\x73 |0
-<U7ABE> \xED\xB7 |0
-<U7ABF> \xC1\x4B |0
-<U7AC0> \xED\xB8 |0
-<U7AC1> \xED\xB9 |0
-<U7AC4> \xC2\xAB |0
-<U7AC5> \xC2\xAC |0
-<U7AC7> \xC4\x75 |0
-<U7ACA> \xC5\xD1 |0
-<U7ACB> \xA5\xDF |0
-<U7AD1> \xD0\x41 |0
-<U7AD8> \xD2\xFD |0
-<U7AD9> \xAF\xB8 |0
-<U7ADF> \xB3\xBA |0
-<U7AE0> \xB3\xB9 |0
-<U7AE3> \xB5\xA4 |0
-<U7AE4> \xDA\xDD |0
-<U7AE5> \xB5\xA3 |0
-<U7AE6> \xDA\xDC |0
-<U7AEB> \xDF\x45 |0
-<U7AED> \xBA\xDC |0
-<U7AEE> \xE3\x4D |0
-<U7AEF> \xBA\xDD |0
-<U7AF6> \xC4\x76 |0
-<U7AF7> \xF4\xA5 |0
-<U7AF9> \xA6\xCB |0
-<U7AFA> \xAA\xC7 |0
-<U7AFB> \xCD\xA7 |0
-<U7AFD> \xAC\xF2 |0
-<U7AFF> \xAC\xF1 |0
-<U7B00> \xD0\x42 |0
-<U7B01> \xD0\x43 |0
-<U7B04> \xD3\x40 |0
-<U7B05> \xD3\x42 |0
-<U7B06> \xAF\xB9 |0
-<U7B08> \xD3\x44 |0
-<U7B09> \xD3\x47 |0
-<U7B0A> \xD3\x45 |0
-<U7B0E> \xD3\x46 |0
-<U7B0F> \xD3\x43 |0
-<U7B10> \xD2\xFE |0
-<U7B11> \xAF\xBA |0
-<U7B12> \xD3\x48 |0
-<U7B13> \xD3\x41 |0
-<U7B18> \xD6\xD3 |0
-<U7B19> \xB2\xC6 |0
-<U7B1A> \xD6\xDC |0
-<U7B1B> \xB2\xC3 |0
-<U7B1D> \xD6\xD5 |0
-<U7B1E> \xB2\xC7 |0
-<U7B20> \xB2\xC1 |0
-<U7B22> \xD6\xD0 |0
-<U7B23> \xD6\xDD |0
-<U7B24> \xD6\xD1 |0
-<U7B25> \xD6\xCE |0
-<U7B26> \xB2\xC5 |0
-<U7B28> \xB2\xC2 |0
-<U7B2A> \xD6\xD4 |0
-<U7B2B> \xD6\xD7 |0
-<U7B2C> \xB2\xC4 |0
-<U7B2D> \xD6\xD8 |0
-<U7B2E> \xB2\xC8 |0
-<U7B2F> \xD6\xD9 |0
-<U7B30> \xD6\xCF |0
-<U7B31> \xD6\xD6 |0
-<U7B32> \xD6\xDA |0
-<U7B33> \xD6\xD2 |0
-<U7B34> \xD6\xCD |0
-<U7B35> \xD6\xCB |0
-<U7B38> \xD6\xDB |0
-<U7B3B> \xDA\xDF |0
-<U7B40> \xDA\xE4 |0
-<U7B44> \xDA\xE0 |0
-<U7B45> \xDA\xE6 |0
-<U7B46> \xB5\xA7 |0
-<U7B47> \xD6\xCC |0
-<U7B48> \xDA\xE1 |0
-<U7B49> \xB5\xA5 |0
-<U7B4A> \xDA\xDE |0
-<U7B4B> \xB5\xAC |0
-<U7B4C> \xDA\xE2 |0
-<U7B4D> \xB5\xAB |0
-<U7B4E> \xDA\xE3 |0
-<U7B4F> \xB5\xAD |0
-<U7B50> \xB5\xA8 |0
-<U7B51> \xB5\xAE |0
-<U7B52> \xB5\xA9 |0
-<U7B54> \xB5\xAA |0
-<U7B56> \xB5\xA6 |0
-<U7B58> \xDA\xE5 |0
-<U7B60> \xB8\x61 |0
-<U7B61> \xDF\x50 |0
-<U7B63> \xDF\x53 |0
-<U7B64> \xDF\x47 |0
-<U7B65> \xDF\x4C |0
-<U7B66> \xDF\x46 |0
-<U7B67> \xB8\x63 |0
-<U7B69> \xDF\x4A |0
-<U7B6D> \xDF\x48 |0
-<U7B6E> \xB8\x62 |0
-<U7B70> \xDF\x4F |0
-<U7B71> \xDF\x4E |0
-<U7B72> \xDF\x4B |0
-<U7B73> \xDF\x4D |0
-<U7B74> \xDF\x49 |0
-<U7B75> \xBA\xE1 |0
-<U7B76> \xDF\x52 |0
-<U7B77> \xB8\x5F |0
-<U7B78> \xDF\x51 |0
-<U7B82> \xE3\x5D |0
-<U7B84> \xBA\xE8 |0
-<U7B85> \xE3\x58 |0
-<U7B87> \xBA\xE7 |0
-<U7B88> \xE3\x4E |0
-<U7B8A> \xE3\x50 |0
-<U7B8B> \xBA\xE0 |0
-<U7B8C> \xE3\x55 |0
-<U7B8D> \xE3\x54 |0
-<U7B8E> \xE3\x57 |0
-<U7B8F> \xBA\xE5 |0
-<U7B90> \xE3\x52 |0
-<U7B91> \xE3\x51 |0
-<U7B94> \xBA\xE4 |0
-<U7B95> \xBA\xDF |0
-<U7B96> \xE3\x53 |0
-<U7B97> \xBA\xE2 |0
-<U7B98> \xE3\x59 |0
-<U7B99> \xE3\x5B |0
-<U7B9B> \xE3\x56 |0
-<U7B9C> \xE3\x4F |0
-<U7B9D> \xBA\xE3 |0
-<U7BA0> \xBD\x69 |0
-<U7BA1> \xBA\xDE |0
-<U7BA4> \xE3\x5C |0
-<U7BAC> \xE6\xD9 |0
-<U7BAD> \xBD\x62 |0
-<U7BAF> \xE6\xDB |0
-<U7BB1> \xBD\x63 |0
-<U7BB4> \xBD\x65 |0
-<U7BB5> \xE6\xDE |0
-<U7BB7> \xE6\xD6 |0
-<U7BB8> \xBA\xE6 |0
-<U7BB9> \xE6\xDC |0
-<U7BBE> \xE6\xD8 |0
-<U7BC0> \xB8\x60 |0
-<U7BC1> \xBD\x68 |0
-<U7BC4> \xBD\x64 |0
-<U7BC6> \xBD\x66 |0
-<U7BC7> \xBD\x67 |0
-<U7BC9> \xBF\x76 |0
-<U7BCA> \xE6\xDD |0
-<U7BCB> \xE6\xD7 |0
-<U7BCC> \xBD\x6A |0
-<U7BCE> \xE6\xDA |0
-<U7BD4> \xEA\xC0 |0
-<U7BD5> \xEA\xBB |0
-<U7BD8> \xEA\xC5 |0
-<U7BD9> \xBF\x74 |0
-<U7BDA> \xEA\xBD |0
-<U7BDB> \xBF\x78 |0
-<U7BDC> \xEA\xC3 |0
-<U7BDD> \xEA\xBA |0
-<U7BDE> \xEA\xB7 |0
-<U7BDF> \xEA\xC6 |0
-<U7BE0> \xC1\x51 |0
-<U7BE1> \xBF\x79 |0
-<U7BE2> \xEA\xC2 |0
-<U7BE3> \xEA\xB8 |0
-<U7BE4> \xBF\x77 |0
-<U7BE5> \xEA\xBC |0
-<U7BE6> \xBF\x7B |0
-<U7BE7> \xEA\xB9 |0
-<U7BE8> \xEA\xBE |0
-<U7BE9> \xBF\x7A |0
-<U7BEA> \xEA\xC1 |0
-<U7BEB> \xEA\xC4 |0
-<U7BF0> \xED\xCB |0
-<U7BF1> \xED\xCC |0
-<U7BF2> \xED\xBC |0
-<U7BF3> \xED\xC3 |0
-<U7BF4> \xED\xC1 |0
-<U7BF7> \xC1\x4F |0
-<U7BF8> \xED\xC8 |0
-<U7BF9> \xEA\xBF |0
-<U7BFB> \xED\xBF |0
-<U7BFD> \xED\xC9 |0
-<U7BFE> \xC1\x4E |0
-<U7BFF> \xED\xBE |0
-<U7C00> \xED\xBD |0
-<U7C01> \xED\xC7 |0
-<U7C02> \xED\xC4 |0
-<U7C03> \xED\xC6 |0
-<U7C05> \xED\xBA |0
-<U7C06> \xED\xCA |0
-<U7C07> \xC1\x4C |0
-<U7C09> \xED\xC5 |0
-<U7C0A> \xED\xCE |0
-<U7C0B> \xED\xC2 |0
-<U7C0C> \xC1\x50 |0
-<U7C0D> \xC1\x4D |0
-<U7C0E> \xED\xC0 |0
-<U7C0F> \xED\xBB |0
-<U7C10> \xED\xCD |0
-<U7C11> \xBF\x75 |0
-<U7C19> \xF0\x63 |0
-<U7C1C> \xF0\x61 |0
-<U7C1D> \xF0\x67 |0
-<U7C1E> \xC2\xB0 |0
-<U7C1F> \xF0\x65 |0
-<U7C20> \xF0\x64 |0
-<U7C21> \xC2\xB2 |0
-<U7C22> \xF0\x6A |0
-<U7C23> \xC2\xB1 |0
-<U7C25> \xF0\x6B |0
-<U7C26> \xF0\x68 |0
-<U7C27> \xC2\xAE |0
-<U7C28> \xF0\x69 |0
-<U7C29> \xF0\x62 |0
-<U7C2A> \xC2\xAF |0
-<U7C2B> \xC2\xAD |0
-<U7C2C> \xF2\xAB |0
-<U7C2D> \xF0\x66 |0
-<U7C30> \xF0\x6C |0
-<U7C33> \xF2\xA8 |0
-<U7C37> \xC3\xB2 |0
-<U7C38> \xC3\xB0 |0
-<U7C39> \xF2\xAA |0
-<U7C3B> \xF2\xAC |0
-<U7C3C> \xF2\xA9 |0
-<U7C3D> \xC3\xB1 |0
-<U7C3E> \xC3\xAE |0
-<U7C3F> \xC3\xAF |0
-<U7C40> \xC3\xB3 |0
-<U7C43> \xC4\x78 |0
-<U7C45> \xF4\xAA |0
-<U7C47> \xF4\xA9 |0
-<U7C48> \xF4\xA7 |0
-<U7C49> \xF4\xA6 |0
-<U7C4A> \xF4\xA8 |0
-<U7C4C> \xC4\x77 |0
-<U7C4D> \xC4\x79 |0
-<U7C50> \xC4\xF0 |0
-<U7C53> \xF5\xE5 |0
-<U7C54> \xF5\xE4 |0
-<U7C57> \xF6\xFA |0
-<U7C59> \xF6\xFC |0
-<U7C5A> \xF6\xFE |0
-<U7C5B> \xF6\xFD |0
-<U7C5C> \xF6\xFB |0
-<U7C5F> \xC5\xA3 |0
-<U7C60> \xC5\xA2 |0
-<U7C63> \xC5\xD3 |0
-<U7C64> \xC5\xD2 |0
-<U7C65> \xC5\xD4 |0
-<U7C66> \xF7\xED |0
-<U7C67> \xF7\xEC |0
-<U7C69> \xF8\xFB |0
-<U7C6A> \xF8\xB8 |0
-<U7C6B> \xF8\xFC |0
-<U7C6C> \xC6\x58 |0
-<U7C6E> \xC6\x59 |0
-<U7C6F> \xF9\x6D |0
-<U7C72> \xC6\x7E |0
-<U7C73> \xA6\xCC |0
-<U7C75> \xCD\xA8 |0
-<U7C78> \xD0\x45 |0
-<U7C79> \xD0\x46 |0
-<U7C7A> \xD0\x44 |0
-<U7C7D> \xAC\xF3 |0
-<U7C7F> \xD0\x47 |0
-<U7C80> \xD0\x48 |0
-<U7C81> \xD0\x49 |0
-<U7C84> \xD3\x49 |0
-<U7C85> \xD3\x4F |0
-<U7C88> \xD3\x4D |0
-<U7C89> \xAF\xBB |0
-<U7C8A> \xD3\x4B |0
-<U7C8C> \xD3\x4C |0
-<U7C8D> \xD3\x4E |0
-<U7C91> \xD3\x4A |0
-<U7C92> \xB2\xC9 |0
-<U7C94> \xD6\xDE |0
-<U7C95> \xB2\xCB |0
-<U7C96> \xD6\xE0 |0
-<U7C97> \xB2\xCA |0
-<U7C98> \xD6\xDF |0
-<U7C9E> \xDA\xE8 |0
-<U7C9F> \xB5\xAF |0
-<U7CA1> \xDA\xEA |0
-<U7CA2> \xDA\xE7 |0
-<U7CA3> \xD6\xE1 |0
-<U7CA5> \xB5\xB0 |0
-<U7CA7> \xF9\xDB |0
-<U7CA8> \xDA\xE9 |0
-<U7CAF> \xDF\x56 |0
-<U7CB1> \xB8\x64 |0
-<U7CB2> \xDF\x54 |0
-<U7CB3> \xB8\x65 |0
-<U7CB4> \xDF\x55 |0
-<U7CB5> \xB8\x66 |0
-<U7CB9> \xBA\xE9 |0
-<U7CBA> \xE3\x61 |0
-<U7CBB> \xE3\x5E |0
-<U7CBC> \xE3\x60 |0
-<U7CBD> \xBA\xEA |0
-<U7CBE> \xBA\xEB |0
-<U7CBF> \xE3\x5F |0
-<U7CC5> \xE6\xDF |0
-<U7CC8> \xE6\xE0 |0
-<U7CCA> \xBD\x6B |0
-<U7CCB> \xE6\xE2 |0
-<U7CCC> \xE6\xE1 |0
-<U7CCE> \xA2\x61 |0
-<U7CD0> \xEA\xCA |0
-<U7CD1> \xEA\xCB |0
-<U7CD2> \xEA\xC7 |0
-<U7CD4> \xEA\xC8 |0
-<U7CD5> \xBF\x7C |0
-<U7CD6> \xBF\x7D |0
-<U7CD7> \xEA\xC9 |0
-<U7CD9> \xC1\x57 |0
-<U7CDC> \xC1\x53 |0
-<U7CDD> \xC1\x58 |0
-<U7CDE> \xC1\x54 |0
-<U7CDF> \xC1\x56 |0
-<U7CE0> \xC1\x52 |0
-<U7CE2> \xC1\x55 |0
-<U7CE7> \xC2\xB3 |0
-<U7CE8> \xED\xCF |0
-<U7CEA> \xF2\xAE |0
-<U7CEC> \xF2\xAD |0
-<U7CEE> \xF4\xAB |0
-<U7CEF> \xC4\x7A |0
-<U7CF0> \xC4\x7B |0
-<U7CF1> \xF7\x41 |0
-<U7CF2> \xF5\xE6 |0
-<U7CF4> \xF7\x40 |0
-<U7CF6> \xF8\xFD |0
-<U7CF7> \xF9\xA4 |0
-<U7CF8> \xA6\xCD |0
-<U7CFB> \xA8\x74 |0
-<U7CFD> \xCD\xA9 |0
-<U7CFE> \xAA\xC8 |0
-<U7D00> \xAC\xF6 |0
-<U7D01> \xD0\x4C |0
-<U7D02> \xAC\xF4 |0
-<U7D03> \xD0\x4A |0
-<U7D04> \xAC\xF9 |0
-<U7D05> \xAC\xF5 |0
-<U7D06> \xAC\xFA |0
-<U7D07> \xAC\xF8 |0
-<U7D08> \xD0\x4B |0
-<U7D09> \xAC\xF7 |0
-<U7D0A> \xAF\xBF |0
-<U7D0B> \xAF\xBE |0
-<U7D0C> \xD3\x5A |0
-<U7D0D> \xAF\xC7 |0
-<U7D0E> \xD3\x53 |0
-<U7D0F> \xD3\x59 |0
-<U7D10> \xAF\xC3 |0
-<U7D11> \xD3\x52 |0
-<U7D12> \xD3\x58 |0
-<U7D13> \xD3\x56 |0
-<U7D14> \xAF\xC2 |0
-<U7D15> \xAF\xC4 |0
-<U7D16> \xD3\x55 |0
-<U7D17> \xAF\xBD |0
-<U7D18> \xD3\x54 |0
-<U7D19> \xAF\xC8 |0
-<U7D1A> \xAF\xC5 |0
-<U7D1B> \xAF\xC9 |0
-<U7D1C> \xAF\xC6 |0
-<U7D1D> \xD3\x51 |0
-<U7D1E> \xD3\x50 |0
-<U7D1F> \xD3\x57 |0
-<U7D20> \xAF\xC0 |0
-<U7D21> \xAF\xBC |0
-<U7D22> \xAF\xC1 |0
-<U7D28> \xD6\xF0 |0
-<U7D29> \xD6\xE9 |0
-<U7D2B> \xB5\xB5 |0
-<U7D2C> \xD6\xE8 |0
-<U7D2E> \xB2\xCF |0
-<U7D2F> \xB2\xD6 |0
-<U7D30> \xB2\xD3 |0
-<U7D31> \xB2\xD9 |0
-<U7D32> \xB2\xD8 |0
-<U7D33> \xB2\xD4 |0
-<U7D35> \xD6\xE2 |0
-<U7D36> \xD6\xE5 |0
-<U7D38> \xD6\xE4 |0
-<U7D39> \xB2\xD0 |0
-<U7D3A> \xD6\xE6 |0
-<U7D3B> \xD6\xEF |0
-<U7D3C> \xB2\xD1 |0
-<U7D3D> \xD6\xE3 |0
-<U7D3E> \xD6\xEC |0
-<U7D3F> \xD6\xED |0
-<U7D40> \xB2\xD2 |0
-<U7D41> \xD6\xEA |0
-<U7D42> \xB2\xD7 |0
-<U7D43> \xB2\xCD |0
-<U7D44> \xB2\xD5 |0
-<U7D45> \xD6\xE7 |0
-<U7D46> \xB2\xCC |0
-<U7D47> \xD6\xEB |0
-<U7D4A> \xD6\xEE |0
-<U7D4E> \xDA\xFB |0
-<U7D4F> \xDA\xF2 |0
-<U7D50> \xB5\xB2 |0
-<U7D51> \xDA\xF9 |0
-<U7D52> \xDA\xF6 |0
-<U7D53> \xDA\xEE |0
-<U7D54> \xDA\xF7 |0
-<U7D55> \xB5\xB4 |0
-<U7D56> \xDA\xEF |0
-<U7D58> \xDA\xEB |0
-<U7D5B> \xB8\x6C |0
-<U7D5C> \xDA\xF4 |0
-<U7D5E> \xB5\xB1 |0
-<U7D5F> \xDA\xFA |0
-<U7D61> \xB5\xB8 |0
-<U7D62> \xB5\xBA |0
-<U7D63> \xDA\xED |0
-<U7D66> \xB5\xB9 |0
-<U7D67> \xDA\xF0 |0
-<U7D68> \xB5\xB3 |0
-<U7D69> \xDA\xF8 |0
-<U7D6A> \xDA\xF1 |0
-<U7D6B> \xDA\xF5 |0
-<U7D6D> \xDA\xF3 |0
-<U7D6E> \xB5\xB6 |0
-<U7D6F> \xDA\xEC |0
-<U7D70> \xB5\xBB |0
-<U7D71> \xB2\xCE |0
-<U7D72> \xB5\xB7 |0
-<U7D73> \xB5\xBC |0
-<U7D79> \xB8\x68 |0
-<U7D7A> \xDF\x5D |0
-<U7D7B> \xDF\x5F |0
-<U7D7C> \xDF\x61 |0
-<U7D7D> \xDF\x65 |0
-<U7D7F> \xDF\x5B |0
-<U7D80> \xDF\x59 |0
-<U7D81> \xB8\x6A |0
-<U7D83> \xDF\x60 |0
-<U7D84> \xDF\x64 |0
-<U7D85> \xDF\x5C |0
-<U7D86> \xDF\x58 |0
-<U7D88> \xDF\x57 |0
-<U7D8C> \xDF\x62 |0
-<U7D8D> \xDF\x5A |0
-<U7D8E> \xDF\x5E |0
-<U7D8F> \xB8\x6B |0
-<U7D91> \xB8\x69 |0
-<U7D92> \xDF\x66 |0
-<U7D93> \xB8\x67 |0
-<U7D94> \xDF\x63 |0
-<U7D96> \xE3\x72 |0
-<U7D9C> \xBA\xEE |0
-<U7D9D> \xE3\x6A |0
-<U7D9E> \xBD\x78 |0
-<U7D9F> \xE3\x74 |0
-<U7DA0> \xBA\xF1 |0
-<U7DA1> \xE3\x78 |0
-<U7DA2> \xBA\xF7 |0
-<U7DA3> \xE3\x65 |0
-<U7DA6> \xE3\x75 |0
-<U7DA7> \xE3\x62 |0
-<U7DA9> \xE3\x77 |0
-<U7DAA> \xE3\x66 |0
-<U7DAC> \xBA\xFE |0
-<U7DAD> \xBA\xFB |0
-<U7DAE> \xE3\x76 |0
-<U7DAF> \xE3\x70 |0
-<U7DB0> \xBA\xED |0
-<U7DB1> \xBA\xF5 |0
-<U7DB2> \xBA\xF4 |0
-<U7DB4> \xBA\xF3 |0
-<U7DB5> \xBA\xF9 |0
-<U7DB7> \xE3\x63 |0
-<U7DB8> \xBA\xFA |0
-<U7DB9> \xE3\x71 |0
-<U7DBA> \xBA\xF6 |0
-<U7DBB> \xBA\xEC |0
-<U7DBC> \xE3\x73 |0
-<U7DBD> \xBA\xEF |0
-<U7DBE> \xBA\xF0 |0
-<U7DBF> \xBA\xF8 |0
-<U7DC0> \xE3\x68 |0
-<U7DC1> \xE3\x67 |0
-<U7DC2> \xE3\x64 |0
-<U7DC4> \xE3\x6C |0
-<U7DC5> \xE3\x69 |0
-<U7DC6> \xE3\x6D |0
-<U7DC7> \xBA\xFD |0
-<U7DC9> \xE3\x79 |0
-<U7DCA> \xBA\xF2 |0
-<U7DCB> \xE3\x6E |0
-<U7DCC> \xE3\x6F |0
-<U7DCE> \xE3\x6B |0
-<U7DD2> \xBA\xFC |0
-<U7DD7> \xE6\xE7 |0
-<U7DD8> \xBD\x70 |0
-<U7DD9> \xBD\x79 |0
-<U7DDA> \xBD\x75 |0
-<U7DDB> \xE6\xE4 |0
-<U7DDD> \xBD\x72 |0
-<U7DDE> \xBD\x76 |0
-<U7DDF> \xE6\xF0 |0
-<U7DE0> \xBD\x6C |0
-<U7DE1> \xE6\xE8 |0
-<U7DE3> \xBD\x74 |0
-<U7DE6> \xE6\xEB |0
-<U7DE7> \xE6\xE6 |0
-<U7DE8> \xBD\x73 |0
-<U7DE9> \xBD\x77 |0
-<U7DEA> \xE6\xE5 |0
-<U7DEC> \xBD\x71 |0
-<U7DEE> \xE6\xEF |0
-<U7DEF> \xBD\x6E |0
-<U7DF0> \xE6\xEE |0
-<U7DF1> \xE6\xED |0
-<U7DF2> \xBD\x7A |0
-<U7DF3> \xE5\x72 |0
-<U7DF4> \xBD\x6D |0
-<U7DF6> \xE6\xEC |0
-<U7DF7> \xE6\xE3 |0
-<U7DF9> \xBD\x7B |0
-<U7DFA> \xE6\xEA |0
-<U7DFB> \xBD\x6F |0
-<U7E03> \xE6\xE9 |0
-<U7E08> \xBF\xA2 |0
-<U7E09> \xBF\xA7 |0
-<U7E0A> \xBF\x7E |0
-<U7E0B> \xEA\xD8 |0
-<U7E0C> \xEA\xCF |0
-<U7E0D> \xEA\xDB |0
-<U7E0E> \xEA\xD3 |0
-<U7E0F> \xEA\xD9 |0
-<U7E10> \xBF\xA8 |0
-<U7E11> \xBF\xA1 |0
-<U7E12> \xEA\xCC |0
-<U7E13> \xEA\xD2 |0
-<U7E14> \xEA\xDC |0
-<U7E15> \xEA\xD5 |0
-<U7E16> \xEA\xDA |0
-<U7E17> \xEA\xCE |0
-<U7E1A> \xEA\xD6 |0
-<U7E1B> \xBF\xA3 |0
-<U7E1C> \xEA\xD4 |0
-<U7E1D> \xBF\xA6 |0
-<U7E1E> \xBF\xA5 |0
-<U7E1F> \xEA\xD0 |0
-<U7E20> \xEA\xD1 |0
-<U7E21> \xEA\xCD |0
-<U7E22> \xEA\xD7 |0
-<U7E23> \xBF\xA4 |0
-<U7E24> \xEA\xDE |0
-<U7E25> \xEA\xDD |0
-<U7E29> \xED\xDA |0
-<U7E2A> \xED\xD6 |0
-<U7E2B> \xC1\x5F |0
-<U7E2D> \xED\xD0 |0
-<U7E2E> \xC1\x59 |0
-<U7E2F> \xC1\x69 |0
-<U7E30> \xED\xDC |0
-<U7E31> \xC1\x61 |0
-<U7E32> \xC1\x5D |0
-<U7E33> \xED\xD3 |0
-<U7E34> \xC1\x64 |0
-<U7E35> \xC1\x67 |0
-<U7E36> \xED\xDE |0
-<U7E37> \xC1\x5C |0
-<U7E38> \xED\xD5 |0
-<U7E39> \xC1\x65 |0
-<U7E3A> \xED\xE0 |0
-<U7E3B> \xED\xDD |0
-<U7E3C> \xED\xD1 |0
-<U7E3D> \xC1\x60 |0
-<U7E3E> \xC1\x5A |0
-<U7E3F> \xC1\x68 |0
-<U7E40> \xED\xD8 |0
-<U7E41> \xC1\x63 |0
-<U7E42> \xED\xD2 |0
-<U7E43> \xC1\x5E |0
-<U7E44> \xED\xDF |0
-<U7E45> \xC1\x62 |0
-<U7E46> \xC1\x5B |0
-<U7E47> \xED\xD9 |0
-<U7E48> \xC1\x66 |0
-<U7E49> \xED\xD7 |0
-<U7E4C> \xED\xDB |0
-<U7E50> \xF0\x6E |0
-<U7E51> \xF0\x74 |0
-<U7E52> \xC2\xB9 |0
-<U7E53> \xF0\x77 |0
-<U7E54> \xC2\xB4 |0
-<U7E55> \xC2\xB5 |0
-<U7E56> \xF0\x6F |0
-<U7E57> \xF0\x76 |0
-<U7E58> \xF0\x71 |0
-<U7E59> \xC2\xBA |0
-<U7E5A> \xC2\xB7 |0
-<U7E5C> \xF0\x6D |0
-<U7E5E> \xC2\xB6 |0
-<U7E5F> \xF0\x73 |0
-<U7E60> \xF0\x75 |0
-<U7E61> \xC2\xB8 |0
-<U7E62> \xF0\x72 |0
-<U7E63> \xF0\x70 |0
-<U7E68> \xF2\xB8 |0
-<U7E69> \xC3\xB7 |0
-<U7E6A> \xC3\xB8 |0
-<U7E6B> \xC3\xB4 |0
-<U7E6D> \xC3\xB5 |0
-<U7E6F> \xF2\xB4 |0
-<U7E70> \xF2\xB2 |0
-<U7E72> \xF2\xB6 |0
-<U7E73> \xC3\xBA |0
-<U7E74> \xF2\xB7 |0
-<U7E75> \xF2\xB0 |0
-<U7E76> \xF2\xAF |0
-<U7E77> \xF2\xB3 |0
-<U7E78> \xF2\xB1 |0
-<U7E79> \xC3\xB6 |0
-<U7E7A> \xF2\xB5 |0
-<U7E7B> \xF4\xAC |0
-<U7E7C> \xC4\x7E |0
-<U7E7D> \xC4\x7D |0
-<U7E7E> \xF4\xAD |0
-<U7E80> \xF4\xAF |0
-<U7E81> \xF4\xAE |0
-<U7E82> \xC4\xA1 |0
-<U7E86> \xF5\xEB |0
-<U7E87> \xF5\xE8 |0
-<U7E88> \xF5\xE9 |0
-<U7E8A> \xF5\xE7 |0
-<U7E8B> \xF5\xEA |0
-<U7E8C> \xC4\xF2 |0
-<U7E8D> \xF5\xEC |0
-<U7E8F> \xC4\xF1 |0
-<U7E91> \xF7\x42 |0
-<U7E93> \xC5\xD5 |0
-<U7E94> \xC5\xD7 |0
-<U7E95> \xF7\xEE |0
-<U7E96> \xC5\xD6 |0
-<U7E97> \xF8\xB9 |0
-<U7E98> \xF9\x40 |0
-<U7E99> \xF9\x42 |0
-<U7E9A> \xF8\xFE |0
-<U7E9B> \xF9\x41 |0
-<U7E9C> \xC6\x6C |0
-<U7F36> \xA6\xCE |0
-<U7F38> \xAC\xFB |0
-<U7F39> \xD2\x6F |0
-<U7F3A> \xAF\xCA |0
-<U7F3D> \xB2\xDA |0
-<U7F3E> \xDA\xFC |0
-<U7F3F> \xDA\xFD |0
-<U7F43> \xEA\xDF |0
-<U7F44> \xC1\x6A |0
-<U7F45> \xED\xE1 |0
-<U7F48> \xC2\xBB |0
-<U7F4A> \xF2\xBA |0
-<U7F4B> \xF2\xB9 |0
-<U7F4C> \xC4\xA2 |0
-<U7F4D> \xF5\xED |0
-<U7F4F> \xF7\x43 |0
-<U7F50> \xC5\xF8 |0
-<U7F51> \xCA\x49 |0
-<U7F54> \xAA\xC9 |0
-<U7F55> \xA8\x75 |0
-<U7F58> \xD0\x4D |0
-<U7F5B> \xD3\x60 |0
-<U7F5C> \xD3\x5B |0
-<U7F5D> \xD3\x5F |0
-<U7F5E> \xD3\x5D |0
-<U7F5F> \xAF\xCB |0
-<U7F60> \xD3\x5E |0
-<U7F61> \xD3\x5C |0
-<U7F63> \xD6\xF1 |0
-<U7F65> \xDA\xFE |0
-<U7F66> \xDB\x40 |0
-<U7F67> \xDF\x69 |0
-<U7F68> \xDF\x6A |0
-<U7F69> \xB8\x6E |0
-<U7F6A> \xB8\x6F |0
-<U7F6B> \xDF\x68 |0
-<U7F6C> \xDF\x6B |0
-<U7F6D> \xDF\x67 |0
-<U7F6E> \xB8\x6D |0
-<U7F70> \xBB\x40 |0
-<U7F72> \xB8\x70 |0
-<U7F73> \xE3\x7A |0
-<U7F75> \xBD\x7C |0
-<U7F76> \xE6\xF1 |0
-<U7F77> \xBD\x7D |0
-<U7F79> \xBF\xA9 |0
-<U7F7A> \xEA\xE2 |0
-<U7F7B> \xEA\xE0 |0
-<U7F7C> \xEA\xE1 |0
-<U7F7D> \xED\xE4 |0
-<U7F7E> \xED\xE3 |0
-<U7F7F> \xED\xE2 |0
-<U7F83> \xF2\xBB |0
-<U7F85> \xC3\xB9 |0
-<U7F86> \xF2\xBC |0
-<U7F87> \xF7\x44 |0
-<U7F88> \xC5\xF9 |0
-<U7F89> \xF8\xBA |0
-<U7F8A> \xA6\xCF |0
-<U7F8B> \xAA\xCB |0
-<U7F8C> \xAA\xCA |0
-<U7F8D> \xD0\x4F |0
-<U7F8E> \xAC\xFC |0
-<U7F91> \xD0\x4E |0
-<U7F92> \xD3\x62 |0
-<U7F94> \xAF\xCC |0
-<U7F95> \xD6\xF2 |0
-<U7F96> \xD3\x61 |0
-<U7F9A> \xB2\xDC |0
-<U7F9B> \xD6\xF5 |0
-<U7F9C> \xD6\xF3 |0
-<U7F9D> \xD6\xF4 |0
-<U7F9E> \xB2\xDB |0
-<U7FA0> \xDB\x42 |0
-<U7FA1> \xDB\x43 |0
-<U7FA2> \xDB\x41 |0
-<U7FA4> \xB8\x73 |0
-<U7FA5> \xDF\x6D |0
-<U7FA6> \xDF\x6C |0
-<U7FA7> \xDF\x6E |0
-<U7FA8> \xB8\x72 |0
-<U7FA9> \xB8\x71 |0
-<U7FAC> \xE6\xF2 |0
-<U7FAD> \xE6\xF4 |0
-<U7FAF> \xBD\x7E |0
-<U7FB0> \xE6\xF3 |0
-<U7FB1> \xEA\xE3 |0
-<U7FB2> \xBF\xAA |0
-<U7FB3> \xF0\x79 |0
-<U7FB5> \xF0\x78 |0
-<U7FB6> \xC3\xBB |0
-<U7FB7> \xF2\xBD |0
-<U7FB8> \xC3\xBD |0
-<U7FB9> \xC3\xBC |0
-<U7FBA> \xF4\xB0 |0
-<U7FBB> \xF5\xEE |0
-<U7FBC> \xC4\xF3 |0
-<U7FBD> \xA6\xD0 |0
-<U7FBE> \xD0\x50 |0
-<U7FBF> \xAC\xFD |0
-<U7FC0> \xD3\x65 |0
-<U7FC1> \xAF\xCE |0
-<U7FC2> \xD3\x64 |0
-<U7FC3> \xD3\x63 |0
-<U7FC5> \xAF\xCD |0
-<U7FC7> \xD6\xFB |0
-<U7FC9> \xD6\xFD |0
-<U7FCA> \xD6\xF6 |0
-<U7FCB> \xD6\xF7 |0
-<U7FCC> \xB2\xDD |0
-<U7FCD> \xD6\xF8 |0
-<U7FCE> \xB2\xDE |0
-<U7FCF> \xD6\xFC |0
-<U7FD0> \xD6\xF9 |0
-<U7FD1> \xD6\xFA |0
-<U7FD2> \xB2\xDF |0
-<U7FD4> \xB5\xBE |0
-<U7FD5> \xB5\xBF |0
-<U7FD7> \xDB\x44 |0
-<U7FDB> \xDF\x6F |0
-<U7FDC> \xDF\x70 |0
-<U7FDE> \xE3\x7E |0
-<U7FDF> \xBB\x43 |0
-<U7FE0> \xBB\x41 |0
-<U7FE1> \xBB\x42 |0
-<U7FE2> \xE3\x7B |0
-<U7FE3> \xE3\x7C |0
-<U7FE5> \xE3\x7D |0
-<U7FE6> \xE6\xF9 |0
-<U7FE8> \xE6\xFA |0
-<U7FE9> \xBD\xA1 |0
-<U7FEA> \xE6\xF7 |0
-<U7FEB> \xE6\xF6 |0
-<U7FEC> \xE6\xF8 |0
-<U7FED> \xE6\xF5 |0
-<U7FEE> \xBF\xAD |0
-<U7FEF> \xEA\xE4 |0
-<U7FF0> \xBF\xAB |0
-<U7FF1> \xBF\xAC |0
-<U7FF2> \xED\xE6 |0
-<U7FF3> \xC1\x6B |0
-<U7FF4> \xED\xE5 |0
-<U7FF5> \xEF\xA8 |0
-<U7FF7> \xF0\x7A |0
-<U7FF8> \xF0\x7B |0
-<U7FF9> \xC2\xBC |0
-<U7FFB> \xC2\xBD |0
-<U7FFC> \xC1\x6C |0
-<U7FFD> \xF2\xBE |0
-<U7FFE> \xF2\xBF |0
-<U7FFF> \xF4\xB1 |0
-<U8000> \xC4\xA3 |0
-<U8001> \xA6\xD1 |0
-<U8003> \xA6\xD2 |0
-<U8004> \xAC\xFE |0
-<U8005> \xAA\xCC |0
-<U8006> \xAF\xCF |0
-<U8007> \xD0\x51 |0
-<U800B> \xB5\xC0 |0
-<U800C> \xA6\xD3 |0
-<U800D> \xAD\x41 |0
-<U800E> \xD0\x52 |0
-<U800F> \xD0\x53 |0
-<U8010> \xAD\x40 |0
-<U8011> \xAD\x42 |0
-<U8012> \xA6\xD4 |0
-<U8014> \xD0\x54 |0
-<U8015> \xAF\xD1 |0
-<U8016> \xD3\x66 |0
-<U8017> \xAF\xD3 |0
-<U8018> \xAF\xD0 |0
-<U8019> \xAF\xD2 |0
-<U801B> \xD7\x41 |0
-<U801C> \xB2\xE0 |0
-<U801E> \xD7\x40 |0
-<U801F> \xD6\xFE |0
-<U8021> \xDF\x71 |0
-<U8024> \xE3\xA1 |0
-<U8026> \xBD\xA2 |0
-<U8028> \xBF\xAE |0
-<U8029> \xEA\xE6 |0
-<U802A> \xEA\xE5 |0
-<U802C> \xED\xE7 |0
-<U8030> \xF5\xEF |0
-<U8033> \xA6\xD5 |0
-<U8034> \xCB\x73 |0
-<U8035> \xCD\xAA |0
-<U8036> \xAD\x43 |0
-<U8037> \xD0\x55 |0
-<U8039> \xD3\x68 |0
-<U803D> \xAF\xD4 |0
-<U803E> \xD3\x67 |0
-<U803F> \xAF\xD5 |0
-<U8043> \xD7\x43 |0
-<U8046> \xB2\xE2 |0
-<U8047> \xD7\x42 |0
-<U8048> \xD7\x44 |0
-<U804A> \xB2\xE1 |0
-<U804F> \xDB\x46 |0
-<U8050> \xDB\x47 |0
-<U8051> \xDB\x45 |0
-<U8052> \xB5\xC1 |0
-<U8056> \xB8\x74 |0
-<U8058> \xB8\x75 |0
-<U805A> \xBB\x45 |0
-<U805C> \xE3\xA3 |0
-<U805D> \xE3\xA2 |0
-<U805E> \xBB\x44 |0
-<U8064> \xE6\xFB |0
-<U8067> \xE6\xFC |0
-<U806C> \xEA\xE7 |0
-<U806F> \xC1\x70 |0
-<U8070> \xC1\x6F |0
-<U8071> \xC1\x6D |0
-<U8072> \xC1\x6E |0
-<U8073> \xC1\x71 |0
-<U8075> \xF0\x7C |0
-<U8076> \xC2\xBF |0
-<U8077> \xC2\xBE |0
-<U8078> \xF2\xC0 |0
-<U8079> \xF4\xB2 |0
-<U807D> \xC5\xA5 |0
-<U807E> \xC5\xA4 |0
-<U807F> \xA6\xD6 |0
-<U8082> \xD1\xFB |0
-<U8084> \xB8\x77 |0
-<U8085> \xB5\xC2 |0
-<U8086> \xB8\x76 |0
-<U8087> \xBB\x46 |0
-<U8089> \xA6\xD7 |0
-<U808A> \xC9\xA9 |0
-<U808B> \xA6\xD8 |0
-<U808C> \xA6\xD9 |0
-<U808F> \xCD\xAB |0
-<U8090> \xCB\x76 |0
-<U8092> \xCB\x77 |0
-<U8093> \xA8\x77 |0
-<U8095> \xCB\x74 |0
-<U8096> \xA8\x76 |0
-<U8098> \xA8\x79 |0
-<U8099> \xCB\x75 |0
-<U809A> \xA8\x7B |0
-<U809B> \xA8\x7A |0
-<U809C> \xCB\x78 |0
-<U809D> \xA8\x78 |0
-<U80A1> \xAA\xD1 |0
-<U80A2> \xAA\xCF |0
-<U80A3> \xCD\xAD |0
-<U80A5> \xAA\xCE |0
-<U80A9> \xAA\xD3 |0
-<U80AA> \xAA\xD5 |0
-<U80AB> \xAA\xD2 |0
-<U80AD> \xCD\xB0 |0
-<U80AE> \xCD\xAC |0
-<U80AF> \xAA\xD6 |0
-<U80B1> \xAA\xD0 |0
-<U80B2> \xA8\x7C |0
-<U80B4> \xAA\xD4 |0
-<U80B5> \xCD\xAF |0
-<U80B8> \xCD\xAE |0
-<U80BA> \xAA\xCD |0
-<U80C2> \xD0\x5B |0
-<U80C3> \xAD\x47 |0
-<U80C4> \xAD\x48 |0
-<U80C5> \xD0\x5D |0
-<U80C7> \xD0\x57 |0
-<U80C8> \xD0\x5A |0
-<U80C9> \xD0\x63 |0
-<U80CA> \xD0\x61 |0
-<U80CC> \xAD\x49 |0
-<U80CD> \xD0\x67 |0
-<U80CE> \xAD\x4C |0
-<U80CF> \xD0\x64 |0
-<U80D0> \xD0\x5C |0
-<U80D1> \xD0\x59 |0
-<U80D4> \xDB\x49 |0
-<U80D5> \xD0\x62 |0
-<U80D6> \xAD\x44 |0
-<U80D7> \xD0\x65 |0
-<U80D8> \xD0\x56 |0
-<U80D9> \xD0\x5F |0
-<U80DA> \xAD\x46 |0
-<U80DB> \xAD\x4B |0
-<U80DC> \xD0\x60 |0
-<U80DD> \xAD\x4F |0
-<U80DE> \xAD\x4D |0
-<U80E0> \xD0\x58 |0
-<U80E1> \xAD\x4A |0
-<U80E3> \xD0\x5E |0
-<U80E4> \xAD\x4E |0
-<U80E5> \xAD\x45 |0
-<U80E6> \xD0\x66 |0
-<U80ED> \xAF\xDA |0
-<U80EF> \xAF\xE3 |0
-<U80F0> \xAF\xD8 |0
-<U80F1> \xAF\xD6 |0
-<U80F2> \xD3\x6A |0
-<U80F3> \xAF\xDE |0
-<U80F4> \xAF\xDB |0
-<U80F5> \xD3\x6C |0
-<U80F8> \xAF\xDD |0
-<U80F9> \xD3\x6B |0
-<U80FA> \xD3\x69 |0
-<U80FB> \xD3\x6E |0
-<U80FC> \xAF\xE2 |0
-<U80FD> \xAF\xE0 |0
-<U80FE> \xDB\x48 |0
-<U8100> \xD3\x6F |0
-<U8101> \xD3\x6D |0
-<U8102> \xAF\xD7 |0
-<U8105> \xAF\xD9 |0
-<U8106> \xAF\xDC |0
-<U8108> \xAF\xDF |0
-<U810A> \xAF\xE1 |0
-<U8115> \xD7\x4E |0
-<U8116> \xB2\xE4 |0
-<U8118> \xD7\x45 |0
-<U8119> \xD7\x47 |0
-<U811B> \xD7\x48 |0
-<U811D> \xD7\x50 |0
-<U811E> \xD7\x4C |0
-<U811F> \xD7\x4A |0
-<U8121> \xD7\x4D |0
-<U8122> \xD7\x51 |0
-<U8123> \xB2\xE5 |0
-<U8124> \xB2\xE9 |0
-<U8125> \xD7\x46 |0
-<U8127> \xD7\x4F |0
-<U8129> \xB2\xE7 |0
-<U812B> \xB2\xE6 |0
-<U812C> \xD7\x4B |0
-<U812D> \xD7\x49 |0
-<U812F> \xB2\xE3 |0
-<U8130> \xB2\xE8 |0
-<U8139> \xB5\xC8 |0
-<U813A> \xDB\x51 |0
-<U813D> \xDB\x4F |0
-<U813E> \xB5\xCA |0
-<U8143> \xDB\x4A |0
-<U8144> \xDF\xA1 |0
-<U8146> \xB5\xC9 |0
-<U8147> \xDB\x4E |0
-<U814A> \xDB\x4B |0
-<U814B> \xB5\xC5 |0
-<U814C> \xB5\xCB |0
-<U814D> \xDB\x50 |0
-<U814E> \xB5\xC7 |0
-<U814F> \xDB\x4D |0
-<U8150> \xBB\x47 |0
-<U8151> \xB5\xC6 |0
-<U8152> \xDB\x4C |0
-<U8153> \xB5\xCC |0
-<U8154> \xB5\xC4 |0
-<U8155> \xB5\xC3 |0
-<U815B> \xDF\x77 |0
-<U815C> \xDF\x75 |0
-<U815E> \xDF\x7B |0
-<U8160> \xDF\x73 |0
-<U8161> \xDF\xA2 |0
-<U8162> \xDF\x78 |0
-<U8164> \xDF\x72 |0
-<U8165> \xB8\x7B |0
-<U8166> \xB8\xA3 |0
-<U8167> \xDF\x7D |0
-<U8169> \xDF\x76 |0
-<U816B> \xB8\x7E |0
-<U816E> \xB8\x7C |0
-<U816F> \xDF\x7E |0
-<U8170> \xB8\x79 |0
-<U8171> \xB8\x78 |0
-<U8172> \xDF\x79 |0
-<U8173> \xB8\x7D |0
-<U8174> \xB5\xCD |0
-<U8176> \xDF\x7C |0
-<U8177> \xDF\x74 |0
-<U8178> \xB8\x7A |0
-<U8179> \xB8\xA1 |0
-<U817A> \xB8\xA2 |0
-<U817F> \xBB\x4C |0
-<U8180> \xBB\x48 |0
-<U8182> \xBB\x4D |0
-<U8183> \xE3\xA6 |0
-<U8186> \xE3\xA5 |0
-<U8187> \xE3\xA7 |0
-<U8188> \xBB\x4A |0
-<U8189> \xE3\xA4 |0
-<U818A> \xBB\x4B |0
-<U818B> \xE3\xAA |0
-<U818C> \xE3\xA9 |0
-<U818D> \xE3\xA8 |0
-<U818F> \xBB\x49 |0
-<U8195> \xE7\x41 |0
-<U8197> \xE7\x44 |0
-<U8198> \xBD\xA8 |0
-<U8199> \xE7\x43 |0
-<U819A> \xBD\xA7 |0
-<U819B> \xBD\xA3 |0
-<U819C> \xBD\xA4 |0
-<U819D> \xBD\xA5 |0
-<U819E> \xE7\x40 |0
-<U819F> \xE6\xFE |0
-<U81A0> \xBD\xA6 |0
-<U81A2> \xE7\x42 |0
-<U81A3> \xE6\xFD |0
-<U81A6> \xEA\xE9 |0
-<U81A7> \xEA\xF3 |0
-<U81A8> \xBF\xB1 |0
-<U81A9> \xBF\xB0 |0
-<U81AB> \xEA\xED |0
-<U81AC> \xEA\xEF |0
-<U81AE> \xEA\xEA |0
-<U81B0> \xEA\xEE |0
-<U81B1> \xEA\xE8 |0
-<U81B2> \xEA\xF1 |0
-<U81B3> \xBF\xAF |0
-<U81B4> \xEA\xF0 |0
-<U81B5> \xEA\xEC |0
-<U81B7> \xEA\xF2 |0
-<U81B9> \xEA\xEB |0
-<U81BA> \xC1\x74 |0
-<U81BB> \xED\xE8 |0
-<U81BC> \xED\xEE |0
-<U81BD> \xC1\x78 |0
-<U81BE> \xC1\x7A |0
-<U81BF> \xC1\x77 |0
-<U81C0> \xC1\x76 |0
-<U81C2> \xC1\x75 |0
-<U81C3> \xC1\x73 |0
-<U81C4> \xED\xE9 |0
-<U81C5> \xED\xEC |0
-<U81C6> \xC1\x72 |0
-<U81C7> \xED\xED |0
-<U81C9> \xC1\x79 |0
-<U81CA> \xED\xEB |0
-<U81CC> \xED\xEA |0
-<U81CD> \xC2\xC0 |0
-<U81CF> \xC2\xC1 |0
-<U81D0> \xF0\xA1 |0
-<U81D1> \xF0\x7D |0
-<U81D2> \xF0\x7E |0
-<U81D5> \xF2\xC2 |0
-<U81D7> \xF2\xC1 |0
-<U81D8> \xC3\xBE |0
-<U81D9> \xF4\xB4 |0
-<U81DA> \xC4\xA4 |0
-<U81DB> \xF4\xB3 |0
-<U81DD> \xF5\xF0 |0
-<U81DE> \xF7\x45 |0
-<U81DF> \xC5\xA6 |0
-<U81E0> \xF9\x43 |0
-<U81E1> \xF9\x44 |0
-<U81E2> \xC5\xD8 |0
-<U81E3> \xA6\xDA |0
-<U81E5> \xAA\xD7 |0
-<U81E6> \xDB\x52 |0
-<U81E7> \xBB\x4E |0
-<U81E8> \xC1\x7B |0
-<U81E9> \xED\xEF |0
-<U81EA> \xA6\xDB |0
-<U81EC> \xAF\xE5 |0
-<U81ED> \xAF\xE4 |0
-<U81EE> \xDB\x53 |0
-<U81F2> \xEA\xF4 |0
-<U81F3> \xA6\xDC |0
-<U81F4> \xAD\x50 |0
-<U81F7> \xDB\x54 |0
-<U81F8> \xDB\x55 |0
-<U81F9> \xDB\x56 |0
-<U81FA> \xBB\x4F |0
-<U81FB> \xBF\xB2 |0
-<U81FC> \xA6\xDD |0
-<U81FE> \xAA\xD8 |0
-<U81FF> \xD0\x68 |0
-<U8200> \xAF\xE6 |0
-<U8201> \xD3\x70 |0
-<U8202> \xB2\xEA |0
-<U8204> \xDB\x57 |0
-<U8205> \xB8\xA4 |0
-<U8207> \xBB\x50 |0
-<U8208> \xBF\xB3 |0
-<U8209> \xC1\x7C |0
-<U820A> \xC2\xC2 |0
-<U820B> \xF4\xB5 |0
-<U820C> \xA6\xDE |0
-<U820D> \xAA\xD9 |0
-<U8210> \xAF\xE7 |0
-<U8211> \xD7\x52 |0
-<U8212> \xB5\xCE |0
-<U8214> \xBB\x51 |0
-<U8215> \xE3\xAB |0
-<U8216> \xE7\x45 |0
-<U821B> \xA6\xDF |0
-<U821C> \xB5\xCF |0
-<U821D> \xDF\xA3 |0
-<U821E> \xBB\x52 |0
-<U821F> \xA6\xE0 |0
-<U8220> \xCD\xB1 |0
-<U8221> \xD0\x69 |0
-<U8222> \xAD\x51 |0
-<U8225> \xD3\x72 |0
-<U8228> \xAF\xEA |0
-<U822A> \xAF\xE8 |0
-<U822B> \xAF\xE9 |0
-<U822C> \xAF\xEB |0
-<U822F> \xD3\x71 |0
-<U8232> \xD7\x57 |0
-<U8233> \xD7\x54 |0
-<U8234> \xD7\x56 |0
-<U8235> \xB2\xEB |0
-<U8236> \xB2\xED |0
-<U8237> \xB2\xEC |0
-<U8238> \xD7\x53 |0
-<U8239> \xB2\xEE |0
-<U823A> \xD7\x55 |0
-<U823C> \xDB\x58 |0
-<U823D> \xDB\x59 |0
-<U823F> \xDB\x5A |0
-<U8240> \xDF\xA6 |0
-<U8242> \xDF\xA7 |0
-<U8244> \xDF\xA5 |0
-<U8245> \xDF\xA8 |0
-<U8247> \xB8\xA5 |0
-<U8249> \xDF\xA4 |0
-<U824B> \xBB\x53 |0
-<U824E> \xE7\x4A |0
-<U824F> \xE7\x46 |0
-<U8250> \xE7\x49 |0
-<U8251> \xE7\x4B |0
-<U8252> \xE7\x48 |0
-<U8253> \xE7\x47 |0
-<U8255> \xEA\xF5 |0
-<U8256> \xEA\xF6 |0
-<U8257> \xEA\xF7 |0
-<U8258> \xBF\xB4 |0
-<U8259> \xBF\xB5 |0
-<U825A> \xED\xF1 |0
-<U825B> \xED\xF0 |0
-<U825C> \xED\xF2 |0
-<U825E> \xF0\xA3 |0
-<U825F> \xF0\xA2 |0
-<U8261> \xF2\xC4 |0
-<U8263> \xF2\xC5 |0
-<U8264> \xF2\xC3 |0
-<U8266> \xC4\xA5 |0
-<U8268> \xF4\xB6 |0
-<U8269> \xF4\xB7 |0
-<U826B> \xF7\x46 |0
-<U826C> \xF7\xEF |0
-<U826D> \xF8\xBB |0
-<U826E> \xA6\xE1 |0
-<U826F> \xA8\x7D |0
-<U8271> \xC1\x7D |0
-<U8272> \xA6\xE2 |0
-<U8274> \xD7\x58 |0
-<U8275> \xDB\x5B |0
-<U8277> \xC6\x41 |0
-<U8278> \xCA\x4A |0
-<U827C> \xCA\x4B |0
-<U827D> \xCA\x4D |0
-<U827E> \xA6\xE3 |0
-<U827F> \xCA\x4E |0
-<U8280> \xCA\x4C |0
-<U8283> \xCB\xA2 |0
-<U8284> \xCB\xA3 |0
-<U8285> \xCB\x7B |0
-<U828A> \xCB\xA1 |0
-<U828B> \xA8\xA1 |0
-<U828D> \xA8\xA2 |0
-<U828E> \xCB\x7C |0
-<U828F> \xCB\x7A |0
-<U8290> \xCB\x79 |0
-<U8291> \xCB\x7D |0
-<U8292> \xA8\x7E |0
-<U8293> \xCB\x7E |0
-<U8294> \xD0\x6A |0
-<U8298> \xCD\xB6 |0
-<U8299> \xAA\xDC |0
-<U829A> \xCD\xB5 |0
-<U829B> \xCD\xB7 |0
-<U829D> \xAA\xDB |0
-<U829E> \xCD\xBC |0
-<U829F> \xAA\xDF |0
-<U82A0> \xCD\xB2 |0
-<U82A1> \xCD\xC0 |0
-<U82A2> \xCD\xC6 |0
-<U82A3> \xAA\xE6 |0
-<U82A4> \xCD\xC3 |0
-<U82A5> \xAA\xE3 |0
-<U82A7> \xCD\xB9 |0
-<U82A8> \xCD\xBF |0
-<U82A9> \xCD\xC1 |0
-<U82AB> \xCD\xB4 |0
-<U82AC> \xAA\xE2 |0
-<U82AD> \xAA\xDD |0
-<U82AE> \xCD\xBA |0
-<U82AF> \xAA\xE4 |0
-<U82B0> \xAA\xE7 |0
-<U82B1> \xAA\xE1 |0
-<U82B3> \xAA\xDA |0
-<U82B4> \xCD\xBE |0
-<U82B5> \xCD\xB8 |0
-<U82B6> \xCD\xC5 |0
-<U82B7> \xAA\xE9 |0
-<U82B8> \xAA\xE5 |0
-<U82B9> \xAA\xE0 |0
-<U82BA> \xCD\xBD |0
-<U82BB> \xAF\xEC |0
-<U82BC> \xCD\xBB |0
-<U82BD> \xAA\xDE |0
-<U82BE> \xAA\xE8 |0
-<U82C0> \xCD\xB3 |0
-<U82C2> \xCD\xC2 |0
-<U82C3> \xCD\xC4 |0
-<U82D1> \xAD\x62 |0
-<U82D2> \xAD\x5C |0
-<U82D3> \xAD\x64 |0
-<U82D4> \xAD\x61 |0
-<U82D5> \xD0\x71 |0
-<U82D6> \xD0\x74 |0
-<U82D7> \xAD\x5D |0
-<U82D9> \xD0\x6B |0
-<U82DB> \xAD\x56 |0
-<U82DC> \xAD\x60 |0
-<U82DE> \xAD\x63 |0
-<U82DF> \xAD\x65 |0
-<U82E0> \xD0\xA2 |0
-<U82E1> \xD0\x77 |0
-<U82E3> \xAD\x55 |0
-<U82E4> \xD0\xA1 |0
-<U82E5> \xAD\x59 |0
-<U82E6> \xAD\x57 |0
-<U82E7> \xAD\x52 |0
-<U82E8> \xD0\x6F |0
-<U82EA> \xD0\x7E |0
-<U82EB> \xD0\x73 |0
-<U82EC> \xD0\x76 |0
-<U82ED> \xD0\xA5 |0
-<U82EF> \xAD\x66 |0
-<U82F0> \xD0\x7D |0
-<U82F1> \xAD\x5E |0
-<U82F2> \xD0\x78 |0
-<U82F3> \xD0\xA4 |0
-<U82F4> \xD0\x75 |0
-<U82F5> \xD0\x79 |0
-<U82F6> \xD0\x7C |0
-<U82F9> \xD0\x6D |0
-<U82FA> \xD0\xA3 |0
-<U82FB> \xD0\x7B |0
-<U82FE> \xD0\x6C |0
-<U8300> \xD0\x70 |0
-<U8301> \xAD\x5F |0
-<U8302> \xAD\x5A |0
-<U8303> \xAD\x53 |0
-<U8304> \xAD\x58 |0
-<U8305> \xAD\x54 |0
-<U8306> \xAD\x67 |0
-<U8307> \xD0\x6E |0
-<U8308> \xD3\xA5 |0
-<U8309> \xAD\x5B |0
-<U830C> \xD0\x7A |0
-<U830D> \xCE\x41 |0
-<U8316> \xD3\xA8 |0
-<U8317> \xAF\xFA |0
-<U8319> \xD3\x76 |0
-<U831B> \xD3\xA3 |0
-<U831C> \xD3\x7D |0
-<U831E> \xD3\xB2 |0
-<U8320> \xD3\xAA |0
-<U8322> \xD3\x7E |0
-<U8324> \xD3\xA9 |0
-<U8325> \xD3\x78 |0
-<U8326> \xD3\x7C |0
-<U8327> \xD3\xB5 |0
-<U8328> \xAF\xFD |0
-<U8329> \xD3\xAD |0
-<U832A> \xD3\xA4 |0
-<U832B> \xAF\xED |0
-<U832C> \xD3\xB3 |0
-<U832D> \xD3\x74 |0
-<U832F> \xD3\xAC |0
-<U8331> \xAF\xFC |0
-<U8332> \xAF\xF7 |0
-<U8333> \xD3\x73 |0
-<U8334> \xAF\xF5 |0
-<U8335> \xAF\xF4 |0
-<U8336> \xAF\xF9 |0
-<U8337> \xD3\xAB |0
-<U8338> \xAF\xF1 |0
-<U8339> \xAF\xF8 |0
-<U833A> \xD0\x72 |0
-<U833B> \xDB\x5C |0
-<U833C> \xD3\xA6 |0
-<U833F> \xD3\x7A |0
-<U8340> \xAF\xFB |0
-<U8341> \xD3\x7B |0
-<U8342> \xD3\xA1 |0
-<U8343> \xAF\xFE |0
-<U8344> \xD3\x75 |0
-<U8345> \xD3\xAF |0
-<U8347> \xD3\xAE |0
-<U8348> \xD3\xB6 |0
-<U8349> \xAF\xF3 |0
-<U834A> \xAF\xF0 |0
-<U834B> \xD3\xB4 |0
-<U834C> \xD3\xB0 |0
-<U834D> \xD3\xA7 |0
-<U834E> \xD3\xA2 |0
-<U834F> \xAF\xF6 |0
-<U8350> \xAF\xF2 |0
-<U8351> \xD3\x77 |0
-<U8352> \xAF\xEE |0
-<U8353> \xD3\xB1 |0
-<U8354> \xAF\xEF |0
-<U8356> \xD3\x79 |0
-<U8373> \xD7\x5E |0
-<U8374> \xD7\x60 |0
-<U8375> \xD7\x65 |0
-<U8376> \xD7\x79 |0
-<U8377> \xB2\xFC |0
-<U8378> \xB2\xF2 |0
-<U837A> \xD7\x5D |0
-<U837B> \xB2\xFD |0
-<U837C> \xB2\xFE |0
-<U837D> \xD7\x68 |0
-<U837E> \xD7\x6F |0
-<U837F> \xD7\x75 |0
-<U8381> \xD7\x62 |0
-<U8383> \xD7\x69 |0
-<U8386> \xB3\x40 |0
-<U8387> \xD7\x77 |0
-<U8388> \xD7\x72 |0
-<U8389> \xB2\xFA |0
-<U838A> \xB2\xF8 |0
-<U838B> \xD7\x6E |0
-<U838C> \xD7\x6A |0
-<U838D> \xD7\x5C |0
-<U838E> \xB2\xEF |0
-<U838F> \xD7\x61 |0
-<U8390> \xD7\x59 |0
-<U8392> \xB2\xF7 |0
-<U8393> \xB2\xF9 |0
-<U8394> \xD7\x66 |0
-<U8395> \xD7\x63 |0
-<U8396> \xB2\xF4 |0
-<U8397> \xD7\x73 |0
-<U8398> \xB2\xF1 |0
-<U8399> \xD7\x64 |0
-<U839A> \xD7\x7A |0
-<U839B> \xD7\x6C |0
-<U839D> \xD7\x6B |0
-<U839E> \xB2\xF0 |0
-<U83A0> \xB2\xFB |0
-<U83A2> \xB2\xF3 |0
-<U83A3> \xD7\x5A |0
-<U83A4> \xD7\x5F |0
-<U83A5> \xD7\x70 |0
-<U83A6> \xD7\x76 |0
-<U83A7> \xB3\x41 |0
-<U83A8> \xD7\x5B |0
-<U83A9> \xD7\x67 |0
-<U83AA> \xD7\x6D |0
-<U83AB> \xB2\xF6 |0
-<U83AE> \xD7\x78 |0
-<U83AF> \xD7\x71 |0
-<U83B0> \xD7\x74 |0
-<U83BD> \xB2\xF5 |0
-<U83BF> \xDB\x6C |0
-<U83C0> \xDB\x60 |0
-<U83C1> \xB5\xD7 |0
-<U83C2> \xDB\x7D |0
-<U83C3> \xDB\xA7 |0
-<U83C4> \xDB\xAA |0
-<U83C5> \xB5\xD5 |0
-<U83C6> \xDB\x68 |0
-<U83C7> \xDB\xA3 |0
-<U83C8> \xDB\x69 |0
-<U83C9> \xDB\x77 |0
-<U83CA> \xB5\xE2 |0
-<U83CB> \xDB\x73 |0
-<U83CC> \xB5\xDF |0
-<U83CE> \xDB\x74 |0
-<U83CF> \xDB\x5D |0
-<U83D1> \xDB\xA4 |0
-<U83D4> \xB5\xE8 |0
-<U83D5> \xDB\xA1 |0
-<U83D6> \xDB\x75 |0
-<U83D7> \xDB\xAC |0
-<U83D8> \xDB\x70 |0
-<U83D9> \xDF\xC8 |0
-<U83DB> \xDB\xAF |0
-<U83DC> \xB5\xE6 |0
-<U83DD> \xDB\x6E |0
-<U83DE> \xDB\x7A |0
-<U83DF> \xB5\xE9 |0
-<U83E0> \xB5\xD4 |0
-<U83E1> \xDB\x72 |0
-<U83E2> \xDB\xAD |0
-<U83E3> \xDB\x6B |0
-<U83E4> \xDB\x64 |0
-<U83E5> \xDB\x6F |0
-<U83E7> \xDB\x63 |0
-<U83E8> \xDB\x61 |0
-<U83E9> \xB5\xD0 |0
-<U83EA> \xDB\xA5 |0
-<U83EB> \xDB\x6A |0
-<U83EC> \xDB\xA8 |0
-<U83EE> \xDB\xA9 |0
-<U83EF> \xB5\xD8 |0
-<U83F0> \xB5\xDD |0
-<U83F1> \xB5\xD9 |0
-<U83F2> \xB5\xE1 |0
-<U83F3> \xDB\x7E |0
-<U83F4> \xB5\xDA |0
-<U83F5> \xDB\x76 |0
-<U83F6> \xDB\x66 |0
-<U83F8> \xB5\xD2 |0
-<U83F9> \xDB\x5E |0
-<U83FA> \xDB\xA2 |0
-<U83FB> \xDB\xAB |0
-<U83FC> \xDB\x65 |0
-<U83FD> \xB5\xE0 |0
-<U83FE> \xDB\xB0 |0
-<U83FF> \xDB\x71 |0
-<U8401> \xDB\x6D |0
-<U8403> \xB5\xD1 |0
-<U8404> \xB5\xE5 |0
-<U8406> \xDB\x7C |0
-<U8407> \xB5\xE7 |0
-<U8409> \xDB\x78 |0
-<U840A> \xB5\xDC |0
-<U840B> \xB5\xD6 |0
-<U840C> \xB5\xDE |0
-<U840D> \xB5\xD3 |0
-<U840E> \xB5\xE4 |0
-<U840F> \xDB\x79 |0
-<U8410> \xDB\x67 |0
-<U8411> \xDB\x7B |0
-<U8412> \xDB\x62 |0
-<U8413> \xDB\xA6 |0
-<U841B> \xDB\xAE |0
-<U8423> \xDB\x5F |0
-<U8429> \xDF\xC7 |0
-<U842B> \xDF\xDD |0
-<U842C> \xB8\x55 |0
-<U842D> \xDF\xCC |0
-<U842F> \xDF\xCA |0
-<U8430> \xDF\xB5 |0
-<U8431> \xB8\xA9 |0
-<U8432> \xDF\xC5 |0
-<U8433> \xDF\xD9 |0
-<U8434> \xDF\xC1 |0
-<U8435> \xB8\xB1 |0
-<U8436> \xDF\xD8 |0
-<U8437> \xDF\xBF |0
-<U8438> \xB5\xE3 |0
-<U8439> \xDF\xCF |0
-<U843A> \xDF\xC0 |0
-<U843B> \xDF\xD6 |0
-<U843C> \xB8\xB0 |0
-<U843D> \xB8\xA8 |0
-<U843F> \xDF\xAA |0
-<U8440> \xDF\xB2 |0
-<U8442> \xDF\xCB |0
-<U8443> \xDF\xC3 |0
-<U8444> \xDF\xDC |0
-<U8445> \xDF\xC6 |0
-<U8446> \xB8\xB6 |0
-<U8447> \xDF\xD7 |0
-<U8449> \xB8\xAD |0
-<U844B> \xDF\xC9 |0
-<U844C> \xDF\xD1 |0
-<U844D> \xDF\xB6 |0
-<U844E> \xDF\xD0 |0
-<U8450> \xDF\xE1 |0
-<U8451> \xDF\xB1 |0
-<U8452> \xDF\xD2 |0
-<U8454> \xDF\xDF |0
-<U8456> \xDF\xAB |0
-<U8457> \xB5\xDB |0
-<U8459> \xDF\xB9 |0
-<U845A> \xDF\xB8 |0
-<U845B> \xB8\xAF |0
-<U845D> \xDF\xBC |0
-<U845E> \xDF\xBE |0
-<U845F> \xDF\xCD |0
-<U8460> \xDF\xDE |0
-<U8461> \xB8\xB2 |0
-<U8463> \xB8\xB3 |0
-<U8465> \xDF\xB0 |0
-<U8466> \xB8\xAB |0
-<U8467> \xDF\xB4 |0
-<U8468> \xDF\xDA |0
-<U8469> \xB8\xB4 |0
-<U846B> \xB8\xAC |0
-<U846C> \xB8\xAE |0
-<U846D> \xB8\xB5 |0
-<U846E> \xDF\xE0 |0
-<U846F> \xDF\xD3 |0
-<U8470> \xDF\xCE |0
-<U8473> \xDF\xBB |0
-<U8474> \xDF\xBA |0
-<U8475> \xB8\xAA |0
-<U8476> \xDF\xAC |0
-<U8477> \xB8\xA7 |0
-<U8478> \xDF\xC4 |0
-<U8479> \xDF\xAD |0
-<U847A> \xDF\xC2 |0
-<U847D> \xDF\xB7 |0
-<U847E> \xDF\xDB |0
-<U8482> \xB8\xA6 |0
-<U8486> \xDF\xB3 |0
-<U848D> \xDF\xAF |0
-<U848E> \xDF\xD5 |0
-<U848F> \xDF\xAE |0
-<U8490> \xBB\x60 |0
-<U8491> \xE3\xD3 |0
-<U8494> \xE3\xC2 |0
-<U8497> \xE3\xAC |0
-<U8498> \xE3\xCA |0
-<U8499> \xBB\x58 |0
-<U849A> \xE3\xBB |0
-<U849B> \xE3\xC5 |0
-<U849C> \xBB\x5B |0
-<U849D> \xE3\xBE |0
-<U849E> \xBB\x59 |0
-<U849F> \xE3\xAF |0
-<U84A0> \xE3\xCD |0
-<U84A1> \xE3\xAE |0
-<U84A2> \xE3\xC1 |0
-<U84A4> \xE3\xAD |0
-<U84A7> \xE3\xBF |0
-<U84A8> \xE3\xC8 |0
-<U84A9> \xE3\xC6 |0
-<U84AA> \xE3\xBA |0
-<U84AB> \xE3\xB5 |0
-<U84AC> \xE3\xB3 |0
-<U84AE> \xE3\xB4 |0
-<U84AF> \xE3\xC7 |0
-<U84B0> \xE3\xD2 |0
-<U84B1> \xE3\xBC |0
-<U84B2> \xBB\x5A |0
-<U84B4> \xE3\xB7 |0
-<U84B6> \xE3\xCB |0
-<U84B8> \xBB\x5D |0
-<U84B9> \xE3\xB6 |0
-<U84BA> \xE3\xB0 |0
-<U84BB> \xE3\xC0 |0
-<U84BC> \xBB\x61 |0
-<U84BF> \xBB\x55 |0
-<U84C0> \xBB\x5E |0
-<U84C1> \xE3\xB8 |0
-<U84C2> \xE3\xB2 |0
-<U84C4> \xBB\x57 |0
-<U84C5> \xDF\xD4 |0
-<U84C6> \xBB\x56 |0
-<U84C7> \xE3\xC3 |0
-<U84C9> \xBB\x54 |0
-<U84CA> \xBB\x63 |0
-<U84CB> \xBB\x5C |0
-<U84CC> \xE3\xC4 |0
-<U84CD> \xE3\xB9 |0
-<U84CE> \xE3\xB1 |0
-<U84CF> \xE3\xCC |0
-<U84D0> \xE3\xBD |0
-<U84D1> \xBB\x62 |0
-<U84D2> \xE3\xD0 |0
-<U84D3> \xBB\x5F |0
-<U84D4> \xE3\xCF |0
-<U84D6> \xE3\xC9 |0
-<U84D7> \xE3\xCE |0
-<U84DB> \xE3\xD1 |0
-<U84E7> \xE7\x73 |0
-<U84E8> \xE7\x74 |0
-<U84E9> \xE7\x67 |0
-<U84EA> \xE7\x66 |0
-<U84EB> \xE7\x62 |0
-<U84EC> \xBD\xB4 |0
-<U84EE> \xBD\xAC |0
-<U84EF> \xE7\x76 |0
-<U84F0> \xE7\x75 |0
-<U84F1> \xDF\xA9 |0
-<U84F2> \xE7\x5F |0
-<U84F3> \xE7\x63 |0
-<U84F4> \xE7\x5D |0
-<U84F6> \xE7\x70 |0
-<U84F7> \xE7\x61 |0
-<U84F9> \xE7\x77 |0
-<U84FA> \xE7\x5A |0
-<U84FB> \xE7\x58 |0
-<U84FC> \xE7\x64 |0
-<U84FD> \xE7\x6E |0
-<U84FE> \xE7\x69 |0
-<U84FF> \xBD\xB6 |0
-<U8500> \xE7\x4F |0
-<U8502> \xE7\x6D |0
-<U8506> \xBD\xB7 |0
-<U8507> \xDF\xBD |0
-<U8508> \xE7\x5B |0
-<U8509> \xE7\x52 |0
-<U850A> \xE7\x55 |0
-<U850B> \xE7\x7B |0
-<U850C> \xE7\x5C |0
-<U850D> \xE7\x53 |0
-<U850E> \xE7\x51 |0
-<U850F> \xE7\x4E |0
-<U8511> \xBD\xB0 |0
-<U8512> \xE7\x65 |0
-<U8513> \xBD\xAF |0
-<U8514> \xBD\xB3 |0
-<U8515> \xE7\x60 |0
-<U8516> \xE7\x68 |0
-<U8517> \xBD\xA9 |0
-<U8518> \xE7\x78 |0
-<U8519> \xE7\x7C |0
-<U851A> \xBD\xAB |0
-<U851C> \xE7\x57 |0
-<U851D> \xE7\x6B |0
-<U851E> \xE7\x6F |0
-<U851F> \xE7\x54 |0
-<U8520> \xE7\x79 |0
-<U8521> \xBD\xB2 |0
-<U8523> \xBD\xB1 |0
-<U8524> \xE7\x4C |0
-<U8525> \xBD\xB5 |0
-<U8526> \xE7\x72 |0
-<U8527> \xE7\x56 |0
-<U8528> \xE7\x6A |0
-<U8529> \xE7\x50 |0
-<U852A> \xE7\x5E |0
-<U852B> \xE7\x59 |0
-<U852C> \xBD\xAD |0
-<U852D> \xBD\xAE |0
-<U852E> \xE7\x6C |0
-<U852F> \xE7\x7D |0
-<U8530> \xE7\x7A |0
-<U8531> \xE7\x71 |0
-<U853B> \xE7\x4D |0
-<U853D> \xBD\xAA |0
-<U853E> \xEB\x49 |0
-<U8540> \xEB\x40 |0
-<U8541> \xEB\x43 |0
-<U8543> \xBF\xBB |0
-<U8544> \xEB\x45 |0
-<U8545> \xEA\xF9 |0
-<U8546> \xEB\x41 |0
-<U8547> \xEB\x47 |0
-<U8548> \xBF\xB8 |0
-<U8549> \xBF\xBC |0
-<U854A> \xBF\xB6 |0
-<U854D> \xEA\xFB |0
-<U854E> \xEB\x4C |0
-<U8551> \xEB\x46 |0
-<U8553> \xEA\xFC |0
-<U8554> \xEB\x55 |0
-<U8555> \xEB\x4F |0
-<U8556> \xEA\xF8 |0
-<U8557> \xEE\x46 |0
-<U8558> \xEA\xFE |0
-<U8559> \xBF\xB7 |0
-<U855B> \xEB\x4A |0
-<U855D> \xEB\x54 |0
-<U855E> \xBF\xBF |0
-<U8560> \xEB\x51 |0
-<U8561> \xEA\xFD |0
-<U8562> \xEB\x44 |0
-<U8563> \xEB\x48 |0
-<U8564> \xEB\x42 |0
-<U8565> \xEB\x56 |0
-<U8566> \xEB\x53 |0
-<U8567> \xEB\x50 |0
-<U8568> \xBF\xB9 |0
-<U8569> \xBF\xBA |0
-<U856A> \xBF\xBE |0
-<U856B> \xEA\xFA |0
-<U856C> \xEB\x57 |0
-<U856D> \xBF\xBD |0
-<U856E> \xEB\x4D |0
-<U8571> \xEB\x4B |0
-<U8575> \xEB\x4E |0
-<U8576> \xEE\x53 |0
-<U8577> \xEE\x40 |0
-<U8578> \xEE\x45 |0
-<U8579> \xEE\x52 |0
-<U857A> \xEE\x44 |0
-<U857B> \xED\xFB |0
-<U857C> \xEE\x41 |0
-<U857E> \xC1\xA2 |0
-<U8580> \xED\xF4 |0
-<U8581> \xEE\x4D |0
-<U8582> \xEE\x4F |0
-<U8583> \xED\xF3 |0
-<U8584> \xC1\xA1 |0
-<U8585> \xEE\x51 |0
-<U8586> \xEE\x49 |0
-<U8587> \xC1\xA8 |0
-<U8588> \xEE\x50 |0
-<U8589> \xEE\x42 |0
-<U858A> \xC1\xAA |0
-<U858B> \xED\xF9 |0
-<U858C> \xEB\x52 |0
-<U858D> \xEE\x4A |0
-<U858E> \xEE\x47 |0
-<U858F> \xED\xF5 |0
-<U8590> \xEE\x55 |0
-<U8591> \xC1\xA4 |0
-<U8594> \xC1\xA5 |0
-<U8595> \xED\xF7 |0
-<U8596> \xEE\x48 |0
-<U8598> \xEE\x54 |0
-<U8599> \xEE\x4B |0
-<U859A> \xED\xFD |0
-<U859B> \xC1\xA7 |0
-<U859C> \xC1\xA3 |0
-<U859D> \xEE\x4C |0
-<U859E> \xED\xFE |0
-<U859F> \xEE\x56 |0
-<U85A0> \xED\xF8 |0
-<U85A1> \xEE\x43 |0
-<U85A2> \xEE\x4E |0
-<U85A3> \xED\xFA |0
-<U85A4> \xED\xFC |0
-<U85A6> \xC2\xCB |0
-<U85A7> \xED\xF6 |0
-<U85A8> \xC1\xA9 |0
-<U85A9> \xC2\xC4 |0
-<U85AA> \xC1\x7E |0
-<U85AF> \xC1\xA6 |0
-<U85B0> \xC2\xC8 |0
-<U85B1> \xF0\xB3 |0
-<U85B3> \xF0\xA9 |0
-<U85B4> \xF0\xA4 |0
-<U85B5> \xF0\xAA |0
-<U85B6> \xF0\xB4 |0
-<U85B7> \xF0\xB8 |0
-<U85B8> \xF0\xB7 |0
-<U85B9> \xC2\xCA |0
-<U85BA> \xC2\xC9 |0
-<U85BD> \xF0\xAB |0
-<U85BE> \xF0\xB9 |0
-<U85BF> \xF0\xAE |0
-<U85C0> \xF0\xA6 |0
-<U85C2> \xF0\xA8 |0
-<U85C3> \xF0\xA7 |0
-<U85C4> \xF0\xAD |0
-<U85C5> \xF0\xB2 |0
-<U85C6> \xF0\xA5 |0
-<U85C7> \xF0\xAC |0
-<U85C8> \xF0\xB1 |0
-<U85C9> \xC2\xC7 |0
-<U85CB> \xF0\xAF |0
-<U85CD> \xC2\xC5 |0
-<U85CE> \xF0\xB0 |0
-<U85CF> \xC2\xC3 |0
-<U85D0> \xC2\xC6 |0
-<U85D1> \xF2\xD5 |0
-<U85D2> \xF0\xB5 |0
-<U85D5> \xC3\xC2 |0
-<U85D7> \xF2\xCD |0
-<U85D8> \xF2\xD1 |0
-<U85D9> \xF2\xC9 |0
-<U85DA> \xF2\xCC |0
-<U85DC> \xF2\xD4 |0
-<U85DD> \xC3\xC0 |0
-<U85DE> \xF2\xD9 |0
-<U85DF> \xF2\xD2 |0
-<U85E1> \xF2\xCA |0
-<U85E2> \xF2\xDA |0
-<U85E3> \xF2\xD3 |0
-<U85E4> \xC3\xC3 |0
-<U85E5> \xC3\xC4 |0
-<U85E6> \xF2\xD7 |0
-<U85E8> \xF2\xCB |0
-<U85E9> \xC3\xBF |0
-<U85EA> \xC3\xC1 |0
-<U85EB> \xF2\xC6 |0
-<U85EC> \xF2\xCE |0
-<U85ED> \xF2\xC8 |0
-<U85EF> \xF2\xD8 |0
-<U85F0> \xF2\xD6 |0
-<U85F1> \xF2\xC7 |0
-<U85F2> \xF2\xCF |0
-<U85F6> \xF4\xBE |0
-<U85F7> \xC3\xC5 |0
-<U85F8> \xF2\xD0 |0
-<U85F9> \xC4\xA7 |0
-<U85FA> \xC4\xA9 |0
-<U85FB> \xC4\xA6 |0
-<U85FD> \xF4\xC3 |0
-<U85FE> \xF4\xBB |0
-<U85FF> \xF4\xB9 |0
-<U8600> \xF4\xBD |0
-<U8601> \xF4\xBA |0
-<U8604> \xF4\xBF |0
-<U8605> \xF4\xC1 |0
-<U8606> \xC4\xAA |0
-<U8607> \xC4\xAC |0
-<U8609> \xF4\xC0 |0
-<U860A> \xC4\xAD |0
-<U860B> \xC4\xAB |0
-<U860C> \xF4\xC2 |0
-<U8611> \xC4\xA8 |0
-<U8617> \xC4\xF4 |0
-<U8618> \xF5\xF1 |0
-<U8619> \xF5\xF7 |0
-<U861A> \xC4\xF6 |0
-<U861B> \xF4\xBC |0
-<U861C> \xF5\xF6 |0
-<U861E> \xF5\xFD |0
-<U861F> \xF5\xF4 |0
-<U8620> \xF5\xFB |0
-<U8621> \xF5\xFA |0
-<U8622> \xF4\xB8 |0
-<U8623> \xF5\xF5 |0
-<U8624> \xF0\xB6 |0
-<U8625> \xF5\xFE |0
-<U8626> \xF5\xF3 |0
-<U8627> \xF5\xF8 |0
-<U8629> \xF5\xFC |0
-<U862A> \xF5\xF2 |0
-<U862C> \xF7\x4A |0
-<U862D> \xC4\xF5 |0
-<U862E> \xF5\xF9 |0
-<U8631> \xF7\xF4 |0
-<U8632> \xF7\x4B |0
-<U8633> \xF7\x49 |0
-<U8634> \xF7\x47 |0
-<U8635> \xF7\x48 |0
-<U8636> \xF7\x4C |0
-<U8638> \xC5\xD9 |0
-<U8639> \xF7\xF2 |0
-<U863A> \xF7\xF0 |0
-<U863B> \xF7\xF5 |0
-<U863C> \xF7\xF3 |0
-<U863E> \xF7\xF6 |0
-<U863F> \xC5\xDA |0
-<U8640> \xF7\xF1 |0
-<U8643> \xF8\xBC |0
-<U8646> \xF9\x45 |0
-<U8647> \xF9\x46 |0
-<U8648> \xF9\x47 |0
-<U864B> \xF9\xC7 |0
-<U864C> \xF9\xBD |0
-<U864D> \xCA\x4F |0
-<U864E> \xAA\xEA |0
-<U8650> \xAD\x68 |0
-<U8652> \xD3\xB8 |0
-<U8653> \xD3\xB7 |0
-<U8654> \xB0\x40 |0
-<U8655> \xB3\x42 |0
-<U8656> \xD7\x7C |0
-<U8659> \xD7\x7B |0
-<U865B> \xB5\xEA |0
-<U865C> \xB8\xB8 |0
-<U865E> \xB8\xB7 |0
-<U865F> \xB8\xB9 |0
-<U8661> \xE3\xD4 |0
-<U8662> \xE7\x7E |0
-<U8663> \xEB\x58 |0
-<U8664> \xEB\x5A |0
-<U8665> \xEB\x59 |0
-<U8667> \xC1\xAB |0
-<U8668> \xEE\x57 |0
-<U8669> \xF0\xBA |0
-<U866A> \xF9\xA5 |0
-<U866B> \xA6\xE4 |0
-<U866D> \xCD\xC9 |0
-<U866E> \xCD\xCA |0
-<U866F> \xCD\xC8 |0
-<U8670> \xCD\xC7 |0
-<U8671> \xAA\xEB |0
-<U8673> \xD0\xA9 |0
-<U8674> \xD0\xA7 |0
-<U8677> \xD0\xA6 |0
-<U8679> \xAD\x69 |0
-<U867A> \xAD\x6B |0
-<U867B> \xAD\x6A |0
-<U867C> \xD0\xA8 |0
-<U8685> \xD3\xC4 |0
-<U8686> \xD3\xC1 |0
-<U8687> \xD3\xBF |0
-<U868A> \xB0\x41 |0
-<U868B> \xD3\xC2 |0
-<U868C> \xB0\x46 |0
-<U868D> \xD3\xBC |0
-<U868E> \xD3\xCB |0
-<U8690> \xD3\xCD |0
-<U8691> \xD3\xBD |0
-<U8693> \xB0\x43 |0
-<U8694> \xD3\xCE |0
-<U8695> \xD3\xC9 |0
-<U8696> \xD3\xBB |0
-<U8697> \xD3\xC0 |0
-<U8698> \xD3\xCA |0
-<U8699> \xD3\xC6 |0
-<U869A> \xD3\xC3 |0
-<U869C> \xB0\x48 |0
-<U869D> \xD3\xCC |0
-<U869E> \xD3\xBE |0
-<U86A1> \xD3\xC7 |0
-<U86A2> \xD3\xB9 |0
-<U86A3> \xB0\x47 |0
-<U86A4> \xB0\x44 |0
-<U86A5> \xD3\xC5 |0
-<U86A7> \xD3\xC8 |0
-<U86A8> \xD3\xBA |0
-<U86A9> \xB0\x45 |0
-<U86AA> \xB0\x42 |0
-<U86AF> \xB3\x4C |0
-<U86B0> \xD7\xA5 |0
-<U86B1> \xB3\x4B |0
-<U86B3> \xD7\xA8 |0
-<U86B4> \xD7\xAB |0
-<U86B5> \xB3\x48 |0
-<U86B6> \xB3\x46 |0
-<U86B7> \xD7\x7E |0
-<U86B8> \xD7\xA9 |0
-<U86B9> \xD7\xA7 |0
-<U86BA> \xD7\xA4 |0
-<U86BB> \xD7\xAC |0
-<U86BC> \xD7\xAD |0
-<U86BD> \xD7\xAF |0
-<U86BE> \xD7\xB0 |0
-<U86BF> \xD7\x7D |0
-<U86C0> \xB3\x45 |0
-<U86C1> \xD7\xA2 |0
-<U86C2> \xD7\xA1 |0
-<U86C3> \xD7\xAE |0
-<U86C4> \xB3\x47 |0
-<U86C5> \xD7\xA3 |0
-<U86C6> \xB3\x49 |0
-<U86C7> \xB3\x44 |0
-<U86C8> \xD7\xA6 |0
-<U86C9> \xB3\x4D |0
-<U86CB> \xB3\x4A |0
-<U86CC> \xD7\xAA |0
-<U86D0> \xB5\xF1 |0
-<U86D1> \xDB\xBF |0
-<U86D3> \xDB\xB4 |0
-<U86D4> \xB5\xEE |0
-<U86D6> \xDF\xE7 |0
-<U86D7> \xDB\xBD |0
-<U86D8> \xDB\xB1 |0
-<U86D9> \xB5\xEC |0
-<U86DA> \xDB\xB6 |0
-<U86DB> \xB5\xEF |0
-<U86DC> \xDB\xBA |0
-<U86DD> \xDB\xB8 |0
-<U86DE> \xB5\xF2 |0
-<U86DF> \xB5\xEB |0
-<U86E2> \xDB\xB2 |0
-<U86E3> \xDB\xB5 |0
-<U86E4> \xB5\xF0 |0
-<U86E6> \xDB\xB3 |0
-<U86E8> \xDB\xBE |0
-<U86E9> \xDB\xBC |0
-<U86EA> \xDB\xB7 |0
-<U86EB> \xDB\xB9 |0
-<U86EC> \xDB\xBB |0
-<U86ED> \xB5\xED |0
-<U86F5> \xDF\xE8 |0
-<U86F6> \xDF\xEE |0
-<U86F7> \xDF\xE4 |0
-<U86F8> \xDF\xEA |0
-<U86F9> \xB8\xBA |0
-<U86FA> \xDF\xE6 |0
-<U86FB> \xB8\xC0 |0
-<U86FE> \xB8\xBF |0
-<U8700> \xB8\xBE |0
-<U8701> \xDF\xED |0
-<U8702> \xB8\xC1 |0
-<U8703> \xB8\xC2 |0
-<U8704> \xDF\xE3 |0
-<U8705> \xDF\xF0 |0
-<U8706> \xB8\xC3 |0
-<U8707> \xB8\xBD |0
-<U8708> \xB8\xBC |0
-<U8709> \xDF\xEC |0
-<U870A> \xB8\xC4 |0
-<U870B> \xDF\xE2 |0
-<U870C> \xDF\xE5 |0
-<U870D> \xDF\xEF |0
-<U870E> \xDF\xEB |0
-<U8711> \xE3\xF4 |0
-<U8712> \xE3\xE9 |0
-<U8713> \xB8\xBB |0
-<U8718> \xBB\x6A |0
-<U8719> \xE3\xDD |0
-<U871A> \xE3\xF2 |0
-<U871B> \xE3\xDE |0
-<U871C> \xBB\x65 |0
-<U871E> \xE3\xDB |0
-<U8720> \xE3\xE4 |0
-<U8721> \xE3\xDC |0
-<U8722> \xBB\x67 |0
-<U8723> \xE3\xD6 |0
-<U8724> \xE3\xF1 |0
-<U8725> \xBB\x68 |0
-<U8726> \xE3\xEE |0
-<U8727> \xE3\xEF |0
-<U8728> \xE3\xD7 |0
-<U8729> \xBB\x6D |0
-<U872A> \xE3\xE6 |0
-<U872C> \xE3\xE0 |0
-<U872D> \xE3\xE7 |0
-<U872E> \xE3\xDA |0
-<U8730> \xE3\xF3 |0
-<U8731> \xE3\xEB |0
-<U8732> \xE3\xE5 |0
-<U8733> \xE3\xD5 |0
-<U8734> \xBB\x69 |0
-<U8735> \xE3\xEC |0
-<U8737> \xBB\x6C |0
-<U8738> \xE3\xF0 |0
-<U873A> \xE3\xEA |0
-<U873B> \xBB\x66 |0
-<U873C> \xE3\xE8 |0
-<U873E> \xE3\xE2 |0
-<U873F> \xBB\x64 |0
-<U8740> \xE3\xD9 |0
-<U8741> \xE3\xE1 |0
-<U8742> \xE3\xED |0
-<U8743> \xE3\xDF |0
-<U8746> \xE3\xE3 |0
-<U874C> \xBD\xC1 |0
-<U874D> \xDF\xE9 |0
-<U874E> \xE7\xB2 |0
-<U874F> \xE7\xBB |0
-<U8750> \xE7\xB1 |0
-<U8751> \xE7\xAD |0
-<U8752> \xE7\xAA |0
-<U8753> \xBD\xC2 |0
-<U8754> \xE7\xA8 |0
-<U8755> \xBB\x6B |0
-<U8756> \xE7\xA1 |0
-<U8757> \xBD\xC0 |0
-<U8758> \xE7\xA7 |0
-<U8759> \xBD\xBF |0
-<U875A> \xE7\xAC |0
-<U875B> \xE7\xA9 |0
-<U875C> \xE7\xB9 |0
-<U875D> \xE7\xB4 |0
-<U875E> \xE7\xAE |0
-<U875F> \xE7\xB3 |0
-<U8760> \xBD\xBB |0
-<U8761> \xE7\xAB |0
-<U8762> \xE7\xBE |0
-<U8763> \xE7\xA2 |0
-<U8764> \xE7\xA3 |0
-<U8765> \xE7\xBA |0
-<U8766> \xBD\xBC |0
-<U8767> \xE7\xBF |0
-<U8768> \xBD\xBE |0
-<U8769> \xE7\xC0 |0
-<U876A> \xE7\xB0 |0
-<U876B> \xE3\xD8 |0
-<U876C> \xE7\xB6 |0
-<U876D> \xE7\xAF |0
-<U876E> \xE7\xB8 |0
-<U876F> \xE7\xB5 |0
-<U8773> \xE7\xA6 |0
-<U8774> \xBD\xB9 |0
-<U8775> \xE7\xBD |0
-<U8776> \xBD\xBA |0
-<U8777> \xE7\xA4 |0
-<U8778> \xBD\xBD |0
-<U8779> \xEB\x64 |0
-<U877A> \xE7\xB7 |0
-<U877B> \xE7\xBC |0
-<U8781> \xEB\x61 |0
-<U8782> \xBD\xB8 |0
-<U8783> \xBF\xC0 |0
-<U8784> \xEB\x6B |0
-<U8785> \xEB\x67 |0
-<U8787> \xEB\x65 |0
-<U8788> \xEB\x60 |0
-<U8789> \xEB\x6F |0
-<U878D> \xBF\xC4 |0
-<U878F> \xEB\x5C |0
-<U8790> \xEB\x68 |0
-<U8791> \xEB\x69 |0
-<U8792> \xEB\x5F |0
-<U8793> \xEB\x5E |0
-<U8794> \xEB\x6C |0
-<U8796> \xEB\x62 |0
-<U8797> \xEB\x5D |0
-<U8798> \xEB\x63 |0
-<U879A> \xEB\x6E |0
-<U879B> \xEB\x5B |0
-<U879C> \xEB\x6D |0
-<U879D> \xEB\x6A |0
-<U879E> \xBF\xC2 |0
-<U879F> \xBF\xC1 |0
-<U87A2> \xBF\xC3 |0
-<U87A3> \xEB\x66 |0
-<U87A4> \xF0\xCB |0
-<U87AA> \xEE\x59 |0
-<U87AB> \xC1\xB1 |0
-<U87AC> \xEE\x5D |0
-<U87AD> \xEE\x5A |0
-<U87AE> \xEE\x61 |0
-<U87AF> \xEE\x67 |0
-<U87B0> \xEE\x5C |0
-<U87B2> \xEE\x70 |0
-<U87B3> \xC1\xAE |0
-<U87B4> \xEE\x6A |0
-<U87B5> \xEE\x5F |0
-<U87B6> \xEE\x6B |0
-<U87B7> \xEE\x66 |0
-<U87B8> \xEE\x6D |0
-<U87B9> \xEE\x5E |0
-<U87BA> \xC1\xB3 |0
-<U87BB> \xC1\xB2 |0
-<U87BC> \xEE\x60 |0
-<U87BD> \xEE\x6E |0
-<U87BE> \xEE\x58 |0
-<U87BF> \xEE\x6C |0
-<U87C0> \xC1\xAC |0
-<U87C2> \xEE\x64 |0
-<U87C3> \xEE\x63 |0
-<U87C4> \xEE\x68 |0
-<U87C5> \xEE\x5B |0
-<U87C6> \xC1\xB0 |0
-<U87C8> \xC1\xB4 |0
-<U87C9> \xEE\x62 |0
-<U87CA> \xEE\x69 |0
-<U87CB> \xC1\xB5 |0
-<U87CC> \xEE\x65 |0
-<U87D1> \xC1\xAD |0
-<U87D2> \xC1\xAF |0
-<U87D3> \xF0\xC7 |0
-<U87D4> \xF0\xC5 |0
-<U87D7> \xF0\xCC |0
-<U87D8> \xF0\xC9 |0
-<U87D9> \xF0\xCD |0
-<U87DB> \xF0\xBE |0
-<U87DC> \xF0\xC6 |0
-<U87DD> \xF0\xD1 |0
-<U87DE> \xEE\x6F |0
-<U87DF> \xF0\xC2 |0
-<U87E0> \xC2\xCF |0
-<U87E1> \xE7\xA5 |0
-<U87E2> \xF0\xBD |0
-<U87E3> \xF0\xCA |0
-<U87E4> \xF0\xC4 |0
-<U87E5> \xF0\xC1 |0
-<U87E6> \xF0\xBC |0
-<U87E7> \xF0\xBB |0
-<U87E8> \xF0\xD0 |0
-<U87EA> \xF0\xC0 |0
-<U87EB> \xF0\xBF |0
-<U87EC> \xC2\xCD |0
-<U87ED> \xF0\xC8 |0
-<U87EF> \xC2\xCC |0
-<U87F2> \xC2\xCE |0
-<U87F3> \xF0\xC3 |0
-<U87F4> \xF0\xCF |0
-<U87F6> \xF2\xDE |0
-<U87F7> \xF2\xDF |0
-<U87F9> \xC3\xC9 |0
-<U87FA> \xF2\xDC |0
-<U87FB> \xC3\xC6 |0
-<U87FC> \xF2\xE4 |0
-<U87FE> \xC3\xCA |0
-<U87FF> \xF2\xE6 |0
-<U8800> \xF2\xDB |0
-<U8801> \xF0\xCE |0
-<U8802> \xF2\xE8 |0
-<U8803> \xF2\xDD |0
-<U8805> \xC3\xC7 |0
-<U8806> \xF2\xE3 |0
-<U8808> \xF2\xE5 |0
-<U8809> \xF2\xE0 |0
-<U880A> \xF2\xE7 |0
-<U880B> \xF2\xE2 |0
-<U880C> \xF2\xE1 |0
-<U880D> \xC3\xC8 |0
-<U8810> \xF4\xC5 |0
-<U8811> \xF4\xC6 |0
-<U8813> \xF4\xC8 |0
-<U8814> \xC4\xAE |0
-<U8815> \xC4\xAF |0
-<U8816> \xF4\xC9 |0
-<U8817> \xF4\xC7 |0
-<U8819> \xF4\xC4 |0
-<U881B> \xF6\x42 |0
-<U881C> \xF6\x45 |0
-<U881D> \xF6\x41 |0
-<U881F> \xC4\xFA |0
-<U8820> \xF6\x43 |0
-<U8821> \xC4\xF9 |0
-<U8822> \xC4\xF8 |0
-<U8823> \xC4\xF7 |0
-<U8824> \xF6\x44 |0
-<U8825> \xF7\x51 |0
-<U8826> \xF7\x4F |0
-<U8828> \xF7\x4E |0
-<U8829> \xF6\x40 |0
-<U882A> \xF7\x50 |0
-<U882B> \xF6\x46 |0
-<U882C> \xF7\x4D |0
-<U882E> \xF7\xF9 |0
-<U882F> \xF7\xD7 |0
-<U8830> \xF7\xF7 |0
-<U8831> \xC5\xDB |0
-<U8832> \xF7\xF8 |0
-<U8833> \xF7\xFA |0
-<U8835> \xF8\xBF |0
-<U8836> \xC5\xFA |0
-<U8837> \xF8\xBE |0
-<U8838> \xF8\xBD |0
-<U8839> \xC5\xFB |0
-<U883B> \xC6\x5A |0
-<U883C> \xF9\x6E |0
-<U883D> \xF9\xA7 |0
-<U883E> \xF9\xA6 |0
-<U883F> \xF9\xA8 |0
-<U8840> \xA6\xE5 |0
-<U8841> \xD0\xAA |0
-<U8843> \xD3\xCF |0
-<U8844> \xD3\xD0 |0
-<U8848> \xDB\xC0 |0
-<U884A> \xF6\x47 |0
-<U884B> \xF8\xC0 |0
-<U884C> \xA6\xE6 |0
-<U884D> \xAD\x6C |0
-<U884E> \xD0\xAB |0
-<U8852> \xD7\xB1 |0
-<U8853> \xB3\x4E |0
-<U8855> \xDB\xC2 |0
-<U8856> \xDB\xC1 |0
-<U8857> \xB5\xF3 |0
-<U8859> \xB8\xC5 |0
-<U885A> \xE7\xC1 |0
-<U885B> \xBD\xC3 |0
-<U885D> \xBD\xC4 |0
-<U8861> \xBF\xC5 |0
-<U8862> \xC5\xFC |0
-<U8863> \xA6\xE7 |0
-<U8867> \xD0\xAC |0
-<U8868> \xAA\xED |0
-<U8869> \xD0\xAE |0
-<U886A> \xD0\xAD |0
-<U886B> \xAD\x6D |0
-<U886D> \xD3\xD1 |0
-<U886F> \xD3\xD8 |0
-<U8870> \xB0\x49 |0
-<U8871> \xD3\xD6 |0
-<U8872> \xD3\xD4 |0
-<U8874> \xD3\xDB |0
-<U8875> \xD3\xD2 |0
-<U8876> \xD3\xD3 |0
-<U8877> \xB0\x4A |0
-<U8879> \xB0\x4E |0
-<U887C> \xD3\xDC |0
-<U887D> \xB0\x4D |0
-<U887E> \xD3\xDA |0
-<U887F> \xD3\xD7 |0
-<U8880> \xD3\xD5 |0
-<U8881> \xB0\x4B |0
-<U8882> \xB0\x4C |0
-<U8883> \xD3\xD9 |0
-<U8888> \xB3\x50 |0
-<U8889> \xD7\xB2 |0
-<U888B> \xB3\x55 |0
-<U888C> \xD7\xC2 |0
-<U888D> \xB3\x54 |0
-<U888E> \xD7\xC4 |0
-<U8891> \xD7\xB8 |0
-<U8892> \xB3\x52 |0
-<U8893> \xD7\xC3 |0
-<U8895> \xD7\xB3 |0
-<U8896> \xB3\x53 |0
-<U8897> \xD7\xBF |0
-<U8898> \xD7\xBB |0
-<U8899> \xD7\xBD |0
-<U889A> \xD7\xB7 |0
-<U889B> \xD7\xBE |0
-<U889E> \xB3\x4F |0
-<U889F> \xD7\xBA |0
-<U88A1> \xD7\xB9 |0
-<U88A2> \xD7\xB5 |0
-<U88A4> \xD7\xC0 |0
-<U88A7> \xD7\xBC |0
-<U88A8> \xD7\xB4 |0
-<U88AA> \xD7\xB6 |0
-<U88AB> \xB3\x51 |0
-<U88AC> \xD7\xC1 |0
-<U88B1> \xB5\xF6 |0
-<U88B2> \xDB\xCD |0
-<U88B6> \xDB\xC9 |0
-<U88B7> \xDB\xCB |0
-<U88B8> \xDB\xC6 |0
-<U88B9> \xDB\xC5 |0
-<U88BA> \xDB\xC3 |0
-<U88BC> \xDB\xCA |0
-<U88BD> \xDB\xCC |0
-<U88BE> \xDB\xC8 |0
-<U88C0> \xDB\xC7 |0
-<U88C1> \xB5\xF4 |0
-<U88C2> \xB5\xF5 |0
-<U88C9> \xDB\xCF |0
-<U88CA> \xB8\xCD |0
-<U88CB> \xDF\xF2 |0
-<U88CC> \xDF\xF8 |0
-<U88CD> \xDF\xF3 |0
-<U88CE> \xDF\xF4 |0
-<U88CF> \xF9\xD8 |0
-<U88D0> \xDF\xF9 |0
-<U88D2> \xB8\xCF |0
-<U88D4> \xB8\xC7 |0
-<U88D5> \xB8\xCE |0
-<U88D6> \xDF\xF1 |0
-<U88D7> \xDB\xC4 |0
-<U88D8> \xB8\xCA |0
-<U88D9> \xB8\xC8 |0
-<U88DA> \xDF\xF7 |0
-<U88DB> \xDF\xF6 |0
-<U88DC> \xB8\xC9 |0
-<U88DD> \xB8\xCB |0
-<U88DE> \xDF\xF5 |0
-<U88DF> \xB8\xC6 |0
-<U88E1> \xB8\xCC |0
-<U88E7> \xE3\xF6 |0
-<U88E8> \xBB\x74 |0
-<U88EB> \xE4\x42 |0
-<U88EC> \xE4\x41 |0
-<U88EE> \xE3\xFB |0
-<U88EF> \xBB\x76 |0
-<U88F0> \xE4\x40 |0
-<U88F1> \xE3\xF7 |0
-<U88F2> \xE3\xF8 |0
-<U88F3> \xBB\x6E |0
-<U88F4> \xBB\x70 |0
-<U88F6> \xE3\xFD |0
-<U88F7> \xE3\xF5 |0
-<U88F8> \xBB\x72 |0
-<U88F9> \xBB\x71 |0
-<U88FA> \xE3\xF9 |0
-<U88FB> \xE3\xFE |0
-<U88FC> \xE3\xFC |0
-<U88FD> \xBB\x73 |0
-<U88FE> \xE3\xFA |0
-<U8901> \xDB\xCE |0
-<U8902> \xBB\x6F |0
-<U8905> \xE7\xC2 |0
-<U8906> \xE7\xC9 |0
-<U8907> \xBD\xC6 |0
-<U8909> \xE7\xCD |0
-<U890A> \xBD\xCA |0
-<U890B> \xE7\xC5 |0
-<U890C> \xE7\xC3 |0
-<U890E> \xE7\xCC |0
-<U8910> \xBD\xC5 |0
-<U8911> \xE7\xCB |0
-<U8912> \xBD\xC7 |0
-<U8913> \xBD\xC8 |0
-<U8914> \xE7\xC4 |0
-<U8915> \xBD\xC9 |0
-<U8916> \xE7\xCA |0
-<U8917> \xE7\xC6 |0
-<U8918> \xE7\xC7 |0
-<U8919> \xE7\xC8 |0
-<U891A> \xBB\x75 |0
-<U891E> \xEB\x70 |0
-<U891F> \xEB\x7C |0
-<U8921> \xBF\xCA |0
-<U8922> \xEB\x77 |0
-<U8923> \xEB\x79 |0
-<U8925> \xBF\xC8 |0
-<U8926> \xEB\x71 |0
-<U8927> \xEB\x75 |0
-<U8929> \xEB\x78 |0
-<U892A> \xBF\xC6 |0
-<U892B> \xBF\xC9 |0
-<U892C> \xEB\x7B |0
-<U892D> \xEB\x73 |0
-<U892E> \xEB\x74 |0
-<U892F> \xEB\x7A |0
-<U8930> \xEB\x72 |0
-<U8931> \xEB\x76 |0
-<U8932> \xBF\xC7 |0
-<U8933> \xEE\x72 |0
-<U8935> \xEE\x71 |0
-<U8936> \xC1\xB7 |0
-<U8937> \xEE\x77 |0
-<U8938> \xC1\xB9 |0
-<U893B> \xC1\xB6 |0
-<U893C> \xEE\x73 |0
-<U893D> \xC1\xBA |0
-<U893E> \xEE\x74 |0
-<U8941> \xEE\x75 |0
-<U8942> \xEE\x78 |0
-<U8944> \xC1\xB8 |0
-<U8946> \xF0\xD6 |0
-<U8949> \xF0\xD9 |0
-<U894B> \xF0\xD3 |0
-<U894C> \xF0\xD5 |0
-<U894F> \xF0\xD4 |0
-<U8950> \xF0\xD7 |0
-<U8951> \xF0\xD8 |0
-<U8952> \xEE\x76 |0
-<U8953> \xF0\xD2 |0
-<U8956> \xC3\xCD |0
-<U8957> \xF2\xEC |0
-<U8958> \xF2\xEF |0
-<U8959> \xF2\xF1 |0
-<U895A> \xF2\xEA |0
-<U895B> \xF2\xEB |0
-<U895C> \xF2\xEE |0
-<U895D> \xF2\xF0 |0
-<U895E> \xC3\xCE |0
-<U895F> \xC3\xCC |0
-<U8960> \xC3\xCB |0
-<U8961> \xF2\xED |0
-<U8962> \xF2\xE9 |0
-<U8963> \xF4\xCA |0
-<U8964> \xC4\xB0 |0
-<U8966> \xF4\xCB |0
-<U8969> \xF6\x49 |0
-<U896A> \xC4\xFB |0
-<U896B> \xF6\x4B |0
-<U896C> \xC4\xFC |0
-<U896D> \xF6\x48 |0
-<U896E> \xF6\x4A |0
-<U896F> \xC5\xA8 |0
-<U8971> \xF7\x52 |0
-<U8972> \xC5\xA7 |0
-<U8973> \xF7\xFD |0
-<U8974> \xF7\xFC |0
-<U8976> \xF7\xFB |0
-<U8979> \xF9\x48 |0
-<U897A> \xF9\x49 |0
-<U897B> \xF9\x4B |0
-<U897C> \xF9\x4A |0
-<U897E> \xCA\x50 |0
-<U897F> \xA6\xE8 |0
-<U8981> \xAD\x6E |0
-<U8982> \xD7\xC5 |0
-<U8983> \xB5\xF7 |0
-<U8985> \xDF\xFA |0
-<U8986> \xC2\xD0 |0
-<U8988> \xF2\xF2 |0
-<U898B> \xA8\xA3 |0
-<U898F> \xB3\x57 |0
-<U8993> \xB3\x56 |0
-<U8995> \xDB\xD0 |0
-<U8996> \xB5\xF8 |0
-<U8997> \xDB\xD2 |0
-<U8998> \xDB\xD1 |0
-<U899B> \xDF\xFB |0
-<U899C> \xB8\xD0 |0
-<U899D> \xE4\x43 |0
-<U899E> \xE4\x46 |0
-<U899F> \xE4\x45 |0
-<U89A1> \xE4\x44 |0
-<U89A2> \xE7\xCE |0
-<U89A3> \xE7\xD0 |0
-<U89A4> \xE7\xCF |0
-<U89A6> \xBF\xCC |0
-<U89AA> \xBF\xCB |0
-<U89AC> \xC1\xBB |0
-<U89AD> \xEE\x79 |0
-<U89AE> \xEE\x7B |0
-<U89AF> \xEE\x7A |0
-<U89B2> \xC2\xD1 |0
-<U89B6> \xF2\xF4 |0
-<U89B7> \xF2\xF3 |0
-<U89B9> \xF4\xCC |0
-<U89BA> \xC4\xB1 |0
-<U89BD> \xC4\xFD |0
-<U89BE> \xF7\x54 |0
-<U89BF> \xF7\x53 |0
-<U89C0> \xC6\x5B |0
-<U89D2> \xA8\xA4 |0
-<U89D3> \xD0\xAF |0
-<U89D4> \xAD\x6F |0
-<U89D5> \xD7\xC8 |0
-<U89D6> \xD7\xC6 |0
-<U89D9> \xD7\xC7 |0
-<U89DA> \xDB\xD4 |0
-<U89DB> \xDB\xD5 |0
-<U89DC> \xE0\x43 |0
-<U89DD> \xDB\xD3 |0
-<U89DF> \xDF\xFC |0
-<U89E0> \xE0\x41 |0
-<U89E1> \xE0\x40 |0
-<U89E2> \xE0\x42 |0
-<U89E3> \xB8\xD1 |0
-<U89E4> \xDF\xFE |0
-<U89E5> \xDF\xFD |0
-<U89E6> \xE0\x44 |0
-<U89E8> \xE4\x49 |0
-<U89E9> \xE4\x47 |0
-<U89EB> \xE4\x48 |0
-<U89EC> \xE7\xD3 |0
-<U89ED> \xE7\xD1 |0
-<U89F0> \xE7\xD2 |0
-<U89F1> \xEB\x7D |0
-<U89F2> \xEE\x7C |0
-<U89F3> \xEE\x7D |0
-<U89F4> \xC2\xD2 |0
-<U89F6> \xF2\xF5 |0
-<U89F7> \xF4\xCD |0
-<U89F8> \xC4\xB2 |0
-<U89FA> \xF6\x4C |0
-<U89FB> \xF7\x55 |0
-<U89FC> \xC5\xA9 |0
-<U89FE> \xF7\xFE |0
-<U89FF> \xF9\x4C |0
-<U8A00> \xA8\xA5 |0
-<U8A02> \xAD\x71 |0
-<U8A03> \xAD\x72 |0
-<U8A04> \xD0\xB0 |0
-<U8A07> \xD0\xB1 |0
-<U8A08> \xAD\x70 |0
-<U8A0A> \xB0\x54 |0
-<U8A0C> \xB0\x52 |0
-<U8A0E> \xB0\x51 |0
-<U8A0F> \xB0\x58 |0
-<U8A10> \xB0\x50 |0
-<U8A11> \xB0\x59 |0
-<U8A12> \xD3\xDD |0
-<U8A13> \xB0\x56 |0
-<U8A15> \xB0\x53 |0
-<U8A16> \xB0\x57 |0
-<U8A17> \xB0\x55 |0
-<U8A18> \xB0\x4F |0
-<U8A1B> \xB3\x5F |0
-<U8A1D> \xB3\x59 |0
-<U8A1E> \xD7\xCC |0
-<U8A1F> \xB3\x5E |0
-<U8A22> \xB3\x60 |0
-<U8A23> \xB3\x5A |0
-<U8A25> \xB3\x5B |0
-<U8A27> \xD7\xCA |0
-<U8A2A> \xB3\x58 |0
-<U8A2C> \xD7\xCB |0
-<U8A2D> \xB3\x5D |0
-<U8A30> \xD7\xC9 |0
-<U8A31> \xB3\x5C |0
-<U8A34> \xB6\x44 |0
-<U8A36> \xB6\x46 |0
-<U8A39> \xDB\xD8 |0
-<U8A3A> \xB6\x45 |0
-<U8A3B> \xB5\xF9 |0
-<U8A3C> \xB5\xFD |0
-<U8A3E> \xB8\xE4 |0
-<U8A3F> \xE0\x49 |0
-<U8A40> \xDB\xDA |0
-<U8A41> \xB5\xFE |0
-<U8A44> \xDB\xDD |0
-<U8A45> \xDB\xDE |0
-<U8A46> \xB6\x43 |0
-<U8A48> \xDB\xE0 |0
-<U8A4A> \xDB\xE2 |0
-<U8A4C> \xDB\xE3 |0
-<U8A4D> \xDB\xD7 |0
-<U8A4E> \xDB\xD6 |0
-<U8A4F> \xDB\xE4 |0
-<U8A50> \xB6\x42 |0
-<U8A51> \xDB\xE1 |0
-<U8A52> \xDB\xDF |0
-<U8A54> \xB6\x40 |0
-<U8A55> \xB5\xFB |0
-<U8A56> \xB6\x47 |0
-<U8A57> \xDB\xDB |0
-<U8A58> \xDB\xDC |0
-<U8A59> \xDB\xD9 |0
-<U8A5B> \xB6\x41 |0
-<U8A5E> \xB5\xFC |0
-<U8A60> \xB5\xFA |0
-<U8A61> \xE0\x48 |0
-<U8A62> \xB8\xDF |0
-<U8A63> \xB8\xDA |0
-<U8A66> \xB8\xD5 |0
-<U8A68> \xB8\xE5 |0
-<U8A69> \xB8\xD6 |0
-<U8A6B> \xB8\xD2 |0
-<U8A6C> \xB8\xE1 |0
-<U8A6D> \xB8\xDE |0
-<U8A6E> \xB8\xE0 |0
-<U8A70> \xB8\xD7 |0
-<U8A71> \xB8\xDC |0
-<U8A72> \xB8\xD3 |0
-<U8A73> \xB8\xD4 |0
-<U8A74> \xE0\x50 |0
-<U8A75> \xE0\x4D |0
-<U8A76> \xE0\x45 |0
-<U8A77> \xE0\x4A |0
-<U8A79> \xB8\xE2 |0
-<U8A7A> \xE0\x51 |0
-<U8A7B> \xB8\xE3 |0
-<U8A7C> \xB8\xD9 |0
-<U8A7F> \xE0\x47 |0
-<U8A81> \xE0\x4F |0
-<U8A82> \xE0\x4B |0
-<U8A83> \xE0\x4E |0
-<U8A84> \xE0\x4C |0
-<U8A85> \xB8\xDD |0
-<U8A86> \xE0\x46 |0
-<U8A87> \xB8\xD8 |0
-<U8A8B> \xE4\x4C |0
-<U8A8C> \xBB\x78 |0
-<U8A8D> \xBB\x7B |0
-<U8A8F> \xE4\x4E |0
-<U8A91> \xBB\xA5 |0
-<U8A92> \xE4\x4D |0
-<U8A93> \xBB\x7D |0
-<U8A95> \xBD\xCF |0
-<U8A96> \xE4\x4F |0
-<U8A98> \xBB\xA4 |0
-<U8A99> \xE4\x4B |0
-<U8A9A> \xBB\xA6 |0
-<U8A9E> \xBB\x79 |0
-<U8AA0> \xB8\xDB |0
-<U8AA1> \xBB\x7C |0
-<U8AA3> \xBB\x7A |0
-<U8AA4> \xBB\x7E |0
-<U8AA5> \xBB\xA2 |0
-<U8AA6> \xBB\x77 |0
-<U8AA7> \xBB\xA7 |0
-<U8AA8> \xBB\xA3 |0
-<U8AAA> \xBB\xA1 |0
-<U8AAB> \xE4\x4A |0
-<U8AB0> \xBD\xD6 |0
-<U8AB2> \xBD\xD2 |0
-<U8AB6> \xBD\xD9 |0
-<U8AB8> \xE7\xD6 |0
-<U8AB9> \xBD\xDA |0
-<U8ABA> \xE7\xE2 |0
-<U8ABB> \xE7\xDB |0
-<U8ABC> \xBD\xCB |0
-<U8ABD> \xE7\xE3 |0
-<U8ABE> \xE7\xDD |0
-<U8ABF> \xBD\xD5 |0
-<U8AC0> \xE7\xDE |0
-<U8AC2> \xBD\xD4 |0
-<U8AC3> \xE7\xE1 |0
-<U8AC4> \xBD\xCE |0
-<U8AC5> \xE7\xDF |0
-<U8AC6> \xE7\xD5 |0
-<U8AC7> \xBD\xCD |0
-<U8AC8> \xEB\xAA |0
-<U8AC9> \xBD\xD3 |0
-<U8ACB> \xBD\xD0 |0
-<U8ACD> \xBD\xD8 |0
-<U8ACF> \xE7\xD4 |0
-<U8AD1> \xE7\xD8 |0
-<U8AD2> \xBD\xCC |0
-<U8AD3> \xE7\xD7 |0
-<U8AD4> \xE7\xD9 |0
-<U8AD5> \xE7\xDA |0
-<U8AD6> \xBD\xD7 |0
-<U8AD7> \xE7\xDC |0
-<U8AD8> \xE7\xE0 |0
-<U8AD9> \xE7\xE4 |0
-<U8ADB> \xBD\xDB |0
-<U8ADC> \xBF\xD2 |0
-<U8ADD> \xEB\xA5 |0
-<U8ADE> \xEB\xAB |0
-<U8ADF> \xEB\xA8 |0
-<U8AE0> \xEB\x7E |0
-<U8AE1> \xEB\xAC |0
-<U8AE2> \xEB\xA1 |0
-<U8AE4> \xEB\xA7 |0
-<U8AE6> \xBF\xCD |0
-<U8AE7> \xBF\xD3 |0
-<U8AE8> \xEB\xAD |0
-<U8AEB> \xBF\xCF |0
-<U8AED> \xBF\xD9 |0
-<U8AEE> \xBF\xD4 |0
-<U8AEF> \xEB\xAF |0
-<U8AF0> \xEB\xA9 |0
-<U8AF1> \xBF\xD0 |0
-<U8AF2> \xEB\xA2 |0
-<U8AF3> \xBF\xDA |0
-<U8AF4> \xEB\xA3 |0
-<U8AF5> \xEB\xA4 |0
-<U8AF6> \xBF\xDB |0
-<U8AF7> \xBF\xD8 |0
-<U8AF8> \xBD\xD1 |0
-<U8AFA> \xBF\xCE |0
-<U8AFB> \xEB\xB0 |0
-<U8AFC> \xBF\xDC |0
-<U8AFE> \xBF\xD5 |0
-<U8AFF> \xEB\xAE |0
-<U8B00> \xBF\xD1 |0
-<U8B01> \xBF\xD6 |0
-<U8B02> \xBF\xD7 |0
-<U8B04> \xC1\xC3 |0
-<U8B05> \xEE\xA4 |0
-<U8B06> \xEE\xAD |0
-<U8B07> \xEE\xAA |0
-<U8B08> \xEE\xAC |0
-<U8B0A> \xC1\xC0 |0
-<U8B0B> \xEE\xA5 |0
-<U8B0D> \xEE\xAB |0
-<U8B0E> \xC1\xBC |0
-<U8B0F> \xEE\xA7 |0
-<U8B10> \xC1\xC4 |0
-<U8B11> \xEE\xA3 |0
-<U8B12> \xEE\xA8 |0
-<U8B13> \xEE\xAF |0
-<U8B14> \xEB\xA6 |0
-<U8B15> \xEE\xA9 |0
-<U8B16> \xEE\xA2 |0
-<U8B17> \xC1\xBD |0
-<U8B18> \xEE\xA1 |0
-<U8B19> \xC1\xBE |0
-<U8B1A> \xEE\xB0 |0
-<U8B1B> \xC1\xBF |0
-<U8B1C> \xEE\xAE |0
-<U8B1D> \xC1\xC2 |0
-<U8B1E> \xEE\x7E |0
-<U8B20> \xC1\xC1 |0
-<U8B22> \xEE\xA6 |0
-<U8B23> \xF0\xDC |0
-<U8B24> \xF0\xEA |0
-<U8B25> \xF0\xE5 |0
-<U8B26> \xF0\xE7 |0
-<U8B27> \xF0\xDB |0
-<U8B28> \xC2\xD3 |0
-<U8B2A> \xF0\xDA |0
-<U8B2B> \xC2\xD6 |0
-<U8B2C> \xC2\xD5 |0
-<U8B2E> \xF0\xE9 |0
-<U8B2F> \xF0\xE1 |0
-<U8B30> \xF0\xDE |0
-<U8B31> \xF0\xE4 |0
-<U8B33> \xF0\xDD |0
-<U8B35> \xF0\xDF |0
-<U8B36> \xF0\xE8 |0
-<U8B37> \xF0\xE6 |0
-<U8B39> \xC2\xD4 |0
-<U8B3A> \xF0\xED |0
-<U8B3B> \xF0\xEB |0
-<U8B3C> \xF0\xE2 |0
-<U8B3D> \xF0\xEC |0
-<U8B3E> \xF0\xE3 |0
-<U8B40> \xF2\xF9 |0
-<U8B41> \xC3\xCF |0
-<U8B42> \xF3\x41 |0
-<U8B45> \xF6\x4F |0
-<U8B46> \xC3\xD6 |0
-<U8B47> \xF0\xE0 |0
-<U8B48> \xF2\xF7 |0
-<U8B49> \xC3\xD2 |0
-<U8B4A> \xF2\xF8 |0
-<U8B4B> \xF2\xFD |0
-<U8B4E> \xC3\xD4 |0
-<U8B4F> \xC3\xD5 |0
-<U8B50> \xF2\xF6 |0
-<U8B51> \xF3\x40 |0
-<U8B52> \xF3\x42 |0
-<U8B53> \xF2\xFA |0
-<U8B54> \xF2\xFC |0
-<U8B55> \xF2\xFE |0
-<U8B56> \xF2\xFB |0
-<U8B57> \xF3\x43 |0
-<U8B58> \xC3\xD1 |0
-<U8B59> \xC3\xD7 |0
-<U8B5A> \xC3\xD3 |0
-<U8B5C> \xC3\xD0 |0
-<U8B5D> \xF4\xD0 |0
-<U8B5F> \xC4\xB7 |0
-<U8B60> \xF4\xCE |0
-<U8B63> \xF4\xD2 |0
-<U8B65> \xF4\xD3 |0
-<U8B66> \xC4\xB5 |0
-<U8B67> \xF4\xD4 |0
-<U8B68> \xF4\xD1 |0
-<U8B6A> \xF4\xCF |0
-<U8B6B> \xC4\xB8 |0
-<U8B6C> \xC4\xB4 |0
-<U8B6D> \xF4\xD5 |0
-<U8B6F> \xC4\xB6 |0
-<U8B70> \xC4\xB3 |0
-<U8B74> \xC4\xFE |0
-<U8B77> \xC5\x40 |0
-<U8B78> \xF6\x4E |0
-<U8B79> \xF6\x4D |0
-<U8B7A> \xF6\x50 |0
-<U8B7B> \xF6\x51 |0
-<U8B7D> \xC5\x41 |0
-<U8B7E> \xF7\x56 |0
-<U8B7F> \xF7\x5B |0
-<U8B80> \xC5\xAA |0
-<U8B82> \xF7\x58 |0
-<U8B84> \xF7\x57 |0
-<U8B85> \xF7\x5A |0
-<U8B86> \xF7\x59 |0
-<U8B88> \xF8\x43 |0
-<U8B8A> \xC5\xDC |0
-<U8B8B> \xF8\x42 |0
-<U8B8C> \xF8\x40 |0
-<U8B8E> \xF8\x41 |0
-<U8B92> \xC5\xFE |0
-<U8B93> \xC5\xFD |0
-<U8B94> \xF8\xC1 |0
-<U8B95> \xF8\xC2 |0
-<U8B96> \xC6\x40 |0
-<U8B98> \xF9\x4D |0
-<U8B99> \xF9\x4E |0
-<U8B9A> \xC6\x67 |0
-<U8B9C> \xC6\x6D |0
-<U8B9E> \xF9\xA9 |0
-<U8B9F> \xF9\xC8 |0
-<U8C37> \xA8\xA6 |0
-<U8C39> \xD7\xCD |0
-<U8C3B> \xD7\xCE |0
-<U8C3C> \xE0\x52 |0
-<U8C3D> \xE4\x50 |0
-<U8C3E> \xE7\xE5 |0
-<U8C3F> \xC1\xC6 |0
-<U8C41> \xC1\xC5 |0
-<U8C42> \xF0\xEE |0
-<U8C43> \xF3\x44 |0
-<U8C45> \xF8\x44 |0
-<U8C46> \xA8\xA7 |0
-<U8C47> \xD3\xDE |0
-<U8C48> \xB0\x5A |0
-<U8C49> \xB3\x61 |0
-<U8C4A> \xE0\x54 |0
-<U8C4B> \xE0\x53 |0
-<U8C4C> \xBD\xDC |0
-<U8C4D> \xE7\xE6 |0
-<U8C4E> \xBD\xDD |0
-<U8C4F> \xEE\xB1 |0
-<U8C50> \xC2\xD7 |0
-<U8C54> \xC6\x76 |0
-<U8C55> \xA8\xA8 |0
-<U8C56> \xCD\xCB |0
-<U8C57> \xD3\xDF |0
-<U8C5A> \xB3\x62 |0
-<U8C5C> \xD7\xCF |0
-<U8C5D> \xD7\xD0 |0
-<U8C5F> \xDB\xE5 |0
-<U8C61> \xB6\x48 |0
-<U8C62> \xB8\xE6 |0
-<U8C64> \xE0\x56 |0
-<U8C65> \xE0\x55 |0
-<U8C66> \xE0\x57 |0
-<U8C68> \xE4\x51 |0
-<U8C69> \xE4\x52 |0
-<U8C6A> \xBB\xA8 |0
-<U8C6B> \xBF\xDD |0
-<U8C6C> \xBD\xDE |0
-<U8C6D> \xBF\xDE |0
-<U8C6F> \xEE\xB5 |0
-<U8C70> \xEE\xB2 |0
-<U8C71> \xEE\xB4 |0
-<U8C72> \xEE\xB3 |0
-<U8C73> \xC1\xC7 |0
-<U8C75> \xF0\xEF |0
-<U8C76> \xF3\x46 |0
-<U8C77> \xF3\x45 |0
-<U8C78> \xCB\xA4 |0
-<U8C79> \xB0\x5C |0
-<U8C7A> \xB0\x5B |0
-<U8C7B> \xD3\xE0 |0
-<U8C7D> \xD7\xD1 |0
-<U8C80> \xDB\xE7 |0
-<U8C81> \xDB\xE6 |0
-<U8C82> \xB6\x49 |0
-<U8C84> \xE0\x59 |0
-<U8C85> \xE0\x5A |0
-<U8C86> \xE0\x58 |0
-<U8C89> \xB8\xE8 |0
-<U8C8A> \xB8\xE7 |0
-<U8C8C> \xBB\xAA |0
-<U8C8D> \xBB\xA9 |0
-<U8C8F> \xE7\xE7 |0
-<U8C90> \xEB\xB3 |0
-<U8C91> \xEB\xB1 |0
-<U8C92> \xEB\xB2 |0
-<U8C93> \xBF\xDF |0
-<U8C94> \xEE\xB7 |0
-<U8C95> \xEE\xB6 |0
-<U8C97> \xF0\xF2 |0
-<U8C98> \xF0\xF1 |0
-<U8C99> \xF0\xF0 |0
-<U8C9A> \xF3\x47 |0
-<U8C9C> \xF9\xAA |0
-<U8C9D> \xA8\xA9 |0
-<U8C9E> \xAD\x73 |0
-<U8CA0> \xAD\x74 |0
-<U8CA1> \xB0\x5D |0
-<U8CA2> \xB0\x5E |0
-<U8CA3> \xD3\xE2 |0
-<U8CA4> \xD3\xE1 |0
-<U8CA5> \xD7\xD2 |0
-<U8CA7> \xB3\x68 |0
-<U8CA8> \xB3\x66 |0
-<U8CA9> \xB3\x63 |0
-<U8CAA> \xB3\x67 |0
-<U8CAB> \xB3\x65 |0
-<U8CAC> \xB3\x64 |0
-<U8CAF> \xB6\x4A |0
-<U8CB0> \xDB\xEA |0
-<U8CB2> \xB8\xED |0
-<U8CB3> \xB6\x4C |0
-<U8CB4> \xB6\x51 |0
-<U8CB5> \xDB\xEC |0
-<U8CB6> \xB6\x53 |0
-<U8CB7> \xB6\x52 |0
-<U8CB8> \xB6\x55 |0
-<U8CB9> \xDB\xEB |0
-<U8CBA> \xDB\xE8 |0
-<U8CBB> \xB6\x4F |0
-<U8CBC> \xB6\x4B |0
-<U8CBD> \xB6\x4D |0
-<U8CBE> \xDB\xE9 |0
-<U8CBF> \xB6\x54 |0
-<U8CC0> \xB6\x50 |0
-<U8CC1> \xB6\x4E |0
-<U8CC2> \xB8\xEF |0
-<U8CC3> \xB8\xEE |0
-<U8CC4> \xB8\xEC |0
-<U8CC5> \xB8\xF0 |0
-<U8CC7> \xB8\xEA |0
-<U8CC8> \xB8\xEB |0
-<U8CCA> \xB8\xE9 |0
-<U8CCC> \xE0\x5B |0
-<U8CCF> \xE4\x54 |0
-<U8CD1> \xBB\xAC |0
-<U8CD2> \xBB\xAD |0
-<U8CD3> \xBB\xAB |0
-<U8CD5> \xE4\x53 |0
-<U8CD7> \xE4\x55 |0
-<U8CD9> \xE7\xEA |0
-<U8CDA> \xE7\xEC |0
-<U8CDC> \xBD\xE7 |0
-<U8CDD> \xE7\xED |0
-<U8CDE> \xBD\xE0 |0
-<U8CDF> \xE7\xE9 |0
-<U8CE0> \xBD\xDF |0
-<U8CE1> \xBD\xE9 |0
-<U8CE2> \xBD\xE5 |0
-<U8CE3> \xBD\xE6 |0
-<U8CE4> \xBD\xE2 |0
-<U8CE5> \xE7\xE8 |0
-<U8CE6> \xBD\xE1 |0
-<U8CE7> \xE7\xEE |0
-<U8CE8> \xE7\xEB |0
-<U8CEA> \xBD\xE8 |0
-<U8CEC> \xBD\xE3 |0
-<U8CED> \xBD\xE4 |0
-<U8CEE> \xEB\xB5 |0
-<U8CF0> \xEB\xB7 |0
-<U8CF1> \xEB\xB6 |0
-<U8CF3> \xEB\xB8 |0
-<U8CF4> \xBF\xE0 |0
-<U8CF5> \xEB\xB4 |0
-<U8CF8> \xC1\xCB |0
-<U8CF9> \xEE\xB8 |0
-<U8CFA> \xC1\xC8 |0
-<U8CFB> \xC1\xCC |0
-<U8CFC> \xC1\xCA |0
-<U8CFD> \xC1\xC9 |0
-<U8CFE> \xF0\xF3 |0
-<U8D00> \xF0\xF6 |0
-<U8D02> \xF0\xF5 |0
-<U8D04> \xF0\xF4 |0
-<U8D05> \xC2\xD8 |0
-<U8D06> \xF3\x48 |0
-<U8D07> \xF3\x49 |0
-<U8D08> \xC3\xD8 |0
-<U8D09> \xF3\x4A |0
-<U8D0A> \xC3\xD9 |0
-<U8D0D> \xC4\xBA |0
-<U8D0F> \xC4\xB9 |0
-<U8D10> \xF6\x52 |0
-<U8D13> \xC5\x42 |0
-<U8D14> \xF6\x53 |0
-<U8D15> \xF7\x5C |0
-<U8D16> \xC5\xAB |0
-<U8D17> \xC5\xAC |0
-<U8D19> \xF8\x45 |0
-<U8D1B> \xC6\x42 |0
-<U8D64> \xA8\xAA |0
-<U8D66> \xB3\x6A |0
-<U8D67> \xB3\x69 |0
-<U8D68> \xE0\x5C |0
-<U8D69> \xE0\x5D |0
-<U8D6B> \xBB\xAE |0
-<U8D6C> \xEB\xB9 |0
-<U8D6D> \xBD\xEA |0
-<U8D6E> \xEB\xBA |0
-<U8D6F> \xEE\xB9 |0
-<U8D70> \xA8\xAB |0
-<U8D72> \xD0\xB2 |0
-<U8D73> \xAD\x76 |0
-<U8D74> \xAD\x75 |0
-<U8D76> \xD3\xE3 |0
-<U8D77> \xB0\x5F |0
-<U8D78> \xD3\xE4 |0
-<U8D79> \xD7\xD5 |0
-<U8D7B> \xD7\xD4 |0
-<U8D7D> \xD7\xD3 |0
-<U8D80> \xDB\xEE |0
-<U8D81> \xB6\x58 |0
-<U8D84> \xDB\xED |0
-<U8D85> \xB6\x57 |0
-<U8D89> \xDB\xEF |0
-<U8D8A> \xB6\x56 |0
-<U8D8C> \xE0\x5F |0
-<U8D8D> \xE0\x62 |0
-<U8D8E> \xE0\x60 |0
-<U8D8F> \xE0\x61 |0
-<U8D90> \xE0\x65 |0
-<U8D91> \xE0\x5E |0
-<U8D92> \xE0\x66 |0
-<U8D93> \xE0\x63 |0
-<U8D94> \xE0\x64 |0
-<U8D95> \xBB\xB0 |0
-<U8D96> \xE4\x56 |0
-<U8D99> \xBB\xAF |0
-<U8D9B> \xE7\xF2 |0
-<U8D9C> \xE7\xF0 |0
-<U8D9F> \xBD\xEB |0
-<U8DA0> \xE7\xEF |0
-<U8DA1> \xE7\xF1 |0
-<U8DA3> \xBD\xEC |0
-<U8DA5> \xEB\xBB |0
-<U8DA7> \xEB\xBC |0
-<U8DA8> \xC1\xCD |0
-<U8DAA> \xF3\x4C |0
-<U8DAB> \xF3\x4E |0
-<U8DAC> \xF3\x4B |0
-<U8DAD> \xF3\x4D |0
-<U8DAE> \xF4\xD6 |0
-<U8DAF> \xF6\x54 |0
-<U8DB2> \xF9\x6F |0
-<U8DB3> \xA8\xAC |0
-<U8DB4> \xAD\x77 |0
-<U8DB5> \xD3\xE5 |0
-<U8DB6> \xD3\xE7 |0
-<U8DB7> \xD3\xE6 |0
-<U8DB9> \xD7\xD8 |0
-<U8DBA> \xB3\x6C |0
-<U8DBC> \xD7\xD6 |0
-<U8DBE> \xB3\x6B |0
-<U8DBF> \xD7\xD9 |0
-<U8DC1> \xD7\xDA |0
-<U8DC2> \xD7\xD7 |0
-<U8DC5> \xDB\xFB |0
-<U8DC6> \xB6\x60 |0
-<U8DC7> \xDB\xF3 |0
-<U8DC8> \xDB\xF9 |0
-<U8DCB> \xB6\x5B |0
-<U8DCC> \xB6\x5E |0
-<U8DCD> \xDB\xF2 |0
-<U8DCE> \xB6\x59 |0
-<U8DCF> \xDB\xF6 |0
-<U8DD0> \xE0\x6C |0
-<U8DD1> \xB6\x5D |0
-<U8DD3> \xDB\xF1 |0
-<U8DD5> \xDB\xF7 |0
-<U8DD6> \xDB\xF4 |0
-<U8DD7> \xDB\xFA |0
-<U8DD8> \xDB\xF0 |0
-<U8DD9> \xDB\xF8 |0
-<U8DDA> \xB6\x5C |0
-<U8DDB> \xB6\x5F |0
-<U8DDC> \xDB\xF5 |0
-<U8DDD> \xB6\x5A |0
-<U8DDF> \xB8\xF2 |0
-<U8DE0> \xE0\x68 |0
-<U8DE1> \xB8\xF1 |0
-<U8DE2> \xE0\x6F |0
-<U8DE3> \xE0\x6E |0
-<U8DE4> \xB8\xF8 |0
-<U8DE6> \xB8\xF9 |0
-<U8DE7> \xE0\x70 |0
-<U8DE8> \xB8\xF3 |0
-<U8DE9> \xE0\x6D |0
-<U8DEA> \xB8\xF7 |0
-<U8DEB> \xE0\x72 |0
-<U8DEC> \xE0\x69 |0
-<U8DEE> \xE0\x6B |0
-<U8DEF> \xB8\xF4 |0
-<U8DF0> \xE0\x67 |0
-<U8DF1> \xE0\x6A |0
-<U8DF2> \xE0\x71 |0
-<U8DF3> \xB8\xF5 |0
-<U8DF4> \xE0\x73 |0
-<U8DFA> \xB8\xF6 |0
-<U8DFC> \xBB\xB1 |0
-<U8DFD> \xE4\x5B |0
-<U8DFE> \xE4\x61 |0
-<U8DFF> \xE4\x59 |0
-<U8E00> \xE4\x62 |0
-<U8E02> \xE4\x58 |0
-<U8E03> \xE4\x5D |0
-<U8E04> \xE4\x63 |0
-<U8E05> \xE4\x60 |0
-<U8E06> \xE4\x5F |0
-<U8E07> \xE4\x5E |0
-<U8E09> \xE4\x57 |0
-<U8E0A> \xE4\x5C |0
-<U8E0D> \xE4\x5A |0
-<U8E0F> \xBD\xF1 |0
-<U8E10> \xBD\xEE |0
-<U8E11> \xE7\xFB |0
-<U8E12> \xE8\x41 |0
-<U8E13> \xE8\x43 |0
-<U8E14> \xE8\x40 |0
-<U8E15> \xE7\xF8 |0
-<U8E16> \xE7\xFA |0
-<U8E17> \xE8\x45 |0
-<U8E18> \xE8\x42 |0
-<U8E19> \xE7\xFC |0
-<U8E1A> \xE8\x46 |0
-<U8E1B> \xE7\xF9 |0
-<U8E1C> \xE8\x44 |0
-<U8E1D> \xBD\xEF |0
-<U8E1E> \xBD\xF5 |0
-<U8E1F> \xBD\xF3 |0
-<U8E20> \xE7\xF3 |0
-<U8E21> \xBD\xF4 |0
-<U8E22> \xBD\xF0 |0
-<U8E23> \xE7\xF4 |0
-<U8E24> \xE7\xF6 |0
-<U8E25> \xE7\xF5 |0
-<U8E26> \xE7\xFD |0
-<U8E27> \xE7\xFE |0
-<U8E29> \xBD\xF2 |0
-<U8E2B> \xBD\xED |0
-<U8E2E> \xE7\xF7 |0
-<U8E30> \xEB\xC6 |0
-<U8E31> \xBF\xE2 |0
-<U8E33> \xEB\xBD |0
-<U8E34> \xBF\xE3 |0
-<U8E35> \xBF\xE6 |0
-<U8E36> \xEB\xC2 |0
-<U8E38> \xEB\xBF |0
-<U8E39> \xBF\xE5 |0
-<U8E3C> \xEB\xC3 |0
-<U8E3D> \xEB\xC4 |0
-<U8E3E> \xEB\xBE |0
-<U8E3F> \xEB\xC7 |0
-<U8E40> \xEB\xC0 |0
-<U8E41> \xEB\xC5 |0
-<U8E42> \xBF\xE4 |0
-<U8E44> \xBF\xE1 |0
-<U8E45> \xEB\xC1 |0
-<U8E47> \xEE\xBF |0
-<U8E48> \xC1\xD0 |0
-<U8E49> \xC1\xCE |0
-<U8E4A> \xC1\xD1 |0
-<U8E4B> \xC1\xCF |0
-<U8E4C> \xEE\xBE |0
-<U8E4D> \xEE\xBB |0
-<U8E4E> \xEE\xBA |0
-<U8E50> \xEE\xBD |0
-<U8E53> \xEE\xBC |0
-<U8E54> \xF1\x45 |0
-<U8E55> \xC2\xDE |0
-<U8E56> \xF0\xFB |0
-<U8E57> \xF0\xFA |0
-<U8E59> \xC2\xD9 |0
-<U8E5A> \xF1\x41 |0
-<U8E5B> \xF1\x40 |0
-<U8E5C> \xF0\xF7 |0
-<U8E5D> \xF1\x43 |0
-<U8E5E> \xF0\xFC |0
-<U8E5F> \xC2\xDD |0
-<U8E60> \xF0\xF9 |0
-<U8E61> \xF1\x42 |0
-<U8E62> \xF0\xF8 |0
-<U8E63> \xC2\xDA |0
-<U8E64> \xC2\xDC |0
-<U8E65> \xF0\xFD |0
-<U8E66> \xC2\xDB |0
-<U8E67> \xF0\xFE |0
-<U8E69> \xF1\x44 |0
-<U8E6A> \xF3\x52 |0
-<U8E6C> \xC3\xDE |0
-<U8E6D> \xF3\x4F |0
-<U8E6F> \xF3\x53 |0
-<U8E72> \xC3\xDB |0
-<U8E73> \xF3\x51 |0
-<U8E74> \xC3\xE0 |0
-<U8E76> \xC3\xDD |0
-<U8E78> \xF3\x50 |0
-<U8E7A> \xC3\xDF |0
-<U8E7B> \xF3\x54 |0
-<U8E7C> \xC3\xDA |0
-<U8E81> \xC4\xBC |0
-<U8E82> \xC4\xBE |0
-<U8E84> \xF4\xD9 |0
-<U8E85> \xC4\xBD |0
-<U8E86> \xF4\xD7 |0
-<U8E87> \xC3\xDC |0
-<U8E88> \xF4\xD8 |0
-<U8E89> \xC4\xBB |0
-<U8E8A> \xC5\x43 |0
-<U8E8B> \xC5\x45 |0
-<U8E8C> \xF6\x56 |0
-<U8E8D> \xC5\x44 |0
-<U8E8E> \xF6\x55 |0
-<U8E90> \xF7\x61 |0
-<U8E91> \xC5\xAD |0
-<U8E92> \xF7\x60 |0
-<U8E93> \xC5\xAE |0
-<U8E94> \xF7\x5E |0
-<U8E95> \xF7\x5D |0
-<U8E96> \xF7\x62 |0
-<U8E97> \xF7\x63 |0
-<U8E98> \xF8\x46 |0
-<U8E9A> \xF7\x5F |0
-<U8E9D> \xF8\xC6 |0
-<U8E9E> \xF8\xC3 |0
-<U8E9F> \xF8\xC4 |0
-<U8EA0> \xF8\xC5 |0
-<U8EA1> \xC6\x5C |0
-<U8EA3> \xF9\x51 |0
-<U8EA4> \xF9\x50 |0
-<U8EA5> \xF9\x4F |0
-<U8EA6> \xF9\x70 |0
-<U8EA8> \xF9\xBE |0
-<U8EA9> \xF9\xAB |0
-<U8EAA> \xC6\x6E |0
-<U8EAB> \xA8\xAD |0
-<U8EAC> \xB0\x60 |0
-<U8EB2> \xB8\xFA |0
-<U8EBA> \xBD\xF6 |0
-<U8EBD> \xEB\xC8 |0
-<U8EC0> \xC2\xDF |0
-<U8EC2> \xF3\x55 |0
-<U8EC9> \xF9\xAC |0
-<U8ECA> \xA8\xAE |0
-<U8ECB> \xAA\xEE |0
-<U8ECC> \xAD\x79 |0
-<U8ECD> \xAD\x78 |0
-<U8ECF> \xB0\x63 |0
-<U8ED1> \xD3\xE8 |0
-<U8ED2> \xB0\x61 |0
-<U8ED3> \xD3\xE9 |0
-<U8ED4> \xB0\x62 |0
-<U8ED7> \xD7\xDF |0
-<U8ED8> \xD7\xDB |0
-<U8EDB> \xB3\x6D |0
-<U8EDC> \xD7\xDE |0
-<U8EDD> \xD7\xDD |0
-<U8EDE> \xD7\xDC |0
-<U8EDF> \xB3\x6E |0
-<U8EE0> \xD7\xE0 |0
-<U8EE1> \xD7\xE1 |0
-<U8EE5> \xDC\x43 |0
-<U8EE6> \xDC\x41 |0
-<U8EE7> \xDC\x45 |0
-<U8EE8> \xDC\x46 |0
-<U8EE9> \xDC\x4C |0
-<U8EEB> \xDC\x48 |0
-<U8EEC> \xDC\x4A |0
-<U8EEE> \xDC\x42 |0
-<U8EEF> \xDB\xFC |0
-<U8EF1> \xDC\x49 |0
-<U8EF4> \xDC\x4B |0
-<U8EF5> \xDC\x44 |0
-<U8EF6> \xDC\x47 |0
-<U8EF7> \xDB\xFD |0
-<U8EF8> \xB6\x62 |0
-<U8EF9> \xDC\x40 |0
-<U8EFA> \xDB\xFE |0
-<U8EFB> \xB6\x61 |0
-<U8EFC> \xB6\x63 |0
-<U8EFE> \xB8\xFD |0
-<U8EFF> \xE0\x75 |0
-<U8F00> \xE0\x77 |0
-<U8F01> \xE0\x76 |0
-<U8F02> \xE0\x7B |0
-<U8F03> \xB8\xFB |0
-<U8F05> \xE0\x78 |0
-<U8F06> \xE0\x74 |0
-<U8F07> \xE0\x79 |0
-<U8F08> \xE0\x7A |0
-<U8F09> \xB8\xFC |0
-<U8F0A> \xB8\xFE |0
-<U8F0B> \xE0\x7C |0
-<U8F0D> \xE4\x67 |0
-<U8F0E> \xE4\x66 |0
-<U8F10> \xE4\x64 |0
-<U8F11> \xE4\x65 |0
-<U8F12> \xBB\xB3 |0
-<U8F13> \xBB\xB5 |0
-<U8F14> \xBB\xB2 |0
-<U8F15> \xBB\xB4 |0
-<U8F16> \xE8\x4D |0
-<U8F17> \xE8\x4E |0
-<U8F18> \xE8\x49 |0
-<U8F1A> \xE8\x4A |0
-<U8F1B> \xBD\xF8 |0
-<U8F1C> \xBD\xFD |0
-<U8F1D> \xBD\xF7 |0
-<U8F1E> \xBD\xFE |0
-<U8F1F> \xBD\xF9 |0
-<U8F20> \xE8\x4B |0
-<U8F23> \xE8\x4C |0
-<U8F24> \xE8\x48 |0
-<U8F25> \xBE\x40 |0
-<U8F26> \xBD\xFB |0
-<U8F29> \xBD\xFA |0
-<U8F2A> \xBD\xFC |0
-<U8F2C> \xE8\x47 |0
-<U8F2E> \xEB\xCA |0
-<U8F2F> \xBF\xE8 |0
-<U8F32> \xEB\xCC |0
-<U8F33> \xBF\xEA |0
-<U8F34> \xEB\xCF |0
-<U8F35> \xEB\xCB |0
-<U8F36> \xEB\xC9 |0
-<U8F37> \xEB\xCE |0
-<U8F38> \xBF\xE9 |0
-<U8F39> \xEB\xCD |0
-<U8F3B> \xBF\xE7 |0
-<U8F3E> \xC1\xD3 |0
-<U8F3F> \xC1\xD6 |0
-<U8F40> \xEE\xC1 |0
-<U8F42> \xC1\xD4 |0
-<U8F43> \xEE\xC0 |0
-<U8F44> \xC1\xD2 |0
-<U8F45> \xC1\xD5 |0
-<U8F46> \xF1\x46 |0
-<U8F47> \xF1\x47 |0
-<U8F48> \xF1\x48 |0
-<U8F49> \xC2\xE0 |0
-<U8F4B> \xF1\x49 |0
-<U8F4D> \xC2\xE1 |0
-<U8F4E> \xC3\xE2 |0
-<U8F4F> \xF3\x58 |0
-<U8F50> \xF3\x59 |0
-<U8F51> \xF3\x57 |0
-<U8F52> \xF3\x56 |0
-<U8F53> \xF3\x5A |0
-<U8F54> \xC3\xE1 |0
-<U8F55> \xF4\xDD |0
-<U8F56> \xF4\xDB |0
-<U8F57> \xF4\xDC |0
-<U8F58> \xF4\xDE |0
-<U8F59> \xF4\xDA |0
-<U8F5A> \xF4\xDF |0
-<U8F5B> \xF6\x58 |0
-<U8F5D> \xF6\x59 |0
-<U8F5E> \xF6\x57 |0
-<U8F5F> \xC5\x46 |0
-<U8F60> \xF7\x64 |0
-<U8F61> \xC5\xAF |0
-<U8F62> \xF7\x65 |0
-<U8F63> \xF8\x48 |0
-<U8F64> \xF8\x47 |0
-<U8F9B> \xA8\xAF |0
-<U8F9C> \xB6\x64 |0
-<U8F9F> \xB9\x40 |0
-<U8FA3> \xBB\xB6 |0
-<U8FA6> \xBF\xEC |0
-<U8FA8> \xBF\xEB |0
-<U8FAD> \xC3\xE3 |0
-<U8FAE> \xC4\x7C |0
-<U8FAF> \xC5\x47 |0
-<U8FB0> \xA8\xB0 |0
-<U8FB1> \xB0\x64 |0
-<U8FB2> \xB9\x41 |0
-<U8FB4> \xF3\x5B |0
-<U8FBF> \xCB\xA6 |0
-<U8FC2> \xA8\xB1 |0
-<U8FC4> \xA8\xB4 |0
-<U8FC5> \xA8\xB3 |0
-<U8FC6> \xA8\xB2 |0
-<U8FC9> \xCB\xA5 |0
-<U8FCB> \xCD\xCD |0
-<U8FCD> \xCD\xCF |0
-<U8FCE> \xAA\xEF |0
-<U8FD1> \xAA\xF1 |0
-<U8FD2> \xCD\xCC |0
-<U8FD3> \xCD\xCE |0
-<U8FD4> \xAA\xF0 |0
-<U8FD5> \xCD\xD1 |0
-<U8FD6> \xCD\xD0 |0
-<U8FD7> \xCD\xD2 |0
-<U8FE0> \xD0\xB6 |0
-<U8FE1> \xD0\xB4 |0
-<U8FE2> \xAD\x7C |0
-<U8FE3> \xD0\xB3 |0
-<U8FE4> \xAD\xA3 |0
-<U8FE5> \xAD\x7E |0
-<U8FE6> \xAD\x7B |0
-<U8FE8> \xAD\xA4 |0
-<U8FEA> \xAD\x7D |0
-<U8FEB> \xAD\xA2 |0
-<U8FED> \xAD\xA1 |0
-<U8FEE> \xD0\xB5 |0
-<U8FF0> \xAD\x7A |0
-<U8FF4> \xB0\x6A |0
-<U8FF5> \xD3\xEB |0
-<U8FF6> \xD3\xF1 |0
-<U8FF7> \xB0\x67 |0
-<U8FF8> \xB0\x6E |0
-<U8FFA> \xB0\x69 |0
-<U8FFB> \xD3\xEE |0
-<U8FFC> \xD3\xF0 |0
-<U8FFD> \xB0\x6C |0
-<U8FFE> \xD3\xEA |0
-<U8FFF> \xD3\xED |0
-<U9000> \xB0\x68 |0
-<U9001> \xB0\x65 |0
-<U9002> \xD3\xEC |0
-<U9003> \xB0\x6B |0
-<U9004> \xD3\xEF |0
-<U9005> \xB0\x6D |0
-<U9006> \xB0\x66 |0
-<U900B> \xD7\xE3 |0
-<U900C> \xD7\xE6 |0
-<U900D> \xB3\x70 |0
-<U900F> \xB3\x7A |0
-<U9010> \xB3\x76 |0
-<U9011> \xD7\xE4 |0
-<U9014> \xB3\x7E |0
-<U9015> \xB3\x77 |0
-<U9016> \xB3\x7C |0
-<U9017> \xB3\x72 |0
-<U9019> \xB3\x6F |0
-<U901A> \xB3\x71 |0
-<U901B> \xB3\x7D |0
-<U901C> \xD7\xE5 |0
-<U901D> \xB3\x75 |0
-<U901E> \xB3\x78 |0
-<U901F> \xB3\x74 |0
-<U9020> \xB3\x79 |0
-<U9021> \xD7\xE7 |0
-<U9022> \xB3\x7B |0
-<U9023> \xB3\x73 |0
-<U9024> \xD7\xE2 |0
-<U902D> \xDC\x4D |0
-<U902E> \xB6\x65 |0
-<U902F> \xDC\x4F |0
-<U9031> \xB6\x67 |0
-<U9032> \xB6\x69 |0
-<U9034> \xDC\x4E |0
-<U9035> \xB6\x66 |0
-<U9036> \xB6\x6A |0
-<U9038> \xB6\x68 |0
-<U903C> \xB9\x47 |0
-<U903D> \xE0\xA3 |0
-<U903E> \xB9\x4F |0
-<U903F> \xE0\x7E |0
-<U9041> \xB9\x50 |0
-<U9042> \xB9\x45 |0
-<U9044> \xE0\xA1 |0
-<U9047> \xB9\x4A |0
-<U9049> \xE0\xA2 |0
-<U904A> \xB9\x43 |0
-<U904B> \xB9\x42 |0
-<U904D> \xB9\x4D |0
-<U904E> \xB9\x4C |0
-<U904F> \xB9\x4B |0
-<U9050> \xB9\x49 |0
-<U9051> \xB9\x4E |0
-<U9052> \xE0\x7D |0
-<U9053> \xB9\x44 |0
-<U9054> \xB9\x46 |0
-<U9055> \xB9\x48 |0
-<U9058> \xBB\xB8 |0
-<U9059> \xBB\xBB |0
-<U905B> \xBB\xBF |0
-<U905C> \xBB\xB9 |0
-<U905D> \xBB\xBE |0
-<U905E> \xBB\xBC |0
-<U9060> \xBB\xB7 |0
-<U9062> \xBB\xBD |0
-<U9063> \xBB\xBA |0
-<U9067> \xE8\x52 |0
-<U9068> \xBE\x43 |0
-<U9069> \xBE\x41 |0
-<U906B> \xE8\x53 |0
-<U906D> \xBE\x44 |0
-<U906E> \xBE\x42 |0
-<U906F> \xE8\x51 |0
-<U9070> \xE8\x50 |0
-<U9072> \xBF\xF0 |0
-<U9073> \xE8\x4F |0
-<U9074> \xBF\xEE |0
-<U9075> \xBF\xED |0
-<U9076> \xEB\xD0 |0
-<U9077> \xBE\x45 |0
-<U9078> \xBF\xEF |0
-<U9079> \xEB\xD1 |0
-<U907A> \xBF\xF2 |0
-<U907B> \xEB\xD2 |0
-<U907C> \xBF\xF1 |0
-<U907D> \xC1\xD8 |0
-<U907E> \xEE\xC3 |0
-<U907F> \xC1\xD7 |0
-<U9080> \xC1\xDC |0
-<U9081> \xC1\xDA |0
-<U9082> \xC1\xDB |0
-<U9083> \xC2\xE3 |0
-<U9084> \xC1\xD9 |0
-<U9085> \xEE\xC2 |0
-<U9086> \xEB\xD3 |0
-<U9087> \xC2\xE2 |0
-<U9088> \xC2\xE4 |0
-<U908A> \xC3\xE4 |0
-<U908B> \xC3\xE5 |0
-<U908D> \xF4\xE0 |0
-<U908F> \xC5\xDE |0
-<U9090> \xC5\xDD |0
-<U9091> \xA8\xB6 |0
-<U9094> \xCA\x55 |0
-<U9095> \xB0\x6F |0
-<U9097> \xCA\x52 |0
-<U9098> \xCA\x53 |0
-<U9099> \xCA\x51 |0
-<U909B> \xCA\x54 |0
-<U909E> \xCB\xAA |0
-<U909F> \xCB\xA7 |0
-<U90A0> \xCB\xAC |0
-<U90A1> \xCB\xA8 |0
-<U90A2> \xA8\xB7 |0
-<U90A3> \xA8\xBA |0
-<U90A5> \xCB\xA9 |0
-<U90A6> \xA8\xB9 |0
-<U90A7> \xCB\xAB |0
-<U90AA> \xA8\xB8 |0
-<U90AF> \xCD\xD5 |0
-<U90B0> \xCD\xD7 |0
-<U90B1> \xAA\xF4 |0
-<U90B2> \xCD\xD3 |0
-<U90B3> \xCD\xD6 |0
-<U90B4> \xCD\xD4 |0
-<U90B5> \xAA\xF2 |0
-<U90B6> \xAA\xF5 |0
-<U90B8> \xAA\xF3 |0
-<U90BD> \xD0\xB8 |0
-<U90BE> \xD0\xBC |0
-<U90BF> \xD0\xB9 |0
-<U90C1> \xAD\xA7 |0
-<U90C3> \xAD\xA8 |0
-<U90C5> \xD0\xBB |0
-<U90C7> \xD0\xBD |0
-<U90C8> \xD0\xBF |0
-<U90CA> \xAD\xA5 |0
-<U90CB> \xD0\xBE |0
-<U90CE> \xAD\xA6 |0
-<U90D4> \xD7\xEE |0
-<U90D5> \xD0\xBA |0
-<U90D6> \xD3\xF2 |0
-<U90D7> \xD3\xFB |0
-<U90D8> \xD3\xF9 |0
-<U90D9> \xD3\xF4 |0
-<U90DA> \xD3\xF5 |0
-<U90DB> \xD3\xFA |0
-<U90DC> \xD3\xFC |0
-<U90DD> \xB0\x71 |0
-<U90DF> \xD3\xF7 |0
-<U90E0> \xD3\xF3 |0
-<U90E1> \xB0\x70 |0
-<U90E2> \xB0\x72 |0
-<U90E3> \xD3\xF6 |0
-<U90E4> \xD3\xFD |0
-<U90E5> \xD3\xF8 |0
-<U90E8> \xB3\xA1 |0
-<U90E9> \xD7\xF1 |0
-<U90EA> \xD7\xE9 |0
-<U90EB> \xD7\xEF |0
-<U90EC> \xD7\xF0 |0
-<U90ED> \xB3\xA2 |0
-<U90EF> \xD7\xE8 |0
-<U90F0> \xD7\xEA |0
-<U90F1> \xD0\xB7 |0
-<U90F2> \xD7\xEC |0
-<U90F3> \xD7\xED |0
-<U90F4> \xD7\xEB |0
-<U90F5> \xB6\x6C |0
-<U90F9> \xDC\x56 |0
-<U90FA> \xEB\xD4 |0
-<U90FB> \xDC\x57 |0
-<U90FC> \xDC\x54 |0
-<U90FD> \xB3\xA3 |0
-<U90FE> \xB6\x6E |0
-<U90FF> \xDC\x53 |0
-<U9100> \xDC\x59 |0
-<U9101> \xDC\x58 |0
-<U9102> \xB6\x6B |0
-<U9103> \xDC\x5C |0
-<U9104> \xDC\x52 |0
-<U9105> \xDC\x5B |0
-<U9106> \xDC\x50 |0
-<U9107> \xDC\x5A |0
-<U9108> \xDC\x55 |0
-<U9109> \xB6\x6D |0
-<U910B> \xE0\xAA |0
-<U910D> \xE0\xA5 |0
-<U910E> \xE0\xAB |0
-<U910F> \xE0\xA6 |0
-<U9110> \xE0\xA4 |0
-<U9111> \xE0\xA7 |0
-<U9112> \xB9\x51 |0
-<U9114> \xE0\xA9 |0
-<U9116> \xE0\xA8 |0
-<U9117> \xB9\x52 |0
-<U9118> \xBB\xC1 |0
-<U9119> \xBB\xC0 |0
-<U911A> \xE4\x6E |0
-<U911B> \xE4\x71 |0
-<U911C> \xE4\x69 |0
-<U911D> \xE4\x6D |0
-<U911E> \xBB\xC2 |0
-<U911F> \xE4\x6C |0
-<U9120> \xE4\x6A |0
-<U9121> \xE4\x70 |0
-<U9122> \xE4\x6B |0
-<U9123> \xE4\x68 |0
-<U9124> \xE4\x6F |0
-<U9126> \xE8\x59 |0
-<U9127> \xBE\x48 |0
-<U9128> \xF1\x4A |0
-<U9129> \xE8\x56 |0
-<U912A> \xE8\x57 |0
-<U912B> \xE8\x55 |0
-<U912C> \xDC\x51 |0
-<U912D> \xBE\x47 |0
-<U912E> \xE8\x5A |0
-<U912F> \xE8\x54 |0
-<U9130> \xBE\x46 |0
-<U9131> \xBE\x49 |0
-<U9132> \xE8\x58 |0
-<U9133> \xEB\xD5 |0
-<U9134> \xBF\xF3 |0
-<U9135> \xEB\xD6 |0
-<U9136> \xEB\xD7 |0
-<U9138> \xEE\xC4 |0
-<U9139> \xC1\xDD |0
-<U913A> \xF1\x4B |0
-<U913B> \xF1\x4C |0
-<U913E> \xF1\x4D |0
-<U913F> \xF3\x5D |0
-<U9140> \xF3\x5C |0
-<U9141> \xF4\xE2 |0
-<U9143> \xF4\xE1 |0
-<U9144> \xF6\x5B |0
-<U9145> \xF6\x5C |0
-<U9146> \xF6\x5A |0
-<U9147> \xF7\x66 |0
-<U9148> \xC5\xB0 |0
-<U9149> \xA8\xBB |0
-<U914A> \xAD\xAA |0
-<U914B> \xAD\xA9 |0
-<U914C> \xB0\x75 |0
-<U914D> \xB0\x74 |0
-<U914E> \xD4\x40 |0
-<U914F> \xD4\x41 |0
-<U9150> \xD3\xFE |0
-<U9152> \xB0\x73 |0
-<U9153> \xD7\xF5 |0
-<U9155> \xD7\xF6 |0
-<U9156> \xD7\xF2 |0
-<U9157> \xB3\xA4 |0
-<U9158> \xD7\xF3 |0
-<U915A> \xD7\xF4 |0
-<U915F> \xDC\x5F |0
-<U9160> \xDC\x61 |0
-<U9161> \xDC\x5D |0
-<U9162> \xDC\x60 |0
-<U9163> \xB6\x6F |0
-<U9164> \xDC\x5E |0
-<U9165> \xB6\x70 |0
-<U9168> \xDD\x73 |0
-<U9169> \xB9\x55 |0
-<U916A> \xB9\x54 |0
-<U916C> \xB9\x53 |0
-<U916E> \xE0\xAC |0
-<U916F> \xE0\xAD |0
-<U9172> \xE4\x73 |0
-<U9173> \xE4\x75 |0
-<U9174> \xBB\xC6 |0
-<U9175> \xBB\xC3 |0
-<U9177> \xBB\xC5 |0
-<U9178> \xBB\xC4 |0
-<U9179> \xE4\x74 |0
-<U917A> \xE4\x72 |0
-<U9180> \xE8\x61 |0
-<U9181> \xE8\x5E |0
-<U9182> \xE8\x5F |0
-<U9183> \xBE\x4D |0
-<U9184> \xE8\x60 |0
-<U9185> \xE8\x5B |0
-<U9186> \xE8\x5C |0
-<U9187> \xBE\x4A |0
-<U9189> \xBE\x4B |0
-<U918A> \xE8\x5D |0
-<U918B> \xBE\x4C |0
-<U918D> \xEB\xDB |0
-<U918F> \xEB\xDC |0
-<U9190> \xEB\xD9 |0
-<U9191> \xEB\xDA |0
-<U9192> \xBF\xF4 |0
-<U9193> \xEB\xD8 |0
-<U9199> \xEE\xC8 |0
-<U919A> \xEE\xC5 |0
-<U919B> \xEE\xC7 |0
-<U919C> \xC1\xE0 |0
-<U919D> \xEE\xCB |0
-<U919E> \xC1\xDF |0
-<U919F> \xEE\xC9 |0
-<U91A0> \xEE\xCC |0
-<U91A1> \xEE\xCA |0
-<U91A2> \xEE\xC6 |0
-<U91A3> \xC1\xDE |0
-<U91A5> \xF1\x4F |0
-<U91A7> \xF1\x50 |0
-<U91A8> \xF1\x4E |0
-<U91AA> \xF1\x52 |0
-<U91AB> \xC2\xE5 |0
-<U91AC> \xC2\xE6 |0
-<U91AD> \xF3\x5F |0
-<U91AE> \xC3\xE7 |0
-<U91AF> \xF1\x51 |0
-<U91B0> \xF3\x5E |0
-<U91B1> \xC3\xE6 |0
-<U91B2> \xF4\xE5 |0
-<U91B3> \xF4\xE6 |0
-<U91B4> \xC4\xBF |0
-<U91B5> \xF4\xE4 |0
-<U91B7> \xF4\xE3 |0
-<U91B9> \xF6\x5D |0
-<U91BA> \xC5\x48 |0
-<U91BC> \xF8\x49 |0
-<U91BD> \xF8\xC8 |0
-<U91BE> \xF8\xC7 |0
-<U91C0> \xC6\x43 |0
-<U91C1> \xC6\x5D |0
-<U91C2> \xF8\xC9 |0
-<U91C3> \xF9\x71 |0
-<U91C5> \xC6\x6F |0
-<U91C6> \xA8\xBC |0
-<U91C7> \xAA\xF6 |0
-<U91C9> \xB9\x56 |0
-<U91CB> \xC4\xC0 |0
-<U91CC> \xA8\xBD |0
-<U91CD> \xAD\xAB |0
-<U91CE> \xB3\xA5 |0
-<U91CF> \xB6\x71 |0
-<U91D0> \xC2\xE7 |0
-<U91D1> \xAA\xF7 |0
-<U91D3> \xD0\xC1 |0
-<U91D4> \xD0\xC0 |0
-<U91D5> \xD4\x42 |0
-<U91D7> \xB0\x78 |0
-<U91D8> \xB0\x76 |0
-<U91D9> \xB0\x7A |0
-<U91DA> \xD4\x44 |0
-<U91DC> \xB0\x79 |0
-<U91DD> \xB0\x77 |0
-<U91E2> \xD4\x43 |0
-<U91E3> \xB3\xA8 |0
-<U91E4> \xD7\xFC |0
-<U91E6> \xB3\xA7 |0
-<U91E7> \xB3\xA9 |0
-<U91E8> \xD8\x42 |0
-<U91E9> \xB3\xAB |0
-<U91EA> \xD7\xFE |0
-<U91EB> \xD8\x40 |0
-<U91EC> \xD7\xF7 |0
-<U91ED> \xB3\xAA |0
-<U91EE> \xD8\x43 |0
-<U91F1> \xD7\xF9 |0
-<U91F3> \xD7\xFA |0
-<U91F4> \xD7\xF8 |0
-<U91F5> \xB3\xA6 |0
-<U91F7> \xD8\x41 |0
-<U91F8> \xD7\xFB |0
-<U91F9> \xD7\xFD |0
-<U91FD> \xDC\x6D |0
-<U91FF> \xDC\x6C |0
-<U9200> \xDC\x6A |0
-<U9201> \xDC\x62 |0
-<U9202> \xDC\x71 |0
-<U9203> \xDC\x65 |0
-<U9204> \xDC\x6F |0
-<U9205> \xDC\x76 |0
-<U9206> \xDC\x6E |0
-<U9207> \xB6\x79 |0
-<U9209> \xB6\x75 |0
-<U920A> \xDC\x63 |0
-<U920C> \xDC\x69 |0
-<U920D> \xB6\x77 |0
-<U920F> \xDC\x68 |0
-<U9210> \xB6\x78 |0
-<U9211> \xB6\x7A |0
-<U9212> \xDC\x6B |0
-<U9214> \xB6\x72 |0
-<U9215> \xB6\x73 |0
-<U9216> \xDC\x77 |0
-<U9217> \xDC\x75 |0
-<U9219> \xDC\x74 |0
-<U921A> \xDC\x66 |0
-<U921C> \xDC\x72 |0
-<U921E> \xB6\x76 |0
-<U9223> \xB6\x74 |0
-<U9224> \xDC\x73 |0
-<U9225> \xDC\x64 |0
-<U9226> \xDC\x67 |0
-<U9227> \xDC\x70 |0
-<U922D> \xE4\xBA |0
-<U922E> \xE0\xB7 |0
-<U9230> \xE0\xB0 |0
-<U9231> \xE0\xC3 |0
-<U9232> \xE0\xCC |0
-<U9233> \xE0\xB3 |0
-<U9234> \xB9\x61 |0
-<U9236> \xE0\xC0 |0
-<U9237> \xB9\x57 |0
-<U9238> \xB9\x59 |0
-<U9239> \xB9\x65 |0
-<U923A> \xE0\xB1 |0
-<U923D> \xB9\x5A |0
-<U923E> \xB9\x5C |0
-<U923F> \xB9\x66 |0
-<U9240> \xB9\x5B |0
-<U9245> \xB9\x64 |0
-<U9246> \xE0\xB9 |0
-<U9248> \xE0\xAE |0
-<U9249> \xB9\x62 |0
-<U924A> \xE0\xB8 |0
-<U924B> \xB9\x5E |0
-<U924C> \xE0\xCA |0
-<U924D> \xB9\x63 |0
-<U924E> \xE0\xC8 |0
-<U924F> \xE0\xBC |0
-<U9250> \xE0\xC6 |0
-<U9251> \xB9\x60 |0
-<U9252> \xE0\xAF |0
-<U9253> \xE0\xC9 |0
-<U9254> \xE0\xC4 |0
-<U9256> \xE0\xCB |0
-<U9257> \xB9\x58 |0
-<U925A> \xB9\x67 |0
-<U925B> \xB9\x5D |0
-<U925E> \xE0\xB5 |0
-<U9260> \xE0\xBD |0
-<U9261> \xE0\xC1 |0
-<U9263> \xE0\xC5 |0
-<U9264> \xB9\x5F |0
-<U9265> \xE0\xB4 |0
-<U9266> \xE0\xB2 |0
-<U9267> \xE0\xBE |0
-<U926C> \xE0\xBB |0
-<U926D> \xE0\xBA |0
-<U926F> \xE0\xBF |0
-<U9270> \xE0\xC2 |0
-<U9272> \xE0\xC7 |0
-<U9276> \xE4\x78 |0
-<U9278> \xBB\xC7 |0
-<U9279> \xE4\xA4 |0
-<U927A> \xE4\x7A |0
-<U927B> \xBB\xCC |0
-<U927C> \xBB\xD0 |0
-<U927D> \xE4\xAD |0
-<U927E> \xE4\xB5 |0
-<U927F> \xE4\xA6 |0
-<U9280> \xBB\xC8 |0
-<U9282> \xE4\xAA |0
-<U9283> \xE0\xB6 |0
-<U9285> \xBB\xC9 |0
-<U9286> \xE4\xB1 |0
-<U9287> \xE4\xB6 |0
-<U9288> \xE4\xAE |0
-<U928A> \xE4\xB0 |0
-<U928B> \xE4\xB9 |0
-<U928C> \xE4\xB2 |0
-<U928D> \xE4\x7E |0
-<U928E> \xE4\xA9 |0
-<U9291> \xBB\xD1 |0
-<U9293> \xBB\xCD |0
-<U9294> \xE4\x7C |0
-<U9295> \xE4\xAB |0
-<U9296> \xBB\xCB |0
-<U9297> \xE4\xA5 |0
-<U9298> \xBB\xCA |0
-<U9299> \xE4\xB3 |0
-<U929A> \xE4\xA2 |0
-<U929B> \xE4\x79 |0
-<U929C> \xBB\xCE |0
-<U929D> \xE4\xB8 |0
-<U92A0> \xE4\x7B |0
-<U92A1> \xE4\xAF |0
-<U92A2> \xE4\xAC |0
-<U92A3> \xE4\xA7 |0
-<U92A4> \xE4\x77 |0
-<U92A5> \xE4\x76 |0
-<U92A6> \xE4\xA1 |0
-<U92A7> \xE4\xB4 |0
-<U92A8> \xBB\xCF |0
-<U92A9> \xE4\xB7 |0
-<U92AA> \xE4\x7D |0
-<U92AB> \xE4\xA3 |0
-<U92AC> \xBE\x52 |0
-<U92B2> \xBE\x5A |0
-<U92B3> \xBE\x55 |0
-<U92B4> \xE8\xA4 |0
-<U92B5> \xE8\xA1 |0
-<U92B6> \xE8\x67 |0
-<U92B7> \xBE\x50 |0
-<U92B9> \xF9\xD7 |0
-<U92BB> \xBE\x4F |0
-<U92BC> \xBE\x56 |0
-<U92C0> \xE8\x65 |0
-<U92C1> \xBE\x54 |0
-<U92C2> \xE8\x71 |0
-<U92C3> \xE8\x63 |0
-<U92C4> \xE8\x64 |0
-<U92C5> \xBE\x4E |0
-<U92C6> \xE8\xA3 |0
-<U92C7> \xBE\x58 |0
-<U92C8> \xE8\x74 |0
-<U92C9> \xE8\x79 |0
-<U92CA> \xE8\x73 |0
-<U92CB> \xEB\xEE |0
-<U92CC> \xE8\x6F |0
-<U92CD> \xE8\x77 |0
-<U92CE> \xE8\x75 |0
-<U92CF> \xE8\x68 |0
-<U92D0> \xE8\x62 |0
-<U92D1> \xE8\x7D |0
-<U92D2> \xBE\x57 |0
-<U92D3> \xE8\x7E |0
-<U92D5> \xE8\x78 |0
-<U92D7> \xE8\x6D |0
-<U92D8> \xE8\x6B |0
-<U92D9> \xE8\x66 |0
-<U92DD> \xE8\x6E |0
-<U92DE> \xE8\x7B |0
-<U92DF> \xE8\x6A |0
-<U92E0> \xE8\x7A |0
-<U92E1> \xE8\xA2 |0
-<U92E4> \xBE\x53 |0
-<U92E6> \xE8\x76 |0
-<U92E7> \xE8\x7C |0
-<U92E8> \xE8\x72 |0
-<U92E9> \xE8\x6C |0
-<U92EA> \xBE\x51 |0
-<U92EE> \xE4\xA8 |0
-<U92EF> \xE8\x70 |0
-<U92F0> \xBE\x59 |0
-<U92F1> \xE8\x69 |0
-<U92F7> \xEB\xF4 |0
-<U92F8> \xBF\xF7 |0
-<U92F9> \xEB\xF3 |0
-<U92FA> \xEB\xF0 |0
-<U92FB> \xEC\x44 |0
-<U92FC> \xBF\xFB |0
-<U92FE> \xEC\x41 |0
-<U92FF> \xEB\xF8 |0
-<U9300> \xEC\x43 |0
-<U9301> \xEB\xE9 |0
-<U9302> \xEB\xF6 |0
-<U9304> \xBF\xFD |0
-<U9306> \xEB\xE1 |0
-<U9308> \xEB\xDF |0
-<U9309> \xEC\x42 |0
-<U930B> \xEC\x40 |0
-<U930C> \xEB\xFE |0
-<U930D> \xEB\xED |0
-<U930E> \xEB\xEC |0
-<U930F> \xEB\xE2 |0
-<U9310> \xC0\x40 |0
-<U9312> \xEB\xE8 |0
-<U9313> \xEB\xF2 |0
-<U9314> \xEB\xFD |0
-<U9315> \xC0\x43 |0
-<U9316> \xEC\x45 |0
-<U9318> \xC1\xE8 |0
-<U9319> \xC0\x45 |0
-<U931A> \xBF\xFE |0
-<U931B> \xEB\xE6 |0
-<U931D> \xEB\xEF |0
-<U931E> \xEB\xDE |0
-<U931F> \xEB\xE0 |0
-<U9320> \xBF\xF5 |0
-<U9321> \xC0\x42 |0
-<U9322> \xBF\xFA |0
-<U9323> \xEB\xE7 |0
-<U9324> \xEB\xF7 |0
-<U9325> \xEB\xF1 |0
-<U9326> \xC0\x41 |0
-<U9327> \xEB\xDD |0
-<U9328> \xC1\xE3 |0
-<U9329> \xEB\xF9 |0
-<U932A> \xEB\xFC |0
-<U932B> \xBF\xFC |0
-<U932D> \xEB\xEB |0
-<U932E> \xC0\x44 |0
-<U932F> \xBF\xF9 |0
-<U9333> \xBF\xF8 |0
-<U9334> \xEB\xF5 |0
-<U9335> \xEB\xFB |0
-<U9336> \xBF\xF6 |0
-<U9338> \xEB\xE4 |0
-<U9339> \xEB\xFA |0
-<U933C> \xEB\xE5 |0
-<U9346> \xEB\xEA |0
-<U9347> \xEE\xD2 |0
-<U9349> \xEE\xD7 |0
-<U934A> \xC1\xE5 |0
-<U934B> \xC1\xE7 |0
-<U934C> \xEE\xDD |0
-<U934D> \xC1\xE1 |0
-<U934E> \xEE\xEC |0
-<U934F> \xEE\xE3 |0
-<U9350> \xEE\xD8 |0
-<U9351> \xEE\xD9 |0
-<U9352> \xEE\xE2 |0
-<U9354> \xC1\xEE |0
-<U9355> \xEE\xE1 |0
-<U9356> \xEE\xD1 |0
-<U9357> \xEE\xE0 |0
-<U9358> \xEE\xD4 |0
-<U9359> \xEE\xED |0
-<U935A> \xC1\xED |0
-<U935B> \xC1\xEB |0
-<U935C> \xEE\xD5 |0
-<U935E> \xEE\xE8 |0
-<U9360> \xEE\xDA |0
-<U9361> \xEE\xE7 |0
-<U9363> \xEE\xE9 |0
-<U9364> \xEE\xD0 |0
-<U9365> \xC1\xE6 |0
-<U9367> \xEE\xEA |0
-<U936A> \xEE\xDE |0
-<U936C> \xC1\xEA |0
-<U936D> \xEE\xDB |0
-<U9370> \xC1\xEC |0
-<U9371> \xEE\xE4 |0
-<U9375> \xC1\xE4 |0
-<U9376> \xEE\xD6 |0
-<U9377> \xEE\xE5 |0
-<U9379> \xEE\xDF |0
-<U937A> \xEB\xE3 |0
-<U937B> \xEE\xE6 |0
-<U937C> \xEE\xD3 |0
-<U937E> \xC1\xE9 |0
-<U9380> \xEE\xEB |0
-<U9382> \xC1\xE2 |0
-<U9383> \xEE\xCE |0
-<U9388> \xF1\x60 |0
-<U9389> \xF1\x59 |0
-<U938A> \xC2\xE9 |0
-<U938C> \xF1\x54 |0
-<U938D> \xF1\x63 |0
-<U938E> \xF1\x5B |0
-<U938F> \xEE\xDC |0
-<U9391> \xF1\x65 |0
-<U9392> \xF1\x55 |0
-<U9394> \xC2\xE8 |0
-<U9395> \xF1\x5F |0
-<U9396> \xC2\xEA |0
-<U9397> \xC2\xF2 |0
-<U9398> \xC2\xF0 |0
-<U9399> \xF1\x61 |0
-<U939A> \xC2\xF1 |0
-<U939B> \xF1\x57 |0
-<U939D> \xF1\x58 |0
-<U939E> \xF1\x5D |0
-<U939F> \xF1\x62 |0
-<U93A1> \xEE\xCD |0
-<U93A2> \xC2\xEB |0
-<U93A3> \xF1\x6A |0
-<U93A4> \xF1\x67 |0
-<U93A5> \xF1\x6B |0
-<U93A6> \xF1\x5E |0
-<U93A7> \xF1\x5A |0
-<U93A8> \xF1\x68 |0
-<U93A9> \xF3\x6A |0
-<U93AA> \xF1\x5C |0
-<U93AC> \xC2\xEE |0
-<U93AE> \xC2\xED |0
-<U93AF> \xEE\xCF |0
-<U93B0> \xC2\xEF |0
-<U93B1> \xF1\x64 |0
-<U93B2> \xF1\x66 |0
-<U93B3> \xC2\xEC |0
-<U93B4> \xF1\x69 |0
-<U93B5> \xF1\x53 |0
-<U93B7> \xF1\x56 |0
-<U93C0> \xF3\x73 |0
-<U93C2> \xF3\x63 |0
-<U93C3> \xC3\xEB |0
-<U93C4> \xF3\x71 |0
-<U93C7> \xF3\x61 |0
-<U93C8> \xC3\xEC |0
-<U93CA> \xF3\x6C |0
-<U93CC> \xF3\x68 |0
-<U93CD> \xC3\xF1 |0
-<U93CE> \xF3\x72 |0
-<U93CF> \xF3\x62 |0
-<U93D0> \xF3\x65 |0
-<U93D1> \xC3\xE9 |0
-<U93D2> \xF3\x74 |0
-<U93D4> \xF3\x6D |0
-<U93D5> \xF3\x70 |0
-<U93D6> \xC3\xEF |0
-<U93D7> \xC3\xF4 |0
-<U93D8> \xC3\xF2 |0
-<U93D9> \xF3\x69 |0
-<U93DA> \xF3\x64 |0
-<U93DC> \xC3\xED |0
-<U93DD> \xC3\xEE |0
-<U93DE> \xF3\x60 |0
-<U93DF> \xC3\xEA |0
-<U93E1> \xC3\xE8 |0
-<U93E2> \xC3\xF0 |0
-<U93E3> \xF3\x6F |0
-<U93E4> \xC3\xF3 |0
-<U93E6> \xF3\x6B |0
-<U93E7> \xF3\x75 |0
-<U93E8> \xC3\xF5 |0
-<U93EC> \xF3\x67 |0
-<U93EE> \xF3\x6E |0
-<U93F5> \xF4\xF3 |0
-<U93F6> \xF5\x42 |0
-<U93F7> \xF4\xF5 |0
-<U93F8> \xF4\xFC |0
-<U93F9> \xF3\x66 |0
-<U93FA> \xF4\xFA |0
-<U93FB> \xF4\xE9 |0
-<U93FC> \xF5\x40 |0
-<U93FD> \xC4\xC3 |0
-<U93FE> \xF4\xED |0
-<U93FF> \xF4\xFE |0
-<U9400> \xF4\xF4 |0
-<U9403> \xC4\xC2 |0
-<U9406> \xF5\x44 |0
-<U9407> \xF4\xF6 |0
-<U9409> \xF4\xFB |0
-<U940A> \xF4\xFD |0
-<U940B> \xF4\xE7 |0
-<U940C> \xF5\x41 |0
-<U940D> \xF4\xF2 |0
-<U940E> \xF4\xF7 |0
-<U940F> \xF4\xEB |0
-<U9410> \xF4\xEF |0
-<U9411> \xF5\x43 |0
-<U9412> \xF4\xF9 |0
-<U9413> \xF4\xE8 |0
-<U9414> \xF4\xEC |0
-<U9415> \xF4\xEE |0
-<U9416> \xF4\xF8 |0
-<U9418> \xC4\xC1 |0
-<U9419> \xF4\xF1 |0
-<U9420> \xF4\xEA |0
-<U9428> \xF4\xF0 |0
-<U9429> \xF6\x61 |0
-<U942A> \xF6\x66 |0
-<U942B> \xC5\x4F |0
-<U942C> \xF6\x68 |0
-<U942E> \xC5\x49 |0
-<U9430> \xF6\x64 |0
-<U9431> \xF6\x6A |0
-<U9432> \xC5\x4E |0
-<U9433> \xC5\x4A |0
-<U9435> \xC5\x4B |0
-<U9436> \xF6\x60 |0
-<U9437> \xF6\x67 |0
-<U9438> \xC5\x4D |0
-<U9439> \xF6\x65 |0
-<U943A> \xC5\x4C |0
-<U943B> \xF6\x5F |0
-<U943C> \xF6\x63 |0
-<U943D> \xF6\x62 |0
-<U943F> \xF6\x5E |0
-<U9440> \xF6\x69 |0
-<U9444> \xC5\xB1 |0
-<U9445> \xF7\x6D |0
-<U9446> \xF7\x70 |0
-<U9447> \xF7\x6C |0
-<U9448> \xF7\x6E |0
-<U9449> \xF7\x6F |0
-<U944A> \xF7\x69 |0
-<U944B> \xF7\x6A |0
-<U944C> \xF7\x67 |0
-<U944F> \xF7\x6B |0
-<U9450> \xF7\x68 |0
-<U9451> \xC5\xB2 |0
-<U9452> \xC5\xB3 |0
-<U9455> \xF8\x4B |0
-<U9457> \xF8\x4D |0
-<U945D> \xF8\x4C |0
-<U945E> \xF8\x4E |0
-<U9460> \xC5\xE0 |0
-<U9462> \xF8\x4A |0
-<U9463> \xC5\xDF |0
-<U9464> \xC5\xE1 |0
-<U9468> \xF8\xCB |0
-<U9469> \xF8\xCC |0
-<U946A> \xC6\x44 |0
-<U946B> \xF8\xCA |0
-<U946D> \xF9\x53 |0
-<U946E> \xF9\x52 |0
-<U946F> \xF9\x54 |0
-<U9470> \xC6\x5F |0
-<U9471> \xF9\x55 |0
-<U9472> \xC6\x5E |0
-<U9473> \xF9\x56 |0
-<U9474> \xF9\x72 |0
-<U9475> \xF9\x75 |0
-<U9476> \xF9\x74 |0
-<U9477> \xC6\x68 |0
-<U9478> \xF9\x73 |0
-<U947C> \xC6\x72 |0
-<U947D> \xC6\x70 |0
-<U947E> \xC6\x71 |0
-<U947F> \xC6\x77 |0
-<U9480> \xF9\xC0 |0
-<U9481> \xF9\xC1 |0
-<U9482> \xF9\xBF |0
-<U9483> \xF9\xC9 |0
-<U9577> \xAA\xF8 |0
-<U957A> \xD8\x44 |0
-<U957B> \xDC\x78 |0
-<U957C> \xE8\xA5 |0
-<U957D> \xF3\x76 |0
-<U9580> \xAA\xF9 |0
-<U9582> \xAD\xAC |0
-<U9583> \xB0\x7B |0
-<U9586> \xD8\x45 |0
-<U9588> \xD8\x46 |0
-<U9589> \xB3\xAC |0
-<U958B> \xB6\x7D |0
-<U958C> \xDC\x7A |0
-<U958D> \xDC\x79 |0
-<U958E> \xB6\xA3 |0
-<U958F> \xB6\x7C |0
-<U9590> \xDC\x7B |0
-<U9591> \xB6\x7E |0
-<U9592> \xB6\xA2 |0
-<U9593> \xB6\xA1 |0
-<U9594> \xB6\x7B |0
-<U9598> \xB9\x68 |0
-<U959B> \xE0\xD0 |0
-<U959C> \xE0\xCE |0
-<U959E> \xE0\xCF |0
-<U959F> \xE0\xCD |0
-<U95A1> \xBB\xD2 |0
-<U95A3> \xBB\xD5 |0
-<U95A4> \xBB\xD7 |0
-<U95A5> \xBB\xD6 |0
-<U95A8> \xBB\xD3 |0
-<U95A9> \xBB\xD4 |0
-<U95AB> \xE8\xA7 |0
-<U95AC> \xE8\xA6 |0
-<U95AD> \xBE\x5B |0
-<U95AE> \xE8\xA8 |0
-<U95B0> \xE8\xA9 |0
-<U95B1> \xBE\x5C |0
-<U95B5> \xEC\x4D |0
-<U95B6> \xEC\x4B |0
-<U95B7> \xEE\xF3 |0
-<U95B9> \xEC\x49 |0
-<U95BA> \xEC\x4A |0
-<U95BB> \xC0\x46 |0
-<U95BC> \xEC\x46 |0
-<U95BD> \xEC\x4E |0
-<U95BE> \xEC\x48 |0
-<U95BF> \xEC\x4C |0
-<U95C0> \xEE\xEF |0
-<U95C3> \xEE\xF1 |0
-<U95C5> \xEE\xF2 |0
-<U95C6> \xC1\xF3 |0
-<U95C7> \xEE\xEE |0
-<U95C8> \xC1\xF2 |0
-<U95C9> \xEE\xF0 |0
-<U95CA> \xC1\xEF |0
-<U95CB> \xC1\xF0 |0
-<U95CC> \xC1\xF1 |0
-<U95CD> \xEC\x47 |0
-<U95D0> \xC2\xF5 |0
-<U95D1> \xF1\x6E |0
-<U95D2> \xF1\x6C |0
-<U95D3> \xF1\x6D |0
-<U95D4> \xC2\xF3 |0
-<U95D5> \xC2\xF6 |0
-<U95D6> \xC2\xF4 |0
-<U95DA> \xF3\x77 |0
-<U95DB> \xF3\x78 |0
-<U95DC> \xC3\xF6 |0
-<U95DE> \xF5\x45 |0
-<U95DF> \xF5\x47 |0
-<U95E0> \xF5\x46 |0
-<U95E1> \xC4\xC4 |0
-<U95E2> \xC5\x50 |0
-<U95E3> \xF6\x6D |0
-<U95E4> \xF6\x6C |0
-<U95E5> \xF6\x6B |0
-<U961C> \xAA\xFA |0
-<U961E> \xC9\xAA |0
-<U9620> \xCA\x58 |0
-<U9621> \xA6\xE9 |0
-<U9622> \xCA\x56 |0
-<U9623> \xCA\x59 |0
-<U9624> \xCA\x57 |0
-<U9628> \xCB\xAE |0
-<U962A> \xA8\xC1 |0
-<U962C> \xA8\xC2 |0
-<U962D> \xCB\xB0 |0
-<U962E> \xA8\xBF |0
-<U962F> \xCB\xAF |0
-<U9630> \xCB\xAD |0
-<U9631> \xA8\xC0 |0
-<U9632> \xA8\xBE |0
-<U9639> \xCD\xD8 |0
-<U963A> \xCD\xDB |0
-<U963B> \xAA\xFD |0
-<U963C> \xCD\xDA |0
-<U963D> \xCD\xD9 |0
-<U963F> \xAA\xFC |0
-<U9640> \xAA\xFB |0
-<U9642> \xAB\x40 |0
-<U9643> \xCD\xDC |0
-<U9644> \xAA\xFE |0
-<U964A> \xD0\xC6 |0
-<U964B> \xAD\xAE |0
-<U964C> \xAD\xAF |0
-<U964D> \xAD\xB0 |0
-<U964E> \xD0\xC7 |0
-<U964F> \xD0\xC3 |0
-<U9650> \xAD\xAD |0
-<U9651> \xD0\xC4 |0
-<U9653> \xD0\xC5 |0
-<U9654> \xD0\xC2 |0
-<U9658> \xB0\xA4 |0
-<U965B> \xB0\xA1 |0
-<U965C> \xD4\x45 |0
-<U965D> \xB0\xA2 |0
-<U965E> \xB0\xA5 |0
-<U965F> \xD4\x46 |0
-<U9661> \xB0\x7E |0
-<U9662> \xB0\x7C |0
-<U9663> \xB0\x7D |0
-<U9664> \xB0\xA3 |0
-<U966A> \xB3\xAD |0
-<U966B> \xD8\x49 |0
-<U966C> \xB3\xB5 |0
-<U966D> \xD8\x48 |0
-<U966F> \xD8\x4B |0
-<U9670> \xB3\xB1 |0
-<U9671> \xD8\x4A |0
-<U9672> \xB6\xAB |0
-<U9673> \xB3\xAF |0
-<U9674> \xB3\xB2 |0
-<U9675> \xB3\xAE |0
-<U9676> \xB3\xB3 |0
-<U9677> \xB3\xB4 |0
-<U9678> \xB3\xB0 |0
-<U967C> \xD8\x47 |0
-<U967D> \xB6\xA7 |0
-<U967E> \xDC\x7D |0
-<U9680> \xDC\xA3 |0
-<U9683> \xDC\xA2 |0
-<U9684> \xB6\xAC |0
-<U9685> \xB6\xA8 |0
-<U9686> \xB6\xA9 |0
-<U9687> \xDC\x7C |0
-<U9688> \xDC\x7E |0
-<U9689> \xDC\xA1 |0
-<U968A> \xB6\xA4 |0
-<U968B> \xB6\xA6 |0
-<U968D> \xB6\xAA |0
-<U968E> \xB6\xA5 |0
-<U9691> \xE0\xD3 |0
-<U9692> \xE0\xD1 |0
-<U9693> \xE0\xD2 |0
-<U9694> \xB9\x6A |0
-<U9695> \xB9\x6B |0
-<U9697> \xE0\xD4 |0
-<U9698> \xB9\x69 |0
-<U9699> \xBB\xD8 |0
-<U969B> \xBB\xDA |0
-<U969C> \xBB\xD9 |0
-<U969E> \xE4\xBB |0
-<U96A1> \xE4\xBC |0
-<U96A2> \xE8\xAB |0
-<U96A4> \xE8\xAA |0
-<U96A7> \xC0\x47 |0
-<U96A8> \xC0\x48 |0
-<U96A9> \xEC\x4F |0
-<U96AA> \xC0\x49 |0
-<U96AC> \xEE\xF6 |0
-<U96AE> \xEE\xF4 |0
-<U96B0> \xEE\xF5 |0
-<U96B1> \xC1\xF4 |0
-<U96B3> \xF1\x6F |0
-<U96B4> \xC3\xF7 |0
-<U96B8> \xC1\xF5 |0
-<U96B9> \xAB\x41 |0
-<U96BB> \xB0\xA6 |0
-<U96BC> \xD4\x47 |0
-<U96BF> \xD8\x4C |0
-<U96C0> \xB3\xB6 |0
-<U96C1> \xB6\xAD |0
-<U96C2> \xDC\xA4 |0
-<U96C3> \xDC\xA6 |0
-<U96C4> \xB6\xAF |0
-<U96C5> \xB6\xAE |0
-<U96C6> \xB6\xB0 |0
-<U96C7> \xB6\xB1 |0
-<U96C8> \xDC\xA5 |0
-<U96C9> \xB9\x6E |0
-<U96CA> \xB9\x6F |0
-<U96CB> \xB9\x6D |0
-<U96CC> \xBB\xDB |0
-<U96CD> \xB9\x6C |0
-<U96CE> \xE0\xD5 |0
-<U96D2> \xBB\xDC |0
-<U96D3> \xE8\xAC |0
-<U96D4> \xEC\x50 |0
-<U96D5> \xC0\x4A |0
-<U96D6> \xC1\xF6 |0
-<U96D7> \xF1\x70 |0
-<U96D8> \xF1\x74 |0
-<U96D9> \xC2\xF9 |0
-<U96DA> \xF1\x71 |0
-<U96DB> \xC2\xFA |0
-<U96DC> \xC2\xF8 |0
-<U96DD> \xF1\x75 |0
-<U96DE> \xC2\xFB |0
-<U96DF> \xF1\x73 |0
-<U96E1> \xF3\x79 |0
-<U96E2> \xC2\xF7 |0
-<U96E3> \xC3\xF8 |0
-<U96E5> \xF8\xCD |0
-<U96E8> \xAB\x42 |0
-<U96E9> \xB3\xB8 |0
-<U96EA> \xB3\xB7 |0
-<U96EF> \xB6\xB2 |0
-<U96F0> \xDC\xA8 |0
-<U96F1> \xDC\xA7 |0
-<U96F2> \xB6\xB3 |0
-<U96F5> \xE0\xD9 |0
-<U96F6> \xB9\x73 |0
-<U96F7> \xB9\x70 |0
-<U96F8> \xE0\xD8 |0
-<U96F9> \xB9\x72 |0
-<U96FA> \xE0\xD6 |0
-<U96FB> \xB9\x71 |0
-<U96FD> \xE0\xD7 |0
-<U96FF> \xE4\xBD |0
-<U9700> \xBB\xDD |0
-<U9702> \xE8\xAF |0
-<U9704> \xBE\x5D |0
-<U9705> \xE8\xAD |0
-<U9706> \xBE\x5E |0
-<U9707> \xBE\x5F |0
-<U9708> \xE8\xAE |0
-<U9709> \xBE\x60 |0
-<U970B> \xEC\x51 |0
-<U970D> \xC0\x4E |0
-<U970E> \xC0\x4B |0
-<U970F> \xC0\x50 |0
-<U9710> \xEC\x53 |0
-<U9711> \xC0\x4C |0
-<U9712> \xEC\x52 |0
-<U9713> \xC0\x4F |0
-<U9716> \xC0\x4D |0
-<U9718> \xEE\xF9 |0
-<U9719> \xEE\xFB |0
-<U971C> \xC1\xF7 |0
-<U971D> \xEE\xFA |0
-<U971E> \xC1\xF8 |0
-<U971F> \xEE\xF8 |0
-<U9720> \xEE\xF7 |0
-<U9722> \xF1\x77 |0
-<U9723> \xF1\x76 |0
-<U9724> \xC2\xFC |0
-<U9725> \xF1\x78 |0
-<U9726> \xF3\x7E |0
-<U9727> \xC3\xFA |0
-<U9728> \xF3\x7D |0
-<U9729> \xF3\x7A |0
-<U972A> \xC3\xF9 |0
-<U972B> \xF3\x7B |0
-<U972C> \xF3\x7C |0
-<U972E> \xF5\x48 |0
-<U972F> \xF5\x49 |0
-<U9730> \xC4\xC5 |0
-<U9732> \xC5\x53 |0
-<U9735> \xF6\x6E |0
-<U9738> \xC5\x51 |0
-<U9739> \xC5\x52 |0
-<U973A> \xF6\x6F |0
-<U973D> \xC5\xB4 |0
-<U973E> \xC5\xB5 |0
-<U973F> \xF7\x71 |0
-<U9742> \xC6\x45 |0
-<U9743> \xF8\xCF |0
-<U9744> \xC6\x47 |0
-<U9746> \xF8\xCE |0
-<U9747> \xF8\xD0 |0
-<U9748> \xC6\x46 |0
-<U9749> \xF9\x57 |0
-<U974B> \xF9\xAD |0
-<U9752> \xAB\x43 |0
-<U9756> \xB9\x74 |0
-<U9758> \xE4\xBE |0
-<U975A> \xE8\xB0 |0
-<U975B> \xC0\x51 |0
-<U975C> \xC0\x52 |0
-<U975E> \xAB\x44 |0
-<U9760> \xBE\x61 |0
-<U9761> \xC3\xFB |0
-<U9762> \xAD\xB1 |0
-<U9766> \xC0\x53 |0
-<U9768> \xC5\xE2 |0
-<U9769> \xAD\xB2 |0
-<U976A> \xD8\x4D |0
-<U976C> \xDC\xA9 |0
-<U976E> \xDC\xAB |0
-<U9770> \xDC\xAA |0
-<U9772> \xE0\xDD |0
-<U9773> \xE0\xDA |0
-<U9774> \xB9\x75 |0
-<U9776> \xB9\x76 |0
-<U9777> \xE0\xDB |0
-<U9778> \xE0\xDC |0
-<U977A> \xE4\xC0 |0
-<U977B> \xE4\xC5 |0
-<U977C> \xBB\xDE |0
-<U977D> \xE4\xBF |0
-<U977E> \xE4\xC1 |0
-<U977F> \xE4\xC8 |0
-<U9780> \xE4\xC3 |0
-<U9781> \xE4\xC7 |0
-<U9782> \xE4\xC4 |0
-<U9783> \xE4\xC2 |0
-<U9784> \xE4\xC6 |0
-<U9785> \xBB\xDF |0
-<U9788> \xE8\xB3 |0
-<U978A> \xE8\xB1 |0
-<U978B> \xBE\x63 |0
-<U978D> \xBE\x62 |0
-<U978E> \xE8\xB2 |0
-<U978F> \xBE\x64 |0
-<U9794> \xEC\x56 |0
-<U9797> \xEC\x55 |0
-<U9798> \xC0\x54 |0
-<U9799> \xEC\x54 |0
-<U979A> \xEE\xFC |0
-<U979C> \xEE\xFE |0
-<U979D> \xEF\x41 |0
-<U979E> \xEF\x40 |0
-<U97A0> \xC1\xF9 |0
-<U97A1> \xEE\xFD |0
-<U97A2> \xF1\xA1 |0
-<U97A3> \xC2\xFD |0
-<U97A4> \xF1\x7D |0
-<U97A5> \xF1\xA2 |0
-<U97A6> \xC2\xFE |0
-<U97A8> \xF1\x7B |0
-<U97AA> \xF1\x7E |0
-<U97AB> \xF1\x7C |0
-<U97AC> \xF1\x79 |0
-<U97AD> \xC3\x40 |0
-<U97AE> \xF1\x7A |0
-<U97B3> \xF3\xA1 |0
-<U97B6> \xF3\xA3 |0
-<U97B7> \xF3\xA2 |0
-<U97B9> \xF5\x4A |0
-<U97BB> \xF5\x4B |0
-<U97BF> \xF6\x70 |0
-<U97C1> \xC5\xB7 |0
-<U97C3> \xC5\xB6 |0
-<U97C4> \xF8\x4F |0
-<U97C5> \xF8\x50 |0
-<U97C6> \xC6\x48 |0
-<U97C7> \xF8\xD1 |0
-<U97C9> \xC6\x69 |0
-<U97CB> \xAD\xB3 |0
-<U97CC> \xB6\xB4 |0
-<U97CD> \xE4\xCA |0
-<U97CE> \xE4\xC9 |0
-<U97CF> \xE8\xB5 |0
-<U97D0> \xE8\xB4 |0
-<U97D3> \xC1\xFA |0
-<U97D4> \xEF\x43 |0
-<U97D5> \xEF\x42 |0
-<U97D6> \xF1\xA5 |0
-<U97D7> \xF1\xA3 |0
-<U97D8> \xF1\xA6 |0
-<U97D9> \xF1\xA4 |0
-<U97DC> \xC3\xFC |0
-<U97DD> \xF3\xA4 |0
-<U97DE> \xF3\xA5 |0
-<U97DF> \xF3\xA6 |0
-<U97E1> \xF6\x71 |0
-<U97E3> \xF7\x72 |0
-<U97E5> \xF8\xD2 |0
-<U97ED> \xAD\xB4 |0
-<U97F0> \xEC\x57 |0
-<U97F1> \xEF\x44 |0
-<U97F3> \xAD\xB5 |0
-<U97F6> \xBB\xE0 |0
-<U97F8> \xEC\x58 |0
-<U97F9> \xC3\x41 |0
-<U97FA> \xF1\xA7 |0
-<U97FB> \xC3\xFD |0
-<U97FD> \xF5\x4C |0
-<U97FE> \xF5\x4D |0
-<U97FF> \xC5\x54 |0
-<U9800> \xF8\x51 |0
-<U9801> \xAD\xB6 |0
-<U9802> \xB3\xBB |0
-<U9803> \xB3\xBC |0
-<U9804> \xD8\x4E |0
-<U9805> \xB6\xB5 |0
-<U9806> \xB6\xB6 |0
-<U9807> \xDC\xAC |0
-<U9808> \xB6\xB7 |0
-<U980A> \xB9\x7A |0
-<U980C> \xB9\x7C |0
-<U980D> \xE0\xDF |0
-<U980E> \xE0\xE0 |0
-<U980F> \xE0\xDE |0
-<U9810> \xB9\x77 |0
-<U9811> \xB9\x78 |0
-<U9812> \xB9\x7B |0
-<U9813> \xB9\x79 |0
-<U9816> \xE4\xCB |0
-<U9817> \xBB\xE1 |0
-<U9818> \xBB\xE2 |0
-<U981B> \xE8\xBC |0
-<U981C> \xBE\x67 |0
-<U981D> \xE8\xB7 |0
-<U981E> \xE8\xB6 |0
-<U9820> \xE8\xBB |0
-<U9821> \xBE\x65 |0
-<U9824> \xC0\x5B |0
-<U9826> \xE8\xB8 |0
-<U9827> \xE8\xBD |0
-<U9828> \xE8\xBA |0
-<U9829> \xE8\xB9 |0
-<U982B> \xBE\x66 |0
-<U982D> \xC0\x59 |0
-<U982F> \xEC\x5A |0
-<U9830> \xC0\x55 |0
-<U9832> \xEC\x5B |0
-<U9835> \xEC\x59 |0
-<U9837> \xC0\x58 |0
-<U9838> \xC0\x56 |0
-<U9839> \xC0\x5A |0
-<U983B> \xC0\x57 |0
-<U9841> \xEF\x45 |0
-<U9843> \xEF\x4A |0
-<U9844> \xEF\x46 |0
-<U9845> \xEF\x49 |0
-<U9846> \xC1\xFB |0
-<U9848> \xED\xD4 |0
-<U9849> \xEF\x48 |0
-<U984A> \xEF\x47 |0
-<U984C> \xC3\x44 |0
-<U984D> \xC3\x42 |0
-<U984E> \xC3\x45 |0
-<U984F> \xC3\x43 |0
-<U9850> \xF1\xA8 |0
-<U9851> \xF1\xA9 |0
-<U9852> \xF1\xAA |0
-<U9853> \xC3\x46 |0
-<U9857> \xF3\xAA |0
-<U9858> \xC4\x40 |0
-<U9859> \xF3\xA8 |0
-<U985B> \xC4\x41 |0
-<U985C> \xF3\xA7 |0
-<U985D> \xF3\xA9 |0
-<U985E> \xC3\xFE |0
-<U985F> \xF5\x51 |0
-<U9860> \xF5\x4E |0
-<U9862> \xF5\x4F |0
-<U9863> \xF5\x50 |0
-<U9864> \xF6\x72 |0
-<U9865> \xC5\x56 |0
-<U9867> \xC5\x55 |0
-<U9869> \xF7\x74 |0
-<U986A> \xF7\x73 |0
-<U986B> \xC5\xB8 |0
-<U986F> \xC5\xE3 |0
-<U9870> \xC6\x49 |0
-<U9871> \xC6\x60 |0
-<U9872> \xF9\x58 |0
-<U9873> \xF9\xAE |0
-<U9874> \xF9\xAF |0
-<U98A8> \xAD\xB7 |0
-<U98A9> \xDC\xAD |0
-<U98AC> \xE0\xE1 |0
-<U98AD> \xE4\xCC |0
-<U98AE> \xE4\xCD |0
-<U98AF> \xBB\xE3 |0
-<U98B1> \xBB\xE4 |0
-<U98B2> \xE8\xBE |0
-<U98B3> \xBE\x68 |0
-<U98B6> \xC1\xFC |0
-<U98B8> \xF1\xAB |0
-<U98BA> \xC3\x47 |0
-<U98BB> \xF3\xAD |0
-<U98BC> \xC4\x42 |0
-<U98BD> \xF3\xAC |0
-<U98BE> \xF3\xAE |0
-<U98BF> \xF3\xAB |0
-<U98C0> \xF6\x75 |0
-<U98C1> \xF5\x52 |0
-<U98C2> \xF5\x53 |0
-<U98C4> \xC4\xC6 |0
-<U98C6> \xF6\x74 |0
-<U98C9> \xF6\x73 |0
-<U98CB> \xF7\x75 |0
-<U98CC> \xF9\xB0 |0
-<U98DB> \xAD\xB8 |0
-<U98DF> \xAD\xB9 |0
-<U98E2> \xB0\xA7 |0
-<U98E3> \xD4\x48 |0
-<U98E5> \xD8\x4F |0
-<U98E7> \xB6\xB8 |0
-<U98E9> \xB6\xBB |0
-<U98EA> \xB6\xB9 |0
-<U98EB> \xDC\xAE |0
-<U98ED> \xB6\xBD |0
-<U98EF> \xB6\xBA |0
-<U98F2> \xB6\xBC |0
-<U98F4> \xB9\x7E |0
-<U98F6> \xE0\xE2 |0
-<U98F9> \xE0\xE3 |0
-<U98FA> \xE8\xC0 |0
-<U98FC> \xB9\x7D |0
-<U98FD> \xB9\xA1 |0
-<U98FE> \xB9\xA2 |0
-<U9900> \xE4\xCF |0
-<U9902> \xE4\xCE |0
-<U9903> \xBB\xE5 |0
-<U9905> \xBB\xE6 |0
-<U9907> \xE4\xD0 |0
-<U9908> \xE8\xBF |0
-<U9909> \xBB\xE8 |0
-<U990A> \xBE\x69 |0
-<U990C> \xBB\xE7 |0
-<U9910> \xC0\x5C |0
-<U9911> \xE8\xC1 |0
-<U9912> \xBE\x6B |0
-<U9913> \xBE\x6A |0
-<U9914> \xE8\xC2 |0
-<U9915> \xE8\xC5 |0
-<U9916> \xE8\xC3 |0
-<U9917> \xE8\xC4 |0
-<U9918> \xBE\x6C |0
-<U991A> \xC0\x61 |0
-<U991B> \xC0\x5F |0
-<U991E> \xC0\x5E |0
-<U991F> \xEC\x5D |0
-<U9921> \xC0\x60 |0
-<U9924> \xEC\x5C |0
-<U9925> \xEF\x4B |0
-<U9927> \xEC\x5E |0
-<U9928> \xC0\x5D |0
-<U9929> \xEC\x5F |0
-<U992A> \xEF\x4E |0
-<U992B> \xEF\x4C |0
-<U992C> \xEF\x4D |0
-<U992D> \xEF\x52 |0
-<U992E> \xC3\x4B |0
-<U992F> \xEF\x51 |0
-<U9930> \xEF\x54 |0
-<U9931> \xEF\x53 |0
-<U9932> \xEF\x50 |0
-<U9933> \xEF\x4F |0
-<U9935> \xC1\xFD |0
-<U993A> \xF1\xAE |0
-<U993C> \xF1\xAD |0
-<U993D> \xC3\x4A |0
-<U993E> \xC3\x48 |0
-<U993F> \xC3\x49 |0
-<U9941> \xF1\xAC |0
-<U9943> \xF3\xB1 |0
-<U9945> \xC4\x43 |0
-<U9947> \xF3\xB0 |0
-<U9948> \xF3\xAF |0
-<U9949> \xC4\x44 |0
-<U994B> \xF5\x58 |0
-<U994C> \xF5\x57 |0
-<U994E> \xF5\x55 |0
-<U9950> \xF5\x54 |0
-<U9951> \xC4\xC8 |0
-<U9952> \xC4\xC7 |0
-<U9953> \xF5\x59 |0
-<U9954> \xF7\x76 |0
-<U9955> \xC5\xB9 |0
-<U9956> \xF6\x77 |0
-<U9957> \xC5\x57 |0
-<U9958> \xF6\x76 |0
-<U9959> \xF5\x56 |0
-<U995B> \xF7\x77 |0
-<U995C> \xC5\xE4 |0
-<U995E> \xC6\x61 |0
-<U995F> \xF9\x59 |0
-<U9961> \xF9\xB1 |0
-<U9996> \xAD\xBA |0
-<U9997> \xD8\x50 |0
-<U9998> \xEF\x55 |0
-<U9999> \xAD\xBB |0
-<U999C> \xE4\xD2 |0
-<U999D> \xE4\xD1 |0
-<U999E> \xEC\x60 |0
-<U99A1> \xEF\x57 |0
-<U99A3> \xEF\x56 |0
-<U99A5> \xC3\x4C |0
-<U99A6> \xF3\xB2 |0
-<U99A7> \xF3\xB3 |0
-<U99A8> \xC4\xC9 |0
-<U99AB> \xF9\xB2 |0
-<U99AC> \xB0\xA8 |0
-<U99AD> \xB6\xBF |0
-<U99AE> \xB6\xBE |0
-<U99AF> \xE0\xE4 |0
-<U99B0> \xE0\xE6 |0
-<U99B1> \xB9\xA4 |0
-<U99B2> \xE0\xE5 |0
-<U99B3> \xB9\xA3 |0
-<U99B4> \xB9\xA5 |0
-<U99B5> \xE0\xE7 |0
-<U99B9> \xE4\xD4 |0
-<U99BA> \xE4\xD6 |0
-<U99BB> \xE4\xD5 |0
-<U99BD> \xE4\xD8 |0
-<U99C1> \xBB\xE9 |0
-<U99C2> \xE4\xD7 |0
-<U99C3> \xE4\xD3 |0
-<U99C7> \xE4\xD9 |0
-<U99C9> \xE8\xCC |0
-<U99CB> \xE8\xCF |0
-<U99CC> \xE8\xD1 |0
-<U99CD> \xE8\xC7 |0
-<U99CE> \xE8\xCB |0
-<U99CF> \xE8\xC8 |0
-<U99D0> \xBE\x6E |0
-<U99D1> \xBE\x71 |0
-<U99D2> \xBE\x73 |0
-<U99D3> \xE8\xC9 |0
-<U99D4> \xE8\xCA |0
-<U99D5> \xBE\x72 |0
-<U99D6> \xE8\xCD |0
-<U99D7> \xE8\xD0 |0
-<U99D8> \xE8\xCE |0
-<U99D9> \xBE\x74 |0
-<U99DB> \xBE\x70 |0
-<U99DC> \xE8\xC6 |0
-<U99DD> \xBE\x6D |0
-<U99DF> \xBE\x6F |0
-<U99E2> \xC0\x63 |0
-<U99E3> \xEC\x66 |0
-<U99E4> \xEC\x64 |0
-<U99E5> \xEC\x63 |0
-<U99E7> \xEC\x69 |0
-<U99E9> \xEC\x68 |0
-<U99EA> \xEC\x67 |0
-<U99EC> \xEC\x62 |0
-<U99ED> \xC0\x62 |0
-<U99EE> \xEC\x61 |0
-<U99F0> \xEC\x65 |0
-<U99F1> \xC0\x64 |0
-<U99F4> \xEF\x5A |0
-<U99F6> \xEF\x5E |0
-<U99F7> \xEF\x5B |0
-<U99F8> \xEF\x5D |0
-<U99F9> \xEF\x5C |0
-<U99FA> \xEF\x59 |0
-<U99FB> \xEF\x5F |0
-<U99FC> \xEF\x62 |0
-<U99FD> \xEF\x60 |0
-<U99FE> \xEF\x61 |0
-<U99FF> \xC2\x40 |0
-<U9A01> \xC1\xFE |0
-<U9A02> \xEF\x58 |0
-<U9A03> \xEF\x63 |0
-<U9A04> \xF1\xB3 |0
-<U9A05> \xF1\xB6 |0
-<U9A06> \xF1\xB8 |0
-<U9A07> \xF1\xB7 |0
-<U9A09> \xF1\xB1 |0
-<U9A0A> \xF1\xB5 |0
-<U9A0B> \xF1\xB0 |0
-<U9A0D> \xF1\xB2 |0
-<U9A0E> \xC3\x4D |0
-<U9A0F> \xF1\xAF |0
-<U9A11> \xF1\xB4 |0
-<U9A14> \xF3\xC0 |0
-<U9A15> \xF3\xB5 |0
-<U9A16> \xC4\x45 |0
-<U9A19> \xC4\x46 |0
-<U9A1A> \xF3\xB4 |0
-<U9A1B> \xF3\xB9 |0
-<U9A1C> \xF3\xBF |0
-<U9A1D> \xF3\xB7 |0
-<U9A1E> \xF3\xBE |0
-<U9A20> \xF3\xBB |0
-<U9A22> \xF3\xBA |0
-<U9A23> \xF3\xBD |0
-<U9A24> \xF3\xB8 |0
-<U9A25> \xF3\xB6 |0
-<U9A27> \xF3\xBC |0
-<U9A29> \xF5\x60 |0
-<U9A2A> \xF5\x5E |0
-<U9A2B> \xC4\xCA |0
-<U9A2C> \xF5\x5D |0
-<U9A2D> \xF5\x63 |0
-<U9A2E> \xF5\x61 |0
-<U9A30> \xC4\xCB |0
-<U9A31> \xF5\x5C |0
-<U9A32> \xF5\x5A |0
-<U9A34> \xF5\x5B |0
-<U9A35> \xC4\xCD |0
-<U9A36> \xF5\x5F |0
-<U9A37> \xC4\xCC |0
-<U9A38> \xF5\x62 |0
-<U9A39> \xF6\x78 |0
-<U9A3A> \xF6\x7E |0
-<U9A3D> \xF6\x79 |0
-<U9A3E> \xC5\x5B |0
-<U9A3F> \xF6\xA1 |0
-<U9A40> \xC5\x5A |0
-<U9A41> \xF6\x7D |0
-<U9A42> \xF6\x7C |0
-<U9A43> \xC5\x59 |0
-<U9A44> \xF6\x7B |0
-<U9A45> \xC5\x58 |0
-<U9A46> \xF6\x7A |0
-<U9A48> \xF7\x7D |0
-<U9A49> \xF7\xA1 |0
-<U9A4A> \xF7\x7E |0
-<U9A4C> \xF7\x7B |0
-<U9A4D> \xC5\xBB |0
-<U9A4E> \xF7\x78 |0
-<U9A4F> \xF7\x7C |0
-<U9A50> \xF7\xA3 |0
-<U9A52> \xF7\xA2 |0
-<U9A53> \xF7\x79 |0
-<U9A54> \xF7\x7A |0
-<U9A55> \xC5\xBA |0
-<U9A56> \xF8\x52 |0
-<U9A57> \xC5\xE7 |0
-<U9A59> \xF8\x53 |0
-<U9A5A> \xC5\xE5 |0
-<U9A5B> \xC5\xE6 |0
-<U9A5E> \xF8\xD3 |0
-<U9A5F> \xC6\x4A |0
-<U9A60> \xF9\x76 |0
-<U9A62> \xC6\x6A |0
-<U9A64> \xF9\xB3 |0
-<U9A65> \xC6\x6B |0
-<U9A66> \xF9\xB4 |0
-<U9A67> \xF9\xB5 |0
-<U9A68> \xF9\xC3 |0
-<U9A69> \xF9\xC2 |0
-<U9A6A> \xC6\x7A |0
-<U9A6B> \xF9\xCD |0
-<U9AA8> \xB0\xA9 |0
-<U9AAB> \xE0\xE9 |0
-<U9AAD> \xE0\xE8 |0
-<U9AAF> \xBB\xEA |0
-<U9AB0> \xBB\xEB |0
-<U9AB1> \xE4\xDA |0
-<U9AB3> \xE8\xD2 |0
-<U9AB4> \xEC\x6C |0
-<U9AB7> \xBE\x75 |0
-<U9AB8> \xC0\x65 |0
-<U9AB9> \xEC\x6A |0
-<U9ABB> \xEC\x6D |0
-<U9ABC> \xC0\x66 |0
-<U9ABE> \xEF\x64 |0
-<U9ABF> \xEC\x6B |0
-<U9AC0> \xF1\xB9 |0
-<U9AC1> \xC3\x4E |0
-<U9AC2> \xF3\xC1 |0
-<U9AC6> \xF5\x66 |0
-<U9AC7> \xF5\x64 |0
-<U9ACA> \xF5\x65 |0
-<U9ACD> \xF6\xA2 |0
-<U9ACF> \xC5\x5C |0
-<U9AD0> \xF7\xA4 |0
-<U9AD1> \xC5\xEA |0
-<U9AD2> \xC5\xBC |0
-<U9AD3> \xC5\xE8 |0
-<U9AD4> \xC5\xE9 |0
-<U9AD5> \xF8\xD4 |0
-<U9AD6> \xC6\x62 |0
-<U9AD8> \xB0\xAA |0
-<U9ADC> \xF1\xBA |0
-<U9ADF> \xD4\x49 |0
-<U9AE1> \xB9\xA6 |0
-<U9AE3> \xE4\xDB |0
-<U9AE6> \xBB\xEC |0
-<U9AE7> \xE4\xDC |0
-<U9AEB> \xE8\xD4 |0
-<U9AEC> \xE8\xD3 |0
-<U9AED> \xC0\x68 |0
-<U9AEE> \xBE\x76 |0
-<U9AEF> \xBE\x77 |0
-<U9AF1> \xE8\xD7 |0
-<U9AF2> \xE8\xD6 |0
-<U9AF3> \xE8\xD5 |0
-<U9AF6> \xEC\x6E |0
-<U9AF7> \xEC\x71 |0
-<U9AF9> \xEC\x70 |0
-<U9AFA> \xEC\x6F |0
-<U9AFB> \xC0\x67 |0
-<U9AFC> \xEF\x68 |0
-<U9AFD> \xEF\x66 |0
-<U9AFE> \xEF\x65 |0
-<U9B01> \xEF\x67 |0
-<U9B03> \xC3\x4F |0
-<U9B04> \xF1\xBC |0
-<U9B05> \xF1\xBD |0
-<U9B06> \xC3\x50 |0
-<U9B08> \xF1\xBB |0
-<U9B0A> \xF3\xC3 |0
-<U9B0B> \xF3\xC2 |0
-<U9B0C> \xF3\xC5 |0
-<U9B0D> \xC4\x47 |0
-<U9B0E> \xF3\xC4 |0
-<U9B10> \xF5\x67 |0
-<U9B11> \xF5\x69 |0
-<U9B12> \xF5\x68 |0
-<U9B15> \xF6\xA3 |0
-<U9B16> \xF6\xA6 |0
-<U9B17> \xF6\xA4 |0
-<U9B18> \xF6\xA5 |0
-<U9B19> \xF7\xA5 |0
-<U9B1A> \xC5\xBD |0
-<U9B1E> \xF8\x54 |0
-<U9B1F> \xF8\x55 |0
-<U9B20> \xF8\x56 |0
-<U9B22> \xC6\x4B |0
-<U9B23> \xC6\x63 |0
-<U9B24> \xF9\xB6 |0
-<U9B25> \xB0\xAB |0
-<U9B27> \xBE\x78 |0
-<U9B28> \xC0\x69 |0
-<U9B29> \xF1\xBE |0
-<U9B2B> \xF7\xA6 |0
-<U9B2E> \xF9\xC4 |0
-<U9B2F> \xD4\x4A |0
-<U9B31> \xC6\x7B |0
-<U9B32> \xB0\xAC |0
-<U9B33> \xEC\x72 |0
-<U9B35> \xF1\xBF |0
-<U9B37> \xF3\xC6 |0
-<U9B3A> \xF6\xA7 |0
-<U9B3B> \xF7\xA7 |0
-<U9B3C> \xB0\xAD |0
-<U9B3E> \xE4\xDD |0
-<U9B3F> \xE4\xDE |0
-<U9B41> \xBB\xED |0
-<U9B42> \xBB\xEE |0
-<U9B43> \xE8\xD9 |0
-<U9B44> \xBE\x7A |0
-<U9B45> \xBE\x79 |0
-<U9B46> \xE8\xD8 |0
-<U9B48> \xEF\x69 |0
-<U9B4A> \xF1\xC0 |0
-<U9B4B> \xF1\xC2 |0
-<U9B4C> \xF1\xC1 |0
-<U9B4D> \xC3\x53 |0
-<U9B4E> \xC3\x52 |0
-<U9B4F> \xC3\x51 |0
-<U9B51> \xC5\x5E |0
-<U9B52> \xF6\xA8 |0
-<U9B54> \xC5\x5D |0
-<U9B55> \xF7\xA9 |0
-<U9B56> \xF7\xA8 |0
-<U9B58> \xC6\x4C |0
-<U9B59> \xF8\xD5 |0
-<U9B5A> \xB3\xBD |0
-<U9B5B> \xE0\xEA |0
-<U9B5F> \xE4\xE1 |0
-<U9B60> \xE4\xDF |0
-<U9B61> \xE4\xE0 |0
-<U9B64> \xE8\xE2 |0
-<U9B66> \xE8\xDD |0
-<U9B67> \xE8\xDA |0
-<U9B68> \xE8\xE1 |0
-<U9B6C> \xE8\xE3 |0
-<U9B6F> \xBE\x7C |0
-<U9B70> \xE8\xE0 |0
-<U9B71> \xE8\xDC |0
-<U9B74> \xE8\xDB |0
-<U9B75> \xE8\xDF |0
-<U9B76> \xE8\xDE |0
-<U9B77> \xBE\x7B |0
-<U9B7A> \xEC\x7D |0
-<U9B7B> \xEC\x78 |0
-<U9B7C> \xEC\x76 |0
-<U9B7D> \xEC\xA1 |0
-<U9B7E> \xEC\x77 |0
-<U9B80> \xEC\x73 |0
-<U9B82> \xEC\x79 |0
-<U9B85> \xEC\x74 |0
-<U9B86> \xEF\x72 |0
-<U9B87> \xEC\x75 |0
-<U9B88> \xEC\xA2 |0
-<U9B90> \xEC\x7C |0
-<U9B91> \xC0\x6A |0
-<U9B92> \xEC\x7B |0
-<U9B93> \xEC\x7A |0
-<U9B95> \xEC\x7E |0
-<U9B9A> \xEF\x6A |0
-<U9B9B> \xEF\x6D |0
-<U9B9E> \xEF\x6C |0
-<U9BA0> \xEF\x74 |0
-<U9BA1> \xEF\x6F |0
-<U9BA2> \xEF\x73 |0
-<U9BA4> \xEF\x71 |0
-<U9BA5> \xEF\x70 |0
-<U9BA6> \xEF\x6E |0
-<U9BA8> \xEF\x6B |0
-<U9BAA> \xC2\x43 |0
-<U9BAB> \xC2\x42 |0
-<U9BAD> \xC2\x44 |0
-<U9BAE> \xC2\x41 |0
-<U9BAF> \xEF\x75 |0
-<U9BB5> \xF1\xC8 |0
-<U9BB6> \xF1\xCB |0
-<U9BB8> \xF1\xC9 |0
-<U9BB9> \xF1\xCD |0
-<U9BBD> \xF1\xCE |0
-<U9BBF> \xF1\xC6 |0
-<U9BC0> \xC3\x58 |0
-<U9BC1> \xF1\xC7 |0
-<U9BC3> \xF1\xC5 |0
-<U9BC4> \xF1\xCC |0
-<U9BC6> \xF1\xC4 |0
-<U9BC7> \xF1\xC3 |0
-<U9BC8> \xC3\x57 |0
-<U9BC9> \xC3\x55 |0
-<U9BCA> \xC3\x54 |0
-<U9BD3> \xF1\xCA |0
-<U9BD4> \xF3\xCF |0
-<U9BD5> \xF3\xD5 |0
-<U9BD6> \xC4\x4A |0
-<U9BD7> \xF3\xD0 |0
-<U9BD9> \xF3\xD3 |0
-<U9BDA> \xF3\xD7 |0
-<U9BDB> \xC4\x4B |0
-<U9BDC> \xF3\xD2 |0
-<U9BDE> \xF3\xCA |0
-<U9BE0> \xF3\xC9 |0
-<U9BE1> \xF3\xD6 |0
-<U9BE2> \xF3\xCD |0
-<U9BE4> \xF3\xCB |0
-<U9BE5> \xF3\xD4 |0
-<U9BE6> \xF3\xCC |0
-<U9BE7> \xC4\x49 |0
-<U9BE8> \xC4\x48 |0
-<U9BEA> \xF3\xC7 |0
-<U9BEB> \xF3\xC8 |0
-<U9BEC> \xF3\xD1 |0
-<U9BF0> \xF3\xCE |0
-<U9BF7> \xF5\x6C |0
-<U9BF8> \xF5\x6F |0
-<U9BFD> \xC3\x56 |0
-<U9C05> \xF5\x6D |0
-<U9C06> \xF5\x73 |0
-<U9C07> \xF5\x71 |0
-<U9C08> \xF5\x6B |0
-<U9C09> \xF5\x76 |0
-<U9C0B> \xF5\x6A |0
-<U9C0D> \xC4\xCF |0
-<U9C0E> \xF5\x72 |0
-<U9C12> \xF5\x6E |0
-<U9C13> \xC4\xCE |0
-<U9C14> \xF5\x75 |0
-<U9C17> \xF5\x74 |0
-<U9C1C> \xF6\xAB |0
-<U9C1D> \xF6\xAA |0
-<U9C21> \xF6\xB1 |0
-<U9C23> \xF6\xAD |0
-<U9C24> \xF6\xB0 |0
-<U9C25> \xC5\x60 |0
-<U9C28> \xF6\xAE |0
-<U9C29> \xF6\xAF |0
-<U9C2B> \xF6\xA9 |0
-<U9C2C> \xF6\xAC |0
-<U9C2D> \xC5\x5F |0
-<U9C31> \xC5\xBF |0
-<U9C32> \xF7\xB4 |0
-<U9C33> \xF7\xAF |0
-<U9C34> \xF7\xB3 |0
-<U9C36> \xF7\xB6 |0
-<U9C37> \xF7\xB2 |0
-<U9C39> \xF7\xAE |0
-<U9C3B> \xC5\xC1 |0
-<U9C3C> \xF7\xB1 |0
-<U9C3D> \xF7\xB5 |0
-<U9C3E> \xC5\xC0 |0
-<U9C3F> \xF7\xAC |0
-<U9C40> \xF5\x70 |0
-<U9C41> \xF7\xB0 |0
-<U9C44> \xF7\xAD |0
-<U9C46> \xF7\xAA |0
-<U9C48> \xF7\xAB |0
-<U9C49> \xC5\xBE |0
-<U9C4A> \xF8\x5A |0
-<U9C4B> \xF8\x5C |0
-<U9C4C> \xF8\x5F |0
-<U9C4D> \xF8\x5B |0
-<U9C4E> \xF8\x60 |0
-<U9C50> \xF8\x59 |0
-<U9C52> \xF8\x57 |0
-<U9C54> \xC5\xEB |0
-<U9C55> \xF8\x5D |0
-<U9C56> \xC5\xED |0
-<U9C57> \xC5\xEC |0
-<U9C58> \xF8\x58 |0
-<U9C59> \xF8\x5E |0
-<U9C5E> \xF8\xDA |0
-<U9C5F> \xC6\x4D |0
-<U9C60> \xF8\xDB |0
-<U9C62> \xF8\xD9 |0
-<U9C63> \xF8\xD6 |0
-<U9C66> \xF8\xD8 |0
-<U9C67> \xF8\xD7 |0
-<U9C68> \xF9\x5A |0
-<U9C6D> \xF9\x5C |0
-<U9C6E> \xF9\x5B |0
-<U9C71> \xF9\x79 |0
-<U9C73> \xF9\x78 |0
-<U9C74> \xF9\x77 |0
-<U9C75> \xF9\x7A |0
-<U9C77> \xC6\x73 |0
-<U9C78> \xC6\x74 |0
-<U9C79> \xF9\xCA |0
-<U9C7A> \xF9\xCE |0
-<U9CE5> \xB3\xBE |0
-<U9CE6> \xDC\xAF |0
-<U9CE7> \xE0\xED |0
-<U9CE9> \xB9\xA7 |0
-<U9CEA> \xE0\xEB |0
-<U9CED> \xE0\xEC |0
-<U9CF1> \xE4\xE2 |0
-<U9CF2> \xE4\xE3 |0
-<U9CF3> \xBB\xF1 |0
-<U9CF4> \xBB\xEF |0
-<U9CF5> \xE4\xE4 |0
-<U9CF6> \xBB\xF0 |0
-<U9CF7> \xE8\xE8 |0
-<U9CF9> \xE8\xEB |0
-<U9CFA> \xE8\xE5 |0
-<U9CFB> \xE8\xEC |0
-<U9CFC> \xE8\xE4 |0
-<U9CFD> \xE8\xE6 |0
-<U9CFF> \xE8\xE7 |0
-<U9D00> \xE8\xEA |0
-<U9D03> \xBE\xA1 |0
-<U9D04> \xE8\xEF |0
-<U9D05> \xE8\xEE |0
-<U9D06> \xBE\x7D |0
-<U9D07> \xE8\xE9 |0
-<U9D08> \xE8\xED |0
-<U9D09> \xBE\x7E |0
-<U9D10> \xEC\xAC |0
-<U9D12> \xC0\x6F |0
-<U9D14> \xEC\xA7 |0
-<U9D15> \xC0\x6B |0
-<U9D17> \xEC\xA4 |0
-<U9D18> \xEC\xAA |0
-<U9D19> \xEC\xAD |0
-<U9D1B> \xC0\x70 |0
-<U9D1D> \xEC\xA9 |0
-<U9D1E> \xEC\xA6 |0
-<U9D1F> \xEC\xAE |0
-<U9D20> \xEC\xA5 |0
-<U9D22> \xEC\xAB |0
-<U9D23> \xC0\x6C |0
-<U9D25> \xEC\xA3 |0
-<U9D26> \xC0\x6D |0
-<U9D28> \xC0\x6E |0
-<U9D29> \xEC\xA8 |0
-<U9D2D> \xEF\xA9 |0
-<U9D2E> \xEF\x7A |0
-<U9D2F> \xEF\x7B |0
-<U9D30> \xEF\x7E |0
-<U9D31> \xEF\x7C |0
-<U9D33> \xEF\x76 |0
-<U9D36> \xEF\x79 |0
-<U9D37> \xEF\xA5 |0
-<U9D38> \xEF\x7D |0
-<U9D3B> \xC2\x45 |0
-<U9D3D> \xEF\xA7 |0
-<U9D3E> \xEF\xA4 |0
-<U9D3F> \xC2\x46 |0
-<U9D40> \xEF\xA6 |0
-<U9D41> \xEF\x77 |0
-<U9D42> \xEF\xA2 |0
-<U9D43> \xEF\xA3 |0
-<U9D45> \xEF\xA1 |0
-<U9D4A> \xF1\xD2 |0
-<U9D4B> \xF1\xD4 |0
-<U9D4C> \xF1\xD7 |0
-<U9D4F> \xF1\xD1 |0
-<U9D51> \xC3\x59 |0
-<U9D52> \xF1\xD9 |0
-<U9D53> \xF1\xD0 |0
-<U9D54> \xF1\xDA |0
-<U9D56> \xF1\xD6 |0
-<U9D57> \xF1\xD8 |0
-<U9D58> \xF1\xDC |0
-<U9D59> \xF1\xD5 |0
-<U9D5A> \xF1\xDD |0
-<U9D5B> \xF1\xD3 |0
-<U9D5C> \xF1\xCF |0
-<U9D5D> \xC3\x5A |0
-<U9D5F> \xF1\xDB |0
-<U9D60> \xC3\x5B |0
-<U9D61> \xC4\x4D |0
-<U9D67> \xEF\x78 |0
-<U9D68> \xF3\xF1 |0
-<U9D69> \xF3\xE8 |0
-<U9D6A> \xC4\x4F |0
-<U9D6B> \xF3\xE4 |0
-<U9D6C> \xC4\x50 |0
-<U9D6F> \xF3\xED |0
-<U9D70> \xF3\xE7 |0
-<U9D71> \xF3\xDD |0
-<U9D72> \xC4\x4E |0
-<U9D73> \xF3\xEA |0
-<U9D74> \xF3\xE5 |0
-<U9D75> \xF3\xE6 |0
-<U9D77> \xF3\xD8 |0
-<U9D78> \xF3\xDF |0
-<U9D79> \xF3\xEE |0
-<U9D7B> \xF3\xEB |0
-<U9D7D> \xF3\xE3 |0
-<U9D7F> \xF3\xEF |0
-<U9D80> \xF3\xDE |0
-<U9D81> \xF3\xD9 |0
-<U9D82> \xF3\xEC |0
-<U9D84> \xF3\xDB |0
-<U9D85> \xF3\xE9 |0
-<U9D86> \xF3\xE0 |0
-<U9D87> \xF3\xF0 |0
-<U9D88> \xF3\xDC |0
-<U9D89> \xC4\x4C |0
-<U9D8A> \xF3\xDA |0
-<U9D8B> \xF3\xE1 |0
-<U9D8C> \xF3\xE2 |0
-<U9D90> \xF5\x7D |0
-<U9D92> \xF5\x7B |0
-<U9D94> \xF5\xA2 |0
-<U9D96> \xF5\xAE |0
-<U9D97> \xF5\xA5 |0
-<U9D98> \xF5\x7C |0
-<U9D99> \xF5\x78 |0
-<U9D9A> \xF5\xA7 |0
-<U9D9B> \xF5\x7E |0
-<U9D9C> \xF5\xA3 |0
-<U9D9D> \xF5\x7A |0
-<U9D9E> \xF5\xAA |0
-<U9D9F> \xF5\x77 |0
-<U9DA0> \xF5\xA1 |0
-<U9DA1> \xF5\xA6 |0
-<U9DA2> \xF5\xA8 |0
-<U9DA3> \xF5\xAB |0
-<U9DA4> \xF5\x79 |0
-<U9DA6> \xF5\xAF |0
-<U9DA7> \xF5\xB0 |0
-<U9DA8> \xF5\xA9 |0
-<U9DA9> \xF5\xAD |0
-<U9DAA> \xF5\xA4 |0
-<U9DAC> \xF6\xC1 |0
-<U9DAD> \xF6\xC4 |0
-<U9DAF> \xC5\x61 |0
-<U9DB1> \xF6\xC3 |0
-<U9DB2> \xF6\xC8 |0
-<U9DB3> \xF6\xC6 |0
-<U9DB4> \xC5\x62 |0
-<U9DB5> \xF6\xBD |0
-<U9DB6> \xF6\xB3 |0
-<U9DB7> \xF6\xB2 |0
-<U9DB8> \xC5\x64 |0
-<U9DB9> \xF6\xBF |0
-<U9DBA> \xF6\xC0 |0
-<U9DBB> \xF6\xBC |0
-<U9DBC> \xF6\xB4 |0
-<U9DBE> \xF6\xB9 |0
-<U9DBF> \xF5\xAC |0
-<U9DC1> \xF6\xB5 |0
-<U9DC2> \xC5\x63 |0
-<U9DC3> \xF6\xBB |0
-<U9DC5> \xF6\xBA |0
-<U9DC7> \xF6\xB6 |0
-<U9DC8> \xF6\xC2 |0
-<U9DCA> \xF6\xB7 |0
-<U9DCB> \xF7\xBB |0
-<U9DCC> \xF6\xC5 |0
-<U9DCD> \xF6\xC7 |0
-<U9DCE> \xF6\xBE |0
-<U9DCF> \xF6\xB8 |0
-<U9DD0> \xF7\xBC |0
-<U9DD1> \xF7\xBE |0
-<U9DD2> \xF7\xB8 |0
-<U9DD3> \xC5\xC2 |0
-<U9DD5> \xF7\xC5 |0
-<U9DD6> \xF7\xC3 |0
-<U9DD7> \xC5\xC3 |0
-<U9DD8> \xF7\xC2 |0
-<U9DD9> \xF7\xC1 |0
-<U9DDA> \xF7\xBA |0
-<U9DDB> \xF7\xB7 |0
-<U9DDC> \xF7\xBD |0
-<U9DDD> \xF7\xC6 |0
-<U9DDE> \xF7\xB9 |0
-<U9DDF> \xF7\xBF |0
-<U9DE1> \xF8\x69 |0
-<U9DE2> \xF8\x6E |0
-<U9DE3> \xF8\x64 |0
-<U9DE4> \xF8\x67 |0
-<U9DE5> \xC5\xEE |0
-<U9DE6> \xF8\x6B |0
-<U9DE8> \xF8\x72 |0
-<U9DE9> \xF7\xC0 |0
-<U9DEB> \xF8\x65 |0
-<U9DEC> \xF8\x6F |0
-<U9DED> \xF8\x73 |0
-<U9DEE> \xF8\x6A |0
-<U9DEF> \xF8\x63 |0
-<U9DF0> \xF8\x6D |0
-<U9DF2> \xF8\x6C |0
-<U9DF3> \xF8\x71 |0
-<U9DF4> \xF8\x70 |0
-<U9DF5> \xF7\xC4 |0
-<U9DF6> \xF8\x68 |0
-<U9DF7> \xF8\x62 |0
-<U9DF8> \xF8\x66 |0
-<U9DF9> \xC6\x4E |0
-<U9DFA> \xC6\x4F |0
-<U9DFB> \xF8\x61 |0
-<U9DFD> \xF8\xE6 |0
-<U9DFE> \xF8\xDD |0
-<U9DFF> \xF8\xE5 |0
-<U9E00> \xF8\xE2 |0
-<U9E01> \xF8\xE3 |0
-<U9E02> \xF8\xDC |0
-<U9E03> \xF8\xDF |0
-<U9E04> \xF8\xE7 |0
-<U9E05> \xF8\xE1 |0
-<U9E06> \xF8\xE0 |0
-<U9E07> \xF8\xDE |0
-<U9E09> \xF8\xE4 |0
-<U9E0B> \xF9\x5D |0
-<U9E0D> \xF9\x5E |0
-<U9E0F> \xF9\x60 |0
-<U9E10> \xF9\x5F |0
-<U9E11> \xF9\x62 |0
-<U9E12> \xF9\x61 |0
-<U9E13> \xF9\x7C |0
-<U9E14> \xF9\x7B |0
-<U9E15> \xF9\xB7 |0
-<U9E17> \xF9\xB8 |0
-<U9E19> \xF9\xC5 |0
-<U9E1A> \xC6\x78 |0
-<U9E1B> \xC6\x7C |0
-<U9E1D> \xF9\xCF |0
-<U9E1E> \xC6\x7D |0
-<U9E75> \xB3\xBF |0
-<U9E79> \xC4\xD0 |0
-<U9E7A> \xF6\xC9 |0
-<U9E7C> \xC6\x50 |0
-<U9E7D> \xC6\x51 |0
-<U9E7F> \xB3\xC0 |0
-<U9E80> \xE0\xEE |0
-<U9E82> \xB9\xA8 |0
-<U9E83> \xE8\xF0 |0
-<U9E86> \xEC\xB0 |0
-<U9E87> \xEC\xB1 |0
-<U9E88> \xEC\xAF |0
-<U9E89> \xEF\xAB |0
-<U9E8A> \xEF\xAA |0
-<U9E8B> \xC2\x47 |0
-<U9E8C> \xF1\xDF |0
-<U9E8D> \xEF\xAC |0
-<U9E8E> \xF1\xDE |0
-<U9E91> \xF3\xF3 |0
-<U9E92> \xC4\x51 |0
-<U9E93> \xC4\x53 |0
-<U9E94> \xF3\xF2 |0
-<U9E97> \xC4\x52 |0
-<U9E99> \xF5\xB1 |0
-<U9E9A> \xF5\xB3 |0
-<U9E9B> \xF5\xB2 |0
-<U9E9C> \xF6\xCA |0
-<U9E9D> \xC5\x65 |0
-<U9E9F> \xC5\xEF |0
-<U9EA0> \xF8\xE8 |0
-<U9EA1> \xF9\x63 |0
-<U9EA4> \xF9\xD2 |0
-<U9EA5> \xB3\xC1 |0
-<U9EA7> \xE4\xE5 |0
-<U9EA9> \xBE\xA2 |0
-<U9EAD> \xEC\xB3 |0
-<U9EAE> \xEC\xB2 |0
-<U9EB0> \xEF\xAD |0
-<U9EB4> \xC4\x54 |0
-<U9EB5> \xC4\xD1 |0
-<U9EB6> \xF7\xC7 |0
-<U9EB7> \xF9\xCB |0
-<U9EBB> \xB3\xC2 |0
-<U9EBC> \xBB\xF2 |0
-<U9EBE> \xBE\xA3 |0
-<U9EC0> \xF3\xF4 |0
-<U9EC2> \xF8\x74 |0
-<U9EC3> \xB6\xC0 |0
-<U9EC8> \xEF\xAE |0
-<U9ECC> \xC6\x64 |0
-<U9ECD> \xB6\xC1 |0
-<U9ECE> \xBE\xA4 |0
-<U9ECF> \xC2\x48 |0
-<U9ED0> \xF8\x75 |0
-<U9ED1> \xB6\xC2 |0
-<U9ED3> \xE8\xF1 |0
-<U9ED4> \xC0\x72 |0
-<U9ED5> \xEC\xB4 |0
-<U9ED6> \xEC\xB5 |0
-<U9ED8> \xC0\x71 |0
-<U9EDA> \xEF\xAF |0
-<U9EDB> \xC2\x4C |0
-<U9EDC> \xC2\x4A |0
-<U9EDD> \xC2\x4B |0
-<U9EDE> \xC2\x49 |0
-<U9EDF> \xF1\xE0 |0
-<U9EE0> \xC3\x5C |0
-<U9EE4> \xF5\xB5 |0
-<U9EE5> \xF5\xB4 |0
-<U9EE6> \xF5\xB7 |0
-<U9EE7> \xF5\xB6 |0
-<U9EE8> \xC4\xD2 |0
-<U9EEB> \xF6\xCB |0
-<U9EED> \xF6\xCD |0
-<U9EEE> \xF6\xCC |0
-<U9EEF> \xC5\x66 |0
-<U9EF0> \xF7\xC8 |0
-<U9EF2> \xF8\x76 |0
-<U9EF3> \xF8\x77 |0
-<U9EF4> \xC5\xF0 |0
-<U9EF5> \xF9\x64 |0
-<U9EF6> \xF9\x7D |0
-<U9EF7> \xC6\x75 |0
-<U9EF9> \xDC\xB0 |0
-<U9EFA> \xEC\xB6 |0
-<U9EFB> \xEF\xB0 |0
-<U9EFC> \xF3\xF5 |0
-<U9EFD> \xE0\xEF |0
-<U9EFF> \xEF\xB1 |0
-<U9F00> \xF1\xE2 |0
-<U9F01> \xF1\xE1 |0
-<U9F06> \xF8\x78 |0
-<U9F07> \xC6\x52 |0
-<U9F09> \xF9\x65 |0
-<U9F0A> \xF9\x7E |0
-<U9F0E> \xB9\xA9 |0
-<U9F0F> \xE8\xF2 |0
-<U9F10> \xE8\xF3 |0
-<U9F12> \xEC\xB7 |0
-<U9F13> \xB9\xAA |0
-<U9F15> \xC3\x5D |0
-<U9F16> \xF1\xE3 |0
-<U9F18> \xF6\xCF |0
-<U9F19> \xC5\x67 |0
-<U9F1A> \xF6\xD0 |0
-<U9F1B> \xF6\xCE |0
-<U9F1C> \xF8\x79 |0
-<U9F1E> \xF8\xE9 |0
-<U9F20> \xB9\xAB |0
-<U9F22> \xEF\xB4 |0
-<U9F23> \xEF\xB3 |0
-<U9F24> \xEF\xB2 |0
-<U9F25> \xF1\xE4 |0
-<U9F28> \xF1\xE8 |0
-<U9F29> \xF1\xE7 |0
-<U9F2A> \xF1\xE6 |0
-<U9F2B> \xF1\xE5 |0
-<U9F2C> \xC3\x5E |0
-<U9F2D> \xF3\xF6 |0
-<U9F2E> \xF5\xB9 |0
-<U9F2F> \xC4\xD3 |0
-<U9F30> \xF5\xB8 |0
-<U9F31> \xF6\xD1 |0
-<U9F32> \xF7\xCB |0
-<U9F33> \xF7\xCA |0
-<U9F34> \xC5\xC4 |0
-<U9F35> \xF7\xC9 |0
-<U9F36> \xF8\x7C |0
-<U9F37> \xF8\x7B |0
-<U9F38> \xF8\x7A |0
-<U9F3B> \xBB\xF3 |0
-<U9F3D> \xEC\xB8 |0
-<U9F3E> \xC2\x4D |0
-<U9F40> \xF3\xF7 |0
-<U9F41> \xF3\xF8 |0
-<U9F42> \xF7\xCC |0
-<U9F43> \xF8\x7D |0
-<U9F46> \xF8\xEA |0
-<U9F47> \xF9\x66 |0
-<U9F48> \xF9\xB9 |0
-<U9F49> \xF9\xD4 |0
-<U9F4A> \xBB\xF4 |0
-<U9F4B> \xC2\x4E |0
-<U9F4C> \xF1\xE9 |0
-<U9F4D> \xF3\xF9 |0
-<U9F4E> \xF6\xD2 |0
-<U9F4F> \xF8\x7E |0
-<U9F52> \xBE\xA6 |0
-<U9F54> \xEF\xB5 |0
-<U9F55> \xF1\xEA |0
-<U9F56> \xF3\xFA |0
-<U9F57> \xF3\xFB |0
-<U9F58> \xF3\xFC |0
-<U9F59> \xF5\xBE |0
-<U9F5B> \xF5\xBA |0
-<U9F5C> \xC5\x68 |0
-<U9F5D> \xF5\xBD |0
-<U9F5E> \xF5\xBC |0
-<U9F5F> \xC4\xD4 |0
-<U9F60> \xF5\xBB |0
-<U9F61> \xC4\xD6 |0
-<U9F63> \xC4\xD5 |0
-<U9F64> \xF6\xD4 |0
-<U9F65> \xF6\xD3 |0
-<U9F66> \xC5\x69 |0
-<U9F67> \xC5\x6A |0
-<U9F6A> \xC5\xC6 |0
-<U9F6B> \xF7\xCD |0
-<U9F6C> \xC5\xC5 |0
-<U9F6E> \xF8\xA3 |0
-<U9F6F> \xF8\xA4 |0
-<U9F70> \xF8\xA2 |0
-<U9F71> \xF8\xA1 |0
-<U9F72> \xC6\x54 |0
-<U9F74> \xF8\xEB |0
-<U9F75> \xF8\xEC |0
-<U9F76> \xF8\xED |0
-<U9F77> \xC6\x53 |0
-<U9F78> \xF9\x67 |0
-<U9F79> \xF9\x6A |0
-<U9F7A> \xF9\x69 |0
-<U9F7B> \xF9\x68 |0
-<U9F7E> \xF9\xD3 |0
-<U9F8D> \xC0\x73 |0
-<U9F90> \xC3\x65 |0
-<U9F91> \xF5\xBF |0
-<U9F92> \xF6\xD5 |0
-<U9F94> \xC5\xC7 |0
-<U9F95> \xF7\xCE |0
-<U9F98> \xF9\xD5 |0
-<U9F9C> \xC0\x74 |0
-<U9FA0> \xEF\xB6 |0
-<U9FA2> \xF7\xCF |0
-<U9FA4> \xF9\xA1 |0
-<UF6B1> \xC6\xA1 |0
-<UF6B2> \xC6\xA2 |0
-<UF6B3> \xC6\xA3 |0
-<UF6B4> \xC6\xA4 |0
-<UF6B5> \xC6\xA5 |0
-<UF6B6> \xC6\xA6 |0
-<UF6B7> \xC6\xA7 |0
-<UF6B8> \xC6\xA8 |0
-<UF6B9> \xC6\xA9 |0
-<UF6BA> \xC6\xAA |0
-<UF6BB> \xC6\xAB |0
-<UF6BC> \xC6\xAC |0
-<UF6BD> \xC6\xAD |0
-<UF6BE> \xC6\xAE |0
-<UF6BF> \xC6\xAF |0
-<UF6C0> \xC6\xB0 |0
-<UF6C1> \xC6\xB1 |0
-<UF6C2> \xC6\xB2 |0
-<UF6C3> \xC6\xB3 |0
-<UF6C4> \xC6\xB4 |0
-<UF6C5> \xC6\xB5 |0
-<UF6C6> \xC6\xB6 |0
-<UF6C7> \xC6\xB7 |0
-<UF6C8> \xC6\xB8 |0
-<UF6C9> \xC6\xB9 |0
-<UF6CA> \xC6\xBA |0
-<UF6CB> \xC6\xBB |0
-<UF6CC> \xC6\xBC |0
-<UF6CD> \xC6\xBD |0
-<UF6CE> \xC6\xBE |0
-<UF6CF> \xC6\xBF |0
-<UF6D0> \xC6\xC0 |0
-<UF6D1> \xC6\xC1 |0
-<UF6D2> \xC6\xC2 |0
-<UF6D3> \xC6\xC3 |0
-<UF6D4> \xC6\xC4 |0
-<UF6D5> \xC6\xC5 |0
-<UF6D6> \xC6\xC6 |0
-<UF6D7> \xC6\xC7 |0
-<UF6D8> \xC6\xC8 |0
-<UF6D9> \xC6\xC9 |0
-<UF6DA> \xC6\xCA |0
-<UF6DB> \xC6\xCB |0
-<UF6DC> \xC6\xCC |0
-<UF6DD> \xC6\xCD |0
-<UF6DE> \xC6\xCE |0
-<UF6DF> \xC6\xCF |0
-<UF6E0> \xC6\xD0 |0
-<UF6E1> \xC6\xD1 |0
-<UF6E2> \xC6\xD2 |0
-<UF6E3> \xC6\xD3 |0
-<UF6E4> \xC6\xD4 |0
-<UF6E5> \xC6\xD5 |0
-<UF6E6> \xC6\xD6 |0
-<UF6E7> \xC6\xD7 |0
-<UF6E8> \xC6\xD8 |0
-<UF6E9> \xC6\xD9 |0
-<UF6EA> \xC6\xDA |0
-<UF6EB> \xC6\xDB |0
-<UF6EC> \xC6\xDC |0
-<UF6ED> \xC6\xDD |0
-<UF6EE> \xC6\xDE |0
-<UF6EF> \xC6\xDF |0
-<UF6F0> \xC6\xE0 |0
-<UF6F1> \xC6\xE1 |0
-<UF6F2> \xC6\xE2 |0
-<UF6F3> \xC6\xE3 |0
-<UF6F4> \xC6\xE4 |0
-<UF6F5> \xC6\xE5 |0
-<UF6F6> \xC6\xE6 |0
-<UF6F7> \xC6\xE7 |0
-<UF6F8> \xC6\xE8 |0
-<UF6F9> \xC6\xE9 |0
-<UF6FA> \xC6\xEA |0
-<UF6FB> \xC6\xEB |0
-<UF6FC> \xC6\xEC |0
-<UF6FD> \xC6\xED |0
-<UF6FE> \xC6\xEE |0
-<UF6FF> \xC6\xEF |0
-<UF700> \xC6\xF0 |0
-<UF701> \xC6\xF1 |0
-<UF702> \xC6\xF2 |0
-<UF703> \xC6\xF3 |0
-<UF704> \xC6\xF4 |0
-<UF705> \xC6\xF5 |0
-<UF706> \xC6\xF6 |0
-<UF707> \xC6\xF7 |0
-<UF708> \xC6\xF8 |0
-<UF709> \xC6\xF9 |0
-<UF70A> \xC6\xFA |0
-<UF70B> \xC6\xFB |0
-<UF70C> \xC6\xFC |0
-<UF70D> \xC6\xFD |0
-<UF70E> \xC6\xFE |0
-<UF70F> \xC7\x40 |0
-<UF710> \xC7\x41 |0
-<UF711> \xC7\x42 |0
-<UF712> \xC7\x43 |0
-<UF713> \xC7\x44 |0
-<UF714> \xC7\x45 |0
-<UF715> \xC7\x46 |0
-<UF716> \xC7\x47 |0
-<UF717> \xC7\x48 |0
-<UF718> \xC7\x49 |0
-<UF719> \xC7\x4A |0
-<UF71A> \xC7\x4B |0
-<UF71B> \xC7\x4C |0
-<UF71C> \xC7\x4D |0
-<UF71D> \xC7\x4E |0
-<UF71E> \xC7\x4F |0
-<UF71F> \xC7\x50 |0
-<UF720> \xC7\x51 |0
-<UF721> \xC7\x52 |0
-<UF722> \xC7\x53 |0
-<UF723> \xC7\x54 |0
-<UF724> \xC7\x55 |0
-<UF725> \xC7\x56 |0
-<UF726> \xC7\x57 |0
-<UF727> \xC7\x58 |0
-<UF728> \xC7\x59 |0
-<UF729> \xC7\x5A |0
-<UF72A> \xC7\x5B |0
-<UF72B> \xC7\x5C |0
-<UF72C> \xC7\x5D |0
-<UF72D> \xC7\x5E |0
-<UF72E> \xC7\x5F |0
-<UF72F> \xC7\x60 |0
-<UF730> \xC7\x61 |0
-<UF731> \xC7\x62 |0
-<UF732> \xC7\x63 |0
-<UF733> \xC7\x64 |0
-<UF734> \xC7\x65 |0
-<UF735> \xC7\x66 |0
-<UF736> \xC7\x67 |0
-<UF737> \xC7\x68 |0
-<UF738> \xC7\x69 |0
-<UF739> \xC7\x6A |0
-<UF73A> \xC7\x6B |0
-<UF73B> \xC7\x6C |0
-<UF73C> \xC7\x6D |0
-<UF73D> \xC7\x6E |0
-<UF73E> \xC7\x6F |0
-<UF73F> \xC7\x70 |0
-<UF740> \xC7\x71 |0
-<UF741> \xC7\x72 |0
-<UF742> \xC7\x73 |0
-<UF743> \xC7\x74 |0
-<UF744> \xC7\x75 |0
-<UF745> \xC7\x76 |0
-<UF746> \xC7\x77 |0
-<UF747> \xC7\x78 |0
-<UF748> \xC7\x79 |0
-<UF749> \xC7\x7A |0
-<UF74A> \xC7\x7B |0
-<UF74B> \xC7\x7C |0
-<UF74C> \xC7\x7D |0
-<UF74D> \xC7\x7E |0
-<UF74E> \xC7\xA1 |0
-<UF74F> \xC7\xA2 |0
-<UF750> \xC7\xA3 |0
-<UF751> \xC7\xA4 |0
-<UF752> \xC7\xA5 |0
-<UF753> \xC7\xA6 |0
-<UF754> \xC7\xA7 |0
-<UF755> \xC7\xA8 |0
-<UF756> \xC7\xA9 |0
-<UF757> \xC7\xAA |0
-<UF758> \xC7\xAB |0
-<UF759> \xC7\xAC |0
-<UF75A> \xC7\xAD |0
-<UF75B> \xC7\xAE |0
-<UF75C> \xC7\xAF |0
-<UF75D> \xC7\xB0 |0
-<UF75E> \xC7\xB1 |0
-<UF75F> \xC7\xB2 |0
-<UF760> \xC7\xB3 |0
-<UF761> \xC7\xB4 |0
-<UF762> \xC7\xB5 |0
-<UF763> \xC7\xB6 |0
-<UF764> \xC7\xB7 |0
-<UF765> \xC7\xB8 |0
-<UF766> \xC7\xB9 |0
-<UF767> \xC7\xBA |0
-<UF768> \xC7\xBB |0
-<UF769> \xC7\xBC |0
-<UF76A> \xC7\xBD |0
-<UF76B> \xC7\xBE |0
-<UF76C> \xC7\xBF |0
-<UF76D> \xC7\xC0 |0
-<UF76E> \xC7\xC1 |0
-<UF76F> \xC7\xC2 |0
-<UF770> \xC7\xC3 |0
-<UF771> \xC7\xC4 |0
-<UF772> \xC7\xC5 |0
-<UF773> \xC7\xC6 |0
-<UF774> \xC7\xC7 |0
-<UF775> \xC7\xC8 |0
-<UF776> \xC7\xC9 |0
-<UF777> \xC7\xCA |0
-<UF778> \xC7\xCB |0
-<UF779> \xC7\xCC |0
-<UF77A> \xC7\xCD |0
-<UF77B> \xC7\xCE |0
-<UF77C> \xC7\xCF |0
-<UF77D> \xC7\xD0 |0
-<UF77E> \xC7\xD1 |0
-<UF77F> \xC7\xD2 |0
-<UF780> \xC7\xD3 |0
-<UF781> \xC7\xD4 |0
-<UF782> \xC7\xD5 |0
-<UF783> \xC7\xD6 |0
-<UF784> \xC7\xD7 |0
-<UF785> \xC7\xD8 |0
-<UF786> \xC7\xD9 |0
-<UF787> \xC7\xDA |0
-<UF788> \xC7\xDB |0
-<UF789> \xC7\xDC |0
-<UF78A> \xC7\xDD |0
-<UF78B> \xC7\xDE |0
-<UF78C> \xC7\xDF |0
-<UF78D> \xC7\xE0 |0
-<UF78E> \xC7\xE1 |0
-<UF78F> \xC7\xE2 |0
-<UF790> \xC7\xE3 |0
-<UF791> \xC7\xE4 |0
-<UF792> \xC7\xE5 |0
-<UF793> \xC7\xE6 |0
-<UF794> \xC7\xE7 |0
-<UF795> \xC7\xE8 |0
-<UF796> \xC7\xE9 |0
-<UF797> \xC7\xEA |0
-<UF798> \xC7\xEB |0
-<UF799> \xC7\xEC |0
-<UF79A> \xC7\xED |0
-<UF79B> \xC7\xEE |0
-<UF79C> \xC7\xEF |0
-<UF79D> \xC7\xF0 |0
-<UF79E> \xC7\xF1 |0
-<UF79F> \xC7\xF2 |0
-<UF7A0> \xC7\xF3 |0
-<UF7A1> \xC7\xF4 |0
-<UF7A2> \xC7\xF5 |0
-<UF7A3> \xC7\xF6 |0
-<UF7A4> \xC7\xF7 |0
-<UF7A5> \xC7\xF8 |0
-<UF7A6> \xC7\xF9 |0
-<UF7A7> \xC7\xFA |0
-<UF7A8> \xC7\xFB |0
-<UF7A9> \xC7\xFC |0
-<UF7AA> \xC7\xFD |0
-<UF7AB> \xC7\xFE |0
-<UF7AC> \xC8\x40 |0
-<UF7AD> \xC8\x41 |0
-<UF7AE> \xC8\x42 |0
-<UF7AF> \xC8\x43 |0
-<UF7B0> \xC8\x44 |0
-<UF7B1> \xC8\x45 |0
-<UF7B2> \xC8\x46 |0
-<UF7B3> \xC8\x47 |0
-<UF7B4> \xC8\x48 |0
-<UF7B5> \xC8\x49 |0
-<UF7B6> \xC8\x4A |0
-<UF7B7> \xC8\x4B |0
-<UF7B8> \xC8\x4C |0
-<UF7B9> \xC8\x4D |0
-<UF7BA> \xC8\x4E |0
-<UF7BB> \xC8\x4F |0
-<UF7BC> \xC8\x50 |0
-<UF7BD> \xC8\x51 |0
-<UF7BE> \xC8\x52 |0
-<UF7BF> \xC8\x53 |0
-<UF7C0> \xC8\x54 |0
-<UF7C1> \xC8\x55 |0
-<UF7C2> \xC8\x56 |0
-<UF7C3> \xC8\x57 |0
-<UF7C4> \xC8\x58 |0
-<UF7C5> \xC8\x59 |0
-<UF7C6> \xC8\x5A |0
-<UF7C7> \xC8\x5B |0
-<UF7C8> \xC8\x5C |0
-<UF7C9> \xC8\x5D |0
-<UF7CA> \xC8\x5E |0
-<UF7CB> \xC8\x5F |0
-<UF7CC> \xC8\x60 |0
-<UF7CD> \xC8\x61 |0
-<UF7CE> \xC8\x62 |0
-<UF7CF> \xC8\x63 |0
-<UF7D0> \xC8\x64 |0
-<UF7D1> \xC8\x65 |0
-<UF7D2> \xC8\x66 |0
-<UF7D3> \xC8\x67 |0
-<UF7D4> \xC8\x68 |0
-<UF7D5> \xC8\x69 |0
-<UF7D6> \xC8\x6A |0
-<UF7D7> \xC8\x6B |0
-<UF7D8> \xC8\x6C |0
-<UF7D9> \xC8\x6D |0
-<UF7DA> \xC8\x6E |0
-<UF7DB> \xC8\x6F |0
-<UF7DC> \xC8\x70 |0
-<UF7DD> \xC8\x71 |0
-<UF7DE> \xC8\x72 |0
-<UF7DF> \xC8\x73 |0
-<UF7E0> \xC8\x74 |0
-<UF7E1> \xC8\x75 |0
-<UF7E2> \xC8\x76 |0
-<UF7E3> \xC8\x77 |0
-<UF7E4> \xC8\x78 |0
-<UF7E5> \xC8\x79 |0
-<UF7E6> \xC8\x7A |0
-<UF7E7> \xC8\x7B |0
-<UF7E8> \xC8\x7C |0
-<UF7E9> \xC8\x7D |0
-<UF7EA> \xC8\x7E |0
-<UF7EB> \xC8\xA1 |0
-<UF7EC> \xC8\xA2 |0
-<UF7ED> \xC8\xA3 |0
-<UF7EE> \xC8\xA4 |0
-<UF7EF> \xC8\xA5 |0
-<UF7F0> \xC8\xA6 |0
-<UF7F1> \xC8\xA7 |0
-<UF7F2> \xC8\xA8 |0
-<UF7F3> \xC8\xA9 |0
-<UF7F4> \xC8\xAA |0
-<UF7F5> \xC8\xAB |0
-<UF7F6> \xC8\xAC |0
-<UF7F7> \xC8\xAD |0
-<UF7F8> \xC8\xAE |0
-<UF7F9> \xC8\xAF |0
-<UF7FA> \xC8\xB0 |0
-<UF7FB> \xC8\xB1 |0
-<UF7FC> \xC8\xB2 |0
-<UF7FD> \xC8\xB3 |0
-<UF7FE> \xC8\xB4 |0
-<UF7FF> \xC8\xB5 |0
-<UF800> \xC8\xB6 |0
-<UF801> \xC8\xB7 |0
-<UF802> \xC8\xB8 |0
-<UF803> \xC8\xB9 |0
-<UF804> \xC8\xBA |0
-<UF805> \xC8\xBB |0
-<UF806> \xC8\xBC |0
-<UF807> \xC8\xBD |0
-<UF808> \xC8\xBE |0
-<UF809> \xC8\xBF |0
-<UF80A> \xC8\xC0 |0
-<UF80B> \xC8\xC1 |0
-<UF80C> \xC8\xC2 |0
-<UF80D> \xC8\xC3 |0
-<UF80E> \xC8\xC4 |0
-<UF80F> \xC8\xC5 |0
-<UF810> \xC8\xC6 |0
-<UF811> \xC8\xC7 |0
-<UF812> \xC8\xC8 |0
-<UF813> \xC8\xC9 |0
-<UF814> \xC8\xCA |0
-<UF815> \xC8\xCB |0
-<UF816> \xC8\xCC |0
-<UF817> \xC8\xCD |0
-<UF818> \xC8\xCE |0
-<UF819> \xC8\xCF |0
-<UF81A> \xC8\xD0 |0
-<UF81B> \xC8\xD1 |0
-<UF81C> \xC8\xD2 |0
-<UF81D> \xC8\xD3 |0
-<UF81E> \xC8\xD4 |0
-<UF81F> \xC8\xD5 |0
-<UF820> \xC8\xD6 |0
-<UF821> \xC8\xD7 |0
-<UF822> \xC8\xD8 |0
-<UF823> \xC8\xD9 |0
-<UF824> \xC8\xDA |0
-<UF825> \xC8\xDB |0
-<UF826> \xC8\xDC |0
-<UF827> \xC8\xDD |0
-<UF828> \xC8\xDE |0
-<UF829> \xC8\xDF |0
-<UF82A> \xC8\xE0 |0
-<UF82B> \xC8\xE1 |0
-<UF82C> \xC8\xE2 |0
-<UF82D> \xC8\xE3 |0
-<UF82E> \xC8\xE4 |0
-<UF82F> \xC8\xE5 |0
-<UF830> \xC8\xE6 |0
-<UF831> \xC8\xE7 |0
-<UF832> \xC8\xE8 |0
-<UF833> \xC8\xE9 |0
-<UF834> \xC8\xEA |0
-<UF835> \xC8\xEB |0
-<UF836> \xC8\xEC |0
-<UF837> \xC8\xED |0
-<UF838> \xC8\xEE |0
-<UF839> \xC8\xEF |0
-<UF83A> \xC8\xF0 |0
-<UF83B> \xC8\xF1 |0
-<UF83C> \xC8\xF2 |0
-<UF83D> \xC8\xF3 |0
-<UF83E> \xC8\xF4 |0
-<UF83F> \xC8\xF5 |0
-<UF840> \xC8\xF6 |0
-<UF841> \xC8\xF7 |0
-<UF842> \xC8\xF8 |0
-<UF843> \xC8\xF9 |0
-<UF844> \xC8\xFA |0
-<UF845> \xC8\xFB |0
-<UF846> \xC8\xFC |0
-<UF847> \xC8\xFD |0
-<UF848> \xC8\xFE |0
-<UFA0C> \xC9\x4A |0
-<UFA0D> \xDD\xFC |0
-<UFE30> \xA1\x4A |0
-<UFE31> \xA1\x57 |0
-<UFE33> \xA1\x59 |0
-<UFE34> \xA1\x5B |0
-<UFE35> \xA1\x5F |0
-<UFE36> \xA1\x60 |0
-<UFE37> \xA1\x63 |0
-<UFE38> \xA1\x64 |0
-<UFE39> \xA1\x67 |0
-<UFE3A> \xA1\x68 |0
-<UFE3B> \xA1\x6B |0
-<UFE3C> \xA1\x6C |0
-<UFE3D> \xA1\x6F |0
-<UFE3E> \xA1\x70 |0
-<UFE3F> \xA1\x73 |0
-<UFE40> \xA1\x74 |0
-<UFE41> \xA1\x77 |0
-<UFE42> \xA1\x78 |0
-<UFE43> \xA1\x7B |0
-<UFE44> \xA1\x7C |0
-<UFE49> \xA1\xC6 |0
-<UFE4A> \xA1\xC7 |0
-<UFE4B> \xA1\xCA |0
-<UFE4C> \xA1\xCB |0
-<UFE4D> \xA1\xC8 |0
-<UFE4E> \xA1\xC9 |0
-<UFE4F> \xA1\x5C |0
-<UFE50> \xA1\x4D |0
-<UFE51> \xA1\x4E |0
-<UFE52> \xA1\x4F |0
-<UFE54> \xA1\x51 |0
-<UFE55> \xA1\x52 |0
-<UFE56> \xA1\x53 |0
-<UFE57> \xA1\x54 |0
-<UFE59> \xA1\x7D |0
-<UFE5A> \xA1\x7E |0
-<UFE5B> \xA1\xA1 |0
-<UFE5C> \xA1\xA2 |0
-<UFE5D> \xA1\xA3 |0
-<UFE5E> \xA1\xA4 |0
-<UFE5F> \xA1\xCC |0
-<UFE60> \xA1\xCD |0
-<UFE61> \xA1\xCE |0
-<UFE62> \xA1\xDE |0
-<UFE63> \xA1\xDF |0
-<UFE64> \xA1\xE0 |0
-<UFE65> \xA1\xE1 |0
-<UFE66> \xA1\xE2 |0
-<UFE68> \xA2\x42 |0
-<UFE69> \xA2\x4C |0
-<UFE6A> \xA2\x4D |0
-<UFE6B> \xA2\x4E |0
-<UFF01> \xA1\x49 |0
-<UFF03> \xA1\xAD |0
-<UFF04> \xA2\x43 |0
-<UFF05> \xA2\x48 |0
-<UFF06> \xA1\xAE |0
-<UFF08> \xA1\x5D |0
-<UFF09> \xA1\x5E |0
-<UFF0A> \xA1\xAF |0
-<UFF0B> \xA1\xCF |0
-<UFF0C> \xA1\x41 |0
-<UFF0D> \xA1\xD0 |0
-<UFF0E> \xA1\x44 |0
-<UFF0F> \xA1\xFE |0
-<UFF10> \xA2\xAF |0
-<UFF11> \xA2\xB0 |0
-<UFF12> \xA2\xB1 |0
-<UFF13> \xA2\xB2 |0
-<UFF14> \xA2\xB3 |0
-<UFF15> \xA2\xB4 |0
-<UFF16> \xA2\xB5 |0
-<UFF17> \xA2\xB6 |0
-<UFF18> \xA2\xB7 |0
-<UFF19> \xA2\xB8 |0
-<UFF1A> \xA1\x47 |0
-<UFF1B> \xA1\x46 |0
-<UFF1C> \xA1\xD5 |0
-<UFF1D> \xA1\xD7 |0
-<UFF1E> \xA1\xD6 |0
-<UFF1F> \xA1\x48 |0
-<UFF20> \xA2\x49 |0
-<UFF21> \xA2\xCF |0
-<UFF22> \xA2\xD0 |0
-<UFF23> \xA2\xD1 |0
-<UFF24> \xA2\xD2 |0
-<UFF25> \xA2\xD3 |0
-<UFF26> \xA2\xD4 |0
-<UFF27> \xA2\xD5 |0
-<UFF28> \xA2\xD6 |0
-<UFF29> \xA2\xD7 |0
-<UFF2A> \xA2\xD8 |0
-<UFF2B> \xA2\xD9 |0
-<UFF2C> \xA2\xDA |0
-<UFF2D> \xA2\xDB |0
-<UFF2E> \xA2\xDC |0
-<UFF2F> \xA2\xDD |0
-<UFF30> \xA2\xDE |0
-<UFF31> \xA2\xDF |0
-<UFF32> \xA2\xE0 |0
-<UFF33> \xA2\xE1 |0
-<UFF34> \xA2\xE2 |0
-<UFF35> \xA2\xE3 |0
-<UFF36> \xA2\xE4 |0
-<UFF37> \xA2\xE5 |0
-<UFF38> \xA2\xE6 |0
-<UFF39> \xA2\xE7 |0
-<UFF3A> \xA2\xE8 |0
-<UFF3C> \xA2\x40 |0
-<UFF3F> \xA1\xC4 |0
-<UFF41> \xA2\xE9 |0
-<UFF42> \xA2\xEA |0
-<UFF43> \xA2\xEB |0
-<UFF44> \xA2\xEC |0
-<UFF45> \xA2\xED |0
-<UFF46> \xA2\xEE |0
-<UFF47> \xA2\xEF |0
-<UFF48> \xA2\xF0 |0
-<UFF49> \xA2\xF1 |0
-<UFF4A> \xA2\xF2 |0
-<UFF4B> \xA2\xF3 |0
-<UFF4C> \xA2\xF4 |0
-<UFF4D> \xA2\xF5 |0
-<UFF4E> \xA2\xF6 |0
-<UFF4F> \xA2\xF7 |0
-<UFF50> \xA2\xF8 |0
-<UFF51> \xA2\xF9 |0
-<UFF52> \xA2\xFA |0
-<UFF53> \xA2\xFB |0
-<UFF54> \xA2\xFC |0
-<UFF55> \xA2\xFD |0
-<UFF56> \xA2\xFE |0
-<UFF57> \xA3\x40 |0
-<UFF58> \xA3\x41 |0
-<UFF59> \xA3\x42 |0
-<UFF5A> \xA3\x43 |0
-<UFF5B> \xA1\x61 |0
-<UFF5C> \xA1\x55 |0
-<UFF5D> \xA1\x62 |0
-<UFF5E> \xA1\xE3 |0
-<UFFE0> \xA2\x46 |0
-<UFFE1> \xA2\x47 |0
-<UFFE3> \xA1\xC3 |0
-<UFFE5> \xA2\x44 |0
-#
-END CHARMAP
-#
diff --git a/enc/trans/ucm/glibc-BIG5HKSCS-2.3.3.ucm b/enc/trans/ucm/glibc-BIG5HKSCS-2.3.3.ucm
deleted file mode 100644
index ca8155b4eb..0000000000
--- a/enc/trans/ucm/glibc-BIG5HKSCS-2.3.3.ucm
+++ /dev/null
@@ -1,18332 +0,0 @@
-# ***************************************************************************
-# *
-# * Copyright (C) 2001-2005, International Business Machines
-# * Corporation and others. All Rights Reserved.
-# *
-# ***************************************************************************
-#
-# File created on Aug 10 10:03 PDT 2005
-#
-# File created by genucm tool.
-# from glibc 2.3.3 using Linux with glibc 2.3.3
-#
-# Table Version : 1.0
-# The 1st column is the Unicode scalar value.
-# The 2nd column is the codepage byte sequence.
-# The 3rd column is the fallback indicator.
-# The fallback indicator can have one of the following values:
-# |0 for exact 1-1 roundtrip mapping
-# |1 for the best fallback codepage byte sequence.
-# |2 for the substitution character
-# |3 for the best reverse fallback Unicode scaler value
-#
-# Encoding description:
-# Encoding name: BIG5HKSCS
-#
-<code_set_name> "glibc-BIG5HKSCS-2.3.3"
-<mb_cur_max> 2
-<mb_cur_min> 1
-<uconv_class> "MBCS"
-<subchar> \x1A
-<icu:charsetFamily> "ASCII"
-# Suggested ICU specific alias information
-#<icu:alias> "glibc-BIG5HKSCS_VPUA"
-
-
-# The following was the generated state table.
-# This does not account for unassigned characters
-#<icu:state> 0-80, 88-8b:1, 8d-fe:1
-#<icu:state> 40-7e, a1-fe
-#
-CHARMAP
-#
-#UNICODE BIG5HKSCS
-#_______ _________
-<U0000> \x00 |0
-<U0001> \x01 |0
-<U0002> \x02 |0
-<U0003> \x03 |0
-<U0004> \x04 |0
-<U0005> \x05 |0
-<U0006> \x06 |0
-<U0007> \x07 |0
-<U0008> \x08 |0
-<U0009> \x09 |0
-<U000A> \x0A |0
-<U000B> \x0B |0
-<U000C> \x0C |0
-<U000D> \x0D |0
-<U000E> \x0E |0
-<U000F> \x0F |0
-<U0010> \x10 |0
-<U0011> \x11 |0
-<U0012> \x12 |0
-<U0013> \x13 |0
-<U0014> \x14 |0
-<U0015> \x15 |0
-<U0016> \x16 |0
-<U0017> \x17 |0
-<U0018> \x18 |0
-<U0019> \x19 |0
-<U001A> \x1A |0
-<U001B> \x1B |0
-<U001C> \x1C |0
-<U001D> \x1D |0
-<U001E> \x1E |0
-<U001F> \x1F |0
-<U0020> \x20 |0
-<U0021> \x21 |0
-<U0022> \x22 |0
-<U0023> \x23 |0
-<U0024> \x24 |0
-<U0025> \x25 |0
-<U0026> \x26 |0
-<U0027> \x27 |0
-<U0028> \x28 |0
-<U0029> \x29 |0
-<U002A> \x2A |0
-<U002B> \x2B |0
-<U002C> \x2C |0
-<U002D> \x2D |0
-<U002E> \x2E |0
-<U002F> \x2F |0
-<U0030> \x30 |0
-<U0031> \x31 |0
-<U0032> \x32 |0
-<U0033> \x33 |0
-<U0034> \x34 |0
-<U0035> \x35 |0
-<U0036> \x36 |0
-<U0037> \x37 |0
-<U0038> \x38 |0
-<U0039> \x39 |0
-<U003A> \x3A |0
-<U003B> \x3B |0
-<U003C> \x3C |0
-<U003D> \x3D |0
-<U003E> \x3E |0
-<U003F> \x3F |0
-<U0040> \x40 |0
-<U0041> \x41 |0
-<U0042> \x42 |0
-<U0043> \x43 |0
-<U0044> \x44 |0
-<U0045> \x45 |0
-<U0046> \x46 |0
-<U0047> \x47 |0
-<U0048> \x48 |0
-<U0049> \x49 |0
-<U004A> \x4A |0
-<U004B> \x4B |0
-<U004C> \x4C |0
-<U004D> \x4D |0
-<U004E> \x4E |0
-<U004F> \x4F |0
-<U0050> \x50 |0
-<U0051> \x51 |0
-<U0052> \x52 |0
-<U0053> \x53 |0
-<U0054> \x54 |0
-<U0055> \x55 |0
-<U0056> \x56 |0
-<U0057> \x57 |0
-<U0058> \x58 |0
-<U0059> \x59 |0
-<U005A> \x5A |0
-<U005B> \x5B |0
-<U005C> \x5C |0
-<U005D> \x5D |0
-<U005E> \x5E |0
-<U005F> \x5F |0
-<U0060> \x60 |0
-<U0061> \x61 |0
-<U0062> \x62 |0
-<U0063> \x63 |0
-<U0064> \x64 |0
-<U0065> \x65 |0
-<U0066> \x66 |0
-<U0067> \x67 |0
-<U0068> \x68 |0
-<U0069> \x69 |0
-<U006A> \x6A |0
-<U006B> \x6B |0
-<U006C> \x6C |0
-<U006D> \x6D |0
-<U006E> \x6E |0
-<U006F> \x6F |0
-<U0070> \x70 |0
-<U0071> \x71 |0
-<U0072> \x72 |0
-<U0073> \x73 |0
-<U0074> \x74 |0
-<U0075> \x75 |0
-<U0076> \x76 |0
-<U0077> \x77 |0
-<U0078> \x78 |0
-<U0079> \x79 |0
-<U007A> \x7A |0
-<U007B> \x7B |0
-<U007C> \x7C |0
-<U007D> \x7D |0
-<U007E> \x7E |0
-<U007F> \x7F |0
-#<U0080> \x80 |0
-<U00A2> \xA2\x46 |0
-<U00A3> \xA2\x47 |0
-<U00A5> \xA2\x44 |0
-<U00A7> \xA1\xB1 |0
-<U00A8> \xC6\xD8 |0
-<U00B0> \xA2\x58 |0
-<U00B1> \xA1\xD3 |0
-<U00B7> \xA1\x50 |0
-<U00C0> \x88\x59 |0
-<U00C1> \x88\x57 |0
-<U00C8> \x88\x5D |0
-<U00C9> \x88\x5B |0
-<U00CA> \x88\x66 |0
-<U00D2> \x88\x61 |0
-<U00D3> \x88\x5F |0
-<U00D7> \xA1\xD1 |0
-<U00E0> \x88\x6A |0
-<U00E1> \x88\x68 |0
-<U00E8> \x88\x6F |0
-<U00E9> \x88\x6D |0
-<U00EA> \x88\xA7 |0
-<U00EC> \x88\x73 |0
-<U00ED> \x88\x71 |0
-<U00F2> \x88\x77 |0
-<U00F3> \x88\x75 |0
-<U00F7> \xA1\xD2 |0
-<U00F8> \xC8\xFB |0
-<U00F9> \x88\x7B |0
-<U00FA> \x88\x79 |0
-<U00FC> \x88\xA2 |0
-<U0100> \x88\x56 |0
-<U0101> \x88\x67 |0
-<U0112> \x88\x5A |0
-<U0113> \x88\x6C |0
-<U011A> \x88\x5C |0
-<U011B> \x88\x6E |0
-<U012B> \x88\x70 |0
-<U014B> \xC8\xFC |0
-<U014C> \x88\x5E |0
-<U014D> \x88\x74 |0
-<U0153> \xC8\xFA |0
-<U016B> \x88\x78 |0
-<U01CD> \x88\x58 |0
-<U01CE> \x88\x69 |0
-<U01D0> \x88\x72 |0
-<U01D1> \x88\x60 |0
-<U01D2> \x88\x76 |0
-<U01D4> \x88\x7A |0
-<U01D6> \x88\x7C |0
-<U01D8> \x88\x7D |0
-<U01DA> \x88\x7E |0
-<U01DC> \x88\xA1 |0
-<U0250> \xC8\xF6 |0
-<U0251> \x88\x6B |0
-<U0254> \xC8\xF8 |0
-<U025B> \xC8\xF7 |0
-<U0261> \x88\xA8 |0
-<U026A> \xC8\xFE |0
-<U0275> \xC8\xF9 |0
-<U0283> \xC8\xF5 |0
-<U028A> \xC8\xFD |0
-<U02C6> \xC6\xD9 |0
-<U02C7> \xA3\xBE |0
-<U02C9> \xA3\xBC |0
-<U02CA> \xA3\xBD |0
-<U02CB> \xA3\xBF |0
-<U02D9> \xA3\xBB |0
-<U0391> \xA3\x44 |0
-<U0392> \xA3\x45 |0
-<U0393> \xA3\x46 |0
-<U0394> \xA3\x47 |0
-<U0395> \xA3\x48 |0
-<U0396> \xA3\x49 |0
-<U0397> \xA3\x4A |0
-<U0398> \xA3\x4B |0
-<U0399> \xA3\x4C |0
-<U039A> \xA3\x4D |0
-<U039B> \xA3\x4E |0
-<U039C> \xA3\x4F |0
-<U039D> \xA3\x50 |0
-<U039E> \xA3\x51 |0
-<U039F> \xA3\x52 |0
-<U03A0> \xA3\x53 |0
-<U03A1> \xA3\x54 |0
-<U03A3> \xA3\x55 |0
-<U03A4> \xA3\x56 |0
-<U03A5> \xA3\x57 |0
-<U03A6> \xA3\x58 |0
-<U03A7> \xA3\x59 |0
-<U03A8> \xA3\x5A |0
-<U03A9> \xA3\x5B |0
-<U03B1> \xA3\x5C |0
-<U03B2> \xA3\x5D |0
-<U03B3> \xA3\x5E |0
-<U03B4> \xA3\x5F |0
-<U03B5> \xA3\x60 |0
-<U03B6> \xA3\x61 |0
-<U03B7> \xA3\x62 |0
-<U03B8> \xA3\x63 |0
-<U03B9> \xA3\x64 |0
-<U03BA> \xA3\x65 |0
-<U03BB> \xA3\x66 |0
-<U03BC> \xA3\x67 |0
-<U03BD> \xA3\x68 |0
-<U03BE> \xA3\x69 |0
-<U03BF> \xA3\x6A |0
-<U03C0> \xA3\x6B |0
-<U03C1> \xA3\x6C |0
-<U03C3> \xA3\x6D |0
-<U03C4> \xA3\x6E |0
-<U03C5> \xA3\x6F |0
-<U03C6> \xA3\x70 |0
-<U03C7> \xA3\x71 |0
-<U03C8> \xA3\x72 |0
-<U03C9> \xA3\x73 |0
-<U0401> \xC7\xF9 |0
-<U0410> \xC7\xF3 |0
-<U0411> \xC7\xF4 |0
-<U0412> \xC7\xF5 |0
-<U0413> \xC7\xF6 |0
-<U0414> \xC7\xF7 |0
-<U0415> \xC7\xF8 |0
-<U0416> \xC7\xFA |0
-<U0417> \xC7\xFB |0
-<U0418> \xC7\xFC |0
-<U0419> \xC7\xFD |0
-<U041A> \xC7\xFE |0
-<U041B> \xC8\x40 |0
-<U041C> \xC8\x41 |0
-<U041D> \xC8\x42 |0
-<U041E> \xC8\x43 |0
-<U041F> \xC8\x44 |0
-<U0420> \xC8\x45 |0
-<U0421> \xC8\x46 |0
-<U0422> \xC8\x47 |0
-<U0423> \xC8\x48 |0
-<U0424> \xC8\x49 |0
-<U0425> \xC8\x4A |0
-<U0426> \xC8\x4B |0
-<U0427> \xC8\x4C |0
-<U0428> \xC8\x4D |0
-<U0429> \xC8\x4E |0
-<U042A> \xC8\x4F |0
-<U042B> \xC8\x50 |0
-<U042C> \xC8\x51 |0
-<U042D> \xC8\x52 |0
-<U042E> \xC8\x53 |0
-<U042F> \xC8\x54 |0
-<U0430> \xC8\x55 |0
-<U0431> \xC8\x56 |0
-<U0432> \xC8\x57 |0
-<U0433> \xC8\x58 |0
-<U0434> \xC8\x59 |0
-<U0435> \xC8\x5A |0
-<U0436> \xC8\x5C |0
-<U0437> \xC8\x5D |0
-<U0438> \xC8\x5E |0
-<U0439> \xC8\x5F |0
-<U043A> \xC8\x60 |0
-<U043B> \xC8\x61 |0
-<U043C> \xC8\x62 |0
-<U043D> \xC8\x63 |0
-<U043E> \xC8\x64 |0
-<U043F> \xC8\x65 |0
-<U0440> \xC8\x66 |0
-<U0441> \xC8\x67 |0
-<U0442> \xC8\x68 |0
-<U0443> \xC8\x69 |0
-<U0444> \xC8\x6A |0
-<U0445> \xC8\x6B |0
-<U0446> \xC8\x6C |0
-<U0447> \xC8\x6D |0
-<U0448> \xC8\x6E |0
-<U0449> \xC8\x6F |0
-<U044A> \xC8\x70 |0
-<U044B> \xC8\x71 |0
-<U044C> \xC8\x72 |0
-<U044D> \xC8\x73 |0
-<U044E> \xC8\x74 |0
-<U044F> \xC8\x75 |0
-<U0451> \xC8\x5B |0
-<U1EBE> \x88\x63 |0
-<U1EBF> \x88\xA4 |0
-<U1EC0> \x88\x65 |0
-<U1EC1> \x88\xA6 |0
-<U2013> \xA1\x56 |0
-<U2014> \xA1\x58 |0
-<U2018> \xA1\xA5 |0
-<U2019> \xA1\xA6 |0
-<U201C> \xA1\xA7 |0
-<U201D> \xA1\xA8 |0
-<U2022> \xA1\x45 |0
-<U2025> \xA1\x4C |0
-<U2026> \xA1\x4B |0
-<U2032> \xA1\xAC |0
-<U2035> \xA1\xAB |0
-<U203B> \xA1\xB0 |0
-<U203E> \xA1\xC2 |0
-<U2103> \xA2\x4A |0
-<U2105> \xA1\xC1 |0
-<U2109> \xA2\x4B |0
-<U2116> \xC8\xD2 |0
-<U2121> \xC8\xD3 |0
-<U2160> \xA2\xB9 |0
-<U2161> \xA2\xBA |0
-<U2162> \xA2\xBB |0
-<U2163> \xA2\xBC |0
-<U2164> \xA2\xBD |0
-<U2165> \xA2\xBE |0
-<U2166> \xA2\xBF |0
-<U2167> \xA2\xC0 |0
-<U2168> \xA2\xC1 |0
-<U2169> \xA2\xC2 |0
-<U2170> \xC6\xB5 |0
-<U2171> \xC6\xB6 |0
-<U2172> \xC6\xB7 |0
-<U2173> \xC6\xB8 |0
-<U2174> \xC6\xB9 |0
-<U2175> \xC6\xBA |0
-<U2176> \xC6\xBB |0
-<U2177> \xC6\xBC |0
-<U2178> \xC6\xBD |0
-<U2179> \xC6\xBE |0
-<U2190> \xA1\xF6 |0
-<U2191> \xA1\xF4 |0
-<U2192> \xA1\xF7 |0
-<U2193> \xA1\xF5 |0
-<U2196> \xA1\xF8 |0
-<U2197> \xA1\xF9 |0
-<U2198> \xA1\xFB |0
-<U2199> \xA1\xFA |0
-<U21B8> \xC8\x77 |0
-<U21B9> \xC8\x78 |0
-<U21E7> \xC8\x76 |0
-<U221A> \xA1\xD4 |0
-<U221E> \xA1\xDB |0
-<U221F> \xA1\xE8 |0
-<U2220> \xA1\xE7 |0
-<U2223> \xA1\xFD |0
-<U2225> \xA1\xFC |0
-<U2229> \xA1\xE4 |0
-<U222A> \xA1\xE5 |0
-<U222B> \xA1\xEC |0
-<U222E> \xA1\xED |0
-<U2234> \xA1\xEF |0
-<U2235> \xA1\xEE |0
-<U223C> \xA1\xE3 |0
-<U2252> \xA1\xDC |0
-<U2260> \xA1\xDA |0
-<U2261> \xA1\xDD |0
-<U2266> \xA1\xD8 |0
-<U2267> \xA1\xD9 |0
-<U22A5> \xA1\xE6 |0
-<U22BF> \xA1\xE9 |0
-<U2460> \xC6\xA1 |0
-<U2461> \xC6\xA2 |0
-<U2462> \xC6\xA3 |0
-<U2463> \xC6\xA4 |0
-<U2464> \xC6\xA5 |0
-<U2465> \xC6\xA6 |0
-<U2466> \xC6\xA7 |0
-<U2467> \xC6\xA8 |0
-<U2468> \xC6\xA9 |0
-<U2469> \xC6\xAA |0
-<U2474> \xC6\xAB |0
-<U2475> \xC6\xAC |0
-<U2476> \xC6\xAD |0
-<U2477> \xC6\xAE |0
-<U2478> \xC6\xAF |0
-<U2479> \xC6\xB0 |0
-<U247A> \xC6\xB1 |0
-<U247B> \xC6\xB2 |0
-<U247C> \xC6\xB3 |0
-<U247D> \xC6\xB4 |0
-<U2500> \xA2\x77 |0
-<U2502> \xA2\x78 |0
-<U250C> \xA2\x7A |0
-<U2510> \xA2\x7B |0
-<U2514> \xA2\x7C |0
-<U2518> \xA2\x7D |0
-<U251C> \xA2\x75 |0
-<U2524> \xA2\x74 |0
-<U252C> \xA2\x73 |0
-<U2534> \xA2\x72 |0
-<U253C> \xA2\x71 |0
-<U2550> \xF9\xF9 |0
-<U2550> \xA2\xA4 |3
-<U2551> \xF9\xF8 |0
-<U2552> \xF9\xE6 |0
-<U2553> \xF9\xEF |0
-<U2554> \xF9\xDD |0
-<U2555> \xF9\xE8 |0
-<U2556> \xF9\xF1 |0
-<U2557> \xF9\xDF |0
-<U2558> \xF9\xEC |0
-<U2559> \xF9\xF5 |0
-<U255A> \xF9\xE3 |0
-<U255B> \xF9\xEE |0
-<U255C> \xF9\xF7 |0
-<U255D> \xF9\xE5 |0
-<U255E> \xF9\xE9 |0
-<U255E> \xA2\xA5 |3
-<U255F> \xF9\xF2 |0
-<U2560> \xF9\xE0 |0
-<U2561> \xF9\xEB |0
-<U2561> \xA2\xA7 |3
-<U2562> \xF9\xF4 |0
-<U2563> \xF9\xE2 |0
-<U2564> \xF9\xE7 |0
-<U2565> \xF9\xF0 |0
-<U2566> \xF9\xDE |0
-<U2567> \xF9\xED |0
-<U2568> \xF9\xF6 |0
-<U2569> \xF9\xE4 |0
-<U256A> \xF9\xEA |0
-<U256A> \xA2\xA6 |3
-<U256B> \xF9\xF3 |0
-<U256C> \xF9\xE1 |0
-<U256D> \xF9\xFA |0
-<U256D> \xA2\x7E |3
-<U256E> \xF9\xFB |0
-<U256E> \xA2\xA1 |3
-<U256F> \xF9\xFD |0
-<U256F> \xA2\xA3 |3
-<U2570> \xF9\xFC |0
-<U2570> \xA2\xA2 |3
-<U2571> \xA2\xAC |0
-<U2572> \xA2\xAD |0
-<U2573> \xA2\xAE |0
-<U2581> \xA2\x62 |0
-<U2582> \xA2\x63 |0
-<U2583> \xA2\x64 |0
-<U2584> \xA2\x65 |0
-<U2585> \xA2\x66 |0
-<U2586> \xA2\x67 |0
-<U2587> \xA2\x68 |0
-<U2588> \xA2\x69 |0
-<U2589> \xA2\x70 |0
-<U258A> \xA2\x6F |0
-<U258B> \xA2\x6E |0
-<U258C> \xA2\x6D |0
-<U258D> \xA2\x6C |0
-<U258E> \xA2\x6B |0
-<U258F> \xA2\x6A |0
-<U2594> \xA2\x76 |0
-<U2595> \xA2\x79 |0
-<U25A0> \xA1\xBD |0
-<U25A1> \xA1\xBC |0
-<U25B2> \xA1\xB6 |0
-<U25B3> \xA1\xB5 |0
-<U25BC> \xA1\xBF |0
-<U25BD> \xA1\xBE |0
-<U25C6> \xA1\xBB |0
-<U25C7> \xA1\xBA |0
-<U25CB> \xA1\xB3 |0
-<U25CE> \xA1\xB7 |0
-<U25CF> \xA1\xB4 |0
-<U25E2> \xA2\xA8 |0
-<U25E3> \xA2\xA9 |0
-<U25E4> \xA2\xAB |0
-<U25E5> \xA2\xAA |0
-<U2605> \xA1\xB9 |0
-<U2606> \xA1\xB8 |0
-<U2609> \xA1\xF3 |0
-<U2640> \xA1\xF0 |0
-<U2641> \xA1\xF2 |0
-<U2642> \xA1\xF1 |0
-<U273D> \xC6\xE6 |0
-<U2E80> \xC8\xD6 |0
-<U2E84> \xC8\xD7 |0
-<U2E86> \xC8\xD8 |0
-<U2E87> \xC8\xD9 |0
-<U2E88> \xC8\xDA |0
-<U2E8A> \xC8\xDB |0
-<U2E8C> \xC8\xDC |0
-<U2E8D> \xC8\xDD |0
-<U2E95> \xC8\xDE |0
-<U2E9C> \xC8\xDF |0
-<U2E9D> \xC8\xE0 |0
-<U2EA5> \xC8\xE1 |0
-<U2EA7> \xC8\xE2 |0
-<U2EAA> \xC8\xE3 |0
-<U2EAC> \xC8\xE4 |0
-<U2EAE> \xC8\xE5 |0
-<U2EB6> \xC8\xE6 |0
-<U2EBC> \xC8\xE7 |0
-<U2EBE> \xC8\xE8 |0
-<U2EC6> \xC8\xE9 |0
-<U2ECA> \xC8\xEA |0
-<U2ECC> \xC8\xEB |0
-<U2ECD> \xC8\xEC |0
-<U2ECF> \xC8\xED |0
-<U2ED6> \xC8\xEE |0
-<U2ED7> \xC8\xEF |0
-<U2EDE> \xC8\xF0 |0
-<U2EE3> \xC8\xF1 |0
-<U2F33> \xC6\xCD |0
-<U3000> \xA1\x40 |0
-<U3001> \xA1\x42 |0
-<U3002> \xA1\x43 |0
-<U3003> \xA1\xB2 |0
-<U3005> \xC6\xE0 |0
-<U3006> \xC6\xE1 |0
-<U3007> \xC6\xE2 |0
-<U3008> \xA1\x71 |0
-<U3009> \xA1\x72 |0
-<U300A> \xA1\x6D |0
-<U300B> \xA1\x6E |0
-<U300C> \xA1\x75 |0
-<U300D> \xA1\x76 |0
-<U300E> \xA1\x79 |0
-<U300F> \xA1\x7A |0
-<U3010> \xA1\x69 |0
-<U3011> \xA1\x6A |0
-<U3012> \xA2\x45 |0
-<U3014> \xA1\x65 |0
-<U3015> \xA1\x66 |0
-<U301D> \xA1\xA9 |0
-<U301E> \xA1\xAA |0
-<U3021> \xA2\xC3 |0
-<U3022> \xA2\xC4 |0
-<U3023> \xA2\xC5 |0
-<U3024> \xA2\xC6 |0
-<U3025> \xA2\xC7 |0
-<U3026> \xA2\xC8 |0
-<U3027> \xA2\xC9 |0
-<U3028> \xA2\xCA |0
-<U3029> \xA2\xCB |0
-<U3041> \xC6\xE7 |0
-<U3042> \xC6\xE8 |0
-<U3043> \xC6\xE9 |0
-<U3044> \xC6\xEA |0
-<U3045> \xC6\xEB |0
-<U3046> \xC6\xEC |0
-<U3047> \xC6\xED |0
-<U3048> \xC6\xEE |0
-<U3049> \xC6\xEF |0
-<U304A> \xC6\xF0 |0
-<U304B> \xC6\xF1 |0
-<U304C> \xC6\xF2 |0
-<U304D> \xC6\xF3 |0
-<U304E> \xC6\xF4 |0
-<U304F> \xC6\xF5 |0
-<U3050> \xC6\xF6 |0
-<U3051> \xC6\xF7 |0
-<U3052> \xC6\xF8 |0
-<U3053> \xC6\xF9 |0
-<U3054> \xC6\xFA |0
-<U3055> \xC6\xFB |0
-<U3056> \xC6\xFC |0
-<U3057> \xC6\xFD |0
-<U3058> \xC6\xFE |0
-<U3059> \xC7\x40 |0
-<U305A> \xC7\x41 |0
-<U305B> \xC7\x42 |0
-<U305C> \xC7\x43 |0
-<U305D> \xC7\x44 |0
-<U305E> \xC7\x45 |0
-<U305F> \xC7\x46 |0
-<U3060> \xC7\x47 |0
-<U3061> \xC7\x48 |0
-<U3062> \xC7\x49 |0
-<U3063> \xC7\x4A |0
-<U3064> \xC7\x4B |0
-<U3065> \xC7\x4C |0
-<U3066> \xC7\x4D |0
-<U3067> \xC7\x4E |0
-<U3068> \xC7\x4F |0
-<U3069> \xC7\x50 |0
-<U306A> \xC7\x51 |0
-<U306B> \xC7\x52 |0
-<U306C> \xC7\x53 |0
-<U306D> \xC7\x54 |0
-<U306E> \xC7\x55 |0
-<U306F> \xC7\x56 |0
-<U3070> \xC7\x57 |0
-<U3071> \xC7\x58 |0
-<U3072> \xC7\x59 |0
-<U3073> \xC7\x5A |0
-<U3074> \xC7\x5B |0
-<U3075> \xC7\x5C |0
-<U3076> \xC7\x5D |0
-<U3077> \xC7\x5E |0
-<U3078> \xC7\x5F |0
-<U3079> \xC7\x60 |0
-<U307A> \xC7\x61 |0
-<U307B> \xC7\x62 |0
-<U307C> \xC7\x63 |0
-<U307D> \xC7\x64 |0
-<U307E> \xC7\x65 |0
-<U307F> \xC7\x66 |0
-<U3080> \xC7\x67 |0
-<U3081> \xC7\x68 |0
-<U3082> \xC7\x69 |0
-<U3083> \xC7\x6A |0
-<U3084> \xC7\x6B |0
-<U3085> \xC7\x6C |0
-<U3086> \xC7\x6D |0
-<U3087> \xC7\x6E |0
-<U3088> \xC7\x6F |0
-<U3089> \xC7\x70 |0
-<U308A> \xC7\x71 |0
-<U308B> \xC7\x72 |0
-<U308C> \xC7\x73 |0
-<U308D> \xC7\x74 |0
-<U308E> \xC7\x75 |0
-<U308F> \xC7\x76 |0
-<U3090> \xC7\x77 |0
-<U3091> \xC7\x78 |0
-<U3092> \xC7\x79 |0
-<U3093> \xC7\x7A |0
-<U309B> \xC8\xD4 |0
-<U309C> \xC8\xD5 |0
-<U309D> \xC6\xDC |0
-<U309E> \xC6\xDD |0
-<U30A1> \xC7\x7B |0
-<U30A2> \xC7\x7C |0
-<U30A3> \xC7\x7D |0
-<U30A4> \xC7\x7E |0
-<U30A5> \xC7\xA1 |0
-<U30A6> \xC7\xA2 |0
-<U30A7> \xC7\xA3 |0
-<U30A8> \xC7\xA4 |0
-<U30A9> \xC7\xA5 |0
-<U30AA> \xC7\xA6 |0
-<U30AB> \xC7\xA7 |0
-<U30AC> \xC7\xA8 |0
-<U30AD> \xC7\xA9 |0
-<U30AE> \xC7\xAA |0
-<U30AF> \xC7\xAB |0
-<U30B0> \xC7\xAC |0
-<U30B1> \xC7\xAD |0
-<U30B2> \xC7\xAE |0
-<U30B3> \xC7\xAF |0
-<U30B4> \xC7\xB0 |0
-<U30B5> \xC7\xB1 |0
-<U30B6> \xC7\xB2 |0
-<U30B7> \xC7\xB3 |0
-<U30B8> \xC7\xB4 |0
-<U30B9> \xC7\xB5 |0
-<U30BA> \xC7\xB6 |0
-<U30BB> \xC7\xB7 |0
-<U30BC> \xC7\xB8 |0
-<U30BD> \xC7\xB9 |0
-<U30BE> \xC7\xBA |0
-<U30BF> \xC7\xBB |0
-<U30C0> \xC7\xBC |0
-<U30C1> \xC7\xBD |0
-<U30C2> \xC7\xBE |0
-<U30C3> \xC7\xBF |0
-<U30C4> \xC7\xC0 |0
-<U30C5> \xC7\xC1 |0
-<U30C6> \xC7\xC2 |0
-<U30C7> \xC7\xC3 |0
-<U30C8> \xC7\xC4 |0
-<U30C9> \xC7\xC5 |0
-<U30CA> \xC7\xC6 |0
-<U30CB> \xC7\xC7 |0
-<U30CC> \xC7\xC8 |0
-<U30CD> \xC7\xC9 |0
-<U30CE> \xC7\xCA |0
-<U30CF> \xC7\xCB |0
-<U30D0> \xC7\xCC |0
-<U30D1> \xC7\xCD |0
-<U30D2> \xC7\xCE |0
-<U30D3> \xC7\xCF |0
-<U30D4> \xC7\xD0 |0
-<U30D5> \xC7\xD1 |0
-<U30D6> \xC7\xD2 |0
-<U30D7> \xC7\xD3 |0
-<U30D8> \xC7\xD4 |0
-<U30D9> \xC7\xD5 |0
-<U30DA> \xC7\xD6 |0
-<U30DB> \xC7\xD7 |0
-<U30DC> \xC7\xD8 |0
-<U30DD> \xC7\xD9 |0
-<U30DE> \xC7\xDA |0
-<U30DF> \xC7\xDB |0
-<U30E0> \xC7\xDC |0
-<U30E1> \xC7\xDD |0
-<U30E2> \xC7\xDE |0
-<U30E3> \xC7\xDF |0
-<U30E4> \xC7\xE0 |0
-<U30E5> \xC7\xE1 |0
-<U30E6> \xC7\xE2 |0
-<U30E7> \xC7\xE3 |0
-<U30E8> \xC7\xE4 |0
-<U30E9> \xC7\xE5 |0
-<U30EA> \xC7\xE6 |0
-<U30EB> \xC7\xE7 |0
-<U30EC> \xC7\xE8 |0
-<U30ED> \xC7\xE9 |0
-<U30EE> \xC7\xEA |0
-<U30EF> \xC7\xEB |0
-<U30F0> \xC7\xEC |0
-<U30F1> \xC7\xED |0
-<U30F2> \xC7\xEE |0
-<U30F3> \xC7\xEF |0
-<U30F4> \xC7\xF0 |0
-<U30F5> \xC7\xF1 |0
-<U30F6> \xC7\xF2 |0
-<U30FC> \xC6\xE3 |0
-<U30FD> \xC6\xDA |0
-<U30FE> \xC6\xDB |0
-<U3105> \xA3\x74 |0
-<U3106> \xA3\x75 |0
-<U3107> \xA3\x76 |0
-<U3108> \xA3\x77 |0
-<U3109> \xA3\x78 |0
-<U310A> \xA3\x79 |0
-<U310B> \xA3\x7A |0
-<U310C> \xA3\x7B |0
-<U310D> \xA3\x7C |0
-<U310E> \xA3\x7D |0
-<U310F> \xA3\x7E |0
-<U3110> \xA3\xA1 |0
-<U3111> \xA3\xA2 |0
-<U3112> \xA3\xA3 |0
-<U3113> \xA3\xA4 |0
-<U3114> \xA3\xA5 |0
-<U3115> \xA3\xA6 |0
-<U3116> \xA3\xA7 |0
-<U3117> \xA3\xA8 |0
-<U3118> \xA3\xA9 |0
-<U3119> \xA3\xAA |0
-<U311A> \xA3\xAB |0
-<U311B> \xA3\xAC |0
-<U311C> \xA3\xAD |0
-<U311D> \xA3\xAE |0
-<U311E> \xA3\xAF |0
-<U311F> \xA3\xB0 |0
-<U3120> \xA3\xB1 |0
-<U3121> \xA3\xB2 |0
-<U3122> \xA3\xB3 |0
-<U3123> \xA3\xB4 |0
-<U3124> \xA3\xB5 |0
-<U3125> \xA3\xB6 |0
-<U3126> \xA3\xB7 |0
-<U3127> \xA3\xB8 |0
-<U3128> \xA3\xB9 |0
-<U3129> \xA3\xBA |0
-<U3231> \xC8\xD1 |0
-<U32A3> \xA1\xC0 |0
-<U338E> \xA2\x55 |0
-<U338F> \xA2\x56 |0
-<U339C> \xA2\x50 |0
-<U339D> \xA2\x51 |0
-<U339E> \xA2\x52 |0
-<U33A1> \xA2\x54 |0
-<U33C4> \xA2\x57 |0
-<U33CE> \xA2\x53 |0
-<U33D1> \xA1\xEB |0
-<U33D2> \xA1\xEA |0
-<U33D5> \xA2\x4F |0
-<U3435> \x92\x77 |0
-<U3440> \x96\xDF |0
-<U344C> \x89\xD5 |0
-<U3464> \x93\xCD |0
-<U3473> \x9B\xDF |0
-<U347A> \xFA\x68 |0
-<U347D> \x89\xDA |0
-<U347E> \x8F\x59 |0
-<U3493> \x89\xDB |0
-<U3496> \x8F\x5D |0
-<U34A5> \x89\xDC |0
-<U34AF> \x96\xF7 |0
-<U34BC> \x8A\xDA |0
-<U34C1> \x8B\xDC |0
-<U34C8> \x97\xDB |0
-<U34DF> \x9E\x53 |0
-<U34E4> \x9D\xAA |0
-<U34FB> \x9B\xEA |0
-<U3506> \x8A\x6E |0
-<U353E> \x8B\xC8 |0
-<U3551> \x89\xE8 |0
-<U3553> \x89\xEA |0
-<U3561> \xFB\x70 |0
-<U356D> \x89\xED |0
-<U3570> \x94\xDD |0
-<U3572> \x89\xEE |0
-<U3577> \x9E\xB4 |0
-<U3578> \x8A\xD3 |0
-<U3584> \x92\xDB |0
-<U3597> \x94\xDB |0
-<U3598> \x89\xF9 |0
-<U35A1> \xFB\x7A |0
-<U35A5> \x89\xFB |0
-<U35AD> \x9E\xFC |0
-<U35BF> \x89\xFC |0
-<U35C1> \x89\xBF |0
-<U35C5> \x89\xFE |0
-<U35C7> \x89\xE6 |0
-<U35CA> \x9D\x46 |0
-<U35CE> \x9D\xEE |0
-<U35D2> \xA0\x7E |0
-<U35D6> \xA0\x68 |0
-<U35DB> \x98\xE9 |0
-<U35DD> \x8B\x68 |0
-<U35F1> \x8D\xFD |0
-<U35F2> \x8B\xBE |0
-<U35F3> \x9F\xD9 |0
-<U35FB> \x8A\xEB |0
-<U35FE> \x9F\xD7 |0
-<U3609> \x8B\x6A |0
-<U3618> \x9C\x5C |0
-<U361A> \x8B\xB1 |0
-<U3623> \xFB\x5E |0
-<U362D> \x9D\xF3 |0
-<U3635> \xA0\xD0 |0
-<U3639> \xFC\x66 |0
-<U363E> \x92\xE9 |0
-<U3647> \x9A\xEC |0
-<U3648> \x8F\xAB |0
-<U3649> \xFA\x48 |0
-<U364E> \x8E\x45 |0
-<U365F> \x9C\x6F |0
-<U367A> \x9E\xDE |0
-<U3681> \x89\xEF |0
-<U369A> \x96\xE9 |0
-<U36A5> \x9E\xBB |0
-<U36AA> \x94\xDE |0
-<U36AC> \x9E\xB8 |0
-<U36B0> \x97\xBA |0
-<U36B1> \xFB\x65 |0
-<U36B5> \x95\xD6 |0
-<U36B9> \x9C\xBB |0
-<U36BC> \x97\xDA |0
-<U36C1> \x8F\x45 |0
-<U36C3> \xFB\x7D |0
-<U36C4> \x91\x58 |0
-<U36C5> \xFE\x64 |0
-<U36C7> \x98\x56 |0
-<U36C8> \x9B\x4D |0
-<U36D3> \x93\x5B |0
-<U36D4> \x95\xC7 |0
-<U36D6> \x97\xE7 |0
-<U36DD> \x93\x59 |0
-<U36E1> \x91\xF5 |0
-<U36E2> \x97\xB8 |0
-<U36E5> \xFD\xA2 |0
-<U36E6> \xFB\xB6 |0
-<U36F5> \x92\xFA |0
-<U3701> \x93\x57 |0
-<U3703> \x8B\xA6 |0
-<U3708> \xFB\xB9 |0
-<U370A> \x97\xB0 |0
-<U370D> \xFD\xC4 |0
-<U371C> \x9C\xA1 |0
-<U3722> \x91\xF2 |0
-<U3723> \x91\xF9 |0
-<U3725> \x8F\xF1 |0
-<U372C> \x97\x45 |0
-<U372D> \x98\x53 |0
-<U3730> \xFE\x78 |0
-<U3732> \xFB\xC1 |0
-<U3733> \x92\x51 |0
-<U373A> \x9D\xAD |0
-<U3740> \xFD\x6C |0
-<U3743> \xFA\x6B |0
-<U3762> \x9B\xC2 |0
-<U376F> \x9A\x7B |0
-<U3797> \x8B\x60 |0
-<U37A0> \x93\x4B |0
-<U37B9> \x9A\xBD |0
-<U37BE> \x91\xB7 |0
-<U37F2> \x95\xB4 |0
-<U37F8> \xFE\xC5 |0
-<U37FB> \x9E\xF0 |0
-<U380F> \x8D\x64 |0
-<U3819> \x92\x69 |0
-<U3820> \x8D\x67 |0
-<U382D> \xFB\xEA |0
-<U3836> \xFB\xEF |0
-<U3838> \x8D\x68 |0
-<U3863> \x93\xEB |0
-<U38A0> \xFC\x42 |0
-<U38C3> \x91\x66 |0
-<U38CC> \xFA\xCD |0
-<U38D1> \x93\xDD |0
-<U38FA> \x8B\xCC |0
-<U3908> \x8D\x6D |0
-<U3914> \x8D\x6E |0
-<U3927> \x96\xA8 |0
-<U3932> \xFC\xA6 |0
-<U393F> \x8D\x6F |0
-<U394D> \x8D\x70 |0
-<U3963> \xFC\x64 |0
-<U3980> \x90\x60 |0
-<U3989> \x8D\x74 |0
-<U398A> \x97\xC3 |0
-<U3992> \x8A\xD0 |0
-<U3999> \x92\x74 |0
-<U399B> \x9B\xBE |0
-<U39A1> \x9C\xC8 |0
-<U39A4> \x9C\xBA |0
-<U39B8> \x8D\x78 |0
-<U39DC> \x9E\xB9 |0
-<U39E2> \x95\x5A |0
-<U39E5> \x91\xB4 |0
-<U39EC> \x8A\x48 |0
-<U39F8> \x8D\x7D |0
-<U39FB> \x8A\x7D |0
-<U39FE> \x8A\xC2 |0
-<U3A01> \xFD\x4A |0
-<U3A03> \x8D\xA1 |0
-<U3A06> \x8A\xD1 |0
-<U3A17> \xFC\xB4 |0
-<U3A18> \x8B\x47 |0
-<U3A29> \x93\xA4 |0
-<U3A2A> \x9E\xDA |0
-<U3A34> \x8A\x51 |0
-<U3A4B> \x8D\xA6 |0
-<U3A52> \x9E\xC5 |0
-<U3A57> \xFC\xC4 |0
-<U3A5C> \xA0\x78 |0
-<U3A5E> \x94\xB5 |0
-<U3A66> \xFC\xC2 |0
-<U3A67> \x8A\x6B |0
-<U3A97> \x8D\xAB |0
-<U3AAB> \xFA\xE8 |0
-<U3ABD> \x8D\xAD |0
-<U3ADE> \xFC\x49 |0
-<U3AE0> \x93\xC1 |0
-<U3AF0> \x90\x6F |0
-<U3AF2> \x8D\xB0 |0
-<U3AFB> \x94\x7E |0
-<U3B0E> \x90\xFA |0
-<U3B19> \x94\x79 |0
-<U3B22> \x8D\xB2 |0
-<U3B2B> \xFC\xEE |0
-<U3B39> \x99\x7B |0
-<U3B42> \x8D\xB4 |0
-<U3B58> \x8D\xB7 |0
-<U3B60> \x91\xB3 |0
-<U3B71> \x8D\xBB |0
-<U3B72> \x8D\xBA |0
-<U3B7B> \x8D\xBC |0
-<U3B7C> \x90\x44 |0
-<U3B80> \xFD\x4C |0
-<U3B96> \x93\xE4 |0
-<U3B99> \x93\xE0 |0
-<U3BA1> \xFD\x53 |0
-<U3BBC> \x8D\xC3 |0
-<U3BBE> \x9B\xB8 |0
-<U3BC2> \xFB\xF0 |0
-<U3BC4> \x93\xE9 |0
-<U3BD7> \x93\xF6 |0
-<U3BDD> \x8D\xC5 |0
-<U3BEC> \x8D\xCA |0
-<U3BF2> \x8D\xCC |0
-<U3BF3> \xFD\x5D |0
-<U3BF4> \x93\xB5 |0
-<U3C0D> \xFD\x61 |0
-<U3C11> \x9C\xF8 |0
-<U3C15> \x92\x52 |0
-<U3C18> \xA0\xE8 |0
-<U3C54> \x9C\xA5 |0
-<U3CCB> \x8D\xD6 |0
-<U3CCD> \x97\xC0 |0
-<U3CD1> \xA0\xDE |0
-<U3CD6> \x97\xD2 |0
-<U3CDC> \xFA\xA5 |0
-<U3CEB> \xFD\xA3 |0
-<U3CEF> \x8D\xDB |0
-<U3D13> \x8E\xAF |0
-<U3D1D> \x91\xB5 |0
-<U3D32> \xFD\x49 |0
-<U3D3B> \xFD\xD1 |0
-<U3D46> \x8D\xEB |0
-<U3D4C> \x97\xC6 |0
-<U3D4E> \xFD\xCE |0
-<U3D51> \x90\xFC |0
-<U3D5F> \xFC\x59 |0
-<U3D62> \x96\xD6 |0
-<U3D69> \x97\xC5 |0
-<U3D6A> \x8D\xEF |0
-<U3D6F> \x97\xD7 |0
-<U3D75> \x8D\xF0 |0
-<U3D7D> \x96\xA6 |0
-<U3D85> \xFB\xBF |0
-<U3D8A> \x8D\xF3 |0
-<U3D8F> \x94\x49 |0
-<U3D91> \x8D\xF5 |0
-<U3DA5> \x98\x72 |0
-<U3DAD> \x8E\x6B |0
-<U3DB4> \xFA\xFD |0
-<U3DBF> \x8F\x50 |0
-<U3DC6> \x9D\xCC |0
-<U3DC7> \xFC\x65 |0
-<U3DCC> \x99\x6E |0
-<U3DCD> \x94\xA1 |0
-<U3DD3> \x8F\x63 |0
-<U3DDB> \xA0\xDA |0
-<U3DE7> \x92\x53 |0
-<U3DE8> \xFD\xE9 |0
-<U3DEB> \x9D\xB5 |0
-<U3DF3> \x98\x79 |0
-<U3DF7> \x9D\x5D |0
-<U3DFC> \x8D\x63 |0
-<U3DFD> \x96\x69 |0
-<U3E06> \x9F\x70 |0
-<U3E40> \xFC\x6A |0
-<U3E43> \x8A\xC7 |0
-<U3E48> \x89\xD7 |0
-<U3E55> \xFE\x4D |0
-<U3E74> \x9E\xDD |0
-<U3EA8> \xFE\xFB |0
-<U3EA9> \x98\xBC |0
-<U3EAA> \xFA\xCC |0
-<U3EAD> \x95\xB0 |0
-<U3EB1> \x94\x64 |0
-<U3EB8> \x93\x6F |0
-<U3EBF> \x94\xB9 |0
-<U3EC2> \x95\xEC |0
-<U3EC7> \x91\xEE |0
-<U3ECA> \x98\xC3 |0
-<U3ECC> \x95\xF6 |0
-<U3ED0> \x8F\xFD |0
-<U3ED1> \x98\xC5 |0
-<U3ED6> \x97\x66 |0
-<U3ED7> \xFE\x6E |0
-<U3EDA> \x97\xDD |0
-<U3EDE> \x92\xD2 |0
-<U3EE1> \x97\x61 |0
-<U3EE2> \x98\xCB |0
-<U3EE7> \x95\xF0 |0
-<U3EE9> \x97\x5D |0
-<U3EEB> \x91\xE3 |0
-<U3EF0> \x98\xCC |0
-<U3EF3> \x94\x69 |0
-<U3EF4> \x98\xCD |0
-<U3EFA> \x98\xCE |0
-<U3EFC> \x95\xFC |0
-<U3EFF> \x94\xA3 |0
-<U3F00> \x96\x62 |0
-<U3F04> \xFE\xB6 |0
-<U3F06> \x94\x63 |0
-<U3F0E> \x98\xD0 |0
-<U3F53> \x98\xD1 |0
-<U3F58> \x94\x75 |0
-<U3F59> \xFA\xE0 |0
-<U3F63> \x94\x72 |0
-<U3F7C> \x98\xD6 |0
-<U3F93> \x8A\xF0 |0
-<U3FC0> \x98\xD9 |0
-<U3FD7> \x98\xDB |0
-<U3FDC> \x98\xDD |0
-<U3FE5> \x98\xA8 |0
-<U3FED> \x8A\x6D |0
-<U3FF9> \x8A\xFB |0
-<U3FFA> \x8A\xAE |0
-<U4004> \xFB\xC9 |0
-<U401D> \x98\xE4 |0
-<U4039> \x98\xE6 |0
-<U4045> \x98\xE8 |0
-<U4053> \x8A\x4D |0
-<U4057> \x92\x57 |0
-<U4062> \x95\xDF |0
-<U4065> \xA0\xAC |0
-<U406A> \x98\xEB |0
-<U406F> \x98\xEC |0
-<U40A8> \x98\xF4 |0
-<U40BB> \x8A\xB8 |0
-<U40BF> \x9E\xE7 |0
-<U40C8> \x94\xBC |0
-<U40D8> \xFC\xD1 |0
-<U40DF> \x9C\xC6 |0
-<U40FA> \x9E\x7E |0
-<U4103> \x98\xFE |0
-<U4104> \xFD\xE8 |0
-<U4109> \x99\x40 |0
-<U410E> \x94\xC9 |0
-<U4132> \x94\xD3 |0
-<U4167> \x99\x46 |0
-<U416C> \x90\xC0 |0
-<U416E> \x94\xD1 |0
-<U417F> \x95\x73 |0
-<U4190> \x93\xC2 |0
-<U41B2> \x99\x48 |0
-<U41C4> \x99\x4B |0
-<U41CA> \x8E\x55 |0
-<U41CF> \x99\x4E |0
-<U41DB> \x8E\xFE |0
-<U41EF> \x8E\x59 |0
-<U41F9> \x94\xEC |0
-<U4211> \x94\xEF |0
-<U4240> \x8F\x74 |0
-<U4260> \x99\x55 |0
-<U426A> \x95\x44 |0
-<U427A> \x99\x56 |0
-<U428C> \x99\x59 |0
-<U4294> \x99\x5B |0
-<U42B5> \xFA\x45 |0
-<U42B9> \x90\xB7 |0
-<U42BC> \x97\x43 |0
-<U42F4> \x95\xCD |0
-<U42FB> \x97\xC9 |0
-<U42FC> \xFD\x50 |0
-<U432B> \x8E\xB9 |0
-<U436E> \x95\xC6 |0
-<U4397> \x99\x67 |0
-<U43BA> \x8A\xB9 |0
-<U43C1> \x8D\xFC |0
-<U43D9> \x8A\x76 |0
-<U43DF> \x9D\x51 |0
-<U43ED> \x99\x73 |0
-<U43F2> \x9D\x4F |0
-<U4401> \x99\x7A |0
-<U4402> \x95\x64 |0
-<U4413> \x99\xA1 |0
-<U4425> \x99\xA5 |0
-<U442D> \x99\xA7 |0
-<U447A> \x8E\xED |0
-<U448F> \x99\xAD |0
-<U449F> \x94\x6E |0
-<U44A0> \x8F\x70 |0
-<U44A2> \xFA\xD0 |0
-<U44B0> \x99\xB3 |0
-<U44B7> \xA0\x53 |0
-<U44C0> \x96\x5C |0
-<U44C5> \xFD\x7A |0
-<U44CE> \x97\xFE |0
-<U44DD> \x92\xBD |0
-<U44DF> \x97\xFD |0
-<U44E4> \x8F\x64 |0
-<U44E9> \xFC\xF7 |0
-<U44EA> \x95\x62 |0
-<U44EB> \x97\xCD |0
-<U44EC> \x9E\x64 |0
-<U44F4> \x92\x4C |0
-<U4503> \x8E\xC9 |0
-<U4504> \x99\xBC |0
-<U4509> \x9D\xA5 |0
-<U450B> \x8F\x54 |0
-<U4516> \x8F\x7C |0
-<U451D> \x8E\xA2 |0
-<U4527> \x8F\x7A |0
-<U452E> \x97\xAE |0
-<U4533> \x96\xC8 |0
-<U453B> \x99\xC3 |0
-<U453D> \x90\xD6 |0
-<U453F> \x9C\xBE |0
-<U4543> \x8F\x76 |0
-<U4551> \x94\x70 |0
-<U4552> \xFB\x4B |0
-<U4555> \xFD\xCA |0
-<U455C> \x8E\xC7 |0
-<U4562> \xA0\xF9 |0
-<U456A> \x8F\xA9 |0
-<U4577> \x99\xC7 |0
-<U4585> \x90\xD7 |0
-<U45E9> \x9E\xDF |0
-<U4606> \x99\xCE |0
-<U460F> \x8F\xBA |0
-<U4615> \x8F\xEB |0
-<U4617> \x99\xCF |0
-<U465B> \x8F\xC2 |0
-<U467A> \x92\xC9 |0
-<U4680> \x97\xDC |0
-<U46CF> \x95\xB3 |0
-<U46D0> \x9C\x79 |0
-<U46F5> \x95\xB2 |0
-<U4713> \x8F\xDB |0
-<U4718> \x9B\xE3 |0
-<U474E> \x9E\x7A |0
-<U477C> \x9B\xEE |0
-<U4798> \x99\xDE |0
-<U47A6> \xFA\xFA |0
-<U47B6> \x9E\xE5 |0
-<U47D5> \x8A\x52 |0
-<U47ED> \x99\xE1 |0
-<U47F4> \x8A\x67 |0
-<U4800> \x8B\xB5 |0
-<U480B> \x8A\xAC |0
-<U4837> \x99\xE9 |0
-<U485D> \xFB\xCA |0
-<U4871> \x97\xDE |0
-<U489B> \x95\xD1 |0
-<U48AD> \x99\xF5 |0
-<U48AE> \xFC\x4A |0
-<U48D0> \x9B\xA9 |0
-<U48DD> \xFB\xDC |0
-<U48ED> \xFE\x56 |0
-<U48F3> \x9E\xA4 |0
-<U48FA> \x9D\x49 |0
-<U4906> \x95\xDB |0
-<U4911> \x89\xC5 |0
-<U491E> \x99\xF8 |0
-<U4925> \x96\x64 |0
-<U492A> \x90\x55 |0
-<U492D> \x96\xD4 |0
-<U4935> \x97\x7C |0
-<U493C> \x96\x4D |0
-<U493E> \x97\xE1 |0
-<U4945> \x9A\x48 |0
-<U4951> \x9A\x49 |0
-<U4953> \xFE\x7D |0
-<U4965> \x90\xAA |0
-<U496A> \x9A\x50 |0
-<U4972> \x93\x47 |0
-<U4989> \x8E\xD8 |0
-<U49A1> \x90\xC9 |0
-<U49A7> \x9A\x55 |0
-<U49DF> \x90\xBC |0
-<U49E5> \x9A\x58 |0
-<U49E7> \x8B\xB8 |0
-<U4A0F> \x90\xD5 |0
-<U4A1D> \x96\x41 |0
-<U4A24> \x9A\x5A |0
-<U4A35> \x9A\x5C |0
-<U4A96> \x97\xC2 |0
-<U4AB4> \x8A\xBB |0
-<U4AB8> \x9B\xAA |0
-<U4AD1> \x90\xF5 |0
-<U4AE4> \x9A\x60 |0
-<U4AFF> \x91\x45 |0
-<U4B19> \x9A\x63 |0
-<U4B2C> \x8B\xB6 |0
-<U4B37> \xFC\xCF |0
-<U4B6F> \x96\x6B |0
-<U4B70> \x9A\x6E |0
-<U4B72> \x91\x4F |0
-<U4B7B> \x97\x46 |0
-<U4B7E> \xA0\xE6 |0
-<U4B8E> \x92\xD7 |0
-<U4B90> \x96\x75 |0
-<U4B93> \x93\xD4 |0
-<U4B96> \x91\xBB |0
-<U4B97> \x96\x79 |0
-<U4B9D> \x9A\x70 |0
-<U4BBD> \x96\x78 |0
-<U4BBE> \x91\xCD |0
-<U4BC0> \x9C\x4A |0
-<U4C04> \xA0\x6F |0
-<U4C07> \xA0\x6A |0
-<U4C0E> \x91\x5F |0
-<U4C3B> \x9F\xA5 |0
-<U4C3E> \x89\xBA |0
-<U4C5B> \x9E\xCD |0
-<U4C6D> \x9A\x79 |0
-<U4C7D> \x9D\xCE |0
-<U4CA4> \x9D\x73 |0
-<U4CAE> \x96\xB9 |0
-<U4CB0> \x96\xBC |0
-<U4CB7> \x9C\xD1 |0
-<U4CCD> \x89\xB7 |0
-<U4CE1> \x9E\xEE |0
-<U4CED> \xFB\x43 |0
-<U4D09> \x9E\xC9 |0
-<U4D10> \xFB\xD3 |0
-<U4D34> \x91\xAE |0
-<U4D91> \x9D\x78 |0
-<U4D9C> \x9D\x7B |0
-<U4E00> \xA4\x40 |0
-<U4E01> \xA4\x42 |0
-<U4E03> \xA4\x43 |0
-<U4E04> \x9E\xB3 |0
-<U4E07> \xC9\x45 |0
-<U4E08> \xA4\x56 |0
-<U4E09> \xA4\x54 |0
-<U4E0A> \xA4\x57 |0
-<U4E0B> \xA4\x55 |0
-<U4E0C> \xC9\x46 |0
-<U4E0D> \xA4\xA3 |0
-<U4E0E> \xC9\x4F |0
-<U4E0F> \xC9\x4D |0
-<U4E10> \xA4\xA2 |0
-<U4E11> \xA4\xA1 |0
-<U4E14> \xA5\x42 |0
-<U4E15> \xA5\x41 |0
-<U4E16> \xA5\x40 |0
-<U4E18> \xA5\x43 |0
-<U4E19> \xA4\xFE |0
-<U4E1A> \x9E\xB2 |0
-<U4E1C> \x9D\xD6 |0
-<U4E1E> \xA5\xE0 |0
-<U4E1F> \xA5\xE1 |0
-<U4E21> \x99\x4F |0
-<U4E24> \x89\xCE |0
-<U4E26> \xA8\xC3 |0
-<U4E28> \x8B\xC0 |0
-<U4E2A> \x9F\xC4 |0
-<U4E2B> \xA4\x58 |0
-<U4E2C> \x8B\xD4 |0
-<U4E2D> \xA4\xA4 |0
-<U4E2E> \xC9\x50 |0
-<U4E30> \xA4\xA5 |0
-<U4E31> \xC9\x63 |0
-<U4E32> \xA6\xEA |0
-<U4E33> \xCB\xB1 |0
-<U4E36> \xC6\xBF |0
-<U4E37> \x8B\xF9 |0
-<U4E38> \xA4\x59 |0
-<U4E39> \xA4\xA6 |0
-<U4E3B> \xA5\x44 |0
-<U4E3C> \xC9\x64 |0
-<U4E3D> \x89\x46 |0
-<U4E3F> \xC6\xC0 |0
-<U4E42> \xC9\x40 |0
-<U4E43> \xA4\x44 |0
-<U4E45> \xA4\x5B |0
-<U4E47> \xC9\x47 |0
-<U4E48> \xA4\x5C |0
-<U4E49> \xFA\xE5 |0
-<U4E4B> \xA4\xA7 |0
-<U4E4D> \xA5\x45 |0
-<U4E4E> \xA5\x47 |0
-<U4E4F> \xA5\x46 |0
-<U4E52> \xA5\xE2 |0
-<U4E53> \xA5\xE3 |0
-<U4E56> \xA8\xC4 |0
-<U4E58> \xAD\xBC |0
-<U4E59> \xA4\x41 |0
-<U4E5A> \xC8\x7B |0
-<U4E5B> \x8B\xC6 |0
-<U4E5C> \xC9\x41 |0
-<U4E5D> \xA4\x45 |0
-<U4E5E> \xA4\x5E |0
-<U4E5F> \xA4\x5D |0
-<U4E69> \xA5\xE4 |0
-<U4E6A> \x9C\x57 |0
-<U4E73> \xA8\xC5 |0
-<U4E78> \x9A\xFB |0
-<U4E7E> \xB0\xAE |0
-<U4E7F> \xD4\x4B |0
-<U4E80> \x89\xD0 |0
-<U4E81> \x89\xCF |0
-<U4E82> \xB6\xC3 |0
-<U4E83> \xDC\xB1 |0
-<U4E84> \xDC\xB2 |0
-<U4E85> \xC6\xC1 |0
-<U4E86> \xA4\x46 |0
-<U4E87> \x89\xD1 |0
-<U4E88> \xA4\xA9 |0
-<U4E89> \x89\xE2 |0
-<U4E8B> \xA8\xC6 |0
-<U4E8C> \xA4\x47 |0
-<U4E8D> \xC9\x48 |0
-<U4E8E> \xA4\x5F |0
-<U4E91> \xA4\xAA |0
-<U4E92> \xA4\xAC |0
-<U4E93> \xC9\x51 |0
-<U4E94> \xA4\xAD |0
-<U4E95> \xA4\xAB |0
-<U4E98> \x92\x7E |0
-<U4E99> \xA5\xE5 |0
-<U4E9A> \x9D\xBA |0
-<U4E9B> \xA8\xC7 |0
-<U4E9E> \xA8\xC8 |0
-<U4E9F> \xAB\x45 |0
-<U4EA0> \xC6\xC2 |0
-<U4EA1> \xA4\x60 |0
-<U4EA2> \xA4\xAE |0
-<U4EA4> \xA5\xE6 |0
-<U4EA5> \xA5\xE8 |0
-<U4EA6> \xA5\xE7 |0
-<U4EA8> \xA6\xEB |0
-<U4EAB> \xA8\xC9 |0
-<U4EAC> \xA8\xCA |0
-<U4EAD> \xAB\x46 |0
-<U4EAE> \xAB\x47 |0
-<U4EB3> \xAD\xBD |0
-<U4EB6> \xDC\xB3 |0
-<U4EB7> \xFB\xF8 |0
-<U4EB9> \xF6\xD6 |0
-<U4EBA> \xA4\x48 |0
-<U4EBB> \x8B\xC7 |0
-<U4EBC> \x92\x6B |0
-<U4EBF> \x89\xD2 |0
-<U4EC0> \xA4\xB0 |0
-<U4EC1> \xA4\xAF |0
-<U4EC2> \xC9\x52 |0
-<U4EC3> \xA4\xB1 |0
-<U4EC4> \xA4\xB7 |0
-<U4EC6> \xA4\xB2 |0
-<U4EC7> \xA4\xB3 |0
-<U4EC8> \xC9\x54 |0
-<U4EC9> \xC9\x53 |0
-<U4ECA> \xA4\xB5 |0
-<U4ECB> \xA4\xB6 |0
-<U4ECD> \xA4\xB4 |0
-<U4ECE> \x9F\xCF |0
-<U4ED4> \xA5\x4A |0
-<U4ED5> \xA5\x4B |0
-<U4ED6> \xA5\x4C |0
-<U4ED7> \xA5\x4D |0
-<U4ED8> \xA5\x49 |0
-<U4ED9> \xA5\x50 |0
-<U4EDA> \xC9\x6A |0
-<U4EDC> \xC9\x66 |0
-<U4EDD> \xC9\x69 |0
-<U4EDE> \xA5\x51 |0
-<U4EDF> \xA5\x61 |0
-<U4EE1> \xC9\x68 |0
-<U4EE3> \xA5\x4E |0
-<U4EE4> \xA5\x4F |0
-<U4EE5> \xA5\x48 |0
-<U4EE8> \xC9\x65 |0
-<U4EE9> \xC9\x67 |0
-<U4EEA> \x9D\xA9 |0
-<U4EEB> \x89\xD3 |0
-<U4EEE> \x99\xE2 |0
-<U4EF0> \xA5\xF5 |0
-<U4EF1> \xC9\xB0 |0
-<U4EF2> \xA5\xF2 |0
-<U4EF3> \xA5\xF6 |0
-<U4EF4> \xC9\xBA |0
-<U4EF5> \xC9\xAE |0
-<U4EF6> \xA5\xF3 |0
-<U4EF7> \xC9\xB2 |0
-<U4EF8> \x92\x67 |0
-<U4EFB> \xA5\xF4 |0
-<U4EFD> \xA5\xF7 |0
-<U4EFF> \xA5\xE9 |0
-<U4F00> \xC9\xB1 |0
-<U4F01> \xA5\xF8 |0
-<U4F02> \xC9\xB5 |0
-<U4F03> \x92\xA4 |0
-<U4F04> \xC9\xB9 |0
-<U4F05> \xC9\xB6 |0
-<U4F08> \xC9\xB3 |0
-<U4F09> \xA5\xEA |0
-<U4F0A> \xA5\xEC |0
-<U4F0B> \xA5\xF9 |0
-<U4F0D> \xA5\xEE |0
-<U4F0E> \xC9\xAB |0
-<U4F0F> \xA5\xF1 |0
-<U4F10> \xA5\xEF |0
-<U4F11> \xA5\xF0 |0
-<U4F12> \xC9\xBB |0
-<U4F13> \xC9\xB8 |0
-<U4F14> \xC9\xAF |0
-<U4F15> \xA5\xED |0
-<U4F18> \xC9\xAC |0
-<U4F19> \xA5\xEB |0
-<U4F1A> \x89\x4E |0
-<U4F1D> \xC9\xB4 |0
-<U4F22> \xC9\xB7 |0
-<U4F28> \x89\x4F |0
-<U4F29> \x92\x78 |0
-<U4F2C> \xC9\xAD |0
-<U4F2D> \xCA\x66 |0
-<U4F2F> \xA7\x42 |0
-<U4F30> \xA6\xF4 |0
-<U4F32> \x91\xB6 |0
-<U4F33> \xCA\x67 |0
-<U4F34> \xA6\xF1 |0
-<U4F36> \xA7\x44 |0
-<U4F37> \x89\xD4 |0
-<U4F38> \xA6\xF9 |0
-<U4F39> \x9F\xD2 |0
-<U4F3A> \xA6\xF8 |0
-<U4F3B> \xCA\x5B |0
-<U4F3C> \xA6\xFC |0
-<U4F3D> \xA6\xF7 |0
-<U4F3E> \xCA\x60 |0
-<U4F3F> \xCA\x68 |0
-<U4F41> \xCA\x64 |0
-<U4F42> \x92\xA7 |0
-<U4F43> \xA6\xFA |0
-<U4F45> \x95\xA2 |0
-<U4F46> \xA6\xFD |0
-<U4F47> \xA6\xEE |0
-<U4F48> \xA7\x47 |0
-<U4F49> \xCA\x5D |0
-<U4F4B> \x92\x6E |0
-<U4F4C> \xCB\xBD |0
-<U4F4D> \xA6\xEC |0
-<U4F4E> \xA7\x43 |0
-<U4F4F> \xA6\xED |0
-<U4F50> \xA6\xF5 |0
-<U4F51> \xA6\xF6 |0
-<U4F52> \xCA\x62 |0
-<U4F53> \xCA\x5E |0
-<U4F54> \xA6\xFB |0
-<U4F55> \xA6\xF3 |0
-<U4F56> \xCA\x5A |0
-<U4F57> \xA6\xEF |0
-<U4F58> \xCA\x65 |0
-<U4F59> \xA7\x45 |0
-<U4F5A> \xA7\x48 |0
-<U4F5B> \xA6\xF2 |0
-<U4F5C> \xA7\x40 |0
-<U4F5D> \xA7\x46 |0
-<U4F5E> \xA6\xF0 |0
-<U4F5F> \xCA\x63 |0
-<U4F60> \xA7\x41 |0
-<U4F61> \xCA\x69 |0
-<U4F62> \xCA\x5C |0
-<U4F63> \xA6\xFE |0
-<U4F64> \xCA\x5F |0
-<U4F67> \xCA\x61 |0
-<U4F69> \xA8\xD8 |0
-<U4F6A> \xCB\xBF |0
-<U4F6B> \xCB\xCB |0
-<U4F6C> \xA8\xD0 |0
-<U4F6E> \xCB\xCC |0
-<U4F6F> \xA8\xCB |0
-<U4F70> \xA8\xD5 |0
-<U4F72> \x96\xEA |0
-<U4F73> \xA8\xCE |0
-<U4F74> \xCB\xB9 |0
-<U4F75> \xA8\xD6 |0
-<U4F76> \xCB\xB8 |0
-<U4F77> \xCB\xBC |0
-<U4F78> \xCB\xC3 |0
-<U4F79> \xCB\xC1 |0
-<U4F7A> \xA8\xDE |0
-<U4F7B> \xA8\xD9 |0
-<U4F7C> \xCB\xB3 |0
-<U4F7D> \xCB\xB5 |0
-<U4F7E> \xA8\xDB |0
-<U4F7F> \xA8\xCF |0
-<U4F80> \xCB\xB6 |0
-<U4F81> \xCB\xC2 |0
-<U4F82> \xCB\xC9 |0
-<U4F83> \xA8\xD4 |0
-<U4F84> \xCB\xBB |0
-<U4F85> \xCB\xB4 |0
-<U4F86> \xA8\xD3 |0
-<U4F87> \xCB\xB7 |0
-<U4F88> \xA8\xD7 |0
-<U4F89> \xCB\xBA |0
-<U4F8A> \x92\x6F |0
-<U4F8B> \xA8\xD2 |0
-<U4F8D> \xA8\xCD |0
-<U4F8F> \xA8\xDC |0
-<U4F90> \xCB\xC4 |0
-<U4F91> \xA8\xDD |0
-<U4F92> \xCB\xC8 |0
-<U4F94> \xCB\xC6 |0
-<U4F95> \xCB\xCA |0
-<U4F96> \xA8\xDA |0
-<U4F97> \xCB\xBE |0
-<U4F98> \xCB\xB2 |0
-<U4F9A> \xCB\xC0 |0
-<U4F9B> \xA8\xD1 |0
-<U4F9C> \xCB\xC5 |0
-<U4F9D> \xA8\xCC |0
-<U4F9E> \xCB\xC7 |0
-<U4FA2> \x92\xA3 |0
-<U4FA8> \x89\x50 |0
-<U4FAB> \xFA\x57 |0
-<U4FAE> \xAB\x56 |0
-<U4FAF> \xAB\x4A |0
-<U4FB0> \x98\x66 |0
-<U4FB2> \xCD\xE0 |0
-<U4FB3> \xCD\xE8 |0
-<U4FB5> \xAB\x49 |0
-<U4FB6> \xAB\x51 |0
-<U4FB7> \xAB\x5D |0
-<U4FB9> \xCD\xEE |0
-<U4FBA> \xCD\xEC |0
-<U4FBB> \xCD\xE7 |0
-<U4FBD> \x89\xD6 |0
-<U4FBF> \xAB\x4B |0
-<U4FC0> \xCD\xED |0
-<U4FC1> \xCD\xE3 |0
-<U4FC2> \xAB\x59 |0
-<U4FC3> \xAB\x50 |0
-<U4FC4> \xAB\x58 |0
-<U4FC5> \xCD\xDE |0
-<U4FC7> \xCD\xEA |0
-<U4FC8> \x98\xB2 |0
-<U4FC9> \xCD\xE1 |0
-<U4FCA> \xAB\x54 |0
-<U4FCB> \xCD\xE2 |0
-<U4FCC> \x92\xAB |0
-<U4FCD> \xCD\xDD |0
-<U4FCE> \xAB\x5B |0
-<U4FCF> \xAB\x4E |0
-<U4FD0> \xAB\x57 |0
-<U4FD1> \xAB\x4D |0
-<U4FD3> \xCD\xDF |0
-<U4FD4> \xCD\xE4 |0
-<U4FD6> \xCD\xEB |0
-<U4FD7> \xAB\x55 |0
-<U4FD8> \xAB\x52 |0
-<U4FD9> \xCD\xE6 |0
-<U4FDA> \xAB\x5A |0
-<U4FDB> \xCD\xE9 |0
-<U4FDC> \xCD\xE5 |0
-<U4FDD> \xAB\x4F |0
-<U4FDE> \xAB\x5C |0
-<U4FDF> \xAB\x53 |0
-<U4FE0> \xAB\x4C |0
-<U4FE1> \xAB\x48 |0
-<U4FE4> \x96\xDE |0
-<U4FE5> \x92\xAC |0
-<U4FEC> \xCD\xEF |0
-<U4FEE> \xAD\xD7 |0
-<U4FEF> \xAD\xC1 |0
-<U4FF1> \xAD\xD1 |0
-<U4FF2> \x9F\x6E |0
-<U4FF3> \xAD\xD6 |0
-<U4FF4> \xD0\xD0 |0
-<U4FF5> \xD0\xCF |0
-<U4FF6> \xD0\xD4 |0
-<U4FF7> \xD0\xD5 |0
-<U4FF8> \xAD\xC4 |0
-<U4FF9> \x8E\xF2 |0
-<U4FFA> \xAD\xCD |0
-<U4FFD> \x9F\x6C |0
-<U4FFE> \xAD\xDA |0
-<U5000> \xAD\xCE |0
-<U5003> \x89\xD8 |0
-<U5005> \xD0\xC9 |0
-<U5006> \xAD\xC7 |0
-<U5007> \xD0\xCA |0
-<U5008> \xFA\x59 |0
-<U5009> \xAD\xDC |0
-<U500B> \xAD\xD3 |0
-<U500C> \xAD\xBE |0
-<U500D> \xAD\xBF |0
-<U500E> \xD0\xDD |0
-<U500F> \xB0\xBF |0
-<U5011> \xAD\xCC |0
-<U5012> \xAD\xCB |0
-<U5013> \xD0\xCB |0
-<U5014> \xAD\xCF |0
-<U5015> \xD4\x5B |0
-<U5016> \xAD\xC6 |0
-<U5017> \xD0\xD6 |0
-<U5018> \xAD\xD5 |0
-<U5019> \xAD\xD4 |0
-<U501A> \xAD\xCA |0
-<U501B> \xD0\xCE |0
-<U501C> \xD0\xD7 |0
-<U501E> \xD0\xC8 |0
-<U501F> \xAD\xC9 |0
-<U5020> \xD0\xD8 |0
-<U5021> \xAD\xD2 |0
-<U5022> \xD0\xCC |0
-<U5023> \xAD\xC0 |0
-<U5025> \xAD\xC3 |0
-<U5026> \xAD\xC2 |0
-<U5027> \xD0\xD9 |0
-<U5028> \xAD\xD0 |0
-<U5029> \xAD\xC5 |0
-<U502A> \xAD\xD9 |0
-<U502B> \xAD\xDB |0
-<U502C> \xD0\xD3 |0
-<U502D> \xAD\xD8 |0
-<U502E> \x92\xA8 |0
-<U502F> \xD0\xDB |0
-<U5030> \xD0\xCD |0
-<U5031> \xD0\xDC |0
-<U5033> \xD0\xD1 |0
-<U5034> \x91\x63 |0
-<U5035> \xD0\xDA |0
-<U5037> \xD0\xD2 |0
-<U503C> \xAD\xC8 |0
-<U5040> \xD4\x63 |0
-<U5041> \xD4\x57 |0
-<U5043> \xB0\xB3 |0
-<U5045> \xD4\x5C |0
-<U5046> \xD4\x62 |0
-<U5047> \xB0\xB2 |0
-<U5048> \xD4\x55 |0
-<U5049> \xB0\xB6 |0
-<U504A> \xD4\x59 |0
-<U504B> \xD4\x52 |0
-<U504C> \xB0\xB4 |0
-<U504D> \xD4\x56 |0
-<U504E> \xB0\xB9 |0
-<U504F> \xB0\xBE |0
-<U5051> \xD4\x67 |0
-<U5053> \xD4\x51 |0
-<U5055> \xB0\xBA |0
-<U5056> \x9F\x73 |0
-<U5057> \xD4\x66 |0
-<U5058> \x92\xAD |0
-<U505A> \xB0\xB5 |0
-<U505B> \xD4\x58 |0
-<U505C> \xB0\xB1 |0
-<U505D> \xD4\x53 |0
-<U505E> \xD4\x4F |0
-<U505F> \xD4\x5D |0
-<U5060> \xD4\x50 |0
-<U5061> \xD4\x4E |0
-<U5062> \xD4\x5A |0
-<U5063> \xD4\x60 |0
-<U5064> \xD4\x61 |0
-<U5065> \xB0\xB7 |0
-<U5066> \x9B\xE9 |0
-<U5068> \xD8\x5B |0
-<U5069> \xD4\x5E |0
-<U506A> \xD4\x4D |0
-<U506B> \xD4\x5F |0
-<U506C> \x92\xA9 |0
-<U506D> \xB0\xC1 |0
-<U506E> \xD4\x64 |0
-<U506F> \xB0\xC0 |0
-<U5070> \xD4\x4C |0
-<U5072> \xD4\x54 |0
-<U5073> \xD4\x65 |0
-<U5074> \xB0\xBC |0
-<U5075> \xB0\xBB |0
-<U5076> \xB0\xB8 |0
-<U5077> \xB0\xBD |0
-<U507A> \xB0\xAF |0
-<U507D> \xB0\xB0 |0
-<U5080> \xB3\xC8 |0
-<U5081> \x92\xAA |0
-<U5082> \xD8\x5E |0
-<U5083> \xD8\x57 |0
-<U5085> \xB3\xC5 |0
-<U5087> \xD8\x5F |0
-<U5088> \x89\xD9 |0
-<U508B> \xD8\x55 |0
-<U508C> \xD8\x58 |0
-<U508D> \xB3\xC4 |0
-<U508E> \xD8\x59 |0
-<U5090> \xFD\x56 |0
-<U5091> \xB3\xC7 |0
-<U5092> \xD8\x5D |0
-<U5094> \xD8\x53 |0
-<U5095> \xD8\x52 |0
-<U5096> \xB3\xC9 |0
-<U5098> \xB3\xCA |0
-<U5099> \xB3\xC6 |0
-<U509A> \xB3\xCB |0
-<U509B> \xD8\x51 |0
-<U509C> \xD8\x5C |0
-<U509D> \xD8\x5A |0
-<U509E> \xD8\x54 |0
-<U50A2> \xB3\xC3 |0
-<U50A3> \xD8\x56 |0
-<U50A6> \x9F\xA8 |0
-<U50AC> \xB6\xCA |0
-<U50AD> \xB6\xC4 |0
-<U50AE> \xDC\xB7 |0
-<U50AF> \xB6\xCD |0
-<U50B0> \xDC\xBD |0
-<U50B1> \xDC\xC0 |0
-<U50B2> \xB6\xC6 |0
-<U50B3> \xB6\xC7 |0
-<U50B4> \xDC\xBA |0
-<U50B5> \xB6\xC5 |0
-<U50B6> \xDC\xC3 |0
-<U50B7> \xB6\xCB |0
-<U50B8> \xDC\xC4 |0
-<U50BA> \xDC\xBF |0
-<U50BB> \xB6\xCC |0
-<U50BD> \xDC\xB4 |0
-<U50BE> \xB6\xC9 |0
-<U50BF> \xDC\xB5 |0
-<U50C1> \xDC\xBE |0
-<U50C2> \xDC\xBC |0
-<U50C4> \xDC\xB8 |0
-<U50C5> \xB6\xC8 |0
-<U50C6> \xDC\xB6 |0
-<U50C7> \xB6\xCE |0
-<U50C8> \xDC\xBB |0
-<U50C9> \xDC\xC2 |0
-<U50CA> \xDC\xB9 |0
-<U50CB> \xDC\xC1 |0
-<U50CD> \x92\xA1 |0
-<U50CE> \xB9\xB6 |0
-<U50CF> \xB9\xB3 |0
-<U50D0> \x90\xE3 |0
-<U50D1> \xB9\xB4 |0
-<U50D3> \xE0\xF9 |0
-<U50D4> \xE0\xF1 |0
-<U50D5> \xB9\xB2 |0
-<U50D6> \xB9\xAF |0
-<U50D7> \xE0\xF2 |0
-<U50D9> \xA0\xA6 |0
-<U50DA> \xB9\xB1 |0
-<U50DB> \xE0\xF5 |0
-<U50DD> \xE0\xF7 |0
-<U50DF> \x94\xAB |0
-<U50E0> \xE0\xFE |0
-<U50E1> \xFC\x72 |0
-<U50E3> \xE0\xFD |0
-<U50E4> \xE0\xF8 |0
-<U50E5> \xB9\xAE |0
-<U50E6> \xE0\xF0 |0
-<U50E7> \xB9\xAC |0
-<U50E8> \xE0\xF3 |0
-<U50E9> \xB9\xB7 |0
-<U50EA> \xE0\xF6 |0
-<U50EC> \xE0\xFA |0
-<U50ED> \xB9\xB0 |0
-<U50EE> \xB9\xAD |0
-<U50EF> \xE0\xFC |0
-<U50F0> \xE0\xFB |0
-<U50F1> \xB9\xB5 |0
-<U50F3> \xE0\xF4 |0
-<U50F4> \x97\xC4 |0
-<U50F5> \xBB\xF8 |0
-<U50F6> \xE4\xEC |0
-<U50F8> \xE4\xE9 |0
-<U50F9> \xBB\xF9 |0
-<U50FB> \xBB\xF7 |0
-<U50FC> \x92\xAE |0
-<U50FD> \xE4\xF0 |0
-<U50FE> \xE4\xED |0
-<U50FF> \xE4\xE6 |0
-<U5100> \xBB\xF6 |0
-<U5101> \xFA\x67 |0
-<U5102> \xBB\xFA |0
-<U5103> \xE4\xE7 |0
-<U5104> \xBB\xF5 |0
-<U5105> \xBB\xFD |0
-<U5106> \xE4\xEA |0
-<U5107> \xE4\xEB |0
-<U5108> \xBB\xFB |0
-<U5109> \xBB\xFC |0
-<U510A> \xE4\xF1 |0
-<U510B> \xE4\xEE |0
-<U510C> \xE4\xEF |0
-<U510D> \x92\xA2 |0
-<U510E> \xFA\x69 |0
-<U5110> \xBE\xAA |0
-<U5111> \xE8\xF8 |0
-<U5112> \xBE\xA7 |0
-<U5113> \xE8\xF5 |0
-<U5114> \xBE\xA9 |0
-<U5115> \xBE\xAB |0
-<U5117> \xE8\xF6 |0
-<U5118> \xBE\xA8 |0
-<U511A> \xE8\xF7 |0
-<U511C> \xE8\xF4 |0
-<U511F> \xC0\x76 |0
-<U5120> \xEC\xBD |0
-<U5121> \xC0\x77 |0
-<U5122> \xEC\xBB |0
-<U5124> \xEC\xBC |0
-<U5125> \xEC\xBA |0
-<U5126> \xEC\xB9 |0
-<U5129> \xEC\xBE |0
-<U512A> \xC0\x75 |0
-<U512B> \x92\x68 |0
-<U512D> \xEF\xB8 |0
-<U512E> \xEF\xB9 |0
-<U5130> \xE4\xE8 |0
-<U5131> \xEF\xB7 |0
-<U5132> \xC0\x78 |0
-<U5133> \xC3\x5F |0
-<U5134> \xF1\xEB |0
-<U5135> \xF1\xEC |0
-<U5137> \xC4\xD7 |0
-<U5138> \xC4\xD8 |0
-<U5139> \xF5\xC1 |0
-<U513A> \xF5\xC0 |0
-<U513B> \xC5\x6C |0
-<U513C> \xC5\x6B |0
-<U513D> \xF7\xD0 |0
-<U513F> \xA4\x49 |0
-<U5140> \xA4\x61 |0
-<U5141> \xA4\xB9 |0
-<U5143> \xA4\xB8 |0
-<U5144> \xA5\x53 |0
-<U5145> \xA5\x52 |0
-<U5146> \xA5\xFC |0
-<U5147> \xA5\xFB |0
-<U5148> \xA5\xFD |0
-<U5149> \xA5\xFA |0
-<U514B> \xA7\x4A |0
-<U514C> \xA7\x49 |0
-<U514D> \xA7\x4B |0
-<U5152> \xA8\xE0 |0
-<U5154> \xA8\xDF |0
-<U5155> \xA8\xE1 |0
-<U5156> \x89\x51 |0
-<U5157> \xAB\x5E |0
-<U5159> \xA2\x59 |0
-<U515A> \xD0\xDE |0
-<U515B> \xA2\x5A |0
-<U515C> \xB0\xC2 |0
-<U515D> \xA2\x5C |0
-<U515E> \xA2\x5B |0
-<U515F> \xD8\x60 |0
-<U5160> \xFA\x6F |0
-<U5161> \xA2\x5D |0
-<U5162> \xB9\xB8 |0
-<U5163> \xA2\x5E |0
-<U5165> \xA4\x4A |0
-<U5167> \xA4\xBA |0
-<U5168> \xA5\xFE |0
-<U5169> \xA8\xE2 |0
-<U516A> \xFA\x71 |0
-<U516B> \xA4\x4B |0
-<U516C> \xA4\xBD |0
-<U516D> \xA4\xBB |0
-<U516E> \xA4\xBC |0
-<U5171> \xA6\x40 |0
-<U5174> \x89\x52 |0
-<U5175> \xA7\x4C |0
-<U5176> \xA8\xE4 |0
-<U5177> \xA8\xE3 |0
-<U5178> \xA8\xE5 |0
-<U5179> \x94\x5A |0
-<U517C> \xAD\xDD |0
-<U5180> \xBE\xAC |0
-<U5182> \xC6\xC3 |0
-<U5186> \x89\xDD |0
-<U5187> \xC9\x4E |0
-<U5188> \xC8\xA2 |0
-<U5189> \xA5\x54 |0
-<U518A> \xA5\x55 |0
-<U518D> \xA6\x41 |0
-<U518F> \xCA\x6A |0
-<U5191> \xAB\x60 |0
-<U5192> \xAB\x5F |0
-<U5193> \xD0\xE0 |0
-<U5194> \xD0\xDF |0
-<U5195> \xB0\xC3 |0
-<U5196> \xC6\xC4 |0
-<U5197> \xA4\xBE |0
-<U5198> \xC9\x55 |0
-<U519A> \x9E\x52 |0
-<U519C> \x89\x53 |0
-<U519E> \xCB\xCD |0
-<U51A0> \xAB\x61 |0
-<U51A2> \xAD\xE0 |0
-<U51A4> \xAD\xDE |0
-<U51A5> \xAD\xDF |0
-<U51A7> \x9E\x55 |0
-<U51A8> \x92\xBA |0
-<U51AA> \xBE\xAD |0
-<U51AB> \xC6\xC5 |0
-<U51AC> \xA5\x56 |0
-<U51B0> \xA6\x42 |0
-<U51B1> \xC9\xBC |0
-<U51B2> \xFA\x7D |0
-<U51B3> \xFA\xA8 |0
-<U51B4> \x9A\x68 |0
-<U51B5> \xFA\x47 |0
-<U51B6> \xA7\x4D |0
-<U51B7> \xA7\x4E |0
-<U51B8> \xFA\x7E |0
-<U51B9> \xCA\x6B |0
-<U51BC> \xCB\xCE |0
-<U51BD> \xA8\xE6 |0
-<U51BE> \xCB\xCF |0
-<U51C3> \x92\xBB |0
-<U51C4> \xD0\xE2 |0
-<U51C5> \xD0\xE3 |0
-<U51C6> \xAD\xE3 |0
-<U51C7> \xFD\xB6 |0
-<U51C8> \xD0\xE4 |0
-<U51C9> \xFA\xA2 |0
-<U51CA> \xD0\xE1 |0
-<U51CB> \xAD\xE4 |0
-<U51CC> \xAD\xE2 |0
-<U51CD> \xAD\xE1 |0
-<U51CE> \xD0\xE5 |0
-<U51CF> \xFA\xA3 |0
-<U51D0> \xD4\x68 |0
-<U51D1> \xFA\xA4 |0
-<U51D2> \x9B\xB4 |0
-<U51D3> \xFA\xA6 |0
-<U51D4> \xD8\x61 |0
-<U51D7> \xDC\xC5 |0
-<U51D8> \xE1\x40 |0
-<U51DB> \x89\xDF |0
-<U51DC> \xBB\xFE |0
-<U51DD> \xBE\xAE |0
-<U51DE> \xE8\xF9 |0
-<U51DF> \xFD\xDB |0
-<U51E0> \xA4\x4C |0
-<U51E1> \xA4\x5A |0
-<U51E2> \xFA\xA9 |0
-<U51E4> \x89\x54 |0
-<U51ED> \xFA\xAB |0
-<U51F0> \xB0\xC4 |0
-<U51F1> \xB3\xCD |0
-<U51F3> \xB9\xB9 |0
-<U51F4> \xFC\x7A |0
-<U51F5> \xC9\x42 |0
-<U51F6> \xA4\xBF |0
-<U51F8> \xA5\x59 |0
-<U51F9> \xA5\x57 |0
-<U51FA> \xA5\x58 |0
-<U51FC> \x89\xE0 |0
-<U51FD> \xA8\xE7 |0
-<U51FE> \x9F\x4F |0
-<U5200> \xA4\x4D |0
-<U5201> \xA4\x4E |0
-<U5202> \xC8\x7D |0
-<U5203> \xA4\x62 |0
-<U5205> \x89\xE1 |0
-<U5206> \xA4\xC0 |0
-<U5207> \xA4\xC1 |0
-<U5208> \xA4\xC2 |0
-<U5209> \xC9\xBE |0
-<U520A> \xA5\x5A |0
-<U520B> \xFA\xB0 |0
-<U520C> \xC9\x6B |0
-<U520E> \xA6\x46 |0
-<U5210> \xC9\xBF |0
-<U5211> \xA6\x44 |0
-<U5212> \xA6\x45 |0
-<U5213> \xC9\xBD |0
-<U5216> \xA6\x47 |0
-<U5217> \xA6\x43 |0
-<U521C> \xCA\x6C |0
-<U521D> \xAA\xEC |0
-<U521E> \xCA\x6D |0
-<U521F> \x9F\xCD |0
-<U5220> \xA0\xE7 |0
-<U5221> \xCA\x6E |0
-<U5224> \xA7\x50 |0
-<U5225> \xA7\x4F |0
-<U5226> \xFA\xB1 |0
-<U5227> \x89\xA6 |0
-<U5228> \xA7\x53 |0
-<U5229> \xA7\x51 |0
-<U522A> \xA7\x52 |0
-<U522E> \xA8\xED |0
-<U5230> \xA8\xEC |0
-<U5231> \xCB\xD4 |0
-<U5232> \xCB\xD1 |0
-<U5233> \xCB\xD2 |0
-<U5234> \x9E\xFA |0
-<U5235> \xCB\xD0 |0
-<U5236> \xA8\xEE |0
-<U5237> \xA8\xEA |0
-<U5238> \xA8\xE9 |0
-<U523A> \xA8\xEB |0
-<U523B> \xA8\xE8 |0
-<U523C> \xFA\xB2 |0
-<U5241> \xA8\xEF |0
-<U5243> \xAB\x63 |0
-<U5244> \xCD\xF0 |0
-<U5246> \xCB\xD3 |0
-<U5247> \xAB\x68 |0
-<U5249> \xCD\xF1 |0
-<U524A> \xAB\x64 |0
-<U524B> \xAB\x67 |0
-<U524C> \xAB\x66 |0
-<U524D> \xAB\x65 |0
-<U524E> \xAB\x62 |0
-<U5252> \xD0\xE8 |0
-<U5254> \xAD\xE7 |0
-<U5255> \xD0\xEB |0
-<U5256> \xAD\xE5 |0
-<U5257> \xFA\xB4 |0
-<U5259> \x92\xC4 |0
-<U525A> \xD0\xE7 |0
-<U525B> \xAD\xE8 |0
-<U525C> \xAD\xE6 |0
-<U525D> \xAD\xE9 |0
-<U525E> \xD0\xE9 |0
-<U525F> \xD0\xEA |0
-<U5260> \x9F\x6F |0
-<U5261> \xD0\xE6 |0
-<U5262> \xD0\xEC |0
-<U5268> \x8B\xB0 |0
-<U5269> \xB3\xD1 |0
-<U526A> \xB0\xC5 |0
-<U526B> \xD4\x69 |0
-<U526C> \xD4\x6B |0
-<U526D> \xD4\x6A |0
-<U526E> \xD4\x6C |0
-<U526F> \xB0\xC6 |0
-<U5272> \xB3\xCE |0
-<U5273> \x9F\xAC |0
-<U5274> \xB3\xCF |0
-<U5275> \xB3\xD0 |0
-<U5277> \xB6\xD0 |0
-<U5278> \xDC\xC7 |0
-<U5279> \x89\xE3 |0
-<U527A> \xDC\xC6 |0
-<U527B> \xDC\xC8 |0
-<U527C> \xDC\xC9 |0
-<U527D> \xB6\xD1 |0
-<U527F> \xB6\xCF |0
-<U5280> \xE1\x41 |0
-<U5281> \xE1\x42 |0
-<U5282> \xB9\xBB |0
-<U5283> \xB9\xBA |0
-<U5284> \xE3\x5A |0
-<U5287> \xBC\x40 |0
-<U5288> \xBC\x41 |0
-<U5289> \xBC\x42 |0
-<U528A> \xBC\x44 |0
-<U528B> \xE4\xF2 |0
-<U528C> \xE4\xF3 |0
-<U528D> \xBC\x43 |0
-<U528F> \x9B\xD3 |0
-<U5290> \x89\xE4 |0
-<U5291> \xBE\xAF |0
-<U5293> \xBE\xB0 |0
-<U5294> \xFA\xB5 |0
-<U5296> \xF1\xED |0
-<U5297> \xF5\xC3 |0
-<U5298> \xF5\xC2 |0
-<U5299> \xF7\xD1 |0
-<U529A> \x9F\xD5 |0
-<U529B> \xA4\x4F |0
-<U529F> \xA5\x5C |0
-<U52A0> \xA5\x5B |0
-<U52A1> \x89\x55 |0
-<U52A3> \xA6\x48 |0
-<U52A4> \x92\xC5 |0
-<U52A6> \xC9\xC0 |0
-<U52A8> \x89\x56 |0
-<U52A9> \xA7\x55 |0
-<U52AA> \xA7\x56 |0
-<U52AB> \xA7\x54 |0
-<U52AC> \xA7\x57 |0
-<U52AD> \xCA\x6F |0
-<U52AE> \xCA\x70 |0
-<U52B5> \xFA\xB3 |0
-<U52B9> \xFA\xB6 |0
-<U52BB> \xA8\xF1 |0
-<U52BC> \xCB\xD5 |0
-<U52BE> \xA8\xF0 |0
-<U52C0> \xCD\xF2 |0
-<U52C1> \xAB\x6C |0
-<U52C2> \xCD\xF3 |0
-<U52C3> \xAB\x6B |0
-<U52C5> \xFA\xB7 |0
-<U52C7> \xAB\x69 |0
-<U52C9> \xAB\x6A |0
-<U52CC> \x9E\xDC |0
-<U52CD> \xD0\xED |0
-<U52D0> \xFB\xC4 |0
-<U52D1> \x9F\x71 |0
-<U52D2> \xB0\xC7 |0
-<U52D3> \xD4\x6E |0
-<U52D5> \xB0\xCA |0
-<U52D6> \xD4\x6D |0
-<U52D7> \xB1\xE5 |0
-<U52D8> \xB0\xC9 |0
-<U52D9> \xB0\xC8 |0
-<U52DB> \xB3\xD4 |0
-<U52DD> \xB3\xD3 |0
-<U52DE> \xB3\xD2 |0
-<U52DF> \xB6\xD2 |0
-<U52E0> \xFA\xBA |0
-<U52E1> \x92\xC7 |0
-<U52E2> \xB6\xD5 |0
-<U52E3> \xB6\xD6 |0
-<U52E4> \xB6\xD4 |0
-<U52E6> \xB6\xD3 |0
-<U52E9> \xE1\x43 |0
-<U52EB> \xE1\x44 |0
-<U52EF> \xE4\xF5 |0
-<U52F0> \xBC\x45 |0
-<U52F1> \xE4\xF4 |0
-<U52F3> \xBE\xB1 |0
-<U52F4> \xEC\xBF |0
-<U52F5> \xC0\x79 |0
-<U52F7> \xF1\xEE |0
-<U52F8> \xC4\x55 |0
-<U52F9> \xC6\xC6 |0
-<U52FA> \xA4\x63 |0
-<U52FB> \xA4\xC3 |0
-<U52FC> \xC9\x56 |0
-<U52FE> \xA4\xC4 |0
-<U52FF> \xA4\xC5 |0
-<U5301> \x9A\x4C |0
-<U5305> \xA5\x5D |0
-<U5306> \xA5\x5E |0
-<U5308> \xA6\x49 |0
-<U5309> \xCA\x71 |0
-<U530A> \xCB\xD6 |0
-<U530B> \xCB\xD7 |0
-<U530D> \xAB\x6D |0
-<U530E> \xD0\xEE |0
-<U530F> \xB0\xCC |0
-<U5310> \xB0\xCB |0
-<U5311> \xD8\x63 |0
-<U5312> \xD8\x62 |0
-<U5315> \xA4\x50 |0
-<U5316> \xA4\xC6 |0
-<U5317> \xA5\x5F |0
-<U5319> \xB0\xCD |0
-<U531A> \xC9\x43 |0
-<U531C> \xC9\x6C |0
-<U531D> \xA5\x60 |0
-<U531F> \xC9\xC2 |0
-<U5320> \xA6\x4B |0
-<U5321> \xA6\x4A |0
-<U5322> \xC9\xC1 |0
-<U5323> \xA7\x58 |0
-<U5327> \x89\xE5 |0
-<U532A> \xAD\xEA |0
-<U532C> \x9F\x7D |0
-<U532D> \xD4\x6F |0
-<U532F> \xB6\xD7 |0
-<U5330> \xE1\x45 |0
-<U5331> \xB9\xBC |0
-<U5332> \xA0\xA9 |0
-<U5333> \xFA\xC4 |0
-<U5334> \xE8\xFA |0
-<U5337> \xF3\xFD |0
-<U5338> \xC6\xC7 |0
-<U5339> \xA4\xC7 |0
-<U533B> \x89\x57 |0
-<U533C> \xCB\xD8 |0
-<U533D> \xCD\xF4 |0
-<U533E> \xB0\xD0 |0
-<U533F> \xB0\xCE |0
-<U5340> \xB0\xCF |0
-<U5341> \xA4\x51 |0
-<U5342> \xFA\xAA |0
-<U5343> \xA4\x64 |0
-<U5344> \xA2\xCD |0
-<U5345> \xA4\xCA |0
-<U5347> \xA4\xC9 |0
-<U5348> \xA4\xC8 |0
-<U5349> \xA5\x63 |0
-<U534A> \xA5\x62 |0
-<U534C> \xC9\x6D |0
-<U534D> \xC9\xC3 |0
-<U534E> \x89\x58 |0
-<U5351> \xA8\xF5 |0
-<U5352> \xA8\xF2 |0
-<U5353> \xA8\xF4 |0
-<U5354> \xA8\xF3 |0
-<U5357> \xAB\x6E |0
-<U535A> \xB3\xD5 |0
-<U535C> \xA4\x52 |0
-<U535D> \x8B\xE3 |0
-<U535E> \xA4\xCB |0
-<U535F> \x8B\x61 |0
-<U5360> \xA5\x65 |0
-<U5361> \xA5\x64 |0
-<U5363> \xCA\x72 |0
-<U5364> \x9A\xF1 |0
-<U5366> \xA8\xF6 |0
-<U5367> \x9E\xB7 |0
-<U5369> \xC6\xC8 |0
-<U536C> \xC9\x57 |0
-<U536D> \xFA\xD1 |0
-<U536E> \xA5\x67 |0
-<U536F> \xA5\x66 |0
-<U5370> \xA6\x4C |0
-<U5371> \xA6\x4D |0
-<U5372> \xCA\x73 |0
-<U5373> \xA7\x59 |0
-<U5374> \xFA\xD2 |0
-<U5375> \xA7\x5A |0
-<U5377> \xA8\xF7 |0
-<U5378> \xA8\xF8 |0
-<U5379> \xA8\xF9 |0
-<U537B> \xAB\x6F |0
-<U537C> \xCD\xF5 |0
-<U537D> \x9E\xBA |0
-<U537E> \xFA\xD4 |0
-<U537F> \xAD\xEB |0
-<U5382> \xC9\x44 |0
-<U5384> \xA4\xCC |0
-<U538A> \xC9\xC4 |0
-<U538E> \xCA\x74 |0
-<U538F> \xCA\x75 |0
-<U5392> \xCB\xD9 |0
-<U5393> \xFA\xD9 |0
-<U5394> \xCB\xDA |0
-<U5396> \xCD\xF7 |0
-<U5397> \xCD\xF6 |0
-<U5398> \xCD\xF9 |0
-<U5399> \xCD\xF8 |0
-<U539A> \xAB\x70 |0
-<U539C> \xD4\x70 |0
-<U539D> \xAD\xED |0
-<U539E> \xD0\xEF |0
-<U539F> \xAD\xEC |0
-<U53A0> \xFA\xDB |0
-<U53A2> \x9C\xE0 |0
-<U53A4> \xD8\x64 |0
-<U53A5> \xB3\xD6 |0
-<U53A6> \xFB\xF7 |0
-<U53A7> \xD8\x65 |0
-<U53A8> \xFB\xFA |0
-<U53A9> \x89\xE7 |0
-<U53AA> \xA0\x7A |0
-<U53AB> \xFA\xDC |0
-<U53AC> \xE1\x46 |0
-<U53AD> \xB9\xBD |0
-<U53AE> \xFA\xDD |0
-<U53B0> \x89\xE9 |0
-<U53B2> \xBC\x46 |0
-<U53B4> \xF1\xEF |0
-<U53B6> \xC6\xC9 |0
-<U53B9> \xC9\x58 |0
-<U53BB> \xA5\x68 |0
-<U53C1> \xFA\xE2 |0
-<U53C2> \x89\xEB |0
-<U53C3> \xB0\xD1 |0
-<U53C5> \xFA\xE3 |0
-<U53C8> \xA4\x53 |0
-<U53C9> \xA4\x65 |0
-<U53CA> \xA4\xCE |0
-<U53CB> \xA4\xCD |0
-<U53CC> \x90\xC8 |0
-<U53CD> \xA4\xCF |0
-<U53D0> \x92\xDA |0
-<U53D1> \x89\x59 |0
-<U53D2> \x9C\xF5 |0
-<U53D4> \xA8\xFB |0
-<U53D6> \xA8\xFA |0
-<U53D7> \xA8\xFC |0
-<U53D8> \x89\x5A |0
-<U53D9> \xFA\xE7 |0
-<U53DA> \x9F\xA2 |0
-<U53DB> \xAB\x71 |0
-<U53DF> \xAD\xEE |0
-<U53E0> \xFA\xEA |0
-<U53E1> \xE8\xFB |0
-<U53E2> \xC2\x4F |0
-<U53E3> \xA4\x66 |0
-<U53E4> \xA5\x6A |0
-<U53E5> \xA5\x79 |0
-<U53E6> \xA5\x74 |0
-<U53E8> \xA5\x6F |0
-<U53E9> \xA5\x6E |0
-<U53EA> \xA5\x75 |0
-<U53EB> \xA5\x73 |0
-<U53EC> \xA5\x6C |0
-<U53ED> \xA5\x7A |0
-<U53EE> \xA5\x6D |0
-<U53EF> \xA5\x69 |0
-<U53F0> \xA5\x78 |0
-<U53F1> \xA5\x77 |0
-<U53F2> \xA5\x76 |0
-<U53F3> \xA5\x6B |0
-<U53F5> \xA5\x72 |0
-<U53F6> \xFA\xED |0
-<U53F7> \x8F\xAD |0
-<U53F8> \xA5\x71 |0
-<U53FB> \xA5\x7B |0
-<U53FC> \xA5\x70 |0
-<U53FE> \xFB\x59 |0
-<U5401> \xA6\x53 |0
-<U5403> \xA6\x59 |0
-<U5404> \xA6\x55 |0
-<U5406> \xA6\x5B |0
-<U5407> \xC9\xC5 |0
-<U5408> \xA6\x58 |0
-<U5409> \xA6\x4E |0
-<U540A> \xA6\x51 |0
-<U540B> \xA6\x54 |0
-<U540C> \xA6\x50 |0
-<U540D> \xA6\x57 |0
-<U540E> \xA6\x5A |0
-<U540F> \xA6\x4F |0
-<U5410> \xA6\x52 |0
-<U5411> \xA6\x56 |0
-<U5412> \xA6\x5C |0
-<U5413> \xFA\xEF |0
-<U5414> \x96\xEF |0
-<U5416> \x9D\xEC |0
-<U5418> \xCA\x7E |0
-<U5419> \xCA\x7B |0
-<U541A> \x9D\xCA |0
-<U541B> \xA7\x67 |0
-<U541C> \xCA\x7C |0
-<U541D> \xA7\x5B |0
-<U541E> \xA7\x5D |0
-<U541F> \xA7\x75 |0
-<U5420> \xA7\x70 |0
-<U5421> \xFD\x6D |0
-<U5423> \x89\xEC |0
-<U5424> \xCA\xA5 |0
-<U5425> \xCA\x7D |0
-<U5426> \xA7\x5F |0
-<U5427> \xA7\x61 |0
-<U5428> \xCA\xA4 |0
-<U5429> \xA7\x68 |0
-<U542A> \xCA\x78 |0
-<U542B> \xA7\x74 |0
-<U542C> \xA7\x76 |0
-<U542D> \xA7\x5C |0
-<U542E> \xA7\x6D |0
-<U542F> \xFB\x44 |0
-<U5430> \xCA\x76 |0
-<U5431> \xA7\x73 |0
-<U5432> \x9D\xE2 |0
-<U5433> \xA7\x64 |0
-<U5435> \xA7\x6E |0
-<U5436> \xA7\x6F |0
-<U5437> \xCA\x77 |0
-<U5438> \xA7\x6C |0
-<U5439> \xA7\x6A |0
-<U543B> \xA7\x6B |0
-<U543C> \xA7\x71 |0
-<U543D> \xCA\xA1 |0
-<U543E> \xA7\x5E |0
-<U5440> \xA7\x72 |0
-<U5441> \xCA\xA3 |0
-<U5442> \xA7\x66 |0
-<U5443> \xA7\x63 |0
-<U5445> \xCA\x7A |0
-<U5446> \xA7\x62 |0
-<U5447> \xCA\xA6 |0
-<U5448> \xA7\x65 |0
-<U544A> \xA7\x69 |0
-<U544B> \x9E\xC0 |0
-<U544D> \x9E\x56 |0
-<U544E> \xA7\x60 |0
-<U544F> \xCA\xA2 |0
-<U5454> \xCA\x79 |0
-<U5460> \xCB\xEB |0
-<U5461> \xCB\xEA |0
-<U5462> \xA9\x4F |0
-<U5463> \xCB\xED |0
-<U5464> \xCB\xEF |0
-<U5465> \xCB\xE4 |0
-<U5466> \xCB\xE7 |0
-<U5467> \xCB\xEE |0
-<U5468> \xA9\x50 |0
-<U5469> \x9F\x79 |0
-<U546A> \x9A\xC7 |0
-<U546B> \xCB\xE1 |0
-<U546C> \xCB\xE5 |0
-<U546D> \xFA\xF4 |0
-<U546F> \xCB\xE9 |0
-<U5470> \xCE\x49 |0
-<U5471> \xA9\x4B |0
-<U5472> \xCE\x4D |0
-<U5473> \xA8\xFD |0
-<U5474> \xCB\xE6 |0
-<U5475> \xA8\xFE |0
-<U5476> \xA9\x4C |0
-<U5477> \xA9\x45 |0
-<U5478> \xA9\x41 |0
-<U547A> \xCB\xE2 |0
-<U547B> \xA9\x44 |0
-<U547C> \xA9\x49 |0
-<U547D> \xA9\x52 |0
-<U547E> \xCB\xE3 |0
-<U547F> \xCB\xDC |0
-<U5480> \xA9\x43 |0
-<U5481> \xCB\xDD |0
-<U5482> \xCB\xDF |0
-<U5484> \xA9\x46 |0
-<U5485> \x98\xA1 |0
-<U5486> \xA9\x48 |0
-<U5487> \xCB\xDB |0
-<U5488> \xCB\xE0 |0
-<U548B> \xA9\x51 |0
-<U548C> \xA9\x4D |0
-<U548D> \xCB\xE8 |0
-<U548E> \xA9\x53 |0
-<U548F> \xFA\xF8 |0
-<U5490> \xA9\x4A |0
-<U5491> \xCB\xDE |0
-<U5492> \xA9\x47 |0
-<U5493> \x89\xF0 |0
-<U5494> \x9E\x47 |0
-<U5495> \xA9\x42 |0
-<U5496> \xA9\x40 |0
-<U5497> \x9D\xF7 |0
-<U5498> \xCB\xEC |0
-<U549A> \xA9\x4E |0
-<U549C> \x9F\xD3 |0
-<U549E> \x9A\xCA |0
-<U54A0> \xCE\x48 |0
-<U54A1> \xCD\xFB |0
-<U54A2> \xCE\x4B |0
-<U54A3> \x89\xF1 |0
-<U54A4> \xFA\xF9 |0
-<U54A5> \xCD\xFD |0
-<U54A6> \xAB\x78 |0
-<U54A7> \xAB\xA8 |0
-<U54A8> \xAB\x74 |0
-<U54A9> \xAB\xA7 |0
-<U54AA> \xAB\x7D |0
-<U54AB> \xAB\xA4 |0
-<U54AC> \xAB\x72 |0
-<U54AD> \xCD\xFC |0
-<U54AE> \xCE\x43 |0
-<U54AF> \xAB\xA3 |0
-<U54B0> \xCE\x4F |0
-<U54B1> \xAB\xA5 |0
-<U54B2> \x8E\x5A |0
-<U54B3> \xAB\x79 |0
-<U54B4> \x89\xF2 |0
-<U54B6> \xCE\x45 |0
-<U54B7> \xCE\x42 |0
-<U54B8> \xAB\x77 |0
-<U54B9> \x89\xF3 |0
-<U54BA> \xCD\xFA |0
-<U54BB> \xAB\xA6 |0
-<U54BC> \xCE\x4A |0
-<U54BD> \xAB\x7C |0
-<U54BE> \xCE\x4C |0
-<U54BF> \xAB\xA9 |0
-<U54C0> \xAB\x73 |0
-<U54C1> \xAB\x7E |0
-<U54C2> \xAB\x7B |0
-<U54C3> \xCE\x40 |0
-<U54C4> \xAB\xA1 |0
-<U54C5> \xCE\x46 |0
-<U54C6> \xCE\x47 |0
-<U54C7> \xAB\x7A |0
-<U54C8> \xAB\xA2 |0
-<U54C9> \xAB\x76 |0
-<U54CB> \x92\x5D |0
-<U54CC> \x8B\x51 |0
-<U54CD> \x92\xE0 |0
-<U54CE> \xAB\x75 |0
-<U54CF> \xCD\xFE |0
-<U54D0> \x89\xF4 |0
-<U54D6> \xCE\x44 |0
-<U54DA> \x9F\xD4 |0
-<U54DE> \xCE\x4E |0
-<U54E0> \xD1\x44 |0
-<U54E1> \xAD\xFB |0
-<U54E2> \xD0\xF1 |0
-<U54E3> \x8A\x79 |0
-<U54E4> \xD0\xF6 |0
-<U54E5> \xAD\xF4 |0
-<U54E6> \xAE\x40 |0
-<U54E7> \xD0\xF4 |0
-<U54E8> \xAD\xEF |0
-<U54E9> \xAD\xF9 |0
-<U54EA> \xAD\xFE |0
-<U54EB> \xD0\xFB |0
-<U54ED> \xAD\xFA |0
-<U54EE> \xAD\xFD |0
-<U54EF> \x89\xF5 |0
-<U54F1> \xD0\xFE |0
-<U54F2> \xAD\xF5 |0
-<U54F3> \xD0\xF5 |0
-<U54F7> \xD1\x42 |0
-<U54F8> \xD1\x43 |0
-<U54FA> \xAD\xF7 |0
-<U54FB> \xD1\x41 |0
-<U54FC> \xAD\xF3 |0
-<U54FD> \xAE\x43 |0
-<U54FF> \xD0\xF8 |0
-<U5501> \xAD\xF1 |0
-<U5502> \x97\xA7 |0
-<U5503> \xD1\x46 |0
-<U5504> \xD0\xF9 |0
-<U5505> \xD0\xFD |0
-<U5506> \xAD\xF6 |0
-<U5507> \xAE\x42 |0
-<U5508> \xD0\xFA |0
-<U5509> \xAD\xFC |0
-<U550A> \xD1\x40 |0
-<U550B> \xD1\x47 |0
-<U550C> \xD4\xA1 |0
-<U550D> \x93\xBA |0
-<U550E> \xD1\x45 |0
-<U550F> \xAE\x44 |0
-<U5510> \xAD\xF0 |0
-<U5511> \xD0\xFC |0
-<U5512> \xD0\xF3 |0
-<U5513> \x9E\x58 |0
-<U5514> \xAD\xF8 |0
-<U5517> \xD0\xF2 |0
-<U5518> \x89\xF6 |0
-<U551A> \xD0\xF7 |0
-<U551E> \x9E\x57 |0
-<U5523> \x89\xF7 |0
-<U5525> \x8A\x41 |0
-<U5526> \xD0\xF0 |0
-<U5527> \xAE\x41 |0
-<U5528> \x89\xF8 |0
-<U552A> \xD4\x77 |0
-<U552B> \xFA\xF1 |0
-<U552C> \xB0\xE4 |0
-<U552D> \xD4\xA7 |0
-<U552E> \xB0\xE2 |0
-<U552F> \xB0\xDF |0
-<U5530> \xD4\x7C |0
-<U5531> \xB0\xDB |0
-<U5532> \xD4\xA2 |0
-<U5533> \xB0\xE6 |0
-<U5534> \xD4\x76 |0
-<U5535> \xD4\x7B |0
-<U5536> \xD4\x7A |0
-<U5537> \xAD\xF2 |0
-<U5538> \xB0\xE1 |0
-<U5539> \xD4\xA5 |0
-<U553B> \xD4\xA8 |0
-<U553C> \xD4\x73 |0
-<U553E> \xB3\xE8 |0
-<U553F> \x89\xFA |0
-<U5540> \xD4\xA9 |0
-<U5541> \xB0\xE7 |0
-<U5543> \xB0\xD9 |0
-<U5544> \xB0\xD6 |0
-<U5545> \xD4\x7E |0
-<U5546> \xB0\xD3 |0
-<U5547> \xFB\x42 |0
-<U5548> \xD4\xA6 |0
-<U5549> \xFA\xBF |0
-<U554A> \xB0\xDA |0
-<U554B> \xD4\xAA |0
-<U554D> \xD4\x74 |0
-<U554E> \xD4\xA4 |0
-<U554F> \xB0\xDD |0
-<U5550> \xD4\x75 |0
-<U5551> \xD4\x78 |0
-<U5552> \xD4\x7D |0
-<U5553> \xFB\xA3 |0
-<U5555> \xB0\xDE |0
-<U5556> \xB0\xDC |0
-<U5557> \xB0\xE8 |0
-<U555C> \xB0\xE3 |0
-<U555D> \xFA\xF7 |0
-<U555E> \xB0\xD7 |0
-<U555F> \xB1\xD2 |0
-<U5561> \xB0\xD8 |0
-<U5562> \xD4\x79 |0
-<U5563> \xB0\xE5 |0
-<U5564> \xB0\xE0 |0
-<U5565> \xD4\xA3 |0
-<U5566> \xB0\xD5 |0
-<U5569> \x9E\x4E |0
-<U556A> \xB0\xD4 |0
-<U556B> \x94\xDC |0
-<U5571> \x95\xDA |0
-<U5572> \x9D\xF8 |0
-<U5573> \x9F\x6A |0
-<U5575> \xD4\x71 |0
-<U5576> \xD4\x72 |0
-<U5577> \xD8\x6A |0
-<U5579> \x8A\xB7 |0
-<U557B> \xB3\xD7 |0
-<U557C> \xB3\xDA |0
-<U557D> \xD8\x75 |0
-<U557E> \xB3\xEE |0
-<U557F> \xD8\x78 |0
-<U5580> \xB3\xD8 |0
-<U5581> \xD8\x71 |0
-<U5582> \xB3\xDE |0
-<U5583> \xB3\xE4 |0
-<U5584> \xB5\xBD |0
-<U5586> \xFB\x46 |0
-<U5587> \xB3\xE2 |0
-<U5588> \xD8\x6E |0
-<U5589> \xB3\xEF |0
-<U558A> \xB3\xDB |0
-<U558B> \xB3\xE3 |0
-<U558C> \xD8\x76 |0
-<U558D> \xDC\xD7 |0
-<U558E> \xD8\x7B |0
-<U558F> \xD8\x6F |0
-<U5590> \x8A\x46 |0
-<U5591> \xD8\x66 |0
-<U5592> \xD8\x73 |0
-<U5593> \xD8\x6D |0
-<U5594> \xB3\xE1 |0
-<U5595> \xD8\x79 |0
-<U5598> \xB3\xDD |0
-<U5599> \xB3\xF1 |0
-<U559A> \xB3\xEA |0
-<U559C> \xB3\xDF |0
-<U559D> \xB3\xDC |0
-<U559F> \xB3\xE7 |0
-<U55A1> \xD8\x7A |0
-<U55A2> \xD8\x6C |0
-<U55A3> \xD8\x72 |0
-<U55A4> \xD8\x74 |0
-<U55A5> \xD8\x68 |0
-<U55A6> \xD8\x77 |0
-<U55A7> \xB3\xD9 |0
-<U55A8> \xD8\x67 |0
-<U55A9> \xFB\x47 |0
-<U55AA> \xB3\xE0 |0
-<U55AB> \xB3\xF0 |0
-<U55AC> \xB3\xEC |0
-<U55AD> \xD8\x69 |0
-<U55AE> \xB3\xE6 |0
-<U55B0> \x91\x48 |0
-<U55B1> \xB3\xED |0
-<U55B2> \xB3\xE9 |0
-<U55B3> \xB3\xE5 |0
-<U55B4> \x92\xDE |0
-<U55B5> \xD8\x70 |0
-<U55B9> \x8B\x53 |0
-<U55BA> \x9D\xF6 |0
-<U55BB> \xB3\xEB |0
-<U55BC> \x9B\xDA |0
-<U55BF> \xDC\xD5 |0
-<U55C0> \xDC\xD1 |0
-<U55C1> \x9D\x7E |0
-<U55C2> \xDC\xE0 |0
-<U55C3> \xDC\xCA |0
-<U55C4> \xDC\xD3 |0
-<U55C5> \xB6\xE5 |0
-<U55C6> \xB6\xE6 |0
-<U55C7> \xB6\xDE |0
-<U55C8> \xDC\xDC |0
-<U55C9> \xB6\xE8 |0
-<U55CA> \xDC\xCF |0
-<U55CB> \xDC\xCE |0
-<U55CC> \xDC\xCC |0
-<U55CD> \xDC\xDE |0
-<U55CE> \xB6\xDC |0
-<U55CF> \xDC\xD8 |0
-<U55D0> \xDC\xCD |0
-<U55D1> \xB6\xDF |0
-<U55D2> \xDC\xD6 |0
-<U55D3> \xB6\xDA |0
-<U55D4> \xDC\xD2 |0
-<U55D5> \xDC\xD9 |0
-<U55D6> \xDC\xDB |0
-<U55D7> \x89\xFD |0
-<U55D8> \x99\xE4 |0
-<U55D9> \xDC\xDF |0
-<U55DA> \xB6\xE3 |0
-<U55DB> \xDC\xCB |0
-<U55DC> \xB6\xDD |0
-<U55DD> \xDC\xD0 |0
-<U55DE> \x9E\x43 |0
-<U55DF> \xB6\xD8 |0
-<U55E1> \xB6\xE4 |0
-<U55E2> \xDC\xDA |0
-<U55E3> \xB6\xE0 |0
-<U55E4> \xB6\xE1 |0
-<U55E5> \xB6\xE7 |0
-<U55E6> \xB6\xDB |0
-<U55E7> \xA2\x5F |0
-<U55E8> \xB6\xD9 |0
-<U55E9> \xDC\xD4 |0
-<U55EA> \x9D\xE9 |0
-<U55EC> \x8F\x52 |0
-<U55EF> \xB6\xE2 |0
-<U55F0> \x9D\xF5 |0
-<U55F1> \x9D\xF0 |0
-<U55F2> \xDC\xDD |0
-<U55F5> \x99\xE7 |0
-<U55F6> \xB9\xCD |0
-<U55F7> \xB9\xC8 |0
-<U55F9> \xE1\x55 |0
-<U55FA> \xE1\x51 |0
-<U55FB> \x8B\xBD |0
-<U55FC> \xE1\x4B |0
-<U55FD> \xB9\xC2 |0
-<U55FE> \xB9\xBE |0
-<U55FF> \xE1\x54 |0
-<U5600> \xB9\xBF |0
-<U5601> \xE1\x4E |0
-<U5602> \xE1\x50 |0
-<U5604> \xE1\x53 |0
-<U5605> \x9D\xEF |0
-<U5606> \xB9\xC4 |0
-<U5608> \xB9\xCB |0
-<U5609> \xB9\xC5 |0
-<U560C> \xE1\x49 |0
-<U560D> \xB9\xC6 |0
-<U560E> \xB9\xC7 |0
-<U560F> \xE1\x4C |0
-<U5610> \xB9\xCC |0
-<U5611> \x9F\xB7 |0
-<U5612> \xE1\x4A |0
-<U5613> \xE1\x4F |0
-<U5614> \xB9\xC3 |0
-<U5615> \xE1\x48 |0
-<U5616> \xB9\xC9 |0
-<U5617> \xB9\xC1 |0
-<U561B> \xB9\xC0 |0
-<U561C> \xE1\x4D |0
-<U561D> \xE1\x52 |0
-<U561E> \x9D\xD0 |0
-<U561F> \xB9\xCA |0
-<U5620> \x9F\xEB |0
-<U5621> \x8D\xA9 |0
-<U5622> \x9D\xCF |0
-<U5623> \x98\xE1 |0
-<U5625> \x9D\xE5 |0
-<U5627> \xE1\x47 |0
-<U5629> \xBC\x4D |0
-<U562A> \xE5\x47 |0
-<U562C> \xE5\x44 |0
-<U562D> \x9D\xC8 |0
-<U562E> \xBC\x47 |0
-<U562F> \xBC\x53 |0
-<U5630> \xBC\x54 |0
-<U5632> \xBC\x4A |0
-<U5633> \xE5\x42 |0
-<U5634> \xBC\x4C |0
-<U5635> \xE4\xF9 |0
-<U5636> \xBC\x52 |0
-<U5637> \xFB\x4F |0
-<U5638> \xE5\x46 |0
-<U5639> \xBC\x49 |0
-<U563A> \xE5\x48 |0
-<U563B> \xBC\x48 |0
-<U563D> \xE5\x43 |0
-<U563E> \xE5\x45 |0
-<U563F> \xBC\x4B |0
-<U5640> \xE5\x41 |0
-<U5641> \xE4\xFA |0
-<U5642> \xE4\xF7 |0
-<U5643> \x9D\xEB |0
-<U5645> \xD8\x6B |0
-<U5646> \xE4\xFD |0
-<U5648> \xE4\xF6 |0
-<U5649> \xE4\xFC |0
-<U564A> \xE4\xFB |0
-<U564C> \xE4\xF8 |0
-<U564D> \xFB\x54 |0
-<U564E> \xBC\x4F |0
-<U564F> \xFB\x55 |0
-<U5650> \x9A\xA2 |0
-<U5652> \x8A\xD6 |0
-<U5653> \xBC\x4E |0
-<U5654> \x9A\x5F |0
-<U5657> \xBC\x50 |0
-<U5658> \xE4\xFE |0
-<U5659> \xBE\xB2 |0
-<U565A> \xE5\x40 |0
-<U565D> \x9E\xF5 |0
-<U565E> \xE9\x45 |0
-<U5660> \xE8\xFD |0
-<U5661> \x8F\xB7 |0
-<U5662> \xBE\xBE |0
-<U5663> \xE9\x42 |0
-<U5664> \xBE\xB6 |0
-<U5665> \xBE\xBA |0
-<U5666> \xE9\x41 |0
-<U5668> \xBE\xB9 |0
-<U5669> \xBE\xB5 |0
-<U566A> \xBE\xB8 |0
-<U566B> \xBE\xB3 |0
-<U566C> \xBE\xBD |0
-<U566D> \xE9\x43 |0
-<U566E> \xE8\xFE |0
-<U566F> \xBE\xBC |0
-<U5670> \xE8\xFC |0
-<U5671> \xBE\xBB |0
-<U5672> \xE9\x44 |0
-<U5673> \xE9\x40 |0
-<U5674> \xBC\x51 |0
-<U5676> \xBE\xBF |0
-<U5677> \xE9\x46 |0
-<U5678> \xBE\xB7 |0
-<U5679> \xBE\xB4 |0
-<U567A> \x9A\xD2 |0
-<U567B> \x9E\x6A |0
-<U567C> \x9E\xE8 |0
-<U567E> \xEC\xC6 |0
-<U567F> \xEC\xC8 |0
-<U5680> \xC0\x7B |0
-<U5681> \xEC\xC9 |0
-<U5682> \xEC\xC7 |0
-<U5683> \xEC\xC5 |0
-<U5684> \xEC\xC4 |0
-<U5685> \xC0\x7D |0
-<U5686> \xEC\xC3 |0
-<U5687> \xC0\x7E |0
-<U5689> \x8B\xBF |0
-<U568A> \x91\xC2 |0
-<U568B> \x9D\x62 |0
-<U568C> \xEC\xC1 |0
-<U568D> \xEC\xC2 |0
-<U568E> \xC0\x7A |0
-<U568F> \xC0\xA1 |0
-<U5690> \xC0\x7C |0
-<U5692> \x92\x60 |0
-<U5693> \xEC\xC0 |0
-<U5695> \xC2\x50 |0
-<U5697> \xEF\xBC |0
-<U5698> \xEF\xBA |0
-<U5699> \xEF\xBF |0
-<U569A> \xEF\xBD |0
-<U569C> \xEF\xBB |0
-<U569D> \xEF\xBE |0
-<U569E> \x92\x5E |0
-<U569F> \x91\xC1 |0
-<U56A1> \x8A\xC5 |0
-<U56A4> \x97\xA3 |0
-<U56A5> \xC3\x60 |0
-<U56A6> \xF1\xF2 |0
-<U56A7> \xF1\xF3 |0
-<U56A8> \xC4\x56 |0
-<U56AA> \xF1\xF4 |0
-<U56AB> \xF1\xF0 |0
-<U56AC> \xF1\xF5 |0
-<U56AD> \xF1\xF1 |0
-<U56AE> \xC2\x51 |0
-<U56AF> \x8B\x6C |0
-<U56B1> \x8D\x7E |0
-<U56B2> \xF3\xFE |0
-<U56B3> \xF4\x41 |0
-<U56B4> \xC4\x59 |0
-<U56B5> \xF4\x40 |0
-<U56B6> \xC4\x58 |0
-<U56B7> \xC4\x57 |0
-<U56B9> \x9C\x54 |0
-<U56BC> \xC4\x5A |0
-<U56BD> \xF5\xC5 |0
-<U56BE> \xF5\xC6 |0
-<U56BF> \x9D\xBD |0
-<U56C0> \xC4\xDA |0
-<U56C1> \xC4\xD9 |0
-<U56C2> \xC4\xDB |0
-<U56C3> \xF5\xC4 |0
-<U56C5> \xF6\xD8 |0
-<U56C6> \xF6\xD7 |0
-<U56C8> \xC5\x6D |0
-<U56C9> \xC5\x6F |0
-<U56CA> \xC5\x6E |0
-<U56CB> \xF6\xD9 |0
-<U56CC> \xC5\xC8 |0
-<U56CD> \xF8\xA6 |0
-<U56D1> \xC5\xF1 |0
-<U56D3> \xF8\xA5 |0
-<U56D4> \xF8\xEE |0
-<U56D6> \x9C\xC5 |0
-<U56D7> \xC9\x49 |0
-<U56DA> \xA5\x7D |0
-<U56DB> \xA5\x7C |0
-<U56DD> \xA6\x5F |0
-<U56DE> \xA6\x5E |0
-<U56DF> \xC9\xC7 |0
-<U56E0> \xA6\x5D |0
-<U56E1> \xC9\xC6 |0
-<U56E2> \x89\x5B |0
-<U56E4> \xA7\x79 |0
-<U56E5> \xCA\xA9 |0
-<U56E7> \xCA\xA8 |0
-<U56EA> \xA7\x77 |0
-<U56EB> \xA7\x7A |0
-<U56ED> \xFB\x5C |0
-<U56EE> \xCA\xA7 |0
-<U56EF> \xFB\x5B |0
-<U56F0> \xA7\x78 |0
-<U56F1> \xFB\x57 |0
-<U56F7> \xCB\xF0 |0
-<U56F9> \xCB\xF1 |0
-<U56FA> \xA9\x54 |0
-<U56FD> \x98\xC7 |0
-<U56FF> \xAB\xAA |0
-<U5700> \xFB\x5A |0
-<U5701> \xD1\x48 |0
-<U5702> \xD1\x49 |0
-<U5703> \xAE\x45 |0
-<U5704> \xAE\x46 |0
-<U5707> \xD4\xAC |0
-<U5708> \xB0\xE9 |0
-<U5709> \xB0\xEB |0
-<U570A> \xD4\xAB |0
-<U570B> \xB0\xEA |0
-<U570C> \xD8\x7C |0
-<U570D> \xB3\xF2 |0
-<U5712> \xB6\xE9 |0
-<U5713> \xB6\xEA |0
-<U5714> \xDC\xE1 |0
-<U5715> \x9C\xEE |0
-<U5716> \xB9\xCF |0
-<U5718> \xB9\xCE |0
-<U571A> \xE5\x49 |0
-<U571B> \xE9\x48 |0
-<U571C> \xE9\x47 |0
-<U571D> \x92\xE2 |0
-<U571E> \xF9\x6B |0
-<U571F> \xA4\x67 |0
-<U5720> \xC9\x59 |0
-<U5722> \xC9\x6E |0
-<U5723> \xC9\x6F |0
-<U5728> \xA6\x62 |0
-<U5729> \xA6\x66 |0
-<U572A> \xC9\xC9 |0
-<U572C> \xA6\x64 |0
-<U572D> \xA6\x63 |0
-<U572E> \xC9\xC8 |0
-<U572F> \xA6\x65 |0
-<U5730> \xA6\x61 |0
-<U5732> \x94\xA7 |0
-<U5733> \xA6\x60 |0
-<U5734> \xC9\xCA |0
-<U573B> \xA7\xA6 |0
-<U573E> \xA7\xA3 |0
-<U573F> \x9B\xD4 |0
-<U5740> \xA7\x7D |0
-<U5741> \xCA\xAA |0
-<U5742> \xFB\x64 |0
-<U5743> \xFB\x76 |0
-<U5745> \xCA\xAB |0
-<U5746> \xFB\x60 |0
-<U5747> \xA7\xA1 |0
-<U5749> \xCA\xAD |0
-<U574A> \xA7\x7B |0
-<U574B> \xCA\xAE |0
-<U574C> \xCA\xAC |0
-<U574D> \xA7\x7E |0
-<U574E> \xA7\xA2 |0
-<U574F> \xA7\xA5 |0
-<U5750> \xA7\xA4 |0
-<U5751> \xA7\x7C |0
-<U5752> \xCA\xAF |0
-<U5754> \x99\xE5 |0
-<U5757> \x9A\xC2 |0
-<U575B> \x91\xFB |0
-<U575F> \xA0\x73 |0
-<U5761> \xA9\x59 |0
-<U5762> \xCB\xFE |0
-<U5764> \xA9\x5B |0
-<U5766> \xA9\x5A |0
-<U5767> \x9F\x72 |0
-<U5768> \xCC\x40 |0
-<U5769> \xA9\x58 |0
-<U576A> \xA9\x57 |0
-<U576B> \xCB\xF5 |0
-<U576D> \xCB\xF4 |0
-<U576F> \xCB\xF2 |0
-<U5770> \xCB\xF7 |0
-<U5771> \xCB\xF6 |0
-<U5772> \xCB\xF3 |0
-<U5773> \xCB\xFC |0
-<U5774> \xCB\xFD |0
-<U5775> \xCB\xFA |0
-<U5776> \xCB\xF8 |0
-<U5777> \xA9\x56 |0
-<U577A> \x9F\xCC |0
-<U577B> \xCB\xFB |0
-<U577C> \xA9\x5C |0
-<U577D> \xCC\x41 |0
-<U577E> \x98\xA5 |0
-<U577F> \x92\xE8 |0
-<U5780> \xCB\xF9 |0
-<U5782> \xAB\xAB |0
-<U5783> \xA9\x55 |0
-<U5788> \x9B\xBC |0
-<U578A> \x96\xF3 |0
-<U578B> \xAB\xAC |0
-<U578C> \xCE\x54 |0
-<U578D> \x92\xE7 |0
-<U578F> \xCE\x5A |0
-<U5790> \xFC\x67 |0
-<U5793> \xAB\xB2 |0
-<U5794> \xCE\x58 |0
-<U5795> \xCE\x5E |0
-<U5797> \xCE\x55 |0
-<U5798> \xCE\x59 |0
-<U5799> \xCE\x5B |0
-<U579A> \xCE\x5D |0
-<U579B> \xCE\x57 |0
-<U579C> \x8B\x7D |0
-<U579D> \xCE\x56 |0
-<U579E> \xCE\x51 |0
-<U579F> \xCE\x52 |0
-<U57A0> \xAB\xAD |0
-<U57A1> \x9B\xF4 |0
-<U57A2> \xAB\xAF |0
-<U57A3> \xAB\xAE |0
-<U57A4> \xCE\x53 |0
-<U57A5> \xCE\x5C |0
-<U57A7> \x9E\xF7 |0
-<U57AA> \x9E\xC1 |0
-<U57AE> \xAB\xB1 |0
-<U57B4> \x99\x6F |0
-<U57B5> \xCE\x50 |0
-<U57B6> \xD1\x53 |0
-<U57B8> \xD1\x52 |0
-<U57B9> \xD1\x57 |0
-<U57BA> \xD1\x4E |0
-<U57BB> \x96\xF1 |0
-<U57BC> \xD1\x51 |0
-<U57BD> \xD1\x50 |0
-<U57BE> \x8E\x41 |0
-<U57BF> \xD1\x54 |0
-<U57C1> \xD1\x58 |0
-<U57C2> \xAE\x47 |0
-<U57C3> \xAE\x4A |0
-<U57C4> \x95\x4A |0
-<U57C6> \xD1\x4F |0
-<U57C7> \xD1\x55 |0
-<U57C8> \x97\xE6 |0
-<U57CB> \xAE\x49 |0
-<U57CC> \xD1\x4A |0
-<U57CE> \xAB\xB0 |0
-<U57CF> \xD4\xBA |0
-<U57D0> \xD1\x56 |0
-<U57D2> \xD1\x4D |0
-<U57D4> \xAE\x48 |0
-<U57D5> \xD1\x4C |0
-<U57D7> \x96\xF5 |0
-<U57DC> \xD4\xB1 |0
-<U57DD> \x92\xE6 |0
-<U57DE> \x9F\x42 |0
-<U57DF> \xB0\xEC |0
-<U57E0> \xB0\xF0 |0
-<U57E1> \xD4\xC1 |0
-<U57E2> \xD4\xAF |0
-<U57E3> \xD4\xBD |0
-<U57E4> \xB0\xF1 |0
-<U57E5> \xD4\xBF |0
-<U57E6> \xFB\x67 |0
-<U57E7> \xD4\xC5 |0
-<U57E9> \xD4\xC9 |0
-<U57EC> \xD4\xC0 |0
-<U57ED> \xD4\xB4 |0
-<U57EE> \xD4\xBC |0
-<U57EF> \x99\xA9 |0
-<U57F0> \xD4\xCA |0
-<U57F1> \xD4\xC8 |0
-<U57F2> \xD4\xBE |0
-<U57F3> \xD4\xB9 |0
-<U57F4> \xD4\xB2 |0
-<U57F5> \xD8\xA6 |0
-<U57F6> \xD4\xB0 |0
-<U57F7> \xB0\xF5 |0
-<U57F8> \xD4\xB7 |0
-<U57F9> \xB0\xF6 |0
-<U57FA> \xB0\xF2 |0
-<U57FB> \xD4\xAD |0
-<U57FC> \xD4\xC3 |0
-<U57FD> \xD4\xB5 |0
-<U57FE> \xFA\xE6 |0
-<U5800> \xD4\xB3 |0
-<U5801> \xD4\xC6 |0
-<U5802> \xB0\xF3 |0
-<U5803> \xFB\x69 |0
-<U5804> \xD4\xCC |0
-<U5805> \xB0\xED |0
-<U5806> \xB0\xEF |0
-<U5807> \xD4\xBB |0
-<U5808> \xD4\xB6 |0
-<U5809> \xAE\x4B |0
-<U580A> \xB0\xEE |0
-<U580B> \xD4\xB8 |0
-<U580C> \xD4\xC7 |0
-<U580D> \xD4\xCB |0
-<U580E> \xD4\xC2 |0
-<U5810> \xD4\xC4 |0
-<U5812> \x97\xE5 |0
-<U5814> \xD4\xAE |0
-<U5819> \xD8\xA1 |0
-<U581B> \xD8\xAA |0
-<U581C> \xD8\xA9 |0
-<U581D> \xB3\xFA |0
-<U581E> \xD8\xA2 |0
-<U5820> \xB3\xFB |0
-<U5821> \xB3\xF9 |0
-<U5822> \x96\x7D |0
-<U5823> \xD8\xA4 |0
-<U5824> \xB3\xF6 |0
-<U5825> \xD8\xA8 |0
-<U5826> \xFB\x6C |0
-<U5827> \xD8\xA3 |0
-<U5828> \xD8\xA5 |0
-<U5829> \xD8\x7D |0
-<U582A> \xB3\xF4 |0
-<U582C> \xD8\xB2 |0
-<U582D> \xD8\xB1 |0
-<U582E> \xD8\xAE |0
-<U582F> \xB3\xF3 |0
-<U5830> \xB3\xF7 |0
-<U5831> \xB3\xF8 |0
-<U5832> \xD1\x4B |0
-<U5833> \xD8\xAB |0
-<U5834> \xB3\xF5 |0
-<U5835> \xB0\xF4 |0
-<U5836> \xD8\xAD |0
-<U5837> \xD8\x7E |0
-<U5838> \xD8\xB0 |0
-<U5839> \xD8\xAF |0
-<U583A> \x99\xA2 |0
-<U583B> \xD8\xB3 |0
-<U583D> \xDC\xEF |0
-<U583F> \xD8\xAC |0
-<U5840> \x9A\xBB |0
-<U5844> \x9A\x65 |0
-<U5847> \x94\x4E |0
-<U5848> \xD8\xA7 |0
-<U5849> \xDC\xE7 |0
-<U584A> \xB6\xF4 |0
-<U584B> \xB6\xF7 |0
-<U584C> \xB6\xF2 |0
-<U584D> \xDC\xE6 |0
-<U584E> \xDC\xEA |0
-<U584F> \xDC\xE5 |0
-<U5851> \xB6\xEC |0
-<U5852> \xB6\xF6 |0
-<U5853> \xDC\xE2 |0
-<U5854> \xB6\xF0 |0
-<U5855> \xDC\xE9 |0
-<U5857> \xB6\xEE |0
-<U5858> \xB6\xED |0
-<U5859> \xDC\xEC |0
-<U585A> \xB6\xEF |0
-<U585B> \xDC\xEE |0
-<U585C> \xFB\x6E |0
-<U585D> \xDC\xEB |0
-<U585E> \xB6\xEB |0
-<U585F> \x99\xDF |0
-<U5862> \xB6\xF5 |0
-<U5863> \xDC\xF0 |0
-<U5864> \xDC\xE4 |0
-<U5865> \xDC\xED |0
-<U5868> \xDC\xE3 |0
-<U5869> \x98\xE3 |0
-<U586B> \xB6\xF1 |0
-<U586C> \x92\x54 |0
-<U586D> \xB6\xF3 |0
-<U586F> \xDC\xE8 |0
-<U5871> \xDC\xF1 |0
-<U5872> \x96\x7B |0
-<U5873> \x8A\xAF |0
-<U5874> \xE1\x5D |0
-<U5875> \xB9\xD0 |0
-<U5876> \xE1\x63 |0
-<U5879> \xB9\xD5 |0
-<U587A> \xE1\x5F |0
-<U587B> \xE1\x66 |0
-<U587C> \xE1\x57 |0
-<U587D> \xB9\xD7 |0
-<U587E> \xB9\xD1 |0
-<U587F> \xE1\x5C |0
-<U5880> \xBC\x55 |0
-<U5881> \xE1\x5B |0
-<U5882> \xE1\x64 |0
-<U5883> \xB9\xD2 |0
-<U5885> \xB9\xD6 |0
-<U5886> \xE1\x5A |0
-<U5887> \xE1\x60 |0
-<U5888> \xE1\x65 |0
-<U5889> \xE1\x56 |0
-<U588A> \xB9\xD4 |0
-<U588B> \xE1\x5E |0
-<U588E> \xE1\x62 |0
-<U588F> \xE1\x68 |0
-<U5890> \xE1\x58 |0
-<U5891> \xE1\x61 |0
-<U5893> \xB9\xD3 |0
-<U5894> \xE1\x67 |0
-<U5898> \xE1\x59 |0
-<U5899> \x8B\xAF |0
-<U589A> \x9E\xBD |0
-<U589C> \xBC\x59 |0
-<U589D> \xE5\x4B |0
-<U589E> \xBC\x57 |0
-<U589F> \xBC\x56 |0
-<U58A0> \xE5\x4D |0
-<U58A1> \xE5\x52 |0
-<U58A3> \xE5\x4E |0
-<U58A5> \xE5\x51 |0
-<U58A6> \xBC\x5C |0
-<U58A7> \x9E\xE6 |0
-<U58A8> \xBE\xA5 |0
-<U58A9> \xBC\x5B |0
-<U58AA> \xFB\x6F |0
-<U58AB> \xE5\x4A |0
-<U58AC> \xE5\x50 |0
-<U58AE> \xBC\x5A |0
-<U58AF> \xE5\x4F |0
-<U58B0> \x8E\xE1 |0
-<U58B1> \xE5\x4C |0
-<U58B3> \xBC\x58 |0
-<U58B5> \x9B\x7D |0
-<U58B6> \x9C\x7E |0
-<U58BA> \xE9\x4D |0
-<U58BB> \xF9\xD9 |0
-<U58BC> \xE9\x4F |0
-<U58BD> \xE9\x4A |0
-<U58BE> \xBE\xC1 |0
-<U58BF> \xE9\x4C |0
-<U58C1> \xBE\xC0 |0
-<U58C2> \xE9\x4E |0
-<U58C5> \xBE\xC3 |0
-<U58C6> \xE9\x50 |0
-<U58C7> \xBE\xC2 |0
-<U58C8> \xE9\x49 |0
-<U58C9> \xE9\x4B |0
-<U58CB> \x92\xEA |0
-<U58CE> \xC0\xA5 |0
-<U58CF> \xEC\xCC |0
-<U58D1> \xC0\xA4 |0
-<U58D2> \xEC\xCD |0
-<U58D3> \xC0\xA3 |0
-<U58D4> \xEC\xCB |0
-<U58D5> \xC0\xA2 |0
-<U58D6> \xEC\xCA |0
-<U58D8> \xC2\x53 |0
-<U58D9> \xC2\x52 |0
-<U58DA> \xF1\xF6 |0
-<U58DB> \xF1\xF8 |0
-<U58DC> \xFB\x72 |0
-<U58DD> \xF1\xF7 |0
-<U58DE> \xC3\x61 |0
-<U58DF> \xC3\x62 |0
-<U58E0> \xFB\x71 |0
-<U58E2> \xC3\x63 |0
-<U58E3> \xF4\x42 |0
-<U58E4> \xC4\x5B |0
-<U58E7> \xF7\xD3 |0
-<U58E8> \xF7\xD2 |0
-<U58E9> \xC5\xF2 |0
-<U58EB> \xA4\x68 |0
-<U58EC> \xA4\xD0 |0
-<U58EF> \xA7\xA7 |0
-<U58F0> \x89\x5C |0
-<U58F2> \x98\xF0 |0
-<U58F3> \x96\xF2 |0
-<U58F4> \xCE\x5F |0
-<U58F9> \xB3\xFC |0
-<U58FA> \xB3\xFD |0
-<U58FB> \xFB\x74 |0
-<U58FC> \xDC\xF2 |0
-<U58FD> \xB9\xD8 |0
-<U58FE> \xE1\x69 |0
-<U58FF> \xE5\x53 |0
-<U5902> \x8B\xC1 |0
-<U5903> \xC9\x5A |0
-<U5904> \x89\x5D |0
-<U5905> \x89\xDE |0
-<U5906> \xCA\xB0 |0
-<U5907> \x89\x5E |0
-<U590A> \xC6\xCA |0
-<U590C> \xCC\x42 |0
-<U590D> \xCE\x60 |0
-<U590E> \xD1\x59 |0
-<U590F> \xAE\x4C |0
-<U5911> \xFE\x42 |0
-<U5912> \xF1\xF9 |0
-<U5914> \xC4\xDC |0
-<U5915> \xA4\x69 |0
-<U5916> \xA5\x7E |0
-<U5917> \xC9\x70 |0
-<U5919> \xA6\x67 |0
-<U591A> \xA6\x68 |0
-<U591C> \xA9\x5D |0
-<U591F> \xFB\x7B |0
-<U5920> \xB0\xF7 |0
-<U5922> \xB9\xDA |0
-<U5924> \xB9\xDB |0
-<U5925> \xB9\xD9 |0
-<U5927> \xA4\x6A |0
-<U5929> \xA4\xD1 |0
-<U592A> \xA4\xD3 |0
-<U592B> \xA4\xD2 |0
-<U592C> \xC9\x5B |0
-<U592D> \xA4\xD4 |0
-<U592E> \xA5\xA1 |0
-<U592F> \xC9\x71 |0
-<U5931> \xA5\xA2 |0
-<U5932> \x89\x5F |0
-<U5934> \x89\x60 |0
-<U5937> \xA6\x69 |0
-<U5938> \xA6\x6A |0
-<U593C> \xC9\xCB |0
-<U593E> \xA7\xA8 |0
-<U5940> \xCA\xB1 |0
-<U5944> \xA9\x61 |0
-<U5945> \xCC\x43 |0
-<U5947> \xA9\x5F |0
-<U5948> \xA9\x60 |0
-<U5949> \xA9\x5E |0
-<U594A> \xD1\x5A |0
-<U594E> \xAB\xB6 |0
-<U594F> \xAB\xB5 |0
-<U5950> \xAB\xB7 |0
-<U5951> \xAB\xB4 |0
-<U5953> \xCE\x61 |0
-<U5954> \xA9\x62 |0
-<U5955> \xAB\xB3 |0
-<U5957> \xAE\x4D |0
-<U5958> \xAE\x4E |0
-<U595A> \xAE\x4F |0
-<U595C> \xD4\xCD |0
-<U5960> \xB3\xFE |0
-<U5961> \xD8\xB4 |0
-<U5962> \xB0\xF8 |0
-<U5965> \x9B\xCD |0
-<U5967> \xB6\xF8 |0
-<U5969> \xB9\xDD |0
-<U596A> \xB9\xDC |0
-<U596B> \xE1\x6A |0
-<U596D> \xBC\x5D |0
-<U596E> \xBE\xC4 |0
-<U5970> \xEF\xC0 |0
-<U5971> \xF6\xDA |0
-<U5972> \xF7\xD4 |0
-<U5973> \xA4\x6B |0
-<U5974> \xA5\xA3 |0
-<U5975> \x9D\xD3 |0
-<U5976> \xA5\xA4 |0
-<U5977> \xC9\xD1 |0
-<U5978> \xA6\x6C |0
-<U5979> \xA6\x6F |0
-<U597B> \xC9\xCF |0
-<U597C> \xC9\xCD |0
-<U597D> \xA6\x6E |0
-<U597E> \xC9\xD0 |0
-<U597F> \xC9\xD2 |0
-<U5980> \xC9\xCC |0
-<U5981> \xA6\x71 |0
-<U5982> \xA6\x70 |0
-<U5983> \xA6\x6D |0
-<U5984> \xA6\x6B |0
-<U5985> \xC9\xCE |0
-<U5989> \x98\x4C |0
-<U598A> \xA7\xB3 |0
-<U598D> \xA7\xB0 |0
-<U598E> \xCA\xB6 |0
-<U598F> \xCA\xB9 |0
-<U5990> \xCA\xB8 |0
-<U5992> \xA7\xAA |0
-<U5993> \xA7\xB2 |0
-<U5994> \x97\x52 |0
-<U5996> \xA7\xAF |0
-<U5997> \xCA\xB5 |0
-<U5998> \xCA\xB3 |0
-<U5999> \xA7\xAE |0
-<U599A> \x95\xC3 |0
-<U599D> \xA7\xA9 |0
-<U599E> \xA7\xAC |0
-<U599F> \x9B\xB6 |0
-<U59A0> \xCA\xB4 |0
-<U59A1> \xCA\xBB |0
-<U59A2> \xCA\xB7 |0
-<U59A3> \xA7\xAD |0
-<U59A4> \xA7\xB1 |0
-<U59A5> \xA7\xB4 |0
-<U59A6> \xCA\xB2 |0
-<U59A7> \xCA\xBA |0
-<U59A8> \xA7\xAB |0
-<U59AC> \x9A\xB9 |0
-<U59AE> \xA9\x67 |0
-<U59AF> \xA9\x6F |0
-<U59B0> \x97\xB3 |0
-<U59B1> \xCC\x4F |0
-<U59B2> \xCC\x48 |0
-<U59B3> \xA9\x70 |0
-<U59B4> \xCC\x53 |0
-<U59B5> \xCC\x44 |0
-<U59B6> \xCC\x4B |0
-<U59B7> \x9F\x74 |0
-<U59B8> \x92\xF1 |0
-<U59B9> \xA9\x66 |0
-<U59BA> \xCC\x45 |0
-<U59BB> \xA9\x64 |0
-<U59BC> \xCC\x4C |0
-<U59BD> \xCC\x50 |0
-<U59BE> \xA9\x63 |0
-<U59C0> \xCC\x51 |0
-<U59C1> \xCC\x4A |0
-<U59C3> \xCC\x4D |0
-<U59C4> \x97\xDF |0
-<U59C5> \xA9\x72 |0
-<U59C6> \xA9\x69 |0
-<U59C7> \xCC\x54 |0
-<U59C8> \xCC\x52 |0
-<U59C9> \xFB\xA6 |0
-<U59CA> \xA9\x6E |0
-<U59CB> \xA9\x6C |0
-<U59CC> \xCC\x49 |0
-<U59CD> \xA9\x6B |0
-<U59CE> \xCC\x47 |0
-<U59CF> \xCC\x46 |0
-<U59D0> \xA9\x6A |0
-<U59D1> \xA9\x68 |0
-<U59D2> \xA9\x71 |0
-<U59D3> \xA9\x6D |0
-<U59D4> \xA9\x65 |0
-<U59D6> \xCC\x4E |0
-<U59D8> \xAB\xB9 |0
-<U59D9> \xFB\xAB |0
-<U59DA> \xAB\xC0 |0
-<U59DB> \xCE\x6F |0
-<U59DC> \xAB\xB8 |0
-<U59DD> \xCE\x67 |0
-<U59DE> \xCE\x63 |0
-<U59E0> \xCE\x73 |0
-<U59E1> \xCE\x62 |0
-<U59E3> \xAB\xBB |0
-<U59E4> \xCE\x6C |0
-<U59E5> \xAB\xBE |0
-<U59E6> \xAB\xC1 |0
-<U59E8> \xAB\xBC |0
-<U59E9> \xCE\x70 |0
-<U59EA> \xAB\xBF |0
-<U59EB> \x98\x77 |0
-<U59EC> \xAE\x56 |0
-<U59ED> \xCE\x76 |0
-<U59EE> \xCE\x64 |0
-<U59EF> \x98\x54 |0
-<U59F0> \x95\xC5 |0
-<U59F1> \xCE\x66 |0
-<U59F2> \xCE\x6D |0
-<U59F3> \xCE\x71 |0
-<U59F4> \xCE\x75 |0
-<U59F5> \xCE\x72 |0
-<U59F6> \xCE\x6B |0
-<U59F7> \xCE\x6E |0
-<U59F8> \x9D\x55 |0
-<U59F9> \xFB\xB2 |0
-<U59FA> \xCE\x68 |0
-<U59FB> \xAB\xC3 |0
-<U59FC> \xCE\x6A |0
-<U59FD> \xCE\x69 |0
-<U59FE> \xCE\x74 |0
-<U59FF> \xAB\xBA |0
-<U5A00> \xCE\x65 |0
-<U5A01> \xAB\xC2 |0
-<U5A02> \x95\x7E |0
-<U5A03> \xAB\xBD |0
-<U5A09> \xAE\x5C |0
-<U5A0A> \xD1\x62 |0
-<U5A0B> \x97\x42 |0
-<U5A0C> \xAE\x5B |0
-<U5A0D> \x94\xE6 |0
-<U5A0F> \xD1\x60 |0
-<U5A11> \xAE\x50 |0
-<U5A12> \x92\xF5 |0
-<U5A13> \xAE\x55 |0
-<U5A15> \xD1\x5F |0
-<U5A16> \xD1\x5C |0
-<U5A17> \xD1\x61 |0
-<U5A18> \xAE\x51 |0
-<U5A19> \xD1\x5B |0
-<U5A1B> \xAE\x54 |0
-<U5A1C> \xAE\x52 |0
-<U5A1E> \xD1\x63 |0
-<U5A1F> \xAE\x53 |0
-<U5A20> \xAE\x57 |0
-<U5A21> \x92\xFD |0
-<U5A23> \xAE\x58 |0
-<U5A24> \xFB\xA2 |0
-<U5A25> \xAE\x5A |0
-<U5A27> \x9C\x51 |0
-<U5A29> \xAE\x59 |0
-<U5A2A> \x94\xE9 |0
-<U5A2B> \x98\x5C |0
-<U5A2C> \x92\xF0 |0
-<U5A2D> \xD1\x5D |0
-<U5A2E> \xD1\x5E |0
-<U5A33> \xD1\x64 |0
-<U5A35> \xD4\xD4 |0
-<U5A36> \xB0\xF9 |0
-<U5A37> \xD8\xC2 |0
-<U5A38> \xD4\xD3 |0
-<U5A39> \xD4\xE6 |0
-<U5A3C> \xB1\x40 |0
-<U5A3D> \x94\x4C |0
-<U5A3E> \xD4\xE4 |0
-<U5A40> \xB0\xFE |0
-<U5A41> \xB0\xFA |0
-<U5A42> \xD4\xED |0
-<U5A43> \xD4\xDD |0
-<U5A44> \xD4\xE0 |0
-<U5A45> \x91\x6B |0
-<U5A46> \xB1\x43 |0
-<U5A47> \xD4\xEA |0
-<U5A48> \xD4\xE2 |0
-<U5A49> \xB0\xFB |0
-<U5A4A> \xB1\x44 |0
-<U5A4C> \xD4\xE7 |0
-<U5A4D> \xD4\xE5 |0
-<U5A50> \xD4\xD6 |0
-<U5A51> \xD4\xEB |0
-<U5A52> \xD4\xDF |0
-<U5A53> \xD4\xDA |0
-<U5A54> \x8B\x78 |0
-<U5A55> \xD4\xD0 |0
-<U5A56> \xD4\xEC |0
-<U5A57> \xD4\xDC |0
-<U5A58> \xD4\xCF |0
-<U5A59> \x94\xE2 |0
-<U5A5A> \xB1\x42 |0
-<U5A5B> \xD4\xE1 |0
-<U5A5C> \xD4\xEE |0
-<U5A5D> \xD4\xDE |0
-<U5A5E> \xD4\xD2 |0
-<U5A5F> \xD4\xD7 |0
-<U5A60> \xD4\xCE |0
-<U5A61> \x98\x4F |0
-<U5A62> \xB1\x41 |0
-<U5A63> \xFB\xB5 |0
-<U5A64> \xD4\xDB |0
-<U5A65> \xD4\xD8 |0
-<U5A66> \xB0\xFC |0
-<U5A67> \xD4\xD1 |0
-<U5A68> \x92\x71 |0
-<U5A69> \xD4\xE9 |0
-<U5A6A> \xB0\xFD |0
-<U5A6B> \x93\x65 |0
-<U5A6C> \xD4\xD9 |0
-<U5A6D> \xD4\xD5 |0
-<U5A6E> \x98\x5B |0
-<U5A70> \xD4\xE8 |0
-<U5A71> \x98\x50 |0
-<U5A77> \xB4\x40 |0
-<U5A78> \xD8\xBB |0
-<U5A79> \x97\xBC |0
-<U5A7A> \xD8\xB8 |0
-<U5A7B> \xD8\xC9 |0
-<U5A7C> \xD8\xBD |0
-<U5A7D> \xD8\xCA |0
-<U5A7E> \x92\xF3 |0
-<U5A7F> \xB4\x42 |0
-<U5A81> \x93\x40 |0
-<U5A82> \x98\x4D |0
-<U5A83> \xD8\xC6 |0
-<U5A84> \xD8\xC3 |0
-<U5A86> \x95\x72 |0
-<U5A88> \xFD\xEF |0
-<U5A8A> \xD8\xC4 |0
-<U5A8B> \xD8\xC7 |0
-<U5A8C> \xD8\xCB |0
-<U5A8E> \xD4\xE3 |0
-<U5A8F> \xD8\xCD |0
-<U5A90> \xDD\x47 |0
-<U5A91> \xFD\xC1 |0
-<U5A92> \xB4\x43 |0
-<U5A93> \xD8\xCE |0
-<U5A94> \xD8\xB6 |0
-<U5A95> \xD8\xC0 |0
-<U5A96> \xFB\xBA |0
-<U5A97> \xD8\xC5 |0
-<U5A99> \x92\xEB |0
-<U5A9A> \xB4\x41 |0
-<U5A9B> \xB4\x44 |0
-<U5A9C> \xD8\xCC |0
-<U5A9D> \xD8\xCF |0
-<U5A9E> \xD8\xBA |0
-<U5A9F> \xD8\xB7 |0
-<U5AA0> \xFC\x73 |0
-<U5AA1> \x97\xB7 |0
-<U5AA2> \xD8\xB9 |0
-<U5AA5> \xD8\xBE |0
-<U5AA6> \xD8\xBC |0
-<U5AA7> \xB4\x45 |0
-<U5AA9> \xD8\xC8 |0
-<U5AAB> \xFB\xB4 |0
-<U5AAC> \xD8\xBF |0
-<U5AAE> \xD8\xC1 |0
-<U5AAF> \xD8\xB5 |0
-<U5AB0> \xDC\xFA |0
-<U5AB1> \xDC\xF8 |0
-<U5AB2> \xB7\x42 |0
-<U5AB3> \xB7\x40 |0
-<U5AB4> \xDD\x43 |0
-<U5AB5> \xDC\xF9 |0
-<U5AB6> \xDD\x44 |0
-<U5AB7> \xDD\x40 |0
-<U5AB8> \xDC\xF7 |0
-<U5AB9> \xDD\x46 |0
-<U5ABA> \xDC\xF6 |0
-<U5ABB> \xDC\xFD |0
-<U5ABC> \xB6\xFE |0
-<U5ABD> \xB6\xFD |0
-<U5ABE> \xB6\xFC |0
-<U5ABF> \xDC\xFB |0
-<U5AC0> \xDD\x41 |0
-<U5AC1> \xB6\xF9 |0
-<U5AC2> \xB7\x41 |0
-<U5AC3> \x90\xA7 |0
-<U5AC4> \xDC\xF4 |0
-<U5AC6> \xDC\xFE |0
-<U5AC7> \xDC\xF3 |0
-<U5AC8> \xDC\xFC |0
-<U5AC9> \xB6\xFA |0
-<U5ACA> \xDD\x42 |0
-<U5ACB> \xDC\xF5 |0
-<U5ACC> \xB6\xFB |0
-<U5ACD> \xDD\x45 |0
-<U5ACE> \x97\x41 |0
-<U5ACF> \x92\xF4 |0
-<U5AD3> \xFB\xBC |0
-<U5AD5> \xE1\x6E |0
-<U5AD6> \xB9\xE2 |0
-<U5AD7> \xB9\xE1 |0
-<U5AD8> \xB9\xE3 |0
-<U5AD9> \xE1\x7A |0
-<U5ADA> \xE1\x70 |0
-<U5ADB> \xE1\x76 |0
-<U5ADC> \xE1\x6B |0
-<U5ADD> \xE1\x79 |0
-<U5ADE> \xE1\x78 |0
-<U5ADF> \xE1\x7C |0
-<U5AE0> \xE1\x75 |0
-<U5AE1> \xB9\xDE |0
-<U5AE2> \xE1\x74 |0
-<U5AE3> \xB9\xE4 |0
-<U5AE4> \x95\x77 |0
-<U5AE5> \xE1\x6D |0
-<U5AE6> \xB9\xDF |0
-<U5AE8> \xE1\x7B |0
-<U5AE9> \xB9\xE0 |0
-<U5AEA> \xE1\x6F |0
-<U5AEB> \xE1\x72 |0
-<U5AEC> \xE1\x77 |0
-<U5AED> \xE1\x71 |0
-<U5AEE> \xE1\x6C |0
-<U5AF0> \x9E\xE2 |0
-<U5AF2> \x8F\x78 |0
-<U5AF3> \xE1\x73 |0
-<U5AF4> \xE5\x55 |0
-<U5AF5> \xBC\x61 |0
-<U5AF6> \xE5\x58 |0
-<U5AF7> \xE5\x57 |0
-<U5AF8> \xE5\x5A |0
-<U5AF9> \xE5\x5C |0
-<U5AFA> \xF9\xDC |0
-<U5AFB> \xBC\x5F |0
-<U5AFD> \xE5\x56 |0
-<U5AFE> \x96\x72 |0
-<U5AFF> \xE5\x54 |0
-<U5B01> \xE5\x5D |0
-<U5B02> \xE5\x5B |0
-<U5B03> \xE5\x59 |0
-<U5B05> \xE5\x5F |0
-<U5B07> \xE5\x5E |0
-<U5B08> \xBC\x63 |0
-<U5B09> \xBC\x5E |0
-<U5B0B> \xBC\x60 |0
-<U5B0C> \xBC\x62 |0
-<U5B0D> \x9E\xB5 |0
-<U5B0F> \xE5\x60 |0
-<U5B10> \xE9\x57 |0
-<U5B11> \x96\x4B |0
-<U5B13> \xE9\x56 |0
-<U5B14> \xE9\x55 |0
-<U5B16> \xE9\x58 |0
-<U5B17> \xE9\x51 |0
-<U5B19> \xE9\x52 |0
-<U5B1A> \xE9\x5A |0
-<U5B1B> \xE9\x53 |0
-<U5B1D> \xBE\xC5 |0
-<U5B1E> \xE9\x5C |0
-<U5B1F> \xA0\xFA |0
-<U5B20> \xE9\x5B |0
-<U5B21> \xE9\x54 |0
-<U5B23> \xEC\xD1 |0
-<U5B24> \xC0\xA8 |0
-<U5B25> \xEC\xCF |0
-<U5B26> \xEC\xD4 |0
-<U5B27> \xEC\xD3 |0
-<U5B28> \xE9\x59 |0
-<U5B2A> \xC0\xA7 |0
-<U5B2B> \x95\x75 |0
-<U5B2C> \xEC\xD2 |0
-<U5B2D> \xEC\xCE |0
-<U5B2E> \xEC\xD6 |0
-<U5B2F> \xEC\xD5 |0
-<U5B30> \xC0\xA6 |0
-<U5B32> \xEC\xD0 |0
-<U5B34> \xBE\xC6 |0
-<U5B38> \xC2\x54 |0
-<U5B3C> \xEF\xC1 |0
-<U5B3D> \xF1\xFA |0
-<U5B3E> \xF1\xFB |0
-<U5B3F> \xF1\xFC |0
-<U5B40> \xC4\x5C |0
-<U5B41> \x90\xDA |0
-<U5B43> \xC4\x5D |0
-<U5B44> \x93\x67 |0
-<U5B45> \xF4\x43 |0
-<U5B46> \xFE\xA4 |0
-<U5B47> \xF5\xC8 |0
-<U5B48> \xF5\xC7 |0
-<U5B4A> \x90\xDF |0
-<U5B4B> \xF6\xDB |0
-<U5B4C> \xF6\xDC |0
-<U5B4D> \xF7\xD5 |0
-<U5B4E> \xF8\xA7 |0
-<U5B4F> \x93\x54 |0
-<U5B50> \xA4\x6C |0
-<U5B51> \xA4\x6D |0
-<U5B53> \xA4\x6E |0
-<U5B54> \xA4\xD5 |0
-<U5B55> \xA5\xA5 |0
-<U5B56> \xC9\xD3 |0
-<U5B57> \xA6\x72 |0
-<U5B58> \xA6\x73 |0
-<U5B5A> \xA7\xB7 |0
-<U5B5B> \xA7\xB8 |0
-<U5B5C> \xA7\xB6 |0
-<U5B5D> \xA7\xB5 |0
-<U5B5F> \xA9\x73 |0
-<U5B62> \xCC\x55 |0
-<U5B63> \xA9\x75 |0
-<U5B64> \xA9\x74 |0
-<U5B65> \xCC\x56 |0
-<U5B66> \x89\x61 |0
-<U5B68> \x8B\xB4 |0
-<U5B69> \xAB\xC4 |0
-<U5B6B> \xAE\x5D |0
-<U5B6C> \xD1\x65 |0
-<U5B6D> \x9D\xC0 |0
-<U5B6E> \xD4\xF0 |0
-<U5B70> \xB1\x45 |0
-<U5B71> \xB4\x47 |0
-<U5B72> \xD4\xEF |0
-<U5B73> \xB4\x46 |0
-<U5B74> \x8E\x48 |0
-<U5B75> \xB9\xE5 |0
-<U5B76> \xFB\xC5 |0
-<U5B77> \xE1\x7D |0
-<U5B78> \xBE\xC7 |0
-<U5B7A> \xC0\xA9 |0
-<U5B7B> \xEC\xD7 |0
-<U5B7C> \xFB\xC7 |0
-<U5B7D> \xC4\x5E |0
-<U5B7F> \xC5\x70 |0
-<U5B80> \xC6\xCB |0
-<U5B81> \xC9\x72 |0
-<U5B82> \xFA\x79 |0
-<U5B83> \xA5\xA6 |0
-<U5B84> \xC9\x73 |0
-<U5B85> \xA6\x76 |0
-<U5B87> \xA6\x74 |0
-<U5B88> \xA6\x75 |0
-<U5B89> \xA6\x77 |0
-<U5B8B> \xA7\xBA |0
-<U5B8C> \xA7\xB9 |0
-<U5B8E> \xCA\xBC |0
-<U5B8F> \xA7\xBB |0
-<U5B90> \x9E\x67 |0
-<U5B92> \xCA\xBD |0
-<U5B93> \xCC\x57 |0
-<U5B95> \xCC\x58 |0
-<U5B97> \xA9\x76 |0
-<U5B98> \xA9\x78 |0
-<U5B99> \xA9\x7A |0
-<U5B9A> \xA9\x77 |0
-<U5B9B> \xA9\x7B |0
-<U5B9C> \xA9\x79 |0
-<U5B9D> \xFB\xD2 |0
-<U5B9E> \x89\x62 |0
-<U5B9F> \x89\x63 |0
-<U5BA2> \xAB\xC8 |0
-<U5BA3> \xAB\xC5 |0
-<U5BA4> \xAB\xC7 |0
-<U5BA5> \xAB\xC9 |0
-<U5BA6> \xAB\xC6 |0
-<U5BA7> \xD1\x66 |0
-<U5BA8> \xCE\x77 |0
-<U5BAA> \xFC\x7D |0
-<U5BAC> \xD1\x68 |0
-<U5BAD> \xD1\x67 |0
-<U5BAE> \xAE\x63 |0
-<U5BB0> \xAE\x5F |0
-<U5BB3> \xAE\x60 |0
-<U5BB4> \xAE\x62 |0
-<U5BB5> \xAE\x64 |0
-<U5BB6> \xAE\x61 |0
-<U5BB8> \xAE\x66 |0
-<U5BB9> \xAE\x65 |0
-<U5BBF> \xB1\x4A |0
-<U5BC0> \xD4\xF2 |0
-<U5BC1> \xD4\xF1 |0
-<U5BC2> \xB1\x49 |0
-<U5BC3> \x9F\x6B |0
-<U5BC4> \xB1\x48 |0
-<U5BC5> \xB1\x47 |0
-<U5BC6> \xB1\x4B |0
-<U5BC7> \xB1\x46 |0
-<U5BCA> \xD8\xD5 |0
-<U5BCB> \xD8\xD2 |0
-<U5BCC> \xB4\x49 |0
-<U5BCD> \xD8\xD1 |0
-<U5BCE> \xD8\xD6 |0
-<U5BD0> \xB4\x4B |0
-<U5BD1> \xD8\xD4 |0
-<U5BD2> \xB4\x48 |0
-<U5BD3> \xB4\x4A |0
-<U5BD4> \xD8\xD3 |0
-<U5BD5> \xFB\xCC |0
-<U5BD6> \xDD\x48 |0
-<U5BD7> \xFE\xAE |0
-<U5BD8> \xDD\x49 |0
-<U5BD9> \xDD\x4A |0
-<U5BDE> \xB9\xE6 |0
-<U5BDF> \xB9\xEE |0
-<U5BE0> \xE1\x7E |0
-<U5BE1> \xB9\xE8 |0
-<U5BE2> \xB9\xEC |0
-<U5BE3> \xE1\xA1 |0
-<U5BE4> \xB9\xED |0
-<U5BE5> \xB9\xE9 |0
-<U5BE6> \xB9\xEA |0
-<U5BE7> \xB9\xE7 |0
-<U5BE8> \xB9\xEB |0
-<U5BE9> \xBC\x66 |0
-<U5BEA> \xD8\xD0 |0
-<U5BEB> \xBC\x67 |0
-<U5BEC> \xBC\x65 |0
-<U5BEE> \xBC\x64 |0
-<U5BEF> \xE9\x5D |0
-<U5BF0> \xBE\xC8 |0
-<U5BF1> \xEC\xD8 |0
-<U5BF2> \xEC\xD9 |0
-<U5BF3> \xFB\xD1 |0
-<U5BF5> \xC3\x64 |0
-<U5BF6> \xC4\x5F |0
-<U5BF8> \xA4\x6F |0
-<U5BFA> \xA6\x78 |0
-<U5BFF> \xFB\x75 |0
-<U5C01> \xAB\xCA |0
-<U5C03> \xD1\x69 |0
-<U5C04> \xAE\x67 |0
-<U5C05> \xFB\xD4 |0
-<U5C07> \xB1\x4E |0
-<U5C08> \xB1\x4D |0
-<U5C09> \xB1\x4C |0
-<U5C0A> \xB4\x4C |0
-<U5C0B> \xB4\x4D |0
-<U5C0C> \xD8\xD7 |0
-<U5C0D> \xB9\xEF |0
-<U5C0E> \xBE\xC9 |0
-<U5C0F> \xA4\x70 |0
-<U5C10> \xC9\x5C |0
-<U5C11> \xA4\xD6 |0
-<U5C12> \xC9\x74 |0
-<U5C13> \xFB\xD6 |0
-<U5C14> \xFB\xD8 |0
-<U5C15> \xC9\xD4 |0
-<U5C16> \xA6\x79 |0
-<U5C1A> \xA9\x7C |0
-<U5C1C> \x8B\x5D |0
-<U5C1E> \x93\x4C |0
-<U5C1F> \xDD\x4B |0
-<U5C20> \x9A\xE2 |0
-<U5C22> \xA4\x71 |0
-<U5C23> \x8B\xC9 |0
-<U5C24> \xA4\xD7 |0
-<U5C25> \xC9\xD5 |0
-<U5C28> \xCA\xBE |0
-<U5C2A> \xCA\xBF |0
-<U5C2C> \xA7\xBC |0
-<U5C30> \xD8\xD8 |0
-<U5C31> \xB4\x4E |0
-<U5C33> \xDD\x4C |0
-<U5C37> \xC0\xAA |0
-<U5C38> \xA4\x72 |0
-<U5C39> \xA4\xA8 |0
-<U5C3A> \xA4\xD8 |0
-<U5C3B> \xC9\x75 |0
-<U5C3C> \xA5\xA7 |0
-<U5C3E> \xA7\xC0 |0
-<U5C3F> \xA7\xBF |0
-<U5C40> \xA7\xBD |0
-<U5C41> \xA7\xBE |0
-<U5C44> \xCC\x59 |0
-<U5C45> \xA9\x7E |0
-<U5C46> \xA9\xA1 |0
-<U5C47> \xCC\x5A |0
-<U5C48> \xA9\x7D |0
-<U5C49> \xFB\xDB |0
-<U5C4A> \x9F\xC9 |0
-<U5C4B> \xAB\xCE |0
-<U5C4C> \xCE\x78 |0
-<U5C4D> \xAB\xCD |0
-<U5C4E> \xAB\xCB |0
-<U5C4F> \xAB\xCC |0
-<U5C50> \xAE\x6A |0
-<U5C51> \xAE\x68 |0
-<U5C53> \x9F\x44 |0
-<U5C54> \xD1\x6B |0
-<U5C55> \xAE\x69 |0
-<U5C56> \xD1\x6A |0
-<U5C58> \xAE\x5E |0
-<U5C59> \xD4\xF3 |0
-<U5C5C> \xB1\x50 |0
-<U5C5D> \xB1\x51 |0
-<U5C5E> \x98\xED |0
-<U5C60> \xB1\x4F |0
-<U5C62> \xB9\xF0 |0
-<U5C63> \xE1\xA2 |0
-<U5C64> \xBC\x68 |0
-<U5C65> \xBC\x69 |0
-<U5C67> \xE5\x61 |0
-<U5C68> \xC0\xAB |0
-<U5C69> \xEF\xC2 |0
-<U5C6A> \xEF\xC3 |0
-<U5C6C> \xC4\xDD |0
-<U5C6D> \xF8\xA8 |0
-<U5C6E> \xC9\x4B |0
-<U5C6F> \xA4\xD9 |0
-<U5C71> \xA4\x73 |0
-<U5C73> \xC9\x77 |0
-<U5C74> \xC9\x76 |0
-<U5C79> \xA6\x7A |0
-<U5C7A> \xC9\xD7 |0
-<U5C7B> \xC9\xD8 |0
-<U5C7C> \xC9\xD6 |0
-<U5C7E> \xC9\xD9 |0
-<U5C85> \xFB\xDD |0
-<U5C86> \xCA\xC7 |0
-<U5C88> \xCA\xC2 |0
-<U5C89> \xCA\xC4 |0
-<U5C8A> \xCA\xC6 |0
-<U5C8B> \xCA\xC3 |0
-<U5C8C> \xA7\xC4 |0
-<U5C8D> \xCA\xC0 |0
-<U5C8F> \xCA\xC1 |0
-<U5C90> \xA7\xC1 |0
-<U5C91> \xA7\xC2 |0
-<U5C92> \xCA\xC5 |0
-<U5C93> \xCA\xC8 |0
-<U5C94> \xA7\xC3 |0
-<U5C95> \xCA\xC9 |0
-<U5C99> \x8D\xF2 |0
-<U5C9A> \x89\x64 |0
-<U5C9C> \xFD\xF2 |0
-<U5C9D> \xCC\x68 |0
-<U5C9E> \x93\x4D |0
-<U5C9F> \xCC\x62 |0
-<U5CA0> \xCC\x5D |0
-<U5CA1> \xA9\xA3 |0
-<U5CA2> \xCC\x65 |0
-<U5CA3> \xCC\x63 |0
-<U5CA4> \xCC\x5C |0
-<U5CA5> \xCC\x69 |0
-<U5CA6> \xCC\x6C |0
-<U5CA7> \xCC\x67 |0
-<U5CA8> \xCC\x60 |0
-<U5CA9> \xA9\xA5 |0
-<U5CAA> \xCC\x66 |0
-<U5CAB> \xA9\xA6 |0
-<U5CAC> \xCC\x61 |0
-<U5CAD> \xCC\x64 |0
-<U5CAE> \xCC\x5B |0
-<U5CAF> \xCC\x5F |0
-<U5CB0> \xCC\x6B |0
-<U5CB1> \xA9\xA7 |0
-<U5CB3> \xA9\xA8 |0
-<U5CB5> \xCC\x5E |0
-<U5CB6> \xCC\x6A |0
-<U5CB7> \xA9\xA2 |0
-<U5CB8> \xA9\xA4 |0
-<U5CBA> \xFB\xE7 |0
-<U5CC1> \xA0\xF2 |0
-<U5CC2> \x98\x68 |0
-<U5CC6> \xCE\xAB |0
-<U5CC7> \xCE\xA4 |0
-<U5CC8> \xCE\xAA |0
-<U5CC9> \xCE\xA3 |0
-<U5CCA> \xCE\xA5 |0
-<U5CCB> \xCE\x7D |0
-<U5CCC> \xCE\x7B |0
-<U5CCE> \xCE\xAC |0
-<U5CCF> \xCE\xA9 |0
-<U5CD0> \xCE\x79 |0
-<U5CD1> \x9F\x58 |0
-<U5CD2> \xAB\xD0 |0
-<U5CD3> \xCE\xA7 |0
-<U5CD4> \xCE\xA8 |0
-<U5CD6> \xCE\xA6 |0
-<U5CD7> \xCE\x7C |0
-<U5CD8> \xCE\x7A |0
-<U5CD9> \xAB\xCF |0
-<U5CDA> \xCE\xA2 |0
-<U5CDB> \xCE\x7E |0
-<U5CDE> \xCE\xA1 |0
-<U5CDF> \xCE\xAD |0
-<U5CE5> \x8D\x73 |0
-<U5CE8> \xAE\x6F |0
-<U5CE9> \xFB\xDE |0
-<U5CEA> \xAE\x6E |0
-<U5CEC> \xD1\x6C |0
-<U5CED> \xAE\x6B |0
-<U5CEE> \xD1\x6E |0
-<U5CEF> \xFB\xDF |0
-<U5CF0> \xAE\x70 |0
-<U5CF1> \xD1\x6F |0
-<U5CF4> \xAE\x73 |0
-<U5CF6> \xAE\x71 |0
-<U5CF7> \xD1\x70 |0
-<U5CF8> \xCE\xAE |0
-<U5CF9> \xD1\x72 |0
-<U5CFB> \xAE\x6D |0
-<U5CFD> \xAE\x6C |0
-<U5CFF> \xD1\x6D |0
-<U5D00> \xD1\x71 |0
-<U5D01> \xAE\x72 |0
-<U5D06> \xB1\x53 |0
-<U5D07> \xB1\x52 |0
-<U5D0B> \xD4\xF5 |0
-<U5D0C> \xD4\xF9 |0
-<U5D0D> \xD4\xFB |0
-<U5D0E> \xB1\x54 |0
-<U5D0F> \xD4\xFE |0
-<U5D10> \xFB\xE3 |0
-<U5D11> \xB1\x58 |0
-<U5D12> \xD5\x41 |0
-<U5D14> \xB1\x5A |0
-<U5D15> \x8D\xA8 |0
-<U5D16> \xB1\x56 |0
-<U5D17> \xB1\x5E |0
-<U5D18> \xFB\xE4 |0
-<U5D19> \xB1\x5B |0
-<U5D1A> \xD4\xF7 |0
-<U5D1B> \xB1\x55 |0
-<U5D1D> \xD4\xF6 |0
-<U5D1E> \xD4\xF4 |0
-<U5D1F> \xD5\x43 |0
-<U5D20> \xD4\xF8 |0
-<U5D22> \xB1\x57 |0
-<U5D23> \xD5\x42 |0
-<U5D24> \xB1\x5C |0
-<U5D25> \xD4\xFD |0
-<U5D26> \xD4\xFC |0
-<U5D27> \xB1\x5D |0
-<U5D28> \xD4\xFA |0
-<U5D29> \xB1\x59 |0
-<U5D2C> \x9C\x75 |0
-<U5D2E> \xD5\x44 |0
-<U5D2F> \x98\x78 |0
-<U5D30> \xD5\x40 |0
-<U5D31> \xD8\xE7 |0
-<U5D32> \xD8\xEE |0
-<U5D33> \xD8\xE3 |0
-<U5D34> \xB4\x51 |0
-<U5D35> \xD8\xDF |0
-<U5D36> \xD8\xEF |0
-<U5D37> \xD8\xD9 |0
-<U5D38> \xD8\xEC |0
-<U5D39> \xD8\xEA |0
-<U5D3A> \xD8\xE4 |0
-<U5D3C> \xD8\xED |0
-<U5D3D> \xD8\xE6 |0
-<U5D3E> \x8D\x60 |0
-<U5D3F> \xD8\xDE |0
-<U5D40> \xD8\xF0 |0
-<U5D41> \xD8\xDC |0
-<U5D42> \xD8\xE9 |0
-<U5D43> \xD8\xDA |0
-<U5D45> \xD8\xF1 |0
-<U5D46> \xFB\xE5 |0
-<U5D47> \xB4\x52 |0
-<U5D48> \x8D\x61 |0
-<U5D49> \xD8\xEB |0
-<U5D4A> \xDD\x4F |0
-<U5D4B> \xD8\xDD |0
-<U5D4C> \xB4\x4F |0
-<U5D4E> \xD8\xE1 |0
-<U5D50> \xB4\x50 |0
-<U5D51> \xD8\xE0 |0
-<U5D52> \xD8\xE5 |0
-<U5D55> \xD8\xE2 |0
-<U5D56> \x8D\x62 |0
-<U5D57> \xA0\xA1 |0
-<U5D59> \xD8\xE8 |0
-<U5D5B> \x9C\x40 |0
-<U5D5E> \xDD\x53 |0
-<U5D62> \xDD\x56 |0
-<U5D63> \xDD\x4E |0
-<U5D65> \xDD\x50 |0
-<U5D67> \xDD\x55 |0
-<U5D68> \xDD\x54 |0
-<U5D69> \xB7\x43 |0
-<U5D6B> \xD8\xDB |0
-<U5D6C> \xDD\x52 |0
-<U5D6F> \xB7\x44 |0
-<U5D70> \x98\xAD |0
-<U5D71> \xDD\x4D |0
-<U5D72> \xDD\x51 |0
-<U5D74> \x9E\xEA |0
-<U5D77> \xE1\xA9 |0
-<U5D79> \xE1\xB0 |0
-<U5D7A> \xE1\xA7 |0
-<U5D7C> \xE1\xAE |0
-<U5D7D> \xE1\xA5 |0
-<U5D7E> \xE1\xAD |0
-<U5D7F> \xE1\xB1 |0
-<U5D80> \xE1\xA4 |0
-<U5D81> \xE1\xA8 |0
-<U5D82> \xE1\xA3 |0
-<U5D84> \xB9\xF1 |0
-<U5D85> \x9C\xEB |0
-<U5D86> \xE1\xA6 |0
-<U5D87> \xB9\xF2 |0
-<U5D88> \xE1\xAC |0
-<U5D89> \xE1\xAB |0
-<U5D8A> \xE1\xAA |0
-<U5D8B> \xFB\xE0 |0
-<U5D8D> \xE1\xAF |0
-<U5D8E> \x9F\x51 |0
-<U5D92> \xE5\x65 |0
-<U5D93> \xE5\x67 |0
-<U5D94> \xBC\x6B |0
-<U5D95> \xE5\x68 |0
-<U5D97> \xE5\x63 |0
-<U5D99> \xE5\x62 |0
-<U5D9A> \xE5\x6C |0
-<U5D9C> \xE5\x6A |0
-<U5D9D> \xBC\x6A |0
-<U5D9E> \xE5\x6D |0
-<U5D9F> \xE5\x64 |0
-<U5DA0> \xE5\x69 |0
-<U5DA1> \xE5\x6B |0
-<U5DA2> \xE5\x66 |0
-<U5DA4> \x8D\x65 |0
-<U5DA7> \xE9\x61 |0
-<U5DA8> \xE9\x66 |0
-<U5DA9> \xE9\x60 |0
-<U5DAA> \xE9\x65 |0
-<U5DAB> \x9C\xF1 |0
-<U5DAC> \xE9\x5E |0
-<U5DAD> \xE9\x68 |0
-<U5DAE> \xE9\x64 |0
-<U5DAF> \xE9\x69 |0
-<U5DB0> \xE9\x63 |0
-<U5DB1> \xE9\x5F |0
-<U5DB2> \xE9\x67 |0
-<U5DB4> \xE9\x6A |0
-<U5DB5> \xE9\x62 |0
-<U5DB6> \xFC\x58 |0
-<U5DB7> \xEC\xDA |0
-<U5DB8> \xC0\xAF |0
-<U5DB9> \x8D\x66 |0
-<U5DBA> \xC0\xAD |0
-<U5DBC> \xC0\xAC |0
-<U5DBD> \xC0\xAE |0
-<U5DC0> \xEF\xC4 |0
-<U5DC1> \x96\x54 |0
-<U5DC2> \xF1\x72 |0
-<U5DC3> \xF1\xFD |0
-<U5DC6> \xF4\x44 |0
-<U5DC7> \xF4\x45 |0
-<U5DC9> \xC4\x60 |0
-<U5DCB> \xF5\xC9 |0
-<U5DCD> \xC4\xDE |0
-<U5DCF> \xF5\xCA |0
-<U5DD1> \xF6\xDE |0
-<U5DD2> \xC5\x72 |0
-<U5DD4> \xC5\x71 |0
-<U5DD5> \xF6\xDD |0
-<U5DD6> \xC5\xC9 |0
-<U5DD7> \xFB\xE8 |0
-<U5DD8> \xF7\xD6 |0
-<U5DDB> \xC6\xCC |0
-<U5DDD> \xA4\x74 |0
-<U5DDE> \xA6\x7B |0
-<U5DDF> \xC9\xDA |0
-<U5DE0> \xCA\xCA |0
-<U5DE1> \xA8\xB5 |0
-<U5DE2> \xB1\x5F |0
-<U5DE5> \xA4\x75 |0
-<U5DE6> \xA5\xAA |0
-<U5DE7> \xA5\xA9 |0
-<U5DE8> \xA5\xA8 |0
-<U5DEB> \xA7\xC5 |0
-<U5DEE> \xAE\x74 |0
-<U5DF0> \xDD\x57 |0
-<U5DF1> \xA4\x76 |0
-<U5DF2> \xA4\x77 |0
-<U5DF3> \xA4\x78 |0
-<U5DF4> \xA4\xDA |0
-<U5DF5> \x9F\xCE |0
-<U5DF7> \xAB\xD1 |0
-<U5DF9> \xCE\xAF |0
-<U5DFD> \xB4\x53 |0
-<U5DFE> \xA4\x79 |0
-<U5DFF> \xC9\x5D |0
-<U5E02> \xA5\xAB |0
-<U5E03> \xA5\xAC |0
-<U5E04> \xC9\x78 |0
-<U5E06> \xA6\x7C |0
-<U5E09> \xFB\xFC |0
-<U5E0A> \xCA\xCB |0
-<U5E0B> \x9A\xE4 |0
-<U5E0C> \xA7\xC6 |0
-<U5E0E> \xCA\xCC |0
-<U5E11> \xA9\xAE |0
-<U5E12> \x9F\x75 |0
-<U5E14> \xCC\x6E |0
-<U5E15> \xA9\xAC |0
-<U5E16> \xA9\xAB |0
-<U5E17> \xCC\x6D |0
-<U5E18> \xA9\xA9 |0
-<U5E19> \xCC\x6F |0
-<U5E1A> \xA9\xAA |0
-<U5E1B> \xA9\xAD |0
-<U5E1D> \xAB\xD2 |0
-<U5E1F> \xAB\xD4 |0
-<U5E20> \xCE\xB3 |0
-<U5E21> \xCE\xB0 |0
-<U5E22> \xCE\xB1 |0
-<U5E23> \xCE\xB2 |0
-<U5E24> \xCE\xB4 |0
-<U5E25> \xAB\xD3 |0
-<U5E28> \xD1\x74 |0
-<U5E29> \xD1\x73 |0
-<U5E2B> \xAE\x76 |0
-<U5E2D> \xAE\x75 |0
-<U5E2E> \xFB\xF1 |0
-<U5E33> \xB1\x62 |0
-<U5E34> \xD5\x46 |0
-<U5E36> \xB1\x61 |0
-<U5E37> \xB1\x63 |0
-<U5E38> \xB1\x60 |0
-<U5E3D> \xB4\x55 |0
-<U5E3E> \xD5\x45 |0
-<U5E40> \xB4\x56 |0
-<U5E41> \xD8\xF3 |0
-<U5E42> \x8D\x69 |0
-<U5E43> \xB4\x57 |0
-<U5E44> \xD8\xF2 |0
-<U5E45> \xB4\x54 |0
-<U5E48> \x93\x4F |0
-<U5E4A> \xDD\x5A |0
-<U5E4B> \xDD\x5C |0
-<U5E4C> \xB7\x45 |0
-<U5E4D> \xDD\x5B |0
-<U5E4E> \xDD\x59 |0
-<U5E4F> \xDD\x58 |0
-<U5E53> \xE1\xB4 |0
-<U5E54> \xB9\xF7 |0
-<U5E55> \xB9\xF5 |0
-<U5E57> \xB9\xF6 |0
-<U5E58> \xE1\xB2 |0
-<U5E59> \xE1\xB3 |0
-<U5E5B> \xB9\xF3 |0
-<U5E5C> \xE5\x71 |0
-<U5E5D> \xE5\x6F |0
-<U5E5E> \x93\x4E |0
-<U5E5F> \xBC\x6D |0
-<U5E60> \xE5\x70 |0
-<U5E61> \xBC\x6E |0
-<U5E62> \xBC\x6C |0
-<U5E63> \xB9\xF4 |0
-<U5E66> \xE9\x6D |0
-<U5E67> \xE9\x6B |0
-<U5E68> \xE9\x6C |0
-<U5E69> \xE5\x6E |0
-<U5E6A> \xEC\xDC |0
-<U5E6B> \xC0\xB0 |0
-<U5E6C> \xEC\xDB |0
-<U5E6D> \xEF\xC5 |0
-<U5E6E> \xEF\xC6 |0
-<U5E6F> \xE9\x6E |0
-<U5E70> \xF1\xFE |0
-<U5E72> \xA4\x7A |0
-<U5E73> \xA5\xAD |0
-<U5E74> \xA6\x7E |0
-<U5E75> \xC9\xDB |0
-<U5E76> \xA6\x7D |0
-<U5E78> \xA9\xAF |0
-<U5E79> \xB7\x46 |0
-<U5E7A> \xFB\xF4 |0
-<U5E7B> \xA4\xDB |0
-<U5E7C> \xA5\xAE |0
-<U5E7D> \xAB\xD5 |0
-<U5E7E> \xB4\x58 |0
-<U5E7F> \xC6\xCE |0
-<U5E80> \xC9\x79 |0
-<U5E82> \xC9\x7A |0
-<U5E83> \xFB\xC3 |0
-<U5E84> \xC9\xDC |0
-<U5E86> \x89\x65 |0
-<U5E87> \xA7\xC8 |0
-<U5E88> \xCA\xD0 |0
-<U5E89> \xCA\xCE |0
-<U5E8A> \xA7\xC9 |0
-<U5E8B> \xCA\xCD |0
-<U5E8C> \xCA\xCF |0
-<U5E8D> \xCA\xD1 |0
-<U5E8F> \xA7\xC7 |0
-<U5E95> \xA9\xB3 |0
-<U5E96> \xA9\xB4 |0
-<U5E97> \xA9\xB1 |0
-<U5E9A> \xA9\xB0 |0
-<U5E9B> \xCE\xB8 |0
-<U5E9C> \xA9\xB2 |0
-<U5EA0> \xAB\xD6 |0
-<U5EA2> \xCE\xB7 |0
-<U5EA3> \xCE\xB9 |0
-<U5EA4> \xCE\xB6 |0
-<U5EA5> \xCE\xBA |0
-<U5EA6> \xAB\xD7 |0
-<U5EA7> \xAE\x79 |0
-<U5EA8> \xD1\x75 |0
-<U5EAA> \xD1\x77 |0
-<U5EAB> \xAE\x77 |0
-<U5EAC> \xD1\x78 |0
-<U5EAD> \xAE\x78 |0
-<U5EAE> \xD1\x76 |0
-<U5EB0> \xCE\xB5 |0
-<U5EB1> \xD5\x47 |0
-<U5EB2> \xD5\x4A |0
-<U5EB3> \xD5\x4B |0
-<U5EB4> \xD5\x48 |0
-<U5EB5> \xB1\x67 |0
-<U5EB6> \xB1\x66 |0
-<U5EB7> \xB1\x64 |0
-<U5EB8> \xB1\x65 |0
-<U5EB9> \xD5\x49 |0
-<U5EBD> \x8D\x6A |0
-<U5EBE> \xB1\x68 |0
-<U5EC1> \xB4\x5A |0
-<U5EC2> \xB4\x5B |0
-<U5EC4> \xB4\x5C |0
-<U5EC5> \xDD\x5D |0
-<U5EC6> \xDD\x5F |0
-<U5EC7> \xDD\x61 |0
-<U5EC8> \xB7\x48 |0
-<U5EC9> \xB7\x47 |0
-<U5ECA> \xB4\x59 |0
-<U5ECB> \xDD\x60 |0
-<U5ECC> \xDD\x5E |0
-<U5ECD> \x93\x53 |0
-<U5ECE> \xE1\xB8 |0
-<U5ED0> \x9D\xFB |0
-<U5ED1> \xE1\xB6 |0
-<U5ED2> \xE1\xBC |0
-<U5ED3> \xB9\xF8 |0
-<U5ED4> \xE1\xBD |0
-<U5ED5> \xE1\xBA |0
-<U5ED6> \xB9\xF9 |0
-<U5ED7> \xE1\xB7 |0
-<U5ED8> \xE1\xB5 |0
-<U5ED9> \xE1\xBB |0
-<U5EDA> \xBC\x70 |0
-<U5EDB> \xE5\x73 |0
-<U5EDC> \xE1\xB9 |0
-<U5EDD> \xBC\x72 |0
-<U5EDE> \xE5\x74 |0
-<U5EDF> \xBC\x71 |0
-<U5EE0> \xBC\x74 |0
-<U5EE1> \xE5\x75 |0
-<U5EE2> \xBC\x6F |0
-<U5EE3> \xBC\x73 |0
-<U5EE5> \xE9\x73 |0
-<U5EE6> \xE9\x71 |0
-<U5EE7> \xE9\x70 |0
-<U5EE8> \xE9\x72 |0
-<U5EE9> \xE9\x6F |0
-<U5EEC> \xC3\x66 |0
-<U5EEE> \xF4\x46 |0
-<U5EEF> \xF4\x47 |0
-<U5EF1> \xF5\xCB |0
-<U5EF2> \xF6\xDF |0
-<U5EF3> \xC6\x55 |0
-<U5EF4> \xFB\xFD |0
-<U5EF6> \xA9\xB5 |0
-<U5EF7> \xA7\xCA |0
-<U5EF8> \x90\x59 |0
-<U5EF9> \xFC\x40 |0
-<U5EFA> \xAB\xD8 |0
-<U5EFB> \xFC\x41 |0
-<U5EFC> \xFC\x43 |0
-<U5EFE> \xA4\x7B |0
-<U5EFF> \xA4\xDC |0
-<U5F01> \xA5\xAF |0
-<U5F02> \xC9\xDD |0
-<U5F04> \xA7\xCB |0
-<U5F05> \xCA\xD2 |0
-<U5F07> \xCE\xBB |0
-<U5F08> \xAB\xD9 |0
-<U5F0A> \xB9\xFA |0
-<U5F0B> \xA4\x7C |0
-<U5F0C> \x93\x61 |0
-<U5F0D> \xFC\x46 |0
-<U5F0E> \x93\x62 |0
-<U5F0F> \xA6\xA1 |0
-<U5F12> \xB7\x49 |0
-<U5F13> \xA4\x7D |0
-<U5F14> \xA4\xDD |0
-<U5F15> \xA4\xDE |0
-<U5F17> \xA5\xB1 |0
-<U5F18> \xA5\xB0 |0
-<U5F1A> \xC9\xDE |0
-<U5F1B> \xA6\xA2 |0
-<U5F1D> \xCA\xD3 |0
-<U5F1F> \xA7\xCC |0
-<U5F22> \xCC\x71 |0
-<U5F23> \xCC\x72 |0
-<U5F24> \xCC\x73 |0
-<U5F25> \x8D\x6B |0
-<U5F26> \xA9\xB6 |0
-<U5F27> \xA9\xB7 |0
-<U5F28> \xCC\x70 |0
-<U5F29> \xA9\xB8 |0
-<U5F2D> \xAB\xDA |0
-<U5F2E> \xCE\xBC |0
-<U5F30> \xD1\x7A |0
-<U5F31> \xAE\x7A |0
-<U5F33> \xD1\x79 |0
-<U5F35> \xB1\x69 |0
-<U5F36> \xD5\x4C |0
-<U5F37> \xB1\x6A |0
-<U5F38> \xD5\x4D |0
-<U5F3A> \xFC\x4C |0
-<U5F3C> \xB4\x5D |0
-<U5F40> \xDD\x62 |0
-<U5F43> \xE1\xBF |0
-<U5F44> \xE1\xBE |0
-<U5F46> \xB9\xFB |0
-<U5F48> \xBC\x75 |0
-<U5F49> \xE5\x76 |0
-<U5F4A> \xBE\xCA |0
-<U5F4B> \xE9\x74 |0
-<U5F4C> \xC0\xB1 |0
-<U5F4D> \x95\xB8 |0
-<U5F4E> \xC5\x73 |0
-<U5F4F> \xF7\xD8 |0
-<U5F50> \xC6\xD0 |0
-<U5F51> \x8B\xCA |0
-<U5F54> \xCC\x74 |0
-<U5F56> \xCE\xBD |0
-<U5F57> \xB1\x6B |0
-<U5F58> \xD8\xF4 |0
-<U5F59> \xB7\x4A |0
-<U5F5C> \x98\x7A |0
-<U5F5D> \xC2\x55 |0
-<U5F61> \xC6\xD1 |0
-<U5F62> \xA7\xCE |0
-<U5F63> \xFC\x51 |0
-<U5F64> \xA7\xCD |0
-<U5F65> \xAB\xDB |0
-<U5F67> \xD1\x7B |0
-<U5F69> \xB1\x6D |0
-<U5F6A> \xB3\x43 |0
-<U5F6B> \xB1\x6E |0
-<U5F6C> \xB1\x6C |0
-<U5F6D> \xB4\x5E |0
-<U5F6F> \xE1\xC0 |0
-<U5F70> \xB9\xFC |0
-<U5F71> \xBC\x76 |0
-<U5F72> \xFC\x54 |0
-<U5F73> \xC9\x4C |0
-<U5F74> \xC9\xDF |0
-<U5F76> \xCA\xD5 |0
-<U5F77> \xA7\xCF |0
-<U5F78> \xCA\xD4 |0
-<U5F79> \xA7\xD0 |0
-<U5F7B> \xFA\xAF |0
-<U5F7C> \xA9\xBC |0
-<U5F7D> \xCC\x77 |0
-<U5F7E> \xCC\x76 |0
-<U5F7F> \xA9\xBB |0
-<U5F80> \xA9\xB9 |0
-<U5F81> \xA9\xBA |0
-<U5F82> \xCC\x75 |0
-<U5F83> \x8D\x6C |0
-<U5F85> \xAB\xDD |0
-<U5F86> \xCE\xBE |0
-<U5F87> \xAB\xE0 |0
-<U5F88> \xAB\xDC |0
-<U5F89> \xAB\xE2 |0
-<U5F8A> \xAB\xDE |0
-<U5F8B> \xAB\xDF |0
-<U5F8C> \xAB\xE1 |0
-<U5F90> \xAE\x7D |0
-<U5F91> \xAE\x7C |0
-<U5F92> \xAE\x7B |0
-<U5F96> \xD5\x4F |0
-<U5F97> \xB1\x6F |0
-<U5F98> \xB1\x72 |0
-<U5F99> \xB1\x70 |0
-<U5F9B> \xD5\x4E |0
-<U5F9C> \xB1\x75 |0
-<U5F9E> \xB1\x71 |0
-<U5F9F> \xD5\x50 |0
-<U5FA0> \xB1\x74 |0
-<U5FA1> \xB1\x73 |0
-<U5FA4> \xFA\x61 |0
-<U5FA5> \xD8\xF6 |0
-<U5FA6> \xD8\xF5 |0
-<U5FA7> \xFC\x57 |0
-<U5FA8> \xB4\x61 |0
-<U5FA9> \xB4\x5F |0
-<U5FAA> \xB4\x60 |0
-<U5FAB> \xD8\xF7 |0
-<U5FAC> \xB7\x4B |0
-<U5FAD> \xDD\x64 |0
-<U5FAE> \xB7\x4C |0
-<U5FAF> \xDD\x63 |0
-<U5FB1> \x9B\x70 |0
-<U5FB2> \xE5\x77 |0
-<U5FB5> \xBC\x78 |0
-<U5FB6> \xE1\xC1 |0
-<U5FB7> \xBC\x77 |0
-<U5FB9> \xB9\xFD |0
-<U5FBA> \xA0\x51 |0
-<U5FBB> \xEC\xDE |0
-<U5FBC> \xE9\x75 |0
-<U5FBD> \xC0\xB2 |0
-<U5FBE> \xEC\xDD |0
-<U5FBF> \xF2\x40 |0
-<U5FC0> \xF4\x48 |0
-<U5FC1> \xF4\x49 |0
-<U5FC3> \xA4\xDF |0
-<U5FC4> \x8B\xCB |0
-<U5FC5> \xA5\xB2 |0
-<U5FC9> \xC9\x7B |0
-<U5FCC> \xA7\xD2 |0
-<U5FCD> \xA7\xD4 |0
-<U5FCF> \xC9\xE2 |0
-<U5FD0> \xCA\xD8 |0
-<U5FD1> \xCA\xD7 |0
-<U5FD2> \xCA\xD6 |0
-<U5FD4> \xC9\xE1 |0
-<U5FD5> \xC9\xE0 |0
-<U5FD6> \xA6\xA4 |0
-<U5FD7> \xA7\xD3 |0
-<U5FD8> \xA7\xD1 |0
-<U5FD9> \xA6\xA3 |0
-<U5FDB> \x93\x6E |0
-<U5FDD> \xA9\xBD |0
-<U5FDE> \xCC\x78 |0
-<U5FDF> \xFC\xD5 |0
-<U5FE0> \xA9\xBE |0
-<U5FE1> \xCA\xDD |0
-<U5FE3> \xCA\xDF |0
-<U5FE4> \xCA\xDE |0
-<U5FE5> \xCC\x79 |0
-<U5FE8> \xCA\xDA |0
-<U5FEA> \xA7\xD8 |0
-<U5FEB> \xA7\xD6 |0
-<U5FED> \xCA\xD9 |0
-<U5FEE> \xCA\xDB |0
-<U5FEF> \xCA\xE1 |0
-<U5FF1> \xA7\xD5 |0
-<U5FF3> \xCA\xDC |0
-<U5FF4> \xCA\xE5 |0
-<U5FF5> \xA9\xC0 |0
-<U5FF7> \xCA\xE2 |0
-<U5FF8> \xA7\xD7 |0
-<U5FFA> \xCA\xE0 |0
-<U5FFB> \xCA\xE3 |0
-<U5FFD> \xA9\xBF |0
-<U5FFF> \xA9\xC1 |0
-<U6000> \xCA\xE4 |0
-<U6009> \xCC\xAF |0
-<U600A> \xCC\xA2 |0
-<U600B> \xCC\x7E |0
-<U600C> \xCC\xAE |0
-<U600D> \xCC\xA9 |0
-<U600E> \xAB\xE7 |0
-<U600F> \xA9\xC2 |0
-<U6010> \xCC\xAA |0
-<U6011> \xCC\xAD |0
-<U6012> \xAB\xE3 |0
-<U6013> \xCC\xAC |0
-<U6014> \xA9\xC3 |0
-<U6015> \xA9\xC8 |0
-<U6016> \xA9\xC6 |0
-<U6017> \xCC\xA3 |0
-<U6019> \xCC\x7C |0
-<U601A> \xCC\xA5 |0
-<U601B> \xA9\xCD |0
-<U601C> \xCC\xB0 |0
-<U601D> \xAB\xE4 |0
-<U601E> \xCC\xA6 |0
-<U6020> \xAB\xE5 |0
-<U6021> \xA9\xC9 |0
-<U6022> \xCC\xA8 |0
-<U6023> \xFC\xA9 |0
-<U6024> \xCE\xCD |0
-<U6025> \xAB\xE6 |0
-<U6026> \xCC\x7B |0
-<U6027> \xA9\xCA |0
-<U6028> \xAB\xE8 |0
-<U6029> \xA9\xCB |0
-<U602A> \xA9\xC7 |0
-<U602B> \xA9\xCC |0
-<U602C> \xCC\xA7 |0
-<U602D> \xCC\x7A |0
-<U602E> \xCC\xAB |0
-<U602F> \xA9\xC4 |0
-<U6031> \xFC\x61 |0
-<U6032> \xCC\x7D |0
-<U6033> \xCC\xA4 |0
-<U6034> \xCC\xA1 |0
-<U6035> \xA9\xC5 |0
-<U6037> \xCE\xBF |0
-<U6039> \xCE\xC0 |0
-<U603B> \x89\x66 |0
-<U6040> \xCE\xCA |0
-<U6041> \xD1\xA1 |0
-<U6042> \xCE\xCB |0
-<U6043> \xAB\xEE |0
-<U6044> \xCE\xCE |0
-<U6045> \xCE\xC4 |0
-<U6046> \xAB\xED |0
-<U6047> \xCE\xC6 |0
-<U6049> \xCE\xC7 |0
-<U604A> \xFA\xCB |0
-<U604C> \xCE\xC9 |0
-<U604D> \xAB\xE9 |0
-<U6050> \xAE\xA3 |0
-<U6052> \xF9\xDA |0
-<U6053> \xCE\xC5 |0
-<U6054> \xCE\xC1 |0
-<U6055> \xAE\xA4 |0
-<U6058> \xCE\xCF |0
-<U6059> \xAE\x7E |0
-<U605A> \xD1\x7D |0
-<U605B> \xCE\xC8 |0
-<U605D> \xD1\x7C |0
-<U605E> \xCE\xC3 |0
-<U605F> \xCE\xCC |0
-<U6062> \xAB\xEC |0
-<U6063> \xAE\xA1 |0
-<U6064> \xAB\xF2 |0
-<U6065> \xAE\xA2 |0
-<U6066> \xCE\xD0 |0
-<U6067> \xD1\x7E |0
-<U6068> \xAB\xEB |0
-<U6069> \xAE\xA6 |0
-<U606A> \xAB\xF1 |0
-<U606B> \xAB\xF0 |0
-<U606C> \xAB\xEF |0
-<U606D> \xAE\xA5 |0
-<U606E> \xCE\xD1 |0
-<U606F> \xAE\xA7 |0
-<U6070> \xAB\xEA |0
-<U6072> \xCE\xC2 |0
-<U6075> \x93\x7A |0
-<U6077> \xA0\xE0 |0
-<U607E> \x93\x6B |0
-<U607F> \xB1\x76 |0
-<U6080> \xD1\xA4 |0
-<U6081> \xD1\xA6 |0
-<U6083> \xD1\xA8 |0
-<U6084> \xAE\xA8 |0
-<U6085> \xAE\xAE |0
-<U6086> \xD5\x53 |0
-<U6087> \xD1\xAC |0
-<U6088> \xD1\xA3 |0
-<U6089> \xB1\x78 |0
-<U608A> \xD5\x51 |0
-<U608C> \xAE\xAD |0
-<U608D> \xAE\xAB |0
-<U608E> \xD1\xAE |0
-<U6090> \xD5\x52 |0
-<U6092> \xD1\xA5 |0
-<U6094> \xAE\xAC |0
-<U6095> \xD1\xA9 |0
-<U6096> \xAE\xAF |0
-<U6097> \xD1\xAB |0
-<U609A> \xAE\xAA |0
-<U609B> \xD1\xAA |0
-<U609C> \xD1\xAD |0
-<U609D> \xD1\xA7 |0
-<U609E> \xFC\x6B |0
-<U609F> \xAE\xA9 |0
-<U60A0> \xB1\x79 |0
-<U60A2> \xD1\xA2 |0
-<U60A3> \xB1\x77 |0
-<U60A4> \xA0\xDC |0
-<U60A7> \x94\x68 |0
-<U60A8> \xB1\x7A |0
-<U60B0> \xD5\x55 |0
-<U60B1> \xD5\x5E |0
-<U60B2> \xB4\x64 |0
-<U60B3> \xFC\x6D |0
-<U60B4> \xB1\x7C |0
-<U60B5> \xB1\xA3 |0
-<U60B6> \xB4\x65 |0
-<U60B7> \xD5\x60 |0
-<U60B8> \xB1\xAA |0
-<U60B9> \xD8\xF9 |0
-<U60BA> \xD5\x56 |0
-<U60BB> \xB1\xA2 |0
-<U60BC> \xB1\xA5 |0
-<U60BD> \xB1\x7E |0
-<U60BE> \xD5\x54 |0
-<U60BF> \xD5\x62 |0
-<U60C0> \xD5\x65 |0
-<U60C1> \xD9\x49 |0
-<U60C3> \xD5\x63 |0
-<U60C4> \xD8\xFD |0
-<U60C5> \xB1\xA1 |0
-<U60C6> \xB1\xA8 |0
-<U60C7> \xB1\xAC |0
-<U60C8> \xD5\x5D |0
-<U60C9> \xD8\xF8 |0
-<U60CA> \xD5\x61 |0
-<U60CB> \xB1\x7B |0
-<U60CC> \xD8\xFA |0
-<U60CD> \xD5\x64 |0
-<U60CE> \xD8\xFC |0
-<U60CF> \xD5\x59 |0
-<U60D1> \xB4\x62 |0
-<U60D3> \xD5\x57 |0
-<U60D4> \xD5\x58 |0
-<U60D5> \xB1\xA7 |0
-<U60D7> \x8D\x71 |0
-<U60D8> \xB1\xA6 |0
-<U60D9> \xD5\x5B |0
-<U60DA> \xB1\xAB |0
-<U60DB> \xD5\x5F |0
-<U60DC> \xB1\xA4 |0
-<U60DD> \xD5\x5C |0
-<U60DE> \xFD\x64 |0
-<U60DF> \xB1\xA9 |0
-<U60E0> \xB4\x66 |0
-<U60E1> \xB4\x63 |0
-<U60E2> \xD8\xFB |0
-<U60E3> \x99\xBA |0
-<U60E4> \xD5\x5A |0
-<U60E6> \xB1\x7D |0
-<U60E7> \x9A\xD0 |0
-<U60E8> \x9A\x61 |0
-<U60E9> \xA0\xE5 |0
-<U60F0> \xB4\x6B |0
-<U60F1> \xB4\x6F |0
-<U60F2> \xD9\x40 |0
-<U60F3> \xB7\x51 |0
-<U60F4> \xB4\x6D |0
-<U60F5> \xD9\x44 |0
-<U60F6> \xB4\x71 |0
-<U60F7> \xDD\x65 |0
-<U60F8> \xD9\x46 |0
-<U60F9> \xB7\x53 |0
-<U60FA> \xB4\x69 |0
-<U60FB> \xB4\x6C |0
-<U60FC> \xD9\x47 |0
-<U60FD> \xA0\x5B |0
-<U60FE> \xD9\x48 |0
-<U60FF> \xD9\x4E |0
-<U6100> \xB4\x73 |0
-<U6101> \xB7\x54 |0
-<U6103> \xD9\x4A |0
-<U6104> \xD9\x4F |0
-<U6105> \xD9\x43 |0
-<U6106> \xB7\x5E |0
-<U6107> \x96\xAC |0
-<U6108> \xB7\x55 |0
-<U6109> \xB4\x72 |0
-<U610A> \xD9\x41 |0
-<U610B> \xD9\x50 |0
-<U610C> \x97\x40 |0
-<U610D> \xB7\x5D |0
-<U610E> \xB4\x70 |0
-<U610F> \xB7\x4E |0
-<U6110> \xD9\x4D |0
-<U6112> \xB4\x74 |0
-<U6113> \xD9\x45 |0
-<U6114> \xD8\xFE |0
-<U6115> \xB4\x6A |0
-<U6116> \xD9\x42 |0
-<U6118> \xD9\x4B |0
-<U6119> \x9E\xF1 |0
-<U611A> \xB7\x4D |0
-<U611B> \xB7\x52 |0
-<U611C> \xB4\x67 |0
-<U611D> \xD9\x4C |0
-<U611F> \xB7\x50 |0
-<U6123> \xB4\x68 |0
-<U6127> \xB7\x5C |0
-<U6128> \xE1\xC3 |0
-<U6129> \xDD\x70 |0
-<U612B> \xDD\x68 |0
-<U612C> \xE1\xC2 |0
-<U612E> \xDD\x6C |0
-<U612F> \xDD\x6E |0
-<U6130> \x9F\x7E |0
-<U6132> \xDD\x6B |0
-<U6134> \xB7\x5B |0
-<U6136> \xDD\x6A |0
-<U6137> \xB7\x5F |0
-<U613B> \xE1\xD2 |0
-<U613D> \x8D\x72 |0
-<U613E> \xB7\x5A |0
-<U613F> \xBA\x40 |0
-<U6140> \xDD\x71 |0
-<U6141> \xE1\xC4 |0
-<U6142> \xFC\x76 |0
-<U6144> \xB7\x58 |0
-<U6145> \xDD\x69 |0
-<U6146> \xDD\x6D |0
-<U6147> \xB9\xFE |0
-<U6148> \xB7\x4F |0
-<U6149> \xDD\x66 |0
-<U614A> \xDD\x67 |0
-<U614B> \xBA\x41 |0
-<U614C> \xB7\x57 |0
-<U614D> \xB7\x59 |0
-<U614E> \xB7\x56 |0
-<U614F> \xDD\x6F |0
-<U6150> \x96\xA9 |0
-<U6152> \xE1\xC8 |0
-<U6153> \xE1\xC9 |0
-<U6154> \xE1\xCE |0
-<U6155> \xBC\x7D |0
-<U6156> \xE1\xD5 |0
-<U6158> \xBA\x47 |0
-<U6159> \xA0\x6E |0
-<U615A> \xBA\x46 |0
-<U615B> \xE1\xD0 |0
-<U615C> \xFC\xAA |0
-<U615D> \xBC\x7C |0
-<U615E> \xE1\xC5 |0
-<U615F> \xBA\x45 |0
-<U6160> \xFB\xCD |0
-<U6161> \xE1\xD4 |0
-<U6162> \xBA\x43 |0
-<U6163> \xBA\x44 |0
-<U6164> \xFC\x74 |0
-<U6165> \xE1\xD1 |0
-<U6166> \xE5\xAA |0
-<U6167> \xBC\x7A |0
-<U6168> \xB4\x6E |0
-<U616A> \xE1\xD3 |0
-<U616B> \xBC\xA3 |0
-<U616C> \xE1\xCB |0
-<U616E> \xBC\x7B |0
-<U616F> \xA0\x74 |0
-<U6170> \xBC\xA2 |0
-<U6171> \xE1\xC6 |0
-<U6172> \xE1\xCA |0
-<U6173> \xE1\xC7 |0
-<U6174> \xE1\xCD |0
-<U6175> \xBA\x48 |0
-<U6176> \xBC\x79 |0
-<U6177> \xBA\x42 |0
-<U6179> \xE5\x7A |0
-<U617A> \xE1\xCF |0
-<U617C> \xBC\xA1 |0
-<U617D> \xA0\x71 |0
-<U617E> \xBC\xA4 |0
-<U6180> \xE1\xCC |0
-<U6181> \xFC\x79 |0
-<U6182> \xBC\x7E |0
-<U6183> \xE5\x79 |0
-<U6187> \xFC\x7C |0
-<U6189> \xE5\x7E |0
-<U618A> \xBE\xCE |0
-<U618B> \xE5\x78 |0
-<U618C> \xE9\xA3 |0
-<U618D> \xE5\xA9 |0
-<U618E> \xBC\xA8 |0
-<U6190> \xBC\xA6 |0
-<U6191> \xBE\xCC |0
-<U6192> \xE5\xA6 |0
-<U6193> \xE5\xA2 |0
-<U6194> \xBC\xAC |0
-<U6195> \x9C\x50 |0
-<U6196> \xE9\x78 |0
-<U6198> \x93\x79 |0
-<U6199> \x93\x78 |0
-<U619A> \xBC\xAA |0
-<U619B> \xE5\xA1 |0
-<U619C> \xA0\xDD |0
-<U619D> \xE9\x76 |0
-<U619F> \xE5\xA5 |0
-<U61A1> \xE5\xA8 |0
-<U61A2> \xE5\x7D |0
-<U61A4> \xBC\xAB |0
-<U61A7> \xBC\xA5 |0
-<U61A8> \xE9\x77 |0
-<U61A9> \xBE\xCD |0
-<U61AA> \xE5\xA7 |0
-<U61AB> \xBC\xA7 |0
-<U61AC> \xBC\xA9 |0
-<U61AD> \xE5\xA4 |0
-<U61AE> \xBC\xAD |0
-<U61AF> \xE5\xA3 |0
-<U61B0> \xE5\x7C |0
-<U61B1> \xE5\x7B |0
-<U61B2> \xBE\xCB |0
-<U61B3> \xE5\xAB |0
-<U61B4> \xE9\x7A |0
-<U61B5> \xEC\xE0 |0
-<U61B6> \xBE\xD0 |0
-<U61B7> \x8D\x75 |0
-<U61B8> \xE9\xA2 |0
-<U61B9> \x8D\x76 |0
-<U61BA> \xE9\x7E |0
-<U61BC> \xEC\xE1 |0
-<U61BE> \xBE\xD1 |0
-<U61BF> \xE9\xA1 |0
-<U61C0> \x93\x74 |0
-<U61C1> \xE9\x7C |0
-<U61C2> \xC0\xB4 |0
-<U61C3> \xEC\xDF |0
-<U61C5> \xE9\x79 |0
-<U61C6> \xE9\x7B |0
-<U61C7> \xC0\xB5 |0
-<U61C8> \xBE\xD3 |0
-<U61C9> \xC0\xB3 |0
-<U61CA> \xBE\xD2 |0
-<U61CB> \xC0\xB7 |0
-<U61CC> \xE9\x7D |0
-<U61CD> \xBE\xCF |0
-<U61CF> \x8D\x77 |0
-<U61D0> \xFC\xA5 |0
-<U61D3> \xFC\xA2 |0
-<U61D6> \xEF\xCF |0
-<U61D8> \xEF\xC7 |0
-<U61DA> \x90\xC3 |0
-<U61DE> \xEC\xE7 |0
-<U61DF> \xEF\xC8 |0
-<U61E0> \xEC\xE3 |0
-<U61E2> \xA0\x79 |0
-<U61E3> \xC2\x56 |0
-<U61E4> \xEC\xE5 |0
-<U61E5> \xEC\xE4 |0
-<U61E6> \xC0\xB6 |0
-<U61E7> \xEC\xE2 |0
-<U61E8> \xEC\xE6 |0
-<U61E9> \xEF\xD0 |0
-<U61EA> \xEF\xCC |0
-<U61EB> \xEF\xCE |0
-<U61ED> \xEF\xC9 |0
-<U61EE> \xEF\xCA |0
-<U61F0> \xEF\xCD |0
-<U61F1> \xEF\xCB |0
-<U61F2> \xC3\x67 |0
-<U61F5> \xC3\x6A |0
-<U61F6> \xC3\x69 |0
-<U61F7> \xC3\x68 |0
-<U61F8> \xC4\x61 |0
-<U61F9> \xF4\x4A |0
-<U61FA> \xC4\x62 |0
-<U61FB> \xF2\x41 |0
-<U61FC> \xC4\xDF |0
-<U61FD> \xF5\xCC |0
-<U61FE> \xC4\xE0 |0
-<U61FF> \xC5\x74 |0
-<U6200> \xC5\xCA |0
-<U6201> \xF7\xD9 |0
-<U6203> \xF7\xDA |0
-<U6204> \xF7\xDB |0
-<U6207> \xF9\xBA |0
-<U6208> \xA4\xE0 |0
-<U6209> \xC9\x7C |0
-<U620A> \xA5\xB3 |0
-<U620C> \xA6\xA6 |0
-<U620D> \xA6\xA7 |0
-<U620E> \xA6\xA5 |0
-<U6210> \xA6\xA8 |0
-<U6211> \xA7\xDA |0
-<U6212> \xA7\xD9 |0
-<U6214> \xCC\xB1 |0
-<U6215> \xA9\xCF |0
-<U6216> \xA9\xCE |0
-<U6219> \xD1\xAF |0
-<U621A> \xB1\xAD |0
-<U621B> \xB1\xAE |0
-<U621F> \xB4\x75 |0
-<U6220> \xDD\x72 |0
-<U6221> \xB7\x60 |0
-<U6222> \xB7\x61 |0
-<U6223> \xDD\x74 |0
-<U6224> \xDD\x76 |0
-<U6225> \xDD\x75 |0
-<U6227> \xE1\xD7 |0
-<U6229> \xE1\xD6 |0
-<U622A> \xBA\x49 |0
-<U622B> \xE1\xD8 |0
-<U622C> \x8D\x79 |0
-<U622D> \xE5\xAC |0
-<U622E> \xBC\xAE |0
-<U6230> \xBE\xD4 |0
-<U6232> \xC0\xB8 |0
-<U6233> \xC2\x57 |0
-<U6234> \xC0\xB9 |0
-<U6236> \xA4\xE1 |0
-<U6237> \x8B\xFC |0
-<U6239> \xA0\x76 |0
-<U623A> \xCA\xE6 |0
-<U623D> \xCC\xB2 |0
-<U623E> \xA9\xD1 |0
-<U623F> \xA9\xD0 |0
-<U6240> \xA9\xD2 |0
-<U6241> \xAB\xF3 |0
-<U6242> \xCE\xD2 |0
-<U6243> \xCE\xD3 |0
-<U6246> \xD1\xB0 |0
-<U6247> \xAE\xB0 |0
-<U6248> \xB1\xAF |0
-<U6249> \xB4\x76 |0
-<U624A> \xD9\x51 |0
-<U624B> \xA4\xE2 |0
-<U624C> \x8B\xCD |0
-<U624D> \xA4\x7E |0
-<U624E> \xA4\xE3 |0
-<U6250> \xC9\x7D |0
-<U6251> \xA5\xB7 |0
-<U6252> \xA5\xB6 |0
-<U6253> \xA5\xB4 |0
-<U6254> \xA5\xB5 |0
-<U6258> \xA6\xAB |0
-<U6259> \xC9\xE9 |0
-<U625A> \xC9\xEB |0
-<U625B> \xA6\xAA |0
-<U625C> \xC9\xE3 |0
-<U625E> \xC9\xE4 |0
-<U6260> \xC9\xEA |0
-<U6261> \xC9\xE6 |0
-<U6262> \xC9\xE8 |0
-<U6263> \xA6\xA9 |0
-<U6264> \xC9\xE5 |0
-<U6265> \xC9\xEC |0
-<U6266> \xC9\xE7 |0
-<U6268> \x9F\x5A |0
-<U626D> \xA7\xE1 |0
-<U626E> \xA7\xEA |0
-<U626F> \xA7\xE8 |0
-<U6270> \xCA\xF0 |0
-<U6271> \xCA\xED |0
-<U6272> \xCA\xF5 |0
-<U6273> \xA7\xE6 |0
-<U6274> \xCA\xF6 |0
-<U6276> \xA7\xDF |0
-<U6277> \xCA\xF3 |0
-<U6279> \xA7\xE5 |0
-<U627A> \xCA\xEF |0
-<U627B> \xCA\xEE |0
-<U627C> \xA7\xE3 |0
-<U627D> \xCA\xF4 |0
-<U627E> \xA7\xE4 |0
-<U627F> \xA9\xD3 |0
-<U6280> \xA7\xDE |0
-<U6281> \xCA\xF1 |0
-<U6282> \x9F\xF4 |0
-<U6283> \xCA\xE7 |0
-<U6284> \xA7\xDB |0
-<U6285> \x9F\xBA |0
-<U6286> \xA7\xEE |0
-<U6287> \xCA\xEC |0
-<U6288> \xCA\xF2 |0
-<U6289> \xA7\xE0 |0
-<U628A> \xA7\xE2 |0
-<U628C> \xCA\xE8 |0
-<U628E> \xCA\xE9 |0
-<U628F> \xCA\xEA |0
-<U6290> \x8D\x7A |0
-<U6291> \xA7\xED |0
-<U6292> \xA7\xE7 |0
-<U6293> \xA7\xEC |0
-<U6294> \xCA\xEB |0
-<U6295> \xA7\xEB |0
-<U6296> \xA7\xDD |0
-<U6297> \xA7\xDC |0
-<U6298> \xA7\xE9 |0
-<U629D> \x9E\x45 |0
-<U62A4> \x93\xB0 |0
-<U62A6> \xA0\x75 |0
-<U62A8> \xA9\xE1 |0
-<U62A9> \xCC\xBE |0
-<U62AA> \xCC\xB7 |0
-<U62AB> \xA9\xDC |0
-<U62AC> \xA9\xEF |0
-<U62AD> \xCC\xB3 |0
-<U62AE> \xCC\xBA |0
-<U62AF> \xCC\xBC |0
-<U62B0> \xCC\xBF |0
-<U62B1> \xA9\xEA |0
-<U62B3> \xCC\xBB |0
-<U62B4> \xCC\xB4 |0
-<U62B5> \xA9\xE8 |0
-<U62B6> \xCC\xB8 |0
-<U62B8> \xCC\xC0 |0
-<U62B9> \xA9\xD9 |0
-<U62BB> \xCC\xBD |0
-<U62BC> \xA9\xE3 |0
-<U62BD> \xA9\xE2 |0
-<U62BE> \xCC\xB6 |0
-<U62BF> \xA9\xD7 |0
-<U62C2> \xA9\xD8 |0
-<U62C3> \x9B\x46 |0
-<U62C4> \xA9\xD6 |0
-<U62C5> \xFC\xAE |0
-<U62C6> \xA9\xEE |0
-<U62C7> \xA9\xE6 |0
-<U62C8> \xA9\xE0 |0
-<U62C9> \xA9\xD4 |0
-<U62CA> \xCC\xB9 |0
-<U62CB> \xA9\xDF |0
-<U62CC> \xA9\xD5 |0
-<U62CD> \xA9\xE7 |0
-<U62CE> \xA9\xF0 |0
-<U62CF> \xCE\xD4 |0
-<U62D0> \xA9\xE4 |0
-<U62D1> \xCC\xB5 |0
-<U62D2> \xA9\xDA |0
-<U62D3> \xA9\xDD |0
-<U62D4> \xA9\xDE |0
-<U62D5> \xFC\xB0 |0
-<U62D6> \xA9\xEC |0
-<U62D7> \xA9\xED |0
-<U62D8> \xA9\xEB |0
-<U62D9> \xA9\xE5 |0
-<U62DA> \xA9\xE9 |0
-<U62DB> \xA9\xDB |0
-<U62DC> \xAB\xF4 |0
-<U62DF> \xFA\x51 |0
-<U62E5> \x8D\x7B |0
-<U62EB> \xCE\xDA |0
-<U62EC> \xAC\x41 |0
-<U62ED> \xAB\xF8 |0
-<U62EE> \xAB\xFA |0
-<U62EF> \xAC\x40 |0
-<U62F0> \xCE\xE6 |0
-<U62F1> \xAB\xFD |0
-<U62F2> \xD1\xB1 |0
-<U62F3> \xAE\xB1 |0
-<U62F4> \xAC\x43 |0
-<U62F5> \xCE\xD7 |0
-<U62F6> \xCE\xDF |0
-<U62F7> \xAB\xFE |0
-<U62F8> \xCE\xDE |0
-<U62F9> \xCE\xDB |0
-<U62FA> \xCE\xE3 |0
-<U62FB> \xCE\xE5 |0
-<U62FC> \xAB\xF7 |0
-<U62FD> \xAB\xFB |0
-<U62FE> \xAC\x42 |0
-<U62FF> \xAE\xB3 |0
-<U6300> \xCE\xE0 |0
-<U6301> \xAB\xF9 |0
-<U6302> \xAC\x45 |0
-<U6303> \xCE\xD9 |0
-<U6307> \xAB\xFC |0
-<U6308> \xAE\xB2 |0
-<U6309> \xAB\xF6 |0
-<U630B> \xCE\xD6 |0
-<U630C> \xCE\xDD |0
-<U630D> \xCE\xD5 |0
-<U630E> \xCE\xD8 |0
-<U630F> \xCE\xDC |0
-<U6310> \xD1\xB2 |0
-<U6311> \xAC\x44 |0
-<U6313> \xCE\xE1 |0
-<U6314> \xCE\xE2 |0
-<U6315> \xCE\xE4 |0
-<U6316> \xAB\xF5 |0
-<U6318> \x8D\x7C |0
-<U6328> \xAE\xC1 |0
-<U6329> \xD1\xBE |0
-<U632A> \xAE\xBF |0
-<U632B> \xAE\xC0 |0
-<U632C> \xD1\xB4 |0
-<U632D> \xD1\xC4 |0
-<U632E> \x9E\xD6 |0
-<U632F> \xAE\xB6 |0
-<U6331> \x93\xAC |0
-<U6332> \xD5\x66 |0
-<U6333> \xD1\xC6 |0
-<U6334> \xD1\xC0 |0
-<U6335> \x9F\x5B |0
-<U6336> \xD1\xB7 |0
-<U6337> \x93\xA9 |0
-<U6338> \xD1\xC9 |0
-<U6339> \xD1\xBA |0
-<U633A> \xAE\xBC |0
-<U633B> \xD5\x7D |0
-<U633C> \xD1\xBD |0
-<U633D> \xAE\xBE |0
-<U633E> \xAE\xB5 |0
-<U6340> \xD1\xCB |0
-<U6341> \xD1\xBF |0
-<U6342> \xAE\xB8 |0
-<U6343> \xD1\xB8 |0
-<U6344> \xD1\xB5 |0
-<U6345> \xD1\xB6 |0
-<U6346> \xAE\xB9 |0
-<U6347> \xD1\xC5 |0
-<U6348> \xD1\xCC |0
-<U6349> \xAE\xBB |0
-<U634A> \xD1\xBC |0
-<U634B> \xD1\xBB |0
-<U634C> \xAE\xC3 |0
-<U634D> \xAE\xC2 |0
-<U634E> \xAE\xB4 |0
-<U634F> \xAE\xBA |0
-<U6350> \xAE\xBD |0
-<U6351> \xD1\xC8 |0
-<U6354> \xD1\xC2 |0
-<U6355> \xAE\xB7 |0
-<U6356> \xD1\xB3 |0
-<U6357> \xD1\xCA |0
-<U6358> \xD1\xC1 |0
-<U6359> \xD1\xC3 |0
-<U635A> \xD1\xC7 |0
-<U6364> \xA0\x7C |0
-<U6365> \xD5\x67 |0
-<U6367> \xB1\xB7 |0
-<U6368> \xB1\xCB |0
-<U6369> \xB1\xCA |0
-<U636B> \xB1\xBF |0
-<U636C> \xFC\xB2 |0
-<U636D> \xD5\x79 |0
-<U636E> \xD5\x75 |0
-<U636F> \xD5\x72 |0
-<U6370> \xD5\xA6 |0
-<U6371> \xB1\xBA |0
-<U6372> \xB1\xB2 |0
-<U6375> \xD5\x77 |0
-<U6376> \xB4\xA8 |0
-<U6377> \xB1\xB6 |0
-<U6378> \xD5\xA1 |0
-<U6379> \x8A\xC1 |0
-<U637A> \xB1\xCC |0
-<U637B> \xB1\xC9 |0
-<U637C> \xD5\x7B |0
-<U637D> \xD5\x6A |0
-<U637F> \x9F\xB4 |0
-<U6380> \xB1\xC8 |0
-<U6381> \xD5\xA3 |0
-<U6382> \xD5\x69 |0
-<U6383> \xB1\xBD |0
-<U6384> \xB1\xC1 |0
-<U6385> \xD5\xA2 |0
-<U6387> \xD5\x73 |0
-<U6388> \xB1\xC2 |0
-<U6389> \xB1\xBC |0
-<U638A> \xD5\x68 |0
-<U638B> \xFC\xAC |0
-<U638C> \xB4\x78 |0
-<U638D> \xD5\xA5 |0
-<U638E> \xD5\x71 |0
-<U638F> \xB1\xC7 |0
-<U6390> \xD5\x74 |0
-<U6391> \xD5\xA4 |0
-<U6392> \xB1\xC6 |0
-<U6394> \xD9\x52 |0
-<U6396> \xB1\xB3 |0
-<U6397> \xD5\x6F |0
-<U6398> \xB1\xB8 |0
-<U6399> \xB1\xC3 |0
-<U639B> \xB1\xBE |0
-<U639C> \xD5\x78 |0
-<U639D> \xD5\x6E |0
-<U639E> \xD5\x6C |0
-<U639F> \xD5\x7E |0
-<U63A0> \xB1\xB0 |0
-<U63A1> \xB1\xC4 |0
-<U63A2> \xB1\xB4 |0
-<U63A3> \xB4\x77 |0
-<U63A4> \xD5\x7C |0
-<U63A5> \xB1\xB5 |0
-<U63A7> \xB1\xB1 |0
-<U63A8> \xB1\xC0 |0
-<U63A9> \xB1\xBB |0
-<U63AA> \xB1\xB9 |0
-<U63AB> \xD5\x70 |0
-<U63AC> \xB1\xC5 |0
-<U63AD> \xD5\x6D |0
-<U63AE> \xD5\x7A |0
-<U63AF> \xD5\x76 |0
-<U63B0> \xD9\x54 |0
-<U63B1> \xD9\x53 |0
-<U63B9> \x9E\x4C |0
-<U63BD> \xD5\x6B |0
-<U63BE> \xD9\x64 |0
-<U63C0> \xB4\x7A |0
-<U63C1> \x8F\xC5 |0
-<U63C2> \xD9\x6A |0
-<U63C3> \xD9\x59 |0
-<U63C4> \xD9\x67 |0
-<U63C5> \xDD\x77 |0
-<U63C6> \xB4\x7D |0
-<U63C7> \xD9\x6B |0
-<U63C8> \xD9\x6E |0
-<U63C9> \xB4\x7C |0
-<U63CA> \xD9\x5C |0
-<U63CB> \xD9\x6D |0
-<U63CC> \xD9\x6C |0
-<U63CD> \xB4\x7E |0
-<U63CE> \xD9\x55 |0
-<U63CF> \xB4\x79 |0
-<U63D0> \xB4\xA3 |0
-<U63D1> \x93\xAD |0
-<U63D2> \xB4\xA1 |0
-<U63D3> \xD9\x69 |0
-<U63D5> \xD9\x5F |0
-<U63D6> \xB4\xA5 |0
-<U63D7> \xD9\x70 |0
-<U63D8> \xD9\x68 |0
-<U63D9> \xD9\x71 |0
-<U63DA> \xB4\xAD |0
-<U63DB> \xB4\xAB |0
-<U63DC> \xD9\x66 |0
-<U63DD> \xD9\x65 |0
-<U63DE> \x9D\xC3 |0
-<U63DF> \xD9\x63 |0
-<U63E0> \xD9\x5D |0
-<U63E1> \xB4\xA4 |0
-<U63E2> \x8D\xA2 |0
-<U63E3> \xB4\xA2 |0
-<U63E4> \xD1\xB9 |0
-<U63E5> \xD9\x56 |0
-<U63E6> \x9D\x4A |0
-<U63E7> \xDD\xB7 |0
-<U63E8> \xD9\x57 |0
-<U63E9> \xB4\x7B |0
-<U63EA> \xB4\xAA |0
-<U63EB> \xDD\x79 |0
-<U63ED> \xB4\xA6 |0
-<U63EE> \xB4\xA7 |0
-<U63EF> \xD9\x58 |0
-<U63F0> \xD9\x6F |0
-<U63F1> \xDD\x78 |0
-<U63F2> \xD9\x60 |0
-<U63F3> \xD9\x5B |0
-<U63F4> \xB4\xA9 |0
-<U63F5> \xD9\x61 |0
-<U63F6> \xD9\x5E |0
-<U63F8> \xFC\xB6 |0
-<U63F9> \xB4\xAE |0
-<U63FB> \x8D\xA3 |0
-<U63FC> \x9E\x4B |0
-<U63FE> \x9E\x4D |0
-<U6406> \xB7\x70 |0
-<U6407> \x8D\xA4 |0
-<U6409> \xDD\x7C |0
-<U640A> \xDD\xB1 |0
-<U640B> \xDD\xB6 |0
-<U640C> \xDD\xAA |0
-<U640D> \xB7\x6C |0
-<U640E> \xDD\xBB |0
-<U640F> \xB7\x69 |0
-<U6410> \xDD\x7A |0
-<U6412> \xDD\x7B |0
-<U6413> \xB7\x62 |0
-<U6414> \xB7\x6B |0
-<U6415> \xDD\xA4 |0
-<U6416> \xB7\x6E |0
-<U6417> \xB7\x6F |0
-<U6418> \xDD\xA5 |0
-<U641A> \xDD\xB2 |0
-<U641B> \xDD\xB8 |0
-<U641C> \xB7\x6A |0
-<U641E> \xB7\x64 |0
-<U641F> \xDD\xA3 |0
-<U6420> \xDD\x7D |0
-<U6421> \xDD\xBA |0
-<U6422> \xDD\xA8 |0
-<U6423> \xDD\xA9 |0
-<U6424> \xDD\x7E |0
-<U6425> \xDD\xB4 |0
-<U6426> \xDD\xAB |0
-<U6427> \xDD\xB5 |0
-<U6428> \xDD\xAD |0
-<U642A> \xB7\x65 |0
-<U642B> \xE1\xD9 |0
-<U642C> \xB7\x68 |0
-<U642D> \xB7\x66 |0
-<U642E> \xDD\xB9 |0
-<U642F> \xDD\xB0 |0
-<U6430> \xDD\xAC |0
-<U6432> \x8A\xFD |0
-<U6433> \xDD\xA1 |0
-<U6434> \xBA\x53 |0
-<U6435> \xDD\xAF |0
-<U6436> \xB7\x6D |0
-<U6437> \xDD\xA7 |0
-<U6438> \xFC\xB5 |0
-<U6439> \xDD\xA6 |0
-<U643A> \xFC\xC3 |0
-<U643B> \x93\xB2 |0
-<U643D> \xB7\x67 |0
-<U643E> \xB7\x63 |0
-<U643F> \xE1\xEE |0
-<U6440> \xDD\xB3 |0
-<U6441> \xDD\xAE |0
-<U6443> \xDD\xA2 |0
-<U644B> \xE1\xE9 |0
-<U644D> \xE1\xDA |0
-<U644E> \xE1\xE5 |0
-<U6450> \xE1\xEC |0
-<U6451> \xBA\x51 |0
-<U6452> \xB4\xAC |0
-<U6453> \xE1\xEA |0
-<U6454> \xBA\x4C |0
-<U6458> \xBA\x4B |0
-<U6459> \xE1\xF1 |0
-<U645A> \x8D\xA5 |0
-<U645B> \xE1\xDB |0
-<U645C> \xE1\xE8 |0
-<U645D> \xE1\xDC |0
-<U645E> \xE1\xE7 |0
-<U645F> \xBA\x4F |0
-<U6460> \xE1\xEB |0
-<U6461> \xD9\x62 |0
-<U6465> \xE1\xF2 |0
-<U6466> \xE1\xE3 |0
-<U6467> \xBA\x52 |0
-<U6468> \xE5\xBA |0
-<U6469> \xBC\xAF |0
-<U646B> \xE1\xF0 |0
-<U646C> \xE1\xEF |0
-<U646D> \xBA\x54 |0
-<U646E> \xE5\xAD |0
-<U646F> \xBC\xB0 |0
-<U6470> \xE5\xAE |0
-<U6471> \x93\xA1 |0
-<U6472> \xE1\xDF |0
-<U6473> \xE1\xE0 |0
-<U6474> \xE1\xDD |0
-<U6475> \xE1\xE2 |0
-<U6476> \xE1\xDE |0
-<U6477> \xE1\xF3 |0
-<U6478> \xBA\x4E |0
-<U6479> \xBC\xB1 |0
-<U647A> \xBA\x50 |0
-<U647B> \xBA\x55 |0
-<U647C> \x8A\xC6 |0
-<U647D> \xE1\xE1 |0
-<U647F> \xE1\xED |0
-<U6482> \xE1\xE6 |0
-<U6485> \xE5\xB1 |0
-<U6487> \xBA\x4A |0
-<U6488> \xBC\xB4 |0
-<U6489> \xE9\xAA |0
-<U648A> \xE5\xB6 |0
-<U648B> \xE5\xB5 |0
-<U648C> \xE5\xB7 |0
-<U648D> \x8A\x5B |0
-<U648F> \xE5\xB4 |0
-<U6490> \xBC\xB5 |0
-<U6491> \x89\x4D |0
-<U6492> \xBC\xBB |0
-<U6493> \xBC\xB8 |0
-<U6495> \xBC\xB9 |0
-<U6496> \xE5\xAF |0
-<U6497> \xE5\xB2 |0
-<U6498> \xE5\xBC |0
-<U6499> \xBC\xC1 |0
-<U649A> \xBC\xBF |0
-<U649C> \xE5\xB3 |0
-<U649D> \xD9\x5A |0
-<U649E> \xBC\xB2 |0
-<U649F> \xE5\xB9 |0
-<U64A0> \xE5\xB0 |0
-<U64A2> \xBC\xC2 |0
-<U64A3> \xE5\xB8 |0
-<U64A4> \xBA\x4D |0
-<U64A5> \xBC\xB7 |0
-<U64A6> \xE1\xE4 |0
-<U64A9> \xBC\xBA |0
-<U64AB> \xBC\xBE |0
-<U64AC> \xBC\xC0 |0
-<U64AD> \xBC\xBD |0
-<U64AE> \xBC\xBC |0
-<U64AF> \xFE\xD4 |0
-<U64B0> \xBC\xB6 |0
-<U64B1> \xE5\xBB |0
-<U64B2> \xBC\xB3 |0
-<U64B3> \xBC\xC3 |0
-<U64B4> \x8A\x78 |0
-<U64B6> \x93\xAB |0
-<U64BB> \xBE\xD8 |0
-<U64BC> \xBE\xD9 |0
-<U64BD> \xE9\xA9 |0
-<U64BE> \xBE\xE2 |0
-<U64BF> \xBE\xDF |0
-<U64C0> \x8D\xA7 |0
-<U64C1> \xBE\xD6 |0
-<U64C2> \xBE\xDD |0
-<U64C3> \xE9\xAB |0
-<U64C4> \xBE\xDB |0
-<U64C5> \xBE\xD5 |0
-<U64C7> \xBE\xDC |0
-<U64C9> \xE9\xA8 |0
-<U64CA> \xC0\xBB |0
-<U64CB> \xBE\xD7 |0
-<U64CD> \xBE\xDE |0
-<U64CE> \xC0\xBA |0
-<U64CF> \xE9\xA7 |0
-<U64D0> \xE9\xA6 |0
-<U64D2> \xBE\xE0 |0
-<U64D3> \x9F\x45 |0
-<U64D4> \xBE\xE1 |0
-<U64D6> \xE9\xA5 |0
-<U64D7> \xE9\xA4 |0
-<U64D8> \xC0\xBC |0
-<U64D9> \xE9\xAE |0
-<U64DA> \xBE\xDA |0
-<U64DB> \xE9\xAC |0
-<U64DD> \x8A\x56 |0
-<U64E0> \xC0\xBD |0
-<U64E1> \xFC\xBF |0
-<U64E2> \xC0\xC2 |0
-<U64E3> \xEC\xEA |0
-<U64E4> \xEC\xEC |0
-<U64E5> \xFC\xC0 |0
-<U64E6> \xC0\xBF |0
-<U64E7> \x8E\xE6 |0
-<U64E8> \xEC\xED |0
-<U64E9> \xEC\xE9 |0
-<U64EA> \x8A\xA4 |0
-<U64EB> \xEC\xEB |0
-<U64EC> \xC0\xC0 |0
-<U64ED> \xC0\xC3 |0
-<U64EF> \xEC\xE8 |0
-<U64F0> \xC0\xBE |0
-<U64F1> \xC0\xC1 |0
-<U64F2> \xC2\x59 |0
-<U64F3> \xE9\xAD |0
-<U64F4> \xC2\x58 |0
-<U64F7> \xC2\x5E |0
-<U64F8> \xEF\xD4 |0
-<U64FA> \xC2\x5C |0
-<U64FB> \xC2\x5D |0
-<U64FC> \xEF\xD7 |0
-<U64FD> \xEF\xD3 |0
-<U64FE> \xC2\x5A |0
-<U64FF> \xEF\xD1 |0
-<U6500> \xC3\x6B |0
-<U6501> \xEF\xD5 |0
-<U6503> \xEF\xD6 |0
-<U6504> \xEF\xD2 |0
-<U6506> \xC2\x5B |0
-<U6507> \xF2\x42 |0
-<U6509> \xF2\x45 |0
-<U650A> \x89\x43 |0
-<U650C> \xF2\x46 |0
-<U650D> \xF2\x44 |0
-<U650E> \xF2\x47 |0
-<U650F> \xC3\x6C |0
-<U6510> \xF2\x43 |0
-<U6511> \x93\xF3 |0
-<U6513> \xF4\x4E |0
-<U6514> \xC4\x64 |0
-<U6515> \xF4\x4D |0
-<U6516> \xF4\x4C |0
-<U6517> \xF4\x4B |0
-<U6518> \xC4\x63 |0
-<U6519> \xC4\x65 |0
-<U651B> \xF5\xCD |0
-<U651C> \xC4\xE2 |0
-<U651D> \xC4\xE1 |0
-<U651E> \xFC\xAB |0
-<U651F> \x9E\xA2 |0
-<U6520> \xF6\xE1 |0
-<U6521> \xF6\xE0 |0
-<U6522> \xF6\xE3 |0
-<U6523> \xC5\xCB |0
-<U6524> \xC5\x75 |0
-<U6525> \xF7\xDD |0
-<U6526> \xF6\xE2 |0
-<U6529> \xF7\xDC |0
-<U652A> \xC5\xCD |0
-<U652B> \xC5\xCC |0
-<U652C> \xC5\xF3 |0
-<U652D> \xF8\xA9 |0
-<U652E> \xF8\xEF |0
-<U652F> \xA4\xE4 |0
-<U6530> \x9D\xC7 |0
-<U6532> \xD9\x72 |0
-<U6533> \xE9\xAF |0
-<U6534> \xC6\xD2 |0
-<U6535> \x8B\xCE |0
-<U6536> \xA6\xAC |0
-<U6537> \xCA\xF7 |0
-<U6538> \xA7\xF1 |0
-<U6539> \xA7\xEF |0
-<U653B> \xA7\xF0 |0
-<U653D> \xCC\xC1 |0
-<U653E> \xA9\xF1 |0
-<U653F> \xAC\x46 |0
-<U6541> \xCE\xE7 |0
-<U6543> \xCE\xE8 |0
-<U6545> \xAC\x47 |0
-<U6546> \xD1\xCE |0
-<U6548> \xAE\xC4 |0
-<U6549> \xAE\xC5 |0
-<U654A> \xD1\xCD |0
-<U654D> \xFC\xC5 |0
-<U654F> \xB1\xD3 |0
-<U6551> \xB1\xCF |0
-<U6553> \xD5\xA7 |0
-<U6554> \xB1\xD6 |0
-<U6555> \xB1\xD5 |0
-<U6556> \xB1\xCE |0
-<U6557> \xB1\xD1 |0
-<U6558> \xB1\xD4 |0
-<U6559> \xB1\xD0 |0
-<U655C> \xD9\x76 |0
-<U655D> \xB1\xCD |0
-<U655E> \xB4\xAF |0
-<U655F> \xFC\xCB |0
-<U6562> \xB4\xB1 |0
-<U6563> \xB4\xB2 |0
-<U6564> \xD9\x75 |0
-<U6565> \xD9\x78 |0
-<U6566> \xB4\xB0 |0
-<U6567> \xD9\x73 |0
-<U6568> \xD9\x77 |0
-<U656A> \xD9\x74 |0
-<U656B> \x93\xB3 |0
-<U656C> \xB7\x71 |0
-<U656D> \xFC\xCA |0
-<U656F> \xDD\xBC |0
-<U6572> \xBA\x56 |0
-<U6573> \xE1\xF4 |0
-<U6574> \xBE\xE3 |0
-<U6575> \xBC\xC4 |0
-<U6576> \xE5\xBD |0
-<U6577> \xBC\xC5 |0
-<U6578> \xBC\xC6 |0
-<U6579> \xE5\xBF |0
-<U657A> \xE5\xBE |0
-<U657B> \xE5\xC0 |0
-<U657C> \xE9\xB1 |0
-<U657F> \xE9\xB0 |0
-<U6580> \xEC\xEF |0
-<U6581> \xEC\xEE |0
-<U6582> \xC0\xC4 |0
-<U6583> \xC0\xC5 |0
-<U6584> \xF2\x48 |0
-<U6585> \xFC\xC9 |0
-<U6586> \x8D\xAC |0
-<U6587> \xA4\xE5 |0
-<U6588> \xFB\xC6 |0
-<U6589> \x89\x67 |0
-<U658C> \xD9\x79 |0
-<U6590> \xB4\xB4 |0
-<U6591> \xB4\xB3 |0
-<U6592> \xDD\xBD |0
-<U6594> \xEF\xD8 |0
-<U6595> \xC4\xE3 |0
-<U6596> \xF7\xDE |0
-<U6597> \xA4\xE6 |0
-<U6599> \xAE\xC6 |0
-<U659B> \xB1\xD8 |0
-<U659C> \xB1\xD7 |0
-<U659D> \xD9\x7A |0
-<U659E> \xD9\x7B |0
-<U659F> \xB7\x72 |0
-<U65A0> \xE1\xF5 |0
-<U65A1> \xBA\x57 |0
-<U65A2> \xE9\xB2 |0
-<U65A4> \xA4\xE7 |0
-<U65A5> \xA5\xB8 |0
-<U65A7> \xA9\xF2 |0
-<U65A8> \xCC\xC2 |0
-<U65AA> \xCE\xE9 |0
-<U65AB> \xAC\x48 |0
-<U65AC> \xB1\xD9 |0
-<U65AE> \xD9\x7C |0
-<U65AF> \xB4\xB5 |0
-<U65B0> \xB7\x73 |0
-<U65B2> \xE5\xC1 |0
-<U65B3> \xE5\xC2 |0
-<U65B5> \xFC\xCD |0
-<U65B6> \xEC\xF0 |0
-<U65B7> \xC2\x5F |0
-<U65B8> \xF8\xF0 |0
-<U65B9> \xA4\xE8 |0
-<U65BB> \xCC\xC3 |0
-<U65BC> \xA9\xF3 |0
-<U65BD> \xAC\x49 |0
-<U65BE> \x9C\xF3 |0
-<U65BF> \xCE\xEA |0
-<U65C1> \xAE\xC7 |0
-<U65C2> \xD1\xD2 |0
-<U65C3> \xD1\xD0 |0
-<U65C4> \xD1\xD1 |0
-<U65C5> \xAE\xC8 |0
-<U65C6> \xD1\xCF |0
-<U65CB> \xB1\xDB |0
-<U65CC> \xB1\xDC |0
-<U65CD> \xD5\xA8 |0
-<U65CE> \xB1\xDD |0
-<U65CF> \xB1\xDA |0
-<U65D0> \xD9\x7D |0
-<U65D1> \xFC\xD0 |0
-<U65D2> \xD9\x7E |0
-<U65D3> \xDD\xBE |0
-<U65D4> \x95\xBB |0
-<U65D6> \xBA\x59 |0
-<U65D7> \xBA\x58 |0
-<U65DA> \xEC\xF1 |0
-<U65DB> \xEF\xD9 |0
-<U65DD> \xF2\x4A |0
-<U65DE> \xF2\x49 |0
-<U65DF> \xF4\x4F |0
-<U65E0> \xFC\xD3 |0
-<U65E1> \xC9\x5E |0
-<U65E2> \xAC\x4A |0
-<U65E3> \xFC\xD4 |0
-<U65E5> \xA4\xE9 |0
-<U65E6> \xA5\xB9 |0
-<U65E8> \xA6\xAE |0
-<U65E9> \xA6\xAD |0
-<U65EC> \xA6\xAF |0
-<U65ED> \xA6\xB0 |0
-<U65EE> \xC9\xEE |0
-<U65EF> \xC9\xED |0
-<U65F0> \xCA\xF8 |0
-<U65F1> \xA7\xF2 |0
-<U65F2> \xCA\xFB |0
-<U65F3> \xCA\xFA |0
-<U65F4> \xCA\xF9 |0
-<U65F5> \xCA\xFC |0
-<U65FA> \xA9\xF4 |0
-<U65FB> \xCC\xC9 |0
-<U65FC> \xCC\xC5 |0
-<U65FD> \xCC\xCE |0
-<U65FF> \x8D\xAE |0
-<U6600> \xA9\xFB |0
-<U6602> \xA9\xF9 |0
-<U6603> \xCC\xCA |0
-<U6604> \xCC\xC6 |0
-<U6605> \xCC\xCD |0
-<U6606> \xA9\xF8 |0
-<U6607> \xAA\x40 |0
-<U6608> \xCC\xC8 |0
-<U6609> \xCC\xC4 |0
-<U660A> \xA9\xFE |0
-<U660B> \xCC\xCB |0
-<U660C> \xA9\xF7 |0
-<U660D> \xCC\xCC |0
-<U660E> \xA9\xFA |0
-<U660F> \xA9\xFC |0
-<U6610> \xCC\xD0 |0
-<U6611> \xCC\xCF |0
-<U6612> \xCC\xC7 |0
-<U6613> \xA9\xF6 |0
-<U6614> \xA9\xF5 |0
-<U6615> \xA9\xFD |0
-<U6618> \xFC\xD7 |0
-<U661C> \xCE\xEF |0
-<U661D> \xCE\xF5 |0
-<U661E> \x93\xDB |0
-<U661F> \xAC\x50 |0
-<U6620> \xAC\x4D |0
-<U6621> \xCE\xEC |0
-<U6622> \xCE\xF1 |0
-<U6623> \xFE\x63 |0
-<U6624> \xAC\x53 |0
-<U6625> \xAC\x4B |0
-<U6626> \xCE\xF0 |0
-<U6627> \xAC\x4E |0
-<U6628> \xAC\x51 |0
-<U662B> \xCE\xF3 |0
-<U662D> \xAC\x4C |0
-<U662E> \xCE\xF8 |0
-<U662F> \xAC\x4F |0
-<U6630> \x93\xD5 |0
-<U6631> \xAC\x52 |0
-<U6632> \xCE\xED |0
-<U6633> \xCE\xF2 |0
-<U6634> \xCE\xF6 |0
-<U6635> \xCE\xEE |0
-<U6636> \xCE\xEB |0
-<U6639> \xCE\xF7 |0
-<U663A> \xCE\xF4 |0
-<U6641> \xAE\xD0 |0
-<U6642> \xAE\xC9 |0
-<U6643> \xAE\xCC |0
-<U6644> \xFC\xDA |0
-<U6645> \xAE\xCF |0
-<U6647> \xD1\xD5 |0
-<U6648> \x9B\x71 |0
-<U6649> \xAE\xCA |0
-<U664A> \xD1\xD3 |0
-<U664B> \xFC\xDD |0
-<U664C> \xAE\xCE |0
-<U664F> \xAE\xCB |0
-<U6651> \xD1\xD6 |0
-<U6652> \xAE\xCD |0
-<U6653> \x8D\xAF |0
-<U6657> \xFA\xF2 |0
-<U6659> \xD5\xAC |0
-<U665A> \xB1\xDF |0
-<U665B> \xD5\xAB |0
-<U665C> \xD5\xAD |0
-<U665D> \xB1\xDE |0
-<U665E> \xB1\xE3 |0
-<U665F> \xD1\xD4 |0
-<U6661> \xD5\xAA |0
-<U6662> \xD5\xAE |0
-<U6663> \x93\xD8 |0
-<U6664> \xB1\xE0 |0
-<U6665> \xD5\xA9 |0
-<U6666> \xB1\xE2 |0
-<U6667> \xFC\xDF |0
-<U6668> \xB1\xE1 |0
-<U666A> \xD9\xA7 |0
-<U666B> \x93\xD3 |0
-<U666C> \xD9\xA2 |0
-<U666E> \xB4\xB6 |0
-<U666F> \xB4\xBA |0
-<U6670> \xB4\xB7 |0
-<U6671> \xD9\xA5 |0
-<U6672> \xD9\xA8 |0
-<U6673> \xFC\xE1 |0
-<U6674> \xB4\xB8 |0
-<U6676> \xB4\xB9 |0
-<U6677> \xB4\xBE |0
-<U6678> \xDD\xC7 |0
-<U6679> \xD9\xA6 |0
-<U667A> \xB4\xBC |0
-<U667B> \xD9\xA3 |0
-<U667C> \xD9\xA1 |0
-<U667D> \x8E\x76 |0
-<U667E> \xB4\xBD |0
-<U6680> \xD9\xA4 |0
-<U6684> \xB7\x79 |0
-<U6685> \xFC\x62 |0
-<U6686> \xDD\xBF |0
-<U6687> \xB7\x76 |0
-<U6688> \xB7\x77 |0
-<U6689> \xB7\x75 |0
-<U668A> \xDD\xC4 |0
-<U668B> \xDD\xC3 |0
-<U668C> \xDD\xC0 |0
-<U668D> \xB7\x7B |0
-<U668E> \x93\xD1 |0
-<U6690> \xDD\xC2 |0
-<U6691> \xB4\xBB |0
-<U6692> \x8D\xB1 |0
-<U6694> \xDD\xC6 |0
-<U6695> \xDD\xC1 |0
-<U6696> \xB7\x78 |0
-<U6697> \xB7\x74 |0
-<U6698> \xB7\x7A |0
-<U6699> \xDD\xC5 |0
-<U669A> \x98\x59 |0
-<U669D> \xBA\x5C |0
-<U669F> \xE1\xF8 |0
-<U66A0> \xE1\xF7 |0
-<U66A1> \xE1\xF6 |0
-<U66A2> \xBA\x5A |0
-<U66A4> \xFB\x52 |0
-<U66A8> \xBA\x5B |0
-<U66A9> \xE5\xC5 |0
-<U66AA> \xE5\xC8 |0
-<U66AB> \xBC\xC8 |0
-<U66AD> \xFB\x53 |0
-<U66AE> \xBC\xC7 |0
-<U66AF> \xE5\xC9 |0
-<U66B0> \xE5\xC4 |0
-<U66B1> \xBC\xCA |0
-<U66B2> \xE5\xC6 |0
-<U66B3> \xFB\x4D |0
-<U66B4> \xBC\xC9 |0
-<U66B5> \xE5\xC3 |0
-<U66B6> \x9C\xBF |0
-<U66B7> \xE5\xC7 |0
-<U66B8> \xBE\xE9 |0
-<U66B9> \xBE\xE6 |0
-<U66BA> \xE9\xBB |0
-<U66BB> \xE9\xBA |0
-<U66BD> \xE9\xB9 |0
-<U66BE> \xE9\xB4 |0
-<U66BF> \x9B\x72 |0
-<U66C0> \xE9\xB5 |0
-<U66C4> \xBE\xE7 |0
-<U66C6> \xBE\xE4 |0
-<U66C7> \xBE\xE8 |0
-<U66C8> \xE9\xB3 |0
-<U66C9> \xBE\xE5 |0
-<U66CA> \xE9\xB6 |0
-<U66CB> \xE9\xB7 |0
-<U66CC> \xE9\xBC |0
-<U66CD> \xFB\x50 |0
-<U66CE> \x93\xBE |0
-<U66CF> \xE9\xB8 |0
-<U66D2> \xEC\xF2 |0
-<U66D6> \xC0\xC7 |0
-<U66D8> \xEF\xDC |0
-<U66D9> \xC0\xC6 |0
-<U66DA> \xEF\xDA |0
-<U66DB> \xEF\xDB |0
-<U66DC> \xC2\x60 |0
-<U66DD> \xC3\x6E |0
-<U66DE> \xF2\x4B |0
-<U66E0> \xC3\x6D |0
-<U66E3> \xF4\x51 |0
-<U66E4> \xF4\x52 |0
-<U66E6> \xC4\x66 |0
-<U66E8> \xF4\x50 |0
-<U66E9> \xC4\xE4 |0
-<U66EB> \xF7\xDF |0
-<U66EC> \xC5\xCE |0
-<U66ED> \xF8\xAA |0
-<U66EE> \xF8\xAB |0
-<U66F0> \xA4\xEA |0
-<U66F1> \x9D\xF1 |0
-<U66F2> \xA6\xB1 |0
-<U66F3> \xA6\xB2 |0
-<U66F4> \xA7\xF3 |0
-<U66F6> \xCC\xD1 |0
-<U66F7> \xAC\x54 |0
-<U66F8> \xAE\xD1 |0
-<U66F9> \xB1\xE4 |0
-<U66FC> \xB0\xD2 |0
-<U66FE> \xB4\xBF |0
-<U66FF> \xB4\xC0 |0
-<U6700> \xB3\xCC |0
-<U6701> \xD9\xA9 |0
-<U6702> \xFC\xEB |0
-<U6703> \xB7\x7C |0
-<U6704> \xE1\xFA |0
-<U6705> \xE1\xF9 |0
-<U6708> \xA4\xEB |0
-<U6709> \xA6\xB3 |0
-<U670A> \xCC\xD2 |0
-<U670B> \xAA\x42 |0
-<U670C> \xA0\xBB |0
-<U670D> \xAA\x41 |0
-<U670E> \x9B\x7E |0
-<U670F> \xCE\xF9 |0
-<U6710> \xCE\xFA |0
-<U6712> \xD1\xD7 |0
-<U6713> \xD1\xD8 |0
-<U6714> \xAE\xD2 |0
-<U6715> \xAE\xD3 |0
-<U6716> \x8D\xB3 |0
-<U6717> \xAE\xD4 |0
-<U6718> \xD5\xAF |0
-<U671B> \xB1\xE6 |0
-<U671D> \xB4\xC2 |0
-<U671E> \x9A\xE8 |0
-<U671F> \xB4\xC1 |0
-<U6720> \xDD\xC8 |0
-<U6721> \xDF\x7A |0
-<U6722> \xE1\xFB |0
-<U6723> \xE9\xBD |0
-<U6725> \x8E\xDC |0
-<U6726> \xC2\x61 |0
-<U6727> \xC4\x67 |0
-<U6728> \xA4\xEC |0
-<U672A> \xA5\xBC |0
-<U672B> \xA5\xBD |0
-<U672C> \xA5\xBB |0
-<U672D> \xA5\xBE |0
-<U672E> \xA5\xBA |0
-<U6731> \xA6\xB6 |0
-<U6733> \xC9\xF6 |0
-<U6734> \xA6\xB5 |0
-<U6735> \xA6\xB7 |0
-<U6736> \x9C\xF9 |0
-<U6738> \xC9\xF1 |0
-<U6739> \xC9\xF0 |0
-<U673A> \xC9\xF3 |0
-<U673B> \xC9\xF2 |0
-<U673C> \xC9\xF5 |0
-<U673D> \xA6\xB4 |0
-<U673E> \xC9\xEF |0
-<U673F> \xC9\xF4 |0
-<U6744> \xFA\x50 |0
-<U6745> \xCA\xFD |0
-<U6746> \xA7\xFD |0
-<U6747> \xCA\xFE |0
-<U6748> \xCB\x43 |0
-<U6749> \xA7\xFC |0
-<U674B> \xCB\x47 |0
-<U674C> \xCB\x42 |0
-<U674D> \xCB\x45 |0
-<U674E> \xA7\xF5 |0
-<U674F> \xA7\xF6 |0
-<U6750> \xA7\xF7 |0
-<U6751> \xA7\xF8 |0
-<U6753> \xA8\x40 |0
-<U6755> \xCB\x41 |0
-<U6756> \xA7\xFA |0
-<U6757> \xA8\x41 |0
-<U6759> \xCB\x40 |0
-<U675A> \xCB\x46 |0
-<U675C> \xA7\xF9 |0
-<U675D> \xCB\x44 |0
-<U675E> \xA7\xFB |0
-<U675F> \xA7\xF4 |0
-<U6760> \xA7\xFE |0
-<U6761> \x98\xE7 |0
-<U6762> \xFC\xF3 |0
-<U6767> \xFC\xF2 |0
-<U676A> \xAA\x57 |0
-<U676C> \xCC\xD4 |0
-<U676D> \xAA\x43 |0
-<U676F> \xAA\x4D |0
-<U6770> \xAA\x4E |0
-<U6771> \xAA\x46 |0
-<U6772> \xAA\x58 |0
-<U6773> \xAA\x48 |0
-<U6774> \xCC\xDC |0
-<U6775> \xAA\x53 |0
-<U6776> \xCC\xD7 |0
-<U6777> \xAA\x49 |0
-<U6778> \xCC\xE6 |0
-<U6779> \xCC\xE7 |0
-<U677A> \xCC\xDF |0
-<U677B> \xCC\xD8 |0
-<U677C> \xAA\x56 |0
-<U677D> \xCC\xE4 |0
-<U677E> \xAA\x51 |0
-<U677F> \xAA\x4F |0
-<U6781> \xCC\xE5 |0
-<U6783> \xCC\xE3 |0
-<U6784> \xCC\xDB |0
-<U6785> \xCC\xD3 |0
-<U6786> \xCC\xDA |0
-<U6787> \xAA\x4A |0
-<U6789> \xAA\x50 |0
-<U678B> \xAA\x44 |0
-<U678C> \xCC\xDE |0
-<U678D> \xCC\xDD |0
-<U678E> \xCC\xD5 |0
-<U678F> \x93\xE5 |0
-<U6790> \xAA\x52 |0
-<U6791> \xCC\xE1 |0
-<U6792> \xCC\xD6 |0
-<U6793> \xAA\x55 |0
-<U6794> \xCC\xE8 |0
-<U6795> \xAA\x45 |0
-<U6797> \xAA\x4C |0
-<U6798> \xCC\xD9 |0
-<U6799> \xCC\xE2 |0
-<U679A> \xAA\x54 |0
-<U679C> \xAA\x47 |0
-<U679D> \xAA\x4B |0
-<U679F> \xCC\xE0 |0
-<U67A0> \x9A\x59 |0
-<U67A4> \x8D\xB5 |0
-<U67AC> \xFD\x4D |0
-<U67AE> \xCF\x5B |0
-<U67AF> \xAC\x5C |0
-<U67B0> \xAC\x69 |0
-<U67B1> \xFD\x5E |0
-<U67B2> \xCF\x56 |0
-<U67B3> \xCF\x4C |0
-<U67B4> \xAC\x62 |0
-<U67B5> \xCF\x4A |0
-<U67B6> \xAC\x5B |0
-<U67B7> \xCF\x45 |0
-<U67B8> \xAC\x65 |0
-<U67B9> \xCF\x52 |0
-<U67BA> \xCE\xFE |0
-<U67BB> \xCF\x41 |0
-<U67BF> \x8F\x7D |0
-<U67C0> \xCF\x44 |0
-<U67C1> \xCE\xFB |0
-<U67C2> \xCF\x51 |0
-<U67C3> \xCF\x61 |0
-<U67C4> \xAC\x60 |0
-<U67C5> \xCF\x46 |0
-<U67C6> \xCF\x58 |0
-<U67C8> \xCE\xFD |0
-<U67C9> \xCF\x5F |0
-<U67CA> \xCF\x60 |0
-<U67CB> \xCF\x63 |0
-<U67CC> \xCF\x5A |0
-<U67CD> \xCF\x4B |0
-<U67CE> \xCF\x53 |0
-<U67CF> \xAC\x66 |0
-<U67D0> \xAC\x59 |0
-<U67D1> \xAC\x61 |0
-<U67D2> \xAC\x6D |0
-<U67D3> \xAC\x56 |0
-<U67D4> \xAC\x58 |0
-<U67D6> \x95\x47 |0
-<U67D7> \xFC\xF6 |0
-<U67D8> \xCF\x43 |0
-<U67D9> \xAC\x6A |0
-<U67DA> \xAC\x63 |0
-<U67DB> \xCF\x5D |0
-<U67DC> \xCF\x40 |0
-<U67DD> \xAC\x6C |0
-<U67DE> \xAC\x67 |0
-<U67DF> \xCF\x49 |0
-<U67E2> \xAC\x6B |0
-<U67E3> \xCF\x50 |0
-<U67E4> \xCF\x48 |0
-<U67E5> \xAC\x64 |0
-<U67E6> \xCF\x5C |0
-<U67E7> \xCF\x54 |0
-<U67E9> \xAC\x5E |0
-<U67EA> \xCF\x62 |0
-<U67EB> \xCF\x47 |0
-<U67EC> \xAC\x5A |0
-<U67ED> \xCF\x59 |0
-<U67EE> \xCF\x4F |0
-<U67EF> \xAC\x5F |0
-<U67F0> \xCF\x55 |0
-<U67F1> \xAC\x57 |0
-<U67F2> \xCE\xFC |0
-<U67F3> \xAC\x68 |0
-<U67F4> \xAE\xE3 |0
-<U67F5> \xAC\x5D |0
-<U67F6> \xCF\x4E |0
-<U67F7> \xCF\x4D |0
-<U67F8> \xCF\x42 |0
-<U67F9> \x92\x50 |0
-<U67FA> \xCF\x5E |0
-<U67FC> \xCF\x57 |0
-<U67FE> \x89\x68 |0
-<U67FF> \xAC\x55 |0
-<U6800> \x8D\xB6 |0
-<U6801> \xFC\xFB |0
-<U6802> \xA0\x7D |0
-<U6803> \x98\xFC |0
-<U6804> \x89\x69 |0
-<U680D> \xFE\x4F |0
-<U6810> \x92\x56 |0
-<U6812> \xD1\xEC |0
-<U6813> \xAE\xEA |0
-<U6814> \xD1\xED |0
-<U6816> \xD1\xE1 |0
-<U6817> \xAE\xDF |0
-<U6818> \xAE\xEB |0
-<U681A> \xD1\xDA |0
-<U681B> \xFA\xC9 |0
-<U681C> \xD1\xE3 |0
-<U681D> \xD1\xEB |0
-<U681E> \x93\xE8 |0
-<U681F> \xD1\xD9 |0
-<U6820> \xD1\xF4 |0
-<U6821> \xAE\xD5 |0
-<U6822> \xFC\xF8 |0
-<U6825> \xD1\xF3 |0
-<U6826> \xD1\xEE |0
-<U6828> \xD1\xEF |0
-<U6829> \xAE\xDD |0
-<U682A> \xAE\xE8 |0
-<U682B> \xD1\xE5 |0
-<U682D> \xD1\xE6 |0
-<U682E> \xD1\xF0 |0
-<U682F> \xD1\xE7 |0
-<U6831> \xD1\xE2 |0
-<U6832> \xD1\xDC |0
-<U6833> \xD1\xDD |0
-<U6834> \xD1\xEA |0
-<U6835> \xD1\xE4 |0
-<U6836> \x9C\xE3 |0
-<U6837> \xFD\xA9 |0
-<U6838> \xAE\xD6 |0
-<U6839> \xAE\xDA |0
-<U683A> \xD1\xF2 |0
-<U683B> \xD1\xDE |0
-<U683C> \xAE\xE6 |0
-<U683D> \xAE\xE2 |0
-<U683E> \xFC\x44 |0
-<U6840> \xAE\xE5 |0
-<U6841> \xAE\xEC |0
-<U6842> \xAE\xDB |0
-<U6843> \xAE\xE7 |0
-<U6844> \xD1\xE9 |0
-<U6845> \xAE\xE9 |0
-<U6846> \xAE\xD8 |0
-<U6847> \x96\x40 |0
-<U6848> \xAE\xD7 |0
-<U6849> \xD1\xDB |0
-<U684A> \x8D\xB8 |0
-<U684B> \xD1\xDF |0
-<U684C> \xAE\xE0 |0
-<U684D> \xD1\xF1 |0
-<U684E> \xD1\xE8 |0
-<U684F> \xD1\xE0 |0
-<U6850> \xAE\xE4 |0
-<U6851> \xAE\xE1 |0
-<U6853> \xAE\xD9 |0
-<U6854> \xAE\xDC |0
-<U6855> \x9B\x4A |0
-<U6856> \x8F\xB9 |0
-<U685D> \xFC\xFE |0
-<U6865> \x89\x6A |0
-<U686B> \xD5\xC4 |0
-<U686D> \xD5\xB4 |0
-<U686E> \xD5\xB5 |0
-<U686F> \xD5\xB9 |0
-<U6871> \xD5\xC8 |0
-<U6872> \xD5\xC5 |0
-<U6874> \xD5\xBE |0
-<U6875> \xD5\xBD |0
-<U6876> \xB1\xED |0
-<U6877> \xD5\xC1 |0
-<U6878> \xD5\xD0 |0
-<U6879> \xD5\xB0 |0
-<U687B> \xD5\xD1 |0
-<U687C> \xD5\xC3 |0
-<U687D> \xD5\xD5 |0
-<U687E> \xD5\xC9 |0
-<U687F> \xB1\xEC |0
-<U6880> \xD5\xC7 |0
-<U6881> \xB1\xE7 |0
-<U6882> \xB1\xFC |0
-<U6883> \xB1\xF2 |0
-<U6884> \x8D\xB9 |0
-<U6885> \xB1\xF6 |0
-<U6886> \xB1\xF5 |0
-<U6887> \xD5\xB1 |0
-<U6888> \x91\x7E |0
-<U6889> \xD5\xCE |0
-<U688A> \xD5\xD4 |0
-<U688B> \xD5\xCC |0
-<U688C> \xD5\xD3 |0
-<U688F> \xD5\xC0 |0
-<U6890> \xD5\xB2 |0
-<U6891> \xD5\xD2 |0
-<U6892> \xD5\xC2 |0
-<U6893> \xB1\xEA |0
-<U6894> \xB1\xF7 |0
-<U6896> \xD5\xCB |0
-<U6897> \xB1\xF0 |0
-<U6898> \x93\xF4 |0
-<U689B> \xD5\xCA |0
-<U689C> \xD5\xB3 |0
-<U689D> \xB1\xF8 |0
-<U689F> \xB1\xFA |0
-<U68A0> \xD5\xCD |0
-<U68A1> \xB1\xFB |0
-<U68A2> \xB1\xE9 |0
-<U68A3> \xD5\xBA |0
-<U68A4> \xD5\xCF |0
-<U68A6> \xFB\x7C |0
-<U68A7> \xB1\xEF |0
-<U68A8> \xB1\xF9 |0
-<U68A9> \xD5\xBC |0
-<U68AA> \xD5\xC6 |0
-<U68AB> \xD5\xB7 |0
-<U68AC> \xD5\xBB |0
-<U68AD> \xB1\xF4 |0
-<U68AE> \xD5\xB6 |0
-<U68AF> \xB1\xE8 |0
-<U68B0> \xB1\xF1 |0
-<U68B1> \xB1\xEE |0
-<U68B2> \xD5\xBF |0
-<U68B3> \xAE\xDE |0
-<U68B4> \xD9\xC0 |0
-<U68B5> \xB1\xEB |0
-<U68B6> \x93\xE7 |0
-<U68B9> \x97\xEF |0
-<U68BD> \xFE\x4A |0
-<U68C3> \xFD\x45 |0
-<U68C4> \xB1\xF3 |0
-<U68C5> \x96\xA5 |0
-<U68C6> \xD9\xC3 |0
-<U68C7> \xD9\xD9 |0
-<U68C8> \xD9\xCE |0
-<U68C9> \xB4\xD6 |0
-<U68CA> \xFE\xE0 |0
-<U68CB> \xB4\xD1 |0
-<U68CC> \xD9\xBD |0
-<U68CD> \xB4\xD2 |0
-<U68CE> \xD9\xCD |0
-<U68D0> \xD9\xC6 |0
-<U68D1> \xD9\xD3 |0
-<U68D2> \xB4\xCE |0
-<U68D3> \xD9\xAB |0
-<U68D4> \xD9\xD5 |0
-<U68D5> \xB4\xC4 |0
-<U68D6> \xD9\xB3 |0
-<U68D7> \xB4\xC7 |0
-<U68D8> \xB4\xC6 |0
-<U68DA> \xB4\xD7 |0
-<U68DC> \xD9\xAD |0
-<U68DD> \xD9\xCF |0
-<U68DE> \xD9\xD0 |0
-<U68DF> \xB4\xC9 |0
-<U68E0> \xB4\xC5 |0
-<U68E1> \xD9\xBB |0
-<U68E3> \xB4\xD0 |0
-<U68E4> \xD9\xB6 |0
-<U68E6> \xD9\xD1 |0
-<U68E7> \xB4\xCC |0
-<U68E8> \xD9\xC9 |0
-<U68E9> \xD9\xD6 |0
-<U68EA> \xD9\xB0 |0
-<U68EB> \xD9\xB5 |0
-<U68EC> \xD9\xAF |0
-<U68EE> \xB4\xCB |0
-<U68EF> \xD9\xC2 |0
-<U68F0> \xDD\xDE |0
-<U68F1> \xD9\xB1 |0
-<U68F2> \xB4\xCF |0
-<U68F3> \xD9\xBA |0
-<U68F4> \xD9\xD2 |0
-<U68F5> \xB4\xCA |0
-<U68F6> \xD9\xB7 |0
-<U68F7> \xD9\xB4 |0
-<U68F8> \xD9\xC5 |0
-<U68F9> \xB4\xCD |0
-<U68FA> \xB4\xC3 |0
-<U68FB> \xB4\xD9 |0
-<U68FC> \xD9\xC8 |0
-<U68FD> \xD9\xC7 |0
-<U6900> \xFD\x48 |0
-<U6901> \xFD\x47 |0
-<U6902> \xFE\xF2 |0
-<U6903> \xFE\x6A |0
-<U6904> \xD9\xAC |0
-<U6905> \xB4\xC8 |0
-<U6906> \xD9\xD4 |0
-<U6907> \xD9\xBC |0
-<U6908> \xD9\xBE |0
-<U6909> \x8D\xBD |0
-<U690A> \xD9\xCB |0
-<U690B> \xD9\xCA |0
-<U690C> \xD9\xAA |0
-<U690D> \xB4\xD3 |0
-<U690E> \xB4\xD5 |0
-<U690F> \xD9\xB2 |0
-<U6910> \xD9\xB9 |0
-<U6911> \xD9\xC1 |0
-<U6912> \xB4\xD4 |0
-<U6913> \xD9\xB8 |0
-<U6914> \xD9\xC4 |0
-<U6915> \xD9\xD7 |0
-<U6917> \xD9\xCC |0
-<U6918> \x9B\xA1 |0
-<U691A> \x9A\xB7 |0
-<U691B> \x8E\xFC |0
-<U6925> \xD9\xD8 |0
-<U692A> \xD9\xAE |0
-<U692C> \x9F\xA1 |0
-<U692F> \xDD\xF2 |0
-<U6930> \xB7\xA6 |0
-<U6932> \xDD\xF0 |0
-<U6933> \xDD\xDB |0
-<U6934> \xDD\xE0 |0
-<U6935> \xDD\xD9 |0
-<U6936> \xFD\x51 |0
-<U6937> \xDD\xEC |0
-<U6938> \xDD\xCB |0
-<U6939> \xDD\xD2 |0
-<U693B> \xDD\xEA |0
-<U693C> \xDD\xF4 |0
-<U693D> \xDD\xDC |0
-<U693E> \xFA\xAD |0
-<U693F> \xDD\xCF |0
-<U6940> \xDD\xE2 |0
-<U6941> \xDD\xE7 |0
-<U6942> \xDD\xD3 |0
-<U6943> \x8D\xBE |0
-<U6944> \xDD\xE4 |0
-<U6945> \xDD\xD0 |0
-<U6946> \x89\xA4 |0
-<U6948> \xDD\xD7 |0
-<U6949> \xDD\xD8 |0
-<U694A> \xB7\xA8 |0
-<U694B> \xDD\xEB |0
-<U694C> \xDD\xE9 |0
-<U694E> \xDD\xCC |0
-<U694F> \xDD\xEE |0
-<U6951> \xDD\xEF |0
-<U6952> \xDD\xF1 |0
-<U6953> \xB7\xAC |0
-<U6954> \xB7\xA4 |0
-<U6955> \x9A\xD9 |0
-<U6956> \xD5\xB8 |0
-<U6957> \xDD\xD4 |0
-<U6958> \xDD\xE6 |0
-<U6959> \xDD\xD5 |0
-<U695A> \xB7\xA1 |0
-<U695B> \xB7\xB1 |0
-<U695C> \xDD\xED |0
-<U695D> \xB7\xAF |0
-<U695E> \xB7\xAB |0
-<U695F> \xDD\xCA |0
-<U6960> \xB7\xA3 |0
-<U6961> \xFD\x4E |0
-<U6962> \xDD\xCD |0
-<U6963> \xB7\xB0 |0
-<U6964> \x8D\xC0 |0
-<U6965> \xDD\xDD |0
-<U6966> \xDD\xC9 |0
-<U6967> \x97\xF0 |0
-<U6968> \xB7\xA9 |0
-<U6969> \xDD\xE1 |0
-<U696A> \xDD\xD1 |0
-<U696B> \xB7\xAA |0
-<U696C> \xDD\xDA |0
-<U696D> \xB7\x7E |0
-<U696E> \xB4\xD8 |0
-<U696F> \xDD\xE3 |0
-<U6970> \xD9\xBF |0
-<U6971> \xDD\xCE |0
-<U6972> \x93\xB4 |0
-<U6973> \xFD\x44 |0
-<U6974> \xDD\xE8 |0
-<U6975> \xB7\xA5 |0
-<U6976> \xDD\xE5 |0
-<U6977> \xB7\xA2 |0
-<U6978> \xDD\xDF |0
-<U6979> \xB7\xAD |0
-<U697A> \xDD\xD6 |0
-<U697B> \xDD\xF3 |0
-<U6980> \x9F\xA7 |0
-<U6982> \xB7\xA7 |0
-<U6983> \xDE\xC6 |0
-<U6985> \x8D\xC2 |0
-<U6986> \xB7\xAE |0
-<U698A> \x99\xB6 |0
-<U698D> \xE2\x4A |0
-<U698E> \xE2\x48 |0
-<U6990> \xE2\x5E |0
-<U6991> \xE2\x46 |0
-<U6993> \xE2\x58 |0
-<U6994> \xB7\x7D |0
-<U6995> \xBA\x5F |0
-<U6996> \xE2\x42 |0
-<U6997> \xE2\x5D |0
-<U6998> \xFD\x52 |0
-<U6999> \xE2\x47 |0
-<U699A> \xE2\x55 |0
-<U699B> \xBA\x64 |0
-<U699C> \xBA\x5D |0
-<U699E> \xE2\x5B |0
-<U699F> \x8D\xC1 |0
-<U69A0> \xE2\x40 |0
-<U69A1> \xE2\x5A |0
-<U69A2> \x8E\x46 |0
-<U69A3> \xBA\x6F |0
-<U69A4> \xE2\x51 |0
-<U69A5> \xE2\x61 |0
-<U69A6> \xBA\x6D |0
-<U69A7> \xE2\x49 |0
-<U69A8> \xBA\x5E |0
-<U69A9> \xE2\x4B |0
-<U69AA> \xE2\x59 |0
-<U69AB> \xBA\x67 |0
-<U69AC> \xE2\x44 |0
-<U69AD> \xBA\x6B |0
-<U69AE> \xBA\x61 |0
-<U69AF> \xE2\x4D |0
-<U69B0> \xE2\x43 |0
-<U69B1> \xE1\xFC |0
-<U69B2> \xA0\xD1 |0
-<U69B3> \xE2\x57 |0
-<U69B4> \xBA\x68 |0
-<U69B5> \xE2\x60 |0
-<U69B6> \xE1\xFD |0
-<U69B7> \xBA\x65 |0
-<U69B9> \xE2\x53 |0
-<U69BB> \xBA\x66 |0
-<U69BC> \xE2\x45 |0
-<U69BD> \xE2\x50 |0
-<U69BE> \xE2\x4C |0
-<U69BF> \xE2\x4E |0
-<U69C0> \x9F\xCA |0
-<U69C1> \xBA\x60 |0
-<U69C2> \xE2\x5F |0
-<U69C3> \xBA\x6E |0
-<U69C4> \xE2\x4F |0
-<U69C6> \xE2\x62 |0
-<U69C9> \xE1\xFE |0
-<U69CA> \xE2\x54 |0
-<U69CB> \xBA\x63 |0
-<U69CC> \xBA\x6C |0
-<U69CD> \xBA\x6A |0
-<U69CE> \xE2\x41 |0
-<U69CF> \xE2\x56 |0
-<U69D0> \xBA\x69 |0
-<U69D1> \x92\xCF |0
-<U69D3> \xBA\x62 |0
-<U69D4> \xE2\x52 |0
-<U69D5> \x9C\xF4 |0
-<U69D6> \x8D\xC4 |0
-<U69D9> \xE2\x5C |0
-<U69E1> \xFD\x41 |0
-<U69E2> \xE5\xD5 |0
-<U69E4> \xE5\xD1 |0
-<U69E5> \xE5\xCD |0
-<U69E6> \xE5\xE1 |0
-<U69E7> \xE5\xDE |0
-<U69E8> \xBC\xCD |0
-<U69E9> \x9B\x4C |0
-<U69EB> \xE5\xE5 |0
-<U69EC> \xE5\xD4 |0
-<U69ED> \xBC\xD8 |0
-<U69EE> \xE5\xDB |0
-<U69F1> \xE5\xD0 |0
-<U69F2> \xE5\xDA |0
-<U69F3> \xBC\xD5 |0
-<U69F4> \xE5\xEE |0
-<U69F6> \xE5\xEB |0
-<U69F7> \xE5\xDD |0
-<U69F8> \xE5\xCE |0
-<U69F9> \xFD\x57 |0
-<U69FA> \xFC\xEF |0
-<U69FB> \xE5\xE2 |0
-<U69FC> \xE5\xE4 |0
-<U69FD> \xBC\xD1 |0
-<U69FE> \xE5\xD8 |0
-<U69FF> \xE5\xD3 |0
-<U6A00> \xE5\xCA |0
-<U6A01> \xBC\xCE |0
-<U6A02> \xBC\xD6 |0
-<U6A03> \x9C\xDE |0
-<U6A04> \xE5\xE7 |0
-<U6A05> \xBC\xD7 |0
-<U6A06> \xE5\xCB |0
-<U6A07> \xE5\xED |0
-<U6A08> \xE5\xE0 |0
-<U6A09> \xE5\xE6 |0
-<U6A0A> \xBC\xD4 |0
-<U6A0B> \xFD\x42 |0
-<U6A0C> \x98\x6C |0
-<U6A0D> \xE5\xE3 |0
-<U6A0F> \xE5\xEA |0
-<U6A11> \xBC\xD9 |0
-<U6A13> \xBC\xD3 |0
-<U6A14> \xE5\xDC |0
-<U6A15> \xE5\xCF |0
-<U6A16> \xE5\xEF |0
-<U6A17> \xE5\xCC |0
-<U6A18> \xE5\xE8 |0
-<U6A19> \xBC\xD0 |0
-<U6A1A> \x97\xF9 |0
-<U6A1B> \xE5\xD6 |0
-<U6A1C> \x95\x58 |0
-<U6A1D> \xE5\xD7 |0
-<U6A1E> \xBC\xCF |0
-<U6A1F> \xBC\xCC |0
-<U6A20> \xE5\xD2 |0
-<U6A21> \xBC\xD2 |0
-<U6A23> \xBC\xCB |0
-<U6A25> \xE5\xE9 |0
-<U6A26> \xE5\xEC |0
-<U6A27> \xE5\xD9 |0
-<U6A28> \xE9\xCA |0
-<U6A2B> \x98\x5E |0
-<U6A2C> \xFE\x7B |0
-<U6A2D> \x94\xCD |0
-<U6A32> \xE9\xC2 |0
-<U6A33> \x93\xEE |0
-<U6A34> \xE9\xBE |0
-<U6A35> \xBE\xF6 |0
-<U6A38> \xBE\xEB |0
-<U6A39> \xBE\xF0 |0
-<U6A3A> \xBE\xEC |0
-<U6A3B> \xE9\xCC |0
-<U6A3C> \xE9\xD7 |0
-<U6A3D> \xBE\xEA |0
-<U6A3E> \xE9\xC4 |0
-<U6A3F> \xE9\xCD |0
-<U6A40> \xE5\xDF |0
-<U6A41> \xE9\xCE |0
-<U6A44> \xBE\xF1 |0
-<U6A45> \xFD\x5A |0
-<U6A46> \xE9\xDD |0
-<U6A47> \xBE\xF5 |0
-<U6A48> \xBE\xF8 |0
-<U6A49> \xE9\xC0 |0
-<U6A4B> \xBE\xF4 |0
-<U6A4C> \x93\xF5 |0
-<U6A4D> \xE9\xDB |0
-<U6A4E> \xE9\xDC |0
-<U6A4F> \xE9\xD2 |0
-<U6A50> \xE9\xD1 |0
-<U6A51> \xE9\xC9 |0
-<U6A52> \x93\xEF |0
-<U6A53> \x8E\xEA |0
-<U6A54> \xE9\xD3 |0
-<U6A55> \xE9\xDA |0
-<U6A56> \xE9\xD9 |0
-<U6A57> \x8F\x5B |0
-<U6A58> \xBE\xEF |0
-<U6A59> \xBE\xED |0
-<U6A5A> \xE9\xCB |0
-<U6A5B> \xE9\xC8 |0
-<U6A5D> \xE9\xC5 |0
-<U6A5E> \xE9\xD8 |0
-<U6A5F> \xBE\xF7 |0
-<U6A60> \xE9\xD6 |0
-<U6A61> \xBE\xF3 |0
-<U6A62> \xBE\xF2 |0
-<U6A64> \xE9\xD0 |0
-<U6A65> \x8D\xC6 |0
-<U6A66> \xE9\xBF |0
-<U6A67> \xE9\xC1 |0
-<U6A68> \xE9\xC3 |0
-<U6A69> \xE9\xD5 |0
-<U6A6A> \xE9\xCF |0
-<U6A6B> \xBE\xEE |0
-<U6A6D> \xE9\xC6 |0
-<U6A6F> \xE9\xD4 |0
-<U6A71> \x8D\xC8 |0
-<U6A74> \x8D\xC7 |0
-<U6A76> \xE9\xC7 |0
-<U6A7A> \x93\xF7 |0
-<U6A7E> \xC0\xCF |0
-<U6A7F> \xED\x45 |0
-<U6A80> \xC0\xC8 |0
-<U6A81> \xEC\xF5 |0
-<U6A82> \x8D\xC9 |0
-<U6A83> \xED\x41 |0
-<U6A84> \xC0\xCA |0
-<U6A85> \xED\x48 |0
-<U6A87> \xEC\xFC |0
-<U6A89> \xEC\xF7 |0
-<U6A8A> \xFB\xF2 |0
-<U6A8C> \xED\x49 |0
-<U6A8D> \xEC\xF3 |0
-<U6A8E> \xEC\xFE |0
-<U6A8F> \x96\x70 |0
-<U6A90> \xC0\xD1 |0
-<U6A91> \xED\x44 |0
-<U6A92> \xED\x4A |0
-<U6A93> \xEC\xFD |0
-<U6A94> \xC0\xC9 |0
-<U6A95> \xED\x40 |0
-<U6A96> \xEC\xF4 |0
-<U6A97> \xC0\xD0 |0
-<U6A99> \x8D\xCB |0
-<U6A9A> \xED\x47 |0
-<U6A9B> \xEC\xF9 |0
-<U6A9C> \xC0\xCC |0
-<U6A9D> \xFD\x5C |0
-<U6A9E> \xEC\xFB |0
-<U6A9F> \xEC\xF8 |0
-<U6AA0> \xC0\xD2 |0
-<U6AA1> \xEC\xFA |0
-<U6AA2> \xC0\xCB |0
-<U6AA3> \xC0\xCE |0
-<U6AA4> \xED\x43 |0
-<U6AA5> \xEC\xF6 |0
-<U6AA6> \xED\x46 |0
-<U6AA7> \x8F\x65 |0
-<U6AA8> \xED\x42 |0
-<U6AAB> \x8D\xCD |0
-<U6AAC> \xC2\x63 |0
-<U6AAD> \xEF\xE7 |0
-<U6AAE> \xC2\x68 |0
-<U6AAF> \xC2\x69 |0
-<U6AB1> \x9D\xA8 |0
-<U6AB2> \x94\xF9 |0
-<U6AB3> \xC2\x62 |0
-<U6AB4> \xEF\xE6 |0
-<U6AB5> \x8D\xCE |0
-<U6AB6> \xEF\xE3 |0
-<U6AB7> \xEF\xE4 |0
-<U6AB8> \xC2\x66 |0
-<U6AB9> \xEF\xDE |0
-<U6ABA> \xEF\xE2 |0
-<U6ABB> \xC2\x65 |0
-<U6ABD> \xEF\xDF |0
-<U6ABE> \x93\xEA |0
-<U6AC2> \xC2\x67 |0
-<U6AC3> \xC2\x64 |0
-<U6AC5> \xEF\xDD |0
-<U6AC6> \xEF\xE1 |0
-<U6AC7> \xEF\xE5 |0
-<U6AC8> \xFD\x5F |0
-<U6AC9> \x93\xF0 |0
-<U6ACA> \x9F\xB6 |0
-<U6ACB> \xF2\x51 |0
-<U6ACC> \xF2\x4E |0
-<U6ACD> \xF2\x57 |0
-<U6ACF> \xF2\x56 |0
-<U6AD0> \xF2\x54 |0
-<U6AD1> \xF2\x4F |0
-<U6AD3> \xC3\x72 |0
-<U6AD4> \x8D\xCF |0
-<U6AD8> \x97\x63 |0
-<U6AD9> \xF2\x50 |0
-<U6ADA> \xC3\x71 |0
-<U6ADB> \xC0\xCD |0
-<U6ADC> \xF2\x53 |0
-<U6ADD> \xC3\x70 |0
-<U6ADE> \xF2\x58 |0
-<U6ADF> \xF2\x52 |0
-<U6AE0> \xF2\x4D |0
-<U6AE1> \xEF\xE0 |0
-<U6AE5> \xC3\x6F |0
-<U6AE7> \xF2\x4C |0
-<U6AE8> \xF4\x56 |0
-<U6AEA> \xF4\x55 |0
-<U6AEB> \xF2\x55 |0
-<U6AEC> \xC4\x68 |0
-<U6AEE> \xF4\x59 |0
-<U6AEF> \xF4\x5A |0
-<U6AF0> \xF4\x54 |0
-<U6AF1> \xF4\x58 |0
-<U6AF3> \xF4\x53 |0
-<U6AF6> \x8D\xD0 |0
-<U6AF8> \xF5\xD1 |0
-<U6AF9> \xF4\x57 |0
-<U6AFA> \xC4\xE7 |0
-<U6AFB> \xC4\xE5 |0
-<U6AFC> \xF5\xCF |0
-<U6B00> \xF5\xD2 |0
-<U6B02> \xF5\xCE |0
-<U6B03> \xF5\xD0 |0
-<U6B04> \xC4\xE6 |0
-<U6B05> \x93\xF1 |0
-<U6B08> \xF6\xE5 |0
-<U6B09> \xF6\xE6 |0
-<U6B0A> \xC5\x76 |0
-<U6B0B> \xF6\xE4 |0
-<U6B0F> \xF7\xE2 |0
-<U6B10> \xC5\xCF |0
-<U6B11> \xF7\xE0 |0
-<U6B12> \xF7\xE1 |0
-<U6B13> \xF8\xAC |0
-<U6B16> \xC6\x56 |0
-<U6B17> \xF8\xF3 |0
-<U6B18> \xF8\xF1 |0
-<U6B19> \xF8\xF2 |0
-<U6B1A> \xF8\xF4 |0
-<U6B1D> \xFD\x62 |0
-<U6B1E> \xF9\xBB |0
-<U6B20> \xA4\xED |0
-<U6B21> \xA6\xB8 |0
-<U6B23> \xAA\x59 |0
-<U6B25> \xCC\xE9 |0
-<U6B28> \xCF\x64 |0
-<U6B2C> \xD1\xF5 |0
-<U6B2D> \xD1\xF7 |0
-<U6B2F> \xD1\xF6 |0
-<U6B31> \xD1\xF8 |0
-<U6B32> \xB1\xFD |0
-<U6B33> \xD5\xD7 |0
-<U6B34> \xD1\xF9 |0
-<U6B35> \xFD\x65 |0
-<U6B36> \xD5\xD6 |0
-<U6B37> \xD5\xD8 |0
-<U6B38> \xD5\xD9 |0
-<U6B39> \xD9\xDA |0
-<U6B3A> \xB4\xDB |0
-<U6B3B> \xD9\xDB |0
-<U6B3C> \xD9\xDD |0
-<U6B3D> \xB4\xDC |0
-<U6B3E> \xB4\xDA |0
-<U6B3F> \xD9\xDC |0
-<U6B41> \xDD\xFA |0
-<U6B42> \xDD\xF8 |0
-<U6B43> \xDD\xF7 |0
-<U6B45> \xDD\xF6 |0
-<U6B46> \xDD\xF5 |0
-<U6B47> \xB7\xB2 |0
-<U6B48> \xDD\xF9 |0
-<U6B49> \xBA\x70 |0
-<U6B4A> \xE2\x63 |0
-<U6B4B> \xE2\x65 |0
-<U6B4C> \xBA\x71 |0
-<U6B4D> \xE2\x64 |0
-<U6B4E> \xBC\xDB |0
-<U6B50> \xBC\xDA |0
-<U6B51> \xE5\xF0 |0
-<U6B52> \x9F\xDB |0
-<U6B54> \xE9\xDF |0
-<U6B55> \xE9\xDE |0
-<U6B56> \xE9\xE0 |0
-<U6B57> \x93\xF8 |0
-<U6B59> \xBE\xF9 |0
-<U6B5B> \xED\x4B |0
-<U6B5C> \xC0\xD3 |0
-<U6B5E> \xEF\xE8 |0
-<U6B5F> \xC2\x6A |0
-<U6B60> \xF2\x59 |0
-<U6B61> \xC5\x77 |0
-<U6B62> \xA4\xEE |0
-<U6B63> \xA5\xBF |0
-<U6B64> \xA6\xB9 |0
-<U6B65> \xA8\x42 |0
-<U6B66> \xAA\x5A |0
-<U6B67> \xAA\x5B |0
-<U6B6A> \xAC\x6E |0
-<U6B6D> \xD1\xFA |0
-<U6B6F> \x8B\xF7 |0
-<U6B72> \xB7\xB3 |0
-<U6B74> \xFD\x66 |0
-<U6B76> \xE6\xD1 |0
-<U6B77> \xBE\xFA |0
-<U6B78> \xC2\x6B |0
-<U6B79> \xA4\xEF |0
-<U6B7A> \x8B\xCF |0
-<U6B7B> \xA6\xBA |0
-<U6B7E> \xCC\xEB |0
-<U6B7F> \xAA\x5C |0
-<U6B80> \xCC\xEA |0
-<U6B81> \x8D\xD1 |0
-<U6B82> \xCF\x65 |0
-<U6B83> \xAC\x6F |0
-<U6B84> \xCF\x66 |0
-<U6B86> \xAC\x70 |0
-<U6B88> \xD1\xFC |0
-<U6B89> \xAE\xEE |0
-<U6B8A> \xAE\xED |0
-<U6B8C> \xD5\xDE |0
-<U6B8D> \xD5\xDC |0
-<U6B8E> \xD5\xDD |0
-<U6B8F> \xD5\xDB |0
-<U6B91> \xD5\xDA |0
-<U6B94> \xD9\xDE |0
-<U6B95> \xD9\xE1 |0
-<U6B96> \xB4\xDE |0
-<U6B97> \xD9\xDF |0
-<U6B98> \xB4\xDD |0
-<U6B99> \xD9\xE0 |0
-<U6B9B> \xDD\xFB |0
-<U6B9E> \xE2\x66 |0
-<U6B9F> \xE2\x67 |0
-<U6BA0> \xE2\x68 |0
-<U6BA2> \xE5\xF3 |0
-<U6BA3> \xE5\xF2 |0
-<U6BA4> \xBC\xDC |0
-<U6BA5> \xE5\xF1 |0
-<U6BA6> \xE5\xF4 |0
-<U6BA7> \xE9\xE1 |0
-<U6BAA> \xE9\xE2 |0
-<U6BAB> \xE9\xE3 |0
-<U6BAD> \xED\x4C |0
-<U6BAE> \xC0\xD4 |0
-<U6BAF> \xC2\x6C |0
-<U6BB0> \xF2\x5A |0
-<U6BB2> \xC4\xE8 |0
-<U6BB3> \xC9\x5F |0
-<U6BB5> \xAC\x71 |0
-<U6BB6> \xCF\x67 |0
-<U6BB7> \xAE\xEF |0
-<U6BBA> \xB1\xFE |0
-<U6BBC> \xB4\xDF |0
-<U6BBD> \xD9\xE2 |0
-<U6BBF> \xB7\xB5 |0
-<U6BC0> \xB7\xB4 |0
-<U6BC1> \x8D\xD2 |0
-<U6BC3> \xE2\x69 |0
-<U6BC4> \xE2\x6A |0
-<U6BC5> \xBC\xDD |0
-<U6BC6> \xBC\xDE |0
-<U6BC7> \xE9\xE5 |0
-<U6BC8> \xE9\xE4 |0
-<U6BC9> \xEF\xE9 |0
-<U6BCA> \xF7\xE3 |0
-<U6BCB> \xA4\xF0 |0
-<U6BCC> \xC9\x60 |0
-<U6BCD> \xA5\xC0 |0
-<U6BCF> \xA8\x43 |0
-<U6BD0> \xCB\x48 |0
-<U6BD2> \xAC\x72 |0
-<U6BD3> \xB7\xB6 |0
-<U6BD4> \xA4\xF1 |0
-<U6BD6> \xCF\x68 |0
-<U6BD7> \xAC\x73 |0
-<U6BD8> \xCF\x69 |0
-<U6BDA> \xC0\xD5 |0
-<U6BDB> \xA4\xF2 |0
-<U6BDC> \xFD\x71 |0
-<U6BDE> \xCC\xEC |0
-<U6BE0> \xCF\x6A |0
-<U6BE1> \xFD\x6F |0
-<U6BE2> \xD2\x42 |0
-<U6BE3> \xD2\x41 |0
-<U6BE4> \xD1\xFE |0
-<U6BE6> \xD1\xFD |0
-<U6BE7> \xD2\x43 |0
-<U6BE8> \xD2\x40 |0
-<U6BEA> \x8D\xD3 |0
-<U6BEB> \xB2\x40 |0
-<U6BEC> \xB2\x41 |0
-<U6BEF> \xB4\xE0 |0
-<U6BF0> \xD9\xE3 |0
-<U6BF2> \xD9\xE4 |0
-<U6BF3> \xD9\xE5 |0
-<U6BF7> \xDE\x41 |0
-<U6BF8> \xDE\x42 |0
-<U6BF9> \xDE\x40 |0
-<U6BFA> \x9F\xE7 |0
-<U6BFB> \xDD\xFD |0
-<U6BFC> \xDD\xFE |0
-<U6BFD> \xB7\xB7 |0
-<U6BFE> \xE2\x6B |0
-<U6BFF> \xE5\xF7 |0
-<U6C00> \xE5\xF6 |0
-<U6C01> \xE5\xF5 |0
-<U6C02> \xE5\xF8 |0
-<U6C03> \xE9\xE7 |0
-<U6C04> \xE9\xE6 |0
-<U6C05> \xBE\xFB |0
-<U6C06> \xE9\xE8 |0
-<U6C08> \xC0\xD6 |0
-<U6C09> \xED\x4D |0
-<U6C0B> \xEF\xEA |0
-<U6C0C> \xF2\x5B |0
-<U6C0D> \xF6\xE7 |0
-<U6C0F> \xA4\xF3 |0
-<U6C10> \xA5\xC2 |0
-<U6C11> \xA5\xC1 |0
-<U6C13> \xAA\x5D |0
-<U6C14> \xC9\x61 |0
-<U6C15> \xC9\x7E |0
-<U6C16> \xA6\xBB |0
-<U6C18> \xC9\xF7 |0
-<U6C19> \xCB\x49 |0
-<U6C1A> \xCB\x4A |0
-<U6C1B> \xAA\x5E |0
-<U6C1C> \x90\xBD |0
-<U6C1D> \xCC\xED |0
-<U6C1F> \xAC\x74 |0
-<U6C20> \xCF\x6B |0
-<U6C21> \xCF\x6C |0
-<U6C23> \xAE\xF0 |0
-<U6C24> \xAE\xF4 |0
-<U6C25> \xD2\x44 |0
-<U6C26> \xAE\xF3 |0
-<U6C27> \xAE\xF1 |0
-<U6C28> \xAE\xF2 |0
-<U6C2A> \xD5\xDF |0
-<U6C2B> \xB2\x42 |0
-<U6C2C> \xB4\xE3 |0
-<U6C2E> \xB4\xE1 |0
-<U6C2F> \xB4\xE2 |0
-<U6C30> \xD9\xE6 |0
-<U6C31> \x9F\xD0 |0
-<U6C33> \xBA\x72 |0
-<U6C34> \xA4\xF4 |0
-<U6C35> \x8B\xD0 |0
-<U6C36> \xC9\xA1 |0
-<U6C37> \xFD\x72 |0
-<U6C38> \xA5\xC3 |0
-<U6C39> \x9C\xAE |0
-<U6C3A> \x8B\xD1 |0
-<U6C3B> \xC9\xA4 |0
-<U6C3D> \x8A\xDB |0
-<U6C3E> \xA5\xC6 |0
-<U6C3F> \xC9\xA3 |0
-<U6C40> \xA5\xC5 |0
-<U6C41> \xA5\xC4 |0
-<U6C42> \xA8\x44 |0
-<U6C43> \xC9\xA2 |0
-<U6C46> \xC9\xF8 |0
-<U6C49> \xFA\xE4 |0
-<U6C4A> \xC9\xFC |0
-<U6C4B> \xC9\xFE |0
-<U6C4C> \xCA\x40 |0
-<U6C4D> \xA6\xC5 |0
-<U6C4E> \xA6\xC6 |0
-<U6C4F> \xC9\xFB |0
-<U6C50> \xA6\xC1 |0
-<U6C52> \xC9\xF9 |0
-<U6C54> \xC9\xFD |0
-<U6C55> \xA6\xC2 |0
-<U6C57> \xA6\xBD |0
-<U6C58> \x95\xCE |0
-<U6C59> \xA6\xBE |0
-<U6C5A> \xFD\x76 |0
-<U6C5B> \xA6\xC4 |0
-<U6C5C> \xC9\xFA |0
-<U6C5D> \xA6\xBC |0
-<U6C5E> \xA8\x45 |0
-<U6C5F> \xA6\xBF |0
-<U6C60> \xA6\xC0 |0
-<U6C61> \xA6\xC3 |0
-<U6C65> \xCB\x5B |0
-<U6C66> \xCB\x59 |0
-<U6C67> \xCB\x4C |0
-<U6C68> \xA8\x51 |0
-<U6C69> \xCB\x53 |0
-<U6C6A> \xA8\x4C |0
-<U6C6B> \xCB\x4D |0
-<U6C6D> \xCB\x55 |0
-<U6C6E> \xFB\x62 |0
-<U6C6F> \xCB\x52 |0
-<U6C70> \xA8\x4F |0
-<U6C71> \xCB\x51 |0
-<U6C72> \xA8\x56 |0
-<U6C73> \xCB\x5A |0
-<U6C74> \xA8\x58 |0
-<U6C75> \x8D\xD4 |0
-<U6C76> \xA8\x5A |0
-<U6C78> \xCB\x4B |0
-<U6C79> \xFD\x78 |0
-<U6C7A> \xA8\x4D |0
-<U6C7B> \xCB\x5C |0
-<U6C7D> \xA8\x54 |0
-<U6C7E> \xA8\x57 |0
-<U6C7F> \x8E\xE3 |0
-<U6C80> \xCD\x45 |0
-<U6C81> \xA8\x47 |0
-<U6C82> \xA8\x5E |0
-<U6C83> \xA8\x55 |0
-<U6C84> \xCB\x4E |0
-<U6C85> \xA8\x4A |0
-<U6C86> \xA8\x59 |0
-<U6C87> \xCB\x56 |0
-<U6C88> \xA8\x48 |0
-<U6C89> \xA8\x49 |0
-<U6C8A> \xCD\x43 |0
-<U6C8B> \xCB\x4F |0
-<U6C8C> \xA8\x50 |0
-<U6C8D> \xA8\x5B |0
-<U6C8E> \xCB\x5D |0
-<U6C8F> \xCB\x50 |0
-<U6C90> \xA8\x4E |0
-<U6C92> \xA8\x53 |0
-<U6C93> \xCC\xEE |0
-<U6C94> \xA8\x5C |0
-<U6C95> \xCB\x57 |0
-<U6C96> \xA8\x52 |0
-<U6C98> \xA8\x5D |0
-<U6C99> \xA8\x46 |0
-<U6C9A> \xCB\x54 |0
-<U6C9B> \xA8\x4B |0
-<U6C9C> \xCB\x58 |0
-<U6C9D> \xCD\x44 |0
-<U6C9F> \x90\x76 |0
-<U6CA2> \x98\xC6 |0
-<U6CAA> \x8D\xD5 |0
-<U6CAB> \xAA\x6A |0
-<U6CAC> \xAA\x7A |0
-<U6CAD> \xCC\xF5 |0
-<U6CAE> \xAA\x71 |0
-<U6CAF> \x97\xD1 |0
-<U6CB0> \xCD\x4B |0
-<U6CB1> \xAA\x62 |0
-<U6CB2> \x9E\xB6 |0
-<U6CB3> \xAA\x65 |0
-<U6CB4> \xCD\x42 |0
-<U6CB6> \xCC\xF3 |0
-<U6CB7> \xCC\xF7 |0
-<U6CB8> \xAA\x6D |0
-<U6CB9> \xAA\x6F |0
-<U6CBA> \xCC\xFA |0
-<U6CBB> \xAA\x76 |0
-<U6CBC> \xAA\x68 |0
-<U6CBD> \xAA\x66 |0
-<U6CBE> \xAA\x67 |0
-<U6CBF> \xAA\x75 |0
-<U6CC0> \xCD\x47 |0
-<U6CC1> \xAA\x70 |0
-<U6CC2> \xCC\xF9 |0
-<U6CC3> \xCC\xFB |0
-<U6CC4> \xAA\x6E |0
-<U6CC5> \xAA\x73 |0
-<U6CC6> \xCC\xFC |0
-<U6CC7> \xCD\x4A |0
-<U6CC9> \xAC\x75 |0
-<U6CCA> \xAA\x79 |0
-<U6CCB> \xFA\xC7 |0
-<U6CCC> \xAA\x63 |0
-<U6CCD> \xCD\x49 |0
-<U6CCE> \xA0\x42 |0
-<U6CCF> \xCD\x4D |0
-<U6CD0> \xCC\xF8 |0
-<U6CD1> \xCD\x4F |0
-<U6CD2> \xCD\x40 |0
-<U6CD3> \xAA\x6C |0
-<U6CD4> \xCC\xF4 |0
-<U6CD5> \xAA\x6B |0
-<U6CD6> \xAA\x7D |0
-<U6CD7> \xAA\x72 |0
-<U6CD9> \xCC\xF2 |0
-<U6CDA> \xCF\x75 |0
-<U6CDB> \xAA\x78 |0
-<U6CDC> \xAA\x7C |0
-<U6CDD> \xCD\x41 |0
-<U6CDE> \xCD\x46 |0
-<U6CDF> \x98\x73 |0
-<U6CE0> \xAA\x7E |0
-<U6CE1> \xAA\x77 |0
-<U6CE2> \xAA\x69 |0
-<U6CE3> \xAA\x5F |0
-<U6CE5> \xAA\x64 |0
-<U6CE7> \xCC\xF6 |0
-<U6CE8> \xAA\x60 |0
-<U6CE9> \xCD\x4E |0
-<U6CEA> \x9F\xFC |0
-<U6CEB> \xCC\xF0 |0
-<U6CEC> \xCC\xEF |0
-<U6CED> \xCC\xFD |0
-<U6CEE> \xCC\xF1 |0
-<U6CEF> \xAA\x7B |0
-<U6CF0> \xAE\xF5 |0
-<U6CF1> \xAA\x74 |0
-<U6CF2> \xCC\xFE |0
-<U6CF3> \xAA\x61 |0
-<U6CF5> \xAC\xA6 |0
-<U6CF9> \xCD\x4C |0
-<U6D00> \xCF\x7C |0
-<U6D01> \xCF\xA1 |0
-<U6D02> \x8D\xD7 |0
-<U6D03> \xCF\xA4 |0
-<U6D04> \xCF\x77 |0
-<U6D05> \x92\xFB |0
-<U6D06> \x8D\xD8 |0
-<U6D07> \xCF\xA7 |0
-<U6D08> \xCF\xAA |0
-<U6D09> \xCF\xAC |0
-<U6D0A> \xCF\x74 |0
-<U6D0B> \xAC\x76 |0
-<U6D0C> \xAC\x7B |0
-<U6D0D> \xD2\x49 |0
-<U6D0E> \xAC\xAD |0
-<U6D0F> \xCF\xA5 |0
-<U6D10> \xCF\xAD |0
-<U6D11> \xCF\x7B |0
-<U6D12> \xCF\x73 |0
-<U6D16> \xD2\x64 |0
-<U6D17> \xAC\x7E |0
-<U6D18> \xCF\xA2 |0
-<U6D19> \xCF\x78 |0
-<U6D1A> \xCF\x7A |0
-<U6D1B> \xAC\xA5 |0
-<U6D1D> \xCF\x7D |0
-<U6D1E> \xAC\x7D |0
-<U6D1F> \xCF\x70 |0
-<U6D20> \xCF\xA8 |0
-<U6D22> \xCF\xAB |0
-<U6D24> \x94\x4F |0
-<U6D25> \xAC\x7A |0
-<U6D26> \x8D\xD9 |0
-<U6D27> \xAC\xA8 |0
-<U6D28> \xCF\x6D |0
-<U6D29> \xAC\xAA |0
-<U6D2A> \xAC\x78 |0
-<U6D2B> \xAC\xAE |0
-<U6D2C> \xCF\xA9 |0
-<U6D2D> \xCF\x6F |0
-<U6D2E> \xAC\xAB |0
-<U6D2F> \xD2\x5E |0
-<U6D30> \xCD\x48 |0
-<U6D31> \xAC\x7C |0
-<U6D32> \xAC\x77 |0
-<U6D33> \xCF\x76 |0
-<U6D34> \xCF\x6E |0
-<U6D35> \xAC\xAC |0
-<U6D36> \xAC\xA4 |0
-<U6D37> \xCF\xA3 |0
-<U6D38> \xAC\xA9 |0
-<U6D39> \xAC\xA7 |0
-<U6D3A> \xCF\x79 |0
-<U6D3B> \xAC\xA1 |0
-<U6D3C> \xCF\x71 |0
-<U6D3D> \xAC\xA2 |0
-<U6D3E> \xAC\xA3 |0
-<U6D3F> \xCF\x72 |0
-<U6D40> \xCF\xA6 |0
-<U6D41> \xAC\x79 |0
-<U6D42> \xCF\x7E |0
-<U6D4E> \x89\x6B |0
-<U6D57> \x97\xCE |0
-<U6D58> \xD2\x4C |0
-<U6D59> \xAE\xFD |0
-<U6D5A> \xAF\x43 |0
-<U6D5B> \xFA\xF3 |0
-<U6D5C> \xFD\xAE |0
-<U6D5E> \xD2\x55 |0
-<U6D5F> \xD2\x5B |0
-<U6D60> \xD2\x57 |0
-<U6D61> \xD2\x4A |0
-<U6D62> \xD2\x4D |0
-<U6D63> \xD2\x46 |0
-<U6D64> \xD2\x47 |0
-<U6D65> \xAF\x4A |0
-<U6D66> \xAE\xFA |0
-<U6D67> \xD2\x56 |0
-<U6D68> \xD2\x5F |0
-<U6D69> \xAF\x45 |0
-<U6D6A> \xAE\xF6 |0
-<U6D6C> \xAF\x40 |0
-<U6D6D> \xD2\x4E |0
-<U6D6E> \xAF\x42 |0
-<U6D6F> \xD2\x4F |0
-<U6D70> \xD2\x59 |0
-<U6D71> \xFB\xAF |0
-<U6D72> \x92\xB7 |0
-<U6D74> \xAF\x44 |0
-<U6D75> \xD2\x68 |0
-<U6D76> \xD2\x48 |0
-<U6D77> \xAE\xFC |0
-<U6D78> \xAE\xFB |0
-<U6D79> \xAF\x48 |0
-<U6D7A> \xD2\x45 |0
-<U6D7B> \xD2\x66 |0
-<U6D7C> \xD2\x5A |0
-<U6D7D> \xD2\x67 |0
-<U6D7E> \xD2\x61 |0
-<U6D7F> \xD2\x53 |0
-<U6D80> \xD2\x62 |0
-<U6D81> \x8D\xDA |0
-<U6D82> \xD2\x5C |0
-<U6D83> \xD2\x65 |0
-<U6D84> \xD2\x63 |0
-<U6D85> \xAF\x49 |0
-<U6D86> \xD2\x54 |0
-<U6D87> \xAE\xF9 |0
-<U6D88> \xAE\xF8 |0
-<U6D89> \xAF\x41 |0
-<U6D8A> \xAF\x47 |0
-<U6D8B> \xD2\x60 |0
-<U6D8C> \xAF\x46 |0
-<U6D8D> \xD2\x51 |0
-<U6D8E> \xB2\x43 |0
-<U6D8F> \x9C\x5A |0
-<U6D90> \xD2\x69 |0
-<U6D91> \xD2\x50 |0
-<U6D92> \xD2\x4B |0
-<U6D93> \xAE\xFE |0
-<U6D94> \xAF\x4B |0
-<U6D95> \xAE\xF7 |0
-<U6D96> \xFD\xAD |0
-<U6D97> \xD2\x58 |0
-<U6D98> \xD2\x5D |0
-<U6DA4> \x8D\xDC |0
-<U6DA5> \x94\x44 |0
-<U6DAA> \xB2\x65 |0
-<U6DAB> \xD5\xE1 |0
-<U6DAC> \xD5\xE5 |0
-<U6DAE> \xB2\x52 |0
-<U6DAF> \xB2\x50 |0
-<U6DB1> \x8D\xDD |0
-<U6DB2> \xB2\x47 |0
-<U6DB3> \xD5\xE3 |0
-<U6DB4> \xD5\xE2 |0
-<U6DB5> \xB2\x5B |0
-<U6DB7> \xD5\xE8 |0
-<U6DB8> \xB2\x55 |0
-<U6DB9> \xA0\xD6 |0
-<U6DBA> \xD5\xFA |0
-<U6DBB> \xD6\x47 |0
-<U6DBC> \xB2\x44 |0
-<U6DBD> \xD5\xF7 |0
-<U6DBE> \xD5\xF0 |0
-<U6DBF> \xB2\x67 |0
-<U6DC0> \xD5\xE0 |0
-<U6DC2> \xD5\xFC |0
-<U6DC4> \xB2\x64 |0
-<U6DC5> \xB2\x58 |0
-<U6DC6> \xB2\x63 |0
-<U6DC7> \xB2\x4E |0
-<U6DC8> \xD5\xEC |0
-<U6DC9> \xD5\xFE |0
-<U6DCA> \xD5\xF6 |0
-<U6DCB> \xB2\x4F |0
-<U6DCC> \xB2\x49 |0
-<U6DCD> \xD6\x45 |0
-<U6DCF> \xD5\xFD |0
-<U6DD0> \xD6\x40 |0
-<U6DD1> \xB2\x51 |0
-<U6DD2> \xB2\x59 |0
-<U6DD3> \xD6\x42 |0
-<U6DD4> \xD5\xEA |0
-<U6DD5> \xD5\xFB |0
-<U6DD6> \xD5\xEF |0
-<U6DD7> \xD6\x44 |0
-<U6DD8> \xB2\x5E |0
-<U6DD9> \xB2\x46 |0
-<U6DDA> \xB2\x5C |0
-<U6DDB> \xD5\xF4 |0
-<U6DDC> \xD5\xF2 |0
-<U6DDD> \xD5\xF3 |0
-<U6DDE> \xB2\x53 |0
-<U6DDF> \xD5\xEE |0
-<U6DE0> \xD5\xED |0
-<U6DE1> \xB2\x48 |0
-<U6DE2> \xD5\xE7 |0
-<U6DE3> \xD6\x46 |0
-<U6DE4> \xB2\x4A |0
-<U6DE5> \xD5\xF1 |0
-<U6DE6> \xB2\x68 |0
-<U6DE8> \xB2\x62 |0
-<U6DE9> \xD5\xE6 |0
-<U6DEA> \xB2\x5F |0
-<U6DEB> \xB2\x5D |0
-<U6DEC> \xB2\x66 |0
-<U6DED> \xD5\xF8 |0
-<U6DEE> \xB2\x61 |0
-<U6DEF> \xD2\x52 |0
-<U6DF0> \xD5\xF9 |0
-<U6DF1> \xB2\x60 |0
-<U6DF2> \xD6\x41 |0
-<U6DF3> \xB2\x45 |0
-<U6DF4> \xD5\xF5 |0
-<U6DF5> \xB2\x57 |0
-<U6DF6> \xD5\xE9 |0
-<U6DF7> \xB2\x56 |0
-<U6DF9> \xB2\x54 |0
-<U6DFA> \xB2\x4C |0
-<U6DFB> \xB2\x4B |0
-<U6DFC> \xD9\xE7 |0
-<U6DFD> \xD6\x43 |0
-<U6E00> \xD5\xEB |0
-<U6E02> \x97\xD5 |0
-<U6E03> \xD9\xFC |0
-<U6E04> \x94\x4A |0
-<U6E05> \xB2\x4D |0
-<U6E0A> \x94\x4D |0
-<U6E0F> \x97\xCB |0
-<U6E15> \x8D\xDE |0
-<U6E18> \x8D\xDF |0
-<U6E19> \xB5\x41 |0
-<U6E1A> \xB2\x5A |0
-<U6E1B> \xB4\xEE |0
-<U6E1C> \xD9\xF6 |0
-<U6E1D> \xB4\xFC |0
-<U6E1F> \xD9\xEA |0
-<U6E20> \xB4\xEB |0
-<U6E21> \xB4\xE7 |0
-<U6E22> \xDA\x49 |0
-<U6E23> \xB4\xED |0
-<U6E24> \xB4\xF1 |0
-<U6E25> \xB4\xEC |0
-<U6E26> \xB4\xF5 |0
-<U6E27> \xDA\x4D |0
-<U6E28> \xDA\x44 |0
-<U6E29> \x8D\xE0 |0
-<U6E2A> \xFE\xF9 |0
-<U6E2B> \xD9\xF1 |0
-<U6E2C> \xB4\xFA |0
-<U6E2D> \xB4\xF4 |0
-<U6E2E> \xD9\xFD |0
-<U6E2F> \xB4\xE4 |0
-<U6E30> \xDA\x4A |0
-<U6E31> \xDA\x43 |0
-<U6E32> \xB4\xE8 |0
-<U6E33> \xD9\xF7 |0
-<U6E34> \xB4\xF7 |0
-<U6E35> \xDA\x55 |0
-<U6E36> \xDA\x56 |0
-<U6E38> \xB4\xE5 |0
-<U6E39> \xDA\x48 |0
-<U6E3A> \xB4\xF9 |0
-<U6E3B> \xD9\xFB |0
-<U6E3C> \xD9\xED |0
-<U6E3D> \xD9\xEE |0
-<U6E3E> \xB4\xFD |0
-<U6E3F> \xD9\xF2 |0
-<U6E40> \xD9\xF9 |0
-<U6E41> \xD9\xF3 |0
-<U6E43> \xB4\xFB |0
-<U6E44> \xB5\x44 |0
-<U6E45> \xD9\xEF |0
-<U6E46> \xD9\xE8 |0
-<U6E47> \xD9\xE9 |0
-<U6E49> \xD9\xEB |0
-<U6E4A> \xB4\xEA |0
-<U6E4B> \xD9\xF8 |0
-<U6E4D> \xB4\xF8 |0
-<U6E4E> \xB5\x42 |0
-<U6E4F> \xFD\xC0 |0
-<U6E50> \xFC\xF9 |0
-<U6E51> \xD9\xFA |0
-<U6E52> \xDA\x53 |0
-<U6E53> \xDA\x4B |0
-<U6E54> \xB4\xE6 |0
-<U6E55> \xDA\x51 |0
-<U6E56> \xB4\xF2 |0
-<U6E58> \xB4\xF0 |0
-<U6E59> \xFB\x7E |0
-<U6E5A> \xDA\x57 |0
-<U6E5B> \xB4\xEF |0
-<U6E5C> \xDA\x41 |0
-<U6E5D> \xD9\xF4 |0
-<U6E5E> \xD9\xFE |0
-<U6E5F> \xB5\x47 |0
-<U6E60> \xDA\x45 |0
-<U6E61> \xDA\x42 |0
-<U6E62> \xD9\xF0 |0
-<U6E63> \xB5\x43 |0
-<U6E64> \xDA\x4F |0
-<U6E65> \xDA\x4C |0
-<U6E66> \xDA\x54 |0
-<U6E67> \xB4\xE9 |0
-<U6E68> \xDA\x40 |0
-<U6E69> \xB5\x46 |0
-<U6E6B> \xDA\x47 |0
-<U6E6E> \xB4\xF3 |0
-<U6E6F> \xB4\xF6 |0
-<U6E71> \xDA\x46 |0
-<U6E72> \xB5\x45 |0
-<U6E73> \xD9\xF5 |0
-<U6E74> \xD5\xE4 |0
-<U6E76> \x92\xB3 |0
-<U6E77> \xDA\x50 |0
-<U6E78> \xDA\x4E |0
-<U6E79> \xDA\x52 |0
-<U6E7C> \xFD\xAF |0
-<U6E86> \x8D\xE1 |0
-<U6E88> \xD9\xEC |0
-<U6E89> \xB5\x40 |0
-<U6E8B> \x95\xD3 |0
-<U6E8D> \xDE\x61 |0
-<U6E8E> \xDE\x60 |0
-<U6E8F> \xDE\x46 |0
-<U6E90> \xB7\xBD |0
-<U6E92> \xDE\x5F |0
-<U6E93> \xDE\x49 |0
-<U6E94> \xDE\x4A |0
-<U6E96> \xB7\xC7 |0
-<U6E97> \xDE\x68 |0
-<U6E98> \xB7\xC2 |0
-<U6E99> \xDE\x5E |0
-<U6E9A> \x89\xC1 |0
-<U6E9B> \xDE\x43 |0
-<U6E9C> \xB7\xC8 |0
-<U6E9D> \xB7\xBE |0
-<U6E9E> \xDE\x52 |0
-<U6E9F> \xDE\x48 |0
-<U6EA0> \xDE\x4B |0
-<U6EA1> \xDE\x63 |0
-<U6EA2> \xB7\xB8 |0
-<U6EA3> \xDE\x6A |0
-<U6EA4> \xDE\x62 |0
-<U6EA5> \xB7\xC1 |0
-<U6EA6> \xDE\x57 |0
-<U6EA7> \xB7\xCC |0
-<U6EAA> \xB7\xCB |0
-<U6EAB> \xB7\xC5 |0
-<U6EAE> \xDE\x69 |0
-<U6EAF> \xB7\xB9 |0
-<U6EB0> \xDE\x55 |0
-<U6EB1> \xDE\x4C |0
-<U6EB2> \xDE\x59 |0
-<U6EB3> \xDE\x65 |0
-<U6EB4> \xB7\xCD |0
-<U6EB5> \xFD\x68 |0
-<U6EB6> \xB7\xBB |0
-<U6EB7> \xDE\x54 |0
-<U6EB8> \x9C\xB7 |0
-<U6EB9> \xDE\x4D |0
-<U6EBA> \xB7\xC4 |0
-<U6EBB> \x8D\xE3 |0
-<U6EBC> \xB7\xC3 |0
-<U6EBD> \xDE\x50 |0
-<U6EBE> \xDE\x5A |0
-<U6EBF> \xDE\x64 |0
-<U6EC0> \xDE\x47 |0
-<U6EC1> \xDE\x51 |0
-<U6EC2> \xB7\xBC |0
-<U6EC3> \xDE\x5B |0
-<U6EC4> \xB7\xC9 |0
-<U6EC5> \xB7\xC0 |0
-<U6EC6> \xDE\x4E |0
-<U6EC7> \xB7\xBF |0
-<U6EC8> \xDE\x45 |0
-<U6EC9> \xDE\x53 |0
-<U6ECA> \xDE\x67 |0
-<U6ECB> \xB4\xFE |0
-<U6ECC> \xBA\xB0 |0
-<U6ECD> \xDE\x56 |0
-<U6ECE> \xE2\x6C |0
-<U6ECF> \xDE\x58 |0
-<U6ED0> \xDE\x66 |0
-<U6ED1> \xB7\xC6 |0
-<U6ED2> \xDE\x4F |0
-<U6ED3> \xB7\xBA |0
-<U6ED4> \xB7\xCA |0
-<U6ED5> \xBC\xF0 |0
-<U6ED6> \xDE\x44 |0
-<U6ED8> \xDE\x5D |0
-<U6ED9> \xFA\xC0 |0
-<U6EDA> \x8D\xE5 |0
-<U6EDB> \xFA\x64 |0
-<U6EDC> \xDE\x5C |0
-<U6EDD> \x89\x47 |0
-<U6EE2> \x8D\xE4 |0
-<U6EE8> \x8D\xE7 |0
-<U6EE9> \x8D\xE8 |0
-<U6EEB> \xE2\xAA |0
-<U6EEC> \xBA\xAD |0
-<U6EED> \xE2\x7D |0
-<U6EEE> \xE2\xA4 |0
-<U6EEF> \xBA\xA2 |0
-<U6EF1> \xE2\x6E |0
-<U6EF2> \xBA\xAF |0
-<U6EF4> \xBA\x77 |0
-<U6EF5> \xE2\x6D |0
-<U6EF6> \xE2\xB0 |0
-<U6EF7> \xBA\xB1 |0
-<U6EF8> \xE2\x71 |0
-<U6EF9> \xE2\xA3 |0
-<U6EFA> \xFD\xC7 |0
-<U6EFB> \xE2\x73 |0
-<U6EFC> \xE2\xB3 |0
-<U6EFD> \xE2\xAF |0
-<U6EFE> \xBA\x75 |0
-<U6EFF> \xBA\xA1 |0
-<U6F00> \xE6\x53 |0
-<U6F01> \xBA\xAE |0
-<U6F02> \xBA\x7D |0
-<U6F03> \xE2\x6F |0
-<U6F04> \xFD\xB0 |0
-<U6F05> \xE2\xAE |0
-<U6F06> \xBA\xA3 |0
-<U6F07> \xE2\xAB |0
-<U6F08> \xE2\xB8 |0
-<U6F09> \xE2\x75 |0
-<U6F0A> \xE2\x7E |0
-<U6F0B> \x94\x45 |0
-<U6F0C> \x97\xD6 |0
-<U6F0D> \xE2\xB6 |0
-<U6F0E> \xE2\xAC |0
-<U6F0F> \xBA\x7C |0
-<U6F12> \xE2\x7C |0
-<U6F13> \xBA\x76 |0
-<U6F14> \xBA\x74 |0
-<U6F15> \xBA\xA8 |0
-<U6F16> \xFC\xC6 |0
-<U6F17> \x98\x44 |0
-<U6F18> \xE2\x7A |0
-<U6F19> \xE2\x77 |0
-<U6F1A> \xE2\x78 |0
-<U6F1C> \xE2\xB2 |0
-<U6F1E> \xE2\xB7 |0
-<U6F1F> \xE2\xB5 |0
-<U6F20> \xBA\x7A |0
-<U6F21> \xE2\xB9 |0
-<U6F22> \xBA\x7E |0
-<U6F23> \xBA\xA7 |0
-<U6F24> \x8D\xE9 |0
-<U6F25> \xE2\x70 |0
-<U6F26> \xE5\xFA |0
-<U6F27> \xE2\x79 |0
-<U6F29> \xBA\x78 |0
-<U6F2A> \xBA\xAC |0
-<U6F2B> \xBA\xA9 |0
-<U6F2C> \xBA\x7B |0
-<U6F2D> \xE2\xA5 |0
-<U6F2E> \xE2\x74 |0
-<U6F2F> \xBA\xAA |0
-<U6F30> \xE2\xA7 |0
-<U6F31> \xBA\xA4 |0
-<U6F32> \xBA\xA6 |0
-<U6F33> \xBA\x73 |0
-<U6F34> \x8D\xEA |0
-<U6F35> \xE2\xA9 |0
-<U6F36> \xE2\xA1 |0
-<U6F37> \xE2\x72 |0
-<U6F38> \xBA\xA5 |0
-<U6F39> \xE2\xB1 |0
-<U6F3A> \xE2\xB4 |0
-<U6F3B> \xE2\x7B |0
-<U6F3C> \xE2\xA8 |0
-<U6F3D> \xFE\x50 |0
-<U6F3E> \xBA\x79 |0
-<U6F3F> \xBC\xDF |0
-<U6F40> \xE2\xA6 |0
-<U6F41> \xE5\xF9 |0
-<U6F43> \xE2\xAD |0
-<U6F44> \xFD\xCC |0
-<U6F4E> \xE2\x76 |0
-<U6F4F> \xE6\x44 |0
-<U6F50> \xE6\x4E |0
-<U6F51> \xBC\xE2 |0
-<U6F52> \xE6\x4D |0
-<U6F53> \xE6\x59 |0
-<U6F54> \xBC\xE4 |0
-<U6F55> \xE6\x4B |0
-<U6F56> \x9D\xA7 |0
-<U6F57> \xE6\x4F |0
-<U6F58> \xBC\xEF |0
-<U6F5A> \xE6\x46 |0
-<U6F5B> \xBC\xE7 |0
-<U6F5C> \xFD\xCD |0
-<U6F5D> \xE6\x52 |0
-<U6F5E> \xE9\xF0 |0
-<U6F5F> \xBC\xF3 |0
-<U6F60> \xBC\xF2 |0
-<U6F61> \xE6\x54 |0
-<U6F62> \xE6\x43 |0
-<U6F63> \xE6\x5E |0
-<U6F64> \xBC\xED |0
-<U6F66> \xBC\xE3 |0
-<U6F67> \xE6\x57 |0
-<U6F69> \xE6\x5B |0
-<U6F6A> \xE6\x60 |0
-<U6F6B> \xE6\x55 |0
-<U6F6C> \xE6\x49 |0
-<U6F6D> \xBC\xE6 |0
-<U6F6E> \xBC\xE9 |0
-<U6F6F> \xBC\xF1 |0
-<U6F70> \xBC\xEC |0
-<U6F72> \xE6\x4C |0
-<U6F73> \xE2\xA2 |0
-<U6F74> \xFD\xCF |0
-<U6F76> \xE6\x48 |0
-<U6F77> \xE6\x5F |0
-<U6F78> \xBC\xE8 |0
-<U6F79> \x95\xD2 |0
-<U6F7A> \xBC\xEB |0
-<U6F7B> \xE6\x61 |0
-<U6F7C> \xBC\xE0 |0
-<U6F7D> \xE6\x56 |0
-<U6F7E> \xE5\xFB |0
-<U6F7F> \xE6\x5C |0
-<U6F80> \xC0\xDF |0
-<U6F81> \x8D\xED |0
-<U6F82> \xE6\x4A |0
-<U6F84> \xBC\xE1 |0
-<U6F85> \xE6\x45 |0
-<U6F86> \xBC\xE5 |0
-<U6F87> \xE5\xFC |0
-<U6F88> \xBA\xAB |0
-<U6F89> \xE6\x41 |0
-<U6F8A> \xFC\xBA |0
-<U6F8B> \xE6\x5A |0
-<U6F8C> \xE6\x42 |0
-<U6F8D> \xE6\x40 |0
-<U6F8E> \xBC\xEA |0
-<U6F90> \xE6\x58 |0
-<U6F92> \xE5\xFE |0
-<U6F93> \xE6\x51 |0
-<U6F94> \xE6\x50 |0
-<U6F95> \xE6\x5D |0
-<U6F96> \xE6\x47 |0
-<U6F97> \xBC\xEE |0
-<U6F9D> \xFD\xC5 |0
-<U6F9E> \xE9\xF3 |0
-<U6F9F> \xFD\xD2 |0
-<U6FA0> \xBF\x49 |0
-<U6FA1> \xBE\xFE |0
-<U6FA2> \xEA\x40 |0
-<U6FA3> \xE9\xEB |0
-<U6FA4> \xBF\x41 |0
-<U6FA5> \xE9\xF7 |0
-<U6FA6> \xBF\x48 |0
-<U6FA7> \xBF\x43 |0
-<U6FA8> \xE9\xF5 |0
-<U6FA9> \xED\x4F |0
-<U6FAA> \xE9\xFB |0
-<U6FAB> \xEA\x42 |0
-<U6FAC> \xE9\xFA |0
-<U6FAD> \xE9\xE9 |0
-<U6FAE> \xE9\xF8 |0
-<U6FAF> \xEA\x44 |0
-<U6FB0> \xEA\x46 |0
-<U6FB1> \xBE\xFD |0
-<U6FB2> \xEA\x45 |0
-<U6FB3> \xBF\x44 |0
-<U6FB4> \xBF\x4A |0
-<U6FB5> \x9C\xDC |0
-<U6FB6> \xBF\x47 |0
-<U6FB8> \xE9\xFE |0
-<U6FB9> \xBF\x46 |0
-<U6FBA> \xE9\xF9 |0
-<U6FBB> \x95\xCF |0
-<U6FBC> \xE9\xED |0
-<U6FBD> \xE9\xF2 |0
-<U6FBE> \x8D\xEE |0
-<U6FBF> \xE9\xFD |0
-<U6FC0> \xBF\x45 |0
-<U6FC1> \xBF\x42 |0
-<U6FC2> \xBE\xFC |0
-<U6FC3> \xBF\x40 |0
-<U6FC4> \xE9\xF1 |0
-<U6FC6> \xE5\xFD |0
-<U6FC7> \xE9\xEC |0
-<U6FC8> \xE9\xEF |0
-<U6FC9> \xEA\x41 |0
-<U6FCA> \xE9\xF4 |0
-<U6FCB> \xE9\xEA |0
-<U6FCC> \xED\x4E |0
-<U6FCD> \xEA\x43 |0
-<U6FCE> \xE9\xEE |0
-<U6FCF> \xE9\xFC |0
-<U6FD3> \xFD\xD4 |0
-<U6FD4> \xED\x51 |0
-<U6FD5> \xC0\xE3 |0
-<U6FD8> \xC0\xD7 |0
-<U6FD9> \x96\xEC |0
-<U6FDA> \x96\xEB |0
-<U6FDB> \xC0\xDB |0
-<U6FDC> \xED\x53 |0
-<U6FDD> \xED\x59 |0
-<U6FDE> \xED\x57 |0
-<U6FDF> \xC0\xD9 |0
-<U6FE0> \xC0\xDA |0
-<U6FE1> \xC0\xE1 |0
-<U6FE2> \xED\x5A |0
-<U6FE3> \xED\x52 |0
-<U6FE4> \xC0\xDC |0
-<U6FE6> \xED\x56 |0
-<U6FE7> \xED\x55 |0
-<U6FE8> \xED\x5B |0
-<U6FE9> \xC0\xE2 |0
-<U6FEB> \xC0\xDD |0
-<U6FEC> \xC0\xE0 |0
-<U6FED> \xED\x54 |0
-<U6FEE> \xC0\xE4 |0
-<U6FEF> \xC0\xDE |0
-<U6FF0> \xC0\xE5 |0
-<U6FF1> \xC0\xD8 |0
-<U6FF2> \xED\x58 |0
-<U6FF4> \xED\x50 |0
-<U6FF6> \x90\xB6 |0
-<U6FF7> \xEF\xF7 |0
-<U6FF8> \xFD\xC3 |0
-<U6FFA> \xC2\x71 |0
-<U6FFB> \xEF\xF4 |0
-<U6FFC> \xEF\xF6 |0
-<U6FFE> \xC2\x6F |0
-<U6FFF> \xEF\xF2 |0
-<U7000> \xEF\xF3 |0
-<U7001> \xEF\xEE |0
-<U7003> \x98\xAB |0
-<U7004> \xE9\xF6 |0
-<U7005> \xEF\xEF |0
-<U7006> \xC2\x70 |0
-<U7007> \xEF\xEB |0
-<U7009> \xC2\x6D |0
-<U700A> \xEF\xF8 |0
-<U700B> \xC2\x6E |0
-<U700C> \xEF\xEC |0
-<U700D> \xEF\xED |0
-<U700E> \xEF\xF1 |0
-<U700F> \xC2\x73 |0
-<U7011> \xC2\x72 |0
-<U7014> \xEF\xF0 |0
-<U7015> \xC3\x78 |0
-<U7016> \xF2\x5F |0
-<U7017> \xF2\x65 |0
-<U7018> \xC3\x79 |0
-<U7019> \xF2\x5C |0
-<U701A> \xC3\x76 |0
-<U701B> \xC3\x73 |0
-<U701C> \xF2\x67 |0
-<U701D> \xC3\x77 |0
-<U701E> \x96\xEE |0
-<U701F> \xC3\x74 |0
-<U7020> \xF2\x5E |0
-<U7021> \xF2\x61 |0
-<U7022> \xF2\x62 |0
-<U7023> \xF2\x63 |0
-<U7024> \xF2\x66 |0
-<U7026> \xEF\xF5 |0
-<U7027> \xF2\x5D |0
-<U7028> \xC3\x75 |0
-<U7029> \xF2\x64 |0
-<U702A> \xF2\x68 |0
-<U702B> \xF2\x60 |0
-<U702C> \x8D\xF4 |0
-<U702F> \xF4\x5D |0
-<U7030> \xC4\x6A |0
-<U7031> \xF4\x60 |0
-<U7032> \xC4\x6B |0
-<U7033> \xF4\x68 |0
-<U7034> \xF4\x5F |0
-<U7035> \xF4\x5C |0
-<U7037> \xF4\x5E |0
-<U7038> \xF4\x62 |0
-<U7039> \xF4\x65 |0
-<U703A> \xF4\x64 |0
-<U703B> \xF4\x67 |0
-<U703C> \xF4\x5B |0
-<U703E> \xC4\x69 |0
-<U703F> \xF4\x63 |0
-<U7040> \xF4\x66 |0
-<U7041> \xF4\x69 |0
-<U7042> \xF4\x61 |0
-<U7043> \xF5\xD3 |0
-<U7044> \xF5\xD4 |0
-<U7045> \xF5\xD8 |0
-<U7046> \xF5\xD9 |0
-<U7048> \xF5\xD6 |0
-<U7049> \xF5\xD7 |0
-<U704A> \xF5\xD5 |0
-<U704B> \xFD\xE0 |0
-<U704C> \xC4\xE9 |0
-<U7050> \x8D\xF6 |0
-<U7051> \xC5\x78 |0
-<U7052> \xF6\xEB |0
-<U7054> \x8D\xF7 |0
-<U7055> \xF6\xE8 |0
-<U7056> \xF6\xE9 |0
-<U7057> \xF6\xEA |0
-<U7058> \xC5\x79 |0
-<U705A> \xF7\xE5 |0
-<U705B> \xF7\xE4 |0
-<U705C> \x8F\xFA |0
-<U705D> \xF8\xAF |0
-<U705E> \xC5\xF4 |0
-<U705F> \xF8\xAD |0
-<U7060> \xF8\xB0 |0
-<U7061> \xF8\xAE |0
-<U7062> \xF8\xF5 |0
-<U7063> \xC6\x57 |0
-<U7064> \xC6\x65 |0
-<U7065> \xF9\xA3 |0
-<U7066> \xF9\x6C |0
-<U7067> \x97\xD0 |0
-<U7068> \xF9\xA2 |0
-<U7069> \xF9\xD0 |0
-<U706A> \xF9\xD1 |0
-<U706B> \xA4\xF5 |0
-<U706C> \x8B\xD2 |0
-<U706F> \x8D\xF8 |0
-<U7070> \xA6\xC7 |0
-<U7071> \xCA\x41 |0
-<U7074> \xCB\x5E |0
-<U7075> \x90\xD9 |0
-<U7076> \xA8\x5F |0
-<U7078> \xA8\x62 |0
-<U7079> \xFA\xF0 |0
-<U707A> \xCB\x5F |0
-<U707C> \xA8\x60 |0
-<U707D> \xA8\x61 |0
-<U707E> \xFD\xE1 |0
-<U707F> \x8D\xF9 |0
-<U7081> \xFD\xE3 |0
-<U7082> \xCD\x58 |0
-<U7083> \xCD\x5A |0
-<U7084> \xCD\x55 |0
-<U7085> \xCD\x52 |0
-<U7086> \xCD\x54 |0
-<U7089> \x8D\xFA |0
-<U708A> \xAA\xA4 |0
-<U708B> \xFB\x63 |0
-<U708E> \xAA\xA2 |0
-<U708F> \x90\xA6 |0
-<U7091> \xCD\x56 |0
-<U7092> \xAA\xA3 |0
-<U7093> \xCD\x53 |0
-<U7094> \xCD\x50 |0
-<U7095> \xAA\xA1 |0
-<U7096> \xCD\x57 |0
-<U7098> \xCD\x51 |0
-<U7099> \xAA\xA5 |0
-<U709A> \xCD\x59 |0
-<U709F> \xCF\xAF |0
-<U70A0> \x99\x70 |0
-<U70A1> \xCF\xB3 |0
-<U70A3> \x91\xEB |0
-<U70A4> \xAC\xB7 |0
-<U70A5> \x97\x70 |0
-<U70A6> \x98\x6F |0
-<U70A7> \xFD\xE2 |0
-<U70A9> \xCF\xB6 |0
-<U70AB> \xAC\xAF |0
-<U70AC> \xAC\xB2 |0
-<U70AD> \xAC\xB4 |0
-<U70AE> \xAC\xB6 |0
-<U70AF> \xAC\xB3 |0
-<U70B0> \xCF\xB2 |0
-<U70B1> \xCF\xB1 |0
-<U70B3> \xAC\xB1 |0
-<U70B4> \xCF\xB4 |0
-<U70B5> \xCF\xB5 |0
-<U70B7> \xCF\xAE |0
-<U70B8> \xAC\xB5 |0
-<U70B9> \x98\xF2 |0
-<U70BA> \xAC\xB0 |0
-<U70BB> \x9A\xFC |0
-<U70BC> \x89\x6C |0
-<U70BD> \xFD\xFD |0
-<U70BE> \xCF\xB0 |0
-<U70C0> \x99\x5E |0
-<U70C4> \x95\xBD |0
-<U70C5> \xD2\x77 |0
-<U70C6> \xD2\x78 |0
-<U70C7> \xD2\x79 |0
-<U70C8> \xAF\x50 |0
-<U70CA> \xAF\x4C |0
-<U70CB> \xD2\x6E |0
-<U70CC> \xFD\xE4 |0
-<U70CD> \xD2\x76 |0
-<U70CE> \xD2\x7B |0
-<U70CF> \xAF\x51 |0
-<U70D0> \x91\xE6 |0
-<U70D1> \xD2\x6C |0
-<U70D2> \xD2\x72 |0
-<U70D3> \xD2\x6B |0
-<U70D4> \xD2\x75 |0
-<U70D5> \xFD\xE5 |0
-<U70D6> \xFD\xE6 |0
-<U70D7> \xD2\x71 |0
-<U70D8> \xAF\x4D |0
-<U70D9> \xAF\x4F |0
-<U70DA> \xD2\x7A |0
-<U70DC> \xD2\x6A |0
-<U70DD> \xD2\x6D |0
-<U70DE> \xD2\x73 |0
-<U70DF> \xFD\xE7 |0
-<U70E0> \xD2\x74 |0
-<U70E1> \xD2\x7C |0
-<U70E2> \xD2\x70 |0
-<U70E4> \xAF\x4E |0
-<U70EF> \xB2\x6D |0
-<U70F0> \xD6\x4E |0
-<U70F1> \x94\x54 |0
-<U70F3> \xD6\x50 |0
-<U70F4> \xD6\x4C |0
-<U70F5> \x99\xB8 |0
-<U70F6> \xD6\x58 |0
-<U70F7> \xD6\x4A |0
-<U70F8> \xD6\x57 |0
-<U70F9> \xB2\x69 |0
-<U70FA> \xD6\x48 |0
-<U70FB> \xDA\x5B |0
-<U70FC> \xD6\x52 |0
-<U70FD> \xB2\x6C |0
-<U70FE> \x97\xE9 |0
-<U70FF> \xD6\x53 |0
-<U7100> \xD6\x56 |0
-<U7102> \xD6\x5A |0
-<U7104> \xD6\x4F |0
-<U7105> \x93\x46 |0
-<U7106> \xD6\x54 |0
-<U7109> \xB2\x6A |0
-<U710A> \xB2\x6B |0
-<U710B> \xD6\x59 |0
-<U710C> \xD6\x4D |0
-<U710D> \xD6\x49 |0
-<U710E> \xD6\x5B |0
-<U7110> \xD6\x51 |0
-<U7113> \xD6\x55 |0
-<U7117> \xD6\x4B |0
-<U7119> \xB5\x48 |0
-<U711A> \xB5\x49 |0
-<U711B> \xDA\x65 |0
-<U711C> \xB5\x4F |0
-<U711D> \x98\x63 |0
-<U711E> \xDA\x59 |0
-<U711F> \xDA\x62 |0
-<U7120> \xDA\x58 |0
-<U7121> \xB5\x4C |0
-<U7122> \xDA\x60 |0
-<U7123> \xDA\x5E |0
-<U7125> \xDA\x5F |0
-<U7126> \xB5\x4A |0
-<U7128> \xDA\x63 |0
-<U7129> \x95\xBC |0
-<U712B> \xFD\xED |0
-<U712C> \xFD\xF7 |0
-<U712E> \xDA\x5C |0
-<U712F> \xDA\x5A |0
-<U7130> \xB5\x4B |0
-<U7131> \xDA\x5D |0
-<U7132> \xDA\x61 |0
-<U7133> \x98\x70 |0
-<U7134> \x96\xF6 |0
-<U7135> \x8E\xA9 |0
-<U7136> \xB5\x4D |0
-<U713A> \xDA\x64 |0
-<U713B> \x94\x51 |0
-<U713E> \x8E\x43 |0
-<U7140> \x8B\x5A |0
-<U7141> \xDE\x70 |0
-<U7142> \xDE\x77 |0
-<U7143> \xDE\x79 |0
-<U7144> \xDE\xA1 |0
-<U7145> \xFD\xEE |0
-<U7146> \xB7\xDA |0
-<U7147> \xDE\x6B |0
-<U7149> \xB7\xD2 |0
-<U714A> \xFD\xF0 |0
-<U714B> \xDE\x7A |0
-<U714C> \xB7\xD7 |0
-<U714D> \xDE\xA2 |0
-<U714E> \xB7\xCE |0
-<U714F> \xFD\xF4 |0
-<U7150> \xDE\x7D |0
-<U7151> \x9B\xF5 |0
-<U7152> \xDE\x6D |0
-<U7153> \xDE\x7E |0
-<U7154> \xDE\x6C |0
-<U7156> \xB7\xDC |0
-<U7158> \xDE\x78 |0
-<U7159> \xB7\xCF |0
-<U715A> \xDE\xA3 |0
-<U715C> \xB7\xD4 |0
-<U715D> \xDE\x71 |0
-<U715E> \xB7\xD9 |0
-<U715F> \xDE\x7C |0
-<U7160> \xDE\x6F |0
-<U7161> \xDE\x76 |0
-<U7162> \xDE\x72 |0
-<U7163> \xDE\x6E |0
-<U7164> \xB7\xD1 |0
-<U7165> \xB7\xD8 |0
-<U7166> \xB7\xD6 |0
-<U7167> \xB7\xD3 |0
-<U7168> \xB7\xDB |0
-<U7169> \xB7\xD0 |0
-<U716A> \xDE\x75 |0
-<U716B> \x97\x7E |0
-<U716C> \xB7\xD5 |0
-<U716E> \xB5\x4E |0
-<U7170> \xDE\x7B |0
-<U7171> \x9B\xD5 |0
-<U7172> \xDE\x73 |0
-<U7173> \x9A\xC3 |0
-<U7175> \x97\xC8 |0
-<U7176> \xA0\xDB |0
-<U7177> \x91\xD0 |0
-<U7178> \xDE\x74 |0
-<U717A> \x9F\xE4 |0
-<U717B> \xE2\xC1 |0
-<U717C> \x8F\xDD |0
-<U717D> \xBA\xB4 |0
-<U717E> \x91\xE9 |0
-<U7180> \xE2\xBD |0
-<U7181> \xE2\xC3 |0
-<U7182> \xE2\xBF |0
-<U7184> \xBA\xB6 |0
-<U7185> \xE2\xBE |0
-<U7186> \xE2\xC2 |0
-<U7187> \xE2\xBA |0
-<U7188> \x98\xE0 |0
-<U7189> \xE2\xBC |0
-<U718A> \xBA\xB5 |0
-<U718C> \x92\xCA |0
-<U718E> \x98\x57 |0
-<U718F> \xE2\xC0 |0
-<U7190> \xE2\xBB |0
-<U7192> \xBA\xB7 |0
-<U7194> \xBA\xB2 |0
-<U7196> \xFD\xEB |0
-<U7197> \xE2\xC4 |0
-<U7198> \x9B\x49 |0
-<U7199> \xBA\xB3 |0
-<U719A> \xE6\x67 |0
-<U719B> \xE6\x64 |0
-<U719C> \xE6\x70 |0
-<U719D> \xE6\x6A |0
-<U719E> \xE6\x6C |0
-<U719F> \xBC\xF4 |0
-<U71A0> \xE6\x66 |0
-<U71A1> \xE6\x6E |0
-<U71A2> \x9D\x76 |0
-<U71A3> \x9E\xAF |0
-<U71A4> \xE6\x6D |0
-<U71A5> \xE6\x6B |0
-<U71A7> \xE6\x71 |0
-<U71A8> \xBC\xF7 |0
-<U71A9> \xE6\x68 |0
-<U71AA> \xE6\x6F |0
-<U71AC> \xBC\xF5 |0
-<U71AD> \x9C\xCC |0
-<U71AF> \xE6\x63 |0
-<U71B0> \xE6\x65 |0
-<U71B1> \xBC\xF6 |0
-<U71B2> \xE6\x62 |0
-<U71B3> \xE6\x72 |0
-<U71B4> \xFD\xEA |0
-<U71B5> \xE6\x69 |0
-<U71B7> \x8D\xF1 |0
-<U71B8> \xEA\x4A |0
-<U71B9> \xBF\x51 |0
-<U71BA> \xFD\xFB |0
-<U71BC> \xEA\x55 |0
-<U71BD> \xEA\x53 |0
-<U71BE> \xBF\x4B |0
-<U71BF> \xEA\x49 |0
-<U71C0> \xEA\x4C |0
-<U71C1> \xEA\x4D |0
-<U71C2> \xEA\x48 |0
-<U71C3> \xBF\x55 |0
-<U71C4> \xBF\x56 |0
-<U71C5> \xEA\x47 |0
-<U71C6> \xEA\x56 |0
-<U71C7> \xEA\x51 |0
-<U71C8> \xBF\x4F |0
-<U71C9> \xBF\x4C |0
-<U71CA> \xEA\x50 |0
-<U71CB> \xEA\x4E |0
-<U71CE> \xBF\x52 |0
-<U71CF> \xEA\x52 |0
-<U71D0> \xBF\x4D |0
-<U71D1> \x8E\x53 |0
-<U71D2> \xBF\x4E |0
-<U71D4> \xEA\x4F |0
-<U71D5> \xBF\x50 |0
-<U71D6> \xEA\x4B |0
-<U71D8> \xEA\x54 |0
-<U71D9> \xBF\x53 |0
-<U71DA> \xEA\x57 |0
-<U71DB> \xEA\x58 |0
-<U71DC> \xBF\x54 |0
-<U71DD> \xFA\xCF |0
-<U71DF> \xC0\xE7 |0
-<U71E0> \xC0\xEE |0
-<U71E1> \xED\x5C |0
-<U71E2> \xED\x62 |0
-<U71E4> \xED\x60 |0
-<U71E5> \xC0\xEA |0
-<U71E6> \xC0\xE9 |0
-<U71E7> \xC0\xE6 |0
-<U71E8> \xED\x5E |0
-<U71EB> \x96\xF9 |0
-<U71EC> \xC0\xEC |0
-<U71ED> \xC0\xEB |0
-<U71EE> \xC0\xE8 |0
-<U71F0> \xED\x61 |0
-<U71F1> \xED\x5D |0
-<U71F2> \xED\x5F |0
-<U71F4> \xC0\xED |0
-<U71F5> \x98\xBF |0
-<U71F6> \x9E\x49 |0
-<U71F8> \xC2\x77 |0
-<U71F9> \xEF\xFB |0
-<U71FB> \xC2\x74 |0
-<U71FC> \xC2\x75 |0
-<U71FD> \xEF\xFD |0
-<U71FE> \xC2\x76 |0
-<U71FF> \xEF\xFA |0
-<U7201> \xEF\xF9 |0
-<U7202> \xF2\x6C |0
-<U7203> \xEF\xFC |0
-<U7205> \xF2\x6D |0
-<U7206> \xC3\x7A |0
-<U7207> \xF2\x6B |0
-<U7209> \x9B\xCA |0
-<U720A> \xF2\x6A |0
-<U720C> \xF2\x69 |0
-<U720D> \xC3\x7B |0
-<U720E> \xFD\xFE |0
-<U720F> \x92\xDC |0
-<U7210> \xC4\x6C |0
-<U7213> \xF4\x6A |0
-<U7214> \xF4\x6B |0
-<U7215> \xFE\x41 |0
-<U7216> \x91\xCC |0
-<U7217> \x91\xE2 |0
-<U7219> \xF5\xDC |0
-<U721A> \xF5\xDB |0
-<U721B> \xC4\xEA |0
-<U721D> \xF5\xDA |0
-<U721E> \xF6\xEC |0
-<U721F> \xF6\xED |0
-<U7222> \xF7\xE6 |0
-<U7223> \xF8\xB1 |0
-<U7224> \xFE\x44 |0
-<U7226> \xF8\xF6 |0
-<U7227> \xF9\xBC |0
-<U7228> \xC6\x79 |0
-<U7229> \xF9\xC6 |0
-<U722A> \xA4\xF6 |0
-<U722B> \x8B\xD3 |0
-<U722C> \xAA\xA6 |0
-<U722D> \xAA\xA7 |0
-<U722E> \xFE\x47 |0
-<U7230> \xAC\xB8 |0
-<U7235> \xC0\xEF |0
-<U7236> \xA4\xF7 |0
-<U7238> \xAA\xA8 |0
-<U7239> \xAF\x52 |0
-<U723A> \xB7\xDD |0
-<U723B> \xA4\xF8 |0
-<U723D> \xB2\x6E |0
-<U723E> \xBA\xB8 |0
-<U723F> \xC9\x62 |0
-<U7240> \xFE\x48 |0
-<U7241> \xCF\xB7 |0
-<U7242> \xD2\x7D |0
-<U7244> \xE2\xC5 |0
-<U7246> \xC0\xF0 |0
-<U7247> \xA4\xF9 |0
-<U7248> \xAA\xA9 |0
-<U7249> \xCF\xB8 |0
-<U724A> \xCF\xB9 |0
-<U724B> \xDA\x66 |0
-<U724C> \xB5\x50 |0
-<U724F> \xDE\xA4 |0
-<U7250> \x94\x55 |0
-<U7252> \xB7\xDE |0
-<U7253> \xE2\xC6 |0
-<U7255> \xFE\x4B |0
-<U7256> \xBC\xF8 |0
-<U7257> \xFE\x4C |0
-<U7258> \xC3\x7C |0
-<U7259> \xA4\xFA |0
-<U725A> \xDA\x67 |0
-<U725B> \xA4\xFB |0
-<U725C> \x8D\xBF |0
-<U725D> \xA6\xC9 |0
-<U725E> \xCA\x42 |0
-<U725F> \xA6\xC8 |0
-<U7260> \xA8\x65 |0
-<U7261> \xA8\x64 |0
-<U7262> \xA8\x63 |0
-<U7263> \xCB\x60 |0
-<U7266> \x9E\x78 |0
-<U7267> \xAA\xAA |0
-<U7269> \xAA\xAB |0
-<U726A> \xCD\x5B |0
-<U726C> \xCF\xBA |0
-<U726E> \xCF\xBD |0
-<U726F> \xAC\xBA |0
-<U7270> \xCF\xBB |0
-<U7272> \xAC\xB9 |0
-<U7273> \xCF\xBC |0
-<U7274> \xAC\xBB |0
-<U7276> \xD2\xA2 |0
-<U7277> \xD2\xA1 |0
-<U7278> \xD2\x7E |0
-<U7279> \xAF\x53 |0
-<U727B> \xD6\x5D |0
-<U727C> \xD6\x5E |0
-<U727D> \xB2\x6F |0
-<U727E> \xD6\x5C |0
-<U727F> \xD6\x5F |0
-<U7280> \xB5\x52 |0
-<U7281> \xB2\x70 |0
-<U7282> \xFE\x51 |0
-<U7284> \xB5\x51 |0
-<U7285> \xDA\x6B |0
-<U7286> \xDA\x6A |0
-<U7287> \x94\x56 |0
-<U7288> \xDA\x68 |0
-<U7289> \xDA\x69 |0
-<U728B> \xDA\x6C |0
-<U728C> \xDE\xA6 |0
-<U728D> \xDE\xA5 |0
-<U728E> \xDE\xA9 |0
-<U728F> \x9D\x61 |0
-<U7290> \xDE\xA8 |0
-<U7291> \xDE\xA7 |0
-<U7292> \xBA\xB9 |0
-<U7293> \xE2\xC9 |0
-<U7294> \x94\x57 |0
-<U7295> \xE2\xC8 |0
-<U7296> \xBA\xBA |0
-<U7297> \xE2\xC7 |0
-<U7298> \xE6\x73 |0
-<U729A> \xE6\x74 |0
-<U729B> \xBC\xF9 |0
-<U729D> \xEA\x59 |0
-<U729E> \xEA\x5A |0
-<U729F> \x99\x66 |0
-<U72A1> \xF2\x72 |0
-<U72A2> \xC3\x7D |0
-<U72A3> \xF2\x71 |0
-<U72A4> \xF2\x70 |0
-<U72A5> \xF2\x6E |0
-<U72A6> \xF2\x6F |0
-<U72A7> \xC4\xEB |0
-<U72A8> \xF4\x6C |0
-<U72A9> \xF6\xEE |0
-<U72AA> \xF8\xF7 |0
-<U72AC> \xA4\xFC |0
-<U72AD> \x8B\xD5 |0
-<U72AE> \xC9\xA5 |0
-<U72AF> \xA5\xC7 |0
-<U72B0> \xC9\xA6 |0
-<U72B2> \xA0\x69 |0
-<U72B4> \xCA\x43 |0
-<U72B5> \xCA\x44 |0
-<U72BA> \xCB\x66 |0
-<U72BD> \xCB\x62 |0
-<U72BF> \xCB\x61 |0
-<U72C0> \xAA\xAC |0
-<U72C1> \xCB\x65 |0
-<U72C2> \xA8\x67 |0
-<U72C3> \xCB\x63 |0
-<U72C4> \xA8\x66 |0
-<U72C5> \xCB\x67 |0
-<U72C6> \xCB\x64 |0
-<U72C9> \xCD\x5F |0
-<U72CA> \xCF\xBE |0
-<U72CB> \xCD\x5D |0
-<U72CC> \xCD\x64 |0
-<U72CD> \x98\xB4 |0
-<U72CE> \xAA\xAD |0
-<U72D0> \xAA\xB0 |0
-<U72D1> \xCD\x65 |0
-<U72D2> \xCD\x61 |0
-<U72D4> \xCD\x62 |0
-<U72D6> \xCD\x5C |0
-<U72D7> \xAA\xAF |0
-<U72D8> \xCD\x5E |0
-<U72D9> \xAA\xAE |0
-<U72DA> \xCD\x63 |0
-<U72DC> \xCD\x60 |0
-<U72DF> \xCF\xC2 |0
-<U72E0> \xAC\xBD |0
-<U72E1> \xAC\xBE |0
-<U72E2> \xA0\x49 |0
-<U72E3> \xCF\xC5 |0
-<U72E4> \xCF\xBF |0
-<U72E6> \xCF\xC4 |0
-<U72E8> \xCF\xC0 |0
-<U72E9> \xAC\xBC |0
-<U72EA> \xCF\xC3 |0
-<U72EB> \xCF\xC1 |0
-<U72F3> \xD2\xA8 |0
-<U72F4> \xD2\xA5 |0
-<U72F6> \xD2\xA7 |0
-<U72F7> \xAF\x58 |0
-<U72F8> \xAF\x57 |0
-<U72F9> \xAF\x55 |0
-<U72FA> \xD2\xA4 |0
-<U72FB> \xD2\xA9 |0
-<U72FC> \xAF\x54 |0
-<U72FD> \xAF\x56 |0
-<U72FE> \xD2\xA6 |0
-<U72FF> \xD6\x67 |0
-<U7300> \xD2\xA3 |0
-<U7301> \xD2\xAA |0
-<U7302> \xA0\x4C |0
-<U7304> \x9E\x65 |0
-<U7307> \xD6\x62 |0
-<U7308> \xD6\x66 |0
-<U730A> \xD6\x65 |0
-<U730B> \xDA\x6E |0
-<U730C> \xDA\x79 |0
-<U730F> \xD6\x68 |0
-<U7310> \x98\xB5 |0
-<U7311> \xD6\x63 |0
-<U7312> \xDA\x6D |0
-<U7313> \xB2\x74 |0
-<U7316> \xB2\x73 |0
-<U7317> \xD6\x61 |0
-<U7318> \xD6\x64 |0
-<U7319> \xB2\x75 |0
-<U731B> \xB2\x72 |0
-<U731C> \xB2\x71 |0
-<U731D> \xD6\x60 |0
-<U731E> \xD6\x69 |0
-<U7322> \xDA\x70 |0
-<U7323> \xDA\x77 |0
-<U7325> \xB5\x54 |0
-<U7326> \xDA\x76 |0
-<U7327> \xDA\x73 |0
-<U7328> \xFE\x58 |0
-<U7329> \xB5\x56 |0
-<U732A> \x99\x75 |0
-<U732B> \xFE\x53 |0
-<U732C> \xA0\x65 |0
-<U732D> \xDA\x75 |0
-<U732E> \xFE\x59 |0
-<U7330> \xDA\x6F |0
-<U7331> \xDA\x71 |0
-<U7332> \xDA\x74 |0
-<U7333> \xDA\x72 |0
-<U7334> \xB5\x55 |0
-<U7335> \xDA\x78 |0
-<U7336> \xB5\x53 |0
-<U7337> \xB7\xDF |0
-<U7338> \x98\xB7 |0
-<U7339> \x98\xB8 |0
-<U733A> \xDE\xAD |0
-<U733B> \xDE\xAC |0
-<U733C> \xDE\xAA |0
-<U733E> \xB7\xE2 |0
-<U733F> \xB7\xE1 |0
-<U7340> \xDE\xAE |0
-<U7341> \x98\xBA |0
-<U7342> \xDE\xAB |0
-<U7343> \xE2\xCA |0
-<U7344> \xBA\xBB |0
-<U7345> \xB7\xE0 |0
-<U7348> \x98\xBB |0
-<U7349> \xDE\xB0 |0
-<U734A> \xDE\xAF |0
-<U734C> \xE2\xCD |0
-<U734D> \xE2\xCB |0
-<U734E> \xBC\xFA |0
-<U734F> \x9F\xBC |0
-<U7350> \xBA\xBC |0
-<U7351> \xE2\xCC |0
-<U7352> \xE6\x76 |0
-<U7357> \xBC\xFB |0
-<U7358> \xE6\x75 |0
-<U7359> \xE6\x7E |0
-<U735A> \xE6\x7D |0
-<U735B> \xE6\x7B |0
-<U735D> \xE6\x7A |0
-<U735E> \xE6\x77 |0
-<U735F> \xE6\x78 |0
-<U7360> \xE6\x79 |0
-<U7361> \xE6\x7C |0
-<U7362> \xE6\xA1 |0
-<U7365> \xEA\x5F |0
-<U7366> \xEA\x5C |0
-<U7367> \xEA\x5D |0
-<U7368> \xBF\x57 |0
-<U7369> \xEA\x5B |0
-<U736A> \xEA\x61 |0
-<U736B> \xEA\x60 |0
-<U736C> \xEA\x5E |0
-<U736E> \xED\x64 |0
-<U736F> \xED\x65 |0
-<U7370> \xC0\xF1 |0
-<U7371> \xA0\x4A |0
-<U7372> \xC0\xF2 |0
-<U7373> \xED\x63 |0
-<U7374> \x9E\xC7 |0
-<U7375> \xC2\x79 |0
-<U7376> \xEF\xFE |0
-<U7377> \xC2\x78 |0
-<U7378> \xC3\x7E |0
-<U737A> \xC3\xA1 |0
-<U737B> \xC4\x6D |0
-<U737C> \xF4\x6E |0
-<U737D> \xF4\x6D |0
-<U737E> \xF5\xDD |0
-<U737F> \xF6\xEF |0
-<U7380> \xC5\x7A |0
-<U7381> \xF7\xE8 |0
-<U7382> \xF7\xE7 |0
-<U7383> \xF7\xE9 |0
-<U7384> \xA5\xC8 |0
-<U7385> \xCF\xC6 |0
-<U7386> \xAF\x59 |0
-<U7387> \xB2\x76 |0
-<U7388> \xD6\x6A |0
-<U7389> \xA5\xC9 |0
-<U738A> \xC9\xA7 |0
-<U738B> \xA4\xFD |0
-<U738E> \xCA\x45 |0
-<U738F> \x98\xAE |0
-<U7392> \xCB\x6C |0
-<U7393> \xCB\x6A |0
-<U7394> \xCB\x6B |0
-<U7395> \xCB\x68 |0
-<U7396> \xA8\x68 |0
-<U7397> \xCB\x69 |0
-<U7398> \x92\xD6 |0
-<U739C> \xFA\xE1 |0
-<U739D> \xCD\x6D |0
-<U739E> \x91\xD4 |0
-<U739F> \xAA\xB3 |0
-<U73A0> \xCD\x6B |0
-<U73A1> \xCD\x67 |0
-<U73A2> \xCD\x6A |0
-<U73A4> \xCD\x66 |0
-<U73A5> \xAA\xB5 |0
-<U73A6> \xCD\x69 |0
-<U73A7> \xFA\xDE |0
-<U73A8> \xAA\xB2 |0
-<U73A9> \xAA\xB1 |0
-<U73AA> \xFE\x5B |0
-<U73AB> \xAA\xB4 |0
-<U73AC> \xCD\x6C |0
-<U73AD> \xCD\x68 |0
-<U73B2> \xAC\xC2 |0
-<U73B3> \xAC\xC5 |0
-<U73B4> \xCF\xCE |0
-<U73B5> \xCF\xCD |0
-<U73B6> \xCF\xCC |0
-<U73B7> \xAC\xBF |0
-<U73B8> \xCF\xD5 |0
-<U73B9> \xCF\xCB |0
-<U73BB> \xAC\xC1 |0
-<U73BC> \xD2\xAF |0
-<U73BE> \xCF\xD2 |0
-<U73BF> \xCF\xD0 |0
-<U73C0> \xAC\xC4 |0
-<U73C2> \xCF\xC8 |0
-<U73C3> \xCF\xD3 |0
-<U73C5> \xCF\xCA |0
-<U73C6> \xCF\xD4 |0
-<U73C7> \xCF\xD1 |0
-<U73C8> \xCF\xC9 |0
-<U73C9> \xFE\x5E |0
-<U73CA> \xAC\xC0 |0
-<U73CB> \xCF\xD6 |0
-<U73CC> \xCF\xC7 |0
-<U73CD> \xAC\xC3 |0
-<U73CE> \xFB\xD7 |0
-<U73CF> \xFE\x5A |0
-<U73D0> \x94\xC5 |0
-<U73D2> \xD2\xB4 |0
-<U73D3> \xD2\xAB |0
-<U73D4> \xD2\xB6 |0
-<U73D5> \xFA\xCA |0
-<U73D6> \xD2\xAE |0
-<U73D7> \xD2\xB9 |0
-<U73D8> \xD2\xBA |0
-<U73D9> \xD2\xAC |0
-<U73DA> \xD2\xB8 |0
-<U73DB> \xD2\xB5 |0
-<U73DC> \xD2\xB3 |0
-<U73DD> \xD2\xB7 |0
-<U73DE> \xAF\x5F |0
-<U73E0> \xAF\x5D |0
-<U73E1> \x98\xC1 |0
-<U73E2> \x97\x5C |0
-<U73E3> \xD2\xB1 |0
-<U73E4> \xFE\x74 |0
-<U73E5> \xD2\xAD |0
-<U73E6> \x97\x73 |0
-<U73E7> \xD2\xB0 |0
-<U73E8> \xD2\xBB |0
-<U73E9> \xD2\xB2 |0
-<U73EA> \xAF\x5E |0
-<U73EB> \xCF\xCF |0
-<U73ED> \xAF\x5A |0
-<U73EE> \xAF\x5C |0
-<U73EF> \xFA\x46 |0
-<U73F3> \x97\x64 |0
-<U73F4> \xD6\x78 |0
-<U73F5> \xD6\x6D |0
-<U73F6> \xD6\x6B |0
-<U73F7> \xFE\x68 |0
-<U73F8> \xD6\x6C |0
-<U73F9> \x96\x4E |0
-<U73FA> \xD6\x73 |0
-<U73FB> \x97\x65 |0
-<U73FC> \xD6\x74 |0
-<U73FD> \xD6\x70 |0
-<U73FE> \xB2\x7B |0
-<U73FF> \xD6\x75 |0
-<U7400> \xD6\x72 |0
-<U7401> \xD6\x6F |0
-<U7403> \xB2\x79 |0
-<U7404> \xD6\x6E |0
-<U7405> \xB2\x77 |0
-<U7406> \xB2\x7A |0
-<U7407> \xD6\x71 |0
-<U7408> \xD6\x79 |0
-<U7409> \xAF\x5B |0
-<U740A> \xB2\x78 |0
-<U740B> \xD6\x77 |0
-<U740C> \xD6\x76 |0
-<U740D> \xB2\x7C |0
-<U7411> \x89\xA1 |0
-<U7412> \x95\xFA |0
-<U7414> \x92\xD4 |0
-<U7415> \xFE\x69 |0
-<U7416> \xDA\x7E |0
-<U7417> \xFB\x45 |0
-<U7419> \x98\xC8 |0
-<U741A> \xDA\xA1 |0
-<U741B> \xB5\x60 |0
-<U741C> \x90\xEF |0
-<U741D> \xDA\xA7 |0
-<U741E> \x98\xC9 |0
-<U741F> \x98\xCA |0
-<U7420> \xDA\xA9 |0
-<U7421> \xDA\xA2 |0
-<U7422> \xB5\x5A |0
-<U7423> \xDA\xA6 |0
-<U7424> \xDA\xA5 |0
-<U7425> \xB5\x5B |0
-<U7426> \xB5\x61 |0
-<U7428> \xB5\x62 |0
-<U7429> \xDA\xA8 |0
-<U742A> \xB5\x58 |0
-<U742B> \xDA\x7D |0
-<U742C> \xDA\x7B |0
-<U742D> \xDA\xA3 |0
-<U742E> \xDA\x7A |0
-<U742F> \xB5\x5F |0
-<U7430> \xDA\x7C |0
-<U7431> \xDA\xA4 |0
-<U7432> \xDA\xAA |0
-<U7433> \xB5\x59 |0
-<U7434> \xB5\x5E |0
-<U7435> \xB5\x5C |0
-<U7436> \xB5\x5D |0
-<U7437> \x94\x6D |0
-<U7438> \x94\xB7 |0
-<U7439> \xFE\x6C |0
-<U743A> \xB5\x57 |0
-<U743C> \x94\x6B |0
-<U743F> \xB7\xE9 |0
-<U7440> \xDE\xB7 |0
-<U7441> \xB7\xE8 |0
-<U7442> \xDE\xBB |0
-<U7443> \x92\xFC |0
-<U7444> \xDE\xB1 |0
-<U7445> \x95\xEB |0
-<U7446> \xDE\xBC |0
-<U7447> \xFE\x73 |0
-<U7448> \x97\x6E |0
-<U7449> \xFE\x5F |0
-<U744A> \xDE\xB2 |0
-<U744B> \xDE\xB3 |0
-<U744D> \xDE\xBD |0
-<U744E> \xDE\xBA |0
-<U744F> \xDE\xB8 |0
-<U7450> \xDE\xB9 |0
-<U7451> \xDE\xB5 |0
-<U7452> \xDE\xB4 |0
-<U7453> \xFD\xBD |0
-<U7454> \xDE\xBE |0
-<U7455> \xB7\xE5 |0
-<U7456> \x92\xD5 |0
-<U7457> \xDE\xB6 |0
-<U7459> \xB7\xEA |0
-<U745A> \xB7\xE4 |0
-<U745B> \xB7\xEB |0
-<U745C> \xB7\xEC |0
-<U745D> \xFE\xB9 |0
-<U745E> \xB7\xE7 |0
-<U745F> \xB7\xE6 |0
-<U7460> \xFE\x71 |0
-<U7462> \xE2\xCE |0
-<U7463> \xBA\xBE |0
-<U7464> \xBA\xBD |0
-<U7465> \xFB\xBB |0
-<U7467> \xE2\xD3 |0
-<U7468> \x94\x7A |0
-<U7469> \xBC\xFC |0
-<U746A> \xBA\xBF |0
-<U746B> \x95\xFB |0
-<U746C> \xFE\x77 |0
-<U746D> \xBA\xC1 |0
-<U746E> \xE2\xD4 |0
-<U746F> \xB7\xE3 |0
-<U7470> \xBA\xC0 |0
-<U7471> \xE2\xD0 |0
-<U7472> \xE2\xD2 |0
-<U7473> \xE2\xCF |0
-<U7474> \xFE\x79 |0
-<U7475> \xE2\xD1 |0
-<U7476> \xFE\x75 |0
-<U7479> \xE6\xAB |0
-<U747A> \x94\x5D |0
-<U747C> \xE6\xAA |0
-<U747D> \xE6\xA7 |0
-<U747E> \xBD\x40 |0
-<U747F> \xEA\x62 |0
-<U7480> \xBD\x41 |0
-<U7481> \xE6\xA6 |0
-<U7482> \xFE\x7C |0
-<U7483> \xBC\xFE |0
-<U7485> \xE6\xA8 |0
-<U7486> \xE6\xA5 |0
-<U7487> \xE6\xA2 |0
-<U7488> \xE6\xA9 |0
-<U7489> \xE6\xA3 |0
-<U748A> \xE6\xA4 |0
-<U748B> \xBC\xFD |0
-<U748C> \x93\x44 |0
-<U748D> \x8E\xA6 |0
-<U7490> \xED\x69 |0
-<U7492> \xEA\x66 |0
-<U7494> \xEA\x65 |0
-<U7495> \xEA\x67 |0
-<U7497> \xED\x66 |0
-<U7498> \xBF\x5A |0
-<U7499> \x92\xD3 |0
-<U749A> \xEA\x63 |0
-<U749B> \x94\xB8 |0
-<U749C> \xBF\x58 |0
-<U749E> \xBF\x5C |0
-<U749F> \xBF\x5B |0
-<U74A0> \xEA\x64 |0
-<U74A1> \xEA\x68 |0
-<U74A3> \xBF\x59 |0
-<U74A4> \xFC\x71 |0
-<U74A5> \xED\x6D |0
-<U74A6> \xC0\xF5 |0
-<U74A7> \xC2\x7A |0
-<U74A8> \xC0\xF6 |0
-<U74A9> \xC0\xF3 |0
-<U74AA> \xED\x6A |0
-<U74AB> \xED\x68 |0
-<U74AD> \xED\x6B |0
-<U74AF> \xED\x6E |0
-<U74B0> \xC0\xF4 |0
-<U74B1> \xED\x6C |0
-<U74B2> \xED\x67 |0
-<U74B4> \x97\x5E |0
-<U74B5> \xF0\x42 |0
-<U74B6> \xF0\x45 |0
-<U74B7> \xF2\x75 |0
-<U74B8> \xF0\x40 |0
-<U74BA> \xF4\x6F |0
-<U74BB> \xF0\x46 |0
-<U74BD> \xC3\xA2 |0
-<U74BE> \xF0\x44 |0
-<U74BF> \xC2\x7B |0
-<U74C0> \xF0\x41 |0
-<U74C1> \xF0\x43 |0
-<U74C2> \xF0\x47 |0
-<U74C3> \xF2\x76 |0
-<U74C5> \xF2\x74 |0
-<U74C8> \xFE\xA7 |0
-<U74CA> \xC3\xA3 |0
-<U74CB> \xF2\x73 |0
-<U74CC> \x94\x6A |0
-<U74CF> \xC4\x6E |0
-<U74D0> \x93\xE3 |0
-<U74D3> \x98\xCF |0
-<U74D4> \xC4\xED |0
-<U74D5> \xF6\xF1 |0
-<U74D6> \xC4\xEC |0
-<U74D7> \xF6\xF3 |0
-<U74D8> \xF6\xF0 |0
-<U74D9> \xF6\xF2 |0
-<U74DA> \xC5\xD0 |0
-<U74DB> \xF8\xB2 |0
-<U74DC> \xA5\xCA |0
-<U74DD> \xCD\x6E |0
-<U74DE> \xD2\xBC |0
-<U74DF> \xD2\xBD |0
-<U74E0> \xB2\x7D |0
-<U74E1> \xDE\xBF |0
-<U74E2> \xBF\x5D |0
-<U74E3> \xC3\xA4 |0
-<U74E4> \xC5\x7B |0
-<U74E5> \xF8\xB3 |0
-<U74E6> \xA5\xCB |0
-<U74E7> \xA0\xD9 |0
-<U74E8> \xCD\x6F |0
-<U74E9> \xA2\x60 |0
-<U74EC> \xCF\xD7 |0
-<U74EE> \xCF\xD8 |0
-<U74F0> \xA0\xBF |0
-<U74F1> \xA0\x4D |0
-<U74F2> \xA0\xB8 |0
-<U74F4> \xD2\xBE |0
-<U74F5> \xD2\xBF |0
-<U74F6> \xB2\x7E |0
-<U74F7> \xB2\xA1 |0
-<U74F8> \xA0\xCE |0
-<U74FB> \xDA\xAB |0
-<U74FD> \xDE\xC2 |0
-<U74FE> \xDE\xC1 |0
-<U74FF> \xDE\xC0 |0
-<U7500> \xE2\xD5 |0
-<U7502> \xE2\xD6 |0
-<U7503> \xE2\xD7 |0
-<U7504> \xBA\xC2 |0
-<U7505> \xA0\xB7 |0
-<U7507> \xE6\xAD |0
-<U7508> \xE6\xAC |0
-<U750B> \xEA\x69 |0
-<U750C> \xBF\x5E |0
-<U750D> \xBF\x5F |0
-<U750E> \xFE\xA9 |0
-<U750F> \xED\x72 |0
-<U7510> \xED\x6F |0
-<U7511> \xED\x70 |0
-<U7512> \xED\x71 |0
-<U7513> \xF0\x49 |0
-<U7514> \xF0\x48 |0
-<U7515> \xC2\x7C |0
-<U7516> \xF2\x77 |0
-<U7517> \xF5\xDE |0
-<U7518> \xA5\xCC |0
-<U7519> \x89\xC3 |0
-<U751A> \xAC\xC6 |0
-<U751C> \xB2\xA2 |0
-<U751D> \xDE\xC3 |0
-<U751E> \xFE\xAB |0
-<U751F> \xA5\xCD |0
-<U7521> \xD2\xC0 |0
-<U7522> \xB2\xA3 |0
-<U7525> \xB5\x63 |0
-<U7526> \xB5\x64 |0
-<U7528> \xA5\xCE |0
-<U7529> \xA5\xCF |0
-<U752A> \xCA\x46 |0
-<U752B> \xA8\x6A |0
-<U752C> \xA8\x69 |0
-<U752D> \xAC\xC7 |0
-<U752E> \xCF\xD9 |0
-<U752F> \xDA\xAC |0
-<U7530> \xA5\xD0 |0
-<U7531> \xA5\xD1 |0
-<U7532> \xA5\xD2 |0
-<U7533> \xA5\xD3 |0
-<U7534> \x9D\xF4 |0
-<U7535> \x89\x6D |0
-<U7537> \xA8\x6B |0
-<U7538> \xA8\x6C |0
-<U7539> \xCB\x6E |0
-<U753A> \xCB\x6D |0
-<U753B> \x9C\x7B |0
-<U753D> \xAA\xB6 |0
-<U753E> \xCD\x72 |0
-<U753F> \xCD\x70 |0
-<U7540> \xCD\x71 |0
-<U7542> \x98\xD2 |0
-<U7546> \x9F\xA9 |0
-<U7547> \xCF\xDA |0
-<U7548> \xCF\xDB |0
-<U754A> \xFE\xB2 |0
-<U754B> \xAC\xCB |0
-<U754C> \xAC\xC9 |0
-<U754D> \xFE\xB1 |0
-<U754E> \xAC\xCA |0
-<U754F> \xAC\xC8 |0
-<U7551> \x97\xD9 |0
-<U7553> \xA0\xC4 |0
-<U7554> \xAF\x60 |0
-<U7555> \x94\x76 |0
-<U7559> \xAF\x64 |0
-<U755A> \xAF\x63 |0
-<U755B> \xD2\xC1 |0
-<U755C> \xAF\x62 |0
-<U755D> \xAF\x61 |0
-<U755F> \xD2\xC2 |0
-<U7560> \x99\x78 |0
-<U7562> \xB2\xA6 |0
-<U7563> \xD6\x7B |0
-<U7564> \xD6\x7A |0
-<U7565> \xB2\xA4 |0
-<U7566> \xB2\xA5 |0
-<U7567> \xFE\xB3 |0
-<U756A> \xB5\x66 |0
-<U756B> \xB5\x65 |0
-<U756C> \xDA\xAE |0
-<U756D> \x98\xD3 |0
-<U756E> \xFE\xB4 |0
-<U756F> \xDA\xAD |0
-<U7570> \xB2\xA7 |0
-<U7572> \x98\xD4 |0
-<U7576> \xB7\xED |0
-<U7577> \xDE\xC5 |0
-<U7578> \xB7\xEE |0
-<U7579> \xDE\xC4 |0
-<U757A> \x9F\xB9 |0
-<U757D> \xE2\xD8 |0
-<U757E> \xE6\xAE |0
-<U757F> \xBD\x42 |0
-<U7580> \xEA\x6A |0
-<U7583> \x94\x71 |0
-<U7584> \xED\x73 |0
-<U7586> \xC3\xA6 |0
-<U7587> \xC3\xA5 |0
-<U758A> \xC5\x7C |0
-<U758B> \xA5\xD4 |0
-<U758C> \xCD\x73 |0
-<U758D> \x98\xD5 |0
-<U758E> \xFE\xB8 |0
-<U758F> \xB2\xA8 |0
-<U7590> \xE2\xD9 |0
-<U7591> \xBA\xC3 |0
-<U7592> \xC6\xD4 |0
-<U7594> \xCB\x6F |0
-<U7595> \xCB\x70 |0
-<U7598> \xCD\x74 |0
-<U7599> \xAA\xB8 |0
-<U759A> \xAA\xB9 |0
-<U759D> \xAA\xB7 |0
-<U759E> \xFE\xBA |0
-<U75A2> \xAC\xCF |0
-<U75A3> \xAC\xD0 |0
-<U75A4> \xAC\xCD |0
-<U75A5> \xAC\xCE |0
-<U75A7> \xCF\xDC |0
-<U75AA> \xCF\xDD |0
-<U75AB> \xAC\xCC |0
-<U75B0> \xD2\xC3 |0
-<U75B1> \x9E\x5C |0
-<U75B2> \xAF\x68 |0
-<U75B3> \xAF\x69 |0
-<U75B4> \xFE\xBB |0
-<U75B5> \xB2\xAB |0
-<U75B6> \xD2\xC9 |0
-<U75B8> \xAF\x6E |0
-<U75B9> \xAF\x6C |0
-<U75BA> \xD2\xCA |0
-<U75BB> \xD2\xC5 |0
-<U75BC> \xAF\x6B |0
-<U75BD> \xAF\x6A |0
-<U75BE> \xAF\x65 |0
-<U75BF> \xD2\xC8 |0
-<U75C0> \xD2\xC7 |0
-<U75C1> \xD2\xC4 |0
-<U75C2> \xAF\x6D |0
-<U75C3> \xA0\x44 |0
-<U75C4> \xD2\xC6 |0
-<U75C5> \xAF\x66 |0
-<U75C7> \xAF\x67 |0
-<U75C8> \x98\xD7 |0
-<U75CA> \xB2\xAC |0
-<U75CB> \xD6\xA1 |0
-<U75CC> \xD6\xA2 |0
-<U75CD> \xB2\xAD |0
-<U75CE> \xD6\x7C |0
-<U75CF> \xD6\x7E |0
-<U75D0> \xD6\xA4 |0
-<U75D1> \xD6\xA3 |0
-<U75D2> \xD6\x7D |0
-<U75D4> \xB2\xA9 |0
-<U75D5> \xB2\xAA |0
-<U75D7> \xDA\xB6 |0
-<U75D8> \xB5\x6B |0
-<U75D9> \xB5\x6A |0
-<U75DA> \xDA\xB0 |0
-<U75DB> \xB5\x68 |0
-<U75DC> \x98\xD8 |0
-<U75DD> \xDA\xB3 |0
-<U75DE> \xB5\x6C |0
-<U75DF> \xDA\xB4 |0
-<U75E0> \xB5\x6D |0
-<U75E1> \xDA\xB1 |0
-<U75E2> \xB5\x67 |0
-<U75E3> \xB5\x69 |0
-<U75E4> \xDA\xB5 |0
-<U75E6> \xDA\xB2 |0
-<U75E7> \xDA\xAF |0
-<U75ED> \xDE\xD2 |0
-<U75EF> \xDE\xC7 |0
-<U75F0> \xB7\xF0 |0
-<U75F1> \xB7\xF3 |0
-<U75F2> \xB7\xF2 |0
-<U75F3> \xB7\xF7 |0
-<U75F4> \xB7\xF6 |0
-<U75F5> \xDE\xD3 |0
-<U75F6> \xDE\xD1 |0
-<U75F7> \xDE\xCA |0
-<U75F8> \xDE\xCE |0
-<U75F9> \xDE\xCD |0
-<U75FA> \xB7\xF4 |0
-<U75FB> \xDE\xD0 |0
-<U75FC> \xDE\xCC |0
-<U75FD> \xDE\xD4 |0
-<U75FE> \xDE\xCB |0
-<U75FF> \xB7\xF5 |0
-<U7600> \xB7\xEF |0
-<U7601> \xB7\xF1 |0
-<U7602> \xFE\xBC |0
-<U7603> \xDE\xC9 |0
-<U7607> \x9F\xFE |0
-<U7608> \xE2\xDB |0
-<U7609> \xBA\xC7 |0
-<U760A> \xE2\xDF |0
-<U760B> \xBA\xC6 |0
-<U760C> \xE2\xDC |0
-<U760D> \xBA\xC5 |0
-<U760F> \xDE\xC8 |0
-<U7610> \xDE\xCF |0
-<U7611> \xE2\xDE |0
-<U7613> \xBA\xC8 |0
-<U7614> \xE2\xE0 |0
-<U7615> \xE2\xDD |0
-<U7616> \xE2\xDA |0
-<U7619> \xE6\xB1 |0
-<U761A> \xE6\xB5 |0
-<U761B> \xE6\xB7 |0
-<U761C> \xE6\xB3 |0
-<U761D> \xE6\xB2 |0
-<U761E> \xE6\xB0 |0
-<U761F> \xBD\x45 |0
-<U7620> \xBD\x43 |0
-<U7621> \xBD\x48 |0
-<U7622> \xBD\x49 |0
-<U7623> \xE6\xB4 |0
-<U7624> \xBD\x46 |0
-<U7625> \xE6\xAF |0
-<U7626> \xBD\x47 |0
-<U7627> \xBA\xC4 |0
-<U7628> \xE6\xB6 |0
-<U7629> \xBD\x44 |0
-<U762C> \xFE\xBD |0
-<U762D> \xEA\x6C |0
-<U762F> \xEA\x6B |0
-<U7630> \xEA\x73 |0
-<U7631> \xEA\x6D |0
-<U7632> \xEA\x72 |0
-<U7633> \xEA\x6F |0
-<U7634> \xBF\x60 |0
-<U7635> \xEA\x71 |0
-<U7638> \xBF\x61 |0
-<U763A> \xBF\x62 |0
-<U763B> \x9D\xDD |0
-<U763C> \xEA\x70 |0
-<U763D> \xEA\x6E |0
-<U7640> \x9E\xE1 |0
-<U7642> \xC0\xF8 |0
-<U7643> \xED\x74 |0
-<U7646> \xC0\xF7 |0
-<U7647> \xED\x77 |0
-<U7648> \xED\x75 |0
-<U7649> \xED\x76 |0
-<U764C> \xC0\xF9 |0
-<U764D> \x98\xDA |0
-<U764E> \x9D\xDF |0
-<U764F> \xFE\xBF |0
-<U7650> \xF0\x4D |0
-<U7651> \xFE\xBE |0
-<U7652> \xC2\xA1 |0
-<U7653> \xF0\x4E |0
-<U7654> \x9E\xEB |0
-<U7656> \xC2\x7D |0
-<U7657> \xF0\x4F |0
-<U7658> \xC2\x7E |0
-<U7659> \xF0\x4C |0
-<U765A> \xF0\x50 |0
-<U765C> \xF0\x4A |0
-<U765F> \xC3\xA7 |0
-<U7660> \xF2\x78 |0
-<U7661> \xC3\xA8 |0
-<U7662> \xC4\x6F |0
-<U7664> \xF0\x4B |0
-<U7665> \xC4\x70 |0
-<U7666> \x9E\x59 |0
-<U7667> \xA0\x5C |0
-<U7669> \xC4\xEE |0
-<U766A> \xF5\xDF |0
-<U766C> \xC5\x7E |0
-<U766D> \xF6\xF4 |0
-<U766E> \xC5\x7D |0
-<U766F> \xFE\xC0 |0
-<U7670> \xF7\xEA |0
-<U7671> \xC5\xF5 |0
-<U7672> \xC5\xF6 |0
-<U7673> \x94\x77 |0
-<U7674> \x98\xDC |0
-<U7675> \xF9\xCC |0
-<U7676> \xFE\xC1 |0
-<U7678> \xAC\xD1 |0
-<U7679> \xCF\xDE |0
-<U767A> \x98\xDE |0
-<U767B> \xB5\x6E |0
-<U767C> \xB5\x6F |0
-<U767D> \xA5\xD5 |0
-<U767E> \xA6\xCA |0
-<U767F> \xCA\x47 |0
-<U7681> \xCB\x71 |0
-<U7682> \xA8\x6D |0
-<U7684> \xAA\xBA |0
-<U7686> \xAC\xD2 |0
-<U7687> \xAC\xD3 |0
-<U7688> \xAC\xD4 |0
-<U7689> \xD6\xA6 |0
-<U768A> \xD2\xCB |0
-<U768B> \xAF\x6F |0
-<U768E> \xB2\xAE |0
-<U768F> \xD6\xA5 |0
-<U7690> \xFE\xC3 |0
-<U7692> \xDA\xB8 |0
-<U7693> \xB5\x71 |0
-<U7695> \xDA\xB7 |0
-<U7696> \xB5\x70 |0
-<U7699> \xDE\xD5 |0
-<U769A> \xBD\x4A |0
-<U769B> \xE6\xBB |0
-<U769C> \xE6\xB8 |0
-<U769D> \xE6\xB9 |0
-<U769E> \xE6\xBA |0
-<U76A1> \xFE\xC8 |0
-<U76A4> \xED\x78 |0
-<U76A5> \xFE\xC9 |0
-<U76A6> \xF0\x51 |0
-<U76AA> \xF4\x71 |0
-<U76AB> \xF4\x70 |0
-<U76AD> \xF6\xF5 |0
-<U76AE> \xA5\xD6 |0
-<U76AF> \xCD\x75 |0
-<U76B0> \xAF\x70 |0
-<U76B4> \xB5\x72 |0
-<U76B5> \xDE\xD6 |0
-<U76B7> \xFE\xCA |0
-<U76B8> \xE2\xE1 |0
-<U76BA> \xBD\x4B |0
-<U76BB> \xEA\x74 |0
-<U76BD> \xF0\x52 |0
-<U76BE> \xF4\x72 |0
-<U76BF> \xA5\xD7 |0
-<U76C2> \xAA\xBB |0
-<U76C3> \xAC\xD7 |0
-<U76C4> \xCF\xDF |0
-<U76C5> \xAC\xD8 |0
-<U76C6> \xAC\xD6 |0
-<U76C8> \xAC\xD5 |0
-<U76C9> \xD2\xCC |0
-<U76CA> \xAF\x71 |0
-<U76CC> \xFE\xCB |0
-<U76CD> \xAF\x72 |0
-<U76CE> \xAF\x73 |0
-<U76D2> \xB2\xB0 |0
-<U76D3> \xD6\xA7 |0
-<U76D4> \xB2\xAF |0
-<U76D6> \x9F\xC2 |0
-<U76DA> \xDA\xB9 |0
-<U76DB> \xB2\xB1 |0
-<U76DC> \xB5\x73 |0
-<U76DD> \xDE\xD7 |0
-<U76DE> \xB7\xF8 |0
-<U76DF> \xB7\xF9 |0
-<U76E1> \xBA\xC9 |0
-<U76E3> \xBA\xCA |0
-<U76E4> \xBD\x4C |0
-<U76E5> \xBF\x64 |0
-<U76E6> \xEA\x75 |0
-<U76E7> \xBF\x63 |0
-<U76E9> \xED\x79 |0
-<U76EA> \xC0\xFA |0
-<U76EC> \xF0\x53 |0
-<U76ED> \xF4\x73 |0
-<U76EE> \xA5\xD8 |0
-<U76EF> \xA8\x6E |0
-<U76F0> \xCD\x78 |0
-<U76F1> \xCD\x77 |0
-<U76F2> \xAA\xBC |0
-<U76F3> \xCD\x76 |0
-<U76F4> \xAA\xBD |0
-<U76F5> \xCD\x79 |0
-<U76F7> \xCF\xE5 |0
-<U76F8> \xAC\xDB |0
-<U76F9> \xAC\xDA |0
-<U76FA> \xCF\xE7 |0
-<U76FB> \xCF\xE6 |0
-<U76FC> \xAC\xDF |0
-<U76FE> \xAC\xDE |0
-<U7701> \xAC\xD9 |0
-<U7703> \xCF\xE1 |0
-<U7704> \xCF\xE2 |0
-<U7705> \xCF\xE3 |0
-<U7707> \xAC\xE0 |0
-<U7708> \xCF\xE0 |0
-<U7709> \xAC\xDC |0
-<U770A> \xCF\xE4 |0
-<U770B> \xAC\xDD |0
-<U770C> \x98\xC4 |0
-<U770E> \x94\xB0 |0
-<U770F> \x94\xB1 |0
-<U7710> \xD2\xCF |0
-<U7711> \xD2\xD3 |0
-<U7712> \xD2\xD1 |0
-<U7713> \xD2\xD0 |0
-<U7715> \xD2\xD4 |0
-<U7719> \xD2\xD5 |0
-<U771A> \xD2\xD6 |0
-<U771B> \xD2\xCE |0
-<U771D> \xD2\xCD |0
-<U771E> \xFE\xD1 |0
-<U771F> \xAF\x75 |0
-<U7720> \xAF\x76 |0
-<U7722> \xD2\xD7 |0
-<U7723> \xD2\xD2 |0
-<U7724> \xA0\xC1 |0
-<U7725> \xD6\xB0 |0
-<U7726> \xFE\xD2 |0
-<U7727> \xD2\xD8 |0
-<U7728> \xAF\x77 |0
-<U7729> \xAF\x74 |0
-<U772B> \xA0\xCD |0
-<U772D> \xD6\xAA |0
-<U772F> \xD6\xA9 |0
-<U7731> \xD6\xAB |0
-<U7732> \xD6\xAC |0
-<U7733> \xD6\xAE |0
-<U7734> \xD6\xAD |0
-<U7735> \xD6\xB2 |0
-<U7736> \xB2\xB5 |0
-<U7737> \xB2\xB2 |0
-<U7738> \xB2\xB6 |0
-<U7739> \xD6\xA8 |0
-<U773A> \xB2\xB7 |0
-<U773B> \xD6\xB1 |0
-<U773C> \xB2\xB4 |0
-<U773D> \xD6\xAF |0
-<U773E> \xB2\xB3 |0
-<U7740> \xFE\xD3 |0
-<U7743> \x98\xE5 |0
-<U7744> \xDA\xBC |0
-<U7745> \xDA\xBE |0
-<U7746> \xDA\xBA |0
-<U7747> \xDA\xBB |0
-<U774A> \xDA\xBF |0
-<U774B> \xDA\xC1 |0
-<U774C> \xDA\xC2 |0
-<U774D> \xDA\xBD |0
-<U774E> \xDA\xC0 |0
-<U774F> \xB5\x74 |0
-<U7752> \xDE\xDB |0
-<U7754> \xDE\xE0 |0
-<U7755> \xDE\xD8 |0
-<U7756> \xDE\xDC |0
-<U7758> \xFE\xD6 |0
-<U7759> \xDE\xE1 |0
-<U775A> \xDE\xDD |0
-<U775B> \xB7\xFA |0
-<U775C> \xB8\x43 |0
-<U775E> \xB7\xFD |0
-<U775F> \xDE\xD9 |0
-<U7760> \xDE\xDA |0
-<U7761> \xBA\xCE |0
-<U7762> \xB8\x46 |0
-<U7763> \xB7\xFE |0
-<U7765> \xB8\x44 |0
-<U7766> \xB7\xFC |0
-<U7767> \xDE\xDF |0
-<U7768> \xB8\x45 |0
-<U7769> \xDE\xDE |0
-<U776A> \xB8\x41 |0
-<U776B> \xB7\xFB |0
-<U776C> \xB8\x42 |0
-<U776D> \xDE\xE2 |0
-<U776E> \xE2\xE6 |0
-<U776F> \xE2\xE8 |0
-<U7772> \x91\xE4 |0
-<U7777> \x8F\xC7 |0
-<U7778> \x94\xAE |0
-<U7779> \xB8\x40 |0
-<U777A> \x8A\x4F |0
-<U777B> \x94\xB2 |0
-<U777C> \xE2\xE3 |0
-<U777D> \xBA\xCC |0
-<U777E> \xE2\xE9 |0
-<U777F> \xBA\xCD |0
-<U7780> \xE2\xE7 |0
-<U7781> \xE2\xE2 |0
-<U7782> \xE2\xE5 |0
-<U7783> \xE2\xEA |0
-<U7784> \xBA\xCB |0
-<U7785> \xE2\xE4 |0
-<U7787> \xBD\x4E |0
-<U7788> \xE6\xBF |0
-<U7789> \xE6\xBE |0
-<U778B> \xBD\x51 |0
-<U778C> \xBD\x4F |0
-<U778D> \xE6\xBC |0
-<U778E> \xBD\x4D |0
-<U778F> \xE6\xBD |0
-<U7791> \xBD\x50 |0
-<U7793> \x8F\xD4 |0
-<U7795> \xEA\x7D |0
-<U7797> \xEA\xA1 |0
-<U7798> \x98\xEA |0
-<U7799> \xEA\x7E |0
-<U779A> \xEA\x76 |0
-<U779B> \xEA\x7A |0
-<U779C> \xEA\x79 |0
-<U779D> \xEA\x77 |0
-<U779E> \xBF\x66 |0
-<U779F> \xBF\x67 |0
-<U77A0> \xBF\x65 |0
-<U77A1> \xEA\x78 |0
-<U77A2> \xEA\x7B |0
-<U77A3> \xEA\x7C |0
-<U77A5> \xBF\x68 |0
-<U77A7> \xC1\x40 |0
-<U77A8> \xED\xA3 |0
-<U77AA> \xC0\xFC |0
-<U77AB> \xED\x7B |0
-<U77AC> \xC0\xFE |0
-<U77AD> \xC1\x41 |0
-<U77AF> \xFE\xD8 |0
-<U77B0> \xC0\xFD |0
-<U77B1> \xED\xA2 |0
-<U77B2> \xED\x7C |0
-<U77B3> \xC0\xFB |0
-<U77B4> \xED\xA1 |0
-<U77B5> \xED\x7A |0
-<U77B6> \xED\x7E |0
-<U77B7> \xED\x7D |0
-<U77B9> \x9D\xE0 |0
-<U77BA> \xF0\x55 |0
-<U77BB> \xC2\xA4 |0
-<U77BC> \xC2\xA5 |0
-<U77BD> \xC2\xA2 |0
-<U77BE> \x98\xEE |0
-<U77BF> \xC2\xA3 |0
-<U77C2> \xF0\x54 |0
-<U77C3> \x95\xC4 |0
-<U77C4> \xF2\x7B |0
-<U77C5> \xFC\xE8 |0
-<U77C7> \xC3\xA9 |0
-<U77C9> \xF2\x79 |0
-<U77CA> \xF2\x7A |0
-<U77CB> \x98\xEF |0
-<U77CC> \xF4\x74 |0
-<U77CD> \xF4\x77 |0
-<U77CE> \xF4\x75 |0
-<U77CF> \xF4\x76 |0
-<U77D0> \xF5\xE0 |0
-<U77D3> \xC4\xEF |0
-<U77D4> \xF7\xEB |0
-<U77D5> \xF8\xB4 |0
-<U77D7> \xC5\xF7 |0
-<U77D8> \xF8\xF8 |0
-<U77D9> \xF8\xF9 |0
-<U77DA> \xC6\x66 |0
-<U77DB> \xA5\xD9 |0
-<U77DC> \xAC\xE1 |0
-<U77DE> \xDA\xC3 |0
-<U77E0> \xDE\xE3 |0
-<U77E2> \xA5\xDA |0
-<U77E3> \xA8\x6F |0
-<U77E5> \xAA\xBE |0
-<U77E6> \xFA\xD8 |0
-<U77E7> \xCF\xE8 |0
-<U77E8> \xCF\xE9 |0
-<U77E9> \xAF\x78 |0
-<U77EC> \xDA\xC4 |0
-<U77ED> \xB5\x75 |0
-<U77EE> \xB8\x47 |0
-<U77EF> \xC1\x42 |0
-<U77F0> \xED\xA4 |0
-<U77F1> \xF2\x7C |0
-<U77F2> \xF4\x78 |0
-<U77F3> \xA5\xDB |0
-<U77F4> \xFE\xDC |0
-<U77F7> \xCD\xA1 |0
-<U77F8> \xCD\x7A |0
-<U77F9> \xCD\x7C |0
-<U77FA> \xCD\x7E |0
-<U77FB> \xCD\x7D |0
-<U77FC> \xCD\x7B |0
-<U77FD> \xAA\xBF |0
-<U77FE> \xA0\xAE |0
-<U7802> \xAC\xE2 |0
-<U7803> \xCF\xF2 |0
-<U7805> \xCF\xED |0
-<U7806> \xCF\xEA |0
-<U7808> \x9D\x4C |0
-<U7809> \xCF\xF1 |0
-<U780C> \xAC\xE4 |0
-<U780D> \xAC\xE5 |0
-<U780E> \xCF\xF0 |0
-<U780F> \xCF\xEF |0
-<U7810> \xCF\xEE |0
-<U7811> \xCF\xEB |0
-<U7812> \xCF\xEC |0
-<U7813> \xCF\xF3 |0
-<U7814> \xAC\xE3 |0
-<U7818> \x98\xF1 |0
-<U781C> \x98\xF3 |0
-<U781D> \xAF\x7C |0
-<U781E> \x94\xC1 |0
-<U781F> \xAF\xA4 |0
-<U7820> \xAF\xA3 |0
-<U7821> \xD2\xE1 |0
-<U7822> \xD2\xDB |0
-<U7823> \xD2\xD9 |0
-<U7825> \xAF\xA1 |0
-<U7826> \xD6\xB9 |0
-<U7827> \xAF\x7A |0
-<U7828> \xD2\xDE |0
-<U7829> \xD2\xE2 |0
-<U782A> \xD2\xE4 |0
-<U782B> \xD2\xE0 |0
-<U782C> \xD2\xDA |0
-<U782D> \xAF\xA2 |0
-<U782E> \xD2\xDF |0
-<U782F> \xD2\xDD |0
-<U7830> \xAF\x79 |0
-<U7831> \xD2\xE5 |0
-<U7832> \xAF\xA5 |0
-<U7833> \xD2\xE3 |0
-<U7834> \xAF\x7D |0
-<U7835> \xD2\xDC |0
-<U7837> \xAF\x7E |0
-<U7838> \xAF\x7B |0
-<U7839> \x98\xF5 |0
-<U783C> \xFA\x4F |0
-<U783D> \x96\xE2 |0
-<U7842> \x94\x50 |0
-<U7843> \xB2\xB9 |0
-<U7844> \x96\xA2 |0
-<U7845> \xD6\xBA |0
-<U7847> \x98\xF6 |0
-<U7848> \xD6\xB3 |0
-<U7849> \xD6\xB5 |0
-<U784A> \xD6\xB7 |0
-<U784B> \x96\xE5 |0
-<U784C> \xD6\xB8 |0
-<U784D> \xD6\xB6 |0
-<U784E> \xB2\xBA |0
-<U7850> \xD6\xBB |0
-<U7851> \x98\xF7 |0
-<U7852> \xD6\xB4 |0
-<U7853> \xA0\x46 |0
-<U7854> \x96\xE3 |0
-<U785C> \xDA\xC8 |0
-<U785D> \xB5\x76 |0
-<U785E> \xDA\xD0 |0
-<U7860> \xDA\xC5 |0
-<U7862> \xDA\xD1 |0
-<U7864> \xDA\xC6 |0
-<U7865> \xDA\xC7 |0
-<U7866> \x98\xF8 |0
-<U7868> \xDA\xCF |0
-<U7869> \xDA\xCE |0
-<U786A> \xDA\xCB |0
-<U786B> \xB2\xB8 |0
-<U786C> \xB5\x77 |0
-<U786D> \xDA\xC9 |0
-<U786E> \xDA\xCC |0
-<U786F> \xB5\x78 |0
-<U7870> \xDA\xCD |0
-<U7871> \xDA\xCA |0
-<U7879> \xDE\xEE |0
-<U787A> \x9E\xE4 |0
-<U787B> \xDE\xF2 |0
-<U787C> \xB8\x4E |0
-<U787E> \xE2\xF0 |0
-<U787F> \xB8\x51 |0
-<U7880> \xDE\xF0 |0
-<U7881> \xF9\xD6 |0
-<U7883> \xDE\xED |0
-<U7884> \xDE\xE8 |0
-<U7885> \xDE\xEA |0
-<U7886> \xDE\xEB |0
-<U7887> \xDE\xE4 |0
-<U7888> \x94\xC3 |0
-<U7889> \xB8\x4D |0
-<U788C> \xB8\x4C |0
-<U788D> \x94\xC2 |0
-<U788E> \xB8\x48 |0
-<U788F> \xDE\xE7 |0
-<U7891> \xB8\x4F |0
-<U7893> \xB8\x50 |0
-<U7894> \xDE\xE6 |0
-<U7895> \xDE\xE9 |0
-<U7896> \xDE\xF1 |0
-<U7897> \xB8\x4A |0
-<U7898> \xB8\x4B |0
-<U7899> \xDE\xEF |0
-<U789A> \xDE\xE5 |0
-<U789E> \xE2\xF2 |0
-<U789F> \xBA\xD0 |0
-<U78A0> \xE2\xF4 |0
-<U78A1> \xDE\xEC |0
-<U78A2> \xE2\xF6 |0
-<U78A3> \xBA\xD4 |0
-<U78A4> \xE2\xF7 |0
-<U78A5> \xE2\xF3 |0
-<U78A7> \xBA\xD1 |0
-<U78A8> \xE2\xEF |0
-<U78A9> \xBA\xD3 |0
-<U78AA> \xE2\xEC |0
-<U78AB> \xE2\xF1 |0
-<U78AC> \xE2\xF5 |0
-<U78AD> \xE2\xEE |0
-<U78AF> \xFE\xE1 |0
-<U78B0> \xB8\x49 |0
-<U78B1> \xFE\xE9 |0
-<U78B2> \xE2\xEB |0
-<U78B3> \xBA\xD2 |0
-<U78B4> \xE2\xED |0
-<U78B6> \x96\xE4 |0
-<U78B8> \x89\xAC |0
-<U78B9> \x96\xDB |0
-<U78BA> \xBD\x54 |0
-<U78BB> \xE6\xC1 |0
-<U78BC> \xBD\x58 |0
-<U78BE> \xBD\x56 |0
-<U78C1> \xBA\xCF |0
-<U78C3> \xE6\xC8 |0
-<U78C4> \xE6\xC9 |0
-<U78C5> \xBD\x53 |0
-<U78C7> \xFE\xE2 |0
-<U78C8> \xE6\xC7 |0
-<U78C9> \xE6\xCA |0
-<U78CA> \xBD\x55 |0
-<U78CB> \xBD\x52 |0
-<U78CC> \xE6\xC3 |0
-<U78CD> \xE6\xC0 |0
-<U78CE> \xE6\xC5 |0
-<U78CF> \xE6\xC2 |0
-<U78D0> \xBD\x59 |0
-<U78D1> \xE6\xC4 |0
-<U78D2> \x94\xC4 |0
-<U78D3> \xFE\xE3 |0
-<U78D4> \xE6\xC6 |0
-<U78D5> \xBD\x57 |0
-<U78D7> \xFE\xE7 |0
-<U78D8> \x9F\xFB |0
-<U78DA> \xBF\x6A |0
-<U78DB> \xEA\xA8 |0
-<U78DD> \xEA\xA2 |0
-<U78DE> \xEA\xA6 |0
-<U78DF> \xEA\xAC |0
-<U78E0> \xEA\xAD |0
-<U78E1> \xEA\xA9 |0
-<U78E2> \xEA\xAA |0
-<U78E3> \xEA\xA7 |0
-<U78E5> \xEA\xA4 |0
-<U78E7> \xBF\x6C |0
-<U78E8> \xBF\x69 |0
-<U78E9> \xEA\xA3 |0
-<U78EA> \xEA\xA5 |0
-<U78EC> \xBF\x6B |0
-<U78ED> \xEA\xAB |0
-<U78EE> \x93\xC9 |0
-<U78EF> \xC1\x46 |0
-<U78F0> \x94\xE8 |0
-<U78F1> \xFB\x56 |0
-<U78F2> \xED\xAA |0
-<U78F3> \xED\xA5 |0
-<U78F4> \xC1\x45 |0
-<U78F5> \x90\xC5 |0
-<U78F7> \xC1\x43 |0
-<U78F9> \xED\xAC |0
-<U78FA> \xC1\x44 |0
-<U78FB> \xED\xA8 |0
-<U78FC> \xED\xA9 |0
-<U78FD> \xED\xA6 |0
-<U78FE> \xED\xAD |0
-<U78FF> \xF0\x56 |0
-<U7901> \xC1\x47 |0
-<U7902> \xED\xA7 |0
-<U7904> \xED\xAE |0
-<U7905> \xED\xAB |0
-<U7906> \xA0\xA8 |0
-<U7909> \xF0\x5A |0
-<U790C> \xF0\x57 |0
-<U790E> \xC2\xA6 |0
-<U7910> \xF0\x5B |0
-<U7911> \xF0\x5D |0
-<U7912> \xF0\x5C |0
-<U7913> \xF0\x58 |0
-<U7914> \xF0\x59 |0
-<U7917> \xF2\xA3 |0
-<U7919> \xC3\xAA |0
-<U791B> \xF2\x7E |0
-<U791C> \xF2\xA2 |0
-<U791D> \xF2\x7D |0
-<U791E> \xF2\xA4 |0
-<U7921> \xF2\xA1 |0
-<U7923> \xF4\x7A |0
-<U7924> \xF4\x7D |0
-<U7925> \xF4\x79 |0
-<U7926> \xC4\x71 |0
-<U7927> \xF4\x7B |0
-<U7928> \xF4\x7C |0
-<U7929> \xF4\x7E |0
-<U792A> \xC4\x72 |0
-<U792B> \xC4\x74 |0
-<U792C> \xC4\x73 |0
-<U792D> \xF5\xE1 |0
-<U792E> \xFE\xE5 |0
-<U792F> \xF5\xE3 |0
-<U7931> \xF5\xE2 |0
-<U7932> \x98\xFD |0
-<U7933> \x98\xFB |0
-<U7934> \xFE\xE8 |0
-<U7935> \xF6\xF6 |0
-<U7936> \x8E\xBF |0
-<U7938> \xF8\xB5 |0
-<U7939> \xF8\xFA |0
-<U793A> \xA5\xDC |0
-<U793B> \x8B\xD8 |0
-<U793C> \xFE\xF7 |0
-<U793D> \xCB\x72 |0
-<U793E> \xAA\xC0 |0
-<U793F> \xCD\xA3 |0
-<U7940> \xAA\xC1 |0
-<U7941> \xAA\xC2 |0
-<U7942> \xCD\xA2 |0
-<U7944> \xCF\xF8 |0
-<U7945> \xCF\xF7 |0
-<U7946> \xAC\xE6 |0
-<U7947> \xAC\xE9 |0
-<U7948> \xAC\xE8 |0
-<U7949> \xAC\xE7 |0
-<U794A> \xCF\xF4 |0
-<U794B> \xCF\xF6 |0
-<U794C> \xCF\xF5 |0
-<U794F> \xD2\xE8 |0
-<U7950> \xAF\xA7 |0
-<U7951> \xD2\xEC |0
-<U7952> \xD2\xEB |0
-<U7953> \xD2\xEA |0
-<U7954> \xD2\xE6 |0
-<U7955> \xAF\xA6 |0
-<U7956> \xAF\xAA |0
-<U7957> \xAF\xAD |0
-<U7958> \x8F\x68 |0
-<U7959> \x94\xC6 |0
-<U795A> \xAF\xAE |0
-<U795B> \xD2\xE7 |0
-<U795C> \xD2\xE9 |0
-<U795D> \xAF\xAC |0
-<U795E> \xAF\xAB |0
-<U795F> \xAF\xA9 |0
-<U7960> \xAF\xA8 |0
-<U7961> \xD6\xC2 |0
-<U7962> \x9D\xEA |0
-<U7963> \xD6\xC0 |0
-<U7964> \xD6\xBC |0
-<U7965> \xB2\xBB |0
-<U7967> \xD6\xBD |0
-<U7968> \xB2\xBC |0
-<U7969> \xD6\xBE |0
-<U796A> \xD6\xBF |0
-<U796B> \xD6\xC1 |0
-<U796D> \xB2\xBD |0
-<U7970> \xDA\xD5 |0
-<U7971> \xFC\x69 |0
-<U7972> \xDA\xD4 |0
-<U7973> \xDA\xD3 |0
-<U7974> \xDA\xD2 |0
-<U7979> \xDE\xF6 |0
-<U797A> \xB8\x52 |0
-<U797C> \xDE\xF3 |0
-<U797D> \xDE\xF5 |0
-<U797E> \x9C\xDA |0
-<U797F> \xB8\x53 |0
-<U7980> \xFE\xF3 |0
-<U7981> \xB8\x54 |0
-<U7982> \xDE\xF4 |0
-<U7983> \x9C\x72 |0
-<U7986> \xFE\xF0 |0
-<U7987> \x89\xC9 |0
-<U7988> \xE3\x41 |0
-<U798A> \xE2\xF9 |0
-<U798B> \xE2\xFA |0
-<U798D> \xBA\xD7 |0
-<U798E> \xBA\xD5 |0
-<U798F> \xBA\xD6 |0
-<U7990> \xE3\x43 |0
-<U7991> \x99\x41 |0
-<U7992> \xE3\x42 |0
-<U7993> \xE2\xFE |0
-<U7994> \xE2\xFD |0
-<U7995> \xE2\xFC |0
-<U7996> \xE2\xFB |0
-<U7997> \xE3\x40 |0
-<U7998> \xE2\xF8 |0
-<U7999> \x99\x42 |0
-<U799A> \xE6\xCB |0
-<U799B> \xE6\xD0 |0
-<U799C> \xE6\xCE |0
-<U799D> \xFE\xF5 |0
-<U799F> \x91\xD7 |0
-<U79A0> \xE6\xCD |0
-<U79A1> \xE6\xCC |0
-<U79A2> \xE6\xCF |0
-<U79A4> \xEA\xAE |0
-<U79A5> \x94\xCC |0
-<U79A6> \xBF\x6D |0
-<U79A7> \xC1\x48 |0
-<U79A8> \xED\xB0 |0
-<U79A9> \xFE\xF8 |0
-<U79AA> \xC1\x49 |0
-<U79AB> \xED\xAF |0
-<U79AC> \xF0\x5F |0
-<U79AD> \xF0\x5E |0
-<U79AE> \xC2\xA7 |0
-<U79B0> \xF2\xA5 |0
-<U79B1> \xC3\xAB |0
-<U79B2> \xF4\xA1 |0
-<U79B3> \xC5\xA1 |0
-<U79B4> \xF6\xF7 |0
-<U79B6> \xF8\xB7 |0
-<U79B7> \xF8\xB6 |0
-<U79B8> \xC9\xA8 |0
-<U79B9> \xAC\xEA |0
-<U79BA> \xAC\xEB |0
-<U79BB> \xD6\xC3 |0
-<U79BD> \xB8\x56 |0
-<U79BE> \xA5\xDD |0
-<U79BF> \xA8\x72 |0
-<U79C0> \xA8\x71 |0
-<U79C1> \xA8\x70 |0
-<U79C4> \x97\xA8 |0
-<U79C5> \xCD\xA4 |0
-<U79C6> \xFE\xFC |0
-<U79C8> \xAA\xC4 |0
-<U79C9> \xAA\xC3 |0
-<U79CB> \xAC\xEE |0
-<U79CC> \xFD\xBF |0
-<U79CD> \xCF\xFA |0
-<U79CE> \xCF\xFD |0
-<U79CF> \xCF\xFB |0
-<U79D1> \xAC\xEC |0
-<U79D2> \xAC\xED |0
-<U79D4> \xFE\xFE |0
-<U79D5> \xCF\xF9 |0
-<U79D6> \xCF\xFC |0
-<U79D8> \xAF\xB5 |0
-<U79DC> \xD2\xF3 |0
-<U79DD> \xD2\xF5 |0
-<U79DE> \xD2\xF4 |0
-<U79DF> \xAF\xB2 |0
-<U79E0> \xD2\xEF |0
-<U79E2> \x96\xD1 |0
-<U79E3> \xAF\xB0 |0
-<U79E4> \xAF\xAF |0
-<U79E6> \xAF\xB3 |0
-<U79E7> \xAF\xB1 |0
-<U79E9> \xAF\xB4 |0
-<U79EA> \xD2\xF2 |0
-<U79EB> \xD2\xED |0
-<U79EC> \xD2\xEE |0
-<U79ED> \xD2\xF1 |0
-<U79EE> \xD2\xF0 |0
-<U79F1> \x94\xD5 |0
-<U79F4> \x94\xD0 |0
-<U79F6> \xD6\xC6 |0
-<U79F7> \xD6\xC7 |0
-<U79F8> \xD6\xC5 |0
-<U79FA> \xD6\xC4 |0
-<U79FB> \xB2\xBE |0
-<U7A00> \xB5\x7D |0
-<U7A02> \xDA\xD6 |0
-<U7A03> \xDA\xD8 |0
-<U7A04> \xDA\xDA |0
-<U7A05> \xB5\x7C |0
-<U7A06> \x99\x44 |0
-<U7A08> \xB5\x7A |0
-<U7A0A> \xDA\xD7 |0
-<U7A0B> \xB5\x7B |0
-<U7A0C> \xDA\xD9 |0
-<U7A0D> \xB5\x79 |0
-<U7A10> \xDF\x41 |0
-<U7A11> \xDE\xF7 |0
-<U7A12> \xDE\xFA |0
-<U7A13> \xDE\xFE |0
-<U7A14> \xB8\x5A |0
-<U7A15> \xDE\xFC |0
-<U7A17> \xDE\xFB |0
-<U7A18> \xDE\xF8 |0
-<U7A19> \xDE\xF9 |0
-<U7A1A> \xB8\x58 |0
-<U7A1B> \xDF\x40 |0
-<U7A1C> \xB8\x57 |0
-<U7A1E> \xB8\x5C |0
-<U7A1F> \xB8\x5B |0
-<U7A20> \xB8\x59 |0
-<U7A22> \xDE\xFD |0
-<U7A26> \xE3\x49 |0
-<U7A28> \xE3\x48 |0
-<U7A2B> \xE3\x44 |0
-<U7A2D> \xA0\xB3 |0
-<U7A2E> \xBA\xD8 |0
-<U7A2F> \xE3\x47 |0
-<U7A30> \xE3\x46 |0
-<U7A31> \xBA\xD9 |0
-<U7A37> \xBD\x5E |0
-<U7A39> \xE6\xD2 |0
-<U7A3A> \x94\xCF |0
-<U7A3B> \xBD\x5F |0
-<U7A3C> \xBD\x5B |0
-<U7A3D> \xBD\x5D |0
-<U7A3E> \x9F\xFA |0
-<U7A3F> \xBD\x5A |0
-<U7A40> \xBD\x5C |0
-<U7A43> \x91\xE5 |0
-<U7A44> \xEA\xAF |0
-<U7A45> \x9C\x6A |0
-<U7A46> \xBF\x70 |0
-<U7A47> \xEA\xB1 |0
-<U7A48> \xEA\xB0 |0
-<U7A49> \x8E\x49 |0
-<U7A4A> \xE3\x45 |0
-<U7A4B> \xBF\x72 |0
-<U7A4C> \xBF\x71 |0
-<U7A4D> \xBF\x6E |0
-<U7A4E> \xBF\x6F |0
-<U7A54> \xED\xB5 |0
-<U7A56> \xED\xB3 |0
-<U7A57> \xC1\x4A |0
-<U7A58> \xED\xB4 |0
-<U7A5A> \xED\xB6 |0
-<U7A5B> \xED\xB2 |0
-<U7A5C> \xED\xB1 |0
-<U7A5F> \xF0\x60 |0
-<U7A60> \xC2\xAA |0
-<U7A61> \xC2\xA8 |0
-<U7A62> \xC2\xA9 |0
-<U7A65> \x8E\x4C |0
-<U7A67> \xF2\xA6 |0
-<U7A68> \xF2\xA7 |0
-<U7A69> \xC3\xAD |0
-<U7A6B> \xC3\xAC |0
-<U7A6C> \xF4\xA3 |0
-<U7A6D> \xF4\xA4 |0
-<U7A6E> \xF4\xA2 |0
-<U7A70> \xF6\xF8 |0
-<U7A71> \xF6\xF9 |0
-<U7A74> \xA5\xDE |0
-<U7A75> \xCA\x48 |0
-<U7A76> \xA8\x73 |0
-<U7A78> \xCD\xA5 |0
-<U7A79> \xAA\xC6 |0
-<U7A7A> \xAA\xC5 |0
-<U7A7B> \xCD\xA6 |0
-<U7A7D> \x8E\x4D |0
-<U7A7E> \xD0\x40 |0
-<U7A7F> \xAC\xEF |0
-<U7A80> \xCF\xFE |0
-<U7A81> \xAC\xF0 |0
-<U7A83> \x9A\x73 |0
-<U7A84> \xAF\xB6 |0
-<U7A85> \xD2\xF8 |0
-<U7A86> \xD2\xF6 |0
-<U7A87> \xD2\xFC |0
-<U7A88> \xAF\xB7 |0
-<U7A89> \xD2\xF7 |0
-<U7A8A> \xD2\xFB |0
-<U7A8B> \xD2\xF9 |0
-<U7A8C> \xD2\xFA |0
-<U7A8F> \xD6\xC8 |0
-<U7A90> \xD6\xCA |0
-<U7A91> \x99\x47 |0
-<U7A92> \xB2\xBF |0
-<U7A94> \xD6\xC9 |0
-<U7A95> \xB2\xC0 |0
-<U7A96> \xB5\xA2 |0
-<U7A97> \xB5\xA1 |0
-<U7A98> \xB5\x7E |0
-<U7A99> \xDA\xDB |0
-<U7A9E> \xDF\x44 |0
-<U7A9F> \xB8\x5D |0
-<U7AA0> \xB8\x5E |0
-<U7AA2> \xDF\x43 |0
-<U7AA3> \xDF\x42 |0
-<U7AA8> \xE3\x4A |0
-<U7AA9> \xBA\xDB |0
-<U7AAA> \xBA\xDA |0
-<U7AAB> \xE3\x4B |0
-<U7AAC> \xE3\x4C |0
-<U7AAE> \xBD\x61 |0
-<U7AAF> \xBD\x60 |0
-<U7AB0> \x8E\x50 |0
-<U7AB1> \xEA\xB5 |0
-<U7AB2> \xE6\xD3 |0
-<U7AB3> \xE6\xD5 |0
-<U7AB4> \xE6\xD4 |0
-<U7AB5> \xEA\xB4 |0
-<U7AB6> \xEA\xB2 |0
-<U7AB7> \xEA\xB6 |0
-<U7AB8> \xEA\xB3 |0
-<U7ABA> \xBF\x73 |0
-<U7ABB> \x8E\x4F |0
-<U7ABC> \x99\x49 |0
-<U7ABE> \xED\xB7 |0
-<U7ABF> \xC1\x4B |0
-<U7AC0> \xED\xB8 |0
-<U7AC1> \xED\xB9 |0
-<U7AC2> \x8E\x51 |0
-<U7AC3> \x8E\x52 |0
-<U7AC4> \xC2\xAB |0
-<U7AC5> \xC2\xAC |0
-<U7AC7> \xC4\x75 |0
-<U7AC8> \x9A\xB2 |0
-<U7AC9> \x89\xA5 |0
-<U7ACA> \xC5\xD1 |0
-<U7ACB> \xA5\xDF |0
-<U7ACF> \x99\x4C |0
-<U7AD1> \xD0\x41 |0
-<U7AD3> \x9F\xF8 |0
-<U7AD8> \xD2\xFD |0
-<U7AD9> \xAF\xB8 |0
-<U7ADA> \x8E\x56 |0
-<U7ADB> \x99\x4D |0
-<U7ADC> \x91\xCA |0
-<U7ADD> \x8E\x57 |0
-<U7ADF> \xB3\xBA |0
-<U7AE0> \xB3\xB9 |0
-<U7AE2> \x94\xE1 |0
-<U7AE3> \xB5\xA4 |0
-<U7AE4> \xDA\xDD |0
-<U7AE5> \xB5\xA3 |0
-<U7AE6> \xDA\xDC |0
-<U7AE7> \x90\x47 |0
-<U7AE9> \x8F\xD8 |0
-<U7AEA> \x8E\x58 |0
-<U7AEB> \xDF\x45 |0
-<U7AED> \xBA\xDC |0
-<U7AEE> \xE3\x4D |0
-<U7AEF> \xBA\xDD |0
-<U7AF6> \xC4\x76 |0
-<U7AF7> \xF4\xA5 |0
-<U7AF9> \xA6\xCB |0
-<U7AFA> \xAA\xC7 |0
-<U7AFB> \xCD\xA7 |0
-<U7AFD> \xAC\xF2 |0
-<U7AFE> \x94\xEB |0
-<U7AFF> \xAC\xF1 |0
-<U7B00> \xD0\x42 |0
-<U7B01> \xD0\x43 |0
-<U7B04> \xD3\x40 |0
-<U7B05> \xD3\x42 |0
-<U7B06> \xAF\xB9 |0
-<U7B08> \xD3\x44 |0
-<U7B09> \xD3\x47 |0
-<U7B0A> \xD3\x45 |0
-<U7B0B> \x8E\x5C |0
-<U7B0C> \x95\x53 |0
-<U7B0E> \xD3\x46 |0
-<U7B0F> \xD3\x43 |0
-<U7B10> \xD2\xFE |0
-<U7B11> \xAF\xBA |0
-<U7B12> \xD3\x48 |0
-<U7B13> \xD3\x41 |0
-<U7B14> \x9F\xE5 |0
-<U7B18> \xD6\xD3 |0
-<U7B19> \xB2\xC6 |0
-<U7B1A> \xD6\xDC |0
-<U7B1B> \xB2\xC3 |0
-<U7B1D> \xD6\xD5 |0
-<U7B1E> \xB2\xC7 |0
-<U7B1F> \x9F\x56 |0
-<U7B20> \xB2\xC1 |0
-<U7B22> \xD6\xD0 |0
-<U7B23> \xD6\xDD |0
-<U7B24> \xD6\xD1 |0
-<U7B25> \xD6\xCE |0
-<U7B26> \xB2\xC5 |0
-<U7B27> \x95\x4F |0
-<U7B28> \xB2\xC2 |0
-<U7B29> \x8E\x5E |0
-<U7B2A> \xD6\xD4 |0
-<U7B2B> \xD6\xD7 |0
-<U7B2C> \xB2\xC4 |0
-<U7B2D> \xD6\xD8 |0
-<U7B2E> \xB2\xC8 |0
-<U7B2F> \xD6\xD9 |0
-<U7B30> \xD6\xCF |0
-<U7B31> \xD6\xD6 |0
-<U7B32> \xD6\xDA |0
-<U7B33> \xD6\xD2 |0
-<U7B34> \xD6\xCD |0
-<U7B35> \xD6\xCB |0
-<U7B38> \xD6\xDB |0
-<U7B39> \x99\x6A |0
-<U7B3B> \xDA\xDF |0
-<U7B40> \xDA\xE4 |0
-<U7B42> \x9C\x64 |0
-<U7B43> \x9C\xD9 |0
-<U7B44> \xDA\xE0 |0
-<U7B45> \xDA\xE6 |0
-<U7B46> \xB5\xA7 |0
-<U7B47> \xD6\xCC |0
-<U7B48> \xDA\xE1 |0
-<U7B49> \xB5\xA5 |0
-<U7B4A> \xDA\xDE |0
-<U7B4B> \xB5\xAC |0
-<U7B4C> \xDA\xE2 |0
-<U7B4D> \xB5\xAB |0
-<U7B4E> \xDA\xE3 |0
-<U7B4F> \xB5\xAD |0
-<U7B50> \xB5\xA8 |0
-<U7B51> \xB5\xAE |0
-<U7B52> \xB5\xA9 |0
-<U7B54> \xB5\xAA |0
-<U7B55> \x8E\x5D |0
-<U7B56> \xB5\xA6 |0
-<U7B58> \xDA\xE5 |0
-<U7B60> \xB8\x61 |0
-<U7B61> \xDF\x50 |0
-<U7B62> \x99\x50 |0
-<U7B63> \xDF\x53 |0
-<U7B64> \xDF\x47 |0
-<U7B65> \xDF\x4C |0
-<U7B66> \xDF\x46 |0
-<U7B67> \xB8\x63 |0
-<U7B69> \xDF\x4A |0
-<U7B6C> \x99\x51 |0
-<U7B6D> \xDF\x48 |0
-<U7B6E> \xB8\x62 |0
-<U7B6F> \x8E\x62 |0
-<U7B70> \xDF\x4F |0
-<U7B71> \xDF\x4E |0
-<U7B72> \xDF\x4B |0
-<U7B73> \xDF\x4D |0
-<U7B74> \xDF\x49 |0
-<U7B75> \xBA\xE1 |0
-<U7B76> \xDF\x52 |0
-<U7B77> \xB8\x5F |0
-<U7B78> \xDF\x51 |0
-<U7B7B> \x99\x52 |0
-<U7B82> \xE3\x5D |0
-<U7B84> \xBA\xE8 |0
-<U7B85> \xE3\x58 |0
-<U7B87> \xBA\xE7 |0
-<U7B88> \xE3\x4E |0
-<U7B8A> \xE3\x50 |0
-<U7B8B> \xBA\xE0 |0
-<U7B8C> \xE3\x55 |0
-<U7B8D> \xE3\x54 |0
-<U7B8E> \xE3\x57 |0
-<U7B8F> \xBA\xE5 |0
-<U7B90> \xE3\x52 |0
-<U7B91> \xE3\x51 |0
-<U7B92> \x8E\x68 |0
-<U7B94> \xBA\xE4 |0
-<U7B95> \xBA\xDF |0
-<U7B96> \xE3\x53 |0
-<U7B97> \xBA\xE2 |0
-<U7B98> \xE3\x59 |0
-<U7B99> \xE3\x5B |0
-<U7B9B> \xE3\x56 |0
-<U7B9C> \xE3\x4F |0
-<U7B9D> \xBA\xE3 |0
-<U7BA0> \xBD\x69 |0
-<U7BA1> \xBA\xDE |0
-<U7BA2> \x8E\x61 |0
-<U7BA3> \x9F\x59 |0
-<U7BA4> \xE3\x5C |0
-<U7BAC> \xE6\xD9 |0
-<U7BAD> \xBD\x62 |0
-<U7BAF> \xE6\xDB |0
-<U7BB1> \xBD\x63 |0
-<U7BB2> \x8B\xB3 |0
-<U7BB4> \xBD\x65 |0
-<U7BB5> \xE6\xDE |0
-<U7BB7> \xE6\xD6 |0
-<U7BB8> \xBA\xE6 |0
-<U7BB9> \xE6\xDC |0
-<U7BBE> \xE6\xD8 |0
-<U7BC0> \xB8\x60 |0
-<U7BC1> \xBD\x68 |0
-<U7BC4> \xBD\x64 |0
-<U7BC6> \xBD\x66 |0
-<U7BC7> \xBD\x67 |0
-<U7BC9> \xBF\x76 |0
-<U7BCA> \xE6\xDD |0
-<U7BCB> \xE6\xD7 |0
-<U7BCC> \xBD\x6A |0
-<U7BCE> \xE6\xDA |0
-<U7BCF> \x9F\x5D |0
-<U7BD0> \x8E\x66 |0
-<U7BD4> \xEA\xC0 |0
-<U7BD5> \xEA\xBB |0
-<U7BD8> \xEA\xC5 |0
-<U7BD9> \xBF\x74 |0
-<U7BDA> \xEA\xBD |0
-<U7BDB> \xBF\x78 |0
-<U7BDC> \xEA\xC3 |0
-<U7BDD> \xEA\xBA |0
-<U7BDE> \xEA\xB7 |0
-<U7BDF> \xEA\xC6 |0
-<U7BE0> \xC1\x51 |0
-<U7BE1> \xBF\x79 |0
-<U7BE2> \xEA\xC2 |0
-<U7BE3> \xEA\xB8 |0
-<U7BE4> \xBF\x77 |0
-<U7BE5> \xEA\xBC |0
-<U7BE6> \xBF\x7B |0
-<U7BE7> \xEA\xB9 |0
-<U7BE8> \xEA\xBE |0
-<U7BE9> \xBF\x7A |0
-<U7BEA> \xEA\xC1 |0
-<U7BEB> \xEA\xC4 |0
-<U7BF0> \xED\xCB |0
-<U7BF1> \xED\xCC |0
-<U7BF2> \xED\xBC |0
-<U7BF3> \xED\xC3 |0
-<U7BF4> \xED\xC1 |0
-<U7BF7> \xC1\x4F |0
-<U7BF8> \xED\xC8 |0
-<U7BF9> \xEA\xBF |0
-<U7BFA> \x8E\x6E |0
-<U7BFB> \xED\xBF |0
-<U7BFC> \x9F\x64 |0
-<U7BFD> \xED\xC9 |0
-<U7BFE> \xC1\x4E |0
-<U7BFF> \xED\xBE |0
-<U7C00> \xED\xBD |0
-<U7C01> \xED\xC7 |0
-<U7C02> \xED\xC4 |0
-<U7C03> \xED\xC6 |0
-<U7C05> \xED\xBA |0
-<U7C06> \xED\xCA |0
-<U7C07> \xC1\x4C |0
-<U7C09> \xED\xC5 |0
-<U7C0A> \xED\xCE |0
-<U7C0B> \xED\xC2 |0
-<U7C0C> \xC1\x50 |0
-<U7C0D> \xC1\x4D |0
-<U7C0E> \xED\xC0 |0
-<U7C0F> \xED\xBB |0
-<U7C10> \xED\xCD |0
-<U7C11> \xBF\x75 |0
-<U7C12> \x99\x53 |0
-<U7C15> \xFA\xB8 |0
-<U7C19> \xF0\x63 |0
-<U7C1B> \x99\x54 |0
-<U7C1C> \xF0\x61 |0
-<U7C1D> \xF0\x67 |0
-<U7C1E> \xC2\xB0 |0
-<U7C1F> \xF0\x65 |0
-<U7C20> \xF0\x64 |0
-<U7C21> \xC2\xB2 |0
-<U7C22> \xF0\x6A |0
-<U7C23> \xC2\xB1 |0
-<U7C25> \xF0\x6B |0
-<U7C26> \xF0\x68 |0
-<U7C27> \xC2\xAE |0
-<U7C28> \xF0\x69 |0
-<U7C29> \xF0\x62 |0
-<U7C2A> \xC2\xAF |0
-<U7C2B> \xC2\xAD |0
-<U7C2C> \xF2\xAB |0
-<U7C2D> \xF0\x66 |0
-<U7C30> \xF0\x6C |0
-<U7C33> \xF2\xA8 |0
-<U7C35> \x8E\x70 |0
-<U7C37> \xC3\xB2 |0
-<U7C38> \xC3\xB0 |0
-<U7C39> \xF2\xAA |0
-<U7C3B> \xF2\xAC |0
-<U7C3C> \xF2\xA9 |0
-<U7C3D> \xC3\xB1 |0
-<U7C3E> \xC3\xAE |0
-<U7C3F> \xC3\xAF |0
-<U7C40> \xC3\xB3 |0
-<U7C42> \x9F\x61 |0
-<U7C43> \xC4\x78 |0
-<U7C44> \x8E\x72 |0
-<U7C45> \xF4\xAA |0
-<U7C47> \xF4\xA9 |0
-<U7C48> \xF4\xA7 |0
-<U7C49> \xF4\xA6 |0
-<U7C4A> \xF4\xA8 |0
-<U7C4C> \xC4\x77 |0
-<U7C4D> \xC4\x79 |0
-<U7C50> \xC4\xF0 |0
-<U7C51> \xA0\x6B |0
-<U7C53> \xF5\xE5 |0
-<U7C54> \xF5\xE4 |0
-<U7C56> \x9F\x40 |0
-<U7C57> \xF6\xFA |0
-<U7C59> \xF6\xFC |0
-<U7C5A> \xF6\xFE |0
-<U7C5B> \xF6\xFD |0
-<U7C5C> \xF6\xFB |0
-<U7C5D> \x94\xED |0
-<U7C5F> \xC5\xA3 |0
-<U7C60> \xC5\xA2 |0
-<U7C63> \xC5\xD3 |0
-<U7C64> \xC5\xD2 |0
-<U7C65> \xC5\xD4 |0
-<U7C66> \xF7\xED |0
-<U7C67> \xF7\xEC |0
-<U7C69> \xF8\xFB |0
-<U7C6A> \xF8\xB8 |0
-<U7C6B> \xF8\xFC |0
-<U7C6C> \xC6\x58 |0
-<U7C6D> \x94\xEE |0
-<U7C6E> \xC6\x59 |0
-<U7C6F> \xF9\x6D |0
-<U7C70> \x9F\xBD |0
-<U7C72> \xC6\x7E |0
-<U7C73> \xA6\xCC |0
-<U7C74> \x8E\x7B |0
-<U7C75> \xCD\xA8 |0
-<U7C78> \xD0\x45 |0
-<U7C79> \xD0\x46 |0
-<U7C7A> \xD0\x44 |0
-<U7C7B> \x99\x57 |0
-<U7C7C> \x94\xF7 |0
-<U7C7D> \xAC\xF3 |0
-<U7C7E> \x9F\x5F |0
-<U7C7F> \xD0\x47 |0
-<U7C80> \xD0\x48 |0
-<U7C81> \xD0\x49 |0
-<U7C83> \x8E\x73 |0
-<U7C84> \xD3\x49 |0
-<U7C85> \xD3\x4F |0
-<U7C86> \x9F\x62 |0
-<U7C88> \xD3\x4D |0
-<U7C89> \xAF\xBB |0
-<U7C8A> \xD3\x4B |0
-<U7C8C> \xD3\x4C |0
-<U7C8D> \xD3\x4E |0
-<U7C8E> \x94\xF6 |0
-<U7C91> \xD3\x4A |0
-<U7C92> \xB2\xC9 |0
-<U7C94> \xD6\xDE |0
-<U7C95> \xB2\xCB |0
-<U7C96> \xD6\xE0 |0
-<U7C97> \xB2\xCA |0
-<U7C98> \xD6\xDF |0
-<U7C9C> \x99\x58 |0
-<U7C9E> \xDA\xE8 |0
-<U7C9F> \xB5\xAF |0
-<U7CA1> \xDA\xEA |0
-<U7CA2> \xDA\xE7 |0
-<U7CA3> \xD6\xE1 |0
-<U7CA5> \xB5\xB0 |0
-<U7CA6> \x8E\x75 |0
-<U7CA7> \xF9\xDB |0
-<U7CA8> \xDA\xE9 |0
-<U7CAC> \x90\x72 |0
-<U7CAE> \x94\xF8 |0
-<U7CAF> \xDF\x56 |0
-<U7CB1> \xB8\x64 |0
-<U7CB2> \xDF\x54 |0
-<U7CB3> \xB8\x65 |0
-<U7CB4> \xDF\x55 |0
-<U7CB5> \xB8\x66 |0
-<U7CB8> \x99\x5A |0
-<U7CB9> \xBA\xE9 |0
-<U7CBA> \xE3\x61 |0
-<U7CBB> \xE3\x5E |0
-<U7CBC> \xE3\x60 |0
-<U7CBD> \xBA\xEA |0
-<U7CBE> \xBA\xEB |0
-<U7CBF> \xE3\x5F |0
-<U7CC2> \xA0\xB0 |0
-<U7CC5> \xE6\xDF |0
-<U7CC7> \x8E\x79 |0
-<U7CC8> \xE6\xE0 |0
-<U7CC9> \x8E\x78 |0
-<U7CCA> \xBD\x6B |0
-<U7CCB> \xE6\xE2 |0
-<U7CCC> \xE6\xE1 |0
-<U7CCD> \x94\xF3 |0
-<U7CCE> \xA2\x61 |0
-<U7CD0> \xEA\xCA |0
-<U7CD1> \xEA\xCB |0
-<U7CD2> \xEA\xC7 |0
-<U7CD3> \x98\xAF |0
-<U7CD4> \xEA\xC8 |0
-<U7CD5> \xBF\x7C |0
-<U7CD6> \xBF\x7D |0
-<U7CD7> \xEA\xC9 |0
-<U7CD9> \xC1\x57 |0
-<U7CDA> \xA0\xB2 |0
-<U7CDC> \xC1\x53 |0
-<U7CDD> \xC1\x58 |0
-<U7CDE> \xC1\x54 |0
-<U7CDF> \xC1\x56 |0
-<U7CE0> \xC1\x52 |0
-<U7CE2> \xC1\x55 |0
-<U7CE6> \x8E\x7A |0
-<U7CE7> \xC2\xB3 |0
-<U7CE8> \xED\xCF |0
-<U7CEA> \xF2\xAE |0
-<U7CEC> \xF2\xAD |0
-<U7CED> \x99\x5C |0
-<U7CEE> \xF4\xAB |0
-<U7CEF> \xC4\x7A |0
-<U7CF0> \xC4\x7B |0
-<U7CF1> \xF7\x41 |0
-<U7CF2> \xF5\xE6 |0
-<U7CF3> \x8E\x7C |0
-<U7CF4> \xF7\x40 |0
-<U7CF5> \x8E\x7D |0
-<U7CF6> \xF8\xFD |0
-<U7CF7> \xF9\xA4 |0
-<U7CF8> \xA6\xCD |0
-<U7CF9> \x8B\xD9 |0
-<U7CFB> \xA8\x74 |0
-<U7CFC> \x89\xA2 |0
-<U7CFD> \xCD\xA9 |0
-<U7CFE> \xAA\xC8 |0
-<U7D00> \xAC\xF6 |0
-<U7D01> \xD0\x4C |0
-<U7D02> \xAC\xF4 |0
-<U7D03> \xD0\x4A |0
-<U7D04> \xAC\xF9 |0
-<U7D05> \xAC\xF5 |0
-<U7D06> \xAC\xFA |0
-<U7D07> \xAC\xF8 |0
-<U7D08> \xD0\x4B |0
-<U7D09> \xAC\xF7 |0
-<U7D0A> \xAF\xBF |0
-<U7D0B> \xAF\xBE |0
-<U7D0C> \xD3\x5A |0
-<U7D0D> \xAF\xC7 |0
-<U7D0E> \xD3\x53 |0
-<U7D0F> \xD3\x59 |0
-<U7D10> \xAF\xC3 |0
-<U7D11> \xD3\x52 |0
-<U7D12> \xD3\x58 |0
-<U7D13> \xD3\x56 |0
-<U7D14> \xAF\xC2 |0
-<U7D15> \xAF\xC4 |0
-<U7D16> \xD3\x55 |0
-<U7D17> \xAF\xBD |0
-<U7D18> \xD3\x54 |0
-<U7D19> \xAF\xC8 |0
-<U7D1A> \xAF\xC5 |0
-<U7D1B> \xAF\xC9 |0
-<U7D1C> \xAF\xC6 |0
-<U7D1D> \xD3\x51 |0
-<U7D1E> \xD3\x50 |0
-<U7D1F> \xD3\x57 |0
-<U7D20> \xAF\xC0 |0
-<U7D21> \xAF\xBC |0
-<U7D22> \xAF\xC1 |0
-<U7D25> \x9E\xD7 |0
-<U7D28> \xD6\xF0 |0
-<U7D29> \xD6\xE9 |0
-<U7D2B> \xB5\xB5 |0
-<U7D2C> \xD6\xE8 |0
-<U7D2E> \xB2\xCF |0
-<U7D2F> \xB2\xD6 |0
-<U7D30> \xB2\xD3 |0
-<U7D31> \xB2\xD9 |0
-<U7D32> \xB2\xD8 |0
-<U7D33> \xB2\xD4 |0
-<U7D35> \xD6\xE2 |0
-<U7D36> \xD6\xE5 |0
-<U7D38> \xD6\xE4 |0
-<U7D39> \xB2\xD0 |0
-<U7D3A> \xD6\xE6 |0
-<U7D3B> \xD6\xEF |0
-<U7D3C> \xB2\xD1 |0
-<U7D3D> \xD6\xE3 |0
-<U7D3E> \xD6\xEC |0
-<U7D3F> \xD6\xED |0
-<U7D40> \xB2\xD2 |0
-<U7D41> \xD6\xEA |0
-<U7D42> \xB2\xD7 |0
-<U7D43> \xB2\xCD |0
-<U7D44> \xB2\xD5 |0
-<U7D45> \xD6\xE7 |0
-<U7D46> \xB2\xCC |0
-<U7D47> \xD6\xEB |0
-<U7D4A> \xD6\xEE |0
-<U7D4D> \xA0\xB6 |0
-<U7D4E> \xDA\xFB |0
-<U7D4F> \xDA\xF2 |0
-<U7D50> \xB5\xB2 |0
-<U7D51> \xDA\xF9 |0
-<U7D52> \xDA\xF6 |0
-<U7D53> \xDA\xEE |0
-<U7D54> \xDA\xF7 |0
-<U7D55> \xB5\xB4 |0
-<U7D56> \xDA\xEF |0
-<U7D58> \xDA\xEB |0
-<U7D5A> \x9E\x42 |0
-<U7D5B> \xB8\x6C |0
-<U7D5C> \xDA\xF4 |0
-<U7D5D> \x8E\xA4 |0
-<U7D5E> \xB5\xB1 |0
-<U7D5F> \xDA\xFA |0
-<U7D61> \xB5\xB8 |0
-<U7D62> \xB5\xBA |0
-<U7D63> \xDA\xED |0
-<U7D66> \xB5\xB9 |0
-<U7D67> \xDA\xF0 |0
-<U7D68> \xB5\xB3 |0
-<U7D69> \xDA\xF8 |0
-<U7D6A> \xDA\xF1 |0
-<U7D6B> \xDA\xF5 |0
-<U7D6D> \xDA\xF3 |0
-<U7D6E> \xB5\xB6 |0
-<U7D6F> \xDA\xEC |0
-<U7D70> \xB5\xBB |0
-<U7D71> \xB2\xCE |0
-<U7D72> \xB5\xB7 |0
-<U7D73> \xB5\xBC |0
-<U7D79> \xB8\x68 |0
-<U7D7A> \xDF\x5D |0
-<U7D7B> \xDF\x5F |0
-<U7D7C> \xDF\x61 |0
-<U7D7D> \xDF\x65 |0
-<U7D7F> \xDF\x5B |0
-<U7D80> \xDF\x59 |0
-<U7D81> \xB8\x6A |0
-<U7D83> \xDF\x60 |0
-<U7D84> \xDF\x64 |0
-<U7D85> \xDF\x5C |0
-<U7D86> \xDF\x58 |0
-<U7D88> \xDF\x57 |0
-<U7D89> \x8E\xA7 |0
-<U7D8C> \xDF\x62 |0
-<U7D8D> \xDF\x5A |0
-<U7D8E> \xDF\x5E |0
-<U7D8F> \xB8\x6B |0
-<U7D91> \xB8\x69 |0
-<U7D92> \xDF\x66 |0
-<U7D93> \xB8\x67 |0
-<U7D94> \xDF\x63 |0
-<U7D96> \xE3\x72 |0
-<U7D97> \x95\x42 |0
-<U7D9C> \xBA\xEE |0
-<U7D9D> \xE3\x6A |0
-<U7D9E> \xBD\x78 |0
-<U7D9F> \xE3\x74 |0
-<U7DA0> \xBA\xF1 |0
-<U7DA1> \xE3\x78 |0
-<U7DA2> \xBA\xF7 |0
-<U7DA3> \xE3\x65 |0
-<U7DA4> \x98\x7D |0
-<U7DA6> \xE3\x75 |0
-<U7DA7> \xE3\x62 |0
-<U7DA8> \x97\x55 |0
-<U7DA9> \xE3\x77 |0
-<U7DAA> \xE3\x66 |0
-<U7DAB> \x8E\xA8 |0
-<U7DAC> \xBA\xFE |0
-<U7DAD> \xBA\xFB |0
-<U7DAE> \xE3\x76 |0
-<U7DAF> \xE3\x70 |0
-<U7DB0> \xBA\xED |0
-<U7DB1> \xBA\xF5 |0
-<U7DB2> \xBA\xF4 |0
-<U7DB3> \x8E\xAA |0
-<U7DB4> \xBA\xF3 |0
-<U7DB5> \xBA\xF9 |0
-<U7DB7> \xE3\x63 |0
-<U7DB8> \xBA\xFA |0
-<U7DB9> \xE3\x71 |0
-<U7DBA> \xBA\xF6 |0
-<U7DBB> \xBA\xEC |0
-<U7DBC> \xE3\x73 |0
-<U7DBD> \xBA\xEF |0
-<U7DBE> \xBA\xF0 |0
-<U7DBF> \xBA\xF8 |0
-<U7DC0> \xE3\x68 |0
-<U7DC1> \xE3\x67 |0
-<U7DC2> \xE3\x64 |0
-<U7DC4> \xE3\x6C |0
-<U7DC5> \xE3\x69 |0
-<U7DC6> \xE3\x6D |0
-<U7DC7> \xBA\xFD |0
-<U7DC9> \xE3\x79 |0
-<U7DCA> \xBA\xF2 |0
-<U7DCB> \xE3\x6E |0
-<U7DCC> \xE3\x6F |0
-<U7DCD> \x89\xA3 |0
-<U7DCE> \xE3\x6B |0
-<U7DCF> \x99\x60 |0
-<U7DD0> \x99\x62 |0
-<U7DD2> \xBA\xFC |0
-<U7DD3> \x94\xFC |0
-<U7DD4> \x99\x61 |0
-<U7DD7> \xE6\xE7 |0
-<U7DD8> \xBD\x70 |0
-<U7DD9> \xBD\x79 |0
-<U7DDA> \xBD\x75 |0
-<U7DDB> \xE6\xE4 |0
-<U7DDC> \x94\xFA |0
-<U7DDD> \xBD\x72 |0
-<U7DDE> \xBD\x76 |0
-<U7DDF> \xE6\xF0 |0
-<U7DE0> \xBD\x6C |0
-<U7DE1> \xE6\xE8 |0
-<U7DE3> \xBD\x74 |0
-<U7DE4> \x8E\xAE |0
-<U7DE5> \x8E\xB2 |0
-<U7DE6> \xE6\xEB |0
-<U7DE7> \xE6\xE6 |0
-<U7DE8> \xBD\x73 |0
-<U7DE9> \xBD\x77 |0
-<U7DEA> \xE6\xE5 |0
-<U7DEC> \xBD\x71 |0
-<U7DEE> \xE6\xEF |0
-<U7DEF> \xBD\x6E |0
-<U7DF0> \xE6\xEE |0
-<U7DF1> \xE6\xED |0
-<U7DF2> \xBD\x7A |0
-<U7DF3> \xE5\x72 |0
-<U7DF4> \xBD\x6D |0
-<U7DF5> \x8E\xB0 |0
-<U7DF6> \xE6\xEC |0
-<U7DF7> \xE6\xE3 |0
-<U7DF9> \xBD\x7B |0
-<U7DFA> \xE6\xEA |0
-<U7DFB> \xBD\x6F |0
-<U7DFD> \x99\x63 |0
-<U7DFE> \x97\xAA |0
-<U7E03> \xE6\xE9 |0
-<U7E07> \x94\xFB |0
-<U7E08> \xBF\xA2 |0
-<U7E09> \xBF\xA7 |0
-<U7E0A> \xBF\x7E |0
-<U7E0B> \xEA\xD8 |0
-<U7E0C> \xEA\xCF |0
-<U7E0D> \xEA\xDB |0
-<U7E0E> \xEA\xD3 |0
-<U7E0F> \xEA\xD9 |0
-<U7E10> \xBF\xA8 |0
-<U7E11> \xBF\xA1 |0
-<U7E12> \xEA\xCC |0
-<U7E13> \xEA\xD2 |0
-<U7E14> \xEA\xDC |0
-<U7E15> \xEA\xD5 |0
-<U7E16> \xEA\xDA |0
-<U7E17> \xEA\xCE |0
-<U7E1A> \xEA\xD6 |0
-<U7E1B> \xBF\xA3 |0
-<U7E1C> \xEA\xD4 |0
-<U7E1D> \xBF\xA6 |0
-<U7E1E> \xBF\xA5 |0
-<U7E1F> \xEA\xD0 |0
-<U7E20> \xEA\xD1 |0
-<U7E21> \xEA\xCD |0
-<U7E22> \xEA\xD7 |0
-<U7E23> \xBF\xA4 |0
-<U7E24> \xEA\xDE |0
-<U7E25> \xEA\xDD |0
-<U7E27> \x8E\xBB |0
-<U7E29> \xED\xDA |0
-<U7E2A> \xED\xD6 |0
-<U7E2B> \xC1\x5F |0
-<U7E2D> \xED\xD0 |0
-<U7E2E> \xC1\x59 |0
-<U7E2F> \xC1\x69 |0
-<U7E30> \xED\xDC |0
-<U7E31> \xC1\x61 |0
-<U7E32> \xC1\x5D |0
-<U7E33> \xED\xD3 |0
-<U7E34> \xC1\x64 |0
-<U7E35> \xC1\x67 |0
-<U7E36> \xED\xDE |0
-<U7E37> \xC1\x5C |0
-<U7E38> \xED\xD5 |0
-<U7E39> \xC1\x65 |0
-<U7E3A> \xED\xE0 |0
-<U7E3B> \xED\xDD |0
-<U7E3C> \xED\xD1 |0
-<U7E3D> \xC1\x60 |0
-<U7E3E> \xC1\x5A |0
-<U7E3F> \xC1\x68 |0
-<U7E40> \xED\xD8 |0
-<U7E41> \xC1\x63 |0
-<U7E42> \xED\xD2 |0
-<U7E43> \xC1\x5E |0
-<U7E44> \xED\xDF |0
-<U7E45> \xC1\x62 |0
-<U7E46> \xC1\x5B |0
-<U7E47> \xED\xD9 |0
-<U7E48> \xC1\x66 |0
-<U7E49> \xED\xD7 |0
-<U7E4C> \xED\xDB |0
-<U7E50> \xF0\x6E |0
-<U7E51> \xF0\x74 |0
-<U7E52> \xC2\xB9 |0
-<U7E53> \xF0\x77 |0
-<U7E54> \xC2\xB4 |0
-<U7E55> \xC2\xB5 |0
-<U7E56> \xF0\x6F |0
-<U7E57> \xF0\x76 |0
-<U7E58> \xF0\x71 |0
-<U7E59> \xC2\xBA |0
-<U7E5A> \xC2\xB7 |0
-<U7E5C> \xF0\x6D |0
-<U7E5E> \xC2\xB6 |0
-<U7E5F> \xF0\x73 |0
-<U7E60> \xF0\x75 |0
-<U7E61> \xC2\xB8 |0
-<U7E62> \xF0\x72 |0
-<U7E63> \xF0\x70 |0
-<U7E65> \x98\x76 |0
-<U7E67> \x8E\xA1 |0
-<U7E68> \xF2\xB8 |0
-<U7E69> \xC3\xB7 |0
-<U7E6A> \xC3\xB8 |0
-<U7E6B> \xC3\xB4 |0
-<U7E6D> \xC3\xB5 |0
-<U7E6E> \x8E\xB7 |0
-<U7E6F> \xF2\xB4 |0
-<U7E70> \xF2\xB2 |0
-<U7E72> \xF2\xB6 |0
-<U7E73> \xC3\xBA |0
-<U7E74> \xF2\xB7 |0
-<U7E75> \xF2\xB0 |0
-<U7E76> \xF2\xAF |0
-<U7E77> \xF2\xB3 |0
-<U7E78> \xF2\xB1 |0
-<U7E79> \xC3\xB6 |0
-<U7E7A> \xF2\xB5 |0
-<U7E7B> \xF4\xAC |0
-<U7E7C> \xC4\x7E |0
-<U7E7D> \xC4\x7D |0
-<U7E7E> \xF4\xAD |0
-<U7E7F> \x9D\xA6 |0
-<U7E80> \xF4\xAF |0
-<U7E81> \xF4\xAE |0
-<U7E82> \xC4\xA1 |0
-<U7E86> \xF5\xEB |0
-<U7E87> \xF5\xE8 |0
-<U7E88> \xF5\xE9 |0
-<U7E8A> \xF5\xE7 |0
-<U7E8B> \xF5\xEA |0
-<U7E8C> \xC4\xF2 |0
-<U7E8D> \xF5\xEC |0
-<U7E8E> \x9E\xB0 |0
-<U7E8F> \xC4\xF1 |0
-<U7E91> \xF7\x42 |0
-<U7E92> \x8E\xB8 |0
-<U7E93> \xC5\xD5 |0
-<U7E94> \xC5\xD7 |0
-<U7E95> \xF7\xEE |0
-<U7E96> \xC5\xD6 |0
-<U7E97> \xF8\xB9 |0
-<U7E98> \xF9\x40 |0
-<U7E99> \xF9\x42 |0
-<U7E9A> \xF8\xFE |0
-<U7E9B> \xF9\x41 |0
-<U7E9C> \xC6\x6C |0
-<U7E9F> \x9D\x70 |0
-<U7EA4> \x89\x6E |0
-<U7EAC> \x89\x6F |0
-<U7EBA> \x89\x70 |0
-<U7EC7> \x89\x71 |0
-<U7ECF> \x89\x72 |0
-<U7EDF> \x89\x73 |0
-<U7F06> \x89\x74 |0
-<U7F36> \xA6\xCE |0
-<U7F37> \x89\x75 |0
-<U7F38> \xAC\xFB |0
-<U7F39> \xD2\x6F |0
-<U7F3A> \xAF\xCA |0
-<U7F3D> \xB2\xDA |0
-<U7F3E> \xDA\xFC |0
-<U7F3F> \xDA\xFD |0
-<U7F40> \x8E\xBC |0
-<U7F41> \x8E\xBD |0
-<U7F43> \xEA\xDF |0
-<U7F44> \xC1\x6A |0
-<U7F45> \xED\xE1 |0
-<U7F47> \x8E\xBE |0
-<U7F48> \xC2\xBB |0
-<U7F49> \x9D\xD1 |0
-<U7F4A> \xF2\xBA |0
-<U7F4B> \xF2\xB9 |0
-<U7F4C> \xC4\xA2 |0
-<U7F4D> \xF5\xED |0
-<U7F4E> \x94\xFD |0
-<U7F4F> \xF7\x43 |0
-<U7F50> \xC5\xF8 |0
-<U7F51> \xCA\x49 |0
-<U7F52> \x8B\xD7 |0
-<U7F53> \x8B\xDA |0
-<U7F54> \xAA\xC9 |0
-<U7F55> \xA8\x75 |0
-<U7F58> \xD0\x4D |0
-<U7F5B> \xD3\x60 |0
-<U7F5C> \xD3\x5B |0
-<U7F5D> \xD3\x5F |0
-<U7F5E> \xD3\x5D |0
-<U7F5F> \xAF\xCB |0
-<U7F60> \xD3\x5E |0
-<U7F61> \xD3\x5C |0
-<U7F63> \xD6\xF1 |0
-<U7F65> \xDA\xFE |0
-<U7F66> \xDB\x40 |0
-<U7F67> \xDF\x69 |0
-<U7F68> \xDF\x6A |0
-<U7F69> \xB8\x6E |0
-<U7F6A> \xB8\x6F |0
-<U7F6B> \xDF\x68 |0
-<U7F6C> \xDF\x6B |0
-<U7F6D> \xDF\x67 |0
-<U7F6E> \xB8\x6D |0
-<U7F70> \xBB\x40 |0
-<U7F71> \xA0\xE2 |0
-<U7F72> \xB8\x70 |0
-<U7F73> \xE3\x7A |0
-<U7F75> \xBD\x7C |0
-<U7F76> \xE6\xF1 |0
-<U7F77> \xBD\x7D |0
-<U7F78> \x9F\xE9 |0
-<U7F79> \xBF\xA9 |0
-<U7F7A> \xEA\xE2 |0
-<U7F7B> \xEA\xE0 |0
-<U7F7C> \xEA\xE1 |0
-<U7F7D> \xED\xE4 |0
-<U7F7E> \xED\xE3 |0
-<U7F7F> \xED\xE2 |0
-<U7F83> \xF2\xBB |0
-<U7F85> \xC3\xB9 |0
-<U7F86> \xF2\xBC |0
-<U7F87> \xF7\x44 |0
-<U7F88> \xC5\xF9 |0
-<U7F89> \xF8\xBA |0
-<U7F8A> \xA6\xCF |0
-<U7F8B> \xAA\xCB |0
-<U7F8C> \xAA\xCA |0
-<U7F8D> \xD0\x4F |0
-<U7F8E> \xAC\xFC |0
-<U7F8F> \xFD\xA8 |0
-<U7F91> \xD0\x4E |0
-<U7F92> \xD3\x62 |0
-<U7F93> \x8A\xE7 |0
-<U7F94> \xAF\xCC |0
-<U7F95> \xD6\xF2 |0
-<U7F96> \xD3\x61 |0
-<U7F97> \x8E\xC2 |0
-<U7F9A> \xB2\xDC |0
-<U7F9B> \xD6\xF5 |0
-<U7F9C> \xD6\xF3 |0
-<U7F9D> \xD6\xF4 |0
-<U7F9E> \xB2\xDB |0
-<U7FA0> \xDB\x42 |0
-<U7FA1> \xDB\x43 |0
-<U7FA2> \xDB\x41 |0
-<U7FA3> \x8E\xC4 |0
-<U7FA4> \xB8\x73 |0
-<U7FA5> \xDF\x6D |0
-<U7FA6> \xDF\x6C |0
-<U7FA7> \xDF\x6E |0
-<U7FA8> \xB8\x72 |0
-<U7FA9> \xB8\x71 |0
-<U7FAC> \xE6\xF2 |0
-<U7FAD> \xE6\xF4 |0
-<U7FAE> \x99\x64 |0
-<U7FAF> \xBD\x7E |0
-<U7FB0> \xE6\xF3 |0
-<U7FB1> \xEA\xE3 |0
-<U7FB2> \xBF\xAA |0
-<U7FB3> \xF0\x79 |0
-<U7FB4> \x99\x65 |0
-<U7FB5> \xF0\x78 |0
-<U7FB6> \xC3\xBB |0
-<U7FB7> \xF2\xBD |0
-<U7FB8> \xC3\xBD |0
-<U7FB9> \xC3\xBC |0
-<U7FBA> \xF4\xB0 |0
-<U7FBB> \xF5\xEE |0
-<U7FBC> \xC4\xF3 |0
-<U7FBD> \xA6\xD0 |0
-<U7FBE> \xD0\x50 |0
-<U7FBF> \xAC\xFD |0
-<U7FC0> \xD3\x65 |0
-<U7FC1> \xAF\xCE |0
-<U7FC2> \xD3\x64 |0
-<U7FC3> \xD3\x63 |0
-<U7FC5> \xAF\xCD |0
-<U7FC7> \xD6\xFB |0
-<U7FC9> \xD6\xFD |0
-<U7FCA> \xD6\xF6 |0
-<U7FCB> \xD6\xF7 |0
-<U7FCC> \xB2\xDD |0
-<U7FCD> \xD6\xF8 |0
-<U7FCE> \xB2\xDE |0
-<U7FCF> \xD6\xFC |0
-<U7FD0> \xD6\xF9 |0
-<U7FD1> \xD6\xFA |0
-<U7FD2> \xB2\xDF |0
-<U7FD4> \xB5\xBE |0
-<U7FD5> \xB5\xBF |0
-<U7FD7> \xDB\x44 |0
-<U7FDB> \xDF\x6F |0
-<U7FDC> \xDF\x70 |0
-<U7FDD> \x95\x4E |0
-<U7FDE> \xE3\x7E |0
-<U7FDF> \xBB\x43 |0
-<U7FE0> \xBB\x41 |0
-<U7FE1> \xBB\x42 |0
-<U7FE2> \xE3\x7B |0
-<U7FE3> \xE3\x7C |0
-<U7FE5> \xE3\x7D |0
-<U7FE6> \xE6\xF9 |0
-<U7FE7> \x98\xB3 |0
-<U7FE8> \xE6\xFA |0
-<U7FE9> \xBD\xA1 |0
-<U7FEA> \xE6\xF7 |0
-<U7FEB> \xE6\xF6 |0
-<U7FEC> \xE6\xF8 |0
-<U7FED> \xE6\xF5 |0
-<U7FEE> \xBF\xAD |0
-<U7FEF> \xEA\xE4 |0
-<U7FF0> \xBF\xAB |0
-<U7FF1> \xBF\xAC |0
-<U7FF2> \xED\xE6 |0
-<U7FF3> \xC1\x6B |0
-<U7FF4> \xED\xE5 |0
-<U7FF5> \xEF\xA8 |0
-<U7FF7> \xF0\x7A |0
-<U7FF8> \xF0\x7B |0
-<U7FF9> \xC2\xBC |0
-<U7FFA> \x8E\xCB |0
-<U7FFB> \xC2\xBD |0
-<U7FFC> \xC1\x6C |0
-<U7FFD> \xF2\xBE |0
-<U7FFE> \xF2\xBF |0
-<U7FFF> \xF4\xB1 |0
-<U8000> \xC4\xA3 |0
-<U8001> \xA6\xD1 |0
-<U8002> \x8B\xDF |0
-<U8003> \xA6\xD2 |0
-<U8004> \xAC\xFE |0
-<U8005> \xAA\xCC |0
-<U8006> \xAF\xCF |0
-<U8007> \xD0\x51 |0
-<U8008> \x8E\xCE |0
-<U800B> \xB5\xC0 |0
-<U800C> \xA6\xD3 |0
-<U800D> \xAD\x41 |0
-<U800E> \xD0\x52 |0
-<U800F> \xD0\x53 |0
-<U8010> \xAD\x40 |0
-<U8011> \xAD\x42 |0
-<U8012> \xA6\xD4 |0
-<U8014> \xD0\x54 |0
-<U8015> \xAF\xD1 |0
-<U8016> \xD3\x66 |0
-<U8017> \xAF\xD3 |0
-<U8018> \xAF\xD0 |0
-<U8019> \xAF\xD2 |0
-<U801B> \xD7\x41 |0
-<U801C> \xB2\xE0 |0
-<U801D> \x8E\xCF |0
-<U801E> \xD7\x40 |0
-<U801F> \xD6\xFE |0
-<U8020> \x99\x68 |0
-<U8021> \xDF\x71 |0
-<U8024> \xE3\xA1 |0
-<U8025> \x99\x69 |0
-<U8026> \xBD\xA2 |0
-<U8028> \xBF\xAE |0
-<U8029> \xEA\xE6 |0
-<U802A> \xEA\xE5 |0
-<U802C> \xED\xE7 |0
-<U802E> \x99\x6B |0
-<U802F> \x8E\xD1 |0
-<U8030> \xF5\xEF |0
-<U8031> \x99\x6C |0
-<U8033> \xA6\xD5 |0
-<U8034> \xCB\x73 |0
-<U8035> \xCD\xAA |0
-<U8036> \xAD\x43 |0
-<U8037> \xD0\x55 |0
-<U8039> \xD3\x68 |0
-<U803B> \x8E\xD4 |0
-<U803C> \x8E\xD5 |0
-<U803D> \xAF\xD4 |0
-<U803E> \xD3\x67 |0
-<U803F> \xAF\xD5 |0
-<U8043> \xD7\x43 |0
-<U8046> \xB2\xE2 |0
-<U8047> \xD7\x42 |0
-<U8048> \xD7\x44 |0
-<U804A> \xB2\xE1 |0
-<U804F> \xDB\x46 |0
-<U8050> \xDB\x47 |0
-<U8051> \xDB\x45 |0
-<U8052> \xB5\xC1 |0
-<U8054> \x99\x6D |0
-<U8056> \xB8\x74 |0
-<U8058> \xB8\x75 |0
-<U805A> \xBB\x45 |0
-<U805B> \xA0\xBE |0
-<U805C> \xE3\xA3 |0
-<U805D> \xE3\xA2 |0
-<U805E> \xBB\x44 |0
-<U8061> \x8E\xD6 |0
-<U8062> \xA0\xBC |0
-<U8063> \xA0\xB5 |0
-<U8064> \xE6\xFB |0
-<U8066> \xA0\xB4 |0
-<U8067> \xE6\xFC |0
-<U806C> \xEA\xE7 |0
-<U806F> \xC1\x70 |0
-<U8070> \xC1\x6F |0
-<U8071> \xC1\x6D |0
-<U8072> \xC1\x6E |0
-<U8073> \xC1\x71 |0
-<U8075> \xF0\x7C |0
-<U8076> \xC2\xBF |0
-<U8077> \xC2\xBE |0
-<U8078> \xF2\xC0 |0
-<U8079> \xF4\xB2 |0
-<U807D> \xC5\xA5 |0
-<U807E> \xC5\xA4 |0
-<U807F> \xA6\xD6 |0
-<U8080> \x8B\xE0 |0
-<U8082> \xD1\xFB |0
-<U8084> \xB8\x77 |0
-<U8085> \xB5\xC2 |0
-<U8086> \xB8\x76 |0
-<U8087> \xBB\x46 |0
-<U8089> \xA6\xD7 |0
-<U808A> \xC9\xA9 |0
-<U808B> \xA6\xD8 |0
-<U808C> \xA6\xD9 |0
-<U808F> \xCD\xAB |0
-<U8090> \xCB\x76 |0
-<U8092> \xCB\x77 |0
-<U8093> \xA8\x77 |0
-<U8095> \xCB\x74 |0
-<U8096> \xA8\x76 |0
-<U8098> \xA8\x79 |0
-<U8099> \xCB\x75 |0
-<U809A> \xA8\x7B |0
-<U809B> \xA8\x7A |0
-<U809C> \xCB\x78 |0
-<U809D> \xA8\x78 |0
-<U809F> \x89\xB5 |0
-<U80A1> \xAA\xD1 |0
-<U80A2> \xAA\xCF |0
-<U80A3> \xCD\xAD |0
-<U80A5> \xAA\xCE |0
-<U80A7> \x8E\xDD |0
-<U80A9> \xAA\xD3 |0
-<U80AA> \xAA\xD5 |0
-<U80AB> \xAA\xD2 |0
-<U80AD> \xCD\xB0 |0
-<U80AE> \xCD\xAC |0
-<U80AF> \xAA\xD6 |0
-<U80B1> \xAA\xD0 |0
-<U80B2> \xA8\x7C |0
-<U80B4> \xAA\xD4 |0
-<U80B5> \xCD\xAF |0
-<U80B6> \x9E\x5D |0
-<U80B7> \x99\x71 |0
-<U80B8> \xCD\xAE |0
-<U80BA> \xAA\xCD |0
-<U80BC> \x89\xAE |0
-<U80BD> \x9D\xE8 |0
-<U80C2> \xD0\x5B |0
-<U80C3> \xAD\x47 |0
-<U80C4> \xAD\x48 |0
-<U80C5> \xD0\x5D |0
-<U80C6> \x95\x65 |0
-<U80C7> \xD0\x57 |0
-<U80C8> \xD0\x5A |0
-<U80C9> \xD0\x63 |0
-<U80CA> \xD0\x61 |0
-<U80CC> \xAD\x49 |0
-<U80CD> \xD0\x67 |0
-<U80CE> \xAD\x4C |0
-<U80CF> \xD0\x64 |0
-<U80D0> \xD0\x5C |0
-<U80D1> \xD0\x59 |0
-<U80D4> \xDB\x49 |0
-<U80D5> \xD0\x62 |0
-<U80D6> \xAD\x44 |0
-<U80D7> \xD0\x65 |0
-<U80D8> \xD0\x56 |0
-<U80D9> \xD0\x5F |0
-<U80DA> \xAD\x46 |0
-<U80DB> \xAD\x4B |0
-<U80DC> \xD0\x60 |0
-<U80DD> \xAD\x4F |0
-<U80DE> \xAD\x4D |0
-<U80E0> \xD0\x58 |0
-<U80E1> \xAD\x4A |0
-<U80E3> \xD0\x5E |0
-<U80E4> \xAD\x4E |0
-<U80E5> \xAD\x45 |0
-<U80E6> \xD0\x66 |0
-<U80E9> \x99\x72 |0
-<U80EC> \x8B\x5C |0
-<U80ED> \xAF\xDA |0
-<U80EF> \xAF\xE3 |0
-<U80F0> \xAF\xD8 |0
-<U80F1> \xAF\xD6 |0
-<U80F2> \xD3\x6A |0
-<U80F3> \xAF\xDE |0
-<U80F4> \xAF\xDB |0
-<U80F5> \xD3\x6C |0
-<U80F6> \x89\xB1 |0
-<U80F8> \xAF\xDD |0
-<U80F9> \xD3\x6B |0
-<U80FA> \xD3\x69 |0
-<U80FB> \xD3\x6E |0
-<U80FC> \xAF\xE2 |0
-<U80FD> \xAF\xE0 |0
-<U80FE> \xDB\x48 |0
-<U8100> \xD3\x6F |0
-<U8101> \xD3\x6D |0
-<U8102> \xAF\xD7 |0
-<U8103> \xA0\xC0 |0
-<U8105> \xAF\xD9 |0
-<U8106> \xAF\xDC |0
-<U8107> \x8E\xDF |0
-<U8108> \xAF\xDF |0
-<U8109> \x95\x66 |0
-<U810A> \xAF\xE1 |0
-<U810C> \x99\x74 |0
-<U810E> \x99\x76 |0
-<U8112> \x99\x77 |0
-<U8114> \x99\x79 |0
-<U8115> \xD7\x4E |0
-<U8116> \xB2\xE4 |0
-<U8117> \x9D\xDA |0
-<U8118> \xD7\x45 |0
-<U8119> \xD7\x47 |0
-<U811A> \x8E\xE0 |0
-<U811B> \xD7\x48 |0
-<U811D> \xD7\x50 |0
-<U811E> \xD7\x4C |0
-<U811F> \xD7\x4A |0
-<U8121> \xD7\x4D |0
-<U8122> \xD7\x51 |0
-<U8123> \xB2\xE5 |0
-<U8124> \xB2\xE9 |0
-<U8125> \xD7\x46 |0
-<U8127> \xD7\x4F |0
-<U8129> \xB2\xE7 |0
-<U812A> \x93\x5C |0
-<U812B> \xB2\xE6 |0
-<U812C> \xD7\x4B |0
-<U812D> \xD7\x49 |0
-<U812F> \xB2\xE3 |0
-<U8130> \xB2\xE8 |0
-<U8132> \x9D\xE6 |0
-<U8134> \x8B\x5F |0
-<U8137> \x95\x63 |0
-<U8139> \xB5\xC8 |0
-<U813A> \xDB\x51 |0
-<U813D> \xDB\x4F |0
-<U813E> \xB5\xCA |0
-<U8142> \x95\x67 |0
-<U8143> \xDB\x4A |0
-<U8144> \xDF\xA1 |0
-<U8146> \xB5\xC9 |0
-<U8147> \xDB\x4E |0
-<U8148> \x9D\xE3 |0
-<U814A> \xDB\x4B |0
-<U814B> \xB5\xC5 |0
-<U814C> \xB5\xCB |0
-<U814D> \xDB\x50 |0
-<U814E> \xB5\xC7 |0
-<U814F> \xDB\x4D |0
-<U8150> \xBB\x47 |0
-<U8151> \xB5\xC6 |0
-<U8152> \xDB\x4C |0
-<U8153> \xB5\xCC |0
-<U8154> \xB5\xC4 |0
-<U8155> \xB5\xC3 |0
-<U8156> \x99\x7C |0
-<U8159> \x99\x7D |0
-<U815A> \x99\x7E |0
-<U815B> \xDF\x77 |0
-<U815C> \xDF\x75 |0
-<U815E> \xDF\x7B |0
-<U8160> \xDF\x73 |0
-<U8161> \xDF\xA2 |0
-<U8162> \xDF\x78 |0
-<U8164> \xDF\x72 |0
-<U8165> \xB8\x7B |0
-<U8166> \xB8\xA3 |0
-<U8167> \xDF\x7D |0
-<U8169> \xDF\x76 |0
-<U816B> \xB8\x7E |0
-<U816D> \x8B\x5B |0
-<U816E> \xB8\x7C |0
-<U816F> \xDF\x7E |0
-<U8170> \xB8\x79 |0
-<U8171> \xB8\x78 |0
-<U8172> \xDF\x79 |0
-<U8173> \xB8\x7D |0
-<U8174> \xB5\xCD |0
-<U8176> \xDF\x7C |0
-<U8177> \xDF\x74 |0
-<U8178> \xB8\x7A |0
-<U8179> \xB8\xA1 |0
-<U817A> \xB8\xA2 |0
-<U817C> \x99\xA3 |0
-<U817F> \xBB\x4C |0
-<U8180> \xBB\x48 |0
-<U8182> \xBB\x4D |0
-<U8183> \xE3\xA6 |0
-<U8184> \x99\xA4 |0
-<U8186> \xE3\xA5 |0
-<U8187> \xE3\xA7 |0
-<U8188> \xBB\x4A |0
-<U8189> \xE3\xA4 |0
-<U818A> \xBB\x4B |0
-<U818B> \xE3\xAA |0
-<U818C> \xE3\xA9 |0
-<U818D> \xE3\xA8 |0
-<U818F> \xBB\x49 |0
-<U8193> \x99\xA6 |0
-<U8195> \xE7\x41 |0
-<U8197> \xE7\x44 |0
-<U8198> \xBD\xA8 |0
-<U8199> \xE7\x43 |0
-<U819A> \xBD\xA7 |0
-<U819B> \xBD\xA3 |0
-<U819C> \xBD\xA4 |0
-<U819D> \xBD\xA5 |0
-<U819E> \xE7\x40 |0
-<U819F> \xE6\xFE |0
-<U81A0> \xBD\xA6 |0
-<U81A2> \xE7\x42 |0
-<U81A3> \xE6\xFD |0
-<U81A5> \x99\xA8 |0
-<U81A6> \xEA\xE9 |0
-<U81A7> \xEA\xF3 |0
-<U81A8> \xBF\xB1 |0
-<U81A9> \xBF\xB0 |0
-<U81AA> \x8A\xBE |0
-<U81AB> \xEA\xED |0
-<U81AC> \xEA\xEF |0
-<U81AE> \xEA\xEA |0
-<U81B0> \xEA\xEE |0
-<U81B1> \xEA\xE8 |0
-<U81B2> \xEA\xF1 |0
-<U81B3> \xBF\xAF |0
-<U81B4> \xEA\xF0 |0
-<U81B5> \xEA\xEC |0
-<U81B6> \x9E\x61 |0
-<U81B7> \xEA\xF2 |0
-<U81B9> \xEA\xEB |0
-<U81BA> \xC1\x74 |0
-<U81BB> \xED\xE8 |0
-<U81BC> \xED\xEE |0
-<U81BD> \xC1\x78 |0
-<U81BE> \xC1\x7A |0
-<U81BF> \xC1\x77 |0
-<U81C0> \xC1\x76 |0
-<U81C1> \x99\xAA |0
-<U81C2> \xC1\x75 |0
-<U81C3> \xC1\x73 |0
-<U81C4> \xED\xE9 |0
-<U81C5> \xED\xEC |0
-<U81C6> \xC1\x72 |0
-<U81C7> \xED\xED |0
-<U81C8> \xA0\xC8 |0
-<U81C9> \xC1\x79 |0
-<U81CA> \xED\xEB |0
-<U81CC> \xED\xEA |0
-<U81CD> \xC2\xC0 |0
-<U81CF> \xC2\xC1 |0
-<U81D0> \xF0\xA1 |0
-<U81D1> \xF0\x7D |0
-<U81D2> \xF0\x7E |0
-<U81D5> \xF2\xC2 |0
-<U81D7> \xF2\xC1 |0
-<U81D8> \xC3\xBE |0
-<U81D9> \xF4\xB4 |0
-<U81DA> \xC4\xA4 |0
-<U81DB> \xF4\xB3 |0
-<U81DD> \xF5\xF0 |0
-<U81DE> \xF7\x45 |0
-<U81DF> \xC5\xA6 |0
-<U81E0> \xF9\x43 |0
-<U81E1> \xF9\x44 |0
-<U81E2> \xC5\xD8 |0
-<U81E3> \xA6\xDA |0
-<U81E4> \x99\xAB |0
-<U81E5> \xAA\xD7 |0
-<U81E6> \xDB\x52 |0
-<U81E7> \xBB\x4E |0
-<U81E8> \xC1\x7B |0
-<U81E9> \xED\xEF |0
-<U81EA> \xA6\xDB |0
-<U81EC> \xAF\xE5 |0
-<U81ED> \xAF\xE4 |0
-<U81EE> \xDB\x53 |0
-<U81EF> \xFE\xC4 |0
-<U81F2> \xEA\xF4 |0
-<U81F3> \xA6\xDC |0
-<U81F4> \xAD\x50 |0
-<U81F6> \x98\xC2 |0
-<U81F7> \xDB\x54 |0
-<U81F8> \xDB\x55 |0
-<U81F9> \xDB\x56 |0
-<U81FA> \xBB\x4F |0
-<U81FB> \xBF\xB2 |0
-<U81FC> \xA6\xDD |0
-<U81FE> \xAA\xD8 |0
-<U81FF> \xD0\x68 |0
-<U8200> \xAF\xE6 |0
-<U8201> \xD3\x70 |0
-<U8202> \xB2\xEA |0
-<U8204> \xDB\x57 |0
-<U8205> \xB8\xA4 |0
-<U8207> \xBB\x50 |0
-<U8208> \xBF\xB3 |0
-<U8209> \xC1\x7C |0
-<U820A> \xC2\xC2 |0
-<U820B> \xF4\xB5 |0
-<U820C> \xA6\xDE |0
-<U820D> \xAA\xD9 |0
-<U8210> \xAF\xE7 |0
-<U8211> \xD7\x52 |0
-<U8212> \xB5\xCE |0
-<U8214> \xBB\x51 |0
-<U8215> \xE3\xAB |0
-<U8216> \xE7\x45 |0
-<U8218> \x8E\xE8 |0
-<U821A> \xA0\xBA |0
-<U821B> \xA6\xDF |0
-<U821C> \xB5\xCF |0
-<U821D> \xDF\xA3 |0
-<U821E> \xBB\x52 |0
-<U821F> \xA6\xE0 |0
-<U8220> \xCD\xB1 |0
-<U8221> \xD0\x69 |0
-<U8222> \xAD\x51 |0
-<U8225> \xD3\x72 |0
-<U8226> \xFD\x77 |0
-<U8228> \xAF\xEA |0
-<U8229> \x8E\xEE |0
-<U822A> \xAF\xE8 |0
-<U822B> \xAF\xE9 |0
-<U822C> \xAF\xEB |0
-<U822D> \x9E\xBF |0
-<U822F> \xD3\x71 |0
-<U8232> \xD7\x57 |0
-<U8233> \xD7\x54 |0
-<U8234> \xD7\x56 |0
-<U8235> \xB2\xEB |0
-<U8236> \xB2\xED |0
-<U8237> \xB2\xEC |0
-<U8238> \xD7\x53 |0
-<U8239> \xB2\xEE |0
-<U823A> \xD7\x55 |0
-<U823C> \xDB\x58 |0
-<U823D> \xDB\x59 |0
-<U823E> \x89\xC2 |0
-<U823F> \xDB\x5A |0
-<U8240> \xDF\xA6 |0
-<U8242> \xDF\xA7 |0
-<U8244> \xDF\xA5 |0
-<U8245> \xDF\xA8 |0
-<U8247> \xB8\xA5 |0
-<U8249> \xDF\xA4 |0
-<U824B> \xBB\x53 |0
-<U824E> \xE7\x4A |0
-<U824F> \xE7\x46 |0
-<U8250> \xE7\x49 |0
-<U8251> \xE7\x4B |0
-<U8252> \xE7\x48 |0
-<U8253> \xE7\x47 |0
-<U8254> \x99\xAC |0
-<U8255> \xEA\xF5 |0
-<U8256> \xEA\xF6 |0
-<U8257> \xEA\xF7 |0
-<U8258> \xBF\xB4 |0
-<U8259> \xBF\xB5 |0
-<U825A> \xED\xF1 |0
-<U825B> \xED\xF0 |0
-<U825C> \xED\xF2 |0
-<U825E> \xF0\xA3 |0
-<U825F> \xF0\xA2 |0
-<U8261> \xF2\xC4 |0
-<U8262> \x95\x6B |0
-<U8263> \xF2\xC5 |0
-<U8264> \xF2\xC3 |0
-<U8265> \x95\x6C |0
-<U8266> \xC4\xA5 |0
-<U8268> \xF4\xB6 |0
-<U8269> \xF4\xB7 |0
-<U826B> \xF7\x46 |0
-<U826C> \xF7\xEF |0
-<U826D> \xF8\xBB |0
-<U826E> \xA6\xE1 |0
-<U826F> \xA8\x7D |0
-<U8271> \xC1\x7D |0
-<U8272> \xA6\xE2 |0
-<U8274> \xD7\x58 |0
-<U8275> \xDB\x5B |0
-<U8276> \x99\xAF |0
-<U8277> \xC6\x41 |0
-<U8278> \xCA\x4A |0
-<U8279> \x99\x4A |0
-<U827A> \x89\x76 |0
-<U827B> \x8F\x48 |0
-<U827C> \xCA\x4B |0
-<U827D> \xCA\x4D |0
-<U827E> \xA6\xE3 |0
-<U827F> \xCA\x4E |0
-<U8280> \xCA\x4C |0
-<U8283> \xCB\xA2 |0
-<U8284> \xCB\xA3 |0
-<U8285> \xCB\x7B |0
-<U8287> \xFB\xEE |0
-<U828A> \xCB\xA1 |0
-<U828B> \xA8\xA1 |0
-<U828D> \xA8\xA2 |0
-<U828E> \xCB\x7C |0
-<U828F> \xCB\x7A |0
-<U8290> \xCB\x79 |0
-<U8291> \xCB\x7D |0
-<U8292> \xA8\x7E |0
-<U8293> \xCB\x7E |0
-<U8294> \xD0\x6A |0
-<U8298> \xCD\xB6 |0
-<U8299> \xAA\xDC |0
-<U829A> \xCD\xB5 |0
-<U829B> \xCD\xB7 |0
-<U829D> \xAA\xDB |0
-<U829E> \xCD\xBC |0
-<U829F> \xAA\xDF |0
-<U82A0> \xCD\xB2 |0
-<U82A1> \xCD\xC0 |0
-<U82A2> \xCD\xC6 |0
-<U82A3> \xAA\xE6 |0
-<U82A4> \xCD\xC3 |0
-<U82A5> \xAA\xE3 |0
-<U82A6> \x99\xAE |0
-<U82A7> \xCD\xB9 |0
-<U82A8> \xCD\xBF |0
-<U82A9> \xCD\xC1 |0
-<U82AA> \x8E\xFB |0
-<U82AB> \xCD\xB4 |0
-<U82AC> \xAA\xE2 |0
-<U82AD> \xAA\xDD |0
-<U82AE> \xCD\xBA |0
-<U82AF> \xAA\xE4 |0
-<U82B0> \xAA\xE7 |0
-<U82B1> \xAA\xE1 |0
-<U82B3> \xAA\xDA |0
-<U82B4> \xCD\xBE |0
-<U82B5> \xCD\xB8 |0
-<U82B6> \xCD\xC5 |0
-<U82B7> \xAA\xE9 |0
-<U82B8> \xAA\xE5 |0
-<U82B9> \xAA\xE0 |0
-<U82BA> \xCD\xBD |0
-<U82BB> \xAF\xEC |0
-<U82BC> \xCD\xBB |0
-<U82BD> \xAA\xDE |0
-<U82BE> \xAA\xE8 |0
-<U82C0> \xCD\xB3 |0
-<U82C2> \xCD\xC2 |0
-<U82C3> \xCD\xC4 |0
-<U82C4> \x8B\x52 |0
-<U82CA> \x99\xB0 |0
-<U82CF> \x89\x77 |0
-<U82D0> \x8F\x41 |0
-<U82D1> \xAD\x62 |0
-<U82D2> \xAD\x5C |0
-<U82D3> \xAD\x64 |0
-<U82D4> \xAD\x61 |0
-<U82D5> \xD0\x71 |0
-<U82D6> \xD0\x74 |0
-<U82D7> \xAD\x5D |0
-<U82D8> \x99\xB1 |0
-<U82D9> \xD0\x6B |0
-<U82DB> \xAD\x56 |0
-<U82DC> \xAD\x60 |0
-<U82DE> \xAD\x63 |0
-<U82DF> \xAD\x65 |0
-<U82E0> \xD0\xA2 |0
-<U82E1> \xD0\x77 |0
-<U82E2> \x8F\x49 |0
-<U82E3> \xAD\x55 |0
-<U82E4> \xD0\xA1 |0
-<U82E5> \xAD\x59 |0
-<U82E6> \xAD\x57 |0
-<U82E7> \xAD\x52 |0
-<U82E8> \xD0\x6F |0
-<U82EA> \xD0\x7E |0
-<U82EB> \xD0\x73 |0
-<U82EC> \xD0\x76 |0
-<U82ED> \xD0\xA5 |0
-<U82EE> \xFA\x4D |0
-<U82EF> \xAD\x66 |0
-<U82F0> \xD0\x7D |0
-<U82F1> \xAD\x5E |0
-<U82F2> \xD0\x78 |0
-<U82F3> \xD0\xA4 |0
-<U82F4> \xD0\x75 |0
-<U82F5> \xD0\x79 |0
-<U82F6> \xD0\x7C |0
-<U82F7> \x9D\xE4 |0
-<U82F9> \xD0\x6D |0
-<U82FA> \xD0\xA3 |0
-<U82FB> \xD0\x7B |0
-<U82FC> \xFB\xE9 |0
-<U82FD> \x9B\x54 |0
-<U82FE> \xD0\x6C |0
-<U82FF> \x99\xB2 |0
-<U8300> \xD0\x70 |0
-<U8301> \xAD\x5F |0
-<U8302> \xAD\x5A |0
-<U8303> \xAD\x53 |0
-<U8304> \xAD\x58 |0
-<U8305> \xAD\x54 |0
-<U8306> \xAD\x67 |0
-<U8307> \xD0\x6E |0
-<U8308> \xD3\xA5 |0
-<U8309> \xAD\x5B |0
-<U830B> \x9E\x68 |0
-<U830C> \xD0\x7A |0
-<U830D> \xCE\x41 |0
-<U8316> \xD3\xA8 |0
-<U8317> \xAF\xFA |0
-<U8318> \x8F\x4A |0
-<U8319> \xD3\x76 |0
-<U831A> \x8F\x42 |0
-<U831B> \xD3\xA3 |0
-<U831C> \xD3\x7D |0
-<U831D> \x8F\x51 |0
-<U831E> \xD3\xB2 |0
-<U8320> \xD3\xAA |0
-<U8322> \xD3\x7E |0
-<U8324> \xD3\xA9 |0
-<U8325> \xD3\x78 |0
-<U8326> \xD3\x7C |0
-<U8327> \xD3\xB5 |0
-<U8328> \xAF\xFD |0
-<U8329> \xD3\xAD |0
-<U832A> \xD3\xA4 |0
-<U832B> \xAF\xED |0
-<U832C> \xD3\xB3 |0
-<U832D> \xD3\x74 |0
-<U832F> \xD3\xAC |0
-<U8331> \xAF\xFC |0
-<U8332> \xAF\xF7 |0
-<U8333> \xD3\x73 |0
-<U8334> \xAF\xF5 |0
-<U8335> \xAF\xF4 |0
-<U8336> \xAF\xF9 |0
-<U8337> \xD3\xAB |0
-<U8338> \xAF\xF1 |0
-<U8339> \xAF\xF8 |0
-<U833A> \xD0\x72 |0
-<U833B> \xDB\x5C |0
-<U833C> \xD3\xA6 |0
-<U833D> \x98\x46 |0
-<U833F> \xD3\x7A |0
-<U8340> \xAF\xFB |0
-<U8341> \xD3\x7B |0
-<U8342> \xD3\xA1 |0
-<U8343> \xAF\xFE |0
-<U8344> \xD3\x75 |0
-<U8345> \xD3\xAF |0
-<U8347> \xD3\xAE |0
-<U8348> \xD3\xB6 |0
-<U8349> \xAF\xF3 |0
-<U834A> \xAF\xF0 |0
-<U834B> \xD3\xB4 |0
-<U834C> \xD3\xB0 |0
-<U834D> \xD3\xA7 |0
-<U834E> \xD3\xA2 |0
-<U834F> \xAF\xF6 |0
-<U8350> \xAF\xF2 |0
-<U8351> \xD3\x77 |0
-<U8352> \xAF\xEE |0
-<U8353> \xD3\xB1 |0
-<U8354> \xAF\xEF |0
-<U8356> \xD3\x79 |0
-<U8357> \x99\xB4 |0
-<U8362> \x8E\xF5 |0
-<U8363> \xFD\x55 |0
-<U8366> \x9C\xCD |0
-<U836F> \x89\x78 |0
-<U8373> \xD7\x5E |0
-<U8374> \xD7\x60 |0
-<U8375> \xD7\x65 |0
-<U8376> \xD7\x79 |0
-<U8377> \xB2\xFC |0
-<U8378> \xB2\xF2 |0
-<U837A> \xD7\x5D |0
-<U837B> \xB2\xFD |0
-<U837C> \xB2\xFE |0
-<U837D> \xD7\x68 |0
-<U837E> \xD7\x6F |0
-<U837F> \xD7\x75 |0
-<U8381> \xD7\x62 |0
-<U8383> \xD7\x69 |0
-<U8385> \x8F\x53 |0
-<U8386> \xB3\x40 |0
-<U8387> \xD7\x77 |0
-<U8388> \xD7\x72 |0
-<U8389> \xB2\xFA |0
-<U838A> \xB2\xF8 |0
-<U838B> \xD7\x6E |0
-<U838C> \xD7\x6A |0
-<U838D> \xD7\x5C |0
-<U838E> \xB2\xEF |0
-<U838F> \xD7\x61 |0
-<U8390> \xD7\x59 |0
-<U8391> \x8F\x6F |0
-<U8392> \xB2\xF7 |0
-<U8393> \xB2\xF9 |0
-<U8394> \xD7\x66 |0
-<U8395> \xD7\x63 |0
-<U8396> \xB2\xF4 |0
-<U8397> \xD7\x73 |0
-<U8398> \xB2\xF1 |0
-<U8399> \xD7\x64 |0
-<U839A> \xD7\x7A |0
-<U839B> \xD7\x6C |0
-<U839C> \x8E\x63 |0
-<U839D> \xD7\x6B |0
-<U839E> \xB2\xF0 |0
-<U83A0> \xB2\xFB |0
-<U83A2> \xB2\xF3 |0
-<U83A3> \xD7\x5A |0
-<U83A4> \xD7\x5F |0
-<U83A5> \xD7\x70 |0
-<U83A6> \xD7\x76 |0
-<U83A7> \xB3\x41 |0
-<U83A8> \xD7\x5B |0
-<U83A9> \xD7\x67 |0
-<U83AA> \xD7\x6D |0
-<U83AB> \xB2\xF6 |0
-<U83AC> \x8F\x56 |0
-<U83AE> \xD7\x78 |0
-<U83AF> \xD7\x71 |0
-<U83B0> \xD7\x74 |0
-<U83B9> \xFE\x76 |0
-<U83BD> \xB2\xF5 |0
-<U83BE> \x9F\xC6 |0
-<U83BF> \xDB\x6C |0
-<U83C0> \xDB\x60 |0
-<U83C1> \xB5\xD7 |0
-<U83C2> \xDB\x7D |0
-<U83C3> \xDB\xA7 |0
-<U83C4> \xDB\xAA |0
-<U83C5> \xB5\xD5 |0
-<U83C6> \xDB\x68 |0
-<U83C7> \xDB\xA3 |0
-<U83C8> \xDB\x69 |0
-<U83C9> \xDB\x77 |0
-<U83CA> \xB5\xE2 |0
-<U83CB> \xDB\x73 |0
-<U83CC> \xB5\xDF |0
-<U83CD> \xFA\xAC |0
-<U83CE> \xDB\x74 |0
-<U83CF> \xDB\x5D |0
-<U83D1> \xDB\xA4 |0
-<U83D3> \x8F\x58 |0
-<U83D4> \xB5\xE8 |0
-<U83D5> \xDB\xA1 |0
-<U83D6> \xDB\x75 |0
-<U83D7> \xDB\xAC |0
-<U83D8> \xDB\x70 |0
-<U83D9> \xDF\xC8 |0
-<U83DB> \xDB\xAF |0
-<U83DC> \xB5\xE6 |0
-<U83DD> \xDB\x6E |0
-<U83DE> \xDB\x7A |0
-<U83DF> \xB5\xE9 |0
-<U83E0> \xB5\xD4 |0
-<U83E1> \xDB\x72 |0
-<U83E2> \xDB\xAD |0
-<U83E3> \xDB\x6B |0
-<U83E4> \xDB\x64 |0
-<U83E5> \xDB\x6F |0
-<U83E7> \xDB\x63 |0
-<U83E8> \xDB\x61 |0
-<U83E9> \xB5\xD0 |0
-<U83EA> \xDB\xA5 |0
-<U83EB> \xDB\x6A |0
-<U83EC> \xDB\xA8 |0
-<U83ED> \x98\x48 |0
-<U83EE> \xDB\xA9 |0
-<U83EF> \xB5\xD8 |0
-<U83F0> \xB5\xDD |0
-<U83F1> \xB5\xD9 |0
-<U83F2> \xB5\xE1 |0
-<U83F3> \xDB\x7E |0
-<U83F4> \xB5\xDA |0
-<U83F5> \xDB\x76 |0
-<U83F6> \xDB\x66 |0
-<U83F8> \xB5\xD2 |0
-<U83F9> \xDB\x5E |0
-<U83FA> \xDB\xA2 |0
-<U83FB> \xDB\xAB |0
-<U83FC> \xDB\x65 |0
-<U83FD> \xB5\xE0 |0
-<U83FE> \xDB\xB0 |0
-<U83FF> \xDB\x71 |0
-<U8401> \xDB\x6D |0
-<U8403> \xB5\xD1 |0
-<U8404> \xB5\xE5 |0
-<U8405> \x99\xB7 |0
-<U8406> \xDB\x7C |0
-<U8407> \xB5\xE7 |0
-<U8409> \xDB\x78 |0
-<U840A> \xB5\xDC |0
-<U840B> \xB5\xD6 |0
-<U840C> \xB5\xDE |0
-<U840D> \xB5\xD3 |0
-<U840E> \xB5\xE4 |0
-<U840F> \xDB\x79 |0
-<U8410> \xDB\x67 |0
-<U8411> \xDB\x7B |0
-<U8412> \xDB\x62 |0
-<U8413> \xDB\xA6 |0
-<U8414> \x96\x65 |0
-<U8416> \xFA\x6C |0
-<U8418> \x9D\xE7 |0
-<U841B> \xDB\xAE |0
-<U841C> \x9E\x62 |0
-<U8420> \x96\xCC |0
-<U8421> \x8E\x67 |0
-<U8423> \xDB\x5F |0
-<U8424> \xFC\x75 |0
-<U8426> \x98\x7E |0
-<U8429> \xDF\xC7 |0
-<U842B> \xDF\xDD |0
-<U842C> \xB8\x55 |0
-<U842D> \xDF\xCC |0
-<U842E> \xFD\xB9 |0
-<U842F> \xDF\xCA |0
-<U8430> \xDF\xB5 |0
-<U8431> \xB8\xA9 |0
-<U8432> \xDF\xC5 |0
-<U8433> \xDF\xD9 |0
-<U8434> \xDF\xC1 |0
-<U8435> \xB8\xB1 |0
-<U8436> \xDF\xD8 |0
-<U8437> \xDF\xBF |0
-<U8438> \xB5\xE3 |0
-<U8439> \xDF\xCF |0
-<U843A> \xDF\xC0 |0
-<U843B> \xDF\xD6 |0
-<U843C> \xB8\xB0 |0
-<U843D> \xB8\xA8 |0
-<U843E> \x97\xFC |0
-<U843F> \xDF\xAA |0
-<U8440> \xDF\xB2 |0
-<U8442> \xDF\xCB |0
-<U8443> \xDF\xC3 |0
-<U8444> \xDF\xDC |0
-<U8445> \xDF\xC6 |0
-<U8446> \xB8\xB6 |0
-<U8447> \xDF\xD7 |0
-<U8448> \x98\xF9 |0
-<U8449> \xB8\xAD |0
-<U844A> \x8F\x66 |0
-<U844B> \xDF\xC9 |0
-<U844C> \xDF\xD1 |0
-<U844D> \xDF\xB6 |0
-<U844E> \xDF\xD0 |0
-<U8450> \xDF\xE1 |0
-<U8451> \xDF\xB1 |0
-<U8452> \xDF\xD2 |0
-<U8453> \x95\x6E |0
-<U8454> \xDF\xDF |0
-<U8455> \x92\x45 |0
-<U8456> \xDF\xAB |0
-<U8457> \xB5\xDB |0
-<U8458> \x8F\x60 |0
-<U8459> \xDF\xB9 |0
-<U845A> \xDF\xB8 |0
-<U845B> \xB8\xAF |0
-<U845C> \x9E\xD1 |0
-<U845D> \xDF\xBC |0
-<U845E> \xDF\xBE |0
-<U845F> \xDF\xCD |0
-<U8460> \xDF\xDE |0
-<U8461> \xB8\xB2 |0
-<U8462> \xFE\xCD |0
-<U8463> \xB8\xB3 |0
-<U8464> \x99\xB9 |0
-<U8465> \xDF\xB0 |0
-<U8466> \xB8\xAB |0
-<U8467> \xDF\xB4 |0
-<U8468> \xDF\xDA |0
-<U8469> \xB8\xB4 |0
-<U846B> \xB8\xAC |0
-<U846C> \xB8\xAE |0
-<U846D> \xB8\xB5 |0
-<U846E> \xDF\xE0 |0
-<U846F> \xDF\xD3 |0
-<U8470> \xDF\xCE |0
-<U8471> \x8F\x62 |0
-<U8472> \x97\x4C |0
-<U8473> \xDF\xBB |0
-<U8474> \xDF\xBA |0
-<U8475> \xB8\xAA |0
-<U8476> \xDF\xAC |0
-<U8477> \xB8\xA7 |0
-<U8478> \xDF\xC4 |0
-<U8479> \xDF\xAD |0
-<U847A> \xDF\xC2 |0
-<U847D> \xDF\xB7 |0
-<U847E> \xDF\xDB |0
-<U847F> \x91\xC7 |0
-<U8480> \x95\x5F |0
-<U8482> \xB8\xA6 |0
-<U8486> \xDF\xB3 |0
-<U8488> \x99\xBB |0
-<U848D> \xDF\xAF |0
-<U848E> \xDF\xD5 |0
-<U848F> \xDF\xAE |0
-<U8490> \xBB\x60 |0
-<U8491> \xE3\xD3 |0
-<U8492> \x8E\x6D |0
-<U8493> \x8F\x71 |0
-<U8494> \xE3\xC2 |0
-<U8496> \x94\xCB |0
-<U8497> \xE3\xAC |0
-<U8498> \xE3\xCA |0
-<U8499> \xBB\x58 |0
-<U849A> \xE3\xBB |0
-<U849B> \xE3\xC5 |0
-<U849C> \xBB\x5B |0
-<U849D> \xE3\xBE |0
-<U849E> \xBB\x59 |0
-<U849F> \xE3\xAF |0
-<U84A0> \xE3\xCD |0
-<U84A1> \xE3\xAE |0
-<U84A2> \xE3\xC1 |0
-<U84A3> \x95\xB1 |0
-<U84A4> \xE3\xAD |0
-<U84A7> \xE3\xBF |0
-<U84A8> \xE3\xC8 |0
-<U84A9> \xE3\xC6 |0
-<U84AA> \xE3\xBA |0
-<U84AB> \xE3\xB5 |0
-<U84AC> \xE3\xB3 |0
-<U84AD> \x9A\xF2 |0
-<U84AE> \xE3\xB4 |0
-<U84AF> \xE3\xC7 |0
-<U84B0> \xE3\xD2 |0
-<U84B1> \xE3\xBC |0
-<U84B2> \xBB\x5A |0
-<U84B4> \xE3\xB7 |0
-<U84B6> \xE3\xCB |0
-<U84B8> \xBB\x5D |0
-<U84B9> \xE3\xB6 |0
-<U84BA> \xE3\xB0 |0
-<U84BB> \xE3\xC0 |0
-<U84BC> \xBB\x61 |0
-<U84BD> \x96\xC3 |0
-<U84BE> \x99\xBD |0
-<U84BF> \xBB\x55 |0
-<U84C0> \xBB\x5E |0
-<U84C1> \xE3\xB8 |0
-<U84C2> \xE3\xB2 |0
-<U84C4> \xBB\x57 |0
-<U84C5> \xDF\xD4 |0
-<U84C6> \xBB\x56 |0
-<U84C7> \xE3\xC3 |0
-<U84C9> \xBB\x54 |0
-<U84CA> \xBB\x63 |0
-<U84CB> \xBB\x5C |0
-<U84CC> \xE3\xC4 |0
-<U84CD> \xE3\xB9 |0
-<U84CE> \xE3\xB1 |0
-<U84CF> \xE3\xCC |0
-<U84D0> \xE3\xBD |0
-<U84D1> \xBB\x62 |0
-<U84D2> \xE3\xD0 |0
-<U84D3> \xBB\x5F |0
-<U84D4> \xE3\xCF |0
-<U84D6> \xE3\xC9 |0
-<U84D7> \xE3\xCE |0
-<U84DA> \xA0\xCF |0
-<U84DB> \xE3\xD1 |0
-<U84DE> \x8F\x6D |0
-<U84E1> \x99\xBE |0
-<U84E2> \x8E\xF4 |0
-<U84E4> \x8F\x72 |0
-<U84E5> \x95\xE4 |0
-<U84E7> \xE7\x73 |0
-<U84E8> \xE7\x74 |0
-<U84E9> \xE7\x67 |0
-<U84EA> \xE7\x66 |0
-<U84EB> \xE7\x62 |0
-<U84EC> \xBD\xB4 |0
-<U84EE> \xBD\xAC |0
-<U84EF> \xE7\x76 |0
-<U84F0> \xE7\x75 |0
-<U84F1> \xDF\xA9 |0
-<U84F2> \xE7\x5F |0
-<U84F3> \xE7\x63 |0
-<U84F4> \xE7\x5D |0
-<U84F6> \xE7\x70 |0
-<U84F7> \xE7\x61 |0
-<U84F8> \x99\xBF |0
-<U84F9> \xE7\x77 |0
-<U84FA> \xE7\x5A |0
-<U84FB> \xE7\x58 |0
-<U84FC> \xE7\x64 |0
-<U84FD> \xE7\x6E |0
-<U84FE> \xE7\x69 |0
-<U84FF> \xBD\xB6 |0
-<U8500> \xE7\x4F |0
-<U8502> \xE7\x6D |0
-<U8503> \x92\x42 |0
-<U8505> \xFB\xA5 |0
-<U8506> \xBD\xB7 |0
-<U8507> \xDF\xBD |0
-<U8508> \xE7\x5B |0
-<U8509> \xE7\x52 |0
-<U850A> \xE7\x55 |0
-<U850B> \xE7\x7B |0
-<U850C> \xE7\x5C |0
-<U850D> \xE7\x53 |0
-<U850E> \xE7\x51 |0
-<U850F> \xE7\x4E |0
-<U8510> \x99\xC0 |0
-<U8511> \xBD\xB0 |0
-<U8512> \xE7\x65 |0
-<U8513> \xBD\xAF |0
-<U8514> \xBD\xB3 |0
-<U8515> \xE7\x60 |0
-<U8516> \xE7\x68 |0
-<U8517> \xBD\xA9 |0
-<U8518> \xE7\x78 |0
-<U8519> \xE7\x7C |0
-<U851A> \xBD\xAB |0
-<U851C> \xE7\x57 |0
-<U851D> \xE7\x6B |0
-<U851E> \xE7\x6F |0
-<U851F> \xE7\x54 |0
-<U8520> \xE7\x79 |0
-<U8521> \xBD\xB2 |0
-<U8523> \xBD\xB1 |0
-<U8524> \xE7\x4C |0
-<U8525> \xBD\xB5 |0
-<U8526> \xE7\x72 |0
-<U8527> \xE7\x56 |0
-<U8528> \xE7\x6A |0
-<U8529> \xE7\x50 |0
-<U852A> \xE7\x5E |0
-<U852B> \xE7\x59 |0
-<U852C> \xBD\xAD |0
-<U852D> \xBD\xAE |0
-<U852E> \xE7\x6C |0
-<U852F> \xE7\x7D |0
-<U8530> \xE7\x7A |0
-<U8531> \xE7\x71 |0
-<U8533> \xFD\xB4 |0
-<U8534> \x8F\x77 |0
-<U8538> \x99\xC1 |0
-<U853B> \xE7\x4D |0
-<U853D> \xBD\xAA |0
-<U853E> \xEB\x49 |0
-<U8540> \xEB\x40 |0
-<U8541> \xEB\x43 |0
-<U8542> \xFA\xB9 |0
-<U8543> \xBF\xBB |0
-<U8544> \xEB\x45 |0
-<U8545> \xEA\xF9 |0
-<U8546> \xEB\x41 |0
-<U8547> \xEB\x47 |0
-<U8548> \xBF\xB8 |0
-<U8549> \xBF\xBC |0
-<U854A> \xBF\xB6 |0
-<U854B> \x8F\x40 |0
-<U854C> \xFA\x44 |0
-<U854D> \xEA\xFB |0
-<U854E> \xEB\x4C |0
-<U8551> \xEB\x46 |0
-<U8552> \x99\xC2 |0
-<U8553> \xEA\xFC |0
-<U8554> \xEB\x55 |0
-<U8555> \xEB\x4F |0
-<U8556> \xEA\xF8 |0
-<U8557> \xEE\x46 |0
-<U8558> \xEA\xFE |0
-<U8559> \xBF\xB7 |0
-<U855A> \x8F\x5C |0
-<U855B> \xEB\x4A |0
-<U855D> \xEB\x54 |0
-<U855E> \xBF\xBF |0
-<U8560> \xEB\x51 |0
-<U8561> \xEA\xFD |0
-<U8562> \xEB\x44 |0
-<U8563> \xEB\x48 |0
-<U8564> \xEB\x42 |0
-<U8565> \xEB\x56 |0
-<U8566> \xEB\x53 |0
-<U8567> \xEB\x50 |0
-<U8568> \xBF\xB9 |0
-<U8569> \xBF\xBA |0
-<U856A> \xBF\xBE |0
-<U856B> \xEA\xFA |0
-<U856C> \xEB\x57 |0
-<U856D> \xBF\xBD |0
-<U856E> \xEB\x4D |0
-<U856F> \x99\xC4 |0
-<U8570> \x99\xC5 |0
-<U8571> \xEB\x4B |0
-<U8573> \x8F\x7B |0
-<U8575> \xEB\x4E |0
-<U8576> \xEE\x53 |0
-<U8577> \xEE\x40 |0
-<U8578> \xEE\x45 |0
-<U8579> \xEE\x52 |0
-<U857A> \xEE\x44 |0
-<U857B> \xED\xFB |0
-<U857C> \xEE\x41 |0
-<U857E> \xC1\xA2 |0
-<U8580> \xED\xF4 |0
-<U8581> \xEE\x4D |0
-<U8582> \xEE\x4F |0
-<U8583> \xED\xF3 |0
-<U8584> \xC1\xA1 |0
-<U8585> \xEE\x51 |0
-<U8586> \xEE\x49 |0
-<U8587> \xC1\xA8 |0
-<U8588> \xEE\x50 |0
-<U8589> \xEE\x42 |0
-<U858A> \xC1\xAA |0
-<U858B> \xED\xF9 |0
-<U858C> \xEB\x52 |0
-<U858D> \xEE\x4A |0
-<U858E> \xEE\x47 |0
-<U858F> \xED\xF5 |0
-<U8590> \xEE\x55 |0
-<U8591> \xC1\xA4 |0
-<U8594> \xC1\xA5 |0
-<U8595> \xED\xF7 |0
-<U8596> \xEE\x48 |0
-<U8598> \xEE\x54 |0
-<U8599> \xEE\x4B |0
-<U859A> \xED\xFD |0
-<U859B> \xC1\xA7 |0
-<U859C> \xC1\xA3 |0
-<U859D> \xEE\x4C |0
-<U859E> \xED\xFE |0
-<U859F> \xEE\x56 |0
-<U85A0> \xED\xF8 |0
-<U85A1> \xEE\x43 |0
-<U85A2> \xEE\x4E |0
-<U85A3> \xED\xFA |0
-<U85A4> \xED\xFC |0
-<U85A6> \xC2\xCB |0
-<U85A7> \xED\xF6 |0
-<U85A8> \xC1\xA9 |0
-<U85A9> \xC2\xC4 |0
-<U85AA> \xC1\x7E |0
-<U85AF> \xC1\xA6 |0
-<U85B0> \xC2\xC8 |0
-<U85B1> \xF0\xB3 |0
-<U85B3> \xF0\xA9 |0
-<U85B4> \xF0\xA4 |0
-<U85B5> \xF0\xAA |0
-<U85B6> \xF0\xB4 |0
-<U85B7> \xF0\xB8 |0
-<U85B8> \xF0\xB7 |0
-<U85B9> \xC2\xCA |0
-<U85BA> \xC2\xC9 |0
-<U85BD> \xF0\xAB |0
-<U85BE> \xF0\xB9 |0
-<U85BF> \xF0\xAE |0
-<U85C0> \xF0\xA6 |0
-<U85C1> \x8F\xA3 |0
-<U85C2> \xF0\xA8 |0
-<U85C3> \xF0\xA7 |0
-<U85C4> \xF0\xAD |0
-<U85C5> \xF0\xB2 |0
-<U85C6> \xF0\xA5 |0
-<U85C7> \xF0\xAC |0
-<U85C8> \xF0\xB1 |0
-<U85C9> \xC2\xC7 |0
-<U85CB> \xF0\xAF |0
-<U85CD> \xC2\xC5 |0
-<U85CE> \xF0\xB0 |0
-<U85CF> \xC2\xC3 |0
-<U85D0> \xC2\xC6 |0
-<U85D1> \xF2\xD5 |0
-<U85D2> \xF0\xB5 |0
-<U85D5> \xC3\xC2 |0
-<U85D7> \xF2\xCD |0
-<U85D8> \xF2\xD1 |0
-<U85D9> \xF2\xC9 |0
-<U85DA> \xF2\xCC |0
-<U85DC> \xF2\xD4 |0
-<U85DD> \xC3\xC0 |0
-<U85DE> \xF2\xD9 |0
-<U85DF> \xF2\xD2 |0
-<U85E0> \x99\xC6 |0
-<U85E1> \xF2\xCA |0
-<U85E2> \xF2\xDA |0
-<U85E3> \xF2\xD3 |0
-<U85E4> \xC3\xC3 |0
-<U85E5> \xC3\xC4 |0
-<U85E6> \xF2\xD7 |0
-<U85E8> \xF2\xCB |0
-<U85E9> \xC3\xBF |0
-<U85EA> \xC3\xC1 |0
-<U85EB> \xF2\xC6 |0
-<U85EC> \xF2\xCE |0
-<U85ED> \xF2\xC8 |0
-<U85EE> \x96\xCD |0
-<U85EF> \xF2\xD8 |0
-<U85F0> \xF2\xD6 |0
-<U85F1> \xF2\xC7 |0
-<U85F2> \xF2\xCF |0
-<U85F6> \xF4\xBE |0
-<U85F7> \xC3\xC5 |0
-<U85F8> \xF2\xD0 |0
-<U85F9> \xC4\xA7 |0
-<U85FA> \xC4\xA9 |0
-<U85FB> \xC4\xA6 |0
-<U85FC> \x96\xC7 |0
-<U85FD> \xF4\xC3 |0
-<U85FE> \xF4\xBB |0
-<U85FF> \xF4\xB9 |0
-<U8600> \xF4\xBD |0
-<U8601> \xF4\xBA |0
-<U8602> \x8F\xA5 |0
-<U8604> \xF4\xBF |0
-<U8605> \xF4\xC1 |0
-<U8606> \xC4\xAA |0
-<U8607> \xC4\xAC |0
-<U8609> \xF4\xC0 |0
-<U860A> \xC4\xAD |0
-<U860B> \xC4\xAB |0
-<U860C> \xF4\xC2 |0
-<U860D> \xFA\xBB |0
-<U8610> \x95\x70 |0
-<U8611> \xC4\xA8 |0
-<U8614> \x93\x68 |0
-<U8616> \x8F\x7E |0
-<U8617> \xC4\xF4 |0
-<U8618> \xF5\xF1 |0
-<U8619> \xF5\xF7 |0
-<U861A> \xC4\xF6 |0
-<U861B> \xF4\xBC |0
-<U861C> \xF5\xF6 |0
-<U861E> \xF5\xFD |0
-<U861F> \xF5\xF4 |0
-<U8620> \xF5\xFB |0
-<U8621> \xF5\xFA |0
-<U8622> \xF4\xB8 |0
-<U8623> \xF5\xF5 |0
-<U8624> \xF0\xB6 |0
-<U8625> \xF5\xFE |0
-<U8626> \xF5\xF3 |0
-<U8627> \xF5\xF8 |0
-<U8628> \x8F\xAA |0
-<U8629> \xF5\xFC |0
-<U862A> \xF5\xF2 |0
-<U862C> \xF7\x4A |0
-<U862D> \xC4\xF5 |0
-<U862E> \xF5\xF9 |0
-<U862F> \xA0\x50 |0
-<U8631> \xF7\xF4 |0
-<U8632> \xF7\x4B |0
-<U8633> \xF7\x49 |0
-<U8634> \xF7\x47 |0
-<U8635> \xF7\x48 |0
-<U8636> \xF7\x4C |0
-<U8638> \xC5\xD9 |0
-<U8639> \xF7\xF2 |0
-<U863A> \xF7\xF0 |0
-<U863B> \xF7\xF5 |0
-<U863C> \xF7\xF3 |0
-<U863E> \xF7\xF6 |0
-<U863F> \xC5\xDA |0
-<U8640> \xF7\xF1 |0
-<U8642> \x90\xD3 |0
-<U8643> \xF8\xBC |0
-<U8645> \x95\x56 |0
-<U8646> \xF9\x45 |0
-<U8647> \xF9\x46 |0
-<U8648> \xF9\x47 |0
-<U864B> \xF9\xC7 |0
-<U864C> \xF9\xBD |0
-<U864D> \xCA\x4F |0
-<U864E> \xAA\xEA |0
-<U8650> \xAD\x68 |0
-<U8652> \xD3\xB8 |0
-<U8653> \xD3\xB7 |0
-<U8654> \xB0\x40 |0
-<U8655> \xB3\x42 |0
-<U8656> \xD7\x7C |0
-<U8659> \xD7\x7B |0
-<U865B> \xB5\xEA |0
-<U865C> \xB8\xB8 |0
-<U865E> \xB8\xB7 |0
-<U865F> \xB8\xB9 |0
-<U8661> \xE3\xD4 |0
-<U8662> \xE7\x7E |0
-<U8663> \xEB\x58 |0
-<U8664> \xEB\x5A |0
-<U8665> \xEB\x59 |0
-<U8667> \xC1\xAB |0
-<U8668> \xEE\x57 |0
-<U8669> \xF0\xBA |0
-<U866A> \xF9\xA5 |0
-<U866B> \xA6\xE4 |0
-<U866C> \x8F\xB8 |0
-<U866D> \xCD\xC9 |0
-<U866E> \xCD\xCA |0
-<U866F> \xCD\xC8 |0
-<U8670> \xCD\xC7 |0
-<U8671> \xAA\xEB |0
-<U8672> \x99\xC8 |0
-<U8673> \xD0\xA9 |0
-<U8674> \xD0\xA7 |0
-<U8677> \xD0\xA6 |0
-<U8679> \xAD\x69 |0
-<U867A> \xAD\x6B |0
-<U867B> \xAD\x6A |0
-<U867C> \xD0\xA8 |0
-<U867E> \x8F\xAF |0
-<U8685> \xD3\xC4 |0
-<U8686> \xD3\xC1 |0
-<U8687> \xD3\xBF |0
-<U868A> \xB0\x41 |0
-<U868B> \xD3\xC2 |0
-<U868C> \xB0\x46 |0
-<U868D> \xD3\xBC |0
-<U868E> \xD3\xCB |0
-<U8690> \xD3\xCD |0
-<U8691> \xD3\xBD |0
-<U8692> \x99\xC9 |0
-<U8693> \xB0\x43 |0
-<U8694> \xD3\xCE |0
-<U8695> \xD3\xC9 |0
-<U8696> \xD3\xBB |0
-<U8697> \xD3\xC0 |0
-<U8698> \xD3\xCA |0
-<U8699> \xD3\xC6 |0
-<U869A> \xD3\xC3 |0
-<U869C> \xB0\x48 |0
-<U869D> \xD3\xCC |0
-<U869E> \xD3\xBE |0
-<U86A0> \x95\x79 |0
-<U86A1> \xD3\xC7 |0
-<U86A2> \xD3\xB9 |0
-<U86A3> \xB0\x47 |0
-<U86A4> \xB0\x44 |0
-<U86A5> \xD3\xC5 |0
-<U86A7> \xD3\xC8 |0
-<U86A8> \xD3\xBA |0
-<U86A9> \xB0\x45 |0
-<U86AA> \xB0\x42 |0
-<U86AD> \x9F\x49 |0
-<U86AF> \xB3\x4C |0
-<U86B0> \xD7\xA5 |0
-<U86B1> \xB3\x4B |0
-<U86B2> \x99\xCA |0
-<U86B3> \xD7\xA8 |0
-<U86B4> \xD7\xAB |0
-<U86B5> \xB3\x48 |0
-<U86B6> \xB3\x46 |0
-<U86B7> \xD7\x7E |0
-<U86B8> \xD7\xA9 |0
-<U86B9> \xD7\xA7 |0
-<U86BA> \xD7\xA4 |0
-<U86BB> \xD7\xAC |0
-<U86BC> \xD7\xAD |0
-<U86BD> \xD7\xAF |0
-<U86BE> \xD7\xB0 |0
-<U86BF> \xD7\x7D |0
-<U86C0> \xB3\x45 |0
-<U86C1> \xD7\xA2 |0
-<U86C2> \xD7\xA1 |0
-<U86C3> \xD7\xAE |0
-<U86C4> \xB3\x47 |0
-<U86C5> \xD7\xA3 |0
-<U86C6> \xB3\x49 |0
-<U86C7> \xB3\x44 |0
-<U86C8> \xD7\xA6 |0
-<U86C9> \xB3\x4D |0
-<U86CB> \xB3\x4A |0
-<U86CC> \xD7\xAA |0
-<U86D0> \xB5\xF1 |0
-<U86D1> \xDB\xBF |0
-<U86D3> \xDB\xB4 |0
-<U86D4> \xB5\xEE |0
-<U86D6> \xDF\xE7 |0
-<U86D7> \xDB\xBD |0
-<U86D8> \xDB\xB1 |0
-<U86D9> \xB5\xEC |0
-<U86DA> \xDB\xB6 |0
-<U86DB> \xB5\xEF |0
-<U86DC> \xDB\xBA |0
-<U86DD> \xDB\xB8 |0
-<U86DE> \xB5\xF2 |0
-<U86DF> \xB5\xEB |0
-<U86E2> \xDB\xB2 |0
-<U86E3> \xDB\xB5 |0
-<U86E4> \xB5\xF0 |0
-<U86E6> \xDB\xB3 |0
-<U86E8> \xDB\xBE |0
-<U86E9> \xDB\xBC |0
-<U86EA> \xDB\xB7 |0
-<U86EB> \xDB\xB9 |0
-<U86EC> \xDB\xBB |0
-<U86ED> \xB5\xED |0
-<U86EF> \x99\xCB |0
-<U86F5> \xDF\xE8 |0
-<U86F6> \xDF\xEE |0
-<U86F7> \xDF\xE4 |0
-<U86F8> \xDF\xEA |0
-<U86F9> \xB8\xBA |0
-<U86FA> \xDF\xE6 |0
-<U86FB> \xB8\xC0 |0
-<U86FE> \xB8\xBF |0
-<U8700> \xB8\xBE |0
-<U8701> \xDF\xED |0
-<U8702> \xB8\xC1 |0
-<U8703> \xB8\xC2 |0
-<U8704> \xDF\xE3 |0
-<U8705> \xDF\xF0 |0
-<U8706> \xB8\xC3 |0
-<U8707> \xB8\xBD |0
-<U8708> \xB8\xBC |0
-<U8709> \xDF\xEC |0
-<U870A> \xB8\xC4 |0
-<U870B> \xDF\xE2 |0
-<U870C> \xDF\xE5 |0
-<U870D> \xDF\xEF |0
-<U870E> \xDF\xEB |0
-<U8711> \xE3\xF4 |0
-<U8712> \xE3\xE9 |0
-<U8713> \xB8\xBB |0
-<U8718> \xBB\x6A |0
-<U8719> \xE3\xDD |0
-<U871A> \xE3\xF2 |0
-<U871B> \xE3\xDE |0
-<U871C> \xBB\x65 |0
-<U871E> \xE3\xDB |0
-<U8720> \xE3\xE4 |0
-<U8721> \xE3\xDC |0
-<U8722> \xBB\x67 |0
-<U8723> \xE3\xD6 |0
-<U8724> \xE3\xF1 |0
-<U8725> \xBB\x68 |0
-<U8726> \xE3\xEE |0
-<U8727> \xE3\xEF |0
-<U8728> \xE3\xD7 |0
-<U8728> \x95\x7A |3
-<U8729> \xBB\x6D |0
-<U872A> \xE3\xE6 |0
-<U872C> \xE3\xE0 |0
-<U872D> \xE3\xE7 |0
-<U872E> \xE3\xDA |0
-<U8730> \xE3\xF3 |0
-<U8731> \xE3\xEB |0
-<U8732> \xE3\xE5 |0
-<U8733> \xE3\xD5 |0
-<U8734> \xBB\x69 |0
-<U8735> \xE3\xEC |0
-<U8737> \xBB\x6C |0
-<U8738> \xE3\xF0 |0
-<U873A> \xE3\xEA |0
-<U873B> \xBB\x66 |0
-<U873C> \xE3\xE8 |0
-<U873E> \xE3\xE2 |0
-<U873F> \xBB\x64 |0
-<U8740> \xE3\xD9 |0
-<U8741> \xE3\xE1 |0
-<U8742> \xE3\xED |0
-<U8743> \xE3\xDF |0
-<U8746> \xE3\xE3 |0
-<U874C> \xBD\xC1 |0
-<U874D> \xDF\xE9 |0
-<U874E> \xE7\xB2 |0
-<U874F> \xE7\xBB |0
-<U8750> \xE7\xB1 |0
-<U8751> \xE7\xAD |0
-<U8752> \xE7\xAA |0
-<U8753> \xBD\xC2 |0
-<U8754> \xE7\xA8 |0
-<U8755> \xBB\x6B |0
-<U8756> \xE7\xA1 |0
-<U8757> \xBD\xC0 |0
-<U8758> \xE7\xA7 |0
-<U8759> \xBD\xBF |0
-<U875A> \xE7\xAC |0
-<U875B> \xE7\xA9 |0
-<U875C> \xE7\xB9 |0
-<U875D> \xE7\xB4 |0
-<U875E> \xE7\xAE |0
-<U875F> \xE7\xB3 |0
-<U8760> \xBD\xBB |0
-<U8761> \xE7\xAB |0
-<U8762> \xE7\xBE |0
-<U8763> \xE7\xA2 |0
-<U8764> \xE7\xA3 |0
-<U8765> \xE7\xBA |0
-<U8766> \xBD\xBC |0
-<U8767> \xE7\xBF |0
-<U8768> \xBD\xBE |0
-<U8769> \xE7\xC0 |0
-<U876A> \xE7\xB0 |0
-<U876B> \xE3\xD8 |0
-<U876C> \xE7\xB6 |0
-<U876D> \xE7\xAF |0
-<U876E> \xE7\xB8 |0
-<U876F> \xE7\xB5 |0
-<U8770> \x9D\xD5 |0
-<U8771> \x8F\xB0 |0
-<U8773> \xE7\xA6 |0
-<U8774> \xBD\xB9 |0
-<U8775> \xE7\xBD |0
-<U8776> \xBD\xBA |0
-<U8777> \xE7\xA4 |0
-<U8778> \xBD\xBD |0
-<U8779> \xEB\x64 |0
-<U877A> \xE7\xB7 |0
-<U877B> \xE7\xBC |0
-<U877D> \xFA\x7A |0
-<U8781> \xEB\x61 |0
-<U8782> \xBD\xB8 |0
-<U8783> \xBF\xC0 |0
-<U8784> \xEB\x6B |0
-<U8785> \xEB\x67 |0
-<U8786> \x9E\x5F |0
-<U8787> \xEB\x65 |0
-<U8788> \xEB\x60 |0
-<U8789> \xEB\x6F |0
-<U878B> \x99\xCD |0
-<U878C> \xA0\xC9 |0
-<U878D> \xBF\xC4 |0
-<U878F> \xEB\x5C |0
-<U8790> \xEB\x68 |0
-<U8791> \xEB\x69 |0
-<U8792> \xEB\x5F |0
-<U8793> \xEB\x5E |0
-<U8794> \xEB\x6C |0
-<U8796> \xEB\x62 |0
-<U8797> \xEB\x5D |0
-<U8798> \xEB\x63 |0
-<U879A> \xEB\x6E |0
-<U879B> \xEB\x5B |0
-<U879C> \xEB\x6D |0
-<U879D> \xEB\x6A |0
-<U879E> \xBF\xC2 |0
-<U879F> \xBF\xC1 |0
-<U87A2> \xBF\xC3 |0
-<U87A3> \xEB\x66 |0
-<U87A4> \xF0\xCB |0
-<U87A5> \x9A\xDB |0
-<U87A9> \xA0\xC6 |0
-<U87AA> \xEE\x59 |0
-<U87AB> \xC1\xB1 |0
-<U87AC> \xEE\x5D |0
-<U87AD> \xEE\x5A |0
-<U87AE> \xEE\x61 |0
-<U87AF> \xEE\x67 |0
-<U87B0> \xEE\x5C |0
-<U87B1> \x8F\xB4 |0
-<U87B2> \xEE\x70 |0
-<U87B3> \xC1\xAE |0
-<U87B4> \xEE\x6A |0
-<U87B5> \xEE\x5F |0
-<U87B6> \xEE\x6B |0
-<U87B7> \xEE\x66 |0
-<U87B8> \xEE\x6D |0
-<U87B9> \xEE\x5E |0
-<U87BA> \xC1\xB3 |0
-<U87BB> \xC1\xB2 |0
-<U87BC> \xEE\x60 |0
-<U87BD> \xEE\x6E |0
-<U87BE> \xEE\x58 |0
-<U87BF> \xEE\x6C |0
-<U87C0> \xC1\xAC |0
-<U87C1> \xA0\xD7 |0
-<U87C2> \xEE\x64 |0
-<U87C3> \xEE\x63 |0
-<U87C4> \xEE\x68 |0
-<U87C5> \xEE\x5B |0
-<U87C6> \xC1\xB0 |0
-<U87C8> \xC1\xB4 |0
-<U87C9> \xEE\x62 |0
-<U87CA> \xEE\x69 |0
-<U87CB> \xC1\xB5 |0
-<U87CC> \xEE\x65 |0
-<U87CE> \xA0\xC7 |0
-<U87D1> \xC1\xAD |0
-<U87D2> \xC1\xAF |0
-<U87D3> \xF0\xC7 |0
-<U87D4> \xF0\xC5 |0
-<U87D6> \xA0\x43 |0
-<U87D7> \xF0\xCC |0
-<U87D8> \xF0\xC9 |0
-<U87D9> \xF0\xCD |0
-<U87DA> \x8F\xB5 |0
-<U87DB> \xF0\xBE |0
-<U87DC> \xF0\xC6 |0
-<U87DD> \xF0\xD1 |0
-<U87DE> \xEE\x6F |0
-<U87DF> \xF0\xC2 |0
-<U87E0> \xC2\xCF |0
-<U87E1> \xE7\xA5 |0
-<U87E2> \xF0\xBD |0
-<U87E3> \xF0\xCA |0
-<U87E4> \xF0\xC4 |0
-<U87E5> \xF0\xC1 |0
-<U87E6> \xF0\xBC |0
-<U87E7> \xF0\xBB |0
-<U87E8> \xF0\xD0 |0
-<U87EA> \xF0\xC0 |0
-<U87EB> \xF0\xBF |0
-<U87EC> \xC2\xCD |0
-<U87ED> \xF0\xC8 |0
-<U87EE> \x8F\xB2 |0
-<U87EF> \xC2\xCC |0
-<U87F2> \xC2\xCE |0
-<U87F3> \xF0\xC3 |0
-<U87F4> \xF0\xCF |0
-<U87F5> \xA0\x61 |0
-<U87F6> \xF2\xDE |0
-<U87F7> \xF2\xDF |0
-<U87F9> \xC3\xC9 |0
-<U87FA> \xF2\xDC |0
-<U87FB> \xC3\xC6 |0
-<U87FC> \xF2\xE4 |0
-<U87FE> \xC3\xCA |0
-<U87FF> \xF2\xE6 |0
-<U8800> \xF2\xDB |0
-<U8801> \xF0\xCE |0
-<U8802> \xF2\xE8 |0
-<U8803> \xF2\xDD |0
-<U8804> \x9E\x5E |0
-<U8805> \xC3\xC7 |0
-<U8806> \xF2\xE3 |0
-<U8808> \xF2\xE5 |0
-<U8809> \xF2\xE0 |0
-<U880A> \xF2\xE7 |0
-<U880B> \xF2\xE2 |0
-<U880C> \xF2\xE1 |0
-<U880D> \xC3\xC8 |0
-<U880F> \x8F\xB6 |0
-<U8810> \xF4\xC5 |0
-<U8811> \xF4\xC6 |0
-<U8813> \xF4\xC8 |0
-<U8814> \xC4\xAE |0
-<U8815> \xC4\xAF |0
-<U8816> \xF4\xC9 |0
-<U8817> \xF4\xC7 |0
-<U8818> \x9F\xE8 |0
-<U8819> \xF4\xC4 |0
-<U881B> \xF6\x42 |0
-<U881C> \xF6\x45 |0
-<U881D> \xF6\x41 |0
-<U881F> \xC4\xFA |0
-<U8820> \xF6\x43 |0
-<U8821> \xC4\xF9 |0
-<U8822> \xC4\xF8 |0
-<U8823> \xC4\xF7 |0
-<U8824> \xF6\x44 |0
-<U8825> \xF7\x51 |0
-<U8826> \xF7\x4F |0
-<U8827> \x9C\xB2 |0
-<U8828> \xF7\x4E |0
-<U8829> \xF6\x40 |0
-<U882A> \xF7\x50 |0
-<U882B> \xF6\x46 |0
-<U882C> \xF7\x4D |0
-<U882D> \x95\x7C |0
-<U882E> \xF7\xF9 |0
-<U882F> \xF7\xD7 |0
-<U8830> \xF7\xF7 |0
-<U8831> \xC5\xDB |0
-<U8832> \xF7\xF8 |0
-<U8833> \xF7\xFA |0
-<U8835> \xF8\xBF |0
-<U8836> \xC5\xFA |0
-<U8837> \xF8\xBE |0
-<U8838> \xF8\xBD |0
-<U8839> \xC5\xFB |0
-<U883B> \xC6\x5A |0
-<U883C> \xF9\x6E |0
-<U883D> \xF9\xA7 |0
-<U883E> \xF9\xA6 |0
-<U883F> \xF9\xA8 |0
-<U8840> \xA6\xE5 |0
-<U8841> \xD0\xAA |0
-<U8842> \x9F\xC7 |0
-<U8843> \xD3\xCF |0
-<U8844> \xD3\xD0 |0
-<U8845> \x8F\xBB |0
-<U8846> \x8F\xBC |0
-<U8848> \xDB\xC0 |0
-<U884A> \xF6\x47 |0
-<U884B> \xF8\xC0 |0
-<U884C> \xA6\xE6 |0
-<U884D> \xAD\x6C |0
-<U884E> \xD0\xAB |0
-<U884F> \x8F\xEC |0
-<U8852> \xD7\xB1 |0
-<U8853> \xB3\x4E |0
-<U8855> \xDB\xC2 |0
-<U8856> \xDB\xC1 |0
-<U8857> \xB5\xF3 |0
-<U8859> \xB8\xC5 |0
-<U885A> \xE7\xC1 |0
-<U885B> \xBD\xC3 |0
-<U885D> \xBD\xC4 |0
-<U885E> \x8F\xC0 |0
-<U8860> \x93\x6A |0
-<U8861> \xBF\xC5 |0
-<U8862> \xC5\xFC |0
-<U8863> \xA6\xE7 |0
-<U8864> \x8B\xE4 |0
-<U8865> \x9C\x7C |0
-<U8867> \xD0\xAC |0
-<U8868> \xAA\xED |0
-<U8869> \xD0\xAE |0
-<U886A> \xD0\xAD |0
-<U886B> \xAD\x6D |0
-<U886D> \xD3\xD1 |0
-<U886E> \x95\xA1 |0
-<U886F> \xD3\xD8 |0
-<U8870> \xB0\x49 |0
-<U8871> \xD3\xD6 |0
-<U8872> \xD3\xD4 |0
-<U8874> \xD3\xDB |0
-<U8875> \xD3\xD2 |0
-<U8876> \xD3\xD3 |0
-<U8877> \xB0\x4A |0
-<U8879> \xB0\x4E |0
-<U887C> \xD3\xDC |0
-<U887D> \xB0\x4D |0
-<U887E> \xD3\xDA |0
-<U887F> \xD3\xD7 |0
-<U8880> \xD3\xD5 |0
-<U8881> \xB0\x4B |0
-<U8882> \xB0\x4C |0
-<U8883> \xD3\xD9 |0
-<U8884> \xFE\xEC |0
-<U8887> \x95\xA3 |0
-<U8888> \xB3\x50 |0
-<U8889> \xD7\xB2 |0
-<U888B> \xB3\x55 |0
-<U888C> \xD7\xC2 |0
-<U888D> \xB3\x54 |0
-<U888E> \xD7\xC4 |0
-<U8891> \xD7\xB8 |0
-<U8892> \xB3\x52 |0
-<U8893> \xD7\xC3 |0
-<U8895> \xD7\xB3 |0
-<U8896> \xB3\x53 |0
-<U8897> \xD7\xBF |0
-<U8898> \xD7\xBB |0
-<U8899> \xD7\xBD |0
-<U889A> \xD7\xB7 |0
-<U889B> \xD7\xBE |0
-<U889C> \x8F\xC1 |0
-<U889E> \xB3\x4F |0
-<U889F> \xD7\xBA |0
-<U88A0> \xA0\x52 |0
-<U88A1> \xD7\xB9 |0
-<U88A2> \xD7\xB5 |0
-<U88A4> \xD7\xC0 |0
-<U88A7> \xD7\xBC |0
-<U88A8> \xD7\xB4 |0
-<U88AA> \xD7\xB6 |0
-<U88AB> \xB3\x51 |0
-<U88AC> \xD7\xC1 |0
-<U88AE> \x99\xD0 |0
-<U88B1> \xB5\xF6 |0
-<U88B2> \xDB\xCD |0
-<U88B4> \x8F\xC3 |0
-<U88B5> \x8F\xC4 |0
-<U88B6> \xDB\xC9 |0
-<U88B7> \xDB\xCB |0
-<U88B8> \xDB\xC6 |0
-<U88B9> \xDB\xC5 |0
-<U88BA> \xDB\xC3 |0
-<U88BC> \xDB\xCA |0
-<U88BD> \xDB\xCC |0
-<U88BE> \xDB\xC8 |0
-<U88BF> \x95\xA4 |0
-<U88C0> \xDB\xC7 |0
-<U88C1> \xB5\xF4 |0
-<U88C2> \xB5\xF5 |0
-<U88C5> \x8F\xC6 |0
-<U88C7> \x9E\x60 |0
-<U88C9> \xDB\xCF |0
-<U88CA> \xB8\xCD |0
-<U88CB> \xDF\xF2 |0
-<U88CC> \xDF\xF8 |0
-<U88CD> \xDF\xF3 |0
-<U88CE> \xDF\xF4 |0
-<U88CF> \xF9\xD8 |0
-<U88D0> \xDF\xF9 |0
-<U88D2> \xB8\xCF |0
-<U88D4> \xB8\xC7 |0
-<U88D5> \xB8\xCE |0
-<U88D6> \xDF\xF1 |0
-<U88D7> \xDB\xC4 |0
-<U88D8> \xB8\xCA |0
-<U88D9> \xB8\xC8 |0
-<U88DA> \xDF\xF7 |0
-<U88DB> \xDF\xF6 |0
-<U88DC> \xB8\xC9 |0
-<U88DD> \xB8\xCB |0
-<U88DE> \xDF\xF5 |0
-<U88DF> \xB8\xC6 |0
-<U88E1> \xB8\xCC |0
-<U88E6> \x95\xA5 |0
-<U88E7> \xE3\xF6 |0
-<U88E8> \xBB\x74 |0
-<U88EB> \xE4\x42 |0
-<U88EC> \xE4\x41 |0
-<U88EE> \xE3\xFB |0
-<U88EF> \xBB\x76 |0
-<U88F0> \xE4\x40 |0
-<U88F1> \xE3\xF7 |0
-<U88F2> \xE3\xF8 |0
-<U88F3> \xBB\x6E |0
-<U88F4> \xBB\x70 |0
-<U88F5> \x9C\xB3 |0
-<U88F6> \xE3\xFD |0
-<U88F7> \xE3\xF5 |0
-<U88F8> \xBB\x72 |0
-<U88F9> \xBB\x71 |0
-<U88FA> \xE3\xF9 |0
-<U88FB> \xE3\xFE |0
-<U88FC> \xE3\xFC |0
-<U88FD> \xBB\x73 |0
-<U88FE> \xE3\xFA |0
-<U88FF> \x99\xD1 |0
-<U8900> \xFE\xF1 |0
-<U8901> \xDB\xCE |0
-<U8902> \xBB\x6F |0
-<U8905> \xE7\xC2 |0
-<U8906> \xE7\xC9 |0
-<U8907> \xBD\xC6 |0
-<U8909> \xE7\xCD |0
-<U890A> \xBD\xCA |0
-<U890B> \xE7\xC5 |0
-<U890C> \xE7\xC3 |0
-<U890E> \xE7\xCC |0
-<U8910> \xBD\xC5 |0
-<U8911> \xE7\xCB |0
-<U8912> \xBD\xC7 |0
-<U8913> \xBD\xC8 |0
-<U8914> \xE7\xC4 |0
-<U8915> \xBD\xC9 |0
-<U8916> \xE7\xCA |0
-<U8917> \xE7\xC6 |0
-<U8918> \xE7\xC7 |0
-<U8919> \xE7\xC8 |0
-<U891A> \xBB\x75 |0
-<U891E> \xEB\x70 |0
-<U891F> \xEB\x7C |0
-<U8921> \xBF\xCA |0
-<U8922> \xEB\x77 |0
-<U8923> \xEB\x79 |0
-<U8924> \x99\xD2 |0
-<U8925> \xBF\xC8 |0
-<U8926> \xEB\x71 |0
-<U8927> \xEB\x75 |0
-<U8929> \xEB\x78 |0
-<U892A> \xBF\xC6 |0
-<U892B> \xBF\xC9 |0
-<U892C> \xEB\x7B |0
-<U892D> \xEB\x73 |0
-<U892E> \xEB\x74 |0
-<U892F> \xEB\x7A |0
-<U8930> \xEB\x72 |0
-<U8931> \xEB\x76 |0
-<U8932> \xBF\xC7 |0
-<U8933> \xEE\x72 |0
-<U8935> \xEE\x71 |0
-<U8936> \xC1\xB7 |0
-<U8937> \xEE\x77 |0
-<U8938> \xC1\xB9 |0
-<U893B> \xC1\xB6 |0
-<U893C> \xEE\x73 |0
-<U893D> \xC1\xBA |0
-<U893E> \xEE\x74 |0
-<U8941> \xEE\x75 |0
-<U8942> \xEE\x78 |0
-<U8943> \x9C\xC2 |0
-<U8944> \xC1\xB8 |0
-<U8946> \xF0\xD6 |0
-<U8947> \x99\xD3 |0
-<U8949> \xF0\xD9 |0
-<U894B> \xF0\xD3 |0
-<U894C> \xF0\xD5 |0
-<U894D> \x95\xA7 |0
-<U894F> \xF0\xD4 |0
-<U8950> \xF0\xD7 |0
-<U8951> \xF0\xD8 |0
-<U8952> \xEE\x76 |0
-<U8953> \xF0\xD2 |0
-<U8954> \x95\xA9 |0
-<U8956> \xC3\xCD |0
-<U8957> \xF2\xEC |0
-<U8958> \xF2\xEF |0
-<U8959> \xF2\xF1 |0
-<U895A> \xF2\xEA |0
-<U895B> \xF2\xEB |0
-<U895C> \xF2\xEE |0
-<U895D> \xF2\xF0 |0
-<U895E> \xC3\xCE |0
-<U895F> \xC3\xCC |0
-<U8960> \xC3\xCB |0
-<U8961> \xF2\xED |0
-<U8962> \xF2\xE9 |0
-<U8963> \xF4\xCA |0
-<U8964> \xC4\xB0 |0
-<U8965> \x95\xA6 |0
-<U8966> \xF4\xCB |0
-<U8969> \xF6\x49 |0
-<U896A> \xC4\xFB |0
-<U896B> \xF6\x4B |0
-<U896C> \xC4\xFC |0
-<U896D> \xF6\x48 |0
-<U896E> \xF6\x4A |0
-<U896F> \xC5\xA8 |0
-<U8971> \xF7\x52 |0
-<U8972> \xC5\xA7 |0
-<U8973> \xF7\xFD |0
-<U8974> \xF7\xFC |0
-<U8976> \xF7\xFB |0
-<U8977> \x9C\x5D |0
-<U8979> \xF9\x48 |0
-<U897A> \xF9\x49 |0
-<U897B> \xF9\x4B |0
-<U897C> \xF9\x4A |0
-<U897E> \xCA\x50 |0
-<U897F> \xA6\xE8 |0
-<U8980> \x98\xE2 |0
-<U8981> \xAD\x6E |0
-<U8982> \xD7\xC5 |0
-<U8983> \xB5\xF7 |0
-<U8985> \xDF\xFA |0
-<U8986> \xC2\xD0 |0
-<U8987> \x8F\xC9 |0
-<U8988> \xF2\xF2 |0
-<U8989> \xA0\xC2 |0
-<U898A> \x8F\xCA |0
-<U898B> \xA8\xA3 |0
-<U898F> \xB3\x57 |0
-<U8991> \x99\xD4 |0
-<U8993> \xB3\x56 |0
-<U8994> \xA0\xB9 |0
-<U8995> \xDB\xD0 |0
-<U8996> \xB5\xF8 |0
-<U8997> \xDB\xD2 |0
-<U8998> \xDB\xD1 |0
-<U899B> \xDF\xFB |0
-<U899C> \xB8\xD0 |0
-<U899D> \xE4\x43 |0
-<U899E> \xE4\x46 |0
-<U899F> \xE4\x45 |0
-<U89A1> \xE4\x44 |0
-<U89A2> \xE7\xCE |0
-<U89A3> \xE7\xD0 |0
-<U89A4> \xE7\xCF |0
-<U89A5> \x9B\x58 |0
-<U89A6> \xBF\xCC |0
-<U89A7> \x8F\xCD |0
-<U89A9> \xA0\xD4 |0
-<U89AA> \xBF\xCB |0
-<U89AC> \xC1\xBB |0
-<U89AD> \xEE\x79 |0
-<U89AE> \xEE\x7B |0
-<U89AF> \xEE\x7A |0
-<U89B2> \xC2\xD1 |0
-<U89B6> \xF2\xF4 |0
-<U89B7> \xF2\xF3 |0
-<U89B9> \xF4\xCC |0
-<U89BA> \xC4\xB1 |0
-<U89BC> \x8F\xCE |0
-<U89BD> \xC4\xFD |0
-<U89BE> \xF7\x54 |0
-<U89BF> \xF7\x53 |0
-<U89C0> \xC6\x5B |0
-<U89C1> \x8B\xE5 |0
-<U89C6> \x89\x79 |0
-<U89D2> \xA8\xA4 |0
-<U89D3> \xD0\xAF |0
-<U89D4> \xAD\x6F |0
-<U89D5> \xD7\xC8 |0
-<U89D6> \xD7\xC6 |0
-<U89D9> \xD7\xC7 |0
-<U89DA> \xDB\xD4 |0
-<U89DB> \xDB\xD5 |0
-<U89DC> \xE0\x43 |0
-<U89DD> \xDB\xD3 |0
-<U89DF> \xDF\xFC |0
-<U89E0> \xE0\x41 |0
-<U89E1> \xE0\x40 |0
-<U89E2> \xE0\x42 |0
-<U89E3> \xB8\xD1 |0
-<U89E4> \xDF\xFE |0
-<U89E5> \xDF\xFD |0
-<U89E6> \xE0\x44 |0
-<U89E7> \x8F\xD0 |0
-<U89E8> \xE4\x49 |0
-<U89E9> \xE4\x47 |0
-<U89EB> \xE4\x48 |0
-<U89EC> \xE7\xD3 |0
-<U89ED> \xE7\xD1 |0
-<U89F0> \xE7\xD2 |0
-<U89F1> \xEB\x7D |0
-<U89F2> \xEE\x7C |0
-<U89F3> \xEE\x7D |0
-<U89F4> \xC2\xD2 |0
-<U89F6> \xF2\xF5 |0
-<U89F7> \xF4\xCD |0
-<U89F8> \xC4\xB2 |0
-<U89FA> \xF6\x4C |0
-<U89FB> \xF7\x55 |0
-<U89FC> \xC5\xA9 |0
-<U89FE> \xF7\xFE |0
-<U89FF> \xF9\x4C |0
-<U8A00> \xA8\xA5 |0
-<U8A02> \xAD\x71 |0
-<U8A03> \xAD\x72 |0
-<U8A04> \xD0\xB0 |0
-<U8A07> \xD0\xB1 |0
-<U8A08> \xAD\x70 |0
-<U8A0A> \xB0\x54 |0
-<U8A0C> \xB0\x52 |0
-<U8A0E> \xB0\x51 |0
-<U8A0F> \xB0\x58 |0
-<U8A10> \xB0\x50 |0
-<U8A11> \xB0\x59 |0
-<U8A12> \xD3\xDD |0
-<U8A13> \xB0\x56 |0
-<U8A15> \xB0\x53 |0
-<U8A16> \xB0\x57 |0
-<U8A17> \xB0\x55 |0
-<U8A18> \xB0\x4F |0
-<U8A1B> \xB3\x5F |0
-<U8A1C> \x95\xB6 |0
-<U8A1D> \xB3\x59 |0
-<U8A1E> \xD7\xCC |0
-<U8A1F> \xB3\x5E |0
-<U8A22> \xB3\x60 |0
-<U8A23> \xB3\x5A |0
-<U8A25> \xB3\x5B |0
-<U8A27> \xD7\xCA |0
-<U8A29> \x99\xD6 |0
-<U8A2A> \xB3\x58 |0
-<U8A2B> \x95\xE5 |0
-<U8A2C> \xD7\xCB |0
-<U8A2D> \xB3\x5D |0
-<U8A30> \xD7\xC9 |0
-<U8A31> \xB3\x5C |0
-<U8A34> \xB6\x44 |0
-<U8A36> \xB6\x46 |0
-<U8A38> \x99\xD7 |0
-<U8A39> \xDB\xD8 |0
-<U8A3A> \xB6\x45 |0
-<U8A3B> \xB5\xF9 |0
-<U8A3C> \xB5\xFD |0
-<U8A3D> \x95\xB5 |0
-<U8A3E> \xB8\xE4 |0
-<U8A3F> \xE0\x49 |0
-<U8A40> \xDB\xDA |0
-<U8A41> \xB5\xFE |0
-<U8A44> \xDB\xDD |0
-<U8A45> \xDB\xDE |0
-<U8A46> \xB6\x43 |0
-<U8A48> \xDB\xE0 |0
-<U8A49> \xA0\xCA |0
-<U8A4A> \xDB\xE2 |0
-<U8A4C> \xDB\xE3 |0
-<U8A4D> \xDB\xD7 |0
-<U8A4E> \xDB\xD6 |0
-<U8A4F> \xDB\xE4 |0
-<U8A50> \xB6\x42 |0
-<U8A51> \xDB\xE1 |0
-<U8A52> \xDB\xDF |0
-<U8A54> \xB6\x40 |0
-<U8A55> \xB5\xFB |0
-<U8A56> \xB6\x47 |0
-<U8A57> \xDB\xDB |0
-<U8A58> \xDB\xDC |0
-<U8A59> \xDB\xD9 |0
-<U8A5B> \xB6\x41 |0
-<U8A5E> \xB5\xFC |0
-<U8A60> \xB5\xFA |0
-<U8A61> \xE0\x48 |0
-<U8A62> \xB8\xDF |0
-<U8A63> \xB8\xDA |0
-<U8A66> \xB8\xD5 |0
-<U8A67> \x9F\xFD |0
-<U8A68> \xB8\xE5 |0
-<U8A69> \xB8\xD6 |0
-<U8A6B> \xB8\xD2 |0
-<U8A6C> \xB8\xE1 |0
-<U8A6D> \xB8\xDE |0
-<U8A6E> \xB8\xE0 |0
-<U8A70> \xB8\xD7 |0
-<U8A71> \xB8\xDC |0
-<U8A72> \xB8\xD3 |0
-<U8A73> \xB8\xD4 |0
-<U8A74> \xE0\x50 |0
-<U8A75> \xE0\x4D |0
-<U8A76> \xE0\x45 |0
-<U8A77> \xE0\x4A |0
-<U8A79> \xB8\xE2 |0
-<U8A7A> \xE0\x51 |0
-<U8A7B> \xB8\xE3 |0
-<U8A7C> \xB8\xD9 |0
-<U8A7E> \xA0\x58 |0
-<U8A7F> \xE0\x47 |0
-<U8A81> \xE0\x4F |0
-<U8A82> \xE0\x4B |0
-<U8A83> \xE0\x4E |0
-<U8A84> \xE0\x4C |0
-<U8A85> \xB8\xDD |0
-<U8A86> \xE0\x46 |0
-<U8A87> \xB8\xD8 |0
-<U8A8B> \xE4\x4C |0
-<U8A8C> \xBB\x78 |0
-<U8A8D> \xBB\x7B |0
-<U8A8F> \xE4\x4E |0
-<U8A90> \x8F\xD6 |0
-<U8A91> \xBB\xA5 |0
-<U8A92> \xE4\x4D |0
-<U8A93> \xBB\x7D |0
-<U8A94> \x99\xD8 |0
-<U8A95> \xBD\xCF |0
-<U8A96> \xE4\x4F |0
-<U8A98> \xBB\xA4 |0
-<U8A99> \xE4\x4B |0
-<U8A9A> \xBB\xA6 |0
-<U8A9C> \x8F\xD3 |0
-<U8A9E> \xBB\x79 |0
-<U8AA0> \xB8\xDB |0
-<U8AA1> \xBB\x7C |0
-<U8AA3> \xBB\x7A |0
-<U8AA4> \xBB\x7E |0
-<U8AA5> \xBB\xA2 |0
-<U8AA6> \xBB\x77 |0
-<U8AA7> \xBB\xA7 |0
-<U8AA8> \xBB\xA3 |0
-<U8AA9> \x8F\xE5 |0
-<U8AAA> \xBB\xA1 |0
-<U8AAB> \xE4\x4A |0
-<U8AAF> \x8F\xE9 |0
-<U8AB0> \xBD\xD6 |0
-<U8AB2> \xBD\xD2 |0
-<U8AB4> \x99\xD9 |0
-<U8AB6> \xBD\xD9 |0
-<U8AB8> \xE7\xD6 |0
-<U8AB9> \xBD\xDA |0
-<U8ABA> \xE7\xE2 |0
-<U8ABB> \xE7\xDB |0
-<U8ABC> \xBD\xCB |0
-<U8ABD> \xE7\xE3 |0
-<U8ABE> \xE7\xDD |0
-<U8ABF> \xBD\xD5 |0
-<U8AC0> \xE7\xDE |0
-<U8AC2> \xBD\xD4 |0
-<U8AC3> \xE7\xE1 |0
-<U8AC4> \xBD\xCE |0
-<U8AC5> \xE7\xDF |0
-<U8AC6> \xE7\xD5 |0
-<U8AC7> \xBD\xCD |0
-<U8AC8> \xEB\xAA |0
-<U8AC9> \xBD\xD3 |0
-<U8ACB> \xBD\xD0 |0
-<U8ACD> \xBD\xD8 |0
-<U8ACF> \xE7\xD4 |0
-<U8AD1> \xE7\xD8 |0
-<U8AD2> \xBD\xCC |0
-<U8AD3> \xE7\xD7 |0
-<U8AD4> \xE7\xD9 |0
-<U8AD5> \xE7\xDA |0
-<U8AD6> \xBD\xD7 |0
-<U8AD7> \xE7\xDC |0
-<U8AD8> \xE7\xE0 |0
-<U8AD9> \xE7\xE4 |0
-<U8ADA> \x92\x7C |0
-<U8ADB> \xBD\xDB |0
-<U8ADC> \xBF\xD2 |0
-<U8ADD> \xEB\xA5 |0
-<U8ADE> \xEB\xAB |0
-<U8ADF> \xEB\xA8 |0
-<U8AE0> \xEB\x7E |0
-<U8AE1> \xEB\xAC |0
-<U8AE2> \xEB\xA1 |0
-<U8AE4> \xEB\xA7 |0
-<U8AE6> \xBF\xCD |0
-<U8AE7> \xBF\xD3 |0
-<U8AE8> \xEB\xAD |0
-<U8AEA> \x9C\x45 |0
-<U8AEB> \xBF\xCF |0
-<U8AED> \xBF\xD9 |0
-<U8AEE> \xBF\xD4 |0
-<U8AEF> \xEB\xAF |0
-<U8AF0> \xEB\xA9 |0
-<U8AF1> \xBF\xD0 |0
-<U8AF2> \xEB\xA2 |0
-<U8AF3> \xBF\xDA |0
-<U8AF4> \xEB\xA3 |0
-<U8AF5> \xEB\xA4 |0
-<U8AF6> \xBF\xDB |0
-<U8AF7> \xBF\xD8 |0
-<U8AF8> \xBD\xD1 |0
-<U8AFA> \xBF\xCE |0
-<U8AFB> \xEB\xB0 |0
-<U8AFC> \xBF\xDC |0
-<U8AFE> \xBF\xD5 |0
-<U8AFF> \xEB\xAE |0
-<U8B00> \xBF\xD1 |0
-<U8B01> \xBF\xD6 |0
-<U8B02> \xBF\xD7 |0
-<U8B04> \xC1\xC3 |0
-<U8B05> \xEE\xA4 |0
-<U8B06> \xEE\xAD |0
-<U8B07> \xEE\xAA |0
-<U8B08> \xEE\xAC |0
-<U8B0A> \xC1\xC0 |0
-<U8B0B> \xEE\xA5 |0
-<U8B0C> \x8F\xDE |0
-<U8B0D> \xEE\xAB |0
-<U8B0E> \xC1\xBC |0
-<U8B0F> \xEE\xA7 |0
-<U8B10> \xC1\xC4 |0
-<U8B11> \xEE\xA3 |0
-<U8B12> \xEE\xA8 |0
-<U8B13> \xEE\xAF |0
-<U8B14> \xEB\xA6 |0
-<U8B15> \xEE\xA9 |0
-<U8B16> \xEE\xA2 |0
-<U8B17> \xC1\xBD |0
-<U8B18> \xEE\xA1 |0
-<U8B19> \xC1\xBE |0
-<U8B1A> \xEE\xB0 |0
-<U8B1B> \xC1\xBF |0
-<U8B1C> \xEE\xAE |0
-<U8B1D> \xC1\xC2 |0
-<U8B1E> \xEE\x7E |0
-<U8B1F> \x8F\xDF |0
-<U8B20> \xC1\xC1 |0
-<U8B22> \xEE\xA6 |0
-<U8B23> \xF0\xDC |0
-<U8B24> \xF0\xEA |0
-<U8B25> \xF0\xE5 |0
-<U8B26> \xF0\xE7 |0
-<U8B27> \xF0\xDB |0
-<U8B28> \xC2\xD3 |0
-<U8B2A> \xF0\xDA |0
-<U8B2B> \xC2\xD6 |0
-<U8B2C> \xC2\xD5 |0
-<U8B2D> \xA0\x4B |0
-<U8B2E> \xF0\xE9 |0
-<U8B2F> \xF0\xE1 |0
-<U8B30> \xF0\xDE |0
-<U8B31> \xF0\xE4 |0
-<U8B33> \xF0\xDD |0
-<U8B35> \xF0\xDF |0
-<U8B36> \xF0\xE8 |0
-<U8B37> \xF0\xE6 |0
-<U8B39> \xC2\xD4 |0
-<U8B3A> \xF0\xED |0
-<U8B3B> \xF0\xEB |0
-<U8B3C> \xF0\xE2 |0
-<U8B3D> \xF0\xEC |0
-<U8B3E> \xF0\xE3 |0
-<U8B3F> \x8F\xE2 |0
-<U8B40> \xF2\xF9 |0
-<U8B41> \xC3\xCF |0
-<U8B42> \xF3\x41 |0
-<U8B43> \xA0\xCC |0
-<U8B45> \xF6\x4F |0
-<U8B46> \xC3\xD6 |0
-<U8B47> \xF0\xE0 |0
-<U8B48> \xF2\xF7 |0
-<U8B49> \xC3\xD2 |0
-<U8B4A> \xF2\xF8 |0
-<U8B4B> \xF2\xFD |0
-<U8B4C> \x8F\xE3 |0
-<U8B4D> \x8F\xE4 |0
-<U8B4E> \xC3\xD4 |0
-<U8B4F> \xC3\xD5 |0
-<U8B50> \xF2\xF6 |0
-<U8B51> \xF3\x40 |0
-<U8B52> \xF3\x42 |0
-<U8B53> \xF2\xFA |0
-<U8B54> \xF2\xFC |0
-<U8B55> \xF2\xFE |0
-<U8B56> \xF2\xFB |0
-<U8B57> \xF3\x43 |0
-<U8B58> \xC3\xD1 |0
-<U8B59> \xC3\xD7 |0
-<U8B5A> \xC3\xD3 |0
-<U8B5C> \xC3\xD0 |0
-<U8B5D> \xF4\xD0 |0
-<U8B5E> \x9B\xC4 |0
-<U8B5F> \xC4\xB7 |0
-<U8B60> \xF4\xCE |0
-<U8B62> \x9B\xFC |0
-<U8B63> \xF4\xD2 |0
-<U8B65> \xF4\xD3 |0
-<U8B66> \xC4\xB5 |0
-<U8B67> \xF4\xD4 |0
-<U8B68> \xF4\xD1 |0
-<U8B69> \x96\x4C |0
-<U8B6A> \xF4\xCF |0
-<U8B6B> \xC4\xB8 |0
-<U8B6C> \xC4\xB4 |0
-<U8B6D> \xF4\xD5 |0
-<U8B6F> \xC4\xB6 |0
-<U8B70> \xC4\xB3 |0
-<U8B74> \xC4\xFE |0
-<U8B77> \xC5\x40 |0
-<U8B78> \xF6\x4E |0
-<U8B79> \xF6\x4D |0
-<U8B7A> \xF6\x50 |0
-<U8B7B> \xF6\x51 |0
-<U8B7D> \xC5\x41 |0
-<U8B7E> \xF7\x56 |0
-<U8B7F> \xF7\x5B |0
-<U8B80> \xC5\xAA |0
-<U8B81> \x9A\xF6 |0
-<U8B82> \xF7\x58 |0
-<U8B84> \xF7\x57 |0
-<U8B85> \xF7\x5A |0
-<U8B86> \xF7\x59 |0
-<U8B88> \xF8\x43 |0
-<U8B8A> \xC5\xDC |0
-<U8B8B> \xF8\x42 |0
-<U8B8C> \xF8\x40 |0
-<U8B8E> \xF8\x41 |0
-<U8B90> \x8F\xE7 |0
-<U8B92> \xC5\xFE |0
-<U8B93> \xC5\xFD |0
-<U8B94> \xF8\xC1 |0
-<U8B95> \xF8\xC2 |0
-<U8B96> \xC6\x40 |0
-<U8B98> \xF9\x4D |0
-<U8B99> \xF9\x4E |0
-<U8B9A> \xC6\x67 |0
-<U8B9B> \x8F\xE8 |0
-<U8B9C> \xC6\x6D |0
-<U8B9E> \xF9\xA9 |0
-<U8B9F> \xF9\xC8 |0
-<U8BA0> \x8B\xE7 |0
-<U8BBE> \x89\x7A |0
-<U8BE2> \x89\x7B |0
-<U8C37> \xA8\xA6 |0
-<U8C39> \xD7\xCD |0
-<U8C3B> \xD7\xCE |0
-<U8C3C> \xE0\x52 |0
-<U8C3D> \xE4\x50 |0
-<U8C3E> \xE7\xE5 |0
-<U8C3F> \xC1\xC6 |0
-<U8C41> \xC1\xC5 |0
-<U8C42> \xF0\xEE |0
-<U8C43> \xF3\x44 |0
-<U8C45> \xF8\x44 |0
-<U8C46> \xA8\xA7 |0
-<U8C47> \xD3\xDE |0
-<U8C48> \xB0\x5A |0
-<U8C49> \xB3\x61 |0
-<U8C4A> \xE0\x54 |0
-<U8C4B> \xE0\x53 |0
-<U8C4C> \xBD\xDC |0
-<U8C4D> \xE7\xE6 |0
-<U8C4E> \xBD\xDD |0
-<U8C4F> \xEE\xB1 |0
-<U8C50> \xC2\xD7 |0
-<U8C51> \x99\xDA |0
-<U8C54> \xC6\x76 |0
-<U8C55> \xA8\xA8 |0
-<U8C56> \xCD\xCB |0
-<U8C57> \xD3\xDF |0
-<U8C5A> \xB3\x62 |0
-<U8C5C> \xD7\xCF |0
-<U8C5D> \xD7\xD0 |0
-<U8C5F> \xDB\xE5 |0
-<U8C61> \xB6\x48 |0
-<U8C62> \xB8\xE6 |0
-<U8C64> \xE0\x56 |0
-<U8C65> \xE0\x55 |0
-<U8C66> \xE0\x57 |0
-<U8C68> \xE4\x51 |0
-<U8C69> \xE4\x52 |0
-<U8C6A> \xBB\xA8 |0
-<U8C6B> \xBF\xDD |0
-<U8C6C> \xBD\xDE |0
-<U8C6D> \xBF\xDE |0
-<U8C6F> \xEE\xB5 |0
-<U8C70> \xEE\xB2 |0
-<U8C71> \xEE\xB4 |0
-<U8C72> \xEE\xB3 |0
-<U8C73> \xC1\xC7 |0
-<U8C75> \xF0\xEF |0
-<U8C76> \xF3\x46 |0
-<U8C77> \xF3\x45 |0
-<U8C78> \xCB\xA4 |0
-<U8C79> \xB0\x5C |0
-<U8C7A> \xB0\x5B |0
-<U8C7B> \xD3\xE0 |0
-<U8C7D> \xD7\xD1 |0
-<U8C80> \xDB\xE7 |0
-<U8C81> \xDB\xE6 |0
-<U8C82> \xB6\x49 |0
-<U8C84> \xE0\x59 |0
-<U8C85> \xE0\x5A |0
-<U8C86> \xE0\x58 |0
-<U8C89> \xB8\xE8 |0
-<U8C8A> \xB8\xE7 |0
-<U8C8C> \xBB\xAA |0
-<U8C8D> \xBB\xA9 |0
-<U8C8F> \xE7\xE7 |0
-<U8C90> \xEB\xB3 |0
-<U8C91> \xEB\xB1 |0
-<U8C92> \xEB\xB2 |0
-<U8C93> \xBF\xDF |0
-<U8C94> \xEE\xB7 |0
-<U8C95> \xEE\xB6 |0
-<U8C97> \xF0\xF2 |0
-<U8C98> \xF0\xF1 |0
-<U8C99> \xF0\xF0 |0
-<U8C9A> \xF3\x47 |0
-<U8C9B> \x8F\xED |0
-<U8C9C> \xF9\xAA |0
-<U8C9D> \xA8\xA9 |0
-<U8C9E> \xAD\x73 |0
-<U8C9F> \x95\xC0 |0
-<U8CA0> \xAD\x74 |0
-<U8CA1> \xB0\x5D |0
-<U8CA2> \xB0\x5E |0
-<U8CA3> \xD3\xE2 |0
-<U8CA4> \xD3\xE1 |0
-<U8CA5> \xD7\xD2 |0
-<U8CA7> \xB3\x68 |0
-<U8CA8> \xB3\x66 |0
-<U8CA9> \xB3\x63 |0
-<U8CAA> \xB3\x67 |0
-<U8CAB> \xB3\x65 |0
-<U8CAC> \xB3\x64 |0
-<U8CAD> \xA0\xCB |0
-<U8CAF> \xB6\x4A |0
-<U8CB0> \xDB\xEA |0
-<U8CB2> \xB8\xED |0
-<U8CB3> \xB6\x4C |0
-<U8CB4> \xB6\x51 |0
-<U8CB5> \xDB\xEC |0
-<U8CB6> \xB6\x53 |0
-<U8CB7> \xB6\x52 |0
-<U8CB8> \xB6\x55 |0
-<U8CB9> \xDB\xEB |0
-<U8CBA> \xDB\xE8 |0
-<U8CBB> \xB6\x4F |0
-<U8CBC> \xB6\x4B |0
-<U8CBD> \xB6\x4D |0
-<U8CBE> \xDB\xE9 |0
-<U8CBF> \xB6\x54 |0
-<U8CC0> \xB6\x50 |0
-<U8CC1> \xB6\x4E |0
-<U8CC2> \xB8\xEF |0
-<U8CC3> \xB8\xEE |0
-<U8CC4> \xB8\xEC |0
-<U8CC5> \xB8\xF0 |0
-<U8CC7> \xB8\xEA |0
-<U8CC8> \xB8\xEB |0
-<U8CCA> \xB8\xE9 |0
-<U8CCC> \xE0\x5B |0
-<U8CCD> \x9E\x48 |0
-<U8CCF> \xE4\x54 |0
-<U8CD1> \xBB\xAC |0
-<U8CD2> \xBB\xAD |0
-<U8CD3> \xBB\xAB |0
-<U8CD4> \x99\xDB |0
-<U8CD5> \xE4\x53 |0
-<U8CD6> \x8F\xF3 |0
-<U8CD7> \xE4\x55 |0
-<U8CD9> \xE7\xEA |0
-<U8CDA> \xE7\xEC |0
-<U8CDB> \x8F\xF9 |0
-<U8CDC> \xBD\xE7 |0
-<U8CDD> \xE7\xED |0
-<U8CDE> \xBD\xE0 |0
-<U8CDF> \xE7\xE9 |0
-<U8CE0> \xBD\xDF |0
-<U8CE1> \xBD\xE9 |0
-<U8CE2> \xBD\xE5 |0
-<U8CE3> \xBD\xE6 |0
-<U8CE4> \xBD\xE2 |0
-<U8CE5> \xE7\xE8 |0
-<U8CE6> \xBD\xE1 |0
-<U8CE7> \xE7\xEE |0
-<U8CE8> \xE7\xEB |0
-<U8CE9> \x95\xC1 |0
-<U8CEA> \xBD\xE8 |0
-<U8CEB> \xA0\x4E |0
-<U8CEC> \xBD\xE3 |0
-<U8CED> \xBD\xE4 |0
-<U8CEE> \xEB\xB5 |0
-<U8CF0> \xEB\xB7 |0
-<U8CF1> \xEB\xB6 |0
-<U8CF2> \x99\xDC |0
-<U8CF3> \xEB\xB8 |0
-<U8CF4> \xBF\xE0 |0
-<U8CF5> \xEB\xB4 |0
-<U8CF7> \xA0\x64 |0
-<U8CF8> \xC1\xCB |0
-<U8CF9> \xEE\xB8 |0
-<U8CFA> \xC1\xC8 |0
-<U8CFB> \xC1\xCC |0
-<U8CFC> \xC1\xCA |0
-<U8CFD> \xC1\xC9 |0
-<U8CFE> \xF0\xF3 |0
-<U8D00> \xF0\xF6 |0
-<U8D02> \xF0\xF5 |0
-<U8D03> \x8F\xF7 |0
-<U8D04> \xF0\xF4 |0
-<U8D05> \xC2\xD8 |0
-<U8D06> \xF3\x48 |0
-<U8D07> \xF3\x49 |0
-<U8D08> \xC3\xD8 |0
-<U8D09> \xF3\x4A |0
-<U8D0A> \xC3\xD9 |0
-<U8D0B> \x89\xB0 |0
-<U8D0C> \xA0\x48 |0
-<U8D0D> \xC4\xBA |0
-<U8D0F> \xC4\xB9 |0
-<U8D10> \xF6\x52 |0
-<U8D11> \x8F\xFB |0
-<U8D12> \x8F\xF6 |0
-<U8D13> \xC5\x42 |0
-<U8D14> \xF6\x53 |0
-<U8D15> \xF7\x5C |0
-<U8D16> \xC5\xAB |0
-<U8D17> \xC5\xAC |0
-<U8D18> \x9D\xDC |0
-<U8D19> \xF8\x45 |0
-<U8D1B> \xC6\x42 |0
-<U8D1C> \x99\xDD |0
-<U8D1D> \x8B\xE8 |0
-<U8D64> \xA8\xAA |0
-<U8D66> \xB3\x6A |0
-<U8D67> \xB3\x69 |0
-<U8D68> \xE0\x5C |0
-<U8D69> \xE0\x5D |0
-<U8D6B> \xBB\xAE |0
-<U8D6C> \xEB\xB9 |0
-<U8D6D> \xBD\xEA |0
-<U8D6E> \xEB\xBA |0
-<U8D6F> \xEE\xB9 |0
-<U8D70> \xA8\xAB |0
-<U8D72> \xD0\xB2 |0
-<U8D73> \xAD\x76 |0
-<U8D74> \xAD\x75 |0
-<U8D76> \xD3\xE3 |0
-<U8D77> \xB0\x5F |0
-<U8D78> \xD3\xE4 |0
-<U8D79> \xD7\xD5 |0
-<U8D7A> \x92\xC1 |0
-<U8D7B> \xD7\xD4 |0
-<U8D7D> \xD7\xD3 |0
-<U8D80> \xDB\xEE |0
-<U8D81> \xB6\x58 |0
-<U8D82> \x9F\xD6 |0
-<U8D84> \xDB\xED |0
-<U8D85> \xB6\x57 |0
-<U8D89> \xDB\xEF |0
-<U8D8A> \xB6\x56 |0
-<U8D8C> \xE0\x5F |0
-<U8D8D> \xE0\x62 |0
-<U8D8E> \xE0\x60 |0
-<U8D8F> \xE0\x61 |0
-<U8D90> \xE0\x65 |0
-<U8D91> \xE0\x5E |0
-<U8D92> \xE0\x66 |0
-<U8D93> \xE0\x63 |0
-<U8D94> \xE0\x64 |0
-<U8D95> \xBB\xB0 |0
-<U8D96> \xE4\x56 |0
-<U8D99> \xBB\xAF |0
-<U8D9B> \xE7\xF2 |0
-<U8D9C> \xE7\xF0 |0
-<U8D9F> \xBD\xEB |0
-<U8DA0> \xE7\xEF |0
-<U8DA1> \xE7\xF1 |0
-<U8DA3> \xBD\xEC |0
-<U8DA5> \xEB\xBB |0
-<U8DA6> \xA0\xD2 |0
-<U8DA7> \xEB\xBC |0
-<U8DA8> \xC1\xCD |0
-<U8DA9> \x90\x40 |0
-<U8DAA> \xF3\x4C |0
-<U8DAB> \xF3\x4E |0
-<U8DAC> \xF3\x4B |0
-<U8DAD> \xF3\x4D |0
-<U8DAE> \xF4\xD6 |0
-<U8DAF> \xF6\x54 |0
-<U8DB2> \xF9\x6F |0
-<U8DB3> \xA8\xAC |0
-<U8DB4> \xAD\x77 |0
-<U8DB5> \xD3\xE5 |0
-<U8DB6> \xD3\xE7 |0
-<U8DB7> \xD3\xE6 |0
-<U8DB9> \xD7\xD8 |0
-<U8DBA> \xB3\x6C |0
-<U8DBC> \xD7\xD6 |0
-<U8DBE> \xB3\x6B |0
-<U8DBF> \xD7\xD9 |0
-<U8DC0> \x8A\xC4 |0
-<U8DC1> \xD7\xDA |0
-<U8DC2> \xD7\xD7 |0
-<U8DC3> \x99\xE0 |0
-<U8DC5> \xDB\xFB |0
-<U8DC6> \xB6\x60 |0
-<U8DC7> \xDB\xF3 |0
-<U8DC8> \xDB\xF9 |0
-<U8DCB> \xB6\x5B |0
-<U8DCC> \xB6\x5E |0
-<U8DCD> \xDB\xF2 |0
-<U8DCE> \xB6\x59 |0
-<U8DCF> \xDB\xF6 |0
-<U8DD0> \xE0\x6C |0
-<U8DD1> \xB6\x5D |0
-<U8DD3> \xDB\xF1 |0
-<U8DD4> \x9F\xF0 |0
-<U8DD5> \xDB\xF7 |0
-<U8DD6> \xDB\xF4 |0
-<U8DD7> \xDB\xFA |0
-<U8DD8> \xDB\xF0 |0
-<U8DD9> \xDB\xF8 |0
-<U8DDA> \xB6\x5C |0
-<U8DDB> \xB6\x5F |0
-<U8DDC> \xDB\xF5 |0
-<U8DDD> \xB6\x5A |0
-<U8DDF> \xB8\xF2 |0
-<U8DE0> \xE0\x68 |0
-<U8DE1> \xB8\xF1 |0
-<U8DE2> \xE0\x6F |0
-<U8DE3> \xE0\x6E |0
-<U8DE4> \xB8\xF8 |0
-<U8DE6> \xB8\xF9 |0
-<U8DE7> \xE0\x70 |0
-<U8DE8> \xB8\xF3 |0
-<U8DE9> \xE0\x6D |0
-<U8DEA> \xB8\xF7 |0
-<U8DEB> \xE0\x72 |0
-<U8DEC> \xE0\x69 |0
-<U8DEE> \xE0\x6B |0
-<U8DEF> \xB8\xF4 |0
-<U8DF0> \xE0\x67 |0
-<U8DF1> \xE0\x6A |0
-<U8DF2> \xE0\x71 |0
-<U8DF3> \xB8\xF5 |0
-<U8DF4> \xE0\x73 |0
-<U8DFA> \xB8\xF6 |0
-<U8DFC> \xBB\xB1 |0
-<U8DFD> \xE4\x5B |0
-<U8DFE> \xE4\x61 |0
-<U8DFF> \xE4\x59 |0
-<U8E00> \xE4\x62 |0
-<U8E01> \x9F\xF3 |0
-<U8E02> \xE4\x58 |0
-<U8E03> \xE4\x5D |0
-<U8E04> \xE4\x63 |0
-<U8E05> \xE4\x60 |0
-<U8E06> \xE4\x5F |0
-<U8E07> \xE4\x5E |0
-<U8E09> \xE4\x57 |0
-<U8E0A> \xE4\x5C |0
-<U8E0D> \xE4\x5A |0
-<U8E0E> \x9D\xBF |0
-<U8E0F> \xBD\xF1 |0
-<U8E10> \xBD\xEE |0
-<U8E11> \xE7\xFB |0
-<U8E12> \xE8\x41 |0
-<U8E13> \xE8\x43 |0
-<U8E14> \xE8\x40 |0
-<U8E15> \xE7\xF8 |0
-<U8E16> \xE7\xFA |0
-<U8E17> \xE8\x45 |0
-<U8E18> \xE8\x42 |0
-<U8E19> \xE7\xFC |0
-<U8E1A> \xE8\x46 |0
-<U8E1B> \xE7\xF9 |0
-<U8E1C> \xE8\x44 |0
-<U8E1D> \xBD\xEF |0
-<U8E1E> \xBD\xF5 |0
-<U8E1F> \xBD\xF3 |0
-<U8E20> \xE7\xF3 |0
-<U8E21> \xBD\xF4 |0
-<U8E22> \xBD\xF0 |0
-<U8E23> \xE7\xF4 |0
-<U8E24> \xE7\xF6 |0
-<U8E25> \xE7\xF5 |0
-<U8E26> \xE7\xFD |0
-<U8E27> \xE7\xFE |0
-<U8E28> \x9F\xF6 |0
-<U8E29> \xBD\xF2 |0
-<U8E2A> \x95\xC8 |0
-<U8E2B> \xBD\xED |0
-<U8E2D> \x9E\x5A |0
-<U8E2E> \xE7\xF7 |0
-<U8E30> \xEB\xC6 |0
-<U8E31> \xBF\xE2 |0
-<U8E33> \xEB\xBD |0
-<U8E34> \xBF\xE3 |0
-<U8E35> \xBF\xE6 |0
-<U8E36> \xEB\xC2 |0
-<U8E38> \xEB\xBF |0
-<U8E39> \xBF\xE5 |0
-<U8E3A> \x99\xE3 |0
-<U8E3C> \xEB\xC3 |0
-<U8E3D> \xEB\xC4 |0
-<U8E3E> \xEB\xBE |0
-<U8E3F> \xEB\xC7 |0
-<U8E40> \xEB\xC0 |0
-<U8E41> \xEB\xC5 |0
-<U8E42> \xBF\xE4 |0
-<U8E44> \xBF\xE1 |0
-<U8E45> \xEB\xC1 |0
-<U8E46> \x8A\x4A |0
-<U8E47> \xEE\xBF |0
-<U8E48> \xC1\xD0 |0
-<U8E49> \xC1\xCE |0
-<U8E4A> \xC1\xD1 |0
-<U8E4B> \xC1\xCF |0
-<U8E4C> \xEE\xBE |0
-<U8E4D> \xEE\xBB |0
-<U8E4E> \xEE\xBA |0
-<U8E4F> \x9F\xF1 |0
-<U8E50> \xEE\xBD |0
-<U8E53> \xEE\xBC |0
-<U8E54> \xF1\x45 |0
-<U8E55> \xC2\xDE |0
-<U8E56> \xF0\xFB |0
-<U8E57> \xF0\xFA |0
-<U8E59> \xC2\xD9 |0
-<U8E5A> \xF1\x41 |0
-<U8E5B> \xF1\x40 |0
-<U8E5C> \xF0\xF7 |0
-<U8E5D> \xF1\x43 |0
-<U8E5E> \xF0\xFC |0
-<U8E5F> \xC2\xDD |0
-<U8E60> \xF0\xF9 |0
-<U8E61> \xF1\x42 |0
-<U8E62> \xF0\xF8 |0
-<U8E63> \xC2\xDA |0
-<U8E64> \xC2\xDC |0
-<U8E65> \xF0\xFD |0
-<U8E66> \xC2\xDB |0
-<U8E67> \xF0\xFE |0
-<U8E68> \x8A\xA7 |0
-<U8E69> \xF1\x44 |0
-<U8E6A> \xF3\x52 |0
-<U8E6C> \xC3\xDE |0
-<U8E6D> \xF3\x4F |0
-<U8E6F> \xF3\x53 |0
-<U8E71> \x99\xE6 |0
-<U8E72> \xC3\xDB |0
-<U8E73> \xF3\x51 |0
-<U8E74> \xC3\xE0 |0
-<U8E75> \x9F\xF7 |0
-<U8E76> \xC3\xDD |0
-<U8E77> \x9F\xED |0
-<U8E78> \xF3\x50 |0
-<U8E7A> \xC3\xDF |0
-<U8E7B> \xF3\x54 |0
-<U8E7C> \xC3\xDA |0
-<U8E7E> \x8A\x5C |0
-<U8E80> \x9D\xAE |0
-<U8E81> \xC4\xBC |0
-<U8E82> \xC4\xBE |0
-<U8E84> \xF4\xD9 |0
-<U8E85> \xC4\xBD |0
-<U8E86> \xF4\xD7 |0
-<U8E87> \xC3\xDC |0
-<U8E88> \xF4\xD8 |0
-<U8E89> \xC4\xBB |0
-<U8E8A> \xC5\x43 |0
-<U8E8B> \xC5\x45 |0
-<U8E8C> \xF6\x56 |0
-<U8E8D> \xC5\x44 |0
-<U8E8E> \xF6\x55 |0
-<U8E90> \xF7\x61 |0
-<U8E91> \xC5\xAD |0
-<U8E92> \xF7\x60 |0
-<U8E93> \xC5\xAE |0
-<U8E94> \xF7\x5E |0
-<U8E95> \xF7\x5D |0
-<U8E96> \xF7\x62 |0
-<U8E97> \xF7\x63 |0
-<U8E98> \xF8\x46 |0
-<U8E9A> \xF7\x5F |0
-<U8E9D> \xF8\xC6 |0
-<U8E9E> \xF8\xC3 |0
-<U8E9F> \xF8\xC4 |0
-<U8EA0> \xF8\xC5 |0
-<U8EA1> \xC6\x5C |0
-<U8EA3> \xF9\x51 |0
-<U8EA4> \xF9\x50 |0
-<U8EA5> \xF9\x4F |0
-<U8EA6> \xF9\x70 |0
-<U8EA7> \x95\xC9 |0
-<U8EA8> \xF9\xBE |0
-<U8EA9> \xF9\xAB |0
-<U8EAA> \xC6\x6E |0
-<U8EAB> \xA8\xAD |0
-<U8EAC> \xB0\x60 |0
-<U8EAD> \x90\x48 |0
-<U8EB0> \x99\xE8 |0
-<U8EB2> \xB8\xFA |0
-<U8EB6> \x90\x49 |0
-<U8EBA> \xBD\xF6 |0
-<U8EBC> \x90\xB1 |0
-<U8EBD> \xEB\xC8 |0
-<U8EC0> \xC2\xDF |0
-<U8EC2> \xF3\x55 |0
-<U8EC3> \x90\x4A |0
-<U8EC9> \xF9\xAC |0
-<U8ECA> \xA8\xAE |0
-<U8ECB> \xAA\xEE |0
-<U8ECC> \xAD\x79 |0
-<U8ECD> \xAD\x78 |0
-<U8ECE> \x99\xEA |0
-<U8ECF> \xB0\x63 |0
-<U8ED1> \xD3\xE8 |0
-<U8ED2> \xB0\x61 |0
-<U8ED3> \xD3\xE9 |0
-<U8ED4> \xB0\x62 |0
-<U8ED7> \xD7\xDF |0
-<U8ED8> \xD7\xDB |0
-<U8EDA> \x9B\xD1 |0
-<U8EDB> \xB3\x6D |0
-<U8EDC> \xD7\xDE |0
-<U8EDD> \xD7\xDD |0
-<U8EDE> \xD7\xDC |0
-<U8EDF> \xB3\x6E |0
-<U8EE0> \xD7\xE0 |0
-<U8EE1> \xD7\xE1 |0
-<U8EE2> \x99\xEB |0
-<U8EE4> \x99\xEC |0
-<U8EE5> \xDC\x43 |0
-<U8EE6> \xDC\x41 |0
-<U8EE7> \xDC\x45 |0
-<U8EE8> \xDC\x46 |0
-<U8EE9> \xDC\x4C |0
-<U8EEB> \xDC\x48 |0
-<U8EEC> \xDC\x4A |0
-<U8EED> \x99\xED |0
-<U8EEE> \xDC\x42 |0
-<U8EEF> \xDB\xFC |0
-<U8EF1> \xDC\x49 |0
-<U8EF2> \x99\xEE |0
-<U8EF4> \xDC\x4B |0
-<U8EF5> \xDC\x44 |0
-<U8EF6> \xDC\x47 |0
-<U8EF7> \xDB\xFD |0
-<U8EF8> \xB6\x62 |0
-<U8EF9> \xDC\x40 |0
-<U8EFA> \xDB\xFE |0
-<U8EFB> \xB6\x61 |0
-<U8EFC> \xB6\x63 |0
-<U8EFE> \xB8\xFD |0
-<U8EFF> \xE0\x75 |0
-<U8F00> \xE0\x77 |0
-<U8F01> \xE0\x76 |0
-<U8F02> \xE0\x7B |0
-<U8F03> \xB8\xFB |0
-<U8F05> \xE0\x78 |0
-<U8F06> \xE0\x74 |0
-<U8F07> \xE0\x79 |0
-<U8F08> \xE0\x7A |0
-<U8F09> \xB8\xFC |0
-<U8F0A> \xB8\xFE |0
-<U8F0B> \xE0\x7C |0
-<U8F0D> \xE4\x67 |0
-<U8F0E> \xE4\x66 |0
-<U8F10> \xE4\x64 |0
-<U8F11> \xE4\x65 |0
-<U8F12> \xBB\xB3 |0
-<U8F13> \xBB\xB5 |0
-<U8F14> \xBB\xB2 |0
-<U8F15> \xBB\xB4 |0
-<U8F16> \xE8\x4D |0
-<U8F17> \xE8\x4E |0
-<U8F18> \xE8\x49 |0
-<U8F19> \x90\x4C |0
-<U8F1A> \xE8\x4A |0
-<U8F1B> \xBD\xF8 |0
-<U8F1C> \xBD\xFD |0
-<U8F1D> \xBD\xF7 |0
-<U8F1E> \xBD\xFE |0
-<U8F1F> \xBD\xF9 |0
-<U8F20> \xE8\x4B |0
-<U8F23> \xE8\x4C |0
-<U8F24> \xE8\x48 |0
-<U8F25> \xBE\x40 |0
-<U8F26> \xBD\xFB |0
-<U8F29> \xBD\xFA |0
-<U8F2A> \xBD\xFC |0
-<U8F2C> \xE8\x47 |0
-<U8F2D> \x90\x4D |0
-<U8F2E> \xEB\xCA |0
-<U8F2F> \xBF\xE8 |0
-<U8F30> \x95\xCB |0
-<U8F32> \xEB\xCC |0
-<U8F33> \xBF\xEA |0
-<U8F34> \xEB\xCF |0
-<U8F35> \xEB\xCB |0
-<U8F36> \xEB\xC9 |0
-<U8F37> \xEB\xCE |0
-<U8F38> \xBF\xE9 |0
-<U8F39> \xEB\xCD |0
-<U8F3B> \xBF\xE7 |0
-<U8F3E> \xC1\xD3 |0
-<U8F3F> \xC1\xD6 |0
-<U8F40> \xEE\xC1 |0
-<U8F41> \x97\xE2 |0
-<U8F42> \xC1\xD4 |0
-<U8F43> \xEE\xC0 |0
-<U8F44> \xC1\xD2 |0
-<U8F45> \xC1\xD5 |0
-<U8F46> \xF1\x46 |0
-<U8F47> \xF1\x47 |0
-<U8F48> \xF1\x48 |0
-<U8F49> \xC2\xE0 |0
-<U8F4A> \x95\xCC |0
-<U8F4B> \xF1\x49 |0
-<U8F4D> \xC2\xE1 |0
-<U8F4E> \xC3\xE2 |0
-<U8F4F> \xF3\x58 |0
-<U8F50> \xF3\x59 |0
-<U8F51> \xF3\x57 |0
-<U8F52> \xF3\x56 |0
-<U8F53> \xF3\x5A |0
-<U8F54> \xC3\xE1 |0
-<U8F55> \xF4\xDD |0
-<U8F56> \xF4\xDB |0
-<U8F57> \xF4\xDC |0
-<U8F58> \xF4\xDE |0
-<U8F59> \xF4\xDA |0
-<U8F5A> \xF4\xDF |0
-<U8F5B> \xF6\x58 |0
-<U8F5C> \x9F\x78 |0
-<U8F5D> \xF6\x59 |0
-<U8F5E> \xF6\x57 |0
-<U8F5F> \xC5\x46 |0
-<U8F60> \xF7\x64 |0
-<U8F61> \xC5\xAF |0
-<U8F62> \xF7\x65 |0
-<U8F63> \xF8\x48 |0
-<U8F64> \xF8\x47 |0
-<U8F66> \x89\x7C |0
-<U8F67> \x89\x7D |0
-<U8F6E> \x89\x7E |0
-<U8F93> \x99\x5D |0
-<U8F9B> \xA8\xAF |0
-<U8F9C> \xB6\x64 |0
-<U8F9F> \xB9\x40 |0
-<U8FA0> \x9B\x5A |0
-<U8FA3> \xBB\xB6 |0
-<U8FA5> \x90\x50 |0
-<U8FA6> \xBF\xEC |0
-<U8FA8> \xBF\xEB |0
-<U8FAD> \xC3\xE3 |0
-<U8FAE> \xC4\x7C |0
-<U8FAF> \xC5\x47 |0
-<U8FB0> \xA8\xB0 |0
-<U8FB1> \xB0\x64 |0
-<U8FB2> \xB9\x41 |0
-<U8FB3> \x90\x54 |0
-<U8FB4> \xF3\x5B |0
-<U8FB5> \xC6\xD6 |0
-<U8FB6> \x9A\xA8 |0
-<U8FB7> \x99\xEF |0
-<U8FB8> \xFE\xEB |0
-<U8FB9> \x9D\xA3 |0
-<U8FBA> \x9D\xA1 |0
-<U8FBB> \x99\x43 |0
-<U8FBC> \x99\x45 |0
-<U8FBE> \x9D\x7D |0
-<U8FBF> \xCB\xA6 |0
-<U8FC1> \x99\xF0 |0
-<U8FC2> \xA8\xB1 |0
-<U8FC4> \xA8\xB4 |0
-<U8FC5> \xA8\xB3 |0
-<U8FC6> \xA8\xB2 |0
-<U8FC9> \xCB\xA5 |0
-<U8FCA> \x99\xF1 |0
-<U8FCB> \xCD\xCD |0
-<U8FCC> \x99\xF2 |0
-<U8FCD> \xCD\xCF |0
-<U8FCE> \xAA\xEF |0
-<U8FD0> \x9D\x60 |0
-<U8FD1> \xAA\xF1 |0
-<U8FD2> \xCD\xCC |0
-<U8FD3> \xCD\xCE |0
-<U8FD4> \xAA\xF0 |0
-<U8FD5> \xCD\xD1 |0
-<U8FD6> \xCD\xD0 |0
-<U8FD7> \xCD\xD2 |0
-<U8FDA> \xA0\xA3 |0
-<U8FE0> \xD0\xB6 |0
-<U8FE1> \xD0\xB4 |0
-<U8FE2> \xAD\x7C |0
-<U8FE3> \xD0\xB3 |0
-<U8FE4> \xAD\xA3 |0
-<U8FE5> \xAD\x7E |0
-<U8FE6> \xAD\x7B |0
-<U8FE8> \xAD\xA4 |0
-<U8FEA> \xAD\x7D |0
-<U8FEB> \xAD\xA2 |0
-<U8FED> \xAD\xA1 |0
-<U8FEE> \xD0\xB5 |0
-<U8FF0> \xAD\x7A |0
-<U8FF4> \xB0\x6A |0
-<U8FF5> \xD3\xEB |0
-<U8FF6> \xD3\xF1 |0
-<U8FF7> \xB0\x67 |0
-<U8FF8> \xB0\x6E |0
-<U8FF9> \x90\x5B |0
-<U8FFA> \xB0\x69 |0
-<U8FFB> \xD3\xEE |0
-<U8FFC> \xD3\xF0 |0
-<U8FFD> \xB0\x6C |0
-<U8FFE> \xD3\xEA |0
-<U8FFF> \xD3\xED |0
-<U9000> \xB0\x68 |0
-<U9001> \xB0\x65 |0
-<U9002> \xD3\xEC |0
-<U9003> \xB0\x6B |0
-<U9004> \xD3\xEF |0
-<U9005> \xB0\x6D |0
-<U9006> \xB0\x66 |0
-<U9008> \x9E\xDB |0
-<U900B> \xD7\xE3 |0
-<U900C> \xD7\xE6 |0
-<U900D> \xB3\x70 |0
-<U900F> \xB3\x7A |0
-<U9010> \xB3\x76 |0
-<U9011> \xD7\xE4 |0
-<U9012> \x9D\x79 |0
-<U9014> \xB3\x7E |0
-<U9015> \xB3\x77 |0
-<U9016> \xB3\x7C |0
-<U9017> \xB3\x72 |0
-<U9019> \xB3\x6F |0
-<U901A> \xB3\x71 |0
-<U901B> \xB3\x7D |0
-<U901C> \xD7\xE5 |0
-<U901D> \xB3\x75 |0
-<U901E> \xB3\x78 |0
-<U901F> \xB3\x74 |0
-<U9020> \xB3\x79 |0
-<U9021> \xD7\xE7 |0
-<U9022> \xB3\x7B |0
-<U9023> \xB3\x73 |0
-<U9024> \xD7\xE2 |0
-<U902D> \xDC\x4D |0
-<U902E> \xB6\x65 |0
-<U902F> \xDC\x4F |0
-<U9031> \xB6\x67 |0
-<U9032> \xB6\x69 |0
-<U9033> \x99\xF3 |0
-<U9034> \xDC\x4E |0
-<U9035> \xB6\x66 |0
-<U9036> \xB6\x6A |0
-<U9037> \x90\x62 |0
-<U9038> \xB6\x68 |0
-<U903C> \xB9\x47 |0
-<U903D> \xE0\xA3 |0
-<U903E> \xB9\x4F |0
-<U903F> \xE0\x7E |0
-<U9041> \xB9\x50 |0
-<U9042> \xB9\x45 |0
-<U9044> \xE0\xA1 |0
-<U9047> \xB9\x4A |0
-<U9049> \xE0\xA2 |0
-<U904A> \xB9\x43 |0
-<U904B> \xB9\x42 |0
-<U904C> \x9F\x55 |0
-<U904D> \xB9\x4D |0
-<U904E> \xB9\x4C |0
-<U904F> \xB9\x4B |0
-<U9050> \xB9\x49 |0
-<U9051> \xB9\x4E |0
-<U9052> \xE0\x7D |0
-<U9053> \xB9\x44 |0
-<U9054> \xB9\x46 |0
-<U9055> \xB9\x48 |0
-<U9056> \x9B\xF9 |0
-<U9058> \xBB\xB8 |0
-<U9059> \xBB\xBB |0
-<U905B> \xBB\xBF |0
-<U905C> \xBB\xB9 |0
-<U905D> \xBB\xBE |0
-<U905E> \xBB\xBC |0
-<U9060> \xBB\xB7 |0
-<U9061> \x90\x65 |0
-<U9062> \xBB\xBD |0
-<U9063> \xBB\xBA |0
-<U9064> \x96\xE0 |0
-<U9067> \xE8\x52 |0
-<U9068> \xBE\x43 |0
-<U9069> \xBE\x41 |0
-<U906B> \xE8\x53 |0
-<U906C> \x98\xBE |0
-<U906D> \xBE\x44 |0
-<U906E> \xBE\x42 |0
-<U906F> \xE8\x51 |0
-<U9070> \xE8\x50 |0
-<U9072> \xBF\xF0 |0
-<U9073> \xE8\x4F |0
-<U9074> \xBF\xEE |0
-<U9075> \xBF\xED |0
-<U9076> \xEB\xD0 |0
-<U9077> \xBE\x45 |0
-<U9078> \xBF\xEF |0
-<U9079> \xEB\xD1 |0
-<U907A> \xBF\xF2 |0
-<U907B> \xEB\xD2 |0
-<U907C> \xBF\xF1 |0
-<U907D> \xC1\xD8 |0
-<U907E> \xEE\xC3 |0
-<U907F> \xC1\xD7 |0
-<U9080> \xC1\xDC |0
-<U9081> \xC1\xDA |0
-<U9082> \xC1\xDB |0
-<U9083> \xC2\xE3 |0
-<U9084> \xC1\xD9 |0
-<U9085> \xEE\xC2 |0
-<U9086> \xEB\xD3 |0
-<U9087> \xC2\xE2 |0
-<U9088> \xC2\xE4 |0
-<U908A> \xC3\xE4 |0
-<U908B> \xC3\xE5 |0
-<U908D> \xF4\xE0 |0
-<U908F> \xC5\xDE |0
-<U9090> \xC5\xDD |0
-<U9091> \xA8\xB6 |0
-<U9094> \xCA\x55 |0
-<U9095> \xB0\x6F |0
-<U9097> \xCA\x52 |0
-<U9098> \xCA\x53 |0
-<U9099> \xCA\x51 |0
-<U909B> \xCA\x54 |0
-<U909E> \xCB\xAA |0
-<U909F> \xCB\xA7 |0
-<U90A0> \xCB\xAC |0
-<U90A1> \xCB\xA8 |0
-<U90A2> \xA8\xB7 |0
-<U90A3> \xA8\xBA |0
-<U90A5> \xCB\xA9 |0
-<U90A6> \xA8\xB9 |0
-<U90A7> \xCB\xAB |0
-<U90A8> \x90\x68 |0
-<U90AA> \xA8\xB8 |0
-<U90AE> \x90\x6C |0
-<U90AF> \xCD\xD5 |0
-<U90B0> \xCD\xD7 |0
-<U90B1> \xAA\xF4 |0
-<U90B2> \xCD\xD3 |0
-<U90B3> \xCD\xD6 |0
-<U90B4> \xCD\xD4 |0
-<U90B5> \xAA\xF2 |0
-<U90B6> \xAA\xF5 |0
-<U90B8> \xAA\xF3 |0
-<U90BB> \x95\xD8 |0
-<U90BD> \xD0\xB8 |0
-<U90BE> \xD0\xBC |0
-<U90BF> \xD0\xB9 |0
-<U90C1> \xAD\xA7 |0
-<U90C3> \xAD\xA8 |0
-<U90C4> \x90\x6A |0
-<U90C5> \xD0\xBB |0
-<U90C7> \xD0\xBD |0
-<U90C8> \xD0\xBF |0
-<U90CA> \xAD\xA5 |0
-<U90CB> \xD0\xBE |0
-<U90CE> \xAD\xA6 |0
-<U90D4> \xD7\xEE |0
-<U90D5> \xD0\xBA |0
-<U90D6> \xD3\xF2 |0
-<U90D7> \xD3\xFB |0
-<U90D8> \xD3\xF9 |0
-<U90D9> \xD3\xF4 |0
-<U90DA> \xD3\xF5 |0
-<U90DB> \xD3\xFA |0
-<U90DC> \xD3\xFC |0
-<U90DD> \xB0\x71 |0
-<U90DF> \xD3\xF7 |0
-<U90E0> \xD3\xF3 |0
-<U90E1> \xB0\x70 |0
-<U90E2> \xB0\x72 |0
-<U90E3> \xD3\xF6 |0
-<U90E4> \xD3\xFD |0
-<U90E5> \xD3\xF8 |0
-<U90E8> \xB3\xA1 |0
-<U90E9> \xD7\xF1 |0
-<U90EA> \xD7\xE9 |0
-<U90EB> \xD7\xEF |0
-<U90EC> \xD7\xF0 |0
-<U90ED> \xB3\xA2 |0
-<U90EF> \xD7\xE8 |0
-<U90F0> \xD7\xEA |0
-<U90F1> \xD0\xB7 |0
-<U90F2> \xD7\xEC |0
-<U90F3> \xD7\xED |0
-<U90F4> \xD7\xEB |0
-<U90F5> \xB6\x6C |0
-<U90F9> \xDC\x56 |0
-<U90FA> \xEB\xD4 |0
-<U90FB> \xDC\x57 |0
-<U90FC> \xDC\x54 |0
-<U90FD> \xB3\xA3 |0
-<U90FE> \xB6\x6E |0
-<U90FF> \xDC\x53 |0
-<U9100> \xDC\x59 |0
-<U9101> \xDC\x58 |0
-<U9102> \xB6\x6B |0
-<U9103> \xDC\x5C |0
-<U9104> \xDC\x52 |0
-<U9105> \xDC\x5B |0
-<U9106> \xDC\x50 |0
-<U9107> \xDC\x5A |0
-<U9108> \xDC\x55 |0
-<U9109> \xB6\x6D |0
-<U910B> \xE0\xAA |0
-<U910D> \xE0\xA5 |0
-<U910E> \xE0\xAB |0
-<U910F> \xE0\xA6 |0
-<U9110> \xE0\xA4 |0
-<U9111> \xE0\xA7 |0
-<U9112> \xB9\x51 |0
-<U9114> \xE0\xA9 |0
-<U9116> \xE0\xA8 |0
-<U9117> \xB9\x52 |0
-<U9118> \xBB\xC1 |0
-<U9119> \xBB\xC0 |0
-<U911A> \xE4\x6E |0
-<U911B> \xE4\x71 |0
-<U911C> \xE4\x69 |0
-<U911D> \xE4\x6D |0
-<U911E> \xBB\xC2 |0
-<U911F> \xE4\x6C |0
-<U9120> \xE4\x6A |0
-<U9121> \xE4\x70 |0
-<U9122> \xE4\x6B |0
-<U9123> \xE4\x68 |0
-<U9124> \xE4\x6F |0
-<U9126> \xE8\x59 |0
-<U9127> \xBE\x48 |0
-<U9128> \xF1\x4A |0
-<U9129> \xE8\x56 |0
-<U912A> \xE8\x57 |0
-<U912B> \xE8\x55 |0
-<U912C> \xDC\x51 |0
-<U912D> \xBE\x47 |0
-<U912E> \xE8\x5A |0
-<U912F> \xE8\x54 |0
-<U9130> \xBE\x46 |0
-<U9131> \xBE\x49 |0
-<U9132> \xE8\x58 |0
-<U9133> \xEB\xD5 |0
-<U9134> \xBF\xF3 |0
-<U9135> \xEB\xD6 |0
-<U9136> \xEB\xD7 |0
-<U9138> \xEE\xC4 |0
-<U9139> \xC1\xDD |0
-<U913A> \xF1\x4B |0
-<U913B> \xF1\x4C |0
-<U913E> \xF1\x4D |0
-<U913F> \xF3\x5D |0
-<U9140> \xF3\x5C |0
-<U9141> \xF4\xE2 |0
-<U9143> \xF4\xE1 |0
-<U9144> \xF6\x5B |0
-<U9145> \xF6\x5C |0
-<U9146> \xF6\x5A |0
-<U9147> \xF7\x66 |0
-<U9148> \xC5\xB0 |0
-<U9149> \xA8\xBB |0
-<U914A> \xAD\xAA |0
-<U914B> \xAD\xA9 |0
-<U914C> \xB0\x75 |0
-<U914D> \xB0\x74 |0
-<U914E> \xD4\x40 |0
-<U914F> \xD4\x41 |0
-<U9150> \xD3\xFE |0
-<U9151> \x9F\xB2 |0
-<U9152> \xB0\x73 |0
-<U9153> \xD7\xF5 |0
-<U9155> \xD7\xF6 |0
-<U9156> \xD7\xF2 |0
-<U9157> \xB3\xA4 |0
-<U9158> \xD7\xF3 |0
-<U9159> \x9F\xAE |0
-<U915A> \xD7\xF4 |0
-<U915C> \x9F\xB0 |0
-<U915E> \x89\xAD |0
-<U915F> \xDC\x5F |0
-<U9160> \xDC\x61 |0
-<U9161> \xDC\x5D |0
-<U9162> \xDC\x60 |0
-<U9163> \xB6\x6F |0
-<U9164> \xDC\x5E |0
-<U9165> \xB6\x70 |0
-<U9167> \x90\x6E |0
-<U9168> \xDD\x73 |0
-<U9169> \xB9\x55 |0
-<U916A> \xB9\x54 |0
-<U916C> \xB9\x53 |0
-<U916E> \xE0\xAC |0
-<U916F> \xE0\xAD |0
-<U9170> \x9E\x71 |0
-<U9172> \xE4\x73 |0
-<U9173> \xE4\x75 |0
-<U9174> \xBB\xC6 |0
-<U9175> \xBB\xC3 |0
-<U9176> \x9E\x4A |0
-<U9177> \xBB\xC5 |0
-<U9178> \xBB\xC4 |0
-<U9179> \xE4\x74 |0
-<U917A> \xE4\x72 |0
-<U917C> \x9F\xDC |0
-<U9180> \xE8\x61 |0
-<U9181> \xE8\x5E |0
-<U9182> \xE8\x5F |0
-<U9183> \xBE\x4D |0
-<U9184> \xE8\x60 |0
-<U9185> \xE8\x5B |0
-<U9186> \xE8\x5C |0
-<U9187> \xBE\x4A |0
-<U9189> \xBE\x4B |0
-<U918A> \xE8\x5D |0
-<U918B> \xBE\x4C |0
-<U918C> \x89\xAB |0
-<U918D> \xEB\xDB |0
-<U918E> \x9F\xB8 |0
-<U918F> \xEB\xDC |0
-<U9190> \xEB\xD9 |0
-<U9191> \xEB\xDA |0
-<U9192> \xBF\xF4 |0
-<U9193> \xEB\xD8 |0
-<U9199> \xEE\xC8 |0
-<U919A> \xEE\xC5 |0
-<U919B> \xEE\xC7 |0
-<U919C> \xC1\xE0 |0
-<U919D> \xEE\xCB |0
-<U919E> \xC1\xDF |0
-<U919F> \xEE\xC9 |0
-<U91A0> \xEE\xCC |0
-<U91A1> \xEE\xCA |0
-<U91A2> \xEE\xC6 |0
-<U91A3> \xC1\xDE |0
-<U91A5> \xF1\x4F |0
-<U91A7> \xF1\x50 |0
-<U91A8> \xF1\x4E |0
-<U91A9> \x90\x70 |0
-<U91AA> \xF1\x52 |0
-<U91AB> \xC2\xE5 |0
-<U91AC> \xC2\xE6 |0
-<U91AD> \xF3\x5F |0
-<U91AE> \xC3\xE7 |0
-<U91AF> \xF1\x51 |0
-<U91B0> \xF3\x5E |0
-<U91B1> \xC3\xE6 |0
-<U91B2> \xF4\xE5 |0
-<U91B3> \xF4\xE6 |0
-<U91B4> \xC4\xBF |0
-<U91B5> \xF4\xE4 |0
-<U91B6> \x8B\x63 |0
-<U91B7> \xF4\xE3 |0
-<U91B9> \xF6\x5D |0
-<U91BA> \xC5\x48 |0
-<U91BB> \x95\xDC |0
-<U91BC> \xF8\x49 |0
-<U91BD> \xF8\xC8 |0
-<U91BE> \xF8\xC7 |0
-<U91C0> \xC6\x43 |0
-<U91C1> \xC6\x5D |0
-<U91C2> \xF8\xC9 |0
-<U91C3> \xF9\x71 |0
-<U91C4> \x90\x71 |0
-<U91C5> \xC6\x6F |0
-<U91C6> \xA8\xBC |0
-<U91C7> \xAA\xF6 |0
-<U91C9> \xB9\x56 |0
-<U91CB> \xC4\xC0 |0
-<U91CC> \xA8\xBD |0
-<U91CD> \xAD\xAB |0
-<U91CE> \xB3\xA5 |0
-<U91CF> \xB6\x71 |0
-<U91D0> \xC2\xE7 |0
-<U91D1> \xAA\xF7 |0
-<U91D3> \xD0\xC1 |0
-<U91D4> \xD0\xC0 |0
-<U91D5> \xD4\x42 |0
-<U91D6> \xFC\x5E |0
-<U91D7> \xB0\x78 |0
-<U91D8> \xB0\x76 |0
-<U91D9> \xB0\x7A |0
-<U91DA> \xD4\x44 |0
-<U91DC> \xB0\x79 |0
-<U91DD> \xB0\x77 |0
-<U91DF> \x89\x49 |0
-<U91E2> \xD4\x43 |0
-<U91E3> \xB3\xA8 |0
-<U91E4> \xD7\xFC |0
-<U91E5> \x96\x5B |0
-<U91E6> \xB3\xA7 |0
-<U91E7> \xB3\xA9 |0
-<U91E8> \xD8\x42 |0
-<U91E9> \xB3\xAB |0
-<U91EA> \xD7\xFE |0
-<U91EB> \xD8\x40 |0
-<U91EC> \xD7\xF7 |0
-<U91ED> \xB3\xAA |0
-<U91EE> \xD8\x43 |0
-<U91F1> \xD7\xF9 |0
-<U91F3> \xD7\xFA |0
-<U91F4> \xD7\xF8 |0
-<U91F5> \xB3\xA6 |0
-<U91F7> \xD8\x41 |0
-<U91F8> \xD7\xFB |0
-<U91F9> \xD7\xFD |0
-<U91FA> \x94\xA6 |0
-<U91FD> \xDC\x6D |0
-<U91FE> \x8F\xD5 |0
-<U91FF> \xDC\x6C |0
-<U9200> \xDC\x6A |0
-<U9201> \xDC\x62 |0
-<U9202> \xDC\x71 |0
-<U9203> \xDC\x65 |0
-<U9204> \xDC\x6F |0
-<U9205> \xDC\x76 |0
-<U9206> \xDC\x6E |0
-<U9207> \xB6\x79 |0
-<U9208> \x9E\x73 |0
-<U9209> \xB6\x75 |0
-<U920A> \xDC\x63 |0
-<U920C> \xDC\x69 |0
-<U920D> \xB6\x77 |0
-<U920E> \x90\x75 |0
-<U920F> \xDC\x68 |0
-<U9210> \xB6\x78 |0
-<U9211> \xB6\x7A |0
-<U9212> \xDC\x6B |0
-<U9213> \x99\xF7 |0
-<U9214> \xB6\x72 |0
-<U9215> \xB6\x73 |0
-<U9216> \xDC\x77 |0
-<U9217> \xDC\x75 |0
-<U9219> \xDC\x74 |0
-<U921A> \xDC\x66 |0
-<U921C> \xDC\x72 |0
-<U921E> \xB6\x76 |0
-<U9223> \xB6\x74 |0
-<U9224> \xDC\x73 |0
-<U9225> \xDC\x64 |0
-<U9226> \xDC\x67 |0
-<U9227> \xDC\x70 |0
-<U9228> \x99\xF9 |0
-<U922A> \x96\x63 |0
-<U922B> \x95\xB9 |0
-<U922D> \xE4\xBA |0
-<U922E> \xE0\xB7 |0
-<U9230> \xE0\xB0 |0
-<U9231> \xE0\xC3 |0
-<U9232> \xE0\xCC |0
-<U9233> \xE0\xB3 |0
-<U9234> \xB9\x61 |0
-<U9235> \x94\xD4 |0
-<U9236> \xE0\xC0 |0
-<U9237> \xB9\x57 |0
-<U9238> \xB9\x59 |0
-<U9239> \xB9\x65 |0
-<U923A> \xE0\xB1 |0
-<U923C> \xFC\xFA |0
-<U923D> \xB9\x5A |0
-<U923E> \xB9\x5C |0
-<U923F> \xB9\x66 |0
-<U9240> \xB9\x5B |0
-<U9241> \x90\x77 |0
-<U9244> \x90\xAB |0
-<U9245> \xB9\x64 |0
-<U9246> \xE0\xB9 |0
-<U9248> \xE0\xAE |0
-<U9249> \xB9\x62 |0
-<U924A> \xE0\xB8 |0
-<U924B> \xB9\x5E |0
-<U924C> \xE0\xCA |0
-<U924D> \xB9\x63 |0
-<U924E> \xE0\xC8 |0
-<U924F> \xE0\xBC |0
-<U9250> \xE0\xC6 |0
-<U9251> \xB9\x60 |0
-<U9252> \xE0\xAF |0
-<U9253> \xE0\xC9 |0
-<U9254> \xE0\xC4 |0
-<U9255> \x9D\x4D |0
-<U9256> \xE0\xCB |0
-<U9257> \xB9\x58 |0
-<U9258> \x99\xFA |0
-<U925A> \xB9\x67 |0
-<U925B> \xB9\x5D |0
-<U925D> \x92\xE3 |0
-<U925E> \xE0\xB5 |0
-<U925F> \x97\xBB |0
-<U9260> \xE0\xBD |0
-<U9261> \xE0\xC1 |0
-<U9262> \x90\x78 |0
-<U9263> \xE0\xC5 |0
-<U9264> \xB9\x5F |0
-<U9265> \xE0\xB4 |0
-<U9266> \xE0\xB2 |0
-<U9267> \xE0\xBE |0
-<U926B> \x99\xFB |0
-<U926C> \xE0\xBB |0
-<U926D> \xE0\xBA |0
-<U926E> \x97\xE0 |0
-<U926F> \xE0\xBF |0
-<U9270> \xE0\xC2 |0
-<U9272> \xE0\xC7 |0
-<U9276> \xE4\x78 |0
-<U9277> \x96\xDC |0
-<U9278> \xBB\xC7 |0
-<U9279> \xE4\xA4 |0
-<U927A> \xE4\x7A |0
-<U927B> \xBB\xCC |0
-<U927C> \xBB\xD0 |0
-<U927D> \xE4\xAD |0
-<U927E> \xE4\xB5 |0
-<U927F> \xE4\xA6 |0
-<U9280> \xBB\xC8 |0
-<U9281> \x9C\xA8 |0
-<U9282> \xE4\xAA |0
-<U9283> \xE0\xB6 |0
-<U9284> \x97\x72 |0
-<U9285> \xBB\xC9 |0
-<U9286> \xE4\xB1 |0
-<U9287> \xE4\xB6 |0
-<U9288> \xE4\xAE |0
-<U9289> \x94\x40 |0
-<U928A> \xE4\xB0 |0
-<U928B> \xE4\xB9 |0
-<U928C> \xE4\xB2 |0
-<U928D> \xE4\x7E |0
-<U928E> \xE4\xA9 |0
-<U928F> \x92\xF2 |0
-<U9291> \xBB\xD1 |0
-<U9293> \xBB\xCD |0
-<U9294> \xE4\x7C |0
-<U9295> \xE4\xAB |0
-<U9296> \xBB\xCB |0
-<U9297> \xE4\xA5 |0
-<U9298> \xBB\xCA |0
-<U9299> \xE4\xB3 |0
-<U929A> \xE4\xA2 |0
-<U929B> \xE4\x79 |0
-<U929C> \xBB\xCE |0
-<U929D> \xE4\xB8 |0
-<U92A0> \xE4\x7B |0
-<U92A1> \xE4\xAF |0
-<U92A2> \xE4\xAC |0
-<U92A3> \xE4\xA7 |0
-<U92A4> \xE4\x77 |0
-<U92A5> \xE4\x76 |0
-<U92A6> \xE4\xA1 |0
-<U92A7> \xE4\xB4 |0
-<U92A8> \xBB\xCF |0
-<U92A9> \xE4\xB7 |0
-<U92AA> \xE4\x7D |0
-<U92AB> \xE4\xA3 |0
-<U92AC> \xBE\x52 |0
-<U92AE> \x99\xFD |0
-<U92B1> \x99\xFC |0
-<U92B2> \xBE\x5A |0
-<U92B3> \xBE\x55 |0
-<U92B4> \xE8\xA4 |0
-<U92B5> \xE8\xA1 |0
-<U92B6> \xE8\x67 |0
-<U92B7> \xBE\x50 |0
-<U92B9> \xF9\xD7 |0
-<U92BA> \x96\x4A |0
-<U92BB> \xBE\x4F |0
-<U92BC> \xBE\x56 |0
-<U92BE> \x96\xD8 |0
-<U92BF> \x99\xFE |0
-<U92C0> \xE8\x65 |0
-<U92C1> \xBE\x54 |0
-<U92C2> \xE8\x71 |0
-<U92C3> \xE8\x63 |0
-<U92C4> \xE8\x64 |0
-<U92C5> \xBE\x4E |0
-<U92C6> \xE8\xA3 |0
-<U92C7> \xBE\x58 |0
-<U92C8> \xE8\x74 |0
-<U92C9> \xE8\x79 |0
-<U92CA> \xE8\x73 |0
-<U92CB> \xEB\xEE |0
-<U92CC> \xE8\x6F |0
-<U92CD> \xE8\x77 |0
-<U92CE> \xE8\x75 |0
-<U92CF> \xE8\x68 |0
-<U92D0> \xE8\x62 |0
-<U92D1> \xE8\x7D |0
-<U92D2> \xBE\x57 |0
-<U92D3> \xE8\x7E |0
-<U92D4> \x90\x4B |0
-<U92D5> \xE8\x78 |0
-<U92D7> \xE8\x6D |0
-<U92D8> \xE8\x6B |0
-<U92D9> \xE8\x66 |0
-<U92DB> \xFA\x41 |0
-<U92DD> \xE8\x6E |0
-<U92DE> \xE8\x7B |0
-<U92DF> \xE8\x6A |0
-<U92E0> \xE8\x7A |0
-<U92E1> \xE8\xA2 |0
-<U92E3> \x9A\x40 |0
-<U92E4> \xBE\x53 |0
-<U92E5> \x97\x5B |0
-<U92E6> \xE8\x76 |0
-<U92E7> \xE8\x7C |0
-<U92E8> \xE8\x72 |0
-<U92E9> \xE8\x6C |0
-<U92EA> \xBE\x51 |0
-<U92EB> \x9A\x41 |0
-<U92EC> \x91\xDD |0
-<U92EE> \xE4\xA8 |0
-<U92EF> \xE8\x70 |0
-<U92F0> \xBE\x59 |0
-<U92F1> \xE8\x69 |0
-<U92F2> \x93\xFC |0
-<U92F3> \x9A\x42 |0
-<U92F4> \x9A\x43 |0
-<U92F6> \x96\x59 |0
-<U92F7> \xEB\xF4 |0
-<U92F8> \xBF\xF7 |0
-<U92F9> \xEB\xF3 |0
-<U92FA> \xEB\xF0 |0
-<U92FB> \xEC\x44 |0
-<U92FC> \xBF\xFB |0
-<U92FD> \x9A\x44 |0
-<U92FE> \xEC\x41 |0
-<U92FF> \xEB\xF8 |0
-<U9300> \xEC\x43 |0
-<U9301> \xEB\xE9 |0
-<U9302> \xEB\xF6 |0
-<U9303> \x90\x51 |0
-<U9304> \xBF\xFD |0
-<U9306> \xEB\xE1 |0
-<U9307> \x94\xBF |0
-<U9308> \xEB\xDF |0
-<U9309> \xEC\x42 |0
-<U930B> \xEC\x40 |0
-<U930C> \xEB\xFE |0
-<U930D> \xEB\xED |0
-<U930E> \xEB\xEC |0
-<U930F> \xEB\xE2 |0
-<U9310> \xC0\x40 |0
-<U9312> \xEB\xE8 |0
-<U9313> \xEB\xF2 |0
-<U9314> \xEB\xFD |0
-<U9315> \xC0\x43 |0
-<U9316> \xEC\x45 |0
-<U9318> \xC1\xE8 |0
-<U9319> \xC0\x45 |0
-<U931A> \xBF\xFE |0
-<U931B> \xEB\xE6 |0
-<U931D> \xEB\xEF |0
-<U931E> \xEB\xDE |0
-<U931F> \xEB\xE0 |0
-<U9320> \xBF\xF5 |0
-<U9321> \xC0\x42 |0
-<U9322> \xBF\xFA |0
-<U9323> \xEB\xE7 |0
-<U9324> \xEB\xF7 |0
-<U9325> \xEB\xF1 |0
-<U9326> \xC0\x41 |0
-<U9327> \xEB\xDD |0
-<U9328> \xC1\xE3 |0
-<U9329> \xEB\xF9 |0
-<U932A> \xEB\xFC |0
-<U932B> \xBF\xFC |0
-<U932C> \x90\xA2 |0
-<U932D> \xEB\xEB |0
-<U932E> \xC0\x44 |0
-<U932F> \xBF\xF9 |0
-<U9330> \x9C\xAB |0
-<U9331> \x97\x76 |0
-<U9333> \xBF\xF8 |0
-<U9334> \xEB\xF5 |0
-<U9335> \xEB\xFB |0
-<U9336> \xBF\xF6 |0
-<U9338> \xEB\xE4 |0
-<U9339> \xEB\xFA |0
-<U933C> \xEB\xE5 |0
-<U9340> \xFC\x55 |0
-<U9341> \xFE\x45 |0
-<U9342> \x94\xA8 |0
-<U9343> \x9A\x45 |0
-<U9344> \xFA\x4B |0
-<U9345> \x9D\xE1 |0
-<U9346> \xEB\xEA |0
-<U9347> \xEE\xD2 |0
-<U9348> \x96\xD9 |0
-<U9349> \xEE\xD7 |0
-<U934A> \xC1\xE5 |0
-<U934B> \xC1\xE7 |0
-<U934C> \xEE\xDD |0
-<U934D> \xC1\xE1 |0
-<U934E> \xEE\xEC |0
-<U934F> \xEE\xE3 |0
-<U9350> \xEE\xD8 |0
-<U9351> \xEE\xD9 |0
-<U9352> \xEE\xE2 |0
-<U9354> \xC1\xEE |0
-<U9355> \xEE\xE1 |0
-<U9356> \xEE\xD1 |0
-<U9357> \xEE\xE0 |0
-<U9358> \xEE\xD4 |0
-<U9359> \xEE\xED |0
-<U935A> \xC1\xED |0
-<U935B> \xC1\xEB |0
-<U935C> \xEE\xD5 |0
-<U935E> \xEE\xE8 |0
-<U935F> \x97\x74 |0
-<U9360> \xEE\xDA |0
-<U9361> \xEE\xE7 |0
-<U9362> \xFD\xF5 |0
-<U9363> \xEE\xE9 |0
-<U9364> \xEE\xD0 |0
-<U9365> \xC1\xE6 |0
-<U9366> \x92\xE5 |0
-<U9367> \xEE\xEA |0
-<U9368> \x96\x45 |0
-<U9369> \x91\xDA |0
-<U936A> \xEE\xDE |0
-<U936B> \x90\xA3 |0
-<U936C> \xC1\xEA |0
-<U936D> \xEE\xDB |0
-<U936E> \xA0\x5F |0
-<U9370> \xC1\xEC |0
-<U9371> \xEE\xE4 |0
-<U9373> \x90\xAF |0
-<U9374> \x97\xBF |0
-<U9375> \xC1\xE4 |0
-<U9376> \xEE\xD6 |0
-<U9377> \xEE\xE5 |0
-<U9378> \x91\x4C |0
-<U9379> \xEE\xDF |0
-<U937A> \xEB\xE3 |0
-<U937B> \xEE\xE6 |0
-<U937C> \xEE\xD3 |0
-<U937D> \x96\x7A |0
-<U937E> \xC1\xE9 |0
-<U9380> \xEE\xEB |0
-<U9381> \x91\xDE |0
-<U9382> \xC1\xE2 |0
-<U9383> \xEE\xCE |0
-<U9384> \x9A\x46 |0
-<U9385> \xFE\xB0 |0
-<U9386> \x97\x79 |0
-<U9387> \x94\x6C |0
-<U9388> \xF1\x60 |0
-<U9389> \xF1\x59 |0
-<U938A> \xC2\xE9 |0
-<U938C> \xF1\x54 |0
-<U938D> \xF1\x63 |0
-<U938E> \xF1\x5B |0
-<U938F> \xEE\xDC |0
-<U9390> \x98\x58 |0
-<U9391> \xF1\x65 |0
-<U9392> \xF1\x55 |0
-<U9394> \xC2\xE8 |0
-<U9395> \xF1\x5F |0
-<U9396> \xC2\xEA |0
-<U9397> \xC2\xF2 |0
-<U9398> \xC2\xF0 |0
-<U9399> \xF1\x61 |0
-<U939A> \xC2\xF1 |0
-<U939B> \xF1\x57 |0
-<U939C> \x92\x66 |0
-<U939D> \xF1\x58 |0
-<U939E> \xF1\x5D |0
-<U939F> \xF1\x62 |0
-<U93A0> \x93\xFB |0
-<U93A1> \xEE\xCD |0
-<U93A2> \xC2\xEB |0
-<U93A3> \xF1\x6A |0
-<U93A4> \xF1\x67 |0
-<U93A5> \xF1\x6B |0
-<U93A6> \xF1\x5E |0
-<U93A7> \xF1\x5A |0
-<U93A8> \xF1\x68 |0
-<U93A9> \xF3\x6A |0
-<U93AA> \xF1\x5C |0
-<U93AC> \xC2\xEE |0
-<U93AD> \x9A\x47 |0
-<U93AE> \xC2\xED |0
-<U93AF> \xEE\xCF |0
-<U93B0> \xC2\xEF |0
-<U93B1> \xF1\x64 |0
-<U93B2> \xF1\x66 |0
-<U93B3> \xC2\xEC |0
-<U93B4> \xF1\x69 |0
-<U93B5> \xF1\x53 |0
-<U93B7> \xF1\x56 |0
-<U93B8> \x97\x49 |0
-<U93BB> \x97\x48 |0
-<U93BD> \x93\x4A |0
-<U93BF> \x9C\xE2 |0
-<U93C0> \xF3\x73 |0
-<U93C2> \xF3\x63 |0
-<U93C3> \xC3\xEB |0
-<U93C4> \xF3\x71 |0
-<U93C6> \x92\x64 |0
-<U93C7> \xF3\x61 |0
-<U93C8> \xC3\xEC |0
-<U93CA> \xF3\x6C |0
-<U93CB> \x91\xDF |0
-<U93CC> \xF3\x68 |0
-<U93CD> \xC3\xF1 |0
-<U93CE> \xF3\x72 |0
-<U93CF> \xF3\x62 |0
-<U93D0> \xF3\x65 |0
-<U93D1> \xC3\xE9 |0
-<U93D2> \xF3\x74 |0
-<U93D3> \xFB\x79 |0
-<U93D4> \xF3\x6D |0
-<U93D5> \xF3\x70 |0
-<U93D6> \xC3\xEF |0
-<U93D7> \xC3\xF4 |0
-<U93D8> \xC3\xF2 |0
-<U93D9> \xF3\x69 |0
-<U93DA> \xF3\x64 |0
-<U93DB> \x96\xD7 |0
-<U93DC> \xC3\xED |0
-<U93DD> \xC3\xEE |0
-<U93DE> \xF3\x60 |0
-<U93DF> \xC3\xEA |0
-<U93E0> \x93\x43 |0
-<U93E1> \xC3\xE8 |0
-<U93E2> \xC3\xF0 |0
-<U93E3> \xF3\x6F |0
-<U93E4> \xC3\xF3 |0
-<U93E6> \xF3\x6B |0
-<U93E7> \xF3\x75 |0
-<U93E8> \xC3\xF5 |0
-<U93EC> \xF3\x67 |0
-<U93EE> \xF3\x6E |0
-<U93F0> \xFD\xCB |0
-<U93F1> \xFE\x7A |0
-<U93F3> \x91\xDB |0
-<U93F5> \xF4\xF3 |0
-<U93F6> \xF5\x42 |0
-<U93F7> \xF4\xF5 |0
-<U93F8> \xF4\xFC |0
-<U93F9> \xF3\x66 |0
-<U93FA> \xF4\xFA |0
-<U93FB> \xF4\xE9 |0
-<U93FC> \xF5\x40 |0
-<U93FD> \xC4\xC3 |0
-<U93FE> \xF4\xED |0
-<U93FF> \xF4\xFE |0
-<U9400> \xF4\xF4 |0
-<U9401> \x97\xAF |0
-<U9403> \xC4\xC2 |0
-<U9404> \x95\xDD |0
-<U9406> \xF5\x44 |0
-<U9407> \xF4\xF6 |0
-<U9408> \x93\x48 |0
-<U9409> \xF4\xFB |0
-<U940A> \xF4\xFD |0
-<U940B> \xF4\xE7 |0
-<U940C> \xF5\x41 |0
-<U940D> \xF4\xF2 |0
-<U940E> \xF4\xF7 |0
-<U940F> \xF4\xEB |0
-<U9410> \xF4\xEF |0
-<U9411> \xF5\x43 |0
-<U9412> \xF4\xF9 |0
-<U9413> \xF4\xE8 |0
-<U9414> \xF4\xEC |0
-<U9415> \xF4\xEE |0
-<U9416> \xF4\xF8 |0
-<U9417> \x9A\x4B |0
-<U9418> \xC4\xC1 |0
-<U9419> \xF4\xF1 |0
-<U941B> \xFC\x45 |0
-<U941D> \x9A\x4D |0
-<U9420> \xF4\xEA |0
-<U9424> \x91\xBC |0
-<U9425> \x90\xE2 |0
-<U9426> \x90\xB4 |0
-<U9427> \x95\xE1 |0
-<U9428> \xF4\xF0 |0
-<U9429> \xF6\x61 |0
-<U942A> \xF6\x66 |0
-<U942B> \xC5\x4F |0
-<U942C> \xF6\x68 |0
-<U942D> \x9A\x4E |0
-<U942E> \xC5\x49 |0
-<U9430> \xF6\x64 |0
-<U9431> \xF6\x6A |0
-<U9432> \xC5\x4E |0
-<U9433> \xC5\x4A |0
-<U9435> \xC5\x4B |0
-<U9436> \xF6\x60 |0
-<U9437> \xF6\x67 |0
-<U9438> \xC5\x4D |0
-<U9439> \xF6\x65 |0
-<U943A> \xC5\x4C |0
-<U943B> \xF6\x5F |0
-<U943C> \xF6\x63 |0
-<U943D> \xF6\x62 |0
-<U943E> \x9A\x4F |0
-<U943F> \xF6\x5E |0
-<U9440> \xF6\x69 |0
-<U9442> \xFE\x40 |0
-<U9443> \xFE\x43 |0
-<U9444> \xC5\xB1 |0
-<U9445> \xF7\x6D |0
-<U9446> \xF7\x70 |0
-<U9447> \xF7\x6C |0
-<U9448> \xF7\x6E |0
-<U9449> \xF7\x6F |0
-<U944A> \xF7\x69 |0
-<U944B> \xF7\x6A |0
-<U944C> \xF7\x67 |0
-<U944D> \x96\xDD |0
-<U944F> \xF7\x6B |0
-<U9450> \xF7\x68 |0
-<U9451> \xC5\xB2 |0
-<U9452> \xC5\xB3 |0
-<U9454> \x9A\x51 |0
-<U9455> \xF8\x4B |0
-<U9457> \xF8\x4D |0
-<U9458> \x96\xA7 |0
-<U945B> \x90\xB0 |0
-<U945D> \xF8\x4C |0
-<U945E> \xF8\x4E |0
-<U9460> \xC5\xE0 |0
-<U9462> \xF8\x4A |0
-<U9463> \xC5\xDF |0
-<U9464> \xC5\xE1 |0
-<U9465> \x9C\x4E |0
-<U9467> \x94\x43 |0
-<U9468> \xF8\xCB |0
-<U9469> \xF8\xCC |0
-<U946A> \xC6\x44 |0
-<U946B> \xF8\xCA |0
-<U946C> \x8E\xBA |0
-<U946D> \xF9\x53 |0
-<U946E> \xF9\x52 |0
-<U946F> \xF9\x54 |0
-<U9470> \xC6\x5F |0
-<U9471> \xF9\x55 |0
-<U9472> \xC6\x5E |0
-<U9473> \xF9\x56 |0
-<U9474> \xF9\x72 |0
-<U9475> \xF9\x75 |0
-<U9476> \xF9\x74 |0
-<U9477> \xC6\x68 |0
-<U9478> \xF9\x73 |0
-<U9479> \x9A\x52 |0
-<U947B> \xFC\xC1 |0
-<U947C> \xC6\x72 |0
-<U947D> \xC6\x70 |0
-<U947E> \xC6\x71 |0
-<U947F> \xC6\x77 |0
-<U9480> \xF9\xC0 |0
-<U9481> \xF9\xC1 |0
-<U9482> \xF9\xBF |0
-<U9483> \xF9\xC9 |0
-<U9485> \x8B\xE9 |0
-<U949F> \x9C\xAF |0
-<U94A2> \x8B\xFD |0
-<U94C1> \x9A\xBC |0
-<U94C3> \x9A\xB8 |0
-<U94DC> \x9A\xAE |0
-<U94F6> \x9A\xA7 |0
-<U952D> \x9A\x53 |0
-<U9547> \x9D\x74 |0
-<U9577> \xAA\xF8 |0
-<U9578> \x8B\xEA |0
-<U957A> \xD8\x44 |0
-<U957B> \xDC\x78 |0
-<U957C> \xE8\xA5 |0
-<U957D> \xF3\x76 |0
-<U957F> \x8B\xEB |0
-<U9580> \xAA\xF9 |0
-<U9582> \xAD\xAC |0
-<U9583> \xB0\x7B |0
-<U9585> \x90\xB2 |0
-<U9586> \xD8\x45 |0
-<U9588> \xD8\x46 |0
-<U9589> \xB3\xAC |0
-<U958B> \xB6\x7D |0
-<U958C> \xDC\x7A |0
-<U958D> \xDC\x79 |0
-<U958E> \xB6\xA3 |0
-<U958F> \xB6\x7C |0
-<U9590> \xDC\x7B |0
-<U9591> \xB6\x7E |0
-<U9592> \xB6\xA2 |0
-<U9593> \xB6\xA1 |0
-<U9594> \xB6\x7B |0
-<U9596> \x95\xE9 |0
-<U9597> \x95\xE8 |0
-<U9598> \xB9\x68 |0
-<U9599> \x95\xE6 |0
-<U959B> \xE0\xD0 |0
-<U959C> \xE0\xCE |0
-<U959E> \xE0\xCF |0
-<U959F> \xE0\xCD |0
-<U95A0> \x90\xB5 |0
-<U95A1> \xBB\xD2 |0
-<U95A2> \x9A\x54 |0
-<U95A3> \xBB\xD5 |0
-<U95A4> \xBB\xD7 |0
-<U95A5> \xBB\xD6 |0
-<U95A6> \x90\xB3 |0
-<U95A7> \x95\xE7 |0
-<U95A8> \xBB\xD3 |0
-<U95A9> \xBB\xD4 |0
-<U95AA> \x8B\x50 |0
-<U95AB> \xE8\xA7 |0
-<U95AC> \xE8\xA6 |0
-<U95AD> \xBE\x5B |0
-<U95AE> \xE8\xA8 |0
-<U95B0> \xE8\xA9 |0
-<U95B1> \xBE\x5C |0
-<U95B5> \xEC\x4D |0
-<U95B6> \xEC\x4B |0
-<U95B7> \xEE\xF3 |0
-<U95B9> \xEC\x49 |0
-<U95BA> \xEC\x4A |0
-<U95BB> \xC0\x46 |0
-<U95BC> \xEC\x46 |0
-<U95BD> \xEC\x4E |0
-<U95BE> \xEC\x48 |0
-<U95BF> \xEC\x4C |0
-<U95C0> \xEE\xEF |0
-<U95C3> \xEE\xF1 |0
-<U95C5> \xEE\xF2 |0
-<U95C6> \xC1\xF3 |0
-<U95C7> \xEE\xEE |0
-<U95C8> \xC1\xF2 |0
-<U95C9> \xEE\xF0 |0
-<U95CA> \xC1\xEF |0
-<U95CB> \xC1\xF0 |0
-<U95CC> \xC1\xF1 |0
-<U95CD> \xEC\x47 |0
-<U95D0> \xC2\xF5 |0
-<U95D1> \xF1\x6E |0
-<U95D2> \xF1\x6C |0
-<U95D3> \xF1\x6D |0
-<U95D4> \xC2\xF3 |0
-<U95D5> \xC2\xF6 |0
-<U95D6> \xC2\xF4 |0
-<U95DA> \xF3\x77 |0
-<U95DB> \xF3\x78 |0
-<U95DC> \xC3\xF6 |0
-<U95DE> \xF5\x45 |0
-<U95DF> \xF5\x47 |0
-<U95E0> \xF5\x46 |0
-<U95E1> \xC4\xC4 |0
-<U95E2> \xC5\x50 |0
-<U95E3> \xF6\x6D |0
-<U95E4> \xF6\x6C |0
-<U95E5> \xF6\x6B |0
-<U95E8> \x8B\xEC |0
-<U95F4> \x9A\x56 |0
-<U961C> \xAA\xFA |0
-<U961D> \x8B\xFB |0
-<U961E> \xC9\xAA |0
-<U9620> \xCA\x58 |0
-<U9621> \xA6\xE9 |0
-<U9622> \xCA\x56 |0
-<U9623> \xCA\x59 |0
-<U9624> \xCA\x57 |0
-<U9628> \xCB\xAE |0
-<U962A> \xA8\xC1 |0
-<U962C> \xA8\xC2 |0
-<U962D> \xCB\xB0 |0
-<U962E> \xA8\xBF |0
-<U962F> \xCB\xAF |0
-<U9630> \xCB\xAD |0
-<U9631> \xA8\xC0 |0
-<U9632> \xA8\xBE |0
-<U9633> \x9A\x57 |0
-<U9638> \xA0\xAA |0
-<U9639> \xCD\xD8 |0
-<U963A> \xCD\xDB |0
-<U963B> \xAA\xFD |0
-<U963C> \xCD\xDA |0
-<U963D> \xCD\xD9 |0
-<U963F> \xAA\xFC |0
-<U9640> \xAA\xFB |0
-<U9641> \x9F\xA6 |0
-<U9642> \xAB\x40 |0
-<U9643> \xCD\xDC |0
-<U9644> \xAA\xFE |0
-<U9645> \x99\xCC |0
-<U964A> \xD0\xC6 |0
-<U964B> \xAD\xAE |0
-<U964C> \xAD\xAF |0
-<U964D> \xAD\xB0 |0
-<U964E> \xD0\xC7 |0
-<U964F> \xD0\xC3 |0
-<U9650> \xAD\xAD |0
-<U9651> \xD0\xC4 |0
-<U9653> \xD0\xC5 |0
-<U9654> \xD0\xC2 |0
-<U9656> \x9C\x59 |0
-<U9658> \xB0\xA4 |0
-<U965B> \xB0\xA1 |0
-<U965C> \xD4\x45 |0
-<U965D> \xB0\xA2 |0
-<U965E> \xB0\xA5 |0
-<U965F> \xD4\x46 |0
-<U9661> \xB0\x7E |0
-<U9662> \xB0\x7C |0
-<U9663> \xB0\x7D |0
-<U9664> \xB0\xA3 |0
-<U9669> \x99\xB5 |0
-<U966A> \xB3\xAD |0
-<U966B> \xD8\x49 |0
-<U966C> \xB3\xB5 |0
-<U966D> \xD8\x48 |0
-<U966F> \xD8\x4B |0
-<U9670> \xB3\xB1 |0
-<U9671> \xD8\x4A |0
-<U9672> \xB6\xAB |0
-<U9673> \xB3\xAF |0
-<U9674> \xB3\xB2 |0
-<U9675> \xB3\xAE |0
-<U9676> \xB3\xB3 |0
-<U9677> \xB3\xB4 |0
-<U9678> \xB3\xB0 |0
-<U967B> \x90\xBE |0
-<U967C> \xD8\x47 |0
-<U967D> \xB6\xA7 |0
-<U967E> \xDC\x7D |0
-<U9680> \xDC\xA3 |0
-<U9681> \x9F\xAF |0
-<U9683> \xDC\xA2 |0
-<U9684> \xB6\xAC |0
-<U9685> \xB6\xA8 |0
-<U9686> \xB6\xA9 |0
-<U9687> \xDC\x7C |0
-<U9688> \xDC\x7E |0
-<U9689> \xDC\xA1 |0
-<U968A> \xB6\xA4 |0
-<U968B> \xB6\xA6 |0
-<U968D> \xB6\xAA |0
-<U968E> \xB6\xA5 |0
-<U968F> \x95\xF2 |0
-<U9691> \xE0\xD3 |0
-<U9692> \xE0\xD1 |0
-<U9693> \xE0\xD2 |0
-<U9694> \xB9\x6A |0
-<U9695> \xB9\x6B |0
-<U9696> \x90\xBF |0
-<U9697> \xE0\xD4 |0
-<U9698> \xB9\x69 |0
-<U9699> \xBB\xD8 |0
-<U969B> \xBB\xDA |0
-<U969C> \xBB\xD9 |0
-<U969E> \xE4\xBB |0
-<U96A1> \xE4\xBC |0
-<U96A2> \xE8\xAB |0
-<U96A3> \x90\xC1 |0
-<U96A4> \xE8\xAA |0
-<U96A5> \xFE\xE4 |0
-<U96A7> \xC0\x47 |0
-<U96A8> \xC0\x48 |0
-<U96A9> \xEC\x4F |0
-<U96AA> \xC0\x49 |0
-<U96AC> \xEE\xF6 |0
-<U96AE> \xEE\xF4 |0
-<U96B0> \xEE\xF5 |0
-<U96B1> \xC1\xF4 |0
-<U96B3> \xF1\x6F |0
-<U96B4> \xC3\xF7 |0
-<U96B6> \x90\xC4 |0
-<U96B8> \xC1\xF5 |0
-<U96B9> \xAB\x41 |0
-<U96BB> \xB0\xA6 |0
-<U96BC> \xD4\x47 |0
-<U96BD> \x90\xC7 |0
-<U96BF> \xD8\x4C |0
-<U96C0> \xB3\xB6 |0
-<U96C1> \xB6\xAD |0
-<U96C2> \xDC\xA4 |0
-<U96C3> \xDC\xA6 |0
-<U96C4> \xB6\xAF |0
-<U96C5> \xB6\xAE |0
-<U96C6> \xB6\xB0 |0
-<U96C7> \xB6\xB1 |0
-<U96C8> \xDC\xA5 |0
-<U96C9> \xB9\x6E |0
-<U96CA> \xB9\x6F |0
-<U96CB> \xB9\x6D |0
-<U96CC> \xBB\xDB |0
-<U96CD> \xB9\x6C |0
-<U96CE> \xE0\xD5 |0
-<U96D2> \xBB\xDC |0
-<U96D3> \xE8\xAC |0
-<U96D4> \xEC\x50 |0
-<U96D5> \xC0\x4A |0
-<U96D6> \xC1\xF6 |0
-<U96D7> \xF1\x70 |0
-<U96D8> \xF1\x74 |0
-<U96D9> \xC2\xF9 |0
-<U96DA> \xF1\x71 |0
-<U96DB> \xC2\xFA |0
-<U96DC> \xC2\xF8 |0
-<U96DD> \xF1\x75 |0
-<U96DE> \xC2\xFB |0
-<U96DF> \xF1\x73 |0
-<U96E1> \xF3\x79 |0
-<U96E2> \xC2\xF7 |0
-<U96E3> \xC3\xF8 |0
-<U96E5> \xF8\xCD |0
-<U96E8> \xAB\x42 |0
-<U96E9> \xB3\xB8 |0
-<U96EA> \xB3\xB7 |0
-<U96EF> \xB6\xB2 |0
-<U96F0> \xDC\xA8 |0
-<U96F1> \xDC\xA7 |0
-<U96F2> \xB6\xB3 |0
-<U96F4> \x92\xE4 |0
-<U96F5> \xE0\xD9 |0
-<U96F6> \xB9\x73 |0
-<U96F7> \xB9\x70 |0
-<U96F8> \xE0\xD8 |0
-<U96F9> \xB9\x72 |0
-<U96FA> \xE0\xD6 |0
-<U96FB> \xB9\x71 |0
-<U96FD> \xE0\xD7 |0
-<U96FF> \xE4\xBD |0
-<U9700> \xBB\xDD |0
-<U9702> \xE8\xAF |0
-<U9703> \x9F\x52 |0
-<U9704> \xBE\x5D |0
-<U9705> \xE8\xAD |0
-<U9706> \xBE\x5E |0
-<U9707> \xBE\x5F |0
-<U9708> \xE8\xAE |0
-<U9709> \xBE\x60 |0
-<U970B> \xEC\x51 |0
-<U970D> \xC0\x4E |0
-<U970E> \xC0\x4B |0
-<U970F> \xC0\x50 |0
-<U9710> \xEC\x53 |0
-<U9711> \xC0\x4C |0
-<U9712> \xEC\x52 |0
-<U9713> \xC0\x4F |0
-<U9716> \xC0\x4D |0
-<U9718> \xEE\xF9 |0
-<U9719> \xEE\xFB |0
-<U971B> \x90\xDB |0
-<U971C> \xC1\xF7 |0
-<U971D> \xEE\xFA |0
-<U971E> \xC1\xF8 |0
-<U971F> \xEE\xF8 |0
-<U9720> \xEE\xF7 |0
-<U9721> \xA0\x66 |0
-<U9722> \xF1\x77 |0
-<U9723> \xF1\x76 |0
-<U9724> \xC2\xFC |0
-<U9725> \xF1\x78 |0
-<U9726> \xF3\x7E |0
-<U9727> \xC3\xFA |0
-<U9728> \xF3\x7D |0
-<U9729> \xF3\x7A |0
-<U972A> \xC3\xF9 |0
-<U972B> \xF3\x7B |0
-<U972C> \xF3\x7C |0
-<U972E> \xF5\x48 |0
-<U972F> \xF5\x49 |0
-<U9730> \xC4\xC5 |0
-<U9731> \x90\xD2 |0
-<U9732> \xC5\x53 |0
-<U9735> \xF6\x6E |0
-<U9736> \x90\xD4 |0
-<U9738> \xC5\x51 |0
-<U9739> \xC5\x52 |0
-<U973A> \xF6\x6F |0
-<U973D> \xC5\xB4 |0
-<U973E> \xC5\xB5 |0
-<U973F> \xF7\x71 |0
-<U9740> \x9A\x5B |0
-<U9741> \x95\xFD |0
-<U9742> \xC6\x45 |0
-<U9743> \xF8\xCF |0
-<U9744> \xC6\x47 |0
-<U9746> \xF8\xCE |0
-<U9747> \xF8\xD0 |0
-<U9748> \xC6\x46 |0
-<U9749> \xF9\x57 |0
-<U974B> \xF9\xAD |0
-<U9751> \x8B\xC4 |0
-<U9752> \xAB\x43 |0
-<U9756> \xB9\x74 |0
-<U9757> \x90\xDE |0
-<U9758> \xE4\xBE |0
-<U975A> \xE8\xB0 |0
-<U975B> \xC0\x51 |0
-<U975C> \xC0\x52 |0
-<U975D> \x9C\xE4 |0
-<U975E> \xAB\x44 |0
-<U975F> \x90\xE1 |0
-<U9760> \xBE\x61 |0
-<U9761> \xC3\xFB |0
-<U9762> \xAD\xB1 |0
-<U9766> \xC0\x53 |0
-<U9768> \xC5\xE2 |0
-<U9769> \xAD\xB2 |0
-<U976A> \xD8\x4D |0
-<U976C> \xDC\xA9 |0
-<U976D> \x9E\x46 |0
-<U976E> \xDC\xAB |0
-<U9770> \xDC\xAA |0
-<U9771> \x96\x51 |0
-<U9772> \xE0\xDD |0
-<U9773> \xE0\xDA |0
-<U9774> \xB9\x75 |0
-<U9776> \xB9\x76 |0
-<U9777> \xE0\xDB |0
-<U9778> \xE0\xDC |0
-<U977A> \xE4\xC0 |0
-<U977B> \xE4\xC5 |0
-<U977C> \xBB\xDE |0
-<U977D> \xE4\xBF |0
-<U977E> \xE4\xC1 |0
-<U977F> \xE4\xC8 |0
-<U9780> \xE4\xC3 |0
-<U9781> \xE4\xC7 |0
-<U9782> \xE4\xC4 |0
-<U9783> \xE4\xC2 |0
-<U9784> \xE4\xC6 |0
-<U9785> \xBB\xDF |0
-<U9787> \xFB\x58 |0
-<U9788> \xE8\xB3 |0
-<U9789> \x90\xE6 |0
-<U978A> \xE8\xB1 |0
-<U978B> \xBE\x63 |0
-<U978D> \xBE\x62 |0
-<U978E> \xE8\xB2 |0
-<U978F> \xBE\x64 |0
-<U9794> \xEC\x56 |0
-<U9797> \xEC\x55 |0
-<U9798> \xC0\x54 |0
-<U9799> \xEC\x54 |0
-<U979A> \xEE\xFC |0
-<U979B> \x96\x50 |0
-<U979C> \xEE\xFE |0
-<U979D> \xEF\x41 |0
-<U979E> \xEF\x40 |0
-<U979F> \x90\xE7 |0
-<U97A0> \xC1\xF9 |0
-<U97A1> \xEE\xFD |0
-<U97A2> \xF1\xA1 |0
-<U97A3> \xC2\xFD |0
-<U97A4> \xF1\x7D |0
-<U97A5> \xF1\xA2 |0
-<U97A6> \xC2\xFE |0
-<U97A8> \xF1\x7B |0
-<U97AA> \xF1\x7E |0
-<U97AB> \xF1\x7C |0
-<U97AC> \xF1\x79 |0
-<U97AD> \xC3\x40 |0
-<U97AE> \xF1\x7A |0
-<U97B1> \x90\xE8 |0
-<U97B2> \x9A\x5D |0
-<U97B3> \xF3\xA1 |0
-<U97B4> \x9F\x7A |0
-<U97B6> \xF3\xA3 |0
-<U97B7> \xF3\xA2 |0
-<U97B8> \x9B\x5C |0
-<U97B9> \xF5\x4A |0
-<U97BA> \x9F\x7C |0
-<U97BB> \xF5\x4B |0
-<U97BD> \xFC\x52 |0
-<U97BE> \x90\xE9 |0
-<U97BF> \xF6\x70 |0
-<U97C0> \x90\xEA |0
-<U97C1> \xC5\xB7 |0
-<U97C2> \x9A\x5E |0
-<U97C3> \xC5\xB6 |0
-<U97C4> \xF8\x4F |0
-<U97C5> \xF8\x50 |0
-<U97C6> \xC6\x48 |0
-<U97C7> \xF8\xD1 |0
-<U97C8> \x9F\x76 |0
-<U97C9> \xC6\x69 |0
-<U97CB> \xAD\xB3 |0
-<U97CC> \xB6\xB4 |0
-<U97CD> \xE4\xCA |0
-<U97CE> \xE4\xC9 |0
-<U97CF> \xE8\xB5 |0
-<U97D0> \xE8\xB4 |0
-<U97D2> \x90\xEB |0
-<U97D3> \xC1\xFA |0
-<U97D4> \xEF\x43 |0
-<U97D5> \xEF\x42 |0
-<U97D6> \xF1\xA5 |0
-<U97D7> \xF1\xA3 |0
-<U97D8> \xF1\xA6 |0
-<U97D9> \xF1\xA4 |0
-<U97DC> \xC3\xFC |0
-<U97DD> \xF3\xA4 |0
-<U97DE> \xF3\xA5 |0
-<U97DF> \xF3\xA6 |0
-<U97E0> \x90\xEC |0
-<U97E1> \xF6\x71 |0
-<U97E3> \xF7\x72 |0
-<U97E5> \xF8\xD2 |0
-<U97E6> \x8B\xEE |0
-<U97ED> \xAD\xB4 |0
-<U97EE> \x90\xEE |0
-<U97F0> \xEC\x57 |0
-<U97F1> \xEF\x44 |0
-<U97F2> \x91\xC6 |0
-<U97F3> \xAD\xB5 |0
-<U97F5> \x90\xF2 |0
-<U97F6> \xBB\xE0 |0
-<U97F8> \xEC\x58 |0
-<U97F9> \xC3\x41 |0
-<U97FA> \xF1\xA7 |0
-<U97FB> \xC3\xFD |0
-<U97FD> \xF5\x4C |0
-<U97FE> \xF5\x4D |0
-<U97FF> \xC5\x54 |0
-<U9800> \xF8\x51 |0
-<U9801> \xAD\xB6 |0
-<U9802> \xB3\xBB |0
-<U9803> \xB3\xBC |0
-<U9804> \xD8\x4E |0
-<U9805> \xB6\xB5 |0
-<U9806> \xB6\xB6 |0
-<U9807> \xDC\xAC |0
-<U9808> \xB6\xB7 |0
-<U980A> \xB9\x7A |0
-<U980C> \xB9\x7C |0
-<U980D> \xE0\xDF |0
-<U980E> \xE0\xE0 |0
-<U980F> \xE0\xDE |0
-<U9810> \xB9\x77 |0
-<U9811> \xB9\x78 |0
-<U9812> \xB9\x7B |0
-<U9813> \xB9\x79 |0
-<U9814> \xFC\xBC |0
-<U9815> \x8A\x74 |0
-<U9816> \xE4\xCB |0
-<U9817> \xBB\xE1 |0
-<U9818> \xBB\xE2 |0
-<U981B> \xE8\xBC |0
-<U981C> \xBE\x67 |0
-<U981D> \xE8\xB7 |0
-<U981E> \xE8\xB6 |0
-<U981F> \x96\x57 |0
-<U9820> \xE8\xBB |0
-<U9821> \xBE\x65 |0
-<U9823> \x9C\xEF |0
-<U9824> \xC0\x5B |0
-<U9826> \xE8\xB8 |0
-<U9827> \xE8\xBD |0
-<U9828> \xE8\xBA |0
-<U9829> \xE8\xB9 |0
-<U982B> \xBE\x66 |0
-<U982D> \xC0\x59 |0
-<U982E> \x9F\xDF |0
-<U982F> \xEC\x5A |0
-<U9830> \xC0\x55 |0
-<U9832> \xEC\x5B |0
-<U9833> \x90\xF7 |0
-<U9834> \x90\xF6 |0
-<U9835> \xEC\x59 |0
-<U9837> \xC0\x58 |0
-<U9838> \xC0\x56 |0
-<U9839> \xC0\x5A |0
-<U983B> \xC0\x57 |0
-<U9841> \xEF\x45 |0
-<U9843> \xEF\x4A |0
-<U9844> \xEF\x46 |0
-<U9845> \xEF\x49 |0
-<U9846> \xC1\xFB |0
-<U9847> \x9B\x5E |0
-<U9848> \xED\xD4 |0
-<U9849> \xEF\x48 |0
-<U984A> \xEF\x47 |0
-<U984B> \x90\xF8 |0
-<U984C> \xC3\x44 |0
-<U984D> \xC3\x42 |0
-<U984E> \xC3\x45 |0
-<U984F> \xC3\x43 |0
-<U9850> \xF1\xA8 |0
-<U9851> \xF1\xA9 |0
-<U9852> \xF1\xAA |0
-<U9853> \xC3\x46 |0
-<U9857> \xF3\xAA |0
-<U9858> \xC4\x40 |0
-<U9859> \xF3\xA8 |0
-<U985B> \xC4\x41 |0
-<U985C> \xF3\xA7 |0
-<U985D> \xF3\xA9 |0
-<U985E> \xC3\xFE |0
-<U985F> \xF5\x51 |0
-<U9860> \xF5\x4E |0
-<U9862> \xF5\x4F |0
-<U9863> \xF5\x50 |0
-<U9864> \xF6\x72 |0
-<U9865> \xC5\x56 |0
-<U9866> \x90\xF9 |0
-<U9867> \xC5\x55 |0
-<U9869> \xF7\x74 |0
-<U986A> \xF7\x73 |0
-<U986B> \xC5\xB8 |0
-<U986C> \xFA\x6A |0
-<U986F> \xC5\xE3 |0
-<U9870> \xC6\x49 |0
-<U9871> \xC6\x60 |0
-<U9872> \xF9\x58 |0
-<U9873> \xF9\xAE |0
-<U9874> \xF9\xAF |0
-<U9875> \x8B\xEF |0
-<U98A8> \xAD\xB7 |0
-<U98A9> \xDC\xAD |0
-<U98AC> \xE0\xE1 |0
-<U98AD> \xE4\xCC |0
-<U98AE> \xE4\xCD |0
-<U98AF> \xBB\xE3 |0
-<U98B1> \xBB\xE4 |0
-<U98B2> \xE8\xBE |0
-<U98B3> \xBE\x68 |0
-<U98B4> \x9F\xE0 |0
-<U98B6> \xC1\xFC |0
-<U98B7> \x91\x42 |0
-<U98B8> \xF1\xAB |0
-<U98B9> \x9A\x62 |0
-<U98BA> \xC3\x47 |0
-<U98BB> \xF3\xAD |0
-<U98BC> \xC4\x42 |0
-<U98BD> \xF3\xAC |0
-<U98BE> \xF3\xAE |0
-<U98BF> \xF3\xAB |0
-<U98C0> \xF6\x75 |0
-<U98C1> \xF5\x52 |0
-<U98C2> \xF5\x53 |0
-<U98C3> \x95\x69 |0
-<U98C4> \xC4\xC6 |0
-<U98C6> \xF6\x74 |0
-<U98C7> \x91\x44 |0
-<U98C8> \x91\x43 |0
-<U98C9> \xF6\x73 |0
-<U98CA> \x91\x41 |0
-<U98CB> \xF7\x75 |0
-<U98CC> \xF9\xB0 |0
-<U98CE> \x8B\xF0 |0
-<U98DB> \xAD\xB8 |0
-<U98DC> \x96\x60 |0
-<U98DE> \x8B\xF1 |0
-<U98DF> \xAD\xB9 |0
-<U98E0> \x99\xF6 |0
-<U98E1> \x91\x49 |0
-<U98E2> \xB0\xA7 |0
-<U98E3> \xD4\x48 |0
-<U98E5> \xD8\x4F |0
-<U98E6> \x91\x4A |0
-<U98E7> \xB6\xB8 |0
-<U98E9> \xB6\xBB |0
-<U98EA> \xB6\xB9 |0
-<U98EB> \xDC\xAE |0
-<U98EC> \x91\x4B |0
-<U98ED> \xB6\xBD |0
-<U98EF> \xB6\xBA |0
-<U98F1> \x9A\x64 |0
-<U98F2> \xB6\xBC |0
-<U98F4> \xB9\x7E |0
-<U98F5> \x8A\xBF |0
-<U98F6> \xE0\xE2 |0
-<U98F9> \xE0\xE3 |0
-<U98FA> \xE8\xC0 |0
-<U98FC> \xB9\x7D |0
-<U98FD> \xB9\xA1 |0
-<U98FE> \xB9\xA2 |0
-<U9900> \xE4\xCF |0
-<U9902> \xE4\xCE |0
-<U9903> \xBB\xE5 |0
-<U9905> \xBB\xE6 |0
-<U9907> \xE4\xD0 |0
-<U9908> \xE8\xBF |0
-<U9909> \xBB\xE8 |0
-<U990A> \xBE\x69 |0
-<U990C> \xBB\xE7 |0
-<U990E> \x9A\x66 |0
-<U9910> \xC0\x5C |0
-<U9911> \xE8\xC1 |0
-<U9912> \xBE\x6B |0
-<U9913> \xBE\x6A |0
-<U9914> \xE8\xC2 |0
-<U9915> \xE8\xC5 |0
-<U9916> \xE8\xC3 |0
-<U9917> \xE8\xC4 |0
-<U9918> \xBE\x6C |0
-<U9919> \x9A\x67 |0
-<U991A> \xC0\x61 |0
-<U991B> \xC0\x5F |0
-<U991C> \x9A\x69 |0
-<U991E> \xC0\x5E |0
-<U991F> \xEC\x5D |0
-<U9921> \xC0\x60 |0
-<U9924> \xEC\x5C |0
-<U9925> \xEF\x4B |0
-<U9927> \xEC\x5E |0
-<U9928> \xC0\x5D |0
-<U9929> \xEC\x5F |0
-<U992A> \xEF\x4E |0
-<U992B> \xEF\x4C |0
-<U992C> \xEF\x4D |0
-<U992D> \xEF\x52 |0
-<U992E> \xC3\x4B |0
-<U992F> \xEF\x51 |0
-<U9930> \xEF\x54 |0
-<U9931> \xEF\x53 |0
-<U9932> \xEF\x50 |0
-<U9933> \xEF\x4F |0
-<U9935> \xC1\xFD |0
-<U9937> \x9A\x6A |0
-<U9938> \x96\x52 |0
-<U9939> \x91\x4D |0
-<U993A> \xF1\xAE |0
-<U993B> \x96\x66 |0
-<U993C> \xF1\xAD |0
-<U993D> \xC3\x4A |0
-<U993E> \xC3\x48 |0
-<U993F> \xC3\x49 |0
-<U9940> \x9F\x7B |0
-<U9941> \xF1\xAC |0
-<U9942> \x9A\x6B |0
-<U9943> \xF3\xB1 |0
-<U9945> \xC4\x43 |0
-<U9947> \xF3\xB0 |0
-<U9948> \xF3\xAF |0
-<U9949> \xC4\x44 |0
-<U994A> \xA0\x6C |0
-<U994B> \xF5\x58 |0
-<U994C> \xF5\x57 |0
-<U994D> \x96\x67 |0
-<U994E> \xF5\x55 |0
-<U9950> \xF5\x54 |0
-<U9951> \xC4\xC8 |0
-<U9952> \xC4\xC7 |0
-<U9953> \xF5\x59 |0
-<U9954> \xF7\x76 |0
-<U9955> \xC5\xB9 |0
-<U9956> \xF6\x77 |0
-<U9957> \xC5\x57 |0
-<U9958> \xF6\x76 |0
-<U9959> \xF5\x56 |0
-<U995B> \xF7\x77 |0
-<U995C> \xC5\xE4 |0
-<U995D> \x9A\x6C |0
-<U995E> \xC6\x61 |0
-<U995F> \xF9\x59 |0
-<U9961> \xF9\xB1 |0
-<U9962> \x9A\x6D |0
-<U9963> \x8B\xF2 |0
-<U9996> \xAD\xBA |0
-<U9997> \xD8\x50 |0
-<U9998> \xEF\x55 |0
-<U9999> \xAD\xBB |0
-<U999B> \x96\x6A |0
-<U999C> \xE4\xD2 |0
-<U999D> \xE4\xD1 |0
-<U999E> \xEC\x60 |0
-<U99A1> \xEF\x57 |0
-<U99A3> \xEF\x56 |0
-<U99A4> \xFC\xEA |0
-<U99A5> \xC3\x4C |0
-<U99A6> \xF3\xB2 |0
-<U99A7> \xF3\xB3 |0
-<U99A8> \xC4\xC9 |0
-<U99AA> \x96\x6C |0
-<U99AB> \xF9\xB2 |0
-<U99AC> \xB0\xA8 |0
-<U99AD> \xB6\xBF |0
-<U99AE> \xB6\xBE |0
-<U99AF> \xE0\xE4 |0
-<U99B0> \xE0\xE6 |0
-<U99B1> \xB9\xA4 |0
-<U99B2> \xE0\xE5 |0
-<U99B3> \xB9\xA3 |0
-<U99B4> \xB9\xA5 |0
-<U99B5> \xE0\xE7 |0
-<U99B8> \x91\xC4 |0
-<U99B9> \xE4\xD4 |0
-<U99BA> \xE4\xD6 |0
-<U99BB> \xE4\xD5 |0
-<U99BC> \x96\x77 |0
-<U99BD> \xE4\xD8 |0
-<U99C1> \xBB\xE9 |0
-<U99C2> \xE4\xD7 |0
-<U99C3> \xE4\xD3 |0
-<U99C4> \x99\xF4 |0
-<U99C5> \x9A\x6F |0
-<U99C7> \xE4\xD9 |0
-<U99C9> \xE8\xCC |0
-<U99CB> \xE8\xCF |0
-<U99CC> \xE8\xD1 |0
-<U99CD> \xE8\xC7 |0
-<U99CE> \xE8\xCB |0
-<U99CF> \xE8\xC8 |0
-<U99D0> \xBE\x6E |0
-<U99D1> \xBE\x71 |0
-<U99D2> \xBE\x73 |0
-<U99D3> \xE8\xC9 |0
-<U99D4> \xE8\xCA |0
-<U99D5> \xBE\x72 |0
-<U99D6> \xE8\xCD |0
-<U99D7> \xE8\xD0 |0
-<U99D8> \xE8\xCE |0
-<U99D9> \xBE\x74 |0
-<U99DA> \x9F\xAB |0
-<U99DB> \xBE\x70 |0
-<U99DC> \xE8\xC6 |0
-<U99DD> \xBE\x6D |0
-<U99DF> \xBE\x6F |0
-<U99E1> \x8E\xC1 |0
-<U99E2> \xC0\x63 |0
-<U99E3> \xEC\x66 |0
-<U99E4> \xEC\x64 |0
-<U99E5> \xEC\x63 |0
-<U99E6> \x95\x55 |0
-<U99E7> \xEC\x69 |0
-<U99E9> \xEC\x68 |0
-<U99EA> \xEC\x67 |0
-<U99EC> \xEC\x62 |0
-<U99ED> \xC0\x62 |0
-<U99EE> \xEC\x61 |0
-<U99F0> \xEC\x65 |0
-<U99F1> \xC0\x64 |0
-<U99F4> \xEF\x5A |0
-<U99F5> \x91\x52 |0
-<U99F6> \xEF\x5E |0
-<U99F7> \xEF\x5B |0
-<U99F8> \xEF\x5D |0
-<U99F9> \xEF\x5C |0
-<U99FA> \xEF\x59 |0
-<U99FB> \xEF\x5F |0
-<U99FC> \xEF\x62 |0
-<U99FD> \xEF\x60 |0
-<U99FE> \xEF\x61 |0
-<U99FF> \xC2\x40 |0
-<U9A01> \xC1\xFE |0
-<U9A02> \xEF\x58 |0
-<U9A03> \xEF\x63 |0
-<U9A04> \xF1\xB3 |0
-<U9A05> \xF1\xB6 |0
-<U9A06> \xF1\xB8 |0
-<U9A07> \xF1\xB7 |0
-<U9A09> \xF1\xB1 |0
-<U9A0A> \xF1\xB5 |0
-<U9A0B> \xF1\xB0 |0
-<U9A0C> \x91\x53 |0
-<U9A0D> \xF1\xB2 |0
-<U9A0E> \xC3\x4D |0
-<U9A0F> \xF1\xAF |0
-<U9A10> \x91\x55 |0
-<U9A11> \xF1\xB4 |0
-<U9A14> \xF3\xC0 |0
-<U9A15> \xF3\xB5 |0
-<U9A16> \xC4\x45 |0
-<U9A19> \xC4\x46 |0
-<U9A1A> \xF3\xB4 |0
-<U9A1B> \xF3\xB9 |0
-<U9A1C> \xF3\xBF |0
-<U9A1D> \xF3\xB7 |0
-<U9A1E> \xF3\xBE |0
-<U9A1F> \x95\x5D |0
-<U9A20> \xF3\xBB |0
-<U9A21> \x96\x71 |0
-<U9A22> \xF3\xBA |0
-<U9A23> \xF3\xBD |0
-<U9A24> \xF3\xB8 |0
-<U9A25> \xF3\xB6 |0
-<U9A26> \x9C\x6D |0
-<U9A27> \xF3\xBC |0
-<U9A29> \xF5\x60 |0
-<U9A2A> \xF5\x5E |0
-<U9A2B> \xC4\xCA |0
-<U9A2C> \xF5\x5D |0
-<U9A2D> \xF5\x63 |0
-<U9A2E> \xF5\x61 |0
-<U9A2F> \x96\x73 |0
-<U9A30> \xC4\xCB |0
-<U9A31> \xF5\x5C |0
-<U9A32> \xF5\x5A |0
-<U9A34> \xF5\x5B |0
-<U9A35> \xC4\xCD |0
-<U9A36> \xF5\x5F |0
-<U9A37> \xC4\xCC |0
-<U9A38> \xF5\x62 |0
-<U9A39> \xF6\x78 |0
-<U9A3A> \xF6\x7E |0
-<U9A3B> \x91\x54 |0
-<U9A3C> \x9A\x71 |0
-<U9A3D> \xF6\x79 |0
-<U9A3E> \xC5\x5B |0
-<U9A3F> \xF6\xA1 |0
-<U9A40> \xC5\x5A |0
-<U9A41> \xF6\x7D |0
-<U9A42> \xF6\x7C |0
-<U9A43> \xC5\x59 |0
-<U9A44> \xF6\x7B |0
-<U9A45> \xC5\x58 |0
-<U9A46> \xF6\x7A |0
-<U9A48> \xF7\x7D |0
-<U9A49> \xF7\xA1 |0
-<U9A4A> \xF7\x7E |0
-<U9A4C> \xF7\x7B |0
-<U9A4D> \xC5\xBB |0
-<U9A4E> \xF7\x78 |0
-<U9A4F> \xF7\x7C |0
-<U9A50> \xF7\xA3 |0
-<U9A52> \xF7\xA2 |0
-<U9A53> \xF7\x79 |0
-<U9A54> \xF7\x7A |0
-<U9A55> \xC5\xBA |0
-<U9A56> \xF8\x52 |0
-<U9A57> \xC5\xE7 |0
-<U9A58> \x91\x56 |0
-<U9A59> \xF8\x53 |0
-<U9A5A> \xC5\xE5 |0
-<U9A5B> \xC5\xE6 |0
-<U9A5C> \x96\x6D |0
-<U9A5E> \xF8\xD3 |0
-<U9A5F> \xC6\x4A |0
-<U9A60> \xF9\x76 |0
-<U9A62> \xC6\x6A |0
-<U9A63> \x95\x57 |0
-<U9A64> \xF9\xB3 |0
-<U9A65> \xC6\x6B |0
-<U9A66> \xF9\xB4 |0
-<U9A67> \xF9\xB5 |0
-<U9A68> \xF9\xC3 |0
-<U9A69> \xF9\xC2 |0
-<U9A6A> \xC6\x7A |0
-<U9A6B> \xF9\xCD |0
-<U9A6C> \x89\xC6 |0
-<U9A8F> \x89\xC7 |0
-<U9AA8> \xB0\xA9 |0
-<U9AAB> \xE0\xE9 |0
-<U9AAD> \xE0\xE8 |0
-<U9AAF> \xBB\xEA |0
-<U9AB0> \xBB\xEB |0
-<U9AB1> \xE4\xDA |0
-<U9AB2> \x8A\x6A |0
-<U9AB3> \xE8\xD2 |0
-<U9AB4> \xEC\x6C |0
-<U9AB6> \x8B\x57 |0
-<U9AB7> \xBE\x75 |0
-<U9AB8> \xC0\x65 |0
-<U9AB9> \xEC\x6A |0
-<U9ABA> \x9F\xE1 |0
-<U9ABB> \xEC\x6D |0
-<U9ABC> \xC0\x66 |0
-<U9ABD> \x9B\x5F |0
-<U9ABE> \xEF\x64 |0
-<U9ABF> \xEC\x6B |0
-<U9AC0> \xF1\xB9 |0
-<U9AC1> \xC3\x4E |0
-<U9AC2> \xF3\xC1 |0
-<U9AC6> \xF5\x66 |0
-<U9AC7> \xF5\x64 |0
-<U9ACA> \xF5\x65 |0
-<U9ACD> \xF6\xA2 |0
-<U9ACF> \xC5\x5C |0
-<U9AD0> \xF7\xA4 |0
-<U9AD1> \xC5\xEA |0
-<U9AD2> \xC5\xBC |0
-<U9AD3> \xC5\xE8 |0
-<U9AD4> \xC5\xE9 |0
-<U9AD5> \xF8\xD4 |0
-<U9AD6> \xC6\x62 |0
-<U9AD7> \xA0\x5D |0
-<U9AD8> \xB0\xAA |0
-<U9ADC> \xF1\xBA |0
-<U9ADF> \xD4\x49 |0
-<U9AE0> \x91\x5B |0
-<U9AE1> \xB9\xA6 |0
-<U9AE2> \x91\x5C |0
-<U9AE3> \xE4\xDB |0
-<U9AE6> \xBB\xEC |0
-<U9AE7> \xE4\xDC |0
-<U9AEB> \xE8\xD4 |0
-<U9AEC> \xE8\xD3 |0
-<U9AED> \xC0\x68 |0
-<U9AEE> \xBE\x76 |0
-<U9AEF> \xBE\x77 |0
-<U9AF1> \xE8\xD7 |0
-<U9AF2> \xE8\xD6 |0
-<U9AF3> \xE8\xD5 |0
-<U9AF4> \x91\x5E |0
-<U9AF6> \xEC\x6E |0
-<U9AF7> \xEC\x71 |0
-<U9AF9> \xEC\x70 |0
-<U9AFA> \xEC\x6F |0
-<U9AFB> \xC0\x67 |0
-<U9AFC> \xEF\x68 |0
-<U9AFD> \xEF\x66 |0
-<U9AFE> \xEF\x65 |0
-<U9AFF> \x9F\x5C |0
-<U9B01> \xEF\x67 |0
-<U9B02> \x9F\x57 |0
-<U9B03> \xC3\x4F |0
-<U9B04> \xF1\xBC |0
-<U9B05> \xF1\xBD |0
-<U9B06> \xC3\x50 |0
-<U9B08> \xF1\xBB |0
-<U9B09> \x9F\x65 |0
-<U9B0A> \xF3\xC3 |0
-<U9B0B> \xF3\xC2 |0
-<U9B0C> \xF3\xC5 |0
-<U9B0D> \xC4\x47 |0
-<U9B0E> \xF3\xC4 |0
-<U9B0F> \x9A\x72 |0
-<U9B10> \xF5\x67 |0
-<U9B11> \xF5\x69 |0
-<U9B12> \xF5\x68 |0
-<U9B14> \x91\x60 |0
-<U9B15> \xF6\xA3 |0
-<U9B16> \xF6\xA6 |0
-<U9B17> \xF6\xA4 |0
-<U9B18> \xF6\xA5 |0
-<U9B19> \xF7\xA5 |0
-<U9B1A> \xC5\xBD |0
-<U9B1E> \xF8\x54 |0
-<U9B1F> \xF8\x55 |0
-<U9B20> \xF8\x56 |0
-<U9B22> \xC6\x4B |0
-<U9B23> \xC6\x63 |0
-<U9B24> \xF9\xB6 |0
-<U9B25> \xB0\xAB |0
-<U9B27> \xBE\x78 |0
-<U9B28> \xC0\x69 |0
-<U9B29> \xF1\xBE |0
-<U9B2A> \x9F\x5E |0
-<U9B2B> \xF7\xA6 |0
-<U9B2D> \x91\x61 |0
-<U9B2E> \xF9\xC4 |0
-<U9B2F> \xD4\x4A |0
-<U9B31> \xC6\x7B |0
-<U9B32> \xB0\xAC |0
-<U9B33> \xEC\x72 |0
-<U9B34> \x91\x64 |0
-<U9B35> \xF1\xBF |0
-<U9B37> \xF3\xC6 |0
-<U9B39> \x9F\x41 |0
-<U9B3A> \xF6\xA7 |0
-<U9B3B> \xF7\xA7 |0
-<U9B3C> \xB0\xAD |0
-<U9B3E> \xE4\xDD |0
-<U9B3F> \xE4\xDE |0
-<U9B40> \x91\x69 |0
-<U9B41> \xBB\xED |0
-<U9B42> \xBB\xEE |0
-<U9B43> \xE8\xD9 |0
-<U9B44> \xBE\x7A |0
-<U9B45> \xBE\x79 |0
-<U9B46> \xE8\xD8 |0
-<U9B48> \xEF\x69 |0
-<U9B4A> \xF1\xC0 |0
-<U9B4B> \xF1\xC2 |0
-<U9B4C> \xF1\xC1 |0
-<U9B4D> \xC3\x53 |0
-<U9B4E> \xC3\x52 |0
-<U9B4F> \xC3\x51 |0
-<U9B50> \x91\x68 |0
-<U9B51> \xC5\x5E |0
-<U9B52> \xF6\xA8 |0
-<U9B54> \xC5\x5D |0
-<U9B55> \xF7\xA9 |0
-<U9B56> \xF7\xA8 |0
-<U9B58> \xC6\x4C |0
-<U9B59> \xF8\xD5 |0
-<U9B5A> \xB3\xBD |0
-<U9B5B> \xE0\xEA |0
-<U9B5F> \xE4\xE1 |0
-<U9B60> \xE4\xDF |0
-<U9B61> \xE4\xE0 |0
-<U9B64> \xE8\xE2 |0
-<U9B66> \xE8\xDD |0
-<U9B67> \xE8\xDA |0
-<U9B68> \xE8\xE1 |0
-<U9B69> \x9A\x74 |0
-<U9B6C> \xE8\xE3 |0
-<U9B6F> \xBE\x7C |0
-<U9B70> \xE8\xE0 |0
-<U9B71> \xE8\xDC |0
-<U9B74> \xE8\xDB |0
-<U9B75> \xE8\xDF |0
-<U9B76> \xE8\xDE |0
-<U9B77> \xBE\x7B |0
-<U9B7A> \xEC\x7D |0
-<U9B7B> \xEC\x78 |0
-<U9B7C> \xEC\x76 |0
-<U9B7D> \xEC\xA1 |0
-<U9B7E> \xEC\x77 |0
-<U9B7F> \x96\xB2 |0
-<U9B80> \xEC\x73 |0
-<U9B81> \x9A\x75 |0
-<U9B82> \xEC\x79 |0
-<U9B83> \xFD\xA5 |0
-<U9B85> \xEC\x74 |0
-<U9B86> \xEF\x72 |0
-<U9B87> \xEC\x75 |0
-<U9B88> \xEC\xA2 |0
-<U9B8B> \x9E\xE9 |0
-<U9B8D> \x8B\xBA |0
-<U9B8E> \x91\x6D |0
-<U9B8F> \xA0\x60 |0
-<U9B90> \xEC\x7C |0
-<U9B91> \xC0\x6A |0
-<U9B92> \xEC\x7B |0
-<U9B93> \xEC\x7A |0
-<U9B95> \xEC\x7E |0
-<U9B97> \x9F\xDE |0
-<U9B9A> \xEF\x6A |0
-<U9B9B> \xEF\x6D |0
-<U9B9D> \x9F\xC3 |0
-<U9B9E> \xEF\x6C |0
-<U9B9F> \x96\xB5 |0
-<U9BA0> \xEF\x74 |0
-<U9BA1> \xEF\x6F |0
-<U9BA2> \xEF\x73 |0
-<U9BA4> \xEF\x71 |0
-<U9BA5> \xEF\x70 |0
-<U9BA6> \xEF\x6E |0
-<U9BA8> \xEF\x6B |0
-<U9BAA> \xC2\x43 |0
-<U9BAB> \xC2\x42 |0
-<U9BAD> \xC2\x44 |0
-<U9BAE> \xC2\x41 |0
-<U9BAF> \xEF\x75 |0
-<U9BB0> \xA0\x67 |0
-<U9BB5> \xF1\xC8 |0
-<U9BB6> \xF1\xCB |0
-<U9BB8> \xF1\xC9 |0
-<U9BB9> \xF1\xCD |0
-<U9BBD> \xF1\xCE |0
-<U9BBF> \xF1\xC6 |0
-<U9BC0> \xC3\x58 |0
-<U9BC1> \xF1\xC7 |0
-<U9BC3> \xF1\xC5 |0
-<U9BC4> \xF1\xCC |0
-<U9BC6> \xF1\xC4 |0
-<U9BC7> \xF1\xC3 |0
-<U9BC8> \xC3\x57 |0
-<U9BC9> \xC3\x55 |0
-<U9BCA> \xC3\x54 |0
-<U9BCF> \x96\xB3 |0
-<U9BD3> \xF1\xCA |0
-<U9BD4> \xF3\xCF |0
-<U9BD5> \xF3\xD5 |0
-<U9BD6> \xC4\x4A |0
-<U9BD7> \xF3\xD0 |0
-<U9BD9> \xF3\xD3 |0
-<U9BDA> \xF3\xD7 |0
-<U9BDB> \xC4\x4B |0
-<U9BDC> \xF3\xD2 |0
-<U9BDD> \x9A\x76 |0
-<U9BDE> \xF3\xCA |0
-<U9BE0> \xF3\xC9 |0
-<U9BE1> \xF3\xD6 |0
-<U9BE2> \xF3\xCD |0
-<U9BE4> \xF3\xCB |0
-<U9BE5> \xF3\xD4 |0
-<U9BE6> \xF3\xCC |0
-<U9BE7> \xC4\x49 |0
-<U9BE8> \xC4\x48 |0
-<U9BE9> \x95\xD5 |0
-<U9BEA> \xF3\xC7 |0
-<U9BEB> \xF3\xC8 |0
-<U9BEC> \xF3\xD1 |0
-<U9BED> \x9E\xCA |0
-<U9BF0> \xF3\xCE |0
-<U9BF1> \x9A\x77 |0
-<U9BF4> \x9A\x78 |0
-<U9BF7> \xF5\x6C |0
-<U9BF8> \xF5\x6F |0
-<U9BFD> \xC3\x56 |0
-<U9BFF> \x91\x70 |0
-<U9C02> \x91\x6F |0
-<U9C05> \xF5\x6D |0
-<U9C06> \xF5\x73 |0
-<U9C07> \xF5\x71 |0
-<U9C08> \xF5\x6B |0
-<U9C09> \xF5\x76 |0
-<U9C0A> \x9F\xA3 |0
-<U9C0B> \xF5\x6A |0
-<U9C0C> \x91\x71 |0
-<U9C0D> \xC4\xCF |0
-<U9C0E> \xF5\x72 |0
-<U9C10> \x96\xB1 |0
-<U9C12> \xF5\x6E |0
-<U9C13> \xC4\xCE |0
-<U9C14> \xF5\x75 |0
-<U9C15> \x9F\x63 |0
-<U9C17> \xF5\x74 |0
-<U9C1B> \x9F\x67 |0
-<U9C1C> \xF6\xAB |0
-<U9C1D> \xF6\xAA |0
-<U9C1F> \x8B\xB9 |0
-<U9C20> \x9A\x7A |0
-<U9C21> \xF6\xB1 |0
-<U9C23> \xF6\xAD |0
-<U9C24> \xF6\xB0 |0
-<U9C25> \xC5\x60 |0
-<U9C26> \x8B\x56 |0
-<U9C28> \xF6\xAE |0
-<U9C29> \xF6\xAF |0
-<U9C2B> \xF6\xA9 |0
-<U9C2C> \xF6\xAC |0
-<U9C2D> \xC5\x5F |0
-<U9C2F> \x9A\xDA |0
-<U9C31> \xC5\xBF |0
-<U9C32> \xF7\xB4 |0
-<U9C33> \xF7\xAF |0
-<U9C34> \xF7\xB3 |0
-<U9C35> \x96\xB0 |0
-<U9C36> \xF7\xB6 |0
-<U9C37> \xF7\xB2 |0
-<U9C39> \xF7\xAE |0
-<U9C3A> \x9A\x7E |0
-<U9C3B> \xC5\xC1 |0
-<U9C3C> \xF7\xB1 |0
-<U9C3D> \xF7\xB5 |0
-<U9C3E> \xC5\xC0 |0
-<U9C3F> \xF7\xAC |0
-<U9C40> \xF5\x70 |0
-<U9C41> \xF7\xB0 |0
-<U9C44> \xF7\xAD |0
-<U9C45> \x9D\xDE |0
-<U9C46> \xF7\xAA |0
-<U9C48> \xF7\xAB |0
-<U9C49> \xC5\xBE |0
-<U9C4A> \xF8\x5A |0
-<U9C4B> \xF8\x5C |0
-<U9C4C> \xF8\x5F |0
-<U9C4D> \xF8\x5B |0
-<U9C4E> \xF8\x60 |0
-<U9C4F> \x96\xAD |0
-<U9C50> \xF8\x59 |0
-<U9C52> \xF8\x57 |0
-<U9C53> \x96\xAE |0
-<U9C54> \xC5\xEB |0
-<U9C55> \xF8\x5D |0
-<U9C56> \xC5\xED |0
-<U9C57> \xC5\xEC |0
-<U9C58> \xF8\x58 |0
-<U9C59> \xF8\x5E |0
-<U9C5D> \x9E\xA1 |0
-<U9C5E> \xF8\xDA |0
-<U9C5F> \xC6\x4D |0
-<U9C60> \xF8\xDB |0
-<U9C62> \xF8\xD9 |0
-<U9C63> \xF8\xD6 |0
-<U9C66> \xF8\xD8 |0
-<U9C67> \xF8\xD7 |0
-<U9C68> \xF9\x5A |0
-<U9C6D> \xF9\x5C |0
-<U9C6E> \xF9\x5B |0
-<U9C71> \xF9\x79 |0
-<U9C72> \x9E\x50 |0
-<U9C73> \xF9\x78 |0
-<U9C74> \xF9\x77 |0
-<U9C75> \xF9\x7A |0
-<U9C77> \xC6\x73 |0
-<U9C78> \xC6\x74 |0
-<U9C79> \xF9\xCA |0
-<U9C7A> \xF9\xCE |0
-<U9C7B> \x96\xAF |0
-<U9C7C> \x8B\xF4 |0
-<U9CE5> \xB3\xBE |0
-<U9CE6> \xDC\xAF |0
-<U9CE7> \xE0\xED |0
-<U9CE9> \xB9\xA7 |0
-<U9CEA> \xE0\xEB |0
-<U9CED> \xE0\xEC |0
-<U9CF1> \xE4\xE2 |0
-<U9CF2> \xE4\xE3 |0
-<U9CF3> \xBB\xF1 |0
-<U9CF4> \xBB\xEF |0
-<U9CF5> \xE4\xE4 |0
-<U9CF6> \xBB\xF0 |0
-<U9CF7> \xE8\xE8 |0
-<U9CF9> \xE8\xEB |0
-<U9CFA> \xE8\xE5 |0
-<U9CFB> \xE8\xEC |0
-<U9CFC> \xE8\xE4 |0
-<U9CFD> \xE8\xE6 |0
-<U9CFF> \xE8\xE7 |0
-<U9D00> \xE8\xEA |0
-<U9D02> \x9F\xA4 |0
-<U9D03> \xBE\xA1 |0
-<U9D04> \xE8\xEF |0
-<U9D05> \xE8\xEE |0
-<U9D06> \xBE\x7D |0
-<U9D07> \xE8\xE9 |0
-<U9D08> \xE8\xED |0
-<U9D09> \xBE\x7E |0
-<U9D0C> \x96\xBD |0
-<U9D10> \xEC\xAC |0
-<U9D12> \xC0\x6F |0
-<U9D14> \xEC\xA7 |0
-<U9D15> \xC0\x6B |0
-<U9D16> \x96\xF4 |0
-<U9D17> \xEC\xA4 |0
-<U9D18> \xEC\xAA |0
-<U9D19> \xEC\xAD |0
-<U9D1B> \xC0\x70 |0
-<U9D1D> \xEC\xA9 |0
-<U9D1E> \xEC\xA6 |0
-<U9D1F> \xEC\xAE |0
-<U9D20> \xEC\xA5 |0
-<U9D21> \x96\xB8 |0
-<U9D22> \xEC\xAB |0
-<U9D23> \xC0\x6C |0
-<U9D25> \xEC\xA3 |0
-<U9D26> \xC0\x6D |0
-<U9D28> \xC0\x6E |0
-<U9D29> \xEC\xA8 |0
-<U9D2D> \xEF\xA9 |0
-<U9D2E> \xEF\x7A |0
-<U9D2F> \xEF\x7B |0
-<U9D30> \xEF\x7E |0
-<U9D31> \xEF\x7C |0
-<U9D33> \xEF\x76 |0
-<U9D34> \xFA\xA1 |0
-<U9D36> \xEF\x79 |0
-<U9D37> \xEF\xA5 |0
-<U9D38> \xEF\x7D |0
-<U9D39> \x91\xA7 |0
-<U9D3B> \xC2\x45 |0
-<U9D3D> \xEF\xA7 |0
-<U9D3E> \xEF\xA4 |0
-<U9D3F> \xC2\x46 |0
-<U9D40> \xEF\xA6 |0
-<U9D41> \xEF\x77 |0
-<U9D42> \xEF\xA2 |0
-<U9D43> \xEF\xA3 |0
-<U9D44> \xA0\x5E |0
-<U9D45> \xEF\xA1 |0
-<U9D49> \x9A\x7D |0
-<U9D4A> \xF1\xD2 |0
-<U9D4B> \xF1\xD4 |0
-<U9D4C> \xF1\xD7 |0
-<U9D4E> \x89\x48 |0
-<U9D4F> \xF1\xD1 |0
-<U9D50> \x9E\xB1 |0
-<U9D51> \xC3\x59 |0
-<U9D52> \xF1\xD9 |0
-<U9D53> \xF1\xD0 |0
-<U9D54> \xF1\xDA |0
-<U9D56> \xF1\xD6 |0
-<U9D57> \xF1\xD8 |0
-<U9D58> \xF1\xDC |0
-<U9D59> \xF1\xD5 |0
-<U9D5A> \xF1\xDD |0
-<U9D5B> \xF1\xD3 |0
-<U9D5C> \xF1\xCF |0
-<U9D5D> \xC3\x5A |0
-<U9D5E> \x9D\xDB |0
-<U9D5F> \xF1\xDB |0
-<U9D60> \xC3\x5B |0
-<U9D61> \xC4\x4D |0
-<U9D67> \xEF\x78 |0
-<U9D68> \xF3\xF1 |0
-<U9D69> \xF3\xE8 |0
-<U9D6A> \xC4\x4F |0
-<U9D6B> \xF3\xE4 |0
-<U9D6C> \xC4\x50 |0
-<U9D6D> \x95\xBF |0
-<U9D6E> \x8A\x73 |0
-<U9D6F> \xF3\xED |0
-<U9D70> \xF3\xE7 |0
-<U9D71> \xF3\xDD |0
-<U9D72> \xC4\x4E |0
-<U9D73> \xF3\xEA |0
-<U9D74> \xF3\xE5 |0
-<U9D75> \xF3\xE6 |0
-<U9D77> \xF3\xD8 |0
-<U9D78> \xF3\xDF |0
-<U9D79> \xF3\xEE |0
-<U9D7B> \xF3\xEB |0
-<U9D7C> \x9E\xFE |0
-<U9D7D> \xF3\xE3 |0
-<U9D7E> \x91\x7A |0
-<U9D7F> \xF3\xEF |0
-<U9D80> \xF3\xDE |0
-<U9D81> \xF3\xD9 |0
-<U9D82> \xF3\xEC |0
-<U9D83> \x91\x7B |0
-<U9D84> \xF3\xDB |0
-<U9D85> \xF3\xE9 |0
-<U9D86> \xF3\xE0 |0
-<U9D87> \xF3\xF0 |0
-<U9D88> \xF3\xDC |0
-<U9D89> \xC4\x4C |0
-<U9D8A> \xF3\xDA |0
-<U9D8B> \xF3\xE1 |0
-<U9D8C> \xF3\xE2 |0
-<U9D90> \xF5\x7D |0
-<U9D92> \xF5\x7B |0
-<U9D93> \x9A\xA3 |0
-<U9D94> \xF5\xA2 |0
-<U9D96> \xF5\xAE |0
-<U9D97> \xF5\xA5 |0
-<U9D98> \xF5\x7C |0
-<U9D99> \xF5\x78 |0
-<U9D9A> \xF5\xA7 |0
-<U9D9B> \xF5\x7E |0
-<U9D9C> \xF5\xA3 |0
-<U9D9D> \xF5\x7A |0
-<U9D9E> \xF5\xAA |0
-<U9D9F> \xF5\x77 |0
-<U9DA0> \xF5\xA1 |0
-<U9DA1> \xF5\xA6 |0
-<U9DA2> \xF5\xA8 |0
-<U9DA3> \xF5\xAB |0
-<U9DA4> \xF5\x79 |0
-<U9DA5> \x96\xC2 |0
-<U9DA6> \xF5\xAF |0
-<U9DA7> \xF5\xB0 |0
-<U9DA8> \xF5\xA9 |0
-<U9DA9> \xF5\xAD |0
-<U9DAA> \xF5\xA4 |0
-<U9DAB> \x9F\x77 |0
-<U9DAC> \xF6\xC1 |0
-<U9DAD> \xF6\xC4 |0
-<U9DAF> \xC5\x61 |0
-<U9DB1> \xF6\xC3 |0
-<U9DB2> \xF6\xC8 |0
-<U9DB3> \xF6\xC6 |0
-<U9DB4> \xC5\x62 |0
-<U9DB5> \xF6\xBD |0
-<U9DB6> \xF6\xB3 |0
-<U9DB7> \xF6\xB2 |0
-<U9DB8> \xC5\x64 |0
-<U9DB9> \xF6\xBF |0
-<U9DBA> \xF6\xC0 |0
-<U9DBB> \xF6\xBC |0
-<U9DBC> \xF6\xB4 |0
-<U9DBD> \x9A\xA4 |0
-<U9DBE> \xF6\xB9 |0
-<U9DBF> \xF5\xAC |0
-<U9DC0> \x9A\xA5 |0
-<U9DC1> \xF6\xB5 |0
-<U9DC2> \xC5\x63 |0
-<U9DC3> \xF6\xBB |0
-<U9DC4> \x91\xA1 |0
-<U9DC5> \xF6\xBA |0
-<U9DC7> \xF6\xB6 |0
-<U9DC8> \xF6\xC2 |0
-<U9DC9> \x89\xB8 |0
-<U9DCA> \xF6\xB7 |0
-<U9DCB> \xF7\xBB |0
-<U9DCC> \xF6\xC5 |0
-<U9DCD> \xF6\xC7 |0
-<U9DCE> \xF6\xBE |0
-<U9DCF> \xF6\xB8 |0
-<U9DD0> \xF7\xBC |0
-<U9DD1> \xF7\xBE |0
-<U9DD2> \xF7\xB8 |0
-<U9DD3> \xC5\xC2 |0
-<U9DD4> \x91\x73 |0
-<U9DD5> \xF7\xC5 |0
-<U9DD6> \xF7\xC3 |0
-<U9DD7> \xC5\xC3 |0
-<U9DD8> \xF7\xC2 |0
-<U9DD9> \xF7\xC1 |0
-<U9DDA> \xF7\xBA |0
-<U9DDB> \xF7\xB7 |0
-<U9DDC> \xF7\xBD |0
-<U9DDD> \xF7\xC6 |0
-<U9DDE> \xF7\xB9 |0
-<U9DDF> \xF7\xBF |0
-<U9DE1> \xF8\x69 |0
-<U9DE2> \xF8\x6E |0
-<U9DE3> \xF8\x64 |0
-<U9DE4> \xF8\x67 |0
-<U9DE5> \xC5\xEE |0
-<U9DE6> \xF8\x6B |0
-<U9DE8> \xF8\x72 |0
-<U9DE9> \xF7\xC0 |0
-<U9DEB> \xF8\x65 |0
-<U9DEC> \xF8\x6F |0
-<U9DED> \xF8\x73 |0
-<U9DEE> \xF8\x6A |0
-<U9DEF> \xF8\x63 |0
-<U9DF0> \xF8\x6D |0
-<U9DF2> \xF8\x6C |0
-<U9DF3> \xF8\x71 |0
-<U9DF4> \xF8\x70 |0
-<U9DF5> \xF7\xC4 |0
-<U9DF6> \xF8\x68 |0
-<U9DF7> \xF8\x62 |0
-<U9DF8> \xF8\x66 |0
-<U9DF9> \xC6\x4E |0
-<U9DFA> \xC6\x4F |0
-<U9DFB> \xF8\x61 |0
-<U9DFC> \x9A\xA6 |0
-<U9DFD> \xF8\xE6 |0
-<U9DFE> \xF8\xDD |0
-<U9DFF> \xF8\xE5 |0
-<U9E00> \xF8\xE2 |0
-<U9E01> \xF8\xE3 |0
-<U9E02> \xF8\xDC |0
-<U9E03> \xF8\xDF |0
-<U9E04> \xF8\xE7 |0
-<U9E05> \xF8\xE1 |0
-<U9E06> \xF8\xE0 |0
-<U9E07> \xF8\xDE |0
-<U9E09> \xF8\xE4 |0
-<U9E0A> \x89\xBD |0
-<U9E0B> \xF9\x5D |0
-<U9E0C> \x89\xB9 |0
-<U9E0D> \xF9\x5E |0
-<U9E0E> \x91\x7D |0
-<U9E0F> \xF9\x60 |0
-<U9E10> \xF9\x5F |0
-<U9E11> \xF9\x62 |0
-<U9E12> \xF9\x61 |0
-<U9E13> \xF9\x7C |0
-<U9E14> \xF9\x7B |0
-<U9E15> \xF9\xB7 |0
-<U9E17> \xF9\xB8 |0
-<U9E18> \x96\xBB |0
-<U9E19> \xF9\xC5 |0
-<U9E1A> \xC6\x78 |0
-<U9E1B> \xC6\x7C |0
-<U9E1C> \x9F\xF2 |0
-<U9E1D> \xF9\xCF |0
-<U9E1E> \xC6\x7D |0
-<U9E1F> \x8B\xF5 |0
-<U9E75> \xB3\xBF |0
-<U9E79> \xC4\xD0 |0
-<U9E7A> \xF6\xC9 |0
-<U9E7B> \x9A\xA9 |0
-<U9E7C> \xC6\x50 |0
-<U9E7D> \xC6\x51 |0
-<U9E7F> \xB3\xC0 |0
-<U9E80> \xE0\xEE |0
-<U9E81> \x9F\x54 |0
-<U9E82> \xB9\xA8 |0
-<U9E83> \xE8\xF0 |0
-<U9E84> \x9F\xE3 |0
-<U9E85> \x9E\xED |0
-<U9E86> \xEC\xB0 |0
-<U9E87> \xEC\xB1 |0
-<U9E88> \xEC\xAF |0
-<U9E89> \xEF\xAB |0
-<U9E8A> \xEF\xAA |0
-<U9E8B> \xC2\x47 |0
-<U9E8C> \xF1\xDF |0
-<U9E8D> \xEF\xAC |0
-<U9E8E> \xF1\xDE |0
-<U9E90> \x91\xAA |0
-<U9E91> \xF3\xF3 |0
-<U9E92> \xC4\x51 |0
-<U9E93> \xC4\x53 |0
-<U9E94> \xF3\xF2 |0
-<U9E95> \x91\xAB |0
-<U9E96> \xA0\x70 |0
-<U9E97> \xC4\x52 |0
-<U9E98> \x9F\x6D |0
-<U9E99> \xF5\xB1 |0
-<U9E9A> \xF5\xB3 |0
-<U9E9B> \xF5\xB2 |0
-<U9E9C> \xF6\xCA |0
-<U9E9D> \xC5\x65 |0
-<U9E9E> \x91\xAC |0
-<U9E9F> \xC5\xEF |0
-<U9EA0> \xF8\xE8 |0
-<U9EA1> \xF9\x63 |0
-<U9EA2> \x91\xAD |0
-<U9EA4> \xF9\xD2 |0
-<U9EA5> \xB3\xC1 |0
-<U9EA6> \xA0\xFD |0
-<U9EA7> \xE4\xE5 |0
-<U9EA8> \x9F\xE2 |0
-<U9EA9> \xBE\xA2 |0
-<U9EAA> \x91\xAF |0
-<U9EAB> \x9E\x41 |0
-<U9EAC> \x9A\xAA |0
-<U9EAD> \xEC\xB3 |0
-<U9EAE> \xEC\xB2 |0
-<U9EAF> \x91\xB0 |0
-<U9EB0> \xEF\xAD |0
-<U9EB1> \x9A\xAB |0
-<U9EB4> \xC4\x54 |0
-<U9EB5> \xC4\xD1 |0
-<U9EB6> \xF7\xC7 |0
-<U9EB7> \xF9\xCB |0
-<U9EBB> \xB3\xC2 |0
-<U9EBC> \xBB\xF2 |0
-<U9EBD> \x9A\xAC |0
-<U9EBE> \xBE\xA3 |0
-<U9EBF> \x9A\x4A |0
-<U9EC0> \xF3\xF4 |0
-<U9EC1> \x91\xB2 |0
-<U9EC2> \xF8\x74 |0
-<U9EC3> \xB6\xC0 |0
-<U9EC4> \x8B\xF6 |0
-<U9EC6> \x9A\xAD |0
-<U9EC7> \x89\xB6 |0
-<U9EC8> \xEF\xAE |0
-<U9ECC> \xC6\x64 |0
-<U9ECD> \xB6\xC1 |0
-<U9ECE> \xBE\xA4 |0
-<U9ECF> \xC2\x48 |0
-<U9ED0> \xF8\x75 |0
-<U9ED1> \xB6\xC2 |0
-<U9ED3> \xE8\xF1 |0
-<U9ED4> \xC0\x72 |0
-<U9ED5> \xEC\xB4 |0
-<U9ED6> \xEC\xB5 |0
-<U9ED8> \xC0\x71 |0
-<U9EDA> \xEF\xAF |0
-<U9EDB> \xC2\x4C |0
-<U9EDC> \xC2\x4A |0
-<U9EDD> \xC2\x4B |0
-<U9EDE> \xC2\x49 |0
-<U9EDF> \xF1\xE0 |0
-<U9EE0> \xC3\x5C |0
-<U9EE2> \x9A\xAF |0
-<U9EE4> \xF5\xB5 |0
-<U9EE5> \xF5\xB4 |0
-<U9EE6> \xF5\xB7 |0
-<U9EE7> \xF5\xB6 |0
-<U9EE8> \xC4\xD2 |0
-<U9EEB> \xF6\xCB |0
-<U9EED> \xF6\xCD |0
-<U9EEE> \xF6\xCC |0
-<U9EEF> \xC5\x66 |0
-<U9EF0> \xF7\xC8 |0
-<U9EF1> \x9A\xB0 |0
-<U9EF2> \xF8\x76 |0
-<U9EF3> \xF8\x77 |0
-<U9EF4> \xC5\xF0 |0
-<U9EF5> \xF9\x64 |0
-<U9EF6> \xF9\x7D |0
-<U9EF7> \xC6\x75 |0
-<U9EF8> \x9A\xB1 |0
-<U9EF9> \xDC\xB0 |0
-<U9EFA> \xEC\xB6 |0
-<U9EFB> \xEF\xB0 |0
-<U9EFC> \xF3\xF5 |0
-<U9EFD> \xE0\xEF |0
-<U9EFE> \x9A\xA1 |0
-<U9EFF> \xEF\xB1 |0
-<U9F00> \xF1\xE2 |0
-<U9F01> \xF1\xE1 |0
-<U9F02> \x91\xB9 |0
-<U9F06> \xF8\x78 |0
-<U9F07> \xC6\x52 |0
-<U9F08> \x91\xBA |0
-<U9F09> \xF9\x65 |0
-<U9F0A> \xF9\x7E |0
-<U9F0E> \xB9\xA9 |0
-<U9F0F> \xE8\xF2 |0
-<U9F10> \xE8\xF3 |0
-<U9F12> \xEC\xB7 |0
-<U9F13> \xB9\xAA |0
-<U9F15> \xC3\x5D |0
-<U9F16> \xF1\xE3 |0
-<U9F17> \x91\xBE |0
-<U9F18> \xF6\xCF |0
-<U9F19> \xC5\x67 |0
-<U9F1A> \xF6\xD0 |0
-<U9F1B> \xF6\xCE |0
-<U9F1C> \xF8\x79 |0
-<U9F1E> \xF8\xE9 |0
-<U9F20> \xB9\xAB |0
-<U9F22> \xEF\xB4 |0
-<U9F23> \xEF\xB3 |0
-<U9F24> \xEF\xB2 |0
-<U9F25> \xF1\xE4 |0
-<U9F26> \xA0\x41 |0
-<U9F27> \x8B\xB7 |0
-<U9F28> \xF1\xE8 |0
-<U9F29> \xF1\xE7 |0
-<U9F2A> \xF1\xE6 |0
-<U9F2B> \xF1\xE5 |0
-<U9F2C> \xC3\x5E |0
-<U9F2D> \xF3\xF6 |0
-<U9F2E> \xF5\xB9 |0
-<U9F2F> \xC4\xD3 |0
-<U9F30> \xF5\xB8 |0
-<U9F31> \xF6\xD1 |0
-<U9F32> \xF7\xCB |0
-<U9F33> \xF7\xCA |0
-<U9F34> \xC5\xC4 |0
-<U9F35> \xF7\xC9 |0
-<U9F36> \xF8\x7C |0
-<U9F37> \xF8\x7B |0
-<U9F38> \xF8\x7A |0
-<U9F39> \x91\xC0 |0
-<U9F3B> \xBB\xF3 |0
-<U9F3D> \xEC\xB8 |0
-<U9F3E> \xC2\x4D |0
-<U9F40> \xF3\xF7 |0
-<U9F41> \xF3\xF8 |0
-<U9F42> \xF7\xCC |0
-<U9F43> \xF8\x7D |0
-<U9F44> \x9A\xB3 |0
-<U9F45> \x91\xC3 |0
-<U9F46> \xF8\xEA |0
-<U9F47> \xF9\x66 |0
-<U9F48> \xF9\xB9 |0
-<U9F49> \xF9\xD4 |0
-<U9F4A> \xBB\xF4 |0
-<U9F4B> \xC2\x4E |0
-<U9F4C> \xF1\xE9 |0
-<U9F4D> \xF3\xF9 |0
-<U9F4E> \xF6\xD2 |0
-<U9F4F> \xF8\x7E |0
-<U9F50> \xA0\xFC |0
-<U9F52> \xBE\xA6 |0
-<U9F53> \x9F\xEE |0
-<U9F54> \xEF\xB5 |0
-<U9F55> \xF1\xEA |0
-<U9F56> \xF3\xFA |0
-<U9F57> \xF3\xFB |0
-<U9F58> \xF3\xFC |0
-<U9F59> \xF5\xBE |0
-<U9F5A> \x9F\x69 |0
-<U9F5B> \xF5\xBA |0
-<U9F5C> \xC5\x68 |0
-<U9F5D> \xF5\xBD |0
-<U9F5E> \xF5\xBC |0
-<U9F5F> \xC4\xD4 |0
-<U9F60> \xF5\xBB |0
-<U9F61> \xC4\xD6 |0
-<U9F62> \x91\xC8 |0
-<U9F63> \xC4\xD5 |0
-<U9F64> \xF6\xD4 |0
-<U9F65> \xF6\xD3 |0
-<U9F66> \xC5\x69 |0
-<U9F67> \xC5\x6A |0
-<U9F69> \x91\xC9 |0
-<U9F6A> \xC5\xC6 |0
-<U9F6B> \xF7\xCD |0
-<U9F6C> \xC5\xC5 |0
-<U9F6E> \xF8\xA3 |0
-<U9F6F> \xF8\xA4 |0
-<U9F70> \xF8\xA2 |0
-<U9F71> \xF8\xA1 |0
-<U9F72> \xC6\x54 |0
-<U9F74> \xF8\xEB |0
-<U9F75> \xF8\xEC |0
-<U9F76> \xF8\xED |0
-<U9F77> \xC6\x53 |0
-<U9F78> \xF9\x67 |0
-<U9F79> \xF9\x6A |0
-<U9F7A> \xF9\x69 |0
-<U9F7B> \xF9\x68 |0
-<U9F7E> \xF9\xD3 |0
-<U9F7F> \x8D\xE6 |0
-<U9F8D> \xC0\x73 |0
-<U9F8E> \x91\xCB |0
-<U9F90> \xC3\x65 |0
-<U9F91> \xF5\xBF |0
-<U9F92> \xF6\xD5 |0
-<U9F94> \xC5\xC7 |0
-<U9F95> \xF7\xCE |0
-<U9F98> \xF9\xD5 |0
-<U9F99> \x89\xC8 |0
-<U9F9C> \xC0\x74 |0
-<U9F9C> \x8B\xF8 |3
-<U9F9F> \x8D\xAA |0
-<U9FA0> \xEF\xB6 |0
-<U9FA2> \xF7\xCF |0
-<U9FA4> \xF9\xA1 |0
-<U9FA5> \x9F\xDD |0
-<UE003> \xFA\x43 |0
-<UE018> \xFA\x58 |0
-<UE01B> \xFA\x5B |0
-<UE02D> \xFA\x6D |0
-<UE038> \xFA\x78 |0
-<UE04C> \xFA\xAE |0
-<UE05A> \xFA\xBC |0
-<UE094> \xFA\xF6 |0
-<UE099> \xFA\xFB |0
-<UE09A> \xFA\xFC |0
-<UE0C5> \xFB\x68 |0
-<UE0D0> \xFB\x73 |0
-<UE0F2> \xFB\xB7 |0
-<UE0F9> \xFB\xBE |0
-<UE0FD> \xFB\xC2 |0
-<UE106> \xFB\xCB |0
-<UE109> \xFB\xCE |0
-<UE10A> \xFB\xCF |0
-<UE130> \xFB\xF5 |0
-<UE150> \xFC\x56 |0
-<UE154> \xFC\x5A |0
-<UE15D> \xFC\x63 |0
-<UE168> \xFC\x6E |0
-<UE16A> \xFC\x70 |0
-<UE171> \xFC\x77 |0
-<UE175> \xFC\x7B |0
-<UE18F> \xFC\xB7 |0
-<UE1BB> \xFC\xE3 |0
-<UE1CC> \xFC\xF4 |0
-<UE1CD> \xFC\xF5 |0
-<UE1D7> \xFD\x40 |0
-<UE1EF> \xFD\x58 |0
-<UE1F2> \xFD\x5B |0
-<UE1FA> \xFD\x63 |0
-<UE1FE> \xFD\x67 |0
-<UE202> \xFD\x6B |0
-<UE20B> \xFD\x74 |0
-<UE219> \xFD\xA4 |0
-<UE21C> \xFD\xA7 |0
-<UE227> \xFD\xB2 |0
-<UE245> \xFD\xD0 |0
-<UE24A> \xFD\xD5 |0
-<UE24E> \xFD\xD9 |0
-<UE26B> \xFD\xF6 |0
-<UE27A> \xFE\x46 |0
-<UE282> \xFE\x4E |0
-<UE290> \xFE\x5C |0
-<UE29B> \xFE\x67 |0
-<UE2A1> \xFE\x6D |0
-<UE2B2> \xFE\x7E |0
-<UE2B7> \xFE\xA5 |0
-<UE2C1> \xFE\xAF |0
-<UE2C9> \xFE\xB7 |0
-<UE2D4> \xFE\xC2 |0
-<UE2E2> \xFE\xD0 |0
-<UE2EB> \xFE\xD9 |0
-<UE2EC> \xFE\xDA |0
-<UE2F0> \xFE\xDE |0
-<UE2F1> \xFE\xDF |0
-<UE300> \xFE\xEE |0
-<UE311> \x8E\x40 |0
-<UE325> \x8E\x54 |0
-<UE330> \x8E\x5F |0
-<UE345> \x8E\x74 |0
-<UE362> \x8E\xB3 |0
-<UE381> \x8E\xD2 |0
-<UE382> \x8E\xD3 |0
-<UE386> \x8E\xD7 |0
-<UE389> \x8E\xDA |0
-<UE394> \x8E\xE5 |0
-<UE396> \x8E\xE7 |0
-<UE39E> \x8E\xEF |0
-<UE3A0> \x8E\xF1 |0
-<UE3B4> \x8F\x46 |0
-<UE3BB> \x8F\x4D |0
-<UE3CD> \x8F\x5F |0
-<UE3CF> \x8F\x61 |0
-<UE3D5> \x8F\x67 |0
-<UE3E1> \x8F\x73 |0
-<UE3E7> \x8F\x79 |0
-<UE3F0> \x8F\xA4 |0
-<UE3F2> \x8F\xA6 |0
-<UE3F4> \x8F\xA8 |0
-<UE426> \x8F\xDA |0
-<UE436> \x8F\xEA |0
-<UE448> \x8F\xFC |0
-<UE44D> \x90\x42 |0
-<UE450> \x90\x45 |0
-<UE467> \x90\x5C |0
-<UE468> \x90\x5D |0
-<UE469> \x90\x5E |0
-<UE474> \x90\x69 |0
-<UE48A> \x90\xA1 |0
-<UE4A1> \x90\xB8 |0
-<UE4C1> \x90\xD8 |0
-<UE4C6> \x90\xDD |0
-<UE4DD> \x90\xF4 |0
-<UE51E> \x91\x76 |0
-<UE524> \x91\x7C |0
-<UE528> \x91\xA2 |0
-<UE52E> \x91\xA8 |0
-<UE52F> \x91\xA9 |0
-<UE56D> \x91\xE7 |0
-<UE570> \x91\xEA |0
-<UE57A> \x91\xF4 |0
-<UE57D> \x91\xF7 |0
-<UE584> \x91\xFE |0
-<UE58B> \x92\x46 |0
-<UE59A> \x92\x55 |0
-<UE59E> \x92\x59 |0
-<UE5A0> \x92\x5B |0
-<UE5A6> \x92\x61 |0
-<UE5AA> \x92\x65 |0
-<UE5C2> \x92\x7D |0
-<UE5C8> \x92\xA5 |0
-<UE5D8> \x92\xB5 |0
-<UE5F1> \x92\xCE |0
-<UE619> \x92\xF6 |0
-<UE61C> \x92\xF9 |0
-<UE646> \x93\x64 |0
-<UE654> \x93\x72 |0
-<UE660> \x93\x7E |0
-<UE66A> \x93\xAA |0
-<UE67D> \x93\xBD |0
-<UE680> \x93\xC0 |0
-<UE68E> \x93\xCE |0
-<UE697> \x93\xD7 |0
-<UE69E> \x93\xDE |0
-<UE6C0> \x94\x41 |0
-<UE6C5> \x94\x46 |0
-<UE6DE> \x94\x5F |0
-<UE6DF> \x94\x60 |0
-<UE701> \x94\xA4 |0
-<UE713> \x94\xB6 |0
-<UE725> \x94\xC8 |0
-<UE73D> \x94\xE0 |0
-<UE741> \x94\xE4 |0
-<UE752> \x94\xF5 |0
-<UE75D> \x95\x41 |0
-<UE761> \x95\x45 |0
-<UE768> \x95\x4C |0
-<UE775> \x95\x59 |0
-<UE77A> \x95\x5E |0
-<UE77D> \x95\x61 |0
-<UE790> \x95\x74 |0
-<UE797> \x95\x7B |0
-<UE7A6> \x95\xAC |0
-<UE7B4> \x95\xBA |0
-<UE7DA> \x95\xE0 |0
-<UE7DD> \x95\xE3 |0
-<UE7E8> \x95\xEE |0
-<UE7E9> \x95\xEF |0
-<UE7ED> \x95\xF3 |0
-<UE7F1> \x95\xF7 |0
-<UE7FB> \x96\x42 |0
-<UE7FC> \x96\x43 |0
-<UE800> \x96\x47 |0
-<UE80C> \x96\x53 |0
-<UE813> \x96\x5A |0
-<UE821> \x96\x68 |0
-<UE828> \x96\x6F |0
-<UE82D> \x96\x74 |0
-<UE82F> \x96\x76 |0
-<UE84D> \x96\xB6 |0
-<UE855> \x96\xBE |0
-<UE856> \x96\xBF |0
-<UE85B> \x96\xC4 |0
-<UE85D> \x96\xC6 |0
-<UE865> \x96\xCE |0
-<UE887> \x96\xF0 |0
-<UE88F> \x96\xF8 |0
-<UE891> \x96\xFA |0
-<UE8A1> \x97\x4B |0
-<UE8A4> \x97\x4E |0
-<UE8C2> \x97\x6C |0
-<UE8C3> \x97\x6D |0
-<UE8CD> \x97\x77 |0
-<UE8D5> \x97\xA1 |0
-<UE8D6> \x97\xA2 |0
-<UE8D9> \x97\xA5 |0
-<UE8DA> \x97\xA6 |0
-<UE8E1> \x97\xAD |0
-<UE8E5> \x97\xB1 |0
-<UE8FE> \x97\xCA |0
-<UE917> \x97\xE3 |0
-<UE918> \x97\xE4 |0
-<UE91F> \x97\xEB |0
-<UE925> \x97\xF1 |0
-<UE92B> \x97\xF7 |0
-<UE934> \x98\x41 |0
-<UE950> \x98\x5D |0
-<UE967> \x98\x74 |0
-<UE96E> \x98\x7B |0
-<UE96F> \x98\x7C |0
-<UE973> \x98\xA2 |0
-<UE977> \x98\xA6 |0
-<UE97A> \x98\xA9 |0
-<UE97B> \x98\xAA |0
-<UE97D> \x98\xAC |0
-<UE982> \x98\xB1 |0
-<UE991> \x98\xC0 |0
-<UE9CB> \x98\xFA |0
-<UEAA9> \x9A\x7C |0
-<UEABF> \x9A\xB4 |0
-<UEAC0> \x9A\xB5 |0
-<UEAC1> \x9A\xB6 |0
-<UEAC5> \x9A\xBA |0
-<UEAC9> \x9A\xBE |0
-<UEACA> \x9A\xBF |0
-<UEACB> \x9A\xC0 |0
-<UEACC> \x9A\xC1 |0
-<UEACF> \x9A\xC4 |0
-<UEAD0> \x9A\xC5 |0
-<UEAD1> \x9A\xC6 |0
-<UEAD3> \x9A\xC8 |0
-<UEAD4> \x9A\xC9 |0
-<UEAD6> \x9A\xCB |0
-<UEAD7> \x9A\xCC |0
-<UEAD9> \x9A\xCE |0
-<UEADA> \x9A\xCF |0
-<UEADC> \x9A\xD1 |0
-<UEADE> \x9A\xD3 |0
-<UEADF> \x9A\xD4 |0
-<UEAE0> \x9A\xD5 |0
-<UEAE1> \x9A\xD6 |0
-<UEAE2> \x9A\xD7 |0
-<UEAE3> \x9A\xD8 |0
-<UEAE7> \x9A\xDC |0
-<UEAE9> \x9A\xDE |0
-<UEAEA> \x9A\xDF |0
-<UEAEC> \x9A\xE1 |0
-<UEAEE> \x9A\xE3 |0
-<UEAF0> \x9A\xE5 |0
-<UEAF1> \x9A\xE6 |0
-<UEAF5> \x9A\xEA |0
-<UEAF6> \x9A\xEB |0
-<UEAF8> \x9A\xED |0
-<UEAF9> \x9A\xEE |0
-<UEAFA> \x9A\xEF |0
-<UEAFB> \x9A\xF0 |0
-<UEAFF> \x9A\xF4 |0
-<UEB00> \x9A\xF5 |0
-<UEB02> \x9A\xF7 |0
-<UEB03> \x9A\xF8 |0
-<UEB04> \x9A\xF9 |0
-<UEB05> \x9A\xFA |0
-<UEB08> \x9A\xFD |0
-<UEB09> \x9A\xFE |0
-<UEB0A> \x9B\x40 |0
-<UEB0B> \x9B\x41 |0
-<UEB0C> \x9B\x42 |0
-<UEB0D> \x9B\x43 |0
-<UEB0E> \x9B\x44 |0
-<UEB0F> \x9B\x45 |0
-<UEB12> \x9B\x48 |0
-<UEB15> \x9B\x4B |0
-<UEB19> \x9B\x4F |0
-<UEB1A> \x9B\x50 |0
-<UEB1B> \x9B\x51 |0
-<UEB1C> \x9B\x52 |0
-<UEB1D> \x9B\x53 |0
-<UEB1F> \x9B\x55 |0
-<UEB20> \x9B\x56 |0
-<UEB23> \x9B\x59 |0
-<UEB25> \x9B\x5B |0
-<UEB27> \x9B\x5D |0
-<UEB2A> \x9B\x60 |0
-<UEB2C> \x9B\x62 |0
-<UEB2D> \x9B\x63 |0
-<UEB2E> \x9B\x64 |0
-<UEB30> \x9B\x66 |0
-<UEB31> \x9B\x67 |0
-<UEB32> \x9B\x68 |0
-<UEB33> \x9B\x69 |0
-<UEB34> \x9B\x6A |0
-<UEB35> \x9B\x6B |0
-<UEB36> \x9B\x6C |0
-<UEB37> \x9B\x6D |0
-<UEB38> \x9B\x6E |0
-<UEB39> \x9B\x6F |0
-<UEB3D> \x9B\x73 |0
-<UEB3E> \x9B\x74 |0
-<UEB3F> \x9B\x75 |0
-<UEB43> \x9B\x79 |0
-<UEB44> \x9B\x7A |0
-<UEB4A> \x9B\xA2 |0
-<UEB4D> \x9B\xA5 |0
-<UEB4E> \x9B\xA6 |0
-<UEB53> \x9B\xAB |0
-<UEB55> \x9B\xAD |0
-<UEB56> \x9B\xAE |0
-<UEB58> \x9B\xB0 |0
-<UEB5A> \x9B\xB2 |0
-<UEB5B> \x9B\xB3 |0
-<UEB62> \x9B\xBA |0
-<UEB63> \x9B\xBB |0
-<UEB65> \x9B\xBD |0
-<UEB67> \x9B\xBF |0
-<UEB68> \x9B\xC0 |0
-<UEB69> \x9B\xC1 |0
-<UEB6F> \x9B\xC7 |0
-<UEB70> \x9B\xC8 |0
-<UEB71> \x9B\xC9 |0
-<UEB73> \x9B\xCB |0
-<UEB76> \x9B\xCE |0
-<UEB77> \x9B\xCF |0
-<UEB7A> \x9B\xD2 |0
-<UEB7E> \x9B\xD6 |0
-<UEB7F> \x9B\xD7 |0
-<UEB80> \x9B\xD8 |0
-<UEB83> \x9B\xDB |0
-<UEB88> \x9B\xE0 |0
-<UEB8A> \x9B\xE2 |0
-<UEB8C> \x9B\xE4 |0
-<UEB90> \x9B\xE8 |0
-<UEB93> \x9B\xEB |0
-<UEB95> \x9B\xED |0
-<UEB99> \x9B\xF1 |0
-<UEB9B> \x9B\xF3 |0
-<UEB9F> \x9B\xF7 |0
-<UEBA2> \x9B\xFA |0
-<UEBA5> \x9B\xFD |0
-<UEBA6> \x9B\xFE |0
-<UEBAA> \x9C\x43 |0
-<UEBAB> \x9C\x44 |0
-<UEBAE> \x9C\x47 |0
-<UEBB2> \x9C\x4B |0
-<UEBB3> \x9C\x4C |0
-<UEBBD> \x9C\x56 |0
-<UEBBF> \x9C\x58 |0
-<UEBC5> \x9C\x5E |0
-<UEBCA> \x9C\x63 |0
-<UEBCC> \x9C\x65 |0
-<UEBCE> \x9C\x67 |0
-<UEBD0> \x9C\x69 |0
-<UEBD5> \x9C\x6E |0
-<UEBD7> \x9C\x70 |0
-<UEBD8> \x9C\x71 |0
-<UEBDA> \x9C\x73 |0
-<UEBDB> \x9C\x74 |0
-<UEBDD> \x9C\x76 |0
-<UEBDF> \x9C\x78 |0
-<UEBE1> \x9C\x7A |0
-<UEBE4> \x9C\x7D |0
-<UEBE8> \x9C\xA3 |0
-<UEBE9> \x9C\xA4 |0
-<UEBEB> \x9C\xA6 |0
-<UEBEC> \x9C\xA7 |0
-<UEBEF> \x9C\xAA |0
-<UEBF2> \x9C\xAD |0
-<UEBF5> \x9C\xB0 |0
-<UEBF9> \x9C\xB4 |0
-<UEBFA> \x9C\xB5 |0
-<UEBFE> \x9C\xB9 |0
-<UEC08> \x9C\xC3 |0
-<UEC09> \x9C\xC4 |0
-<UEC0F> \x9C\xCA |0
-<UEC13> \x9C\xCE |0
-<UEC19> \x9C\xD4 |0
-<UEC1A> \x9C\xD5 |0
-<UEC1B> \x9C\xD6 |0
-<UEC1C> \x9C\xD7 |0
-<UEC24> \x9C\xDF |0
-<UEC26> \x9C\xE1 |0
-<UEC2B> \x9C\xE6 |0
-<UEC2F> \x9C\xEA |0
-<UEC32> \x9C\xED |0
-<UEC3F> \x9C\xFA |0
-<UEC43> \x9C\xFE |0
-<UEC44> \x9D\x40 |0
-<UEC45> \x9D\x41 |0
-<UEC46> \x9D\x42 |0
-<UEC47> \x9D\x43 |0
-<UEC48> \x9D\x44 |0
-<UEC49> \x9D\x45 |0
-<UEC4B> \x9D\x47 |0
-<UEC4F> \x9D\x4B |0
-<UEC52> \x9D\x4E |0
-<UEC54> \x9D\x50 |0
-<UEC56> \x9D\x52 |0
-<UEC57> \x9D\x53 |0
-<UEC58> \x9D\x54 |0
-<UEC5A> \x9D\x56 |0
-<UEC5C> \x9D\x58 |0
-<UEC5D> \x9D\x59 |0
-<UEC60> \x9D\x5C |0
-<UEC62> \x9D\x5E |0
-<UEC63> \x9D\x5F |0
-<UEC67> \x9D\x63 |0
-<UEC69> \x9D\x65 |0
-<UEC6A> \x9D\x66 |0
-<UEC6B> \x9D\x67 |0
-<UEC6C> \x9D\x68 |0
-<UEC6D> \x9D\x69 |0
-<UEC6F> \x9D\x6B |0
-<UEC70> \x9D\x6C |0
-<UEC72> \x9D\x6E |0
-<UEC73> \x9D\x6F |0
-<UEC75> \x9D\x71 |0
-<UEC79> \x9D\x75 |0
-<UEC7B> \x9D\x77 |0
-<UEC7E> \x9D\x7A |0
-<UEC84> \x9D\xA2 |0
-<UEC8E> \x9D\xAC |0
-<UEC92> \x9D\xB0 |0
-<UEC95> \x9D\xB3 |0
-<UECAF> \x9D\xCD |0
-<UECB6> \x9D\xD4 |0
-<UECCF> \x9D\xED |0
-<UECDC> \x9D\xFA |0
-<UECE0> \x9D\xFE |0
-<UECE1> \x9E\x40 |0
-<UECF0> \x9E\x4F |0
-<UECF2> \x9E\x51 |0
-<UECFC> \x9E\x5B |0
-<UED11> \x9E\x70 |0
-<UED1D> \x9E\x7C |0
-<UED24> \x9E\xA5 |0
-<UED29> \x9E\xAA |0
-<UED2C> \x9E\xAD |0
-<UED3B> \x9E\xBC |0
-<UED41> \x9E\xC2 |0
-<UED4F> \x9E\xD0 |0
-<UED52> \x9E\xD3 |0
-<UED5F> \x9E\xE0 |0
-<UED6B> \x9E\xEC |0
-<UED78> \x9E\xF9 |0
-<UED84> \x9F\x46 |0
-<UED85> \x9F\x47 |0
-<UED88> \x9F\x4A |0
-<UED8B> \x9F\x4D |0
-<UED8E> \x9F\x50 |0
-<UEDCF> \x9F\xB3 |0
-<UEDDA> \x9F\xBE |0
-<UEDED> \x9F\xD1 |0
-<UEE08> \x9F\xEC |0
-<UEE5D> \xA0\xA4 |0
-<UEE6A> \xA0\xB1 |0
-<UEEA5> \xA0\xEC |0
-<UEEB0> \xA0\xF7 |0
-<UEEB4> \xA0\xFB |0
-<UEEB7> \xA0\xFE |0
-<UF303> \x88\x40 |0
-<UF304> \x88\x41 |0
-<UF305> \x88\x42 |0
-<UF306> \x88\x43 |0
-<UF307> \x88\x44 |0
-<UF308> \x88\x45 |0
-<UF309> \x88\x46 |0
-<UF30A> \x88\x47 |0
-<UF30B> \x88\x48 |0
-<UF30C> \x88\x49 |0
-<UF30D> \x88\x4A |0
-<UF30E> \x88\x4B |0
-<UF30F> \x88\x4C |0
-<UF310> \x88\x4D |0
-<UF311> \x88\x4E |0
-<UF312> \x88\x4F |0
-<UF313> \x88\x50 |0
-<UF314> \x88\x51 |0
-<UF315> \x88\x52 |0
-<UF316> \x88\x53 |0
-<UF317> \x88\x54 |0
-<UF318> \x88\x55 |0
-<UF325> \x88\x62 |0
-<UF327> \x88\x64 |0
-<UF344> \x88\xA3 |0
-<UF346> \x88\xA5 |0
-<UF34A> \x88\xA9 |0
-<UF34B> \x88\xAA |0
-<UF3A1> \x89\x41 |0
-<UF3F0> \x89\xB2 |0
-<UF3F9> \x89\xBB |0
-<UF3FC> \x89\xBE |0
-<UF408> \x89\xCA |0
-<UF40B> \x89\xCD |0
-<UF43D> \x8A\x40 |0
-<UF441> \x8A\x44 |0
-<UF442> \x8A\x45 |0
-<UF449> \x8A\x4C |0
-<UF44D> \x8A\x50 |0
-<UF450> \x8A\x53 |0
-<UF454> \x8A\x57 |0
-<UF45A> \x8A\x5D |0
-<UF45B> \x8A\x5E |0
-<UF45C> \x8A\x5F |0
-<UF45D> \x8A\x60 |0
-<UF462> \x8A\x65 |0
-<UF465> \x8A\x68 |0
-<UF466> \x8A\x69 |0
-<UF469> \x8A\x6C |0
-<UF46D> \x8A\x70 |0
-<UF46E> \x8A\x71 |0
-<UF46F> \x8A\x72 |0
-<UF477> \x8A\x7A |0
-<UF478> \x8A\x7B |0
-<UF47C> \x8A\xA1 |0
-<UF47D> \x8A\xA2 |0
-<UF47E> \x8A\xA3 |0
-<UF480> \x8A\xA5 |0
-<UF485> \x8A\xAA |0
-<UF488> \x8A\xAD |0
-<UF48B> \x8A\xB0 |0
-<UF48D> \x8A\xB2 |0
-<UF48F> \x8A\xB4 |0
-<UF490> \x8A\xB5 |0
-<UF491> \x8A\xB6 |0
-<UF497> \x8A\xBC |0
-<UF498> \x8A\xBD |0
-<UF49B> \x8A\xC0 |0
-<UF4A4> \x8A\xC9 |0
-<UF4A7> \x8A\xCC |0
-<UF4AA> \x8A\xCF |0
-<UF4AD> \x8A\xD2 |0
-<UF4AF> \x8A\xD4 |0
-<UF4B3> \x8A\xD8 |0
-<UF4B4> \x8A\xD9 |0
-<UF4B7> \x8A\xDC |0
-<UF4BA> \x8A\xDF |0
-<UF4BB> \x8A\xE0 |0
-<UF4BC> \x8A\xE1 |0
-<UF4BD> \x8A\xE2 |0
-<UF4C0> \x8A\xE5 |0
-<UF4C1> \x8A\xE6 |0
-<UF4C3> \x8A\xE8 |0
-<UF4C8> \x8A\xED |0
-<UF4CE> \x8A\xF3 |0
-<UF4CF> \x8A\xF4 |0
-<UF4D2> \x8A\xF7 |0
-<UF4E2> \x8B\x48 |0
-<UF4E5> \x8B\x4B |0
-<UF4E7> \x8B\x4D |0
-<UF4E8> \x8B\x4E |0
-<UF4E9> \x8B\x4F |0
-<UF4F3> \x8B\x59 |0
-<UF522> \x8B\xAA |0
-<UF523> \x8B\xAB |0
-<UF525> \x8B\xAD |0
-<UF526> \x8B\xAE |0
-<UF52A> \x8B\xB2 |0
-<UF53A> \x8B\xC2 |0
-<UF53B> \x8B\xC3 |0
-<UF53D> \x8B\xC5 |0
-<UF54E> \x8B\xD6 |0
-<UF553> \x8B\xDB |0
-<UF556> \x8B\xDE |0
-<UF559> \x8B\xE1 |0
-<UF55A> \x8B\xE2 |0
-<UF55E> \x8B\xE6 |0
-<UF565> \x8B\xED |0
-<UF56B> \x8B\xF3 |0
-<UF572> \x8B\xFA |0
-<UF6B0> \x8D\xFE |0
-<UF7E5> \xC8\x79 |0
-<UF7E6> \xC8\x7A |0
-<UF7E8> \xC8\x7C |0
-<UF7EA> \xC8\x7E |0
-<UF7EB> \xC8\xA1 |0
-<UF7ED> \xC8\xA3 |0
-<UF7EE> \xC8\xA4 |0
-<UFA0C> \xC9\x4A |0
-<UFA0D> \xDD\xFC |0
-<UFE30> \xA1\x4A |0
-<UFE31> \xA1\x57 |0
-<UFE33> \xA1\x59 |0
-<UFE34> \xA1\x5B |0
-<UFE35> \xA1\x5F |0
-<UFE36> \xA1\x60 |0
-<UFE37> \xA1\x63 |0
-<UFE38> \xA1\x64 |0
-<UFE39> \xA1\x67 |0
-<UFE3A> \xA1\x68 |0
-<UFE3B> \xA1\x6B |0
-<UFE3C> \xA1\x6C |0
-<UFE3D> \xA1\x6F |0
-<UFE3E> \xA1\x70 |0
-<UFE3F> \xA1\x73 |0
-<UFE40> \xA1\x74 |0
-<UFE41> \xA1\x77 |0
-<UFE42> \xA1\x78 |0
-<UFE43> \xA1\x7B |0
-<UFE44> \xA1\x7C |0
-<UFE49> \xA1\xC6 |0
-<UFE4A> \xA1\xC7 |0
-<UFE4B> \xA1\xCA |0
-<UFE4C> \xA1\xCB |0
-<UFE4D> \xA1\xC8 |0
-<UFE4E> \xA1\xC9 |0
-<UFE4F> \xA1\x5C |0
-<UFE50> \xA1\x4D |0
-<UFE52> \xA1\x4F |0
-<UFE54> \xA1\x51 |0
-<UFE55> \xA1\x52 |0
-<UFE56> \xA1\x53 |0
-<UFE57> \xA1\x54 |0
-<UFE59> \xA1\x7D |0
-<UFE5A> \xA1\x7E |0
-<UFE5B> \xA1\xA1 |0
-<UFE5C> \xA1\xA2 |0
-<UFE5D> \xA1\xA3 |0
-<UFE5E> \xA1\xA4 |0
-<UFE5F> \xA1\xCC |0
-<UFE60> \xA1\xCD |0
-<UFE61> \xA1\xCE |0
-<UFE62> \xA1\xDE |0
-<UFE63> \xA1\xDF |0
-<UFE64> \xA1\xE0 |0
-<UFE65> \xA1\xE1 |0
-<UFE66> \xA1\xE2 |0
-<UFE69> \xA2\x4C |0
-<UFE6A> \xA2\x4D |0
-<UFE6B> \xA2\x4E |0
-<UFF01> \xA1\x49 |0
-<UFF02> \xC8\xD0 |0
-<UFF03> \xA1\xAD |0
-<UFF04> \xA2\x43 |0
-<UFF05> \xA2\x48 |0
-<UFF06> \xA1\xAE |0
-<UFF07> \xC8\xCF |0
-<UFF08> \xA1\x5D |0
-<UFF09> \xA1\x5E |0
-<UFF0A> \xA1\xAF |0
-<UFF0B> \xA1\xCF |0
-<UFF0C> \xA1\x41 |0
-<UFF0D> \xA1\xD0 |0
-<UFF0E> \xA1\x44 |0
-<UFF0F> \xA2\x41 |0
-<UFF10> \xA2\xAF |0
-<UFF11> \xA2\xB0 |0
-<UFF12> \xA2\xB1 |0
-<UFF13> \xA2\xB2 |0
-<UFF14> \xA2\xB3 |0
-<UFF15> \xA2\xB4 |0
-<UFF16> \xA2\xB5 |0
-<UFF17> \xA2\xB6 |0
-<UFF18> \xA2\xB7 |0
-<UFF19> \xA2\xB8 |0
-<UFF1A> \xA1\x47 |0
-<UFF1B> \xA1\x46 |0
-<UFF1C> \xA1\xD5 |0
-<UFF1D> \xA1\xD7 |0
-<UFF1E> \xA1\xD6 |0
-<UFF1F> \xA1\x48 |0
-<UFF20> \xA2\x49 |0
-<UFF21> \xA2\xCF |0
-<UFF22> \xA2\xD0 |0
-<UFF23> \xA2\xD1 |0
-<UFF24> \xA2\xD2 |0
-<UFF25> \xA2\xD3 |0
-<UFF26> \xA2\xD4 |0
-<UFF27> \xA2\xD5 |0
-<UFF28> \xA2\xD6 |0
-<UFF29> \xA2\xD7 |0
-<UFF2A> \xA2\xD8 |0
-<UFF2B> \xA2\xD9 |0
-<UFF2C> \xA2\xDA |0
-<UFF2D> \xA2\xDB |0
-<UFF2E> \xA2\xDC |0
-<UFF2F> \xA2\xDD |0
-<UFF30> \xA2\xDE |0
-<UFF31> \xA2\xDF |0
-<UFF32> \xA2\xE0 |0
-<UFF33> \xA2\xE1 |0
-<UFF34> \xA2\xE2 |0
-<UFF35> \xA2\xE3 |0
-<UFF36> \xA2\xE4 |0
-<UFF37> \xA2\xE5 |0
-<UFF38> \xA2\xE6 |0
-<UFF39> \xA2\xE7 |0
-<UFF3A> \xA2\xE8 |0
-<UFF3B> \xC6\xE4 |0
-<UFF3C> \xA2\x42 |0
-<UFF3D> \xC6\xE5 |0
-<UFF3F> \xA1\xC4 |0
-<UFF41> \xA2\xE9 |0
-<UFF42> \xA2\xEA |0
-<UFF43> \xA2\xEB |0
-<UFF44> \xA2\xEC |0
-<UFF45> \xA2\xED |0
-<UFF46> \xA2\xEE |0
-<UFF47> \xA2\xEF |0
-<UFF48> \xA2\xF0 |0
-<UFF49> \xA2\xF1 |0
-<UFF4A> \xA2\xF2 |0
-<UFF4B> \xA2\xF3 |0
-<UFF4C> \xA2\xF4 |0
-<UFF4D> \xA2\xF5 |0
-<UFF4E> \xA2\xF6 |0
-<UFF4F> \xA2\xF7 |0
-<UFF50> \xA2\xF8 |0
-<UFF51> \xA2\xF9 |0
-<UFF52> \xA2\xFA |0
-<UFF53> \xA2\xFB |0
-<UFF54> \xA2\xFC |0
-<UFF55> \xA2\xFD |0
-<UFF56> \xA2\xFE |0
-<UFF57> \xA3\x40 |0
-<UFF58> \xA3\x41 |0
-<UFF59> \xA3\x42 |0
-<UFF5A> \xA3\x43 |0
-<UFF5B> \xA1\x61 |0
-<UFF5C> \xA1\x55 |0
-<UFF5D> \xA1\x62 |0
-<UFF64> \xA1\x4E |0
-<UFFE2> \xC8\xCD |0
-<UFFE4> \xC8\xCE |0
-<UFFED> \xF9\xFE |0
-<U2003E> \x93\x75 |0
-<U20046> \x93\x76 |0
-<U2004E> \x95\x48 |0
-<U20068> \x8E\xC6 |0
-<U200EE> \xA0\xF6 |0
-<U20118> \xFC\xAD |0
-<U201AB> \x92\x72 |0
-<U201C1> \xFC\x47 |0
-<U201D4> \x94\xDF |0
-<U20214> \x98\xA4 |0
-<U2025B> \x94\xE7 |0
-<U20274> \x90\xCB |0
-<U20275> \x92\x7B |0
-<U20299> \x94\xD8 |0
-<U2029E> \xFC\x5F |0
-<U202A0> \xFA\x54 |0
-<U202BF> \x96\xDA |0
-<U202C0> \x92\x79 |0
-<U202E5> \xFA\x74 |0
-<U2030A> \x92\x75 |0
-<U20325> \x8D\xFB |0
-<U20341> \x8A\x49 |0
-<U20345> \x92\xDF |0
-<U20346> \x9B\x7C |0
-<U20347> \xFA\x63 |0
-<U2037E> \xFA\x60 |0
-<U2037F> \x92\x6D |0
-<U20380> \xFA\x62 |0
-<U203A7> \x97\x6B |0
-<U203B5> \xFD\x6A |0
-<U203C9> \xFD\x54 |0
-<U203CB> \x92\x73 |0
-<U203F5> \x97\xD8 |0
-<U203FC> \x9F\xBB |0
-<U20413> \x93\x42 |0
-<U20414> \x92\x76 |0
-<U2041F> \xFA\x65 |0
-<U20465> \x92\x6C |0
-<U20487> \xFA\x6E |0
-<U20491> \x92\xC0 |0
-<U20492> \x92\xBF |0
-<U204A3> \x92\xBE |0
-<U204FC> \x8A\xB3 |0
-<U204FE> \x97\x75 |0
-<U20547> \xFA\x40 |0
-<U2058E> \xFA\x76 |0
-<U205A5> \xFB\xD0 |0
-<U205B3> \xFA\x7B |0
-<U205D0> \x89\xCC |0
-<U205DF> \xFA\x42 |0
-<U205E0> \x92\xBC |0
-<U205EB> \x94\x5C |0
-<U20611> \x9B\xB5 |0
-<U20619> \x98\xA7 |0
-<U2061A> \x97\xA4 |0
-<U20630> \x90\xFD |0
-<U2070E> \x92\xC3 |0
-<U20779> \x9B\xD0 |0
-<U2082C> \x95\x50 |0
-<U20873> \x92\xC6 |0
-<U20916> \x95\x46 |0
-<U20954> \xFA\xC2 |0
-<U20979> \x9E\xC3 |0
-<U20A11> \x9C\x66 |0
-<U20A50> \x90\x53 |0
-<U20AB4> \x97\xC1 |0
-<U20B8F> \xFA\xE9 |0
-<U20BA8> \x92\x62 |0
-<U20BC6> \x92\xE1 |0
-<U20BE2> \xFA\xC6 |0
-<U20BFF> \xFA\x72 |0
-<U20C20> \x92\xCC |0
-<U20C41> \x9D\xF9 |0
-<U20C42> \x8A\x43 |0
-<U20C43> \x8A\xA6 |0
-<U20C53> \x9A\xCD |0
-<U20C77> \xFA\xEE |0
-<U20C78> \x9B\xCC |0
-<U20C9C> \x9D\x7C |0
-<U20CCF> \x99\x5F |0
-<U20CD3> \xFB\xF6 |0
-<U20CD4> \x9F\xC5 |0
-<U20CD5> \x8A\x59 |0
-<U20CD6> \x8B\x6B |0
-<U20D46> \x8A\x64 |0
-<U20D47> \x8A\xF2 |0
-<U20D48> \x8A\xF8 |0
-<U20D49> \x9D\xD8 |0
-<U20D4C> \x94\xD6 |0
-<U20D4D> \xFA\xFE |0
-<U20D4E> \xFB\xA7 |0
-<U20D7E> \x8B\x43 |0
-<U20D7F> \x8B\x44 |0
-<U20DA7> \x9E\x54 |0
-<U20E09> \x8A\xCA |0
-<U20E0A> \x9E\xA8 |0
-<U20E0D> \x92\x63 |0
-<U20E0E> \x9A\xDD |0
-<U20E0F> \x8B\x65 |0
-<U20E10> \x8B\x6F |0
-<U20E11> \x8B\x7E |0
-<U20E16> \x8F\x43 |0
-<U20E1D> \x92\xD0 |0
-<U20E6D> \x9D\xBE |0
-<U20E75> \xFC\xDE |0
-<U20E76> \x9D\xFD |0
-<U20E77> \x8B\x66 |0
-<U20E78> \x8B\x70 |0
-<U20E79> \x8B\x75 |0
-<U20E7A> \x8A\xE4 |0
-<U20E7B> \x8B\xA4 |0
-<U20EAA> \x8A\xEF |0
-<U20EAB> \x8A\xF6 |0
-<U20EAC> \x9E\x76 |0
-<U20EB6> \x9E\xE3 |0
-<U20EF8> \x9C\xB1 |0
-<U20EF9> \x9E\x77 |0
-<U20EFA> \x8B\x64 |0
-<U20EFB> \x8B\x67 |0
-<U20F2D> \x9A\xE0 |0
-<U20F2E> \x8B\x4A |0
-<U20F30> \x8A\xF1 |0
-<U20F31> \x8A\xD7 |0
-<U20F3B> \xA0\xAB |0
-<U20F8D> \x8A\xEE |0
-<U20FAD> \x8A\xFE |0
-<U20FB4> \x8A\x58 |0
-<U20FB5> \x8B\xA3 |0
-<U20FB6> \x8B\xA7 |0
-<U20FEA> \x9D\xD7 |0
-<U20FEB> \x9E\x7D |0
-<U20FEC> \x9E\xA7 |0
-<U20FED> \x9E\xAB |0
-<U2101D> \x8B\x79 |0
-<U2101E> \x8B\x7A |0
-<U2106F> \x8A\x7E |0
-<U21075> \x9E\x44 |0
-<U21076> \x9A\xE7 |0
-<U21077> \x8A\x7C |0
-<U21078> \x8B\x71 |0
-<U2107B> \x9A\xE9 |0
-<U210B4> \xFB\x4E |0
-<U210C0> \x8A\xF9 |0
-<U210C1> \x9E\x63 |0
-<U210C7> \x8B\x49 |0
-<U210C8> \x8A\xCE |0
-<U210C9> \x8B\x6E |0
-<U210F4> \x8A\x5A |0
-<U210F5> \x8B\x7B |0
-<U210F6> \x8B\x7C |0
-<U2113D> \x8A\xFA |0
-<U21148> \x8B\x72 |0
-<U21180> \x8B\xA8 |0
-<U21187> \x9E\xAE |0
-<U211D9> \x9E\x72 |0
-<U2124F> \xFB\x5F |0
-<U2127C> \x90\xBA |0
-<U212A9> \x9E\xF6 |0
-<U212B0> \x97\xED |0
-<U212E3> \x9A\xF3 |0
-<U212FE> \xA0\xEE |0
-<U21302> \x96\x7C |0
-<U21303> \x93\x45 |0
-<U21304> \x98\x6E |0
-<U21305> \xFA\x56 |0
-<U2133A> \xFC\x4B |0
-<U2139C> \x97\xC7 |0
-<U213C5> \x9C\xCB |0
-<U213C6> \x92\x40 |0
-<U213ED> \x9C\xE8 |0
-<U213FE> \x91\xFD |0
-<U21452> \x97\xE8 |0
-<U21454> \xFB\x6A |0
-<U21455> \x8B\x74 |0
-<U21497> \xFD\xC8 |0
-<U214B6> \x92\x41 |0
-<U214E8> \x96\xA1 |0
-<U214FD> \x8E\xF3 |0
-<U21596> \xFA\xD6 |0
-<U2160A> \x9C\xC7 |0
-<U21613> \xFA\xD7 |0
-<U2163E> \xFB\xA1 |0
-<U21661> \x8E\xC5 |0
-<U21692> \xFB\xA4 |0
-<U216C0> \x91\xFA |0
-<U216C1> \xFE\xDB |0
-<U216C2> \x97\xAB |0
-<U216D3> \x91\x47 |0
-<U216D5> \xFB\xB1 |0
-<U216E6> \x94\xD2 |0
-<U216E7> \xFE\x61 |0
-<U216E8> \xFA\xCE |0
-<U216FA> \x92\xED |0
-<U216FB> \x91\xF3 |0
-<U216FC> \x93\xC6 |0
-<U216FE> \x93\x5A |0
-<U21710> \x92\xEF |0
-<U21726> \xFA\xC8 |0
-<U2173A> \x98\x47 |0
-<U2173B> \x93\x66 |0
-<U2173C> \x98\x55 |0
-<U21757> \x96\xE6 |0
-<U2176C> \x9F\x43 |0
-<U2176D> \x9F\xAA |0
-<U2176E> \x94\xDA |0
-<U2176F> \x92\xEE |0
-<U21770> \xFC\xAF |0
-<U21771> \xFB\xFB |0
-<U21773> \x8E\xF9 |0
-<U21774> \x91\xF6 |0
-<U217B1> \x9C\xB6 |0
-<U217B2> \xFB\xAD |0
-<U217B3> \x98\x4E |0
-<U217B4> \x8F\x44 |0
-<U217B5> \x96\xFD |0
-<U217D9> \x97\x69 |0
-<U217DA> \x95\xD4 |0
-<U217DB> \x98\x4B |0
-<U217DC> \xFB\xAA |0
-<U217F5> \x9D\xAF |0
-<U217F6> \x9D\xC5 |0
-<U217F8> \x91\xF1 |0
-<U217F9> \x8E\xB1 |0
-<U217FA> \x97\xA9 |0
-<U217FB> \xFB\xAC |0
-<U217FC> \xFC\xB8 |0
-<U21828> \xFB\xB0 |0
-<U21829> \xFC\xD2 |0
-<U2182A> \x93\xCB |0
-<U2183A> \x8B\xAC |0
-<U2183B> \xA0\x55 |0
-<U21845> \x95\xBE |0
-<U2185E> \x8E\xE9 |0
-<U21861> \x92\xF8 |0
-<U21862> \x97\xBE |0
-<U21863> \x91\x6C |0
-<U21864> \x94\xAA |0
-<U2187B> \x9D\xC6 |0
-<U21883> \x97\xB5 |0
-<U21884> \x92\xB8 |0
-<U21885> \x91\xEF |0
-<U2189E> \xFE\xA6 |0
-<U2189F> \x97\x60 |0
-<U218A0> \x93\x58 |0
-<U218A1> \x95\x76 |0
-<U218A2> \x8F\xAC |0
-<U218BE> \x91\xEC |0
-<U218BF> \x97\xB4 |0
-<U218D6> \x97\x4A |0
-<U218D7> \xFB\x49 |0
-<U218D8> \x95\x78 |0
-<U218D9> \x93\xBC |0
-<U218FA> \x91\xD6 |0
-<U21903> \x93\x55 |0
-<U21904> \x93\x56 |0
-<U21905> \x98\x51 |0
-<U21910> \x8F\xF8 |0
-<U21911> \xFB\xC0 |0
-<U21912> \x93\xF2 |0
-<U21915> \x90\xD0 |0
-<U21927> \x93\x63 |0
-<U2193B> \x91\xA5 |0
-<U21944> \xA0\xED |0
-<U2197C> \x93\x51 |0
-<U21988> \xFE\xA8 |0
-<U21996> \x93\x50 |0
-<U219DB> \xFA\x4C |0
-<U219F3> \x92\xF7 |0
-<U21A4B> \xFE\xAD |0
-<U21B44> \xFB\xD5 |0
-<U21CA2> \x9E\x79 |0
-<U21CA5> \xFB\xD9 |0
-<U21D46> \xA0\xA7 |0
-<U21DBA> \x93\x5E |0
-<U21DCA> \x89\xCB |0
-<U21DD1> \x9F\x53 |0
-<U21DF9> \xFB\xE1 |0
-<U21E37> \xFB\xE2 |0
-<U21E89> \x90\x74 |0
-<U21EA4> \xFB\xE6 |0
-<U21EA8> \x9B\xB7 |0
-<U21ED5> \x9B\x47 |0
-<U21F6A> \xFC\x5B |0
-<U21FA1> \x9C\xFD |0
-<U22049> \xFB\xEC |0
-<U2209A> \x9B\xA8 |0
-<U220C7> \x8A\xD5 |0
-<U220FC> \xFA\x73 |0
-<U2212A> \xFD\x59 |0
-<U22173> \xFB\xED |0
-<U2217A> \x9C\xA9 |0
-<U221A1> \x8A\xA8 |0
-<U221C3> \x9B\xC3 |0
-<U2227C> \x9B\x4E |0
-<U22321> \x95\xD0 |0
-<U22325> \x90\x5F |0
-<U223BD> \x97\xEE |0
-<U223D0> \xFC\x4E |0
-<U22465> \x9E\xC6 |0
-<U22471> \xFC\x50 |0
-<U2248B> \xFD\x73 |0
-<U22513> \xFA\x5E |0
-<U2251B> \xA0\x59 |0
-<U22530> \xFA\x75 |0
-<U2258D> \x9C\xA2 |0
-<U225AF> \x93\x70 |0
-<U225BE> \x93\x71 |0
-<U2261B> \x93\x77 |0
-<U2261C> \xFE\xEF |0
-<U2262B> \x93\x6D |0
-<U22668> \xFC\x5D |0
-<U22696> \x8A\xFC |0
-<U22698> \xFB\x41 |0
-<U226F4> \x9E\x6B |0
-<U226F5> \x94\xE3 |0
-<U226F6> \x8E\xE2 |0
-<U2271B> \x9C\x4D |0
-<U2271F> \x96\xA3 |0
-<U22775> \x8A\xC3 |0
-<U22781> \x96\xAA |0
-<U227B4> \xFC\x68 |0
-<U227B5> \x8B\x6D |0
-<U22803> \x8A\xE9 |0
-<U2285F> \xFC\xA1 |0
-<U22860> \x93\x6C |0
-<U228AD> \xFE\x70 |0
-<U228C1> \xFC\xA8 |0
-<U228F7> \xFC\xE9 |0
-<U22939> \x8A\xEA |0
-<U2296B> \x96\xAB |0
-<U22980> \xFC\xA7 |0
-<U22ACF> \x8A\xCB |0
-<U22AD5> \x9B\x57 |0
-<U22B22> \x93\xA5 |0
-<U22B6A> \x93\xA3 |0
-<U22BCE> \x8B\x42 |0
-<U22C26> \x97\x50 |0
-<U22C27> \x8F\xB3 |0
-<U22C51> \x8B\x45 |0
-<U22C55> \x8B\x46 |0
-<U22C9B> \x93\x7B |0
-<U22CA1> \x93\xB1 |0
-<U22CC6> \x8A\x47 |0
-<U22D07> \x93\x7C |0
-<U22D08> \x9B\x65 |0
-<U22D67> \x93\xAF |0
-<U22DA0> \x9E\xA3 |0
-<U22DA3> \xFA\xEC |0
-<U22DA4> \x8B\x77 |0
-<U22E0D> \xFC\xB1 |0
-<U22E36> \xFC\xBB |0
-<U22E78> \x93\xA8 |0
-<U22FE3> \x97\xEC |0
-<U2304B> \xFD\xC2 |0
-<U2307D> \x91\x67 |0
-<U2307E> \xFC\xCC |0
-<U2308E> \x93\xB6 |0
-<U230B7> \x90\xE4 |0
-<U230BC> \x90\xE5 |0
-<U230DA> \x9E\xF2 |0
-<U23103> \x93\xCA |0
-<U2313D> \x8B\xBC |0
-<U23182> \x93\xCF |0
-<U231A4> \xFC\xDB |0
-<U231A5> \xFC\xDC |0
-<U231C8> \xFC\xE6 |0
-<U231C9> \x96\xE7 |0
-<U231F7> \xFC\xD8 |0
-<U231F8> \xFC\xD9 |0
-<U231F9> \xFD\xA6 |0
-<U23225> \x95\xF1 |0
-<U2322F> \x9C\xE9 |0
-<U23231> \xFC\xE4 |0
-<U23232> \x94\xAF |0
-<U23233> \xFA\x77 |0
-<U23234> \x93\xCC |0
-<U23262> \x90\x5A |0
-<U23289> \x93\xBF |0
-<U2328A> \xFB\x51 |0
-<U232AB> \x93\xB9 |0
-<U232AC> \xFE\xD7 |0
-<U232AD> \x93\xB7 |0
-<U232D2> \x93\xD9 |0
-<U232E0> \x93\xBB |0
-<U232E1> \x93\xDA |0
-<U23300> \x98\xA3 |0
-<U2330A> \x90\xD1 |0
-<U233B4> \xFA\x70 |0
-<U233E6> \xFC\xFC |0
-<U233F4> \x8B\x40 |0
-<U233F5> \xA0\x7B |0
-<U233FE> \x93\xE2 |0
-<U23400> \xFC\xD6 |0
-<U23450> \x93\xA6 |0
-<U23472> \x93\x5F |0
-<U234E5> \x97\xF2 |0
-<U23530> \x8E\xF8 |0
-<U2355A> \x8F\x47 |0
-<U23595> \x92\xB4 |0
-<U23599> \x91\xED |0
-<U2359C> \x96\xD2 |0
-<U235CD> \xFD\x46 |0
-<U235CE> \x8F\x4F |0
-<U235CF> \x95\x49 |0
-<U23600> \xFA\x5C |0
-<U2363C> \xFD\x4B |0
-<U23640> \x96\xD3 |0
-<U23677> \xA0\xF5 |0
-<U236A6> \x92\x43 |0
-<U236AD> \x97\xFA |0
-<U236BA> \x9D\xD9 |0
-<U236DF> \x97\xF4 |0
-<U236EE> \x92\x4D |0
-<U23720> \x9E\xD5 |0
-<U2372F> \x9C\xC9 |0
-<U2373F> \x92\x58 |0
-<U23766> \x8E\xC8 |0
-<U23781> \x94\xB4 |0
-<U237A2> \x93\xE1 |0
-<U237BC> \x93\xDF |0
-<U237C2> \xFC\xF0 |0
-<U237D5> \x93\xEC |0
-<U237D6> \x97\xF6 |0
-<U237D7> \x96\xCF |0
-<U23ADB> \xFD\x69 |0
-<U23AEE> \x93\x52 |0
-<U23B5A> \xFD\x6E |0
-<U23C99> \xFA\x7C |0
-<U23C9A> \x93\xFA |0
-<U23C9B> \x90\x7C |0
-<U23CB7> \x9D\xB7 |0
-<U23CC7> \xA0\xE9 |0
-<U23CC8> \xFA\x4E |0
-<U23CC9> \xFD\xA1 |0
-<U23CFC> \x9E\x74 |0
-<U23CFD> \x9F\xBF |0
-<U23CFE> \x9E\xCB |0
-<U23CFF> \x9B\xB9 |0
-<U23D5B> \x97\xB9 |0
-<U23DB6> \x9E\xD2 |0
-<U23DB7> \x97\x53 |0
-<U23DB8> \x96\xA4 |0
-<U23DB9> \x8F\xBE |0
-<U23DBA> \x94\xD9 |0
-<U23DBB> \x90\x58 |0
-<U23DBC> \xFD\x79 |0
-<U23DBD> \xFD\x7B |0
-<U23DF8> \x8E\xFA |0
-<U23E2C> \x9E\xD9 |0
-<U23E2D> \x97\xD4 |0
-<U23E2E> \x90\xBB |0
-<U23E2F> \xFD\xBC |0
-<U23E30> \xFD\xC6 |0
-<U23E31> \x92\x48 |0
-<U23E88> \x9D\xC1 |0
-<U23E89> \x92\xB9 |0
-<U23E8A> \x92\xA6 |0
-<U23E8B> \x8F\x4B |0
-<U23EBF> \x92\xB6 |0
-<U23EF7> \x9E\xD8 |0
-<U23EF8> \x94\x5E |0
-<U23EF9> \x98\x5F |0
-<U23EFA> \x94\xCE |0
-<U23EFB> \x92\x4A |0
-<U23EFC> \xFD\x70 |0
-<U23F35> \x94\x67 |0
-<U23F41> \x8D\xEC |0
-<U23F7F> \x94\x48 |0
-<U23F80> \xFA\xC1 |0
-<U23F81> \x9C\xF7 |0
-<U23F82> \xFD\xBE |0
-<U23FB7> \xFC\x7E |0
-<U23FC0> \x93\xF9 |0
-<U23FEB> \xFA\xEB |0
-<U23FEC> \xFA\xC3 |0
-<U23FED> \x97\xD3 |0
-<U23FEE> \x95\xF9 |0
-<U23FEF> \x9C\x48 |0
-<U23FF0> \x8E\x6A |0
-<U24011> \xA0\xD8 |0
-<U24039> \xFD\xD7 |0
-<U2403A> \xFB\x4A |0
-<U2403B> \x9B\xAF |0
-<U2403C> \x94\x4B |0
-<U2403D> \xFD\xC9 |0
-<U24057> \x8E\xAC |0
-<U2408B> \x92\x5A |0
-<U2408C> \xFC\xBD |0
-<U2408D> \x92\xD9 |0
-<U240C9> \x92\xDD |0
-<U24104> \x96\xBA |0
-<U2413F> \xFD\xDA |0
-<U24140> \xFD\xDE |0
-<U24144> \xFD\xD3 |0
-<U24155> \xFD\xD6 |0
-<U24156> \xFD\xDC |0
-<U24157> \xFD\xDD |0
-<U2415C> \x90\xFE |0
-<U2415F> \xFE\xA1 |0
-<U2417A> \x9C\xD8 |0
-<U241A3> \x9E\x6D |0
-<U241A4> \xFD\x7C |0
-<U241A5> \xFB\x61 |0
-<U241E2> \xFE\x60 |0
-<U241FC> \x98\x52 |0
-<U2421B> \x96\x4F |0
-<U2424B> \x91\x6E |0
-<U24256> \x98\x6D |0
-<U24259> \x98\x64 |0
-<U24276> \x94\x53 |0
-<U24277> \xFD\xEC |0
-<U24278> \xFB\x78 |0
-<U242A5> \x98\x5A |0
-<U242C9> \x93\xD0 |0
-<U242CA> \x98\x62 |0
-<U242FA> \x97\x4F |0
-<U2431A> \x94\x52 |0
-<U24348> \x91\xD2 |0
-<U24362> \x97\xEA |0
-<U24363> \xFB\x6B |0
-<U24364> \x91\xB1 |0
-<U24365> \xFD\xF3 |0
-<U2438C> \x92\xCB |0
-<U24396> \x9B\xB1 |0
-<U2439C> \xFC\xEC |0
-<U243BD> \x98\x6B |0
-<U243C1> \x97\x51 |0
-<U243E9> \x98\x71 |0
-<U243F2> \x9E\xF3 |0
-<U243F8> \x91\xE8 |0
-<U24435> \xFB\x4C |0
-<U24436> \x92\x6A |0
-<U2445A> \xFD\xF8 |0
-<U2445B> \x98\x61 |0
-<U24487> \x93\xED |0
-<U24488> \x97\x44 |0
-<U244B9> \x91\xE1 |0
-<U244CE> \x98\x69 |0
-<U244D3> \x8A\x62 |0
-<U24521> \x9C\x55 |0
-<U24578> \x8E\x77 |0
-<U2462A> \x93\xE6 |0
-<U24665> \x93\xA2 |0
-<U24697> \x94\xB3 |0
-<U246D4> \x93\x7D |0
-<U24706> \x9E\x66 |0
-<U24725> \x94\x59 |0
-<U2478F> \x94\x58 |0
-<U24823> \xFE\x54 |0
-<U248F3> \x94\xA5 |0
-<U248FF> \x95\xED |0
-<U24900> \xFD\x7E |0
-<U24901> \xFB\xEB |0
-<U2490C> \xFD\x7D |0
-<U24916> \x97\x6F |0
-<U24917> \x94\x61 |0
-<U24919> \x9F\xC1 |0
-<U2492F> \x95\xD7 |0
-<U24933> \xFA\x52 |0
-<U2493E> \x9F\x68 |0
-<U2493F> \x9B\xE7 |0
-<U24940> \xFC\xCE |0
-<U24941> \x96\xE8 |0
-<U24942> \xFA\x49 |0
-<U24962> \x95\x4D |0
-<U24963> \x9E\xF8 |0
-<U24974> \xFE\x49 |0
-<U24975> \x91\xCE |0
-<U24976> \x97\x71 |0
-<U2497F> \xFD\xB1 |0
-<U24988> \x9C\xF2 |0
-<U24989> \x93\xB8 |0
-<U2498A> \x90\x43 |0
-<U2498B> \x97\x59 |0
-<U2498C> \x94\xD7 |0
-<U2498D> \xFE\x66 |0
-<U2498E> \x94\x7D |0
-<U2498F> \xFC\x6F |0
-<U249A7> \x8E\xF7 |0
-<U249AB> \x94\x7C |0
-<U249AC> \x92\xCD |0
-<U249AD> \x97\xB2 |0
-<U249B7> \xFE\x65 |0
-<U249B8> \x96\x7E |0
-<U249B9> \x97\x58 |0
-<U249BA> \x9B\x77 |0
-<U249BB> \x91\xCF |0
-<U249DE> \x96\xD5 |0
-<U249DF> \xFC\xB3 |0
-<U249E3> \x93\xAE |0
-<U249F6> \x9C\x46 |0
-<U249F7> \x95\x5B |0
-<U249F8> \x91\xD1 |0
-<U249F9> \x94\xF4 |0
-<U24A21> \xFC\xED |0
-<U24A22> \xFD\xFA |0
-<U24A23> \xFC\xC8 |0
-<U24A24> \xFE\x62 |0
-<U24A25> \x91\xFC |0
-<U24A26> \xFE\x6B |0
-<U24A27> \xFD\xF9 |0
-<U24A28> \xFC\xC7 |0
-<U24A29> \x91\x4E |0
-<U24A2A> \x9C\xB8 |0
-<U24A3E> \x97\x67 |0
-<U24A4E> \x94\xA2 |0
-<U24A4F> \x98\x75 |0
-<U24A50> \x97\xAC |0
-<U24A51> \x91\xD3 |0
-<U24A65> \x8E\xEB |0
-<U24A66> \x97\x6A |0
-<U24A67> \x96\x5E |0
-<U24A77> \x9F\xF9 |0
-<U24A78> \x95\xF8 |0
-<U24A79> \xFE\xA2 |0
-<U24A7A> \x8F\xE6 |0
-<U24A93> \x9D\xA4 |0
-<U24A94> \x97\x68 |0
-<U24A95> \x8E\xEC |0
-<U24A96> \x94\xBD |0
-<U24AA4> \x94\x5B |0
-<U24AA5> \x9C\xF6 |0
-<U24AA6> \xFA\xA7 |0
-<U24AA7> \x9B\xD9 |0
-<U24AB1> \xFA\x5D |0
-<U24AB2> \x96\x56 |0
-<U24AB3> \x97\x62 |0
-<U24ABA> \x94\xBA |0
-<U24ABB> \xA0\x4F |0
-<U24ABC> \x92\xD8 |0
-<U24AC7> \x94\xBB |0
-<U24AD1> \x90\xCF |0
-<U24ADF> \x94\x65 |0
-<U24AE2> \x9F\x4C |0
-<U24B6E> \x9E\xBE |0
-<U24BF5> \xFB\x6D |0
-<U24C09> \x95\xCA |0
-<U24C9E> \x9D\xC2 |0
-<U24C9F> \x97\xF8 |0
-<U24CD9> \x94\x73 |0
-<U24D06> \x94\x74 |0
-<U24DB8> \x8A\x4B |0
-<U24DEA> \x8A\x55 |0
-<U24DEB> \x8B\x69 |0
-<U24E50> \x8B\x76 |0
-<U24F0E> \xA0\xF8 |0
-<U24F5C> \x98\xDF |0
-<U24F82> \xFE\xB5 |0
-<U24F97> \x96\xFB |0
-<U24F9A> \x9B\xFB |0
-<U24FA9> \x9E\xCE |0
-<U24FC2> \x9E\x7B |0
-<U2509D> \xFE\xCE |0
-<U25148> \x9D\xFC |0
-<U2517D> \xFE\xCF |0
-<U2517E> \x8B\xA5 |0
-<U251E3> \x8A\xEC |0
-<U251E6> \xFC\xE0 |0
-<U251E7> \x94\xAD |0
-<U25220> \xFE\xD5 |0
-<U25221> \x94\xAC |0
-<U252C7> \x8A\x6F |0
-<U252D8> \x8B\xA9 |0
-<U25311> \x9D\xCB |0
-<U25313> \xFC\xE7 |0
-<U25425> \x93\xC8 |0
-<U2542F> \x91\xF0 |0
-<U25430> \x8F\xE0 |0
-<U2546C> \x90\xED |0
-<U2546E> \x9B\xDC |0
-<U2555B> \x93\xC7 |0
-<U2555C> \x92\x49 |0
-<U2555D> \x96\xE1 |0
-<U25565> \x8F\xE1 |0
-<U25566> \x9B\xE5 |0
-<U25581> \x94\xC0 |0
-<U25584> \x93\xC3 |0
-<U2558F> \x93\xC5 |0
-<U255B9> \x90\x79 |0
-<U255D5> \x97\x7B |0
-<U255DB> \x90\x7E |0
-<U255E0> \xFE\xE6 |0
-<U25635> \x9D\xB8 |0
-<U25651> \x92\x70 |0
-<U25683> \x95\xA8 |0
-<U256F6> \x98\xB9 |0
-<U25706> \x91\x40 |0
-<U2571D> \xFC\xBE |0
-<U25725> \x91\x57 |0
-<U25772> \xFA\xDF |0
-<U257C7> \x9B\xE6 |0
-<U257E0> \x8E\x44 |0
-<U257E1> \x9C\x4F |0
-<U25857> \xFE\xF4 |0
-<U25872> \x93\xDC |0
-<U258E1> \x8E\x4A |0
-<U25956> \x9D\xB9 |0
-<U259AC> \x8E\x4E |0
-<U25A9C> \x94\xE5 |0
-<U25AAE> \x9B\xF0 |0
-<U25AE9> \x95\x51 |0
-<U25B74> \x8B\xBB |0
-<U25BB3> \x94\xF0 |0
-<U25BB4> \x8E\x64 |0
-<U25BC6> \x94\xEA |0
-<U25C01> \x8E\x5B |0
-<U25C06> \x9B\xF2 |0
-<U25C4A> \x9D\xC9 |0
-<U25C65> \x8E\x6C |0
-<U25CC0> \x8F\x75 |0
-<U25CC1> \x8E\x71 |0
-<U25CFE> \x8E\x60 |0
-<U25D20> \xFD\xD8 |0
-<U25D43> \x95\x52 |0
-<U25E0E> \x95\x54 |0
-<U25E81> \x9D\xBB |0
-<U25E82> \x95\x43 |0
-<U25E83> \x92\xFE |0
-<U25EA6> \x94\xF2 |0
-<U25EBC> \x94\xF1 |0
-<U25ED7> \xA0\xEA |0
-<U25ED8> \x9D\xD2 |0
-<U25F4B> \x91\xF8 |0
-<U25FE1> \x94\x62 |0
-<U25FE2> \x9B\xA4 |0
-<U26029> \x8E\xAD |0
-<U26064> \x96\xD0 |0
-<U260A4> \x97\x57 |0
-<U260A5> \x8A\x77 |0
-<U26121> \x8E\xB5 |0
-<U26159> \xA0\x6D |0
-<U2615A> \x8E\xB6 |0
-<U2615B> \x97\x56 |0
-<U2615C> \x95\x40 |0
-<U261AD> \xA0\xF3 |0
-<U261AE> \x94\xBE |0
-<U261DD> \xFD\xDF |0
-<U26258> \x9D\xBC |0
-<U26261> \x94\xFE |0
-<U262D0> \x8E\xC0 |0
-<U26351> \x8E\xC3 |0
-<U263BE> \x96\x49 |0
-<U26410> \x90\xCC |0
-<U26411> \x9C\x60 |0
-<U26412> \x95\x4B |0
-<U26489> \x8E\xCC |0
-<U26498> \x8E\xE4 |0
-<U26512> \x9C\x49 |0
-<U26572> \x8B\x5E |0
-<U265AD> \x95\x5C |0
-<U26626> \x8E\xD9 |0
-<U266AF> \x9D\xB4 |0
-<U266B1> \x92\x5F |0
-<U266E8> \x8E\xDB |0
-<U26741> \x97\x54 |0
-<U267B3> \x9E\xD4 |0
-<U267B4> \x95\x68 |0
-<U267CC> \xA0\xC3 |0
-<U2685E> \x9C\x61 |0
-<U2686E> \x9C\x5F |0
-<U26888> \xFC\x4D |0
-<U26893> \x9E\x69 |0
-<U2690E> \xFE\xC7 |0
-<U26911> \xFE\xC6 |0
-<U269A8> \x91\x65 |0
-<U269B5> \x9C\xE7 |0
-<U269F2> \x8A\x54 |0
-<U269FA> \x9C\x6C |0
-<U26A2E> \xFE\x5D |0
-<U26A42> \x95\x6A |0
-<U26A51> \x95\x6D |0
-<U26A52> \x8E\xF0 |0
-<U26B0A> \x8E\xF6 |0
-<U26B28> \xFB\xDA |0
-<U26B50> \x8B\x4C |0
-<U26B51> \xFD\x75 |0
-<U26B52> \x9B\xDD |0
-<U26B53> \xFA\xF5 |0
-<U26B96> \x8F\x6A |0
-<U26B97> \x8F\x4E |0
-<U26BB3> \xFA\x55 |0
-<U26BF7> \x9C\x41 |0
-<U26C21> \x92\x5C |0
-<U26C7E> \xFB\x66 |0
-<U26C7F> \x8E\x65 |0
-<U26C80> \x98\x49 |0
-<U26C81> \xFB\xA8 |0
-<U26C82> \x98\x42 |0
-<U26CB7> \x97\xFB |0
-<U26CB8> \x90\xCA |0
-<U26CBD> \x9C\x5B |0
-<U26CC0> \x97\x4D |0
-<U26D22> \x9F\x4B |0
-<U26D23> \x9F\xB5 |0
-<U26D24> \x93\xD2 |0
-<U26D25> \xFD\xAA |0
-<U26D26> \x98\x40 |0
-<U26D27> \x91\x46 |0
-<U26D28> \x98\x67 |0
-<U26D29> \xFA\x5A |0
-<U26D2A> \xFB\xA9 |0
-<U26DA0> \xFC\xFD |0
-<U26DA1> \xFD\xAB |0
-<U26DA2> \x91\xBD |0
-<U26DA3> \x8F\x4C |0
-<U26DA4> \x96\xC9 |0
-<U26DA5> \x8F\x55 |0
-<U26DA6> \xFB\xAE |0
-<U26DA7> \x95\x6F |0
-<U26DDC> \xA0\xF0 |0
-<U26DEA> \x94\x6F |0
-<U26DEB> \xFD\xAC |0
-<U26DF0> \x96\xCB |0
-<U26E05> \xA0\x56 |0
-<U26E42> \x8F\x5E |0
-<U26E43> \x8F\x6C |0
-<U26E44> \x8E\xA3 |0
-<U26E45> \xFB\xB3 |0
-<U26E6E> \xFC\x53 |0
-<U26E72> \xFD\xB3 |0
-<U26E77> \x8F\x6B |0
-<U26E84> \x96\xCA |0
-<U26ED0> \x9E\x6F |0
-<U26ED1> \xA0\xC5 |0
-<U26ED2> \xFC\x78 |0
-<U26ED3> \x8E\x42 |0
-<U26ED4> \x8F\x5A |0
-<U26ED5> \x90\xC2 |0
-<U26ED6> \x8E\xA5 |0
-<U26ED7> \x90\x61 |0
-<U26F26> \x92\x4F |0
-<U26F73> \x93\x73 |0
-<U26F74> \xFD\xB5 |0
-<U26F9F> \xFE\xCC |0
-<U26FA1> \xFB\xBD |0
-<U26FDE> \x98\x43 |0
-<U26FDF> \x96\xC5 |0
-<U2700E> \x89\xBC |0
-<U27052> \x92\x4B |0
-<U27053> \x98\x4A |0
-<U270AD> \xA0\xF1 |0
-<U270AE> \x9E\xFB |0
-<U270AF> \x9C\xD2 |0
-<U270CD> \x8F\xA7 |0
-<U270F8> \xFC\x5C |0
-<U27109> \x98\x45 |0
-<U2710C> \x90\x46 |0
-<U27126> \xFE\xFA |0
-<U27127> \x95\x60 |0
-<U27164> \x9F\x48 |0
-<U27165> \x92\x47 |0
-<U27175> \x90\xFB |0
-<U2721B> \x95\x71 |0
-<U272E6> \x9C\xAC |0
-<U2739A> \x8F\xAE |0
-<U27422> \x95\x7D |0
-<U27484> \x97\xB6 |0
-<U27486> \xA0\xBD |0
-<U275E0> \x8F\xBD |0
-<U275E4> \x8F\xBF |0
-<U275FD> \x93\x69 |0
-<U275FE> \x9B\xA7 |0
-<U2760C> \xFE\xEA |0
-<U27632> \x9B\xE1 |0
-<U27639> \x8B\x41 |0
-<U27655> \x9D\xB6 |0
-<U27656> \xA0\xEB |0
-<U27657> \x9B\xA3 |0
-<U27694> \x8B\xA1 |0
-<U2770F> \x8F\xC8 |0
-<U27735> \x89\x4C |0
-<U27736> \x98\x60 |0
-<U27741> \x94\xC7 |0
-<U2775E> \x8B\x58 |0
-<U27784> \x95\xAB |0
-<U27785> \x95\xAA |0
-<U27870> \x93\xD6 |0
-<U27924> \x8F\xD1 |0
-<U27967> \x99\xD5 |0
-<U27A0E> \xFB\xC8 |0
-<U27A59> \x8F\xD7 |0
-<U27ABD> \x8F\xD2 |0
-<U27ABE> \x90\x64 |0
-<U27AF4> \x98\xB6 |0
-<U27B18> \x98\xBD |0
-<U27B38> \x8F\xDC |0
-<U27B39> \xFE\xF6 |0
-<U27B3A> \x8F\xD9 |0
-<U27BF4> \x97\xF3 |0
-<U27C12> \x9B\xF8 |0
-<U27D2F> \x9E\x6C |0
-<U27D53> \x8F\xF2 |0
-<U27D54> \x8F\xEE |0
-<U27D73> \x9E\x6E |0
-<U27D8F> \x8F\xEF |0
-<U27D98> \x8F\xF4 |0
-<U27DBD> \x8F\xF5 |0
-<U27DDC> \x95\xC2 |0
-<U27E4D> \x98\x6A |0
-<U27E4F> \x97\xCF |0
-<U28002> \x90\x41 |0
-<U28009> \x9C\xDB |0
-<U280BD> \x8B\x62 |0
-<U280BE> \x8A\x4E |0
-<U280E9> \x8A\x66 |0
-<U280F4> \x9C\xFB |0
-<U2812E> \x9C\xFC |0
-<U2816F> \x9C\xE5 |0
-<U28207> \x8B\x73 |0
-<U28256> \x8A\x61 |0
-<U282CD> \x8B\xA2 |0
-<U282E2> \x9D\xF2 |0
-<U2833A> \x8E\xCA |0
-<U28365> \x90\x4E |0
-<U2837D> \x9F\xF5 |0
-<U28412> \x90\x4F |0
-<U28482> \xFB\xFE |0
-<U2853C> \x90\x63 |0
-<U2853D> \x90\x57 |0
-<U2856C> \x90\x66 |0
-<U285F4> \xFC\xE5 |0
-<U28600> \x91\x62 |0
-<U2860B> \x90\x67 |0
-<U28625> \x8F\xA1 |0
-<U2863B> \x8F\xA2 |0
-<U286AA> \x9D\x48 |0
-<U286AB> \xFA\xD3 |0
-<U286D8> \x90\xB9 |0
-<U286E6> \x90\x6B |0
-<U28804> \xFE\x57 |0
-<U2882B> \xFE\x55 |0
-<U28933> \x90\x73 |0
-<U28948> \x9B\xEF |0
-<U28949> \x9C\xF0 |0
-<U2896C> \x91\xE0 |0
-<U2897E> \x91\xD8 |0
-<U28989> \x96\x46 |0
-<U289A8> \x93\x60 |0
-<U289AA> \xFA\x53 |0
-<U289AB> \x9C\xD3 |0
-<U289BC> \xFB\x40 |0
-<U289C0> \x8D\xE2 |0
-<U289DC> \x94\x42 |0
-<U289DE> \x90\x56 |0
-<U289E1> \x98\x65 |0
-<U289E4> \xFA\x4A |0
-<U289F9> \x95\xAF |0
-<U289FA> \x97\x5A |0
-<U289FB> \x93\x49 |0
-<U289FC> \x97\x47 |0
-<U28A0F> \xA0\xF4 |0
-<U28A16> \x97\x78 |0
-<U28A25> \x8F\xCF |0
-<U28A29> \xFC\x60 |0
-<U28A44> \x91\xDC |0
-<U28A45> \x96\x61 |0
-<U28A46> \x92\xEC |0
-<U28A47> \x93\x5D |0
-<U28A48> \x8E\xDE |0
-<U28A49> \x96\xFE |0
-<U28A4A> \xFD\x4F |0
-<U28A4B> \x95\xDE |0
-<U28A59> \x98\xB0 |0
-<U28A5A> \xA0\x40 |0
-<U28A81> \x97\xBD |0
-<U28A82> \x97\x7D |0
-<U28A83> \x97\xF5 |0
-<U28A9A> \x9B\xAC |0
-<U28A9B> \xFA\xDA |0
-<U28A9C> \x92\xC2 |0
-<U28AC6> \x90\x7B |0
-<U28ACB> \x93\xFE |0
-<U28ACC> \x94\x7B |0
-<U28ADE> \xFA\xBE |0
-<U28ADF> \xFD\x43 |0
-<U28AE0> \x90\xC6 |0
-<U28AE1> \x90\xA4 |0
-<U28AE2> \x90\xA8 |0
-<U28AE3> \x94\xA9 |0
-<U28AE5> \x90\xA9 |0
-<U28B0C> \x90\x7D |0
-<U28B21> \xFD\xBA |0
-<U28B22> \x93\xC4 |0
-<U28B2B> \xFE\xED |0
-<U28B2C> \x9D\xAB |0
-<U28B2D> \xA0\xE3 |0
-<U28B2F> \x96\x48 |0
-<U28B4C> \x8A\xA9 |0
-<U28B4E> \x9B\xC5 |0
-<U28B50> \x96\x5D |0
-<U28B63> \x97\x5F |0
-<U28B64> \x96\x5F |0
-<U28B65> \x96\x6E |0
-<U28B66> \xFB\x5D |0
-<U28B6C> \x9D\xB1 |0
-<U28B8F> \xFE\xA3 |0
-<U28B99> \x9D\xB2 |0
-<U28B9C> \x95\xAE |0
-<U28B9D> \xFC\xA3 |0
-<U28BC2> \xA0\xA2 |0
-<U28BC5> \x96\x55 |0
-<U28BD7> \x93\x41 |0
-<U28BD9> \x95\xAD |0
-<U28BDA> \x91\xD5 |0
-<U28BE7> \x97\x7A |0
-<U28BE8> \xFD\xFC |0
-<U28BE9> \x8E\x47 |0
-<U28BEA> \x93\xFD |0
-<U28BEB> \x90\xA5 |0
-<U28BEC> \x90\xAC |0
-<U28BFF> \x90\xAE |0
-<U28C1D> \x95\xE2 |0
-<U28C23> \x94\x66 |0
-<U28C2B> \x91\xB8 |0
-<U28C30> \x9C\xEC |0
-<U28C39> \x90\xAD |0
-<U28CCD> \x8A\xE3 |0
-<U28D34> \x95\xEA |0
-<U28E36> \x91\xD9 |0
-<U28E65> \x95\xF5 |0
-<U28E66> \x95\xF4 |0
-<U28EB2> \xFE\x72 |0
-<U28EB3> \x92\x7A |0
-<U28ED9> \xFE\xAC |0
-<U2908B> \x91\xC5 |0
-<U290AF> \x90\xCD |0
-<U290B0> \x95\xFE |0
-<U290B1> \x91\x59 |0
-<U290E4> \x97\xCC |0
-<U290E5> \x90\xCE |0
-<U2910D> \xFE\xFD |0
-<U29110> \x9D\x5B |0
-<U2919C> \xFD\x60 |0
-<U291A8> \x9C\xCF |0
-<U291EB> \x90\xE0 |0
-<U2941D> \x90\xF3 |0
-<U29433> \x90\xF0 |0
-<U29448> \x95\xB7 |0
-<U294D9> \x8E\x4B |0
-<U294DA> \x96\x58 |0
-<U2959E> \x9E\xCF |0
-<U295E9> \x9D\x64 |0
-<U29857> \x91\x50 |0
-<U298A4> \x9C\xC1 |0
-<U298EA> \x93\xA7 |0
-<U29903> \xA0\xEF |0
-<U29905> \x91\x51 |0
-<U2992F> \x96\xC1 |0
-<U2995D> \xFC\xA4 |0
-<U2996A> \x9D\x6A |0
-<U2999D> \x92\x4E |0
-<U29B05> \x91\x5D |0
-<U29B0E> \x9D\x6D |0
-<U29BD5> \x91\x5A |0
-<U29CAD> \x9C\xC0 |0
-<U29D3E> \x91\x6A |0
-<U29D7C> \x9E\xA6 |0
-<U29E2D> \x96\xB4 |0
-<U29E68> \x91\x72 |0
-<U29EAC> \x9E\xC8 |0
-<U29EC3> \x8B\x55 |0
-<U29F23> \x9D\x72 |0
-<U29F30> \x9E\xCC |0
-<U29FB7> \x91\x74 |0
-<U2A0E1> \x91\x77 |0
-<U2A0F3> \x96\xC0 |0
-<U2A0F8> \x8F\xB1 |0
-<U2A0FE> \x96\xB7 |0
-<U2A123> \x91\x78 |0
-<U2A150> \xFB\x77 |0
-<U2A192> \x91\x75 |0
-<U2A193> \x91\xA3 |0
-<U2A1DF> \x91\x79 |0
-<U2A220> \x91\xA4 |0
-<U2A233> \x91\xA6 |0
-<U2A29F> \x90\x52 |0
-<U2A2B2> \xA0\x45 |0
-<U2A2DF> \x9C\xDD |0
-<U2A3A9> \x89\x40 |0
-<U2A5C6> \x94\x78 |0
-<U2A6A9> \x9E\x75 |0
-<U2F840> \xA0\x47 |0
-<U2F894> \xFC\x48 |0
-<U2F8CD> \x9C\x52 |0
-<U2F994> \x8E\xFD |0
-<U2F9D4> \x8F\xF0 |0
-#
-END CHARMAP
-#
diff --git a/enc/trans/ucm/windows-950-2000.ucm b/enc/trans/ucm/windows-950-2000.ucm
deleted file mode 100644
index 0f3936c8d1..0000000000
--- a/enc/trans/ucm/windows-950-2000.ucm
+++ /dev/null
@@ -1,20379 +0,0 @@
-# ***************************************************************************
-# *
-# * Copyright (C) 2001-2002, International Business Machines
-# * Corporation and others. All Rights Reserved.
-# *
-# ***************************************************************************
-#
-# File created on Dec 03 13:48 Pacific Standard Time 2002
-#
-# File created by genmucm tool.
-# from windows 2000 using IMultiLanguage 5.50.4522.1800
-#
-# Table Version : 1.0
-# The 1st column is the Unicode scalar value.
-# The 2nd column is the codepage byte sequence.
-# The 3rd column is the fallback indicator.
-# The fallback indicator can have one of the following values:
-# |0 for exact 1-1 roundtrip mapping
-# |1 for the best fallback codepage byte sequence.
-# |2 for the substitution character
-# |3 for the best reverse fallback Unicode scaler value
-#
-# Encoding description: Chinese Traditional (Big5)
-# Encoding name: big5
-#
-<code_set_name> "windows-950-2000"
-<mb_cur_max> 2
-<mb_cur_min> 1
-<uconv_class> "MBCS"
-<subchar> \x3F
-<icu:charsetFamily> "ASCII"
-# Suggested ICU specific alias information
-#<icu:alias> "windows-950_VPUA"
-
-<icu:state> 0-80, 81-fe:1, ff
-<icu:state> 40-7e, 80-fe
-
-# The following was the generated state table.
-# This does not account for unassigned characters
-#<icu:state> 0-80, 81-fe:1, ff
-#<icu:state> 40-7e, a1-fe
-#
-CHARMAP
-#
-#UNICODE 950
-#_______ _________
-<U0000> \x00 |0
-<U0001> \x01 |0
-<U0002> \x02 |0
-<U0003> \x03 |0
-<U0004> \x04 |0
-<U0005> \x05 |0
-<U0006> \x06 |0
-<U0007> \x07 |0
-<U0008> \x08 |0
-<U0009> \x09 |0
-<U000A> \x0A |0
-<U000B> \x0B |0
-<U000C> \x0C |0
-<U000D> \x0D |0
-<U000E> \x0E |0
-<U000F> \x0F |0
-<U0010> \x10 |0
-<U0011> \x11 |0
-<U0012> \x12 |0
-<U0013> \x13 |0
-<U0014> \x14 |0
-<U0015> \x15 |0
-<U0016> \x16 |0
-<U0017> \x17 |0
-<U0018> \x18 |0
-<U0019> \x19 |0
-<U001A> \x1A |0
-<U001B> \x1B |0
-<U001C> \x1C |0
-<U001D> \x1D |0
-<U001E> \x1E |0
-<U001F> \x1F |0
-<U0020> \x20 |0
-<U0021> \x21 |0
-<U0022> \x22 |0
-<U0023> \x23 |0
-<U0024> \x24 |0
-<U0025> \x25 |0
-<U0026> \x26 |0
-<U0027> \x27 |0
-<U0028> \x28 |0
-<U0029> \x29 |0
-<U002A> \x2A |0
-<U002B> \x2B |0
-<U002C> \x2C |0
-<U002D> \x2D |0
-<U002E> \x2E |0
-<U002F> \x2F |0
-<U0030> \x30 |0
-<U0031> \x31 |0
-<U0032> \x32 |0
-<U0033> \x33 |0
-<U0034> \x34 |0
-<U0035> \x35 |0
-<U0036> \x36 |0
-<U0037> \x37 |0
-<U0038> \x38 |0
-<U0039> \x39 |0
-<U003A> \x3A |0
-<U003B> \x3B |0
-<U003C> \x3C |0
-<U003D> \x3D |0
-<U003E> \x3E |0
-<U003F> \x3F |0
-<U0040> \x40 |0
-<U0041> \x41 |0
-<U0042> \x42 |0
-<U0043> \x43 |0
-<U0044> \x44 |0
-<U0045> \x45 |0
-<U0046> \x46 |0
-<U0047> \x47 |0
-<U0048> \x48 |0
-<U0049> \x49 |0
-<U004A> \x4A |0
-<U004B> \x4B |0
-<U004C> \x4C |0
-<U004D> \x4D |0
-<U004E> \x4E |0
-<U004F> \x4F |0
-<U0050> \x50 |0
-<U0051> \x51 |0
-<U0052> \x52 |0
-<U0053> \x53 |0
-<U0054> \x54 |0
-<U0055> \x55 |0
-<U0056> \x56 |0
-<U0057> \x57 |0
-<U0058> \x58 |0
-<U0059> \x59 |0
-<U005A> \x5A |0
-<U005B> \x5B |0
-<U005C> \x5C |0
-<U005D> \x5D |0
-<U005E> \x5E |0
-<U005F> \x5F |0
-<U0060> \x60 |0
-<U0061> \x61 |0
-<U0062> \x62 |0
-<U0063> \x63 |0
-<U0064> \x64 |0
-<U0065> \x65 |0
-<U0066> \x66 |0
-<U0067> \x67 |0
-<U0068> \x68 |0
-<U0069> \x69 |0
-<U006A> \x6A |0
-<U006B> \x6B |0
-<U006C> \x6C |0
-<U006D> \x6D |0
-<U006E> \x6E |0
-<U006F> \x6F |0
-<U0070> \x70 |0
-<U0071> \x71 |0
-<U0072> \x72 |0
-<U0073> \x73 |0
-<U0074> \x74 |0
-<U0075> \x75 |0
-<U0076> \x76 |0
-<U0077> \x77 |0
-<U0078> \x78 |0
-<U0079> \x79 |0
-<U007A> \x7A |0
-<U007B> \x7B |0
-<U007C> \x7C |0
-<U007D> \x7D |0
-<U007E> \x7E |0
-<U007F> \x7F |0
-#<U0080> \x80 |0
-<U00A1> \x21 |1
-<U00A2> \xA2\x46 |1
-<U00A3> \xA2\x47 |1
-<U00A5> \xA2\x44 |1
-<U00A6> \x7C |1
-<U00A7> \xA1\xB1 |0
-<U00A8> \xA1\x4C |1
-<U00A9> \x63 |1
-<U00AA> \x61 |1
-<U00AD> \x2D |1
-<U00AE> \x52 |1
-<U00AF> \xA1\xC2 |0
-<U00B0> \xA2\x58 |0
-<U00B1> \xA1\xD3 |0
-<U00B2> \x32 |1
-<U00B3> \x33 |1
-<U00B4> \xA1\xA6 |1
-<U00B5> \xA3\x67 |1
-<U00B7> \xA1\x50 |0
-<U00B8> \xA1\x4D |1
-<U00B9> \x31 |1
-<U00BA> \x6F |1
-<U00C0> \x41 |1
-<U00C1> \x41 |1
-<U00C2> \x41 |1
-<U00C3> \x41 |1
-<U00C4> \x41 |1
-<U00C5> \x41 |1
-<U00C6> \x41 |1
-<U00C7> \x43 |1
-<U00C8> \x45 |1
-<U00C9> \x45 |1
-<U00CA> \x45 |1
-<U00CB> \x45 |1
-<U00CC> \x49 |1
-<U00CD> \x49 |1
-<U00CE> \x49 |1
-<U00CF> \x49 |1
-<U00D0> \x44 |1
-<U00D1> \x4E |1
-<U00D2> \x4F |1
-<U00D3> \x4F |1
-<U00D4> \x4F |1
-<U00D5> \x4F |1
-<U00D6> \x4F |1
-<U00D7> \xA1\xD1 |0
-<U00D8> \x4F |1
-<U00D9> \x55 |1
-<U00DA> \x55 |1
-<U00DB> \x55 |1
-<U00DC> \x55 |1
-<U00DD> \x59 |1
-<U00DE> \x54 |1
-<U00DF> \x73 |1
-<U00E0> \x61 |1
-<U00E1> \x61 |1
-<U00E2> \x61 |1
-<U00E3> \x61 |1
-<U00E4> \x61 |1
-<U00E5> \x61 |1
-<U00E6> \x61 |1
-<U00E7> \x63 |1
-<U00E8> \x65 |1
-<U00E9> \x65 |1
-<U00EA> \x65 |1
-<U00EB> \x65 |1
-<U00EC> \x69 |1
-<U00ED> \x69 |1
-<U00EE> \x69 |1
-<U00EF> \x69 |1
-<U00F0> \x65 |1
-<U00F1> \x6E |1
-<U00F2> \x6F |1
-<U00F3> \x6F |1
-<U00F4> \x6F |1
-<U00F5> \x6F |1
-<U00F6> \x6F |1
-<U00F7> \xA1\xD2 |0
-<U00F8> \x6F |1
-<U00F9> \x75 |1
-<U00FA> \x75 |1
-<U00FB> \x75 |1
-<U00FC> \x75 |1
-<U00FD> \x79 |1
-<U00FE> \x74 |1
-<U00FF> \x79 |1
-<U02C7> \xA3\xBE |0
-<U02C9> \xA3\xBC |0
-<U02CA> \xA3\xBD |0
-<U02CB> \xA3\xBF |0
-<U02CD> \xA1\xC5 |0
-<U02D9> \xA3\xBB |0
-<U0305> \xA1\xC2 |1
-<U0391> \xA3\x44 |0
-<U0392> \xA3\x45 |0
-<U0393> \xA3\x46 |0
-<U0394> \xA3\x47 |0
-<U0395> \xA3\x48 |0
-<U0396> \xA3\x49 |0
-<U0397> \xA3\x4A |0
-<U0398> \xA3\x4B |0
-<U0399> \xA3\x4C |0
-<U039A> \xA3\x4D |0
-<U039B> \xA3\x4E |0
-<U039C> \xA3\x4F |0
-<U039D> \xA3\x50 |0
-<U039E> \xA3\x51 |0
-<U039F> \xA3\x52 |0
-<U03A0> \xA3\x53 |0
-<U03A1> \xA3\x54 |0
-<U03A3> \xA3\x55 |0
-<U03A4> \xA3\x56 |0
-<U03A5> \xA3\x57 |0
-<U03A6> \xA3\x58 |0
-<U03A7> \xA3\x59 |0
-<U03A8> \xA3\x5A |0
-<U03A9> \xA3\x5B |0
-<U03B1> \xA3\x5C |0
-<U03B2> \xA3\x5D |0
-<U03B3> \xA3\x5E |0
-<U03B4> \xA3\x5F |0
-<U03B5> \xA3\x60 |0
-<U03B6> \xA3\x61 |0
-<U03B7> \xA3\x62 |0
-<U03B8> \xA3\x63 |0
-<U03B9> \xA3\x64 |0
-<U03BA> \xA3\x65 |0
-<U03BB> \xA3\x66 |0
-<U03BC> \xA3\x67 |0
-<U03BD> \xA3\x68 |0
-<U03BE> \xA3\x69 |0
-<U03BF> \xA3\x6A |0
-<U03C0> \xA3\x6B |0
-<U03C1> \xA3\x6C |0
-<U03C3> \xA3\x6D |0
-<U03C4> \xA3\x6E |0
-<U03C5> \xA3\x6F |0
-<U03C6> \xA3\x70 |0
-<U03C7> \xA3\x71 |0
-<U03C8> \xA3\x72 |0
-<U03C9> \xA3\x73 |0
-<U2013> \xA1\x56 |0
-<U2014> \xA1\x58 |0
-<U2015> \xA2\x77 |1
-<U2016> \xA1\xFC |1
-<U2018> \xA1\xA5 |0
-<U2019> \xA1\xA6 |0
-<U201C> \xA1\xA7 |0
-<U201D> \xA1\xA8 |0
-<U2022> \xA1\x45 |1
-<U2024> \xA3\xBB |1
-<U2025> \xA1\x4C |0
-<U2026> \xA1\x4B |0
-<U2027> \xA1\x45 |0
-<U2032> \xA1\xAC |0
-<U2033> \xA1\xB2 |1
-<U2035> \xA1\xAB |0
-<U203B> \xA1\xB0 |0
-<U203E> \xA1\xC3 |1
-<U20AC> \xA3\xE1 |0
-<U2103> \xA2\x4A |0
-<U2105> \xA1\xC1 |0
-<U2109> \xA2\x4B |0
-<U2160> \xA2\xB9 |0
-<U2161> \xA2\xBA |0
-<U2162> \xA2\xBB |0
-<U2163> \xA2\xBC |0
-<U2164> \xA2\xBD |0
-<U2165> \xA2\xBE |0
-<U2166> \xA2\xBF |0
-<U2167> \xA2\xC0 |0
-<U2168> \xA2\xC1 |0
-<U2169> \xA2\xC2 |0
-<U2190> \xA1\xF6 |0
-<U2191> \xA1\xF4 |0
-<U2192> \xA1\xF7 |0
-<U2193> \xA1\xF5 |0
-<U2196> \xA1\xF8 |0
-<U2197> \xA1\xF9 |0
-<U2198> \xA1\xFB |0
-<U2199> \xA1\xFA |0
-<U2215> \xA2\x41 |0
-<U2216> \xA2\x42 |1
-<U2218> \xA2\x58 |1
-<U221A> \xA1\xD4 |0
-<U221E> \xA1\xDB |0
-<U221F> \xA1\xE8 |0
-<U2220> \xA1\xE7 |0
-<U2223> \xA1\xFD |0
-<U2225> \xA1\xFC |0
-<U2229> \xA1\xE4 |0
-<U222A> \xA1\xE5 |0
-<U222B> \xA1\xEC |0
-<U222E> \xA1\xED |0
-<U2234> \xA1\xEF |0
-<U2235> \xA1\xEE |0
-<U2252> \xA1\xDC |0
-<U2260> \xA1\xDA |0
-<U2261> \xA1\xDD |0
-<U2263> \xA1\xDD |1
-<U2266> \xA1\xD8 |0
-<U2267> \xA1\xD9 |0
-<U2295> \xA1\xF2 |0
-<U2299> \xA1\xF3 |0
-<U22A5> \xA1\xE6 |0
-<U22BF> \xA1\xE9 |0
-<U2307> \xA1\x5B |1
-<U2500> \xA2\x77 |0
-<U2502> \xA2\x78 |0
-<U250C> \xA2\x7A |0
-<U2510> \xA2\x7B |0
-<U2514> \xA2\x7C |0
-<U2518> \xA2\x7D |0
-<U251C> \xA2\x75 |0
-<U2524> \xA2\x74 |0
-<U252C> \xA2\x73 |0
-<U2534> \xA2\x72 |0
-<U253C> \xA2\x71 |0
-<U2550> \xF9\xF9 |0
-<U2550> \xA2\xA4 |3
-<U2551> \xF9\xF8 |0
-<U2552> \xF9\xE6 |0
-<U2553> \xF9\xEF |0
-<U2554> \xF9\xDD |0
-<U2555> \xF9\xE8 |0
-<U2556> \xF9\xF1 |0
-<U2557> \xF9\xDF |0
-<U2558> \xF9\xEC |0
-<U2559> \xF9\xF5 |0
-<U255A> \xF9\xE3 |0
-<U255B> \xF9\xEE |0
-<U255C> \xF9\xF7 |0
-<U255D> \xF9\xE5 |0
-<U255E> \xF9\xE9 |0
-<U255E> \xA2\xA5 |3
-<U255F> \xF9\xF2 |0
-<U2560> \xF9\xE0 |0
-<U2561> \xF9\xEB |0
-<U2561> \xA2\xA7 |3
-<U2562> \xF9\xF4 |0
-<U2563> \xF9\xE2 |0
-<U2564> \xF9\xE7 |0
-<U2565> \xF9\xF0 |0
-<U2566> \xF9\xDE |0
-<U2567> \xF9\xED |0
-<U2568> \xF9\xF6 |0
-<U2569> \xF9\xE4 |0
-<U256A> \xF9\xEA |0
-<U256A> \xA2\xA6 |3
-<U256B> \xF9\xF3 |0
-<U256C> \xF9\xE1 |0
-<U256D> \xA2\x7E |0
-<U256D> \xF9\xFA |3
-<U256E> \xA2\xA1 |0
-<U256E> \xF9\xFB |3
-<U256F> \xA2\xA3 |0
-<U256F> \xF9\xFD |3
-<U2570> \xA2\xA2 |0
-<U2570> \xF9\xFC |3
-<U2571> \xA2\xAC |0
-<U2572> \xA2\xAD |0
-<U2573> \xA2\xAE |0
-<U2574> \xA1\x5A |0
-<U2581> \xA2\x62 |0
-<U2582> \xA2\x63 |0
-<U2583> \xA2\x64 |0
-<U2584> \xA2\x65 |0
-<U2585> \xA2\x66 |0
-<U2586> \xA2\x67 |0
-<U2587> \xA2\x68 |0
-<U2588> \xA2\x69 |0
-<U2589> \xA2\x70 |0
-<U258A> \xA2\x6F |0
-<U258B> \xA2\x6E |0
-<U258C> \xA2\x6D |0
-<U258D> \xA2\x6C |0
-<U258E> \xA2\x6B |0
-<U258F> \xA2\x6A |0
-<U2593> \xF9\xFE |0
-<U2594> \xA2\x76 |0
-<U2595> \xA2\x79 |0
-<U25A0> \xA1\xBD |0
-<U25A1> \xA1\xBC |0
-<U25B2> \xA1\xB6 |0
-<U25B3> \xA1\xB5 |0
-<U25BC> \xA1\xBF |0
-<U25BD> \xA1\xBE |0
-<U25C6> \xA1\xBB |0
-<U25C7> \xA1\xBA |0
-<U25CB> \xA1\xB3 |0
-<U25CE> \xA1\xB7 |0
-<U25CF> \xA1\xB4 |0
-<U25E2> \xA2\xA8 |0
-<U25E3> \xA2\xA9 |0
-<U25E4> \xA2\xAB |0
-<U25E5> \xA2\xAA |0
-<U2605> \xA1\xB9 |0
-<U2606> \xA1\xB8 |0
-<U2609> \xA1\xF3 |1
-<U2640> \xA1\xF0 |0
-<U2641> \xA1\xF2 |1
-<U2642> \xA1\xF1 |0
-<U3000> \xA1\x40 |0
-<U3001> \xA1\x42 |0
-<U3002> \xA1\x43 |0
-<U3003> \xA1\xB2 |0
-<U3008> \xA1\x71 |0
-<U3009> \xA1\x72 |0
-<U300A> \xA1\x6D |0
-<U300B> \xA1\x6E |0
-<U300C> \xA1\x75 |0
-<U300D> \xA1\x76 |0
-<U300E> \xA1\x79 |0
-<U300F> \xA1\x7A |0
-<U3010> \xA1\x69 |0
-<U3011> \xA1\x6A |0
-<U3012> \xA2\x45 |0
-<U3014> \xA1\x65 |0
-<U3015> \xA1\x66 |0
-<U301C> \xA1\xE3 |1
-<U301D> \xA1\xA9 |0
-<U301E> \xA1\xAA |0
-<U3021> \xA2\xC3 |0
-<U3022> \xA2\xC4 |0
-<U3023> \xA2\xC5 |0
-<U3024> \xA2\xC6 |0
-<U3025> \xA2\xC7 |0
-<U3026> \xA2\xC8 |0
-<U3027> \xA2\xC9 |0
-<U3028> \xA2\xCA |0
-<U3029> \xA2\xCB |0
-<U3030> \xA1\xCA |1
-<U3105> \xA3\x74 |0
-<U3106> \xA3\x75 |0
-<U3107> \xA3\x76 |0
-<U3108> \xA3\x77 |0
-<U3109> \xA3\x78 |0
-<U310A> \xA3\x79 |0
-<U310B> \xA3\x7A |0
-<U310C> \xA3\x7B |0
-<U310D> \xA3\x7C |0
-<U310E> \xA3\x7D |0
-<U310F> \xA3\x7E |0
-<U3110> \xA3\xA1 |0
-<U3111> \xA3\xA2 |0
-<U3112> \xA3\xA3 |0
-<U3113> \xA3\xA4 |0
-<U3114> \xA3\xA5 |0
-<U3115> \xA3\xA6 |0
-<U3116> \xA3\xA7 |0
-<U3117> \xA3\xA8 |0
-<U3118> \xA3\xA9 |0
-<U3119> \xA3\xAA |0
-<U311A> \xA3\xAB |0
-<U311B> \xA3\xAC |0
-<U311C> \xA3\xAD |0
-<U311D> \xA3\xAE |0
-<U311E> \xA3\xAF |0
-<U311F> \xA3\xB0 |0
-<U3120> \xA3\xB1 |0
-<U3121> \xA3\xB2 |0
-<U3122> \xA3\xB3 |0
-<U3123> \xA3\xB4 |0
-<U3124> \xA3\xB5 |0
-<U3125> \xA3\xB6 |0
-<U3126> \xA3\xB7 |0
-<U3127> \xA3\xB8 |0
-<U3128> \xA3\xB9 |0
-<U3129> \xA3\xBA |0
-<U3192> \xA4\x40 |1
-<U3193> \xA4\x47 |1
-<U3194> \xA4\x54 |1
-<U3195> \xA5\x7C |1
-<U3196> \xA4\x57 |1
-<U3197> \xA4\xA4 |1
-<U3198> \xA4\x55 |1
-<U3199> \xA5\xD2 |1
-<U319A> \xA4\x41 |1
-<U319B> \xA4\xFE |1
-<U319C> \xA4\x42 |1
-<U319D> \xA4\xD1 |1
-<U319E> \xA6\x61 |1
-<U319F> \xA4\x48 |1
-<U3220> \xA4\x40 |1
-<U3221> \xA4\x47 |1
-<U3222> \xA4\x54 |1
-<U3223> \xA5\x7C |1
-<U3224> \xA4\xAD |1
-<U3225> \xA4\xBB |1
-<U3226> \xA4\x43 |1
-<U3227> \xA4\x4B |1
-<U3228> \xA4\x45 |1
-<U3229> \xA4\x51 |1
-<U322A> \xA4\xEB |1
-<U322B> \xA4\xF5 |1
-<U322C> \xA4\xF4 |1
-<U322D> \xA4\xEC |1
-<U322E> \xAA\xF7 |1
-<U322F> \xA4\x67 |1
-<U3230> \xA4\xE9 |1
-<U3231> \xAE\xE8 |1
-<U3232> \xA6\xB3 |1
-<U3233> \xAA\xC0 |1
-<U3234> \xA6\x57 |1
-<U3235> \xAF\x53 |1
-<U3236> \xB0\x5D |1
-<U3237> \xAF\xAC |1
-<U3238> \xB3\xD2 |1
-<U3239> \xA5\x4E |1
-<U323A> \xA9\x49 |1
-<U323B> \xBE\xC7 |1
-<U323C> \xBA\xCA |1
-<U323D> \xA5\xF8 |1
-<U323E> \xB8\xEA |1
-<U323F> \xA8\xF3 |1
-<U3240> \xB2\xBD |1
-<U3241> \xA5\xF0 |1
-<U3242> \xA6\xDB |1
-<U3243> \xA6\xDC |1
-<U3280> \xA4\x40 |1
-<U3281> \xA4\x47 |1
-<U3282> \xA4\x54 |1
-<U3283> \xA5\x7C |1
-<U3284> \xA4\xAD |1
-<U3285> \xA4\xBB |1
-<U3286> \xA4\x43 |1
-<U3287> \xA4\x4B |1
-<U3288> \xA4\x45 |1
-<U3289> \xA4\x51 |1
-<U328A> \xA4\xEB |1
-<U328B> \xA4\xF5 |1
-<U328C> \xA4\xF4 |1
-<U328D> \xA4\xEC |1
-<U328E> \xAA\xF7 |1
-<U328F> \xA4\x67 |1
-<U3290> \xA4\xE9 |1
-<U3291> \xAE\xE8 |1
-<U3292> \xA6\xB3 |1
-<U3293> \xAA\xC0 |1
-<U3294> \xA6\x57 |1
-<U3295> \xAF\x53 |1
-<U3296> \xB0\x5D |1
-<U3297> \xAF\xAC |1
-<U3298> \xB3\xD2 |1
-<U3299> \xAF\xB5 |1
-<U329A> \xA8\x6B |1
-<U329B> \xA4\x6B |1
-<U329C> \xBE\x41 |1
-<U329D> \xC0\x75 |1
-<U329E> \xA6\x4C |1
-<U329F> \xAA\x60 |1
-<U32A0> \xB6\xB5 |1
-<U32A1> \xA5\xF0 |1
-<U32A2> \xBC\x67 |1
-<U32A3> \xA1\xC0 |0
-<U32A4> \xA4\x57 |1
-<U32A5> \xA4\xA4 |1
-<U32A6> \xA4\x55 |1
-<U32A7> \xA5\xAA |1
-<U32A8> \xA5\x6B |1
-<U32A9> \xC2\xE5 |1
-<U32AA> \xA9\x76 |1
-<U32AB> \xBE\xC7 |1
-<U32AC> \xBA\xCA |1
-<U32AD> \xA5\xF8 |1
-<U32AE> \xB8\xEA |1
-<U32AF> \xA8\xF3 |1
-<U32B0> \xA9\x5D |1
-<U338E> \xA2\x55 |0
-<U338F> \xA2\x56 |0
-<U339C> \xA2\x50 |0
-<U339D> \xA2\x51 |0
-<U339E> \xA2\x52 |0
-<U33A1> \xA2\x54 |0
-<U33C4> \xA2\x57 |0
-<U33CE> \xA2\x53 |0
-<U33D1> \xA1\xEB |0
-<U33D2> \xA1\xEA |0
-<U33D5> \xA2\x4F |0
-<U4E00> \xA4\x40 |0
-<U4E01> \xA4\x42 |0
-<U4E03> \xA4\x43 |0
-<U4E07> \xC9\x45 |0
-<U4E08> \xA4\x56 |0
-<U4E09> \xA4\x54 |0
-<U4E0A> \xA4\x57 |0
-<U4E0B> \xA4\x55 |0
-<U4E0C> \xC9\x46 |0
-<U4E0D> \xA4\xA3 |0
-<U4E0E> \xC9\x4F |0
-<U4E0F> \xC9\x4D |0
-<U4E10> \xA4\xA2 |0
-<U4E11> \xA4\xA1 |0
-<U4E14> \xA5\x42 |0
-<U4E15> \xA5\x41 |0
-<U4E16> \xA5\x40 |0
-<U4E18> \xA5\x43 |0
-<U4E19> \xA4\xFE |0
-<U4E1E> \xA5\xE0 |0
-<U4E1F> \xA5\xE1 |0
-<U4E26> \xA8\xC3 |0
-<U4E2B> \xA4\x58 |0
-<U4E2D> \xA4\xA4 |0
-<U4E2E> \xC9\x50 |0
-<U4E30> \xA4\xA5 |0
-<U4E31> \xC9\x63 |0
-<U4E32> \xA6\xEA |0
-<U4E33> \xCB\xB1 |0
-<U4E38> \xA4\x59 |0
-<U4E39> \xA4\xA6 |0
-<U4E3B> \xA5\x44 |0
-<U4E3C> \xC9\x64 |0
-<U4E42> \xC9\x40 |0
-<U4E43> \xA4\x44 |0
-<U4E45> \xA4\x5B |0
-<U4E47> \xC9\x47 |0
-<U4E48> \xA4\x5C |0
-<U4E4B> \xA4\xA7 |0
-<U4E4D> \xA5\x45 |0
-<U4E4E> \xA5\x47 |0
-<U4E4F> \xA5\x46 |0
-<U4E52> \xA5\xE2 |0
-<U4E53> \xA5\xE3 |0
-<U4E56> \xA8\xC4 |0
-<U4E58> \xAD\xBC |0
-<U4E59> \xA4\x41 |0
-<U4E5C> \xC9\x41 |0
-<U4E5D> \xA4\x45 |0
-<U4E5E> \xA4\x5E |0
-<U4E5F> \xA4\x5D |0
-<U4E69> \xA5\xE4 |0
-<U4E73> \xA8\xC5 |0
-<U4E7E> \xB0\xAE |0
-<U4E7F> \xD4\x4B |0
-<U4E82> \xB6\xC3 |0
-<U4E83> \xDC\xB1 |0
-<U4E84> \xDC\xB2 |0
-<U4E86> \xA4\x46 |0
-<U4E88> \xA4\xA9 |0
-<U4E8B> \xA8\xC6 |0
-<U4E8C> \xA4\x47 |0
-<U4E8D> \xC9\x48 |0
-<U4E8E> \xA4\x5F |0
-<U4E91> \xA4\xAA |0
-<U4E92> \xA4\xAC |0
-<U4E93> \xC9\x51 |0
-<U4E94> \xA4\xAD |0
-<U4E95> \xA4\xAB |0
-<U4E99> \xA5\xE5 |0
-<U4E9B> \xA8\xC7 |0
-<U4E9E> \xA8\xC8 |0
-<U4E9F> \xAB\x45 |0
-<U4EA1> \xA4\x60 |0
-<U4EA2> \xA4\xAE |0
-<U4EA4> \xA5\xE6 |0
-<U4EA5> \xA5\xE8 |0
-<U4EA6> \xA5\xE7 |0
-<U4EA8> \xA6\xEB |0
-<U4EAB> \xA8\xC9 |0
-<U4EAC> \xA8\xCA |0
-<U4EAD> \xAB\x46 |0
-<U4EAE> \xAB\x47 |0
-<U4EB3> \xAD\xBD |0
-<U4EB6> \xDC\xB3 |0
-<U4EB9> \xF6\xD6 |0
-<U4EBA> \xA4\x48 |0
-<U4EC0> \xA4\xB0 |0
-<U4EC1> \xA4\xAF |0
-<U4EC2> \xC9\x52 |0
-<U4EC3> \xA4\xB1 |0
-<U4EC4> \xA4\xB7 |0
-<U4EC6> \xA4\xB2 |0
-<U4EC7> \xA4\xB3 |0
-<U4EC8> \xC9\x54 |0
-<U4EC9> \xC9\x53 |0
-<U4ECA> \xA4\xB5 |0
-<U4ECB> \xA4\xB6 |0
-<U4ECD> \xA4\xB4 |0
-<U4ED4> \xA5\x4A |0
-<U4ED5> \xA5\x4B |0
-<U4ED6> \xA5\x4C |0
-<U4ED7> \xA5\x4D |0
-<U4ED8> \xA5\x49 |0
-<U4ED9> \xA5\x50 |0
-<U4EDA> \xC9\x6A |0
-<U4EDC> \xC9\x66 |0
-<U4EDD> \xC9\x69 |0
-<U4EDE> \xA5\x51 |0
-<U4EDF> \xA5\x61 |0
-<U4EE1> \xC9\x68 |0
-<U4EE3> \xA5\x4E |0
-<U4EE4> \xA5\x4F |0
-<U4EE5> \xA5\x48 |0
-<U4EE8> \xC9\x65 |0
-<U4EE9> \xC9\x67 |0
-<U4EF0> \xA5\xF5 |0
-<U4EF1> \xC9\xB0 |0
-<U4EF2> \xA5\xF2 |0
-<U4EF3> \xA5\xF6 |0
-<U4EF4> \xC9\xBA |0
-<U4EF5> \xC9\xAE |0
-<U4EF6> \xA5\xF3 |0
-<U4EF7> \xC9\xB2 |0
-<U4EFB> \xA5\xF4 |0
-<U4EFD> \xA5\xF7 |0
-<U4EFF> \xA5\xE9 |0
-<U4F00> \xC9\xB1 |0
-<U4F01> \xA5\xF8 |0
-<U4F02> \xC9\xB5 |0
-<U4F04> \xC9\xB9 |0
-<U4F05> \xC9\xB6 |0
-<U4F08> \xC9\xB3 |0
-<U4F09> \xA5\xEA |0
-<U4F0A> \xA5\xEC |0
-<U4F0B> \xA5\xF9 |0
-<U4F0D> \xA5\xEE |0
-<U4F0E> \xC9\xAB |0
-<U4F0F> \xA5\xF1 |0
-<U4F10> \xA5\xEF |0
-<U4F11> \xA5\xF0 |0
-<U4F12> \xC9\xBB |0
-<U4F13> \xC9\xB8 |0
-<U4F14> \xC9\xAF |0
-<U4F15> \xA5\xED |0
-<U4F18> \xC9\xAC |0
-<U4F19> \xA5\xEB |0
-<U4F1D> \xC9\xB4 |0
-<U4F22> \xC9\xB7 |0
-<U4F2C> \xC9\xAD |0
-<U4F2D> \xCA\x66 |0
-<U4F2F> \xA7\x42 |0
-<U4F30> \xA6\xF4 |0
-<U4F33> \xCA\x67 |0
-<U4F34> \xA6\xF1 |0
-<U4F36> \xA7\x44 |0
-<U4F38> \xA6\xF9 |0
-<U4F3A> \xA6\xF8 |0
-<U4F3B> \xCA\x5B |0
-<U4F3C> \xA6\xFC |0
-<U4F3D> \xA6\xF7 |0
-<U4F3E> \xCA\x60 |0
-<U4F3F> \xCA\x68 |0
-<U4F41> \xCA\x64 |0
-<U4F43> \xA6\xFA |0
-<U4F46> \xA6\xFD |0
-<U4F47> \xA6\xEE |0
-<U4F48> \xA7\x47 |0
-<U4F49> \xCA\x5D |0
-<U4F4C> \xCB\xBD |0
-<U4F4D> \xA6\xEC |0
-<U4F4E> \xA7\x43 |0
-<U4F4F> \xA6\xED |0
-<U4F50> \xA6\xF5 |0
-<U4F51> \xA6\xF6 |0
-<U4F52> \xCA\x62 |0
-<U4F53> \xCA\x5E |0
-<U4F54> \xA6\xFB |0
-<U4F55> \xA6\xF3 |0
-<U4F56> \xCA\x5A |0
-<U4F57> \xA6\xEF |0
-<U4F58> \xCA\x65 |0
-<U4F59> \xA7\x45 |0
-<U4F5A> \xA7\x48 |0
-<U4F5B> \xA6\xF2 |0
-<U4F5C> \xA7\x40 |0
-<U4F5D> \xA7\x46 |0
-<U4F5E> \xA6\xF0 |0
-<U4F5F> \xCA\x63 |0
-<U4F60> \xA7\x41 |0
-<U4F61> \xCA\x69 |0
-<U4F62> \xCA\x5C |0
-<U4F63> \xA6\xFE |0
-<U4F64> \xCA\x5F |0
-<U4F67> \xCA\x61 |0
-<U4F69> \xA8\xD8 |0
-<U4F6A> \xCB\xBF |0
-<U4F6B> \xCB\xCB |0
-<U4F6C> \xA8\xD0 |0
-<U4F6E> \xCB\xCC |0
-<U4F6F> \xA8\xCB |0
-<U4F70> \xA8\xD5 |0
-<U4F73> \xA8\xCE |0
-<U4F74> \xCB\xB9 |0
-<U4F75> \xA8\xD6 |0
-<U4F76> \xCB\xB8 |0
-<U4F77> \xCB\xBC |0
-<U4F78> \xCB\xC3 |0
-<U4F79> \xCB\xC1 |0
-<U4F7A> \xA8\xDE |0
-<U4F7B> \xA8\xD9 |0
-<U4F7C> \xCB\xB3 |0
-<U4F7D> \xCB\xB5 |0
-<U4F7E> \xA8\xDB |0
-<U4F7F> \xA8\xCF |0
-<U4F80> \xCB\xB6 |0
-<U4F81> \xCB\xC2 |0
-<U4F82> \xCB\xC9 |0
-<U4F83> \xA8\xD4 |0
-<U4F84> \xCB\xBB |0
-<U4F85> \xCB\xB4 |0
-<U4F86> \xA8\xD3 |0
-<U4F87> \xCB\xB7 |0
-<U4F88> \xA8\xD7 |0
-<U4F89> \xCB\xBA |0
-<U4F8B> \xA8\xD2 |0
-<U4F8D> \xA8\xCD |0
-<U4F8F> \xA8\xDC |0
-<U4F90> \xCB\xC4 |0
-<U4F91> \xA8\xDD |0
-<U4F92> \xCB\xC8 |0
-<U4F94> \xCB\xC6 |0
-<U4F95> \xCB\xCA |0
-<U4F96> \xA8\xDA |0
-<U4F97> \xCB\xBE |0
-<U4F98> \xCB\xB2 |0
-<U4F9A> \xCB\xC0 |0
-<U4F9B> \xA8\xD1 |0
-<U4F9C> \xCB\xC5 |0
-<U4F9D> \xA8\xCC |0
-<U4F9E> \xCB\xC7 |0
-<U4FAE> \xAB\x56 |0
-<U4FAF> \xAB\x4A |0
-<U4FB2> \xCD\xE0 |0
-<U4FB3> \xCD\xE8 |0
-<U4FB5> \xAB\x49 |0
-<U4FB6> \xAB\x51 |0
-<U4FB7> \xAB\x5D |0
-<U4FB9> \xCD\xEE |0
-<U4FBA> \xCD\xEC |0
-<U4FBB> \xCD\xE7 |0
-<U4FBF> \xAB\x4B |0
-<U4FC0> \xCD\xED |0
-<U4FC1> \xCD\xE3 |0
-<U4FC2> \xAB\x59 |0
-<U4FC3> \xAB\x50 |0
-<U4FC4> \xAB\x58 |0
-<U4FC5> \xCD\xDE |0
-<U4FC7> \xCD\xEA |0
-<U4FC9> \xCD\xE1 |0
-<U4FCA> \xAB\x54 |0
-<U4FCB> \xCD\xE2 |0
-<U4FCD> \xCD\xDD |0
-<U4FCE> \xAB\x5B |0
-<U4FCF> \xAB\x4E |0
-<U4FD0> \xAB\x57 |0
-<U4FD1> \xAB\x4D |0
-<U4FD3> \xCD\xDF |0
-<U4FD4> \xCD\xE4 |0
-<U4FD6> \xCD\xEB |0
-<U4FD7> \xAB\x55 |0
-<U4FD8> \xAB\x52 |0
-<U4FD9> \xCD\xE6 |0
-<U4FDA> \xAB\x5A |0
-<U4FDB> \xCD\xE9 |0
-<U4FDC> \xCD\xE5 |0
-<U4FDD> \xAB\x4F |0
-<U4FDE> \xAB\x5C |0
-<U4FDF> \xAB\x53 |0
-<U4FE0> \xAB\x4C |0
-<U4FE1> \xAB\x48 |0
-<U4FEC> \xCD\xEF |0
-<U4FEE> \xAD\xD7 |0
-<U4FEF> \xAD\xC1 |0
-<U4FF1> \xAD\xD1 |0
-<U4FF3> \xAD\xD6 |0
-<U4FF4> \xD0\xD0 |0
-<U4FF5> \xD0\xCF |0
-<U4FF6> \xD0\xD4 |0
-<U4FF7> \xD0\xD5 |0
-<U4FF8> \xAD\xC4 |0
-<U4FFA> \xAD\xCD |0
-<U4FFE> \xAD\xDA |0
-<U5000> \xAD\xCE |0
-<U5005> \xD0\xC9 |0
-<U5006> \xAD\xC7 |0
-<U5007> \xD0\xCA |0
-<U5009> \xAD\xDC |0
-<U500B> \xAD\xD3 |0
-<U500C> \xAD\xBE |0
-<U500D> \xAD\xBF |0
-<U500E> \xD0\xDD |0
-<U500F> \xB0\xBF |0
-<U5011> \xAD\xCC |0
-<U5012> \xAD\xCB |0
-<U5013> \xD0\xCB |0
-<U5014> \xAD\xCF |0
-<U5015> \xD4\x5B |0
-<U5016> \xAD\xC6 |0
-<U5017> \xD0\xD6 |0
-<U5018> \xAD\xD5 |0
-<U5019> \xAD\xD4 |0
-<U501A> \xAD\xCA |0
-<U501B> \xD0\xCE |0
-<U501C> \xD0\xD7 |0
-<U501E> \xD0\xC8 |0
-<U501F> \xAD\xC9 |0
-<U5020> \xD0\xD8 |0
-<U5021> \xAD\xD2 |0
-<U5022> \xD0\xCC |0
-<U5023> \xAD\xC0 |0
-<U5025> \xAD\xC3 |0
-<U5026> \xAD\xC2 |0
-<U5027> \xD0\xD9 |0
-<U5028> \xAD\xD0 |0
-<U5029> \xAD\xC5 |0
-<U502A> \xAD\xD9 |0
-<U502B> \xAD\xDB |0
-<U502C> \xD0\xD3 |0
-<U502D> \xAD\xD8 |0
-<U502F> \xD0\xDB |0
-<U5030> \xD0\xCD |0
-<U5031> \xD0\xDC |0
-<U5033> \xD0\xD1 |0
-<U5035> \xD0\xDA |0
-<U5037> \xD0\xD2 |0
-<U503C> \xAD\xC8 |0
-<U5040> \xD4\x63 |0
-<U5041> \xD4\x57 |0
-<U5043> \xB0\xB3 |0
-<U5045> \xD4\x5C |0
-<U5046> \xD4\x62 |0
-<U5047> \xB0\xB2 |0
-<U5048> \xD4\x55 |0
-<U5049> \xB0\xB6 |0
-<U504A> \xD4\x59 |0
-<U504B> \xD4\x52 |0
-<U504C> \xB0\xB4 |0
-<U504D> \xD4\x56 |0
-<U504E> \xB0\xB9 |0
-<U504F> \xB0\xBE |0
-<U5051> \xD4\x67 |0
-<U5053> \xD4\x51 |0
-<U5055> \xB0\xBA |0
-<U5057> \xD4\x66 |0
-<U505A> \xB0\xB5 |0
-<U505B> \xD4\x58 |0
-<U505C> \xB0\xB1 |0
-<U505D> \xD4\x53 |0
-<U505E> \xD4\x4F |0
-<U505F> \xD4\x5D |0
-<U5060> \xD4\x50 |0
-<U5061> \xD4\x4E |0
-<U5062> \xD4\x5A |0
-<U5063> \xD4\x60 |0
-<U5064> \xD4\x61 |0
-<U5065> \xB0\xB7 |0
-<U5068> \xD8\x5B |0
-<U5069> \xD4\x5E |0
-<U506A> \xD4\x4D |0
-<U506B> \xD4\x5F |0
-<U506D> \xB0\xC1 |0
-<U506E> \xD4\x64 |0
-<U506F> \xB0\xC0 |0
-<U5070> \xD4\x4C |0
-<U5072> \xD4\x54 |0
-<U5073> \xD4\x65 |0
-<U5074> \xB0\xBC |0
-<U5075> \xB0\xBB |0
-<U5076> \xB0\xB8 |0
-<U5077> \xB0\xBD |0
-<U507A> \xB0\xAF |0
-<U507D> \xB0\xB0 |0
-<U5080> \xB3\xC8 |0
-<U5082> \xD8\x5E |0
-<U5083> \xD8\x57 |0
-<U5085> \xB3\xC5 |0
-<U5087> \xD8\x5F |0
-<U508B> \xD8\x55 |0
-<U508C> \xD8\x58 |0
-<U508D> \xB3\xC4 |0
-<U508E> \xD8\x59 |0
-<U5091> \xB3\xC7 |0
-<U5092> \xD8\x5D |0
-<U5094> \xD8\x53 |0
-<U5095> \xD8\x52 |0
-<U5096> \xB3\xC9 |0
-<U5098> \xB3\xCA |0
-<U5099> \xB3\xC6 |0
-<U509A> \xB3\xCB |0
-<U509B> \xD8\x51 |0
-<U509C> \xD8\x5C |0
-<U509D> \xD8\x5A |0
-<U509E> \xD8\x54 |0
-<U50A2> \xB3\xC3 |0
-<U50A3> \xD8\x56 |0
-<U50AC> \xB6\xCA |0
-<U50AD> \xB6\xC4 |0
-<U50AE> \xDC\xB7 |0
-<U50AF> \xB6\xCD |0
-<U50B0> \xDC\xBD |0
-<U50B1> \xDC\xC0 |0
-<U50B2> \xB6\xC6 |0
-<U50B3> \xB6\xC7 |0
-<U50B4> \xDC\xBA |0
-<U50B5> \xB6\xC5 |0
-<U50B6> \xDC\xC3 |0
-<U50B7> \xB6\xCB |0
-<U50B8> \xDC\xC4 |0
-<U50BA> \xDC\xBF |0
-<U50BB> \xB6\xCC |0
-<U50BD> \xDC\xB4 |0
-<U50BE> \xB6\xC9 |0
-<U50BF> \xDC\xB5 |0
-<U50C1> \xDC\xBE |0
-<U50C2> \xDC\xBC |0
-<U50C4> \xDC\xB8 |0
-<U50C5> \xB6\xC8 |0
-<U50C6> \xDC\xB6 |0
-<U50C7> \xB6\xCE |0
-<U50C8> \xDC\xBB |0
-<U50C9> \xDC\xC2 |0
-<U50CA> \xDC\xB9 |0
-<U50CB> \xDC\xC1 |0
-<U50CE> \xB9\xB6 |0
-<U50CF> \xB9\xB3 |0
-<U50D1> \xB9\xB4 |0
-<U50D3> \xE0\xF9 |0
-<U50D4> \xE0\xF1 |0
-<U50D5> \xB9\xB2 |0
-<U50D6> \xB9\xAF |0
-<U50D7> \xE0\xF2 |0
-<U50DA> \xB9\xB1 |0
-<U50DB> \xE0\xF5 |0
-<U50DD> \xE0\xF7 |0
-<U50E0> \xE0\xFE |0
-<U50E3> \xE0\xFD |0
-<U50E4> \xE0\xF8 |0
-<U50E5> \xB9\xAE |0
-<U50E6> \xE0\xF0 |0
-<U50E7> \xB9\xAC |0
-<U50E8> \xE0\xF3 |0
-<U50E9> \xB9\xB7 |0
-<U50EA> \xE0\xF6 |0
-<U50EC> \xE0\xFA |0
-<U50ED> \xB9\xB0 |0
-<U50EE> \xB9\xAD |0
-<U50EF> \xE0\xFC |0
-<U50F0> \xE0\xFB |0
-<U50F1> \xB9\xB5 |0
-<U50F3> \xE0\xF4 |0
-<U50F5> \xBB\xF8 |0
-<U50F6> \xE4\xEC |0
-<U50F8> \xE4\xE9 |0
-<U50F9> \xBB\xF9 |0
-<U50FB> \xBB\xF7 |0
-<U50FD> \xE4\xF0 |0
-<U50FE> \xE4\xED |0
-<U50FF> \xE4\xE6 |0
-<U5100> \xBB\xF6 |0
-<U5102> \xBB\xFA |0
-<U5103> \xE4\xE7 |0
-<U5104> \xBB\xF5 |0
-<U5105> \xBB\xFD |0
-<U5106> \xE4\xEA |0
-<U5107> \xE4\xEB |0
-<U5108> \xBB\xFB |0
-<U5109> \xBB\xFC |0
-<U510A> \xE4\xF1 |0
-<U510B> \xE4\xEE |0
-<U510C> \xE4\xEF |0
-<U5110> \xBE\xAA |0
-<U5111> \xE8\xF8 |0
-<U5112> \xBE\xA7 |0
-<U5113> \xE8\xF5 |0
-<U5114> \xBE\xA9 |0
-<U5115> \xBE\xAB |0
-<U5117> \xE8\xF6 |0
-<U5118> \xBE\xA8 |0
-<U511A> \xE8\xF7 |0
-<U511C> \xE8\xF4 |0
-<U511F> \xC0\x76 |0
-<U5120> \xEC\xBD |0
-<U5121> \xC0\x77 |0
-<U5122> \xEC\xBB |0
-<U5124> \xEC\xBC |0
-<U5125> \xEC\xBA |0
-<U5126> \xEC\xB9 |0
-<U5129> \xEC\xBE |0
-<U512A> \xC0\x75 |0
-<U512D> \xEF\xB8 |0
-<U512E> \xEF\xB9 |0
-<U5130> \xE4\xE8 |0
-<U5131> \xEF\xB7 |0
-<U5132> \xC0\x78 |0
-<U5133> \xC3\x5F |0
-<U5134> \xF1\xEB |0
-<U5135> \xF1\xEC |0
-<U5137> \xC4\xD7 |0
-<U5138> \xC4\xD8 |0
-<U5139> \xF5\xC1 |0
-<U513A> \xF5\xC0 |0
-<U513B> \xC5\x6C |0
-<U513C> \xC5\x6B |0
-<U513D> \xF7\xD0 |0
-<U513F> \xA4\x49 |0
-<U5140> \xA4\x61 |0
-<U5141> \xA4\xB9 |0
-<U5143> \xA4\xB8 |0
-<U5144> \xA5\x53 |0
-<U5145> \xA5\x52 |0
-<U5146> \xA5\xFC |0
-<U5147> \xA5\xFB |0
-<U5148> \xA5\xFD |0
-<U5149> \xA5\xFA |0
-<U514B> \xA7\x4A |0
-<U514C> \xA7\x49 |0
-<U514D> \xA7\x4B |0
-<U5152> \xA8\xE0 |0
-<U5154> \xA8\xDF |0
-<U5155> \xA8\xE1 |0
-<U5157> \xAB\x5E |0
-<U5159> \xA2\x59 |0
-<U515A> \xD0\xDE |0
-<U515B> \xA2\x5A |0
-<U515C> \xB0\xC2 |0
-<U515D> \xA2\x5C |0
-<U515E> \xA2\x5B |0
-<U515F> \xD8\x60 |0
-<U5161> \xA2\x5D |0
-<U5162> \xB9\xB8 |0
-<U5163> \xA2\x5E |0
-<U5165> \xA4\x4A |0
-<U5167> \xA4\xBA |0
-<U5168> \xA5\xFE |0
-<U5169> \xA8\xE2 |0
-<U516B> \xA4\x4B |0
-<U516C> \xA4\xBD |0
-<U516D> \xA4\xBB |0
-<U516E> \xA4\xBC |0
-<U5171> \xA6\x40 |0
-<U5175> \xA7\x4C |0
-<U5176> \xA8\xE4 |0
-<U5177> \xA8\xE3 |0
-<U5178> \xA8\xE5 |0
-<U517C> \xAD\xDD |0
-<U5180> \xBE\xAC |0
-<U5187> \xC9\x4E |0
-<U5189> \xA5\x54 |0
-<U518A> \xA5\x55 |0
-<U518D> \xA6\x41 |0
-<U518F> \xCA\x6A |0
-<U5191> \xAB\x60 |0
-<U5192> \xAB\x5F |0
-<U5193> \xD0\xE0 |0
-<U5194> \xD0\xDF |0
-<U5195> \xB0\xC3 |0
-<U5197> \xA4\xBE |0
-<U5198> \xC9\x55 |0
-<U519E> \xCB\xCD |0
-<U51A0> \xAB\x61 |0
-<U51A2> \xAD\xE0 |0
-<U51A4> \xAD\xDE |0
-<U51A5> \xAD\xDF |0
-<U51AA> \xBE\xAD |0
-<U51AC> \xA5\x56 |0
-<U51B0> \xA6\x42 |0
-<U51B1> \xC9\xBC |0
-<U51B6> \xA7\x4D |0
-<U51B7> \xA7\x4E |0
-<U51B9> \xCA\x6B |0
-<U51BC> \xCB\xCE |0
-<U51BD> \xA8\xE6 |0
-<U51BE> \xCB\xCF |0
-<U51C4> \xD0\xE2 |0
-<U51C5> \xD0\xE3 |0
-<U51C6> \xAD\xE3 |0
-<U51C8> \xD0\xE4 |0
-<U51CA> \xD0\xE1 |0
-<U51CB> \xAD\xE4 |0
-<U51CC> \xAD\xE2 |0
-<U51CD> \xAD\xE1 |0
-<U51CE> \xD0\xE5 |0
-<U51D0> \xD4\x68 |0
-<U51D4> \xD8\x61 |0
-<U51D7> \xDC\xC5 |0
-<U51D8> \xE1\x40 |0
-<U51DC> \xBB\xFE |0
-<U51DD> \xBE\xAE |0
-<U51DE> \xE8\xF9 |0
-<U51E0> \xA4\x4C |0
-<U51E1> \xA4\x5A |0
-<U51F0> \xB0\xC4 |0
-<U51F1> \xB3\xCD |0
-<U51F3> \xB9\xB9 |0
-<U51F5> \xC9\x42 |0
-<U51F6> \xA4\xBF |0
-<U51F8> \xA5\x59 |0
-<U51F9> \xA5\x57 |0
-<U51FA> \xA5\x58 |0
-<U51FD> \xA8\xE7 |0
-<U5200> \xA4\x4D |0
-<U5201> \xA4\x4E |0
-<U5203> \xA4\x62 |0
-<U5206> \xA4\xC0 |0
-<U5207> \xA4\xC1 |0
-<U5208> \xA4\xC2 |0
-<U5209> \xC9\xBE |0
-<U520A> \xA5\x5A |0
-<U520C> \xC9\x6B |0
-<U520E> \xA6\x46 |0
-<U5210> \xC9\xBF |0
-<U5211> \xA6\x44 |0
-<U5212> \xA6\x45 |0
-<U5213> \xC9\xBD |0
-<U5216> \xA6\x47 |0
-<U5217> \xA6\x43 |0
-<U521C> \xCA\x6C |0
-<U521D> \xAA\xEC |0
-<U521E> \xCA\x6D |0
-<U5221> \xCA\x6E |0
-<U5224> \xA7\x50 |0
-<U5225> \xA7\x4F |0
-<U5228> \xA7\x53 |0
-<U5229> \xA7\x51 |0
-<U522A> \xA7\x52 |0
-<U522E> \xA8\xED |0
-<U5230> \xA8\xEC |0
-<U5231> \xCB\xD4 |0
-<U5232> \xCB\xD1 |0
-<U5233> \xCB\xD2 |0
-<U5235> \xCB\xD0 |0
-<U5236> \xA8\xEE |0
-<U5237> \xA8\xEA |0
-<U5238> \xA8\xE9 |0
-<U523A> \xA8\xEB |0
-<U523B> \xA8\xE8 |0
-<U5241> \xA8\xEF |0
-<U5243> \xAB\x63 |0
-<U5244> \xCD\xF0 |0
-<U5246> \xCB\xD3 |0
-<U5247> \xAB\x68 |0
-<U5249> \xCD\xF1 |0
-<U524A> \xAB\x64 |0
-<U524B> \xAB\x67 |0
-<U524C> \xAB\x66 |0
-<U524D> \xAB\x65 |0
-<U524E> \xAB\x62 |0
-<U5252> \xD0\xE8 |0
-<U5254> \xAD\xE7 |0
-<U5255> \xD0\xEB |0
-<U5256> \xAD\xE5 |0
-<U525A> \xD0\xE7 |0
-<U525B> \xAD\xE8 |0
-<U525C> \xAD\xE6 |0
-<U525D> \xAD\xE9 |0
-<U525E> \xD0\xE9 |0
-<U525F> \xD0\xEA |0
-<U5261> \xD0\xE6 |0
-<U5262> \xD0\xEC |0
-<U5269> \xB3\xD1 |0
-<U526A> \xB0\xC5 |0
-<U526B> \xD4\x69 |0
-<U526C> \xD4\x6B |0
-<U526D> \xD4\x6A |0
-<U526E> \xD4\x6C |0
-<U526F> \xB0\xC6 |0
-<U5272> \xB3\xCE |0
-<U5274> \xB3\xCF |0
-<U5275> \xB3\xD0 |0
-<U5277> \xB6\xD0 |0
-<U5278> \xDC\xC7 |0
-<U527A> \xDC\xC6 |0
-<U527B> \xDC\xC8 |0
-<U527C> \xDC\xC9 |0
-<U527D> \xB6\xD1 |0
-<U527F> \xB6\xCF |0
-<U5280> \xE1\x41 |0
-<U5281> \xE1\x42 |0
-<U5282> \xB9\xBB |0
-<U5283> \xB9\xBA |0
-<U5284> \xE3\x5A |0
-<U5287> \xBC\x40 |0
-<U5288> \xBC\x41 |0
-<U5289> \xBC\x42 |0
-<U528A> \xBC\x44 |0
-<U528B> \xE4\xF2 |0
-<U528C> \xE4\xF3 |0
-<U528D> \xBC\x43 |0
-<U5291> \xBE\xAF |0
-<U5293> \xBE\xB0 |0
-<U5296> \xF1\xED |0
-<U5297> \xF5\xC3 |0
-<U5298> \xF5\xC2 |0
-<U5299> \xF7\xD1 |0
-<U529B> \xA4\x4F |0
-<U529F> \xA5\x5C |0
-<U52A0> \xA5\x5B |0
-<U52A3> \xA6\x48 |0
-<U52A6> \xC9\xC0 |0
-<U52A9> \xA7\x55 |0
-<U52AA> \xA7\x56 |0
-<U52AB> \xA7\x54 |0
-<U52AC> \xA7\x57 |0
-<U52AD> \xCA\x6F |0
-<U52AE> \xCA\x70 |0
-<U52BB> \xA8\xF1 |0
-<U52BC> \xCB\xD5 |0
-<U52BE> \xA8\xF0 |0
-<U52C0> \xCD\xF2 |0
-<U52C1> \xAB\x6C |0
-<U52C2> \xCD\xF3 |0
-<U52C3> \xAB\x6B |0
-<U52C7> \xAB\x69 |0
-<U52C9> \xAB\x6A |0
-<U52CD> \xD0\xED |0
-<U52D2> \xB0\xC7 |0
-<U52D3> \xD4\x6E |0
-<U52D5> \xB0\xCA |0
-<U52D6> \xD4\x6D |0
-<U52D7> \xB1\xE5 |0
-<U52D8> \xB0\xC9 |0
-<U52D9> \xB0\xC8 |0
-<U52DB> \xB3\xD4 |0
-<U52DD> \xB3\xD3 |0
-<U52DE> \xB3\xD2 |0
-<U52DF> \xB6\xD2 |0
-<U52E2> \xB6\xD5 |0
-<U52E3> \xB6\xD6 |0
-<U52E4> \xB6\xD4 |0
-<U52E6> \xB6\xD3 |0
-<U52E9> \xE1\x43 |0
-<U52EB> \xE1\x44 |0
-<U52EF> \xE4\xF5 |0
-<U52F0> \xBC\x45 |0
-<U52F1> \xE4\xF4 |0
-<U52F3> \xBE\xB1 |0
-<U52F4> \xEC\xBF |0
-<U52F5> \xC0\x79 |0
-<U52F7> \xF1\xEE |0
-<U52F8> \xC4\x55 |0
-<U52FA> \xA4\x63 |0
-<U52FB> \xA4\xC3 |0
-<U52FC> \xC9\x56 |0
-<U52FE> \xA4\xC4 |0
-<U52FF> \xA4\xC5 |0
-<U5305> \xA5\x5D |0
-<U5306> \xA5\x5E |0
-<U5308> \xA6\x49 |0
-<U5309> \xCA\x71 |0
-<U530A> \xCB\xD6 |0
-<U530B> \xCB\xD7 |0
-<U530D> \xAB\x6D |0
-<U530E> \xD0\xEE |0
-<U530F> \xB0\xCC |0
-<U5310> \xB0\xCB |0
-<U5311> \xD8\x63 |0
-<U5312> \xD8\x62 |0
-<U5315> \xA4\x50 |0
-<U5316> \xA4\xC6 |0
-<U5317> \xA5\x5F |0
-<U5319> \xB0\xCD |0
-<U531A> \xC9\x43 |0
-<U531C> \xC9\x6C |0
-<U531D> \xA5\x60 |0
-<U531F> \xC9\xC2 |0
-<U5320> \xA6\x4B |0
-<U5321> \xA6\x4A |0
-<U5322> \xC9\xC1 |0
-<U5323> \xA7\x58 |0
-<U532A> \xAD\xEA |0
-<U532D> \xD4\x6F |0
-<U532F> \xB6\xD7 |0
-<U5330> \xE1\x45 |0
-<U5331> \xB9\xBC |0
-<U5334> \xE8\xFA |0
-<U5337> \xF3\xFD |0
-<U5339> \xA4\xC7 |0
-<U533C> \xCB\xD8 |0
-<U533D> \xCD\xF4 |0
-<U533E> \xB0\xD0 |0
-<U533F> \xB0\xCE |0
-<U5340> \xB0\xCF |0
-<U5341> \xA4\x51 |0
-<U5341> \xA2\xCC |3
-<U5343> \xA4\x64 |0
-<U5344> \xA2\xCD |0
-<U5345> \xA4\xCA |0
-<U5345> \xA2\xCE |3
-<U5347> \xA4\xC9 |0
-<U5348> \xA4\xC8 |0
-<U5349> \xA5\x63 |0
-<U534A> \xA5\x62 |0
-<U534C> \xC9\x6D |0
-<U534D> \xC9\xC3 |0
-<U5351> \xA8\xF5 |0
-<U5352> \xA8\xF2 |0
-<U5353> \xA8\xF4 |0
-<U5354> \xA8\xF3 |0
-<U5357> \xAB\x6E |0
-<U535A> \xB3\xD5 |0
-<U535C> \xA4\x52 |0
-<U535E> \xA4\xCB |0
-<U5360> \xA5\x65 |0
-<U5361> \xA5\x64 |0
-<U5363> \xCA\x72 |0
-<U5366> \xA8\xF6 |0
-<U536C> \xC9\x57 |0
-<U536E> \xA5\x67 |0
-<U536F> \xA5\x66 |0
-<U5370> \xA6\x4C |0
-<U5371> \xA6\x4D |0
-<U5372> \xCA\x73 |0
-<U5373> \xA7\x59 |0
-<U5375> \xA7\x5A |0
-<U5377> \xA8\xF7 |0
-<U5378> \xA8\xF8 |0
-<U5379> \xA8\xF9 |0
-<U537B> \xAB\x6F |0
-<U537C> \xCD\xF5 |0
-<U537F> \xAD\xEB |0
-<U5382> \xC9\x44 |0
-<U5384> \xA4\xCC |0
-<U538A> \xC9\xC4 |0
-<U538E> \xCA\x74 |0
-<U538F> \xCA\x75 |0
-<U5392> \xCB\xD9 |0
-<U5394> \xCB\xDA |0
-<U5396> \xCD\xF7 |0
-<U5397> \xCD\xF6 |0
-<U5398> \xCD\xF9 |0
-<U5399> \xCD\xF8 |0
-<U539A> \xAB\x70 |0
-<U539C> \xD4\x70 |0
-<U539D> \xAD\xED |0
-<U539E> \xD0\xEF |0
-<U539F> \xAD\xEC |0
-<U53A4> \xD8\x64 |0
-<U53A5> \xB3\xD6 |0
-<U53A7> \xD8\x65 |0
-<U53AC> \xE1\x46 |0
-<U53AD> \xB9\xBD |0
-<U53B2> \xBC\x46 |0
-<U53B4> \xF1\xEF |0
-<U53B9> \xC9\x58 |0
-<U53BB> \xA5\x68 |0
-<U53C3> \xB0\xD1 |0
-<U53C8> \xA4\x53 |0
-<U53C9> \xA4\x65 |0
-<U53CA> \xA4\xCE |0
-<U53CB> \xA4\xCD |0
-<U53CD> \xA4\xCF |0
-<U53D4> \xA8\xFB |0
-<U53D6> \xA8\xFA |0
-<U53D7> \xA8\xFC |0
-<U53DB> \xAB\x71 |0
-<U53DF> \xAD\xEE |0
-<U53E1> \xE8\xFB |0
-<U53E2> \xC2\x4F |0
-<U53E3> \xA4\x66 |0
-<U53E4> \xA5\x6A |0
-<U53E5> \xA5\x79 |0
-<U53E6> \xA5\x74 |0
-<U53E8> \xA5\x6F |0
-<U53E9> \xA5\x6E |0
-<U53EA> \xA5\x75 |0
-<U53EB> \xA5\x73 |0
-<U53EC> \xA5\x6C |0
-<U53ED> \xA5\x7A |0
-<U53EE> \xA5\x6D |0
-<U53EF> \xA5\x69 |0
-<U53F0> \xA5\x78 |0
-<U53F1> \xA5\x77 |0
-<U53F2> \xA5\x76 |0
-<U53F3> \xA5\x6B |0
-<U53F5> \xA5\x72 |0
-<U53F8> \xA5\x71 |0
-<U53FB> \xA5\x7B |0
-<U53FC> \xA5\x70 |0
-<U5401> \xA6\x53 |0
-<U5403> \xA6\x59 |0
-<U5404> \xA6\x55 |0
-<U5406> \xA6\x5B |0
-<U5407> \xC9\xC5 |0
-<U5408> \xA6\x58 |0
-<U5409> \xA6\x4E |0
-<U540A> \xA6\x51 |0
-<U540B> \xA6\x54 |0
-<U540C> \xA6\x50 |0
-<U540D> \xA6\x57 |0
-<U540E> \xA6\x5A |0
-<U540F> \xA6\x4F |0
-<U5410> \xA6\x52 |0
-<U5411> \xA6\x56 |0
-<U5412> \xA6\x5C |0
-<U5418> \xCA\x7E |0
-<U5419> \xCA\x7B |0
-<U541B> \xA7\x67 |0
-<U541C> \xCA\x7C |0
-<U541D> \xA7\x5B |0
-<U541E> \xA7\x5D |0
-<U541F> \xA7\x75 |0
-<U5420> \xA7\x70 |0
-<U5424> \xCA\xA5 |0
-<U5425> \xCA\x7D |0
-<U5426> \xA7\x5F |0
-<U5427> \xA7\x61 |0
-<U5428> \xCA\xA4 |0
-<U5429> \xA7\x68 |0
-<U542A> \xCA\x78 |0
-<U542B> \xA7\x74 |0
-<U542C> \xA7\x76 |0
-<U542D> \xA7\x5C |0
-<U542E> \xA7\x6D |0
-<U5430> \xCA\x76 |0
-<U5431> \xA7\x73 |0
-<U5433> \xA7\x64 |0
-<U5435> \xA7\x6E |0
-<U5436> \xA7\x6F |0
-<U5437> \xCA\x77 |0
-<U5438> \xA7\x6C |0
-<U5439> \xA7\x6A |0
-<U543B> \xA7\x6B |0
-<U543C> \xA7\x71 |0
-<U543D> \xCA\xA1 |0
-<U543E> \xA7\x5E |0
-<U5440> \xA7\x72 |0
-<U5441> \xCA\xA3 |0
-<U5442> \xA7\x66 |0
-<U5443> \xA7\x63 |0
-<U5445> \xCA\x7A |0
-<U5446> \xA7\x62 |0
-<U5447> \xCA\xA6 |0
-<U5448> \xA7\x65 |0
-<U544A> \xA7\x69 |0
-<U544E> \xA7\x60 |0
-<U544F> \xCA\xA2 |0
-<U5454> \xCA\x79 |0
-<U5460> \xCB\xEB |0
-<U5461> \xCB\xEA |0
-<U5462> \xA9\x4F |0
-<U5463> \xCB\xED |0
-<U5464> \xCB\xEF |0
-<U5465> \xCB\xE4 |0
-<U5466> \xCB\xE7 |0
-<U5467> \xCB\xEE |0
-<U5468> \xA9\x50 |0
-<U546B> \xCB\xE1 |0
-<U546C> \xCB\xE5 |0
-<U546F> \xCB\xE9 |0
-<U5470> \xCE\x49 |0
-<U5471> \xA9\x4B |0
-<U5472> \xCE\x4D |0
-<U5473> \xA8\xFD |0
-<U5474> \xCB\xE6 |0
-<U5475> \xA8\xFE |0
-<U5476> \xA9\x4C |0
-<U5477> \xA9\x45 |0
-<U5478> \xA9\x41 |0
-<U547A> \xCB\xE2 |0
-<U547B> \xA9\x44 |0
-<U547C> \xA9\x49 |0
-<U547D> \xA9\x52 |0
-<U547E> \xCB\xE3 |0
-<U547F> \xCB\xDC |0
-<U5480> \xA9\x43 |0
-<U5481> \xCB\xDD |0
-<U5482> \xCB\xDF |0
-<U5484> \xA9\x46 |0
-<U5486> \xA9\x48 |0
-<U5487> \xCB\xDB |0
-<U5488> \xCB\xE0 |0
-<U548B> \xA9\x51 |0
-<U548C> \xA9\x4D |0
-<U548D> \xCB\xE8 |0
-<U548E> \xA9\x53 |0
-<U5490> \xA9\x4A |0
-<U5491> \xCB\xDE |0
-<U5492> \xA9\x47 |0
-<U5495> \xA9\x42 |0
-<U5496> \xA9\x40 |0
-<U5498> \xCB\xEC |0
-<U549A> \xA9\x4E |0
-<U54A0> \xCE\x48 |0
-<U54A1> \xCD\xFB |0
-<U54A2> \xCE\x4B |0
-<U54A5> \xCD\xFD |0
-<U54A6> \xAB\x78 |0
-<U54A7> \xAB\xA8 |0
-<U54A8> \xAB\x74 |0
-<U54A9> \xAB\xA7 |0
-<U54AA> \xAB\x7D |0
-<U54AB> \xAB\xA4 |0
-<U54AC> \xAB\x72 |0
-<U54AD> \xCD\xFC |0
-<U54AE> \xCE\x43 |0
-<U54AF> \xAB\xA3 |0
-<U54B0> \xCE\x4F |0
-<U54B1> \xAB\xA5 |0
-<U54B3> \xAB\x79 |0
-<U54B6> \xCE\x45 |0
-<U54B7> \xCE\x42 |0
-<U54B8> \xAB\x77 |0
-<U54BA> \xCD\xFA |0
-<U54BB> \xAB\xA6 |0
-<U54BC> \xCE\x4A |0
-<U54BD> \xAB\x7C |0
-<U54BE> \xCE\x4C |0
-<U54BF> \xAB\xA9 |0
-<U54C0> \xAB\x73 |0
-<U54C1> \xAB\x7E |0
-<U54C2> \xAB\x7B |0
-<U54C3> \xCE\x40 |0
-<U54C4> \xAB\xA1 |0
-<U54C5> \xCE\x46 |0
-<U54C6> \xCE\x47 |0
-<U54C7> \xAB\x7A |0
-<U54C8> \xAB\xA2 |0
-<U54C9> \xAB\x76 |0
-<U54CE> \xAB\x75 |0
-<U54CF> \xCD\xFE |0
-<U54D6> \xCE\x44 |0
-<U54DE> \xCE\x4E |0
-<U54E0> \xD1\x44 |0
-<U54E1> \xAD\xFB |0
-<U54E2> \xD0\xF1 |0
-<U54E4> \xD0\xF6 |0
-<U54E5> \xAD\xF4 |0
-<U54E6> \xAE\x40 |0
-<U54E7> \xD0\xF4 |0
-<U54E8> \xAD\xEF |0
-<U54E9> \xAD\xF9 |0
-<U54EA> \xAD\xFE |0
-<U54EB> \xD0\xFB |0
-<U54ED> \xAD\xFA |0
-<U54EE> \xAD\xFD |0
-<U54F1> \xD0\xFE |0
-<U54F2> \xAD\xF5 |0
-<U54F3> \xD0\xF5 |0
-<U54F7> \xD1\x42 |0
-<U54F8> \xD1\x43 |0
-<U54FA> \xAD\xF7 |0
-<U54FB> \xD1\x41 |0
-<U54FC> \xAD\xF3 |0
-<U54FD> \xAE\x43 |0
-<U54FF> \xD0\xF8 |0
-<U5501> \xAD\xF1 |0
-<U5503> \xD1\x46 |0
-<U5504> \xD0\xF9 |0
-<U5505> \xD0\xFD |0
-<U5506> \xAD\xF6 |0
-<U5507> \xAE\x42 |0
-<U5508> \xD0\xFA |0
-<U5509> \xAD\xFC |0
-<U550A> \xD1\x40 |0
-<U550B> \xD1\x47 |0
-<U550C> \xD4\xA1 |0
-<U550E> \xD1\x45 |0
-<U550F> \xAE\x44 |0
-<U5510> \xAD\xF0 |0
-<U5511> \xD0\xFC |0
-<U5512> \xD0\xF3 |0
-<U5514> \xAD\xF8 |0
-<U5517> \xD0\xF2 |0
-<U551A> \xD0\xF7 |0
-<U5526> \xD0\xF0 |0
-<U5527> \xAE\x41 |0
-<U552A> \xD4\x77 |0
-<U552C> \xB0\xE4 |0
-<U552D> \xD4\xA7 |0
-<U552E> \xB0\xE2 |0
-<U552F> \xB0\xDF |0
-<U5530> \xD4\x7C |0
-<U5531> \xB0\xDB |0
-<U5532> \xD4\xA2 |0
-<U5533> \xB0\xE6 |0
-<U5534> \xD4\x76 |0
-<U5535> \xD4\x7B |0
-<U5536> \xD4\x7A |0
-<U5537> \xAD\xF2 |0
-<U5538> \xB0\xE1 |0
-<U5539> \xD4\xA5 |0
-<U553B> \xD4\xA8 |0
-<U553C> \xD4\x73 |0
-<U553E> \xB3\xE8 |0
-<U5540> \xD4\xA9 |0
-<U5541> \xB0\xE7 |0
-<U5543> \xB0\xD9 |0
-<U5544> \xB0\xD6 |0
-<U5545> \xD4\x7E |0
-<U5546> \xB0\xD3 |0
-<U5548> \xD4\xA6 |0
-<U554A> \xB0\xDA |0
-<U554B> \xD4\xAA |0
-<U554D> \xD4\x74 |0
-<U554E> \xD4\xA4 |0
-<U554F> \xB0\xDD |0
-<U5550> \xD4\x75 |0
-<U5551> \xD4\x78 |0
-<U5552> \xD4\x7D |0
-<U5555> \xB0\xDE |0
-<U5556> \xB0\xDC |0
-<U5557> \xB0\xE8 |0
-<U555C> \xB0\xE3 |0
-<U555E> \xB0\xD7 |0
-<U555F> \xB1\xD2 |0
-<U5561> \xB0\xD8 |0
-<U5562> \xD4\x79 |0
-<U5563> \xB0\xE5 |0
-<U5564> \xB0\xE0 |0
-<U5565> \xD4\xA3 |0
-<U5566> \xB0\xD5 |0
-<U556A> \xB0\xD4 |0
-<U5575> \xD4\x71 |0
-<U5576> \xD4\x72 |0
-<U5577> \xD8\x6A |0
-<U557B> \xB3\xD7 |0
-<U557C> \xB3\xDA |0
-<U557D> \xD8\x75 |0
-<U557E> \xB3\xEE |0
-<U557F> \xD8\x78 |0
-<U5580> \xB3\xD8 |0
-<U5581> \xD8\x71 |0
-<U5582> \xB3\xDE |0
-<U5583> \xB3\xE4 |0
-<U5584> \xB5\xBD |0
-<U5587> \xB3\xE2 |0
-<U5588> \xD8\x6E |0
-<U5589> \xB3\xEF |0
-<U558A> \xB3\xDB |0
-<U558B> \xB3\xE3 |0
-<U558C> \xD8\x76 |0
-<U558D> \xDC\xD7 |0
-<U558E> \xD8\x7B |0
-<U558F> \xD8\x6F |0
-<U5591> \xD8\x66 |0
-<U5592> \xD8\x73 |0
-<U5593> \xD8\x6D |0
-<U5594> \xB3\xE1 |0
-<U5595> \xD8\x79 |0
-<U5598> \xB3\xDD |0
-<U5599> \xB3\xF1 |0
-<U559A> \xB3\xEA |0
-<U559C> \xB3\xDF |0
-<U559D> \xB3\xDC |0
-<U559F> \xB3\xE7 |0
-<U55A1> \xD8\x7A |0
-<U55A2> \xD8\x6C |0
-<U55A3> \xD8\x72 |0
-<U55A4> \xD8\x74 |0
-<U55A5> \xD8\x68 |0
-<U55A6> \xD8\x77 |0
-<U55A7> \xB3\xD9 |0
-<U55A8> \xD8\x67 |0
-<U55AA> \xB3\xE0 |0
-<U55AB> \xB3\xF0 |0
-<U55AC> \xB3\xEC |0
-<U55AD> \xD8\x69 |0
-<U55AE> \xB3\xE6 |0
-<U55B1> \xB3\xED |0
-<U55B2> \xB3\xE9 |0
-<U55B3> \xB3\xE5 |0
-<U55B5> \xD8\x70 |0
-<U55BB> \xB3\xEB |0
-<U55BF> \xDC\xD5 |0
-<U55C0> \xDC\xD1 |0
-<U55C2> \xDC\xE0 |0
-<U55C3> \xDC\xCA |0
-<U55C4> \xDC\xD3 |0
-<U55C5> \xB6\xE5 |0
-<U55C6> \xB6\xE6 |0
-<U55C7> \xB6\xDE |0
-<U55C8> \xDC\xDC |0
-<U55C9> \xB6\xE8 |0
-<U55CA> \xDC\xCF |0
-<U55CB> \xDC\xCE |0
-<U55CC> \xDC\xCC |0
-<U55CD> \xDC\xDE |0
-<U55CE> \xB6\xDC |0
-<U55CF> \xDC\xD8 |0
-<U55D0> \xDC\xCD |0
-<U55D1> \xB6\xDF |0
-<U55D2> \xDC\xD6 |0
-<U55D3> \xB6\xDA |0
-<U55D4> \xDC\xD2 |0
-<U55D5> \xDC\xD9 |0
-<U55D6> \xDC\xDB |0
-<U55D9> \xDC\xDF |0
-<U55DA> \xB6\xE3 |0
-<U55DB> \xDC\xCB |0
-<U55DC> \xB6\xDD |0
-<U55DD> \xDC\xD0 |0
-<U55DF> \xB6\xD8 |0
-<U55E1> \xB6\xE4 |0
-<U55E2> \xDC\xDA |0
-<U55E3> \xB6\xE0 |0
-<U55E4> \xB6\xE1 |0
-<U55E5> \xB6\xE7 |0
-<U55E6> \xB6\xDB |0
-<U55E7> \xA2\x5F |0
-<U55E8> \xB6\xD9 |0
-<U55E9> \xDC\xD4 |0
-<U55EF> \xB6\xE2 |0
-<U55F2> \xDC\xDD |0
-<U55F6> \xB9\xCD |0
-<U55F7> \xB9\xC8 |0
-<U55F9> \xE1\x55 |0
-<U55FA> \xE1\x51 |0
-<U55FC> \xE1\x4B |0
-<U55FD> \xB9\xC2 |0
-<U55FE> \xB9\xBE |0
-<U55FF> \xE1\x54 |0
-<U5600> \xB9\xBF |0
-<U5601> \xE1\x4E |0
-<U5602> \xE1\x50 |0
-<U5604> \xE1\x53 |0
-<U5606> \xB9\xC4 |0
-<U5608> \xB9\xCB |0
-<U5609> \xB9\xC5 |0
-<U560C> \xE1\x49 |0
-<U560D> \xB9\xC6 |0
-<U560E> \xB9\xC7 |0
-<U560F> \xE1\x4C |0
-<U5610> \xB9\xCC |0
-<U5612> \xE1\x4A |0
-<U5613> \xE1\x4F |0
-<U5614> \xB9\xC3 |0
-<U5615> \xE1\x48 |0
-<U5616> \xB9\xC9 |0
-<U5617> \xB9\xC1 |0
-<U561B> \xB9\xC0 |0
-<U561C> \xE1\x4D |0
-<U561D> \xE1\x52 |0
-<U561F> \xB9\xCA |0
-<U5627> \xE1\x47 |0
-<U5629> \xBC\x4D |0
-<U562A> \xE5\x47 |0
-<U562C> \xE5\x44 |0
-<U562E> \xBC\x47 |0
-<U562F> \xBC\x53 |0
-<U5630> \xBC\x54 |0
-<U5632> \xBC\x4A |0
-<U5633> \xE5\x42 |0
-<U5634> \xBC\x4C |0
-<U5635> \xE4\xF9 |0
-<U5636> \xBC\x52 |0
-<U5638> \xE5\x46 |0
-<U5639> \xBC\x49 |0
-<U563A> \xE5\x48 |0
-<U563B> \xBC\x48 |0
-<U563D> \xE5\x43 |0
-<U563E> \xE5\x45 |0
-<U563F> \xBC\x4B |0
-<U5640> \xE5\x41 |0
-<U5641> \xE4\xFA |0
-<U5642> \xE4\xF7 |0
-<U5645> \xD8\x6B |0
-<U5646> \xE4\xFD |0
-<U5648> \xE4\xF6 |0
-<U5649> \xE4\xFC |0
-<U564A> \xE4\xFB |0
-<U564C> \xE4\xF8 |0
-<U564E> \xBC\x4F |0
-<U5653> \xBC\x4E |0
-<U5657> \xBC\x50 |0
-<U5658> \xE4\xFE |0
-<U5659> \xBE\xB2 |0
-<U565A> \xE5\x40 |0
-<U565E> \xE9\x45 |0
-<U5660> \xE8\xFD |0
-<U5662> \xBE\xBE |0
-<U5663> \xE9\x42 |0
-<U5664> \xBE\xB6 |0
-<U5665> \xBE\xBA |0
-<U5666> \xE9\x41 |0
-<U5668> \xBE\xB9 |0
-<U5669> \xBE\xB5 |0
-<U566A> \xBE\xB8 |0
-<U566B> \xBE\xB3 |0
-<U566C> \xBE\xBD |0
-<U566D> \xE9\x43 |0
-<U566E> \xE8\xFE |0
-<U566F> \xBE\xBC |0
-<U5670> \xE8\xFC |0
-<U5671> \xBE\xBB |0
-<U5672> \xE9\x44 |0
-<U5673> \xE9\x40 |0
-<U5674> \xBC\x51 |0
-<U5676> \xBE\xBF |0
-<U5677> \xE9\x46 |0
-<U5678> \xBE\xB7 |0
-<U5679> \xBE\xB4 |0
-<U567E> \xEC\xC6 |0
-<U567F> \xEC\xC8 |0
-<U5680> \xC0\x7B |0
-<U5681> \xEC\xC9 |0
-<U5682> \xEC\xC7 |0
-<U5683> \xEC\xC5 |0
-<U5684> \xEC\xC4 |0
-<U5685> \xC0\x7D |0
-<U5686> \xEC\xC3 |0
-<U5687> \xC0\x7E |0
-<U568C> \xEC\xC1 |0
-<U568D> \xEC\xC2 |0
-<U568E> \xC0\x7A |0
-<U568F> \xC0\xA1 |0
-<U5690> \xC0\x7C |0
-<U5693> \xEC\xC0 |0
-<U5695> \xC2\x50 |0
-<U5697> \xEF\xBC |0
-<U5698> \xEF\xBA |0
-<U5699> \xEF\xBF |0
-<U569A> \xEF\xBD |0
-<U569C> \xEF\xBB |0
-<U569D> \xEF\xBE |0
-<U56A5> \xC3\x60 |0
-<U56A6> \xF1\xF2 |0
-<U56A7> \xF1\xF3 |0
-<U56A8> \xC4\x56 |0
-<U56AA> \xF1\xF4 |0
-<U56AB> \xF1\xF0 |0
-<U56AC> \xF1\xF5 |0
-<U56AD> \xF1\xF1 |0
-<U56AE> \xC2\x51 |0
-<U56B2> \xF3\xFE |0
-<U56B3> \xF4\x41 |0
-<U56B4> \xC4\x59 |0
-<U56B5> \xF4\x40 |0
-<U56B6> \xC4\x58 |0
-<U56B7> \xC4\x57 |0
-<U56BC> \xC4\x5A |0
-<U56BD> \xF5\xC5 |0
-<U56BE> \xF5\xC6 |0
-<U56C0> \xC4\xDA |0
-<U56C1> \xC4\xD9 |0
-<U56C2> \xC4\xDB |0
-<U56C3> \xF5\xC4 |0
-<U56C5> \xF6\xD8 |0
-<U56C6> \xF6\xD7 |0
-<U56C8> \xC5\x6D |0
-<U56C9> \xC5\x6F |0
-<U56CA> \xC5\x6E |0
-<U56CB> \xF6\xD9 |0
-<U56CC> \xC5\xC8 |0
-<U56CD> \xF8\xA6 |0
-<U56D1> \xC5\xF1 |0
-<U56D3> \xF8\xA5 |0
-<U56D4> \xF8\xEE |0
-<U56D7> \xC9\x49 |0
-<U56DA> \xA5\x7D |0
-<U56DB> \xA5\x7C |0
-<U56DD> \xA6\x5F |0
-<U56DE> \xA6\x5E |0
-<U56DF> \xC9\xC7 |0
-<U56E0> \xA6\x5D |0
-<U56E1> \xC9\xC6 |0
-<U56E4> \xA7\x79 |0
-<U56E5> \xCA\xA9 |0
-<U56E7> \xCA\xA8 |0
-<U56EA> \xA7\x77 |0
-<U56EB> \xA7\x7A |0
-<U56EE> \xCA\xA7 |0
-<U56F0> \xA7\x78 |0
-<U56F7> \xCB\xF0 |0
-<U56F9> \xCB\xF1 |0
-<U56FA> \xA9\x54 |0
-<U56FF> \xAB\xAA |0
-<U5701> \xD1\x48 |0
-<U5702> \xD1\x49 |0
-<U5703> \xAE\x45 |0
-<U5704> \xAE\x46 |0
-<U5707> \xD4\xAC |0
-<U5708> \xB0\xE9 |0
-<U5709> \xB0\xEB |0
-<U570A> \xD4\xAB |0
-<U570B> \xB0\xEA |0
-<U570C> \xD8\x7C |0
-<U570D> \xB3\xF2 |0
-<U5712> \xB6\xE9 |0
-<U5713> \xB6\xEA |0
-<U5714> \xDC\xE1 |0
-<U5716> \xB9\xCF |0
-<U5718> \xB9\xCE |0
-<U571A> \xE5\x49 |0
-<U571B> \xE9\x48 |0
-<U571C> \xE9\x47 |0
-<U571E> \xF9\x6B |0
-<U571F> \xA4\x67 |0
-<U5720> \xC9\x59 |0
-<U5722> \xC9\x6E |0
-<U5723> \xC9\x6F |0
-<U5728> \xA6\x62 |0
-<U5729> \xA6\x66 |0
-<U572A> \xC9\xC9 |0
-<U572C> \xA6\x64 |0
-<U572D> \xA6\x63 |0
-<U572E> \xC9\xC8 |0
-<U572F> \xA6\x65 |0
-<U5730> \xA6\x61 |0
-<U5733> \xA6\x60 |0
-<U5734> \xC9\xCA |0
-<U573B> \xA7\xA6 |0
-<U573E> \xA7\xA3 |0
-<U5740> \xA7\x7D |0
-<U5741> \xCA\xAA |0
-<U5745> \xCA\xAB |0
-<U5747> \xA7\xA1 |0
-<U5749> \xCA\xAD |0
-<U574A> \xA7\x7B |0
-<U574B> \xCA\xAE |0
-<U574C> \xCA\xAC |0
-<U574D> \xA7\x7E |0
-<U574E> \xA7\xA2 |0
-<U574F> \xA7\xA5 |0
-<U5750> \xA7\xA4 |0
-<U5751> \xA7\x7C |0
-<U5752> \xCA\xAF |0
-<U5761> \xA9\x59 |0
-<U5762> \xCB\xFE |0
-<U5764> \xA9\x5B |0
-<U5766> \xA9\x5A |0
-<U5768> \xCC\x40 |0
-<U5769> \xA9\x58 |0
-<U576A> \xA9\x57 |0
-<U576B> \xCB\xF5 |0
-<U576D> \xCB\xF4 |0
-<U576F> \xCB\xF2 |0
-<U5770> \xCB\xF7 |0
-<U5771> \xCB\xF6 |0
-<U5772> \xCB\xF3 |0
-<U5773> \xCB\xFC |0
-<U5774> \xCB\xFD |0
-<U5775> \xCB\xFA |0
-<U5776> \xCB\xF8 |0
-<U5777> \xA9\x56 |0
-<U577B> \xCB\xFB |0
-<U577C> \xA9\x5C |0
-<U577D> \xCC\x41 |0
-<U5780> \xCB\xF9 |0
-<U5782> \xAB\xAB |0
-<U5783> \xA9\x55 |0
-<U578B> \xAB\xAC |0
-<U578C> \xCE\x54 |0
-<U578F> \xCE\x5A |0
-<U5793> \xAB\xB2 |0
-<U5794> \xCE\x58 |0
-<U5795> \xCE\x5E |0
-<U5797> \xCE\x55 |0
-<U5798> \xCE\x59 |0
-<U5799> \xCE\x5B |0
-<U579A> \xCE\x5D |0
-<U579B> \xCE\x57 |0
-<U579D> \xCE\x56 |0
-<U579E> \xCE\x51 |0
-<U579F> \xCE\x52 |0
-<U57A0> \xAB\xAD |0
-<U57A2> \xAB\xAF |0
-<U57A3> \xAB\xAE |0
-<U57A4> \xCE\x53 |0
-<U57A5> \xCE\x5C |0
-<U57AE> \xAB\xB1 |0
-<U57B5> \xCE\x50 |0
-<U57B6> \xD1\x53 |0
-<U57B8> \xD1\x52 |0
-<U57B9> \xD1\x57 |0
-<U57BA> \xD1\x4E |0
-<U57BC> \xD1\x51 |0
-<U57BD> \xD1\x50 |0
-<U57BF> \xD1\x54 |0
-<U57C1> \xD1\x58 |0
-<U57C2> \xAE\x47 |0
-<U57C3> \xAE\x4A |0
-<U57C6> \xD1\x4F |0
-<U57C7> \xD1\x55 |0
-<U57CB> \xAE\x49 |0
-<U57CC> \xD1\x4A |0
-<U57CE> \xAB\xB0 |0
-<U57CF> \xD4\xBA |0
-<U57D0> \xD1\x56 |0
-<U57D2> \xD1\x4D |0
-<U57D4> \xAE\x48 |0
-<U57D5> \xD1\x4C |0
-<U57DC> \xD4\xB1 |0
-<U57DF> \xB0\xEC |0
-<U57E0> \xB0\xF0 |0
-<U57E1> \xD4\xC1 |0
-<U57E2> \xD4\xAF |0
-<U57E3> \xD4\xBD |0
-<U57E4> \xB0\xF1 |0
-<U57E5> \xD4\xBF |0
-<U57E7> \xD4\xC5 |0
-<U57E9> \xD4\xC9 |0
-<U57EC> \xD4\xC0 |0
-<U57ED> \xD4\xB4 |0
-<U57EE> \xD4\xBC |0
-<U57F0> \xD4\xCA |0
-<U57F1> \xD4\xC8 |0
-<U57F2> \xD4\xBE |0
-<U57F3> \xD4\xB9 |0
-<U57F4> \xD4\xB2 |0
-<U57F5> \xD8\xA6 |0
-<U57F6> \xD4\xB0 |0
-<U57F7> \xB0\xF5 |0
-<U57F8> \xD4\xB7 |0
-<U57F9> \xB0\xF6 |0
-<U57FA> \xB0\xF2 |0
-<U57FB> \xD4\xAD |0
-<U57FC> \xD4\xC3 |0
-<U57FD> \xD4\xB5 |0
-<U5800> \xD4\xB3 |0
-<U5801> \xD4\xC6 |0
-<U5802> \xB0\xF3 |0
-<U5804> \xD4\xCC |0
-<U5805> \xB0\xED |0
-<U5806> \xB0\xEF |0
-<U5807> \xD4\xBB |0
-<U5808> \xD4\xB6 |0
-<U5809> \xAE\x4B |0
-<U580A> \xB0\xEE |0
-<U580B> \xD4\xB8 |0
-<U580C> \xD4\xC7 |0
-<U580D> \xD4\xCB |0
-<U580E> \xD4\xC2 |0
-<U5810> \xD4\xC4 |0
-<U5814> \xD4\xAE |0
-<U5819> \xD8\xA1 |0
-<U581B> \xD8\xAA |0
-<U581C> \xD8\xA9 |0
-<U581D> \xB3\xFA |0
-<U581E> \xD8\xA2 |0
-<U5820> \xB3\xFB |0
-<U5821> \xB3\xF9 |0
-<U5823> \xD8\xA4 |0
-<U5824> \xB3\xF6 |0
-<U5825> \xD8\xA8 |0
-<U5827> \xD8\xA3 |0
-<U5828> \xD8\xA5 |0
-<U5829> \xD8\x7D |0
-<U582A> \xB3\xF4 |0
-<U582C> \xD8\xB2 |0
-<U582D> \xD8\xB1 |0
-<U582E> \xD8\xAE |0
-<U582F> \xB3\xF3 |0
-<U5830> \xB3\xF7 |0
-<U5831> \xB3\xF8 |0
-<U5832> \xD1\x4B |0
-<U5833> \xD8\xAB |0
-<U5834> \xB3\xF5 |0
-<U5835> \xB0\xF4 |0
-<U5836> \xD8\xAD |0
-<U5837> \xD8\x7E |0
-<U5838> \xD8\xB0 |0
-<U5839> \xD8\xAF |0
-<U583B> \xD8\xB3 |0
-<U583D> \xDC\xEF |0
-<U583F> \xD8\xAC |0
-<U5848> \xD8\xA7 |0
-<U5849> \xDC\xE7 |0
-<U584A> \xB6\xF4 |0
-<U584B> \xB6\xF7 |0
-<U584C> \xB6\xF2 |0
-<U584D> \xDC\xE6 |0
-<U584E> \xDC\xEA |0
-<U584F> \xDC\xE5 |0
-<U5851> \xB6\xEC |0
-<U5852> \xB6\xF6 |0
-<U5853> \xDC\xE2 |0
-<U5854> \xB6\xF0 |0
-<U5855> \xDC\xE9 |0
-<U5857> \xB6\xEE |0
-<U5858> \xB6\xED |0
-<U5859> \xDC\xEC |0
-<U585A> \xB6\xEF |0
-<U585B> \xDC\xEE |0
-<U585D> \xDC\xEB |0
-<U585E> \xB6\xEB |0
-<U5862> \xB6\xF5 |0
-<U5863> \xDC\xF0 |0
-<U5864> \xDC\xE4 |0
-<U5865> \xDC\xED |0
-<U5868> \xDC\xE3 |0
-<U586B> \xB6\xF1 |0
-<U586D> \xB6\xF3 |0
-<U586F> \xDC\xE8 |0
-<U5871> \xDC\xF1 |0
-<U5874> \xE1\x5D |0
-<U5875> \xB9\xD0 |0
-<U5876> \xE1\x63 |0
-<U5879> \xB9\xD5 |0
-<U587A> \xE1\x5F |0
-<U587B> \xE1\x66 |0
-<U587C> \xE1\x57 |0
-<U587D> \xB9\xD7 |0
-<U587E> \xB9\xD1 |0
-<U587F> \xE1\x5C |0
-<U5880> \xBC\x55 |0
-<U5881> \xE1\x5B |0
-<U5882> \xE1\x64 |0
-<U5883> \xB9\xD2 |0
-<U5885> \xB9\xD6 |0
-<U5886> \xE1\x5A |0
-<U5887> \xE1\x60 |0
-<U5888> \xE1\x65 |0
-<U5889> \xE1\x56 |0
-<U588A> \xB9\xD4 |0
-<U588B> \xE1\x5E |0
-<U588E> \xE1\x62 |0
-<U588F> \xE1\x68 |0
-<U5890> \xE1\x58 |0
-<U5891> \xE1\x61 |0
-<U5893> \xB9\xD3 |0
-<U5894> \xE1\x67 |0
-<U5898> \xE1\x59 |0
-<U589C> \xBC\x59 |0
-<U589D> \xE5\x4B |0
-<U589E> \xBC\x57 |0
-<U589F> \xBC\x56 |0
-<U58A0> \xE5\x4D |0
-<U58A1> \xE5\x52 |0
-<U58A3> \xE5\x4E |0
-<U58A5> \xE5\x51 |0
-<U58A6> \xBC\x5C |0
-<U58A8> \xBE\xA5 |0
-<U58A9> \xBC\x5B |0
-<U58AB> \xE5\x4A |0
-<U58AC> \xE5\x50 |0
-<U58AE> \xBC\x5A |0
-<U58AF> \xE5\x4F |0
-<U58B1> \xE5\x4C |0
-<U58B3> \xBC\x58 |0
-<U58BA> \xE9\x4D |0
-<U58BB> \xF9\xD9 |0
-<U58BC> \xE9\x4F |0
-<U58BD> \xE9\x4A |0
-<U58BE> \xBE\xC1 |0
-<U58BF> \xE9\x4C |0
-<U58C1> \xBE\xC0 |0
-<U58C2> \xE9\x4E |0
-<U58C5> \xBE\xC3 |0
-<U58C6> \xE9\x50 |0
-<U58C7> \xBE\xC2 |0
-<U58C8> \xE9\x49 |0
-<U58C9> \xE9\x4B |0
-<U58CE> \xC0\xA5 |0
-<U58CF> \xEC\xCC |0
-<U58D1> \xC0\xA4 |0
-<U58D2> \xEC\xCD |0
-<U58D3> \xC0\xA3 |0
-<U58D4> \xEC\xCB |0
-<U58D5> \xC0\xA2 |0
-<U58D6> \xEC\xCA |0
-<U58D8> \xC2\x53 |0
-<U58D9> \xC2\x52 |0
-<U58DA> \xF1\xF6 |0
-<U58DB> \xF1\xF8 |0
-<U58DD> \xF1\xF7 |0
-<U58DE> \xC3\x61 |0
-<U58DF> \xC3\x62 |0
-<U58E2> \xC3\x63 |0
-<U58E3> \xF4\x42 |0
-<U58E4> \xC4\x5B |0
-<U58E7> \xF7\xD3 |0
-<U58E8> \xF7\xD2 |0
-<U58E9> \xC5\xF2 |0
-<U58EB> \xA4\x68 |0
-<U58EC> \xA4\xD0 |0
-<U58EF> \xA7\xA7 |0
-<U58F4> \xCE\x5F |0
-<U58F9> \xB3\xFC |0
-<U58FA> \xB3\xFD |0
-<U58FC> \xDC\xF2 |0
-<U58FD> \xB9\xD8 |0
-<U58FE> \xE1\x69 |0
-<U58FF> \xE5\x53 |0
-<U5903> \xC9\x5A |0
-<U5906> \xCA\xB0 |0
-<U590C> \xCC\x42 |0
-<U590D> \xCE\x60 |0
-<U590E> \xD1\x59 |0
-<U590F> \xAE\x4C |0
-<U5912> \xF1\xF9 |0
-<U5914> \xC4\xDC |0
-<U5915> \xA4\x69 |0
-<U5916> \xA5\x7E |0
-<U5917> \xC9\x70 |0
-<U5919> \xA6\x67 |0
-<U591A> \xA6\x68 |0
-<U591C> \xA9\x5D |0
-<U5920> \xB0\xF7 |0
-<U5922> \xB9\xDA |0
-<U5924> \xB9\xDB |0
-<U5925> \xB9\xD9 |0
-<U5927> \xA4\x6A |0
-<U5929> \xA4\xD1 |0
-<U592A> \xA4\xD3 |0
-<U592B> \xA4\xD2 |0
-<U592C> \xC9\x5B |0
-<U592D> \xA4\xD4 |0
-<U592E> \xA5\xA1 |0
-<U592F> \xC9\x71 |0
-<U5931> \xA5\xA2 |0
-<U5937> \xA6\x69 |0
-<U5938> \xA6\x6A |0
-<U593C> \xC9\xCB |0
-<U593E> \xA7\xA8 |0
-<U5940> \xCA\xB1 |0
-<U5944> \xA9\x61 |0
-<U5945> \xCC\x43 |0
-<U5947> \xA9\x5F |0
-<U5948> \xA9\x60 |0
-<U5949> \xA9\x5E |0
-<U594A> \xD1\x5A |0
-<U594E> \xAB\xB6 |0
-<U594F> \xAB\xB5 |0
-<U5950> \xAB\xB7 |0
-<U5951> \xAB\xB4 |0
-<U5953> \xCE\x61 |0
-<U5954> \xA9\x62 |0
-<U5955> \xAB\xB3 |0
-<U5957> \xAE\x4D |0
-<U5958> \xAE\x4E |0
-<U595A> \xAE\x4F |0
-<U595C> \xD4\xCD |0
-<U5960> \xB3\xFE |0
-<U5961> \xD8\xB4 |0
-<U5962> \xB0\xF8 |0
-<U5967> \xB6\xF8 |0
-<U5969> \xB9\xDD |0
-<U596A> \xB9\xDC |0
-<U596B> \xE1\x6A |0
-<U596D> \xBC\x5D |0
-<U596E> \xBE\xC4 |0
-<U5970> \xEF\xC0 |0
-<U5971> \xF6\xDA |0
-<U5972> \xF7\xD4 |0
-<U5973> \xA4\x6B |0
-<U5974> \xA5\xA3 |0
-<U5976> \xA5\xA4 |0
-<U5977> \xC9\xD1 |0
-<U5978> \xA6\x6C |0
-<U5979> \xA6\x6F |0
-<U597B> \xC9\xCF |0
-<U597C> \xC9\xCD |0
-<U597D> \xA6\x6E |0
-<U597E> \xC9\xD0 |0
-<U597F> \xC9\xD2 |0
-<U5980> \xC9\xCC |0
-<U5981> \xA6\x71 |0
-<U5982> \xA6\x70 |0
-<U5983> \xA6\x6D |0
-<U5984> \xA6\x6B |0
-<U5985> \xC9\xCE |0
-<U598A> \xA7\xB3 |0
-<U598D> \xA7\xB0 |0
-<U598E> \xCA\xB6 |0
-<U598F> \xCA\xB9 |0
-<U5990> \xCA\xB8 |0
-<U5992> \xA7\xAA |0
-<U5993> \xA7\xB2 |0
-<U5996> \xA7\xAF |0
-<U5997> \xCA\xB5 |0
-<U5998> \xCA\xB3 |0
-<U5999> \xA7\xAE |0
-<U599D> \xA7\xA9 |0
-<U599E> \xA7\xAC |0
-<U59A0> \xCA\xB4 |0
-<U59A1> \xCA\xBB |0
-<U59A2> \xCA\xB7 |0
-<U59A3> \xA7\xAD |0
-<U59A4> \xA7\xB1 |0
-<U59A5> \xA7\xB4 |0
-<U59A6> \xCA\xB2 |0
-<U59A7> \xCA\xBA |0
-<U59A8> \xA7\xAB |0
-<U59AE> \xA9\x67 |0
-<U59AF> \xA9\x6F |0
-<U59B1> \xCC\x4F |0
-<U59B2> \xCC\x48 |0
-<U59B3> \xA9\x70 |0
-<U59B4> \xCC\x53 |0
-<U59B5> \xCC\x44 |0
-<U59B6> \xCC\x4B |0
-<U59B9> \xA9\x66 |0
-<U59BA> \xCC\x45 |0
-<U59BB> \xA9\x64 |0
-<U59BC> \xCC\x4C |0
-<U59BD> \xCC\x50 |0
-<U59BE> \xA9\x63 |0
-<U59C0> \xCC\x51 |0
-<U59C1> \xCC\x4A |0
-<U59C3> \xCC\x4D |0
-<U59C5> \xA9\x72 |0
-<U59C6> \xA9\x69 |0
-<U59C7> \xCC\x54 |0
-<U59C8> \xCC\x52 |0
-<U59CA> \xA9\x6E |0
-<U59CB> \xA9\x6C |0
-<U59CC> \xCC\x49 |0
-<U59CD> \xA9\x6B |0
-<U59CE> \xCC\x47 |0
-<U59CF> \xCC\x46 |0
-<U59D0> \xA9\x6A |0
-<U59D1> \xA9\x68 |0
-<U59D2> \xA9\x71 |0
-<U59D3> \xA9\x6D |0
-<U59D4> \xA9\x65 |0
-<U59D6> \xCC\x4E |0
-<U59D8> \xAB\xB9 |0
-<U59DA> \xAB\xC0 |0
-<U59DB> \xCE\x6F |0
-<U59DC> \xAB\xB8 |0
-<U59DD> \xCE\x67 |0
-<U59DE> \xCE\x63 |0
-<U59E0> \xCE\x73 |0
-<U59E1> \xCE\x62 |0
-<U59E3> \xAB\xBB |0
-<U59E4> \xCE\x6C |0
-<U59E5> \xAB\xBE |0
-<U59E6> \xAB\xC1 |0
-<U59E8> \xAB\xBC |0
-<U59E9> \xCE\x70 |0
-<U59EA> \xAB\xBF |0
-<U59EC> \xAE\x56 |0
-<U59ED> \xCE\x76 |0
-<U59EE> \xCE\x64 |0
-<U59F1> \xCE\x66 |0
-<U59F2> \xCE\x6D |0
-<U59F3> \xCE\x71 |0
-<U59F4> \xCE\x75 |0
-<U59F5> \xCE\x72 |0
-<U59F6> \xCE\x6B |0
-<U59F7> \xCE\x6E |0
-<U59FA> \xCE\x68 |0
-<U59FB> \xAB\xC3 |0
-<U59FC> \xCE\x6A |0
-<U59FD> \xCE\x69 |0
-<U59FE> \xCE\x74 |0
-<U59FF> \xAB\xBA |0
-<U5A00> \xCE\x65 |0
-<U5A01> \xAB\xC2 |0
-<U5A03> \xAB\xBD |0
-<U5A09> \xAE\x5C |0
-<U5A0A> \xD1\x62 |0
-<U5A0C> \xAE\x5B |0
-<U5A0F> \xD1\x60 |0
-<U5A11> \xAE\x50 |0
-<U5A13> \xAE\x55 |0
-<U5A15> \xD1\x5F |0
-<U5A16> \xD1\x5C |0
-<U5A17> \xD1\x61 |0
-<U5A18> \xAE\x51 |0
-<U5A19> \xD1\x5B |0
-<U5A1B> \xAE\x54 |0
-<U5A1C> \xAE\x52 |0
-<U5A1E> \xD1\x63 |0
-<U5A1F> \xAE\x53 |0
-<U5A20> \xAE\x57 |0
-<U5A23> \xAE\x58 |0
-<U5A25> \xAE\x5A |0
-<U5A29> \xAE\x59 |0
-<U5A2D> \xD1\x5D |0
-<U5A2E> \xD1\x5E |0
-<U5A33> \xD1\x64 |0
-<U5A35> \xD4\xD4 |0
-<U5A36> \xB0\xF9 |0
-<U5A37> \xD8\xC2 |0
-<U5A38> \xD4\xD3 |0
-<U5A39> \xD4\xE6 |0
-<U5A3C> \xB1\x40 |0
-<U5A3E> \xD4\xE4 |0
-<U5A40> \xB0\xFE |0
-<U5A41> \xB0\xFA |0
-<U5A42> \xD4\xED |0
-<U5A43> \xD4\xDD |0
-<U5A44> \xD4\xE0 |0
-<U5A46> \xB1\x43 |0
-<U5A47> \xD4\xEA |0
-<U5A48> \xD4\xE2 |0
-<U5A49> \xB0\xFB |0
-<U5A4A> \xB1\x44 |0
-<U5A4C> \xD4\xE7 |0
-<U5A4D> \xD4\xE5 |0
-<U5A50> \xD4\xD6 |0
-<U5A51> \xD4\xEB |0
-<U5A52> \xD4\xDF |0
-<U5A53> \xD4\xDA |0
-<U5A55> \xD4\xD0 |0
-<U5A56> \xD4\xEC |0
-<U5A57> \xD4\xDC |0
-<U5A58> \xD4\xCF |0
-<U5A5A> \xB1\x42 |0
-<U5A5B> \xD4\xE1 |0
-<U5A5C> \xD4\xEE |0
-<U5A5D> \xD4\xDE |0
-<U5A5E> \xD4\xD2 |0
-<U5A5F> \xD4\xD7 |0
-<U5A60> \xD4\xCE |0
-<U5A62> \xB1\x41 |0
-<U5A64> \xD4\xDB |0
-<U5A65> \xD4\xD8 |0
-<U5A66> \xB0\xFC |0
-<U5A67> \xD4\xD1 |0
-<U5A69> \xD4\xE9 |0
-<U5A6A> \xB0\xFD |0
-<U5A6C> \xD4\xD9 |0
-<U5A6D> \xD4\xD5 |0
-<U5A70> \xD4\xE8 |0
-<U5A77> \xB4\x40 |0
-<U5A78> \xD8\xBB |0
-<U5A7A> \xD8\xB8 |0
-<U5A7B> \xD8\xC9 |0
-<U5A7C> \xD8\xBD |0
-<U5A7D> \xD8\xCA |0
-<U5A7F> \xB4\x42 |0
-<U5A83> \xD8\xC6 |0
-<U5A84> \xD8\xC3 |0
-<U5A8A> \xD8\xC4 |0
-<U5A8B> \xD8\xC7 |0
-<U5A8C> \xD8\xCB |0
-<U5A8E> \xD4\xE3 |0
-<U5A8F> \xD8\xCD |0
-<U5A90> \xDD\x47 |0
-<U5A92> \xB4\x43 |0
-<U5A93> \xD8\xCE |0
-<U5A94> \xD8\xB6 |0
-<U5A95> \xD8\xC0 |0
-<U5A97> \xD8\xC5 |0
-<U5A9A> \xB4\x41 |0
-<U5A9B> \xB4\x44 |0
-<U5A9C> \xD8\xCC |0
-<U5A9D> \xD8\xCF |0
-<U5A9E> \xD8\xBA |0
-<U5A9F> \xD8\xB7 |0
-<U5AA2> \xD8\xB9 |0
-<U5AA5> \xD8\xBE |0
-<U5AA6> \xD8\xBC |0
-<U5AA7> \xB4\x45 |0
-<U5AA9> \xD8\xC8 |0
-<U5AAC> \xD8\xBF |0
-<U5AAE> \xD8\xC1 |0
-<U5AAF> \xD8\xB5 |0
-<U5AB0> \xDC\xFA |0
-<U5AB1> \xDC\xF8 |0
-<U5AB2> \xB7\x42 |0
-<U5AB3> \xB7\x40 |0
-<U5AB4> \xDD\x43 |0
-<U5AB5> \xDC\xF9 |0
-<U5AB6> \xDD\x44 |0
-<U5AB7> \xDD\x40 |0
-<U5AB8> \xDC\xF7 |0
-<U5AB9> \xDD\x46 |0
-<U5ABA> \xDC\xF6 |0
-<U5ABB> \xDC\xFD |0
-<U5ABC> \xB6\xFE |0
-<U5ABD> \xB6\xFD |0
-<U5ABE> \xB6\xFC |0
-<U5ABF> \xDC\xFB |0
-<U5AC0> \xDD\x41 |0
-<U5AC1> \xB6\xF9 |0
-<U5AC2> \xB7\x41 |0
-<U5AC4> \xDC\xF4 |0
-<U5AC6> \xDC\xFE |0
-<U5AC7> \xDC\xF3 |0
-<U5AC8> \xDC\xFC |0
-<U5AC9> \xB6\xFA |0
-<U5ACA> \xDD\x42 |0
-<U5ACB> \xDC\xF5 |0
-<U5ACC> \xB6\xFB |0
-<U5ACD> \xDD\x45 |0
-<U5AD5> \xE1\x6E |0
-<U5AD6> \xB9\xE2 |0
-<U5AD7> \xB9\xE1 |0
-<U5AD8> \xB9\xE3 |0
-<U5AD9> \xE1\x7A |0
-<U5ADA> \xE1\x70 |0
-<U5ADB> \xE1\x76 |0
-<U5ADC> \xE1\x6B |0
-<U5ADD> \xE1\x79 |0
-<U5ADE> \xE1\x78 |0
-<U5ADF> \xE1\x7C |0
-<U5AE0> \xE1\x75 |0
-<U5AE1> \xB9\xDE |0
-<U5AE2> \xE1\x74 |0
-<U5AE3> \xB9\xE4 |0
-<U5AE5> \xE1\x6D |0
-<U5AE6> \xB9\xDF |0
-<U5AE8> \xE1\x7B |0
-<U5AE9> \xB9\xE0 |0
-<U5AEA> \xE1\x6F |0
-<U5AEB> \xE1\x72 |0
-<U5AEC> \xE1\x77 |0
-<U5AED> \xE1\x71 |0
-<U5AEE> \xE1\x6C |0
-<U5AF3> \xE1\x73 |0
-<U5AF4> \xE5\x55 |0
-<U5AF5> \xBC\x61 |0
-<U5AF6> \xE5\x58 |0
-<U5AF7> \xE5\x57 |0
-<U5AF8> \xE5\x5A |0
-<U5AF9> \xE5\x5C |0
-<U5AFA> \xF9\xDC |0
-<U5AFB> \xBC\x5F |0
-<U5AFD> \xE5\x56 |0
-<U5AFF> \xE5\x54 |0
-<U5B01> \xE5\x5D |0
-<U5B02> \xE5\x5B |0
-<U5B03> \xE5\x59 |0
-<U5B05> \xE5\x5F |0
-<U5B07> \xE5\x5E |0
-<U5B08> \xBC\x63 |0
-<U5B09> \xBC\x5E |0
-<U5B0B> \xBC\x60 |0
-<U5B0C> \xBC\x62 |0
-<U5B0F> \xE5\x60 |0
-<U5B10> \xE9\x57 |0
-<U5B13> \xE9\x56 |0
-<U5B14> \xE9\x55 |0
-<U5B16> \xE9\x58 |0
-<U5B17> \xE9\x51 |0
-<U5B19> \xE9\x52 |0
-<U5B1A> \xE9\x5A |0
-<U5B1B> \xE9\x53 |0
-<U5B1D> \xBE\xC5 |0
-<U5B1E> \xE9\x5C |0
-<U5B20> \xE9\x5B |0
-<U5B21> \xE9\x54 |0
-<U5B23> \xEC\xD1 |0
-<U5B24> \xC0\xA8 |0
-<U5B25> \xEC\xCF |0
-<U5B26> \xEC\xD4 |0
-<U5B27> \xEC\xD3 |0
-<U5B28> \xE9\x59 |0
-<U5B2A> \xC0\xA7 |0
-<U5B2C> \xEC\xD2 |0
-<U5B2D> \xEC\xCE |0
-<U5B2E> \xEC\xD6 |0
-<U5B2F> \xEC\xD5 |0
-<U5B30> \xC0\xA6 |0
-<U5B32> \xEC\xD0 |0
-<U5B34> \xBE\xC6 |0
-<U5B38> \xC2\x54 |0
-<U5B3C> \xEF\xC1 |0
-<U5B3D> \xF1\xFA |0
-<U5B3E> \xF1\xFB |0
-<U5B3F> \xF1\xFC |0
-<U5B40> \xC4\x5C |0
-<U5B43> \xC4\x5D |0
-<U5B45> \xF4\x43 |0
-<U5B47> \xF5\xC8 |0
-<U5B48> \xF5\xC7 |0
-<U5B4B> \xF6\xDB |0
-<U5B4C> \xF6\xDC |0
-<U5B4D> \xF7\xD5 |0
-<U5B4E> \xF8\xA7 |0
-<U5B50> \xA4\x6C |0
-<U5B51> \xA4\x6D |0
-<U5B53> \xA4\x6E |0
-<U5B54> \xA4\xD5 |0
-<U5B55> \xA5\xA5 |0
-<U5B56> \xC9\xD3 |0
-<U5B57> \xA6\x72 |0
-<U5B58> \xA6\x73 |0
-<U5B5A> \xA7\xB7 |0
-<U5B5B> \xA7\xB8 |0
-<U5B5C> \xA7\xB6 |0
-<U5B5D> \xA7\xB5 |0
-<U5B5F> \xA9\x73 |0
-<U5B62> \xCC\x55 |0
-<U5B63> \xA9\x75 |0
-<U5B64> \xA9\x74 |0
-<U5B65> \xCC\x56 |0
-<U5B69> \xAB\xC4 |0
-<U5B6B> \xAE\x5D |0
-<U5B6C> \xD1\x65 |0
-<U5B6E> \xD4\xF0 |0
-<U5B70> \xB1\x45 |0
-<U5B71> \xB4\x47 |0
-<U5B72> \xD4\xEF |0
-<U5B73> \xB4\x46 |0
-<U5B75> \xB9\xE5 |0
-<U5B77> \xE1\x7D |0
-<U5B78> \xBE\xC7 |0
-<U5B7A> \xC0\xA9 |0
-<U5B7B> \xEC\xD7 |0
-<U5B7D> \xC4\x5E |0
-<U5B7F> \xC5\x70 |0
-<U5B81> \xC9\x72 |0
-<U5B83> \xA5\xA6 |0
-<U5B84> \xC9\x73 |0
-<U5B85> \xA6\x76 |0
-<U5B87> \xA6\x74 |0
-<U5B88> \xA6\x75 |0
-<U5B89> \xA6\x77 |0
-<U5B8B> \xA7\xBA |0
-<U5B8C> \xA7\xB9 |0
-<U5B8E> \xCA\xBC |0
-<U5B8F> \xA7\xBB |0
-<U5B92> \xCA\xBD |0
-<U5B93> \xCC\x57 |0
-<U5B95> \xCC\x58 |0
-<U5B97> \xA9\x76 |0
-<U5B98> \xA9\x78 |0
-<U5B99> \xA9\x7A |0
-<U5B9A> \xA9\x77 |0
-<U5B9B> \xA9\x7B |0
-<U5B9C> \xA9\x79 |0
-<U5BA2> \xAB\xC8 |0
-<U5BA3> \xAB\xC5 |0
-<U5BA4> \xAB\xC7 |0
-<U5BA5> \xAB\xC9 |0
-<U5BA6> \xAB\xC6 |0
-<U5BA7> \xD1\x66 |0
-<U5BA8> \xCE\x77 |0
-<U5BAC> \xD1\x68 |0
-<U5BAD> \xD1\x67 |0
-<U5BAE> \xAE\x63 |0
-<U5BB0> \xAE\x5F |0
-<U5BB3> \xAE\x60 |0
-<U5BB4> \xAE\x62 |0
-<U5BB5> \xAE\x64 |0
-<U5BB6> \xAE\x61 |0
-<U5BB8> \xAE\x66 |0
-<U5BB9> \xAE\x65 |0
-<U5BBF> \xB1\x4A |0
-<U5BC0> \xD4\xF2 |0
-<U5BC1> \xD4\xF1 |0
-<U5BC2> \xB1\x49 |0
-<U5BC4> \xB1\x48 |0
-<U5BC5> \xB1\x47 |0
-<U5BC6> \xB1\x4B |0
-<U5BC7> \xB1\x46 |0
-<U5BCA> \xD8\xD5 |0
-<U5BCB> \xD8\xD2 |0
-<U5BCC> \xB4\x49 |0
-<U5BCD> \xD8\xD1 |0
-<U5BCE> \xD8\xD6 |0
-<U5BD0> \xB4\x4B |0
-<U5BD1> \xD8\xD4 |0
-<U5BD2> \xB4\x48 |0
-<U5BD3> \xB4\x4A |0
-<U5BD4> \xD8\xD3 |0
-<U5BD6> \xDD\x48 |0
-<U5BD8> \xDD\x49 |0
-<U5BD9> \xDD\x4A |0
-<U5BDE> \xB9\xE6 |0
-<U5BDF> \xB9\xEE |0
-<U5BE0> \xE1\x7E |0
-<U5BE1> \xB9\xE8 |0
-<U5BE2> \xB9\xEC |0
-<U5BE3> \xE1\xA1 |0
-<U5BE4> \xB9\xED |0
-<U5BE5> \xB9\xE9 |0
-<U5BE6> \xB9\xEA |0
-<U5BE7> \xB9\xE7 |0
-<U5BE8> \xB9\xEB |0
-<U5BE9> \xBC\x66 |0
-<U5BEA> \xD8\xD0 |0
-<U5BEB> \xBC\x67 |0
-<U5BEC> \xBC\x65 |0
-<U5BEE> \xBC\x64 |0
-<U5BEF> \xE9\x5D |0
-<U5BF0> \xBE\xC8 |0
-<U5BF1> \xEC\xD8 |0
-<U5BF2> \xEC\xD9 |0
-<U5BF5> \xC3\x64 |0
-<U5BF6> \xC4\x5F |0
-<U5BF8> \xA4\x6F |0
-<U5BFA> \xA6\x78 |0
-<U5C01> \xAB\xCA |0
-<U5C03> \xD1\x69 |0
-<U5C04> \xAE\x67 |0
-<U5C07> \xB1\x4E |0
-<U5C08> \xB1\x4D |0
-<U5C09> \xB1\x4C |0
-<U5C0A> \xB4\x4C |0
-<U5C0B> \xB4\x4D |0
-<U5C0C> \xD8\xD7 |0
-<U5C0D> \xB9\xEF |0
-<U5C0E> \xBE\xC9 |0
-<U5C0F> \xA4\x70 |0
-<U5C10> \xC9\x5C |0
-<U5C11> \xA4\xD6 |0
-<U5C12> \xC9\x74 |0
-<U5C15> \xC9\xD4 |0
-<U5C16> \xA6\x79 |0
-<U5C1A> \xA9\x7C |0
-<U5C1F> \xDD\x4B |0
-<U5C22> \xA4\x71 |0
-<U5C24> \xA4\xD7 |0
-<U5C25> \xC9\xD5 |0
-<U5C28> \xCA\xBE |0
-<U5C2A> \xCA\xBF |0
-<U5C2C> \xA7\xBC |0
-<U5C30> \xD8\xD8 |0
-<U5C31> \xB4\x4E |0
-<U5C33> \xDD\x4C |0
-<U5C37> \xC0\xAA |0
-<U5C38> \xA4\x72 |0
-<U5C39> \xA4\xA8 |0
-<U5C3A> \xA4\xD8 |0
-<U5C3B> \xC9\x75 |0
-<U5C3C> \xA5\xA7 |0
-<U5C3E> \xA7\xC0 |0
-<U5C3F> \xA7\xBF |0
-<U5C40> \xA7\xBD |0
-<U5C41> \xA7\xBE |0
-<U5C44> \xCC\x59 |0
-<U5C45> \xA9\x7E |0
-<U5C46> \xA9\xA1 |0
-<U5C47> \xCC\x5A |0
-<U5C48> \xA9\x7D |0
-<U5C4B> \xAB\xCE |0
-<U5C4C> \xCE\x78 |0
-<U5C4D> \xAB\xCD |0
-<U5C4E> \xAB\xCB |0
-<U5C4F> \xAB\xCC |0
-<U5C50> \xAE\x6A |0
-<U5C51> \xAE\x68 |0
-<U5C54> \xD1\x6B |0
-<U5C55> \xAE\x69 |0
-<U5C56> \xD1\x6A |0
-<U5C58> \xAE\x5E |0
-<U5C59> \xD4\xF3 |0
-<U5C5C> \xB1\x50 |0
-<U5C5D> \xB1\x51 |0
-<U5C60> \xB1\x4F |0
-<U5C62> \xB9\xF0 |0
-<U5C63> \xE1\xA2 |0
-<U5C64> \xBC\x68 |0
-<U5C65> \xBC\x69 |0
-<U5C67> \xE5\x61 |0
-<U5C68> \xC0\xAB |0
-<U5C69> \xEF\xC2 |0
-<U5C6A> \xEF\xC3 |0
-<U5C6C> \xC4\xDD |0
-<U5C6D> \xF8\xA8 |0
-<U5C6E> \xC9\x4B |0
-<U5C6F> \xA4\xD9 |0
-<U5C71> \xA4\x73 |0
-<U5C73> \xC9\x77 |0
-<U5C74> \xC9\x76 |0
-<U5C79> \xA6\x7A |0
-<U5C7A> \xC9\xD7 |0
-<U5C7B> \xC9\xD8 |0
-<U5C7C> \xC9\xD6 |0
-<U5C7E> \xC9\xD9 |0
-<U5C86> \xCA\xC7 |0
-<U5C88> \xCA\xC2 |0
-<U5C89> \xCA\xC4 |0
-<U5C8A> \xCA\xC6 |0
-<U5C8B> \xCA\xC3 |0
-<U5C8C> \xA7\xC4 |0
-<U5C8D> \xCA\xC0 |0
-<U5C8F> \xCA\xC1 |0
-<U5C90> \xA7\xC1 |0
-<U5C91> \xA7\xC2 |0
-<U5C92> \xCA\xC5 |0
-<U5C93> \xCA\xC8 |0
-<U5C94> \xA7\xC3 |0
-<U5C95> \xCA\xC9 |0
-<U5C9D> \xCC\x68 |0
-<U5C9F> \xCC\x62 |0
-<U5CA0> \xCC\x5D |0
-<U5CA1> \xA9\xA3 |0
-<U5CA2> \xCC\x65 |0
-<U5CA3> \xCC\x63 |0
-<U5CA4> \xCC\x5C |0
-<U5CA5> \xCC\x69 |0
-<U5CA6> \xCC\x6C |0
-<U5CA7> \xCC\x67 |0
-<U5CA8> \xCC\x60 |0
-<U5CA9> \xA9\xA5 |0
-<U5CAA> \xCC\x66 |0
-<U5CAB> \xA9\xA6 |0
-<U5CAC> \xCC\x61 |0
-<U5CAD> \xCC\x64 |0
-<U5CAE> \xCC\x5B |0
-<U5CAF> \xCC\x5F |0
-<U5CB0> \xCC\x6B |0
-<U5CB1> \xA9\xA7 |0
-<U5CB3> \xA9\xA8 |0
-<U5CB5> \xCC\x5E |0
-<U5CB6> \xCC\x6A |0
-<U5CB7> \xA9\xA2 |0
-<U5CB8> \xA9\xA4 |0
-<U5CC6> \xCE\xAB |0
-<U5CC7> \xCE\xA4 |0
-<U5CC8> \xCE\xAA |0
-<U5CC9> \xCE\xA3 |0
-<U5CCA> \xCE\xA5 |0
-<U5CCB> \xCE\x7D |0
-<U5CCC> \xCE\x7B |0
-<U5CCE> \xCE\xAC |0
-<U5CCF> \xCE\xA9 |0
-<U5CD0> \xCE\x79 |0
-<U5CD2> \xAB\xD0 |0
-<U5CD3> \xCE\xA7 |0
-<U5CD4> \xCE\xA8 |0
-<U5CD6> \xCE\xA6 |0
-<U5CD7> \xCE\x7C |0
-<U5CD8> \xCE\x7A |0
-<U5CD9> \xAB\xCF |0
-<U5CDA> \xCE\xA2 |0
-<U5CDB> \xCE\x7E |0
-<U5CDE> \xCE\xA1 |0
-<U5CDF> \xCE\xAD |0
-<U5CE8> \xAE\x6F |0
-<U5CEA> \xAE\x6E |0
-<U5CEC> \xD1\x6C |0
-<U5CED> \xAE\x6B |0
-<U5CEE> \xD1\x6E |0
-<U5CF0> \xAE\x70 |0
-<U5CF1> \xD1\x6F |0
-<U5CF4> \xAE\x73 |0
-<U5CF6> \xAE\x71 |0
-<U5CF7> \xD1\x70 |0
-<U5CF8> \xCE\xAE |0
-<U5CF9> \xD1\x72 |0
-<U5CFB> \xAE\x6D |0
-<U5CFD> \xAE\x6C |0
-<U5CFF> \xD1\x6D |0
-<U5D00> \xD1\x71 |0
-<U5D01> \xAE\x72 |0
-<U5D06> \xB1\x53 |0
-<U5D07> \xB1\x52 |0
-<U5D0B> \xD4\xF5 |0
-<U5D0C> \xD4\xF9 |0
-<U5D0D> \xD4\xFB |0
-<U5D0E> \xB1\x54 |0
-<U5D0F> \xD4\xFE |0
-<U5D11> \xB1\x58 |0
-<U5D12> \xD5\x41 |0
-<U5D14> \xB1\x5A |0
-<U5D16> \xB1\x56 |0
-<U5D17> \xB1\x5E |0
-<U5D19> \xB1\x5B |0
-<U5D1A> \xD4\xF7 |0
-<U5D1B> \xB1\x55 |0
-<U5D1D> \xD4\xF6 |0
-<U5D1E> \xD4\xF4 |0
-<U5D1F> \xD5\x43 |0
-<U5D20> \xD4\xF8 |0
-<U5D22> \xB1\x57 |0
-<U5D23> \xD5\x42 |0
-<U5D24> \xB1\x5C |0
-<U5D25> \xD4\xFD |0
-<U5D26> \xD4\xFC |0
-<U5D27> \xB1\x5D |0
-<U5D28> \xD4\xFA |0
-<U5D29> \xB1\x59 |0
-<U5D2E> \xD5\x44 |0
-<U5D30> \xD5\x40 |0
-<U5D31> \xD8\xE7 |0
-<U5D32> \xD8\xEE |0
-<U5D33> \xD8\xE3 |0
-<U5D34> \xB4\x51 |0
-<U5D35> \xD8\xDF |0
-<U5D36> \xD8\xEF |0
-<U5D37> \xD8\xD9 |0
-<U5D38> \xD8\xEC |0
-<U5D39> \xD8\xEA |0
-<U5D3A> \xD8\xE4 |0
-<U5D3C> \xD8\xED |0
-<U5D3D> \xD8\xE6 |0
-<U5D3F> \xD8\xDE |0
-<U5D40> \xD8\xF0 |0
-<U5D41> \xD8\xDC |0
-<U5D42> \xD8\xE9 |0
-<U5D43> \xD8\xDA |0
-<U5D45> \xD8\xF1 |0
-<U5D47> \xB4\x52 |0
-<U5D49> \xD8\xEB |0
-<U5D4A> \xDD\x4F |0
-<U5D4B> \xD8\xDD |0
-<U5D4C> \xB4\x4F |0
-<U5D4E> \xD8\xE1 |0
-<U5D50> \xB4\x50 |0
-<U5D51> \xD8\xE0 |0
-<U5D52> \xD8\xE5 |0
-<U5D55> \xD8\xE2 |0
-<U5D59> \xD8\xE8 |0
-<U5D5E> \xDD\x53 |0
-<U5D62> \xDD\x56 |0
-<U5D63> \xDD\x4E |0
-<U5D65> \xDD\x50 |0
-<U5D67> \xDD\x55 |0
-<U5D68> \xDD\x54 |0
-<U5D69> \xB7\x43 |0
-<U5D6B> \xD8\xDB |0
-<U5D6C> \xDD\x52 |0
-<U5D6F> \xB7\x44 |0
-<U5D71> \xDD\x4D |0
-<U5D72> \xDD\x51 |0
-<U5D77> \xE1\xA9 |0
-<U5D79> \xE1\xB0 |0
-<U5D7A> \xE1\xA7 |0
-<U5D7C> \xE1\xAE |0
-<U5D7D> \xE1\xA5 |0
-<U5D7E> \xE1\xAD |0
-<U5D7F> \xE1\xB1 |0
-<U5D80> \xE1\xA4 |0
-<U5D81> \xE1\xA8 |0
-<U5D82> \xE1\xA3 |0
-<U5D84> \xB9\xF1 |0
-<U5D86> \xE1\xA6 |0
-<U5D87> \xB9\xF2 |0
-<U5D88> \xE1\xAC |0
-<U5D89> \xE1\xAB |0
-<U5D8A> \xE1\xAA |0
-<U5D8D> \xE1\xAF |0
-<U5D92> \xE5\x65 |0
-<U5D93> \xE5\x67 |0
-<U5D94> \xBC\x6B |0
-<U5D95> \xE5\x68 |0
-<U5D97> \xE5\x63 |0
-<U5D99> \xE5\x62 |0
-<U5D9A> \xE5\x6C |0
-<U5D9C> \xE5\x6A |0
-<U5D9D> \xBC\x6A |0
-<U5D9E> \xE5\x6D |0
-<U5D9F> \xE5\x64 |0
-<U5DA0> \xE5\x69 |0
-<U5DA1> \xE5\x6B |0
-<U5DA2> \xE5\x66 |0
-<U5DA7> \xE9\x61 |0
-<U5DA8> \xE9\x66 |0
-<U5DA9> \xE9\x60 |0
-<U5DAA> \xE9\x65 |0
-<U5DAC> \xE9\x5E |0
-<U5DAD> \xE9\x68 |0
-<U5DAE> \xE9\x64 |0
-<U5DAF> \xE9\x69 |0
-<U5DB0> \xE9\x63 |0
-<U5DB1> \xE9\x5F |0
-<U5DB2> \xE9\x67 |0
-<U5DB4> \xE9\x6A |0
-<U5DB5> \xE9\x62 |0
-<U5DB7> \xEC\xDA |0
-<U5DB8> \xC0\xAF |0
-<U5DBA> \xC0\xAD |0
-<U5DBC> \xC0\xAC |0
-<U5DBD> \xC0\xAE |0
-<U5DC0> \xEF\xC4 |0
-<U5DC2> \xF1\x72 |0
-<U5DC3> \xF1\xFD |0
-<U5DC6> \xF4\x44 |0
-<U5DC7> \xF4\x45 |0
-<U5DC9> \xC4\x60 |0
-<U5DCB> \xF5\xC9 |0
-<U5DCD> \xC4\xDE |0
-<U5DCF> \xF5\xCA |0
-<U5DD1> \xF6\xDE |0
-<U5DD2> \xC5\x72 |0
-<U5DD4> \xC5\x71 |0
-<U5DD5> \xF6\xDD |0
-<U5DD6> \xC5\xC9 |0
-<U5DD8> \xF7\xD6 |0
-<U5DDD> \xA4\x74 |0
-<U5DDE> \xA6\x7B |0
-<U5DDF> \xC9\xDA |0
-<U5DE0> \xCA\xCA |0
-<U5DE1> \xA8\xB5 |0
-<U5DE2> \xB1\x5F |0
-<U5DE5> \xA4\x75 |0
-<U5DE6> \xA5\xAA |0
-<U5DE7> \xA5\xA9 |0
-<U5DE8> \xA5\xA8 |0
-<U5DEB> \xA7\xC5 |0
-<U5DEE> \xAE\x74 |0
-<U5DF0> \xDD\x57 |0
-<U5DF1> \xA4\x76 |0
-<U5DF2> \xA4\x77 |0
-<U5DF3> \xA4\x78 |0
-<U5DF4> \xA4\xDA |0
-<U5DF7> \xAB\xD1 |0
-<U5DF9> \xCE\xAF |0
-<U5DFD> \xB4\x53 |0
-<U5DFE> \xA4\x79 |0
-<U5DFF> \xC9\x5D |0
-<U5E02> \xA5\xAB |0
-<U5E03> \xA5\xAC |0
-<U5E04> \xC9\x78 |0
-<U5E06> \xA6\x7C |0
-<U5E0A> \xCA\xCB |0
-<U5E0C> \xA7\xC6 |0
-<U5E0E> \xCA\xCC |0
-<U5E11> \xA9\xAE |0
-<U5E14> \xCC\x6E |0
-<U5E15> \xA9\xAC |0
-<U5E16> \xA9\xAB |0
-<U5E17> \xCC\x6D |0
-<U5E18> \xA9\xA9 |0
-<U5E19> \xCC\x6F |0
-<U5E1A> \xA9\xAA |0
-<U5E1B> \xA9\xAD |0
-<U5E1D> \xAB\xD2 |0
-<U5E1F> \xAB\xD4 |0
-<U5E20> \xCE\xB3 |0
-<U5E21> \xCE\xB0 |0
-<U5E22> \xCE\xB1 |0
-<U5E23> \xCE\xB2 |0
-<U5E24> \xCE\xB4 |0
-<U5E25> \xAB\xD3 |0
-<U5E28> \xD1\x74 |0
-<U5E29> \xD1\x73 |0
-<U5E2B> \xAE\x76 |0
-<U5E2D> \xAE\x75 |0
-<U5E33> \xB1\x62 |0
-<U5E34> \xD5\x46 |0
-<U5E36> \xB1\x61 |0
-<U5E37> \xB1\x63 |0
-<U5E38> \xB1\x60 |0
-<U5E3D> \xB4\x55 |0
-<U5E3E> \xD5\x45 |0
-<U5E40> \xB4\x56 |0
-<U5E41> \xD8\xF3 |0
-<U5E43> \xB4\x57 |0
-<U5E44> \xD8\xF2 |0
-<U5E45> \xB4\x54 |0
-<U5E4A> \xDD\x5A |0
-<U5E4B> \xDD\x5C |0
-<U5E4C> \xB7\x45 |0
-<U5E4D> \xDD\x5B |0
-<U5E4E> \xDD\x59 |0
-<U5E4F> \xDD\x58 |0
-<U5E53> \xE1\xB4 |0
-<U5E54> \xB9\xF7 |0
-<U5E55> \xB9\xF5 |0
-<U5E57> \xB9\xF6 |0
-<U5E58> \xE1\xB2 |0
-<U5E59> \xE1\xB3 |0
-<U5E5B> \xB9\xF3 |0
-<U5E5C> \xE5\x71 |0
-<U5E5D> \xE5\x6F |0
-<U5E5F> \xBC\x6D |0
-<U5E60> \xE5\x70 |0
-<U5E61> \xBC\x6E |0
-<U5E62> \xBC\x6C |0
-<U5E63> \xB9\xF4 |0
-<U5E66> \xE9\x6D |0
-<U5E67> \xE9\x6B |0
-<U5E68> \xE9\x6C |0
-<U5E69> \xE5\x6E |0
-<U5E6A> \xEC\xDC |0
-<U5E6B> \xC0\xB0 |0
-<U5E6C> \xEC\xDB |0
-<U5E6D> \xEF\xC5 |0
-<U5E6E> \xEF\xC6 |0
-<U5E6F> \xE9\x6E |0
-<U5E70> \xF1\xFE |0
-<U5E72> \xA4\x7A |0
-<U5E73> \xA5\xAD |0
-<U5E74> \xA6\x7E |0
-<U5E75> \xC9\xDB |0
-<U5E76> \xA6\x7D |0
-<U5E78> \xA9\xAF |0
-<U5E79> \xB7\x46 |0
-<U5E7B> \xA4\xDB |0
-<U5E7C> \xA5\xAE |0
-<U5E7D> \xAB\xD5 |0
-<U5E7E> \xB4\x58 |0
-<U5E80> \xC9\x79 |0
-<U5E82> \xC9\x7A |0
-<U5E84> \xC9\xDC |0
-<U5E87> \xA7\xC8 |0
-<U5E88> \xCA\xD0 |0
-<U5E89> \xCA\xCE |0
-<U5E8A> \xA7\xC9 |0
-<U5E8B> \xCA\xCD |0
-<U5E8C> \xCA\xCF |0
-<U5E8D> \xCA\xD1 |0
-<U5E8F> \xA7\xC7 |0
-<U5E95> \xA9\xB3 |0
-<U5E96> \xA9\xB4 |0
-<U5E97> \xA9\xB1 |0
-<U5E9A> \xA9\xB0 |0
-<U5E9B> \xCE\xB8 |0
-<U5E9C> \xA9\xB2 |0
-<U5EA0> \xAB\xD6 |0
-<U5EA2> \xCE\xB7 |0
-<U5EA3> \xCE\xB9 |0
-<U5EA4> \xCE\xB6 |0
-<U5EA5> \xCE\xBA |0
-<U5EA6> \xAB\xD7 |0
-<U5EA7> \xAE\x79 |0
-<U5EA8> \xD1\x75 |0
-<U5EAA> \xD1\x77 |0
-<U5EAB> \xAE\x77 |0
-<U5EAC> \xD1\x78 |0
-<U5EAD> \xAE\x78 |0
-<U5EAE> \xD1\x76 |0
-<U5EB0> \xCE\xB5 |0
-<U5EB1> \xD5\x47 |0
-<U5EB2> \xD5\x4A |0
-<U5EB3> \xD5\x4B |0
-<U5EB4> \xD5\x48 |0
-<U5EB5> \xB1\x67 |0
-<U5EB6> \xB1\x66 |0
-<U5EB7> \xB1\x64 |0
-<U5EB8> \xB1\x65 |0
-<U5EB9> \xD5\x49 |0
-<U5EBE> \xB1\x68 |0
-<U5EC1> \xB4\x5A |0
-<U5EC2> \xB4\x5B |0
-<U5EC4> \xB4\x5C |0
-<U5EC5> \xDD\x5D |0
-<U5EC6> \xDD\x5F |0
-<U5EC7> \xDD\x61 |0
-<U5EC8> \xB7\x48 |0
-<U5EC9> \xB7\x47 |0
-<U5ECA> \xB4\x59 |0
-<U5ECB> \xDD\x60 |0
-<U5ECC> \xDD\x5E |0
-<U5ECE> \xE1\xB8 |0
-<U5ED1> \xE1\xB6 |0
-<U5ED2> \xE1\xBC |0
-<U5ED3> \xB9\xF8 |0
-<U5ED4> \xE1\xBD |0
-<U5ED5> \xE1\xBA |0
-<U5ED6> \xB9\xF9 |0
-<U5ED7> \xE1\xB7 |0
-<U5ED8> \xE1\xB5 |0
-<U5ED9> \xE1\xBB |0
-<U5EDA> \xBC\x70 |0
-<U5EDB> \xE5\x73 |0
-<U5EDC> \xE1\xB9 |0
-<U5EDD> \xBC\x72 |0
-<U5EDE> \xE5\x74 |0
-<U5EDF> \xBC\x71 |0
-<U5EE0> \xBC\x74 |0
-<U5EE1> \xE5\x75 |0
-<U5EE2> \xBC\x6F |0
-<U5EE3> \xBC\x73 |0
-<U5EE5> \xE9\x73 |0
-<U5EE6> \xE9\x71 |0
-<U5EE7> \xE9\x70 |0
-<U5EE8> \xE9\x72 |0
-<U5EE9> \xE9\x6F |0
-<U5EEC> \xC3\x66 |0
-<U5EEE> \xF4\x46 |0
-<U5EEF> \xF4\x47 |0
-<U5EF1> \xF5\xCB |0
-<U5EF2> \xF6\xDF |0
-<U5EF3> \xC6\x55 |0
-<U5EF6> \xA9\xB5 |0
-<U5EF7> \xA7\xCA |0
-<U5EFA> \xAB\xD8 |0
-<U5EFE> \xA4\x7B |0
-<U5EFF> \xA4\xDC |0
-<U5F01> \xA5\xAF |0
-<U5F02> \xC9\xDD |0
-<U5F04> \xA7\xCB |0
-<U5F05> \xCA\xD2 |0
-<U5F07> \xCE\xBB |0
-<U5F08> \xAB\xD9 |0
-<U5F0A> \xB9\xFA |0
-<U5F0B> \xA4\x7C |0
-<U5F0F> \xA6\xA1 |0
-<U5F12> \xB7\x49 |0
-<U5F13> \xA4\x7D |0
-<U5F14> \xA4\xDD |0
-<U5F15> \xA4\xDE |0
-<U5F17> \xA5\xB1 |0
-<U5F18> \xA5\xB0 |0
-<U5F1A> \xC9\xDE |0
-<U5F1B> \xA6\xA2 |0
-<U5F1D> \xCA\xD3 |0
-<U5F1F> \xA7\xCC |0
-<U5F22> \xCC\x71 |0
-<U5F23> \xCC\x72 |0
-<U5F24> \xCC\x73 |0
-<U5F26> \xA9\xB6 |0
-<U5F27> \xA9\xB7 |0
-<U5F28> \xCC\x70 |0
-<U5F29> \xA9\xB8 |0
-<U5F2D> \xAB\xDA |0
-<U5F2E> \xCE\xBC |0
-<U5F30> \xD1\x7A |0
-<U5F31> \xAE\x7A |0
-<U5F33> \xD1\x79 |0
-<U5F35> \xB1\x69 |0
-<U5F36> \xD5\x4C |0
-<U5F37> \xB1\x6A |0
-<U5F38> \xD5\x4D |0
-<U5F3C> \xB4\x5D |0
-<U5F40> \xDD\x62 |0
-<U5F43> \xE1\xBF |0
-<U5F44> \xE1\xBE |0
-<U5F46> \xB9\xFB |0
-<U5F48> \xBC\x75 |0
-<U5F49> \xE5\x76 |0
-<U5F4A> \xBE\xCA |0
-<U5F4B> \xE9\x74 |0
-<U5F4C> \xC0\xB1 |0
-<U5F4E> \xC5\x73 |0
-<U5F4F> \xF7\xD8 |0
-<U5F54> \xCC\x74 |0
-<U5F56> \xCE\xBD |0
-<U5F57> \xB1\x6B |0
-<U5F58> \xD8\xF4 |0
-<U5F59> \xB7\x4A |0
-<U5F5D> \xC2\x55 |0
-<U5F62> \xA7\xCE |0
-<U5F64> \xA7\xCD |0
-<U5F65> \xAB\xDB |0
-<U5F67> \xD1\x7B |0
-<U5F69> \xB1\x6D |0
-<U5F6A> \xB3\x43 |0
-<U5F6B> \xB1\x6E |0
-<U5F6C> \xB1\x6C |0
-<U5F6D> \xB4\x5E |0
-<U5F6F> \xE1\xC0 |0
-<U5F70> \xB9\xFC |0
-<U5F71> \xBC\x76 |0
-<U5F73> \xC9\x4C |0
-<U5F74> \xC9\xDF |0
-<U5F76> \xCA\xD5 |0
-<U5F77> \xA7\xCF |0
-<U5F78> \xCA\xD4 |0
-<U5F79> \xA7\xD0 |0
-<U5F7C> \xA9\xBC |0
-<U5F7D> \xCC\x77 |0
-<U5F7E> \xCC\x76 |0
-<U5F7F> \xA9\xBB |0
-<U5F80> \xA9\xB9 |0
-<U5F81> \xA9\xBA |0
-<U5F82> \xCC\x75 |0
-<U5F85> \xAB\xDD |0
-<U5F86> \xCE\xBE |0
-<U5F87> \xAB\xE0 |0
-<U5F88> \xAB\xDC |0
-<U5F89> \xAB\xE2 |0
-<U5F8A> \xAB\xDE |0
-<U5F8B> \xAB\xDF |0
-<U5F8C> \xAB\xE1 |0
-<U5F90> \xAE\x7D |0
-<U5F91> \xAE\x7C |0
-<U5F92> \xAE\x7B |0
-<U5F96> \xD5\x4F |0
-<U5F97> \xB1\x6F |0
-<U5F98> \xB1\x72 |0
-<U5F99> \xB1\x70 |0
-<U5F9B> \xD5\x4E |0
-<U5F9C> \xB1\x75 |0
-<U5F9E> \xB1\x71 |0
-<U5F9F> \xD5\x50 |0
-<U5FA0> \xB1\x74 |0
-<U5FA1> \xB1\x73 |0
-<U5FA5> \xD8\xF6 |0
-<U5FA6> \xD8\xF5 |0
-<U5FA8> \xB4\x61 |0
-<U5FA9> \xB4\x5F |0
-<U5FAA> \xB4\x60 |0
-<U5FAB> \xD8\xF7 |0
-<U5FAC> \xB7\x4B |0
-<U5FAD> \xDD\x64 |0
-<U5FAE> \xB7\x4C |0
-<U5FAF> \xDD\x63 |0
-<U5FB2> \xE5\x77 |0
-<U5FB5> \xBC\x78 |0
-<U5FB6> \xE1\xC1 |0
-<U5FB7> \xBC\x77 |0
-<U5FB9> \xB9\xFD |0
-<U5FBB> \xEC\xDE |0
-<U5FBC> \xE9\x75 |0
-<U5FBD> \xC0\xB2 |0
-<U5FBE> \xEC\xDD |0
-<U5FBF> \xF2\x40 |0
-<U5FC0> \xF4\x48 |0
-<U5FC1> \xF4\x49 |0
-<U5FC3> \xA4\xDF |0
-<U5FC5> \xA5\xB2 |0
-<U5FC9> \xC9\x7B |0
-<U5FCC> \xA7\xD2 |0
-<U5FCD> \xA7\xD4 |0
-<U5FCF> \xC9\xE2 |0
-<U5FD0> \xCA\xD8 |0
-<U5FD1> \xCA\xD7 |0
-<U5FD2> \xCA\xD6 |0
-<U5FD4> \xC9\xE1 |0
-<U5FD5> \xC9\xE0 |0
-<U5FD6> \xA6\xA4 |0
-<U5FD7> \xA7\xD3 |0
-<U5FD8> \xA7\xD1 |0
-<U5FD9> \xA6\xA3 |0
-<U5FDD> \xA9\xBD |0
-<U5FDE> \xCC\x78 |0
-<U5FE0> \xA9\xBE |0
-<U5FE1> \xCA\xDD |0
-<U5FE3> \xCA\xDF |0
-<U5FE4> \xCA\xDE |0
-<U5FE5> \xCC\x79 |0
-<U5FE8> \xCA\xDA |0
-<U5FEA> \xA7\xD8 |0
-<U5FEB> \xA7\xD6 |0
-<U5FED> \xCA\xD9 |0
-<U5FEE> \xCA\xDB |0
-<U5FEF> \xCA\xE1 |0
-<U5FF1> \xA7\xD5 |0
-<U5FF3> \xCA\xDC |0
-<U5FF4> \xCA\xE5 |0
-<U5FF5> \xA9\xC0 |0
-<U5FF7> \xCA\xE2 |0
-<U5FF8> \xA7\xD7 |0
-<U5FFA> \xCA\xE0 |0
-<U5FFB> \xCA\xE3 |0
-<U5FFD> \xA9\xBF |0
-<U5FFF> \xA9\xC1 |0
-<U6000> \xCA\xE4 |0
-<U6009> \xCC\xAF |0
-<U600A> \xCC\xA2 |0
-<U600B> \xCC\x7E |0
-<U600C> \xCC\xAE |0
-<U600D> \xCC\xA9 |0
-<U600E> \xAB\xE7 |0
-<U600F> \xA9\xC2 |0
-<U6010> \xCC\xAA |0
-<U6011> \xCC\xAD |0
-<U6012> \xAB\xE3 |0
-<U6013> \xCC\xAC |0
-<U6014> \xA9\xC3 |0
-<U6015> \xA9\xC8 |0
-<U6016> \xA9\xC6 |0
-<U6017> \xCC\xA3 |0
-<U6019> \xCC\x7C |0
-<U601A> \xCC\xA5 |0
-<U601B> \xA9\xCD |0
-<U601C> \xCC\xB0 |0
-<U601D> \xAB\xE4 |0
-<U601E> \xCC\xA6 |0
-<U6020> \xAB\xE5 |0
-<U6021> \xA9\xC9 |0
-<U6022> \xCC\xA8 |0
-<U6024> \xCE\xCD |0
-<U6025> \xAB\xE6 |0
-<U6026> \xCC\x7B |0
-<U6027> \xA9\xCA |0
-<U6028> \xAB\xE8 |0
-<U6029> \xA9\xCB |0
-<U602A> \xA9\xC7 |0
-<U602B> \xA9\xCC |0
-<U602C> \xCC\xA7 |0
-<U602D> \xCC\x7A |0
-<U602E> \xCC\xAB |0
-<U602F> \xA9\xC4 |0
-<U6032> \xCC\x7D |0
-<U6033> \xCC\xA4 |0
-<U6034> \xCC\xA1 |0
-<U6035> \xA9\xC5 |0
-<U6037> \xCE\xBF |0
-<U6039> \xCE\xC0 |0
-<U6040> \xCE\xCA |0
-<U6041> \xD1\xA1 |0
-<U6042> \xCE\xCB |0
-<U6043> \xAB\xEE |0
-<U6044> \xCE\xCE |0
-<U6045> \xCE\xC4 |0
-<U6046> \xAB\xED |0
-<U6047> \xCE\xC6 |0
-<U6049> \xCE\xC7 |0
-<U604C> \xCE\xC9 |0
-<U604D> \xAB\xE9 |0
-<U6050> \xAE\xA3 |0
-<U6052> \xF9\xDA |0
-<U6053> \xCE\xC5 |0
-<U6054> \xCE\xC1 |0
-<U6055> \xAE\xA4 |0
-<U6058> \xCE\xCF |0
-<U6059> \xAE\x7E |0
-<U605A> \xD1\x7D |0
-<U605B> \xCE\xC8 |0
-<U605D> \xD1\x7C |0
-<U605E> \xCE\xC3 |0
-<U605F> \xCE\xCC |0
-<U6062> \xAB\xEC |0
-<U6063> \xAE\xA1 |0
-<U6064> \xAB\xF2 |0
-<U6065> \xAE\xA2 |0
-<U6066> \xCE\xD0 |0
-<U6067> \xD1\x7E |0
-<U6068> \xAB\xEB |0
-<U6069> \xAE\xA6 |0
-<U606A> \xAB\xF1 |0
-<U606B> \xAB\xF0 |0
-<U606C> \xAB\xEF |0
-<U606D> \xAE\xA5 |0
-<U606E> \xCE\xD1 |0
-<U606F> \xAE\xA7 |0
-<U6070> \xAB\xEA |0
-<U6072> \xCE\xC2 |0
-<U607F> \xB1\x76 |0
-<U6080> \xD1\xA4 |0
-<U6081> \xD1\xA6 |0
-<U6083> \xD1\xA8 |0
-<U6084> \xAE\xA8 |0
-<U6085> \xAE\xAE |0
-<U6086> \xD5\x53 |0
-<U6087> \xD1\xAC |0
-<U6088> \xD1\xA3 |0
-<U6089> \xB1\x78 |0
-<U608A> \xD5\x51 |0
-<U608C> \xAE\xAD |0
-<U608D> \xAE\xAB |0
-<U608E> \xD1\xAE |0
-<U6090> \xD5\x52 |0
-<U6092> \xD1\xA5 |0
-<U6094> \xAE\xAC |0
-<U6095> \xD1\xA9 |0
-<U6096> \xAE\xAF |0
-<U6097> \xD1\xAB |0
-<U609A> \xAE\xAA |0
-<U609B> \xD1\xAA |0
-<U609C> \xD1\xAD |0
-<U609D> \xD1\xA7 |0
-<U609F> \xAE\xA9 |0
-<U60A0> \xB1\x79 |0
-<U60A2> \xD1\xA2 |0
-<U60A3> \xB1\x77 |0
-<U60A8> \xB1\x7A |0
-<U60B0> \xD5\x55 |0
-<U60B1> \xD5\x5E |0
-<U60B2> \xB4\x64 |0
-<U60B4> \xB1\x7C |0
-<U60B5> \xB1\xA3 |0
-<U60B6> \xB4\x65 |0
-<U60B7> \xD5\x60 |0
-<U60B8> \xB1\xAA |0
-<U60B9> \xD8\xF9 |0
-<U60BA> \xD5\x56 |0
-<U60BB> \xB1\xA2 |0
-<U60BC> \xB1\xA5 |0
-<U60BD> \xB1\x7E |0
-<U60BE> \xD5\x54 |0
-<U60BF> \xD5\x62 |0
-<U60C0> \xD5\x65 |0
-<U60C1> \xD9\x49 |0
-<U60C3> \xD5\x63 |0
-<U60C4> \xD8\xFD |0
-<U60C5> \xB1\xA1 |0
-<U60C6> \xB1\xA8 |0
-<U60C7> \xB1\xAC |0
-<U60C8> \xD5\x5D |0
-<U60C9> \xD8\xF8 |0
-<U60CA> \xD5\x61 |0
-<U60CB> \xB1\x7B |0
-<U60CC> \xD8\xFA |0
-<U60CD> \xD5\x64 |0
-<U60CE> \xD8\xFC |0
-<U60CF> \xD5\x59 |0
-<U60D1> \xB4\x62 |0
-<U60D3> \xD5\x57 |0
-<U60D4> \xD5\x58 |0
-<U60D5> \xB1\xA7 |0
-<U60D8> \xB1\xA6 |0
-<U60D9> \xD5\x5B |0
-<U60DA> \xB1\xAB |0
-<U60DB> \xD5\x5F |0
-<U60DC> \xB1\xA4 |0
-<U60DD> \xD5\x5C |0
-<U60DF> \xB1\xA9 |0
-<U60E0> \xB4\x66 |0
-<U60E1> \xB4\x63 |0
-<U60E2> \xD8\xFB |0
-<U60E4> \xD5\x5A |0
-<U60E6> \xB1\x7D |0
-<U60F0> \xB4\x6B |0
-<U60F1> \xB4\x6F |0
-<U60F2> \xD9\x40 |0
-<U60F3> \xB7\x51 |0
-<U60F4> \xB4\x6D |0
-<U60F5> \xD9\x44 |0
-<U60F6> \xB4\x71 |0
-<U60F7> \xDD\x65 |0
-<U60F8> \xD9\x46 |0
-<U60F9> \xB7\x53 |0
-<U60FA> \xB4\x69 |0
-<U60FB> \xB4\x6C |0
-<U60FC> \xD9\x47 |0
-<U60FE> \xD9\x48 |0
-<U60FF> \xD9\x4E |0
-<U6100> \xB4\x73 |0
-<U6101> \xB7\x54 |0
-<U6103> \xD9\x4A |0
-<U6104> \xD9\x4F |0
-<U6105> \xD9\x43 |0
-<U6106> \xB7\x5E |0
-<U6108> \xB7\x55 |0
-<U6109> \xB4\x72 |0
-<U610A> \xD9\x41 |0
-<U610B> \xD9\x50 |0
-<U610D> \xB7\x5D |0
-<U610E> \xB4\x70 |0
-<U610F> \xB7\x4E |0
-<U6110> \xD9\x4D |0
-<U6112> \xB4\x74 |0
-<U6113> \xD9\x45 |0
-<U6114> \xD8\xFE |0
-<U6115> \xB4\x6A |0
-<U6116> \xD9\x42 |0
-<U6118> \xD9\x4B |0
-<U611A> \xB7\x4D |0
-<U611B> \xB7\x52 |0
-<U611C> \xB4\x67 |0
-<U611D> \xD9\x4C |0
-<U611F> \xB7\x50 |0
-<U6123> \xB4\x68 |0
-<U6127> \xB7\x5C |0
-<U6128> \xE1\xC3 |0
-<U6129> \xDD\x70 |0
-<U612B> \xDD\x68 |0
-<U612C> \xE1\xC2 |0
-<U612E> \xDD\x6C |0
-<U612F> \xDD\x6E |0
-<U6132> \xDD\x6B |0
-<U6134> \xB7\x5B |0
-<U6136> \xDD\x6A |0
-<U6137> \xB7\x5F |0
-<U613B> \xE1\xD2 |0
-<U613E> \xB7\x5A |0
-<U613F> \xBA\x40 |0
-<U6140> \xDD\x71 |0
-<U6141> \xE1\xC4 |0
-<U6144> \xB7\x58 |0
-<U6145> \xDD\x69 |0
-<U6146> \xDD\x6D |0
-<U6147> \xB9\xFE |0
-<U6148> \xB7\x4F |0
-<U6149> \xDD\x66 |0
-<U614A> \xDD\x67 |0
-<U614B> \xBA\x41 |0
-<U614C> \xB7\x57 |0
-<U614D> \xB7\x59 |0
-<U614E> \xB7\x56 |0
-<U614F> \xDD\x6F |0
-<U6152> \xE1\xC8 |0
-<U6153> \xE1\xC9 |0
-<U6154> \xE1\xCE |0
-<U6155> \xBC\x7D |0
-<U6156> \xE1\xD5 |0
-<U6158> \xBA\x47 |0
-<U615A> \xBA\x46 |0
-<U615B> \xE1\xD0 |0
-<U615D> \xBC\x7C |0
-<U615E> \xE1\xC5 |0
-<U615F> \xBA\x45 |0
-<U6161> \xE1\xD4 |0
-<U6162> \xBA\x43 |0
-<U6163> \xBA\x44 |0
-<U6165> \xE1\xD1 |0
-<U6166> \xE5\xAA |0
-<U6167> \xBC\x7A |0
-<U6168> \xB4\x6E |0
-<U616A> \xE1\xD3 |0
-<U616B> \xBC\xA3 |0
-<U616C> \xE1\xCB |0
-<U616E> \xBC\x7B |0
-<U6170> \xBC\xA2 |0
-<U6171> \xE1\xC6 |0
-<U6172> \xE1\xCA |0
-<U6173> \xE1\xC7 |0
-<U6174> \xE1\xCD |0
-<U6175> \xBA\x48 |0
-<U6176> \xBC\x79 |0
-<U6177> \xBA\x42 |0
-<U6179> \xE5\x7A |0
-<U617A> \xE1\xCF |0
-<U617C> \xBC\xA1 |0
-<U617E> \xBC\xA4 |0
-<U6180> \xE1\xCC |0
-<U6182> \xBC\x7E |0
-<U6183> \xE5\x79 |0
-<U6189> \xE5\x7E |0
-<U618A> \xBE\xCE |0
-<U618B> \xE5\x78 |0
-<U618C> \xE9\xA3 |0
-<U618D> \xE5\xA9 |0
-<U618E> \xBC\xA8 |0
-<U6190> \xBC\xA6 |0
-<U6191> \xBE\xCC |0
-<U6192> \xE5\xA6 |0
-<U6193> \xE5\xA2 |0
-<U6194> \xBC\xAC |0
-<U6196> \xE9\x78 |0
-<U619A> \xBC\xAA |0
-<U619B> \xE5\xA1 |0
-<U619D> \xE9\x76 |0
-<U619F> \xE5\xA5 |0
-<U61A1> \xE5\xA8 |0
-<U61A2> \xE5\x7D |0
-<U61A4> \xBC\xAB |0
-<U61A7> \xBC\xA5 |0
-<U61A8> \xE9\x77 |0
-<U61A9> \xBE\xCD |0
-<U61AA> \xE5\xA7 |0
-<U61AB> \xBC\xA7 |0
-<U61AC> \xBC\xA9 |0
-<U61AD> \xE5\xA4 |0
-<U61AE> \xBC\xAD |0
-<U61AF> \xE5\xA3 |0
-<U61B0> \xE5\x7C |0
-<U61B1> \xE5\x7B |0
-<U61B2> \xBE\xCB |0
-<U61B3> \xE5\xAB |0
-<U61B4> \xE9\x7A |0
-<U61B5> \xEC\xE0 |0
-<U61B6> \xBE\xD0 |0
-<U61B8> \xE9\xA2 |0
-<U61BA> \xE9\x7E |0
-<U61BC> \xEC\xE1 |0
-<U61BE> \xBE\xD1 |0
-<U61BF> \xE9\xA1 |0
-<U61C1> \xE9\x7C |0
-<U61C2> \xC0\xB4 |0
-<U61C3> \xEC\xDF |0
-<U61C5> \xE9\x79 |0
-<U61C6> \xE9\x7B |0
-<U61C7> \xC0\xB5 |0
-<U61C8> \xBE\xD3 |0
-<U61C9> \xC0\xB3 |0
-<U61CA> \xBE\xD2 |0
-<U61CB> \xC0\xB7 |0
-<U61CC> \xE9\x7D |0
-<U61CD> \xBE\xCF |0
-<U61D6> \xEF\xCF |0
-<U61D8> \xEF\xC7 |0
-<U61DE> \xEC\xE7 |0
-<U61DF> \xEF\xC8 |0
-<U61E0> \xEC\xE3 |0
-<U61E3> \xC2\x56 |0
-<U61E4> \xEC\xE5 |0
-<U61E5> \xEC\xE4 |0
-<U61E6> \xC0\xB6 |0
-<U61E7> \xEC\xE2 |0
-<U61E8> \xEC\xE6 |0
-<U61E9> \xEF\xD0 |0
-<U61EA> \xEF\xCC |0
-<U61EB> \xEF\xCE |0
-<U61ED> \xEF\xC9 |0
-<U61EE> \xEF\xCA |0
-<U61F0> \xEF\xCD |0
-<U61F1> \xEF\xCB |0
-<U61F2> \xC3\x67 |0
-<U61F5> \xC3\x6A |0
-<U61F6> \xC3\x69 |0
-<U61F7> \xC3\x68 |0
-<U61F8> \xC4\x61 |0
-<U61F9> \xF4\x4A |0
-<U61FA> \xC4\x62 |0
-<U61FB> \xF2\x41 |0
-<U61FC> \xC4\xDF |0
-<U61FD> \xF5\xCC |0
-<U61FE> \xC4\xE0 |0
-<U61FF> \xC5\x74 |0
-<U6200> \xC5\xCA |0
-<U6201> \xF7\xD9 |0
-<U6203> \xF7\xDA |0
-<U6204> \xF7\xDB |0
-<U6207> \xF9\xBA |0
-<U6208> \xA4\xE0 |0
-<U6209> \xC9\x7C |0
-<U620A> \xA5\xB3 |0
-<U620C> \xA6\xA6 |0
-<U620D> \xA6\xA7 |0
-<U620E> \xA6\xA5 |0
-<U6210> \xA6\xA8 |0
-<U6211> \xA7\xDA |0
-<U6212> \xA7\xD9 |0
-<U6214> \xCC\xB1 |0
-<U6215> \xA9\xCF |0
-<U6216> \xA9\xCE |0
-<U6219> \xD1\xAF |0
-<U621A> \xB1\xAD |0
-<U621B> \xB1\xAE |0
-<U621F> \xB4\x75 |0
-<U6220> \xDD\x72 |0
-<U6221> \xB7\x60 |0
-<U6222> \xB7\x61 |0
-<U6223> \xDD\x74 |0
-<U6224> \xDD\x76 |0
-<U6225> \xDD\x75 |0
-<U6227> \xE1\xD7 |0
-<U6229> \xE1\xD6 |0
-<U622A> \xBA\x49 |0
-<U622B> \xE1\xD8 |0
-<U622D> \xE5\xAC |0
-<U622E> \xBC\xAE |0
-<U6230> \xBE\xD4 |0
-<U6232> \xC0\xB8 |0
-<U6233> \xC2\x57 |0
-<U6234> \xC0\xB9 |0
-<U6236> \xA4\xE1 |0
-<U623A> \xCA\xE6 |0
-<U623D> \xCC\xB2 |0
-<U623E> \xA9\xD1 |0
-<U623F> \xA9\xD0 |0
-<U6240> \xA9\xD2 |0
-<U6241> \xAB\xF3 |0
-<U6242> \xCE\xD2 |0
-<U6243> \xCE\xD3 |0
-<U6246> \xD1\xB0 |0
-<U6247> \xAE\xB0 |0
-<U6248> \xB1\xAF |0
-<U6249> \xB4\x76 |0
-<U624A> \xD9\x51 |0
-<U624B> \xA4\xE2 |0
-<U624D> \xA4\x7E |0
-<U624E> \xA4\xE3 |0
-<U6250> \xC9\x7D |0
-<U6251> \xA5\xB7 |0
-<U6252> \xA5\xB6 |0
-<U6253> \xA5\xB4 |0
-<U6254> \xA5\xB5 |0
-<U6258> \xA6\xAB |0
-<U6259> \xC9\xE9 |0
-<U625A> \xC9\xEB |0
-<U625B> \xA6\xAA |0
-<U625C> \xC9\xE3 |0
-<U625E> \xC9\xE4 |0
-<U6260> \xC9\xEA |0
-<U6261> \xC9\xE6 |0
-<U6262> \xC9\xE8 |0
-<U6263> \xA6\xA9 |0
-<U6264> \xC9\xE5 |0
-<U6265> \xC9\xEC |0
-<U6266> \xC9\xE7 |0
-<U626D> \xA7\xE1 |0
-<U626E> \xA7\xEA |0
-<U626F> \xA7\xE8 |0
-<U6270> \xCA\xF0 |0
-<U6271> \xCA\xED |0
-<U6272> \xCA\xF5 |0
-<U6273> \xA7\xE6 |0
-<U6274> \xCA\xF6 |0
-<U6276> \xA7\xDF |0
-<U6277> \xCA\xF3 |0
-<U6279> \xA7\xE5 |0
-<U627A> \xCA\xEF |0
-<U627B> \xCA\xEE |0
-<U627C> \xA7\xE3 |0
-<U627D> \xCA\xF4 |0
-<U627E> \xA7\xE4 |0
-<U627F> \xA9\xD3 |0
-<U6280> \xA7\xDE |0
-<U6281> \xCA\xF1 |0
-<U6283> \xCA\xE7 |0
-<U6284> \xA7\xDB |0
-<U6286> \xA7\xEE |0
-<U6287> \xCA\xEC |0
-<U6288> \xCA\xF2 |0
-<U6289> \xA7\xE0 |0
-<U628A> \xA7\xE2 |0
-<U628C> \xCA\xE8 |0
-<U628E> \xCA\xE9 |0
-<U628F> \xCA\xEA |0
-<U6291> \xA7\xED |0
-<U6292> \xA7\xE7 |0
-<U6293> \xA7\xEC |0
-<U6294> \xCA\xEB |0
-<U6295> \xA7\xEB |0
-<U6296> \xA7\xDD |0
-<U6297> \xA7\xDC |0
-<U6298> \xA7\xE9 |0
-<U62A8> \xA9\xE1 |0
-<U62A9> \xCC\xBE |0
-<U62AA> \xCC\xB7 |0
-<U62AB> \xA9\xDC |0
-<U62AC> \xA9\xEF |0
-<U62AD> \xCC\xB3 |0
-<U62AE> \xCC\xBA |0
-<U62AF> \xCC\xBC |0
-<U62B0> \xCC\xBF |0
-<U62B1> \xA9\xEA |0
-<U62B3> \xCC\xBB |0
-<U62B4> \xCC\xB4 |0
-<U62B5> \xA9\xE8 |0
-<U62B6> \xCC\xB8 |0
-<U62B8> \xCC\xC0 |0
-<U62B9> \xA9\xD9 |0
-<U62BB> \xCC\xBD |0
-<U62BC> \xA9\xE3 |0
-<U62BD> \xA9\xE2 |0
-<U62BE> \xCC\xB6 |0
-<U62BF> \xA9\xD7 |0
-<U62C2> \xA9\xD8 |0
-<U62C4> \xA9\xD6 |0
-<U62C6> \xA9\xEE |0
-<U62C7> \xA9\xE6 |0
-<U62C8> \xA9\xE0 |0
-<U62C9> \xA9\xD4 |0
-<U62CA> \xCC\xB9 |0
-<U62CB> \xA9\xDF |0
-<U62CC> \xA9\xD5 |0
-<U62CD> \xA9\xE7 |0
-<U62CE> \xA9\xF0 |0
-<U62CF> \xCE\xD4 |0
-<U62D0> \xA9\xE4 |0
-<U62D1> \xCC\xB5 |0
-<U62D2> \xA9\xDA |0
-<U62D3> \xA9\xDD |0
-<U62D4> \xA9\xDE |0
-<U62D6> \xA9\xEC |0
-<U62D7> \xA9\xED |0
-<U62D8> \xA9\xEB |0
-<U62D9> \xA9\xE5 |0
-<U62DA> \xA9\xE9 |0
-<U62DB> \xA9\xDB |0
-<U62DC> \xAB\xF4 |0
-<U62EB> \xCE\xDA |0
-<U62EC> \xAC\x41 |0
-<U62ED> \xAB\xF8 |0
-<U62EE> \xAB\xFA |0
-<U62EF> \xAC\x40 |0
-<U62F0> \xCE\xE6 |0
-<U62F1> \xAB\xFD |0
-<U62F2> \xD1\xB1 |0
-<U62F3> \xAE\xB1 |0
-<U62F4> \xAC\x43 |0
-<U62F5> \xCE\xD7 |0
-<U62F6> \xCE\xDF |0
-<U62F7> \xAB\xFE |0
-<U62F8> \xCE\xDE |0
-<U62F9> \xCE\xDB |0
-<U62FA> \xCE\xE3 |0
-<U62FB> \xCE\xE5 |0
-<U62FC> \xAB\xF7 |0
-<U62FD> \xAB\xFB |0
-<U62FE> \xAC\x42 |0
-<U62FF> \xAE\xB3 |0
-<U6300> \xCE\xE0 |0
-<U6301> \xAB\xF9 |0
-<U6302> \xAC\x45 |0
-<U6303> \xCE\xD9 |0
-<U6307> \xAB\xFC |0
-<U6308> \xAE\xB2 |0
-<U6309> \xAB\xF6 |0
-<U630B> \xCE\xD6 |0
-<U630C> \xCE\xDD |0
-<U630D> \xCE\xD5 |0
-<U630E> \xCE\xD8 |0
-<U630F> \xCE\xDC |0
-<U6310> \xD1\xB2 |0
-<U6311> \xAC\x44 |0
-<U6313> \xCE\xE1 |0
-<U6314> \xCE\xE2 |0
-<U6315> \xCE\xE4 |0
-<U6316> \xAB\xF5 |0
-<U6328> \xAE\xC1 |0
-<U6329> \xD1\xBE |0
-<U632A> \xAE\xBF |0
-<U632B> \xAE\xC0 |0
-<U632C> \xD1\xB4 |0
-<U632D> \xD1\xC4 |0
-<U632F> \xAE\xB6 |0
-<U6332> \xD5\x66 |0
-<U6333> \xD1\xC6 |0
-<U6334> \xD1\xC0 |0
-<U6336> \xD1\xB7 |0
-<U6338> \xD1\xC9 |0
-<U6339> \xD1\xBA |0
-<U633A> \xAE\xBC |0
-<U633B> \xD5\x7D |0
-<U633C> \xD1\xBD |0
-<U633D> \xAE\xBE |0
-<U633E> \xAE\xB5 |0
-<U6340> \xD1\xCB |0
-<U6341> \xD1\xBF |0
-<U6342> \xAE\xB8 |0
-<U6343> \xD1\xB8 |0
-<U6344> \xD1\xB5 |0
-<U6345> \xD1\xB6 |0
-<U6346> \xAE\xB9 |0
-<U6347> \xD1\xC5 |0
-<U6348> \xD1\xCC |0
-<U6349> \xAE\xBB |0
-<U634A> \xD1\xBC |0
-<U634B> \xD1\xBB |0
-<U634C> \xAE\xC3 |0
-<U634D> \xAE\xC2 |0
-<U634E> \xAE\xB4 |0
-<U634F> \xAE\xBA |0
-<U6350> \xAE\xBD |0
-<U6351> \xD1\xC8 |0
-<U6354> \xD1\xC2 |0
-<U6355> \xAE\xB7 |0
-<U6356> \xD1\xB3 |0
-<U6357> \xD1\xCA |0
-<U6358> \xD1\xC1 |0
-<U6359> \xD1\xC3 |0
-<U635A> \xD1\xC7 |0
-<U6365> \xD5\x67 |0
-<U6367> \xB1\xB7 |0
-<U6368> \xB1\xCB |0
-<U6369> \xB1\xCA |0
-<U636B> \xB1\xBF |0
-<U636D> \xD5\x79 |0
-<U636E> \xD5\x75 |0
-<U636F> \xD5\x72 |0
-<U6370> \xD5\xA6 |0
-<U6371> \xB1\xBA |0
-<U6372> \xB1\xB2 |0
-<U6375> \xD5\x77 |0
-<U6376> \xB4\xA8 |0
-<U6377> \xB1\xB6 |0
-<U6378> \xD5\xA1 |0
-<U637A> \xB1\xCC |0
-<U637B> \xB1\xC9 |0
-<U637C> \xD5\x7B |0
-<U637D> \xD5\x6A |0
-<U6380> \xB1\xC8 |0
-<U6381> \xD5\xA3 |0
-<U6382> \xD5\x69 |0
-<U6383> \xB1\xBD |0
-<U6384> \xB1\xC1 |0
-<U6385> \xD5\xA2 |0
-<U6387> \xD5\x73 |0
-<U6388> \xB1\xC2 |0
-<U6389> \xB1\xBC |0
-<U638A> \xD5\x68 |0
-<U638C> \xB4\x78 |0
-<U638D> \xD5\xA5 |0
-<U638E> \xD5\x71 |0
-<U638F> \xB1\xC7 |0
-<U6390> \xD5\x74 |0
-<U6391> \xD5\xA4 |0
-<U6392> \xB1\xC6 |0
-<U6394> \xD9\x52 |0
-<U6396> \xB1\xB3 |0
-<U6397> \xD5\x6F |0
-<U6398> \xB1\xB8 |0
-<U6399> \xB1\xC3 |0
-<U639B> \xB1\xBE |0
-<U639C> \xD5\x78 |0
-<U639D> \xD5\x6E |0
-<U639E> \xD5\x6C |0
-<U639F> \xD5\x7E |0
-<U63A0> \xB1\xB0 |0
-<U63A1> \xB1\xC4 |0
-<U63A2> \xB1\xB4 |0
-<U63A3> \xB4\x77 |0
-<U63A4> \xD5\x7C |0
-<U63A5> \xB1\xB5 |0
-<U63A7> \xB1\xB1 |0
-<U63A8> \xB1\xC0 |0
-<U63A9> \xB1\xBB |0
-<U63AA> \xB1\xB9 |0
-<U63AB> \xD5\x70 |0
-<U63AC> \xB1\xC5 |0
-<U63AD> \xD5\x6D |0
-<U63AE> \xD5\x7A |0
-<U63AF> \xD5\x76 |0
-<U63B0> \xD9\x54 |0
-<U63B1> \xD9\x53 |0
-<U63BD> \xD5\x6B |0
-<U63BE> \xD9\x64 |0
-<U63C0> \xB4\x7A |0
-<U63C2> \xD9\x6A |0
-<U63C3> \xD9\x59 |0
-<U63C4> \xD9\x67 |0
-<U63C5> \xDD\x77 |0
-<U63C6> \xB4\x7D |0
-<U63C7> \xD9\x6B |0
-<U63C8> \xD9\x6E |0
-<U63C9> \xB4\x7C |0
-<U63CA> \xD9\x5C |0
-<U63CB> \xD9\x6D |0
-<U63CC> \xD9\x6C |0
-<U63CD> \xB4\x7E |0
-<U63CE> \xD9\x55 |0
-<U63CF> \xB4\x79 |0
-<U63D0> \xB4\xA3 |0
-<U63D2> \xB4\xA1 |0
-<U63D3> \xD9\x69 |0
-<U63D5> \xD9\x5F |0
-<U63D6> \xB4\xA5 |0
-<U63D7> \xD9\x70 |0
-<U63D8> \xD9\x68 |0
-<U63D9> \xD9\x71 |0
-<U63DA> \xB4\xAD |0
-<U63DB> \xB4\xAB |0
-<U63DC> \xD9\x66 |0
-<U63DD> \xD9\x65 |0
-<U63DF> \xD9\x63 |0
-<U63E0> \xD9\x5D |0
-<U63E1> \xB4\xA4 |0
-<U63E3> \xB4\xA2 |0
-<U63E4> \xD1\xB9 |0
-<U63E5> \xD9\x56 |0
-<U63E7> \xDD\xB7 |0
-<U63E8> \xD9\x57 |0
-<U63E9> \xB4\x7B |0
-<U63EA> \xB4\xAA |0
-<U63EB> \xDD\x79 |0
-<U63ED> \xB4\xA6 |0
-<U63EE> \xB4\xA7 |0
-<U63EF> \xD9\x58 |0
-<U63F0> \xD9\x6F |0
-<U63F1> \xDD\x78 |0
-<U63F2> \xD9\x60 |0
-<U63F3> \xD9\x5B |0
-<U63F4> \xB4\xA9 |0
-<U63F5> \xD9\x61 |0
-<U63F6> \xD9\x5E |0
-<U63F9> \xB4\xAE |0
-<U6406> \xB7\x70 |0
-<U6409> \xDD\x7C |0
-<U640A> \xDD\xB1 |0
-<U640B> \xDD\xB6 |0
-<U640C> \xDD\xAA |0
-<U640D> \xB7\x6C |0
-<U640E> \xDD\xBB |0
-<U640F> \xB7\x69 |0
-<U6410> \xDD\x7A |0
-<U6412> \xDD\x7B |0
-<U6413> \xB7\x62 |0
-<U6414> \xB7\x6B |0
-<U6415> \xDD\xA4 |0
-<U6416> \xB7\x6E |0
-<U6417> \xB7\x6F |0
-<U6418> \xDD\xA5 |0
-<U641A> \xDD\xB2 |0
-<U641B> \xDD\xB8 |0
-<U641C> \xB7\x6A |0
-<U641E> \xB7\x64 |0
-<U641F> \xDD\xA3 |0
-<U6420> \xDD\x7D |0
-<U6421> \xDD\xBA |0
-<U6422> \xDD\xA8 |0
-<U6423> \xDD\xA9 |0
-<U6424> \xDD\x7E |0
-<U6425> \xDD\xB4 |0
-<U6426> \xDD\xAB |0
-<U6427> \xDD\xB5 |0
-<U6428> \xDD\xAD |0
-<U642A> \xB7\x65 |0
-<U642B> \xE1\xD9 |0
-<U642C> \xB7\x68 |0
-<U642D> \xB7\x66 |0
-<U642E> \xDD\xB9 |0
-<U642F> \xDD\xB0 |0
-<U6430> \xDD\xAC |0
-<U6433> \xDD\xA1 |0
-<U6434> \xBA\x53 |0
-<U6435> \xDD\xAF |0
-<U6436> \xB7\x6D |0
-<U6437> \xDD\xA7 |0
-<U6439> \xDD\xA6 |0
-<U643D> \xB7\x67 |0
-<U643E> \xB7\x63 |0
-<U643F> \xE1\xEE |0
-<U6440> \xDD\xB3 |0
-<U6441> \xDD\xAE |0
-<U6443> \xDD\xA2 |0
-<U644B> \xE1\xE9 |0
-<U644D> \xE1\xDA |0
-<U644E> \xE1\xE5 |0
-<U6450> \xE1\xEC |0
-<U6451> \xBA\x51 |0
-<U6452> \xB4\xAC |0
-<U6453> \xE1\xEA |0
-<U6454> \xBA\x4C |0
-<U6458> \xBA\x4B |0
-<U6459> \xE1\xF1 |0
-<U645B> \xE1\xDB |0
-<U645C> \xE1\xE8 |0
-<U645D> \xE1\xDC |0
-<U645E> \xE1\xE7 |0
-<U645F> \xBA\x4F |0
-<U6460> \xE1\xEB |0
-<U6461> \xD9\x62 |0
-<U6465> \xE1\xF2 |0
-<U6466> \xE1\xE3 |0
-<U6467> \xBA\x52 |0
-<U6468> \xE5\xBA |0
-<U6469> \xBC\xAF |0
-<U646B> \xE1\xF0 |0
-<U646C> \xE1\xEF |0
-<U646D> \xBA\x54 |0
-<U646E> \xE5\xAD |0
-<U646F> \xBC\xB0 |0
-<U6470> \xE5\xAE |0
-<U6472> \xE1\xDF |0
-<U6473> \xE1\xE0 |0
-<U6474> \xE1\xDD |0
-<U6475> \xE1\xE2 |0
-<U6476> \xE1\xDE |0
-<U6477> \xE1\xF3 |0
-<U6478> \xBA\x4E |0
-<U6479> \xBC\xB1 |0
-<U647A> \xBA\x50 |0
-<U647B> \xBA\x55 |0
-<U647D> \xE1\xE1 |0
-<U647F> \xE1\xED |0
-<U6482> \xE1\xE6 |0
-<U6485> \xE5\xB1 |0
-<U6487> \xBA\x4A |0
-<U6488> \xBC\xB4 |0
-<U6489> \xE9\xAA |0
-<U648A> \xE5\xB6 |0
-<U648B> \xE5\xB5 |0
-<U648C> \xE5\xB7 |0
-<U648F> \xE5\xB4 |0
-<U6490> \xBC\xB5 |0
-<U6492> \xBC\xBB |0
-<U6493> \xBC\xB8 |0
-<U6495> \xBC\xB9 |0
-<U6496> \xE5\xAF |0
-<U6497> \xE5\xB2 |0
-<U6498> \xE5\xBC |0
-<U6499> \xBC\xC1 |0
-<U649A> \xBC\xBF |0
-<U649C> \xE5\xB3 |0
-<U649D> \xD9\x5A |0
-<U649E> \xBC\xB2 |0
-<U649F> \xE5\xB9 |0
-<U64A0> \xE5\xB0 |0
-<U64A2> \xBC\xC2 |0
-<U64A3> \xE5\xB8 |0
-<U64A4> \xBA\x4D |0
-<U64A5> \xBC\xB7 |0
-<U64A6> \xE1\xE4 |0
-<U64A9> \xBC\xBA |0
-<U64AB> \xBC\xBE |0
-<U64AC> \xBC\xC0 |0
-<U64AD> \xBC\xBD |0
-<U64AE> \xBC\xBC |0
-<U64B0> \xBC\xB6 |0
-<U64B1> \xE5\xBB |0
-<U64B2> \xBC\xB3 |0
-<U64B3> \xBC\xC3 |0
-<U64BB> \xBE\xD8 |0
-<U64BC> \xBE\xD9 |0
-<U64BD> \xE9\xA9 |0
-<U64BE> \xBE\xE2 |0
-<U64BF> \xBE\xDF |0
-<U64C1> \xBE\xD6 |0
-<U64C2> \xBE\xDD |0
-<U64C3> \xE9\xAB |0
-<U64C4> \xBE\xDB |0
-<U64C5> \xBE\xD5 |0
-<U64C7> \xBE\xDC |0
-<U64C9> \xE9\xA8 |0
-<U64CA> \xC0\xBB |0
-<U64CB> \xBE\xD7 |0
-<U64CD> \xBE\xDE |0
-<U64CE> \xC0\xBA |0
-<U64CF> \xE9\xA7 |0
-<U64D0> \xE9\xA6 |0
-<U64D2> \xBE\xE0 |0
-<U64D4> \xBE\xE1 |0
-<U64D6> \xE9\xA5 |0
-<U64D7> \xE9\xA4 |0
-<U64D8> \xC0\xBC |0
-<U64D9> \xE9\xAE |0
-<U64DA> \xBE\xDA |0
-<U64DB> \xE9\xAC |0
-<U64E0> \xC0\xBD |0
-<U64E2> \xC0\xC2 |0
-<U64E3> \xEC\xEA |0
-<U64E4> \xEC\xEC |0
-<U64E6> \xC0\xBF |0
-<U64E8> \xEC\xED |0
-<U64E9> \xEC\xE9 |0
-<U64EB> \xEC\xEB |0
-<U64EC> \xC0\xC0 |0
-<U64ED> \xC0\xC3 |0
-<U64EF> \xEC\xE8 |0
-<U64F0> \xC0\xBE |0
-<U64F1> \xC0\xC1 |0
-<U64F2> \xC2\x59 |0
-<U64F3> \xE9\xAD |0
-<U64F4> \xC2\x58 |0
-<U64F7> \xC2\x5E |0
-<U64F8> \xEF\xD4 |0
-<U64FA> \xC2\x5C |0
-<U64FB> \xC2\x5D |0
-<U64FC> \xEF\xD7 |0
-<U64FD> \xEF\xD3 |0
-<U64FE> \xC2\x5A |0
-<U64FF> \xEF\xD1 |0
-<U6500> \xC3\x6B |0
-<U6501> \xEF\xD5 |0
-<U6503> \xEF\xD6 |0
-<U6504> \xEF\xD2 |0
-<U6506> \xC2\x5B |0
-<U6507> \xF2\x42 |0
-<U6509> \xF2\x45 |0
-<U650C> \xF2\x46 |0
-<U650D> \xF2\x44 |0
-<U650E> \xF2\x47 |0
-<U650F> \xC3\x6C |0
-<U6510> \xF2\x43 |0
-<U6513> \xF4\x4E |0
-<U6514> \xC4\x64 |0
-<U6515> \xF4\x4D |0
-<U6516> \xF4\x4C |0
-<U6517> \xF4\x4B |0
-<U6518> \xC4\x63 |0
-<U6519> \xC4\x65 |0
-<U651B> \xF5\xCD |0
-<U651C> \xC4\xE2 |0
-<U651D> \xC4\xE1 |0
-<U6520> \xF6\xE1 |0
-<U6521> \xF6\xE0 |0
-<U6522> \xF6\xE3 |0
-<U6523> \xC5\xCB |0
-<U6524> \xC5\x75 |0
-<U6525> \xF7\xDD |0
-<U6526> \xF6\xE2 |0
-<U6529> \xF7\xDC |0
-<U652A> \xC5\xCD |0
-<U652B> \xC5\xCC |0
-<U652C> \xC5\xF3 |0
-<U652D> \xF8\xA9 |0
-<U652E> \xF8\xEF |0
-<U652F> \xA4\xE4 |0
-<U6532> \xD9\x72 |0
-<U6533> \xE9\xAF |0
-<U6536> \xA6\xAC |0
-<U6537> \xCA\xF7 |0
-<U6538> \xA7\xF1 |0
-<U6539> \xA7\xEF |0
-<U653B> \xA7\xF0 |0
-<U653D> \xCC\xC1 |0
-<U653E> \xA9\xF1 |0
-<U653F> \xAC\x46 |0
-<U6541> \xCE\xE7 |0
-<U6543> \xCE\xE8 |0
-<U6545> \xAC\x47 |0
-<U6546> \xD1\xCE |0
-<U6548> \xAE\xC4 |0
-<U6549> \xAE\xC5 |0
-<U654A> \xD1\xCD |0
-<U654F> \xB1\xD3 |0
-<U6551> \xB1\xCF |0
-<U6553> \xD5\xA7 |0
-<U6554> \xB1\xD6 |0
-<U6555> \xB1\xD5 |0
-<U6556> \xB1\xCE |0
-<U6557> \xB1\xD1 |0
-<U6558> \xB1\xD4 |0
-<U6559> \xB1\xD0 |0
-<U655C> \xD9\x76 |0
-<U655D> \xB1\xCD |0
-<U655E> \xB4\xAF |0
-<U6562> \xB4\xB1 |0
-<U6563> \xB4\xB2 |0
-<U6564> \xD9\x75 |0
-<U6565> \xD9\x78 |0
-<U6566> \xB4\xB0 |0
-<U6567> \xD9\x73 |0
-<U6568> \xD9\x77 |0
-<U656A> \xD9\x74 |0
-<U656C> \xB7\x71 |0
-<U656F> \xDD\xBC |0
-<U6572> \xBA\x56 |0
-<U6573> \xE1\xF4 |0
-<U6574> \xBE\xE3 |0
-<U6575> \xBC\xC4 |0
-<U6576> \xE5\xBD |0
-<U6577> \xBC\xC5 |0
-<U6578> \xBC\xC6 |0
-<U6579> \xE5\xBF |0
-<U657A> \xE5\xBE |0
-<U657B> \xE5\xC0 |0
-<U657C> \xE9\xB1 |0
-<U657F> \xE9\xB0 |0
-<U6580> \xEC\xEF |0
-<U6581> \xEC\xEE |0
-<U6582> \xC0\xC4 |0
-<U6583> \xC0\xC5 |0
-<U6584> \xF2\x48 |0
-<U6587> \xA4\xE5 |0
-<U658C> \xD9\x79 |0
-<U6590> \xB4\xB4 |0
-<U6591> \xB4\xB3 |0
-<U6592> \xDD\xBD |0
-<U6594> \xEF\xD8 |0
-<U6595> \xC4\xE3 |0
-<U6596> \xF7\xDE |0
-<U6597> \xA4\xE6 |0
-<U6599> \xAE\xC6 |0
-<U659B> \xB1\xD8 |0
-<U659C> \xB1\xD7 |0
-<U659D> \xD9\x7A |0
-<U659E> \xD9\x7B |0
-<U659F> \xB7\x72 |0
-<U65A0> \xE1\xF5 |0
-<U65A1> \xBA\x57 |0
-<U65A2> \xE9\xB2 |0
-<U65A4> \xA4\xE7 |0
-<U65A5> \xA5\xB8 |0
-<U65A7> \xA9\xF2 |0
-<U65A8> \xCC\xC2 |0
-<U65AA> \xCE\xE9 |0
-<U65AB> \xAC\x48 |0
-<U65AC> \xB1\xD9 |0
-<U65AE> \xD9\x7C |0
-<U65AF> \xB4\xB5 |0
-<U65B0> \xB7\x73 |0
-<U65B2> \xE5\xC1 |0
-<U65B3> \xE5\xC2 |0
-<U65B6> \xEC\xF0 |0
-<U65B7> \xC2\x5F |0
-<U65B8> \xF8\xF0 |0
-<U65B9> \xA4\xE8 |0
-<U65BB> \xCC\xC3 |0
-<U65BC> \xA9\xF3 |0
-<U65BD> \xAC\x49 |0
-<U65BF> \xCE\xEA |0
-<U65C1> \xAE\xC7 |0
-<U65C2> \xD1\xD2 |0
-<U65C3> \xD1\xD0 |0
-<U65C4> \xD1\xD1 |0
-<U65C5> \xAE\xC8 |0
-<U65C6> \xD1\xCF |0
-<U65CB> \xB1\xDB |0
-<U65CC> \xB1\xDC |0
-<U65CD> \xD5\xA8 |0
-<U65CE> \xB1\xDD |0
-<U65CF> \xB1\xDA |0
-<U65D0> \xD9\x7D |0
-<U65D2> \xD9\x7E |0
-<U65D3> \xDD\xBE |0
-<U65D6> \xBA\x59 |0
-<U65D7> \xBA\x58 |0
-<U65DA> \xEC\xF1 |0
-<U65DB> \xEF\xD9 |0
-<U65DD> \xF2\x4A |0
-<U65DE> \xF2\x49 |0
-<U65DF> \xF4\x4F |0
-<U65E1> \xC9\x5E |0
-<U65E2> \xAC\x4A |0
-<U65E5> \xA4\xE9 |0
-<U65E6> \xA5\xB9 |0
-<U65E8> \xA6\xAE |0
-<U65E9> \xA6\xAD |0
-<U65EC> \xA6\xAF |0
-<U65ED> \xA6\xB0 |0
-<U65EE> \xC9\xEE |0
-<U65EF> \xC9\xED |0
-<U65F0> \xCA\xF8 |0
-<U65F1> \xA7\xF2 |0
-<U65F2> \xCA\xFB |0
-<U65F3> \xCA\xFA |0
-<U65F4> \xCA\xF9 |0
-<U65F5> \xCA\xFC |0
-<U65FA> \xA9\xF4 |0
-<U65FB> \xCC\xC9 |0
-<U65FC> \xCC\xC5 |0
-<U65FD> \xCC\xCE |0
-<U6600> \xA9\xFB |0
-<U6602> \xA9\xF9 |0
-<U6603> \xCC\xCA |0
-<U6604> \xCC\xC6 |0
-<U6605> \xCC\xCD |0
-<U6606> \xA9\xF8 |0
-<U6607> \xAA\x40 |0
-<U6608> \xCC\xC8 |0
-<U6609> \xCC\xC4 |0
-<U660A> \xA9\xFE |0
-<U660B> \xCC\xCB |0
-<U660C> \xA9\xF7 |0
-<U660D> \xCC\xCC |0
-<U660E> \xA9\xFA |0
-<U660F> \xA9\xFC |0
-<U6610> \xCC\xD0 |0
-<U6611> \xCC\xCF |0
-<U6612> \xCC\xC7 |0
-<U6613> \xA9\xF6 |0
-<U6614> \xA9\xF5 |0
-<U6615> \xA9\xFD |0
-<U661C> \xCE\xEF |0
-<U661D> \xCE\xF5 |0
-<U661F> \xAC\x50 |0
-<U6620> \xAC\x4D |0
-<U6621> \xCE\xEC |0
-<U6622> \xCE\xF1 |0
-<U6624> \xAC\x53 |0
-<U6625> \xAC\x4B |0
-<U6626> \xCE\xF0 |0
-<U6627> \xAC\x4E |0
-<U6628> \xAC\x51 |0
-<U662B> \xCE\xF3 |0
-<U662D> \xAC\x4C |0
-<U662E> \xCE\xF8 |0
-<U662F> \xAC\x4F |0
-<U6631> \xAC\x52 |0
-<U6632> \xCE\xED |0
-<U6633> \xCE\xF2 |0
-<U6634> \xCE\xF6 |0
-<U6635> \xCE\xEE |0
-<U6636> \xCE\xEB |0
-<U6639> \xCE\xF7 |0
-<U663A> \xCE\xF4 |0
-<U6641> \xAE\xD0 |0
-<U6642> \xAE\xC9 |0
-<U6643> \xAE\xCC |0
-<U6645> \xAE\xCF |0
-<U6647> \xD1\xD5 |0
-<U6649> \xAE\xCA |0
-<U664A> \xD1\xD3 |0
-<U664C> \xAE\xCE |0
-<U664F> \xAE\xCB |0
-<U6651> \xD1\xD6 |0
-<U6652> \xAE\xCD |0
-<U6659> \xD5\xAC |0
-<U665A> \xB1\xDF |0
-<U665B> \xD5\xAB |0
-<U665C> \xD5\xAD |0
-<U665D> \xB1\xDE |0
-<U665E> \xB1\xE3 |0
-<U665F> \xD1\xD4 |0
-<U6661> \xD5\xAA |0
-<U6662> \xD5\xAE |0
-<U6664> \xB1\xE0 |0
-<U6665> \xD5\xA9 |0
-<U6666> \xB1\xE2 |0
-<U6668> \xB1\xE1 |0
-<U666A> \xD9\xA7 |0
-<U666C> \xD9\xA2 |0
-<U666E> \xB4\xB6 |0
-<U666F> \xB4\xBA |0
-<U6670> \xB4\xB7 |0
-<U6671> \xD9\xA5 |0
-<U6672> \xD9\xA8 |0
-<U6674> \xB4\xB8 |0
-<U6676> \xB4\xB9 |0
-<U6677> \xB4\xBE |0
-<U6678> \xDD\xC7 |0
-<U6679> \xD9\xA6 |0
-<U667A> \xB4\xBC |0
-<U667B> \xD9\xA3 |0
-<U667C> \xD9\xA1 |0
-<U667E> \xB4\xBD |0
-<U6680> \xD9\xA4 |0
-<U6684> \xB7\x79 |0
-<U6686> \xDD\xBF |0
-<U6687> \xB7\x76 |0
-<U6688> \xB7\x77 |0
-<U6689> \xB7\x75 |0
-<U668A> \xDD\xC4 |0
-<U668B> \xDD\xC3 |0
-<U668C> \xDD\xC0 |0
-<U668D> \xB7\x7B |0
-<U6690> \xDD\xC2 |0
-<U6691> \xB4\xBB |0
-<U6694> \xDD\xC6 |0
-<U6695> \xDD\xC1 |0
-<U6696> \xB7\x78 |0
-<U6697> \xB7\x74 |0
-<U6698> \xB7\x7A |0
-<U6699> \xDD\xC5 |0
-<U669D> \xBA\x5C |0
-<U669F> \xE1\xF8 |0
-<U66A0> \xE1\xF7 |0
-<U66A1> \xE1\xF6 |0
-<U66A2> \xBA\x5A |0
-<U66A8> \xBA\x5B |0
-<U66A9> \xE5\xC5 |0
-<U66AA> \xE5\xC8 |0
-<U66AB> \xBC\xC8 |0
-<U66AE> \xBC\xC7 |0
-<U66AF> \xE5\xC9 |0
-<U66B0> \xE5\xC4 |0
-<U66B1> \xBC\xCA |0
-<U66B2> \xE5\xC6 |0
-<U66B4> \xBC\xC9 |0
-<U66B5> \xE5\xC3 |0
-<U66B7> \xE5\xC7 |0
-<U66B8> \xBE\xE9 |0
-<U66B9> \xBE\xE6 |0
-<U66BA> \xE9\xBB |0
-<U66BB> \xE9\xBA |0
-<U66BD> \xE9\xB9 |0
-<U66BE> \xE9\xB4 |0
-<U66C0> \xE9\xB5 |0
-<U66C4> \xBE\xE7 |0
-<U66C6> \xBE\xE4 |0
-<U66C7> \xBE\xE8 |0
-<U66C8> \xE9\xB3 |0
-<U66C9> \xBE\xE5 |0
-<U66CA> \xE9\xB6 |0
-<U66CB> \xE9\xB7 |0
-<U66CC> \xE9\xBC |0
-<U66CF> \xE9\xB8 |0
-<U66D2> \xEC\xF2 |0
-<U66D6> \xC0\xC7 |0
-<U66D8> \xEF\xDC |0
-<U66D9> \xC0\xC6 |0
-<U66DA> \xEF\xDA |0
-<U66DB> \xEF\xDB |0
-<U66DC> \xC2\x60 |0
-<U66DD> \xC3\x6E |0
-<U66DE> \xF2\x4B |0
-<U66E0> \xC3\x6D |0
-<U66E3> \xF4\x51 |0
-<U66E4> \xF4\x52 |0
-<U66E6> \xC4\x66 |0
-<U66E8> \xF4\x50 |0
-<U66E9> \xC4\xE4 |0
-<U66EB> \xF7\xDF |0
-<U66EC> \xC5\xCE |0
-<U66ED> \xF8\xAA |0
-<U66EE> \xF8\xAB |0
-<U66F0> \xA4\xEA |0
-<U66F2> \xA6\xB1 |0
-<U66F3> \xA6\xB2 |0
-<U66F4> \xA7\xF3 |0
-<U66F6> \xCC\xD1 |0
-<U66F7> \xAC\x54 |0
-<U66F8> \xAE\xD1 |0
-<U66F9> \xB1\xE4 |0
-<U66FC> \xB0\xD2 |0
-<U66FE> \xB4\xBF |0
-<U66FF> \xB4\xC0 |0
-<U6700> \xB3\xCC |0
-<U6701> \xD9\xA9 |0
-<U6703> \xB7\x7C |0
-<U6704> \xE1\xFA |0
-<U6705> \xE1\xF9 |0
-<U6708> \xA4\xEB |0
-<U6709> \xA6\xB3 |0
-<U670A> \xCC\xD2 |0
-<U670B> \xAA\x42 |0
-<U670D> \xAA\x41 |0
-<U670F> \xCE\xF9 |0
-<U6710> \xCE\xFA |0
-<U6712> \xD1\xD7 |0
-<U6713> \xD1\xD8 |0
-<U6714> \xAE\xD2 |0
-<U6715> \xAE\xD3 |0
-<U6717> \xAE\xD4 |0
-<U6718> \xD5\xAF |0
-<U671B> \xB1\xE6 |0
-<U671D> \xB4\xC2 |0
-<U671F> \xB4\xC1 |0
-<U6720> \xDD\xC8 |0
-<U6721> \xDF\x7A |0
-<U6722> \xE1\xFB |0
-<U6723> \xE9\xBD |0
-<U6726> \xC2\x61 |0
-<U6727> \xC4\x67 |0
-<U6728> \xA4\xEC |0
-<U672A> \xA5\xBC |0
-<U672B> \xA5\xBD |0
-<U672C> \xA5\xBB |0
-<U672D> \xA5\xBE |0
-<U672E> \xA5\xBA |0
-<U6731> \xA6\xB6 |0
-<U6733> \xC9\xF6 |0
-<U6734> \xA6\xB5 |0
-<U6735> \xA6\xB7 |0
-<U6738> \xC9\xF1 |0
-<U6739> \xC9\xF0 |0
-<U673A> \xC9\xF3 |0
-<U673B> \xC9\xF2 |0
-<U673C> \xC9\xF5 |0
-<U673D> \xA6\xB4 |0
-<U673E> \xC9\xEF |0
-<U673F> \xC9\xF4 |0
-<U6745> \xCA\xFD |0
-<U6746> \xA7\xFD |0
-<U6747> \xCA\xFE |0
-<U6748> \xCB\x43 |0
-<U6749> \xA7\xFC |0
-<U674B> \xCB\x47 |0
-<U674C> \xCB\x42 |0
-<U674D> \xCB\x45 |0
-<U674E> \xA7\xF5 |0
-<U674F> \xA7\xF6 |0
-<U6750> \xA7\xF7 |0
-<U6751> \xA7\xF8 |0
-<U6753> \xA8\x40 |0
-<U6755> \xCB\x41 |0
-<U6756> \xA7\xFA |0
-<U6757> \xA8\x41 |0
-<U6759> \xCB\x40 |0
-<U675A> \xCB\x46 |0
-<U675C> \xA7\xF9 |0
-<U675D> \xCB\x44 |0
-<U675E> \xA7\xFB |0
-<U675F> \xA7\xF4 |0
-<U6760> \xA7\xFE |0
-<U676A> \xAA\x57 |0
-<U676C> \xCC\xD4 |0
-<U676D> \xAA\x43 |0
-<U676F> \xAA\x4D |0
-<U6770> \xAA\x4E |0
-<U6771> \xAA\x46 |0
-<U6772> \xAA\x58 |0
-<U6773> \xAA\x48 |0
-<U6774> \xCC\xDC |0
-<U6775> \xAA\x53 |0
-<U6776> \xCC\xD7 |0
-<U6777> \xAA\x49 |0
-<U6778> \xCC\xE6 |0
-<U6779> \xCC\xE7 |0
-<U677A> \xCC\xDF |0
-<U677B> \xCC\xD8 |0
-<U677C> \xAA\x56 |0
-<U677D> \xCC\xE4 |0
-<U677E> \xAA\x51 |0
-<U677F> \xAA\x4F |0
-<U6781> \xCC\xE5 |0
-<U6783> \xCC\xE3 |0
-<U6784> \xCC\xDB |0
-<U6785> \xCC\xD3 |0
-<U6786> \xCC\xDA |0
-<U6787> \xAA\x4A |0
-<U6789> \xAA\x50 |0
-<U678B> \xAA\x44 |0
-<U678C> \xCC\xDE |0
-<U678D> \xCC\xDD |0
-<U678E> \xCC\xD5 |0
-<U6790> \xAA\x52 |0
-<U6791> \xCC\xE1 |0
-<U6792> \xCC\xD6 |0
-<U6793> \xAA\x55 |0
-<U6794> \xCC\xE8 |0
-<U6795> \xAA\x45 |0
-<U6797> \xAA\x4C |0
-<U6798> \xCC\xD9 |0
-<U6799> \xCC\xE2 |0
-<U679A> \xAA\x54 |0
-<U679C> \xAA\x47 |0
-<U679D> \xAA\x4B |0
-<U679F> \xCC\xE0 |0
-<U67AE> \xCF\x5B |0
-<U67AF> \xAC\x5C |0
-<U67B0> \xAC\x69 |0
-<U67B2> \xCF\x56 |0
-<U67B3> \xCF\x4C |0
-<U67B4> \xAC\x62 |0
-<U67B5> \xCF\x4A |0
-<U67B6> \xAC\x5B |0
-<U67B7> \xCF\x45 |0
-<U67B8> \xAC\x65 |0
-<U67B9> \xCF\x52 |0
-<U67BA> \xCE\xFE |0
-<U67BB> \xCF\x41 |0
-<U67C0> \xCF\x44 |0
-<U67C1> \xCE\xFB |0
-<U67C2> \xCF\x51 |0
-<U67C3> \xCF\x61 |0
-<U67C4> \xAC\x60 |0
-<U67C5> \xCF\x46 |0
-<U67C6> \xCF\x58 |0
-<U67C8> \xCE\xFD |0
-<U67C9> \xCF\x5F |0
-<U67CA> \xCF\x60 |0
-<U67CB> \xCF\x63 |0
-<U67CC> \xCF\x5A |0
-<U67CD> \xCF\x4B |0
-<U67CE> \xCF\x53 |0
-<U67CF> \xAC\x66 |0
-<U67D0> \xAC\x59 |0
-<U67D1> \xAC\x61 |0
-<U67D2> \xAC\x6D |0
-<U67D3> \xAC\x56 |0
-<U67D4> \xAC\x58 |0
-<U67D8> \xCF\x43 |0
-<U67D9> \xAC\x6A |0
-<U67DA> \xAC\x63 |0
-<U67DB> \xCF\x5D |0
-<U67DC> \xCF\x40 |0
-<U67DD> \xAC\x6C |0
-<U67DE> \xAC\x67 |0
-<U67DF> \xCF\x49 |0
-<U67E2> \xAC\x6B |0
-<U67E3> \xCF\x50 |0
-<U67E4> \xCF\x48 |0
-<U67E5> \xAC\x64 |0
-<U67E6> \xCF\x5C |0
-<U67E7> \xCF\x54 |0
-<U67E9> \xAC\x5E |0
-<U67EA> \xCF\x62 |0
-<U67EB> \xCF\x47 |0
-<U67EC> \xAC\x5A |0
-<U67ED> \xCF\x59 |0
-<U67EE> \xCF\x4F |0
-<U67EF> \xAC\x5F |0
-<U67F0> \xCF\x55 |0
-<U67F1> \xAC\x57 |0
-<U67F2> \xCE\xFC |0
-<U67F3> \xAC\x68 |0
-<U67F4> \xAE\xE3 |0
-<U67F5> \xAC\x5D |0
-<U67F6> \xCF\x4E |0
-<U67F7> \xCF\x4D |0
-<U67F8> \xCF\x42 |0
-<U67FA> \xCF\x5E |0
-<U67FC> \xCF\x57 |0
-<U67FF> \xAC\x55 |0
-<U6812> \xD1\xEC |0
-<U6813> \xAE\xEA |0
-<U6814> \xD1\xED |0
-<U6816> \xD1\xE1 |0
-<U6817> \xAE\xDF |0
-<U6818> \xAE\xEB |0
-<U681A> \xD1\xDA |0
-<U681C> \xD1\xE3 |0
-<U681D> \xD1\xEB |0
-<U681F> \xD1\xD9 |0
-<U6820> \xD1\xF4 |0
-<U6821> \xAE\xD5 |0
-<U6825> \xD1\xF3 |0
-<U6826> \xD1\xEE |0
-<U6828> \xD1\xEF |0
-<U6829> \xAE\xDD |0
-<U682A> \xAE\xE8 |0
-<U682B> \xD1\xE5 |0
-<U682D> \xD1\xE6 |0
-<U682E> \xD1\xF0 |0
-<U682F> \xD1\xE7 |0
-<U6831> \xD1\xE2 |0
-<U6832> \xD1\xDC |0
-<U6833> \xD1\xDD |0
-<U6834> \xD1\xEA |0
-<U6835> \xD1\xE4 |0
-<U6838> \xAE\xD6 |0
-<U6839> \xAE\xDA |0
-<U683A> \xD1\xF2 |0
-<U683B> \xD1\xDE |0
-<U683C> \xAE\xE6 |0
-<U683D> \xAE\xE2 |0
-<U6840> \xAE\xE5 |0
-<U6841> \xAE\xEC |0
-<U6842> \xAE\xDB |0
-<U6843> \xAE\xE7 |0
-<U6844> \xD1\xE9 |0
-<U6845> \xAE\xE9 |0
-<U6846> \xAE\xD8 |0
-<U6848> \xAE\xD7 |0
-<U6849> \xD1\xDB |0
-<U684B> \xD1\xDF |0
-<U684C> \xAE\xE0 |0
-<U684D> \xD1\xF1 |0
-<U684E> \xD1\xE8 |0
-<U684F> \xD1\xE0 |0
-<U6850> \xAE\xE4 |0
-<U6851> \xAE\xE1 |0
-<U6853> \xAE\xD9 |0
-<U6854> \xAE\xDC |0
-<U686B> \xD5\xC4 |0
-<U686D> \xD5\xB4 |0
-<U686E> \xD5\xB5 |0
-<U686F> \xD5\xB9 |0
-<U6871> \xD5\xC8 |0
-<U6872> \xD5\xC5 |0
-<U6874> \xD5\xBE |0
-<U6875> \xD5\xBD |0
-<U6876> \xB1\xED |0
-<U6877> \xD5\xC1 |0
-<U6878> \xD5\xD0 |0
-<U6879> \xD5\xB0 |0
-<U687B> \xD5\xD1 |0
-<U687C> \xD5\xC3 |0
-<U687D> \xD5\xD5 |0
-<U687E> \xD5\xC9 |0
-<U687F> \xB1\xEC |0
-<U6880> \xD5\xC7 |0
-<U6881> \xB1\xE7 |0
-<U6882> \xB1\xFC |0
-<U6883> \xB1\xF2 |0
-<U6885> \xB1\xF6 |0
-<U6886> \xB1\xF5 |0
-<U6887> \xD5\xB1 |0
-<U6889> \xD5\xCE |0
-<U688A> \xD5\xD4 |0
-<U688B> \xD5\xCC |0
-<U688C> \xD5\xD3 |0
-<U688F> \xD5\xC0 |0
-<U6890> \xD5\xB2 |0
-<U6891> \xD5\xD2 |0
-<U6892> \xD5\xC2 |0
-<U6893> \xB1\xEA |0
-<U6894> \xB1\xF7 |0
-<U6896> \xD5\xCB |0
-<U6897> \xB1\xF0 |0
-<U689B> \xD5\xCA |0
-<U689C> \xD5\xB3 |0
-<U689D> \xB1\xF8 |0
-<U689F> \xB1\xFA |0
-<U68A0> \xD5\xCD |0
-<U68A1> \xB1\xFB |0
-<U68A2> \xB1\xE9 |0
-<U68A3> \xD5\xBA |0
-<U68A4> \xD5\xCF |0
-<U68A7> \xB1\xEF |0
-<U68A8> \xB1\xF9 |0
-<U68A9> \xD5\xBC |0
-<U68AA> \xD5\xC6 |0
-<U68AB> \xD5\xB7 |0
-<U68AC> \xD5\xBB |0
-<U68AD> \xB1\xF4 |0
-<U68AE> \xD5\xB6 |0
-<U68AF> \xB1\xE8 |0
-<U68B0> \xB1\xF1 |0
-<U68B1> \xB1\xEE |0
-<U68B2> \xD5\xBF |0
-<U68B3> \xAE\xDE |0
-<U68B4> \xD9\xC0 |0
-<U68B5> \xB1\xEB |0
-<U68C4> \xB1\xF3 |0
-<U68C6> \xD9\xC3 |0
-<U68C7> \xD9\xD9 |0
-<U68C8> \xD9\xCE |0
-<U68C9> \xB4\xD6 |0
-<U68CB> \xB4\xD1 |0
-<U68CC> \xD9\xBD |0
-<U68CD> \xB4\xD2 |0
-<U68CE> \xD9\xCD |0
-<U68D0> \xD9\xC6 |0
-<U68D1> \xD9\xD3 |0
-<U68D2> \xB4\xCE |0
-<U68D3> \xD9\xAB |0
-<U68D4> \xD9\xD5 |0
-<U68D5> \xB4\xC4 |0
-<U68D6> \xD9\xB3 |0
-<U68D7> \xB4\xC7 |0
-<U68D8> \xB4\xC6 |0
-<U68DA> \xB4\xD7 |0
-<U68DC> \xD9\xAD |0
-<U68DD> \xD9\xCF |0
-<U68DE> \xD9\xD0 |0
-<U68DF> \xB4\xC9 |0
-<U68E0> \xB4\xC5 |0
-<U68E1> \xD9\xBB |0
-<U68E3> \xB4\xD0 |0
-<U68E4> \xD9\xB6 |0
-<U68E6> \xD9\xD1 |0
-<U68E7> \xB4\xCC |0
-<U68E8> \xD9\xC9 |0
-<U68E9> \xD9\xD6 |0
-<U68EA> \xD9\xB0 |0
-<U68EB> \xD9\xB5 |0
-<U68EC> \xD9\xAF |0
-<U68EE> \xB4\xCB |0
-<U68EF> \xD9\xC2 |0
-<U68F0> \xDD\xDE |0
-<U68F1> \xD9\xB1 |0
-<U68F2> \xB4\xCF |0
-<U68F3> \xD9\xBA |0
-<U68F4> \xD9\xD2 |0
-<U68F5> \xB4\xCA |0
-<U68F6> \xD9\xB7 |0
-<U68F7> \xD9\xB4 |0
-<U68F8> \xD9\xC5 |0
-<U68F9> \xB4\xCD |0
-<U68FA> \xB4\xC3 |0
-<U68FB> \xB4\xD9 |0
-<U68FC> \xD9\xC8 |0
-<U68FD> \xD9\xC7 |0
-<U6904> \xD9\xAC |0
-<U6905> \xB4\xC8 |0
-<U6906> \xD9\xD4 |0
-<U6907> \xD9\xBC |0
-<U6908> \xD9\xBE |0
-<U690A> \xD9\xCB |0
-<U690B> \xD9\xCA |0
-<U690C> \xD9\xAA |0
-<U690D> \xB4\xD3 |0
-<U690E> \xB4\xD5 |0
-<U690F> \xD9\xB2 |0
-<U6910> \xD9\xB9 |0
-<U6911> \xD9\xC1 |0
-<U6912> \xB4\xD4 |0
-<U6913> \xD9\xB8 |0
-<U6914> \xD9\xC4 |0
-<U6915> \xD9\xD7 |0
-<U6917> \xD9\xCC |0
-<U6925> \xD9\xD8 |0
-<U692A> \xD9\xAE |0
-<U692F> \xDD\xF2 |0
-<U6930> \xB7\xA6 |0
-<U6932> \xDD\xF0 |0
-<U6933> \xDD\xDB |0
-<U6934> \xDD\xE0 |0
-<U6935> \xDD\xD9 |0
-<U6937> \xDD\xEC |0
-<U6938> \xDD\xCB |0
-<U6939> \xDD\xD2 |0
-<U693B> \xDD\xEA |0
-<U693C> \xDD\xF4 |0
-<U693D> \xDD\xDC |0
-<U693F> \xDD\xCF |0
-<U6940> \xDD\xE2 |0
-<U6941> \xDD\xE7 |0
-<U6942> \xDD\xD3 |0
-<U6944> \xDD\xE4 |0
-<U6945> \xDD\xD0 |0
-<U6948> \xDD\xD7 |0
-<U6949> \xDD\xD8 |0
-<U694A> \xB7\xA8 |0
-<U694B> \xDD\xEB |0
-<U694C> \xDD\xE9 |0
-<U694E> \xDD\xCC |0
-<U694F> \xDD\xEE |0
-<U6951> \xDD\xEF |0
-<U6952> \xDD\xF1 |0
-<U6953> \xB7\xAC |0
-<U6954> \xB7\xA4 |0
-<U6956> \xD5\xB8 |0
-<U6957> \xDD\xD4 |0
-<U6958> \xDD\xE6 |0
-<U6959> \xDD\xD5 |0
-<U695A> \xB7\xA1 |0
-<U695B> \xB7\xB1 |0
-<U695C> \xDD\xED |0
-<U695D> \xB7\xAF |0
-<U695E> \xB7\xAB |0
-<U695F> \xDD\xCA |0
-<U6960> \xB7\xA3 |0
-<U6962> \xDD\xCD |0
-<U6963> \xB7\xB0 |0
-<U6965> \xDD\xDD |0
-<U6966> \xDD\xC9 |0
-<U6968> \xB7\xA9 |0
-<U6969> \xDD\xE1 |0
-<U696A> \xDD\xD1 |0
-<U696B> \xB7\xAA |0
-<U696C> \xDD\xDA |0
-<U696D> \xB7\x7E |0
-<U696E> \xB4\xD8 |0
-<U696F> \xDD\xE3 |0
-<U6970> \xD9\xBF |0
-<U6971> \xDD\xCE |0
-<U6974> \xDD\xE8 |0
-<U6975> \xB7\xA5 |0
-<U6976> \xDD\xE5 |0
-<U6977> \xB7\xA2 |0
-<U6978> \xDD\xDF |0
-<U6979> \xB7\xAD |0
-<U697A> \xDD\xD6 |0
-<U697B> \xDD\xF3 |0
-<U6982> \xB7\xA7 |0
-<U6983> \xDE\xC6 |0
-<U6986> \xB7\xAE |0
-<U698D> \xE2\x4A |0
-<U698E> \xE2\x48 |0
-<U6990> \xE2\x5E |0
-<U6991> \xE2\x46 |0
-<U6993> \xE2\x58 |0
-<U6994> \xB7\x7D |0
-<U6995> \xBA\x5F |0
-<U6996> \xE2\x42 |0
-<U6997> \xE2\x5D |0
-<U6999> \xE2\x47 |0
-<U699A> \xE2\x55 |0
-<U699B> \xBA\x64 |0
-<U699C> \xBA\x5D |0
-<U699E> \xE2\x5B |0
-<U69A0> \xE2\x40 |0
-<U69A1> \xE2\x5A |0
-<U69A3> \xBA\x6F |0
-<U69A4> \xE2\x51 |0
-<U69A5> \xE2\x61 |0
-<U69A6> \xBA\x6D |0
-<U69A7> \xE2\x49 |0
-<U69A8> \xBA\x5E |0
-<U69A9> \xE2\x4B |0
-<U69AA> \xE2\x59 |0
-<U69AB> \xBA\x67 |0
-<U69AC> \xE2\x44 |0
-<U69AD> \xBA\x6B |0
-<U69AE> \xBA\x61 |0
-<U69AF> \xE2\x4D |0
-<U69B0> \xE2\x43 |0
-<U69B1> \xE1\xFC |0
-<U69B3> \xE2\x57 |0
-<U69B4> \xBA\x68 |0
-<U69B5> \xE2\x60 |0
-<U69B6> \xE1\xFD |0
-<U69B7> \xBA\x65 |0
-<U69B9> \xE2\x53 |0
-<U69BB> \xBA\x66 |0
-<U69BC> \xE2\x45 |0
-<U69BD> \xE2\x50 |0
-<U69BE> \xE2\x4C |0
-<U69BF> \xE2\x4E |0
-<U69C1> \xBA\x60 |0
-<U69C2> \xE2\x5F |0
-<U69C3> \xBA\x6E |0
-<U69C4> \xE2\x4F |0
-<U69C6> \xE2\x62 |0
-<U69C9> \xE1\xFE |0
-<U69CA> \xE2\x54 |0
-<U69CB> \xBA\x63 |0
-<U69CC> \xBA\x6C |0
-<U69CD> \xBA\x6A |0
-<U69CE> \xE2\x41 |0
-<U69CF> \xE2\x56 |0
-<U69D0> \xBA\x69 |0
-<U69D3> \xBA\x62 |0
-<U69D4> \xE2\x52 |0
-<U69D9> \xE2\x5C |0
-<U69E2> \xE5\xD5 |0
-<U69E4> \xE5\xD1 |0
-<U69E5> \xE5\xCD |0
-<U69E6> \xE5\xE1 |0
-<U69E7> \xE5\xDE |0
-<U69E8> \xBC\xCD |0
-<U69EB> \xE5\xE5 |0
-<U69EC> \xE5\xD4 |0
-<U69ED> \xBC\xD8 |0
-<U69EE> \xE5\xDB |0
-<U69F1> \xE5\xD0 |0
-<U69F2> \xE5\xDA |0
-<U69F3> \xBC\xD5 |0
-<U69F4> \xE5\xEE |0
-<U69F6> \xE5\xEB |0
-<U69F7> \xE5\xDD |0
-<U69F8> \xE5\xCE |0
-<U69FB> \xE5\xE2 |0
-<U69FC> \xE5\xE4 |0
-<U69FD> \xBC\xD1 |0
-<U69FE> \xE5\xD8 |0
-<U69FF> \xE5\xD3 |0
-<U6A00> \xE5\xCA |0
-<U6A01> \xBC\xCE |0
-<U6A02> \xBC\xD6 |0
-<U6A04> \xE5\xE7 |0
-<U6A05> \xBC\xD7 |0
-<U6A06> \xE5\xCB |0
-<U6A07> \xE5\xED |0
-<U6A08> \xE5\xE0 |0
-<U6A09> \xE5\xE6 |0
-<U6A0A> \xBC\xD4 |0
-<U6A0D> \xE5\xE3 |0
-<U6A0F> \xE5\xEA |0
-<U6A11> \xBC\xD9 |0
-<U6A13> \xBC\xD3 |0
-<U6A14> \xE5\xDC |0
-<U6A15> \xE5\xCF |0
-<U6A16> \xE5\xEF |0
-<U6A17> \xE5\xCC |0
-<U6A18> \xE5\xE8 |0
-<U6A19> \xBC\xD0 |0
-<U6A1B> \xE5\xD6 |0
-<U6A1D> \xE5\xD7 |0
-<U6A1E> \xBC\xCF |0
-<U6A1F> \xBC\xCC |0
-<U6A20> \xE5\xD2 |0
-<U6A21> \xBC\xD2 |0
-<U6A23> \xBC\xCB |0
-<U6A25> \xE5\xE9 |0
-<U6A26> \xE5\xEC |0
-<U6A27> \xE5\xD9 |0
-<U6A28> \xE9\xCA |0
-<U6A32> \xE9\xC2 |0
-<U6A34> \xE9\xBE |0
-<U6A35> \xBE\xF6 |0
-<U6A38> \xBE\xEB |0
-<U6A39> \xBE\xF0 |0
-<U6A3A> \xBE\xEC |0
-<U6A3B> \xE9\xCC |0
-<U6A3C> \xE9\xD7 |0
-<U6A3D> \xBE\xEA |0
-<U6A3E> \xE9\xC4 |0
-<U6A3F> \xE9\xCD |0
-<U6A40> \xE5\xDF |0
-<U6A41> \xE9\xCE |0
-<U6A44> \xBE\xF1 |0
-<U6A46> \xE9\xDD |0
-<U6A47> \xBE\xF5 |0
-<U6A48> \xBE\xF8 |0
-<U6A49> \xE9\xC0 |0
-<U6A4B> \xBE\xF4 |0
-<U6A4D> \xE9\xDB |0
-<U6A4E> \xE9\xDC |0
-<U6A4F> \xE9\xD2 |0
-<U6A50> \xE9\xD1 |0
-<U6A51> \xE9\xC9 |0
-<U6A54> \xE9\xD3 |0
-<U6A55> \xE9\xDA |0
-<U6A56> \xE9\xD9 |0
-<U6A58> \xBE\xEF |0
-<U6A59> \xBE\xED |0
-<U6A5A> \xE9\xCB |0
-<U6A5B> \xE9\xC8 |0
-<U6A5D> \xE9\xC5 |0
-<U6A5E> \xE9\xD8 |0
-<U6A5F> \xBE\xF7 |0
-<U6A60> \xE9\xD6 |0
-<U6A61> \xBE\xF3 |0
-<U6A62> \xBE\xF2 |0
-<U6A64> \xE9\xD0 |0
-<U6A66> \xE9\xBF |0
-<U6A67> \xE9\xC1 |0
-<U6A68> \xE9\xC3 |0
-<U6A69> \xE9\xD5 |0
-<U6A6A> \xE9\xCF |0
-<U6A6B> \xBE\xEE |0
-<U6A6D> \xE9\xC6 |0
-<U6A6F> \xE9\xD4 |0
-<U6A76> \xE9\xC7 |0
-<U6A7E> \xC0\xCF |0
-<U6A7F> \xED\x45 |0
-<U6A80> \xC0\xC8 |0
-<U6A81> \xEC\xF5 |0
-<U6A83> \xED\x41 |0
-<U6A84> \xC0\xCA |0
-<U6A85> \xED\x48 |0
-<U6A87> \xEC\xFC |0
-<U6A89> \xEC\xF7 |0
-<U6A8C> \xED\x49 |0
-<U6A8D> \xEC\xF3 |0
-<U6A8E> \xEC\xFE |0
-<U6A90> \xC0\xD1 |0
-<U6A91> \xED\x44 |0
-<U6A92> \xED\x4A |0
-<U6A93> \xEC\xFD |0
-<U6A94> \xC0\xC9 |0
-<U6A95> \xED\x40 |0
-<U6A96> \xEC\xF4 |0
-<U6A97> \xC0\xD0 |0
-<U6A9A> \xED\x47 |0
-<U6A9B> \xEC\xF9 |0
-<U6A9C> \xC0\xCC |0
-<U6A9E> \xEC\xFB |0
-<U6A9F> \xEC\xF8 |0
-<U6AA0> \xC0\xD2 |0
-<U6AA1> \xEC\xFA |0
-<U6AA2> \xC0\xCB |0
-<U6AA3> \xC0\xCE |0
-<U6AA4> \xED\x43 |0
-<U6AA5> \xEC\xF6 |0
-<U6AA6> \xED\x46 |0
-<U6AA8> \xED\x42 |0
-<U6AAC> \xC2\x63 |0
-<U6AAD> \xEF\xE7 |0
-<U6AAE> \xC2\x68 |0
-<U6AAF> \xC2\x69 |0
-<U6AB3> \xC2\x62 |0
-<U6AB4> \xEF\xE6 |0
-<U6AB6> \xEF\xE3 |0
-<U6AB7> \xEF\xE4 |0
-<U6AB8> \xC2\x66 |0
-<U6AB9> \xEF\xDE |0
-<U6ABA> \xEF\xE2 |0
-<U6ABB> \xC2\x65 |0
-<U6ABD> \xEF\xDF |0
-<U6AC2> \xC2\x67 |0
-<U6AC3> \xC2\x64 |0
-<U6AC5> \xEF\xDD |0
-<U6AC6> \xEF\xE1 |0
-<U6AC7> \xEF\xE5 |0
-<U6ACB> \xF2\x51 |0
-<U6ACC> \xF2\x4E |0
-<U6ACD> \xF2\x57 |0
-<U6ACF> \xF2\x56 |0
-<U6AD0> \xF2\x54 |0
-<U6AD1> \xF2\x4F |0
-<U6AD3> \xC3\x72 |0
-<U6AD9> \xF2\x50 |0
-<U6ADA> \xC3\x71 |0
-<U6ADB> \xC0\xCD |0
-<U6ADC> \xF2\x53 |0
-<U6ADD> \xC3\x70 |0
-<U6ADE> \xF2\x58 |0
-<U6ADF> \xF2\x52 |0
-<U6AE0> \xF2\x4D |0
-<U6AE1> \xEF\xE0 |0
-<U6AE5> \xC3\x6F |0
-<U6AE7> \xF2\x4C |0
-<U6AE8> \xF4\x56 |0
-<U6AEA> \xF4\x55 |0
-<U6AEB> \xF2\x55 |0
-<U6AEC> \xC4\x68 |0
-<U6AEE> \xF4\x59 |0
-<U6AEF> \xF4\x5A |0
-<U6AF0> \xF4\x54 |0
-<U6AF1> \xF4\x58 |0
-<U6AF3> \xF4\x53 |0
-<U6AF8> \xF5\xD1 |0
-<U6AF9> \xF4\x57 |0
-<U6AFA> \xC4\xE7 |0
-<U6AFB> \xC4\xE5 |0
-<U6AFC> \xF5\xCF |0
-<U6B00> \xF5\xD2 |0
-<U6B02> \xF5\xCE |0
-<U6B03> \xF5\xD0 |0
-<U6B04> \xC4\xE6 |0
-<U6B08> \xF6\xE5 |0
-<U6B09> \xF6\xE6 |0
-<U6B0A> \xC5\x76 |0
-<U6B0B> \xF6\xE4 |0
-<U6B0F> \xF7\xE2 |0
-<U6B10> \xC5\xCF |0
-<U6B11> \xF7\xE0 |0
-<U6B12> \xF7\xE1 |0
-<U6B13> \xF8\xAC |0
-<U6B16> \xC6\x56 |0
-<U6B17> \xF8\xF3 |0
-<U6B18> \xF8\xF1 |0
-<U6B19> \xF8\xF2 |0
-<U6B1A> \xF8\xF4 |0
-<U6B1E> \xF9\xBB |0
-<U6B20> \xA4\xED |0
-<U6B21> \xA6\xB8 |0
-<U6B23> \xAA\x59 |0
-<U6B25> \xCC\xE9 |0
-<U6B28> \xCF\x64 |0
-<U6B2C> \xD1\xF5 |0
-<U6B2D> \xD1\xF7 |0
-<U6B2F> \xD1\xF6 |0
-<U6B31> \xD1\xF8 |0
-<U6B32> \xB1\xFD |0
-<U6B33> \xD5\xD7 |0
-<U6B34> \xD1\xF9 |0
-<U6B36> \xD5\xD6 |0
-<U6B37> \xD5\xD8 |0
-<U6B38> \xD5\xD9 |0
-<U6B39> \xD9\xDA |0
-<U6B3A> \xB4\xDB |0
-<U6B3B> \xD9\xDB |0
-<U6B3C> \xD9\xDD |0
-<U6B3D> \xB4\xDC |0
-<U6B3E> \xB4\xDA |0
-<U6B3F> \xD9\xDC |0
-<U6B41> \xDD\xFA |0
-<U6B42> \xDD\xF8 |0
-<U6B43> \xDD\xF7 |0
-<U6B45> \xDD\xF6 |0
-<U6B46> \xDD\xF5 |0
-<U6B47> \xB7\xB2 |0
-<U6B48> \xDD\xF9 |0
-<U6B49> \xBA\x70 |0
-<U6B4A> \xE2\x63 |0
-<U6B4B> \xE2\x65 |0
-<U6B4C> \xBA\x71 |0
-<U6B4D> \xE2\x64 |0
-<U6B4E> \xBC\xDB |0
-<U6B50> \xBC\xDA |0
-<U6B51> \xE5\xF0 |0
-<U6B54> \xE9\xDF |0
-<U6B55> \xE9\xDE |0
-<U6B56> \xE9\xE0 |0
-<U6B59> \xBE\xF9 |0
-<U6B5B> \xED\x4B |0
-<U6B5C> \xC0\xD3 |0
-<U6B5E> \xEF\xE8 |0
-<U6B5F> \xC2\x6A |0
-<U6B60> \xF2\x59 |0
-<U6B61> \xC5\x77 |0
-<U6B62> \xA4\xEE |0
-<U6B63> \xA5\xBF |0
-<U6B64> \xA6\xB9 |0
-<U6B65> \xA8\x42 |0
-<U6B66> \xAA\x5A |0
-<U6B67> \xAA\x5B |0
-<U6B6A> \xAC\x6E |0
-<U6B6D> \xD1\xFA |0
-<U6B72> \xB7\xB3 |0
-<U6B76> \xE6\xD1 |0
-<U6B77> \xBE\xFA |0
-<U6B78> \xC2\x6B |0
-<U6B79> \xA4\xEF |0
-<U6B7B> \xA6\xBA |0
-<U6B7E> \xCC\xEB |0
-<U6B7F> \xAA\x5C |0
-<U6B80> \xCC\xEA |0
-<U6B82> \xCF\x65 |0
-<U6B83> \xAC\x6F |0
-<U6B84> \xCF\x66 |0
-<U6B86> \xAC\x70 |0
-<U6B88> \xD1\xFC |0
-<U6B89> \xAE\xEE |0
-<U6B8A> \xAE\xED |0
-<U6B8C> \xD5\xDE |0
-<U6B8D> \xD5\xDC |0
-<U6B8E> \xD5\xDD |0
-<U6B8F> \xD5\xDB |0
-<U6B91> \xD5\xDA |0
-<U6B94> \xD9\xDE |0
-<U6B95> \xD9\xE1 |0
-<U6B96> \xB4\xDE |0
-<U6B97> \xD9\xDF |0
-<U6B98> \xB4\xDD |0
-<U6B99> \xD9\xE0 |0
-<U6B9B> \xDD\xFB |0
-<U6B9E> \xE2\x66 |0
-<U6B9F> \xE2\x67 |0
-<U6BA0> \xE2\x68 |0
-<U6BA2> \xE5\xF3 |0
-<U6BA3> \xE5\xF2 |0
-<U6BA4> \xBC\xDC |0
-<U6BA5> \xE5\xF1 |0
-<U6BA6> \xE5\xF4 |0
-<U6BA7> \xE9\xE1 |0
-<U6BAA> \xE9\xE2 |0
-<U6BAB> \xE9\xE3 |0
-<U6BAD> \xED\x4C |0
-<U6BAE> \xC0\xD4 |0
-<U6BAF> \xC2\x6C |0
-<U6BB0> \xF2\x5A |0
-<U6BB2> \xC4\xE8 |0
-<U6BB3> \xC9\x5F |0
-<U6BB5> \xAC\x71 |0
-<U6BB6> \xCF\x67 |0
-<U6BB7> \xAE\xEF |0
-<U6BBA> \xB1\xFE |0
-<U6BBC> \xB4\xDF |0
-<U6BBD> \xD9\xE2 |0
-<U6BBF> \xB7\xB5 |0
-<U6BC0> \xB7\xB4 |0
-<U6BC3> \xE2\x69 |0
-<U6BC4> \xE2\x6A |0
-<U6BC5> \xBC\xDD |0
-<U6BC6> \xBC\xDE |0
-<U6BC7> \xE9\xE5 |0
-<U6BC8> \xE9\xE4 |0
-<U6BC9> \xEF\xE9 |0
-<U6BCA> \xF7\xE3 |0
-<U6BCB> \xA4\xF0 |0
-<U6BCC> \xC9\x60 |0
-<U6BCD> \xA5\xC0 |0
-<U6BCF> \xA8\x43 |0
-<U6BD0> \xCB\x48 |0
-<U6BD2> \xAC\x72 |0
-<U6BD3> \xB7\xB6 |0
-<U6BD4> \xA4\xF1 |0
-<U6BD6> \xCF\x68 |0
-<U6BD7> \xAC\x73 |0
-<U6BD8> \xCF\x69 |0
-<U6BDA> \xC0\xD5 |0
-<U6BDB> \xA4\xF2 |0
-<U6BDE> \xCC\xEC |0
-<U6BE0> \xCF\x6A |0
-<U6BE2> \xD2\x42 |0
-<U6BE3> \xD2\x41 |0
-<U6BE4> \xD1\xFE |0
-<U6BE6> \xD1\xFD |0
-<U6BE7> \xD2\x43 |0
-<U6BE8> \xD2\x40 |0
-<U6BEB> \xB2\x40 |0
-<U6BEC> \xB2\x41 |0
-<U6BEF> \xB4\xE0 |0
-<U6BF0> \xD9\xE3 |0
-<U6BF2> \xD9\xE4 |0
-<U6BF3> \xD9\xE5 |0
-<U6BF7> \xDE\x41 |0
-<U6BF8> \xDE\x42 |0
-<U6BF9> \xDE\x40 |0
-<U6BFB> \xDD\xFD |0
-<U6BFC> \xDD\xFE |0
-<U6BFD> \xB7\xB7 |0
-<U6BFE> \xE2\x6B |0
-<U6BFF> \xE5\xF7 |0
-<U6C00> \xE5\xF6 |0
-<U6C01> \xE5\xF5 |0
-<U6C02> \xE5\xF8 |0
-<U6C03> \xE9\xE7 |0
-<U6C04> \xE9\xE6 |0
-<U6C05> \xBE\xFB |0
-<U6C06> \xE9\xE8 |0
-<U6C08> \xC0\xD6 |0
-<U6C09> \xED\x4D |0
-<U6C0B> \xEF\xEA |0
-<U6C0C> \xF2\x5B |0
-<U6C0D> \xF6\xE7 |0
-<U6C0F> \xA4\xF3 |0
-<U6C10> \xA5\xC2 |0
-<U6C11> \xA5\xC1 |0
-<U6C13> \xAA\x5D |0
-<U6C14> \xC9\x61 |0
-<U6C15> \xC9\x7E |0
-<U6C16> \xA6\xBB |0
-<U6C18> \xC9\xF7 |0
-<U6C19> \xCB\x49 |0
-<U6C1A> \xCB\x4A |0
-<U6C1B> \xAA\x5E |0
-<U6C1D> \xCC\xED |0
-<U6C1F> \xAC\x74 |0
-<U6C20> \xCF\x6B |0
-<U6C21> \xCF\x6C |0
-<U6C23> \xAE\xF0 |0
-<U6C24> \xAE\xF4 |0
-<U6C25> \xD2\x44 |0
-<U6C26> \xAE\xF3 |0
-<U6C27> \xAE\xF1 |0
-<U6C28> \xAE\xF2 |0
-<U6C2A> \xD5\xDF |0
-<U6C2B> \xB2\x42 |0
-<U6C2C> \xB4\xE3 |0
-<U6C2E> \xB4\xE1 |0
-<U6C2F> \xB4\xE2 |0
-<U6C30> \xD9\xE6 |0
-<U6C33> \xBA\x72 |0
-<U6C34> \xA4\xF4 |0
-<U6C36> \xC9\xA1 |0
-<U6C38> \xA5\xC3 |0
-<U6C3B> \xC9\xA4 |0
-<U6C3E> \xA5\xC6 |0
-<U6C3F> \xC9\xA3 |0
-<U6C40> \xA5\xC5 |0
-<U6C41> \xA5\xC4 |0
-<U6C42> \xA8\x44 |0
-<U6C43> \xC9\xA2 |0
-<U6C46> \xC9\xF8 |0
-<U6C4A> \xC9\xFC |0
-<U6C4B> \xC9\xFE |0
-<U6C4C> \xCA\x40 |0
-<U6C4D> \xA6\xC5 |0
-<U6C4E> \xA6\xC6 |0
-<U6C4F> \xC9\xFB |0
-<U6C50> \xA6\xC1 |0
-<U6C52> \xC9\xF9 |0
-<U6C54> \xC9\xFD |0
-<U6C55> \xA6\xC2 |0
-<U6C57> \xA6\xBD |0
-<U6C59> \xA6\xBE |0
-<U6C5B> \xA6\xC4 |0
-<U6C5C> \xC9\xFA |0
-<U6C5D> \xA6\xBC |0
-<U6C5E> \xA8\x45 |0
-<U6C5F> \xA6\xBF |0
-<U6C60> \xA6\xC0 |0
-<U6C61> \xA6\xC3 |0
-<U6C65> \xCB\x5B |0
-<U6C66> \xCB\x59 |0
-<U6C67> \xCB\x4C |0
-<U6C68> \xA8\x51 |0
-<U6C69> \xCB\x53 |0
-<U6C6A> \xA8\x4C |0
-<U6C6B> \xCB\x4D |0
-<U6C6D> \xCB\x55 |0
-<U6C6F> \xCB\x52 |0
-<U6C70> \xA8\x4F |0
-<U6C71> \xCB\x51 |0
-<U6C72> \xA8\x56 |0
-<U6C73> \xCB\x5A |0
-<U6C74> \xA8\x58 |0
-<U6C76> \xA8\x5A |0
-<U6C78> \xCB\x4B |0
-<U6C7A> \xA8\x4D |0
-<U6C7B> \xCB\x5C |0
-<U6C7D> \xA8\x54 |0
-<U6C7E> \xA8\x57 |0
-<U6C80> \xCD\x45 |0
-<U6C81> \xA8\x47 |0
-<U6C82> \xA8\x5E |0
-<U6C83> \xA8\x55 |0
-<U6C84> \xCB\x4E |0
-<U6C85> \xA8\x4A |0
-<U6C86> \xA8\x59 |0
-<U6C87> \xCB\x56 |0
-<U6C88> \xA8\x48 |0
-<U6C89> \xA8\x49 |0
-<U6C8A> \xCD\x43 |0
-<U6C8B> \xCB\x4F |0
-<U6C8C> \xA8\x50 |0
-<U6C8D> \xA8\x5B |0
-<U6C8E> \xCB\x5D |0
-<U6C8F> \xCB\x50 |0
-<U6C90> \xA8\x4E |0
-<U6C92> \xA8\x53 |0
-<U6C93> \xCC\xEE |0
-<U6C94> \xA8\x5C |0
-<U6C95> \xCB\x57 |0
-<U6C96> \xA8\x52 |0
-<U6C98> \xA8\x5D |0
-<U6C99> \xA8\x46 |0
-<U6C9A> \xCB\x54 |0
-<U6C9B> \xA8\x4B |0
-<U6C9C> \xCB\x58 |0
-<U6C9D> \xCD\x44 |0
-<U6CAB> \xAA\x6A |0
-<U6CAC> \xAA\x7A |0
-<U6CAD> \xCC\xF5 |0
-<U6CAE> \xAA\x71 |0
-<U6CB0> \xCD\x4B |0
-<U6CB1> \xAA\x62 |0
-<U6CB3> \xAA\x65 |0
-<U6CB4> \xCD\x42 |0
-<U6CB6> \xCC\xF3 |0
-<U6CB7> \xCC\xF7 |0
-<U6CB8> \xAA\x6D |0
-<U6CB9> \xAA\x6F |0
-<U6CBA> \xCC\xFA |0
-<U6CBB> \xAA\x76 |0
-<U6CBC> \xAA\x68 |0
-<U6CBD> \xAA\x66 |0
-<U6CBE> \xAA\x67 |0
-<U6CBF> \xAA\x75 |0
-<U6CC0> \xCD\x47 |0
-<U6CC1> \xAA\x70 |0
-<U6CC2> \xCC\xF9 |0
-<U6CC3> \xCC\xFB |0
-<U6CC4> \xAA\x6E |0
-<U6CC5> \xAA\x73 |0
-<U6CC6> \xCC\xFC |0
-<U6CC7> \xCD\x4A |0
-<U6CC9> \xAC\x75 |0
-<U6CCA> \xAA\x79 |0
-<U6CCC> \xAA\x63 |0
-<U6CCD> \xCD\x49 |0
-<U6CCF> \xCD\x4D |0
-<U6CD0> \xCC\xF8 |0
-<U6CD1> \xCD\x4F |0
-<U6CD2> \xCD\x40 |0
-<U6CD3> \xAA\x6C |0
-<U6CD4> \xCC\xF4 |0
-<U6CD5> \xAA\x6B |0
-<U6CD6> \xAA\x7D |0
-<U6CD7> \xAA\x72 |0
-<U6CD9> \xCC\xF2 |0
-<U6CDA> \xCF\x75 |0
-<U6CDB> \xAA\x78 |0
-<U6CDC> \xAA\x7C |0
-<U6CDD> \xCD\x41 |0
-<U6CDE> \xCD\x46 |0
-<U6CE0> \xAA\x7E |0
-<U6CE1> \xAA\x77 |0
-<U6CE2> \xAA\x69 |0
-<U6CE3> \xAA\x5F |0
-<U6CE5> \xAA\x64 |0
-<U6CE7> \xCC\xF6 |0
-<U6CE8> \xAA\x60 |0
-<U6CE9> \xCD\x4E |0
-<U6CEB> \xCC\xF0 |0
-<U6CEC> \xCC\xEF |0
-<U6CED> \xCC\xFD |0
-<U6CEE> \xCC\xF1 |0
-<U6CEF> \xAA\x7B |0
-<U6CF0> \xAE\xF5 |0
-<U6CF1> \xAA\x74 |0
-<U6CF2> \xCC\xFE |0
-<U6CF3> \xAA\x61 |0
-<U6CF5> \xAC\xA6 |0
-<U6CF9> \xCD\x4C |0
-<U6D00> \xCF\x7C |0
-<U6D01> \xCF\xA1 |0
-<U6D03> \xCF\xA4 |0
-<U6D04> \xCF\x77 |0
-<U6D07> \xCF\xA7 |0
-<U6D08> \xCF\xAA |0
-<U6D09> \xCF\xAC |0
-<U6D0A> \xCF\x74 |0
-<U6D0B> \xAC\x76 |0
-<U6D0C> \xAC\x7B |0
-<U6D0D> \xD2\x49 |0
-<U6D0E> \xAC\xAD |0
-<U6D0F> \xCF\xA5 |0
-<U6D10> \xCF\xAD |0
-<U6D11> \xCF\x7B |0
-<U6D12> \xCF\x73 |0
-<U6D16> \xD2\x64 |0
-<U6D17> \xAC\x7E |0
-<U6D18> \xCF\xA2 |0
-<U6D19> \xCF\x78 |0
-<U6D1A> \xCF\x7A |0
-<U6D1B> \xAC\xA5 |0
-<U6D1D> \xCF\x7D |0
-<U6D1E> \xAC\x7D |0
-<U6D1F> \xCF\x70 |0
-<U6D20> \xCF\xA8 |0
-<U6D22> \xCF\xAB |0
-<U6D25> \xAC\x7A |0
-<U6D27> \xAC\xA8 |0
-<U6D28> \xCF\x6D |0
-<U6D29> \xAC\xAA |0
-<U6D2A> \xAC\x78 |0
-<U6D2B> \xAC\xAE |0
-<U6D2C> \xCF\xA9 |0
-<U6D2D> \xCF\x6F |0
-<U6D2E> \xAC\xAB |0
-<U6D2F> \xD2\x5E |0
-<U6D30> \xCD\x48 |0
-<U6D31> \xAC\x7C |0
-<U6D32> \xAC\x77 |0
-<U6D33> \xCF\x76 |0
-<U6D34> \xCF\x6E |0
-<U6D35> \xAC\xAC |0
-<U6D36> \xAC\xA4 |0
-<U6D37> \xCF\xA3 |0
-<U6D38> \xAC\xA9 |0
-<U6D39> \xAC\xA7 |0
-<U6D3A> \xCF\x79 |0
-<U6D3B> \xAC\xA1 |0
-<U6D3C> \xCF\x71 |0
-<U6D3D> \xAC\xA2 |0
-<U6D3E> \xAC\xA3 |0
-<U6D3F> \xCF\x72 |0
-<U6D40> \xCF\xA6 |0
-<U6D41> \xAC\x79 |0
-<U6D42> \xCF\x7E |0
-<U6D58> \xD2\x4C |0
-<U6D59> \xAE\xFD |0
-<U6D5A> \xAF\x43 |0
-<U6D5E> \xD2\x55 |0
-<U6D5F> \xD2\x5B |0
-<U6D60> \xD2\x57 |0
-<U6D61> \xD2\x4A |0
-<U6D62> \xD2\x4D |0
-<U6D63> \xD2\x46 |0
-<U6D64> \xD2\x47 |0
-<U6D65> \xAF\x4A |0
-<U6D66> \xAE\xFA |0
-<U6D67> \xD2\x56 |0
-<U6D68> \xD2\x5F |0
-<U6D69> \xAF\x45 |0
-<U6D6A> \xAE\xF6 |0
-<U6D6C> \xAF\x40 |0
-<U6D6D> \xD2\x4E |0
-<U6D6E> \xAF\x42 |0
-<U6D6F> \xD2\x4F |0
-<U6D70> \xD2\x59 |0
-<U6D74> \xAF\x44 |0
-<U6D75> \xD2\x68 |0
-<U6D76> \xD2\x48 |0
-<U6D77> \xAE\xFC |0
-<U6D78> \xAE\xFB |0
-<U6D79> \xAF\x48 |0
-<U6D7A> \xD2\x45 |0
-<U6D7B> \xD2\x66 |0
-<U6D7C> \xD2\x5A |0
-<U6D7D> \xD2\x67 |0
-<U6D7E> \xD2\x61 |0
-<U6D7F> \xD2\x53 |0
-<U6D80> \xD2\x62 |0
-<U6D82> \xD2\x5C |0
-<U6D83> \xD2\x65 |0
-<U6D84> \xD2\x63 |0
-<U6D85> \xAF\x49 |0
-<U6D86> \xD2\x54 |0
-<U6D87> \xAE\xF9 |0
-<U6D88> \xAE\xF8 |0
-<U6D89> \xAF\x41 |0
-<U6D8A> \xAF\x47 |0
-<U6D8B> \xD2\x60 |0
-<U6D8C> \xAF\x46 |0
-<U6D8D> \xD2\x51 |0
-<U6D8E> \xB2\x43 |0
-<U6D90> \xD2\x69 |0
-<U6D91> \xD2\x50 |0
-<U6D92> \xD2\x4B |0
-<U6D93> \xAE\xFE |0
-<U6D94> \xAF\x4B |0
-<U6D95> \xAE\xF7 |0
-<U6D97> \xD2\x58 |0
-<U6D98> \xD2\x5D |0
-<U6DAA> \xB2\x65 |0
-<U6DAB> \xD5\xE1 |0
-<U6DAC> \xD5\xE5 |0
-<U6DAE> \xB2\x52 |0
-<U6DAF> \xB2\x50 |0
-<U6DB2> \xB2\x47 |0
-<U6DB3> \xD5\xE3 |0
-<U6DB4> \xD5\xE2 |0
-<U6DB5> \xB2\x5B |0
-<U6DB7> \xD5\xE8 |0
-<U6DB8> \xB2\x55 |0
-<U6DBA> \xD5\xFA |0
-<U6DBB> \xD6\x47 |0
-<U6DBC> \xB2\x44 |0
-<U6DBD> \xD5\xF7 |0
-<U6DBE> \xD5\xF0 |0
-<U6DBF> \xB2\x67 |0
-<U6DC0> \xD5\xE0 |0
-<U6DC2> \xD5\xFC |0
-<U6DC4> \xB2\x64 |0
-<U6DC5> \xB2\x58 |0
-<U6DC6> \xB2\x63 |0
-<U6DC7> \xB2\x4E |0
-<U6DC8> \xD5\xEC |0
-<U6DC9> \xD5\xFE |0
-<U6DCA> \xD5\xF6 |0
-<U6DCB> \xB2\x4F |0
-<U6DCC> \xB2\x49 |0
-<U6DCD> \xD6\x45 |0
-<U6DCF> \xD5\xFD |0
-<U6DD0> \xD6\x40 |0
-<U6DD1> \xB2\x51 |0
-<U6DD2> \xB2\x59 |0
-<U6DD3> \xD6\x42 |0
-<U6DD4> \xD5\xEA |0
-<U6DD5> \xD5\xFB |0
-<U6DD6> \xD5\xEF |0
-<U6DD7> \xD6\x44 |0
-<U6DD8> \xB2\x5E |0
-<U6DD9> \xB2\x46 |0
-<U6DDA> \xB2\x5C |0
-<U6DDB> \xD5\xF4 |0
-<U6DDC> \xD5\xF2 |0
-<U6DDD> \xD5\xF3 |0
-<U6DDE> \xB2\x53 |0
-<U6DDF> \xD5\xEE |0
-<U6DE0> \xD5\xED |0
-<U6DE1> \xB2\x48 |0
-<U6DE2> \xD5\xE7 |0
-<U6DE3> \xD6\x46 |0
-<U6DE4> \xB2\x4A |0
-<U6DE5> \xD5\xF1 |0
-<U6DE6> \xB2\x68 |0
-<U6DE8> \xB2\x62 |0
-<U6DE9> \xD5\xE6 |0
-<U6DEA> \xB2\x5F |0
-<U6DEB> \xB2\x5D |0
-<U6DEC> \xB2\x66 |0
-<U6DED> \xD5\xF8 |0
-<U6DEE> \xB2\x61 |0
-<U6DEF> \xD2\x52 |0
-<U6DF0> \xD5\xF9 |0
-<U6DF1> \xB2\x60 |0
-<U6DF2> \xD6\x41 |0
-<U6DF3> \xB2\x45 |0
-<U6DF4> \xD5\xF5 |0
-<U6DF5> \xB2\x57 |0
-<U6DF6> \xD5\xE9 |0
-<U6DF7> \xB2\x56 |0
-<U6DF9> \xB2\x54 |0
-<U6DFA> \xB2\x4C |0
-<U6DFB> \xB2\x4B |0
-<U6DFC> \xD9\xE7 |0
-<U6DFD> \xD6\x43 |0
-<U6E00> \xD5\xEB |0
-<U6E03> \xD9\xFC |0
-<U6E05> \xB2\x4D |0
-<U6E19> \xB5\x41 |0
-<U6E1A> \xB2\x5A |0
-<U6E1B> \xB4\xEE |0
-<U6E1C> \xD9\xF6 |0
-<U6E1D> \xB4\xFC |0
-<U6E1F> \xD9\xEA |0
-<U6E20> \xB4\xEB |0
-<U6E21> \xB4\xE7 |0
-<U6E22> \xDA\x49 |0
-<U6E23> \xB4\xED |0
-<U6E24> \xB4\xF1 |0
-<U6E25> \xB4\xEC |0
-<U6E26> \xB4\xF5 |0
-<U6E27> \xDA\x4D |0
-<U6E28> \xDA\x44 |0
-<U6E2B> \xD9\xF1 |0
-<U6E2C> \xB4\xFA |0
-<U6E2D> \xB4\xF4 |0
-<U6E2E> \xD9\xFD |0
-<U6E2F> \xB4\xE4 |0
-<U6E30> \xDA\x4A |0
-<U6E31> \xDA\x43 |0
-<U6E32> \xB4\xE8 |0
-<U6E33> \xD9\xF7 |0
-<U6E34> \xB4\xF7 |0
-<U6E35> \xDA\x55 |0
-<U6E36> \xDA\x56 |0
-<U6E38> \xB4\xE5 |0
-<U6E39> \xDA\x48 |0
-<U6E3A> \xB4\xF9 |0
-<U6E3B> \xD9\xFB |0
-<U6E3C> \xD9\xED |0
-<U6E3D> \xD9\xEE |0
-<U6E3E> \xB4\xFD |0
-<U6E3F> \xD9\xF2 |0
-<U6E40> \xD9\xF9 |0
-<U6E41> \xD9\xF3 |0
-<U6E43> \xB4\xFB |0
-<U6E44> \xB5\x44 |0
-<U6E45> \xD9\xEF |0
-<U6E46> \xD9\xE8 |0
-<U6E47> \xD9\xE9 |0
-<U6E49> \xD9\xEB |0
-<U6E4A> \xB4\xEA |0
-<U6E4B> \xD9\xF8 |0
-<U6E4D> \xB4\xF8 |0
-<U6E4E> \xB5\x42 |0
-<U6E51> \xD9\xFA |0
-<U6E52> \xDA\x53 |0
-<U6E53> \xDA\x4B |0
-<U6E54> \xB4\xE6 |0
-<U6E55> \xDA\x51 |0
-<U6E56> \xB4\xF2 |0
-<U6E58> \xB4\xF0 |0
-<U6E5A> \xDA\x57 |0
-<U6E5B> \xB4\xEF |0
-<U6E5C> \xDA\x41 |0
-<U6E5D> \xD9\xF4 |0
-<U6E5E> \xD9\xFE |0
-<U6E5F> \xB5\x47 |0
-<U6E60> \xDA\x45 |0
-<U6E61> \xDA\x42 |0
-<U6E62> \xD9\xF0 |0
-<U6E63> \xB5\x43 |0
-<U6E64> \xDA\x4F |0
-<U6E65> \xDA\x4C |0
-<U6E66> \xDA\x54 |0
-<U6E67> \xB4\xE9 |0
-<U6E68> \xDA\x40 |0
-<U6E69> \xB5\x46 |0
-<U6E6B> \xDA\x47 |0
-<U6E6E> \xB4\xF3 |0
-<U6E6F> \xB4\xF6 |0
-<U6E71> \xDA\x46 |0
-<U6E72> \xB5\x45 |0
-<U6E73> \xD9\xF5 |0
-<U6E74> \xD5\xE4 |0
-<U6E77> \xDA\x50 |0
-<U6E78> \xDA\x4E |0
-<U6E79> \xDA\x52 |0
-<U6E88> \xD9\xEC |0
-<U6E89> \xB5\x40 |0
-<U6E8D> \xDE\x61 |0
-<U6E8E> \xDE\x60 |0
-<U6E8F> \xDE\x46 |0
-<U6E90> \xB7\xBD |0
-<U6E92> \xDE\x5F |0
-<U6E93> \xDE\x49 |0
-<U6E94> \xDE\x4A |0
-<U6E96> \xB7\xC7 |0
-<U6E97> \xDE\x68 |0
-<U6E98> \xB7\xC2 |0
-<U6E99> \xDE\x5E |0
-<U6E9B> \xDE\x43 |0
-<U6E9C> \xB7\xC8 |0
-<U6E9D> \xB7\xBE |0
-<U6E9E> \xDE\x52 |0
-<U6E9F> \xDE\x48 |0
-<U6EA0> \xDE\x4B |0
-<U6EA1> \xDE\x63 |0
-<U6EA2> \xB7\xB8 |0
-<U6EA3> \xDE\x6A |0
-<U6EA4> \xDE\x62 |0
-<U6EA5> \xB7\xC1 |0
-<U6EA6> \xDE\x57 |0
-<U6EA7> \xB7\xCC |0
-<U6EAA> \xB7\xCB |0
-<U6EAB> \xB7\xC5 |0
-<U6EAE> \xDE\x69 |0
-<U6EAF> \xB7\xB9 |0
-<U6EB0> \xDE\x55 |0
-<U6EB1> \xDE\x4C |0
-<U6EB2> \xDE\x59 |0
-<U6EB3> \xDE\x65 |0
-<U6EB4> \xB7\xCD |0
-<U6EB6> \xB7\xBB |0
-<U6EB7> \xDE\x54 |0
-<U6EB9> \xDE\x4D |0
-<U6EBA> \xB7\xC4 |0
-<U6EBC> \xB7\xC3 |0
-<U6EBD> \xDE\x50 |0
-<U6EBE> \xDE\x5A |0
-<U6EBF> \xDE\x64 |0
-<U6EC0> \xDE\x47 |0
-<U6EC1> \xDE\x51 |0
-<U6EC2> \xB7\xBC |0
-<U6EC3> \xDE\x5B |0
-<U6EC4> \xB7\xC9 |0
-<U6EC5> \xB7\xC0 |0
-<U6EC6> \xDE\x4E |0
-<U6EC7> \xB7\xBF |0
-<U6EC8> \xDE\x45 |0
-<U6EC9> \xDE\x53 |0
-<U6ECA> \xDE\x67 |0
-<U6ECB> \xB4\xFE |0
-<U6ECC> \xBA\xB0 |0
-<U6ECD> \xDE\x56 |0
-<U6ECE> \xE2\x6C |0
-<U6ECF> \xDE\x58 |0
-<U6ED0> \xDE\x66 |0
-<U6ED1> \xB7\xC6 |0
-<U6ED2> \xDE\x4F |0
-<U6ED3> \xB7\xBA |0
-<U6ED4> \xB7\xCA |0
-<U6ED5> \xBC\xF0 |0
-<U6ED6> \xDE\x44 |0
-<U6ED8> \xDE\x5D |0
-<U6EDC> \xDE\x5C |0
-<U6EEB> \xE2\xAA |0
-<U6EEC> \xBA\xAD |0
-<U6EED> \xE2\x7D |0
-<U6EEE> \xE2\xA4 |0
-<U6EEF> \xBA\xA2 |0
-<U6EF1> \xE2\x6E |0
-<U6EF2> \xBA\xAF |0
-<U6EF4> \xBA\x77 |0
-<U6EF5> \xE2\x6D |0
-<U6EF6> \xE2\xB0 |0
-<U6EF7> \xBA\xB1 |0
-<U6EF8> \xE2\x71 |0
-<U6EF9> \xE2\xA3 |0
-<U6EFB> \xE2\x73 |0
-<U6EFC> \xE2\xB3 |0
-<U6EFD> \xE2\xAF |0
-<U6EFE> \xBA\x75 |0
-<U6EFF> \xBA\xA1 |0
-<U6F00> \xE6\x53 |0
-<U6F01> \xBA\xAE |0
-<U6F02> \xBA\x7D |0
-<U6F03> \xE2\x6F |0
-<U6F05> \xE2\xAE |0
-<U6F06> \xBA\xA3 |0
-<U6F07> \xE2\xAB |0
-<U6F08> \xE2\xB8 |0
-<U6F09> \xE2\x75 |0
-<U6F0A> \xE2\x7E |0
-<U6F0D> \xE2\xB6 |0
-<U6F0E> \xE2\xAC |0
-<U6F0F> \xBA\x7C |0
-<U6F12> \xE2\x7C |0
-<U6F13> \xBA\x76 |0
-<U6F14> \xBA\x74 |0
-<U6F15> \xBA\xA8 |0
-<U6F18> \xE2\x7A |0
-<U6F19> \xE2\x77 |0
-<U6F1A> \xE2\x78 |0
-<U6F1C> \xE2\xB2 |0
-<U6F1E> \xE2\xB7 |0
-<U6F1F> \xE2\xB5 |0
-<U6F20> \xBA\x7A |0
-<U6F21> \xE2\xB9 |0
-<U6F22> \xBA\x7E |0
-<U6F23> \xBA\xA7 |0
-<U6F25> \xE2\x70 |0
-<U6F26> \xE5\xFA |0
-<U6F27> \xE2\x79 |0
-<U6F29> \xBA\x78 |0
-<U6F2A> \xBA\xAC |0
-<U6F2B> \xBA\xA9 |0
-<U6F2C> \xBA\x7B |0
-<U6F2D> \xE2\xA5 |0
-<U6F2E> \xE2\x74 |0
-<U6F2F> \xBA\xAA |0
-<U6F30> \xE2\xA7 |0
-<U6F31> \xBA\xA4 |0
-<U6F32> \xBA\xA6 |0
-<U6F33> \xBA\x73 |0
-<U6F35> \xE2\xA9 |0
-<U6F36> \xE2\xA1 |0
-<U6F37> \xE2\x72 |0
-<U6F38> \xBA\xA5 |0
-<U6F39> \xE2\xB1 |0
-<U6F3A> \xE2\xB4 |0
-<U6F3B> \xE2\x7B |0
-<U6F3C> \xE2\xA8 |0
-<U6F3E> \xBA\x79 |0
-<U6F3F> \xBC\xDF |0
-<U6F40> \xE2\xA6 |0
-<U6F41> \xE5\xF9 |0
-<U6F43> \xE2\xAD |0
-<U6F4E> \xE2\x76 |0
-<U6F4F> \xE6\x44 |0
-<U6F50> \xE6\x4E |0
-<U6F51> \xBC\xE2 |0
-<U6F52> \xE6\x4D |0
-<U6F53> \xE6\x59 |0
-<U6F54> \xBC\xE4 |0
-<U6F55> \xE6\x4B |0
-<U6F57> \xE6\x4F |0
-<U6F58> \xBC\xEF |0
-<U6F5A> \xE6\x46 |0
-<U6F5B> \xBC\xE7 |0
-<U6F5D> \xE6\x52 |0
-<U6F5E> \xE9\xF0 |0
-<U6F5F> \xBC\xF3 |0
-<U6F60> \xBC\xF2 |0
-<U6F61> \xE6\x54 |0
-<U6F62> \xE6\x43 |0
-<U6F63> \xE6\x5E |0
-<U6F64> \xBC\xED |0
-<U6F66> \xBC\xE3 |0
-<U6F67> \xE6\x57 |0
-<U6F69> \xE6\x5B |0
-<U6F6A> \xE6\x60 |0
-<U6F6B> \xE6\x55 |0
-<U6F6C> \xE6\x49 |0
-<U6F6D> \xBC\xE6 |0
-<U6F6E> \xBC\xE9 |0
-<U6F6F> \xBC\xF1 |0
-<U6F70> \xBC\xEC |0
-<U6F72> \xE6\x4C |0
-<U6F73> \xE2\xA2 |0
-<U6F76> \xE6\x48 |0
-<U6F77> \xE6\x5F |0
-<U6F78> \xBC\xE8 |0
-<U6F7A> \xBC\xEB |0
-<U6F7B> \xE6\x61 |0
-<U6F7C> \xBC\xE0 |0
-<U6F7D> \xE6\x56 |0
-<U6F7E> \xE5\xFB |0
-<U6F7F> \xE6\x5C |0
-<U6F80> \xC0\xDF |0
-<U6F82> \xE6\x4A |0
-<U6F84> \xBC\xE1 |0
-<U6F85> \xE6\x45 |0
-<U6F86> \xBC\xE5 |0
-<U6F87> \xE5\xFC |0
-<U6F88> \xBA\xAB |0
-<U6F89> \xE6\x41 |0
-<U6F8B> \xE6\x5A |0
-<U6F8C> \xE6\x42 |0
-<U6F8D> \xE6\x40 |0
-<U6F8E> \xBC\xEA |0
-<U6F90> \xE6\x58 |0
-<U6F92> \xE5\xFE |0
-<U6F93> \xE6\x51 |0
-<U6F94> \xE6\x50 |0
-<U6F95> \xE6\x5D |0
-<U6F96> \xE6\x47 |0
-<U6F97> \xBC\xEE |0
-<U6F9E> \xE9\xF3 |0
-<U6FA0> \xBF\x49 |0
-<U6FA1> \xBE\xFE |0
-<U6FA2> \xEA\x40 |0
-<U6FA3> \xE9\xEB |0
-<U6FA4> \xBF\x41 |0
-<U6FA5> \xE9\xF7 |0
-<U6FA6> \xBF\x48 |0
-<U6FA7> \xBF\x43 |0
-<U6FA8> \xE9\xF5 |0
-<U6FA9> \xED\x4F |0
-<U6FAA> \xE9\xFB |0
-<U6FAB> \xEA\x42 |0
-<U6FAC> \xE9\xFA |0
-<U6FAD> \xE9\xE9 |0
-<U6FAE> \xE9\xF8 |0
-<U6FAF> \xEA\x44 |0
-<U6FB0> \xEA\x46 |0
-<U6FB1> \xBE\xFD |0
-<U6FB2> \xEA\x45 |0
-<U6FB3> \xBF\x44 |0
-<U6FB4> \xBF\x4A |0
-<U6FB6> \xBF\x47 |0
-<U6FB8> \xE9\xFE |0
-<U6FB9> \xBF\x46 |0
-<U6FBA> \xE9\xF9 |0
-<U6FBC> \xE9\xED |0
-<U6FBD> \xE9\xF2 |0
-<U6FBF> \xE9\xFD |0
-<U6FC0> \xBF\x45 |0
-<U6FC1> \xBF\x42 |0
-<U6FC2> \xBE\xFC |0
-<U6FC3> \xBF\x40 |0
-<U6FC4> \xE9\xF1 |0
-<U6FC6> \xE5\xFD |0
-<U6FC7> \xE9\xEC |0
-<U6FC8> \xE9\xEF |0
-<U6FC9> \xEA\x41 |0
-<U6FCA> \xE9\xF4 |0
-<U6FCB> \xE9\xEA |0
-<U6FCC> \xED\x4E |0
-<U6FCD> \xEA\x43 |0
-<U6FCE> \xE9\xEE |0
-<U6FCF> \xE9\xFC |0
-<U6FD4> \xED\x51 |0
-<U6FD5> \xC0\xE3 |0
-<U6FD8> \xC0\xD7 |0
-<U6FDB> \xC0\xDB |0
-<U6FDC> \xED\x53 |0
-<U6FDD> \xED\x59 |0
-<U6FDE> \xED\x57 |0
-<U6FDF> \xC0\xD9 |0
-<U6FE0> \xC0\xDA |0
-<U6FE1> \xC0\xE1 |0
-<U6FE2> \xED\x5A |0
-<U6FE3> \xED\x52 |0
-<U6FE4> \xC0\xDC |0
-<U6FE6> \xED\x56 |0
-<U6FE7> \xED\x55 |0
-<U6FE8> \xED\x5B |0
-<U6FE9> \xC0\xE2 |0
-<U6FEB> \xC0\xDD |0
-<U6FEC> \xC0\xE0 |0
-<U6FED> \xED\x54 |0
-<U6FEE> \xC0\xE4 |0
-<U6FEF> \xC0\xDE |0
-<U6FF0> \xC0\xE5 |0
-<U6FF1> \xC0\xD8 |0
-<U6FF2> \xED\x58 |0
-<U6FF4> \xED\x50 |0
-<U6FF7> \xEF\xF7 |0
-<U6FFA> \xC2\x71 |0
-<U6FFB> \xEF\xF4 |0
-<U6FFC> \xEF\xF6 |0
-<U6FFE> \xC2\x6F |0
-<U6FFF> \xEF\xF2 |0
-<U7000> \xEF\xF3 |0
-<U7001> \xEF\xEE |0
-<U7004> \xE9\xF6 |0
-<U7005> \xEF\xEF |0
-<U7006> \xC2\x70 |0
-<U7007> \xEF\xEB |0
-<U7009> \xC2\x6D |0
-<U700A> \xEF\xF8 |0
-<U700B> \xC2\x6E |0
-<U700C> \xEF\xEC |0
-<U700D> \xEF\xED |0
-<U700E> \xEF\xF1 |0
-<U700F> \xC2\x73 |0
-<U7011> \xC2\x72 |0
-<U7014> \xEF\xF0 |0
-<U7015> \xC3\x78 |0
-<U7016> \xF2\x5F |0
-<U7017> \xF2\x65 |0
-<U7018> \xC3\x79 |0
-<U7019> \xF2\x5C |0
-<U701A> \xC3\x76 |0
-<U701B> \xC3\x73 |0
-<U701C> \xF2\x67 |0
-<U701D> \xC3\x77 |0
-<U701F> \xC3\x74 |0
-<U7020> \xF2\x5E |0
-<U7021> \xF2\x61 |0
-<U7022> \xF2\x62 |0
-<U7023> \xF2\x63 |0
-<U7024> \xF2\x66 |0
-<U7026> \xEF\xF5 |0
-<U7027> \xF2\x5D |0
-<U7028> \xC3\x75 |0
-<U7029> \xF2\x64 |0
-<U702A> \xF2\x68 |0
-<U702B> \xF2\x60 |0
-<U702F> \xF4\x5D |0
-<U7030> \xC4\x6A |0
-<U7031> \xF4\x60 |0
-<U7032> \xC4\x6B |0
-<U7033> \xF4\x68 |0
-<U7034> \xF4\x5F |0
-<U7035> \xF4\x5C |0
-<U7037> \xF4\x5E |0
-<U7038> \xF4\x62 |0
-<U7039> \xF4\x65 |0
-<U703A> \xF4\x64 |0
-<U703B> \xF4\x67 |0
-<U703C> \xF4\x5B |0
-<U703E> \xC4\x69 |0
-<U703F> \xF4\x63 |0
-<U7040> \xF4\x66 |0
-<U7041> \xF4\x69 |0
-<U7042> \xF4\x61 |0
-<U7043> \xF5\xD3 |0
-<U7044> \xF5\xD4 |0
-<U7045> \xF5\xD8 |0
-<U7046> \xF5\xD9 |0
-<U7048> \xF5\xD6 |0
-<U7049> \xF5\xD7 |0
-<U704A> \xF5\xD5 |0
-<U704C> \xC4\xE9 |0
-<U7051> \xC5\x78 |0
-<U7052> \xF6\xEB |0
-<U7055> \xF6\xE8 |0
-<U7056> \xF6\xE9 |0
-<U7057> \xF6\xEA |0
-<U7058> \xC5\x79 |0
-<U705A> \xF7\xE5 |0
-<U705B> \xF7\xE4 |0
-<U705D> \xF8\xAF |0
-<U705E> \xC5\xF4 |0
-<U705F> \xF8\xAD |0
-<U7060> \xF8\xB0 |0
-<U7061> \xF8\xAE |0
-<U7062> \xF8\xF5 |0
-<U7063> \xC6\x57 |0
-<U7064> \xC6\x65 |0
-<U7065> \xF9\xA3 |0
-<U7066> \xF9\x6C |0
-<U7068> \xF9\xA2 |0
-<U7069> \xF9\xD0 |0
-<U706A> \xF9\xD1 |0
-<U706B> \xA4\xF5 |0
-<U7070> \xA6\xC7 |0
-<U7071> \xCA\x41 |0
-<U7074> \xCB\x5E |0
-<U7076> \xA8\x5F |0
-<U7078> \xA8\x62 |0
-<U707A> \xCB\x5F |0
-<U707C> \xA8\x60 |0
-<U707D> \xA8\x61 |0
-<U7082> \xCD\x58 |0
-<U7083> \xCD\x5A |0
-<U7084> \xCD\x55 |0
-<U7085> \xCD\x52 |0
-<U7086> \xCD\x54 |0
-<U708A> \xAA\xA4 |0
-<U708E> \xAA\xA2 |0
-<U7091> \xCD\x56 |0
-<U7092> \xAA\xA3 |0
-<U7093> \xCD\x53 |0
-<U7094> \xCD\x50 |0
-<U7095> \xAA\xA1 |0
-<U7096> \xCD\x57 |0
-<U7098> \xCD\x51 |0
-<U7099> \xAA\xA5 |0
-<U709A> \xCD\x59 |0
-<U709F> \xCF\xAF |0
-<U70A1> \xCF\xB3 |0
-<U70A4> \xAC\xB7 |0
-<U70A9> \xCF\xB6 |0
-<U70AB> \xAC\xAF |0
-<U70AC> \xAC\xB2 |0
-<U70AD> \xAC\xB4 |0
-<U70AE> \xAC\xB6 |0
-<U70AF> \xAC\xB3 |0
-<U70B0> \xCF\xB2 |0
-<U70B1> \xCF\xB1 |0
-<U70B3> \xAC\xB1 |0
-<U70B4> \xCF\xB4 |0
-<U70B5> \xCF\xB5 |0
-<U70B7> \xCF\xAE |0
-<U70B8> \xAC\xB5 |0
-<U70BA> \xAC\xB0 |0
-<U70BE> \xCF\xB0 |0
-<U70C5> \xD2\x77 |0
-<U70C6> \xD2\x78 |0
-<U70C7> \xD2\x79 |0
-<U70C8> \xAF\x50 |0
-<U70CA> \xAF\x4C |0
-<U70CB> \xD2\x6E |0
-<U70CD> \xD2\x76 |0
-<U70CE> \xD2\x7B |0
-<U70CF> \xAF\x51 |0
-<U70D1> \xD2\x6C |0
-<U70D2> \xD2\x72 |0
-<U70D3> \xD2\x6B |0
-<U70D4> \xD2\x75 |0
-<U70D7> \xD2\x71 |0
-<U70D8> \xAF\x4D |0
-<U70D9> \xAF\x4F |0
-<U70DA> \xD2\x7A |0
-<U70DC> \xD2\x6A |0
-<U70DD> \xD2\x6D |0
-<U70DE> \xD2\x73 |0
-<U70E0> \xD2\x74 |0
-<U70E1> \xD2\x7C |0
-<U70E2> \xD2\x70 |0
-<U70E4> \xAF\x4E |0
-<U70EF> \xB2\x6D |0
-<U70F0> \xD6\x4E |0
-<U70F3> \xD6\x50 |0
-<U70F4> \xD6\x4C |0
-<U70F6> \xD6\x58 |0
-<U70F7> \xD6\x4A |0
-<U70F8> \xD6\x57 |0
-<U70F9> \xB2\x69 |0
-<U70FA> \xD6\x48 |0
-<U70FB> \xDA\x5B |0
-<U70FC> \xD6\x52 |0
-<U70FD> \xB2\x6C |0
-<U70FF> \xD6\x53 |0
-<U7100> \xD6\x56 |0
-<U7102> \xD6\x5A |0
-<U7104> \xD6\x4F |0
-<U7106> \xD6\x54 |0
-<U7109> \xB2\x6A |0
-<U710A> \xB2\x6B |0
-<U710B> \xD6\x59 |0
-<U710C> \xD6\x4D |0
-<U710D> \xD6\x49 |0
-<U710E> \xD6\x5B |0
-<U7110> \xD6\x51 |0
-<U7113> \xD6\x55 |0
-<U7117> \xD6\x4B |0
-<U7119> \xB5\x48 |0
-<U711A> \xB5\x49 |0
-<U711B> \xDA\x65 |0
-<U711C> \xB5\x4F |0
-<U711E> \xDA\x59 |0
-<U711F> \xDA\x62 |0
-<U7120> \xDA\x58 |0
-<U7121> \xB5\x4C |0
-<U7122> \xDA\x60 |0
-<U7123> \xDA\x5E |0
-<U7125> \xDA\x5F |0
-<U7126> \xB5\x4A |0
-<U7128> \xDA\x63 |0
-<U712E> \xDA\x5C |0
-<U712F> \xDA\x5A |0
-<U7130> \xB5\x4B |0
-<U7131> \xDA\x5D |0
-<U7132> \xDA\x61 |0
-<U7136> \xB5\x4D |0
-<U713A> \xDA\x64 |0
-<U7141> \xDE\x70 |0
-<U7142> \xDE\x77 |0
-<U7143> \xDE\x79 |0
-<U7144> \xDE\xA1 |0
-<U7146> \xB7\xDA |0
-<U7147> \xDE\x6B |0
-<U7149> \xB7\xD2 |0
-<U714B> \xDE\x7A |0
-<U714C> \xB7\xD7 |0
-<U714D> \xDE\xA2 |0
-<U714E> \xB7\xCE |0
-<U7150> \xDE\x7D |0
-<U7152> \xDE\x6D |0
-<U7153> \xDE\x7E |0
-<U7154> \xDE\x6C |0
-<U7156> \xB7\xDC |0
-<U7158> \xDE\x78 |0
-<U7159> \xB7\xCF |0
-<U715A> \xDE\xA3 |0
-<U715C> \xB7\xD4 |0
-<U715D> \xDE\x71 |0
-<U715E> \xB7\xD9 |0
-<U715F> \xDE\x7C |0
-<U7160> \xDE\x6F |0
-<U7161> \xDE\x76 |0
-<U7162> \xDE\x72 |0
-<U7163> \xDE\x6E |0
-<U7164> \xB7\xD1 |0
-<U7165> \xB7\xD8 |0
-<U7166> \xB7\xD6 |0
-<U7167> \xB7\xD3 |0
-<U7168> \xB7\xDB |0
-<U7169> \xB7\xD0 |0
-<U716A> \xDE\x75 |0
-<U716C> \xB7\xD5 |0
-<U716E> \xB5\x4E |0
-<U7170> \xDE\x7B |0
-<U7172> \xDE\x73 |0
-<U7178> \xDE\x74 |0
-<U717B> \xE2\xC1 |0
-<U717D> \xBA\xB4 |0
-<U7180> \xE2\xBD |0
-<U7181> \xE2\xC3 |0
-<U7182> \xE2\xBF |0
-<U7184> \xBA\xB6 |0
-<U7185> \xE2\xBE |0
-<U7186> \xE2\xC2 |0
-<U7187> \xE2\xBA |0
-<U7189> \xE2\xBC |0
-<U718A> \xBA\xB5 |0
-<U718F> \xE2\xC0 |0
-<U7190> \xE2\xBB |0
-<U7192> \xBA\xB7 |0
-<U7194> \xBA\xB2 |0
-<U7197> \xE2\xC4 |0
-<U7199> \xBA\xB3 |0
-<U719A> \xE6\x67 |0
-<U719B> \xE6\x64 |0
-<U719C> \xE6\x70 |0
-<U719D> \xE6\x6A |0
-<U719E> \xE6\x6C |0
-<U719F> \xBC\xF4 |0
-<U71A0> \xE6\x66 |0
-<U71A1> \xE6\x6E |0
-<U71A4> \xE6\x6D |0
-<U71A5> \xE6\x6B |0
-<U71A7> \xE6\x71 |0
-<U71A8> \xBC\xF7 |0
-<U71A9> \xE6\x68 |0
-<U71AA> \xE6\x6F |0
-<U71AC> \xBC\xF5 |0
-<U71AF> \xE6\x63 |0
-<U71B0> \xE6\x65 |0
-<U71B1> \xBC\xF6 |0
-<U71B2> \xE6\x62 |0
-<U71B3> \xE6\x72 |0
-<U71B5> \xE6\x69 |0
-<U71B8> \xEA\x4A |0
-<U71B9> \xBF\x51 |0
-<U71BC> \xEA\x55 |0
-<U71BD> \xEA\x53 |0
-<U71BE> \xBF\x4B |0
-<U71BF> \xEA\x49 |0
-<U71C0> \xEA\x4C |0
-<U71C1> \xEA\x4D |0
-<U71C2> \xEA\x48 |0
-<U71C3> \xBF\x55 |0
-<U71C4> \xBF\x56 |0
-<U71C5> \xEA\x47 |0
-<U71C6> \xEA\x56 |0
-<U71C7> \xEA\x51 |0
-<U71C8> \xBF\x4F |0
-<U71C9> \xBF\x4C |0
-<U71CA> \xEA\x50 |0
-<U71CB> \xEA\x4E |0
-<U71CE> \xBF\x52 |0
-<U71CF> \xEA\x52 |0
-<U71D0> \xBF\x4D |0
-<U71D2> \xBF\x4E |0
-<U71D4> \xEA\x4F |0
-<U71D5> \xBF\x50 |0
-<U71D6> \xEA\x4B |0
-<U71D8> \xEA\x54 |0
-<U71D9> \xBF\x53 |0
-<U71DA> \xEA\x57 |0
-<U71DB> \xEA\x58 |0
-<U71DC> \xBF\x54 |0
-<U71DF> \xC0\xE7 |0
-<U71E0> \xC0\xEE |0
-<U71E1> \xED\x5C |0
-<U71E2> \xED\x62 |0
-<U71E4> \xED\x60 |0
-<U71E5> \xC0\xEA |0
-<U71E6> \xC0\xE9 |0
-<U71E7> \xC0\xE6 |0
-<U71E8> \xED\x5E |0
-<U71EC> \xC0\xEC |0
-<U71ED> \xC0\xEB |0
-<U71EE> \xC0\xE8 |0
-<U71F0> \xED\x61 |0
-<U71F1> \xED\x5D |0
-<U71F2> \xED\x5F |0
-<U71F4> \xC0\xED |0
-<U71F8> \xC2\x77 |0
-<U71F9> \xEF\xFB |0
-<U71FB> \xC2\x74 |0
-<U71FC> \xC2\x75 |0
-<U71FD> \xEF\xFD |0
-<U71FE> \xC2\x76 |0
-<U71FF> \xEF\xFA |0
-<U7201> \xEF\xF9 |0
-<U7202> \xF2\x6C |0
-<U7203> \xEF\xFC |0
-<U7205> \xF2\x6D |0
-<U7206> \xC3\x7A |0
-<U7207> \xF2\x6B |0
-<U720A> \xF2\x6A |0
-<U720C> \xF2\x69 |0
-<U720D> \xC3\x7B |0
-<U7210> \xC4\x6C |0
-<U7213> \xF4\x6A |0
-<U7214> \xF4\x6B |0
-<U7219> \xF5\xDC |0
-<U721A> \xF5\xDB |0
-<U721B> \xC4\xEA |0
-<U721D> \xF5\xDA |0
-<U721E> \xF6\xEC |0
-<U721F> \xF6\xED |0
-<U7222> \xF7\xE6 |0
-<U7223> \xF8\xB1 |0
-<U7226> \xF8\xF6 |0
-<U7227> \xF9\xBC |0
-<U7228> \xC6\x79 |0
-<U7229> \xF9\xC6 |0
-<U722A> \xA4\xF6 |0
-<U722C> \xAA\xA6 |0
-<U722D> \xAA\xA7 |0
-<U7230> \xAC\xB8 |0
-<U7235> \xC0\xEF |0
-<U7236> \xA4\xF7 |0
-<U7238> \xAA\xA8 |0
-<U7239> \xAF\x52 |0
-<U723A> \xB7\xDD |0
-<U723B> \xA4\xF8 |0
-<U723D> \xB2\x6E |0
-<U723E> \xBA\xB8 |0
-<U723F> \xC9\x62 |0
-<U7241> \xCF\xB7 |0
-<U7242> \xD2\x7D |0
-<U7244> \xE2\xC5 |0
-<U7246> \xC0\xF0 |0
-<U7247> \xA4\xF9 |0
-<U7248> \xAA\xA9 |0
-<U7249> \xCF\xB8 |0
-<U724A> \xCF\xB9 |0
-<U724B> \xDA\x66 |0
-<U724C> \xB5\x50 |0
-<U724F> \xDE\xA4 |0
-<U7252> \xB7\xDE |0
-<U7253> \xE2\xC6 |0
-<U7256> \xBC\xF8 |0
-<U7258> \xC3\x7C |0
-<U7259> \xA4\xFA |0
-<U725A> \xDA\x67 |0
-<U725B> \xA4\xFB |0
-<U725D> \xA6\xC9 |0
-<U725E> \xCA\x42 |0
-<U725F> \xA6\xC8 |0
-<U7260> \xA8\x65 |0
-<U7261> \xA8\x64 |0
-<U7262> \xA8\x63 |0
-<U7263> \xCB\x60 |0
-<U7267> \xAA\xAA |0
-<U7269> \xAA\xAB |0
-<U726A> \xCD\x5B |0
-<U726C> \xCF\xBA |0
-<U726E> \xCF\xBD |0
-<U726F> \xAC\xBA |0
-<U7270> \xCF\xBB |0
-<U7272> \xAC\xB9 |0
-<U7273> \xCF\xBC |0
-<U7274> \xAC\xBB |0
-<U7276> \xD2\xA2 |0
-<U7277> \xD2\xA1 |0
-<U7278> \xD2\x7E |0
-<U7279> \xAF\x53 |0
-<U727B> \xD6\x5D |0
-<U727C> \xD6\x5E |0
-<U727D> \xB2\x6F |0
-<U727E> \xD6\x5C |0
-<U727F> \xD6\x5F |0
-<U7280> \xB5\x52 |0
-<U7281> \xB2\x70 |0
-<U7284> \xB5\x51 |0
-<U7285> \xDA\x6B |0
-<U7286> \xDA\x6A |0
-<U7288> \xDA\x68 |0
-<U7289> \xDA\x69 |0
-<U728B> \xDA\x6C |0
-<U728C> \xDE\xA6 |0
-<U728D> \xDE\xA5 |0
-<U728E> \xDE\xA9 |0
-<U7290> \xDE\xA8 |0
-<U7291> \xDE\xA7 |0
-<U7292> \xBA\xB9 |0
-<U7293> \xE2\xC9 |0
-<U7295> \xE2\xC8 |0
-<U7296> \xBA\xBA |0
-<U7297> \xE2\xC7 |0
-<U7298> \xE6\x73 |0
-<U729A> \xE6\x74 |0
-<U729B> \xBC\xF9 |0
-<U729D> \xEA\x59 |0
-<U729E> \xEA\x5A |0
-<U72A1> \xF2\x72 |0
-<U72A2> \xC3\x7D |0
-<U72A3> \xF2\x71 |0
-<U72A4> \xF2\x70 |0
-<U72A5> \xF2\x6E |0
-<U72A6> \xF2\x6F |0
-<U72A7> \xC4\xEB |0
-<U72A8> \xF4\x6C |0
-<U72A9> \xF6\xEE |0
-<U72AA> \xF8\xF7 |0
-<U72AC> \xA4\xFC |0
-<U72AE> \xC9\xA5 |0
-<U72AF> \xA5\xC7 |0
-<U72B0> \xC9\xA6 |0
-<U72B4> \xCA\x43 |0
-<U72B5> \xCA\x44 |0
-<U72BA> \xCB\x66 |0
-<U72BD> \xCB\x62 |0
-<U72BF> \xCB\x61 |0
-<U72C0> \xAA\xAC |0
-<U72C1> \xCB\x65 |0
-<U72C2> \xA8\x67 |0
-<U72C3> \xCB\x63 |0
-<U72C4> \xA8\x66 |0
-<U72C5> \xCB\x67 |0
-<U72C6> \xCB\x64 |0
-<U72C9> \xCD\x5F |0
-<U72CA> \xCF\xBE |0
-<U72CB> \xCD\x5D |0
-<U72CC> \xCD\x64 |0
-<U72CE> \xAA\xAD |0
-<U72D0> \xAA\xB0 |0
-<U72D1> \xCD\x65 |0
-<U72D2> \xCD\x61 |0
-<U72D4> \xCD\x62 |0
-<U72D6> \xCD\x5C |0
-<U72D7> \xAA\xAF |0
-<U72D8> \xCD\x5E |0
-<U72D9> \xAA\xAE |0
-<U72DA> \xCD\x63 |0
-<U72DC> \xCD\x60 |0
-<U72DF> \xCF\xC2 |0
-<U72E0> \xAC\xBD |0
-<U72E1> \xAC\xBE |0
-<U72E3> \xCF\xC5 |0
-<U72E4> \xCF\xBF |0
-<U72E6> \xCF\xC4 |0
-<U72E8> \xCF\xC0 |0
-<U72E9> \xAC\xBC |0
-<U72EA> \xCF\xC3 |0
-<U72EB> \xCF\xC1 |0
-<U72F3> \xD2\xA8 |0
-<U72F4> \xD2\xA5 |0
-<U72F6> \xD2\xA7 |0
-<U72F7> \xAF\x58 |0
-<U72F8> \xAF\x57 |0
-<U72F9> \xAF\x55 |0
-<U72FA> \xD2\xA4 |0
-<U72FB> \xD2\xA9 |0
-<U72FC> \xAF\x54 |0
-<U72FD> \xAF\x56 |0
-<U72FE> \xD2\xA6 |0
-<U72FF> \xD6\x67 |0
-<U7300> \xD2\xA3 |0
-<U7301> \xD2\xAA |0
-<U7307> \xD6\x62 |0
-<U7308> \xD6\x66 |0
-<U730A> \xD6\x65 |0
-<U730B> \xDA\x6E |0
-<U730C> \xDA\x79 |0
-<U730F> \xD6\x68 |0
-<U7311> \xD6\x63 |0
-<U7312> \xDA\x6D |0
-<U7313> \xB2\x74 |0
-<U7316> \xB2\x73 |0
-<U7317> \xD6\x61 |0
-<U7318> \xD6\x64 |0
-<U7319> \xB2\x75 |0
-<U731B> \xB2\x72 |0
-<U731C> \xB2\x71 |0
-<U731D> \xD6\x60 |0
-<U731E> \xD6\x69 |0
-<U7322> \xDA\x70 |0
-<U7323> \xDA\x77 |0
-<U7325> \xB5\x54 |0
-<U7326> \xDA\x76 |0
-<U7327> \xDA\x73 |0
-<U7329> \xB5\x56 |0
-<U732D> \xDA\x75 |0
-<U7330> \xDA\x6F |0
-<U7331> \xDA\x71 |0
-<U7332> \xDA\x74 |0
-<U7333> \xDA\x72 |0
-<U7334> \xB5\x55 |0
-<U7335> \xDA\x78 |0
-<U7336> \xB5\x53 |0
-<U7337> \xB7\xDF |0
-<U733A> \xDE\xAD |0
-<U733B> \xDE\xAC |0
-<U733C> \xDE\xAA |0
-<U733E> \xB7\xE2 |0
-<U733F> \xB7\xE1 |0
-<U7340> \xDE\xAE |0
-<U7342> \xDE\xAB |0
-<U7343> \xE2\xCA |0
-<U7344> \xBA\xBB |0
-<U7345> \xB7\xE0 |0
-<U7349> \xDE\xB0 |0
-<U734A> \xDE\xAF |0
-<U734C> \xE2\xCD |0
-<U734D> \xE2\xCB |0
-<U734E> \xBC\xFA |0
-<U7350> \xBA\xBC |0
-<U7351> \xE2\xCC |0
-<U7352> \xE6\x76 |0
-<U7357> \xBC\xFB |0
-<U7358> \xE6\x75 |0
-<U7359> \xE6\x7E |0
-<U735A> \xE6\x7D |0
-<U735B> \xE6\x7B |0
-<U735D> \xE6\x7A |0
-<U735E> \xE6\x77 |0
-<U735F> \xE6\x78 |0
-<U7360> \xE6\x79 |0
-<U7361> \xE6\x7C |0
-<U7362> \xE6\xA1 |0
-<U7365> \xEA\x5F |0
-<U7366> \xEA\x5C |0
-<U7367> \xEA\x5D |0
-<U7368> \xBF\x57 |0
-<U7369> \xEA\x5B |0
-<U736A> \xEA\x61 |0
-<U736B> \xEA\x60 |0
-<U736C> \xEA\x5E |0
-<U736E> \xED\x64 |0
-<U736F> \xED\x65 |0
-<U7370> \xC0\xF1 |0
-<U7372> \xC0\xF2 |0
-<U7373> \xED\x63 |0
-<U7375> \xC2\x79 |0
-<U7376> \xEF\xFE |0
-<U7377> \xC2\x78 |0
-<U7378> \xC3\x7E |0
-<U737A> \xC3\xA1 |0
-<U737B> \xC4\x6D |0
-<U737C> \xF4\x6E |0
-<U737D> \xF4\x6D |0
-<U737E> \xF5\xDD |0
-<U737F> \xF6\xEF |0
-<U7380> \xC5\x7A |0
-<U7381> \xF7\xE8 |0
-<U7382> \xF7\xE7 |0
-<U7383> \xF7\xE9 |0
-<U7384> \xA5\xC8 |0
-<U7385> \xCF\xC6 |0
-<U7386> \xAF\x59 |0
-<U7387> \xB2\x76 |0
-<U7388> \xD6\x6A |0
-<U7389> \xA5\xC9 |0
-<U738A> \xC9\xA7 |0
-<U738B> \xA4\xFD |0
-<U738E> \xCA\x45 |0
-<U7392> \xCB\x6C |0
-<U7393> \xCB\x6A |0
-<U7394> \xCB\x6B |0
-<U7395> \xCB\x68 |0
-<U7396> \xA8\x68 |0
-<U7397> \xCB\x69 |0
-<U739D> \xCD\x6D |0
-<U739F> \xAA\xB3 |0
-<U73A0> \xCD\x6B |0
-<U73A1> \xCD\x67 |0
-<U73A2> \xCD\x6A |0
-<U73A4> \xCD\x66 |0
-<U73A5> \xAA\xB5 |0
-<U73A6> \xCD\x69 |0
-<U73A8> \xAA\xB2 |0
-<U73A9> \xAA\xB1 |0
-<U73AB> \xAA\xB4 |0
-<U73AC> \xCD\x6C |0
-<U73AD> \xCD\x68 |0
-<U73B2> \xAC\xC2 |0
-<U73B3> \xAC\xC5 |0
-<U73B4> \xCF\xCE |0
-<U73B5> \xCF\xCD |0
-<U73B6> \xCF\xCC |0
-<U73B7> \xAC\xBF |0
-<U73B8> \xCF\xD5 |0
-<U73B9> \xCF\xCB |0
-<U73BB> \xAC\xC1 |0
-<U73BC> \xD2\xAF |0
-<U73BE> \xCF\xD2 |0
-<U73BF> \xCF\xD0 |0
-<U73C0> \xAC\xC4 |0
-<U73C2> \xCF\xC8 |0
-<U73C3> \xCF\xD3 |0
-<U73C5> \xCF\xCA |0
-<U73C6> \xCF\xD4 |0
-<U73C7> \xCF\xD1 |0
-<U73C8> \xCF\xC9 |0
-<U73CA> \xAC\xC0 |0
-<U73CB> \xCF\xD6 |0
-<U73CC> \xCF\xC7 |0
-<U73CD> \xAC\xC3 |0
-<U73D2> \xD2\xB4 |0
-<U73D3> \xD2\xAB |0
-<U73D4> \xD2\xB6 |0
-<U73D6> \xD2\xAE |0
-<U73D7> \xD2\xB9 |0
-<U73D8> \xD2\xBA |0
-<U73D9> \xD2\xAC |0
-<U73DA> \xD2\xB8 |0
-<U73DB> \xD2\xB5 |0
-<U73DC> \xD2\xB3 |0
-<U73DD> \xD2\xB7 |0
-<U73DE> \xAF\x5F |0
-<U73E0> \xAF\x5D |0
-<U73E3> \xD2\xB1 |0
-<U73E5> \xD2\xAD |0
-<U73E7> \xD2\xB0 |0
-<U73E8> \xD2\xBB |0
-<U73E9> \xD2\xB2 |0
-<U73EA> \xAF\x5E |0
-<U73EB> \xCF\xCF |0
-<U73ED> \xAF\x5A |0
-<U73EE> \xAF\x5C |0
-<U73F4> \xD6\x78 |0
-<U73F5> \xD6\x6D |0
-<U73F6> \xD6\x6B |0
-<U73F8> \xD6\x6C |0
-<U73FA> \xD6\x73 |0
-<U73FC> \xD6\x74 |0
-<U73FD> \xD6\x70 |0
-<U73FE> \xB2\x7B |0
-<U73FF> \xD6\x75 |0
-<U7400> \xD6\x72 |0
-<U7401> \xD6\x6F |0
-<U7403> \xB2\x79 |0
-<U7404> \xD6\x6E |0
-<U7405> \xB2\x77 |0
-<U7406> \xB2\x7A |0
-<U7407> \xD6\x71 |0
-<U7408> \xD6\x79 |0
-<U7409> \xAF\x5B |0
-<U740A> \xB2\x78 |0
-<U740B> \xD6\x77 |0
-<U740C> \xD6\x76 |0
-<U740D> \xB2\x7C |0
-<U7416> \xDA\x7E |0
-<U741A> \xDA\xA1 |0
-<U741B> \xB5\x60 |0
-<U741D> \xDA\xA7 |0
-<U7420> \xDA\xA9 |0
-<U7421> \xDA\xA2 |0
-<U7422> \xB5\x5A |0
-<U7423> \xDA\xA6 |0
-<U7424> \xDA\xA5 |0
-<U7425> \xB5\x5B |0
-<U7426> \xB5\x61 |0
-<U7428> \xB5\x62 |0
-<U7429> \xDA\xA8 |0
-<U742A> \xB5\x58 |0
-<U742B> \xDA\x7D |0
-<U742C> \xDA\x7B |0
-<U742D> \xDA\xA3 |0
-<U742E> \xDA\x7A |0
-<U742F> \xB5\x5F |0
-<U7430> \xDA\x7C |0
-<U7431> \xDA\xA4 |0
-<U7432> \xDA\xAA |0
-<U7433> \xB5\x59 |0
-<U7434> \xB5\x5E |0
-<U7435> \xB5\x5C |0
-<U7436> \xB5\x5D |0
-<U743A> \xB5\x57 |0
-<U743F> \xB7\xE9 |0
-<U7440> \xDE\xB7 |0
-<U7441> \xB7\xE8 |0
-<U7442> \xDE\xBB |0
-<U7444> \xDE\xB1 |0
-<U7446> \xDE\xBC |0
-<U744A> \xDE\xB2 |0
-<U744B> \xDE\xB3 |0
-<U744D> \xDE\xBD |0
-<U744E> \xDE\xBA |0
-<U744F> \xDE\xB8 |0
-<U7450> \xDE\xB9 |0
-<U7451> \xDE\xB5 |0
-<U7452> \xDE\xB4 |0
-<U7454> \xDE\xBE |0
-<U7455> \xB7\xE5 |0
-<U7457> \xDE\xB6 |0
-<U7459> \xB7\xEA |0
-<U745A> \xB7\xE4 |0
-<U745B> \xB7\xEB |0
-<U745C> \xB7\xEC |0
-<U745E> \xB7\xE7 |0
-<U745F> \xB7\xE6 |0
-<U7462> \xE2\xCE |0
-<U7463> \xBA\xBE |0
-<U7464> \xBA\xBD |0
-<U7467> \xE2\xD3 |0
-<U7469> \xBC\xFC |0
-<U746A> \xBA\xBF |0
-<U746D> \xBA\xC1 |0
-<U746E> \xE2\xD4 |0
-<U746F> \xB7\xE3 |0
-<U7470> \xBA\xC0 |0
-<U7471> \xE2\xD0 |0
-<U7472> \xE2\xD2 |0
-<U7473> \xE2\xCF |0
-<U7475> \xE2\xD1 |0
-<U7479> \xE6\xAB |0
-<U747C> \xE6\xAA |0
-<U747D> \xE6\xA7 |0
-<U747E> \xBD\x40 |0
-<U747F> \xEA\x62 |0
-<U7480> \xBD\x41 |0
-<U7481> \xE6\xA6 |0
-<U7483> \xBC\xFE |0
-<U7485> \xE6\xA8 |0
-<U7486> \xE6\xA5 |0
-<U7487> \xE6\xA2 |0
-<U7488> \xE6\xA9 |0
-<U7489> \xE6\xA3 |0
-<U748A> \xE6\xA4 |0
-<U748B> \xBC\xFD |0
-<U7490> \xED\x69 |0
-<U7492> \xEA\x66 |0
-<U7494> \xEA\x65 |0
-<U7495> \xEA\x67 |0
-<U7497> \xED\x66 |0
-<U7498> \xBF\x5A |0
-<U749A> \xEA\x63 |0
-<U749C> \xBF\x58 |0
-<U749E> \xBF\x5C |0
-<U749F> \xBF\x5B |0
-<U74A0> \xEA\x64 |0
-<U74A1> \xEA\x68 |0
-<U74A3> \xBF\x59 |0
-<U74A5> \xED\x6D |0
-<U74A6> \xC0\xF5 |0
-<U74A7> \xC2\x7A |0
-<U74A8> \xC0\xF6 |0
-<U74A9> \xC0\xF3 |0
-<U74AA> \xED\x6A |0
-<U74AB> \xED\x68 |0
-<U74AD> \xED\x6B |0
-<U74AF> \xED\x6E |0
-<U74B0> \xC0\xF4 |0
-<U74B1> \xED\x6C |0
-<U74B2> \xED\x67 |0
-<U74B5> \xF0\x42 |0
-<U74B6> \xF0\x45 |0
-<U74B7> \xF2\x75 |0
-<U74B8> \xF0\x40 |0
-<U74BA> \xF4\x6F |0
-<U74BB> \xF0\x46 |0
-<U74BD> \xC3\xA2 |0
-<U74BE> \xF0\x44 |0
-<U74BF> \xC2\x7B |0
-<U74C0> \xF0\x41 |0
-<U74C1> \xF0\x43 |0
-<U74C2> \xF0\x47 |0
-<U74C3> \xF2\x76 |0
-<U74C5> \xF2\x74 |0
-<U74CA> \xC3\xA3 |0
-<U74CB> \xF2\x73 |0
-<U74CF> \xC4\x6E |0
-<U74D4> \xC4\xED |0
-<U74D5> \xF6\xF1 |0
-<U74D6> \xC4\xEC |0
-<U74D7> \xF6\xF3 |0
-<U74D8> \xF6\xF0 |0
-<U74D9> \xF6\xF2 |0
-<U74DA> \xC5\xD0 |0
-<U74DB> \xF8\xB2 |0
-<U74DC> \xA5\xCA |0
-<U74DD> \xCD\x6E |0
-<U74DE> \xD2\xBC |0
-<U74DF> \xD2\xBD |0
-<U74E0> \xB2\x7D |0
-<U74E1> \xDE\xBF |0
-<U74E2> \xBF\x5D |0
-<U74E3> \xC3\xA4 |0
-<U74E4> \xC5\x7B |0
-<U74E5> \xF8\xB3 |0
-<U74E6> \xA5\xCB |0
-<U74E8> \xCD\x6F |0
-<U74E9> \xA2\x60 |0
-<U74EC> \xCF\xD7 |0
-<U74EE> \xCF\xD8 |0
-<U74F4> \xD2\xBE |0
-<U74F5> \xD2\xBF |0
-<U74F6> \xB2\x7E |0
-<U74F7> \xB2\xA1 |0
-<U74FB> \xDA\xAB |0
-<U74FD> \xDE\xC2 |0
-<U74FE> \xDE\xC1 |0
-<U74FF> \xDE\xC0 |0
-<U7500> \xE2\xD5 |0
-<U7502> \xE2\xD6 |0
-<U7503> \xE2\xD7 |0
-<U7504> \xBA\xC2 |0
-<U7507> \xE6\xAD |0
-<U7508> \xE6\xAC |0
-<U750B> \xEA\x69 |0
-<U750C> \xBF\x5E |0
-<U750D> \xBF\x5F |0
-<U750F> \xED\x72 |0
-<U7510> \xED\x6F |0
-<U7511> \xED\x70 |0
-<U7512> \xED\x71 |0
-<U7513> \xF0\x49 |0
-<U7514> \xF0\x48 |0
-<U7515> \xC2\x7C |0
-<U7516> \xF2\x77 |0
-<U7517> \xF5\xDE |0
-<U7518> \xA5\xCC |0
-<U751A> \xAC\xC6 |0
-<U751C> \xB2\xA2 |0
-<U751D> \xDE\xC3 |0
-<U751F> \xA5\xCD |0
-<U7521> \xD2\xC0 |0
-<U7522> \xB2\xA3 |0
-<U7525> \xB5\x63 |0
-<U7526> \xB5\x64 |0
-<U7528> \xA5\xCE |0
-<U7529> \xA5\xCF |0
-<U752A> \xCA\x46 |0
-<U752B> \xA8\x6A |0
-<U752C> \xA8\x69 |0
-<U752D> \xAC\xC7 |0
-<U752E> \xCF\xD9 |0
-<U752F> \xDA\xAC |0
-<U7530> \xA5\xD0 |0
-<U7531> \xA5\xD1 |0
-<U7532> \xA5\xD2 |0
-<U7533> \xA5\xD3 |0
-<U7537> \xA8\x6B |0
-<U7538> \xA8\x6C |0
-<U7539> \xCB\x6E |0
-<U753A> \xCB\x6D |0
-<U753D> \xAA\xB6 |0
-<U753E> \xCD\x72 |0
-<U753F> \xCD\x70 |0
-<U7540> \xCD\x71 |0
-<U7547> \xCF\xDA |0
-<U7548> \xCF\xDB |0
-<U754B> \xAC\xCB |0
-<U754C> \xAC\xC9 |0
-<U754E> \xAC\xCA |0
-<U754F> \xAC\xC8 |0
-<U7554> \xAF\x60 |0
-<U7559> \xAF\x64 |0
-<U755A> \xAF\x63 |0
-<U755B> \xD2\xC1 |0
-<U755C> \xAF\x62 |0
-<U755D> \xAF\x61 |0
-<U755F> \xD2\xC2 |0
-<U7562> \xB2\xA6 |0
-<U7563> \xD6\x7B |0
-<U7564> \xD6\x7A |0
-<U7565> \xB2\xA4 |0
-<U7566> \xB2\xA5 |0
-<U756A> \xB5\x66 |0
-<U756B> \xB5\x65 |0
-<U756C> \xDA\xAE |0
-<U756F> \xDA\xAD |0
-<U7570> \xB2\xA7 |0
-<U7576> \xB7\xED |0
-<U7577> \xDE\xC5 |0
-<U7578> \xB7\xEE |0
-<U7579> \xDE\xC4 |0
-<U757D> \xE2\xD8 |0
-<U757E> \xE6\xAE |0
-<U757F> \xBD\x42 |0
-<U7580> \xEA\x6A |0
-<U7584> \xED\x73 |0
-<U7586> \xC3\xA6 |0
-<U7587> \xC3\xA5 |0
-<U758A> \xC5\x7C |0
-<U758B> \xA5\xD4 |0
-<U758C> \xCD\x73 |0
-<U758F> \xB2\xA8 |0
-<U7590> \xE2\xD9 |0
-<U7591> \xBA\xC3 |0
-<U7594> \xCB\x6F |0
-<U7595> \xCB\x70 |0
-<U7598> \xCD\x74 |0
-<U7599> \xAA\xB8 |0
-<U759A> \xAA\xB9 |0
-<U759D> \xAA\xB7 |0
-<U75A2> \xAC\xCF |0
-<U75A3> \xAC\xD0 |0
-<U75A4> \xAC\xCD |0
-<U75A5> \xAC\xCE |0
-<U75A7> \xCF\xDC |0
-<U75AA> \xCF\xDD |0
-<U75AB> \xAC\xCC |0
-<U75B0> \xD2\xC3 |0
-<U75B2> \xAF\x68 |0
-<U75B3> \xAF\x69 |0
-<U75B5> \xB2\xAB |0
-<U75B6> \xD2\xC9 |0
-<U75B8> \xAF\x6E |0
-<U75B9> \xAF\x6C |0
-<U75BA> \xD2\xCA |0
-<U75BB> \xD2\xC5 |0
-<U75BC> \xAF\x6B |0
-<U75BD> \xAF\x6A |0
-<U75BE> \xAF\x65 |0
-<U75BF> \xD2\xC8 |0
-<U75C0> \xD2\xC7 |0
-<U75C1> \xD2\xC4 |0
-<U75C2> \xAF\x6D |0
-<U75C4> \xD2\xC6 |0
-<U75C5> \xAF\x66 |0
-<U75C7> \xAF\x67 |0
-<U75CA> \xB2\xAC |0
-<U75CB> \xD6\xA1 |0
-<U75CC> \xD6\xA2 |0
-<U75CD> \xB2\xAD |0
-<U75CE> \xD6\x7C |0
-<U75CF> \xD6\x7E |0
-<U75D0> \xD6\xA4 |0
-<U75D1> \xD6\xA3 |0
-<U75D2> \xD6\x7D |0
-<U75D4> \xB2\xA9 |0
-<U75D5> \xB2\xAA |0
-<U75D7> \xDA\xB6 |0
-<U75D8> \xB5\x6B |0
-<U75D9> \xB5\x6A |0
-<U75DA> \xDA\xB0 |0
-<U75DB> \xB5\x68 |0
-<U75DD> \xDA\xB3 |0
-<U75DE> \xB5\x6C |0
-<U75DF> \xDA\xB4 |0
-<U75E0> \xB5\x6D |0
-<U75E1> \xDA\xB1 |0
-<U75E2> \xB5\x67 |0
-<U75E3> \xB5\x69 |0
-<U75E4> \xDA\xB5 |0
-<U75E6> \xDA\xB2 |0
-<U75E7> \xDA\xAF |0
-<U75ED> \xDE\xD2 |0
-<U75EF> \xDE\xC7 |0
-<U75F0> \xB7\xF0 |0
-<U75F1> \xB7\xF3 |0
-<U75F2> \xB7\xF2 |0
-<U75F3> \xB7\xF7 |0
-<U75F4> \xB7\xF6 |0
-<U75F5> \xDE\xD3 |0
-<U75F6> \xDE\xD1 |0
-<U75F7> \xDE\xCA |0
-<U75F8> \xDE\xCE |0
-<U75F9> \xDE\xCD |0
-<U75FA> \xB7\xF4 |0
-<U75FB> \xDE\xD0 |0
-<U75FC> \xDE\xCC |0
-<U75FD> \xDE\xD4 |0
-<U75FE> \xDE\xCB |0
-<U75FF> \xB7\xF5 |0
-<U7600> \xB7\xEF |0
-<U7601> \xB7\xF1 |0
-<U7603> \xDE\xC9 |0
-<U7608> \xE2\xDB |0
-<U7609> \xBA\xC7 |0
-<U760A> \xE2\xDF |0
-<U760B> \xBA\xC6 |0
-<U760C> \xE2\xDC |0
-<U760D> \xBA\xC5 |0
-<U760F> \xDE\xC8 |0
-<U7610> \xDE\xCF |0
-<U7611> \xE2\xDE |0
-<U7613> \xBA\xC8 |0
-<U7614> \xE2\xE0 |0
-<U7615> \xE2\xDD |0
-<U7616> \xE2\xDA |0
-<U7619> \xE6\xB1 |0
-<U761A> \xE6\xB5 |0
-<U761B> \xE6\xB7 |0
-<U761C> \xE6\xB3 |0
-<U761D> \xE6\xB2 |0
-<U761E> \xE6\xB0 |0
-<U761F> \xBD\x45 |0
-<U7620> \xBD\x43 |0
-<U7621> \xBD\x48 |0
-<U7622> \xBD\x49 |0
-<U7623> \xE6\xB4 |0
-<U7624> \xBD\x46 |0
-<U7625> \xE6\xAF |0
-<U7626> \xBD\x47 |0
-<U7627> \xBA\xC4 |0
-<U7628> \xE6\xB6 |0
-<U7629> \xBD\x44 |0
-<U762D> \xEA\x6C |0
-<U762F> \xEA\x6B |0
-<U7630> \xEA\x73 |0
-<U7631> \xEA\x6D |0
-<U7632> \xEA\x72 |0
-<U7633> \xEA\x6F |0
-<U7634> \xBF\x60 |0
-<U7635> \xEA\x71 |0
-<U7638> \xBF\x61 |0
-<U763A> \xBF\x62 |0
-<U763C> \xEA\x70 |0
-<U763D> \xEA\x6E |0
-<U7642> \xC0\xF8 |0
-<U7643> \xED\x74 |0
-<U7646> \xC0\xF7 |0
-<U7647> \xED\x77 |0
-<U7648> \xED\x75 |0
-<U7649> \xED\x76 |0
-<U764C> \xC0\xF9 |0
-<U7650> \xF0\x4D |0
-<U7652> \xC2\xA1 |0
-<U7653> \xF0\x4E |0
-<U7656> \xC2\x7D |0
-<U7657> \xF0\x4F |0
-<U7658> \xC2\x7E |0
-<U7659> \xF0\x4C |0
-<U765A> \xF0\x50 |0
-<U765C> \xF0\x4A |0
-<U765F> \xC3\xA7 |0
-<U7660> \xF2\x78 |0
-<U7661> \xC3\xA8 |0
-<U7662> \xC4\x6F |0
-<U7664> \xF0\x4B |0
-<U7665> \xC4\x70 |0
-<U7669> \xC4\xEE |0
-<U766A> \xF5\xDF |0
-<U766C> \xC5\x7E |0
-<U766D> \xF6\xF4 |0
-<U766E> \xC5\x7D |0
-<U7670> \xF7\xEA |0
-<U7671> \xC5\xF5 |0
-<U7672> \xC5\xF6 |0
-<U7675> \xF9\xCC |0
-<U7678> \xAC\xD1 |0
-<U7679> \xCF\xDE |0
-<U767B> \xB5\x6E |0
-<U767C> \xB5\x6F |0
-<U767D> \xA5\xD5 |0
-<U767E> \xA6\xCA |0
-<U767F> \xCA\x47 |0
-<U7681> \xCB\x71 |0
-<U7682> \xA8\x6D |0
-<U7684> \xAA\xBA |0
-<U7686> \xAC\xD2 |0
-<U7687> \xAC\xD3 |0
-<U7688> \xAC\xD4 |0
-<U7689> \xD6\xA6 |0
-<U768A> \xD2\xCB |0
-<U768B> \xAF\x6F |0
-<U768E> \xB2\xAE |0
-<U768F> \xD6\xA5 |0
-<U7692> \xDA\xB8 |0
-<U7693> \xB5\x71 |0
-<U7695> \xDA\xB7 |0
-<U7696> \xB5\x70 |0
-<U7699> \xDE\xD5 |0
-<U769A> \xBD\x4A |0
-<U769B> \xE6\xBB |0
-<U769C> \xE6\xB8 |0
-<U769D> \xE6\xB9 |0
-<U769E> \xE6\xBA |0
-<U76A4> \xED\x78 |0
-<U76A6> \xF0\x51 |0
-<U76AA> \xF4\x71 |0
-<U76AB> \xF4\x70 |0
-<U76AD> \xF6\xF5 |0
-<U76AE> \xA5\xD6 |0
-<U76AF> \xCD\x75 |0
-<U76B0> \xAF\x70 |0
-<U76B4> \xB5\x72 |0
-<U76B5> \xDE\xD6 |0
-<U76B8> \xE2\xE1 |0
-<U76BA> \xBD\x4B |0
-<U76BB> \xEA\x74 |0
-<U76BD> \xF0\x52 |0
-<U76BE> \xF4\x72 |0
-<U76BF> \xA5\xD7 |0
-<U76C2> \xAA\xBB |0
-<U76C3> \xAC\xD7 |0
-<U76C4> \xCF\xDF |0
-<U76C5> \xAC\xD8 |0
-<U76C6> \xAC\xD6 |0
-<U76C8> \xAC\xD5 |0
-<U76C9> \xD2\xCC |0
-<U76CA> \xAF\x71 |0
-<U76CD> \xAF\x72 |0
-<U76CE> \xAF\x73 |0
-<U76D2> \xB2\xB0 |0
-<U76D3> \xD6\xA7 |0
-<U76D4> \xB2\xAF |0
-<U76DA> \xDA\xB9 |0
-<U76DB> \xB2\xB1 |0
-<U76DC> \xB5\x73 |0
-<U76DD> \xDE\xD7 |0
-<U76DE> \xB7\xF8 |0
-<U76DF> \xB7\xF9 |0
-<U76E1> \xBA\xC9 |0
-<U76E3> \xBA\xCA |0
-<U76E4> \xBD\x4C |0
-<U76E5> \xBF\x64 |0
-<U76E6> \xEA\x75 |0
-<U76E7> \xBF\x63 |0
-<U76E9> \xED\x79 |0
-<U76EA> \xC0\xFA |0
-<U76EC> \xF0\x53 |0
-<U76ED> \xF4\x73 |0
-<U76EE> \xA5\xD8 |0
-<U76EF> \xA8\x6E |0
-<U76F0> \xCD\x78 |0
-<U76F1> \xCD\x77 |0
-<U76F2> \xAA\xBC |0
-<U76F3> \xCD\x76 |0
-<U76F4> \xAA\xBD |0
-<U76F5> \xCD\x79 |0
-<U76F7> \xCF\xE5 |0
-<U76F8> \xAC\xDB |0
-<U76F9> \xAC\xDA |0
-<U76FA> \xCF\xE7 |0
-<U76FB> \xCF\xE6 |0
-<U76FC> \xAC\xDF |0
-<U76FE> \xAC\xDE |0
-<U7701> \xAC\xD9 |0
-<U7703> \xCF\xE1 |0
-<U7704> \xCF\xE2 |0
-<U7705> \xCF\xE3 |0
-<U7707> \xAC\xE0 |0
-<U7708> \xCF\xE0 |0
-<U7709> \xAC\xDC |0
-<U770A> \xCF\xE4 |0
-<U770B> \xAC\xDD |0
-<U7710> \xD2\xCF |0
-<U7711> \xD2\xD3 |0
-<U7712> \xD2\xD1 |0
-<U7713> \xD2\xD0 |0
-<U7715> \xD2\xD4 |0
-<U7719> \xD2\xD5 |0
-<U771A> \xD2\xD6 |0
-<U771B> \xD2\xCE |0
-<U771D> \xD2\xCD |0
-<U771F> \xAF\x75 |0
-<U7720> \xAF\x76 |0
-<U7722> \xD2\xD7 |0
-<U7723> \xD2\xD2 |0
-<U7725> \xD6\xB0 |0
-<U7727> \xD2\xD8 |0
-<U7728> \xAF\x77 |0
-<U7729> \xAF\x74 |0
-<U772D> \xD6\xAA |0
-<U772F> \xD6\xA9 |0
-<U7731> \xD6\xAB |0
-<U7732> \xD6\xAC |0
-<U7733> \xD6\xAE |0
-<U7734> \xD6\xAD |0
-<U7735> \xD6\xB2 |0
-<U7736> \xB2\xB5 |0
-<U7737> \xB2\xB2 |0
-<U7738> \xB2\xB6 |0
-<U7739> \xD6\xA8 |0
-<U773A> \xB2\xB7 |0
-<U773B> \xD6\xB1 |0
-<U773C> \xB2\xB4 |0
-<U773D> \xD6\xAF |0
-<U773E> \xB2\xB3 |0
-<U7744> \xDA\xBC |0
-<U7745> \xDA\xBE |0
-<U7746> \xDA\xBA |0
-<U7747> \xDA\xBB |0
-<U774A> \xDA\xBF |0
-<U774B> \xDA\xC1 |0
-<U774C> \xDA\xC2 |0
-<U774D> \xDA\xBD |0
-<U774E> \xDA\xC0 |0
-<U774F> \xB5\x74 |0
-<U7752> \xDE\xDB |0
-<U7754> \xDE\xE0 |0
-<U7755> \xDE\xD8 |0
-<U7756> \xDE\xDC |0
-<U7759> \xDE\xE1 |0
-<U775A> \xDE\xDD |0
-<U775B> \xB7\xFA |0
-<U775C> \xB8\x43 |0
-<U775E> \xB7\xFD |0
-<U775F> \xDE\xD9 |0
-<U7760> \xDE\xDA |0
-<U7761> \xBA\xCE |0
-<U7762> \xB8\x46 |0
-<U7763> \xB7\xFE |0
-<U7765> \xB8\x44 |0
-<U7766> \xB7\xFC |0
-<U7767> \xDE\xDF |0
-<U7768> \xB8\x45 |0
-<U7769> \xDE\xDE |0
-<U776A> \xB8\x41 |0
-<U776B> \xB7\xFB |0
-<U776C> \xB8\x42 |0
-<U776D> \xDE\xE2 |0
-<U776E> \xE2\xE6 |0
-<U776F> \xE2\xE8 |0
-<U7779> \xB8\x40 |0
-<U777C> \xE2\xE3 |0
-<U777D> \xBA\xCC |0
-<U777E> \xE2\xE9 |0
-<U777F> \xBA\xCD |0
-<U7780> \xE2\xE7 |0
-<U7781> \xE2\xE2 |0
-<U7782> \xE2\xE5 |0
-<U7783> \xE2\xEA |0
-<U7784> \xBA\xCB |0
-<U7785> \xE2\xE4 |0
-<U7787> \xBD\x4E |0
-<U7788> \xE6\xBF |0
-<U7789> \xE6\xBE |0
-<U778B> \xBD\x51 |0
-<U778C> \xBD\x4F |0
-<U778D> \xE6\xBC |0
-<U778E> \xBD\x4D |0
-<U778F> \xE6\xBD |0
-<U7791> \xBD\x50 |0
-<U7795> \xEA\x7D |0
-<U7797> \xEA\xA1 |0
-<U7799> \xEA\x7E |0
-<U779A> \xEA\x76 |0
-<U779B> \xEA\x7A |0
-<U779C> \xEA\x79 |0
-<U779D> \xEA\x77 |0
-<U779E> \xBF\x66 |0
-<U779F> \xBF\x67 |0
-<U77A0> \xBF\x65 |0
-<U77A1> \xEA\x78 |0
-<U77A2> \xEA\x7B |0
-<U77A3> \xEA\x7C |0
-<U77A5> \xBF\x68 |0
-<U77A7> \xC1\x40 |0
-<U77A8> \xED\xA3 |0
-<U77AA> \xC0\xFC |0
-<U77AB> \xED\x7B |0
-<U77AC> \xC0\xFE |0
-<U77AD> \xC1\x41 |0
-<U77B0> \xC0\xFD |0
-<U77B1> \xED\xA2 |0
-<U77B2> \xED\x7C |0
-<U77B3> \xC0\xFB |0
-<U77B4> \xED\xA1 |0
-<U77B5> \xED\x7A |0
-<U77B6> \xED\x7E |0
-<U77B7> \xED\x7D |0
-<U77BA> \xF0\x55 |0
-<U77BB> \xC2\xA4 |0
-<U77BC> \xC2\xA5 |0
-<U77BD> \xC2\xA2 |0
-<U77BF> \xC2\xA3 |0
-<U77C2> \xF0\x54 |0
-<U77C4> \xF2\x7B |0
-<U77C7> \xC3\xA9 |0
-<U77C9> \xF2\x79 |0
-<U77CA> \xF2\x7A |0
-<U77CC> \xF4\x74 |0
-<U77CD> \xF4\x77 |0
-<U77CE> \xF4\x75 |0
-<U77CF> \xF4\x76 |0
-<U77D0> \xF5\xE0 |0
-<U77D3> \xC4\xEF |0
-<U77D4> \xF7\xEB |0
-<U77D5> \xF8\xB4 |0
-<U77D7> \xC5\xF7 |0
-<U77D8> \xF8\xF8 |0
-<U77D9> \xF8\xF9 |0
-<U77DA> \xC6\x66 |0
-<U77DB> \xA5\xD9 |0
-<U77DC> \xAC\xE1 |0
-<U77DE> \xDA\xC3 |0
-<U77E0> \xDE\xE3 |0
-<U77E2> \xA5\xDA |0
-<U77E3> \xA8\x6F |0
-<U77E5> \xAA\xBE |0
-<U77E7> \xCF\xE8 |0
-<U77E8> \xCF\xE9 |0
-<U77E9> \xAF\x78 |0
-<U77EC> \xDA\xC4 |0
-<U77ED> \xB5\x75 |0
-<U77EE> \xB8\x47 |0
-<U77EF> \xC1\x42 |0
-<U77F0> \xED\xA4 |0
-<U77F1> \xF2\x7C |0
-<U77F2> \xF4\x78 |0
-<U77F3> \xA5\xDB |0
-<U77F7> \xCD\xA1 |0
-<U77F8> \xCD\x7A |0
-<U77F9> \xCD\x7C |0
-<U77FA> \xCD\x7E |0
-<U77FB> \xCD\x7D |0
-<U77FC> \xCD\x7B |0
-<U77FD> \xAA\xBF |0
-<U7802> \xAC\xE2 |0
-<U7803> \xCF\xF2 |0
-<U7805> \xCF\xED |0
-<U7806> \xCF\xEA |0
-<U7809> \xCF\xF1 |0
-<U780C> \xAC\xE4 |0
-<U780D> \xAC\xE5 |0
-<U780E> \xCF\xF0 |0
-<U780F> \xCF\xEF |0
-<U7810> \xCF\xEE |0
-<U7811> \xCF\xEB |0
-<U7812> \xCF\xEC |0
-<U7813> \xCF\xF3 |0
-<U7814> \xAC\xE3 |0
-<U781D> \xAF\x7C |0
-<U781F> \xAF\xA4 |0
-<U7820> \xAF\xA3 |0
-<U7821> \xD2\xE1 |0
-<U7822> \xD2\xDB |0
-<U7823> \xD2\xD9 |0
-<U7825> \xAF\xA1 |0
-<U7826> \xD6\xB9 |0
-<U7827> \xAF\x7A |0
-<U7828> \xD2\xDE |0
-<U7829> \xD2\xE2 |0
-<U782A> \xD2\xE4 |0
-<U782B> \xD2\xE0 |0
-<U782C> \xD2\xDA |0
-<U782D> \xAF\xA2 |0
-<U782E> \xD2\xDF |0
-<U782F> \xD2\xDD |0
-<U7830> \xAF\x79 |0
-<U7831> \xD2\xE5 |0
-<U7832> \xAF\xA5 |0
-<U7833> \xD2\xE3 |0
-<U7834> \xAF\x7D |0
-<U7835> \xD2\xDC |0
-<U7837> \xAF\x7E |0
-<U7838> \xAF\x7B |0
-<U7843> \xB2\xB9 |0
-<U7845> \xD6\xBA |0
-<U7848> \xD6\xB3 |0
-<U7849> \xD6\xB5 |0
-<U784A> \xD6\xB7 |0
-<U784C> \xD6\xB8 |0
-<U784D> \xD6\xB6 |0
-<U784E> \xB2\xBA |0
-<U7850> \xD6\xBB |0
-<U7852> \xD6\xB4 |0
-<U785C> \xDA\xC8 |0
-<U785D> \xB5\x76 |0
-<U785E> \xDA\xD0 |0
-<U7860> \xDA\xC5 |0
-<U7862> \xDA\xD1 |0
-<U7864> \xDA\xC6 |0
-<U7865> \xDA\xC7 |0
-<U7868> \xDA\xCF |0
-<U7869> \xDA\xCE |0
-<U786A> \xDA\xCB |0
-<U786B> \xB2\xB8 |0
-<U786C> \xB5\x77 |0
-<U786D> \xDA\xC9 |0
-<U786E> \xDA\xCC |0
-<U786F> \xB5\x78 |0
-<U7870> \xDA\xCD |0
-<U7871> \xDA\xCA |0
-<U7879> \xDE\xEE |0
-<U787B> \xDE\xF2 |0
-<U787C> \xB8\x4E |0
-<U787E> \xE2\xF0 |0
-<U787F> \xB8\x51 |0
-<U7880> \xDE\xF0 |0
-<U7881> \xF9\xD6 |0
-<U7883> \xDE\xED |0
-<U7884> \xDE\xE8 |0
-<U7885> \xDE\xEA |0
-<U7886> \xDE\xEB |0
-<U7887> \xDE\xE4 |0
-<U7889> \xB8\x4D |0
-<U788C> \xB8\x4C |0
-<U788E> \xB8\x48 |0
-<U788F> \xDE\xE7 |0
-<U7891> \xB8\x4F |0
-<U7893> \xB8\x50 |0
-<U7894> \xDE\xE6 |0
-<U7895> \xDE\xE9 |0
-<U7896> \xDE\xF1 |0
-<U7897> \xB8\x4A |0
-<U7898> \xB8\x4B |0
-<U7899> \xDE\xEF |0
-<U789A> \xDE\xE5 |0
-<U789E> \xE2\xF2 |0
-<U789F> \xBA\xD0 |0
-<U78A0> \xE2\xF4 |0
-<U78A1> \xDE\xEC |0
-<U78A2> \xE2\xF6 |0
-<U78A3> \xBA\xD4 |0
-<U78A4> \xE2\xF7 |0
-<U78A5> \xE2\xF3 |0
-<U78A7> \xBA\xD1 |0
-<U78A8> \xE2\xEF |0
-<U78A9> \xBA\xD3 |0
-<U78AA> \xE2\xEC |0
-<U78AB> \xE2\xF1 |0
-<U78AC> \xE2\xF5 |0
-<U78AD> \xE2\xEE |0
-<U78B0> \xB8\x49 |0
-<U78B2> \xE2\xEB |0
-<U78B3> \xBA\xD2 |0
-<U78B4> \xE2\xED |0
-<U78BA> \xBD\x54 |0
-<U78BB> \xE6\xC1 |0
-<U78BC> \xBD\x58 |0
-<U78BE> \xBD\x56 |0
-<U78C1> \xBA\xCF |0
-<U78C3> \xE6\xC8 |0
-<U78C4> \xE6\xC9 |0
-<U78C5> \xBD\x53 |0
-<U78C8> \xE6\xC7 |0
-<U78C9> \xE6\xCA |0
-<U78CA> \xBD\x55 |0
-<U78CB> \xBD\x52 |0
-<U78CC> \xE6\xC3 |0
-<U78CD> \xE6\xC0 |0
-<U78CE> \xE6\xC5 |0
-<U78CF> \xE6\xC2 |0
-<U78D0> \xBD\x59 |0
-<U78D1> \xE6\xC4 |0
-<U78D4> \xE6\xC6 |0
-<U78D5> \xBD\x57 |0
-<U78DA> \xBF\x6A |0
-<U78DB> \xEA\xA8 |0
-<U78DD> \xEA\xA2 |0
-<U78DE> \xEA\xA6 |0
-<U78DF> \xEA\xAC |0
-<U78E0> \xEA\xAD |0
-<U78E1> \xEA\xA9 |0
-<U78E2> \xEA\xAA |0
-<U78E3> \xEA\xA7 |0
-<U78E5> \xEA\xA4 |0
-<U78E7> \xBF\x6C |0
-<U78E8> \xBF\x69 |0
-<U78E9> \xEA\xA3 |0
-<U78EA> \xEA\xA5 |0
-<U78EC> \xBF\x6B |0
-<U78ED> \xEA\xAB |0
-<U78EF> \xC1\x46 |0
-<U78F2> \xED\xAA |0
-<U78F3> \xED\xA5 |0
-<U78F4> \xC1\x45 |0
-<U78F7> \xC1\x43 |0
-<U78F9> \xED\xAC |0
-<U78FA> \xC1\x44 |0
-<U78FB> \xED\xA8 |0
-<U78FC> \xED\xA9 |0
-<U78FD> \xED\xA6 |0
-<U78FE> \xED\xAD |0
-<U78FF> \xF0\x56 |0
-<U7901> \xC1\x47 |0
-<U7902> \xED\xA7 |0
-<U7904> \xED\xAE |0
-<U7905> \xED\xAB |0
-<U7909> \xF0\x5A |0
-<U790C> \xF0\x57 |0
-<U790E> \xC2\xA6 |0
-<U7910> \xF0\x5B |0
-<U7911> \xF0\x5D |0
-<U7912> \xF0\x5C |0
-<U7913> \xF0\x58 |0
-<U7914> \xF0\x59 |0
-<U7917> \xF2\xA3 |0
-<U7919> \xC3\xAA |0
-<U791B> \xF2\x7E |0
-<U791C> \xF2\xA2 |0
-<U791D> \xF2\x7D |0
-<U791E> \xF2\xA4 |0
-<U7921> \xF2\xA1 |0
-<U7923> \xF4\x7A |0
-<U7924> \xF4\x7D |0
-<U7925> \xF4\x79 |0
-<U7926> \xC4\x71 |0
-<U7927> \xF4\x7B |0
-<U7928> \xF4\x7C |0
-<U7929> \xF4\x7E |0
-<U792A> \xC4\x72 |0
-<U792B> \xC4\x74 |0
-<U792C> \xC4\x73 |0
-<U792D> \xF5\xE1 |0
-<U792F> \xF5\xE3 |0
-<U7931> \xF5\xE2 |0
-<U7935> \xF6\xF6 |0
-<U7938> \xF8\xB5 |0
-<U7939> \xF8\xFA |0
-<U793A> \xA5\xDC |0
-<U793D> \xCB\x72 |0
-<U793E> \xAA\xC0 |0
-<U793F> \xCD\xA3 |0
-<U7940> \xAA\xC1 |0
-<U7941> \xAA\xC2 |0
-<U7942> \xCD\xA2 |0
-<U7944> \xCF\xF8 |0
-<U7945> \xCF\xF7 |0
-<U7946> \xAC\xE6 |0
-<U7947> \xAC\xE9 |0
-<U7948> \xAC\xE8 |0
-<U7949> \xAC\xE7 |0
-<U794A> \xCF\xF4 |0
-<U794B> \xCF\xF6 |0
-<U794C> \xCF\xF5 |0
-<U794F> \xD2\xE8 |0
-<U7950> \xAF\xA7 |0
-<U7951> \xD2\xEC |0
-<U7952> \xD2\xEB |0
-<U7953> \xD2\xEA |0
-<U7954> \xD2\xE6 |0
-<U7955> \xAF\xA6 |0
-<U7956> \xAF\xAA |0
-<U7957> \xAF\xAD |0
-<U795A> \xAF\xAE |0
-<U795B> \xD2\xE7 |0
-<U795C> \xD2\xE9 |0
-<U795D> \xAF\xAC |0
-<U795E> \xAF\xAB |0
-<U795F> \xAF\xA9 |0
-<U7960> \xAF\xA8 |0
-<U7961> \xD6\xC2 |0
-<U7963> \xD6\xC0 |0
-<U7964> \xD6\xBC |0
-<U7965> \xB2\xBB |0
-<U7967> \xD6\xBD |0
-<U7968> \xB2\xBC |0
-<U7969> \xD6\xBE |0
-<U796A> \xD6\xBF |0
-<U796B> \xD6\xC1 |0
-<U796D> \xB2\xBD |0
-<U7970> \xDA\xD5 |0
-<U7972> \xDA\xD4 |0
-<U7973> \xDA\xD3 |0
-<U7974> \xDA\xD2 |0
-<U7979> \xDE\xF6 |0
-<U797A> \xB8\x52 |0
-<U797C> \xDE\xF3 |0
-<U797D> \xDE\xF5 |0
-<U797F> \xB8\x53 |0
-<U7981> \xB8\x54 |0
-<U7982> \xDE\xF4 |0
-<U7988> \xE3\x41 |0
-<U798A> \xE2\xF9 |0
-<U798B> \xE2\xFA |0
-<U798D> \xBA\xD7 |0
-<U798E> \xBA\xD5 |0
-<U798F> \xBA\xD6 |0
-<U7990> \xE3\x43 |0
-<U7992> \xE3\x42 |0
-<U7993> \xE2\xFE |0
-<U7994> \xE2\xFD |0
-<U7995> \xE2\xFC |0
-<U7996> \xE2\xFB |0
-<U7997> \xE3\x40 |0
-<U7998> \xE2\xF8 |0
-<U799A> \xE6\xCB |0
-<U799B> \xE6\xD0 |0
-<U799C> \xE6\xCE |0
-<U79A0> \xE6\xCD |0
-<U79A1> \xE6\xCC |0
-<U79A2> \xE6\xCF |0
-<U79A4> \xEA\xAE |0
-<U79A6> \xBF\x6D |0
-<U79A7> \xC1\x48 |0
-<U79A8> \xED\xB0 |0
-<U79AA> \xC1\x49 |0
-<U79AB> \xED\xAF |0
-<U79AC> \xF0\x5F |0
-<U79AD> \xF0\x5E |0
-<U79AE> \xC2\xA7 |0
-<U79B0> \xF2\xA5 |0
-<U79B1> \xC3\xAB |0
-<U79B2> \xF4\xA1 |0
-<U79B3> \xC5\xA1 |0
-<U79B4> \xF6\xF7 |0
-<U79B6> \xF8\xB7 |0
-<U79B7> \xF8\xB6 |0
-<U79B8> \xC9\xA8 |0
-<U79B9> \xAC\xEA |0
-<U79BA> \xAC\xEB |0
-<U79BB> \xD6\xC3 |0
-<U79BD> \xB8\x56 |0
-<U79BE> \xA5\xDD |0
-<U79BF> \xA8\x72 |0
-<U79C0> \xA8\x71 |0
-<U79C1> \xA8\x70 |0
-<U79C5> \xCD\xA4 |0
-<U79C8> \xAA\xC4 |0
-<U79C9> \xAA\xC3 |0
-<U79CB> \xAC\xEE |0
-<U79CD> \xCF\xFA |0
-<U79CE> \xCF\xFD |0
-<U79CF> \xCF\xFB |0
-<U79D1> \xAC\xEC |0
-<U79D2> \xAC\xED |0
-<U79D5> \xCF\xF9 |0
-<U79D6> \xCF\xFC |0
-<U79D8> \xAF\xB5 |0
-<U79DC> \xD2\xF3 |0
-<U79DD> \xD2\xF5 |0
-<U79DE> \xD2\xF4 |0
-<U79DF> \xAF\xB2 |0
-<U79E0> \xD2\xEF |0
-<U79E3> \xAF\xB0 |0
-<U79E4> \xAF\xAF |0
-<U79E6> \xAF\xB3 |0
-<U79E7> \xAF\xB1 |0
-<U79E9> \xAF\xB4 |0
-<U79EA> \xD2\xF2 |0
-<U79EB> \xD2\xED |0
-<U79EC> \xD2\xEE |0
-<U79ED> \xD2\xF1 |0
-<U79EE> \xD2\xF0 |0
-<U79F6> \xD6\xC6 |0
-<U79F7> \xD6\xC7 |0
-<U79F8> \xD6\xC5 |0
-<U79FA> \xD6\xC4 |0
-<U79FB> \xB2\xBE |0
-<U7A00> \xB5\x7D |0
-<U7A02> \xDA\xD6 |0
-<U7A03> \xDA\xD8 |0
-<U7A04> \xDA\xDA |0
-<U7A05> \xB5\x7C |0
-<U7A08> \xB5\x7A |0
-<U7A0A> \xDA\xD7 |0
-<U7A0B> \xB5\x7B |0
-<U7A0C> \xDA\xD9 |0
-<U7A0D> \xB5\x79 |0
-<U7A10> \xDF\x41 |0
-<U7A11> \xDE\xF7 |0
-<U7A12> \xDE\xFA |0
-<U7A13> \xDE\xFE |0
-<U7A14> \xB8\x5A |0
-<U7A15> \xDE\xFC |0
-<U7A17> \xDE\xFB |0
-<U7A18> \xDE\xF8 |0
-<U7A19> \xDE\xF9 |0
-<U7A1A> \xB8\x58 |0
-<U7A1B> \xDF\x40 |0
-<U7A1C> \xB8\x57 |0
-<U7A1E> \xB8\x5C |0
-<U7A1F> \xB8\x5B |0
-<U7A20> \xB8\x59 |0
-<U7A22> \xDE\xFD |0
-<U7A26> \xE3\x49 |0
-<U7A28> \xE3\x48 |0
-<U7A2B> \xE3\x44 |0
-<U7A2E> \xBA\xD8 |0
-<U7A2F> \xE3\x47 |0
-<U7A30> \xE3\x46 |0
-<U7A31> \xBA\xD9 |0
-<U7A37> \xBD\x5E |0
-<U7A39> \xE6\xD2 |0
-<U7A3B> \xBD\x5F |0
-<U7A3C> \xBD\x5B |0
-<U7A3D> \xBD\x5D |0
-<U7A3F> \xBD\x5A |0
-<U7A40> \xBD\x5C |0
-<U7A44> \xEA\xAF |0
-<U7A46> \xBF\x70 |0
-<U7A47> \xEA\xB1 |0
-<U7A48> \xEA\xB0 |0
-<U7A4A> \xE3\x45 |0
-<U7A4B> \xBF\x72 |0
-<U7A4C> \xBF\x71 |0
-<U7A4D> \xBF\x6E |0
-<U7A4E> \xBF\x6F |0
-<U7A54> \xED\xB5 |0
-<U7A56> \xED\xB3 |0
-<U7A57> \xC1\x4A |0
-<U7A58> \xED\xB4 |0
-<U7A5A> \xED\xB6 |0
-<U7A5B> \xED\xB2 |0
-<U7A5C> \xED\xB1 |0
-<U7A5F> \xF0\x60 |0
-<U7A60> \xC2\xAA |0
-<U7A61> \xC2\xA8 |0
-<U7A62> \xC2\xA9 |0
-<U7A67> \xF2\xA6 |0
-<U7A68> \xF2\xA7 |0
-<U7A69> \xC3\xAD |0
-<U7A6B> \xC3\xAC |0
-<U7A6C> \xF4\xA3 |0
-<U7A6D> \xF4\xA4 |0
-<U7A6E> \xF4\xA2 |0
-<U7A70> \xF6\xF8 |0
-<U7A71> \xF6\xF9 |0
-<U7A74> \xA5\xDE |0
-<U7A75> \xCA\x48 |0
-<U7A76> \xA8\x73 |0
-<U7A78> \xCD\xA5 |0
-<U7A79> \xAA\xC6 |0
-<U7A7A> \xAA\xC5 |0
-<U7A7B> \xCD\xA6 |0
-<U7A7E> \xD0\x40 |0
-<U7A7F> \xAC\xEF |0
-<U7A80> \xCF\xFE |0
-<U7A81> \xAC\xF0 |0
-<U7A84> \xAF\xB6 |0
-<U7A85> \xD2\xF8 |0
-<U7A86> \xD2\xF6 |0
-<U7A87> \xD2\xFC |0
-<U7A88> \xAF\xB7 |0
-<U7A89> \xD2\xF7 |0
-<U7A8A> \xD2\xFB |0
-<U7A8B> \xD2\xF9 |0
-<U7A8C> \xD2\xFA |0
-<U7A8F> \xD6\xC8 |0
-<U7A90> \xD6\xCA |0
-<U7A92> \xB2\xBF |0
-<U7A94> \xD6\xC9 |0
-<U7A95> \xB2\xC0 |0
-<U7A96> \xB5\xA2 |0
-<U7A97> \xB5\xA1 |0
-<U7A98> \xB5\x7E |0
-<U7A99> \xDA\xDB |0
-<U7A9E> \xDF\x44 |0
-<U7A9F> \xB8\x5D |0
-<U7AA0> \xB8\x5E |0
-<U7AA2> \xDF\x43 |0
-<U7AA3> \xDF\x42 |0
-<U7AA8> \xE3\x4A |0
-<U7AA9> \xBA\xDB |0
-<U7AAA> \xBA\xDA |0
-<U7AAB> \xE3\x4B |0
-<U7AAC> \xE3\x4C |0
-<U7AAE> \xBD\x61 |0
-<U7AAF> \xBD\x60 |0
-<U7AB1> \xEA\xB5 |0
-<U7AB2> \xE6\xD3 |0
-<U7AB3> \xE6\xD5 |0
-<U7AB4> \xE6\xD4 |0
-<U7AB5> \xEA\xB4 |0
-<U7AB6> \xEA\xB2 |0
-<U7AB7> \xEA\xB6 |0
-<U7AB8> \xEA\xB3 |0
-<U7ABA> \xBF\x73 |0
-<U7ABE> \xED\xB7 |0
-<U7ABF> \xC1\x4B |0
-<U7AC0> \xED\xB8 |0
-<U7AC1> \xED\xB9 |0
-<U7AC4> \xC2\xAB |0
-<U7AC5> \xC2\xAC |0
-<U7AC7> \xC4\x75 |0
-<U7ACA> \xC5\xD1 |0
-<U7ACB> \xA5\xDF |0
-<U7AD1> \xD0\x41 |0
-<U7AD8> \xD2\xFD |0
-<U7AD9> \xAF\xB8 |0
-<U7ADF> \xB3\xBA |0
-<U7AE0> \xB3\xB9 |0
-<U7AE3> \xB5\xA4 |0
-<U7AE4> \xDA\xDD |0
-<U7AE5> \xB5\xA3 |0
-<U7AE6> \xDA\xDC |0
-<U7AEB> \xDF\x45 |0
-<U7AED> \xBA\xDC |0
-<U7AEE> \xE3\x4D |0
-<U7AEF> \xBA\xDD |0
-<U7AF6> \xC4\x76 |0
-<U7AF7> \xF4\xA5 |0
-<U7AF9> \xA6\xCB |0
-<U7AFA> \xAA\xC7 |0
-<U7AFB> \xCD\xA7 |0
-<U7AFD> \xAC\xF2 |0
-<U7AFF> \xAC\xF1 |0
-<U7B00> \xD0\x42 |0
-<U7B01> \xD0\x43 |0
-<U7B04> \xD3\x40 |0
-<U7B05> \xD3\x42 |0
-<U7B06> \xAF\xB9 |0
-<U7B08> \xD3\x44 |0
-<U7B09> \xD3\x47 |0
-<U7B0A> \xD3\x45 |0
-<U7B0E> \xD3\x46 |0
-<U7B0F> \xD3\x43 |0
-<U7B10> \xD2\xFE |0
-<U7B11> \xAF\xBA |0
-<U7B12> \xD3\x48 |0
-<U7B13> \xD3\x41 |0
-<U7B18> \xD6\xD3 |0
-<U7B19> \xB2\xC6 |0
-<U7B1A> \xD6\xDC |0
-<U7B1B> \xB2\xC3 |0
-<U7B1D> \xD6\xD5 |0
-<U7B1E> \xB2\xC7 |0
-<U7B20> \xB2\xC1 |0
-<U7B22> \xD6\xD0 |0
-<U7B23> \xD6\xDD |0
-<U7B24> \xD6\xD1 |0
-<U7B25> \xD6\xCE |0
-<U7B26> \xB2\xC5 |0
-<U7B28> \xB2\xC2 |0
-<U7B2A> \xD6\xD4 |0
-<U7B2B> \xD6\xD7 |0
-<U7B2C> \xB2\xC4 |0
-<U7B2D> \xD6\xD8 |0
-<U7B2E> \xB2\xC8 |0
-<U7B2F> \xD6\xD9 |0
-<U7B30> \xD6\xCF |0
-<U7B31> \xD6\xD6 |0
-<U7B32> \xD6\xDA |0
-<U7B33> \xD6\xD2 |0
-<U7B34> \xD6\xCD |0
-<U7B35> \xD6\xCB |0
-<U7B38> \xD6\xDB |0
-<U7B3B> \xDA\xDF |0
-<U7B40> \xDA\xE4 |0
-<U7B44> \xDA\xE0 |0
-<U7B45> \xDA\xE6 |0
-<U7B46> \xB5\xA7 |0
-<U7B47> \xD6\xCC |0
-<U7B48> \xDA\xE1 |0
-<U7B49> \xB5\xA5 |0
-<U7B4A> \xDA\xDE |0
-<U7B4B> \xB5\xAC |0
-<U7B4C> \xDA\xE2 |0
-<U7B4D> \xB5\xAB |0
-<U7B4E> \xDA\xE3 |0
-<U7B4F> \xB5\xAD |0
-<U7B50> \xB5\xA8 |0
-<U7B51> \xB5\xAE |0
-<U7B52> \xB5\xA9 |0
-<U7B54> \xB5\xAA |0
-<U7B56> \xB5\xA6 |0
-<U7B58> \xDA\xE5 |0
-<U7B60> \xB8\x61 |0
-<U7B61> \xDF\x50 |0
-<U7B63> \xDF\x53 |0
-<U7B64> \xDF\x47 |0
-<U7B65> \xDF\x4C |0
-<U7B66> \xDF\x46 |0
-<U7B67> \xB8\x63 |0
-<U7B69> \xDF\x4A |0
-<U7B6D> \xDF\x48 |0
-<U7B6E> \xB8\x62 |0
-<U7B70> \xDF\x4F |0
-<U7B71> \xDF\x4E |0
-<U7B72> \xDF\x4B |0
-<U7B73> \xDF\x4D |0
-<U7B74> \xDF\x49 |0
-<U7B75> \xBA\xE1 |0
-<U7B76> \xDF\x52 |0
-<U7B77> \xB8\x5F |0
-<U7B78> \xDF\x51 |0
-<U7B82> \xE3\x5D |0
-<U7B84> \xBA\xE8 |0
-<U7B85> \xE3\x58 |0
-<U7B87> \xBA\xE7 |0
-<U7B88> \xE3\x4E |0
-<U7B8A> \xE3\x50 |0
-<U7B8B> \xBA\xE0 |0
-<U7B8C> \xE3\x55 |0
-<U7B8D> \xE3\x54 |0
-<U7B8E> \xE3\x57 |0
-<U7B8F> \xBA\xE5 |0
-<U7B90> \xE3\x52 |0
-<U7B91> \xE3\x51 |0
-<U7B94> \xBA\xE4 |0
-<U7B95> \xBA\xDF |0
-<U7B96> \xE3\x53 |0
-<U7B97> \xBA\xE2 |0
-<U7B98> \xE3\x59 |0
-<U7B99> \xE3\x5B |0
-<U7B9B> \xE3\x56 |0
-<U7B9C> \xE3\x4F |0
-<U7B9D> \xBA\xE3 |0
-<U7BA0> \xBD\x69 |0
-<U7BA1> \xBA\xDE |0
-<U7BA4> \xE3\x5C |0
-<U7BAC> \xE6\xD9 |0
-<U7BAD> \xBD\x62 |0
-<U7BAF> \xE6\xDB |0
-<U7BB1> \xBD\x63 |0
-<U7BB4> \xBD\x65 |0
-<U7BB5> \xE6\xDE |0
-<U7BB7> \xE6\xD6 |0
-<U7BB8> \xBA\xE6 |0
-<U7BB9> \xE6\xDC |0
-<U7BBE> \xE6\xD8 |0
-<U7BC0> \xB8\x60 |0
-<U7BC1> \xBD\x68 |0
-<U7BC4> \xBD\x64 |0
-<U7BC6> \xBD\x66 |0
-<U7BC7> \xBD\x67 |0
-<U7BC9> \xBF\x76 |0
-<U7BCA> \xE6\xDD |0
-<U7BCB> \xE6\xD7 |0
-<U7BCC> \xBD\x6A |0
-<U7BCE> \xE6\xDA |0
-<U7BD4> \xEA\xC0 |0
-<U7BD5> \xEA\xBB |0
-<U7BD8> \xEA\xC5 |0
-<U7BD9> \xBF\x74 |0
-<U7BDA> \xEA\xBD |0
-<U7BDB> \xBF\x78 |0
-<U7BDC> \xEA\xC3 |0
-<U7BDD> \xEA\xBA |0
-<U7BDE> \xEA\xB7 |0
-<U7BDF> \xEA\xC6 |0
-<U7BE0> \xC1\x51 |0
-<U7BE1> \xBF\x79 |0
-<U7BE2> \xEA\xC2 |0
-<U7BE3> \xEA\xB8 |0
-<U7BE4> \xBF\x77 |0
-<U7BE5> \xEA\xBC |0
-<U7BE6> \xBF\x7B |0
-<U7BE7> \xEA\xB9 |0
-<U7BE8> \xEA\xBE |0
-<U7BE9> \xBF\x7A |0
-<U7BEA> \xEA\xC1 |0
-<U7BEB> \xEA\xC4 |0
-<U7BF0> \xED\xCB |0
-<U7BF1> \xED\xCC |0
-<U7BF2> \xED\xBC |0
-<U7BF3> \xED\xC3 |0
-<U7BF4> \xED\xC1 |0
-<U7BF7> \xC1\x4F |0
-<U7BF8> \xED\xC8 |0
-<U7BF9> \xEA\xBF |0
-<U7BFB> \xED\xBF |0
-<U7BFD> \xED\xC9 |0
-<U7BFE> \xC1\x4E |0
-<U7BFF> \xED\xBE |0
-<U7C00> \xED\xBD |0
-<U7C01> \xED\xC7 |0
-<U7C02> \xED\xC4 |0
-<U7C03> \xED\xC6 |0
-<U7C05> \xED\xBA |0
-<U7C06> \xED\xCA |0
-<U7C07> \xC1\x4C |0
-<U7C09> \xED\xC5 |0
-<U7C0A> \xED\xCE |0
-<U7C0B> \xED\xC2 |0
-<U7C0C> \xC1\x50 |0
-<U7C0D> \xC1\x4D |0
-<U7C0E> \xED\xC0 |0
-<U7C0F> \xED\xBB |0
-<U7C10> \xED\xCD |0
-<U7C11> \xBF\x75 |0
-<U7C19> \xF0\x63 |0
-<U7C1C> \xF0\x61 |0
-<U7C1D> \xF0\x67 |0
-<U7C1E> \xC2\xB0 |0
-<U7C1F> \xF0\x65 |0
-<U7C20> \xF0\x64 |0
-<U7C21> \xC2\xB2 |0
-<U7C22> \xF0\x6A |0
-<U7C23> \xC2\xB1 |0
-<U7C25> \xF0\x6B |0
-<U7C26> \xF0\x68 |0
-<U7C27> \xC2\xAE |0
-<U7C28> \xF0\x69 |0
-<U7C29> \xF0\x62 |0
-<U7C2A> \xC2\xAF |0
-<U7C2B> \xC2\xAD |0
-<U7C2C> \xF2\xAB |0
-<U7C2D> \xF0\x66 |0
-<U7C30> \xF0\x6C |0
-<U7C33> \xF2\xA8 |0
-<U7C37> \xC3\xB2 |0
-<U7C38> \xC3\xB0 |0
-<U7C39> \xF2\xAA |0
-<U7C3B> \xF2\xAC |0
-<U7C3C> \xF2\xA9 |0
-<U7C3D> \xC3\xB1 |0
-<U7C3E> \xC3\xAE |0
-<U7C3F> \xC3\xAF |0
-<U7C40> \xC3\xB3 |0
-<U7C43> \xC4\x78 |0
-<U7C45> \xF4\xAA |0
-<U7C47> \xF4\xA9 |0
-<U7C48> \xF4\xA7 |0
-<U7C49> \xF4\xA6 |0
-<U7C4A> \xF4\xA8 |0
-<U7C4C> \xC4\x77 |0
-<U7C4D> \xC4\x79 |0
-<U7C50> \xC4\xF0 |0
-<U7C53> \xF5\xE5 |0
-<U7C54> \xF5\xE4 |0
-<U7C57> \xF6\xFA |0
-<U7C59> \xF6\xFC |0
-<U7C5A> \xF6\xFE |0
-<U7C5B> \xF6\xFD |0
-<U7C5C> \xF6\xFB |0
-<U7C5F> \xC5\xA3 |0
-<U7C60> \xC5\xA2 |0
-<U7C63> \xC5\xD3 |0
-<U7C64> \xC5\xD2 |0
-<U7C65> \xC5\xD4 |0
-<U7C66> \xF7\xED |0
-<U7C67> \xF7\xEC |0
-<U7C69> \xF8\xFB |0
-<U7C6A> \xF8\xB8 |0
-<U7C6B> \xF8\xFC |0
-<U7C6C> \xC6\x58 |0
-<U7C6E> \xC6\x59 |0
-<U7C6F> \xF9\x6D |0
-<U7C72> \xC6\x7E |0
-<U7C73> \xA6\xCC |0
-<U7C75> \xCD\xA8 |0
-<U7C78> \xD0\x45 |0
-<U7C79> \xD0\x46 |0
-<U7C7A> \xD0\x44 |0
-<U7C7D> \xAC\xF3 |0
-<U7C7F> \xD0\x47 |0
-<U7C80> \xD0\x48 |0
-<U7C81> \xD0\x49 |0
-<U7C84> \xD3\x49 |0
-<U7C85> \xD3\x4F |0
-<U7C88> \xD3\x4D |0
-<U7C89> \xAF\xBB |0
-<U7C8A> \xD3\x4B |0
-<U7C8C> \xD3\x4C |0
-<U7C8D> \xD3\x4E |0
-<U7C91> \xD3\x4A |0
-<U7C92> \xB2\xC9 |0
-<U7C94> \xD6\xDE |0
-<U7C95> \xB2\xCB |0
-<U7C96> \xD6\xE0 |0
-<U7C97> \xB2\xCA |0
-<U7C98> \xD6\xDF |0
-<U7C9E> \xDA\xE8 |0
-<U7C9F> \xB5\xAF |0
-<U7CA1> \xDA\xEA |0
-<U7CA2> \xDA\xE7 |0
-<U7CA3> \xD6\xE1 |0
-<U7CA5> \xB5\xB0 |0
-<U7CA7> \xF9\xDB |0
-<U7CA8> \xDA\xE9 |0
-<U7CAF> \xDF\x56 |0
-<U7CB1> \xB8\x64 |0
-<U7CB2> \xDF\x54 |0
-<U7CB3> \xB8\x65 |0
-<U7CB4> \xDF\x55 |0
-<U7CB5> \xB8\x66 |0
-<U7CB9> \xBA\xE9 |0
-<U7CBA> \xE3\x61 |0
-<U7CBB> \xE3\x5E |0
-<U7CBC> \xE3\x60 |0
-<U7CBD> \xBA\xEA |0
-<U7CBE> \xBA\xEB |0
-<U7CBF> \xE3\x5F |0
-<U7CC5> \xE6\xDF |0
-<U7CC8> \xE6\xE0 |0
-<U7CCA> \xBD\x6B |0
-<U7CCB> \xE6\xE2 |0
-<U7CCC> \xE6\xE1 |0
-<U7CCE> \xA2\x61 |0
-<U7CD0> \xEA\xCA |0
-<U7CD1> \xEA\xCB |0
-<U7CD2> \xEA\xC7 |0
-<U7CD4> \xEA\xC8 |0
-<U7CD5> \xBF\x7C |0
-<U7CD6> \xBF\x7D |0
-<U7CD7> \xEA\xC9 |0
-<U7CD9> \xC1\x57 |0
-<U7CDC> \xC1\x53 |0
-<U7CDD> \xC1\x58 |0
-<U7CDE> \xC1\x54 |0
-<U7CDF> \xC1\x56 |0
-<U7CE0> \xC1\x52 |0
-<U7CE2> \xC1\x55 |0
-<U7CE7> \xC2\xB3 |0
-<U7CE8> \xED\xCF |0
-<U7CEA> \xF2\xAE |0
-<U7CEC> \xF2\xAD |0
-<U7CEE> \xF4\xAB |0
-<U7CEF> \xC4\x7A |0
-<U7CF0> \xC4\x7B |0
-<U7CF1> \xF7\x41 |0
-<U7CF2> \xF5\xE6 |0
-<U7CF4> \xF7\x40 |0
-<U7CF6> \xF8\xFD |0
-<U7CF7> \xF9\xA4 |0
-<U7CF8> \xA6\xCD |0
-<U7CFB> \xA8\x74 |0
-<U7CFD> \xCD\xA9 |0
-<U7CFE> \xAA\xC8 |0
-<U7D00> \xAC\xF6 |0
-<U7D01> \xD0\x4C |0
-<U7D02> \xAC\xF4 |0
-<U7D03> \xD0\x4A |0
-<U7D04> \xAC\xF9 |0
-<U7D05> \xAC\xF5 |0
-<U7D06> \xAC\xFA |0
-<U7D07> \xAC\xF8 |0
-<U7D08> \xD0\x4B |0
-<U7D09> \xAC\xF7 |0
-<U7D0A> \xAF\xBF |0
-<U7D0B> \xAF\xBE |0
-<U7D0C> \xD3\x5A |0
-<U7D0D> \xAF\xC7 |0
-<U7D0E> \xD3\x53 |0
-<U7D0F> \xD3\x59 |0
-<U7D10> \xAF\xC3 |0
-<U7D11> \xD3\x52 |0
-<U7D12> \xD3\x58 |0
-<U7D13> \xD3\x56 |0
-<U7D14> \xAF\xC2 |0
-<U7D15> \xAF\xC4 |0
-<U7D16> \xD3\x55 |0
-<U7D17> \xAF\xBD |0
-<U7D18> \xD3\x54 |0
-<U7D19> \xAF\xC8 |0
-<U7D1A> \xAF\xC5 |0
-<U7D1B> \xAF\xC9 |0
-<U7D1C> \xAF\xC6 |0
-<U7D1D> \xD3\x51 |0
-<U7D1E> \xD3\x50 |0
-<U7D1F> \xD3\x57 |0
-<U7D20> \xAF\xC0 |0
-<U7D21> \xAF\xBC |0
-<U7D22> \xAF\xC1 |0
-<U7D28> \xD6\xF0 |0
-<U7D29> \xD6\xE9 |0
-<U7D2B> \xB5\xB5 |0
-<U7D2C> \xD6\xE8 |0
-<U7D2E> \xB2\xCF |0
-<U7D2F> \xB2\xD6 |0
-<U7D30> \xB2\xD3 |0
-<U7D31> \xB2\xD9 |0
-<U7D32> \xB2\xD8 |0
-<U7D33> \xB2\xD4 |0
-<U7D35> \xD6\xE2 |0
-<U7D36> \xD6\xE5 |0
-<U7D38> \xD6\xE4 |0
-<U7D39> \xB2\xD0 |0
-<U7D3A> \xD6\xE6 |0
-<U7D3B> \xD6\xEF |0
-<U7D3C> \xB2\xD1 |0
-<U7D3D> \xD6\xE3 |0
-<U7D3E> \xD6\xEC |0
-<U7D3F> \xD6\xED |0
-<U7D40> \xB2\xD2 |0
-<U7D41> \xD6\xEA |0
-<U7D42> \xB2\xD7 |0
-<U7D43> \xB2\xCD |0
-<U7D44> \xB2\xD5 |0
-<U7D45> \xD6\xE7 |0
-<U7D46> \xB2\xCC |0
-<U7D47> \xD6\xEB |0
-<U7D4A> \xD6\xEE |0
-<U7D4E> \xDA\xFB |0
-<U7D4F> \xDA\xF2 |0
-<U7D50> \xB5\xB2 |0
-<U7D51> \xDA\xF9 |0
-<U7D52> \xDA\xF6 |0
-<U7D53> \xDA\xEE |0
-<U7D54> \xDA\xF7 |0
-<U7D55> \xB5\xB4 |0
-<U7D56> \xDA\xEF |0
-<U7D58> \xDA\xEB |0
-<U7D5B> \xB8\x6C |0
-<U7D5C> \xDA\xF4 |0
-<U7D5E> \xB5\xB1 |0
-<U7D5F> \xDA\xFA |0
-<U7D61> \xB5\xB8 |0
-<U7D62> \xB5\xBA |0
-<U7D63> \xDA\xED |0
-<U7D66> \xB5\xB9 |0
-<U7D67> \xDA\xF0 |0
-<U7D68> \xB5\xB3 |0
-<U7D69> \xDA\xF8 |0
-<U7D6A> \xDA\xF1 |0
-<U7D6B> \xDA\xF5 |0
-<U7D6D> \xDA\xF3 |0
-<U7D6E> \xB5\xB6 |0
-<U7D6F> \xDA\xEC |0
-<U7D70> \xB5\xBB |0
-<U7D71> \xB2\xCE |0
-<U7D72> \xB5\xB7 |0
-<U7D73> \xB5\xBC |0
-<U7D79> \xB8\x68 |0
-<U7D7A> \xDF\x5D |0
-<U7D7B> \xDF\x5F |0
-<U7D7C> \xDF\x61 |0
-<U7D7D> \xDF\x65 |0
-<U7D7F> \xDF\x5B |0
-<U7D80> \xDF\x59 |0
-<U7D81> \xB8\x6A |0
-<U7D83> \xDF\x60 |0
-<U7D84> \xDF\x64 |0
-<U7D85> \xDF\x5C |0
-<U7D86> \xDF\x58 |0
-<U7D88> \xDF\x57 |0
-<U7D8C> \xDF\x62 |0
-<U7D8D> \xDF\x5A |0
-<U7D8E> \xDF\x5E |0
-<U7D8F> \xB8\x6B |0
-<U7D91> \xB8\x69 |0
-<U7D92> \xDF\x66 |0
-<U7D93> \xB8\x67 |0
-<U7D94> \xDF\x63 |0
-<U7D96> \xE3\x72 |0
-<U7D9C> \xBA\xEE |0
-<U7D9D> \xE3\x6A |0
-<U7D9E> \xBD\x78 |0
-<U7D9F> \xE3\x74 |0
-<U7DA0> \xBA\xF1 |0
-<U7DA1> \xE3\x78 |0
-<U7DA2> \xBA\xF7 |0
-<U7DA3> \xE3\x65 |0
-<U7DA6> \xE3\x75 |0
-<U7DA7> \xE3\x62 |0
-<U7DA9> \xE3\x77 |0
-<U7DAA> \xE3\x66 |0
-<U7DAC> \xBA\xFE |0
-<U7DAD> \xBA\xFB |0
-<U7DAE> \xE3\x76 |0
-<U7DAF> \xE3\x70 |0
-<U7DB0> \xBA\xED |0
-<U7DB1> \xBA\xF5 |0
-<U7DB2> \xBA\xF4 |0
-<U7DB4> \xBA\xF3 |0
-<U7DB5> \xBA\xF9 |0
-<U7DB7> \xE3\x63 |0
-<U7DB8> \xBA\xFA |0
-<U7DB9> \xE3\x71 |0
-<U7DBA> \xBA\xF6 |0
-<U7DBB> \xBA\xEC |0
-<U7DBC> \xE3\x73 |0
-<U7DBD> \xBA\xEF |0
-<U7DBE> \xBA\xF0 |0
-<U7DBF> \xBA\xF8 |0
-<U7DC0> \xE3\x68 |0
-<U7DC1> \xE3\x67 |0
-<U7DC2> \xE3\x64 |0
-<U7DC4> \xE3\x6C |0
-<U7DC5> \xE3\x69 |0
-<U7DC6> \xE3\x6D |0
-<U7DC7> \xBA\xFD |0
-<U7DC9> \xE3\x79 |0
-<U7DCA> \xBA\xF2 |0
-<U7DCB> \xE3\x6E |0
-<U7DCC> \xE3\x6F |0
-<U7DCE> \xE3\x6B |0
-<U7DD2> \xBA\xFC |0
-<U7DD7> \xE6\xE7 |0
-<U7DD8> \xBD\x70 |0
-<U7DD9> \xBD\x79 |0
-<U7DDA> \xBD\x75 |0
-<U7DDB> \xE6\xE4 |0
-<U7DDD> \xBD\x72 |0
-<U7DDE> \xBD\x76 |0
-<U7DDF> \xE6\xF0 |0
-<U7DE0> \xBD\x6C |0
-<U7DE1> \xE6\xE8 |0
-<U7DE3> \xBD\x74 |0
-<U7DE6> \xE6\xEB |0
-<U7DE7> \xE6\xE6 |0
-<U7DE8> \xBD\x73 |0
-<U7DE9> \xBD\x77 |0
-<U7DEA> \xE6\xE5 |0
-<U7DEC> \xBD\x71 |0
-<U7DEE> \xE6\xEF |0
-<U7DEF> \xBD\x6E |0
-<U7DF0> \xE6\xEE |0
-<U7DF1> \xE6\xED |0
-<U7DF2> \xBD\x7A |0
-<U7DF3> \xE5\x72 |0
-<U7DF4> \xBD\x6D |0
-<U7DF6> \xE6\xEC |0
-<U7DF7> \xE6\xE3 |0
-<U7DF9> \xBD\x7B |0
-<U7DFA> \xE6\xEA |0
-<U7DFB> \xBD\x6F |0
-<U7E03> \xE6\xE9 |0
-<U7E08> \xBF\xA2 |0
-<U7E09> \xBF\xA7 |0
-<U7E0A> \xBF\x7E |0
-<U7E0B> \xEA\xD8 |0
-<U7E0C> \xEA\xCF |0
-<U7E0D> \xEA\xDB |0
-<U7E0E> \xEA\xD3 |0
-<U7E0F> \xEA\xD9 |0
-<U7E10> \xBF\xA8 |0
-<U7E11> \xBF\xA1 |0
-<U7E12> \xEA\xCC |0
-<U7E13> \xEA\xD2 |0
-<U7E14> \xEA\xDC |0
-<U7E15> \xEA\xD5 |0
-<U7E16> \xEA\xDA |0
-<U7E17> \xEA\xCE |0
-<U7E1A> \xEA\xD6 |0
-<U7E1B> \xBF\xA3 |0
-<U7E1C> \xEA\xD4 |0
-<U7E1D> \xBF\xA6 |0
-<U7E1E> \xBF\xA5 |0
-<U7E1F> \xEA\xD0 |0
-<U7E20> \xEA\xD1 |0
-<U7E21> \xEA\xCD |0
-<U7E22> \xEA\xD7 |0
-<U7E23> \xBF\xA4 |0
-<U7E24> \xEA\xDE |0
-<U7E25> \xEA\xDD |0
-<U7E29> \xED\xDA |0
-<U7E2A> \xED\xD6 |0
-<U7E2B> \xC1\x5F |0
-<U7E2D> \xED\xD0 |0
-<U7E2E> \xC1\x59 |0
-<U7E2F> \xC1\x69 |0
-<U7E30> \xED\xDC |0
-<U7E31> \xC1\x61 |0
-<U7E32> \xC1\x5D |0
-<U7E33> \xED\xD3 |0
-<U7E34> \xC1\x64 |0
-<U7E35> \xC1\x67 |0
-<U7E36> \xED\xDE |0
-<U7E37> \xC1\x5C |0
-<U7E38> \xED\xD5 |0
-<U7E39> \xC1\x65 |0
-<U7E3A> \xED\xE0 |0
-<U7E3B> \xED\xDD |0
-<U7E3C> \xED\xD1 |0
-<U7E3D> \xC1\x60 |0
-<U7E3E> \xC1\x5A |0
-<U7E3F> \xC1\x68 |0
-<U7E40> \xED\xD8 |0
-<U7E41> \xC1\x63 |0
-<U7E42> \xED\xD2 |0
-<U7E43> \xC1\x5E |0
-<U7E44> \xED\xDF |0
-<U7E45> \xC1\x62 |0
-<U7E46> \xC1\x5B |0
-<U7E47> \xED\xD9 |0
-<U7E48> \xC1\x66 |0
-<U7E49> \xED\xD7 |0
-<U7E4C> \xED\xDB |0
-<U7E50> \xF0\x6E |0
-<U7E51> \xF0\x74 |0
-<U7E52> \xC2\xB9 |0
-<U7E53> \xF0\x77 |0
-<U7E54> \xC2\xB4 |0
-<U7E55> \xC2\xB5 |0
-<U7E56> \xF0\x6F |0
-<U7E57> \xF0\x76 |0
-<U7E58> \xF0\x71 |0
-<U7E59> \xC2\xBA |0
-<U7E5A> \xC2\xB7 |0
-<U7E5C> \xF0\x6D |0
-<U7E5E> \xC2\xB6 |0
-<U7E5F> \xF0\x73 |0
-<U7E60> \xF0\x75 |0
-<U7E61> \xC2\xB8 |0
-<U7E62> \xF0\x72 |0
-<U7E63> \xF0\x70 |0
-<U7E68> \xF2\xB8 |0
-<U7E69> \xC3\xB7 |0
-<U7E6A> \xC3\xB8 |0
-<U7E6B> \xC3\xB4 |0
-<U7E6D> \xC3\xB5 |0
-<U7E6F> \xF2\xB4 |0
-<U7E70> \xF2\xB2 |0
-<U7E72> \xF2\xB6 |0
-<U7E73> \xC3\xBA |0
-<U7E74> \xF2\xB7 |0
-<U7E75> \xF2\xB0 |0
-<U7E76> \xF2\xAF |0
-<U7E77> \xF2\xB3 |0
-<U7E78> \xF2\xB1 |0
-<U7E79> \xC3\xB6 |0
-<U7E7A> \xF2\xB5 |0
-<U7E7B> \xF4\xAC |0
-<U7E7C> \xC4\x7E |0
-<U7E7D> \xC4\x7D |0
-<U7E7E> \xF4\xAD |0
-<U7E80> \xF4\xAF |0
-<U7E81> \xF4\xAE |0
-<U7E82> \xC4\xA1 |0
-<U7E86> \xF5\xEB |0
-<U7E87> \xF5\xE8 |0
-<U7E88> \xF5\xE9 |0
-<U7E8A> \xF5\xE7 |0
-<U7E8B> \xF5\xEA |0
-<U7E8C> \xC4\xF2 |0
-<U7E8D> \xF5\xEC |0
-<U7E8F> \xC4\xF1 |0
-<U7E91> \xF7\x42 |0
-<U7E93> \xC5\xD5 |0
-<U7E94> \xC5\xD7 |0
-<U7E95> \xF7\xEE |0
-<U7E96> \xC5\xD6 |0
-<U7E97> \xF8\xB9 |0
-<U7E98> \xF9\x40 |0
-<U7E99> \xF9\x42 |0
-<U7E9A> \xF8\xFE |0
-<U7E9B> \xF9\x41 |0
-<U7E9C> \xC6\x6C |0
-<U7F36> \xA6\xCE |0
-<U7F38> \xAC\xFB |0
-<U7F39> \xD2\x6F |0
-<U7F3A> \xAF\xCA |0
-<U7F3D> \xB2\xDA |0
-<U7F3E> \xDA\xFC |0
-<U7F3F> \xDA\xFD |0
-<U7F43> \xEA\xDF |0
-<U7F44> \xC1\x6A |0
-<U7F45> \xED\xE1 |0
-<U7F48> \xC2\xBB |0
-<U7F4A> \xF2\xBA |0
-<U7F4B> \xF2\xB9 |0
-<U7F4C> \xC4\xA2 |0
-<U7F4D> \xF5\xED |0
-<U7F4F> \xF7\x43 |0
-<U7F50> \xC5\xF8 |0
-<U7F51> \xCA\x49 |0
-<U7F54> \xAA\xC9 |0
-<U7F55> \xA8\x75 |0
-<U7F58> \xD0\x4D |0
-<U7F5B> \xD3\x60 |0
-<U7F5C> \xD3\x5B |0
-<U7F5D> \xD3\x5F |0
-<U7F5E> \xD3\x5D |0
-<U7F5F> \xAF\xCB |0
-<U7F60> \xD3\x5E |0
-<U7F61> \xD3\x5C |0
-<U7F63> \xD6\xF1 |0
-<U7F65> \xDA\xFE |0
-<U7F66> \xDB\x40 |0
-<U7F67> \xDF\x69 |0
-<U7F68> \xDF\x6A |0
-<U7F69> \xB8\x6E |0
-<U7F6A> \xB8\x6F |0
-<U7F6B> \xDF\x68 |0
-<U7F6C> \xDF\x6B |0
-<U7F6D> \xDF\x67 |0
-<U7F6E> \xB8\x6D |0
-<U7F70> \xBB\x40 |0
-<U7F72> \xB8\x70 |0
-<U7F73> \xE3\x7A |0
-<U7F75> \xBD\x7C |0
-<U7F76> \xE6\xF1 |0
-<U7F77> \xBD\x7D |0
-<U7F79> \xBF\xA9 |0
-<U7F7A> \xEA\xE2 |0
-<U7F7B> \xEA\xE0 |0
-<U7F7C> \xEA\xE1 |0
-<U7F7D> \xED\xE4 |0
-<U7F7E> \xED\xE3 |0
-<U7F7F> \xED\xE2 |0
-<U7F83> \xF2\xBB |0
-<U7F85> \xC3\xB9 |0
-<U7F86> \xF2\xBC |0
-<U7F87> \xF7\x44 |0
-<U7F88> \xC5\xF9 |0
-<U7F89> \xF8\xBA |0
-<U7F8A> \xA6\xCF |0
-<U7F8B> \xAA\xCB |0
-<U7F8C> \xAA\xCA |0
-<U7F8D> \xD0\x4F |0
-<U7F8E> \xAC\xFC |0
-<U7F91> \xD0\x4E |0
-<U7F92> \xD3\x62 |0
-<U7F94> \xAF\xCC |0
-<U7F95> \xD6\xF2 |0
-<U7F96> \xD3\x61 |0
-<U7F9A> \xB2\xDC |0
-<U7F9B> \xD6\xF5 |0
-<U7F9C> \xD6\xF3 |0
-<U7F9D> \xD6\xF4 |0
-<U7F9E> \xB2\xDB |0
-<U7FA0> \xDB\x42 |0
-<U7FA1> \xDB\x43 |0
-<U7FA2> \xDB\x41 |0
-<U7FA4> \xB8\x73 |0
-<U7FA5> \xDF\x6D |0
-<U7FA6> \xDF\x6C |0
-<U7FA7> \xDF\x6E |0
-<U7FA8> \xB8\x72 |0
-<U7FA9> \xB8\x71 |0
-<U7FAC> \xE6\xF2 |0
-<U7FAD> \xE6\xF4 |0
-<U7FAF> \xBD\x7E |0
-<U7FB0> \xE6\xF3 |0
-<U7FB1> \xEA\xE3 |0
-<U7FB2> \xBF\xAA |0
-<U7FB3> \xF0\x79 |0
-<U7FB5> \xF0\x78 |0
-<U7FB6> \xC3\xBB |0
-<U7FB7> \xF2\xBD |0
-<U7FB8> \xC3\xBD |0
-<U7FB9> \xC3\xBC |0
-<U7FBA> \xF4\xB0 |0
-<U7FBB> \xF5\xEE |0
-<U7FBC> \xC4\xF3 |0
-<U7FBD> \xA6\xD0 |0
-<U7FBE> \xD0\x50 |0
-<U7FBF> \xAC\xFD |0
-<U7FC0> \xD3\x65 |0
-<U7FC1> \xAF\xCE |0
-<U7FC2> \xD3\x64 |0
-<U7FC3> \xD3\x63 |0
-<U7FC5> \xAF\xCD |0
-<U7FC7> \xD6\xFB |0
-<U7FC9> \xD6\xFD |0
-<U7FCA> \xD6\xF6 |0
-<U7FCB> \xD6\xF7 |0
-<U7FCC> \xB2\xDD |0
-<U7FCD> \xD6\xF8 |0
-<U7FCE> \xB2\xDE |0
-<U7FCF> \xD6\xFC |0
-<U7FD0> \xD6\xF9 |0
-<U7FD1> \xD6\xFA |0
-<U7FD2> \xB2\xDF |0
-<U7FD4> \xB5\xBE |0
-<U7FD5> \xB5\xBF |0
-<U7FD7> \xDB\x44 |0
-<U7FDB> \xDF\x6F |0
-<U7FDC> \xDF\x70 |0
-<U7FDE> \xE3\x7E |0
-<U7FDF> \xBB\x43 |0
-<U7FE0> \xBB\x41 |0
-<U7FE1> \xBB\x42 |0
-<U7FE2> \xE3\x7B |0
-<U7FE3> \xE3\x7C |0
-<U7FE5> \xE3\x7D |0
-<U7FE6> \xE6\xF9 |0
-<U7FE8> \xE6\xFA |0
-<U7FE9> \xBD\xA1 |0
-<U7FEA> \xE6\xF7 |0
-<U7FEB> \xE6\xF6 |0
-<U7FEC> \xE6\xF8 |0
-<U7FED> \xE6\xF5 |0
-<U7FEE> \xBF\xAD |0
-<U7FEF> \xEA\xE4 |0
-<U7FF0> \xBF\xAB |0
-<U7FF1> \xBF\xAC |0
-<U7FF2> \xED\xE6 |0
-<U7FF3> \xC1\x6B |0
-<U7FF4> \xED\xE5 |0
-<U7FF5> \xEF\xA8 |0
-<U7FF7> \xF0\x7A |0
-<U7FF8> \xF0\x7B |0
-<U7FF9> \xC2\xBC |0
-<U7FFB> \xC2\xBD |0
-<U7FFC> \xC1\x6C |0
-<U7FFD> \xF2\xBE |0
-<U7FFE> \xF2\xBF |0
-<U7FFF> \xF4\xB1 |0
-<U8000> \xC4\xA3 |0
-<U8001> \xA6\xD1 |0
-<U8003> \xA6\xD2 |0
-<U8004> \xAC\xFE |0
-<U8005> \xAA\xCC |0
-<U8006> \xAF\xCF |0
-<U8007> \xD0\x51 |0
-<U800B> \xB5\xC0 |0
-<U800C> \xA6\xD3 |0
-<U800D> \xAD\x41 |0
-<U800E> \xD0\x52 |0
-<U800F> \xD0\x53 |0
-<U8010> \xAD\x40 |0
-<U8011> \xAD\x42 |0
-<U8012> \xA6\xD4 |0
-<U8014> \xD0\x54 |0
-<U8015> \xAF\xD1 |0
-<U8016> \xD3\x66 |0
-<U8017> \xAF\xD3 |0
-<U8018> \xAF\xD0 |0
-<U8019> \xAF\xD2 |0
-<U801B> \xD7\x41 |0
-<U801C> \xB2\xE0 |0
-<U801E> \xD7\x40 |0
-<U801F> \xD6\xFE |0
-<U8021> \xDF\x71 |0
-<U8024> \xE3\xA1 |0
-<U8026> \xBD\xA2 |0
-<U8028> \xBF\xAE |0
-<U8029> \xEA\xE6 |0
-<U802A> \xEA\xE5 |0
-<U802C> \xED\xE7 |0
-<U8030> \xF5\xEF |0
-<U8033> \xA6\xD5 |0
-<U8034> \xCB\x73 |0
-<U8035> \xCD\xAA |0
-<U8036> \xAD\x43 |0
-<U8037> \xD0\x55 |0
-<U8039> \xD3\x68 |0
-<U803D> \xAF\xD4 |0
-<U803E> \xD3\x67 |0
-<U803F> \xAF\xD5 |0
-<U8043> \xD7\x43 |0
-<U8046> \xB2\xE2 |0
-<U8047> \xD7\x42 |0
-<U8048> \xD7\x44 |0
-<U804A> \xB2\xE1 |0
-<U804F> \xDB\x46 |0
-<U8050> \xDB\x47 |0
-<U8051> \xDB\x45 |0
-<U8052> \xB5\xC1 |0
-<U8056> \xB8\x74 |0
-<U8058> \xB8\x75 |0
-<U805A> \xBB\x45 |0
-<U805C> \xE3\xA3 |0
-<U805D> \xE3\xA2 |0
-<U805E> \xBB\x44 |0
-<U8064> \xE6\xFB |0
-<U8067> \xE6\xFC |0
-<U806C> \xEA\xE7 |0
-<U806F> \xC1\x70 |0
-<U8070> \xC1\x6F |0
-<U8071> \xC1\x6D |0
-<U8072> \xC1\x6E |0
-<U8073> \xC1\x71 |0
-<U8075> \xF0\x7C |0
-<U8076> \xC2\xBF |0
-<U8077> \xC2\xBE |0
-<U8078> \xF2\xC0 |0
-<U8079> \xF4\xB2 |0
-<U807D> \xC5\xA5 |0
-<U807E> \xC5\xA4 |0
-<U807F> \xA6\xD6 |0
-<U8082> \xD1\xFB |0
-<U8084> \xB8\x77 |0
-<U8085> \xB5\xC2 |0
-<U8086> \xB8\x76 |0
-<U8087> \xBB\x46 |0
-<U8089> \xA6\xD7 |0
-<U808A> \xC9\xA9 |0
-<U808B> \xA6\xD8 |0
-<U808C> \xA6\xD9 |0
-<U808F> \xCD\xAB |0
-<U8090> \xCB\x76 |0
-<U8092> \xCB\x77 |0
-<U8093> \xA8\x77 |0
-<U8095> \xCB\x74 |0
-<U8096> \xA8\x76 |0
-<U8098> \xA8\x79 |0
-<U8099> \xCB\x75 |0
-<U809A> \xA8\x7B |0
-<U809B> \xA8\x7A |0
-<U809C> \xCB\x78 |0
-<U809D> \xA8\x78 |0
-<U80A1> \xAA\xD1 |0
-<U80A2> \xAA\xCF |0
-<U80A3> \xCD\xAD |0
-<U80A5> \xAA\xCE |0
-<U80A9> \xAA\xD3 |0
-<U80AA> \xAA\xD5 |0
-<U80AB> \xAA\xD2 |0
-<U80AD> \xCD\xB0 |0
-<U80AE> \xCD\xAC |0
-<U80AF> \xAA\xD6 |0
-<U80B1> \xAA\xD0 |0
-<U80B2> \xA8\x7C |0
-<U80B4> \xAA\xD4 |0
-<U80B5> \xCD\xAF |0
-<U80B8> \xCD\xAE |0
-<U80BA> \xAA\xCD |0
-<U80C2> \xD0\x5B |0
-<U80C3> \xAD\x47 |0
-<U80C4> \xAD\x48 |0
-<U80C5> \xD0\x5D |0
-<U80C7> \xD0\x57 |0
-<U80C8> \xD0\x5A |0
-<U80C9> \xD0\x63 |0
-<U80CA> \xD0\x61 |0
-<U80CC> \xAD\x49 |0
-<U80CD> \xD0\x67 |0
-<U80CE> \xAD\x4C |0
-<U80CF> \xD0\x64 |0
-<U80D0> \xD0\x5C |0
-<U80D1> \xD0\x59 |0
-<U80D4> \xDB\x49 |0
-<U80D5> \xD0\x62 |0
-<U80D6> \xAD\x44 |0
-<U80D7> \xD0\x65 |0
-<U80D8> \xD0\x56 |0
-<U80D9> \xD0\x5F |0
-<U80DA> \xAD\x46 |0
-<U80DB> \xAD\x4B |0
-<U80DC> \xD0\x60 |0
-<U80DD> \xAD\x4F |0
-<U80DE> \xAD\x4D |0
-<U80E0> \xD0\x58 |0
-<U80E1> \xAD\x4A |0
-<U80E3> \xD0\x5E |0
-<U80E4> \xAD\x4E |0
-<U80E5> \xAD\x45 |0
-<U80E6> \xD0\x66 |0
-<U80ED> \xAF\xDA |0
-<U80EF> \xAF\xE3 |0
-<U80F0> \xAF\xD8 |0
-<U80F1> \xAF\xD6 |0
-<U80F2> \xD3\x6A |0
-<U80F3> \xAF\xDE |0
-<U80F4> \xAF\xDB |0
-<U80F5> \xD3\x6C |0
-<U80F8> \xAF\xDD |0
-<U80F9> \xD3\x6B |0
-<U80FA> \xD3\x69 |0
-<U80FB> \xD3\x6E |0
-<U80FC> \xAF\xE2 |0
-<U80FD> \xAF\xE0 |0
-<U80FE> \xDB\x48 |0
-<U8100> \xD3\x6F |0
-<U8101> \xD3\x6D |0
-<U8102> \xAF\xD7 |0
-<U8105> \xAF\xD9 |0
-<U8106> \xAF\xDC |0
-<U8108> \xAF\xDF |0
-<U810A> \xAF\xE1 |0
-<U8115> \xD7\x4E |0
-<U8116> \xB2\xE4 |0
-<U8118> \xD7\x45 |0
-<U8119> \xD7\x47 |0
-<U811B> \xD7\x48 |0
-<U811D> \xD7\x50 |0
-<U811E> \xD7\x4C |0
-<U811F> \xD7\x4A |0
-<U8121> \xD7\x4D |0
-<U8122> \xD7\x51 |0
-<U8123> \xB2\xE5 |0
-<U8124> \xB2\xE9 |0
-<U8125> \xD7\x46 |0
-<U8127> \xD7\x4F |0
-<U8129> \xB2\xE7 |0
-<U812B> \xB2\xE6 |0
-<U812C> \xD7\x4B |0
-<U812D> \xD7\x49 |0
-<U812F> \xB2\xE3 |0
-<U8130> \xB2\xE8 |0
-<U8139> \xB5\xC8 |0
-<U813A> \xDB\x51 |0
-<U813D> \xDB\x4F |0
-<U813E> \xB5\xCA |0
-<U8143> \xDB\x4A |0
-<U8144> \xDF\xA1 |0
-<U8146> \xB5\xC9 |0
-<U8147> \xDB\x4E |0
-<U814A> \xDB\x4B |0
-<U814B> \xB5\xC5 |0
-<U814C> \xB5\xCB |0
-<U814D> \xDB\x50 |0
-<U814E> \xB5\xC7 |0
-<U814F> \xDB\x4D |0
-<U8150> \xBB\x47 |0
-<U8151> \xB5\xC6 |0
-<U8152> \xDB\x4C |0
-<U8153> \xB5\xCC |0
-<U8154> \xB5\xC4 |0
-<U8155> \xB5\xC3 |0
-<U815B> \xDF\x77 |0
-<U815C> \xDF\x75 |0
-<U815E> \xDF\x7B |0
-<U8160> \xDF\x73 |0
-<U8161> \xDF\xA2 |0
-<U8162> \xDF\x78 |0
-<U8164> \xDF\x72 |0
-<U8165> \xB8\x7B |0
-<U8166> \xB8\xA3 |0
-<U8167> \xDF\x7D |0
-<U8169> \xDF\x76 |0
-<U816B> \xB8\x7E |0
-<U816E> \xB8\x7C |0
-<U816F> \xDF\x7E |0
-<U8170> \xB8\x79 |0
-<U8171> \xB8\x78 |0
-<U8172> \xDF\x79 |0
-<U8173> \xB8\x7D |0
-<U8174> \xB5\xCD |0
-<U8176> \xDF\x7C |0
-<U8177> \xDF\x74 |0
-<U8178> \xB8\x7A |0
-<U8179> \xB8\xA1 |0
-<U817A> \xB8\xA2 |0
-<U817F> \xBB\x4C |0
-<U8180> \xBB\x48 |0
-<U8182> \xBB\x4D |0
-<U8183> \xE3\xA6 |0
-<U8186> \xE3\xA5 |0
-<U8187> \xE3\xA7 |0
-<U8188> \xBB\x4A |0
-<U8189> \xE3\xA4 |0
-<U818A> \xBB\x4B |0
-<U818B> \xE3\xAA |0
-<U818C> \xE3\xA9 |0
-<U818D> \xE3\xA8 |0
-<U818F> \xBB\x49 |0
-<U8195> \xE7\x41 |0
-<U8197> \xE7\x44 |0
-<U8198> \xBD\xA8 |0
-<U8199> \xE7\x43 |0
-<U819A> \xBD\xA7 |0
-<U819B> \xBD\xA3 |0
-<U819C> \xBD\xA4 |0
-<U819D> \xBD\xA5 |0
-<U819E> \xE7\x40 |0
-<U819F> \xE6\xFE |0
-<U81A0> \xBD\xA6 |0
-<U81A2> \xE7\x42 |0
-<U81A3> \xE6\xFD |0
-<U81A6> \xEA\xE9 |0
-<U81A7> \xEA\xF3 |0
-<U81A8> \xBF\xB1 |0
-<U81A9> \xBF\xB0 |0
-<U81AB> \xEA\xED |0
-<U81AC> \xEA\xEF |0
-<U81AE> \xEA\xEA |0
-<U81B0> \xEA\xEE |0
-<U81B1> \xEA\xE8 |0
-<U81B2> \xEA\xF1 |0
-<U81B3> \xBF\xAF |0
-<U81B4> \xEA\xF0 |0
-<U81B5> \xEA\xEC |0
-<U81B7> \xEA\xF2 |0
-<U81B9> \xEA\xEB |0
-<U81BA> \xC1\x74 |0
-<U81BB> \xED\xE8 |0
-<U81BC> \xED\xEE |0
-<U81BD> \xC1\x78 |0
-<U81BE> \xC1\x7A |0
-<U81BF> \xC1\x77 |0
-<U81C0> \xC1\x76 |0
-<U81C2> \xC1\x75 |0
-<U81C3> \xC1\x73 |0
-<U81C4> \xED\xE9 |0
-<U81C5> \xED\xEC |0
-<U81C6> \xC1\x72 |0
-<U81C7> \xED\xED |0
-<U81C9> \xC1\x79 |0
-<U81CA> \xED\xEB |0
-<U81CC> \xED\xEA |0
-<U81CD> \xC2\xC0 |0
-<U81CF> \xC2\xC1 |0
-<U81D0> \xF0\xA1 |0
-<U81D1> \xF0\x7D |0
-<U81D2> \xF0\x7E |0
-<U81D5> \xF2\xC2 |0
-<U81D7> \xF2\xC1 |0
-<U81D8> \xC3\xBE |0
-<U81D9> \xF4\xB4 |0
-<U81DA> \xC4\xA4 |0
-<U81DB> \xF4\xB3 |0
-<U81DD> \xF5\xF0 |0
-<U81DE> \xF7\x45 |0
-<U81DF> \xC5\xA6 |0
-<U81E0> \xF9\x43 |0
-<U81E1> \xF9\x44 |0
-<U81E2> \xC5\xD8 |0
-<U81E3> \xA6\xDA |0
-<U81E5> \xAA\xD7 |0
-<U81E6> \xDB\x52 |0
-<U81E7> \xBB\x4E |0
-<U81E8> \xC1\x7B |0
-<U81E9> \xED\xEF |0
-<U81EA> \xA6\xDB |0
-<U81EC> \xAF\xE5 |0
-<U81ED> \xAF\xE4 |0
-<U81EE> \xDB\x53 |0
-<U81F2> \xEA\xF4 |0
-<U81F3> \xA6\xDC |0
-<U81F4> \xAD\x50 |0
-<U81F7> \xDB\x54 |0
-<U81F8> \xDB\x55 |0
-<U81F9> \xDB\x56 |0
-<U81FA> \xBB\x4F |0
-<U81FB> \xBF\xB2 |0
-<U81FC> \xA6\xDD |0
-<U81FE> \xAA\xD8 |0
-<U81FF> \xD0\x68 |0
-<U8200> \xAF\xE6 |0
-<U8201> \xD3\x70 |0
-<U8202> \xB2\xEA |0
-<U8204> \xDB\x57 |0
-<U8205> \xB8\xA4 |0
-<U8207> \xBB\x50 |0
-<U8208> \xBF\xB3 |0
-<U8209> \xC1\x7C |0
-<U820A> \xC2\xC2 |0
-<U820B> \xF4\xB5 |0
-<U820C> \xA6\xDE |0
-<U820D> \xAA\xD9 |0
-<U8210> \xAF\xE7 |0
-<U8211> \xD7\x52 |0
-<U8212> \xB5\xCE |0
-<U8214> \xBB\x51 |0
-<U8215> \xE3\xAB |0
-<U8216> \xE7\x45 |0
-<U821B> \xA6\xDF |0
-<U821C> \xB5\xCF |0
-<U821D> \xDF\xA3 |0
-<U821E> \xBB\x52 |0
-<U821F> \xA6\xE0 |0
-<U8220> \xCD\xB1 |0
-<U8221> \xD0\x69 |0
-<U8222> \xAD\x51 |0
-<U8225> \xD3\x72 |0
-<U8228> \xAF\xEA |0
-<U822A> \xAF\xE8 |0
-<U822B> \xAF\xE9 |0
-<U822C> \xAF\xEB |0
-<U822F> \xD3\x71 |0
-<U8232> \xD7\x57 |0
-<U8233> \xD7\x54 |0
-<U8234> \xD7\x56 |0
-<U8235> \xB2\xEB |0
-<U8236> \xB2\xED |0
-<U8237> \xB2\xEC |0
-<U8238> \xD7\x53 |0
-<U8239> \xB2\xEE |0
-<U823A> \xD7\x55 |0
-<U823C> \xDB\x58 |0
-<U823D> \xDB\x59 |0
-<U823F> \xDB\x5A |0
-<U8240> \xDF\xA6 |0
-<U8242> \xDF\xA7 |0
-<U8244> \xDF\xA5 |0
-<U8245> \xDF\xA8 |0
-<U8247> \xB8\xA5 |0
-<U8249> \xDF\xA4 |0
-<U824B> \xBB\x53 |0
-<U824E> \xE7\x4A |0
-<U824F> \xE7\x46 |0
-<U8250> \xE7\x49 |0
-<U8251> \xE7\x4B |0
-<U8252> \xE7\x48 |0
-<U8253> \xE7\x47 |0
-<U8255> \xEA\xF5 |0
-<U8256> \xEA\xF6 |0
-<U8257> \xEA\xF7 |0
-<U8258> \xBF\xB4 |0
-<U8259> \xBF\xB5 |0
-<U825A> \xED\xF1 |0
-<U825B> \xED\xF0 |0
-<U825C> \xED\xF2 |0
-<U825E> \xF0\xA3 |0
-<U825F> \xF0\xA2 |0
-<U8261> \xF2\xC4 |0
-<U8263> \xF2\xC5 |0
-<U8264> \xF2\xC3 |0
-<U8266> \xC4\xA5 |0
-<U8268> \xF4\xB6 |0
-<U8269> \xF4\xB7 |0
-<U826B> \xF7\x46 |0
-<U826C> \xF7\xEF |0
-<U826D> \xF8\xBB |0
-<U826E> \xA6\xE1 |0
-<U826F> \xA8\x7D |0
-<U8271> \xC1\x7D |0
-<U8272> \xA6\xE2 |0
-<U8274> \xD7\x58 |0
-<U8275> \xDB\x5B |0
-<U8277> \xC6\x41 |0
-<U8278> \xCA\x4A |0
-<U827C> \xCA\x4B |0
-<U827D> \xCA\x4D |0
-<U827E> \xA6\xE3 |0
-<U827F> \xCA\x4E |0
-<U8280> \xCA\x4C |0
-<U8283> \xCB\xA2 |0
-<U8284> \xCB\xA3 |0
-<U8285> \xCB\x7B |0
-<U828A> \xCB\xA1 |0
-<U828B> \xA8\xA1 |0
-<U828D> \xA8\xA2 |0
-<U828E> \xCB\x7C |0
-<U828F> \xCB\x7A |0
-<U8290> \xCB\x79 |0
-<U8291> \xCB\x7D |0
-<U8292> \xA8\x7E |0
-<U8293> \xCB\x7E |0
-<U8294> \xD0\x6A |0
-<U8298> \xCD\xB6 |0
-<U8299> \xAA\xDC |0
-<U829A> \xCD\xB5 |0
-<U829B> \xCD\xB7 |0
-<U829D> \xAA\xDB |0
-<U829E> \xCD\xBC |0
-<U829F> \xAA\xDF |0
-<U82A0> \xCD\xB2 |0
-<U82A1> \xCD\xC0 |0
-<U82A2> \xCD\xC6 |0
-<U82A3> \xAA\xE6 |0
-<U82A4> \xCD\xC3 |0
-<U82A5> \xAA\xE3 |0
-<U82A7> \xCD\xB9 |0
-<U82A8> \xCD\xBF |0
-<U82A9> \xCD\xC1 |0
-<U82AB> \xCD\xB4 |0
-<U82AC> \xAA\xE2 |0
-<U82AD> \xAA\xDD |0
-<U82AE> \xCD\xBA |0
-<U82AF> \xAA\xE4 |0
-<U82B0> \xAA\xE7 |0
-<U82B1> \xAA\xE1 |0
-<U82B3> \xAA\xDA |0
-<U82B4> \xCD\xBE |0
-<U82B5> \xCD\xB8 |0
-<U82B6> \xCD\xC5 |0
-<U82B7> \xAA\xE9 |0
-<U82B8> \xAA\xE5 |0
-<U82B9> \xAA\xE0 |0
-<U82BA> \xCD\xBD |0
-<U82BB> \xAF\xEC |0
-<U82BC> \xCD\xBB |0
-<U82BD> \xAA\xDE |0
-<U82BE> \xAA\xE8 |0
-<U82C0> \xCD\xB3 |0
-<U82C2> \xCD\xC2 |0
-<U82C3> \xCD\xC4 |0
-<U82D1> \xAD\x62 |0
-<U82D2> \xAD\x5C |0
-<U82D3> \xAD\x64 |0
-<U82D4> \xAD\x61 |0
-<U82D5> \xD0\x71 |0
-<U82D6> \xD0\x74 |0
-<U82D7> \xAD\x5D |0
-<U82D9> \xD0\x6B |0
-<U82DB> \xAD\x56 |0
-<U82DC> \xAD\x60 |0
-<U82DE> \xAD\x63 |0
-<U82DF> \xAD\x65 |0
-<U82E0> \xD0\xA2 |0
-<U82E1> \xD0\x77 |0
-<U82E3> \xAD\x55 |0
-<U82E4> \xD0\xA1 |0
-<U82E5> \xAD\x59 |0
-<U82E6> \xAD\x57 |0
-<U82E7> \xAD\x52 |0
-<U82E8> \xD0\x6F |0
-<U82EA> \xD0\x7E |0
-<U82EB> \xD0\x73 |0
-<U82EC> \xD0\x76 |0
-<U82ED> \xD0\xA5 |0
-<U82EF> \xAD\x66 |0
-<U82F0> \xD0\x7D |0
-<U82F1> \xAD\x5E |0
-<U82F2> \xD0\x78 |0
-<U82F3> \xD0\xA4 |0
-<U82F4> \xD0\x75 |0
-<U82F5> \xD0\x79 |0
-<U82F6> \xD0\x7C |0
-<U82F9> \xD0\x6D |0
-<U82FA> \xD0\xA3 |0
-<U82FB> \xD0\x7B |0
-<U82FE> \xD0\x6C |0
-<U8300> \xD0\x70 |0
-<U8301> \xAD\x5F |0
-<U8302> \xAD\x5A |0
-<U8303> \xAD\x53 |0
-<U8304> \xAD\x58 |0
-<U8305> \xAD\x54 |0
-<U8306> \xAD\x67 |0
-<U8307> \xD0\x6E |0
-<U8308> \xD3\xA5 |0
-<U8309> \xAD\x5B |0
-<U830C> \xD0\x7A |0
-<U830D> \xCE\x41 |0
-<U8316> \xD3\xA8 |0
-<U8317> \xAF\xFA |0
-<U8319> \xD3\x76 |0
-<U831B> \xD3\xA3 |0
-<U831C> \xD3\x7D |0
-<U831E> \xD3\xB2 |0
-<U8320> \xD3\xAA |0
-<U8322> \xD3\x7E |0
-<U8324> \xD3\xA9 |0
-<U8325> \xD3\x78 |0
-<U8326> \xD3\x7C |0
-<U8327> \xD3\xB5 |0
-<U8328> \xAF\xFD |0
-<U8329> \xD3\xAD |0
-<U832A> \xD3\xA4 |0
-<U832B> \xAF\xED |0
-<U832C> \xD3\xB3 |0
-<U832D> \xD3\x74 |0
-<U832F> \xD3\xAC |0
-<U8331> \xAF\xFC |0
-<U8332> \xAF\xF7 |0
-<U8333> \xD3\x73 |0
-<U8334> \xAF\xF5 |0
-<U8335> \xAF\xF4 |0
-<U8336> \xAF\xF9 |0
-<U8337> \xD3\xAB |0
-<U8338> \xAF\xF1 |0
-<U8339> \xAF\xF8 |0
-<U833A> \xD0\x72 |0
-<U833B> \xDB\x5C |0
-<U833C> \xD3\xA6 |0
-<U833F> \xD3\x7A |0
-<U8340> \xAF\xFB |0
-<U8341> \xD3\x7B |0
-<U8342> \xD3\xA1 |0
-<U8343> \xAF\xFE |0
-<U8344> \xD3\x75 |0
-<U8345> \xD3\xAF |0
-<U8347> \xD3\xAE |0
-<U8348> \xD3\xB6 |0
-<U8349> \xAF\xF3 |0
-<U834A> \xAF\xF0 |0
-<U834B> \xD3\xB4 |0
-<U834C> \xD3\xB0 |0
-<U834D> \xD3\xA7 |0
-<U834E> \xD3\xA2 |0
-<U834F> \xAF\xF6 |0
-<U8350> \xAF\xF2 |0
-<U8351> \xD3\x77 |0
-<U8352> \xAF\xEE |0
-<U8353> \xD3\xB1 |0
-<U8354> \xAF\xEF |0
-<U8356> \xD3\x79 |0
-<U8373> \xD7\x5E |0
-<U8374> \xD7\x60 |0
-<U8375> \xD7\x65 |0
-<U8376> \xD7\x79 |0
-<U8377> \xB2\xFC |0
-<U8378> \xB2\xF2 |0
-<U837A> \xD7\x5D |0
-<U837B> \xB2\xFD |0
-<U837C> \xB2\xFE |0
-<U837D> \xD7\x68 |0
-<U837E> \xD7\x6F |0
-<U837F> \xD7\x75 |0
-<U8381> \xD7\x62 |0
-<U8383> \xD7\x69 |0
-<U8386> \xB3\x40 |0
-<U8387> \xD7\x77 |0
-<U8388> \xD7\x72 |0
-<U8389> \xB2\xFA |0
-<U838A> \xB2\xF8 |0
-<U838B> \xD7\x6E |0
-<U838C> \xD7\x6A |0
-<U838D> \xD7\x5C |0
-<U838E> \xB2\xEF |0
-<U838F> \xD7\x61 |0
-<U8390> \xD7\x59 |0
-<U8392> \xB2\xF7 |0
-<U8393> \xB2\xF9 |0
-<U8394> \xD7\x66 |0
-<U8395> \xD7\x63 |0
-<U8396> \xB2\xF4 |0
-<U8397> \xD7\x73 |0
-<U8398> \xB2\xF1 |0
-<U8399> \xD7\x64 |0
-<U839A> \xD7\x7A |0
-<U839B> \xD7\x6C |0
-<U839D> \xD7\x6B |0
-<U839E> \xB2\xF0 |0
-<U83A0> \xB2\xFB |0
-<U83A2> \xB2\xF3 |0
-<U83A3> \xD7\x5A |0
-<U83A4> \xD7\x5F |0
-<U83A5> \xD7\x70 |0
-<U83A6> \xD7\x76 |0
-<U83A7> \xB3\x41 |0
-<U83A8> \xD7\x5B |0
-<U83A9> \xD7\x67 |0
-<U83AA> \xD7\x6D |0
-<U83AB> \xB2\xF6 |0
-<U83AE> \xD7\x78 |0
-<U83AF> \xD7\x71 |0
-<U83B0> \xD7\x74 |0
-<U83BD> \xB2\xF5 |0
-<U83BF> \xDB\x6C |0
-<U83C0> \xDB\x60 |0
-<U83C1> \xB5\xD7 |0
-<U83C2> \xDB\x7D |0
-<U83C3> \xDB\xA7 |0
-<U83C4> \xDB\xAA |0
-<U83C5> \xB5\xD5 |0
-<U83C6> \xDB\x68 |0
-<U83C7> \xDB\xA3 |0
-<U83C8> \xDB\x69 |0
-<U83C9> \xDB\x77 |0
-<U83CA> \xB5\xE2 |0
-<U83CB> \xDB\x73 |0
-<U83CC> \xB5\xDF |0
-<U83CE> \xDB\x74 |0
-<U83CF> \xDB\x5D |0
-<U83D1> \xDB\xA4 |0
-<U83D4> \xB5\xE8 |0
-<U83D5> \xDB\xA1 |0
-<U83D6> \xDB\x75 |0
-<U83D7> \xDB\xAC |0
-<U83D8> \xDB\x70 |0
-<U83D9> \xDF\xC8 |0
-<U83DB> \xDB\xAF |0
-<U83DC> \xB5\xE6 |0
-<U83DD> \xDB\x6E |0
-<U83DE> \xDB\x7A |0
-<U83DF> \xB5\xE9 |0
-<U83E0> \xB5\xD4 |0
-<U83E1> \xDB\x72 |0
-<U83E2> \xDB\xAD |0
-<U83E3> \xDB\x6B |0
-<U83E4> \xDB\x64 |0
-<U83E5> \xDB\x6F |0
-<U83E7> \xDB\x63 |0
-<U83E8> \xDB\x61 |0
-<U83E9> \xB5\xD0 |0
-<U83EA> \xDB\xA5 |0
-<U83EB> \xDB\x6A |0
-<U83EC> \xDB\xA8 |0
-<U83EE> \xDB\xA9 |0
-<U83EF> \xB5\xD8 |0
-<U83F0> \xB5\xDD |0
-<U83F1> \xB5\xD9 |0
-<U83F2> \xB5\xE1 |0
-<U83F3> \xDB\x7E |0
-<U83F4> \xB5\xDA |0
-<U83F5> \xDB\x76 |0
-<U83F6> \xDB\x66 |0
-<U83F8> \xB5\xD2 |0
-<U83F9> \xDB\x5E |0
-<U83FA> \xDB\xA2 |0
-<U83FB> \xDB\xAB |0
-<U83FC> \xDB\x65 |0
-<U83FD> \xB5\xE0 |0
-<U83FE> \xDB\xB0 |0
-<U83FF> \xDB\x71 |0
-<U8401> \xDB\x6D |0
-<U8403> \xB5\xD1 |0
-<U8404> \xB5\xE5 |0
-<U8406> \xDB\x7C |0
-<U8407> \xB5\xE7 |0
-<U8409> \xDB\x78 |0
-<U840A> \xB5\xDC |0
-<U840B> \xB5\xD6 |0
-<U840C> \xB5\xDE |0
-<U840D> \xB5\xD3 |0
-<U840E> \xB5\xE4 |0
-<U840F> \xDB\x79 |0
-<U8410> \xDB\x67 |0
-<U8411> \xDB\x7B |0
-<U8412> \xDB\x62 |0
-<U8413> \xDB\xA6 |0
-<U841B> \xDB\xAE |0
-<U8423> \xDB\x5F |0
-<U8429> \xDF\xC7 |0
-<U842B> \xDF\xDD |0
-<U842C> \xB8\x55 |0
-<U842D> \xDF\xCC |0
-<U842F> \xDF\xCA |0
-<U8430> \xDF\xB5 |0
-<U8431> \xB8\xA9 |0
-<U8432> \xDF\xC5 |0
-<U8433> \xDF\xD9 |0
-<U8434> \xDF\xC1 |0
-<U8435> \xB8\xB1 |0
-<U8436> \xDF\xD8 |0
-<U8437> \xDF\xBF |0
-<U8438> \xB5\xE3 |0
-<U8439> \xDF\xCF |0
-<U843A> \xDF\xC0 |0
-<U843B> \xDF\xD6 |0
-<U843C> \xB8\xB0 |0
-<U843D> \xB8\xA8 |0
-<U843F> \xDF\xAA |0
-<U8440> \xDF\xB2 |0
-<U8442> \xDF\xCB |0
-<U8443> \xDF\xC3 |0
-<U8444> \xDF\xDC |0
-<U8445> \xDF\xC6 |0
-<U8446> \xB8\xB6 |0
-<U8447> \xDF\xD7 |0
-<U8449> \xB8\xAD |0
-<U844B> \xDF\xC9 |0
-<U844C> \xDF\xD1 |0
-<U844D> \xDF\xB6 |0
-<U844E> \xDF\xD0 |0
-<U8450> \xDF\xE1 |0
-<U8451> \xDF\xB1 |0
-<U8452> \xDF\xD2 |0
-<U8454> \xDF\xDF |0
-<U8456> \xDF\xAB |0
-<U8457> \xB5\xDB |0
-<U8459> \xDF\xB9 |0
-<U845A> \xDF\xB8 |0
-<U845B> \xB8\xAF |0
-<U845D> \xDF\xBC |0
-<U845E> \xDF\xBE |0
-<U845F> \xDF\xCD |0
-<U8460> \xDF\xDE |0
-<U8461> \xB8\xB2 |0
-<U8463> \xB8\xB3 |0
-<U8465> \xDF\xB0 |0
-<U8466> \xB8\xAB |0
-<U8467> \xDF\xB4 |0
-<U8468> \xDF\xDA |0
-<U8469> \xB8\xB4 |0
-<U846B> \xB8\xAC |0
-<U846C> \xB8\xAE |0
-<U846D> \xB8\xB5 |0
-<U846E> \xDF\xE0 |0
-<U846F> \xDF\xD3 |0
-<U8470> \xDF\xCE |0
-<U8473> \xDF\xBB |0
-<U8474> \xDF\xBA |0
-<U8475> \xB8\xAA |0
-<U8476> \xDF\xAC |0
-<U8477> \xB8\xA7 |0
-<U8478> \xDF\xC4 |0
-<U8479> \xDF\xAD |0
-<U847A> \xDF\xC2 |0
-<U847D> \xDF\xB7 |0
-<U847E> \xDF\xDB |0
-<U8482> \xB8\xA6 |0
-<U8486> \xDF\xB3 |0
-<U848D> \xDF\xAF |0
-<U848E> \xDF\xD5 |0
-<U848F> \xDF\xAE |0
-<U8490> \xBB\x60 |0
-<U8491> \xE3\xD3 |0
-<U8494> \xE3\xC2 |0
-<U8497> \xE3\xAC |0
-<U8498> \xE3\xCA |0
-<U8499> \xBB\x58 |0
-<U849A> \xE3\xBB |0
-<U849B> \xE3\xC5 |0
-<U849C> \xBB\x5B |0
-<U849D> \xE3\xBE |0
-<U849E> \xBB\x59 |0
-<U849F> \xE3\xAF |0
-<U84A0> \xE3\xCD |0
-<U84A1> \xE3\xAE |0
-<U84A2> \xE3\xC1 |0
-<U84A4> \xE3\xAD |0
-<U84A7> \xE3\xBF |0
-<U84A8> \xE3\xC8 |0
-<U84A9> \xE3\xC6 |0
-<U84AA> \xE3\xBA |0
-<U84AB> \xE3\xB5 |0
-<U84AC> \xE3\xB3 |0
-<U84AE> \xE3\xB4 |0
-<U84AF> \xE3\xC7 |0
-<U84B0> \xE3\xD2 |0
-<U84B1> \xE3\xBC |0
-<U84B2> \xBB\x5A |0
-<U84B4> \xE3\xB7 |0
-<U84B6> \xE3\xCB |0
-<U84B8> \xBB\x5D |0
-<U84B9> \xE3\xB6 |0
-<U84BA> \xE3\xB0 |0
-<U84BB> \xE3\xC0 |0
-<U84BC> \xBB\x61 |0
-<U84BF> \xBB\x55 |0
-<U84C0> \xBB\x5E |0
-<U84C1> \xE3\xB8 |0
-<U84C2> \xE3\xB2 |0
-<U84C4> \xBB\x57 |0
-<U84C5> \xDF\xD4 |0
-<U84C6> \xBB\x56 |0
-<U84C7> \xE3\xC3 |0
-<U84C9> \xBB\x54 |0
-<U84CA> \xBB\x63 |0
-<U84CB> \xBB\x5C |0
-<U84CC> \xE3\xC4 |0
-<U84CD> \xE3\xB9 |0
-<U84CE> \xE3\xB1 |0
-<U84CF> \xE3\xCC |0
-<U84D0> \xE3\xBD |0
-<U84D1> \xBB\x62 |0
-<U84D2> \xE3\xD0 |0
-<U84D3> \xBB\x5F |0
-<U84D4> \xE3\xCF |0
-<U84D6> \xE3\xC9 |0
-<U84D7> \xE3\xCE |0
-<U84DB> \xE3\xD1 |0
-<U84E7> \xE7\x73 |0
-<U84E8> \xE7\x74 |0
-<U84E9> \xE7\x67 |0
-<U84EA> \xE7\x66 |0
-<U84EB> \xE7\x62 |0
-<U84EC> \xBD\xB4 |0
-<U84EE> \xBD\xAC |0
-<U84EF> \xE7\x76 |0
-<U84F0> \xE7\x75 |0
-<U84F1> \xDF\xA9 |0
-<U84F2> \xE7\x5F |0
-<U84F3> \xE7\x63 |0
-<U84F4> \xE7\x5D |0
-<U84F6> \xE7\x70 |0
-<U84F7> \xE7\x61 |0
-<U84F9> \xE7\x77 |0
-<U84FA> \xE7\x5A |0
-<U84FB> \xE7\x58 |0
-<U84FC> \xE7\x64 |0
-<U84FD> \xE7\x6E |0
-<U84FE> \xE7\x69 |0
-<U84FF> \xBD\xB6 |0
-<U8500> \xE7\x4F |0
-<U8502> \xE7\x6D |0
-<U8506> \xBD\xB7 |0
-<U8507> \xDF\xBD |0
-<U8508> \xE7\x5B |0
-<U8509> \xE7\x52 |0
-<U850A> \xE7\x55 |0
-<U850B> \xE7\x7B |0
-<U850C> \xE7\x5C |0
-<U850D> \xE7\x53 |0
-<U850E> \xE7\x51 |0
-<U850F> \xE7\x4E |0
-<U8511> \xBD\xB0 |0
-<U8512> \xE7\x65 |0
-<U8513> \xBD\xAF |0
-<U8514> \xBD\xB3 |0
-<U8515> \xE7\x60 |0
-<U8516> \xE7\x68 |0
-<U8517> \xBD\xA9 |0
-<U8518> \xE7\x78 |0
-<U8519> \xE7\x7C |0
-<U851A> \xBD\xAB |0
-<U851C> \xE7\x57 |0
-<U851D> \xE7\x6B |0
-<U851E> \xE7\x6F |0
-<U851F> \xE7\x54 |0
-<U8520> \xE7\x79 |0
-<U8521> \xBD\xB2 |0
-<U8523> \xBD\xB1 |0
-<U8524> \xE7\x4C |0
-<U8525> \xBD\xB5 |0
-<U8526> \xE7\x72 |0
-<U8527> \xE7\x56 |0
-<U8528> \xE7\x6A |0
-<U8529> \xE7\x50 |0
-<U852A> \xE7\x5E |0
-<U852B> \xE7\x59 |0
-<U852C> \xBD\xAD |0
-<U852D> \xBD\xAE |0
-<U852E> \xE7\x6C |0
-<U852F> \xE7\x7D |0
-<U8530> \xE7\x7A |0
-<U8531> \xE7\x71 |0
-<U853B> \xE7\x4D |0
-<U853D> \xBD\xAA |0
-<U853E> \xEB\x49 |0
-<U8540> \xEB\x40 |0
-<U8541> \xEB\x43 |0
-<U8543> \xBF\xBB |0
-<U8544> \xEB\x45 |0
-<U8545> \xEA\xF9 |0
-<U8546> \xEB\x41 |0
-<U8547> \xEB\x47 |0
-<U8548> \xBF\xB8 |0
-<U8549> \xBF\xBC |0
-<U854A> \xBF\xB6 |0
-<U854D> \xEA\xFB |0
-<U854E> \xEB\x4C |0
-<U8551> \xEB\x46 |0
-<U8553> \xEA\xFC |0
-<U8554> \xEB\x55 |0
-<U8555> \xEB\x4F |0
-<U8556> \xEA\xF8 |0
-<U8557> \xEE\x46 |0
-<U8558> \xEA\xFE |0
-<U8559> \xBF\xB7 |0
-<U855B> \xEB\x4A |0
-<U855D> \xEB\x54 |0
-<U855E> \xBF\xBF |0
-<U8560> \xEB\x51 |0
-<U8561> \xEA\xFD |0
-<U8562> \xEB\x44 |0
-<U8563> \xEB\x48 |0
-<U8564> \xEB\x42 |0
-<U8565> \xEB\x56 |0
-<U8566> \xEB\x53 |0
-<U8567> \xEB\x50 |0
-<U8568> \xBF\xB9 |0
-<U8569> \xBF\xBA |0
-<U856A> \xBF\xBE |0
-<U856B> \xEA\xFA |0
-<U856C> \xEB\x57 |0
-<U856D> \xBF\xBD |0
-<U856E> \xEB\x4D |0
-<U8571> \xEB\x4B |0
-<U8575> \xEB\x4E |0
-<U8576> \xEE\x53 |0
-<U8577> \xEE\x40 |0
-<U8578> \xEE\x45 |0
-<U8579> \xEE\x52 |0
-<U857A> \xEE\x44 |0
-<U857B> \xED\xFB |0
-<U857C> \xEE\x41 |0
-<U857E> \xC1\xA2 |0
-<U8580> \xED\xF4 |0
-<U8581> \xEE\x4D |0
-<U8582> \xEE\x4F |0
-<U8583> \xED\xF3 |0
-<U8584> \xC1\xA1 |0
-<U8585> \xEE\x51 |0
-<U8586> \xEE\x49 |0
-<U8587> \xC1\xA8 |0
-<U8588> \xEE\x50 |0
-<U8589> \xEE\x42 |0
-<U858A> \xC1\xAA |0
-<U858B> \xED\xF9 |0
-<U858C> \xEB\x52 |0
-<U858D> \xEE\x4A |0
-<U858E> \xEE\x47 |0
-<U858F> \xED\xF5 |0
-<U8590> \xEE\x55 |0
-<U8591> \xC1\xA4 |0
-<U8594> \xC1\xA5 |0
-<U8595> \xED\xF7 |0
-<U8596> \xEE\x48 |0
-<U8598> \xEE\x54 |0
-<U8599> \xEE\x4B |0
-<U859A> \xED\xFD |0
-<U859B> \xC1\xA7 |0
-<U859C> \xC1\xA3 |0
-<U859D> \xEE\x4C |0
-<U859E> \xED\xFE |0
-<U859F> \xEE\x56 |0
-<U85A0> \xED\xF8 |0
-<U85A1> \xEE\x43 |0
-<U85A2> \xEE\x4E |0
-<U85A3> \xED\xFA |0
-<U85A4> \xED\xFC |0
-<U85A6> \xC2\xCB |0
-<U85A7> \xED\xF6 |0
-<U85A8> \xC1\xA9 |0
-<U85A9> \xC2\xC4 |0
-<U85AA> \xC1\x7E |0
-<U85AF> \xC1\xA6 |0
-<U85B0> \xC2\xC8 |0
-<U85B1> \xF0\xB3 |0
-<U85B3> \xF0\xA9 |0
-<U85B4> \xF0\xA4 |0
-<U85B5> \xF0\xAA |0
-<U85B6> \xF0\xB4 |0
-<U85B7> \xF0\xB8 |0
-<U85B8> \xF0\xB7 |0
-<U85B9> \xC2\xCA |0
-<U85BA> \xC2\xC9 |0
-<U85BD> \xF0\xAB |0
-<U85BE> \xF0\xB9 |0
-<U85BF> \xF0\xAE |0
-<U85C0> \xF0\xA6 |0
-<U85C2> \xF0\xA8 |0
-<U85C3> \xF0\xA7 |0
-<U85C4> \xF0\xAD |0
-<U85C5> \xF0\xB2 |0
-<U85C6> \xF0\xA5 |0
-<U85C7> \xF0\xAC |0
-<U85C8> \xF0\xB1 |0
-<U85C9> \xC2\xC7 |0
-<U85CB> \xF0\xAF |0
-<U85CD> \xC2\xC5 |0
-<U85CE> \xF0\xB0 |0
-<U85CF> \xC2\xC3 |0
-<U85D0> \xC2\xC6 |0
-<U85D1> \xF2\xD5 |0
-<U85D2> \xF0\xB5 |0
-<U85D5> \xC3\xC2 |0
-<U85D7> \xF2\xCD |0
-<U85D8> \xF2\xD1 |0
-<U85D9> \xF2\xC9 |0
-<U85DA> \xF2\xCC |0
-<U85DC> \xF2\xD4 |0
-<U85DD> \xC3\xC0 |0
-<U85DE> \xF2\xD9 |0
-<U85DF> \xF2\xD2 |0
-<U85E1> \xF2\xCA |0
-<U85E2> \xF2\xDA |0
-<U85E3> \xF2\xD3 |0
-<U85E4> \xC3\xC3 |0
-<U85E5> \xC3\xC4 |0
-<U85E6> \xF2\xD7 |0
-<U85E8> \xF2\xCB |0
-<U85E9> \xC3\xBF |0
-<U85EA> \xC3\xC1 |0
-<U85EB> \xF2\xC6 |0
-<U85EC> \xF2\xCE |0
-<U85ED> \xF2\xC8 |0
-<U85EF> \xF2\xD8 |0
-<U85F0> \xF2\xD6 |0
-<U85F1> \xF2\xC7 |0
-<U85F2> \xF2\xCF |0
-<U85F6> \xF4\xBE |0
-<U85F7> \xC3\xC5 |0
-<U85F8> \xF2\xD0 |0
-<U85F9> \xC4\xA7 |0
-<U85FA> \xC4\xA9 |0
-<U85FB> \xC4\xA6 |0
-<U85FD> \xF4\xC3 |0
-<U85FE> \xF4\xBB |0
-<U85FF> \xF4\xB9 |0
-<U8600> \xF4\xBD |0
-<U8601> \xF4\xBA |0
-<U8604> \xF4\xBF |0
-<U8605> \xF4\xC1 |0
-<U8606> \xC4\xAA |0
-<U8607> \xC4\xAC |0
-<U8609> \xF4\xC0 |0
-<U860A> \xC4\xAD |0
-<U860B> \xC4\xAB |0
-<U860C> \xF4\xC2 |0
-<U8611> \xC4\xA8 |0
-<U8617> \xC4\xF4 |0
-<U8618> \xF5\xF1 |0
-<U8619> \xF5\xF7 |0
-<U861A> \xC4\xF6 |0
-<U861B> \xF4\xBC |0
-<U861C> \xF5\xF6 |0
-<U861E> \xF5\xFD |0
-<U861F> \xF5\xF4 |0
-<U8620> \xF5\xFB |0
-<U8621> \xF5\xFA |0
-<U8622> \xF4\xB8 |0
-<U8623> \xF5\xF5 |0
-<U8624> \xF0\xB6 |0
-<U8625> \xF5\xFE |0
-<U8626> \xF5\xF3 |0
-<U8627> \xF5\xF8 |0
-<U8629> \xF5\xFC |0
-<U862A> \xF5\xF2 |0
-<U862C> \xF7\x4A |0
-<U862D> \xC4\xF5 |0
-<U862E> \xF5\xF9 |0
-<U8631> \xF7\xF4 |0
-<U8632> \xF7\x4B |0
-<U8633> \xF7\x49 |0
-<U8634> \xF7\x47 |0
-<U8635> \xF7\x48 |0
-<U8636> \xF7\x4C |0
-<U8638> \xC5\xD9 |0
-<U8639> \xF7\xF2 |0
-<U863A> \xF7\xF0 |0
-<U863B> \xF7\xF5 |0
-<U863C> \xF7\xF3 |0
-<U863E> \xF7\xF6 |0
-<U863F> \xC5\xDA |0
-<U8640> \xF7\xF1 |0
-<U8643> \xF8\xBC |0
-<U8646> \xF9\x45 |0
-<U8647> \xF9\x46 |0
-<U8648> \xF9\x47 |0
-<U864B> \xF9\xC7 |0
-<U864C> \xF9\xBD |0
-<U864D> \xCA\x4F |0
-<U864E> \xAA\xEA |0
-<U8650> \xAD\x68 |0
-<U8652> \xD3\xB8 |0
-<U8653> \xD3\xB7 |0
-<U8654> \xB0\x40 |0
-<U8655> \xB3\x42 |0
-<U8656> \xD7\x7C |0
-<U8659> \xD7\x7B |0
-<U865B> \xB5\xEA |0
-<U865C> \xB8\xB8 |0
-<U865E> \xB8\xB7 |0
-<U865F> \xB8\xB9 |0
-<U8661> \xE3\xD4 |0
-<U8662> \xE7\x7E |0
-<U8663> \xEB\x58 |0
-<U8664> \xEB\x5A |0
-<U8665> \xEB\x59 |0
-<U8667> \xC1\xAB |0
-<U8668> \xEE\x57 |0
-<U8669> \xF0\xBA |0
-<U866A> \xF9\xA5 |0
-<U866B> \xA6\xE4 |0
-<U866D> \xCD\xC9 |0
-<U866E> \xCD\xCA |0
-<U866F> \xCD\xC8 |0
-<U8670> \xCD\xC7 |0
-<U8671> \xAA\xEB |0
-<U8673> \xD0\xA9 |0
-<U8674> \xD0\xA7 |0
-<U8677> \xD0\xA6 |0
-<U8679> \xAD\x69 |0
-<U867A> \xAD\x6B |0
-<U867B> \xAD\x6A |0
-<U867C> \xD0\xA8 |0
-<U8685> \xD3\xC4 |0
-<U8686> \xD3\xC1 |0
-<U8687> \xD3\xBF |0
-<U868A> \xB0\x41 |0
-<U868B> \xD3\xC2 |0
-<U868C> \xB0\x46 |0
-<U868D> \xD3\xBC |0
-<U868E> \xD3\xCB |0
-<U8690> \xD3\xCD |0
-<U8691> \xD3\xBD |0
-<U8693> \xB0\x43 |0
-<U8694> \xD3\xCE |0
-<U8695> \xD3\xC9 |0
-<U8696> \xD3\xBB |0
-<U8697> \xD3\xC0 |0
-<U8698> \xD3\xCA |0
-<U8699> \xD3\xC6 |0
-<U869A> \xD3\xC3 |0
-<U869C> \xB0\x48 |0
-<U869D> \xD3\xCC |0
-<U869E> \xD3\xBE |0
-<U86A1> \xD3\xC7 |0
-<U86A2> \xD3\xB9 |0
-<U86A3> \xB0\x47 |0
-<U86A4> \xB0\x44 |0
-<U86A5> \xD3\xC5 |0
-<U86A7> \xD3\xC8 |0
-<U86A8> \xD3\xBA |0
-<U86A9> \xB0\x45 |0
-<U86AA> \xB0\x42 |0
-<U86AF> \xB3\x4C |0
-<U86B0> \xD7\xA5 |0
-<U86B1> \xB3\x4B |0
-<U86B3> \xD7\xA8 |0
-<U86B4> \xD7\xAB |0
-<U86B5> \xB3\x48 |0
-<U86B6> \xB3\x46 |0
-<U86B7> \xD7\x7E |0
-<U86B8> \xD7\xA9 |0
-<U86B9> \xD7\xA7 |0
-<U86BA> \xD7\xA4 |0
-<U86BB> \xD7\xAC |0
-<U86BC> \xD7\xAD |0
-<U86BD> \xD7\xAF |0
-<U86BE> \xD7\xB0 |0
-<U86BF> \xD7\x7D |0
-<U86C0> \xB3\x45 |0
-<U86C1> \xD7\xA2 |0
-<U86C2> \xD7\xA1 |0
-<U86C3> \xD7\xAE |0
-<U86C4> \xB3\x47 |0
-<U86C5> \xD7\xA3 |0
-<U86C6> \xB3\x49 |0
-<U86C7> \xB3\x44 |0
-<U86C8> \xD7\xA6 |0
-<U86C9> \xB3\x4D |0
-<U86CB> \xB3\x4A |0
-<U86CC> \xD7\xAA |0
-<U86D0> \xB5\xF1 |0
-<U86D1> \xDB\xBF |0
-<U86D3> \xDB\xB4 |0
-<U86D4> \xB5\xEE |0
-<U86D6> \xDF\xE7 |0
-<U86D7> \xDB\xBD |0
-<U86D8> \xDB\xB1 |0
-<U86D9> \xB5\xEC |0
-<U86DA> \xDB\xB6 |0
-<U86DB> \xB5\xEF |0
-<U86DC> \xDB\xBA |0
-<U86DD> \xDB\xB8 |0
-<U86DE> \xB5\xF2 |0
-<U86DF> \xB5\xEB |0
-<U86E2> \xDB\xB2 |0
-<U86E3> \xDB\xB5 |0
-<U86E4> \xB5\xF0 |0
-<U86E6> \xDB\xB3 |0
-<U86E8> \xDB\xBE |0
-<U86E9> \xDB\xBC |0
-<U86EA> \xDB\xB7 |0
-<U86EB> \xDB\xB9 |0
-<U86EC> \xDB\xBB |0
-<U86ED> \xB5\xED |0
-<U86F5> \xDF\xE8 |0
-<U86F6> \xDF\xEE |0
-<U86F7> \xDF\xE4 |0
-<U86F8> \xDF\xEA |0
-<U86F9> \xB8\xBA |0
-<U86FA> \xDF\xE6 |0
-<U86FB> \xB8\xC0 |0
-<U86FE> \xB8\xBF |0
-<U8700> \xB8\xBE |0
-<U8701> \xDF\xED |0
-<U8702> \xB8\xC1 |0
-<U8703> \xB8\xC2 |0
-<U8704> \xDF\xE3 |0
-<U8705> \xDF\xF0 |0
-<U8706> \xB8\xC3 |0
-<U8707> \xB8\xBD |0
-<U8708> \xB8\xBC |0
-<U8709> \xDF\xEC |0
-<U870A> \xB8\xC4 |0
-<U870B> \xDF\xE2 |0
-<U870C> \xDF\xE5 |0
-<U870D> \xDF\xEF |0
-<U870E> \xDF\xEB |0
-<U8711> \xE3\xF4 |0
-<U8712> \xE3\xE9 |0
-<U8713> \xB8\xBB |0
-<U8718> \xBB\x6A |0
-<U8719> \xE3\xDD |0
-<U871A> \xE3\xF2 |0
-<U871B> \xE3\xDE |0
-<U871C> \xBB\x65 |0
-<U871E> \xE3\xDB |0
-<U8720> \xE3\xE4 |0
-<U8721> \xE3\xDC |0
-<U8722> \xBB\x67 |0
-<U8723> \xE3\xD6 |0
-<U8724> \xE3\xF1 |0
-<U8725> \xBB\x68 |0
-<U8726> \xE3\xEE |0
-<U8727> \xE3\xEF |0
-<U8728> \xE3\xD7 |0
-<U8729> \xBB\x6D |0
-<U872A> \xE3\xE6 |0
-<U872C> \xE3\xE0 |0
-<U872D> \xE3\xE7 |0
-<U872E> \xE3\xDA |0
-<U8730> \xE3\xF3 |0
-<U8731> \xE3\xEB |0
-<U8732> \xE3\xE5 |0
-<U8733> \xE3\xD5 |0
-<U8734> \xBB\x69 |0
-<U8735> \xE3\xEC |0
-<U8737> \xBB\x6C |0
-<U8738> \xE3\xF0 |0
-<U873A> \xE3\xEA |0
-<U873B> \xBB\x66 |0
-<U873C> \xE3\xE8 |0
-<U873E> \xE3\xE2 |0
-<U873F> \xBB\x64 |0
-<U8740> \xE3\xD9 |0
-<U8741> \xE3\xE1 |0
-<U8742> \xE3\xED |0
-<U8743> \xE3\xDF |0
-<U8746> \xE3\xE3 |0
-<U874C> \xBD\xC1 |0
-<U874D> \xDF\xE9 |0
-<U874E> \xE7\xB2 |0
-<U874F> \xE7\xBB |0
-<U8750> \xE7\xB1 |0
-<U8751> \xE7\xAD |0
-<U8752> \xE7\xAA |0
-<U8753> \xBD\xC2 |0
-<U8754> \xE7\xA8 |0
-<U8755> \xBB\x6B |0
-<U8756> \xE7\xA1 |0
-<U8757> \xBD\xC0 |0
-<U8758> \xE7\xA7 |0
-<U8759> \xBD\xBF |0
-<U875A> \xE7\xAC |0
-<U875B> \xE7\xA9 |0
-<U875C> \xE7\xB9 |0
-<U875D> \xE7\xB4 |0
-<U875E> \xE7\xAE |0
-<U875F> \xE7\xB3 |0
-<U8760> \xBD\xBB |0
-<U8761> \xE7\xAB |0
-<U8762> \xE7\xBE |0
-<U8763> \xE7\xA2 |0
-<U8764> \xE7\xA3 |0
-<U8765> \xE7\xBA |0
-<U8766> \xBD\xBC |0
-<U8767> \xE7\xBF |0
-<U8768> \xBD\xBE |0
-<U8769> \xE7\xC0 |0
-<U876A> \xE7\xB0 |0
-<U876B> \xE3\xD8 |0
-<U876C> \xE7\xB6 |0
-<U876D> \xE7\xAF |0
-<U876E> \xE7\xB8 |0
-<U876F> \xE7\xB5 |0
-<U8773> \xE7\xA6 |0
-<U8774> \xBD\xB9 |0
-<U8775> \xE7\xBD |0
-<U8776> \xBD\xBA |0
-<U8777> \xE7\xA4 |0
-<U8778> \xBD\xBD |0
-<U8779> \xEB\x64 |0
-<U877A> \xE7\xB7 |0
-<U877B> \xE7\xBC |0
-<U8781> \xEB\x61 |0
-<U8782> \xBD\xB8 |0
-<U8783> \xBF\xC0 |0
-<U8784> \xEB\x6B |0
-<U8785> \xEB\x67 |0
-<U8787> \xEB\x65 |0
-<U8788> \xEB\x60 |0
-<U8789> \xEB\x6F |0
-<U878D> \xBF\xC4 |0
-<U878F> \xEB\x5C |0
-<U8790> \xEB\x68 |0
-<U8791> \xEB\x69 |0
-<U8792> \xEB\x5F |0
-<U8793> \xEB\x5E |0
-<U8794> \xEB\x6C |0
-<U8796> \xEB\x62 |0
-<U8797> \xEB\x5D |0
-<U8798> \xEB\x63 |0
-<U879A> \xEB\x6E |0
-<U879B> \xEB\x5B |0
-<U879C> \xEB\x6D |0
-<U879D> \xEB\x6A |0
-<U879E> \xBF\xC2 |0
-<U879F> \xBF\xC1 |0
-<U87A2> \xBF\xC3 |0
-<U87A3> \xEB\x66 |0
-<U87A4> \xF0\xCB |0
-<U87AA> \xEE\x59 |0
-<U87AB> \xC1\xB1 |0
-<U87AC> \xEE\x5D |0
-<U87AD> \xEE\x5A |0
-<U87AE> \xEE\x61 |0
-<U87AF> \xEE\x67 |0
-<U87B0> \xEE\x5C |0
-<U87B2> \xEE\x70 |0
-<U87B3> \xC1\xAE |0
-<U87B4> \xEE\x6A |0
-<U87B5> \xEE\x5F |0
-<U87B6> \xEE\x6B |0
-<U87B7> \xEE\x66 |0
-<U87B8> \xEE\x6D |0
-<U87B9> \xEE\x5E |0
-<U87BA> \xC1\xB3 |0
-<U87BB> \xC1\xB2 |0
-<U87BC> \xEE\x60 |0
-<U87BD> \xEE\x6E |0
-<U87BE> \xEE\x58 |0
-<U87BF> \xEE\x6C |0
-<U87C0> \xC1\xAC |0
-<U87C2> \xEE\x64 |0
-<U87C3> \xEE\x63 |0
-<U87C4> \xEE\x68 |0
-<U87C5> \xEE\x5B |0
-<U87C6> \xC1\xB0 |0
-<U87C8> \xC1\xB4 |0
-<U87C9> \xEE\x62 |0
-<U87CA> \xEE\x69 |0
-<U87CB> \xC1\xB5 |0
-<U87CC> \xEE\x65 |0
-<U87D1> \xC1\xAD |0
-<U87D2> \xC1\xAF |0
-<U87D3> \xF0\xC7 |0
-<U87D4> \xF0\xC5 |0
-<U87D7> \xF0\xCC |0
-<U87D8> \xF0\xC9 |0
-<U87D9> \xF0\xCD |0
-<U87DB> \xF0\xBE |0
-<U87DC> \xF0\xC6 |0
-<U87DD> \xF0\xD1 |0
-<U87DE> \xEE\x6F |0
-<U87DF> \xF0\xC2 |0
-<U87E0> \xC2\xCF |0
-<U87E1> \xE7\xA5 |0
-<U87E2> \xF0\xBD |0
-<U87E3> \xF0\xCA |0
-<U87E4> \xF0\xC4 |0
-<U87E5> \xF0\xC1 |0
-<U87E6> \xF0\xBC |0
-<U87E7> \xF0\xBB |0
-<U87E8> \xF0\xD0 |0
-<U87EA> \xF0\xC0 |0
-<U87EB> \xF0\xBF |0
-<U87EC> \xC2\xCD |0
-<U87ED> \xF0\xC8 |0
-<U87EF> \xC2\xCC |0
-<U87F2> \xC2\xCE |0
-<U87F3> \xF0\xC3 |0
-<U87F4> \xF0\xCF |0
-<U87F6> \xF2\xDE |0
-<U87F7> \xF2\xDF |0
-<U87F9> \xC3\xC9 |0
-<U87FA> \xF2\xDC |0
-<U87FB> \xC3\xC6 |0
-<U87FC> \xF2\xE4 |0
-<U87FE> \xC3\xCA |0
-<U87FF> \xF2\xE6 |0
-<U8800> \xF2\xDB |0
-<U8801> \xF0\xCE |0
-<U8802> \xF2\xE8 |0
-<U8803> \xF2\xDD |0
-<U8805> \xC3\xC7 |0
-<U8806> \xF2\xE3 |0
-<U8808> \xF2\xE5 |0
-<U8809> \xF2\xE0 |0
-<U880A> \xF2\xE7 |0
-<U880B> \xF2\xE2 |0
-<U880C> \xF2\xE1 |0
-<U880D> \xC3\xC8 |0
-<U8810> \xF4\xC5 |0
-<U8811> \xF4\xC6 |0
-<U8813> \xF4\xC8 |0
-<U8814> \xC4\xAE |0
-<U8815> \xC4\xAF |0
-<U8816> \xF4\xC9 |0
-<U8817> \xF4\xC7 |0
-<U8819> \xF4\xC4 |0
-<U881B> \xF6\x42 |0
-<U881C> \xF6\x45 |0
-<U881D> \xF6\x41 |0
-<U881F> \xC4\xFA |0
-<U8820> \xF6\x43 |0
-<U8821> \xC4\xF9 |0
-<U8822> \xC4\xF8 |0
-<U8823> \xC4\xF7 |0
-<U8824> \xF6\x44 |0
-<U8825> \xF7\x51 |0
-<U8826> \xF7\x4F |0
-<U8828> \xF7\x4E |0
-<U8829> \xF6\x40 |0
-<U882A> \xF7\x50 |0
-<U882B> \xF6\x46 |0
-<U882C> \xF7\x4D |0
-<U882E> \xF7\xF9 |0
-<U882F> \xF7\xD7 |0
-<U8830> \xF7\xF7 |0
-<U8831> \xC5\xDB |0
-<U8832> \xF7\xF8 |0
-<U8833> \xF7\xFA |0
-<U8835> \xF8\xBF |0
-<U8836> \xC5\xFA |0
-<U8837> \xF8\xBE |0
-<U8838> \xF8\xBD |0
-<U8839> \xC5\xFB |0
-<U883B> \xC6\x5A |0
-<U883C> \xF9\x6E |0
-<U883D> \xF9\xA7 |0
-<U883E> \xF9\xA6 |0
-<U883F> \xF9\xA8 |0
-<U8840> \xA6\xE5 |0
-<U8841> \xD0\xAA |0
-<U8843> \xD3\xCF |0
-<U8844> \xD3\xD0 |0
-<U8848> \xDB\xC0 |0
-<U884A> \xF6\x47 |0
-<U884B> \xF8\xC0 |0
-<U884C> \xA6\xE6 |0
-<U884D> \xAD\x6C |0
-<U884E> \xD0\xAB |0
-<U8852> \xD7\xB1 |0
-<U8853> \xB3\x4E |0
-<U8855> \xDB\xC2 |0
-<U8856> \xDB\xC1 |0
-<U8857> \xB5\xF3 |0
-<U8859> \xB8\xC5 |0
-<U885A> \xE7\xC1 |0
-<U885B> \xBD\xC3 |0
-<U885D> \xBD\xC4 |0
-<U8861> \xBF\xC5 |0
-<U8862> \xC5\xFC |0
-<U8863> \xA6\xE7 |0
-<U8867> \xD0\xAC |0
-<U8868> \xAA\xED |0
-<U8869> \xD0\xAE |0
-<U886A> \xD0\xAD |0
-<U886B> \xAD\x6D |0
-<U886D> \xD3\xD1 |0
-<U886F> \xD3\xD8 |0
-<U8870> \xB0\x49 |0
-<U8871> \xD3\xD6 |0
-<U8872> \xD3\xD4 |0
-<U8874> \xD3\xDB |0
-<U8875> \xD3\xD2 |0
-<U8876> \xD3\xD3 |0
-<U8877> \xB0\x4A |0
-<U8879> \xB0\x4E |0
-<U887C> \xD3\xDC |0
-<U887D> \xB0\x4D |0
-<U887E> \xD3\xDA |0
-<U887F> \xD3\xD7 |0
-<U8880> \xD3\xD5 |0
-<U8881> \xB0\x4B |0
-<U8882> \xB0\x4C |0
-<U8883> \xD3\xD9 |0
-<U8888> \xB3\x50 |0
-<U8889> \xD7\xB2 |0
-<U888B> \xB3\x55 |0
-<U888C> \xD7\xC2 |0
-<U888D> \xB3\x54 |0
-<U888E> \xD7\xC4 |0
-<U8891> \xD7\xB8 |0
-<U8892> \xB3\x52 |0
-<U8893> \xD7\xC3 |0
-<U8895> \xD7\xB3 |0
-<U8896> \xB3\x53 |0
-<U8897> \xD7\xBF |0
-<U8898> \xD7\xBB |0
-<U8899> \xD7\xBD |0
-<U889A> \xD7\xB7 |0
-<U889B> \xD7\xBE |0
-<U889E> \xB3\x4F |0
-<U889F> \xD7\xBA |0
-<U88A1> \xD7\xB9 |0
-<U88A2> \xD7\xB5 |0
-<U88A4> \xD7\xC0 |0
-<U88A7> \xD7\xBC |0
-<U88A8> \xD7\xB4 |0
-<U88AA> \xD7\xB6 |0
-<U88AB> \xB3\x51 |0
-<U88AC> \xD7\xC1 |0
-<U88B1> \xB5\xF6 |0
-<U88B2> \xDB\xCD |0
-<U88B6> \xDB\xC9 |0
-<U88B7> \xDB\xCB |0
-<U88B8> \xDB\xC6 |0
-<U88B9> \xDB\xC5 |0
-<U88BA> \xDB\xC3 |0
-<U88BC> \xDB\xCA |0
-<U88BD> \xDB\xCC |0
-<U88BE> \xDB\xC8 |0
-<U88C0> \xDB\xC7 |0
-<U88C1> \xB5\xF4 |0
-<U88C2> \xB5\xF5 |0
-<U88C9> \xDB\xCF |0
-<U88CA> \xB8\xCD |0
-<U88CB> \xDF\xF2 |0
-<U88CC> \xDF\xF8 |0
-<U88CD> \xDF\xF3 |0
-<U88CE> \xDF\xF4 |0
-<U88CF> \xF9\xD8 |0
-<U88D0> \xDF\xF9 |0
-<U88D2> \xB8\xCF |0
-<U88D4> \xB8\xC7 |0
-<U88D5> \xB8\xCE |0
-<U88D6> \xDF\xF1 |0
-<U88D7> \xDB\xC4 |0
-<U88D8> \xB8\xCA |0
-<U88D9> \xB8\xC8 |0
-<U88DA> \xDF\xF7 |0
-<U88DB> \xDF\xF6 |0
-<U88DC> \xB8\xC9 |0
-<U88DD> \xB8\xCB |0
-<U88DE> \xDF\xF5 |0
-<U88DF> \xB8\xC6 |0
-<U88E1> \xB8\xCC |0
-<U88E7> \xE3\xF6 |0
-<U88E8> \xBB\x74 |0
-<U88EB> \xE4\x42 |0
-<U88EC> \xE4\x41 |0
-<U88EE> \xE3\xFB |0
-<U88EF> \xBB\x76 |0
-<U88F0> \xE4\x40 |0
-<U88F1> \xE3\xF7 |0
-<U88F2> \xE3\xF8 |0
-<U88F3> \xBB\x6E |0
-<U88F4> \xBB\x70 |0
-<U88F6> \xE3\xFD |0
-<U88F7> \xE3\xF5 |0
-<U88F8> \xBB\x72 |0
-<U88F9> \xBB\x71 |0
-<U88FA> \xE3\xF9 |0
-<U88FB> \xE3\xFE |0
-<U88FC> \xE3\xFC |0
-<U88FD> \xBB\x73 |0
-<U88FE> \xE3\xFA |0
-<U8901> \xDB\xCE |0
-<U8902> \xBB\x6F |0
-<U8905> \xE7\xC2 |0
-<U8906> \xE7\xC9 |0
-<U8907> \xBD\xC6 |0
-<U8909> \xE7\xCD |0
-<U890A> \xBD\xCA |0
-<U890B> \xE7\xC5 |0
-<U890C> \xE7\xC3 |0
-<U890E> \xE7\xCC |0
-<U8910> \xBD\xC5 |0
-<U8911> \xE7\xCB |0
-<U8912> \xBD\xC7 |0
-<U8913> \xBD\xC8 |0
-<U8914> \xE7\xC4 |0
-<U8915> \xBD\xC9 |0
-<U8916> \xE7\xCA |0
-<U8917> \xE7\xC6 |0
-<U8918> \xE7\xC7 |0
-<U8919> \xE7\xC8 |0
-<U891A> \xBB\x75 |0
-<U891E> \xEB\x70 |0
-<U891F> \xEB\x7C |0
-<U8921> \xBF\xCA |0
-<U8922> \xEB\x77 |0
-<U8923> \xEB\x79 |0
-<U8925> \xBF\xC8 |0
-<U8926> \xEB\x71 |0
-<U8927> \xEB\x75 |0
-<U8929> \xEB\x78 |0
-<U892A> \xBF\xC6 |0
-<U892B> \xBF\xC9 |0
-<U892C> \xEB\x7B |0
-<U892D> \xEB\x73 |0
-<U892E> \xEB\x74 |0
-<U892F> \xEB\x7A |0
-<U8930> \xEB\x72 |0
-<U8931> \xEB\x76 |0
-<U8932> \xBF\xC7 |0
-<U8933> \xEE\x72 |0
-<U8935> \xEE\x71 |0
-<U8936> \xC1\xB7 |0
-<U8937> \xEE\x77 |0
-<U8938> \xC1\xB9 |0
-<U893B> \xC1\xB6 |0
-<U893C> \xEE\x73 |0
-<U893D> \xC1\xBA |0
-<U893E> \xEE\x74 |0
-<U8941> \xEE\x75 |0
-<U8942> \xEE\x78 |0
-<U8944> \xC1\xB8 |0
-<U8946> \xF0\xD6 |0
-<U8949> \xF0\xD9 |0
-<U894B> \xF0\xD3 |0
-<U894C> \xF0\xD5 |0
-<U894F> \xF0\xD4 |0
-<U8950> \xF0\xD7 |0
-<U8951> \xF0\xD8 |0
-<U8952> \xEE\x76 |0
-<U8953> \xF0\xD2 |0
-<U8956> \xC3\xCD |0
-<U8957> \xF2\xEC |0
-<U8958> \xF2\xEF |0
-<U8959> \xF2\xF1 |0
-<U895A> \xF2\xEA |0
-<U895B> \xF2\xEB |0
-<U895C> \xF2\xEE |0
-<U895D> \xF2\xF0 |0
-<U895E> \xC3\xCE |0
-<U895F> \xC3\xCC |0
-<U8960> \xC3\xCB |0
-<U8961> \xF2\xED |0
-<U8962> \xF2\xE9 |0
-<U8963> \xF4\xCA |0
-<U8964> \xC4\xB0 |0
-<U8966> \xF4\xCB |0
-<U8969> \xF6\x49 |0
-<U896A> \xC4\xFB |0
-<U896B> \xF6\x4B |0
-<U896C> \xC4\xFC |0
-<U896D> \xF6\x48 |0
-<U896E> \xF6\x4A |0
-<U896F> \xC5\xA8 |0
-<U8971> \xF7\x52 |0
-<U8972> \xC5\xA7 |0
-<U8973> \xF7\xFD |0
-<U8974> \xF7\xFC |0
-<U8976> \xF7\xFB |0
-<U8979> \xF9\x48 |0
-<U897A> \xF9\x49 |0
-<U897B> \xF9\x4B |0
-<U897C> \xF9\x4A |0
-<U897E> \xCA\x50 |0
-<U897F> \xA6\xE8 |0
-<U8981> \xAD\x6E |0
-<U8982> \xD7\xC5 |0
-<U8983> \xB5\xF7 |0
-<U8985> \xDF\xFA |0
-<U8986> \xC2\xD0 |0
-<U8988> \xF2\xF2 |0
-<U898B> \xA8\xA3 |0
-<U898F> \xB3\x57 |0
-<U8993> \xB3\x56 |0
-<U8995> \xDB\xD0 |0
-<U8996> \xB5\xF8 |0
-<U8997> \xDB\xD2 |0
-<U8998> \xDB\xD1 |0
-<U899B> \xDF\xFB |0
-<U899C> \xB8\xD0 |0
-<U899D> \xE4\x43 |0
-<U899E> \xE4\x46 |0
-<U899F> \xE4\x45 |0
-<U89A1> \xE4\x44 |0
-<U89A2> \xE7\xCE |0
-<U89A3> \xE7\xD0 |0
-<U89A4> \xE7\xCF |0
-<U89A6> \xBF\xCC |0
-<U89AA> \xBF\xCB |0
-<U89AC> \xC1\xBB |0
-<U89AD> \xEE\x79 |0
-<U89AE> \xEE\x7B |0
-<U89AF> \xEE\x7A |0
-<U89B2> \xC2\xD1 |0
-<U89B6> \xF2\xF4 |0
-<U89B7> \xF2\xF3 |0
-<U89B9> \xF4\xCC |0
-<U89BA> \xC4\xB1 |0
-<U89BD> \xC4\xFD |0
-<U89BE> \xF7\x54 |0
-<U89BF> \xF7\x53 |0
-<U89C0> \xC6\x5B |0
-<U89D2> \xA8\xA4 |0
-<U89D3> \xD0\xAF |0
-<U89D4> \xAD\x6F |0
-<U89D5> \xD7\xC8 |0
-<U89D6> \xD7\xC6 |0
-<U89D9> \xD7\xC7 |0
-<U89DA> \xDB\xD4 |0
-<U89DB> \xDB\xD5 |0
-<U89DC> \xE0\x43 |0
-<U89DD> \xDB\xD3 |0
-<U89DF> \xDF\xFC |0
-<U89E0> \xE0\x41 |0
-<U89E1> \xE0\x40 |0
-<U89E2> \xE0\x42 |0
-<U89E3> \xB8\xD1 |0
-<U89E4> \xDF\xFE |0
-<U89E5> \xDF\xFD |0
-<U89E6> \xE0\x44 |0
-<U89E8> \xE4\x49 |0
-<U89E9> \xE4\x47 |0
-<U89EB> \xE4\x48 |0
-<U89EC> \xE7\xD3 |0
-<U89ED> \xE7\xD1 |0
-<U89F0> \xE7\xD2 |0
-<U89F1> \xEB\x7D |0
-<U89F2> \xEE\x7C |0
-<U89F3> \xEE\x7D |0
-<U89F4> \xC2\xD2 |0
-<U89F6> \xF2\xF5 |0
-<U89F7> \xF4\xCD |0
-<U89F8> \xC4\xB2 |0
-<U89FA> \xF6\x4C |0
-<U89FB> \xF7\x55 |0
-<U89FC> \xC5\xA9 |0
-<U89FE> \xF7\xFE |0
-<U89FF> \xF9\x4C |0
-<U8A00> \xA8\xA5 |0
-<U8A02> \xAD\x71 |0
-<U8A03> \xAD\x72 |0
-<U8A04> \xD0\xB0 |0
-<U8A07> \xD0\xB1 |0
-<U8A08> \xAD\x70 |0
-<U8A0A> \xB0\x54 |0
-<U8A0C> \xB0\x52 |0
-<U8A0E> \xB0\x51 |0
-<U8A0F> \xB0\x58 |0
-<U8A10> \xB0\x50 |0
-<U8A11> \xB0\x59 |0
-<U8A12> \xD3\xDD |0
-<U8A13> \xB0\x56 |0
-<U8A15> \xB0\x53 |0
-<U8A16> \xB0\x57 |0
-<U8A17> \xB0\x55 |0
-<U8A18> \xB0\x4F |0
-<U8A1B> \xB3\x5F |0
-<U8A1D> \xB3\x59 |0
-<U8A1E> \xD7\xCC |0
-<U8A1F> \xB3\x5E |0
-<U8A22> \xB3\x60 |0
-<U8A23> \xB3\x5A |0
-<U8A25> \xB3\x5B |0
-<U8A27> \xD7\xCA |0
-<U8A2A> \xB3\x58 |0
-<U8A2C> \xD7\xCB |0
-<U8A2D> \xB3\x5D |0
-<U8A30> \xD7\xC9 |0
-<U8A31> \xB3\x5C |0
-<U8A34> \xB6\x44 |0
-<U8A36> \xB6\x46 |0
-<U8A39> \xDB\xD8 |0
-<U8A3A> \xB6\x45 |0
-<U8A3B> \xB5\xF9 |0
-<U8A3C> \xB5\xFD |0
-<U8A3E> \xB8\xE4 |0
-<U8A3F> \xE0\x49 |0
-<U8A40> \xDB\xDA |0
-<U8A41> \xB5\xFE |0
-<U8A44> \xDB\xDD |0
-<U8A45> \xDB\xDE |0
-<U8A46> \xB6\x43 |0
-<U8A48> \xDB\xE0 |0
-<U8A4A> \xDB\xE2 |0
-<U8A4C> \xDB\xE3 |0
-<U8A4D> \xDB\xD7 |0
-<U8A4E> \xDB\xD6 |0
-<U8A4F> \xDB\xE4 |0
-<U8A50> \xB6\x42 |0
-<U8A51> \xDB\xE1 |0
-<U8A52> \xDB\xDF |0
-<U8A54> \xB6\x40 |0
-<U8A55> \xB5\xFB |0
-<U8A56> \xB6\x47 |0
-<U8A57> \xDB\xDB |0
-<U8A58> \xDB\xDC |0
-<U8A59> \xDB\xD9 |0
-<U8A5B> \xB6\x41 |0
-<U8A5E> \xB5\xFC |0
-<U8A60> \xB5\xFA |0
-<U8A61> \xE0\x48 |0
-<U8A62> \xB8\xDF |0
-<U8A63> \xB8\xDA |0
-<U8A66> \xB8\xD5 |0
-<U8A68> \xB8\xE5 |0
-<U8A69> \xB8\xD6 |0
-<U8A6B> \xB8\xD2 |0
-<U8A6C> \xB8\xE1 |0
-<U8A6D> \xB8\xDE |0
-<U8A6E> \xB8\xE0 |0
-<U8A70> \xB8\xD7 |0
-<U8A71> \xB8\xDC |0
-<U8A72> \xB8\xD3 |0
-<U8A73> \xB8\xD4 |0
-<U8A74> \xE0\x50 |0
-<U8A75> \xE0\x4D |0
-<U8A76> \xE0\x45 |0
-<U8A77> \xE0\x4A |0
-<U8A79> \xB8\xE2 |0
-<U8A7A> \xE0\x51 |0
-<U8A7B> \xB8\xE3 |0
-<U8A7C> \xB8\xD9 |0
-<U8A7F> \xE0\x47 |0
-<U8A81> \xE0\x4F |0
-<U8A82> \xE0\x4B |0
-<U8A83> \xE0\x4E |0
-<U8A84> \xE0\x4C |0
-<U8A85> \xB8\xDD |0
-<U8A86> \xE0\x46 |0
-<U8A87> \xB8\xD8 |0
-<U8A8B> \xE4\x4C |0
-<U8A8C> \xBB\x78 |0
-<U8A8D> \xBB\x7B |0
-<U8A8F> \xE4\x4E |0
-<U8A91> \xBB\xA5 |0
-<U8A92> \xE4\x4D |0
-<U8A93> \xBB\x7D |0
-<U8A95> \xBD\xCF |0
-<U8A96> \xE4\x4F |0
-<U8A98> \xBB\xA4 |0
-<U8A99> \xE4\x4B |0
-<U8A9A> \xBB\xA6 |0
-<U8A9E> \xBB\x79 |0
-<U8AA0> \xB8\xDB |0
-<U8AA1> \xBB\x7C |0
-<U8AA3> \xBB\x7A |0
-<U8AA4> \xBB\x7E |0
-<U8AA5> \xBB\xA2 |0
-<U8AA6> \xBB\x77 |0
-<U8AA7> \xBB\xA7 |0
-<U8AA8> \xBB\xA3 |0
-<U8AAA> \xBB\xA1 |0
-<U8AAB> \xE4\x4A |0
-<U8AB0> \xBD\xD6 |0
-<U8AB2> \xBD\xD2 |0
-<U8AB6> \xBD\xD9 |0
-<U8AB8> \xE7\xD6 |0
-<U8AB9> \xBD\xDA |0
-<U8ABA> \xE7\xE2 |0
-<U8ABB> \xE7\xDB |0
-<U8ABC> \xBD\xCB |0
-<U8ABD> \xE7\xE3 |0
-<U8ABE> \xE7\xDD |0
-<U8ABF> \xBD\xD5 |0
-<U8AC0> \xE7\xDE |0
-<U8AC2> \xBD\xD4 |0
-<U8AC3> \xE7\xE1 |0
-<U8AC4> \xBD\xCE |0
-<U8AC5> \xE7\xDF |0
-<U8AC6> \xE7\xD5 |0
-<U8AC7> \xBD\xCD |0
-<U8AC8> \xEB\xAA |0
-<U8AC9> \xBD\xD3 |0
-<U8ACB> \xBD\xD0 |0
-<U8ACD> \xBD\xD8 |0
-<U8ACF> \xE7\xD4 |0
-<U8AD1> \xE7\xD8 |0
-<U8AD2> \xBD\xCC |0
-<U8AD3> \xE7\xD7 |0
-<U8AD4> \xE7\xD9 |0
-<U8AD5> \xE7\xDA |0
-<U8AD6> \xBD\xD7 |0
-<U8AD7> \xE7\xDC |0
-<U8AD8> \xE7\xE0 |0
-<U8AD9> \xE7\xE4 |0
-<U8ADB> \xBD\xDB |0
-<U8ADC> \xBF\xD2 |0
-<U8ADD> \xEB\xA5 |0
-<U8ADE> \xEB\xAB |0
-<U8ADF> \xEB\xA8 |0
-<U8AE0> \xEB\x7E |0
-<U8AE1> \xEB\xAC |0
-<U8AE2> \xEB\xA1 |0
-<U8AE4> \xEB\xA7 |0
-<U8AE6> \xBF\xCD |0
-<U8AE7> \xBF\xD3 |0
-<U8AE8> \xEB\xAD |0
-<U8AEB> \xBF\xCF |0
-<U8AED> \xBF\xD9 |0
-<U8AEE> \xBF\xD4 |0
-<U8AEF> \xEB\xAF |0
-<U8AF0> \xEB\xA9 |0
-<U8AF1> \xBF\xD0 |0
-<U8AF2> \xEB\xA2 |0
-<U8AF3> \xBF\xDA |0
-<U8AF4> \xEB\xA3 |0
-<U8AF5> \xEB\xA4 |0
-<U8AF6> \xBF\xDB |0
-<U8AF7> \xBF\xD8 |0
-<U8AF8> \xBD\xD1 |0
-<U8AFA> \xBF\xCE |0
-<U8AFB> \xEB\xB0 |0
-<U8AFC> \xBF\xDC |0
-<U8AFE> \xBF\xD5 |0
-<U8AFF> \xEB\xAE |0
-<U8B00> \xBF\xD1 |0
-<U8B01> \xBF\xD6 |0
-<U8B02> \xBF\xD7 |0
-<U8B04> \xC1\xC3 |0
-<U8B05> \xEE\xA4 |0
-<U8B06> \xEE\xAD |0
-<U8B07> \xEE\xAA |0
-<U8B08> \xEE\xAC |0
-<U8B0A> \xC1\xC0 |0
-<U8B0B> \xEE\xA5 |0
-<U8B0D> \xEE\xAB |0
-<U8B0E> \xC1\xBC |0
-<U8B0F> \xEE\xA7 |0
-<U8B10> \xC1\xC4 |0
-<U8B11> \xEE\xA3 |0
-<U8B12> \xEE\xA8 |0
-<U8B13> \xEE\xAF |0
-<U8B14> \xEB\xA6 |0
-<U8B15> \xEE\xA9 |0
-<U8B16> \xEE\xA2 |0
-<U8B17> \xC1\xBD |0
-<U8B18> \xEE\xA1 |0
-<U8B19> \xC1\xBE |0
-<U8B1A> \xEE\xB0 |0
-<U8B1B> \xC1\xBF |0
-<U8B1C> \xEE\xAE |0
-<U8B1D> \xC1\xC2 |0
-<U8B1E> \xEE\x7E |0
-<U8B20> \xC1\xC1 |0
-<U8B22> \xEE\xA6 |0
-<U8B23> \xF0\xDC |0
-<U8B24> \xF0\xEA |0
-<U8B25> \xF0\xE5 |0
-<U8B26> \xF0\xE7 |0
-<U8B27> \xF0\xDB |0
-<U8B28> \xC2\xD3 |0
-<U8B2A> \xF0\xDA |0
-<U8B2B> \xC2\xD6 |0
-<U8B2C> \xC2\xD5 |0
-<U8B2E> \xF0\xE9 |0
-<U8B2F> \xF0\xE1 |0
-<U8B30> \xF0\xDE |0
-<U8B31> \xF0\xE4 |0
-<U8B33> \xF0\xDD |0
-<U8B35> \xF0\xDF |0
-<U8B36> \xF0\xE8 |0
-<U8B37> \xF0\xE6 |0
-<U8B39> \xC2\xD4 |0
-<U8B3A> \xF0\xED |0
-<U8B3B> \xF0\xEB |0
-<U8B3C> \xF0\xE2 |0
-<U8B3D> \xF0\xEC |0
-<U8B3E> \xF0\xE3 |0
-<U8B40> \xF2\xF9 |0
-<U8B41> \xC3\xCF |0
-<U8B42> \xF3\x41 |0
-<U8B45> \xF6\x4F |0
-<U8B46> \xC3\xD6 |0
-<U8B47> \xF0\xE0 |0
-<U8B48> \xF2\xF7 |0
-<U8B49> \xC3\xD2 |0
-<U8B4A> \xF2\xF8 |0
-<U8B4B> \xF2\xFD |0
-<U8B4E> \xC3\xD4 |0
-<U8B4F> \xC3\xD5 |0
-<U8B50> \xF2\xF6 |0
-<U8B51> \xF3\x40 |0
-<U8B52> \xF3\x42 |0
-<U8B53> \xF2\xFA |0
-<U8B54> \xF2\xFC |0
-<U8B55> \xF2\xFE |0
-<U8B56> \xF2\xFB |0
-<U8B57> \xF3\x43 |0
-<U8B58> \xC3\xD1 |0
-<U8B59> \xC3\xD7 |0
-<U8B5A> \xC3\xD3 |0
-<U8B5C> \xC3\xD0 |0
-<U8B5D> \xF4\xD0 |0
-<U8B5F> \xC4\xB7 |0
-<U8B60> \xF4\xCE |0
-<U8B63> \xF4\xD2 |0
-<U8B65> \xF4\xD3 |0
-<U8B66> \xC4\xB5 |0
-<U8B67> \xF4\xD4 |0
-<U8B68> \xF4\xD1 |0
-<U8B6A> \xF4\xCF |0
-<U8B6B> \xC4\xB8 |0
-<U8B6C> \xC4\xB4 |0
-<U8B6D> \xF4\xD5 |0
-<U8B6F> \xC4\xB6 |0
-<U8B70> \xC4\xB3 |0
-<U8B74> \xC4\xFE |0
-<U8B77> \xC5\x40 |0
-<U8B78> \xF6\x4E |0
-<U8B79> \xF6\x4D |0
-<U8B7A> \xF6\x50 |0
-<U8B7B> \xF6\x51 |0
-<U8B7D> \xC5\x41 |0
-<U8B7E> \xF7\x56 |0
-<U8B7F> \xF7\x5B |0
-<U8B80> \xC5\xAA |0
-<U8B82> \xF7\x58 |0
-<U8B84> \xF7\x57 |0
-<U8B85> \xF7\x5A |0
-<U8B86> \xF7\x59 |0
-<U8B88> \xF8\x43 |0
-<U8B8A> \xC5\xDC |0
-<U8B8B> \xF8\x42 |0
-<U8B8C> \xF8\x40 |0
-<U8B8E> \xF8\x41 |0
-<U8B92> \xC5\xFE |0
-<U8B93> \xC5\xFD |0
-<U8B94> \xF8\xC1 |0
-<U8B95> \xF8\xC2 |0
-<U8B96> \xC6\x40 |0
-<U8B98> \xF9\x4D |0
-<U8B99> \xF9\x4E |0
-<U8B9A> \xC6\x67 |0
-<U8B9C> \xC6\x6D |0
-<U8B9E> \xF9\xA9 |0
-<U8B9F> \xF9\xC8 |0
-<U8C37> \xA8\xA6 |0
-<U8C39> \xD7\xCD |0
-<U8C3B> \xD7\xCE |0
-<U8C3C> \xE0\x52 |0
-<U8C3D> \xE4\x50 |0
-<U8C3E> \xE7\xE5 |0
-<U8C3F> \xC1\xC6 |0
-<U8C41> \xC1\xC5 |0
-<U8C42> \xF0\xEE |0
-<U8C43> \xF3\x44 |0
-<U8C45> \xF8\x44 |0
-<U8C46> \xA8\xA7 |0
-<U8C47> \xD3\xDE |0
-<U8C48> \xB0\x5A |0
-<U8C49> \xB3\x61 |0
-<U8C4A> \xE0\x54 |0
-<U8C4B> \xE0\x53 |0
-<U8C4C> \xBD\xDC |0
-<U8C4D> \xE7\xE6 |0
-<U8C4E> \xBD\xDD |0
-<U8C4F> \xEE\xB1 |0
-<U8C50> \xC2\xD7 |0
-<U8C54> \xC6\x76 |0
-<U8C55> \xA8\xA8 |0
-<U8C56> \xCD\xCB |0
-<U8C57> \xD3\xDF |0
-<U8C5A> \xB3\x62 |0
-<U8C5C> \xD7\xCF |0
-<U8C5D> \xD7\xD0 |0
-<U8C5F> \xDB\xE5 |0
-<U8C61> \xB6\x48 |0
-<U8C62> \xB8\xE6 |0
-<U8C64> \xE0\x56 |0
-<U8C65> \xE0\x55 |0
-<U8C66> \xE0\x57 |0
-<U8C68> \xE4\x51 |0
-<U8C69> \xE4\x52 |0
-<U8C6A> \xBB\xA8 |0
-<U8C6B> \xBF\xDD |0
-<U8C6C> \xBD\xDE |0
-<U8C6D> \xBF\xDE |0
-<U8C6F> \xEE\xB5 |0
-<U8C70> \xEE\xB2 |0
-<U8C71> \xEE\xB4 |0
-<U8C72> \xEE\xB3 |0
-<U8C73> \xC1\xC7 |0
-<U8C75> \xF0\xEF |0
-<U8C76> \xF3\x46 |0
-<U8C77> \xF3\x45 |0
-<U8C78> \xCB\xA4 |0
-<U8C79> \xB0\x5C |0
-<U8C7A> \xB0\x5B |0
-<U8C7B> \xD3\xE0 |0
-<U8C7D> \xD7\xD1 |0
-<U8C80> \xDB\xE7 |0
-<U8C81> \xDB\xE6 |0
-<U8C82> \xB6\x49 |0
-<U8C84> \xE0\x59 |0
-<U8C85> \xE0\x5A |0
-<U8C86> \xE0\x58 |0
-<U8C89> \xB8\xE8 |0
-<U8C8A> \xB8\xE7 |0
-<U8C8C> \xBB\xAA |0
-<U8C8D> \xBB\xA9 |0
-<U8C8F> \xE7\xE7 |0
-<U8C90> \xEB\xB3 |0
-<U8C91> \xEB\xB1 |0
-<U8C92> \xEB\xB2 |0
-<U8C93> \xBF\xDF |0
-<U8C94> \xEE\xB7 |0
-<U8C95> \xEE\xB6 |0
-<U8C97> \xF0\xF2 |0
-<U8C98> \xF0\xF1 |0
-<U8C99> \xF0\xF0 |0
-<U8C9A> \xF3\x47 |0
-<U8C9C> \xF9\xAA |0
-<U8C9D> \xA8\xA9 |0
-<U8C9E> \xAD\x73 |0
-<U8CA0> \xAD\x74 |0
-<U8CA1> \xB0\x5D |0
-<U8CA2> \xB0\x5E |0
-<U8CA3> \xD3\xE2 |0
-<U8CA4> \xD3\xE1 |0
-<U8CA5> \xD7\xD2 |0
-<U8CA7> \xB3\x68 |0
-<U8CA8> \xB3\x66 |0
-<U8CA9> \xB3\x63 |0
-<U8CAA> \xB3\x67 |0
-<U8CAB> \xB3\x65 |0
-<U8CAC> \xB3\x64 |0
-<U8CAF> \xB6\x4A |0
-<U8CB0> \xDB\xEA |0
-<U8CB2> \xB8\xED |0
-<U8CB3> \xB6\x4C |0
-<U8CB4> \xB6\x51 |0
-<U8CB5> \xDB\xEC |0
-<U8CB6> \xB6\x53 |0
-<U8CB7> \xB6\x52 |0
-<U8CB8> \xB6\x55 |0
-<U8CB9> \xDB\xEB |0
-<U8CBA> \xDB\xE8 |0
-<U8CBB> \xB6\x4F |0
-<U8CBC> \xB6\x4B |0
-<U8CBD> \xB6\x4D |0
-<U8CBE> \xDB\xE9 |0
-<U8CBF> \xB6\x54 |0
-<U8CC0> \xB6\x50 |0
-<U8CC1> \xB6\x4E |0
-<U8CC2> \xB8\xEF |0
-<U8CC3> \xB8\xEE |0
-<U8CC4> \xB8\xEC |0
-<U8CC5> \xB8\xF0 |0
-<U8CC7> \xB8\xEA |0
-<U8CC8> \xB8\xEB |0
-<U8CCA> \xB8\xE9 |0
-<U8CCC> \xE0\x5B |0
-<U8CCF> \xE4\x54 |0
-<U8CD1> \xBB\xAC |0
-<U8CD2> \xBB\xAD |0
-<U8CD3> \xBB\xAB |0
-<U8CD5> \xE4\x53 |0
-<U8CD7> \xE4\x55 |0
-<U8CD9> \xE7\xEA |0
-<U8CDA> \xE7\xEC |0
-<U8CDC> \xBD\xE7 |0
-<U8CDD> \xE7\xED |0
-<U8CDE> \xBD\xE0 |0
-<U8CDF> \xE7\xE9 |0
-<U8CE0> \xBD\xDF |0
-<U8CE1> \xBD\xE9 |0
-<U8CE2> \xBD\xE5 |0
-<U8CE3> \xBD\xE6 |0
-<U8CE4> \xBD\xE2 |0
-<U8CE5> \xE7\xE8 |0
-<U8CE6> \xBD\xE1 |0
-<U8CE7> \xE7\xEE |0
-<U8CE8> \xE7\xEB |0
-<U8CEA> \xBD\xE8 |0
-<U8CEC> \xBD\xE3 |0
-<U8CED> \xBD\xE4 |0
-<U8CEE> \xEB\xB5 |0
-<U8CF0> \xEB\xB7 |0
-<U8CF1> \xEB\xB6 |0
-<U8CF3> \xEB\xB8 |0
-<U8CF4> \xBF\xE0 |0
-<U8CF5> \xEB\xB4 |0
-<U8CF8> \xC1\xCB |0
-<U8CF9> \xEE\xB8 |0
-<U8CFA> \xC1\xC8 |0
-<U8CFB> \xC1\xCC |0
-<U8CFC> \xC1\xCA |0
-<U8CFD> \xC1\xC9 |0
-<U8CFE> \xF0\xF3 |0
-<U8D00> \xF0\xF6 |0
-<U8D02> \xF0\xF5 |0
-<U8D04> \xF0\xF4 |0
-<U8D05> \xC2\xD8 |0
-<U8D06> \xF3\x48 |0
-<U8D07> \xF3\x49 |0
-<U8D08> \xC3\xD8 |0
-<U8D09> \xF3\x4A |0
-<U8D0A> \xC3\xD9 |0
-<U8D0D> \xC4\xBA |0
-<U8D0F> \xC4\xB9 |0
-<U8D10> \xF6\x52 |0
-<U8D13> \xC5\x42 |0
-<U8D14> \xF6\x53 |0
-<U8D15> \xF7\x5C |0
-<U8D16> \xC5\xAB |0
-<U8D17> \xC5\xAC |0
-<U8D19> \xF8\x45 |0
-<U8D1B> \xC6\x42 |0
-<U8D64> \xA8\xAA |0
-<U8D66> \xB3\x6A |0
-<U8D67> \xB3\x69 |0
-<U8D68> \xE0\x5C |0
-<U8D69> \xE0\x5D |0
-<U8D6B> \xBB\xAE |0
-<U8D6C> \xEB\xB9 |0
-<U8D6D> \xBD\xEA |0
-<U8D6E> \xEB\xBA |0
-<U8D6F> \xEE\xB9 |0
-<U8D70> \xA8\xAB |0
-<U8D72> \xD0\xB2 |0
-<U8D73> \xAD\x76 |0
-<U8D74> \xAD\x75 |0
-<U8D76> \xD3\xE3 |0
-<U8D77> \xB0\x5F |0
-<U8D78> \xD3\xE4 |0
-<U8D79> \xD7\xD5 |0
-<U8D7B> \xD7\xD4 |0
-<U8D7D> \xD7\xD3 |0
-<U8D80> \xDB\xEE |0
-<U8D81> \xB6\x58 |0
-<U8D84> \xDB\xED |0
-<U8D85> \xB6\x57 |0
-<U8D89> \xDB\xEF |0
-<U8D8A> \xB6\x56 |0
-<U8D8C> \xE0\x5F |0
-<U8D8D> \xE0\x62 |0
-<U8D8E> \xE0\x60 |0
-<U8D8F> \xE0\x61 |0
-<U8D90> \xE0\x65 |0
-<U8D91> \xE0\x5E |0
-<U8D92> \xE0\x66 |0
-<U8D93> \xE0\x63 |0
-<U8D94> \xE0\x64 |0
-<U8D95> \xBB\xB0 |0
-<U8D96> \xE4\x56 |0
-<U8D99> \xBB\xAF |0
-<U8D9B> \xE7\xF2 |0
-<U8D9C> \xE7\xF0 |0
-<U8D9F> \xBD\xEB |0
-<U8DA0> \xE7\xEF |0
-<U8DA1> \xE7\xF1 |0
-<U8DA3> \xBD\xEC |0
-<U8DA5> \xEB\xBB |0
-<U8DA7> \xEB\xBC |0
-<U8DA8> \xC1\xCD |0
-<U8DAA> \xF3\x4C |0
-<U8DAB> \xF3\x4E |0
-<U8DAC> \xF3\x4B |0
-<U8DAD> \xF3\x4D |0
-<U8DAE> \xF4\xD6 |0
-<U8DAF> \xF6\x54 |0
-<U8DB2> \xF9\x6F |0
-<U8DB3> \xA8\xAC |0
-<U8DB4> \xAD\x77 |0
-<U8DB5> \xD3\xE5 |0
-<U8DB6> \xD3\xE7 |0
-<U8DB7> \xD3\xE6 |0
-<U8DB9> \xD7\xD8 |0
-<U8DBA> \xB3\x6C |0
-<U8DBC> \xD7\xD6 |0
-<U8DBE> \xB3\x6B |0
-<U8DBF> \xD7\xD9 |0
-<U8DC1> \xD7\xDA |0
-<U8DC2> \xD7\xD7 |0
-<U8DC5> \xDB\xFB |0
-<U8DC6> \xB6\x60 |0
-<U8DC7> \xDB\xF3 |0
-<U8DC8> \xDB\xF9 |0
-<U8DCB> \xB6\x5B |0
-<U8DCC> \xB6\x5E |0
-<U8DCD> \xDB\xF2 |0
-<U8DCE> \xB6\x59 |0
-<U8DCF> \xDB\xF6 |0
-<U8DD0> \xE0\x6C |0
-<U8DD1> \xB6\x5D |0
-<U8DD3> \xDB\xF1 |0
-<U8DD5> \xDB\xF7 |0
-<U8DD6> \xDB\xF4 |0
-<U8DD7> \xDB\xFA |0
-<U8DD8> \xDB\xF0 |0
-<U8DD9> \xDB\xF8 |0
-<U8DDA> \xB6\x5C |0
-<U8DDB> \xB6\x5F |0
-<U8DDC> \xDB\xF5 |0
-<U8DDD> \xB6\x5A |0
-<U8DDF> \xB8\xF2 |0
-<U8DE0> \xE0\x68 |0
-<U8DE1> \xB8\xF1 |0
-<U8DE2> \xE0\x6F |0
-<U8DE3> \xE0\x6E |0
-<U8DE4> \xB8\xF8 |0
-<U8DE6> \xB8\xF9 |0
-<U8DE7> \xE0\x70 |0
-<U8DE8> \xB8\xF3 |0
-<U8DE9> \xE0\x6D |0
-<U8DEA> \xB8\xF7 |0
-<U8DEB> \xE0\x72 |0
-<U8DEC> \xE0\x69 |0
-<U8DEE> \xE0\x6B |0
-<U8DEF> \xB8\xF4 |0
-<U8DF0> \xE0\x67 |0
-<U8DF1> \xE0\x6A |0
-<U8DF2> \xE0\x71 |0
-<U8DF3> \xB8\xF5 |0
-<U8DF4> \xE0\x73 |0
-<U8DFA> \xB8\xF6 |0
-<U8DFC> \xBB\xB1 |0
-<U8DFD> \xE4\x5B |0
-<U8DFE> \xE4\x61 |0
-<U8DFF> \xE4\x59 |0
-<U8E00> \xE4\x62 |0
-<U8E02> \xE4\x58 |0
-<U8E03> \xE4\x5D |0
-<U8E04> \xE4\x63 |0
-<U8E05> \xE4\x60 |0
-<U8E06> \xE4\x5F |0
-<U8E07> \xE4\x5E |0
-<U8E09> \xE4\x57 |0
-<U8E0A> \xE4\x5C |0
-<U8E0D> \xE4\x5A |0
-<U8E0F> \xBD\xF1 |0
-<U8E10> \xBD\xEE |0
-<U8E11> \xE7\xFB |0
-<U8E12> \xE8\x41 |0
-<U8E13> \xE8\x43 |0
-<U8E14> \xE8\x40 |0
-<U8E15> \xE7\xF8 |0
-<U8E16> \xE7\xFA |0
-<U8E17> \xE8\x45 |0
-<U8E18> \xE8\x42 |0
-<U8E19> \xE7\xFC |0
-<U8E1A> \xE8\x46 |0
-<U8E1B> \xE7\xF9 |0
-<U8E1C> \xE8\x44 |0
-<U8E1D> \xBD\xEF |0
-<U8E1E> \xBD\xF5 |0
-<U8E1F> \xBD\xF3 |0
-<U8E20> \xE7\xF3 |0
-<U8E21> \xBD\xF4 |0
-<U8E22> \xBD\xF0 |0
-<U8E23> \xE7\xF4 |0
-<U8E24> \xE7\xF6 |0
-<U8E25> \xE7\xF5 |0
-<U8E26> \xE7\xFD |0
-<U8E27> \xE7\xFE |0
-<U8E29> \xBD\xF2 |0
-<U8E2B> \xBD\xED |0
-<U8E2E> \xE7\xF7 |0
-<U8E30> \xEB\xC6 |0
-<U8E31> \xBF\xE2 |0
-<U8E33> \xEB\xBD |0
-<U8E34> \xBF\xE3 |0
-<U8E35> \xBF\xE6 |0
-<U8E36> \xEB\xC2 |0
-<U8E38> \xEB\xBF |0
-<U8E39> \xBF\xE5 |0
-<U8E3C> \xEB\xC3 |0
-<U8E3D> \xEB\xC4 |0
-<U8E3E> \xEB\xBE |0
-<U8E3F> \xEB\xC7 |0
-<U8E40> \xEB\xC0 |0
-<U8E41> \xEB\xC5 |0
-<U8E42> \xBF\xE4 |0
-<U8E44> \xBF\xE1 |0
-<U8E45> \xEB\xC1 |0
-<U8E47> \xEE\xBF |0
-<U8E48> \xC1\xD0 |0
-<U8E49> \xC1\xCE |0
-<U8E4A> \xC1\xD1 |0
-<U8E4B> \xC1\xCF |0
-<U8E4C> \xEE\xBE |0
-<U8E4D> \xEE\xBB |0
-<U8E4E> \xEE\xBA |0
-<U8E50> \xEE\xBD |0
-<U8E53> \xEE\xBC |0
-<U8E54> \xF1\x45 |0
-<U8E55> \xC2\xDE |0
-<U8E56> \xF0\xFB |0
-<U8E57> \xF0\xFA |0
-<U8E59> \xC2\xD9 |0
-<U8E5A> \xF1\x41 |0
-<U8E5B> \xF1\x40 |0
-<U8E5C> \xF0\xF7 |0
-<U8E5D> \xF1\x43 |0
-<U8E5E> \xF0\xFC |0
-<U8E5F> \xC2\xDD |0
-<U8E60> \xF0\xF9 |0
-<U8E61> \xF1\x42 |0
-<U8E62> \xF0\xF8 |0
-<U8E63> \xC2\xDA |0
-<U8E64> \xC2\xDC |0
-<U8E65> \xF0\xFD |0
-<U8E66> \xC2\xDB |0
-<U8E67> \xF0\xFE |0
-<U8E69> \xF1\x44 |0
-<U8E6A> \xF3\x52 |0
-<U8E6C> \xC3\xDE |0
-<U8E6D> \xF3\x4F |0
-<U8E6F> \xF3\x53 |0
-<U8E72> \xC3\xDB |0
-<U8E73> \xF3\x51 |0
-<U8E74> \xC3\xE0 |0
-<U8E76> \xC3\xDD |0
-<U8E78> \xF3\x50 |0
-<U8E7A> \xC3\xDF |0
-<U8E7B> \xF3\x54 |0
-<U8E7C> \xC3\xDA |0
-<U8E81> \xC4\xBC |0
-<U8E82> \xC4\xBE |0
-<U8E84> \xF4\xD9 |0
-<U8E85> \xC4\xBD |0
-<U8E86> \xF4\xD7 |0
-<U8E87> \xC3\xDC |0
-<U8E88> \xF4\xD8 |0
-<U8E89> \xC4\xBB |0
-<U8E8A> \xC5\x43 |0
-<U8E8B> \xC5\x45 |0
-<U8E8C> \xF6\x56 |0
-<U8E8D> \xC5\x44 |0
-<U8E8E> \xF6\x55 |0
-<U8E90> \xF7\x61 |0
-<U8E91> \xC5\xAD |0
-<U8E92> \xF7\x60 |0
-<U8E93> \xC5\xAE |0
-<U8E94> \xF7\x5E |0
-<U8E95> \xF7\x5D |0
-<U8E96> \xF7\x62 |0
-<U8E97> \xF7\x63 |0
-<U8E98> \xF8\x46 |0
-<U8E9A> \xF7\x5F |0
-<U8E9D> \xF8\xC6 |0
-<U8E9E> \xF8\xC3 |0
-<U8E9F> \xF8\xC4 |0
-<U8EA0> \xF8\xC5 |0
-<U8EA1> \xC6\x5C |0
-<U8EA3> \xF9\x51 |0
-<U8EA4> \xF9\x50 |0
-<U8EA5> \xF9\x4F |0
-<U8EA6> \xF9\x70 |0
-<U8EA8> \xF9\xBE |0
-<U8EA9> \xF9\xAB |0
-<U8EAA> \xC6\x6E |0
-<U8EAB> \xA8\xAD |0
-<U8EAC> \xB0\x60 |0
-<U8EB2> \xB8\xFA |0
-<U8EBA> \xBD\xF6 |0
-<U8EBD> \xEB\xC8 |0
-<U8EC0> \xC2\xDF |0
-<U8EC2> \xF3\x55 |0
-<U8EC9> \xF9\xAC |0
-<U8ECA> \xA8\xAE |0
-<U8ECB> \xAA\xEE |0
-<U8ECC> \xAD\x79 |0
-<U8ECD> \xAD\x78 |0
-<U8ECF> \xB0\x63 |0
-<U8ED1> \xD3\xE8 |0
-<U8ED2> \xB0\x61 |0
-<U8ED3> \xD3\xE9 |0
-<U8ED4> \xB0\x62 |0
-<U8ED7> \xD7\xDF |0
-<U8ED8> \xD7\xDB |0
-<U8EDB> \xB3\x6D |0
-<U8EDC> \xD7\xDE |0
-<U8EDD> \xD7\xDD |0
-<U8EDE> \xD7\xDC |0
-<U8EDF> \xB3\x6E |0
-<U8EE0> \xD7\xE0 |0
-<U8EE1> \xD7\xE1 |0
-<U8EE5> \xDC\x43 |0
-<U8EE6> \xDC\x41 |0
-<U8EE7> \xDC\x45 |0
-<U8EE8> \xDC\x46 |0
-<U8EE9> \xDC\x4C |0
-<U8EEB> \xDC\x48 |0
-<U8EEC> \xDC\x4A |0
-<U8EEE> \xDC\x42 |0
-<U8EEF> \xDB\xFC |0
-<U8EF1> \xDC\x49 |0
-<U8EF4> \xDC\x4B |0
-<U8EF5> \xDC\x44 |0
-<U8EF6> \xDC\x47 |0
-<U8EF7> \xDB\xFD |0
-<U8EF8> \xB6\x62 |0
-<U8EF9> \xDC\x40 |0
-<U8EFA> \xDB\xFE |0
-<U8EFB> \xB6\x61 |0
-<U8EFC> \xB6\x63 |0
-<U8EFE> \xB8\xFD |0
-<U8EFF> \xE0\x75 |0
-<U8F00> \xE0\x77 |0
-<U8F01> \xE0\x76 |0
-<U8F02> \xE0\x7B |0
-<U8F03> \xB8\xFB |0
-<U8F05> \xE0\x78 |0
-<U8F06> \xE0\x74 |0
-<U8F07> \xE0\x79 |0
-<U8F08> \xE0\x7A |0
-<U8F09> \xB8\xFC |0
-<U8F0A> \xB8\xFE |0
-<U8F0B> \xE0\x7C |0
-<U8F0D> \xE4\x67 |0
-<U8F0E> \xE4\x66 |0
-<U8F10> \xE4\x64 |0
-<U8F11> \xE4\x65 |0
-<U8F12> \xBB\xB3 |0
-<U8F13> \xBB\xB5 |0
-<U8F14> \xBB\xB2 |0
-<U8F15> \xBB\xB4 |0
-<U8F16> \xE8\x4D |0
-<U8F17> \xE8\x4E |0
-<U8F18> \xE8\x49 |0
-<U8F1A> \xE8\x4A |0
-<U8F1B> \xBD\xF8 |0
-<U8F1C> \xBD\xFD |0
-<U8F1D> \xBD\xF7 |0
-<U8F1E> \xBD\xFE |0
-<U8F1F> \xBD\xF9 |0
-<U8F20> \xE8\x4B |0
-<U8F23> \xE8\x4C |0
-<U8F24> \xE8\x48 |0
-<U8F25> \xBE\x40 |0
-<U8F26> \xBD\xFB |0
-<U8F29> \xBD\xFA |0
-<U8F2A> \xBD\xFC |0
-<U8F2C> \xE8\x47 |0
-<U8F2E> \xEB\xCA |0
-<U8F2F> \xBF\xE8 |0
-<U8F32> \xEB\xCC |0
-<U8F33> \xBF\xEA |0
-<U8F34> \xEB\xCF |0
-<U8F35> \xEB\xCB |0
-<U8F36> \xEB\xC9 |0
-<U8F37> \xEB\xCE |0
-<U8F38> \xBF\xE9 |0
-<U8F39> \xEB\xCD |0
-<U8F3B> \xBF\xE7 |0
-<U8F3E> \xC1\xD3 |0
-<U8F3F> \xC1\xD6 |0
-<U8F40> \xEE\xC1 |0
-<U8F42> \xC1\xD4 |0
-<U8F43> \xEE\xC0 |0
-<U8F44> \xC1\xD2 |0
-<U8F45> \xC1\xD5 |0
-<U8F46> \xF1\x46 |0
-<U8F47> \xF1\x47 |0
-<U8F48> \xF1\x48 |0
-<U8F49> \xC2\xE0 |0
-<U8F4B> \xF1\x49 |0
-<U8F4D> \xC2\xE1 |0
-<U8F4E> \xC3\xE2 |0
-<U8F4F> \xF3\x58 |0
-<U8F50> \xF3\x59 |0
-<U8F51> \xF3\x57 |0
-<U8F52> \xF3\x56 |0
-<U8F53> \xF3\x5A |0
-<U8F54> \xC3\xE1 |0
-<U8F55> \xF4\xDD |0
-<U8F56> \xF4\xDB |0
-<U8F57> \xF4\xDC |0
-<U8F58> \xF4\xDE |0
-<U8F59> \xF4\xDA |0
-<U8F5A> \xF4\xDF |0
-<U8F5B> \xF6\x58 |0
-<U8F5D> \xF6\x59 |0
-<U8F5E> \xF6\x57 |0
-<U8F5F> \xC5\x46 |0
-<U8F60> \xF7\x64 |0
-<U8F61> \xC5\xAF |0
-<U8F62> \xF7\x65 |0
-<U8F63> \xF8\x48 |0
-<U8F64> \xF8\x47 |0
-<U8F9B> \xA8\xAF |0
-<U8F9C> \xB6\x64 |0
-<U8F9F> \xB9\x40 |0
-<U8FA3> \xBB\xB6 |0
-<U8FA6> \xBF\xEC |0
-<U8FA8> \xBF\xEB |0
-<U8FAD> \xC3\xE3 |0
-<U8FAE> \xC4\x7C |0
-<U8FAF> \xC5\x47 |0
-<U8FB0> \xA8\xB0 |0
-<U8FB1> \xB0\x64 |0
-<U8FB2> \xB9\x41 |0
-<U8FB4> \xF3\x5B |0
-<U8FBF> \xCB\xA6 |0
-<U8FC2> \xA8\xB1 |0
-<U8FC4> \xA8\xB4 |0
-<U8FC5> \xA8\xB3 |0
-<U8FC6> \xA8\xB2 |0
-<U8FC9> \xCB\xA5 |0
-<U8FCB> \xCD\xCD |0
-<U8FCD> \xCD\xCF |0
-<U8FCE> \xAA\xEF |0
-<U8FD1> \xAA\xF1 |0
-<U8FD2> \xCD\xCC |0
-<U8FD3> \xCD\xCE |0
-<U8FD4> \xAA\xF0 |0
-<U8FD5> \xCD\xD1 |0
-<U8FD6> \xCD\xD0 |0
-<U8FD7> \xCD\xD2 |0
-<U8FE0> \xD0\xB6 |0
-<U8FE1> \xD0\xB4 |0
-<U8FE2> \xAD\x7C |0
-<U8FE3> \xD0\xB3 |0
-<U8FE4> \xAD\xA3 |0
-<U8FE5> \xAD\x7E |0
-<U8FE6> \xAD\x7B |0
-<U8FE8> \xAD\xA4 |0
-<U8FEA> \xAD\x7D |0
-<U8FEB> \xAD\xA2 |0
-<U8FED> \xAD\xA1 |0
-<U8FEE> \xD0\xB5 |0
-<U8FF0> \xAD\x7A |0
-<U8FF4> \xB0\x6A |0
-<U8FF5> \xD3\xEB |0
-<U8FF6> \xD3\xF1 |0
-<U8FF7> \xB0\x67 |0
-<U8FF8> \xB0\x6E |0
-<U8FFA> \xB0\x69 |0
-<U8FFB> \xD3\xEE |0
-<U8FFC> \xD3\xF0 |0
-<U8FFD> \xB0\x6C |0
-<U8FFE> \xD3\xEA |0
-<U8FFF> \xD3\xED |0
-<U9000> \xB0\x68 |0
-<U9001> \xB0\x65 |0
-<U9002> \xD3\xEC |0
-<U9003> \xB0\x6B |0
-<U9004> \xD3\xEF |0
-<U9005> \xB0\x6D |0
-<U9006> \xB0\x66 |0
-<U900B> \xD7\xE3 |0
-<U900C> \xD7\xE6 |0
-<U900D> \xB3\x70 |0
-<U900F> \xB3\x7A |0
-<U9010> \xB3\x76 |0
-<U9011> \xD7\xE4 |0
-<U9014> \xB3\x7E |0
-<U9015> \xB3\x77 |0
-<U9016> \xB3\x7C |0
-<U9017> \xB3\x72 |0
-<U9019> \xB3\x6F |0
-<U901A> \xB3\x71 |0
-<U901B> \xB3\x7D |0
-<U901C> \xD7\xE5 |0
-<U901D> \xB3\x75 |0
-<U901E> \xB3\x78 |0
-<U901F> \xB3\x74 |0
-<U9020> \xB3\x79 |0
-<U9021> \xD7\xE7 |0
-<U9022> \xB3\x7B |0
-<U9023> \xB3\x73 |0
-<U9024> \xD7\xE2 |0
-<U902D> \xDC\x4D |0
-<U902E> \xB6\x65 |0
-<U902F> \xDC\x4F |0
-<U9031> \xB6\x67 |0
-<U9032> \xB6\x69 |0
-<U9034> \xDC\x4E |0
-<U9035> \xB6\x66 |0
-<U9036> \xB6\x6A |0
-<U9038> \xB6\x68 |0
-<U903C> \xB9\x47 |0
-<U903D> \xE0\xA3 |0
-<U903E> \xB9\x4F |0
-<U903F> \xE0\x7E |0
-<U9041> \xB9\x50 |0
-<U9042> \xB9\x45 |0
-<U9044> \xE0\xA1 |0
-<U9047> \xB9\x4A |0
-<U9049> \xE0\xA2 |0
-<U904A> \xB9\x43 |0
-<U904B> \xB9\x42 |0
-<U904D> \xB9\x4D |0
-<U904E> \xB9\x4C |0
-<U904F> \xB9\x4B |0
-<U9050> \xB9\x49 |0
-<U9051> \xB9\x4E |0
-<U9052> \xE0\x7D |0
-<U9053> \xB9\x44 |0
-<U9054> \xB9\x46 |0
-<U9055> \xB9\x48 |0
-<U9058> \xBB\xB8 |0
-<U9059> \xBB\xBB |0
-<U905B> \xBB\xBF |0
-<U905C> \xBB\xB9 |0
-<U905D> \xBB\xBE |0
-<U905E> \xBB\xBC |0
-<U9060> \xBB\xB7 |0
-<U9062> \xBB\xBD |0
-<U9063> \xBB\xBA |0
-<U9067> \xE8\x52 |0
-<U9068> \xBE\x43 |0
-<U9069> \xBE\x41 |0
-<U906B> \xE8\x53 |0
-<U906D> \xBE\x44 |0
-<U906E> \xBE\x42 |0
-<U906F> \xE8\x51 |0
-<U9070> \xE8\x50 |0
-<U9072> \xBF\xF0 |0
-<U9073> \xE8\x4F |0
-<U9074> \xBF\xEE |0
-<U9075> \xBF\xED |0
-<U9076> \xEB\xD0 |0
-<U9077> \xBE\x45 |0
-<U9078> \xBF\xEF |0
-<U9079> \xEB\xD1 |0
-<U907A> \xBF\xF2 |0
-<U907B> \xEB\xD2 |0
-<U907C> \xBF\xF1 |0
-<U907D> \xC1\xD8 |0
-<U907E> \xEE\xC3 |0
-<U907F> \xC1\xD7 |0
-<U9080> \xC1\xDC |0
-<U9081> \xC1\xDA |0
-<U9082> \xC1\xDB |0
-<U9083> \xC2\xE3 |0
-<U9084> \xC1\xD9 |0
-<U9085> \xEE\xC2 |0
-<U9086> \xEB\xD3 |0
-<U9087> \xC2\xE2 |0
-<U9088> \xC2\xE4 |0
-<U908A> \xC3\xE4 |0
-<U908B> \xC3\xE5 |0
-<U908D> \xF4\xE0 |0
-<U908F> \xC5\xDE |0
-<U9090> \xC5\xDD |0
-<U9091> \xA8\xB6 |0
-<U9094> \xCA\x55 |0
-<U9095> \xB0\x6F |0
-<U9097> \xCA\x52 |0
-<U9098> \xCA\x53 |0
-<U9099> \xCA\x51 |0
-<U909B> \xCA\x54 |0
-<U909E> \xCB\xAA |0
-<U909F> \xCB\xA7 |0
-<U90A0> \xCB\xAC |0
-<U90A1> \xCB\xA8 |0
-<U90A2> \xA8\xB7 |0
-<U90A3> \xA8\xBA |0
-<U90A5> \xCB\xA9 |0
-<U90A6> \xA8\xB9 |0
-<U90A7> \xCB\xAB |0
-<U90AA> \xA8\xB8 |0
-<U90AF> \xCD\xD5 |0
-<U90B0> \xCD\xD7 |0
-<U90B1> \xAA\xF4 |0
-<U90B2> \xCD\xD3 |0
-<U90B3> \xCD\xD6 |0
-<U90B4> \xCD\xD4 |0
-<U90B5> \xAA\xF2 |0
-<U90B6> \xAA\xF5 |0
-<U90B8> \xAA\xF3 |0
-<U90BD> \xD0\xB8 |0
-<U90BE> \xD0\xBC |0
-<U90BF> \xD0\xB9 |0
-<U90C1> \xAD\xA7 |0
-<U90C3> \xAD\xA8 |0
-<U90C5> \xD0\xBB |0
-<U90C7> \xD0\xBD |0
-<U90C8> \xD0\xBF |0
-<U90CA> \xAD\xA5 |0
-<U90CB> \xD0\xBE |0
-<U90CE> \xAD\xA6 |0
-<U90D4> \xD7\xEE |0
-<U90D5> \xD0\xBA |0
-<U90D6> \xD3\xF2 |0
-<U90D7> \xD3\xFB |0
-<U90D8> \xD3\xF9 |0
-<U90D9> \xD3\xF4 |0
-<U90DA> \xD3\xF5 |0
-<U90DB> \xD3\xFA |0
-<U90DC> \xD3\xFC |0
-<U90DD> \xB0\x71 |0
-<U90DF> \xD3\xF7 |0
-<U90E0> \xD3\xF3 |0
-<U90E1> \xB0\x70 |0
-<U90E2> \xB0\x72 |0
-<U90E3> \xD3\xF6 |0
-<U90E4> \xD3\xFD |0
-<U90E5> \xD3\xF8 |0
-<U90E8> \xB3\xA1 |0
-<U90E9> \xD7\xF1 |0
-<U90EA> \xD7\xE9 |0
-<U90EB> \xD7\xEF |0
-<U90EC> \xD7\xF0 |0
-<U90ED> \xB3\xA2 |0
-<U90EF> \xD7\xE8 |0
-<U90F0> \xD7\xEA |0
-<U90F1> \xD0\xB7 |0
-<U90F2> \xD7\xEC |0
-<U90F3> \xD7\xED |0
-<U90F4> \xD7\xEB |0
-<U90F5> \xB6\x6C |0
-<U90F9> \xDC\x56 |0
-<U90FA> \xEB\xD4 |0
-<U90FB> \xDC\x57 |0
-<U90FC> \xDC\x54 |0
-<U90FD> \xB3\xA3 |0
-<U90FE> \xB6\x6E |0
-<U90FF> \xDC\x53 |0
-<U9100> \xDC\x59 |0
-<U9101> \xDC\x58 |0
-<U9102> \xB6\x6B |0
-<U9103> \xDC\x5C |0
-<U9104> \xDC\x52 |0
-<U9105> \xDC\x5B |0
-<U9106> \xDC\x50 |0
-<U9107> \xDC\x5A |0
-<U9108> \xDC\x55 |0
-<U9109> \xB6\x6D |0
-<U910B> \xE0\xAA |0
-<U910D> \xE0\xA5 |0
-<U910E> \xE0\xAB |0
-<U910F> \xE0\xA6 |0
-<U9110> \xE0\xA4 |0
-<U9111> \xE0\xA7 |0
-<U9112> \xB9\x51 |0
-<U9114> \xE0\xA9 |0
-<U9116> \xE0\xA8 |0
-<U9117> \xB9\x52 |0
-<U9118> \xBB\xC1 |0
-<U9119> \xBB\xC0 |0
-<U911A> \xE4\x6E |0
-<U911B> \xE4\x71 |0
-<U911C> \xE4\x69 |0
-<U911D> \xE4\x6D |0
-<U911E> \xBB\xC2 |0
-<U911F> \xE4\x6C |0
-<U9120> \xE4\x6A |0
-<U9121> \xE4\x70 |0
-<U9122> \xE4\x6B |0
-<U9123> \xE4\x68 |0
-<U9124> \xE4\x6F |0
-<U9126> \xE8\x59 |0
-<U9127> \xBE\x48 |0
-<U9128> \xF1\x4A |0
-<U9129> \xE8\x56 |0
-<U912A> \xE8\x57 |0
-<U912B> \xE8\x55 |0
-<U912C> \xDC\x51 |0
-<U912D> \xBE\x47 |0
-<U912E> \xE8\x5A |0
-<U912F> \xE8\x54 |0
-<U9130> \xBE\x46 |0
-<U9131> \xBE\x49 |0
-<U9132> \xE8\x58 |0
-<U9133> \xEB\xD5 |0
-<U9134> \xBF\xF3 |0
-<U9135> \xEB\xD6 |0
-<U9136> \xEB\xD7 |0
-<U9138> \xEE\xC4 |0
-<U9139> \xC1\xDD |0
-<U913A> \xF1\x4B |0
-<U913B> \xF1\x4C |0
-<U913E> \xF1\x4D |0
-<U913F> \xF3\x5D |0
-<U9140> \xF3\x5C |0
-<U9141> \xF4\xE2 |0
-<U9143> \xF4\xE1 |0
-<U9144> \xF6\x5B |0
-<U9145> \xF6\x5C |0
-<U9146> \xF6\x5A |0
-<U9147> \xF7\x66 |0
-<U9148> \xC5\xB0 |0
-<U9149> \xA8\xBB |0
-<U914A> \xAD\xAA |0
-<U914B> \xAD\xA9 |0
-<U914C> \xB0\x75 |0
-<U914D> \xB0\x74 |0
-<U914E> \xD4\x40 |0
-<U914F> \xD4\x41 |0
-<U9150> \xD3\xFE |0
-<U9152> \xB0\x73 |0
-<U9153> \xD7\xF5 |0
-<U9155> \xD7\xF6 |0
-<U9156> \xD7\xF2 |0
-<U9157> \xB3\xA4 |0
-<U9158> \xD7\xF3 |0
-<U915A> \xD7\xF4 |0
-<U915F> \xDC\x5F |0
-<U9160> \xDC\x61 |0
-<U9161> \xDC\x5D |0
-<U9162> \xDC\x60 |0
-<U9163> \xB6\x6F |0
-<U9164> \xDC\x5E |0
-<U9165> \xB6\x70 |0
-<U9168> \xDD\x73 |0
-<U9169> \xB9\x55 |0
-<U916A> \xB9\x54 |0
-<U916C> \xB9\x53 |0
-<U916E> \xE0\xAC |0
-<U916F> \xE0\xAD |0
-<U9172> \xE4\x73 |0
-<U9173> \xE4\x75 |0
-<U9174> \xBB\xC6 |0
-<U9175> \xBB\xC3 |0
-<U9177> \xBB\xC5 |0
-<U9178> \xBB\xC4 |0
-<U9179> \xE4\x74 |0
-<U917A> \xE4\x72 |0
-<U9180> \xE8\x61 |0
-<U9181> \xE8\x5E |0
-<U9182> \xE8\x5F |0
-<U9183> \xBE\x4D |0
-<U9184> \xE8\x60 |0
-<U9185> \xE8\x5B |0
-<U9186> \xE8\x5C |0
-<U9187> \xBE\x4A |0
-<U9189> \xBE\x4B |0
-<U918A> \xE8\x5D |0
-<U918B> \xBE\x4C |0
-<U918D> \xEB\xDB |0
-<U918F> \xEB\xDC |0
-<U9190> \xEB\xD9 |0
-<U9191> \xEB\xDA |0
-<U9192> \xBF\xF4 |0
-<U9193> \xEB\xD8 |0
-<U9199> \xEE\xC8 |0
-<U919A> \xEE\xC5 |0
-<U919B> \xEE\xC7 |0
-<U919C> \xC1\xE0 |0
-<U919D> \xEE\xCB |0
-<U919E> \xC1\xDF |0
-<U919F> \xEE\xC9 |0
-<U91A0> \xEE\xCC |0
-<U91A1> \xEE\xCA |0
-<U91A2> \xEE\xC6 |0
-<U91A3> \xC1\xDE |0
-<U91A5> \xF1\x4F |0
-<U91A7> \xF1\x50 |0
-<U91A8> \xF1\x4E |0
-<U91AA> \xF1\x52 |0
-<U91AB> \xC2\xE5 |0
-<U91AC> \xC2\xE6 |0
-<U91AD> \xF3\x5F |0
-<U91AE> \xC3\xE7 |0
-<U91AF> \xF1\x51 |0
-<U91B0> \xF3\x5E |0
-<U91B1> \xC3\xE6 |0
-<U91B2> \xF4\xE5 |0
-<U91B3> \xF4\xE6 |0
-<U91B4> \xC4\xBF |0
-<U91B5> \xF4\xE4 |0
-<U91B7> \xF4\xE3 |0
-<U91B9> \xF6\x5D |0
-<U91BA> \xC5\x48 |0
-<U91BC> \xF8\x49 |0
-<U91BD> \xF8\xC8 |0
-<U91BE> \xF8\xC7 |0
-<U91C0> \xC6\x43 |0
-<U91C1> \xC6\x5D |0
-<U91C2> \xF8\xC9 |0
-<U91C3> \xF9\x71 |0
-<U91C5> \xC6\x6F |0
-<U91C6> \xA8\xBC |0
-<U91C7> \xAA\xF6 |0
-<U91C9> \xB9\x56 |0
-<U91CB> \xC4\xC0 |0
-<U91CC> \xA8\xBD |0
-<U91CD> \xAD\xAB |0
-<U91CE> \xB3\xA5 |0
-<U91CF> \xB6\x71 |0
-<U91D0> \xC2\xE7 |0
-<U91D1> \xAA\xF7 |0
-<U91D3> \xD0\xC1 |0
-<U91D4> \xD0\xC0 |0
-<U91D5> \xD4\x42 |0
-<U91D7> \xB0\x78 |0
-<U91D8> \xB0\x76 |0
-<U91D9> \xB0\x7A |0
-<U91DA> \xD4\x44 |0
-<U91DC> \xB0\x79 |0
-<U91DD> \xB0\x77 |0
-<U91E2> \xD4\x43 |0
-<U91E3> \xB3\xA8 |0
-<U91E4> \xD7\xFC |0
-<U91E6> \xB3\xA7 |0
-<U91E7> \xB3\xA9 |0
-<U91E8> \xD8\x42 |0
-<U91E9> \xB3\xAB |0
-<U91EA> \xD7\xFE |0
-<U91EB> \xD8\x40 |0
-<U91EC> \xD7\xF7 |0
-<U91ED> \xB3\xAA |0
-<U91EE> \xD8\x43 |0
-<U91F1> \xD7\xF9 |0
-<U91F3> \xD7\xFA |0
-<U91F4> \xD7\xF8 |0
-<U91F5> \xB3\xA6 |0
-<U91F7> \xD8\x41 |0
-<U91F8> \xD7\xFB |0
-<U91F9> \xD7\xFD |0
-<U91FD> \xDC\x6D |0
-<U91FF> \xDC\x6C |0
-<U9200> \xDC\x6A |0
-<U9201> \xDC\x62 |0
-<U9202> \xDC\x71 |0
-<U9203> \xDC\x65 |0
-<U9204> \xDC\x6F |0
-<U9205> \xDC\x76 |0
-<U9206> \xDC\x6E |0
-<U9207> \xB6\x79 |0
-<U9209> \xB6\x75 |0
-<U920A> \xDC\x63 |0
-<U920C> \xDC\x69 |0
-<U920D> \xB6\x77 |0
-<U920F> \xDC\x68 |0
-<U9210> \xB6\x78 |0
-<U9211> \xB6\x7A |0
-<U9212> \xDC\x6B |0
-<U9214> \xB6\x72 |0
-<U9215> \xB6\x73 |0
-<U9216> \xDC\x77 |0
-<U9217> \xDC\x75 |0
-<U9219> \xDC\x74 |0
-<U921A> \xDC\x66 |0
-<U921C> \xDC\x72 |0
-<U921E> \xB6\x76 |0
-<U9223> \xB6\x74 |0
-<U9224> \xDC\x73 |0
-<U9225> \xDC\x64 |0
-<U9226> \xDC\x67 |0
-<U9227> \xDC\x70 |0
-<U922D> \xE4\xBA |0
-<U922E> \xE0\xB7 |0
-<U9230> \xE0\xB0 |0
-<U9231> \xE0\xC3 |0
-<U9232> \xE0\xCC |0
-<U9233> \xE0\xB3 |0
-<U9234> \xB9\x61 |0
-<U9236> \xE0\xC0 |0
-<U9237> \xB9\x57 |0
-<U9238> \xB9\x59 |0
-<U9239> \xB9\x65 |0
-<U923A> \xE0\xB1 |0
-<U923D> \xB9\x5A |0
-<U923E> \xB9\x5C |0
-<U923F> \xB9\x66 |0
-<U9240> \xB9\x5B |0
-<U9245> \xB9\x64 |0
-<U9246> \xE0\xB9 |0
-<U9248> \xE0\xAE |0
-<U9249> \xB9\x62 |0
-<U924A> \xE0\xB8 |0
-<U924B> \xB9\x5E |0
-<U924C> \xE0\xCA |0
-<U924D> \xB9\x63 |0
-<U924E> \xE0\xC8 |0
-<U924F> \xE0\xBC |0
-<U9250> \xE0\xC6 |0
-<U9251> \xB9\x60 |0
-<U9252> \xE0\xAF |0
-<U9253> \xE0\xC9 |0
-<U9254> \xE0\xC4 |0
-<U9256> \xE0\xCB |0
-<U9257> \xB9\x58 |0
-<U925A> \xB9\x67 |0
-<U925B> \xB9\x5D |0
-<U925E> \xE0\xB5 |0
-<U9260> \xE0\xBD |0
-<U9261> \xE0\xC1 |0
-<U9263> \xE0\xC5 |0
-<U9264> \xB9\x5F |0
-<U9265> \xE0\xB4 |0
-<U9266> \xE0\xB2 |0
-<U9267> \xE0\xBE |0
-<U926C> \xE0\xBB |0
-<U926D> \xE0\xBA |0
-<U926F> \xE0\xBF |0
-<U9270> \xE0\xC2 |0
-<U9272> \xE0\xC7 |0
-<U9276> \xE4\x78 |0
-<U9278> \xBB\xC7 |0
-<U9279> \xE4\xA4 |0
-<U927A> \xE4\x7A |0
-<U927B> \xBB\xCC |0
-<U927C> \xBB\xD0 |0
-<U927D> \xE4\xAD |0
-<U927E> \xE4\xB5 |0
-<U927F> \xE4\xA6 |0
-<U9280> \xBB\xC8 |0
-<U9282> \xE4\xAA |0
-<U9283> \xE0\xB6 |0
-<U9285> \xBB\xC9 |0
-<U9286> \xE4\xB1 |0
-<U9287> \xE4\xB6 |0
-<U9288> \xE4\xAE |0
-<U928A> \xE4\xB0 |0
-<U928B> \xE4\xB9 |0
-<U928C> \xE4\xB2 |0
-<U928D> \xE4\x7E |0
-<U928E> \xE4\xA9 |0
-<U9291> \xBB\xD1 |0
-<U9293> \xBB\xCD |0
-<U9294> \xE4\x7C |0
-<U9295> \xE4\xAB |0
-<U9296> \xBB\xCB |0
-<U9297> \xE4\xA5 |0
-<U9298> \xBB\xCA |0
-<U9299> \xE4\xB3 |0
-<U929A> \xE4\xA2 |0
-<U929B> \xE4\x79 |0
-<U929C> \xBB\xCE |0
-<U929D> \xE4\xB8 |0
-<U92A0> \xE4\x7B |0
-<U92A1> \xE4\xAF |0
-<U92A2> \xE4\xAC |0
-<U92A3> \xE4\xA7 |0
-<U92A4> \xE4\x77 |0
-<U92A5> \xE4\x76 |0
-<U92A6> \xE4\xA1 |0
-<U92A7> \xE4\xB4 |0
-<U92A8> \xBB\xCF |0
-<U92A9> \xE4\xB7 |0
-<U92AA> \xE4\x7D |0
-<U92AB> \xE4\xA3 |0
-<U92AC> \xBE\x52 |0
-<U92B2> \xBE\x5A |0
-<U92B3> \xBE\x55 |0
-<U92B4> \xE8\xA4 |0
-<U92B5> \xE8\xA1 |0
-<U92B6> \xE8\x67 |0
-<U92B7> \xBE\x50 |0
-<U92B9> \xF9\xD7 |0
-<U92BB> \xBE\x4F |0
-<U92BC> \xBE\x56 |0
-<U92C0> \xE8\x65 |0
-<U92C1> \xBE\x54 |0
-<U92C2> \xE8\x71 |0
-<U92C3> \xE8\x63 |0
-<U92C4> \xE8\x64 |0
-<U92C5> \xBE\x4E |0
-<U92C6> \xE8\xA3 |0
-<U92C7> \xBE\x58 |0
-<U92C8> \xE8\x74 |0
-<U92C9> \xE8\x79 |0
-<U92CA> \xE8\x73 |0
-<U92CB> \xEB\xEE |0
-<U92CC> \xE8\x6F |0
-<U92CD> \xE8\x77 |0
-<U92CE> \xE8\x75 |0
-<U92CF> \xE8\x68 |0
-<U92D0> \xE8\x62 |0
-<U92D1> \xE8\x7D |0
-<U92D2> \xBE\x57 |0
-<U92D3> \xE8\x7E |0
-<U92D5> \xE8\x78 |0
-<U92D7> \xE8\x6D |0
-<U92D8> \xE8\x6B |0
-<U92D9> \xE8\x66 |0
-<U92DD> \xE8\x6E |0
-<U92DE> \xE8\x7B |0
-<U92DF> \xE8\x6A |0
-<U92E0> \xE8\x7A |0
-<U92E1> \xE8\xA2 |0
-<U92E4> \xBE\x53 |0
-<U92E6> \xE8\x76 |0
-<U92E7> \xE8\x7C |0
-<U92E8> \xE8\x72 |0
-<U92E9> \xE8\x6C |0
-<U92EA> \xBE\x51 |0
-<U92EE> \xE4\xA8 |0
-<U92EF> \xE8\x70 |0
-<U92F0> \xBE\x59 |0
-<U92F1> \xE8\x69 |0
-<U92F7> \xEB\xF4 |0
-<U92F8> \xBF\xF7 |0
-<U92F9> \xEB\xF3 |0
-<U92FA> \xEB\xF0 |0
-<U92FB> \xEC\x44 |0
-<U92FC> \xBF\xFB |0
-<U92FE> \xEC\x41 |0
-<U92FF> \xEB\xF8 |0
-<U9300> \xEC\x43 |0
-<U9301> \xEB\xE9 |0
-<U9302> \xEB\xF6 |0
-<U9304> \xBF\xFD |0
-<U9306> \xEB\xE1 |0
-<U9308> \xEB\xDF |0
-<U9309> \xEC\x42 |0
-<U930B> \xEC\x40 |0
-<U930C> \xEB\xFE |0
-<U930D> \xEB\xED |0
-<U930E> \xEB\xEC |0
-<U930F> \xEB\xE2 |0
-<U9310> \xC0\x40 |0
-<U9312> \xEB\xE8 |0
-<U9313> \xEB\xF2 |0
-<U9314> \xEB\xFD |0
-<U9315> \xC0\x43 |0
-<U9316> \xEC\x45 |0
-<U9318> \xC1\xE8 |0
-<U9319> \xC0\x45 |0
-<U931A> \xBF\xFE |0
-<U931B> \xEB\xE6 |0
-<U931D> \xEB\xEF |0
-<U931E> \xEB\xDE |0
-<U931F> \xEB\xE0 |0
-<U9320> \xBF\xF5 |0
-<U9321> \xC0\x42 |0
-<U9322> \xBF\xFA |0
-<U9323> \xEB\xE7 |0
-<U9324> \xEB\xF7 |0
-<U9325> \xEB\xF1 |0
-<U9326> \xC0\x41 |0
-<U9327> \xEB\xDD |0
-<U9328> \xC1\xE3 |0
-<U9329> \xEB\xF9 |0
-<U932A> \xEB\xFC |0
-<U932B> \xBF\xFC |0
-<U932D> \xEB\xEB |0
-<U932E> \xC0\x44 |0
-<U932F> \xBF\xF9 |0
-<U9333> \xBF\xF8 |0
-<U9334> \xEB\xF5 |0
-<U9335> \xEB\xFB |0
-<U9336> \xBF\xF6 |0
-<U9338> \xEB\xE4 |0
-<U9339> \xEB\xFA |0
-<U933C> \xEB\xE5 |0
-<U9346> \xEB\xEA |0
-<U9347> \xEE\xD2 |0
-<U9349> \xEE\xD7 |0
-<U934A> \xC1\xE5 |0
-<U934B> \xC1\xE7 |0
-<U934C> \xEE\xDD |0
-<U934D> \xC1\xE1 |0
-<U934E> \xEE\xEC |0
-<U934F> \xEE\xE3 |0
-<U9350> \xEE\xD8 |0
-<U9351> \xEE\xD9 |0
-<U9352> \xEE\xE2 |0
-<U9354> \xC1\xEE |0
-<U9355> \xEE\xE1 |0
-<U9356> \xEE\xD1 |0
-<U9357> \xEE\xE0 |0
-<U9358> \xEE\xD4 |0
-<U9359> \xEE\xED |0
-<U935A> \xC1\xED |0
-<U935B> \xC1\xEB |0
-<U935C> \xEE\xD5 |0
-<U935E> \xEE\xE8 |0
-<U9360> \xEE\xDA |0
-<U9361> \xEE\xE7 |0
-<U9363> \xEE\xE9 |0
-<U9364> \xEE\xD0 |0
-<U9365> \xC1\xE6 |0
-<U9367> \xEE\xEA |0
-<U936A> \xEE\xDE |0
-<U936C> \xC1\xEA |0
-<U936D> \xEE\xDB |0
-<U9370> \xC1\xEC |0
-<U9371> \xEE\xE4 |0
-<U9375> \xC1\xE4 |0
-<U9376> \xEE\xD6 |0
-<U9377> \xEE\xE5 |0
-<U9379> \xEE\xDF |0
-<U937A> \xEB\xE3 |0
-<U937B> \xEE\xE6 |0
-<U937C> \xEE\xD3 |0
-<U937E> \xC1\xE9 |0
-<U9380> \xEE\xEB |0
-<U9382> \xC1\xE2 |0
-<U9383> \xEE\xCE |0
-<U9388> \xF1\x60 |0
-<U9389> \xF1\x59 |0
-<U938A> \xC2\xE9 |0
-<U938C> \xF1\x54 |0
-<U938D> \xF1\x63 |0
-<U938E> \xF1\x5B |0
-<U938F> \xEE\xDC |0
-<U9391> \xF1\x65 |0
-<U9392> \xF1\x55 |0
-<U9394> \xC2\xE8 |0
-<U9395> \xF1\x5F |0
-<U9396> \xC2\xEA |0
-<U9397> \xC2\xF2 |0
-<U9398> \xC2\xF0 |0
-<U9399> \xF1\x61 |0
-<U939A> \xC2\xF1 |0
-<U939B> \xF1\x57 |0
-<U939D> \xF1\x58 |0
-<U939E> \xF1\x5D |0
-<U939F> \xF1\x62 |0
-<U93A1> \xEE\xCD |0
-<U93A2> \xC2\xEB |0
-<U93A3> \xF1\x6A |0
-<U93A4> \xF1\x67 |0
-<U93A5> \xF1\x6B |0
-<U93A6> \xF1\x5E |0
-<U93A7> \xF1\x5A |0
-<U93A8> \xF1\x68 |0
-<U93A9> \xF3\x6A |0
-<U93AA> \xF1\x5C |0
-<U93AC> \xC2\xEE |0
-<U93AE> \xC2\xED |0
-<U93AF> \xEE\xCF |0
-<U93B0> \xC2\xEF |0
-<U93B1> \xF1\x64 |0
-<U93B2> \xF1\x66 |0
-<U93B3> \xC2\xEC |0
-<U93B4> \xF1\x69 |0
-<U93B5> \xF1\x53 |0
-<U93B7> \xF1\x56 |0
-<U93C0> \xF3\x73 |0
-<U93C2> \xF3\x63 |0
-<U93C3> \xC3\xEB |0
-<U93C4> \xF3\x71 |0
-<U93C7> \xF3\x61 |0
-<U93C8> \xC3\xEC |0
-<U93CA> \xF3\x6C |0
-<U93CC> \xF3\x68 |0
-<U93CD> \xC3\xF1 |0
-<U93CE> \xF3\x72 |0
-<U93CF> \xF3\x62 |0
-<U93D0> \xF3\x65 |0
-<U93D1> \xC3\xE9 |0
-<U93D2> \xF3\x74 |0
-<U93D4> \xF3\x6D |0
-<U93D5> \xF3\x70 |0
-<U93D6> \xC3\xEF |0
-<U93D7> \xC3\xF4 |0
-<U93D8> \xC3\xF2 |0
-<U93D9> \xF3\x69 |0
-<U93DA> \xF3\x64 |0
-<U93DC> \xC3\xED |0
-<U93DD> \xC3\xEE |0
-<U93DE> \xF3\x60 |0
-<U93DF> \xC3\xEA |0
-<U93E1> \xC3\xE8 |0
-<U93E2> \xC3\xF0 |0
-<U93E3> \xF3\x6F |0
-<U93E4> \xC3\xF3 |0
-<U93E6> \xF3\x6B |0
-<U93E7> \xF3\x75 |0
-<U93E8> \xC3\xF5 |0
-<U93EC> \xF3\x67 |0
-<U93EE> \xF3\x6E |0
-<U93F5> \xF4\xF3 |0
-<U93F6> \xF5\x42 |0
-<U93F7> \xF4\xF5 |0
-<U93F8> \xF4\xFC |0
-<U93F9> \xF3\x66 |0
-<U93FA> \xF4\xFA |0
-<U93FB> \xF4\xE9 |0
-<U93FC> \xF5\x40 |0
-<U93FD> \xC4\xC3 |0
-<U93FE> \xF4\xED |0
-<U93FF> \xF4\xFE |0
-<U9400> \xF4\xF4 |0
-<U9403> \xC4\xC2 |0
-<U9406> \xF5\x44 |0
-<U9407> \xF4\xF6 |0
-<U9409> \xF4\xFB |0
-<U940A> \xF4\xFD |0
-<U940B> \xF4\xE7 |0
-<U940C> \xF5\x41 |0
-<U940D> \xF4\xF2 |0
-<U940E> \xF4\xF7 |0
-<U940F> \xF4\xEB |0
-<U9410> \xF4\xEF |0
-<U9411> \xF5\x43 |0
-<U9412> \xF4\xF9 |0
-<U9413> \xF4\xE8 |0
-<U9414> \xF4\xEC |0
-<U9415> \xF4\xEE |0
-<U9416> \xF4\xF8 |0
-<U9418> \xC4\xC1 |0
-<U9419> \xF4\xF1 |0
-<U9420> \xF4\xEA |0
-<U9428> \xF4\xF0 |0
-<U9429> \xF6\x61 |0
-<U942A> \xF6\x66 |0
-<U942B> \xC5\x4F |0
-<U942C> \xF6\x68 |0
-<U942E> \xC5\x49 |0
-<U9430> \xF6\x64 |0
-<U9431> \xF6\x6A |0
-<U9432> \xC5\x4E |0
-<U9433> \xC5\x4A |0
-<U9435> \xC5\x4B |0
-<U9436> \xF6\x60 |0
-<U9437> \xF6\x67 |0
-<U9438> \xC5\x4D |0
-<U9439> \xF6\x65 |0
-<U943A> \xC5\x4C |0
-<U943B> \xF6\x5F |0
-<U943C> \xF6\x63 |0
-<U943D> \xF6\x62 |0
-<U943F> \xF6\x5E |0
-<U9440> \xF6\x69 |0
-<U9444> \xC5\xB1 |0
-<U9445> \xF7\x6D |0
-<U9446> \xF7\x70 |0
-<U9447> \xF7\x6C |0
-<U9448> \xF7\x6E |0
-<U9449> \xF7\x6F |0
-<U944A> \xF7\x69 |0
-<U944B> \xF7\x6A |0
-<U944C> \xF7\x67 |0
-<U944F> \xF7\x6B |0
-<U9450> \xF7\x68 |0
-<U9451> \xC5\xB2 |0
-<U9452> \xC5\xB3 |0
-<U9455> \xF8\x4B |0
-<U9457> \xF8\x4D |0
-<U945D> \xF8\x4C |0
-<U945E> \xF8\x4E |0
-<U9460> \xC5\xE0 |0
-<U9462> \xF8\x4A |0
-<U9463> \xC5\xDF |0
-<U9464> \xC5\xE1 |0
-<U9468> \xF8\xCB |0
-<U9469> \xF8\xCC |0
-<U946A> \xC6\x44 |0
-<U946B> \xF8\xCA |0
-<U946D> \xF9\x53 |0
-<U946E> \xF9\x52 |0
-<U946F> \xF9\x54 |0
-<U9470> \xC6\x5F |0
-<U9471> \xF9\x55 |0
-<U9472> \xC6\x5E |0
-<U9473> \xF9\x56 |0
-<U9474> \xF9\x72 |0
-<U9475> \xF9\x75 |0
-<U9476> \xF9\x74 |0
-<U9477> \xC6\x68 |0
-<U9478> \xF9\x73 |0
-<U947C> \xC6\x72 |0
-<U947D> \xC6\x70 |0
-<U947E> \xC6\x71 |0
-<U947F> \xC6\x77 |0
-<U9480> \xF9\xC0 |0
-<U9481> \xF9\xC1 |0
-<U9482> \xF9\xBF |0
-<U9483> \xF9\xC9 |0
-<U9577> \xAA\xF8 |0
-<U957A> \xD8\x44 |0
-<U957B> \xDC\x78 |0
-<U957C> \xE8\xA5 |0
-<U957D> \xF3\x76 |0
-<U9580> \xAA\xF9 |0
-<U9582> \xAD\xAC |0
-<U9583> \xB0\x7B |0
-<U9586> \xD8\x45 |0
-<U9588> \xD8\x46 |0
-<U9589> \xB3\xAC |0
-<U958B> \xB6\x7D |0
-<U958C> \xDC\x7A |0
-<U958D> \xDC\x79 |0
-<U958E> \xB6\xA3 |0
-<U958F> \xB6\x7C |0
-<U9590> \xDC\x7B |0
-<U9591> \xB6\x7E |0
-<U9592> \xB6\xA2 |0
-<U9593> \xB6\xA1 |0
-<U9594> \xB6\x7B |0
-<U9598> \xB9\x68 |0
-<U959B> \xE0\xD0 |0
-<U959C> \xE0\xCE |0
-<U959E> \xE0\xCF |0
-<U959F> \xE0\xCD |0
-<U95A1> \xBB\xD2 |0
-<U95A3> \xBB\xD5 |0
-<U95A4> \xBB\xD7 |0
-<U95A5> \xBB\xD6 |0
-<U95A8> \xBB\xD3 |0
-<U95A9> \xBB\xD4 |0
-<U95AB> \xE8\xA7 |0
-<U95AC> \xE8\xA6 |0
-<U95AD> \xBE\x5B |0
-<U95AE> \xE8\xA8 |0
-<U95B0> \xE8\xA9 |0
-<U95B1> \xBE\x5C |0
-<U95B5> \xEC\x4D |0
-<U95B6> \xEC\x4B |0
-<U95B7> \xEE\xF3 |0
-<U95B9> \xEC\x49 |0
-<U95BA> \xEC\x4A |0
-<U95BB> \xC0\x46 |0
-<U95BC> \xEC\x46 |0
-<U95BD> \xEC\x4E |0
-<U95BE> \xEC\x48 |0
-<U95BF> \xEC\x4C |0
-<U95C0> \xEE\xEF |0
-<U95C3> \xEE\xF1 |0
-<U95C5> \xEE\xF2 |0
-<U95C6> \xC1\xF3 |0
-<U95C7> \xEE\xEE |0
-<U95C8> \xC1\xF2 |0
-<U95C9> \xEE\xF0 |0
-<U95CA> \xC1\xEF |0
-<U95CB> \xC1\xF0 |0
-<U95CC> \xC1\xF1 |0
-<U95CD> \xEC\x47 |0
-<U95D0> \xC2\xF5 |0
-<U95D1> \xF1\x6E |0
-<U95D2> \xF1\x6C |0
-<U95D3> \xF1\x6D |0
-<U95D4> \xC2\xF3 |0
-<U95D5> \xC2\xF6 |0
-<U95D6> \xC2\xF4 |0
-<U95DA> \xF3\x77 |0
-<U95DB> \xF3\x78 |0
-<U95DC> \xC3\xF6 |0
-<U95DE> \xF5\x45 |0
-<U95DF> \xF5\x47 |0
-<U95E0> \xF5\x46 |0
-<U95E1> \xC4\xC4 |0
-<U95E2> \xC5\x50 |0
-<U95E3> \xF6\x6D |0
-<U95E4> \xF6\x6C |0
-<U95E5> \xF6\x6B |0
-<U961C> \xAA\xFA |0
-<U961E> \xC9\xAA |0
-<U9620> \xCA\x58 |0
-<U9621> \xA6\xE9 |0
-<U9622> \xCA\x56 |0
-<U9623> \xCA\x59 |0
-<U9624> \xCA\x57 |0
-<U9628> \xCB\xAE |0
-<U962A> \xA8\xC1 |0
-<U962C> \xA8\xC2 |0
-<U962D> \xCB\xB0 |0
-<U962E> \xA8\xBF |0
-<U962F> \xCB\xAF |0
-<U9630> \xCB\xAD |0
-<U9631> \xA8\xC0 |0
-<U9632> \xA8\xBE |0
-<U9639> \xCD\xD8 |0
-<U963A> \xCD\xDB |0
-<U963B> \xAA\xFD |0
-<U963C> \xCD\xDA |0
-<U963D> \xCD\xD9 |0
-<U963F> \xAA\xFC |0
-<U9640> \xAA\xFB |0
-<U9642> \xAB\x40 |0
-<U9643> \xCD\xDC |0
-<U9644> \xAA\xFE |0
-<U964A> \xD0\xC6 |0
-<U964B> \xAD\xAE |0
-<U964C> \xAD\xAF |0
-<U964D> \xAD\xB0 |0
-<U964E> \xD0\xC7 |0
-<U964F> \xD0\xC3 |0
-<U9650> \xAD\xAD |0
-<U9651> \xD0\xC4 |0
-<U9653> \xD0\xC5 |0
-<U9654> \xD0\xC2 |0
-<U9658> \xB0\xA4 |0
-<U965B> \xB0\xA1 |0
-<U965C> \xD4\x45 |0
-<U965D> \xB0\xA2 |0
-<U965E> \xB0\xA5 |0
-<U965F> \xD4\x46 |0
-<U9661> \xB0\x7E |0
-<U9662> \xB0\x7C |0
-<U9663> \xB0\x7D |0
-<U9664> \xB0\xA3 |0
-<U966A> \xB3\xAD |0
-<U966B> \xD8\x49 |0
-<U966C> \xB3\xB5 |0
-<U966D> \xD8\x48 |0
-<U966F> \xD8\x4B |0
-<U9670> \xB3\xB1 |0
-<U9671> \xD8\x4A |0
-<U9672> \xB6\xAB |0
-<U9673> \xB3\xAF |0
-<U9674> \xB3\xB2 |0
-<U9675> \xB3\xAE |0
-<U9676> \xB3\xB3 |0
-<U9677> \xB3\xB4 |0
-<U9678> \xB3\xB0 |0
-<U967C> \xD8\x47 |0
-<U967D> \xB6\xA7 |0
-<U967E> \xDC\x7D |0
-<U9680> \xDC\xA3 |0
-<U9683> \xDC\xA2 |0
-<U9684> \xB6\xAC |0
-<U9685> \xB6\xA8 |0
-<U9686> \xB6\xA9 |0
-<U9687> \xDC\x7C |0
-<U9688> \xDC\x7E |0
-<U9689> \xDC\xA1 |0
-<U968A> \xB6\xA4 |0
-<U968B> \xB6\xA6 |0
-<U968D> \xB6\xAA |0
-<U968E> \xB6\xA5 |0
-<U9691> \xE0\xD3 |0
-<U9692> \xE0\xD1 |0
-<U9693> \xE0\xD2 |0
-<U9694> \xB9\x6A |0
-<U9695> \xB9\x6B |0
-<U9697> \xE0\xD4 |0
-<U9698> \xB9\x69 |0
-<U9699> \xBB\xD8 |0
-<U969B> \xBB\xDA |0
-<U969C> \xBB\xD9 |0
-<U969E> \xE4\xBB |0
-<U96A1> \xE4\xBC |0
-<U96A2> \xE8\xAB |0
-<U96A4> \xE8\xAA |0
-<U96A7> \xC0\x47 |0
-<U96A8> \xC0\x48 |0
-<U96A9> \xEC\x4F |0
-<U96AA> \xC0\x49 |0
-<U96AC> \xEE\xF6 |0
-<U96AE> \xEE\xF4 |0
-<U96B0> \xEE\xF5 |0
-<U96B1> \xC1\xF4 |0
-<U96B3> \xF1\x6F |0
-<U96B4> \xC3\xF7 |0
-<U96B8> \xC1\xF5 |0
-<U96B9> \xAB\x41 |0
-<U96BB> \xB0\xA6 |0
-<U96BC> \xD4\x47 |0
-<U96BF> \xD8\x4C |0
-<U96C0> \xB3\xB6 |0
-<U96C1> \xB6\xAD |0
-<U96C2> \xDC\xA4 |0
-<U96C3> \xDC\xA6 |0
-<U96C4> \xB6\xAF |0
-<U96C5> \xB6\xAE |0
-<U96C6> \xB6\xB0 |0
-<U96C7> \xB6\xB1 |0
-<U96C8> \xDC\xA5 |0
-<U96C9> \xB9\x6E |0
-<U96CA> \xB9\x6F |0
-<U96CB> \xB9\x6D |0
-<U96CC> \xBB\xDB |0
-<U96CD> \xB9\x6C |0
-<U96CE> \xE0\xD5 |0
-<U96D2> \xBB\xDC |0
-<U96D3> \xE8\xAC |0
-<U96D4> \xEC\x50 |0
-<U96D5> \xC0\x4A |0
-<U96D6> \xC1\xF6 |0
-<U96D7> \xF1\x70 |0
-<U96D8> \xF1\x74 |0
-<U96D9> \xC2\xF9 |0
-<U96DA> \xF1\x71 |0
-<U96DB> \xC2\xFA |0
-<U96DC> \xC2\xF8 |0
-<U96DD> \xF1\x75 |0
-<U96DE> \xC2\xFB |0
-<U96DF> \xF1\x73 |0
-<U96E1> \xF3\x79 |0
-<U96E2> \xC2\xF7 |0
-<U96E3> \xC3\xF8 |0
-<U96E5> \xF8\xCD |0
-<U96E8> \xAB\x42 |0
-<U96E9> \xB3\xB8 |0
-<U96EA> \xB3\xB7 |0
-<U96EF> \xB6\xB2 |0
-<U96F0> \xDC\xA8 |0
-<U96F1> \xDC\xA7 |0
-<U96F2> \xB6\xB3 |0
-<U96F5> \xE0\xD9 |0
-<U96F6> \xB9\x73 |0
-<U96F7> \xB9\x70 |0
-<U96F8> \xE0\xD8 |0
-<U96F9> \xB9\x72 |0
-<U96FA> \xE0\xD6 |0
-<U96FB> \xB9\x71 |0
-<U96FD> \xE0\xD7 |0
-<U96FF> \xE4\xBD |0
-<U9700> \xBB\xDD |0
-<U9702> \xE8\xAF |0
-<U9704> \xBE\x5D |0
-<U9705> \xE8\xAD |0
-<U9706> \xBE\x5E |0
-<U9707> \xBE\x5F |0
-<U9708> \xE8\xAE |0
-<U9709> \xBE\x60 |0
-<U970B> \xEC\x51 |0
-<U970D> \xC0\x4E |0
-<U970E> \xC0\x4B |0
-<U970F> \xC0\x50 |0
-<U9710> \xEC\x53 |0
-<U9711> \xC0\x4C |0
-<U9712> \xEC\x52 |0
-<U9713> \xC0\x4F |0
-<U9716> \xC0\x4D |0
-<U9718> \xEE\xF9 |0
-<U9719> \xEE\xFB |0
-<U971C> \xC1\xF7 |0
-<U971D> \xEE\xFA |0
-<U971E> \xC1\xF8 |0
-<U971F> \xEE\xF8 |0
-<U9720> \xEE\xF7 |0
-<U9722> \xF1\x77 |0
-<U9723> \xF1\x76 |0
-<U9724> \xC2\xFC |0
-<U9725> \xF1\x78 |0
-<U9726> \xF3\x7E |0
-<U9727> \xC3\xFA |0
-<U9728> \xF3\x7D |0
-<U9729> \xF3\x7A |0
-<U972A> \xC3\xF9 |0
-<U972B> \xF3\x7B |0
-<U972C> \xF3\x7C |0
-<U972E> \xF5\x48 |0
-<U972F> \xF5\x49 |0
-<U9730> \xC4\xC5 |0
-<U9732> \xC5\x53 |0
-<U9735> \xF6\x6E |0
-<U9738> \xC5\x51 |0
-<U9739> \xC5\x52 |0
-<U973A> \xF6\x6F |0
-<U973D> \xC5\xB4 |0
-<U973E> \xC5\xB5 |0
-<U973F> \xF7\x71 |0
-<U9742> \xC6\x45 |0
-<U9743> \xF8\xCF |0
-<U9744> \xC6\x47 |0
-<U9746> \xF8\xCE |0
-<U9747> \xF8\xD0 |0
-<U9748> \xC6\x46 |0
-<U9749> \xF9\x57 |0
-<U974B> \xF9\xAD |0
-<U9752> \xAB\x43 |0
-<U9756> \xB9\x74 |0
-<U9758> \xE4\xBE |0
-<U975A> \xE8\xB0 |0
-<U975B> \xC0\x51 |0
-<U975C> \xC0\x52 |0
-<U975E> \xAB\x44 |0
-<U9760> \xBE\x61 |0
-<U9761> \xC3\xFB |0
-<U9762> \xAD\xB1 |0
-<U9766> \xC0\x53 |0
-<U9768> \xC5\xE2 |0
-<U9769> \xAD\xB2 |0
-<U976A> \xD8\x4D |0
-<U976C> \xDC\xA9 |0
-<U976E> \xDC\xAB |0
-<U9770> \xDC\xAA |0
-<U9772> \xE0\xDD |0
-<U9773> \xE0\xDA |0
-<U9774> \xB9\x75 |0
-<U9776> \xB9\x76 |0
-<U9777> \xE0\xDB |0
-<U9778> \xE0\xDC |0
-<U977A> \xE4\xC0 |0
-<U977B> \xE4\xC5 |0
-<U977C> \xBB\xDE |0
-<U977D> \xE4\xBF |0
-<U977E> \xE4\xC1 |0
-<U977F> \xE4\xC8 |0
-<U9780> \xE4\xC3 |0
-<U9781> \xE4\xC7 |0
-<U9782> \xE4\xC4 |0
-<U9783> \xE4\xC2 |0
-<U9784> \xE4\xC6 |0
-<U9785> \xBB\xDF |0
-<U9788> \xE8\xB3 |0
-<U978A> \xE8\xB1 |0
-<U978B> \xBE\x63 |0
-<U978D> \xBE\x62 |0
-<U978E> \xE8\xB2 |0
-<U978F> \xBE\x64 |0
-<U9794> \xEC\x56 |0
-<U9797> \xEC\x55 |0
-<U9798> \xC0\x54 |0
-<U9799> \xEC\x54 |0
-<U979A> \xEE\xFC |0
-<U979C> \xEE\xFE |0
-<U979D> \xEF\x41 |0
-<U979E> \xEF\x40 |0
-<U97A0> \xC1\xF9 |0
-<U97A1> \xEE\xFD |0
-<U97A2> \xF1\xA1 |0
-<U97A3> \xC2\xFD |0
-<U97A4> \xF1\x7D |0
-<U97A5> \xF1\xA2 |0
-<U97A6> \xC2\xFE |0
-<U97A8> \xF1\x7B |0
-<U97AA> \xF1\x7E |0
-<U97AB> \xF1\x7C |0
-<U97AC> \xF1\x79 |0
-<U97AD> \xC3\x40 |0
-<U97AE> \xF1\x7A |0
-<U97B3> \xF3\xA1 |0
-<U97B6> \xF3\xA3 |0
-<U97B7> \xF3\xA2 |0
-<U97B9> \xF5\x4A |0
-<U97BB> \xF5\x4B |0
-<U97BF> \xF6\x70 |0
-<U97C1> \xC5\xB7 |0
-<U97C3> \xC5\xB6 |0
-<U97C4> \xF8\x4F |0
-<U97C5> \xF8\x50 |0
-<U97C6> \xC6\x48 |0
-<U97C7> \xF8\xD1 |0
-<U97C9> \xC6\x69 |0
-<U97CB> \xAD\xB3 |0
-<U97CC> \xB6\xB4 |0
-<U97CD> \xE4\xCA |0
-<U97CE> \xE4\xC9 |0
-<U97CF> \xE8\xB5 |0
-<U97D0> \xE8\xB4 |0
-<U97D3> \xC1\xFA |0
-<U97D4> \xEF\x43 |0
-<U97D5> \xEF\x42 |0
-<U97D6> \xF1\xA5 |0
-<U97D7> \xF1\xA3 |0
-<U97D8> \xF1\xA6 |0
-<U97D9> \xF1\xA4 |0
-<U97DC> \xC3\xFC |0
-<U97DD> \xF3\xA4 |0
-<U97DE> \xF3\xA5 |0
-<U97DF> \xF3\xA6 |0
-<U97E1> \xF6\x71 |0
-<U97E3> \xF7\x72 |0
-<U97E5> \xF8\xD2 |0
-<U97ED> \xAD\xB4 |0
-<U97F0> \xEC\x57 |0
-<U97F1> \xEF\x44 |0
-<U97F3> \xAD\xB5 |0
-<U97F6> \xBB\xE0 |0
-<U97F8> \xEC\x58 |0
-<U97F9> \xC3\x41 |0
-<U97FA> \xF1\xA7 |0
-<U97FB> \xC3\xFD |0
-<U97FD> \xF5\x4C |0
-<U97FE> \xF5\x4D |0
-<U97FF> \xC5\x54 |0
-<U9800> \xF8\x51 |0
-<U9801> \xAD\xB6 |0
-<U9802> \xB3\xBB |0
-<U9803> \xB3\xBC |0
-<U9804> \xD8\x4E |0
-<U9805> \xB6\xB5 |0
-<U9806> \xB6\xB6 |0
-<U9807> \xDC\xAC |0
-<U9808> \xB6\xB7 |0
-<U980A> \xB9\x7A |0
-<U980C> \xB9\x7C |0
-<U980D> \xE0\xDF |0
-<U980E> \xE0\xE0 |0
-<U980F> \xE0\xDE |0
-<U9810> \xB9\x77 |0
-<U9811> \xB9\x78 |0
-<U9812> \xB9\x7B |0
-<U9813> \xB9\x79 |0
-<U9816> \xE4\xCB |0
-<U9817> \xBB\xE1 |0
-<U9818> \xBB\xE2 |0
-<U981B> \xE8\xBC |0
-<U981C> \xBE\x67 |0
-<U981D> \xE8\xB7 |0
-<U981E> \xE8\xB6 |0
-<U9820> \xE8\xBB |0
-<U9821> \xBE\x65 |0
-<U9824> \xC0\x5B |0
-<U9826> \xE8\xB8 |0
-<U9827> \xE8\xBD |0
-<U9828> \xE8\xBA |0
-<U9829> \xE8\xB9 |0
-<U982B> \xBE\x66 |0
-<U982D> \xC0\x59 |0
-<U982F> \xEC\x5A |0
-<U9830> \xC0\x55 |0
-<U9832> \xEC\x5B |0
-<U9835> \xEC\x59 |0
-<U9837> \xC0\x58 |0
-<U9838> \xC0\x56 |0
-<U9839> \xC0\x5A |0
-<U983B> \xC0\x57 |0
-<U9841> \xEF\x45 |0
-<U9843> \xEF\x4A |0
-<U9844> \xEF\x46 |0
-<U9845> \xEF\x49 |0
-<U9846> \xC1\xFB |0
-<U9848> \xED\xD4 |0
-<U9849> \xEF\x48 |0
-<U984A> \xEF\x47 |0
-<U984C> \xC3\x44 |0
-<U984D> \xC3\x42 |0
-<U984E> \xC3\x45 |0
-<U984F> \xC3\x43 |0
-<U9850> \xF1\xA8 |0
-<U9851> \xF1\xA9 |0
-<U9852> \xF1\xAA |0
-<U9853> \xC3\x46 |0
-<U9857> \xF3\xAA |0
-<U9858> \xC4\x40 |0
-<U9859> \xF3\xA8 |0
-<U985B> \xC4\x41 |0
-<U985C> \xF3\xA7 |0
-<U985D> \xF3\xA9 |0
-<U985E> \xC3\xFE |0
-<U985F> \xF5\x51 |0
-<U9860> \xF5\x4E |0
-<U9862> \xF5\x4F |0
-<U9863> \xF5\x50 |0
-<U9864> \xF6\x72 |0
-<U9865> \xC5\x56 |0
-<U9867> \xC5\x55 |0
-<U9869> \xF7\x74 |0
-<U986A> \xF7\x73 |0
-<U986B> \xC5\xB8 |0
-<U986F> \xC5\xE3 |0
-<U9870> \xC6\x49 |0
-<U9871> \xC6\x60 |0
-<U9872> \xF9\x58 |0
-<U9873> \xF9\xAE |0
-<U9874> \xF9\xAF |0
-<U98A8> \xAD\xB7 |0
-<U98A9> \xDC\xAD |0
-<U98AC> \xE0\xE1 |0
-<U98AD> \xE4\xCC |0
-<U98AE> \xE4\xCD |0
-<U98AF> \xBB\xE3 |0
-<U98B1> \xBB\xE4 |0
-<U98B2> \xE8\xBE |0
-<U98B3> \xBE\x68 |0
-<U98B6> \xC1\xFC |0
-<U98B8> \xF1\xAB |0
-<U98BA> \xC3\x47 |0
-<U98BB> \xF3\xAD |0
-<U98BC> \xC4\x42 |0
-<U98BD> \xF3\xAC |0
-<U98BE> \xF3\xAE |0
-<U98BF> \xF3\xAB |0
-<U98C0> \xF6\x75 |0
-<U98C1> \xF5\x52 |0
-<U98C2> \xF5\x53 |0
-<U98C4> \xC4\xC6 |0
-<U98C6> \xF6\x74 |0
-<U98C9> \xF6\x73 |0
-<U98CB> \xF7\x75 |0
-<U98CC> \xF9\xB0 |0
-<U98DB> \xAD\xB8 |0
-<U98DF> \xAD\xB9 |0
-<U98E2> \xB0\xA7 |0
-<U98E3> \xD4\x48 |0
-<U98E5> \xD8\x4F |0
-<U98E7> \xB6\xB8 |0
-<U98E9> \xB6\xBB |0
-<U98EA> \xB6\xB9 |0
-<U98EB> \xDC\xAE |0
-<U98ED> \xB6\xBD |0
-<U98EF> \xB6\xBA |0
-<U98F2> \xB6\xBC |0
-<U98F4> \xB9\x7E |0
-<U98F6> \xE0\xE2 |0
-<U98F9> \xE0\xE3 |0
-<U98FA> \xE8\xC0 |0
-<U98FC> \xB9\x7D |0
-<U98FD> \xB9\xA1 |0
-<U98FE> \xB9\xA2 |0
-<U9900> \xE4\xCF |0
-<U9902> \xE4\xCE |0
-<U9903> \xBB\xE5 |0
-<U9905> \xBB\xE6 |0
-<U9907> \xE4\xD0 |0
-<U9908> \xE8\xBF |0
-<U9909> \xBB\xE8 |0
-<U990A> \xBE\x69 |0
-<U990C> \xBB\xE7 |0
-<U9910> \xC0\x5C |0
-<U9911> \xE8\xC1 |0
-<U9912> \xBE\x6B |0
-<U9913> \xBE\x6A |0
-<U9914> \xE8\xC2 |0
-<U9915> \xE8\xC5 |0
-<U9916> \xE8\xC3 |0
-<U9917> \xE8\xC4 |0
-<U9918> \xBE\x6C |0
-<U991A> \xC0\x61 |0
-<U991B> \xC0\x5F |0
-<U991E> \xC0\x5E |0
-<U991F> \xEC\x5D |0
-<U9921> \xC0\x60 |0
-<U9924> \xEC\x5C |0
-<U9925> \xEF\x4B |0
-<U9927> \xEC\x5E |0
-<U9928> \xC0\x5D |0
-<U9929> \xEC\x5F |0
-<U992A> \xEF\x4E |0
-<U992B> \xEF\x4C |0
-<U992C> \xEF\x4D |0
-<U992D> \xEF\x52 |0
-<U992E> \xC3\x4B |0
-<U992F> \xEF\x51 |0
-<U9930> \xEF\x54 |0
-<U9931> \xEF\x53 |0
-<U9932> \xEF\x50 |0
-<U9933> \xEF\x4F |0
-<U9935> \xC1\xFD |0
-<U993A> \xF1\xAE |0
-<U993C> \xF1\xAD |0
-<U993D> \xC3\x4A |0
-<U993E> \xC3\x48 |0
-<U993F> \xC3\x49 |0
-<U9941> \xF1\xAC |0
-<U9943> \xF3\xB1 |0
-<U9945> \xC4\x43 |0
-<U9947> \xF3\xB0 |0
-<U9948> \xF3\xAF |0
-<U9949> \xC4\x44 |0
-<U994B> \xF5\x58 |0
-<U994C> \xF5\x57 |0
-<U994E> \xF5\x55 |0
-<U9950> \xF5\x54 |0
-<U9951> \xC4\xC8 |0
-<U9952> \xC4\xC7 |0
-<U9953> \xF5\x59 |0
-<U9954> \xF7\x76 |0
-<U9955> \xC5\xB9 |0
-<U9956> \xF6\x77 |0
-<U9957> \xC5\x57 |0
-<U9958> \xF6\x76 |0
-<U9959> \xF5\x56 |0
-<U995B> \xF7\x77 |0
-<U995C> \xC5\xE4 |0
-<U995E> \xC6\x61 |0
-<U995F> \xF9\x59 |0
-<U9961> \xF9\xB1 |0
-<U9996> \xAD\xBA |0
-<U9997> \xD8\x50 |0
-<U9998> \xEF\x55 |0
-<U9999> \xAD\xBB |0
-<U999C> \xE4\xD2 |0
-<U999D> \xE4\xD1 |0
-<U999E> \xEC\x60 |0
-<U99A1> \xEF\x57 |0
-<U99A3> \xEF\x56 |0
-<U99A5> \xC3\x4C |0
-<U99A6> \xF3\xB2 |0
-<U99A7> \xF3\xB3 |0
-<U99A8> \xC4\xC9 |0
-<U99AB> \xF9\xB2 |0
-<U99AC> \xB0\xA8 |0
-<U99AD> \xB6\xBF |0
-<U99AE> \xB6\xBE |0
-<U99AF> \xE0\xE4 |0
-<U99B0> \xE0\xE6 |0
-<U99B1> \xB9\xA4 |0
-<U99B2> \xE0\xE5 |0
-<U99B3> \xB9\xA3 |0
-<U99B4> \xB9\xA5 |0
-<U99B5> \xE0\xE7 |0
-<U99B9> \xE4\xD4 |0
-<U99BA> \xE4\xD6 |0
-<U99BB> \xE4\xD5 |0
-<U99BD> \xE4\xD8 |0
-<U99C1> \xBB\xE9 |0
-<U99C2> \xE4\xD7 |0
-<U99C3> \xE4\xD3 |0
-<U99C7> \xE4\xD9 |0
-<U99C9> \xE8\xCC |0
-<U99CB> \xE8\xCF |0
-<U99CC> \xE8\xD1 |0
-<U99CD> \xE8\xC7 |0
-<U99CE> \xE8\xCB |0
-<U99CF> \xE8\xC8 |0
-<U99D0> \xBE\x6E |0
-<U99D1> \xBE\x71 |0
-<U99D2> \xBE\x73 |0
-<U99D3> \xE8\xC9 |0
-<U99D4> \xE8\xCA |0
-<U99D5> \xBE\x72 |0
-<U99D6> \xE8\xCD |0
-<U99D7> \xE8\xD0 |0
-<U99D8> \xE8\xCE |0
-<U99D9> \xBE\x74 |0
-<U99DB> \xBE\x70 |0
-<U99DC> \xE8\xC6 |0
-<U99DD> \xBE\x6D |0
-<U99DF> \xBE\x6F |0
-<U99E2> \xC0\x63 |0
-<U99E3> \xEC\x66 |0
-<U99E4> \xEC\x64 |0
-<U99E5> \xEC\x63 |0
-<U99E7> \xEC\x69 |0
-<U99E9> \xEC\x68 |0
-<U99EA> \xEC\x67 |0
-<U99EC> \xEC\x62 |0
-<U99ED> \xC0\x62 |0
-<U99EE> \xEC\x61 |0
-<U99F0> \xEC\x65 |0
-<U99F1> \xC0\x64 |0
-<U99F4> \xEF\x5A |0
-<U99F6> \xEF\x5E |0
-<U99F7> \xEF\x5B |0
-<U99F8> \xEF\x5D |0
-<U99F9> \xEF\x5C |0
-<U99FA> \xEF\x59 |0
-<U99FB> \xEF\x5F |0
-<U99FC> \xEF\x62 |0
-<U99FD> \xEF\x60 |0
-<U99FE> \xEF\x61 |0
-<U99FF> \xC2\x40 |0
-<U9A01> \xC1\xFE |0
-<U9A02> \xEF\x58 |0
-<U9A03> \xEF\x63 |0
-<U9A04> \xF1\xB3 |0
-<U9A05> \xF1\xB6 |0
-<U9A06> \xF1\xB8 |0
-<U9A07> \xF1\xB7 |0
-<U9A09> \xF1\xB1 |0
-<U9A0A> \xF1\xB5 |0
-<U9A0B> \xF1\xB0 |0
-<U9A0D> \xF1\xB2 |0
-<U9A0E> \xC3\x4D |0
-<U9A0F> \xF1\xAF |0
-<U9A11> \xF1\xB4 |0
-<U9A14> \xF3\xC0 |0
-<U9A15> \xF3\xB5 |0
-<U9A16> \xC4\x45 |0
-<U9A19> \xC4\x46 |0
-<U9A1A> \xF3\xB4 |0
-<U9A1B> \xF3\xB9 |0
-<U9A1C> \xF3\xBF |0
-<U9A1D> \xF3\xB7 |0
-<U9A1E> \xF3\xBE |0
-<U9A20> \xF3\xBB |0
-<U9A22> \xF3\xBA |0
-<U9A23> \xF3\xBD |0
-<U9A24> \xF3\xB8 |0
-<U9A25> \xF3\xB6 |0
-<U9A27> \xF3\xBC |0
-<U9A29> \xF5\x60 |0
-<U9A2A> \xF5\x5E |0
-<U9A2B> \xC4\xCA |0
-<U9A2C> \xF5\x5D |0
-<U9A2D> \xF5\x63 |0
-<U9A2E> \xF5\x61 |0
-<U9A30> \xC4\xCB |0
-<U9A31> \xF5\x5C |0
-<U9A32> \xF5\x5A |0
-<U9A34> \xF5\x5B |0
-<U9A35> \xC4\xCD |0
-<U9A36> \xF5\x5F |0
-<U9A37> \xC4\xCC |0
-<U9A38> \xF5\x62 |0
-<U9A39> \xF6\x78 |0
-<U9A3A> \xF6\x7E |0
-<U9A3D> \xF6\x79 |0
-<U9A3E> \xC5\x5B |0
-<U9A3F> \xF6\xA1 |0
-<U9A40> \xC5\x5A |0
-<U9A41> \xF6\x7D |0
-<U9A42> \xF6\x7C |0
-<U9A43> \xC5\x59 |0
-<U9A44> \xF6\x7B |0
-<U9A45> \xC5\x58 |0
-<U9A46> \xF6\x7A |0
-<U9A48> \xF7\x7D |0
-<U9A49> \xF7\xA1 |0
-<U9A4A> \xF7\x7E |0
-<U9A4C> \xF7\x7B |0
-<U9A4D> \xC5\xBB |0
-<U9A4E> \xF7\x78 |0
-<U9A4F> \xF7\x7C |0
-<U9A50> \xF7\xA3 |0
-<U9A52> \xF7\xA2 |0
-<U9A53> \xF7\x79 |0
-<U9A54> \xF7\x7A |0
-<U9A55> \xC5\xBA |0
-<U9A56> \xF8\x52 |0
-<U9A57> \xC5\xE7 |0
-<U9A59> \xF8\x53 |0
-<U9A5A> \xC5\xE5 |0
-<U9A5B> \xC5\xE6 |0
-<U9A5E> \xF8\xD3 |0
-<U9A5F> \xC6\x4A |0
-<U9A60> \xF9\x76 |0
-<U9A62> \xC6\x6A |0
-<U9A64> \xF9\xB3 |0
-<U9A65> \xC6\x6B |0
-<U9A66> \xF9\xB4 |0
-<U9A67> \xF9\xB5 |0
-<U9A68> \xF9\xC3 |0
-<U9A69> \xF9\xC2 |0
-<U9A6A> \xC6\x7A |0
-<U9A6B> \xF9\xCD |0
-<U9AA8> \xB0\xA9 |0
-<U9AAB> \xE0\xE9 |0
-<U9AAD> \xE0\xE8 |0
-<U9AAF> \xBB\xEA |0
-<U9AB0> \xBB\xEB |0
-<U9AB1> \xE4\xDA |0
-<U9AB3> \xE8\xD2 |0
-<U9AB4> \xEC\x6C |0
-<U9AB7> \xBE\x75 |0
-<U9AB8> \xC0\x65 |0
-<U9AB9> \xEC\x6A |0
-<U9ABB> \xEC\x6D |0
-<U9ABC> \xC0\x66 |0
-<U9ABE> \xEF\x64 |0
-<U9ABF> \xEC\x6B |0
-<U9AC0> \xF1\xB9 |0
-<U9AC1> \xC3\x4E |0
-<U9AC2> \xF3\xC1 |0
-<U9AC6> \xF5\x66 |0
-<U9AC7> \xF5\x64 |0
-<U9ACA> \xF5\x65 |0
-<U9ACD> \xF6\xA2 |0
-<U9ACF> \xC5\x5C |0
-<U9AD0> \xF7\xA4 |0
-<U9AD1> \xC5\xEA |0
-<U9AD2> \xC5\xBC |0
-<U9AD3> \xC5\xE8 |0
-<U9AD4> \xC5\xE9 |0
-<U9AD5> \xF8\xD4 |0
-<U9AD6> \xC6\x62 |0
-<U9AD8> \xB0\xAA |0
-<U9ADC> \xF1\xBA |0
-<U9ADF> \xD4\x49 |0
-<U9AE1> \xB9\xA6 |0
-<U9AE3> \xE4\xDB |0
-<U9AE6> \xBB\xEC |0
-<U9AE7> \xE4\xDC |0
-<U9AEB> \xE8\xD4 |0
-<U9AEC> \xE8\xD3 |0
-<U9AED> \xC0\x68 |0
-<U9AEE> \xBE\x76 |0
-<U9AEF> \xBE\x77 |0
-<U9AF1> \xE8\xD7 |0
-<U9AF2> \xE8\xD6 |0
-<U9AF3> \xE8\xD5 |0
-<U9AF6> \xEC\x6E |0
-<U9AF7> \xEC\x71 |0
-<U9AF9> \xEC\x70 |0
-<U9AFA> \xEC\x6F |0
-<U9AFB> \xC0\x67 |0
-<U9AFC> \xEF\x68 |0
-<U9AFD> \xEF\x66 |0
-<U9AFE> \xEF\x65 |0
-<U9B01> \xEF\x67 |0
-<U9B03> \xC3\x4F |0
-<U9B04> \xF1\xBC |0
-<U9B05> \xF1\xBD |0
-<U9B06> \xC3\x50 |0
-<U9B08> \xF1\xBB |0
-<U9B0A> \xF3\xC3 |0
-<U9B0B> \xF3\xC2 |0
-<U9B0C> \xF3\xC5 |0
-<U9B0D> \xC4\x47 |0
-<U9B0E> \xF3\xC4 |0
-<U9B10> \xF5\x67 |0
-<U9B11> \xF5\x69 |0
-<U9B12> \xF5\x68 |0
-<U9B15> \xF6\xA3 |0
-<U9B16> \xF6\xA6 |0
-<U9B17> \xF6\xA4 |0
-<U9B18> \xF6\xA5 |0
-<U9B19> \xF7\xA5 |0
-<U9B1A> \xC5\xBD |0
-<U9B1E> \xF8\x54 |0
-<U9B1F> \xF8\x55 |0
-<U9B20> \xF8\x56 |0
-<U9B22> \xC6\x4B |0
-<U9B23> \xC6\x63 |0
-<U9B24> \xF9\xB6 |0
-<U9B25> \xB0\xAB |0
-<U9B27> \xBE\x78 |0
-<U9B28> \xC0\x69 |0
-<U9B29> \xF1\xBE |0
-<U9B2B> \xF7\xA6 |0
-<U9B2E> \xF9\xC4 |0
-<U9B2F> \xD4\x4A |0
-<U9B31> \xC6\x7B |0
-<U9B32> \xB0\xAC |0
-<U9B33> \xEC\x72 |0
-<U9B35> \xF1\xBF |0
-<U9B37> \xF3\xC6 |0
-<U9B3A> \xF6\xA7 |0
-<U9B3B> \xF7\xA7 |0
-<U9B3C> \xB0\xAD |0
-<U9B3E> \xE4\xDD |0
-<U9B3F> \xE4\xDE |0
-<U9B41> \xBB\xED |0
-<U9B42> \xBB\xEE |0
-<U9B43> \xE8\xD9 |0
-<U9B44> \xBE\x7A |0
-<U9B45> \xBE\x79 |0
-<U9B46> \xE8\xD8 |0
-<U9B48> \xEF\x69 |0
-<U9B4A> \xF1\xC0 |0
-<U9B4B> \xF1\xC2 |0
-<U9B4C> \xF1\xC1 |0
-<U9B4D> \xC3\x53 |0
-<U9B4E> \xC3\x52 |0
-<U9B4F> \xC3\x51 |0
-<U9B51> \xC5\x5E |0
-<U9B52> \xF6\xA8 |0
-<U9B54> \xC5\x5D |0
-<U9B55> \xF7\xA9 |0
-<U9B56> \xF7\xA8 |0
-<U9B58> \xC6\x4C |0
-<U9B59> \xF8\xD5 |0
-<U9B5A> \xB3\xBD |0
-<U9B5B> \xE0\xEA |0
-<U9B5F> \xE4\xE1 |0
-<U9B60> \xE4\xDF |0
-<U9B61> \xE4\xE0 |0
-<U9B64> \xE8\xE2 |0
-<U9B66> \xE8\xDD |0
-<U9B67> \xE8\xDA |0
-<U9B68> \xE8\xE1 |0
-<U9B6C> \xE8\xE3 |0
-<U9B6F> \xBE\x7C |0
-<U9B70> \xE8\xE0 |0
-<U9B71> \xE8\xDC |0
-<U9B74> \xE8\xDB |0
-<U9B75> \xE8\xDF |0
-<U9B76> \xE8\xDE |0
-<U9B77> \xBE\x7B |0
-<U9B7A> \xEC\x7D |0
-<U9B7B> \xEC\x78 |0
-<U9B7C> \xEC\x76 |0
-<U9B7D> \xEC\xA1 |0
-<U9B7E> \xEC\x77 |0
-<U9B80> \xEC\x73 |0
-<U9B82> \xEC\x79 |0
-<U9B85> \xEC\x74 |0
-<U9B86> \xEF\x72 |0
-<U9B87> \xEC\x75 |0
-<U9B88> \xEC\xA2 |0
-<U9B90> \xEC\x7C |0
-<U9B91> \xC0\x6A |0
-<U9B92> \xEC\x7B |0
-<U9B93> \xEC\x7A |0
-<U9B95> \xEC\x7E |0
-<U9B9A> \xEF\x6A |0
-<U9B9B> \xEF\x6D |0
-<U9B9E> \xEF\x6C |0
-<U9BA0> \xEF\x74 |0
-<U9BA1> \xEF\x6F |0
-<U9BA2> \xEF\x73 |0
-<U9BA4> \xEF\x71 |0
-<U9BA5> \xEF\x70 |0
-<U9BA6> \xEF\x6E |0
-<U9BA8> \xEF\x6B |0
-<U9BAA> \xC2\x43 |0
-<U9BAB> \xC2\x42 |0
-<U9BAD> \xC2\x44 |0
-<U9BAE> \xC2\x41 |0
-<U9BAF> \xEF\x75 |0
-<U9BB5> \xF1\xC8 |0
-<U9BB6> \xF1\xCB |0
-<U9BB8> \xF1\xC9 |0
-<U9BB9> \xF1\xCD |0
-<U9BBD> \xF1\xCE |0
-<U9BBF> \xF1\xC6 |0
-<U9BC0> \xC3\x58 |0
-<U9BC1> \xF1\xC7 |0
-<U9BC3> \xF1\xC5 |0
-<U9BC4> \xF1\xCC |0
-<U9BC6> \xF1\xC4 |0
-<U9BC7> \xF1\xC3 |0
-<U9BC8> \xC3\x57 |0
-<U9BC9> \xC3\x55 |0
-<U9BCA> \xC3\x54 |0
-<U9BD3> \xF1\xCA |0
-<U9BD4> \xF3\xCF |0
-<U9BD5> \xF3\xD5 |0
-<U9BD6> \xC4\x4A |0
-<U9BD7> \xF3\xD0 |0
-<U9BD9> \xF3\xD3 |0
-<U9BDA> \xF3\xD7 |0
-<U9BDB> \xC4\x4B |0
-<U9BDC> \xF3\xD2 |0
-<U9BDE> \xF3\xCA |0
-<U9BE0> \xF3\xC9 |0
-<U9BE1> \xF3\xD6 |0
-<U9BE2> \xF3\xCD |0
-<U9BE4> \xF3\xCB |0
-<U9BE5> \xF3\xD4 |0
-<U9BE6> \xF3\xCC |0
-<U9BE7> \xC4\x49 |0
-<U9BE8> \xC4\x48 |0
-<U9BEA> \xF3\xC7 |0
-<U9BEB> \xF3\xC8 |0
-<U9BEC> \xF3\xD1 |0
-<U9BF0> \xF3\xCE |0
-<U9BF7> \xF5\x6C |0
-<U9BF8> \xF5\x6F |0
-<U9BFD> \xC3\x56 |0
-<U9C05> \xF5\x6D |0
-<U9C06> \xF5\x73 |0
-<U9C07> \xF5\x71 |0
-<U9C08> \xF5\x6B |0
-<U9C09> \xF5\x76 |0
-<U9C0B> \xF5\x6A |0
-<U9C0D> \xC4\xCF |0
-<U9C0E> \xF5\x72 |0
-<U9C12> \xF5\x6E |0
-<U9C13> \xC4\xCE |0
-<U9C14> \xF5\x75 |0
-<U9C17> \xF5\x74 |0
-<U9C1C> \xF6\xAB |0
-<U9C1D> \xF6\xAA |0
-<U9C21> \xF6\xB1 |0
-<U9C23> \xF6\xAD |0
-<U9C24> \xF6\xB0 |0
-<U9C25> \xC5\x60 |0
-<U9C28> \xF6\xAE |0
-<U9C29> \xF6\xAF |0
-<U9C2B> \xF6\xA9 |0
-<U9C2C> \xF6\xAC |0
-<U9C2D> \xC5\x5F |0
-<U9C31> \xC5\xBF |0
-<U9C32> \xF7\xB4 |0
-<U9C33> \xF7\xAF |0
-<U9C34> \xF7\xB3 |0
-<U9C36> \xF7\xB6 |0
-<U9C37> \xF7\xB2 |0
-<U9C39> \xF7\xAE |0
-<U9C3B> \xC5\xC1 |0
-<U9C3C> \xF7\xB1 |0
-<U9C3D> \xF7\xB5 |0
-<U9C3E> \xC5\xC0 |0
-<U9C3F> \xF7\xAC |0
-<U9C40> \xF5\x70 |0
-<U9C41> \xF7\xB0 |0
-<U9C44> \xF7\xAD |0
-<U9C46> \xF7\xAA |0
-<U9C48> \xF7\xAB |0
-<U9C49> \xC5\xBE |0
-<U9C4A> \xF8\x5A |0
-<U9C4B> \xF8\x5C |0
-<U9C4C> \xF8\x5F |0
-<U9C4D> \xF8\x5B |0
-<U9C4E> \xF8\x60 |0
-<U9C50> \xF8\x59 |0
-<U9C52> \xF8\x57 |0
-<U9C54> \xC5\xEB |0
-<U9C55> \xF8\x5D |0
-<U9C56> \xC5\xED |0
-<U9C57> \xC5\xEC |0
-<U9C58> \xF8\x58 |0
-<U9C59> \xF8\x5E |0
-<U9C5E> \xF8\xDA |0
-<U9C5F> \xC6\x4D |0
-<U9C60> \xF8\xDB |0
-<U9C62> \xF8\xD9 |0
-<U9C63> \xF8\xD6 |0
-<U9C66> \xF8\xD8 |0
-<U9C67> \xF8\xD7 |0
-<U9C68> \xF9\x5A |0
-<U9C6D> \xF9\x5C |0
-<U9C6E> \xF9\x5B |0
-<U9C71> \xF9\x79 |0
-<U9C73> \xF9\x78 |0
-<U9C74> \xF9\x77 |0
-<U9C75> \xF9\x7A |0
-<U9C77> \xC6\x73 |0
-<U9C78> \xC6\x74 |0
-<U9C79> \xF9\xCA |0
-<U9C7A> \xF9\xCE |0
-<U9CE5> \xB3\xBE |0
-<U9CE6> \xDC\xAF |0
-<U9CE7> \xE0\xED |0
-<U9CE9> \xB9\xA7 |0
-<U9CEA> \xE0\xEB |0
-<U9CED> \xE0\xEC |0
-<U9CF1> \xE4\xE2 |0
-<U9CF2> \xE4\xE3 |0
-<U9CF3> \xBB\xF1 |0
-<U9CF4> \xBB\xEF |0
-<U9CF5> \xE4\xE4 |0
-<U9CF6> \xBB\xF0 |0
-<U9CF7> \xE8\xE8 |0
-<U9CF9> \xE8\xEB |0
-<U9CFA> \xE8\xE5 |0
-<U9CFB> \xE8\xEC |0
-<U9CFC> \xE8\xE4 |0
-<U9CFD> \xE8\xE6 |0
-<U9CFF> \xE8\xE7 |0
-<U9D00> \xE8\xEA |0
-<U9D03> \xBE\xA1 |0
-<U9D04> \xE8\xEF |0
-<U9D05> \xE8\xEE |0
-<U9D06> \xBE\x7D |0
-<U9D07> \xE8\xE9 |0
-<U9D08> \xE8\xED |0
-<U9D09> \xBE\x7E |0
-<U9D10> \xEC\xAC |0
-<U9D12> \xC0\x6F |0
-<U9D14> \xEC\xA7 |0
-<U9D15> \xC0\x6B |0
-<U9D17> \xEC\xA4 |0
-<U9D18> \xEC\xAA |0
-<U9D19> \xEC\xAD |0
-<U9D1B> \xC0\x70 |0
-<U9D1D> \xEC\xA9 |0
-<U9D1E> \xEC\xA6 |0
-<U9D1F> \xEC\xAE |0
-<U9D20> \xEC\xA5 |0
-<U9D22> \xEC\xAB |0
-<U9D23> \xC0\x6C |0
-<U9D25> \xEC\xA3 |0
-<U9D26> \xC0\x6D |0
-<U9D28> \xC0\x6E |0
-<U9D29> \xEC\xA8 |0
-<U9D2D> \xEF\xA9 |0
-<U9D2E> \xEF\x7A |0
-<U9D2F> \xEF\x7B |0
-<U9D30> \xEF\x7E |0
-<U9D31> \xEF\x7C |0
-<U9D33> \xEF\x76 |0
-<U9D36> \xEF\x79 |0
-<U9D37> \xEF\xA5 |0
-<U9D38> \xEF\x7D |0
-<U9D3B> \xC2\x45 |0
-<U9D3D> \xEF\xA7 |0
-<U9D3E> \xEF\xA4 |0
-<U9D3F> \xC2\x46 |0
-<U9D40> \xEF\xA6 |0
-<U9D41> \xEF\x77 |0
-<U9D42> \xEF\xA2 |0
-<U9D43> \xEF\xA3 |0
-<U9D45> \xEF\xA1 |0
-<U9D4A> \xF1\xD2 |0
-<U9D4B> \xF1\xD4 |0
-<U9D4C> \xF1\xD7 |0
-<U9D4F> \xF1\xD1 |0
-<U9D51> \xC3\x59 |0
-<U9D52> \xF1\xD9 |0
-<U9D53> \xF1\xD0 |0
-<U9D54> \xF1\xDA |0
-<U9D56> \xF1\xD6 |0
-<U9D57> \xF1\xD8 |0
-<U9D58> \xF1\xDC |0
-<U9D59> \xF1\xD5 |0
-<U9D5A> \xF1\xDD |0
-<U9D5B> \xF1\xD3 |0
-<U9D5C> \xF1\xCF |0
-<U9D5D> \xC3\x5A |0
-<U9D5F> \xF1\xDB |0
-<U9D60> \xC3\x5B |0
-<U9D61> \xC4\x4D |0
-<U9D67> \xEF\x78 |0
-<U9D68> \xF3\xF1 |0
-<U9D69> \xF3\xE8 |0
-<U9D6A> \xC4\x4F |0
-<U9D6B> \xF3\xE4 |0
-<U9D6C> \xC4\x50 |0
-<U9D6F> \xF3\xED |0
-<U9D70> \xF3\xE7 |0
-<U9D71> \xF3\xDD |0
-<U9D72> \xC4\x4E |0
-<U9D73> \xF3\xEA |0
-<U9D74> \xF3\xE5 |0
-<U9D75> \xF3\xE6 |0
-<U9D77> \xF3\xD8 |0
-<U9D78> \xF3\xDF |0
-<U9D79> \xF3\xEE |0
-<U9D7B> \xF3\xEB |0
-<U9D7D> \xF3\xE3 |0
-<U9D7F> \xF3\xEF |0
-<U9D80> \xF3\xDE |0
-<U9D81> \xF3\xD9 |0
-<U9D82> \xF3\xEC |0
-<U9D84> \xF3\xDB |0
-<U9D85> \xF3\xE9 |0
-<U9D86> \xF3\xE0 |0
-<U9D87> \xF3\xF0 |0
-<U9D88> \xF3\xDC |0
-<U9D89> \xC4\x4C |0
-<U9D8A> \xF3\xDA |0
-<U9D8B> \xF3\xE1 |0
-<U9D8C> \xF3\xE2 |0
-<U9D90> \xF5\x7D |0
-<U9D92> \xF5\x7B |0
-<U9D94> \xF5\xA2 |0
-<U9D96> \xF5\xAE |0
-<U9D97> \xF5\xA5 |0
-<U9D98> \xF5\x7C |0
-<U9D99> \xF5\x78 |0
-<U9D9A> \xF5\xA7 |0
-<U9D9B> \xF5\x7E |0
-<U9D9C> \xF5\xA3 |0
-<U9D9D> \xF5\x7A |0
-<U9D9E> \xF5\xAA |0
-<U9D9F> \xF5\x77 |0
-<U9DA0> \xF5\xA1 |0
-<U9DA1> \xF5\xA6 |0
-<U9DA2> \xF5\xA8 |0
-<U9DA3> \xF5\xAB |0
-<U9DA4> \xF5\x79 |0
-<U9DA6> \xF5\xAF |0
-<U9DA7> \xF5\xB0 |0
-<U9DA8> \xF5\xA9 |0
-<U9DA9> \xF5\xAD |0
-<U9DAA> \xF5\xA4 |0
-<U9DAC> \xF6\xC1 |0
-<U9DAD> \xF6\xC4 |0
-<U9DAF> \xC5\x61 |0
-<U9DB1> \xF6\xC3 |0
-<U9DB2> \xF6\xC8 |0
-<U9DB3> \xF6\xC6 |0
-<U9DB4> \xC5\x62 |0
-<U9DB5> \xF6\xBD |0
-<U9DB6> \xF6\xB3 |0
-<U9DB7> \xF6\xB2 |0
-<U9DB8> \xC5\x64 |0
-<U9DB9> \xF6\xBF |0
-<U9DBA> \xF6\xC0 |0
-<U9DBB> \xF6\xBC |0
-<U9DBC> \xF6\xB4 |0
-<U9DBE> \xF6\xB9 |0
-<U9DBF> \xF5\xAC |0
-<U9DC1> \xF6\xB5 |0
-<U9DC2> \xC5\x63 |0
-<U9DC3> \xF6\xBB |0
-<U9DC5> \xF6\xBA |0
-<U9DC7> \xF6\xB6 |0
-<U9DC8> \xF6\xC2 |0
-<U9DCA> \xF6\xB7 |0
-<U9DCB> \xF7\xBB |0
-<U9DCC> \xF6\xC5 |0
-<U9DCD> \xF6\xC7 |0
-<U9DCE> \xF6\xBE |0
-<U9DCF> \xF6\xB8 |0
-<U9DD0> \xF7\xBC |0
-<U9DD1> \xF7\xBE |0
-<U9DD2> \xF7\xB8 |0
-<U9DD3> \xC5\xC2 |0
-<U9DD5> \xF7\xC5 |0
-<U9DD6> \xF7\xC3 |0
-<U9DD7> \xC5\xC3 |0
-<U9DD8> \xF7\xC2 |0
-<U9DD9> \xF7\xC1 |0
-<U9DDA> \xF7\xBA |0
-<U9DDB> \xF7\xB7 |0
-<U9DDC> \xF7\xBD |0
-<U9DDD> \xF7\xC6 |0
-<U9DDE> \xF7\xB9 |0
-<U9DDF> \xF7\xBF |0
-<U9DE1> \xF8\x69 |0
-<U9DE2> \xF8\x6E |0
-<U9DE3> \xF8\x64 |0
-<U9DE4> \xF8\x67 |0
-<U9DE5> \xC5\xEE |0
-<U9DE6> \xF8\x6B |0
-<U9DE8> \xF8\x72 |0
-<U9DE9> \xF7\xC0 |0
-<U9DEB> \xF8\x65 |0
-<U9DEC> \xF8\x6F |0
-<U9DED> \xF8\x73 |0
-<U9DEE> \xF8\x6A |0
-<U9DEF> \xF8\x63 |0
-<U9DF0> \xF8\x6D |0
-<U9DF2> \xF8\x6C |0
-<U9DF3> \xF8\x71 |0
-<U9DF4> \xF8\x70 |0
-<U9DF5> \xF7\xC4 |0
-<U9DF6> \xF8\x68 |0
-<U9DF7> \xF8\x62 |0
-<U9DF8> \xF8\x66 |0
-<U9DF9> \xC6\x4E |0
-<U9DFA> \xC6\x4F |0
-<U9DFB> \xF8\x61 |0
-<U9DFD> \xF8\xE6 |0
-<U9DFE> \xF8\xDD |0
-<U9DFF> \xF8\xE5 |0
-<U9E00> \xF8\xE2 |0
-<U9E01> \xF8\xE3 |0
-<U9E02> \xF8\xDC |0
-<U9E03> \xF8\xDF |0
-<U9E04> \xF8\xE7 |0
-<U9E05> \xF8\xE1 |0
-<U9E06> \xF8\xE0 |0
-<U9E07> \xF8\xDE |0
-<U9E09> \xF8\xE4 |0
-<U9E0B> \xF9\x5D |0
-<U9E0D> \xF9\x5E |0
-<U9E0F> \xF9\x60 |0
-<U9E10> \xF9\x5F |0
-<U9E11> \xF9\x62 |0
-<U9E12> \xF9\x61 |0
-<U9E13> \xF9\x7C |0
-<U9E14> \xF9\x7B |0
-<U9E15> \xF9\xB7 |0
-<U9E17> \xF9\xB8 |0
-<U9E19> \xF9\xC5 |0
-<U9E1A> \xC6\x78 |0
-<U9E1B> \xC6\x7C |0
-<U9E1D> \xF9\xCF |0
-<U9E1E> \xC6\x7D |0
-<U9E75> \xB3\xBF |0
-<U9E79> \xC4\xD0 |0
-<U9E7A> \xF6\xC9 |0
-<U9E7C> \xC6\x50 |0
-<U9E7D> \xC6\x51 |0
-<U9E7F> \xB3\xC0 |0
-<U9E80> \xE0\xEE |0
-<U9E82> \xB9\xA8 |0
-<U9E83> \xE8\xF0 |0
-<U9E86> \xEC\xB0 |0
-<U9E87> \xEC\xB1 |0
-<U9E88> \xEC\xAF |0
-<U9E89> \xEF\xAB |0
-<U9E8A> \xEF\xAA |0
-<U9E8B> \xC2\x47 |0
-<U9E8C> \xF1\xDF |0
-<U9E8D> \xEF\xAC |0
-<U9E8E> \xF1\xDE |0
-<U9E91> \xF3\xF3 |0
-<U9E92> \xC4\x51 |0
-<U9E93> \xC4\x53 |0
-<U9E94> \xF3\xF2 |0
-<U9E97> \xC4\x52 |0
-<U9E99> \xF5\xB1 |0
-<U9E9A> \xF5\xB3 |0
-<U9E9B> \xF5\xB2 |0
-<U9E9C> \xF6\xCA |0
-<U9E9D> \xC5\x65 |0
-<U9E9F> \xC5\xEF |0
-<U9EA0> \xF8\xE8 |0
-<U9EA1> \xF9\x63 |0
-<U9EA4> \xF9\xD2 |0
-<U9EA5> \xB3\xC1 |0
-<U9EA7> \xE4\xE5 |0
-<U9EA9> \xBE\xA2 |0
-<U9EAD> \xEC\xB3 |0
-<U9EAE> \xEC\xB2 |0
-<U9EB0> \xEF\xAD |0
-<U9EB4> \xC4\x54 |0
-<U9EB5> \xC4\xD1 |0
-<U9EB6> \xF7\xC7 |0
-<U9EB7> \xF9\xCB |0
-<U9EBB> \xB3\xC2 |0
-<U9EBC> \xBB\xF2 |0
-<U9EBE> \xBE\xA3 |0
-<U9EC0> \xF3\xF4 |0
-<U9EC2> \xF8\x74 |0
-<U9EC3> \xB6\xC0 |0
-<U9EC8> \xEF\xAE |0
-<U9ECC> \xC6\x64 |0
-<U9ECD> \xB6\xC1 |0
-<U9ECE> \xBE\xA4 |0
-<U9ECF> \xC2\x48 |0
-<U9ED0> \xF8\x75 |0
-<U9ED1> \xB6\xC2 |0
-<U9ED3> \xE8\xF1 |0
-<U9ED4> \xC0\x72 |0
-<U9ED5> \xEC\xB4 |0
-<U9ED6> \xEC\xB5 |0
-<U9ED8> \xC0\x71 |0
-<U9EDA> \xEF\xAF |0
-<U9EDB> \xC2\x4C |0
-<U9EDC> \xC2\x4A |0
-<U9EDD> \xC2\x4B |0
-<U9EDE> \xC2\x49 |0
-<U9EDF> \xF1\xE0 |0
-<U9EE0> \xC3\x5C |0
-<U9EE4> \xF5\xB5 |0
-<U9EE5> \xF5\xB4 |0
-<U9EE6> \xF5\xB7 |0
-<U9EE7> \xF5\xB6 |0
-<U9EE8> \xC4\xD2 |0
-<U9EEB> \xF6\xCB |0
-<U9EED> \xF6\xCD |0
-<U9EEE> \xF6\xCC |0
-<U9EEF> \xC5\x66 |0
-<U9EF0> \xF7\xC8 |0
-<U9EF2> \xF8\x76 |0
-<U9EF3> \xF8\x77 |0
-<U9EF4> \xC5\xF0 |0
-<U9EF5> \xF9\x64 |0
-<U9EF6> \xF9\x7D |0
-<U9EF7> \xC6\x75 |0
-<U9EF9> \xDC\xB0 |0
-<U9EFA> \xEC\xB6 |0
-<U9EFB> \xEF\xB0 |0
-<U9EFC> \xF3\xF5 |0
-<U9EFD> \xE0\xEF |0
-<U9EFF> \xEF\xB1 |0
-<U9F00> \xF1\xE2 |0
-<U9F01> \xF1\xE1 |0
-<U9F06> \xF8\x78 |0
-<U9F07> \xC6\x52 |0
-<U9F09> \xF9\x65 |0
-<U9F0A> \xF9\x7E |0
-<U9F0E> \xB9\xA9 |0
-<U9F0F> \xE8\xF2 |0
-<U9F10> \xE8\xF3 |0
-<U9F12> \xEC\xB7 |0
-<U9F13> \xB9\xAA |0
-<U9F15> \xC3\x5D |0
-<U9F16> \xF1\xE3 |0
-<U9F18> \xF6\xCF |0
-<U9F19> \xC5\x67 |0
-<U9F1A> \xF6\xD0 |0
-<U9F1B> \xF6\xCE |0
-<U9F1C> \xF8\x79 |0
-<U9F1E> \xF8\xE9 |0
-<U9F20> \xB9\xAB |0
-<U9F22> \xEF\xB4 |0
-<U9F23> \xEF\xB3 |0
-<U9F24> \xEF\xB2 |0
-<U9F25> \xF1\xE4 |0
-<U9F28> \xF1\xE8 |0
-<U9F29> \xF1\xE7 |0
-<U9F2A> \xF1\xE6 |0
-<U9F2B> \xF1\xE5 |0
-<U9F2C> \xC3\x5E |0
-<U9F2D> \xF3\xF6 |0
-<U9F2E> \xF5\xB9 |0
-<U9F2F> \xC4\xD3 |0
-<U9F30> \xF5\xB8 |0
-<U9F31> \xF6\xD1 |0
-<U9F32> \xF7\xCB |0
-<U9F33> \xF7\xCA |0
-<U9F34> \xC5\xC4 |0
-<U9F35> \xF7\xC9 |0
-<U9F36> \xF8\x7C |0
-<U9F37> \xF8\x7B |0
-<U9F38> \xF8\x7A |0
-<U9F3B> \xBB\xF3 |0
-<U9F3D> \xEC\xB8 |0
-<U9F3E> \xC2\x4D |0
-<U9F40> \xF3\xF7 |0
-<U9F41> \xF3\xF8 |0
-<U9F42> \xF7\xCC |0
-<U9F43> \xF8\x7D |0
-<U9F46> \xF8\xEA |0
-<U9F47> \xF9\x66 |0
-<U9F48> \xF9\xB9 |0
-<U9F49> \xF9\xD4 |0
-<U9F4A> \xBB\xF4 |0
-<U9F4B> \xC2\x4E |0
-<U9F4C> \xF1\xE9 |0
-<U9F4D> \xF3\xF9 |0
-<U9F4E> \xF6\xD2 |0
-<U9F4F> \xF8\x7E |0
-<U9F52> \xBE\xA6 |0
-<U9F54> \xEF\xB5 |0
-<U9F55> \xF1\xEA |0
-<U9F56> \xF3\xFA |0
-<U9F57> \xF3\xFB |0
-<U9F58> \xF3\xFC |0
-<U9F59> \xF5\xBE |0
-<U9F5B> \xF5\xBA |0
-<U9F5C> \xC5\x68 |0
-<U9F5D> \xF5\xBD |0
-<U9F5E> \xF5\xBC |0
-<U9F5F> \xC4\xD4 |0
-<U9F60> \xF5\xBB |0
-<U9F61> \xC4\xD6 |0
-<U9F63> \xC4\xD5 |0
-<U9F64> \xF6\xD4 |0
-<U9F65> \xF6\xD3 |0
-<U9F66> \xC5\x69 |0
-<U9F67> \xC5\x6A |0
-<U9F6A> \xC5\xC6 |0
-<U9F6B> \xF7\xCD |0
-<U9F6C> \xC5\xC5 |0
-<U9F6E> \xF8\xA3 |0
-<U9F6F> \xF8\xA4 |0
-<U9F70> \xF8\xA2 |0
-<U9F71> \xF8\xA1 |0
-<U9F72> \xC6\x54 |0
-<U9F74> \xF8\xEB |0
-<U9F75> \xF8\xEC |0
-<U9F76> \xF8\xED |0
-<U9F77> \xC6\x53 |0
-<U9F78> \xF9\x67 |0
-<U9F79> \xF9\x6A |0
-<U9F7A> \xF9\x69 |0
-<U9F7B> \xF9\x68 |0
-<U9F7E> \xF9\xD3 |0
-<U9F8D> \xC0\x73 |0
-<U9F90> \xC3\x65 |0
-<U9F91> \xF5\xBF |0
-<U9F92> \xF6\xD5 |0
-<U9F94> \xC5\xC7 |0
-<U9F95> \xF7\xCE |0
-<U9F98> \xF9\xD5 |0
-<U9F9C> \xC0\x74 |0
-<U9FA0> \xEF\xB6 |0
-<U9FA2> \xF7\xCF |0
-<U9FA4> \xF9\xA1 |0
-<UE000> \xFA\x40 |0
-<UE001> \xFA\x41 |0
-<UE002> \xFA\x42 |0
-<UE003> \xFA\x43 |0
-<UE004> \xFA\x44 |0
-<UE005> \xFA\x45 |0
-<UE006> \xFA\x46 |0
-<UE007> \xFA\x47 |0
-<UE008> \xFA\x48 |0
-<UE009> \xFA\x49 |0
-<UE00A> \xFA\x4A |0
-<UE00B> \xFA\x4B |0
-<UE00C> \xFA\x4C |0
-<UE00D> \xFA\x4D |0
-<UE00E> \xFA\x4E |0
-<UE00F> \xFA\x4F |0
-<UE010> \xFA\x50 |0
-<UE011> \xFA\x51 |0
-<UE012> \xFA\x52 |0
-<UE013> \xFA\x53 |0
-<UE014> \xFA\x54 |0
-<UE015> \xFA\x55 |0
-<UE016> \xFA\x56 |0
-<UE017> \xFA\x57 |0
-<UE018> \xFA\x58 |0
-<UE019> \xFA\x59 |0
-<UE01A> \xFA\x5A |0
-<UE01B> \xFA\x5B |0
-<UE01C> \xFA\x5C |0
-<UE01D> \xFA\x5D |0
-<UE01E> \xFA\x5E |0
-<UE01F> \xFA\x5F |0
-<UE020> \xFA\x60 |0
-<UE021> \xFA\x61 |0
-<UE022> \xFA\x62 |0
-<UE023> \xFA\x63 |0
-<UE024> \xFA\x64 |0
-<UE025> \xFA\x65 |0
-<UE026> \xFA\x66 |0
-<UE027> \xFA\x67 |0
-<UE028> \xFA\x68 |0
-<UE029> \xFA\x69 |0
-<UE02A> \xFA\x6A |0
-<UE02B> \xFA\x6B |0
-<UE02C> \xFA\x6C |0
-<UE02D> \xFA\x6D |0
-<UE02E> \xFA\x6E |0
-<UE02F> \xFA\x6F |0
-<UE030> \xFA\x70 |0
-<UE031> \xFA\x71 |0
-<UE032> \xFA\x72 |0
-<UE033> \xFA\x73 |0
-<UE034> \xFA\x74 |0
-<UE035> \xFA\x75 |0
-<UE036> \xFA\x76 |0
-<UE037> \xFA\x77 |0
-<UE038> \xFA\x78 |0
-<UE039> \xFA\x79 |0
-<UE03A> \xFA\x7A |0
-<UE03B> \xFA\x7B |0
-<UE03C> \xFA\x7C |0
-<UE03D> \xFA\x7D |0
-<UE03E> \xFA\x7E |0
-<UE03F> \xFA\xA1 |0
-<UE040> \xFA\xA2 |0
-<UE041> \xFA\xA3 |0
-<UE042> \xFA\xA4 |0
-<UE043> \xFA\xA5 |0
-<UE044> \xFA\xA6 |0
-<UE045> \xFA\xA7 |0
-<UE046> \xFA\xA8 |0
-<UE047> \xFA\xA9 |0
-<UE048> \xFA\xAA |0
-<UE049> \xFA\xAB |0
-<UE04A> \xFA\xAC |0
-<UE04B> \xFA\xAD |0
-<UE04C> \xFA\xAE |0
-<UE04D> \xFA\xAF |0
-<UE04E> \xFA\xB0 |0
-<UE04F> \xFA\xB1 |0
-<UE050> \xFA\xB2 |0
-<UE051> \xFA\xB3 |0
-<UE052> \xFA\xB4 |0
-<UE053> \xFA\xB5 |0
-<UE054> \xFA\xB6 |0
-<UE055> \xFA\xB7 |0
-<UE056> \xFA\xB8 |0
-<UE057> \xFA\xB9 |0
-<UE058> \xFA\xBA |0
-<UE059> \xFA\xBB |0
-<UE05A> \xFA\xBC |0
-<UE05B> \xFA\xBD |0
-<UE05C> \xFA\xBE |0
-<UE05D> \xFA\xBF |0
-<UE05E> \xFA\xC0 |0
-<UE05F> \xFA\xC1 |0
-<UE060> \xFA\xC2 |0
-<UE061> \xFA\xC3 |0
-<UE062> \xFA\xC4 |0
-<UE063> \xFA\xC5 |0
-<UE064> \xFA\xC6 |0
-<UE065> \xFA\xC7 |0
-<UE066> \xFA\xC8 |0
-<UE067> \xFA\xC9 |0
-<UE068> \xFA\xCA |0
-<UE069> \xFA\xCB |0
-<UE06A> \xFA\xCC |0
-<UE06B> \xFA\xCD |0
-<UE06C> \xFA\xCE |0
-<UE06D> \xFA\xCF |0
-<UE06E> \xFA\xD0 |0
-<UE06F> \xFA\xD1 |0
-<UE070> \xFA\xD2 |0
-<UE071> \xFA\xD3 |0
-<UE072> \xFA\xD4 |0
-<UE073> \xFA\xD5 |0
-<UE074> \xFA\xD6 |0
-<UE075> \xFA\xD7 |0
-<UE076> \xFA\xD8 |0
-<UE077> \xFA\xD9 |0
-<UE078> \xFA\xDA |0
-<UE079> \xFA\xDB |0
-<UE07A> \xFA\xDC |0
-<UE07B> \xFA\xDD |0
-<UE07C> \xFA\xDE |0
-<UE07D> \xFA\xDF |0
-<UE07E> \xFA\xE0 |0
-<UE07F> \xFA\xE1 |0
-<UE080> \xFA\xE2 |0
-<UE081> \xFA\xE3 |0
-<UE082> \xFA\xE4 |0
-<UE083> \xFA\xE5 |0
-<UE084> \xFA\xE6 |0
-<UE085> \xFA\xE7 |0
-<UE086> \xFA\xE8 |0
-<UE087> \xFA\xE9 |0
-<UE088> \xFA\xEA |0
-<UE089> \xFA\xEB |0
-<UE08A> \xFA\xEC |0
-<UE08B> \xFA\xED |0
-<UE08C> \xFA\xEE |0
-<UE08D> \xFA\xEF |0
-<UE08E> \xFA\xF0 |0
-<UE08F> \xFA\xF1 |0
-<UE090> \xFA\xF2 |0
-<UE091> \xFA\xF3 |0
-<UE092> \xFA\xF4 |0
-<UE093> \xFA\xF5 |0
-<UE094> \xFA\xF6 |0
-<UE095> \xFA\xF7 |0
-<UE096> \xFA\xF8 |0
-<UE097> \xFA\xF9 |0
-<UE098> \xFA\xFA |0
-<UE099> \xFA\xFB |0
-<UE09A> \xFA\xFC |0
-<UE09B> \xFA\xFD |0
-<UE09C> \xFA\xFE |0
-<UE09D> \xFB\x40 |0
-<UE09E> \xFB\x41 |0
-<UE09F> \xFB\x42 |0
-<UE0A0> \xFB\x43 |0
-<UE0A1> \xFB\x44 |0
-<UE0A2> \xFB\x45 |0
-<UE0A3> \xFB\x46 |0
-<UE0A4> \xFB\x47 |0
-<UE0A5> \xFB\x48 |0
-<UE0A6> \xFB\x49 |0
-<UE0A7> \xFB\x4A |0
-<UE0A8> \xFB\x4B |0
-<UE0A9> \xFB\x4C |0
-<UE0AA> \xFB\x4D |0
-<UE0AB> \xFB\x4E |0
-<UE0AC> \xFB\x4F |0
-<UE0AD> \xFB\x50 |0
-<UE0AE> \xFB\x51 |0
-<UE0AF> \xFB\x52 |0
-<UE0B0> \xFB\x53 |0
-<UE0B1> \xFB\x54 |0
-<UE0B2> \xFB\x55 |0
-<UE0B3> \xFB\x56 |0
-<UE0B4> \xFB\x57 |0
-<UE0B5> \xFB\x58 |0
-<UE0B6> \xFB\x59 |0
-<UE0B7> \xFB\x5A |0
-<UE0B8> \xFB\x5B |0
-<UE0B9> \xFB\x5C |0
-<UE0BA> \xFB\x5D |0
-<UE0BB> \xFB\x5E |0
-<UE0BC> \xFB\x5F |0
-<UE0BD> \xFB\x60 |0
-<UE0BE> \xFB\x61 |0
-<UE0BF> \xFB\x62 |0
-<UE0C0> \xFB\x63 |0
-<UE0C1> \xFB\x64 |0
-<UE0C2> \xFB\x65 |0
-<UE0C3> \xFB\x66 |0
-<UE0C4> \xFB\x67 |0
-<UE0C5> \xFB\x68 |0
-<UE0C6> \xFB\x69 |0
-<UE0C7> \xFB\x6A |0
-<UE0C8> \xFB\x6B |0
-<UE0C9> \xFB\x6C |0
-<UE0CA> \xFB\x6D |0
-<UE0CB> \xFB\x6E |0
-<UE0CC> \xFB\x6F |0
-<UE0CD> \xFB\x70 |0
-<UE0CE> \xFB\x71 |0
-<UE0CF> \xFB\x72 |0
-<UE0D0> \xFB\x73 |0
-<UE0D1> \xFB\x74 |0
-<UE0D2> \xFB\x75 |0
-<UE0D3> \xFB\x76 |0
-<UE0D4> \xFB\x77 |0
-<UE0D5> \xFB\x78 |0
-<UE0D6> \xFB\x79 |0
-<UE0D7> \xFB\x7A |0
-<UE0D8> \xFB\x7B |0
-<UE0D9> \xFB\x7C |0
-<UE0DA> \xFB\x7D |0
-<UE0DB> \xFB\x7E |0
-<UE0DC> \xFB\xA1 |0
-<UE0DD> \xFB\xA2 |0
-<UE0DE> \xFB\xA3 |0
-<UE0DF> \xFB\xA4 |0
-<UE0E0> \xFB\xA5 |0
-<UE0E1> \xFB\xA6 |0
-<UE0E2> \xFB\xA7 |0
-<UE0E3> \xFB\xA8 |0
-<UE0E4> \xFB\xA9 |0
-<UE0E5> \xFB\xAA |0
-<UE0E6> \xFB\xAB |0
-<UE0E7> \xFB\xAC |0
-<UE0E8> \xFB\xAD |0
-<UE0E9> \xFB\xAE |0
-<UE0EA> \xFB\xAF |0
-<UE0EB> \xFB\xB0 |0
-<UE0EC> \xFB\xB1 |0
-<UE0ED> \xFB\xB2 |0
-<UE0EE> \xFB\xB3 |0
-<UE0EF> \xFB\xB4 |0
-<UE0F0> \xFB\xB5 |0
-<UE0F1> \xFB\xB6 |0
-<UE0F2> \xFB\xB7 |0
-<UE0F3> \xFB\xB8 |0
-<UE0F4> \xFB\xB9 |0
-<UE0F5> \xFB\xBA |0
-<UE0F6> \xFB\xBB |0
-<UE0F7> \xFB\xBC |0
-<UE0F8> \xFB\xBD |0
-<UE0F9> \xFB\xBE |0
-<UE0FA> \xFB\xBF |0
-<UE0FB> \xFB\xC0 |0
-<UE0FC> \xFB\xC1 |0
-<UE0FD> \xFB\xC2 |0
-<UE0FE> \xFB\xC3 |0
-<UE0FF> \xFB\xC4 |0
-<UE100> \xFB\xC5 |0
-<UE101> \xFB\xC6 |0
-<UE102> \xFB\xC7 |0
-<UE103> \xFB\xC8 |0
-<UE104> \xFB\xC9 |0
-<UE105> \xFB\xCA |0
-<UE106> \xFB\xCB |0
-<UE107> \xFB\xCC |0
-<UE108> \xFB\xCD |0
-<UE109> \xFB\xCE |0
-<UE10A> \xFB\xCF |0
-<UE10B> \xFB\xD0 |0
-<UE10C> \xFB\xD1 |0
-<UE10D> \xFB\xD2 |0
-<UE10E> \xFB\xD3 |0
-<UE10F> \xFB\xD4 |0
-<UE110> \xFB\xD5 |0
-<UE111> \xFB\xD6 |0
-<UE112> \xFB\xD7 |0
-<UE113> \xFB\xD8 |0
-<UE114> \xFB\xD9 |0
-<UE115> \xFB\xDA |0
-<UE116> \xFB\xDB |0
-<UE117> \xFB\xDC |0
-<UE118> \xFB\xDD |0
-<UE119> \xFB\xDE |0
-<UE11A> \xFB\xDF |0
-<UE11B> \xFB\xE0 |0
-<UE11C> \xFB\xE1 |0
-<UE11D> \xFB\xE2 |0
-<UE11E> \xFB\xE3 |0
-<UE11F> \xFB\xE4 |0
-<UE120> \xFB\xE5 |0
-<UE121> \xFB\xE6 |0
-<UE122> \xFB\xE7 |0
-<UE123> \xFB\xE8 |0
-<UE124> \xFB\xE9 |0
-<UE125> \xFB\xEA |0
-<UE126> \xFB\xEB |0
-<UE127> \xFB\xEC |0
-<UE128> \xFB\xED |0
-<UE129> \xFB\xEE |0
-<UE12A> \xFB\xEF |0
-<UE12B> \xFB\xF0 |0
-<UE12C> \xFB\xF1 |0
-<UE12D> \xFB\xF2 |0
-<UE12E> \xFB\xF3 |0
-<UE12F> \xFB\xF4 |0
-<UE130> \xFB\xF5 |0
-<UE131> \xFB\xF6 |0
-<UE132> \xFB\xF7 |0
-<UE133> \xFB\xF8 |0
-<UE134> \xFB\xF9 |0
-<UE135> \xFB\xFA |0
-<UE136> \xFB\xFB |0
-<UE137> \xFB\xFC |0
-<UE138> \xFB\xFD |0
-<UE139> \xFB\xFE |0
-<UE13A> \xFC\x40 |0
-<UE13B> \xFC\x41 |0
-<UE13C> \xFC\x42 |0
-<UE13D> \xFC\x43 |0
-<UE13E> \xFC\x44 |0
-<UE13F> \xFC\x45 |0
-<UE140> \xFC\x46 |0
-<UE141> \xFC\x47 |0
-<UE142> \xFC\x48 |0
-<UE143> \xFC\x49 |0
-<UE144> \xFC\x4A |0
-<UE145> \xFC\x4B |0
-<UE146> \xFC\x4C |0
-<UE147> \xFC\x4D |0
-<UE148> \xFC\x4E |0
-<UE149> \xFC\x4F |0
-<UE14A> \xFC\x50 |0
-<UE14B> \xFC\x51 |0
-<UE14C> \xFC\x52 |0
-<UE14D> \xFC\x53 |0
-<UE14E> \xFC\x54 |0
-<UE14F> \xFC\x55 |0
-<UE150> \xFC\x56 |0
-<UE151> \xFC\x57 |0
-<UE152> \xFC\x58 |0
-<UE153> \xFC\x59 |0
-<UE154> \xFC\x5A |0
-<UE155> \xFC\x5B |0
-<UE156> \xFC\x5C |0
-<UE157> \xFC\x5D |0
-<UE158> \xFC\x5E |0
-<UE159> \xFC\x5F |0
-<UE15A> \xFC\x60 |0
-<UE15B> \xFC\x61 |0
-<UE15C> \xFC\x62 |0
-<UE15D> \xFC\x63 |0
-<UE15E> \xFC\x64 |0
-<UE15F> \xFC\x65 |0
-<UE160> \xFC\x66 |0
-<UE161> \xFC\x67 |0
-<UE162> \xFC\x68 |0
-<UE163> \xFC\x69 |0
-<UE164> \xFC\x6A |0
-<UE165> \xFC\x6B |0
-<UE166> \xFC\x6C |0
-<UE167> \xFC\x6D |0
-<UE168> \xFC\x6E |0
-<UE169> \xFC\x6F |0
-<UE16A> \xFC\x70 |0
-<UE16B> \xFC\x71 |0
-<UE16C> \xFC\x72 |0
-<UE16D> \xFC\x73 |0
-<UE16E> \xFC\x74 |0
-<UE16F> \xFC\x75 |0
-<UE170> \xFC\x76 |0
-<UE171> \xFC\x77 |0
-<UE172> \xFC\x78 |0
-<UE173> \xFC\x79 |0
-<UE174> \xFC\x7A |0
-<UE175> \xFC\x7B |0
-<UE176> \xFC\x7C |0
-<UE177> \xFC\x7D |0
-<UE178> \xFC\x7E |0
-<UE179> \xFC\xA1 |0
-<UE17A> \xFC\xA2 |0
-<UE17B> \xFC\xA3 |0
-<UE17C> \xFC\xA4 |0
-<UE17D> \xFC\xA5 |0
-<UE17E> \xFC\xA6 |0
-<UE17F> \xFC\xA7 |0
-<UE180> \xFC\xA8 |0
-<UE181> \xFC\xA9 |0
-<UE182> \xFC\xAA |0
-<UE183> \xFC\xAB |0
-<UE184> \xFC\xAC |0
-<UE185> \xFC\xAD |0
-<UE186> \xFC\xAE |0
-<UE187> \xFC\xAF |0
-<UE188> \xFC\xB0 |0
-<UE189> \xFC\xB1 |0
-<UE18A> \xFC\xB2 |0
-<UE18B> \xFC\xB3 |0
-<UE18C> \xFC\xB4 |0
-<UE18D> \xFC\xB5 |0
-<UE18E> \xFC\xB6 |0
-<UE18F> \xFC\xB7 |0
-<UE190> \xFC\xB8 |0
-<UE191> \xFC\xB9 |0
-<UE192> \xFC\xBA |0
-<UE193> \xFC\xBB |0
-<UE194> \xFC\xBC |0
-<UE195> \xFC\xBD |0
-<UE196> \xFC\xBE |0
-<UE197> \xFC\xBF |0
-<UE198> \xFC\xC0 |0
-<UE199> \xFC\xC1 |0
-<UE19A> \xFC\xC2 |0
-<UE19B> \xFC\xC3 |0
-<UE19C> \xFC\xC4 |0
-<UE19D> \xFC\xC5 |0
-<UE19E> \xFC\xC6 |0
-<UE19F> \xFC\xC7 |0
-<UE1A0> \xFC\xC8 |0
-<UE1A1> \xFC\xC9 |0
-<UE1A2> \xFC\xCA |0
-<UE1A3> \xFC\xCB |0
-<UE1A4> \xFC\xCC |0
-<UE1A5> \xFC\xCD |0
-<UE1A6> \xFC\xCE |0
-<UE1A7> \xFC\xCF |0
-<UE1A8> \xFC\xD0 |0
-<UE1A9> \xFC\xD1 |0
-<UE1AA> \xFC\xD2 |0
-<UE1AB> \xFC\xD3 |0
-<UE1AC> \xFC\xD4 |0
-<UE1AD> \xFC\xD5 |0
-<UE1AE> \xFC\xD6 |0
-<UE1AF> \xFC\xD7 |0
-<UE1B0> \xFC\xD8 |0
-<UE1B1> \xFC\xD9 |0
-<UE1B2> \xFC\xDA |0
-<UE1B3> \xFC\xDB |0
-<UE1B4> \xFC\xDC |0
-<UE1B5> \xFC\xDD |0
-<UE1B6> \xFC\xDE |0
-<UE1B7> \xFC\xDF |0
-<UE1B8> \xFC\xE0 |0
-<UE1B9> \xFC\xE1 |0
-<UE1BA> \xFC\xE2 |0
-<UE1BB> \xFC\xE3 |0
-<UE1BC> \xFC\xE4 |0
-<UE1BD> \xFC\xE5 |0
-<UE1BE> \xFC\xE6 |0
-<UE1BF> \xFC\xE7 |0
-<UE1C0> \xFC\xE8 |0
-<UE1C1> \xFC\xE9 |0
-<UE1C2> \xFC\xEA |0
-<UE1C3> \xFC\xEB |0
-<UE1C4> \xFC\xEC |0
-<UE1C5> \xFC\xED |0
-<UE1C6> \xFC\xEE |0
-<UE1C7> \xFC\xEF |0
-<UE1C8> \xFC\xF0 |0
-<UE1C9> \xFC\xF1 |0
-<UE1CA> \xFC\xF2 |0
-<UE1CB> \xFC\xF3 |0
-<UE1CC> \xFC\xF4 |0
-<UE1CD> \xFC\xF5 |0
-<UE1CE> \xFC\xF6 |0
-<UE1CF> \xFC\xF7 |0
-<UE1D0> \xFC\xF8 |0
-<UE1D1> \xFC\xF9 |0
-<UE1D2> \xFC\xFA |0
-<UE1D3> \xFC\xFB |0
-<UE1D4> \xFC\xFC |0
-<UE1D5> \xFC\xFD |0
-<UE1D6> \xFC\xFE |0
-<UE1D7> \xFD\x40 |0
-<UE1D8> \xFD\x41 |0
-<UE1D9> \xFD\x42 |0
-<UE1DA> \xFD\x43 |0
-<UE1DB> \xFD\x44 |0
-<UE1DC> \xFD\x45 |0
-<UE1DD> \xFD\x46 |0
-<UE1DE> \xFD\x47 |0
-<UE1DF> \xFD\x48 |0
-<UE1E0> \xFD\x49 |0
-<UE1E1> \xFD\x4A |0
-<UE1E2> \xFD\x4B |0
-<UE1E3> \xFD\x4C |0
-<UE1E4> \xFD\x4D |0
-<UE1E5> \xFD\x4E |0
-<UE1E6> \xFD\x4F |0
-<UE1E7> \xFD\x50 |0
-<UE1E8> \xFD\x51 |0
-<UE1E9> \xFD\x52 |0
-<UE1EA> \xFD\x53 |0
-<UE1EB> \xFD\x54 |0
-<UE1EC> \xFD\x55 |0
-<UE1ED> \xFD\x56 |0
-<UE1EE> \xFD\x57 |0
-<UE1EF> \xFD\x58 |0
-<UE1F0> \xFD\x59 |0
-<UE1F1> \xFD\x5A |0
-<UE1F2> \xFD\x5B |0
-<UE1F3> \xFD\x5C |0
-<UE1F4> \xFD\x5D |0
-<UE1F5> \xFD\x5E |0
-<UE1F6> \xFD\x5F |0
-<UE1F7> \xFD\x60 |0
-<UE1F8> \xFD\x61 |0
-<UE1F9> \xFD\x62 |0
-<UE1FA> \xFD\x63 |0
-<UE1FB> \xFD\x64 |0
-<UE1FC> \xFD\x65 |0
-<UE1FD> \xFD\x66 |0
-<UE1FE> \xFD\x67 |0
-<UE1FF> \xFD\x68 |0
-<UE200> \xFD\x69 |0
-<UE201> \xFD\x6A |0
-<UE202> \xFD\x6B |0
-<UE203> \xFD\x6C |0
-<UE204> \xFD\x6D |0
-<UE205> \xFD\x6E |0
-<UE206> \xFD\x6F |0
-<UE207> \xFD\x70 |0
-<UE208> \xFD\x71 |0
-<UE209> \xFD\x72 |0
-<UE20A> \xFD\x73 |0
-<UE20B> \xFD\x74 |0
-<UE20C> \xFD\x75 |0
-<UE20D> \xFD\x76 |0
-<UE20E> \xFD\x77 |0
-<UE20F> \xFD\x78 |0
-<UE210> \xFD\x79 |0
-<UE211> \xFD\x7A |0
-<UE212> \xFD\x7B |0
-<UE213> \xFD\x7C |0
-<UE214> \xFD\x7D |0
-<UE215> \xFD\x7E |0
-<UE216> \xFD\xA1 |0
-<UE217> \xFD\xA2 |0
-<UE218> \xFD\xA3 |0
-<UE219> \xFD\xA4 |0
-<UE21A> \xFD\xA5 |0
-<UE21B> \xFD\xA6 |0
-<UE21C> \xFD\xA7 |0
-<UE21D> \xFD\xA8 |0
-<UE21E> \xFD\xA9 |0
-<UE21F> \xFD\xAA |0
-<UE220> \xFD\xAB |0
-<UE221> \xFD\xAC |0
-<UE222> \xFD\xAD |0
-<UE223> \xFD\xAE |0
-<UE224> \xFD\xAF |0
-<UE225> \xFD\xB0 |0
-<UE226> \xFD\xB1 |0
-<UE227> \xFD\xB2 |0
-<UE228> \xFD\xB3 |0
-<UE229> \xFD\xB4 |0
-<UE22A> \xFD\xB5 |0
-<UE22B> \xFD\xB6 |0
-<UE22C> \xFD\xB7 |0
-<UE22D> \xFD\xB8 |0
-<UE22E> \xFD\xB9 |0
-<UE22F> \xFD\xBA |0
-<UE230> \xFD\xBB |0
-<UE231> \xFD\xBC |0
-<UE232> \xFD\xBD |0
-<UE233> \xFD\xBE |0
-<UE234> \xFD\xBF |0
-<UE235> \xFD\xC0 |0
-<UE236> \xFD\xC1 |0
-<UE237> \xFD\xC2 |0
-<UE238> \xFD\xC3 |0
-<UE239> \xFD\xC4 |0
-<UE23A> \xFD\xC5 |0
-<UE23B> \xFD\xC6 |0
-<UE23C> \xFD\xC7 |0
-<UE23D> \xFD\xC8 |0
-<UE23E> \xFD\xC9 |0
-<UE23F> \xFD\xCA |0
-<UE240> \xFD\xCB |0
-<UE241> \xFD\xCC |0
-<UE242> \xFD\xCD |0
-<UE243> \xFD\xCE |0
-<UE244> \xFD\xCF |0
-<UE245> \xFD\xD0 |0
-<UE246> \xFD\xD1 |0
-<UE247> \xFD\xD2 |0
-<UE248> \xFD\xD3 |0
-<UE249> \xFD\xD4 |0
-<UE24A> \xFD\xD5 |0
-<UE24B> \xFD\xD6 |0
-<UE24C> \xFD\xD7 |0
-<UE24D> \xFD\xD8 |0
-<UE24E> \xFD\xD9 |0
-<UE24F> \xFD\xDA |0
-<UE250> \xFD\xDB |0
-<UE251> \xFD\xDC |0
-<UE252> \xFD\xDD |0
-<UE253> \xFD\xDE |0
-<UE254> \xFD\xDF |0
-<UE255> \xFD\xE0 |0
-<UE256> \xFD\xE1 |0
-<UE257> \xFD\xE2 |0
-<UE258> \xFD\xE3 |0
-<UE259> \xFD\xE4 |0
-<UE25A> \xFD\xE5 |0
-<UE25B> \xFD\xE6 |0
-<UE25C> \xFD\xE7 |0
-<UE25D> \xFD\xE8 |0
-<UE25E> \xFD\xE9 |0
-<UE25F> \xFD\xEA |0
-<UE260> \xFD\xEB |0
-<UE261> \xFD\xEC |0
-<UE262> \xFD\xED |0
-<UE263> \xFD\xEE |0
-<UE264> \xFD\xEF |0
-<UE265> \xFD\xF0 |0
-<UE266> \xFD\xF1 |0
-<UE267> \xFD\xF2 |0
-<UE268> \xFD\xF3 |0
-<UE269> \xFD\xF4 |0
-<UE26A> \xFD\xF5 |0
-<UE26B> \xFD\xF6 |0
-<UE26C> \xFD\xF7 |0
-<UE26D> \xFD\xF8 |0
-<UE26E> \xFD\xF9 |0
-<UE26F> \xFD\xFA |0
-<UE270> \xFD\xFB |0
-<UE271> \xFD\xFC |0
-<UE272> \xFD\xFD |0
-<UE273> \xFD\xFE |0
-<UE274> \xFE\x40 |0
-<UE275> \xFE\x41 |0
-<UE276> \xFE\x42 |0
-<UE277> \xFE\x43 |0
-<UE278> \xFE\x44 |0
-<UE279> \xFE\x45 |0
-<UE27A> \xFE\x46 |0
-<UE27B> \xFE\x47 |0
-<UE27C> \xFE\x48 |0
-<UE27D> \xFE\x49 |0
-<UE27E> \xFE\x4A |0
-<UE27F> \xFE\x4B |0
-<UE280> \xFE\x4C |0
-<UE281> \xFE\x4D |0
-<UE282> \xFE\x4E |0
-<UE283> \xFE\x4F |0
-<UE284> \xFE\x50 |0
-<UE285> \xFE\x51 |0
-<UE286> \xFE\x52 |0
-<UE287> \xFE\x53 |0
-<UE288> \xFE\x54 |0
-<UE289> \xFE\x55 |0
-<UE28A> \xFE\x56 |0
-<UE28B> \xFE\x57 |0
-<UE28C> \xFE\x58 |0
-<UE28D> \xFE\x59 |0
-<UE28E> \xFE\x5A |0
-<UE28F> \xFE\x5B |0
-<UE290> \xFE\x5C |0
-<UE291> \xFE\x5D |0
-<UE292> \xFE\x5E |0
-<UE293> \xFE\x5F |0
-<UE294> \xFE\x60 |0
-<UE295> \xFE\x61 |0
-<UE296> \xFE\x62 |0
-<UE297> \xFE\x63 |0
-<UE298> \xFE\x64 |0
-<UE299> \xFE\x65 |0
-<UE29A> \xFE\x66 |0
-<UE29B> \xFE\x67 |0
-<UE29C> \xFE\x68 |0
-<UE29D> \xFE\x69 |0
-<UE29E> \xFE\x6A |0
-<UE29F> \xFE\x6B |0
-<UE2A0> \xFE\x6C |0
-<UE2A1> \xFE\x6D |0
-<UE2A2> \xFE\x6E |0
-<UE2A3> \xFE\x6F |0
-<UE2A4> \xFE\x70 |0
-<UE2A5> \xFE\x71 |0
-<UE2A6> \xFE\x72 |0
-<UE2A7> \xFE\x73 |0
-<UE2A8> \xFE\x74 |0
-<UE2A9> \xFE\x75 |0
-<UE2AA> \xFE\x76 |0
-<UE2AB> \xFE\x77 |0
-<UE2AC> \xFE\x78 |0
-<UE2AD> \xFE\x79 |0
-<UE2AE> \xFE\x7A |0
-<UE2AF> \xFE\x7B |0
-<UE2B0> \xFE\x7C |0
-<UE2B1> \xFE\x7D |0
-<UE2B2> \xFE\x7E |0
-<UE2B3> \xFE\xA1 |0
-<UE2B4> \xFE\xA2 |0
-<UE2B5> \xFE\xA3 |0
-<UE2B6> \xFE\xA4 |0
-<UE2B7> \xFE\xA5 |0
-<UE2B8> \xFE\xA6 |0
-<UE2B9> \xFE\xA7 |0
-<UE2BA> \xFE\xA8 |0
-<UE2BB> \xFE\xA9 |0
-<UE2BC> \xFE\xAA |0
-<UE2BD> \xFE\xAB |0
-<UE2BE> \xFE\xAC |0
-<UE2BF> \xFE\xAD |0
-<UE2C0> \xFE\xAE |0
-<UE2C1> \xFE\xAF |0
-<UE2C2> \xFE\xB0 |0
-<UE2C3> \xFE\xB1 |0
-<UE2C4> \xFE\xB2 |0
-<UE2C5> \xFE\xB3 |0
-<UE2C6> \xFE\xB4 |0
-<UE2C7> \xFE\xB5 |0
-<UE2C8> \xFE\xB6 |0
-<UE2C9> \xFE\xB7 |0
-<UE2CA> \xFE\xB8 |0
-<UE2CB> \xFE\xB9 |0
-<UE2CC> \xFE\xBA |0
-<UE2CD> \xFE\xBB |0
-<UE2CE> \xFE\xBC |0
-<UE2CF> \xFE\xBD |0
-<UE2D0> \xFE\xBE |0
-<UE2D1> \xFE\xBF |0
-<UE2D2> \xFE\xC0 |0
-<UE2D3> \xFE\xC1 |0
-<UE2D4> \xFE\xC2 |0
-<UE2D5> \xFE\xC3 |0
-<UE2D6> \xFE\xC4 |0
-<UE2D7> \xFE\xC5 |0
-<UE2D8> \xFE\xC6 |0
-<UE2D9> \xFE\xC7 |0
-<UE2DA> \xFE\xC8 |0
-<UE2DB> \xFE\xC9 |0
-<UE2DC> \xFE\xCA |0
-<UE2DD> \xFE\xCB |0
-<UE2DE> \xFE\xCC |0
-<UE2DF> \xFE\xCD |0
-<UE2E0> \xFE\xCE |0
-<UE2E1> \xFE\xCF |0
-<UE2E2> \xFE\xD0 |0
-<UE2E3> \xFE\xD1 |0
-<UE2E4> \xFE\xD2 |0
-<UE2E5> \xFE\xD3 |0
-<UE2E6> \xFE\xD4 |0
-<UE2E7> \xFE\xD5 |0
-<UE2E8> \xFE\xD6 |0
-<UE2E9> \xFE\xD7 |0
-<UE2EA> \xFE\xD8 |0
-<UE2EB> \xFE\xD9 |0
-<UE2EC> \xFE\xDA |0
-<UE2ED> \xFE\xDB |0
-<UE2EE> \xFE\xDC |0
-<UE2EF> \xFE\xDD |0
-<UE2F0> \xFE\xDE |0
-<UE2F1> \xFE\xDF |0
-<UE2F2> \xFE\xE0 |0
-<UE2F3> \xFE\xE1 |0
-<UE2F4> \xFE\xE2 |0
-<UE2F5> \xFE\xE3 |0
-<UE2F6> \xFE\xE4 |0
-<UE2F7> \xFE\xE5 |0
-<UE2F8> \xFE\xE6 |0
-<UE2F9> \xFE\xE7 |0
-<UE2FA> \xFE\xE8 |0
-<UE2FB> \xFE\xE9 |0
-<UE2FC> \xFE\xEA |0
-<UE2FD> \xFE\xEB |0
-<UE2FE> \xFE\xEC |0
-<UE2FF> \xFE\xED |0
-<UE300> \xFE\xEE |0
-<UE301> \xFE\xEF |0
-<UE302> \xFE\xF0 |0
-<UE303> \xFE\xF1 |0
-<UE304> \xFE\xF2 |0
-<UE305> \xFE\xF3 |0
-<UE306> \xFE\xF4 |0
-<UE307> \xFE\xF5 |0
-<UE308> \xFE\xF6 |0
-<UE309> \xFE\xF7 |0
-<UE30A> \xFE\xF8 |0
-<UE30B> \xFE\xF9 |0
-<UE30C> \xFE\xFA |0
-<UE30D> \xFE\xFB |0
-<UE30E> \xFE\xFC |0
-<UE30F> \xFE\xFD |0
-<UE310> \xFE\xFE |0
-<UE311> \x8E\x40 |0
-<UE312> \x8E\x41 |0
-<UE313> \x8E\x42 |0
-<UE314> \x8E\x43 |0
-<UE315> \x8E\x44 |0
-<UE316> \x8E\x45 |0
-<UE317> \x8E\x46 |0
-<UE318> \x8E\x47 |0
-<UE319> \x8E\x48 |0
-<UE31A> \x8E\x49 |0
-<UE31B> \x8E\x4A |0
-<UE31C> \x8E\x4B |0
-<UE31D> \x8E\x4C |0
-<UE31E> \x8E\x4D |0
-<UE31F> \x8E\x4E |0
-<UE320> \x8E\x4F |0
-<UE321> \x8E\x50 |0
-<UE322> \x8E\x51 |0
-<UE323> \x8E\x52 |0
-<UE324> \x8E\x53 |0
-<UE325> \x8E\x54 |0
-<UE326> \x8E\x55 |0
-<UE327> \x8E\x56 |0
-<UE328> \x8E\x57 |0
-<UE329> \x8E\x58 |0
-<UE32A> \x8E\x59 |0
-<UE32B> \x8E\x5A |0
-<UE32C> \x8E\x5B |0
-<UE32D> \x8E\x5C |0
-<UE32E> \x8E\x5D |0
-<UE32F> \x8E\x5E |0
-<UE330> \x8E\x5F |0
-<UE331> \x8E\x60 |0
-<UE332> \x8E\x61 |0
-<UE333> \x8E\x62 |0
-<UE334> \x8E\x63 |0
-<UE335> \x8E\x64 |0
-<UE336> \x8E\x65 |0
-<UE337> \x8E\x66 |0
-<UE338> \x8E\x67 |0
-<UE339> \x8E\x68 |0
-<UE33A> \x8E\x69 |0
-<UE33B> \x8E\x6A |0
-<UE33C> \x8E\x6B |0
-<UE33D> \x8E\x6C |0
-<UE33E> \x8E\x6D |0
-<UE33F> \x8E\x6E |0
-<UE340> \x8E\x6F |0
-<UE341> \x8E\x70 |0
-<UE342> \x8E\x71 |0
-<UE343> \x8E\x72 |0
-<UE344> \x8E\x73 |0
-<UE345> \x8E\x74 |0
-<UE346> \x8E\x75 |0
-<UE347> \x8E\x76 |0
-<UE348> \x8E\x77 |0
-<UE349> \x8E\x78 |0
-<UE34A> \x8E\x79 |0
-<UE34B> \x8E\x7A |0
-<UE34C> \x8E\x7B |0
-<UE34D> \x8E\x7C |0
-<UE34E> \x8E\x7D |0
-<UE34F> \x8E\x7E |0
-<UE350> \x8E\xA1 |0
-<UE351> \x8E\xA2 |0
-<UE352> \x8E\xA3 |0
-<UE353> \x8E\xA4 |0
-<UE354> \x8E\xA5 |0
-<UE355> \x8E\xA6 |0
-<UE356> \x8E\xA7 |0
-<UE357> \x8E\xA8 |0
-<UE358> \x8E\xA9 |0
-<UE359> \x8E\xAA |0
-<UE35A> \x8E\xAB |0
-<UE35B> \x8E\xAC |0
-<UE35C> \x8E\xAD |0
-<UE35D> \x8E\xAE |0
-<UE35E> \x8E\xAF |0
-<UE35F> \x8E\xB0 |0
-<UE360> \x8E\xB1 |0
-<UE361> \x8E\xB2 |0
-<UE362> \x8E\xB3 |0
-<UE363> \x8E\xB4 |0
-<UE364> \x8E\xB5 |0
-<UE365> \x8E\xB6 |0
-<UE366> \x8E\xB7 |0
-<UE367> \x8E\xB8 |0
-<UE368> \x8E\xB9 |0
-<UE369> \x8E\xBA |0
-<UE36A> \x8E\xBB |0
-<UE36B> \x8E\xBC |0
-<UE36C> \x8E\xBD |0
-<UE36D> \x8E\xBE |0
-<UE36E> \x8E\xBF |0
-<UE36F> \x8E\xC0 |0
-<UE370> \x8E\xC1 |0
-<UE371> \x8E\xC2 |0
-<UE372> \x8E\xC3 |0
-<UE373> \x8E\xC4 |0
-<UE374> \x8E\xC5 |0
-<UE375> \x8E\xC6 |0
-<UE376> \x8E\xC7 |0
-<UE377> \x8E\xC8 |0
-<UE378> \x8E\xC9 |0
-<UE379> \x8E\xCA |0
-<UE37A> \x8E\xCB |0
-<UE37B> \x8E\xCC |0
-<UE37C> \x8E\xCD |0
-<UE37D> \x8E\xCE |0
-<UE37E> \x8E\xCF |0
-<UE37F> \x8E\xD0 |0
-<UE380> \x8E\xD1 |0
-<UE381> \x8E\xD2 |0
-<UE382> \x8E\xD3 |0
-<UE383> \x8E\xD4 |0
-<UE384> \x8E\xD5 |0
-<UE385> \x8E\xD6 |0
-<UE386> \x8E\xD7 |0
-<UE387> \x8E\xD8 |0
-<UE388> \x8E\xD9 |0
-<UE389> \x8E\xDA |0
-<UE38A> \x8E\xDB |0
-<UE38B> \x8E\xDC |0
-<UE38C> \x8E\xDD |0
-<UE38D> \x8E\xDE |0
-<UE38E> \x8E\xDF |0
-<UE38F> \x8E\xE0 |0
-<UE390> \x8E\xE1 |0
-<UE391> \x8E\xE2 |0
-<UE392> \x8E\xE3 |0
-<UE393> \x8E\xE4 |0
-<UE394> \x8E\xE5 |0
-<UE395> \x8E\xE6 |0
-<UE396> \x8E\xE7 |0
-<UE397> \x8E\xE8 |0
-<UE398> \x8E\xE9 |0
-<UE399> \x8E\xEA |0
-<UE39A> \x8E\xEB |0
-<UE39B> \x8E\xEC |0
-<UE39C> \x8E\xED |0
-<UE39D> \x8E\xEE |0
-<UE39E> \x8E\xEF |0
-<UE39F> \x8E\xF0 |0
-<UE3A0> \x8E\xF1 |0
-<UE3A1> \x8E\xF2 |0
-<UE3A2> \x8E\xF3 |0
-<UE3A3> \x8E\xF4 |0
-<UE3A4> \x8E\xF5 |0
-<UE3A5> \x8E\xF6 |0
-<UE3A6> \x8E\xF7 |0
-<UE3A7> \x8E\xF8 |0
-<UE3A8> \x8E\xF9 |0
-<UE3A9> \x8E\xFA |0
-<UE3AA> \x8E\xFB |0
-<UE3AB> \x8E\xFC |0
-<UE3AC> \x8E\xFD |0
-<UE3AD> \x8E\xFE |0
-<UE3AE> \x8F\x40 |0
-<UE3AF> \x8F\x41 |0
-<UE3B0> \x8F\x42 |0
-<UE3B1> \x8F\x43 |0
-<UE3B2> \x8F\x44 |0
-<UE3B3> \x8F\x45 |0
-<UE3B4> \x8F\x46 |0
-<UE3B5> \x8F\x47 |0
-<UE3B6> \x8F\x48 |0
-<UE3B7> \x8F\x49 |0
-<UE3B8> \x8F\x4A |0
-<UE3B9> \x8F\x4B |0
-<UE3BA> \x8F\x4C |0
-<UE3BB> \x8F\x4D |0
-<UE3BC> \x8F\x4E |0
-<UE3BD> \x8F\x4F |0
-<UE3BE> \x8F\x50 |0
-<UE3BF> \x8F\x51 |0
-<UE3C0> \x8F\x52 |0
-<UE3C1> \x8F\x53 |0
-<UE3C2> \x8F\x54 |0
-<UE3C3> \x8F\x55 |0
-<UE3C4> \x8F\x56 |0
-<UE3C5> \x8F\x57 |0
-<UE3C6> \x8F\x58 |0
-<UE3C7> \x8F\x59 |0
-<UE3C8> \x8F\x5A |0
-<UE3C9> \x8F\x5B |0
-<UE3CA> \x8F\x5C |0
-<UE3CB> \x8F\x5D |0
-<UE3CC> \x8F\x5E |0
-<UE3CD> \x8F\x5F |0
-<UE3CE> \x8F\x60 |0
-<UE3CF> \x8F\x61 |0
-<UE3D0> \x8F\x62 |0
-<UE3D1> \x8F\x63 |0
-<UE3D2> \x8F\x64 |0
-<UE3D3> \x8F\x65 |0
-<UE3D4> \x8F\x66 |0
-<UE3D5> \x8F\x67 |0
-<UE3D6> \x8F\x68 |0
-<UE3D7> \x8F\x69 |0
-<UE3D8> \x8F\x6A |0
-<UE3D9> \x8F\x6B |0
-<UE3DA> \x8F\x6C |0
-<UE3DB> \x8F\x6D |0
-<UE3DC> \x8F\x6E |0
-<UE3DD> \x8F\x6F |0
-<UE3DE> \x8F\x70 |0
-<UE3DF> \x8F\x71 |0
-<UE3E0> \x8F\x72 |0
-<UE3E1> \x8F\x73 |0
-<UE3E2> \x8F\x74 |0
-<UE3E3> \x8F\x75 |0
-<UE3E4> \x8F\x76 |0
-<UE3E5> \x8F\x77 |0
-<UE3E6> \x8F\x78 |0
-<UE3E7> \x8F\x79 |0
-<UE3E8> \x8F\x7A |0
-<UE3E9> \x8F\x7B |0
-<UE3EA> \x8F\x7C |0
-<UE3EB> \x8F\x7D |0
-<UE3EC> \x8F\x7E |0
-<UE3ED> \x8F\xA1 |0
-<UE3EE> \x8F\xA2 |0
-<UE3EF> \x8F\xA3 |0
-<UE3F0> \x8F\xA4 |0
-<UE3F1> \x8F\xA5 |0
-<UE3F2> \x8F\xA6 |0
-<UE3F3> \x8F\xA7 |0
-<UE3F4> \x8F\xA8 |0
-<UE3F5> \x8F\xA9 |0
-<UE3F6> \x8F\xAA |0
-<UE3F7> \x8F\xAB |0
-<UE3F8> \x8F\xAC |0
-<UE3F9> \x8F\xAD |0
-<UE3FA> \x8F\xAE |0
-<UE3FB> \x8F\xAF |0
-<UE3FC> \x8F\xB0 |0
-<UE3FD> \x8F\xB1 |0
-<UE3FE> \x8F\xB2 |0
-<UE3FF> \x8F\xB3 |0
-<UE400> \x8F\xB4 |0
-<UE401> \x8F\xB5 |0
-<UE402> \x8F\xB6 |0
-<UE403> \x8F\xB7 |0
-<UE404> \x8F\xB8 |0
-<UE405> \x8F\xB9 |0
-<UE406> \x8F\xBA |0
-<UE407> \x8F\xBB |0
-<UE408> \x8F\xBC |0
-<UE409> \x8F\xBD |0
-<UE40A> \x8F\xBE |0
-<UE40B> \x8F\xBF |0
-<UE40C> \x8F\xC0 |0
-<UE40D> \x8F\xC1 |0
-<UE40E> \x8F\xC2 |0
-<UE40F> \x8F\xC3 |0
-<UE410> \x8F\xC4 |0
-<UE411> \x8F\xC5 |0
-<UE412> \x8F\xC6 |0
-<UE413> \x8F\xC7 |0
-<UE414> \x8F\xC8 |0
-<UE415> \x8F\xC9 |0
-<UE416> \x8F\xCA |0
-<UE417> \x8F\xCB |0
-<UE418> \x8F\xCC |0
-<UE419> \x8F\xCD |0
-<UE41A> \x8F\xCE |0
-<UE41B> \x8F\xCF |0
-<UE41C> \x8F\xD0 |0
-<UE41D> \x8F\xD1 |0
-<UE41E> \x8F\xD2 |0
-<UE41F> \x8F\xD3 |0
-<UE420> \x8F\xD4 |0
-<UE421> \x8F\xD5 |0
-<UE422> \x8F\xD6 |0
-<UE423> \x8F\xD7 |0
-<UE424> \x8F\xD8 |0
-<UE425> \x8F\xD9 |0
-<UE426> \x8F\xDA |0
-<UE427> \x8F\xDB |0
-<UE428> \x8F\xDC |0
-<UE429> \x8F\xDD |0
-<UE42A> \x8F\xDE |0
-<UE42B> \x8F\xDF |0
-<UE42C> \x8F\xE0 |0
-<UE42D> \x8F\xE1 |0
-<UE42E> \x8F\xE2 |0
-<UE42F> \x8F\xE3 |0
-<UE430> \x8F\xE4 |0
-<UE431> \x8F\xE5 |0
-<UE432> \x8F\xE6 |0
-<UE433> \x8F\xE7 |0
-<UE434> \x8F\xE8 |0
-<UE435> \x8F\xE9 |0
-<UE436> \x8F\xEA |0
-<UE437> \x8F\xEB |0
-<UE438> \x8F\xEC |0
-<UE439> \x8F\xED |0
-<UE43A> \x8F\xEE |0
-<UE43B> \x8F\xEF |0
-<UE43C> \x8F\xF0 |0
-<UE43D> \x8F\xF1 |0
-<UE43E> \x8F\xF2 |0
-<UE43F> \x8F\xF3 |0
-<UE440> \x8F\xF4 |0
-<UE441> \x8F\xF5 |0
-<UE442> \x8F\xF6 |0
-<UE443> \x8F\xF7 |0
-<UE444> \x8F\xF8 |0
-<UE445> \x8F\xF9 |0
-<UE446> \x8F\xFA |0
-<UE447> \x8F\xFB |0
-<UE448> \x8F\xFC |0
-<UE449> \x8F\xFD |0
-<UE44A> \x8F\xFE |0
-<UE44B> \x90\x40 |0
-<UE44C> \x90\x41 |0
-<UE44D> \x90\x42 |0
-<UE44E> \x90\x43 |0
-<UE44F> \x90\x44 |0
-<UE450> \x90\x45 |0
-<UE451> \x90\x46 |0
-<UE452> \x90\x47 |0
-<UE453> \x90\x48 |0
-<UE454> \x90\x49 |0
-<UE455> \x90\x4A |0
-<UE456> \x90\x4B |0
-<UE457> \x90\x4C |0
-<UE458> \x90\x4D |0
-<UE459> \x90\x4E |0
-<UE45A> \x90\x4F |0
-<UE45B> \x90\x50 |0
-<UE45C> \x90\x51 |0
-<UE45D> \x90\x52 |0
-<UE45E> \x90\x53 |0
-<UE45F> \x90\x54 |0
-<UE460> \x90\x55 |0
-<UE461> \x90\x56 |0
-<UE462> \x90\x57 |0
-<UE463> \x90\x58 |0
-<UE464> \x90\x59 |0
-<UE465> \x90\x5A |0
-<UE466> \x90\x5B |0
-<UE467> \x90\x5C |0
-<UE468> \x90\x5D |0
-<UE469> \x90\x5E |0
-<UE46A> \x90\x5F |0
-<UE46B> \x90\x60 |0
-<UE46C> \x90\x61 |0
-<UE46D> \x90\x62 |0
-<UE46E> \x90\x63 |0
-<UE46F> \x90\x64 |0
-<UE470> \x90\x65 |0
-<UE471> \x90\x66 |0
-<UE472> \x90\x67 |0
-<UE473> \x90\x68 |0
-<UE474> \x90\x69 |0
-<UE475> \x90\x6A |0
-<UE476> \x90\x6B |0
-<UE477> \x90\x6C |0
-<UE478> \x90\x6D |0
-<UE479> \x90\x6E |0
-<UE47A> \x90\x6F |0
-<UE47B> \x90\x70 |0
-<UE47C> \x90\x71 |0
-<UE47D> \x90\x72 |0
-<UE47E> \x90\x73 |0
-<UE47F> \x90\x74 |0
-<UE480> \x90\x75 |0
-<UE481> \x90\x76 |0
-<UE482> \x90\x77 |0
-<UE483> \x90\x78 |0
-<UE484> \x90\x79 |0
-<UE485> \x90\x7A |0
-<UE486> \x90\x7B |0
-<UE487> \x90\x7C |0
-<UE488> \x90\x7D |0
-<UE489> \x90\x7E |0
-<UE48A> \x90\xA1 |0
-<UE48B> \x90\xA2 |0
-<UE48C> \x90\xA3 |0
-<UE48D> \x90\xA4 |0
-<UE48E> \x90\xA5 |0
-<UE48F> \x90\xA6 |0
-<UE490> \x90\xA7 |0
-<UE491> \x90\xA8 |0
-<UE492> \x90\xA9 |0
-<UE493> \x90\xAA |0
-<UE494> \x90\xAB |0
-<UE495> \x90\xAC |0
-<UE496> \x90\xAD |0
-<UE497> \x90\xAE |0
-<UE498> \x90\xAF |0
-<UE499> \x90\xB0 |0
-<UE49A> \x90\xB1 |0
-<UE49B> \x90\xB2 |0
-<UE49C> \x90\xB3 |0
-<UE49D> \x90\xB4 |0
-<UE49E> \x90\xB5 |0
-<UE49F> \x90\xB6 |0
-<UE4A0> \x90\xB7 |0
-<UE4A1> \x90\xB8 |0
-<UE4A2> \x90\xB9 |0
-<UE4A3> \x90\xBA |0
-<UE4A4> \x90\xBB |0
-<UE4A5> \x90\xBC |0
-<UE4A6> \x90\xBD |0
-<UE4A7> \x90\xBE |0
-<UE4A8> \x90\xBF |0
-<UE4A9> \x90\xC0 |0
-<UE4AA> \x90\xC1 |0
-<UE4AB> \x90\xC2 |0
-<UE4AC> \x90\xC3 |0
-<UE4AD> \x90\xC4 |0
-<UE4AE> \x90\xC5 |0
-<UE4AF> \x90\xC6 |0
-<UE4B0> \x90\xC7 |0
-<UE4B1> \x90\xC8 |0
-<UE4B2> \x90\xC9 |0
-<UE4B3> \x90\xCA |0
-<UE4B4> \x90\xCB |0
-<UE4B5> \x90\xCC |0
-<UE4B6> \x90\xCD |0
-<UE4B7> \x90\xCE |0
-<UE4B8> \x90\xCF |0
-<UE4B9> \x90\xD0 |0
-<UE4BA> \x90\xD1 |0
-<UE4BB> \x90\xD2 |0
-<UE4BC> \x90\xD3 |0
-<UE4BD> \x90\xD4 |0
-<UE4BE> \x90\xD5 |0
-<UE4BF> \x90\xD6 |0
-<UE4C0> \x90\xD7 |0
-<UE4C1> \x90\xD8 |0
-<UE4C2> \x90\xD9 |0
-<UE4C3> \x90\xDA |0
-<UE4C4> \x90\xDB |0
-<UE4C5> \x90\xDC |0
-<UE4C6> \x90\xDD |0
-<UE4C7> \x90\xDE |0
-<UE4C8> \x90\xDF |0
-<UE4C9> \x90\xE0 |0
-<UE4CA> \x90\xE1 |0
-<UE4CB> \x90\xE2 |0
-<UE4CC> \x90\xE3 |0
-<UE4CD> \x90\xE4 |0
-<UE4CE> \x90\xE5 |0
-<UE4CF> \x90\xE6 |0
-<UE4D0> \x90\xE7 |0
-<UE4D1> \x90\xE8 |0
-<UE4D2> \x90\xE9 |0
-<UE4D3> \x90\xEA |0
-<UE4D4> \x90\xEB |0
-<UE4D5> \x90\xEC |0
-<UE4D6> \x90\xED |0
-<UE4D7> \x90\xEE |0
-<UE4D8> \x90\xEF |0
-<UE4D9> \x90\xF0 |0
-<UE4DA> \x90\xF1 |0
-<UE4DB> \x90\xF2 |0
-<UE4DC> \x90\xF3 |0
-<UE4DD> \x90\xF4 |0
-<UE4DE> \x90\xF5 |0
-<UE4DF> \x90\xF6 |0
-<UE4E0> \x90\xF7 |0
-<UE4E1> \x90\xF8 |0
-<UE4E2> \x90\xF9 |0
-<UE4E3> \x90\xFA |0
-<UE4E4> \x90\xFB |0
-<UE4E5> \x90\xFC |0
-<UE4E6> \x90\xFD |0
-<UE4E7> \x90\xFE |0
-<UE4E8> \x91\x40 |0
-<UE4E9> \x91\x41 |0
-<UE4EA> \x91\x42 |0
-<UE4EB> \x91\x43 |0
-<UE4EC> \x91\x44 |0
-<UE4ED> \x91\x45 |0
-<UE4EE> \x91\x46 |0
-<UE4EF> \x91\x47 |0
-<UE4F0> \x91\x48 |0
-<UE4F1> \x91\x49 |0
-<UE4F2> \x91\x4A |0
-<UE4F3> \x91\x4B |0
-<UE4F4> \x91\x4C |0
-<UE4F5> \x91\x4D |0
-<UE4F6> \x91\x4E |0
-<UE4F7> \x91\x4F |0
-<UE4F8> \x91\x50 |0
-<UE4F9> \x91\x51 |0
-<UE4FA> \x91\x52 |0
-<UE4FB> \x91\x53 |0
-<UE4FC> \x91\x54 |0
-<UE4FD> \x91\x55 |0
-<UE4FE> \x91\x56 |0
-<UE4FF> \x91\x57 |0
-<UE500> \x91\x58 |0
-<UE501> \x91\x59 |0
-<UE502> \x91\x5A |0
-<UE503> \x91\x5B |0
-<UE504> \x91\x5C |0
-<UE505> \x91\x5D |0
-<UE506> \x91\x5E |0
-<UE507> \x91\x5F |0
-<UE508> \x91\x60 |0
-<UE509> \x91\x61 |0
-<UE50A> \x91\x62 |0
-<UE50B> \x91\x63 |0
-<UE50C> \x91\x64 |0
-<UE50D> \x91\x65 |0
-<UE50E> \x91\x66 |0
-<UE50F> \x91\x67 |0
-<UE510> \x91\x68 |0
-<UE511> \x91\x69 |0
-<UE512> \x91\x6A |0
-<UE513> \x91\x6B |0
-<UE514> \x91\x6C |0
-<UE515> \x91\x6D |0
-<UE516> \x91\x6E |0
-<UE517> \x91\x6F |0
-<UE518> \x91\x70 |0
-<UE519> \x91\x71 |0
-<UE51A> \x91\x72 |0
-<UE51B> \x91\x73 |0
-<UE51C> \x91\x74 |0
-<UE51D> \x91\x75 |0
-<UE51E> \x91\x76 |0
-<UE51F> \x91\x77 |0
-<UE520> \x91\x78 |0
-<UE521> \x91\x79 |0
-<UE522> \x91\x7A |0
-<UE523> \x91\x7B |0
-<UE524> \x91\x7C |0
-<UE525> \x91\x7D |0
-<UE526> \x91\x7E |0
-<UE527> \x91\xA1 |0
-<UE528> \x91\xA2 |0
-<UE529> \x91\xA3 |0
-<UE52A> \x91\xA4 |0
-<UE52B> \x91\xA5 |0
-<UE52C> \x91\xA6 |0
-<UE52D> \x91\xA7 |0
-<UE52E> \x91\xA8 |0
-<UE52F> \x91\xA9 |0
-<UE530> \x91\xAA |0
-<UE531> \x91\xAB |0
-<UE532> \x91\xAC |0
-<UE533> \x91\xAD |0
-<UE534> \x91\xAE |0
-<UE535> \x91\xAF |0
-<UE536> \x91\xB0 |0
-<UE537> \x91\xB1 |0
-<UE538> \x91\xB2 |0
-<UE539> \x91\xB3 |0
-<UE53A> \x91\xB4 |0
-<UE53B> \x91\xB5 |0
-<UE53C> \x91\xB6 |0
-<UE53D> \x91\xB7 |0
-<UE53E> \x91\xB8 |0
-<UE53F> \x91\xB9 |0
-<UE540> \x91\xBA |0
-<UE541> \x91\xBB |0
-<UE542> \x91\xBC |0
-<UE543> \x91\xBD |0
-<UE544> \x91\xBE |0
-<UE545> \x91\xBF |0
-<UE546> \x91\xC0 |0
-<UE547> \x91\xC1 |0
-<UE548> \x91\xC2 |0
-<UE549> \x91\xC3 |0
-<UE54A> \x91\xC4 |0
-<UE54B> \x91\xC5 |0
-<UE54C> \x91\xC6 |0
-<UE54D> \x91\xC7 |0
-<UE54E> \x91\xC8 |0
-<UE54F> \x91\xC9 |0
-<UE550> \x91\xCA |0
-<UE551> \x91\xCB |0
-<UE552> \x91\xCC |0
-<UE553> \x91\xCD |0
-<UE554> \x91\xCE |0
-<UE555> \x91\xCF |0
-<UE556> \x91\xD0 |0
-<UE557> \x91\xD1 |0
-<UE558> \x91\xD2 |0
-<UE559> \x91\xD3 |0
-<UE55A> \x91\xD4 |0
-<UE55B> \x91\xD5 |0
-<UE55C> \x91\xD6 |0
-<UE55D> \x91\xD7 |0
-<UE55E> \x91\xD8 |0
-<UE55F> \x91\xD9 |0
-<UE560> \x91\xDA |0
-<UE561> \x91\xDB |0
-<UE562> \x91\xDC |0
-<UE563> \x91\xDD |0
-<UE564> \x91\xDE |0
-<UE565> \x91\xDF |0
-<UE566> \x91\xE0 |0
-<UE567> \x91\xE1 |0
-<UE568> \x91\xE2 |0
-<UE569> \x91\xE3 |0
-<UE56A> \x91\xE4 |0
-<UE56B> \x91\xE5 |0
-<UE56C> \x91\xE6 |0
-<UE56D> \x91\xE7 |0
-<UE56E> \x91\xE8 |0
-<UE56F> \x91\xE9 |0
-<UE570> \x91\xEA |0
-<UE571> \x91\xEB |0
-<UE572> \x91\xEC |0
-<UE573> \x91\xED |0
-<UE574> \x91\xEE |0
-<UE575> \x91\xEF |0
-<UE576> \x91\xF0 |0
-<UE577> \x91\xF1 |0
-<UE578> \x91\xF2 |0
-<UE579> \x91\xF3 |0
-<UE57A> \x91\xF4 |0
-<UE57B> \x91\xF5 |0
-<UE57C> \x91\xF6 |0
-<UE57D> \x91\xF7 |0
-<UE57E> \x91\xF8 |0
-<UE57F> \x91\xF9 |0
-<UE580> \x91\xFA |0
-<UE581> \x91\xFB |0
-<UE582> \x91\xFC |0
-<UE583> \x91\xFD |0
-<UE584> \x91\xFE |0
-<UE585> \x92\x40 |0
-<UE586> \x92\x41 |0
-<UE587> \x92\x42 |0
-<UE588> \x92\x43 |0
-<UE589> \x92\x44 |0
-<UE58A> \x92\x45 |0
-<UE58B> \x92\x46 |0
-<UE58C> \x92\x47 |0
-<UE58D> \x92\x48 |0
-<UE58E> \x92\x49 |0
-<UE58F> \x92\x4A |0
-<UE590> \x92\x4B |0
-<UE591> \x92\x4C |0
-<UE592> \x92\x4D |0
-<UE593> \x92\x4E |0
-<UE594> \x92\x4F |0
-<UE595> \x92\x50 |0
-<UE596> \x92\x51 |0
-<UE597> \x92\x52 |0
-<UE598> \x92\x53 |0
-<UE599> \x92\x54 |0
-<UE59A> \x92\x55 |0
-<UE59B> \x92\x56 |0
-<UE59C> \x92\x57 |0
-<UE59D> \x92\x58 |0
-<UE59E> \x92\x59 |0
-<UE59F> \x92\x5A |0
-<UE5A0> \x92\x5B |0
-<UE5A1> \x92\x5C |0
-<UE5A2> \x92\x5D |0
-<UE5A3> \x92\x5E |0
-<UE5A4> \x92\x5F |0
-<UE5A5> \x92\x60 |0
-<UE5A6> \x92\x61 |0
-<UE5A7> \x92\x62 |0
-<UE5A8> \x92\x63 |0
-<UE5A9> \x92\x64 |0
-<UE5AA> \x92\x65 |0
-<UE5AB> \x92\x66 |0
-<UE5AC> \x92\x67 |0
-<UE5AD> \x92\x68 |0
-<UE5AE> \x92\x69 |0
-<UE5AF> \x92\x6A |0
-<UE5B0> \x92\x6B |0
-<UE5B1> \x92\x6C |0
-<UE5B2> \x92\x6D |0
-<UE5B3> \x92\x6E |0
-<UE5B4> \x92\x6F |0
-<UE5B5> \x92\x70 |0
-<UE5B6> \x92\x71 |0
-<UE5B7> \x92\x72 |0
-<UE5B8> \x92\x73 |0
-<UE5B9> \x92\x74 |0
-<UE5BA> \x92\x75 |0
-<UE5BB> \x92\x76 |0
-<UE5BC> \x92\x77 |0
-<UE5BD> \x92\x78 |0
-<UE5BE> \x92\x79 |0
-<UE5BF> \x92\x7A |0
-<UE5C0> \x92\x7B |0
-<UE5C1> \x92\x7C |0
-<UE5C2> \x92\x7D |0
-<UE5C3> \x92\x7E |0
-<UE5C4> \x92\xA1 |0
-<UE5C5> \x92\xA2 |0
-<UE5C6> \x92\xA3 |0
-<UE5C7> \x92\xA4 |0
-<UE5C8> \x92\xA5 |0
-<UE5C9> \x92\xA6 |0
-<UE5CA> \x92\xA7 |0
-<UE5CB> \x92\xA8 |0
-<UE5CC> \x92\xA9 |0
-<UE5CD> \x92\xAA |0
-<UE5CE> \x92\xAB |0
-<UE5CF> \x92\xAC |0
-<UE5D0> \x92\xAD |0
-<UE5D1> \x92\xAE |0
-<UE5D2> \x92\xAF |0
-<UE5D3> \x92\xB0 |0
-<UE5D4> \x92\xB1 |0
-<UE5D5> \x92\xB2 |0
-<UE5D6> \x92\xB3 |0
-<UE5D7> \x92\xB4 |0
-<UE5D8> \x92\xB5 |0
-<UE5D9> \x92\xB6 |0
-<UE5DA> \x92\xB7 |0
-<UE5DB> \x92\xB8 |0
-<UE5DC> \x92\xB9 |0
-<UE5DD> \x92\xBA |0
-<UE5DE> \x92\xBB |0
-<UE5DF> \x92\xBC |0
-<UE5E0> \x92\xBD |0
-<UE5E1> \x92\xBE |0
-<UE5E2> \x92\xBF |0
-<UE5E3> \x92\xC0 |0
-<UE5E4> \x92\xC1 |0
-<UE5E5> \x92\xC2 |0
-<UE5E6> \x92\xC3 |0
-<UE5E7> \x92\xC4 |0
-<UE5E8> \x92\xC5 |0
-<UE5E9> \x92\xC6 |0
-<UE5EA> \x92\xC7 |0
-<UE5EB> \x92\xC8 |0
-<UE5EC> \x92\xC9 |0
-<UE5ED> \x92\xCA |0
-<UE5EE> \x92\xCB |0
-<UE5EF> \x92\xCC |0
-<UE5F0> \x92\xCD |0
-<UE5F1> \x92\xCE |0
-<UE5F2> \x92\xCF |0
-<UE5F3> \x92\xD0 |0
-<UE5F4> \x92\xD1 |0
-<UE5F5> \x92\xD2 |0
-<UE5F6> \x92\xD3 |0
-<UE5F7> \x92\xD4 |0
-<UE5F8> \x92\xD5 |0
-<UE5F9> \x92\xD6 |0
-<UE5FA> \x92\xD7 |0
-<UE5FB> \x92\xD8 |0
-<UE5FC> \x92\xD9 |0
-<UE5FD> \x92\xDA |0
-<UE5FE> \x92\xDB |0
-<UE5FF> \x92\xDC |0
-<UE600> \x92\xDD |0
-<UE601> \x92\xDE |0
-<UE602> \x92\xDF |0
-<UE603> \x92\xE0 |0
-<UE604> \x92\xE1 |0
-<UE605> \x92\xE2 |0
-<UE606> \x92\xE3 |0
-<UE607> \x92\xE4 |0
-<UE608> \x92\xE5 |0
-<UE609> \x92\xE6 |0
-<UE60A> \x92\xE7 |0
-<UE60B> \x92\xE8 |0
-<UE60C> \x92\xE9 |0
-<UE60D> \x92\xEA |0
-<UE60E> \x92\xEB |0
-<UE60F> \x92\xEC |0
-<UE610> \x92\xED |0
-<UE611> \x92\xEE |0
-<UE612> \x92\xEF |0
-<UE613> \x92\xF0 |0
-<UE614> \x92\xF1 |0
-<UE615> \x92\xF2 |0
-<UE616> \x92\xF3 |0
-<UE617> \x92\xF4 |0
-<UE618> \x92\xF5 |0
-<UE619> \x92\xF6 |0
-<UE61A> \x92\xF7 |0
-<UE61B> \x92\xF8 |0
-<UE61C> \x92\xF9 |0
-<UE61D> \x92\xFA |0
-<UE61E> \x92\xFB |0
-<UE61F> \x92\xFC |0
-<UE620> \x92\xFD |0
-<UE621> \x92\xFE |0
-<UE622> \x93\x40 |0
-<UE623> \x93\x41 |0
-<UE624> \x93\x42 |0
-<UE625> \x93\x43 |0
-<UE626> \x93\x44 |0
-<UE627> \x93\x45 |0
-<UE628> \x93\x46 |0
-<UE629> \x93\x47 |0
-<UE62A> \x93\x48 |0
-<UE62B> \x93\x49 |0
-<UE62C> \x93\x4A |0
-<UE62D> \x93\x4B |0
-<UE62E> \x93\x4C |0
-<UE62F> \x93\x4D |0
-<UE630> \x93\x4E |0
-<UE631> \x93\x4F |0
-<UE632> \x93\x50 |0
-<UE633> \x93\x51 |0
-<UE634> \x93\x52 |0
-<UE635> \x93\x53 |0
-<UE636> \x93\x54 |0
-<UE637> \x93\x55 |0
-<UE638> \x93\x56 |0
-<UE639> \x93\x57 |0
-<UE63A> \x93\x58 |0
-<UE63B> \x93\x59 |0
-<UE63C> \x93\x5A |0
-<UE63D> \x93\x5B |0
-<UE63E> \x93\x5C |0
-<UE63F> \x93\x5D |0
-<UE640> \x93\x5E |0
-<UE641> \x93\x5F |0
-<UE642> \x93\x60 |0
-<UE643> \x93\x61 |0
-<UE644> \x93\x62 |0
-<UE645> \x93\x63 |0
-<UE646> \x93\x64 |0
-<UE647> \x93\x65 |0
-<UE648> \x93\x66 |0
-<UE649> \x93\x67 |0
-<UE64A> \x93\x68 |0
-<UE64B> \x93\x69 |0
-<UE64C> \x93\x6A |0
-<UE64D> \x93\x6B |0
-<UE64E> \x93\x6C |0
-<UE64F> \x93\x6D |0
-<UE650> \x93\x6E |0
-<UE651> \x93\x6F |0
-<UE652> \x93\x70 |0
-<UE653> \x93\x71 |0
-<UE654> \x93\x72 |0
-<UE655> \x93\x73 |0
-<UE656> \x93\x74 |0
-<UE657> \x93\x75 |0
-<UE658> \x93\x76 |0
-<UE659> \x93\x77 |0
-<UE65A> \x93\x78 |0
-<UE65B> \x93\x79 |0
-<UE65C> \x93\x7A |0
-<UE65D> \x93\x7B |0
-<UE65E> \x93\x7C |0
-<UE65F> \x93\x7D |0
-<UE660> \x93\x7E |0
-<UE661> \x93\xA1 |0
-<UE662> \x93\xA2 |0
-<UE663> \x93\xA3 |0
-<UE664> \x93\xA4 |0
-<UE665> \x93\xA5 |0
-<UE666> \x93\xA6 |0
-<UE667> \x93\xA7 |0
-<UE668> \x93\xA8 |0
-<UE669> \x93\xA9 |0
-<UE66A> \x93\xAA |0
-<UE66B> \x93\xAB |0
-<UE66C> \x93\xAC |0
-<UE66D> \x93\xAD |0
-<UE66E> \x93\xAE |0
-<UE66F> \x93\xAF |0
-<UE670> \x93\xB0 |0
-<UE671> \x93\xB1 |0
-<UE672> \x93\xB2 |0
-<UE673> \x93\xB3 |0
-<UE674> \x93\xB4 |0
-<UE675> \x93\xB5 |0
-<UE676> \x93\xB6 |0
-<UE677> \x93\xB7 |0
-<UE678> \x93\xB8 |0
-<UE679> \x93\xB9 |0
-<UE67A> \x93\xBA |0
-<UE67B> \x93\xBB |0
-<UE67C> \x93\xBC |0
-<UE67D> \x93\xBD |0
-<UE67E> \x93\xBE |0
-<UE67F> \x93\xBF |0
-<UE680> \x93\xC0 |0
-<UE681> \x93\xC1 |0
-<UE682> \x93\xC2 |0
-<UE683> \x93\xC3 |0
-<UE684> \x93\xC4 |0
-<UE685> \x93\xC5 |0
-<UE686> \x93\xC6 |0
-<UE687> \x93\xC7 |0
-<UE688> \x93\xC8 |0
-<UE689> \x93\xC9 |0
-<UE68A> \x93\xCA |0
-<UE68B> \x93\xCB |0
-<UE68C> \x93\xCC |0
-<UE68D> \x93\xCD |0
-<UE68E> \x93\xCE |0
-<UE68F> \x93\xCF |0
-<UE690> \x93\xD0 |0
-<UE691> \x93\xD1 |0
-<UE692> \x93\xD2 |0
-<UE693> \x93\xD3 |0
-<UE694> \x93\xD4 |0
-<UE695> \x93\xD5 |0
-<UE696> \x93\xD6 |0
-<UE697> \x93\xD7 |0
-<UE698> \x93\xD8 |0
-<UE699> \x93\xD9 |0
-<UE69A> \x93\xDA |0
-<UE69B> \x93\xDB |0
-<UE69C> \x93\xDC |0
-<UE69D> \x93\xDD |0
-<UE69E> \x93\xDE |0
-<UE69F> \x93\xDF |0
-<UE6A0> \x93\xE0 |0
-<UE6A1> \x93\xE1 |0
-<UE6A2> \x93\xE2 |0
-<UE6A3> \x93\xE3 |0
-<UE6A4> \x93\xE4 |0
-<UE6A5> \x93\xE5 |0
-<UE6A6> \x93\xE6 |0
-<UE6A7> \x93\xE7 |0
-<UE6A8> \x93\xE8 |0
-<UE6A9> \x93\xE9 |0
-<UE6AA> \x93\xEA |0
-<UE6AB> \x93\xEB |0
-<UE6AC> \x93\xEC |0
-<UE6AD> \x93\xED |0
-<UE6AE> \x93\xEE |0
-<UE6AF> \x93\xEF |0
-<UE6B0> \x93\xF0 |0
-<UE6B1> \x93\xF1 |0
-<UE6B2> \x93\xF2 |0
-<UE6B3> \x93\xF3 |0
-<UE6B4> \x93\xF4 |0
-<UE6B5> \x93\xF5 |0
-<UE6B6> \x93\xF6 |0
-<UE6B7> \x93\xF7 |0
-<UE6B8> \x93\xF8 |0
-<UE6B9> \x93\xF9 |0
-<UE6BA> \x93\xFA |0
-<UE6BB> \x93\xFB |0
-<UE6BC> \x93\xFC |0
-<UE6BD> \x93\xFD |0
-<UE6BE> \x93\xFE |0
-<UE6BF> \x94\x40 |0
-<UE6C0> \x94\x41 |0
-<UE6C1> \x94\x42 |0
-<UE6C2> \x94\x43 |0
-<UE6C3> \x94\x44 |0
-<UE6C4> \x94\x45 |0
-<UE6C5> \x94\x46 |0
-<UE6C6> \x94\x47 |0
-<UE6C7> \x94\x48 |0
-<UE6C8> \x94\x49 |0
-<UE6C9> \x94\x4A |0
-<UE6CA> \x94\x4B |0
-<UE6CB> \x94\x4C |0
-<UE6CC> \x94\x4D |0
-<UE6CD> \x94\x4E |0
-<UE6CE> \x94\x4F |0
-<UE6CF> \x94\x50 |0
-<UE6D0> \x94\x51 |0
-<UE6D1> \x94\x52 |0
-<UE6D2> \x94\x53 |0
-<UE6D3> \x94\x54 |0
-<UE6D4> \x94\x55 |0
-<UE6D5> \x94\x56 |0
-<UE6D6> \x94\x57 |0
-<UE6D7> \x94\x58 |0
-<UE6D8> \x94\x59 |0
-<UE6D9> \x94\x5A |0
-<UE6DA> \x94\x5B |0
-<UE6DB> \x94\x5C |0
-<UE6DC> \x94\x5D |0
-<UE6DD> \x94\x5E |0
-<UE6DE> \x94\x5F |0
-<UE6DF> \x94\x60 |0
-<UE6E0> \x94\x61 |0
-<UE6E1> \x94\x62 |0
-<UE6E2> \x94\x63 |0
-<UE6E3> \x94\x64 |0
-<UE6E4> \x94\x65 |0
-<UE6E5> \x94\x66 |0
-<UE6E6> \x94\x67 |0
-<UE6E7> \x94\x68 |0
-<UE6E8> \x94\x69 |0
-<UE6E9> \x94\x6A |0
-<UE6EA> \x94\x6B |0
-<UE6EB> \x94\x6C |0
-<UE6EC> \x94\x6D |0
-<UE6ED> \x94\x6E |0
-<UE6EE> \x94\x6F |0
-<UE6EF> \x94\x70 |0
-<UE6F0> \x94\x71 |0
-<UE6F1> \x94\x72 |0
-<UE6F2> \x94\x73 |0
-<UE6F3> \x94\x74 |0
-<UE6F4> \x94\x75 |0
-<UE6F5> \x94\x76 |0
-<UE6F6> \x94\x77 |0
-<UE6F7> \x94\x78 |0
-<UE6F8> \x94\x79 |0
-<UE6F9> \x94\x7A |0
-<UE6FA> \x94\x7B |0
-<UE6FB> \x94\x7C |0
-<UE6FC> \x94\x7D |0
-<UE6FD> \x94\x7E |0
-<UE6FE> \x94\xA1 |0
-<UE6FF> \x94\xA2 |0
-<UE700> \x94\xA3 |0
-<UE701> \x94\xA4 |0
-<UE702> \x94\xA5 |0
-<UE703> \x94\xA6 |0
-<UE704> \x94\xA7 |0
-<UE705> \x94\xA8 |0
-<UE706> \x94\xA9 |0
-<UE707> \x94\xAA |0
-<UE708> \x94\xAB |0
-<UE709> \x94\xAC |0
-<UE70A> \x94\xAD |0
-<UE70B> \x94\xAE |0
-<UE70C> \x94\xAF |0
-<UE70D> \x94\xB0 |0
-<UE70E> \x94\xB1 |0
-<UE70F> \x94\xB2 |0
-<UE710> \x94\xB3 |0
-<UE711> \x94\xB4 |0
-<UE712> \x94\xB5 |0
-<UE713> \x94\xB6 |0
-<UE714> \x94\xB7 |0
-<UE715> \x94\xB8 |0
-<UE716> \x94\xB9 |0
-<UE717> \x94\xBA |0
-<UE718> \x94\xBB |0
-<UE719> \x94\xBC |0
-<UE71A> \x94\xBD |0
-<UE71B> \x94\xBE |0
-<UE71C> \x94\xBF |0
-<UE71D> \x94\xC0 |0
-<UE71E> \x94\xC1 |0
-<UE71F> \x94\xC2 |0
-<UE720> \x94\xC3 |0
-<UE721> \x94\xC4 |0
-<UE722> \x94\xC5 |0
-<UE723> \x94\xC6 |0
-<UE724> \x94\xC7 |0
-<UE725> \x94\xC8 |0
-<UE726> \x94\xC9 |0
-<UE727> \x94\xCA |0
-<UE728> \x94\xCB |0
-<UE729> \x94\xCC |0
-<UE72A> \x94\xCD |0
-<UE72B> \x94\xCE |0
-<UE72C> \x94\xCF |0
-<UE72D> \x94\xD0 |0
-<UE72E> \x94\xD1 |0
-<UE72F> \x94\xD2 |0
-<UE730> \x94\xD3 |0
-<UE731> \x94\xD4 |0
-<UE732> \x94\xD5 |0
-<UE733> \x94\xD6 |0
-<UE734> \x94\xD7 |0
-<UE735> \x94\xD8 |0
-<UE736> \x94\xD9 |0
-<UE737> \x94\xDA |0
-<UE738> \x94\xDB |0
-<UE739> \x94\xDC |0
-<UE73A> \x94\xDD |0
-<UE73B> \x94\xDE |0
-<UE73C> \x94\xDF |0
-<UE73D> \x94\xE0 |0
-<UE73E> \x94\xE1 |0
-<UE73F> \x94\xE2 |0
-<UE740> \x94\xE3 |0
-<UE741> \x94\xE4 |0
-<UE742> \x94\xE5 |0
-<UE743> \x94\xE6 |0
-<UE744> \x94\xE7 |0
-<UE745> \x94\xE8 |0
-<UE746> \x94\xE9 |0
-<UE747> \x94\xEA |0
-<UE748> \x94\xEB |0
-<UE749> \x94\xEC |0
-<UE74A> \x94\xED |0
-<UE74B> \x94\xEE |0
-<UE74C> \x94\xEF |0
-<UE74D> \x94\xF0 |0
-<UE74E> \x94\xF1 |0
-<UE74F> \x94\xF2 |0
-<UE750> \x94\xF3 |0
-<UE751> \x94\xF4 |0
-<UE752> \x94\xF5 |0
-<UE753> \x94\xF6 |0
-<UE754> \x94\xF7 |0
-<UE755> \x94\xF8 |0
-<UE756> \x94\xF9 |0
-<UE757> \x94\xFA |0
-<UE758> \x94\xFB |0
-<UE759> \x94\xFC |0
-<UE75A> \x94\xFD |0
-<UE75B> \x94\xFE |0
-<UE75C> \x95\x40 |0
-<UE75D> \x95\x41 |0
-<UE75E> \x95\x42 |0
-<UE75F> \x95\x43 |0
-<UE760> \x95\x44 |0
-<UE761> \x95\x45 |0
-<UE762> \x95\x46 |0
-<UE763> \x95\x47 |0
-<UE764> \x95\x48 |0
-<UE765> \x95\x49 |0
-<UE766> \x95\x4A |0
-<UE767> \x95\x4B |0
-<UE768> \x95\x4C |0
-<UE769> \x95\x4D |0
-<UE76A> \x95\x4E |0
-<UE76B> \x95\x4F |0
-<UE76C> \x95\x50 |0
-<UE76D> \x95\x51 |0
-<UE76E> \x95\x52 |0
-<UE76F> \x95\x53 |0
-<UE770> \x95\x54 |0
-<UE771> \x95\x55 |0
-<UE772> \x95\x56 |0
-<UE773> \x95\x57 |0
-<UE774> \x95\x58 |0
-<UE775> \x95\x59 |0
-<UE776> \x95\x5A |0
-<UE777> \x95\x5B |0
-<UE778> \x95\x5C |0
-<UE779> \x95\x5D |0
-<UE77A> \x95\x5E |0
-<UE77B> \x95\x5F |0
-<UE77C> \x95\x60 |0
-<UE77D> \x95\x61 |0
-<UE77E> \x95\x62 |0
-<UE77F> \x95\x63 |0
-<UE780> \x95\x64 |0
-<UE781> \x95\x65 |0
-<UE782> \x95\x66 |0
-<UE783> \x95\x67 |0
-<UE784> \x95\x68 |0
-<UE785> \x95\x69 |0
-<UE786> \x95\x6A |0
-<UE787> \x95\x6B |0
-<UE788> \x95\x6C |0
-<UE789> \x95\x6D |0
-<UE78A> \x95\x6E |0
-<UE78B> \x95\x6F |0
-<UE78C> \x95\x70 |0
-<UE78D> \x95\x71 |0
-<UE78E> \x95\x72 |0
-<UE78F> \x95\x73 |0
-<UE790> \x95\x74 |0
-<UE791> \x95\x75 |0
-<UE792> \x95\x76 |0
-<UE793> \x95\x77 |0
-<UE794> \x95\x78 |0
-<UE795> \x95\x79 |0
-<UE796> \x95\x7A |0
-<UE797> \x95\x7B |0
-<UE798> \x95\x7C |0
-<UE799> \x95\x7D |0
-<UE79A> \x95\x7E |0
-<UE79B> \x95\xA1 |0
-<UE79C> \x95\xA2 |0
-<UE79D> \x95\xA3 |0
-<UE79E> \x95\xA4 |0
-<UE79F> \x95\xA5 |0
-<UE7A0> \x95\xA6 |0
-<UE7A1> \x95\xA7 |0
-<UE7A2> \x95\xA8 |0
-<UE7A3> \x95\xA9 |0
-<UE7A4> \x95\xAA |0
-<UE7A5> \x95\xAB |0
-<UE7A6> \x95\xAC |0
-<UE7A7> \x95\xAD |0
-<UE7A8> \x95\xAE |0
-<UE7A9> \x95\xAF |0
-<UE7AA> \x95\xB0 |0
-<UE7AB> \x95\xB1 |0
-<UE7AC> \x95\xB2 |0
-<UE7AD> \x95\xB3 |0
-<UE7AE> \x95\xB4 |0
-<UE7AF> \x95\xB5 |0
-<UE7B0> \x95\xB6 |0
-<UE7B1> \x95\xB7 |0
-<UE7B2> \x95\xB8 |0
-<UE7B3> \x95\xB9 |0
-<UE7B4> \x95\xBA |0
-<UE7B5> \x95\xBB |0
-<UE7B6> \x95\xBC |0
-<UE7B7> \x95\xBD |0
-<UE7B8> \x95\xBE |0
-<UE7B9> \x95\xBF |0
-<UE7BA> \x95\xC0 |0
-<UE7BB> \x95\xC1 |0
-<UE7BC> \x95\xC2 |0
-<UE7BD> \x95\xC3 |0
-<UE7BE> \x95\xC4 |0
-<UE7BF> \x95\xC5 |0
-<UE7C0> \x95\xC6 |0
-<UE7C1> \x95\xC7 |0
-<UE7C2> \x95\xC8 |0
-<UE7C3> \x95\xC9 |0
-<UE7C4> \x95\xCA |0
-<UE7C5> \x95\xCB |0
-<UE7C6> \x95\xCC |0
-<UE7C7> \x95\xCD |0
-<UE7C8> \x95\xCE |0
-<UE7C9> \x95\xCF |0
-<UE7CA> \x95\xD0 |0
-<UE7CB> \x95\xD1 |0
-<UE7CC> \x95\xD2 |0
-<UE7CD> \x95\xD3 |0
-<UE7CE> \x95\xD4 |0
-<UE7CF> \x95\xD5 |0
-<UE7D0> \x95\xD6 |0
-<UE7D1> \x95\xD7 |0
-<UE7D2> \x95\xD8 |0
-<UE7D3> \x95\xD9 |0
-<UE7D4> \x95\xDA |0
-<UE7D5> \x95\xDB |0
-<UE7D6> \x95\xDC |0
-<UE7D7> \x95\xDD |0
-<UE7D8> \x95\xDE |0
-<UE7D9> \x95\xDF |0
-<UE7DA> \x95\xE0 |0
-<UE7DB> \x95\xE1 |0
-<UE7DC> \x95\xE2 |0
-<UE7DD> \x95\xE3 |0
-<UE7DE> \x95\xE4 |0
-<UE7DF> \x95\xE5 |0
-<UE7E0> \x95\xE6 |0
-<UE7E1> \x95\xE7 |0
-<UE7E2> \x95\xE8 |0
-<UE7E3> \x95\xE9 |0
-<UE7E4> \x95\xEA |0
-<UE7E5> \x95\xEB |0
-<UE7E6> \x95\xEC |0
-<UE7E7> \x95\xED |0
-<UE7E8> \x95\xEE |0
-<UE7E9> \x95\xEF |0
-<UE7EA> \x95\xF0 |0
-<UE7EB> \x95\xF1 |0
-<UE7EC> \x95\xF2 |0
-<UE7ED> \x95\xF3 |0
-<UE7EE> \x95\xF4 |0
-<UE7EF> \x95\xF5 |0
-<UE7F0> \x95\xF6 |0
-<UE7F1> \x95\xF7 |0
-<UE7F2> \x95\xF8 |0
-<UE7F3> \x95\xF9 |0
-<UE7F4> \x95\xFA |0
-<UE7F5> \x95\xFB |0
-<UE7F6> \x95\xFC |0
-<UE7F7> \x95\xFD |0
-<UE7F8> \x95\xFE |0
-<UE7F9> \x96\x40 |0
-<UE7FA> \x96\x41 |0
-<UE7FB> \x96\x42 |0
-<UE7FC> \x96\x43 |0
-<UE7FD> \x96\x44 |0
-<UE7FE> \x96\x45 |0
-<UE7FF> \x96\x46 |0
-<UE800> \x96\x47 |0
-<UE801> \x96\x48 |0
-<UE802> \x96\x49 |0
-<UE803> \x96\x4A |0
-<UE804> \x96\x4B |0
-<UE805> \x96\x4C |0
-<UE806> \x96\x4D |0
-<UE807> \x96\x4E |0
-<UE808> \x96\x4F |0
-<UE809> \x96\x50 |0
-<UE80A> \x96\x51 |0
-<UE80B> \x96\x52 |0
-<UE80C> \x96\x53 |0
-<UE80D> \x96\x54 |0
-<UE80E> \x96\x55 |0
-<UE80F> \x96\x56 |0
-<UE810> \x96\x57 |0
-<UE811> \x96\x58 |0
-<UE812> \x96\x59 |0
-<UE813> \x96\x5A |0
-<UE814> \x96\x5B |0
-<UE815> \x96\x5C |0
-<UE816> \x96\x5D |0
-<UE817> \x96\x5E |0
-<UE818> \x96\x5F |0
-<UE819> \x96\x60 |0
-<UE81A> \x96\x61 |0
-<UE81B> \x96\x62 |0
-<UE81C> \x96\x63 |0
-<UE81D> \x96\x64 |0
-<UE81E> \x96\x65 |0
-<UE81F> \x96\x66 |0
-<UE820> \x96\x67 |0
-<UE821> \x96\x68 |0
-<UE822> \x96\x69 |0
-<UE823> \x96\x6A |0
-<UE824> \x96\x6B |0
-<UE825> \x96\x6C |0
-<UE826> \x96\x6D |0
-<UE827> \x96\x6E |0
-<UE828> \x96\x6F |0
-<UE829> \x96\x70 |0
-<UE82A> \x96\x71 |0
-<UE82B> \x96\x72 |0
-<UE82C> \x96\x73 |0
-<UE82D> \x96\x74 |0
-<UE82E> \x96\x75 |0
-<UE82F> \x96\x76 |0
-<UE830> \x96\x77 |0
-<UE831> \x96\x78 |0
-<UE832> \x96\x79 |0
-<UE833> \x96\x7A |0
-<UE834> \x96\x7B |0
-<UE835> \x96\x7C |0
-<UE836> \x96\x7D |0
-<UE837> \x96\x7E |0
-<UE838> \x96\xA1 |0
-<UE839> \x96\xA2 |0
-<UE83A> \x96\xA3 |0
-<UE83B> \x96\xA4 |0
-<UE83C> \x96\xA5 |0
-<UE83D> \x96\xA6 |0
-<UE83E> \x96\xA7 |0
-<UE83F> \x96\xA8 |0
-<UE840> \x96\xA9 |0
-<UE841> \x96\xAA |0
-<UE842> \x96\xAB |0
-<UE843> \x96\xAC |0
-<UE844> \x96\xAD |0
-<UE845> \x96\xAE |0
-<UE846> \x96\xAF |0
-<UE847> \x96\xB0 |0
-<UE848> \x96\xB1 |0
-<UE849> \x96\xB2 |0
-<UE84A> \x96\xB3 |0
-<UE84B> \x96\xB4 |0
-<UE84C> \x96\xB5 |0
-<UE84D> \x96\xB6 |0
-<UE84E> \x96\xB7 |0
-<UE84F> \x96\xB8 |0
-<UE850> \x96\xB9 |0
-<UE851> \x96\xBA |0
-<UE852> \x96\xBB |0
-<UE853> \x96\xBC |0
-<UE854> \x96\xBD |0
-<UE855> \x96\xBE |0
-<UE856> \x96\xBF |0
-<UE857> \x96\xC0 |0
-<UE858> \x96\xC1 |0
-<UE859> \x96\xC2 |0
-<UE85A> \x96\xC3 |0
-<UE85B> \x96\xC4 |0
-<UE85C> \x96\xC5 |0
-<UE85D> \x96\xC6 |0
-<UE85E> \x96\xC7 |0
-<UE85F> \x96\xC8 |0
-<UE860> \x96\xC9 |0
-<UE861> \x96\xCA |0
-<UE862> \x96\xCB |0
-<UE863> \x96\xCC |0
-<UE864> \x96\xCD |0
-<UE865> \x96\xCE |0
-<UE866> \x96\xCF |0
-<UE867> \x96\xD0 |0
-<UE868> \x96\xD1 |0
-<UE869> \x96\xD2 |0
-<UE86A> \x96\xD3 |0
-<UE86B> \x96\xD4 |0
-<UE86C> \x96\xD5 |0
-<UE86D> \x96\xD6 |0
-<UE86E> \x96\xD7 |0
-<UE86F> \x96\xD8 |0
-<UE870> \x96\xD9 |0
-<UE871> \x96\xDA |0
-<UE872> \x96\xDB |0
-<UE873> \x96\xDC |0
-<UE874> \x96\xDD |0
-<UE875> \x96\xDE |0
-<UE876> \x96\xDF |0
-<UE877> \x96\xE0 |0
-<UE878> \x96\xE1 |0
-<UE879> \x96\xE2 |0
-<UE87A> \x96\xE3 |0
-<UE87B> \x96\xE4 |0
-<UE87C> \x96\xE5 |0
-<UE87D> \x96\xE6 |0
-<UE87E> \x96\xE7 |0
-<UE87F> \x96\xE8 |0
-<UE880> \x96\xE9 |0
-<UE881> \x96\xEA |0
-<UE882> \x96\xEB |0
-<UE883> \x96\xEC |0
-<UE884> \x96\xED |0
-<UE885> \x96\xEE |0
-<UE886> \x96\xEF |0
-<UE887> \x96\xF0 |0
-<UE888> \x96\xF1 |0
-<UE889> \x96\xF2 |0
-<UE88A> \x96\xF3 |0
-<UE88B> \x96\xF4 |0
-<UE88C> \x96\xF5 |0
-<UE88D> \x96\xF6 |0
-<UE88E> \x96\xF7 |0
-<UE88F> \x96\xF8 |0
-<UE890> \x96\xF9 |0
-<UE891> \x96\xFA |0
-<UE892> \x96\xFB |0
-<UE893> \x96\xFC |0
-<UE894> \x96\xFD |0
-<UE895> \x96\xFE |0
-<UE896> \x97\x40 |0
-<UE897> \x97\x41 |0
-<UE898> \x97\x42 |0
-<UE899> \x97\x43 |0
-<UE89A> \x97\x44 |0
-<UE89B> \x97\x45 |0
-<UE89C> \x97\x46 |0
-<UE89D> \x97\x47 |0
-<UE89E> \x97\x48 |0
-<UE89F> \x97\x49 |0
-<UE8A0> \x97\x4A |0
-<UE8A1> \x97\x4B |0
-<UE8A2> \x97\x4C |0
-<UE8A3> \x97\x4D |0
-<UE8A4> \x97\x4E |0
-<UE8A5> \x97\x4F |0
-<UE8A6> \x97\x50 |0
-<UE8A7> \x97\x51 |0
-<UE8A8> \x97\x52 |0
-<UE8A9> \x97\x53 |0
-<UE8AA> \x97\x54 |0
-<UE8AB> \x97\x55 |0
-<UE8AC> \x97\x56 |0
-<UE8AD> \x97\x57 |0
-<UE8AE> \x97\x58 |0
-<UE8AF> \x97\x59 |0
-<UE8B0> \x97\x5A |0
-<UE8B1> \x97\x5B |0
-<UE8B2> \x97\x5C |0
-<UE8B3> \x97\x5D |0
-<UE8B4> \x97\x5E |0
-<UE8B5> \x97\x5F |0
-<UE8B6> \x97\x60 |0
-<UE8B7> \x97\x61 |0
-<UE8B8> \x97\x62 |0
-<UE8B9> \x97\x63 |0
-<UE8BA> \x97\x64 |0
-<UE8BB> \x97\x65 |0
-<UE8BC> \x97\x66 |0
-<UE8BD> \x97\x67 |0
-<UE8BE> \x97\x68 |0
-<UE8BF> \x97\x69 |0
-<UE8C0> \x97\x6A |0
-<UE8C1> \x97\x6B |0
-<UE8C2> \x97\x6C |0
-<UE8C3> \x97\x6D |0
-<UE8C4> \x97\x6E |0
-<UE8C5> \x97\x6F |0
-<UE8C6> \x97\x70 |0
-<UE8C7> \x97\x71 |0
-<UE8C8> \x97\x72 |0
-<UE8C9> \x97\x73 |0
-<UE8CA> \x97\x74 |0
-<UE8CB> \x97\x75 |0
-<UE8CC> \x97\x76 |0
-<UE8CD> \x97\x77 |0
-<UE8CE> \x97\x78 |0
-<UE8CF> \x97\x79 |0
-<UE8D0> \x97\x7A |0
-<UE8D1> \x97\x7B |0
-<UE8D2> \x97\x7C |0
-<UE8D3> \x97\x7D |0
-<UE8D4> \x97\x7E |0
-<UE8D5> \x97\xA1 |0
-<UE8D6> \x97\xA2 |0
-<UE8D7> \x97\xA3 |0
-<UE8D8> \x97\xA4 |0
-<UE8D9> \x97\xA5 |0
-<UE8DA> \x97\xA6 |0
-<UE8DB> \x97\xA7 |0
-<UE8DC> \x97\xA8 |0
-<UE8DD> \x97\xA9 |0
-<UE8DE> \x97\xAA |0
-<UE8DF> \x97\xAB |0
-<UE8E0> \x97\xAC |0
-<UE8E1> \x97\xAD |0
-<UE8E2> \x97\xAE |0
-<UE8E3> \x97\xAF |0
-<UE8E4> \x97\xB0 |0
-<UE8E5> \x97\xB1 |0
-<UE8E6> \x97\xB2 |0
-<UE8E7> \x97\xB3 |0
-<UE8E8> \x97\xB4 |0
-<UE8E9> \x97\xB5 |0
-<UE8EA> \x97\xB6 |0
-<UE8EB> \x97\xB7 |0
-<UE8EC> \x97\xB8 |0
-<UE8ED> \x97\xB9 |0
-<UE8EE> \x97\xBA |0
-<UE8EF> \x97\xBB |0
-<UE8F0> \x97\xBC |0
-<UE8F1> \x97\xBD |0
-<UE8F2> \x97\xBE |0
-<UE8F3> \x97\xBF |0
-<UE8F4> \x97\xC0 |0
-<UE8F5> \x97\xC1 |0
-<UE8F6> \x97\xC2 |0
-<UE8F7> \x97\xC3 |0
-<UE8F8> \x97\xC4 |0
-<UE8F9> \x97\xC5 |0
-<UE8FA> \x97\xC6 |0
-<UE8FB> \x97\xC7 |0
-<UE8FC> \x97\xC8 |0
-<UE8FD> \x97\xC9 |0
-<UE8FE> \x97\xCA |0
-<UE8FF> \x97\xCB |0
-<UE900> \x97\xCC |0
-<UE901> \x97\xCD |0
-<UE902> \x97\xCE |0
-<UE903> \x97\xCF |0
-<UE904> \x97\xD0 |0
-<UE905> \x97\xD1 |0
-<UE906> \x97\xD2 |0
-<UE907> \x97\xD3 |0
-<UE908> \x97\xD4 |0
-<UE909> \x97\xD5 |0
-<UE90A> \x97\xD6 |0
-<UE90B> \x97\xD7 |0
-<UE90C> \x97\xD8 |0
-<UE90D> \x97\xD9 |0
-<UE90E> \x97\xDA |0
-<UE90F> \x97\xDB |0
-<UE910> \x97\xDC |0
-<UE911> \x97\xDD |0
-<UE912> \x97\xDE |0
-<UE913> \x97\xDF |0
-<UE914> \x97\xE0 |0
-<UE915> \x97\xE1 |0
-<UE916> \x97\xE2 |0
-<UE917> \x97\xE3 |0
-<UE918> \x97\xE4 |0
-<UE919> \x97\xE5 |0
-<UE91A> \x97\xE6 |0
-<UE91B> \x97\xE7 |0
-<UE91C> \x97\xE8 |0
-<UE91D> \x97\xE9 |0
-<UE91E> \x97\xEA |0
-<UE91F> \x97\xEB |0
-<UE920> \x97\xEC |0
-<UE921> \x97\xED |0
-<UE922> \x97\xEE |0
-<UE923> \x97\xEF |0
-<UE924> \x97\xF0 |0
-<UE925> \x97\xF1 |0
-<UE926> \x97\xF2 |0
-<UE927> \x97\xF3 |0
-<UE928> \x97\xF4 |0
-<UE929> \x97\xF5 |0
-<UE92A> \x97\xF6 |0
-<UE92B> \x97\xF7 |0
-<UE92C> \x97\xF8 |0
-<UE92D> \x97\xF9 |0
-<UE92E> \x97\xFA |0
-<UE92F> \x97\xFB |0
-<UE930> \x97\xFC |0
-<UE931> \x97\xFD |0
-<UE932> \x97\xFE |0
-<UE933> \x98\x40 |0
-<UE934> \x98\x41 |0
-<UE935> \x98\x42 |0
-<UE936> \x98\x43 |0
-<UE937> \x98\x44 |0
-<UE938> \x98\x45 |0
-<UE939> \x98\x46 |0
-<UE93A> \x98\x47 |0
-<UE93B> \x98\x48 |0
-<UE93C> \x98\x49 |0
-<UE93D> \x98\x4A |0
-<UE93E> \x98\x4B |0
-<UE93F> \x98\x4C |0
-<UE940> \x98\x4D |0
-<UE941> \x98\x4E |0
-<UE942> \x98\x4F |0
-<UE943> \x98\x50 |0
-<UE944> \x98\x51 |0
-<UE945> \x98\x52 |0
-<UE946> \x98\x53 |0
-<UE947> \x98\x54 |0
-<UE948> \x98\x55 |0
-<UE949> \x98\x56 |0
-<UE94A> \x98\x57 |0
-<UE94B> \x98\x58 |0
-<UE94C> \x98\x59 |0
-<UE94D> \x98\x5A |0
-<UE94E> \x98\x5B |0
-<UE94F> \x98\x5C |0
-<UE950> \x98\x5D |0
-<UE951> \x98\x5E |0
-<UE952> \x98\x5F |0
-<UE953> \x98\x60 |0
-<UE954> \x98\x61 |0
-<UE955> \x98\x62 |0
-<UE956> \x98\x63 |0
-<UE957> \x98\x64 |0
-<UE958> \x98\x65 |0
-<UE959> \x98\x66 |0
-<UE95A> \x98\x67 |0
-<UE95B> \x98\x68 |0
-<UE95C> \x98\x69 |0
-<UE95D> \x98\x6A |0
-<UE95E> \x98\x6B |0
-<UE95F> \x98\x6C |0
-<UE960> \x98\x6D |0
-<UE961> \x98\x6E |0
-<UE962> \x98\x6F |0
-<UE963> \x98\x70 |0
-<UE964> \x98\x71 |0
-<UE965> \x98\x72 |0
-<UE966> \x98\x73 |0
-<UE967> \x98\x74 |0
-<UE968> \x98\x75 |0
-<UE969> \x98\x76 |0
-<UE96A> \x98\x77 |0
-<UE96B> \x98\x78 |0
-<UE96C> \x98\x79 |0
-<UE96D> \x98\x7A |0
-<UE96E> \x98\x7B |0
-<UE96F> \x98\x7C |0
-<UE970> \x98\x7D |0
-<UE971> \x98\x7E |0
-<UE972> \x98\xA1 |0
-<UE973> \x98\xA2 |0
-<UE974> \x98\xA3 |0
-<UE975> \x98\xA4 |0
-<UE976> \x98\xA5 |0
-<UE977> \x98\xA6 |0
-<UE978> \x98\xA7 |0
-<UE979> \x98\xA8 |0
-<UE97A> \x98\xA9 |0
-<UE97B> \x98\xAA |0
-<UE97C> \x98\xAB |0
-<UE97D> \x98\xAC |0
-<UE97E> \x98\xAD |0
-<UE97F> \x98\xAE |0
-<UE980> \x98\xAF |0
-<UE981> \x98\xB0 |0
-<UE982> \x98\xB1 |0
-<UE983> \x98\xB2 |0
-<UE984> \x98\xB3 |0
-<UE985> \x98\xB4 |0
-<UE986> \x98\xB5 |0
-<UE987> \x98\xB6 |0
-<UE988> \x98\xB7 |0
-<UE989> \x98\xB8 |0
-<UE98A> \x98\xB9 |0
-<UE98B> \x98\xBA |0
-<UE98C> \x98\xBB |0
-<UE98D> \x98\xBC |0
-<UE98E> \x98\xBD |0
-<UE98F> \x98\xBE |0
-<UE990> \x98\xBF |0
-<UE991> \x98\xC0 |0
-<UE992> \x98\xC1 |0
-<UE993> \x98\xC2 |0
-<UE994> \x98\xC3 |0
-<UE995> \x98\xC4 |0
-<UE996> \x98\xC5 |0
-<UE997> \x98\xC6 |0
-<UE998> \x98\xC7 |0
-<UE999> \x98\xC8 |0
-<UE99A> \x98\xC9 |0
-<UE99B> \x98\xCA |0
-<UE99C> \x98\xCB |0
-<UE99D> \x98\xCC |0
-<UE99E> \x98\xCD |0
-<UE99F> \x98\xCE |0
-<UE9A0> \x98\xCF |0
-<UE9A1> \x98\xD0 |0
-<UE9A2> \x98\xD1 |0
-<UE9A3> \x98\xD2 |0
-<UE9A4> \x98\xD3 |0
-<UE9A5> \x98\xD4 |0
-<UE9A6> \x98\xD5 |0
-<UE9A7> \x98\xD6 |0
-<UE9A8> \x98\xD7 |0
-<UE9A9> \x98\xD8 |0
-<UE9AA> \x98\xD9 |0
-<UE9AB> \x98\xDA |0
-<UE9AC> \x98\xDB |0
-<UE9AD> \x98\xDC |0
-<UE9AE> \x98\xDD |0
-<UE9AF> \x98\xDE |0
-<UE9B0> \x98\xDF |0
-<UE9B1> \x98\xE0 |0
-<UE9B2> \x98\xE1 |0
-<UE9B3> \x98\xE2 |0
-<UE9B4> \x98\xE3 |0
-<UE9B5> \x98\xE4 |0
-<UE9B6> \x98\xE5 |0
-<UE9B7> \x98\xE6 |0
-<UE9B8> \x98\xE7 |0
-<UE9B9> \x98\xE8 |0
-<UE9BA> \x98\xE9 |0
-<UE9BB> \x98\xEA |0
-<UE9BC> \x98\xEB |0
-<UE9BD> \x98\xEC |0
-<UE9BE> \x98\xED |0
-<UE9BF> \x98\xEE |0
-<UE9C0> \x98\xEF |0
-<UE9C1> \x98\xF0 |0
-<UE9C2> \x98\xF1 |0
-<UE9C3> \x98\xF2 |0
-<UE9C4> \x98\xF3 |0
-<UE9C5> \x98\xF4 |0
-<UE9C6> \x98\xF5 |0
-<UE9C7> \x98\xF6 |0
-<UE9C8> \x98\xF7 |0
-<UE9C9> \x98\xF8 |0
-<UE9CA> \x98\xF9 |0
-<UE9CB> \x98\xFA |0
-<UE9CC> \x98\xFB |0
-<UE9CD> \x98\xFC |0
-<UE9CE> \x98\xFD |0
-<UE9CF> \x98\xFE |0
-<UE9D0> \x99\x40 |0
-<UE9D1> \x99\x41 |0
-<UE9D2> \x99\x42 |0
-<UE9D3> \x99\x43 |0
-<UE9D4> \x99\x44 |0
-<UE9D5> \x99\x45 |0
-<UE9D6> \x99\x46 |0
-<UE9D7> \x99\x47 |0
-<UE9D8> \x99\x48 |0
-<UE9D9> \x99\x49 |0
-<UE9DA> \x99\x4A |0
-<UE9DB> \x99\x4B |0
-<UE9DC> \x99\x4C |0
-<UE9DD> \x99\x4D |0
-<UE9DE> \x99\x4E |0
-<UE9DF> \x99\x4F |0
-<UE9E0> \x99\x50 |0
-<UE9E1> \x99\x51 |0
-<UE9E2> \x99\x52 |0
-<UE9E3> \x99\x53 |0
-<UE9E4> \x99\x54 |0
-<UE9E5> \x99\x55 |0
-<UE9E6> \x99\x56 |0
-<UE9E7> \x99\x57 |0
-<UE9E8> \x99\x58 |0
-<UE9E9> \x99\x59 |0
-<UE9EA> \x99\x5A |0
-<UE9EB> \x99\x5B |0
-<UE9EC> \x99\x5C |0
-<UE9ED> \x99\x5D |0
-<UE9EE> \x99\x5E |0
-<UE9EF> \x99\x5F |0
-<UE9F0> \x99\x60 |0
-<UE9F1> \x99\x61 |0
-<UE9F2> \x99\x62 |0
-<UE9F3> \x99\x63 |0
-<UE9F4> \x99\x64 |0
-<UE9F5> \x99\x65 |0
-<UE9F6> \x99\x66 |0
-<UE9F7> \x99\x67 |0
-<UE9F8> \x99\x68 |0
-<UE9F9> \x99\x69 |0
-<UE9FA> \x99\x6A |0
-<UE9FB> \x99\x6B |0
-<UE9FC> \x99\x6C |0
-<UE9FD> \x99\x6D |0
-<UE9FE> \x99\x6E |0
-<UE9FF> \x99\x6F |0
-<UEA00> \x99\x70 |0
-<UEA01> \x99\x71 |0
-<UEA02> \x99\x72 |0
-<UEA03> \x99\x73 |0
-<UEA04> \x99\x74 |0
-<UEA05> \x99\x75 |0
-<UEA06> \x99\x76 |0
-<UEA07> \x99\x77 |0
-<UEA08> \x99\x78 |0
-<UEA09> \x99\x79 |0
-<UEA0A> \x99\x7A |0
-<UEA0B> \x99\x7B |0
-<UEA0C> \x99\x7C |0
-<UEA0D> \x99\x7D |0
-<UEA0E> \x99\x7E |0
-<UEA0F> \x99\xA1 |0
-<UEA10> \x99\xA2 |0
-<UEA11> \x99\xA3 |0
-<UEA12> \x99\xA4 |0
-<UEA13> \x99\xA5 |0
-<UEA14> \x99\xA6 |0
-<UEA15> \x99\xA7 |0
-<UEA16> \x99\xA8 |0
-<UEA17> \x99\xA9 |0
-<UEA18> \x99\xAA |0
-<UEA19> \x99\xAB |0
-<UEA1A> \x99\xAC |0
-<UEA1B> \x99\xAD |0
-<UEA1C> \x99\xAE |0
-<UEA1D> \x99\xAF |0
-<UEA1E> \x99\xB0 |0
-<UEA1F> \x99\xB1 |0
-<UEA20> \x99\xB2 |0
-<UEA21> \x99\xB3 |0
-<UEA22> \x99\xB4 |0
-<UEA23> \x99\xB5 |0
-<UEA24> \x99\xB6 |0
-<UEA25> \x99\xB7 |0
-<UEA26> \x99\xB8 |0
-<UEA27> \x99\xB9 |0
-<UEA28> \x99\xBA |0
-<UEA29> \x99\xBB |0
-<UEA2A> \x99\xBC |0
-<UEA2B> \x99\xBD |0
-<UEA2C> \x99\xBE |0
-<UEA2D> \x99\xBF |0
-<UEA2E> \x99\xC0 |0
-<UEA2F> \x99\xC1 |0
-<UEA30> \x99\xC2 |0
-<UEA31> \x99\xC3 |0
-<UEA32> \x99\xC4 |0
-<UEA33> \x99\xC5 |0
-<UEA34> \x99\xC6 |0
-<UEA35> \x99\xC7 |0
-<UEA36> \x99\xC8 |0
-<UEA37> \x99\xC9 |0
-<UEA38> \x99\xCA |0
-<UEA39> \x99\xCB |0
-<UEA3A> \x99\xCC |0
-<UEA3B> \x99\xCD |0
-<UEA3C> \x99\xCE |0
-<UEA3D> \x99\xCF |0
-<UEA3E> \x99\xD0 |0
-<UEA3F> \x99\xD1 |0
-<UEA40> \x99\xD2 |0
-<UEA41> \x99\xD3 |0
-<UEA42> \x99\xD4 |0
-<UEA43> \x99\xD5 |0
-<UEA44> \x99\xD6 |0
-<UEA45> \x99\xD7 |0
-<UEA46> \x99\xD8 |0
-<UEA47> \x99\xD9 |0
-<UEA48> \x99\xDA |0
-<UEA49> \x99\xDB |0
-<UEA4A> \x99\xDC |0
-<UEA4B> \x99\xDD |0
-<UEA4C> \x99\xDE |0
-<UEA4D> \x99\xDF |0
-<UEA4E> \x99\xE0 |0
-<UEA4F> \x99\xE1 |0
-<UEA50> \x99\xE2 |0
-<UEA51> \x99\xE3 |0
-<UEA52> \x99\xE4 |0
-<UEA53> \x99\xE5 |0
-<UEA54> \x99\xE6 |0
-<UEA55> \x99\xE7 |0
-<UEA56> \x99\xE8 |0
-<UEA57> \x99\xE9 |0
-<UEA58> \x99\xEA |0
-<UEA59> \x99\xEB |0
-<UEA5A> \x99\xEC |0
-<UEA5B> \x99\xED |0
-<UEA5C> \x99\xEE |0
-<UEA5D> \x99\xEF |0
-<UEA5E> \x99\xF0 |0
-<UEA5F> \x99\xF1 |0
-<UEA60> \x99\xF2 |0
-<UEA61> \x99\xF3 |0
-<UEA62> \x99\xF4 |0
-<UEA63> \x99\xF5 |0
-<UEA64> \x99\xF6 |0
-<UEA65> \x99\xF7 |0
-<UEA66> \x99\xF8 |0
-<UEA67> \x99\xF9 |0
-<UEA68> \x99\xFA |0
-<UEA69> \x99\xFB |0
-<UEA6A> \x99\xFC |0
-<UEA6B> \x99\xFD |0
-<UEA6C> \x99\xFE |0
-<UEA6D> \x9A\x40 |0
-<UEA6E> \x9A\x41 |0
-<UEA6F> \x9A\x42 |0
-<UEA70> \x9A\x43 |0
-<UEA71> \x9A\x44 |0
-<UEA72> \x9A\x45 |0
-<UEA73> \x9A\x46 |0
-<UEA74> \x9A\x47 |0
-<UEA75> \x9A\x48 |0
-<UEA76> \x9A\x49 |0
-<UEA77> \x9A\x4A |0
-<UEA78> \x9A\x4B |0
-<UEA79> \x9A\x4C |0
-<UEA7A> \x9A\x4D |0
-<UEA7B> \x9A\x4E |0
-<UEA7C> \x9A\x4F |0
-<UEA7D> \x9A\x50 |0
-<UEA7E> \x9A\x51 |0
-<UEA7F> \x9A\x52 |0
-<UEA80> \x9A\x53 |0
-<UEA81> \x9A\x54 |0
-<UEA82> \x9A\x55 |0
-<UEA83> \x9A\x56 |0
-<UEA84> \x9A\x57 |0
-<UEA85> \x9A\x58 |0
-<UEA86> \x9A\x59 |0
-<UEA87> \x9A\x5A |0
-<UEA88> \x9A\x5B |0
-<UEA89> \x9A\x5C |0
-<UEA8A> \x9A\x5D |0
-<UEA8B> \x9A\x5E |0
-<UEA8C> \x9A\x5F |0
-<UEA8D> \x9A\x60 |0
-<UEA8E> \x9A\x61 |0
-<UEA8F> \x9A\x62 |0
-<UEA90> \x9A\x63 |0
-<UEA91> \x9A\x64 |0
-<UEA92> \x9A\x65 |0
-<UEA93> \x9A\x66 |0
-<UEA94> \x9A\x67 |0
-<UEA95> \x9A\x68 |0
-<UEA96> \x9A\x69 |0
-<UEA97> \x9A\x6A |0
-<UEA98> \x9A\x6B |0
-<UEA99> \x9A\x6C |0
-<UEA9A> \x9A\x6D |0
-<UEA9B> \x9A\x6E |0
-<UEA9C> \x9A\x6F |0
-<UEA9D> \x9A\x70 |0
-<UEA9E> \x9A\x71 |0
-<UEA9F> \x9A\x72 |0
-<UEAA0> \x9A\x73 |0
-<UEAA1> \x9A\x74 |0
-<UEAA2> \x9A\x75 |0
-<UEAA3> \x9A\x76 |0
-<UEAA4> \x9A\x77 |0
-<UEAA5> \x9A\x78 |0
-<UEAA6> \x9A\x79 |0
-<UEAA7> \x9A\x7A |0
-<UEAA8> \x9A\x7B |0
-<UEAA9> \x9A\x7C |0
-<UEAAA> \x9A\x7D |0
-<UEAAB> \x9A\x7E |0
-<UEAAC> \x9A\xA1 |0
-<UEAAD> \x9A\xA2 |0
-<UEAAE> \x9A\xA3 |0
-<UEAAF> \x9A\xA4 |0
-<UEAB0> \x9A\xA5 |0
-<UEAB1> \x9A\xA6 |0
-<UEAB2> \x9A\xA7 |0
-<UEAB3> \x9A\xA8 |0
-<UEAB4> \x9A\xA9 |0
-<UEAB5> \x9A\xAA |0
-<UEAB6> \x9A\xAB |0
-<UEAB7> \x9A\xAC |0
-<UEAB8> \x9A\xAD |0
-<UEAB9> \x9A\xAE |0
-<UEABA> \x9A\xAF |0
-<UEABB> \x9A\xB0 |0
-<UEABC> \x9A\xB1 |0
-<UEABD> \x9A\xB2 |0
-<UEABE> \x9A\xB3 |0
-<UEABF> \x9A\xB4 |0
-<UEAC0> \x9A\xB5 |0
-<UEAC1> \x9A\xB6 |0
-<UEAC2> \x9A\xB7 |0
-<UEAC3> \x9A\xB8 |0
-<UEAC4> \x9A\xB9 |0
-<UEAC5> \x9A\xBA |0
-<UEAC6> \x9A\xBB |0
-<UEAC7> \x9A\xBC |0
-<UEAC8> \x9A\xBD |0
-<UEAC9> \x9A\xBE |0
-<UEACA> \x9A\xBF |0
-<UEACB> \x9A\xC0 |0
-<UEACC> \x9A\xC1 |0
-<UEACD> \x9A\xC2 |0
-<UEACE> \x9A\xC3 |0
-<UEACF> \x9A\xC4 |0
-<UEAD0> \x9A\xC5 |0
-<UEAD1> \x9A\xC6 |0
-<UEAD2> \x9A\xC7 |0
-<UEAD3> \x9A\xC8 |0
-<UEAD4> \x9A\xC9 |0
-<UEAD5> \x9A\xCA |0
-<UEAD6> \x9A\xCB |0
-<UEAD7> \x9A\xCC |0
-<UEAD8> \x9A\xCD |0
-<UEAD9> \x9A\xCE |0
-<UEADA> \x9A\xCF |0
-<UEADB> \x9A\xD0 |0
-<UEADC> \x9A\xD1 |0
-<UEADD> \x9A\xD2 |0
-<UEADE> \x9A\xD3 |0
-<UEADF> \x9A\xD4 |0
-<UEAE0> \x9A\xD5 |0
-<UEAE1> \x9A\xD6 |0
-<UEAE2> \x9A\xD7 |0
-<UEAE3> \x9A\xD8 |0
-<UEAE4> \x9A\xD9 |0
-<UEAE5> \x9A\xDA |0
-<UEAE6> \x9A\xDB |0
-<UEAE7> \x9A\xDC |0
-<UEAE8> \x9A\xDD |0
-<UEAE9> \x9A\xDE |0
-<UEAEA> \x9A\xDF |0
-<UEAEB> \x9A\xE0 |0
-<UEAEC> \x9A\xE1 |0
-<UEAED> \x9A\xE2 |0
-<UEAEE> \x9A\xE3 |0
-<UEAEF> \x9A\xE4 |0
-<UEAF0> \x9A\xE5 |0
-<UEAF1> \x9A\xE6 |0
-<UEAF2> \x9A\xE7 |0
-<UEAF3> \x9A\xE8 |0
-<UEAF4> \x9A\xE9 |0
-<UEAF5> \x9A\xEA |0
-<UEAF6> \x9A\xEB |0
-<UEAF7> \x9A\xEC |0
-<UEAF8> \x9A\xED |0
-<UEAF9> \x9A\xEE |0
-<UEAFA> \x9A\xEF |0
-<UEAFB> \x9A\xF0 |0
-<UEAFC> \x9A\xF1 |0
-<UEAFD> \x9A\xF2 |0
-<UEAFE> \x9A\xF3 |0
-<UEAFF> \x9A\xF4 |0
-<UEB00> \x9A\xF5 |0
-<UEB01> \x9A\xF6 |0
-<UEB02> \x9A\xF7 |0
-<UEB03> \x9A\xF8 |0
-<UEB04> \x9A\xF9 |0
-<UEB05> \x9A\xFA |0
-<UEB06> \x9A\xFB |0
-<UEB07> \x9A\xFC |0
-<UEB08> \x9A\xFD |0
-<UEB09> \x9A\xFE |0
-<UEB0A> \x9B\x40 |0
-<UEB0B> \x9B\x41 |0
-<UEB0C> \x9B\x42 |0
-<UEB0D> \x9B\x43 |0
-<UEB0E> \x9B\x44 |0
-<UEB0F> \x9B\x45 |0
-<UEB10> \x9B\x46 |0
-<UEB11> \x9B\x47 |0
-<UEB12> \x9B\x48 |0
-<UEB13> \x9B\x49 |0
-<UEB14> \x9B\x4A |0
-<UEB15> \x9B\x4B |0
-<UEB16> \x9B\x4C |0
-<UEB17> \x9B\x4D |0
-<UEB18> \x9B\x4E |0
-<UEB19> \x9B\x4F |0
-<UEB1A> \x9B\x50 |0
-<UEB1B> \x9B\x51 |0
-<UEB1C> \x9B\x52 |0
-<UEB1D> \x9B\x53 |0
-<UEB1E> \x9B\x54 |0
-<UEB1F> \x9B\x55 |0
-<UEB20> \x9B\x56 |0
-<UEB21> \x9B\x57 |0
-<UEB22> \x9B\x58 |0
-<UEB23> \x9B\x59 |0
-<UEB24> \x9B\x5A |0
-<UEB25> \x9B\x5B |0
-<UEB26> \x9B\x5C |0
-<UEB27> \x9B\x5D |0
-<UEB28> \x9B\x5E |0
-<UEB29> \x9B\x5F |0
-<UEB2A> \x9B\x60 |0
-<UEB2B> \x9B\x61 |0
-<UEB2C> \x9B\x62 |0
-<UEB2D> \x9B\x63 |0
-<UEB2E> \x9B\x64 |0
-<UEB2F> \x9B\x65 |0
-<UEB30> \x9B\x66 |0
-<UEB31> \x9B\x67 |0
-<UEB32> \x9B\x68 |0
-<UEB33> \x9B\x69 |0
-<UEB34> \x9B\x6A |0
-<UEB35> \x9B\x6B |0
-<UEB36> \x9B\x6C |0
-<UEB37> \x9B\x6D |0
-<UEB38> \x9B\x6E |0
-<UEB39> \x9B\x6F |0
-<UEB3A> \x9B\x70 |0
-<UEB3B> \x9B\x71 |0
-<UEB3C> \x9B\x72 |0
-<UEB3D> \x9B\x73 |0
-<UEB3E> \x9B\x74 |0
-<UEB3F> \x9B\x75 |0
-<UEB40> \x9B\x76 |0
-<UEB41> \x9B\x77 |0
-<UEB42> \x9B\x78 |0
-<UEB43> \x9B\x79 |0
-<UEB44> \x9B\x7A |0
-<UEB45> \x9B\x7B |0
-<UEB46> \x9B\x7C |0
-<UEB47> \x9B\x7D |0
-<UEB48> \x9B\x7E |0
-<UEB49> \x9B\xA1 |0
-<UEB4A> \x9B\xA2 |0
-<UEB4B> \x9B\xA3 |0
-<UEB4C> \x9B\xA4 |0
-<UEB4D> \x9B\xA5 |0
-<UEB4E> \x9B\xA6 |0
-<UEB4F> \x9B\xA7 |0
-<UEB50> \x9B\xA8 |0
-<UEB51> \x9B\xA9 |0
-<UEB52> \x9B\xAA |0
-<UEB53> \x9B\xAB |0
-<UEB54> \x9B\xAC |0
-<UEB55> \x9B\xAD |0
-<UEB56> \x9B\xAE |0
-<UEB57> \x9B\xAF |0
-<UEB58> \x9B\xB0 |0
-<UEB59> \x9B\xB1 |0
-<UEB5A> \x9B\xB2 |0
-<UEB5B> \x9B\xB3 |0
-<UEB5C> \x9B\xB4 |0
-<UEB5D> \x9B\xB5 |0
-<UEB5E> \x9B\xB6 |0
-<UEB5F> \x9B\xB7 |0
-<UEB60> \x9B\xB8 |0
-<UEB61> \x9B\xB9 |0
-<UEB62> \x9B\xBA |0
-<UEB63> \x9B\xBB |0
-<UEB64> \x9B\xBC |0
-<UEB65> \x9B\xBD |0
-<UEB66> \x9B\xBE |0
-<UEB67> \x9B\xBF |0
-<UEB68> \x9B\xC0 |0
-<UEB69> \x9B\xC1 |0
-<UEB6A> \x9B\xC2 |0
-<UEB6B> \x9B\xC3 |0
-<UEB6C> \x9B\xC4 |0
-<UEB6D> \x9B\xC5 |0
-<UEB6E> \x9B\xC6 |0
-<UEB6F> \x9B\xC7 |0
-<UEB70> \x9B\xC8 |0
-<UEB71> \x9B\xC9 |0
-<UEB72> \x9B\xCA |0
-<UEB73> \x9B\xCB |0
-<UEB74> \x9B\xCC |0
-<UEB75> \x9B\xCD |0
-<UEB76> \x9B\xCE |0
-<UEB77> \x9B\xCF |0
-<UEB78> \x9B\xD0 |0
-<UEB79> \x9B\xD1 |0
-<UEB7A> \x9B\xD2 |0
-<UEB7B> \x9B\xD3 |0
-<UEB7C> \x9B\xD4 |0
-<UEB7D> \x9B\xD5 |0
-<UEB7E> \x9B\xD6 |0
-<UEB7F> \x9B\xD7 |0
-<UEB80> \x9B\xD8 |0
-<UEB81> \x9B\xD9 |0
-<UEB82> \x9B\xDA |0
-<UEB83> \x9B\xDB |0
-<UEB84> \x9B\xDC |0
-<UEB85> \x9B\xDD |0
-<UEB86> \x9B\xDE |0
-<UEB87> \x9B\xDF |0
-<UEB88> \x9B\xE0 |0
-<UEB89> \x9B\xE1 |0
-<UEB8A> \x9B\xE2 |0
-<UEB8B> \x9B\xE3 |0
-<UEB8C> \x9B\xE4 |0
-<UEB8D> \x9B\xE5 |0
-<UEB8E> \x9B\xE6 |0
-<UEB8F> \x9B\xE7 |0
-<UEB90> \x9B\xE8 |0
-<UEB91> \x9B\xE9 |0
-<UEB92> \x9B\xEA |0
-<UEB93> \x9B\xEB |0
-<UEB94> \x9B\xEC |0
-<UEB95> \x9B\xED |0
-<UEB96> \x9B\xEE |0
-<UEB97> \x9B\xEF |0
-<UEB98> \x9B\xF0 |0
-<UEB99> \x9B\xF1 |0
-<UEB9A> \x9B\xF2 |0
-<UEB9B> \x9B\xF3 |0
-<UEB9C> \x9B\xF4 |0
-<UEB9D> \x9B\xF5 |0
-<UEB9E> \x9B\xF6 |0
-<UEB9F> \x9B\xF7 |0
-<UEBA0> \x9B\xF8 |0
-<UEBA1> \x9B\xF9 |0
-<UEBA2> \x9B\xFA |0
-<UEBA3> \x9B\xFB |0
-<UEBA4> \x9B\xFC |0
-<UEBA5> \x9B\xFD |0
-<UEBA6> \x9B\xFE |0
-<UEBA7> \x9C\x40 |0
-<UEBA8> \x9C\x41 |0
-<UEBA9> \x9C\x42 |0
-<UEBAA> \x9C\x43 |0
-<UEBAB> \x9C\x44 |0
-<UEBAC> \x9C\x45 |0
-<UEBAD> \x9C\x46 |0
-<UEBAE> \x9C\x47 |0
-<UEBAF> \x9C\x48 |0
-<UEBB0> \x9C\x49 |0
-<UEBB1> \x9C\x4A |0
-<UEBB2> \x9C\x4B |0
-<UEBB3> \x9C\x4C |0
-<UEBB4> \x9C\x4D |0
-<UEBB5> \x9C\x4E |0
-<UEBB6> \x9C\x4F |0
-<UEBB7> \x9C\x50 |0
-<UEBB8> \x9C\x51 |0
-<UEBB9> \x9C\x52 |0
-<UEBBA> \x9C\x53 |0
-<UEBBB> \x9C\x54 |0
-<UEBBC> \x9C\x55 |0
-<UEBBD> \x9C\x56 |0
-<UEBBE> \x9C\x57 |0
-<UEBBF> \x9C\x58 |0
-<UEBC0> \x9C\x59 |0
-<UEBC1> \x9C\x5A |0
-<UEBC2> \x9C\x5B |0
-<UEBC3> \x9C\x5C |0
-<UEBC4> \x9C\x5D |0
-<UEBC5> \x9C\x5E |0
-<UEBC6> \x9C\x5F |0
-<UEBC7> \x9C\x60 |0
-<UEBC8> \x9C\x61 |0
-<UEBC9> \x9C\x62 |0
-<UEBCA> \x9C\x63 |0
-<UEBCB> \x9C\x64 |0
-<UEBCC> \x9C\x65 |0
-<UEBCD> \x9C\x66 |0
-<UEBCE> \x9C\x67 |0
-<UEBCF> \x9C\x68 |0
-<UEBD0> \x9C\x69 |0
-<UEBD1> \x9C\x6A |0
-<UEBD2> \x9C\x6B |0
-<UEBD3> \x9C\x6C |0
-<UEBD4> \x9C\x6D |0
-<UEBD5> \x9C\x6E |0
-<UEBD6> \x9C\x6F |0
-<UEBD7> \x9C\x70 |0
-<UEBD8> \x9C\x71 |0
-<UEBD9> \x9C\x72 |0
-<UEBDA> \x9C\x73 |0
-<UEBDB> \x9C\x74 |0
-<UEBDC> \x9C\x75 |0
-<UEBDD> \x9C\x76 |0
-<UEBDE> \x9C\x77 |0
-<UEBDF> \x9C\x78 |0
-<UEBE0> \x9C\x79 |0
-<UEBE1> \x9C\x7A |0
-<UEBE2> \x9C\x7B |0
-<UEBE3> \x9C\x7C |0
-<UEBE4> \x9C\x7D |0
-<UEBE5> \x9C\x7E |0
-<UEBE6> \x9C\xA1 |0
-<UEBE7> \x9C\xA2 |0
-<UEBE8> \x9C\xA3 |0
-<UEBE9> \x9C\xA4 |0
-<UEBEA> \x9C\xA5 |0
-<UEBEB> \x9C\xA6 |0
-<UEBEC> \x9C\xA7 |0
-<UEBED> \x9C\xA8 |0
-<UEBEE> \x9C\xA9 |0
-<UEBEF> \x9C\xAA |0
-<UEBF0> \x9C\xAB |0
-<UEBF1> \x9C\xAC |0
-<UEBF2> \x9C\xAD |0
-<UEBF3> \x9C\xAE |0
-<UEBF4> \x9C\xAF |0
-<UEBF5> \x9C\xB0 |0
-<UEBF6> \x9C\xB1 |0
-<UEBF7> \x9C\xB2 |0
-<UEBF8> \x9C\xB3 |0
-<UEBF9> \x9C\xB4 |0
-<UEBFA> \x9C\xB5 |0
-<UEBFB> \x9C\xB6 |0
-<UEBFC> \x9C\xB7 |0
-<UEBFD> \x9C\xB8 |0
-<UEBFE> \x9C\xB9 |0
-<UEBFF> \x9C\xBA |0
-<UEC00> \x9C\xBB |0
-<UEC01> \x9C\xBC |0
-<UEC02> \x9C\xBD |0
-<UEC03> \x9C\xBE |0
-<UEC04> \x9C\xBF |0
-<UEC05> \x9C\xC0 |0
-<UEC06> \x9C\xC1 |0
-<UEC07> \x9C\xC2 |0
-<UEC08> \x9C\xC3 |0
-<UEC09> \x9C\xC4 |0
-<UEC0A> \x9C\xC5 |0
-<UEC0B> \x9C\xC6 |0
-<UEC0C> \x9C\xC7 |0
-<UEC0D> \x9C\xC8 |0
-<UEC0E> \x9C\xC9 |0
-<UEC0F> \x9C\xCA |0
-<UEC10> \x9C\xCB |0
-<UEC11> \x9C\xCC |0
-<UEC12> \x9C\xCD |0
-<UEC13> \x9C\xCE |0
-<UEC14> \x9C\xCF |0
-<UEC15> \x9C\xD0 |0
-<UEC16> \x9C\xD1 |0
-<UEC17> \x9C\xD2 |0
-<UEC18> \x9C\xD3 |0
-<UEC19> \x9C\xD4 |0
-<UEC1A> \x9C\xD5 |0
-<UEC1B> \x9C\xD6 |0
-<UEC1C> \x9C\xD7 |0
-<UEC1D> \x9C\xD8 |0
-<UEC1E> \x9C\xD9 |0
-<UEC1F> \x9C\xDA |0
-<UEC20> \x9C\xDB |0
-<UEC21> \x9C\xDC |0
-<UEC22> \x9C\xDD |0
-<UEC23> \x9C\xDE |0
-<UEC24> \x9C\xDF |0
-<UEC25> \x9C\xE0 |0
-<UEC26> \x9C\xE1 |0
-<UEC27> \x9C\xE2 |0
-<UEC28> \x9C\xE3 |0
-<UEC29> \x9C\xE4 |0
-<UEC2A> \x9C\xE5 |0
-<UEC2B> \x9C\xE6 |0
-<UEC2C> \x9C\xE7 |0
-<UEC2D> \x9C\xE8 |0
-<UEC2E> \x9C\xE9 |0
-<UEC2F> \x9C\xEA |0
-<UEC30> \x9C\xEB |0
-<UEC31> \x9C\xEC |0
-<UEC32> \x9C\xED |0
-<UEC33> \x9C\xEE |0
-<UEC34> \x9C\xEF |0
-<UEC35> \x9C\xF0 |0
-<UEC36> \x9C\xF1 |0
-<UEC37> \x9C\xF2 |0
-<UEC38> \x9C\xF3 |0
-<UEC39> \x9C\xF4 |0
-<UEC3A> \x9C\xF5 |0
-<UEC3B> \x9C\xF6 |0
-<UEC3C> \x9C\xF7 |0
-<UEC3D> \x9C\xF8 |0
-<UEC3E> \x9C\xF9 |0
-<UEC3F> \x9C\xFA |0
-<UEC40> \x9C\xFB |0
-<UEC41> \x9C\xFC |0
-<UEC42> \x9C\xFD |0
-<UEC43> \x9C\xFE |0
-<UEC44> \x9D\x40 |0
-<UEC45> \x9D\x41 |0
-<UEC46> \x9D\x42 |0
-<UEC47> \x9D\x43 |0
-<UEC48> \x9D\x44 |0
-<UEC49> \x9D\x45 |0
-<UEC4A> \x9D\x46 |0
-<UEC4B> \x9D\x47 |0
-<UEC4C> \x9D\x48 |0
-<UEC4D> \x9D\x49 |0
-<UEC4E> \x9D\x4A |0
-<UEC4F> \x9D\x4B |0
-<UEC50> \x9D\x4C |0
-<UEC51> \x9D\x4D |0
-<UEC52> \x9D\x4E |0
-<UEC53> \x9D\x4F |0
-<UEC54> \x9D\x50 |0
-<UEC55> \x9D\x51 |0
-<UEC56> \x9D\x52 |0
-<UEC57> \x9D\x53 |0
-<UEC58> \x9D\x54 |0
-<UEC59> \x9D\x55 |0
-<UEC5A> \x9D\x56 |0
-<UEC5B> \x9D\x57 |0
-<UEC5C> \x9D\x58 |0
-<UEC5D> \x9D\x59 |0
-<UEC5E> \x9D\x5A |0
-<UEC5F> \x9D\x5B |0
-<UEC60> \x9D\x5C |0
-<UEC61> \x9D\x5D |0
-<UEC62> \x9D\x5E |0
-<UEC63> \x9D\x5F |0
-<UEC64> \x9D\x60 |0
-<UEC65> \x9D\x61 |0
-<UEC66> \x9D\x62 |0
-<UEC67> \x9D\x63 |0
-<UEC68> \x9D\x64 |0
-<UEC69> \x9D\x65 |0
-<UEC6A> \x9D\x66 |0
-<UEC6B> \x9D\x67 |0
-<UEC6C> \x9D\x68 |0
-<UEC6D> \x9D\x69 |0
-<UEC6E> \x9D\x6A |0
-<UEC6F> \x9D\x6B |0
-<UEC70> \x9D\x6C |0
-<UEC71> \x9D\x6D |0
-<UEC72> \x9D\x6E |0
-<UEC73> \x9D\x6F |0
-<UEC74> \x9D\x70 |0
-<UEC75> \x9D\x71 |0
-<UEC76> \x9D\x72 |0
-<UEC77> \x9D\x73 |0
-<UEC78> \x9D\x74 |0
-<UEC79> \x9D\x75 |0
-<UEC7A> \x9D\x76 |0
-<UEC7B> \x9D\x77 |0
-<UEC7C> \x9D\x78 |0
-<UEC7D> \x9D\x79 |0
-<UEC7E> \x9D\x7A |0
-<UEC7F> \x9D\x7B |0
-<UEC80> \x9D\x7C |0
-<UEC81> \x9D\x7D |0
-<UEC82> \x9D\x7E |0
-<UEC83> \x9D\xA1 |0
-<UEC84> \x9D\xA2 |0
-<UEC85> \x9D\xA3 |0
-<UEC86> \x9D\xA4 |0
-<UEC87> \x9D\xA5 |0
-<UEC88> \x9D\xA6 |0
-<UEC89> \x9D\xA7 |0
-<UEC8A> \x9D\xA8 |0
-<UEC8B> \x9D\xA9 |0
-<UEC8C> \x9D\xAA |0
-<UEC8D> \x9D\xAB |0
-<UEC8E> \x9D\xAC |0
-<UEC8F> \x9D\xAD |0
-<UEC90> \x9D\xAE |0
-<UEC91> \x9D\xAF |0
-<UEC92> \x9D\xB0 |0
-<UEC93> \x9D\xB1 |0
-<UEC94> \x9D\xB2 |0
-<UEC95> \x9D\xB3 |0
-<UEC96> \x9D\xB4 |0
-<UEC97> \x9D\xB5 |0
-<UEC98> \x9D\xB6 |0
-<UEC99> \x9D\xB7 |0
-<UEC9A> \x9D\xB8 |0
-<UEC9B> \x9D\xB9 |0
-<UEC9C> \x9D\xBA |0
-<UEC9D> \x9D\xBB |0
-<UEC9E> \x9D\xBC |0
-<UEC9F> \x9D\xBD |0
-<UECA0> \x9D\xBE |0
-<UECA1> \x9D\xBF |0
-<UECA2> \x9D\xC0 |0
-<UECA3> \x9D\xC1 |0
-<UECA4> \x9D\xC2 |0
-<UECA5> \x9D\xC3 |0
-<UECA6> \x9D\xC4 |0
-<UECA7> \x9D\xC5 |0
-<UECA8> \x9D\xC6 |0
-<UECA9> \x9D\xC7 |0
-<UECAA> \x9D\xC8 |0
-<UECAB> \x9D\xC9 |0
-<UECAC> \x9D\xCA |0
-<UECAD> \x9D\xCB |0
-<UECAE> \x9D\xCC |0
-<UECAF> \x9D\xCD |0
-<UECB0> \x9D\xCE |0
-<UECB1> \x9D\xCF |0
-<UECB2> \x9D\xD0 |0
-<UECB3> \x9D\xD1 |0
-<UECB4> \x9D\xD2 |0
-<UECB5> \x9D\xD3 |0
-<UECB6> \x9D\xD4 |0
-<UECB7> \x9D\xD5 |0
-<UECB8> \x9D\xD6 |0
-<UECB9> \x9D\xD7 |0
-<UECBA> \x9D\xD8 |0
-<UECBB> \x9D\xD9 |0
-<UECBC> \x9D\xDA |0
-<UECBD> \x9D\xDB |0
-<UECBE> \x9D\xDC |0
-<UECBF> \x9D\xDD |0
-<UECC0> \x9D\xDE |0
-<UECC1> \x9D\xDF |0
-<UECC2> \x9D\xE0 |0
-<UECC3> \x9D\xE1 |0
-<UECC4> \x9D\xE2 |0
-<UECC5> \x9D\xE3 |0
-<UECC6> \x9D\xE4 |0
-<UECC7> \x9D\xE5 |0
-<UECC8> \x9D\xE6 |0
-<UECC9> \x9D\xE7 |0
-<UECCA> \x9D\xE8 |0
-<UECCB> \x9D\xE9 |0
-<UECCC> \x9D\xEA |0
-<UECCD> \x9D\xEB |0
-<UECCE> \x9D\xEC |0
-<UECCF> \x9D\xED |0
-<UECD0> \x9D\xEE |0
-<UECD1> \x9D\xEF |0
-<UECD2> \x9D\xF0 |0
-<UECD3> \x9D\xF1 |0
-<UECD4> \x9D\xF2 |0
-<UECD5> \x9D\xF3 |0
-<UECD6> \x9D\xF4 |0
-<UECD7> \x9D\xF5 |0
-<UECD8> \x9D\xF6 |0
-<UECD9> \x9D\xF7 |0
-<UECDA> \x9D\xF8 |0
-<UECDB> \x9D\xF9 |0
-<UECDC> \x9D\xFA |0
-<UECDD> \x9D\xFB |0
-<UECDE> \x9D\xFC |0
-<UECDF> \x9D\xFD |0
-<UECE0> \x9D\xFE |0
-<UECE1> \x9E\x40 |0
-<UECE2> \x9E\x41 |0
-<UECE3> \x9E\x42 |0
-<UECE4> \x9E\x43 |0
-<UECE5> \x9E\x44 |0
-<UECE6> \x9E\x45 |0
-<UECE7> \x9E\x46 |0
-<UECE8> \x9E\x47 |0
-<UECE9> \x9E\x48 |0
-<UECEA> \x9E\x49 |0
-<UECEB> \x9E\x4A |0
-<UECEC> \x9E\x4B |0
-<UECED> \x9E\x4C |0
-<UECEE> \x9E\x4D |0
-<UECEF> \x9E\x4E |0
-<UECF0> \x9E\x4F |0
-<UECF1> \x9E\x50 |0
-<UECF2> \x9E\x51 |0
-<UECF3> \x9E\x52 |0
-<UECF4> \x9E\x53 |0
-<UECF5> \x9E\x54 |0
-<UECF6> \x9E\x55 |0
-<UECF7> \x9E\x56 |0
-<UECF8> \x9E\x57 |0
-<UECF9> \x9E\x58 |0
-<UECFA> \x9E\x59 |0
-<UECFB> \x9E\x5A |0
-<UECFC> \x9E\x5B |0
-<UECFD> \x9E\x5C |0
-<UECFE> \x9E\x5D |0
-<UECFF> \x9E\x5E |0
-<UED00> \x9E\x5F |0
-<UED01> \x9E\x60 |0
-<UED02> \x9E\x61 |0
-<UED03> \x9E\x62 |0
-<UED04> \x9E\x63 |0
-<UED05> \x9E\x64 |0
-<UED06> \x9E\x65 |0
-<UED07> \x9E\x66 |0
-<UED08> \x9E\x67 |0
-<UED09> \x9E\x68 |0
-<UED0A> \x9E\x69 |0
-<UED0B> \x9E\x6A |0
-<UED0C> \x9E\x6B |0
-<UED0D> \x9E\x6C |0
-<UED0E> \x9E\x6D |0
-<UED0F> \x9E\x6E |0
-<UED10> \x9E\x6F |0
-<UED11> \x9E\x70 |0
-<UED12> \x9E\x71 |0
-<UED13> \x9E\x72 |0
-<UED14> \x9E\x73 |0
-<UED15> \x9E\x74 |0
-<UED16> \x9E\x75 |0
-<UED17> \x9E\x76 |0
-<UED18> \x9E\x77 |0
-<UED19> \x9E\x78 |0
-<UED1A> \x9E\x79 |0
-<UED1B> \x9E\x7A |0
-<UED1C> \x9E\x7B |0
-<UED1D> \x9E\x7C |0
-<UED1E> \x9E\x7D |0
-<UED1F> \x9E\x7E |0
-<UED20> \x9E\xA1 |0
-<UED21> \x9E\xA2 |0
-<UED22> \x9E\xA3 |0
-<UED23> \x9E\xA4 |0
-<UED24> \x9E\xA5 |0
-<UED25> \x9E\xA6 |0
-<UED26> \x9E\xA7 |0
-<UED27> \x9E\xA8 |0
-<UED28> \x9E\xA9 |0
-<UED29> \x9E\xAA |0
-<UED2A> \x9E\xAB |0
-<UED2B> \x9E\xAC |0
-<UED2C> \x9E\xAD |0
-<UED2D> \x9E\xAE |0
-<UED2E> \x9E\xAF |0
-<UED2F> \x9E\xB0 |0
-<UED30> \x9E\xB1 |0
-<UED31> \x9E\xB2 |0
-<UED32> \x9E\xB3 |0
-<UED33> \x9E\xB4 |0
-<UED34> \x9E\xB5 |0
-<UED35> \x9E\xB6 |0
-<UED36> \x9E\xB7 |0
-<UED37> \x9E\xB8 |0
-<UED38> \x9E\xB9 |0
-<UED39> \x9E\xBA |0
-<UED3A> \x9E\xBB |0
-<UED3B> \x9E\xBC |0
-<UED3C> \x9E\xBD |0
-<UED3D> \x9E\xBE |0
-<UED3E> \x9E\xBF |0
-<UED3F> \x9E\xC0 |0
-<UED40> \x9E\xC1 |0
-<UED41> \x9E\xC2 |0
-<UED42> \x9E\xC3 |0
-<UED43> \x9E\xC4 |0
-<UED44> \x9E\xC5 |0
-<UED45> \x9E\xC6 |0
-<UED46> \x9E\xC7 |0
-<UED47> \x9E\xC8 |0
-<UED48> \x9E\xC9 |0
-<UED49> \x9E\xCA |0
-<UED4A> \x9E\xCB |0
-<UED4B> \x9E\xCC |0
-<UED4C> \x9E\xCD |0
-<UED4D> \x9E\xCE |0
-<UED4E> \x9E\xCF |0
-<UED4F> \x9E\xD0 |0
-<UED50> \x9E\xD1 |0
-<UED51> \x9E\xD2 |0
-<UED52> \x9E\xD3 |0
-<UED53> \x9E\xD4 |0
-<UED54> \x9E\xD5 |0
-<UED55> \x9E\xD6 |0
-<UED56> \x9E\xD7 |0
-<UED57> \x9E\xD8 |0
-<UED58> \x9E\xD9 |0
-<UED59> \x9E\xDA |0
-<UED5A> \x9E\xDB |0
-<UED5B> \x9E\xDC |0
-<UED5C> \x9E\xDD |0
-<UED5D> \x9E\xDE |0
-<UED5E> \x9E\xDF |0
-<UED5F> \x9E\xE0 |0
-<UED60> \x9E\xE1 |0
-<UED61> \x9E\xE2 |0
-<UED62> \x9E\xE3 |0
-<UED63> \x9E\xE4 |0
-<UED64> \x9E\xE5 |0
-<UED65> \x9E\xE6 |0
-<UED66> \x9E\xE7 |0
-<UED67> \x9E\xE8 |0
-<UED68> \x9E\xE9 |0
-<UED69> \x9E\xEA |0
-<UED6A> \x9E\xEB |0
-<UED6B> \x9E\xEC |0
-<UED6C> \x9E\xED |0
-<UED6D> \x9E\xEE |0
-<UED6E> \x9E\xEF |0
-<UED6F> \x9E\xF0 |0
-<UED70> \x9E\xF1 |0
-<UED71> \x9E\xF2 |0
-<UED72> \x9E\xF3 |0
-<UED73> \x9E\xF4 |0
-<UED74> \x9E\xF5 |0
-<UED75> \x9E\xF6 |0
-<UED76> \x9E\xF7 |0
-<UED77> \x9E\xF8 |0
-<UED78> \x9E\xF9 |0
-<UED79> \x9E\xFA |0
-<UED7A> \x9E\xFB |0
-<UED7B> \x9E\xFC |0
-<UED7C> \x9E\xFD |0
-<UED7D> \x9E\xFE |0
-<UED7E> \x9F\x40 |0
-<UED7F> \x9F\x41 |0
-<UED80> \x9F\x42 |0
-<UED81> \x9F\x43 |0
-<UED82> \x9F\x44 |0
-<UED83> \x9F\x45 |0
-<UED84> \x9F\x46 |0
-<UED85> \x9F\x47 |0
-<UED86> \x9F\x48 |0
-<UED87> \x9F\x49 |0
-<UED88> \x9F\x4A |0
-<UED89> \x9F\x4B |0
-<UED8A> \x9F\x4C |0
-<UED8B> \x9F\x4D |0
-<UED8C> \x9F\x4E |0
-<UED8D> \x9F\x4F |0
-<UED8E> \x9F\x50 |0
-<UED8F> \x9F\x51 |0
-<UED90> \x9F\x52 |0
-<UED91> \x9F\x53 |0
-<UED92> \x9F\x54 |0
-<UED93> \x9F\x55 |0
-<UED94> \x9F\x56 |0
-<UED95> \x9F\x57 |0
-<UED96> \x9F\x58 |0
-<UED97> \x9F\x59 |0
-<UED98> \x9F\x5A |0
-<UED99> \x9F\x5B |0
-<UED9A> \x9F\x5C |0
-<UED9B> \x9F\x5D |0
-<UED9C> \x9F\x5E |0
-<UED9D> \x9F\x5F |0
-<UED9E> \x9F\x60 |0
-<UED9F> \x9F\x61 |0
-<UEDA0> \x9F\x62 |0
-<UEDA1> \x9F\x63 |0
-<UEDA2> \x9F\x64 |0
-<UEDA3> \x9F\x65 |0
-<UEDA4> \x9F\x66 |0
-<UEDA5> \x9F\x67 |0
-<UEDA6> \x9F\x68 |0
-<UEDA7> \x9F\x69 |0
-<UEDA8> \x9F\x6A |0
-<UEDA9> \x9F\x6B |0
-<UEDAA> \x9F\x6C |0
-<UEDAB> \x9F\x6D |0
-<UEDAC> \x9F\x6E |0
-<UEDAD> \x9F\x6F |0
-<UEDAE> \x9F\x70 |0
-<UEDAF> \x9F\x71 |0
-<UEDB0> \x9F\x72 |0
-<UEDB1> \x9F\x73 |0
-<UEDB2> \x9F\x74 |0
-<UEDB3> \x9F\x75 |0
-<UEDB4> \x9F\x76 |0
-<UEDB5> \x9F\x77 |0
-<UEDB6> \x9F\x78 |0
-<UEDB7> \x9F\x79 |0
-<UEDB8> \x9F\x7A |0
-<UEDB9> \x9F\x7B |0
-<UEDBA> \x9F\x7C |0
-<UEDBB> \x9F\x7D |0
-<UEDBC> \x9F\x7E |0
-<UEDBD> \x9F\xA1 |0
-<UEDBE> \x9F\xA2 |0
-<UEDBF> \x9F\xA3 |0
-<UEDC0> \x9F\xA4 |0
-<UEDC1> \x9F\xA5 |0
-<UEDC2> \x9F\xA6 |0
-<UEDC3> \x9F\xA7 |0
-<UEDC4> \x9F\xA8 |0
-<UEDC5> \x9F\xA9 |0
-<UEDC6> \x9F\xAA |0
-<UEDC7> \x9F\xAB |0
-<UEDC8> \x9F\xAC |0
-<UEDC9> \x9F\xAD |0
-<UEDCA> \x9F\xAE |0
-<UEDCB> \x9F\xAF |0
-<UEDCC> \x9F\xB0 |0
-<UEDCD> \x9F\xB1 |0
-<UEDCE> \x9F\xB2 |0
-<UEDCF> \x9F\xB3 |0
-<UEDD0> \x9F\xB4 |0
-<UEDD1> \x9F\xB5 |0
-<UEDD2> \x9F\xB6 |0
-<UEDD3> \x9F\xB7 |0
-<UEDD4> \x9F\xB8 |0
-<UEDD5> \x9F\xB9 |0
-<UEDD6> \x9F\xBA |0
-<UEDD7> \x9F\xBB |0
-<UEDD8> \x9F\xBC |0
-<UEDD9> \x9F\xBD |0
-<UEDDA> \x9F\xBE |0
-<UEDDB> \x9F\xBF |0
-<UEDDC> \x9F\xC0 |0
-<UEDDD> \x9F\xC1 |0
-<UEDDE> \x9F\xC2 |0
-<UEDDF> \x9F\xC3 |0
-<UEDE0> \x9F\xC4 |0
-<UEDE1> \x9F\xC5 |0
-<UEDE2> \x9F\xC6 |0
-<UEDE3> \x9F\xC7 |0
-<UEDE4> \x9F\xC8 |0
-<UEDE5> \x9F\xC9 |0
-<UEDE6> \x9F\xCA |0
-<UEDE7> \x9F\xCB |0
-<UEDE8> \x9F\xCC |0
-<UEDE9> \x9F\xCD |0
-<UEDEA> \x9F\xCE |0
-<UEDEB> \x9F\xCF |0
-<UEDEC> \x9F\xD0 |0
-<UEDED> \x9F\xD1 |0
-<UEDEE> \x9F\xD2 |0
-<UEDEF> \x9F\xD3 |0
-<UEDF0> \x9F\xD4 |0
-<UEDF1> \x9F\xD5 |0
-<UEDF2> \x9F\xD6 |0
-<UEDF3> \x9F\xD7 |0
-<UEDF4> \x9F\xD8 |0
-<UEDF5> \x9F\xD9 |0
-<UEDF6> \x9F\xDA |0
-<UEDF7> \x9F\xDB |0
-<UEDF8> \x9F\xDC |0
-<UEDF9> \x9F\xDD |0
-<UEDFA> \x9F\xDE |0
-<UEDFB> \x9F\xDF |0
-<UEDFC> \x9F\xE0 |0
-<UEDFD> \x9F\xE1 |0
-<UEDFE> \x9F\xE2 |0
-<UEDFF> \x9F\xE3 |0
-<UEE00> \x9F\xE4 |0
-<UEE01> \x9F\xE5 |0
-<UEE02> \x9F\xE6 |0
-<UEE03> \x9F\xE7 |0
-<UEE04> \x9F\xE8 |0
-<UEE05> \x9F\xE9 |0
-<UEE06> \x9F\xEA |0
-<UEE07> \x9F\xEB |0
-<UEE08> \x9F\xEC |0
-<UEE09> \x9F\xED |0
-<UEE0A> \x9F\xEE |0
-<UEE0B> \x9F\xEF |0
-<UEE0C> \x9F\xF0 |0
-<UEE0D> \x9F\xF1 |0
-<UEE0E> \x9F\xF2 |0
-<UEE0F> \x9F\xF3 |0
-<UEE10> \x9F\xF4 |0
-<UEE11> \x9F\xF5 |0
-<UEE12> \x9F\xF6 |0
-<UEE13> \x9F\xF7 |0
-<UEE14> \x9F\xF8 |0
-<UEE15> \x9F\xF9 |0
-<UEE16> \x9F\xFA |0
-<UEE17> \x9F\xFB |0
-<UEE18> \x9F\xFC |0
-<UEE19> \x9F\xFD |0
-<UEE1A> \x9F\xFE |0
-<UEE1B> \xA0\x40 |0
-<UEE1C> \xA0\x41 |0
-<UEE1D> \xA0\x42 |0
-<UEE1E> \xA0\x43 |0
-<UEE1F> \xA0\x44 |0
-<UEE20> \xA0\x45 |0
-<UEE21> \xA0\x46 |0
-<UEE22> \xA0\x47 |0
-<UEE23> \xA0\x48 |0
-<UEE24> \xA0\x49 |0
-<UEE25> \xA0\x4A |0
-<UEE26> \xA0\x4B |0
-<UEE27> \xA0\x4C |0
-<UEE28> \xA0\x4D |0
-<UEE29> \xA0\x4E |0
-<UEE2A> \xA0\x4F |0
-<UEE2B> \xA0\x50 |0
-<UEE2C> \xA0\x51 |0
-<UEE2D> \xA0\x52 |0
-<UEE2E> \xA0\x53 |0
-<UEE2F> \xA0\x54 |0
-<UEE30> \xA0\x55 |0
-<UEE31> \xA0\x56 |0
-<UEE32> \xA0\x57 |0
-<UEE33> \xA0\x58 |0
-<UEE34> \xA0\x59 |0
-<UEE35> \xA0\x5A |0
-<UEE36> \xA0\x5B |0
-<UEE37> \xA0\x5C |0
-<UEE38> \xA0\x5D |0
-<UEE39> \xA0\x5E |0
-<UEE3A> \xA0\x5F |0
-<UEE3B> \xA0\x60 |0
-<UEE3C> \xA0\x61 |0
-<UEE3D> \xA0\x62 |0
-<UEE3E> \xA0\x63 |0
-<UEE3F> \xA0\x64 |0
-<UEE40> \xA0\x65 |0
-<UEE41> \xA0\x66 |0
-<UEE42> \xA0\x67 |0
-<UEE43> \xA0\x68 |0
-<UEE44> \xA0\x69 |0
-<UEE45> \xA0\x6A |0
-<UEE46> \xA0\x6B |0
-<UEE47> \xA0\x6C |0
-<UEE48> \xA0\x6D |0
-<UEE49> \xA0\x6E |0
-<UEE4A> \xA0\x6F |0
-<UEE4B> \xA0\x70 |0
-<UEE4C> \xA0\x71 |0
-<UEE4D> \xA0\x72 |0
-<UEE4E> \xA0\x73 |0
-<UEE4F> \xA0\x74 |0
-<UEE50> \xA0\x75 |0
-<UEE51> \xA0\x76 |0
-<UEE52> \xA0\x77 |0
-<UEE53> \xA0\x78 |0
-<UEE54> \xA0\x79 |0
-<UEE55> \xA0\x7A |0
-<UEE56> \xA0\x7B |0
-<UEE57> \xA0\x7C |0
-<UEE58> \xA0\x7D |0
-<UEE59> \xA0\x7E |0
-<UEE5A> \xA0\xA1 |0
-<UEE5B> \xA0\xA2 |0
-<UEE5C> \xA0\xA3 |0
-<UEE5D> \xA0\xA4 |0
-<UEE5E> \xA0\xA5 |0
-<UEE5F> \xA0\xA6 |0
-<UEE60> \xA0\xA7 |0
-<UEE61> \xA0\xA8 |0
-<UEE62> \xA0\xA9 |0
-<UEE63> \xA0\xAA |0
-<UEE64> \xA0\xAB |0
-<UEE65> \xA0\xAC |0
-<UEE66> \xA0\xAD |0
-<UEE67> \xA0\xAE |0
-<UEE68> \xA0\xAF |0
-<UEE69> \xA0\xB0 |0
-<UEE6A> \xA0\xB1 |0
-<UEE6B> \xA0\xB2 |0
-<UEE6C> \xA0\xB3 |0
-<UEE6D> \xA0\xB4 |0
-<UEE6E> \xA0\xB5 |0
-<UEE6F> \xA0\xB6 |0
-<UEE70> \xA0\xB7 |0
-<UEE71> \xA0\xB8 |0
-<UEE72> \xA0\xB9 |0
-<UEE73> \xA0\xBA |0
-<UEE74> \xA0\xBB |0
-<UEE75> \xA0\xBC |0
-<UEE76> \xA0\xBD |0
-<UEE77> \xA0\xBE |0
-<UEE78> \xA0\xBF |0
-<UEE79> \xA0\xC0 |0
-<UEE7A> \xA0\xC1 |0
-<UEE7B> \xA0\xC2 |0
-<UEE7C> \xA0\xC3 |0
-<UEE7D> \xA0\xC4 |0
-<UEE7E> \xA0\xC5 |0
-<UEE7F> \xA0\xC6 |0
-<UEE80> \xA0\xC7 |0
-<UEE81> \xA0\xC8 |0
-<UEE82> \xA0\xC9 |0
-<UEE83> \xA0\xCA |0
-<UEE84> \xA0\xCB |0
-<UEE85> \xA0\xCC |0
-<UEE86> \xA0\xCD |0
-<UEE87> \xA0\xCE |0
-<UEE88> \xA0\xCF |0
-<UEE89> \xA0\xD0 |0
-<UEE8A> \xA0\xD1 |0
-<UEE8B> \xA0\xD2 |0
-<UEE8C> \xA0\xD3 |0
-<UEE8D> \xA0\xD4 |0
-<UEE8E> \xA0\xD5 |0
-<UEE8F> \xA0\xD6 |0
-<UEE90> \xA0\xD7 |0
-<UEE91> \xA0\xD8 |0
-<UEE92> \xA0\xD9 |0
-<UEE93> \xA0\xDA |0
-<UEE94> \xA0\xDB |0
-<UEE95> \xA0\xDC |0
-<UEE96> \xA0\xDD |0
-<UEE97> \xA0\xDE |0
-<UEE98> \xA0\xDF |0
-<UEE99> \xA0\xE0 |0
-<UEE9A> \xA0\xE1 |0
-<UEE9B> \xA0\xE2 |0
-<UEE9C> \xA0\xE3 |0
-<UEE9D> \xA0\xE4 |0
-<UEE9E> \xA0\xE5 |0
-<UEE9F> \xA0\xE6 |0
-<UEEA0> \xA0\xE7 |0
-<UEEA1> \xA0\xE8 |0
-<UEEA2> \xA0\xE9 |0
-<UEEA3> \xA0\xEA |0
-<UEEA4> \xA0\xEB |0
-<UEEA5> \xA0\xEC |0
-<UEEA6> \xA0\xED |0
-<UEEA7> \xA0\xEE |0
-<UEEA8> \xA0\xEF |0
-<UEEA9> \xA0\xF0 |0
-<UEEAA> \xA0\xF1 |0
-<UEEAB> \xA0\xF2 |0
-<UEEAC> \xA0\xF3 |0
-<UEEAD> \xA0\xF4 |0
-<UEEAE> \xA0\xF5 |0
-<UEEAF> \xA0\xF6 |0
-<UEEB0> \xA0\xF7 |0
-<UEEB1> \xA0\xF8 |0
-<UEEB2> \xA0\xF9 |0
-<UEEB3> \xA0\xFA |0
-<UEEB4> \xA0\xFB |0
-<UEEB5> \xA0\xFC |0
-<UEEB6> \xA0\xFD |0
-<UEEB7> \xA0\xFE |0
-<UEEB8> \x81\x40 |0
-<UEEB9> \x81\x41 |0
-<UEEBA> \x81\x42 |0
-<UEEBB> \x81\x43 |0
-<UEEBC> \x81\x44 |0
-<UEEBD> \x81\x45 |0
-<UEEBE> \x81\x46 |0
-<UEEBF> \x81\x47 |0
-<UEEC0> \x81\x48 |0
-<UEEC1> \x81\x49 |0
-<UEEC2> \x81\x4A |0
-<UEEC3> \x81\x4B |0
-<UEEC4> \x81\x4C |0
-<UEEC5> \x81\x4D |0
-<UEEC6> \x81\x4E |0
-<UEEC7> \x81\x4F |0
-<UEEC8> \x81\x50 |0
-<UEEC9> \x81\x51 |0
-<UEECA> \x81\x52 |0
-<UEECB> \x81\x53 |0
-<UEECC> \x81\x54 |0
-<UEECD> \x81\x55 |0
-<UEECE> \x81\x56 |0
-<UEECF> \x81\x57 |0
-<UEED0> \x81\x58 |0
-<UEED1> \x81\x59 |0
-<UEED2> \x81\x5A |0
-<UEED3> \x81\x5B |0
-<UEED4> \x81\x5C |0
-<UEED5> \x81\x5D |0
-<UEED6> \x81\x5E |0
-<UEED7> \x81\x5F |0
-<UEED8> \x81\x60 |0
-<UEED9> \x81\x61 |0
-<UEEDA> \x81\x62 |0
-<UEEDB> \x81\x63 |0
-<UEEDC> \x81\x64 |0
-<UEEDD> \x81\x65 |0
-<UEEDE> \x81\x66 |0
-<UEEDF> \x81\x67 |0
-<UEEE0> \x81\x68 |0
-<UEEE1> \x81\x69 |0
-<UEEE2> \x81\x6A |0
-<UEEE3> \x81\x6B |0
-<UEEE4> \x81\x6C |0
-<UEEE5> \x81\x6D |0
-<UEEE6> \x81\x6E |0
-<UEEE7> \x81\x6F |0
-<UEEE8> \x81\x70 |0
-<UEEE9> \x81\x71 |0
-<UEEEA> \x81\x72 |0
-<UEEEB> \x81\x73 |0
-<UEEEC> \x81\x74 |0
-<UEEED> \x81\x75 |0
-<UEEEE> \x81\x76 |0
-<UEEEF> \x81\x77 |0
-<UEEF0> \x81\x78 |0
-<UEEF1> \x81\x79 |0
-<UEEF2> \x81\x7A |0
-<UEEF3> \x81\x7B |0
-<UEEF4> \x81\x7C |0
-<UEEF5> \x81\x7D |0
-<UEEF6> \x81\x7E |0
-<UEEF7> \x81\xA1 |0
-<UEEF8> \x81\xA2 |0
-<UEEF9> \x81\xA3 |0
-<UEEFA> \x81\xA4 |0
-<UEEFB> \x81\xA5 |0
-<UEEFC> \x81\xA6 |0
-<UEEFD> \x81\xA7 |0
-<UEEFE> \x81\xA8 |0
-<UEEFF> \x81\xA9 |0
-<UEF00> \x81\xAA |0
-<UEF01> \x81\xAB |0
-<UEF02> \x81\xAC |0
-<UEF03> \x81\xAD |0
-<UEF04> \x81\xAE |0
-<UEF05> \x81\xAF |0
-<UEF06> \x81\xB0 |0
-<UEF07> \x81\xB1 |0
-<UEF08> \x81\xB2 |0
-<UEF09> \x81\xB3 |0
-<UEF0A> \x81\xB4 |0
-<UEF0B> \x81\xB5 |0
-<UEF0C> \x81\xB6 |0
-<UEF0D> \x81\xB7 |0
-<UEF0E> \x81\xB8 |0
-<UEF0F> \x81\xB9 |0
-<UEF10> \x81\xBA |0
-<UEF11> \x81\xBB |0
-<UEF12> \x81\xBC |0
-<UEF13> \x81\xBD |0
-<UEF14> \x81\xBE |0
-<UEF15> \x81\xBF |0
-<UEF16> \x81\xC0 |0
-<UEF17> \x81\xC1 |0
-<UEF18> \x81\xC2 |0
-<UEF19> \x81\xC3 |0
-<UEF1A> \x81\xC4 |0
-<UEF1B> \x81\xC5 |0
-<UEF1C> \x81\xC6 |0
-<UEF1D> \x81\xC7 |0
-<UEF1E> \x81\xC8 |0
-<UEF1F> \x81\xC9 |0
-<UEF20> \x81\xCA |0
-<UEF21> \x81\xCB |0
-<UEF22> \x81\xCC |0
-<UEF23> \x81\xCD |0
-<UEF24> \x81\xCE |0
-<UEF25> \x81\xCF |0
-<UEF26> \x81\xD0 |0
-<UEF27> \x81\xD1 |0
-<UEF28> \x81\xD2 |0
-<UEF29> \x81\xD3 |0
-<UEF2A> \x81\xD4 |0
-<UEF2B> \x81\xD5 |0
-<UEF2C> \x81\xD6 |0
-<UEF2D> \x81\xD7 |0
-<UEF2E> \x81\xD8 |0
-<UEF2F> \x81\xD9 |0
-<UEF30> \x81\xDA |0
-<UEF31> \x81\xDB |0
-<UEF32> \x81\xDC |0
-<UEF33> \x81\xDD |0
-<UEF34> \x81\xDE |0
-<UEF35> \x81\xDF |0
-<UEF36> \x81\xE0 |0
-<UEF37> \x81\xE1 |0
-<UEF38> \x81\xE2 |0
-<UEF39> \x81\xE3 |0
-<UEF3A> \x81\xE4 |0
-<UEF3B> \x81\xE5 |0
-<UEF3C> \x81\xE6 |0
-<UEF3D> \x81\xE7 |0
-<UEF3E> \x81\xE8 |0
-<UEF3F> \x81\xE9 |0
-<UEF40> \x81\xEA |0
-<UEF41> \x81\xEB |0
-<UEF42> \x81\xEC |0
-<UEF43> \x81\xED |0
-<UEF44> \x81\xEE |0
-<UEF45> \x81\xEF |0
-<UEF46> \x81\xF0 |0
-<UEF47> \x81\xF1 |0
-<UEF48> \x81\xF2 |0
-<UEF49> \x81\xF3 |0
-<UEF4A> \x81\xF4 |0
-<UEF4B> \x81\xF5 |0
-<UEF4C> \x81\xF6 |0
-<UEF4D> \x81\xF7 |0
-<UEF4E> \x81\xF8 |0
-<UEF4F> \x81\xF9 |0
-<UEF50> \x81\xFA |0
-<UEF51> \x81\xFB |0
-<UEF52> \x81\xFC |0
-<UEF53> \x81\xFD |0
-<UEF54> \x81\xFE |0
-<UEF55> \x82\x40 |0
-<UEF56> \x82\x41 |0
-<UEF57> \x82\x42 |0
-<UEF58> \x82\x43 |0
-<UEF59> \x82\x44 |0
-<UEF5A> \x82\x45 |0
-<UEF5B> \x82\x46 |0
-<UEF5C> \x82\x47 |0
-<UEF5D> \x82\x48 |0
-<UEF5E> \x82\x49 |0
-<UEF5F> \x82\x4A |0
-<UEF60> \x82\x4B |0
-<UEF61> \x82\x4C |0
-<UEF62> \x82\x4D |0
-<UEF63> \x82\x4E |0
-<UEF64> \x82\x4F |0
-<UEF65> \x82\x50 |0
-<UEF66> \x82\x51 |0
-<UEF67> \x82\x52 |0
-<UEF68> \x82\x53 |0
-<UEF69> \x82\x54 |0
-<UEF6A> \x82\x55 |0
-<UEF6B> \x82\x56 |0
-<UEF6C> \x82\x57 |0
-<UEF6D> \x82\x58 |0
-<UEF6E> \x82\x59 |0
-<UEF6F> \x82\x5A |0
-<UEF70> \x82\x5B |0
-<UEF71> \x82\x5C |0
-<UEF72> \x82\x5D |0
-<UEF73> \x82\x5E |0
-<UEF74> \x82\x5F |0
-<UEF75> \x82\x60 |0
-<UEF76> \x82\x61 |0
-<UEF77> \x82\x62 |0
-<UEF78> \x82\x63 |0
-<UEF79> \x82\x64 |0
-<UEF7A> \x82\x65 |0
-<UEF7B> \x82\x66 |0
-<UEF7C> \x82\x67 |0
-<UEF7D> \x82\x68 |0
-<UEF7E> \x82\x69 |0
-<UEF7F> \x82\x6A |0
-<UEF80> \x82\x6B |0
-<UEF81> \x82\x6C |0
-<UEF82> \x82\x6D |0
-<UEF83> \x82\x6E |0
-<UEF84> \x82\x6F |0
-<UEF85> \x82\x70 |0
-<UEF86> \x82\x71 |0
-<UEF87> \x82\x72 |0
-<UEF88> \x82\x73 |0
-<UEF89> \x82\x74 |0
-<UEF8A> \x82\x75 |0
-<UEF8B> \x82\x76 |0
-<UEF8C> \x82\x77 |0
-<UEF8D> \x82\x78 |0
-<UEF8E> \x82\x79 |0
-<UEF8F> \x82\x7A |0
-<UEF90> \x82\x7B |0
-<UEF91> \x82\x7C |0
-<UEF92> \x82\x7D |0
-<UEF93> \x82\x7E |0
-<UEF94> \x82\xA1 |0
-<UEF95> \x82\xA2 |0
-<UEF96> \x82\xA3 |0
-<UEF97> \x82\xA4 |0
-<UEF98> \x82\xA5 |0
-<UEF99> \x82\xA6 |0
-<UEF9A> \x82\xA7 |0
-<UEF9B> \x82\xA8 |0
-<UEF9C> \x82\xA9 |0
-<UEF9D> \x82\xAA |0
-<UEF9E> \x82\xAB |0
-<UEF9F> \x82\xAC |0
-<UEFA0> \x82\xAD |0
-<UEFA1> \x82\xAE |0
-<UEFA2> \x82\xAF |0
-<UEFA3> \x82\xB0 |0
-<UEFA4> \x82\xB1 |0
-<UEFA5> \x82\xB2 |0
-<UEFA6> \x82\xB3 |0
-<UEFA7> \x82\xB4 |0
-<UEFA8> \x82\xB5 |0
-<UEFA9> \x82\xB6 |0
-<UEFAA> \x82\xB7 |0
-<UEFAB> \x82\xB8 |0
-<UEFAC> \x82\xB9 |0
-<UEFAD> \x82\xBA |0
-<UEFAE> \x82\xBB |0
-<UEFAF> \x82\xBC |0
-<UEFB0> \x82\xBD |0
-<UEFB1> \x82\xBE |0
-<UEFB2> \x82\xBF |0
-<UEFB3> \x82\xC0 |0
-<UEFB4> \x82\xC1 |0
-<UEFB5> \x82\xC2 |0
-<UEFB6> \x82\xC3 |0
-<UEFB7> \x82\xC4 |0
-<UEFB8> \x82\xC5 |0
-<UEFB9> \x82\xC6 |0
-<UEFBA> \x82\xC7 |0
-<UEFBB> \x82\xC8 |0
-<UEFBC> \x82\xC9 |0
-<UEFBD> \x82\xCA |0
-<UEFBE> \x82\xCB |0
-<UEFBF> \x82\xCC |0
-<UEFC0> \x82\xCD |0
-<UEFC1> \x82\xCE |0
-<UEFC2> \x82\xCF |0
-<UEFC3> \x82\xD0 |0
-<UEFC4> \x82\xD1 |0
-<UEFC5> \x82\xD2 |0
-<UEFC6> \x82\xD3 |0
-<UEFC7> \x82\xD4 |0
-<UEFC8> \x82\xD5 |0
-<UEFC9> \x82\xD6 |0
-<UEFCA> \x82\xD7 |0
-<UEFCB> \x82\xD8 |0
-<UEFCC> \x82\xD9 |0
-<UEFCD> \x82\xDA |0
-<UEFCE> \x82\xDB |0
-<UEFCF> \x82\xDC |0
-<UEFD0> \x82\xDD |0
-<UEFD1> \x82\xDE |0
-<UEFD2> \x82\xDF |0
-<UEFD3> \x82\xE0 |0
-<UEFD4> \x82\xE1 |0
-<UEFD5> \x82\xE2 |0
-<UEFD6> \x82\xE3 |0
-<UEFD7> \x82\xE4 |0
-<UEFD8> \x82\xE5 |0
-<UEFD9> \x82\xE6 |0
-<UEFDA> \x82\xE7 |0
-<UEFDB> \x82\xE8 |0
-<UEFDC> \x82\xE9 |0
-<UEFDD> \x82\xEA |0
-<UEFDE> \x82\xEB |0
-<UEFDF> \x82\xEC |0
-<UEFE0> \x82\xED |0
-<UEFE1> \x82\xEE |0
-<UEFE2> \x82\xEF |0
-<UEFE3> \x82\xF0 |0
-<UEFE4> \x82\xF1 |0
-<UEFE5> \x82\xF2 |0
-<UEFE6> \x82\xF3 |0
-<UEFE7> \x82\xF4 |0
-<UEFE8> \x82\xF5 |0
-<UEFE9> \x82\xF6 |0
-<UEFEA> \x82\xF7 |0
-<UEFEB> \x82\xF8 |0
-<UEFEC> \x82\xF9 |0
-<UEFED> \x82\xFA |0
-<UEFEE> \x82\xFB |0
-<UEFEF> \x82\xFC |0
-<UEFF0> \x82\xFD |0
-<UEFF1> \x82\xFE |0
-<UEFF2> \x83\x40 |0
-<UEFF3> \x83\x41 |0
-<UEFF4> \x83\x42 |0
-<UEFF5> \x83\x43 |0
-<UEFF6> \x83\x44 |0
-<UEFF7> \x83\x45 |0
-<UEFF8> \x83\x46 |0
-<UEFF9> \x83\x47 |0
-<UEFFA> \x83\x48 |0
-<UEFFB> \x83\x49 |0
-<UEFFC> \x83\x4A |0
-<UEFFD> \x83\x4B |0
-<UEFFE> \x83\x4C |0
-<UEFFF> \x83\x4D |0
-<UF000> \x83\x4E |0
-<UF001> \x83\x4F |0
-<UF002> \x83\x50 |0
-<UF003> \x83\x51 |0
-<UF004> \x83\x52 |0
-<UF005> \x83\x53 |0
-<UF006> \x83\x54 |0
-<UF007> \x83\x55 |0
-<UF008> \x83\x56 |0
-<UF009> \x83\x57 |0
-<UF00A> \x83\x58 |0
-<UF00B> \x83\x59 |0
-<UF00C> \x83\x5A |0
-<UF00D> \x83\x5B |0
-<UF00E> \x83\x5C |0
-<UF00F> \x83\x5D |0
-<UF010> \x83\x5E |0
-<UF011> \x83\x5F |0
-<UF012> \x83\x60 |0
-<UF013> \x83\x61 |0
-<UF014> \x83\x62 |0
-<UF015> \x83\x63 |0
-<UF016> \x83\x64 |0
-<UF017> \x83\x65 |0
-<UF018> \x83\x66 |0
-<UF019> \x83\x67 |0
-<UF01A> \x83\x68 |0
-<UF01B> \x83\x69 |0
-<UF01C> \x83\x6A |0
-<UF01D> \x83\x6B |0
-<UF01E> \x83\x6C |0
-<UF01F> \x83\x6D |0
-<UF020> \x83\x6E |0
-<UF021> \x83\x6F |0
-<UF022> \x83\x70 |0
-<UF023> \x83\x71 |0
-<UF024> \x83\x72 |0
-<UF025> \x83\x73 |0
-<UF026> \x83\x74 |0
-<UF027> \x83\x75 |0
-<UF028> \x83\x76 |0
-<UF029> \x83\x77 |0
-<UF02A> \x83\x78 |0
-<UF02B> \x83\x79 |0
-<UF02C> \x83\x7A |0
-<UF02D> \x83\x7B |0
-<UF02E> \x83\x7C |0
-<UF02F> \x83\x7D |0
-<UF030> \x83\x7E |0
-<UF031> \x83\xA1 |0
-<UF032> \x83\xA2 |0
-<UF033> \x83\xA3 |0
-<UF034> \x83\xA4 |0
-<UF035> \x83\xA5 |0
-<UF036> \x83\xA6 |0
-<UF037> \x83\xA7 |0
-<UF038> \x83\xA8 |0
-<UF039> \x83\xA9 |0
-<UF03A> \x83\xAA |0
-<UF03B> \x83\xAB |0
-<UF03C> \x83\xAC |0
-<UF03D> \x83\xAD |0
-<UF03E> \x83\xAE |0
-<UF03F> \x83\xAF |0
-<UF040> \x83\xB0 |0
-<UF041> \x83\xB1 |0
-<UF042> \x83\xB2 |0
-<UF043> \x83\xB3 |0
-<UF044> \x83\xB4 |0
-<UF045> \x83\xB5 |0
-<UF046> \x83\xB6 |0
-<UF047> \x83\xB7 |0
-<UF048> \x83\xB8 |0
-<UF049> \x83\xB9 |0
-<UF04A> \x83\xBA |0
-<UF04B> \x83\xBB |0
-<UF04C> \x83\xBC |0
-<UF04D> \x83\xBD |0
-<UF04E> \x83\xBE |0
-<UF04F> \x83\xBF |0
-<UF050> \x83\xC0 |0
-<UF051> \x83\xC1 |0
-<UF052> \x83\xC2 |0
-<UF053> \x83\xC3 |0
-<UF054> \x83\xC4 |0
-<UF055> \x83\xC5 |0
-<UF056> \x83\xC6 |0
-<UF057> \x83\xC7 |0
-<UF058> \x83\xC8 |0
-<UF059> \x83\xC9 |0
-<UF05A> \x83\xCA |0
-<UF05B> \x83\xCB |0
-<UF05C> \x83\xCC |0
-<UF05D> \x83\xCD |0
-<UF05E> \x83\xCE |0
-<UF05F> \x83\xCF |0
-<UF060> \x83\xD0 |0
-<UF061> \x83\xD1 |0
-<UF062> \x83\xD2 |0
-<UF063> \x83\xD3 |0
-<UF064> \x83\xD4 |0
-<UF065> \x83\xD5 |0
-<UF066> \x83\xD6 |0
-<UF067> \x83\xD7 |0
-<UF068> \x83\xD8 |0
-<UF069> \x83\xD9 |0
-<UF06A> \x83\xDA |0
-<UF06B> \x83\xDB |0
-<UF06C> \x83\xDC |0
-<UF06D> \x83\xDD |0
-<UF06E> \x83\xDE |0
-<UF06F> \x83\xDF |0
-<UF070> \x83\xE0 |0
-<UF071> \x83\xE1 |0
-<UF072> \x83\xE2 |0
-<UF073> \x83\xE3 |0
-<UF074> \x83\xE4 |0
-<UF075> \x83\xE5 |0
-<UF076> \x83\xE6 |0
-<UF077> \x83\xE7 |0
-<UF078> \x83\xE8 |0
-<UF079> \x83\xE9 |0
-<UF07A> \x83\xEA |0
-<UF07B> \x83\xEB |0
-<UF07C> \x83\xEC |0
-<UF07D> \x83\xED |0
-<UF07E> \x83\xEE |0
-<UF07F> \x83\xEF |0
-<UF080> \x83\xF0 |0
-<UF081> \x83\xF1 |0
-<UF082> \x83\xF2 |0
-<UF083> \x83\xF3 |0
-<UF084> \x83\xF4 |0
-<UF085> \x83\xF5 |0
-<UF086> \x83\xF6 |0
-<UF087> \x83\xF7 |0
-<UF088> \x83\xF8 |0
-<UF089> \x83\xF9 |0
-<UF08A> \x83\xFA |0
-<UF08B> \x83\xFB |0
-<UF08C> \x83\xFC |0
-<UF08D> \x83\xFD |0
-<UF08E> \x83\xFE |0
-<UF08F> \x84\x40 |0
-<UF090> \x84\x41 |0
-<UF091> \x84\x42 |0
-<UF092> \x84\x43 |0
-<UF093> \x84\x44 |0
-<UF094> \x84\x45 |0
-<UF095> \x84\x46 |0
-<UF096> \x84\x47 |0
-<UF097> \x84\x48 |0
-<UF098> \x84\x49 |0
-<UF099> \x84\x4A |0
-<UF09A> \x84\x4B |0
-<UF09B> \x84\x4C |0
-<UF09C> \x84\x4D |0
-<UF09D> \x84\x4E |0
-<UF09E> \x84\x4F |0
-<UF09F> \x84\x50 |0
-<UF0A0> \x84\x51 |0
-<UF0A1> \x84\x52 |0
-<UF0A2> \x84\x53 |0
-<UF0A3> \x84\x54 |0
-<UF0A4> \x84\x55 |0
-<UF0A5> \x84\x56 |0
-<UF0A6> \x84\x57 |0
-<UF0A7> \x84\x58 |0
-<UF0A8> \x84\x59 |0
-<UF0A9> \x84\x5A |0
-<UF0AA> \x84\x5B |0
-<UF0AB> \x84\x5C |0
-<UF0AC> \x84\x5D |0
-<UF0AD> \x84\x5E |0
-<UF0AE> \x84\x5F |0
-<UF0AF> \x84\x60 |0
-<UF0B0> \x84\x61 |0
-<UF0B1> \x84\x62 |0
-<UF0B2> \x84\x63 |0
-<UF0B3> \x84\x64 |0
-<UF0B4> \x84\x65 |0
-<UF0B5> \x84\x66 |0
-<UF0B6> \x84\x67 |0
-<UF0B7> \x84\x68 |0
-<UF0B8> \x84\x69 |0
-<UF0B9> \x84\x6A |0
-<UF0BA> \x84\x6B |0
-<UF0BB> \x84\x6C |0
-<UF0BC> \x84\x6D |0
-<UF0BD> \x84\x6E |0
-<UF0BE> \x84\x6F |0
-<UF0BF> \x84\x70 |0
-<UF0C0> \x84\x71 |0
-<UF0C1> \x84\x72 |0
-<UF0C2> \x84\x73 |0
-<UF0C3> \x84\x74 |0
-<UF0C4> \x84\x75 |0
-<UF0C5> \x84\x76 |0
-<UF0C6> \x84\x77 |0
-<UF0C7> \x84\x78 |0
-<UF0C8> \x84\x79 |0
-<UF0C9> \x84\x7A |0
-<UF0CA> \x84\x7B |0
-<UF0CB> \x84\x7C |0
-<UF0CC> \x84\x7D |0
-<UF0CD> \x84\x7E |0
-<UF0CE> \x84\xA1 |0
-<UF0CF> \x84\xA2 |0
-<UF0D0> \x84\xA3 |0
-<UF0D1> \x84\xA4 |0
-<UF0D2> \x84\xA5 |0
-<UF0D3> \x84\xA6 |0
-<UF0D4> \x84\xA7 |0
-<UF0D5> \x84\xA8 |0
-<UF0D6> \x84\xA9 |0
-<UF0D7> \x84\xAA |0
-<UF0D8> \x84\xAB |0
-<UF0D9> \x84\xAC |0
-<UF0DA> \x84\xAD |0
-<UF0DB> \x84\xAE |0
-<UF0DC> \x84\xAF |0
-<UF0DD> \x84\xB0 |0
-<UF0DE> \x84\xB1 |0
-<UF0DF> \x84\xB2 |0
-<UF0E0> \x84\xB3 |0
-<UF0E1> \x84\xB4 |0
-<UF0E2> \x84\xB5 |0
-<UF0E3> \x84\xB6 |0
-<UF0E4> \x84\xB7 |0
-<UF0E5> \x84\xB8 |0
-<UF0E6> \x84\xB9 |0
-<UF0E7> \x84\xBA |0
-<UF0E8> \x84\xBB |0
-<UF0E9> \x84\xBC |0
-<UF0EA> \x84\xBD |0
-<UF0EB> \x84\xBE |0
-<UF0EC> \x84\xBF |0
-<UF0ED> \x84\xC0 |0
-<UF0EE> \x84\xC1 |0
-<UF0EF> \x84\xC2 |0
-<UF0F0> \x84\xC3 |0
-<UF0F1> \x84\xC4 |0
-<UF0F2> \x84\xC5 |0
-<UF0F3> \x84\xC6 |0
-<UF0F4> \x84\xC7 |0
-<UF0F5> \x84\xC8 |0
-<UF0F6> \x84\xC9 |0
-<UF0F7> \x84\xCA |0
-<UF0F8> \x84\xCB |0
-<UF0F9> \x84\xCC |0
-<UF0FA> \x84\xCD |0
-<UF0FB> \x84\xCE |0
-<UF0FC> \x84\xCF |0
-<UF0FD> \x84\xD0 |0
-<UF0FE> \x84\xD1 |0
-<UF0FF> \x84\xD2 |0
-<UF100> \x84\xD3 |0
-<UF101> \x84\xD4 |0
-<UF102> \x84\xD5 |0
-<UF103> \x84\xD6 |0
-<UF104> \x84\xD7 |0
-<UF105> \x84\xD8 |0
-<UF106> \x84\xD9 |0
-<UF107> \x84\xDA |0
-<UF108> \x84\xDB |0
-<UF109> \x84\xDC |0
-<UF10A> \x84\xDD |0
-<UF10B> \x84\xDE |0
-<UF10C> \x84\xDF |0
-<UF10D> \x84\xE0 |0
-<UF10E> \x84\xE1 |0
-<UF10F> \x84\xE2 |0
-<UF110> \x84\xE3 |0
-<UF111> \x84\xE4 |0
-<UF112> \x84\xE5 |0
-<UF113> \x84\xE6 |0
-<UF114> \x84\xE7 |0
-<UF115> \x84\xE8 |0
-<UF116> \x84\xE9 |0
-<UF117> \x84\xEA |0
-<UF118> \x84\xEB |0
-<UF119> \x84\xEC |0
-<UF11A> \x84\xED |0
-<UF11B> \x84\xEE |0
-<UF11C> \x84\xEF |0
-<UF11D> \x84\xF0 |0
-<UF11E> \x84\xF1 |0
-<UF11F> \x84\xF2 |0
-<UF120> \x84\xF3 |0
-<UF121> \x84\xF4 |0
-<UF122> \x84\xF5 |0
-<UF123> \x84\xF6 |0
-<UF124> \x84\xF7 |0
-<UF125> \x84\xF8 |0
-<UF126> \x84\xF9 |0
-<UF127> \x84\xFA |0
-<UF128> \x84\xFB |0
-<UF129> \x84\xFC |0
-<UF12A> \x84\xFD |0
-<UF12B> \x84\xFE |0
-<UF12C> \x85\x40 |0
-<UF12D> \x85\x41 |0
-<UF12E> \x85\x42 |0
-<UF12F> \x85\x43 |0
-<UF130> \x85\x44 |0
-<UF131> \x85\x45 |0
-<UF132> \x85\x46 |0
-<UF133> \x85\x47 |0
-<UF134> \x85\x48 |0
-<UF135> \x85\x49 |0
-<UF136> \x85\x4A |0
-<UF137> \x85\x4B |0
-<UF138> \x85\x4C |0
-<UF139> \x85\x4D |0
-<UF13A> \x85\x4E |0
-<UF13B> \x85\x4F |0
-<UF13C> \x85\x50 |0
-<UF13D> \x85\x51 |0
-<UF13E> \x85\x52 |0
-<UF13F> \x85\x53 |0
-<UF140> \x85\x54 |0
-<UF141> \x85\x55 |0
-<UF142> \x85\x56 |0
-<UF143> \x85\x57 |0
-<UF144> \x85\x58 |0
-<UF145> \x85\x59 |0
-<UF146> \x85\x5A |0
-<UF147> \x85\x5B |0
-<UF148> \x85\x5C |0
-<UF149> \x85\x5D |0
-<UF14A> \x85\x5E |0
-<UF14B> \x85\x5F |0
-<UF14C> \x85\x60 |0
-<UF14D> \x85\x61 |0
-<UF14E> \x85\x62 |0
-<UF14F> \x85\x63 |0
-<UF150> \x85\x64 |0
-<UF151> \x85\x65 |0
-<UF152> \x85\x66 |0
-<UF153> \x85\x67 |0
-<UF154> \x85\x68 |0
-<UF155> \x85\x69 |0
-<UF156> \x85\x6A |0
-<UF157> \x85\x6B |0
-<UF158> \x85\x6C |0
-<UF159> \x85\x6D |0
-<UF15A> \x85\x6E |0
-<UF15B> \x85\x6F |0
-<UF15C> \x85\x70 |0
-<UF15D> \x85\x71 |0
-<UF15E> \x85\x72 |0
-<UF15F> \x85\x73 |0
-<UF160> \x85\x74 |0
-<UF161> \x85\x75 |0
-<UF162> \x85\x76 |0
-<UF163> \x85\x77 |0
-<UF164> \x85\x78 |0
-<UF165> \x85\x79 |0
-<UF166> \x85\x7A |0
-<UF167> \x85\x7B |0
-<UF168> \x85\x7C |0
-<UF169> \x85\x7D |0
-<UF16A> \x85\x7E |0
-<UF16B> \x85\xA1 |0
-<UF16C> \x85\xA2 |0
-<UF16D> \x85\xA3 |0
-<UF16E> \x85\xA4 |0
-<UF16F> \x85\xA5 |0
-<UF170> \x85\xA6 |0
-<UF171> \x85\xA7 |0
-<UF172> \x85\xA8 |0
-<UF173> \x85\xA9 |0
-<UF174> \x85\xAA |0
-<UF175> \x85\xAB |0
-<UF176> \x85\xAC |0
-<UF177> \x85\xAD |0
-<UF178> \x85\xAE |0
-<UF179> \x85\xAF |0
-<UF17A> \x85\xB0 |0
-<UF17B> \x85\xB1 |0
-<UF17C> \x85\xB2 |0
-<UF17D> \x85\xB3 |0
-<UF17E> \x85\xB4 |0
-<UF17F> \x85\xB5 |0
-<UF180> \x85\xB6 |0
-<UF181> \x85\xB7 |0
-<UF182> \x85\xB8 |0
-<UF183> \x85\xB9 |0
-<UF184> \x85\xBA |0
-<UF185> \x85\xBB |0
-<UF186> \x85\xBC |0
-<UF187> \x85\xBD |0
-<UF188> \x85\xBE |0
-<UF189> \x85\xBF |0
-<UF18A> \x85\xC0 |0
-<UF18B> \x85\xC1 |0
-<UF18C> \x85\xC2 |0
-<UF18D> \x85\xC3 |0
-<UF18E> \x85\xC4 |0
-<UF18F> \x85\xC5 |0
-<UF190> \x85\xC6 |0
-<UF191> \x85\xC7 |0
-<UF192> \x85\xC8 |0
-<UF193> \x85\xC9 |0
-<UF194> \x85\xCA |0
-<UF195> \x85\xCB |0
-<UF196> \x85\xCC |0
-<UF197> \x85\xCD |0
-<UF198> \x85\xCE |0
-<UF199> \x85\xCF |0
-<UF19A> \x85\xD0 |0
-<UF19B> \x85\xD1 |0
-<UF19C> \x85\xD2 |0
-<UF19D> \x85\xD3 |0
-<UF19E> \x85\xD4 |0
-<UF19F> \x85\xD5 |0
-<UF1A0> \x85\xD6 |0
-<UF1A1> \x85\xD7 |0
-<UF1A2> \x85\xD8 |0
-<UF1A3> \x85\xD9 |0
-<UF1A4> \x85\xDA |0
-<UF1A5> \x85\xDB |0
-<UF1A6> \x85\xDC |0
-<UF1A7> \x85\xDD |0
-<UF1A8> \x85\xDE |0
-<UF1A9> \x85\xDF |0
-<UF1AA> \x85\xE0 |0
-<UF1AB> \x85\xE1 |0
-<UF1AC> \x85\xE2 |0
-<UF1AD> \x85\xE3 |0
-<UF1AE> \x85\xE4 |0
-<UF1AF> \x85\xE5 |0
-<UF1B0> \x85\xE6 |0
-<UF1B1> \x85\xE7 |0
-<UF1B2> \x85\xE8 |0
-<UF1B3> \x85\xE9 |0
-<UF1B4> \x85\xEA |0
-<UF1B5> \x85\xEB |0
-<UF1B6> \x85\xEC |0
-<UF1B7> \x85\xED |0
-<UF1B8> \x85\xEE |0
-<UF1B9> \x85\xEF |0
-<UF1BA> \x85\xF0 |0
-<UF1BB> \x85\xF1 |0
-<UF1BC> \x85\xF2 |0
-<UF1BD> \x85\xF3 |0
-<UF1BE> \x85\xF4 |0
-<UF1BF> \x85\xF5 |0
-<UF1C0> \x85\xF6 |0
-<UF1C1> \x85\xF7 |0
-<UF1C2> \x85\xF8 |0
-<UF1C3> \x85\xF9 |0
-<UF1C4> \x85\xFA |0
-<UF1C5> \x85\xFB |0
-<UF1C6> \x85\xFC |0
-<UF1C7> \x85\xFD |0
-<UF1C8> \x85\xFE |0
-<UF1C9> \x86\x40 |0
-<UF1CA> \x86\x41 |0
-<UF1CB> \x86\x42 |0
-<UF1CC> \x86\x43 |0
-<UF1CD> \x86\x44 |0
-<UF1CE> \x86\x45 |0
-<UF1CF> \x86\x46 |0
-<UF1D0> \x86\x47 |0
-<UF1D1> \x86\x48 |0
-<UF1D2> \x86\x49 |0
-<UF1D3> \x86\x4A |0
-<UF1D4> \x86\x4B |0
-<UF1D5> \x86\x4C |0
-<UF1D6> \x86\x4D |0
-<UF1D7> \x86\x4E |0
-<UF1D8> \x86\x4F |0
-<UF1D9> \x86\x50 |0
-<UF1DA> \x86\x51 |0
-<UF1DB> \x86\x52 |0
-<UF1DC> \x86\x53 |0
-<UF1DD> \x86\x54 |0
-<UF1DE> \x86\x55 |0
-<UF1DF> \x86\x56 |0
-<UF1E0> \x86\x57 |0
-<UF1E1> \x86\x58 |0
-<UF1E2> \x86\x59 |0
-<UF1E3> \x86\x5A |0
-<UF1E4> \x86\x5B |0
-<UF1E5> \x86\x5C |0
-<UF1E6> \x86\x5D |0
-<UF1E7> \x86\x5E |0
-<UF1E8> \x86\x5F |0
-<UF1E9> \x86\x60 |0
-<UF1EA> \x86\x61 |0
-<UF1EB> \x86\x62 |0
-<UF1EC> \x86\x63 |0
-<UF1ED> \x86\x64 |0
-<UF1EE> \x86\x65 |0
-<UF1EF> \x86\x66 |0
-<UF1F0> \x86\x67 |0
-<UF1F1> \x86\x68 |0
-<UF1F2> \x86\x69 |0
-<UF1F3> \x86\x6A |0
-<UF1F4> \x86\x6B |0
-<UF1F5> \x86\x6C |0
-<UF1F6> \x86\x6D |0
-<UF1F7> \x86\x6E |0
-<UF1F8> \x86\x6F |0
-<UF1F9> \x86\x70 |0
-<UF1FA> \x86\x71 |0
-<UF1FB> \x86\x72 |0
-<UF1FC> \x86\x73 |0
-<UF1FD> \x86\x74 |0
-<UF1FE> \x86\x75 |0
-<UF1FF> \x86\x76 |0
-<UF200> \x86\x77 |0
-<UF201> \x86\x78 |0
-<UF202> \x86\x79 |0
-<UF203> \x86\x7A |0
-<UF204> \x86\x7B |0
-<UF205> \x86\x7C |0
-<UF206> \x86\x7D |0
-<UF207> \x86\x7E |0
-<UF208> \x86\xA1 |0
-<UF209> \x86\xA2 |0
-<UF20A> \x86\xA3 |0
-<UF20B> \x86\xA4 |0
-<UF20C> \x86\xA5 |0
-<UF20D> \x86\xA6 |0
-<UF20E> \x86\xA7 |0
-<UF20F> \x86\xA8 |0
-<UF210> \x86\xA9 |0
-<UF211> \x86\xAA |0
-<UF212> \x86\xAB |0
-<UF213> \x86\xAC |0
-<UF214> \x86\xAD |0
-<UF215> \x86\xAE |0
-<UF216> \x86\xAF |0
-<UF217> \x86\xB0 |0
-<UF218> \x86\xB1 |0
-<UF219> \x86\xB2 |0
-<UF21A> \x86\xB3 |0
-<UF21B> \x86\xB4 |0
-<UF21C> \x86\xB5 |0
-<UF21D> \x86\xB6 |0
-<UF21E> \x86\xB7 |0
-<UF21F> \x86\xB8 |0
-<UF220> \x86\xB9 |0
-<UF221> \x86\xBA |0
-<UF222> \x86\xBB |0
-<UF223> \x86\xBC |0
-<UF224> \x86\xBD |0
-<UF225> \x86\xBE |0
-<UF226> \x86\xBF |0
-<UF227> \x86\xC0 |0
-<UF228> \x86\xC1 |0
-<UF229> \x86\xC2 |0
-<UF22A> \x86\xC3 |0
-<UF22B> \x86\xC4 |0
-<UF22C> \x86\xC5 |0
-<UF22D> \x86\xC6 |0
-<UF22E> \x86\xC7 |0
-<UF22F> \x86\xC8 |0
-<UF230> \x86\xC9 |0
-<UF231> \x86\xCA |0
-<UF232> \x86\xCB |0
-<UF233> \x86\xCC |0
-<UF234> \x86\xCD |0
-<UF235> \x86\xCE |0
-<UF236> \x86\xCF |0
-<UF237> \x86\xD0 |0
-<UF238> \x86\xD1 |0
-<UF239> \x86\xD2 |0
-<UF23A> \x86\xD3 |0
-<UF23B> \x86\xD4 |0
-<UF23C> \x86\xD5 |0
-<UF23D> \x86\xD6 |0
-<UF23E> \x86\xD7 |0
-<UF23F> \x86\xD8 |0
-<UF240> \x86\xD9 |0
-<UF241> \x86\xDA |0
-<UF242> \x86\xDB |0
-<UF243> \x86\xDC |0
-<UF244> \x86\xDD |0
-<UF245> \x86\xDE |0
-<UF246> \x86\xDF |0
-<UF247> \x86\xE0 |0
-<UF248> \x86\xE1 |0
-<UF249> \x86\xE2 |0
-<UF24A> \x86\xE3 |0
-<UF24B> \x86\xE4 |0
-<UF24C> \x86\xE5 |0
-<UF24D> \x86\xE6 |0
-<UF24E> \x86\xE7 |0
-<UF24F> \x86\xE8 |0
-<UF250> \x86\xE9 |0
-<UF251> \x86\xEA |0
-<UF252> \x86\xEB |0
-<UF253> \x86\xEC |0
-<UF254> \x86\xED |0
-<UF255> \x86\xEE |0
-<UF256> \x86\xEF |0
-<UF257> \x86\xF0 |0
-<UF258> \x86\xF1 |0
-<UF259> \x86\xF2 |0
-<UF25A> \x86\xF3 |0
-<UF25B> \x86\xF4 |0
-<UF25C> \x86\xF5 |0
-<UF25D> \x86\xF6 |0
-<UF25E> \x86\xF7 |0
-<UF25F> \x86\xF8 |0
-<UF260> \x86\xF9 |0
-<UF261> \x86\xFA |0
-<UF262> \x86\xFB |0
-<UF263> \x86\xFC |0
-<UF264> \x86\xFD |0
-<UF265> \x86\xFE |0
-<UF266> \x87\x40 |0
-<UF267> \x87\x41 |0
-<UF268> \x87\x42 |0
-<UF269> \x87\x43 |0
-<UF26A> \x87\x44 |0
-<UF26B> \x87\x45 |0
-<UF26C> \x87\x46 |0
-<UF26D> \x87\x47 |0
-<UF26E> \x87\x48 |0
-<UF26F> \x87\x49 |0
-<UF270> \x87\x4A |0
-<UF271> \x87\x4B |0
-<UF272> \x87\x4C |0
-<UF273> \x87\x4D |0
-<UF274> \x87\x4E |0
-<UF275> \x87\x4F |0
-<UF276> \x87\x50 |0
-<UF277> \x87\x51 |0
-<UF278> \x87\x52 |0
-<UF279> \x87\x53 |0
-<UF27A> \x87\x54 |0
-<UF27B> \x87\x55 |0
-<UF27C> \x87\x56 |0
-<UF27D> \x87\x57 |0
-<UF27E> \x87\x58 |0
-<UF27F> \x87\x59 |0
-<UF280> \x87\x5A |0
-<UF281> \x87\x5B |0
-<UF282> \x87\x5C |0
-<UF283> \x87\x5D |0
-<UF284> \x87\x5E |0
-<UF285> \x87\x5F |0
-<UF286> \x87\x60 |0
-<UF287> \x87\x61 |0
-<UF288> \x87\x62 |0
-<UF289> \x87\x63 |0
-<UF28A> \x87\x64 |0
-<UF28B> \x87\x65 |0
-<UF28C> \x87\x66 |0
-<UF28D> \x87\x67 |0
-<UF28E> \x87\x68 |0
-<UF28F> \x87\x69 |0
-<UF290> \x87\x6A |0
-<UF291> \x87\x6B |0
-<UF292> \x87\x6C |0
-<UF293> \x87\x6D |0
-<UF294> \x87\x6E |0
-<UF295> \x87\x6F |0
-<UF296> \x87\x70 |0
-<UF297> \x87\x71 |0
-<UF298> \x87\x72 |0
-<UF299> \x87\x73 |0
-<UF29A> \x87\x74 |0
-<UF29B> \x87\x75 |0
-<UF29C> \x87\x76 |0
-<UF29D> \x87\x77 |0
-<UF29E> \x87\x78 |0
-<UF29F> \x87\x79 |0
-<UF2A0> \x87\x7A |0
-<UF2A1> \x87\x7B |0
-<UF2A2> \x87\x7C |0
-<UF2A3> \x87\x7D |0
-<UF2A4> \x87\x7E |0
-<UF2A5> \x87\xA1 |0
-<UF2A6> \x87\xA2 |0
-<UF2A7> \x87\xA3 |0
-<UF2A8> \x87\xA4 |0
-<UF2A9> \x87\xA5 |0
-<UF2AA> \x87\xA6 |0
-<UF2AB> \x87\xA7 |0
-<UF2AC> \x87\xA8 |0
-<UF2AD> \x87\xA9 |0
-<UF2AE> \x87\xAA |0
-<UF2AF> \x87\xAB |0
-<UF2B0> \x87\xAC |0
-<UF2B1> \x87\xAD |0
-<UF2B2> \x87\xAE |0
-<UF2B3> \x87\xAF |0
-<UF2B4> \x87\xB0 |0
-<UF2B5> \x87\xB1 |0
-<UF2B6> \x87\xB2 |0
-<UF2B7> \x87\xB3 |0
-<UF2B8> \x87\xB4 |0
-<UF2B9> \x87\xB5 |0
-<UF2BA> \x87\xB6 |0
-<UF2BB> \x87\xB7 |0
-<UF2BC> \x87\xB8 |0
-<UF2BD> \x87\xB9 |0
-<UF2BE> \x87\xBA |0
-<UF2BF> \x87\xBB |0
-<UF2C0> \x87\xBC |0
-<UF2C1> \x87\xBD |0
-<UF2C2> \x87\xBE |0
-<UF2C3> \x87\xBF |0
-<UF2C4> \x87\xC0 |0
-<UF2C5> \x87\xC1 |0
-<UF2C6> \x87\xC2 |0
-<UF2C7> \x87\xC3 |0
-<UF2C8> \x87\xC4 |0
-<UF2C9> \x87\xC5 |0
-<UF2CA> \x87\xC6 |0
-<UF2CB> \x87\xC7 |0
-<UF2CC> \x87\xC8 |0
-<UF2CD> \x87\xC9 |0
-<UF2CE> \x87\xCA |0
-<UF2CF> \x87\xCB |0
-<UF2D0> \x87\xCC |0
-<UF2D1> \x87\xCD |0
-<UF2D2> \x87\xCE |0
-<UF2D3> \x87\xCF |0
-<UF2D4> \x87\xD0 |0
-<UF2D5> \x87\xD1 |0
-<UF2D6> \x87\xD2 |0
-<UF2D7> \x87\xD3 |0
-<UF2D8> \x87\xD4 |0
-<UF2D9> \x87\xD5 |0
-<UF2DA> \x87\xD6 |0
-<UF2DB> \x87\xD7 |0
-<UF2DC> \x87\xD8 |0
-<UF2DD> \x87\xD9 |0
-<UF2DE> \x87\xDA |0
-<UF2DF> \x87\xDB |0
-<UF2E0> \x87\xDC |0
-<UF2E1> \x87\xDD |0
-<UF2E2> \x87\xDE |0
-<UF2E3> \x87\xDF |0
-<UF2E4> \x87\xE0 |0
-<UF2E5> \x87\xE1 |0
-<UF2E6> \x87\xE2 |0
-<UF2E7> \x87\xE3 |0
-<UF2E8> \x87\xE4 |0
-<UF2E9> \x87\xE5 |0
-<UF2EA> \x87\xE6 |0
-<UF2EB> \x87\xE7 |0
-<UF2EC> \x87\xE8 |0
-<UF2ED> \x87\xE9 |0
-<UF2EE> \x87\xEA |0
-<UF2EF> \x87\xEB |0
-<UF2F0> \x87\xEC |0
-<UF2F1> \x87\xED |0
-<UF2F2> \x87\xEE |0
-<UF2F3> \x87\xEF |0
-<UF2F4> \x87\xF0 |0
-<UF2F5> \x87\xF1 |0
-<UF2F6> \x87\xF2 |0
-<UF2F7> \x87\xF3 |0
-<UF2F8> \x87\xF4 |0
-<UF2F9> \x87\xF5 |0
-<UF2FA> \x87\xF6 |0
-<UF2FB> \x87\xF7 |0
-<UF2FC> \x87\xF8 |0
-<UF2FD> \x87\xF9 |0
-<UF2FE> \x87\xFA |0
-<UF2FF> \x87\xFB |0
-<UF300> \x87\xFC |0
-<UF301> \x87\xFD |0
-<UF302> \x87\xFE |0
-<UF303> \x88\x40 |0
-<UF304> \x88\x41 |0
-<UF305> \x88\x42 |0
-<UF306> \x88\x43 |0
-<UF307> \x88\x44 |0
-<UF308> \x88\x45 |0
-<UF309> \x88\x46 |0
-<UF30A> \x88\x47 |0
-<UF30B> \x88\x48 |0
-<UF30C> \x88\x49 |0
-<UF30D> \x88\x4A |0
-<UF30E> \x88\x4B |0
-<UF30F> \x88\x4C |0
-<UF310> \x88\x4D |0
-<UF311> \x88\x4E |0
-<UF312> \x88\x4F |0
-<UF313> \x88\x50 |0
-<UF314> \x88\x51 |0
-<UF315> \x88\x52 |0
-<UF316> \x88\x53 |0
-<UF317> \x88\x54 |0
-<UF318> \x88\x55 |0
-<UF319> \x88\x56 |0
-<UF31A> \x88\x57 |0
-<UF31B> \x88\x58 |0
-<UF31C> \x88\x59 |0
-<UF31D> \x88\x5A |0
-<UF31E> \x88\x5B |0
-<UF31F> \x88\x5C |0
-<UF320> \x88\x5D |0
-<UF321> \x88\x5E |0
-<UF322> \x88\x5F |0
-<UF323> \x88\x60 |0
-<UF324> \x88\x61 |0
-<UF325> \x88\x62 |0
-<UF326> \x88\x63 |0
-<UF327> \x88\x64 |0
-<UF328> \x88\x65 |0
-<UF329> \x88\x66 |0
-<UF32A> \x88\x67 |0
-<UF32B> \x88\x68 |0
-<UF32C> \x88\x69 |0
-<UF32D> \x88\x6A |0
-<UF32E> \x88\x6B |0
-<UF32F> \x88\x6C |0
-<UF330> \x88\x6D |0
-<UF331> \x88\x6E |0
-<UF332> \x88\x6F |0
-<UF333> \x88\x70 |0
-<UF334> \x88\x71 |0
-<UF335> \x88\x72 |0
-<UF336> \x88\x73 |0
-<UF337> \x88\x74 |0
-<UF338> \x88\x75 |0
-<UF339> \x88\x76 |0
-<UF33A> \x88\x77 |0
-<UF33B> \x88\x78 |0
-<UF33C> \x88\x79 |0
-<UF33D> \x88\x7A |0
-<UF33E> \x88\x7B |0
-<UF33F> \x88\x7C |0
-<UF340> \x88\x7D |0
-<UF341> \x88\x7E |0
-<UF342> \x88\xA1 |0
-<UF343> \x88\xA2 |0
-<UF344> \x88\xA3 |0
-<UF345> \x88\xA4 |0
-<UF346> \x88\xA5 |0
-<UF347> \x88\xA6 |0
-<UF348> \x88\xA7 |0
-<UF349> \x88\xA8 |0
-<UF34A> \x88\xA9 |0
-<UF34B> \x88\xAA |0
-<UF34C> \x88\xAB |0
-<UF34D> \x88\xAC |0
-<UF34E> \x88\xAD |0
-<UF34F> \x88\xAE |0
-<UF350> \x88\xAF |0
-<UF351> \x88\xB0 |0
-<UF352> \x88\xB1 |0
-<UF353> \x88\xB2 |0
-<UF354> \x88\xB3 |0
-<UF355> \x88\xB4 |0
-<UF356> \x88\xB5 |0
-<UF357> \x88\xB6 |0
-<UF358> \x88\xB7 |0
-<UF359> \x88\xB8 |0
-<UF35A> \x88\xB9 |0
-<UF35B> \x88\xBA |0
-<UF35C> \x88\xBB |0
-<UF35D> \x88\xBC |0
-<UF35E> \x88\xBD |0
-<UF35F> \x88\xBE |0
-<UF360> \x88\xBF |0
-<UF361> \x88\xC0 |0
-<UF362> \x88\xC1 |0
-<UF363> \x88\xC2 |0
-<UF364> \x88\xC3 |0
-<UF365> \x88\xC4 |0
-<UF366> \x88\xC5 |0
-<UF367> \x88\xC6 |0
-<UF368> \x88\xC7 |0
-<UF369> \x88\xC8 |0
-<UF36A> \x88\xC9 |0
-<UF36B> \x88\xCA |0
-<UF36C> \x88\xCB |0
-<UF36D> \x88\xCC |0
-<UF36E> \x88\xCD |0
-<UF36F> \x88\xCE |0
-<UF370> \x88\xCF |0
-<UF371> \x88\xD0 |0
-<UF372> \x88\xD1 |0
-<UF373> \x88\xD2 |0
-<UF374> \x88\xD3 |0
-<UF375> \x88\xD4 |0
-<UF376> \x88\xD5 |0
-<UF377> \x88\xD6 |0
-<UF378> \x88\xD7 |0
-<UF379> \x88\xD8 |0
-<UF37A> \x88\xD9 |0
-<UF37B> \x88\xDA |0
-<UF37C> \x88\xDB |0
-<UF37D> \x88\xDC |0
-<UF37E> \x88\xDD |0
-<UF37F> \x88\xDE |0
-<UF380> \x88\xDF |0
-<UF381> \x88\xE0 |0
-<UF382> \x88\xE1 |0
-<UF383> \x88\xE2 |0
-<UF384> \x88\xE3 |0
-<UF385> \x88\xE4 |0
-<UF386> \x88\xE5 |0
-<UF387> \x88\xE6 |0
-<UF388> \x88\xE7 |0
-<UF389> \x88\xE8 |0
-<UF38A> \x88\xE9 |0
-<UF38B> \x88\xEA |0
-<UF38C> \x88\xEB |0
-<UF38D> \x88\xEC |0
-<UF38E> \x88\xED |0
-<UF38F> \x88\xEE |0
-<UF390> \x88\xEF |0
-<UF391> \x88\xF0 |0
-<UF392> \x88\xF1 |0
-<UF393> \x88\xF2 |0
-<UF394> \x88\xF3 |0
-<UF395> \x88\xF4 |0
-<UF396> \x88\xF5 |0
-<UF397> \x88\xF6 |0
-<UF398> \x88\xF7 |0
-<UF399> \x88\xF8 |0
-<UF39A> \x88\xF9 |0
-<UF39B> \x88\xFA |0
-<UF39C> \x88\xFB |0
-<UF39D> \x88\xFC |0
-<UF39E> \x88\xFD |0
-<UF39F> \x88\xFE |0
-<UF3A0> \x89\x40 |0
-<UF3A1> \x89\x41 |0
-<UF3A2> \x89\x42 |0
-<UF3A3> \x89\x43 |0
-<UF3A4> \x89\x44 |0
-<UF3A5> \x89\x45 |0
-<UF3A6> \x89\x46 |0
-<UF3A7> \x89\x47 |0
-<UF3A8> \x89\x48 |0
-<UF3A9> \x89\x49 |0
-<UF3AA> \x89\x4A |0
-<UF3AB> \x89\x4B |0
-<UF3AC> \x89\x4C |0
-<UF3AD> \x89\x4D |0
-<UF3AE> \x89\x4E |0
-<UF3AF> \x89\x4F |0
-<UF3B0> \x89\x50 |0
-<UF3B1> \x89\x51 |0
-<UF3B2> \x89\x52 |0
-<UF3B3> \x89\x53 |0
-<UF3B4> \x89\x54 |0
-<UF3B5> \x89\x55 |0
-<UF3B6> \x89\x56 |0
-<UF3B7> \x89\x57 |0
-<UF3B8> \x89\x58 |0
-<UF3B9> \x89\x59 |0
-<UF3BA> \x89\x5A |0
-<UF3BB> \x89\x5B |0
-<UF3BC> \x89\x5C |0
-<UF3BD> \x89\x5D |0
-<UF3BE> \x89\x5E |0
-<UF3BF> \x89\x5F |0
-<UF3C0> \x89\x60 |0
-<UF3C1> \x89\x61 |0
-<UF3C2> \x89\x62 |0
-<UF3C3> \x89\x63 |0
-<UF3C4> \x89\x64 |0
-<UF3C5> \x89\x65 |0
-<UF3C6> \x89\x66 |0
-<UF3C7> \x89\x67 |0
-<UF3C8> \x89\x68 |0
-<UF3C9> \x89\x69 |0
-<UF3CA> \x89\x6A |0
-<UF3CB> \x89\x6B |0
-<UF3CC> \x89\x6C |0
-<UF3CD> \x89\x6D |0
-<UF3CE> \x89\x6E |0
-<UF3CF> \x89\x6F |0
-<UF3D0> \x89\x70 |0
-<UF3D1> \x89\x71 |0
-<UF3D2> \x89\x72 |0
-<UF3D3> \x89\x73 |0
-<UF3D4> \x89\x74 |0
-<UF3D5> \x89\x75 |0
-<UF3D6> \x89\x76 |0
-<UF3D7> \x89\x77 |0
-<UF3D8> \x89\x78 |0
-<UF3D9> \x89\x79 |0
-<UF3DA> \x89\x7A |0
-<UF3DB> \x89\x7B |0
-<UF3DC> \x89\x7C |0
-<UF3DD> \x89\x7D |0
-<UF3DE> \x89\x7E |0
-<UF3DF> \x89\xA1 |0
-<UF3E0> \x89\xA2 |0
-<UF3E1> \x89\xA3 |0
-<UF3E2> \x89\xA4 |0
-<UF3E3> \x89\xA5 |0
-<UF3E4> \x89\xA6 |0
-<UF3E5> \x89\xA7 |0
-<UF3E6> \x89\xA8 |0
-<UF3E7> \x89\xA9 |0
-<UF3E8> \x89\xAA |0
-<UF3E9> \x89\xAB |0
-<UF3EA> \x89\xAC |0
-<UF3EB> \x89\xAD |0
-<UF3EC> \x89\xAE |0
-<UF3ED> \x89\xAF |0
-<UF3EE> \x89\xB0 |0
-<UF3EF> \x89\xB1 |0
-<UF3F0> \x89\xB2 |0
-<UF3F1> \x89\xB3 |0
-<UF3F2> \x89\xB4 |0
-<UF3F3> \x89\xB5 |0
-<UF3F4> \x89\xB6 |0
-<UF3F5> \x89\xB7 |0
-<UF3F6> \x89\xB8 |0
-<UF3F7> \x89\xB9 |0
-<UF3F8> \x89\xBA |0
-<UF3F9> \x89\xBB |0
-<UF3FA> \x89\xBC |0
-<UF3FB> \x89\xBD |0
-<UF3FC> \x89\xBE |0
-<UF3FD> \x89\xBF |0
-<UF3FE> \x89\xC0 |0
-<UF3FF> \x89\xC1 |0
-<UF400> \x89\xC2 |0
-<UF401> \x89\xC3 |0
-<UF402> \x89\xC4 |0
-<UF403> \x89\xC5 |0
-<UF404> \x89\xC6 |0
-<UF405> \x89\xC7 |0
-<UF406> \x89\xC8 |0
-<UF407> \x89\xC9 |0
-<UF408> \x89\xCA |0
-<UF409> \x89\xCB |0
-<UF40A> \x89\xCC |0
-<UF40B> \x89\xCD |0
-<UF40C> \x89\xCE |0
-<UF40D> \x89\xCF |0
-<UF40E> \x89\xD0 |0
-<UF40F> \x89\xD1 |0
-<UF410> \x89\xD2 |0
-<UF411> \x89\xD3 |0
-<UF412> \x89\xD4 |0
-<UF413> \x89\xD5 |0
-<UF414> \x89\xD6 |0
-<UF415> \x89\xD7 |0
-<UF416> \x89\xD8 |0
-<UF417> \x89\xD9 |0
-<UF418> \x89\xDA |0
-<UF419> \x89\xDB |0
-<UF41A> \x89\xDC |0
-<UF41B> \x89\xDD |0
-<UF41C> \x89\xDE |0
-<UF41D> \x89\xDF |0
-<UF41E> \x89\xE0 |0
-<UF41F> \x89\xE1 |0
-<UF420> \x89\xE2 |0
-<UF421> \x89\xE3 |0
-<UF422> \x89\xE4 |0
-<UF423> \x89\xE5 |0
-<UF424> \x89\xE6 |0
-<UF425> \x89\xE7 |0
-<UF426> \x89\xE8 |0
-<UF427> \x89\xE9 |0
-<UF428> \x89\xEA |0
-<UF429> \x89\xEB |0
-<UF42A> \x89\xEC |0
-<UF42B> \x89\xED |0
-<UF42C> \x89\xEE |0
-<UF42D> \x89\xEF |0
-<UF42E> \x89\xF0 |0
-<UF42F> \x89\xF1 |0
-<UF430> \x89\xF2 |0
-<UF431> \x89\xF3 |0
-<UF432> \x89\xF4 |0
-<UF433> \x89\xF5 |0
-<UF434> \x89\xF6 |0
-<UF435> \x89\xF7 |0
-<UF436> \x89\xF8 |0
-<UF437> \x89\xF9 |0
-<UF438> \x89\xFA |0
-<UF439> \x89\xFB |0
-<UF43A> \x89\xFC |0
-<UF43B> \x89\xFD |0
-<UF43C> \x89\xFE |0
-<UF43D> \x8A\x40 |0
-<UF43E> \x8A\x41 |0
-<UF43F> \x8A\x42 |0
-<UF440> \x8A\x43 |0
-<UF441> \x8A\x44 |0
-<UF442> \x8A\x45 |0
-<UF443> \x8A\x46 |0
-<UF444> \x8A\x47 |0
-<UF445> \x8A\x48 |0
-<UF446> \x8A\x49 |0
-<UF447> \x8A\x4A |0
-<UF448> \x8A\x4B |0
-<UF449> \x8A\x4C |0
-<UF44A> \x8A\x4D |0
-<UF44B> \x8A\x4E |0
-<UF44C> \x8A\x4F |0
-<UF44D> \x8A\x50 |0
-<UF44E> \x8A\x51 |0
-<UF44F> \x8A\x52 |0
-<UF450> \x8A\x53 |0
-<UF451> \x8A\x54 |0
-<UF452> \x8A\x55 |0
-<UF453> \x8A\x56 |0
-<UF454> \x8A\x57 |0
-<UF455> \x8A\x58 |0
-<UF456> \x8A\x59 |0
-<UF457> \x8A\x5A |0
-<UF458> \x8A\x5B |0
-<UF459> \x8A\x5C |0
-<UF45A> \x8A\x5D |0
-<UF45B> \x8A\x5E |0
-<UF45C> \x8A\x5F |0
-<UF45D> \x8A\x60 |0
-<UF45E> \x8A\x61 |0
-<UF45F> \x8A\x62 |0
-<UF460> \x8A\x63 |0
-<UF461> \x8A\x64 |0
-<UF462> \x8A\x65 |0
-<UF463> \x8A\x66 |0
-<UF464> \x8A\x67 |0
-<UF465> \x8A\x68 |0
-<UF466> \x8A\x69 |0
-<UF467> \x8A\x6A |0
-<UF468> \x8A\x6B |0
-<UF469> \x8A\x6C |0
-<UF46A> \x8A\x6D |0
-<UF46B> \x8A\x6E |0
-<UF46C> \x8A\x6F |0
-<UF46D> \x8A\x70 |0
-<UF46E> \x8A\x71 |0
-<UF46F> \x8A\x72 |0
-<UF470> \x8A\x73 |0
-<UF471> \x8A\x74 |0
-<UF472> \x8A\x75 |0
-<UF473> \x8A\x76 |0
-<UF474> \x8A\x77 |0
-<UF475> \x8A\x78 |0
-<UF476> \x8A\x79 |0
-<UF477> \x8A\x7A |0
-<UF478> \x8A\x7B |0
-<UF479> \x8A\x7C |0
-<UF47A> \x8A\x7D |0
-<UF47B> \x8A\x7E |0
-<UF47C> \x8A\xA1 |0
-<UF47D> \x8A\xA2 |0
-<UF47E> \x8A\xA3 |0
-<UF47F> \x8A\xA4 |0
-<UF480> \x8A\xA5 |0
-<UF481> \x8A\xA6 |0
-<UF482> \x8A\xA7 |0
-<UF483> \x8A\xA8 |0
-<UF484> \x8A\xA9 |0
-<UF485> \x8A\xAA |0
-<UF486> \x8A\xAB |0
-<UF487> \x8A\xAC |0
-<UF488> \x8A\xAD |0
-<UF489> \x8A\xAE |0
-<UF48A> \x8A\xAF |0
-<UF48B> \x8A\xB0 |0
-<UF48C> \x8A\xB1 |0
-<UF48D> \x8A\xB2 |0
-<UF48E> \x8A\xB3 |0
-<UF48F> \x8A\xB4 |0
-<UF490> \x8A\xB5 |0
-<UF491> \x8A\xB6 |0
-<UF492> \x8A\xB7 |0
-<UF493> \x8A\xB8 |0
-<UF494> \x8A\xB9 |0
-<UF495> \x8A\xBA |0
-<UF496> \x8A\xBB |0
-<UF497> \x8A\xBC |0
-<UF498> \x8A\xBD |0
-<UF499> \x8A\xBE |0
-<UF49A> \x8A\xBF |0
-<UF49B> \x8A\xC0 |0
-<UF49C> \x8A\xC1 |0
-<UF49D> \x8A\xC2 |0
-<UF49E> \x8A\xC3 |0
-<UF49F> \x8A\xC4 |0
-<UF4A0> \x8A\xC5 |0
-<UF4A1> \x8A\xC6 |0
-<UF4A2> \x8A\xC7 |0
-<UF4A3> \x8A\xC8 |0
-<UF4A4> \x8A\xC9 |0
-<UF4A5> \x8A\xCA |0
-<UF4A6> \x8A\xCB |0
-<UF4A7> \x8A\xCC |0
-<UF4A8> \x8A\xCD |0
-<UF4A9> \x8A\xCE |0
-<UF4AA> \x8A\xCF |0
-<UF4AB> \x8A\xD0 |0
-<UF4AC> \x8A\xD1 |0
-<UF4AD> \x8A\xD2 |0
-<UF4AE> \x8A\xD3 |0
-<UF4AF> \x8A\xD4 |0
-<UF4B0> \x8A\xD5 |0
-<UF4B1> \x8A\xD6 |0
-<UF4B2> \x8A\xD7 |0
-<UF4B3> \x8A\xD8 |0
-<UF4B4> \x8A\xD9 |0
-<UF4B5> \x8A\xDA |0
-<UF4B6> \x8A\xDB |0
-<UF4B7> \x8A\xDC |0
-<UF4B8> \x8A\xDD |0
-<UF4B9> \x8A\xDE |0
-<UF4BA> \x8A\xDF |0
-<UF4BB> \x8A\xE0 |0
-<UF4BC> \x8A\xE1 |0
-<UF4BD> \x8A\xE2 |0
-<UF4BE> \x8A\xE3 |0
-<UF4BF> \x8A\xE4 |0
-<UF4C0> \x8A\xE5 |0
-<UF4C1> \x8A\xE6 |0
-<UF4C2> \x8A\xE7 |0
-<UF4C3> \x8A\xE8 |0
-<UF4C4> \x8A\xE9 |0
-<UF4C5> \x8A\xEA |0
-<UF4C6> \x8A\xEB |0
-<UF4C7> \x8A\xEC |0
-<UF4C8> \x8A\xED |0
-<UF4C9> \x8A\xEE |0
-<UF4CA> \x8A\xEF |0
-<UF4CB> \x8A\xF0 |0
-<UF4CC> \x8A\xF1 |0
-<UF4CD> \x8A\xF2 |0
-<UF4CE> \x8A\xF3 |0
-<UF4CF> \x8A\xF4 |0
-<UF4D0> \x8A\xF5 |0
-<UF4D1> \x8A\xF6 |0
-<UF4D2> \x8A\xF7 |0
-<UF4D3> \x8A\xF8 |0
-<UF4D4> \x8A\xF9 |0
-<UF4D5> \x8A\xFA |0
-<UF4D6> \x8A\xFB |0
-<UF4D7> \x8A\xFC |0
-<UF4D8> \x8A\xFD |0
-<UF4D9> \x8A\xFE |0
-<UF4DA> \x8B\x40 |0
-<UF4DB> \x8B\x41 |0
-<UF4DC> \x8B\x42 |0
-<UF4DD> \x8B\x43 |0
-<UF4DE> \x8B\x44 |0
-<UF4DF> \x8B\x45 |0
-<UF4E0> \x8B\x46 |0
-<UF4E1> \x8B\x47 |0
-<UF4E2> \x8B\x48 |0
-<UF4E3> \x8B\x49 |0
-<UF4E4> \x8B\x4A |0
-<UF4E5> \x8B\x4B |0
-<UF4E6> \x8B\x4C |0
-<UF4E7> \x8B\x4D |0
-<UF4E8> \x8B\x4E |0
-<UF4E9> \x8B\x4F |0
-<UF4EA> \x8B\x50 |0
-<UF4EB> \x8B\x51 |0
-<UF4EC> \x8B\x52 |0
-<UF4ED> \x8B\x53 |0
-<UF4EE> \x8B\x54 |0
-<UF4EF> \x8B\x55 |0
-<UF4F0> \x8B\x56 |0
-<UF4F1> \x8B\x57 |0
-<UF4F2> \x8B\x58 |0
-<UF4F3> \x8B\x59 |0
-<UF4F4> \x8B\x5A |0
-<UF4F5> \x8B\x5B |0
-<UF4F6> \x8B\x5C |0
-<UF4F7> \x8B\x5D |0
-<UF4F8> \x8B\x5E |0
-<UF4F9> \x8B\x5F |0
-<UF4FA> \x8B\x60 |0
-<UF4FB> \x8B\x61 |0
-<UF4FC> \x8B\x62 |0
-<UF4FD> \x8B\x63 |0
-<UF4FE> \x8B\x64 |0
-<UF4FF> \x8B\x65 |0
-<UF500> \x8B\x66 |0
-<UF501> \x8B\x67 |0
-<UF502> \x8B\x68 |0
-<UF503> \x8B\x69 |0
-<UF504> \x8B\x6A |0
-<UF505> \x8B\x6B |0
-<UF506> \x8B\x6C |0
-<UF507> \x8B\x6D |0
-<UF508> \x8B\x6E |0
-<UF509> \x8B\x6F |0
-<UF50A> \x8B\x70 |0
-<UF50B> \x8B\x71 |0
-<UF50C> \x8B\x72 |0
-<UF50D> \x8B\x73 |0
-<UF50E> \x8B\x74 |0
-<UF50F> \x8B\x75 |0
-<UF510> \x8B\x76 |0
-<UF511> \x8B\x77 |0
-<UF512> \x8B\x78 |0
-<UF513> \x8B\x79 |0
-<UF514> \x8B\x7A |0
-<UF515> \x8B\x7B |0
-<UF516> \x8B\x7C |0
-<UF517> \x8B\x7D |0
-<UF518> \x8B\x7E |0
-<UF519> \x8B\xA1 |0
-<UF51A> \x8B\xA2 |0
-<UF51B> \x8B\xA3 |0
-<UF51C> \x8B\xA4 |0
-<UF51D> \x8B\xA5 |0
-<UF51E> \x8B\xA6 |0
-<UF51F> \x8B\xA7 |0
-<UF520> \x8B\xA8 |0
-<UF521> \x8B\xA9 |0
-<UF522> \x8B\xAA |0
-<UF523> \x8B\xAB |0
-<UF524> \x8B\xAC |0
-<UF525> \x8B\xAD |0
-<UF526> \x8B\xAE |0
-<UF527> \x8B\xAF |0
-<UF528> \x8B\xB0 |0
-<UF529> \x8B\xB1 |0
-<UF52A> \x8B\xB2 |0
-<UF52B> \x8B\xB3 |0
-<UF52C> \x8B\xB4 |0
-<UF52D> \x8B\xB5 |0
-<UF52E> \x8B\xB6 |0
-<UF52F> \x8B\xB7 |0
-<UF530> \x8B\xB8 |0
-<UF531> \x8B\xB9 |0
-<UF532> \x8B\xBA |0
-<UF533> \x8B\xBB |0
-<UF534> \x8B\xBC |0
-<UF535> \x8B\xBD |0
-<UF536> \x8B\xBE |0
-<UF537> \x8B\xBF |0
-<UF538> \x8B\xC0 |0
-<UF539> \x8B\xC1 |0
-<UF53A> \x8B\xC2 |0
-<UF53B> \x8B\xC3 |0
-<UF53C> \x8B\xC4 |0
-<UF53D> \x8B\xC5 |0
-<UF53E> \x8B\xC6 |0
-<UF53F> \x8B\xC7 |0
-<UF540> \x8B\xC8 |0
-<UF541> \x8B\xC9 |0
-<UF542> \x8B\xCA |0
-<UF543> \x8B\xCB |0
-<UF544> \x8B\xCC |0
-<UF545> \x8B\xCD |0
-<UF546> \x8B\xCE |0
-<UF547> \x8B\xCF |0
-<UF548> \x8B\xD0 |0
-<UF549> \x8B\xD1 |0
-<UF54A> \x8B\xD2 |0
-<UF54B> \x8B\xD3 |0
-<UF54C> \x8B\xD4 |0
-<UF54D> \x8B\xD5 |0
-<UF54E> \x8B\xD6 |0
-<UF54F> \x8B\xD7 |0
-<UF550> \x8B\xD8 |0
-<UF551> \x8B\xD9 |0
-<UF552> \x8B\xDA |0
-<UF553> \x8B\xDB |0
-<UF554> \x8B\xDC |0
-<UF555> \x8B\xDD |0
-<UF556> \x8B\xDE |0
-<UF557> \x8B\xDF |0
-<UF558> \x8B\xE0 |0
-<UF559> \x8B\xE1 |0
-<UF55A> \x8B\xE2 |0
-<UF55B> \x8B\xE3 |0
-<UF55C> \x8B\xE4 |0
-<UF55D> \x8B\xE5 |0
-<UF55E> \x8B\xE6 |0
-<UF55F> \x8B\xE7 |0
-<UF560> \x8B\xE8 |0
-<UF561> \x8B\xE9 |0
-<UF562> \x8B\xEA |0
-<UF563> \x8B\xEB |0
-<UF564> \x8B\xEC |0
-<UF565> \x8B\xED |0
-<UF566> \x8B\xEE |0
-<UF567> \x8B\xEF |0
-<UF568> \x8B\xF0 |0
-<UF569> \x8B\xF1 |0
-<UF56A> \x8B\xF2 |0
-<UF56B> \x8B\xF3 |0
-<UF56C> \x8B\xF4 |0
-<UF56D> \x8B\xF5 |0
-<UF56E> \x8B\xF6 |0
-<UF56F> \x8B\xF7 |0
-<UF570> \x8B\xF8 |0
-<UF571> \x8B\xF9 |0
-<UF572> \x8B\xFA |0
-<UF573> \x8B\xFB |0
-<UF574> \x8B\xFC |0
-<UF575> \x8B\xFD |0
-<UF576> \x8B\xFE |0
-<UF577> \x8C\x40 |0
-<UF578> \x8C\x41 |0
-<UF579> \x8C\x42 |0
-<UF57A> \x8C\x43 |0
-<UF57B> \x8C\x44 |0
-<UF57C> \x8C\x45 |0
-<UF57D> \x8C\x46 |0
-<UF57E> \x8C\x47 |0
-<UF57F> \x8C\x48 |0
-<UF580> \x8C\x49 |0
-<UF581> \x8C\x4A |0
-<UF582> \x8C\x4B |0
-<UF583> \x8C\x4C |0
-<UF584> \x8C\x4D |0
-<UF585> \x8C\x4E |0
-<UF586> \x8C\x4F |0
-<UF587> \x8C\x50 |0
-<UF588> \x8C\x51 |0
-<UF589> \x8C\x52 |0
-<UF58A> \x8C\x53 |0
-<UF58B> \x8C\x54 |0
-<UF58C> \x8C\x55 |0
-<UF58D> \x8C\x56 |0
-<UF58E> \x8C\x57 |0
-<UF58F> \x8C\x58 |0
-<UF590> \x8C\x59 |0
-<UF591> \x8C\x5A |0
-<UF592> \x8C\x5B |0
-<UF593> \x8C\x5C |0
-<UF594> \x8C\x5D |0
-<UF595> \x8C\x5E |0
-<UF596> \x8C\x5F |0
-<UF597> \x8C\x60 |0
-<UF598> \x8C\x61 |0
-<UF599> \x8C\x62 |0
-<UF59A> \x8C\x63 |0
-<UF59B> \x8C\x64 |0
-<UF59C> \x8C\x65 |0
-<UF59D> \x8C\x66 |0
-<UF59E> \x8C\x67 |0
-<UF59F> \x8C\x68 |0
-<UF5A0> \x8C\x69 |0
-<UF5A1> \x8C\x6A |0
-<UF5A2> \x8C\x6B |0
-<UF5A3> \x8C\x6C |0
-<UF5A4> \x8C\x6D |0
-<UF5A5> \x8C\x6E |0
-<UF5A6> \x8C\x6F |0
-<UF5A7> \x8C\x70 |0
-<UF5A8> \x8C\x71 |0
-<UF5A9> \x8C\x72 |0
-<UF5AA> \x8C\x73 |0
-<UF5AB> \x8C\x74 |0
-<UF5AC> \x8C\x75 |0
-<UF5AD> \x8C\x76 |0
-<UF5AE> \x8C\x77 |0
-<UF5AF> \x8C\x78 |0
-<UF5B0> \x8C\x79 |0
-<UF5B1> \x8C\x7A |0
-<UF5B2> \x8C\x7B |0
-<UF5B3> \x8C\x7C |0
-<UF5B4> \x8C\x7D |0
-<UF5B5> \x8C\x7E |0
-<UF5B6> \x8C\xA1 |0
-<UF5B7> \x8C\xA2 |0
-<UF5B8> \x8C\xA3 |0
-<UF5B9> \x8C\xA4 |0
-<UF5BA> \x8C\xA5 |0
-<UF5BB> \x8C\xA6 |0
-<UF5BC> \x8C\xA7 |0
-<UF5BD> \x8C\xA8 |0
-<UF5BE> \x8C\xA9 |0
-<UF5BF> \x8C\xAA |0
-<UF5C0> \x8C\xAB |0
-<UF5C1> \x8C\xAC |0
-<UF5C2> \x8C\xAD |0
-<UF5C3> \x8C\xAE |0
-<UF5C4> \x8C\xAF |0
-<UF5C5> \x8C\xB0 |0
-<UF5C6> \x8C\xB1 |0
-<UF5C7> \x8C\xB2 |0
-<UF5C8> \x8C\xB3 |0
-<UF5C9> \x8C\xB4 |0
-<UF5CA> \x8C\xB5 |0
-<UF5CB> \x8C\xB6 |0
-<UF5CC> \x8C\xB7 |0
-<UF5CD> \x8C\xB8 |0
-<UF5CE> \x8C\xB9 |0
-<UF5CF> \x8C\xBA |0
-<UF5D0> \x8C\xBB |0
-<UF5D1> \x8C\xBC |0
-<UF5D2> \x8C\xBD |0
-<UF5D3> \x8C\xBE |0
-<UF5D4> \x8C\xBF |0
-<UF5D5> \x8C\xC0 |0
-<UF5D6> \x8C\xC1 |0
-<UF5D7> \x8C\xC2 |0
-<UF5D8> \x8C\xC3 |0
-<UF5D9> \x8C\xC4 |0
-<UF5DA> \x8C\xC5 |0
-<UF5DB> \x8C\xC6 |0
-<UF5DC> \x8C\xC7 |0
-<UF5DD> \x8C\xC8 |0
-<UF5DE> \x8C\xC9 |0
-<UF5DF> \x8C\xCA |0
-<UF5E0> \x8C\xCB |0
-<UF5E1> \x8C\xCC |0
-<UF5E2> \x8C\xCD |0
-<UF5E3> \x8C\xCE |0
-<UF5E4> \x8C\xCF |0
-<UF5E5> \x8C\xD0 |0
-<UF5E6> \x8C\xD1 |0
-<UF5E7> \x8C\xD2 |0
-<UF5E8> \x8C\xD3 |0
-<UF5E9> \x8C\xD4 |0
-<UF5EA> \x8C\xD5 |0
-<UF5EB> \x8C\xD6 |0
-<UF5EC> \x8C\xD7 |0
-<UF5ED> \x8C\xD8 |0
-<UF5EE> \x8C\xD9 |0
-<UF5EF> \x8C\xDA |0
-<UF5F0> \x8C\xDB |0
-<UF5F1> \x8C\xDC |0
-<UF5F2> \x8C\xDD |0
-<UF5F3> \x8C\xDE |0
-<UF5F4> \x8C\xDF |0
-<UF5F5> \x8C\xE0 |0
-<UF5F6> \x8C\xE1 |0
-<UF5F7> \x8C\xE2 |0
-<UF5F8> \x8C\xE3 |0
-<UF5F9> \x8C\xE4 |0
-<UF5FA> \x8C\xE5 |0
-<UF5FB> \x8C\xE6 |0
-<UF5FC> \x8C\xE7 |0
-<UF5FD> \x8C\xE8 |0
-<UF5FE> \x8C\xE9 |0
-<UF5FF> \x8C\xEA |0
-<UF600> \x8C\xEB |0
-<UF601> \x8C\xEC |0
-<UF602> \x8C\xED |0
-<UF603> \x8C\xEE |0
-<UF604> \x8C\xEF |0
-<UF605> \x8C\xF0 |0
-<UF606> \x8C\xF1 |0
-<UF607> \x8C\xF2 |0
-<UF608> \x8C\xF3 |0
-<UF609> \x8C\xF4 |0
-<UF60A> \x8C\xF5 |0
-<UF60B> \x8C\xF6 |0
-<UF60C> \x8C\xF7 |0
-<UF60D> \x8C\xF8 |0
-<UF60E> \x8C\xF9 |0
-<UF60F> \x8C\xFA |0
-<UF610> \x8C\xFB |0
-<UF611> \x8C\xFC |0
-<UF612> \x8C\xFD |0
-<UF613> \x8C\xFE |0
-<UF614> \x8D\x40 |0
-<UF615> \x8D\x41 |0
-<UF616> \x8D\x42 |0
-<UF617> \x8D\x43 |0
-<UF618> \x8D\x44 |0
-<UF619> \x8D\x45 |0
-<UF61A> \x8D\x46 |0
-<UF61B> \x8D\x47 |0
-<UF61C> \x8D\x48 |0
-<UF61D> \x8D\x49 |0
-<UF61E> \x8D\x4A |0
-<UF61F> \x8D\x4B |0
-<UF620> \x8D\x4C |0
-<UF621> \x8D\x4D |0
-<UF622> \x8D\x4E |0
-<UF623> \x8D\x4F |0
-<UF624> \x8D\x50 |0
-<UF625> \x8D\x51 |0
-<UF626> \x8D\x52 |0
-<UF627> \x8D\x53 |0
-<UF628> \x8D\x54 |0
-<UF629> \x8D\x55 |0
-<UF62A> \x8D\x56 |0
-<UF62B> \x8D\x57 |0
-<UF62C> \x8D\x58 |0
-<UF62D> \x8D\x59 |0
-<UF62E> \x8D\x5A |0
-<UF62F> \x8D\x5B |0
-<UF630> \x8D\x5C |0
-<UF631> \x8D\x5D |0
-<UF632> \x8D\x5E |0
-<UF633> \x8D\x5F |0
-<UF634> \x8D\x60 |0
-<UF635> \x8D\x61 |0
-<UF636> \x8D\x62 |0
-<UF637> \x8D\x63 |0
-<UF638> \x8D\x64 |0
-<UF639> \x8D\x65 |0
-<UF63A> \x8D\x66 |0
-<UF63B> \x8D\x67 |0
-<UF63C> \x8D\x68 |0
-<UF63D> \x8D\x69 |0
-<UF63E> \x8D\x6A |0
-<UF63F> \x8D\x6B |0
-<UF640> \x8D\x6C |0
-<UF641> \x8D\x6D |0
-<UF642> \x8D\x6E |0
-<UF643> \x8D\x6F |0
-<UF644> \x8D\x70 |0
-<UF645> \x8D\x71 |0
-<UF646> \x8D\x72 |0
-<UF647> \x8D\x73 |0
-<UF648> \x8D\x74 |0
-<UF649> \x8D\x75 |0
-<UF64A> \x8D\x76 |0
-<UF64B> \x8D\x77 |0
-<UF64C> \x8D\x78 |0
-<UF64D> \x8D\x79 |0
-<UF64E> \x8D\x7A |0
-<UF64F> \x8D\x7B |0
-<UF650> \x8D\x7C |0
-<UF651> \x8D\x7D |0
-<UF652> \x8D\x7E |0
-<UF653> \x8D\xA1 |0
-<UF654> \x8D\xA2 |0
-<UF655> \x8D\xA3 |0
-<UF656> \x8D\xA4 |0
-<UF657> \x8D\xA5 |0
-<UF658> \x8D\xA6 |0
-<UF659> \x8D\xA7 |0
-<UF65A> \x8D\xA8 |0
-<UF65B> \x8D\xA9 |0
-<UF65C> \x8D\xAA |0
-<UF65D> \x8D\xAB |0
-<UF65E> \x8D\xAC |0
-<UF65F> \x8D\xAD |0
-<UF660> \x8D\xAE |0
-<UF661> \x8D\xAF |0
-<UF662> \x8D\xB0 |0
-<UF663> \x8D\xB1 |0
-<UF664> \x8D\xB2 |0
-<UF665> \x8D\xB3 |0
-<UF666> \x8D\xB4 |0
-<UF667> \x8D\xB5 |0
-<UF668> \x8D\xB6 |0
-<UF669> \x8D\xB7 |0
-<UF66A> \x8D\xB8 |0
-<UF66B> \x8D\xB9 |0
-<UF66C> \x8D\xBA |0
-<UF66D> \x8D\xBB |0
-<UF66E> \x8D\xBC |0
-<UF66F> \x8D\xBD |0
-<UF670> \x8D\xBE |0
-<UF671> \x8D\xBF |0
-<UF672> \x8D\xC0 |0
-<UF673> \x8D\xC1 |0
-<UF674> \x8D\xC2 |0
-<UF675> \x8D\xC3 |0
-<UF676> \x8D\xC4 |0
-<UF677> \x8D\xC5 |0
-<UF678> \x8D\xC6 |0
-<UF679> \x8D\xC7 |0
-<UF67A> \x8D\xC8 |0
-<UF67B> \x8D\xC9 |0
-<UF67C> \x8D\xCA |0
-<UF67D> \x8D\xCB |0
-<UF67E> \x8D\xCC |0
-<UF67F> \x8D\xCD |0
-<UF680> \x8D\xCE |0
-<UF681> \x8D\xCF |0
-<UF682> \x8D\xD0 |0
-<UF683> \x8D\xD1 |0
-<UF684> \x8D\xD2 |0
-<UF685> \x8D\xD3 |0
-<UF686> \x8D\xD4 |0
-<UF687> \x8D\xD5 |0
-<UF688> \x8D\xD6 |0
-<UF689> \x8D\xD7 |0
-<UF68A> \x8D\xD8 |0
-<UF68B> \x8D\xD9 |0
-<UF68C> \x8D\xDA |0
-<UF68D> \x8D\xDB |0
-<UF68E> \x8D\xDC |0
-<UF68F> \x8D\xDD |0
-<UF690> \x8D\xDE |0
-<UF691> \x8D\xDF |0
-<UF692> \x8D\xE0 |0
-<UF693> \x8D\xE1 |0
-<UF694> \x8D\xE2 |0
-<UF695> \x8D\xE3 |0
-<UF696> \x8D\xE4 |0
-<UF697> \x8D\xE5 |0
-<UF698> \x8D\xE6 |0
-<UF699> \x8D\xE7 |0
-<UF69A> \x8D\xE8 |0
-<UF69B> \x8D\xE9 |0
-<UF69C> \x8D\xEA |0
-<UF69D> \x8D\xEB |0
-<UF69E> \x8D\xEC |0
-<UF69F> \x8D\xED |0
-<UF6A0> \x8D\xEE |0
-<UF6A1> \x8D\xEF |0
-<UF6A2> \x8D\xF0 |0
-<UF6A3> \x8D\xF1 |0
-<UF6A4> \x8D\xF2 |0
-<UF6A5> \x8D\xF3 |0
-<UF6A6> \x8D\xF4 |0
-<UF6A7> \x8D\xF5 |0
-<UF6A8> \x8D\xF6 |0
-<UF6A9> \x8D\xF7 |0
-<UF6AA> \x8D\xF8 |0
-<UF6AB> \x8D\xF9 |0
-<UF6AC> \x8D\xFA |0
-<UF6AD> \x8D\xFB |0
-<UF6AE> \x8D\xFC |0
-<UF6AF> \x8D\xFD |0
-<UF6B0> \x8D\xFE |0
-<UF6B1> \xC6\xA1 |0
-<UF6B2> \xC6\xA2 |0
-<UF6B3> \xC6\xA3 |0
-<UF6B4> \xC6\xA4 |0
-<UF6B5> \xC6\xA5 |0
-<UF6B6> \xC6\xA6 |0
-<UF6B7> \xC6\xA7 |0
-<UF6B8> \xC6\xA8 |0
-<UF6B9> \xC6\xA9 |0
-<UF6BA> \xC6\xAA |0
-<UF6BB> \xC6\xAB |0
-<UF6BC> \xC6\xAC |0
-<UF6BD> \xC6\xAD |0
-<UF6BE> \xC6\xAE |0
-<UF6BF> \xC6\xAF |0
-<UF6C0> \xC6\xB0 |0
-<UF6C1> \xC6\xB1 |0
-<UF6C2> \xC6\xB2 |0
-<UF6C3> \xC6\xB3 |0
-<UF6C4> \xC6\xB4 |0
-<UF6C5> \xC6\xB5 |0
-<UF6C6> \xC6\xB6 |0
-<UF6C7> \xC6\xB7 |0
-<UF6C8> \xC6\xB8 |0
-<UF6C9> \xC6\xB9 |0
-<UF6CA> \xC6\xBA |0
-<UF6CB> \xC6\xBB |0
-<UF6CC> \xC6\xBC |0
-<UF6CD> \xC6\xBD |0
-<UF6CE> \xC6\xBE |0
-<UF6CF> \xC6\xBF |0
-<UF6D0> \xC6\xC0 |0
-<UF6D1> \xC6\xC1 |0
-<UF6D2> \xC6\xC2 |0
-<UF6D3> \xC6\xC3 |0
-<UF6D4> \xC6\xC4 |0
-<UF6D5> \xC6\xC5 |0
-<UF6D6> \xC6\xC6 |0
-<UF6D7> \xC6\xC7 |0
-<UF6D8> \xC6\xC8 |0
-<UF6D9> \xC6\xC9 |0
-<UF6DA> \xC6\xCA |0
-<UF6DB> \xC6\xCB |0
-<UF6DC> \xC6\xCC |0
-<UF6DD> \xC6\xCD |0
-<UF6DE> \xC6\xCE |0
-<UF6DF> \xC6\xCF |0
-<UF6E0> \xC6\xD0 |0
-<UF6E1> \xC6\xD1 |0
-<UF6E2> \xC6\xD2 |0
-<UF6E3> \xC6\xD3 |0
-<UF6E4> \xC6\xD4 |0
-<UF6E5> \xC6\xD5 |0
-<UF6E6> \xC6\xD6 |0
-<UF6E7> \xC6\xD7 |0
-<UF6E8> \xC6\xD8 |0
-<UF6E9> \xC6\xD9 |0
-<UF6EA> \xC6\xDA |0
-<UF6EB> \xC6\xDB |0
-<UF6EC> \xC6\xDC |0
-<UF6ED> \xC6\xDD |0
-<UF6EE> \xC6\xDE |0
-<UF6EF> \xC6\xDF |0
-<UF6F0> \xC6\xE0 |0
-<UF6F1> \xC6\xE1 |0
-<UF6F2> \xC6\xE2 |0
-<UF6F3> \xC6\xE3 |0
-<UF6F4> \xC6\xE4 |0
-<UF6F5> \xC6\xE5 |0
-<UF6F6> \xC6\xE6 |0
-<UF6F7> \xC6\xE7 |0
-<UF6F8> \xC6\xE8 |0
-<UF6F9> \xC6\xE9 |0
-<UF6FA> \xC6\xEA |0
-<UF6FB> \xC6\xEB |0
-<UF6FC> \xC6\xEC |0
-<UF6FD> \xC6\xED |0
-<UF6FE> \xC6\xEE |0
-<UF6FF> \xC6\xEF |0
-<UF700> \xC6\xF0 |0
-<UF701> \xC6\xF1 |0
-<UF702> \xC6\xF2 |0
-<UF703> \xC6\xF3 |0
-<UF704> \xC6\xF4 |0
-<UF705> \xC6\xF5 |0
-<UF706> \xC6\xF6 |0
-<UF707> \xC6\xF7 |0
-<UF708> \xC6\xF8 |0
-<UF709> \xC6\xF9 |0
-<UF70A> \xC6\xFA |0
-<UF70B> \xC6\xFB |0
-<UF70C> \xC6\xFC |0
-<UF70D> \xC6\xFD |0
-<UF70E> \xC6\xFE |0
-<UF70F> \xC7\x40 |0
-<UF710> \xC7\x41 |0
-<UF711> \xC7\x42 |0
-<UF712> \xC7\x43 |0
-<UF713> \xC7\x44 |0
-<UF714> \xC7\x45 |0
-<UF715> \xC7\x46 |0
-<UF716> \xC7\x47 |0
-<UF717> \xC7\x48 |0
-<UF718> \xC7\x49 |0
-<UF719> \xC7\x4A |0
-<UF71A> \xC7\x4B |0
-<UF71B> \xC7\x4C |0
-<UF71C> \xC7\x4D |0
-<UF71D> \xC7\x4E |0
-<UF71E> \xC7\x4F |0
-<UF71F> \xC7\x50 |0
-<UF720> \xC7\x51 |0
-<UF721> \xC7\x52 |0
-<UF722> \xC7\x53 |0
-<UF723> \xC7\x54 |0
-<UF724> \xC7\x55 |0
-<UF725> \xC7\x56 |0
-<UF726> \xC7\x57 |0
-<UF727> \xC7\x58 |0
-<UF728> \xC7\x59 |0
-<UF729> \xC7\x5A |0
-<UF72A> \xC7\x5B |0
-<UF72B> \xC7\x5C |0
-<UF72C> \xC7\x5D |0
-<UF72D> \xC7\x5E |0
-<UF72E> \xC7\x5F |0
-<UF72F> \xC7\x60 |0
-<UF730> \xC7\x61 |0
-<UF731> \xC7\x62 |0
-<UF732> \xC7\x63 |0
-<UF733> \xC7\x64 |0
-<UF734> \xC7\x65 |0
-<UF735> \xC7\x66 |0
-<UF736> \xC7\x67 |0
-<UF737> \xC7\x68 |0
-<UF738> \xC7\x69 |0
-<UF739> \xC7\x6A |0
-<UF73A> \xC7\x6B |0
-<UF73B> \xC7\x6C |0
-<UF73C> \xC7\x6D |0
-<UF73D> \xC7\x6E |0
-<UF73E> \xC7\x6F |0
-<UF73F> \xC7\x70 |0
-<UF740> \xC7\x71 |0
-<UF741> \xC7\x72 |0
-<UF742> \xC7\x73 |0
-<UF743> \xC7\x74 |0
-<UF744> \xC7\x75 |0
-<UF745> \xC7\x76 |0
-<UF746> \xC7\x77 |0
-<UF747> \xC7\x78 |0
-<UF748> \xC7\x79 |0
-<UF749> \xC7\x7A |0
-<UF74A> \xC7\x7B |0
-<UF74B> \xC7\x7C |0
-<UF74C> \xC7\x7D |0
-<UF74D> \xC7\x7E |0
-<UF74E> \xC7\xA1 |0
-<UF74F> \xC7\xA2 |0
-<UF750> \xC7\xA3 |0
-<UF751> \xC7\xA4 |0
-<UF752> \xC7\xA5 |0
-<UF753> \xC7\xA6 |0
-<UF754> \xC7\xA7 |0
-<UF755> \xC7\xA8 |0
-<UF756> \xC7\xA9 |0
-<UF757> \xC7\xAA |0
-<UF758> \xC7\xAB |0
-<UF759> \xC7\xAC |0
-<UF75A> \xC7\xAD |0
-<UF75B> \xC7\xAE |0
-<UF75C> \xC7\xAF |0
-<UF75D> \xC7\xB0 |0
-<UF75E> \xC7\xB1 |0
-<UF75F> \xC7\xB2 |0
-<UF760> \xC7\xB3 |0
-<UF761> \xC7\xB4 |0
-<UF762> \xC7\xB5 |0
-<UF763> \xC7\xB6 |0
-<UF764> \xC7\xB7 |0
-<UF765> \xC7\xB8 |0
-<UF766> \xC7\xB9 |0
-<UF767> \xC7\xBA |0
-<UF768> \xC7\xBB |0
-<UF769> \xC7\xBC |0
-<UF76A> \xC7\xBD |0
-<UF76B> \xC7\xBE |0
-<UF76C> \xC7\xBF |0
-<UF76D> \xC7\xC0 |0
-<UF76E> \xC7\xC1 |0
-<UF76F> \xC7\xC2 |0
-<UF770> \xC7\xC3 |0
-<UF771> \xC7\xC4 |0
-<UF772> \xC7\xC5 |0
-<UF773> \xC7\xC6 |0
-<UF774> \xC7\xC7 |0
-<UF775> \xC7\xC8 |0
-<UF776> \xC7\xC9 |0
-<UF777> \xC7\xCA |0
-<UF778> \xC7\xCB |0
-<UF779> \xC7\xCC |0
-<UF77A> \xC7\xCD |0
-<UF77B> \xC7\xCE |0
-<UF77C> \xC7\xCF |0
-<UF77D> \xC7\xD0 |0
-<UF77E> \xC7\xD1 |0
-<UF77F> \xC7\xD2 |0
-<UF780> \xC7\xD3 |0
-<UF781> \xC7\xD4 |0
-<UF782> \xC7\xD5 |0
-<UF783> \xC7\xD6 |0
-<UF784> \xC7\xD7 |0
-<UF785> \xC7\xD8 |0
-<UF786> \xC7\xD9 |0
-<UF787> \xC7\xDA |0
-<UF788> \xC7\xDB |0
-<UF789> \xC7\xDC |0
-<UF78A> \xC7\xDD |0
-<UF78B> \xC7\xDE |0
-<UF78C> \xC7\xDF |0
-<UF78D> \xC7\xE0 |0
-<UF78E> \xC7\xE1 |0
-<UF78F> \xC7\xE2 |0
-<UF790> \xC7\xE3 |0
-<UF791> \xC7\xE4 |0
-<UF792> \xC7\xE5 |0
-<UF793> \xC7\xE6 |0
-<UF794> \xC7\xE7 |0
-<UF795> \xC7\xE8 |0
-<UF796> \xC7\xE9 |0
-<UF797> \xC7\xEA |0
-<UF798> \xC7\xEB |0
-<UF799> \xC7\xEC |0
-<UF79A> \xC7\xED |0
-<UF79B> \xC7\xEE |0
-<UF79C> \xC7\xEF |0
-<UF79D> \xC7\xF0 |0
-<UF79E> \xC7\xF1 |0
-<UF79F> \xC7\xF2 |0
-<UF7A0> \xC7\xF3 |0
-<UF7A1> \xC7\xF4 |0
-<UF7A2> \xC7\xF5 |0
-<UF7A3> \xC7\xF6 |0
-<UF7A4> \xC7\xF7 |0
-<UF7A5> \xC7\xF8 |0
-<UF7A6> \xC7\xF9 |0
-<UF7A7> \xC7\xFA |0
-<UF7A8> \xC7\xFB |0
-<UF7A9> \xC7\xFC |0
-<UF7AA> \xC7\xFD |0
-<UF7AB> \xC7\xFE |0
-<UF7AC> \xC8\x40 |0
-<UF7AD> \xC8\x41 |0
-<UF7AE> \xC8\x42 |0
-<UF7AF> \xC8\x43 |0
-<UF7B0> \xC8\x44 |0
-<UF7B1> \xC8\x45 |0
-<UF7B2> \xC8\x46 |0
-<UF7B3> \xC8\x47 |0
-<UF7B4> \xC8\x48 |0
-<UF7B5> \xC8\x49 |0
-<UF7B6> \xC8\x4A |0
-<UF7B7> \xC8\x4B |0
-<UF7B8> \xC8\x4C |0
-<UF7B9> \xC8\x4D |0
-<UF7BA> \xC8\x4E |0
-<UF7BB> \xC8\x4F |0
-<UF7BC> \xC8\x50 |0
-<UF7BD> \xC8\x51 |0
-<UF7BE> \xC8\x52 |0
-<UF7BF> \xC8\x53 |0
-<UF7C0> \xC8\x54 |0
-<UF7C1> \xC8\x55 |0
-<UF7C2> \xC8\x56 |0
-<UF7C3> \xC8\x57 |0
-<UF7C4> \xC8\x58 |0
-<UF7C5> \xC8\x59 |0
-<UF7C6> \xC8\x5A |0
-<UF7C7> \xC8\x5B |0
-<UF7C8> \xC8\x5C |0
-<UF7C9> \xC8\x5D |0
-<UF7CA> \xC8\x5E |0
-<UF7CB> \xC8\x5F |0
-<UF7CC> \xC8\x60 |0
-<UF7CD> \xC8\x61 |0
-<UF7CE> \xC8\x62 |0
-<UF7CF> \xC8\x63 |0
-<UF7D0> \xC8\x64 |0
-<UF7D1> \xC8\x65 |0
-<UF7D2> \xC8\x66 |0
-<UF7D3> \xC8\x67 |0
-<UF7D4> \xC8\x68 |0
-<UF7D5> \xC8\x69 |0
-<UF7D6> \xC8\x6A |0
-<UF7D7> \xC8\x6B |0
-<UF7D8> \xC8\x6C |0
-<UF7D9> \xC8\x6D |0
-<UF7DA> \xC8\x6E |0
-<UF7DB> \xC8\x6F |0
-<UF7DC> \xC8\x70 |0
-<UF7DD> \xC8\x71 |0
-<UF7DE> \xC8\x72 |0
-<UF7DF> \xC8\x73 |0
-<UF7E0> \xC8\x74 |0
-<UF7E1> \xC8\x75 |0
-<UF7E2> \xC8\x76 |0
-<UF7E3> \xC8\x77 |0
-<UF7E4> \xC8\x78 |0
-<UF7E5> \xC8\x79 |0
-<UF7E6> \xC8\x7A |0
-<UF7E7> \xC8\x7B |0
-<UF7E8> \xC8\x7C |0
-<UF7E9> \xC8\x7D |0
-<UF7EA> \xC8\x7E |0
-<UF7EB> \xC8\xA1 |0
-<UF7EC> \xC8\xA2 |0
-<UF7ED> \xC8\xA3 |0
-<UF7EE> \xC8\xA4 |0
-<UF7EF> \xC8\xA5 |0
-<UF7F0> \xC8\xA6 |0
-<UF7F1> \xC8\xA7 |0
-<UF7F2> \xC8\xA8 |0
-<UF7F3> \xC8\xA9 |0
-<UF7F4> \xC8\xAA |0
-<UF7F5> \xC8\xAB |0
-<UF7F6> \xC8\xAC |0
-<UF7F7> \xC8\xAD |0
-<UF7F8> \xC8\xAE |0
-<UF7F9> \xC8\xAF |0
-<UF7FA> \xC8\xB0 |0
-<UF7FB> \xC8\xB1 |0
-<UF7FC> \xC8\xB2 |0
-<UF7FD> \xC8\xB3 |0
-<UF7FE> \xC8\xB4 |0
-<UF7FF> \xC8\xB5 |0
-<UF800> \xC8\xB6 |0
-<UF801> \xC8\xB7 |0
-<UF802> \xC8\xB8 |0
-<UF803> \xC8\xB9 |0
-<UF804> \xC8\xBA |0
-<UF805> \xC8\xBB |0
-<UF806> \xC8\xBC |0
-<UF807> \xC8\xBD |0
-<UF808> \xC8\xBE |0
-<UF809> \xC8\xBF |0
-<UF80A> \xC8\xC0 |0
-<UF80B> \xC8\xC1 |0
-<UF80C> \xC8\xC2 |0
-<UF80D> \xC8\xC3 |0
-<UF80E> \xC8\xC4 |0
-<UF80F> \xC8\xC5 |0
-<UF810> \xC8\xC6 |0
-<UF811> \xC8\xC7 |0
-<UF812> \xC8\xC8 |0
-<UF813> \xC8\xC9 |0
-<UF814> \xC8\xCA |0
-<UF815> \xC8\xCB |0
-<UF816> \xC8\xCC |0
-<UF817> \xC8\xCD |0
-<UF818> \xC8\xCE |0
-<UF819> \xC8\xCF |0
-<UF81A> \xC8\xD0 |0
-<UF81B> \xC8\xD1 |0
-<UF81C> \xC8\xD2 |0
-<UF81D> \xC8\xD3 |0
-<UF81E> \xC8\xD4 |0
-<UF81F> \xC8\xD5 |0
-<UF820> \xC8\xD6 |0
-<UF821> \xC8\xD7 |0
-<UF822> \xC8\xD8 |0
-<UF823> \xC8\xD9 |0
-<UF824> \xC8\xDA |0
-<UF825> \xC8\xDB |0
-<UF826> \xC8\xDC |0
-<UF827> \xC8\xDD |0
-<UF828> \xC8\xDE |0
-<UF829> \xC8\xDF |0
-<UF82A> \xC8\xE0 |0
-<UF82B> \xC8\xE1 |0
-<UF82C> \xC8\xE2 |0
-<UF82D> \xC8\xE3 |0
-<UF82E> \xC8\xE4 |0
-<UF82F> \xC8\xE5 |0
-<UF830> \xC8\xE6 |0
-<UF831> \xC8\xE7 |0
-<UF832> \xC8\xE8 |0
-<UF833> \xC8\xE9 |0
-<UF834> \xC8\xEA |0
-<UF835> \xC8\xEB |0
-<UF836> \xC8\xEC |0
-<UF837> \xC8\xED |0
-<UF838> \xC8\xEE |0
-<UF839> \xC8\xEF |0
-<UF83A> \xC8\xF0 |0
-<UF83B> \xC8\xF1 |0
-<UF83C> \xC8\xF2 |0
-<UF83D> \xC8\xF3 |0
-<UF83E> \xC8\xF4 |0
-<UF83F> \xC8\xF5 |0
-<UF840> \xC8\xF6 |0
-<UF841> \xC8\xF7 |0
-<UF842> \xC8\xF8 |0
-<UF843> \xC8\xF9 |0
-<UF844> \xC8\xFA |0
-<UF845> \xC8\xFB |0
-<UF846> \xC8\xFC |0
-<UF847> \xC8\xFD |0
-<UF848> \xC8\xFE |0
-#<UF8F8> \xFF |0
-<UF900> \xB0\x5A |1
-<UF901> \xA7\xF3 |1
-<UF902> \xA8\xAE |1
-<UF903> \xB8\xEB |1
-<UF904> \xB7\xC6 |1
-<UF905> \xA6\xEA |1
-<UF906> \xA5\x79 |1
-<UF907> \xC0\x74 |1
-<UF908> \xC0\x74 |1
-<UF909> \xAB\xB4 |1
-<UF90A> \xAA\xF7 |1
-<UF90B> \xB3\xE2 |1
-<UF90C> \xA9\x60 |1
-<UF90D> \xC3\x69 |1
-<UF90E> \xC4\xEE |1
-<UF90F> \xC3\xB9 |1
-<UF910> \xC5\xDA |1
-<UF911> \xC1\xB3 |1
-<UF912> \xBB\x72 |1
-<UF913> \xC5\xDE |1
-<UF914> \xBC\xD6 |1
-<UF915> \xAC\xA5 |1
-<UF916> \xAF\x4F |1
-<UF917> \xAF\x5F |1
-<UF918> \xB8\xA8 |1
-<UF919> \xB9\x54 |1
-<UF91A> \xC0\x64 |1
-<UF91B> \xB6\xC3 |1
-<UF91C> \xA7\x5A |1
-<UF91D> \xC4\xE6 |1
-<UF91E> \xC4\xEA |1
-<UF91F> \xC4\xF5 |1
-<UF920> \xC6\x7D |1
-<UF921> \xB4\x50 |1
-<UF922> \xC0\xDD |1
-<UF923> \xC2\xC5 |1
-<UF924> \xC4\xB0 |1
-<UF925> \xA9\xD4 |1
-<UF926> \xC3\xBE |1
-<UF927> \xC4\xFA |1
-<UF928> \xB4\x59 |1
-<UF929> \xAE\xD4 |1
-<UF92A> \xAE\xF6 |1
-<UF92B> \xAF\x54 |1
-<UF92D> \xA8\xD3 |1
-<UF92E> \xA7\x4E |1
-<UF92F> \xB3\xD2 |1
-<UF930> \xBE\xDB |1
-<UF931> \xC3\x72 |1
-<UF932> \xC4\x6C |1
-<UF933> \xBF\x63 |1
-<UF934> \xA6\xD1 |1
-<UF935> \xC4\xAA |1
-<UF936> \xB8\xB8 |1
-<UF937> \xB8\xF4 |1
-<UF938> \xC5\x53 |1
-<UF939> \xBE\x7C |1
-<UF93A> \xC6\x4F |1
-<UF93B> \xB8\x4C |1
-<UF93C> \xB8\x53 |1
-<UF93D> \xBA\xF1 |1
-<UF93E> \xDB\x77 |1
-<UF93F> \xBF\xFD |1
-<UF940> \xB3\xC0 |1
-<UF941> \xBD\xD7 |1
-<UF942> \xC3\x62 |1
-<UF943> \xA7\xCB |1
-<UF944> \xC5\xA2 |1
-<UF945> \xC5\xA4 |1
-<UF946> \xA8\x63 |1
-<UF947> \xBD\x55 |1
-<UF948> \xB8\xEF |1
-<UF949> \xB9\x70 |1
-<UF94A> \xC2\x53 |1
-<UF94B> \xB9\xF0 |1
-<UF94C> \xBC\xD3 |1
-<UF94D> \xB2\x5C |1
-<UF94E> \xBA\x7C |1
-<UF94F> \xB2\xD6 |1
-<UF950> \xC1\x5C |1
-<UF951> \xAD\xAE |1
-<UF952> \xB0\xC7 |1
-<UF953> \xA6\xD8 |1
-<UF954> \xBB\xFE |1
-<UF955> \xAD\xE2 |1
-<UF956> \xB8\x57 |1
-<UF957> \xBA\xF0 |1
-<UF958> \xB5\xD9 |1
-<UF959> \xB3\xAE |1
-<UF95A> \xC5\xAA |1
-<UF95B> \xCE\xD4 |1
-<UF95C> \xBC\xD6 |1
-<UF95D> \xBF\xD5 |1
-<UF95E> \xA4\xA6 |1
-<UF95F> \xB9\xE7 |1
-<UF960> \xAB\xE3 |1
-<UF961> \xB2\x76 |1
-<UF962> \xB2\xA7 |1
-<UF963> \xA5\x5F |1
-<UF964> \xED\xA8 |1
-<UF965> \xAB\x4B |1
-<UF966> \xB4\x5F |1
-<UF967> \xA4\xA3 |1
-<UF968> \xAA\x63 |1
-<UF969> \xBC\xC6 |1
-<UF96A> \xAF\xC1 |1
-<UF96B> \xB0\xD1 |1
-<UF96C> \xB6\xEB |1
-<UF96D> \xAC\xD9 |1
-<UF96E> \xB8\xAD |1
-<UF96F> \xBB\xA1 |1
-<UF970> \xB1\xFE |1
-<UF971> \xA8\xB0 |1
-<UF972> \xA8\x48 |1
-<UF973> \xAC\x42 |1
-<UF974> \xAD\x59 |1
-<UF975> \xB1\xB0 |1
-<UF976> \xB2\xA4 |1
-<UF977> \xAB\x47 |1
-<UF978> \xA8\xE2 |1
-<UF97A> \xB1\xE7 |1
-<UF97B> \xC2\xB3 |1
-<UF97C> \xA8\x7D |1
-<UF97D> \xBD\xCC |1
-<UF97E> \xB6\x71 |1
-<UF97F> \xC0\x79 |1
-<UF980> \xA7\x66 |1
-<UF981> \xA4\x6B |1
-<UF982> \xC3\x66 |1
-<UF983> \xAE\xC8 |1
-<UF984> \xC2\x6F |1
-<UF985> \xC4\x72 |1
-<UF986> \xBE\x5B |1
-<UF987> \xC6\x7A |1
-<UF988> \xC4\x52 |1
-<UF989> \xBE\xA4 |1
-<UF98A> \xA4\x4F |1
-<UF98B> \xBE\xE4 |1
-<UF98C> \xBE\xFA |1
-<UF98D> \xF7\x65 |1
-<UF98E> \xA6\x7E |1
-<UF98F> \xBC\xA6 |1
-<UF990> \xC5\xCA |1
-<UF991> \xBC\xBF |1
-<UF992> \xBA\xA7 |1
-<UF993> \xB7\xD2 |1
-<UF994> \xE6\xA3 |1
-<UF996> \xBD\x6D |1
-<UF997> \xC1\x70 |1
-<UF998> \xBD\xFB |1
-<UF999> \xBD\xAC |1
-<UF99A> \xB3\x73 |1
-<UF99B> \xC1\xE5 |1
-<UF99C> \xA6\x43 |1
-<UF99D> \xA6\x48 |1
-<UF99E> \xAB\x7C |1
-<UF99F> \xAF\x50 |1
-<UF9A0> \xB5\xF5 |1
-<UF9A1> \xBB\xA1 |1
-<UF9A2> \xB7\x47 |1
-<UF9A3> \xA9\xC0 |1
-<UF9A4> \xB1\xC9 |1
-<UF9A5> \xC0\xD4 |1
-<UF9A6> \xC3\xAE |1
-<UF9A7> \xC2\x79 |1
-<UF9A8> \xA5\x4F |1
-<UF9A9> \xCB\xF1 |1
-<UF9AA> \xB9\xE7 |1
-<UF9AB> \xC0\xAD |1
-<UF9AC> \xCC\xB0 |1
-<UF9AD> \xAC\xC2 |1
-<UF9AE> \xBC\xFC |1
-<UF9AF> \xB2\xDC |1
-<UF9B0> \xB2\xE2 |1
-<UF9B1> \xB9\x61 |1
-<UF9B2> \xB9\x73 |1
-<UF9B3> \xC6\x46 |1
-<UF9B4> \xBB\xE2 |1
-<UF9B5> \xA8\xD2 |1
-<UF9B6> \xC2\xA7 |1
-<UF9B7> \xC4\xBF |1
-<UF9B8> \xC1\xF5 |1
-<UF9B9> \xB4\x63 |1
-<UF9BA> \xA4\x46 |1
-<UF9BB> \xB9\xB1 |1
-<UF9BC> \xBC\x64 |1
-<UF9BD> \xA7\xBF |1
-<UF9BE> \xAE\xC6 |1
-<UF9BF> \xBC\xD6 |1
-<UF9C0> \xBF\x52 |1
-<UF9C1> \xC0\xF8 |1
-<UF9C2> \xE7\x64 |1
-<UF9C3> \xBF\xF1 |1
-<UF9C4> \xC0\x73 |1
-<UF9C5> \xB7\x77 |1
-<UF9C6> \xA8\xBF |1
-<UF9C7> \xBC\x42 |1
-<UF9C8> \xCC\xD8 |1
-<UF9C9> \xAC\x68 |1
-<UF9CA> \xAC\x79 |1
-<UF9CB> \xB7\xC8 |1
-<UF9CC> \xAF\x5B |1
-<UF9CD> \xAF\x64 |1
-<UF9CE> \xB2\xB8 |1
-<UF9CF> \xAF\xC3 |1
-<UF9D0> \xC3\xFE |1
-<UF9D1> \xA4\xBB |1
-<UF9D2> \xBC\xAE |1
-<UF9D3> \xB3\xB0 |1
-<UF9D4> \xAD\xDB |1
-<UF9D5> \xB1\x5B |1
-<UF9D6> \xB2\x5F |1
-<UF9D7> \xBD\xFC |1
-<UF9D8> \xAB\xDF |1
-<UF9D9> \xB7\x58 |1
-<UF9DA> \xAE\xDF |1
-<UF9DB> \xB2\x76 |1
-<UF9DC> \xB6\xA9 |1
-<UF9DD> \xA7\x51 |1
-<UF9DE> \xA6\x4F |1
-<UF9DF> \xBC\x69 |1
-<UF9E0> \xA9\xF6 |1
-<UF9E1> \xA7\xF5 |1
-<UF9E2> \xB1\xF9 |1
-<UF9E3> \xAA\x64 |1
-<UF9E4> \xB2\x7A |1
-<UF9E5> \xB5\x67 |1
-<UF9E6> \xBF\xA9 |1
-<UF9E8> \xB8\xCC |1
-<UF9E9> \xA8\xBD |1
-<UF9EA> \xC2\xF7 |1
-<UF9EB> \xB0\xCE |1
-<UF9EC> \xB7\xC4 |1
-<UF9ED> \xA7\x5B |1
-<UF9EE> \xBF\x4D |1
-<UF9EF> \xBF\x5A |1
-<UF9F0> \xC4\xA9 |1
-<UF9F2> \xC5\xEC |1
-<UF9F3> \xC5\xEF |1
-<UF9F4> \xAA\x4C |1
-<UF9F5> \xB2\x4F |1
-<UF9F6> \xC1\x7B |1
-<UF9F7> \xA5\xDF |1
-<UF9F8> \xB2\xC1 |1
-<UF9F9> \xB2\xC9 |1
-<UF9FA> \xAA\xAC |1
-<UF9FB> \xAA\xA5 |1
-<UF9FC> \xC3\xD1 |1
-<UF9FD> \xA4\xB0 |1
-<UF9FE> \xAF\xF9 |1
-<UF9FF> \xA8\xEB |1
-<UFA00> \xA4\xC1 |1
-<UFA01> \xAB\xD7 |1
-<UFA02> \xA9\xDD |1
-<UFA03> \xBF\x7D |1
-<UFA04> \xA6\x76 |1
-<UFA05> \xAC\x7D |1
-<UFA06> \xBC\xC9 |1
-<UFA07> \xBF\xE7 |1
-<UFA08> \xA6\xE6 |1
-<UFA09> \xAD\xB0 |1
-<UFA0A> \xA8\xA3 |1
-<UFA0B> \xB9\xF8 |1
-<UFA0C> \xC9\x4A |0
-<UFA0D> \xDD\xFC |0
-<UFA10> \xB6\xEF |1
-<UFA12> \xB4\xB8 |1
-<UFA15> \xE8\xF9 |1
-<UFA16> \xBD\xDE |1
-<UFA17> \xAF\x71 |1
-<UFA19> \xAF\xAB |1
-<UFA1A> \xB2\xBB |1
-<UFA1B> \xBA\xD6 |1
-<UFA1C> \xB9\x74 |1
-<UFA1D> \xBA\xEB |1
-<UFA1E> \xA6\xD0 |1
-<UFA22> \xBD\xD1 |1
-<UFA25> \xB6\x68 |1
-<UFA26> \xB3\xA3 |1
-<UFA2A> \xB6\xBA |1
-<UFA2B> \xB9\x7D |1
-<UFA2C> \xC0\x5D |1
-<UFA2D> \xC5\x62 |1
-<UFE30> \xA1\x4A |0
-<UFE31> \xA1\x57 |0
-<UFE33> \xA1\x59 |0
-<UFE34> \xA1\x5B |0
-<UFE35> \xA1\x5F |0
-<UFE36> \xA1\x60 |0
-<UFE37> \xA1\x63 |0
-<UFE38> \xA1\x64 |0
-<UFE39> \xA1\x67 |0
-<UFE3A> \xA1\x68 |0
-<UFE3B> \xA1\x6B |0
-<UFE3C> \xA1\x6C |0
-<UFE3D> \xA1\x6F |0
-<UFE3E> \xA1\x70 |0
-<UFE3F> \xA1\x73 |0
-<UFE40> \xA1\x74 |0
-<UFE41> \xA1\x77 |0
-<UFE42> \xA1\x78 |0
-<UFE43> \xA1\x7B |0
-<UFE44> \xA1\x7C |0
-<UFE49> \xA1\xC6 |0
-<UFE4A> \xA1\xC7 |0
-<UFE4B> \xA1\xCA |0
-<UFE4C> \xA1\xCB |0
-<UFE4D> \xA1\xC8 |0
-<UFE4E> \xA1\xC9 |0
-<UFE4F> \xA1\x5C |0
-<UFE50> \xA1\x4D |0
-<UFE51> \xA1\x4E |0
-<UFE52> \xA1\x4F |0
-<UFE54> \xA1\x51 |0
-<UFE55> \xA1\x52 |0
-<UFE56> \xA1\x53 |0
-<UFE57> \xA1\x54 |0
-<UFE59> \xA1\x7D |0
-<UFE5A> \xA1\x7E |0
-<UFE5B> \xA1\xA1 |0
-<UFE5C> \xA1\xA2 |0
-<UFE5D> \xA1\xA3 |0
-<UFE5E> \xA1\xA4 |0
-<UFE5F> \xA1\xCC |0
-<UFE60> \xA1\xCD |0
-<UFE61> \xA1\xCE |0
-<UFE62> \xA1\xDE |0
-<UFE63> \xA1\xDF |0
-<UFE64> \xA1\xE0 |0
-<UFE65> \xA1\xE1 |0
-<UFE66> \xA1\xE2 |0
-<UFE68> \xA2\x42 |0
-<UFE69> \xA2\x4C |0
-<UFE6A> \xA2\x4D |0
-<UFE6B> \xA2\x4E |0
-<UFF01> \xA1\x49 |0
-<UFF02> \xA1\xA8 |1
-<UFF03> \xA1\xAD |0
-<UFF04> \xA2\x43 |0
-<UFF05> \xA2\x48 |0
-<UFF06> \xA1\xAE |0
-<UFF07> \xA1\xA6 |1
-<UFF08> \xA1\x5D |0
-<UFF09> \xA1\x5E |0
-<UFF0A> \xA1\xAF |0
-<UFF0B> \xA1\xCF |0
-<UFF0C> \xA1\x41 |0
-<UFF0D> \xA1\xD0 |0
-<UFF0E> \xA1\x44 |0
-<UFF0F> \xA1\xFE |0
-<UFF10> \xA2\xAF |0
-<UFF11> \xA2\xB0 |0
-<UFF12> \xA2\xB1 |0
-<UFF13> \xA2\xB2 |0
-<UFF14> \xA2\xB3 |0
-<UFF15> \xA2\xB4 |0
-<UFF16> \xA2\xB5 |0
-<UFF17> \xA2\xB6 |0
-<UFF18> \xA2\xB7 |0
-<UFF19> \xA2\xB8 |0
-<UFF1A> \xA1\x47 |0
-<UFF1B> \xA1\x46 |0
-<UFF1C> \xA1\xD5 |0
-<UFF1D> \xA1\xD7 |0
-<UFF1E> \xA1\xD6 |0
-<UFF1F> \xA1\x48 |0
-<UFF20> \xA2\x49 |0
-<UFF21> \xA2\xCF |0
-<UFF22> \xA2\xD0 |0
-<UFF23> \xA2\xD1 |0
-<UFF24> \xA2\xD2 |0
-<UFF25> \xA2\xD3 |0
-<UFF26> \xA2\xD4 |0
-<UFF27> \xA2\xD5 |0
-<UFF28> \xA2\xD6 |0
-<UFF29> \xA2\xD7 |0
-<UFF2A> \xA2\xD8 |0
-<UFF2B> \xA2\xD9 |0
-<UFF2C> \xA2\xDA |0
-<UFF2D> \xA2\xDB |0
-<UFF2E> \xA2\xDC |0
-<UFF2F> \xA2\xDD |0
-<UFF30> \xA2\xDE |0
-<UFF31> \xA2\xDF |0
-<UFF32> \xA2\xE0 |0
-<UFF33> \xA2\xE1 |0
-<UFF34> \xA2\xE2 |0
-<UFF35> \xA2\xE3 |0
-<UFF36> \xA2\xE4 |0
-<UFF37> \xA2\xE5 |0
-<UFF38> \xA2\xE6 |0
-<UFF39> \xA2\xE7 |0
-<UFF3A> \xA2\xE8 |0
-<UFF3B> \xA1\x65 |1
-<UFF3C> \xA2\x40 |0
-<UFF3D> \xA1\x66 |1
-<UFF3E> \xA1\x73 |1
-<UFF3F> \xA1\xC4 |0
-<UFF40> \xA1\xA5 |1
-<UFF41> \xA2\xE9 |0
-<UFF42> \xA2\xEA |0
-<UFF43> \xA2\xEB |0
-<UFF44> \xA2\xEC |0
-<UFF45> \xA2\xED |0
-<UFF46> \xA2\xEE |0
-<UFF47> \xA2\xEF |0
-<UFF48> \xA2\xF0 |0
-<UFF49> \xA2\xF1 |0
-<UFF4A> \xA2\xF2 |0
-<UFF4B> \xA2\xF3 |0
-<UFF4C> \xA2\xF4 |0
-<UFF4D> \xA2\xF5 |0
-<UFF4E> \xA2\xF6 |0
-<UFF4F> \xA2\xF7 |0
-<UFF50> \xA2\xF8 |0
-<UFF51> \xA2\xF9 |0
-<UFF52> \xA2\xFA |0
-<UFF53> \xA2\xFB |0
-<UFF54> \xA2\xFC |0
-<UFF55> \xA2\xFD |0
-<UFF56> \xA2\xFE |0
-<UFF57> \xA3\x40 |0
-<UFF58> \xA3\x41 |0
-<UFF59> \xA3\x42 |0
-<UFF5A> \xA3\x43 |0
-<UFF5B> \xA1\x61 |0
-<UFF5C> \xA1\x55 |0
-<UFF5D> \xA1\x62 |0
-<UFF5E> \xA1\xE3 |0
-<UFF64> \xA1\x4E |1
-<UFFE0> \xA2\x46 |0
-<UFFE1> \xA2\x47 |0
-<UFFE3> \xA1\xC3 |0
-<UFFE5> \xA2\x44 |0
-#
-END CHARMAP
-#
diff --git a/enc/trans/ucm/windows-950_hkscs-2001.ucm b/enc/trans/ucm/windows-950_hkscs-2001.ucm
deleted file mode 100644
index f7ecf5a3db..0000000000
--- a/enc/trans/ucm/windows-950_hkscs-2001.ucm
+++ /dev/null
@@ -1,23446 +0,0 @@
-# ***************************************************************************
-# *
-# * Copyright (C) 2001-2002, International Business Machines
-# * Corporation and others. All Rights Reserved.
-# *
-# ***************************************************************************
-#
-# File created on Apr 01 11:35 Pacific Standard Time 2003
-#
-# File created by genmucm tool.
-# from windows 2000 using IMultiLanguage 5.50.4522.1800
-#
-# Table Version : 1.0
-# The 1st column is the Unicode scalar value.
-# The 2nd column is the codepage byte sequence.
-# The 3rd column is the fallback indicator.
-# The fallback indicator can have one of the following values:
-# |0 for exact 1-1 roundtrip mapping
-# |1 for the best fallback codepage byte sequence.
-# |2 for the substitution character
-# |3 for the best reverse fallback Unicode scaler value
-#
-# Encoding description: Chinese Traditional (Big5)
-# Encoding name: big5
-# Comment: Warning this is a non-standard windows-950 implementation
-# you must use http://www.microsoft.com/hk/hkscs/ to get this mapping.
-#
-<code_set_name> "windows-950_hkscs-2001"
-<mb_cur_max> 2
-<mb_cur_min> 1
-<uconv_class> "MBCS"
-<subchar> \x3F
-<icu:charsetFamily> "ASCII"
-# Suggested ICU specific alias information
-#<icu:alias> "windows-950_VPUA"
-
-<icu:state> 0-80, 81-fe:1, ff
-<icu:state> 40-7e, 80-fe
-
-# The following was the generated state table.
-# This does not account for unassigned characters
-#<icu:state> 0-80, 81-fe:1, ff
-#<icu:state> 40-7e, a1-fe
-#
-CHARMAP
-#
-#UNICODE 950
-#_______ _________
-<U0000> \x00 |0
-<U0001> \x01 |0
-<U0002> \x02 |0
-<U0003> \x03 |0
-<U0004> \x04 |0
-<U0005> \x05 |0
-<U0006> \x06 |0
-<U0007> \x07 |0
-<U0008> \x08 |0
-<U0009> \x09 |0
-<U000A> \x0A |0
-<U000B> \x0B |0
-<U000C> \x0C |0
-<U000D> \x0D |0
-<U000E> \x0E |0
-<U000F> \x0F |0
-<U0010> \x10 |0
-<U0011> \x11 |0
-<U0012> \x12 |0
-<U0013> \x13 |0
-<U0014> \x14 |0
-<U0015> \x15 |0
-<U0016> \x16 |0
-<U0017> \x17 |0
-<U0018> \x18 |0
-<U0019> \x19 |0
-<U001A> \x1A |0
-<U001B> \x1B |0
-<U001C> \x1C |0
-<U001D> \x1D |0
-<U001E> \x1E |0
-<U001F> \x1F |0
-<U0020> \x20 |0
-<U0021> \x21 |0
-<U0022> \x22 |0
-<U0023> \x23 |0
-<U0024> \x24 |0
-<U0025> \x25 |0
-<U0026> \x26 |0
-<U0027> \x27 |0
-<U0028> \x28 |0
-<U0029> \x29 |0
-<U002A> \x2A |0
-<U002B> \x2B |0
-<U002C> \x2C |0
-<U002D> \x2D |0
-<U002E> \x2E |0
-<U002F> \x2F |0
-<U0030> \x30 |0
-<U0031> \x31 |0
-<U0032> \x32 |0
-<U0033> \x33 |0
-<U0034> \x34 |0
-<U0035> \x35 |0
-<U0036> \x36 |0
-<U0037> \x37 |0
-<U0038> \x38 |0
-<U0039> \x39 |0
-<U003A> \x3A |0
-<U003B> \x3B |0
-<U003C> \x3C |0
-<U003D> \x3D |0
-<U003E> \x3E |0
-<U003F> \x3F |0
-<U0040> \x40 |0
-<U0041> \x41 |0
-<U0042> \x42 |0
-<U0043> \x43 |0
-<U0044> \x44 |0
-<U0045> \x45 |0
-<U0046> \x46 |0
-<U0047> \x47 |0
-<U0048> \x48 |0
-<U0049> \x49 |0
-<U004A> \x4A |0
-<U004B> \x4B |0
-<U004C> \x4C |0
-<U004D> \x4D |0
-<U004E> \x4E |0
-<U004F> \x4F |0
-<U0050> \x50 |0
-<U0051> \x51 |0
-<U0052> \x52 |0
-<U0053> \x53 |0
-<U0054> \x54 |0
-<U0055> \x55 |0
-<U0056> \x56 |0
-<U0057> \x57 |0
-<U0058> \x58 |0
-<U0059> \x59 |0
-<U005A> \x5A |0
-<U005B> \x5B |0
-<U005C> \x5C |0
-<U005D> \x5D |0
-<U005E> \x5E |0
-<U005F> \x5F |0
-<U0060> \x60 |0
-<U0061> \x61 |0
-<U0062> \x62 |0
-<U0063> \x63 |0
-<U0064> \x64 |0
-<U0065> \x65 |0
-<U0066> \x66 |0
-<U0067> \x67 |0
-<U0068> \x68 |0
-<U0069> \x69 |0
-<U006A> \x6A |0
-<U006B> \x6B |0
-<U006C> \x6C |0
-<U006D> \x6D |0
-<U006E> \x6E |0
-<U006F> \x6F |0
-<U0070> \x70 |0
-<U0071> \x71 |0
-<U0072> \x72 |0
-<U0073> \x73 |0
-<U0074> \x74 |0
-<U0075> \x75 |0
-<U0076> \x76 |0
-<U0077> \x77 |0
-<U0078> \x78 |0
-<U0079> \x79 |0
-<U007A> \x7A |0
-<U007B> \x7B |0
-<U007C> \x7C |0
-<U007D> \x7D |0
-<U007E> \x7E |0
-<U007F> \x7F |0
-#<U0080> \x80 |0
-<U00A1> \x21 |1
-<U00A2> \xA2\x46 |1
-<U00A3> \xA2\x47 |1
-<U00A5> \xA2\x44 |1
-<U00A6> \x7C |1
-<U00A7> \xA1\xB1 |0
-<U00A8> \xC6\xD8 |0
-<U00A9> \x63 |1
-<U00AA> \x61 |1
-<U00AD> \x2D |1
-<U00AE> \x52 |1
-<U00AF> \xA1\xC2 |0
-<U00B0> \xA2\x58 |0
-<U00B1> \xA1\xD3 |0
-<U00B2> \x32 |1
-<U00B3> \x33 |1
-<U00B4> \xA1\xA6 |1
-<U00B5> \xA3\x67 |1
-<U00B7> \xA1\x50 |0
-<U00B8> \xA1\x4D |1
-<U00B9> \x31 |1
-<U00BA> \x6F |1
-<U00C0> \x88\x59 |0
-<U00C1> \x88\x57 |0
-<U00C2> \x41 |1
-<U00C3> \x41 |1
-<U00C4> \x41 |1
-<U00C5> \x41 |1
-<U00C6> \x41 |1
-<U00C7> \x43 |1
-<U00C8> \x88\x5D |0
-<U00C9> \x88\x5B |0
-<U00CA> \x88\x66 |0
-<U00CB> \x45 |1
-<U00CC> \x49 |1
-<U00CD> \x49 |1
-<U00CE> \x49 |1
-<U00CF> \x49 |1
-<U00D0> \x44 |1
-<U00D1> \x4E |1
-<U00D2> \x88\x61 |0
-<U00D3> \x88\x5F |0
-<U00D4> \x4F |1
-<U00D5> \x4F |1
-<U00D6> \x4F |1
-<U00D7> \xA1\xD1 |0
-<U00D8> \x4F |1
-<U00D9> \x55 |1
-<U00DA> \x55 |1
-<U00DB> \x55 |1
-<U00DC> \x55 |1
-<U00DD> \x59 |1
-<U00DE> \x54 |1
-<U00DF> \x73 |1
-<U00E0> \x88\x6A |0
-<U00E1> \x88\x68 |0
-<U00E2> \x61 |1
-<U00E3> \x61 |1
-<U00E4> \x61 |1
-<U00E5> \x61 |1
-<U00E6> \x61 |1
-<U00E7> \x63 |1
-<U00E8> \x88\x6F |0
-<U00E9> \x88\x6D |0
-<U00EA> \x88\xA7 |0
-<U00EB> \x65 |1
-<U00EC> \x88\x73 |0
-<U00ED> \x88\x71 |0
-<U00EE> \x69 |1
-<U00EF> \x69 |1
-<U00F0> \x65 |1
-<U00F1> \x6E |1
-<U00F2> \x88\x77 |0
-<U00F3> \x88\x75 |0
-<U00F4> \x6F |1
-<U00F5> \x6F |1
-<U00F6> \x6F |1
-<U00F7> \xA1\xD2 |0
-<U00F8> \xC8\xFB |0
-<U00F9> \x88\x7B |0
-<U00FA> \x88\x79 |0
-<U00FB> \x75 |1
-<U00FC> \x88\xA2 |0
-<U00FD> \x79 |1
-<U00FE> \x74 |1
-<U00FF> \x79 |1
-<U0100> \x88\x56 |0
-<U0101> \x88\x67 |0
-<U0112> \x88\x5A |0
-<U0113> \x88\x6C |0
-<U011A> \x88\x5C |0
-<U011B> \x88\x6E |0
-<U012B> \x88\x70 |0
-<U014B> \xC8\xFC |0
-<U014C> \x88\x5E |0
-<U014D> \x88\x74 |0
-<U0153> \xC8\xFA |0
-<U016B> \x88\x78 |0
-<U01CD> \x88\x58 |0
-<U01CE> \x88\x69 |0
-<U01D0> \x88\x72 |0
-<U01D1> \x88\x60 |0
-<U01D2> \x88\x76 |0
-<U01D4> \x88\x7A |0
-<U01D6> \x88\x7C |0
-<U01D8> \x88\x7D |0
-<U01DA> \x88\x7E |0
-<U01DC> \x88\xA1 |0
-<U0250> \xC8\xF6 |0
-<U0251> \x88\x6B |0
-<U0254> \xC8\xF8 |0
-<U025B> \xC8\xF7 |0
-<U0261> \x88\xA8 |0
-<U026A> \xC8\xFE |0
-<U0275> \xC8\xF9 |0
-<U0283> \xC8\xF5 |0
-<U028A> \xC8\xFD |0
-<U02C6> \xC6\xD9 |0
-<U02C7> \xA3\xBE |0
-<U02C9> \xA3\xBC |0
-<U02CA> \xA3\xBD |0
-<U02CB> \xA3\xBF |0
-<U02CD> \xA1\xC5 |0
-<U02D9> \xA3\xBB |0
-<U0305> \xA1\xC2 |1
-<U0391> \xA3\x44 |0
-<U0392> \xA3\x45 |0
-<U0393> \xA3\x46 |0
-<U0394> \xA3\x47 |0
-<U0395> \xA3\x48 |0
-<U0396> \xA3\x49 |0
-<U0397> \xA3\x4A |0
-<U0398> \xA3\x4B |0
-<U0399> \xA3\x4C |0
-<U039A> \xA3\x4D |0
-<U039B> \xA3\x4E |0
-<U039C> \xA3\x4F |0
-<U039D> \xA3\x50 |0
-<U039E> \xA3\x51 |0
-<U039F> \xA3\x52 |0
-<U03A0> \xA3\x53 |0
-<U03A1> \xA3\x54 |0
-<U03A3> \xA3\x55 |0
-<U03A4> \xA3\x56 |0
-<U03A5> \xA3\x57 |0
-<U03A6> \xA3\x58 |0
-<U03A7> \xA3\x59 |0
-<U03A8> \xA3\x5A |0
-<U03A9> \xA3\x5B |0
-<U03B1> \xA3\x5C |0
-<U03B2> \xA3\x5D |0
-<U03B3> \xA3\x5E |0
-<U03B4> \xA3\x5F |0
-<U03B5> \xA3\x60 |0
-<U03B6> \xA3\x61 |0
-<U03B7> \xA3\x62 |0
-<U03B8> \xA3\x63 |0
-<U03B9> \xA3\x64 |0
-<U03BA> \xA3\x65 |0
-<U03BB> \xA3\x66 |0
-<U03BC> \xA3\x67 |0
-<U03BD> \xA3\x68 |0
-<U03BE> \xA3\x69 |0
-<U03BF> \xA3\x6A |0
-<U03C0> \xA3\x6B |0
-<U03C1> \xA3\x6C |0
-<U03C3> \xA3\x6D |0
-<U03C4> \xA3\x6E |0
-<U03C5> \xA3\x6F |0
-<U03C6> \xA3\x70 |0
-<U03C7> \xA3\x71 |0
-<U03C8> \xA3\x72 |0
-<U03C9> \xA3\x73 |0
-<U0401> \xC7\xF9 |0
-<U0410> \xC7\xF3 |0
-<U0411> \xC7\xF4 |0
-<U0412> \xC7\xF5 |0
-<U0413> \xC7\xF6 |0
-<U0414> \xC7\xF7 |0
-<U0415> \xC7\xF8 |0
-<U0416> \xC7\xFA |0
-<U0417> \xC7\xFB |0
-<U0418> \xC7\xFC |0
-<U0419> \xC7\xFD |0
-<U041A> \xC7\xFE |0
-<U041B> \xC8\x40 |0
-<U041C> \xC8\x41 |0
-<U041D> \xC8\x42 |0
-<U041E> \xC8\x43 |0
-<U041F> \xC8\x44 |0
-<U0420> \xC8\x45 |0
-<U0421> \xC8\x46 |0
-<U0422> \xC8\x47 |0
-<U0423> \xC8\x48 |0
-<U0424> \xC8\x49 |0
-<U0425> \xC8\x4A |0
-<U0426> \xC8\x4B |0
-<U0427> \xC8\x4C |0
-<U0428> \xC8\x4D |0
-<U0429> \xC8\x4E |0
-<U042A> \xC8\x4F |0
-<U042B> \xC8\x50 |0
-<U042C> \xC8\x51 |0
-<U042D> \xC8\x52 |0
-<U042E> \xC8\x53 |0
-<U042F> \xC8\x54 |0
-<U0430> \xC8\x55 |0
-<U0431> \xC8\x56 |0
-<U0432> \xC8\x57 |0
-<U0433> \xC8\x58 |0
-<U0434> \xC8\x59 |0
-<U0435> \xC8\x5A |0
-<U0436> \xC8\x5C |0
-<U0437> \xC8\x5D |0
-<U0438> \xC8\x5E |0
-<U0439> \xC8\x5F |0
-<U043A> \xC8\x60 |0
-<U043B> \xC8\x61 |0
-<U043C> \xC8\x62 |0
-<U043D> \xC8\x63 |0
-<U043E> \xC8\x64 |0
-<U043F> \xC8\x65 |0
-<U0440> \xC8\x66 |0
-<U0441> \xC8\x67 |0
-<U0442> \xC8\x68 |0
-<U0443> \xC8\x69 |0
-<U0444> \xC8\x6A |0
-<U0445> \xC8\x6B |0
-<U0446> \xC8\x6C |0
-<U0447> \xC8\x6D |0
-<U0448> \xC8\x6E |0
-<U0449> \xC8\x6F |0
-<U044A> \xC8\x70 |0
-<U044B> \xC8\x71 |0
-<U044C> \xC8\x72 |0
-<U044D> \xC8\x73 |0
-<U044E> \xC8\x74 |0
-<U044F> \xC8\x75 |0
-<U0451> \xC8\x5B |0
-<U1EBE> \x88\x63 |0
-<U1EBF> \x88\xA4 |0
-<U1EC0> \x88\x65 |0
-<U1EC1> \x88\xA6 |0
-<U2013> \xA1\x56 |0
-<U2014> \xA1\x58 |0
-<U2015> \xA2\x77 |1
-<U2016> \xA1\xFC |1
-<U2018> \xA1\xA5 |0
-<U2019> \xA1\xA6 |0
-<U201C> \xA1\xA7 |0
-<U201D> \xA1\xA8 |0
-<U2022> \xA1\x45 |1
-<U2024> \xA3\xBB |1
-<U2025> \xA1\x4C |0
-<U2026> \xA1\x4B |0
-<U2027> \xA1\x45 |0
-<U2032> \xA1\xAC |0
-<U2033> \xA1\xB2 |1
-<U2035> \xA1\xAB |0
-<U203B> \xA1\xB0 |0
-<U203E> \xA1\xC3 |1
-<U20AC> \xA3\xE1 |0
-<U2103> \xA2\x4A |0
-<U2105> \xA1\xC1 |0
-<U2109> \xA2\x4B |0
-<U2116> \xC8\xD2 |0
-<U2121> \xC8\xD3 |0
-<U2160> \xA2\xB9 |0
-<U2161> \xA2\xBA |0
-<U2162> \xA2\xBB |0
-<U2163> \xA2\xBC |0
-<U2164> \xA2\xBD |0
-<U2165> \xA2\xBE |0
-<U2166> \xA2\xBF |0
-<U2167> \xA2\xC0 |0
-<U2168> \xA2\xC1 |0
-<U2169> \xA2\xC2 |0
-<U2170> \xC6\xB5 |0
-<U2171> \xC6\xB6 |0
-<U2172> \xC6\xB7 |0
-<U2173> \xC6\xB8 |0
-<U2174> \xC6\xB9 |0
-<U2175> \xC6\xBA |0
-<U2176> \xC6\xBB |0
-<U2177> \xC6\xBC |0
-<U2178> \xC6\xBD |0
-<U2179> \xC6\xBE |0
-<U2190> \xA1\xF6 |0
-<U2191> \xA1\xF4 |0
-<U2192> \xA1\xF7 |0
-<U2193> \xA1\xF5 |0
-<U2196> \xA1\xF8 |0
-<U2197> \xA1\xF9 |0
-<U2198> \xA1\xFB |0
-<U2199> \xA1\xFA |0
-<U21B8> \xC8\x77 |0
-<U21B9> \xC8\x78 |0
-<U21E7> \xC8\x76 |0
-<U2215> \xA2\x41 |0
-<U2216> \xA2\x42 |1
-<U2218> \xA2\x58 |1
-<U221A> \xA1\xD4 |0
-<U221E> \xA1\xDB |0
-<U221F> \xA1\xE8 |0
-<U2220> \xA1\xE7 |0
-<U2223> \xA1\xFD |0
-<U2225> \xA1\xFC |0
-<U2229> \xA1\xE4 |0
-<U222A> \xA1\xE5 |0
-<U222B> \xA1\xEC |0
-<U222E> \xA1\xED |0
-<U2234> \xA1\xEF |0
-<U2235> \xA1\xEE |0
-<U2252> \xA1\xDC |0
-<U2260> \xA1\xDA |0
-<U2261> \xA1\xDD |0
-<U2263> \xA1\xDD |1
-<U2266> \xA1\xD8 |0
-<U2267> \xA1\xD9 |0
-<U2295> \xA1\xF2 |0
-<U2299> \xA1\xF3 |0
-<U22A5> \xA1\xE6 |0
-<U22BF> \xA1\xE9 |0
-<U2307> \xA1\x5B |1
-<U2460> \xC6\xA1 |0
-<U2461> \xC6\xA2 |0
-<U2462> \xC6\xA3 |0
-<U2463> \xC6\xA4 |0
-<U2464> \xC6\xA5 |0
-<U2465> \xC6\xA6 |0
-<U2466> \xC6\xA7 |0
-<U2467> \xC6\xA8 |0
-<U2468> \xC6\xA9 |0
-<U2469> \xC6\xAA |0
-<U2474> \xC6\xAB |0
-<U2475> \xC6\xAC |0
-<U2476> \xC6\xAD |0
-<U2477> \xC6\xAE |0
-<U2478> \xC6\xAF |0
-<U2479> \xC6\xB0 |0
-<U247A> \xC6\xB1 |0
-<U247B> \xC6\xB2 |0
-<U247C> \xC6\xB3 |0
-<U247D> \xC6\xB4 |0
-<U2500> \xA2\x77 |0
-<U2502> \xA2\x78 |0
-<U250C> \xA2\x7A |0
-<U2510> \xA2\x7B |0
-<U2514> \xA2\x7C |0
-<U2518> \xA2\x7D |0
-<U251C> \xA2\x75 |0
-<U2524> \xA2\x74 |0
-<U252C> \xA2\x73 |0
-<U2534> \xA2\x72 |0
-<U253C> \xA2\x71 |0
-<U2550> \xF9\xF9 |0
-<U2550> \xA2\xA4 |3
-<U2551> \xF9\xF8 |0
-<U2552> \xF9\xE6 |0
-<U2553> \xF9\xEF |0
-<U2554> \xF9\xDD |0
-<U2555> \xF9\xE8 |0
-<U2556> \xF9\xF1 |0
-<U2557> \xF9\xDF |0
-<U2558> \xF9\xEC |0
-<U2559> \xF9\xF5 |0
-<U255A> \xF9\xE3 |0
-<U255B> \xF9\xEE |0
-<U255C> \xF9\xF7 |0
-<U255D> \xF9\xE5 |0
-<U255E> \xF9\xE9 |0
-<U255E> \xA2\xA5 |3
-<U255F> \xF9\xF2 |0
-<U2560> \xF9\xE0 |0
-<U2561> \xF9\xEB |0
-<U2561> \xA2\xA7 |3
-<U2562> \xF9\xF4 |0
-<U2563> \xF9\xE2 |0
-<U2564> \xF9\xE7 |0
-<U2565> \xF9\xF0 |0
-<U2566> \xF9\xDE |0
-<U2567> \xF9\xED |0
-<U2568> \xF9\xF6 |0
-<U2569> \xF9\xE4 |0
-<U256A> \xF9\xEA |0
-<U256A> \xA2\xA6 |3
-<U256B> \xF9\xF3 |0
-<U256C> \xF9\xE1 |0
-<U256D> \xF9\xFA |0
-<U256D> \xA2\x7E |3
-<U256E> \xF9\xFB |0
-<U256E> \xA2\xA1 |3
-<U256F> \xF9\xFD |0
-<U256F> \xA2\xA3 |3
-<U2570> \xF9\xFC |0
-<U2570> \xA2\xA2 |3
-<U2571> \xA2\xAC |0
-<U2572> \xA2\xAD |0
-<U2573> \xA2\xAE |0
-<U2574> \xA1\x5A |0
-<U2581> \xA2\x62 |0
-<U2582> \xA2\x63 |0
-<U2583> \xA2\x64 |0
-<U2584> \xA2\x65 |0
-<U2585> \xA2\x66 |0
-<U2586> \xA2\x67 |0
-<U2587> \xA2\x68 |0
-<U2588> \xA2\x69 |0
-<U2589> \xA2\x70 |0
-<U258A> \xA2\x6F |0
-<U258B> \xA2\x6E |0
-<U258C> \xA2\x6D |0
-<U258D> \xA2\x6C |0
-<U258E> \xA2\x6B |0
-<U258F> \xA2\x6A |0
-<U2593> \xF9\xFE |1
-<U2594> \xA2\x76 |0
-<U2595> \xA2\x79 |0
-<U25A0> \xA1\xBD |0
-<U25A1> \xA1\xBC |0
-<U25B2> \xA1\xB6 |0
-<U25B3> \xA1\xB5 |0
-<U25BC> \xA1\xBF |0
-<U25BD> \xA1\xBE |0
-<U25C6> \xA1\xBB |0
-<U25C7> \xA1\xBA |0
-<U25CB> \xA1\xB3 |0
-<U25CE> \xA1\xB7 |0
-<U25CF> \xA1\xB4 |0
-<U25E2> \xA2\xA8 |0
-<U25E3> \xA2\xA9 |0
-<U25E4> \xA2\xAB |0
-<U25E5> \xA2\xAA |0
-<U2605> \xA1\xB9 |0
-<U2606> \xA1\xB8 |0
-<U2609> \xA1\xF3 |1
-<U2640> \xA1\xF0 |0
-<U2641> \xA1\xF2 |1
-<U2642> \xA1\xF1 |0
-<U273D> \xC6\xE6 |0
-<U2E80> \xC8\xD6 |0
-<U2E84> \xC8\xD7 |0
-<U2E86> \xC8\xD8 |0
-<U2E87> \xC8\xD9 |0
-<U2E88> \xC8\xDA |0
-<U2E8A> \xC8\xDB |0
-<U2E8C> \xC8\xDC |0
-<U2E8D> \xC8\xDD |0
-<U2E95> \xC8\xDE |0
-<U2E9C> \xC8\xDF |0
-<U2E9D> \xC8\xE0 |0
-<U2EA5> \xC8\xE1 |0
-<U2EA7> \xC8\xE2 |0
-<U2EAA> \xC8\xE3 |0
-<U2EAC> \xC8\xE4 |0
-<U2EAE> \xC8\xE5 |0
-<U2EB6> \xC8\xE6 |0
-<U2EBC> \xC8\xE7 |0
-<U2EBE> \xC8\xE8 |0
-<U2EC6> \xC8\xE9 |0
-<U2ECA> \xC8\xEA |0
-<U2ECC> \xC8\xEB |0
-<U2ECD> \xC8\xEC |0
-<U2ECF> \xC8\xED |0
-<U2ED6> \xC8\xEE |0
-<U2ED7> \xC8\xEF |0
-<U2EDE> \xC8\xF0 |0
-<U2EE3> \xC8\xF1 |0
-<U2F33> \xC6\xCD |0
-<U3000> \xA1\x40 |0
-<U3001> \xA1\x42 |0
-<U3002> \xA1\x43 |0
-<U3003> \xA1\xB2 |0
-<U3005> \xC6\xE0 |0
-<U3006> \xC6\xE1 |0
-<U3007> \xC6\xE2 |0
-<U3008> \xA1\x71 |0
-<U3009> \xA1\x72 |0
-<U300A> \xA1\x6D |0
-<U300B> \xA1\x6E |0
-<U300C> \xA1\x75 |0
-<U300D> \xA1\x76 |0
-<U300E> \xA1\x79 |0
-<U300F> \xA1\x7A |0
-<U3010> \xA1\x69 |0
-<U3011> \xA1\x6A |0
-<U3012> \xA2\x45 |0
-<U3014> \xA1\x65 |0
-<U3015> \xA1\x66 |0
-<U301C> \xA1\xE3 |1
-<U301D> \xA1\xA9 |0
-<U301E> \xA1\xAA |0
-<U3021> \xA2\xC3 |0
-<U3022> \xA2\xC4 |0
-<U3023> \xA2\xC5 |0
-<U3024> \xA2\xC6 |0
-<U3025> \xA2\xC7 |0
-<U3026> \xA2\xC8 |0
-<U3027> \xA2\xC9 |0
-<U3028> \xA2\xCA |0
-<U3029> \xA2\xCB |0
-<U3030> \xA1\xCA |1
-<U3041> \xC6\xE7 |0
-<U3042> \xC6\xE8 |0
-<U3043> \xC6\xE9 |0
-<U3044> \xC6\xEA |0
-<U3045> \xC6\xEB |0
-<U3046> \xC6\xEC |0
-<U3047> \xC6\xED |0
-<U3048> \xC6\xEE |0
-<U3049> \xC6\xEF |0
-<U304A> \xC6\xF0 |0
-<U304B> \xC6\xF1 |0
-<U304C> \xC6\xF2 |0
-<U304D> \xC6\xF3 |0
-<U304E> \xC6\xF4 |0
-<U304F> \xC6\xF5 |0
-<U3050> \xC6\xF6 |0
-<U3051> \xC6\xF7 |0
-<U3052> \xC6\xF8 |0
-<U3053> \xC6\xF9 |0
-<U3054> \xC6\xFA |0
-<U3055> \xC6\xFB |0
-<U3056> \xC6\xFC |0
-<U3057> \xC6\xFD |0
-<U3058> \xC6\xFE |0
-<U3059> \xC7\x40 |0
-<U305A> \xC7\x41 |0
-<U305B> \xC7\x42 |0
-<U305C> \xC7\x43 |0
-<U305D> \xC7\x44 |0
-<U305E> \xC7\x45 |0
-<U305F> \xC7\x46 |0
-<U3060> \xC7\x47 |0
-<U3061> \xC7\x48 |0
-<U3062> \xC7\x49 |0
-<U3063> \xC7\x4A |0
-<U3064> \xC7\x4B |0
-<U3065> \xC7\x4C |0
-<U3066> \xC7\x4D |0
-<U3067> \xC7\x4E |0
-<U3068> \xC7\x4F |0
-<U3069> \xC7\x50 |0
-<U306A> \xC7\x51 |0
-<U306B> \xC7\x52 |0
-<U306C> \xC7\x53 |0
-<U306D> \xC7\x54 |0
-<U306E> \xC7\x55 |0
-<U306F> \xC7\x56 |0
-<U3070> \xC7\x57 |0
-<U3071> \xC7\x58 |0
-<U3072> \xC7\x59 |0
-<U3073> \xC7\x5A |0
-<U3074> \xC7\x5B |0
-<U3075> \xC7\x5C |0
-<U3076> \xC7\x5D |0
-<U3077> \xC7\x5E |0
-<U3078> \xC7\x5F |0
-<U3079> \xC7\x60 |0
-<U307A> \xC7\x61 |0
-<U307B> \xC7\x62 |0
-<U307C> \xC7\x63 |0
-<U307D> \xC7\x64 |0
-<U307E> \xC7\x65 |0
-<U307F> \xC7\x66 |0
-<U3080> \xC7\x67 |0
-<U3081> \xC7\x68 |0
-<U3082> \xC7\x69 |0
-<U3083> \xC7\x6A |0
-<U3084> \xC7\x6B |0
-<U3085> \xC7\x6C |0
-<U3086> \xC7\x6D |0
-<U3087> \xC7\x6E |0
-<U3088> \xC7\x6F |0
-<U3089> \xC7\x70 |0
-<U308A> \xC7\x71 |0
-<U308B> \xC7\x72 |0
-<U308C> \xC7\x73 |0
-<U308D> \xC7\x74 |0
-<U308E> \xC7\x75 |0
-<U308F> \xC7\x76 |0
-<U3090> \xC7\x77 |0
-<U3091> \xC7\x78 |0
-<U3092> \xC7\x79 |0
-<U3093> \xC7\x7A |0
-<U309B> \xC8\xD4 |0
-<U309C> \xC8\xD5 |0
-<U309D> \xC6\xDC |0
-<U309E> \xC6\xDD |0
-<U30A1> \xC7\x7B |0
-<U30A2> \xC7\x7C |0
-<U30A3> \xC7\x7D |0
-<U30A4> \xC7\x7E |0
-<U30A5> \xC7\xA1 |0
-<U30A6> \xC7\xA2 |0
-<U30A7> \xC7\xA3 |0
-<U30A8> \xC7\xA4 |0
-<U30A9> \xC7\xA5 |0
-<U30AA> \xC7\xA6 |0
-<U30AB> \xC7\xA7 |0
-<U30AC> \xC7\xA8 |0
-<U30AD> \xC7\xA9 |0
-<U30AE> \xC7\xAA |0
-<U30AF> \xC7\xAB |0
-<U30B0> \xC7\xAC |0
-<U30B1> \xC7\xAD |0
-<U30B2> \xC7\xAE |0
-<U30B3> \xC7\xAF |0
-<U30B4> \xC7\xB0 |0
-<U30B5> \xC7\xB1 |0
-<U30B6> \xC7\xB2 |0
-<U30B7> \xC7\xB3 |0
-<U30B8> \xC7\xB4 |0
-<U30B9> \xC7\xB5 |0
-<U30BA> \xC7\xB6 |0
-<U30BB> \xC7\xB7 |0
-<U30BC> \xC7\xB8 |0
-<U30BD> \xC7\xB9 |0
-<U30BE> \xC7\xBA |0
-<U30BF> \xC7\xBB |0
-<U30C0> \xC7\xBC |0
-<U30C1> \xC7\xBD |0
-<U30C2> \xC7\xBE |0
-<U30C3> \xC7\xBF |0
-<U30C4> \xC7\xC0 |0
-<U30C5> \xC7\xC1 |0
-<U30C6> \xC7\xC2 |0
-<U30C7> \xC7\xC3 |0
-<U30C8> \xC7\xC4 |0
-<U30C9> \xC7\xC5 |0
-<U30CA> \xC7\xC6 |0
-<U30CB> \xC7\xC7 |0
-<U30CC> \xC7\xC8 |0
-<U30CD> \xC7\xC9 |0
-<U30CE> \xC7\xCA |0
-<U30CF> \xC7\xCB |0
-<U30D0> \xC7\xCC |0
-<U30D1> \xC7\xCD |0
-<U30D2> \xC7\xCE |0
-<U30D3> \xC7\xCF |0
-<U30D4> \xC7\xD0 |0
-<U30D5> \xC7\xD1 |0
-<U30D6> \xC7\xD2 |0
-<U30D7> \xC7\xD3 |0
-<U30D8> \xC7\xD4 |0
-<U30D9> \xC7\xD5 |0
-<U30DA> \xC7\xD6 |0
-<U30DB> \xC7\xD7 |0
-<U30DC> \xC7\xD8 |0
-<U30DD> \xC7\xD9 |0
-<U30DE> \xC7\xDA |0
-<U30DF> \xC7\xDB |0
-<U30E0> \xC7\xDC |0
-<U30E1> \xC7\xDD |0
-<U30E2> \xC7\xDE |0
-<U30E3> \xC7\xDF |0
-<U30E4> \xC7\xE0 |0
-<U30E5> \xC7\xE1 |0
-<U30E6> \xC7\xE2 |0
-<U30E7> \xC7\xE3 |0
-<U30E8> \xC7\xE4 |0
-<U30E9> \xC7\xE5 |0
-<U30EA> \xC7\xE6 |0
-<U30EB> \xC7\xE7 |0
-<U30EC> \xC7\xE8 |0
-<U30ED> \xC7\xE9 |0
-<U30EE> \xC7\xEA |0
-<U30EF> \xC7\xEB |0
-<U30F0> \xC7\xEC |0
-<U30F1> \xC7\xED |0
-<U30F2> \xC7\xEE |0
-<U30F3> \xC7\xEF |0
-<U30F4> \xC7\xF0 |0
-<U30F5> \xC7\xF1 |0
-<U30F6> \xC7\xF2 |0
-<U30FC> \xC6\xE3 |0
-<U30FD> \xC6\xDA |0
-<U30FE> \xC6\xDB |0
-<U3105> \xA3\x74 |0
-<U3106> \xA3\x75 |0
-<U3107> \xA3\x76 |0
-<U3108> \xA3\x77 |0
-<U3109> \xA3\x78 |0
-<U310A> \xA3\x79 |0
-<U310B> \xA3\x7A |0
-<U310C> \xA3\x7B |0
-<U310D> \xA3\x7C |0
-<U310E> \xA3\x7D |0
-<U310F> \xA3\x7E |0
-<U3110> \xA3\xA1 |0
-<U3111> \xA3\xA2 |0
-<U3112> \xA3\xA3 |0
-<U3113> \xA3\xA4 |0
-<U3114> \xA3\xA5 |0
-<U3115> \xA3\xA6 |0
-<U3116> \xA3\xA7 |0
-<U3117> \xA3\xA8 |0
-<U3118> \xA3\xA9 |0
-<U3119> \xA3\xAA |0
-<U311A> \xA3\xAB |0
-<U311B> \xA3\xAC |0
-<U311C> \xA3\xAD |0
-<U311D> \xA3\xAE |0
-<U311E> \xA3\xAF |0
-<U311F> \xA3\xB0 |0
-<U3120> \xA3\xB1 |0
-<U3121> \xA3\xB2 |0
-<U3122> \xA3\xB3 |0
-<U3123> \xA3\xB4 |0
-<U3124> \xA3\xB5 |0
-<U3125> \xA3\xB6 |0
-<U3126> \xA3\xB7 |0
-<U3127> \xA3\xB8 |0
-<U3128> \xA3\xB9 |0
-<U3129> \xA3\xBA |0
-<U3192> \xA4\x40 |1
-<U3193> \xA4\x47 |1
-<U3194> \xA4\x54 |1
-<U3195> \xA5\x7C |1
-<U3196> \xA4\x57 |1
-<U3197> \xA4\xA4 |1
-<U3198> \xA4\x55 |1
-<U3199> \xA5\xD2 |1
-<U319A> \xA4\x41 |1
-<U319B> \xA4\xFE |1
-<U319C> \xA4\x42 |1
-<U319D> \xA4\xD1 |1
-<U319E> \xA6\x61 |1
-<U319F> \xA4\x48 |1
-<U3220> \xA4\x40 |1
-<U3221> \xA4\x47 |1
-<U3222> \xA4\x54 |1
-<U3223> \xA5\x7C |1
-<U3224> \xA4\xAD |1
-<U3225> \xA4\xBB |1
-<U3226> \xA4\x43 |1
-<U3227> \xA4\x4B |1
-<U3228> \xA4\x45 |1
-<U3229> \xA4\x51 |1
-<U322A> \xA4\xEB |1
-<U322B> \xA4\xF5 |1
-<U322C> \xA4\xF4 |1
-<U322D> \xA4\xEC |1
-<U322E> \xAA\xF7 |1
-<U322F> \xA4\x67 |1
-<U3230> \xA4\xE9 |1
-<U3231> \xC8\xD1 |0
-<U3232> \xA6\xB3 |1
-<U3233> \xAA\xC0 |1
-<U3234> \xA6\x57 |1
-<U3235> \xAF\x53 |1
-<U3236> \xB0\x5D |1
-<U3237> \xAF\xAC |1
-<U3238> \xB3\xD2 |1
-<U3239> \xA5\x4E |1
-<U323A> \xA9\x49 |1
-<U323B> \xBE\xC7 |1
-<U323C> \xBA\xCA |1
-<U323D> \xA5\xF8 |1
-<U323E> \xB8\xEA |1
-<U323F> \xA8\xF3 |1
-<U3240> \xB2\xBD |1
-<U3241> \xA5\xF0 |1
-<U3242> \xA6\xDB |1
-<U3243> \xA6\xDC |1
-<U3280> \xA4\x40 |1
-<U3281> \xA4\x47 |1
-<U3282> \xA4\x54 |1
-<U3283> \xA5\x7C |1
-<U3284> \xA4\xAD |1
-<U3285> \xA4\xBB |1
-<U3286> \xA4\x43 |1
-<U3287> \xA4\x4B |1
-<U3288> \xA4\x45 |1
-<U3289> \xA4\x51 |1
-<U328A> \xA4\xEB |1
-<U328B> \xA4\xF5 |1
-<U328C> \xA4\xF4 |1
-<U328D> \xA4\xEC |1
-<U328E> \xAA\xF7 |1
-<U328F> \xA4\x67 |1
-<U3290> \xA4\xE9 |1
-<U3291> \xAE\xE8 |1
-<U3292> \xA6\xB3 |1
-<U3293> \xAA\xC0 |1
-<U3294> \xA6\x57 |1
-<U3295> \xAF\x53 |1
-<U3296> \xB0\x5D |1
-<U3297> \xAF\xAC |1
-<U3298> \xB3\xD2 |1
-<U3299> \xAF\xB5 |1
-<U329A> \xA8\x6B |1
-<U329B> \xA4\x6B |1
-<U329C> \xBE\x41 |1
-<U329D> \xC0\x75 |1
-<U329E> \xA6\x4C |1
-<U329F> \xAA\x60 |1
-<U32A0> \xB6\xB5 |1
-<U32A1> \xA5\xF0 |1
-<U32A2> \xBC\x67 |1
-<U32A3> \xA1\xC0 |0
-<U32A4> \xA4\x57 |1
-<U32A5> \xA4\xA4 |1
-<U32A6> \xA4\x55 |1
-<U32A7> \xA5\xAA |1
-<U32A8> \xA5\x6B |1
-<U32A9> \xC2\xE5 |1
-<U32AA> \xA9\x76 |1
-<U32AB> \xBE\xC7 |1
-<U32AC> \xBA\xCA |1
-<U32AD> \xA5\xF8 |1
-<U32AE> \xB8\xEA |1
-<U32AF> \xA8\xF3 |1
-<U32B0> \xA9\x5D |1
-<U338E> \xA2\x55 |0
-<U338F> \xA2\x56 |0
-<U339C> \xA2\x50 |0
-<U339D> \xA2\x51 |0
-<U339E> \xA2\x52 |0
-<U33A1> \xA2\x54 |0
-<U33C4> \xA2\x57 |0
-<U33CE> \xA2\x53 |0
-<U33D1> \xA1\xEB |0
-<U33D2> \xA1\xEA |0
-<U33D5> \xA2\x4F |0
-<U3435> \x92\x77 |0
-<U3440> \x96\xDF |0
-<U344C> \x89\xD5 |0
-<U3464> \x93\xCD |0
-<U3473> \x9B\xDF |0
-<U347A> \xFA\x68 |0
-<U347D> \x89\xDA |0
-<U347E> \x8F\x59 |0
-<U3493> \x89\xDB |0
-<U3496> \x8F\x5D |0
-<U34A5> \x89\xDC |0
-<U34AF> \x96\xF7 |0
-<U34BC> \x8A\xDA |0
-<U34C1> \x8B\xDC |0
-<U34C8> \x97\xDB |0
-<U34DF> \x9E\x53 |0
-<U34E4> \x9D\xAA |0
-<U34FB> \x9B\xEA |0
-<U3506> \x8A\x6E |0
-<U353E> \x8B\xC8 |0
-<U3551> \x89\xE8 |0
-<U3553> \x89\xEA |0
-<U3559> \x8C\x4B |0
-<U3561> \xFB\x70 |0
-<U356D> \x89\xED |0
-<U3570> \x94\xDD |0
-<U3572> \x89\xEE |0
-<U3577> \x9E\xB4 |0
-<U3578> \x8A\xD3 |0
-<U3584> \x92\xDB |0
-<U3597> \x94\xDB |0
-<U3598> \x89\xF9 |0
-<U35A1> \xFB\x7A |0
-<U35A5> \x89\xFB |0
-<U35AD> \x9E\xFC |0
-<U35BF> \x89\xFC |0
-<U35C1> \x89\xBF |0
-<U35C5> \x89\xFE |0
-<U35C7> \x89\xE6 |0
-<U35CA> \x9D\x46 |0
-<U35CE> \x9D\xEE |0
-<U35D2> \xA0\x7E |0
-<U35D6> \xA0\x68 |0
-<U35DB> \x98\xE9 |0
-<U35DD> \x8B\x68 |0
-<U35F1> \x8D\xFD |0
-<U35F2> \x8B\xBE |0
-<U35F3> \x9F\xD9 |0
-<U35FB> \x8A\xEB |0
-<U35FE> \x9F\xD7 |0
-<U3609> \x8B\x6A |0
-<U3618> \x9C\x5C |0
-<U361A> \x8B\xB1 |0
-<U3623> \xFB\x5E |0
-<U362D> \x9D\xF3 |0
-<U3635> \xA0\xD0 |0
-<U3639> \xFC\x66 |0
-<U363E> \x92\xE9 |0
-<U3647> \x9A\xEC |0
-<U3648> \x8F\xAB |0
-<U3649> \xFA\x48 |0
-<U364E> \x8E\x45 |0
-<U365F> \x9C\x6F |0
-<U367A> \x9E\xDE |0
-<U3681> \x89\xEF |0
-<U369A> \x96\xE9 |0
-<U36A5> \x9E\xBB |0
-<U36AA> \x94\xDE |0
-<U36AC> \x9E\xB8 |0
-<U36B0> \x97\xBA |0
-<U36B1> \xFB\x65 |0
-<U36B5> \x95\xD6 |0
-<U36B9> \x9C\xBB |0
-<U36BC> \x97\xDA |0
-<U36C1> \x8F\x45 |0
-<U36C3> \xFB\x7D |0
-<U36C4> \x91\x58 |0
-<U36C5> \xFE\x64 |0
-<U36C7> \x98\x56 |0
-<U36C8> \x9B\x4D |0
-<U36D3> \x93\x5B |0
-<U36D4> \x95\xC7 |0
-<U36D6> \x97\xE7 |0
-<U36DD> \x93\x59 |0
-<U36E1> \x91\xF5 |0
-<U36E2> \x97\xB8 |0
-<U36E5> \xFD\xA2 |0
-<U36E6> \xFB\xB6 |0
-<U36F5> \x92\xFA |0
-<U3701> \x93\x57 |0
-<U3703> \x8B\xA6 |0
-<U3708> \xFB\xB9 |0
-<U370A> \x97\xB0 |0
-<U370D> \xFD\xC4 |0
-<U371C> \x9C\xA1 |0
-<U3722> \x91\xF2 |0
-<U3723> \x91\xF9 |0
-<U3725> \x8F\xF1 |0
-<U372C> \x97\x45 |0
-<U372D> \x98\x53 |0
-<U3730> \xFE\x78 |0
-<U3732> \xFB\xC1 |0
-<U3733> \x92\x51 |0
-<U373A> \x9D\xAD |0
-<U3740> \xFD\x6C |0
-<U3743> \xFA\x6B |0
-<U3762> \x9B\xC2 |0
-<U376F> \x9A\x7B |0
-<U3797> \x8B\x60 |0
-<U37A0> \x93\x4B |0
-<U37B9> \x9A\xBD |0
-<U37BE> \x91\xB7 |0
-<U37F2> \x95\xB4 |0
-<U37F8> \xFE\xC5 |0
-<U37FB> \x9E\xF0 |0
-<U380F> \x8D\x64 |0
-<U3819> \x92\x69 |0
-<U3820> \x8D\x67 |0
-<U382D> \xFB\xEA |0
-<U3836> \xFB\xEF |0
-<U3838> \x8D\x68 |0
-<U3863> \x93\xEB |0
-<U38A0> \xFC\x42 |0
-<U38C3> \x91\x66 |0
-<U38CC> \xFA\xCD |0
-<U38D1> \x93\xDD |0
-<U38FA> \x8B\xCC |0
-<U3908> \x8D\x6D |0
-<U3914> \x8D\x6E |0
-<U3927> \x96\xA8 |0
-<U3932> \xFC\xA6 |0
-<U393F> \x8D\x6F |0
-<U394D> \x8D\x70 |0
-<U3963> \xFC\x64 |0
-<U3980> \x90\x60 |0
-<U3989> \x8D\x74 |0
-<U398A> \x97\xC3 |0
-<U3992> \x8A\xD0 |0
-<U3999> \x92\x74 |0
-<U399B> \x9B\xBE |0
-<U39A1> \x9C\xC8 |0
-<U39A4> \x9C\xBA |0
-<U39B8> \x8D\x78 |0
-<U39DC> \x9E\xB9 |0
-<U39E2> \x95\x5A |0
-<U39E5> \x91\xB4 |0
-<U39EC> \x8A\x48 |0
-<U39F8> \x8D\x7D |0
-<U39FB> \x8A\x7D |0
-<U39FE> \x8A\xC2 |0
-<U3A01> \xFD\x4A |0
-<U3A03> \x8D\xA1 |0
-<U3A06> \x8A\xD1 |0
-<U3A17> \xFC\xB4 |0
-<U3A18> \x8B\x47 |0
-<U3A29> \x93\xA4 |0
-<U3A2A> \x9E\xDA |0
-<U3A34> \x8A\x51 |0
-<U3A4B> \x8D\xA6 |0
-<U3A52> \x9E\xC5 |0
-<U3A57> \xFC\xC4 |0
-<U3A5C> \xA0\x78 |0
-<U3A5E> \x94\xB5 |0
-<U3A66> \xFC\xC2 |0
-<U3A67> \x8A\x6B |0
-<U3A97> \x8D\xAB |0
-<U3AAB> \xFA\xE8 |0
-<U3ABD> \x8D\xAD |0
-<U3ADE> \xFC\x49 |0
-<U3AE0> \x93\xC1 |0
-<U3AF0> \x90\x6F |0
-<U3AF2> \x8D\xB0 |0
-<U3AFB> \x94\x7E |0
-<U3B0E> \x90\xFA |0
-<U3B19> \x94\x79 |0
-<U3B22> \x8D\xB2 |0
-<U3B2B> \xFC\xEE |0
-<U3B39> \x99\x7B |0
-<U3B42> \x8D\xB4 |0
-<U3B58> \x8D\xB7 |0
-<U3B60> \x91\xB3 |0
-<U3B71> \x8D\xBB |0
-<U3B72> \x8D\xBA |0
-<U3B7B> \x8D\xBC |0
-<U3B7C> \x90\x44 |0
-<U3B80> \xFD\x4C |0
-<U3B96> \x93\xE4 |0
-<U3B99> \x93\xE0 |0
-<U3BA1> \xFD\x53 |0
-<U3BBC> \x8D\xC3 |0
-<U3BBE> \x9B\xB8 |0
-<U3BC2> \xFB\xF0 |0
-<U3BC4> \x93\xE9 |0
-<U3BD7> \x93\xF6 |0
-<U3BDD> \x8D\xC5 |0
-<U3BEC> \x8D\xCA |0
-<U3BF2> \x8D\xCC |0
-<U3BF3> \xFD\x5D |0
-<U3BF4> \x93\xB5 |0
-<U3C0D> \xFD\x61 |0
-<U3C11> \x9C\xF8 |0
-<U3C15> \x92\x52 |0
-<U3C18> \xA0\xE8 |0
-<U3C54> \x9C\xA5 |0
-<U3C8B> \x8C\x56 |0
-<U3CCB> \x8D\xD6 |0
-<U3CCD> \x97\xC0 |0
-<U3CD1> \xA0\xDE |0
-<U3CD6> \x97\xD2 |0
-<U3CDC> \xFA\xA5 |0
-<U3CEB> \xFD\xA3 |0
-<U3CEF> \x8D\xDB |0
-<U3D13> \x8E\xAF |0
-<U3D1D> \x91\xB5 |0
-<U3D32> \xFD\x49 |0
-<U3D3B> \xFD\xD1 |0
-<U3D46> \x8D\xEB |0
-<U3D4C> \x97\xC6 |0
-<U3D4E> \xFD\xCE |0
-<U3D51> \x90\xFC |0
-<U3D5F> \xFC\x59 |0
-<U3D62> \x96\xD6 |0
-<U3D69> \x97\xC5 |0
-<U3D6A> \x8D\xEF |0
-<U3D6F> \x97\xD7 |0
-<U3D75> \x8D\xF0 |0
-<U3D7D> \x96\xA6 |0
-<U3D85> \xFB\xBF |0
-<U3D8A> \x8D\xF3 |0
-<U3D8F> \x94\x49 |0
-<U3D91> \x8D\xF5 |0
-<U3DA5> \x98\x72 |0
-<U3DAD> \x8E\x6B |0
-<U3DB4> \xFA\xFD |0
-<U3DBF> \x8F\x50 |0
-<U3DC6> \x9D\xCC |0
-<U3DC7> \xFC\x65 |0
-<U3DC9> \x8C\x44 |0
-<U3DCC> \x99\x6E |0
-<U3DCD> \x94\xA1 |0
-<U3DD3> \x8F\x63 |0
-<U3DDB> \xA0\xDA |0
-<U3DE7> \x92\x53 |0
-<U3DE8> \xFD\xE9 |0
-<U3DEB> \x9D\xB5 |0
-<U3DF3> \x98\x79 |0
-<U3DF7> \x9D\x5D |0
-<U3DFC> \x8D\x63 |0
-<U3DFD> \x96\x69 |0
-<U3E06> \x9F\x70 |0
-<U3E40> \xFC\x6A |0
-<U3E43> \x8A\xC7 |0
-<U3E48> \x89\xD7 |0
-<U3E55> \xFE\x4D |0
-<U3E74> \x9E\xDD |0
-<U3EA8> \xFE\xFB |0
-<U3EA9> \x98\xBC |0
-<U3EAA> \xFA\xCC |0
-<U3EAD> \x95\xB0 |0
-<U3EB1> \x94\x64 |0
-<U3EB8> \x93\x6F |0
-<U3EBF> \x94\xB9 |0
-<U3EC2> \x95\xEC |0
-<U3EC7> \x91\xEE |0
-<U3ECA> \x98\xC3 |0
-<U3ECC> \x95\xF6 |0
-<U3ED0> \x8F\xFD |0
-<U3ED1> \x98\xC5 |0
-<U3ED6> \x97\x66 |0
-<U3ED7> \xFE\x6E |0
-<U3EDA> \x97\xDD |0
-<U3EDB> \x8C\xAA |0
-<U3EDE> \x92\xD2 |0
-<U3EE1> \x97\x61 |0
-<U3EE2> \x98\xCB |0
-<U3EE7> \x95\xF0 |0
-<U3EE9> \x97\x5D |0
-<U3EEB> \x91\xE3 |0
-<U3EF0> \x98\xCC |0
-<U3EF3> \x94\x69 |0
-<U3EF4> \x98\xCD |0
-<U3EFA> \x98\xCE |0
-<U3EFC> \x95\xFC |0
-<U3EFF> \x94\xA3 |0
-<U3F00> \x96\x62 |0
-<U3F04> \xFE\xB6 |0
-<U3F06> \x94\x63 |0
-<U3F0E> \x98\xD0 |0
-<U3F53> \x98\xD1 |0
-<U3F58> \x94\x75 |0
-<U3F59> \xFA\xE0 |0
-<U3F63> \x94\x72 |0
-<U3F7C> \x98\xD6 |0
-<U3F93> \x8A\xF0 |0
-<U3FC0> \x98\xD9 |0
-<U3FD7> \x98\xDB |0
-<U3FDC> \x98\xDD |0
-<U3FE5> \x98\xA8 |0
-<U3FED> \x8A\x6D |0
-<U3FF9> \x8A\xFB |0
-<U3FFA> \x8A\xAE |0
-<U4004> \xFB\xC9 |0
-<U4009> \x8C\x5D |0
-<U401D> \x98\xE4 |0
-<U4039> \x98\xE6 |0
-<U4045> \x98\xE8 |0
-<U4053> \x8A\x4D |0
-<U4057> \x92\x57 |0
-<U4062> \x95\xDF |0
-<U4065> \xA0\xAC |0
-<U406A> \x98\xEB |0
-<U406F> \x98\xEC |0
-<U4071> \x8C\xC3 |0
-<U40A8> \x98\xF4 |0
-<U40BB> \x8A\xB8 |0
-<U40BF> \x9E\xE7 |0
-<U40C8> \x94\xBC |0
-<U40D8> \xFC\xD1 |0
-<U40DF> \x9C\xC6 |0
-<U40FA> \x9E\x7E |0
-<U4103> \x98\xFE |0
-<U4104> \xFD\xE8 |0
-<U4109> \x99\x40 |0
-<U410E> \x94\xC9 |0
-<U4132> \x94\xD3 |0
-<U4167> \x99\x46 |0
-<U416C> \x90\xC0 |0
-<U416E> \x94\xD1 |0
-<U417F> \x95\x73 |0
-<U4190> \x93\xC2 |0
-<U41B2> \x99\x48 |0
-<U41C4> \x99\x4B |0
-<U41CA> \x8E\x55 |0
-<U41CF> \x99\x4E |0
-<U41DB> \x8E\xFE |0
-<U41EF> \x8E\x59 |0
-<U41F9> \x94\xEC |0
-<U4211> \x94\xEF |0
-<U4223> \x8C\x60 |0
-<U4240> \x8F\x74 |0
-<U4260> \x99\x55 |0
-<U426A> \x95\x44 |0
-<U4276> \x8C\xCB |0
-<U427A> \x99\x56 |0
-<U428C> \x99\x59 |0
-<U4294> \x99\x5B |0
-<U42A2> \x8C\xC4 |0
-<U42B5> \xFA\x45 |0
-<U42B9> \x90\xB7 |0
-<U42BC> \x97\x43 |0
-<U42F4> \x95\xCD |0
-<U42FB> \x97\xC9 |0
-<U42FC> \xFD\x50 |0
-<U432B> \x8E\xB9 |0
-<U436E> \x95\xC6 |0
-<U4397> \x99\x67 |0
-<U43BA> \x8A\xB9 |0
-<U43C1> \x8D\xFC |0
-<U43D9> \x8A\x76 |0
-<U43DF> \x9D\x51 |0
-<U43ED> \x99\x73 |0
-<U43F2> \x9D\x4F |0
-<U4401> \x99\x7A |0
-<U4402> \x95\x64 |0
-<U4413> \x99\xA1 |0
-<U4425> \x99\xA5 |0
-<U442D> \x99\xA7 |0
-<U447A> \x8E\xED |0
-<U448F> \x99\xAD |0
-<U449F> \x94\x6E |0
-<U44A0> \x8F\x70 |0
-<U44A2> \xFA\xD0 |0
-<U44B0> \x99\xB3 |0
-<U44B7> \xA0\x53 |0
-<U44C0> \x96\x5C |0
-<U44C5> \xFD\x7A |0
-<U44CE> \x97\xFE |0
-<U44DD> \x92\xBD |0
-<U44DF> \x97\xFD |0
-<U44E4> \x8F\x64 |0
-<U44E9> \xFC\xF7 |0
-<U44EA> \x95\x62 |0
-<U44EB> \x97\xCD |0
-<U44EC> \x9E\x64 |0
-<U44F4> \x92\x4C |0
-<U4503> \x8E\xC9 |0
-<U4504> \x99\xBC |0
-<U4509> \x9D\xA5 |0
-<U450B> \x8F\x54 |0
-<U4516> \x8F\x7C |0
-<U451D> \x8E\xA2 |0
-<U4527> \x8F\x7A |0
-<U452E> \x97\xAE |0
-<U4533> \x96\xC8 |0
-<U453B> \x99\xC3 |0
-<U453D> \x90\xD6 |0
-<U453F> \x9C\xBE |0
-<U4543> \x8F\x76 |0
-<U4551> \x94\x70 |0
-<U4552> \xFB\x4B |0
-<U4555> \xFD\xCA |0
-<U455C> \x8E\xC7 |0
-<U4562> \xA0\xF9 |0
-<U456A> \x8F\xA9 |0
-<U4577> \x99\xC7 |0
-<U4585> \x90\xD7 |0
-<U45E9> \x9E\xDF |0
-<U4606> \x99\xCE |0
-<U460F> \x8F\xBA |0
-<U4615> \x8F\xEB |0
-<U4617> \x99\xCF |0
-<U465B> \x8F\xC2 |0
-<U467A> \x92\xC9 |0
-<U4680> \x97\xDC |0
-<U46CF> \x95\xB3 |0
-<U46D0> \x9C\x79 |0
-<U46F5> \x95\xB2 |0
-<U4713> \x8F\xDB |0
-<U4718> \x9B\xE3 |0
-<U474E> \x9E\x7A |0
-<U477C> \x9B\xEE |0
-<U4798> \x99\xDE |0
-<U47A6> \xFA\xFA |0
-<U47B6> \x9E\xE5 |0
-<U47D5> \x8A\x52 |0
-<U47ED> \x99\xE1 |0
-<U47F4> \x8A\x67 |0
-<U4800> \x8B\xB5 |0
-<U480B> \x8A\xAC |0
-<U4837> \x99\xE9 |0
-<U485D> \xFB\xCA |0
-<U4871> \x97\xDE |0
-<U489B> \x95\xD1 |0
-<U48AD> \x99\xF5 |0
-<U48AE> \xFC\x4A |0
-<U48D0> \x9B\xA9 |0
-<U48DD> \xFB\xDC |0
-<U48ED> \xFE\x56 |0
-<U48F3> \x9E\xA4 |0
-<U48FA> \x9D\x49 |0
-<U4906> \x95\xDB |0
-<U4911> \x89\xC5 |0
-<U491E> \x99\xF8 |0
-<U4925> \x96\x64 |0
-<U492A> \x90\x55 |0
-<U492D> \x96\xD4 |0
-<U4935> \x97\x7C |0
-<U493C> \x96\x4D |0
-<U493E> \x97\xE1 |0
-<U4945> \x9A\x48 |0
-<U4951> \x9A\x49 |0
-<U4953> \xFE\x7D |0
-<U4965> \x90\xAA |0
-<U496A> \x9A\x50 |0
-<U4972> \x93\x47 |0
-<U4989> \x8E\xD8 |0
-<U49A1> \x90\xC9 |0
-<U49A7> \x9A\x55 |0
-<U49DF> \x90\xBC |0
-<U49E5> \x9A\x58 |0
-<U49E7> \x8B\xB8 |0
-<U4A0F> \x90\xD5 |0
-<U4A1D> \x96\x41 |0
-<U4A24> \x9A\x5A |0
-<U4A35> \x9A\x5C |0
-<U4A96> \x97\xC2 |0
-<U4AB4> \x8A\xBB |0
-<U4AB8> \x9B\xAA |0
-<U4AD1> \x90\xF5 |0
-<U4AE4> \x9A\x60 |0
-<U4AFF> \x91\x45 |0
-<U4B10> \x8C\x58 |0
-<U4B19> \x9A\x63 |0
-<U4B20> \x8C\x49 |0
-<U4B2C> \x8B\xB6 |0
-<U4B37> \xFC\xCF |0
-<U4B6F> \x96\x6B |0
-<U4B70> \x9A\x6E |0
-<U4B72> \x91\x4F |0
-<U4B7B> \x97\x46 |0
-<U4B7E> \xA0\xE6 |0
-<U4B8E> \x92\xD7 |0
-<U4B90> \x96\x75 |0
-<U4B93> \x93\xD4 |0
-<U4B96> \x91\xBB |0
-<U4B97> \x96\x79 |0
-<U4B9D> \x9A\x70 |0
-<U4BBD> \x96\x78 |0
-<U4BBE> \x91\xCD |0
-<U4BC0> \x9C\x4A |0
-<U4C04> \xA0\x6F |0
-<U4C07> \xA0\x6A |0
-<U4C0E> \x91\x5F |0
-<U4C3B> \x9F\xA5 |0
-<U4C3E> \x89\xBA |0
-<U4C5B> \x9E\xCD |0
-<U4C6D> \x9A\x79 |0
-<U4C7D> \x9D\xCE |0
-<U4C81> \x8C\xD2 |0
-<U4CA4> \x9D\x73 |0
-<U4CAE> \x96\xB9 |0
-<U4CB0> \x96\xBC |0
-<U4CB7> \x9C\xD1 |0
-<U4CCD> \x89\xB7 |0
-<U4CE1> \x9E\xEE |0
-<U4CED> \xFB\x43 |0
-<U4D09> \x9E\xC9 |0
-<U4D10> \xFB\xD3 |0
-<U4D34> \x91\xAE |0
-<U4D91> \x9D\x78 |0
-<U4D9C> \x9D\x7B |0
-<U4E00> \xA4\x40 |0
-<U4E01> \xA4\x42 |0
-<U4E03> \xA4\x43 |0
-<U4E04> \x9E\xB3 |0
-<U4E07> \xC9\x45 |0
-<U4E08> \xA4\x56 |0
-<U4E09> \xA4\x54 |0
-<U4E0A> \xA4\x57 |0
-<U4E0B> \xA4\x55 |0
-<U4E0C> \xC9\x46 |0
-<U4E0D> \xA4\xA3 |0
-<U4E0E> \xC9\x4F |0
-<U4E0F> \xC9\x4D |0
-<U4E10> \xA4\xA2 |0
-<U4E11> \xA4\xA1 |0
-<U4E14> \xA5\x42 |0
-<U4E15> \xA5\x41 |0
-<U4E16> \xA5\x40 |0
-<U4E18> \xA5\x43 |0
-<U4E19> \xA4\xFE |0
-<U4E1A> \x9E\xB2 |0
-<U4E1C> \x9D\xD6 |0
-<U4E1E> \xA5\xE0 |0
-<U4E1F> \xA5\xE1 |0
-<U4E21> \x99\x4F |0
-<U4E24> \x89\xCE |0
-<U4E26> \xA8\xC3 |0
-<U4E28> \x8B\xC0 |0
-<U4E2A> \x9F\xC4 |0
-<U4E2B> \xA4\x58 |0
-<U4E2C> \x8B\xD4 |0
-<U4E2D> \xA4\xA4 |0
-<U4E2E> \xC9\x50 |0
-<U4E2F> \x8C\x72 |0
-<U4E30> \xA4\xA5 |0
-<U4E31> \xC9\x63 |0
-<U4E32> \xA6\xEA |0
-<U4E33> \xCB\xB1 |0
-<U4E36> \xC6\xBF |0
-<U4E37> \x8B\xF9 |0
-<U4E38> \xA4\x59 |0
-<U4E39> \xA4\xA6 |0
-<U4E3B> \xA5\x44 |0
-<U4E3C> \xC9\x64 |0
-<U4E3D> \x89\x46 |0
-<U4E3F> \xC6\xC0 |0
-<U4E42> \xC9\x40 |0
-<U4E43> \xA4\x44 |0
-<U4E45> \xA4\x5B |0
-<U4E47> \xC9\x47 |0
-<U4E48> \xA4\x5C |0
-<U4E49> \xFA\xE5 |0
-<U4E4B> \xA4\xA7 |0
-<U4E4D> \xA5\x45 |0
-<U4E4E> \xA5\x47 |0
-<U4E4F> \xA5\x46 |0
-<U4E52> \xA5\xE2 |0
-<U4E53> \xA5\xE3 |0
-<U4E56> \xA8\xC4 |0
-<U4E58> \xAD\xBC |0
-<U4E59> \xA4\x41 |0
-<U4E5A> \xC8\x7B |0
-<U4E5B> \x8B\xC6 |0
-<U4E5C> \xC9\x41 |0
-<U4E5D> \xA4\x45 |0
-<U4E5E> \xA4\x5E |0
-<U4E5F> \xA4\x5D |0
-<U4E69> \xA5\xE4 |0
-<U4E6A> \x9C\x57 |0
-<U4E73> \xA8\xC5 |0
-<U4E78> \x9A\xFB |0
-<U4E7E> \xB0\xAE |0
-<U4E7F> \xD4\x4B |0
-<U4E80> \x89\xD0 |0
-<U4E81> \x89\xCF |0
-<U4E82> \xB6\xC3 |0
-<U4E83> \xDC\xB1 |0
-<U4E84> \xDC\xB2 |0
-<U4E85> \xC6\xC1 |0
-<U4E86> \xA4\x46 |0
-<U4E87> \x89\xD1 |0
-<U4E88> \xA4\xA9 |0
-<U4E89> \x89\xE2 |0
-<U4E8B> \xA8\xC6 |0
-<U4E8C> \xA4\x47 |0
-<U4E8D> \xC9\x48 |0
-<U4E8E> \xA4\x5F |0
-<U4E91> \xA4\xAA |0
-<U4E92> \xA4\xAC |0
-<U4E93> \xC9\x51 |0
-<U4E94> \xA4\xAD |0
-<U4E95> \xA4\xAB |0
-<U4E98> \x92\x7E |0
-<U4E99> \xA5\xE5 |0
-<U4E9A> \x9D\xBA |0
-<U4E9B> \xA8\xC7 |0
-<U4E9E> \xA8\xC8 |0
-<U4E9F> \xAB\x45 |0
-<U4EA0> \xC6\xC2 |0
-<U4EA1> \xA4\x60 |0
-<U4EA2> \xA4\xAE |0
-<U4EA3> \x8C\x6F |0
-<U4EA4> \xA5\xE6 |0
-<U4EA5> \xA5\xE8 |0
-<U4EA6> \xA5\xE7 |0
-<U4EA8> \xA6\xEB |0
-<U4EAB> \xA8\xC9 |0
-<U4EAC> \xA8\xCA |0
-<U4EAD> \xAB\x46 |0
-<U4EAE> \xAB\x47 |0
-<U4EB3> \xAD\xBD |0
-<U4EB6> \xDC\xB3 |0
-<U4EB7> \xFB\xF8 |0
-<U4EB9> \xF6\xD6 |0
-<U4EBA> \xA4\x48 |0
-<U4EBB> \x8B\xC7 |0
-<U4EBC> \x92\x6B |0
-<U4EBF> \x89\xD2 |0
-<U4EC0> \xA4\xB0 |0
-<U4EC1> \xA4\xAF |0
-<U4EC2> \xC9\x52 |0
-<U4EC3> \xA4\xB1 |0
-<U4EC4> \xA4\xB7 |0
-<U4EC6> \xA4\xB2 |0
-<U4EC7> \xA4\xB3 |0
-<U4EC8> \xC9\x54 |0
-<U4EC9> \xC9\x53 |0
-<U4ECA> \xA4\xB5 |0
-<U4ECB> \xA4\xB6 |0
-<U4ECD> \xA4\xB4 |0
-<U4ECE> \x9F\xCF |0
-<U4ED4> \xA5\x4A |0
-<U4ED5> \xA5\x4B |0
-<U4ED6> \xA5\x4C |0
-<U4ED7> \xA5\x4D |0
-<U4ED8> \xA5\x49 |0
-<U4ED9> \xA5\x50 |0
-<U4EDA> \xC9\x6A |0
-<U4EDC> \xC9\x66 |0
-<U4EDD> \xC9\x69 |0
-<U4EDE> \xA5\x51 |0
-<U4EDF> \xA5\x61 |0
-<U4EE1> \xC9\x68 |0
-<U4EE3> \xA5\x4E |0
-<U4EE4> \xA5\x4F |0
-<U4EE5> \xA5\x48 |0
-<U4EE8> \xC9\x65 |0
-<U4EE9> \xC9\x67 |0
-<U4EEA> \x9D\xA9 |0
-<U4EEB> \x89\xD3 |0
-<U4EEE> \x99\xE2 |0
-<U4EF0> \xA5\xF5 |0
-<U4EF1> \xC9\xB0 |0
-<U4EF2> \xA5\xF2 |0
-<U4EF3> \xA5\xF6 |0
-<U4EF4> \xC9\xBA |0
-<U4EF5> \xC9\xAE |0
-<U4EF6> \xA5\xF3 |0
-<U4EF7> \xC9\xB2 |0
-<U4EF8> \x92\x67 |0
-<U4EFB> \xA5\xF4 |0
-<U4EFD> \xA5\xF7 |0
-<U4EFF> \xA5\xE9 |0
-<U4F00> \xC9\xB1 |0
-<U4F01> \xA5\xF8 |0
-<U4F02> \xC9\xB5 |0
-<U4F03> \x92\xA4 |0
-<U4F04> \xC9\xB9 |0
-<U4F05> \xC9\xB6 |0
-<U4F08> \xC9\xB3 |0
-<U4F09> \xA5\xEA |0
-<U4F0A> \xA5\xEC |0
-<U4F0B> \xA5\xF9 |0
-<U4F0D> \xA5\xEE |0
-<U4F0E> \xC9\xAB |0
-<U4F0F> \xA5\xF1 |0
-<U4F10> \xA5\xEF |0
-<U4F11> \xA5\xF0 |0
-<U4F12> \xC9\xBB |0
-<U4F13> \xC9\xB8 |0
-<U4F14> \xC9\xAF |0
-<U4F15> \xA5\xED |0
-<U4F17> \x8C\x73 |0
-<U4F18> \xC9\xAC |0
-<U4F19> \xA5\xEB |0
-<U4F1A> \x89\x4E |0
-<U4F1D> \xC9\xB4 |0
-<U4F22> \xC9\xB7 |0
-<U4F28> \x89\x4F |0
-<U4F29> \x92\x78 |0
-<U4F2C> \xC9\xAD |0
-<U4F2D> \xCA\x66 |0
-<U4F2F> \xA7\x42 |0
-<U4F30> \xA6\xF4 |0
-<U4F32> \x91\xB6 |0
-<U4F33> \xCA\x67 |0
-<U4F34> \xA6\xF1 |0
-<U4F36> \xA7\x44 |0
-<U4F37> \x89\xD4 |0
-<U4F38> \xA6\xF9 |0
-<U4F39> \x9F\xD2 |0
-<U4F3A> \xA6\xF8 |0
-<U4F3B> \xCA\x5B |0
-<U4F3C> \xA6\xFC |0
-<U4F3D> \xA6\xF7 |0
-<U4F3E> \xCA\x60 |0
-<U4F3F> \xCA\x68 |0
-<U4F41> \xCA\x64 |0
-<U4F42> \x92\xA7 |0
-<U4F43> \xA6\xFA |0
-<U4F45> \x95\xA2 |0
-<U4F46> \xA6\xFD |0
-<U4F47> \xA6\xEE |0
-<U4F48> \xA7\x47 |0
-<U4F49> \xCA\x5D |0
-<U4F4B> \x92\x6E |0
-<U4F4C> \xCB\xBD |0
-<U4F4D> \xA6\xEC |0
-<U4F4E> \xA7\x43 |0
-<U4F4F> \xA6\xED |0
-<U4F50> \xA6\xF5 |0
-<U4F51> \xA6\xF6 |0
-<U4F52> \xCA\x62 |0
-<U4F53> \xCA\x5E |0
-<U4F54> \xA6\xFB |0
-<U4F55> \xA6\xF3 |0
-<U4F56> \xCA\x5A |0
-<U4F57> \xA6\xEF |0
-<U4F58> \xCA\x65 |0
-<U4F59> \xA7\x45 |0
-<U4F5A> \xA7\x48 |0
-<U4F5B> \xA6\xF2 |0
-<U4F5C> \xA7\x40 |0
-<U4F5D> \xA7\x46 |0
-<U4F5E> \xA6\xF0 |0
-<U4F5F> \xCA\x63 |0
-<U4F60> \xA7\x41 |0
-<U4F61> \xCA\x69 |0
-<U4F62> \xCA\x5C |0
-<U4F63> \xA6\xFE |0
-<U4F64> \xCA\x5F |0
-<U4F67> \xCA\x61 |0
-<U4F69> \xA8\xD8 |0
-<U4F6A> \xCB\xBF |0
-<U4F6B> \xCB\xCB |0
-<U4F6C> \xA8\xD0 |0
-<U4F6E> \xCB\xCC |0
-<U4F6F> \xA8\xCB |0
-<U4F70> \xA8\xD5 |0
-<U4F72> \x96\xEA |0
-<U4F73> \xA8\xCE |0
-<U4F74> \xCB\xB9 |0
-<U4F75> \xA8\xD6 |0
-<U4F76> \xCB\xB8 |0
-<U4F77> \xCB\xBC |0
-<U4F78> \xCB\xC3 |0
-<U4F79> \xCB\xC1 |0
-<U4F7A> \xA8\xDE |0
-<U4F7B> \xA8\xD9 |0
-<U4F7C> \xCB\xB3 |0
-<U4F7D> \xCB\xB5 |0
-<U4F7E> \xA8\xDB |0
-<U4F7F> \xA8\xCF |0
-<U4F80> \xCB\xB6 |0
-<U4F81> \xCB\xC2 |0
-<U4F82> \xCB\xC9 |0
-<U4F83> \xA8\xD4 |0
-<U4F84> \xCB\xBB |0
-<U4F85> \xCB\xB4 |0
-<U4F86> \xA8\xD3 |0
-<U4F87> \xCB\xB7 |0
-<U4F88> \xA8\xD7 |0
-<U4F89> \xCB\xBA |0
-<U4F8A> \x92\x6F |0
-<U4F8B> \xA8\xD2 |0
-<U4F8D> \xA8\xCD |0
-<U4F8F> \xA8\xDC |0
-<U4F90> \xCB\xC4 |0
-<U4F91> \xA8\xDD |0
-<U4F92> \xCB\xC8 |0
-<U4F94> \xCB\xC6 |0
-<U4F95> \xCB\xCA |0
-<U4F96> \xA8\xDA |0
-<U4F97> \xCB\xBE |0
-<U4F98> \xCB\xB2 |0
-<U4F9A> \xCB\xC0 |0
-<U4F9B> \xA8\xD1 |0
-<U4F9C> \xCB\xC5 |0
-<U4F9D> \xA8\xCC |0
-<U4F9E> \xCB\xC7 |0
-<U4FA2> \x92\xA3 |0
-<U4FA8> \x89\x50 |0
-<U4FAB> \xFA\x57 |0
-<U4FAE> \xAB\x56 |0
-<U4FAF> \xAB\x4A |0
-<U4FB0> \x98\x66 |0
-<U4FB2> \xCD\xE0 |0
-<U4FB3> \xCD\xE8 |0
-<U4FB5> \xAB\x49 |0
-<U4FB6> \xAB\x51 |0
-<U4FB7> \xAB\x5D |0
-<U4FB9> \xCD\xEE |0
-<U4FBA> \xCD\xEC |0
-<U4FBB> \xCD\xE7 |0
-<U4FBD> \x89\xD6 |0
-<U4FBF> \xAB\x4B |0
-<U4FC0> \xCD\xED |0
-<U4FC1> \xCD\xE3 |0
-<U4FC2> \xAB\x59 |0
-<U4FC3> \xAB\x50 |0
-<U4FC4> \xAB\x58 |0
-<U4FC5> \xCD\xDE |0
-<U4FC7> \xCD\xEA |0
-<U4FC8> \x98\xB2 |0
-<U4FC9> \xCD\xE1 |0
-<U4FCA> \xAB\x54 |0
-<U4FCB> \xCD\xE2 |0
-<U4FCC> \x92\xAB |0
-<U4FCD> \xCD\xDD |0
-<U4FCE> \xAB\x5B |0
-<U4FCF> \xAB\x4E |0
-<U4FD0> \xAB\x57 |0
-<U4FD1> \xAB\x4D |0
-<U4FD3> \xCD\xDF |0
-<U4FD4> \xCD\xE4 |0
-<U4FD6> \xCD\xEB |0
-<U4FD7> \xAB\x55 |0
-<U4FD8> \xAB\x52 |0
-<U4FD9> \xCD\xE6 |0
-<U4FDA> \xAB\x5A |0
-<U4FDB> \xCD\xE9 |0
-<U4FDC> \xCD\xE5 |0
-<U4FDD> \xAB\x4F |0
-<U4FDE> \xAB\x5C |0
-<U4FDF> \xAB\x53 |0
-<U4FE0> \xAB\x4C |0
-<U4FE1> \xAB\x48 |0
-<U4FE4> \x96\xDE |0
-<U4FE5> \x92\xAC |0
-<U4FEC> \xCD\xEF |0
-<U4FEE> \xAD\xD7 |0
-<U4FEF> \xAD\xC1 |0
-<U4FF0> \x8C\x70 |0
-<U4FF1> \xAD\xD1 |0
-<U4FF2> \x9F\x6E |0
-<U4FF3> \xAD\xD6 |0
-<U4FF4> \xD0\xD0 |0
-<U4FF5> \xD0\xCF |0
-<U4FF6> \xD0\xD4 |0
-<U4FF7> \xD0\xD5 |0
-<U4FF8> \xAD\xC4 |0
-<U4FF9> \x8E\xF2 |0
-<U4FFA> \xAD\xCD |0
-<U4FFD> \x9F\x6C |0
-<U4FFE> \xAD\xDA |0
-<U5000> \xAD\xCE |0
-<U5003> \x89\xD8 |0
-<U5005> \xD0\xC9 |0
-<U5006> \xAD\xC7 |0
-<U5007> \xD0\xCA |0
-<U5008> \xFA\x59 |0
-<U5009> \xAD\xDC |0
-<U500B> \xAD\xD3 |0
-<U500C> \xAD\xBE |0
-<U500D> \xAD\xBF |0
-<U500E> \xD0\xDD |0
-<U500F> \xB0\xBF |0
-<U5011> \xAD\xCC |0
-<U5012> \xAD\xCB |0
-<U5013> \xD0\xCB |0
-<U5014> \xAD\xCF |0
-<U5015> \xD4\x5B |0
-<U5016> \xAD\xC6 |0
-<U5017> \xD0\xD6 |0
-<U5018> \xAD\xD5 |0
-<U5019> \xAD\xD4 |0
-<U501A> \xAD\xCA |0
-<U501B> \xD0\xCE |0
-<U501C> \xD0\xD7 |0
-<U501E> \xD0\xC8 |0
-<U501F> \xAD\xC9 |0
-<U5020> \xD0\xD8 |0
-<U5021> \xAD\xD2 |0
-<U5022> \xD0\xCC |0
-<U5023> \xAD\xC0 |0
-<U5025> \xAD\xC3 |0
-<U5026> \xAD\xC2 |0
-<U5027> \xD0\xD9 |0
-<U5028> \xAD\xD0 |0
-<U5029> \xAD\xC5 |0
-<U502A> \xAD\xD9 |0
-<U502B> \xAD\xDB |0
-<U502C> \xD0\xD3 |0
-<U502D> \xAD\xD8 |0
-<U502E> \x92\xA8 |0
-<U502F> \xD0\xDB |0
-<U5030> \xD0\xCD |0
-<U5031> \xD0\xDC |0
-<U5033> \xD0\xD1 |0
-<U5034> \x91\x63 |0
-<U5035> \xD0\xDA |0
-<U5037> \xD0\xD2 |0
-<U503B> \x8C\x40 |0
-<U503C> \xAD\xC8 |0
-<U5040> \xD4\x63 |0
-<U5041> \xD4\x57 |0
-<U5043> \xB0\xB3 |0
-<U5045> \xD4\x5C |0
-<U5046> \xD4\x62 |0
-<U5047> \xB0\xB2 |0
-<U5048> \xD4\x55 |0
-<U5049> \xB0\xB6 |0
-<U504A> \xD4\x59 |0
-<U504B> \xD4\x52 |0
-<U504C> \xB0\xB4 |0
-<U504D> \xD4\x56 |0
-<U504E> \xB0\xB9 |0
-<U504F> \xB0\xBE |0
-<U5051> \xD4\x67 |0
-<U5053> \xD4\x51 |0
-<U5055> \xB0\xBA |0
-<U5056> \x9F\x73 |0
-<U5057> \xD4\x66 |0
-<U5058> \x92\xAD |0
-<U505A> \xB0\xB5 |0
-<U505B> \xD4\x58 |0
-<U505C> \xB0\xB1 |0
-<U505D> \xD4\x53 |0
-<U505E> \xD4\x4F |0
-<U505F> \xD4\x5D |0
-<U5060> \xD4\x50 |0
-<U5061> \xD4\x4E |0
-<U5062> \xD4\x5A |0
-<U5063> \xD4\x60 |0
-<U5064> \xD4\x61 |0
-<U5065> \xB0\xB7 |0
-<U5066> \x9B\xE9 |0
-<U5068> \xD8\x5B |0
-<U5069> \xD4\x5E |0
-<U506A> \xD4\x4D |0
-<U506B> \xD4\x5F |0
-<U506C> \x92\xA9 |0
-<U506D> \xB0\xC1 |0
-<U506E> \xD4\x64 |0
-<U506F> \xB0\xC0 |0
-<U5070> \xD4\x4C |0
-<U5072> \xD4\x54 |0
-<U5073> \xD4\x65 |0
-<U5074> \xB0\xBC |0
-<U5075> \xB0\xBB |0
-<U5076> \xB0\xB8 |0
-<U5077> \xB0\xBD |0
-<U507A> \xB0\xAF |0
-<U507D> \xB0\xB0 |0
-<U5080> \xB3\xC8 |0
-<U5081> \x92\xAA |0
-<U5082> \xD8\x5E |0
-<U5083> \xD8\x57 |0
-<U5085> \xB3\xC5 |0
-<U5087> \xD8\x5F |0
-<U5088> \x89\xD9 |0
-<U508B> \xD8\x55 |0
-<U508C> \xD8\x58 |0
-<U508D> \xB3\xC4 |0
-<U508E> \xD8\x59 |0
-<U5090> \xFD\x56 |0
-<U5091> \xB3\xC7 |0
-<U5092> \xD8\x5D |0
-<U5094> \xD8\x53 |0
-<U5095> \xD8\x52 |0
-<U5096> \xB3\xC9 |0
-<U5098> \xB3\xCA |0
-<U5099> \xB3\xC6 |0
-<U509A> \xB3\xCB |0
-<U509B> \xD8\x51 |0
-<U509C> \xD8\x5C |0
-<U509D> \xD8\x5A |0
-<U509E> \xD8\x54 |0
-<U50A2> \xB3\xC3 |0
-<U50A3> \xD8\x56 |0
-<U50A6> \x9F\xA8 |0
-<U50AC> \xB6\xCA |0
-<U50AD> \xB6\xC4 |0
-<U50AE> \xDC\xB7 |0
-<U50AF> \xB6\xCD |0
-<U50B0> \xDC\xBD |0
-<U50B1> \xDC\xC0 |0
-<U50B2> \xB6\xC6 |0
-<U50B3> \xB6\xC7 |0
-<U50B4> \xDC\xBA |0
-<U50B5> \xB6\xC5 |0
-<U50B6> \xDC\xC3 |0
-<U50B7> \xB6\xCB |0
-<U50B8> \xDC\xC4 |0
-<U50BA> \xDC\xBF |0
-<U50BB> \xB6\xCC |0
-<U50BC> \x8C\x71 |0
-<U50BD> \xDC\xB4 |0
-<U50BE> \xB6\xC9 |0
-<U50BF> \xDC\xB5 |0
-<U50C1> \xDC\xBE |0
-<U50C2> \xDC\xBC |0
-<U50C4> \xDC\xB8 |0
-<U50C5> \xB6\xC8 |0
-<U50C6> \xDC\xB6 |0
-<U50C7> \xB6\xCE |0
-<U50C8> \xDC\xBB |0
-<U50C9> \xDC\xC2 |0
-<U50CA> \xDC\xB9 |0
-<U50CB> \xDC\xC1 |0
-<U50CD> \x92\xA1 |0
-<U50CE> \xB9\xB6 |0
-<U50CF> \xB9\xB3 |0
-<U50D0> \x90\xE3 |0
-<U50D1> \xB9\xB4 |0
-<U50D3> \xE0\xF9 |0
-<U50D4> \xE0\xF1 |0
-<U50D5> \xB9\xB2 |0
-<U50D6> \xB9\xAF |0
-<U50D7> \xE0\xF2 |0
-<U50D9> \xA0\xA6 |0
-<U50DA> \xB9\xB1 |0
-<U50DB> \xE0\xF5 |0
-<U50DD> \xE0\xF7 |0
-<U50DF> \x94\xAB |0
-<U50E0> \xE0\xFE |0
-<U50E1> \xFC\x72 |0
-<U50E3> \xE0\xFD |0
-<U50E4> \xE0\xF8 |0
-<U50E5> \xB9\xAE |0
-<U50E6> \xE0\xF0 |0
-<U50E7> \xB9\xAC |0
-<U50E8> \xE0\xF3 |0
-<U50E9> \xB9\xB7 |0
-<U50EA> \xE0\xF6 |0
-<U50EC> \xE0\xFA |0
-<U50ED> \xB9\xB0 |0
-<U50EE> \xB9\xAD |0
-<U50EF> \xE0\xFC |0
-<U50F0> \xE0\xFB |0
-<U50F1> \xB9\xB5 |0
-<U50F3> \xE0\xF4 |0
-<U50F4> \x97\xC4 |0
-<U50F5> \xBB\xF8 |0
-<U50F6> \xE4\xEC |0
-<U50F8> \xE4\xE9 |0
-<U50F9> \xBB\xF9 |0
-<U50FB> \xBB\xF7 |0
-<U50FC> \x92\xAE |0
-<U50FD> \xE4\xF0 |0
-<U50FE> \xE4\xED |0
-<U50FF> \xE4\xE6 |0
-<U5100> \xBB\xF6 |0
-<U5101> \xFA\x67 |0
-<U5102> \xBB\xFA |0
-<U5103> \xE4\xE7 |0
-<U5104> \xBB\xF5 |0
-<U5105> \xBB\xFD |0
-<U5106> \xE4\xEA |0
-<U5107> \xE4\xEB |0
-<U5108> \xBB\xFB |0
-<U5109> \xBB\xFC |0
-<U510A> \xE4\xF1 |0
-<U510B> \xE4\xEE |0
-<U510C> \xE4\xEF |0
-<U510D> \x92\xA2 |0
-<U510E> \xFA\x69 |0
-<U5110> \xBE\xAA |0
-<U5111> \xE8\xF8 |0
-<U5112> \xBE\xA7 |0
-<U5113> \xE8\xF5 |0
-<U5114> \xBE\xA9 |0
-<U5115> \xBE\xAB |0
-<U5117> \xE8\xF6 |0
-<U5118> \xBE\xA8 |0
-<U511A> \xE8\xF7 |0
-<U511C> \xE8\xF4 |0
-<U511F> \xC0\x76 |0
-<U5120> \xEC\xBD |0
-<U5121> \xC0\x77 |0
-<U5122> \xEC\xBB |0
-<U5124> \xEC\xBC |0
-<U5125> \xEC\xBA |0
-<U5126> \xEC\xB9 |0
-<U5129> \xEC\xBE |0
-<U512A> \xC0\x75 |0
-<U512B> \x92\x68 |0
-<U512D> \xEF\xB8 |0
-<U512E> \xEF\xB9 |0
-<U5130> \xE4\xE8 |0
-<U5131> \xEF\xB7 |0
-<U5132> \xC0\x78 |0
-<U5133> \xC3\x5F |0
-<U5134> \xF1\xEB |0
-<U5135> \xF1\xEC |0
-<U5137> \xC4\xD7 |0
-<U5138> \xC4\xD8 |0
-<U5139> \xF5\xC1 |0
-<U513A> \xF5\xC0 |0
-<U513B> \xC5\x6C |0
-<U513C> \xC5\x6B |0
-<U513D> \xF7\xD0 |0
-<U513F> \xA4\x49 |0
-<U5140> \xA4\x61 |0
-<U5141> \xA4\xB9 |0
-<U5143> \xA4\xB8 |0
-<U5144> \xA5\x53 |0
-<U5145> \xA5\x52 |0
-<U5146> \xA5\xFC |0
-<U5147> \xA5\xFB |0
-<U5148> \xA5\xFD |0
-<U5149> \xA5\xFA |0
-<U514B> \xA7\x4A |0
-<U514C> \xA7\x49 |0
-<U514D> \xA7\x4B |0
-<U5152> \xA8\xE0 |0
-<U5154> \xA8\xDF |0
-<U5155> \xA8\xE1 |0
-<U5156> \x89\x51 |0
-<U5157> \xAB\x5E |0
-<U5159> \xA2\x59 |0
-<U515A> \xD0\xDE |0
-<U515B> \xA2\x5A |0
-<U515C> \xB0\xC2 |0
-<U515D> \xA2\x5C |0
-<U515E> \xA2\x5B |0
-<U515F> \xD8\x60 |0
-<U5160> \xFA\x6F |0
-<U5161> \xA2\x5D |0
-<U5162> \xB9\xB8 |0
-<U5163> \xA2\x5E |0
-<U5165> \xA4\x4A |0
-<U5167> \xA4\xBA |0
-<U5168> \xA5\xFE |0
-<U5169> \xA8\xE2 |0
-<U516A> \xFA\x71 |0
-<U516B> \xA4\x4B |0
-<U516C> \xA4\xBD |0
-<U516D> \xA4\xBB |0
-<U516E> \xA4\xBC |0
-<U5171> \xA6\x40 |0
-<U5174> \x89\x52 |0
-<U5175> \xA7\x4C |0
-<U5176> \xA8\xE4 |0
-<U5177> \xA8\xE3 |0
-<U5178> \xA8\xE5 |0
-<U5179> \x94\x5A |0
-<U517C> \xAD\xDD |0
-<U5180> \xBE\xAC |0
-<U5182> \xC6\xC3 |0
-<U5186> \x89\xDD |0
-<U5187> \xC9\x4E |0
-<U5188> \xC8\xA2 |0
-<U5189> \xA5\x54 |0
-<U518A> \xA5\x55 |0
-<U518D> \xA6\x41 |0
-<U518F> \xCA\x6A |0
-<U5191> \xAB\x60 |0
-<U5192> \xAB\x5F |0
-<U5193> \xD0\xE0 |0
-<U5194> \xD0\xDF |0
-<U5195> \xB0\xC3 |0
-<U5196> \xC6\xC4 |0
-<U5197> \xA4\xBE |0
-<U5198> \xC9\x55 |0
-<U519A> \x9E\x52 |0
-<U519C> \x89\x53 |0
-<U519E> \xCB\xCD |0
-<U51A0> \xAB\x61 |0
-<U51A2> \xAD\xE0 |0
-<U51A4> \xAD\xDE |0
-<U51A5> \xAD\xDF |0
-<U51A7> \x9E\x55 |0
-<U51A8> \x92\xBA |0
-<U51AA> \xBE\xAD |0
-<U51AB> \xC6\xC5 |0
-<U51AC> \xA5\x56 |0
-<U51AE> \x8C\x5B |0
-<U51B0> \xA6\x42 |0
-<U51B1> \xC9\xBC |0
-<U51B2> \xFA\x7D |0
-<U51B3> \xFA\xA8 |0
-<U51B4> \x9A\x68 |0
-<U51B5> \xFA\x47 |0
-<U51B6> \xA7\x4D |0
-<U51B7> \xA7\x4E |0
-<U51B8> \xFA\x7E |0
-<U51B9> \xCA\x6B |0
-<U51BC> \xCB\xCE |0
-<U51BD> \xA8\xE6 |0
-<U51BE> \xCB\xCF |0
-<U51C3> \x92\xBB |0
-<U51C4> \xD0\xE2 |0
-<U51C5> \xD0\xE3 |0
-<U51C6> \xAD\xE3 |0
-<U51C7> \xFD\xB6 |0
-<U51C8> \xD0\xE4 |0
-<U51C9> \xFA\xA2 |0
-<U51CA> \xD0\xE1 |0
-<U51CB> \xAD\xE4 |0
-<U51CC> \xAD\xE2 |0
-<U51CD> \xAD\xE1 |0
-<U51CE> \xD0\xE5 |0
-<U51CF> \xFA\xA3 |0
-<U51D0> \xD4\x68 |0
-<U51D1> \xFA\xA4 |0
-<U51D2> \x9B\xB4 |0
-<U51D3> \xFA\xA6 |0
-<U51D4> \xD8\x61 |0
-<U51D7> \xDC\xC5 |0
-<U51D8> \xE1\x40 |0
-<U51DB> \x89\xDF |0
-<U51DC> \xBB\xFE |0
-<U51DD> \xBE\xAE |0
-<U51DE> \xE8\xF9 |0
-<U51DF> \xFD\xDB |0
-<U51E0> \xA4\x4C |0
-<U51E1> \xA4\x5A |0
-<U51E2> \xFA\xA9 |0
-<U51E4> \x89\x54 |0
-<U51ED> \xFA\xAB |0
-<U51F0> \xB0\xC4 |0
-<U51F1> \xB3\xCD |0
-<U51F3> \xB9\xB9 |0
-<U51F4> \xFC\x7A |0
-<U51F5> \xC9\x42 |0
-<U51F6> \xA4\xBF |0
-<U51F8> \xA5\x59 |0
-<U51F9> \xA5\x57 |0
-<U51FA> \xA5\x58 |0
-<U51FC> \x89\xE0 |0
-<U51FD> \xA8\xE7 |0
-<U51FE> \x9F\x4F |0
-<U5200> \xA4\x4D |0
-<U5201> \xA4\x4E |0
-<U5202> \xC8\x7D |0
-<U5203> \xA4\x62 |0
-<U5205> \x89\xE1 |0
-<U5206> \xA4\xC0 |0
-<U5207> \xA4\xC1 |0
-<U5208> \xA4\xC2 |0
-<U5209> \xC9\xBE |0
-<U520A> \xA5\x5A |0
-<U520B> \xFA\xB0 |0
-<U520C> \xC9\x6B |0
-<U520E> \xA6\x46 |0
-<U5210> \xC9\xBF |0
-<U5211> \xA6\x44 |0
-<U5212> \xA6\x45 |0
-<U5213> \xC9\xBD |0
-<U5216> \xA6\x47 |0
-<U5217> \xA6\x43 |0
-<U521C> \xCA\x6C |0
-<U521D> \xAA\xEC |0
-<U521E> \xCA\x6D |0
-<U521F> \x9F\xCD |0
-<U5220> \xA0\xE7 |0
-<U5221> \xCA\x6E |0
-<U5224> \xA7\x50 |0
-<U5225> \xA7\x4F |0
-<U5226> \xFA\xB1 |0
-<U5227> \x89\xA6 |0
-<U5228> \xA7\x53 |0
-<U5229> \xA7\x51 |0
-<U522A> \xA7\x52 |0
-<U522E> \xA8\xED |0
-<U5230> \xA8\xEC |0
-<U5231> \xCB\xD4 |0
-<U5232> \xCB\xD1 |0
-<U5233> \xCB\xD2 |0
-<U5234> \x9E\xFA |0
-<U5235> \xCB\xD0 |0
-<U5236> \xA8\xEE |0
-<U5237> \xA8\xEA |0
-<U5238> \xA8\xE9 |0
-<U523A> \xA8\xEB |0
-<U523B> \xA8\xE8 |0
-<U523C> \xFA\xB2 |0
-<U5241> \xA8\xEF |0
-<U5243> \xAB\x63 |0
-<U5244> \xCD\xF0 |0
-<U5246> \xCB\xD3 |0
-<U5247> \xAB\x68 |0
-<U5249> \xCD\xF1 |0
-<U524A> \xAB\x64 |0
-<U524B> \xAB\x67 |0
-<U524C> \xAB\x66 |0
-<U524D> \xAB\x65 |0
-<U524E> \xAB\x62 |0
-<U5252> \xD0\xE8 |0
-<U5254> \xAD\xE7 |0
-<U5255> \xD0\xEB |0
-<U5256> \xAD\xE5 |0
-<U5257> \xFA\xB4 |0
-<U5259> \x92\xC4 |0
-<U525A> \xD0\xE7 |0
-<U525B> \xAD\xE8 |0
-<U525C> \xAD\xE6 |0
-<U525D> \xAD\xE9 |0
-<U525E> \xD0\xE9 |0
-<U525F> \xD0\xEA |0
-<U5260> \x9F\x6F |0
-<U5261> \xD0\xE6 |0
-<U5262> \xD0\xEC |0
-<U5268> \x8B\xB0 |0
-<U5269> \xB3\xD1 |0
-<U526A> \xB0\xC5 |0
-<U526B> \xD4\x69 |0
-<U526C> \xD4\x6B |0
-<U526D> \xD4\x6A |0
-<U526E> \xD4\x6C |0
-<U526F> \xB0\xC6 |0
-<U5272> \xB3\xCE |0
-<U5273> \x9F\xAC |0
-<U5274> \xB3\xCF |0
-<U5275> \xB3\xD0 |0
-<U5277> \xB6\xD0 |0
-<U5278> \xDC\xC7 |0
-<U5279> \x89\xE3 |0
-<U527A> \xDC\xC6 |0
-<U527B> \xDC\xC8 |0
-<U527C> \xDC\xC9 |0
-<U527D> \xB6\xD1 |0
-<U527F> \xB6\xCF |0
-<U5280> \xE1\x41 |0
-<U5281> \xE1\x42 |0
-<U5282> \xB9\xBB |0
-<U5283> \xB9\xBA |0
-<U5284> \xE3\x5A |0
-<U5287> \xBC\x40 |0
-<U5288> \xBC\x41 |0
-<U5289> \xBC\x42 |0
-<U528A> \xBC\x44 |0
-<U528B> \xE4\xF2 |0
-<U528C> \xE4\xF3 |0
-<U528D> \xBC\x43 |0
-<U528F> \x9B\xD3 |0
-<U5290> \x89\xE4 |0
-<U5291> \xBE\xAF |0
-<U5293> \xBE\xB0 |0
-<U5294> \xFA\xB5 |0
-<U5296> \xF1\xED |0
-<U5297> \xF5\xC3 |0
-<U5298> \xF5\xC2 |0
-<U5299> \xF7\xD1 |0
-<U529A> \x9F\xD5 |0
-<U529B> \xA4\x4F |0
-<U529F> \xA5\x5C |0
-<U52A0> \xA5\x5B |0
-<U52A1> \x89\x55 |0
-<U52A3> \xA6\x48 |0
-<U52A4> \x92\xC5 |0
-<U52A6> \xC9\xC0 |0
-<U52A8> \x89\x56 |0
-<U52A9> \xA7\x55 |0
-<U52AA> \xA7\x56 |0
-<U52AB> \xA7\x54 |0
-<U52AC> \xA7\x57 |0
-<U52AD> \xCA\x6F |0
-<U52AE> \xCA\x70 |0
-<U52B5> \xFA\xB3 |0
-<U52B9> \xFA\xB6 |0
-<U52BB> \xA8\xF1 |0
-<U52BC> \xCB\xD5 |0
-<U52BE> \xA8\xF0 |0
-<U52C0> \xCD\xF2 |0
-<U52C1> \xAB\x6C |0
-<U52C2> \xCD\xF3 |0
-<U52C3> \xAB\x6B |0
-<U52C5> \xFA\xB7 |0
-<U52C7> \xAB\x69 |0
-<U52C9> \xAB\x6A |0
-<U52CC> \x9E\xDC |0
-<U52CD> \xD0\xED |0
-<U52D0> \xFB\xC4 |0
-<U52D1> \x9F\x71 |0
-<U52D2> \xB0\xC7 |0
-<U52D3> \xD4\x6E |0
-<U52D5> \xB0\xCA |0
-<U52D6> \xD4\x6D |0
-<U52D7> \xB1\xE5 |0
-<U52D8> \xB0\xC9 |0
-<U52D9> \xB0\xC8 |0
-<U52DB> \xB3\xD4 |0
-<U52DD> \xB3\xD3 |0
-<U52DE> \xB3\xD2 |0
-<U52DF> \xB6\xD2 |0
-<U52E0> \xFA\xBA |0
-<U52E1> \x92\xC7 |0
-<U52E2> \xB6\xD5 |0
-<U52E3> \xB6\xD6 |0
-<U52E4> \xB6\xD4 |0
-<U52E6> \xB6\xD3 |0
-<U52E9> \xE1\x43 |0
-<U52EB> \xE1\x44 |0
-<U52EF> \xE4\xF5 |0
-<U52F0> \xBC\x45 |0
-<U52F1> \xE4\xF4 |0
-<U52F3> \xBE\xB1 |0
-<U52F4> \xEC\xBF |0
-<U52F5> \xC0\x79 |0
-<U52F7> \xF1\xEE |0
-<U52F8> \xC4\x55 |0
-<U52F9> \xC6\xC6 |0
-<U52FA> \xA4\x63 |0
-<U52FB> \xA4\xC3 |0
-<U52FC> \xC9\x56 |0
-<U52FE> \xA4\xC4 |0
-<U52FF> \xA4\xC5 |0
-<U5301> \x9A\x4C |0
-<U5305> \xA5\x5D |0
-<U5306> \xA5\x5E |0
-<U5308> \xA6\x49 |0
-<U5309> \xCA\x71 |0
-<U530A> \xCB\xD6 |0
-<U530B> \xCB\xD7 |0
-<U530D> \xAB\x6D |0
-<U530E> \xD0\xEE |0
-<U530F> \xB0\xCC |0
-<U5310> \xB0\xCB |0
-<U5311> \xD8\x63 |0
-<U5312> \xD8\x62 |0
-<U5315> \xA4\x50 |0
-<U5316> \xA4\xC6 |0
-<U5317> \xA5\x5F |0
-<U5319> \xB0\xCD |0
-<U531A> \xC9\x43 |0
-<U531C> \xC9\x6C |0
-<U531D> \xA5\x60 |0
-<U531F> \xC9\xC2 |0
-<U5320> \xA6\x4B |0
-<U5321> \xA6\x4A |0
-<U5322> \xC9\xC1 |0
-<U5323> \xA7\x58 |0
-<U5324> \x8C\x68 |0
-<U5327> \x89\xE5 |0
-<U532A> \xAD\xEA |0
-<U532C> \x9F\x7D |0
-<U532D> \xD4\x6F |0
-<U532F> \xB6\xD7 |0
-<U5330> \xE1\x45 |0
-<U5331> \xB9\xBC |0
-<U5332> \xA0\xA9 |0
-<U5333> \xFA\xC4 |0
-<U5334> \xE8\xFA |0
-<U5337> \xF3\xFD |0
-<U5338> \xC6\xC7 |0
-<U5339> \xA4\xC7 |0
-<U533B> \x89\x57 |0
-<U533C> \xCB\xD8 |0
-<U533D> \xCD\xF4 |0
-<U533E> \xB0\xD0 |0
-<U533F> \xB0\xCE |0
-<U5340> \xB0\xCF |0
-<U5341> \xA4\x51 |0
-<U5341> \xA2\xCC |3
-<U5342> \xFA\xAA |0
-<U5343> \xA4\x64 |0
-<U5344> \xA2\xCD |0
-<U5345> \xA4\xCA |0
-<U5345> \xA2\xCE |3
-<U5347> \xA4\xC9 |0
-<U5348> \xA4\xC8 |0
-<U5349> \xA5\x63 |0
-<U534A> \xA5\x62 |0
-<U534C> \xC9\x6D |0
-<U534D> \xC9\xC3 |0
-<U534E> \x89\x58 |0
-<U5351> \xA8\xF5 |0
-<U5352> \xA8\xF2 |0
-<U5353> \xA8\xF4 |0
-<U5354> \xA8\xF3 |0
-<U5357> \xAB\x6E |0
-<U535A> \xB3\xD5 |0
-<U535C> \xA4\x52 |0
-<U535D> \x8B\xE3 |0
-<U535E> \xA4\xCB |0
-<U535F> \x8B\x61 |0
-<U5360> \xA5\x65 |0
-<U5361> \xA5\x64 |0
-<U5363> \xCA\x72 |0
-<U5364> \x9A\xF1 |0
-<U5366> \xA8\xF6 |0
-<U5367> \x9E\xB7 |0
-<U5369> \xC6\xC8 |0
-<U536C> \xC9\x57 |0
-<U536D> \xFA\xD1 |0
-<U536E> \xA5\x67 |0
-<U536F> \xA5\x66 |0
-<U5370> \xA6\x4C |0
-<U5371> \xA6\x4D |0
-<U5372> \xCA\x73 |0
-<U5373> \xA7\x59 |0
-<U5374> \xFA\xD2 |0
-<U5375> \xA7\x5A |0
-<U5377> \xA8\xF7 |0
-<U5378> \xA8\xF8 |0
-<U5379> \xA8\xF9 |0
-<U537B> \xAB\x6F |0
-<U537C> \xCD\xF5 |0
-<U537D> \x9E\xBA |0
-<U537E> \xFA\xD4 |0
-<U537F> \xAD\xEB |0
-<U5382> \xC9\x44 |0
-<U5384> \xA4\xCC |0
-<U538A> \xC9\xC4 |0
-<U538E> \xCA\x74 |0
-<U538F> \xCA\x75 |0
-<U5392> \xCB\xD9 |0
-<U5393> \xFA\xD9 |0
-<U5394> \xCB\xDA |0
-<U5396> \xCD\xF7 |0
-<U5397> \xCD\xF6 |0
-<U5398> \xCD\xF9 |0
-<U5399> \xCD\xF8 |0
-<U539A> \xAB\x70 |0
-<U539C> \xD4\x70 |0
-<U539D> \xAD\xED |0
-<U539E> \xD0\xEF |0
-<U539F> \xAD\xEC |0
-<U53A0> \xFA\xDB |0
-<U53A2> \x9C\xE0 |0
-<U53A4> \xD8\x64 |0
-<U53A5> \xB3\xD6 |0
-<U53A6> \xFB\xF7 |0
-<U53A7> \xD8\x65 |0
-<U53A8> \xFB\xFA |0
-<U53A9> \x89\xE7 |0
-<U53AA> \xA0\x7A |0
-<U53AB> \xFA\xDC |0
-<U53AC> \xE1\x46 |0
-<U53AD> \xB9\xBD |0
-<U53AE> \xFA\xDD |0
-<U53B0> \x89\xE9 |0
-<U53B2> \xBC\x46 |0
-<U53B4> \xF1\xEF |0
-<U53B6> \xC6\xC9 |0
-<U53B9> \xC9\x58 |0
-<U53BB> \xA5\x68 |0
-<U53C1> \xFA\xE2 |0
-<U53C2> \x89\xEB |0
-<U53C3> \xB0\xD1 |0
-<U53C5> \xFA\xE3 |0
-<U53C8> \xA4\x53 |0
-<U53C9> \xA4\x65 |0
-<U53CA> \xA4\xCE |0
-<U53CB> \xA4\xCD |0
-<U53CC> \x90\xC8 |0
-<U53CD> \xA4\xCF |0
-<U53D0> \x92\xDA |0
-<U53D1> \x89\x59 |0
-<U53D2> \x9C\xF5 |0
-<U53D4> \xA8\xFB |0
-<U53D6> \xA8\xFA |0
-<U53D7> \xA8\xFC |0
-<U53D8> \x89\x5A |0
-<U53D9> \xFA\xE7 |0
-<U53DA> \x9F\xA2 |0
-<U53DB> \xAB\x71 |0
-<U53DF> \xAD\xEE |0
-<U53E0> \xFA\xEA |0
-<U53E1> \xE8\xFB |0
-<U53E2> \xC2\x4F |0
-<U53E3> \xA4\x66 |0
-<U53E4> \xA5\x6A |0
-<U53E5> \xA5\x79 |0
-<U53E6> \xA5\x74 |0
-<U53E8> \xA5\x6F |0
-<U53E9> \xA5\x6E |0
-<U53EA> \xA5\x75 |0
-<U53EB> \xA5\x73 |0
-<U53EC> \xA5\x6C |0
-<U53ED> \xA5\x7A |0
-<U53EE> \xA5\x6D |0
-<U53EF> \xA5\x69 |0
-<U53F0> \xA5\x78 |0
-<U53F1> \xA5\x77 |0
-<U53F2> \xA5\x76 |0
-<U53F3> \xA5\x6B |0
-<U53F5> \xA5\x72 |0
-<U53F6> \xFA\xED |0
-<U53F7> \x8F\xAD |0
-<U53F8> \xA5\x71 |0
-<U53FB> \xA5\x7B |0
-<U53FC> \xA5\x70 |0
-<U53FE> \xFB\x59 |0
-<U5401> \xA6\x53 |0
-<U5403> \xA6\x59 |0
-<U5404> \xA6\x55 |0
-<U5406> \xA6\x5B |0
-<U5407> \xC9\xC5 |0
-<U5408> \xA6\x58 |0
-<U5409> \xA6\x4E |0
-<U540A> \xA6\x51 |0
-<U540B> \xA6\x54 |0
-<U540C> \xA6\x50 |0
-<U540D> \xA6\x57 |0
-<U540E> \xA6\x5A |0
-<U540F> \xA6\x4F |0
-<U5410> \xA6\x52 |0
-<U5411> \xA6\x56 |0
-<U5412> \xA6\x5C |0
-<U5413> \xFA\xEF |0
-<U5414> \x96\xEF |0
-<U5416> \x9D\xEC |0
-<U5418> \xCA\x7E |0
-<U5419> \xCA\x7B |0
-<U541A> \x9D\xCA |0
-<U541B> \xA7\x67 |0
-<U541C> \xCA\x7C |0
-<U541D> \xA7\x5B |0
-<U541E> \xA7\x5D |0
-<U541F> \xA7\x75 |0
-<U5420> \xA7\x70 |0
-<U5421> \xFD\x6D |0
-<U5423> \x89\xEC |0
-<U5424> \xCA\xA5 |0
-<U5425> \xCA\x7D |0
-<U5426> \xA7\x5F |0
-<U5427> \xA7\x61 |0
-<U5428> \xCA\xA4 |0
-<U5429> \xA7\x68 |0
-<U542A> \xCA\x78 |0
-<U542B> \xA7\x74 |0
-<U542C> \xA7\x76 |0
-<U542D> \xA7\x5C |0
-<U542E> \xA7\x6D |0
-<U542F> \xFB\x44 |0
-<U5430> \xCA\x76 |0
-<U5431> \xA7\x73 |0
-<U5432> \x9D\xE2 |0
-<U5433> \xA7\x64 |0
-<U5434> \x8C\x75 |0
-<U5435> \xA7\x6E |0
-<U5436> \xA7\x6F |0
-<U5437> \xCA\x77 |0
-<U5438> \xA7\x6C |0
-<U5439> \xA7\x6A |0
-<U543B> \xA7\x6B |0
-<U543C> \xA7\x71 |0
-<U543D> \xCA\xA1 |0
-<U543E> \xA7\x5E |0
-<U5440> \xA7\x72 |0
-<U5441> \xCA\xA3 |0
-<U5442> \xA7\x66 |0
-<U5443> \xA7\x63 |0
-<U5445> \xCA\x7A |0
-<U5446> \xA7\x62 |0
-<U5447> \xCA\xA6 |0
-<U5448> \xA7\x65 |0
-<U544A> \xA7\x69 |0
-<U544B> \x9E\xC0 |0
-<U544D> \x9E\x56 |0
-<U544E> \xA7\x60 |0
-<U544F> \xCA\xA2 |0
-<U5454> \xCA\x79 |0
-<U5460> \xCB\xEB |0
-<U5461> \xCB\xEA |0
-<U5462> \xA9\x4F |0
-<U5463> \xCB\xED |0
-<U5464> \xCB\xEF |0
-<U5465> \xCB\xE4 |0
-<U5466> \xCB\xE7 |0
-<U5467> \xCB\xEE |0
-<U5468> \xA9\x50 |0
-<U5469> \x9F\x79 |0
-<U546A> \x9A\xC7 |0
-<U546B> \xCB\xE1 |0
-<U546C> \xCB\xE5 |0
-<U546D> \xFA\xF4 |0
-<U546F> \xCB\xE9 |0
-<U5470> \xCE\x49 |0
-<U5471> \xA9\x4B |0
-<U5472> \xCE\x4D |0
-<U5473> \xA8\xFD |0
-<U5474> \xCB\xE6 |0
-<U5475> \xA8\xFE |0
-<U5476> \xA9\x4C |0
-<U5477> \xA9\x45 |0
-<U5478> \xA9\x41 |0
-<U547A> \xCB\xE2 |0
-<U547B> \xA9\x44 |0
-<U547C> \xA9\x49 |0
-<U547D> \xA9\x52 |0
-<U547E> \xCB\xE3 |0
-<U547F> \xCB\xDC |0
-<U5480> \xA9\x43 |0
-<U5481> \xCB\xDD |0
-<U5482> \xCB\xDF |0
-<U5484> \xA9\x46 |0
-<U5485> \x98\xA1 |0
-<U5486> \xA9\x48 |0
-<U5487> \xCB\xDB |0
-<U5488> \xCB\xE0 |0
-<U548B> \xA9\x51 |0
-<U548C> \xA9\x4D |0
-<U548D> \xCB\xE8 |0
-<U548E> \xA9\x53 |0
-<U548F> \xFA\xF8 |0
-<U5490> \xA9\x4A |0
-<U5491> \xCB\xDE |0
-<U5492> \xA9\x47 |0
-<U5493> \x89\xF0 |0
-<U5494> \x9E\x47 |0
-<U5495> \xA9\x42 |0
-<U5496> \xA9\x40 |0
-<U5497> \x9D\xF7 |0
-<U5498> \xCB\xEC |0
-<U549A> \xA9\x4E |0
-<U549C> \x9F\xD3 |0
-<U549E> \x9A\xCA |0
-<U54A0> \xCE\x48 |0
-<U54A1> \xCD\xFB |0
-<U54A2> \xCE\x4B |0
-<U54A3> \x89\xF1 |0
-<U54A4> \xFA\xF9 |0
-<U54A5> \xCD\xFD |0
-<U54A6> \xAB\x78 |0
-<U54A7> \xAB\xA8 |0
-<U54A8> \xAB\x74 |0
-<U54A9> \xAB\xA7 |0
-<U54AA> \xAB\x7D |0
-<U54AB> \xAB\xA4 |0
-<U54AC> \xAB\x72 |0
-<U54AD> \xCD\xFC |0
-<U54AE> \xCE\x43 |0
-<U54AF> \xAB\xA3 |0
-<U54B0> \xCE\x4F |0
-<U54B1> \xAB\xA5 |0
-<U54B2> \x8E\x5A |0
-<U54B3> \xAB\x79 |0
-<U54B4> \x89\xF2 |0
-<U54B6> \xCE\x45 |0
-<U54B7> \xCE\x42 |0
-<U54B8> \xAB\x77 |0
-<U54B9> \x89\xF3 |0
-<U54BA> \xCD\xFA |0
-<U54BB> \xAB\xA6 |0
-<U54BC> \xCE\x4A |0
-<U54BD> \xAB\x7C |0
-<U54BE> \xCE\x4C |0
-<U54BF> \xAB\xA9 |0
-<U54C0> \xAB\x73 |0
-<U54C1> \xAB\x7E |0
-<U54C2> \xAB\x7B |0
-<U54C3> \xCE\x40 |0
-<U54C4> \xAB\xA1 |0
-<U54C5> \xCE\x46 |0
-<U54C6> \xCE\x47 |0
-<U54C7> \xAB\x7A |0
-<U54C8> \xAB\xA2 |0
-<U54C9> \xAB\x76 |0
-<U54CB> \x92\x5D |0
-<U54CC> \x8B\x51 |0
-<U54CD> \x92\xE0 |0
-<U54CE> \xAB\x75 |0
-<U54CF> \xCD\xFE |0
-<U54D0> \x89\xF4 |0
-<U54D6> \xCE\x44 |0
-<U54DA> \x9F\xD4 |0
-<U54DE> \xCE\x4E |0
-<U54E0> \xD1\x44 |0
-<U54E1> \xAD\xFB |0
-<U54E2> \xD0\xF1 |0
-<U54E3> \x8A\x79 |0
-<U54E4> \xD0\xF6 |0
-<U54E5> \xAD\xF4 |0
-<U54E6> \xAE\x40 |0
-<U54E7> \xD0\xF4 |0
-<U54E8> \xAD\xEF |0
-<U54E9> \xAD\xF9 |0
-<U54EA> \xAD\xFE |0
-<U54EB> \xD0\xFB |0
-<U54ED> \xAD\xFA |0
-<U54EE> \xAD\xFD |0
-<U54EF> \x89\xF5 |0
-<U54F1> \xD0\xFE |0
-<U54F2> \xAD\xF5 |0
-<U54F3> \xD0\xF5 |0
-<U54F7> \xD1\x42 |0
-<U54F8> \xD1\x43 |0
-<U54FA> \xAD\xF7 |0
-<U54FB> \xD1\x41 |0
-<U54FC> \xAD\xF3 |0
-<U54FD> \xAE\x43 |0
-<U54FF> \xD0\xF8 |0
-<U5501> \xAD\xF1 |0
-<U5502> \x97\xA7 |0
-<U5503> \xD1\x46 |0
-<U5504> \xD0\xF9 |0
-<U5505> \xD0\xFD |0
-<U5506> \xAD\xF6 |0
-<U5507> \xAE\x42 |0
-<U5508> \xD0\xFA |0
-<U5509> \xAD\xFC |0
-<U550A> \xD1\x40 |0
-<U550B> \xD1\x47 |0
-<U550C> \xD4\xA1 |0
-<U550D> \x93\xBA |0
-<U550E> \xD1\x45 |0
-<U550F> \xAE\x44 |0
-<U5510> \xAD\xF0 |0
-<U5511> \xD0\xFC |0
-<U5512> \xD0\xF3 |0
-<U5513> \x9E\x58 |0
-<U5514> \xAD\xF8 |0
-<U5517> \xD0\xF2 |0
-<U5518> \x89\xF6 |0
-<U551A> \xD0\xF7 |0
-<U551E> \x9E\x57 |0
-<U5523> \x89\xF7 |0
-<U5525> \x8A\x41 |0
-<U5526> \xD0\xF0 |0
-<U5527> \xAE\x41 |0
-<U5528> \x89\xF8 |0
-<U552A> \xD4\x77 |0
-<U552B> \xFA\xF1 |0
-<U552C> \xB0\xE4 |0
-<U552D> \xD4\xA7 |0
-<U552E> \xB0\xE2 |0
-<U552F> \xB0\xDF |0
-<U5530> \xD4\x7C |0
-<U5531> \xB0\xDB |0
-<U5532> \xD4\xA2 |0
-<U5533> \xB0\xE6 |0
-<U5534> \xD4\x76 |0
-<U5535> \xD4\x7B |0
-<U5536> \xD4\x7A |0
-<U5537> \xAD\xF2 |0
-<U5538> \xB0\xE1 |0
-<U5539> \xD4\xA5 |0
-<U553B> \xD4\xA8 |0
-<U553C> \xD4\x73 |0
-<U553E> \xB3\xE8 |0
-<U553F> \x89\xFA |0
-<U5540> \xD4\xA9 |0
-<U5541> \xB0\xE7 |0
-<U5543> \xB0\xD9 |0
-<U5544> \xB0\xD6 |0
-<U5545> \xD4\x7E |0
-<U5546> \xB0\xD3 |0
-<U5547> \xFB\x42 |0
-<U5548> \xD4\xA6 |0
-<U5549> \xFA\xBF |0
-<U554A> \xB0\xDA |0
-<U554B> \xD4\xAA |0
-<U554D> \xD4\x74 |0
-<U554E> \xD4\xA4 |0
-<U554F> \xB0\xDD |0
-<U5550> \xD4\x75 |0
-<U5551> \xD4\x78 |0
-<U5552> \xD4\x7D |0
-<U5553> \xFB\xA3 |0
-<U5555> \xB0\xDE |0
-<U5556> \xB0\xDC |0
-<U5557> \xB0\xE8 |0
-<U555C> \xB0\xE3 |0
-<U555D> \xFA\xF7 |0
-<U555E> \xB0\xD7 |0
-<U555F> \xB1\xD2 |0
-<U5561> \xB0\xD8 |0
-<U5562> \xD4\x79 |0
-<U5563> \xB0\xE5 |0
-<U5564> \xB0\xE0 |0
-<U5565> \xD4\xA3 |0
-<U5566> \xB0\xD5 |0
-<U5569> \x9E\x4E |0
-<U556A> \xB0\xD4 |0
-<U556B> \x94\xDC |0
-<U5571> \x95\xDA |0
-<U5572> \x9D\xF8 |0
-<U5573> \x9F\x6A |0
-<U5575> \xD4\x71 |0
-<U5576> \xD4\x72 |0
-<U5577> \xD8\x6A |0
-<U5579> \x8A\xB7 |0
-<U557B> \xB3\xD7 |0
-<U557C> \xB3\xDA |0
-<U557D> \xD8\x75 |0
-<U557E> \xB3\xEE |0
-<U557F> \xD8\x78 |0
-<U5580> \xB3\xD8 |0
-<U5581> \xD8\x71 |0
-<U5582> \xB3\xDE |0
-<U5583> \xB3\xE4 |0
-<U5584> \xB5\xBD |0
-<U5586> \xFB\x46 |0
-<U5587> \xB3\xE2 |0
-<U5588> \xD8\x6E |0
-<U5589> \xB3\xEF |0
-<U558A> \xB3\xDB |0
-<U558B> \xB3\xE3 |0
-<U558C> \xD8\x76 |0
-<U558D> \xDC\xD7 |0
-<U558E> \xD8\x7B |0
-<U558F> \xD8\x6F |0
-<U5590> \x8A\x46 |0
-<U5591> \xD8\x66 |0
-<U5592> \xD8\x73 |0
-<U5593> \xD8\x6D |0
-<U5594> \xB3\xE1 |0
-<U5595> \xD8\x79 |0
-<U5598> \xB3\xDD |0
-<U5599> \xB3\xF1 |0
-<U559A> \xB3\xEA |0
-<U559C> \xB3\xDF |0
-<U559D> \xB3\xDC |0
-<U559F> \xB3\xE7 |0
-<U55A1> \xD8\x7A |0
-<U55A2> \xD8\x6C |0
-<U55A3> \xD8\x72 |0
-<U55A4> \xD8\x74 |0
-<U55A5> \xD8\x68 |0
-<U55A6> \xD8\x77 |0
-<U55A7> \xB3\xD9 |0
-<U55A8> \xD8\x67 |0
-<U55A9> \xFB\x47 |0
-<U55AA> \xB3\xE0 |0
-<U55AB> \xB3\xF0 |0
-<U55AC> \xB3\xEC |0
-<U55AD> \xD8\x69 |0
-<U55AE> \xB3\xE6 |0
-<U55B0> \x91\x48 |0
-<U55B1> \xB3\xED |0
-<U55B2> \xB3\xE9 |0
-<U55B3> \xB3\xE5 |0
-<U55B4> \x92\xDE |0
-<U55B5> \xD8\x70 |0
-<U55B9> \x8B\x53 |0
-<U55BA> \x9D\xF6 |0
-<U55BB> \xB3\xEB |0
-<U55BC> \x9B\xDA |0
-<U55BF> \xDC\xD5 |0
-<U55C0> \xDC\xD1 |0
-<U55C1> \x9D\x7E |0
-<U55C2> \xDC\xE0 |0
-<U55C3> \xDC\xCA |0
-<U55C4> \xDC\xD3 |0
-<U55C5> \xB6\xE5 |0
-<U55C6> \xB6\xE6 |0
-<U55C7> \xB6\xDE |0
-<U55C8> \xDC\xDC |0
-<U55C9> \xB6\xE8 |0
-<U55CA> \xDC\xCF |0
-<U55CB> \xDC\xCE |0
-<U55CC> \xDC\xCC |0
-<U55CD> \xDC\xDE |0
-<U55CE> \xB6\xDC |0
-<U55CF> \xDC\xD8 |0
-<U55D0> \xDC\xCD |0
-<U55D1> \xB6\xDF |0
-<U55D2> \xDC\xD6 |0
-<U55D3> \xB6\xDA |0
-<U55D4> \xDC\xD2 |0
-<U55D5> \xDC\xD9 |0
-<U55D6> \xDC\xDB |0
-<U55D7> \x89\xFD |0
-<U55D8> \x99\xE4 |0
-<U55D9> \xDC\xDF |0
-<U55DA> \xB6\xE3 |0
-<U55DB> \xDC\xCB |0
-<U55DC> \xB6\xDD |0
-<U55DD> \xDC\xD0 |0
-<U55DE> \x9E\x43 |0
-<U55DF> \xB6\xD8 |0
-<U55E1> \xB6\xE4 |0
-<U55E2> \xDC\xDA |0
-<U55E3> \xB6\xE0 |0
-<U55E4> \xB6\xE1 |0
-<U55E5> \xB6\xE7 |0
-<U55E6> \xB6\xDB |0
-<U55E7> \xA2\x5F |0
-<U55E8> \xB6\xD9 |0
-<U55E9> \xDC\xD4 |0
-<U55EA> \x9D\xE9 |0
-<U55EC> \x8F\x52 |0
-<U55EF> \xB6\xE2 |0
-<U55F0> \x9D\xF5 |0
-<U55F1> \x9D\xF0 |0
-<U55F2> \xDC\xDD |0
-<U55F5> \x99\xE7 |0
-<U55F6> \xB9\xCD |0
-<U55F7> \xB9\xC8 |0
-<U55F9> \xE1\x55 |0
-<U55FA> \xE1\x51 |0
-<U55FB> \x8B\xBD |0
-<U55FC> \xE1\x4B |0
-<U55FD> \xB9\xC2 |0
-<U55FE> \xB9\xBE |0
-<U55FF> \xE1\x54 |0
-<U5600> \xB9\xBF |0
-<U5601> \xE1\x4E |0
-<U5602> \xE1\x50 |0
-<U5604> \xE1\x53 |0
-<U5605> \x9D\xEF |0
-<U5606> \xB9\xC4 |0
-<U5608> \xB9\xCB |0
-<U5609> \xB9\xC5 |0
-<U560C> \xE1\x49 |0
-<U560D> \xB9\xC6 |0
-<U560E> \xB9\xC7 |0
-<U560F> \xE1\x4C |0
-<U5610> \xB9\xCC |0
-<U5611> \x9F\xB7 |0
-<U5612> \xE1\x4A |0
-<U5613> \xE1\x4F |0
-<U5614> \xB9\xC3 |0
-<U5615> \xE1\x48 |0
-<U5616> \xB9\xC9 |0
-<U5617> \xB9\xC1 |0
-<U561B> \xB9\xC0 |0
-<U561C> \xE1\x4D |0
-<U561D> \xE1\x52 |0
-<U561E> \x9D\xD0 |0
-<U561F> \xB9\xCA |0
-<U5620> \x9F\xEB |0
-<U5621> \x8D\xA9 |0
-<U5622> \x9D\xCF |0
-<U5623> \x98\xE1 |0
-<U5625> \x9D\xE5 |0
-<U5627> \xE1\x47 |0
-<U5629> \xBC\x4D |0
-<U562A> \xE5\x47 |0
-<U562C> \xE5\x44 |0
-<U562D> \x9D\xC8 |0
-<U562E> \xBC\x47 |0
-<U562F> \xBC\x53 |0
-<U5630> \xBC\x54 |0
-<U5632> \xBC\x4A |0
-<U5633> \xE5\x42 |0
-<U5634> \xBC\x4C |0
-<U5635> \xE4\xF9 |0
-<U5636> \xBC\x52 |0
-<U5637> \xFB\x4F |0
-<U5638> \xE5\x46 |0
-<U5639> \xBC\x49 |0
-<U563A> \xE5\x48 |0
-<U563B> \xBC\x48 |0
-<U563D> \xE5\x43 |0
-<U563E> \xE5\x45 |0
-<U563F> \xBC\x4B |0
-<U5640> \xE5\x41 |0
-<U5641> \xE4\xFA |0
-<U5642> \xE4\xF7 |0
-<U5643> \x9D\xEB |0
-<U5645> \xD8\x6B |0
-<U5646> \xE4\xFD |0
-<U5648> \xE4\xF6 |0
-<U5649> \xE4\xFC |0
-<U564A> \xE4\xFB |0
-<U564C> \xE4\xF8 |0
-<U564D> \xFB\x54 |0
-<U564E> \xBC\x4F |0
-<U564F> \xFB\x55 |0
-<U5650> \x9A\xA2 |0
-<U5652> \x8A\xD6 |0
-<U5653> \xBC\x4E |0
-<U5654> \x9A\x5F |0
-<U5657> \xBC\x50 |0
-<U5658> \xE4\xFE |0
-<U5659> \xBE\xB2 |0
-<U565A> \xE5\x40 |0
-<U565D> \x9E\xF5 |0
-<U565E> \xE9\x45 |0
-<U5660> \xE8\xFD |0
-<U5661> \x8F\xB7 |0
-<U5662> \xBE\xBE |0
-<U5663> \xE9\x42 |0
-<U5664> \xBE\xB6 |0
-<U5665> \xBE\xBA |0
-<U5666> \xE9\x41 |0
-<U5668> \xBE\xB9 |0
-<U5669> \xBE\xB5 |0
-<U566A> \xBE\xB8 |0
-<U566B> \xBE\xB3 |0
-<U566C> \xBE\xBD |0
-<U566D> \xE9\x43 |0
-<U566E> \xE8\xFE |0
-<U566F> \xBE\xBC |0
-<U5670> \xE8\xFC |0
-<U5671> \xBE\xBB |0
-<U5672> \xE9\x44 |0
-<U5673> \xE9\x40 |0
-<U5674> \xBC\x51 |0
-<U5676> \xBE\xBF |0
-<U5677> \xE9\x46 |0
-<U5678> \xBE\xB7 |0
-<U5679> \xBE\xB4 |0
-<U567A> \x9A\xD2 |0
-<U567B> \x9E\x6A |0
-<U567C> \x9E\xE8 |0
-<U567E> \xEC\xC6 |0
-<U567F> \xEC\xC8 |0
-<U5680> \xC0\x7B |0
-<U5681> \xEC\xC9 |0
-<U5682> \xEC\xC7 |0
-<U5683> \xEC\xC5 |0
-<U5684> \xEC\xC4 |0
-<U5685> \xC0\x7D |0
-<U5686> \xEC\xC3 |0
-<U5687> \xC0\x7E |0
-<U5689> \x8B\xBF |0
-<U568A> \x91\xC2 |0
-<U568B> \x9D\x62 |0
-<U568C> \xEC\xC1 |0
-<U568D> \xEC\xC2 |0
-<U568E> \xC0\x7A |0
-<U568F> \xC0\xA1 |0
-<U5690> \xC0\x7C |0
-<U5692> \x92\x60 |0
-<U5693> \xEC\xC0 |0
-<U5695> \xC2\x50 |0
-<U5697> \xEF\xBC |0
-<U5698> \xEF\xBA |0
-<U5699> \xEF\xBF |0
-<U569A> \xEF\xBD |0
-<U569C> \xEF\xBB |0
-<U569D> \xEF\xBE |0
-<U569E> \x92\x5E |0
-<U569F> \x91\xC1 |0
-<U56A1> \x8A\xC5 |0
-<U56A4> \x97\xA3 |0
-<U56A5> \xC3\x60 |0
-<U56A6> \xF1\xF2 |0
-<U56A7> \xF1\xF3 |0
-<U56A8> \xC4\x56 |0
-<U56AA> \xF1\xF4 |0
-<U56AB> \xF1\xF0 |0
-<U56AC> \xF1\xF5 |0
-<U56AD> \xF1\xF1 |0
-<U56AE> \xC2\x51 |0
-<U56AF> \x8B\x6C |0
-<U56B1> \x8D\x7E |0
-<U56B2> \xF3\xFE |0
-<U56B3> \xF4\x41 |0
-<U56B4> \xC4\x59 |0
-<U56B5> \xF4\x40 |0
-<U56B6> \xC4\x58 |0
-<U56B7> \xC4\x57 |0
-<U56B9> \x9C\x54 |0
-<U56BC> \xC4\x5A |0
-<U56BD> \xF5\xC5 |0
-<U56BE> \xF5\xC6 |0
-<U56BF> \x9D\xBD |0
-<U56C0> \xC4\xDA |0
-<U56C1> \xC4\xD9 |0
-<U56C2> \xC4\xDB |0
-<U56C3> \xF5\xC4 |0
-<U56C5> \xF6\xD8 |0
-<U56C6> \xF6\xD7 |0
-<U56C8> \xC5\x6D |0
-<U56C9> \xC5\x6F |0
-<U56CA> \xC5\x6E |0
-<U56CB> \xF6\xD9 |0
-<U56CC> \xC5\xC8 |0
-<U56CD> \xF8\xA6 |0
-<U56D1> \xC5\xF1 |0
-<U56D3> \xF8\xA5 |0
-<U56D4> \xF8\xEE |0
-<U56D6> \x9C\xC5 |0
-<U56D7> \xC9\x49 |0
-<U56DA> \xA5\x7D |0
-<U56DB> \xA5\x7C |0
-<U56DD> \xA6\x5F |0
-<U56DE> \xA6\x5E |0
-<U56DF> \xC9\xC7 |0
-<U56E0> \xA6\x5D |0
-<U56E1> \xC9\xC6 |0
-<U56E2> \x89\x5B |0
-<U56E4> \xA7\x79 |0
-<U56E5> \xCA\xA9 |0
-<U56E7> \xCA\xA8 |0
-<U56EA> \xA7\x77 |0
-<U56EB> \xA7\x7A |0
-<U56ED> \xFB\x5C |0
-<U56EE> \xCA\xA7 |0
-<U56EF> \xFB\x5B |0
-<U56F0> \xA7\x78 |0
-<U56F1> \xFB\x57 |0
-<U56F7> \xCB\xF0 |0
-<U56F9> \xCB\xF1 |0
-<U56FA> \xA9\x54 |0
-<U56FD> \x98\xC7 |0
-<U56FF> \xAB\xAA |0
-<U5700> \xFB\x5A |0
-<U5701> \xD1\x48 |0
-<U5702> \xD1\x49 |0
-<U5703> \xAE\x45 |0
-<U5704> \xAE\x46 |0
-<U5707> \xD4\xAC |0
-<U5708> \xB0\xE9 |0
-<U5709> \xB0\xEB |0
-<U570A> \xD4\xAB |0
-<U570B> \xB0\xEA |0
-<U570C> \xD8\x7C |0
-<U570D> \xB3\xF2 |0
-<U5712> \xB6\xE9 |0
-<U5713> \xB6\xEA |0
-<U5714> \xDC\xE1 |0
-<U5715> \x9C\xEE |0
-<U5716> \xB9\xCF |0
-<U5718> \xB9\xCE |0
-<U571A> \xE5\x49 |0
-<U571B> \xE9\x48 |0
-<U571C> \xE9\x47 |0
-<U571D> \x92\xE2 |0
-<U571E> \xF9\x6B |0
-<U571F> \xA4\x67 |0
-<U5720> \xC9\x59 |0
-<U5722> \xC9\x6E |0
-<U5723> \xC9\x6F |0
-<U5728> \xA6\x62 |0
-<U5729> \xA6\x66 |0
-<U572A> \xC9\xC9 |0
-<U572C> \xA6\x64 |0
-<U572D> \xA6\x63 |0
-<U572E> \xC9\xC8 |0
-<U572F> \xA6\x65 |0
-<U5730> \xA6\x61 |0
-<U5732> \x94\xA7 |0
-<U5733> \xA6\x60 |0
-<U5734> \xC9\xCA |0
-<U573B> \xA7\xA6 |0
-<U573D> \x8C\xCC |0
-<U573E> \xA7\xA3 |0
-<U573F> \x9B\xD4 |0
-<U5740> \xA7\x7D |0
-<U5741> \xCA\xAA |0
-<U5742> \xFB\x64 |0
-<U5743> \xFB\x76 |0
-<U5745> \xCA\xAB |0
-<U5746> \xFB\x60 |0
-<U5747> \xA7\xA1 |0
-<U5749> \xCA\xAD |0
-<U574A> \xA7\x7B |0
-<U574B> \xCA\xAE |0
-<U574C> \xCA\xAC |0
-<U574D> \xA7\x7E |0
-<U574E> \xA7\xA2 |0
-<U574F> \xA7\xA5 |0
-<U5750> \xA7\xA4 |0
-<U5751> \xA7\x7C |0
-<U5752> \xCA\xAF |0
-<U5754> \x99\xE5 |0
-<U5757> \x9A\xC2 |0
-<U575B> \x91\xFB |0
-<U575F> \xA0\x73 |0
-<U5761> \xA9\x59 |0
-<U5762> \xCB\xFE |0
-<U5764> \xA9\x5B |0
-<U5766> \xA9\x5A |0
-<U5767> \x9F\x72 |0
-<U5768> \xCC\x40 |0
-<U5769> \xA9\x58 |0
-<U576A> \xA9\x57 |0
-<U576B> \xCB\xF5 |0
-<U576D> \xCB\xF4 |0
-<U576F> \xCB\xF2 |0
-<U5770> \xCB\xF7 |0
-<U5771> \xCB\xF6 |0
-<U5772> \xCB\xF3 |0
-<U5773> \xCB\xFC |0
-<U5774> \xCB\xFD |0
-<U5775> \xCB\xFA |0
-<U5776> \xCB\xF8 |0
-<U5777> \xA9\x56 |0
-<U577A> \x9F\xCC |0
-<U577B> \xCB\xFB |0
-<U577C> \xA9\x5C |0
-<U577D> \xCC\x41 |0
-<U577E> \x98\xA5 |0
-<U577F> \x92\xE8 |0
-<U5780> \xCB\xF9 |0
-<U5782> \xAB\xAB |0
-<U5783> \xA9\x55 |0
-<U5788> \x9B\xBC |0
-<U578A> \x96\xF3 |0
-<U578B> \xAB\xAC |0
-<U578C> \xCE\x54 |0
-<U578D> \x92\xE7 |0
-<U578F> \xCE\x5A |0
-<U5790> \xFC\x67 |0
-<U5793> \xAB\xB2 |0
-<U5794> \xCE\x58 |0
-<U5795> \xCE\x5E |0
-<U5797> \xCE\x55 |0
-<U5798> \xCE\x59 |0
-<U5799> \xCE\x5B |0
-<U579A> \xCE\x5D |0
-<U579B> \xCE\x57 |0
-<U579C> \x8B\x7D |0
-<U579D> \xCE\x56 |0
-<U579E> \xCE\x51 |0
-<U579F> \xCE\x52 |0
-<U57A0> \xAB\xAD |0
-<U57A1> \x9B\xF4 |0
-<U57A2> \xAB\xAF |0
-<U57A3> \xAB\xAE |0
-<U57A4> \xCE\x53 |0
-<U57A5> \xCE\x5C |0
-<U57A7> \x9E\xF7 |0
-<U57AA> \x9E\xC1 |0
-<U57AE> \xAB\xB1 |0
-<U57B4> \x99\x6F |0
-<U57B5> \xCE\x50 |0
-<U57B6> \xD1\x53 |0
-<U57B8> \xD1\x52 |0
-<U57B9> \xD1\x57 |0
-<U57BA> \xD1\x4E |0
-<U57BB> \x96\xF1 |0
-<U57BC> \xD1\x51 |0
-<U57BD> \xD1\x50 |0
-<U57BE> \x8E\x41 |0
-<U57BF> \xD1\x54 |0
-<U57C1> \xD1\x58 |0
-<U57C2> \xAE\x47 |0
-<U57C3> \xAE\x4A |0
-<U57C4> \x95\x4A |0
-<U57C6> \xD1\x4F |0
-<U57C7> \xD1\x55 |0
-<U57C8> \x97\xE6 |0
-<U57CB> \xAE\x49 |0
-<U57CC> \xD1\x4A |0
-<U57CE> \xAB\xB0 |0
-<U57CF> \xD4\xBA |0
-<U57D0> \xD1\x56 |0
-<U57D2> \xD1\x4D |0
-<U57D4> \xAE\x48 |0
-<U57D5> \xD1\x4C |0
-<U57D7> \x96\xF5 |0
-<U57DC> \xD4\xB1 |0
-<U57DD> \x92\xE6 |0
-<U57DE> \x9F\x42 |0
-<U57DF> \xB0\xEC |0
-<U57E0> \xB0\xF0 |0
-<U57E1> \xD4\xC1 |0
-<U57E2> \xD4\xAF |0
-<U57E3> \xD4\xBD |0
-<U57E4> \xB0\xF1 |0
-<U57E5> \xD4\xBF |0
-<U57E6> \xFB\x67 |0
-<U57E7> \xD4\xC5 |0
-<U57E9> \xD4\xC9 |0
-<U57EC> \xD4\xC0 |0
-<U57ED> \xD4\xB4 |0
-<U57EE> \xD4\xBC |0
-<U57EF> \x99\xA9 |0
-<U57F0> \xD4\xCA |0
-<U57F1> \xD4\xC8 |0
-<U57F2> \xD4\xBE |0
-<U57F3> \xD4\xB9 |0
-<U57F4> \xD4\xB2 |0
-<U57F5> \xD8\xA6 |0
-<U57F6> \xD4\xB0 |0
-<U57F7> \xB0\xF5 |0
-<U57F8> \xD4\xB7 |0
-<U57F9> \xB0\xF6 |0
-<U57FA> \xB0\xF2 |0
-<U57FB> \xD4\xAD |0
-<U57FC> \xD4\xC3 |0
-<U57FD> \xD4\xB5 |0
-<U57FE> \xFA\xE6 |0
-<U5800> \xD4\xB3 |0
-<U5801> \xD4\xC6 |0
-<U5802> \xB0\xF3 |0
-<U5803> \xFB\x69 |0
-<U5804> \xD4\xCC |0
-<U5805> \xB0\xED |0
-<U5806> \xB0\xEF |0
-<U5807> \xD4\xBB |0
-<U5808> \xD4\xB6 |0
-<U5809> \xAE\x4B |0
-<U580A> \xB0\xEE |0
-<U580B> \xD4\xB8 |0
-<U580C> \xD4\xC7 |0
-<U580D> \xD4\xCB |0
-<U580E> \xD4\xC2 |0
-<U5810> \xD4\xC4 |0
-<U5812> \x97\xE5 |0
-<U5814> \xD4\xAE |0
-<U5819> \xD8\xA1 |0
-<U581B> \xD8\xAA |0
-<U581C> \xD8\xA9 |0
-<U581D> \xB3\xFA |0
-<U581E> \xD8\xA2 |0
-<U5820> \xB3\xFB |0
-<U5821> \xB3\xF9 |0
-<U5822> \x96\x7D |0
-<U5823> \xD8\xA4 |0
-<U5824> \xB3\xF6 |0
-<U5825> \xD8\xA8 |0
-<U5826> \xFB\x6C |0
-<U5827> \xD8\xA3 |0
-<U5828> \xD8\xA5 |0
-<U5829> \xD8\x7D |0
-<U582A> \xB3\xF4 |0
-<U582C> \xD8\xB2 |0
-<U582D> \xD8\xB1 |0
-<U582E> \xD8\xAE |0
-<U582F> \xB3\xF3 |0
-<U5830> \xB3\xF7 |0
-<U5831> \xB3\xF8 |0
-<U5832> \xD1\x4B |0
-<U5833> \xD8\xAB |0
-<U5834> \xB3\xF5 |0
-<U5835> \xB0\xF4 |0
-<U5836> \xD8\xAD |0
-<U5837> \xD8\x7E |0
-<U5838> \xD8\xB0 |0
-<U5839> \xD8\xAF |0
-<U583A> \x99\xA2 |0
-<U583B> \xD8\xB3 |0
-<U583D> \xDC\xEF |0
-<U583F> \xD8\xAC |0
-<U5840> \x9A\xBB |0
-<U5844> \x9A\x65 |0
-<U5847> \x94\x4E |0
-<U5848> \xD8\xA7 |0
-<U5849> \xDC\xE7 |0
-<U584A> \xB6\xF4 |0
-<U584B> \xB6\xF7 |0
-<U584C> \xB6\xF2 |0
-<U584D> \xDC\xE6 |0
-<U584E> \xDC\xEA |0
-<U584F> \xDC\xE5 |0
-<U5851> \xB6\xEC |0
-<U5852> \xB6\xF6 |0
-<U5853> \xDC\xE2 |0
-<U5854> \xB6\xF0 |0
-<U5855> \xDC\xE9 |0
-<U5857> \xB6\xEE |0
-<U5858> \xB6\xED |0
-<U5859> \xDC\xEC |0
-<U585A> \xB6\xEF |0
-<U585B> \xDC\xEE |0
-<U585C> \xFB\x6E |0
-<U585D> \xDC\xEB |0
-<U585E> \xB6\xEB |0
-<U585F> \x99\xDF |0
-<U5862> \xB6\xF5 |0
-<U5863> \xDC\xF0 |0
-<U5864> \xDC\xE4 |0
-<U5865> \xDC\xED |0
-<U5868> \xDC\xE3 |0
-<U5869> \x98\xE3 |0
-<U586B> \xB6\xF1 |0
-<U586C> \x92\x54 |0
-<U586D> \xB6\xF3 |0
-<U586F> \xDC\xE8 |0
-<U5871> \xDC\xF1 |0
-<U5872> \x96\x7B |0
-<U5873> \x8A\xAF |0
-<U5874> \xE1\x5D |0
-<U5875> \xB9\xD0 |0
-<U5876> \xE1\x63 |0
-<U5879> \xB9\xD5 |0
-<U587A> \xE1\x5F |0
-<U587B> \xE1\x66 |0
-<U587C> \xE1\x57 |0
-<U587D> \xB9\xD7 |0
-<U587E> \xB9\xD1 |0
-<U587F> \xE1\x5C |0
-<U5880> \xBC\x55 |0
-<U5881> \xE1\x5B |0
-<U5882> \xE1\x64 |0
-<U5883> \xB9\xD2 |0
-<U5885> \xB9\xD6 |0
-<U5886> \xE1\x5A |0
-<U5887> \xE1\x60 |0
-<U5888> \xE1\x65 |0
-<U5889> \xE1\x56 |0
-<U588A> \xB9\xD4 |0
-<U588B> \xE1\x5E |0
-<U588E> \xE1\x62 |0
-<U588F> \xE1\x68 |0
-<U5890> \xE1\x58 |0
-<U5891> \xE1\x61 |0
-<U5892> \x8C\x77 |0
-<U5893> \xB9\xD3 |0
-<U5894> \xE1\x67 |0
-<U5898> \xE1\x59 |0
-<U5899> \x8B\xAF |0
-<U589A> \x9E\xBD |0
-<U589C> \xBC\x59 |0
-<U589D> \xE5\x4B |0
-<U589E> \xBC\x57 |0
-<U589F> \xBC\x56 |0
-<U58A0> \xE5\x4D |0
-<U58A1> \xE5\x52 |0
-<U58A3> \xE5\x4E |0
-<U58A5> \xE5\x51 |0
-<U58A6> \xBC\x5C |0
-<U58A7> \x9E\xE6 |0
-<U58A8> \xBE\xA5 |0
-<U58A9> \xBC\x5B |0
-<U58AA> \xFB\x6F |0
-<U58AB> \xE5\x4A |0
-<U58AC> \xE5\x50 |0
-<U58AE> \xBC\x5A |0
-<U58AF> \xE5\x4F |0
-<U58B0> \x8E\xE1 |0
-<U58B1> \xE5\x4C |0
-<U58B3> \xBC\x58 |0
-<U58B5> \x9B\x7D |0
-<U58B6> \x9C\x7E |0
-<U58BA> \xE9\x4D |0
-<U58BB> \xF9\xD9 |0
-<U58BC> \xE9\x4F |0
-<U58BD> \xE9\x4A |0
-<U58BE> \xBE\xC1 |0
-<U58BF> \xE9\x4C |0
-<U58C1> \xBE\xC0 |0
-<U58C2> \xE9\x4E |0
-<U58C5> \xBE\xC3 |0
-<U58C6> \xE9\x50 |0
-<U58C7> \xBE\xC2 |0
-<U58C8> \xE9\x49 |0
-<U58C9> \xE9\x4B |0
-<U58CB> \x92\xEA |0
-<U58CE> \xC0\xA5 |0
-<U58CF> \xEC\xCC |0
-<U58D0> \x8C\x78 |0
-<U58D1> \xC0\xA4 |0
-<U58D2> \xEC\xCD |0
-<U58D3> \xC0\xA3 |0
-<U58D4> \xEC\xCB |0
-<U58D5> \xC0\xA2 |0
-<U58D6> \xEC\xCA |0
-<U58D8> \xC2\x53 |0
-<U58D9> \xC2\x52 |0
-<U58DA> \xF1\xF6 |0
-<U58DB> \xF1\xF8 |0
-<U58DC> \xFB\x72 |0
-<U58DD> \xF1\xF7 |0
-<U58DE> \xC3\x61 |0
-<U58DF> \xC3\x62 |0
-<U58E0> \xFB\x71 |0
-<U58E2> \xC3\x63 |0
-<U58E3> \xF4\x42 |0
-<U58E4> \xC4\x5B |0
-<U58E7> \xF7\xD3 |0
-<U58E8> \xF7\xD2 |0
-<U58E9> \xC5\xF2 |0
-<U58EB> \xA4\x68 |0
-<U58EC> \xA4\xD0 |0
-<U58EF> \xA7\xA7 |0
-<U58F0> \x89\x5C |0
-<U58F2> \x98\xF0 |0
-<U58F3> \x96\xF2 |0
-<U58F4> \xCE\x5F |0
-<U58F9> \xB3\xFC |0
-<U58FA> \xB3\xFD |0
-<U58FB> \xFB\x74 |0
-<U58FC> \xDC\xF2 |0
-<U58FD> \xB9\xD8 |0
-<U58FE> \xE1\x69 |0
-<U58FF> \xE5\x53 |0
-<U5902> \x8B\xC1 |0
-<U5903> \xC9\x5A |0
-<U5904> \x89\x5D |0
-<U5905> \x89\xDE |0
-<U5906> \xCA\xB0 |0
-<U5907> \x89\x5E |0
-<U590A> \xC6\xCA |0
-<U590C> \xCC\x42 |0
-<U590D> \xCE\x60 |0
-<U590E> \xD1\x59 |0
-<U590F> \xAE\x4C |0
-<U5911> \xFE\x42 |0
-<U5912> \xF1\xF9 |0
-<U5914> \xC4\xDC |0
-<U5915> \xA4\x69 |0
-<U5916> \xA5\x7E |0
-<U5917> \xC9\x70 |0
-<U5919> \xA6\x67 |0
-<U591A> \xA6\x68 |0
-<U591C> \xA9\x5D |0
-<U591F> \xFB\x7B |0
-<U5920> \xB0\xF7 |0
-<U5922> \xB9\xDA |0
-<U5924> \xB9\xDB |0
-<U5925> \xB9\xD9 |0
-<U5927> \xA4\x6A |0
-<U5929> \xA4\xD1 |0
-<U592A> \xA4\xD3 |0
-<U592B> \xA4\xD2 |0
-<U592C> \xC9\x5B |0
-<U592D> \xA4\xD4 |0
-<U592E> \xA5\xA1 |0
-<U592F> \xC9\x71 |0
-<U5931> \xA5\xA2 |0
-<U5932> \x89\x5F |0
-<U5934> \x89\x60 |0
-<U5937> \xA6\x69 |0
-<U5938> \xA6\x6A |0
-<U593C> \xC9\xCB |0
-<U593E> \xA7\xA8 |0
-<U5940> \xCA\xB1 |0
-<U5944> \xA9\x61 |0
-<U5945> \xCC\x43 |0
-<U5947> \xA9\x5F |0
-<U5948> \xA9\x60 |0
-<U5949> \xA9\x5E |0
-<U594A> \xD1\x5A |0
-<U594E> \xAB\xB6 |0
-<U594F> \xAB\xB5 |0
-<U5950> \xAB\xB7 |0
-<U5951> \xAB\xB4 |0
-<U5953> \xCE\x61 |0
-<U5954> \xA9\x62 |0
-<U5955> \xAB\xB3 |0
-<U5957> \xAE\x4D |0
-<U5958> \xAE\x4E |0
-<U595A> \xAE\x4F |0
-<U595C> \xD4\xCD |0
-<U5960> \xB3\xFE |0
-<U5961> \xD8\xB4 |0
-<U5962> \xB0\xF8 |0
-<U5965> \x9B\xCD |0
-<U5967> \xB6\xF8 |0
-<U5969> \xB9\xDD |0
-<U596A> \xB9\xDC |0
-<U596B> \xE1\x6A |0
-<U596D> \xBC\x5D |0
-<U596E> \xBE\xC4 |0
-<U5970> \xEF\xC0 |0
-<U5971> \xF6\xDA |0
-<U5972> \xF7\xD4 |0
-<U5973> \xA4\x6B |0
-<U5974> \xA5\xA3 |0
-<U5975> \x9D\xD3 |0
-<U5976> \xA5\xA4 |0
-<U5977> \xC9\xD1 |0
-<U5978> \xA6\x6C |0
-<U5979> \xA6\x6F |0
-<U597B> \xC9\xCF |0
-<U597C> \xC9\xCD |0
-<U597D> \xA6\x6E |0
-<U597E> \xC9\xD0 |0
-<U597F> \xC9\xD2 |0
-<U5980> \xC9\xCC |0
-<U5981> \xA6\x71 |0
-<U5982> \xA6\x70 |0
-<U5983> \xA6\x6D |0
-<U5984> \xA6\x6B |0
-<U5985> \xC9\xCE |0
-<U5989> \x98\x4C |0
-<U598A> \xA7\xB3 |0
-<U598D> \xA7\xB0 |0
-<U598E> \xCA\xB6 |0
-<U598F> \xCA\xB9 |0
-<U5990> \xCA\xB8 |0
-<U5992> \xA7\xAA |0
-<U5993> \xA7\xB2 |0
-<U5994> \x97\x52 |0
-<U5996> \xA7\xAF |0
-<U5997> \xCA\xB5 |0
-<U5998> \xCA\xB3 |0
-<U5999> \xA7\xAE |0
-<U599A> \x95\xC3 |0
-<U599D> \xA7\xA9 |0
-<U599E> \xA7\xAC |0
-<U599F> \x9B\xB6 |0
-<U59A0> \xCA\xB4 |0
-<U59A1> \xCA\xBB |0
-<U59A2> \xCA\xB7 |0
-<U59A3> \xA7\xAD |0
-<U59A4> \xA7\xB1 |0
-<U59A5> \xA7\xB4 |0
-<U59A6> \xCA\xB2 |0
-<U59A7> \xCA\xBA |0
-<U59A8> \xA7\xAB |0
-<U59AC> \x9A\xB9 |0
-<U59AE> \xA9\x67 |0
-<U59AF> \xA9\x6F |0
-<U59B0> \x97\xB3 |0
-<U59B1> \xCC\x4F |0
-<U59B2> \xCC\x48 |0
-<U59B3> \xA9\x70 |0
-<U59B4> \xCC\x53 |0
-<U59B5> \xCC\x44 |0
-<U59B6> \xCC\x4B |0
-<U59B7> \x9F\x74 |0
-<U59B8> \x92\xF1 |0
-<U59B9> \xA9\x66 |0
-<U59BA> \xCC\x45 |0
-<U59BB> \xA9\x64 |0
-<U59BC> \xCC\x4C |0
-<U59BD> \xCC\x50 |0
-<U59BE> \xA9\x63 |0
-<U59C0> \xCC\x51 |0
-<U59C1> \xCC\x4A |0
-<U59C3> \xCC\x4D |0
-<U59C4> \x97\xDF |0
-<U59C5> \xA9\x72 |0
-<U59C6> \xA9\x69 |0
-<U59C7> \xCC\x54 |0
-<U59C8> \xCC\x52 |0
-<U59C9> \xFB\xA6 |0
-<U59CA> \xA9\x6E |0
-<U59CB> \xA9\x6C |0
-<U59CC> \xCC\x49 |0
-<U59CD> \xA9\x6B |0
-<U59CE> \xCC\x47 |0
-<U59CF> \xCC\x46 |0
-<U59D0> \xA9\x6A |0
-<U59D1> \xA9\x68 |0
-<U59D2> \xA9\x71 |0
-<U59D3> \xA9\x6D |0
-<U59D4> \xA9\x65 |0
-<U59D6> \xCC\x4E |0
-<U59D8> \xAB\xB9 |0
-<U59D9> \xFB\xAB |0
-<U59DA> \xAB\xC0 |0
-<U59DB> \xCE\x6F |0
-<U59DC> \xAB\xB8 |0
-<U59DD> \xCE\x67 |0
-<U59DE> \xCE\x63 |0
-<U59E0> \xCE\x73 |0
-<U59E1> \xCE\x62 |0
-<U59E3> \xAB\xBB |0
-<U59E4> \xCE\x6C |0
-<U59E5> \xAB\xBE |0
-<U59E6> \xAB\xC1 |0
-<U59E8> \xAB\xBC |0
-<U59E9> \xCE\x70 |0
-<U59EA> \xAB\xBF |0
-<U59EB> \x98\x77 |0
-<U59EC> \xAE\x56 |0
-<U59ED> \xCE\x76 |0
-<U59EE> \xCE\x64 |0
-<U59EF> \x98\x54 |0
-<U59F0> \x95\xC5 |0
-<U59F1> \xCE\x66 |0
-<U59F2> \xCE\x6D |0
-<U59F3> \xCE\x71 |0
-<U59F4> \xCE\x75 |0
-<U59F5> \xCE\x72 |0
-<U59F6> \xCE\x6B |0
-<U59F7> \xCE\x6E |0
-<U59F8> \x9D\x55 |0
-<U59F9> \xFB\xB2 |0
-<U59FA> \xCE\x68 |0
-<U59FB> \xAB\xC3 |0
-<U59FC> \xCE\x6A |0
-<U59FD> \xCE\x69 |0
-<U59FE> \xCE\x74 |0
-<U59FF> \xAB\xBA |0
-<U5A00> \xCE\x65 |0
-<U5A01> \xAB\xC2 |0
-<U5A02> \x95\x7E |0
-<U5A03> \xAB\xBD |0
-<U5A09> \xAE\x5C |0
-<U5A0A> \xD1\x62 |0
-<U5A0B> \x97\x42 |0
-<U5A0C> \xAE\x5B |0
-<U5A0D> \x94\xE6 |0
-<U5A0F> \xD1\x60 |0
-<U5A11> \xAE\x50 |0
-<U5A12> \x92\xF5 |0
-<U5A13> \xAE\x55 |0
-<U5A15> \xD1\x5F |0
-<U5A16> \xD1\x5C |0
-<U5A17> \xD1\x61 |0
-<U5A18> \xAE\x51 |0
-<U5A19> \xD1\x5B |0
-<U5A1A> \x8C\xC5 |0
-<U5A1B> \xAE\x54 |0
-<U5A1C> \xAE\x52 |0
-<U5A1E> \xD1\x63 |0
-<U5A1F> \xAE\x53 |0
-<U5A20> \xAE\x57 |0
-<U5A21> \x92\xFD |0
-<U5A23> \xAE\x58 |0
-<U5A24> \xFB\xA2 |0
-<U5A25> \xAE\x5A |0
-<U5A27> \x9C\x51 |0
-<U5A29> \xAE\x59 |0
-<U5A2A> \x94\xE9 |0
-<U5A2B> \x98\x5C |0
-<U5A2C> \x92\xF0 |0
-<U5A2D> \xD1\x5D |0
-<U5A2E> \xD1\x5E |0
-<U5A33> \xD1\x64 |0
-<U5A35> \xD4\xD4 |0
-<U5A36> \xB0\xF9 |0
-<U5A37> \xD8\xC2 |0
-<U5A38> \xD4\xD3 |0
-<U5A39> \xD4\xE6 |0
-<U5A3C> \xB1\x40 |0
-<U5A3D> \x94\x4C |0
-<U5A3E> \xD4\xE4 |0
-<U5A40> \xB0\xFE |0
-<U5A41> \xB0\xFA |0
-<U5A42> \xD4\xED |0
-<U5A43> \xD4\xDD |0
-<U5A44> \xD4\xE0 |0
-<U5A45> \x91\x6B |0
-<U5A46> \xB1\x43 |0
-<U5A47> \xD4\xEA |0
-<U5A48> \xD4\xE2 |0
-<U5A49> \xB0\xFB |0
-<U5A4A> \xB1\x44 |0
-<U5A4C> \xD4\xE7 |0
-<U5A4D> \xD4\xE5 |0
-<U5A50> \xD4\xD6 |0
-<U5A51> \xD4\xEB |0
-<U5A52> \xD4\xDF |0
-<U5A53> \xD4\xDA |0
-<U5A54> \x8B\x78 |0
-<U5A55> \xD4\xD0 |0
-<U5A56> \xD4\xEC |0
-<U5A57> \xD4\xDC |0
-<U5A58> \xD4\xCF |0
-<U5A59> \x94\xE2 |0
-<U5A5A> \xB1\x42 |0
-<U5A5B> \xD4\xE1 |0
-<U5A5C> \xD4\xEE |0
-<U5A5D> \xD4\xDE |0
-<U5A5E> \xD4\xD2 |0
-<U5A5F> \xD4\xD7 |0
-<U5A60> \xD4\xCE |0
-<U5A61> \x98\x4F |0
-<U5A62> \xB1\x41 |0
-<U5A63> \xFB\xB5 |0
-<U5A64> \xD4\xDB |0
-<U5A65> \xD4\xD8 |0
-<U5A66> \xB0\xFC |0
-<U5A67> \xD4\xD1 |0
-<U5A68> \x92\x71 |0
-<U5A69> \xD4\xE9 |0
-<U5A6A> \xB0\xFD |0
-<U5A6B> \x93\x65 |0
-<U5A6C> \xD4\xD9 |0
-<U5A6D> \xD4\xD5 |0
-<U5A6E> \x98\x5B |0
-<U5A70> \xD4\xE8 |0
-<U5A71> \x98\x50 |0
-<U5A77> \xB4\x40 |0
-<U5A78> \xD8\xBB |0
-<U5A79> \x97\xBC |0
-<U5A7A> \xD8\xB8 |0
-<U5A7B> \xD8\xC9 |0
-<U5A7C> \xD8\xBD |0
-<U5A7D> \xD8\xCA |0
-<U5A7E> \x92\xF3 |0
-<U5A7F> \xB4\x42 |0
-<U5A81> \x93\x40 |0
-<U5A82> \x98\x4D |0
-<U5A83> \xD8\xC6 |0
-<U5A84> \xD8\xC3 |0
-<U5A86> \x95\x72 |0
-<U5A88> \xFD\xEF |0
-<U5A8A> \xD8\xC4 |0
-<U5A8B> \xD8\xC7 |0
-<U5A8C> \xD8\xCB |0
-<U5A8E> \xD4\xE3 |0
-<U5A8F> \xD8\xCD |0
-<U5A90> \xDD\x47 |0
-<U5A91> \xFD\xC1 |0
-<U5A92> \xB4\x43 |0
-<U5A93> \xD8\xCE |0
-<U5A94> \xD8\xB6 |0
-<U5A95> \xD8\xC0 |0
-<U5A96> \xFB\xBA |0
-<U5A97> \xD8\xC5 |0
-<U5A99> \x92\xEB |0
-<U5A9A> \xB4\x41 |0
-<U5A9B> \xB4\x44 |0
-<U5A9C> \xD8\xCC |0
-<U5A9D> \xD8\xCF |0
-<U5A9E> \xD8\xBA |0
-<U5A9F> \xD8\xB7 |0
-<U5AA0> \xFC\x73 |0
-<U5AA1> \x97\xB7 |0
-<U5AA2> \xD8\xB9 |0
-<U5AA5> \xD8\xBE |0
-<U5AA6> \xD8\xBC |0
-<U5AA7> \xB4\x45 |0
-<U5AA9> \xD8\xC8 |0
-<U5AAB> \xFB\xB4 |0
-<U5AAC> \xD8\xBF |0
-<U5AAE> \xD8\xC1 |0
-<U5AAF> \xD8\xB5 |0
-<U5AB0> \xDC\xFA |0
-<U5AB1> \xDC\xF8 |0
-<U5AB2> \xB7\x42 |0
-<U5AB3> \xB7\x40 |0
-<U5AB4> \xDD\x43 |0
-<U5AB5> \xDC\xF9 |0
-<U5AB6> \xDD\x44 |0
-<U5AB7> \xDD\x40 |0
-<U5AB8> \xDC\xF7 |0
-<U5AB9> \xDD\x46 |0
-<U5ABA> \xDC\xF6 |0
-<U5ABB> \xDC\xFD |0
-<U5ABC> \xB6\xFE |0
-<U5ABD> \xB6\xFD |0
-<U5ABE> \xB6\xFC |0
-<U5ABF> \xDC\xFB |0
-<U5AC0> \xDD\x41 |0
-<U5AC1> \xB6\xF9 |0
-<U5AC2> \xB7\x41 |0
-<U5AC3> \x90\xA7 |0
-<U5AC4> \xDC\xF4 |0
-<U5AC6> \xDC\xFE |0
-<U5AC7> \xDC\xF3 |0
-<U5AC8> \xDC\xFC |0
-<U5AC9> \xB6\xFA |0
-<U5ACA> \xDD\x42 |0
-<U5ACB> \xDC\xF5 |0
-<U5ACC> \xB6\xFB |0
-<U5ACD> \xDD\x45 |0
-<U5ACE> \x97\x41 |0
-<U5ACF> \x92\xF4 |0
-<U5AD3> \xFB\xBC |0
-<U5AD5> \xE1\x6E |0
-<U5AD6> \xB9\xE2 |0
-<U5AD7> \xB9\xE1 |0
-<U5AD8> \xB9\xE3 |0
-<U5AD9> \xE1\x7A |0
-<U5ADA> \xE1\x70 |0
-<U5ADB> \xE1\x76 |0
-<U5ADC> \xE1\x6B |0
-<U5ADD> \xE1\x79 |0
-<U5ADE> \xE1\x78 |0
-<U5ADF> \xE1\x7C |0
-<U5AE0> \xE1\x75 |0
-<U5AE1> \xB9\xDE |0
-<U5AE2> \xE1\x74 |0
-<U5AE3> \xB9\xE4 |0
-<U5AE4> \x95\x77 |0
-<U5AE5> \xE1\x6D |0
-<U5AE6> \xB9\xDF |0
-<U5AE8> \xE1\x7B |0
-<U5AE9> \xB9\xE0 |0
-<U5AEA> \xE1\x6F |0
-<U5AEB> \xE1\x72 |0
-<U5AEC> \xE1\x77 |0
-<U5AED> \xE1\x71 |0
-<U5AEE> \xE1\x6C |0
-<U5AF0> \x9E\xE2 |0
-<U5AF2> \x8F\x78 |0
-<U5AF3> \xE1\x73 |0
-<U5AF4> \xE5\x55 |0
-<U5AF5> \xBC\x61 |0
-<U5AF6> \xE5\x58 |0
-<U5AF7> \xE5\x57 |0
-<U5AF8> \xE5\x5A |0
-<U5AF9> \xE5\x5C |0
-<U5AFA> \xF9\xDC |0
-<U5AFB> \xBC\x5F |0
-<U5AFD> \xE5\x56 |0
-<U5AFE> \x96\x72 |0
-<U5AFF> \xE5\x54 |0
-<U5B01> \xE5\x5D |0
-<U5B02> \xE5\x5B |0
-<U5B03> \xE5\x59 |0
-<U5B05> \xE5\x5F |0
-<U5B07> \xE5\x5E |0
-<U5B08> \xBC\x63 |0
-<U5B09> \xBC\x5E |0
-<U5B0B> \xBC\x60 |0
-<U5B0C> \xBC\x62 |0
-<U5B0D> \x9E\xB5 |0
-<U5B0F> \xE5\x60 |0
-<U5B10> \xE9\x57 |0
-<U5B11> \x96\x4B |0
-<U5B13> \xE9\x56 |0
-<U5B14> \xE9\x55 |0
-<U5B15> \x8C\xAC |0
-<U5B16> \xE9\x58 |0
-<U5B17> \xE9\x51 |0
-<U5B19> \xE9\x52 |0
-<U5B1A> \xE9\x5A |0
-<U5B1B> \xE9\x53 |0
-<U5B1D> \xBE\xC5 |0
-<U5B1E> \xE9\x5C |0
-<U5B1F> \xA0\xFA |0
-<U5B20> \xE9\x5B |0
-<U5B21> \xE9\x54 |0
-<U5B23> \xEC\xD1 |0
-<U5B24> \xC0\xA8 |0
-<U5B25> \xEC\xCF |0
-<U5B26> \xEC\xD4 |0
-<U5B27> \xEC\xD3 |0
-<U5B28> \xE9\x59 |0
-<U5B2A> \xC0\xA7 |0
-<U5B2B> \x95\x75 |0
-<U5B2C> \xEC\xD2 |0
-<U5B2D> \xEC\xCE |0
-<U5B2E> \xEC\xD6 |0
-<U5B2F> \xEC\xD5 |0
-<U5B30> \xC0\xA6 |0
-<U5B32> \xEC\xD0 |0
-<U5B34> \xBE\xC6 |0
-<U5B38> \xC2\x54 |0
-<U5B3C> \xEF\xC1 |0
-<U5B3D> \xF1\xFA |0
-<U5B3E> \xF1\xFB |0
-<U5B3F> \xF1\xFC |0
-<U5B40> \xC4\x5C |0
-<U5B41> \x90\xDA |0
-<U5B43> \xC4\x5D |0
-<U5B44> \x93\x67 |0
-<U5B45> \xF4\x43 |0
-<U5B46> \xFE\xA4 |0
-<U5B47> \xF5\xC8 |0
-<U5B48> \xF5\xC7 |0
-<U5B4A> \x90\xDF |0
-<U5B4B> \xF6\xDB |0
-<U5B4C> \xF6\xDC |0
-<U5B4D> \xF7\xD5 |0
-<U5B4E> \xF8\xA7 |0
-<U5B4F> \x93\x54 |0
-<U5B50> \xA4\x6C |0
-<U5B51> \xA4\x6D |0
-<U5B53> \xA4\x6E |0
-<U5B54> \xA4\xD5 |0
-<U5B55> \xA5\xA5 |0
-<U5B56> \xC9\xD3 |0
-<U5B57> \xA6\x72 |0
-<U5B58> \xA6\x73 |0
-<U5B5A> \xA7\xB7 |0
-<U5B5B> \xA7\xB8 |0
-<U5B5C> \xA7\xB6 |0
-<U5B5D> \xA7\xB5 |0
-<U5B5F> \xA9\x73 |0
-<U5B62> \xCC\x55 |0
-<U5B63> \xA9\x75 |0
-<U5B64> \xA9\x74 |0
-<U5B65> \xCC\x56 |0
-<U5B66> \x89\x61 |0
-<U5B68> \x8B\xB4 |0
-<U5B69> \xAB\xC4 |0
-<U5B6B> \xAE\x5D |0
-<U5B6C> \xD1\x65 |0
-<U5B6D> \x9D\xC0 |0
-<U5B6E> \xD4\xF0 |0
-<U5B70> \xB1\x45 |0
-<U5B71> \xB4\x47 |0
-<U5B72> \xD4\xEF |0
-<U5B73> \xB4\x46 |0
-<U5B74> \x8E\x48 |0
-<U5B75> \xB9\xE5 |0
-<U5B76> \xFB\xC5 |0
-<U5B77> \xE1\x7D |0
-<U5B78> \xBE\xC7 |0
-<U5B7A> \xC0\xA9 |0
-<U5B7B> \xEC\xD7 |0
-<U5B7C> \xFB\xC7 |0
-<U5B7D> \xC4\x5E |0
-<U5B7F> \xC5\x70 |0
-<U5B80> \xC6\xCB |0
-<U5B81> \xC9\x72 |0
-<U5B82> \xFA\x79 |0
-<U5B83> \xA5\xA6 |0
-<U5B84> \xC9\x73 |0
-<U5B85> \xA6\x76 |0
-<U5B87> \xA6\x74 |0
-<U5B88> \xA6\x75 |0
-<U5B89> \xA6\x77 |0
-<U5B8B> \xA7\xBA |0
-<U5B8C> \xA7\xB9 |0
-<U5B8E> \xCA\xBC |0
-<U5B8F> \xA7\xBB |0
-<U5B90> \x9E\x67 |0
-<U5B92> \xCA\xBD |0
-<U5B93> \xCC\x57 |0
-<U5B95> \xCC\x58 |0
-<U5B96> \x8C\xD9 |0
-<U5B97> \xA9\x76 |0
-<U5B98> \xA9\x78 |0
-<U5B99> \xA9\x7A |0
-<U5B9A> \xA9\x77 |0
-<U5B9B> \xA9\x7B |0
-<U5B9C> \xA9\x79 |0
-<U5B9D> \xFB\xD2 |0
-<U5B9E> \x89\x62 |0
-<U5B9F> \x89\x63 |0
-<U5BA2> \xAB\xC8 |0
-<U5BA3> \xAB\xC5 |0
-<U5BA4> \xAB\xC7 |0
-<U5BA5> \xAB\xC9 |0
-<U5BA6> \xAB\xC6 |0
-<U5BA7> \xD1\x66 |0
-<U5BA8> \xCE\x77 |0
-<U5BAA> \xFC\x7D |0
-<U5BAC> \xD1\x68 |0
-<U5BAD> \xD1\x67 |0
-<U5BAE> \xAE\x63 |0
-<U5BB0> \xAE\x5F |0
-<U5BB3> \xAE\x60 |0
-<U5BB4> \xAE\x62 |0
-<U5BB5> \xAE\x64 |0
-<U5BB6> \xAE\x61 |0
-<U5BB8> \xAE\x66 |0
-<U5BB9> \xAE\x65 |0
-<U5BBF> \xB1\x4A |0
-<U5BC0> \xD4\xF2 |0
-<U5BC1> \xD4\xF1 |0
-<U5BC2> \xB1\x49 |0
-<U5BC3> \x9F\x6B |0
-<U5BC4> \xB1\x48 |0
-<U5BC5> \xB1\x47 |0
-<U5BC6> \xB1\x4B |0
-<U5BC7> \xB1\x46 |0
-<U5BCA> \xD8\xD5 |0
-<U5BCB> \xD8\xD2 |0
-<U5BCC> \xB4\x49 |0
-<U5BCD> \xD8\xD1 |0
-<U5BCE> \xD8\xD6 |0
-<U5BD0> \xB4\x4B |0
-<U5BD1> \xD8\xD4 |0
-<U5BD2> \xB4\x48 |0
-<U5BD3> \xB4\x4A |0
-<U5BD4> \xD8\xD3 |0
-<U5BD5> \xFB\xCC |0
-<U5BD6> \xDD\x48 |0
-<U5BD7> \xFE\xAE |0
-<U5BD8> \xDD\x49 |0
-<U5BD9> \xDD\x4A |0
-<U5BDE> \xB9\xE6 |0
-<U5BDF> \xB9\xEE |0
-<U5BE0> \xE1\x7E |0
-<U5BE1> \xB9\xE8 |0
-<U5BE2> \xB9\xEC |0
-<U5BE3> \xE1\xA1 |0
-<U5BE4> \xB9\xED |0
-<U5BE5> \xB9\xE9 |0
-<U5BE6> \xB9\xEA |0
-<U5BE7> \xB9\xE7 |0
-<U5BE8> \xB9\xEB |0
-<U5BE9> \xBC\x66 |0
-<U5BEA> \xD8\xD0 |0
-<U5BEB> \xBC\x67 |0
-<U5BEC> \xBC\x65 |0
-<U5BEE> \xBC\x64 |0
-<U5BEF> \xE9\x5D |0
-<U5BF0> \xBE\xC8 |0
-<U5BF1> \xEC\xD8 |0
-<U5BF2> \xEC\xD9 |0
-<U5BF3> \xFB\xD1 |0
-<U5BF5> \xC3\x64 |0
-<U5BF6> \xC4\x5F |0
-<U5BF8> \xA4\x6F |0
-<U5BFA> \xA6\x78 |0
-<U5BFF> \xFB\x75 |0
-<U5C01> \xAB\xCA |0
-<U5C03> \xD1\x69 |0
-<U5C04> \xAE\x67 |0
-<U5C05> \xFB\xD4 |0
-<U5C07> \xB1\x4E |0
-<U5C08> \xB1\x4D |0
-<U5C09> \xB1\x4C |0
-<U5C0A> \xB4\x4C |0
-<U5C0B> \xB4\x4D |0
-<U5C0C> \xD8\xD7 |0
-<U5C0D> \xB9\xEF |0
-<U5C0E> \xBE\xC9 |0
-<U5C0F> \xA4\x70 |0
-<U5C10> \xC9\x5C |0
-<U5C11> \xA4\xD6 |0
-<U5C12> \xC9\x74 |0
-<U5C13> \xFB\xD6 |0
-<U5C14> \xFB\xD8 |0
-<U5C15> \xC9\xD4 |0
-<U5C16> \xA6\x79 |0
-<U5C1A> \xA9\x7C |0
-<U5C1C> \x8B\x5D |0
-<U5C1E> \x93\x4C |0
-<U5C1F> \xDD\x4B |0
-<U5C20> \x9A\xE2 |0
-<U5C22> \xA4\x71 |0
-<U5C23> \x8B\xC9 |0
-<U5C24> \xA4\xD7 |0
-<U5C25> \xC9\xD5 |0
-<U5C28> \xCA\xBE |0
-<U5C2A> \xCA\xBF |0
-<U5C2C> \xA7\xBC |0
-<U5C30> \xD8\xD8 |0
-<U5C31> \xB4\x4E |0
-<U5C33> \xDD\x4C |0
-<U5C37> \xC0\xAA |0
-<U5C38> \xA4\x72 |0
-<U5C39> \xA4\xA8 |0
-<U5C3A> \xA4\xD8 |0
-<U5C3B> \xC9\x75 |0
-<U5C3C> \xA5\xA7 |0
-<U5C3E> \xA7\xC0 |0
-<U5C3F> \xA7\xBF |0
-<U5C40> \xA7\xBD |0
-<U5C41> \xA7\xBE |0
-<U5C44> \xCC\x59 |0
-<U5C45> \xA9\x7E |0
-<U5C46> \xA9\xA1 |0
-<U5C47> \xCC\x5A |0
-<U5C48> \xA9\x7D |0
-<U5C49> \xFB\xDB |0
-<U5C4A> \x9F\xC9 |0
-<U5C4B> \xAB\xCE |0
-<U5C4C> \xCE\x78 |0
-<U5C4D> \xAB\xCD |0
-<U5C4E> \xAB\xCB |0
-<U5C4F> \xAB\xCC |0
-<U5C50> \xAE\x6A |0
-<U5C51> \xAE\x68 |0
-<U5C53> \x9F\x44 |0
-<U5C54> \xD1\x6B |0
-<U5C55> \xAE\x69 |0
-<U5C56> \xD1\x6A |0
-<U5C58> \xAE\x5E |0
-<U5C59> \xD4\xF3 |0
-<U5C5C> \xB1\x50 |0
-<U5C5D> \xB1\x51 |0
-<U5C5E> \x98\xED |0
-<U5C60> \xB1\x4F |0
-<U5C62> \xB9\xF0 |0
-<U5C63> \xE1\xA2 |0
-<U5C64> \xBC\x68 |0
-<U5C65> \xBC\x69 |0
-<U5C67> \xE5\x61 |0
-<U5C68> \xC0\xAB |0
-<U5C69> \xEF\xC2 |0
-<U5C6A> \xEF\xC3 |0
-<U5C6C> \xC4\xDD |0
-<U5C6D> \xF8\xA8 |0
-<U5C6E> \xC9\x4B |0
-<U5C6F> \xA4\xD9 |0
-<U5C71> \xA4\x73 |0
-<U5C73> \xC9\x77 |0
-<U5C74> \xC9\x76 |0
-<U5C79> \xA6\x7A |0
-<U5C7A> \xC9\xD7 |0
-<U5C7B> \xC9\xD8 |0
-<U5C7C> \xC9\xD6 |0
-<U5C7E> \xC9\xD9 |0
-<U5C85> \xFB\xDD |0
-<U5C86> \xCA\xC7 |0
-<U5C88> \xCA\xC2 |0
-<U5C89> \xCA\xC4 |0
-<U5C8A> \xCA\xC6 |0
-<U5C8B> \xCA\xC3 |0
-<U5C8C> \xA7\xC4 |0
-<U5C8D> \xCA\xC0 |0
-<U5C8F> \xCA\xC1 |0
-<U5C90> \xA7\xC1 |0
-<U5C91> \xA7\xC2 |0
-<U5C92> \xCA\xC5 |0
-<U5C93> \xCA\xC8 |0
-<U5C94> \xA7\xC3 |0
-<U5C95> \xCA\xC9 |0
-<U5C99> \x8D\xF2 |0
-<U5C9A> \x89\x64 |0
-<U5C9C> \xFD\xF2 |0
-<U5C9D> \xCC\x68 |0
-<U5C9E> \x93\x4D |0
-<U5C9F> \xCC\x62 |0
-<U5CA0> \xCC\x5D |0
-<U5CA1> \xA9\xA3 |0
-<U5CA2> \xCC\x65 |0
-<U5CA3> \xCC\x63 |0
-<U5CA4> \xCC\x5C |0
-<U5CA5> \xCC\x69 |0
-<U5CA6> \xCC\x6C |0
-<U5CA7> \xCC\x67 |0
-<U5CA8> \xCC\x60 |0
-<U5CA9> \xA9\xA5 |0
-<U5CAA> \xCC\x66 |0
-<U5CAB> \xA9\xA6 |0
-<U5CAC> \xCC\x61 |0
-<U5CAD> \xCC\x64 |0
-<U5CAE> \xCC\x5B |0
-<U5CAF> \xCC\x5F |0
-<U5CB0> \xCC\x6B |0
-<U5CB1> \xA9\xA7 |0
-<U5CB3> \xA9\xA8 |0
-<U5CB5> \xCC\x5E |0
-<U5CB6> \xCC\x6A |0
-<U5CB7> \xA9\xA2 |0
-<U5CB8> \xA9\xA4 |0
-<U5CBA> \xFB\xE7 |0
-<U5CC1> \xA0\xF2 |0
-<U5CC2> \x98\x68 |0
-<U5CC6> \xCE\xAB |0
-<U5CC7> \xCE\xA4 |0
-<U5CC8> \xCE\xAA |0
-<U5CC9> \xCE\xA3 |0
-<U5CCA> \xCE\xA5 |0
-<U5CCB> \xCE\x7D |0
-<U5CCC> \xCE\x7B |0
-<U5CCE> \xCE\xAC |0
-<U5CCF> \xCE\xA9 |0
-<U5CD0> \xCE\x79 |0
-<U5CD1> \x9F\x58 |0
-<U5CD2> \xAB\xD0 |0
-<U5CD3> \xCE\xA7 |0
-<U5CD4> \xCE\xA8 |0
-<U5CD6> \xCE\xA6 |0
-<U5CD7> \xCE\x7C |0
-<U5CD8> \xCE\x7A |0
-<U5CD9> \xAB\xCF |0
-<U5CDA> \xCE\xA2 |0
-<U5CDB> \xCE\x7E |0
-<U5CDE> \xCE\xA1 |0
-<U5CDF> \xCE\xAD |0
-<U5CE5> \x8D\x73 |0
-<U5CE8> \xAE\x6F |0
-<U5CE9> \xFB\xDE |0
-<U5CEA> \xAE\x6E |0
-<U5CEC> \xD1\x6C |0
-<U5CED> \xAE\x6B |0
-<U5CEE> \xD1\x6E |0
-<U5CEF> \xFB\xDF |0
-<U5CF0> \xAE\x70 |0
-<U5CF1> \xD1\x6F |0
-<U5CF4> \xAE\x73 |0
-<U5CF5> \x8C\x48 |0
-<U5CF6> \xAE\x71 |0
-<U5CF7> \xD1\x70 |0
-<U5CF8> \xCE\xAE |0
-<U5CF9> \xD1\x72 |0
-<U5CFB> \xAE\x6D |0
-<U5CFD> \xAE\x6C |0
-<U5CFF> \xD1\x6D |0
-<U5D00> \xD1\x71 |0
-<U5D01> \xAE\x72 |0
-<U5D06> \xB1\x53 |0
-<U5D07> \xB1\x52 |0
-<U5D0B> \xD4\xF5 |0
-<U5D0C> \xD4\xF9 |0
-<U5D0D> \xD4\xFB |0
-<U5D0E> \xB1\x54 |0
-<U5D0F> \xD4\xFE |0
-<U5D10> \xFB\xE3 |0
-<U5D11> \xB1\x58 |0
-<U5D12> \xD5\x41 |0
-<U5D14> \xB1\x5A |0
-<U5D15> \x8D\xA8 |0
-<U5D16> \xB1\x56 |0
-<U5D17> \xB1\x5E |0
-<U5D18> \xFB\xE4 |0
-<U5D19> \xB1\x5B |0
-<U5D1A> \xD4\xF7 |0
-<U5D1B> \xB1\x55 |0
-<U5D1D> \xD4\xF6 |0
-<U5D1E> \xD4\xF4 |0
-<U5D1F> \xD5\x43 |0
-<U5D20> \xD4\xF8 |0
-<U5D22> \xB1\x57 |0
-<U5D23> \xD5\x42 |0
-<U5D24> \xB1\x5C |0
-<U5D25> \xD4\xFD |0
-<U5D26> \xD4\xFC |0
-<U5D27> \xB1\x5D |0
-<U5D28> \xD4\xFA |0
-<U5D29> \xB1\x59 |0
-<U5D2C> \x9C\x75 |0
-<U5D2E> \xD5\x44 |0
-<U5D2F> \x98\x78 |0
-<U5D30> \xD5\x40 |0
-<U5D31> \xD8\xE7 |0
-<U5D32> \xD8\xEE |0
-<U5D33> \xD8\xE3 |0
-<U5D34> \xB4\x51 |0
-<U5D35> \xD8\xDF |0
-<U5D36> \xD8\xEF |0
-<U5D37> \xD8\xD9 |0
-<U5D38> \xD8\xEC |0
-<U5D39> \xD8\xEA |0
-<U5D3A> \xD8\xE4 |0
-<U5D3C> \xD8\xED |0
-<U5D3D> \xD8\xE6 |0
-<U5D3E> \x8D\x60 |0
-<U5D3F> \xD8\xDE |0
-<U5D40> \xD8\xF0 |0
-<U5D41> \xD8\xDC |0
-<U5D42> \xD8\xE9 |0
-<U5D43> \xD8\xDA |0
-<U5D45> \xD8\xF1 |0
-<U5D46> \xFB\xE5 |0
-<U5D47> \xB4\x52 |0
-<U5D48> \x8D\x61 |0
-<U5D49> \xD8\xEB |0
-<U5D4A> \xDD\x4F |0
-<U5D4B> \xD8\xDD |0
-<U5D4C> \xB4\x4F |0
-<U5D4E> \xD8\xE1 |0
-<U5D50> \xB4\x50 |0
-<U5D51> \xD8\xE0 |0
-<U5D52> \xD8\xE5 |0
-<U5D55> \xD8\xE2 |0
-<U5D56> \x8D\x62 |0
-<U5D57> \xA0\xA1 |0
-<U5D59> \xD8\xE8 |0
-<U5D5B> \x9C\x40 |0
-<U5D5E> \xDD\x53 |0
-<U5D62> \xDD\x56 |0
-<U5D63> \xDD\x4E |0
-<U5D65> \xDD\x50 |0
-<U5D67> \xDD\x55 |0
-<U5D68> \xDD\x54 |0
-<U5D69> \xB7\x43 |0
-<U5D6B> \xD8\xDB |0
-<U5D6C> \xDD\x52 |0
-<U5D6F> \xB7\x44 |0
-<U5D70> \x98\xAD |0
-<U5D71> \xDD\x4D |0
-<U5D72> \xDD\x51 |0
-<U5D74> \x9E\xEA |0
-<U5D77> \xE1\xA9 |0
-<U5D79> \xE1\xB0 |0
-<U5D7A> \xE1\xA7 |0
-<U5D7B> \x8C\xD4 |0
-<U5D7C> \xE1\xAE |0
-<U5D7D> \xE1\xA5 |0
-<U5D7E> \xE1\xAD |0
-<U5D7F> \xE1\xB1 |0
-<U5D80> \xE1\xA4 |0
-<U5D81> \xE1\xA8 |0
-<U5D82> \xE1\xA3 |0
-<U5D84> \xB9\xF1 |0
-<U5D85> \x9C\xEB |0
-<U5D86> \xE1\xA6 |0
-<U5D87> \xB9\xF2 |0
-<U5D88> \xE1\xAC |0
-<U5D89> \xE1\xAB |0
-<U5D8A> \xE1\xAA |0
-<U5D8B> \xFB\xE0 |0
-<U5D8D> \xE1\xAF |0
-<U5D8E> \x9F\x51 |0
-<U5D92> \xE5\x65 |0
-<U5D93> \xE5\x67 |0
-<U5D94> \xBC\x6B |0
-<U5D95> \xE5\x68 |0
-<U5D97> \xE5\x63 |0
-<U5D99> \xE5\x62 |0
-<U5D9A> \xE5\x6C |0
-<U5D9C> \xE5\x6A |0
-<U5D9D> \xBC\x6A |0
-<U5D9E> \xE5\x6D |0
-<U5D9F> \xE5\x64 |0
-<U5DA0> \xE5\x69 |0
-<U5DA1> \xE5\x6B |0
-<U5DA2> \xE5\x66 |0
-<U5DA4> \x8D\x65 |0
-<U5DA7> \xE9\x61 |0
-<U5DA8> \xE9\x66 |0
-<U5DA9> \xE9\x60 |0
-<U5DAA> \xE9\x65 |0
-<U5DAB> \x9C\xF1 |0
-<U5DAC> \xE9\x5E |0
-<U5DAD> \xE9\x68 |0
-<U5DAE> \xE9\x64 |0
-<U5DAF> \xE9\x69 |0
-<U5DB0> \xE9\x63 |0
-<U5DB1> \xE9\x5F |0
-<U5DB2> \xE9\x67 |0
-<U5DB4> \xE9\x6A |0
-<U5DB5> \xE9\x62 |0
-<U5DB6> \xFC\x58 |0
-<U5DB7> \xEC\xDA |0
-<U5DB8> \xC0\xAF |0
-<U5DB9> \x8D\x66 |0
-<U5DBA> \xC0\xAD |0
-<U5DBC> \xC0\xAC |0
-<U5DBD> \xC0\xAE |0
-<U5DC0> \xEF\xC4 |0
-<U5DC1> \x96\x54 |0
-<U5DC2> \xF1\x72 |0
-<U5DC3> \xF1\xFD |0
-<U5DC6> \xF4\x44 |0
-<U5DC7> \xF4\x45 |0
-<U5DC9> \xC4\x60 |0
-<U5DCB> \xF5\xC9 |0
-<U5DCD> \xC4\xDE |0
-<U5DCF> \xF5\xCA |0
-<U5DD1> \xF6\xDE |0
-<U5DD2> \xC5\x72 |0
-<U5DD4> \xC5\x71 |0
-<U5DD5> \xF6\xDD |0
-<U5DD6> \xC5\xC9 |0
-<U5DD7> \xFB\xE8 |0
-<U5DD8> \xF7\xD6 |0
-<U5DDB> \xC6\xCC |0
-<U5DDD> \xA4\x74 |0
-<U5DDE> \xA6\x7B |0
-<U5DDF> \xC9\xDA |0
-<U5DE0> \xCA\xCA |0
-<U5DE1> \xA8\xB5 |0
-<U5DE2> \xB1\x5F |0
-<U5DE5> \xA4\x75 |0
-<U5DE6> \xA5\xAA |0
-<U5DE7> \xA5\xA9 |0
-<U5DE8> \xA5\xA8 |0
-<U5DEB> \xA7\xC5 |0
-<U5DEE> \xAE\x74 |0
-<U5DF0> \xDD\x57 |0
-<U5DF1> \xA4\x76 |0
-<U5DF2> \xA4\x77 |0
-<U5DF3> \xA4\x78 |0
-<U5DF4> \xA4\xDA |0
-<U5DF5> \x9F\xCE |0
-<U5DF7> \xAB\xD1 |0
-<U5DF9> \xCE\xAF |0
-<U5DFD> \xB4\x53 |0
-<U5DFE> \xA4\x79 |0
-<U5DFF> \xC9\x5D |0
-<U5E02> \xA5\xAB |0
-<U5E03> \xA5\xAC |0
-<U5E04> \xC9\x78 |0
-<U5E06> \xA6\x7C |0
-<U5E09> \xFB\xFC |0
-<U5E0A> \xCA\xCB |0
-<U5E0B> \x9A\xE4 |0
-<U5E0C> \xA7\xC6 |0
-<U5E0E> \xCA\xCC |0
-<U5E11> \xA9\xAE |0
-<U5E12> \x9F\x75 |0
-<U5E14> \xCC\x6E |0
-<U5E15> \xA9\xAC |0
-<U5E16> \xA9\xAB |0
-<U5E17> \xCC\x6D |0
-<U5E18> \xA9\xA9 |0
-<U5E19> \xCC\x6F |0
-<U5E1A> \xA9\xAA |0
-<U5E1B> \xA9\xAD |0
-<U5E1D> \xAB\xD2 |0
-<U5E1F> \xAB\xD4 |0
-<U5E20> \xCE\xB3 |0
-<U5E21> \xCE\xB0 |0
-<U5E22> \xCE\xB1 |0
-<U5E23> \xCE\xB2 |0
-<U5E24> \xCE\xB4 |0
-<U5E25> \xAB\xD3 |0
-<U5E28> \xD1\x74 |0
-<U5E29> \xD1\x73 |0
-<U5E2B> \xAE\x76 |0
-<U5E2D> \xAE\x75 |0
-<U5E2E> \xFB\xF1 |0
-<U5E33> \xB1\x62 |0
-<U5E34> \xD5\x46 |0
-<U5E36> \xB1\x61 |0
-<U5E37> \xB1\x63 |0
-<U5E38> \xB1\x60 |0
-<U5E3D> \xB4\x55 |0
-<U5E3E> \xD5\x45 |0
-<U5E40> \xB4\x56 |0
-<U5E41> \xD8\xF3 |0
-<U5E42> \x8D\x69 |0
-<U5E43> \xB4\x57 |0
-<U5E44> \xD8\xF2 |0
-<U5E45> \xB4\x54 |0
-<U5E48> \x93\x4F |0
-<U5E4A> \xDD\x5A |0
-<U5E4B> \xDD\x5C |0
-<U5E4C> \xB7\x45 |0
-<U5E4D> \xDD\x5B |0
-<U5E4E> \xDD\x59 |0
-<U5E4F> \xDD\x58 |0
-<U5E53> \xE1\xB4 |0
-<U5E54> \xB9\xF7 |0
-<U5E55> \xB9\xF5 |0
-<U5E57> \xB9\xF6 |0
-<U5E58> \xE1\xB2 |0
-<U5E59> \xE1\xB3 |0
-<U5E5B> \xB9\xF3 |0
-<U5E5C> \xE5\x71 |0
-<U5E5D> \xE5\x6F |0
-<U5E5E> \x93\x4E |0
-<U5E5F> \xBC\x6D |0
-<U5E60> \xE5\x70 |0
-<U5E61> \xBC\x6E |0
-<U5E62> \xBC\x6C |0
-<U5E63> \xB9\xF4 |0
-<U5E66> \xE9\x6D |0
-<U5E67> \xE9\x6B |0
-<U5E68> \xE9\x6C |0
-<U5E69> \xE5\x6E |0
-<U5E6A> \xEC\xDC |0
-<U5E6B> \xC0\xB0 |0
-<U5E6C> \xEC\xDB |0
-<U5E6D> \xEF\xC5 |0
-<U5E6E> \xEF\xC6 |0
-<U5E6F> \xE9\x6E |0
-<U5E70> \xF1\xFE |0
-<U5E72> \xA4\x7A |0
-<U5E73> \xA5\xAD |0
-<U5E74> \xA6\x7E |0
-<U5E75> \xC9\xDB |0
-<U5E76> \xA6\x7D |0
-<U5E78> \xA9\xAF |0
-<U5E79> \xB7\x46 |0
-<U5E7A> \xFB\xF4 |0
-<U5E7B> \xA4\xDB |0
-<U5E7C> \xA5\xAE |0
-<U5E7D> \xAB\xD5 |0
-<U5E7E> \xB4\x58 |0
-<U5E7F> \xC6\xCE |0
-<U5E80> \xC9\x79 |0
-<U5E82> \xC9\x7A |0
-<U5E83> \xFB\xC3 |0
-<U5E84> \xC9\xDC |0
-<U5E86> \x89\x65 |0
-<U5E87> \xA7\xC8 |0
-<U5E88> \xCA\xD0 |0
-<U5E89> \xCA\xCE |0
-<U5E8A> \xA7\xC9 |0
-<U5E8B> \xCA\xCD |0
-<U5E8C> \xCA\xCF |0
-<U5E8D> \xCA\xD1 |0
-<U5E8F> \xA7\xC7 |0
-<U5E92> \x8C\x7A |0
-<U5E95> \xA9\xB3 |0
-<U5E96> \xA9\xB4 |0
-<U5E97> \xA9\xB1 |0
-<U5E99> \x8C\x7B |0
-<U5E9A> \xA9\xB0 |0
-<U5E9B> \xCE\xB8 |0
-<U5E9C> \xA9\xB2 |0
-<U5EA0> \xAB\xD6 |0
-<U5EA2> \xCE\xB7 |0
-<U5EA3> \xCE\xB9 |0
-<U5EA4> \xCE\xB6 |0
-<U5EA5> \xCE\xBA |0
-<U5EA6> \xAB\xD7 |0
-<U5EA7> \xAE\x79 |0
-<U5EA8> \xD1\x75 |0
-<U5EAA> \xD1\x77 |0
-<U5EAB> \xAE\x77 |0
-<U5EAC> \xD1\x78 |0
-<U5EAD> \xAE\x78 |0
-<U5EAE> \xD1\x76 |0
-<U5EB0> \xCE\xB5 |0
-<U5EB1> \xD5\x47 |0
-<U5EB2> \xD5\x4A |0
-<U5EB3> \xD5\x4B |0
-<U5EB4> \xD5\x48 |0
-<U5EB5> \xB1\x67 |0
-<U5EB6> \xB1\x66 |0
-<U5EB7> \xB1\x64 |0
-<U5EB8> \xB1\x65 |0
-<U5EB9> \xD5\x49 |0
-<U5EBD> \x8D\x6A |0
-<U5EBE> \xB1\x68 |0
-<U5EC1> \xB4\x5A |0
-<U5EC2> \xB4\x5B |0
-<U5EC4> \xB4\x5C |0
-<U5EC5> \xDD\x5D |0
-<U5EC6> \xDD\x5F |0
-<U5EC7> \xDD\x61 |0
-<U5EC8> \xB7\x48 |0
-<U5EC9> \xB7\x47 |0
-<U5ECA> \xB4\x59 |0
-<U5ECB> \xDD\x60 |0
-<U5ECC> \xDD\x5E |0
-<U5ECD> \x93\x53 |0
-<U5ECE> \xE1\xB8 |0
-<U5ED0> \x9D\xFB |0
-<U5ED1> \xE1\xB6 |0
-<U5ED2> \xE1\xBC |0
-<U5ED3> \xB9\xF8 |0
-<U5ED4> \xE1\xBD |0
-<U5ED5> \xE1\xBA |0
-<U5ED6> \xB9\xF9 |0
-<U5ED7> \xE1\xB7 |0
-<U5ED8> \xE1\xB5 |0
-<U5ED9> \xE1\xBB |0
-<U5EDA> \xBC\x70 |0
-<U5EDB> \xE5\x73 |0
-<U5EDC> \xE1\xB9 |0
-<U5EDD> \xBC\x72 |0
-<U5EDE> \xE5\x74 |0
-<U5EDF> \xBC\x71 |0
-<U5EE0> \xBC\x74 |0
-<U5EE1> \xE5\x75 |0
-<U5EE2> \xBC\x6F |0
-<U5EE3> \xBC\x73 |0
-<U5EE5> \xE9\x73 |0
-<U5EE6> \xE9\x71 |0
-<U5EE7> \xE9\x70 |0
-<U5EE8> \xE9\x72 |0
-<U5EE9> \xE9\x6F |0
-<U5EEC> \xC3\x66 |0
-<U5EEE> \xF4\x46 |0
-<U5EEF> \xF4\x47 |0
-<U5EF1> \xF5\xCB |0
-<U5EF2> \xF6\xDF |0
-<U5EF3> \xC6\x55 |0
-<U5EF4> \xFB\xFD |0
-<U5EF6> \xA9\xB5 |0
-<U5EF7> \xA7\xCA |0
-<U5EF8> \x90\x59 |0
-<U5EF9> \xFC\x40 |0
-<U5EFA> \xAB\xD8 |0
-<U5EFB> \xFC\x41 |0
-<U5EFC> \xFC\x43 |0
-<U5EFE> \xA4\x7B |0
-<U5EFF> \xA4\xDC |0
-<U5F01> \xA5\xAF |0
-<U5F02> \xC9\xDD |0
-<U5F04> \xA7\xCB |0
-<U5F05> \xCA\xD2 |0
-<U5F07> \xCE\xBB |0
-<U5F08> \xAB\xD9 |0
-<U5F0A> \xB9\xFA |0
-<U5F0B> \xA4\x7C |0
-<U5F0C> \x93\x61 |0
-<U5F0D> \xFC\x46 |0
-<U5F0E> \x93\x62 |0
-<U5F0F> \xA6\xA1 |0
-<U5F12> \xB7\x49 |0
-<U5F13> \xA4\x7D |0
-<U5F14> \xA4\xDD |0
-<U5F15> \xA4\xDE |0
-<U5F17> \xA5\xB1 |0
-<U5F18> \xA5\xB0 |0
-<U5F1A> \xC9\xDE |0
-<U5F1B> \xA6\xA2 |0
-<U5F1D> \xCA\xD3 |0
-<U5F1F> \xA7\xCC |0
-<U5F22> \xCC\x71 |0
-<U5F23> \xCC\x72 |0
-<U5F24> \xCC\x73 |0
-<U5F25> \x8D\x6B |0
-<U5F26> \xA9\xB6 |0
-<U5F27> \xA9\xB7 |0
-<U5F28> \xCC\x70 |0
-<U5F29> \xA9\xB8 |0
-<U5F2D> \xAB\xDA |0
-<U5F2E> \xCE\xBC |0
-<U5F30> \xD1\x7A |0
-<U5F31> \xAE\x7A |0
-<U5F33> \xD1\x79 |0
-<U5F35> \xB1\x69 |0
-<U5F36> \xD5\x4C |0
-<U5F37> \xB1\x6A |0
-<U5F38> \xD5\x4D |0
-<U5F3A> \xFC\x4C |0
-<U5F3C> \xB4\x5D |0
-<U5F40> \xDD\x62 |0
-<U5F43> \xE1\xBF |0
-<U5F44> \xE1\xBE |0
-<U5F46> \xB9\xFB |0
-<U5F48> \xBC\x75 |0
-<U5F49> \xE5\x76 |0
-<U5F4A> \xBE\xCA |0
-<U5F4B> \xE9\x74 |0
-<U5F4C> \xC0\xB1 |0
-<U5F4D> \x95\xB8 |0
-<U5F4E> \xC5\x73 |0
-<U5F4F> \xF7\xD8 |0
-<U5F50> \xC6\xD0 |0
-<U5F51> \x8B\xCA |0
-<U5F54> \xCC\x74 |0
-<U5F56> \xCE\xBD |0
-<U5F57> \xB1\x6B |0
-<U5F58> \xD8\xF4 |0
-<U5F59> \xB7\x4A |0
-<U5F5C> \x98\x7A |0
-<U5F5D> \xC2\x55 |0
-<U5F61> \xC6\xD1 |0
-<U5F62> \xA7\xCE |0
-<U5F63> \xFC\x51 |0
-<U5F64> \xA7\xCD |0
-<U5F65> \xAB\xDB |0
-<U5F67> \xD1\x7B |0
-<U5F69> \xB1\x6D |0
-<U5F6A> \xB3\x43 |0
-<U5F6B> \xB1\x6E |0
-<U5F6C> \xB1\x6C |0
-<U5F6D> \xB4\x5E |0
-<U5F6F> \xE1\xC0 |0
-<U5F70> \xB9\xFC |0
-<U5F71> \xBC\x76 |0
-<U5F72> \xFC\x54 |0
-<U5F73> \xC9\x4C |0
-<U5F74> \xC9\xDF |0
-<U5F76> \xCA\xD5 |0
-<U5F77> \xA7\xCF |0
-<U5F78> \xCA\xD4 |0
-<U5F79> \xA7\xD0 |0
-<U5F7B> \xFA\xAF |0
-<U5F7C> \xA9\xBC |0
-<U5F7D> \xCC\x77 |0
-<U5F7E> \xCC\x76 |0
-<U5F7F> \xA9\xBB |0
-<U5F80> \xA9\xB9 |0
-<U5F81> \xA9\xBA |0
-<U5F82> \xCC\x75 |0
-<U5F83> \x8D\x6C |0
-<U5F85> \xAB\xDD |0
-<U5F86> \xCE\xBE |0
-<U5F87> \xAB\xE0 |0
-<U5F88> \xAB\xDC |0
-<U5F89> \xAB\xE2 |0
-<U5F8A> \xAB\xDE |0
-<U5F8B> \xAB\xDF |0
-<U5F8C> \xAB\xE1 |0
-<U5F90> \xAE\x7D |0
-<U5F91> \xAE\x7C |0
-<U5F92> \xAE\x7B |0
-<U5F96> \xD5\x4F |0
-<U5F97> \xB1\x6F |0
-<U5F98> \xB1\x72 |0
-<U5F99> \xB1\x70 |0
-<U5F9B> \xD5\x4E |0
-<U5F9C> \xB1\x75 |0
-<U5F9E> \xB1\x71 |0
-<U5F9F> \xD5\x50 |0
-<U5FA0> \xB1\x74 |0
-<U5FA1> \xB1\x73 |0
-<U5FA4> \xFA\x61 |0
-<U5FA5> \xD8\xF6 |0
-<U5FA6> \xD8\xF5 |0
-<U5FA7> \xFC\x57 |0
-<U5FA8> \xB4\x61 |0
-<U5FA9> \xB4\x5F |0
-<U5FAA> \xB4\x60 |0
-<U5FAB> \xD8\xF7 |0
-<U5FAC> \xB7\x4B |0
-<U5FAD> \xDD\x64 |0
-<U5FAE> \xB7\x4C |0
-<U5FAF> \xDD\x63 |0
-<U5FB1> \x9B\x70 |0
-<U5FB2> \xE5\x77 |0
-<U5FB5> \xBC\x78 |0
-<U5FB6> \xE1\xC1 |0
-<U5FB7> \xBC\x77 |0
-<U5FB9> \xB9\xFD |0
-<U5FBA> \xA0\x51 |0
-<U5FBB> \xEC\xDE |0
-<U5FBC> \xE9\x75 |0
-<U5FBD> \xC0\xB2 |0
-<U5FBE> \xEC\xDD |0
-<U5FBF> \xF2\x40 |0
-<U5FC0> \xF4\x48 |0
-<U5FC1> \xF4\x49 |0
-<U5FC2> \x8C\x7C |0
-<U5FC3> \xA4\xDF |0
-<U5FC4> \x8B\xCB |0
-<U5FC5> \xA5\xB2 |0
-<U5FC9> \xC9\x7B |0
-<U5FCC> \xA7\xD2 |0
-<U5FCD> \xA7\xD4 |0
-<U5FCF> \xC9\xE2 |0
-<U5FD0> \xCA\xD8 |0
-<U5FD1> \xCA\xD7 |0
-<U5FD2> \xCA\xD6 |0
-<U5FD4> \xC9\xE1 |0
-<U5FD5> \xC9\xE0 |0
-<U5FD6> \xA6\xA4 |0
-<U5FD7> \xA7\xD3 |0
-<U5FD8> \xA7\xD1 |0
-<U5FD9> \xA6\xA3 |0
-<U5FDB> \x93\x6E |0
-<U5FDD> \xA9\xBD |0
-<U5FDE> \xCC\x78 |0
-<U5FDF> \xFC\xD5 |0
-<U5FE0> \xA9\xBE |0
-<U5FE1> \xCA\xDD |0
-<U5FE3> \xCA\xDF |0
-<U5FE4> \xCA\xDE |0
-<U5FE5> \xCC\x79 |0
-<U5FE8> \xCA\xDA |0
-<U5FEA> \xA7\xD8 |0
-<U5FEB> \xA7\xD6 |0
-<U5FED> \xCA\xD9 |0
-<U5FEE> \xCA\xDB |0
-<U5FEF> \xCA\xE1 |0
-<U5FF1> \xA7\xD5 |0
-<U5FF3> \xCA\xDC |0
-<U5FF4> \xCA\xE5 |0
-<U5FF5> \xA9\xC0 |0
-<U5FF7> \xCA\xE2 |0
-<U5FF8> \xA7\xD7 |0
-<U5FFA> \xCA\xE0 |0
-<U5FFB> \xCA\xE3 |0
-<U5FFD> \xA9\xBF |0
-<U5FFF> \xA9\xC1 |0
-<U6000> \xCA\xE4 |0
-<U6009> \xCC\xAF |0
-<U600A> \xCC\xA2 |0
-<U600B> \xCC\x7E |0
-<U600C> \xCC\xAE |0
-<U600D> \xCC\xA9 |0
-<U600E> \xAB\xE7 |0
-<U600F> \xA9\xC2 |0
-<U6010> \xCC\xAA |0
-<U6011> \xCC\xAD |0
-<U6012> \xAB\xE3 |0
-<U6013> \xCC\xAC |0
-<U6014> \xA9\xC3 |0
-<U6015> \xA9\xC8 |0
-<U6016> \xA9\xC6 |0
-<U6017> \xCC\xA3 |0
-<U6019> \xCC\x7C |0
-<U601A> \xCC\xA5 |0
-<U601B> \xA9\xCD |0
-<U601C> \xCC\xB0 |0
-<U601D> \xAB\xE4 |0
-<U601E> \xCC\xA6 |0
-<U6020> \xAB\xE5 |0
-<U6021> \xA9\xC9 |0
-<U6022> \xCC\xA8 |0
-<U6023> \xFC\xA9 |0
-<U6024> \xCE\xCD |0
-<U6025> \xAB\xE6 |0
-<U6026> \xCC\x7B |0
-<U6027> \xA9\xCA |0
-<U6028> \xAB\xE8 |0
-<U6029> \xA9\xCB |0
-<U602A> \xA9\xC7 |0
-<U602B> \xA9\xCC |0
-<U602C> \xCC\xA7 |0
-<U602D> \xCC\x7A |0
-<U602E> \xCC\xAB |0
-<U602F> \xA9\xC4 |0
-<U6031> \xFC\x61 |0
-<U6032> \xCC\x7D |0
-<U6033> \xCC\xA4 |0
-<U6034> \xCC\xA1 |0
-<U6035> \xA9\xC5 |0
-<U6037> \xCE\xBF |0
-<U6039> \xCE\xC0 |0
-<U603B> \x89\x66 |0
-<U6040> \xCE\xCA |0
-<U6041> \xD1\xA1 |0
-<U6042> \xCE\xCB |0
-<U6043> \xAB\xEE |0
-<U6044> \xCE\xCE |0
-<U6045> \xCE\xC4 |0
-<U6046> \xAB\xED |0
-<U6047> \xCE\xC6 |0
-<U6049> \xCE\xC7 |0
-<U604A> \xFA\xCB |0
-<U604C> \xCE\xC9 |0
-<U604D> \xAB\xE9 |0
-<U6050> \xAE\xA3 |0
-<U6052> \xF9\xDA |0
-<U6053> \xCE\xC5 |0
-<U6054> \xCE\xC1 |0
-<U6055> \xAE\xA4 |0
-<U6058> \xCE\xCF |0
-<U6059> \xAE\x7E |0
-<U605A> \xD1\x7D |0
-<U605B> \xCE\xC8 |0
-<U605D> \xD1\x7C |0
-<U605E> \xCE\xC3 |0
-<U605F> \xCE\xCC |0
-<U6062> \xAB\xEC |0
-<U6063> \xAE\xA1 |0
-<U6064> \xAB\xF2 |0
-<U6065> \xAE\xA2 |0
-<U6066> \xCE\xD0 |0
-<U6067> \xD1\x7E |0
-<U6068> \xAB\xEB |0
-<U6069> \xAE\xA6 |0
-<U606A> \xAB\xF1 |0
-<U606B> \xAB\xF0 |0
-<U606C> \xAB\xEF |0
-<U606D> \xAE\xA5 |0
-<U606E> \xCE\xD1 |0
-<U606F> \xAE\xA7 |0
-<U6070> \xAB\xEA |0
-<U6072> \xCE\xC2 |0
-<U6075> \x93\x7A |0
-<U6077> \xA0\xE0 |0
-<U607E> \x93\x6B |0
-<U607F> \xB1\x76 |0
-<U6080> \xD1\xA4 |0
-<U6081> \xD1\xA6 |0
-<U6083> \xD1\xA8 |0
-<U6084> \xAE\xA8 |0
-<U6085> \xAE\xAE |0
-<U6086> \xD5\x53 |0
-<U6087> \xD1\xAC |0
-<U6088> \xD1\xA3 |0
-<U6089> \xB1\x78 |0
-<U608A> \xD5\x51 |0
-<U608C> \xAE\xAD |0
-<U608D> \xAE\xAB |0
-<U608E> \xD1\xAE |0
-<U6090> \xD5\x52 |0
-<U6092> \xD1\xA5 |0
-<U6094> \xAE\xAC |0
-<U6095> \xD1\xA9 |0
-<U6096> \xAE\xAF |0
-<U6097> \xD1\xAB |0
-<U609A> \xAE\xAA |0
-<U609B> \xD1\xAA |0
-<U609C> \xD1\xAD |0
-<U609D> \xD1\xA7 |0
-<U609E> \xFC\x6B |0
-<U609F> \xAE\xA9 |0
-<U60A0> \xB1\x79 |0
-<U60A2> \xD1\xA2 |0
-<U60A3> \xB1\x77 |0
-<U60A4> \xA0\xDC |0
-<U60A7> \x94\x68 |0
-<U60A8> \xB1\x7A |0
-<U60B0> \xD5\x55 |0
-<U60B1> \xD5\x5E |0
-<U60B2> \xB4\x64 |0
-<U60B3> \xFC\x6D |0
-<U60B4> \xB1\x7C |0
-<U60B5> \xB1\xA3 |0
-<U60B6> \xB4\x65 |0
-<U60B7> \xD5\x60 |0
-<U60B8> \xB1\xAA |0
-<U60B9> \xD8\xF9 |0
-<U60BA> \xD5\x56 |0
-<U60BB> \xB1\xA2 |0
-<U60BC> \xB1\xA5 |0
-<U60BD> \xB1\x7E |0
-<U60BE> \xD5\x54 |0
-<U60BF> \xD5\x62 |0
-<U60C0> \xD5\x65 |0
-<U60C1> \xD9\x49 |0
-<U60C3> \xD5\x63 |0
-<U60C4> \xD8\xFD |0
-<U60C5> \xB1\xA1 |0
-<U60C6> \xB1\xA8 |0
-<U60C7> \xB1\xAC |0
-<U60C8> \xD5\x5D |0
-<U60C9> \xD8\xF8 |0
-<U60CA> \xD5\x61 |0
-<U60CB> \xB1\x7B |0
-<U60CC> \xD8\xFA |0
-<U60CD> \xD5\x64 |0
-<U60CE> \xD8\xFC |0
-<U60CF> \xD5\x59 |0
-<U60D1> \xB4\x62 |0
-<U60D3> \xD5\x57 |0
-<U60D4> \xD5\x58 |0
-<U60D5> \xB1\xA7 |0
-<U60D7> \x8D\x71 |0
-<U60D8> \xB1\xA6 |0
-<U60D9> \xD5\x5B |0
-<U60DA> \xB1\xAB |0
-<U60DB> \xD5\x5F |0
-<U60DC> \xB1\xA4 |0
-<U60DD> \xD5\x5C |0
-<U60DE> \xFD\x64 |0
-<U60DF> \xB1\xA9 |0
-<U60E0> \xB4\x66 |0
-<U60E1> \xB4\x63 |0
-<U60E2> \xD8\xFB |0
-<U60E3> \x99\xBA |0
-<U60E4> \xD5\x5A |0
-<U60E6> \xB1\x7D |0
-<U60E7> \x9A\xD0 |0
-<U60E8> \x9A\x61 |0
-<U60E9> \xA0\xE5 |0
-<U60F0> \xB4\x6B |0
-<U60F1> \xB4\x6F |0
-<U60F2> \xD9\x40 |0
-<U60F3> \xB7\x51 |0
-<U60F4> \xB4\x6D |0
-<U60F5> \xD9\x44 |0
-<U60F6> \xB4\x71 |0
-<U60F7> \xDD\x65 |0
-<U60F8> \xD9\x46 |0
-<U60F9> \xB7\x53 |0
-<U60FA> \xB4\x69 |0
-<U60FB> \xB4\x6C |0
-<U60FC> \xD9\x47 |0
-<U60FD> \xA0\x5B |0
-<U60FE> \xD9\x48 |0
-<U60FF> \xD9\x4E |0
-<U6100> \xB4\x73 |0
-<U6101> \xB7\x54 |0
-<U6103> \xD9\x4A |0
-<U6104> \xD9\x4F |0
-<U6105> \xD9\x43 |0
-<U6106> \xB7\x5E |0
-<U6107> \x96\xAC |0
-<U6108> \xB7\x55 |0
-<U6109> \xB4\x72 |0
-<U610A> \xD9\x41 |0
-<U610B> \xD9\x50 |0
-<U610C> \x97\x40 |0
-<U610D> \xB7\x5D |0
-<U610E> \xB4\x70 |0
-<U610F> \xB7\x4E |0
-<U6110> \xD9\x4D |0
-<U6112> \xB4\x74 |0
-<U6113> \xD9\x45 |0
-<U6114> \xD8\xFE |0
-<U6115> \xB4\x6A |0
-<U6116> \xD9\x42 |0
-<U6118> \xD9\x4B |0
-<U6119> \x9E\xF1 |0
-<U611A> \xB7\x4D |0
-<U611B> \xB7\x52 |0
-<U611C> \xB4\x67 |0
-<U611D> \xD9\x4C |0
-<U611F> \xB7\x50 |0
-<U6122> \x8C\x4D |0
-<U6123> \xB4\x68 |0
-<U6127> \xB7\x5C |0
-<U6128> \xE1\xC3 |0
-<U6129> \xDD\x70 |0
-<U612B> \xDD\x68 |0
-<U612C> \xE1\xC2 |0
-<U612E> \xDD\x6C |0
-<U612F> \xDD\x6E |0
-<U6130> \x9F\x7E |0
-<U6132> \xDD\x6B |0
-<U6134> \xB7\x5B |0
-<U6136> \xDD\x6A |0
-<U6137> \xB7\x5F |0
-<U613B> \xE1\xD2 |0
-<U613D> \x8D\x72 |0
-<U613E> \xB7\x5A |0
-<U613F> \xBA\x40 |0
-<U6140> \xDD\x71 |0
-<U6141> \xE1\xC4 |0
-<U6142> \xFC\x76 |0
-<U6144> \xB7\x58 |0
-<U6145> \xDD\x69 |0
-<U6146> \xDD\x6D |0
-<U6147> \xB9\xFE |0
-<U6148> \xB7\x4F |0
-<U6149> \xDD\x66 |0
-<U614A> \xDD\x67 |0
-<U614B> \xBA\x41 |0
-<U614C> \xB7\x57 |0
-<U614D> \xB7\x59 |0
-<U614E> \xB7\x56 |0
-<U614F> \xDD\x6F |0
-<U6150> \x96\xA9 |0
-<U6152> \xE1\xC8 |0
-<U6153> \xE1\xC9 |0
-<U6154> \xE1\xCE |0
-<U6155> \xBC\x7D |0
-<U6156> \xE1\xD5 |0
-<U6158> \xBA\x47 |0
-<U6159> \xA0\x6E |0
-<U615A> \xBA\x46 |0
-<U615B> \xE1\xD0 |0
-<U615C> \xFC\xAA |0
-<U615D> \xBC\x7C |0
-<U615E> \xE1\xC5 |0
-<U615F> \xBA\x45 |0
-<U6160> \xFB\xCD |0
-<U6161> \xE1\xD4 |0
-<U6162> \xBA\x43 |0
-<U6163> \xBA\x44 |0
-<U6164> \xFC\x74 |0
-<U6165> \xE1\xD1 |0
-<U6166> \xE5\xAA |0
-<U6167> \xBC\x7A |0
-<U6168> \xB4\x6E |0
-<U616A> \xE1\xD3 |0
-<U616B> \xBC\xA3 |0
-<U616C> \xE1\xCB |0
-<U616E> \xBC\x7B |0
-<U616F> \xA0\x74 |0
-<U6170> \xBC\xA2 |0
-<U6171> \xE1\xC6 |0
-<U6172> \xE1\xCA |0
-<U6173> \xE1\xC7 |0
-<U6174> \xE1\xCD |0
-<U6175> \xBA\x48 |0
-<U6176> \xBC\x79 |0
-<U6177> \xBA\x42 |0
-<U6179> \xE5\x7A |0
-<U617A> \xE1\xCF |0
-<U617C> \xBC\xA1 |0
-<U617D> \xA0\x71 |0
-<U617E> \xBC\xA4 |0
-<U6180> \xE1\xCC |0
-<U6181> \xFC\x79 |0
-<U6182> \xBC\x7E |0
-<U6183> \xE5\x79 |0
-<U6187> \xFC\x7C |0
-<U6189> \xE5\x7E |0
-<U618A> \xBE\xCE |0
-<U618B> \xE5\x78 |0
-<U618C> \xE9\xA3 |0
-<U618D> \xE5\xA9 |0
-<U618E> \xBC\xA8 |0
-<U6190> \xBC\xA6 |0
-<U6191> \xBE\xCC |0
-<U6192> \xE5\xA6 |0
-<U6193> \xE5\xA2 |0
-<U6194> \xBC\xAC |0
-<U6195> \x9C\x50 |0
-<U6196> \xE9\x78 |0
-<U6198> \x93\x79 |0
-<U6199> \x93\x78 |0
-<U619A> \xBC\xAA |0
-<U619B> \xE5\xA1 |0
-<U619C> \xA0\xDD |0
-<U619D> \xE9\x76 |0
-<U619F> \xE5\xA5 |0
-<U61A1> \xE5\xA8 |0
-<U61A2> \xE5\x7D |0
-<U61A4> \xBC\xAB |0
-<U61A7> \xBC\xA5 |0
-<U61A8> \xE9\x77 |0
-<U61A9> \xBE\xCD |0
-<U61AA> \xE5\xA7 |0
-<U61AB> \xBC\xA7 |0
-<U61AC> \xBC\xA9 |0
-<U61AD> \xE5\xA4 |0
-<U61AE> \xBC\xAD |0
-<U61AF> \xE5\xA3 |0
-<U61B0> \xE5\x7C |0
-<U61B1> \xE5\x7B |0
-<U61B2> \xBE\xCB |0
-<U61B3> \xE5\xAB |0
-<U61B4> \xE9\x7A |0
-<U61B5> \xEC\xE0 |0
-<U61B6> \xBE\xD0 |0
-<U61B7> \x8D\x75 |0
-<U61B8> \xE9\xA2 |0
-<U61B9> \x8D\x76 |0
-<U61BA> \xE9\x7E |0
-<U61BC> \xEC\xE1 |0
-<U61BE> \xBE\xD1 |0
-<U61BF> \xE9\xA1 |0
-<U61C0> \x93\x74 |0
-<U61C1> \xE9\x7C |0
-<U61C2> \xC0\xB4 |0
-<U61C3> \xEC\xDF |0
-<U61C5> \xE9\x79 |0
-<U61C6> \xE9\x7B |0
-<U61C7> \xC0\xB5 |0
-<U61C8> \xBE\xD3 |0
-<U61C9> \xC0\xB3 |0
-<U61CA> \xBE\xD2 |0
-<U61CB> \xC0\xB7 |0
-<U61CC> \xE9\x7D |0
-<U61CD> \xBE\xCF |0
-<U61CF> \x8D\x77 |0
-<U61D0> \xFC\xA5 |0
-<U61D3> \xFC\xA2 |0
-<U61D6> \xEF\xCF |0
-<U61D8> \xEF\xC7 |0
-<U61DA> \x90\xC3 |0
-<U61DE> \xEC\xE7 |0
-<U61DF> \xEF\xC8 |0
-<U61E0> \xEC\xE3 |0
-<U61E2> \xA0\x79 |0
-<U61E3> \xC2\x56 |0
-<U61E4> \xEC\xE5 |0
-<U61E5> \xEC\xE4 |0
-<U61E6> \xC0\xB6 |0
-<U61E7> \xEC\xE2 |0
-<U61E8> \xEC\xE6 |0
-<U61E9> \xEF\xD0 |0
-<U61EA> \xEF\xCC |0
-<U61EB> \xEF\xCE |0
-<U61ED> \xEF\xC9 |0
-<U61EE> \xEF\xCA |0
-<U61F0> \xEF\xCD |0
-<U61F1> \xEF\xCB |0
-<U61F2> \xC3\x67 |0
-<U61F5> \xC3\x6A |0
-<U61F6> \xC3\x69 |0
-<U61F7> \xC3\x68 |0
-<U61F8> \xC4\x61 |0
-<U61F9> \xF4\x4A |0
-<U61FA> \xC4\x62 |0
-<U61FB> \xF2\x41 |0
-<U61FC> \xC4\xDF |0
-<U61FD> \xF5\xCC |0
-<U61FE> \xC4\xE0 |0
-<U61FF> \xC5\x74 |0
-<U6200> \xC5\xCA |0
-<U6201> \xF7\xD9 |0
-<U6203> \xF7\xDA |0
-<U6204> \xF7\xDB |0
-<U6207> \xF9\xBA |0
-<U6208> \xA4\xE0 |0
-<U6209> \xC9\x7C |0
-<U620A> \xA5\xB3 |0
-<U620C> \xA6\xA6 |0
-<U620D> \xA6\xA7 |0
-<U620E> \xA6\xA5 |0
-<U6210> \xA6\xA8 |0
-<U6211> \xA7\xDA |0
-<U6212> \xA7\xD9 |0
-<U6214> \xCC\xB1 |0
-<U6215> \xA9\xCF |0
-<U6216> \xA9\xCE |0
-<U6219> \xD1\xAF |0
-<U621A> \xB1\xAD |0
-<U621B> \xB1\xAE |0
-<U621F> \xB4\x75 |0
-<U6220> \xDD\x72 |0
-<U6221> \xB7\x60 |0
-<U6222> \xB7\x61 |0
-<U6223> \xDD\x74 |0
-<U6224> \xDD\x76 |0
-<U6225> \xDD\x75 |0
-<U6227> \xE1\xD7 |0
-<U6229> \xE1\xD6 |0
-<U622A> \xBA\x49 |0
-<U622B> \xE1\xD8 |0
-<U622C> \x8D\x79 |0
-<U622D> \xE5\xAC |0
-<U622E> \xBC\xAE |0
-<U6230> \xBE\xD4 |0
-<U6232> \xC0\xB8 |0
-<U6233> \xC2\x57 |0
-<U6234> \xC0\xB9 |0
-<U6236> \xA4\xE1 |0
-<U6237> \x8B\xFC |0
-<U6239> \xA0\x76 |0
-<U623A> \xCA\xE6 |0
-<U623D> \xCC\xB2 |0
-<U623E> \xA9\xD1 |0
-<U623F> \xA9\xD0 |0
-<U6240> \xA9\xD2 |0
-<U6241> \xAB\xF3 |0
-<U6242> \xCE\xD2 |0
-<U6243> \xCE\xD3 |0
-<U6246> \xD1\xB0 |0
-<U6247> \xAE\xB0 |0
-<U6248> \xB1\xAF |0
-<U6249> \xB4\x76 |0
-<U624A> \xD9\x51 |0
-<U624B> \xA4\xE2 |0
-<U624C> \x8B\xCD |0
-<U624D> \xA4\x7E |0
-<U624E> \xA4\xE3 |0
-<U6250> \xC9\x7D |0
-<U6251> \xA5\xB7 |0
-<U6252> \xA5\xB6 |0
-<U6253> \xA5\xB4 |0
-<U6254> \xA5\xB5 |0
-<U6258> \xA6\xAB |0
-<U6259> \xC9\xE9 |0
-<U625A> \xC9\xEB |0
-<U625B> \xA6\xAA |0
-<U625C> \xC9\xE3 |0
-<U625E> \xC9\xE4 |0
-<U6260> \xC9\xEA |0
-<U6261> \xC9\xE6 |0
-<U6262> \xC9\xE8 |0
-<U6263> \xA6\xA9 |0
-<U6264> \xC9\xE5 |0
-<U6265> \xC9\xEC |0
-<U6266> \xC9\xE7 |0
-<U6268> \x9F\x5A |0
-<U626D> \xA7\xE1 |0
-<U626E> \xA7\xEA |0
-<U626F> \xA7\xE8 |0
-<U6270> \xCA\xF0 |0
-<U6271> \xCA\xED |0
-<U6272> \xCA\xF5 |0
-<U6273> \xA7\xE6 |0
-<U6274> \xCA\xF6 |0
-<U6276> \xA7\xDF |0
-<U6277> \xCA\xF3 |0
-<U6279> \xA7\xE5 |0
-<U627A> \xCA\xEF |0
-<U627B> \xCA\xEE |0
-<U627C> \xA7\xE3 |0
-<U627D> \xCA\xF4 |0
-<U627E> \xA7\xE4 |0
-<U627F> \xA9\xD3 |0
-<U6280> \xA7\xDE |0
-<U6281> \xCA\xF1 |0
-<U6282> \x9F\xF4 |0
-<U6283> \xCA\xE7 |0
-<U6284> \xA7\xDB |0
-<U6285> \x9F\xBA |0
-<U6286> \xA7\xEE |0
-<U6287> \xCA\xEC |0
-<U6288> \xCA\xF2 |0
-<U6289> \xA7\xE0 |0
-<U628A> \xA7\xE2 |0
-<U628C> \xCA\xE8 |0
-<U628E> \xCA\xE9 |0
-<U628F> \xCA\xEA |0
-<U6290> \x8D\x7A |0
-<U6291> \xA7\xED |0
-<U6292> \xA7\xE7 |0
-<U6293> \xA7\xEC |0
-<U6294> \xCA\xEB |0
-<U6295> \xA7\xEB |0
-<U6296> \xA7\xDD |0
-<U6297> \xA7\xDC |0
-<U6298> \xA7\xE9 |0
-<U629D> \x9E\x45 |0
-<U62A4> \x93\xB0 |0
-<U62A6> \xA0\x75 |0
-<U62A8> \xA9\xE1 |0
-<U62A9> \xCC\xBE |0
-<U62AA> \xCC\xB7 |0
-<U62AB> \xA9\xDC |0
-<U62AC> \xA9\xEF |0
-<U62AD> \xCC\xB3 |0
-<U62AE> \xCC\xBA |0
-<U62AF> \xCC\xBC |0
-<U62B0> \xCC\xBF |0
-<U62B1> \xA9\xEA |0
-<U62B3> \xCC\xBB |0
-<U62B4> \xCC\xB4 |0
-<U62B5> \xA9\xE8 |0
-<U62B6> \xCC\xB8 |0
-<U62B8> \xCC\xC0 |0
-<U62B9> \xA9\xD9 |0
-<U62BB> \xCC\xBD |0
-<U62BC> \xA9\xE3 |0
-<U62BD> \xA9\xE2 |0
-<U62BE> \xCC\xB6 |0
-<U62BF> \xA9\xD7 |0
-<U62C2> \xA9\xD8 |0
-<U62C3> \x9B\x46 |0
-<U62C4> \xA9\xD6 |0
-<U62C5> \xFC\xAE |0
-<U62C6> \xA9\xEE |0
-<U62C7> \xA9\xE6 |0
-<U62C8> \xA9\xE0 |0
-<U62C9> \xA9\xD4 |0
-<U62CA> \xCC\xB9 |0
-<U62CB> \xA9\xDF |0
-<U62CC> \xA9\xD5 |0
-<U62CD> \xA9\xE7 |0
-<U62CE> \xA9\xF0 |0
-<U62CF> \xCE\xD4 |0
-<U62D0> \xA9\xE4 |0
-<U62D1> \xCC\xB5 |0
-<U62D2> \xA9\xDA |0
-<U62D3> \xA9\xDD |0
-<U62D4> \xA9\xDE |0
-<U62D5> \xFC\xB0 |0
-<U62D6> \xA9\xEC |0
-<U62D7> \xA9\xED |0
-<U62D8> \xA9\xEB |0
-<U62D9> \xA9\xE5 |0
-<U62DA> \xA9\xE9 |0
-<U62DB> \xA9\xDB |0
-<U62DC> \xAB\xF4 |0
-<U62DF> \xFA\x51 |0
-<U62E5> \x8D\x7B |0
-<U62EB> \xCE\xDA |0
-<U62EC> \xAC\x41 |0
-<U62ED> \xAB\xF8 |0
-<U62EE> \xAB\xFA |0
-<U62EF> \xAC\x40 |0
-<U62F0> \xCE\xE6 |0
-<U62F1> \xAB\xFD |0
-<U62F2> \xD1\xB1 |0
-<U62F3> \xAE\xB1 |0
-<U62F4> \xAC\x43 |0
-<U62F5> \xCE\xD7 |0
-<U62F6> \xCE\xDF |0
-<U62F7> \xAB\xFE |0
-<U62F8> \xCE\xDE |0
-<U62F9> \xCE\xDB |0
-<U62FA> \xCE\xE3 |0
-<U62FB> \xCE\xE5 |0
-<U62FC> \xAB\xF7 |0
-<U62FD> \xAB\xFB |0
-<U62FE> \xAC\x42 |0
-<U62FF> \xAE\xB3 |0
-<U6300> \xCE\xE0 |0
-<U6301> \xAB\xF9 |0
-<U6302> \xAC\x45 |0
-<U6303> \xCE\xD9 |0
-<U6307> \xAB\xFC |0
-<U6308> \xAE\xB2 |0
-<U6309> \xAB\xF6 |0
-<U630B> \xCE\xD6 |0
-<U630C> \xCE\xDD |0
-<U630D> \xCE\xD5 |0
-<U630E> \xCE\xD8 |0
-<U630F> \xCE\xDC |0
-<U6310> \xD1\xB2 |0
-<U6311> \xAC\x44 |0
-<U6313> \xCE\xE1 |0
-<U6314> \xCE\xE2 |0
-<U6315> \xCE\xE4 |0
-<U6316> \xAB\xF5 |0
-<U6318> \x8D\x7C |0
-<U6328> \xAE\xC1 |0
-<U6329> \xD1\xBE |0
-<U632A> \xAE\xBF |0
-<U632B> \xAE\xC0 |0
-<U632C> \xD1\xB4 |0
-<U632D> \xD1\xC4 |0
-<U632E> \x9E\xD6 |0
-<U632F> \xAE\xB6 |0
-<U6331> \x93\xAC |0
-<U6332> \xD5\x66 |0
-<U6333> \xD1\xC6 |0
-<U6334> \xD1\xC0 |0
-<U6335> \x9F\x5B |0
-<U6336> \xD1\xB7 |0
-<U6337> \x93\xA9 |0
-<U6338> \xD1\xC9 |0
-<U6339> \xD1\xBA |0
-<U633A> \xAE\xBC |0
-<U633B> \xD5\x7D |0
-<U633C> \xD1\xBD |0
-<U633D> \xAE\xBE |0
-<U633E> \xAE\xB5 |0
-<U6340> \xD1\xCB |0
-<U6341> \xD1\xBF |0
-<U6342> \xAE\xB8 |0
-<U6343> \xD1\xB8 |0
-<U6344> \xD1\xB5 |0
-<U6345> \xD1\xB6 |0
-<U6346> \xAE\xB9 |0
-<U6347> \xD1\xC5 |0
-<U6348> \xD1\xCC |0
-<U6349> \xAE\xBB |0
-<U634A> \xD1\xBC |0
-<U634B> \xD1\xBB |0
-<U634C> \xAE\xC3 |0
-<U634D> \xAE\xC2 |0
-<U634E> \xAE\xB4 |0
-<U634F> \xAE\xBA |0
-<U6350> \xAE\xBD |0
-<U6351> \xD1\xC8 |0
-<U6354> \xD1\xC2 |0
-<U6355> \xAE\xB7 |0
-<U6356> \xD1\xB3 |0
-<U6357> \xD1\xCA |0
-<U6358> \xD1\xC1 |0
-<U6359> \xD1\xC3 |0
-<U635A> \xD1\xC7 |0
-<U6364> \xA0\x7C |0
-<U6365> \xD5\x67 |0
-<U6367> \xB1\xB7 |0
-<U6368> \xB1\xCB |0
-<U6369> \xB1\xCA |0
-<U636B> \xB1\xBF |0
-<U636C> \xFC\xB2 |0
-<U636D> \xD5\x79 |0
-<U636E> \xD5\x75 |0
-<U636F> \xD5\x72 |0
-<U6370> \xD5\xA6 |0
-<U6371> \xB1\xBA |0
-<U6372> \xB1\xB2 |0
-<U6375> \xD5\x77 |0
-<U6376> \xB4\xA8 |0
-<U6377> \xB1\xB6 |0
-<U6378> \xD5\xA1 |0
-<U6379> \x8A\xC1 |0
-<U637A> \xB1\xCC |0
-<U637B> \xB1\xC9 |0
-<U637C> \xD5\x7B |0
-<U637D> \xD5\x6A |0
-<U637F> \x9F\xB4 |0
-<U6380> \xB1\xC8 |0
-<U6381> \xD5\xA3 |0
-<U6382> \xD5\x69 |0
-<U6383> \xB1\xBD |0
-<U6384> \xB1\xC1 |0
-<U6385> \xD5\xA2 |0
-<U6387> \xD5\x73 |0
-<U6388> \xB1\xC2 |0
-<U6389> \xB1\xBC |0
-<U638A> \xD5\x68 |0
-<U638B> \xFC\xAC |0
-<U638C> \xB4\x78 |0
-<U638D> \xD5\xA5 |0
-<U638E> \xD5\x71 |0
-<U638F> \xB1\xC7 |0
-<U6390> \xD5\x74 |0
-<U6391> \xD5\xA4 |0
-<U6392> \xB1\xC6 |0
-<U6394> \xD9\x52 |0
-<U6396> \xB1\xB3 |0
-<U6397> \xD5\x6F |0
-<U6398> \xB1\xB8 |0
-<U6399> \xB1\xC3 |0
-<U639B> \xB1\xBE |0
-<U639C> \xD5\x78 |0
-<U639D> \xD5\x6E |0
-<U639E> \xD5\x6C |0
-<U639F> \xD5\x7E |0
-<U63A0> \xB1\xB0 |0
-<U63A1> \xB1\xC4 |0
-<U63A2> \xB1\xB4 |0
-<U63A3> \xB4\x77 |0
-<U63A4> \xD5\x7C |0
-<U63A5> \xB1\xB5 |0
-<U63A7> \xB1\xB1 |0
-<U63A8> \xB1\xC0 |0
-<U63A9> \xB1\xBB |0
-<U63AA> \xB1\xB9 |0
-<U63AB> \xD5\x70 |0
-<U63AC> \xB1\xC5 |0
-<U63AD> \xD5\x6D |0
-<U63AE> \xD5\x7A |0
-<U63AF> \xD5\x76 |0
-<U63B0> \xD9\x54 |0
-<U63B1> \xD9\x53 |0
-<U63B9> \x9E\x4C |0
-<U63BD> \xD5\x6B |0
-<U63BE> \xD9\x64 |0
-<U63C0> \xB4\x7A |0
-<U63C1> \x8F\xC5 |0
-<U63C2> \xD9\x6A |0
-<U63C3> \xD9\x59 |0
-<U63C4> \xD9\x67 |0
-<U63C5> \xDD\x77 |0
-<U63C6> \xB4\x7D |0
-<U63C7> \xD9\x6B |0
-<U63C8> \xD9\x6E |0
-<U63C9> \xB4\x7C |0
-<U63CA> \xD9\x5C |0
-<U63CB> \xD9\x6D |0
-<U63CC> \xD9\x6C |0
-<U63CD> \xB4\x7E |0
-<U63CE> \xD9\x55 |0
-<U63CF> \xB4\x79 |0
-<U63D0> \xB4\xA3 |0
-<U63D1> \x93\xAD |0
-<U63D2> \xB4\xA1 |0
-<U63D3> \xD9\x69 |0
-<U63D5> \xD9\x5F |0
-<U63D6> \xB4\xA5 |0
-<U63D7> \xD9\x70 |0
-<U63D8> \xD9\x68 |0
-<U63D9> \xD9\x71 |0
-<U63DA> \xB4\xAD |0
-<U63DB> \xB4\xAB |0
-<U63DC> \xD9\x66 |0
-<U63DD> \xD9\x65 |0
-<U63DE> \x9D\xC3 |0
-<U63DF> \xD9\x63 |0
-<U63E0> \xD9\x5D |0
-<U63E1> \xB4\xA4 |0
-<U63E2> \x8D\xA2 |0
-<U63E3> \xB4\xA2 |0
-<U63E4> \xD1\xB9 |0
-<U63E5> \xD9\x56 |0
-<U63E6> \x9D\x4A |0
-<U63E7> \xDD\xB7 |0
-<U63E8> \xD9\x57 |0
-<U63E9> \xB4\x7B |0
-<U63EA> \xB4\xAA |0
-<U63EB> \xDD\x79 |0
-<U63ED> \xB4\xA6 |0
-<U63EE> \xB4\xA7 |0
-<U63EF> \xD9\x58 |0
-<U63F0> \xD9\x6F |0
-<U63F1> \xDD\x78 |0
-<U63F2> \xD9\x60 |0
-<U63F3> \xD9\x5B |0
-<U63F4> \xB4\xA9 |0
-<U63F5> \xD9\x61 |0
-<U63F6> \xD9\x5E |0
-<U63F8> \xFC\xB6 |0
-<U63F9> \xB4\xAE |0
-<U63FB> \x8D\xA3 |0
-<U63FC> \x9E\x4B |0
-<U63FE> \x9E\x4D |0
-<U6406> \xB7\x70 |0
-<U6407> \x8D\xA4 |0
-<U6409> \xDD\x7C |0
-<U640A> \xDD\xB1 |0
-<U640B> \xDD\xB6 |0
-<U640C> \xDD\xAA |0
-<U640D> \xB7\x6C |0
-<U640E> \xDD\xBB |0
-<U640F> \xB7\x69 |0
-<U6410> \xDD\x7A |0
-<U6412> \xDD\x7B |0
-<U6413> \xB7\x62 |0
-<U6414> \xB7\x6B |0
-<U6415> \xDD\xA4 |0
-<U6416> \xB7\x6E |0
-<U6417> \xB7\x6F |0
-<U6418> \xDD\xA5 |0
-<U641A> \xDD\xB2 |0
-<U641B> \xDD\xB8 |0
-<U641C> \xB7\x6A |0
-<U641E> \xB7\x64 |0
-<U641F> \xDD\xA3 |0
-<U6420> \xDD\x7D |0
-<U6421> \xDD\xBA |0
-<U6422> \xDD\xA8 |0
-<U6423> \xDD\xA9 |0
-<U6424> \xDD\x7E |0
-<U6425> \xDD\xB4 |0
-<U6426> \xDD\xAB |0
-<U6427> \xDD\xB5 |0
-<U6428> \xDD\xAD |0
-<U642A> \xB7\x65 |0
-<U642B> \xE1\xD9 |0
-<U642C> \xB7\x68 |0
-<U642D> \xB7\x66 |0
-<U642E> \xDD\xB9 |0
-<U642F> \xDD\xB0 |0
-<U6430> \xDD\xAC |0
-<U6432> \x8A\xFD |0
-<U6433> \xDD\xA1 |0
-<U6434> \xBA\x53 |0
-<U6435> \xDD\xAF |0
-<U6436> \xB7\x6D |0
-<U6437> \xDD\xA7 |0
-<U6438> \xFC\xB5 |0
-<U6439> \xDD\xA6 |0
-<U643A> \xFC\xC3 |0
-<U643B> \x93\xB2 |0
-<U643D> \xB7\x67 |0
-<U643E> \xB7\x63 |0
-<U643F> \xE1\xEE |0
-<U6440> \xDD\xB3 |0
-<U6441> \xDD\xAE |0
-<U6443> \xDD\xA2 |0
-<U644B> \xE1\xE9 |0
-<U644D> \xE1\xDA |0
-<U644E> \xE1\xE5 |0
-<U6450> \xE1\xEC |0
-<U6451> \xBA\x51 |0
-<U6452> \xB4\xAC |0
-<U6453> \xE1\xEA |0
-<U6454> \xBA\x4C |0
-<U6458> \xBA\x4B |0
-<U6459> \xE1\xF1 |0
-<U645A> \x8D\xA5 |0
-<U645B> \xE1\xDB |0
-<U645C> \xE1\xE8 |0
-<U645D> \xE1\xDC |0
-<U645E> \xE1\xE7 |0
-<U645F> \xBA\x4F |0
-<U6460> \xE1\xEB |0
-<U6461> \xD9\x62 |0
-<U6465> \xE1\xF2 |0
-<U6466> \xE1\xE3 |0
-<U6467> \xBA\x52 |0
-<U6468> \xE5\xBA |0
-<U6469> \xBC\xAF |0
-<U646B> \xE1\xF0 |0
-<U646C> \xE1\xEF |0
-<U646D> \xBA\x54 |0
-<U646E> \xE5\xAD |0
-<U646F> \xBC\xB0 |0
-<U6470> \xE5\xAE |0
-<U6471> \x93\xA1 |0
-<U6472> \xE1\xDF |0
-<U6473> \xE1\xE0 |0
-<U6474> \xE1\xDD |0
-<U6475> \xE1\xE2 |0
-<U6476> \xE1\xDE |0
-<U6477> \xE1\xF3 |0
-<U6478> \xBA\x4E |0
-<U6479> \xBC\xB1 |0
-<U647A> \xBA\x50 |0
-<U647B> \xBA\x55 |0
-<U647C> \x8A\xC6 |0
-<U647D> \xE1\xE1 |0
-<U647F> \xE1\xED |0
-<U6482> \xE1\xE6 |0
-<U6485> \xE5\xB1 |0
-<U6487> \xBA\x4A |0
-<U6488> \xBC\xB4 |0
-<U6489> \xE9\xAA |0
-<U648A> \xE5\xB6 |0
-<U648B> \xE5\xB5 |0
-<U648C> \xE5\xB7 |0
-<U648D> \x8A\x5B |0
-<U648F> \xE5\xB4 |0
-<U6490> \xBC\xB5 |0
-<U6491> \x89\x4D |0
-<U6492> \xBC\xBB |0
-<U6493> \xBC\xB8 |0
-<U6495> \xBC\xB9 |0
-<U6496> \xE5\xAF |0
-<U6497> \xE5\xB2 |0
-<U6498> \xE5\xBC |0
-<U6499> \xBC\xC1 |0
-<U649A> \xBC\xBF |0
-<U649C> \xE5\xB3 |0
-<U649D> \xD9\x5A |0
-<U649E> \xBC\xB2 |0
-<U649F> \xE5\xB9 |0
-<U64A0> \xE5\xB0 |0
-<U64A2> \xBC\xC2 |0
-<U64A3> \xE5\xB8 |0
-<U64A4> \xBA\x4D |0
-<U64A5> \xBC\xB7 |0
-<U64A6> \xE1\xE4 |0
-<U64A9> \xBC\xBA |0
-<U64AB> \xBC\xBE |0
-<U64AC> \xBC\xC0 |0
-<U64AD> \xBC\xBD |0
-<U64AE> \xBC\xBC |0
-<U64AF> \xFE\xD4 |0
-<U64B0> \xBC\xB6 |0
-<U64B1> \xE5\xBB |0
-<U64B2> \xBC\xB3 |0
-<U64B3> \xBC\xC3 |0
-<U64B4> \x8A\x78 |0
-<U64B6> \x93\xAB |0
-<U64BB> \xBE\xD8 |0
-<U64BC> \xBE\xD9 |0
-<U64BD> \xE9\xA9 |0
-<U64BE> \xBE\xE2 |0
-<U64BF> \xBE\xDF |0
-<U64C0> \x8D\xA7 |0
-<U64C1> \xBE\xD6 |0
-<U64C2> \xBE\xDD |0
-<U64C3> \xE9\xAB |0
-<U64C4> \xBE\xDB |0
-<U64C5> \xBE\xD5 |0
-<U64C7> \xBE\xDC |0
-<U64C9> \xE9\xA8 |0
-<U64CA> \xC0\xBB |0
-<U64CB> \xBE\xD7 |0
-<U64CD> \xBE\xDE |0
-<U64CE> \xC0\xBA |0
-<U64CF> \xE9\xA7 |0
-<U64D0> \xE9\xA6 |0
-<U64D2> \xBE\xE0 |0
-<U64D3> \x9F\x45 |0
-<U64D4> \xBE\xE1 |0
-<U64D6> \xE9\xA5 |0
-<U64D7> \xE9\xA4 |0
-<U64D8> \xC0\xBC |0
-<U64D9> \xE9\xAE |0
-<U64DA> \xBE\xDA |0
-<U64DB> \xE9\xAC |0
-<U64DD> \x8A\x56 |0
-<U64E0> \xC0\xBD |0
-<U64E1> \xFC\xBF |0
-<U64E2> \xC0\xC2 |0
-<U64E3> \xEC\xEA |0
-<U64E4> \xEC\xEC |0
-<U64E5> \xFC\xC0 |0
-<U64E6> \xC0\xBF |0
-<U64E7> \x8E\xE6 |0
-<U64E8> \xEC\xED |0
-<U64E9> \xEC\xE9 |0
-<U64EA> \x8A\xA4 |0
-<U64EB> \xEC\xEB |0
-<U64EC> \xC0\xC0 |0
-<U64ED> \xC0\xC3 |0
-<U64EF> \xEC\xE8 |0
-<U64F0> \xC0\xBE |0
-<U64F1> \xC0\xC1 |0
-<U64F2> \xC2\x59 |0
-<U64F3> \xE9\xAD |0
-<U64F4> \xC2\x58 |0
-<U64F7> \xC2\x5E |0
-<U64F8> \xEF\xD4 |0
-<U64FA> \xC2\x5C |0
-<U64FB> \xC2\x5D |0
-<U64FC> \xEF\xD7 |0
-<U64FD> \xEF\xD3 |0
-<U64FE> \xC2\x5A |0
-<U64FF> \xEF\xD1 |0
-<U6500> \xC3\x6B |0
-<U6501> \xEF\xD5 |0
-<U6503> \xEF\xD6 |0
-<U6504> \xEF\xD2 |0
-<U6506> \xC2\x5B |0
-<U6507> \xF2\x42 |0
-<U6509> \xF2\x45 |0
-<U650A> \x89\x43 |0
-<U650C> \xF2\x46 |0
-<U650D> \xF2\x44 |0
-<U650E> \xF2\x47 |0
-<U650F> \xC3\x6C |0
-<U6510> \xF2\x43 |0
-<U6511> \x93\xF3 |0
-<U6513> \xF4\x4E |0
-<U6514> \xC4\x64 |0
-<U6515> \xF4\x4D |0
-<U6516> \xF4\x4C |0
-<U6517> \xF4\x4B |0
-<U6518> \xC4\x63 |0
-<U6519> \xC4\x65 |0
-<U651B> \xF5\xCD |0
-<U651C> \xC4\xE2 |0
-<U651D> \xC4\xE1 |0
-<U651E> \xFC\xAB |0
-<U651F> \x9E\xA2 |0
-<U6520> \xF6\xE1 |0
-<U6521> \xF6\xE0 |0
-<U6522> \xF6\xE3 |0
-<U6523> \xC5\xCB |0
-<U6524> \xC5\x75 |0
-<U6525> \xF7\xDD |0
-<U6526> \xF6\xE2 |0
-<U6529> \xF7\xDC |0
-<U652A> \xC5\xCD |0
-<U652B> \xC5\xCC |0
-<U652C> \xC5\xF3 |0
-<U652D> \xF8\xA9 |0
-<U652E> \xF8\xEF |0
-<U652F> \xA4\xE4 |0
-<U6530> \x9D\xC7 |0
-<U6532> \xD9\x72 |0
-<U6533> \xE9\xAF |0
-<U6534> \xC6\xD2 |0
-<U6535> \x8B\xCE |0
-<U6536> \xA6\xAC |0
-<U6537> \xCA\xF7 |0
-<U6538> \xA7\xF1 |0
-<U6539> \xA7\xEF |0
-<U653B> \xA7\xF0 |0
-<U653D> \xCC\xC1 |0
-<U653E> \xA9\xF1 |0
-<U653F> \xAC\x46 |0
-<U6541> \xCE\xE7 |0
-<U6543> \xCE\xE8 |0
-<U6545> \xAC\x47 |0
-<U6546> \xD1\xCE |0
-<U6548> \xAE\xC4 |0
-<U6549> \xAE\xC5 |0
-<U654A> \xD1\xCD |0
-<U654D> \xFC\xC5 |0
-<U654F> \xB1\xD3 |0
-<U6551> \xB1\xCF |0
-<U6553> \xD5\xA7 |0
-<U6554> \xB1\xD6 |0
-<U6555> \xB1\xD5 |0
-<U6556> \xB1\xCE |0
-<U6557> \xB1\xD1 |0
-<U6558> \xB1\xD4 |0
-<U6559> \xB1\xD0 |0
-<U655C> \xD9\x76 |0
-<U655D> \xB1\xCD |0
-<U655E> \xB4\xAF |0
-<U655F> \xFC\xCB |0
-<U6562> \xB4\xB1 |0
-<U6563> \xB4\xB2 |0
-<U6564> \xD9\x75 |0
-<U6565> \xD9\x78 |0
-<U6566> \xB4\xB0 |0
-<U6567> \xD9\x73 |0
-<U6568> \xD9\x77 |0
-<U656A> \xD9\x74 |0
-<U656B> \x93\xB3 |0
-<U656C> \xB7\x71 |0
-<U656D> \xFC\xCA |0
-<U656F> \xDD\xBC |0
-<U6572> \xBA\x56 |0
-<U6573> \xE1\xF4 |0
-<U6574> \xBE\xE3 |0
-<U6575> \xBC\xC4 |0
-<U6576> \xE5\xBD |0
-<U6577> \xBC\xC5 |0
-<U6578> \xBC\xC6 |0
-<U6579> \xE5\xBF |0
-<U657A> \xE5\xBE |0
-<U657B> \xE5\xC0 |0
-<U657C> \xE9\xB1 |0
-<U657F> \xE9\xB0 |0
-<U6580> \xEC\xEF |0
-<U6581> \xEC\xEE |0
-<U6582> \xC0\xC4 |0
-<U6583> \xC0\xC5 |0
-<U6584> \xF2\x48 |0
-<U6585> \xFC\xC9 |0
-<U6586> \x8D\xAC |0
-<U6587> \xA4\xE5 |0
-<U6588> \xFB\xC6 |0
-<U6589> \x89\x67 |0
-<U658B> \x8C\x7E |0
-<U658C> \xD9\x79 |0
-<U6590> \xB4\xB4 |0
-<U6591> \xB4\xB3 |0
-<U6592> \xDD\xBD |0
-<U6594> \xEF\xD8 |0
-<U6595> \xC4\xE3 |0
-<U6596> \xF7\xDE |0
-<U6597> \xA4\xE6 |0
-<U6599> \xAE\xC6 |0
-<U659B> \xB1\xD8 |0
-<U659C> \xB1\xD7 |0
-<U659D> \xD9\x7A |0
-<U659E> \xD9\x7B |0
-<U659F> \xB7\x72 |0
-<U65A0> \xE1\xF5 |0
-<U65A1> \xBA\x57 |0
-<U65A2> \xE9\xB2 |0
-<U65A4> \xA4\xE7 |0
-<U65A5> \xA5\xB8 |0
-<U65A7> \xA9\xF2 |0
-<U65A8> \xCC\xC2 |0
-<U65AA> \xCE\xE9 |0
-<U65AB> \xAC\x48 |0
-<U65AC> \xB1\xD9 |0
-<U65AE> \xD9\x7C |0
-<U65AF> \xB4\xB5 |0
-<U65B0> \xB7\x73 |0
-<U65B2> \xE5\xC1 |0
-<U65B3> \xE5\xC2 |0
-<U65B5> \xFC\xCD |0
-<U65B6> \xEC\xF0 |0
-<U65B7> \xC2\x5F |0
-<U65B8> \xF8\xF0 |0
-<U65B9> \xA4\xE8 |0
-<U65BB> \xCC\xC3 |0
-<U65BC> \xA9\xF3 |0
-<U65BD> \xAC\x49 |0
-<U65BE> \x9C\xF3 |0
-<U65BF> \xCE\xEA |0
-<U65C1> \xAE\xC7 |0
-<U65C2> \xD1\xD2 |0
-<U65C3> \xD1\xD0 |0
-<U65C4> \xD1\xD1 |0
-<U65C5> \xAE\xC8 |0
-<U65C6> \xD1\xCF |0
-<U65CB> \xB1\xDB |0
-<U65CC> \xB1\xDC |0
-<U65CD> \xD5\xA8 |0
-<U65CE> \xB1\xDD |0
-<U65CF> \xB1\xDA |0
-<U65D0> \xD9\x7D |0
-<U65D1> \xFC\xD0 |0
-<U65D2> \xD9\x7E |0
-<U65D3> \xDD\xBE |0
-<U65D4> \x95\xBB |0
-<U65D6> \xBA\x59 |0
-<U65D7> \xBA\x58 |0
-<U65DA> \xEC\xF1 |0
-<U65DB> \xEF\xD9 |0
-<U65DD> \xF2\x4A |0
-<U65DE> \xF2\x49 |0
-<U65DF> \xF4\x4F |0
-<U65E0> \xFC\xD3 |0
-<U65E1> \xC9\x5E |0
-<U65E2> \xAC\x4A |0
-<U65E3> \xFC\xD4 |0
-<U65E5> \xA4\xE9 |0
-<U65E6> \xA5\xB9 |0
-<U65E8> \xA6\xAE |0
-<U65E9> \xA6\xAD |0
-<U65EC> \xA6\xAF |0
-<U65ED> \xA6\xB0 |0
-<U65EE> \xC9\xEE |0
-<U65EF> \xC9\xED |0
-<U65F0> \xCA\xF8 |0
-<U65F1> \xA7\xF2 |0
-<U65F2> \xCA\xFB |0
-<U65F3> \xCA\xFA |0
-<U65F4> \xCA\xF9 |0
-<U65F5> \xCA\xFC |0
-<U65FA> \xA9\xF4 |0
-<U65FB> \xCC\xC9 |0
-<U65FC> \xCC\xC5 |0
-<U65FD> \xCC\xCE |0
-<U65FF> \x8D\xAE |0
-<U6600> \xA9\xFB |0
-<U6602> \xA9\xF9 |0
-<U6603> \xCC\xCA |0
-<U6604> \xCC\xC6 |0
-<U6605> \xCC\xCD |0
-<U6606> \xA9\xF8 |0
-<U6607> \xAA\x40 |0
-<U6608> \xCC\xC8 |0
-<U6609> \xCC\xC4 |0
-<U660A> \xA9\xFE |0
-<U660B> \xCC\xCB |0
-<U660C> \xA9\xF7 |0
-<U660D> \xCC\xCC |0
-<U660E> \xA9\xFA |0
-<U660F> \xA9\xFC |0
-<U6610> \xCC\xD0 |0
-<U6611> \xCC\xCF |0
-<U6612> \xCC\xC7 |0
-<U6613> \xA9\xF6 |0
-<U6614> \xA9\xF5 |0
-<U6615> \xA9\xFD |0
-<U6618> \xFC\xD7 |0
-<U661C> \xCE\xEF |0
-<U661D> \xCE\xF5 |0
-<U661E> \x93\xDB |0
-<U661F> \xAC\x50 |0
-<U6620> \xAC\x4D |0
-<U6621> \xCE\xEC |0
-<U6622> \xCE\xF1 |0
-<U6623> \xFE\x63 |0
-<U6624> \xAC\x53 |0
-<U6625> \xAC\x4B |0
-<U6626> \xCE\xF0 |0
-<U6627> \xAC\x4E |0
-<U6628> \xAC\x51 |0
-<U662B> \xCE\xF3 |0
-<U662D> \xAC\x4C |0
-<U662E> \xCE\xF8 |0
-<U662F> \xAC\x4F |0
-<U6630> \x93\xD5 |0
-<U6631> \xAC\x52 |0
-<U6632> \xCE\xED |0
-<U6633> \xCE\xF2 |0
-<U6634> \xCE\xF6 |0
-<U6635> \xCE\xEE |0
-<U6636> \xCE\xEB |0
-<U6639> \xCE\xF7 |0
-<U663A> \xCE\xF4 |0
-<U6641> \xAE\xD0 |0
-<U6642> \xAE\xC9 |0
-<U6643> \xAE\xCC |0
-<U6644> \xFC\xDA |0
-<U6645> \xAE\xCF |0
-<U6647> \xD1\xD5 |0
-<U6648> \x9B\x71 |0
-<U6649> \xAE\xCA |0
-<U664A> \xD1\xD3 |0
-<U664B> \xFC\xDD |0
-<U664C> \xAE\xCE |0
-<U664F> \xAE\xCB |0
-<U6651> \xD1\xD6 |0
-<U6652> \xAE\xCD |0
-<U6653> \x8D\xAF |0
-<U6657> \xFA\xF2 |0
-<U6659> \xD5\xAC |0
-<U665A> \xB1\xDF |0
-<U665B> \xD5\xAB |0
-<U665C> \xD5\xAD |0
-<U665D> \xB1\xDE |0
-<U665E> \xB1\xE3 |0
-<U665F> \xD1\xD4 |0
-<U6661> \xD5\xAA |0
-<U6662> \xD5\xAE |0
-<U6663> \x93\xD8 |0
-<U6664> \xB1\xE0 |0
-<U6665> \xD5\xA9 |0
-<U6666> \xB1\xE2 |0
-<U6667> \xFC\xDF |0
-<U6668> \xB1\xE1 |0
-<U666A> \xD9\xA7 |0
-<U666B> \x93\xD3 |0
-<U666C> \xD9\xA2 |0
-<U666E> \xB4\xB6 |0
-<U666F> \xB4\xBA |0
-<U6670> \xB4\xB7 |0
-<U6671> \xD9\xA5 |0
-<U6672> \xD9\xA8 |0
-<U6673> \xFC\xE1 |0
-<U6674> \xB4\xB8 |0
-<U6676> \xB4\xB9 |0
-<U6677> \xB4\xBE |0
-<U6678> \xDD\xC7 |0
-<U6679> \xD9\xA6 |0
-<U667A> \xB4\xBC |0
-<U667B> \xD9\xA3 |0
-<U667C> \xD9\xA1 |0
-<U667D> \x8E\x76 |0
-<U667E> \xB4\xBD |0
-<U6680> \xD9\xA4 |0
-<U6684> \xB7\x79 |0
-<U6685> \xFC\x62 |0
-<U6686> \xDD\xBF |0
-<U6687> \xB7\x76 |0
-<U6688> \xB7\x77 |0
-<U6689> \xB7\x75 |0
-<U668A> \xDD\xC4 |0
-<U668B> \xDD\xC3 |0
-<U668C> \xDD\xC0 |0
-<U668D> \xB7\x7B |0
-<U668E> \x93\xD1 |0
-<U6690> \xDD\xC2 |0
-<U6691> \xB4\xBB |0
-<U6692> \x8D\xB1 |0
-<U6694> \xDD\xC6 |0
-<U6695> \xDD\xC1 |0
-<U6696> \xB7\x78 |0
-<U6697> \xB7\x74 |0
-<U6698> \xB7\x7A |0
-<U6699> \xDD\xC5 |0
-<U669A> \x98\x59 |0
-<U669D> \xBA\x5C |0
-<U669F> \xE1\xF8 |0
-<U66A0> \xE1\xF7 |0
-<U66A1> \xE1\xF6 |0
-<U66A2> \xBA\x5A |0
-<U66A4> \xFB\x52 |0
-<U66A8> \xBA\x5B |0
-<U66A9> \xE5\xC5 |0
-<U66AA> \xE5\xC8 |0
-<U66AB> \xBC\xC8 |0
-<U66AD> \xFB\x53 |0
-<U66AE> \xBC\xC7 |0
-<U66AF> \xE5\xC9 |0
-<U66B0> \xE5\xC4 |0
-<U66B1> \xBC\xCA |0
-<U66B2> \xE5\xC6 |0
-<U66B3> \xFB\x4D |0
-<U66B4> \xBC\xC9 |0
-<U66B5> \xE5\xC3 |0
-<U66B6> \x9C\xBF |0
-<U66B7> \xE5\xC7 |0
-<U66B8> \xBE\xE9 |0
-<U66B9> \xBE\xE6 |0
-<U66BA> \xE9\xBB |0
-<U66BB> \xE9\xBA |0
-<U66BD> \xE9\xB9 |0
-<U66BE> \xE9\xB4 |0
-<U66BF> \x9B\x72 |0
-<U66C0> \xE9\xB5 |0
-<U66C4> \xBE\xE7 |0
-<U66C6> \xBE\xE4 |0
-<U66C7> \xBE\xE8 |0
-<U66C8> \xE9\xB3 |0
-<U66C9> \xBE\xE5 |0
-<U66CA> \xE9\xB6 |0
-<U66CB> \xE9\xB7 |0
-<U66CC> \xE9\xBC |0
-<U66CD> \xFB\x50 |0
-<U66CE> \x93\xBE |0
-<U66CF> \xE9\xB8 |0
-<U66D2> \xEC\xF2 |0
-<U66D6> \xC0\xC7 |0
-<U66D8> \xEF\xDC |0
-<U66D9> \xC0\xC6 |0
-<U66DA> \xEF\xDA |0
-<U66DB> \xEF\xDB |0
-<U66DC> \xC2\x60 |0
-<U66DD> \xC3\x6E |0
-<U66DE> \xF2\x4B |0
-<U66E0> \xC3\x6D |0
-<U66E3> \xF4\x51 |0
-<U66E4> \xF4\x52 |0
-<U66E6> \xC4\x66 |0
-<U66E8> \xF4\x50 |0
-<U66E9> \xC4\xE4 |0
-<U66EB> \xF7\xDF |0
-<U66EC> \xC5\xCE |0
-<U66ED> \xF8\xAA |0
-<U66EE> \xF8\xAB |0
-<U66F0> \xA4\xEA |0
-<U66F1> \x9D\xF1 |0
-<U66F2> \xA6\xB1 |0
-<U66F3> \xA6\xB2 |0
-<U66F4> \xA7\xF3 |0
-<U66F6> \xCC\xD1 |0
-<U66F7> \xAC\x54 |0
-<U66F8> \xAE\xD1 |0
-<U66F9> \xB1\xE4 |0
-<U66FC> \xB0\xD2 |0
-<U66FE> \xB4\xBF |0
-<U66FF> \xB4\xC0 |0
-<U6700> \xB3\xCC |0
-<U6701> \xD9\xA9 |0
-<U6702> \xFC\xEB |0
-<U6703> \xB7\x7C |0
-<U6704> \xE1\xFA |0
-<U6705> \xE1\xF9 |0
-<U6708> \xA4\xEB |0
-<U6709> \xA6\xB3 |0
-<U670A> \xCC\xD2 |0
-<U670B> \xAA\x42 |0
-<U670C> \xA0\xBB |0
-<U670D> \xAA\x41 |0
-<U670E> \x9B\x7E |0
-<U670F> \xCE\xF9 |0
-<U6710> \xCE\xFA |0
-<U6712> \xD1\xD7 |0
-<U6713> \xD1\xD8 |0
-<U6714> \xAE\xD2 |0
-<U6715> \xAE\xD3 |0
-<U6716> \x8D\xB3 |0
-<U6717> \xAE\xD4 |0
-<U6718> \xD5\xAF |0
-<U6719> \x8C\x52 |0
-<U671B> \xB1\xE6 |0
-<U671D> \xB4\xC2 |0
-<U671E> \x9A\xE8 |0
-<U671F> \xB4\xC1 |0
-<U6720> \xDD\xC8 |0
-<U6721> \xDF\x7A |0
-<U6722> \xE1\xFB |0
-<U6723> \xE9\xBD |0
-<U6725> \x8E\xDC |0
-<U6726> \xC2\x61 |0
-<U6727> \xC4\x67 |0
-<U6728> \xA4\xEC |0
-<U672A> \xA5\xBC |0
-<U672B> \xA5\xBD |0
-<U672C> \xA5\xBB |0
-<U672D> \xA5\xBE |0
-<U672E> \xA5\xBA |0
-<U6731> \xA6\xB6 |0
-<U6733> \xC9\xF6 |0
-<U6734> \xA6\xB5 |0
-<U6735> \xA6\xB7 |0
-<U6736> \x9C\xF9 |0
-<U6738> \xC9\xF1 |0
-<U6739> \xC9\xF0 |0
-<U673A> \xC9\xF3 |0
-<U673B> \xC9\xF2 |0
-<U673C> \xC9\xF5 |0
-<U673D> \xA6\xB4 |0
-<U673E> \xC9\xEF |0
-<U673F> \xC9\xF4 |0
-<U6744> \xFA\x50 |0
-<U6745> \xCA\xFD |0
-<U6746> \xA7\xFD |0
-<U6747> \xCA\xFE |0
-<U6748> \xCB\x43 |0
-<U6749> \xA7\xFC |0
-<U674B> \xCB\x47 |0
-<U674C> \xCB\x42 |0
-<U674D> \xCB\x45 |0
-<U674E> \xA7\xF5 |0
-<U674F> \xA7\xF6 |0
-<U6750> \xA7\xF7 |0
-<U6751> \xA7\xF8 |0
-<U6753> \xA8\x40 |0
-<U6755> \xCB\x41 |0
-<U6756> \xA7\xFA |0
-<U6757> \xA8\x41 |0
-<U6759> \xCB\x40 |0
-<U675A> \xCB\x46 |0
-<U675C> \xA7\xF9 |0
-<U675D> \xCB\x44 |0
-<U675E> \xA7\xFB |0
-<U675F> \xA7\xF4 |0
-<U6760> \xA7\xFE |0
-<U6761> \x98\xE7 |0
-<U6762> \xFC\xF3 |0
-<U6767> \xFC\xF2 |0
-<U676A> \xAA\x57 |0
-<U676B> \x8C\xCA |0
-<U676C> \xCC\xD4 |0
-<U676D> \xAA\x43 |0
-<U676F> \xAA\x4D |0
-<U6770> \xAA\x4E |0
-<U6771> \xAA\x46 |0
-<U6772> \xAA\x58 |0
-<U6773> \xAA\x48 |0
-<U6774> \xCC\xDC |0
-<U6775> \xAA\x53 |0
-<U6776> \xCC\xD7 |0
-<U6777> \xAA\x49 |0
-<U6778> \xCC\xE6 |0
-<U6779> \xCC\xE7 |0
-<U677A> \xCC\xDF |0
-<U677B> \xCC\xD8 |0
-<U677C> \xAA\x56 |0
-<U677D> \xCC\xE4 |0
-<U677E> \xAA\x51 |0
-<U677F> \xAA\x4F |0
-<U6781> \xCC\xE5 |0
-<U6783> \xCC\xE3 |0
-<U6784> \xCC\xDB |0
-<U6785> \xCC\xD3 |0
-<U6786> \xCC\xDA |0
-<U6787> \xAA\x4A |0
-<U6789> \xAA\x50 |0
-<U678B> \xAA\x44 |0
-<U678C> \xCC\xDE |0
-<U678D> \xCC\xDD |0
-<U678E> \xCC\xD5 |0
-<U678F> \x93\xE5 |0
-<U6790> \xAA\x52 |0
-<U6791> \xCC\xE1 |0
-<U6792> \xCC\xD6 |0
-<U6793> \xAA\x55 |0
-<U6794> \xCC\xE8 |0
-<U6795> \xAA\x45 |0
-<U6797> \xAA\x4C |0
-<U6798> \xCC\xD9 |0
-<U6799> \xCC\xE2 |0
-<U679A> \xAA\x54 |0
-<U679C> \xAA\x47 |0
-<U679D> \xAA\x4B |0
-<U679F> \xCC\xE0 |0
-<U67A0> \x9A\x59 |0
-<U67A4> \x8D\xB5 |0
-<U67AC> \xFD\x4D |0
-<U67AE> \xCF\x5B |0
-<U67AF> \xAC\x5C |0
-<U67B0> \xAC\x69 |0
-<U67B1> \xFD\x5E |0
-<U67B2> \xCF\x56 |0
-<U67B3> \xCF\x4C |0
-<U67B4> \xAC\x62 |0
-<U67B5> \xCF\x4A |0
-<U67B6> \xAC\x5B |0
-<U67B7> \xCF\x45 |0
-<U67B8> \xAC\x65 |0
-<U67B9> \xCF\x52 |0
-<U67BA> \xCE\xFE |0
-<U67BB> \xCF\x41 |0
-<U67BF> \x8F\x7D |0
-<U67C0> \xCF\x44 |0
-<U67C1> \xCE\xFB |0
-<U67C2> \xCF\x51 |0
-<U67C3> \xCF\x61 |0
-<U67C4> \xAC\x60 |0
-<U67C5> \xCF\x46 |0
-<U67C6> \xCF\x58 |0
-<U67C8> \xCE\xFD |0
-<U67C9> \xCF\x5F |0
-<U67CA> \xCF\x60 |0
-<U67CB> \xCF\x63 |0
-<U67CC> \xCF\x5A |0
-<U67CD> \xCF\x4B |0
-<U67CE> \xCF\x53 |0
-<U67CF> \xAC\x66 |0
-<U67D0> \xAC\x59 |0
-<U67D1> \xAC\x61 |0
-<U67D2> \xAC\x6D |0
-<U67D3> \xAC\x56 |0
-<U67D4> \xAC\x58 |0
-<U67D6> \x95\x47 |0
-<U67D7> \xFC\xF6 |0
-<U67D8> \xCF\x43 |0
-<U67D9> \xAC\x6A |0
-<U67DA> \xAC\x63 |0
-<U67DB> \xCF\x5D |0
-<U67DC> \xCF\x40 |0
-<U67DD> \xAC\x6C |0
-<U67DE> \xAC\x67 |0
-<U67DF> \xCF\x49 |0
-<U67E2> \xAC\x6B |0
-<U67E3> \xCF\x50 |0
-<U67E4> \xCF\x48 |0
-<U67E5> \xAC\x64 |0
-<U67E6> \xCF\x5C |0
-<U67E7> \xCF\x54 |0
-<U67E9> \xAC\x5E |0
-<U67EA> \xCF\x62 |0
-<U67EB> \xCF\x47 |0
-<U67EC> \xAC\x5A |0
-<U67ED> \xCF\x59 |0
-<U67EE> \xCF\x4F |0
-<U67EF> \xAC\x5F |0
-<U67F0> \xCF\x55 |0
-<U67F1> \xAC\x57 |0
-<U67F2> \xCE\xFC |0
-<U67F3> \xAC\x68 |0
-<U67F4> \xAE\xE3 |0
-<U67F5> \xAC\x5D |0
-<U67F6> \xCF\x4E |0
-<U67F7> \xCF\x4D |0
-<U67F8> \xCF\x42 |0
-<U67F9> \x92\x50 |0
-<U67FA> \xCF\x5E |0
-<U67FC> \xCF\x57 |0
-<U67FE> \x89\x68 |0
-<U67FF> \xAC\x55 |0
-<U6800> \x8D\xB6 |0
-<U6801> \xFC\xFB |0
-<U6802> \xA0\x7D |0
-<U6803> \x98\xFC |0
-<U6804> \x89\x69 |0
-<U680D> \xFE\x4F |0
-<U6810> \x92\x56 |0
-<U6812> \xD1\xEC |0
-<U6813> \xAE\xEA |0
-<U6814> \xD1\xED |0
-<U6816> \xD1\xE1 |0
-<U6817> \xAE\xDF |0
-<U6818> \xAE\xEB |0
-<U681A> \xD1\xDA |0
-<U681B> \xFA\xC9 |0
-<U681C> \xD1\xE3 |0
-<U681D> \xD1\xEB |0
-<U681E> \x93\xE8 |0
-<U681F> \xD1\xD9 |0
-<U6820> \xD1\xF4 |0
-<U6821> \xAE\xD5 |0
-<U6822> \xFC\xF8 |0
-<U6825> \xD1\xF3 |0
-<U6826> \xD1\xEE |0
-<U6828> \xD1\xEF |0
-<U6829> \xAE\xDD |0
-<U682A> \xAE\xE8 |0
-<U682B> \xD1\xE5 |0
-<U682D> \xD1\xE6 |0
-<U682E> \xD1\xF0 |0
-<U682F> \xD1\xE7 |0
-<U6831> \xD1\xE2 |0
-<U6832> \xD1\xDC |0
-<U6833> \xD1\xDD |0
-<U6834> \xD1\xEA |0
-<U6835> \xD1\xE4 |0
-<U6836> \x9C\xE3 |0
-<U6837> \xFD\xA9 |0
-<U6838> \xAE\xD6 |0
-<U6839> \xAE\xDA |0
-<U683A> \xD1\xF2 |0
-<U683B> \xD1\xDE |0
-<U683C> \xAE\xE6 |0
-<U683D> \xAE\xE2 |0
-<U683E> \xFC\x44 |0
-<U6840> \xAE\xE5 |0
-<U6841> \xAE\xEC |0
-<U6842> \xAE\xDB |0
-<U6843> \xAE\xE7 |0
-<U6844> \xD1\xE9 |0
-<U6845> \xAE\xE9 |0
-<U6846> \xAE\xD8 |0
-<U6847> \x96\x40 |0
-<U6848> \xAE\xD7 |0
-<U6849> \xD1\xDB |0
-<U684A> \x8D\xB8 |0
-<U684B> \xD1\xDF |0
-<U684C> \xAE\xE0 |0
-<U684D> \xD1\xF1 |0
-<U684E> \xD1\xE8 |0
-<U684F> \xD1\xE0 |0
-<U6850> \xAE\xE4 |0
-<U6851> \xAE\xE1 |0
-<U6853> \xAE\xD9 |0
-<U6854> \xAE\xDC |0
-<U6855> \x9B\x4A |0
-<U6856> \x8F\xB9 |0
-<U685D> \xFC\xFE |0
-<U6865> \x89\x6A |0
-<U686B> \xD5\xC4 |0
-<U686D> \xD5\xB4 |0
-<U686E> \xD5\xB5 |0
-<U686F> \xD5\xB9 |0
-<U6871> \xD5\xC8 |0
-<U6872> \xD5\xC5 |0
-<U6874> \xD5\xBE |0
-<U6875> \xD5\xBD |0
-<U6876> \xB1\xED |0
-<U6877> \xD5\xC1 |0
-<U6878> \xD5\xD0 |0
-<U6879> \xD5\xB0 |0
-<U687B> \xD5\xD1 |0
-<U687C> \xD5\xC3 |0
-<U687D> \xD5\xD5 |0
-<U687E> \xD5\xC9 |0
-<U687F> \xB1\xEC |0
-<U6880> \xD5\xC7 |0
-<U6881> \xB1\xE7 |0
-<U6882> \xB1\xFC |0
-<U6883> \xB1\xF2 |0
-<U6884> \x8D\xB9 |0
-<U6885> \xB1\xF6 |0
-<U6886> \xB1\xF5 |0
-<U6887> \xD5\xB1 |0
-<U6888> \x91\x7E |0
-<U6889> \xD5\xCE |0
-<U688A> \xD5\xD4 |0
-<U688B> \xD5\xCC |0
-<U688C> \xD5\xD3 |0
-<U688F> \xD5\xC0 |0
-<U6890> \xD5\xB2 |0
-<U6891> \xD5\xD2 |0
-<U6892> \xD5\xC2 |0
-<U6893> \xB1\xEA |0
-<U6894> \xB1\xF7 |0
-<U6896> \xD5\xCB |0
-<U6897> \xB1\xF0 |0
-<U6898> \x93\xF4 |0
-<U689B> \xD5\xCA |0
-<U689C> \xD5\xB3 |0
-<U689D> \xB1\xF8 |0
-<U689F> \xB1\xFA |0
-<U68A0> \xD5\xCD |0
-<U68A1> \xB1\xFB |0
-<U68A2> \xB1\xE9 |0
-<U68A3> \xD5\xBA |0
-<U68A4> \xD5\xCF |0
-<U68A6> \xFB\x7C |0
-<U68A7> \xB1\xEF |0
-<U68A8> \xB1\xF9 |0
-<U68A9> \xD5\xBC |0
-<U68AA> \xD5\xC6 |0
-<U68AB> \xD5\xB7 |0
-<U68AC> \xD5\xBB |0
-<U68AD> \xB1\xF4 |0
-<U68AE> \xD5\xB6 |0
-<U68AF> \xB1\xE8 |0
-<U68B0> \xB1\xF1 |0
-<U68B1> \xB1\xEE |0
-<U68B2> \xD5\xBF |0
-<U68B3> \xAE\xDE |0
-<U68B4> \xD9\xC0 |0
-<U68B5> \xB1\xEB |0
-<U68B6> \x93\xE7 |0
-<U68B9> \x97\xEF |0
-<U68BD> \xFE\x4A |0
-<U68C3> \xFD\x45 |0
-<U68C4> \xB1\xF3 |0
-<U68C5> \x96\xA5 |0
-<U68C6> \xD9\xC3 |0
-<U68C7> \xD9\xD9 |0
-<U68C8> \xD9\xCE |0
-<U68C9> \xB4\xD6 |0
-<U68CA> \xFE\xE0 |0
-<U68CB> \xB4\xD1 |0
-<U68CC> \xD9\xBD |0
-<U68CD> \xB4\xD2 |0
-<U68CE> \xD9\xCD |0
-<U68D0> \xD9\xC6 |0
-<U68D1> \xD9\xD3 |0
-<U68D2> \xB4\xCE |0
-<U68D3> \xD9\xAB |0
-<U68D4> \xD9\xD5 |0
-<U68D5> \xB4\xC4 |0
-<U68D6> \xD9\xB3 |0
-<U68D7> \xB4\xC7 |0
-<U68D8> \xB4\xC6 |0
-<U68DA> \xB4\xD7 |0
-<U68DC> \xD9\xAD |0
-<U68DD> \xD9\xCF |0
-<U68DE> \xD9\xD0 |0
-<U68DF> \xB4\xC9 |0
-<U68E0> \xB4\xC5 |0
-<U68E1> \xD9\xBB |0
-<U68E3> \xB4\xD0 |0
-<U68E4> \xD9\xB6 |0
-<U68E6> \xD9\xD1 |0
-<U68E7> \xB4\xCC |0
-<U68E8> \xD9\xC9 |0
-<U68E9> \xD9\xD6 |0
-<U68EA> \xD9\xB0 |0
-<U68EB> \xD9\xB5 |0
-<U68EC> \xD9\xAF |0
-<U68EE> \xB4\xCB |0
-<U68EF> \xD9\xC2 |0
-<U68F0> \xDD\xDE |0
-<U68F1> \xD9\xB1 |0
-<U68F2> \xB4\xCF |0
-<U68F3> \xD9\xBA |0
-<U68F4> \xD9\xD2 |0
-<U68F5> \xB4\xCA |0
-<U68F6> \xD9\xB7 |0
-<U68F7> \xD9\xB4 |0
-<U68F8> \xD9\xC5 |0
-<U68F9> \xB4\xCD |0
-<U68FA> \xB4\xC3 |0
-<U68FB> \xB4\xD9 |0
-<U68FC> \xD9\xC8 |0
-<U68FD> \xD9\xC7 |0
-<U6900> \xFD\x48 |0
-<U6901> \xFD\x47 |0
-<U6902> \xFE\xF2 |0
-<U6903> \xFE\x6A |0
-<U6904> \xD9\xAC |0
-<U6905> \xB4\xC8 |0
-<U6906> \xD9\xD4 |0
-<U6907> \xD9\xBC |0
-<U6908> \xD9\xBE |0
-<U6909> \x8D\xBD |0
-<U690A> \xD9\xCB |0
-<U690B> \xD9\xCA |0
-<U690C> \xD9\xAA |0
-<U690D> \xB4\xD3 |0
-<U690E> \xB4\xD5 |0
-<U690F> \xD9\xB2 |0
-<U6910> \xD9\xB9 |0
-<U6911> \xD9\xC1 |0
-<U6912> \xB4\xD4 |0
-<U6913> \xD9\xB8 |0
-<U6914> \xD9\xC4 |0
-<U6915> \xD9\xD7 |0
-<U6917> \xD9\xCC |0
-<U6918> \x9B\xA1 |0
-<U6919> \x8C\xA2 |0
-<U691A> \x9A\xB7 |0
-<U691B> \x8E\xFC |0
-<U6925> \xD9\xD8 |0
-<U692A> \xD9\xAE |0
-<U692C> \x9F\xA1 |0
-<U692F> \xDD\xF2 |0
-<U6930> \xB7\xA6 |0
-<U6932> \xDD\xF0 |0
-<U6933> \xDD\xDB |0
-<U6934> \xDD\xE0 |0
-<U6935> \xDD\xD9 |0
-<U6936> \xFD\x51 |0
-<U6937> \xDD\xEC |0
-<U6938> \xDD\xCB |0
-<U6939> \xDD\xD2 |0
-<U693B> \xDD\xEA |0
-<U693C> \xDD\xF4 |0
-<U693D> \xDD\xDC |0
-<U693E> \xFA\xAD |0
-<U693F> \xDD\xCF |0
-<U6940> \xDD\xE2 |0
-<U6941> \xDD\xE7 |0
-<U6942> \xDD\xD3 |0
-<U6943> \x8D\xBE |0
-<U6944> \xDD\xE4 |0
-<U6945> \xDD\xD0 |0
-<U6946> \x89\xA4 |0
-<U6948> \xDD\xD7 |0
-<U6949> \xDD\xD8 |0
-<U694A> \xB7\xA8 |0
-<U694B> \xDD\xEB |0
-<U694C> \xDD\xE9 |0
-<U694E> \xDD\xCC |0
-<U694F> \xDD\xEE |0
-<U6951> \xDD\xEF |0
-<U6952> \xDD\xF1 |0
-<U6953> \xB7\xAC |0
-<U6954> \xB7\xA4 |0
-<U6955> \x9A\xD9 |0
-<U6956> \xD5\xB8 |0
-<U6957> \xDD\xD4 |0
-<U6958> \xDD\xE6 |0
-<U6959> \xDD\xD5 |0
-<U695A> \xB7\xA1 |0
-<U695B> \xB7\xB1 |0
-<U695C> \xDD\xED |0
-<U695D> \xB7\xAF |0
-<U695E> \xB7\xAB |0
-<U695F> \xDD\xCA |0
-<U6960> \xB7\xA3 |0
-<U6961> \xFD\x4E |0
-<U6962> \xDD\xCD |0
-<U6963> \xB7\xB0 |0
-<U6964> \x8D\xC0 |0
-<U6965> \xDD\xDD |0
-<U6966> \xDD\xC9 |0
-<U6967> \x97\xF0 |0
-<U6968> \xB7\xA9 |0
-<U6969> \xDD\xE1 |0
-<U696A> \xDD\xD1 |0
-<U696B> \xB7\xAA |0
-<U696C> \xDD\xDA |0
-<U696D> \xB7\x7E |0
-<U696E> \xB4\xD8 |0
-<U696F> \xDD\xE3 |0
-<U6970> \xD9\xBF |0
-<U6971> \xDD\xCE |0
-<U6972> \x93\xB4 |0
-<U6973> \xFD\x44 |0
-<U6974> \xDD\xE8 |0
-<U6975> \xB7\xA5 |0
-<U6976> \xDD\xE5 |0
-<U6977> \xB7\xA2 |0
-<U6978> \xDD\xDF |0
-<U6979> \xB7\xAD |0
-<U697A> \xDD\xD6 |0
-<U697B> \xDD\xF3 |0
-<U6980> \x9F\xA7 |0
-<U6982> \xB7\xA7 |0
-<U6983> \xDE\xC6 |0
-<U6985> \x8D\xC2 |0
-<U6986> \xB7\xAE |0
-<U698A> \x99\xB6 |0
-<U698D> \xE2\x4A |0
-<U698E> \xE2\x48 |0
-<U6990> \xE2\x5E |0
-<U6991> \xE2\x46 |0
-<U6993> \xE2\x58 |0
-<U6994> \xB7\x7D |0
-<U6995> \xBA\x5F |0
-<U6996> \xE2\x42 |0
-<U6997> \xE2\x5D |0
-<U6998> \xFD\x52 |0
-<U6999> \xE2\x47 |0
-<U699A> \xE2\x55 |0
-<U699B> \xBA\x64 |0
-<U699C> \xBA\x5D |0
-<U699E> \xE2\x5B |0
-<U699F> \x8D\xC1 |0
-<U69A0> \xE2\x40 |0
-<U69A1> \xE2\x5A |0
-<U69A2> \x8E\x46 |0
-<U69A3> \xBA\x6F |0
-<U69A4> \xE2\x51 |0
-<U69A5> \xE2\x61 |0
-<U69A6> \xBA\x6D |0
-<U69A7> \xE2\x49 |0
-<U69A8> \xBA\x5E |0
-<U69A9> \xE2\x4B |0
-<U69AA> \xE2\x59 |0
-<U69AB> \xBA\x67 |0
-<U69AC> \xE2\x44 |0
-<U69AD> \xBA\x6B |0
-<U69AE> \xBA\x61 |0
-<U69AF> \xE2\x4D |0
-<U69B0> \xE2\x43 |0
-<U69B1> \xE1\xFC |0
-<U69B2> \xA0\xD1 |0
-<U69B3> \xE2\x57 |0
-<U69B4> \xBA\x68 |0
-<U69B5> \xE2\x60 |0
-<U69B6> \xE1\xFD |0
-<U69B7> \xBA\x65 |0
-<U69B9> \xE2\x53 |0
-<U69BB> \xBA\x66 |0
-<U69BC> \xE2\x45 |0
-<U69BD> \xE2\x50 |0
-<U69BE> \xE2\x4C |0
-<U69BF> \xE2\x4E |0
-<U69C0> \x9F\xCA |0
-<U69C1> \xBA\x60 |0
-<U69C2> \xE2\x5F |0
-<U69C3> \xBA\x6E |0
-<U69C4> \xE2\x4F |0
-<U69C6> \xE2\x62 |0
-<U69C9> \xE1\xFE |0
-<U69CA> \xE2\x54 |0
-<U69CB> \xBA\x63 |0
-<U69CC> \xBA\x6C |0
-<U69CD> \xBA\x6A |0
-<U69CE> \xE2\x41 |0
-<U69CF> \xE2\x56 |0
-<U69D0> \xBA\x69 |0
-<U69D1> \x92\xCF |0
-<U69D3> \xBA\x62 |0
-<U69D4> \xE2\x52 |0
-<U69D5> \x9C\xF4 |0
-<U69D6> \x8D\xC4 |0
-<U69D9> \xE2\x5C |0
-<U69E1> \xFD\x41 |0
-<U69E2> \xE5\xD5 |0
-<U69E4> \xE5\xD1 |0
-<U69E5> \xE5\xCD |0
-<U69E6> \xE5\xE1 |0
-<U69E7> \xE5\xDE |0
-<U69E8> \xBC\xCD |0
-<U69E9> \x9B\x4C |0
-<U69EB> \xE5\xE5 |0
-<U69EC> \xE5\xD4 |0
-<U69ED> \xBC\xD8 |0
-<U69EE> \xE5\xDB |0
-<U69F1> \xE5\xD0 |0
-<U69F2> \xE5\xDA |0
-<U69F3> \xBC\xD5 |0
-<U69F4> \xE5\xEE |0
-<U69F6> \xE5\xEB |0
-<U69F7> \xE5\xDD |0
-<U69F8> \xE5\xCE |0
-<U69F9> \xFD\x57 |0
-<U69FA> \xFC\xEF |0
-<U69FB> \xE5\xE2 |0
-<U69FC> \xE5\xE4 |0
-<U69FD> \xBC\xD1 |0
-<U69FE> \xE5\xD8 |0
-<U69FF> \xE5\xD3 |0
-<U6A00> \xE5\xCA |0
-<U6A01> \xBC\xCE |0
-<U6A02> \xBC\xD6 |0
-<U6A03> \x9C\xDE |0
-<U6A04> \xE5\xE7 |0
-<U6A05> \xBC\xD7 |0
-<U6A06> \xE5\xCB |0
-<U6A07> \xE5\xED |0
-<U6A08> \xE5\xE0 |0
-<U6A09> \xE5\xE6 |0
-<U6A0A> \xBC\xD4 |0
-<U6A0B> \xFD\x42 |0
-<U6A0C> \x98\x6C |0
-<U6A0D> \xE5\xE3 |0
-<U6A0F> \xE5\xEA |0
-<U6A11> \xBC\xD9 |0
-<U6A13> \xBC\xD3 |0
-<U6A14> \xE5\xDC |0
-<U6A15> \xE5\xCF |0
-<U6A16> \xE5\xEF |0
-<U6A17> \xE5\xCC |0
-<U6A18> \xE5\xE8 |0
-<U6A19> \xBC\xD0 |0
-<U6A1A> \x97\xF9 |0
-<U6A1B> \xE5\xD6 |0
-<U6A1C> \x95\x58 |0
-<U6A1D> \xE5\xD7 |0
-<U6A1E> \xBC\xCF |0
-<U6A1F> \xBC\xCC |0
-<U6A20> \xE5\xD2 |0
-<U6A21> \xBC\xD2 |0
-<U6A23> \xBC\xCB |0
-<U6A25> \xE5\xE9 |0
-<U6A26> \xE5\xEC |0
-<U6A27> \xE5\xD9 |0
-<U6A28> \xE9\xCA |0
-<U6A2B> \x98\x5E |0
-<U6A2C> \xFE\x7B |0
-<U6A2D> \x94\xCD |0
-<U6A32> \xE9\xC2 |0
-<U6A33> \x93\xEE |0
-<U6A34> \xE9\xBE |0
-<U6A35> \xBE\xF6 |0
-<U6A38> \xBE\xEB |0
-<U6A39> \xBE\xF0 |0
-<U6A3A> \xBE\xEC |0
-<U6A3B> \xE9\xCC |0
-<U6A3C> \xE9\xD7 |0
-<U6A3D> \xBE\xEA |0
-<U6A3E> \xE9\xC4 |0
-<U6A3F> \xE9\xCD |0
-<U6A40> \xE5\xDF |0
-<U6A41> \xE9\xCE |0
-<U6A43> \x8C\xA3 |0
-<U6A44> \xBE\xF1 |0
-<U6A45> \xFD\x5A |0
-<U6A46> \xE9\xDD |0
-<U6A47> \xBE\xF5 |0
-<U6A48> \xBE\xF8 |0
-<U6A49> \xE9\xC0 |0
-<U6A4B> \xBE\xF4 |0
-<U6A4C> \x93\xF5 |0
-<U6A4D> \xE9\xDB |0
-<U6A4E> \xE9\xDC |0
-<U6A4F> \xE9\xD2 |0
-<U6A50> \xE9\xD1 |0
-<U6A51> \xE9\xC9 |0
-<U6A52> \x93\xEF |0
-<U6A53> \x8E\xEA |0
-<U6A54> \xE9\xD3 |0
-<U6A55> \xE9\xDA |0
-<U6A56> \xE9\xD9 |0
-<U6A57> \x8F\x5B |0
-<U6A58> \xBE\xEF |0
-<U6A59> \xBE\xED |0
-<U6A5A> \xE9\xCB |0
-<U6A5B> \xE9\xC8 |0
-<U6A5D> \xE9\xC5 |0
-<U6A5E> \xE9\xD8 |0
-<U6A5F> \xBE\xF7 |0
-<U6A60> \xE9\xD6 |0
-<U6A61> \xBE\xF3 |0
-<U6A62> \xBE\xF2 |0
-<U6A63> \x8C\x5E |0
-<U6A64> \xE9\xD0 |0
-<U6A65> \x8D\xC6 |0
-<U6A66> \xE9\xBF |0
-<U6A67> \xE9\xC1 |0
-<U6A68> \xE9\xC3 |0
-<U6A69> \xE9\xD5 |0
-<U6A6A> \xE9\xCF |0
-<U6A6B> \xBE\xEE |0
-<U6A6D> \xE9\xC6 |0
-<U6A6F> \xE9\xD4 |0
-<U6A71> \x8D\xC8 |0
-<U6A74> \x8D\xC7 |0
-<U6A76> \xE9\xC7 |0
-<U6A7A> \x93\xF7 |0
-<U6A7E> \xC0\xCF |0
-<U6A7F> \xED\x45 |0
-<U6A80> \xC0\xC8 |0
-<U6A81> \xEC\xF5 |0
-<U6A82> \x8D\xC9 |0
-<U6A83> \xED\x41 |0
-<U6A84> \xC0\xCA |0
-<U6A85> \xED\x48 |0
-<U6A87> \xEC\xFC |0
-<U6A89> \xEC\xF7 |0
-<U6A8A> \xFB\xF2 |0
-<U6A8C> \xED\x49 |0
-<U6A8D> \xEC\xF3 |0
-<U6A8E> \xEC\xFE |0
-<U6A8F> \x96\x70 |0
-<U6A90> \xC0\xD1 |0
-<U6A91> \xED\x44 |0
-<U6A92> \xED\x4A |0
-<U6A93> \xEC\xFD |0
-<U6A94> \xC0\xC9 |0
-<U6A95> \xED\x40 |0
-<U6A96> \xEC\xF4 |0
-<U6A97> \xC0\xD0 |0
-<U6A99> \x8D\xCB |0
-<U6A9A> \xED\x47 |0
-<U6A9B> \xEC\xF9 |0
-<U6A9C> \xC0\xCC |0
-<U6A9D> \xFD\x5C |0
-<U6A9E> \xEC\xFB |0
-<U6A9F> \xEC\xF8 |0
-<U6AA0> \xC0\xD2 |0
-<U6AA1> \xEC\xFA |0
-<U6AA2> \xC0\xCB |0
-<U6AA3> \xC0\xCE |0
-<U6AA4> \xED\x43 |0
-<U6AA5> \xEC\xF6 |0
-<U6AA6> \xED\x46 |0
-<U6AA7> \x8F\x65 |0
-<U6AA8> \xED\x42 |0
-<U6AAB> \x8D\xCD |0
-<U6AAC> \xC2\x63 |0
-<U6AAD> \xEF\xE7 |0
-<U6AAE> \xC2\x68 |0
-<U6AAF> \xC2\x69 |0
-<U6AB1> \x9D\xA8 |0
-<U6AB2> \x94\xF9 |0
-<U6AB3> \xC2\x62 |0
-<U6AB4> \xEF\xE6 |0
-<U6AB5> \x8D\xCE |0
-<U6AB6> \xEF\xE3 |0
-<U6AB7> \xEF\xE4 |0
-<U6AB8> \xC2\x66 |0
-<U6AB9> \xEF\xDE |0
-<U6ABA> \xEF\xE2 |0
-<U6ABB> \xC2\x65 |0
-<U6ABD> \xEF\xDF |0
-<U6ABE> \x93\xEA |0
-<U6AC2> \xC2\x67 |0
-<U6AC3> \xC2\x64 |0
-<U6AC5> \xEF\xDD |0
-<U6AC6> \xEF\xE1 |0
-<U6AC7> \xEF\xE5 |0
-<U6AC8> \xFD\x5F |0
-<U6AC9> \x93\xF0 |0
-<U6ACA> \x9F\xB6 |0
-<U6ACB> \xF2\x51 |0
-<U6ACC> \xF2\x4E |0
-<U6ACD> \xF2\x57 |0
-<U6ACF> \xF2\x56 |0
-<U6AD0> \xF2\x54 |0
-<U6AD1> \xF2\x4F |0
-<U6AD3> \xC3\x72 |0
-<U6AD4> \x8D\xCF |0
-<U6AD8> \x97\x63 |0
-<U6AD9> \xF2\x50 |0
-<U6ADA> \xC3\x71 |0
-<U6ADB> \xC0\xCD |0
-<U6ADC> \xF2\x53 |0
-<U6ADD> \xC3\x70 |0
-<U6ADE> \xF2\x58 |0
-<U6ADF> \xF2\x52 |0
-<U6AE0> \xF2\x4D |0
-<U6AE1> \xEF\xE0 |0
-<U6AE5> \xC3\x6F |0
-<U6AE7> \xF2\x4C |0
-<U6AE8> \xF4\x56 |0
-<U6AEA> \xF4\x55 |0
-<U6AEB> \xF2\x55 |0
-<U6AEC> \xC4\x68 |0
-<U6AEE> \xF4\x59 |0
-<U6AEF> \xF4\x5A |0
-<U6AF0> \xF4\x54 |0
-<U6AF1> \xF4\x58 |0
-<U6AF3> \xF4\x53 |0
-<U6AF6> \x8D\xD0 |0
-<U6AF8> \xF5\xD1 |0
-<U6AF9> \xF4\x57 |0
-<U6AFA> \xC4\xE7 |0
-<U6AFB> \xC4\xE5 |0
-<U6AFC> \xF5\xCF |0
-<U6B00> \xF5\xD2 |0
-<U6B02> \xF5\xCE |0
-<U6B03> \xF5\xD0 |0
-<U6B04> \xC4\xE6 |0
-<U6B05> \x93\xF1 |0
-<U6B08> \xF6\xE5 |0
-<U6B09> \xF6\xE6 |0
-<U6B0A> \xC5\x76 |0
-<U6B0B> \xF6\xE4 |0
-<U6B0F> \xF7\xE2 |0
-<U6B10> \xC5\xCF |0
-<U6B11> \xF7\xE0 |0
-<U6B12> \xF7\xE1 |0
-<U6B13> \xF8\xAC |0
-<U6B16> \xC6\x56 |0
-<U6B17> \xF8\xF3 |0
-<U6B18> \xF8\xF1 |0
-<U6B19> \xF8\xF2 |0
-<U6B1A> \xF8\xF4 |0
-<U6B1D> \xFD\x62 |0
-<U6B1E> \xF9\xBB |0
-<U6B20> \xA4\xED |0
-<U6B21> \xA6\xB8 |0
-<U6B23> \xAA\x59 |0
-<U6B25> \xCC\xE9 |0
-<U6B28> \xCF\x64 |0
-<U6B2C> \xD1\xF5 |0
-<U6B2D> \xD1\xF7 |0
-<U6B2F> \xD1\xF6 |0
-<U6B31> \xD1\xF8 |0
-<U6B32> \xB1\xFD |0
-<U6B33> \xD5\xD7 |0
-<U6B34> \xD1\xF9 |0
-<U6B35> \xFD\x65 |0
-<U6B36> \xD5\xD6 |0
-<U6B37> \xD5\xD8 |0
-<U6B38> \xD5\xD9 |0
-<U6B39> \xD9\xDA |0
-<U6B3A> \xB4\xDB |0
-<U6B3B> \xD9\xDB |0
-<U6B3C> \xD9\xDD |0
-<U6B3D> \xB4\xDC |0
-<U6B3E> \xB4\xDA |0
-<U6B3F> \xD9\xDC |0
-<U6B41> \xDD\xFA |0
-<U6B42> \xDD\xF8 |0
-<U6B43> \xDD\xF7 |0
-<U6B45> \xDD\xF6 |0
-<U6B46> \xDD\xF5 |0
-<U6B47> \xB7\xB2 |0
-<U6B48> \xDD\xF9 |0
-<U6B49> \xBA\x70 |0
-<U6B4A> \xE2\x63 |0
-<U6B4B> \xE2\x65 |0
-<U6B4C> \xBA\x71 |0
-<U6B4D> \xE2\x64 |0
-<U6B4E> \xBC\xDB |0
-<U6B50> \xBC\xDA |0
-<U6B51> \xE5\xF0 |0
-<U6B52> \x9F\xDB |0
-<U6B54> \xE9\xDF |0
-<U6B55> \xE9\xDE |0
-<U6B56> \xE9\xE0 |0
-<U6B57> \x93\xF8 |0
-<U6B59> \xBE\xF9 |0
-<U6B5B> \xED\x4B |0
-<U6B5C> \xC0\xD3 |0
-<U6B5E> \xEF\xE8 |0
-<U6B5F> \xC2\x6A |0
-<U6B60> \xF2\x59 |0
-<U6B61> \xC5\x77 |0
-<U6B62> \xA4\xEE |0
-<U6B63> \xA5\xBF |0
-<U6B64> \xA6\xB9 |0
-<U6B65> \xA8\x42 |0
-<U6B66> \xAA\x5A |0
-<U6B67> \xAA\x5B |0
-<U6B6A> \xAC\x6E |0
-<U6B6D> \xD1\xFA |0
-<U6B6F> \x8B\xF7 |0
-<U6B72> \xB7\xB3 |0
-<U6B74> \xFD\x66 |0
-<U6B76> \xE6\xD1 |0
-<U6B77> \xBE\xFA |0
-<U6B78> \xC2\x6B |0
-<U6B79> \xA4\xEF |0
-<U6B7A> \x8B\xCF |0
-<U6B7B> \xA6\xBA |0
-<U6B7E> \xCC\xEB |0
-<U6B7F> \xAA\x5C |0
-<U6B80> \xCC\xEA |0
-<U6B81> \x8D\xD1 |0
-<U6B82> \xCF\x65 |0
-<U6B83> \xAC\x6F |0
-<U6B84> \xCF\x66 |0
-<U6B86> \xAC\x70 |0
-<U6B88> \xD1\xFC |0
-<U6B89> \xAE\xEE |0
-<U6B8A> \xAE\xED |0
-<U6B8C> \xD5\xDE |0
-<U6B8D> \xD5\xDC |0
-<U6B8E> \xD5\xDD |0
-<U6B8F> \xD5\xDB |0
-<U6B91> \xD5\xDA |0
-<U6B94> \xD9\xDE |0
-<U6B95> \xD9\xE1 |0
-<U6B96> \xB4\xDE |0
-<U6B97> \xD9\xDF |0
-<U6B98> \xB4\xDD |0
-<U6B99> \xD9\xE0 |0
-<U6B9B> \xDD\xFB |0
-<U6B9E> \xE2\x66 |0
-<U6B9F> \xE2\x67 |0
-<U6BA0> \xE2\x68 |0
-<U6BA2> \xE5\xF3 |0
-<U6BA3> \xE5\xF2 |0
-<U6BA4> \xBC\xDC |0
-<U6BA5> \xE5\xF1 |0
-<U6BA6> \xE5\xF4 |0
-<U6BA7> \xE9\xE1 |0
-<U6BAA> \xE9\xE2 |0
-<U6BAB> \xE9\xE3 |0
-<U6BAD> \xED\x4C |0
-<U6BAE> \xC0\xD4 |0
-<U6BAF> \xC2\x6C |0
-<U6BB0> \xF2\x5A |0
-<U6BB2> \xC4\xE8 |0
-<U6BB3> \xC9\x5F |0
-<U6BB5> \xAC\x71 |0
-<U6BB6> \xCF\x67 |0
-<U6BB7> \xAE\xEF |0
-<U6BBA> \xB1\xFE |0
-<U6BBC> \xB4\xDF |0
-<U6BBD> \xD9\xE2 |0
-<U6BBF> \xB7\xB5 |0
-<U6BC0> \xB7\xB4 |0
-<U6BC1> \x8D\xD2 |0
-<U6BC3> \xE2\x69 |0
-<U6BC4> \xE2\x6A |0
-<U6BC5> \xBC\xDD |0
-<U6BC6> \xBC\xDE |0
-<U6BC7> \xE9\xE5 |0
-<U6BC8> \xE9\xE4 |0
-<U6BC9> \xEF\xE9 |0
-<U6BCA> \xF7\xE3 |0
-<U6BCB> \xA4\xF0 |0
-<U6BCC> \xC9\x60 |0
-<U6BCD> \xA5\xC0 |0
-<U6BCF> \xA8\x43 |0
-<U6BD0> \xCB\x48 |0
-<U6BD2> \xAC\x72 |0
-<U6BD3> \xB7\xB6 |0
-<U6BD4> \xA4\xF1 |0
-<U6BD6> \xCF\x68 |0
-<U6BD7> \xAC\x73 |0
-<U6BD8> \xCF\x69 |0
-<U6BDA> \xC0\xD5 |0
-<U6BDB> \xA4\xF2 |0
-<U6BDC> \xFD\x71 |0
-<U6BDE> \xCC\xEC |0
-<U6BE0> \xCF\x6A |0
-<U6BE1> \xFD\x6F |0
-<U6BE2> \xD2\x42 |0
-<U6BE3> \xD2\x41 |0
-<U6BE4> \xD1\xFE |0
-<U6BE6> \xD1\xFD |0
-<U6BE7> \xD2\x43 |0
-<U6BE8> \xD2\x40 |0
-<U6BEA> \x8D\xD3 |0
-<U6BEB> \xB2\x40 |0
-<U6BEC> \xB2\x41 |0
-<U6BEF> \xB4\xE0 |0
-<U6BF0> \xD9\xE3 |0
-<U6BF2> \xD9\xE4 |0
-<U6BF3> \xD9\xE5 |0
-<U6BF7> \xDE\x41 |0
-<U6BF8> \xDE\x42 |0
-<U6BF9> \xDE\x40 |0
-<U6BFA> \x9F\xE7 |0
-<U6BFB> \xDD\xFD |0
-<U6BFC> \xDD\xFE |0
-<U6BFD> \xB7\xB7 |0
-<U6BFE> \xE2\x6B |0
-<U6BFF> \xE5\xF7 |0
-<U6C00> \xE5\xF6 |0
-<U6C01> \xE5\xF5 |0
-<U6C02> \xE5\xF8 |0
-<U6C03> \xE9\xE7 |0
-<U6C04> \xE9\xE6 |0
-<U6C05> \xBE\xFB |0
-<U6C06> \xE9\xE8 |0
-<U6C08> \xC0\xD6 |0
-<U6C09> \xED\x4D |0
-<U6C0B> \xEF\xEA |0
-<U6C0C> \xF2\x5B |0
-<U6C0D> \xF6\xE7 |0
-<U6C0F> \xA4\xF3 |0
-<U6C10> \xA5\xC2 |0
-<U6C11> \xA5\xC1 |0
-<U6C13> \xAA\x5D |0
-<U6C14> \xC9\x61 |0
-<U6C15> \xC9\x7E |0
-<U6C16> \xA6\xBB |0
-<U6C18> \xC9\xF7 |0
-<U6C19> \xCB\x49 |0
-<U6C1A> \xCB\x4A |0
-<U6C1B> \xAA\x5E |0
-<U6C1C> \x90\xBD |0
-<U6C1D> \xCC\xED |0
-<U6C1F> \xAC\x74 |0
-<U6C20> \xCF\x6B |0
-<U6C21> \xCF\x6C |0
-<U6C23> \xAE\xF0 |0
-<U6C24> \xAE\xF4 |0
-<U6C25> \xD2\x44 |0
-<U6C26> \xAE\xF3 |0
-<U6C27> \xAE\xF1 |0
-<U6C28> \xAE\xF2 |0
-<U6C2A> \xD5\xDF |0
-<U6C2B> \xB2\x42 |0
-<U6C2C> \xB4\xE3 |0
-<U6C2E> \xB4\xE1 |0
-<U6C2F> \xB4\xE2 |0
-<U6C30> \xD9\xE6 |0
-<U6C31> \x9F\xD0 |0
-<U6C33> \xBA\x72 |0
-<U6C34> \xA4\xF4 |0
-<U6C35> \x8B\xD0 |0
-<U6C36> \xC9\xA1 |0
-<U6C37> \xFD\x72 |0
-<U6C38> \xA5\xC3 |0
-<U6C39> \x9C\xAE |0
-<U6C3A> \x8B\xD1 |0
-<U6C3B> \xC9\xA4 |0
-<U6C3D> \x8A\xDB |0
-<U6C3E> \xA5\xC6 |0
-<U6C3F> \xC9\xA3 |0
-<U6C40> \xA5\xC5 |0
-<U6C41> \xA5\xC4 |0
-<U6C42> \xA8\x44 |0
-<U6C43> \xC9\xA2 |0
-<U6C46> \xC9\xF8 |0
-<U6C49> \xFA\xE4 |0
-<U6C4A> \xC9\xFC |0
-<U6C4B> \xC9\xFE |0
-<U6C4C> \xCA\x40 |0
-<U6C4D> \xA6\xC5 |0
-<U6C4E> \xA6\xC6 |0
-<U6C4F> \xC9\xFB |0
-<U6C50> \xA6\xC1 |0
-<U6C52> \xC9\xF9 |0
-<U6C54> \xC9\xFD |0
-<U6C55> \xA6\xC2 |0
-<U6C57> \xA6\xBD |0
-<U6C58> \x95\xCE |0
-<U6C59> \xA6\xBE |0
-<U6C5A> \xFD\x76 |0
-<U6C5B> \xA6\xC4 |0
-<U6C5C> \xC9\xFA |0
-<U6C5D> \xA6\xBC |0
-<U6C5E> \xA8\x45 |0
-<U6C5F> \xA6\xBF |0
-<U6C60> \xA6\xC0 |0
-<U6C61> \xA6\xC3 |0
-<U6C65> \xCB\x5B |0
-<U6C66> \xCB\x59 |0
-<U6C67> \xCB\x4C |0
-<U6C68> \xA8\x51 |0
-<U6C69> \xCB\x53 |0
-<U6C6A> \xA8\x4C |0
-<U6C6B> \xCB\x4D |0
-<U6C6D> \xCB\x55 |0
-<U6C6E> \xFB\x62 |0
-<U6C6F> \xCB\x52 |0
-<U6C70> \xA8\x4F |0
-<U6C71> \xCB\x51 |0
-<U6C72> \xA8\x56 |0
-<U6C73> \xCB\x5A |0
-<U6C74> \xA8\x58 |0
-<U6C75> \x8D\xD4 |0
-<U6C76> \xA8\x5A |0
-<U6C78> \xCB\x4B |0
-<U6C79> \xFD\x78 |0
-<U6C7A> \xA8\x4D |0
-<U6C7B> \xCB\x5C |0
-<U6C7D> \xA8\x54 |0
-<U6C7E> \xA8\x57 |0
-<U6C7F> \x8E\xE3 |0
-<U6C80> \xCD\x45 |0
-<U6C81> \xA8\x47 |0
-<U6C82> \xA8\x5E |0
-<U6C83> \xA8\x55 |0
-<U6C84> \xCB\x4E |0
-<U6C85> \xA8\x4A |0
-<U6C86> \xA8\x59 |0
-<U6C87> \xCB\x56 |0
-<U6C88> \xA8\x48 |0
-<U6C89> \xA8\x49 |0
-<U6C8A> \xCD\x43 |0
-<U6C8B> \xCB\x4F |0
-<U6C8C> \xA8\x50 |0
-<U6C8D> \xA8\x5B |0
-<U6C8E> \xCB\x5D |0
-<U6C8F> \xCB\x50 |0
-<U6C90> \xA8\x4E |0
-<U6C92> \xA8\x53 |0
-<U6C93> \xCC\xEE |0
-<U6C94> \xA8\x5C |0
-<U6C95> \xCB\x57 |0
-<U6C96> \xA8\x52 |0
-<U6C98> \xA8\x5D |0
-<U6C99> \xA8\x46 |0
-<U6C9A> \xCB\x54 |0
-<U6C9B> \xA8\x4B |0
-<U6C9C> \xCB\x58 |0
-<U6C9D> \xCD\x44 |0
-<U6C9F> \x90\x76 |0
-<U6CA2> \x98\xC6 |0
-<U6CAA> \x8D\xD5 |0
-<U6CAB> \xAA\x6A |0
-<U6CAC> \xAA\x7A |0
-<U6CAD> \xCC\xF5 |0
-<U6CAE> \xAA\x71 |0
-<U6CAF> \x97\xD1 |0
-<U6CB0> \xCD\x4B |0
-<U6CB1> \xAA\x62 |0
-<U6CB2> \x9E\xB6 |0
-<U6CB3> \xAA\x65 |0
-<U6CB4> \xCD\x42 |0
-<U6CB6> \xCC\xF3 |0
-<U6CB7> \xCC\xF7 |0
-<U6CB8> \xAA\x6D |0
-<U6CB9> \xAA\x6F |0
-<U6CBA> \xCC\xFA |0
-<U6CBB> \xAA\x76 |0
-<U6CBC> \xAA\x68 |0
-<U6CBD> \xAA\x66 |0
-<U6CBE> \xAA\x67 |0
-<U6CBF> \xAA\x75 |0
-<U6CC0> \xCD\x47 |0
-<U6CC1> \xAA\x70 |0
-<U6CC2> \xCC\xF9 |0
-<U6CC3> \xCC\xFB |0
-<U6CC4> \xAA\x6E |0
-<U6CC5> \xAA\x73 |0
-<U6CC6> \xCC\xFC |0
-<U6CC7> \xCD\x4A |0
-<U6CC9> \xAC\x75 |0
-<U6CCA> \xAA\x79 |0
-<U6CCB> \xFA\xC7 |0
-<U6CCC> \xAA\x63 |0
-<U6CCD> \xCD\x49 |0
-<U6CCE> \xA0\x42 |0
-<U6CCF> \xCD\x4D |0
-<U6CD0> \xCC\xF8 |0
-<U6CD1> \xCD\x4F |0
-<U6CD2> \xCD\x40 |0
-<U6CD3> \xAA\x6C |0
-<U6CD4> \xCC\xF4 |0
-<U6CD5> \xAA\x6B |0
-<U6CD6> \xAA\x7D |0
-<U6CD7> \xAA\x72 |0
-<U6CD9> \xCC\xF2 |0
-<U6CDA> \xCF\x75 |0
-<U6CDB> \xAA\x78 |0
-<U6CDC> \xAA\x7C |0
-<U6CDD> \xCD\x41 |0
-<U6CDE> \xCD\x46 |0
-<U6CDF> \x98\x73 |0
-<U6CE0> \xAA\x7E |0
-<U6CE1> \xAA\x77 |0
-<U6CE2> \xAA\x69 |0
-<U6CE3> \xAA\x5F |0
-<U6CE5> \xAA\x64 |0
-<U6CE7> \xCC\xF6 |0
-<U6CE8> \xAA\x60 |0
-<U6CE9> \xCD\x4E |0
-<U6CEA> \x9F\xFC |0
-<U6CEB> \xCC\xF0 |0
-<U6CEC> \xCC\xEF |0
-<U6CED> \xCC\xFD |0
-<U6CEE> \xCC\xF1 |0
-<U6CEF> \xAA\x7B |0
-<U6CF0> \xAE\xF5 |0
-<U6CF1> \xAA\x74 |0
-<U6CF2> \xCC\xFE |0
-<U6CF3> \xAA\x61 |0
-<U6CF5> \xAC\xA6 |0
-<U6CF9> \xCD\x4C |0
-<U6CFF> \x8C\xA5 |0
-<U6D00> \xCF\x7C |0
-<U6D01> \xCF\xA1 |0
-<U6D02> \x8D\xD7 |0
-<U6D03> \xCF\xA4 |0
-<U6D04> \xCF\x77 |0
-<U6D05> \x92\xFB |0
-<U6D06> \x8D\xD8 |0
-<U6D07> \xCF\xA7 |0
-<U6D08> \xCF\xAA |0
-<U6D09> \xCF\xAC |0
-<U6D0A> \xCF\x74 |0
-<U6D0B> \xAC\x76 |0
-<U6D0C> \xAC\x7B |0
-<U6D0D> \xD2\x49 |0
-<U6D0E> \xAC\xAD |0
-<U6D0F> \xCF\xA5 |0
-<U6D10> \xCF\xAD |0
-<U6D11> \xCF\x7B |0
-<U6D12> \xCF\x73 |0
-<U6D16> \xD2\x64 |0
-<U6D17> \xAC\x7E |0
-<U6D18> \xCF\xA2 |0
-<U6D19> \xCF\x78 |0
-<U6D1A> \xCF\x7A |0
-<U6D1B> \xAC\xA5 |0
-<U6D1D> \xCF\x7D |0
-<U6D1E> \xAC\x7D |0
-<U6D1F> \xCF\x70 |0
-<U6D20> \xCF\xA8 |0
-<U6D22> \xCF\xAB |0
-<U6D24> \x94\x4F |0
-<U6D25> \xAC\x7A |0
-<U6D26> \x8D\xD9 |0
-<U6D27> \xAC\xA8 |0
-<U6D28> \xCF\x6D |0
-<U6D29> \xAC\xAA |0
-<U6D2A> \xAC\x78 |0
-<U6D2B> \xAC\xAE |0
-<U6D2C> \xCF\xA9 |0
-<U6D2D> \xCF\x6F |0
-<U6D2E> \xAC\xAB |0
-<U6D2F> \xD2\x5E |0
-<U6D30> \xCD\x48 |0
-<U6D31> \xAC\x7C |0
-<U6D32> \xAC\x77 |0
-<U6D33> \xCF\x76 |0
-<U6D34> \xCF\x6E |0
-<U6D35> \xAC\xAC |0
-<U6D36> \xAC\xA4 |0
-<U6D37> \xCF\xA3 |0
-<U6D38> \xAC\xA9 |0
-<U6D39> \xAC\xA7 |0
-<U6D3A> \xCF\x79 |0
-<U6D3B> \xAC\xA1 |0
-<U6D3C> \xCF\x71 |0
-<U6D3D> \xAC\xA2 |0
-<U6D3E> \xAC\xA3 |0
-<U6D3F> \xCF\x72 |0
-<U6D40> \xCF\xA6 |0
-<U6D41> \xAC\x79 |0
-<U6D42> \xCF\x7E |0
-<U6D4E> \x89\x6B |0
-<U6D57> \x97\xCE |0
-<U6D58> \xD2\x4C |0
-<U6D59> \xAE\xFD |0
-<U6D5A> \xAF\x43 |0
-<U6D5B> \xFA\xF3 |0
-<U6D5C> \xFD\xAE |0
-<U6D5E> \xD2\x55 |0
-<U6D5F> \xD2\x5B |0
-<U6D60> \xD2\x57 |0
-<U6D61> \xD2\x4A |0
-<U6D62> \xD2\x4D |0
-<U6D63> \xD2\x46 |0
-<U6D64> \xD2\x47 |0
-<U6D65> \xAF\x4A |0
-<U6D66> \xAE\xFA |0
-<U6D67> \xD2\x56 |0
-<U6D68> \xD2\x5F |0
-<U6D69> \xAF\x45 |0
-<U6D6A> \xAE\xF6 |0
-<U6D6C> \xAF\x40 |0
-<U6D6D> \xD2\x4E |0
-<U6D6E> \xAF\x42 |0
-<U6D6F> \xD2\x4F |0
-<U6D70> \xD2\x59 |0
-<U6D71> \xFB\xAF |0
-<U6D72> \x92\xB7 |0
-<U6D74> \xAF\x44 |0
-<U6D75> \xD2\x68 |0
-<U6D76> \xD2\x48 |0
-<U6D77> \xAE\xFC |0
-<U6D78> \xAE\xFB |0
-<U6D79> \xAF\x48 |0
-<U6D7A> \xD2\x45 |0
-<U6D7B> \xD2\x66 |0
-<U6D7C> \xD2\x5A |0
-<U6D7D> \xD2\x67 |0
-<U6D7E> \xD2\x61 |0
-<U6D7F> \xD2\x53 |0
-<U6D80> \xD2\x62 |0
-<U6D81> \x8D\xDA |0
-<U6D82> \xD2\x5C |0
-<U6D83> \xD2\x65 |0
-<U6D84> \xD2\x63 |0
-<U6D85> \xAF\x49 |0
-<U6D86> \xD2\x54 |0
-<U6D87> \xAE\xF9 |0
-<U6D88> \xAE\xF8 |0
-<U6D89> \xAF\x41 |0
-<U6D8A> \xAF\x47 |0
-<U6D8B> \xD2\x60 |0
-<U6D8C> \xAF\x46 |0
-<U6D8D> \xD2\x51 |0
-<U6D8E> \xB2\x43 |0
-<U6D8F> \x9C\x5A |0
-<U6D90> \xD2\x69 |0
-<U6D91> \xD2\x50 |0
-<U6D92> \xD2\x4B |0
-<U6D93> \xAE\xFE |0
-<U6D94> \xAF\x4B |0
-<U6D95> \xAE\xF7 |0
-<U6D96> \xFD\xAD |0
-<U6D97> \xD2\x58 |0
-<U6D98> \xD2\x5D |0
-<U6DA4> \x8D\xDC |0
-<U6DA5> \x94\x44 |0
-<U6DAA> \xB2\x65 |0
-<U6DAB> \xD5\xE1 |0
-<U6DAC> \xD5\xE5 |0
-<U6DAE> \xB2\x52 |0
-<U6DAF> \xB2\x50 |0
-<U6DB1> \x8D\xDD |0
-<U6DB2> \xB2\x47 |0
-<U6DB3> \xD5\xE3 |0
-<U6DB4> \xD5\xE2 |0
-<U6DB5> \xB2\x5B |0
-<U6DB7> \xD5\xE8 |0
-<U6DB8> \xB2\x55 |0
-<U6DB9> \xA0\xD6 |0
-<U6DBA> \xD5\xFA |0
-<U6DBB> \xD6\x47 |0
-<U6DBC> \xB2\x44 |0
-<U6DBD> \xD5\xF7 |0
-<U6DBE> \xD5\xF0 |0
-<U6DBF> \xB2\x67 |0
-<U6DC0> \xD5\xE0 |0
-<U6DC2> \xD5\xFC |0
-<U6DC4> \xB2\x64 |0
-<U6DC5> \xB2\x58 |0
-<U6DC6> \xB2\x63 |0
-<U6DC7> \xB2\x4E |0
-<U6DC8> \xD5\xEC |0
-<U6DC9> \xD5\xFE |0
-<U6DCA> \xD5\xF6 |0
-<U6DCB> \xB2\x4F |0
-<U6DCC> \xB2\x49 |0
-<U6DCD> \xD6\x45 |0
-<U6DCF> \xD5\xFD |0
-<U6DD0> \xD6\x40 |0
-<U6DD1> \xB2\x51 |0
-<U6DD2> \xB2\x59 |0
-<U6DD3> \xD6\x42 |0
-<U6DD4> \xD5\xEA |0
-<U6DD5> \xD5\xFB |0
-<U6DD6> \xD5\xEF |0
-<U6DD7> \xD6\x44 |0
-<U6DD8> \xB2\x5E |0
-<U6DD9> \xB2\x46 |0
-<U6DDA> \xB2\x5C |0
-<U6DDB> \xD5\xF4 |0
-<U6DDC> \xD5\xF2 |0
-<U6DDD> \xD5\xF3 |0
-<U6DDE> \xB2\x53 |0
-<U6DDF> \xD5\xEE |0
-<U6DE0> \xD5\xED |0
-<U6DE1> \xB2\x48 |0
-<U6DE2> \xD5\xE7 |0
-<U6DE3> \xD6\x46 |0
-<U6DE4> \xB2\x4A |0
-<U6DE5> \xD5\xF1 |0
-<U6DE6> \xB2\x68 |0
-<U6DE8> \xB2\x62 |0
-<U6DE9> \xD5\xE6 |0
-<U6DEA> \xB2\x5F |0
-<U6DEB> \xB2\x5D |0
-<U6DEC> \xB2\x66 |0
-<U6DED> \xD5\xF8 |0
-<U6DEE> \xB2\x61 |0
-<U6DEF> \xD2\x52 |0
-<U6DF0> \xD5\xF9 |0
-<U6DF1> \xB2\x60 |0
-<U6DF2> \xD6\x41 |0
-<U6DF3> \xB2\x45 |0
-<U6DF4> \xD5\xF5 |0
-<U6DF5> \xB2\x57 |0
-<U6DF6> \xD5\xE9 |0
-<U6DF7> \xB2\x56 |0
-<U6DF9> \xB2\x54 |0
-<U6DFA> \xB2\x4C |0
-<U6DFB> \xB2\x4B |0
-<U6DFC> \xD9\xE7 |0
-<U6DFD> \xD6\x43 |0
-<U6DFE> \x8C\x41 |0
-<U6E00> \xD5\xEB |0
-<U6E02> \x97\xD5 |0
-<U6E03> \xD9\xFC |0
-<U6E04> \x94\x4A |0
-<U6E05> \xB2\x4D |0
-<U6E0A> \x94\x4D |0
-<U6E0F> \x97\xCB |0
-<U6E15> \x8D\xDE |0
-<U6E18> \x8D\xDF |0
-<U6E19> \xB5\x41 |0
-<U6E1A> \xB2\x5A |0
-<U6E1B> \xB4\xEE |0
-<U6E1C> \xD9\xF6 |0
-<U6E1D> \xB4\xFC |0
-<U6E1F> \xD9\xEA |0
-<U6E20> \xB4\xEB |0
-<U6E21> \xB4\xE7 |0
-<U6E22> \xDA\x49 |0
-<U6E23> \xB4\xED |0
-<U6E24> \xB4\xF1 |0
-<U6E25> \xB4\xEC |0
-<U6E26> \xB4\xF5 |0
-<U6E27> \xDA\x4D |0
-<U6E28> \xDA\x44 |0
-<U6E29> \x8D\xE0 |0
-<U6E2A> \xFE\xF9 |0
-<U6E2B> \xD9\xF1 |0
-<U6E2C> \xB4\xFA |0
-<U6E2D> \xB4\xF4 |0
-<U6E2E> \xD9\xFD |0
-<U6E2F> \xB4\xE4 |0
-<U6E30> \xDA\x4A |0
-<U6E31> \xDA\x43 |0
-<U6E32> \xB4\xE8 |0
-<U6E33> \xD9\xF7 |0
-<U6E34> \xB4\xF7 |0
-<U6E35> \xDA\x55 |0
-<U6E36> \xDA\x56 |0
-<U6E38> \xB4\xE5 |0
-<U6E39> \xDA\x48 |0
-<U6E3A> \xB4\xF9 |0
-<U6E3B> \xD9\xFB |0
-<U6E3C> \xD9\xED |0
-<U6E3D> \xD9\xEE |0
-<U6E3E> \xB4\xFD |0
-<U6E3F> \xD9\xF2 |0
-<U6E40> \xD9\xF9 |0
-<U6E41> \xD9\xF3 |0
-<U6E43> \xB4\xFB |0
-<U6E44> \xB5\x44 |0
-<U6E45> \xD9\xEF |0
-<U6E46> \xD9\xE8 |0
-<U6E47> \xD9\xE9 |0
-<U6E49> \xD9\xEB |0
-<U6E4A> \xB4\xEA |0
-<U6E4B> \xD9\xF8 |0
-<U6E4D> \xB4\xF8 |0
-<U6E4E> \xB5\x42 |0
-<U6E4F> \xFD\xC0 |0
-<U6E50> \xFC\xF9 |0
-<U6E51> \xD9\xFA |0
-<U6E52> \xDA\x53 |0
-<U6E53> \xDA\x4B |0
-<U6E54> \xB4\xE6 |0
-<U6E55> \xDA\x51 |0
-<U6E56> \xB4\xF2 |0
-<U6E58> \xB4\xF0 |0
-<U6E59> \xFB\x7E |0
-<U6E5A> \xDA\x57 |0
-<U6E5B> \xB4\xEF |0
-<U6E5C> \xDA\x41 |0
-<U6E5D> \xD9\xF4 |0
-<U6E5E> \xD9\xFE |0
-<U6E5F> \xB5\x47 |0
-<U6E60> \xDA\x45 |0
-<U6E61> \xDA\x42 |0
-<U6E62> \xD9\xF0 |0
-<U6E63> \xB5\x43 |0
-<U6E64> \xDA\x4F |0
-<U6E65> \xDA\x4C |0
-<U6E66> \xDA\x54 |0
-<U6E67> \xB4\xE9 |0
-<U6E68> \xDA\x40 |0
-<U6E69> \xB5\x46 |0
-<U6E6B> \xDA\x47 |0
-<U6E6E> \xB4\xF3 |0
-<U6E6F> \xB4\xF6 |0
-<U6E71> \xDA\x46 |0
-<U6E72> \xB5\x45 |0
-<U6E73> \xD9\xF5 |0
-<U6E74> \xD5\xE4 |0
-<U6E76> \x92\xB3 |0
-<U6E77> \xDA\x50 |0
-<U6E78> \xDA\x4E |0
-<U6E79> \xDA\x52 |0
-<U6E7C> \xFD\xAF |0
-<U6E86> \x8D\xE1 |0
-<U6E88> \xD9\xEC |0
-<U6E89> \xB5\x40 |0
-<U6E8B> \x95\xD3 |0
-<U6E8D> \xDE\x61 |0
-<U6E8E> \xDE\x60 |0
-<U6E8F> \xDE\x46 |0
-<U6E90> \xB7\xBD |0
-<U6E92> \xDE\x5F |0
-<U6E93> \xDE\x49 |0
-<U6E94> \xDE\x4A |0
-<U6E96> \xB7\xC7 |0
-<U6E97> \xDE\x68 |0
-<U6E98> \xB7\xC2 |0
-<U6E99> \xDE\x5E |0
-<U6E9A> \x89\xC1 |0
-<U6E9B> \xDE\x43 |0
-<U6E9C> \xB7\xC8 |0
-<U6E9D> \xB7\xBE |0
-<U6E9E> \xDE\x52 |0
-<U6E9F> \xDE\x48 |0
-<U6EA0> \xDE\x4B |0
-<U6EA1> \xDE\x63 |0
-<U6EA2> \xB7\xB8 |0
-<U6EA3> \xDE\x6A |0
-<U6EA4> \xDE\x62 |0
-<U6EA5> \xB7\xC1 |0
-<U6EA6> \xDE\x57 |0
-<U6EA7> \xB7\xCC |0
-<U6EAA> \xB7\xCB |0
-<U6EAB> \xB7\xC5 |0
-<U6EAE> \xDE\x69 |0
-<U6EAF> \xB7\xB9 |0
-<U6EB0> \xDE\x55 |0
-<U6EB1> \xDE\x4C |0
-<U6EB2> \xDE\x59 |0
-<U6EB3> \xDE\x65 |0
-<U6EB4> \xB7\xCD |0
-<U6EB5> \xFD\x68 |0
-<U6EB6> \xB7\xBB |0
-<U6EB7> \xDE\x54 |0
-<U6EB8> \x9C\xB7 |0
-<U6EB9> \xDE\x4D |0
-<U6EBA> \xB7\xC4 |0
-<U6EBB> \x8D\xE3 |0
-<U6EBC> \xB7\xC3 |0
-<U6EBD> \xDE\x50 |0
-<U6EBE> \xDE\x5A |0
-<U6EBF> \xDE\x64 |0
-<U6EC0> \xDE\x47 |0
-<U6EC1> \xDE\x51 |0
-<U6EC2> \xB7\xBC |0
-<U6EC3> \xDE\x5B |0
-<U6EC4> \xB7\xC9 |0
-<U6EC5> \xB7\xC0 |0
-<U6EC6> \xDE\x4E |0
-<U6EC7> \xB7\xBF |0
-<U6EC8> \xDE\x45 |0
-<U6EC9> \xDE\x53 |0
-<U6ECA> \xDE\x67 |0
-<U6ECB> \xB4\xFE |0
-<U6ECC> \xBA\xB0 |0
-<U6ECD> \xDE\x56 |0
-<U6ECE> \xE2\x6C |0
-<U6ECF> \xDE\x58 |0
-<U6ED0> \xDE\x66 |0
-<U6ED1> \xB7\xC6 |0
-<U6ED2> \xDE\x4F |0
-<U6ED3> \xB7\xBA |0
-<U6ED4> \xB7\xCA |0
-<U6ED5> \xBC\xF0 |0
-<U6ED6> \xDE\x44 |0
-<U6ED8> \xDE\x5D |0
-<U6ED9> \xFA\xC0 |0
-<U6EDA> \x8D\xE5 |0
-<U6EDB> \xFA\x64 |0
-<U6EDC> \xDE\x5C |0
-<U6EDD> \x89\x47 |0
-<U6EE2> \x8D\xE4 |0
-<U6EE8> \x8D\xE7 |0
-<U6EE9> \x8D\xE8 |0
-<U6EEB> \xE2\xAA |0
-<U6EEC> \xBA\xAD |0
-<U6EED> \xE2\x7D |0
-<U6EEE> \xE2\xA4 |0
-<U6EEF> \xBA\xA2 |0
-<U6EF1> \xE2\x6E |0
-<U6EF2> \xBA\xAF |0
-<U6EF4> \xBA\x77 |0
-<U6EF5> \xE2\x6D |0
-<U6EF6> \xE2\xB0 |0
-<U6EF7> \xBA\xB1 |0
-<U6EF8> \xE2\x71 |0
-<U6EF9> \xE2\xA3 |0
-<U6EFA> \xFD\xC7 |0
-<U6EFB> \xE2\x73 |0
-<U6EFC> \xE2\xB3 |0
-<U6EFD> \xE2\xAF |0
-<U6EFE> \xBA\x75 |0
-<U6EFF> \xBA\xA1 |0
-<U6F00> \xE6\x53 |0
-<U6F01> \xBA\xAE |0
-<U6F02> \xBA\x7D |0
-<U6F03> \xE2\x6F |0
-<U6F04> \xFD\xB0 |0
-<U6F05> \xE2\xAE |0
-<U6F06> \xBA\xA3 |0
-<U6F07> \xE2\xAB |0
-<U6F08> \xE2\xB8 |0
-<U6F09> \xE2\x75 |0
-<U6F0A> \xE2\x7E |0
-<U6F0B> \x94\x45 |0
-<U6F0C> \x97\xD6 |0
-<U6F0D> \xE2\xB6 |0
-<U6F0E> \xE2\xAC |0
-<U6F0F> \xBA\x7C |0
-<U6F12> \xE2\x7C |0
-<U6F13> \xBA\x76 |0
-<U6F14> \xBA\x74 |0
-<U6F15> \xBA\xA8 |0
-<U6F16> \xFC\xC6 |0
-<U6F17> \x98\x44 |0
-<U6F18> \xE2\x7A |0
-<U6F19> \xE2\x77 |0
-<U6F1A> \xE2\x78 |0
-<U6F1C> \xE2\xB2 |0
-<U6F1E> \xE2\xB7 |0
-<U6F1F> \xE2\xB5 |0
-<U6F20> \xBA\x7A |0
-<U6F21> \xE2\xB9 |0
-<U6F22> \xBA\x7E |0
-<U6F23> \xBA\xA7 |0
-<U6F24> \x8D\xE9 |0
-<U6F25> \xE2\x70 |0
-<U6F26> \xE5\xFA |0
-<U6F27> \xE2\x79 |0
-<U6F29> \xBA\x78 |0
-<U6F2A> \xBA\xAC |0
-<U6F2B> \xBA\xA9 |0
-<U6F2C> \xBA\x7B |0
-<U6F2D> \xE2\xA5 |0
-<U6F2E> \xE2\x74 |0
-<U6F2F> \xBA\xAA |0
-<U6F30> \xE2\xA7 |0
-<U6F31> \xBA\xA4 |0
-<U6F32> \xBA\xA6 |0
-<U6F33> \xBA\x73 |0
-<U6F34> \x8D\xEA |0
-<U6F35> \xE2\xA9 |0
-<U6F36> \xE2\xA1 |0
-<U6F37> \xE2\x72 |0
-<U6F38> \xBA\xA5 |0
-<U6F39> \xE2\xB1 |0
-<U6F3A> \xE2\xB4 |0
-<U6F3B> \xE2\x7B |0
-<U6F3C> \xE2\xA8 |0
-<U6F3D> \xFE\x50 |0
-<U6F3E> \xBA\x79 |0
-<U6F3F> \xBC\xDF |0
-<U6F40> \xE2\xA6 |0
-<U6F41> \xE5\xF9 |0
-<U6F43> \xE2\xAD |0
-<U6F44> \xFD\xCC |0
-<U6F4E> \xE2\x76 |0
-<U6F4F> \xE6\x44 |0
-<U6F50> \xE6\x4E |0
-<U6F51> \xBC\xE2 |0
-<U6F52> \xE6\x4D |0
-<U6F53> \xE6\x59 |0
-<U6F54> \xBC\xE4 |0
-<U6F55> \xE6\x4B |0
-<U6F56> \x9D\xA7 |0
-<U6F57> \xE6\x4F |0
-<U6F58> \xBC\xEF |0
-<U6F5A> \xE6\x46 |0
-<U6F5B> \xBC\xE7 |0
-<U6F5C> \xFD\xCD |0
-<U6F5D> \xE6\x52 |0
-<U6F5E> \xE9\xF0 |0
-<U6F5F> \xBC\xF3 |0
-<U6F60> \xBC\xF2 |0
-<U6F61> \xE6\x54 |0
-<U6F62> \xE6\x43 |0
-<U6F63> \xE6\x5E |0
-<U6F64> \xBC\xED |0
-<U6F66> \xBC\xE3 |0
-<U6F67> \xE6\x57 |0
-<U6F69> \xE6\x5B |0
-<U6F6A> \xE6\x60 |0
-<U6F6B> \xE6\x55 |0
-<U6F6C> \xE6\x49 |0
-<U6F6D> \xBC\xE6 |0
-<U6F6E> \xBC\xE9 |0
-<U6F6F> \xBC\xF1 |0
-<U6F70> \xBC\xEC |0
-<U6F72> \xE6\x4C |0
-<U6F73> \xE2\xA2 |0
-<U6F74> \xFD\xCF |0
-<U6F76> \xE6\x48 |0
-<U6F77> \xE6\x5F |0
-<U6F78> \xBC\xE8 |0
-<U6F79> \x95\xD2 |0
-<U6F7A> \xBC\xEB |0
-<U6F7B> \xE6\x61 |0
-<U6F7C> \xBC\xE0 |0
-<U6F7D> \xE6\x56 |0
-<U6F7E> \xE5\xFB |0
-<U6F7F> \xE6\x5C |0
-<U6F80> \xC0\xDF |0
-<U6F81> \x8D\xED |0
-<U6F82> \xE6\x4A |0
-<U6F84> \xBC\xE1 |0
-<U6F85> \xE6\x45 |0
-<U6F86> \xBC\xE5 |0
-<U6F87> \xE5\xFC |0
-<U6F88> \xBA\xAB |0
-<U6F89> \xE6\x41 |0
-<U6F8A> \xFC\xBA |0
-<U6F8B> \xE6\x5A |0
-<U6F8C> \xE6\x42 |0
-<U6F8D> \xE6\x40 |0
-<U6F8E> \xBC\xEA |0
-<U6F90> \xE6\x58 |0
-<U6F92> \xE5\xFE |0
-<U6F93> \xE6\x51 |0
-<U6F94> \xE6\x50 |0
-<U6F95> \xE6\x5D |0
-<U6F96> \xE6\x47 |0
-<U6F97> \xBC\xEE |0
-<U6F9D> \xFD\xC5 |0
-<U6F9E> \xE9\xF3 |0
-<U6F9F> \xFD\xD2 |0
-<U6FA0> \xBF\x49 |0
-<U6FA1> \xBE\xFE |0
-<U6FA2> \xEA\x40 |0
-<U6FA3> \xE9\xEB |0
-<U6FA4> \xBF\x41 |0
-<U6FA5> \xE9\xF7 |0
-<U6FA6> \xBF\x48 |0
-<U6FA7> \xBF\x43 |0
-<U6FA8> \xE9\xF5 |0
-<U6FA9> \xED\x4F |0
-<U6FAA> \xE9\xFB |0
-<U6FAB> \xEA\x42 |0
-<U6FAC> \xE9\xFA |0
-<U6FAD> \xE9\xE9 |0
-<U6FAE> \xE9\xF8 |0
-<U6FAF> \xEA\x44 |0
-<U6FB0> \xEA\x46 |0
-<U6FB1> \xBE\xFD |0
-<U6FB2> \xEA\x45 |0
-<U6FB3> \xBF\x44 |0
-<U6FB4> \xBF\x4A |0
-<U6FB5> \x9C\xDC |0
-<U6FB6> \xBF\x47 |0
-<U6FB8> \xE9\xFE |0
-<U6FB9> \xBF\x46 |0
-<U6FBA> \xE9\xF9 |0
-<U6FBB> \x95\xCF |0
-<U6FBC> \xE9\xED |0
-<U6FBD> \xE9\xF2 |0
-<U6FBE> \x8D\xEE |0
-<U6FBF> \xE9\xFD |0
-<U6FC0> \xBF\x45 |0
-<U6FC1> \xBF\x42 |0
-<U6FC2> \xBE\xFC |0
-<U6FC3> \xBF\x40 |0
-<U6FC4> \xE9\xF1 |0
-<U6FC6> \xE5\xFD |0
-<U6FC7> \xE9\xEC |0
-<U6FC8> \xE9\xEF |0
-<U6FC9> \xEA\x41 |0
-<U6FCA> \xE9\xF4 |0
-<U6FCB> \xE9\xEA |0
-<U6FCC> \xED\x4E |0
-<U6FCD> \xEA\x43 |0
-<U6FCE> \xE9\xEE |0
-<U6FCF> \xE9\xFC |0
-<U6FD3> \xFD\xD4 |0
-<U6FD4> \xED\x51 |0
-<U6FD5> \xC0\xE3 |0
-<U6FD8> \xC0\xD7 |0
-<U6FD9> \x96\xEC |0
-<U6FDA> \x96\xEB |0
-<U6FDB> \xC0\xDB |0
-<U6FDC> \xED\x53 |0
-<U6FDD> \xED\x59 |0
-<U6FDE> \xED\x57 |0
-<U6FDF> \xC0\xD9 |0
-<U6FE0> \xC0\xDA |0
-<U6FE1> \xC0\xE1 |0
-<U6FE2> \xED\x5A |0
-<U6FE3> \xED\x52 |0
-<U6FE4> \xC0\xDC |0
-<U6FE6> \xED\x56 |0
-<U6FE7> \xED\x55 |0
-<U6FE8> \xED\x5B |0
-<U6FE9> \xC0\xE2 |0
-<U6FEB> \xC0\xDD |0
-<U6FEC> \xC0\xE0 |0
-<U6FED> \xED\x54 |0
-<U6FEE> \xC0\xE4 |0
-<U6FEF> \xC0\xDE |0
-<U6FF0> \xC0\xE5 |0
-<U6FF1> \xC0\xD8 |0
-<U6FF2> \xED\x58 |0
-<U6FF4> \xED\x50 |0
-<U6FF6> \x90\xB6 |0
-<U6FF7> \xEF\xF7 |0
-<U6FF8> \xFD\xC3 |0
-<U6FFA> \xC2\x71 |0
-<U6FFB> \xEF\xF4 |0
-<U6FFC> \xEF\xF6 |0
-<U6FFE> \xC2\x6F |0
-<U6FFF> \xEF\xF2 |0
-<U7000> \xEF\xF3 |0
-<U7001> \xEF\xEE |0
-<U7003> \x98\xAB |0
-<U7004> \xE9\xF6 |0
-<U7005> \xEF\xEF |0
-<U7006> \xC2\x70 |0
-<U7007> \xEF\xEB |0
-<U7009> \xC2\x6D |0
-<U700A> \xEF\xF8 |0
-<U700B> \xC2\x6E |0
-<U700C> \xEF\xEC |0
-<U700D> \xEF\xED |0
-<U700E> \xEF\xF1 |0
-<U700F> \xC2\x73 |0
-<U7011> \xC2\x72 |0
-<U7014> \xEF\xF0 |0
-<U7015> \xC3\x78 |0
-<U7016> \xF2\x5F |0
-<U7017> \xF2\x65 |0
-<U7018> \xC3\x79 |0
-<U7019> \xF2\x5C |0
-<U701A> \xC3\x76 |0
-<U701B> \xC3\x73 |0
-<U701C> \xF2\x67 |0
-<U701D> \xC3\x77 |0
-<U701E> \x96\xEE |0
-<U701F> \xC3\x74 |0
-<U7020> \xF2\x5E |0
-<U7021> \xF2\x61 |0
-<U7022> \xF2\x62 |0
-<U7023> \xF2\x63 |0
-<U7024> \xF2\x66 |0
-<U7026> \xEF\xF5 |0
-<U7027> \xF2\x5D |0
-<U7028> \xC3\x75 |0
-<U7029> \xF2\x64 |0
-<U702A> \xF2\x68 |0
-<U702B> \xF2\x60 |0
-<U702C> \x8D\xF4 |0
-<U702F> \xF4\x5D |0
-<U7030> \xC4\x6A |0
-<U7031> \xF4\x60 |0
-<U7032> \xC4\x6B |0
-<U7033> \xF4\x68 |0
-<U7034> \xF4\x5F |0
-<U7035> \xF4\x5C |0
-<U7037> \xF4\x5E |0
-<U7038> \xF4\x62 |0
-<U7039> \xF4\x65 |0
-<U703A> \xF4\x64 |0
-<U703B> \xF4\x67 |0
-<U703C> \xF4\x5B |0
-<U703E> \xC4\x69 |0
-<U703F> \xF4\x63 |0
-<U7040> \xF4\x66 |0
-<U7041> \xF4\x69 |0
-<U7042> \xF4\x61 |0
-<U7043> \xF5\xD3 |0
-<U7044> \xF5\xD4 |0
-<U7045> \xF5\xD8 |0
-<U7046> \xF5\xD9 |0
-<U7048> \xF5\xD6 |0
-<U7049> \xF5\xD7 |0
-<U704A> \xF5\xD5 |0
-<U704B> \xFD\xE0 |0
-<U704C> \xC4\xE9 |0
-<U704D> \x8C\x67 |0
-<U7050> \x8D\xF6 |0
-<U7051> \xC5\x78 |0
-<U7052> \xF6\xEB |0
-<U7054> \x8D\xF7 |0
-<U7055> \xF6\xE8 |0
-<U7056> \xF6\xE9 |0
-<U7057> \xF6\xEA |0
-<U7058> \xC5\x79 |0
-<U705A> \xF7\xE5 |0
-<U705B> \xF7\xE4 |0
-<U705C> \x8F\xFA |0
-<U705D> \xF8\xAF |0
-<U705E> \xC5\xF4 |0
-<U705F> \xF8\xAD |0
-<U7060> \xF8\xB0 |0
-<U7061> \xF8\xAE |0
-<U7062> \xF8\xF5 |0
-<U7063> \xC6\x57 |0
-<U7064> \xC6\x65 |0
-<U7065> \xF9\xA3 |0
-<U7066> \xF9\x6C |0
-<U7067> \x97\xD0 |0
-<U7068> \xF9\xA2 |0
-<U7069> \xF9\xD0 |0
-<U706A> \xF9\xD1 |0
-<U706B> \xA4\xF5 |0
-<U706C> \x8B\xD2 |0
-<U706F> \x8D\xF8 |0
-<U7070> \xA6\xC7 |0
-<U7071> \xCA\x41 |0
-<U7074> \xCB\x5E |0
-<U7075> \x90\xD9 |0
-<U7076> \xA8\x5F |0
-<U7077> \x8C\x47 |0
-<U7078> \xA8\x62 |0
-<U7079> \xFA\xF0 |0
-<U707A> \xCB\x5F |0
-<U707C> \xA8\x60 |0
-<U707D> \xA8\x61 |0
-<U707E> \xFD\xE1 |0
-<U707F> \x8D\xF9 |0
-<U7081> \xFD\xE3 |0
-<U7082> \xCD\x58 |0
-<U7083> \xCD\x5A |0
-<U7084> \xCD\x55 |0
-<U7085> \xCD\x52 |0
-<U7086> \xCD\x54 |0
-<U7089> \x8D\xFA |0
-<U708A> \xAA\xA4 |0
-<U708B> \xFB\x63 |0
-<U708E> \xAA\xA2 |0
-<U708F> \x90\xA6 |0
-<U7091> \xCD\x56 |0
-<U7092> \xAA\xA3 |0
-<U7093> \xCD\x53 |0
-<U7094> \xCD\x50 |0
-<U7095> \xAA\xA1 |0
-<U7096> \xCD\x57 |0
-<U7098> \xCD\x51 |0
-<U7099> \xAA\xA5 |0
-<U709A> \xCD\x59 |0
-<U709F> \xCF\xAF |0
-<U70A0> \x99\x70 |0
-<U70A1> \xCF\xB3 |0
-<U70A3> \x91\xEB |0
-<U70A4> \xAC\xB7 |0
-<U70A5> \x97\x70 |0
-<U70A6> \x98\x6F |0
-<U70A7> \xFD\xE2 |0
-<U70A9> \xCF\xB6 |0
-<U70AB> \xAC\xAF |0
-<U70AC> \xAC\xB2 |0
-<U70AD> \xAC\xB4 |0
-<U70AE> \xAC\xB6 |0
-<U70AF> \xAC\xB3 |0
-<U70B0> \xCF\xB2 |0
-<U70B1> \xCF\xB1 |0
-<U70B3> \xAC\xB1 |0
-<U70B4> \xCF\xB4 |0
-<U70B5> \xCF\xB5 |0
-<U70B7> \xCF\xAE |0
-<U70B8> \xAC\xB5 |0
-<U70B9> \x98\xF2 |0
-<U70BA> \xAC\xB0 |0
-<U70BB> \x9A\xFC |0
-<U70BC> \x89\x6C |0
-<U70BD> \xFD\xFD |0
-<U70BE> \xCF\xB0 |0
-<U70C0> \x99\x5E |0
-<U70C4> \x95\xBD |0
-<U70C5> \xD2\x77 |0
-<U70C6> \xD2\x78 |0
-<U70C7> \xD2\x79 |0
-<U70C8> \xAF\x50 |0
-<U70CA> \xAF\x4C |0
-<U70CB> \xD2\x6E |0
-<U70CC> \xFD\xE4 |0
-<U70CD> \xD2\x76 |0
-<U70CE> \xD2\x7B |0
-<U70CF> \xAF\x51 |0
-<U70D0> \x91\xE6 |0
-<U70D1> \xD2\x6C |0
-<U70D2> \xD2\x72 |0
-<U70D3> \xD2\x6B |0
-<U70D4> \xD2\x75 |0
-<U70D5> \xFD\xE5 |0
-<U70D6> \xFD\xE6 |0
-<U70D7> \xD2\x71 |0
-<U70D8> \xAF\x4D |0
-<U70D9> \xAF\x4F |0
-<U70DA> \xD2\x7A |0
-<U70DC> \xD2\x6A |0
-<U70DD> \xD2\x6D |0
-<U70DE> \xD2\x73 |0
-<U70DF> \xFD\xE7 |0
-<U70E0> \xD2\x74 |0
-<U70E1> \xD2\x7C |0
-<U70E2> \xD2\x70 |0
-<U70E4> \xAF\x4E |0
-<U70EF> \xB2\x6D |0
-<U70F0> \xD6\x4E |0
-<U70F1> \x94\x54 |0
-<U70F3> \xD6\x50 |0
-<U70F4> \xD6\x4C |0
-<U70F5> \x99\xB8 |0
-<U70F6> \xD6\x58 |0
-<U70F7> \xD6\x4A |0
-<U70F8> \xD6\x57 |0
-<U70F9> \xB2\x69 |0
-<U70FA> \xD6\x48 |0
-<U70FB> \xDA\x5B |0
-<U70FC> \xD6\x52 |0
-<U70FD> \xB2\x6C |0
-<U70FE> \x97\xE9 |0
-<U70FF> \xD6\x53 |0
-<U7100> \xD6\x56 |0
-<U7102> \xD6\x5A |0
-<U7104> \xD6\x4F |0
-<U7105> \x93\x46 |0
-<U7106> \xD6\x54 |0
-<U7109> \xB2\x6A |0
-<U710A> \xB2\x6B |0
-<U710B> \xD6\x59 |0
-<U710C> \xD6\x4D |0
-<U710D> \xD6\x49 |0
-<U710E> \xD6\x5B |0
-<U7110> \xD6\x51 |0
-<U7113> \xD6\x55 |0
-<U7117> \xD6\x4B |0
-<U7119> \xB5\x48 |0
-<U711A> \xB5\x49 |0
-<U711B> \xDA\x65 |0
-<U711C> \xB5\x4F |0
-<U711D> \x98\x63 |0
-<U711E> \xDA\x59 |0
-<U711F> \xDA\x62 |0
-<U7120> \xDA\x58 |0
-<U7121> \xB5\x4C |0
-<U7122> \xDA\x60 |0
-<U7123> \xDA\x5E |0
-<U7125> \xDA\x5F |0
-<U7126> \xB5\x4A |0
-<U7128> \xDA\x63 |0
-<U7129> \x95\xBC |0
-<U712B> \xFD\xED |0
-<U712C> \xFD\xF7 |0
-<U712E> \xDA\x5C |0
-<U712F> \xDA\x5A |0
-<U7130> \xB5\x4B |0
-<U7131> \xDA\x5D |0
-<U7132> \xDA\x61 |0
-<U7133> \x98\x70 |0
-<U7134> \x96\xF6 |0
-<U7135> \x8E\xA9 |0
-<U7136> \xB5\x4D |0
-<U713A> \xDA\x64 |0
-<U713B> \x94\x51 |0
-<U713E> \x8E\x43 |0
-<U7140> \x8B\x5A |0
-<U7141> \xDE\x70 |0
-<U7142> \xDE\x77 |0
-<U7143> \xDE\x79 |0
-<U7144> \xDE\xA1 |0
-<U7145> \xFD\xEE |0
-<U7146> \xB7\xDA |0
-<U7147> \xDE\x6B |0
-<U7149> \xB7\xD2 |0
-<U714A> \xFD\xF0 |0
-<U714B> \xDE\x7A |0
-<U714C> \xB7\xD7 |0
-<U714D> \xDE\xA2 |0
-<U714E> \xB7\xCE |0
-<U714F> \xFD\xF4 |0
-<U7150> \xDE\x7D |0
-<U7151> \x9B\xF5 |0
-<U7152> \xDE\x6D |0
-<U7153> \xDE\x7E |0
-<U7154> \xDE\x6C |0
-<U7156> \xB7\xDC |0
-<U7158> \xDE\x78 |0
-<U7159> \xB7\xCF |0
-<U715A> \xDE\xA3 |0
-<U715C> \xB7\xD4 |0
-<U715D> \xDE\x71 |0
-<U715E> \xB7\xD9 |0
-<U715F> \xDE\x7C |0
-<U7160> \xDE\x6F |0
-<U7161> \xDE\x76 |0
-<U7162> \xDE\x72 |0
-<U7163> \xDE\x6E |0
-<U7164> \xB7\xD1 |0
-<U7165> \xB7\xD8 |0
-<U7166> \xB7\xD6 |0
-<U7167> \xB7\xD3 |0
-<U7168> \xB7\xDB |0
-<U7169> \xB7\xD0 |0
-<U716A> \xDE\x75 |0
-<U716B> \x97\x7E |0
-<U716C> \xB7\xD5 |0
-<U716E> \xB5\x4E |0
-<U7170> \xDE\x7B |0
-<U7171> \x9B\xD5 |0
-<U7172> \xDE\x73 |0
-<U7173> \x9A\xC3 |0
-<U7175> \x97\xC8 |0
-<U7176> \xA0\xDB |0
-<U7177> \x91\xD0 |0
-<U7178> \xDE\x74 |0
-<U717A> \x9F\xE4 |0
-<U717B> \xE2\xC1 |0
-<U717C> \x8F\xDD |0
-<U717D> \xBA\xB4 |0
-<U717E> \x91\xE9 |0
-<U7180> \xE2\xBD |0
-<U7181> \xE2\xC3 |0
-<U7182> \xE2\xBF |0
-<U7184> \xBA\xB6 |0
-<U7185> \xE2\xBE |0
-<U7186> \xE2\xC2 |0
-<U7187> \xE2\xBA |0
-<U7188> \x98\xE0 |0
-<U7189> \xE2\xBC |0
-<U718A> \xBA\xB5 |0
-<U718C> \x92\xCA |0
-<U718E> \x98\x57 |0
-<U718F> \xE2\xC0 |0
-<U7190> \xE2\xBB |0
-<U7191> \x8C\x51 |0
-<U7192> \xBA\xB7 |0
-<U7194> \xBA\xB2 |0
-<U7196> \xFD\xEB |0
-<U7197> \xE2\xC4 |0
-<U7198> \x9B\x49 |0
-<U7199> \xBA\xB3 |0
-<U719A> \xE6\x67 |0
-<U719B> \xE6\x64 |0
-<U719C> \xE6\x70 |0
-<U719D> \xE6\x6A |0
-<U719E> \xE6\x6C |0
-<U719F> \xBC\xF4 |0
-<U71A0> \xE6\x66 |0
-<U71A1> \xE6\x6E |0
-<U71A2> \x9D\x76 |0
-<U71A3> \x9E\xAF |0
-<U71A4> \xE6\x6D |0
-<U71A5> \xE6\x6B |0
-<U71A7> \xE6\x71 |0
-<U71A8> \xBC\xF7 |0
-<U71A9> \xE6\x68 |0
-<U71AA> \xE6\x6F |0
-<U71AC> \xBC\xF5 |0
-<U71AD> \x9C\xCC |0
-<U71AF> \xE6\x63 |0
-<U71B0> \xE6\x65 |0
-<U71B1> \xBC\xF6 |0
-<U71B2> \xE6\x62 |0
-<U71B3> \xE6\x72 |0
-<U71B4> \xFD\xEA |0
-<U71B5> \xE6\x69 |0
-<U71B7> \x8D\xF1 |0
-<U71B8> \xEA\x4A |0
-<U71B9> \xBF\x51 |0
-<U71BA> \xFD\xFB |0
-<U71BC> \xEA\x55 |0
-<U71BD> \xEA\x53 |0
-<U71BE> \xBF\x4B |0
-<U71BF> \xEA\x49 |0
-<U71C0> \xEA\x4C |0
-<U71C1> \xEA\x4D |0
-<U71C2> \xEA\x48 |0
-<U71C3> \xBF\x55 |0
-<U71C4> \xBF\x56 |0
-<U71C5> \xEA\x47 |0
-<U71C6> \xEA\x56 |0
-<U71C7> \xEA\x51 |0
-<U71C8> \xBF\x4F |0
-<U71C9> \xBF\x4C |0
-<U71CA> \xEA\x50 |0
-<U71CB> \xEA\x4E |0
-<U71CE> \xBF\x52 |0
-<U71CF> \xEA\x52 |0
-<U71D0> \xBF\x4D |0
-<U71D1> \x8E\x53 |0
-<U71D2> \xBF\x4E |0
-<U71D4> \xEA\x4F |0
-<U71D5> \xBF\x50 |0
-<U71D6> \xEA\x4B |0
-<U71D8> \xEA\x54 |0
-<U71D9> \xBF\x53 |0
-<U71DA> \xEA\x57 |0
-<U71DB> \xEA\x58 |0
-<U71DC> \xBF\x54 |0
-<U71DD> \xFA\xCF |0
-<U71DF> \xC0\xE7 |0
-<U71E0> \xC0\xEE |0
-<U71E1> \xED\x5C |0
-<U71E2> \xED\x62 |0
-<U71E4> \xED\x60 |0
-<U71E5> \xC0\xEA |0
-<U71E6> \xC0\xE9 |0
-<U71E7> \xC0\xE6 |0
-<U71E8> \xED\x5E |0
-<U71EB> \x96\xF9 |0
-<U71EC> \xC0\xEC |0
-<U71ED> \xC0\xEB |0
-<U71EE> \xC0\xE8 |0
-<U71F0> \xED\x61 |0
-<U71F1> \xED\x5D |0
-<U71F2> \xED\x5F |0
-<U71F4> \xC0\xED |0
-<U71F5> \x98\xBF |0
-<U71F6> \x9E\x49 |0
-<U71F8> \xC2\x77 |0
-<U71F9> \xEF\xFB |0
-<U71FB> \xC2\x74 |0
-<U71FC> \xC2\x75 |0
-<U71FD> \xEF\xFD |0
-<U71FE> \xC2\x76 |0
-<U71FF> \xEF\xFA |0
-<U7200> \x8C\xA7 |0
-<U7201> \xEF\xF9 |0
-<U7202> \xF2\x6C |0
-<U7203> \xEF\xFC |0
-<U7205> \xF2\x6D |0
-<U7206> \xC3\x7A |0
-<U7207> \xF2\x6B |0
-<U7209> \x9B\xCA |0
-<U720A> \xF2\x6A |0
-<U720C> \xF2\x69 |0
-<U720D> \xC3\x7B |0
-<U720E> \xFD\xFE |0
-<U720F> \x92\xDC |0
-<U7210> \xC4\x6C |0
-<U7213> \xF4\x6A |0
-<U7214> \xF4\x6B |0
-<U7215> \xFE\x41 |0
-<U7216> \x91\xCC |0
-<U7217> \x91\xE2 |0
-<U7219> \xF5\xDC |0
-<U721A> \xF5\xDB |0
-<U721B> \xC4\xEA |0
-<U721D> \xF5\xDA |0
-<U721E> \xF6\xEC |0
-<U721F> \xF6\xED |0
-<U7222> \xF7\xE6 |0
-<U7223> \xF8\xB1 |0
-<U7224> \xFE\x44 |0
-<U7226> \xF8\xF6 |0
-<U7227> \xF9\xBC |0
-<U7228> \xC6\x79 |0
-<U7229> \xF9\xC6 |0
-<U722A> \xA4\xF6 |0
-<U722B> \x8B\xD3 |0
-<U722C> \xAA\xA6 |0
-<U722D> \xAA\xA7 |0
-<U722E> \xFE\x47 |0
-<U7230> \xAC\xB8 |0
-<U7235> \xC0\xEF |0
-<U7236> \xA4\xF7 |0
-<U7238> \xAA\xA8 |0
-<U7239> \xAF\x52 |0
-<U723A> \xB7\xDD |0
-<U723B> \xA4\xF8 |0
-<U723D> \xB2\x6E |0
-<U723E> \xBA\xB8 |0
-<U723F> \xC9\x62 |0
-<U7240> \xFE\x48 |0
-<U7241> \xCF\xB7 |0
-<U7242> \xD2\x7D |0
-<U7244> \xE2\xC5 |0
-<U7246> \xC0\xF0 |0
-<U7247> \xA4\xF9 |0
-<U7248> \xAA\xA9 |0
-<U7249> \xCF\xB8 |0
-<U724A> \xCF\xB9 |0
-<U724B> \xDA\x66 |0
-<U724C> \xB5\x50 |0
-<U724F> \xDE\xA4 |0
-<U7250> \x94\x55 |0
-<U7252> \xB7\xDE |0
-<U7253> \xE2\xC6 |0
-<U7255> \xFE\x4B |0
-<U7256> \xBC\xF8 |0
-<U7257> \xFE\x4C |0
-<U7258> \xC3\x7C |0
-<U7259> \xA4\xFA |0
-<U725A> \xDA\x67 |0
-<U725B> \xA4\xFB |0
-<U725C> \x8D\xBF |0
-<U725D> \xA6\xC9 |0
-<U725E> \xCA\x42 |0
-<U725F> \xA6\xC8 |0
-<U7260> \xA8\x65 |0
-<U7261> \xA8\x64 |0
-<U7262> \xA8\x63 |0
-<U7263> \xCB\x60 |0
-<U7266> \x9E\x78 |0
-<U7267> \xAA\xAA |0
-<U7269> \xAA\xAB |0
-<U726A> \xCD\x5B |0
-<U726C> \xCF\xBA |0
-<U726E> \xCF\xBD |0
-<U726F> \xAC\xBA |0
-<U7270> \xCF\xBB |0
-<U7272> \xAC\xB9 |0
-<U7273> \xCF\xBC |0
-<U7274> \xAC\xBB |0
-<U7276> \xD2\xA2 |0
-<U7277> \xD2\xA1 |0
-<U7278> \xD2\x7E |0
-<U7279> \xAF\x53 |0
-<U727B> \xD6\x5D |0
-<U727C> \xD6\x5E |0
-<U727D> \xB2\x6F |0
-<U727E> \xD6\x5C |0
-<U727F> \xD6\x5F |0
-<U7280> \xB5\x52 |0
-<U7281> \xB2\x70 |0
-<U7282> \xFE\x51 |0
-<U7284> \xB5\x51 |0
-<U7285> \xDA\x6B |0
-<U7286> \xDA\x6A |0
-<U7287> \x94\x56 |0
-<U7288> \xDA\x68 |0
-<U7289> \xDA\x69 |0
-<U728B> \xDA\x6C |0
-<U728C> \xDE\xA6 |0
-<U728D> \xDE\xA5 |0
-<U728E> \xDE\xA9 |0
-<U728F> \x9D\x61 |0
-<U7290> \xDE\xA8 |0
-<U7291> \xDE\xA7 |0
-<U7292> \xBA\xB9 |0
-<U7293> \xE2\xC9 |0
-<U7294> \x94\x57 |0
-<U7295> \xE2\xC8 |0
-<U7296> \xBA\xBA |0
-<U7297> \xE2\xC7 |0
-<U7298> \xE6\x73 |0
-<U729A> \xE6\x74 |0
-<U729B> \xBC\xF9 |0
-<U729D> \xEA\x59 |0
-<U729E> \xEA\x5A |0
-<U729F> \x99\x66 |0
-<U72A1> \xF2\x72 |0
-<U72A2> \xC3\x7D |0
-<U72A3> \xF2\x71 |0
-<U72A4> \xF2\x70 |0
-<U72A5> \xF2\x6E |0
-<U72A6> \xF2\x6F |0
-<U72A7> \xC4\xEB |0
-<U72A8> \xF4\x6C |0
-<U72A9> \xF6\xEE |0
-<U72AA> \xF8\xF7 |0
-<U72AC> \xA4\xFC |0
-<U72AD> \x8B\xD5 |0
-<U72AE> \xC9\xA5 |0
-<U72AF> \xA5\xC7 |0
-<U72B0> \xC9\xA6 |0
-<U72B2> \xA0\x69 |0
-<U72B4> \xCA\x43 |0
-<U72B5> \xCA\x44 |0
-<U72BA> \xCB\x66 |0
-<U72BD> \xCB\x62 |0
-<U72BF> \xCB\x61 |0
-<U72C0> \xAA\xAC |0
-<U72C1> \xCB\x65 |0
-<U72C2> \xA8\x67 |0
-<U72C3> \xCB\x63 |0
-<U72C4> \xA8\x66 |0
-<U72C5> \xCB\x67 |0
-<U72C6> \xCB\x64 |0
-<U72C9> \xCD\x5F |0
-<U72CA> \xCF\xBE |0
-<U72CB> \xCD\x5D |0
-<U72CC> \xCD\x64 |0
-<U72CD> \x98\xB4 |0
-<U72CE> \xAA\xAD |0
-<U72D0> \xAA\xB0 |0
-<U72D1> \xCD\x65 |0
-<U72D2> \xCD\x61 |0
-<U72D4> \xCD\x62 |0
-<U72D6> \xCD\x5C |0
-<U72D7> \xAA\xAF |0
-<U72D8> \xCD\x5E |0
-<U72D9> \xAA\xAE |0
-<U72DA> \xCD\x63 |0
-<U72DC> \xCD\x60 |0
-<U72DF> \xCF\xC2 |0
-<U72E0> \xAC\xBD |0
-<U72E1> \xAC\xBE |0
-<U72E2> \xA0\x49 |0
-<U72E3> \xCF\xC5 |0
-<U72E4> \xCF\xBF |0
-<U72E6> \xCF\xC4 |0
-<U72E8> \xCF\xC0 |0
-<U72E9> \xAC\xBC |0
-<U72EA> \xCF\xC3 |0
-<U72EB> \xCF\xC1 |0
-<U72F3> \xD2\xA8 |0
-<U72F4> \xD2\xA5 |0
-<U72F6> \xD2\xA7 |0
-<U72F7> \xAF\x58 |0
-<U72F8> \xAF\x57 |0
-<U72F9> \xAF\x55 |0
-<U72FA> \xD2\xA4 |0
-<U72FB> \xD2\xA9 |0
-<U72FC> \xAF\x54 |0
-<U72FD> \xAF\x56 |0
-<U72FE> \xD2\xA6 |0
-<U72FF> \xD6\x67 |0
-<U7300> \xD2\xA3 |0
-<U7301> \xD2\xAA |0
-<U7302> \xA0\x4C |0
-<U7304> \x9E\x65 |0
-<U7307> \xD6\x62 |0
-<U7308> \xD6\x66 |0
-<U730A> \xD6\x65 |0
-<U730B> \xDA\x6E |0
-<U730C> \xDA\x79 |0
-<U730F> \xD6\x68 |0
-<U7310> \x98\xB5 |0
-<U7311> \xD6\x63 |0
-<U7312> \xDA\x6D |0
-<U7313> \xB2\x74 |0
-<U7316> \xB2\x73 |0
-<U7317> \xD6\x61 |0
-<U7318> \xD6\x64 |0
-<U7319> \xB2\x75 |0
-<U731B> \xB2\x72 |0
-<U731C> \xB2\x71 |0
-<U731D> \xD6\x60 |0
-<U731E> \xD6\x69 |0
-<U7322> \xDA\x70 |0
-<U7323> \xDA\x77 |0
-<U7325> \xB5\x54 |0
-<U7326> \xDA\x76 |0
-<U7327> \xDA\x73 |0
-<U7328> \xFE\x58 |0
-<U7329> \xB5\x56 |0
-<U732A> \x99\x75 |0
-<U732B> \xFE\x53 |0
-<U732C> \xA0\x65 |0
-<U732D> \xDA\x75 |0
-<U732E> \xFE\x59 |0
-<U7330> \xDA\x6F |0
-<U7331> \xDA\x71 |0
-<U7332> \xDA\x74 |0
-<U7333> \xDA\x72 |0
-<U7334> \xB5\x55 |0
-<U7335> \xDA\x78 |0
-<U7336> \xB5\x53 |0
-<U7337> \xB7\xDF |0
-<U7338> \x98\xB7 |0
-<U7339> \x98\xB8 |0
-<U733A> \xDE\xAD |0
-<U733B> \xDE\xAC |0
-<U733C> \xDE\xAA |0
-<U733E> \xB7\xE2 |0
-<U733F> \xB7\xE1 |0
-<U7340> \xDE\xAE |0
-<U7341> \x98\xBA |0
-<U7342> \xDE\xAB |0
-<U7343> \xE2\xCA |0
-<U7344> \xBA\xBB |0
-<U7345> \xB7\xE0 |0
-<U7348> \x98\xBB |0
-<U7349> \xDE\xB0 |0
-<U734A> \xDE\xAF |0
-<U734C> \xE2\xCD |0
-<U734D> \xE2\xCB |0
-<U734E> \xBC\xFA |0
-<U734F> \x9F\xBC |0
-<U7350> \xBA\xBC |0
-<U7351> \xE2\xCC |0
-<U7352> \xE6\x76 |0
-<U7357> \xBC\xFB |0
-<U7358> \xE6\x75 |0
-<U7359> \xE6\x7E |0
-<U735A> \xE6\x7D |0
-<U735B> \xE6\x7B |0
-<U735D> \xE6\x7A |0
-<U735E> \xE6\x77 |0
-<U735F> \xE6\x78 |0
-<U7360> \xE6\x79 |0
-<U7361> \xE6\x7C |0
-<U7362> \xE6\xA1 |0
-<U7365> \xEA\x5F |0
-<U7366> \xEA\x5C |0
-<U7367> \xEA\x5D |0
-<U7368> \xBF\x57 |0
-<U7369> \xEA\x5B |0
-<U736A> \xEA\x61 |0
-<U736B> \xEA\x60 |0
-<U736C> \xEA\x5E |0
-<U736E> \xED\x64 |0
-<U736F> \xED\x65 |0
-<U7370> \xC0\xF1 |0
-<U7371> \xA0\x4A |0
-<U7372> \xC0\xF2 |0
-<U7373> \xED\x63 |0
-<U7374> \x9E\xC7 |0
-<U7375> \xC2\x79 |0
-<U7376> \xEF\xFE |0
-<U7377> \xC2\x78 |0
-<U7378> \xC3\x7E |0
-<U737A> \xC3\xA1 |0
-<U737B> \xC4\x6D |0
-<U737C> \xF4\x6E |0
-<U737D> \xF4\x6D |0
-<U737E> \xF5\xDD |0
-<U737F> \xF6\xEF |0
-<U7380> \xC5\x7A |0
-<U7381> \xF7\xE8 |0
-<U7382> \xF7\xE7 |0
-<U7383> \xF7\xE9 |0
-<U7384> \xA5\xC8 |0
-<U7385> \xCF\xC6 |0
-<U7386> \xAF\x59 |0
-<U7387> \xB2\x76 |0
-<U7388> \xD6\x6A |0
-<U7389> \xA5\xC9 |0
-<U738A> \xC9\xA7 |0
-<U738B> \xA4\xFD |0
-<U738C> \x8C\xA9 |0
-<U738E> \xCA\x45 |0
-<U738F> \x98\xAE |0
-<U7392> \xCB\x6C |0
-<U7393> \xCB\x6A |0
-<U7394> \xCB\x6B |0
-<U7395> \xCB\x68 |0
-<U7396> \xA8\x68 |0
-<U7397> \xCB\x69 |0
-<U7398> \x92\xD6 |0
-<U739C> \xFA\xE1 |0
-<U739D> \xCD\x6D |0
-<U739E> \x91\xD4 |0
-<U739F> \xAA\xB3 |0
-<U73A0> \xCD\x6B |0
-<U73A1> \xCD\x67 |0
-<U73A2> \xCD\x6A |0
-<U73A4> \xCD\x66 |0
-<U73A5> \xAA\xB5 |0
-<U73A6> \xCD\x69 |0
-<U73A7> \xFA\xDE |0
-<U73A8> \xAA\xB2 |0
-<U73A9> \xAA\xB1 |0
-<U73AA> \xFE\x5B |0
-<U73AB> \xAA\xB4 |0
-<U73AC> \xCD\x6C |0
-<U73AD> \xCD\x68 |0
-<U73B2> \xAC\xC2 |0
-<U73B3> \xAC\xC5 |0
-<U73B4> \xCF\xCE |0
-<U73B5> \xCF\xCD |0
-<U73B6> \xCF\xCC |0
-<U73B7> \xAC\xBF |0
-<U73B8> \xCF\xD5 |0
-<U73B9> \xCF\xCB |0
-<U73BA> \x8C\x53 |0
-<U73BB> \xAC\xC1 |0
-<U73BC> \xD2\xAF |0
-<U73BE> \xCF\xD2 |0
-<U73BF> \xCF\xD0 |0
-<U73C0> \xAC\xC4 |0
-<U73C2> \xCF\xC8 |0
-<U73C3> \xCF\xD3 |0
-<U73C5> \xCF\xCA |0
-<U73C6> \xCF\xD4 |0
-<U73C7> \xCF\xD1 |0
-<U73C8> \xCF\xC9 |0
-<U73C9> \xFE\x5E |0
-<U73CA> \xAC\xC0 |0
-<U73CB> \xCF\xD6 |0
-<U73CC> \xCF\xC7 |0
-<U73CD> \xAC\xC3 |0
-<U73CE> \xFB\xD7 |0
-<U73CF> \xFE\x5A |0
-<U73D0> \x94\xC5 |0
-<U73D2> \xD2\xB4 |0
-<U73D3> \xD2\xAB |0
-<U73D4> \xD2\xB6 |0
-<U73D5> \xFA\xCA |0
-<U73D6> \xD2\xAE |0
-<U73D7> \xD2\xB9 |0
-<U73D8> \xD2\xBA |0
-<U73D9> \xD2\xAC |0
-<U73DA> \xD2\xB8 |0
-<U73DB> \xD2\xB5 |0
-<U73DC> \xD2\xB3 |0
-<U73DD> \xD2\xB7 |0
-<U73DE> \xAF\x5F |0
-<U73E0> \xAF\x5D |0
-<U73E1> \x98\xC1 |0
-<U73E2> \x97\x5C |0
-<U73E3> \xD2\xB1 |0
-<U73E4> \xFE\x74 |0
-<U73E5> \xD2\xAD |0
-<U73E6> \x97\x73 |0
-<U73E7> \xD2\xB0 |0
-<U73E8> \xD2\xBB |0
-<U73E9> \xD2\xB2 |0
-<U73EA> \xAF\x5E |0
-<U73EB> \xCF\xCF |0
-<U73ED> \xAF\x5A |0
-<U73EE> \xAF\x5C |0
-<U73EF> \xFA\x46 |0
-<U73F3> \x97\x64 |0
-<U73F4> \xD6\x78 |0
-<U73F5> \xD6\x6D |0
-<U73F6> \xD6\x6B |0
-<U73F7> \xFE\x68 |0
-<U73F8> \xD6\x6C |0
-<U73F9> \x96\x4E |0
-<U73FA> \xD6\x73 |0
-<U73FB> \x97\x65 |0
-<U73FC> \xD6\x74 |0
-<U73FD> \xD6\x70 |0
-<U73FE> \xB2\x7B |0
-<U73FF> \xD6\x75 |0
-<U7400> \xD6\x72 |0
-<U7401> \xD6\x6F |0
-<U7402> \x8C\x5A |0
-<U7403> \xB2\x79 |0
-<U7404> \xD6\x6E |0
-<U7405> \xB2\x77 |0
-<U7406> \xB2\x7A |0
-<U7407> \xD6\x71 |0
-<U7408> \xD6\x79 |0
-<U7409> \xAF\x5B |0
-<U740A> \xB2\x78 |0
-<U740B> \xD6\x77 |0
-<U740C> \xD6\x76 |0
-<U740D> \xB2\x7C |0
-<U7411> \x89\xA1 |0
-<U7412> \x95\xFA |0
-<U7414> \x92\xD4 |0
-<U7415> \xFE\x69 |0
-<U7416> \xDA\x7E |0
-<U7417> \xFB\x45 |0
-<U7419> \x98\xC8 |0
-<U741A> \xDA\xA1 |0
-<U741B> \xB5\x60 |0
-<U741C> \x90\xEF |0
-<U741D> \xDA\xA7 |0
-<U741E> \x98\xC9 |0
-<U741F> \x98\xCA |0
-<U7420> \xDA\xA9 |0
-<U7421> \xDA\xA2 |0
-<U7422> \xB5\x5A |0
-<U7423> \xDA\xA6 |0
-<U7424> \xDA\xA5 |0
-<U7425> \xB5\x5B |0
-<U7426> \xB5\x61 |0
-<U7428> \xB5\x62 |0
-<U7429> \xDA\xA8 |0
-<U742A> \xB5\x58 |0
-<U742B> \xDA\x7D |0
-<U742C> \xDA\x7B |0
-<U742D> \xDA\xA3 |0
-<U742E> \xDA\x7A |0
-<U742F> \xB5\x5F |0
-<U7430> \xDA\x7C |0
-<U7431> \xDA\xA4 |0
-<U7432> \xDA\xAA |0
-<U7433> \xB5\x59 |0
-<U7434> \xB5\x5E |0
-<U7435> \xB5\x5C |0
-<U7436> \xB5\x5D |0
-<U7437> \x94\x6D |0
-<U7438> \x94\xB7 |0
-<U7439> \xFE\x6C |0
-<U743A> \xB5\x57 |0
-<U743C> \x94\x6B |0
-<U743F> \xB7\xE9 |0
-<U7440> \xDE\xB7 |0
-<U7441> \xB7\xE8 |0
-<U7442> \xDE\xBB |0
-<U7443> \x92\xFC |0
-<U7444> \xDE\xB1 |0
-<U7445> \x95\xEB |0
-<U7446> \xDE\xBC |0
-<U7447> \xFE\x73 |0
-<U7448> \x97\x6E |0
-<U7449> \xFE\x5F |0
-<U744A> \xDE\xB2 |0
-<U744B> \xDE\xB3 |0
-<U744D> \xDE\xBD |0
-<U744E> \xDE\xBA |0
-<U744F> \xDE\xB8 |0
-<U7450> \xDE\xB9 |0
-<U7451> \xDE\xB5 |0
-<U7452> \xDE\xB4 |0
-<U7453> \xFD\xBD |0
-<U7454> \xDE\xBE |0
-<U7455> \xB7\xE5 |0
-<U7456> \x92\xD5 |0
-<U7457> \xDE\xB6 |0
-<U7459> \xB7\xEA |0
-<U745A> \xB7\xE4 |0
-<U745B> \xB7\xEB |0
-<U745C> \xB7\xEC |0
-<U745D> \xFE\xB9 |0
-<U745E> \xB7\xE7 |0
-<U745F> \xB7\xE6 |0
-<U7460> \xFE\x71 |0
-<U7462> \xE2\xCE |0
-<U7463> \xBA\xBE |0
-<U7464> \xBA\xBD |0
-<U7465> \xFB\xBB |0
-<U7467> \xE2\xD3 |0
-<U7468> \x94\x7A |0
-<U7469> \xBC\xFC |0
-<U746A> \xBA\xBF |0
-<U746B> \x95\xFB |0
-<U746C> \xFE\x77 |0
-<U746D> \xBA\xC1 |0
-<U746E> \xE2\xD4 |0
-<U746F> \xB7\xE3 |0
-<U7470> \xBA\xC0 |0
-<U7471> \xE2\xD0 |0
-<U7472> \xE2\xD2 |0
-<U7473> \xE2\xCF |0
-<U7474> \xFE\x79 |0
-<U7475> \xE2\xD1 |0
-<U7476> \xFE\x75 |0
-<U7479> \xE6\xAB |0
-<U747A> \x94\x5D |0
-<U747C> \xE6\xAA |0
-<U747D> \xE6\xA7 |0
-<U747E> \xBD\x40 |0
-<U747F> \xEA\x62 |0
-<U7480> \xBD\x41 |0
-<U7481> \xE6\xA6 |0
-<U7482> \xFE\x7C |0
-<U7483> \xBC\xFE |0
-<U7485> \xE6\xA8 |0
-<U7486> \xE6\xA5 |0
-<U7487> \xE6\xA2 |0
-<U7488> \xE6\xA9 |0
-<U7489> \xE6\xA3 |0
-<U748A> \xE6\xA4 |0
-<U748B> \xBC\xFD |0
-<U748C> \x93\x44 |0
-<U748D> \x8E\xA6 |0
-<U7490> \xED\x69 |0
-<U7492> \xEA\x66 |0
-<U7494> \xEA\x65 |0
-<U7495> \xEA\x67 |0
-<U7497> \xED\x66 |0
-<U7498> \xBF\x5A |0
-<U7499> \x92\xD3 |0
-<U749A> \xEA\x63 |0
-<U749B> \x94\xB8 |0
-<U749C> \xBF\x58 |0
-<U749E> \xBF\x5C |0
-<U749F> \xBF\x5B |0
-<U74A0> \xEA\x64 |0
-<U74A1> \xEA\x68 |0
-<U74A3> \xBF\x59 |0
-<U74A4> \xFC\x71 |0
-<U74A5> \xED\x6D |0
-<U74A6> \xC0\xF5 |0
-<U74A7> \xC2\x7A |0
-<U74A8> \xC0\xF6 |0
-<U74A9> \xC0\xF3 |0
-<U74AA> \xED\x6A |0
-<U74AB> \xED\x68 |0
-<U74AD> \xED\x6B |0
-<U74AF> \xED\x6E |0
-<U74B0> \xC0\xF4 |0
-<U74B1> \xED\x6C |0
-<U74B2> \xED\x67 |0
-<U74B4> \x97\x5E |0
-<U74B5> \xF0\x42 |0
-<U74B6> \xF0\x45 |0
-<U74B7> \xF2\x75 |0
-<U74B8> \xF0\x40 |0
-<U74B9> \x8C\xAD |0
-<U74BA> \xF4\x6F |0
-<U74BB> \xF0\x46 |0
-<U74BD> \xC3\xA2 |0
-<U74BE> \xF0\x44 |0
-<U74BF> \xC2\x7B |0
-<U74C0> \xF0\x41 |0
-<U74C1> \xF0\x43 |0
-<U74C2> \xF0\x47 |0
-<U74C3> \xF2\x76 |0
-<U74C5> \xF2\x74 |0
-<U74C8> \xFE\xA7 |0
-<U74CA> \xC3\xA3 |0
-<U74CB> \xF2\x73 |0
-<U74CC> \x94\x6A |0
-<U74CF> \xC4\x6E |0
-<U74D0> \x93\xE3 |0
-<U74D3> \x98\xCF |0
-<U74D4> \xC4\xED |0
-<U74D5> \xF6\xF1 |0
-<U74D6> \xC4\xEC |0
-<U74D7> \xF6\xF3 |0
-<U74D8> \xF6\xF0 |0
-<U74D9> \xF6\xF2 |0
-<U74DA> \xC5\xD0 |0
-<U74DB> \xF8\xB2 |0
-<U74DC> \xA5\xCA |0
-<U74DD> \xCD\x6E |0
-<U74DE> \xD2\xBC |0
-<U74DF> \xD2\xBD |0
-<U74E0> \xB2\x7D |0
-<U74E1> \xDE\xBF |0
-<U74E2> \xBF\x5D |0
-<U74E3> \xC3\xA4 |0
-<U74E4> \xC5\x7B |0
-<U74E5> \xF8\xB3 |0
-<U74E6> \xA5\xCB |0
-<U74E7> \xA0\xD9 |0
-<U74E8> \xCD\x6F |0
-<U74E9> \xA2\x60 |0
-<U74EC> \xCF\xD7 |0
-<U74EE> \xCF\xD8 |0
-<U74F0> \xA0\xBF |0
-<U74F1> \xA0\x4D |0
-<U74F2> \xA0\xB8 |0
-<U74F4> \xD2\xBE |0
-<U74F5> \xD2\xBF |0
-<U74F6> \xB2\x7E |0
-<U74F7> \xB2\xA1 |0
-<U74F8> \xA0\xCE |0
-<U74FB> \xDA\xAB |0
-<U74FD> \xDE\xC2 |0
-<U74FE> \xDE\xC1 |0
-<U74FF> \xDE\xC0 |0
-<U7500> \xE2\xD5 |0
-<U7502> \xE2\xD6 |0
-<U7503> \xE2\xD7 |0
-<U7504> \xBA\xC2 |0
-<U7505> \xA0\xB7 |0
-<U7507> \xE6\xAD |0
-<U7508> \xE6\xAC |0
-<U750B> \xEA\x69 |0
-<U750C> \xBF\x5E |0
-<U750D> \xBF\x5F |0
-<U750E> \xFE\xA9 |0
-<U750F> \xED\x72 |0
-<U7510> \xED\x6F |0
-<U7511> \xED\x70 |0
-<U7512> \xED\x71 |0
-<U7513> \xF0\x49 |0
-<U7514> \xF0\x48 |0
-<U7515> \xC2\x7C |0
-<U7516> \xF2\x77 |0
-<U7517> \xF5\xDE |0
-<U7518> \xA5\xCC |0
-<U7519> \x89\xC3 |0
-<U751A> \xAC\xC6 |0
-<U751C> \xB2\xA2 |0
-<U751D> \xDE\xC3 |0
-<U751E> \xFE\xAB |0
-<U751F> \xA5\xCD |0
-<U7521> \xD2\xC0 |0
-<U7522> \xB2\xA3 |0
-<U7525> \xB5\x63 |0
-<U7526> \xB5\x64 |0
-<U7528> \xA5\xCE |0
-<U7529> \xA5\xCF |0
-<U752A> \xCA\x46 |0
-<U752B> \xA8\x6A |0
-<U752C> \xA8\x69 |0
-<U752D> \xAC\xC7 |0
-<U752E> \xCF\xD9 |0
-<U752F> \xDA\xAC |0
-<U7530> \xA5\xD0 |0
-<U7531> \xA5\xD1 |0
-<U7532> \xA5\xD2 |0
-<U7533> \xA5\xD3 |0
-<U7534> \x9D\xF4 |0
-<U7535> \x89\x6D |0
-<U7537> \xA8\x6B |0
-<U7538> \xA8\x6C |0
-<U7539> \xCB\x6E |0
-<U753A> \xCB\x6D |0
-<U753B> \x9C\x7B |0
-<U753D> \xAA\xB6 |0
-<U753E> \xCD\x72 |0
-<U753F> \xCD\x70 |0
-<U7540> \xCD\x71 |0
-<U7542> \x98\xD2 |0
-<U7546> \x9F\xA9 |0
-<U7547> \xCF\xDA |0
-<U7548> \xCF\xDB |0
-<U754A> \xFE\xB2 |0
-<U754B> \xAC\xCB |0
-<U754C> \xAC\xC9 |0
-<U754D> \xFE\xB1 |0
-<U754E> \xAC\xCA |0
-<U754F> \xAC\xC8 |0
-<U7551> \x97\xD9 |0
-<U7553> \xA0\xC4 |0
-<U7554> \xAF\x60 |0
-<U7555> \x94\x76 |0
-<U7559> \xAF\x64 |0
-<U755A> \xAF\x63 |0
-<U755B> \xD2\xC1 |0
-<U755C> \xAF\x62 |0
-<U755D> \xAF\x61 |0
-<U755F> \xD2\xC2 |0
-<U7560> \x99\x78 |0
-<U7562> \xB2\xA6 |0
-<U7563> \xD6\x7B |0
-<U7564> \xD6\x7A |0
-<U7565> \xB2\xA4 |0
-<U7566> \xB2\xA5 |0
-<U7567> \xFE\xB3 |0
-<U756A> \xB5\x66 |0
-<U756B> \xB5\x65 |0
-<U756C> \xDA\xAE |0
-<U756D> \x98\xD3 |0
-<U756E> \xFE\xB4 |0
-<U756F> \xDA\xAD |0
-<U7570> \xB2\xA7 |0
-<U7572> \x98\xD4 |0
-<U7576> \xB7\xED |0
-<U7577> \xDE\xC5 |0
-<U7578> \xB7\xEE |0
-<U7579> \xDE\xC4 |0
-<U757A> \x9F\xB9 |0
-<U757D> \xE2\xD8 |0
-<U757E> \xE6\xAE |0
-<U757F> \xBD\x42 |0
-<U7580> \xEA\x6A |0
-<U7583> \x94\x71 |0
-<U7584> \xED\x73 |0
-<U7586> \xC3\xA6 |0
-<U7587> \xC3\xA5 |0
-<U758A> \xC5\x7C |0
-<U758B> \xA5\xD4 |0
-<U758C> \xCD\x73 |0
-<U758D> \x98\xD5 |0
-<U758E> \xFE\xB8 |0
-<U758F> \xB2\xA8 |0
-<U7590> \xE2\xD9 |0
-<U7591> \xBA\xC3 |0
-<U7592> \xC6\xD4 |0
-<U7594> \xCB\x6F |0
-<U7595> \xCB\x70 |0
-<U7598> \xCD\x74 |0
-<U7599> \xAA\xB8 |0
-<U759A> \xAA\xB9 |0
-<U759D> \xAA\xB7 |0
-<U759E> \xFE\xBA |0
-<U75A2> \xAC\xCF |0
-<U75A3> \xAC\xD0 |0
-<U75A4> \xAC\xCD |0
-<U75A5> \xAC\xCE |0
-<U75A7> \xCF\xDC |0
-<U75AA> \xCF\xDD |0
-<U75AB> \xAC\xCC |0
-<U75B0> \xD2\xC3 |0
-<U75B1> \x9E\x5C |0
-<U75B2> \xAF\x68 |0
-<U75B3> \xAF\x69 |0
-<U75B4> \xFE\xBB |0
-<U75B5> \xB2\xAB |0
-<U75B6> \xD2\xC9 |0
-<U75B8> \xAF\x6E |0
-<U75B9> \xAF\x6C |0
-<U75BA> \xD2\xCA |0
-<U75BB> \xD2\xC5 |0
-<U75BC> \xAF\x6B |0
-<U75BD> \xAF\x6A |0
-<U75BE> \xAF\x65 |0
-<U75BF> \xD2\xC8 |0
-<U75C0> \xD2\xC7 |0
-<U75C1> \xD2\xC4 |0
-<U75C2> \xAF\x6D |0
-<U75C3> \xA0\x44 |0
-<U75C4> \xD2\xC6 |0
-<U75C5> \xAF\x66 |0
-<U75C7> \xAF\x67 |0
-<U75C8> \x98\xD7 |0
-<U75CA> \xB2\xAC |0
-<U75CB> \xD6\xA1 |0
-<U75CC> \xD6\xA2 |0
-<U75CD> \xB2\xAD |0
-<U75CE> \xD6\x7C |0
-<U75CF> \xD6\x7E |0
-<U75D0> \xD6\xA4 |0
-<U75D1> \xD6\xA3 |0
-<U75D2> \xD6\x7D |0
-<U75D4> \xB2\xA9 |0
-<U75D5> \xB2\xAA |0
-<U75D7> \xDA\xB6 |0
-<U75D8> \xB5\x6B |0
-<U75D9> \xB5\x6A |0
-<U75DA> \xDA\xB0 |0
-<U75DB> \xB5\x68 |0
-<U75DC> \x98\xD8 |0
-<U75DD> \xDA\xB3 |0
-<U75DE> \xB5\x6C |0
-<U75DF> \xDA\xB4 |0
-<U75E0> \xB5\x6D |0
-<U75E1> \xDA\xB1 |0
-<U75E2> \xB5\x67 |0
-<U75E3> \xB5\x69 |0
-<U75E4> \xDA\xB5 |0
-<U75E6> \xDA\xB2 |0
-<U75E7> \xDA\xAF |0
-<U75ED> \xDE\xD2 |0
-<U75EF> \xDE\xC7 |0
-<U75F0> \xB7\xF0 |0
-<U75F1> \xB7\xF3 |0
-<U75F2> \xB7\xF2 |0
-<U75F3> \xB7\xF7 |0
-<U75F4> \xB7\xF6 |0
-<U75F5> \xDE\xD3 |0
-<U75F6> \xDE\xD1 |0
-<U75F7> \xDE\xCA |0
-<U75F8> \xDE\xCE |0
-<U75F9> \xDE\xCD |0
-<U75FA> \xB7\xF4 |0
-<U75FB> \xDE\xD0 |0
-<U75FC> \xDE\xCC |0
-<U75FD> \xDE\xD4 |0
-<U75FE> \xDE\xCB |0
-<U75FF> \xB7\xF5 |0
-<U7600> \xB7\xEF |0
-<U7601> \xB7\xF1 |0
-<U7602> \xFE\xBC |0
-<U7603> \xDE\xC9 |0
-<U7607> \x9F\xFE |0
-<U7608> \xE2\xDB |0
-<U7609> \xBA\xC7 |0
-<U760A> \xE2\xDF |0
-<U760B> \xBA\xC6 |0
-<U760C> \xE2\xDC |0
-<U760D> \xBA\xC5 |0
-<U760F> \xDE\xC8 |0
-<U7610> \xDE\xCF |0
-<U7611> \xE2\xDE |0
-<U7613> \xBA\xC8 |0
-<U7614> \xE2\xE0 |0
-<U7615> \xE2\xDD |0
-<U7616> \xE2\xDA |0
-<U7619> \xE6\xB1 |0
-<U761A> \xE6\xB5 |0
-<U761B> \xE6\xB7 |0
-<U761C> \xE6\xB3 |0
-<U761D> \xE6\xB2 |0
-<U761E> \xE6\xB0 |0
-<U761F> \xBD\x45 |0
-<U7620> \xBD\x43 |0
-<U7621> \xBD\x48 |0
-<U7622> \xBD\x49 |0
-<U7623> \xE6\xB4 |0
-<U7624> \xBD\x46 |0
-<U7625> \xE6\xAF |0
-<U7626> \xBD\x47 |0
-<U7627> \xBA\xC4 |0
-<U7628> \xE6\xB6 |0
-<U7629> \xBD\x44 |0
-<U762C> \xFE\xBD |0
-<U762D> \xEA\x6C |0
-<U762F> \xEA\x6B |0
-<U7630> \xEA\x73 |0
-<U7631> \xEA\x6D |0
-<U7632> \xEA\x72 |0
-<U7633> \xEA\x6F |0
-<U7634> \xBF\x60 |0
-<U7635> \xEA\x71 |0
-<U7638> \xBF\x61 |0
-<U763A> \xBF\x62 |0
-<U763B> \x9D\xDD |0
-<U763C> \xEA\x70 |0
-<U763D> \xEA\x6E |0
-<U7640> \x9E\xE1 |0
-<U7642> \xC0\xF8 |0
-<U7643> \xED\x74 |0
-<U7646> \xC0\xF7 |0
-<U7647> \xED\x77 |0
-<U7648> \xED\x75 |0
-<U7649> \xED\x76 |0
-<U764C> \xC0\xF9 |0
-<U764D> \x98\xDA |0
-<U764E> \x9D\xDF |0
-<U764F> \xFE\xBF |0
-<U7650> \xF0\x4D |0
-<U7651> \xFE\xBE |0
-<U7652> \xC2\xA1 |0
-<U7653> \xF0\x4E |0
-<U7654> \x9E\xEB |0
-<U7656> \xC2\x7D |0
-<U7657> \xF0\x4F |0
-<U7658> \xC2\x7E |0
-<U7659> \xF0\x4C |0
-<U765A> \xF0\x50 |0
-<U765C> \xF0\x4A |0
-<U765F> \xC3\xA7 |0
-<U7660> \xF2\x78 |0
-<U7661> \xC3\xA8 |0
-<U7662> \xC4\x6F |0
-<U7664> \xF0\x4B |0
-<U7665> \xC4\x70 |0
-<U7666> \x9E\x59 |0
-<U7667> \xA0\x5C |0
-<U7669> \xC4\xEE |0
-<U766A> \xF5\xDF |0
-<U766C> \xC5\x7E |0
-<U766D> \xF6\xF4 |0
-<U766E> \xC5\x7D |0
-<U766F> \xFE\xC0 |0
-<U7670> \xF7\xEA |0
-<U7671> \xC5\xF5 |0
-<U7672> \xC5\xF6 |0
-<U7673> \x94\x77 |0
-<U7674> \x98\xDC |0
-<U7675> \xF9\xCC |0
-<U7676> \xFE\xC1 |0
-<U7678> \xAC\xD1 |0
-<U7679> \xCF\xDE |0
-<U767A> \x98\xDE |0
-<U767B> \xB5\x6E |0
-<U767C> \xB5\x6F |0
-<U767D> \xA5\xD5 |0
-<U767E> \xA6\xCA |0
-<U767F> \xCA\x47 |0
-<U7681> \xCB\x71 |0
-<U7682> \xA8\x6D |0
-<U7684> \xAA\xBA |0
-<U7686> \xAC\xD2 |0
-<U7687> \xAC\xD3 |0
-<U7688> \xAC\xD4 |0
-<U7689> \xD6\xA6 |0
-<U768A> \xD2\xCB |0
-<U768B> \xAF\x6F |0
-<U768E> \xB2\xAE |0
-<U768F> \xD6\xA5 |0
-<U7690> \xFE\xC3 |0
-<U7692> \xDA\xB8 |0
-<U7693> \xB5\x71 |0
-<U7695> \xDA\xB7 |0
-<U7696> \xB5\x70 |0
-<U7699> \xDE\xD5 |0
-<U769A> \xBD\x4A |0
-<U769B> \xE6\xBB |0
-<U769C> \xE6\xB8 |0
-<U769D> \xE6\xB9 |0
-<U769E> \xE6\xBA |0
-<U76A1> \xFE\xC8 |0
-<U76A4> \xED\x78 |0
-<U76A5> \xFE\xC9 |0
-<U76A6> \xF0\x51 |0
-<U76AA> \xF4\x71 |0
-<U76AB> \xF4\x70 |0
-<U76AD> \xF6\xF5 |0
-<U76AE> \xA5\xD6 |0
-<U76AF> \xCD\x75 |0
-<U76B0> \xAF\x70 |0
-<U76B4> \xB5\x72 |0
-<U76B5> \xDE\xD6 |0
-<U76B7> \xFE\xCA |0
-<U76B8> \xE2\xE1 |0
-<U76BA> \xBD\x4B |0
-<U76BB> \xEA\x74 |0
-<U76BD> \xF0\x52 |0
-<U76BE> \xF4\x72 |0
-<U76BF> \xA5\xD7 |0
-<U76C2> \xAA\xBB |0
-<U76C3> \xAC\xD7 |0
-<U76C4> \xCF\xDF |0
-<U76C5> \xAC\xD8 |0
-<U76C6> \xAC\xD6 |0
-<U76C8> \xAC\xD5 |0
-<U76C9> \xD2\xCC |0
-<U76CA> \xAF\x71 |0
-<U76CC> \xFE\xCB |0
-<U76CD> \xAF\x72 |0
-<U76CE> \xAF\x73 |0
-<U76D2> \xB2\xB0 |0
-<U76D3> \xD6\xA7 |0
-<U76D4> \xB2\xAF |0
-<U76D6> \x9F\xC2 |0
-<U76D9> \x8C\x6B |0
-<U76DA> \xDA\xB9 |0
-<U76DB> \xB2\xB1 |0
-<U76DC> \xB5\x73 |0
-<U76DD> \xDE\xD7 |0
-<U76DE> \xB7\xF8 |0
-<U76DF> \xB7\xF9 |0
-<U76E1> \xBA\xC9 |0
-<U76E3> \xBA\xCA |0
-<U76E4> \xBD\x4C |0
-<U76E5> \xBF\x64 |0
-<U76E6> \xEA\x75 |0
-<U76E7> \xBF\x63 |0
-<U76E9> \xED\x79 |0
-<U76EA> \xC0\xFA |0
-<U76EC> \xF0\x53 |0
-<U76ED> \xF4\x73 |0
-<U76EE> \xA5\xD8 |0
-<U76EF> \xA8\x6E |0
-<U76F0> \xCD\x78 |0
-<U76F1> \xCD\x77 |0
-<U76F2> \xAA\xBC |0
-<U76F3> \xCD\x76 |0
-<U76F4> \xAA\xBD |0
-<U76F5> \xCD\x79 |0
-<U76F7> \xCF\xE5 |0
-<U76F8> \xAC\xDB |0
-<U76F9> \xAC\xDA |0
-<U76FA> \xCF\xE7 |0
-<U76FB> \xCF\xE6 |0
-<U76FC> \xAC\xDF |0
-<U76FE> \xAC\xDE |0
-<U7701> \xAC\xD9 |0
-<U7703> \xCF\xE1 |0
-<U7704> \xCF\xE2 |0
-<U7705> \xCF\xE3 |0
-<U7707> \xAC\xE0 |0
-<U7708> \xCF\xE0 |0
-<U7709> \xAC\xDC |0
-<U770A> \xCF\xE4 |0
-<U770B> \xAC\xDD |0
-<U770C> \x98\xC4 |0
-<U770E> \x94\xB0 |0
-<U770F> \x94\xB1 |0
-<U7710> \xD2\xCF |0
-<U7711> \xD2\xD3 |0
-<U7712> \xD2\xD1 |0
-<U7713> \xD2\xD0 |0
-<U7715> \xD2\xD4 |0
-<U7719> \xD2\xD5 |0
-<U771A> \xD2\xD6 |0
-<U771B> \xD2\xCE |0
-<U771D> \xD2\xCD |0
-<U771E> \xFE\xD1 |0
-<U771F> \xAF\x75 |0
-<U7720> \xAF\x76 |0
-<U7722> \xD2\xD7 |0
-<U7723> \xD2\xD2 |0
-<U7724> \xA0\xC1 |0
-<U7725> \xD6\xB0 |0
-<U7726> \xFE\xD2 |0
-<U7727> \xD2\xD8 |0
-<U7728> \xAF\x77 |0
-<U7729> \xAF\x74 |0
-<U772B> \xA0\xCD |0
-<U772D> \xD6\xAA |0
-<U772F> \xD6\xA9 |0
-<U7731> \xD6\xAB |0
-<U7732> \xD6\xAC |0
-<U7733> \xD6\xAE |0
-<U7734> \xD6\xAD |0
-<U7735> \xD6\xB2 |0
-<U7736> \xB2\xB5 |0
-<U7737> \xB2\xB2 |0
-<U7738> \xB2\xB6 |0
-<U7739> \xD6\xA8 |0
-<U773A> \xB2\xB7 |0
-<U773B> \xD6\xB1 |0
-<U773C> \xB2\xB4 |0
-<U773D> \xD6\xAF |0
-<U773E> \xB2\xB3 |0
-<U7740> \xFE\xD3 |0
-<U7743> \x98\xE5 |0
-<U7744> \xDA\xBC |0
-<U7745> \xDA\xBE |0
-<U7746> \xDA\xBA |0
-<U7747> \xDA\xBB |0
-<U774A> \xDA\xBF |0
-<U774B> \xDA\xC1 |0
-<U774C> \xDA\xC2 |0
-<U774D> \xDA\xBD |0
-<U774E> \xDA\xC0 |0
-<U774F> \xB5\x74 |0
-<U7752> \xDE\xDB |0
-<U7754> \xDE\xE0 |0
-<U7755> \xDE\xD8 |0
-<U7756> \xDE\xDC |0
-<U7758> \xFE\xD6 |0
-<U7759> \xDE\xE1 |0
-<U775A> \xDE\xDD |0
-<U775B> \xB7\xFA |0
-<U775C> \xB8\x43 |0
-<U775E> \xB7\xFD |0
-<U775F> \xDE\xD9 |0
-<U7760> \xDE\xDA |0
-<U7761> \xBA\xCE |0
-<U7762> \xB8\x46 |0
-<U7763> \xB7\xFE |0
-<U7765> \xB8\x44 |0
-<U7766> \xB7\xFC |0
-<U7767> \xDE\xDF |0
-<U7768> \xB8\x45 |0
-<U7769> \xDE\xDE |0
-<U776A> \xB8\x41 |0
-<U776B> \xB7\xFB |0
-<U776C> \xB8\x42 |0
-<U776D> \xDE\xE2 |0
-<U776E> \xE2\xE6 |0
-<U776F> \xE2\xE8 |0
-<U7772> \x91\xE4 |0
-<U7777> \x8F\xC7 |0
-<U7778> \x94\xAE |0
-<U7779> \xB8\x40 |0
-<U777A> \x8A\x4F |0
-<U777B> \x94\xB2 |0
-<U777C> \xE2\xE3 |0
-<U777D> \xBA\xCC |0
-<U777E> \xE2\xE9 |0
-<U777F> \xBA\xCD |0
-<U7780> \xE2\xE7 |0
-<U7781> \xE2\xE2 |0
-<U7782> \xE2\xE5 |0
-<U7783> \xE2\xEA |0
-<U7784> \xBA\xCB |0
-<U7785> \xE2\xE4 |0
-<U7787> \xBD\x4E |0
-<U7788> \xE6\xBF |0
-<U7789> \xE6\xBE |0
-<U778B> \xBD\x51 |0
-<U778C> \xBD\x4F |0
-<U778D> \xE6\xBC |0
-<U778E> \xBD\x4D |0
-<U778F> \xE6\xBD |0
-<U7791> \xBD\x50 |0
-<U7793> \x8F\xD4 |0
-<U7795> \xEA\x7D |0
-<U7797> \xEA\xA1 |0
-<U7798> \x98\xEA |0
-<U7799> \xEA\x7E |0
-<U779A> \xEA\x76 |0
-<U779B> \xEA\x7A |0
-<U779C> \xEA\x79 |0
-<U779D> \xEA\x77 |0
-<U779E> \xBF\x66 |0
-<U779F> \xBF\x67 |0
-<U77A0> \xBF\x65 |0
-<U77A1> \xEA\x78 |0
-<U77A2> \xEA\x7B |0
-<U77A3> \xEA\x7C |0
-<U77A5> \xBF\x68 |0
-<U77A7> \xC1\x40 |0
-<U77A8> \xED\xA3 |0
-<U77AA> \xC0\xFC |0
-<U77AB> \xED\x7B |0
-<U77AC> \xC0\xFE |0
-<U77AD> \xC1\x41 |0
-<U77AF> \xFE\xD8 |0
-<U77B0> \xC0\xFD |0
-<U77B1> \xED\xA2 |0
-<U77B2> \xED\x7C |0
-<U77B3> \xC0\xFB |0
-<U77B4> \xED\xA1 |0
-<U77B5> \xED\x7A |0
-<U77B6> \xED\x7E |0
-<U77B7> \xED\x7D |0
-<U77B9> \x9D\xE0 |0
-<U77BA> \xF0\x55 |0
-<U77BB> \xC2\xA4 |0
-<U77BC> \xC2\xA5 |0
-<U77BD> \xC2\xA2 |0
-<U77BE> \x98\xEE |0
-<U77BF> \xC2\xA3 |0
-<U77C2> \xF0\x54 |0
-<U77C3> \x95\xC4 |0
-<U77C4> \xF2\x7B |0
-<U77C5> \xFC\xE8 |0
-<U77C7> \xC3\xA9 |0
-<U77C9> \xF2\x79 |0
-<U77CA> \xF2\x7A |0
-<U77CB> \x98\xEF |0
-<U77CC> \xF4\x74 |0
-<U77CD> \xF4\x77 |0
-<U77CE> \xF4\x75 |0
-<U77CF> \xF4\x76 |0
-<U77D0> \xF5\xE0 |0
-<U77D3> \xC4\xEF |0
-<U77D4> \xF7\xEB |0
-<U77D5> \xF8\xB4 |0
-<U77D7> \xC5\xF7 |0
-<U77D8> \xF8\xF8 |0
-<U77D9> \xF8\xF9 |0
-<U77DA> \xC6\x66 |0
-<U77DB> \xA5\xD9 |0
-<U77DC> \xAC\xE1 |0
-<U77DD> \x8C\x6E |0
-<U77DE> \xDA\xC3 |0
-<U77E0> \xDE\xE3 |0
-<U77E2> \xA5\xDA |0
-<U77E3> \xA8\x6F |0
-<U77E5> \xAA\xBE |0
-<U77E6> \xFA\xD8 |0
-<U77E7> \xCF\xE8 |0
-<U77E8> \xCF\xE9 |0
-<U77E9> \xAF\x78 |0
-<U77EC> \xDA\xC4 |0
-<U77ED> \xB5\x75 |0
-<U77EE> \xB8\x47 |0
-<U77EF> \xC1\x42 |0
-<U77F0> \xED\xA4 |0
-<U77F1> \xF2\x7C |0
-<U77F2> \xF4\x78 |0
-<U77F3> \xA5\xDB |0
-<U77F4> \xFE\xDC |0
-<U77F7> \xCD\xA1 |0
-<U77F8> \xCD\x7A |0
-<U77F9> \xCD\x7C |0
-<U77FA> \xCD\x7E |0
-<U77FB> \xCD\x7D |0
-<U77FC> \xCD\x7B |0
-<U77FD> \xAA\xBF |0
-<U77FE> \xA0\xAE |0
-<U7802> \xAC\xE2 |0
-<U7803> \xCF\xF2 |0
-<U7805> \xCF\xED |0
-<U7806> \xCF\xEA |0
-<U7808> \x9D\x4C |0
-<U7809> \xCF\xF1 |0
-<U780C> \xAC\xE4 |0
-<U780D> \xAC\xE5 |0
-<U780E> \xCF\xF0 |0
-<U780F> \xCF\xEF |0
-<U7810> \xCF\xEE |0
-<U7811> \xCF\xEB |0
-<U7812> \xCF\xEC |0
-<U7813> \xCF\xF3 |0
-<U7814> \xAC\xE3 |0
-<U7818> \x98\xF1 |0
-<U781C> \x98\xF3 |0
-<U781D> \xAF\x7C |0
-<U781E> \x94\xC1 |0
-<U781F> \xAF\xA4 |0
-<U7820> \xAF\xA3 |0
-<U7821> \xD2\xE1 |0
-<U7822> \xD2\xDB |0
-<U7823> \xD2\xD9 |0
-<U7825> \xAF\xA1 |0
-<U7826> \xD6\xB9 |0
-<U7827> \xAF\x7A |0
-<U7828> \xD2\xDE |0
-<U7829> \xD2\xE2 |0
-<U782A> \xD2\xE4 |0
-<U782B> \xD2\xE0 |0
-<U782C> \xD2\xDA |0
-<U782D> \xAF\xA2 |0
-<U782E> \xD2\xDF |0
-<U782F> \xD2\xDD |0
-<U7830> \xAF\x79 |0
-<U7831> \xD2\xE5 |0
-<U7832> \xAF\xA5 |0
-<U7833> \xD2\xE3 |0
-<U7834> \xAF\x7D |0
-<U7835> \xD2\xDC |0
-<U7837> \xAF\x7E |0
-<U7838> \xAF\x7B |0
-<U7839> \x98\xF5 |0
-<U783C> \xFA\x4F |0
-<U783D> \x96\xE2 |0
-<U7842> \x94\x50 |0
-<U7843> \xB2\xB9 |0
-<U7844> \x96\xA2 |0
-<U7845> \xD6\xBA |0
-<U7847> \x98\xF6 |0
-<U7848> \xD6\xB3 |0
-<U7849> \xD6\xB5 |0
-<U784A> \xD6\xB7 |0
-<U784B> \x96\xE5 |0
-<U784C> \xD6\xB8 |0
-<U784D> \xD6\xB6 |0
-<U784E> \xB2\xBA |0
-<U7850> \xD6\xBB |0
-<U7851> \x98\xF7 |0
-<U7852> \xD6\xB4 |0
-<U7853> \xA0\x46 |0
-<U7854> \x96\xE3 |0
-<U785C> \xDA\xC8 |0
-<U785D> \xB5\x76 |0
-<U785E> \xDA\xD0 |0
-<U7860> \xDA\xC5 |0
-<U7862> \xDA\xD1 |0
-<U7864> \xDA\xC6 |0
-<U7865> \xDA\xC7 |0
-<U7866> \x98\xF8 |0
-<U7868> \xDA\xCF |0
-<U7869> \xDA\xCE |0
-<U786A> \xDA\xCB |0
-<U786B> \xB2\xB8 |0
-<U786C> \xB5\x77 |0
-<U786D> \xDA\xC9 |0
-<U786E> \xDA\xCC |0
-<U786F> \xB5\x78 |0
-<U7870> \xDA\xCD |0
-<U7871> \xDA\xCA |0
-<U7879> \xDE\xEE |0
-<U787A> \x9E\xE4 |0
-<U787B> \xDE\xF2 |0
-<U787C> \xB8\x4E |0
-<U787E> \xE2\xF0 |0
-<U787F> \xB8\x51 |0
-<U7880> \xDE\xF0 |0
-<U7881> \xF9\xD6 |0
-<U7883> \xDE\xED |0
-<U7884> \xDE\xE8 |0
-<U7885> \xDE\xEA |0
-<U7886> \xDE\xEB |0
-<U7887> \xDE\xE4 |0
-<U7888> \x94\xC3 |0
-<U7889> \xB8\x4D |0
-<U788C> \xB8\x4C |0
-<U788D> \x94\xC2 |0
-<U788E> \xB8\x48 |0
-<U788F> \xDE\xE7 |0
-<U7891> \xB8\x4F |0
-<U7893> \xB8\x50 |0
-<U7894> \xDE\xE6 |0
-<U7895> \xDE\xE9 |0
-<U7896> \xDE\xF1 |0
-<U7897> \xB8\x4A |0
-<U7898> \xB8\x4B |0
-<U7899> \xDE\xEF |0
-<U789A> \xDE\xE5 |0
-<U789E> \xE2\xF2 |0
-<U789F> \xBA\xD0 |0
-<U78A0> \xE2\xF4 |0
-<U78A1> \xDE\xEC |0
-<U78A2> \xE2\xF6 |0
-<U78A3> \xBA\xD4 |0
-<U78A4> \xE2\xF7 |0
-<U78A5> \xE2\xF3 |0
-<U78A7> \xBA\xD1 |0
-<U78A8> \xE2\xEF |0
-<U78A9> \xBA\xD3 |0
-<U78AA> \xE2\xEC |0
-<U78AB> \xE2\xF1 |0
-<U78AC> \xE2\xF5 |0
-<U78AD> \xE2\xEE |0
-<U78AF> \xFE\xE1 |0
-<U78B0> \xB8\x49 |0
-<U78B1> \xFE\xE9 |0
-<U78B2> \xE2\xEB |0
-<U78B3> \xBA\xD2 |0
-<U78B4> \xE2\xED |0
-<U78B6> \x96\xE4 |0
-<U78B8> \x89\xAC |0
-<U78B9> \x96\xDB |0
-<U78BA> \xBD\x54 |0
-<U78BB> \xE6\xC1 |0
-<U78BC> \xBD\x58 |0
-<U78BE> \xBD\x56 |0
-<U78C1> \xBA\xCF |0
-<U78C3> \xE6\xC8 |0
-<U78C4> \xE6\xC9 |0
-<U78C5> \xBD\x53 |0
-<U78C7> \xFE\xE2 |0
-<U78C8> \xE6\xC7 |0
-<U78C9> \xE6\xCA |0
-<U78CA> \xBD\x55 |0
-<U78CB> \xBD\x52 |0
-<U78CC> \xE6\xC3 |0
-<U78CD> \xE6\xC0 |0
-<U78CE> \xE6\xC5 |0
-<U78CF> \xE6\xC2 |0
-<U78D0> \xBD\x59 |0
-<U78D1> \xE6\xC4 |0
-<U78D2> \x94\xC4 |0
-<U78D3> \xFE\xE3 |0
-<U78D4> \xE6\xC6 |0
-<U78D5> \xBD\x57 |0
-<U78D7> \xFE\xE7 |0
-<U78D8> \x9F\xFB |0
-<U78DA> \xBF\x6A |0
-<U78DB> \xEA\xA8 |0
-<U78DD> \xEA\xA2 |0
-<U78DE> \xEA\xA6 |0
-<U78DF> \xEA\xAC |0
-<U78E0> \xEA\xAD |0
-<U78E1> \xEA\xA9 |0
-<U78E2> \xEA\xAA |0
-<U78E3> \xEA\xA7 |0
-<U78E4> \x8C\x59 |0
-<U78E5> \xEA\xA4 |0
-<U78E7> \xBF\x6C |0
-<U78E8> \xBF\x69 |0
-<U78E9> \xEA\xA3 |0
-<U78EA> \xEA\xA5 |0
-<U78EC> \xBF\x6B |0
-<U78ED> \xEA\xAB |0
-<U78EE> \x93\xC9 |0
-<U78EF> \xC1\x46 |0
-<U78F0> \x94\xE8 |0
-<U78F1> \xFB\x56 |0
-<U78F2> \xED\xAA |0
-<U78F3> \xED\xA5 |0
-<U78F4> \xC1\x45 |0
-<U78F5> \x90\xC5 |0
-<U78F7> \xC1\x43 |0
-<U78F9> \xED\xAC |0
-<U78FA> \xC1\x44 |0
-<U78FB> \xED\xA8 |0
-<U78FC> \xED\xA9 |0
-<U78FD> \xED\xA6 |0
-<U78FE> \xED\xAD |0
-<U78FF> \xF0\x56 |0
-<U7901> \xC1\x47 |0
-<U7902> \xED\xA7 |0
-<U7904> \xED\xAE |0
-<U7905> \xED\xAB |0
-<U7906> \xA0\xA8 |0
-<U7909> \xF0\x5A |0
-<U790C> \xF0\x57 |0
-<U790E> \xC2\xA6 |0
-<U7910> \xF0\x5B |0
-<U7911> \xF0\x5D |0
-<U7912> \xF0\x5C |0
-<U7913> \xF0\x58 |0
-<U7914> \xF0\x59 |0
-<U7917> \xF2\xA3 |0
-<U7919> \xC3\xAA |0
-<U791B> \xF2\x7E |0
-<U791C> \xF2\xA2 |0
-<U791D> \xF2\x7D |0
-<U791E> \xF2\xA4 |0
-<U7921> \xF2\xA1 |0
-<U7923> \xF4\x7A |0
-<U7924> \xF4\x7D |0
-<U7925> \xF4\x79 |0
-<U7926> \xC4\x71 |0
-<U7927> \xF4\x7B |0
-<U7928> \xF4\x7C |0
-<U7929> \xF4\x7E |0
-<U792A> \xC4\x72 |0
-<U792B> \xC4\x74 |0
-<U792C> \xC4\x73 |0
-<U792D> \xF5\xE1 |0
-<U792E> \xFE\xE5 |0
-<U792F> \xF5\xE3 |0
-<U7931> \xF5\xE2 |0
-<U7932> \x98\xFD |0
-<U7933> \x98\xFB |0
-<U7934> \xFE\xE8 |0
-<U7935> \xF6\xF6 |0
-<U7936> \x8E\xBF |0
-<U7938> \xF8\xB5 |0
-<U7939> \xF8\xFA |0
-<U793A> \xA5\xDC |0
-<U793B> \x8B\xD8 |0
-<U793C> \xFE\xF7 |0
-<U793D> \xCB\x72 |0
-<U793E> \xAA\xC0 |0
-<U793F> \xCD\xA3 |0
-<U7940> \xAA\xC1 |0
-<U7941> \xAA\xC2 |0
-<U7942> \xCD\xA2 |0
-<U7944> \xCF\xF8 |0
-<U7945> \xCF\xF7 |0
-<U7946> \xAC\xE6 |0
-<U7947> \xAC\xE9 |0
-<U7948> \xAC\xE8 |0
-<U7949> \xAC\xE7 |0
-<U794A> \xCF\xF4 |0
-<U794B> \xCF\xF6 |0
-<U794C> \xCF\xF5 |0
-<U794F> \xD2\xE8 |0
-<U7950> \xAF\xA7 |0
-<U7951> \xD2\xEC |0
-<U7952> \xD2\xEB |0
-<U7953> \xD2\xEA |0
-<U7954> \xD2\xE6 |0
-<U7955> \xAF\xA6 |0
-<U7956> \xAF\xAA |0
-<U7957> \xAF\xAD |0
-<U7958> \x8F\x68 |0
-<U7959> \x94\xC6 |0
-<U795A> \xAF\xAE |0
-<U795B> \xD2\xE7 |0
-<U795C> \xD2\xE9 |0
-<U795D> \xAF\xAC |0
-<U795E> \xAF\xAB |0
-<U795F> \xAF\xA9 |0
-<U7960> \xAF\xA8 |0
-<U7961> \xD6\xC2 |0
-<U7962> \x9D\xEA |0
-<U7963> \xD6\xC0 |0
-<U7964> \xD6\xBC |0
-<U7965> \xB2\xBB |0
-<U7967> \xD6\xBD |0
-<U7968> \xB2\xBC |0
-<U7969> \xD6\xBE |0
-<U796A> \xD6\xBF |0
-<U796B> \xD6\xC1 |0
-<U796D> \xB2\xBD |0
-<U7970> \xDA\xD5 |0
-<U7971> \xFC\x69 |0
-<U7972> \xDA\xD4 |0
-<U7973> \xDA\xD3 |0
-<U7974> \xDA\xD2 |0
-<U7979> \xDE\xF6 |0
-<U797A> \xB8\x52 |0
-<U797C> \xDE\xF3 |0
-<U797D> \xDE\xF5 |0
-<U797E> \x9C\xDA |0
-<U797F> \xB8\x53 |0
-<U7980> \xFE\xF3 |0
-<U7981> \xB8\x54 |0
-<U7982> \xDE\xF4 |0
-<U7983> \x9C\x72 |0
-<U7986> \xFE\xF0 |0
-<U7987> \x89\xC9 |0
-<U7988> \xE3\x41 |0
-<U798A> \xE2\xF9 |0
-<U798B> \xE2\xFA |0
-<U798D> \xBA\xD7 |0
-<U798E> \xBA\xD5 |0
-<U798F> \xBA\xD6 |0
-<U7990> \xE3\x43 |0
-<U7991> \x99\x41 |0
-<U7992> \xE3\x42 |0
-<U7993> \xE2\xFE |0
-<U7994> \xE2\xFD |0
-<U7995> \xE2\xFC |0
-<U7996> \xE2\xFB |0
-<U7997> \xE3\x40 |0
-<U7998> \xE2\xF8 |0
-<U7999> \x99\x42 |0
-<U799A> \xE6\xCB |0
-<U799B> \xE6\xD0 |0
-<U799C> \xE6\xCE |0
-<U799D> \xFE\xF5 |0
-<U799F> \x91\xD7 |0
-<U79A0> \xE6\xCD |0
-<U79A1> \xE6\xCC |0
-<U79A2> \xE6\xCF |0
-<U79A4> \xEA\xAE |0
-<U79A5> \x94\xCC |0
-<U79A6> \xBF\x6D |0
-<U79A7> \xC1\x48 |0
-<U79A8> \xED\xB0 |0
-<U79A9> \xFE\xF8 |0
-<U79AA> \xC1\x49 |0
-<U79AB> \xED\xAF |0
-<U79AC> \xF0\x5F |0
-<U79AD> \xF0\x5E |0
-<U79AE> \xC2\xA7 |0
-<U79B0> \xF2\xA5 |0
-<U79B1> \xC3\xAB |0
-<U79B2> \xF4\xA1 |0
-<U79B3> \xC5\xA1 |0
-<U79B4> \xF6\xF7 |0
-<U79B6> \xF8\xB7 |0
-<U79B7> \xF8\xB6 |0
-<U79B8> \xC9\xA8 |0
-<U79B9> \xAC\xEA |0
-<U79BA> \xAC\xEB |0
-<U79BB> \xD6\xC3 |0
-<U79BD> \xB8\x56 |0
-<U79BE> \xA5\xDD |0
-<U79BF> \xA8\x72 |0
-<U79C0> \xA8\x71 |0
-<U79C1> \xA8\x70 |0
-<U79C4> \x97\xA8 |0
-<U79C5> \xCD\xA4 |0
-<U79C6> \xFE\xFC |0
-<U79C8> \xAA\xC4 |0
-<U79C9> \xAA\xC3 |0
-<U79CB> \xAC\xEE |0
-<U79CC> \xFD\xBF |0
-<U79CD> \xCF\xFA |0
-<U79CE> \xCF\xFD |0
-<U79CF> \xCF\xFB |0
-<U79D1> \xAC\xEC |0
-<U79D2> \xAC\xED |0
-<U79D4> \xFE\xFE |0
-<U79D5> \xCF\xF9 |0
-<U79D6> \xCF\xFC |0
-<U79D8> \xAF\xB5 |0
-<U79DC> \xD2\xF3 |0
-<U79DD> \xD2\xF5 |0
-<U79DE> \xD2\xF4 |0
-<U79DF> \xAF\xB2 |0
-<U79E0> \xD2\xEF |0
-<U79E2> \x96\xD1 |0
-<U79E3> \xAF\xB0 |0
-<U79E4> \xAF\xAF |0
-<U79E6> \xAF\xB3 |0
-<U79E7> \xAF\xB1 |0
-<U79E9> \xAF\xB4 |0
-<U79EA> \xD2\xF2 |0
-<U79EB> \xD2\xED |0
-<U79EC> \xD2\xEE |0
-<U79ED> \xD2\xF1 |0
-<U79EE> \xD2\xF0 |0
-<U79F1> \x94\xD5 |0
-<U79F4> \x94\xD0 |0
-<U79F6> \xD6\xC6 |0
-<U79F7> \xD6\xC7 |0
-<U79F8> \xD6\xC5 |0
-<U79FA> \xD6\xC4 |0
-<U79FB> \xB2\xBE |0
-<U7A00> \xB5\x7D |0
-<U7A02> \xDA\xD6 |0
-<U7A03> \xDA\xD8 |0
-<U7A04> \xDA\xDA |0
-<U7A05> \xB5\x7C |0
-<U7A06> \x99\x44 |0
-<U7A08> \xB5\x7A |0
-<U7A0A> \xDA\xD7 |0
-<U7A0B> \xB5\x7B |0
-<U7A0C> \xDA\xD9 |0
-<U7A0D> \xB5\x79 |0
-<U7A10> \xDF\x41 |0
-<U7A11> \xDE\xF7 |0
-<U7A12> \xDE\xFA |0
-<U7A13> \xDE\xFE |0
-<U7A14> \xB8\x5A |0
-<U7A15> \xDE\xFC |0
-<U7A17> \xDE\xFB |0
-<U7A18> \xDE\xF8 |0
-<U7A19> \xDE\xF9 |0
-<U7A1A> \xB8\x58 |0
-<U7A1B> \xDF\x40 |0
-<U7A1C> \xB8\x57 |0
-<U7A1E> \xB8\x5C |0
-<U7A1F> \xB8\x5B |0
-<U7A20> \xB8\x59 |0
-<U7A22> \xDE\xFD |0
-<U7A26> \xE3\x49 |0
-<U7A28> \xE3\x48 |0
-<U7A2A> \x8C\x63 |0
-<U7A2B> \xE3\x44 |0
-<U7A2D> \xA0\xB3 |0
-<U7A2E> \xBA\xD8 |0
-<U7A2F> \xE3\x47 |0
-<U7A30> \xE3\x46 |0
-<U7A31> \xBA\xD9 |0
-<U7A37> \xBD\x5E |0
-<U7A39> \xE6\xD2 |0
-<U7A3A> \x94\xCF |0
-<U7A3B> \xBD\x5F |0
-<U7A3C> \xBD\x5B |0
-<U7A3D> \xBD\x5D |0
-<U7A3E> \x9F\xFA |0
-<U7A3F> \xBD\x5A |0
-<U7A40> \xBD\x5C |0
-<U7A43> \x91\xE5 |0
-<U7A44> \xEA\xAF |0
-<U7A45> \x9C\x6A |0
-<U7A46> \xBF\x70 |0
-<U7A47> \xEA\xB1 |0
-<U7A48> \xEA\xB0 |0
-<U7A49> \x8E\x49 |0
-<U7A4A> \xE3\x45 |0
-<U7A4B> \xBF\x72 |0
-<U7A4C> \xBF\x71 |0
-<U7A4D> \xBF\x6E |0
-<U7A4E> \xBF\x6F |0
-<U7A54> \xED\xB5 |0
-<U7A56> \xED\xB3 |0
-<U7A57> \xC1\x4A |0
-<U7A58> \xED\xB4 |0
-<U7A5A> \xED\xB6 |0
-<U7A5B> \xED\xB2 |0
-<U7A5C> \xED\xB1 |0
-<U7A5F> \xF0\x60 |0
-<U7A60> \xC2\xAA |0
-<U7A61> \xC2\xA8 |0
-<U7A62> \xC2\xA9 |0
-<U7A65> \x8E\x4C |0
-<U7A67> \xF2\xA6 |0
-<U7A68> \xF2\xA7 |0
-<U7A69> \xC3\xAD |0
-<U7A6B> \xC3\xAC |0
-<U7A6C> \xF4\xA3 |0
-<U7A6D> \xF4\xA4 |0
-<U7A6E> \xF4\xA2 |0
-<U7A70> \xF6\xF8 |0
-<U7A71> \xF6\xF9 |0
-<U7A74> \xA5\xDE |0
-<U7A75> \xCA\x48 |0
-<U7A76> \xA8\x73 |0
-<U7A78> \xCD\xA5 |0
-<U7A79> \xAA\xC6 |0
-<U7A7A> \xAA\xC5 |0
-<U7A7B> \xCD\xA6 |0
-<U7A7D> \x8E\x4D |0
-<U7A7E> \xD0\x40 |0
-<U7A7F> \xAC\xEF |0
-<U7A80> \xCF\xFE |0
-<U7A81> \xAC\xF0 |0
-<U7A83> \x9A\x73 |0
-<U7A84> \xAF\xB6 |0
-<U7A85> \xD2\xF8 |0
-<U7A86> \xD2\xF6 |0
-<U7A87> \xD2\xFC |0
-<U7A88> \xAF\xB7 |0
-<U7A89> \xD2\xF7 |0
-<U7A8A> \xD2\xFB |0
-<U7A8B> \xD2\xF9 |0
-<U7A8C> \xD2\xFA |0
-<U7A8F> \xD6\xC8 |0
-<U7A90> \xD6\xCA |0
-<U7A91> \x99\x47 |0
-<U7A92> \xB2\xBF |0
-<U7A93> \x8C\xB1 |0
-<U7A94> \xD6\xC9 |0
-<U7A95> \xB2\xC0 |0
-<U7A96> \xB5\xA2 |0
-<U7A97> \xB5\xA1 |0
-<U7A98> \xB5\x7E |0
-<U7A99> \xDA\xDB |0
-<U7A9E> \xDF\x44 |0
-<U7A9F> \xB8\x5D |0
-<U7AA0> \xB8\x5E |0
-<U7AA2> \xDF\x43 |0
-<U7AA3> \xDF\x42 |0
-<U7AA8> \xE3\x4A |0
-<U7AA9> \xBA\xDB |0
-<U7AAA> \xBA\xDA |0
-<U7AAB> \xE3\x4B |0
-<U7AAC> \xE3\x4C |0
-<U7AAE> \xBD\x61 |0
-<U7AAF> \xBD\x60 |0
-<U7AB0> \x8E\x50 |0
-<U7AB1> \xEA\xB5 |0
-<U7AB2> \xE6\xD3 |0
-<U7AB3> \xE6\xD5 |0
-<U7AB4> \xE6\xD4 |0
-<U7AB5> \xEA\xB4 |0
-<U7AB6> \xEA\xB2 |0
-<U7AB7> \xEA\xB6 |0
-<U7AB8> \xEA\xB3 |0
-<U7ABA> \xBF\x73 |0
-<U7ABB> \x8E\x4F |0
-<U7ABC> \x99\x49 |0
-<U7ABE> \xED\xB7 |0
-<U7ABF> \xC1\x4B |0
-<U7AC0> \xED\xB8 |0
-<U7AC1> \xED\xB9 |0
-<U7AC2> \x8E\x51 |0
-<U7AC3> \x8E\x52 |0
-<U7AC4> \xC2\xAB |0
-<U7AC5> \xC2\xAC |0
-<U7AC7> \xC4\x75 |0
-<U7AC8> \x9A\xB2 |0
-<U7AC9> \x89\xA5 |0
-<U7ACA> \xC5\xD1 |0
-<U7ACB> \xA5\xDF |0
-<U7ACF> \x99\x4C |0
-<U7AD1> \xD0\x41 |0
-<U7AD3> \x9F\xF8 |0
-<U7AD8> \xD2\xFD |0
-<U7AD9> \xAF\xB8 |0
-<U7ADA> \x8E\x56 |0
-<U7ADB> \x99\x4D |0
-<U7ADC> \x91\xCA |0
-<U7ADD> \x8E\x57 |0
-<U7ADF> \xB3\xBA |0
-<U7AE0> \xB3\xB9 |0
-<U7AE2> \x94\xE1 |0
-<U7AE3> \xB5\xA4 |0
-<U7AE4> \xDA\xDD |0
-<U7AE5> \xB5\xA3 |0
-<U7AE6> \xDA\xDC |0
-<U7AE7> \x90\x47 |0
-<U7AE9> \x8F\xD8 |0
-<U7AEA> \x8E\x58 |0
-<U7AEB> \xDF\x45 |0
-<U7AED> \xBA\xDC |0
-<U7AEE> \xE3\x4D |0
-<U7AEF> \xBA\xDD |0
-<U7AF6> \xC4\x76 |0
-<U7AF7> \xF4\xA5 |0
-<U7AF9> \xA6\xCB |0
-<U7AFA> \xAA\xC7 |0
-<U7AFB> \xCD\xA7 |0
-<U7AFD> \xAC\xF2 |0
-<U7AFE> \x94\xEB |0
-<U7AFF> \xAC\xF1 |0
-<U7B00> \xD0\x42 |0
-<U7B01> \xD0\x43 |0
-<U7B04> \xD3\x40 |0
-<U7B05> \xD3\x42 |0
-<U7B06> \xAF\xB9 |0
-<U7B08> \xD3\x44 |0
-<U7B09> \xD3\x47 |0
-<U7B0A> \xD3\x45 |0
-<U7B0B> \x8E\x5C |0
-<U7B0C> \x95\x53 |0
-<U7B0E> \xD3\x46 |0
-<U7B0F> \xD3\x43 |0
-<U7B10> \xD2\xFE |0
-<U7B11> \xAF\xBA |0
-<U7B12> \xD3\x48 |0
-<U7B13> \xD3\x41 |0
-<U7B14> \x9F\xE5 |0
-<U7B18> \xD6\xD3 |0
-<U7B19> \xB2\xC6 |0
-<U7B1A> \xD6\xDC |0
-<U7B1B> \xB2\xC3 |0
-<U7B1D> \xD6\xD5 |0
-<U7B1E> \xB2\xC7 |0
-<U7B1F> \x9F\x56 |0
-<U7B20> \xB2\xC1 |0
-<U7B22> \xD6\xD0 |0
-<U7B23> \xD6\xDD |0
-<U7B24> \xD6\xD1 |0
-<U7B25> \xD6\xCE |0
-<U7B26> \xB2\xC5 |0
-<U7B27> \x95\x4F |0
-<U7B28> \xB2\xC2 |0
-<U7B29> \x8E\x5E |0
-<U7B2A> \xD6\xD4 |0
-<U7B2B> \xD6\xD7 |0
-<U7B2C> \xB2\xC4 |0
-<U7B2D> \xD6\xD8 |0
-<U7B2E> \xB2\xC8 |0
-<U7B2F> \xD6\xD9 |0
-<U7B30> \xD6\xCF |0
-<U7B31> \xD6\xD6 |0
-<U7B32> \xD6\xDA |0
-<U7B33> \xD6\xD2 |0
-<U7B34> \xD6\xCD |0
-<U7B35> \xD6\xCB |0
-<U7B38> \xD6\xDB |0
-<U7B39> \x99\x6A |0
-<U7B3B> \xDA\xDF |0
-<U7B40> \xDA\xE4 |0
-<U7B42> \x9C\x64 |0
-<U7B43> \x9C\xD9 |0
-<U7B44> \xDA\xE0 |0
-<U7B45> \xDA\xE6 |0
-<U7B46> \xB5\xA7 |0
-<U7B47> \xD6\xCC |0
-<U7B48> \xDA\xE1 |0
-<U7B49> \xB5\xA5 |0
-<U7B4A> \xDA\xDE |0
-<U7B4B> \xB5\xAC |0
-<U7B4C> \xDA\xE2 |0
-<U7B4D> \xB5\xAB |0
-<U7B4E> \xDA\xE3 |0
-<U7B4F> \xB5\xAD |0
-<U7B50> \xB5\xA8 |0
-<U7B51> \xB5\xAE |0
-<U7B52> \xB5\xA9 |0
-<U7B54> \xB5\xAA |0
-<U7B55> \x8E\x5D |0
-<U7B56> \xB5\xA6 |0
-<U7B58> \xDA\xE5 |0
-<U7B60> \xB8\x61 |0
-<U7B61> \xDF\x50 |0
-<U7B62> \x99\x50 |0
-<U7B63> \xDF\x53 |0
-<U7B64> \xDF\x47 |0
-<U7B65> \xDF\x4C |0
-<U7B66> \xDF\x46 |0
-<U7B67> \xB8\x63 |0
-<U7B69> \xDF\x4A |0
-<U7B6C> \x99\x51 |0
-<U7B6D> \xDF\x48 |0
-<U7B6E> \xB8\x62 |0
-<U7B6F> \x8E\x62 |0
-<U7B70> \xDF\x4F |0
-<U7B71> \xDF\x4E |0
-<U7B72> \xDF\x4B |0
-<U7B73> \xDF\x4D |0
-<U7B74> \xDF\x49 |0
-<U7B75> \xBA\xE1 |0
-<U7B76> \xDF\x52 |0
-<U7B77> \xB8\x5F |0
-<U7B78> \xDF\x51 |0
-<U7B7B> \x99\x52 |0
-<U7B82> \xE3\x5D |0
-<U7B84> \xBA\xE8 |0
-<U7B85> \xE3\x58 |0
-<U7B87> \xBA\xE7 |0
-<U7B88> \xE3\x4E |0
-<U7B8A> \xE3\x50 |0
-<U7B8B> \xBA\xE0 |0
-<U7B8C> \xE3\x55 |0
-<U7B8D> \xE3\x54 |0
-<U7B8E> \xE3\x57 |0
-<U7B8F> \xBA\xE5 |0
-<U7B90> \xE3\x52 |0
-<U7B91> \xE3\x51 |0
-<U7B92> \x8E\x68 |0
-<U7B94> \xBA\xE4 |0
-<U7B95> \xBA\xDF |0
-<U7B96> \xE3\x53 |0
-<U7B97> \xBA\xE2 |0
-<U7B98> \xE3\x59 |0
-<U7B99> \xE3\x5B |0
-<U7B9B> \xE3\x56 |0
-<U7B9C> \xE3\x4F |0
-<U7B9D> \xBA\xE3 |0
-<U7BA0> \xBD\x69 |0
-<U7BA1> \xBA\xDE |0
-<U7BA2> \x8E\x61 |0
-<U7BA3> \x9F\x59 |0
-<U7BA4> \xE3\x5C |0
-<U7BAC> \xE6\xD9 |0
-<U7BAD> \xBD\x62 |0
-<U7BAF> \xE6\xDB |0
-<U7BB1> \xBD\x63 |0
-<U7BB2> \x8B\xB3 |0
-<U7BB4> \xBD\x65 |0
-<U7BB5> \xE6\xDE |0
-<U7BB7> \xE6\xD6 |0
-<U7BB8> \xBA\xE6 |0
-<U7BB9> \xE6\xDC |0
-<U7BBE> \xE6\xD8 |0
-<U7BC0> \xB8\x60 |0
-<U7BC1> \xBD\x68 |0
-<U7BC4> \xBD\x64 |0
-<U7BC6> \xBD\x66 |0
-<U7BC7> \xBD\x67 |0
-<U7BC9> \xBF\x76 |0
-<U7BCA> \xE6\xDD |0
-<U7BCB> \xE6\xD7 |0
-<U7BCC> \xBD\x6A |0
-<U7BCE> \xE6\xDA |0
-<U7BCF> \x9F\x5D |0
-<U7BD0> \x8E\x66 |0
-<U7BD4> \xEA\xC0 |0
-<U7BD5> \xEA\xBB |0
-<U7BD8> \xEA\xC5 |0
-<U7BD9> \xBF\x74 |0
-<U7BDA> \xEA\xBD |0
-<U7BDB> \xBF\x78 |0
-<U7BDC> \xEA\xC3 |0
-<U7BDD> \xEA\xBA |0
-<U7BDE> \xEA\xB7 |0
-<U7BDF> \xEA\xC6 |0
-<U7BE0> \xC1\x51 |0
-<U7BE1> \xBF\x79 |0
-<U7BE2> \xEA\xC2 |0
-<U7BE3> \xEA\xB8 |0
-<U7BE4> \xBF\x77 |0
-<U7BE5> \xEA\xBC |0
-<U7BE6> \xBF\x7B |0
-<U7BE7> \xEA\xB9 |0
-<U7BE8> \xEA\xBE |0
-<U7BE9> \xBF\x7A |0
-<U7BEA> \xEA\xC1 |0
-<U7BEB> \xEA\xC4 |0
-<U7BEC> \x8C\xB2 |0
-<U7BF0> \xED\xCB |0
-<U7BF1> \xED\xCC |0
-<U7BF2> \xED\xBC |0
-<U7BF3> \xED\xC3 |0
-<U7BF4> \xED\xC1 |0
-<U7BF7> \xC1\x4F |0
-<U7BF8> \xED\xC8 |0
-<U7BF9> \xEA\xBF |0
-<U7BFA> \x8E\x6E |0
-<U7BFB> \xED\xBF |0
-<U7BFC> \x9F\x64 |0
-<U7BFD> \xED\xC9 |0
-<U7BFE> \xC1\x4E |0
-<U7BFF> \xED\xBE |0
-<U7C00> \xED\xBD |0
-<U7C01> \xED\xC7 |0
-<U7C02> \xED\xC4 |0
-<U7C03> \xED\xC6 |0
-<U7C05> \xED\xBA |0
-<U7C06> \xED\xCA |0
-<U7C07> \xC1\x4C |0
-<U7C09> \xED\xC5 |0
-<U7C0A> \xED\xCE |0
-<U7C0B> \xED\xC2 |0
-<U7C0C> \xC1\x50 |0
-<U7C0D> \xC1\x4D |0
-<U7C0E> \xED\xC0 |0
-<U7C0F> \xED\xBB |0
-<U7C10> \xED\xCD |0
-<U7C11> \xBF\x75 |0
-<U7C12> \x99\x53 |0
-<U7C15> \xFA\xB8 |0
-<U7C19> \xF0\x63 |0
-<U7C1B> \x99\x54 |0
-<U7C1C> \xF0\x61 |0
-<U7C1D> \xF0\x67 |0
-<U7C1E> \xC2\xB0 |0
-<U7C1F> \xF0\x65 |0
-<U7C20> \xF0\x64 |0
-<U7C21> \xC2\xB2 |0
-<U7C22> \xF0\x6A |0
-<U7C23> \xC2\xB1 |0
-<U7C25> \xF0\x6B |0
-<U7C26> \xF0\x68 |0
-<U7C27> \xC2\xAE |0
-<U7C28> \xF0\x69 |0
-<U7C29> \xF0\x62 |0
-<U7C2A> \xC2\xAF |0
-<U7C2B> \xC2\xAD |0
-<U7C2C> \xF2\xAB |0
-<U7C2D> \xF0\x66 |0
-<U7C30> \xF0\x6C |0
-<U7C33> \xF2\xA8 |0
-<U7C35> \x8E\x70 |0
-<U7C37> \xC3\xB2 |0
-<U7C38> \xC3\xB0 |0
-<U7C39> \xF2\xAA |0
-<U7C3B> \xF2\xAC |0
-<U7C3C> \xF2\xA9 |0
-<U7C3D> \xC3\xB1 |0
-<U7C3E> \xC3\xAE |0
-<U7C3F> \xC3\xAF |0
-<U7C40> \xC3\xB3 |0
-<U7C42> \x9F\x61 |0
-<U7C43> \xC4\x78 |0
-<U7C44> \x8E\x72 |0
-<U7C45> \xF4\xAA |0
-<U7C47> \xF4\xA9 |0
-<U7C48> \xF4\xA7 |0
-<U7C49> \xF4\xA6 |0
-<U7C4A> \xF4\xA8 |0
-<U7C4C> \xC4\x77 |0
-<U7C4D> \xC4\x79 |0
-<U7C50> \xC4\xF0 |0
-<U7C51> \xA0\x6B |0
-<U7C53> \xF5\xE5 |0
-<U7C54> \xF5\xE4 |0
-<U7C56> \x9F\x40 |0
-<U7C57> \xF6\xFA |0
-<U7C59> \xF6\xFC |0
-<U7C5A> \xF6\xFE |0
-<U7C5B> \xF6\xFD |0
-<U7C5C> \xF6\xFB |0
-<U7C5D> \x94\xED |0
-<U7C5F> \xC5\xA3 |0
-<U7C60> \xC5\xA2 |0
-<U7C63> \xC5\xD3 |0
-<U7C64> \xC5\xD2 |0
-<U7C65> \xC5\xD4 |0
-<U7C66> \xF7\xED |0
-<U7C67> \xF7\xEC |0
-<U7C69> \xF8\xFB |0
-<U7C6A> \xF8\xB8 |0
-<U7C6B> \xF8\xFC |0
-<U7C6C> \xC6\x58 |0
-<U7C6D> \x94\xEE |0
-<U7C6E> \xC6\x59 |0
-<U7C6F> \xF9\x6D |0
-<U7C70> \x9F\xBD |0
-<U7C72> \xC6\x7E |0
-<U7C73> \xA6\xCC |0
-<U7C74> \x8E\x7B |0
-<U7C75> \xCD\xA8 |0
-<U7C78> \xD0\x45 |0
-<U7C79> \xD0\x46 |0
-<U7C7A> \xD0\x44 |0
-<U7C7B> \x99\x57 |0
-<U7C7C> \x94\xF7 |0
-<U7C7D> \xAC\xF3 |0
-<U7C7E> \x9F\x5F |0
-<U7C7F> \xD0\x47 |0
-<U7C80> \xD0\x48 |0
-<U7C81> \xD0\x49 |0
-<U7C83> \x8E\x73 |0
-<U7C84> \xD3\x49 |0
-<U7C85> \xD3\x4F |0
-<U7C86> \x9F\x62 |0
-<U7C88> \xD3\x4D |0
-<U7C89> \xAF\xBB |0
-<U7C8A> \xD3\x4B |0
-<U7C8C> \xD3\x4C |0
-<U7C8D> \xD3\x4E |0
-<U7C8E> \x94\xF6 |0
-<U7C91> \xD3\x4A |0
-<U7C92> \xB2\xC9 |0
-<U7C94> \xD6\xDE |0
-<U7C95> \xB2\xCB |0
-<U7C96> \xD6\xE0 |0
-<U7C97> \xB2\xCA |0
-<U7C98> \xD6\xDF |0
-<U7C9C> \x99\x58 |0
-<U7C9E> \xDA\xE8 |0
-<U7C9F> \xB5\xAF |0
-<U7CA1> \xDA\xEA |0
-<U7CA2> \xDA\xE7 |0
-<U7CA3> \xD6\xE1 |0
-<U7CA5> \xB5\xB0 |0
-<U7CA6> \x8E\x75 |0
-<U7CA7> \xF9\xDB |0
-<U7CA8> \xDA\xE9 |0
-<U7CAC> \x90\x72 |0
-<U7CAE> \x94\xF8 |0
-<U7CAF> \xDF\x56 |0
-<U7CB1> \xB8\x64 |0
-<U7CB2> \xDF\x54 |0
-<U7CB3> \xB8\x65 |0
-<U7CB4> \xDF\x55 |0
-<U7CB5> \xB8\x66 |0
-<U7CB8> \x99\x5A |0
-<U7CB9> \xBA\xE9 |0
-<U7CBA> \xE3\x61 |0
-<U7CBB> \xE3\x5E |0
-<U7CBC> \xE3\x60 |0
-<U7CBD> \xBA\xEA |0
-<U7CBE> \xBA\xEB |0
-<U7CBF> \xE3\x5F |0
-<U7CC2> \xA0\xB0 |0
-<U7CC3> \x8C\xB3 |0
-<U7CC5> \xE6\xDF |0
-<U7CC7> \x8E\x79 |0
-<U7CC8> \xE6\xE0 |0
-<U7CC9> \x8E\x78 |0
-<U7CCA> \xBD\x6B |0
-<U7CCB> \xE6\xE2 |0
-<U7CCC> \xE6\xE1 |0
-<U7CCD> \x94\xF3 |0
-<U7CCE> \xA2\x61 |0
-<U7CD0> \xEA\xCA |0
-<U7CD1> \xEA\xCB |0
-<U7CD2> \xEA\xC7 |0
-<U7CD3> \x98\xAF |0
-<U7CD4> \xEA\xC8 |0
-<U7CD5> \xBF\x7C |0
-<U7CD6> \xBF\x7D |0
-<U7CD7> \xEA\xC9 |0
-<U7CD9> \xC1\x57 |0
-<U7CDA> \xA0\xB2 |0
-<U7CDC> \xC1\x53 |0
-<U7CDD> \xC1\x58 |0
-<U7CDE> \xC1\x54 |0
-<U7CDF> \xC1\x56 |0
-<U7CE0> \xC1\x52 |0
-<U7CE2> \xC1\x55 |0
-<U7CE6> \x8E\x7A |0
-<U7CE7> \xC2\xB3 |0
-<U7CE8> \xED\xCF |0
-<U7CEA> \xF2\xAE |0
-<U7CEC> \xF2\xAD |0
-<U7CED> \x99\x5C |0
-<U7CEE> \xF4\xAB |0
-<U7CEF> \xC4\x7A |0
-<U7CF0> \xC4\x7B |0
-<U7CF1> \xF7\x41 |0
-<U7CF2> \xF5\xE6 |0
-<U7CF3> \x8E\x7C |0
-<U7CF4> \xF7\x40 |0
-<U7CF5> \x8E\x7D |0
-<U7CF6> \xF8\xFD |0
-<U7CF7> \xF9\xA4 |0
-<U7CF8> \xA6\xCD |0
-<U7CF9> \x8B\xD9 |0
-<U7CFB> \xA8\x74 |0
-<U7CFC> \x89\xA2 |0
-<U7CFD> \xCD\xA9 |0
-<U7CFE> \xAA\xC8 |0
-<U7D00> \xAC\xF6 |0
-<U7D01> \xD0\x4C |0
-<U7D02> \xAC\xF4 |0
-<U7D03> \xD0\x4A |0
-<U7D04> \xAC\xF9 |0
-<U7D05> \xAC\xF5 |0
-<U7D06> \xAC\xFA |0
-<U7D07> \xAC\xF8 |0
-<U7D08> \xD0\x4B |0
-<U7D09> \xAC\xF7 |0
-<U7D0A> \xAF\xBF |0
-<U7D0B> \xAF\xBE |0
-<U7D0C> \xD3\x5A |0
-<U7D0D> \xAF\xC7 |0
-<U7D0E> \xD3\x53 |0
-<U7D0F> \xD3\x59 |0
-<U7D10> \xAF\xC3 |0
-<U7D11> \xD3\x52 |0
-<U7D12> \xD3\x58 |0
-<U7D13> \xD3\x56 |0
-<U7D14> \xAF\xC2 |0
-<U7D15> \xAF\xC4 |0
-<U7D16> \xD3\x55 |0
-<U7D17> \xAF\xBD |0
-<U7D18> \xD3\x54 |0
-<U7D19> \xAF\xC8 |0
-<U7D1A> \xAF\xC5 |0
-<U7D1B> \xAF\xC9 |0
-<U7D1C> \xAF\xC6 |0
-<U7D1D> \xD3\x51 |0
-<U7D1E> \xD3\x50 |0
-<U7D1F> \xD3\x57 |0
-<U7D20> \xAF\xC0 |0
-<U7D21> \xAF\xBC |0
-<U7D22> \xAF\xC1 |0
-<U7D25> \x9E\xD7 |0
-<U7D28> \xD6\xF0 |0
-<U7D29> \xD6\xE9 |0
-<U7D2B> \xB5\xB5 |0
-<U7D2C> \xD6\xE8 |0
-<U7D2E> \xB2\xCF |0
-<U7D2F> \xB2\xD6 |0
-<U7D30> \xB2\xD3 |0
-<U7D31> \xB2\xD9 |0
-<U7D32> \xB2\xD8 |0
-<U7D33> \xB2\xD4 |0
-<U7D35> \xD6\xE2 |0
-<U7D36> \xD6\xE5 |0
-<U7D38> \xD6\xE4 |0
-<U7D39> \xB2\xD0 |0
-<U7D3A> \xD6\xE6 |0
-<U7D3B> \xD6\xEF |0
-<U7D3C> \xB2\xD1 |0
-<U7D3D> \xD6\xE3 |0
-<U7D3E> \xD6\xEC |0
-<U7D3F> \xD6\xED |0
-<U7D40> \xB2\xD2 |0
-<U7D41> \xD6\xEA |0
-<U7D42> \xB2\xD7 |0
-<U7D43> \xB2\xCD |0
-<U7D44> \xB2\xD5 |0
-<U7D45> \xD6\xE7 |0
-<U7D46> \xB2\xCC |0
-<U7D47> \xD6\xEB |0
-<U7D4A> \xD6\xEE |0
-<U7D4D> \xA0\xB6 |0
-<U7D4E> \xDA\xFB |0
-<U7D4F> \xDA\xF2 |0
-<U7D50> \xB5\xB2 |0
-<U7D51> \xDA\xF9 |0
-<U7D52> \xDA\xF6 |0
-<U7D53> \xDA\xEE |0
-<U7D54> \xDA\xF7 |0
-<U7D55> \xB5\xB4 |0
-<U7D56> \xDA\xEF |0
-<U7D58> \xDA\xEB |0
-<U7D5A> \x9E\x42 |0
-<U7D5B> \xB8\x6C |0
-<U7D5C> \xDA\xF4 |0
-<U7D5D> \x8E\xA4 |0
-<U7D5E> \xB5\xB1 |0
-<U7D5F> \xDA\xFA |0
-<U7D61> \xB5\xB8 |0
-<U7D62> \xB5\xBA |0
-<U7D63> \xDA\xED |0
-<U7D66> \xB5\xB9 |0
-<U7D67> \xDA\xF0 |0
-<U7D68> \xB5\xB3 |0
-<U7D69> \xDA\xF8 |0
-<U7D6A> \xDA\xF1 |0
-<U7D6B> \xDA\xF5 |0
-<U7D6D> \xDA\xF3 |0
-<U7D6E> \xB5\xB6 |0
-<U7D6F> \xDA\xEC |0
-<U7D70> \xB5\xBB |0
-<U7D71> \xB2\xCE |0
-<U7D72> \xB5\xB7 |0
-<U7D73> \xB5\xBC |0
-<U7D79> \xB8\x68 |0
-<U7D7A> \xDF\x5D |0
-<U7D7B> \xDF\x5F |0
-<U7D7C> \xDF\x61 |0
-<U7D7D> \xDF\x65 |0
-<U7D7F> \xDF\x5B |0
-<U7D80> \xDF\x59 |0
-<U7D81> \xB8\x6A |0
-<U7D83> \xDF\x60 |0
-<U7D84> \xDF\x64 |0
-<U7D85> \xDF\x5C |0
-<U7D86> \xDF\x58 |0
-<U7D88> \xDF\x57 |0
-<U7D89> \x8E\xA7 |0
-<U7D8B> \x8C\x76 |0
-<U7D8C> \xDF\x62 |0
-<U7D8D> \xDF\x5A |0
-<U7D8E> \xDF\x5E |0
-<U7D8F> \xB8\x6B |0
-<U7D91> \xB8\x69 |0
-<U7D92> \xDF\x66 |0
-<U7D93> \xB8\x67 |0
-<U7D94> \xDF\x63 |0
-<U7D96> \xE3\x72 |0
-<U7D97> \x95\x42 |0
-<U7D9C> \xBA\xEE |0
-<U7D9D> \xE3\x6A |0
-<U7D9E> \xBD\x78 |0
-<U7D9F> \xE3\x74 |0
-<U7DA0> \xBA\xF1 |0
-<U7DA1> \xE3\x78 |0
-<U7DA2> \xBA\xF7 |0
-<U7DA3> \xE3\x65 |0
-<U7DA4> \x98\x7D |0
-<U7DA6> \xE3\x75 |0
-<U7DA7> \xE3\x62 |0
-<U7DA8> \x97\x55 |0
-<U7DA9> \xE3\x77 |0
-<U7DAA> \xE3\x66 |0
-<U7DAB> \x8E\xA8 |0
-<U7DAC> \xBA\xFE |0
-<U7DAD> \xBA\xFB |0
-<U7DAE> \xE3\x76 |0
-<U7DAF> \xE3\x70 |0
-<U7DB0> \xBA\xED |0
-<U7DB1> \xBA\xF5 |0
-<U7DB2> \xBA\xF4 |0
-<U7DB3> \x8E\xAA |0
-<U7DB4> \xBA\xF3 |0
-<U7DB5> \xBA\xF9 |0
-<U7DB7> \xE3\x63 |0
-<U7DB8> \xBA\xFA |0
-<U7DB9> \xE3\x71 |0
-<U7DBA> \xBA\xF6 |0
-<U7DBB> \xBA\xEC |0
-<U7DBC> \xE3\x73 |0
-<U7DBD> \xBA\xEF |0
-<U7DBE> \xBA\xF0 |0
-<U7DBF> \xBA\xF8 |0
-<U7DC0> \xE3\x68 |0
-<U7DC1> \xE3\x67 |0
-<U7DC2> \xE3\x64 |0
-<U7DC4> \xE3\x6C |0
-<U7DC5> \xE3\x69 |0
-<U7DC6> \xE3\x6D |0
-<U7DC7> \xBA\xFD |0
-<U7DC9> \xE3\x79 |0
-<U7DCA> \xBA\xF2 |0
-<U7DCB> \xE3\x6E |0
-<U7DCC> \xE3\x6F |0
-<U7DCD> \x89\xA3 |0
-<U7DCE> \xE3\x6B |0
-<U7DCF> \x99\x60 |0
-<U7DD0> \x99\x62 |0
-<U7DD2> \xBA\xFC |0
-<U7DD3> \x94\xFC |0
-<U7DD4> \x99\x61 |0
-<U7DD7> \xE6\xE7 |0
-<U7DD8> \xBD\x70 |0
-<U7DD9> \xBD\x79 |0
-<U7DDA> \xBD\x75 |0
-<U7DDB> \xE6\xE4 |0
-<U7DDC> \x94\xFA |0
-<U7DDD> \xBD\x72 |0
-<U7DDE> \xBD\x76 |0
-<U7DDF> \xE6\xF0 |0
-<U7DE0> \xBD\x6C |0
-<U7DE1> \xE6\xE8 |0
-<U7DE3> \xBD\x74 |0
-<U7DE4> \x8E\xAE |0
-<U7DE5> \x8E\xB2 |0
-<U7DE6> \xE6\xEB |0
-<U7DE7> \xE6\xE6 |0
-<U7DE8> \xBD\x73 |0
-<U7DE9> \xBD\x77 |0
-<U7DEA> \xE6\xE5 |0
-<U7DEC> \xBD\x71 |0
-<U7DEE> \xE6\xEF |0
-<U7DEF> \xBD\x6E |0
-<U7DF0> \xE6\xEE |0
-<U7DF1> \xE6\xED |0
-<U7DF2> \xBD\x7A |0
-<U7DF3> \xE5\x72 |0
-<U7DF4> \xBD\x6D |0
-<U7DF5> \x8E\xB0 |0
-<U7DF6> \xE6\xEC |0
-<U7DF7> \xE6\xE3 |0
-<U7DF9> \xBD\x7B |0
-<U7DFA> \xE6\xEA |0
-<U7DFB> \xBD\x6F |0
-<U7DFD> \x99\x63 |0
-<U7DFE> \x97\xAA |0
-<U7E03> \xE6\xE9 |0
-<U7E07> \x94\xFB |0
-<U7E08> \xBF\xA2 |0
-<U7E09> \xBF\xA7 |0
-<U7E0A> \xBF\x7E |0
-<U7E0B> \xEA\xD8 |0
-<U7E0C> \xEA\xCF |0
-<U7E0D> \xEA\xDB |0
-<U7E0E> \xEA\xD3 |0
-<U7E0F> \xEA\xD9 |0
-<U7E10> \xBF\xA8 |0
-<U7E11> \xBF\xA1 |0
-<U7E12> \xEA\xCC |0
-<U7E13> \xEA\xD2 |0
-<U7E14> \xEA\xDC |0
-<U7E15> \xEA\xD5 |0
-<U7E16> \xEA\xDA |0
-<U7E17> \xEA\xCE |0
-<U7E1A> \xEA\xD6 |0
-<U7E1B> \xBF\xA3 |0
-<U7E1C> \xEA\xD4 |0
-<U7E1D> \xBF\xA6 |0
-<U7E1E> \xBF\xA5 |0
-<U7E1F> \xEA\xD0 |0
-<U7E20> \xEA\xD1 |0
-<U7E21> \xEA\xCD |0
-<U7E22> \xEA\xD7 |0
-<U7E23> \xBF\xA4 |0
-<U7E24> \xEA\xDE |0
-<U7E25> \xEA\xDD |0
-<U7E27> \x8E\xBB |0
-<U7E29> \xED\xDA |0
-<U7E2A> \xED\xD6 |0
-<U7E2B> \xC1\x5F |0
-<U7E2D> \xED\xD0 |0
-<U7E2E> \xC1\x59 |0
-<U7E2F> \xC1\x69 |0
-<U7E30> \xED\xDC |0
-<U7E31> \xC1\x61 |0
-<U7E32> \xC1\x5D |0
-<U7E33> \xED\xD3 |0
-<U7E34> \xC1\x64 |0
-<U7E35> \xC1\x67 |0
-<U7E36> \xED\xDE |0
-<U7E37> \xC1\x5C |0
-<U7E38> \xED\xD5 |0
-<U7E39> \xC1\x65 |0
-<U7E3A> \xED\xE0 |0
-<U7E3B> \xED\xDD |0
-<U7E3C> \xED\xD1 |0
-<U7E3D> \xC1\x60 |0
-<U7E3E> \xC1\x5A |0
-<U7E3F> \xC1\x68 |0
-<U7E40> \xED\xD8 |0
-<U7E41> \xC1\x63 |0
-<U7E42> \xED\xD2 |0
-<U7E43> \xC1\x5E |0
-<U7E44> \xED\xDF |0
-<U7E45> \xC1\x62 |0
-<U7E46> \xC1\x5B |0
-<U7E47> \xED\xD9 |0
-<U7E48> \xC1\x66 |0
-<U7E49> \xED\xD7 |0
-<U7E4C> \xED\xDB |0
-<U7E50> \xF0\x6E |0
-<U7E51> \xF0\x74 |0
-<U7E52> \xC2\xB9 |0
-<U7E53> \xF0\x77 |0
-<U7E54> \xC2\xB4 |0
-<U7E55> \xC2\xB5 |0
-<U7E56> \xF0\x6F |0
-<U7E57> \xF0\x76 |0
-<U7E58> \xF0\x71 |0
-<U7E59> \xC2\xBA |0
-<U7E5A> \xC2\xB7 |0
-<U7E5B> \x8C\xDC |0
-<U7E5C> \xF0\x6D |0
-<U7E5E> \xC2\xB6 |0
-<U7E5F> \xF0\x73 |0
-<U7E60> \xF0\x75 |0
-<U7E61> \xC2\xB8 |0
-<U7E62> \xF0\x72 |0
-<U7E63> \xF0\x70 |0
-<U7E65> \x98\x76 |0
-<U7E67> \x8E\xA1 |0
-<U7E68> \xF2\xB8 |0
-<U7E69> \xC3\xB7 |0
-<U7E6A> \xC3\xB8 |0
-<U7E6B> \xC3\xB4 |0
-<U7E6C> \x8C\xB4 |0
-<U7E6D> \xC3\xB5 |0
-<U7E6E> \x8E\xB7 |0
-<U7E6F> \xF2\xB4 |0
-<U7E70> \xF2\xB2 |0
-<U7E72> \xF2\xB6 |0
-<U7E73> \xC3\xBA |0
-<U7E74> \xF2\xB7 |0
-<U7E75> \xF2\xB0 |0
-<U7E76> \xF2\xAF |0
-<U7E77> \xF2\xB3 |0
-<U7E78> \xF2\xB1 |0
-<U7E79> \xC3\xB6 |0
-<U7E7A> \xF2\xB5 |0
-<U7E7B> \xF4\xAC |0
-<U7E7C> \xC4\x7E |0
-<U7E7D> \xC4\x7D |0
-<U7E7E> \xF4\xAD |0
-<U7E7F> \x9D\xA6 |0
-<U7E80> \xF4\xAF |0
-<U7E81> \xF4\xAE |0
-<U7E82> \xC4\xA1 |0
-<U7E86> \xF5\xEB |0
-<U7E87> \xF5\xE8 |0
-<U7E88> \xF5\xE9 |0
-<U7E8A> \xF5\xE7 |0
-<U7E8B> \xF5\xEA |0
-<U7E8C> \xC4\xF2 |0
-<U7E8D> \xF5\xEC |0
-<U7E8E> \x9E\xB0 |0
-<U7E8F> \xC4\xF1 |0
-<U7E91> \xF7\x42 |0
-<U7E92> \x8E\xB8 |0
-<U7E93> \xC5\xD5 |0
-<U7E94> \xC5\xD7 |0
-<U7E95> \xF7\xEE |0
-<U7E96> \xC5\xD6 |0
-<U7E97> \xF8\xB9 |0
-<U7E98> \xF9\x40 |0
-<U7E99> \xF9\x42 |0
-<U7E9A> \xF8\xFE |0
-<U7E9B> \xF9\x41 |0
-<U7E9C> \xC6\x6C |0
-<U7E9F> \x9D\x70 |0
-<U7EA4> \x89\x6E |0
-<U7EAC> \x89\x6F |0
-<U7EBA> \x89\x70 |0
-<U7EC7> \x89\x71 |0
-<U7ECF> \x89\x72 |0
-<U7EDF> \x89\x73 |0
-<U7F06> \x89\x74 |0
-<U7F36> \xA6\xCE |0
-<U7F37> \x89\x75 |0
-<U7F38> \xAC\xFB |0
-<U7F39> \xD2\x6F |0
-<U7F3A> \xAF\xCA |0
-<U7F3D> \xB2\xDA |0
-<U7F3E> \xDA\xFC |0
-<U7F3F> \xDA\xFD |0
-<U7F40> \x8E\xBC |0
-<U7F41> \x8E\xBD |0
-<U7F43> \xEA\xDF |0
-<U7F44> \xC1\x6A |0
-<U7F45> \xED\xE1 |0
-<U7F47> \x8E\xBE |0
-<U7F48> \xC2\xBB |0
-<U7F49> \x9D\xD1 |0
-<U7F4A> \xF2\xBA |0
-<U7F4B> \xF2\xB9 |0
-<U7F4C> \xC4\xA2 |0
-<U7F4D> \xF5\xED |0
-<U7F4E> \x94\xFD |0
-<U7F4F> \xF7\x43 |0
-<U7F50> \xC5\xF8 |0
-<U7F51> \xCA\x49 |0
-<U7F52> \x8B\xD7 |0
-<U7F53> \x8B\xDA |0
-<U7F54> \xAA\xC9 |0
-<U7F55> \xA8\x75 |0
-<U7F58> \xD0\x4D |0
-<U7F5B> \xD3\x60 |0
-<U7F5C> \xD3\x5B |0
-<U7F5D> \xD3\x5F |0
-<U7F5E> \xD3\x5D |0
-<U7F5F> \xAF\xCB |0
-<U7F60> \xD3\x5E |0
-<U7F61> \xD3\x5C |0
-<U7F63> \xD6\xF1 |0
-<U7F65> \xDA\xFE |0
-<U7F66> \xDB\x40 |0
-<U7F67> \xDF\x69 |0
-<U7F68> \xDF\x6A |0
-<U7F69> \xB8\x6E |0
-<U7F6A> \xB8\x6F |0
-<U7F6B> \xDF\x68 |0
-<U7F6C> \xDF\x6B |0
-<U7F6D> \xDF\x67 |0
-<U7F6E> \xB8\x6D |0
-<U7F70> \xBB\x40 |0
-<U7F71> \xA0\xE2 |0
-<U7F72> \xB8\x70 |0
-<U7F73> \xE3\x7A |0
-<U7F75> \xBD\x7C |0
-<U7F76> \xE6\xF1 |0
-<U7F77> \xBD\x7D |0
-<U7F78> \x9F\xE9 |0
-<U7F79> \xBF\xA9 |0
-<U7F7A> \xEA\xE2 |0
-<U7F7B> \xEA\xE0 |0
-<U7F7C> \xEA\xE1 |0
-<U7F7D> \xED\xE4 |0
-<U7F7E> \xED\xE3 |0
-<U7F7F> \xED\xE2 |0
-<U7F83> \xF2\xBB |0
-<U7F85> \xC3\xB9 |0
-<U7F86> \xF2\xBC |0
-<U7F87> \xF7\x44 |0
-<U7F88> \xC5\xF9 |0
-<U7F89> \xF8\xBA |0
-<U7F8A> \xA6\xCF |0
-<U7F8B> \xAA\xCB |0
-<U7F8C> \xAA\xCA |0
-<U7F8D> \xD0\x4F |0
-<U7F8E> \xAC\xFC |0
-<U7F8F> \xFD\xA8 |0
-<U7F91> \xD0\x4E |0
-<U7F92> \xD3\x62 |0
-<U7F93> \x8A\xE7 |0
-<U7F94> \xAF\xCC |0
-<U7F95> \xD6\xF2 |0
-<U7F96> \xD3\x61 |0
-<U7F97> \x8E\xC2 |0
-<U7F9A> \xB2\xDC |0
-<U7F9B> \xD6\xF5 |0
-<U7F9C> \xD6\xF3 |0
-<U7F9D> \xD6\xF4 |0
-<U7F9E> \xB2\xDB |0
-<U7FA0> \xDB\x42 |0
-<U7FA1> \xDB\x43 |0
-<U7FA2> \xDB\x41 |0
-<U7FA3> \x8E\xC4 |0
-<U7FA4> \xB8\x73 |0
-<U7FA5> \xDF\x6D |0
-<U7FA6> \xDF\x6C |0
-<U7FA7> \xDF\x6E |0
-<U7FA8> \xB8\x72 |0
-<U7FA9> \xB8\x71 |0
-<U7FAC> \xE6\xF2 |0
-<U7FAD> \xE6\xF4 |0
-<U7FAE> \x99\x64 |0
-<U7FAF> \xBD\x7E |0
-<U7FB0> \xE6\xF3 |0
-<U7FB1> \xEA\xE3 |0
-<U7FB2> \xBF\xAA |0
-<U7FB3> \xF0\x79 |0
-<U7FB4> \x99\x65 |0
-<U7FB5> \xF0\x78 |0
-<U7FB6> \xC3\xBB |0
-<U7FB7> \xF2\xBD |0
-<U7FB8> \xC3\xBD |0
-<U7FB9> \xC3\xBC |0
-<U7FBA> \xF4\xB0 |0
-<U7FBB> \xF5\xEE |0
-<U7FBC> \xC4\xF3 |0
-<U7FBD> \xA6\xD0 |0
-<U7FBE> \xD0\x50 |0
-<U7FBF> \xAC\xFD |0
-<U7FC0> \xD3\x65 |0
-<U7FC1> \xAF\xCE |0
-<U7FC2> \xD3\x64 |0
-<U7FC3> \xD3\x63 |0
-<U7FC5> \xAF\xCD |0
-<U7FC7> \xD6\xFB |0
-<U7FC9> \xD6\xFD |0
-<U7FCA> \xD6\xF6 |0
-<U7FCB> \xD6\xF7 |0
-<U7FCC> \xB2\xDD |0
-<U7FCD> \xD6\xF8 |0
-<U7FCE> \xB2\xDE |0
-<U7FCF> \xD6\xFC |0
-<U7FD0> \xD6\xF9 |0
-<U7FD1> \xD6\xFA |0
-<U7FD2> \xB2\xDF |0
-<U7FD4> \xB5\xBE |0
-<U7FD5> \xB5\xBF |0
-<U7FD7> \xDB\x44 |0
-<U7FDB> \xDF\x6F |0
-<U7FDC> \xDF\x70 |0
-<U7FDD> \x95\x4E |0
-<U7FDE> \xE3\x7E |0
-<U7FDF> \xBB\x43 |0
-<U7FE0> \xBB\x41 |0
-<U7FE1> \xBB\x42 |0
-<U7FE2> \xE3\x7B |0
-<U7FE3> \xE3\x7C |0
-<U7FE5> \xE3\x7D |0
-<U7FE6> \xE6\xF9 |0
-<U7FE7> \x98\xB3 |0
-<U7FE8> \xE6\xFA |0
-<U7FE9> \xBD\xA1 |0
-<U7FEA> \xE6\xF7 |0
-<U7FEB> \xE6\xF6 |0
-<U7FEC> \xE6\xF8 |0
-<U7FED> \xE6\xF5 |0
-<U7FEE> \xBF\xAD |0
-<U7FEF> \xEA\xE4 |0
-<U7FF0> \xBF\xAB |0
-<U7FF1> \xBF\xAC |0
-<U7FF2> \xED\xE6 |0
-<U7FF3> \xC1\x6B |0
-<U7FF4> \xED\xE5 |0
-<U7FF5> \xEF\xA8 |0
-<U7FF7> \xF0\x7A |0
-<U7FF8> \xF0\x7B |0
-<U7FF9> \xC2\xBC |0
-<U7FFA> \x8E\xCB |0
-<U7FFB> \xC2\xBD |0
-<U7FFC> \xC1\x6C |0
-<U7FFD> \xF2\xBE |0
-<U7FFE> \xF2\xBF |0
-<U7FFF> \xF4\xB1 |0
-<U8000> \xC4\xA3 |0
-<U8001> \xA6\xD1 |0
-<U8002> \x8B\xDF |0
-<U8003> \xA6\xD2 |0
-<U8004> \xAC\xFE |0
-<U8005> \xAA\xCC |0
-<U8006> \xAF\xCF |0
-<U8007> \xD0\x51 |0
-<U8008> \x8E\xCE |0
-<U800B> \xB5\xC0 |0
-<U800C> \xA6\xD3 |0
-<U800D> \xAD\x41 |0
-<U800E> \xD0\x52 |0
-<U800F> \xD0\x53 |0
-<U8010> \xAD\x40 |0
-<U8011> \xAD\x42 |0
-<U8012> \xA6\xD4 |0
-<U8014> \xD0\x54 |0
-<U8015> \xAF\xD1 |0
-<U8016> \xD3\x66 |0
-<U8017> \xAF\xD3 |0
-<U8018> \xAF\xD0 |0
-<U8019> \xAF\xD2 |0
-<U801B> \xD7\x41 |0
-<U801C> \xB2\xE0 |0
-<U801D> \x8E\xCF |0
-<U801E> \xD7\x40 |0
-<U801F> \xD6\xFE |0
-<U8020> \x99\x68 |0
-<U8021> \xDF\x71 |0
-<U8024> \xE3\xA1 |0
-<U8025> \x99\x69 |0
-<U8026> \xBD\xA2 |0
-<U8028> \xBF\xAE |0
-<U8029> \xEA\xE6 |0
-<U802A> \xEA\xE5 |0
-<U802C> \xED\xE7 |0
-<U802E> \x99\x6B |0
-<U802F> \x8E\xD1 |0
-<U8030> \xF5\xEF |0
-<U8031> \x99\x6C |0
-<U8033> \xA6\xD5 |0
-<U8034> \xCB\x73 |0
-<U8035> \xCD\xAA |0
-<U8036> \xAD\x43 |0
-<U8037> \xD0\x55 |0
-<U8039> \xD3\x68 |0
-<U803B> \x8E\xD4 |0
-<U803C> \x8E\xD5 |0
-<U803D> \xAF\xD4 |0
-<U803E> \xD3\x67 |0
-<U803F> \xAF\xD5 |0
-<U8043> \xD7\x43 |0
-<U8046> \xB2\xE2 |0
-<U8047> \xD7\x42 |0
-<U8048> \xD7\x44 |0
-<U804A> \xB2\xE1 |0
-<U804F> \xDB\x46 |0
-<U8050> \xDB\x47 |0
-<U8051> \xDB\x45 |0
-<U8052> \xB5\xC1 |0
-<U8054> \x99\x6D |0
-<U8056> \xB8\x74 |0
-<U8058> \xB8\x75 |0
-<U805A> \xBB\x45 |0
-<U805B> \xA0\xBE |0
-<U805C> \xE3\xA3 |0
-<U805D> \xE3\xA2 |0
-<U805E> \xBB\x44 |0
-<U8061> \x8E\xD6 |0
-<U8062> \xA0\xBC |0
-<U8063> \xA0\xB5 |0
-<U8064> \xE6\xFB |0
-<U8066> \xA0\xB4 |0
-<U8067> \xE6\xFC |0
-<U806C> \xEA\xE7 |0
-<U806F> \xC1\x70 |0
-<U8070> \xC1\x6F |0
-<U8071> \xC1\x6D |0
-<U8072> \xC1\x6E |0
-<U8073> \xC1\x71 |0
-<U8075> \xF0\x7C |0
-<U8076> \xC2\xBF |0
-<U8077> \xC2\xBE |0
-<U8078> \xF2\xC0 |0
-<U8079> \xF4\xB2 |0
-<U807D> \xC5\xA5 |0
-<U807E> \xC5\xA4 |0
-<U807F> \xA6\xD6 |0
-<U8080> \x8B\xE0 |0
-<U8082> \xD1\xFB |0
-<U8084> \xB8\x77 |0
-<U8085> \xB5\xC2 |0
-<U8086> \xB8\x76 |0
-<U8087> \xBB\x46 |0
-<U8089> \xA6\xD7 |0
-<U808A> \xC9\xA9 |0
-<U808B> \xA6\xD8 |0
-<U808C> \xA6\xD9 |0
-<U808F> \xCD\xAB |0
-<U8090> \xCB\x76 |0
-<U8092> \xCB\x77 |0
-<U8093> \xA8\x77 |0
-<U8095> \xCB\x74 |0
-<U8096> \xA8\x76 |0
-<U8098> \xA8\x79 |0
-<U8099> \xCB\x75 |0
-<U809A> \xA8\x7B |0
-<U809B> \xA8\x7A |0
-<U809C> \xCB\x78 |0
-<U809D> \xA8\x78 |0
-<U809F> \x89\xB5 |0
-<U80A1> \xAA\xD1 |0
-<U80A2> \xAA\xCF |0
-<U80A3> \xCD\xAD |0
-<U80A5> \xAA\xCE |0
-<U80A7> \x8E\xDD |0
-<U80A9> \xAA\xD3 |0
-<U80AA> \xAA\xD5 |0
-<U80AB> \xAA\xD2 |0
-<U80AD> \xCD\xB0 |0
-<U80AE> \xCD\xAC |0
-<U80AF> \xAA\xD6 |0
-<U80B1> \xAA\xD0 |0
-<U80B2> \xA8\x7C |0
-<U80B4> \xAA\xD4 |0
-<U80B5> \xCD\xAF |0
-<U80B6> \x9E\x5D |0
-<U80B7> \x99\x71 |0
-<U80B8> \xCD\xAE |0
-<U80BA> \xAA\xCD |0
-<U80BC> \x89\xAE |0
-<U80BD> \x9D\xE8 |0
-<U80C2> \xD0\x5B |0
-<U80C3> \xAD\x47 |0
-<U80C4> \xAD\x48 |0
-<U80C5> \xD0\x5D |0
-<U80C6> \x95\x65 |0
-<U80C7> \xD0\x57 |0
-<U80C8> \xD0\x5A |0
-<U80C9> \xD0\x63 |0
-<U80CA> \xD0\x61 |0
-<U80CC> \xAD\x49 |0
-<U80CD> \xD0\x67 |0
-<U80CE> \xAD\x4C |0
-<U80CF> \xD0\x64 |0
-<U80D0> \xD0\x5C |0
-<U80D1> \xD0\x59 |0
-<U80D4> \xDB\x49 |0
-<U80D5> \xD0\x62 |0
-<U80D6> \xAD\x44 |0
-<U80D7> \xD0\x65 |0
-<U80D8> \xD0\x56 |0
-<U80D9> \xD0\x5F |0
-<U80DA> \xAD\x46 |0
-<U80DB> \xAD\x4B |0
-<U80DC> \xD0\x60 |0
-<U80DD> \xAD\x4F |0
-<U80DE> \xAD\x4D |0
-<U80E0> \xD0\x58 |0
-<U80E1> \xAD\x4A |0
-<U80E3> \xD0\x5E |0
-<U80E4> \xAD\x4E |0
-<U80E5> \xAD\x45 |0
-<U80E6> \xD0\x66 |0
-<U80E9> \x99\x72 |0
-<U80EC> \x8B\x5C |0
-<U80ED> \xAF\xDA |0
-<U80EF> \xAF\xE3 |0
-<U80F0> \xAF\xD8 |0
-<U80F1> \xAF\xD6 |0
-<U80F2> \xD3\x6A |0
-<U80F3> \xAF\xDE |0
-<U80F4> \xAF\xDB |0
-<U80F5> \xD3\x6C |0
-<U80F6> \x89\xB1 |0
-<U80F8> \xAF\xDD |0
-<U80F9> \xD3\x6B |0
-<U80FA> \xD3\x69 |0
-<U80FB> \xD3\x6E |0
-<U80FC> \xAF\xE2 |0
-<U80FD> \xAF\xE0 |0
-<U80FE> \xDB\x48 |0
-<U8100> \xD3\x6F |0
-<U8101> \xD3\x6D |0
-<U8102> \xAF\xD7 |0
-<U8103> \xA0\xC0 |0
-<U8105> \xAF\xD9 |0
-<U8106> \xAF\xDC |0
-<U8107> \x8E\xDF |0
-<U8108> \xAF\xDF |0
-<U8109> \x95\x66 |0
-<U810A> \xAF\xE1 |0
-<U810C> \x99\x74 |0
-<U810E> \x99\x76 |0
-<U8112> \x99\x77 |0
-<U8114> \x99\x79 |0
-<U8115> \xD7\x4E |0
-<U8116> \xB2\xE4 |0
-<U8117> \x9D\xDA |0
-<U8118> \xD7\x45 |0
-<U8119> \xD7\x47 |0
-<U811A> \x8E\xE0 |0
-<U811B> \xD7\x48 |0
-<U811D> \xD7\x50 |0
-<U811E> \xD7\x4C |0
-<U811F> \xD7\x4A |0
-<U8121> \xD7\x4D |0
-<U8122> \xD7\x51 |0
-<U8123> \xB2\xE5 |0
-<U8124> \xB2\xE9 |0
-<U8125> \xD7\x46 |0
-<U8127> \xD7\x4F |0
-<U8129> \xB2\xE7 |0
-<U812A> \x93\x5C |0
-<U812B> \xB2\xE6 |0
-<U812C> \xD7\x4B |0
-<U812D> \xD7\x49 |0
-<U812F> \xB2\xE3 |0
-<U8130> \xB2\xE8 |0
-<U8132> \x9D\xE6 |0
-<U8134> \x8B\x5F |0
-<U8137> \x95\x63 |0
-<U8139> \xB5\xC8 |0
-<U813A> \xDB\x51 |0
-<U813D> \xDB\x4F |0
-<U813E> \xB5\xCA |0
-<U8142> \x95\x67 |0
-<U8143> \xDB\x4A |0
-<U8144> \xDF\xA1 |0
-<U8146> \xB5\xC9 |0
-<U8147> \xDB\x4E |0
-<U8148> \x9D\xE3 |0
-<U814A> \xDB\x4B |0
-<U814B> \xB5\xC5 |0
-<U814C> \xB5\xCB |0
-<U814D> \xDB\x50 |0
-<U814E> \xB5\xC7 |0
-<U814F> \xDB\x4D |0
-<U8150> \xBB\x47 |0
-<U8151> \xB5\xC6 |0
-<U8152> \xDB\x4C |0
-<U8153> \xB5\xCC |0
-<U8154> \xB5\xC4 |0
-<U8155> \xB5\xC3 |0
-<U8156> \x99\x7C |0
-<U8159> \x99\x7D |0
-<U815A> \x99\x7E |0
-<U815B> \xDF\x77 |0
-<U815C> \xDF\x75 |0
-<U815E> \xDF\x7B |0
-<U8160> \xDF\x73 |0
-<U8161> \xDF\xA2 |0
-<U8162> \xDF\x78 |0
-<U8164> \xDF\x72 |0
-<U8165> \xB8\x7B |0
-<U8166> \xB8\xA3 |0
-<U8167> \xDF\x7D |0
-<U8169> \xDF\x76 |0
-<U816B> \xB8\x7E |0
-<U816D> \x8B\x5B |0
-<U816E> \xB8\x7C |0
-<U816F> \xDF\x7E |0
-<U8170> \xB8\x79 |0
-<U8171> \xB8\x78 |0
-<U8172> \xDF\x79 |0
-<U8173> \xB8\x7D |0
-<U8174> \xB5\xCD |0
-<U8176> \xDF\x7C |0
-<U8177> \xDF\x74 |0
-<U8178> \xB8\x7A |0
-<U8179> \xB8\xA1 |0
-<U817A> \xB8\xA2 |0
-<U817C> \x99\xA3 |0
-<U817F> \xBB\x4C |0
-<U8180> \xBB\x48 |0
-<U8182> \xBB\x4D |0
-<U8183> \xE3\xA6 |0
-<U8184> \x99\xA4 |0
-<U8186> \xE3\xA5 |0
-<U8187> \xE3\xA7 |0
-<U8188> \xBB\x4A |0
-<U8189> \xE3\xA4 |0
-<U818A> \xBB\x4B |0
-<U818B> \xE3\xAA |0
-<U818C> \xE3\xA9 |0
-<U818D> \xE3\xA8 |0
-<U818F> \xBB\x49 |0
-<U8193> \x99\xA6 |0
-<U8195> \xE7\x41 |0
-<U8197> \xE7\x44 |0
-<U8198> \xBD\xA8 |0
-<U8199> \xE7\x43 |0
-<U819A> \xBD\xA7 |0
-<U819B> \xBD\xA3 |0
-<U819C> \xBD\xA4 |0
-<U819D> \xBD\xA5 |0
-<U819E> \xE7\x40 |0
-<U819F> \xE6\xFE |0
-<U81A0> \xBD\xA6 |0
-<U81A2> \xE7\x42 |0
-<U81A3> \xE6\xFD |0
-<U81A5> \x99\xA8 |0
-<U81A6> \xEA\xE9 |0
-<U81A7> \xEA\xF3 |0
-<U81A8> \xBF\xB1 |0
-<U81A9> \xBF\xB0 |0
-<U81AA> \x8A\xBE |0
-<U81AB> \xEA\xED |0
-<U81AC> \xEA\xEF |0
-<U81AE> \xEA\xEA |0
-<U81B0> \xEA\xEE |0
-<U81B1> \xEA\xE8 |0
-<U81B2> \xEA\xF1 |0
-<U81B3> \xBF\xAF |0
-<U81B4> \xEA\xF0 |0
-<U81B5> \xEA\xEC |0
-<U81B6> \x9E\x61 |0
-<U81B7> \xEA\xF2 |0
-<U81B9> \xEA\xEB |0
-<U81BA> \xC1\x74 |0
-<U81BB> \xED\xE8 |0
-<U81BC> \xED\xEE |0
-<U81BD> \xC1\x78 |0
-<U81BE> \xC1\x7A |0
-<U81BF> \xC1\x77 |0
-<U81C0> \xC1\x76 |0
-<U81C1> \x99\xAA |0
-<U81C2> \xC1\x75 |0
-<U81C3> \xC1\x73 |0
-<U81C4> \xED\xE9 |0
-<U81C5> \xED\xEC |0
-<U81C6> \xC1\x72 |0
-<U81C7> \xED\xED |0
-<U81C8> \xA0\xC8 |0
-<U81C9> \xC1\x79 |0
-<U81CA> \xED\xEB |0
-<U81CC> \xED\xEA |0
-<U81CD> \xC2\xC0 |0
-<U81CF> \xC2\xC1 |0
-<U81D0> \xF0\xA1 |0
-<U81D1> \xF0\x7D |0
-<U81D2> \xF0\x7E |0
-<U81D5> \xF2\xC2 |0
-<U81D7> \xF2\xC1 |0
-<U81D8> \xC3\xBE |0
-<U81D9> \xF4\xB4 |0
-<U81DA> \xC4\xA4 |0
-<U81DB> \xF4\xB3 |0
-<U81DD> \xF5\xF0 |0
-<U81DE> \xF7\x45 |0
-<U81DF> \xC5\xA6 |0
-<U81E0> \xF9\x43 |0
-<U81E1> \xF9\x44 |0
-<U81E2> \xC5\xD8 |0
-<U81E3> \xA6\xDA |0
-<U81E4> \x99\xAB |0
-<U81E5> \xAA\xD7 |0
-<U81E6> \xDB\x52 |0
-<U81E7> \xBB\x4E |0
-<U81E8> \xC1\x7B |0
-<U81E9> \xED\xEF |0
-<U81EA> \xA6\xDB |0
-<U81EC> \xAF\xE5 |0
-<U81ED> \xAF\xE4 |0
-<U81EE> \xDB\x53 |0
-<U81EF> \xFE\xC4 |0
-<U81F2> \xEA\xF4 |0
-<U81F3> \xA6\xDC |0
-<U81F4> \xAD\x50 |0
-<U81F6> \x98\xC2 |0
-<U81F7> \xDB\x54 |0
-<U81F8> \xDB\x55 |0
-<U81F9> \xDB\x56 |0
-<U81FA> \xBB\x4F |0
-<U81FB> \xBF\xB2 |0
-<U81FC> \xA6\xDD |0
-<U81FE> \xAA\xD8 |0
-<U81FF> \xD0\x68 |0
-<U8200> \xAF\xE6 |0
-<U8201> \xD3\x70 |0
-<U8202> \xB2\xEA |0
-<U8204> \xDB\x57 |0
-<U8205> \xB8\xA4 |0
-<U8207> \xBB\x50 |0
-<U8208> \xBF\xB3 |0
-<U8209> \xC1\x7C |0
-<U820A> \xC2\xC2 |0
-<U820B> \xF4\xB5 |0
-<U820C> \xA6\xDE |0
-<U820D> \xAA\xD9 |0
-<U8210> \xAF\xE7 |0
-<U8211> \xD7\x52 |0
-<U8212> \xB5\xCE |0
-<U8214> \xBB\x51 |0
-<U8215> \xE3\xAB |0
-<U8216> \xE7\x45 |0
-<U8218> \x8E\xE8 |0
-<U821A> \xA0\xBA |0
-<U821B> \xA6\xDF |0
-<U821C> \xB5\xCF |0
-<U821D> \xDF\xA3 |0
-<U821E> \xBB\x52 |0
-<U821F> \xA6\xE0 |0
-<U8220> \xCD\xB1 |0
-<U8221> \xD0\x69 |0
-<U8222> \xAD\x51 |0
-<U8225> \xD3\x72 |0
-<U8226> \xFD\x77 |0
-<U8228> \xAF\xEA |0
-<U8229> \x8E\xEE |0
-<U822A> \xAF\xE8 |0
-<U822B> \xAF\xE9 |0
-<U822C> \xAF\xEB |0
-<U822D> \x9E\xBF |0
-<U822F> \xD3\x71 |0
-<U8232> \xD7\x57 |0
-<U8233> \xD7\x54 |0
-<U8234> \xD7\x56 |0
-<U8235> \xB2\xEB |0
-<U8236> \xB2\xED |0
-<U8237> \xB2\xEC |0
-<U8238> \xD7\x53 |0
-<U8239> \xB2\xEE |0
-<U823A> \xD7\x55 |0
-<U823C> \xDB\x58 |0
-<U823D> \xDB\x59 |0
-<U823E> \x89\xC2 |0
-<U823F> \xDB\x5A |0
-<U8240> \xDF\xA6 |0
-<U8242> \xDF\xA7 |0
-<U8244> \xDF\xA5 |0
-<U8245> \xDF\xA8 |0
-<U8247> \xB8\xA5 |0
-<U8249> \xDF\xA4 |0
-<U824B> \xBB\x53 |0
-<U824E> \xE7\x4A |0
-<U824F> \xE7\x46 |0
-<U8250> \xE7\x49 |0
-<U8251> \xE7\x4B |0
-<U8252> \xE7\x48 |0
-<U8253> \xE7\x47 |0
-<U8254> \x99\xAC |0
-<U8255> \xEA\xF5 |0
-<U8256> \xEA\xF6 |0
-<U8257> \xEA\xF7 |0
-<U8258> \xBF\xB4 |0
-<U8259> \xBF\xB5 |0
-<U825A> \xED\xF1 |0
-<U825B> \xED\xF0 |0
-<U825C> \xED\xF2 |0
-<U825E> \xF0\xA3 |0
-<U825F> \xF0\xA2 |0
-<U8261> \xF2\xC4 |0
-<U8262> \x95\x6B |0
-<U8263> \xF2\xC5 |0
-<U8264> \xF2\xC3 |0
-<U8265> \x95\x6C |0
-<U8266> \xC4\xA5 |0
-<U8268> \xF4\xB6 |0
-<U8269> \xF4\xB7 |0
-<U826B> \xF7\x46 |0
-<U826C> \xF7\xEF |0
-<U826D> \xF8\xBB |0
-<U826E> \xA6\xE1 |0
-<U826F> \xA8\x7D |0
-<U8271> \xC1\x7D |0
-<U8272> \xA6\xE2 |0
-<U8274> \xD7\x58 |0
-<U8275> \xDB\x5B |0
-<U8276> \x99\xAF |0
-<U8277> \xC6\x41 |0
-<U8278> \xCA\x4A |0
-<U8279> \x99\x4A |0
-<U827A> \x89\x76 |0
-<U827B> \x8F\x48 |0
-<U827C> \xCA\x4B |0
-<U827D> \xCA\x4D |0
-<U827E> \xA6\xE3 |0
-<U827F> \xCA\x4E |0
-<U8280> \xCA\x4C |0
-<U8283> \xCB\xA2 |0
-<U8284> \xCB\xA3 |0
-<U8285> \xCB\x7B |0
-<U8287> \xFB\xEE |0
-<U828A> \xCB\xA1 |0
-<U828B> \xA8\xA1 |0
-<U828D> \xA8\xA2 |0
-<U828E> \xCB\x7C |0
-<U828F> \xCB\x7A |0
-<U8290> \xCB\x79 |0
-<U8291> \xCB\x7D |0
-<U8292> \xA8\x7E |0
-<U8293> \xCB\x7E |0
-<U8294> \xD0\x6A |0
-<U8298> \xCD\xB6 |0
-<U8299> \xAA\xDC |0
-<U829A> \xCD\xB5 |0
-<U829B> \xCD\xB7 |0
-<U829D> \xAA\xDB |0
-<U829E> \xCD\xBC |0
-<U829F> \xAA\xDF |0
-<U82A0> \xCD\xB2 |0
-<U82A1> \xCD\xC0 |0
-<U82A2> \xCD\xC6 |0
-<U82A3> \xAA\xE6 |0
-<U82A4> \xCD\xC3 |0
-<U82A5> \xAA\xE3 |0
-<U82A6> \x99\xAE |0
-<U82A7> \xCD\xB9 |0
-<U82A8> \xCD\xBF |0
-<U82A9> \xCD\xC1 |0
-<U82AA> \x8E\xFB |0
-<U82AB> \xCD\xB4 |0
-<U82AC> \xAA\xE2 |0
-<U82AD> \xAA\xDD |0
-<U82AE> \xCD\xBA |0
-<U82AF> \xAA\xE4 |0
-<U82B0> \xAA\xE7 |0
-<U82B1> \xAA\xE1 |0
-<U82B3> \xAA\xDA |0
-<U82B4> \xCD\xBE |0
-<U82B5> \xCD\xB8 |0
-<U82B6> \xCD\xC5 |0
-<U82B7> \xAA\xE9 |0
-<U82B8> \xAA\xE5 |0
-<U82B9> \xAA\xE0 |0
-<U82BA> \xCD\xBD |0
-<U82BB> \xAF\xEC |0
-<U82BC> \xCD\xBB |0
-<U82BD> \xAA\xDE |0
-<U82BE> \xAA\xE8 |0
-<U82BF> \x8C\xD0 |0
-<U82C0> \xCD\xB3 |0
-<U82C2> \xCD\xC2 |0
-<U82C3> \xCD\xC4 |0
-<U82C4> \x8B\x52 |0
-<U82CA> \x99\xB0 |0
-<U82CF> \x89\x77 |0
-<U82D0> \x8F\x41 |0
-<U82D1> \xAD\x62 |0
-<U82D2> \xAD\x5C |0
-<U82D3> \xAD\x64 |0
-<U82D4> \xAD\x61 |0
-<U82D5> \xD0\x71 |0
-<U82D6> \xD0\x74 |0
-<U82D7> \xAD\x5D |0
-<U82D8> \x99\xB1 |0
-<U82D9> \xD0\x6B |0
-<U82DB> \xAD\x56 |0
-<U82DC> \xAD\x60 |0
-<U82DE> \xAD\x63 |0
-<U82DF> \xAD\x65 |0
-<U82E0> \xD0\xA2 |0
-<U82E1> \xD0\x77 |0
-<U82E2> \x8F\x49 |0
-<U82E3> \xAD\x55 |0
-<U82E4> \xD0\xA1 |0
-<U82E5> \xAD\x59 |0
-<U82E6> \xAD\x57 |0
-<U82E7> \xAD\x52 |0
-<U82E8> \xD0\x6F |0
-<U82EA> \xD0\x7E |0
-<U82EB> \xD0\x73 |0
-<U82EC> \xD0\x76 |0
-<U82ED> \xD0\xA5 |0
-<U82EE> \xFA\x4D |0
-<U82EF> \xAD\x66 |0
-<U82F0> \xD0\x7D |0
-<U82F1> \xAD\x5E |0
-<U82F2> \xD0\x78 |0
-<U82F3> \xD0\xA4 |0
-<U82F4> \xD0\x75 |0
-<U82F5> \xD0\x79 |0
-<U82F6> \xD0\x7C |0
-<U82F7> \x9D\xE4 |0
-<U82F8> \x8C\xB5 |0
-<U82F9> \xD0\x6D |0
-<U82FA> \xD0\xA3 |0
-<U82FB> \xD0\x7B |0
-<U82FC> \xFB\xE9 |0
-<U82FD> \x9B\x54 |0
-<U82FE> \xD0\x6C |0
-<U82FF> \x99\xB2 |0
-<U8300> \xD0\x70 |0
-<U8301> \xAD\x5F |0
-<U8302> \xAD\x5A |0
-<U8303> \xAD\x53 |0
-<U8304> \xAD\x58 |0
-<U8305> \xAD\x54 |0
-<U8306> \xAD\x67 |0
-<U8307> \xD0\x6E |0
-<U8308> \xD3\xA5 |0
-<U8309> \xAD\x5B |0
-<U830B> \x9E\x68 |0
-<U830C> \xD0\x7A |0
-<U830D> \xCE\x41 |0
-<U8316> \xD3\xA8 |0
-<U8317> \xAF\xFA |0
-<U8318> \x8F\x4A |0
-<U8319> \xD3\x76 |0
-<U831A> \x8F\x42 |0
-<U831B> \xD3\xA3 |0
-<U831C> \xD3\x7D |0
-<U831D> \x8F\x51 |0
-<U831E> \xD3\xB2 |0
-<U8320> \xD3\xAA |0
-<U8322> \xD3\x7E |0
-<U8324> \xD3\xA9 |0
-<U8325> \xD3\x78 |0
-<U8326> \xD3\x7C |0
-<U8327> \xD3\xB5 |0
-<U8328> \xAF\xFD |0
-<U8329> \xD3\xAD |0
-<U832A> \xD3\xA4 |0
-<U832B> \xAF\xED |0
-<U832C> \xD3\xB3 |0
-<U832D> \xD3\x74 |0
-<U832F> \xD3\xAC |0
-<U8331> \xAF\xFC |0
-<U8332> \xAF\xF7 |0
-<U8333> \xD3\x73 |0
-<U8334> \xAF\xF5 |0
-<U8335> \xAF\xF4 |0
-<U8336> \xAF\xF9 |0
-<U8337> \xD3\xAB |0
-<U8338> \xAF\xF1 |0
-<U8339> \xAF\xF8 |0
-<U833A> \xD0\x72 |0
-<U833B> \xDB\x5C |0
-<U833C> \xD3\xA6 |0
-<U833D> \x98\x46 |0
-<U833F> \xD3\x7A |0
-<U8340> \xAF\xFB |0
-<U8341> \xD3\x7B |0
-<U8342> \xD3\xA1 |0
-<U8343> \xAF\xFE |0
-<U8344> \xD3\x75 |0
-<U8345> \xD3\xAF |0
-<U8347> \xD3\xAE |0
-<U8348> \xD3\xB6 |0
-<U8349> \xAF\xF3 |0
-<U834A> \xAF\xF0 |0
-<U834B> \xD3\xB4 |0
-<U834C> \xD3\xB0 |0
-<U834D> \xD3\xA7 |0
-<U834E> \xD3\xA2 |0
-<U834F> \xAF\xF6 |0
-<U8350> \xAF\xF2 |0
-<U8351> \xD3\x77 |0
-<U8352> \xAF\xEE |0
-<U8353> \xD3\xB1 |0
-<U8354> \xAF\xEF |0
-<U8356> \xD3\x79 |0
-<U8357> \x99\xB4 |0
-<U8362> \x8E\xF5 |0
-<U8363> \xFD\x55 |0
-<U8366> \x9C\xCD |0
-<U836F> \x89\x78 |0
-<U8373> \xD7\x5E |0
-<U8374> \xD7\x60 |0
-<U8375> \xD7\x65 |0
-<U8376> \xD7\x79 |0
-<U8377> \xB2\xFC |0
-<U8378> \xB2\xF2 |0
-<U837A> \xD7\x5D |0
-<U837B> \xB2\xFD |0
-<U837C> \xB2\xFE |0
-<U837D> \xD7\x68 |0
-<U837E> \xD7\x6F |0
-<U837F> \xD7\x75 |0
-<U8381> \xD7\x62 |0
-<U8383> \xD7\x69 |0
-<U8385> \x8F\x53 |0
-<U8386> \xB3\x40 |0
-<U8387> \xD7\x77 |0
-<U8388> \xD7\x72 |0
-<U8389> \xB2\xFA |0
-<U838A> \xB2\xF8 |0
-<U838B> \xD7\x6E |0
-<U838C> \xD7\x6A |0
-<U838D> \xD7\x5C |0
-<U838E> \xB2\xEF |0
-<U838F> \xD7\x61 |0
-<U8390> \xD7\x59 |0
-<U8391> \x8F\x6F |0
-<U8392> \xB2\xF7 |0
-<U8393> \xB2\xF9 |0
-<U8394> \xD7\x66 |0
-<U8395> \xD7\x63 |0
-<U8396> \xB2\xF4 |0
-<U8397> \xD7\x73 |0
-<U8398> \xB2\xF1 |0
-<U8399> \xD7\x64 |0
-<U839A> \xD7\x7A |0
-<U839B> \xD7\x6C |0
-<U839C> \x8E\x63 |0
-<U839D> \xD7\x6B |0
-<U839E> \xB2\xF0 |0
-<U83A0> \xB2\xFB |0
-<U83A2> \xB2\xF3 |0
-<U83A3> \xD7\x5A |0
-<U83A4> \xD7\x5F |0
-<U83A5> \xD7\x70 |0
-<U83A6> \xD7\x76 |0
-<U83A7> \xB3\x41 |0
-<U83A8> \xD7\x5B |0
-<U83A9> \xD7\x67 |0
-<U83AA> \xD7\x6D |0
-<U83AB> \xB2\xF6 |0
-<U83AC> \x8F\x56 |0
-<U83AE> \xD7\x78 |0
-<U83AF> \xD7\x71 |0
-<U83B0> \xD7\x74 |0
-<U83B9> \xFE\x76 |0
-<U83BD> \xB2\xF5 |0
-<U83BE> \x9F\xC6 |0
-<U83BF> \xDB\x6C |0
-<U83C0> \xDB\x60 |0
-<U83C1> \xB5\xD7 |0
-<U83C2> \xDB\x7D |0
-<U83C3> \xDB\xA7 |0
-<U83C4> \xDB\xAA |0
-<U83C5> \xB5\xD5 |0
-<U83C6> \xDB\x68 |0
-<U83C7> \xDB\xA3 |0
-<U83C8> \xDB\x69 |0
-<U83C9> \xDB\x77 |0
-<U83CA> \xB5\xE2 |0
-<U83CB> \xDB\x73 |0
-<U83CC> \xB5\xDF |0
-<U83CD> \xFA\xAC |0
-<U83CE> \xDB\x74 |0
-<U83CF> \xDB\x5D |0
-<U83D1> \xDB\xA4 |0
-<U83D3> \x8F\x58 |0
-<U83D4> \xB5\xE8 |0
-<U83D5> \xDB\xA1 |0
-<U83D6> \xDB\x75 |0
-<U83D7> \xDB\xAC |0
-<U83D8> \xDB\x70 |0
-<U83D9> \xDF\xC8 |0
-<U83DB> \xDB\xAF |0
-<U83DC> \xB5\xE6 |0
-<U83DD> \xDB\x6E |0
-<U83DE> \xDB\x7A |0
-<U83DF> \xB5\xE9 |0
-<U83E0> \xB5\xD4 |0
-<U83E1> \xDB\x72 |0
-<U83E2> \xDB\xAD |0
-<U83E3> \xDB\x6B |0
-<U83E4> \xDB\x64 |0
-<U83E5> \xDB\x6F |0
-<U83E7> \xDB\x63 |0
-<U83E8> \xDB\x61 |0
-<U83E9> \xB5\xD0 |0
-<U83EA> \xDB\xA5 |0
-<U83EB> \xDB\x6A |0
-<U83EC> \xDB\xA8 |0
-<U83ED> \x98\x48 |0
-<U83EE> \xDB\xA9 |0
-<U83EF> \xB5\xD8 |0
-<U83F0> \xB5\xDD |0
-<U83F1> \xB5\xD9 |0
-<U83F2> \xB5\xE1 |0
-<U83F3> \xDB\x7E |0
-<U83F4> \xB5\xDA |0
-<U83F5> \xDB\x76 |0
-<U83F6> \xDB\x66 |0
-<U83F8> \xB5\xD2 |0
-<U83F9> \xDB\x5E |0
-<U83FA> \xDB\xA2 |0
-<U83FB> \xDB\xAB |0
-<U83FC> \xDB\x65 |0
-<U83FD> \xB5\xE0 |0
-<U83FE> \xDB\xB0 |0
-<U83FF> \xDB\x71 |0
-<U8401> \xDB\x6D |0
-<U8403> \xB5\xD1 |0
-<U8404> \xB5\xE5 |0
-<U8405> \x99\xB7 |0
-<U8406> \xDB\x7C |0
-<U8407> \xB5\xE7 |0
-<U8409> \xDB\x78 |0
-<U840A> \xB5\xDC |0
-<U840B> \xB5\xD6 |0
-<U840C> \xB5\xDE |0
-<U840D> \xB5\xD3 |0
-<U840E> \xB5\xE4 |0
-<U840F> \xDB\x79 |0
-<U8410> \xDB\x67 |0
-<U8411> \xDB\x7B |0
-<U8412> \xDB\x62 |0
-<U8413> \xDB\xA6 |0
-<U8414> \x96\x65 |0
-<U8416> \xFA\x6C |0
-<U8418> \x9D\xE7 |0
-<U841B> \xDB\xAE |0
-<U841C> \x9E\x62 |0
-<U8420> \x96\xCC |0
-<U8421> \x8E\x67 |0
-<U8423> \xDB\x5F |0
-<U8424> \xFC\x75 |0
-<U8426> \x98\x7E |0
-<U8429> \xDF\xC7 |0
-<U842B> \xDF\xDD |0
-<U842C> \xB8\x55 |0
-<U842D> \xDF\xCC |0
-<U842E> \xFD\xB9 |0
-<U842F> \xDF\xCA |0
-<U8430> \xDF\xB5 |0
-<U8431> \xB8\xA9 |0
-<U8432> \xDF\xC5 |0
-<U8433> \xDF\xD9 |0
-<U8434> \xDF\xC1 |0
-<U8435> \xB8\xB1 |0
-<U8436> \xDF\xD8 |0
-<U8437> \xDF\xBF |0
-<U8438> \xB5\xE3 |0
-<U8439> \xDF\xCF |0
-<U843A> \xDF\xC0 |0
-<U843B> \xDF\xD6 |0
-<U843C> \xB8\xB0 |0
-<U843D> \xB8\xA8 |0
-<U843E> \x97\xFC |0
-<U843F> \xDF\xAA |0
-<U8440> \xDF\xB2 |0
-<U8442> \xDF\xCB |0
-<U8443> \xDF\xC3 |0
-<U8444> \xDF\xDC |0
-<U8445> \xDF\xC6 |0
-<U8446> \xB8\xB6 |0
-<U8447> \xDF\xD7 |0
-<U8448> \x98\xF9 |0
-<U8449> \xB8\xAD |0
-<U844A> \x8F\x66 |0
-<U844B> \xDF\xC9 |0
-<U844C> \xDF\xD1 |0
-<U844D> \xDF\xB6 |0
-<U844E> \xDF\xD0 |0
-<U8450> \xDF\xE1 |0
-<U8451> \xDF\xB1 |0
-<U8452> \xDF\xD2 |0
-<U8453> \x95\x6E |0
-<U8454> \xDF\xDF |0
-<U8455> \x92\x45 |0
-<U8456> \xDF\xAB |0
-<U8457> \xB5\xDB |0
-<U8458> \x8F\x60 |0
-<U8459> \xDF\xB9 |0
-<U845A> \xDF\xB8 |0
-<U845B> \xB8\xAF |0
-<U845C> \x9E\xD1 |0
-<U845D> \xDF\xBC |0
-<U845E> \xDF\xBE |0
-<U845F> \xDF\xCD |0
-<U8460> \xDF\xDE |0
-<U8461> \xB8\xB2 |0
-<U8462> \xFE\xCD |0
-<U8463> \xB8\xB3 |0
-<U8464> \x99\xB9 |0
-<U8465> \xDF\xB0 |0
-<U8466> \xB8\xAB |0
-<U8467> \xDF\xB4 |0
-<U8468> \xDF\xDA |0
-<U8469> \xB8\xB4 |0
-<U846B> \xB8\xAC |0
-<U846C> \xB8\xAE |0
-<U846D> \xB8\xB5 |0
-<U846E> \xDF\xE0 |0
-<U846F> \xDF\xD3 |0
-<U8470> \xDF\xCE |0
-<U8471> \x8F\x62 |0
-<U8472> \x97\x4C |0
-<U8473> \xDF\xBB |0
-<U8474> \xDF\xBA |0
-<U8475> \xB8\xAA |0
-<U8476> \xDF\xAC |0
-<U8477> \xB8\xA7 |0
-<U8478> \xDF\xC4 |0
-<U8479> \xDF\xAD |0
-<U847A> \xDF\xC2 |0
-<U847D> \xDF\xB7 |0
-<U847E> \xDF\xDB |0
-<U847F> \x91\xC7 |0
-<U8480> \x95\x5F |0
-<U8482> \xB8\xA6 |0
-<U8486> \xDF\xB3 |0
-<U8488> \x99\xBB |0
-<U848D> \xDF\xAF |0
-<U848E> \xDF\xD5 |0
-<U848F> \xDF\xAE |0
-<U8490> \xBB\x60 |0
-<U8491> \xE3\xD3 |0
-<U8492> \x8E\x6D |0
-<U8493> \x8F\x71 |0
-<U8494> \xE3\xC2 |0
-<U8496> \x94\xCB |0
-<U8497> \xE3\xAC |0
-<U8498> \xE3\xCA |0
-<U8499> \xBB\x58 |0
-<U849A> \xE3\xBB |0
-<U849B> \xE3\xC5 |0
-<U849C> \xBB\x5B |0
-<U849D> \xE3\xBE |0
-<U849E> \xBB\x59 |0
-<U849F> \xE3\xAF |0
-<U84A0> \xE3\xCD |0
-<U84A1> \xE3\xAE |0
-<U84A2> \xE3\xC1 |0
-<U84A3> \x95\xB1 |0
-<U84A4> \xE3\xAD |0
-<U84A7> \xE3\xBF |0
-<U84A8> \xE3\xC8 |0
-<U84A9> \xE3\xC6 |0
-<U84AA> \xE3\xBA |0
-<U84AB> \xE3\xB5 |0
-<U84AC> \xE3\xB3 |0
-<U84AD> \x9A\xF2 |0
-<U84AE> \xE3\xB4 |0
-<U84AF> \xE3\xC7 |0
-<U84B0> \xE3\xD2 |0
-<U84B1> \xE3\xBC |0
-<U84B2> \xBB\x5A |0
-<U84B4> \xE3\xB7 |0
-<U84B6> \xE3\xCB |0
-<U84B8> \xBB\x5D |0
-<U84B9> \xE3\xB6 |0
-<U84BA> \xE3\xB0 |0
-<U84BB> \xE3\xC0 |0
-<U84BC> \xBB\x61 |0
-<U84BD> \x96\xC3 |0
-<U84BE> \x99\xBD |0
-<U84BF> \xBB\x55 |0
-<U84C0> \xBB\x5E |0
-<U84C1> \xE3\xB8 |0
-<U84C2> \xE3\xB2 |0
-<U84C4> \xBB\x57 |0
-<U84C5> \xDF\xD4 |0
-<U84C6> \xBB\x56 |0
-<U84C7> \xE3\xC3 |0
-<U84C9> \xBB\x54 |0
-<U84CA> \xBB\x63 |0
-<U84CB> \xBB\x5C |0
-<U84CC> \xE3\xC4 |0
-<U84CD> \xE3\xB9 |0
-<U84CE> \xE3\xB1 |0
-<U84CF> \xE3\xCC |0
-<U84D0> \xE3\xBD |0
-<U84D1> \xBB\x62 |0
-<U84D2> \xE3\xD0 |0
-<U84D3> \xBB\x5F |0
-<U84D4> \xE3\xCF |0
-<U84D6> \xE3\xC9 |0
-<U84D7> \xE3\xCE |0
-<U84DA> \xA0\xCF |0
-<U84DB> \xE3\xD1 |0
-<U84DE> \x8F\x6D |0
-<U84E1> \x99\xBE |0
-<U84E2> \x8E\xF4 |0
-<U84E4> \x8F\x72 |0
-<U84E5> \x95\xE4 |0
-<U84E7> \xE7\x73 |0
-<U84E8> \xE7\x74 |0
-<U84E9> \xE7\x67 |0
-<U84EA> \xE7\x66 |0
-<U84EB> \xE7\x62 |0
-<U84EC> \xBD\xB4 |0
-<U84EE> \xBD\xAC |0
-<U84EF> \xE7\x76 |0
-<U84F0> \xE7\x75 |0
-<U84F1> \xDF\xA9 |0
-<U84F2> \xE7\x5F |0
-<U84F3> \xE7\x63 |0
-<U84F4> \xE7\x5D |0
-<U84F6> \xE7\x70 |0
-<U84F7> \xE7\x61 |0
-<U84F8> \x99\xBF |0
-<U84F9> \xE7\x77 |0
-<U84FA> \xE7\x5A |0
-<U84FB> \xE7\x58 |0
-<U84FC> \xE7\x64 |0
-<U84FD> \xE7\x6E |0
-<U84FE> \xE7\x69 |0
-<U84FF> \xBD\xB6 |0
-<U8500> \xE7\x4F |0
-<U8502> \xE7\x6D |0
-<U8503> \x92\x42 |0
-<U8505> \xFB\xA5 |0
-<U8506> \xBD\xB7 |0
-<U8507> \xDF\xBD |0
-<U8508> \xE7\x5B |0
-<U8509> \xE7\x52 |0
-<U850A> \xE7\x55 |0
-<U850B> \xE7\x7B |0
-<U850C> \xE7\x5C |0
-<U850D> \xE7\x53 |0
-<U850E> \xE7\x51 |0
-<U850F> \xE7\x4E |0
-<U8510> \x99\xC0 |0
-<U8511> \xBD\xB0 |0
-<U8512> \xE7\x65 |0
-<U8513> \xBD\xAF |0
-<U8514> \xBD\xB3 |0
-<U8515> \xE7\x60 |0
-<U8516> \xE7\x68 |0
-<U8517> \xBD\xA9 |0
-<U8518> \xE7\x78 |0
-<U8519> \xE7\x7C |0
-<U851A> \xBD\xAB |0
-<U851C> \xE7\x57 |0
-<U851D> \xE7\x6B |0
-<U851E> \xE7\x6F |0
-<U851F> \xE7\x54 |0
-<U8520> \xE7\x79 |0
-<U8521> \xBD\xB2 |0
-<U8523> \xBD\xB1 |0
-<U8524> \xE7\x4C |0
-<U8525> \xBD\xB5 |0
-<U8526> \xE7\x72 |0
-<U8527> \xE7\x56 |0
-<U8528> \xE7\x6A |0
-<U8529> \xE7\x50 |0
-<U852A> \xE7\x5E |0
-<U852B> \xE7\x59 |0
-<U852C> \xBD\xAD |0
-<U852D> \xBD\xAE |0
-<U852E> \xE7\x6C |0
-<U852F> \xE7\x7D |0
-<U8530> \xE7\x7A |0
-<U8531> \xE7\x71 |0
-<U8533> \xFD\xB4 |0
-<U8534> \x8F\x77 |0
-<U8538> \x99\xC1 |0
-<U853B> \xE7\x4D |0
-<U853D> \xBD\xAA |0
-<U853E> \xEB\x49 |0
-<U8540> \xEB\x40 |0
-<U8541> \xEB\x43 |0
-<U8542> \xFA\xB9 |0
-<U8543> \xBF\xBB |0
-<U8544> \xEB\x45 |0
-<U8545> \xEA\xF9 |0
-<U8546> \xEB\x41 |0
-<U8547> \xEB\x47 |0
-<U8548> \xBF\xB8 |0
-<U8549> \xBF\xBC |0
-<U854A> \xBF\xB6 |0
-<U854B> \x8F\x40 |0
-<U854C> \xFA\x44 |0
-<U854D> \xEA\xFB |0
-<U854E> \xEB\x4C |0
-<U8551> \xEB\x46 |0
-<U8552> \x99\xC2 |0
-<U8553> \xEA\xFC |0
-<U8554> \xEB\x55 |0
-<U8555> \xEB\x4F |0
-<U8556> \xEA\xF8 |0
-<U8557> \xEE\x46 |0
-<U8558> \xEA\xFE |0
-<U8559> \xBF\xB7 |0
-<U855A> \x8F\x5C |0
-<U855B> \xEB\x4A |0
-<U855D> \xEB\x54 |0
-<U855E> \xBF\xBF |0
-<U855F> \x8C\xBD |0
-<U8560> \xEB\x51 |0
-<U8561> \xEA\xFD |0
-<U8562> \xEB\x44 |0
-<U8563> \xEB\x48 |0
-<U8564> \xEB\x42 |0
-<U8565> \xEB\x56 |0
-<U8566> \xEB\x53 |0
-<U8567> \xEB\x50 |0
-<U8568> \xBF\xB9 |0
-<U8569> \xBF\xBA |0
-<U856A> \xBF\xBE |0
-<U856B> \xEA\xFA |0
-<U856C> \xEB\x57 |0
-<U856D> \xBF\xBD |0
-<U856E> \xEB\x4D |0
-<U856F> \x99\xC4 |0
-<U8570> \x99\xC5 |0
-<U8571> \xEB\x4B |0
-<U8573> \x8F\x7B |0
-<U8575> \xEB\x4E |0
-<U8576> \xEE\x53 |0
-<U8577> \xEE\x40 |0
-<U8578> \xEE\x45 |0
-<U8579> \xEE\x52 |0
-<U857A> \xEE\x44 |0
-<U857B> \xED\xFB |0
-<U857C> \xEE\x41 |0
-<U857E> \xC1\xA2 |0
-<U8580> \xED\xF4 |0
-<U8581> \xEE\x4D |0
-<U8582> \xEE\x4F |0
-<U8583> \xED\xF3 |0
-<U8584> \xC1\xA1 |0
-<U8585> \xEE\x51 |0
-<U8586> \xEE\x49 |0
-<U8587> \xC1\xA8 |0
-<U8588> \xEE\x50 |0
-<U8589> \xEE\x42 |0
-<U858A> \xC1\xAA |0
-<U858B> \xED\xF9 |0
-<U858C> \xEB\x52 |0
-<U858D> \xEE\x4A |0
-<U858E> \xEE\x47 |0
-<U858F> \xED\xF5 |0
-<U8590> \xEE\x55 |0
-<U8591> \xC1\xA4 |0
-<U8594> \xC1\xA5 |0
-<U8595> \xED\xF7 |0
-<U8596> \xEE\x48 |0
-<U8597> \x8C\xB6 |0
-<U8598> \xEE\x54 |0
-<U8599> \xEE\x4B |0
-<U859A> \xED\xFD |0
-<U859B> \xC1\xA7 |0
-<U859C> \xC1\xA3 |0
-<U859D> \xEE\x4C |0
-<U859E> \xED\xFE |0
-<U859F> \xEE\x56 |0
-<U85A0> \xED\xF8 |0
-<U85A1> \xEE\x43 |0
-<U85A2> \xEE\x4E |0
-<U85A3> \xED\xFA |0
-<U85A4> \xED\xFC |0
-<U85A6> \xC2\xCB |0
-<U85A7> \xED\xF6 |0
-<U85A8> \xC1\xA9 |0
-<U85A9> \xC2\xC4 |0
-<U85AA> \xC1\x7E |0
-<U85AF> \xC1\xA6 |0
-<U85B0> \xC2\xC8 |0
-<U85B1> \xF0\xB3 |0
-<U85B3> \xF0\xA9 |0
-<U85B4> \xF0\xA4 |0
-<U85B5> \xF0\xAA |0
-<U85B6> \xF0\xB4 |0
-<U85B7> \xF0\xB8 |0
-<U85B8> \xF0\xB7 |0
-<U85B9> \xC2\xCA |0
-<U85BA> \xC2\xC9 |0
-<U85BD> \xF0\xAB |0
-<U85BE> \xF0\xB9 |0
-<U85BF> \xF0\xAE |0
-<U85C0> \xF0\xA6 |0
-<U85C1> \x8F\xA3 |0
-<U85C2> \xF0\xA8 |0
-<U85C3> \xF0\xA7 |0
-<U85C4> \xF0\xAD |0
-<U85C5> \xF0\xB2 |0
-<U85C6> \xF0\xA5 |0
-<U85C7> \xF0\xAC |0
-<U85C8> \xF0\xB1 |0
-<U85C9> \xC2\xC7 |0
-<U85CB> \xF0\xAF |0
-<U85CD> \xC2\xC5 |0
-<U85CE> \xF0\xB0 |0
-<U85CF> \xC2\xC3 |0
-<U85D0> \xC2\xC6 |0
-<U85D1> \xF2\xD5 |0
-<U85D2> \xF0\xB5 |0
-<U85D5> \xC3\xC2 |0
-<U85D6> \x8C\xCE |0
-<U85D7> \xF2\xCD |0
-<U85D8> \xF2\xD1 |0
-<U85D9> \xF2\xC9 |0
-<U85DA> \xF2\xCC |0
-<U85DC> \xF2\xD4 |0
-<U85DD> \xC3\xC0 |0
-<U85DE> \xF2\xD9 |0
-<U85DF> \xF2\xD2 |0
-<U85E0> \x99\xC6 |0
-<U85E1> \xF2\xCA |0
-<U85E2> \xF2\xDA |0
-<U85E3> \xF2\xD3 |0
-<U85E4> \xC3\xC3 |0
-<U85E5> \xC3\xC4 |0
-<U85E6> \xF2\xD7 |0
-<U85E8> \xF2\xCB |0
-<U85E9> \xC3\xBF |0
-<U85EA> \xC3\xC1 |0
-<U85EB> \xF2\xC6 |0
-<U85EC> \xF2\xCE |0
-<U85ED> \xF2\xC8 |0
-<U85EE> \x96\xCD |0
-<U85EF> \xF2\xD8 |0
-<U85F0> \xF2\xD6 |0
-<U85F1> \xF2\xC7 |0
-<U85F2> \xF2\xCF |0
-<U85F6> \xF4\xBE |0
-<U85F7> \xC3\xC5 |0
-<U85F8> \xF2\xD0 |0
-<U85F9> \xC4\xA7 |0
-<U85FA> \xC4\xA9 |0
-<U85FB> \xC4\xA6 |0
-<U85FC> \x96\xC7 |0
-<U85FD> \xF4\xC3 |0
-<U85FE> \xF4\xBB |0
-<U85FF> \xF4\xB9 |0
-<U8600> \xF4\xBD |0
-<U8601> \xF4\xBA |0
-<U8602> \x8F\xA5 |0
-<U8604> \xF4\xBF |0
-<U8605> \xF4\xC1 |0
-<U8606> \xC4\xAA |0
-<U8607> \xC4\xAC |0
-<U8609> \xF4\xC0 |0
-<U860A> \xC4\xAD |0
-<U860B> \xC4\xAB |0
-<U860C> \xF4\xC2 |0
-<U860D> \xFA\xBB |0
-<U860F> \x8C\x61 |0
-<U8610> \x95\x70 |0
-<U8611> \xC4\xA8 |0
-<U8614> \x93\x68 |0
-<U8616> \x8F\x7E |0
-<U8617> \xC4\xF4 |0
-<U8618> \xF5\xF1 |0
-<U8619> \xF5\xF7 |0
-<U861A> \xC4\xF6 |0
-<U861B> \xF4\xBC |0
-<U861C> \xF5\xF6 |0
-<U861E> \xF5\xFD |0
-<U861F> \xF5\xF4 |0
-<U8620> \xF5\xFB |0
-<U8621> \xF5\xFA |0
-<U8622> \xF4\xB8 |0
-<U8623> \xF5\xF5 |0
-<U8624> \xF0\xB6 |0
-<U8625> \xF5\xFE |0
-<U8626> \xF5\xF3 |0
-<U8627> \xF5\xF8 |0
-<U8628> \x8F\xAA |0
-<U8629> \xF5\xFC |0
-<U862A> \xF5\xF2 |0
-<U862C> \xF7\x4A |0
-<U862D> \xC4\xF5 |0
-<U862E> \xF5\xF9 |0
-<U862F> \xA0\x50 |0
-<U8631> \xF7\xF4 |0
-<U8632> \xF7\x4B |0
-<U8633> \xF7\x49 |0
-<U8634> \xF7\x47 |0
-<U8635> \xF7\x48 |0
-<U8636> \xF7\x4C |0
-<U8638> \xC5\xD9 |0
-<U8639> \xF7\xF2 |0
-<U863A> \xF7\xF0 |0
-<U863B> \xF7\xF5 |0
-<U863C> \xF7\xF3 |0
-<U863E> \xF7\xF6 |0
-<U863F> \xC5\xDA |0
-<U8640> \xF7\xF1 |0
-<U8642> \x90\xD3 |0
-<U8643> \xF8\xBC |0
-<U8645> \x95\x56 |0
-<U8646> \xF9\x45 |0
-<U8647> \xF9\x46 |0
-<U8648> \xF9\x47 |0
-<U864B> \xF9\xC7 |0
-<U864C> \xF9\xBD |0
-<U864D> \xCA\x4F |0
-<U864E> \xAA\xEA |0
-<U8650> \xAD\x68 |0
-<U8652> \xD3\xB8 |0
-<U8653> \xD3\xB7 |0
-<U8654> \xB0\x40 |0
-<U8655> \xB3\x42 |0
-<U8656> \xD7\x7C |0
-<U8659> \xD7\x7B |0
-<U865B> \xB5\xEA |0
-<U865C> \xB8\xB8 |0
-<U865E> \xB8\xB7 |0
-<U865F> \xB8\xB9 |0
-<U8661> \xE3\xD4 |0
-<U8662> \xE7\x7E |0
-<U8663> \xEB\x58 |0
-<U8664> \xEB\x5A |0
-<U8665> \xEB\x59 |0
-<U8667> \xC1\xAB |0
-<U8668> \xEE\x57 |0
-<U8669> \xF0\xBA |0
-<U866A> \xF9\xA5 |0
-<U866B> \xA6\xE4 |0
-<U866C> \x8F\xB8 |0
-<U866D> \xCD\xC9 |0
-<U866E> \xCD\xCA |0
-<U866F> \xCD\xC8 |0
-<U8670> \xCD\xC7 |0
-<U8671> \xAA\xEB |0
-<U8672> \x99\xC8 |0
-<U8673> \xD0\xA9 |0
-<U8674> \xD0\xA7 |0
-<U8677> \xD0\xA6 |0
-<U8679> \xAD\x69 |0
-<U867A> \xAD\x6B |0
-<U867B> \xAD\x6A |0
-<U867C> \xD0\xA8 |0
-<U867E> \x8F\xAF |0
-<U8685> \xD3\xC4 |0
-<U8686> \xD3\xC1 |0
-<U8687> \xD3\xBF |0
-<U868A> \xB0\x41 |0
-<U868B> \xD3\xC2 |0
-<U868C> \xB0\x46 |0
-<U868D> \xD3\xBC |0
-<U868E> \xD3\xCB |0
-<U8690> \xD3\xCD |0
-<U8691> \xD3\xBD |0
-<U8692> \x99\xC9 |0
-<U8693> \xB0\x43 |0
-<U8694> \xD3\xCE |0
-<U8695> \xD3\xC9 |0
-<U8696> \xD3\xBB |0
-<U8697> \xD3\xC0 |0
-<U8698> \xD3\xCA |0
-<U8699> \xD3\xC6 |0
-<U869A> \xD3\xC3 |0
-<U869C> \xB0\x48 |0
-<U869D> \xD3\xCC |0
-<U869E> \xD3\xBE |0
-<U86A0> \x95\x79 |0
-<U86A1> \xD3\xC7 |0
-<U86A2> \xD3\xB9 |0
-<U86A3> \xB0\x47 |0
-<U86A4> \xB0\x44 |0
-<U86A5> \xD3\xC5 |0
-<U86A7> \xD3\xC8 |0
-<U86A8> \xD3\xBA |0
-<U86A9> \xB0\x45 |0
-<U86AA> \xB0\x42 |0
-<U86AD> \x9F\x49 |0
-<U86AF> \xB3\x4C |0
-<U86B0> \xD7\xA5 |0
-<U86B1> \xB3\x4B |0
-<U86B2> \x99\xCA |0
-<U86B3> \xD7\xA8 |0
-<U86B4> \xD7\xAB |0
-<U86B5> \xB3\x48 |0
-<U86B6> \xB3\x46 |0
-<U86B7> \xD7\x7E |0
-<U86B8> \xD7\xA9 |0
-<U86B9> \xD7\xA7 |0
-<U86BA> \xD7\xA4 |0
-<U86BB> \xD7\xAC |0
-<U86BC> \xD7\xAD |0
-<U86BD> \xD7\xAF |0
-<U86BE> \xD7\xB0 |0
-<U86BF> \xD7\x7D |0
-<U86C0> \xB3\x45 |0
-<U86C1> \xD7\xA2 |0
-<U86C2> \xD7\xA1 |0
-<U86C3> \xD7\xAE |0
-<U86C4> \xB3\x47 |0
-<U86C5> \xD7\xA3 |0
-<U86C6> \xB3\x49 |0
-<U86C7> \xB3\x44 |0
-<U86C8> \xD7\xA6 |0
-<U86C9> \xB3\x4D |0
-<U86CB> \xB3\x4A |0
-<U86CC> \xD7\xAA |0
-<U86D0> \xB5\xF1 |0
-<U86D1> \xDB\xBF |0
-<U86D3> \xDB\xB4 |0
-<U86D4> \xB5\xEE |0
-<U86D6> \xDF\xE7 |0
-<U86D7> \xDB\xBD |0
-<U86D8> \xDB\xB1 |0
-<U86D9> \xB5\xEC |0
-<U86DA> \xDB\xB6 |0
-<U86DB> \xB5\xEF |0
-<U86DC> \xDB\xBA |0
-<U86DD> \xDB\xB8 |0
-<U86DE> \xB5\xF2 |0
-<U86DF> \xB5\xEB |0
-<U86E2> \xDB\xB2 |0
-<U86E3> \xDB\xB5 |0
-<U86E4> \xB5\xF0 |0
-<U86E6> \xDB\xB3 |0
-<U86E8> \xDB\xBE |0
-<U86E9> \xDB\xBC |0
-<U86EA> \xDB\xB7 |0
-<U86EB> \xDB\xB9 |0
-<U86EC> \xDB\xBB |0
-<U86ED> \xB5\xED |0
-<U86EF> \x99\xCB |0
-<U86F5> \xDF\xE8 |0
-<U86F6> \xDF\xEE |0
-<U86F7> \xDF\xE4 |0
-<U86F8> \xDF\xEA |0
-<U86F9> \xB8\xBA |0
-<U86FA> \xDF\xE6 |0
-<U86FB> \xB8\xC0 |0
-<U86FE> \xB8\xBF |0
-<U8700> \xB8\xBE |0
-<U8701> \xDF\xED |0
-<U8702> \xB8\xC1 |0
-<U8703> \xB8\xC2 |0
-<U8704> \xDF\xE3 |0
-<U8705> \xDF\xF0 |0
-<U8706> \xB8\xC3 |0
-<U8707> \xB8\xBD |0
-<U8708> \xB8\xBC |0
-<U8709> \xDF\xEC |0
-<U870A> \xB8\xC4 |0
-<U870B> \xDF\xE2 |0
-<U870C> \xDF\xE5 |0
-<U870D> \xDF\xEF |0
-<U870E> \xDF\xEB |0
-<U8711> \xE3\xF4 |0
-<U8712> \xE3\xE9 |0
-<U8713> \xB8\xBB |0
-<U8718> \xBB\x6A |0
-<U8719> \xE3\xDD |0
-<U871A> \xE3\xF2 |0
-<U871B> \xE3\xDE |0
-<U871C> \xBB\x65 |0
-<U871E> \xE3\xDB |0
-<U8720> \xE3\xE4 |0
-<U8721> \xE3\xDC |0
-<U8722> \xBB\x67 |0
-<U8723> \xE3\xD6 |0
-<U8724> \xE3\xF1 |0
-<U8725> \xBB\x68 |0
-<U8726> \xE3\xEE |0
-<U8727> \xE3\xEF |0
-<U8728> \xE3\xD7 |0
-<U8729> \xBB\x6D |0
-<U872A> \xE3\xE6 |0
-<U872C> \xE3\xE0 |0
-<U872D> \xE3\xE7 |0
-<U872E> \xE3\xDA |0
-<U8730> \xE3\xF3 |0
-<U8731> \xE3\xEB |0
-<U8732> \xE3\xE5 |0
-<U8733> \xE3\xD5 |0
-<U8734> \xBB\x69 |0
-<U8735> \xE3\xEC |0
-<U8737> \xBB\x6C |0
-<U8738> \xE3\xF0 |0
-<U873A> \xE3\xEA |0
-<U873B> \xBB\x66 |0
-<U873C> \xE3\xE8 |0
-<U873E> \xE3\xE2 |0
-<U873F> \xBB\x64 |0
-<U8740> \xE3\xD9 |0
-<U8741> \xE3\xE1 |0
-<U8742> \xE3\xED |0
-<U8743> \xE3\xDF |0
-<U8746> \xE3\xE3 |0
-<U874C> \xBD\xC1 |0
-<U874D> \xDF\xE9 |0
-<U874E> \xE7\xB2 |0
-<U874F> \xE7\xBB |0
-<U8750> \xE7\xB1 |0
-<U8751> \xE7\xAD |0
-<U8752> \xE7\xAA |0
-<U8753> \xBD\xC2 |0
-<U8754> \xE7\xA8 |0
-<U8755> \xBB\x6B |0
-<U8756> \xE7\xA1 |0
-<U8757> \xBD\xC0 |0
-<U8758> \xE7\xA7 |0
-<U8759> \xBD\xBF |0
-<U875A> \xE7\xAC |0
-<U875B> \xE7\xA9 |0
-<U875C> \xE7\xB9 |0
-<U875D> \xE7\xB4 |0
-<U875E> \xE7\xAE |0
-<U875F> \xE7\xB3 |0
-<U8760> \xBD\xBB |0
-<U8761> \xE7\xAB |0
-<U8762> \xE7\xBE |0
-<U8763> \xE7\xA2 |0
-<U8764> \xE7\xA3 |0
-<U8765> \xE7\xBA |0
-<U8766> \xBD\xBC |0
-<U8767> \xE7\xBF |0
-<U8768> \xBD\xBE |0
-<U8769> \xE7\xC0 |0
-<U876A> \xE7\xB0 |0
-<U876B> \xE3\xD8 |0
-<U876C> \xE7\xB6 |0
-<U876D> \xE7\xAF |0
-<U876E> \xE7\xB8 |0
-<U876F> \xE7\xB5 |0
-<U8770> \x9D\xD5 |0
-<U8771> \x8F\xB0 |0
-<U8773> \xE7\xA6 |0
-<U8774> \xBD\xB9 |0
-<U8775> \xE7\xBD |0
-<U8776> \xBD\xBA |0
-<U8777> \xE7\xA4 |0
-<U8778> \xBD\xBD |0
-<U8779> \xEB\x64 |0
-<U877A> \xE7\xB7 |0
-<U877B> \xE7\xBC |0
-<U877D> \xFA\x7A |0
-<U8781> \xEB\x61 |0
-<U8782> \xBD\xB8 |0
-<U8783> \xBF\xC0 |0
-<U8784> \xEB\x6B |0
-<U8785> \xEB\x67 |0
-<U8786> \x9E\x5F |0
-<U8787> \xEB\x65 |0
-<U8788> \xEB\x60 |0
-<U8789> \xEB\x6F |0
-<U878B> \x99\xCD |0
-<U878C> \xA0\xC9 |0
-<U878D> \xBF\xC4 |0
-<U878F> \xEB\x5C |0
-<U8790> \xEB\x68 |0
-<U8791> \xEB\x69 |0
-<U8792> \xEB\x5F |0
-<U8793> \xEB\x5E |0
-<U8794> \xEB\x6C |0
-<U8796> \xEB\x62 |0
-<U8797> \xEB\x5D |0
-<U8798> \xEB\x63 |0
-<U879A> \xEB\x6E |0
-<U879B> \xEB\x5B |0
-<U879C> \xEB\x6D |0
-<U879D> \xEB\x6A |0
-<U879E> \xBF\xC2 |0
-<U879F> \xBF\xC1 |0
-<U87A2> \xBF\xC3 |0
-<U87A3> \xEB\x66 |0
-<U87A4> \xF0\xCB |0
-<U87A5> \x9A\xDB |0
-<U87A9> \xA0\xC6 |0
-<U87AA> \xEE\x59 |0
-<U87AB> \xC1\xB1 |0
-<U87AC> \xEE\x5D |0
-<U87AD> \xEE\x5A |0
-<U87AE> \xEE\x61 |0
-<U87AF> \xEE\x67 |0
-<U87B0> \xEE\x5C |0
-<U87B1> \x8F\xB4 |0
-<U87B2> \xEE\x70 |0
-<U87B3> \xC1\xAE |0
-<U87B4> \xEE\x6A |0
-<U87B5> \xEE\x5F |0
-<U87B6> \xEE\x6B |0
-<U87B7> \xEE\x66 |0
-<U87B8> \xEE\x6D |0
-<U87B9> \xEE\x5E |0
-<U87BA> \xC1\xB3 |0
-<U87BB> \xC1\xB2 |0
-<U87BC> \xEE\x60 |0
-<U87BD> \xEE\x6E |0
-<U87BE> \xEE\x58 |0
-<U87BF> \xEE\x6C |0
-<U87C0> \xC1\xAC |0
-<U87C1> \xA0\xD7 |0
-<U87C2> \xEE\x64 |0
-<U87C3> \xEE\x63 |0
-<U87C4> \xEE\x68 |0
-<U87C5> \xEE\x5B |0
-<U87C6> \xC1\xB0 |0
-<U87C8> \xC1\xB4 |0
-<U87C9> \xEE\x62 |0
-<U87CA> \xEE\x69 |0
-<U87CB> \xC1\xB5 |0
-<U87CC> \xEE\x65 |0
-<U87CE> \xA0\xC7 |0
-<U87D1> \xC1\xAD |0
-<U87D2> \xC1\xAF |0
-<U87D3> \xF0\xC7 |0
-<U87D4> \xF0\xC5 |0
-<U87D6> \xA0\x43 |0
-<U87D7> \xF0\xCC |0
-<U87D8> \xF0\xC9 |0
-<U87D9> \xF0\xCD |0
-<U87DA> \x8F\xB5 |0
-<U87DB> \xF0\xBE |0
-<U87DC> \xF0\xC6 |0
-<U87DD> \xF0\xD1 |0
-<U87DE> \xEE\x6F |0
-<U87DF> \xF0\xC2 |0
-<U87E0> \xC2\xCF |0
-<U87E1> \xE7\xA5 |0
-<U87E2> \xF0\xBD |0
-<U87E3> \xF0\xCA |0
-<U87E4> \xF0\xC4 |0
-<U87E5> \xF0\xC1 |0
-<U87E6> \xF0\xBC |0
-<U87E7> \xF0\xBB |0
-<U87E8> \xF0\xD0 |0
-<U87EA> \xF0\xC0 |0
-<U87EB> \xF0\xBF |0
-<U87EC> \xC2\xCD |0
-<U87ED> \xF0\xC8 |0
-<U87EE> \x8F\xB2 |0
-<U87EF> \xC2\xCC |0
-<U87F2> \xC2\xCE |0
-<U87F3> \xF0\xC3 |0
-<U87F4> \xF0\xCF |0
-<U87F5> \xA0\x61 |0
-<U87F6> \xF2\xDE |0
-<U87F7> \xF2\xDF |0
-<U87F9> \xC3\xC9 |0
-<U87FA> \xF2\xDC |0
-<U87FB> \xC3\xC6 |0
-<U87FC> \xF2\xE4 |0
-<U87FE> \xC3\xCA |0
-<U87FF> \xF2\xE6 |0
-<U8800> \xF2\xDB |0
-<U8801> \xF0\xCE |0
-<U8802> \xF2\xE8 |0
-<U8803> \xF2\xDD |0
-<U8804> \x9E\x5E |0
-<U8805> \xC3\xC7 |0
-<U8806> \xF2\xE3 |0
-<U8808> \xF2\xE5 |0
-<U8809> \xF2\xE0 |0
-<U880A> \xF2\xE7 |0
-<U880B> \xF2\xE2 |0
-<U880C> \xF2\xE1 |0
-<U880D> \xC3\xC8 |0
-<U880F> \x8F\xB6 |0
-<U8810> \xF4\xC5 |0
-<U8811> \xF4\xC6 |0
-<U8813> \xF4\xC8 |0
-<U8814> \xC4\xAE |0
-<U8815> \xC4\xAF |0
-<U8816> \xF4\xC9 |0
-<U8817> \xF4\xC7 |0
-<U8818> \x9F\xE8 |0
-<U8819> \xF4\xC4 |0
-<U881B> \xF6\x42 |0
-<U881C> \xF6\x45 |0
-<U881D> \xF6\x41 |0
-<U881F> \xC4\xFA |0
-<U8820> \xF6\x43 |0
-<U8821> \xC4\xF9 |0
-<U8822> \xC4\xF8 |0
-<U8823> \xC4\xF7 |0
-<U8824> \xF6\x44 |0
-<U8825> \xF7\x51 |0
-<U8826> \xF7\x4F |0
-<U8827> \x9C\xB2 |0
-<U8828> \xF7\x4E |0
-<U8829> \xF6\x40 |0
-<U882A> \xF7\x50 |0
-<U882B> \xF6\x46 |0
-<U882C> \xF7\x4D |0
-<U882D> \x95\x7C |0
-<U882E> \xF7\xF9 |0
-<U882F> \xF7\xD7 |0
-<U8830> \xF7\xF7 |0
-<U8831> \xC5\xDB |0
-<U8832> \xF7\xF8 |0
-<U8833> \xF7\xFA |0
-<U8835> \xF8\xBF |0
-<U8836> \xC5\xFA |0
-<U8837> \xF8\xBE |0
-<U8838> \xF8\xBD |0
-<U8839> \xC5\xFB |0
-<U883B> \xC6\x5A |0
-<U883C> \xF9\x6E |0
-<U883D> \xF9\xA7 |0
-<U883E> \xF9\xA6 |0
-<U883F> \xF9\xA8 |0
-<U8840> \xA6\xE5 |0
-<U8841> \xD0\xAA |0
-<U8842> \x9F\xC7 |0
-<U8843> \xD3\xCF |0
-<U8844> \xD3\xD0 |0
-<U8845> \x8F\xBB |0
-<U8846> \x8F\xBC |0
-<U8848> \xDB\xC0 |0
-<U884A> \xF6\x47 |0
-<U884B> \xF8\xC0 |0
-<U884C> \xA6\xE6 |0
-<U884D> \xAD\x6C |0
-<U884E> \xD0\xAB |0
-<U884F> \x8F\xEC |0
-<U8852> \xD7\xB1 |0
-<U8853> \xB3\x4E |0
-<U8855> \xDB\xC2 |0
-<U8856> \xDB\xC1 |0
-<U8857> \xB5\xF3 |0
-<U8859> \xB8\xC5 |0
-<U885A> \xE7\xC1 |0
-<U885B> \xBD\xC3 |0
-<U885D> \xBD\xC4 |0
-<U885E> \x8F\xC0 |0
-<U8860> \x93\x6A |0
-<U8861> \xBF\xC5 |0
-<U8862> \xC5\xFC |0
-<U8863> \xA6\xE7 |0
-<U8864> \x8B\xE4 |0
-<U8865> \x9C\x7C |0
-<U8867> \xD0\xAC |0
-<U8868> \xAA\xED |0
-<U8869> \xD0\xAE |0
-<U886A> \xD0\xAD |0
-<U886B> \xAD\x6D |0
-<U886D> \xD3\xD1 |0
-<U886E> \x95\xA1 |0
-<U886F> \xD3\xD8 |0
-<U8870> \xB0\x49 |0
-<U8871> \xD3\xD6 |0
-<U8872> \xD3\xD4 |0
-<U8874> \xD3\xDB |0
-<U8875> \xD3\xD2 |0
-<U8876> \xD3\xD3 |0
-<U8877> \xB0\x4A |0
-<U8879> \xB0\x4E |0
-<U887C> \xD3\xDC |0
-<U887D> \xB0\x4D |0
-<U887E> \xD3\xDA |0
-<U887F> \xD3\xD7 |0
-<U8880> \xD3\xD5 |0
-<U8881> \xB0\x4B |0
-<U8882> \xB0\x4C |0
-<U8883> \xD3\xD9 |0
-<U8884> \xFE\xEC |0
-<U8887> \x95\xA3 |0
-<U8888> \xB3\x50 |0
-<U8889> \xD7\xB2 |0
-<U888B> \xB3\x55 |0
-<U888C> \xD7\xC2 |0
-<U888D> \xB3\x54 |0
-<U888E> \xD7\xC4 |0
-<U888F> \x8C\x45 |0
-<U8890> \x8C\xB8 |0
-<U8891> \xD7\xB8 |0
-<U8892> \xB3\x52 |0
-<U8893> \xD7\xC3 |0
-<U8895> \xD7\xB3 |0
-<U8896> \xB3\x53 |0
-<U8897> \xD7\xBF |0
-<U8898> \xD7\xBB |0
-<U8899> \xD7\xBD |0
-<U889A> \xD7\xB7 |0
-<U889B> \xD7\xBE |0
-<U889C> \x8F\xC1 |0
-<U889E> \xB3\x4F |0
-<U889F> \xD7\xBA |0
-<U88A0> \xA0\x52 |0
-<U88A1> \xD7\xB9 |0
-<U88A2> \xD7\xB5 |0
-<U88A4> \xD7\xC0 |0
-<U88A7> \xD7\xBC |0
-<U88A8> \xD7\xB4 |0
-<U88AA> \xD7\xB6 |0
-<U88AB> \xB3\x51 |0
-<U88AC> \xD7\xC1 |0
-<U88AE> \x99\xD0 |0
-<U88B1> \xB5\xF6 |0
-<U88B2> \xDB\xCD |0
-<U88B4> \x8F\xC3 |0
-<U88B5> \x8F\xC4 |0
-<U88B6> \xDB\xC9 |0
-<U88B7> \xDB\xCB |0
-<U88B8> \xDB\xC6 |0
-<U88B9> \xDB\xC5 |0
-<U88BA> \xDB\xC3 |0
-<U88BC> \xDB\xCA |0
-<U88BD> \xDB\xCC |0
-<U88BE> \xDB\xC8 |0
-<U88BF> \x95\xA4 |0
-<U88C0> \xDB\xC7 |0
-<U88C1> \xB5\xF4 |0
-<U88C2> \xB5\xF5 |0
-<U88C5> \x8F\xC6 |0
-<U88C7> \x9E\x60 |0
-<U88C9> \xDB\xCF |0
-<U88CA> \xB8\xCD |0
-<U88CB> \xDF\xF2 |0
-<U88CC> \xDF\xF8 |0
-<U88CD> \xDF\xF3 |0
-<U88CE> \xDF\xF4 |0
-<U88CF> \xF9\xD8 |0
-<U88D0> \xDF\xF9 |0
-<U88D2> \xB8\xCF |0
-<U88D4> \xB8\xC7 |0
-<U88D5> \xB8\xCE |0
-<U88D6> \xDF\xF1 |0
-<U88D7> \xDB\xC4 |0
-<U88D8> \xB8\xCA |0
-<U88D9> \xB8\xC8 |0
-<U88DA> \xDF\xF7 |0
-<U88DB> \xDF\xF6 |0
-<U88DC> \xB8\xC9 |0
-<U88DD> \xB8\xCB |0
-<U88DE> \xDF\xF5 |0
-<U88DF> \xB8\xC6 |0
-<U88E1> \xB8\xCC |0
-<U88E6> \x95\xA5 |0
-<U88E7> \xE3\xF6 |0
-<U88E8> \xBB\x74 |0
-<U88EB> \xE4\x42 |0
-<U88EC> \xE4\x41 |0
-<U88EE> \xE3\xFB |0
-<U88EF> \xBB\x76 |0
-<U88F0> \xE4\x40 |0
-<U88F1> \xE3\xF7 |0
-<U88F2> \xE3\xF8 |0
-<U88F3> \xBB\x6E |0
-<U88F4> \xBB\x70 |0
-<U88F5> \x9C\xB3 |0
-<U88F6> \xE3\xFD |0
-<U88F7> \xE3\xF5 |0
-<U88F8> \xBB\x72 |0
-<U88F9> \xBB\x71 |0
-<U88FA> \xE3\xF9 |0
-<U88FB> \xE3\xFE |0
-<U88FC> \xE3\xFC |0
-<U88FD> \xBB\x73 |0
-<U88FE> \xE3\xFA |0
-<U88FF> \x99\xD1 |0
-<U8900> \xFE\xF1 |0
-<U8901> \xDB\xCE |0
-<U8902> \xBB\x6F |0
-<U8905> \xE7\xC2 |0
-<U8906> \xE7\xC9 |0
-<U8907> \xBD\xC6 |0
-<U8909> \xE7\xCD |0
-<U890A> \xBD\xCA |0
-<U890B> \xE7\xC5 |0
-<U890C> \xE7\xC3 |0
-<U890E> \xE7\xCC |0
-<U8910> \xBD\xC5 |0
-<U8911> \xE7\xCB |0
-<U8912> \xBD\xC7 |0
-<U8913> \xBD\xC8 |0
-<U8914> \xE7\xC4 |0
-<U8915> \xBD\xC9 |0
-<U8916> \xE7\xCA |0
-<U8917> \xE7\xC6 |0
-<U8918> \xE7\xC7 |0
-<U8919> \xE7\xC8 |0
-<U891A> \xBB\x75 |0
-<U891E> \xEB\x70 |0
-<U891F> \xEB\x7C |0
-<U8921> \xBF\xCA |0
-<U8922> \xEB\x77 |0
-<U8923> \xEB\x79 |0
-<U8924> \x99\xD2 |0
-<U8925> \xBF\xC8 |0
-<U8926> \xEB\x71 |0
-<U8927> \xEB\x75 |0
-<U8929> \xEB\x78 |0
-<U892A> \xBF\xC6 |0
-<U892B> \xBF\xC9 |0
-<U892C> \xEB\x7B |0
-<U892D> \xEB\x73 |0
-<U892E> \xEB\x74 |0
-<U892F> \xEB\x7A |0
-<U8930> \xEB\x72 |0
-<U8931> \xEB\x76 |0
-<U8932> \xBF\xC7 |0
-<U8933> \xEE\x72 |0
-<U8935> \xEE\x71 |0
-<U8936> \xC1\xB7 |0
-<U8937> \xEE\x77 |0
-<U8938> \xC1\xB9 |0
-<U893B> \xC1\xB6 |0
-<U893C> \xEE\x73 |0
-<U893D> \xC1\xBA |0
-<U893E> \xEE\x74 |0
-<U8941> \xEE\x75 |0
-<U8942> \xEE\x78 |0
-<U8943> \x9C\xC2 |0
-<U8944> \xC1\xB8 |0
-<U8946> \xF0\xD6 |0
-<U8947> \x99\xD3 |0
-<U8949> \xF0\xD9 |0
-<U894B> \xF0\xD3 |0
-<U894C> \xF0\xD5 |0
-<U894D> \x95\xA7 |0
-<U894F> \xF0\xD4 |0
-<U8950> \xF0\xD7 |0
-<U8951> \xF0\xD8 |0
-<U8952> \xEE\x76 |0
-<U8953> \xF0\xD2 |0
-<U8954> \x95\xA9 |0
-<U8956> \xC3\xCD |0
-<U8957> \xF2\xEC |0
-<U8958> \xF2\xEF |0
-<U8959> \xF2\xF1 |0
-<U895A> \xF2\xEA |0
-<U895B> \xF2\xEB |0
-<U895C> \xF2\xEE |0
-<U895D> \xF2\xF0 |0
-<U895E> \xC3\xCE |0
-<U895F> \xC3\xCC |0
-<U8960> \xC3\xCB |0
-<U8961> \xF2\xED |0
-<U8962> \xF2\xE9 |0
-<U8963> \xF4\xCA |0
-<U8964> \xC4\xB0 |0
-<U8965> \x95\xA6 |0
-<U8966> \xF4\xCB |0
-<U8969> \xF6\x49 |0
-<U896A> \xC4\xFB |0
-<U896B> \xF6\x4B |0
-<U896C> \xC4\xFC |0
-<U896D> \xF6\x48 |0
-<U896E> \xF6\x4A |0
-<U896F> \xC5\xA8 |0
-<U8971> \xF7\x52 |0
-<U8972> \xC5\xA7 |0
-<U8973> \xF7\xFD |0
-<U8974> \xF7\xFC |0
-<U8976> \xF7\xFB |0
-<U8977> \x9C\x5D |0
-<U8979> \xF9\x48 |0
-<U897A> \xF9\x49 |0
-<U897B> \xF9\x4B |0
-<U897C> \xF9\x4A |0
-<U897E> \xCA\x50 |0
-<U897F> \xA6\xE8 |0
-<U8980> \x98\xE2 |0
-<U8981> \xAD\x6E |0
-<U8982> \xD7\xC5 |0
-<U8983> \xB5\xF7 |0
-<U8985> \xDF\xFA |0
-<U8986> \xC2\xD0 |0
-<U8987> \x8F\xC9 |0
-<U8988> \xF2\xF2 |0
-<U8989> \xA0\xC2 |0
-<U898A> \x8F\xCA |0
-<U898B> \xA8\xA3 |0
-<U898F> \xB3\x57 |0
-<U8991> \x99\xD4 |0
-<U8993> \xB3\x56 |0
-<U8994> \xA0\xB9 |0
-<U8995> \xDB\xD0 |0
-<U8996> \xB5\xF8 |0
-<U8997> \xDB\xD2 |0
-<U8998> \xDB\xD1 |0
-<U899B> \xDF\xFB |0
-<U899C> \xB8\xD0 |0
-<U899D> \xE4\x43 |0
-<U899E> \xE4\x46 |0
-<U899F> \xE4\x45 |0
-<U89A1> \xE4\x44 |0
-<U89A2> \xE7\xCE |0
-<U89A3> \xE7\xD0 |0
-<U89A4> \xE7\xCF |0
-<U89A5> \x9B\x58 |0
-<U89A6> \xBF\xCC |0
-<U89A7> \x8F\xCD |0
-<U89A9> \xA0\xD4 |0
-<U89AA> \xBF\xCB |0
-<U89AC> \xC1\xBB |0
-<U89AD> \xEE\x79 |0
-<U89AE> \xEE\x7B |0
-<U89AF> \xEE\x7A |0
-<U89B2> \xC2\xD1 |0
-<U89B6> \xF2\xF4 |0
-<U89B7> \xF2\xF3 |0
-<U89B9> \xF4\xCC |0
-<U89BA> \xC4\xB1 |0
-<U89BC> \x8F\xCE |0
-<U89BD> \xC4\xFD |0
-<U89BE> \xF7\x54 |0
-<U89BF> \xF7\x53 |0
-<U89C0> \xC6\x5B |0
-<U89C1> \x8B\xE5 |0
-<U89C6> \x89\x79 |0
-<U89D2> \xA8\xA4 |0
-<U89D3> \xD0\xAF |0
-<U89D4> \xAD\x6F |0
-<U89D5> \xD7\xC8 |0
-<U89D6> \xD7\xC6 |0
-<U89D9> \xD7\xC7 |0
-<U89DA> \xDB\xD4 |0
-<U89DB> \xDB\xD5 |0
-<U89DC> \xE0\x43 |0
-<U89DD> \xDB\xD3 |0
-<U89DF> \xDF\xFC |0
-<U89E0> \xE0\x41 |0
-<U89E1> \xE0\x40 |0
-<U89E2> \xE0\x42 |0
-<U89E3> \xB8\xD1 |0
-<U89E4> \xDF\xFE |0
-<U89E5> \xDF\xFD |0
-<U89E6> \xE0\x44 |0
-<U89E7> \x8F\xD0 |0
-<U89E8> \xE4\x49 |0
-<U89E9> \xE4\x47 |0
-<U89EB> \xE4\x48 |0
-<U89EC> \xE7\xD3 |0
-<U89ED> \xE7\xD1 |0
-<U89F0> \xE7\xD2 |0
-<U89F1> \xEB\x7D |0
-<U89F2> \xEE\x7C |0
-<U89F3> \xEE\x7D |0
-<U89F4> \xC2\xD2 |0
-<U89F6> \xF2\xF5 |0
-<U89F7> \xF4\xCD |0
-<U89F8> \xC4\xB2 |0
-<U89FA> \xF6\x4C |0
-<U89FB> \xF7\x55 |0
-<U89FC> \xC5\xA9 |0
-<U89FE> \xF7\xFE |0
-<U89FF> \xF9\x4C |0
-<U8A00> \xA8\xA5 |0
-<U8A02> \xAD\x71 |0
-<U8A03> \xAD\x72 |0
-<U8A04> \xD0\xB0 |0
-<U8A07> \xD0\xB1 |0
-<U8A08> \xAD\x70 |0
-<U8A0A> \xB0\x54 |0
-<U8A0C> \xB0\x52 |0
-<U8A0E> \xB0\x51 |0
-<U8A0F> \xB0\x58 |0
-<U8A10> \xB0\x50 |0
-<U8A11> \xB0\x59 |0
-<U8A12> \xD3\xDD |0
-<U8A13> \xB0\x56 |0
-<U8A15> \xB0\x53 |0
-<U8A16> \xB0\x57 |0
-<U8A17> \xB0\x55 |0
-<U8A18> \xB0\x4F |0
-<U8A1B> \xB3\x5F |0
-<U8A1C> \x95\xB6 |0
-<U8A1D> \xB3\x59 |0
-<U8A1E> \xD7\xCC |0
-<U8A1F> \xB3\x5E |0
-<U8A22> \xB3\x60 |0
-<U8A23> \xB3\x5A |0
-<U8A25> \xB3\x5B |0
-<U8A27> \xD7\xCA |0
-<U8A29> \x99\xD6 |0
-<U8A2A> \xB3\x58 |0
-<U8A2B> \x95\xE5 |0
-<U8A2C> \xD7\xCB |0
-<U8A2D> \xB3\x5D |0
-<U8A30> \xD7\xC9 |0
-<U8A31> \xB3\x5C |0
-<U8A34> \xB6\x44 |0
-<U8A36> \xB6\x46 |0
-<U8A38> \x99\xD7 |0
-<U8A39> \xDB\xD8 |0
-<U8A3A> \xB6\x45 |0
-<U8A3B> \xB5\xF9 |0
-<U8A3C> \xB5\xFD |0
-<U8A3D> \x95\xB5 |0
-<U8A3E> \xB8\xE4 |0
-<U8A3F> \xE0\x49 |0
-<U8A40> \xDB\xDA |0
-<U8A41> \xB5\xFE |0
-<U8A44> \xDB\xDD |0
-<U8A45> \xDB\xDE |0
-<U8A46> \xB6\x43 |0
-<U8A48> \xDB\xE0 |0
-<U8A49> \xA0\xCA |0
-<U8A4A> \xDB\xE2 |0
-<U8A4C> \xDB\xE3 |0
-<U8A4D> \xDB\xD7 |0
-<U8A4E> \xDB\xD6 |0
-<U8A4F> \xDB\xE4 |0
-<U8A50> \xB6\x42 |0
-<U8A51> \xDB\xE1 |0
-<U8A52> \xDB\xDF |0
-<U8A54> \xB6\x40 |0
-<U8A55> \xB5\xFB |0
-<U8A56> \xB6\x47 |0
-<U8A57> \xDB\xDB |0
-<U8A58> \xDB\xDC |0
-<U8A59> \xDB\xD9 |0
-<U8A5B> \xB6\x41 |0
-<U8A5E> \xB5\xFC |0
-<U8A60> \xB5\xFA |0
-<U8A61> \xE0\x48 |0
-<U8A62> \xB8\xDF |0
-<U8A63> \xB8\xDA |0
-<U8A66> \xB8\xD5 |0
-<U8A67> \x9F\xFD |0
-<U8A68> \xB8\xE5 |0
-<U8A69> \xB8\xD6 |0
-<U8A6B> \xB8\xD2 |0
-<U8A6C> \xB8\xE1 |0
-<U8A6D> \xB8\xDE |0
-<U8A6E> \xB8\xE0 |0
-<U8A70> \xB8\xD7 |0
-<U8A71> \xB8\xDC |0
-<U8A72> \xB8\xD3 |0
-<U8A73> \xB8\xD4 |0
-<U8A74> \xE0\x50 |0
-<U8A75> \xE0\x4D |0
-<U8A76> \xE0\x45 |0
-<U8A77> \xE0\x4A |0
-<U8A79> \xB8\xE2 |0
-<U8A7A> \xE0\x51 |0
-<U8A7B> \xB8\xE3 |0
-<U8A7C> \xB8\xD9 |0
-<U8A7E> \xA0\x58 |0
-<U8A7F> \xE0\x47 |0
-<U8A81> \xE0\x4F |0
-<U8A82> \xE0\x4B |0
-<U8A83> \xE0\x4E |0
-<U8A84> \xE0\x4C |0
-<U8A85> \xB8\xDD |0
-<U8A86> \xE0\x46 |0
-<U8A87> \xB8\xD8 |0
-<U8A8B> \xE4\x4C |0
-<U8A8C> \xBB\x78 |0
-<U8A8D> \xBB\x7B |0
-<U8A8F> \xE4\x4E |0
-<U8A90> \x8F\xD6 |0
-<U8A91> \xBB\xA5 |0
-<U8A92> \xE4\x4D |0
-<U8A93> \xBB\x7D |0
-<U8A94> \x99\xD8 |0
-<U8A95> \xBD\xCF |0
-<U8A96> \xE4\x4F |0
-<U8A98> \xBB\xA4 |0
-<U8A99> \xE4\x4B |0
-<U8A9A> \xBB\xA6 |0
-<U8A9C> \x8F\xD3 |0
-<U8A9E> \xBB\x79 |0
-<U8AA0> \xB8\xDB |0
-<U8AA1> \xBB\x7C |0
-<U8AA3> \xBB\x7A |0
-<U8AA4> \xBB\x7E |0
-<U8AA5> \xBB\xA2 |0
-<U8AA6> \xBB\x77 |0
-<U8AA7> \xBB\xA7 |0
-<U8AA8> \xBB\xA3 |0
-<U8AA9> \x8F\xE5 |0
-<U8AAA> \xBB\xA1 |0
-<U8AAB> \xE4\x4A |0
-<U8AAF> \x8F\xE9 |0
-<U8AB0> \xBD\xD6 |0
-<U8AB2> \xBD\xD2 |0
-<U8AB4> \x99\xD9 |0
-<U8AB6> \xBD\xD9 |0
-<U8AB8> \xE7\xD6 |0
-<U8AB9> \xBD\xDA |0
-<U8ABA> \xE7\xE2 |0
-<U8ABB> \xE7\xDB |0
-<U8ABC> \xBD\xCB |0
-<U8ABD> \xE7\xE3 |0
-<U8ABE> \xE7\xDD |0
-<U8ABF> \xBD\xD5 |0
-<U8AC0> \xE7\xDE |0
-<U8AC2> \xBD\xD4 |0
-<U8AC3> \xE7\xE1 |0
-<U8AC4> \xBD\xCE |0
-<U8AC5> \xE7\xDF |0
-<U8AC6> \xE7\xD5 |0
-<U8AC7> \xBD\xCD |0
-<U8AC8> \xEB\xAA |0
-<U8AC9> \xBD\xD3 |0
-<U8ACB> \xBD\xD0 |0
-<U8ACD> \xBD\xD8 |0
-<U8ACF> \xE7\xD4 |0
-<U8AD1> \xE7\xD8 |0
-<U8AD2> \xBD\xCC |0
-<U8AD3> \xE7\xD7 |0
-<U8AD4> \xE7\xD9 |0
-<U8AD5> \xE7\xDA |0
-<U8AD6> \xBD\xD7 |0
-<U8AD7> \xE7\xDC |0
-<U8AD8> \xE7\xE0 |0
-<U8AD9> \xE7\xE4 |0
-<U8ADA> \x92\x7C |0
-<U8ADB> \xBD\xDB |0
-<U8ADC> \xBF\xD2 |0
-<U8ADD> \xEB\xA5 |0
-<U8ADE> \xEB\xAB |0
-<U8ADF> \xEB\xA8 |0
-<U8AE0> \xEB\x7E |0
-<U8AE1> \xEB\xAC |0
-<U8AE2> \xEB\xA1 |0
-<U8AE4> \xEB\xA7 |0
-<U8AE6> \xBF\xCD |0
-<U8AE7> \xBF\xD3 |0
-<U8AE8> \xEB\xAD |0
-<U8AEA> \x9C\x45 |0
-<U8AEB> \xBF\xCF |0
-<U8AED> \xBF\xD9 |0
-<U8AEE> \xBF\xD4 |0
-<U8AEF> \xEB\xAF |0
-<U8AF0> \xEB\xA9 |0
-<U8AF1> \xBF\xD0 |0
-<U8AF2> \xEB\xA2 |0
-<U8AF3> \xBF\xDA |0
-<U8AF4> \xEB\xA3 |0
-<U8AF5> \xEB\xA4 |0
-<U8AF6> \xBF\xDB |0
-<U8AF7> \xBF\xD8 |0
-<U8AF8> \xBD\xD1 |0
-<U8AFA> \xBF\xCE |0
-<U8AFB> \xEB\xB0 |0
-<U8AFC> \xBF\xDC |0
-<U8AFE> \xBF\xD5 |0
-<U8AFF> \xEB\xAE |0
-<U8B00> \xBF\xD1 |0
-<U8B01> \xBF\xD6 |0
-<U8B02> \xBF\xD7 |0
-<U8B04> \xC1\xC3 |0
-<U8B05> \xEE\xA4 |0
-<U8B06> \xEE\xAD |0
-<U8B07> \xEE\xAA |0
-<U8B08> \xEE\xAC |0
-<U8B0A> \xC1\xC0 |0
-<U8B0B> \xEE\xA5 |0
-<U8B0C> \x8F\xDE |0
-<U8B0D> \xEE\xAB |0
-<U8B0E> \xC1\xBC |0
-<U8B0F> \xEE\xA7 |0
-<U8B10> \xC1\xC4 |0
-<U8B11> \xEE\xA3 |0
-<U8B12> \xEE\xA8 |0
-<U8B13> \xEE\xAF |0
-<U8B14> \xEB\xA6 |0
-<U8B15> \xEE\xA9 |0
-<U8B16> \xEE\xA2 |0
-<U8B17> \xC1\xBD |0
-<U8B18> \xEE\xA1 |0
-<U8B19> \xC1\xBE |0
-<U8B1A> \xEE\xB0 |0
-<U8B1B> \xC1\xBF |0
-<U8B1C> \xEE\xAE |0
-<U8B1D> \xC1\xC2 |0
-<U8B1E> \xEE\x7E |0
-<U8B1F> \x8F\xDF |0
-<U8B20> \xC1\xC1 |0
-<U8B22> \xEE\xA6 |0
-<U8B23> \xF0\xDC |0
-<U8B24> \xF0\xEA |0
-<U8B25> \xF0\xE5 |0
-<U8B26> \xF0\xE7 |0
-<U8B27> \xF0\xDB |0
-<U8B28> \xC2\xD3 |0
-<U8B2A> \xF0\xDA |0
-<U8B2B> \xC2\xD6 |0
-<U8B2C> \xC2\xD5 |0
-<U8B2D> \xA0\x4B |0
-<U8B2E> \xF0\xE9 |0
-<U8B2F> \xF0\xE1 |0
-<U8B30> \xF0\xDE |0
-<U8B31> \xF0\xE4 |0
-<U8B33> \xF0\xDD |0
-<U8B35> \xF0\xDF |0
-<U8B36> \xF0\xE8 |0
-<U8B37> \xF0\xE6 |0
-<U8B39> \xC2\xD4 |0
-<U8B3A> \xF0\xED |0
-<U8B3B> \xF0\xEB |0
-<U8B3C> \xF0\xE2 |0
-<U8B3D> \xF0\xEC |0
-<U8B3E> \xF0\xE3 |0
-<U8B3F> \x8F\xE2 |0
-<U8B40> \xF2\xF9 |0
-<U8B41> \xC3\xCF |0
-<U8B42> \xF3\x41 |0
-<U8B43> \xA0\xCC |0
-<U8B45> \xF6\x4F |0
-<U8B46> \xC3\xD6 |0
-<U8B47> \xF0\xE0 |0
-<U8B48> \xF2\xF7 |0
-<U8B49> \xC3\xD2 |0
-<U8B4A> \xF2\xF8 |0
-<U8B4B> \xF2\xFD |0
-<U8B4C> \x8F\xE3 |0
-<U8B4D> \x8F\xE4 |0
-<U8B4E> \xC3\xD4 |0
-<U8B4F> \xC3\xD5 |0
-<U8B50> \xF2\xF6 |0
-<U8B51> \xF3\x40 |0
-<U8B52> \xF3\x42 |0
-<U8B53> \xF2\xFA |0
-<U8B54> \xF2\xFC |0
-<U8B55> \xF2\xFE |0
-<U8B56> \xF2\xFB |0
-<U8B57> \xF3\x43 |0
-<U8B58> \xC3\xD1 |0
-<U8B59> \xC3\xD7 |0
-<U8B5A> \xC3\xD3 |0
-<U8B5C> \xC3\xD0 |0
-<U8B5D> \xF4\xD0 |0
-<U8B5E> \x9B\xC4 |0
-<U8B5F> \xC4\xB7 |0
-<U8B60> \xF4\xCE |0
-<U8B62> \x9B\xFC |0
-<U8B63> \xF4\xD2 |0
-<U8B65> \xF4\xD3 |0
-<U8B66> \xC4\xB5 |0
-<U8B67> \xF4\xD4 |0
-<U8B68> \xF4\xD1 |0
-<U8B69> \x96\x4C |0
-<U8B6A> \xF4\xCF |0
-<U8B6B> \xC4\xB8 |0
-<U8B6C> \xC4\xB4 |0
-<U8B6D> \xF4\xD5 |0
-<U8B6F> \xC4\xB6 |0
-<U8B70> \xC4\xB3 |0
-<U8B74> \xC4\xFE |0
-<U8B77> \xC5\x40 |0
-<U8B78> \xF6\x4E |0
-<U8B79> \xF6\x4D |0
-<U8B7A> \xF6\x50 |0
-<U8B7B> \xF6\x51 |0
-<U8B7D> \xC5\x41 |0
-<U8B7E> \xF7\x56 |0
-<U8B7F> \xF7\x5B |0
-<U8B80> \xC5\xAA |0
-<U8B81> \x9A\xF6 |0
-<U8B82> \xF7\x58 |0
-<U8B83> \x8C\xAE |0
-<U8B84> \xF7\x57 |0
-<U8B85> \xF7\x5A |0
-<U8B86> \xF7\x59 |0
-<U8B88> \xF8\x43 |0
-<U8B8A> \xC5\xDC |0
-<U8B8B> \xF8\x42 |0
-<U8B8C> \xF8\x40 |0
-<U8B8E> \xF8\x41 |0
-<U8B90> \x8F\xE7 |0
-<U8B92> \xC5\xFE |0
-<U8B93> \xC5\xFD |0
-<U8B94> \xF8\xC1 |0
-<U8B95> \xF8\xC2 |0
-<U8B96> \xC6\x40 |0
-<U8B98> \xF9\x4D |0
-<U8B99> \xF9\x4E |0
-<U8B9A> \xC6\x67 |0
-<U8B9B> \x8F\xE8 |0
-<U8B9C> \xC6\x6D |0
-<U8B9E> \xF9\xA9 |0
-<U8B9F> \xF9\xC8 |0
-<U8BA0> \x8B\xE7 |0
-<U8BBE> \x89\x7A |0
-<U8BE2> \x89\x7B |0
-<U8C37> \xA8\xA6 |0
-<U8C39> \xD7\xCD |0
-<U8C3B> \xD7\xCE |0
-<U8C3C> \xE0\x52 |0
-<U8C3D> \xE4\x50 |0
-<U8C3E> \xE7\xE5 |0
-<U8C3F> \xC1\xC6 |0
-<U8C41> \xC1\xC5 |0
-<U8C42> \xF0\xEE |0
-<U8C43> \xF3\x44 |0
-<U8C45> \xF8\x44 |0
-<U8C46> \xA8\xA7 |0
-<U8C47> \xD3\xDE |0
-<U8C48> \xB0\x5A |0
-<U8C49> \xB3\x61 |0
-<U8C4A> \xE0\x54 |0
-<U8C4B> \xE0\x53 |0
-<U8C4C> \xBD\xDC |0
-<U8C4D> \xE7\xE6 |0
-<U8C4E> \xBD\xDD |0
-<U8C4F> \xEE\xB1 |0
-<U8C50> \xC2\xD7 |0
-<U8C51> \x99\xDA |0
-<U8C54> \xC6\x76 |0
-<U8C55> \xA8\xA8 |0
-<U8C56> \xCD\xCB |0
-<U8C57> \xD3\xDF |0
-<U8C5A> \xB3\x62 |0
-<U8C5C> \xD7\xCF |0
-<U8C5D> \xD7\xD0 |0
-<U8C5F> \xDB\xE5 |0
-<U8C61> \xB6\x48 |0
-<U8C62> \xB8\xE6 |0
-<U8C64> \xE0\x56 |0
-<U8C65> \xE0\x55 |0
-<U8C66> \xE0\x57 |0
-<U8C68> \xE4\x51 |0
-<U8C69> \xE4\x52 |0
-<U8C6A> \xBB\xA8 |0
-<U8C6B> \xBF\xDD |0
-<U8C6C> \xBD\xDE |0
-<U8C6D> \xBF\xDE |0
-<U8C6F> \xEE\xB5 |0
-<U8C70> \xEE\xB2 |0
-<U8C71> \xEE\xB4 |0
-<U8C72> \xEE\xB3 |0
-<U8C73> \xC1\xC7 |0
-<U8C75> \xF0\xEF |0
-<U8C76> \xF3\x46 |0
-<U8C77> \xF3\x45 |0
-<U8C78> \xCB\xA4 |0
-<U8C79> \xB0\x5C |0
-<U8C7A> \xB0\x5B |0
-<U8C7B> \xD3\xE0 |0
-<U8C7D> \xD7\xD1 |0
-<U8C80> \xDB\xE7 |0
-<U8C81> \xDB\xE6 |0
-<U8C82> \xB6\x49 |0
-<U8C84> \xE0\x59 |0
-<U8C85> \xE0\x5A |0
-<U8C86> \xE0\x58 |0
-<U8C89> \xB8\xE8 |0
-<U8C8A> \xB8\xE7 |0
-<U8C8C> \xBB\xAA |0
-<U8C8D> \xBB\xA9 |0
-<U8C8F> \xE7\xE7 |0
-<U8C90> \xEB\xB3 |0
-<U8C91> \xEB\xB1 |0
-<U8C92> \xEB\xB2 |0
-<U8C93> \xBF\xDF |0
-<U8C94> \xEE\xB7 |0
-<U8C95> \xEE\xB6 |0
-<U8C97> \xF0\xF2 |0
-<U8C98> \xF0\xF1 |0
-<U8C99> \xF0\xF0 |0
-<U8C9A> \xF3\x47 |0
-<U8C9B> \x8F\xED |0
-<U8C9C> \xF9\xAA |0
-<U8C9D> \xA8\xA9 |0
-<U8C9E> \xAD\x73 |0
-<U8C9F> \x95\xC0 |0
-<U8CA0> \xAD\x74 |0
-<U8CA1> \xB0\x5D |0
-<U8CA2> \xB0\x5E |0
-<U8CA3> \xD3\xE2 |0
-<U8CA4> \xD3\xE1 |0
-<U8CA5> \xD7\xD2 |0
-<U8CA7> \xB3\x68 |0
-<U8CA8> \xB3\x66 |0
-<U8CA9> \xB3\x63 |0
-<U8CAA> \xB3\x67 |0
-<U8CAB> \xB3\x65 |0
-<U8CAC> \xB3\x64 |0
-<U8CAD> \xA0\xCB |0
-<U8CAF> \xB6\x4A |0
-<U8CB0> \xDB\xEA |0
-<U8CB2> \xB8\xED |0
-<U8CB3> \xB6\x4C |0
-<U8CB4> \xB6\x51 |0
-<U8CB5> \xDB\xEC |0
-<U8CB6> \xB6\x53 |0
-<U8CB7> \xB6\x52 |0
-<U8CB8> \xB6\x55 |0
-<U8CB9> \xDB\xEB |0
-<U8CBA> \xDB\xE8 |0
-<U8CBB> \xB6\x4F |0
-<U8CBC> \xB6\x4B |0
-<U8CBD> \xB6\x4D |0
-<U8CBE> \xDB\xE9 |0
-<U8CBF> \xB6\x54 |0
-<U8CC0> \xB6\x50 |0
-<U8CC1> \xB6\x4E |0
-<U8CC2> \xB8\xEF |0
-<U8CC3> \xB8\xEE |0
-<U8CC4> \xB8\xEC |0
-<U8CC5> \xB8\xF0 |0
-<U8CC7> \xB8\xEA |0
-<U8CC8> \xB8\xEB |0
-<U8CCA> \xB8\xE9 |0
-<U8CCC> \xE0\x5B |0
-<U8CCD> \x9E\x48 |0
-<U8CCF> \xE4\x54 |0
-<U8CD1> \xBB\xAC |0
-<U8CD2> \xBB\xAD |0
-<U8CD3> \xBB\xAB |0
-<U8CD4> \x99\xDB |0
-<U8CD5> \xE4\x53 |0
-<U8CD6> \x8F\xF3 |0
-<U8CD7> \xE4\x55 |0
-<U8CD9> \xE7\xEA |0
-<U8CDA> \xE7\xEC |0
-<U8CDB> \x8F\xF9 |0
-<U8CDC> \xBD\xE7 |0
-<U8CDD> \xE7\xED |0
-<U8CDE> \xBD\xE0 |0
-<U8CDF> \xE7\xE9 |0
-<U8CE0> \xBD\xDF |0
-<U8CE1> \xBD\xE9 |0
-<U8CE2> \xBD\xE5 |0
-<U8CE3> \xBD\xE6 |0
-<U8CE4> \xBD\xE2 |0
-<U8CE5> \xE7\xE8 |0
-<U8CE6> \xBD\xE1 |0
-<U8CE7> \xE7\xEE |0
-<U8CE8> \xE7\xEB |0
-<U8CE9> \x95\xC1 |0
-<U8CEA> \xBD\xE8 |0
-<U8CEB> \xA0\x4E |0
-<U8CEC> \xBD\xE3 |0
-<U8CED> \xBD\xE4 |0
-<U8CEE> \xEB\xB5 |0
-<U8CF0> \xEB\xB7 |0
-<U8CF1> \xEB\xB6 |0
-<U8CF2> \x99\xDC |0
-<U8CF3> \xEB\xB8 |0
-<U8CF4> \xBF\xE0 |0
-<U8CF5> \xEB\xB4 |0
-<U8CF7> \xA0\x64 |0
-<U8CF8> \xC1\xCB |0
-<U8CF9> \xEE\xB8 |0
-<U8CFA> \xC1\xC8 |0
-<U8CFB> \xC1\xCC |0
-<U8CFC> \xC1\xCA |0
-<U8CFD> \xC1\xC9 |0
-<U8CFE> \xF0\xF3 |0
-<U8D00> \xF0\xF6 |0
-<U8D02> \xF0\xF5 |0
-<U8D03> \x8F\xF7 |0
-<U8D04> \xF0\xF4 |0
-<U8D05> \xC2\xD8 |0
-<U8D06> \xF3\x48 |0
-<U8D07> \xF3\x49 |0
-<U8D08> \xC3\xD8 |0
-<U8D09> \xF3\x4A |0
-<U8D0A> \xC3\xD9 |0
-<U8D0B> \x89\xB0 |0
-<U8D0C> \xA0\x48 |0
-<U8D0D> \xC4\xBA |0
-<U8D0F> \xC4\xB9 |0
-<U8D10> \xF6\x52 |0
-<U8D11> \x8F\xFB |0
-<U8D12> \x8F\xF6 |0
-<U8D13> \xC5\x42 |0
-<U8D14> \xF6\x53 |0
-<U8D15> \xF7\x5C |0
-<U8D16> \xC5\xAB |0
-<U8D17> \xC5\xAC |0
-<U8D18> \x9D\xDC |0
-<U8D19> \xF8\x45 |0
-<U8D1B> \xC6\x42 |0
-<U8D1C> \x99\xDD |0
-<U8D1D> \x8B\xE8 |0
-<U8D64> \xA8\xAA |0
-<U8D66> \xB3\x6A |0
-<U8D67> \xB3\x69 |0
-<U8D68> \xE0\x5C |0
-<U8D69> \xE0\x5D |0
-<U8D6B> \xBB\xAE |0
-<U8D6C> \xEB\xB9 |0
-<U8D6D> \xBD\xEA |0
-<U8D6E> \xEB\xBA |0
-<U8D6F> \xEE\xB9 |0
-<U8D70> \xA8\xAB |0
-<U8D72> \xD0\xB2 |0
-<U8D73> \xAD\x76 |0
-<U8D74> \xAD\x75 |0
-<U8D76> \xD3\xE3 |0
-<U8D77> \xB0\x5F |0
-<U8D78> \xD3\xE4 |0
-<U8D79> \xD7\xD5 |0
-<U8D7A> \x92\xC1 |0
-<U8D7B> \xD7\xD4 |0
-<U8D7D> \xD7\xD3 |0
-<U8D80> \xDB\xEE |0
-<U8D81> \xB6\x58 |0
-<U8D82> \x9F\xD6 |0
-<U8D84> \xDB\xED |0
-<U8D85> \xB6\x57 |0
-<U8D89> \xDB\xEF |0
-<U8D8A> \xB6\x56 |0
-<U8D8C> \xE0\x5F |0
-<U8D8D> \xE0\x62 |0
-<U8D8E> \xE0\x60 |0
-<U8D8F> \xE0\x61 |0
-<U8D90> \xE0\x65 |0
-<U8D91> \xE0\x5E |0
-<U8D92> \xE0\x66 |0
-<U8D93> \xE0\x63 |0
-<U8D94> \xE0\x64 |0
-<U8D95> \xBB\xB0 |0
-<U8D96> \xE4\x56 |0
-<U8D99> \xBB\xAF |0
-<U8D9B> \xE7\xF2 |0
-<U8D9C> \xE7\xF0 |0
-<U8D9F> \xBD\xEB |0
-<U8DA0> \xE7\xEF |0
-<U8DA1> \xE7\xF1 |0
-<U8DA3> \xBD\xEC |0
-<U8DA5> \xEB\xBB |0
-<U8DA6> \xA0\xD2 |0
-<U8DA7> \xEB\xBC |0
-<U8DA8> \xC1\xCD |0
-<U8DA9> \x90\x40 |0
-<U8DAA> \xF3\x4C |0
-<U8DAB> \xF3\x4E |0
-<U8DAC> \xF3\x4B |0
-<U8DAD> \xF3\x4D |0
-<U8DAE> \xF4\xD6 |0
-<U8DAF> \xF6\x54 |0
-<U8DB2> \xF9\x6F |0
-<U8DB3> \xA8\xAC |0
-<U8DB4> \xAD\x77 |0
-<U8DB5> \xD3\xE5 |0
-<U8DB6> \xD3\xE7 |0
-<U8DB7> \xD3\xE6 |0
-<U8DB9> \xD7\xD8 |0
-<U8DBA> \xB3\x6C |0
-<U8DBC> \xD7\xD6 |0
-<U8DBE> \xB3\x6B |0
-<U8DBF> \xD7\xD9 |0
-<U8DC0> \x8A\xC4 |0
-<U8DC1> \xD7\xDA |0
-<U8DC2> \xD7\xD7 |0
-<U8DC3> \x99\xE0 |0
-<U8DC5> \xDB\xFB |0
-<U8DC6> \xB6\x60 |0
-<U8DC7> \xDB\xF3 |0
-<U8DC8> \xDB\xF9 |0
-<U8DCB> \xB6\x5B |0
-<U8DCC> \xB6\x5E |0
-<U8DCD> \xDB\xF2 |0
-<U8DCE> \xB6\x59 |0
-<U8DCF> \xDB\xF6 |0
-<U8DD0> \xE0\x6C |0
-<U8DD1> \xB6\x5D |0
-<U8DD3> \xDB\xF1 |0
-<U8DD4> \x9F\xF0 |0
-<U8DD5> \xDB\xF7 |0
-<U8DD6> \xDB\xF4 |0
-<U8DD7> \xDB\xFA |0
-<U8DD8> \xDB\xF0 |0
-<U8DD9> \xDB\xF8 |0
-<U8DDA> \xB6\x5C |0
-<U8DDB> \xB6\x5F |0
-<U8DDC> \xDB\xF5 |0
-<U8DDD> \xB6\x5A |0
-<U8DDF> \xB8\xF2 |0
-<U8DE0> \xE0\x68 |0
-<U8DE1> \xB8\xF1 |0
-<U8DE2> \xE0\x6F |0
-<U8DE3> \xE0\x6E |0
-<U8DE4> \xB8\xF8 |0
-<U8DE6> \xB8\xF9 |0
-<U8DE7> \xE0\x70 |0
-<U8DE8> \xB8\xF3 |0
-<U8DE9> \xE0\x6D |0
-<U8DEA> \xB8\xF7 |0
-<U8DEB> \xE0\x72 |0
-<U8DEC> \xE0\x69 |0
-<U8DEE> \xE0\x6B |0
-<U8DEF> \xB8\xF4 |0
-<U8DF0> \xE0\x67 |0
-<U8DF1> \xE0\x6A |0
-<U8DF2> \xE0\x71 |0
-<U8DF3> \xB8\xF5 |0
-<U8DF4> \xE0\x73 |0
-<U8DFA> \xB8\xF6 |0
-<U8DFC> \xBB\xB1 |0
-<U8DFD> \xE4\x5B |0
-<U8DFE> \xE4\x61 |0
-<U8DFF> \xE4\x59 |0
-<U8E00> \xE4\x62 |0
-<U8E01> \x9F\xF3 |0
-<U8E02> \xE4\x58 |0
-<U8E03> \xE4\x5D |0
-<U8E04> \xE4\x63 |0
-<U8E05> \xE4\x60 |0
-<U8E06> \xE4\x5F |0
-<U8E07> \xE4\x5E |0
-<U8E09> \xE4\x57 |0
-<U8E0A> \xE4\x5C |0
-<U8E0D> \xE4\x5A |0
-<U8E0E> \x9D\xBF |0
-<U8E0F> \xBD\xF1 |0
-<U8E10> \xBD\xEE |0
-<U8E11> \xE7\xFB |0
-<U8E12> \xE8\x41 |0
-<U8E13> \xE8\x43 |0
-<U8E14> \xE8\x40 |0
-<U8E15> \xE7\xF8 |0
-<U8E16> \xE7\xFA |0
-<U8E17> \xE8\x45 |0
-<U8E18> \xE8\x42 |0
-<U8E19> \xE7\xFC |0
-<U8E1A> \xE8\x46 |0
-<U8E1B> \xE7\xF9 |0
-<U8E1C> \xE8\x44 |0
-<U8E1D> \xBD\xEF |0
-<U8E1E> \xBD\xF5 |0
-<U8E1F> \xBD\xF3 |0
-<U8E20> \xE7\xF3 |0
-<U8E21> \xBD\xF4 |0
-<U8E22> \xBD\xF0 |0
-<U8E23> \xE7\xF4 |0
-<U8E24> \xE7\xF6 |0
-<U8E25> \xE7\xF5 |0
-<U8E26> \xE7\xFD |0
-<U8E27> \xE7\xFE |0
-<U8E28> \x9F\xF6 |0
-<U8E29> \xBD\xF2 |0
-<U8E2A> \x95\xC8 |0
-<U8E2B> \xBD\xED |0
-<U8E2D> \x9E\x5A |0
-<U8E2E> \xE7\xF7 |0
-<U8E30> \xEB\xC6 |0
-<U8E31> \xBF\xE2 |0
-<U8E33> \xEB\xBD |0
-<U8E34> \xBF\xE3 |0
-<U8E35> \xBF\xE6 |0
-<U8E36> \xEB\xC2 |0
-<U8E38> \xEB\xBF |0
-<U8E39> \xBF\xE5 |0
-<U8E3A> \x99\xE3 |0
-<U8E3C> \xEB\xC3 |0
-<U8E3D> \xEB\xC4 |0
-<U8E3E> \xEB\xBE |0
-<U8E3F> \xEB\xC7 |0
-<U8E40> \xEB\xC0 |0
-<U8E41> \xEB\xC5 |0
-<U8E42> \xBF\xE4 |0
-<U8E44> \xBF\xE1 |0
-<U8E45> \xEB\xC1 |0
-<U8E46> \x8A\x4A |0
-<U8E47> \xEE\xBF |0
-<U8E48> \xC1\xD0 |0
-<U8E49> \xC1\xCE |0
-<U8E4A> \xC1\xD1 |0
-<U8E4B> \xC1\xCF |0
-<U8E4C> \xEE\xBE |0
-<U8E4D> \xEE\xBB |0
-<U8E4E> \xEE\xBA |0
-<U8E4F> \x9F\xF1 |0
-<U8E50> \xEE\xBD |0
-<U8E53> \xEE\xBC |0
-<U8E54> \xF1\x45 |0
-<U8E55> \xC2\xDE |0
-<U8E56> \xF0\xFB |0
-<U8E57> \xF0\xFA |0
-<U8E59> \xC2\xD9 |0
-<U8E5A> \xF1\x41 |0
-<U8E5B> \xF1\x40 |0
-<U8E5C> \xF0\xF7 |0
-<U8E5D> \xF1\x43 |0
-<U8E5E> \xF0\xFC |0
-<U8E5F> \xC2\xDD |0
-<U8E60> \xF0\xF9 |0
-<U8E61> \xF1\x42 |0
-<U8E62> \xF0\xF8 |0
-<U8E63> \xC2\xDA |0
-<U8E64> \xC2\xDC |0
-<U8E65> \xF0\xFD |0
-<U8E66> \xC2\xDB |0
-<U8E67> \xF0\xFE |0
-<U8E68> \x8A\xA7 |0
-<U8E69> \xF1\x44 |0
-<U8E6A> \xF3\x52 |0
-<U8E6C> \xC3\xDE |0
-<U8E6D> \xF3\x4F |0
-<U8E6F> \xF3\x53 |0
-<U8E71> \x99\xE6 |0
-<U8E72> \xC3\xDB |0
-<U8E73> \xF3\x51 |0
-<U8E74> \xC3\xE0 |0
-<U8E75> \x9F\xF7 |0
-<U8E76> \xC3\xDD |0
-<U8E77> \x9F\xED |0
-<U8E78> \xF3\x50 |0
-<U8E7A> \xC3\xDF |0
-<U8E7B> \xF3\x54 |0
-<U8E7C> \xC3\xDA |0
-<U8E7E> \x8A\x5C |0
-<U8E80> \x9D\xAE |0
-<U8E81> \xC4\xBC |0
-<U8E82> \xC4\xBE |0
-<U8E84> \xF4\xD9 |0
-<U8E85> \xC4\xBD |0
-<U8E86> \xF4\xD7 |0
-<U8E87> \xC3\xDC |0
-<U8E88> \xF4\xD8 |0
-<U8E89> \xC4\xBB |0
-<U8E8A> \xC5\x43 |0
-<U8E8B> \xC5\x45 |0
-<U8E8C> \xF6\x56 |0
-<U8E8D> \xC5\x44 |0
-<U8E8E> \xF6\x55 |0
-<U8E90> \xF7\x61 |0
-<U8E91> \xC5\xAD |0
-<U8E92> \xF7\x60 |0
-<U8E93> \xC5\xAE |0
-<U8E94> \xF7\x5E |0
-<U8E95> \xF7\x5D |0
-<U8E96> \xF7\x62 |0
-<U8E97> \xF7\x63 |0
-<U8E98> \xF8\x46 |0
-<U8E9A> \xF7\x5F |0
-<U8E9D> \xF8\xC6 |0
-<U8E9E> \xF8\xC3 |0
-<U8E9F> \xF8\xC4 |0
-<U8EA0> \xF8\xC5 |0
-<U8EA1> \xC6\x5C |0
-<U8EA3> \xF9\x51 |0
-<U8EA4> \xF9\x50 |0
-<U8EA5> \xF9\x4F |0
-<U8EA6> \xF9\x70 |0
-<U8EA7> \x95\xC9 |0
-<U8EA8> \xF9\xBE |0
-<U8EA9> \xF9\xAB |0
-<U8EAA> \xC6\x6E |0
-<U8EAB> \xA8\xAD |0
-<U8EAC> \xB0\x60 |0
-<U8EAD> \x90\x48 |0
-<U8EB0> \x99\xE8 |0
-<U8EB2> \xB8\xFA |0
-<U8EB6> \x90\x49 |0
-<U8EB9> \x8C\xBA |0
-<U8EBA> \xBD\xF6 |0
-<U8EBC> \x90\xB1 |0
-<U8EBD> \xEB\xC8 |0
-<U8EC0> \xC2\xDF |0
-<U8EC2> \xF3\x55 |0
-<U8EC3> \x90\x4A |0
-<U8EC9> \xF9\xAC |0
-<U8ECA> \xA8\xAE |0
-<U8ECB> \xAA\xEE |0
-<U8ECC> \xAD\x79 |0
-<U8ECD> \xAD\x78 |0
-<U8ECE> \x99\xEA |0
-<U8ECF> \xB0\x63 |0
-<U8ED1> \xD3\xE8 |0
-<U8ED2> \xB0\x61 |0
-<U8ED3> \xD3\xE9 |0
-<U8ED4> \xB0\x62 |0
-<U8ED7> \xD7\xDF |0
-<U8ED8> \xD7\xDB |0
-<U8EDA> \x9B\xD1 |0
-<U8EDB> \xB3\x6D |0
-<U8EDC> \xD7\xDE |0
-<U8EDD> \xD7\xDD |0
-<U8EDE> \xD7\xDC |0
-<U8EDF> \xB3\x6E |0
-<U8EE0> \xD7\xE0 |0
-<U8EE1> \xD7\xE1 |0
-<U8EE2> \x99\xEB |0
-<U8EE4> \x99\xEC |0
-<U8EE5> \xDC\x43 |0
-<U8EE6> \xDC\x41 |0
-<U8EE7> \xDC\x45 |0
-<U8EE8> \xDC\x46 |0
-<U8EE9> \xDC\x4C |0
-<U8EEB> \xDC\x48 |0
-<U8EEC> \xDC\x4A |0
-<U8EED> \x99\xED |0
-<U8EEE> \xDC\x42 |0
-<U8EEF> \xDB\xFC |0
-<U8EF1> \xDC\x49 |0
-<U8EF2> \x99\xEE |0
-<U8EF4> \xDC\x4B |0
-<U8EF5> \xDC\x44 |0
-<U8EF6> \xDC\x47 |0
-<U8EF7> \xDB\xFD |0
-<U8EF8> \xB6\x62 |0
-<U8EF9> \xDC\x40 |0
-<U8EFA> \xDB\xFE |0
-<U8EFB> \xB6\x61 |0
-<U8EFC> \xB6\x63 |0
-<U8EFE> \xB8\xFD |0
-<U8EFF> \xE0\x75 |0
-<U8F00> \xE0\x77 |0
-<U8F01> \xE0\x76 |0
-<U8F02> \xE0\x7B |0
-<U8F03> \xB8\xFB |0
-<U8F05> \xE0\x78 |0
-<U8F06> \xE0\x74 |0
-<U8F07> \xE0\x79 |0
-<U8F08> \xE0\x7A |0
-<U8F09> \xB8\xFC |0
-<U8F0A> \xB8\xFE |0
-<U8F0B> \xE0\x7C |0
-<U8F0D> \xE4\x67 |0
-<U8F0E> \xE4\x66 |0
-<U8F10> \xE4\x64 |0
-<U8F11> \xE4\x65 |0
-<U8F12> \xBB\xB3 |0
-<U8F13> \xBB\xB5 |0
-<U8F14> \xBB\xB2 |0
-<U8F15> \xBB\xB4 |0
-<U8F16> \xE8\x4D |0
-<U8F17> \xE8\x4E |0
-<U8F18> \xE8\x49 |0
-<U8F19> \x90\x4C |0
-<U8F1A> \xE8\x4A |0
-<U8F1B> \xBD\xF8 |0
-<U8F1C> \xBD\xFD |0
-<U8F1D> \xBD\xF7 |0
-<U8F1E> \xBD\xFE |0
-<U8F1F> \xBD\xF9 |0
-<U8F20> \xE8\x4B |0
-<U8F23> \xE8\x4C |0
-<U8F24> \xE8\x48 |0
-<U8F25> \xBE\x40 |0
-<U8F26> \xBD\xFB |0
-<U8F29> \xBD\xFA |0
-<U8F2A> \xBD\xFC |0
-<U8F2C> \xE8\x47 |0
-<U8F2D> \x90\x4D |0
-<U8F2E> \xEB\xCA |0
-<U8F2F> \xBF\xE8 |0
-<U8F30> \x95\xCB |0
-<U8F32> \xEB\xCC |0
-<U8F33> \xBF\xEA |0
-<U8F34> \xEB\xCF |0
-<U8F35> \xEB\xCB |0
-<U8F36> \xEB\xC9 |0
-<U8F37> \xEB\xCE |0
-<U8F38> \xBF\xE9 |0
-<U8F39> \xEB\xCD |0
-<U8F3B> \xBF\xE7 |0
-<U8F3E> \xC1\xD3 |0
-<U8F3F> \xC1\xD6 |0
-<U8F40> \xEE\xC1 |0
-<U8F41> \x97\xE2 |0
-<U8F42> \xC1\xD4 |0
-<U8F43> \xEE\xC0 |0
-<U8F44> \xC1\xD2 |0
-<U8F45> \xC1\xD5 |0
-<U8F46> \xF1\x46 |0
-<U8F47> \xF1\x47 |0
-<U8F48> \xF1\x48 |0
-<U8F49> \xC2\xE0 |0
-<U8F4A> \x95\xCC |0
-<U8F4B> \xF1\x49 |0
-<U8F4D> \xC2\xE1 |0
-<U8F4E> \xC3\xE2 |0
-<U8F4F> \xF3\x58 |0
-<U8F50> \xF3\x59 |0
-<U8F51> \xF3\x57 |0
-<U8F52> \xF3\x56 |0
-<U8F53> \xF3\x5A |0
-<U8F54> \xC3\xE1 |0
-<U8F55> \xF4\xDD |0
-<U8F56> \xF4\xDB |0
-<U8F57> \xF4\xDC |0
-<U8F58> \xF4\xDE |0
-<U8F59> \xF4\xDA |0
-<U8F5A> \xF4\xDF |0
-<U8F5B> \xF6\x58 |0
-<U8F5C> \x9F\x78 |0
-<U8F5D> \xF6\x59 |0
-<U8F5E> \xF6\x57 |0
-<U8F5F> \xC5\x46 |0
-<U8F60> \xF7\x64 |0
-<U8F61> \xC5\xAF |0
-<U8F62> \xF7\x65 |0
-<U8F63> \xF8\x48 |0
-<U8F64> \xF8\x47 |0
-<U8F66> \x89\x7C |0
-<U8F67> \x89\x7D |0
-<U8F6E> \x89\x7E |0
-<U8F93> \x99\x5D |0
-<U8F9B> \xA8\xAF |0
-<U8F9C> \xB6\x64 |0
-<U8F9F> \xB9\x40 |0
-<U8FA0> \x9B\x5A |0
-<U8FA3> \xBB\xB6 |0
-<U8FA5> \x90\x50 |0
-<U8FA6> \xBF\xEC |0
-<U8FA7> \x8C\x4F |0
-<U8FA8> \xBF\xEB |0
-<U8FAD> \xC3\xE3 |0
-<U8FAE> \xC4\x7C |0
-<U8FAF> \xC5\x47 |0
-<U8FB0> \xA8\xB0 |0
-<U8FB1> \xB0\x64 |0
-<U8FB2> \xB9\x41 |0
-<U8FB3> \x90\x54 |0
-<U8FB4> \xF3\x5B |0
-<U8FB5> \xC6\xD6 |0
-<U8FB6> \x9A\xA8 |0
-<U8FB7> \x99\xEF |0
-<U8FB8> \xFE\xEB |0
-<U8FB9> \x9D\xA3 |0
-<U8FBA> \x9D\xA1 |0
-<U8FBB> \x99\x43 |0
-<U8FBC> \x99\x45 |0
-<U8FBE> \x9D\x7D |0
-<U8FBF> \xCB\xA6 |0
-<U8FC1> \x99\xF0 |0
-<U8FC2> \xA8\xB1 |0
-<U8FC4> \xA8\xB4 |0
-<U8FC5> \xA8\xB3 |0
-<U8FC6> \xA8\xB2 |0
-<U8FC9> \xCB\xA5 |0
-<U8FCA> \x99\xF1 |0
-<U8FCB> \xCD\xCD |0
-<U8FCC> \x99\xF2 |0
-<U8FCD> \xCD\xCF |0
-<U8FCE> \xAA\xEF |0
-<U8FCF> \x8C\xBC |0
-<U8FD0> \x9D\x60 |0
-<U8FD1> \xAA\xF1 |0
-<U8FD2> \xCD\xCC |0
-<U8FD3> \xCD\xCE |0
-<U8FD4> \xAA\xF0 |0
-<U8FD5> \xCD\xD1 |0
-<U8FD6> \xCD\xD0 |0
-<U8FD7> \xCD\xD2 |0
-<U8FDA> \xA0\xA3 |0
-<U8FE0> \xD0\xB6 |0
-<U8FE1> \xD0\xB4 |0
-<U8FE2> \xAD\x7C |0
-<U8FE3> \xD0\xB3 |0
-<U8FE4> \xAD\xA3 |0
-<U8FE5> \xAD\x7E |0
-<U8FE6> \xAD\x7B |0
-<U8FE8> \xAD\xA4 |0
-<U8FEA> \xAD\x7D |0
-<U8FEB> \xAD\xA2 |0
-<U8FED> \xAD\xA1 |0
-<U8FEE> \xD0\xB5 |0
-<U8FF0> \xAD\x7A |0
-<U8FF4> \xB0\x6A |0
-<U8FF5> \xD3\xEB |0
-<U8FF6> \xD3\xF1 |0
-<U8FF7> \xB0\x67 |0
-<U8FF8> \xB0\x6E |0
-<U8FF9> \x90\x5B |0
-<U8FFA> \xB0\x69 |0
-<U8FFB> \xD3\xEE |0
-<U8FFC> \xD3\xF0 |0
-<U8FFD> \xB0\x6C |0
-<U8FFE> \xD3\xEA |0
-<U8FFF> \xD3\xED |0
-<U9000> \xB0\x68 |0
-<U9001> \xB0\x65 |0
-<U9002> \xD3\xEC |0
-<U9003> \xB0\x6B |0
-<U9004> \xD3\xEF |0
-<U9005> \xB0\x6D |0
-<U9006> \xB0\x66 |0
-<U9008> \x9E\xDB |0
-<U900B> \xD7\xE3 |0
-<U900C> \xD7\xE6 |0
-<U900D> \xB3\x70 |0
-<U900F> \xB3\x7A |0
-<U9010> \xB3\x76 |0
-<U9011> \xD7\xE4 |0
-<U9012> \x9D\x79 |0
-<U9014> \xB3\x7E |0
-<U9015> \xB3\x77 |0
-<U9016> \xB3\x7C |0
-<U9017> \xB3\x72 |0
-<U9019> \xB3\x6F |0
-<U901A> \xB3\x71 |0
-<U901B> \xB3\x7D |0
-<U901C> \xD7\xE5 |0
-<U901D> \xB3\x75 |0
-<U901E> \xB3\x78 |0
-<U901F> \xB3\x74 |0
-<U9020> \xB3\x79 |0
-<U9021> \xD7\xE7 |0
-<U9022> \xB3\x7B |0
-<U9023> \xB3\x73 |0
-<U9024> \xD7\xE2 |0
-<U902D> \xDC\x4D |0
-<U902E> \xB6\x65 |0
-<U902F> \xDC\x4F |0
-<U9031> \xB6\x67 |0
-<U9032> \xB6\x69 |0
-<U9033> \x99\xF3 |0
-<U9034> \xDC\x4E |0
-<U9035> \xB6\x66 |0
-<U9036> \xB6\x6A |0
-<U9037> \x90\x62 |0
-<U9038> \xB6\x68 |0
-<U903C> \xB9\x47 |0
-<U903D> \xE0\xA3 |0
-<U903E> \xB9\x4F |0
-<U903F> \xE0\x7E |0
-<U9041> \xB9\x50 |0
-<U9042> \xB9\x45 |0
-<U9044> \xE0\xA1 |0
-<U9047> \xB9\x4A |0
-<U9049> \xE0\xA2 |0
-<U904A> \xB9\x43 |0
-<U904B> \xB9\x42 |0
-<U904C> \x9F\x55 |0
-<U904D> \xB9\x4D |0
-<U904E> \xB9\x4C |0
-<U904F> \xB9\x4B |0
-<U9050> \xB9\x49 |0
-<U9051> \xB9\x4E |0
-<U9052> \xE0\x7D |0
-<U9053> \xB9\x44 |0
-<U9054> \xB9\x46 |0
-<U9055> \xB9\x48 |0
-<U9056> \x9B\xF9 |0
-<U9058> \xBB\xB8 |0
-<U9059> \xBB\xBB |0
-<U905B> \xBB\xBF |0
-<U905C> \xBB\xB9 |0
-<U905D> \xBB\xBE |0
-<U905E> \xBB\xBC |0
-<U9060> \xBB\xB7 |0
-<U9061> \x90\x65 |0
-<U9062> \xBB\xBD |0
-<U9063> \xBB\xBA |0
-<U9064> \x96\xE0 |0
-<U9067> \xE8\x52 |0
-<U9068> \xBE\x43 |0
-<U9069> \xBE\x41 |0
-<U906B> \xE8\x53 |0
-<U906C> \x98\xBE |0
-<U906D> \xBE\x44 |0
-<U906E> \xBE\x42 |0
-<U906F> \xE8\x51 |0
-<U9070> \xE8\x50 |0
-<U9072> \xBF\xF0 |0
-<U9073> \xE8\x4F |0
-<U9074> \xBF\xEE |0
-<U9075> \xBF\xED |0
-<U9076> \xEB\xD0 |0
-<U9077> \xBE\x45 |0
-<U9078> \xBF\xEF |0
-<U9079> \xEB\xD1 |0
-<U907A> \xBF\xF2 |0
-<U907B> \xEB\xD2 |0
-<U907C> \xBF\xF1 |0
-<U907D> \xC1\xD8 |0
-<U907E> \xEE\xC3 |0
-<U907F> \xC1\xD7 |0
-<U9080> \xC1\xDC |0
-<U9081> \xC1\xDA |0
-<U9082> \xC1\xDB |0
-<U9083> \xC2\xE3 |0
-<U9084> \xC1\xD9 |0
-<U9085> \xEE\xC2 |0
-<U9086> \xEB\xD3 |0
-<U9087> \xC2\xE2 |0
-<U9088> \xC2\xE4 |0
-<U908A> \xC3\xE4 |0
-<U908B> \xC3\xE5 |0
-<U908D> \xF4\xE0 |0
-<U908F> \xC5\xDE |0
-<U9090> \xC5\xDD |0
-<U9091> \xA8\xB6 |0
-<U9094> \xCA\x55 |0
-<U9095> \xB0\x6F |0
-<U9097> \xCA\x52 |0
-<U9098> \xCA\x53 |0
-<U9099> \xCA\x51 |0
-<U909B> \xCA\x54 |0
-<U909E> \xCB\xAA |0
-<U909F> \xCB\xA7 |0
-<U90A0> \xCB\xAC |0
-<U90A1> \xCB\xA8 |0
-<U90A2> \xA8\xB7 |0
-<U90A3> \xA8\xBA |0
-<U90A5> \xCB\xA9 |0
-<U90A6> \xA8\xB9 |0
-<U90A7> \xCB\xAB |0
-<U90A8> \x90\x68 |0
-<U90AA> \xA8\xB8 |0
-<U90AE> \x90\x6C |0
-<U90AF> \xCD\xD5 |0
-<U90B0> \xCD\xD7 |0
-<U90B1> \xAA\xF4 |0
-<U90B2> \xCD\xD3 |0
-<U90B3> \xCD\xD6 |0
-<U90B4> \xCD\xD4 |0
-<U90B5> \xAA\xF2 |0
-<U90B6> \xAA\xF5 |0
-<U90B8> \xAA\xF3 |0
-<U90BB> \x95\xD8 |0
-<U90BD> \xD0\xB8 |0
-<U90BE> \xD0\xBC |0
-<U90BF> \xD0\xB9 |0
-<U90C1> \xAD\xA7 |0
-<U90C3> \xAD\xA8 |0
-<U90C4> \x90\x6A |0
-<U90C5> \xD0\xBB |0
-<U90C7> \xD0\xBD |0
-<U90C8> \xD0\xBF |0
-<U90CA> \xAD\xA5 |0
-<U90CB> \xD0\xBE |0
-<U90CE> \xAD\xA6 |0
-<U90D4> \xD7\xEE |0
-<U90D5> \xD0\xBA |0
-<U90D6> \xD3\xF2 |0
-<U90D7> \xD3\xFB |0
-<U90D8> \xD3\xF9 |0
-<U90D9> \xD3\xF4 |0
-<U90DA> \xD3\xF5 |0
-<U90DB> \xD3\xFA |0
-<U90DC> \xD3\xFC |0
-<U90DD> \xB0\x71 |0
-<U90DF> \xD3\xF7 |0
-<U90E0> \xD3\xF3 |0
-<U90E1> \xB0\x70 |0
-<U90E2> \xB0\x72 |0
-<U90E3> \xD3\xF6 |0
-<U90E4> \xD3\xFD |0
-<U90E5> \xD3\xF8 |0
-<U90E8> \xB3\xA1 |0
-<U90E9> \xD7\xF1 |0
-<U90EA> \xD7\xE9 |0
-<U90EB> \xD7\xEF |0
-<U90EC> \xD7\xF0 |0
-<U90ED> \xB3\xA2 |0
-<U90EF> \xD7\xE8 |0
-<U90F0> \xD7\xEA |0
-<U90F1> \xD0\xB7 |0
-<U90F2> \xD7\xEC |0
-<U90F3> \xD7\xED |0
-<U90F4> \xD7\xEB |0
-<U90F5> \xB6\x6C |0
-<U90F9> \xDC\x56 |0
-<U90FA> \xEB\xD4 |0
-<U90FB> \xDC\x57 |0
-<U90FC> \xDC\x54 |0
-<U90FD> \xB3\xA3 |0
-<U90FE> \xB6\x6E |0
-<U90FF> \xDC\x53 |0
-<U9100> \xDC\x59 |0
-<U9101> \xDC\x58 |0
-<U9102> \xB6\x6B |0
-<U9103> \xDC\x5C |0
-<U9104> \xDC\x52 |0
-<U9105> \xDC\x5B |0
-<U9106> \xDC\x50 |0
-<U9107> \xDC\x5A |0
-<U9108> \xDC\x55 |0
-<U9109> \xB6\x6D |0
-<U910B> \xE0\xAA |0
-<U910D> \xE0\xA5 |0
-<U910E> \xE0\xAB |0
-<U910F> \xE0\xA6 |0
-<U9110> \xE0\xA4 |0
-<U9111> \xE0\xA7 |0
-<U9112> \xB9\x51 |0
-<U9114> \xE0\xA9 |0
-<U9116> \xE0\xA8 |0
-<U9117> \xB9\x52 |0
-<U9118> \xBB\xC1 |0
-<U9119> \xBB\xC0 |0
-<U911A> \xE4\x6E |0
-<U911B> \xE4\x71 |0
-<U911C> \xE4\x69 |0
-<U911D> \xE4\x6D |0
-<U911E> \xBB\xC2 |0
-<U911F> \xE4\x6C |0
-<U9120> \xE4\x6A |0
-<U9121> \xE4\x70 |0
-<U9122> \xE4\x6B |0
-<U9123> \xE4\x68 |0
-<U9124> \xE4\x6F |0
-<U9126> \xE8\x59 |0
-<U9127> \xBE\x48 |0
-<U9128> \xF1\x4A |0
-<U9129> \xE8\x56 |0
-<U912A> \xE8\x57 |0
-<U912B> \xE8\x55 |0
-<U912C> \xDC\x51 |0
-<U912D> \xBE\x47 |0
-<U912E> \xE8\x5A |0
-<U912F> \xE8\x54 |0
-<U9130> \xBE\x46 |0
-<U9131> \xBE\x49 |0
-<U9132> \xE8\x58 |0
-<U9133> \xEB\xD5 |0
-<U9134> \xBF\xF3 |0
-<U9135> \xEB\xD6 |0
-<U9136> \xEB\xD7 |0
-<U9138> \xEE\xC4 |0
-<U9139> \xC1\xDD |0
-<U913A> \xF1\x4B |0
-<U913B> \xF1\x4C |0
-<U913E> \xF1\x4D |0
-<U913F> \xF3\x5D |0
-<U9140> \xF3\x5C |0
-<U9141> \xF4\xE2 |0
-<U9143> \xF4\xE1 |0
-<U9144> \xF6\x5B |0
-<U9145> \xF6\x5C |0
-<U9146> \xF6\x5A |0
-<U9147> \xF7\x66 |0
-<U9148> \xC5\xB0 |0
-<U9149> \xA8\xBB |0
-<U914A> \xAD\xAA |0
-<U914B> \xAD\xA9 |0
-<U914C> \xB0\x75 |0
-<U914D> \xB0\x74 |0
-<U914E> \xD4\x40 |0
-<U914F> \xD4\x41 |0
-<U9150> \xD3\xFE |0
-<U9151> \x9F\xB2 |0
-<U9152> \xB0\x73 |0
-<U9153> \xD7\xF5 |0
-<U9155> \xD7\xF6 |0
-<U9156> \xD7\xF2 |0
-<U9157> \xB3\xA4 |0
-<U9158> \xD7\xF3 |0
-<U9159> \x9F\xAE |0
-<U915A> \xD7\xF4 |0
-<U915C> \x9F\xB0 |0
-<U915E> \x89\xAD |0
-<U915F> \xDC\x5F |0
-<U9160> \xDC\x61 |0
-<U9161> \xDC\x5D |0
-<U9162> \xDC\x60 |0
-<U9163> \xB6\x6F |0
-<U9164> \xDC\x5E |0
-<U9165> \xB6\x70 |0
-<U9167> \x90\x6E |0
-<U9168> \xDD\x73 |0
-<U9169> \xB9\x55 |0
-<U916A> \xB9\x54 |0
-<U916C> \xB9\x53 |0
-<U916E> \xE0\xAC |0
-<U916F> \xE0\xAD |0
-<U9170> \x9E\x71 |0
-<U9172> \xE4\x73 |0
-<U9173> \xE4\x75 |0
-<U9174> \xBB\xC6 |0
-<U9175> \xBB\xC3 |0
-<U9176> \x9E\x4A |0
-<U9177> \xBB\xC5 |0
-<U9178> \xBB\xC4 |0
-<U9179> \xE4\x74 |0
-<U917A> \xE4\x72 |0
-<U917C> \x9F\xDC |0
-<U9180> \xE8\x61 |0
-<U9181> \xE8\x5E |0
-<U9182> \xE8\x5F |0
-<U9183> \xBE\x4D |0
-<U9184> \xE8\x60 |0
-<U9185> \xE8\x5B |0
-<U9186> \xE8\x5C |0
-<U9187> \xBE\x4A |0
-<U9189> \xBE\x4B |0
-<U918A> \xE8\x5D |0
-<U918B> \xBE\x4C |0
-<U918C> \x89\xAB |0
-<U918D> \xEB\xDB |0
-<U918E> \x9F\xB8 |0
-<U918F> \xEB\xDC |0
-<U9190> \xEB\xD9 |0
-<U9191> \xEB\xDA |0
-<U9192> \xBF\xF4 |0
-<U9193> \xEB\xD8 |0
-<U9199> \xEE\xC8 |0
-<U919A> \xEE\xC5 |0
-<U919B> \xEE\xC7 |0
-<U919C> \xC1\xE0 |0
-<U919D> \xEE\xCB |0
-<U919E> \xC1\xDF |0
-<U919F> \xEE\xC9 |0
-<U91A0> \xEE\xCC |0
-<U91A1> \xEE\xCA |0
-<U91A2> \xEE\xC6 |0
-<U91A3> \xC1\xDE |0
-<U91A5> \xF1\x4F |0
-<U91A7> \xF1\x50 |0
-<U91A8> \xF1\x4E |0
-<U91A9> \x90\x70 |0
-<U91AA> \xF1\x52 |0
-<U91AB> \xC2\xE5 |0
-<U91AC> \xC2\xE6 |0
-<U91AD> \xF3\x5F |0
-<U91AE> \xC3\xE7 |0
-<U91AF> \xF1\x51 |0
-<U91B0> \xF3\x5E |0
-<U91B1> \xC3\xE6 |0
-<U91B2> \xF4\xE5 |0
-<U91B3> \xF4\xE6 |0
-<U91B4> \xC4\xBF |0
-<U91B5> \xF4\xE4 |0
-<U91B6> \x8B\x63 |0
-<U91B7> \xF4\xE3 |0
-<U91B9> \xF6\x5D |0
-<U91BA> \xC5\x48 |0
-<U91BB> \x95\xDC |0
-<U91BC> \xF8\x49 |0
-<U91BD> \xF8\xC8 |0
-<U91BE> \xF8\xC7 |0
-<U91C0> \xC6\x43 |0
-<U91C1> \xC6\x5D |0
-<U91C2> \xF8\xC9 |0
-<U91C3> \xF9\x71 |0
-<U91C4> \x90\x71 |0
-<U91C5> \xC6\x6F |0
-<U91C6> \xA8\xBC |0
-<U91C7> \xAA\xF6 |0
-<U91C9> \xB9\x56 |0
-<U91CB> \xC4\xC0 |0
-<U91CC> \xA8\xBD |0
-<U91CD> \xAD\xAB |0
-<U91CE> \xB3\xA5 |0
-<U91CF> \xB6\x71 |0
-<U91D0> \xC2\xE7 |0
-<U91D1> \xAA\xF7 |0
-<U91D3> \xD0\xC1 |0
-<U91D4> \xD0\xC0 |0
-<U91D5> \xD4\x42 |0
-<U91D6> \xFC\x5E |0
-<U91D7> \xB0\x78 |0
-<U91D8> \xB0\x76 |0
-<U91D9> \xB0\x7A |0
-<U91DA> \xD4\x44 |0
-<U91DC> \xB0\x79 |0
-<U91DD> \xB0\x77 |0
-<U91DF> \x89\x49 |0
-<U91E2> \xD4\x43 |0
-<U91E3> \xB3\xA8 |0
-<U91E4> \xD7\xFC |0
-<U91E5> \x96\x5B |0
-<U91E6> \xB3\xA7 |0
-<U91E7> \xB3\xA9 |0
-<U91E8> \xD8\x42 |0
-<U91E9> \xB3\xAB |0
-<U91EA> \xD7\xFE |0
-<U91EB> \xD8\x40 |0
-<U91EC> \xD7\xF7 |0
-<U91ED> \xB3\xAA |0
-<U91EE> \xD8\x43 |0
-<U91F1> \xD7\xF9 |0
-<U91F3> \xD7\xFA |0
-<U91F4> \xD7\xF8 |0
-<U91F5> \xB3\xA6 |0
-<U91F6> \x8C\x50 |0
-<U91F7> \xD8\x41 |0
-<U91F8> \xD7\xFB |0
-<U91F9> \xD7\xFD |0
-<U91FA> \x94\xA6 |0
-<U91FD> \xDC\x6D |0
-<U91FE> \x8F\xD5 |0
-<U91FF> \xDC\x6C |0
-<U9200> \xDC\x6A |0
-<U9201> \xDC\x62 |0
-<U9202> \xDC\x71 |0
-<U9203> \xDC\x65 |0
-<U9204> \xDC\x6F |0
-<U9205> \xDC\x76 |0
-<U9206> \xDC\x6E |0
-<U9207> \xB6\x79 |0
-<U9208> \x9E\x73 |0
-<U9209> \xB6\x75 |0
-<U920A> \xDC\x63 |0
-<U920C> \xDC\x69 |0
-<U920D> \xB6\x77 |0
-<U920E> \x90\x75 |0
-<U920F> \xDC\x68 |0
-<U9210> \xB6\x78 |0
-<U9211> \xB6\x7A |0
-<U9212> \xDC\x6B |0
-<U9213> \x99\xF7 |0
-<U9214> \xB6\x72 |0
-<U9215> \xB6\x73 |0
-<U9216> \xDC\x77 |0
-<U9217> \xDC\x75 |0
-<U9219> \xDC\x74 |0
-<U921A> \xDC\x66 |0
-<U921C> \xDC\x72 |0
-<U921E> \xB6\x76 |0
-<U9221> \x8C\xBF |0
-<U9223> \xB6\x74 |0
-<U9224> \xDC\x73 |0
-<U9225> \xDC\x64 |0
-<U9226> \xDC\x67 |0
-<U9227> \xDC\x70 |0
-<U9228> \x99\xF9 |0
-<U922A> \x96\x63 |0
-<U922B> \x95\xB9 |0
-<U922D> \xE4\xBA |0
-<U922E> \xE0\xB7 |0
-<U9230> \xE0\xB0 |0
-<U9231> \xE0\xC3 |0
-<U9232> \xE0\xCC |0
-<U9233> \xE0\xB3 |0
-<U9234> \xB9\x61 |0
-<U9235> \x94\xD4 |0
-<U9236> \xE0\xC0 |0
-<U9237> \xB9\x57 |0
-<U9238> \xB9\x59 |0
-<U9239> \xB9\x65 |0
-<U923A> \xE0\xB1 |0
-<U923C> \xFC\xFA |0
-<U923D> \xB9\x5A |0
-<U923E> \xB9\x5C |0
-<U923F> \xB9\x66 |0
-<U9240> \xB9\x5B |0
-<U9241> \x90\x77 |0
-<U9244> \x90\xAB |0
-<U9245> \xB9\x64 |0
-<U9246> \xE0\xB9 |0
-<U9248> \xE0\xAE |0
-<U9249> \xB9\x62 |0
-<U924A> \xE0\xB8 |0
-<U924B> \xB9\x5E |0
-<U924C> \xE0\xCA |0
-<U924D> \xB9\x63 |0
-<U924E> \xE0\xC8 |0
-<U924F> \xE0\xBC |0
-<U9250> \xE0\xC6 |0
-<U9251> \xB9\x60 |0
-<U9252> \xE0\xAF |0
-<U9253> \xE0\xC9 |0
-<U9254> \xE0\xC4 |0
-<U9255> \x9D\x4D |0
-<U9256> \xE0\xCB |0
-<U9257> \xB9\x58 |0
-<U9258> \x99\xFA |0
-<U925A> \xB9\x67 |0
-<U925B> \xB9\x5D |0
-<U925D> \x92\xE3 |0
-<U925E> \xE0\xB5 |0
-<U925F> \x97\xBB |0
-<U9260> \xE0\xBD |0
-<U9261> \xE0\xC1 |0
-<U9262> \x90\x78 |0
-<U9263> \xE0\xC5 |0
-<U9264> \xB9\x5F |0
-<U9265> \xE0\xB4 |0
-<U9266> \xE0\xB2 |0
-<U9267> \xE0\xBE |0
-<U926B> \x99\xFB |0
-<U926C> \xE0\xBB |0
-<U926D> \xE0\xBA |0
-<U926E> \x97\xE0 |0
-<U926F> \xE0\xBF |0
-<U9270> \xE0\xC2 |0
-<U9272> \xE0\xC7 |0
-<U9276> \xE4\x78 |0
-<U9277> \x96\xDC |0
-<U9278> \xBB\xC7 |0
-<U9279> \xE4\xA4 |0
-<U927A> \xE4\x7A |0
-<U927B> \xBB\xCC |0
-<U927C> \xBB\xD0 |0
-<U927D> \xE4\xAD |0
-<U927E> \xE4\xB5 |0
-<U927F> \xE4\xA6 |0
-<U9280> \xBB\xC8 |0
-<U9281> \x9C\xA8 |0
-<U9282> \xE4\xAA |0
-<U9283> \xE0\xB6 |0
-<U9284> \x97\x72 |0
-<U9285> \xBB\xC9 |0
-<U9286> \xE4\xB1 |0
-<U9287> \xE4\xB6 |0
-<U9288> \xE4\xAE |0
-<U9289> \x94\x40 |0
-<U928A> \xE4\xB0 |0
-<U928B> \xE4\xB9 |0
-<U928C> \xE4\xB2 |0
-<U928D> \xE4\x7E |0
-<U928E> \xE4\xA9 |0
-<U928F> \x92\xF2 |0
-<U9291> \xBB\xD1 |0
-<U9293> \xBB\xCD |0
-<U9294> \xE4\x7C |0
-<U9295> \xE4\xAB |0
-<U9296> \xBB\xCB |0
-<U9297> \xE4\xA5 |0
-<U9298> \xBB\xCA |0
-<U9299> \xE4\xB3 |0
-<U929A> \xE4\xA2 |0
-<U929B> \xE4\x79 |0
-<U929C> \xBB\xCE |0
-<U929D> \xE4\xB8 |0
-<U92A0> \xE4\x7B |0
-<U92A1> \xE4\xAF |0
-<U92A2> \xE4\xAC |0
-<U92A3> \xE4\xA7 |0
-<U92A4> \xE4\x77 |0
-<U92A5> \xE4\x76 |0
-<U92A6> \xE4\xA1 |0
-<U92A7> \xE4\xB4 |0
-<U92A8> \xBB\xCF |0
-<U92A9> \xE4\xB7 |0
-<U92AA> \xE4\x7D |0
-<U92AB> \xE4\xA3 |0
-<U92AC> \xBE\x52 |0
-<U92AE> \x99\xFD |0
-<U92B1> \x99\xFC |0
-<U92B2> \xBE\x5A |0
-<U92B3> \xBE\x55 |0
-<U92B4> \xE8\xA4 |0
-<U92B5> \xE8\xA1 |0
-<U92B6> \xE8\x67 |0
-<U92B7> \xBE\x50 |0
-<U92B9> \xF9\xD7 |0
-<U92BA> \x96\x4A |0
-<U92BB> \xBE\x4F |0
-<U92BC> \xBE\x56 |0
-<U92BE> \x96\xD8 |0
-<U92BF> \x99\xFE |0
-<U92C0> \xE8\x65 |0
-<U92C1> \xBE\x54 |0
-<U92C2> \xE8\x71 |0
-<U92C3> \xE8\x63 |0
-<U92C4> \xE8\x64 |0
-<U92C5> \xBE\x4E |0
-<U92C6> \xE8\xA3 |0
-<U92C7> \xBE\x58 |0
-<U92C8> \xE8\x74 |0
-<U92C9> \xE8\x79 |0
-<U92CA> \xE8\x73 |0
-<U92CB> \xEB\xEE |0
-<U92CC> \xE8\x6F |0
-<U92CD> \xE8\x77 |0
-<U92CE> \xE8\x75 |0
-<U92CF> \xE8\x68 |0
-<U92D0> \xE8\x62 |0
-<U92D1> \xE8\x7D |0
-<U92D2> \xBE\x57 |0
-<U92D3> \xE8\x7E |0
-<U92D4> \x90\x4B |0
-<U92D5> \xE8\x78 |0
-<U92D7> \xE8\x6D |0
-<U92D8> \xE8\x6B |0
-<U92D9> \xE8\x66 |0
-<U92DB> \xFA\x41 |0
-<U92DD> \xE8\x6E |0
-<U92DE> \xE8\x7B |0
-<U92DF> \xE8\x6A |0
-<U92E0> \xE8\x7A |0
-<U92E1> \xE8\xA2 |0
-<U92E3> \x9A\x40 |0
-<U92E4> \xBE\x53 |0
-<U92E5> \x97\x5B |0
-<U92E6> \xE8\x76 |0
-<U92E7> \xE8\x7C |0
-<U92E8> \xE8\x72 |0
-<U92E9> \xE8\x6C |0
-<U92EA> \xBE\x51 |0
-<U92EB> \x9A\x41 |0
-<U92EC> \x91\xDD |0
-<U92EE> \xE4\xA8 |0
-<U92EF> \xE8\x70 |0
-<U92F0> \xBE\x59 |0
-<U92F1> \xE8\x69 |0
-<U92F2> \x93\xFC |0
-<U92F3> \x9A\x42 |0
-<U92F4> \x9A\x43 |0
-<U92F6> \x96\x59 |0
-<U92F7> \xEB\xF4 |0
-<U92F8> \xBF\xF7 |0
-<U92F9> \xEB\xF3 |0
-<U92FA> \xEB\xF0 |0
-<U92FB> \xEC\x44 |0
-<U92FC> \xBF\xFB |0
-<U92FD> \x9A\x44 |0
-<U92FE> \xEC\x41 |0
-<U92FF> \xEB\xF8 |0
-<U9300> \xEC\x43 |0
-<U9301> \xEB\xE9 |0
-<U9302> \xEB\xF6 |0
-<U9303> \x90\x51 |0
-<U9304> \xBF\xFD |0
-<U9306> \xEB\xE1 |0
-<U9307> \x94\xBF |0
-<U9308> \xEB\xDF |0
-<U9309> \xEC\x42 |0
-<U930B> \xEC\x40 |0
-<U930C> \xEB\xFE |0
-<U930D> \xEB\xED |0
-<U930E> \xEB\xEC |0
-<U930F> \xEB\xE2 |0
-<U9310> \xC0\x40 |0
-<U9312> \xEB\xE8 |0
-<U9313> \xEB\xF2 |0
-<U9314> \xEB\xFD |0
-<U9315> \xC0\x43 |0
-<U9316> \xEC\x45 |0
-<U9318> \xC1\xE8 |0
-<U9319> \xC0\x45 |0
-<U931A> \xBF\xFE |0
-<U931B> \xEB\xE6 |0
-<U931D> \xEB\xEF |0
-<U931E> \xEB\xDE |0
-<U931F> \xEB\xE0 |0
-<U9320> \xBF\xF5 |0
-<U9321> \xC0\x42 |0
-<U9322> \xBF\xFA |0
-<U9323> \xEB\xE7 |0
-<U9324> \xEB\xF7 |0
-<U9325> \xEB\xF1 |0
-<U9326> \xC0\x41 |0
-<U9327> \xEB\xDD |0
-<U9328> \xC1\xE3 |0
-<U9329> \xEB\xF9 |0
-<U932A> \xEB\xFC |0
-<U932B> \xBF\xFC |0
-<U932C> \x90\xA2 |0
-<U932D> \xEB\xEB |0
-<U932E> \xC0\x44 |0
-<U932F> \xBF\xF9 |0
-<U9330> \x9C\xAB |0
-<U9331> \x97\x76 |0
-<U9333> \xBF\xF8 |0
-<U9334> \xEB\xF5 |0
-<U9335> \xEB\xFB |0
-<U9336> \xBF\xF6 |0
-<U9338> \xEB\xE4 |0
-<U9339> \xEB\xFA |0
-<U933C> \xEB\xE5 |0
-<U9340> \xFC\x55 |0
-<U9341> \xFE\x45 |0
-<U9342> \x94\xA8 |0
-<U9343> \x9A\x45 |0
-<U9344> \xFA\x4B |0
-<U9345> \x9D\xE1 |0
-<U9346> \xEB\xEA |0
-<U9347> \xEE\xD2 |0
-<U9348> \x96\xD9 |0
-<U9349> \xEE\xD7 |0
-<U934A> \xC1\xE5 |0
-<U934B> \xC1\xE7 |0
-<U934C> \xEE\xDD |0
-<U934D> \xC1\xE1 |0
-<U934E> \xEE\xEC |0
-<U934F> \xEE\xE3 |0
-<U9350> \xEE\xD8 |0
-<U9351> \xEE\xD9 |0
-<U9352> \xEE\xE2 |0
-<U9354> \xC1\xEE |0
-<U9355> \xEE\xE1 |0
-<U9356> \xEE\xD1 |0
-<U9357> \xEE\xE0 |0
-<U9358> \xEE\xD4 |0
-<U9359> \xEE\xED |0
-<U935A> \xC1\xED |0
-<U935B> \xC1\xEB |0
-<U935C> \xEE\xD5 |0
-<U935E> \xEE\xE8 |0
-<U935F> \x97\x74 |0
-<U9360> \xEE\xDA |0
-<U9361> \xEE\xE7 |0
-<U9362> \xFD\xF5 |0
-<U9363> \xEE\xE9 |0
-<U9364> \xEE\xD0 |0
-<U9365> \xC1\xE6 |0
-<U9366> \x92\xE5 |0
-<U9367> \xEE\xEA |0
-<U9368> \x96\x45 |0
-<U9369> \x91\xDA |0
-<U936A> \xEE\xDE |0
-<U936B> \x90\xA3 |0
-<U936C> \xC1\xEA |0
-<U936D> \xEE\xDB |0
-<U936E> \xA0\x5F |0
-<U9370> \xC1\xEC |0
-<U9371> \xEE\xE4 |0
-<U9373> \x90\xAF |0
-<U9374> \x97\xBF |0
-<U9375> \xC1\xE4 |0
-<U9376> \xEE\xD6 |0
-<U9377> \xEE\xE5 |0
-<U9378> \x91\x4C |0
-<U9379> \xEE\xDF |0
-<U937A> \xEB\xE3 |0
-<U937B> \xEE\xE6 |0
-<U937C> \xEE\xD3 |0
-<U937D> \x96\x7A |0
-<U937E> \xC1\xE9 |0
-<U9380> \xEE\xEB |0
-<U9381> \x91\xDE |0
-<U9382> \xC1\xE2 |0
-<U9383> \xEE\xCE |0
-<U9384> \x9A\x46 |0
-<U9385> \xFE\xB0 |0
-<U9386> \x97\x79 |0
-<U9387> \x94\x6C |0
-<U9388> \xF1\x60 |0
-<U9389> \xF1\x59 |0
-<U938A> \xC2\xE9 |0
-<U938C> \xF1\x54 |0
-<U938D> \xF1\x63 |0
-<U938E> \xF1\x5B |0
-<U938F> \xEE\xDC |0
-<U9390> \x98\x58 |0
-<U9391> \xF1\x65 |0
-<U9392> \xF1\x55 |0
-<U9394> \xC2\xE8 |0
-<U9395> \xF1\x5F |0
-<U9396> \xC2\xEA |0
-<U9397> \xC2\xF2 |0
-<U9398> \xC2\xF0 |0
-<U9399> \xF1\x61 |0
-<U939A> \xC2\xF1 |0
-<U939B> \xF1\x57 |0
-<U939C> \x92\x66 |0
-<U939D> \xF1\x58 |0
-<U939E> \xF1\x5D |0
-<U939F> \xF1\x62 |0
-<U93A0> \x93\xFB |0
-<U93A1> \xEE\xCD |0
-<U93A2> \xC2\xEB |0
-<U93A3> \xF1\x6A |0
-<U93A4> \xF1\x67 |0
-<U93A5> \xF1\x6B |0
-<U93A6> \xF1\x5E |0
-<U93A7> \xF1\x5A |0
-<U93A8> \xF1\x68 |0
-<U93A9> \xF3\x6A |0
-<U93AA> \xF1\x5C |0
-<U93AC> \xC2\xEE |0
-<U93AD> \x9A\x47 |0
-<U93AE> \xC2\xED |0
-<U93AF> \xEE\xCF |0
-<U93B0> \xC2\xEF |0
-<U93B1> \xF1\x64 |0
-<U93B2> \xF1\x66 |0
-<U93B3> \xC2\xEC |0
-<U93B4> \xF1\x69 |0
-<U93B5> \xF1\x53 |0
-<U93B7> \xF1\x56 |0
-<U93B8> \x97\x49 |0
-<U93BB> \x97\x48 |0
-<U93BD> \x93\x4A |0
-<U93BF> \x9C\xE2 |0
-<U93C0> \xF3\x73 |0
-<U93C2> \xF3\x63 |0
-<U93C3> \xC3\xEB |0
-<U93C4> \xF3\x71 |0
-<U93C6> \x92\x64 |0
-<U93C7> \xF3\x61 |0
-<U93C8> \xC3\xEC |0
-<U93CA> \xF3\x6C |0
-<U93CB> \x91\xDF |0
-<U93CC> \xF3\x68 |0
-<U93CD> \xC3\xF1 |0
-<U93CE> \xF3\x72 |0
-<U93CF> \xF3\x62 |0
-<U93D0> \xF3\x65 |0
-<U93D1> \xC3\xE9 |0
-<U93D2> \xF3\x74 |0
-<U93D3> \xFB\x79 |0
-<U93D4> \xF3\x6D |0
-<U93D5> \xF3\x70 |0
-<U93D6> \xC3\xEF |0
-<U93D7> \xC3\xF4 |0
-<U93D8> \xC3\xF2 |0
-<U93D9> \xF3\x69 |0
-<U93DA> \xF3\x64 |0
-<U93DB> \x96\xD7 |0
-<U93DC> \xC3\xED |0
-<U93DD> \xC3\xEE |0
-<U93DE> \xF3\x60 |0
-<U93DF> \xC3\xEA |0
-<U93E0> \x93\x43 |0
-<U93E1> \xC3\xE8 |0
-<U93E2> \xC3\xF0 |0
-<U93E3> \xF3\x6F |0
-<U93E4> \xC3\xF3 |0
-<U93E6> \xF3\x6B |0
-<U93E7> \xF3\x75 |0
-<U93E8> \xC3\xF5 |0
-<U93EC> \xF3\x67 |0
-<U93EE> \xF3\x6E |0
-<U93F0> \xFD\xCB |0
-<U93F1> \xFE\x7A |0
-<U93F3> \x91\xDB |0
-<U93F4> \x8C\x6A |0
-<U93F5> \xF4\xF3 |0
-<U93F6> \xF5\x42 |0
-<U93F7> \xF4\xF5 |0
-<U93F8> \xF4\xFC |0
-<U93F9> \xF3\x66 |0
-<U93FA> \xF4\xFA |0
-<U93FB> \xF4\xE9 |0
-<U93FC> \xF5\x40 |0
-<U93FD> \xC4\xC3 |0
-<U93FE> \xF4\xED |0
-<U93FF> \xF4\xFE |0
-<U9400> \xF4\xF4 |0
-<U9401> \x97\xAF |0
-<U9403> \xC4\xC2 |0
-<U9404> \x95\xDD |0
-<U9406> \xF5\x44 |0
-<U9407> \xF4\xF6 |0
-<U9408> \x93\x48 |0
-<U9409> \xF4\xFB |0
-<U940A> \xF4\xFD |0
-<U940B> \xF4\xE7 |0
-<U940C> \xF5\x41 |0
-<U940D> \xF4\xF2 |0
-<U940E> \xF4\xF7 |0
-<U940F> \xF4\xEB |0
-<U9410> \xF4\xEF |0
-<U9411> \xF5\x43 |0
-<U9412> \xF4\xF9 |0
-<U9413> \xF4\xE8 |0
-<U9414> \xF4\xEC |0
-<U9415> \xF4\xEE |0
-<U9416> \xF4\xF8 |0
-<U9417> \x9A\x4B |0
-<U9418> \xC4\xC1 |0
-<U9419> \xF4\xF1 |0
-<U941B> \xFC\x45 |0
-<U941D> \x9A\x4D |0
-<U9420> \xF4\xEA |0
-<U9424> \x91\xBC |0
-<U9425> \x90\xE2 |0
-<U9426> \x90\xB4 |0
-<U9427> \x95\xE1 |0
-<U9428> \xF4\xF0 |0
-<U9429> \xF6\x61 |0
-<U942A> \xF6\x66 |0
-<U942B> \xC5\x4F |0
-<U942C> \xF6\x68 |0
-<U942D> \x9A\x4E |0
-<U942E> \xC5\x49 |0
-<U9430> \xF6\x64 |0
-<U9431> \xF6\x6A |0
-<U9432> \xC5\x4E |0
-<U9433> \xC5\x4A |0
-<U9435> \xC5\x4B |0
-<U9436> \xF6\x60 |0
-<U9437> \xF6\x67 |0
-<U9438> \xC5\x4D |0
-<U9439> \xF6\x65 |0
-<U943A> \xC5\x4C |0
-<U943B> \xF6\x5F |0
-<U943C> \xF6\x63 |0
-<U943D> \xF6\x62 |0
-<U943E> \x9A\x4F |0
-<U943F> \xF6\x5E |0
-<U9440> \xF6\x69 |0
-<U9442> \xFE\x40 |0
-<U9443> \xFE\x43 |0
-<U9444> \xC5\xB1 |0
-<U9445> \xF7\x6D |0
-<U9446> \xF7\x70 |0
-<U9447> \xF7\x6C |0
-<U9448> \xF7\x6E |0
-<U9449> \xF7\x6F |0
-<U944A> \xF7\x69 |0
-<U944B> \xF7\x6A |0
-<U944C> \xF7\x67 |0
-<U944D> \x96\xDD |0
-<U944F> \xF7\x6B |0
-<U9450> \xF7\x68 |0
-<U9451> \xC5\xB2 |0
-<U9452> \xC5\xB3 |0
-<U9454> \x9A\x51 |0
-<U9455> \xF8\x4B |0
-<U9457> \xF8\x4D |0
-<U9458> \x96\xA7 |0
-<U945B> \x90\xB0 |0
-<U945D> \xF8\x4C |0
-<U945E> \xF8\x4E |0
-<U9460> \xC5\xE0 |0
-<U9462> \xF8\x4A |0
-<U9463> \xC5\xDF |0
-<U9464> \xC5\xE1 |0
-<U9465> \x9C\x4E |0
-<U9467> \x94\x43 |0
-<U9468> \xF8\xCB |0
-<U9469> \xF8\xCC |0
-<U946A> \xC6\x44 |0
-<U946B> \xF8\xCA |0
-<U946C> \x8E\xBA |0
-<U946D> \xF9\x53 |0
-<U946E> \xF9\x52 |0
-<U946F> \xF9\x54 |0
-<U9470> \xC6\x5F |0
-<U9471> \xF9\x55 |0
-<U9472> \xC6\x5E |0
-<U9473> \xF9\x56 |0
-<U9474> \xF9\x72 |0
-<U9475> \xF9\x75 |0
-<U9476> \xF9\x74 |0
-<U9477> \xC6\x68 |0
-<U9478> \xF9\x73 |0
-<U9479> \x9A\x52 |0
-<U947B> \xFC\xC1 |0
-<U947C> \xC6\x72 |0
-<U947D> \xC6\x70 |0
-<U947E> \xC6\x71 |0
-<U947F> \xC6\x77 |0
-<U9480> \xF9\xC0 |0
-<U9481> \xF9\xC1 |0
-<U9482> \xF9\xBF |0
-<U9483> \xF9\xC9 |0
-<U9485> \x8B\xE9 |0
-<U949F> \x9C\xAF |0
-<U94A2> \x8B\xFD |0
-<U94C1> \x9A\xBC |0
-<U94C3> \x9A\xB8 |0
-<U94DC> \x9A\xAE |0
-<U94F6> \x9A\xA7 |0
-<U952D> \x9A\x53 |0
-<U9547> \x9D\x74 |0
-<U9577> \xAA\xF8 |0
-<U9578> \x8B\xEA |0
-<U957A> \xD8\x44 |0
-<U957B> \xDC\x78 |0
-<U957C> \xE8\xA5 |0
-<U957D> \xF3\x76 |0
-<U957F> \x8B\xEB |0
-<U9580> \xAA\xF9 |0
-<U9582> \xAD\xAC |0
-<U9583> \xB0\x7B |0
-<U9585> \x90\xB2 |0
-<U9586> \xD8\x45 |0
-<U9588> \xD8\x46 |0
-<U9589> \xB3\xAC |0
-<U958B> \xB6\x7D |0
-<U958C> \xDC\x7A |0
-<U958D> \xDC\x79 |0
-<U958E> \xB6\xA3 |0
-<U958F> \xB6\x7C |0
-<U9590> \xDC\x7B |0
-<U9591> \xB6\x7E |0
-<U9592> \xB6\xA2 |0
-<U9593> \xB6\xA1 |0
-<U9594> \xB6\x7B |0
-<U9596> \x95\xE9 |0
-<U9597> \x95\xE8 |0
-<U9598> \xB9\x68 |0
-<U9599> \x95\xE6 |0
-<U959B> \xE0\xD0 |0
-<U959C> \xE0\xCE |0
-<U959E> \xE0\xCF |0
-<U959F> \xE0\xCD |0
-<U95A0> \x90\xB5 |0
-<U95A1> \xBB\xD2 |0
-<U95A2> \x9A\x54 |0
-<U95A3> \xBB\xD5 |0
-<U95A4> \xBB\xD7 |0
-<U95A5> \xBB\xD6 |0
-<U95A6> \x90\xB3 |0
-<U95A7> \x95\xE7 |0
-<U95A8> \xBB\xD3 |0
-<U95A9> \xBB\xD4 |0
-<U95AA> \x8B\x50 |0
-<U95AB> \xE8\xA7 |0
-<U95AC> \xE8\xA6 |0
-<U95AD> \xBE\x5B |0
-<U95AE> \xE8\xA8 |0
-<U95B0> \xE8\xA9 |0
-<U95B1> \xBE\x5C |0
-<U95B5> \xEC\x4D |0
-<U95B6> \xEC\x4B |0
-<U95B7> \xEE\xF3 |0
-<U95B9> \xEC\x49 |0
-<U95BA> \xEC\x4A |0
-<U95BB> \xC0\x46 |0
-<U95BC> \xEC\x46 |0
-<U95BD> \xEC\x4E |0
-<U95BE> \xEC\x48 |0
-<U95BF> \xEC\x4C |0
-<U95C0> \xEE\xEF |0
-<U95C3> \xEE\xF1 |0
-<U95C5> \xEE\xF2 |0
-<U95C6> \xC1\xF3 |0
-<U95C7> \xEE\xEE |0
-<U95C8> \xC1\xF2 |0
-<U95C9> \xEE\xF0 |0
-<U95CA> \xC1\xEF |0
-<U95CB> \xC1\xF0 |0
-<U95CC> \xC1\xF1 |0
-<U95CD> \xEC\x47 |0
-<U95D0> \xC2\xF5 |0
-<U95D1> \xF1\x6E |0
-<U95D2> \xF1\x6C |0
-<U95D3> \xF1\x6D |0
-<U95D4> \xC2\xF3 |0
-<U95D5> \xC2\xF6 |0
-<U95D6> \xC2\xF4 |0
-<U95DA> \xF3\x77 |0
-<U95DB> \xF3\x78 |0
-<U95DC> \xC3\xF6 |0
-<U95DE> \xF5\x45 |0
-<U95DF> \xF5\x47 |0
-<U95E0> \xF5\x46 |0
-<U95E1> \xC4\xC4 |0
-<U95E2> \xC5\x50 |0
-<U95E3> \xF6\x6D |0
-<U95E4> \xF6\x6C |0
-<U95E5> \xF6\x6B |0
-<U95E8> \x8B\xEC |0
-<U95F4> \x9A\x56 |0
-<U961C> \xAA\xFA |0
-<U961D> \x8B\xFB |0
-<U961E> \xC9\xAA |0
-<U9620> \xCA\x58 |0
-<U9621> \xA6\xE9 |0
-<U9622> \xCA\x56 |0
-<U9623> \xCA\x59 |0
-<U9624> \xCA\x57 |0
-<U9628> \xCB\xAE |0
-<U962A> \xA8\xC1 |0
-<U962C> \xA8\xC2 |0
-<U962D> \xCB\xB0 |0
-<U962E> \xA8\xBF |0
-<U962F> \xCB\xAF |0
-<U9630> \xCB\xAD |0
-<U9631> \xA8\xC0 |0
-<U9632> \xA8\xBE |0
-<U9633> \x9A\x57 |0
-<U9638> \xA0\xAA |0
-<U9639> \xCD\xD8 |0
-<U963A> \xCD\xDB |0
-<U963B> \xAA\xFD |0
-<U963C> \xCD\xDA |0
-<U963D> \xCD\xD9 |0
-<U963F> \xAA\xFC |0
-<U9640> \xAA\xFB |0
-<U9641> \x9F\xA6 |0
-<U9642> \xAB\x40 |0
-<U9643> \xCD\xDC |0
-<U9644> \xAA\xFE |0
-<U9645> \x99\xCC |0
-<U964A> \xD0\xC6 |0
-<U964B> \xAD\xAE |0
-<U964C> \xAD\xAF |0
-<U964D> \xAD\xB0 |0
-<U964E> \xD0\xC7 |0
-<U964F> \xD0\xC3 |0
-<U9650> \xAD\xAD |0
-<U9651> \xD0\xC4 |0
-<U9653> \xD0\xC5 |0
-<U9654> \xD0\xC2 |0
-<U9656> \x9C\x59 |0
-<U9658> \xB0\xA4 |0
-<U965B> \xB0\xA1 |0
-<U965C> \xD4\x45 |0
-<U965D> \xB0\xA2 |0
-<U965E> \xB0\xA5 |0
-<U965F> \xD4\x46 |0
-<U9661> \xB0\x7E |0
-<U9662> \xB0\x7C |0
-<U9663> \xB0\x7D |0
-<U9664> \xB0\xA3 |0
-<U9669> \x99\xB5 |0
-<U966A> \xB3\xAD |0
-<U966B> \xD8\x49 |0
-<U966C> \xB3\xB5 |0
-<U966D> \xD8\x48 |0
-<U966F> \xD8\x4B |0
-<U9670> \xB3\xB1 |0
-<U9671> \xD8\x4A |0
-<U9672> \xB6\xAB |0
-<U9673> \xB3\xAF |0
-<U9674> \xB3\xB2 |0
-<U9675> \xB3\xAE |0
-<U9676> \xB3\xB3 |0
-<U9677> \xB3\xB4 |0
-<U9678> \xB3\xB0 |0
-<U967B> \x90\xBE |0
-<U967C> \xD8\x47 |0
-<U967D> \xB6\xA7 |0
-<U967E> \xDC\x7D |0
-<U9680> \xDC\xA3 |0
-<U9681> \x9F\xAF |0
-<U9683> \xDC\xA2 |0
-<U9684> \xB6\xAC |0
-<U9685> \xB6\xA8 |0
-<U9686> \xB6\xA9 |0
-<U9687> \xDC\x7C |0
-<U9688> \xDC\x7E |0
-<U9689> \xDC\xA1 |0
-<U968A> \xB6\xA4 |0
-<U968B> \xB6\xA6 |0
-<U968D> \xB6\xAA |0
-<U968E> \xB6\xA5 |0
-<U968F> \x95\xF2 |0
-<U9691> \xE0\xD3 |0
-<U9692> \xE0\xD1 |0
-<U9693> \xE0\xD2 |0
-<U9694> \xB9\x6A |0
-<U9695> \xB9\x6B |0
-<U9696> \x90\xBF |0
-<U9697> \xE0\xD4 |0
-<U9698> \xB9\x69 |0
-<U9699> \xBB\xD8 |0
-<U969B> \xBB\xDA |0
-<U969C> \xBB\xD9 |0
-<U969E> \xE4\xBB |0
-<U96A1> \xE4\xBC |0
-<U96A2> \xE8\xAB |0
-<U96A3> \x90\xC1 |0
-<U96A4> \xE8\xAA |0
-<U96A5> \xFE\xE4 |0
-<U96A7> \xC0\x47 |0
-<U96A8> \xC0\x48 |0
-<U96A9> \xEC\x4F |0
-<U96AA> \xC0\x49 |0
-<U96AC> \xEE\xF6 |0
-<U96AE> \xEE\xF4 |0
-<U96B0> \xEE\xF5 |0
-<U96B1> \xC1\xF4 |0
-<U96B3> \xF1\x6F |0
-<U96B4> \xC3\xF7 |0
-<U96B6> \x90\xC4 |0
-<U96B8> \xC1\xF5 |0
-<U96B9> \xAB\x41 |0
-<U96BB> \xB0\xA6 |0
-<U96BC> \xD4\x47 |0
-<U96BD> \x90\xC7 |0
-<U96BF> \xD8\x4C |0
-<U96C0> \xB3\xB6 |0
-<U96C1> \xB6\xAD |0
-<U96C2> \xDC\xA4 |0
-<U96C3> \xDC\xA6 |0
-<U96C4> \xB6\xAF |0
-<U96C5> \xB6\xAE |0
-<U96C6> \xB6\xB0 |0
-<U96C7> \xB6\xB1 |0
-<U96C8> \xDC\xA5 |0
-<U96C9> \xB9\x6E |0
-<U96CA> \xB9\x6F |0
-<U96CB> \xB9\x6D |0
-<U96CC> \xBB\xDB |0
-<U96CD> \xB9\x6C |0
-<U96CE> \xE0\xD5 |0
-<U96D2> \xBB\xDC |0
-<U96D3> \xE8\xAC |0
-<U96D4> \xEC\x50 |0
-<U96D5> \xC0\x4A |0
-<U96D6> \xC1\xF6 |0
-<U96D7> \xF1\x70 |0
-<U96D8> \xF1\x74 |0
-<U96D9> \xC2\xF9 |0
-<U96DA> \xF1\x71 |0
-<U96DB> \xC2\xFA |0
-<U96DC> \xC2\xF8 |0
-<U96DD> \xF1\x75 |0
-<U96DE> \xC2\xFB |0
-<U96DF> \xF1\x73 |0
-<U96E1> \xF3\x79 |0
-<U96E2> \xC2\xF7 |0
-<U96E3> \xC3\xF8 |0
-<U96E5> \xF8\xCD |0
-<U96E8> \xAB\x42 |0
-<U96E9> \xB3\xB8 |0
-<U96EA> \xB3\xB7 |0
-<U96EF> \xB6\xB2 |0
-<U96F0> \xDC\xA8 |0
-<U96F1> \xDC\xA7 |0
-<U96F2> \xB6\xB3 |0
-<U96F4> \x92\xE4 |0
-<U96F5> \xE0\xD9 |0
-<U96F6> \xB9\x73 |0
-<U96F7> \xB9\x70 |0
-<U96F8> \xE0\xD8 |0
-<U96F9> \xB9\x72 |0
-<U96FA> \xE0\xD6 |0
-<U96FB> \xB9\x71 |0
-<U96FD> \xE0\xD7 |0
-<U96FF> \xE4\xBD |0
-<U9700> \xBB\xDD |0
-<U9702> \xE8\xAF |0
-<U9703> \x9F\x52 |0
-<U9704> \xBE\x5D |0
-<U9705> \xE8\xAD |0
-<U9706> \xBE\x5E |0
-<U9707> \xBE\x5F |0
-<U9708> \xE8\xAE |0
-<U9709> \xBE\x60 |0
-<U970B> \xEC\x51 |0
-<U970D> \xC0\x4E |0
-<U970E> \xC0\x4B |0
-<U970F> \xC0\x50 |0
-<U9710> \xEC\x53 |0
-<U9711> \xC0\x4C |0
-<U9712> \xEC\x52 |0
-<U9713> \xC0\x4F |0
-<U9716> \xC0\x4D |0
-<U9718> \xEE\xF9 |0
-<U9719> \xEE\xFB |0
-<U971B> \x90\xDB |0
-<U971C> \xC1\xF7 |0
-<U971D> \xEE\xFA |0
-<U971E> \xC1\xF8 |0
-<U971F> \xEE\xF8 |0
-<U9720> \xEE\xF7 |0
-<U9721> \xA0\x66 |0
-<U9722> \xF1\x77 |0
-<U9723> \xF1\x76 |0
-<U9724> \xC2\xFC |0
-<U9725> \xF1\x78 |0
-<U9726> \xF3\x7E |0
-<U9727> \xC3\xFA |0
-<U9728> \xF3\x7D |0
-<U9729> \xF3\x7A |0
-<U972A> \xC3\xF9 |0
-<U972B> \xF3\x7B |0
-<U972C> \xF3\x7C |0
-<U972E> \xF5\x48 |0
-<U972F> \xF5\x49 |0
-<U9730> \xC4\xC5 |0
-<U9731> \x90\xD2 |0
-<U9732> \xC5\x53 |0
-<U9735> \xF6\x6E |0
-<U9736> \x90\xD4 |0
-<U9738> \xC5\x51 |0
-<U9739> \xC5\x52 |0
-<U973A> \xF6\x6F |0
-<U973D> \xC5\xB4 |0
-<U973E> \xC5\xB5 |0
-<U973F> \xF7\x71 |0
-<U9740> \x9A\x5B |0
-<U9741> \x95\xFD |0
-<U9742> \xC6\x45 |0
-<U9743> \xF8\xCF |0
-<U9744> \xC6\x47 |0
-<U9746> \xF8\xCE |0
-<U9747> \xF8\xD0 |0
-<U9748> \xC6\x46 |0
-<U9749> \xF9\x57 |0
-<U974B> \xF9\xAD |0
-<U9751> \x8B\xC4 |0
-<U9752> \xAB\x43 |0
-<U9755> \x8C\x66 |0
-<U9756> \xB9\x74 |0
-<U9757> \x90\xDE |0
-<U9758> \xE4\xBE |0
-<U975A> \xE8\xB0 |0
-<U975B> \xC0\x51 |0
-<U975C> \xC0\x52 |0
-<U975D> \x9C\xE4 |0
-<U975E> \xAB\x44 |0
-<U975F> \x90\xE1 |0
-<U9760> \xBE\x61 |0
-<U9761> \xC3\xFB |0
-<U9762> \xAD\xB1 |0
-<U9766> \xC0\x53 |0
-<U9768> \xC5\xE2 |0
-<U9769> \xAD\xB2 |0
-<U976A> \xD8\x4D |0
-<U976C> \xDC\xA9 |0
-<U976D> \x9E\x46 |0
-<U976E> \xDC\xAB |0
-<U9770> \xDC\xAA |0
-<U9771> \x96\x51 |0
-<U9772> \xE0\xDD |0
-<U9773> \xE0\xDA |0
-<U9774> \xB9\x75 |0
-<U9776> \xB9\x76 |0
-<U9777> \xE0\xDB |0
-<U9778> \xE0\xDC |0
-<U977A> \xE4\xC0 |0
-<U977B> \xE4\xC5 |0
-<U977C> \xBB\xDE |0
-<U977D> \xE4\xBF |0
-<U977E> \xE4\xC1 |0
-<U977F> \xE4\xC8 |0
-<U9780> \xE4\xC3 |0
-<U9781> \xE4\xC7 |0
-<U9782> \xE4\xC4 |0
-<U9783> \xE4\xC2 |0
-<U9784> \xE4\xC6 |0
-<U9785> \xBB\xDF |0
-<U9787> \xFB\x58 |0
-<U9788> \xE8\xB3 |0
-<U9789> \x90\xE6 |0
-<U978A> \xE8\xB1 |0
-<U978B> \xBE\x63 |0
-<U978D> \xBE\x62 |0
-<U978E> \xE8\xB2 |0
-<U978F> \xBE\x64 |0
-<U9794> \xEC\x56 |0
-<U9797> \xEC\x55 |0
-<U9798> \xC0\x54 |0
-<U9799> \xEC\x54 |0
-<U979A> \xEE\xFC |0
-<U979B> \x96\x50 |0
-<U979C> \xEE\xFE |0
-<U979D> \xEF\x41 |0
-<U979E> \xEF\x40 |0
-<U979F> \x90\xE7 |0
-<U97A0> \xC1\xF9 |0
-<U97A1> \xEE\xFD |0
-<U97A2> \xF1\xA1 |0
-<U97A3> \xC2\xFD |0
-<U97A4> \xF1\x7D |0
-<U97A5> \xF1\xA2 |0
-<U97A6> \xC2\xFE |0
-<U97A8> \xF1\x7B |0
-<U97AA> \xF1\x7E |0
-<U97AB> \xF1\x7C |0
-<U97AC> \xF1\x79 |0
-<U97AD> \xC3\x40 |0
-<U97AE> \xF1\x7A |0
-<U97B1> \x90\xE8 |0
-<U97B2> \x9A\x5D |0
-<U97B3> \xF3\xA1 |0
-<U97B4> \x9F\x7A |0
-<U97B6> \xF3\xA3 |0
-<U97B7> \xF3\xA2 |0
-<U97B8> \x9B\x5C |0
-<U97B9> \xF5\x4A |0
-<U97BA> \x9F\x7C |0
-<U97BB> \xF5\x4B |0
-<U97BD> \xFC\x52 |0
-<U97BE> \x90\xE9 |0
-<U97BF> \xF6\x70 |0
-<U97C0> \x90\xEA |0
-<U97C1> \xC5\xB7 |0
-<U97C2> \x9A\x5E |0
-<U97C3> \xC5\xB6 |0
-<U97C4> \xF8\x4F |0
-<U97C5> \xF8\x50 |0
-<U97C6> \xC6\x48 |0
-<U97C7> \xF8\xD1 |0
-<U97C8> \x9F\x76 |0
-<U97C9> \xC6\x69 |0
-<U97CB> \xAD\xB3 |0
-<U97CC> \xB6\xB4 |0
-<U97CD> \xE4\xCA |0
-<U97CE> \xE4\xC9 |0
-<U97CF> \xE8\xB5 |0
-<U97D0> \xE8\xB4 |0
-<U97D2> \x90\xEB |0
-<U97D3> \xC1\xFA |0
-<U97D4> \xEF\x43 |0
-<U97D5> \xEF\x42 |0
-<U97D6> \xF1\xA5 |0
-<U97D7> \xF1\xA3 |0
-<U97D8> \xF1\xA6 |0
-<U97D9> \xF1\xA4 |0
-<U97DC> \xC3\xFC |0
-<U97DD> \xF3\xA4 |0
-<U97DE> \xF3\xA5 |0
-<U97DF> \xF3\xA6 |0
-<U97E0> \x90\xEC |0
-<U97E1> \xF6\x71 |0
-<U97E3> \xF7\x72 |0
-<U97E5> \xF8\xD2 |0
-<U97E6> \x8B\xEE |0
-<U97ED> \xAD\xB4 |0
-<U97EE> \x90\xEE |0
-<U97F0> \xEC\x57 |0
-<U97F1> \xEF\x44 |0
-<U97F2> \x91\xC6 |0
-<U97F3> \xAD\xB5 |0
-<U97F5> \x90\xF2 |0
-<U97F6> \xBB\xE0 |0
-<U97F8> \xEC\x58 |0
-<U97F9> \xC3\x41 |0
-<U97FA> \xF1\xA7 |0
-<U97FB> \xC3\xFD |0
-<U97FD> \xF5\x4C |0
-<U97FE> \xF5\x4D |0
-<U97FF> \xC5\x54 |0
-<U9800> \xF8\x51 |0
-<U9801> \xAD\xB6 |0
-<U9802> \xB3\xBB |0
-<U9803> \xB3\xBC |0
-<U9804> \xD8\x4E |0
-<U9805> \xB6\xB5 |0
-<U9806> \xB6\xB6 |0
-<U9807> \xDC\xAC |0
-<U9808> \xB6\xB7 |0
-<U980A> \xB9\x7A |0
-<U980C> \xB9\x7C |0
-<U980D> \xE0\xDF |0
-<U980E> \xE0\xE0 |0
-<U980F> \xE0\xDE |0
-<U9810> \xB9\x77 |0
-<U9811> \xB9\x78 |0
-<U9812> \xB9\x7B |0
-<U9813> \xB9\x79 |0
-<U9814> \xFC\xBC |0
-<U9815> \x8A\x74 |0
-<U9816> \xE4\xCB |0
-<U9817> \xBB\xE1 |0
-<U9818> \xBB\xE2 |0
-<U981B> \xE8\xBC |0
-<U981C> \xBE\x67 |0
-<U981D> \xE8\xB7 |0
-<U981E> \xE8\xB6 |0
-<U981F> \x96\x57 |0
-<U9820> \xE8\xBB |0
-<U9821> \xBE\x65 |0
-<U9823> \x9C\xEF |0
-<U9824> \xC0\x5B |0
-<U9826> \xE8\xB8 |0
-<U9827> \xE8\xBD |0
-<U9828> \xE8\xBA |0
-<U9829> \xE8\xB9 |0
-<U982B> \xBE\x66 |0
-<U982D> \xC0\x59 |0
-<U982E> \x9F\xDF |0
-<U982F> \xEC\x5A |0
-<U9830> \xC0\x55 |0
-<U9832> \xEC\x5B |0
-<U9833> \x90\xF7 |0
-<U9834> \x90\xF6 |0
-<U9835> \xEC\x59 |0
-<U9837> \xC0\x58 |0
-<U9838> \xC0\x56 |0
-<U9839> \xC0\x5A |0
-<U983B> \xC0\x57 |0
-<U9841> \xEF\x45 |0
-<U9843> \xEF\x4A |0
-<U9844> \xEF\x46 |0
-<U9845> \xEF\x49 |0
-<U9846> \xC1\xFB |0
-<U9847> \x9B\x5E |0
-<U9848> \xED\xD4 |0
-<U9849> \xEF\x48 |0
-<U984A> \xEF\x47 |0
-<U984B> \x90\xF8 |0
-<U984C> \xC3\x44 |0
-<U984D> \xC3\x42 |0
-<U984E> \xC3\x45 |0
-<U984F> \xC3\x43 |0
-<U9850> \xF1\xA8 |0
-<U9851> \xF1\xA9 |0
-<U9852> \xF1\xAA |0
-<U9853> \xC3\x46 |0
-<U9857> \xF3\xAA |0
-<U9858> \xC4\x40 |0
-<U9859> \xF3\xA8 |0
-<U985B> \xC4\x41 |0
-<U985C> \xF3\xA7 |0
-<U985D> \xF3\xA9 |0
-<U985E> \xC3\xFE |0
-<U985F> \xF5\x51 |0
-<U9860> \xF5\x4E |0
-<U9862> \xF5\x4F |0
-<U9863> \xF5\x50 |0
-<U9864> \xF6\x72 |0
-<U9865> \xC5\x56 |0
-<U9866> \x90\xF9 |0
-<U9867> \xC5\x55 |0
-<U9868> \x8C\xC9 |0
-<U9869> \xF7\x74 |0
-<U986A> \xF7\x73 |0
-<U986B> \xC5\xB8 |0
-<U986C> \xFA\x6A |0
-<U986F> \xC5\xE3 |0
-<U9870> \xC6\x49 |0
-<U9871> \xC6\x60 |0
-<U9872> \xF9\x58 |0
-<U9873> \xF9\xAE |0
-<U9874> \xF9\xAF |0
-<U9875> \x8B\xEF |0
-<U98A8> \xAD\xB7 |0
-<U98A9> \xDC\xAD |0
-<U98AC> \xE0\xE1 |0
-<U98AD> \xE4\xCC |0
-<U98AE> \xE4\xCD |0
-<U98AF> \xBB\xE3 |0
-<U98B1> \xBB\xE4 |0
-<U98B2> \xE8\xBE |0
-<U98B3> \xBE\x68 |0
-<U98B4> \x9F\xE0 |0
-<U98B6> \xC1\xFC |0
-<U98B7> \x91\x42 |0
-<U98B8> \xF1\xAB |0
-<U98B9> \x9A\x62 |0
-<U98BA> \xC3\x47 |0
-<U98BB> \xF3\xAD |0
-<U98BC> \xC4\x42 |0
-<U98BD> \xF3\xAC |0
-<U98BE> \xF3\xAE |0
-<U98BF> \xF3\xAB |0
-<U98C0> \xF6\x75 |0
-<U98C1> \xF5\x52 |0
-<U98C2> \xF5\x53 |0
-<U98C3> \x95\x69 |0
-<U98C4> \xC4\xC6 |0
-<U98C6> \xF6\x74 |0
-<U98C7> \x91\x44 |0
-<U98C8> \x91\x43 |0
-<U98C9> \xF6\x73 |0
-<U98CA> \x91\x41 |0
-<U98CB> \xF7\x75 |0
-<U98CC> \xF9\xB0 |0
-<U98CE> \x8B\xF0 |0
-<U98DB> \xAD\xB8 |0
-<U98DC> \x96\x60 |0
-<U98DE> \x8B\xF1 |0
-<U98DF> \xAD\xB9 |0
-<U98E0> \x99\xF6 |0
-<U98E1> \x91\x49 |0
-<U98E2> \xB0\xA7 |0
-<U98E3> \xD4\x48 |0
-<U98E5> \xD8\x4F |0
-<U98E6> \x91\x4A |0
-<U98E7> \xB6\xB8 |0
-<U98E9> \xB6\xBB |0
-<U98EA> \xB6\xB9 |0
-<U98EB> \xDC\xAE |0
-<U98EC> \x91\x4B |0
-<U98ED> \xB6\xBD |0
-<U98EF> \xB6\xBA |0
-<U98F1> \x9A\x64 |0
-<U98F2> \xB6\xBC |0
-<U98F4> \xB9\x7E |0
-<U98F5> \x8A\xBF |0
-<U98F6> \xE0\xE2 |0
-<U98F9> \xE0\xE3 |0
-<U98FA> \xE8\xC0 |0
-<U98FC> \xB9\x7D |0
-<U98FD> \xB9\xA1 |0
-<U98FE> \xB9\xA2 |0
-<U9900> \xE4\xCF |0
-<U9902> \xE4\xCE |0
-<U9903> \xBB\xE5 |0
-<U9905> \xBB\xE6 |0
-<U9907> \xE4\xD0 |0
-<U9908> \xE8\xBF |0
-<U9909> \xBB\xE8 |0
-<U990A> \xBE\x69 |0
-<U990C> \xBB\xE7 |0
-<U990E> \x9A\x66 |0
-<U9910> \xC0\x5C |0
-<U9911> \xE8\xC1 |0
-<U9912> \xBE\x6B |0
-<U9913> \xBE\x6A |0
-<U9914> \xE8\xC2 |0
-<U9915> \xE8\xC5 |0
-<U9916> \xE8\xC3 |0
-<U9917> \xE8\xC4 |0
-<U9918> \xBE\x6C |0
-<U9919> \x9A\x67 |0
-<U991A> \xC0\x61 |0
-<U991B> \xC0\x5F |0
-<U991C> \x9A\x69 |0
-<U991E> \xC0\x5E |0
-<U991F> \xEC\x5D |0
-<U9921> \xC0\x60 |0
-<U9924> \xEC\x5C |0
-<U9925> \xEF\x4B |0
-<U9927> \xEC\x5E |0
-<U9928> \xC0\x5D |0
-<U9929> \xEC\x5F |0
-<U992A> \xEF\x4E |0
-<U992B> \xEF\x4C |0
-<U992C> \xEF\x4D |0
-<U992D> \xEF\x52 |0
-<U992E> \xC3\x4B |0
-<U992F> \xEF\x51 |0
-<U9930> \xEF\x54 |0
-<U9931> \xEF\x53 |0
-<U9932> \xEF\x50 |0
-<U9933> \xEF\x4F |0
-<U9935> \xC1\xFD |0
-<U9937> \x9A\x6A |0
-<U9938> \x96\x52 |0
-<U9939> \x91\x4D |0
-<U993A> \xF1\xAE |0
-<U993B> \x96\x66 |0
-<U993C> \xF1\xAD |0
-<U993D> \xC3\x4A |0
-<U993E> \xC3\x48 |0
-<U993F> \xC3\x49 |0
-<U9940> \x9F\x7B |0
-<U9941> \xF1\xAC |0
-<U9942> \x9A\x6B |0
-<U9943> \xF3\xB1 |0
-<U9945> \xC4\x43 |0
-<U9947> \xF3\xB0 |0
-<U9948> \xF3\xAF |0
-<U9949> \xC4\x44 |0
-<U994A> \xA0\x6C |0
-<U994B> \xF5\x58 |0
-<U994C> \xF5\x57 |0
-<U994D> \x96\x67 |0
-<U994E> \xF5\x55 |0
-<U9950> \xF5\x54 |0
-<U9951> \xC4\xC8 |0
-<U9952> \xC4\xC7 |0
-<U9953> \xF5\x59 |0
-<U9954> \xF7\x76 |0
-<U9955> \xC5\xB9 |0
-<U9956> \xF6\x77 |0
-<U9957> \xC5\x57 |0
-<U9958> \xF6\x76 |0
-<U9959> \xF5\x56 |0
-<U995B> \xF7\x77 |0
-<U995C> \xC5\xE4 |0
-<U995D> \x9A\x6C |0
-<U995E> \xC6\x61 |0
-<U995F> \xF9\x59 |0
-<U9961> \xF9\xB1 |0
-<U9962> \x9A\x6D |0
-<U9963> \x8B\xF2 |0
-<U9996> \xAD\xBA |0
-<U9997> \xD8\x50 |0
-<U9998> \xEF\x55 |0
-<U9999> \xAD\xBB |0
-<U999B> \x96\x6A |0
-<U999C> \xE4\xD2 |0
-<U999D> \xE4\xD1 |0
-<U999E> \xEC\x60 |0
-<U99A1> \xEF\x57 |0
-<U99A3> \xEF\x56 |0
-<U99A4> \xFC\xEA |0
-<U99A5> \xC3\x4C |0
-<U99A6> \xF3\xB2 |0
-<U99A7> \xF3\xB3 |0
-<U99A8> \xC4\xC9 |0
-<U99AA> \x96\x6C |0
-<U99AB> \xF9\xB2 |0
-<U99AC> \xB0\xA8 |0
-<U99AD> \xB6\xBF |0
-<U99AE> \xB6\xBE |0
-<U99AF> \xE0\xE4 |0
-<U99B0> \xE0\xE6 |0
-<U99B1> \xB9\xA4 |0
-<U99B2> \xE0\xE5 |0
-<U99B3> \xB9\xA3 |0
-<U99B4> \xB9\xA5 |0
-<U99B5> \xE0\xE7 |0
-<U99B8> \x91\xC4 |0
-<U99B9> \xE4\xD4 |0
-<U99BA> \xE4\xD6 |0
-<U99BB> \xE4\xD5 |0
-<U99BC> \x96\x77 |0
-<U99BD> \xE4\xD8 |0
-<U99C1> \xBB\xE9 |0
-<U99C2> \xE4\xD7 |0
-<U99C3> \xE4\xD3 |0
-<U99C4> \x99\xF4 |0
-<U99C5> \x9A\x6F |0
-<U99C7> \xE4\xD9 |0
-<U99C9> \xE8\xCC |0
-<U99CB> \xE8\xCF |0
-<U99CC> \xE8\xD1 |0
-<U99CD> \xE8\xC7 |0
-<U99CE> \xE8\xCB |0
-<U99CF> \xE8\xC8 |0
-<U99D0> \xBE\x6E |0
-<U99D1> \xBE\x71 |0
-<U99D2> \xBE\x73 |0
-<U99D3> \xE8\xC9 |0
-<U99D4> \xE8\xCA |0
-<U99D5> \xBE\x72 |0
-<U99D6> \xE8\xCD |0
-<U99D7> \xE8\xD0 |0
-<U99D8> \xE8\xCE |0
-<U99D9> \xBE\x74 |0
-<U99DA> \x9F\xAB |0
-<U99DB> \xBE\x70 |0
-<U99DC> \xE8\xC6 |0
-<U99DD> \xBE\x6D |0
-<U99DF> \xBE\x6F |0
-<U99E0> \x8C\xBE |0
-<U99E1> \x8E\xC1 |0
-<U99E2> \xC0\x63 |0
-<U99E3> \xEC\x66 |0
-<U99E4> \xEC\x64 |0
-<U99E5> \xEC\x63 |0
-<U99E6> \x95\x55 |0
-<U99E7> \xEC\x69 |0
-<U99E9> \xEC\x68 |0
-<U99EA> \xEC\x67 |0
-<U99EC> \xEC\x62 |0
-<U99ED> \xC0\x62 |0
-<U99EE> \xEC\x61 |0
-<U99F0> \xEC\x65 |0
-<U99F1> \xC0\x64 |0
-<U99F4> \xEF\x5A |0
-<U99F5> \x91\x52 |0
-<U99F6> \xEF\x5E |0
-<U99F7> \xEF\x5B |0
-<U99F8> \xEF\x5D |0
-<U99F9> \xEF\x5C |0
-<U99FA> \xEF\x59 |0
-<U99FB> \xEF\x5F |0
-<U99FC> \xEF\x62 |0
-<U99FD> \xEF\x60 |0
-<U99FE> \xEF\x61 |0
-<U99FF> \xC2\x40 |0
-<U9A01> \xC1\xFE |0
-<U9A02> \xEF\x58 |0
-<U9A03> \xEF\x63 |0
-<U9A04> \xF1\xB3 |0
-<U9A05> \xF1\xB6 |0
-<U9A06> \xF1\xB8 |0
-<U9A07> \xF1\xB7 |0
-<U9A09> \xF1\xB1 |0
-<U9A0A> \xF1\xB5 |0
-<U9A0B> \xF1\xB0 |0
-<U9A0C> \x91\x53 |0
-<U9A0D> \xF1\xB2 |0
-<U9A0E> \xC3\x4D |0
-<U9A0F> \xF1\xAF |0
-<U9A10> \x91\x55 |0
-<U9A11> \xF1\xB4 |0
-<U9A14> \xF3\xC0 |0
-<U9A15> \xF3\xB5 |0
-<U9A16> \xC4\x45 |0
-<U9A19> \xC4\x46 |0
-<U9A1A> \xF3\xB4 |0
-<U9A1B> \xF3\xB9 |0
-<U9A1C> \xF3\xBF |0
-<U9A1D> \xF3\xB7 |0
-<U9A1E> \xF3\xBE |0
-<U9A1F> \x95\x5D |0
-<U9A20> \xF3\xBB |0
-<U9A21> \x96\x71 |0
-<U9A22> \xF3\xBA |0
-<U9A23> \xF3\xBD |0
-<U9A24> \xF3\xB8 |0
-<U9A25> \xF3\xB6 |0
-<U9A26> \x9C\x6D |0
-<U9A27> \xF3\xBC |0
-<U9A29> \xF5\x60 |0
-<U9A2A> \xF5\x5E |0
-<U9A2B> \xC4\xCA |0
-<U9A2C> \xF5\x5D |0
-<U9A2D> \xF5\x63 |0
-<U9A2E> \xF5\x61 |0
-<U9A2F> \x96\x73 |0
-<U9A30> \xC4\xCB |0
-<U9A31> \xF5\x5C |0
-<U9A32> \xF5\x5A |0
-<U9A34> \xF5\x5B |0
-<U9A35> \xC4\xCD |0
-<U9A36> \xF5\x5F |0
-<U9A37> \xC4\xCC |0
-<U9A38> \xF5\x62 |0
-<U9A39> \xF6\x78 |0
-<U9A3A> \xF6\x7E |0
-<U9A3B> \x91\x54 |0
-<U9A3C> \x9A\x71 |0
-<U9A3D> \xF6\x79 |0
-<U9A3E> \xC5\x5B |0
-<U9A3F> \xF6\xA1 |0
-<U9A40> \xC5\x5A |0
-<U9A41> \xF6\x7D |0
-<U9A42> \xF6\x7C |0
-<U9A43> \xC5\x59 |0
-<U9A44> \xF6\x7B |0
-<U9A45> \xC5\x58 |0
-<U9A46> \xF6\x7A |0
-<U9A48> \xF7\x7D |0
-<U9A49> \xF7\xA1 |0
-<U9A4A> \xF7\x7E |0
-<U9A4C> \xF7\x7B |0
-<U9A4D> \xC5\xBB |0
-<U9A4E> \xF7\x78 |0
-<U9A4F> \xF7\x7C |0
-<U9A50> \xF7\xA3 |0
-<U9A52> \xF7\xA2 |0
-<U9A53> \xF7\x79 |0
-<U9A54> \xF7\x7A |0
-<U9A55> \xC5\xBA |0
-<U9A56> \xF8\x52 |0
-<U9A57> \xC5\xE7 |0
-<U9A58> \x91\x56 |0
-<U9A59> \xF8\x53 |0
-<U9A5A> \xC5\xE5 |0
-<U9A5B> \xC5\xE6 |0
-<U9A5C> \x96\x6D |0
-<U9A5E> \xF8\xD3 |0
-<U9A5F> \xC6\x4A |0
-<U9A60> \xF9\x76 |0
-<U9A62> \xC6\x6A |0
-<U9A63> \x95\x57 |0
-<U9A64> \xF9\xB3 |0
-<U9A65> \xC6\x6B |0
-<U9A66> \xF9\xB4 |0
-<U9A67> \xF9\xB5 |0
-<U9A68> \xF9\xC3 |0
-<U9A69> \xF9\xC2 |0
-<U9A6A> \xC6\x7A |0
-<U9A6B> \xF9\xCD |0
-<U9A6C> \x89\xC6 |0
-<U9A8F> \x89\xC7 |0
-<U9AA8> \xB0\xA9 |0
-<U9AAB> \xE0\xE9 |0
-<U9AAD> \xE0\xE8 |0
-<U9AAF> \xBB\xEA |0
-<U9AB0> \xBB\xEB |0
-<U9AB1> \xE4\xDA |0
-<U9AB2> \x8A\x6A |0
-<U9AB3> \xE8\xD2 |0
-<U9AB4> \xEC\x6C |0
-<U9AB6> \x8B\x57 |0
-<U9AB7> \xBE\x75 |0
-<U9AB8> \xC0\x65 |0
-<U9AB9> \xEC\x6A |0
-<U9ABA> \x9F\xE1 |0
-<U9ABB> \xEC\x6D |0
-<U9ABC> \xC0\x66 |0
-<U9ABD> \x9B\x5F |0
-<U9ABE> \xEF\x64 |0
-<U9ABF> \xEC\x6B |0
-<U9AC0> \xF1\xB9 |0
-<U9AC1> \xC3\x4E |0
-<U9AC2> \xF3\xC1 |0
-<U9AC6> \xF5\x66 |0
-<U9AC7> \xF5\x64 |0
-<U9ACA> \xF5\x65 |0
-<U9ACD> \xF6\xA2 |0
-<U9ACF> \xC5\x5C |0
-<U9AD0> \xF7\xA4 |0
-<U9AD1> \xC5\xEA |0
-<U9AD2> \xC5\xBC |0
-<U9AD3> \xC5\xE8 |0
-<U9AD4> \xC5\xE9 |0
-<U9AD5> \xF8\xD4 |0
-<U9AD6> \xC6\x62 |0
-<U9AD7> \xA0\x5D |0
-<U9AD8> \xB0\xAA |0
-<U9ADC> \xF1\xBA |0
-<U9ADF> \xD4\x49 |0
-<U9AE0> \x91\x5B |0
-<U9AE1> \xB9\xA6 |0
-<U9AE2> \x91\x5C |0
-<U9AE3> \xE4\xDB |0
-<U9AE6> \xBB\xEC |0
-<U9AE7> \xE4\xDC |0
-<U9AEB> \xE8\xD4 |0
-<U9AEC> \xE8\xD3 |0
-<U9AED> \xC0\x68 |0
-<U9AEE> \xBE\x76 |0
-<U9AEF> \xBE\x77 |0
-<U9AF1> \xE8\xD7 |0
-<U9AF2> \xE8\xD6 |0
-<U9AF3> \xE8\xD5 |0
-<U9AF4> \x91\x5E |0
-<U9AF6> \xEC\x6E |0
-<U9AF7> \xEC\x71 |0
-<U9AF9> \xEC\x70 |0
-<U9AFA> \xEC\x6F |0
-<U9AFB> \xC0\x67 |0
-<U9AFC> \xEF\x68 |0
-<U9AFD> \xEF\x66 |0
-<U9AFE> \xEF\x65 |0
-<U9AFF> \x9F\x5C |0
-<U9B01> \xEF\x67 |0
-<U9B02> \x9F\x57 |0
-<U9B03> \xC3\x4F |0
-<U9B04> \xF1\xBC |0
-<U9B05> \xF1\xBD |0
-<U9B06> \xC3\x50 |0
-<U9B08> \xF1\xBB |0
-<U9B09> \x9F\x65 |0
-<U9B0A> \xF3\xC3 |0
-<U9B0B> \xF3\xC2 |0
-<U9B0C> \xF3\xC5 |0
-<U9B0D> \xC4\x47 |0
-<U9B0E> \xF3\xC4 |0
-<U9B0F> \x9A\x72 |0
-<U9B10> \xF5\x67 |0
-<U9B11> \xF5\x69 |0
-<U9B12> \xF5\x68 |0
-<U9B14> \x91\x60 |0
-<U9B15> \xF6\xA3 |0
-<U9B16> \xF6\xA6 |0
-<U9B17> \xF6\xA4 |0
-<U9B18> \xF6\xA5 |0
-<U9B19> \xF7\xA5 |0
-<U9B1A> \xC5\xBD |0
-<U9B1E> \xF8\x54 |0
-<U9B1F> \xF8\x55 |0
-<U9B20> \xF8\x56 |0
-<U9B22> \xC6\x4B |0
-<U9B23> \xC6\x63 |0
-<U9B24> \xF9\xB6 |0
-<U9B25> \xB0\xAB |0
-<U9B27> \xBE\x78 |0
-<U9B28> \xC0\x69 |0
-<U9B29> \xF1\xBE |0
-<U9B2A> \x9F\x5E |0
-<U9B2B> \xF7\xA6 |0
-<U9B2D> \x91\x61 |0
-<U9B2E> \xF9\xC4 |0
-<U9B2F> \xD4\x4A |0
-<U9B31> \xC6\x7B |0
-<U9B32> \xB0\xAC |0
-<U9B33> \xEC\x72 |0
-<U9B34> \x91\x64 |0
-<U9B35> \xF1\xBF |0
-<U9B37> \xF3\xC6 |0
-<U9B39> \x9F\x41 |0
-<U9B3A> \xF6\xA7 |0
-<U9B3B> \xF7\xA7 |0
-<U9B3C> \xB0\xAD |0
-<U9B3E> \xE4\xDD |0
-<U9B3F> \xE4\xDE |0
-<U9B40> \x91\x69 |0
-<U9B41> \xBB\xED |0
-<U9B42> \xBB\xEE |0
-<U9B43> \xE8\xD9 |0
-<U9B44> \xBE\x7A |0
-<U9B45> \xBE\x79 |0
-<U9B46> \xE8\xD8 |0
-<U9B48> \xEF\x69 |0
-<U9B4A> \xF1\xC0 |0
-<U9B4B> \xF1\xC2 |0
-<U9B4C> \xF1\xC1 |0
-<U9B4D> \xC3\x53 |0
-<U9B4E> \xC3\x52 |0
-<U9B4F> \xC3\x51 |0
-<U9B50> \x91\x68 |0
-<U9B51> \xC5\x5E |0
-<U9B52> \xF6\xA8 |0
-<U9B54> \xC5\x5D |0
-<U9B55> \xF7\xA9 |0
-<U9B56> \xF7\xA8 |0
-<U9B58> \xC6\x4C |0
-<U9B59> \xF8\xD5 |0
-<U9B5A> \xB3\xBD |0
-<U9B5B> \xE0\xEA |0
-<U9B5F> \xE4\xE1 |0
-<U9B60> \xE4\xDF |0
-<U9B61> \xE4\xE0 |0
-<U9B64> \xE8\xE2 |0
-<U9B66> \xE8\xDD |0
-<U9B67> \xE8\xDA |0
-<U9B68> \xE8\xE1 |0
-<U9B69> \x9A\x74 |0
-<U9B6C> \xE8\xE3 |0
-<U9B6F> \xBE\x7C |0
-<U9B70> \xE8\xE0 |0
-<U9B71> \xE8\xDC |0
-<U9B74> \xE8\xDB |0
-<U9B75> \xE8\xDF |0
-<U9B76> \xE8\xDE |0
-<U9B77> \xBE\x7B |0
-<U9B7A> \xEC\x7D |0
-<U9B7B> \xEC\x78 |0
-<U9B7C> \xEC\x76 |0
-<U9B7D> \xEC\xA1 |0
-<U9B7E> \xEC\x77 |0
-<U9B7F> \x96\xB2 |0
-<U9B80> \xEC\x73 |0
-<U9B81> \x9A\x75 |0
-<U9B82> \xEC\x79 |0
-<U9B83> \xFD\xA5 |0
-<U9B85> \xEC\x74 |0
-<U9B86> \xEF\x72 |0
-<U9B87> \xEC\x75 |0
-<U9B88> \xEC\xA2 |0
-<U9B8B> \x9E\xE9 |0
-<U9B8D> \x8B\xBA |0
-<U9B8E> \x91\x6D |0
-<U9B8F> \xA0\x60 |0
-<U9B90> \xEC\x7C |0
-<U9B91> \xC0\x6A |0
-<U9B92> \xEC\x7B |0
-<U9B93> \xEC\x7A |0
-<U9B95> \xEC\x7E |0
-<U9B97> \x9F\xDE |0
-<U9B9A> \xEF\x6A |0
-<U9B9B> \xEF\x6D |0
-<U9B9D> \x9F\xC3 |0
-<U9B9E> \xEF\x6C |0
-<U9B9F> \x96\xB5 |0
-<U9BA0> \xEF\x74 |0
-<U9BA1> \xEF\x6F |0
-<U9BA2> \xEF\x73 |0
-<U9BA4> \xEF\x71 |0
-<U9BA5> \xEF\x70 |0
-<U9BA6> \xEF\x6E |0
-<U9BA8> \xEF\x6B |0
-<U9BAA> \xC2\x43 |0
-<U9BAB> \xC2\x42 |0
-<U9BAD> \xC2\x44 |0
-<U9BAE> \xC2\x41 |0
-<U9BAF> \xEF\x75 |0
-<U9BB0> \xA0\x67 |0
-<U9BB5> \xF1\xC8 |0
-<U9BB6> \xF1\xCB |0
-<U9BB8> \xF1\xC9 |0
-<U9BB9> \xF1\xCD |0
-<U9BBD> \xF1\xCE |0
-<U9BBF> \xF1\xC6 |0
-<U9BC0> \xC3\x58 |0
-<U9BC1> \xF1\xC7 |0
-<U9BC3> \xF1\xC5 |0
-<U9BC4> \xF1\xCC |0
-<U9BC6> \xF1\xC4 |0
-<U9BC7> \xF1\xC3 |0
-<U9BC8> \xC3\x57 |0
-<U9BC9> \xC3\x55 |0
-<U9BCA> \xC3\x54 |0
-<U9BCF> \x96\xB3 |0
-<U9BD3> \xF1\xCA |0
-<U9BD4> \xF3\xCF |0
-<U9BD5> \xF3\xD5 |0
-<U9BD6> \xC4\x4A |0
-<U9BD7> \xF3\xD0 |0
-<U9BD9> \xF3\xD3 |0
-<U9BDA> \xF3\xD7 |0
-<U9BDB> \xC4\x4B |0
-<U9BDC> \xF3\xD2 |0
-<U9BDD> \x9A\x76 |0
-<U9BDE> \xF3\xCA |0
-<U9BE0> \xF3\xC9 |0
-<U9BE1> \xF3\xD6 |0
-<U9BE2> \xF3\xCD |0
-<U9BE4> \xF3\xCB |0
-<U9BE5> \xF3\xD4 |0
-<U9BE6> \xF3\xCC |0
-<U9BE7> \xC4\x49 |0
-<U9BE8> \xC4\x48 |0
-<U9BE9> \x95\xD5 |0
-<U9BEA> \xF3\xC7 |0
-<U9BEB> \xF3\xC8 |0
-<U9BEC> \xF3\xD1 |0
-<U9BED> \x9E\xCA |0
-<U9BF0> \xF3\xCE |0
-<U9BF1> \x9A\x77 |0
-<U9BF4> \x9A\x78 |0
-<U9BF7> \xF5\x6C |0
-<U9BF8> \xF5\x6F |0
-<U9BFD> \xC3\x56 |0
-<U9BFF> \x91\x70 |0
-<U9C02> \x91\x6F |0
-<U9C05> \xF5\x6D |0
-<U9C06> \xF5\x73 |0
-<U9C07> \xF5\x71 |0
-<U9C08> \xF5\x6B |0
-<U9C09> \xF5\x76 |0
-<U9C0A> \x9F\xA3 |0
-<U9C0B> \xF5\x6A |0
-<U9C0C> \x91\x71 |0
-<U9C0D> \xC4\xCF |0
-<U9C0E> \xF5\x72 |0
-<U9C10> \x96\xB1 |0
-<U9C12> \xF5\x6E |0
-<U9C13> \xC4\xCE |0
-<U9C14> \xF5\x75 |0
-<U9C15> \x9F\x63 |0
-<U9C17> \xF5\x74 |0
-<U9C1B> \x9F\x67 |0
-<U9C1C> \xF6\xAB |0
-<U9C1D> \xF6\xAA |0
-<U9C1F> \x8B\xB9 |0
-<U9C20> \x9A\x7A |0
-<U9C21> \xF6\xB1 |0
-<U9C23> \xF6\xAD |0
-<U9C24> \xF6\xB0 |0
-<U9C25> \xC5\x60 |0
-<U9C26> \x8B\x56 |0
-<U9C28> \xF6\xAE |0
-<U9C29> \xF6\xAF |0
-<U9C2B> \xF6\xA9 |0
-<U9C2C> \xF6\xAC |0
-<U9C2D> \xC5\x5F |0
-<U9C2F> \x9A\xDA |0
-<U9C31> \xC5\xBF |0
-<U9C32> \xF7\xB4 |0
-<U9C33> \xF7\xAF |0
-<U9C34> \xF7\xB3 |0
-<U9C35> \x96\xB0 |0
-<U9C36> \xF7\xB6 |0
-<U9C37> \xF7\xB2 |0
-<U9C39> \xF7\xAE |0
-<U9C3A> \x9A\x7E |0
-<U9C3B> \xC5\xC1 |0
-<U9C3C> \xF7\xB1 |0
-<U9C3D> \xF7\xB5 |0
-<U9C3E> \xC5\xC0 |0
-<U9C3F> \xF7\xAC |0
-<U9C40> \xF5\x70 |0
-<U9C41> \xF7\xB0 |0
-<U9C44> \xF7\xAD |0
-<U9C45> \x9D\xDE |0
-<U9C46> \xF7\xAA |0
-<U9C48> \xF7\xAB |0
-<U9C49> \xC5\xBE |0
-<U9C4A> \xF8\x5A |0
-<U9C4B> \xF8\x5C |0
-<U9C4C> \xF8\x5F |0
-<U9C4D> \xF8\x5B |0
-<U9C4E> \xF8\x60 |0
-<U9C4F> \x96\xAD |0
-<U9C50> \xF8\x59 |0
-<U9C52> \xF8\x57 |0
-<U9C53> \x96\xAE |0
-<U9C54> \xC5\xEB |0
-<U9C55> \xF8\x5D |0
-<U9C56> \xC5\xED |0
-<U9C57> \xC5\xEC |0
-<U9C58> \xF8\x58 |0
-<U9C59> \xF8\x5E |0
-<U9C5D> \x9E\xA1 |0
-<U9C5E> \xF8\xDA |0
-<U9C5F> \xC6\x4D |0
-<U9C60> \xF8\xDB |0
-<U9C62> \xF8\xD9 |0
-<U9C63> \xF8\xD6 |0
-<U9C66> \xF8\xD8 |0
-<U9C67> \xF8\xD7 |0
-<U9C68> \xF9\x5A |0
-<U9C6D> \xF9\x5C |0
-<U9C6E> \xF9\x5B |0
-<U9C71> \xF9\x79 |0
-<U9C72> \x9E\x50 |0
-<U9C73> \xF9\x78 |0
-<U9C74> \xF9\x77 |0
-<U9C75> \xF9\x7A |0
-<U9C77> \xC6\x73 |0
-<U9C78> \xC6\x74 |0
-<U9C79> \xF9\xCA |0
-<U9C7A> \xF9\xCE |0
-<U9C7B> \x96\xAF |0
-<U9C7C> \x8B\xF4 |0
-<U9CE5> \xB3\xBE |0
-<U9CE6> \xDC\xAF |0
-<U9CE7> \xE0\xED |0
-<U9CE9> \xB9\xA7 |0
-<U9CEA> \xE0\xEB |0
-<U9CED> \xE0\xEC |0
-<U9CF1> \xE4\xE2 |0
-<U9CF2> \xE4\xE3 |0
-<U9CF3> \xBB\xF1 |0
-<U9CF4> \xBB\xEF |0
-<U9CF5> \xE4\xE4 |0
-<U9CF6> \xBB\xF0 |0
-<U9CF7> \xE8\xE8 |0
-<U9CF9> \xE8\xEB |0
-<U9CFA> \xE8\xE5 |0
-<U9CFB> \xE8\xEC |0
-<U9CFC> \xE8\xE4 |0
-<U9CFD> \xE8\xE6 |0
-<U9CFF> \xE8\xE7 |0
-<U9D00> \xE8\xEA |0
-<U9D02> \x9F\xA4 |0
-<U9D03> \xBE\xA1 |0
-<U9D04> \xE8\xEF |0
-<U9D05> \xE8\xEE |0
-<U9D06> \xBE\x7D |0
-<U9D07> \xE8\xE9 |0
-<U9D08> \xE8\xED |0
-<U9D09> \xBE\x7E |0
-<U9D0C> \x96\xBD |0
-<U9D10> \xEC\xAC |0
-<U9D12> \xC0\x6F |0
-<U9D14> \xEC\xA7 |0
-<U9D15> \xC0\x6B |0
-<U9D16> \x96\xF4 |0
-<U9D17> \xEC\xA4 |0
-<U9D18> \xEC\xAA |0
-<U9D19> \xEC\xAD |0
-<U9D1B> \xC0\x70 |0
-<U9D1D> \xEC\xA9 |0
-<U9D1E> \xEC\xA6 |0
-<U9D1F> \xEC\xAE |0
-<U9D20> \xEC\xA5 |0
-<U9D21> \x96\xB8 |0
-<U9D22> \xEC\xAB |0
-<U9D23> \xC0\x6C |0
-<U9D25> \xEC\xA3 |0
-<U9D26> \xC0\x6D |0
-<U9D28> \xC0\x6E |0
-<U9D29> \xEC\xA8 |0
-<U9D2D> \xEF\xA9 |0
-<U9D2E> \xEF\x7A |0
-<U9D2F> \xEF\x7B |0
-<U9D30> \xEF\x7E |0
-<U9D31> \xEF\x7C |0
-<U9D33> \xEF\x76 |0
-<U9D34> \xFA\xA1 |0
-<U9D36> \xEF\x79 |0
-<U9D37> \xEF\xA5 |0
-<U9D38> \xEF\x7D |0
-<U9D39> \x91\xA7 |0
-<U9D3B> \xC2\x45 |0
-<U9D3D> \xEF\xA7 |0
-<U9D3E> \xEF\xA4 |0
-<U9D3F> \xC2\x46 |0
-<U9D40> \xEF\xA6 |0
-<U9D41> \xEF\x77 |0
-<U9D42> \xEF\xA2 |0
-<U9D43> \xEF\xA3 |0
-<U9D44> \xA0\x5E |0
-<U9D45> \xEF\xA1 |0
-<U9D49> \x9A\x7D |0
-<U9D4A> \xF1\xD2 |0
-<U9D4B> \xF1\xD4 |0
-<U9D4C> \xF1\xD7 |0
-<U9D4E> \x89\x48 |0
-<U9D4F> \xF1\xD1 |0
-<U9D50> \x9E\xB1 |0
-<U9D51> \xC3\x59 |0
-<U9D52> \xF1\xD9 |0
-<U9D53> \xF1\xD0 |0
-<U9D54> \xF1\xDA |0
-<U9D56> \xF1\xD6 |0
-<U9D57> \xF1\xD8 |0
-<U9D58> \xF1\xDC |0
-<U9D59> \xF1\xD5 |0
-<U9D5A> \xF1\xDD |0
-<U9D5B> \xF1\xD3 |0
-<U9D5C> \xF1\xCF |0
-<U9D5D> \xC3\x5A |0
-<U9D5E> \x9D\xDB |0
-<U9D5F> \xF1\xDB |0
-<U9D60> \xC3\x5B |0
-<U9D61> \xC4\x4D |0
-<U9D67> \xEF\x78 |0
-<U9D68> \xF3\xF1 |0
-<U9D69> \xF3\xE8 |0
-<U9D6A> \xC4\x4F |0
-<U9D6B> \xF3\xE4 |0
-<U9D6C> \xC4\x50 |0
-<U9D6D> \x95\xBF |0
-<U9D6E> \x8A\x73 |0
-<U9D6F> \xF3\xED |0
-<U9D70> \xF3\xE7 |0
-<U9D71> \xF3\xDD |0
-<U9D72> \xC4\x4E |0
-<U9D73> \xF3\xEA |0
-<U9D74> \xF3\xE5 |0
-<U9D75> \xF3\xE6 |0
-<U9D77> \xF3\xD8 |0
-<U9D78> \xF3\xDF |0
-<U9D79> \xF3\xEE |0
-<U9D7B> \xF3\xEB |0
-<U9D7C> \x9E\xFE |0
-<U9D7D> \xF3\xE3 |0
-<U9D7E> \x91\x7A |0
-<U9D7F> \xF3\xEF |0
-<U9D80> \xF3\xDE |0
-<U9D81> \xF3\xD9 |0
-<U9D82> \xF3\xEC |0
-<U9D83> \x91\x7B |0
-<U9D84> \xF3\xDB |0
-<U9D85> \xF3\xE9 |0
-<U9D86> \xF3\xE0 |0
-<U9D87> \xF3\xF0 |0
-<U9D88> \xF3\xDC |0
-<U9D89> \xC4\x4C |0
-<U9D8A> \xF3\xDA |0
-<U9D8B> \xF3\xE1 |0
-<U9D8C> \xF3\xE2 |0
-<U9D90> \xF5\x7D |0
-<U9D92> \xF5\x7B |0
-<U9D93> \x9A\xA3 |0
-<U9D94> \xF5\xA2 |0
-<U9D96> \xF5\xAE |0
-<U9D97> \xF5\xA5 |0
-<U9D98> \xF5\x7C |0
-<U9D99> \xF5\x78 |0
-<U9D9A> \xF5\xA7 |0
-<U9D9B> \xF5\x7E |0
-<U9D9C> \xF5\xA3 |0
-<U9D9D> \xF5\x7A |0
-<U9D9E> \xF5\xAA |0
-<U9D9F> \xF5\x77 |0
-<U9DA0> \xF5\xA1 |0
-<U9DA1> \xF5\xA6 |0
-<U9DA2> \xF5\xA8 |0
-<U9DA3> \xF5\xAB |0
-<U9DA4> \xF5\x79 |0
-<U9DA5> \x96\xC2 |0
-<U9DA6> \xF5\xAF |0
-<U9DA7> \xF5\xB0 |0
-<U9DA8> \xF5\xA9 |0
-<U9DA9> \xF5\xAD |0
-<U9DAA> \xF5\xA4 |0
-<U9DAB> \x9F\x77 |0
-<U9DAC> \xF6\xC1 |0
-<U9DAD> \xF6\xC4 |0
-<U9DAF> \xC5\x61 |0
-<U9DB1> \xF6\xC3 |0
-<U9DB2> \xF6\xC8 |0
-<U9DB3> \xF6\xC6 |0
-<U9DB4> \xC5\x62 |0
-<U9DB5> \xF6\xBD |0
-<U9DB6> \xF6\xB3 |0
-<U9DB7> \xF6\xB2 |0
-<U9DB8> \xC5\x64 |0
-<U9DB9> \xF6\xBF |0
-<U9DBA> \xF6\xC0 |0
-<U9DBB> \xF6\xBC |0
-<U9DBC> \xF6\xB4 |0
-<U9DBD> \x9A\xA4 |0
-<U9DBE> \xF6\xB9 |0
-<U9DBF> \xF5\xAC |0
-<U9DC0> \x9A\xA5 |0
-<U9DC1> \xF6\xB5 |0
-<U9DC2> \xC5\x63 |0
-<U9DC3> \xF6\xBB |0
-<U9DC4> \x91\xA1 |0
-<U9DC5> \xF6\xBA |0
-<U9DC7> \xF6\xB6 |0
-<U9DC8> \xF6\xC2 |0
-<U9DC9> \x89\xB8 |0
-<U9DCA> \xF6\xB7 |0
-<U9DCB> \xF7\xBB |0
-<U9DCC> \xF6\xC5 |0
-<U9DCD> \xF6\xC7 |0
-<U9DCE> \xF6\xBE |0
-<U9DCF> \xF6\xB8 |0
-<U9DD0> \xF7\xBC |0
-<U9DD1> \xF7\xBE |0
-<U9DD2> \xF7\xB8 |0
-<U9DD3> \xC5\xC2 |0
-<U9DD4> \x91\x73 |0
-<U9DD5> \xF7\xC5 |0
-<U9DD6> \xF7\xC3 |0
-<U9DD7> \xC5\xC3 |0
-<U9DD8> \xF7\xC2 |0
-<U9DD9> \xF7\xC1 |0
-<U9DDA> \xF7\xBA |0
-<U9DDB> \xF7\xB7 |0
-<U9DDC> \xF7\xBD |0
-<U9DDD> \xF7\xC6 |0
-<U9DDE> \xF7\xB9 |0
-<U9DDF> \xF7\xBF |0
-<U9DE1> \xF8\x69 |0
-<U9DE2> \xF8\x6E |0
-<U9DE3> \xF8\x64 |0
-<U9DE4> \xF8\x67 |0
-<U9DE5> \xC5\xEE |0
-<U9DE6> \xF8\x6B |0
-<U9DE8> \xF8\x72 |0
-<U9DE9> \xF7\xC0 |0
-<U9DEB> \xF8\x65 |0
-<U9DEC> \xF8\x6F |0
-<U9DED> \xF8\x73 |0
-<U9DEE> \xF8\x6A |0
-<U9DEF> \xF8\x63 |0
-<U9DF0> \xF8\x6D |0
-<U9DF2> \xF8\x6C |0
-<U9DF3> \xF8\x71 |0
-<U9DF4> \xF8\x70 |0
-<U9DF5> \xF7\xC4 |0
-<U9DF6> \xF8\x68 |0
-<U9DF7> \xF8\x62 |0
-<U9DF8> \xF8\x66 |0
-<U9DF9> \xC6\x4E |0
-<U9DFA> \xC6\x4F |0
-<U9DFB> \xF8\x61 |0
-<U9DFC> \x9A\xA6 |0
-<U9DFD> \xF8\xE6 |0
-<U9DFE> \xF8\xDD |0
-<U9DFF> \xF8\xE5 |0
-<U9E00> \xF8\xE2 |0
-<U9E01> \xF8\xE3 |0
-<U9E02> \xF8\xDC |0
-<U9E03> \xF8\xDF |0
-<U9E04> \xF8\xE7 |0
-<U9E05> \xF8\xE1 |0
-<U9E06> \xF8\xE0 |0
-<U9E07> \xF8\xDE |0
-<U9E09> \xF8\xE4 |0
-<U9E0A> \x89\xBD |0
-<U9E0B> \xF9\x5D |0
-<U9E0C> \x89\xB9 |0
-<U9E0D> \xF9\x5E |0
-<U9E0E> \x91\x7D |0
-<U9E0F> \xF9\x60 |0
-<U9E10> \xF9\x5F |0
-<U9E11> \xF9\x62 |0
-<U9E12> \xF9\x61 |0
-<U9E13> \xF9\x7C |0
-<U9E14> \xF9\x7B |0
-<U9E15> \xF9\xB7 |0
-<U9E17> \xF9\xB8 |0
-<U9E18> \x96\xBB |0
-<U9E19> \xF9\xC5 |0
-<U9E1A> \xC6\x78 |0
-<U9E1B> \xC6\x7C |0
-<U9E1C> \x9F\xF2 |0
-<U9E1D> \xF9\xCF |0
-<U9E1E> \xC6\x7D |0
-<U9E1F> \x8B\xF5 |0
-<U9E75> \xB3\xBF |0
-<U9E79> \xC4\xD0 |0
-<U9E7A> \xF6\xC9 |0
-<U9E7B> \x9A\xA9 |0
-<U9E7C> \xC6\x50 |0
-<U9E7D> \xC6\x51 |0
-<U9E7F> \xB3\xC0 |0
-<U9E80> \xE0\xEE |0
-<U9E81> \x9F\x54 |0
-<U9E82> \xB9\xA8 |0
-<U9E83> \xE8\xF0 |0
-<U9E84> \x9F\xE3 |0
-<U9E85> \x9E\xED |0
-<U9E86> \xEC\xB0 |0
-<U9E87> \xEC\xB1 |0
-<U9E88> \xEC\xAF |0
-<U9E89> \xEF\xAB |0
-<U9E8A> \xEF\xAA |0
-<U9E8B> \xC2\x47 |0
-<U9E8C> \xF1\xDF |0
-<U9E8D> \xEF\xAC |0
-<U9E8E> \xF1\xDE |0
-<U9E90> \x91\xAA |0
-<U9E91> \xF3\xF3 |0
-<U9E92> \xC4\x51 |0
-<U9E93> \xC4\x53 |0
-<U9E94> \xF3\xF2 |0
-<U9E95> \x91\xAB |0
-<U9E96> \xA0\x70 |0
-<U9E97> \xC4\x52 |0
-<U9E98> \x9F\x6D |0
-<U9E99> \xF5\xB1 |0
-<U9E9A> \xF5\xB3 |0
-<U9E9B> \xF5\xB2 |0
-<U9E9C> \xF6\xCA |0
-<U9E9D> \xC5\x65 |0
-<U9E9E> \x91\xAC |0
-<U9E9F> \xC5\xEF |0
-<U9EA0> \xF8\xE8 |0
-<U9EA1> \xF9\x63 |0
-<U9EA2> \x91\xAD |0
-<U9EA4> \xF9\xD2 |0
-<U9EA5> \xB3\xC1 |0
-<U9EA6> \xA0\xFD |0
-<U9EA7> \xE4\xE5 |0
-<U9EA8> \x9F\xE2 |0
-<U9EA9> \xBE\xA2 |0
-<U9EAA> \x91\xAF |0
-<U9EAB> \x9E\x41 |0
-<U9EAC> \x9A\xAA |0
-<U9EAD> \xEC\xB3 |0
-<U9EAE> \xEC\xB2 |0
-<U9EAF> \x91\xB0 |0
-<U9EB0> \xEF\xAD |0
-<U9EB1> \x9A\xAB |0
-<U9EB4> \xC4\x54 |0
-<U9EB5> \xC4\xD1 |0
-<U9EB6> \xF7\xC7 |0
-<U9EB7> \xF9\xCB |0
-<U9EBB> \xB3\xC2 |0
-<U9EBC> \xBB\xF2 |0
-<U9EBD> \x9A\xAC |0
-<U9EBE> \xBE\xA3 |0
-<U9EBF> \x9A\x4A |0
-<U9EC0> \xF3\xF4 |0
-<U9EC1> \x91\xB2 |0
-<U9EC2> \xF8\x74 |0
-<U9EC3> \xB6\xC0 |0
-<U9EC4> \x8B\xF6 |0
-<U9EC6> \x9A\xAD |0
-<U9EC7> \x89\xB6 |0
-<U9EC8> \xEF\xAE |0
-<U9ECC> \xC6\x64 |0
-<U9ECD> \xB6\xC1 |0
-<U9ECE> \xBE\xA4 |0
-<U9ECF> \xC2\x48 |0
-<U9ED0> \xF8\x75 |0
-<U9ED1> \xB6\xC2 |0
-<U9ED3> \xE8\xF1 |0
-<U9ED4> \xC0\x72 |0
-<U9ED5> \xEC\xB4 |0
-<U9ED6> \xEC\xB5 |0
-<U9ED8> \xC0\x71 |0
-<U9EDA> \xEF\xAF |0
-<U9EDB> \xC2\x4C |0
-<U9EDC> \xC2\x4A |0
-<U9EDD> \xC2\x4B |0
-<U9EDE> \xC2\x49 |0
-<U9EDF> \xF1\xE0 |0
-<U9EE0> \xC3\x5C |0
-<U9EE2> \x9A\xAF |0
-<U9EE4> \xF5\xB5 |0
-<U9EE5> \xF5\xB4 |0
-<U9EE6> \xF5\xB7 |0
-<U9EE7> \xF5\xB6 |0
-<U9EE8> \xC4\xD2 |0
-<U9EEB> \xF6\xCB |0
-<U9EED> \xF6\xCD |0
-<U9EEE> \xF6\xCC |0
-<U9EEF> \xC5\x66 |0
-<U9EF0> \xF7\xC8 |0
-<U9EF1> \x9A\xB0 |0
-<U9EF2> \xF8\x76 |0
-<U9EF3> \xF8\x77 |0
-<U9EF4> \xC5\xF0 |0
-<U9EF5> \xF9\x64 |0
-<U9EF6> \xF9\x7D |0
-<U9EF7> \xC6\x75 |0
-<U9EF8> \x9A\xB1 |0
-<U9EF9> \xDC\xB0 |0
-<U9EFA> \xEC\xB6 |0
-<U9EFB> \xEF\xB0 |0
-<U9EFC> \xF3\xF5 |0
-<U9EFD> \xE0\xEF |0
-<U9EFE> \x9A\xA1 |0
-<U9EFF> \xEF\xB1 |0
-<U9F00> \xF1\xE2 |0
-<U9F01> \xF1\xE1 |0
-<U9F02> \x91\xB9 |0
-<U9F06> \xF8\x78 |0
-<U9F07> \xC6\x52 |0
-<U9F08> \x91\xBA |0
-<U9F09> \xF9\x65 |0
-<U9F0A> \xF9\x7E |0
-<U9F0E> \xB9\xA9 |0
-<U9F0F> \xE8\xF2 |0
-<U9F10> \xE8\xF3 |0
-<U9F12> \xEC\xB7 |0
-<U9F13> \xB9\xAA |0
-<U9F15> \xC3\x5D |0
-<U9F16> \xF1\xE3 |0
-<U9F17> \x91\xBE |0
-<U9F18> \xF6\xCF |0
-<U9F19> \xC5\x67 |0
-<U9F1A> \xF6\xD0 |0
-<U9F1B> \xF6\xCE |0
-<U9F1C> \xF8\x79 |0
-<U9F1E> \xF8\xE9 |0
-<U9F20> \xB9\xAB |0
-<U9F22> \xEF\xB4 |0
-<U9F23> \xEF\xB3 |0
-<U9F24> \xEF\xB2 |0
-<U9F25> \xF1\xE4 |0
-<U9F26> \xA0\x41 |0
-<U9F27> \x8B\xB7 |0
-<U9F28> \xF1\xE8 |0
-<U9F29> \xF1\xE7 |0
-<U9F2A> \xF1\xE6 |0
-<U9F2B> \xF1\xE5 |0
-<U9F2C> \xC3\x5E |0
-<U9F2D> \xF3\xF6 |0
-<U9F2E> \xF5\xB9 |0
-<U9F2F> \xC4\xD3 |0
-<U9F30> \xF5\xB8 |0
-<U9F31> \xF6\xD1 |0
-<U9F32> \xF7\xCB |0
-<U9F33> \xF7\xCA |0
-<U9F34> \xC5\xC4 |0
-<U9F35> \xF7\xC9 |0
-<U9F36> \xF8\x7C |0
-<U9F37> \xF8\x7B |0
-<U9F38> \xF8\x7A |0
-<U9F39> \x91\xC0 |0
-<U9F3B> \xBB\xF3 |0
-<U9F3D> \xEC\xB8 |0
-<U9F3E> \xC2\x4D |0
-<U9F40> \xF3\xF7 |0
-<U9F41> \xF3\xF8 |0
-<U9F42> \xF7\xCC |0
-<U9F43> \xF8\x7D |0
-<U9F44> \x9A\xB3 |0
-<U9F45> \x91\xC3 |0
-<U9F46> \xF8\xEA |0
-<U9F47> \xF9\x66 |0
-<U9F48> \xF9\xB9 |0
-<U9F49> \xF9\xD4 |0
-<U9F4A> \xBB\xF4 |0
-<U9F4B> \xC2\x4E |0
-<U9F4C> \xF1\xE9 |0
-<U9F4D> \xF3\xF9 |0
-<U9F4E> \xF6\xD2 |0
-<U9F4F> \xF8\x7E |0
-<U9F50> \xA0\xFC |0
-<U9F52> \xBE\xA6 |0
-<U9F53> \x9F\xEE |0
-<U9F54> \xEF\xB5 |0
-<U9F55> \xF1\xEA |0
-<U9F56> \xF3\xFA |0
-<U9F57> \xF3\xFB |0
-<U9F58> \xF3\xFC |0
-<U9F59> \xF5\xBE |0
-<U9F5A> \x9F\x69 |0
-<U9F5B> \xF5\xBA |0
-<U9F5C> \xC5\x68 |0
-<U9F5D> \xF5\xBD |0
-<U9F5E> \xF5\xBC |0
-<U9F5F> \xC4\xD4 |0
-<U9F60> \xF5\xBB |0
-<U9F61> \xC4\xD6 |0
-<U9F62> \x91\xC8 |0
-<U9F63> \xC4\xD5 |0
-<U9F64> \xF6\xD4 |0
-<U9F65> \xF6\xD3 |0
-<U9F66> \xC5\x69 |0
-<U9F67> \xC5\x6A |0
-<U9F69> \x91\xC9 |0
-<U9F6A> \xC5\xC6 |0
-<U9F6B> \xF7\xCD |0
-<U9F6C> \xC5\xC5 |0
-<U9F6E> \xF8\xA3 |0
-<U9F6F> \xF8\xA4 |0
-<U9F70> \xF8\xA2 |0
-<U9F71> \xF8\xA1 |0
-<U9F72> \xC6\x54 |0
-<U9F74> \xF8\xEB |0
-<U9F75> \xF8\xEC |0
-<U9F76> \xF8\xED |0
-<U9F77> \xC6\x53 |0
-<U9F78> \xF9\x67 |0
-<U9F79> \xF9\x6A |0
-<U9F7A> \xF9\x69 |0
-<U9F7B> \xF9\x68 |0
-<U9F7E> \xF9\xD3 |0
-<U9F7F> \x8D\xE6 |0
-<U9F8D> \xC0\x73 |0
-<U9F8E> \x91\xCB |0
-<U9F90> \xC3\x65 |0
-<U9F91> \xF5\xBF |0
-<U9F92> \xF6\xD5 |0
-<U9F94> \xC5\xC7 |0
-<U9F95> \xF7\xCE |0
-<U9F98> \xF9\xD5 |0
-<U9F99> \x89\xC8 |0
-<U9F9C> \xC0\x74 |0
-<U9F9F> \x8D\xAA |0
-<U9FA0> \xEF\xB6 |0
-<U9FA2> \xF7\xCF |0
-<U9FA4> \xF9\xA1 |0
-<U9FA5> \x9F\xDD |0
-<UE000> \xFA\x40 |0
-<UE001> \xFA\x41 |1
-<UE002> \xFA\x42 |0
-<UE003> \xFA\x43 |0
-<UE004> \xFA\x44 |1
-<UE005> \xFA\x45 |1
-<UE006> \xFA\x46 |1
-<UE007> \xFA\x47 |1
-<UE008> \xFA\x48 |1
-<UE009> \xFA\x49 |0
-<UE00A> \xFA\x4A |0
-<UE00B> \xFA\x4B |1
-<UE00C> \xFA\x4C |0
-<UE00D> \xFA\x4D |1
-<UE00E> \xFA\x4E |0
-<UE00F> \xFA\x4F |1
-<UE010> \xFA\x50 |1
-<UE011> \xFA\x51 |1
-<UE012> \xFA\x52 |0
-<UE013> \xFA\x53 |0
-<UE014> \xFA\x54 |0
-<UE015> \xFA\x55 |0
-<UE016> \xFA\x56 |0
-<UE017> \xFA\x57 |1
-<UE018> \xFA\x58 |0
-<UE019> \xFA\x59 |1
-<UE01A> \xFA\x5A |0
-<UE01B> \xFA\x5B |0
-<UE01C> \xFA\x5C |0
-<UE01D> \xFA\x5D |0
-<UE01E> \xFA\x5E |0
-<UE01F> \xFA\x5F |0
-<UE020> \xFA\x60 |0
-<UE021> \xFA\x61 |1
-<UE022> \xFA\x62 |0
-<UE023> \xFA\x63 |0
-<UE024> \xFA\x64 |1
-<UE025> \xFA\x65 |0
-<UE026> \xFA\x66 |0
-<UE027> \xFA\x67 |1
-<UE028> \xFA\x68 |1
-<UE029> \xFA\x69 |1
-<UE02A> \xFA\x6A |1
-<UE02B> \xFA\x6B |1
-<UE02C> \xFA\x6C |1
-<UE02D> \xFA\x6D |0
-<UE02E> \xFA\x6E |0
-<UE02F> \xFA\x6F |1
-<UE030> \xFA\x70 |0
-<UE031> \xFA\x71 |1
-<UE032> \xFA\x72 |0
-<UE033> \xFA\x73 |0
-<UE034> \xFA\x74 |0
-<UE035> \xFA\x75 |0
-<UE036> \xFA\x76 |0
-<UE037> \xFA\x77 |0
-<UE038> \xFA\x78 |0
-<UE039> \xFA\x79 |1
-<UE03A> \xFA\x7A |1
-<UE03B> \xFA\x7B |0
-<UE03C> \xFA\x7C |0
-<UE03D> \xFA\x7D |1
-<UE03E> \xFA\x7E |1
-<UE03F> \xFA\xA1 |1
-<UE040> \xFA\xA2 |1
-<UE041> \xFA\xA3 |1
-<UE042> \xFA\xA4 |1
-<UE043> \xFA\xA5 |1
-<UE044> \xFA\xA6 |1
-<UE045> \xFA\xA7 |0
-<UE046> \xFA\xA8 |1
-<UE047> \xFA\xA9 |1
-<UE048> \xFA\xAA |1
-<UE049> \xFA\xAB |1
-<UE04A> \xFA\xAC |1
-<UE04B> \xFA\xAD |1
-<UE04C> \xFA\xAE |0
-<UE04D> \xFA\xAF |1
-<UE04E> \xFA\xB0 |1
-<UE04F> \xFA\xB1 |1
-<UE050> \xFA\xB2 |1
-<UE051> \xFA\xB3 |1
-<UE052> \xFA\xB4 |1
-<UE053> \xFA\xB5 |1
-<UE054> \xFA\xB6 |1
-<UE055> \xFA\xB7 |1
-<UE056> \xFA\xB8 |1
-<UE057> \xFA\xB9 |1
-<UE058> \xFA\xBA |1
-<UE059> \xFA\xBB |1
-<UE05A> \xFA\xBC |0
-<UE05B> \xFA\xBD |0
-<UE05C> \xFA\xBE |0
-<UE05D> \xFA\xBF |1
-<UE05E> \xFA\xC0 |1
-<UE05F> \xFA\xC1 |0
-<UE060> \xFA\xC2 |0
-<UE061> \xFA\xC3 |0
-<UE062> \xFA\xC4 |1
-<UE063> \xFA\xC5 |0
-<UE064> \xFA\xC6 |0
-<UE065> \xFA\xC7 |1
-<UE066> \xFA\xC8 |0
-<UE067> \xFA\xC9 |1
-<UE068> \xFA\xCA |1
-<UE069> \xFA\xCB |1
-<UE06A> \xFA\xCC |1
-<UE06B> \xFA\xCD |1
-<UE06C> \xFA\xCE |0
-<UE06D> \xFA\xCF |1
-<UE06E> \xFA\xD0 |1
-<UE06F> \xFA\xD1 |1
-<UE070> \xFA\xD2 |1
-<UE071> \xFA\xD3 |0
-<UE072> \xFA\xD4 |1
-<UE073> \xFA\xD5 |0
-<UE074> \xFA\xD6 |0
-<UE075> \xFA\xD7 |0
-<UE076> \xFA\xD8 |1
-<UE077> \xFA\xD9 |1
-<UE078> \xFA\xDA |0
-<UE079> \xFA\xDB |1
-<UE07A> \xFA\xDC |1
-<UE07B> \xFA\xDD |1
-<UE07C> \xFA\xDE |1
-<UE07D> \xFA\xDF |0
-<UE07E> \xFA\xE0 |1
-<UE07F> \xFA\xE1 |1
-<UE080> \xFA\xE2 |1
-<UE081> \xFA\xE3 |1
-<UE082> \xFA\xE4 |1
-<UE083> \xFA\xE5 |1
-<UE084> \xFA\xE6 |1
-<UE085> \xFA\xE7 |1
-<UE086> \xFA\xE8 |1
-<UE087> \xFA\xE9 |0
-<UE088> \xFA\xEA |1
-<UE089> \xFA\xEB |0
-<UE08A> \xFA\xEC |0
-<UE08B> \xFA\xED |1
-<UE08C> \xFA\xEE |0
-<UE08D> \xFA\xEF |1
-<UE08E> \xFA\xF0 |1
-<UE08F> \xFA\xF1 |1
-<UE090> \xFA\xF2 |1
-<UE091> \xFA\xF3 |1
-<UE092> \xFA\xF4 |1
-<UE093> \xFA\xF5 |0
-<UE094> \xFA\xF6 |0
-<UE095> \xFA\xF7 |1
-<UE096> \xFA\xF8 |1
-<UE097> \xFA\xF9 |1
-<UE098> \xFA\xFA |1
-<UE099> \xFA\xFB |0
-<UE09A> \xFA\xFC |0
-<UE09B> \xFA\xFD |1
-<UE09C> \xFA\xFE |0
-<UE09D> \xFB\x40 |0
-<UE09E> \xFB\x41 |0
-<UE09F> \xFB\x42 |1
-<UE0A0> \xFB\x43 |1
-<UE0A1> \xFB\x44 |1
-<UE0A2> \xFB\x45 |1
-<UE0A3> \xFB\x46 |1
-<UE0A4> \xFB\x47 |1
-<UE0A5> \xFB\x48 |0
-<UE0A6> \xFB\x49 |0
-<UE0A7> \xFB\x4A |0
-<UE0A8> \xFB\x4B |1
-<UE0A9> \xFB\x4C |0
-<UE0AA> \xFB\x4D |1
-<UE0AB> \xFB\x4E |0
-<UE0AC> \xFB\x4F |1
-<UE0AD> \xFB\x50 |1
-<UE0AE> \xFB\x51 |0
-<UE0AF> \xFB\x52 |1
-<UE0B0> \xFB\x53 |1
-<UE0B1> \xFB\x54 |1
-<UE0B2> \xFB\x55 |1
-<UE0B3> \xFB\x56 |1
-<UE0B4> \xFB\x57 |1
-<UE0B5> \xFB\x58 |1
-<UE0B6> \xFB\x59 |1
-<UE0B7> \xFB\x5A |1
-<UE0B8> \xFB\x5B |1
-<UE0B9> \xFB\x5C |1
-<UE0BA> \xFB\x5D |0
-<UE0BB> \xFB\x5E |1
-<UE0BC> \xFB\x5F |0
-<UE0BD> \xFB\x60 |1
-<UE0BE> \xFB\x61 |0
-<UE0BF> \xFB\x62 |1
-<UE0C0> \xFB\x63 |1
-<UE0C1> \xFB\x64 |1
-<UE0C2> \xFB\x65 |1
-<UE0C3> \xFB\x66 |0
-<UE0C4> \xFB\x67 |1
-<UE0C5> \xFB\x68 |0
-<UE0C6> \xFB\x69 |1
-<UE0C7> \xFB\x6A |0
-<UE0C8> \xFB\x6B |0
-<UE0C9> \xFB\x6C |1
-<UE0CA> \xFB\x6D |0
-<UE0CB> \xFB\x6E |1
-<UE0CC> \xFB\x6F |1
-<UE0CD> \xFB\x70 |1
-<UE0CE> \xFB\x71 |1
-<UE0CF> \xFB\x72 |1
-<UE0D0> \xFB\x73 |0
-<UE0D1> \xFB\x74 |1
-<UE0D2> \xFB\x75 |1
-<UE0D3> \xFB\x76 |1
-<UE0D4> \xFB\x77 |0
-<UE0D5> \xFB\x78 |0
-<UE0D6> \xFB\x79 |1
-<UE0D7> \xFB\x7A |1
-<UE0D8> \xFB\x7B |1
-<UE0D9> \xFB\x7C |1
-<UE0DA> \xFB\x7D |1
-<UE0DB> \xFB\x7E |1
-<UE0DC> \xFB\xA1 |0
-<UE0DD> \xFB\xA2 |1
-<UE0DE> \xFB\xA3 |1
-<UE0DF> \xFB\xA4 |0
-<UE0E0> \xFB\xA5 |1
-<UE0E1> \xFB\xA6 |1
-<UE0E2> \xFB\xA7 |0
-<UE0E3> \xFB\xA8 |0
-<UE0E4> \xFB\xA9 |0
-<UE0E5> \xFB\xAA |0
-<UE0E6> \xFB\xAB |1
-<UE0E7> \xFB\xAC |0
-<UE0E8> \xFB\xAD |0
-<UE0E9> \xFB\xAE |0
-<UE0EA> \xFB\xAF |1
-<UE0EB> \xFB\xB0 |0
-<UE0EC> \xFB\xB1 |0
-<UE0ED> \xFB\xB2 |1
-<UE0EE> \xFB\xB3 |0
-<UE0EF> \xFB\xB4 |1
-<UE0F0> \xFB\xB5 |1
-<UE0F1> \xFB\xB6 |1
-<UE0F2> \xFB\xB7 |0
-<UE0F3> \xFB\xB8 |0
-<UE0F4> \xFB\xB9 |1
-<UE0F5> \xFB\xBA |1
-<UE0F6> \xFB\xBB |1
-<UE0F7> \xFB\xBC |1
-<UE0F8> \xFB\xBD |0
-<UE0F9> \xFB\xBE |0
-<UE0FA> \xFB\xBF |1
-<UE0FB> \xFB\xC0 |0
-<UE0FC> \xFB\xC1 |1
-<UE0FD> \xFB\xC2 |0
-<UE0FE> \xFB\xC3 |1
-<UE0FF> \xFB\xC4 |1
-<UE100> \xFB\xC5 |1
-<UE101> \xFB\xC6 |1
-<UE102> \xFB\xC7 |1
-<UE103> \xFB\xC8 |0
-<UE104> \xFB\xC9 |1
-<UE105> \xFB\xCA |1
-<UE106> \xFB\xCB |0
-<UE107> \xFB\xCC |1
-<UE108> \xFB\xCD |1
-<UE109> \xFB\xCE |0
-<UE10A> \xFB\xCF |0
-<UE10B> \xFB\xD0 |0
-<UE10C> \xFB\xD1 |1
-<UE10D> \xFB\xD2 |1
-<UE10E> \xFB\xD3 |1
-<UE10F> \xFB\xD4 |1
-<UE110> \xFB\xD5 |0
-<UE111> \xFB\xD6 |1
-<UE112> \xFB\xD7 |1
-<UE113> \xFB\xD8 |1
-<UE114> \xFB\xD9 |0
-<UE115> \xFB\xDA |0
-<UE116> \xFB\xDB |1
-<UE117> \xFB\xDC |1
-<UE118> \xFB\xDD |1
-<UE119> \xFB\xDE |1
-<UE11A> \xFB\xDF |1
-<UE11B> \xFB\xE0 |1
-<UE11C> \xFB\xE1 |0
-<UE11D> \xFB\xE2 |0
-<UE11E> \xFB\xE3 |1
-<UE11F> \xFB\xE4 |1
-<UE120> \xFB\xE5 |1
-<UE121> \xFB\xE6 |0
-<UE122> \xFB\xE7 |1
-<UE123> \xFB\xE8 |1
-<UE124> \xFB\xE9 |1
-<UE125> \xFB\xEA |1
-<UE126> \xFB\xEB |0
-<UE127> \xFB\xEC |0
-<UE128> \xFB\xED |0
-<UE129> \xFB\xEE |1
-<UE12A> \xFB\xEF |1
-<UE12B> \xFB\xF0 |1
-<UE12C> \xFB\xF1 |1
-<UE12D> \xFB\xF2 |1
-<UE12E> \xFB\xF3 |0
-<UE12F> \xFB\xF4 |1
-<UE130> \xFB\xF5 |0
-<UE131> \xFB\xF6 |0
-<UE132> \xFB\xF7 |1
-<UE133> \xFB\xF8 |1
-<UE134> \xFB\xF9 |0
-<UE135> \xFB\xFA |1
-<UE136> \xFB\xFB |0
-<UE137> \xFB\xFC |1
-<UE138> \xFB\xFD |1
-<UE139> \xFB\xFE |0
-<UE13A> \xFC\x40 |1
-<UE13B> \xFC\x41 |1
-<UE13C> \xFC\x42 |1
-<UE13D> \xFC\x43 |1
-<UE13E> \xFC\x44 |1
-<UE13F> \xFC\x45 |1
-<UE140> \xFC\x46 |1
-<UE141> \xFC\x47 |0
-<UE142> \xFC\x48 |0
-<UE143> \xFC\x49 |1
-<UE144> \xFC\x4A |1
-<UE145> \xFC\x4B |0
-<UE146> \xFC\x4C |1
-<UE147> \xFC\x4D |0
-<UE148> \xFC\x4E |0
-<UE149> \xFC\x4F |0
-<UE14A> \xFC\x50 |0
-<UE14B> \xFC\x51 |1
-<UE14C> \xFC\x52 |1
-<UE14D> \xFC\x53 |0
-<UE14E> \xFC\x54 |1
-<UE14F> \xFC\x55 |1
-<UE150> \xFC\x56 |0
-<UE151> \xFC\x57 |1
-<UE152> \xFC\x58 |1
-<UE153> \xFC\x59 |1
-<UE154> \xFC\x5A |0
-<UE155> \xFC\x5B |0
-<UE156> \xFC\x5C |0
-<UE157> \xFC\x5D |0
-<UE158> \xFC\x5E |1
-<UE159> \xFC\x5F |0
-<UE15A> \xFC\x60 |0
-<UE15B> \xFC\x61 |1
-<UE15C> \xFC\x62 |1
-<UE15D> \xFC\x63 |0
-<UE15E> \xFC\x64 |1
-<UE15F> \xFC\x65 |1
-<UE160> \xFC\x66 |1
-<UE161> \xFC\x67 |1
-<UE162> \xFC\x68 |0
-<UE163> \xFC\x69 |1
-<UE164> \xFC\x6A |1
-<UE165> \xFC\x6B |1
-<UE166> \xFC\x6C |0
-<UE167> \xFC\x6D |1
-<UE168> \xFC\x6E |0
-<UE169> \xFC\x6F |0
-<UE16A> \xFC\x70 |0
-<UE16B> \xFC\x71 |1
-<UE16C> \xFC\x72 |1
-<UE16D> \xFC\x73 |1
-<UE16E> \xFC\x74 |1
-<UE16F> \xFC\x75 |1
-<UE170> \xFC\x76 |1
-<UE171> \xFC\x77 |0
-<UE172> \xFC\x78 |0
-<UE173> \xFC\x79 |1
-<UE174> \xFC\x7A |1
-<UE175> \xFC\x7B |0
-<UE176> \xFC\x7C |1
-<UE177> \xFC\x7D |1
-<UE178> \xFC\x7E |0
-<UE179> \xFC\xA1 |0
-<UE17A> \xFC\xA2 |1
-<UE17B> \xFC\xA3 |0
-<UE17C> \xFC\xA4 |0
-<UE17D> \xFC\xA5 |1
-<UE17E> \xFC\xA6 |1
-<UE17F> \xFC\xA7 |0
-<UE180> \xFC\xA8 |0
-<UE181> \xFC\xA9 |1
-<UE182> \xFC\xAA |1
-<UE183> \xFC\xAB |1
-<UE184> \xFC\xAC |1
-<UE185> \xFC\xAD |0
-<UE186> \xFC\xAE |1
-<UE187> \xFC\xAF |0
-<UE188> \xFC\xB0 |1
-<UE189> \xFC\xB1 |0
-<UE18A> \xFC\xB2 |1
-<UE18B> \xFC\xB3 |0
-<UE18C> \xFC\xB4 |1
-<UE18D> \xFC\xB5 |1
-<UE18E> \xFC\xB6 |1
-<UE18F> \xFC\xB7 |0
-<UE190> \xFC\xB8 |0
-<UE191> \xFC\xB9 |0
-<UE192> \xFC\xBA |1
-<UE193> \xFC\xBB |0
-<UE194> \xFC\xBC |1
-<UE195> \xFC\xBD |0
-<UE196> \xFC\xBE |0
-<UE197> \xFC\xBF |1
-<UE198> \xFC\xC0 |1
-<UE199> \xFC\xC1 |1
-<UE19A> \xFC\xC2 |1
-<UE19B> \xFC\xC3 |1
-<UE19C> \xFC\xC4 |1
-<UE19D> \xFC\xC5 |1
-<UE19E> \xFC\xC6 |1
-<UE19F> \xFC\xC7 |0
-<UE1A0> \xFC\xC8 |0
-<UE1A1> \xFC\xC9 |1
-<UE1A2> \xFC\xCA |1
-<UE1A3> \xFC\xCB |1
-<UE1A4> \xFC\xCC |0
-<UE1A5> \xFC\xCD |1
-<UE1A6> \xFC\xCE |0
-<UE1A7> \xFC\xCF |1
-<UE1A8> \xFC\xD0 |1
-<UE1A9> \xFC\xD1 |1
-<UE1AA> \xFC\xD2 |0
-<UE1AB> \xFC\xD3 |1
-<UE1AC> \xFC\xD4 |1
-<UE1AD> \xFC\xD5 |1
-<UE1AE> \xFC\xD6 |0
-<UE1AF> \xFC\xD7 |1
-<UE1B0> \xFC\xD8 |0
-<UE1B1> \xFC\xD9 |0
-<UE1B2> \xFC\xDA |1
-<UE1B3> \xFC\xDB |0
-<UE1B4> \xFC\xDC |0
-<UE1B5> \xFC\xDD |1
-<UE1B6> \xFC\xDE |0
-<UE1B7> \xFC\xDF |1
-<UE1B8> \xFC\xE0 |0
-<UE1B9> \xFC\xE1 |1
-<UE1BA> \xFC\xE2 |0
-<UE1BB> \xFC\xE3 |0
-<UE1BC> \xFC\xE4 |0
-<UE1BD> \xFC\xE5 |0
-<UE1BE> \xFC\xE6 |0
-<UE1BF> \xFC\xE7 |0
-<UE1C0> \xFC\xE8 |1
-<UE1C1> \xFC\xE9 |0
-<UE1C2> \xFC\xEA |1
-<UE1C3> \xFC\xEB |1
-<UE1C4> \xFC\xEC |0
-<UE1C5> \xFC\xED |0
-<UE1C6> \xFC\xEE |1
-<UE1C7> \xFC\xEF |1
-<UE1C8> \xFC\xF0 |0
-<UE1C9> \xFC\xF1 |0
-<UE1CA> \xFC\xF2 |1
-<UE1CB> \xFC\xF3 |1
-<UE1CC> \xFC\xF4 |0
-<UE1CD> \xFC\xF5 |0
-<UE1CE> \xFC\xF6 |1
-<UE1CF> \xFC\xF7 |1
-<UE1D0> \xFC\xF8 |1
-<UE1D1> \xFC\xF9 |1
-<UE1D2> \xFC\xFA |1
-<UE1D3> \xFC\xFB |1
-<UE1D4> \xFC\xFC |0
-<UE1D5> \xFC\xFD |0
-<UE1D6> \xFC\xFE |1
-<UE1D7> \xFD\x40 |0
-<UE1D8> \xFD\x41 |1
-<UE1D9> \xFD\x42 |1
-<UE1DA> \xFD\x43 |0
-<UE1DB> \xFD\x44 |1
-<UE1DC> \xFD\x45 |1
-<UE1DD> \xFD\x46 |0
-<UE1DE> \xFD\x47 |1
-<UE1DF> \xFD\x48 |1
-<UE1E0> \xFD\x49 |1
-<UE1E1> \xFD\x4A |1
-<UE1E2> \xFD\x4B |0
-<UE1E3> \xFD\x4C |1
-<UE1E4> \xFD\x4D |1
-<UE1E5> \xFD\x4E |1
-<UE1E6> \xFD\x4F |0
-<UE1E7> \xFD\x50 |1
-<UE1E8> \xFD\x51 |1
-<UE1E9> \xFD\x52 |1
-<UE1EA> \xFD\x53 |1
-<UE1EB> \xFD\x54 |0
-<UE1EC> \xFD\x55 |1
-<UE1ED> \xFD\x56 |1
-<UE1EE> \xFD\x57 |1
-<UE1EF> \xFD\x58 |0
-<UE1F0> \xFD\x59 |0
-<UE1F1> \xFD\x5A |1
-<UE1F2> \xFD\x5B |0
-<UE1F3> \xFD\x5C |1
-<UE1F4> \xFD\x5D |1
-<UE1F5> \xFD\x5E |1
-<UE1F6> \xFD\x5F |1
-<UE1F7> \xFD\x60 |0
-<UE1F8> \xFD\x61 |1
-<UE1F9> \xFD\x62 |1
-<UE1FA> \xFD\x63 |0
-<UE1FB> \xFD\x64 |1
-<UE1FC> \xFD\x65 |1
-<UE1FD> \xFD\x66 |1
-<UE1FE> \xFD\x67 |0
-<UE1FF> \xFD\x68 |1
-<UE200> \xFD\x69 |0
-<UE201> \xFD\x6A |0
-<UE202> \xFD\x6B |0
-<UE203> \xFD\x6C |1
-<UE204> \xFD\x6D |1
-<UE205> \xFD\x6E |0
-<UE206> \xFD\x6F |1
-<UE207> \xFD\x70 |0
-<UE208> \xFD\x71 |1
-<UE209> \xFD\x72 |1
-<UE20A> \xFD\x73 |0
-<UE20B> \xFD\x74 |0
-<UE20C> \xFD\x75 |0
-<UE20D> \xFD\x76 |1
-<UE20E> \xFD\x77 |1
-<UE20F> \xFD\x78 |1
-<UE210> \xFD\x79 |0
-<UE211> \xFD\x7A |1
-<UE212> \xFD\x7B |0
-<UE213> \xFD\x7C |0
-<UE214> \xFD\x7D |0
-<UE215> \xFD\x7E |0
-<UE216> \xFD\xA1 |0
-<UE217> \xFD\xA2 |1
-<UE218> \xFD\xA3 |1
-<UE219> \xFD\xA4 |0
-<UE21A> \xFD\xA5 |1
-<UE21B> \xFD\xA6 |0
-<UE21C> \xFD\xA7 |0
-<UE21D> \xFD\xA8 |1
-<UE21E> \xFD\xA9 |1
-<UE21F> \xFD\xAA |0
-<UE220> \xFD\xAB |0
-<UE221> \xFD\xAC |0
-<UE222> \xFD\xAD |1
-<UE223> \xFD\xAE |1
-<UE224> \xFD\xAF |1
-<UE225> \xFD\xB0 |1
-<UE226> \xFD\xB1 |0
-<UE227> \xFD\xB2 |0
-<UE228> \xFD\xB3 |0
-<UE229> \xFD\xB4 |1
-<UE22A> \xFD\xB5 |0
-<UE22B> \xFD\xB6 |1
-<UE22C> \xFD\xB7 |0
-<UE22D> \xFD\xB8 |0
-<UE22E> \xFD\xB9 |1
-<UE22F> \xFD\xBA |0
-<UE230> \xFD\xBB |0
-<UE231> \xFD\xBC |0
-<UE232> \xFD\xBD |1
-<UE233> \xFD\xBE |0
-<UE234> \xFD\xBF |1
-<UE235> \xFD\xC0 |1
-<UE236> \xFD\xC1 |1
-<UE237> \xFD\xC2 |0
-<UE238> \xFD\xC3 |1
-<UE239> \xFD\xC4 |1
-<UE23A> \xFD\xC5 |1
-<UE23B> \xFD\xC6 |0
-<UE23C> \xFD\xC7 |1
-<UE23D> \xFD\xC8 |0
-<UE23E> \xFD\xC9 |0
-<UE23F> \xFD\xCA |1
-<UE240> \xFD\xCB |1
-<UE241> \xFD\xCC |1
-<UE242> \xFD\xCD |1
-<UE243> \xFD\xCE |1
-<UE244> \xFD\xCF |1
-<UE245> \xFD\xD0 |0
-<UE246> \xFD\xD1 |1
-<UE247> \xFD\xD2 |1
-<UE248> \xFD\xD3 |0
-<UE249> \xFD\xD4 |1
-<UE24A> \xFD\xD5 |0
-<UE24B> \xFD\xD6 |0
-<UE24C> \xFD\xD7 |0
-<UE24D> \xFD\xD8 |0
-<UE24E> \xFD\xD9 |0
-<UE24F> \xFD\xDA |0
-<UE250> \xFD\xDB |1
-<UE251> \xFD\xDC |0
-<UE252> \xFD\xDD |0
-<UE253> \xFD\xDE |0
-<UE254> \xFD\xDF |0
-<UE255> \xFD\xE0 |1
-<UE256> \xFD\xE1 |1
-<UE257> \xFD\xE2 |1
-<UE258> \xFD\xE3 |1
-<UE259> \xFD\xE4 |1
-<UE25A> \xFD\xE5 |1
-<UE25B> \xFD\xE6 |1
-<UE25C> \xFD\xE7 |1
-<UE25D> \xFD\xE8 |1
-<UE25E> \xFD\xE9 |1
-<UE25F> \xFD\xEA |1
-<UE260> \xFD\xEB |1
-<UE261> \xFD\xEC |0
-<UE262> \xFD\xED |1
-<UE263> \xFD\xEE |1
-<UE264> \xFD\xEF |1
-<UE265> \xFD\xF0 |1
-<UE266> \xFD\xF1 |0
-<UE267> \xFD\xF2 |1
-<UE268> \xFD\xF3 |0
-<UE269> \xFD\xF4 |1
-<UE26A> \xFD\xF5 |1
-<UE26B> \xFD\xF6 |0
-<UE26C> \xFD\xF7 |1
-<UE26D> \xFD\xF8 |0
-<UE26E> \xFD\xF9 |0
-<UE26F> \xFD\xFA |0
-<UE270> \xFD\xFB |1
-<UE271> \xFD\xFC |0
-<UE272> \xFD\xFD |1
-<UE273> \xFD\xFE |1
-<UE274> \xFE\x40 |1
-<UE275> \xFE\x41 |1
-<UE276> \xFE\x42 |1
-<UE277> \xFE\x43 |1
-<UE278> \xFE\x44 |1
-<UE279> \xFE\x45 |1
-<UE27A> \xFE\x46 |0
-<UE27B> \xFE\x47 |1
-<UE27C> \xFE\x48 |1
-<UE27D> \xFE\x49 |0
-<UE27E> \xFE\x4A |1
-<UE27F> \xFE\x4B |1
-<UE280> \xFE\x4C |1
-<UE281> \xFE\x4D |1
-<UE282> \xFE\x4E |0
-<UE283> \xFE\x4F |1
-<UE284> \xFE\x50 |1
-<UE285> \xFE\x51 |1
-<UE286> \xFE\x52 |0
-<UE287> \xFE\x53 |1
-<UE288> \xFE\x54 |0
-<UE289> \xFE\x55 |0
-<UE28A> \xFE\x56 |1
-<UE28B> \xFE\x57 |0
-<UE28C> \xFE\x58 |1
-<UE28D> \xFE\x59 |1
-<UE28E> \xFE\x5A |1
-<UE28F> \xFE\x5B |1
-<UE290> \xFE\x5C |0
-<UE291> \xFE\x5D |0
-<UE292> \xFE\x5E |1
-<UE293> \xFE\x5F |1
-<UE294> \xFE\x60 |0
-<UE295> \xFE\x61 |0
-<UE296> \xFE\x62 |0
-<UE297> \xFE\x63 |1
-<UE298> \xFE\x64 |1
-<UE299> \xFE\x65 |0
-<UE29A> \xFE\x66 |0
-<UE29B> \xFE\x67 |0
-<UE29C> \xFE\x68 |1
-<UE29D> \xFE\x69 |1
-<UE29E> \xFE\x6A |1
-<UE29F> \xFE\x6B |0
-<UE2A0> \xFE\x6C |1
-<UE2A1> \xFE\x6D |0
-<UE2A2> \xFE\x6E |1
-<UE2A3> \xFE\x6F |0
-<UE2A4> \xFE\x70 |0
-<UE2A5> \xFE\x71 |1
-<UE2A6> \xFE\x72 |0
-<UE2A7> \xFE\x73 |1
-<UE2A8> \xFE\x74 |1
-<UE2A9> \xFE\x75 |1
-<UE2AA> \xFE\x76 |1
-<UE2AB> \xFE\x77 |1
-<UE2AC> \xFE\x78 |1
-<UE2AD> \xFE\x79 |1
-<UE2AE> \xFE\x7A |1
-<UE2AF> \xFE\x7B |1
-<UE2B0> \xFE\x7C |1
-<UE2B1> \xFE\x7D |1
-<UE2B2> \xFE\x7E |0
-<UE2B3> \xFE\xA1 |0
-<UE2B4> \xFE\xA2 |0
-<UE2B5> \xFE\xA3 |0
-<UE2B6> \xFE\xA4 |1
-<UE2B7> \xFE\xA5 |0
-<UE2B8> \xFE\xA6 |0
-<UE2B9> \xFE\xA7 |1
-<UE2BA> \xFE\xA8 |0
-<UE2BB> \xFE\xA9 |1
-<UE2BC> \xFE\xAA |0
-<UE2BD> \xFE\xAB |1
-<UE2BE> \xFE\xAC |0
-<UE2BF> \xFE\xAD |0
-<UE2C0> \xFE\xAE |1
-<UE2C1> \xFE\xAF |0
-<UE2C2> \xFE\xB0 |1
-<UE2C3> \xFE\xB1 |1
-<UE2C4> \xFE\xB2 |1
-<UE2C5> \xFE\xB3 |1
-<UE2C6> \xFE\xB4 |1
-<UE2C7> \xFE\xB5 |0
-<UE2C8> \xFE\xB6 |1
-<UE2C9> \xFE\xB7 |0
-<UE2CA> \xFE\xB8 |1
-<UE2CB> \xFE\xB9 |1
-<UE2CC> \xFE\xBA |1
-<UE2CD> \xFE\xBB |1
-<UE2CE> \xFE\xBC |1
-<UE2CF> \xFE\xBD |1
-<UE2D0> \xFE\xBE |1
-<UE2D1> \xFE\xBF |1
-<UE2D2> \xFE\xC0 |1
-<UE2D3> \xFE\xC1 |1
-<UE2D4> \xFE\xC2 |0
-<UE2D5> \xFE\xC3 |1
-<UE2D6> \xFE\xC4 |1
-<UE2D7> \xFE\xC5 |1
-<UE2D8> \xFE\xC6 |0
-<UE2D9> \xFE\xC7 |0
-<UE2DA> \xFE\xC8 |1
-<UE2DB> \xFE\xC9 |1
-<UE2DC> \xFE\xCA |1
-<UE2DD> \xFE\xCB |1
-<UE2DE> \xFE\xCC |0
-<UE2DF> \xFE\xCD |1
-<UE2E0> \xFE\xCE |0
-<UE2E1> \xFE\xCF |0
-<UE2E2> \xFE\xD0 |0
-<UE2E3> \xFE\xD1 |1
-<UE2E4> \xFE\xD2 |1
-<UE2E5> \xFE\xD3 |1
-<UE2E6> \xFE\xD4 |1
-<UE2E7> \xFE\xD5 |0
-<UE2E8> \xFE\xD6 |1
-<UE2E9> \xFE\xD7 |0
-<UE2EA> \xFE\xD8 |1
-<UE2EB> \xFE\xD9 |0
-<UE2EC> \xFE\xDA |0
-<UE2ED> \xFE\xDB |0
-<UE2EE> \xFE\xDC |1
-<UE2EF> \xFE\xDD |0
-<UE2F0> \xFE\xDE |0
-<UE2F1> \xFE\xDF |0
-<UE2F2> \xFE\xE0 |1
-<UE2F3> \xFE\xE1 |1
-<UE2F4> \xFE\xE2 |1
-<UE2F5> \xFE\xE3 |1
-<UE2F6> \xFE\xE4 |1
-<UE2F7> \xFE\xE5 |1
-<UE2F8> \xFE\xE6 |0
-<UE2F9> \xFE\xE7 |1
-<UE2FA> \xFE\xE8 |1
-<UE2FB> \xFE\xE9 |1
-<UE2FC> \xFE\xEA |0
-<UE2FD> \xFE\xEB |1
-<UE2FE> \xFE\xEC |1
-<UE2FF> \xFE\xED |0
-<UE300> \xFE\xEE |0
-<UE301> \xFE\xEF |0
-<UE302> \xFE\xF0 |1
-<UE303> \xFE\xF1 |1
-<UE304> \xFE\xF2 |1
-<UE305> \xFE\xF3 |1
-<UE306> \xFE\xF4 |0
-<UE307> \xFE\xF5 |1
-<UE308> \xFE\xF6 |0
-<UE309> \xFE\xF7 |1
-<UE30A> \xFE\xF8 |1
-<UE30B> \xFE\xF9 |1
-<UE30C> \xFE\xFA |0
-<UE30D> \xFE\xFB |1
-<UE30E> \xFE\xFC |1
-<UE30F> \xFE\xFD |0
-<UE310> \xFE\xFE |1
-<UE311> \x8E\x40 |0
-<UE312> \x8E\x41 |1
-<UE313> \x8E\x42 |0
-<UE314> \x8E\x43 |1
-<UE315> \x8E\x44 |0
-<UE316> \x8E\x45 |1
-<UE317> \x8E\x46 |1
-<UE318> \x8E\x47 |0
-<UE319> \x8E\x48 |1
-<UE31A> \x8E\x49 |1
-<UE31B> \x8E\x4A |0
-<UE31C> \x8E\x4B |0
-<UE31D> \x8E\x4C |1
-<UE31E> \x8E\x4D |1
-<UE31F> \x8E\x4E |0
-<UE320> \x8E\x4F |1
-<UE321> \x8E\x50 |1
-<UE322> \x8E\x51 |1
-<UE323> \x8E\x52 |1
-<UE324> \x8E\x53 |1
-<UE325> \x8E\x54 |0
-<UE326> \x8E\x55 |1
-<UE327> \x8E\x56 |1
-<UE328> \x8E\x57 |1
-<UE329> \x8E\x58 |1
-<UE32A> \x8E\x59 |1
-<UE32B> \x8E\x5A |1
-<UE32C> \x8E\x5B |0
-<UE32D> \x8E\x5C |1
-<UE32E> \x8E\x5D |1
-<UE32F> \x8E\x5E |1
-<UE330> \x8E\x5F |0
-<UE331> \x8E\x60 |0
-<UE332> \x8E\x61 |1
-<UE333> \x8E\x62 |1
-<UE334> \x8E\x63 |1
-<UE335> \x8E\x64 |0
-<UE336> \x8E\x65 |0
-<UE337> \x8E\x66 |1
-<UE338> \x8E\x67 |1
-<UE339> \x8E\x68 |1
-<UE33A> \x8E\x69 |0
-<UE33B> \x8E\x6A |0
-<UE33C> \x8E\x6B |1
-<UE33D> \x8E\x6C |0
-<UE33E> \x8E\x6D |1
-<UE33F> \x8E\x6E |1
-<UE340> \x8E\x6F |0
-<UE341> \x8E\x70 |1
-<UE342> \x8E\x71 |0
-<UE343> \x8E\x72 |1
-<UE344> \x8E\x73 |1
-<UE345> \x8E\x74 |0
-<UE346> \x8E\x75 |1
-<UE347> \x8E\x76 |1
-<UE348> \x8E\x77 |0
-<UE349> \x8E\x78 |1
-<UE34A> \x8E\x79 |1
-<UE34B> \x8E\x7A |1
-<UE34C> \x8E\x7B |1
-<UE34D> \x8E\x7C |1
-<UE34E> \x8E\x7D |1
-<UE34F> \x8E\x7E |0
-<UE350> \x8E\xA1 |1
-<UE351> \x8E\xA2 |1
-<UE352> \x8E\xA3 |0
-<UE353> \x8E\xA4 |1
-<UE354> \x8E\xA5 |0
-<UE355> \x8E\xA6 |1
-<UE356> \x8E\xA7 |1
-<UE357> \x8E\xA8 |1
-<UE358> \x8E\xA9 |1
-<UE359> \x8E\xAA |1
-<UE35A> \x8E\xAB |0
-<UE35B> \x8E\xAC |0
-<UE35C> \x8E\xAD |0
-<UE35D> \x8E\xAE |1
-<UE35E> \x8E\xAF |1
-<UE35F> \x8E\xB0 |1
-<UE360> \x8E\xB1 |0
-<UE361> \x8E\xB2 |1
-<UE362> \x8E\xB3 |0
-<UE363> \x8E\xB4 |0
-<UE364> \x8E\xB5 |0
-<UE365> \x8E\xB6 |0
-<UE366> \x8E\xB7 |1
-<UE367> \x8E\xB8 |1
-<UE368> \x8E\xB9 |1
-<UE369> \x8E\xBA |1
-<UE36A> \x8E\xBB |1
-<UE36B> \x8E\xBC |1
-<UE36C> \x8E\xBD |1
-<UE36D> \x8E\xBE |1
-<UE36E> \x8E\xBF |1
-<UE36F> \x8E\xC0 |0
-<UE370> \x8E\xC1 |1
-<UE371> \x8E\xC2 |1
-<UE372> \x8E\xC3 |0
-<UE373> \x8E\xC4 |1
-<UE374> \x8E\xC5 |0
-<UE375> \x8E\xC6 |0
-<UE376> \x8E\xC7 |1
-<UE377> \x8E\xC8 |0
-<UE378> \x8E\xC9 |1
-<UE379> \x8E\xCA |0
-<UE37A> \x8E\xCB |1
-<UE37B> \x8E\xCC |0
-<UE37C> \x8E\xCD |0
-<UE37D> \x8E\xCE |1
-<UE37E> \x8E\xCF |1
-<UE37F> \x8E\xD0 |0
-<UE380> \x8E\xD1 |1
-<UE381> \x8E\xD2 |0
-<UE382> \x8E\xD3 |0
-<UE383> \x8E\xD4 |1
-<UE384> \x8E\xD5 |1
-<UE385> \x8E\xD6 |1
-<UE386> \x8E\xD7 |0
-<UE387> \x8E\xD8 |1
-<UE388> \x8E\xD9 |0
-<UE389> \x8E\xDA |0
-<UE38A> \x8E\xDB |0
-<UE38B> \x8E\xDC |1
-<UE38C> \x8E\xDD |1
-<UE38D> \x8E\xDE |0
-<UE38E> \x8E\xDF |1
-<UE38F> \x8E\xE0 |1
-<UE390> \x8E\xE1 |1
-<UE391> \x8E\xE2 |0
-<UE392> \x8E\xE3 |1
-<UE393> \x8E\xE4 |0
-<UE394> \x8E\xE5 |0
-<UE395> \x8E\xE6 |1
-<UE396> \x8E\xE7 |0
-<UE397> \x8E\xE8 |1
-<UE398> \x8E\xE9 |0
-<UE399> \x8E\xEA |1
-<UE39A> \x8E\xEB |0
-<UE39B> \x8E\xEC |0
-<UE39C> \x8E\xED |1
-<UE39D> \x8E\xEE |1
-<UE39E> \x8E\xEF |0
-<UE39F> \x8E\xF0 |0
-<UE3A0> \x8E\xF1 |0
-<UE3A1> \x8E\xF2 |1
-<UE3A2> \x8E\xF3 |0
-<UE3A3> \x8E\xF4 |1
-<UE3A4> \x8E\xF5 |1
-<UE3A5> \x8E\xF6 |0
-<UE3A6> \x8E\xF7 |0
-<UE3A7> \x8E\xF8 |0
-<UE3A8> \x8E\xF9 |0
-<UE3A9> \x8E\xFA |0
-<UE3AA> \x8E\xFB |1
-<UE3AB> \x8E\xFC |1
-<UE3AC> \x8E\xFD |0
-<UE3AD> \x8E\xFE |1
-<UE3AE> \x8F\x40 |1
-<UE3AF> \x8F\x41 |1
-<UE3B0> \x8F\x42 |1
-<UE3B1> \x8F\x43 |0
-<UE3B2> \x8F\x44 |0
-<UE3B3> \x8F\x45 |1
-<UE3B4> \x8F\x46 |0
-<UE3B5> \x8F\x47 |0
-<UE3B6> \x8F\x48 |1
-<UE3B7> \x8F\x49 |1
-<UE3B8> \x8F\x4A |1
-<UE3B9> \x8F\x4B |0
-<UE3BA> \x8F\x4C |0
-<UE3BB> \x8F\x4D |0
-<UE3BC> \x8F\x4E |0
-<UE3BD> \x8F\x4F |0
-<UE3BE> \x8F\x50 |1
-<UE3BF> \x8F\x51 |1
-<UE3C0> \x8F\x52 |1
-<UE3C1> \x8F\x53 |1
-<UE3C2> \x8F\x54 |1
-<UE3C3> \x8F\x55 |0
-<UE3C4> \x8F\x56 |1
-<UE3C5> \x8F\x57 |0
-<UE3C6> \x8F\x58 |1
-<UE3C7> \x8F\x59 |1
-<UE3C8> \x8F\x5A |0
-<UE3C9> \x8F\x5B |1
-<UE3CA> \x8F\x5C |1
-<UE3CB> \x8F\x5D |1
-<UE3CC> \x8F\x5E |0
-<UE3CD> \x8F\x5F |0
-<UE3CE> \x8F\x60 |1
-<UE3CF> \x8F\x61 |0
-<UE3D0> \x8F\x62 |1
-<UE3D1> \x8F\x63 |1
-<UE3D2> \x8F\x64 |1
-<UE3D3> \x8F\x65 |1
-<UE3D4> \x8F\x66 |1
-<UE3D5> \x8F\x67 |0
-<UE3D6> \x8F\x68 |1
-<UE3D7> \x8F\x69 |0
-<UE3D8> \x8F\x6A |0
-<UE3D9> \x8F\x6B |0
-<UE3DA> \x8F\x6C |0
-<UE3DB> \x8F\x6D |1
-<UE3DC> \x8F\x6E |0
-<UE3DD> \x8F\x6F |1
-<UE3DE> \x8F\x70 |1
-<UE3DF> \x8F\x71 |1
-<UE3E0> \x8F\x72 |1
-<UE3E1> \x8F\x73 |0
-<UE3E2> \x8F\x74 |1
-<UE3E3> \x8F\x75 |0
-<UE3E4> \x8F\x76 |1
-<UE3E5> \x8F\x77 |1
-<UE3E6> \x8F\x78 |1
-<UE3E7> \x8F\x79 |0
-<UE3E8> \x8F\x7A |1
-<UE3E9> \x8F\x7B |1
-<UE3EA> \x8F\x7C |1
-<UE3EB> \x8F\x7D |1
-<UE3EC> \x8F\x7E |1
-<UE3ED> \x8F\xA1 |0
-<UE3EE> \x8F\xA2 |0
-<UE3EF> \x8F\xA3 |1
-<UE3F0> \x8F\xA4 |0
-<UE3F1> \x8F\xA5 |1
-<UE3F2> \x8F\xA6 |0
-<UE3F3> \x8F\xA7 |0
-<UE3F4> \x8F\xA8 |0
-<UE3F5> \x8F\xA9 |1
-<UE3F6> \x8F\xAA |1
-<UE3F7> \x8F\xAB |1
-<UE3F8> \x8F\xAC |0
-<UE3F9> \x8F\xAD |1
-<UE3FA> \x8F\xAE |0
-<UE3FB> \x8F\xAF |1
-<UE3FC> \x8F\xB0 |1
-<UE3FD> \x8F\xB1 |0
-<UE3FE> \x8F\xB2 |1
-<UE3FF> \x8F\xB3 |0
-<UE400> \x8F\xB4 |1
-<UE401> \x8F\xB5 |1
-<UE402> \x8F\xB6 |1
-<UE403> \x8F\xB7 |1
-<UE404> \x8F\xB8 |1
-<UE405> \x8F\xB9 |1
-<UE406> \x8F\xBA |1
-<UE407> \x8F\xBB |1
-<UE408> \x8F\xBC |1
-<UE409> \x8F\xBD |0
-<UE40A> \x8F\xBE |0
-<UE40B> \x8F\xBF |0
-<UE40C> \x8F\xC0 |1
-<UE40D> \x8F\xC1 |1
-<UE40E> \x8F\xC2 |1
-<UE40F> \x8F\xC3 |1
-<UE410> \x8F\xC4 |1
-<UE411> \x8F\xC5 |1
-<UE412> \x8F\xC6 |1
-<UE413> \x8F\xC7 |1
-<UE414> \x8F\xC8 |0
-<UE415> \x8F\xC9 |1
-<UE416> \x8F\xCA |1
-<UE417> \x8F\xCB |0
-<UE418> \x8F\xCC |0
-<UE419> \x8F\xCD |1
-<UE41A> \x8F\xCE |1
-<UE41B> \x8F\xCF |0
-<UE41C> \x8F\xD0 |1
-<UE41D> \x8F\xD1 |0
-<UE41E> \x8F\xD2 |0
-<UE41F> \x8F\xD3 |1
-<UE420> \x8F\xD4 |1
-<UE421> \x8F\xD5 |1
-<UE422> \x8F\xD6 |1
-<UE423> \x8F\xD7 |0
-<UE424> \x8F\xD8 |1
-<UE425> \x8F\xD9 |0
-<UE426> \x8F\xDA |0
-<UE427> \x8F\xDB |1
-<UE428> \x8F\xDC |0
-<UE429> \x8F\xDD |1
-<UE42A> \x8F\xDE |1
-<UE42B> \x8F\xDF |1
-<UE42C> \x8F\xE0 |0
-<UE42D> \x8F\xE1 |0
-<UE42E> \x8F\xE2 |1
-<UE42F> \x8F\xE3 |1
-<UE430> \x8F\xE4 |1
-<UE431> \x8F\xE5 |1
-<UE432> \x8F\xE6 |0
-<UE433> \x8F\xE7 |1
-<UE434> \x8F\xE8 |1
-<UE435> \x8F\xE9 |1
-<UE436> \x8F\xEA |0
-<UE437> \x8F\xEB |1
-<UE438> \x8F\xEC |1
-<UE439> \x8F\xED |1
-<UE43A> \x8F\xEE |0
-<UE43B> \x8F\xEF |0
-<UE43C> \x8F\xF0 |0
-<UE43D> \x8F\xF1 |1
-<UE43E> \x8F\xF2 |0
-<UE43F> \x8F\xF3 |1
-<UE440> \x8F\xF4 |0
-<UE441> \x8F\xF5 |0
-<UE442> \x8F\xF6 |1
-<UE443> \x8F\xF7 |1
-<UE444> \x8F\xF8 |0
-<UE445> \x8F\xF9 |1
-<UE446> \x8F\xFA |1
-<UE447> \x8F\xFB |1
-<UE448> \x8F\xFC |0
-<UE449> \x8F\xFD |1
-<UE44A> \x8F\xFE |0
-<UE44B> \x90\x40 |1
-<UE44C> \x90\x41 |0
-<UE44D> \x90\x42 |0
-<UE44E> \x90\x43 |0
-<UE44F> \x90\x44 |1
-<UE450> \x90\x45 |0
-<UE451> \x90\x46 |0
-<UE452> \x90\x47 |1
-<UE453> \x90\x48 |1
-<UE454> \x90\x49 |1
-<UE455> \x90\x4A |1
-<UE456> \x90\x4B |1
-<UE457> \x90\x4C |1
-<UE458> \x90\x4D |1
-<UE459> \x90\x4E |0
-<UE45A> \x90\x4F |0
-<UE45B> \x90\x50 |1
-<UE45C> \x90\x51 |1
-<UE45D> \x90\x52 |0
-<UE45E> \x90\x53 |0
-<UE45F> \x90\x54 |1
-<UE460> \x90\x55 |1
-<UE461> \x90\x56 |0
-<UE462> \x90\x57 |0
-<UE463> \x90\x58 |0
-<UE464> \x90\x59 |1
-<UE465> \x90\x5A |0
-<UE466> \x90\x5B |1
-<UE467> \x90\x5C |0
-<UE468> \x90\x5D |0
-<UE469> \x90\x5E |0
-<UE46A> \x90\x5F |0
-<UE46B> \x90\x60 |1
-<UE46C> \x90\x61 |0
-<UE46D> \x90\x62 |1
-<UE46E> \x90\x63 |0
-<UE46F> \x90\x64 |0
-<UE470> \x90\x65 |1
-<UE471> \x90\x66 |0
-<UE472> \x90\x67 |0
-<UE473> \x90\x68 |1
-<UE474> \x90\x69 |0
-<UE475> \x90\x6A |1
-<UE476> \x90\x6B |0
-<UE477> \x90\x6C |1
-<UE478> \x90\x6D |0
-<UE479> \x90\x6E |1
-<UE47A> \x90\x6F |1
-<UE47B> \x90\x70 |1
-<UE47C> \x90\x71 |1
-<UE47D> \x90\x72 |1
-<UE47E> \x90\x73 |0
-<UE47F> \x90\x74 |0
-<UE480> \x90\x75 |1
-<UE481> \x90\x76 |1
-<UE482> \x90\x77 |1
-<UE483> \x90\x78 |1
-<UE484> \x90\x79 |0
-<UE485> \x90\x7A |0
-<UE486> \x90\x7B |0
-<UE487> \x90\x7C |0
-<UE488> \x90\x7D |0
-<UE489> \x90\x7E |0
-<UE48A> \x90\xA1 |0
-<UE48B> \x90\xA2 |1
-<UE48C> \x90\xA3 |1
-<UE48D> \x90\xA4 |0
-<UE48E> \x90\xA5 |0
-<UE48F> \x90\xA6 |1
-<UE490> \x90\xA7 |1
-<UE491> \x90\xA8 |0
-<UE492> \x90\xA9 |0
-<UE493> \x90\xAA |1
-<UE494> \x90\xAB |1
-<UE495> \x90\xAC |0
-<UE496> \x90\xAD |0
-<UE497> \x90\xAE |0
-<UE498> \x90\xAF |1
-<UE499> \x90\xB0 |1
-<UE49A> \x90\xB1 |1
-<UE49B> \x90\xB2 |1
-<UE49C> \x90\xB3 |1
-<UE49D> \x90\xB4 |1
-<UE49E> \x90\xB5 |1
-<UE49F> \x90\xB6 |1
-<UE4A0> \x90\xB7 |1
-<UE4A1> \x90\xB8 |0
-<UE4A2> \x90\xB9 |0
-<UE4A3> \x90\xBA |0
-<UE4A4> \x90\xBB |0
-<UE4A5> \x90\xBC |1
-<UE4A6> \x90\xBD |1
-<UE4A7> \x90\xBE |1
-<UE4A8> \x90\xBF |1
-<UE4A9> \x90\xC0 |1
-<UE4AA> \x90\xC1 |1
-<UE4AB> \x90\xC2 |0
-<UE4AC> \x90\xC3 |1
-<UE4AD> \x90\xC4 |1
-<UE4AE> \x90\xC5 |1
-<UE4AF> \x90\xC6 |0
-<UE4B0> \x90\xC7 |1
-<UE4B1> \x90\xC8 |1
-<UE4B2> \x90\xC9 |1
-<UE4B3> \x90\xCA |0
-<UE4B4> \x90\xCB |0
-<UE4B5> \x90\xCC |0
-<UE4B6> \x90\xCD |0
-<UE4B7> \x90\xCE |0
-<UE4B8> \x90\xCF |0
-<UE4B9> \x90\xD0 |0
-<UE4BA> \x90\xD1 |0
-<UE4BB> \x90\xD2 |1
-<UE4BC> \x90\xD3 |1
-<UE4BD> \x90\xD4 |1
-<UE4BE> \x90\xD5 |1
-<UE4BF> \x90\xD6 |1
-<UE4C0> \x90\xD7 |1
-<UE4C1> \x90\xD8 |0
-<UE4C2> \x90\xD9 |1
-<UE4C3> \x90\xDA |1
-<UE4C4> \x90\xDB |1
-<UE4C5> \x90\xDC |0
-<UE4C6> \x90\xDD |0
-<UE4C7> \x90\xDE |1
-<UE4C8> \x90\xDF |1
-<UE4C9> \x90\xE0 |0
-<UE4CA> \x90\xE1 |1
-<UE4CB> \x90\xE2 |1
-<UE4CC> \x90\xE3 |1
-<UE4CD> \x90\xE4 |0
-<UE4CE> \x90\xE5 |0
-<UE4CF> \x90\xE6 |1
-<UE4D0> \x90\xE7 |1
-<UE4D1> \x90\xE8 |1
-<UE4D2> \x90\xE9 |1
-<UE4D3> \x90\xEA |1
-<UE4D4> \x90\xEB |1
-<UE4D5> \x90\xEC |1
-<UE4D6> \x90\xED |0
-<UE4D7> \x90\xEE |1
-<UE4D8> \x90\xEF |1
-<UE4D9> \x90\xF0 |0
-<UE4DA> \x90\xF1 |0
-<UE4DB> \x90\xF2 |1
-<UE4DC> \x90\xF3 |0
-<UE4DD> \x90\xF4 |0
-<UE4DE> \x90\xF5 |1
-<UE4DF> \x90\xF6 |1
-<UE4E0> \x90\xF7 |1
-<UE4E1> \x90\xF8 |1
-<UE4E2> \x90\xF9 |1
-<UE4E3> \x90\xFA |1
-<UE4E4> \x90\xFB |0
-<UE4E5> \x90\xFC |1
-<UE4E6> \x90\xFD |0
-<UE4E7> \x90\xFE |0
-<UE4E8> \x91\x40 |0
-<UE4E9> \x91\x41 |1
-<UE4EA> \x91\x42 |1
-<UE4EB> \x91\x43 |1
-<UE4EC> \x91\x44 |1
-<UE4ED> \x91\x45 |1
-<UE4EE> \x91\x46 |0
-<UE4EF> \x91\x47 |0
-<UE4F0> \x91\x48 |1
-<UE4F1> \x91\x49 |1
-<UE4F2> \x91\x4A |1
-<UE4F3> \x91\x4B |1
-<UE4F4> \x91\x4C |1
-<UE4F5> \x91\x4D |1
-<UE4F6> \x91\x4E |0
-<UE4F7> \x91\x4F |1
-<UE4F8> \x91\x50 |0
-<UE4F9> \x91\x51 |0
-<UE4FA> \x91\x52 |1
-<UE4FB> \x91\x53 |1
-<UE4FC> \x91\x54 |1
-<UE4FD> \x91\x55 |1
-<UE4FE> \x91\x56 |1
-<UE4FF> \x91\x57 |0
-<UE500> \x91\x58 |1
-<UE501> \x91\x59 |0
-<UE502> \x91\x5A |0
-<UE503> \x91\x5B |1
-<UE504> \x91\x5C |1
-<UE505> \x91\x5D |0
-<UE506> \x91\x5E |1
-<UE507> \x91\x5F |1
-<UE508> \x91\x60 |1
-<UE509> \x91\x61 |1
-<UE50A> \x91\x62 |0
-<UE50B> \x91\x63 |1
-<UE50C> \x91\x64 |1
-<UE50D> \x91\x65 |0
-<UE50E> \x91\x66 |1
-<UE50F> \x91\x67 |0
-<UE510> \x91\x68 |1
-<UE511> \x91\x69 |1
-<UE512> \x91\x6A |0
-<UE513> \x91\x6B |1
-<UE514> \x91\x6C |0
-<UE515> \x91\x6D |1
-<UE516> \x91\x6E |0
-<UE517> \x91\x6F |1
-<UE518> \x91\x70 |1
-<UE519> \x91\x71 |1
-<UE51A> \x91\x72 |0
-<UE51B> \x91\x73 |1
-<UE51C> \x91\x74 |0
-<UE51D> \x91\x75 |0
-<UE51E> \x91\x76 |0
-<UE51F> \x91\x77 |0
-<UE520> \x91\x78 |0
-<UE521> \x91\x79 |0
-<UE522> \x91\x7A |1
-<UE523> \x91\x7B |1
-<UE524> \x91\x7C |0
-<UE525> \x91\x7D |1
-<UE526> \x91\x7E |1
-<UE527> \x91\xA1 |1
-<UE528> \x91\xA2 |0
-<UE529> \x91\xA3 |0
-<UE52A> \x91\xA4 |0
-<UE52B> \x91\xA5 |0
-<UE52C> \x91\xA6 |0
-<UE52D> \x91\xA7 |1
-<UE52E> \x91\xA8 |0
-<UE52F> \x91\xA9 |0
-<UE530> \x91\xAA |1
-<UE531> \x91\xAB |1
-<UE532> \x91\xAC |1
-<UE533> \x91\xAD |1
-<UE534> \x91\xAE |1
-<UE535> \x91\xAF |1
-<UE536> \x91\xB0 |1
-<UE537> \x91\xB1 |0
-<UE538> \x91\xB2 |1
-<UE539> \x91\xB3 |1
-<UE53A> \x91\xB4 |1
-<UE53B> \x91\xB5 |1
-<UE53C> \x91\xB6 |1
-<UE53D> \x91\xB7 |1
-<UE53E> \x91\xB8 |0
-<UE53F> \x91\xB9 |1
-<UE540> \x91\xBA |1
-<UE541> \x91\xBB |1
-<UE542> \x91\xBC |1
-<UE543> \x91\xBD |0
-<UE544> \x91\xBE |1
-<UE545> \x91\xBF |0
-<UE546> \x91\xC0 |1
-<UE547> \x91\xC1 |1
-<UE548> \x91\xC2 |1
-<UE549> \x91\xC3 |1
-<UE54A> \x91\xC4 |1
-<UE54B> \x91\xC5 |0
-<UE54C> \x91\xC6 |1
-<UE54D> \x91\xC7 |1
-<UE54E> \x91\xC8 |1
-<UE54F> \x91\xC9 |1
-<UE550> \x91\xCA |1
-<UE551> \x91\xCB |1
-<UE552> \x91\xCC |1
-<UE553> \x91\xCD |1
-<UE554> \x91\xCE |0
-<UE555> \x91\xCF |0
-<UE556> \x91\xD0 |1
-<UE557> \x91\xD1 |0
-<UE558> \x91\xD2 |0
-<UE559> \x91\xD3 |0
-<UE55A> \x91\xD4 |1
-<UE55B> \x91\xD5 |0
-<UE55C> \x91\xD6 |0
-<UE55D> \x91\xD7 |1
-<UE55E> \x91\xD8 |0
-<UE55F> \x91\xD9 |0
-<UE560> \x91\xDA |1
-<UE561> \x91\xDB |1
-<UE562> \x91\xDC |0
-<UE563> \x91\xDD |1
-<UE564> \x91\xDE |1
-<UE565> \x91\xDF |1
-<UE566> \x91\xE0 |0
-<UE567> \x91\xE1 |0
-<UE568> \x91\xE2 |1
-<UE569> \x91\xE3 |1
-<UE56A> \x91\xE4 |1
-<UE56B> \x91\xE5 |1
-<UE56C> \x91\xE6 |1
-<UE56D> \x91\xE7 |0
-<UE56E> \x91\xE8 |0
-<UE56F> \x91\xE9 |1
-<UE570> \x91\xEA |0
-<UE571> \x91\xEB |1
-<UE572> \x91\xEC |0
-<UE573> \x91\xED |0
-<UE574> \x91\xEE |1
-<UE575> \x91\xEF |0
-<UE576> \x91\xF0 |0
-<UE577> \x91\xF1 |0
-<UE578> \x91\xF2 |1
-<UE579> \x91\xF3 |0
-<UE57A> \x91\xF4 |0
-<UE57B> \x91\xF5 |1
-<UE57C> \x91\xF6 |0
-<UE57D> \x91\xF7 |0
-<UE57E> \x91\xF8 |0
-<UE57F> \x91\xF9 |1
-<UE580> \x91\xFA |0
-<UE581> \x91\xFB |1
-<UE582> \x91\xFC |0
-<UE583> \x91\xFD |0
-<UE584> \x91\xFE |0
-<UE585> \x92\x40 |0
-<UE586> \x92\x41 |0
-<UE587> \x92\x42 |1
-<UE588> \x92\x43 |0
-<UE589> \x92\x44 |0
-<UE58A> \x92\x45 |1
-<UE58B> \x92\x46 |0
-<UE58C> \x92\x47 |0
-<UE58D> \x92\x48 |0
-<UE58E> \x92\x49 |0
-<UE58F> \x92\x4A |0
-<UE590> \x92\x4B |0
-<UE591> \x92\x4C |1
-<UE592> \x92\x4D |0
-<UE593> \x92\x4E |0
-<UE594> \x92\x4F |0
-<UE595> \x92\x50 |1
-<UE596> \x92\x51 |1
-<UE597> \x92\x52 |1
-<UE598> \x92\x53 |1
-<UE599> \x92\x54 |1
-<UE59A> \x92\x55 |0
-<UE59B> \x92\x56 |1
-<UE59C> \x92\x57 |1
-<UE59D> \x92\x58 |0
-<UE59E> \x92\x59 |0
-<UE59F> \x92\x5A |0
-<UE5A0> \x92\x5B |0
-<UE5A1> \x92\x5C |0
-<UE5A2> \x92\x5D |1
-<UE5A3> \x92\x5E |1
-<UE5A4> \x92\x5F |0
-<UE5A5> \x92\x60 |1
-<UE5A6> \x92\x61 |0
-<UE5A7> \x92\x62 |0
-<UE5A8> \x92\x63 |0
-<UE5A9> \x92\x64 |1
-<UE5AA> \x92\x65 |0
-<UE5AB> \x92\x66 |1
-<UE5AC> \x92\x67 |1
-<UE5AD> \x92\x68 |1
-<UE5AE> \x92\x69 |1
-<UE5AF> \x92\x6A |0
-<UE5B0> \x92\x6B |1
-<UE5B1> \x92\x6C |0
-<UE5B2> \x92\x6D |0
-<UE5B3> \x92\x6E |1
-<UE5B4> \x92\x6F |1
-<UE5B5> \x92\x70 |0
-<UE5B6> \x92\x71 |1
-<UE5B7> \x92\x72 |0
-<UE5B8> \x92\x73 |0
-<UE5B9> \x92\x74 |1
-<UE5BA> \x92\x75 |0
-<UE5BB> \x92\x76 |0
-<UE5BC> \x92\x77 |1
-<UE5BD> \x92\x78 |1
-<UE5BE> \x92\x79 |0
-<UE5BF> \x92\x7A |0
-<UE5C0> \x92\x7B |0
-<UE5C1> \x92\x7C |1
-<UE5C2> \x92\x7D |0
-<UE5C3> \x92\x7E |1
-<UE5C4> \x92\xA1 |1
-<UE5C5> \x92\xA2 |1
-<UE5C6> \x92\xA3 |1
-<UE5C7> \x92\xA4 |1
-<UE5C8> \x92\xA5 |0
-<UE5C9> \x92\xA6 |0
-<UE5CA> \x92\xA7 |1
-<UE5CB> \x92\xA8 |1
-<UE5CC> \x92\xA9 |1
-<UE5CD> \x92\xAA |1
-<UE5CE> \x92\xAB |1
-<UE5CF> \x92\xAC |1
-<UE5D0> \x92\xAD |1
-<UE5D1> \x92\xAE |1
-<UE5D2> \x92\xAF |0
-<UE5D3> \x92\xB0 |0
-<UE5D4> \x92\xB1 |0
-<UE5D5> \x92\xB2 |0
-<UE5D6> \x92\xB3 |1
-<UE5D7> \x92\xB4 |0
-<UE5D8> \x92\xB5 |0
-<UE5D9> \x92\xB6 |0
-<UE5DA> \x92\xB7 |1
-<UE5DB> \x92\xB8 |0
-<UE5DC> \x92\xB9 |0
-<UE5DD> \x92\xBA |1
-<UE5DE> \x92\xBB |1
-<UE5DF> \x92\xBC |0
-<UE5E0> \x92\xBD |1
-<UE5E1> \x92\xBE |0
-<UE5E2> \x92\xBF |0
-<UE5E3> \x92\xC0 |0
-<UE5E4> \x92\xC1 |1
-<UE5E5> \x92\xC2 |0
-<UE5E6> \x92\xC3 |0
-<UE5E7> \x92\xC4 |1
-<UE5E8> \x92\xC5 |1
-<UE5E9> \x92\xC6 |0
-<UE5EA> \x92\xC7 |1
-<UE5EB> \x92\xC8 |0
-<UE5EC> \x92\xC9 |1
-<UE5ED> \x92\xCA |1
-<UE5EE> \x92\xCB |0
-<UE5EF> \x92\xCC |0
-<UE5F0> \x92\xCD |0
-<UE5F1> \x92\xCE |0
-<UE5F2> \x92\xCF |1
-<UE5F3> \x92\xD0 |0
-<UE5F4> \x92\xD1 |0
-<UE5F5> \x92\xD2 |1
-<UE5F6> \x92\xD3 |1
-<UE5F7> \x92\xD4 |1
-<UE5F8> \x92\xD5 |1
-<UE5F9> \x92\xD6 |1
-<UE5FA> \x92\xD7 |1
-<UE5FB> \x92\xD8 |0
-<UE5FC> \x92\xD9 |0
-<UE5FD> \x92\xDA |1
-<UE5FE> \x92\xDB |1
-<UE5FF> \x92\xDC |1
-<UE600> \x92\xDD |0
-<UE601> \x92\xDE |1
-<UE602> \x92\xDF |0
-<UE603> \x92\xE0 |1
-<UE604> \x92\xE1 |0
-<UE605> \x92\xE2 |1
-<UE606> \x92\xE3 |1
-<UE607> \x92\xE4 |1
-<UE608> \x92\xE5 |1
-<UE609> \x92\xE6 |1
-<UE60A> \x92\xE7 |1
-<UE60B> \x92\xE8 |1
-<UE60C> \x92\xE9 |1
-<UE60D> \x92\xEA |1
-<UE60E> \x92\xEB |1
-<UE60F> \x92\xEC |0
-<UE610> \x92\xED |0
-<UE611> \x92\xEE |0
-<UE612> \x92\xEF |0
-<UE613> \x92\xF0 |1
-<UE614> \x92\xF1 |1
-<UE615> \x92\xF2 |1
-<UE616> \x92\xF3 |1
-<UE617> \x92\xF4 |1
-<UE618> \x92\xF5 |1
-<UE619> \x92\xF6 |0
-<UE61A> \x92\xF7 |0
-<UE61B> \x92\xF8 |0
-<UE61C> \x92\xF9 |0
-<UE61D> \x92\xFA |1
-<UE61E> \x92\xFB |1
-<UE61F> \x92\xFC |1
-<UE620> \x92\xFD |1
-<UE621> \x92\xFE |0
-<UE622> \x93\x40 |1
-<UE623> \x93\x41 |0
-<UE624> \x93\x42 |0
-<UE625> \x93\x43 |1
-<UE626> \x93\x44 |1
-<UE627> \x93\x45 |0
-<UE628> \x93\x46 |1
-<UE629> \x93\x47 |1
-<UE62A> \x93\x48 |1
-<UE62B> \x93\x49 |0
-<UE62C> \x93\x4A |1
-<UE62D> \x93\x4B |1
-<UE62E> \x93\x4C |1
-<UE62F> \x93\x4D |1
-<UE630> \x93\x4E |1
-<UE631> \x93\x4F |1
-<UE632> \x93\x50 |0
-<UE633> \x93\x51 |0
-<UE634> \x93\x52 |0
-<UE635> \x93\x53 |1
-<UE636> \x93\x54 |1
-<UE637> \x93\x55 |0
-<UE638> \x93\x56 |0
-<UE639> \x93\x57 |1
-<UE63A> \x93\x58 |0
-<UE63B> \x93\x59 |1
-<UE63C> \x93\x5A |0
-<UE63D> \x93\x5B |1
-<UE63E> \x93\x5C |1
-<UE63F> \x93\x5D |0
-<UE640> \x93\x5E |0
-<UE641> \x93\x5F |0
-<UE642> \x93\x60 |0
-<UE643> \x93\x61 |1
-<UE644> \x93\x62 |1
-<UE645> \x93\x63 |0
-<UE646> \x93\x64 |0
-<UE647> \x93\x65 |1
-<UE648> \x93\x66 |0
-<UE649> \x93\x67 |1
-<UE64A> \x93\x68 |1
-<UE64B> \x93\x69 |0
-<UE64C> \x93\x6A |1
-<UE64D> \x93\x6B |1
-<UE64E> \x93\x6C |0
-<UE64F> \x93\x6D |0
-<UE650> \x93\x6E |1
-<UE651> \x93\x6F |1
-<UE652> \x93\x70 |0
-<UE653> \x93\x71 |0
-<UE654> \x93\x72 |0
-<UE655> \x93\x73 |0
-<UE656> \x93\x74 |1
-<UE657> \x93\x75 |0
-<UE658> \x93\x76 |0
-<UE659> \x93\x77 |0
-<UE65A> \x93\x78 |1
-<UE65B> \x93\x79 |1
-<UE65C> \x93\x7A |1
-<UE65D> \x93\x7B |0
-<UE65E> \x93\x7C |0
-<UE65F> \x93\x7D |0
-<UE660> \x93\x7E |0
-<UE661> \x93\xA1 |1
-<UE662> \x93\xA2 |0
-<UE663> \x93\xA3 |0
-<UE664> \x93\xA4 |1
-<UE665> \x93\xA5 |0
-<UE666> \x93\xA6 |0
-<UE667> \x93\xA7 |0
-<UE668> \x93\xA8 |0
-<UE669> \x93\xA9 |1
-<UE66A> \x93\xAA |0
-<UE66B> \x93\xAB |1
-<UE66C> \x93\xAC |1
-<UE66D> \x93\xAD |1
-<UE66E> \x93\xAE |0
-<UE66F> \x93\xAF |0
-<UE670> \x93\xB0 |1
-<UE671> \x93\xB1 |0
-<UE672> \x93\xB2 |1
-<UE673> \x93\xB3 |1
-<UE674> \x93\xB4 |1
-<UE675> \x93\xB5 |1
-<UE676> \x93\xB6 |0
-<UE677> \x93\xB7 |0
-<UE678> \x93\xB8 |0
-<UE679> \x93\xB9 |0
-<UE67A> \x93\xBA |1
-<UE67B> \x93\xBB |0
-<UE67C> \x93\xBC |0
-<UE67D> \x93\xBD |0
-<UE67E> \x93\xBE |1
-<UE67F> \x93\xBF |0
-<UE680> \x93\xC0 |0
-<UE681> \x93\xC1 |1
-<UE682> \x93\xC2 |1
-<UE683> \x93\xC3 |0
-<UE684> \x93\xC4 |0
-<UE685> \x93\xC5 |0
-<UE686> \x93\xC6 |0
-<UE687> \x93\xC7 |0
-<UE688> \x93\xC8 |0
-<UE689> \x93\xC9 |1
-<UE68A> \x93\xCA |0
-<UE68B> \x93\xCB |0
-<UE68C> \x93\xCC |0
-<UE68D> \x93\xCD |1
-<UE68E> \x93\xCE |0
-<UE68F> \x93\xCF |0
-<UE690> \x93\xD0 |0
-<UE691> \x93\xD1 |1
-<UE692> \x93\xD2 |0
-<UE693> \x93\xD3 |1
-<UE694> \x93\xD4 |1
-<UE695> \x93\xD5 |1
-<UE696> \x93\xD6 |0
-<UE697> \x93\xD7 |0
-<UE698> \x93\xD8 |1
-<UE699> \x93\xD9 |0
-<UE69A> \x93\xDA |0
-<UE69B> \x93\xDB |1
-<UE69C> \x93\xDC |0
-<UE69D> \x93\xDD |1
-<UE69E> \x93\xDE |0
-<UE69F> \x93\xDF |0
-<UE6A0> \x93\xE0 |1
-<UE6A1> \x93\xE1 |0
-<UE6A2> \x93\xE2 |0
-<UE6A3> \x93\xE3 |1
-<UE6A4> \x93\xE4 |1
-<UE6A5> \x93\xE5 |1
-<UE6A6> \x93\xE6 |0
-<UE6A7> \x93\xE7 |1
-<UE6A8> \x93\xE8 |1
-<UE6A9> \x93\xE9 |1
-<UE6AA> \x93\xEA |1
-<UE6AB> \x93\xEB |1
-<UE6AC> \x93\xEC |0
-<UE6AD> \x93\xED |0
-<UE6AE> \x93\xEE |1
-<UE6AF> \x93\xEF |1
-<UE6B0> \x93\xF0 |1
-<UE6B1> \x93\xF1 |1
-<UE6B2> \x93\xF2 |0
-<UE6B3> \x93\xF3 |1
-<UE6B4> \x93\xF4 |1
-<UE6B5> \x93\xF5 |1
-<UE6B6> \x93\xF6 |1
-<UE6B7> \x93\xF7 |1
-<UE6B8> \x93\xF8 |1
-<UE6B9> \x93\xF9 |0
-<UE6BA> \x93\xFA |0
-<UE6BB> \x93\xFB |1
-<UE6BC> \x93\xFC |1
-<UE6BD> \x93\xFD |0
-<UE6BE> \x93\xFE |0
-<UE6BF> \x94\x40 |1
-<UE6C0> \x94\x41 |0
-<UE6C1> \x94\x42 |0
-<UE6C2> \x94\x43 |1
-<UE6C3> \x94\x44 |1
-<UE6C4> \x94\x45 |1
-<UE6C5> \x94\x46 |0
-<UE6C6> \x94\x47 |0
-<UE6C7> \x94\x48 |0
-<UE6C8> \x94\x49 |1
-<UE6C9> \x94\x4A |1
-<UE6CA> \x94\x4B |0
-<UE6CB> \x94\x4C |1
-<UE6CC> \x94\x4D |1
-<UE6CD> \x94\x4E |1
-<UE6CE> \x94\x4F |1
-<UE6CF> \x94\x50 |1
-<UE6D0> \x94\x51 |1
-<UE6D1> \x94\x52 |0
-<UE6D2> \x94\x53 |0
-<UE6D3> \x94\x54 |1
-<UE6D4> \x94\x55 |1
-<UE6D5> \x94\x56 |1
-<UE6D6> \x94\x57 |1
-<UE6D7> \x94\x58 |0
-<UE6D8> \x94\x59 |0
-<UE6D9> \x94\x5A |1
-<UE6DA> \x94\x5B |0
-<UE6DB> \x94\x5C |0
-<UE6DC> \x94\x5D |1
-<UE6DD> \x94\x5E |0
-<UE6DE> \x94\x5F |0
-<UE6DF> \x94\x60 |0
-<UE6E0> \x94\x61 |0
-<UE6E1> \x94\x62 |0
-<UE6E2> \x94\x63 |1
-<UE6E3> \x94\x64 |1
-<UE6E4> \x94\x65 |0
-<UE6E5> \x94\x66 |0
-<UE6E6> \x94\x67 |0
-<UE6E7> \x94\x68 |1
-<UE6E8> \x94\x69 |1
-<UE6E9> \x94\x6A |1
-<UE6EA> \x94\x6B |1
-<UE6EB> \x94\x6C |1
-<UE6EC> \x94\x6D |1
-<UE6ED> \x94\x6E |1
-<UE6EE> \x94\x6F |0
-<UE6EF> \x94\x70 |1
-<UE6F0> \x94\x71 |1
-<UE6F1> \x94\x72 |1
-<UE6F2> \x94\x73 |0
-<UE6F3> \x94\x74 |0
-<UE6F4> \x94\x75 |1
-<UE6F5> \x94\x76 |1
-<UE6F6> \x94\x77 |1
-<UE6F7> \x94\x78 |0
-<UE6F8> \x94\x79 |1
-<UE6F9> \x94\x7A |1
-<UE6FA> \x94\x7B |0
-<UE6FB> \x94\x7C |0
-<UE6FC> \x94\x7D |0
-<UE6FD> \x94\x7E |1
-<UE6FE> \x94\xA1 |1
-<UE6FF> \x94\xA2 |0
-<UE700> \x94\xA3 |1
-<UE701> \x94\xA4 |0
-<UE702> \x94\xA5 |0
-<UE703> \x94\xA6 |1
-<UE704> \x94\xA7 |1
-<UE705> \x94\xA8 |1
-<UE706> \x94\xA9 |0
-<UE707> \x94\xAA |0
-<UE708> \x94\xAB |1
-<UE709> \x94\xAC |0
-<UE70A> \x94\xAD |0
-<UE70B> \x94\xAE |1
-<UE70C> \x94\xAF |0
-<UE70D> \x94\xB0 |1
-<UE70E> \x94\xB1 |1
-<UE70F> \x94\xB2 |1
-<UE710> \x94\xB3 |0
-<UE711> \x94\xB4 |0
-<UE712> \x94\xB5 |1
-<UE713> \x94\xB6 |0
-<UE714> \x94\xB7 |1
-<UE715> \x94\xB8 |1
-<UE716> \x94\xB9 |1
-<UE717> \x94\xBA |0
-<UE718> \x94\xBB |0
-<UE719> \x94\xBC |1
-<UE71A> \x94\xBD |0
-<UE71B> \x94\xBE |0
-<UE71C> \x94\xBF |1
-<UE71D> \x94\xC0 |0
-<UE71E> \x94\xC1 |1
-<UE71F> \x94\xC2 |1
-<UE720> \x94\xC3 |1
-<UE721> \x94\xC4 |1
-<UE722> \x94\xC5 |1
-<UE723> \x94\xC6 |1
-<UE724> \x94\xC7 |0
-<UE725> \x94\xC8 |0
-<UE726> \x94\xC9 |1
-<UE727> \x94\xCA |0
-<UE728> \x94\xCB |1
-<UE729> \x94\xCC |1
-<UE72A> \x94\xCD |1
-<UE72B> \x94\xCE |0
-<UE72C> \x94\xCF |1
-<UE72D> \x94\xD0 |1
-<UE72E> \x94\xD1 |1
-<UE72F> \x94\xD2 |0
-<UE730> \x94\xD3 |1
-<UE731> \x94\xD4 |1
-<UE732> \x94\xD5 |1
-<UE733> \x94\xD6 |0
-<UE734> \x94\xD7 |0
-<UE735> \x94\xD8 |0
-<UE736> \x94\xD9 |0
-<UE737> \x94\xDA |0
-<UE738> \x94\xDB |1
-<UE739> \x94\xDC |1
-<UE73A> \x94\xDD |1
-<UE73B> \x94\xDE |1
-<UE73C> \x94\xDF |0
-<UE73D> \x94\xE0 |0
-<UE73E> \x94\xE1 |1
-<UE73F> \x94\xE2 |1
-<UE740> \x94\xE3 |0
-<UE741> \x94\xE4 |0
-<UE742> \x94\xE5 |0
-<UE743> \x94\xE6 |1
-<UE744> \x94\xE7 |0
-<UE745> \x94\xE8 |1
-<UE746> \x94\xE9 |1
-<UE747> \x94\xEA |0
-<UE748> \x94\xEB |1
-<UE749> \x94\xEC |1
-<UE74A> \x94\xED |1
-<UE74B> \x94\xEE |1
-<UE74C> \x94\xEF |1
-<UE74D> \x94\xF0 |0
-<UE74E> \x94\xF1 |0
-<UE74F> \x94\xF2 |0
-<UE750> \x94\xF3 |1
-<UE751> \x94\xF4 |0
-<UE752> \x94\xF5 |0
-<UE753> \x94\xF6 |1
-<UE754> \x94\xF7 |1
-<UE755> \x94\xF8 |1
-<UE756> \x94\xF9 |1
-<UE757> \x94\xFA |1
-<UE758> \x94\xFB |1
-<UE759> \x94\xFC |1
-<UE75A> \x94\xFD |1
-<UE75B> \x94\xFE |0
-<UE75C> \x95\x40 |0
-<UE75D> \x95\x41 |0
-<UE75E> \x95\x42 |1
-<UE75F> \x95\x43 |0
-<UE760> \x95\x44 |1
-<UE761> \x95\x45 |0
-<UE762> \x95\x46 |0
-<UE763> \x95\x47 |1
-<UE764> \x95\x48 |0
-<UE765> \x95\x49 |0
-<UE766> \x95\x4A |1
-<UE767> \x95\x4B |0
-<UE768> \x95\x4C |0
-<UE769> \x95\x4D |0
-<UE76A> \x95\x4E |1
-<UE76B> \x95\x4F |1
-<UE76C> \x95\x50 |0
-<UE76D> \x95\x51 |0
-<UE76E> \x95\x52 |0
-<UE76F> \x95\x53 |1
-<UE770> \x95\x54 |0
-<UE771> \x95\x55 |1
-<UE772> \x95\x56 |1
-<UE773> \x95\x57 |1
-<UE774> \x95\x58 |1
-<UE775> \x95\x59 |0
-<UE776> \x95\x5A |1
-<UE777> \x95\x5B |0
-<UE778> \x95\x5C |0
-<UE779> \x95\x5D |1
-<UE77A> \x95\x5E |0
-<UE77B> \x95\x5F |1
-<UE77C> \x95\x60 |0
-<UE77D> \x95\x61 |0
-<UE77E> \x95\x62 |1
-<UE77F> \x95\x63 |1
-<UE780> \x95\x64 |1
-<UE781> \x95\x65 |1
-<UE782> \x95\x66 |1
-<UE783> \x95\x67 |1
-<UE784> \x95\x68 |0
-<UE785> \x95\x69 |1
-<UE786> \x95\x6A |0
-<UE787> \x95\x6B |1
-<UE788> \x95\x6C |1
-<UE789> \x95\x6D |0
-<UE78A> \x95\x6E |1
-<UE78B> \x95\x6F |0
-<UE78C> \x95\x70 |1
-<UE78D> \x95\x71 |0
-<UE78E> \x95\x72 |1
-<UE78F> \x95\x73 |1
-<UE790> \x95\x74 |0
-<UE791> \x95\x75 |1
-<UE792> \x95\x76 |0
-<UE793> \x95\x77 |1
-<UE794> \x95\x78 |0
-<UE795> \x95\x79 |1
-<UE796> \x95\x7A |0
-<UE797> \x95\x7B |0
-<UE798> \x95\x7C |1
-<UE799> \x95\x7D |0
-<UE79A> \x95\x7E |1
-<UE79B> \x95\xA1 |1
-<UE79C> \x95\xA2 |1
-<UE79D> \x95\xA3 |1
-<UE79E> \x95\xA4 |1
-<UE79F> \x95\xA5 |1
-<UE7A0> \x95\xA6 |1
-<UE7A1> \x95\xA7 |1
-<UE7A2> \x95\xA8 |0
-<UE7A3> \x95\xA9 |1
-<UE7A4> \x95\xAA |0
-<UE7A5> \x95\xAB |0
-<UE7A6> \x95\xAC |0
-<UE7A7> \x95\xAD |0
-<UE7A8> \x95\xAE |0
-<UE7A9> \x95\xAF |0
-<UE7AA> \x95\xB0 |1
-<UE7AB> \x95\xB1 |1
-<UE7AC> \x95\xB2 |1
-<UE7AD> \x95\xB3 |1
-<UE7AE> \x95\xB4 |1
-<UE7AF> \x95\xB5 |1
-<UE7B0> \x95\xB6 |1
-<UE7B1> \x95\xB7 |0
-<UE7B2> \x95\xB8 |1
-<UE7B3> \x95\xB9 |1
-<UE7B4> \x95\xBA |0
-<UE7B5> \x95\xBB |1
-<UE7B6> \x95\xBC |1
-<UE7B7> \x95\xBD |1
-<UE7B8> \x95\xBE |0
-<UE7B9> \x95\xBF |1
-<UE7BA> \x95\xC0 |1
-<UE7BB> \x95\xC1 |1
-<UE7BC> \x95\xC2 |0
-<UE7BD> \x95\xC3 |1
-<UE7BE> \x95\xC4 |1
-<UE7BF> \x95\xC5 |1
-<UE7C0> \x95\xC6 |1
-<UE7C1> \x95\xC7 |1
-<UE7C2> \x95\xC8 |1
-<UE7C3> \x95\xC9 |1
-<UE7C4> \x95\xCA |0
-<UE7C5> \x95\xCB |1
-<UE7C6> \x95\xCC |1
-<UE7C7> \x95\xCD |1
-<UE7C8> \x95\xCE |1
-<UE7C9> \x95\xCF |1
-<UE7CA> \x95\xD0 |0
-<UE7CB> \x95\xD1 |1
-<UE7CC> \x95\xD2 |1
-<UE7CD> \x95\xD3 |1
-<UE7CE> \x95\xD4 |0
-<UE7CF> \x95\xD5 |1
-<UE7D0> \x95\xD6 |1
-<UE7D1> \x95\xD7 |0
-<UE7D2> \x95\xD8 |1
-<UE7D3> \x95\xD9 |0
-<UE7D4> \x95\xDA |1
-<UE7D5> \x95\xDB |1
-<UE7D6> \x95\xDC |1
-<UE7D7> \x95\xDD |1
-<UE7D8> \x95\xDE |0
-<UE7D9> \x95\xDF |1
-<UE7DA> \x95\xE0 |0
-<UE7DB> \x95\xE1 |1
-<UE7DC> \x95\xE2 |0
-<UE7DD> \x95\xE3 |0
-<UE7DE> \x95\xE4 |1
-<UE7DF> \x95\xE5 |1
-<UE7E0> \x95\xE6 |1
-<UE7E1> \x95\xE7 |1
-<UE7E2> \x95\xE8 |1
-<UE7E3> \x95\xE9 |1
-<UE7E4> \x95\xEA |0
-<UE7E5> \x95\xEB |1
-<UE7E6> \x95\xEC |1
-<UE7E7> \x95\xED |0
-<UE7E8> \x95\xEE |0
-<UE7E9> \x95\xEF |0
-<UE7EA> \x95\xF0 |1
-<UE7EB> \x95\xF1 |0
-<UE7EC> \x95\xF2 |1
-<UE7ED> \x95\xF3 |0
-<UE7EE> \x95\xF4 |0
-<UE7EF> \x95\xF5 |0
-<UE7F0> \x95\xF6 |1
-<UE7F1> \x95\xF7 |0
-<UE7F2> \x95\xF8 |0
-<UE7F3> \x95\xF9 |0
-<UE7F4> \x95\xFA |1
-<UE7F5> \x95\xFB |1
-<UE7F6> \x95\xFC |1
-<UE7F7> \x95\xFD |1
-<UE7F8> \x95\xFE |0
-<UE7F9> \x96\x40 |1
-<UE7FA> \x96\x41 |1
-<UE7FB> \x96\x42 |0
-<UE7FC> \x96\x43 |0
-<UE7FD> \x96\x44 |0
-<UE7FE> \x96\x45 |1
-<UE7FF> \x96\x46 |0
-<UE800> \x96\x47 |0
-<UE801> \x96\x48 |0
-<UE802> \x96\x49 |0
-<UE803> \x96\x4A |1
-<UE804> \x96\x4B |1
-<UE805> \x96\x4C |1
-<UE806> \x96\x4D |1
-<UE807> \x96\x4E |1
-<UE808> \x96\x4F |0
-<UE809> \x96\x50 |1
-<UE80A> \x96\x51 |1
-<UE80B> \x96\x52 |1
-<UE80C> \x96\x53 |0
-<UE80D> \x96\x54 |1
-<UE80E> \x96\x55 |0
-<UE80F> \x96\x56 |0
-<UE810> \x96\x57 |1
-<UE811> \x96\x58 |0
-<UE812> \x96\x59 |1
-<UE813> \x96\x5A |0
-<UE814> \x96\x5B |1
-<UE815> \x96\x5C |1
-<UE816> \x96\x5D |0
-<UE817> \x96\x5E |0
-<UE818> \x96\x5F |0
-<UE819> \x96\x60 |1
-<UE81A> \x96\x61 |0
-<UE81B> \x96\x62 |1
-<UE81C> \x96\x63 |1
-<UE81D> \x96\x64 |1
-<UE81E> \x96\x65 |1
-<UE81F> \x96\x66 |1
-<UE820> \x96\x67 |1
-<UE821> \x96\x68 |0
-<UE822> \x96\x69 |1
-<UE823> \x96\x6A |1
-<UE824> \x96\x6B |1
-<UE825> \x96\x6C |1
-<UE826> \x96\x6D |1
-<UE827> \x96\x6E |0
-<UE828> \x96\x6F |0
-<UE829> \x96\x70 |1
-<UE82A> \x96\x71 |1
-<UE82B> \x96\x72 |1
-<UE82C> \x96\x73 |1
-<UE82D> \x96\x74 |0
-<UE82E> \x96\x75 |1
-<UE82F> \x96\x76 |0
-<UE830> \x96\x77 |1
-<UE831> \x96\x78 |1
-<UE832> \x96\x79 |1
-<UE833> \x96\x7A |1
-<UE834> \x96\x7B |1
-<UE835> \x96\x7C |0
-<UE836> \x96\x7D |1
-<UE837> \x96\x7E |0
-<UE838> \x96\xA1 |0
-<UE839> \x96\xA2 |1
-<UE83A> \x96\xA3 |0
-<UE83B> \x96\xA4 |0
-<UE83C> \x96\xA5 |1
-<UE83D> \x96\xA6 |1
-<UE83E> \x96\xA7 |1
-<UE83F> \x96\xA8 |1
-<UE840> \x96\xA9 |1
-<UE841> \x96\xAA |0
-<UE842> \x96\xAB |0
-<UE843> \x96\xAC |1
-<UE844> \x96\xAD |1
-<UE845> \x96\xAE |1
-<UE846> \x96\xAF |1
-<UE847> \x96\xB0 |1
-<UE848> \x96\xB1 |1
-<UE849> \x96\xB2 |1
-<UE84A> \x96\xB3 |1
-<UE84B> \x96\xB4 |0
-<UE84C> \x96\xB5 |1
-<UE84D> \x96\xB6 |0
-<UE84E> \x96\xB7 |0
-<UE84F> \x96\xB8 |1
-<UE850> \x96\xB9 |1
-<UE851> \x96\xBA |0
-<UE852> \x96\xBB |1
-<UE853> \x96\xBC |1
-<UE854> \x96\xBD |1
-<UE855> \x96\xBE |0
-<UE856> \x96\xBF |0
-<UE857> \x96\xC0 |0
-<UE858> \x96\xC1 |0
-<UE859> \x96\xC2 |1
-<UE85A> \x96\xC3 |1
-<UE85B> \x96\xC4 |0
-<UE85C> \x96\xC5 |0
-<UE85D> \x96\xC6 |0
-<UE85E> \x96\xC7 |1
-<UE85F> \x96\xC8 |1
-<UE860> \x96\xC9 |0
-<UE861> \x96\xCA |0
-<UE862> \x96\xCB |0
-<UE863> \x96\xCC |1
-<UE864> \x96\xCD |1
-<UE865> \x96\xCE |0
-<UE866> \x96\xCF |0
-<UE867> \x96\xD0 |0
-<UE868> \x96\xD1 |1
-<UE869> \x96\xD2 |0
-<UE86A> \x96\xD3 |0
-<UE86B> \x96\xD4 |1
-<UE86C> \x96\xD5 |0
-<UE86D> \x96\xD6 |1
-<UE86E> \x96\xD7 |1
-<UE86F> \x96\xD8 |1
-<UE870> \x96\xD9 |1
-<UE871> \x96\xDA |0
-<UE872> \x96\xDB |1
-<UE873> \x96\xDC |1
-<UE874> \x96\xDD |1
-<UE875> \x96\xDE |1
-<UE876> \x96\xDF |1
-<UE877> \x96\xE0 |1
-<UE878> \x96\xE1 |0
-<UE879> \x96\xE2 |1
-<UE87A> \x96\xE3 |1
-<UE87B> \x96\xE4 |1
-<UE87C> \x96\xE5 |1
-<UE87D> \x96\xE6 |0
-<UE87E> \x96\xE7 |0
-<UE87F> \x96\xE8 |0
-<UE880> \x96\xE9 |1
-<UE881> \x96\xEA |1
-<UE882> \x96\xEB |1
-<UE883> \x96\xEC |1
-<UE884> \x96\xED |0
-<UE885> \x96\xEE |1
-<UE886> \x96\xEF |1
-<UE887> \x96\xF0 |0
-<UE888> \x96\xF1 |1
-<UE889> \x96\xF2 |1
-<UE88A> \x96\xF3 |1
-<UE88B> \x96\xF4 |1
-<UE88C> \x96\xF5 |1
-<UE88D> \x96\xF6 |1
-<UE88E> \x96\xF7 |1
-<UE88F> \x96\xF8 |0
-<UE890> \x96\xF9 |1
-<UE891> \x96\xFA |0
-<UE892> \x96\xFB |0
-<UE893> \x96\xFC |0
-<UE894> \x96\xFD |0
-<UE895> \x96\xFE |0
-<UE896> \x97\x40 |1
-<UE897> \x97\x41 |1
-<UE898> \x97\x42 |1
-<UE899> \x97\x43 |1
-<UE89A> \x97\x44 |0
-<UE89B> \x97\x45 |1
-<UE89C> \x97\x46 |1
-<UE89D> \x97\x47 |0
-<UE89E> \x97\x48 |1
-<UE89F> \x97\x49 |1
-<UE8A0> \x97\x4A |0
-<UE8A1> \x97\x4B |0
-<UE8A2> \x97\x4C |1
-<UE8A3> \x97\x4D |0
-<UE8A4> \x97\x4E |0
-<UE8A5> \x97\x4F |0
-<UE8A6> \x97\x50 |0
-<UE8A7> \x97\x51 |0
-<UE8A8> \x97\x52 |1
-<UE8A9> \x97\x53 |0
-<UE8AA> \x97\x54 |0
-<UE8AB> \x97\x55 |1
-<UE8AC> \x97\x56 |0
-<UE8AD> \x97\x57 |0
-<UE8AE> \x97\x58 |0
-<UE8AF> \x97\x59 |0
-<UE8B0> \x97\x5A |0
-<UE8B1> \x97\x5B |1
-<UE8B2> \x97\x5C |1
-<UE8B3> \x97\x5D |1
-<UE8B4> \x97\x5E |1
-<UE8B5> \x97\x5F |0
-<UE8B6> \x97\x60 |0
-<UE8B7> \x97\x61 |1
-<UE8B8> \x97\x62 |0
-<UE8B9> \x97\x63 |1
-<UE8BA> \x97\x64 |1
-<UE8BB> \x97\x65 |1
-<UE8BC> \x97\x66 |1
-<UE8BD> \x97\x67 |0
-<UE8BE> \x97\x68 |0
-<UE8BF> \x97\x69 |0
-<UE8C0> \x97\x6A |0
-<UE8C1> \x97\x6B |0
-<UE8C2> \x97\x6C |0
-<UE8C3> \x97\x6D |0
-<UE8C4> \x97\x6E |1
-<UE8C5> \x97\x6F |0
-<UE8C6> \x97\x70 |1
-<UE8C7> \x97\x71 |0
-<UE8C8> \x97\x72 |1
-<UE8C9> \x97\x73 |1
-<UE8CA> \x97\x74 |1
-<UE8CB> \x97\x75 |0
-<UE8CC> \x97\x76 |1
-<UE8CD> \x97\x77 |0
-<UE8CE> \x97\x78 |0
-<UE8CF> \x97\x79 |1
-<UE8D0> \x97\x7A |0
-<UE8D1> \x97\x7B |0
-<UE8D2> \x97\x7C |1
-<UE8D3> \x97\x7D |0
-<UE8D4> \x97\x7E |1
-<UE8D5> \x97\xA1 |0
-<UE8D6> \x97\xA2 |0
-<UE8D7> \x97\xA3 |1
-<UE8D8> \x97\xA4 |0
-<UE8D9> \x97\xA5 |0
-<UE8DA> \x97\xA6 |0
-<UE8DB> \x97\xA7 |1
-<UE8DC> \x97\xA8 |1
-<UE8DD> \x97\xA9 |0
-<UE8DE> \x97\xAA |1
-<UE8DF> \x97\xAB |0
-<UE8E0> \x97\xAC |0
-<UE8E1> \x97\xAD |0
-<UE8E2> \x97\xAE |1
-<UE8E3> \x97\xAF |1
-<UE8E4> \x97\xB0 |1
-<UE8E5> \x97\xB1 |0
-<UE8E6> \x97\xB2 |0
-<UE8E7> \x97\xB3 |1
-<UE8E8> \x97\xB4 |0
-<UE8E9> \x97\xB5 |0
-<UE8EA> \x97\xB6 |0
-<UE8EB> \x97\xB7 |1
-<UE8EC> \x97\xB8 |1
-<UE8ED> \x97\xB9 |0
-<UE8EE> \x97\xBA |1
-<UE8EF> \x97\xBB |1
-<UE8F0> \x97\xBC |1
-<UE8F1> \x97\xBD |0
-<UE8F2> \x97\xBE |0
-<UE8F3> \x97\xBF |1
-<UE8F4> \x97\xC0 |1
-<UE8F5> \x97\xC1 |0
-<UE8F6> \x97\xC2 |1
-<UE8F7> \x97\xC3 |1
-<UE8F8> \x97\xC4 |1
-<UE8F9> \x97\xC5 |1
-<UE8FA> \x97\xC6 |1
-<UE8FB> \x97\xC7 |0
-<UE8FC> \x97\xC8 |1
-<UE8FD> \x97\xC9 |1
-<UE8FE> \x97\xCA |0
-<UE8FF> \x97\xCB |1
-<UE900> \x97\xCC |0
-<UE901> \x97\xCD |1
-<UE902> \x97\xCE |1
-<UE903> \x97\xCF |0
-<UE904> \x97\xD0 |1
-<UE905> \x97\xD1 |1
-<UE906> \x97\xD2 |1
-<UE907> \x97\xD3 |0
-<UE908> \x97\xD4 |0
-<UE909> \x97\xD5 |1
-<UE90A> \x97\xD6 |1
-<UE90B> \x97\xD7 |1
-<UE90C> \x97\xD8 |0
-<UE90D> \x97\xD9 |1
-<UE90E> \x97\xDA |1
-<UE90F> \x97\xDB |1
-<UE910> \x97\xDC |1
-<UE911> \x97\xDD |1
-<UE912> \x97\xDE |1
-<UE913> \x97\xDF |1
-<UE914> \x97\xE0 |1
-<UE915> \x97\xE1 |1
-<UE916> \x97\xE2 |1
-<UE917> \x97\xE3 |0
-<UE918> \x97\xE4 |0
-<UE919> \x97\xE5 |1
-<UE91A> \x97\xE6 |1
-<UE91B> \x97\xE7 |1
-<UE91C> \x97\xE8 |0
-<UE91D> \x97\xE9 |1
-<UE91E> \x97\xEA |0
-<UE91F> \x97\xEB |0
-<UE920> \x97\xEC |0
-<UE921> \x97\xED |0
-<UE922> \x97\xEE |0
-<UE923> \x97\xEF |1
-<UE924> \x97\xF0 |1
-<UE925> \x97\xF1 |0
-<UE926> \x97\xF2 |0
-<UE927> \x97\xF3 |0
-<UE928> \x97\xF4 |0
-<UE929> \x97\xF5 |0
-<UE92A> \x97\xF6 |0
-<UE92B> \x97\xF7 |0
-<UE92C> \x97\xF8 |0
-<UE92D> \x97\xF9 |1
-<UE92E> \x97\xFA |0
-<UE92F> \x97\xFB |0
-<UE930> \x97\xFC |1
-<UE931> \x97\xFD |1
-<UE932> \x97\xFE |1
-<UE933> \x98\x40 |0
-<UE934> \x98\x41 |0
-<UE935> \x98\x42 |0
-<UE936> \x98\x43 |0
-<UE937> \x98\x44 |1
-<UE938> \x98\x45 |0
-<UE939> \x98\x46 |1
-<UE93A> \x98\x47 |0
-<UE93B> \x98\x48 |1
-<UE93C> \x98\x49 |0
-<UE93D> \x98\x4A |0
-<UE93E> \x98\x4B |0
-<UE93F> \x98\x4C |1
-<UE940> \x98\x4D |1
-<UE941> \x98\x4E |0
-<UE942> \x98\x4F |1
-<UE943> \x98\x50 |1
-<UE944> \x98\x51 |0
-<UE945> \x98\x52 |0
-<UE946> \x98\x53 |1
-<UE947> \x98\x54 |1
-<UE948> \x98\x55 |0
-<UE949> \x98\x56 |1
-<UE94A> \x98\x57 |1
-<UE94B> \x98\x58 |1
-<UE94C> \x98\x59 |1
-<UE94D> \x98\x5A |0
-<UE94E> \x98\x5B |1
-<UE94F> \x98\x5C |1
-<UE950> \x98\x5D |0
-<UE951> \x98\x5E |1
-<UE952> \x98\x5F |0
-<UE953> \x98\x60 |0
-<UE954> \x98\x61 |0
-<UE955> \x98\x62 |0
-<UE956> \x98\x63 |1
-<UE957> \x98\x64 |0
-<UE958> \x98\x65 |0
-<UE959> \x98\x66 |1
-<UE95A> \x98\x67 |0
-<UE95B> \x98\x68 |1
-<UE95C> \x98\x69 |0
-<UE95D> \x98\x6A |0
-<UE95E> \x98\x6B |0
-<UE95F> \x98\x6C |1
-<UE960> \x98\x6D |0
-<UE961> \x98\x6E |0
-<UE962> \x98\x6F |1
-<UE963> \x98\x70 |1
-<UE964> \x98\x71 |0
-<UE965> \x98\x72 |1
-<UE966> \x98\x73 |1
-<UE967> \x98\x74 |0
-<UE968> \x98\x75 |0
-<UE969> \x98\x76 |1
-<UE96A> \x98\x77 |1
-<UE96B> \x98\x78 |1
-<UE96C> \x98\x79 |1
-<UE96D> \x98\x7A |1
-<UE96E> \x98\x7B |0
-<UE96F> \x98\x7C |0
-<UE970> \x98\x7D |1
-<UE971> \x98\x7E |1
-<UE972> \x98\xA1 |1
-<UE973> \x98\xA2 |0
-<UE974> \x98\xA3 |0
-<UE975> \x98\xA4 |0
-<UE976> \x98\xA5 |1
-<UE977> \x98\xA6 |0
-<UE978> \x98\xA7 |0
-<UE979> \x98\xA8 |1
-<UE97A> \x98\xA9 |0
-<UE97B> \x98\xAA |0
-<UE97C> \x98\xAB |1
-<UE97D> \x98\xAC |0
-<UE97E> \x98\xAD |1
-<UE97F> \x98\xAE |1
-<UE980> \x98\xAF |1
-<UE981> \x98\xB0 |0
-<UE982> \x98\xB1 |0
-<UE983> \x98\xB2 |1
-<UE984> \x98\xB3 |1
-<UE985> \x98\xB4 |1
-<UE986> \x98\xB5 |1
-<UE987> \x98\xB6 |0
-<UE988> \x98\xB7 |1
-<UE989> \x98\xB8 |1
-<UE98A> \x98\xB9 |0
-<UE98B> \x98\xBA |1
-<UE98C> \x98\xBB |1
-<UE98D> \x98\xBC |1
-<UE98E> \x98\xBD |0
-<UE98F> \x98\xBE |1
-<UE990> \x98\xBF |1
-<UE991> \x98\xC0 |0
-<UE992> \x98\xC1 |1
-<UE993> \x98\xC2 |1
-<UE994> \x98\xC3 |1
-<UE995> \x98\xC4 |1
-<UE996> \x98\xC5 |1
-<UE997> \x98\xC6 |1
-<UE998> \x98\xC7 |1
-<UE999> \x98\xC8 |1
-<UE99A> \x98\xC9 |1
-<UE99B> \x98\xCA |1
-<UE99C> \x98\xCB |1
-<UE99D> \x98\xCC |1
-<UE99E> \x98\xCD |1
-<UE99F> \x98\xCE |1
-<UE9A0> \x98\xCF |1
-<UE9A1> \x98\xD0 |1
-<UE9A2> \x98\xD1 |1
-<UE9A3> \x98\xD2 |1
-<UE9A4> \x98\xD3 |1
-<UE9A5> \x98\xD4 |1
-<UE9A6> \x98\xD5 |1
-<UE9A7> \x98\xD6 |1
-<UE9A8> \x98\xD7 |1
-<UE9A9> \x98\xD8 |1
-<UE9AA> \x98\xD9 |1
-<UE9AB> \x98\xDA |1
-<UE9AC> \x98\xDB |1
-<UE9AD> \x98\xDC |1
-<UE9AE> \x98\xDD |1
-<UE9AF> \x98\xDE |1
-<UE9B0> \x98\xDF |0
-<UE9B1> \x98\xE0 |1
-<UE9B2> \x98\xE1 |1
-<UE9B3> \x98\xE2 |1
-<UE9B4> \x98\xE3 |1
-<UE9B5> \x98\xE4 |1
-<UE9B6> \x98\xE5 |1
-<UE9B7> \x98\xE6 |1
-<UE9B8> \x98\xE7 |1
-<UE9B9> \x98\xE8 |1
-<UE9BA> \x98\xE9 |1
-<UE9BB> \x98\xEA |1
-<UE9BC> \x98\xEB |1
-<UE9BD> \x98\xEC |1
-<UE9BE> \x98\xED |1
-<UE9BF> \x98\xEE |1
-<UE9C0> \x98\xEF |1
-<UE9C1> \x98\xF0 |1
-<UE9C2> \x98\xF1 |1
-<UE9C3> \x98\xF2 |1
-<UE9C4> \x98\xF3 |1
-<UE9C5> \x98\xF4 |1
-<UE9C6> \x98\xF5 |1
-<UE9C7> \x98\xF6 |1
-<UE9C8> \x98\xF7 |1
-<UE9C9> \x98\xF8 |1
-<UE9CA> \x98\xF9 |1
-<UE9CB> \x98\xFA |0
-<UE9CC> \x98\xFB |1
-<UE9CD> \x98\xFC |1
-<UE9CE> \x98\xFD |1
-<UE9CF> \x98\xFE |1
-<UE9D0> \x99\x40 |1
-<UE9D1> \x99\x41 |1
-<UE9D2> \x99\x42 |1
-<UE9D3> \x99\x43 |1
-<UE9D4> \x99\x44 |1
-<UE9D5> \x99\x45 |1
-<UE9D6> \x99\x46 |1
-<UE9D7> \x99\x47 |1
-<UE9D8> \x99\x48 |1
-<UE9D9> \x99\x49 |1
-<UE9DA> \x99\x4A |1
-<UE9DB> \x99\x4B |1
-<UE9DC> \x99\x4C |1
-<UE9DD> \x99\x4D |1
-<UE9DE> \x99\x4E |1
-<UE9DF> \x99\x4F |1
-<UE9E0> \x99\x50 |1
-<UE9E1> \x99\x51 |1
-<UE9E2> \x99\x52 |1
-<UE9E3> \x99\x53 |1
-<UE9E4> \x99\x54 |1
-<UE9E5> \x99\x55 |1
-<UE9E6> \x99\x56 |1
-<UE9E7> \x99\x57 |1
-<UE9E8> \x99\x58 |1
-<UE9E9> \x99\x59 |1
-<UE9EA> \x99\x5A |1
-<UE9EB> \x99\x5B |1
-<UE9EC> \x99\x5C |1
-<UE9ED> \x99\x5D |1
-<UE9EE> \x99\x5E |1
-<UE9EF> \x99\x5F |0
-<UE9F0> \x99\x60 |1
-<UE9F1> \x99\x61 |1
-<UE9F2> \x99\x62 |1
-<UE9F3> \x99\x63 |1
-<UE9F4> \x99\x64 |1
-<UE9F5> \x99\x65 |1
-<UE9F6> \x99\x66 |1
-<UE9F7> \x99\x67 |1
-<UE9F8> \x99\x68 |1
-<UE9F9> \x99\x69 |1
-<UE9FA> \x99\x6A |1
-<UE9FB> \x99\x6B |1
-<UE9FC> \x99\x6C |1
-<UE9FD> \x99\x6D |1
-<UE9FE> \x99\x6E |1
-<UE9FF> \x99\x6F |1
-<UEA00> \x99\x70 |1
-<UEA01> \x99\x71 |1
-<UEA02> \x99\x72 |1
-<UEA03> \x99\x73 |1
-<UEA04> \x99\x74 |1
-<UEA05> \x99\x75 |1
-<UEA06> \x99\x76 |1
-<UEA07> \x99\x77 |1
-<UEA08> \x99\x78 |1
-<UEA09> \x99\x79 |1
-<UEA0A> \x99\x7A |1
-<UEA0B> \x99\x7B |1
-<UEA0C> \x99\x7C |1
-<UEA0D> \x99\x7D |1
-<UEA0E> \x99\x7E |1
-<UEA0F> \x99\xA1 |1
-<UEA10> \x99\xA2 |1
-<UEA11> \x99\xA3 |1
-<UEA12> \x99\xA4 |1
-<UEA13> \x99\xA5 |1
-<UEA14> \x99\xA6 |1
-<UEA15> \x99\xA7 |1
-<UEA16> \x99\xA8 |1
-<UEA17> \x99\xA9 |1
-<UEA18> \x99\xAA |1
-<UEA19> \x99\xAB |1
-<UEA1A> \x99\xAC |1
-<UEA1B> \x99\xAD |1
-<UEA1C> \x99\xAE |1
-<UEA1D> \x99\xAF |1
-<UEA1E> \x99\xB0 |1
-<UEA1F> \x99\xB1 |1
-<UEA20> \x99\xB2 |1
-<UEA21> \x99\xB3 |1
-<UEA22> \x99\xB4 |1
-<UEA23> \x99\xB5 |1
-<UEA24> \x99\xB6 |1
-<UEA25> \x99\xB7 |1
-<UEA26> \x99\xB8 |1
-<UEA27> \x99\xB9 |1
-<UEA28> \x99\xBA |1
-<UEA29> \x99\xBB |1
-<UEA2A> \x99\xBC |1
-<UEA2B> \x99\xBD |1
-<UEA2C> \x99\xBE |1
-<UEA2D> \x99\xBF |1
-<UEA2E> \x99\xC0 |1
-<UEA2F> \x99\xC1 |1
-<UEA30> \x99\xC2 |1
-<UEA31> \x99\xC3 |1
-<UEA32> \x99\xC4 |1
-<UEA33> \x99\xC5 |1
-<UEA34> \x99\xC6 |1
-<UEA35> \x99\xC7 |1
-<UEA36> \x99\xC8 |1
-<UEA37> \x99\xC9 |1
-<UEA38> \x99\xCA |1
-<UEA39> \x99\xCB |1
-<UEA3A> \x99\xCC |1
-<UEA3B> \x99\xCD |1
-<UEA3C> \x99\xCE |1
-<UEA3D> \x99\xCF |1
-<UEA3E> \x99\xD0 |1
-<UEA3F> \x99\xD1 |1
-<UEA40> \x99\xD2 |1
-<UEA41> \x99\xD3 |1
-<UEA42> \x99\xD4 |1
-<UEA43> \x99\xD5 |0
-<UEA44> \x99\xD6 |1
-<UEA45> \x99\xD7 |1
-<UEA46> \x99\xD8 |1
-<UEA47> \x99\xD9 |1
-<UEA48> \x99\xDA |1
-<UEA49> \x99\xDB |1
-<UEA4A> \x99\xDC |1
-<UEA4B> \x99\xDD |1
-<UEA4C> \x99\xDE |1
-<UEA4D> \x99\xDF |1
-<UEA4E> \x99\xE0 |1
-<UEA4F> \x99\xE1 |1
-<UEA50> \x99\xE2 |1
-<UEA51> \x99\xE3 |1
-<UEA52> \x99\xE4 |1
-<UEA53> \x99\xE5 |1
-<UEA54> \x99\xE6 |1
-<UEA55> \x99\xE7 |1
-<UEA56> \x99\xE8 |1
-<UEA57> \x99\xE9 |1
-<UEA58> \x99\xEA |1
-<UEA59> \x99\xEB |1
-<UEA5A> \x99\xEC |1
-<UEA5B> \x99\xED |1
-<UEA5C> \x99\xEE |1
-<UEA5D> \x99\xEF |1
-<UEA5E> \x99\xF0 |1
-<UEA5F> \x99\xF1 |1
-<UEA60> \x99\xF2 |1
-<UEA61> \x99\xF3 |1
-<UEA62> \x99\xF4 |1
-<UEA63> \x99\xF5 |1
-<UEA64> \x99\xF6 |1
-<UEA65> \x99\xF7 |1
-<UEA66> \x99\xF8 |1
-<UEA67> \x99\xF9 |1
-<UEA68> \x99\xFA |1
-<UEA69> \x99\xFB |1
-<UEA6A> \x99\xFC |1
-<UEA6B> \x99\xFD |1
-<UEA6C> \x99\xFE |1
-<UEA6D> \x9A\x40 |1
-<UEA6E> \x9A\x41 |1
-<UEA6F> \x9A\x42 |1
-<UEA70> \x9A\x43 |1
-<UEA71> \x9A\x44 |1
-<UEA72> \x9A\x45 |1
-<UEA73> \x9A\x46 |1
-<UEA74> \x9A\x47 |1
-<UEA75> \x9A\x48 |1
-<UEA76> \x9A\x49 |1
-<UEA77> \x9A\x4A |1
-<UEA78> \x9A\x4B |1
-<UEA79> \x9A\x4C |1
-<UEA7A> \x9A\x4D |1
-<UEA7B> \x9A\x4E |1
-<UEA7C> \x9A\x4F |1
-<UEA7D> \x9A\x50 |1
-<UEA7E> \x9A\x51 |1
-<UEA7F> \x9A\x52 |1
-<UEA80> \x9A\x53 |1
-<UEA81> \x9A\x54 |1
-<UEA82> \x9A\x55 |1
-<UEA83> \x9A\x56 |1
-<UEA84> \x9A\x57 |1
-<UEA85> \x9A\x58 |1
-<UEA86> \x9A\x59 |1
-<UEA87> \x9A\x5A |1
-<UEA88> \x9A\x5B |1
-<UEA89> \x9A\x5C |1
-<UEA8A> \x9A\x5D |1
-<UEA8B> \x9A\x5E |1
-<UEA8C> \x9A\x5F |1
-<UEA8D> \x9A\x60 |1
-<UEA8E> \x9A\x61 |1
-<UEA8F> \x9A\x62 |1
-<UEA90> \x9A\x63 |1
-<UEA91> \x9A\x64 |1
-<UEA92> \x9A\x65 |1
-<UEA93> \x9A\x66 |1
-<UEA94> \x9A\x67 |1
-<UEA95> \x9A\x68 |1
-<UEA96> \x9A\x69 |1
-<UEA97> \x9A\x6A |1
-<UEA98> \x9A\x6B |1
-<UEA99> \x9A\x6C |1
-<UEA9A> \x9A\x6D |1
-<UEA9B> \x9A\x6E |1
-<UEA9C> \x9A\x6F |1
-<UEA9D> \x9A\x70 |1
-<UEA9E> \x9A\x71 |1
-<UEA9F> \x9A\x72 |1
-<UEAA0> \x9A\x73 |1
-<UEAA1> \x9A\x74 |1
-<UEAA2> \x9A\x75 |1
-<UEAA3> \x9A\x76 |1
-<UEAA4> \x9A\x77 |1
-<UEAA5> \x9A\x78 |1
-<UEAA6> \x9A\x79 |1
-<UEAA7> \x9A\x7A |1
-<UEAA8> \x9A\x7B |1
-<UEAA9> \x9A\x7C |0
-<UEAAA> \x9A\x7D |1
-<UEAAB> \x9A\x7E |1
-<UEAAC> \x9A\xA1 |1
-<UEAAD> \x9A\xA2 |1
-<UEAAE> \x9A\xA3 |1
-<UEAAF> \x9A\xA4 |1
-<UEAB0> \x9A\xA5 |1
-<UEAB1> \x9A\xA6 |1
-<UEAB2> \x9A\xA7 |1
-<UEAB3> \x9A\xA8 |1
-<UEAB4> \x9A\xA9 |1
-<UEAB5> \x9A\xAA |1
-<UEAB6> \x9A\xAB |1
-<UEAB7> \x9A\xAC |1
-<UEAB8> \x9A\xAD |1
-<UEAB9> \x9A\xAE |1
-<UEABA> \x9A\xAF |1
-<UEABB> \x9A\xB0 |1
-<UEABC> \x9A\xB1 |1
-<UEABD> \x9A\xB2 |1
-<UEABE> \x9A\xB3 |1
-<UEABF> \x9A\xB4 |0
-<UEAC0> \x9A\xB5 |0
-<UEAC1> \x9A\xB6 |0
-<UEAC2> \x9A\xB7 |1
-<UEAC3> \x9A\xB8 |1
-<UEAC4> \x9A\xB9 |1
-<UEAC5> \x9A\xBA |0
-<UEAC6> \x9A\xBB |1
-<UEAC7> \x9A\xBC |1
-<UEAC8> \x9A\xBD |1
-<UEAC9> \x9A\xBE |0
-<UEACA> \x9A\xBF |0
-<UEACB> \x9A\xC0 |0
-<UEACC> \x9A\xC1 |0
-<UEACD> \x9A\xC2 |1
-<UEACE> \x9A\xC3 |1
-<UEACF> \x9A\xC4 |0
-<UEAD0> \x9A\xC5 |0
-<UEAD1> \x9A\xC6 |0
-<UEAD2> \x9A\xC7 |1
-<UEAD3> \x9A\xC8 |0
-<UEAD4> \x9A\xC9 |0
-<UEAD5> \x9A\xCA |1
-<UEAD6> \x9A\xCB |0
-<UEAD7> \x9A\xCC |0
-<UEAD8> \x9A\xCD |0
-<UEAD9> \x9A\xCE |0
-<UEADA> \x9A\xCF |0
-<UEADB> \x9A\xD0 |1
-<UEADC> \x9A\xD1 |0
-<UEADD> \x9A\xD2 |1
-<UEADE> \x9A\xD3 |0
-<UEADF> \x9A\xD4 |0
-<UEAE0> \x9A\xD5 |0
-<UEAE1> \x9A\xD6 |0
-<UEAE2> \x9A\xD7 |0
-<UEAE3> \x9A\xD8 |0
-<UEAE4> \x9A\xD9 |1
-<UEAE5> \x9A\xDA |1
-<UEAE6> \x9A\xDB |1
-<UEAE7> \x9A\xDC |0
-<UEAE8> \x9A\xDD |0
-<UEAE9> \x9A\xDE |0
-<UEAEA> \x9A\xDF |0
-<UEAEB> \x9A\xE0 |0
-<UEAEC> \x9A\xE1 |0
-<UEAED> \x9A\xE2 |1
-<UEAEE> \x9A\xE3 |0
-<UEAEF> \x9A\xE4 |1
-<UEAF0> \x9A\xE5 |0
-<UEAF1> \x9A\xE6 |0
-<UEAF2> \x9A\xE7 |0
-<UEAF3> \x9A\xE8 |1
-<UEAF4> \x9A\xE9 |0
-<UEAF5> \x9A\xEA |0
-<UEAF6> \x9A\xEB |0
-<UEAF7> \x9A\xEC |1
-<UEAF8> \x9A\xED |0
-<UEAF9> \x9A\xEE |0
-<UEAFA> \x9A\xEF |0
-<UEAFB> \x9A\xF0 |0
-<UEAFC> \x9A\xF1 |1
-<UEAFD> \x9A\xF2 |1
-<UEAFE> \x9A\xF3 |0
-<UEAFF> \x9A\xF4 |0
-<UEB00> \x9A\xF5 |0
-<UEB01> \x9A\xF6 |1
-<UEB02> \x9A\xF7 |0
-<UEB03> \x9A\xF8 |0
-<UEB04> \x9A\xF9 |0
-<UEB05> \x9A\xFA |0
-<UEB06> \x9A\xFB |1
-<UEB07> \x9A\xFC |1
-<UEB08> \x9A\xFD |0
-<UEB09> \x9A\xFE |0
-<UEB0A> \x9B\x40 |0
-<UEB0B> \x9B\x41 |0
-<UEB0C> \x9B\x42 |0
-<UEB0D> \x9B\x43 |0
-<UEB0E> \x9B\x44 |0
-<UEB0F> \x9B\x45 |0
-<UEB10> \x9B\x46 |1
-<UEB11> \x9B\x47 |0
-<UEB12> \x9B\x48 |0
-<UEB13> \x9B\x49 |1
-<UEB14> \x9B\x4A |1
-<UEB15> \x9B\x4B |0
-<UEB16> \x9B\x4C |1
-<UEB17> \x9B\x4D |1
-<UEB18> \x9B\x4E |0
-<UEB19> \x9B\x4F |0
-<UEB1A> \x9B\x50 |0
-<UEB1B> \x9B\x51 |0
-<UEB1C> \x9B\x52 |0
-<UEB1D> \x9B\x53 |0
-<UEB1E> \x9B\x54 |1
-<UEB1F> \x9B\x55 |0
-<UEB20> \x9B\x56 |0
-<UEB21> \x9B\x57 |0
-<UEB22> \x9B\x58 |1
-<UEB23> \x9B\x59 |0
-<UEB24> \x9B\x5A |1
-<UEB25> \x9B\x5B |0
-<UEB26> \x9B\x5C |1
-<UEB27> \x9B\x5D |0
-<UEB28> \x9B\x5E |1
-<UEB29> \x9B\x5F |1
-<UEB2A> \x9B\x60 |0
-<UEB2B> \x9B\x61 |0
-<UEB2C> \x9B\x62 |0
-<UEB2D> \x9B\x63 |0
-<UEB2E> \x9B\x64 |0
-<UEB2F> \x9B\x65 |0
-<UEB30> \x9B\x66 |0
-<UEB31> \x9B\x67 |0
-<UEB32> \x9B\x68 |0
-<UEB33> \x9B\x69 |0
-<UEB34> \x9B\x6A |0
-<UEB35> \x9B\x6B |0
-<UEB36> \x9B\x6C |0
-<UEB37> \x9B\x6D |0
-<UEB38> \x9B\x6E |0
-<UEB39> \x9B\x6F |0
-<UEB3A> \x9B\x70 |1
-<UEB3B> \x9B\x71 |1
-<UEB3C> \x9B\x72 |1
-<UEB3D> \x9B\x73 |0
-<UEB3E> \x9B\x74 |0
-<UEB3F> \x9B\x75 |0
-<UEB40> \x9B\x76 |0
-<UEB41> \x9B\x77 |0
-<UEB42> \x9B\x78 |0
-<UEB43> \x9B\x79 |0
-<UEB44> \x9B\x7A |0
-<UEB45> \x9B\x7B |0
-<UEB46> \x9B\x7C |0
-<UEB47> \x9B\x7D |1
-<UEB48> \x9B\x7E |1
-<UEB49> \x9B\xA1 |1
-<UEB4A> \x9B\xA2 |0
-<UEB4B> \x9B\xA3 |0
-<UEB4C> \x9B\xA4 |0
-<UEB4D> \x9B\xA5 |0
-<UEB4E> \x9B\xA6 |0
-<UEB4F> \x9B\xA7 |0
-<UEB50> \x9B\xA8 |0
-<UEB51> \x9B\xA9 |1
-<UEB52> \x9B\xAA |1
-<UEB53> \x9B\xAB |0
-<UEB54> \x9B\xAC |0
-<UEB55> \x9B\xAD |0
-<UEB56> \x9B\xAE |0
-<UEB57> \x9B\xAF |0
-<UEB58> \x9B\xB0 |0
-<UEB59> \x9B\xB1 |0
-<UEB5A> \x9B\xB2 |0
-<UEB5B> \x9B\xB3 |0
-<UEB5C> \x9B\xB4 |1
-<UEB5D> \x9B\xB5 |0
-<UEB5E> \x9B\xB6 |1
-<UEB5F> \x9B\xB7 |0
-<UEB60> \x9B\xB8 |1
-<UEB61> \x9B\xB9 |0
-<UEB62> \x9B\xBA |0
-<UEB63> \x9B\xBB |0
-<UEB64> \x9B\xBC |1
-<UEB65> \x9B\xBD |0
-<UEB66> \x9B\xBE |1
-<UEB67> \x9B\xBF |0
-<UEB68> \x9B\xC0 |0
-<UEB69> \x9B\xC1 |0
-<UEB6A> \x9B\xC2 |1
-<UEB6B> \x9B\xC3 |0
-<UEB6C> \x9B\xC4 |1
-<UEB6D> \x9B\xC5 |0
-<UEB6E> \x9B\xC6 |0
-<UEB6F> \x9B\xC7 |0
-<UEB70> \x9B\xC8 |0
-<UEB71> \x9B\xC9 |0
-<UEB72> \x9B\xCA |1
-<UEB73> \x9B\xCB |0
-<UEB74> \x9B\xCC |0
-<UEB75> \x9B\xCD |1
-<UEB76> \x9B\xCE |0
-<UEB77> \x9B\xCF |0
-<UEB78> \x9B\xD0 |0
-<UEB79> \x9B\xD1 |1
-<UEB7A> \x9B\xD2 |0
-<UEB7B> \x9B\xD3 |1
-<UEB7C> \x9B\xD4 |1
-<UEB7D> \x9B\xD5 |1
-<UEB7E> \x9B\xD6 |0
-<UEB7F> \x9B\xD7 |0
-<UEB80> \x9B\xD8 |0
-<UEB81> \x9B\xD9 |0
-<UEB82> \x9B\xDA |1
-<UEB83> \x9B\xDB |0
-<UEB84> \x9B\xDC |0
-<UEB85> \x9B\xDD |0
-<UEB86> \x9B\xDE |0
-<UEB87> \x9B\xDF |1
-<UEB88> \x9B\xE0 |0
-<UEB89> \x9B\xE1 |0
-<UEB8A> \x9B\xE2 |0
-<UEB8B> \x9B\xE3 |1
-<UEB8C> \x9B\xE4 |0
-<UEB8D> \x9B\xE5 |0
-<UEB8E> \x9B\xE6 |0
-<UEB8F> \x9B\xE7 |0
-<UEB90> \x9B\xE8 |0
-<UEB91> \x9B\xE9 |1
-<UEB92> \x9B\xEA |1
-<UEB93> \x9B\xEB |0
-<UEB94> \x9B\xEC |0
-<UEB95> \x9B\xED |0
-<UEB96> \x9B\xEE |1
-<UEB97> \x9B\xEF |0
-<UEB98> \x9B\xF0 |0
-<UEB99> \x9B\xF1 |0
-<UEB9A> \x9B\xF2 |0
-<UEB9B> \x9B\xF3 |0
-<UEB9C> \x9B\xF4 |1
-<UEB9D> \x9B\xF5 |1
-<UEB9E> \x9B\xF6 |0
-<UEB9F> \x9B\xF7 |0
-<UEBA0> \x9B\xF8 |0
-<UEBA1> \x9B\xF9 |1
-<UEBA2> \x9B\xFA |0
-<UEBA3> \x9B\xFB |0
-<UEBA4> \x9B\xFC |1
-<UEBA5> \x9B\xFD |0
-<UEBA6> \x9B\xFE |0
-<UEBA7> \x9C\x40 |1
-<UEBA8> \x9C\x41 |0
-<UEBA9> \x9C\x42 |0
-<UEBAA> \x9C\x43 |0
-<UEBAB> \x9C\x44 |0
-<UEBAC> \x9C\x45 |1
-<UEBAD> \x9C\x46 |0
-<UEBAE> \x9C\x47 |0
-<UEBAF> \x9C\x48 |0
-<UEBB0> \x9C\x49 |0
-<UEBB1> \x9C\x4A |1
-<UEBB2> \x9C\x4B |0
-<UEBB3> \x9C\x4C |0
-<UEBB4> \x9C\x4D |0
-<UEBB5> \x9C\x4E |1
-<UEBB6> \x9C\x4F |0
-<UEBB7> \x9C\x50 |1
-<UEBB8> \x9C\x51 |1
-<UEBB9> \x9C\x52 |0
-<UEBBA> \x9C\x53 |0
-<UEBBB> \x9C\x54 |1
-<UEBBC> \x9C\x55 |0
-<UEBBD> \x9C\x56 |0
-<UEBBE> \x9C\x57 |1
-<UEBBF> \x9C\x58 |0
-<UEBC0> \x9C\x59 |1
-<UEBC1> \x9C\x5A |1
-<UEBC2> \x9C\x5B |0
-<UEBC3> \x9C\x5C |1
-<UEBC4> \x9C\x5D |1
-<UEBC5> \x9C\x5E |0
-<UEBC6> \x9C\x5F |0
-<UEBC7> \x9C\x60 |0
-<UEBC8> \x9C\x61 |0
-<UEBC9> \x9C\x62 |0
-<UEBCA> \x9C\x63 |0
-<UEBCB> \x9C\x64 |1
-<UEBCC> \x9C\x65 |0
-<UEBCD> \x9C\x66 |0
-<UEBCE> \x9C\x67 |0
-<UEBCF> \x9C\x68 |0
-<UEBD0> \x9C\x69 |0
-<UEBD1> \x9C\x6A |1
-<UEBD2> \x9C\x6B |0
-<UEBD3> \x9C\x6C |0
-<UEBD4> \x9C\x6D |1
-<UEBD5> \x9C\x6E |0
-<UEBD6> \x9C\x6F |1
-<UEBD7> \x9C\x70 |0
-<UEBD8> \x9C\x71 |0
-<UEBD9> \x9C\x72 |1
-<UEBDA> \x9C\x73 |0
-<UEBDB> \x9C\x74 |0
-<UEBDC> \x9C\x75 |1
-<UEBDD> \x9C\x76 |0
-<UEBDE> \x9C\x77 |0
-<UEBDF> \x9C\x78 |0
-<UEBE0> \x9C\x79 |1
-<UEBE1> \x9C\x7A |0
-<UEBE2> \x9C\x7B |1
-<UEBE3> \x9C\x7C |1
-<UEBE4> \x9C\x7D |0
-<UEBE5> \x9C\x7E |1
-<UEBE6> \x9C\xA1 |1
-<UEBE7> \x9C\xA2 |0
-<UEBE8> \x9C\xA3 |0
-<UEBE9> \x9C\xA4 |0
-<UEBEA> \x9C\xA5 |1
-<UEBEB> \x9C\xA6 |0
-<UEBEC> \x9C\xA7 |0
-<UEBED> \x9C\xA8 |1
-<UEBEE> \x9C\xA9 |0
-<UEBEF> \x9C\xAA |0
-<UEBF0> \x9C\xAB |1
-<UEBF1> \x9C\xAC |0
-<UEBF2> \x9C\xAD |0
-<UEBF3> \x9C\xAE |1
-<UEBF4> \x9C\xAF |1
-<UEBF5> \x9C\xB0 |0
-<UEBF6> \x9C\xB1 |0
-<UEBF7> \x9C\xB2 |1
-<UEBF8> \x9C\xB3 |1
-<UEBF9> \x9C\xB4 |0
-<UEBFA> \x9C\xB5 |0
-<UEBFB> \x9C\xB6 |0
-<UEBFC> \x9C\xB7 |1
-<UEBFD> \x9C\xB8 |0
-<UEBFE> \x9C\xB9 |0
-<UEBFF> \x9C\xBA |1
-<UEC00> \x9C\xBB |1
-<UEC01> \x9C\xBC |0
-<UEC02> \x9C\xBD |0
-<UEC03> \x9C\xBE |1
-<UEC04> \x9C\xBF |1
-<UEC05> \x9C\xC0 |0
-<UEC06> \x9C\xC1 |0
-<UEC07> \x9C\xC2 |1
-<UEC08> \x9C\xC3 |0
-<UEC09> \x9C\xC4 |0
-<UEC0A> \x9C\xC5 |1
-<UEC0B> \x9C\xC6 |1
-<UEC0C> \x9C\xC7 |0
-<UEC0D> \x9C\xC8 |1
-<UEC0E> \x9C\xC9 |0
-<UEC0F> \x9C\xCA |0
-<UEC10> \x9C\xCB |0
-<UEC11> \x9C\xCC |1
-<UEC12> \x9C\xCD |1
-<UEC13> \x9C\xCE |0
-<UEC14> \x9C\xCF |0
-<UEC15> \x9C\xD0 |0
-<UEC16> \x9C\xD1 |1
-<UEC17> \x9C\xD2 |0
-<UEC18> \x9C\xD3 |0
-<UEC19> \x9C\xD4 |0
-<UEC1A> \x9C\xD5 |0
-<UEC1B> \x9C\xD6 |0
-<UEC1C> \x9C\xD7 |0
-<UEC1D> \x9C\xD8 |0
-<UEC1E> \x9C\xD9 |1
-<UEC1F> \x9C\xDA |1
-<UEC20> \x9C\xDB |0
-<UEC21> \x9C\xDC |1
-<UEC22> \x9C\xDD |0
-<UEC23> \x9C\xDE |1
-<UEC24> \x9C\xDF |0
-<UEC25> \x9C\xE0 |1
-<UEC26> \x9C\xE1 |0
-<UEC27> \x9C\xE2 |1
-<UEC28> \x9C\xE3 |1
-<UEC29> \x9C\xE4 |1
-<UEC2A> \x9C\xE5 |0
-<UEC2B> \x9C\xE6 |0
-<UEC2C> \x9C\xE7 |0
-<UEC2D> \x9C\xE8 |0
-<UEC2E> \x9C\xE9 |0
-<UEC2F> \x9C\xEA |0
-<UEC30> \x9C\xEB |1
-<UEC31> \x9C\xEC |0
-<UEC32> \x9C\xED |0
-<UEC33> \x9C\xEE |1
-<UEC34> \x9C\xEF |1
-<UEC35> \x9C\xF0 |0
-<UEC36> \x9C\xF1 |1
-<UEC37> \x9C\xF2 |0
-<UEC38> \x9C\xF3 |1
-<UEC39> \x9C\xF4 |1
-<UEC3A> \x9C\xF5 |1
-<UEC3B> \x9C\xF6 |0
-<UEC3C> \x9C\xF7 |0
-<UEC3D> \x9C\xF8 |1
-<UEC3E> \x9C\xF9 |1
-<UEC3F> \x9C\xFA |0
-<UEC40> \x9C\xFB |0
-<UEC41> \x9C\xFC |0
-<UEC42> \x9C\xFD |0
-<UEC43> \x9C\xFE |0
-<UEC44> \x9D\x40 |0
-<UEC45> \x9D\x41 |0
-<UEC46> \x9D\x42 |0
-<UEC47> \x9D\x43 |0
-<UEC48> \x9D\x44 |0
-<UEC49> \x9D\x45 |0
-<UEC4A> \x9D\x46 |1
-<UEC4B> \x9D\x47 |0
-<UEC4C> \x9D\x48 |0
-<UEC4D> \x9D\x49 |1
-<UEC4E> \x9D\x4A |1
-<UEC4F> \x9D\x4B |0
-<UEC50> \x9D\x4C |1
-<UEC51> \x9D\x4D |1
-<UEC52> \x9D\x4E |0
-<UEC53> \x9D\x4F |1
-<UEC54> \x9D\x50 |0
-<UEC55> \x9D\x51 |1
-<UEC56> \x9D\x52 |0
-<UEC57> \x9D\x53 |0
-<UEC58> \x9D\x54 |0
-<UEC59> \x9D\x55 |1
-<UEC5A> \x9D\x56 |0
-<UEC5B> \x9D\x57 |0
-<UEC5C> \x9D\x58 |0
-<UEC5D> \x9D\x59 |0
-<UEC5E> \x9D\x5A |0
-<UEC5F> \x9D\x5B |0
-<UEC60> \x9D\x5C |0
-<UEC61> \x9D\x5D |1
-<UEC62> \x9D\x5E |0
-<UEC63> \x9D\x5F |0
-<UEC64> \x9D\x60 |1
-<UEC65> \x9D\x61 |1
-<UEC66> \x9D\x62 |1
-<UEC67> \x9D\x63 |0
-<UEC68> \x9D\x64 |0
-<UEC69> \x9D\x65 |0
-<UEC6A> \x9D\x66 |0
-<UEC6B> \x9D\x67 |0
-<UEC6C> \x9D\x68 |0
-<UEC6D> \x9D\x69 |0
-<UEC6E> \x9D\x6A |0
-<UEC6F> \x9D\x6B |0
-<UEC70> \x9D\x6C |0
-<UEC71> \x9D\x6D |0
-<UEC72> \x9D\x6E |0
-<UEC73> \x9D\x6F |0
-<UEC74> \x9D\x70 |1
-<UEC75> \x9D\x71 |0
-<UEC76> \x9D\x72 |0
-<UEC77> \x9D\x73 |1
-<UEC78> \x9D\x74 |1
-<UEC79> \x9D\x75 |0
-<UEC7A> \x9D\x76 |1
-<UEC7B> \x9D\x77 |0
-<UEC7C> \x9D\x78 |1
-<UEC7D> \x9D\x79 |1
-<UEC7E> \x9D\x7A |0
-<UEC7F> \x9D\x7B |1
-<UEC80> \x9D\x7C |0
-<UEC81> \x9D\x7D |1
-<UEC82> \x9D\x7E |1
-<UEC83> \x9D\xA1 |1
-<UEC84> \x9D\xA2 |0
-<UEC85> \x9D\xA3 |1
-<UEC86> \x9D\xA4 |0
-<UEC87> \x9D\xA5 |1
-<UEC88> \x9D\xA6 |1
-<UEC89> \x9D\xA7 |1
-<UEC8A> \x9D\xA8 |1
-<UEC8B> \x9D\xA9 |1
-<UEC8C> \x9D\xAA |1
-<UEC8D> \x9D\xAB |0
-<UEC8E> \x9D\xAC |0
-<UEC8F> \x9D\xAD |1
-<UEC90> \x9D\xAE |1
-<UEC91> \x9D\xAF |0
-<UEC92> \x9D\xB0 |0
-<UEC93> \x9D\xB1 |0
-<UEC94> \x9D\xB2 |0
-<UEC95> \x9D\xB3 |0
-<UEC96> \x9D\xB4 |0
-<UEC97> \x9D\xB5 |1
-<UEC98> \x9D\xB6 |0
-<UEC99> \x9D\xB7 |0
-<UEC9A> \x9D\xB8 |0
-<UEC9B> \x9D\xB9 |0
-<UEC9C> \x9D\xBA |1
-<UEC9D> \x9D\xBB |0
-<UEC9E> \x9D\xBC |0
-<UEC9F> \x9D\xBD |1
-<UECA0> \x9D\xBE |0
-<UECA1> \x9D\xBF |1
-<UECA2> \x9D\xC0 |1
-<UECA3> \x9D\xC1 |0
-<UECA4> \x9D\xC2 |0
-<UECA5> \x9D\xC3 |1
-<UECA6> \x9D\xC4 |0
-<UECA7> \x9D\xC5 |0
-<UECA8> \x9D\xC6 |0
-<UECA9> \x9D\xC7 |1
-<UECAA> \x9D\xC8 |1
-<UECAB> \x9D\xC9 |0
-<UECAC> \x9D\xCA |1
-<UECAD> \x9D\xCB |0
-<UECAE> \x9D\xCC |1
-<UECAF> \x9D\xCD |0
-<UECB0> \x9D\xCE |1
-<UECB1> \x9D\xCF |1
-<UECB2> \x9D\xD0 |1
-<UECB3> \x9D\xD1 |1
-<UECB4> \x9D\xD2 |0
-<UECB5> \x9D\xD3 |1
-<UECB6> \x9D\xD4 |0
-<UECB7> \x9D\xD5 |1
-<UECB8> \x9D\xD6 |1
-<UECB9> \x9D\xD7 |0
-<UECBA> \x9D\xD8 |0
-<UECBB> \x9D\xD9 |0
-<UECBC> \x9D\xDA |1
-<UECBD> \x9D\xDB |1
-<UECBE> \x9D\xDC |1
-<UECBF> \x9D\xDD |1
-<UECC0> \x9D\xDE |1
-<UECC1> \x9D\xDF |1
-<UECC2> \x9D\xE0 |1
-<UECC3> \x9D\xE1 |1
-<UECC4> \x9D\xE2 |1
-<UECC5> \x9D\xE3 |1
-<UECC6> \x9D\xE4 |1
-<UECC7> \x9D\xE5 |1
-<UECC8> \x9D\xE6 |1
-<UECC9> \x9D\xE7 |1
-<UECCA> \x9D\xE8 |1
-<UECCB> \x9D\xE9 |1
-<UECCC> \x9D\xEA |1
-<UECCD> \x9D\xEB |1
-<UECCE> \x9D\xEC |1
-<UECCF> \x9D\xED |0
-<UECD0> \x9D\xEE |1
-<UECD1> \x9D\xEF |1
-<UECD2> \x9D\xF0 |1
-<UECD3> \x9D\xF1 |1
-<UECD4> \x9D\xF2 |0
-<UECD5> \x9D\xF3 |1
-<UECD6> \x9D\xF4 |1
-<UECD7> \x9D\xF5 |1
-<UECD8> \x9D\xF6 |1
-<UECD9> \x9D\xF7 |1
-<UECDA> \x9D\xF8 |1
-<UECDB> \x9D\xF9 |0
-<UECDC> \x9D\xFA |0
-<UECDD> \x9D\xFB |1
-<UECDE> \x9D\xFC |0
-<UECDF> \x9D\xFD |0
-<UECE0> \x9D\xFE |0
-<UECE1> \x9E\x40 |0
-<UECE2> \x9E\x41 |1
-<UECE3> \x9E\x42 |1
-<UECE4> \x9E\x43 |1
-<UECE5> \x9E\x44 |0
-<UECE6> \x9E\x45 |1
-<UECE7> \x9E\x46 |1
-<UECE8> \x9E\x47 |1
-<UECE9> \x9E\x48 |1
-<UECEA> \x9E\x49 |1
-<UECEB> \x9E\x4A |1
-<UECEC> \x9E\x4B |1
-<UECED> \x9E\x4C |1
-<UECEE> \x9E\x4D |1
-<UECEF> \x9E\x4E |1
-<UECF0> \x9E\x4F |0
-<UECF1> \x9E\x50 |1
-<UECF2> \x9E\x51 |0
-<UECF3> \x9E\x52 |1
-<UECF4> \x9E\x53 |1
-<UECF5> \x9E\x54 |0
-<UECF6> \x9E\x55 |1
-<UECF7> \x9E\x56 |1
-<UECF8> \x9E\x57 |1
-<UECF9> \x9E\x58 |1
-<UECFA> \x9E\x59 |1
-<UECFB> \x9E\x5A |1
-<UECFC> \x9E\x5B |0
-<UECFD> \x9E\x5C |1
-<UECFE> \x9E\x5D |1
-<UECFF> \x9E\x5E |1
-<UED00> \x9E\x5F |1
-<UED01> \x9E\x60 |1
-<UED02> \x9E\x61 |1
-<UED03> \x9E\x62 |1
-<UED04> \x9E\x63 |0
-<UED05> \x9E\x64 |1
-<UED06> \x9E\x65 |1
-<UED07> \x9E\x66 |0
-<UED08> \x9E\x67 |1
-<UED09> \x9E\x68 |1
-<UED0A> \x9E\x69 |0
-<UED0B> \x9E\x6A |1
-<UED0C> \x9E\x6B |0
-<UED0D> \x9E\x6C |0
-<UED0E> \x9E\x6D |0
-<UED0F> \x9E\x6E |0
-<UED10> \x9E\x6F |0
-<UED11> \x9E\x70 |0
-<UED12> \x9E\x71 |1
-<UED13> \x9E\x72 |0
-<UED14> \x9E\x73 |1
-<UED15> \x9E\x74 |0
-<UED16> \x9E\x75 |0
-<UED17> \x9E\x76 |0
-<UED18> \x9E\x77 |0
-<UED19> \x9E\x78 |1
-<UED1A> \x9E\x79 |0
-<UED1B> \x9E\x7A |1
-<UED1C> \x9E\x7B |0
-<UED1D> \x9E\x7C |0
-<UED1E> \x9E\x7D |0
-<UED1F> \x9E\x7E |1
-<UED20> \x9E\xA1 |1
-<UED21> \x9E\xA2 |1
-<UED22> \x9E\xA3 |0
-<UED23> \x9E\xA4 |1
-<UED24> \x9E\xA5 |0
-<UED25> \x9E\xA6 |0
-<UED26> \x9E\xA7 |0
-<UED27> \x9E\xA8 |0
-<UED28> \x9E\xA9 |0
-<UED29> \x9E\xAA |0
-<UED2A> \x9E\xAB |0
-<UED2B> \x9E\xAC |0
-<UED2C> \x9E\xAD |0
-<UED2D> \x9E\xAE |0
-<UED2E> \x9E\xAF |1
-<UED2F> \x9E\xB0 |1
-<UED30> \x9E\xB1 |1
-<UED31> \x9E\xB2 |1
-<UED32> \x9E\xB3 |1
-<UED33> \x9E\xB4 |1
-<UED34> \x9E\xB5 |1
-<UED35> \x9E\xB6 |1
-<UED36> \x9E\xB7 |1
-<UED37> \x9E\xB8 |1
-<UED38> \x9E\xB9 |1
-<UED39> \x9E\xBA |1
-<UED3A> \x9E\xBB |1
-<UED3B> \x9E\xBC |0
-<UED3C> \x9E\xBD |1
-<UED3D> \x9E\xBE |0
-<UED3E> \x9E\xBF |1
-<UED3F> \x9E\xC0 |1
-<UED40> \x9E\xC1 |1
-<UED41> \x9E\xC2 |0
-<UED42> \x9E\xC3 |0
-<UED43> \x9E\xC4 |0
-<UED44> \x9E\xC5 |1
-<UED45> \x9E\xC6 |0
-<UED46> \x9E\xC7 |1
-<UED47> \x9E\xC8 |0
-<UED48> \x9E\xC9 |1
-<UED49> \x9E\xCA |1
-<UED4A> \x9E\xCB |0
-<UED4B> \x9E\xCC |0
-<UED4C> \x9E\xCD |1
-<UED4D> \x9E\xCE |0
-<UED4E> \x9E\xCF |0
-<UED4F> \x9E\xD0 |0
-<UED50> \x9E\xD1 |1
-<UED51> \x9E\xD2 |0
-<UED52> \x9E\xD3 |0
-<UED53> \x9E\xD4 |0
-<UED54> \x9E\xD5 |0
-<UED55> \x9E\xD6 |1
-<UED56> \x9E\xD7 |1
-<UED57> \x9E\xD8 |0
-<UED58> \x9E\xD9 |0
-<UED59> \x9E\xDA |1
-<UED5A> \x9E\xDB |1
-<UED5B> \x9E\xDC |1
-<UED5C> \x9E\xDD |1
-<UED5D> \x9E\xDE |1
-<UED5E> \x9E\xDF |1
-<UED5F> \x9E\xE0 |0
-<UED60> \x9E\xE1 |1
-<UED61> \x9E\xE2 |1
-<UED62> \x9E\xE3 |0
-<UED63> \x9E\xE4 |1
-<UED64> \x9E\xE5 |1
-<UED65> \x9E\xE6 |1
-<UED66> \x9E\xE7 |1
-<UED67> \x9E\xE8 |1
-<UED68> \x9E\xE9 |1
-<UED69> \x9E\xEA |1
-<UED6A> \x9E\xEB |1
-<UED6B> \x9E\xEC |0
-<UED6C> \x9E\xED |1
-<UED6D> \x9E\xEE |1
-<UED6E> \x9E\xEF |0
-<UED6F> \x9E\xF0 |1
-<UED70> \x9E\xF1 |1
-<UED71> \x9E\xF2 |0
-<UED72> \x9E\xF3 |0
-<UED73> \x9E\xF4 |0
-<UED74> \x9E\xF5 |1
-<UED75> \x9E\xF6 |0
-<UED76> \x9E\xF7 |1
-<UED77> \x9E\xF8 |0
-<UED78> \x9E\xF9 |0
-<UED79> \x9E\xFA |1
-<UED7A> \x9E\xFB |0
-<UED7B> \x9E\xFC |1
-<UED7C> \x9E\xFD |0
-<UED7D> \x9E\xFE |1
-<UED7E> \x9F\x40 |1
-<UED7F> \x9F\x41 |1
-<UED80> \x9F\x42 |1
-<UED81> \x9F\x43 |0
-<UED82> \x9F\x44 |1
-<UED83> \x9F\x45 |1
-<UED84> \x9F\x46 |0
-<UED85> \x9F\x47 |0
-<UED86> \x9F\x48 |0
-<UED87> \x9F\x49 |1
-<UED88> \x9F\x4A |0
-<UED89> \x9F\x4B |0
-<UED8A> \x9F\x4C |0
-<UED8B> \x9F\x4D |0
-<UED8C> \x9F\x4E |0
-<UED8D> \x9F\x4F |1
-<UED8E> \x9F\x50 |0
-<UED8F> \x9F\x51 |1
-<UED90> \x9F\x52 |1
-<UED91> \x9F\x53 |0
-<UED92> \x9F\x54 |1
-<UED93> \x9F\x55 |1
-<UED94> \x9F\x56 |1
-<UED95> \x9F\x57 |1
-<UED96> \x9F\x58 |1
-<UED97> \x9F\x59 |1
-<UED98> \x9F\x5A |1
-<UED99> \x9F\x5B |1
-<UED9A> \x9F\x5C |1
-<UED9B> \x9F\x5D |1
-<UED9C> \x9F\x5E |1
-<UED9D> \x9F\x5F |1
-<UED9E> \x9F\x60 |0
-<UED9F> \x9F\x61 |1
-<UEDA0> \x9F\x62 |1
-<UEDA1> \x9F\x63 |1
-<UEDA2> \x9F\x64 |1
-<UEDA3> \x9F\x65 |1
-<UEDA4> \x9F\x66 |0
-<UEDA5> \x9F\x67 |1
-<UEDA6> \x9F\x68 |0
-<UEDA7> \x9F\x69 |1
-<UEDA8> \x9F\x6A |1
-<UEDA9> \x9F\x6B |1
-<UEDAA> \x9F\x6C |1
-<UEDAB> \x9F\x6D |1
-<UEDAC> \x9F\x6E |1
-<UEDAD> \x9F\x6F |1
-<UEDAE> \x9F\x70 |1
-<UEDAF> \x9F\x71 |1
-<UEDB0> \x9F\x72 |1
-<UEDB1> \x9F\x73 |1
-<UEDB2> \x9F\x74 |1
-<UEDB3> \x9F\x75 |1
-<UEDB4> \x9F\x76 |1
-<UEDB5> \x9F\x77 |1
-<UEDB6> \x9F\x78 |1
-<UEDB7> \x9F\x79 |1
-<UEDB8> \x9F\x7A |1
-<UEDB9> \x9F\x7B |1
-<UEDBA> \x9F\x7C |1
-<UEDBB> \x9F\x7D |1
-<UEDBC> \x9F\x7E |1
-<UEDBD> \x9F\xA1 |1
-<UEDBE> \x9F\xA2 |1
-<UEDBF> \x9F\xA3 |1
-<UEDC0> \x9F\xA4 |1
-<UEDC1> \x9F\xA5 |1
-<UEDC2> \x9F\xA6 |1
-<UEDC3> \x9F\xA7 |1
-<UEDC4> \x9F\xA8 |1
-<UEDC5> \x9F\xA9 |1
-<UEDC6> \x9F\xAA |0
-<UEDC7> \x9F\xAB |1
-<UEDC8> \x9F\xAC |1
-<UEDC9> \x9F\xAD |0
-<UEDCA> \x9F\xAE |1
-<UEDCB> \x9F\xAF |1
-<UEDCC> \x9F\xB0 |1
-<UEDCD> \x9F\xB1 |0
-<UEDCE> \x9F\xB2 |1
-<UEDCF> \x9F\xB3 |0
-<UEDD0> \x9F\xB4 |1
-<UEDD1> \x9F\xB5 |0
-<UEDD2> \x9F\xB6 |1
-<UEDD3> \x9F\xB7 |1
-<UEDD4> \x9F\xB8 |1
-<UEDD5> \x9F\xB9 |1
-<UEDD6> \x9F\xBA |1
-<UEDD7> \x9F\xBB |0
-<UEDD8> \x9F\xBC |1
-<UEDD9> \x9F\xBD |1
-<UEDDA> \x9F\xBE |0
-<UEDDB> \x9F\xBF |0
-<UEDDC> \x9F\xC0 |0
-<UEDDD> \x9F\xC1 |0
-<UEDDE> \x9F\xC2 |1
-<UEDDF> \x9F\xC3 |1
-<UEDE0> \x9F\xC4 |1
-<UEDE1> \x9F\xC5 |0
-<UEDE2> \x9F\xC6 |1
-<UEDE3> \x9F\xC7 |1
-<UEDE4> \x9F\xC8 |0
-<UEDE5> \x9F\xC9 |1
-<UEDE6> \x9F\xCA |1
-<UEDE7> \x9F\xCB |0
-<UEDE8> \x9F\xCC |1
-<UEDE9> \x9F\xCD |1
-<UEDEA> \x9F\xCE |1
-<UEDEB> \x9F\xCF |1
-<UEDEC> \x9F\xD0 |1
-<UEDED> \x9F\xD1 |0
-<UEDEE> \x9F\xD2 |1
-<UEDEF> \x9F\xD3 |1
-<UEDF0> \x9F\xD4 |1
-<UEDF1> \x9F\xD5 |1
-<UEDF2> \x9F\xD6 |1
-<UEDF3> \x9F\xD7 |1
-<UEDF4> \x9F\xD8 |0
-<UEDF5> \x9F\xD9 |1
-<UEDF6> \x9F\xDA |0
-<UEDF7> \x9F\xDB |1
-<UEDF8> \x9F\xDC |1
-<UEDF9> \x9F\xDD |1
-<UEDFA> \x9F\xDE |1
-<UEDFB> \x9F\xDF |1
-<UEDFC> \x9F\xE0 |1
-<UEDFD> \x9F\xE1 |1
-<UEDFE> \x9F\xE2 |1
-<UEDFF> \x9F\xE3 |1
-<UEE00> \x9F\xE4 |1
-<UEE01> \x9F\xE5 |1
-<UEE02> \x9F\xE6 |0
-<UEE03> \x9F\xE7 |1
-<UEE04> \x9F\xE8 |1
-<UEE05> \x9F\xE9 |1
-<UEE06> \x9F\xEA |0
-<UEE07> \x9F\xEB |1
-<UEE08> \x9F\xEC |0
-<UEE09> \x9F\xED |1
-<UEE0A> \x9F\xEE |1
-<UEE0B> \x9F\xEF |0
-<UEE0C> \x9F\xF0 |1
-<UEE0D> \x9F\xF1 |1
-<UEE0E> \x9F\xF2 |1
-<UEE0F> \x9F\xF3 |1
-<UEE10> \x9F\xF4 |1
-<UEE11> \x9F\xF5 |0
-<UEE12> \x9F\xF6 |1
-<UEE13> \x9F\xF7 |1
-<UEE14> \x9F\xF8 |1
-<UEE15> \x9F\xF9 |0
-<UEE16> \x9F\xFA |1
-<UEE17> \x9F\xFB |1
-<UEE18> \x9F\xFC |1
-<UEE19> \x9F\xFD |1
-<UEE1A> \x9F\xFE |1
-<UEE1B> \xA0\x40 |0
-<UEE1C> \xA0\x41 |1
-<UEE1D> \xA0\x42 |1
-<UEE1E> \xA0\x43 |1
-<UEE1F> \xA0\x44 |1
-<UEE20> \xA0\x45 |0
-<UEE21> \xA0\x46 |1
-<UEE22> \xA0\x47 |0
-<UEE23> \xA0\x48 |1
-<UEE24> \xA0\x49 |1
-<UEE25> \xA0\x4A |1
-<UEE26> \xA0\x4B |1
-<UEE27> \xA0\x4C |1
-<UEE28> \xA0\x4D |1
-<UEE29> \xA0\x4E |1
-<UEE2A> \xA0\x4F |0
-<UEE2B> \xA0\x50 |1
-<UEE2C> \xA0\x51 |1
-<UEE2D> \xA0\x52 |1
-<UEE2E> \xA0\x53 |1
-<UEE2F> \xA0\x54 |0
-<UEE30> \xA0\x55 |0
-<UEE31> \xA0\x56 |0
-<UEE32> \xA0\x57 |0
-<UEE33> \xA0\x58 |1
-<UEE34> \xA0\x59 |0
-<UEE35> \xA0\x5A |0
-<UEE36> \xA0\x5B |1
-<UEE37> \xA0\x5C |1
-<UEE38> \xA0\x5D |1
-<UEE39> \xA0\x5E |1
-<UEE3A> \xA0\x5F |1
-<UEE3B> \xA0\x60 |1
-<UEE3C> \xA0\x61 |1
-<UEE3D> \xA0\x62 |0
-<UEE3E> \xA0\x63 |0
-<UEE3F> \xA0\x64 |1
-<UEE40> \xA0\x65 |1
-<UEE41> \xA0\x66 |1
-<UEE42> \xA0\x67 |1
-<UEE43> \xA0\x68 |1
-<UEE44> \xA0\x69 |1
-<UEE45> \xA0\x6A |1
-<UEE46> \xA0\x6B |1
-<UEE47> \xA0\x6C |1
-<UEE48> \xA0\x6D |0
-<UEE49> \xA0\x6E |1
-<UEE4A> \xA0\x6F |1
-<UEE4B> \xA0\x70 |1
-<UEE4C> \xA0\x71 |1
-<UEE4D> \xA0\x72 |0
-<UEE4E> \xA0\x73 |1
-<UEE4F> \xA0\x74 |1
-<UEE50> \xA0\x75 |1
-<UEE51> \xA0\x76 |1
-<UEE52> \xA0\x77 |0
-<UEE53> \xA0\x78 |1
-<UEE54> \xA0\x79 |1
-<UEE55> \xA0\x7A |1
-<UEE56> \xA0\x7B |0
-<UEE57> \xA0\x7C |1
-<UEE58> \xA0\x7D |1
-<UEE59> \xA0\x7E |1
-<UEE5A> \xA0\xA1 |1
-<UEE5B> \xA0\xA2 |0
-<UEE5C> \xA0\xA3 |1
-<UEE5D> \xA0\xA4 |0
-<UEE5E> \xA0\xA5 |0
-<UEE5F> \xA0\xA6 |1
-<UEE60> \xA0\xA7 |0
-<UEE61> \xA0\xA8 |1
-<UEE62> \xA0\xA9 |1
-<UEE63> \xA0\xAA |1
-<UEE64> \xA0\xAB |0
-<UEE65> \xA0\xAC |1
-<UEE66> \xA0\xAD |0
-<UEE67> \xA0\xAE |1
-<UEE68> \xA0\xAF |0
-<UEE69> \xA0\xB0 |1
-<UEE6A> \xA0\xB1 |0
-<UEE6B> \xA0\xB2 |1
-<UEE6C> \xA0\xB3 |1
-<UEE6D> \xA0\xB4 |1
-<UEE6E> \xA0\xB5 |1
-<UEE6F> \xA0\xB6 |1
-<UEE70> \xA0\xB7 |1
-<UEE71> \xA0\xB8 |1
-<UEE72> \xA0\xB9 |1
-<UEE73> \xA0\xBA |1
-<UEE74> \xA0\xBB |1
-<UEE75> \xA0\xBC |1
-<UEE76> \xA0\xBD |0
-<UEE77> \xA0\xBE |1
-<UEE78> \xA0\xBF |1
-<UEE79> \xA0\xC0 |1
-<UEE7A> \xA0\xC1 |1
-<UEE7B> \xA0\xC2 |1
-<UEE7C> \xA0\xC3 |0
-<UEE7D> \xA0\xC4 |1
-<UEE7E> \xA0\xC5 |0
-<UEE7F> \xA0\xC6 |1
-<UEE80> \xA0\xC7 |1
-<UEE81> \xA0\xC8 |1
-<UEE82> \xA0\xC9 |1
-<UEE83> \xA0\xCA |1
-<UEE84> \xA0\xCB |1
-<UEE85> \xA0\xCC |1
-<UEE86> \xA0\xCD |1
-<UEE87> \xA0\xCE |1
-<UEE88> \xA0\xCF |1
-<UEE89> \xA0\xD0 |1
-<UEE8A> \xA0\xD1 |1
-<UEE8B> \xA0\xD2 |1
-<UEE8C> \xA0\xD3 |0
-<UEE8D> \xA0\xD4 |1
-<UEE8E> \xA0\xD5 |0
-<UEE8F> \xA0\xD6 |1
-<UEE90> \xA0\xD7 |1
-<UEE91> \xA0\xD8 |0
-<UEE92> \xA0\xD9 |1
-<UEE93> \xA0\xDA |1
-<UEE94> \xA0\xDB |1
-<UEE95> \xA0\xDC |1
-<UEE96> \xA0\xDD |1
-<UEE97> \xA0\xDE |1
-<UEE98> \xA0\xDF |0
-<UEE99> \xA0\xE0 |1
-<UEE9A> \xA0\xE1 |0
-<UEE9B> \xA0\xE2 |1
-<UEE9C> \xA0\xE3 |0
-<UEE9D> \xA0\xE4 |0
-<UEE9E> \xA0\xE5 |1
-<UEE9F> \xA0\xE6 |1
-<UEEA0> \xA0\xE7 |1
-<UEEA1> \xA0\xE8 |1
-<UEEA2> \xA0\xE9 |0
-<UEEA3> \xA0\xEA |0
-<UEEA4> \xA0\xEB |0
-<UEEA5> \xA0\xEC |0
-<UEEA6> \xA0\xED |0
-<UEEA7> \xA0\xEE |0
-<UEEA8> \xA0\xEF |0
-<UEEA9> \xA0\xF0 |0
-<UEEAA> \xA0\xF1 |0
-<UEEAB> \xA0\xF2 |1
-<UEEAC> \xA0\xF3 |0
-<UEEAD> \xA0\xF4 |0
-<UEEAE> \xA0\xF5 |0
-<UEEAF> \xA0\xF6 |0
-<UEEB0> \xA0\xF7 |0
-<UEEB1> \xA0\xF8 |0
-<UEEB2> \xA0\xF9 |1
-<UEEB3> \xA0\xFA |1
-<UEEB4> \xA0\xFB |0
-<UEEB5> \xA0\xFC |1
-<UEEB6> \xA0\xFD |1
-<UEEB7> \xA0\xFE |0
-<UEEB8> \x81\x40 |0
-<UEEB9> \x81\x41 |0
-<UEEBA> \x81\x42 |0
-<UEEBB> \x81\x43 |0
-<UEEBC> \x81\x44 |0
-<UEEBD> \x81\x45 |0
-<UEEBE> \x81\x46 |0
-<UEEBF> \x81\x47 |0
-<UEEC0> \x81\x48 |0
-<UEEC1> \x81\x49 |0
-<UEEC2> \x81\x4A |0
-<UEEC3> \x81\x4B |0
-<UEEC4> \x81\x4C |0
-<UEEC5> \x81\x4D |0
-<UEEC6> \x81\x4E |0
-<UEEC7> \x81\x4F |0
-<UEEC8> \x81\x50 |0
-<UEEC9> \x81\x51 |0
-<UEECA> \x81\x52 |0
-<UEECB> \x81\x53 |0
-<UEECC> \x81\x54 |0
-<UEECD> \x81\x55 |0
-<UEECE> \x81\x56 |0
-<UEECF> \x81\x57 |0
-<UEED0> \x81\x58 |0
-<UEED1> \x81\x59 |0
-<UEED2> \x81\x5A |0
-<UEED3> \x81\x5B |0
-<UEED4> \x81\x5C |0
-<UEED5> \x81\x5D |0
-<UEED6> \x81\x5E |0
-<UEED7> \x81\x5F |0
-<UEED8> \x81\x60 |0
-<UEED9> \x81\x61 |0
-<UEEDA> \x81\x62 |0
-<UEEDB> \x81\x63 |0
-<UEEDC> \x81\x64 |0
-<UEEDD> \x81\x65 |0
-<UEEDE> \x81\x66 |0
-<UEEDF> \x81\x67 |0
-<UEEE0> \x81\x68 |0
-<UEEE1> \x81\x69 |0
-<UEEE2> \x81\x6A |0
-<UEEE3> \x81\x6B |0
-<UEEE4> \x81\x6C |0
-<UEEE5> \x81\x6D |0
-<UEEE6> \x81\x6E |0
-<UEEE7> \x81\x6F |0
-<UEEE8> \x81\x70 |0
-<UEEE9> \x81\x71 |0
-<UEEEA> \x81\x72 |0
-<UEEEB> \x81\x73 |0
-<UEEEC> \x81\x74 |0
-<UEEED> \x81\x75 |0
-<UEEEE> \x81\x76 |0
-<UEEEF> \x81\x77 |0
-<UEEF0> \x81\x78 |0
-<UEEF1> \x81\x79 |0
-<UEEF2> \x81\x7A |0
-<UEEF3> \x81\x7B |0
-<UEEF4> \x81\x7C |0
-<UEEF5> \x81\x7D |0
-<UEEF6> \x81\x7E |0
-<UEEF7> \x81\xA1 |0
-<UEEF8> \x81\xA2 |0
-<UEEF9> \x81\xA3 |0
-<UEEFA> \x81\xA4 |0
-<UEEFB> \x81\xA5 |0
-<UEEFC> \x81\xA6 |0
-<UEEFD> \x81\xA7 |0
-<UEEFE> \x81\xA8 |0
-<UEEFF> \x81\xA9 |0
-<UEF00> \x81\xAA |0
-<UEF01> \x81\xAB |0
-<UEF02> \x81\xAC |0
-<UEF03> \x81\xAD |0
-<UEF04> \x81\xAE |0
-<UEF05> \x81\xAF |0
-<UEF06> \x81\xB0 |0
-<UEF07> \x81\xB1 |0
-<UEF08> \x81\xB2 |0
-<UEF09> \x81\xB3 |0
-<UEF0A> \x81\xB4 |0
-<UEF0B> \x81\xB5 |0
-<UEF0C> \x81\xB6 |0
-<UEF0D> \x81\xB7 |0
-<UEF0E> \x81\xB8 |0
-<UEF0F> \x81\xB9 |0
-<UEF10> \x81\xBA |0
-<UEF11> \x81\xBB |0
-<UEF12> \x81\xBC |0
-<UEF13> \x81\xBD |0
-<UEF14> \x81\xBE |0
-<UEF15> \x81\xBF |0
-<UEF16> \x81\xC0 |0
-<UEF17> \x81\xC1 |0
-<UEF18> \x81\xC2 |0
-<UEF19> \x81\xC3 |0
-<UEF1A> \x81\xC4 |0
-<UEF1B> \x81\xC5 |0
-<UEF1C> \x81\xC6 |0
-<UEF1D> \x81\xC7 |0
-<UEF1E> \x81\xC8 |0
-<UEF1F> \x81\xC9 |0
-<UEF20> \x81\xCA |0
-<UEF21> \x81\xCB |0
-<UEF22> \x81\xCC |0
-<UEF23> \x81\xCD |0
-<UEF24> \x81\xCE |0
-<UEF25> \x81\xCF |0
-<UEF26> \x81\xD0 |0
-<UEF27> \x81\xD1 |0
-<UEF28> \x81\xD2 |0
-<UEF29> \x81\xD3 |0
-<UEF2A> \x81\xD4 |0
-<UEF2B> \x81\xD5 |0
-<UEF2C> \x81\xD6 |0
-<UEF2D> \x81\xD7 |0
-<UEF2E> \x81\xD8 |0
-<UEF2F> \x81\xD9 |0
-<UEF30> \x81\xDA |0
-<UEF31> \x81\xDB |0
-<UEF32> \x81\xDC |0
-<UEF33> \x81\xDD |0
-<UEF34> \x81\xDE |0
-<UEF35> \x81\xDF |0
-<UEF36> \x81\xE0 |0
-<UEF37> \x81\xE1 |0
-<UEF38> \x81\xE2 |0
-<UEF39> \x81\xE3 |0
-<UEF3A> \x81\xE4 |0
-<UEF3B> \x81\xE5 |0
-<UEF3C> \x81\xE6 |0
-<UEF3D> \x81\xE7 |0
-<UEF3E> \x81\xE8 |0
-<UEF3F> \x81\xE9 |0
-<UEF40> \x81\xEA |0
-<UEF41> \x81\xEB |0
-<UEF42> \x81\xEC |0
-<UEF43> \x81\xED |0
-<UEF44> \x81\xEE |0
-<UEF45> \x81\xEF |0
-<UEF46> \x81\xF0 |0
-<UEF47> \x81\xF1 |0
-<UEF48> \x81\xF2 |0
-<UEF49> \x81\xF3 |0
-<UEF4A> \x81\xF4 |0
-<UEF4B> \x81\xF5 |0
-<UEF4C> \x81\xF6 |0
-<UEF4D> \x81\xF7 |0
-<UEF4E> \x81\xF8 |0
-<UEF4F> \x81\xF9 |0
-<UEF50> \x81\xFA |0
-<UEF51> \x81\xFB |0
-<UEF52> \x81\xFC |0
-<UEF53> \x81\xFD |0
-<UEF54> \x81\xFE |0
-<UEF55> \x82\x40 |0
-<UEF56> \x82\x41 |0
-<UEF57> \x82\x42 |0
-<UEF58> \x82\x43 |0
-<UEF59> \x82\x44 |0
-<UEF5A> \x82\x45 |0
-<UEF5B> \x82\x46 |0
-<UEF5C> \x82\x47 |0
-<UEF5D> \x82\x48 |0
-<UEF5E> \x82\x49 |0
-<UEF5F> \x82\x4A |0
-<UEF60> \x82\x4B |0
-<UEF61> \x82\x4C |0
-<UEF62> \x82\x4D |0
-<UEF63> \x82\x4E |0
-<UEF64> \x82\x4F |0
-<UEF65> \x82\x50 |0
-<UEF66> \x82\x51 |0
-<UEF67> \x82\x52 |0
-<UEF68> \x82\x53 |0
-<UEF69> \x82\x54 |0
-<UEF6A> \x82\x55 |0
-<UEF6B> \x82\x56 |0
-<UEF6C> \x82\x57 |0
-<UEF6D> \x82\x58 |0
-<UEF6E> \x82\x59 |0
-<UEF6F> \x82\x5A |0
-<UEF70> \x82\x5B |0
-<UEF71> \x82\x5C |0
-<UEF72> \x82\x5D |0
-<UEF73> \x82\x5E |0
-<UEF74> \x82\x5F |0
-<UEF75> \x82\x60 |0
-<UEF76> \x82\x61 |0
-<UEF77> \x82\x62 |0
-<UEF78> \x82\x63 |0
-<UEF79> \x82\x64 |0
-<UEF7A> \x82\x65 |0
-<UEF7B> \x82\x66 |0
-<UEF7C> \x82\x67 |0
-<UEF7D> \x82\x68 |0
-<UEF7E> \x82\x69 |0
-<UEF7F> \x82\x6A |0
-<UEF80> \x82\x6B |0
-<UEF81> \x82\x6C |0
-<UEF82> \x82\x6D |0
-<UEF83> \x82\x6E |0
-<UEF84> \x82\x6F |0
-<UEF85> \x82\x70 |0
-<UEF86> \x82\x71 |0
-<UEF87> \x82\x72 |0
-<UEF88> \x82\x73 |0
-<UEF89> \x82\x74 |0
-<UEF8A> \x82\x75 |0
-<UEF8B> \x82\x76 |0
-<UEF8C> \x82\x77 |0
-<UEF8D> \x82\x78 |0
-<UEF8E> \x82\x79 |0
-<UEF8F> \x82\x7A |0
-<UEF90> \x82\x7B |0
-<UEF91> \x82\x7C |0
-<UEF92> \x82\x7D |0
-<UEF93> \x82\x7E |0
-<UEF94> \x82\xA1 |0
-<UEF95> \x82\xA2 |0
-<UEF96> \x82\xA3 |0
-<UEF97> \x82\xA4 |0
-<UEF98> \x82\xA5 |0
-<UEF99> \x82\xA6 |0
-<UEF9A> \x82\xA7 |0
-<UEF9B> \x82\xA8 |0
-<UEF9C> \x82\xA9 |0
-<UEF9D> \x82\xAA |0
-<UEF9E> \x82\xAB |0
-<UEF9F> \x82\xAC |0
-<UEFA0> \x82\xAD |0
-<UEFA1> \x82\xAE |0
-<UEFA2> \x82\xAF |0
-<UEFA3> \x82\xB0 |0
-<UEFA4> \x82\xB1 |0
-<UEFA5> \x82\xB2 |0
-<UEFA6> \x82\xB3 |0
-<UEFA7> \x82\xB4 |0
-<UEFA8> \x82\xB5 |0
-<UEFA9> \x82\xB6 |0
-<UEFAA> \x82\xB7 |0
-<UEFAB> \x82\xB8 |0
-<UEFAC> \x82\xB9 |0
-<UEFAD> \x82\xBA |0
-<UEFAE> \x82\xBB |0
-<UEFAF> \x82\xBC |0
-<UEFB0> \x82\xBD |0
-<UEFB1> \x82\xBE |0
-<UEFB2> \x82\xBF |0
-<UEFB3> \x82\xC0 |0
-<UEFB4> \x82\xC1 |0
-<UEFB5> \x82\xC2 |0
-<UEFB6> \x82\xC3 |0
-<UEFB7> \x82\xC4 |0
-<UEFB8> \x82\xC5 |0
-<UEFB9> \x82\xC6 |0
-<UEFBA> \x82\xC7 |0
-<UEFBB> \x82\xC8 |0
-<UEFBC> \x82\xC9 |0
-<UEFBD> \x82\xCA |0
-<UEFBE> \x82\xCB |0
-<UEFBF> \x82\xCC |0
-<UEFC0> \x82\xCD |0
-<UEFC1> \x82\xCE |0
-<UEFC2> \x82\xCF |0
-<UEFC3> \x82\xD0 |0
-<UEFC4> \x82\xD1 |0
-<UEFC5> \x82\xD2 |0
-<UEFC6> \x82\xD3 |0
-<UEFC7> \x82\xD4 |0
-<UEFC8> \x82\xD5 |0
-<UEFC9> \x82\xD6 |0
-<UEFCA> \x82\xD7 |0
-<UEFCB> \x82\xD8 |0
-<UEFCC> \x82\xD9 |0
-<UEFCD> \x82\xDA |0
-<UEFCE> \x82\xDB |0
-<UEFCF> \x82\xDC |0
-<UEFD0> \x82\xDD |0
-<UEFD1> \x82\xDE |0
-<UEFD2> \x82\xDF |0
-<UEFD3> \x82\xE0 |0
-<UEFD4> \x82\xE1 |0
-<UEFD5> \x82\xE2 |0
-<UEFD6> \x82\xE3 |0
-<UEFD7> \x82\xE4 |0
-<UEFD8> \x82\xE5 |0
-<UEFD9> \x82\xE6 |0
-<UEFDA> \x82\xE7 |0
-<UEFDB> \x82\xE8 |0
-<UEFDC> \x82\xE9 |0
-<UEFDD> \x82\xEA |0
-<UEFDE> \x82\xEB |0
-<UEFDF> \x82\xEC |0
-<UEFE0> \x82\xED |0
-<UEFE1> \x82\xEE |0
-<UEFE2> \x82\xEF |0
-<UEFE3> \x82\xF0 |0
-<UEFE4> \x82\xF1 |0
-<UEFE5> \x82\xF2 |0
-<UEFE6> \x82\xF3 |0
-<UEFE7> \x82\xF4 |0
-<UEFE8> \x82\xF5 |0
-<UEFE9> \x82\xF6 |0
-<UEFEA> \x82\xF7 |0
-<UEFEB> \x82\xF8 |0
-<UEFEC> \x82\xF9 |0
-<UEFED> \x82\xFA |0
-<UEFEE> \x82\xFB |0
-<UEFEF> \x82\xFC |0
-<UEFF0> \x82\xFD |0
-<UEFF1> \x82\xFE |0
-<UEFF2> \x83\x40 |0
-<UEFF3> \x83\x41 |0
-<UEFF4> \x83\x42 |0
-<UEFF5> \x83\x43 |0
-<UEFF6> \x83\x44 |0
-<UEFF7> \x83\x45 |0
-<UEFF8> \x83\x46 |0
-<UEFF9> \x83\x47 |0
-<UEFFA> \x83\x48 |0
-<UEFFB> \x83\x49 |0
-<UEFFC> \x83\x4A |0
-<UEFFD> \x83\x4B |0
-<UEFFE> \x83\x4C |0
-<UEFFF> \x83\x4D |0
-<UF000> \x83\x4E |0
-<UF001> \x83\x4F |0
-<UF002> \x83\x50 |0
-<UF003> \x83\x51 |0
-<UF004> \x83\x52 |0
-<UF005> \x83\x53 |0
-<UF006> \x83\x54 |0
-<UF007> \x83\x55 |0
-<UF008> \x83\x56 |0
-<UF009> \x83\x57 |0
-<UF00A> \x83\x58 |0
-<UF00B> \x83\x59 |0
-<UF00C> \x83\x5A |0
-<UF00D> \x83\x5B |0
-<UF00E> \x83\x5C |0
-<UF00F> \x83\x5D |0
-<UF010> \x83\x5E |0
-<UF011> \x83\x5F |0
-<UF012> \x83\x60 |0
-<UF013> \x83\x61 |0
-<UF014> \x83\x62 |0
-<UF015> \x83\x63 |0
-<UF016> \x83\x64 |0
-<UF017> \x83\x65 |0
-<UF018> \x83\x66 |0
-<UF019> \x83\x67 |0
-<UF01A> \x83\x68 |0
-<UF01B> \x83\x69 |0
-<UF01C> \x83\x6A |0
-<UF01D> \x83\x6B |0
-<UF01E> \x83\x6C |0
-<UF01F> \x83\x6D |0
-<UF020> \x83\x6E |0
-<UF021> \x83\x6F |0
-<UF022> \x83\x70 |0
-<UF023> \x83\x71 |0
-<UF024> \x83\x72 |0
-<UF025> \x83\x73 |0
-<UF026> \x83\x74 |0
-<UF027> \x83\x75 |0
-<UF028> \x83\x76 |0
-<UF029> \x83\x77 |0
-<UF02A> \x83\x78 |0
-<UF02B> \x83\x79 |0
-<UF02C> \x83\x7A |0
-<UF02D> \x83\x7B |0
-<UF02E> \x83\x7C |0
-<UF02F> \x83\x7D |0
-<UF030> \x83\x7E |0
-<UF031> \x83\xA1 |0
-<UF032> \x83\xA2 |0
-<UF033> \x83\xA3 |0
-<UF034> \x83\xA4 |0
-<UF035> \x83\xA5 |0
-<UF036> \x83\xA6 |0
-<UF037> \x83\xA7 |0
-<UF038> \x83\xA8 |0
-<UF039> \x83\xA9 |0
-<UF03A> \x83\xAA |0
-<UF03B> \x83\xAB |0
-<UF03C> \x83\xAC |0
-<UF03D> \x83\xAD |0
-<UF03E> \x83\xAE |0
-<UF03F> \x83\xAF |0
-<UF040> \x83\xB0 |0
-<UF041> \x83\xB1 |0
-<UF042> \x83\xB2 |0
-<UF043> \x83\xB3 |0
-<UF044> \x83\xB4 |0
-<UF045> \x83\xB5 |0
-<UF046> \x83\xB6 |0
-<UF047> \x83\xB7 |0
-<UF048> \x83\xB8 |0
-<UF049> \x83\xB9 |0
-<UF04A> \x83\xBA |0
-<UF04B> \x83\xBB |0
-<UF04C> \x83\xBC |0
-<UF04D> \x83\xBD |0
-<UF04E> \x83\xBE |0
-<UF04F> \x83\xBF |0
-<UF050> \x83\xC0 |0
-<UF051> \x83\xC1 |0
-<UF052> \x83\xC2 |0
-<UF053> \x83\xC3 |0
-<UF054> \x83\xC4 |0
-<UF055> \x83\xC5 |0
-<UF056> \x83\xC6 |0
-<UF057> \x83\xC7 |0
-<UF058> \x83\xC8 |0
-<UF059> \x83\xC9 |0
-<UF05A> \x83\xCA |0
-<UF05B> \x83\xCB |0
-<UF05C> \x83\xCC |0
-<UF05D> \x83\xCD |0
-<UF05E> \x83\xCE |0
-<UF05F> \x83\xCF |0
-<UF060> \x83\xD0 |0
-<UF061> \x83\xD1 |0
-<UF062> \x83\xD2 |0
-<UF063> \x83\xD3 |0
-<UF064> \x83\xD4 |0
-<UF065> \x83\xD5 |0
-<UF066> \x83\xD6 |0
-<UF067> \x83\xD7 |0
-<UF068> \x83\xD8 |0
-<UF069> \x83\xD9 |0
-<UF06A> \x83\xDA |0
-<UF06B> \x83\xDB |0
-<UF06C> \x83\xDC |0
-<UF06D> \x83\xDD |0
-<UF06E> \x83\xDE |0
-<UF06F> \x83\xDF |0
-<UF070> \x83\xE0 |0
-<UF071> \x83\xE1 |0
-<UF072> \x83\xE2 |0
-<UF073> \x83\xE3 |0
-<UF074> \x83\xE4 |0
-<UF075> \x83\xE5 |0
-<UF076> \x83\xE6 |0
-<UF077> \x83\xE7 |0
-<UF078> \x83\xE8 |0
-<UF079> \x83\xE9 |0
-<UF07A> \x83\xEA |0
-<UF07B> \x83\xEB |0
-<UF07C> \x83\xEC |0
-<UF07D> \x83\xED |0
-<UF07E> \x83\xEE |0
-<UF07F> \x83\xEF |0
-<UF080> \x83\xF0 |0
-<UF081> \x83\xF1 |0
-<UF082> \x83\xF2 |0
-<UF083> \x83\xF3 |0
-<UF084> \x83\xF4 |0
-<UF085> \x83\xF5 |0
-<UF086> \x83\xF6 |0
-<UF087> \x83\xF7 |0
-<UF088> \x83\xF8 |0
-<UF089> \x83\xF9 |0
-<UF08A> \x83\xFA |0
-<UF08B> \x83\xFB |0
-<UF08C> \x83\xFC |0
-<UF08D> \x83\xFD |0
-<UF08E> \x83\xFE |0
-<UF08F> \x84\x40 |0
-<UF090> \x84\x41 |0
-<UF091> \x84\x42 |0
-<UF092> \x84\x43 |0
-<UF093> \x84\x44 |0
-<UF094> \x84\x45 |0
-<UF095> \x84\x46 |0
-<UF096> \x84\x47 |0
-<UF097> \x84\x48 |0
-<UF098> \x84\x49 |0
-<UF099> \x84\x4A |0
-<UF09A> \x84\x4B |0
-<UF09B> \x84\x4C |0
-<UF09C> \x84\x4D |0
-<UF09D> \x84\x4E |0
-<UF09E> \x84\x4F |0
-<UF09F> \x84\x50 |0
-<UF0A0> \x84\x51 |0
-<UF0A1> \x84\x52 |0
-<UF0A2> \x84\x53 |0
-<UF0A3> \x84\x54 |0
-<UF0A4> \x84\x55 |0
-<UF0A5> \x84\x56 |0
-<UF0A6> \x84\x57 |0
-<UF0A7> \x84\x58 |0
-<UF0A8> \x84\x59 |0
-<UF0A9> \x84\x5A |0
-<UF0AA> \x84\x5B |0
-<UF0AB> \x84\x5C |0
-<UF0AC> \x84\x5D |0
-<UF0AD> \x84\x5E |0
-<UF0AE> \x84\x5F |0
-<UF0AF> \x84\x60 |0
-<UF0B0> \x84\x61 |0
-<UF0B1> \x84\x62 |0
-<UF0B2> \x84\x63 |0
-<UF0B3> \x84\x64 |0
-<UF0B4> \x84\x65 |0
-<UF0B5> \x84\x66 |0
-<UF0B6> \x84\x67 |0
-<UF0B7> \x84\x68 |0
-<UF0B8> \x84\x69 |0
-<UF0B9> \x84\x6A |0
-<UF0BA> \x84\x6B |0
-<UF0BB> \x84\x6C |0
-<UF0BC> \x84\x6D |0
-<UF0BD> \x84\x6E |0
-<UF0BE> \x84\x6F |0
-<UF0BF> \x84\x70 |0
-<UF0C0> \x84\x71 |0
-<UF0C1> \x84\x72 |0
-<UF0C2> \x84\x73 |0
-<UF0C3> \x84\x74 |0
-<UF0C4> \x84\x75 |0
-<UF0C5> \x84\x76 |0
-<UF0C6> \x84\x77 |0
-<UF0C7> \x84\x78 |0
-<UF0C8> \x84\x79 |0
-<UF0C9> \x84\x7A |0
-<UF0CA> \x84\x7B |0
-<UF0CB> \x84\x7C |0
-<UF0CC> \x84\x7D |0
-<UF0CD> \x84\x7E |0
-<UF0CE> \x84\xA1 |0
-<UF0CF> \x84\xA2 |0
-<UF0D0> \x84\xA3 |0
-<UF0D1> \x84\xA4 |0
-<UF0D2> \x84\xA5 |0
-<UF0D3> \x84\xA6 |0
-<UF0D4> \x84\xA7 |0
-<UF0D5> \x84\xA8 |0
-<UF0D6> \x84\xA9 |0
-<UF0D7> \x84\xAA |0
-<UF0D8> \x84\xAB |0
-<UF0D9> \x84\xAC |0
-<UF0DA> \x84\xAD |0
-<UF0DB> \x84\xAE |0
-<UF0DC> \x84\xAF |0
-<UF0DD> \x84\xB0 |0
-<UF0DE> \x84\xB1 |0
-<UF0DF> \x84\xB2 |0
-<UF0E0> \x84\xB3 |0
-<UF0E1> \x84\xB4 |0
-<UF0E2> \x84\xB5 |0
-<UF0E3> \x84\xB6 |0
-<UF0E4> \x84\xB7 |0
-<UF0E5> \x84\xB8 |0
-<UF0E6> \x84\xB9 |0
-<UF0E7> \x84\xBA |0
-<UF0E8> \x84\xBB |0
-<UF0E9> \x84\xBC |0
-<UF0EA> \x84\xBD |0
-<UF0EB> \x84\xBE |0
-<UF0EC> \x84\xBF |0
-<UF0ED> \x84\xC0 |0
-<UF0EE> \x84\xC1 |0
-<UF0EF> \x84\xC2 |0
-<UF0F0> \x84\xC3 |0
-<UF0F1> \x84\xC4 |0
-<UF0F2> \x84\xC5 |0
-<UF0F3> \x84\xC6 |0
-<UF0F4> \x84\xC7 |0
-<UF0F5> \x84\xC8 |0
-<UF0F6> \x84\xC9 |0
-<UF0F7> \x84\xCA |0
-<UF0F8> \x84\xCB |0
-<UF0F9> \x84\xCC |0
-<UF0FA> \x84\xCD |0
-<UF0FB> \x84\xCE |0
-<UF0FC> \x84\xCF |0
-<UF0FD> \x84\xD0 |0
-<UF0FE> \x84\xD1 |0
-<UF0FF> \x84\xD2 |0
-<UF100> \x84\xD3 |0
-<UF101> \x84\xD4 |0
-<UF102> \x84\xD5 |0
-<UF103> \x84\xD6 |0
-<UF104> \x84\xD7 |0
-<UF105> \x84\xD8 |0
-<UF106> \x84\xD9 |0
-<UF107> \x84\xDA |0
-<UF108> \x84\xDB |0
-<UF109> \x84\xDC |0
-<UF10A> \x84\xDD |0
-<UF10B> \x84\xDE |0
-<UF10C> \x84\xDF |0
-<UF10D> \x84\xE0 |0
-<UF10E> \x84\xE1 |0
-<UF10F> \x84\xE2 |0
-<UF110> \x84\xE3 |0
-<UF111> \x84\xE4 |0
-<UF112> \x84\xE5 |0
-<UF113> \x84\xE6 |0
-<UF114> \x84\xE7 |0
-<UF115> \x84\xE8 |0
-<UF116> \x84\xE9 |0
-<UF117> \x84\xEA |0
-<UF118> \x84\xEB |0
-<UF119> \x84\xEC |0
-<UF11A> \x84\xED |0
-<UF11B> \x84\xEE |0
-<UF11C> \x84\xEF |0
-<UF11D> \x84\xF0 |0
-<UF11E> \x84\xF1 |0
-<UF11F> \x84\xF2 |0
-<UF120> \x84\xF3 |0
-<UF121> \x84\xF4 |0
-<UF122> \x84\xF5 |0
-<UF123> \x84\xF6 |0
-<UF124> \x84\xF7 |0
-<UF125> \x84\xF8 |0
-<UF126> \x84\xF9 |0
-<UF127> \x84\xFA |0
-<UF128> \x84\xFB |0
-<UF129> \x84\xFC |0
-<UF12A> \x84\xFD |0
-<UF12B> \x84\xFE |0
-<UF12C> \x85\x40 |0
-<UF12D> \x85\x41 |0
-<UF12E> \x85\x42 |0
-<UF12F> \x85\x43 |0
-<UF130> \x85\x44 |0
-<UF131> \x85\x45 |0
-<UF132> \x85\x46 |0
-<UF133> \x85\x47 |0
-<UF134> \x85\x48 |0
-<UF135> \x85\x49 |0
-<UF136> \x85\x4A |0
-<UF137> \x85\x4B |0
-<UF138> \x85\x4C |0
-<UF139> \x85\x4D |0
-<UF13A> \x85\x4E |0
-<UF13B> \x85\x4F |0
-<UF13C> \x85\x50 |0
-<UF13D> \x85\x51 |0
-<UF13E> \x85\x52 |0
-<UF13F> \x85\x53 |0
-<UF140> \x85\x54 |0
-<UF141> \x85\x55 |0
-<UF142> \x85\x56 |0
-<UF143> \x85\x57 |0
-<UF144> \x85\x58 |0
-<UF145> \x85\x59 |0
-<UF146> \x85\x5A |0
-<UF147> \x85\x5B |0
-<UF148> \x85\x5C |0
-<UF149> \x85\x5D |0
-<UF14A> \x85\x5E |0
-<UF14B> \x85\x5F |0
-<UF14C> \x85\x60 |0
-<UF14D> \x85\x61 |0
-<UF14E> \x85\x62 |0
-<UF14F> \x85\x63 |0
-<UF150> \x85\x64 |0
-<UF151> \x85\x65 |0
-<UF152> \x85\x66 |0
-<UF153> \x85\x67 |0
-<UF154> \x85\x68 |0
-<UF155> \x85\x69 |0
-<UF156> \x85\x6A |0
-<UF157> \x85\x6B |0
-<UF158> \x85\x6C |0
-<UF159> \x85\x6D |0
-<UF15A> \x85\x6E |0
-<UF15B> \x85\x6F |0
-<UF15C> \x85\x70 |0
-<UF15D> \x85\x71 |0
-<UF15E> \x85\x72 |0
-<UF15F> \x85\x73 |0
-<UF160> \x85\x74 |0
-<UF161> \x85\x75 |0
-<UF162> \x85\x76 |0
-<UF163> \x85\x77 |0
-<UF164> \x85\x78 |0
-<UF165> \x85\x79 |0
-<UF166> \x85\x7A |0
-<UF167> \x85\x7B |0
-<UF168> \x85\x7C |0
-<UF169> \x85\x7D |0
-<UF16A> \x85\x7E |0
-<UF16B> \x85\xA1 |0
-<UF16C> \x85\xA2 |0
-<UF16D> \x85\xA3 |0
-<UF16E> \x85\xA4 |0
-<UF16F> \x85\xA5 |0
-<UF170> \x85\xA6 |0
-<UF171> \x85\xA7 |0
-<UF172> \x85\xA8 |0
-<UF173> \x85\xA9 |0
-<UF174> \x85\xAA |0
-<UF175> \x85\xAB |0
-<UF176> \x85\xAC |0
-<UF177> \x85\xAD |0
-<UF178> \x85\xAE |0
-<UF179> \x85\xAF |0
-<UF17A> \x85\xB0 |0
-<UF17B> \x85\xB1 |0
-<UF17C> \x85\xB2 |0
-<UF17D> \x85\xB3 |0
-<UF17E> \x85\xB4 |0
-<UF17F> \x85\xB5 |0
-<UF180> \x85\xB6 |0
-<UF181> \x85\xB7 |0
-<UF182> \x85\xB8 |0
-<UF183> \x85\xB9 |0
-<UF184> \x85\xBA |0
-<UF185> \x85\xBB |0
-<UF186> \x85\xBC |0
-<UF187> \x85\xBD |0
-<UF188> \x85\xBE |0
-<UF189> \x85\xBF |0
-<UF18A> \x85\xC0 |0
-<UF18B> \x85\xC1 |0
-<UF18C> \x85\xC2 |0
-<UF18D> \x85\xC3 |0
-<UF18E> \x85\xC4 |0
-<UF18F> \x85\xC5 |0
-<UF190> \x85\xC6 |0
-<UF191> \x85\xC7 |0
-<UF192> \x85\xC8 |0
-<UF193> \x85\xC9 |0
-<UF194> \x85\xCA |0
-<UF195> \x85\xCB |0
-<UF196> \x85\xCC |0
-<UF197> \x85\xCD |0
-<UF198> \x85\xCE |0
-<UF199> \x85\xCF |0
-<UF19A> \x85\xD0 |0
-<UF19B> \x85\xD1 |0
-<UF19C> \x85\xD2 |0
-<UF19D> \x85\xD3 |0
-<UF19E> \x85\xD4 |0
-<UF19F> \x85\xD5 |0
-<UF1A0> \x85\xD6 |0
-<UF1A1> \x85\xD7 |0
-<UF1A2> \x85\xD8 |0
-<UF1A3> \x85\xD9 |0
-<UF1A4> \x85\xDA |0
-<UF1A5> \x85\xDB |0
-<UF1A6> \x85\xDC |0
-<UF1A7> \x85\xDD |0
-<UF1A8> \x85\xDE |0
-<UF1A9> \x85\xDF |0
-<UF1AA> \x85\xE0 |0
-<UF1AB> \x85\xE1 |0
-<UF1AC> \x85\xE2 |0
-<UF1AD> \x85\xE3 |0
-<UF1AE> \x85\xE4 |0
-<UF1AF> \x85\xE5 |0
-<UF1B0> \x85\xE6 |0
-<UF1B1> \x85\xE7 |0
-<UF1B2> \x85\xE8 |0
-<UF1B3> \x85\xE9 |0
-<UF1B4> \x85\xEA |0
-<UF1B5> \x85\xEB |0
-<UF1B6> \x85\xEC |0
-<UF1B7> \x85\xED |0
-<UF1B8> \x85\xEE |0
-<UF1B9> \x85\xEF |0
-<UF1BA> \x85\xF0 |0
-<UF1BB> \x85\xF1 |0
-<UF1BC> \x85\xF2 |0
-<UF1BD> \x85\xF3 |0
-<UF1BE> \x85\xF4 |0
-<UF1BF> \x85\xF5 |0
-<UF1C0> \x85\xF6 |0
-<UF1C1> \x85\xF7 |0
-<UF1C2> \x85\xF8 |0
-<UF1C3> \x85\xF9 |0
-<UF1C4> \x85\xFA |0
-<UF1C5> \x85\xFB |0
-<UF1C6> \x85\xFC |0
-<UF1C7> \x85\xFD |0
-<UF1C8> \x85\xFE |0
-<UF1C9> \x86\x40 |0
-<UF1CA> \x86\x41 |0
-<UF1CB> \x86\x42 |0
-<UF1CC> \x86\x43 |0
-<UF1CD> \x86\x44 |0
-<UF1CE> \x86\x45 |0
-<UF1CF> \x86\x46 |0
-<UF1D0> \x86\x47 |0
-<UF1D1> \x86\x48 |0
-<UF1D2> \x86\x49 |0
-<UF1D3> \x86\x4A |0
-<UF1D4> \x86\x4B |0
-<UF1D5> \x86\x4C |0
-<UF1D6> \x86\x4D |0
-<UF1D7> \x86\x4E |0
-<UF1D8> \x86\x4F |0
-<UF1D9> \x86\x50 |0
-<UF1DA> \x86\x51 |0
-<UF1DB> \x86\x52 |0
-<UF1DC> \x86\x53 |0
-<UF1DD> \x86\x54 |0
-<UF1DE> \x86\x55 |0
-<UF1DF> \x86\x56 |0
-<UF1E0> \x86\x57 |0
-<UF1E1> \x86\x58 |0
-<UF1E2> \x86\x59 |0
-<UF1E3> \x86\x5A |0
-<UF1E4> \x86\x5B |0
-<UF1E5> \x86\x5C |0
-<UF1E6> \x86\x5D |0
-<UF1E7> \x86\x5E |0
-<UF1E8> \x86\x5F |0
-<UF1E9> \x86\x60 |0
-<UF1EA> \x86\x61 |0
-<UF1EB> \x86\x62 |0
-<UF1EC> \x86\x63 |0
-<UF1ED> \x86\x64 |0
-<UF1EE> \x86\x65 |0
-<UF1EF> \x86\x66 |0
-<UF1F0> \x86\x67 |0
-<UF1F1> \x86\x68 |0
-<UF1F2> \x86\x69 |0
-<UF1F3> \x86\x6A |0
-<UF1F4> \x86\x6B |0
-<UF1F5> \x86\x6C |0
-<UF1F6> \x86\x6D |0
-<UF1F7> \x86\x6E |0
-<UF1F8> \x86\x6F |0
-<UF1F9> \x86\x70 |0
-<UF1FA> \x86\x71 |0
-<UF1FB> \x86\x72 |0
-<UF1FC> \x86\x73 |0
-<UF1FD> \x86\x74 |0
-<UF1FE> \x86\x75 |0
-<UF1FF> \x86\x76 |0
-<UF200> \x86\x77 |0
-<UF201> \x86\x78 |0
-<UF202> \x86\x79 |0
-<UF203> \x86\x7A |0
-<UF204> \x86\x7B |0
-<UF205> \x86\x7C |0
-<UF206> \x86\x7D |0
-<UF207> \x86\x7E |0
-<UF208> \x86\xA1 |0
-<UF209> \x86\xA2 |0
-<UF20A> \x86\xA3 |0
-<UF20B> \x86\xA4 |0
-<UF20C> \x86\xA5 |0
-<UF20D> \x86\xA6 |0
-<UF20E> \x86\xA7 |0
-<UF20F> \x86\xA8 |0
-<UF210> \x86\xA9 |0
-<UF211> \x86\xAA |0
-<UF212> \x86\xAB |0
-<UF213> \x86\xAC |0
-<UF214> \x86\xAD |0
-<UF215> \x86\xAE |0
-<UF216> \x86\xAF |0
-<UF217> \x86\xB0 |0
-<UF218> \x86\xB1 |0
-<UF219> \x86\xB2 |0
-<UF21A> \x86\xB3 |0
-<UF21B> \x86\xB4 |0
-<UF21C> \x86\xB5 |0
-<UF21D> \x86\xB6 |0
-<UF21E> \x86\xB7 |0
-<UF21F> \x86\xB8 |0
-<UF220> \x86\xB9 |0
-<UF221> \x86\xBA |0
-<UF222> \x86\xBB |0
-<UF223> \x86\xBC |0
-<UF224> \x86\xBD |0
-<UF225> \x86\xBE |0
-<UF226> \x86\xBF |0
-<UF227> \x86\xC0 |0
-<UF228> \x86\xC1 |0
-<UF229> \x86\xC2 |0
-<UF22A> \x86\xC3 |0
-<UF22B> \x86\xC4 |0
-<UF22C> \x86\xC5 |0
-<UF22D> \x86\xC6 |0
-<UF22E> \x86\xC7 |0
-<UF22F> \x86\xC8 |0
-<UF230> \x86\xC9 |0
-<UF231> \x86\xCA |0
-<UF232> \x86\xCB |0
-<UF233> \x86\xCC |0
-<UF234> \x86\xCD |0
-<UF235> \x86\xCE |0
-<UF236> \x86\xCF |0
-<UF237> \x86\xD0 |0
-<UF238> \x86\xD1 |0
-<UF239> \x86\xD2 |0
-<UF23A> \x86\xD3 |0
-<UF23B> \x86\xD4 |0
-<UF23C> \x86\xD5 |0
-<UF23D> \x86\xD6 |0
-<UF23E> \x86\xD7 |0
-<UF23F> \x86\xD8 |0
-<UF240> \x86\xD9 |0
-<UF241> \x86\xDA |0
-<UF242> \x86\xDB |0
-<UF243> \x86\xDC |0
-<UF244> \x86\xDD |0
-<UF245> \x86\xDE |0
-<UF246> \x86\xDF |0
-<UF247> \x86\xE0 |0
-<UF248> \x86\xE1 |0
-<UF249> \x86\xE2 |0
-<UF24A> \x86\xE3 |0
-<UF24B> \x86\xE4 |0
-<UF24C> \x86\xE5 |0
-<UF24D> \x86\xE6 |0
-<UF24E> \x86\xE7 |0
-<UF24F> \x86\xE8 |0
-<UF250> \x86\xE9 |0
-<UF251> \x86\xEA |0
-<UF252> \x86\xEB |0
-<UF253> \x86\xEC |0
-<UF254> \x86\xED |0
-<UF255> \x86\xEE |0
-<UF256> \x86\xEF |0
-<UF257> \x86\xF0 |0
-<UF258> \x86\xF1 |0
-<UF259> \x86\xF2 |0
-<UF25A> \x86\xF3 |0
-<UF25B> \x86\xF4 |0
-<UF25C> \x86\xF5 |0
-<UF25D> \x86\xF6 |0
-<UF25E> \x86\xF7 |0
-<UF25F> \x86\xF8 |0
-<UF260> \x86\xF9 |0
-<UF261> \x86\xFA |0
-<UF262> \x86\xFB |0
-<UF263> \x86\xFC |0
-<UF264> \x86\xFD |0
-<UF265> \x86\xFE |0
-<UF266> \x87\x40 |0
-<UF267> \x87\x41 |0
-<UF268> \x87\x42 |0
-<UF269> \x87\x43 |0
-<UF26A> \x87\x44 |0
-<UF26B> \x87\x45 |0
-<UF26C> \x87\x46 |0
-<UF26D> \x87\x47 |0
-<UF26E> \x87\x48 |0
-<UF26F> \x87\x49 |0
-<UF270> \x87\x4A |0
-<UF271> \x87\x4B |0
-<UF272> \x87\x4C |0
-<UF273> \x87\x4D |0
-<UF274> \x87\x4E |0
-<UF275> \x87\x4F |0
-<UF276> \x87\x50 |0
-<UF277> \x87\x51 |0
-<UF278> \x87\x52 |0
-<UF279> \x87\x53 |0
-<UF27A> \x87\x54 |0
-<UF27B> \x87\x55 |0
-<UF27C> \x87\x56 |0
-<UF27D> \x87\x57 |0
-<UF27E> \x87\x58 |0
-<UF27F> \x87\x59 |0
-<UF280> \x87\x5A |0
-<UF281> \x87\x5B |0
-<UF282> \x87\x5C |0
-<UF283> \x87\x5D |0
-<UF284> \x87\x5E |0
-<UF285> \x87\x5F |0
-<UF286> \x87\x60 |0
-<UF287> \x87\x61 |0
-<UF288> \x87\x62 |0
-<UF289> \x87\x63 |0
-<UF28A> \x87\x64 |0
-<UF28B> \x87\x65 |0
-<UF28C> \x87\x66 |0
-<UF28D> \x87\x67 |0
-<UF28E> \x87\x68 |0
-<UF28F> \x87\x69 |0
-<UF290> \x87\x6A |0
-<UF291> \x87\x6B |0
-<UF292> \x87\x6C |0
-<UF293> \x87\x6D |0
-<UF294> \x87\x6E |0
-<UF295> \x87\x6F |0
-<UF296> \x87\x70 |0
-<UF297> \x87\x71 |0
-<UF298> \x87\x72 |0
-<UF299> \x87\x73 |0
-<UF29A> \x87\x74 |0
-<UF29B> \x87\x75 |0
-<UF29C> \x87\x76 |0
-<UF29D> \x87\x77 |0
-<UF29E> \x87\x78 |0
-<UF29F> \x87\x79 |0
-<UF2A0> \x87\x7A |0
-<UF2A1> \x87\x7B |0
-<UF2A2> \x87\x7C |0
-<UF2A3> \x87\x7D |0
-<UF2A4> \x87\x7E |0
-<UF2A5> \x87\xA1 |0
-<UF2A6> \x87\xA2 |0
-<UF2A7> \x87\xA3 |0
-<UF2A8> \x87\xA4 |0
-<UF2A9> \x87\xA5 |0
-<UF2AA> \x87\xA6 |0
-<UF2AB> \x87\xA7 |0
-<UF2AC> \x87\xA8 |0
-<UF2AD> \x87\xA9 |0
-<UF2AE> \x87\xAA |0
-<UF2AF> \x87\xAB |0
-<UF2B0> \x87\xAC |0
-<UF2B1> \x87\xAD |0
-<UF2B2> \x87\xAE |0
-<UF2B3> \x87\xAF |0
-<UF2B4> \x87\xB0 |0
-<UF2B5> \x87\xB1 |0
-<UF2B6> \x87\xB2 |0
-<UF2B7> \x87\xB3 |0
-<UF2B8> \x87\xB4 |0
-<UF2B9> \x87\xB5 |0
-<UF2BA> \x87\xB6 |0
-<UF2BB> \x87\xB7 |0
-<UF2BC> \x87\xB8 |0
-<UF2BD> \x87\xB9 |0
-<UF2BE> \x87\xBA |0
-<UF2BF> \x87\xBB |0
-<UF2C0> \x87\xBC |0
-<UF2C1> \x87\xBD |0
-<UF2C2> \x87\xBE |0
-<UF2C3> \x87\xBF |0
-<UF2C4> \x87\xC0 |0
-<UF2C5> \x87\xC1 |0
-<UF2C6> \x87\xC2 |0
-<UF2C7> \x87\xC3 |0
-<UF2C8> \x87\xC4 |0
-<UF2C9> \x87\xC5 |0
-<UF2CA> \x87\xC6 |0
-<UF2CB> \x87\xC7 |0
-<UF2CC> \x87\xC8 |0
-<UF2CD> \x87\xC9 |0
-<UF2CE> \x87\xCA |0
-<UF2CF> \x87\xCB |0
-<UF2D0> \x87\xCC |0
-<UF2D1> \x87\xCD |0
-<UF2D2> \x87\xCE |0
-<UF2D3> \x87\xCF |0
-<UF2D4> \x87\xD0 |0
-<UF2D5> \x87\xD1 |0
-<UF2D6> \x87\xD2 |0
-<UF2D7> \x87\xD3 |0
-<UF2D8> \x87\xD4 |0
-<UF2D9> \x87\xD5 |0
-<UF2DA> \x87\xD6 |0
-<UF2DB> \x87\xD7 |0
-<UF2DC> \x87\xD8 |0
-<UF2DD> \x87\xD9 |0
-<UF2DE> \x87\xDA |0
-<UF2DF> \x87\xDB |0
-<UF2E0> \x87\xDC |0
-<UF2E1> \x87\xDD |0
-<UF2E2> \x87\xDE |0
-<UF2E3> \x87\xDF |0
-<UF2E4> \x87\xE0 |0
-<UF2E5> \x87\xE1 |0
-<UF2E6> \x87\xE2 |0
-<UF2E7> \x87\xE3 |0
-<UF2E8> \x87\xE4 |0
-<UF2E9> \x87\xE5 |0
-<UF2EA> \x87\xE6 |0
-<UF2EB> \x87\xE7 |0
-<UF2EC> \x87\xE8 |0
-<UF2ED> \x87\xE9 |0
-<UF2EE> \x87\xEA |0
-<UF2EF> \x87\xEB |0
-<UF2F0> \x87\xEC |0
-<UF2F1> \x87\xED |0
-<UF2F2> \x87\xEE |0
-<UF2F3> \x87\xEF |0
-<UF2F4> \x87\xF0 |0
-<UF2F5> \x87\xF1 |0
-<UF2F6> \x87\xF2 |0
-<UF2F7> \x87\xF3 |0
-<UF2F8> \x87\xF4 |0
-<UF2F9> \x87\xF5 |0
-<UF2FA> \x87\xF6 |0
-<UF2FB> \x87\xF7 |0
-<UF2FC> \x87\xF8 |0
-<UF2FD> \x87\xF9 |0
-<UF2FE> \x87\xFA |0
-<UF2FF> \x87\xFB |0
-<UF300> \x87\xFC |0
-<UF301> \x87\xFD |0
-<UF302> \x87\xFE |0
-<UF303> \x88\x40 |0
-<UF304> \x88\x41 |0
-<UF305> \x88\x42 |0
-<UF306> \x88\x43 |0
-<UF307> \x88\x44 |0
-<UF308> \x88\x45 |0
-<UF309> \x88\x46 |0
-<UF30A> \x88\x47 |0
-<UF30B> \x88\x48 |0
-<UF30C> \x88\x49 |0
-<UF30D> \x88\x4A |0
-<UF30E> \x88\x4B |0
-<UF30F> \x88\x4C |0
-<UF310> \x88\x4D |0
-<UF311> \x88\x4E |0
-<UF312> \x88\x4F |0
-<UF313> \x88\x50 |0
-<UF314> \x88\x51 |0
-<UF315> \x88\x52 |0
-<UF316> \x88\x53 |0
-<UF317> \x88\x54 |0
-<UF318> \x88\x55 |0
-<UF319> \x88\x56 |1
-<UF31A> \x88\x57 |1
-<UF31B> \x88\x58 |1
-<UF31C> \x88\x59 |1
-<UF31D> \x88\x5A |1
-<UF31E> \x88\x5B |1
-<UF31F> \x88\x5C |1
-<UF320> \x88\x5D |1
-<UF321> \x88\x5E |1
-<UF322> \x88\x5F |1
-<UF323> \x88\x60 |1
-<UF324> \x88\x61 |1
-<UF325> \x88\x62 |0
-<UF326> \x88\x63 |1
-<UF327> \x88\x64 |0
-<UF328> \x88\x65 |1
-<UF329> \x88\x66 |1
-<UF32A> \x88\x67 |1
-<UF32B> \x88\x68 |1
-<UF32C> \x88\x69 |1
-<UF32D> \x88\x6A |1
-<UF32E> \x88\x6B |1
-<UF32F> \x88\x6C |1
-<UF330> \x88\x6D |1
-<UF331> \x88\x6E |1
-<UF332> \x88\x6F |1
-<UF333> \x88\x70 |1
-<UF334> \x88\x71 |1
-<UF335> \x88\x72 |1
-<UF336> \x88\x73 |1
-<UF337> \x88\x74 |1
-<UF338> \x88\x75 |1
-<UF339> \x88\x76 |1
-<UF33A> \x88\x77 |1
-<UF33B> \x88\x78 |1
-<UF33C> \x88\x79 |1
-<UF33D> \x88\x7A |1
-<UF33E> \x88\x7B |1
-<UF33F> \x88\x7C |1
-<UF340> \x88\x7D |1
-<UF341> \x88\x7E |1
-<UF342> \x88\xA1 |1
-<UF343> \x88\xA2 |1
-<UF344> \x88\xA3 |0
-<UF345> \x88\xA4 |1
-<UF346> \x88\xA5 |0
-<UF347> \x88\xA6 |1
-<UF348> \x88\xA7 |1
-<UF349> \x88\xA8 |1
-<UF34A> \x88\xA9 |0
-<UF34B> \x88\xAA |0
-<UF34C> \x88\xAB |0
-<UF34D> \x88\xAC |0
-<UF34E> \x88\xAD |0
-<UF34F> \x88\xAE |0
-<UF350> \x88\xAF |0
-<UF351> \x88\xB0 |0
-<UF352> \x88\xB1 |0
-<UF353> \x88\xB2 |0
-<UF354> \x88\xB3 |0
-<UF355> \x88\xB4 |0
-<UF356> \x88\xB5 |0
-<UF357> \x88\xB6 |0
-<UF358> \x88\xB7 |0
-<UF359> \x88\xB8 |0
-<UF35A> \x88\xB9 |0
-<UF35B> \x88\xBA |0
-<UF35C> \x88\xBB |0
-<UF35D> \x88\xBC |0
-<UF35E> \x88\xBD |0
-<UF35F> \x88\xBE |0
-<UF360> \x88\xBF |0
-<UF361> \x88\xC0 |0
-<UF362> \x88\xC1 |0
-<UF363> \x88\xC2 |0
-<UF364> \x88\xC3 |0
-<UF365> \x88\xC4 |0
-<UF366> \x88\xC5 |0
-<UF367> \x88\xC6 |0
-<UF368> \x88\xC7 |0
-<UF369> \x88\xC8 |0
-<UF36A> \x88\xC9 |0
-<UF36B> \x88\xCA |0
-<UF36C> \x88\xCB |0
-<UF36D> \x88\xCC |0
-<UF36E> \x88\xCD |0
-<UF36F> \x88\xCE |0
-<UF370> \x88\xCF |0
-<UF371> \x88\xD0 |0
-<UF372> \x88\xD1 |0
-<UF373> \x88\xD2 |0
-<UF374> \x88\xD3 |0
-<UF375> \x88\xD4 |0
-<UF376> \x88\xD5 |0
-<UF377> \x88\xD6 |0
-<UF378> \x88\xD7 |0
-<UF379> \x88\xD8 |0
-<UF37A> \x88\xD9 |0
-<UF37B> \x88\xDA |0
-<UF37C> \x88\xDB |0
-<UF37D> \x88\xDC |0
-<UF37E> \x88\xDD |0
-<UF37F> \x88\xDE |0
-<UF380> \x88\xDF |0
-<UF381> \x88\xE0 |0
-<UF382> \x88\xE1 |0
-<UF383> \x88\xE2 |0
-<UF384> \x88\xE3 |0
-<UF385> \x88\xE4 |0
-<UF386> \x88\xE5 |0
-<UF387> \x88\xE6 |0
-<UF388> \x88\xE7 |0
-<UF389> \x88\xE8 |0
-<UF38A> \x88\xE9 |0
-<UF38B> \x88\xEA |0
-<UF38C> \x88\xEB |0
-<UF38D> \x88\xEC |0
-<UF38E> \x88\xED |0
-<UF38F> \x88\xEE |0
-<UF390> \x88\xEF |0
-<UF391> \x88\xF0 |0
-<UF392> \x88\xF1 |0
-<UF393> \x88\xF2 |0
-<UF394> \x88\xF3 |0
-<UF395> \x88\xF4 |0
-<UF396> \x88\xF5 |0
-<UF397> \x88\xF6 |0
-<UF398> \x88\xF7 |0
-<UF399> \x88\xF8 |0
-<UF39A> \x88\xF9 |0
-<UF39B> \x88\xFA |0
-<UF39C> \x88\xFB |0
-<UF39D> \x88\xFC |0
-<UF39E> \x88\xFD |0
-<UF39F> \x88\xFE |0
-<UF3A0> \x89\x40 |0
-<UF3A1> \x89\x41 |0
-<UF3A2> \x89\x42 |0
-<UF3A3> \x89\x43 |1
-<UF3A4> \x89\x44 |0
-<UF3A5> \x89\x45 |0
-<UF3A6> \x89\x46 |1
-<UF3A7> \x89\x47 |1
-<UF3A8> \x89\x48 |1
-<UF3A9> \x89\x49 |1
-<UF3AA> \x89\x4A |0
-<UF3AB> \x89\x4B |0
-<UF3AC> \x89\x4C |0
-<UF3AD> \x89\x4D |1
-<UF3AE> \x89\x4E |1
-<UF3AF> \x89\x4F |1
-<UF3B0> \x89\x50 |1
-<UF3B1> \x89\x51 |1
-<UF3B2> \x89\x52 |1
-<UF3B3> \x89\x53 |1
-<UF3B4> \x89\x54 |1
-<UF3B5> \x89\x55 |1
-<UF3B6> \x89\x56 |1
-<UF3B7> \x89\x57 |1
-<UF3B8> \x89\x58 |1
-<UF3B9> \x89\x59 |1
-<UF3BA> \x89\x5A |1
-<UF3BB> \x89\x5B |1
-<UF3BC> \x89\x5C |1
-<UF3BD> \x89\x5D |1
-<UF3BE> \x89\x5E |1
-<UF3BF> \x89\x5F |1
-<UF3C0> \x89\x60 |1
-<UF3C1> \x89\x61 |1
-<UF3C2> \x89\x62 |1
-<UF3C3> \x89\x63 |1
-<UF3C4> \x89\x64 |1
-<UF3C5> \x89\x65 |1
-<UF3C6> \x89\x66 |1
-<UF3C7> \x89\x67 |1
-<UF3C8> \x89\x68 |1
-<UF3C9> \x89\x69 |1
-<UF3CA> \x89\x6A |1
-<UF3CB> \x89\x6B |1
-<UF3CC> \x89\x6C |1
-<UF3CD> \x89\x6D |1
-<UF3CE> \x89\x6E |1
-<UF3CF> \x89\x6F |1
-<UF3D0> \x89\x70 |1
-<UF3D1> \x89\x71 |1
-<UF3D2> \x89\x72 |1
-<UF3D3> \x89\x73 |1
-<UF3D4> \x89\x74 |1
-<UF3D5> \x89\x75 |1
-<UF3D6> \x89\x76 |1
-<UF3D7> \x89\x77 |1
-<UF3D8> \x89\x78 |1
-<UF3D9> \x89\x79 |1
-<UF3DA> \x89\x7A |1
-<UF3DB> \x89\x7B |1
-<UF3DC> \x89\x7C |1
-<UF3DD> \x89\x7D |1
-<UF3DE> \x89\x7E |1
-<UF3DF> \x89\xA1 |1
-<UF3E0> \x89\xA2 |1
-<UF3E1> \x89\xA3 |1
-<UF3E2> \x89\xA4 |1
-<UF3E3> \x89\xA5 |1
-<UF3E4> \x89\xA6 |1
-<UF3E5> \x89\xA7 |0
-<UF3E6> \x89\xA8 |0
-<UF3E7> \x89\xA9 |0
-<UF3E8> \x89\xAA |0
-<UF3E9> \x89\xAB |1
-<UF3EA> \x89\xAC |1
-<UF3EB> \x89\xAD |1
-<UF3EC> \x89\xAE |1
-<UF3ED> \x89\xAF |0
-<UF3EE> \x89\xB0 |1
-<UF3EF> \x89\xB1 |1
-<UF3F0> \x89\xB2 |0
-<UF3F1> \x89\xB3 |0
-<UF3F2> \x89\xB4 |0
-<UF3F3> \x89\xB5 |1
-<UF3F4> \x89\xB6 |1
-<UF3F5> \x89\xB7 |1
-<UF3F6> \x89\xB8 |1
-<UF3F7> \x89\xB9 |1
-<UF3F8> \x89\xBA |1
-<UF3F9> \x89\xBB |0
-<UF3FA> \x89\xBC |0
-<UF3FB> \x89\xBD |1
-<UF3FC> \x89\xBE |0
-<UF3FD> \x89\xBF |1
-<UF3FE> \x89\xC0 |0
-<UF3FF> \x89\xC1 |1
-<UF400> \x89\xC2 |1
-<UF401> \x89\xC3 |1
-<UF402> \x89\xC4 |0
-<UF403> \x89\xC5 |1
-<UF404> \x89\xC6 |1
-<UF405> \x89\xC7 |1
-<UF406> \x89\xC8 |1
-<UF407> \x89\xC9 |1
-<UF408> \x89\xCA |0
-<UF409> \x89\xCB |0
-<UF40A> \x89\xCC |0
-<UF40B> \x89\xCD |0
-<UF40C> \x89\xCE |1
-<UF40D> \x89\xCF |1
-<UF40E> \x89\xD0 |1
-<UF40F> \x89\xD1 |1
-<UF410> \x89\xD2 |1
-<UF411> \x89\xD3 |1
-<UF412> \x89\xD4 |1
-<UF413> \x89\xD5 |1
-<UF414> \x89\xD6 |1
-<UF415> \x89\xD7 |1
-<UF416> \x89\xD8 |1
-<UF417> \x89\xD9 |1
-<UF418> \x89\xDA |1
-<UF419> \x89\xDB |1
-<UF41A> \x89\xDC |1
-<UF41B> \x89\xDD |1
-<UF41C> \x89\xDE |1
-<UF41D> \x89\xDF |1
-<UF41E> \x89\xE0 |1
-<UF41F> \x89\xE1 |1
-<UF420> \x89\xE2 |1
-<UF421> \x89\xE3 |1
-<UF422> \x89\xE4 |1
-<UF423> \x89\xE5 |1
-<UF424> \x89\xE6 |1
-<UF425> \x89\xE7 |1
-<UF426> \x89\xE8 |1
-<UF427> \x89\xE9 |1
-<UF428> \x89\xEA |1
-<UF429> \x89\xEB |1
-<UF42A> \x89\xEC |1
-<UF42B> \x89\xED |1
-<UF42C> \x89\xEE |1
-<UF42D> \x89\xEF |1
-<UF42E> \x89\xF0 |1
-<UF42F> \x89\xF1 |1
-<UF430> \x89\xF2 |1
-<UF431> \x89\xF3 |1
-<UF432> \x89\xF4 |1
-<UF433> \x89\xF5 |1
-<UF434> \x89\xF6 |1
-<UF435> \x89\xF7 |1
-<UF436> \x89\xF8 |1
-<UF437> \x89\xF9 |1
-<UF438> \x89\xFA |1
-<UF439> \x89\xFB |1
-<UF43A> \x89\xFC |1
-<UF43B> \x89\xFD |1
-<UF43C> \x89\xFE |1
-<UF43D> \x8A\x40 |0
-<UF43E> \x8A\x41 |1
-<UF43F> \x8A\x42 |0
-<UF440> \x8A\x43 |0
-<UF441> \x8A\x44 |0
-<UF442> \x8A\x45 |0
-<UF443> \x8A\x46 |1
-<UF444> \x8A\x47 |0
-<UF445> \x8A\x48 |1
-<UF446> \x8A\x49 |0
-<UF447> \x8A\x4A |1
-<UF448> \x8A\x4B |0
-<UF449> \x8A\x4C |0
-<UF44A> \x8A\x4D |1
-<UF44B> \x8A\x4E |0
-<UF44C> \x8A\x4F |1
-<UF44D> \x8A\x50 |0
-<UF44E> \x8A\x51 |1
-<UF44F> \x8A\x52 |1
-<UF450> \x8A\x53 |0
-<UF451> \x8A\x54 |0
-<UF452> \x8A\x55 |0
-<UF453> \x8A\x56 |1
-<UF454> \x8A\x57 |0
-<UF455> \x8A\x58 |0
-<UF456> \x8A\x59 |0
-<UF457> \x8A\x5A |0
-<UF458> \x8A\x5B |1
-<UF459> \x8A\x5C |1
-<UF45A> \x8A\x5D |0
-<UF45B> \x8A\x5E |0
-<UF45C> \x8A\x5F |0
-<UF45D> \x8A\x60 |0
-<UF45E> \x8A\x61 |0
-<UF45F> \x8A\x62 |0
-<UF460> \x8A\x63 |0
-<UF461> \x8A\x64 |0
-<UF462> \x8A\x65 |0
-<UF463> \x8A\x66 |0
-<UF464> \x8A\x67 |1
-<UF465> \x8A\x68 |0
-<UF466> \x8A\x69 |0
-<UF467> \x8A\x6A |1
-<UF468> \x8A\x6B |1
-<UF469> \x8A\x6C |0
-<UF46A> \x8A\x6D |1
-<UF46B> \x8A\x6E |1
-<UF46C> \x8A\x6F |0
-<UF46D> \x8A\x70 |0
-<UF46E> \x8A\x71 |0
-<UF46F> \x8A\x72 |0
-<UF470> \x8A\x73 |1
-<UF471> \x8A\x74 |1
-<UF472> \x8A\x75 |0
-<UF473> \x8A\x76 |1
-<UF474> \x8A\x77 |0
-<UF475> \x8A\x78 |1
-<UF476> \x8A\x79 |1
-<UF477> \x8A\x7A |0
-<UF478> \x8A\x7B |0
-<UF479> \x8A\x7C |0
-<UF47A> \x8A\x7D |1
-<UF47B> \x8A\x7E |0
-<UF47C> \x8A\xA1 |0
-<UF47D> \x8A\xA2 |0
-<UF47E> \x8A\xA3 |0
-<UF47F> \x8A\xA4 |1
-<UF480> \x8A\xA5 |0
-<UF481> \x8A\xA6 |0
-<UF482> \x8A\xA7 |1
-<UF483> \x8A\xA8 |0
-<UF484> \x8A\xA9 |0
-<UF485> \x8A\xAA |0
-<UF486> \x8A\xAB |0
-<UF487> \x8A\xAC |1
-<UF488> \x8A\xAD |0
-<UF489> \x8A\xAE |1
-<UF48A> \x8A\xAF |1
-<UF48B> \x8A\xB0 |0
-<UF48C> \x8A\xB1 |0
-<UF48D> \x8A\xB2 |0
-<UF48E> \x8A\xB3 |0
-<UF48F> \x8A\xB4 |0
-<UF490> \x8A\xB5 |0
-<UF491> \x8A\xB6 |0
-<UF492> \x8A\xB7 |1
-<UF493> \x8A\xB8 |1
-<UF494> \x8A\xB9 |1
-<UF495> \x8A\xBA |0
-<UF496> \x8A\xBB |1
-<UF497> \x8A\xBC |0
-<UF498> \x8A\xBD |0
-<UF499> \x8A\xBE |1
-<UF49A> \x8A\xBF |1
-<UF49B> \x8A\xC0 |0
-<UF49C> \x8A\xC1 |1
-<UF49D> \x8A\xC2 |1
-<UF49E> \x8A\xC3 |0
-<UF49F> \x8A\xC4 |1
-<UF4A0> \x8A\xC5 |1
-<UF4A1> \x8A\xC6 |1
-<UF4A2> \x8A\xC7 |1
-<UF4A3> \x8A\xC8 |0
-<UF4A4> \x8A\xC9 |0
-<UF4A5> \x8A\xCA |0
-<UF4A6> \x8A\xCB |0
-<UF4A7> \x8A\xCC |0
-<UF4A8> \x8A\xCD |0
-<UF4A9> \x8A\xCE |0
-<UF4AA> \x8A\xCF |0
-<UF4AB> \x8A\xD0 |1
-<UF4AC> \x8A\xD1 |1
-<UF4AD> \x8A\xD2 |0
-<UF4AE> \x8A\xD3 |1
-<UF4AF> \x8A\xD4 |0
-<UF4B0> \x8A\xD5 |0
-<UF4B1> \x8A\xD6 |1
-<UF4B2> \x8A\xD7 |0
-<UF4B3> \x8A\xD8 |0
-<UF4B4> \x8A\xD9 |0
-<UF4B5> \x8A\xDA |1
-<UF4B6> \x8A\xDB |1
-<UF4B7> \x8A\xDC |0
-<UF4B8> \x8A\xDD |0
-<UF4B9> \x8A\xDE |0
-<UF4BA> \x8A\xDF |0
-<UF4BB> \x8A\xE0 |0
-<UF4BC> \x8A\xE1 |0
-<UF4BD> \x8A\xE2 |0
-<UF4BE> \x8A\xE3 |0
-<UF4BF> \x8A\xE4 |0
-<UF4C0> \x8A\xE5 |0
-<UF4C1> \x8A\xE6 |0
-<UF4C2> \x8A\xE7 |1
-<UF4C3> \x8A\xE8 |0
-<UF4C4> \x8A\xE9 |0
-<UF4C5> \x8A\xEA |0
-<UF4C6> \x8A\xEB |1
-<UF4C7> \x8A\xEC |0
-<UF4C8> \x8A\xED |0
-<UF4C9> \x8A\xEE |0
-<UF4CA> \x8A\xEF |0
-<UF4CB> \x8A\xF0 |1
-<UF4CC> \x8A\xF1 |0
-<UF4CD> \x8A\xF2 |0
-<UF4CE> \x8A\xF3 |0
-<UF4CF> \x8A\xF4 |0
-<UF4D0> \x8A\xF5 |0
-<UF4D1> \x8A\xF6 |0
-<UF4D2> \x8A\xF7 |0
-<UF4D3> \x8A\xF8 |0
-<UF4D4> \x8A\xF9 |0
-<UF4D5> \x8A\xFA |0
-<UF4D6> \x8A\xFB |1
-<UF4D7> \x8A\xFC |0
-<UF4D8> \x8A\xFD |1
-<UF4D9> \x8A\xFE |0
-<UF4DA> \x8B\x40 |0
-<UF4DB> \x8B\x41 |0
-<UF4DC> \x8B\x42 |0
-<UF4DD> \x8B\x43 |0
-<UF4DE> \x8B\x44 |0
-<UF4DF> \x8B\x45 |0
-<UF4E0> \x8B\x46 |0
-<UF4E1> \x8B\x47 |1
-<UF4E2> \x8B\x48 |0
-<UF4E3> \x8B\x49 |0
-<UF4E4> \x8B\x4A |0
-<UF4E5> \x8B\x4B |0
-<UF4E6> \x8B\x4C |0
-<UF4E7> \x8B\x4D |0
-<UF4E8> \x8B\x4E |0
-<UF4E9> \x8B\x4F |0
-<UF4EA> \x8B\x50 |1
-<UF4EB> \x8B\x51 |1
-<UF4EC> \x8B\x52 |1
-<UF4ED> \x8B\x53 |1
-<UF4EE> \x8B\x54 |0
-<UF4EF> \x8B\x55 |0
-<UF4F0> \x8B\x56 |1
-<UF4F1> \x8B\x57 |1
-<UF4F2> \x8B\x58 |0
-<UF4F3> \x8B\x59 |0
-<UF4F4> \x8B\x5A |1
-<UF4F5> \x8B\x5B |1
-<UF4F6> \x8B\x5C |1
-<UF4F7> \x8B\x5D |1
-<UF4F8> \x8B\x5E |0
-<UF4F9> \x8B\x5F |1
-<UF4FA> \x8B\x60 |1
-<UF4FB> \x8B\x61 |1
-<UF4FC> \x8B\x62 |0
-<UF4FD> \x8B\x63 |1
-<UF4FE> \x8B\x64 |0
-<UF4FF> \x8B\x65 |0
-<UF500> \x8B\x66 |0
-<UF501> \x8B\x67 |0
-<UF502> \x8B\x68 |1
-<UF503> \x8B\x69 |0
-<UF504> \x8B\x6A |1
-<UF505> \x8B\x6B |0
-<UF506> \x8B\x6C |1
-<UF507> \x8B\x6D |0
-<UF508> \x8B\x6E |0
-<UF509> \x8B\x6F |0
-<UF50A> \x8B\x70 |0
-<UF50B> \x8B\x71 |0
-<UF50C> \x8B\x72 |0
-<UF50D> \x8B\x73 |0
-<UF50E> \x8B\x74 |0
-<UF50F> \x8B\x75 |0
-<UF510> \x8B\x76 |0
-<UF511> \x8B\x77 |0
-<UF512> \x8B\x78 |1
-<UF513> \x8B\x79 |0
-<UF514> \x8B\x7A |0
-<UF515> \x8B\x7B |0
-<UF516> \x8B\x7C |0
-<UF517> \x8B\x7D |1
-<UF518> \x8B\x7E |0
-<UF519> \x8B\xA1 |0
-<UF51A> \x8B\xA2 |0
-<UF51B> \x8B\xA3 |0
-<UF51C> \x8B\xA4 |0
-<UF51D> \x8B\xA5 |0
-<UF51E> \x8B\xA6 |1
-<UF51F> \x8B\xA7 |0
-<UF520> \x8B\xA8 |0
-<UF521> \x8B\xA9 |0
-<UF522> \x8B\xAA |0
-<UF523> \x8B\xAB |0
-<UF524> \x8B\xAC |0
-<UF525> \x8B\xAD |0
-<UF526> \x8B\xAE |0
-<UF527> \x8B\xAF |1
-<UF528> \x8B\xB0 |1
-<UF529> \x8B\xB1 |1
-<UF52A> \x8B\xB2 |0
-<UF52B> \x8B\xB3 |1
-<UF52C> \x8B\xB4 |1
-<UF52D> \x8B\xB5 |1
-<UF52E> \x8B\xB6 |1
-<UF52F> \x8B\xB7 |1
-<UF530> \x8B\xB8 |1
-<UF531> \x8B\xB9 |1
-<UF532> \x8B\xBA |1
-<UF533> \x8B\xBB |0
-<UF534> \x8B\xBC |0
-<UF535> \x8B\xBD |1
-<UF536> \x8B\xBE |1
-<UF537> \x8B\xBF |1
-<UF538> \x8B\xC0 |1
-<UF539> \x8B\xC1 |1
-<UF53A> \x8B\xC2 |0
-<UF53B> \x8B\xC3 |0
-<UF53C> \x8B\xC4 |1
-<UF53D> \x8B\xC5 |0
-<UF53E> \x8B\xC6 |1
-<UF53F> \x8B\xC7 |1
-<UF540> \x8B\xC8 |1
-<UF541> \x8B\xC9 |1
-<UF542> \x8B\xCA |1
-<UF543> \x8B\xCB |1
-<UF544> \x8B\xCC |1
-<UF545> \x8B\xCD |1
-<UF546> \x8B\xCE |1
-<UF547> \x8B\xCF |1
-<UF548> \x8B\xD0 |1
-<UF549> \x8B\xD1 |1
-<UF54A> \x8B\xD2 |1
-<UF54B> \x8B\xD3 |1
-<UF54C> \x8B\xD4 |1
-<UF54D> \x8B\xD5 |1
-<UF54E> \x8B\xD6 |0
-<UF54F> \x8B\xD7 |1
-<UF550> \x8B\xD8 |1
-<UF551> \x8B\xD9 |1
-<UF552> \x8B\xDA |1
-<UF553> \x8B\xDB |0
-<UF554> \x8B\xDC |1
-<UF555> \x8B\xDD |0
-<UF556> \x8B\xDE |0
-<UF557> \x8B\xDF |1
-<UF558> \x8B\xE0 |1
-<UF559> \x8B\xE1 |0
-<UF55A> \x8B\xE2 |0
-<UF55B> \x8B\xE3 |1
-<UF55C> \x8B\xE4 |1
-<UF55D> \x8B\xE5 |1
-<UF55E> \x8B\xE6 |0
-<UF55F> \x8B\xE7 |1
-<UF560> \x8B\xE8 |1
-<UF561> \x8B\xE9 |1
-<UF562> \x8B\xEA |1
-<UF563> \x8B\xEB |1
-<UF564> \x8B\xEC |1
-<UF565> \x8B\xED |0
-<UF566> \x8B\xEE |1
-<UF567> \x8B\xEF |1
-<UF568> \x8B\xF0 |1
-<UF569> \x8B\xF1 |1
-<UF56A> \x8B\xF2 |1
-<UF56B> \x8B\xF3 |0
-<UF56C> \x8B\xF4 |1
-<UF56D> \x8B\xF5 |1
-<UF56E> \x8B\xF6 |1
-<UF56F> \x8B\xF7 |1
-<UF570> \x8B\xF8 |1
-<UF571> \x8B\xF9 |1
-<UF572> \x8B\xFA |0
-<UF573> \x8B\xFB |1
-<UF574> \x8B\xFC |1
-<UF575> \x8B\xFD |1
-<UF576> \x8B\xFE |0
-<UF577> \x8C\x40 |1
-<UF578> \x8C\x41 |1
-<UF579> \x8C\x42 |0
-<UF57A> \x8C\x43 |0
-<UF57B> \x8C\x44 |1
-<UF57C> \x8C\x45 |1
-<UF57D> \x8C\x46 |0
-<UF57E> \x8C\x47 |1
-<UF57F> \x8C\x48 |1
-<UF580> \x8C\x49 |1
-<UF581> \x8C\x4A |0
-<UF582> \x8C\x4B |1
-<UF583> \x8C\x4C |0
-<UF584> \x8C\x4D |1
-<UF585> \x8C\x4E |0
-<UF586> \x8C\x4F |1
-<UF587> \x8C\x50 |1
-<UF588> \x8C\x51 |1
-<UF589> \x8C\x52 |1
-<UF58A> \x8C\x53 |1
-<UF58B> \x8C\x54 |0
-<UF58C> \x8C\x55 |0
-<UF58D> \x8C\x56 |1
-<UF58E> \x8C\x57 |0
-<UF58F> \x8C\x58 |1
-<UF590> \x8C\x59 |1
-<UF591> \x8C\x5A |1
-<UF592> \x8C\x5B |1
-<UF593> \x8C\x5C |0
-<UF594> \x8C\x5D |1
-<UF595> \x8C\x5E |1
-<UF596> \x8C\x5F |0
-<UF597> \x8C\x60 |1
-<UF598> \x8C\x61 |1
-<UF599> \x8C\x62 |0
-<UF59A> \x8C\x63 |1
-<UF59B> \x8C\x64 |0
-<UF59C> \x8C\x65 |0
-<UF59D> \x8C\x66 |1
-<UF59E> \x8C\x67 |1
-<UF59F> \x8C\x68 |1
-<UF5A0> \x8C\x69 |0
-<UF5A1> \x8C\x6A |1
-<UF5A2> \x8C\x6B |1
-<UF5A3> \x8C\x6C |0
-<UF5A4> \x8C\x6D |0
-<UF5A5> \x8C\x6E |1
-<UF5A6> \x8C\x6F |1
-<UF5A7> \x8C\x70 |1
-<UF5A8> \x8C\x71 |1
-<UF5A9> \x8C\x72 |1
-<UF5AA> \x8C\x73 |1
-<UF5AB> \x8C\x74 |0
-<UF5AC> \x8C\x75 |1
-<UF5AD> \x8C\x76 |1
-<UF5AE> \x8C\x77 |1
-<UF5AF> \x8C\x78 |1
-<UF5B0> \x8C\x79 |0
-<UF5B1> \x8C\x7A |1
-<UF5B2> \x8C\x7B |1
-<UF5B3> \x8C\x7C |1
-<UF5B4> \x8C\x7D |0
-<UF5B5> \x8C\x7E |1
-<UF5B6> \x8C\xA1 |0
-<UF5B7> \x8C\xA2 |1
-<UF5B8> \x8C\xA3 |1
-<UF5B9> \x8C\xA4 |0
-<UF5BA> \x8C\xA5 |1
-<UF5BB> \x8C\xA6 |0
-<UF5BC> \x8C\xA7 |1
-<UF5BD> \x8C\xA8 |0
-<UF5BE> \x8C\xA9 |1
-<UF5BF> \x8C\xAA |1
-<UF5C0> \x8C\xAB |0
-<UF5C1> \x8C\xAC |1
-<UF5C2> \x8C\xAD |1
-<UF5C3> \x8C\xAE |1
-<UF5C4> \x8C\xAF |0
-<UF5C5> \x8C\xB0 |0
-<UF5C6> \x8C\xB1 |1
-<UF5C7> \x8C\xB2 |1
-<UF5C8> \x8C\xB3 |1
-<UF5C9> \x8C\xB4 |1
-<UF5CA> \x8C\xB5 |1
-<UF5CB> \x8C\xB6 |1
-<UF5CC> \x8C\xB7 |0
-<UF5CD> \x8C\xB8 |1
-<UF5CE> \x8C\xB9 |0
-<UF5CF> \x8C\xBA |1
-<UF5D0> \x8C\xBB |0
-<UF5D1> \x8C\xBC |1
-<UF5D2> \x8C\xBD |1
-<UF5D3> \x8C\xBE |1
-<UF5D4> \x8C\xBF |1
-<UF5D5> \x8C\xC0 |0
-<UF5D6> \x8C\xC1 |0
-<UF5D7> \x8C\xC2 |0
-<UF5D8> \x8C\xC3 |1
-<UF5D9> \x8C\xC4 |1
-<UF5DA> \x8C\xC5 |1
-<UF5DB> \x8C\xC6 |0
-<UF5DC> \x8C\xC7 |0
-<UF5DD> \x8C\xC8 |0
-<UF5DE> \x8C\xC9 |1
-<UF5DF> \x8C\xCA |1
-<UF5E0> \x8C\xCB |1
-<UF5E1> \x8C\xCC |1
-<UF5E2> \x8C\xCD |0
-<UF5E3> \x8C\xCE |1
-<UF5E4> \x8C\xCF |0
-<UF5E5> \x8C\xD0 |1
-<UF5E6> \x8C\xD1 |0
-<UF5E7> \x8C\xD2 |1
-<UF5E8> \x8C\xD3 |0
-<UF5E9> \x8C\xD4 |1
-<UF5EA> \x8C\xD5 |0
-<UF5EB> \x8C\xD6 |0
-<UF5EC> \x8C\xD7 |0
-<UF5ED> \x8C\xD8 |0
-<UF5EE> \x8C\xD9 |1
-<UF5EF> \x8C\xDA |0
-<UF5F0> \x8C\xDB |0
-<UF5F1> \x8C\xDC |1
-<UF5F2> \x8C\xDD |0
-<UF5F3> \x8C\xDE |0
-<UF5F4> \x8C\xDF |0
-<UF5F5> \x8C\xE0 |0
-<UF5F6> \x8C\xE1 |0
-<UF5F7> \x8C\xE2 |0
-<UF5F8> \x8C\xE3 |0
-<UF5F9> \x8C\xE4 |0
-<UF5FA> \x8C\xE5 |0
-<UF5FB> \x8C\xE6 |0
-<UF5FC> \x8C\xE7 |0
-<UF5FD> \x8C\xE8 |0
-<UF5FE> \x8C\xE9 |0
-<UF5FF> \x8C\xEA |0
-<UF600> \x8C\xEB |0
-<UF601> \x8C\xEC |0
-<UF602> \x8C\xED |0
-<UF603> \x8C\xEE |0
-<UF604> \x8C\xEF |0
-<UF605> \x8C\xF0 |0
-<UF606> \x8C\xF1 |0
-<UF607> \x8C\xF2 |0
-<UF608> \x8C\xF3 |0
-<UF609> \x8C\xF4 |0
-<UF60A> \x8C\xF5 |0
-<UF60B> \x8C\xF6 |0
-<UF60C> \x8C\xF7 |0
-<UF60D> \x8C\xF8 |0
-<UF60E> \x8C\xF9 |0
-<UF60F> \x8C\xFA |0
-<UF610> \x8C\xFB |0
-<UF611> \x8C\xFC |0
-<UF612> \x8C\xFD |0
-<UF613> \x8C\xFE |0
-<UF614> \x8D\x40 |0
-<UF615> \x8D\x41 |0
-<UF616> \x8D\x42 |0
-<UF617> \x8D\x43 |0
-<UF618> \x8D\x44 |0
-<UF619> \x8D\x45 |0
-<UF61A> \x8D\x46 |0
-<UF61B> \x8D\x47 |0
-<UF61C> \x8D\x48 |0
-<UF61D> \x8D\x49 |0
-<UF61E> \x8D\x4A |0
-<UF61F> \x8D\x4B |0
-<UF620> \x8D\x4C |0
-<UF621> \x8D\x4D |0
-<UF622> \x8D\x4E |0
-<UF623> \x8D\x4F |0
-<UF624> \x8D\x50 |0
-<UF625> \x8D\x51 |0
-<UF626> \x8D\x52 |0
-<UF627> \x8D\x53 |0
-<UF628> \x8D\x54 |0
-<UF629> \x8D\x55 |0
-<UF62A> \x8D\x56 |0
-<UF62B> \x8D\x57 |0
-<UF62C> \x8D\x58 |0
-<UF62D> \x8D\x59 |0
-<UF62E> \x8D\x5A |0
-<UF62F> \x8D\x5B |0
-<UF630> \x8D\x5C |0
-<UF631> \x8D\x5D |0
-<UF632> \x8D\x5E |0
-<UF633> \x8D\x5F |0
-<UF634> \x8D\x60 |1
-<UF635> \x8D\x61 |1
-<UF636> \x8D\x62 |1
-<UF637> \x8D\x63 |1
-<UF638> \x8D\x64 |1
-<UF639> \x8D\x65 |1
-<UF63A> \x8D\x66 |1
-<UF63B> \x8D\x67 |1
-<UF63C> \x8D\x68 |1
-<UF63D> \x8D\x69 |1
-<UF63E> \x8D\x6A |1
-<UF63F> \x8D\x6B |1
-<UF640> \x8D\x6C |1
-<UF641> \x8D\x6D |1
-<UF642> \x8D\x6E |1
-<UF643> \x8D\x6F |1
-<UF644> \x8D\x70 |1
-<UF645> \x8D\x71 |1
-<UF646> \x8D\x72 |1
-<UF647> \x8D\x73 |1
-<UF648> \x8D\x74 |1
-<UF649> \x8D\x75 |1
-<UF64A> \x8D\x76 |1
-<UF64B> \x8D\x77 |1
-<UF64C> \x8D\x78 |1
-<UF64D> \x8D\x79 |1
-<UF64E> \x8D\x7A |1
-<UF64F> \x8D\x7B |1
-<UF650> \x8D\x7C |1
-<UF651> \x8D\x7D |1
-<UF652> \x8D\x7E |1
-<UF653> \x8D\xA1 |1
-<UF654> \x8D\xA2 |1
-<UF655> \x8D\xA3 |1
-<UF656> \x8D\xA4 |1
-<UF657> \x8D\xA5 |1
-<UF658> \x8D\xA6 |1
-<UF659> \x8D\xA7 |1
-<UF65A> \x8D\xA8 |1
-<UF65B> \x8D\xA9 |1
-<UF65C> \x8D\xAA |1
-<UF65D> \x8D\xAB |1
-<UF65E> \x8D\xAC |1
-<UF65F> \x8D\xAD |1
-<UF660> \x8D\xAE |1
-<UF661> \x8D\xAF |1
-<UF662> \x8D\xB0 |1
-<UF663> \x8D\xB1 |1
-<UF664> \x8D\xB2 |1
-<UF665> \x8D\xB3 |1
-<UF666> \x8D\xB4 |1
-<UF667> \x8D\xB5 |1
-<UF668> \x8D\xB6 |1
-<UF669> \x8D\xB7 |1
-<UF66A> \x8D\xB8 |1
-<UF66B> \x8D\xB9 |1
-<UF66C> \x8D\xBA |1
-<UF66D> \x8D\xBB |1
-<UF66E> \x8D\xBC |1
-<UF66F> \x8D\xBD |1
-<UF670> \x8D\xBE |1
-<UF671> \x8D\xBF |1
-<UF672> \x8D\xC0 |1
-<UF673> \x8D\xC1 |1
-<UF674> \x8D\xC2 |1
-<UF675> \x8D\xC3 |1
-<UF676> \x8D\xC4 |1
-<UF677> \x8D\xC5 |1
-<UF678> \x8D\xC6 |1
-<UF679> \x8D\xC7 |1
-<UF67A> \x8D\xC8 |1
-<UF67B> \x8D\xC9 |1
-<UF67C> \x8D\xCA |1
-<UF67D> \x8D\xCB |1
-<UF67E> \x8D\xCC |1
-<UF67F> \x8D\xCD |1
-<UF680> \x8D\xCE |1
-<UF681> \x8D\xCF |1
-<UF682> \x8D\xD0 |1
-<UF683> \x8D\xD1 |1
-<UF684> \x8D\xD2 |1
-<UF685> \x8D\xD3 |1
-<UF686> \x8D\xD4 |1
-<UF687> \x8D\xD5 |1
-<UF688> \x8D\xD6 |1
-<UF689> \x8D\xD7 |1
-<UF68A> \x8D\xD8 |1
-<UF68B> \x8D\xD9 |1
-<UF68C> \x8D\xDA |1
-<UF68D> \x8D\xDB |1
-<UF68E> \x8D\xDC |1
-<UF68F> \x8D\xDD |1
-<UF690> \x8D\xDE |1
-<UF691> \x8D\xDF |1
-<UF692> \x8D\xE0 |1
-<UF693> \x8D\xE1 |1
-<UF694> \x8D\xE2 |0
-<UF695> \x8D\xE3 |1
-<UF696> \x8D\xE4 |1
-<UF697> \x8D\xE5 |1
-<UF698> \x8D\xE6 |1
-<UF699> \x8D\xE7 |1
-<UF69A> \x8D\xE8 |1
-<UF69B> \x8D\xE9 |1
-<UF69C> \x8D\xEA |1
-<UF69D> \x8D\xEB |1
-<UF69E> \x8D\xEC |0
-<UF69F> \x8D\xED |1
-<UF6A0> \x8D\xEE |1
-<UF6A1> \x8D\xEF |1
-<UF6A2> \x8D\xF0 |1
-<UF6A3> \x8D\xF1 |1
-<UF6A4> \x8D\xF2 |1
-<UF6A5> \x8D\xF3 |1
-<UF6A6> \x8D\xF4 |1
-<UF6A7> \x8D\xF5 |1
-<UF6A8> \x8D\xF6 |1
-<UF6A9> \x8D\xF7 |1
-<UF6AA> \x8D\xF8 |1
-<UF6AB> \x8D\xF9 |1
-<UF6AC> \x8D\xFA |1
-<UF6AD> \x8D\xFB |0
-<UF6AE> \x8D\xFC |1
-<UF6AF> \x8D\xFD |1
-<UF6B0> \x8D\xFE |0
-<UF6B1> \xC6\xA1 |1
-<UF6B2> \xC6\xA2 |1
-<UF6B3> \xC6\xA3 |1
-<UF6B4> \xC6\xA4 |1
-<UF6B5> \xC6\xA5 |1
-<UF6B6> \xC6\xA6 |1
-<UF6B7> \xC6\xA7 |1
-<UF6B8> \xC6\xA8 |1
-<UF6B9> \xC6\xA9 |1
-<UF6BA> \xC6\xAA |1
-<UF6BB> \xC6\xAB |1
-<UF6BC> \xC6\xAC |1
-<UF6BD> \xC6\xAD |1
-<UF6BE> \xC6\xAE |1
-<UF6BF> \xC6\xAF |1
-<UF6C0> \xC6\xB0 |1
-<UF6C1> \xC6\xB1 |1
-<UF6C2> \xC6\xB2 |1
-<UF6C3> \xC6\xB3 |1
-<UF6C4> \xC6\xB4 |1
-<UF6C5> \xC6\xB5 |1
-<UF6C6> \xC6\xB6 |1
-<UF6C7> \xC6\xB7 |1
-<UF6C8> \xC6\xB8 |1
-<UF6C9> \xC6\xB9 |1
-<UF6CA> \xC6\xBA |1
-<UF6CB> \xC6\xBB |1
-<UF6CC> \xC6\xBC |1
-<UF6CD> \xC6\xBD |1
-<UF6CE> \xC6\xBE |1
-<UF6CF> \xC6\xBF |1
-<UF6D0> \xC6\xC0 |1
-<UF6D1> \xC6\xC1 |1
-<UF6D2> \xC6\xC2 |1
-<UF6D3> \xC6\xC3 |1
-<UF6D4> \xC6\xC4 |1
-<UF6D5> \xC6\xC5 |1
-<UF6D6> \xC6\xC6 |1
-<UF6D7> \xC6\xC7 |1
-<UF6D8> \xC6\xC8 |1
-<UF6D9> \xC6\xC9 |1
-<UF6DA> \xC6\xCA |1
-<UF6DB> \xC6\xCB |1
-<UF6DC> \xC6\xCC |1
-<UF6DD> \xC6\xCD |1
-<UF6DE> \xC6\xCE |1
-<UF6DF> \xC6\xCF |0
-<UF6E0> \xC6\xD0 |1
-<UF6E1> \xC6\xD1 |1
-<UF6E2> \xC6\xD2 |1
-<UF6E3> \xC6\xD3 |0
-<UF6E4> \xC6\xD4 |1
-<UF6E5> \xC6\xD5 |0
-<UF6E6> \xC6\xD6 |1
-<UF6E7> \xC6\xD7 |0
-<UF6E8> \xC6\xD8 |1
-<UF6E9> \xC6\xD9 |1
-<UF6EA> \xC6\xDA |1
-<UF6EB> \xC6\xDB |1
-<UF6EC> \xC6\xDC |1
-<UF6ED> \xC6\xDD |1
-<UF6EE> \xC6\xDE |0
-<UF6EF> \xC6\xDF |0
-<UF6F0> \xC6\xE0 |1
-<UF6F1> \xC6\xE1 |1
-<UF6F2> \xC6\xE2 |1
-<UF6F3> \xC6\xE3 |1
-<UF6F4> \xC6\xE4 |1
-<UF6F5> \xC6\xE5 |1
-<UF6F6> \xC6\xE6 |1
-<UF6F7> \xC6\xE7 |1
-<UF6F8> \xC6\xE8 |1
-<UF6F9> \xC6\xE9 |1
-<UF6FA> \xC6\xEA |1
-<UF6FB> \xC6\xEB |1
-<UF6FC> \xC6\xEC |1
-<UF6FD> \xC6\xED |1
-<UF6FE> \xC6\xEE |1
-<UF6FF> \xC6\xEF |1
-<UF700> \xC6\xF0 |1
-<UF701> \xC6\xF1 |1
-<UF702> \xC6\xF2 |1
-<UF703> \xC6\xF3 |1
-<UF704> \xC6\xF4 |1
-<UF705> \xC6\xF5 |1
-<UF706> \xC6\xF6 |1
-<UF707> \xC6\xF7 |1
-<UF708> \xC6\xF8 |1
-<UF709> \xC6\xF9 |1
-<UF70A> \xC6\xFA |1
-<UF70B> \xC6\xFB |1
-<UF70C> \xC6\xFC |1
-<UF70D> \xC6\xFD |1
-<UF70E> \xC6\xFE |1
-<UF70F> \xC7\x40 |1
-<UF710> \xC7\x41 |1
-<UF711> \xC7\x42 |1
-<UF712> \xC7\x43 |1
-<UF713> \xC7\x44 |1
-<UF714> \xC7\x45 |1
-<UF715> \xC7\x46 |1
-<UF716> \xC7\x47 |1
-<UF717> \xC7\x48 |1
-<UF718> \xC7\x49 |1
-<UF719> \xC7\x4A |1
-<UF71A> \xC7\x4B |1
-<UF71B> \xC7\x4C |1
-<UF71C> \xC7\x4D |1
-<UF71D> \xC7\x4E |1
-<UF71E> \xC7\x4F |1
-<UF71F> \xC7\x50 |1
-<UF720> \xC7\x51 |1
-<UF721> \xC7\x52 |1
-<UF722> \xC7\x53 |1
-<UF723> \xC7\x54 |1
-<UF724> \xC7\x55 |1
-<UF725> \xC7\x56 |1
-<UF726> \xC7\x57 |1
-<UF727> \xC7\x58 |1
-<UF728> \xC7\x59 |1
-<UF729> \xC7\x5A |1
-<UF72A> \xC7\x5B |1
-<UF72B> \xC7\x5C |1
-<UF72C> \xC7\x5D |1
-<UF72D> \xC7\x5E |1
-<UF72E> \xC7\x5F |1
-<UF72F> \xC7\x60 |1
-<UF730> \xC7\x61 |1
-<UF731> \xC7\x62 |1
-<UF732> \xC7\x63 |1
-<UF733> \xC7\x64 |1
-<UF734> \xC7\x65 |1
-<UF735> \xC7\x66 |1
-<UF736> \xC7\x67 |1
-<UF737> \xC7\x68 |1
-<UF738> \xC7\x69 |1
-<UF739> \xC7\x6A |1
-<UF73A> \xC7\x6B |1
-<UF73B> \xC7\x6C |1
-<UF73C> \xC7\x6D |1
-<UF73D> \xC7\x6E |1
-<UF73E> \xC7\x6F |1
-<UF73F> \xC7\x70 |1
-<UF740> \xC7\x71 |1
-<UF741> \xC7\x72 |1
-<UF742> \xC7\x73 |1
-<UF743> \xC7\x74 |1
-<UF744> \xC7\x75 |1
-<UF745> \xC7\x76 |1
-<UF746> \xC7\x77 |1
-<UF747> \xC7\x78 |1
-<UF748> \xC7\x79 |1
-<UF749> \xC7\x7A |1
-<UF74A> \xC7\x7B |1
-<UF74B> \xC7\x7C |1
-<UF74C> \xC7\x7D |1
-<UF74D> \xC7\x7E |1
-<UF74E> \xC7\xA1 |1
-<UF74F> \xC7\xA2 |1
-<UF750> \xC7\xA3 |1
-<UF751> \xC7\xA4 |1
-<UF752> \xC7\xA5 |1
-<UF753> \xC7\xA6 |1
-<UF754> \xC7\xA7 |1
-<UF755> \xC7\xA8 |1
-<UF756> \xC7\xA9 |1
-<UF757> \xC7\xAA |1
-<UF758> \xC7\xAB |1
-<UF759> \xC7\xAC |1
-<UF75A> \xC7\xAD |1
-<UF75B> \xC7\xAE |1
-<UF75C> \xC7\xAF |1
-<UF75D> \xC7\xB0 |1
-<UF75E> \xC7\xB1 |1
-<UF75F> \xC7\xB2 |1
-<UF760> \xC7\xB3 |1
-<UF761> \xC7\xB4 |1
-<UF762> \xC7\xB5 |1
-<UF763> \xC7\xB6 |1
-<UF764> \xC7\xB7 |1
-<UF765> \xC7\xB8 |1
-<UF766> \xC7\xB9 |1
-<UF767> \xC7\xBA |1
-<UF768> \xC7\xBB |1
-<UF769> \xC7\xBC |1
-<UF76A> \xC7\xBD |1
-<UF76B> \xC7\xBE |1
-<UF76C> \xC7\xBF |1
-<UF76D> \xC7\xC0 |1
-<UF76E> \xC7\xC1 |1
-<UF76F> \xC7\xC2 |1
-<UF770> \xC7\xC3 |1
-<UF771> \xC7\xC4 |1
-<UF772> \xC7\xC5 |1
-<UF773> \xC7\xC6 |1
-<UF774> \xC7\xC7 |1
-<UF775> \xC7\xC8 |1
-<UF776> \xC7\xC9 |1
-<UF777> \xC7\xCA |1
-<UF778> \xC7\xCB |1
-<UF779> \xC7\xCC |1
-<UF77A> \xC7\xCD |1
-<UF77B> \xC7\xCE |1
-<UF77C> \xC7\xCF |1
-<UF77D> \xC7\xD0 |1
-<UF77E> \xC7\xD1 |1
-<UF77F> \xC7\xD2 |1
-<UF780> \xC7\xD3 |1
-<UF781> \xC7\xD4 |1
-<UF782> \xC7\xD5 |1
-<UF783> \xC7\xD6 |1
-<UF784> \xC7\xD7 |1
-<UF785> \xC7\xD8 |1
-<UF786> \xC7\xD9 |1
-<UF787> \xC7\xDA |1
-<UF788> \xC7\xDB |1
-<UF789> \xC7\xDC |1
-<UF78A> \xC7\xDD |1
-<UF78B> \xC7\xDE |1
-<UF78C> \xC7\xDF |1
-<UF78D> \xC7\xE0 |1
-<UF78E> \xC7\xE1 |1
-<UF78F> \xC7\xE2 |1
-<UF790> \xC7\xE3 |1
-<UF791> \xC7\xE4 |1
-<UF792> \xC7\xE5 |1
-<UF793> \xC7\xE6 |1
-<UF794> \xC7\xE7 |1
-<UF795> \xC7\xE8 |1
-<UF796> \xC7\xE9 |1
-<UF797> \xC7\xEA |1
-<UF798> \xC7\xEB |1
-<UF799> \xC7\xEC |1
-<UF79A> \xC7\xED |1
-<UF79B> \xC7\xEE |1
-<UF79C> \xC7\xEF |1
-<UF79D> \xC7\xF0 |1
-<UF79E> \xC7\xF1 |1
-<UF79F> \xC7\xF2 |1
-<UF7A0> \xC7\xF3 |1
-<UF7A1> \xC7\xF4 |1
-<UF7A2> \xC7\xF5 |1
-<UF7A3> \xC7\xF6 |1
-<UF7A4> \xC7\xF7 |1
-<UF7A5> \xC7\xF8 |1
-<UF7A6> \xC7\xF9 |1
-<UF7A7> \xC7\xFA |1
-<UF7A8> \xC7\xFB |1
-<UF7A9> \xC7\xFC |1
-<UF7AA> \xC7\xFD |1
-<UF7AB> \xC7\xFE |1
-<UF7AC> \xC8\x40 |1
-<UF7AD> \xC8\x41 |1
-<UF7AE> \xC8\x42 |1
-<UF7AF> \xC8\x43 |1
-<UF7B0> \xC8\x44 |1
-<UF7B1> \xC8\x45 |1
-<UF7B2> \xC8\x46 |1
-<UF7B3> \xC8\x47 |1
-<UF7B4> \xC8\x48 |1
-<UF7B5> \xC8\x49 |1
-<UF7B6> \xC8\x4A |1
-<UF7B7> \xC8\x4B |1
-<UF7B8> \xC8\x4C |1
-<UF7B9> \xC8\x4D |1
-<UF7BA> \xC8\x4E |1
-<UF7BB> \xC8\x4F |1
-<UF7BC> \xC8\x50 |1
-<UF7BD> \xC8\x51 |1
-<UF7BE> \xC8\x52 |1
-<UF7BF> \xC8\x53 |1
-<UF7C0> \xC8\x54 |1
-<UF7C1> \xC8\x55 |1
-<UF7C2> \xC8\x56 |1
-<UF7C3> \xC8\x57 |1
-<UF7C4> \xC8\x58 |1
-<UF7C5> \xC8\x59 |1
-<UF7C6> \xC8\x5A |1
-<UF7C7> \xC8\x5B |1
-<UF7C8> \xC8\x5C |1
-<UF7C9> \xC8\x5D |1
-<UF7CA> \xC8\x5E |1
-<UF7CB> \xC8\x5F |1
-<UF7CC> \xC8\x60 |1
-<UF7CD> \xC8\x61 |1
-<UF7CE> \xC8\x62 |1
-<UF7CF> \xC8\x63 |1
-<UF7D0> \xC8\x64 |1
-<UF7D1> \xC8\x65 |1
-<UF7D2> \xC8\x66 |1
-<UF7D3> \xC8\x67 |1
-<UF7D4> \xC8\x68 |1
-<UF7D5> \xC8\x69 |1
-<UF7D6> \xC8\x6A |1
-<UF7D7> \xC8\x6B |1
-<UF7D8> \xC8\x6C |1
-<UF7D9> \xC8\x6D |1
-<UF7DA> \xC8\x6E |1
-<UF7DB> \xC8\x6F |1
-<UF7DC> \xC8\x70 |1
-<UF7DD> \xC8\x71 |1
-<UF7DE> \xC8\x72 |1
-<UF7DF> \xC8\x73 |1
-<UF7E0> \xC8\x74 |1
-<UF7E1> \xC8\x75 |1
-<UF7E2> \xC8\x76 |1
-<UF7E3> \xC8\x77 |1
-<UF7E4> \xC8\x78 |1
-<UF7E5> \xC8\x79 |0
-<UF7E6> \xC8\x7A |0
-<UF7E7> \xC8\x7B |1
-<UF7E8> \xC8\x7C |0
-<UF7E9> \xC8\x7D |1
-<UF7EA> \xC8\x7E |0
-<UF7EB> \xC8\xA1 |0
-<UF7EC> \xC8\xA2 |1
-<UF7ED> \xC8\xA3 |0
-<UF7EE> \xC8\xA4 |0
-<UF7EF> \xC8\xA5 |0
-<UF7F0> \xC8\xA6 |0
-<UF7F1> \xC8\xA7 |0
-<UF7F2> \xC8\xA8 |0
-<UF7F3> \xC8\xA9 |0
-<UF7F4> \xC8\xAA |0
-<UF7F5> \xC8\xAB |0
-<UF7F6> \xC8\xAC |0
-<UF7F7> \xC8\xAD |0
-<UF7F8> \xC8\xAE |0
-<UF7F9> \xC8\xAF |0
-<UF7FA> \xC8\xB0 |0
-<UF7FB> \xC8\xB1 |0
-<UF7FC> \xC8\xB2 |0
-<UF7FD> \xC8\xB3 |0
-<UF7FE> \xC8\xB4 |0
-<UF7FF> \xC8\xB5 |0
-<UF800> \xC8\xB6 |0
-<UF801> \xC8\xB7 |0
-<UF802> \xC8\xB8 |0
-<UF803> \xC8\xB9 |0
-<UF804> \xC8\xBA |0
-<UF805> \xC8\xBB |0
-<UF806> \xC8\xBC |0
-<UF807> \xC8\xBD |0
-<UF808> \xC8\xBE |0
-<UF809> \xC8\xBF |0
-<UF80A> \xC8\xC0 |0
-<UF80B> \xC8\xC1 |0
-<UF80C> \xC8\xC2 |0
-<UF80D> \xC8\xC3 |0
-<UF80E> \xC8\xC4 |0
-<UF80F> \xC8\xC5 |0
-<UF810> \xC8\xC6 |0
-<UF811> \xC8\xC7 |0
-<UF812> \xC8\xC8 |0
-<UF813> \xC8\xC9 |0
-<UF814> \xC8\xCA |0
-<UF815> \xC8\xCB |0
-<UF816> \xC8\xCC |0
-<UF817> \xC8\xCD |1
-<UF818> \xC8\xCE |1
-<UF819> \xC8\xCF |1
-<UF81A> \xC8\xD0 |1
-<UF81B> \xC8\xD1 |1
-<UF81C> \xC8\xD2 |1
-<UF81D> \xC8\xD3 |1
-<UF81E> \xC8\xD4 |1
-<UF81F> \xC8\xD5 |1
-<UF820> \xC8\xD6 |1
-<UF821> \xC8\xD7 |1
-<UF822> \xC8\xD8 |1
-<UF823> \xC8\xD9 |1
-<UF824> \xC8\xDA |1
-<UF825> \xC8\xDB |1
-<UF826> \xC8\xDC |1
-<UF827> \xC8\xDD |1
-<UF828> \xC8\xDE |1
-<UF829> \xC8\xDF |1
-<UF82A> \xC8\xE0 |1
-<UF82B> \xC8\xE1 |1
-<UF82C> \xC8\xE2 |1
-<UF82D> \xC8\xE3 |1
-<UF82E> \xC8\xE4 |1
-<UF82F> \xC8\xE5 |1
-<UF830> \xC8\xE6 |1
-<UF831> \xC8\xE7 |1
-<UF832> \xC8\xE8 |1
-<UF833> \xC8\xE9 |1
-<UF834> \xC8\xEA |1
-<UF835> \xC8\xEB |1
-<UF836> \xC8\xEC |1
-<UF837> \xC8\xED |1
-<UF838> \xC8\xEE |1
-<UF839> \xC8\xEF |1
-<UF83A> \xC8\xF0 |1
-<UF83B> \xC8\xF1 |1
-<UF83C> \xC8\xF2 |0
-<UF83D> \xC8\xF3 |0
-<UF83E> \xC8\xF4 |0
-<UF83F> \xC8\xF5 |1
-<UF840> \xC8\xF6 |1
-<UF841> \xC8\xF7 |1
-<UF842> \xC8\xF8 |1
-<UF843> \xC8\xF9 |1
-<UF844> \xC8\xFA |1
-<UF845> \xC8\xFB |1
-<UF846> \xC8\xFC |1
-<UF847> \xC8\xFD |1
-<UF848> \xC8\xFE |1
-#<UF8F8> \xFF |0
-<UF900> \xB0\x5A |1
-<UF901> \xA7\xF3 |1
-<UF902> \xA8\xAE |1
-<UF903> \xB8\xEB |1
-<UF904> \xB7\xC6 |1
-<UF905> \xA6\xEA |1
-<UF906> \xA5\x79 |1
-<UF907> \x8B\xF8 |0
-<UF908> \xC0\x74 |1
-<UF909> \xAB\xB4 |1
-<UF90A> \xAA\xF7 |1
-<UF90B> \xB3\xE2 |1
-<UF90C> \xA9\x60 |1
-<UF90D> \xC3\x69 |1
-<UF90E> \xC4\xEE |1
-<UF90F> \xC3\xB9 |1
-<UF910> \xC5\xDA |1
-<UF911> \xC1\xB3 |1
-<UF912> \xBB\x72 |1
-<UF913> \xC5\xDE |1
-<UF914> \xBC\xD6 |1
-<UF915> \xAC\xA5 |1
-<UF916> \xAF\x4F |1
-<UF917> \xAF\x5F |1
-<UF918> \xB8\xA8 |1
-<UF919> \xB9\x54 |1
-<UF91A> \xC0\x64 |1
-<UF91B> \xB6\xC3 |1
-<UF91C> \xA7\x5A |1
-<UF91D> \xC4\xE6 |1
-<UF91E> \xC4\xEA |1
-<UF91F> \xC4\xF5 |1
-<UF920> \xC6\x7D |1
-<UF921> \xB4\x50 |1
-<UF922> \xC0\xDD |1
-<UF923> \xC2\xC5 |1
-<UF924> \xC4\xB0 |1
-<UF925> \xA9\xD4 |1
-<UF926> \xC3\xBE |1
-<UF927> \xC4\xFA |1
-<UF928> \xB4\x59 |1
-<UF929> \xAE\xD4 |1
-<UF92A> \xAE\xF6 |1
-<UF92B> \xAF\x54 |1
-<UF92D> \xA8\xD3 |1
-<UF92E> \xA7\x4E |1
-<UF92F> \xB3\xD2 |1
-<UF930> \xBE\xDB |1
-<UF931> \xC3\x72 |1
-<UF932> \xC4\x6C |1
-<UF933> \xBF\x63 |1
-<UF934> \xA6\xD1 |1
-<UF935> \xC4\xAA |1
-<UF936> \xB8\xB8 |1
-<UF937> \xB8\xF4 |1
-<UF938> \xC5\x53 |1
-<UF939> \xBE\x7C |1
-<UF93A> \xC6\x4F |1
-<UF93B> \xB8\x4C |1
-<UF93C> \xB8\x53 |1
-<UF93D> \xBA\xF1 |1
-<UF93E> \xDB\x77 |1
-<UF93F> \xBF\xFD |1
-<UF940> \xB3\xC0 |1
-<UF941> \xBD\xD7 |1
-<UF942> \xC3\x62 |1
-<UF943> \xA7\xCB |1
-<UF944> \xC5\xA2 |1
-<UF945> \xC5\xA4 |1
-<UF946> \xA8\x63 |1
-<UF947> \xBD\x55 |1
-<UF948> \xB8\xEF |1
-<UF949> \xB9\x70 |1
-<UF94A> \xC2\x53 |1
-<UF94B> \xB9\xF0 |1
-<UF94C> \xBC\xD3 |1
-<UF94D> \xB2\x5C |1
-<UF94E> \xBA\x7C |1
-<UF94F> \xB2\xD6 |1
-<UF950> \xC1\x5C |1
-<UF951> \xAD\xAE |1
-<UF952> \xB0\xC7 |1
-<UF953> \xA6\xD8 |1
-<UF954> \xBB\xFE |1
-<UF955> \xAD\xE2 |1
-<UF956> \xB8\x57 |1
-<UF957> \xBA\xF0 |1
-<UF958> \xB5\xD9 |1
-<UF959> \xB3\xAE |1
-<UF95A> \xC5\xAA |1
-<UF95B> \xCE\xD4 |1
-<UF95C> \xBC\xD6 |1
-<UF95D> \xBF\xD5 |1
-<UF95E> \xA4\xA6 |1
-<UF95F> \xB9\xE7 |1
-<UF960> \xAB\xE3 |1
-<UF961> \xB2\x76 |1
-<UF962> \xB2\xA7 |1
-<UF963> \xA5\x5F |1
-<UF964> \xED\xA8 |1
-<UF965> \xAB\x4B |1
-<UF966> \xB4\x5F |1
-<UF967> \xA4\xA3 |1
-<UF968> \xAA\x63 |1
-<UF969> \xBC\xC6 |1
-<UF96A> \xAF\xC1 |1
-<UF96B> \xB0\xD1 |1
-<UF96C> \xB6\xEB |1
-<UF96D> \xAC\xD9 |1
-<UF96E> \xB8\xAD |1
-<UF96F> \xBB\xA1 |1
-<UF970> \xB1\xFE |1
-<UF971> \xA8\xB0 |1
-<UF972> \xA8\x48 |1
-<UF973> \xAC\x42 |1
-<UF974> \xAD\x59 |1
-<UF975> \xB1\xB0 |1
-<UF976> \xB2\xA4 |1
-<UF977> \xAB\x47 |1
-<UF978> \xA8\xE2 |1
-<UF97A> \xB1\xE7 |1
-<UF97B> \xC2\xB3 |1
-<UF97C> \xA8\x7D |1
-<UF97D> \xBD\xCC |1
-<UF97E> \xB6\x71 |1
-<UF97F> \xC0\x79 |1
-<UF980> \xA7\x66 |1
-<UF981> \xA4\x6B |1
-<UF982> \xC3\x66 |1
-<UF983> \xAE\xC8 |1
-<UF984> \xC2\x6F |1
-<UF985> \xC4\x72 |1
-<UF986> \xBE\x5B |1
-<UF987> \xC6\x7A |1
-<UF988> \xC4\x52 |1
-<UF989> \xBE\xA4 |1
-<UF98A> \xA4\x4F |1
-<UF98B> \xBE\xE4 |1
-<UF98C> \xBE\xFA |1
-<UF98D> \xF7\x65 |1
-<UF98E> \xA6\x7E |1
-<UF98F> \xBC\xA6 |1
-<UF990> \xC5\xCA |1
-<UF991> \xBC\xBF |1
-<UF992> \xBA\xA7 |1
-<UF993> \xB7\xD2 |1
-<UF994> \xE6\xA3 |1
-<UF996> \xBD\x6D |1
-<UF997> \xC1\x70 |1
-<UF998> \xBD\xFB |1
-<UF999> \xBD\xAC |1
-<UF99A> \xB3\x73 |1
-<UF99B> \xC1\xE5 |1
-<UF99C> \xA6\x43 |1
-<UF99D> \xA6\x48 |1
-<UF99E> \xAB\x7C |1
-<UF99F> \xAF\x50 |1
-<UF9A0> \xB5\xF5 |1
-<UF9A1> \xBB\xA1 |1
-<UF9A2> \xB7\x47 |1
-<UF9A3> \xA9\xC0 |1
-<UF9A4> \xB1\xC9 |1
-<UF9A5> \xC0\xD4 |1
-<UF9A6> \xC3\xAE |1
-<UF9A7> \xC2\x79 |1
-<UF9A8> \xA5\x4F |1
-<UF9A9> \xCB\xF1 |1
-<UF9AA> \xB9\xE7 |1
-<UF9AB> \xC0\xAD |1
-<UF9AC> \xCC\xB0 |1
-<UF9AD> \xAC\xC2 |1
-<UF9AE> \xBC\xFC |1
-<UF9AF> \xB2\xDC |1
-<UF9B0> \xB2\xE2 |1
-<UF9B1> \xB9\x61 |1
-<UF9B2> \xB9\x73 |1
-<UF9B3> \xC6\x46 |1
-<UF9B4> \xBB\xE2 |1
-<UF9B5> \xA8\xD2 |1
-<UF9B6> \xC2\xA7 |1
-<UF9B7> \xC4\xBF |1
-<UF9B8> \xC1\xF5 |1
-<UF9B9> \xB4\x63 |1
-<UF9BA> \xA4\x46 |1
-<UF9BB> \xB9\xB1 |1
-<UF9BC> \xBC\x64 |1
-<UF9BD> \xA7\xBF |1
-<UF9BE> \xAE\xC6 |1
-<UF9BF> \xBC\xD6 |1
-<UF9C0> \xBF\x52 |1
-<UF9C1> \xC0\xF8 |1
-<UF9C2> \xE7\x64 |1
-<UF9C3> \xBF\xF1 |1
-<UF9C4> \xC0\x73 |1
-<UF9C5> \xB7\x77 |1
-<UF9C6> \xA8\xBF |1
-<UF9C7> \xBC\x42 |1
-<UF9C8> \xCC\xD8 |1
-<UF9C9> \xAC\x68 |1
-<UF9CA> \xAC\x79 |1
-<UF9CB> \xB7\xC8 |1
-<UF9CC> \xAF\x5B |1
-<UF9CD> \xAF\x64 |1
-<UF9CE> \xB2\xB8 |1
-<UF9CF> \xAF\xC3 |1
-<UF9D0> \xC3\xFE |1
-<UF9D1> \xA4\xBB |1
-<UF9D2> \xBC\xAE |1
-<UF9D3> \xB3\xB0 |1
-<UF9D4> \xAD\xDB |1
-<UF9D5> \xB1\x5B |1
-<UF9D6> \xB2\x5F |1
-<UF9D7> \xBD\xFC |1
-<UF9D8> \xAB\xDF |1
-<UF9D9> \xB7\x58 |1
-<UF9DA> \xAE\xDF |1
-<UF9DB> \xB2\x76 |1
-<UF9DC> \xB6\xA9 |1
-<UF9DD> \xA7\x51 |1
-<UF9DE> \xA6\x4F |1
-<UF9DF> \xBC\x69 |1
-<UF9E0> \xA9\xF6 |1
-<UF9E1> \xA7\xF5 |1
-<UF9E2> \xB1\xF9 |1
-<UF9E3> \xAA\x64 |1
-<UF9E4> \xB2\x7A |1
-<UF9E5> \xB5\x67 |1
-<UF9E6> \xBF\xA9 |1
-<UF9E8> \xB8\xCC |1
-<UF9E9> \xA8\xBD |1
-<UF9EA> \xC2\xF7 |1
-<UF9EB> \xB0\xCE |1
-<UF9EC> \xB7\xC4 |1
-<UF9ED> \xA7\x5B |1
-<UF9EE> \xBF\x4D |1
-<UF9EF> \xBF\x5A |1
-<UF9F0> \xC4\xA9 |1
-<UF9F2> \xC5\xEC |1
-<UF9F3> \xC5\xEF |1
-<UF9F4> \xAA\x4C |1
-<UF9F5> \xB2\x4F |1
-<UF9F6> \xC1\x7B |1
-<UF9F7> \xA5\xDF |1
-<UF9F8> \xB2\xC1 |1
-<UF9F9> \xB2\xC9 |1
-<UF9FA> \xAA\xAC |1
-<UF9FB> \xAA\xA5 |1
-<UF9FC> \xC3\xD1 |1
-<UF9FD> \xA4\xB0 |1
-<UF9FE> \xAF\xF9 |1
-<UF9FF> \xA8\xEB |1
-<UFA00> \xA4\xC1 |1
-<UFA01> \xAB\xD7 |1
-<UFA02> \xA9\xDD |1
-<UFA03> \xBF\x7D |1
-<UFA04> \xA6\x76 |1
-<UFA05> \xAC\x7D |1
-<UFA06> \xBC\xC9 |1
-<UFA07> \xBF\xE7 |1
-<UFA08> \xA6\xE6 |1
-<UFA09> \xAD\xB0 |1
-<UFA0A> \xA8\xA3 |1
-<UFA0B> \xB9\xF8 |1
-<UFA0C> \xC9\x4A |0
-<UFA0D> \xDD\xFC |0
-<UFA10> \xB6\xEF |1
-<UFA12> \xB4\xB8 |1
-<UFA15> \xE8\xF9 |1
-<UFA16> \xBD\xDE |1
-<UFA17> \xAF\x71 |1
-<UFA19> \xAF\xAB |1
-<UFA1A> \xB2\xBB |1
-<UFA1B> \xBA\xD6 |1
-<UFA1C> \xB9\x74 |1
-<UFA1D> \xBA\xEB |1
-<UFA1E> \xA6\xD0 |1
-<UFA22> \xBD\xD1 |1
-<UFA25> \xB6\x68 |1
-<UFA26> \xB3\xA3 |1
-<UFA2A> \xB6\xBA |1
-<UFA2B> \xB9\x7D |1
-<UFA2C> \xC0\x5D |1
-<UFA2D> \xC5\x62 |1
-<UFE30> \xA1\x4A |0
-<UFE31> \xA1\x57 |0
-<UFE33> \xA1\x59 |0
-<UFE34> \xA1\x5B |0
-<UFE35> \xA1\x5F |0
-<UFE36> \xA1\x60 |0
-<UFE37> \xA1\x63 |0
-<UFE38> \xA1\x64 |0
-<UFE39> \xA1\x67 |0
-<UFE3A> \xA1\x68 |0
-<UFE3B> \xA1\x6B |0
-<UFE3C> \xA1\x6C |0
-<UFE3D> \xA1\x6F |0
-<UFE3E> \xA1\x70 |0
-<UFE3F> \xA1\x73 |0
-<UFE40> \xA1\x74 |0
-<UFE41> \xA1\x77 |0
-<UFE42> \xA1\x78 |0
-<UFE43> \xA1\x7B |0
-<UFE44> \xA1\x7C |0
-<UFE49> \xA1\xC6 |0
-<UFE4A> \xA1\xC7 |0
-<UFE4B> \xA1\xCA |0
-<UFE4C> \xA1\xCB |0
-<UFE4D> \xA1\xC8 |0
-<UFE4E> \xA1\xC9 |0
-<UFE4F> \xA1\x5C |0
-<UFE50> \xA1\x4D |0
-<UFE51> \xA1\x4E |0
-<UFE52> \xA1\x4F |0
-<UFE54> \xA1\x51 |0
-<UFE55> \xA1\x52 |0
-<UFE56> \xA1\x53 |0
-<UFE57> \xA1\x54 |0
-<UFE59> \xA1\x7D |0
-<UFE5A> \xA1\x7E |0
-<UFE5B> \xA1\xA1 |0
-<UFE5C> \xA1\xA2 |0
-<UFE5D> \xA1\xA3 |0
-<UFE5E> \xA1\xA4 |0
-<UFE5F> \xA1\xCC |0
-<UFE60> \xA1\xCD |0
-<UFE61> \xA1\xCE |0
-<UFE62> \xA1\xDE |0
-<UFE63> \xA1\xDF |0
-<UFE64> \xA1\xE0 |0
-<UFE65> \xA1\xE1 |0
-<UFE66> \xA1\xE2 |0
-<UFE68> \xA2\x42 |0
-<UFE69> \xA2\x4C |0
-<UFE6A> \xA2\x4D |0
-<UFE6B> \xA2\x4E |0
-<UFF01> \xA1\x49 |0
-<UFF02> \xC8\xD0 |0
-<UFF03> \xA1\xAD |0
-<UFF04> \xA2\x43 |0
-<UFF05> \xA2\x48 |0
-<UFF06> \xA1\xAE |0
-<UFF07> \xC8\xCF |0
-<UFF08> \xA1\x5D |0
-<UFF09> \xA1\x5E |0
-<UFF0A> \xA1\xAF |0
-<UFF0B> \xA1\xCF |0
-<UFF0C> \xA1\x41 |0
-<UFF0D> \xA1\xD0 |0
-<UFF0E> \xA1\x44 |0
-<UFF0F> \xA1\xFE |0
-<UFF10> \xA2\xAF |0
-<UFF11> \xA2\xB0 |0
-<UFF12> \xA2\xB1 |0
-<UFF13> \xA2\xB2 |0
-<UFF14> \xA2\xB3 |0
-<UFF15> \xA2\xB4 |0
-<UFF16> \xA2\xB5 |0
-<UFF17> \xA2\xB6 |0
-<UFF18> \xA2\xB7 |0
-<UFF19> \xA2\xB8 |0
-<UFF1A> \xA1\x47 |0
-<UFF1B> \xA1\x46 |0
-<UFF1C> \xA1\xD5 |0
-<UFF1D> \xA1\xD7 |0
-<UFF1E> \xA1\xD6 |0
-<UFF1F> \xA1\x48 |0
-<UFF20> \xA2\x49 |0
-<UFF21> \xA2\xCF |0
-<UFF22> \xA2\xD0 |0
-<UFF23> \xA2\xD1 |0
-<UFF24> \xA2\xD2 |0
-<UFF25> \xA2\xD3 |0
-<UFF26> \xA2\xD4 |0
-<UFF27> \xA2\xD5 |0
-<UFF28> \xA2\xD6 |0
-<UFF29> \xA2\xD7 |0
-<UFF2A> \xA2\xD8 |0
-<UFF2B> \xA2\xD9 |0
-<UFF2C> \xA2\xDA |0
-<UFF2D> \xA2\xDB |0
-<UFF2E> \xA2\xDC |0
-<UFF2F> \xA2\xDD |0
-<UFF30> \xA2\xDE |0
-<UFF31> \xA2\xDF |0
-<UFF32> \xA2\xE0 |0
-<UFF33> \xA2\xE1 |0
-<UFF34> \xA2\xE2 |0
-<UFF35> \xA2\xE3 |0
-<UFF36> \xA2\xE4 |0
-<UFF37> \xA2\xE5 |0
-<UFF38> \xA2\xE6 |0
-<UFF39> \xA2\xE7 |0
-<UFF3A> \xA2\xE8 |0
-<UFF3B> \xC6\xE4 |0
-<UFF3C> \xA2\x40 |0
-<UFF3D> \xC6\xE5 |0
-<UFF3E> \xA1\x73 |1
-<UFF3F> \xA1\xC4 |0
-<UFF40> \xA1\xA5 |1
-<UFF41> \xA2\xE9 |0
-<UFF42> \xA2\xEA |0
-<UFF43> \xA2\xEB |0
-<UFF44> \xA2\xEC |0
-<UFF45> \xA2\xED |0
-<UFF46> \xA2\xEE |0
-<UFF47> \xA2\xEF |0
-<UFF48> \xA2\xF0 |0
-<UFF49> \xA2\xF1 |0
-<UFF4A> \xA2\xF2 |0
-<UFF4B> \xA2\xF3 |0
-<UFF4C> \xA2\xF4 |0
-<UFF4D> \xA2\xF5 |0
-<UFF4E> \xA2\xF6 |0
-<UFF4F> \xA2\xF7 |0
-<UFF50> \xA2\xF8 |0
-<UFF51> \xA2\xF9 |0
-<UFF52> \xA2\xFA |0
-<UFF53> \xA2\xFB |0
-<UFF54> \xA2\xFC |0
-<UFF55> \xA2\xFD |0
-<UFF56> \xA2\xFE |0
-<UFF57> \xA3\x40 |0
-<UFF58> \xA3\x41 |0
-<UFF59> \xA3\x42 |0
-<UFF5A> \xA3\x43 |0
-<UFF5B> \xA1\x61 |0
-<UFF5C> \xA1\x55 |0
-<UFF5D> \xA1\x62 |0
-<UFF5E> \xA1\xE3 |0
-<UFF64> \xA1\x4E |1
-<UFFE0> \xA2\x46 |0
-<UFFE1> \xA2\x47 |0
-<UFFE2> \xC8\xCD |0
-<UFFE3> \xA1\xC3 |0
-<UFFE4> \xC8\xCE |0
-<UFFE5> \xA2\x44 |0
-<UFFED> \xF9\xFE |0
-#
-END CHARMAP
-#
diff --git a/enc/trans/utf8_mac.trans b/enc/trans/utf8_mac.trans
index 11ce35e212..0d69dba46a 100644
--- a/enc/trans/utf8_mac.trans
+++ b/enc/trans/utf8_mac.trans
@@ -52,7 +52,7 @@ struct from_utf8_mac_status {
int end;
int len;
};
-#define buf_length(sp) ((sp)->len)
+#define buf_length(sp) (sp->len)
int
buf_bytesize(struct from_utf8_mac_status *sp)
@@ -233,7 +233,8 @@ rb_from_UTF8_MAC = {
from_utf8_mac_finish
};
-TRANS_INIT(utf8_mac)
+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
index 632c8808ef..1bf6ed0975 100644
--- a/enc/trans/utf_16_32.trans
+++ b/enc/trans/utf_16_32.trans
@@ -22,14 +22,6 @@
transcode_generate_node(ActionMap.parse(map), "from_UTF_32BE")
map = {}
- map["{00-ff}{00-ff}"] = :func_si
- transcode_generate_node(ActionMap.parse(map), "from_UTF_16")
-
- map = {}
- map["{00-ff}{00-ff}{00-ff}{00-ff}"] = :func_si
- transcode_generate_node(ActionMap.parse(map), "from_UTF_32")
-
- map = {}
map["{00-7f}"] = :func_so
map["{c2-df}{80-bf}"] = :func_so
map["e0{a0-bf}{80-bf}"] = :func_so
@@ -267,134 +259,6 @@ fun_so_to_utf_32le(void *statep, const unsigned char *s, size_t l, unsigned char
return 4;
}
-static int
-state_init(void *statep)
-{
- unsigned char *sp = statep;
- *sp = 0;
- return 0;
-}
-
-static VALUE
-fun_si_from_utf_16(void *statep, const unsigned char *s, size_t l)
-{
- #define BE 1
- #define LE 2
- unsigned char *sp = statep;
- switch (*sp) {
- case 0:
- if (s[0] == 0xFE && s[1] == 0xFF) {
- *sp = BE;
- return ZERObt;
- }
- else if (s[0] == 0xFF && s[1] == 0xFE) {
- *sp = LE;
- return ZERObt;
- }
- break;
- case BE:
- if (s[0] < 0xD8 || 0xDF < s[0]) {
- return (VALUE)FUNso;
- }
- else if (s[0] <= 0xDB) {
- return (VALUE)from_UTF_16BE_D8toDB_00toFF;
- }
- break;
- case LE:
- if (s[1] < 0xD8 || 0xDF < s[1]) {
- return (VALUE)FUNso;
- }
- else if (s[1] <= 0xDB) {
- return (VALUE)from_UTF_16LE_00toFF_D8toDB;
- }
- break;
- }
- return (VALUE)INVALID;
-}
-
-static ssize_t
-fun_so_from_utf_16(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- switch (*sp) {
- case BE:
- return fun_so_from_utf_16be(statep, s, l, o, osize);
- case LE:
- return fun_so_from_utf_16le(statep, s, l, o, osize);
- }
- return 0;
-}
-
-static VALUE
-fun_si_from_utf_32(void *statep, const unsigned char *s, size_t l)
-{
- unsigned char *sp = statep;
- switch (*sp) {
- case 0:
- if (s[0] == 0 && s[1] == 0 && s[2] == 0xFE && s[3] == 0xFF) {
- *sp = BE;
- return ZERObt;
- }
- else if (s[0] == 0xFF && s[1] == 0xFE && s[2] == 0 && s[3] == 0) {
- *sp = LE;
- return ZERObt;
- }
- break;
- case BE:
- if (s[0] == 0 && ((0 < s[1] && s[1] <= 0x10) ||
- (s[1] == 0 && (s[2] < 0xD8 || 0xDF < s[2]))))
- return (VALUE)FUNso;
- break;
- case LE:
- if (s[3] == 0 && ((0 < s[2] && s[2] <= 0x10) ||
- (s[2] == 0 && (s[1] < 0xD8 || 0xDF < s[1]))))
- return (VALUE)FUNso;
- break;
- }
- return (VALUE)INVALID;
-}
-
-static ssize_t
-fun_so_from_utf_32(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- switch (*sp) {
- case BE:
- return fun_so_from_utf_32be(statep, s, l, o, osize);
- case LE:
- return fun_so_from_utf_32le(statep, s, l, o, osize);
- }
- return 0;
-}
-
-static ssize_t
-fun_so_to_utf_16(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- if (*sp == 0) {
- *o++ = 0xFE;
- *o++ = 0xFF;
- *sp = 1;
- return 2 + fun_so_to_utf_16be(statep, s, l, o, osize);
- }
- return fun_so_to_utf_16be(statep, s, l, o, osize);
-}
-
-static ssize_t
-fun_so_to_utf_32(void *statep, const unsigned char *s, size_t l, unsigned char *o, size_t osize)
-{
- unsigned char *sp = statep;
- if (*sp == 0) {
- *o++ = 0x00;
- *o++ = 0x00;
- *o++ = 0xFE;
- *o++ = 0xFF;
- *sp = 1;
- return 4 + fun_so_to_utf_32be(statep, s, l, o, osize);
- }
- return fun_so_to_utf_32be(statep, s, l, o, osize);
-}
-
static const rb_transcoder
rb_from_UTF_16BE = {
"UTF-16BE", "UTF-8", from_UTF_16BE,
@@ -491,55 +355,8 @@ rb_to_UTF_32LE = {
NULL, NULL, NULL, fun_so_to_utf_32le
};
-static const rb_transcoder
-rb_from_UTF_16 = {
- "UTF-16", "UTF-8", from_UTF_16,
- TRANSCODE_TABLE_INFO,
- 2, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 1, state_init, NULL, /* state_size, state_init, state_fini */
- NULL, fun_si_from_utf_16, NULL, fun_so_from_utf_16
-};
-
-static const rb_transcoder
-rb_from_UTF_32 = {
- "UTF-32", "UTF-8", from_UTF_32,
- TRANSCODE_TABLE_INFO,
- 4, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_decoder, /* asciicompat_type */
- 1, state_init, NULL, /* state_size, state_init, state_fini */
- NULL, fun_si_from_utf_32, NULL, fun_so_from_utf_32
-};
-
-static const rb_transcoder
-rb_to_UTF_16 = {
- "UTF-8", "UTF-16", from_UTF_8,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 1, state_init, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_utf_16
-};
-
-static const rb_transcoder
-rb_to_UTF_32 = {
- "UTF-8", "UTF-32", from_UTF_8,
- TRANSCODE_TABLE_INFO,
- 1, /* input_unit_length */
- 4, /* max_input */
- 4, /* max_output */
- asciicompat_encoder, /* asciicompat_type */
- 1, state_init, NULL, /* state_size, state_init, state_fini */
- NULL, NULL, NULL, fun_so_to_utf_32
-};
-
-TRANS_INIT(utf_16_32)
+void
+Init_utf_16_32(void)
{
rb_register_transcoder(&rb_from_UTF_16BE);
rb_register_transcoder(&rb_to_UTF_16BE);
@@ -549,8 +366,4 @@ TRANS_INIT(utf_16_32)
rb_register_transcoder(&rb_to_UTF_32BE);
rb_register_transcoder(&rb_from_UTF_32LE);
rb_register_transcoder(&rb_to_UTF_32LE);
- rb_register_transcoder(&rb_from_UTF_16);
- rb_register_transcoder(&rb_to_UTF_16);
- rb_register_transcoder(&rb_from_UTF_32);
- rb_register_transcoder(&rb_to_UTF_32);
}
diff --git a/enc/unicode.c b/enc/unicode.c
index 20990c1e54..e3a314b6f3 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -38,7 +38,7 @@
static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
- 0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 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,
@@ -103,8 +103,1937 @@ typedef struct {
CodePointList2 to;
} CaseUnfold_13_Type;
-#include "enc/unicode/casefold.h"
+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)
@@ -151,7 +2080,7 @@ onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
#include "ruby/st.h"
-#define PROPERTY_NAME_MAX_SIZE (MAX_WORD_LENGTH + 1)
+#define PROPERTY_NAME_MAX_SIZE MAX_WORD_LENGTH
extern int
onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end)
@@ -162,6 +2091,7 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end
UChar *p;
OnigCodePoint code;
+ p = name;
len = 0;
for (p = name; p < end; p += enclen(enc, p, end)) {
code = ONIGENC_MBC_TO_CODE(enc, p, end);
@@ -170,7 +2100,7 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end
if (code >= 0x80)
return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
- buf[len++] = ONIGENC_ASCII_CODE_TO_LOWER_CASE(code);
+ buf[len++] = (UChar )TOLOWER((unsigned char)code);
if (len >= PROPERTY_NAME_MAX_SIZE)
return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
}
@@ -238,7 +2168,7 @@ static int init_case_fold_table(void)
THREAD_ATOMIC_START;
- FoldTable = st_init_numtable_with_size(FOLD_TABLE_SIZE);
+ 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];
@@ -249,7 +2179,7 @@ static int init_case_fold_table(void)
st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
}
- Unfold1Table = st_init_numtable_with_size(UNFOLD1_TABLE_SIZE);
+ Unfold1Table = st_init_numtable_with_size(1000);
if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
for (i = 0; i < numberof(CaseUnfold_11); i++) {
@@ -261,7 +2191,7 @@ static int init_case_fold_table(void)
st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
}
- Unfold2Table = st_init_table_with_size(&type_code2_hash, UNFOLD2_TABLE_SIZE);
+ 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++) {
@@ -273,7 +2203,7 @@ static int init_case_fold_table(void)
st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
}
- Unfold3Table = st_init_table_with_size(&type_code3_hash, UNFOLD3_TABLE_SIZE);
+ 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++) {
@@ -315,7 +2245,7 @@ onigenc_unicode_mbc_case_fold(OnigEncoding enc,
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);
+ return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);
}
#if 0
/* NO NEEDS TO CHECK */
@@ -421,7 +2351,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
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;
+ if (r != 0) return r;
for (k = 0; k < CaseUnfold_12[i].to.n; k++) {
if (k == j) continue;
@@ -440,7 +2370,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
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;
+ if (r != 0) return r;
for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) {
if (k == j) continue;
@@ -460,7 +2390,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
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;
+ if (r != 0) return r;
for (k = 0; k < CaseUnfold_13[i].to.n; k++) {
if (k == j) continue;
diff --git a/enc/unicode/casefold.h b/enc/unicode/casefold.h
deleted file mode 100644
index b9559de4a3..0000000000
--- a/enc/unicode/casefold.h
+++ /dev/null
@@ -1,2238 +0,0 @@
-/* DO NOT EDIT THIS FILE. */
-/* Generated by tool/CaseFolding.py */
-
-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}}},
- { 0x023a, {1, {0x2c65}}},
- { 0x023b, {1, {0x023c}}},
- { 0x023d, {1, {0x019a}}},
- { 0x023e, {1, {0x2c66}}},
- { 0x0241, {1, {0x0242}}},
- { 0x0243, {1, {0x0180}}},
- { 0x0244, {1, {0x0289}}},
- { 0x0245, {1, {0x028c}}},
- { 0x0246, {1, {0x0247}}},
- { 0x0248, {1, {0x0249}}},
- { 0x024a, {1, {0x024b}}},
- { 0x024c, {1, {0x024d}}},
- { 0x024e, {1, {0x024f}}},
- { 0x0345, {1, {0x03b9}}},
- { 0x0370, {1, {0x0371}}},
- { 0x0372, {1, {0x0373}}},
- { 0x0376, {1, {0x0377}}},
- { 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}}},
- { 0x03cf, {1, {0x03d7}}},
- { 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}}},
- { 0x03fd, {1, {0x037b}}},
- { 0x03fe, {1, {0x037c}}},
- { 0x03ff, {1, {0x037d}}},
- { 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}}},
- { 0x04c0, {1, {0x04cf}}},
- { 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}}},
- { 0x04fa, {1, {0x04fb}}},
- { 0x04fc, {1, {0x04fd}}},
- { 0x04fe, {1, {0x04ff}}},
- { 0x0500, {1, {0x0501}}},
- { 0x0502, {1, {0x0503}}},
- { 0x0504, {1, {0x0505}}},
- { 0x0506, {1, {0x0507}}},
- { 0x0508, {1, {0x0509}}},
- { 0x050a, {1, {0x050b}}},
- { 0x050c, {1, {0x050d}}},
- { 0x050e, {1, {0x050f}}},
- { 0x0510, {1, {0x0511}}},
- { 0x0512, {1, {0x0513}}},
- { 0x0514, {1, {0x0515}}},
- { 0x0516, {1, {0x0517}}},
- { 0x0518, {1, {0x0519}}},
- { 0x051a, {1, {0x051b}}},
- { 0x051c, {1, {0x051d}}},
- { 0x051e, {1, {0x051f}}},
- { 0x0520, {1, {0x0521}}},
- { 0x0522, {1, {0x0523}}},
- { 0x0524, {1, {0x0525}}},
- { 0x0526, {1, {0x0527}}},
- { 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}}},
- { 0x10c7, {1, {0x2d27}}},
- { 0x10cd, {1, {0x2d2d}}},
- { 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}}},
- { 0x1e9e, {2, {0x0073, 0x0073}}},
- { 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}}},
- { 0x1efa, {1, {0x1efb}}},
- { 0x1efc, {1, {0x1efd}}},
- { 0x1efe, {1, {0x1eff}}},
- { 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}}},
- { 0x2132, {1, {0x214e}}},
- { 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}}},
- { 0x2183, {1, {0x2184}}},
- { 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}}},
- { 0x2c60, {1, {0x2c61}}},
- { 0x2c62, {1, {0x026b}}},
- { 0x2c63, {1, {0x1d7d}}},
- { 0x2c64, {1, {0x027d}}},
- { 0x2c67, {1, {0x2c68}}},
- { 0x2c69, {1, {0x2c6a}}},
- { 0x2c6b, {1, {0x2c6c}}},
- { 0x2c6d, {1, {0x0251}}},
- { 0x2c6e, {1, {0x0271}}},
- { 0x2c6f, {1, {0x0250}}},
- { 0x2c70, {1, {0x0252}}},
- { 0x2c72, {1, {0x2c73}}},
- { 0x2c75, {1, {0x2c76}}},
- { 0x2c7e, {1, {0x023f}}},
- { 0x2c7f, {1, {0x0240}}},
- { 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}}},
- { 0x2ceb, {1, {0x2cec}}},
- { 0x2ced, {1, {0x2cee}}},
- { 0x2cf2, {1, {0x2cf3}}},
- { 0xa640, {1, {0xa641}}},
- { 0xa642, {1, {0xa643}}},
- { 0xa644, {1, {0xa645}}},
- { 0xa646, {1, {0xa647}}},
- { 0xa648, {1, {0xa649}}},
- { 0xa64a, {1, {0xa64b}}},
- { 0xa64c, {1, {0xa64d}}},
- { 0xa64e, {1, {0xa64f}}},
- { 0xa650, {1, {0xa651}}},
- { 0xa652, {1, {0xa653}}},
- { 0xa654, {1, {0xa655}}},
- { 0xa656, {1, {0xa657}}},
- { 0xa658, {1, {0xa659}}},
- { 0xa65a, {1, {0xa65b}}},
- { 0xa65c, {1, {0xa65d}}},
- { 0xa65e, {1, {0xa65f}}},
- { 0xa660, {1, {0xa661}}},
- { 0xa662, {1, {0xa663}}},
- { 0xa664, {1, {0xa665}}},
- { 0xa666, {1, {0xa667}}},
- { 0xa668, {1, {0xa669}}},
- { 0xa66a, {1, {0xa66b}}},
- { 0xa66c, {1, {0xa66d}}},
- { 0xa680, {1, {0xa681}}},
- { 0xa682, {1, {0xa683}}},
- { 0xa684, {1, {0xa685}}},
- { 0xa686, {1, {0xa687}}},
- { 0xa688, {1, {0xa689}}},
- { 0xa68a, {1, {0xa68b}}},
- { 0xa68c, {1, {0xa68d}}},
- { 0xa68e, {1, {0xa68f}}},
- { 0xa690, {1, {0xa691}}},
- { 0xa692, {1, {0xa693}}},
- { 0xa694, {1, {0xa695}}},
- { 0xa696, {1, {0xa697}}},
- { 0xa722, {1, {0xa723}}},
- { 0xa724, {1, {0xa725}}},
- { 0xa726, {1, {0xa727}}},
- { 0xa728, {1, {0xa729}}},
- { 0xa72a, {1, {0xa72b}}},
- { 0xa72c, {1, {0xa72d}}},
- { 0xa72e, {1, {0xa72f}}},
- { 0xa732, {1, {0xa733}}},
- { 0xa734, {1, {0xa735}}},
- { 0xa736, {1, {0xa737}}},
- { 0xa738, {1, {0xa739}}},
- { 0xa73a, {1, {0xa73b}}},
- { 0xa73c, {1, {0xa73d}}},
- { 0xa73e, {1, {0xa73f}}},
- { 0xa740, {1, {0xa741}}},
- { 0xa742, {1, {0xa743}}},
- { 0xa744, {1, {0xa745}}},
- { 0xa746, {1, {0xa747}}},
- { 0xa748, {1, {0xa749}}},
- { 0xa74a, {1, {0xa74b}}},
- { 0xa74c, {1, {0xa74d}}},
- { 0xa74e, {1, {0xa74f}}},
- { 0xa750, {1, {0xa751}}},
- { 0xa752, {1, {0xa753}}},
- { 0xa754, {1, {0xa755}}},
- { 0xa756, {1, {0xa757}}},
- { 0xa758, {1, {0xa759}}},
- { 0xa75a, {1, {0xa75b}}},
- { 0xa75c, {1, {0xa75d}}},
- { 0xa75e, {1, {0xa75f}}},
- { 0xa760, {1, {0xa761}}},
- { 0xa762, {1, {0xa763}}},
- { 0xa764, {1, {0xa765}}},
- { 0xa766, {1, {0xa767}}},
- { 0xa768, {1, {0xa769}}},
- { 0xa76a, {1, {0xa76b}}},
- { 0xa76c, {1, {0xa76d}}},
- { 0xa76e, {1, {0xa76f}}},
- { 0xa779, {1, {0xa77a}}},
- { 0xa77b, {1, {0xa77c}}},
- { 0xa77d, {1, {0x1d79}}},
- { 0xa77e, {1, {0xa77f}}},
- { 0xa780, {1, {0xa781}}},
- { 0xa782, {1, {0xa783}}},
- { 0xa784, {1, {0xa785}}},
- { 0xa786, {1, {0xa787}}},
- { 0xa78b, {1, {0xa78c}}},
- { 0xa78d, {1, {0x0265}}},
- { 0xa790, {1, {0xa791}}},
- { 0xa792, {1, {0xa793}}},
- { 0xa7a0, {1, {0xa7a1}}},
- { 0xa7a2, {1, {0xa7a3}}},
- { 0xa7a4, {1, {0xa7a5}}},
- { 0xa7a6, {1, {0xa7a7}}},
- { 0xa7a8, {1, {0xa7a9}}},
- { 0xa7aa, {1, {0x0266}}},
- { 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, {0x004b, 0x212a }}},
- { 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, {0x00c5, 0x212b }}},
- { 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 }}},
- { 0x0180, {1, {0x0243 }}},
- { 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 }}},
- { 0x023f, {1, {0x2c7e }}},
- { 0x0240, {1, {0x2c7f }}},
- { 0x0242, {1, {0x0241 }}},
- { 0x0247, {1, {0x0246 }}},
- { 0x0249, {1, {0x0248 }}},
- { 0x024b, {1, {0x024a }}},
- { 0x024d, {1, {0x024c }}},
- { 0x024f, {1, {0x024e }}},
- { 0x0250, {1, {0x2c6f }}},
- { 0x0251, {1, {0x2c6d }}},
- { 0x0252, {1, {0x2c70 }}},
- { 0x0253, {1, {0x0181 }}},
- { 0x0254, {1, {0x0186 }}},
- { 0x0256, {1, {0x0189 }}},
- { 0x0257, {1, {0x018a }}},
- { 0x0259, {1, {0x018f }}},
- { 0x025b, {1, {0x0190 }}},
- { 0x0260, {1, {0x0193 }}},
- { 0x0263, {1, {0x0194 }}},
- { 0x0265, {1, {0xa78d }}},
- { 0x0266, {1, {0xa7aa }}},
- { 0x0268, {1, {0x0197 }}},
- { 0x0269, {1, {0x0196 }}},
- { 0x026b, {1, {0x2c62 }}},
- { 0x026f, {1, {0x019c }}},
- { 0x0271, {1, {0x2c6e }}},
- { 0x0272, {1, {0x019d }}},
- { 0x0275, {1, {0x019f }}},
- { 0x027d, {1, {0x2c64 }}},
- { 0x0280, {1, {0x01a6 }}},
- { 0x0283, {1, {0x01a9 }}},
- { 0x0288, {1, {0x01ae }}},
- { 0x0289, {1, {0x0244 }}},
- { 0x028a, {1, {0x01b1 }}},
- { 0x028b, {1, {0x01b2 }}},
- { 0x028c, {1, {0x0245 }}},
- { 0x0292, {1, {0x01b7 }}},
- { 0x0371, {1, {0x0370 }}},
- { 0x0373, {1, {0x0372 }}},
- { 0x0377, {1, {0x0376 }}},
- { 0x037b, {1, {0x03fd }}},
- { 0x037c, {1, {0x03fe }}},
- { 0x037d, {1, {0x03ff }}},
- { 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, {0x0395, 0x03f5 }}},
- { 0x03b6, {1, {0x0396 }}},
- { 0x03b7, {1, {0x0397 }}},
- { 0x03b8, {3, {0x0398, 0x03d1, 0x03f4 }}},
- { 0x03b9, {3, {0x0345, 0x0399, 0x1fbe }}},
- { 0x03ba, {2, {0x039a, 0x03f0 }}},
- { 0x03bb, {1, {0x039b }}},
- { 0x03bc, {2, {0x00b5, 0x039c }}},
- { 0x03bd, {1, {0x039d }}},
- { 0x03be, {1, {0x039e }}},
- { 0x03bf, {1, {0x039f }}},
- { 0x03c0, {2, {0x03a0, 0x03d6 }}},
- { 0x03c1, {2, {0x03a1, 0x03f1 }}},
- { 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 }}},
- { 0x03d7, {1, {0x03cf }}},
- { 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 }}},
- { 0x04cf, {1, {0x04c0 }}},
- { 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 }}},
- { 0x04fb, {1, {0x04fa }}},
- { 0x04fd, {1, {0x04fc }}},
- { 0x04ff, {1, {0x04fe }}},
- { 0x0501, {1, {0x0500 }}},
- { 0x0503, {1, {0x0502 }}},
- { 0x0505, {1, {0x0504 }}},
- { 0x0507, {1, {0x0506 }}},
- { 0x0509, {1, {0x0508 }}},
- { 0x050b, {1, {0x050a }}},
- { 0x050d, {1, {0x050c }}},
- { 0x050f, {1, {0x050e }}},
- { 0x0511, {1, {0x0510 }}},
- { 0x0513, {1, {0x0512 }}},
- { 0x0515, {1, {0x0514 }}},
- { 0x0517, {1, {0x0516 }}},
- { 0x0519, {1, {0x0518 }}},
- { 0x051b, {1, {0x051a }}},
- { 0x051d, {1, {0x051c }}},
- { 0x051f, {1, {0x051e }}},
- { 0x0521, {1, {0x0520 }}},
- { 0x0523, {1, {0x0522 }}},
- { 0x0525, {1, {0x0524 }}},
- { 0x0527, {1, {0x0526 }}},
- { 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 }}},
- { 0x1d79, {1, {0xa77d }}},
- { 0x1d7d, {1, {0x2c63 }}},
- { 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, {0x1e60, 0x1e9b }}},
- { 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 }}},
- { 0x1efb, {1, {0x1efa }}},
- { 0x1efd, {1, {0x1efc }}},
- { 0x1eff, {1, {0x1efe }}},
- { 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 }}},
- { 0x214e, {1, {0x2132 }}},
- { 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 }}},
- { 0x2184, {1, {0x2183 }}},
- { 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 }}},
- { 0x2c61, {1, {0x2c60 }}},
- { 0x2c65, {1, {0x023a }}},
- { 0x2c66, {1, {0x023e }}},
- { 0x2c68, {1, {0x2c67 }}},
- { 0x2c6a, {1, {0x2c69 }}},
- { 0x2c6c, {1, {0x2c6b }}},
- { 0x2c73, {1, {0x2c72 }}},
- { 0x2c76, {1, {0x2c75 }}},
- { 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 }}},
- { 0x2cec, {1, {0x2ceb }}},
- { 0x2cee, {1, {0x2ced }}},
- { 0x2cf3, {1, {0x2cf2 }}},
- { 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 }}},
- { 0x2d27, {1, {0x10c7 }}},
- { 0x2d2d, {1, {0x10cd }}},
- { 0xa641, {1, {0xa640 }}},
- { 0xa643, {1, {0xa642 }}},
- { 0xa645, {1, {0xa644 }}},
- { 0xa647, {1, {0xa646 }}},
- { 0xa649, {1, {0xa648 }}},
- { 0xa64b, {1, {0xa64a }}},
- { 0xa64d, {1, {0xa64c }}},
- { 0xa64f, {1, {0xa64e }}},
- { 0xa651, {1, {0xa650 }}},
- { 0xa653, {1, {0xa652 }}},
- { 0xa655, {1, {0xa654 }}},
- { 0xa657, {1, {0xa656 }}},
- { 0xa659, {1, {0xa658 }}},
- { 0xa65b, {1, {0xa65a }}},
- { 0xa65d, {1, {0xa65c }}},
- { 0xa65f, {1, {0xa65e }}},
- { 0xa661, {1, {0xa660 }}},
- { 0xa663, {1, {0xa662 }}},
- { 0xa665, {1, {0xa664 }}},
- { 0xa667, {1, {0xa666 }}},
- { 0xa669, {1, {0xa668 }}},
- { 0xa66b, {1, {0xa66a }}},
- { 0xa66d, {1, {0xa66c }}},
- { 0xa681, {1, {0xa680 }}},
- { 0xa683, {1, {0xa682 }}},
- { 0xa685, {1, {0xa684 }}},
- { 0xa687, {1, {0xa686 }}},
- { 0xa689, {1, {0xa688 }}},
- { 0xa68b, {1, {0xa68a }}},
- { 0xa68d, {1, {0xa68c }}},
- { 0xa68f, {1, {0xa68e }}},
- { 0xa691, {1, {0xa690 }}},
- { 0xa693, {1, {0xa692 }}},
- { 0xa695, {1, {0xa694 }}},
- { 0xa697, {1, {0xa696 }}},
- { 0xa723, {1, {0xa722 }}},
- { 0xa725, {1, {0xa724 }}},
- { 0xa727, {1, {0xa726 }}},
- { 0xa729, {1, {0xa728 }}},
- { 0xa72b, {1, {0xa72a }}},
- { 0xa72d, {1, {0xa72c }}},
- { 0xa72f, {1, {0xa72e }}},
- { 0xa733, {1, {0xa732 }}},
- { 0xa735, {1, {0xa734 }}},
- { 0xa737, {1, {0xa736 }}},
- { 0xa739, {1, {0xa738 }}},
- { 0xa73b, {1, {0xa73a }}},
- { 0xa73d, {1, {0xa73c }}},
- { 0xa73f, {1, {0xa73e }}},
- { 0xa741, {1, {0xa740 }}},
- { 0xa743, {1, {0xa742 }}},
- { 0xa745, {1, {0xa744 }}},
- { 0xa747, {1, {0xa746 }}},
- { 0xa749, {1, {0xa748 }}},
- { 0xa74b, {1, {0xa74a }}},
- { 0xa74d, {1, {0xa74c }}},
- { 0xa74f, {1, {0xa74e }}},
- { 0xa751, {1, {0xa750 }}},
- { 0xa753, {1, {0xa752 }}},
- { 0xa755, {1, {0xa754 }}},
- { 0xa757, {1, {0xa756 }}},
- { 0xa759, {1, {0xa758 }}},
- { 0xa75b, {1, {0xa75a }}},
- { 0xa75d, {1, {0xa75c }}},
- { 0xa75f, {1, {0xa75e }}},
- { 0xa761, {1, {0xa760 }}},
- { 0xa763, {1, {0xa762 }}},
- { 0xa765, {1, {0xa764 }}},
- { 0xa767, {1, {0xa766 }}},
- { 0xa769, {1, {0xa768 }}},
- { 0xa76b, {1, {0xa76a }}},
- { 0xa76d, {1, {0xa76c }}},
- { 0xa76f, {1, {0xa76e }}},
- { 0xa77a, {1, {0xa779 }}},
- { 0xa77c, {1, {0xa77b }}},
- { 0xa77f, {1, {0xa77e }}},
- { 0xa781, {1, {0xa780 }}},
- { 0xa783, {1, {0xa782 }}},
- { 0xa785, {1, {0xa784 }}},
- { 0xa787, {1, {0xa786 }}},
- { 0xa78c, {1, {0xa78b }}},
- { 0xa791, {1, {0xa790 }}},
- { 0xa793, {1, {0xa792 }}},
- { 0xa7a1, {1, {0xa7a0 }}},
- { 0xa7a3, {1, {0xa7a2 }}},
- { 0xa7a5, {1, {0xa7a4 }}},
- { 0xa7a7, {1, {0xa7a6 }}},
- { 0xa7a9, {1, {0xa7a8 }}},
- { 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}, {2, {0x00df, 0x1e9e }}},
- { {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, {0x1f80, 0x1f88 }}},
- { {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 FOLD_TABLE_SIZE 1357
-#define UNFOLD1_TABLE_SIZE 1207
-#define UNFOLD2_TABLE_SIZE 88
-#define UNFOLD3_TABLE_SIZE 23
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
index 2e80edf525..2248b8f7cb 100644
--- a/enc/unicode/name2ctype.h
+++ b/enc/unicode/name2ctype.h
@@ -3,7 +3,7 @@
#ifndef USE_UNICODE_PROPERTIES
/* Computed positions: -k'1,3' */
#else /* USE_UNICODE_PROPERTIES */
-/* Computed positions: -k'1-3,5-6,12,16,$' */
+/* Computed positions: -k'1-3,6,12,16,$' */
#endif /* USE_UNICODE_PROPERTIES */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -34,4276 +34,9 @@ error "gperf generated tables don't work with this execution character set. Plea
#endif
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 540,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x065f,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x103f,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1baf,
- 0x1bba, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa90a, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9cf,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x11100, 0x11132,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x11680, 0x116b5,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* 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[] = {
- 42,
- 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,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xa9d0, 0xa9d9,
- 0xaa50, 0xaa59,
- 0xabf0, 0xabf9,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x11066, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 544,
- 0x0021, 0x007e,
- 0x00a1, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 0x167f,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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,
- 0x200b, 0x2027,
- 0x202a, 0x202e,
- 0x2030, 0x205e,
- 0x2060, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 618,
- 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, 0x02b8,
- 0x02c0, 0x02c1,
- 0x02e0, 0x02e4,
- 0x0345, 0x0345,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037a, 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,
- 0x0525, 0x0525,
- 0x0527, 0x0527,
- 0x0561, 0x0587,
- 0x1d00, 0x1dbf,
- 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,
- 0x2090, 0x209c,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2170, 0x217f,
- 0x2184, 0x2184,
- 0x24d0, 0x24e9,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7d,
- 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,
- 0x2cec, 0x2cec,
- 0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 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,
- 0xa661, 0xa661,
- 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, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7f8, 0xa7fa,
- 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[] = {
- 541,
- 0x0020, 0x007e,
- 0x00a0, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 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,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x2027,
- 0x202a, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 140,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00ab, 0x00ab,
- 0x00b6, 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,
- 0x0830, 0x083e,
- 0x085e, 0x085e,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0af0, 0x0af0,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1360, 0x1368,
- 0x1400, 0x1400,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x1a1e, 0x1a1f,
- 0x1aa0, 0x1aa6,
- 0x1aa8, 0x1aad,
- 0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd3, 0x1cd3,
- 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,
- 0x2d70, 0x2d70,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e3b,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa4fe, 0xa4ff,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa6f2, 0xa6f7,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa8f8, 0xa8fa,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xa9c1, 0xa9cd,
- 0xa9de, 0xa9df,
- 0xaa5c, 0xaa5f,
- 0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
- 0xabeb, 0xabeb,
- 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, 0x10102,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x10857, 0x10857,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x10a7f, 0x10a7f,
- 0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
- 0x110bb, 0x110bc,
- 0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
- 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[] = {
- 610,
- 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,
- 0x0524, 0x0524,
- 0x0526, 0x0526,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 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,
- 0x2160, 0x216f,
- 0x2183, 0x2183,
- 0x24b6, 0x24cf,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c70,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c7e, 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,
- 0x2ceb, 0x2ceb,
- 0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
- 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,
- 0xa660, 0xa660,
- 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,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
- 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[] = {
- 564,
- 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, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06df, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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,
- 0x135d, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3007,
- 0x3021, 0x302f,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa672,
- 0xa674, 0xa67d,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa8e0, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xa960, 0xa97c,
- 0xa980, 0xa9c0,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabec, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 0x10140, 0x10174,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
- 0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 566,
- 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,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07c0, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f20, 0x0f29,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x1049,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x1090, 0x1099,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8d0, 0xa8d9,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11066, 0x1106f,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11132,
- 0x11136, 0x1113f,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b5,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* 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,
@@ -4312,35 +45,34 @@ static const OnigCodePoint CR_Any[] = {
/* 'Assigned': - */
static const OnigCodePoint CR_Assigned[] = {
- 539,
+ 485,
0x0000, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x0591, 0x05c7,
0x05d0, 0x05ea,
0x05f0, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0606, 0x061b,
- 0x061e, 0x070d,
+ 0x061e, 0x061f,
+ 0x0621, 0x065e,
+ 0x0660, 0x070d,
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
0x0800, 0x082d,
0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -4384,7 +116,8 @@ static const OnigCodePoint CR_Assigned[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -4398,7 +131,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -4446,10 +179,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -4484,17 +218,17 @@ static const OnigCodePoint CR_Assigned[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -4510,7 +244,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
0x1400, 0x169c,
@@ -4547,14 +281,14 @@ static const OnigCodePoint CR_Assigned[] = {
0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -4573,25 +307,38 @@ static const OnigCodePoint CR_Assigned[] = {
0x2000, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -4600,7 +347,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -4610,21 +357,21 @@ static const OnigCodePoint CR_Assigned[] = {
0x3099, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa82b,
0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
@@ -4640,18 +387,14 @@ static const OnigCodePoint CR_Assigned[] = {
0xaa50, 0xaa59,
0xaa5c, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xd800, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -4660,7 +403,7 @@ static const OnigCodePoint CR_Assigned[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -4713,8 +456,6 @@ static const OnigCodePoint CR_Assigned[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -4730,26 +471,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -4777,75 +503,28 @@ static const OnigCodePoint CR_Assigned[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
@@ -4856,560 +535,44 @@ static const OnigCodePoint CR_Assigned[] = {
/* 'C': Major Category */
static const OnigCodePoint CR_C[] = {
- 541,
+ 20,
0x0000, 0x001f,
0x007f, 0x009f,
0x00ad, 0x00ad,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x0605,
- 0x061c, 0x061d,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
- 0x070e, 0x070f,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
+ 0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
- 0x2060, 0x206f,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfffb,
- 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
+ 0x2060, 0x2064,
+ 0x206a, 0x206f,
+ 0xd800, 0xf8ff,
+ 0xfeff, 0xfeff,
+ 0xfff9, 0xfffb,
0x110bd, 0x110bd,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
0x1d173, 0x1d17a,
- 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe00ff,
- 0xe01f0, 0x10ffff,
+ 0xe0001, 0xe0001,
+ 0xe0020, 0xe007f,
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10ffff,
}; /* CR_C */
/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
+static const OnigCodePoint CR_Cc[] = {
+ 2,
+ 0x0000, 0x001f,
+ 0x007f, 0x009f,
+}; /* CR_Cc */
/* 'Cf': General Category */
static const OnigCodePoint CR_Cf[] = {
- 14,
+ 15,
0x00ad, 0x00ad,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
0x2060, 0x2064,
@@ -5424,35 +587,34 @@ static const OnigCodePoint CR_Cf[] = {
/* 'Cn': General Category */
static const OnigCodePoint CR_Cn[] = {
- 539,
+ 485,
0x0378, 0x0379,
0x037f, 0x0383,
0x038b, 0x038b,
0x038d, 0x038d,
0x03a2, 0x03a2,
- 0x0528, 0x0530,
+ 0x0526, 0x0530,
0x0557, 0x0558,
0x0560, 0x0560,
0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
+ 0x058b, 0x0590,
0x05c8, 0x05cf,
0x05eb, 0x05ef,
0x05f5, 0x05ff,
- 0x0605, 0x0605,
+ 0x0604, 0x0605,
0x061c, 0x061d,
+ 0x0620, 0x0620,
+ 0x065f, 0x065f,
0x070e, 0x070e,
0x074b, 0x074c,
0x07b2, 0x07bf,
0x07fb, 0x07ff,
0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
+ 0x083f, 0x08ff,
+ 0x093a, 0x093b,
+ 0x094f, 0x094f,
+ 0x0956, 0x0957,
+ 0x0973, 0x0978,
0x0980, 0x0980,
0x0984, 0x0984,
0x098d, 0x098e,
@@ -5496,6 +658,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0ace, 0x0acf,
0x0ad1, 0x0adf,
0x0ae4, 0x0ae5,
+ 0x0af0, 0x0af0,
0x0af2, 0x0b00,
0x0b04, 0x0b04,
0x0b0d, 0x0b0e,
@@ -5510,7 +673,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0b58, 0x0b5b,
0x0b5e, 0x0b5e,
0x0b64, 0x0b65,
- 0x0b78, 0x0b81,
+ 0x0b72, 0x0b81,
0x0b84, 0x0b84,
0x0b8b, 0x0b8d,
0x0b91, 0x0b91,
@@ -5558,10 +721,11 @@ static const OnigCodePoint CR_Cn[] = {
0x0d04, 0x0d04,
0x0d0d, 0x0d0d,
0x0d11, 0x0d11,
- 0x0d3b, 0x0d3c,
+ 0x0d29, 0x0d29,
+ 0x0d3a, 0x0d3c,
0x0d45, 0x0d45,
0x0d49, 0x0d49,
- 0x0d4f, 0x0d56,
+ 0x0d4e, 0x0d56,
0x0d58, 0x0d5f,
0x0d64, 0x0d65,
0x0d76, 0x0d78,
@@ -5596,16 +760,16 @@ static const OnigCodePoint CR_Cn[] = {
0x0ec7, 0x0ec7,
0x0ece, 0x0ecf,
0x0eda, 0x0edb,
- 0x0ee0, 0x0eff,
+ 0x0ede, 0x0eff,
0x0f48, 0x0f48,
0x0f6d, 0x0f70,
+ 0x0f8c, 0x0f8f,
0x0f98, 0x0f98,
0x0fbd, 0x0fbd,
0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
+ 0x0fd9, 0x0fff,
+ 0x10c6, 0x10cf,
+ 0x10fd, 0x10ff,
0x1249, 0x1249,
0x124e, 0x124f,
0x1257, 0x1257,
@@ -5621,7 +785,7 @@ static const OnigCodePoint CR_Cn[] = {
0x12d7, 0x12d7,
0x1311, 0x1311,
0x1316, 0x1317,
- 0x135b, 0x135c,
+ 0x135b, 0x135e,
0x137d, 0x137f,
0x139a, 0x139f,
0x13f5, 0x13ff,
@@ -5659,13 +823,13 @@ static const OnigCodePoint CR_Cn[] = {
0x1aae, 0x1aff,
0x1b4c, 0x1b4f,
0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
+ 0x1bab, 0x1bad,
+ 0x1bba, 0x1bff,
0x1c38, 0x1c3a,
0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
+ 0x1c80, 0x1ccf,
+ 0x1cf3, 0x1cff,
+ 0x1de7, 0x1dfc,
0x1f16, 0x1f17,
0x1f1e, 0x1f1f,
0x1f46, 0x1f47,
@@ -5685,24 +849,37 @@ static const OnigCodePoint CR_Cn[] = {
0x2065, 0x2069,
0x2072, 0x2073,
0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
+ 0x2095, 0x209f,
+ 0x20b9, 0x20cf,
0x20f1, 0x20ff,
0x218a, 0x218f,
- 0x23f4, 0x23ff,
+ 0x23e9, 0x23ff,
0x2427, 0x243f,
0x244b, 0x245f,
+ 0x26ce, 0x26ce,
+ 0x26e2, 0x26e2,
+ 0x26e4, 0x26e7,
0x2700, 0x2700,
+ 0x2705, 0x2705,
+ 0x270a, 0x270b,
+ 0x2728, 0x2728,
+ 0x274c, 0x274c,
+ 0x274e, 0x274e,
+ 0x2753, 0x2755,
+ 0x275f, 0x2760,
+ 0x2795, 0x2797,
+ 0x27b0, 0x27b0,
+ 0x27bf, 0x27bf,
+ 0x27cb, 0x27cb,
+ 0x27cd, 0x27cf,
0x2b4d, 0x2b4f,
0x2b5a, 0x2bff,
0x2c2f, 0x2c2f,
0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
+ 0x2cf2, 0x2cf8,
+ 0x2d26, 0x2d2f,
+ 0x2d66, 0x2d6e,
+ 0x2d70, 0x2d7f,
0x2d97, 0x2d9f,
0x2da7, 0x2da7,
0x2daf, 0x2daf,
@@ -5712,7 +889,7 @@ static const OnigCodePoint CR_Cn[] = {
0x2dcf, 0x2dcf,
0x2dd7, 0x2dd7,
0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
+ 0x2e32, 0x2e7f,
0x2e9a, 0x2e9a,
0x2ef4, 0x2eff,
0x2fd6, 0x2fef,
@@ -5722,20 +899,20 @@ static const OnigCodePoint CR_Cn[] = {
0x3100, 0x3104,
0x312e, 0x3130,
0x318f, 0x318f,
- 0x31bb, 0x31bf,
+ 0x31b8, 0x31bf,
0x31e4, 0x31ef,
0x321f, 0x321f,
0x32ff, 0x32ff,
0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
+ 0x9fcc, 0x9fff,
0xa48d, 0xa48f,
0xa4c7, 0xa4cf,
0xa62c, 0xa63f,
- 0xa698, 0xa69e,
+ 0xa660, 0xa661,
+ 0xa674, 0xa67b,
+ 0xa698, 0xa69f,
0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
+ 0xa78d, 0xa7fa,
0xa82c, 0xa82f,
0xa83a, 0xa83f,
0xa878, 0xa87f,
@@ -5752,17 +929,13 @@ static const OnigCodePoint CR_Cn[] = {
0xaa5a, 0xaa5b,
0xaa7c, 0xaa7f,
0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
+ 0xaae0, 0xabbf,
0xabee, 0xabef,
0xabfa, 0xabff,
0xd7a4, 0xd7af,
0xd7c7, 0xd7ca,
0xd7fc, 0xd7ff,
+ 0xfa2e, 0xfa2f,
0xfa6e, 0xfa6f,
0xfada, 0xfaff,
0xfb07, 0xfb12,
@@ -5772,7 +945,7 @@ static const OnigCodePoint CR_Cn[] = {
0xfb3f, 0xfb3f,
0xfb42, 0xfb42,
0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
+ 0xfbb2, 0xfbd2,
0xfd40, 0xfd4f,
0xfd90, 0xfd91,
0xfdc8, 0xfdef,
@@ -5824,9 +997,7 @@ static const OnigCodePoint CR_Cn[] = {
0x10860, 0x108ff,
0x1091c, 0x1091e,
0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
+ 0x10940, 0x109ff,
0x10a04, 0x10a04,
0x10a07, 0x10a0b,
0x10a14, 0x10a14,
@@ -5841,27 +1012,12 @@ static const OnigCodePoint CR_Cn[] = {
0x10b73, 0x10b77,
0x10b80, 0x10bff,
0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
+ 0x10e7f, 0x1107f,
+ 0x110c2, 0x11fff,
0x1236f, 0x123ff,
0x12463, 0x1246f,
0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
+ 0x1342f, 0x1cfff,
0x1d0f6, 0x1d0ff,
0x1d127, 0x1d128,
0x1d1de, 0x1d1ff,
@@ -5888,76 +1044,29 @@ static const OnigCodePoint CR_Cn[] = {
0x1d551, 0x1d551,
0x1d6a6, 0x1d6a7,
0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
+ 0x1d800, 0x1efff,
0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
+ 0x1f094, 0x1f0ff,
0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
+ 0x1f12f, 0x1f130,
+ 0x1f132, 0x1f13c,
+ 0x1f13e, 0x1f13e,
+ 0x1f140, 0x1f141,
+ 0x1f143, 0x1f145,
+ 0x1f147, 0x1f149,
+ 0x1f14f, 0x1f156,
+ 0x1f158, 0x1f15e,
+ 0x1f160, 0x1f178,
+ 0x1f17a, 0x1f17a,
+ 0x1f17d, 0x1f17e,
+ 0x1f180, 0x1f189,
+ 0x1f18e, 0x1f18f,
+ 0x1f191, 0x1f1ff,
+ 0x1f201, 0x1f20f,
+ 0x1f232, 0x1f23f,
+ 0x1f249, 0x1ffff,
0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
+ 0x2b735, 0x2f7ff,
0x2fa1e, 0xe0000,
0xe0002, 0xe001f,
0xe0080, 0xe00ff,
@@ -5982,7 +1091,7 @@ static const OnigCodePoint CR_Cs[] = {
/* 'L': Major Category */
static const OnigCodePoint CR_L[] = {
- 486,
+ 422,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -6004,13 +1113,13 @@ static const OnigCodePoint CR_L[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -6029,14 +1138,11 @@ static const OnigCodePoint CR_L[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -6105,12 +1211,11 @@ static const OnigCodePoint CR_L[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -6137,11 +1242,11 @@ static const OnigCodePoint CR_L[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -6152,10 +1257,9 @@ static const OnigCodePoint CR_L[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -6202,13 +1306,11 @@ static const OnigCodePoint CR_L[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -6231,7 +1333,7 @@ static const OnigCodePoint CR_L[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -6250,11 +1352,8 @@ static const OnigCodePoint CR_L[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -6275,24 +1374,23 @@ static const OnigCodePoint CR_L[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6e5,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -6317,18 +1415,12 @@ static const OnigCodePoint CR_L[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -6377,8 +1469,6 @@ static const OnigCodePoint CR_L[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -6388,20 +1478,9 @@ static const OnigCodePoint CR_L[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -6432,168 +1511,18 @@ static const OnigCodePoint CR_L[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_L */
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
- 113,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00b5, 0x00b5,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x01ba,
- 0x01bc, 0x01bf,
- 0x01c4, 0x0293,
- 0x0295, 0x02af,
- 0x0370, 0x0373,
- 0x0376, 0x0377,
- 0x037b, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0561, 0x0587,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1d9a,
- 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,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c7b,
- 0x2c7e, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
- 0xa680, 0xa697,
- 0xa722, 0xa76f,
- 0xa771, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7fa, 0xa7fa,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0x10400, 0x1044f,
- 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,
-}; /* CR_LC */
-
/* 'Ll': General Category */
static const OnigCodePoint CR_Ll[] = {
- 611,
+ 599,
0x0061, 0x007a,
+ 0x00aa, 0x00aa,
0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
0x00df, 0x00f6,
0x00f8, 0x00ff,
0x0101, 0x0101,
@@ -6856,10 +1785,9 @@ static const OnigCodePoint CR_Ll[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
+ 0x1d62, 0x1d77,
0x1d79, 0x1d9a,
0x1e01, 0x1e01,
0x1e03, 0x1e03,
@@ -7023,7 +1951,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2c6c, 0x2c6c,
0x2c71, 0x2c71,
0x2c73, 0x2c74,
- 0x2c76, 0x2c7b,
+ 0x2c76, 0x2c7c,
0x2c81, 0x2c81,
0x2c83, 0x2c83,
0x2c85, 0x2c85,
@@ -7076,10 +2004,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2ce3, 0x2ce4,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -7096,7 +2021,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -7162,15 +2086,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7fa, 0xa7fa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -7207,7 +2122,7 @@ static const OnigCodePoint CR_Ll[] = {
/* 'Lm': General Category */
static const OnigCodePoint CR_Lm[] = {
- 52,
+ 49,
0x02b0, 0x02c1,
0x02c6, 0x02d1,
0x02e0, 0x02e4,
@@ -7231,13 +2146,13 @@ static const OnigCodePoint CR_Lm[] = {
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c78, 0x1c7d,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
- 0x2c7c, 0x2c7d,
+ 0x2090, 0x2094,
+ 0x2c7d, 0x2c7d,
0x2d6f, 0x2d6f,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
@@ -7252,27 +2167,22 @@ static const OnigCodePoint CR_Lm[] = {
0xa717, 0xa71f,
0xa770, 0xa770,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
0xff9e, 0xff9f,
- 0x16f93, 0x16f9f,
}; /* CR_Lm */
/* 'Lo': General Category */
static const OnigCodePoint CR_Lo[] = {
- 371,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 311,
0x01bb, 0x01bb,
0x01c0, 0x01c3,
0x0294, 0x0294,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
@@ -7286,14 +2196,11 @@ static const OnigCodePoint CR_Lo[] = {
0x07b1, 0x07b1,
0x07ca, 0x07ea,
0x0800, 0x0815,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0972, 0x0977,
+ 0x0972, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -7362,12 +2269,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -7393,11 +2299,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0eb2, 0x0eb3,
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -7408,7 +2314,7 @@ static const OnigCodePoint CR_Lo[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10d0, 0x10fa,
- 0x10fd, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -7454,15 +2360,13 @@ static const OnigCodePoint CR_Lo[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c77,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x2135, 0x2138,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -7480,10 +2384,10 @@ static const OnigCodePoint CR_Lo[] = {
0x30ff, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa014,
0xa016, 0xa48c,
0xa4d0, 0xa4f7,
@@ -7517,18 +2421,12 @@ static const OnigCodePoint CR_Lo[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadc,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf2,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb1d, 0xfb1d,
0xfb1f, 0xfb28,
@@ -7575,8 +2473,6 @@ static const OnigCodePoint CR_Lo[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -7586,55 +2482,11 @@ static const OnigCodePoint CR_Lo[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x1b000, 0x1b001,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Lo */
@@ -7655,7 +2507,7 @@ static const OnigCodePoint CR_Lt[] = {
/* 'Lu': General Category */
static const OnigCodePoint CR_Lu[] = {
- 608,
+ 594,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -7921,11 +2773,8 @@ static const OnigCodePoint CR_Lu[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -8140,7 +2989,6 @@ static const OnigCodePoint CR_Lu[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -8157,7 +3005,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -8222,15 +3069,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
0x1d400, 0x1d419,
@@ -8268,7 +3106,7 @@ static const OnigCodePoint CR_Lu[] = {
/* 'M': Major Category */
static const OnigCodePoint CR_M[] = {
- 204,
+ 188,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -8277,10 +3115,10 @@ static const OnigCodePoint CR_M[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -8291,12 +3129,10 @@ static const OnigCodePoint CR_M[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093c,
- 0x093e, 0x094f,
- 0x0951, 0x0957,
+ 0x093c, 0x093c,
+ 0x093e, 0x094e,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09bc, 0x09bc,
@@ -8370,7 +3206,7 @@ static const OnigCodePoint CR_M[] = {
0x0f3e, 0x0f3f,
0x0f71, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102b, 0x103e,
@@ -8382,12 +3218,12 @@ static const OnigCodePoint CR_M[] = {
0x1082, 0x108d,
0x108f, 0x108f,
0x109a, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17d3,
+ 0x17b6, 0x17d3,
0x17dd, 0x17dd,
0x180b, 0x180d,
0x18a9, 0x18a9,
@@ -8403,24 +3239,21 @@ static const OnigCodePoint CR_M[] = {
0x1b34, 0x1b44,
0x1b6b, 0x1b73,
0x1b80, 0x1b82,
- 0x1ba1, 0x1bad,
- 0x1be6, 0x1bf3,
+ 0x1ba1, 0x1baa,
0x1c24, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf2, 0x1cf4,
+ 0x1cf2, 0x1cf2,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8442,8 +3275,6 @@ static const OnigCodePoint CR_M[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf6,
0xabe3, 0xabea,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
@@ -8455,17 +3286,8 @@ static const OnigCodePoint CR_M[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11000, 0x11002,
- 0x11038, 0x11046,
0x11080, 0x11082,
0x110b0, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x11134,
- 0x11180, 0x11182,
- 0x111b3, 0x111c0,
- 0x116ab, 0x116b7,
- 0x16f51, 0x16f7e,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -8477,12 +3299,11 @@ static const OnigCodePoint CR_M[] = {
/* 'Mc': General Category */
static const OnigCodePoint CR_Mc[] = {
- 126,
+ 106,
0x0903, 0x0903,
- 0x093b, 0x093b,
0x093e, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x094f,
+ 0x094e, 0x094e,
0x0982, 0x0983,
0x09be, 0x09c0,
0x09c7, 0x09c8,
@@ -8559,16 +3380,10 @@ static const OnigCodePoint CR_Mc[] = {
0x1ba1, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
0x1c24, 0x1c2b,
0x1c34, 0x1c35,
0x1ce1, 0x1ce1,
- 0x1cf2, 0x1cf3,
- 0x302e, 0x302f,
+ 0x1cf2, 0x1cf2,
0xa823, 0xa824,
0xa827, 0xa827,
0xa880, 0xa881,
@@ -8582,34 +3397,22 @@ static const OnigCodePoint CR_Mc[] = {
0xaa33, 0xaa34,
0xaa4d, 0xaa4d,
0xaa7b, 0xaa7b,
- 0xaaeb, 0xaaeb,
- 0xaaee, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabea,
0xabec, 0xabec,
- 0x11000, 0x11000,
- 0x11002, 0x11002,
0x11082, 0x11082,
0x110b0, 0x110b2,
0x110b7, 0x110b8,
- 0x1112c, 0x1112c,
- 0x11182, 0x11182,
- 0x111b3, 0x111b5,
- 0x111bf, 0x111c0,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x16f51, 0x16f7e,
0x1d165, 0x1d166,
0x1d16d, 0x1d172,
}; /* CR_Mc */
/* 'Me': General Category */
static const OnigCodePoint CR_Me[] = {
- 4,
+ 5,
0x0488, 0x0489,
+ 0x06de, 0x06de,
0x20dd, 0x20e0,
0x20e2, 0x20e4,
0xa670, 0xa672,
@@ -8617,7 +3420,7 @@ static const OnigCodePoint CR_Me[] = {
/* 'Mn': General Category */
static const OnigCodePoint CR_Mn[] = {
- 220,
+ 194,
0x0300, 0x036f,
0x0483, 0x0487,
0x0591, 0x05bd,
@@ -8626,7 +3429,7 @@ static const OnigCodePoint CR_Mn[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06df, 0x06e4,
@@ -8640,14 +3443,11 @@ static const OnigCodePoint CR_Mn[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -8708,7 +3508,7 @@ static const OnigCodePoint CR_Mn[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -8722,12 +3522,11 @@ static const OnigCodePoint CR_Mn[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -8755,31 +3554,23 @@ static const OnigCodePoint CR_Mn[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa66f,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8803,8 +3594,6 @@ static const OnigCodePoint CR_Mn[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -8817,21 +3606,9 @@ static const OnigCodePoint CR_Mn[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d167, 0x1d169,
0x1d17b, 0x1d182,
0x1d185, 0x1d18b,
@@ -8842,7 +3619,7 @@ static const OnigCodePoint CR_Mn[] = {
/* 'N': Major Category */
static const OnigCodePoint CR_N[] = {
- 88,
+ 81,
0x0030, 0x0039,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
@@ -8856,7 +3633,6 @@ static const OnigCodePoint CR_N[] = {
0x0a66, 0x0a6f,
0x0ae6, 0x0aef,
0x0b66, 0x0b6f,
- 0x0b72, 0x0b77,
0x0be6, 0x0bf2,
0x0c66, 0x0c6f,
0x0c78, 0x0c7e,
@@ -8894,7 +3670,6 @@ static const OnigCodePoint CR_N[] = {
0x3038, 0x303a,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8922,11 +3697,6 @@ static const OnigCodePoint CR_N[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
0x12400, 0x12462,
0x1d360, 0x1d371,
0x1d7ce, 0x1d7ff,
@@ -8934,7 +3704,46 @@ static const OnigCodePoint CR_N[] = {
}; /* CR_N */
/* 'Nd': General Category */
-#define CR_Nd CR_Digit
+static const OnigCodePoint CR_Nd[] = {
+ 37,
+ 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, 0x19da,
+ 0x1a80, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1b50, 0x1b59,
+ 0x1bb0, 0x1bb9,
+ 0x1c40, 0x1c49,
+ 0x1c50, 0x1c59,
+ 0xa620, 0xa629,
+ 0xa8d0, 0xa8d9,
+ 0xa900, 0xa909,
+ 0xa9d0, 0xa9d9,
+ 0xaa50, 0xaa59,
+ 0xabf0, 0xabf9,
+ 0xff10, 0xff19,
+ 0x104a0, 0x104a9,
+ 0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
/* 'Nl': General Category */
static const OnigCodePoint CR_Nl[] = {
@@ -8955,19 +3764,17 @@ static const OnigCodePoint CR_Nl[] = {
/* 'No': General Category */
static const OnigCodePoint CR_No[] = {
- 42,
+ 38,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
0x00bc, 0x00be,
0x09f4, 0x09f9,
- 0x0b72, 0x0b77,
0x0bf0, 0x0bf2,
0x0c78, 0x0c7e,
0x0d70, 0x0d75,
0x0f2a, 0x0f33,
0x1369, 0x137c,
0x17f0, 0x17f9,
- 0x19da, 0x19da,
0x2070, 0x2070,
0x2074, 0x2079,
0x2080, 0x2089,
@@ -8979,7 +3786,6 @@ static const OnigCodePoint CR_No[] = {
0x2cfd, 0x2cfd,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8995,13 +3801,143 @@ static const OnigCodePoint CR_No[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x11065,
0x1d360, 0x1d371,
0x1f100, 0x1f10a,
}; /* CR_No */
/* 'P': Major Category */
-#define CR_P CR_Punct
+static const OnigCodePoint CR_P[] = {
+ 129,
+ 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,
+ 0x0830, 0x083e,
+ 0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0df4, 0x0df4,
+ 0x0e4f, 0x0e4f,
+ 0x0e5a, 0x0e5b,
+ 0x0f04, 0x0f12,
+ 0x0f3a, 0x0f3d,
+ 0x0f85, 0x0f85,
+ 0x0fd0, 0x0fd4,
+ 0x104a, 0x104f,
+ 0x10fb, 0x10fb,
+ 0x1361, 0x1368,
+ 0x1400, 0x1400,
+ 0x166d, 0x166e,
+ 0x169b, 0x169c,
+ 0x16eb, 0x16ed,
+ 0x1735, 0x1736,
+ 0x17d4, 0x17d6,
+ 0x17d8, 0x17da,
+ 0x1800, 0x180a,
+ 0x1944, 0x1945,
+ 0x19de, 0x19df,
+ 0x1a1e, 0x1a1f,
+ 0x1aa0, 0x1aa6,
+ 0x1aa8, 0x1aad,
+ 0x1b5a, 0x1b60,
+ 0x1c3b, 0x1c3f,
+ 0x1c7e, 0x1c7f,
+ 0x1cd3, 0x1cd3,
+ 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, 0x2e31,
+ 0x3001, 0x3003,
+ 0x3008, 0x3011,
+ 0x3014, 0x301f,
+ 0x3030, 0x3030,
+ 0x303d, 0x303d,
+ 0x30a0, 0x30a0,
+ 0x30fb, 0x30fb,
+ 0xa4fe, 0xa4ff,
+ 0xa60d, 0xa60f,
+ 0xa673, 0xa673,
+ 0xa67e, 0xa67e,
+ 0xa6f2, 0xa6f7,
+ 0xa874, 0xa877,
+ 0xa8ce, 0xa8cf,
+ 0xa8f8, 0xa8fa,
+ 0xa92e, 0xa92f,
+ 0xa95f, 0xa95f,
+ 0xa9c1, 0xa9cd,
+ 0xa9de, 0xa9df,
+ 0xaa5c, 0xaa5f,
+ 0xaade, 0xaadf,
+ 0xabeb, 0xabeb,
+ 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,
+ 0x10857, 0x10857,
+ 0x1091f, 0x1091f,
+ 0x1093f, 0x1093f,
+ 0x10a50, 0x10a58,
+ 0x10a7f, 0x10a7f,
+ 0x10b39, 0x10b3f,
+ 0x110bb, 0x110bc,
+ 0x110be, 0x110c1,
+ 0x12470, 0x12473,
+}; /* CR_P */
/* 'Pc': General Category */
static const OnigCodePoint CR_Pc[] = {
@@ -9016,7 +3952,7 @@ static const OnigCodePoint CR_Pc[] = {
/* 'Pd': General Category */
static const OnigCodePoint CR_Pd[] = {
- 16,
+ 15,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -9025,7 +3961,6 @@ static const OnigCodePoint CR_Pd[] = {
0x2010, 0x2015,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -9143,7 +4078,7 @@ static const OnigCodePoint CR_Pi[] = {
/* 'Po': General Category */
static const OnigCodePoint CR_Po[] = {
- 135,
+ 124,
0x0021, 0x0023,
0x0025, 0x0027,
0x002a, 0x002a,
@@ -9153,8 +4088,7 @@ static const OnigCodePoint CR_Po[] = {
0x003f, 0x0040,
0x005c, 0x005c,
0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00b6, 0x00b7,
+ 0x00b7, 0x00b7,
0x00bf, 0x00bf,
0x037e, 0x037e,
0x0387, 0x0387,
@@ -9173,21 +4107,17 @@ static const OnigCodePoint CR_Po[] = {
0x0700, 0x070d,
0x07f7, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0970, 0x0970,
- 0x0af0, 0x0af0,
0x0df4, 0x0df4,
0x0e4f, 0x0e4f,
0x0e5a, 0x0e5b,
0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
0x0f85, 0x0f85,
0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
0x104a, 0x104f,
0x10fb, 0x10fb,
- 0x1360, 0x1368,
+ 0x1361, 0x1368,
0x166d, 0x166e,
0x16eb, 0x16ed,
0x1735, 0x1736,
@@ -9196,14 +4126,13 @@ static const OnigCodePoint CR_Po[] = {
0x1800, 0x1805,
0x1807, 0x180a,
0x1944, 0x1945,
+ 0x19de, 0x19df,
0x1a1e, 0x1a1f,
0x1aa0, 0x1aa6,
0x1aa8, 0x1aad,
0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
0x1c3b, 0x1c3f,
0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x2016, 0x2017,
0x2020, 0x2027,
@@ -9215,7 +4144,6 @@ static const OnigCodePoint CR_Po[] = {
0x2055, 0x205e,
0x2cf9, 0x2cfc,
0x2cfe, 0x2cff,
- 0x2d70, 0x2d70,
0x2e00, 0x2e01,
0x2e06, 0x2e08,
0x2e0b, 0x2e0b,
@@ -9224,7 +4152,7 @@ static const OnigCodePoint CR_Po[] = {
0x2e1b, 0x2e1b,
0x2e1e, 0x2e1f,
0x2e2a, 0x2e2e,
- 0x2e30, 0x2e39,
+ 0x2e30, 0x2e31,
0x3001, 0x3003,
0x303d, 0x303d,
0x30fb, 0x30fb,
@@ -9242,7 +4170,6 @@ static const OnigCodePoint CR_Po[] = {
0xa9de, 0xa9df,
0xaa5c, 0xaa5f,
0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe10, 0xfe16,
0xfe19, 0xfe19,
@@ -9264,7 +4191,7 @@ static const OnigCodePoint CR_Po[] = {
0xff3c, 0xff3c,
0xff61, 0xff61,
0xff64, 0xff65,
- 0x10100, 0x10102,
+ 0x10100, 0x10101,
0x1039f, 0x1039f,
0x103d0, 0x103d0,
0x10857, 0x10857,
@@ -9273,11 +4200,8 @@ static const OnigCodePoint CR_Po[] = {
0x10a50, 0x10a58,
0x10a7f, 0x10a7f,
0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
0x12470, 0x12473,
}; /* CR_Po */
@@ -9368,11 +4292,11 @@ static const OnigCodePoint CR_S[] = {
0x0060, 0x0060,
0x007c, 0x007c,
0x007e, 0x007e,
- 0x00a2, 0x00a6,
- 0x00a8, 0x00a9,
+ 0x00a2, 0x00a9,
0x00ac, 0x00ac,
0x00ae, 0x00b1,
0x00b4, 0x00b4,
+ 0x00b6, 0x00b6,
0x00b8, 0x00b8,
0x00d7, 0x00d7,
0x00f7, 0x00f7,
@@ -9385,11 +4309,9 @@ static const OnigCodePoint CR_S[] = {
0x0384, 0x0385,
0x03f6, 0x03f6,
0x0482, 0x0482,
- 0x058f, 0x058f,
0x0606, 0x0608,
0x060b, 0x060b,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9399,11 +4321,11 @@ static const OnigCodePoint CR_S[] = {
0x0b70, 0x0b70,
0x0bf3, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0e3f, 0x0e3f,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9413,10 +4335,11 @@ static const OnigCodePoint CR_S[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x17db, 0x17db,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x1fbd, 0x1fbd,
@@ -9429,7 +4352,7 @@ static const OnigCodePoint CR_S[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
@@ -9445,14 +4368,29 @@ static const OnigCodePoint CR_S[] = {
0x214a, 0x214d,
0x214f, 0x214f,
0x2190, 0x2328,
- 0x232b, 0x23f3,
+ 0x232b, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
- 0x2500, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x2500, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27c4,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x2982,
0x2999, 0x29d7,
0x29dc, 0x29fb,
@@ -9473,8 +4411,7 @@ static const OnigCodePoint CR_S[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9488,7 +4425,6 @@ static const OnigCodePoint CR_S[] = {
0xa836, 0xa839,
0xaa77, 0xaa79,
0xfb29, 0xfb29,
- 0xfbb2, 0xfbc1,
0xfdfc, 0xfdfd,
0xfe62, 0xfe62,
0xfe64, 0xfe66,
@@ -9503,6 +4439,7 @@ static const OnigCodePoint CR_S[] = {
0xffe0, 0xffe6,
0xffe8, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9527,46 +4464,32 @@ static const OnigCodePoint CR_S[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_S */
/* 'Sc': General Category */
static const OnigCodePoint CR_Sc[] = {
- 17,
+ 16,
0x0024, 0x0024,
0x00a2, 0x00a5,
- 0x058f, 0x058f,
0x060b, 0x060b,
0x09f2, 0x09f3,
0x09fb, 0x09fb,
@@ -9574,7 +4497,7 @@ static const OnigCodePoint CR_Sc[] = {
0x0bf9, 0x0bf9,
0x0e3f, 0x0e3f,
0x17db, 0x17db,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0xa838, 0xa838,
0xfdfc, 0xfdfc,
0xfe69, 0xfe69,
@@ -9585,7 +4508,7 @@ static const OnigCodePoint CR_Sc[] = {
/* 'Sk': General Category */
static const OnigCodePoint CR_Sk[] = {
- 27,
+ 26,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -9609,7 +4532,6 @@ static const OnigCodePoint CR_Sk[] = {
0xa700, 0xa716,
0xa720, 0xa721,
0xa789, 0xa78a,
- 0xfbb2, 0xfbc1,
0xff3e, 0xff3e,
0xff40, 0xff40,
0xffe3, 0xffe3,
@@ -9632,7 +4554,6 @@ static const OnigCodePoint CR_Sm[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x2118, 0x2118,
0x2140, 0x2144,
0x214b, 0x214b,
0x2190, 0x2194,
@@ -9655,7 +4576,9 @@ static const OnigCodePoint CR_Sm[] = {
0x25f8, 0x25ff,
0x266f, 0x266f,
0x27c0, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x27ff,
0x2900, 0x2982,
0x2999, 0x29d7,
@@ -9682,19 +4605,18 @@ static const OnigCodePoint CR_Sm[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
}; /* CR_Sm */
/* 'So': General Category */
static const OnigCodePoint CR_So[] = {
- 153,
- 0x00a6, 0x00a6,
+ 154,
+ 0x00a6, 0x00a7,
0x00a9, 0x00a9,
0x00ae, 0x00ae,
0x00b0, 0x00b0,
+ 0x00b6, 0x00b6,
0x0482, 0x0482,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9703,10 +4625,10 @@ static const OnigCodePoint CR_So[] = {
0x0bf3, 0x0bf8,
0x0bfa, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9716,16 +4638,17 @@ static const OnigCodePoint CR_So[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
0x2114, 0x2114,
- 0x2116, 0x2117,
+ 0x2116, 0x2118,
0x211e, 0x2123,
0x2125, 0x2125,
0x2127, 0x2127,
@@ -9750,7 +4673,7 @@ static const OnigCodePoint CR_So[] = {
0x232b, 0x237b,
0x237d, 0x239a,
0x23b4, 0x23db,
- 0x23e2, 0x23f3,
+ 0x23e2, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
@@ -9758,9 +4681,21 @@ static const OnigCodePoint CR_So[] = {
0x25b8, 0x25c0,
0x25c2, 0x25f7,
0x2600, 0x266e,
- 0x2670, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27bf,
+ 0x2670, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
0x2800, 0x28ff,
0x2b00, 0x2b2f,
0x2b45, 0x2b46,
@@ -9779,8 +4714,7 @@ static const OnigCodePoint CR_So[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9796,6 +4730,7 @@ static const OnigCodePoint CR_So[] = {
0xffe8, 0xffe8,
0xffed, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9812,35 +4747,23 @@ static const OnigCodePoint CR_So[] = {
0x1d300, 0x1d356,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_So */
/* 'Z': Major Category */
@@ -9884,7 +4807,7 @@ static const OnigCodePoint CR_Zs[] = {
/* 'Math': Derived Property */
static const OnigCodePoint CR_Math[] = {
- 138,
+ 105,
0x002b, 0x002b,
0x003c, 0x003e,
0x005e, 0x005e,
@@ -9912,10 +4835,9 @@ static const OnigCodePoint CR_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
- 0x2118, 0x211d,
+ 0x2119, 0x211d,
0x2124, 0x2124,
0x2128, 0x2129,
0x212c, 0x212d,
@@ -9953,7 +4875,9 @@ static const OnigCodePoint CR_Math[] = {
0x2642, 0x2642,
0x2660, 0x2663,
0x266d, 0x266f,
- 0x27c0, 0x27ff,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2aff,
0x2b30, 0x2b44,
0x2b47, 0x2b4c,
@@ -9989,54 +4913,1698 @@ static const OnigCodePoint CR_Math[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Math */
/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
+static const OnigCodePoint CR_Alphabetic[] = {
+ 474,
+ 0x0041, 0x005a,
+ 0x0061, 0x007a,
+ 0x00aa, 0x00aa,
+ 0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
+ 0x00c0, 0x00d6,
+ 0x00d8, 0x00f6,
+ 0x00f8, 0x02c1,
+ 0x02c6, 0x02d1,
+ 0x02e0, 0x02e4,
+ 0x02ec, 0x02ec,
+ 0x02ee, 0x02ee,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
+ 0x038c, 0x038c,
+ 0x038e, 0x03a1,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
+ 0x0531, 0x0556,
+ 0x0559, 0x0559,
+ 0x0561, 0x0587,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
+ 0x05d0, 0x05ea,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06ef,
+ 0x06fa, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
+ 0x074d, 0x07b1,
+ 0x07ca, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0971, 0x0972,
+ 0x0979, 0x097f,
+ 0x0981, 0x0983,
+ 0x0985, 0x098c,
+ 0x098f, 0x0990,
+ 0x0993, 0x09a8,
+ 0x09aa, 0x09b0,
+ 0x09b2, 0x09b2,
+ 0x09b6, 0x09b9,
+ 0x09bd, 0x09c4,
+ 0x09c7, 0x09c8,
+ 0x09cb, 0x09cc,
+ 0x09ce, 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,
+ 0x0a3e, 0x0a42,
+ 0x0a47, 0x0a48,
+ 0x0a4b, 0x0a4c,
+ 0x0a51, 0x0a51,
+ 0x0a59, 0x0a5c,
+ 0x0a5e, 0x0a5e,
+ 0x0a70, 0x0a75,
+ 0x0a81, 0x0a83,
+ 0x0a85, 0x0a8d,
+ 0x0a8f, 0x0a91,
+ 0x0a93, 0x0aa8,
+ 0x0aaa, 0x0ab0,
+ 0x0ab2, 0x0ab3,
+ 0x0ab5, 0x0ab9,
+ 0x0abd, 0x0ac5,
+ 0x0ac7, 0x0ac9,
+ 0x0acb, 0x0acc,
+ 0x0ad0, 0x0ad0,
+ 0x0ae0, 0x0ae3,
+ 0x0b01, 0x0b03,
+ 0x0b05, 0x0b0c,
+ 0x0b0f, 0x0b10,
+ 0x0b13, 0x0b28,
+ 0x0b2a, 0x0b30,
+ 0x0b32, 0x0b33,
+ 0x0b35, 0x0b39,
+ 0x0b3d, 0x0b44,
+ 0x0b47, 0x0b48,
+ 0x0b4b, 0x0b4c,
+ 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, 0x0bcc,
+ 0x0bd0, 0x0bd0,
+ 0x0bd7, 0x0bd7,
+ 0x0c01, 0x0c03,
+ 0x0c05, 0x0c0c,
+ 0x0c0e, 0x0c10,
+ 0x0c12, 0x0c28,
+ 0x0c2a, 0x0c33,
+ 0x0c35, 0x0c39,
+ 0x0c3d, 0x0c44,
+ 0x0c46, 0x0c48,
+ 0x0c4a, 0x0c4c,
+ 0x0c55, 0x0c56,
+ 0x0c58, 0x0c59,
+ 0x0c60, 0x0c63,
+ 0x0c82, 0x0c83,
+ 0x0c85, 0x0c8c,
+ 0x0c8e, 0x0c90,
+ 0x0c92, 0x0ca8,
+ 0x0caa, 0x0cb3,
+ 0x0cb5, 0x0cb9,
+ 0x0cbd, 0x0cc4,
+ 0x0cc6, 0x0cc8,
+ 0x0cca, 0x0ccc,
+ 0x0cd5, 0x0cd6,
+ 0x0cde, 0x0cde,
+ 0x0ce0, 0x0ce3,
+ 0x0d02, 0x0d03,
+ 0x0d05, 0x0d0c,
+ 0x0d0e, 0x0d10,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
+ 0x0d3d, 0x0d44,
+ 0x0d46, 0x0d48,
+ 0x0d4a, 0x0d4c,
+ 0x0d57, 0x0d57,
+ 0x0d60, 0x0d63,
+ 0x0d7a, 0x0d7f,
+ 0x0d82, 0x0d83,
+ 0x0d85, 0x0d96,
+ 0x0d9a, 0x0db1,
+ 0x0db3, 0x0dbb,
+ 0x0dbd, 0x0dbd,
+ 0x0dc0, 0x0dc6,
+ 0x0dcf, 0x0dd4,
+ 0x0dd6, 0x0dd6,
+ 0x0dd8, 0x0ddf,
+ 0x0df2, 0x0df3,
+ 0x0e01, 0x0e3a,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 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,
+ 0x0ecd, 0x0ecd,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f40, 0x0f47,
+ 0x0f49, 0x0f6c,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
+ 0x0f99, 0x0fbc,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x103f,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 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, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
+ 0x1700, 0x170c,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
+ 0x1740, 0x1753,
+ 0x1760, 0x176c,
+ 0x176e, 0x1770,
+ 0x1772, 0x1773,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
+ 0x1820, 0x1877,
+ 0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
+ 0x1900, 0x191c,
+ 0x1920, 0x192b,
+ 0x1930, 0x1938,
+ 0x1950, 0x196d,
+ 0x1970, 0x1974,
+ 0x1980, 0x19ab,
+ 0x19b0, 0x19c9,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1baf,
+ 0x1c00, 0x1c35,
+ 0x1c4d, 0x1c4f,
+ 0x1c5a, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
+ 0x2c00, 0x2c2e,
+ 0x2c30, 0x2c5e,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 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, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
+ 0x3041, 0x3096,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
+ 0x3105, 0x312d,
+ 0x3131, 0x318e,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
+ 0xa000, 0xa48c,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa61f,
+ 0xa62a, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa90a, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
+ 0xa9cf, 0xa9cf,
+ 0xaa00, 0xaa36,
+ 0xaa40, 0xaa4d,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xac00, 0xd7a3,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
+ 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,
+ 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,
+ 0x10140, 0x10174,
+ 0x10280, 0x1029c,
+ 0x102a0, 0x102d0,
+ 0x10300, 0x1031e,
+ 0x10330, 0x1034a,
+ 0x10380, 0x1039d,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
+ 0x10400, 0x1049d,
+ 0x10800, 0x10805,
+ 0x10808, 0x10808,
+ 0x1080a, 0x10835,
+ 0x10837, 0x10838,
+ 0x1083c, 0x1083c,
+ 0x1083f, 0x10855,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
+ 0x10a00, 0x10a03,
+ 0x10a05, 0x10a06,
+ 0x10a0c, 0x10a13,
+ 0x10a15, 0x10a17,
+ 0x10a19, 0x10a33,
+ 0x10a60, 0x10a7c,
+ 0x10b00, 0x10b35,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
+ 0x10c00, 0x10c48,
+ 0x11082, 0x110b8,
+ 0x12000, 0x1236e,
+ 0x12400, 0x12462,
+ 0x13000, 0x1342e,
+ 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, 0x2a6d6,
+ 0x2a700, 0x2b734,
+ 0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
+static const OnigCodePoint CR_Lowercase[] = {
+ 602,
+ 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, 0x02b8,
+ 0x02c0, 0x02c1,
+ 0x02e0, 0x02e4,
+ 0x0345, 0x0345,
+ 0x0371, 0x0371,
+ 0x0373, 0x0373,
+ 0x0377, 0x0377,
+ 0x037a, 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,
+ 0x0525, 0x0525,
+ 0x0561, 0x0587,
+ 0x1d00, 0x1dbf,
+ 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,
+ 0x2090, 0x2094,
+ 0x210a, 0x210a,
+ 0x210e, 0x210f,
+ 0x2113, 0x2113,
+ 0x212f, 0x212f,
+ 0x2134, 0x2134,
+ 0x2139, 0x2139,
+ 0x213c, 0x213d,
+ 0x2146, 0x2149,
+ 0x214e, 0x214e,
+ 0x2170, 0x217f,
+ 0x2184, 0x2184,
+ 0x24d0, 0x24e9,
+ 0x2c30, 0x2c5e,
+ 0x2c61, 0x2c61,
+ 0x2c65, 0x2c66,
+ 0x2c68, 0x2c68,
+ 0x2c6a, 0x2c6a,
+ 0x2c6c, 0x2c6c,
+ 0x2c71, 0x2c71,
+ 0x2c73, 0x2c74,
+ 0x2c76, 0x2c7d,
+ 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,
+ 0x2cec, 0x2cec,
+ 0x2cee, 0x2cee,
+ 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, 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_Lowercase */
/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
+static const OnigCodePoint CR_Uppercase[] = {
+ 596,
+ 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,
+ 0x0524, 0x0524,
+ 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,
+ 0x2160, 0x216f,
+ 0x2183, 0x2183,
+ 0x24b6, 0x24cf,
+ 0x2c00, 0x2c2e,
+ 0x2c60, 0x2c60,
+ 0x2c62, 0x2c64,
+ 0x2c67, 0x2c67,
+ 0x2c69, 0x2c69,
+ 0x2c6b, 0x2c6b,
+ 0x2c6d, 0x2c70,
+ 0x2c72, 0x2c72,
+ 0x2c75, 0x2c75,
+ 0x2c7e, 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,
+ 0x2ceb, 0x2ceb,
+ 0x2ced, 0x2ced,
+ 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_Uppercase */
/* 'Cased': Derived Property */
static const OnigCodePoint CR_Cased[] = {
- 119,
+ 110,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -10060,12 +6628,10 @@ static const OnigCodePoint CR_Cased[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -10086,9 +6652,7 @@ static const OnigCodePoint CR_Cased[] = {
0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -10110,17 +6674,12 @@ static const OnigCodePoint CR_Cased[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7fa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -10160,7 +6719,7 @@ static const OnigCodePoint CR_Cased[] = {
/* 'Case_Ignorable': Derived Property */
static const OnigCodePoint CR_Case_Ignorable[] = {
- 295,
+ 266,
0x0027, 0x0027,
0x002e, 0x002e,
0x003a, 0x003a,
@@ -10184,13 +6743,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x05f4, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0610, 0x061a,
0x0640, 0x0640,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
- 0x06d6, 0x06dd,
- 0x06df, 0x06e8,
+ 0x06d6, 0x06e8,
0x06ea, 0x06ed,
0x070f, 0x070f,
0x0711, 0x0711,
@@ -10199,14 +6757,11 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x07eb, 0x07f5,
0x07fa, 0x07fa,
0x0816, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0971, 0x0971,
0x0981, 0x0981,
@@ -10269,7 +6824,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -10284,7 +6839,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x108d, 0x108d,
0x109d, 0x109d,
0x10fc, 0x10fc,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
@@ -10320,11 +6875,6 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
@@ -10332,11 +6882,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x1fbd, 0x1fbd,
0x1fbf, 0x1fc1,
0x1fcd, 0x1fcf,
@@ -10352,16 +6901,15 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x206a, 0x206f,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0x2cef, 0x2cf1,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3031, 0x3035,
0x303b, 0x303b,
0x3099, 0x309e,
@@ -10370,14 +6918,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xa4f8, 0xa4fd,
0xa60c, 0xa60c,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
+ 0xa67c, 0xa67d,
0xa67f, 0xa67f,
- 0xa69f, 0xa69f,
0xa6f0, 0xa6f1,
0xa700, 0xa721,
0xa770, 0xa770,
0xa788, 0xa78a,
- 0xa7f8, 0xa7f9,
0xa802, 0xa802,
0xa806, 0xa806,
0xa80b, 0xa80b,
@@ -10403,14 +6949,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xaabe, 0xaabf,
0xaac1, 0xaac1,
0xaadd, 0xaadd,
- 0xaaec, 0xaaed,
- 0xaaf3, 0xaaf4,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
0xfb1e, 0xfb1e,
- 0xfbb2, 0xfbc1,
0xfe00, 0xfe0f,
0xfe13, 0xfe13,
0xfe20, 0xfe26,
@@ -10432,22 +6974,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
0x110bd, 0x110bd,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d173, 0x1d182,
0x1d185, 0x1d18b,
@@ -10460,7 +6990,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
/* 'Changes_When_Lowercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Lowercased[] = {
- 571,
+ 557,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -10725,11 +7255,8 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -10939,7 +7466,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -10956,7 +7482,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -11021,22 +7546,13 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
}; /* CR_Changes_When_Lowercased */
/* 'Changes_When_Uppercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Uppercased[] = {
- 586,
+ 573,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11186,7 +7702,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11316,7 +7831,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -11527,10 +8041,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -11547,7 +8058,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -11612,13 +8122,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -11627,7 +8130,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
/* 'Changes_When_Titlecased': Derived Property */
static const OnigCodePoint CR_Changes_When_Titlecased[] = {
- 587,
+ 574,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11778,7 +8281,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11908,7 +8410,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -12119,10 +8620,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -12139,7 +8637,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -12204,13 +8701,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -12219,7 +8709,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
/* 'Changes_When_Casefolded': Derived Property */
static const OnigCodePoint CR_Changes_When_Casefolded[] = {
- 582,
+ 568,
0x0041, 0x005a,
0x00b5, 0x00b5,
0x00c0, 0x00d6,
@@ -12490,12 +8980,9 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x0587, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -12707,7 +9194,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -12724,7 +9210,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -12789,15 +9274,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12806,7 +9282,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
/* 'Changes_When_Casemapped': Derived Property */
static const OnigCodePoint CR_Changes_When_Casemapped[] = {
- 104,
+ 97,
0x0041, 0x005a,
0x0061, 0x007a,
0x00b5, 0x00b5,
@@ -12827,7 +9303,6 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -12851,12 +9326,10 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x03f4, 0x03f5,
0x03f7, 0x03fb,
0x03fd, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
0x1e00, 0x1e9b,
@@ -12894,18 +9367,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x2c75, 0x2c76,
0x2c7e, 0x2ce3,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa72f,
0xa732, 0xa76f,
0xa779, 0xa787,
- 0xa78b, 0xa78d,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12915,7 +9384,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
/* 'ID_Start': Derived Property */
static const OnigCodePoint CR_ID_Start[] = {
- 488,
+ 424,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -12937,13 +9406,13 @@ static const OnigCodePoint CR_ID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -12962,14 +9431,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -13038,12 +9504,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -13070,11 +9535,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -13085,10 +9550,9 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13136,13 +9600,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -13165,7 +9627,7 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -13183,11 +9645,8 @@ static const OnigCodePoint CR_ID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -13208,24 +9667,23 @@ static const OnigCodePoint CR_ID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -13250,18 +9708,12 @@ static const OnigCodePoint CR_ID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13311,8 +9763,6 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -13322,21 +9772,10 @@ static const OnigCodePoint CR_ID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -13367,48 +9806,14 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_ID_Start */
/* 'ID_Continue': Derived Property */
static const OnigCodePoint CR_ID_Continue[] = {
- 564,
+ 506,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -13433,7 +9838,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -13445,7 +9850,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -13456,13 +9862,12 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -13564,14 +9969,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -13607,7 +10012,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -13617,16 +10022,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13642,7 +10047,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -13658,7 +10063,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -13684,14 +10090,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -13714,7 +10121,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -13734,13 +10141,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -13760,24 +10165,23 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -13795,20 +10199,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13865,8 +10263,6 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -13879,25 +10275,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -13935,49 +10316,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_ID_Continue */
/* 'XID_Start': Derived Property */
static const OnigCodePoint CR_XID_Start[] = {
- 495,
+ 431,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -13999,13 +10346,13 @@ static const OnigCodePoint CR_XID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -14024,14 +10371,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -14100,12 +10444,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -14132,11 +10475,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -14147,10 +10490,9 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14198,13 +10540,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -14227,7 +10567,7 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -14245,11 +10585,8 @@ static const OnigCodePoint CR_XID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -14270,24 +10607,23 @@ static const OnigCodePoint CR_XID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -14312,18 +10648,12 @@ static const OnigCodePoint CR_XID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14380,8 +10710,6 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -14391,21 +10719,10 @@ static const OnigCodePoint CR_XID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -14436,48 +10753,14 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_XID_Start */
/* 'XID_Continue': Derived Property */
static const OnigCodePoint CR_XID_Continue[] = {
- 571,
+ 513,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -14502,7 +10785,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -14514,7 +10797,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -14525,13 +10809,12 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -14633,14 +10916,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -14676,7 +10959,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -14686,16 +10969,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14711,7 +10994,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -14727,7 +11010,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -14753,14 +11037,15 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -14783,7 +11068,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -14803,13 +11088,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -14830,24 +11113,23 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -14865,20 +11147,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14941,8 +11217,6 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -14955,25 +11229,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -15011,42 +11270,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_XID_Continue */
@@ -15073,7 +11298,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
/* 'Grapheme_Extend': Derived Property */
static const OnigCodePoint CR_Grapheme_Extend[] = {
- 232,
+ 206,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -15082,10 +11307,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -15096,14 +11321,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -15174,7 +11396,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -15188,12 +11410,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -15221,30 +11442,22 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -15268,8 +11481,6 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -15283,21 +11494,9 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d165,
0x1d167, 0x1d169,
0x1d16e, 0x1d172,
@@ -15310,7 +11509,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
/* 'Grapheme_Base': Derived Property */
static const OnigCodePoint CR_Grapheme_Base[] = {
- 643,
+ 567,
0x0020, 0x007e,
0x00a0, 0x00ac,
0x00ae, 0x02ff,
@@ -15320,12 +11519,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x038c, 0x038c,
0x038e, 0x03a1,
0x03a3, 0x0482,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x05be, 0x05be,
0x05c0, 0x05c0,
0x05c3, 0x05c3,
@@ -15334,10 +11532,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x05f0, 0x05f4,
0x0606, 0x060f,
0x061b, 0x061b,
- 0x061e, 0x064a,
+ 0x061e, 0x061f,
+ 0x0621, 0x064a,
0x0660, 0x066f,
0x0671, 0x06d5,
- 0x06de, 0x06de,
0x06e5, 0x06e6,
0x06e9, 0x06e9,
0x06ee, 0x070d,
@@ -15352,17 +11550,13 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0824, 0x0824,
0x0828, 0x0828,
0x0830, 0x083e,
- 0x0840, 0x0858,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0903, 0x0939,
- 0x093b, 0x093b,
0x093d, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x0950,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
0x0958, 0x0961,
- 0x0964, 0x0977,
+ 0x0964, 0x0972,
0x0979, 0x097f,
0x0982, 0x0983,
0x0985, 0x098c,
@@ -15404,7 +11598,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae1,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b02, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -15418,7 +11613,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0b4b, 0x0b4c,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b61,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b83, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -15465,12 +11660,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
0x0d3f, 0x0d40,
0x0d46, 0x0d48,
0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d66, 0x0d75,
0x0d79, 0x0d7f,
@@ -15504,7 +11699,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f17,
0x0f1a, 0x0f34,
0x0f36, 0x0f36,
@@ -15513,10 +11708,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0f49, 0x0f6c,
0x0f7f, 0x0f7f,
0x0f85, 0x0f85,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x0fbe, 0x0fc5,
0x0fc7, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x102c,
0x1031, 0x1031,
0x1038, 0x1038,
@@ -15529,9 +11724,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1087, 0x108c,
0x108e, 0x109c,
0x109e, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -15604,21 +11798,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1b82, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
- 0x1bfc, 0x1c2b,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c2b,
0x1c34, 0x1c35,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -15641,24 +11829,36 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x202f, 0x205f,
0x2070, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -15668,7 +11868,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -15679,24 +11879,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x309b, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa673, 0xa673,
0xa67e, 0xa697,
0xa6a0, 0xa6ef,
0xa6f2, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa824,
@@ -15730,13 +11929,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xaab9, 0xaabd,
0xaac0, 0xaac0,
0xaac2, 0xaac2,
- 0xaadb, 0xaaeb,
- 0xaaee, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabec,
@@ -15744,7 +11937,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -15754,7 +11948,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -15806,8 +12000,6 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -15821,36 +12013,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x11000,
- 0x11002, 0x11037,
- 0x11047, 0x1104d,
- 0x11052, 0x1106f,
0x11082, 0x110b2,
0x110b7, 0x110b8,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11103, 0x11126,
- 0x1112c, 0x1112c,
- 0x11136, 0x11143,
- 0x11182, 0x111b5,
- 0x111bf, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116aa,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d164,
@@ -15884,81 +12054,34 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Grapheme_Base */
/* 'Grapheme_Link': Derived Property */
static const OnigCodePoint CR_Grapheme_Link[] = {
- 33,
+ 26,
0x094d, 0x094d,
0x09cd, 0x09cd,
0x0a4d, 0x0a4d,
@@ -15977,26 +12100,19 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
0x17d2, 0x17d2,
0x1a60, 0x1a60,
0x1b44, 0x1b44,
- 0x1baa, 0x1bab,
- 0x1bf2, 0x1bf3,
- 0x2d7f, 0x2d7f,
+ 0x1baa, 0x1baa,
0xa806, 0xa806,
0xa8c4, 0xa8c4,
0xa953, 0xa953,
0xa9c0, 0xa9c0,
- 0xaaf6, 0xaaf6,
0xabed, 0xabed,
0x10a3f, 0x10a3f,
- 0x11046, 0x11046,
0x110b9, 0x110b9,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b6,
}; /* CR_Grapheme_Link */
/* 'Common': Script */
static const OnigCodePoint CR_Common[] = {
- 157,
+ 159,
0x0000, 0x0040,
0x005b, 0x0060,
0x007b, 0x00a9,
@@ -16005,13 +12121,13 @@ static const OnigCodePoint CR_Common[] = {
0x00d7, 0x00d7,
0x00f7, 0x00f7,
0x02b9, 0x02df,
- 0x02e5, 0x02e9,
- 0x02ec, 0x02ff,
+ 0x02e5, 0x02ff,
0x0374, 0x0374,
0x037e, 0x037e,
0x0385, 0x0385,
0x0387, 0x0387,
0x0589, 0x0589,
+ 0x0600, 0x0603,
0x060c, 0x060c,
0x061b, 0x061b,
0x061f, 0x061f,
@@ -16019,6 +12135,8 @@ static const OnigCodePoint CR_Common[] = {
0x0660, 0x0669,
0x06dd, 0x06dd,
0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0cf1, 0x0cf2,
0x0e3f, 0x0e3f,
0x0fd5, 0x0fd8,
0x10fb, 0x10fb,
@@ -16029,28 +12147,42 @@ static const OnigCodePoint CR_Common[] = {
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x2000, 0x200b,
0x200e, 0x2064,
0x206a, 0x2070,
0x2074, 0x207e,
0x2080, 0x208e,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2125,
0x2127, 0x2129,
0x212c, 0x2131,
0x2133, 0x214d,
0x214f, 0x215f,
0x2189, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ff,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2b4c,
0x2b50, 0x2b59,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2ff0, 0x2ffb,
0x3000, 0x3004,
0x3006, 0x3006,
@@ -16121,44 +12253,30 @@ static const OnigCodePoint CR_Common[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f1ff,
- 0x1f201, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
}; /* CR_Common */
/* 'Latin': Script */
static const OnigCodePoint CR_Latin[] = {
- 30,
+ 28,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -16175,17 +12293,15 @@ static const OnigCodePoint CR_Latin[] = {
0x1e00, 0x1eff,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x212a, 0x212b,
0x2132, 0x2132,
0x214e, 0x214e,
0x2160, 0x2188,
0x2c60, 0x2c7f,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7ff,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa7ff,
0xfb00, 0xfb06,
0xff21, 0xff3a,
0xff41, 0xff5a,
@@ -16231,24 +12347,24 @@ static const OnigCodePoint CR_Greek[] = {
/* 'Cyrillic': Script */
static const OnigCodePoint CR_Cyrillic[] = {
- 7,
+ 8,
0x0400, 0x0484,
- 0x0487, 0x0527,
+ 0x0487, 0x0525,
0x1d2b, 0x1d2b,
0x1d78, 0x1d78,
0x2de0, 0x2dff,
- 0xa640, 0xa697,
- 0xa69f, 0xa69f,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
}; /* CR_Cyrillic */
/* 'Armenian': Script */
static const OnigCodePoint CR_Armenian[] = {
- 6,
+ 5,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x058a, 0x058a,
- 0x058f, 0x058f,
0xfb13, 0xfb17,
}; /* CR_Armenian */
@@ -16268,22 +12384,18 @@ static const OnigCodePoint CR_Hebrew[] = {
/* 'Arabic': Script */
static const OnigCodePoint CR_Arabic[] = {
- 56,
- 0x0600, 0x0604,
+ 18,
0x0606, 0x060b,
0x060d, 0x061a,
0x061e, 0x061e,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x0656, 0x065e,
0x066a, 0x066f,
0x0671, 0x06dc,
0x06de, 0x06ff,
0x0750, 0x077f,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0xfb50, 0xfbc1,
+ 0xfb50, 0xfbb1,
0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -16291,40 +12403,6 @@ static const OnigCodePoint CR_Arabic[] = {
0xfe70, 0xfe74,
0xfe76, 0xfefc,
0x10e60, 0x10e7e,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Arabic */
/* 'Syriac': Script */
@@ -16343,10 +12421,14 @@ static const OnigCodePoint CR_Thaana[] = {
/* 'Devanagari': Script */
static const OnigCodePoint CR_Devanagari[] = {
- 5,
- 0x0900, 0x0950,
- 0x0953, 0x0963,
- 0x0966, 0x0977,
+ 9,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0950,
+ 0x0953, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0xa8e0, 0xa8fb,
}; /* CR_Devanagari */
@@ -16393,7 +12475,7 @@ static const OnigCodePoint CR_Gurmukhi[] = {
/* 'Gujarati': Script */
static const OnigCodePoint CR_Gujarati[] = {
- 13,
+ 14,
0x0a81, 0x0a83,
0x0a85, 0x0a8d,
0x0a8f, 0x0a91,
@@ -16406,7 +12488,8 @@ static const OnigCodePoint CR_Gujarati[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
}; /* CR_Gujarati */
/* 'Oriya': Script */
@@ -16425,7 +12508,7 @@ static const OnigCodePoint CR_Oriya[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
}; /* CR_Oriya */
/* 'Tamil': Script */
@@ -16470,7 +12553,7 @@ static const OnigCodePoint CR_Telugu[] = {
/* 'Kannada': Script */
static const OnigCodePoint CR_Kannada[] = {
- 14,
+ 13,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -16484,19 +12567,19 @@ static const OnigCodePoint CR_Kannada[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
}; /* CR_Kannada */
/* 'Malayalam': Script */
static const OnigCodePoint CR_Malayalam[] = {
- 11,
+ 12,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -16546,7 +12629,7 @@ static const OnigCodePoint CR_Lao[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
}; /* CR_Lao */
/* 'Tibetan': Script */
@@ -16554,11 +12637,11 @@ static const OnigCodePoint CR_Tibetan[] = {
7,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
0x0fce, 0x0fd4,
- 0x0fd9, 0x0fda,
}; /* CR_Tibetan */
/* 'Myanmar': Script */
@@ -16570,22 +12653,17 @@ static const OnigCodePoint CR_Myanmar[] = {
/* 'Georgian': Script */
static const OnigCodePoint CR_Georgian[] = {
- 8,
+ 4,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x10ff,
+ 0x10fc, 0x10fc,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
}; /* CR_Georgian */
/* 'Hangul': Script */
static const OnigCodePoint CR_Hangul[] = {
- 14,
+ 13,
0x1100, 0x11ff,
- 0x302e, 0x302f,
0x3131, 0x318e,
0x3200, 0x321e,
0x3260, 0x327e,
@@ -16602,7 +12680,7 @@ static const OnigCodePoint CR_Hangul[] = {
/* 'Ethiopic': Script */
static const OnigCodePoint CR_Ethiopic[] = {
- 32,
+ 27,
0x1200, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -16619,7 +12697,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -16630,11 +12708,6 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
}; /* CR_Ethiopic */
/* 'Cherokee': Script */
@@ -16685,16 +12758,15 @@ static const OnigCodePoint CR_Mongolian[] = {
/* 'Hiragana': Script */
static const OnigCodePoint CR_Hiragana[] = {
- 4,
+ 3,
0x3041, 0x3096,
0x309d, 0x309f,
- 0x1b001, 0x1b001,
0x1f200, 0x1f200,
}; /* CR_Hiragana */
/* 'Katakana': Script */
static const OnigCodePoint CR_Katakana[] = {
- 8,
+ 7,
0x30a1, 0x30fa,
0x30fd, 0x30ff,
0x31f0, 0x31ff,
@@ -16702,15 +12774,13 @@ static const OnigCodePoint CR_Katakana[] = {
0x3300, 0x3357,
0xff66, 0xff6f,
0xff71, 0xff9d,
- 0x1b000, 0x1b000,
}; /* CR_Katakana */
/* 'Bopomofo': Script */
static const OnigCodePoint CR_Bopomofo[] = {
- 3,
- 0x02ea, 0x02eb,
+ 2,
0x3105, 0x312d,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
}; /* CR_Bopomofo */
/* 'Han': Script */
@@ -16724,12 +12794,12 @@ static const OnigCodePoint CR_Han[] = {
0x3021, 0x3029,
0x3038, 0x303b,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Han */
@@ -16761,23 +12831,21 @@ static const OnigCodePoint CR_Deseret[] = {
/* 'Inherited': Script */
static const OnigCodePoint CR_Inherited[] = {
- 25,
+ 23,
0x0300, 0x036f,
0x0485, 0x0486,
0x064b, 0x0655,
- 0x065f, 0x065f,
0x0670, 0x0670,
0x0951, 0x0952,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xfe00, 0xfe0f,
0xfe20, 0xfe26,
@@ -16893,7 +12961,7 @@ static const OnigCodePoint CR_Buginese[] = {
static const OnigCodePoint CR_Coptic[] = {
3,
0x03e2, 0x03ef,
- 0x2c80, 0x2cf3,
+ 0x2c80, 0x2cf1,
0x2cf9, 0x2cff,
}; /* CR_Coptic */
@@ -16915,10 +12983,9 @@ static const OnigCodePoint CR_Glagolitic[] = {
/* 'Tifinagh': Script */
static const OnigCodePoint CR_Tifinagh[] = {
- 3,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d7f,
+ 2,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
}; /* CR_Tifinagh */
/* 'Syloti_Nagri': Script */
@@ -16984,8 +13051,8 @@ static const OnigCodePoint CR_Nko[] = {
/* 'Sundanese': Script */
static const OnigCodePoint CR_Sundanese[] = {
2,
- 0x1b80, 0x1bbf,
- 0x1cc0, 0x1cc7,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
}; /* CR_Sundanese */
/* 'Lepcha': Script */
@@ -17101,9 +13168,8 @@ static const OnigCodePoint CR_Lisu[] = {
/* 'Bamum': Script */
static const OnigCodePoint CR_Bamum[] = {
- 2,
+ 1,
0xa6a0, 0xa6f7,
- 0x16800, 0x16a38,
}; /* CR_Bamum */
/* 'Javanese': Script */
@@ -17116,8 +13182,7 @@ static const OnigCodePoint CR_Javanese[] = {
/* 'Meetei_Mayek': Script */
static const OnigCodePoint CR_Meetei_Mayek[] = {
- 3,
- 0xaae0, 0xaaf6,
+ 2,
0xabc0, 0xabed,
0xabf0, 0xabf9,
}; /* CR_Meetei_Mayek */
@@ -17161,78 +13226,21 @@ static const OnigCodePoint CR_Kaithi[] = {
0x11080, 0x110c1,
}; /* CR_Kaithi */
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
- 2,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
- 2,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
- 2,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
- 2,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
- 2,
- 0x109a0, 0x109b7,
- 0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
- 1,
- 0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
- 3,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
- 2,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
- 2,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
- 2,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
-}; /* CR_Takri */
-
/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
+static const OnigCodePoint CR_White_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_White_Space */
/* 'Bidi_Control': Binary Property */
static const OnigCodePoint CR_Bidi_Control[] = {
@@ -17249,7 +13257,7 @@ static const OnigCodePoint CR_Join_Control[] = {
/* 'Dash': Binary Property */
static const OnigCodePoint CR_Dash[] = {
- 20,
+ 19,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -17262,7 +13270,6 @@ static const OnigCodePoint CR_Dash[] = {
0x2212, 0x2212,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -17306,7 +13313,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
/* 'Terminal_Punctuation': Binary Property */
static const OnigCodePoint CR_Terminal_Punctuation[] = {
- 70,
+ 65,
0x0021, 0x0021,
0x002c, 0x002c,
0x002e, 0x002e,
@@ -17324,7 +13331,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x070c, 0x070c,
0x07f8, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0e5a, 0x0e5b,
0x0f08, 0x0f08,
@@ -17356,7 +13362,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0xa9c7, 0xa9c9,
0xaa5d, 0xaa5f,
0xaadf, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe50, 0xfe52,
0xfe54, 0xfe57,
@@ -17372,16 +13377,13 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x10857, 0x10857,
0x1091f, 0x1091f,
0x10b3a, 0x10b3f,
- 0x11047, 0x1104d,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
0x12470, 0x12473,
}; /* CR_Terminal_Punctuation */
/* 'Other_Math': Binary Property */
static const OnigCodePoint CR_Other_Math[] = {
- 133,
+ 99,
0x005e, 0x005e,
0x03d0, 0x03d2,
0x03d5, 0x03d5,
@@ -17398,7 +13400,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
0x2119, 0x211d,
@@ -17482,39 +13483,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
}; /* CR_Other_Math */
/* 'Hex_Digit': Binary Property */
@@ -17529,11 +13497,16 @@ static const OnigCodePoint CR_Hex_Digit[] = {
}; /* CR_Hex_Digit */
/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+ 3,
+ 0x0030, 0x0039,
+ 0x0041, 0x0046,
+ 0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
/* 'Other_Alphabetic': Binary Property */
static const OnigCodePoint CR_Other_Alphabetic[] = {
- 158,
+ 141,
0x0345, 0x0345,
0x05b0, 0x05bd,
0x05bf, 0x05bf,
@@ -17542,7 +13515,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x05c7, 0x05c7,
0x0610, 0x061a,
0x064b, 0x0657,
- 0x0659, 0x065f,
+ 0x0659, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06e1, 0x06e4,
@@ -17555,13 +13528,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082c,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093b,
0x093e, 0x094c,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
+ 0x094e, 0x094e,
+ 0x0955, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09be, 0x09c4,
@@ -17623,7 +13593,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x0ebb, 0x0ebc,
0x0ecd, 0x0ecd,
0x0f71, 0x0f81,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x102b, 0x1036,
0x1038, 0x1038,
@@ -17653,21 +13623,17 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x1b35, 0x1b43,
0x1b80, 0x1b82,
0x1ba1, 0x1ba9,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1bf1,
0x1c24, 0x1c35,
- 0x1cf2, 0x1cf3,
+ 0x1cf2, 0x1cf2,
0x24b6, 0x24e9,
0x2de0, 0x2dff,
- 0xa674, 0xa67b,
- 0xa69f, 0xa69f,
0xa823, 0xa827,
0xa880, 0xa881,
0xa8b4, 0xa8c3,
0xa926, 0xa92a,
0xa947, 0xa952,
0xa980, 0xa983,
- 0xa9b4, 0xa9bf,
+ 0xa9b3, 0xa9bf,
0xaa29, 0xaa36,
0xaa43, 0xaa43,
0xaa4c, 0xaa4d,
@@ -17675,23 +13641,13 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0xaab2, 0xaab4,
0xaab7, 0xaab8,
0xaabe, 0xaabe,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabea,
0xfb1e, 0xfb1e,
0x10a01, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a0f,
- 0x11000, 0x11002,
- 0x11038, 0x11045,
0x11082, 0x11082,
0x110b0, 0x110b8,
- 0x11100, 0x11102,
- 0x11127, 0x11132,
- 0x11180, 0x11182,
- 0x111b3, 0x111bf,
- 0x116ab, 0x116b5,
- 0x16f51, 0x16f7e,
}; /* CR_Other_Alphabetic */
/* 'Ideographic': Binary Property */
@@ -17701,18 +13657,18 @@ static const OnigCodePoint CR_Ideographic[] = {
0x3021, 0x3029,
0x3038, 0x303a,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Ideographic */
/* 'Diacritic': Binary Property */
static const OnigCodePoint CR_Diacritic[] = {
- 125,
+ 117,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -17741,7 +13697,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0x07a6, 0x07b0,
0x07eb, 0x07f5,
0x0818, 0x0819,
- 0x08e4, 0x08fe,
0x093c, 0x093c,
0x094d, 0x094d,
0x0951, 0x0954,
@@ -17784,12 +13739,11 @@ static const OnigCodePoint CR_Diacritic[] = {
0x1b34, 0x1b34,
0x1b44, 0x1b44,
0x1b6b, 0x1b73,
- 0x1baa, 0x1bab,
+ 0x1baa, 0x1baa,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
0x1cd0, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1d2c, 0x1d6a,
0x1dc4, 0x1dcf,
0x1dfd, 0x1dff,
@@ -17810,7 +13764,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa6f0, 0xa6f1,
0xa717, 0xa721,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa8c4, 0xa8c4,
0xa8e0, 0xa8f1,
0xa92b, 0xa92e,
@@ -17819,7 +13772,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa9c0, 0xa9c0,
0xaa7b, 0xaa7b,
0xaabf, 0xaac2,
- 0xaaf6, 0xaaf6,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
0xfe20, 0xfe26,
@@ -17829,10 +13781,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xff9e, 0xff9f,
0xffe3, 0xffe3,
0x110b9, 0x110ba,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -17842,14 +13790,13 @@ static const OnigCodePoint CR_Diacritic[] = {
/* 'Extender': Binary Property */
static const OnigCodePoint CR_Extender[] = {
- 22,
+ 20,
0x00b7, 0x00b7,
0x02d0, 0x02d1,
0x0640, 0x0640,
0x07fa, 0x07fa,
0x0e46, 0x0e46,
0x0ec6, 0x0ec6,
- 0x180a, 0x180a,
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c36, 0x1c36,
@@ -17863,31 +13810,25 @@ static const OnigCodePoint CR_Extender[] = {
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
}; /* CR_Extender */
/* 'Other_Lowercase': Binary Property */
static const OnigCodePoint CR_Other_Lowercase[] = {
- 18,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 13,
0x02b0, 0x02b8,
0x02c0, 0x02c1,
0x02e0, 0x02e4,
0x0345, 0x0345,
0x037a, 0x037a,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2170, 0x217f,
0x24d0, 0x24e9,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0xa770, 0xa770,
- 0xa7f8, 0xa7f9,
}; /* CR_Other_Lowercase */
/* 'Other_Uppercase': Binary Property */
@@ -17922,7 +13863,7 @@ static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
/* 'Other_Grapheme_Extend': Binary Property */
static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
- 17,
+ 16,
0x09be, 0x09be,
0x09d7, 0x09d7,
0x0b3e, 0x0b3e,
@@ -17936,7 +13877,6 @@ static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
0x0dcf, 0x0dcf,
0x0ddf, 0x0ddf,
0x200c, 0x200d,
- 0x302e, 0x302f,
0xff9e, 0xff9f,
0x1d165, 0x1d165,
0x1d16e, 0x1d172,
@@ -17965,9 +13905,9 @@ static const OnigCodePoint CR_Radical[] = {
/* 'Unified_Ideograph': Binary Property */
static const OnigCodePoint CR_Unified_Ideograph[] = {
- 12,
+ 11,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xfa0e, 0xfa0f,
0xfa11, 0xfa11,
0xfa13, 0xfa14,
@@ -17977,15 +13917,13 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
0xfa27, 0xfa29,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
}; /* CR_Unified_Ideograph */
/* 'Other_Default_Ignorable_Code_Point': Binary Property */
static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
- 11,
+ 10,
0x034f, 0x034f,
0x115f, 0x1160,
- 0x17b4, 0x17b5,
0x2065, 0x2069,
0x3164, 0x3164,
0xffa0, 0xffa0,
@@ -17998,9 +13936,8 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
/* 'Deprecated': Binary Property */
static const OnigCodePoint CR_Deprecated[] = {
- 9,
+ 8,
0x0149, 0x0149,
- 0x0673, 0x0673,
0x0f77, 0x0f77,
0x0f79, 0x0f79,
0x17a3, 0x17a4,
@@ -18066,16 +14003,15 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
/* 'Other_ID_Continue': Binary Property */
static const OnigCodePoint CR_Other_ID_Continue[] = {
- 4,
+ 3,
0x00b7, 0x00b7,
0x0387, 0x0387,
0x1369, 0x1371,
- 0x19da, 0x19da,
}; /* CR_Other_ID_Continue */
/* 'STerm': Binary Property */
static const OnigCodePoint CR_STerm[] = {
- 50,
+ 43,
0x0021, 0x0021,
0x002e, 0x002e,
0x003f, 0x003f,
@@ -18091,11 +14027,9 @@ static const OnigCodePoint CR_STerm[] = {
0x1362, 0x1362,
0x1367, 0x1368,
0x166e, 0x166e,
- 0x1735, 0x1736,
0x1803, 0x1803,
0x1809, 0x1809,
0x1944, 0x1945,
- 0x1aa8, 0x1aab,
0x1b5a, 0x1b5b,
0x1b5e, 0x1b5f,
0x1c3b, 0x1c3c,
@@ -18113,7 +14047,6 @@ static const OnigCodePoint CR_STerm[] = {
0xa92f, 0xa92f,
0xa9c8, 0xa9c9,
0xaa5d, 0xaa5f,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe52, 0xfe52,
0xfe56, 0xfe57,
@@ -18121,11 +14054,7 @@ static const OnigCodePoint CR_STerm[] = {
0xff0e, 0xff0e,
0xff1f, 0xff1f,
0xff61, 0xff61,
- 0x10a56, 0x10a57,
- 0x11047, 0x11048,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
}; /* CR_STerm */
/* 'Variation_Selector': Binary Property */
@@ -18178,3965 +14107,48 @@ static const OnigCodePoint CR_Pattern_Syntax[] = {
0xfd3e, 0xfd3f,
0xfe45, 0xfe46,
}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
+#endif /* USE_UNICODE_PROPERTIES */
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
- 537,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0605, 0x0605,
- 0x061c, 0x061d,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
- 288,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x05b0, 0x05b9,
- 0x05bb, 0x05c3,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9a,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20aa,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xe000, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ab,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ac,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
- 369,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f3,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
- 402,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f5,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+ 1,
+ 0x000a, 0x000a,
+}; /* CR_NEWLINE */
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
- 397,
- 0x0000, 0x0220,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034f,
- 0x0360, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03f6,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b1,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2052,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213a,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23ce,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24fe,
- 0x2500, 0x2613,
- 0x2616, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2689,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2aff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321c,
- 0x3220, 0x3243,
- 0x3251, 0x327b,
- 0x327f, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfc,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe46,
- 0xfe49, 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, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
- 412,
- 0x0000, 0x0236,
- 0x0250, 0x0357,
- 0x035d, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03fb,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060c, 0x0615,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0658,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x19e0, 0x19ff,
- 0x1d00, 0x1d6b,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2054,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213b,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23d0,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2691,
- 0x26a0, 0x26a1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b0d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x327d,
- 0x327f, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d300, 0x1d356,
- 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, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
+/* '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 */
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
- 430,
- 0x0000, 0x0241,
- 0x0250, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05b9,
- 0x05bb, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x097d, 0x097d,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1d00, 0x1dc3,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20eb,
- 0x2100, 0x214c,
- 0x2153, 0x2183,
- 0x2190, 0x23db,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c6,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b13,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa800, 0xa82b,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 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, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
- 440,
- 0x0000, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x0513,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 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,
- 0x1d00, 0x1dca,
- 0x1dfe, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20ef,
- 0x2100, 0x214e,
- 0x2153, 0x2184,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b2,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b1a,
- 0x2b20, 0x2b23,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6c,
- 0x2c74, 0x2c77,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa71a,
- 0xa720, 0xa721,
- 0xa800, 0xa82b,
- 0xa840, 0xa877,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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, 0x1091f,
- 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,
- 0x1d12a, 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,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
- 455,
- 0x0000, 0x0377,
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+ 490,
+ 0x0021, 0x007e,
+ 0x00a1, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0523,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
@@ -22152,11 +14164,13 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
+ 0x0800, 0x082d,
+ 0x0830, 0x083e,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
0x0958, 0x0972,
- 0x097b, 0x097f,
+ 0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -22170,7 +14184,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fa,
+ 0x09e6, 0x09fb,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -22308,14 +14322,10 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
+ 0x0fce, 0x0fd8,
+ 0x1000, 0x10c5,
0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -22334,8 +14344,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
+ 0x1400, 0x167f,
+ 0x1681, 0x169c,
0x16a0, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
@@ -22347,21 +14357,26 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1780, 0x17dd,
0x17e0, 0x17e9,
0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x1800, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
0x1940, 0x1940,
0x1944, 0x196d,
0x1970, 0x1974,
- 0x1980, 0x19a9,
+ 0x1980, 0x19ab,
0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
+ 0x19d0, 0x19da,
0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
+ 0x1a1e, 0x1a5e,
+ 0x1a60, 0x1a7c,
+ 0x1a7f, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
0x1b80, 0x1baa,
@@ -22369,8 +14384,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -22386,40 +14402,40 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x200b, 0x2027,
+ 0x202a, 0x202e,
+ 0x2030, 0x205e,
+ 0x2060, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
- 0x20a0, 0x20b5,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
+ 0x2100, 0x2189,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
0x2701, 0x2704,
0x2706, 0x2709,
0x270c, 0x2727,
0x2729, 0x274b,
0x274d, 0x274d,
0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
+ 0x2756, 0x275e,
0x2761, 0x2794,
0x2798, 0x27af,
0x27b1, 0x27be,
0x27c0, 0x27ca,
0x27cc, 0x27cc,
0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
+ 0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
@@ -22432,12 +14448,12 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x3001, 0x303f,
0x3041, 0x3096,
0x3099, 0x30ff,
0x3105, 0x312d,
@@ -22445,30 +14461,41 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
+ 0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fc3,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
- 0xa500, 0xa62b,
+ 0xa4d0, 0xa62b,
0xa640, 0xa65f,
0xa662, 0xa673,
0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
0xa700, 0xa78c,
0xa7fb, 0xa82b,
+ 0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
0xa8ce, 0xa8d9,
+ 0xa8e0, 0xa8fb,
0xa900, 0xa953,
- 0xa95f, 0xa95f,
+ 0xa95f, 0xa97c,
+ 0xa980, 0xa9cd,
+ 0xa9cf, 0xa9d9,
+ 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
+ 0xaa5c, 0xaa7b,
+ 0xaa80, 0xaac2,
+ 0xaadb, 0xaadf,
+ 0xabc0, 0xabed,
+ 0xabf0, 0xabf9,
0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xe000, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -22481,7 +14508,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22497,7 +14524,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -22524,8 +14552,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1080a, 0x10835,
0x10837, 0x10838,
0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
+ 0x1083f, 0x10855,
+ 0x10857, 0x1085f,
+ 0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
0x10a00, 0x10a03,
@@ -22536,9 +14565,18 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x10a38, 0x10a3a,
0x10a3f, 0x10a47,
0x10a50, 0x10a58,
+ 0x10a60, 0x10a7f,
+ 0x10b00, 0x10b35,
+ 0x10b39, 0x10b55,
+ 0x10b58, 0x10b72,
+ 0x10b78, 0x10b7f,
+ 0x10c00, 0x10c48,
+ 0x10e60, 0x10e7e,
+ 0x11080, 0x110c1,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
+ 0x13000, 0x1342e,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -22568,30 +14606,42 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1fffe, 0x2a6d6,
+ 0x1f100, 0x1f10a,
+ 0x1f110, 0x1f12e,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
+ 0x1f240, 0x1f248,
+ 0x20000, 0x2a6d6,
+ 0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Graph */
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
- 495,
- 0x0000, 0x0377,
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+ 487,
+ 0x0020, 0x007e,
+ 0x00a0, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
@@ -22849,7 +14899,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x2000, 0x2027,
+ 0x202a, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
@@ -22938,7 +14989,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xe000, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
@@ -22952,7 +15003,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22968,7 +15019,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -23067,54 +15119,84 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1f200, 0x1f200,
0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Print */
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
- 511,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+ 506,
+ 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, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x0483, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
+ 0x0591, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06de, 0x06e8,
+ 0x06ea, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x074a,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
+ 0x07c0, 0x07f5,
+ 0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23129,7 +15211,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23159,7 +15241,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23173,7 +15254,8 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23189,7 +15271,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0bca, 0x0bcd,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23203,7 +15285,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -23217,18 +15298,18 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 0x0d66, 0x0d6f,
+ 0x0d7a, 0x0d7f,
0x0d82, 0x0d83,
0x0d85, 0x0d96,
0x0d9a, 0x0db1,
@@ -23239,9 +15320,10 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0dcf, 0x0dd4,
0x0dd6, 0x0dd6,
0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e4e,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23260,14 +15342,24 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
+ 0x0f00, 0x0f00,
+ 0x0f18, 0x0f19,
+ 0x0f20, 0x0f29,
+ 0x0f35, 0x0f35,
+ 0x0f37, 0x0f37,
+ 0x0f39, 0x0f39,
+ 0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f84,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10d0, 0x10fc,
+ 0x0fc6, 0x0fc6,
+ 0x1000, 0x1049,
+ 0x1050, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -23284,22 +15376,27 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x1720, 0x1734,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dd,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x180b, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
@@ -23307,29 +15404,29 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
0x1a60, 0x1a7c,
0x1a7f, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
+ 0x1aa7, 0x1aa7,
0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
+ 0x1b50, 0x1b59,
+ 0x1b6b, 0x1b73,
0x1b80, 0x1baa,
0x1bae, 0x1bb9,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cd0, 0x1cf2,
+ 0x1c00, 0x1c37,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1cd0, 0x1cd2,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23339,34 +15436,44 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x1ff6, 0x1ffc,
+ 0x203f, 0x2040,
+ 0x2054, 0x2054,
+ 0x2071, 0x2071,
+ 0x207f, 0x207f,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27ce, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf1,
- 0x2cf9, 0x2d25,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cf1,
+ 0x2d00, 0x2d25,
0x2d30, 0x2d65,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23375,108 +15482,107 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e31,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x302f,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x3099, 0x309a,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcb,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa673,
- 0xa67c, 0xa697,
- 0xa6a0, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa791,
- 0xa7a0, 0xa7a9,
- 0xa7fa, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa672,
+ 0xa67c, 0xa67d,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6f1,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
+ 0xa840, 0xa873,
0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa8d0, 0xa8d9,
+ 0xa8e0, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92d,
+ 0xa930, 0xa953,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9c0,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaadf,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xf900, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
+ 0xfdf0, 0xfdfb,
+ 0xfe00, 0xfe0f,
0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfe33, 0xfe34,
+ 0xfe4d, 0xfe4f,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff3f, 0xff3f,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
+ 0x101fd, 0x101fd,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -23485,40 +15591,30 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a3f, 0x10a3f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
+ 0x11080, 0x110ba,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
+ 0x1d165, 0x1d169,
+ 0x1d16d, 0x1d172,
+ 0x1d17b, 0x1d182,
+ 0x1d185, 0x1d18b,
+ 0x1d1aa, 0x1d1ad,
+ 0x1d242, 0x1d244,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -23538,103 +15634,85 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f169,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f5ff,
- 0x1f601, 0x1f610,
- 0x1f612, 0x1f614,
- 0x1f616, 0x1f616,
- 0x1f618, 0x1f618,
- 0x1f61a, 0x1f61a,
- 0x1f61c, 0x1f61e,
- 0x1f620, 0x1f625,
- 0x1f628, 0x1f62b,
- 0x1f62d, 0x1f62d,
- 0x1f630, 0x1f633,
- 0x1f635, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
+}; /* CR_Word */
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
- 549,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+ 497,
+ 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,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x07c0, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23643,13 +15721,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x09aa, 0x09b0,
0x09b2, 0x09b2,
0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
+ 0x09bd, 0x09c4,
0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
+ 0x09cb, 0x09cc,
+ 0x09ce, 0x09ce,
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23658,10 +15737,9 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0a32, 0x0a33,
0x0a35, 0x0a36,
0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
0x0a3e, 0x0a42,
0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
+ 0x0a4b, 0x0a4c,
0x0a51, 0x0a51,
0x0a59, 0x0a5c,
0x0a5e, 0x0a5e,
@@ -23673,12 +15751,12 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0aaa, 0x0ab0,
0x0ab2, 0x0ab3,
0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
+ 0x0abd, 0x0ac5,
0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
+ 0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23686,13 +15764,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0b2a, 0x0b30,
0x0b32, 0x0b33,
0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
+ 0x0b3d, 0x0b44,
0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
+ 0x0b4b, 0x0b4c,
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23705,10 +15784,10 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0bae, 0x0bb9,
0x0bbe, 0x0bc2,
0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
+ 0x0bca, 0x0bcc,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23717,50 +15796,50 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0c35, 0x0c39,
0x0c3d, 0x0c44,
0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
+ 0x0c4a, 0x0c4c,
0x0c55, 0x0c56,
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
0x0c92, 0x0ca8,
0x0caa, 0x0cb3,
0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
+ 0x0cbd, 0x0cc4,
0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
+ 0x0cca, 0x0ccc,
0x0cd5, 0x0cd6,
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4c,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 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, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23776,19 +15855,30 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0ebb, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
+ 0x0ecd, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f47,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f20, 0x0f29,
+ 0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x1049,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x1090, 0x1099,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -23804,51 +15894,57 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1930, 0x1938,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1a80, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b50, 0x1b59,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c35,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 0x1d00, 0x1dbf,
+ 0x1e00, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23858,34 +15954,41 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 0x2d00, 0x2d25,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23894,106 +15997,103 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8d0, 0xa8d9,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfdf0, 0xfdfb,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -24002,53 +16102,22 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
+ 0x11082, 0x110b8,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -24068,1430 +16137,28 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
- 1,
- 0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
- 1,
- 0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
- 1,
- 0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
- 1,
- 0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
- 1,
- 0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
- 1,
- 0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
- 1,
- 0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
- 1,
- 0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
- 1,
- 0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
- 1,
- 0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
- 1,
- 0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
- 1,
- 0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
- 1,
- 0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
- 1,
- 0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
- 1,
- 0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
- 1,
- 0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
- 1,
- 0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
- 1,
- 0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
- 1,
- 0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
- 1,
- 0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
- 1,
- 0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
- 1,
- 0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
- 1,
- 0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
- 1,
- 0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
- 1,
- 0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
- 1,
- 0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
- 1,
- 0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
- 1,
- 0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
- 1,
- 0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
- 1,
- 0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
- 1,
- 0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
- 1,
- 0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
- 1,
- 0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
- 1,
- 0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
- 1,
- 0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
- 1,
- 0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
- 1,
- 0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
- 1,
- 0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
- 1,
- 0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
- 1,
- 0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
- 1,
- 0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
- 1,
- 0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
- 1,
- 0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
- 1,
- 0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
- 1,
- 0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
- 1,
- 0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
- 1,
- 0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
- 1,
- 0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
- 1,
- 0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
- 1,
- 0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
- 1,
- 0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
- 1,
- 0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
- 1,
- 0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
- 1,
- 0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
- 1,
- 0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
- 1,
- 0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
- 1,
- 0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
- 1,
- 0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
- 1,
- 0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
- 1,
- 0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
- 1,
- 0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
- 1,
- 0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
- 1,
- 0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
- 1,
- 0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
- 1,
- 0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
- 1,
- 0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
- 1,
- 0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
- 1,
- 0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
- 1,
- 0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
- 1,
- 0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
- 1,
- 0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
- 1,
- 0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
- 1,
- 0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
- 1,
- 0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
- 1,
- 0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
- 1,
- 0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
- 1,
- 0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
- 1,
- 0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
- 1,
- 0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
- 1,
- 0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
- 1,
- 0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
- 1,
- 0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
- 1,
- 0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
- 1,
- 0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
- 1,
- 0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
- 1,
- 0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
- 1,
- 0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
- 1,
- 0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
- 1,
- 0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
- 1,
- 0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
- 1,
- 0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
- 1,
- 0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
- 1,
- 0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
- 1,
- 0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
- 1,
- 0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
- 1,
- 0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
- 1,
- 0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
- 1,
- 0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
- 1,
- 0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
- 1,
- 0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
- 1,
- 0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
- 1,
- 0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
- 1,
- 0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
- 1,
- 0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
- 1,
- 0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
- 1,
- 0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
- 1,
- 0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
- 1,
- 0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
- 1,
- 0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
- 1,
- 0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
- 1,
- 0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
- 1,
- 0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
- 1,
- 0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
- 1,
- 0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
- 1,
- 0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
- 1,
- 0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
- 1,
- 0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
- 1,
- 0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
- 1,
- 0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
- 1,
- 0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
- 1,
- 0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
- 1,
- 0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
- 1,
- 0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
- 1,
- 0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-#define CR_In_Kayah_Li CR_Kayah_Li
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
- 1,
- 0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
- 1,
- 0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
- 1,
- 0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
- 1,
- 0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
- 1,
- 0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
- 1,
- 0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
- 1,
- 0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
- 1,
- 0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
- 1,
- 0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
- 1,
- 0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
- 1,
- 0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
- 1,
- 0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
- 1,
- 0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
- 1,
- 0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
- 1,
- 0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
- 1,
- 0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
- 1,
- 0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
- 1,
- 0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
- 1,
- 0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
- 1,
- 0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
- 1,
- 0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
- 1,
- 0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
- 1,
- 0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
- 1,
- 0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
- 1,
- 0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
- 1,
- 0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
- 1,
- 0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
- 1,
- 0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
- 1,
- 0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
- 1,
- 0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
- 1,
- 0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
- 1,
- 0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
- 1,
- 0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
- 1,
- 0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
- 1,
- 0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
- 1,
- 0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
- 1,
- 0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
- 1,
- 0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
- 1,
- 0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
- 1,
- 0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
- 1,
- 0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
- 1,
- 0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
- 1,
- 0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
- 1,
- 0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
- 1,
- 0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
- 1,
- 0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
- 1,
- 0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
- 1,
- 0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
- 1,
- 0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
- 1,
- 0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
- 1,
- 0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
- 1,
- 0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
- 1,
- 0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
- 1,
- 0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
- 1,
- 0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
- 1,
- 0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
- 1,
- 0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
- 1,
- 0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
- 1,
- 0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
- 1,
- 0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
- 1,
- 0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
- 1,
- 0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
- 1,
- 0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
- 1,
- 0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
- 1,
- 0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
- 1,
- 0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
- 1,
- 0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
- 1,
- 0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
- 1,
- 0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
- 1,
- 0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
- 1,
- 0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
- 1,
- 0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
- 1,
- 0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
- 1,
- 0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
- 1,
- 0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
- 1,
- 0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Transport_And_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
- 1,
- 0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_And_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
- 1,
- 0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
- 1,
- 0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
- 1,
- 0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
- 1,
- 0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
- 1,
- 0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
- 1,
- 0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
- 1,
- 0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
- 1,
- 0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
+}; /* CR_Alnum */
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
1,
- 0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
- 36,
- 0x0860, 0x089f,
- 0x1ab0, 0x1aff,
- 0x1c80, 0x1cbf,
- 0x2fe0, 0x2fef,
- 0xa9e0, 0xa9ff,
- 0xab30, 0xabbf,
- 0x10200, 0x1027f,
- 0x102e0, 0x102ff,
- 0x10350, 0x1037f,
- 0x103e0, 0x103ff,
- 0x104b0, 0x107ff,
- 0x10860, 0x108ff,
- 0x10940, 0x1097f,
- 0x10a80, 0x10aff,
- 0x10b80, 0x10bff,
- 0x10c50, 0x10e5f,
- 0x10e80, 0x10fff,
- 0x11150, 0x1117f,
- 0x111e0, 0x1167f,
- 0x116d0, 0x11fff,
- 0x12480, 0x12fff,
- 0x13430, 0x167ff,
- 0x16a40, 0x16eff,
- 0x16fa0, 0x1afff,
- 0x1b100, 0x1cfff,
- 0x1d250, 0x1d2ff,
- 0x1d380, 0x1d3ff,
- 0x1d800, 0x1edff,
- 0x1ef00, 0x1efff,
- 0x1f650, 0x1f67f,
- 0x1f780, 0x1ffff,
- 0x2a6e0, 0x2a6ff,
- 0x2b820, 0x2f7ff,
- 0x2fa20, 0xdffff,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
+ 0x0000, 0x007f,
+}; /* CR_ASCII */
static const OnigCodePoint* const CodeRanges[] = {
CR_NEWLINE,
@@ -25510,6 +16177,7 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Alnum,
CR_ASCII,
#ifdef USE_UNICODE_PROPERTIES
+#ifdef USE_UNICODE_PROPERTIES
CR_Any,
CR_Assigned,
CR_C,
@@ -25519,7 +16187,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Co,
CR_Cs,
CR_L,
- CR_LC,
CR_Ll,
CR_Lm,
CR_Lo,
@@ -25661,16 +16328,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Inscriptional_Pahlavi,
CR_Old_Turkic,
CR_Kaithi,
- CR_Batak,
- CR_Brahmi,
- CR_Mandaic,
- CR_Chakma,
- CR_Meroitic_Cursive,
- CR_Meroitic_Hieroglyphs,
- CR_Miao,
- CR_Sharada,
- CR_Sora_Sompeng,
- CR_Takri,
CR_White_Space,
CR_Bidi_Control,
CR_Join_Control,
@@ -25703,241 +16360,7 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Variation_Selector,
CR_Pattern_White_Space,
CR_Pattern_Syntax,
- CR_Unknown,
- CR_Age_1_1,
- CR_Age_2_0,
- CR_Age_2_1,
- CR_Age_3_0,
- CR_Age_3_1,
- CR_Age_3_2,
- CR_Age_4_0,
- CR_Age_4_1,
- CR_Age_5_0,
- CR_Age_5_1,
- CR_Age_5_2,
- CR_Age_6_0,
- CR_Age_6_1,
- CR_In_Basic_Latin,
- CR_In_Latin_1_Supplement,
- CR_In_Latin_Extended_A,
- CR_In_Latin_Extended_B,
- CR_In_IPA_Extensions,
- CR_In_Spacing_Modifier_Letters,
- CR_In_Combining_Diacritical_Marks,
- CR_In_Greek_and_Coptic,
- CR_In_Cyrillic,
- CR_In_Cyrillic_Supplement,
- CR_In_Armenian,
- CR_In_Hebrew,
- CR_In_Arabic,
- CR_In_Syriac,
- CR_In_Arabic_Supplement,
- CR_In_Thaana,
- CR_In_NKo,
- CR_In_Samaritan,
- CR_In_Mandaic,
- CR_In_Arabic_Extended_A,
- CR_In_Devanagari,
- CR_In_Bengali,
- CR_In_Gurmukhi,
- CR_In_Gujarati,
- CR_In_Oriya,
- CR_In_Tamil,
- CR_In_Telugu,
- CR_In_Kannada,
- CR_In_Malayalam,
- CR_In_Sinhala,
- CR_In_Thai,
- CR_In_Lao,
- CR_In_Tibetan,
- CR_In_Myanmar,
- CR_In_Georgian,
- CR_In_Hangul_Jamo,
- CR_In_Ethiopic,
- CR_In_Ethiopic_Supplement,
- CR_In_Cherokee,
- CR_In_Unified_Canadian_Aboriginal_Syllabics,
- CR_In_Ogham,
- CR_In_Runic,
- CR_In_Tagalog,
- CR_In_Hanunoo,
- CR_In_Buhid,
- CR_In_Tagbanwa,
- CR_In_Khmer,
- CR_In_Mongolian,
- CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
- CR_In_Limbu,
- CR_In_Tai_Le,
- CR_In_New_Tai_Lue,
- CR_In_Khmer_Symbols,
- CR_In_Buginese,
- CR_In_Tai_Tham,
- CR_In_Balinese,
- CR_In_Sundanese,
- CR_In_Batak,
- CR_In_Lepcha,
- CR_In_Ol_Chiki,
- CR_In_Sundanese_Supplement,
- CR_In_Vedic_Extensions,
- CR_In_Phonetic_Extensions,
- CR_In_Phonetic_Extensions_Supplement,
- CR_In_Combining_Diacritical_Marks_Supplement,
- CR_In_Latin_Extended_Additional,
- CR_In_Greek_Extended,
- CR_In_General_Punctuation,
- CR_In_Superscripts_and_Subscripts,
- CR_In_Currency_Symbols,
- CR_In_Combining_Diacritical_Marks_for_Symbols,
- CR_In_Letterlike_Symbols,
- CR_In_Number_Forms,
- CR_In_Arrows,
- CR_In_Mathematical_Operators,
- CR_In_Miscellaneous_Technical,
- CR_In_Control_Pictures,
- CR_In_Optical_Character_Recognition,
- CR_In_Enclosed_Alphanumerics,
- CR_In_Box_Drawing,
- CR_In_Block_Elements,
- CR_In_Geometric_Shapes,
- CR_In_Miscellaneous_Symbols,
- CR_In_Dingbats,
- CR_In_Miscellaneous_Mathematical_Symbols_A,
- CR_In_Supplemental_Arrows_A,
- CR_In_Braille_Patterns,
- CR_In_Supplemental_Arrows_B,
- CR_In_Miscellaneous_Mathematical_Symbols_B,
- CR_In_Supplemental_Mathematical_Operators,
- CR_In_Miscellaneous_Symbols_and_Arrows,
- CR_In_Glagolitic,
- CR_In_Latin_Extended_C,
- CR_In_Coptic,
- CR_In_Georgian_Supplement,
- CR_In_Tifinagh,
- CR_In_Ethiopic_Extended,
- CR_In_Cyrillic_Extended_A,
- CR_In_Supplemental_Punctuation,
- CR_In_CJK_Radicals_Supplement,
- CR_In_Kangxi_Radicals,
- CR_In_Ideographic_Description_Characters,
- CR_In_CJK_Symbols_and_Punctuation,
- CR_In_Hiragana,
- CR_In_Katakana,
- CR_In_Bopomofo,
- CR_In_Hangul_Compatibility_Jamo,
- CR_In_Kanbun,
- CR_In_Bopomofo_Extended,
- CR_In_CJK_Strokes,
- CR_In_Katakana_Phonetic_Extensions,
- CR_In_Enclosed_CJK_Letters_and_Months,
- CR_In_CJK_Compatibility,
- CR_In_CJK_Unified_Ideographs_Extension_A,
- CR_In_Yijing_Hexagram_Symbols,
- CR_In_CJK_Unified_Ideographs,
- CR_In_Yi_Syllables,
- CR_In_Yi_Radicals,
- CR_In_Lisu,
- CR_In_Vai,
- CR_In_Cyrillic_Extended_B,
- CR_In_Bamum,
- CR_In_Modifier_Tone_Letters,
- CR_In_Latin_Extended_D,
- CR_In_Syloti_Nagri,
- CR_In_Common_Indic_Number_Forms,
- CR_In_Phags_pa,
- CR_In_Saurashtra,
- CR_In_Devanagari_Extended,
- CR_In_Kayah_Li,
- CR_In_Rejang,
- CR_In_Hangul_Jamo_Extended_A,
- CR_In_Javanese,
- CR_In_Cham,
- CR_In_Myanmar_Extended_A,
- CR_In_Tai_Viet,
- CR_In_Meetei_Mayek_Extensions,
- CR_In_Ethiopic_Extended_A,
- CR_In_Meetei_Mayek,
- CR_In_Hangul_Syllables,
- CR_In_Hangul_Jamo_Extended_B,
- CR_In_High_Surrogates,
- CR_In_High_Private_Use_Surrogates,
- CR_In_Low_Surrogates,
- CR_In_Private_Use_Area,
- CR_In_CJK_Compatibility_Ideographs,
- CR_In_Alphabetic_Presentation_Forms,
- CR_In_Arabic_Presentation_Forms_A,
- CR_In_Variation_Selectors,
- CR_In_Vertical_Forms,
- CR_In_Combining_Half_Marks,
- CR_In_CJK_Compatibility_Forms,
- CR_In_Small_Form_Variants,
- CR_In_Arabic_Presentation_Forms_B,
- CR_In_Halfwidth_and_Fullwidth_Forms,
- CR_In_Specials,
- CR_In_Linear_B_Syllabary,
- CR_In_Linear_B_Ideograms,
- CR_In_Aegean_Numbers,
- CR_In_Ancient_Greek_Numbers,
- CR_In_Ancient_Symbols,
- CR_In_Phaistos_Disc,
- CR_In_Lycian,
- CR_In_Carian,
- CR_In_Old_Italic,
- CR_In_Gothic,
- CR_In_Ugaritic,
- CR_In_Old_Persian,
- CR_In_Deseret,
- CR_In_Shavian,
- CR_In_Osmanya,
- CR_In_Cypriot_Syllabary,
- CR_In_Imperial_Aramaic,
- CR_In_Phoenician,
- CR_In_Lydian,
- CR_In_Meroitic_Hieroglyphs,
- CR_In_Meroitic_Cursive,
- CR_In_Kharoshthi,
- CR_In_Old_South_Arabian,
- CR_In_Avestan,
- CR_In_Inscriptional_Parthian,
- CR_In_Inscriptional_Pahlavi,
- CR_In_Old_Turkic,
- CR_In_Rumi_Numeral_Symbols,
- CR_In_Brahmi,
- CR_In_Kaithi,
- CR_In_Sora_Sompeng,
- CR_In_Chakma,
- CR_In_Sharada,
- CR_In_Takri,
- CR_In_Cuneiform,
- CR_In_Cuneiform_Numbers_and_Punctuation,
- CR_In_Egyptian_Hieroglyphs,
- CR_In_Bamum_Supplement,
- CR_In_Miao,
- CR_In_Kana_Supplement,
- CR_In_Byzantine_Musical_Symbols,
- CR_In_Musical_Symbols,
- CR_In_Ancient_Greek_Musical_Notation,
- CR_In_Tai_Xuan_Jing_Symbols,
- CR_In_Counting_Rod_Numerals,
- CR_In_Mathematical_Alphanumeric_Symbols,
- CR_In_Arabic_Mathematical_Alphabetic_Symbols,
- CR_In_Mahjong_Tiles,
- CR_In_Domino_Tiles,
- CR_In_Playing_Cards,
- CR_In_Enclosed_Alphanumeric_Supplement,
- CR_In_Enclosed_Ideographic_Supplement,
- CR_In_Miscellaneous_Symbols_And_Pictographs,
- CR_In_Emoticons,
- CR_In_Transport_And_Map_Symbols,
- CR_In_Alchemical_Symbols,
- CR_In_CJK_Unified_Ideographs_Extension_B,
- CR_In_CJK_Unified_Ideographs_Extension_C,
- CR_In_CJK_Unified_Ideographs_Extension_D,
- CR_In_CJK_Compatibility_Ideographs_Supplement,
- CR_In_Tags,
- CR_In_Variation_Selectors_Supplement,
- CR_In_Supplementary_Private_Use_Area_A,
- CR_In_Supplementary_Private_Use_Area_B,
- CR_In_No_Block,
+#endif /* USE_UNICODE_PROPERTIES */
#endif /* USE_UNICODE_PROPERTIES */
};
struct uniname2ctype_struct {
@@ -25947,19 +16370,19 @@ struct uniname2ctype_struct {
static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 14
+#define TOTAL_KEYWORDS 15
#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 19
-/* maximum key range = 14, duplicates = 0 */
+#define MAX_WORD_LENGTH 7
+#define MIN_HASH_VALUE 7
+#define MAX_HASH_VALUE 21
+/* maximum key range = 15, duplicates = 0 */
#else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 625
+#define TOTAL_KEYWORDS 367
#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 44
+#define MAX_WORD_LENGTH 30
#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 4167
-/* maximum key range = 4165, duplicates = 0 */
+#define MAX_HASH_VALUE 1751
+/* maximum key range = 1749, duplicates = 0 */
#endif /* USE_UNICODE_PROPERTIES */
#ifdef __GNUC__
@@ -25981,33 +16404,33 @@ uniname2ctype_hash (str, len)
#endif /* USE_UNICODE_PROPERTIES */
{
#ifndef USE_UNICODE_PROPERTIES
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 3, 11, 5,
- 4, 20, 20, 9, 20, 1, 20, 20, 10, 20,
- 2, 20, 1, 20, 1, 7, 4, 6, 20, 1,
- 4, 20, 20, 20, 20, 20, 20, 20
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 3, 13, 6,
+ 4, 22, 22, 11, 22, 1, 22, 22, 10, 22,
+ 2, 22, 1, 22, 10, 8, 4, 7, 22, 3,
+ 4, 22, 22, 22, 22, 22, 22, 22
#else /* USE_UNICODE_PROPERTIES */
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 1, 4168, 13, 1,
- 3, 28, 31, 10, 27, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 13, 854, 14,
- 443, 19, 7, 570, 335, 4, 66, 1159, 102, 34,
- 1, 178, 474, 1, 192, 2, 64, 1117, 491, 264,
- 256, 1305, 3, 4168, 4168, 4168, 4168, 4168
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 7, 419, 1,
+ 128, 38, 100, 186, 46, 11, 226, 463, 4, 317,
+ 6, 2, 265, 5, 18, 112, 30, 289, 164, 384,
+ 368, 579, 10, 1752, 1752, 1752, 1752, 1752
#endif /* USE_UNICODE_PROPERTIES */
};
#ifndef USE_UNICODE_PROPERTIES
@@ -26035,8 +16458,6 @@ uniname2ctype_hash (str, len)
hval += asso_values[(unsigned char)str[5]];
/*FALLTHROUGH*/
case 5:
- hval += asso_values[(unsigned char)str[4]];
- /*FALLTHROUGH*/
case 4:
case 3:
hval += asso_values[(unsigned char)str[2]];
@@ -26055,1298 +16476,783 @@ uniname2ctype_hash (str, len)
struct uniname2ctype_pool_t
{
#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str6[sizeof("word")];
char uniname2ctype_pool_str7[sizeof("print")];
char uniname2ctype_pool_str8[sizeof("punct")];
char uniname2ctype_pool_str9[sizeof("alpha")];
char uniname2ctype_pool_str10[sizeof("alnum")];
char uniname2ctype_pool_str11[sizeof("xdigit")];
- char uniname2ctype_pool_str12[sizeof("upper")];
- char uniname2ctype_pool_str13[sizeof("ascii")];
- char uniname2ctype_pool_str14[sizeof("cntrl")];
- char uniname2ctype_pool_str15[sizeof("space")];
- char uniname2ctype_pool_str16[sizeof("lower")];
- char uniname2ctype_pool_str17[sizeof("graph")];
- char uniname2ctype_pool_str18[sizeof("digit")];
- char uniname2ctype_pool_str19[sizeof("blank")];
+ char uniname2ctype_pool_str12[sizeof("newline")];
+ char uniname2ctype_pool_str13[sizeof("upper")];
+ char uniname2ctype_pool_str14[sizeof("ascii")];
+ char uniname2ctype_pool_str15[sizeof("cntrl")];
+ char uniname2ctype_pool_str16[sizeof("space")];
+ char uniname2ctype_pool_str17[sizeof("word")];
+ char uniname2ctype_pool_str18[sizeof("lower")];
+ char uniname2ctype_pool_str19[sizeof("graph")];
+ char uniname2ctype_pool_str20[sizeof("digit")];
+ char uniname2ctype_pool_str21[sizeof("blank")];
#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str3[sizeof("n")];
- char uniname2ctype_pool_str5[sizeof("s")];
- char uniname2ctype_pool_str7[sizeof("z")];
- char uniname2ctype_pool_str9[sizeof("zs")];
- char uniname2ctype_pool_str16[sizeof("zzzz")];
- char uniname2ctype_pool_str18[sizeof("cn")];
- char uniname2ctype_pool_str20[sizeof("cs")];
- char uniname2ctype_pool_str24[sizeof("ci")];
- char uniname2ctype_pool_str29[sizeof("c")];
- char uniname2ctype_pool_str30[sizeof("cf")];
- char uniname2ctype_pool_str32[sizeof("sc")];
- char uniname2ctype_pool_str34[sizeof("cans")];
- char uniname2ctype_pool_str35[sizeof("qaai")];
- char uniname2ctype_pool_str38[sizeof("mn")];
- char uniname2ctype_pool_str42[sizeof("ascii")];
- char uniname2ctype_pool_str44[sizeof("cc")];
- char uniname2ctype_pool_str45[sizeof("qaac")];
- char uniname2ctype_pool_str49[sizeof("inavestan")];
- char uniname2ctype_pool_str52[sizeof("inspecials")];
- char uniname2ctype_pool_str62[sizeof("inipaextensions")];
- char uniname2ctype_pool_str64[sizeof("mc")];
- char uniname2ctype_pool_str66[sizeof("insamaritan")];
- char uniname2ctype_pool_str69[sizeof("m")];
- char uniname2ctype_pool_str72[sizeof("sm")];
- char uniname2ctype_pool_str74[sizeof("me")];
- char uniname2ctype_pool_str82[sizeof("inarmenian")];
- char uniname2ctype_pool_str84[sizeof("incuneiform")];
- char uniname2ctype_pool_str86[sizeof("mandaic")];
- char uniname2ctype_pool_str90[sizeof("inancientsymbols")];
- char uniname2ctype_pool_str92[sizeof("incuneiformnumbersandpunctuation")];
- char uniname2ctype_pool_str96[sizeof("inthai")];
- char uniname2ctype_pool_str99[sizeof("inmusicalsymbols")];
- char uniname2ctype_pool_str100[sizeof("inmiscellaneoussymbols")];
- char uniname2ctype_pool_str106[sizeof("incham")];
- char uniname2ctype_pool_str109[sizeof("inmiscellaneoussymbolsandarrows")];
- char uniname2ctype_pool_str113[sizeof("initialpunctuation")];
- char uniname2ctype_pool_str114[sizeof("inmiscellaneoussymbolsandpictographs")];
- char uniname2ctype_pool_str116[sizeof("inthaana")];
- char uniname2ctype_pool_str124[sizeof("taile")];
- char uniname2ctype_pool_str125[sizeof("mtei")];
- char uniname2ctype_pool_str132[sizeof("lc")];
- char uniname2ctype_pool_str133[sizeof("lana")];
- char uniname2ctype_pool_str134[sizeof("inlycian")];
- char uniname2ctype_pool_str135[sizeof("intransportandmapsymbols")];
- char uniname2ctype_pool_str136[sizeof("incontrolpictures")];
- char uniname2ctype_pool_str142[sizeof("sinhala")];
- char uniname2ctype_pool_str151[sizeof("incommonindicnumberforms")];
- char uniname2ctype_pool_str156[sizeof("inmiscellaneousmathematicalsymbolsa")];
- char uniname2ctype_pool_str158[sizeof("sterm")];
- char uniname2ctype_pool_str167[sizeof("inmyanmarextendeda")];
- char uniname2ctype_pool_str172[sizeof("lm")];
- char uniname2ctype_pool_str175[sizeof("taiviet")];
- char uniname2ctype_pool_str179[sizeof("inlinearbideograms")];
- char uniname2ctype_pool_str180[sizeof("intaitham")];
- char uniname2ctype_pool_str184[sizeof("latn")];
- char uniname2ctype_pool_str186[sizeof("latin")];
- char uniname2ctype_pool_str187[sizeof("ital")];
- char uniname2ctype_pool_str189[sizeof("alnum")];
- char uniname2ctype_pool_str199[sizeof("inmalayalam")];
- char uniname2ctype_pool_str201[sizeof("intaile")];
- char uniname2ctype_pool_str202[sizeof("tale")];
- char uniname2ctype_pool_str205[sizeof("l")];
- char uniname2ctype_pool_str207[sizeof("nl")];
- char uniname2ctype_pool_str209[sizeof("zl")];
- char uniname2ctype_pool_str216[sizeof("intamil")];
- char uniname2ctype_pool_str217[sizeof("taml")];
- char uniname2ctype_pool_str218[sizeof("inlatinextendeda")];
- char uniname2ctype_pool_str220[sizeof("inlatinextendedc")];
- char uniname2ctype_pool_str223[sizeof("inrunic")];
- char uniname2ctype_pool_str224[sizeof("incarian")];
- char uniname2ctype_pool_str225[sizeof("insyriac")];
- char uniname2ctype_pool_str227[sizeof("cari")];
- char uniname2ctype_pool_str230[sizeof("inmeeteimayekextensions")];
- char uniname2ctype_pool_str231[sizeof("osma")];
- char uniname2ctype_pool_str232[sizeof("lt")];
- char uniname2ctype_pool_str233[sizeof("miao")];
- char uniname2ctype_pool_str234[sizeof("insharada")];
- char uniname2ctype_pool_str239[sizeof("incyrillic")];
- char uniname2ctype_pool_str240[sizeof("carian")];
- char uniname2ctype_pool_str244[sizeof("armn")];
- char uniname2ctype_pool_str245[sizeof("samr")];
- char uniname2ctype_pool_str247[sizeof("armi")];
- char uniname2ctype_pool_str248[sizeof("inideographicdescriptioncharacters")];
- char uniname2ctype_pool_str252[sizeof("inosmanya")];
- char uniname2ctype_pool_str253[sizeof("armenian")];
- char uniname2ctype_pool_str254[sizeof("inmyanmar")];
- char uniname2ctype_pool_str255[sizeof("samaritan")];
- char uniname2ctype_pool_str256[sizeof("arabic")];
- char uniname2ctype_pool_str259[sizeof("incherokee")];
- char uniname2ctype_pool_str261[sizeof("connectorpunctuation")];
- char uniname2ctype_pool_str263[sizeof("merc")];
- char uniname2ctype_pool_str264[sizeof("inmiscellaneoustechnical")];
- char uniname2ctype_pool_str268[sizeof("inenclosedalphanumerics")];
- char uniname2ctype_pool_str279[sizeof("inemoticons")];
- char uniname2ctype_pool_str281[sizeof("joinc")];
- char uniname2ctype_pool_str288[sizeof("cntrl")];
- char uniname2ctype_pool_str301[sizeof("inenclosedcjklettersandmonths")];
- char uniname2ctype_pool_str303[sizeof("cwcf")];
- char uniname2ctype_pool_str304[sizeof("inruminumeralsymbols")];
- char uniname2ctype_pool_str308[sizeof("ll")];
- char uniname2ctype_pool_str313[sizeof("term")];
- char uniname2ctype_pool_str316[sizeof("inlatinextendedadditional")];
- char uniname2ctype_pool_str320[sizeof("tamil")];
- char uniname2ctype_pool_str321[sizeof("loe")];
- char uniname2ctype_pool_str329[sizeof("newtailue")];
- char uniname2ctype_pool_str330[sizeof("cwcm")];
- char uniname2ctype_pool_str339[sizeof("inenclosedalphanumericsupplement")];
- char uniname2ctype_pool_str346[sizeof("sinh")];
- char uniname2ctype_pool_str347[sizeof("zinh")];
- char uniname2ctype_pool_str349[sizeof("meroiticcursive")];
- char uniname2ctype_pool_str353[sizeof("han")];
- char uniname2ctype_pool_str357[sizeof("hani")];
- char uniname2ctype_pool_str358[sizeof("inopticalcharacterrecognition")];
- char uniname2ctype_pool_str359[sizeof("no")];
- char uniname2ctype_pool_str360[sizeof("so")];
- char uniname2ctype_pool_str364[sizeof("innewtailue")];
- char uniname2ctype_pool_str365[sizeof("insinhala")];
- char uniname2ctype_pool_str367[sizeof("innko")];
- char uniname2ctype_pool_str372[sizeof("co")];
- char uniname2ctype_pool_str375[sizeof("shavian")];
- char uniname2ctype_pool_str378[sizeof("terminalpunctuation")];
- char uniname2ctype_pool_str386[sizeof("intaixuanjingsymbols")];
- char uniname2ctype_pool_str387[sizeof("inethiopic")];
- char uniname2ctype_pool_str389[sizeof("sora")];
- char uniname2ctype_pool_str398[sizeof("inarrows")];
- char uniname2ctype_pool_str400[sizeof("cham")];
- char uniname2ctype_pool_str403[sizeof("inlowsurrogates")];
- char uniname2ctype_pool_str405[sizeof("oriya")];
- char uniname2ctype_pool_str406[sizeof("ext")];
- char uniname2ctype_pool_str409[sizeof("cwt")];
- char uniname2ctype_pool_str412[sizeof("common")];
- char uniname2ctype_pool_str414[sizeof("inmiao")];
- char uniname2ctype_pool_str420[sizeof("thai")];
- char uniname2ctype_pool_str425[sizeof("intifinagh")];
- char uniname2ctype_pool_str426[sizeof("ethi")];
- char uniname2ctype_pool_str427[sizeof("mero")];
- char uniname2ctype_pool_str428[sizeof("chakma")];
- char uniname2ctype_pool_str429[sizeof("thaa")];
- char uniname2ctype_pool_str430[sizeof("inscriptionalparthian")];
- char uniname2ctype_pool_str432[sizeof("tifinagh")];
- char uniname2ctype_pool_str436[sizeof("titlecaseletter")];
- char uniname2ctype_pool_str445[sizeof("thaana")];
- char uniname2ctype_pool_str449[sizeof("asciihexdigit")];
- char uniname2ctype_pool_str450[sizeof("math")];
- char uniname2ctype_pool_str453[sizeof("di")];
- char uniname2ctype_pool_str454[sizeof("ids")];
- char uniname2ctype_pool_str460[sizeof("lo")];
- char uniname2ctype_pool_str468[sizeof("inlao")];
- char uniname2ctype_pool_str470[sizeof("taitham")];
- char uniname2ctype_pool_str474[sizeof("lao")];
- char uniname2ctype_pool_str475[sizeof("laoo")];
- char uniname2ctype_pool_str476[sizeof("dia")];
- char uniname2ctype_pool_str478[sizeof("idc")];
- char uniname2ctype_pool_str480[sizeof("ps")];
- char uniname2ctype_pool_str481[sizeof("insundanese")];
- char uniname2ctype_pool_str484[sizeof("pi")];
- char uniname2ctype_pool_str485[sizeof("cwl")];
- char uniname2ctype_pool_str490[sizeof("pf")];
- char uniname2ctype_pool_str495[sizeof("mand")];
- char uniname2ctype_pool_str496[sizeof("insylotinagri")];
- char uniname2ctype_pool_str497[sizeof("vs")];
- char uniname2ctype_pool_str503[sizeof("mongolian")];
- char uniname2ctype_pool_str504[sizeof("pc")];
- char uniname2ctype_pool_str506[sizeof("inmandaic")];
- char uniname2ctype_pool_str509[sizeof("invai")];
- char uniname2ctype_pool_str511[sizeof("lineseparator")];
- char uniname2ctype_pool_str514[sizeof("pe")];
- char uniname2ctype_pool_str515[sizeof("vai")];
- char uniname2ctype_pool_str516[sizeof("vaii")];
- char uniname2ctype_pool_str517[sizeof("idst")];
- char uniname2ctype_pool_str520[sizeof("indominotiles")];
- char uniname2ctype_pool_str521[sizeof("inshavian")];
- char uniname2ctype_pool_str522[sizeof("inspacingmodifierletters")];
- char uniname2ctype_pool_str524[sizeof("format")];
- char uniname2ctype_pool_str528[sizeof("inphaistosdisc")];
- char uniname2ctype_pool_str531[sizeof("hano")];
- char uniname2ctype_pool_str532[sizeof("space")];
- char uniname2ctype_pool_str542[sizeof("indeseret")];
- char uniname2ctype_pool_str545[sizeof("inolchiki")];
- char uniname2ctype_pool_str548[sizeof("hira")];
- char uniname2ctype_pool_str553[sizeof("joincontrol")];
- char uniname2ctype_pool_str555[sizeof("idcontinue")];
- char uniname2ctype_pool_str558[sizeof("inmahjongtiles")];
- char uniname2ctype_pool_str560[sizeof("patws")];
- char uniname2ctype_pool_str563[sizeof("inlydian")];
- char uniname2ctype_pool_str564[sizeof("cher")];
- char uniname2ctype_pool_str568[sizeof("inhiragana")];
- char uniname2ctype_pool_str572[sizeof("inogham")];
- char uniname2ctype_pool_str574[sizeof("avst")];
- char uniname2ctype_pool_str575[sizeof("inscriptionalpahlavi")];
- char uniname2ctype_pool_str579[sizeof("incoptic")];
- char uniname2ctype_pool_str587[sizeof("java")];
- char uniname2ctype_pool_str589[sizeof("inmathematicalalphanumericsymbols")];
- char uniname2ctype_pool_str594[sizeof("letter")];
- char uniname2ctype_pool_str604[sizeof("injavanese")];
- char uniname2ctype_pool_str608[sizeof("avestan")];
- char uniname2ctype_pool_str612[sizeof("age=1.1")];
- char uniname2ctype_pool_str613[sizeof("lepc")];
- char uniname2ctype_pool_str614[sizeof("age=2.1")];
- char uniname2ctype_pool_str616[sizeof("inlepcha")];
- char uniname2ctype_pool_str617[sizeof("javanese")];
- char uniname2ctype_pool_str618[sizeof("shaw")];
- char uniname2ctype_pool_str619[sizeof("finalpunctuation")];
- char uniname2ctype_pool_str620[sizeof("alpha")];
- char uniname2ctype_pool_str621[sizeof("age=5.1")];
- char uniname2ctype_pool_str622[sizeof("inmongolian")];
- char uniname2ctype_pool_str623[sizeof("age=5.2")];
- char uniname2ctype_pool_str626[sizeof("age=2.0")];
- char uniname2ctype_pool_str627[sizeof("ahex")];
- char uniname2ctype_pool_str630[sizeof("ingeneralpunctuation")];
- char uniname2ctype_pool_str631[sizeof("oids")];
- char uniname2ctype_pool_str632[sizeof("odi")];
- char uniname2ctype_pool_str633[sizeof("age=5.0")];
- char uniname2ctype_pool_str636[sizeof("tavt")];
- char uniname2ctype_pool_str637[sizeof("intaiviet")];
- char uniname2ctype_pool_str638[sizeof("age=6.1")];
- char uniname2ctype_pool_str639[sizeof("age=3.1")];
- char uniname2ctype_pool_str640[sizeof("insundanesesupplement")];
- char uniname2ctype_pool_str641[sizeof("age=3.2")];
- char uniname2ctype_pool_str642[sizeof("age=4.1")];
- char uniname2ctype_pool_str643[sizeof("oidc")];
- char uniname2ctype_pool_str646[sizeof("tfng")];
- char uniname2ctype_pool_str647[sizeof("insmallformvariants")];
- char uniname2ctype_pool_str648[sizeof("ideo")];
- char uniname2ctype_pool_str649[sizeof("intags")];
- char uniname2ctype_pool_str650[sizeof("age=6.0")];
- char uniname2ctype_pool_str651[sizeof("age=3.0")];
- char uniname2ctype_pool_str653[sizeof("whitespace")];
- char uniname2ctype_pool_str654[sizeof("age=4.0")];
- char uniname2ctype_pool_str655[sizeof("inolditalic")];
- char uniname2ctype_pool_str660[sizeof("oalpha")];
- char uniname2ctype_pool_str668[sizeof("ingujarati")];
- char uniname2ctype_pool_str672[sizeof("control")];
- char uniname2ctype_pool_str679[sizeof("diacritic")];
- char uniname2ctype_pool_str682[sizeof("tagbanwa")];
- char uniname2ctype_pool_str690[sizeof("inphoenician")];
- char uniname2ctype_pool_str701[sizeof("ininscriptionalparthian")];
- char uniname2ctype_pool_str703[sizeof("ininscriptionalpahlavi")];
- char uniname2ctype_pool_str704[sizeof("coptic")];
- char uniname2ctype_pool_str705[sizeof("dsrt")];
- char uniname2ctype_pool_str706[sizeof("inmodifiertoneletters")];
- char uniname2ctype_pool_str709[sizeof("xids")];
- char uniname2ctype_pool_str713[sizeof("hanunoo")];
- char uniname2ctype_pool_str715[sizeof("inoldturkic")];
- char uniname2ctype_pool_str721[sizeof("xidc")];
- char uniname2ctype_pool_str725[sizeof("idstart")];
- char uniname2ctype_pool_str729[sizeof("inimperialaramaic")];
- char uniname2ctype_pool_str730[sizeof("invariationselectors")];
- char uniname2ctype_pool_str734[sizeof("copt")];
- char uniname2ctype_pool_str737[sizeof("caseignorable")];
- char uniname2ctype_pool_str738[sizeof("prti")];
- char uniname2ctype_pool_str739[sizeof("nchar")];
- char uniname2ctype_pool_str746[sizeof("deseret")];
- char uniname2ctype_pool_str747[sizeof("decimalnumber")];
- char uniname2ctype_pool_str748[sizeof("cprt")];
- char uniname2ctype_pool_str750[sizeof("inlatin1supplement")];
- char uniname2ctype_pool_str771[sizeof("imperialaramaic")];
- char uniname2ctype_pool_str776[sizeof("privateuse")];
- char uniname2ctype_pool_str777[sizeof("casedletter")];
- char uniname2ctype_pool_str778[sizeof("lowercase")];
- char uniname2ctype_pool_str780[sizeof("spaceseparator")];
- char uniname2ctype_pool_str784[sizeof("radical")];
- char uniname2ctype_pool_str787[sizeof("mong")];
- char uniname2ctype_pool_str788[sizeof("canadianaboriginal")];
- char uniname2ctype_pool_str792[sizeof("letternumber")];
- char uniname2ctype_pool_str796[sizeof("insorasompeng")];
- char uniname2ctype_pool_str797[sizeof("dash")];
- char uniname2ctype_pool_str798[sizeof("wspace")];
- char uniname2ctype_pool_str799[sizeof("ogam")];
- char uniname2ctype_pool_str802[sizeof("invariationselectorssupplement")];
- char uniname2ctype_pool_str803[sizeof("print")];
- char uniname2ctype_pool_str811[sizeof("otheridcontinue")];
- char uniname2ctype_pool_str815[sizeof("ingurmukhi")];
- char uniname2ctype_pool_str818[sizeof("closepunctuation")];
- char uniname2ctype_pool_str823[sizeof("olditalic")];
- char uniname2ctype_pool_str824[sizeof("noncharactercodepoint")];
- char uniname2ctype_pool_str826[sizeof("sharada")];
- char uniname2ctype_pool_str827[sizeof("ingeometricshapes")];
- char uniname2ctype_pool_str830[sizeof("otheralphabetic")];
- char uniname2ctype_pool_str831[sizeof("patternwhitespace")];
- char uniname2ctype_pool_str832[sizeof("po")];
- char uniname2ctype_pool_str833[sizeof("rjng")];
- char uniname2ctype_pool_str835[sizeof("ingreekandcoptic")];
- char uniname2ctype_pool_str841[sizeof("xdigit")];
- char uniname2ctype_pool_str850[sizeof("gothic")];
- char uniname2ctype_pool_str851[sizeof("inoldsoutharabian")];
- char uniname2ctype_pool_str852[sizeof("xidstart")];
- char uniname2ctype_pool_str854[sizeof("inrejang")];
- char uniname2ctype_pool_str860[sizeof("idsbinaryoperator")];
- char uniname2ctype_pool_str867[sizeof("olower")];
- char uniname2ctype_pool_str869[sizeof("hex")];
- char uniname2ctype_pool_str870[sizeof("inenclosedideographicsupplement")];
- char uniname2ctype_pool_str874[sizeof("inalphabeticpresentationforms")];
- char uniname2ctype_pool_str879[sizeof("inbasiclatin")];
- char uniname2ctype_pool_str884[sizeof("othersymbol")];
- char uniname2ctype_pool_str889[sizeof("nd")];
- char uniname2ctype_pool_str890[sizeof("sd")];
- char uniname2ctype_pool_str900[sizeof("omath")];
- char uniname2ctype_pool_str901[sizeof("separator")];
- char uniname2ctype_pool_str907[sizeof("inarabic")];
- char uniname2ctype_pool_str912[sizeof("xidcontinue")];
- char uniname2ctype_pool_str913[sizeof("otheridstart")];
- char uniname2ctype_pool_str914[sizeof("grext")];
- char uniname2ctype_pool_str917[sizeof("otherlowercase")];
- char uniname2ctype_pool_str919[sizeof("phli")];
- char uniname2ctype_pool_str920[sizeof("cased")];
- char uniname2ctype_pool_str923[sizeof("hang")];
- char uniname2ctype_pool_str931[sizeof("xpeo")];
- char uniname2ctype_pool_str933[sizeof("lower")];
- char uniname2ctype_pool_str936[sizeof("modifierletter")];
- char uniname2ctype_pool_str938[sizeof("inphoneticextensions")];
- char uniname2ctype_pool_str939[sizeof("inarabicpresentationformsa")];
- char uniname2ctype_pool_str943[sizeof("innumberforms")];
- char uniname2ctype_pool_str945[sizeof("oldpersian")];
- char uniname2ctype_pool_str946[sizeof("incyrillicextendeda")];
- char uniname2ctype_pool_str947[sizeof("inverticalforms")];
- char uniname2ctype_pool_str949[sizeof("p")];
- char uniname2ctype_pool_str950[sizeof("inbyzantinemusicalsymbols")];
- char uniname2ctype_pool_str951[sizeof("inmathematicaloperators")];
- char uniname2ctype_pool_str952[sizeof("intibetan")];
- char uniname2ctype_pool_str953[sizeof("zp")];
- char uniname2ctype_pool_str956[sizeof("ingeorgian")];
- char uniname2ctype_pool_str960[sizeof("inbraillepatterns")];
- char uniname2ctype_pool_str962[sizeof("lepcha")];
- char uniname2ctype_pool_str963[sizeof("geor")];
- char uniname2ctype_pool_str964[sizeof("invedicextensions")];
- char uniname2ctype_pool_str965[sizeof("linb")];
- char uniname2ctype_pool_str966[sizeof("other")];
- char uniname2ctype_pool_str970[sizeof("deva")];
- char uniname2ctype_pool_str972[sizeof("indevanagari")];
- char uniname2ctype_pool_str973[sizeof("othernumber")];
- char uniname2ctype_pool_str974[sizeof("bamum")];
- char uniname2ctype_pool_str976[sizeof("shrd")];
- char uniname2ctype_pool_str977[sizeof("bali")];
- char uniname2ctype_pool_str981[sizeof("devanagari")];
- char uniname2ctype_pool_str983[sizeof("extender")];
- char uniname2ctype_pool_str988[sizeof("inherited")];
- char uniname2ctype_pool_str989[sizeof("glagolitic")];
- char uniname2ctype_pool_str990[sizeof("tibt")];
- char uniname2ctype_pool_str994[sizeof("inbalinese")];
- char uniname2ctype_pool_str996[sizeof("ingothic")];
- char uniname2ctype_pool_str997[sizeof("inmiscellaneousmathematicalsymbolsb")];
- char uniname2ctype_pool_str998[sizeof("limb")];
- char uniname2ctype_pool_str1000[sizeof("bengali")];
- char uniname2ctype_pool_str1003[sizeof("phoenician")];
- char uniname2ctype_pool_str1004[sizeof("insuperscriptsandsubscripts")];
- char uniname2ctype_pool_str1006[sizeof("inmeroitichieroglyphs")];
- char uniname2ctype_pool_str1007[sizeof("tibetan")];
- char uniname2ctype_pool_str1010[sizeof("inphoneticextensionssupplement")];
- char uniname2ctype_pool_str1016[sizeof("balinese")];
- char uniname2ctype_pool_str1021[sizeof("lowercaseletter")];
- char uniname2ctype_pool_str1031[sizeof("indingbats")];
- char uniname2ctype_pool_str1035[sizeof("inprivateusearea")];
- char uniname2ctype_pool_str1039[sizeof("assigned")];
- char uniname2ctype_pool_str1044[sizeof("patternsyntax")];
- char uniname2ctype_pool_str1051[sizeof("inhangulsyllables")];
- char uniname2ctype_pool_str1065[sizeof("sarb")];
- char uniname2ctype_pool_str1067[sizeof("brai")];
- char uniname2ctype_pool_str1069[sizeof("insupplementalmathematicaloperators")];
- char uniname2ctype_pool_str1070[sizeof("phnx")];
- char uniname2ctype_pool_str1072[sizeof("ingreekextended")];
- char uniname2ctype_pool_str1074[sizeof("otherletter")];
- char uniname2ctype_pool_str1076[sizeof("arab")];
- char uniname2ctype_pool_str1078[sizeof("inlatinextendedd")];
- char uniname2ctype_pool_str1081[sizeof("word")];
- char uniname2ctype_pool_str1084[sizeof("inphagspa")];
- char uniname2ctype_pool_str1087[sizeof("inblockelements")];
- char uniname2ctype_pool_str1092[sizeof("ethiopic")];
- char uniname2ctype_pool_str1094[sizeof("inethiopicextendeda")];
- char uniname2ctype_pool_str1107[sizeof("brahmi")];
- char uniname2ctype_pool_str1110[sizeof("logicalorderexception")];
- char uniname2ctype_pool_str1114[sizeof("inoldpersian")];
- char uniname2ctype_pool_str1129[sizeof("inletterlikesymbols")];
- char uniname2ctype_pool_str1133[sizeof("sorasompeng")];
- char uniname2ctype_pool_str1135[sizeof("hiragana")];
- char uniname2ctype_pool_str1142[sizeof("inhanguljamoextendeda")];
- char uniname2ctype_pool_str1147[sizeof("othermath")];
- char uniname2ctype_pool_str1150[sizeof("digit")];
- char uniname2ctype_pool_str1151[sizeof("goth")];
- char uniname2ctype_pool_str1156[sizeof("ogham")];
- char uniname2ctype_pool_str1162[sizeof("sundanese")];
- char uniname2ctype_pool_str1170[sizeof("saurashtra")];
- char uniname2ctype_pool_str1173[sizeof("linearb")];
- char uniname2ctype_pool_str1179[sizeof("graphemebase")];
- char uniname2ctype_pool_str1185[sizeof("inunifiedcanadianaboriginalsyllabics")];
- char uniname2ctype_pool_str1186[sizeof("cuneiform")];
- char uniname2ctype_pool_str1188[sizeof("inkannada")];
- char uniname2ctype_pool_str1190[sizeof("kana")];
- char uniname2ctype_pool_str1195[sizeof("inancientgreeknumbers")];
- char uniname2ctype_pool_str1196[sizeof("incjkstrokes")];
- char uniname2ctype_pool_str1198[sizeof("inglagolitic")];
- char uniname2ctype_pool_str1202[sizeof("inancientgreekmusicalnotation")];
- char uniname2ctype_pool_str1212[sizeof("inchakma")];
- char uniname2ctype_pool_str1215[sizeof("plrd")];
- char uniname2ctype_pool_str1219[sizeof("inbrahmi")];
- char uniname2ctype_pool_str1224[sizeof("cakm")];
- char uniname2ctype_pool_str1225[sizeof("incjkcompatibilityforms")];
- char uniname2ctype_pool_str1229[sizeof("lisu")];
- char uniname2ctype_pool_str1230[sizeof("incjkcompatibilityideographs")];
- char uniname2ctype_pool_str1231[sizeof("intagalog")];
- char uniname2ctype_pool_str1244[sizeof("inkaithi")];
- char uniname2ctype_pool_str1245[sizeof("insupplementalarrowsa")];
- char uniname2ctype_pool_str1249[sizeof("takri")];
- char uniname2ctype_pool_str1253[sizeof("ideographic")];
- char uniname2ctype_pool_str1256[sizeof("hexdigit")];
- char uniname2ctype_pool_str1259[sizeof("glag")];
- char uniname2ctype_pool_str1261[sizeof("softdotted")];
- char uniname2ctype_pool_str1262[sizeof("variationselector")];
- char uniname2ctype_pool_str1264[sizeof("inkatakana")];
- char uniname2ctype_pool_str1265[sizeof("meeteimayek")];
- char uniname2ctype_pool_str1274[sizeof("otherpunctuation")];
- char uniname2ctype_pool_str1279[sizeof("inhanguljamo")];
- char uniname2ctype_pool_str1282[sizeof("kali")];
- char uniname2ctype_pool_str1289[sizeof("braille")];
- char uniname2ctype_pool_str1298[sizeof("incombininghalfmarks")];
- char uniname2ctype_pool_str1300[sizeof("talu")];
- char uniname2ctype_pool_str1302[sizeof("incjkcompatibilityideographssupplement")];
- char uniname2ctype_pool_str1306[sizeof("telu")];
- char uniname2ctype_pool_str1307[sizeof("idsb")];
- char uniname2ctype_pool_str1310[sizeof("tglg")];
- char uniname2ctype_pool_str1313[sizeof("inmeeteimayek")];
- char uniname2ctype_pool_str1315[sizeof("yi")];
- char uniname2ctype_pool_str1318[sizeof("phagspa")];
- char uniname2ctype_pool_str1321[sizeof("yiii")];
- char uniname2ctype_pool_str1323[sizeof("inarabicmathematicalalphabeticsymbols")];
- char uniname2ctype_pool_str1328[sizeof("saur")];
- char uniname2ctype_pool_str1330[sizeof("ogrext")];
- char uniname2ctype_pool_str1334[sizeof("bidic")];
- char uniname2ctype_pool_str1341[sizeof("inkanasupplement")];
- char uniname2ctype_pool_str1343[sizeof("runic")];
- char uniname2ctype_pool_str1344[sizeof("inalchemicalsymbols")];
- char uniname2ctype_pool_str1350[sizeof("georgian")];
- char uniname2ctype_pool_str1351[sizeof("inugaritic")];
- char uniname2ctype_pool_str1354[sizeof("insaurashtra")];
- char uniname2ctype_pool_str1356[sizeof("inhighprivateusesurrogates")];
- char uniname2ctype_pool_str1362[sizeof("pd")];
- char uniname2ctype_pool_str1372[sizeof("incountingrodnumerals")];
- char uniname2ctype_pool_str1377[sizeof("inarabicextendeda")];
- char uniname2ctype_pool_str1389[sizeof("inkharoshthi")];
- char uniname2ctype_pool_str1393[sizeof("idstrinaryoperator")];
- char uniname2ctype_pool_str1396[sizeof("phag")];
- char uniname2ctype_pool_str1398[sizeof("brah")];
- char uniname2ctype_pool_str1402[sizeof("mark")];
- char uniname2ctype_pool_str1404[sizeof("hebr")];
- char uniname2ctype_pool_str1411[sizeof("inkhmersymbols")];
- char uniname2ctype_pool_str1413[sizeof("dep")];
- char uniname2ctype_pool_str1416[sizeof("inkhmer")];
- char uniname2ctype_pool_str1422[sizeof("deprecated")];
- char uniname2ctype_pool_str1424[sizeof("rejang")];
- char uniname2ctype_pool_str1429[sizeof("lyci")];
- char uniname2ctype_pool_str1431[sizeof("intakri")];
- char uniname2ctype_pool_str1432[sizeof("takr")];
- char uniname2ctype_pool_str1435[sizeof("incyrillicsupplement")];
- char uniname2ctype_pool_str1436[sizeof("changeswhencasefolded")];
- char uniname2ctype_pool_str1438[sizeof("indevanagariextended")];
- char uniname2ctype_pool_str1442[sizeof("lycian")];
- char uniname2ctype_pool_str1443[sizeof("inbengali")];
- char uniname2ctype_pool_str1448[sizeof("beng")];
- char uniname2ctype_pool_str1450[sizeof("graph")];
- char uniname2ctype_pool_str1452[sizeof("inyijinghexagramsymbols")];
- char uniname2ctype_pool_str1457[sizeof("olck")];
- char uniname2ctype_pool_str1460[sizeof("inarabicsupplement")];
- char uniname2ctype_pool_str1462[sizeof("inbuginese")];
- char uniname2ctype_pool_str1463[sizeof("changeswhencasemapped")];
- char uniname2ctype_pool_str1468[sizeof("olchiki")];
- char uniname2ctype_pool_str1478[sizeof("inaegeannumbers")];
- char uniname2ctype_pool_str1479[sizeof("mlym")];
- char uniname2ctype_pool_str1480[sizeof("alphabetic")];
- char uniname2ctype_pool_str1492[sizeof("sylotinagri")];
- char uniname2ctype_pool_str1498[sizeof("changeswhentitlecased")];
- char uniname2ctype_pool_str1504[sizeof("tagalog")];
- char uniname2ctype_pool_str1505[sizeof("tagb")];
- char uniname2ctype_pool_str1506[sizeof("runr")];
- char uniname2ctype_pool_str1510[sizeof("malayalam")];
- char uniname2ctype_pool_str1512[sizeof("inoriya")];
- char uniname2ctype_pool_str1516[sizeof("intagbanwa")];
- char uniname2ctype_pool_str1517[sizeof("syrc")];
- char uniname2ctype_pool_str1519[sizeof("nko")];
- char uniname2ctype_pool_str1520[sizeof("nkoo")];
- char uniname2ctype_pool_str1523[sizeof("inethiopicextended")];
- char uniname2ctype_pool_str1525[sizeof("kaithi")];
- char uniname2ctype_pool_str1530[sizeof("mathsymbol")];
- char uniname2ctype_pool_str1531[sizeof("inyiradicals")];
- char uniname2ctype_pool_str1536[sizeof("insupplementaryprivateuseareaa")];
- char uniname2ctype_pool_str1540[sizeof("osmanya")];
- char uniname2ctype_pool_str1546[sizeof("syriac")];
- char uniname2ctype_pool_str1548[sizeof("otherdefaultignorablecodepoint")];
- char uniname2ctype_pool_str1561[sizeof("number")];
- char uniname2ctype_pool_str1565[sizeof("inlinearbsyllabary")];
- char uniname2ctype_pool_str1566[sizeof("kthi")];
- char uniname2ctype_pool_str1567[sizeof("sund")];
- char uniname2ctype_pool_str1569[sizeof("mymr")];
- char uniname2ctype_pool_str1571[sizeof("incombiningdiacriticalmarks")];
- char uniname2ctype_pool_str1578[sizeof("enclosingmark")];
- char uniname2ctype_pool_str1581[sizeof("incombiningdiacriticalmarksforsymbols")];
- char uniname2ctype_pool_str1583[sizeof("inethiopicsupplement")];
- char uniname2ctype_pool_str1590[sizeof("unassigned")];
- char uniname2ctype_pool_str1591[sizeof("sylo")];
- char uniname2ctype_pool_str1595[sizeof("combiningmark")];
- char uniname2ctype_pool_str1598[sizeof("myanmar")];
- char uniname2ctype_pool_str1605[sizeof("graphemeextend")];
- char uniname2ctype_pool_str1606[sizeof("bidicontrol")];
- char uniname2ctype_pool_str1609[sizeof("inhalfwidthandfullwidthforms")];
- char uniname2ctype_pool_str1617[sizeof("cyrl")];
- char uniname2ctype_pool_str1620[sizeof("knda")];
- char uniname2ctype_pool_str1634[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
- char uniname2ctype_pool_str1635[sizeof("xsux")];
- char uniname2ctype_pool_str1636[sizeof("modifiersymbol")];
- char uniname2ctype_pool_str1643[sizeof("incombiningdiacriticalmarkssupplement")];
- char uniname2ctype_pool_str1645[sizeof("inhanunoo")];
- char uniname2ctype_pool_str1648[sizeof("inbuhid")];
- char uniname2ctype_pool_str1649[sizeof("kannada")];
- char uniname2ctype_pool_str1658[sizeof("inhebrew")];
- char uniname2ctype_pool_str1662[sizeof("grbase")];
- char uniname2ctype_pool_str1664[sizeof("spacingmark")];
- char uniname2ctype_pool_str1670[sizeof("inkatakanaphoneticextensions")];
- char uniname2ctype_pool_str1676[sizeof("hangul")];
- char uniname2ctype_pool_str1683[sizeof("incjksymbolsandpunctuation")];
- char uniname2ctype_pool_str1688[sizeof("bopo")];
- char uniname2ctype_pool_str1692[sizeof("orya")];
- char uniname2ctype_pool_str1699[sizeof("inbopomofo")];
- char uniname2ctype_pool_str1701[sizeof("kharoshthi")];
- char uniname2ctype_pool_str1703[sizeof("khar")];
- char uniname2ctype_pool_str1709[sizeof("changeswhenlowercased")];
- char uniname2ctype_pool_str1724[sizeof("khmr")];
- char uniname2ctype_pool_str1725[sizeof("punct")];
- char uniname2ctype_pool_str1729[sizeof("symbol")];
- char uniname2ctype_pool_str1732[sizeof("cherokee")];
- char uniname2ctype_pool_str1737[sizeof("cyrillic")];
- char uniname2ctype_pool_str1759[sizeof("inkangxiradicals")];
- char uniname2ctype_pool_str1761[sizeof("hebrew")];
- char uniname2ctype_pool_str1780[sizeof("inarabicpresentationformsb")];
- char uniname2ctype_pool_str1787[sizeof("incyrillicextendedb")];
- char uniname2ctype_pool_str1790[sizeof("ugaritic")];
- char uniname2ctype_pool_str1829[sizeof("incurrencysymbols")];
- char uniname2ctype_pool_str1831[sizeof("meroitichieroglyphs")];
- char uniname2ctype_pool_str1835[sizeof("inhighsurrogates")];
- char uniname2ctype_pool_str1853[sizeof("nonspacingmark")];
- char uniname2ctype_pool_str1858[sizeof("lydi")];
- char uniname2ctype_pool_str1864[sizeof("patsyn")];
- char uniname2ctype_pool_str1868[sizeof("orkh")];
- char uniname2ctype_pool_str1871[sizeof("lydian")];
- char uniname2ctype_pool_str1896[sizeof("ugar")];
- char uniname2ctype_pool_str1899[sizeof("othergraphemeextend")];
- char uniname2ctype_pool_str1900[sizeof("inlatinextendedb")];
- char uniname2ctype_pool_str1904[sizeof("bopomofo")];
- char uniname2ctype_pool_str1917[sizeof("khmer")];
- char uniname2ctype_pool_str1925[sizeof("uideo")];
- char uniname2ctype_pool_str1932[sizeof("otheruppercase")];
- char uniname2ctype_pool_str1944[sizeof("grek")];
- char uniname2ctype_pool_str1949[sizeof("gujr")];
- char uniname2ctype_pool_str1970[sizeof("gujarati")];
- char uniname2ctype_pool_str1983[sizeof("inhanguljamoextendedb")];
- char uniname2ctype_pool_str1988[sizeof("defaultignorablecodepoint")];
- char uniname2ctype_pool_str2005[sizeof("inplayingcards")];
- char uniname2ctype_pool_str2022[sizeof("bamu")];
- char uniname2ctype_pool_str2028[sizeof("inkanbun")];
- char uniname2ctype_pool_str2033[sizeof("incjkradicalssupplement")];
- char uniname2ctype_pool_str2046[sizeof("cypriot")];
- char uniname2ctype_pool_str2051[sizeof("inbamum")];
- char uniname2ctype_pool_str2053[sizeof("inmeroiticcursive")];
- char uniname2ctype_pool_str2055[sizeof("oldturkic")];
- char uniname2ctype_pool_str2086[sizeof("insupplementalarrowsb")];
- char uniname2ctype_pool_str2087[sizeof("surrogate")];
- char uniname2ctype_pool_str2094[sizeof("batk")];
- char uniname2ctype_pool_str2102[sizeof("inbatak")];
- char uniname2ctype_pool_str2119[sizeof("inlimbu")];
- char uniname2ctype_pool_str2123[sizeof("incypriotsyllabary")];
- char uniname2ctype_pool_str2129[sizeof("dashpunctuation")];
- char uniname2ctype_pool_str2130[sizeof("innoblock")];
- char uniname2ctype_pool_str2141[sizeof("hyphen")];
- char uniname2ctype_pool_str2162[sizeof("insupplementalpunctuation")];
- char uniname2ctype_pool_str2165[sizeof("ingeorgiansupplement")];
- char uniname2ctype_pool_str2178[sizeof("oupper")];
- char uniname2ctype_pool_str2189[sizeof("paragraphseparator")];
- char uniname2ctype_pool_str2194[sizeof("inbamumsupplement")];
- char uniname2ctype_pool_str2299[sizeof("uppercase")];
- char uniname2ctype_pool_str2313[sizeof("currencysymbol")];
- char uniname2ctype_pool_str2322[sizeof("sk")];
- char uniname2ctype_pool_str2338[sizeof("lu")];
- char uniname2ctype_pool_str2342[sizeof("openpunctuation")];
- char uniname2ctype_pool_str2349[sizeof("inlisu")];
- char uniname2ctype_pool_str2371[sizeof("qmark")];
- char uniname2ctype_pool_str2372[sizeof("egyp")];
- char uniname2ctype_pool_str2377[sizeof("insupplementaryprivateuseareab")];
- char uniname2ctype_pool_str2379[sizeof("limbu")];
- char uniname2ctype_pool_str2400[sizeof("inegyptianhieroglyphs")];
- char uniname2ctype_pool_str2401[sizeof("unifiedideograph")];
- char uniname2ctype_pool_str2413[sizeof("intelugu")];
- char uniname2ctype_pool_str2429[sizeof("katakana")];
- char uniname2ctype_pool_str2442[sizeof("inhangulcompatibilityjamo")];
- char uniname2ctype_pool_str2454[sizeof("upper")];
- char uniname2ctype_pool_str2495[sizeof("inkayahli")];
- char uniname2ctype_pool_str2515[sizeof("cwu")];
- char uniname2ctype_pool_str2523[sizeof("incjkcompatibility")];
- char uniname2ctype_pool_str2542[sizeof("uppercaseletter")];
- char uniname2ctype_pool_str2549[sizeof("bugi")];
- char uniname2ctype_pool_str2588[sizeof("buginese")];
- char uniname2ctype_pool_str2627[sizeof("any")];
- char uniname2ctype_pool_str2651[sizeof("inyisyllables")];
- char uniname2ctype_pool_str2671[sizeof("inbopomofoextended")];
- char uniname2ctype_pool_str2710[sizeof("inboxdrawing")];
- char uniname2ctype_pool_str2724[sizeof("changeswhenuppercased")];
- char uniname2ctype_pool_str2727[sizeof("unknown")];
- char uniname2ctype_pool_str2737[sizeof("quotationmark")];
- char uniname2ctype_pool_str2753[sizeof("buhd")];
- char uniname2ctype_pool_str2785[sizeof("punctuation")];
- char uniname2ctype_pool_str2888[sizeof("oldsoutharabian")];
- char uniname2ctype_pool_str2925[sizeof("kayahli")];
- char uniname2ctype_pool_str2940[sizeof("incjkunifiedideographs")];
- char uniname2ctype_pool_str2961[sizeof("incjkunifiedideographsextensiona")];
- char uniname2ctype_pool_str2962[sizeof("incjkunifiedideographsextensionc")];
- char uniname2ctype_pool_str2995[sizeof("telugu")];
- char uniname2ctype_pool_str3000[sizeof("guru")];
- char uniname2ctype_pool_str3104[sizeof("greek")];
- char uniname2ctype_pool_str3189[sizeof("grlink")];
- char uniname2ctype_pool_str3197[sizeof("buhid")];
- char uniname2ctype_pool_str3254[sizeof("batak")];
- char uniname2ctype_pool_str3292[sizeof("blank")];
- char uniname2ctype_pool_str3391[sizeof("incjkunifiedideographsextensiond")];
- char uniname2ctype_pool_str3459[sizeof("graphemelink")];
- char uniname2ctype_pool_str3480[sizeof("egyptianhieroglyphs")];
- char uniname2ctype_pool_str3802[sizeof("incjkunifiedideographsextensionb")];
- char uniname2ctype_pool_str3922[sizeof("zyyy")];
- char uniname2ctype_pool_str4167[sizeof("gurmukhi")];
+ char uniname2ctype_pool_str3[sizeof("c")];
+ char uniname2ctype_pool_str5[sizeof("cc")];
+ char uniname2ctype_pool_str7[sizeof("co")];
+ char uniname2ctype_pool_str9[sizeof("l")];
+ char uniname2ctype_pool_str10[sizeof("lo")];
+ char uniname2ctype_pool_str12[sizeof("no")];
+ char uniname2ctype_pool_str13[sizeof("n")];
+ char uniname2ctype_pool_str14[sizeof("ll")];
+ char uniname2ctype_pool_str15[sizeof("cn")];
+ char uniname2ctype_pool_str16[sizeof("nl")];
+ char uniname2ctype_pool_str18[sizeof("lao")];
+ char uniname2ctype_pool_str19[sizeof("laoo")];
+ char uniname2ctype_pool_str20[sizeof("zl")];
+ char uniname2ctype_pool_str21[sizeof("z")];
+ char uniname2ctype_pool_str22[sizeof("control")];
+ char uniname2ctype_pool_str24[sizeof("qaac")];
+ char uniname2ctype_pool_str25[sizeof("ci")];
+ char uniname2ctype_pool_str28[sizeof("lana")];
+ char uniname2ctype_pool_str33[sizeof("oalpha")];
+ char uniname2ctype_pool_str34[sizeof("qaai")];
+ char uniname2ctype_pool_str40[sizeof("arabic")];
+ char uniname2ctype_pool_str41[sizeof("cari")];
+ char uniname2ctype_pool_str43[sizeof("oriya")];
+ char uniname2ctype_pool_str44[sizeof("carian")];
+ char uniname2ctype_pool_str46[sizeof("cntrl")];
+ char uniname2ctype_pool_str49[sizeof("connectorpunctuation")];
+ char uniname2ctype_pool_str50[sizeof("olower")];
+ char uniname2ctype_pool_str51[sizeof("latn")];
+ char uniname2ctype_pool_str52[sizeof("latin")];
+ char uniname2ctype_pool_str56[sizeof("ital")];
+ char uniname2ctype_pool_str65[sizeof("hano")];
+ char uniname2ctype_pool_str66[sizeof("lt")];
+ char uniname2ctype_pool_str68[sizeof("han")];
+ char uniname2ctype_pool_str70[sizeof("hanunoo")];
+ char uniname2ctype_pool_str71[sizeof("canadianaboriginal")];
+ char uniname2ctype_pool_str73[sizeof("hangul")];
+ char uniname2ctype_pool_str74[sizeof("hani")];
+ char uniname2ctype_pool_str76[sizeof("nchar")];
+ char uniname2ctype_pool_str77[sizeof("zinh")];
+ char uniname2ctype_pool_str83[sizeof("tale")];
+ char uniname2ctype_pool_str85[sizeof("loe")];
+ char uniname2ctype_pool_str86[sizeof("hira")];
+ char uniname2ctype_pool_str91[sizeof("taile")];
+ char uniname2ctype_pool_str92[sizeof("lineseparator")];
+ char uniname2ctype_pool_str94[sizeof("thaa")];
+ char uniname2ctype_pool_str97[sizeof("hiragana")];
+ char uniname2ctype_pool_str98[sizeof("thai")];
+ char uniname2ctype_pool_str100[sizeof("initialpunctuation")];
+ char uniname2ctype_pool_str101[sizeof("other")];
+ char uniname2ctype_pool_str103[sizeof("thaana")];
+ char uniname2ctype_pool_str107[sizeof("cher")];
+ char uniname2ctype_pool_str111[sizeof("otherletter")];
+ char uniname2ctype_pool_str113[sizeof("othernumber")];
+ char uniname2ctype_pool_str114[sizeof("letter")];
+ char uniname2ctype_pool_str116[sizeof("sc")];
+ char uniname2ctype_pool_str118[sizeof("so")];
+ char uniname2ctype_pool_str123[sizeof("taiviet")];
+ char uniname2ctype_pool_str128[sizeof("noncharactercodepoint")];
+ char uniname2ctype_pool_str129[sizeof("ethi")];
+ char uniname2ctype_pool_str130[sizeof("cans")];
+ char uniname2ctype_pool_str135[sizeof("titlecaseletter")];
+ char uniname2ctype_pool_str136[sizeof("ascii")];
+ char uniname2ctype_pool_str138[sizeof("letternumber")];
+ char uniname2ctype_pool_str139[sizeof("otheralphabetic")];
+ char uniname2ctype_pool_str141[sizeof("otherlowercase")];
+ char uniname2ctype_pool_str144[sizeof("idc")];
+ char uniname2ctype_pool_str146[sizeof("oidc")];
+ char uniname2ctype_pool_str147[sizeof("sinhala")];
+ char uniname2ctype_pool_str148[sizeof("terminalpunctuation")];
+ char uniname2ctype_pool_str151[sizeof("olditalic")];
+ char uniname2ctype_pool_str152[sizeof("di")];
+ char uniname2ctype_pool_str153[sizeof("otheridcontinue")];
+ char uniname2ctype_pool_str155[sizeof("odi")];
+ char uniname2ctype_pool_str156[sizeof("dia")];
+ char uniname2ctype_pool_str161[sizeof("otheridstart")];
+ char uniname2ctype_pool_str162[sizeof("oldturkic")];
+ char uniname2ctype_pool_str167[sizeof("diacritic")];
+ char uniname2ctype_pool_str168[sizeof("oldpersian")];
+ char uniname2ctype_pool_str171[sizeof("radical")];
+ char uniname2ctype_pool_str179[sizeof("sinh")];
+ char uniname2ctype_pool_str183[sizeof("ideo")];
+ char uniname2ctype_pool_str185[sizeof("shavian")];
+ char uniname2ctype_pool_str186[sizeof("format")];
+ char uniname2ctype_pool_str192[sizeof("inscriptionalparthian")];
+ char uniname2ctype_pool_str196[sizeof("vai")];
+ char uniname2ctype_pool_str197[sizeof("vaii")];
+ char uniname2ctype_pool_str202[sizeof("tifinagh")];
+ char uniname2ctype_pool_str203[sizeof("cf")];
+ char uniname2ctype_pool_str205[sizeof("othersymbol")];
+ char uniname2ctype_pool_str207[sizeof("ideographic")];
+ char uniname2ctype_pool_str211[sizeof("inherited")];
+ char uniname2ctype_pool_str212[sizeof("glagolitic")];
+ char uniname2ctype_pool_str218[sizeof("idcontinue")];
+ char uniname2ctype_pool_str220[sizeof("asciihexdigit")];
+ char uniname2ctype_pool_str224[sizeof("inscriptionalpahlavi")];
+ char uniname2ctype_pool_str225[sizeof("s")];
+ char uniname2ctype_pool_str226[sizeof("gothic")];
+ char uniname2ctype_pool_str227[sizeof("cs")];
+ char uniname2ctype_pool_str229[sizeof("avestan")];
+ char uniname2ctype_pool_str235[sizeof("tavt")];
+ char uniname2ctype_pool_str236[sizeof("zs")];
+ char uniname2ctype_pool_str243[sizeof("decimalnumber")];
+ char uniname2ctype_pool_str244[sizeof("tagbanwa")];
+ char uniname2ctype_pool_str245[sizeof("joinc")];
+ char uniname2ctype_pool_str248[sizeof("geor")];
+ char uniname2ctype_pool_str249[sizeof("hang")];
+ char uniname2ctype_pool_str251[sizeof("georgian")];
+ char uniname2ctype_pool_str253[sizeof("cased")];
+ char uniname2ctype_pool_str256[sizeof("joincontrol")];
+ char uniname2ctype_pool_str257[sizeof("oids")];
+ char uniname2ctype_pool_str260[sizeof("variationselector")];
+ char uniname2ctype_pool_str262[sizeof("graph")];
+ char uniname2ctype_pool_str263[sizeof("changeswhenlowercased")];
+ char uniname2ctype_pool_str264[sizeof("nd")];
+ char uniname2ctype_pool_str268[sizeof("goth")];
+ char uniname2ctype_pool_str269[sizeof("pc")];
+ char uniname2ctype_pool_str271[sizeof("po")];
+ char uniname2ctype_pool_str272[sizeof("ogrext")];
+ char uniname2ctype_pool_str276[sizeof("coptic")];
+ char uniname2ctype_pool_str277[sizeof("grext")];
+ char uniname2ctype_pool_str282[sizeof("logicalorderexception")];
+ char uniname2ctype_pool_str285[sizeof("idst")];
+ char uniname2ctype_pool_str288[sizeof("alpha")];
+ char uniname2ctype_pool_str289[sizeof("pi")];
+ char uniname2ctype_pool_str292[sizeof("dsrt")];
+ char uniname2ctype_pool_str297[sizeof("dash")];
+ char uniname2ctype_pool_str298[sizeof("otherdefaultignorablecodepoint")];
+ char uniname2ctype_pool_str302[sizeof("copt")];
+ char uniname2ctype_pool_str306[sizeof("idstart")];
+ char uniname2ctype_pool_str307[sizeof("closepunctuation")];
+ char uniname2ctype_pool_str309[sizeof("changeswhentitlecased")];
+ char uniname2ctype_pool_str312[sizeof("lepc")];
+ char uniname2ctype_pool_str317[sizeof("avst")];
+ char uniname2ctype_pool_str318[sizeof("cprt")];
+ char uniname2ctype_pool_str319[sizeof("runic")];
+ char uniname2ctype_pool_str320[sizeof("patsyn")];
+ char uniname2ctype_pool_str321[sizeof("mc")];
+ char uniname2ctype_pool_str326[sizeof("tfng")];
+ char uniname2ctype_pool_str327[sizeof("lepcha")];
+ char uniname2ctype_pool_str328[sizeof("prti")];
+ char uniname2ctype_pool_str329[sizeof("print")];
+ char uniname2ctype_pool_str330[sizeof("phli")];
+ char uniname2ctype_pool_str331[sizeof("mn")];
+ char uniname2ctype_pool_str332[sizeof("idsbinaryoperator")];
+ char uniname2ctype_pool_str334[sizeof("talu")];
+ char uniname2ctype_pool_str335[sizeof("runr")];
+ char uniname2ctype_pool_str337[sizeof("graphemebase")];
+ char uniname2ctype_pool_str338[sizeof("common")];
+ char uniname2ctype_pool_str339[sizeof("alnum")];
+ char uniname2ctype_pool_str340[sizeof("phoenician")];
+ char uniname2ctype_pool_str341[sizeof("deva")];
+ char uniname2ctype_pool_str342[sizeof("changeswhencasefolded")];
+ char uniname2ctype_pool_str343[sizeof("pe")];
+ char uniname2ctype_pool_str344[sizeof("mongolian")];
+ char uniname2ctype_pool_str352[sizeof("armn")];
+ char uniname2ctype_pool_str353[sizeof("deseret")];
+ char uniname2ctype_pool_str354[sizeof("softdotted")];
+ char uniname2ctype_pool_str357[sizeof("armi")];
+ char uniname2ctype_pool_str358[sizeof("devanagari")];
+ char uniname2ctype_pool_str360[sizeof("digit")];
+ char uniname2ctype_pool_str361[sizeof("caseignorable")];
+ char uniname2ctype_pool_str362[sizeof("taml")];
+ char uniname2ctype_pool_str363[sizeof("tamil")];
+ char uniname2ctype_pool_str365[sizeof("telu")];
+ char uniname2ctype_pool_str366[sizeof("ids")];
+ char uniname2ctype_pool_str367[sizeof("armenian")];
+ char uniname2ctype_pool_str370[sizeof("sd")];
+ char uniname2ctype_pool_str372[sizeof("privateuse")];
+ char uniname2ctype_pool_str373[sizeof("assigned")];
+ char uniname2ctype_pool_str375[sizeof("cham")];
+ char uniname2ctype_pool_str377[sizeof("omath")];
+ char uniname2ctype_pool_str378[sizeof("otherpunctuation")];
+ char uniname2ctype_pool_str379[sizeof("taitham")];
+ char uniname2ctype_pool_str381[sizeof("defaultignorablecodepoint")];
+ char uniname2ctype_pool_str387[sizeof("glag")];
+ char uniname2ctype_pool_str388[sizeof("ethiopic")];
+ char uniname2ctype_pool_str390[sizeof("vs")];
+ char uniname2ctype_pool_str395[sizeof("me")];
+ char uniname2ctype_pool_str396[sizeof("cwl")];
+ char uniname2ctype_pool_str400[sizeof("mtei")];
+ char uniname2ctype_pool_str404[sizeof("math")];
+ char uniname2ctype_pool_str407[sizeof("term")];
+ char uniname2ctype_pool_str408[sizeof("java")];
+ char uniname2ctype_pool_str410[sizeof("tglg")];
+ char uniname2ctype_pool_str413[sizeof("lower")];
+ char uniname2ctype_pool_str414[sizeof("patternwhitespace")];
+ char uniname2ctype_pool_str417[sizeof("finalpunctuation")];
+ char uniname2ctype_pool_str418[sizeof("tagalog")];
+ char uniname2ctype_pool_str419[sizeof("patws")];
+ char uniname2ctype_pool_str420[sizeof("lisu")];
+ char uniname2ctype_pool_str426[sizeof("otheruppercase")];
+ char uniname2ctype_pool_str427[sizeof("space")];
+ char uniname2ctype_pool_str429[sizeof("graphemeextend")];
+ char uniname2ctype_pool_str430[sizeof("saur")];
+ char uniname2ctype_pool_str435[sizeof("uideo")];
+ char uniname2ctype_pool_str438[sizeof("lowercase")];
+ char uniname2ctype_pool_str440[sizeof("rjng")];
+ char uniname2ctype_pool_str442[sizeof("osma")];
+ char uniname2ctype_pool_str444[sizeof("linb")];
+ char uniname2ctype_pool_str445[sizeof("bali")];
+ char uniname2ctype_pool_str448[sizeof("cwt")];
+ char uniname2ctype_pool_str449[sizeof("separator")];
+ char uniname2ctype_pool_str450[sizeof("othermath")];
+ char uniname2ctype_pool_str451[sizeof("unassigned")];
+ char uniname2ctype_pool_str454[sizeof("lowercaseletter")];
+ char uniname2ctype_pool_str455[sizeof("arab")];
+ char uniname2ctype_pool_str458[sizeof("samr")];
+ char uniname2ctype_pool_str459[sizeof("brai")];
+ char uniname2ctype_pool_str460[sizeof("sundanese")];
+ char uniname2ctype_pool_str462[sizeof("samaritan")];
+ char uniname2ctype_pool_str463[sizeof("ahex")];
+ char uniname2ctype_pool_str465[sizeof("linearb")];
+ char uniname2ctype_pool_str467[sizeof("pf")];
+ char uniname2ctype_pool_str469[sizeof("ext")];
+ char uniname2ctype_pool_str474[sizeof("olck")];
+ char uniname2ctype_pool_str476[sizeof("nko")];
+ char uniname2ctype_pool_str477[sizeof("nkoo")];
+ char uniname2ctype_pool_str479[sizeof("newline")];
+ char uniname2ctype_pool_str480[sizeof("tibetan")];
+ char uniname2ctype_pool_str481[sizeof("javanese")];
+ char uniname2ctype_pool_str485[sizeof("bengali")];
+ char uniname2ctype_pool_str486[sizeof("newtailue")];
+ char uniname2ctype_pool_str487[sizeof("kana")];
+ char uniname2ctype_pool_str488[sizeof("olchiki")];
+ char uniname2ctype_pool_str489[sizeof("kali")];
+ char uniname2ctype_pool_str490[sizeof("cwcf")];
+ char uniname2ctype_pool_str491[sizeof("ps")];
+ char uniname2ctype_pool_str493[sizeof("braille")];
+ char uniname2ctype_pool_str494[sizeof("tibt")];
+ char uniname2ctype_pool_str502[sizeof("sterm")];
+ char uniname2ctype_pool_str504[sizeof("ugar")];
+ char uniname2ctype_pool_str505[sizeof("nonspacingmark")];
+ char uniname2ctype_pool_str508[sizeof("phag")];
+ char uniname2ctype_pool_str509[sizeof("kaithi")];
+ char uniname2ctype_pool_str512[sizeof("xidc")];
+ char uniname2ctype_pool_str514[sizeof("balinese")];
+ char uniname2ctype_pool_str515[sizeof("mong")];
+ char uniname2ctype_pool_str516[sizeof("ogam")];
+ char uniname2ctype_pool_str520[sizeof("modifierletter")];
+ char uniname2ctype_pool_str521[sizeof("ugaritic")];
+ char uniname2ctype_pool_str522[sizeof("katakana")];
+ char uniname2ctype_pool_str523[sizeof("pd")];
+ char uniname2ctype_pool_str525[sizeof("hebr")];
+ char uniname2ctype_pool_str531[sizeof("p")];
+ char uniname2ctype_pool_str533[sizeof("orkh")];
+ char uniname2ctype_pool_str536[sizeof("word")];
+ char uniname2ctype_pool_str537[sizeof("saurashtra")];
+ char uniname2ctype_pool_str538[sizeof("khar")];
+ char uniname2ctype_pool_str539[sizeof("sund")];
+ char uniname2ctype_pool_str542[sizeof("zp")];
+ char uniname2ctype_pool_str548[sizeof("changeswhenuppercased")];
+ char uniname2ctype_pool_str552[sizeof("xidstart")];
+ char uniname2ctype_pool_str553[sizeof("shaw")];
+ char uniname2ctype_pool_str554[sizeof("kthi")];
+ char uniname2ctype_pool_str556[sizeof("ogham")];
+ char uniname2ctype_pool_str558[sizeof("spaceseparator")];
+ char uniname2ctype_pool_str559[sizeof("changeswhencasemapped")];
+ char uniname2ctype_pool_str560[sizeof("sarb")];
+ char uniname2ctype_pool_str562[sizeof("xidcontinue")];
+ char uniname2ctype_pool_str564[sizeof("bidic")];
+ char uniname2ctype_pool_str570[sizeof("deprecated")];
+ char uniname2ctype_pool_str573[sizeof("xdigit")];
+ char uniname2ctype_pool_str575[sizeof("bidicontrol")];
+ char uniname2ctype_pool_str584[sizeof("lu")];
+ char uniname2ctype_pool_str587[sizeof("dashpunctuation")];
+ char uniname2ctype_pool_str590[sizeof("extender")];
+ char uniname2ctype_pool_str593[sizeof("idstrinaryoperator")];
+ char uniname2ctype_pool_str594[sizeof("cherokee")];
+ char uniname2ctype_pool_str595[sizeof("punct")];
+ char uniname2ctype_pool_str597[sizeof("phagspa")];
+ char uniname2ctype_pool_str598[sizeof("oupper")];
+ char uniname2ctype_pool_str599[sizeof("lyci")];
+ char uniname2ctype_pool_str601[sizeof("whitespace")];
+ char uniname2ctype_pool_str602[sizeof("lycian")];
+ char uniname2ctype_pool_str603[sizeof("yi")];
+ char uniname2ctype_pool_str606[sizeof("cyrl")];
+ char uniname2ctype_pool_str608[sizeof("knda")];
+ char uniname2ctype_pool_str610[sizeof("orya")];
+ char uniname2ctype_pool_str611[sizeof("cyrillic")];
+ char uniname2ctype_pool_str616[sizeof("yiii")];
+ char uniname2ctype_pool_str618[sizeof("kannada")];
+ char uniname2ctype_pool_str623[sizeof("xids")];
+ char uniname2ctype_pool_str626[sizeof("limbu")];
+ char uniname2ctype_pool_str635[sizeof("m")];
+ char uniname2ctype_pool_str638[sizeof("unifiedideograph")];
+ char uniname2ctype_pool_str639[sizeof("paragraphseparator")];
+ char uniname2ctype_pool_str640[sizeof("lm")];
+ char uniname2ctype_pool_str645[sizeof("openpunctuation")];
+ char uniname2ctype_pool_str646[sizeof("tagb")];
+ char uniname2ctype_pool_str649[sizeof("kharoshthi")];
+ char uniname2ctype_pool_str651[sizeof("enclosingmark")];
+ char uniname2ctype_pool_str652[sizeof("surrogate")];
+ char uniname2ctype_pool_str653[sizeof("beng")];
+ char uniname2ctype_pool_str654[sizeof("number")];
+ char uniname2ctype_pool_str656[sizeof("telugu")];
+ char uniname2ctype_pool_str660[sizeof("rejang")];
+ char uniname2ctype_pool_str661[sizeof("malayalam")];
+ char uniname2ctype_pool_str674[sizeof("idsb")];
+ char uniname2ctype_pool_str676[sizeof("hexdigit")];
+ char uniname2ctype_pool_str677[sizeof("xpeo")];
+ char uniname2ctype_pool_str689[sizeof("phnx")];
+ char uniname2ctype_pool_str692[sizeof("bopo")];
+ char uniname2ctype_pool_str698[sizeof("bopomofo")];
+ char uniname2ctype_pool_str699[sizeof("dep")];
+ char uniname2ctype_pool_str701[sizeof("sylo")];
+ char uniname2ctype_pool_str705[sizeof("grbase")];
+ char uniname2ctype_pool_str706[sizeof("alphabetic")];
+ char uniname2ctype_pool_str707[sizeof("cwcm")];
+ char uniname2ctype_pool_str708[sizeof("patternsyntax")];
+ char uniname2ctype_pool_str709[sizeof("grek")];
+ char uniname2ctype_pool_str710[sizeof("greek")];
+ char uniname2ctype_pool_str714[sizeof("syrc")];
+ char uniname2ctype_pool_str717[sizeof("syriac")];
+ char uniname2ctype_pool_str722[sizeof("cuneiform")];
+ char uniname2ctype_pool_str723[sizeof("gujr")];
+ char uniname2ctype_pool_str726[sizeof("lydi")];
+ char uniname2ctype_pool_str727[sizeof("gujarati")];
+ char uniname2ctype_pool_str728[sizeof("sylotinagri")];
+ char uniname2ctype_pool_str729[sizeof("lydian")];
+ char uniname2ctype_pool_str748[sizeof("sm")];
+ char uniname2ctype_pool_str751[sizeof("currencysymbol")];
+ char uniname2ctype_pool_str755[sizeof("limb")];
+ char uniname2ctype_pool_str758[sizeof("othergraphemeextend")];
+ char uniname2ctype_pool_str786[sizeof("guru")];
+ char uniname2ctype_pool_str797[sizeof("qmark")];
+ char uniname2ctype_pool_str809[sizeof("mark")];
+ char uniname2ctype_pool_str820[sizeof("quotationmark")];
+ char uniname2ctype_pool_str823[sizeof("hex")];
+ char uniname2ctype_pool_str842[sizeof("upper")];
+ char uniname2ctype_pool_str843[sizeof("wspace")];
+ char uniname2ctype_pool_str848[sizeof("khmr")];
+ char uniname2ctype_pool_str849[sizeof("khmer")];
+ char uniname2ctype_pool_str863[sizeof("oldsoutharabian")];
+ char uniname2ctype_pool_str864[sizeof("spacingmark")];
+ char uniname2ctype_pool_str866[sizeof("punctuation")];
+ char uniname2ctype_pool_str867[sizeof("uppercase")];
+ char uniname2ctype_pool_str878[sizeof("meeteimayek")];
+ char uniname2ctype_pool_str883[sizeof("uppercaseletter")];
+ char uniname2ctype_pool_str884[sizeof("cypriot")];
+ char uniname2ctype_pool_str886[sizeof("buhd")];
+ char uniname2ctype_pool_str887[sizeof("buhid")];
+ char uniname2ctype_pool_str895[sizeof("modifiersymbol")];
+ char uniname2ctype_pool_str898[sizeof("blank")];
+ char uniname2ctype_pool_str908[sizeof("hyphen")];
+ char uniname2ctype_pool_str909[sizeof("bugi")];
+ char uniname2ctype_pool_str935[sizeof("myanmar")];
+ char uniname2ctype_pool_str937[sizeof("imperialaramaic")];
+ char uniname2ctype_pool_str947[sizeof("mathsymbol")];
+ char uniname2ctype_pool_str966[sizeof("cwu")];
+ char uniname2ctype_pool_str975[sizeof("gurmukhi")];
+ char uniname2ctype_pool_str978[sizeof("buginese")];
+ char uniname2ctype_pool_str1022[sizeof("symbol")];
+ char uniname2ctype_pool_str1024[sizeof("osmanya")];
+ char uniname2ctype_pool_str1036[sizeof("bamu")];
+ char uniname2ctype_pool_str1040[sizeof("sk")];
+ char uniname2ctype_pool_str1065[sizeof("bamum")];
+ char uniname2ctype_pool_str1071[sizeof("kayahli")];
+ char uniname2ctype_pool_str1072[sizeof("egyp")];
+ char uniname2ctype_pool_str1140[sizeof("grlink")];
+ char uniname2ctype_pool_str1141[sizeof("xsux")];
+ char uniname2ctype_pool_str1174[sizeof("any")];
+ char uniname2ctype_pool_str1187[sizeof("graphemelink")];
+ char uniname2ctype_pool_str1221[sizeof("mlym")];
+ char uniname2ctype_pool_str1235[sizeof("mymr")];
+ char uniname2ctype_pool_str1277[sizeof("hebrew")];
+ char uniname2ctype_pool_str1542[sizeof("egyptianhieroglyphs")];
+ char uniname2ctype_pool_str1751[sizeof("zyyy")];
#endif /* USE_UNICODE_PROPERTIES */
};
static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
{
#ifndef USE_UNICODE_PROPERTIES
- "word",
"print",
"punct",
- "alpha",
- "alnum",
- "xdigit",
- "upper",
#else /* USE_UNICODE_PROPERTIES */
- "n",
- "s",
- "z",
- "zs",
- "zzzz",
- "cn",
- "cs",
- "ci",
"c",
- "cf",
- "sc",
- "cans",
- "qaai",
- "mn",
-#endif /* USE_UNICODE_PROPERTIES */
- "ascii",
-#ifdef USE_UNICODE_PROPERTIES
"cc",
- "qaac",
- "inavestan",
- "inspecials",
- "inipaextensions",
- "mc",
- "insamaritan",
- "m",
- "sm",
- "me",
- "inarmenian",
- "incuneiform",
- "mandaic",
- "inancientsymbols",
- "incuneiformnumbersandpunctuation",
- "inthai",
- "inmusicalsymbols",
- "inmiscellaneoussymbols",
- "incham",
- "inmiscellaneoussymbolsandarrows",
- "initialpunctuation",
- "inmiscellaneoussymbolsandpictographs",
- "inthaana",
- "taile",
- "mtei",
- "lc",
- "lana",
- "inlycian",
- "intransportandmapsymbols",
- "incontrolpictures",
- "sinhala",
- "incommonindicnumberforms",
- "inmiscellaneousmathematicalsymbolsa",
- "sterm",
- "inmyanmarextendeda",
- "lm",
- "taiviet",
- "inlinearbideograms",
- "intaitham",
- "latn",
- "latin",
- "ital",
- "alnum",
- "inmalayalam",
- "intaile",
- "tale",
+ "co",
"l",
+ "lo",
+ "no",
+ "n",
+ "ll",
+ "cn",
"nl",
+ "lao",
+ "laoo",
"zl",
- "intamil",
- "taml",
- "inlatinextendeda",
- "inlatinextendedc",
- "inrunic",
- "incarian",
- "insyriac",
+ "z",
+ "control",
+ "qaac",
+ "ci",
+ "lana",
+ "oalpha",
+ "qaai",
+ "arabic",
"cari",
- "inmeeteimayekextensions",
- "osma",
- "lt",
- "miao",
- "insharada",
- "incyrillic",
+ "oriya",
"carian",
- "armn",
- "samr",
- "armi",
- "inideographicdescriptioncharacters",
- "inosmanya",
- "armenian",
- "inmyanmar",
- "samaritan",
- "arabic",
- "incherokee",
- "connectorpunctuation",
- "merc",
- "inmiscellaneoustechnical",
- "inenclosedalphanumerics",
- "inemoticons",
- "joinc",
-#endif /* USE_UNICODE_PROPERTIES */
"cntrl",
-#ifdef USE_UNICODE_PROPERTIES
- "inenclosedcjklettersandmonths",
- "cwcf",
- "inruminumeralsymbols",
- "ll",
- "term",
- "inlatinextendedadditional",
- "tamil",
- "loe",
- "newtailue",
- "cwcm",
- "inenclosedalphanumericsupplement",
- "sinh",
- "zinh",
- "meroiticcursive",
+ "connectorpunctuation",
+ "olower",
+ "latn",
+ "latin",
+ "ital",
+ "hano",
+ "lt",
"han",
+ "hanunoo",
+ "canadianaboriginal",
+ "hangul",
"hani",
- "inopticalcharacterrecognition",
- "no",
- "so",
- "innewtailue",
- "insinhala",
- "innko",
- "co",
- "shavian",
- "terminalpunctuation",
- "intaixuanjingsymbols",
- "inethiopic",
- "sora",
- "inarrows",
- "cham",
- "inlowsurrogates",
- "oriya",
- "ext",
- "cwt",
- "common",
- "inmiao",
+ "nchar",
+ "zinh",
+ "tale",
+ "loe",
+ "hira",
+ "taile",
+ "lineseparator",
+ "thaa",
+ "hiragana",
"thai",
- "intifinagh",
+ "initialpunctuation",
+ "other",
+ "thaana",
+ "cher",
+ "otherletter",
+ "othernumber",
+ "letter",
+ "sc",
+ "so",
+ "taiviet",
+ "noncharactercodepoint",
"ethi",
- "mero",
- "chakma",
- "thaa",
- "inscriptionalparthian",
- "tifinagh",
+ "cans",
"titlecaseletter",
- "thaana",
- "asciihexdigit",
- "math",
+ "ascii",
+ "letternumber",
+ "otheralphabetic",
+ "otherlowercase",
+ "idc",
+ "oidc",
+ "sinhala",
+ "terminalpunctuation",
+ "olditalic",
"di",
- "ids",
- "lo",
- "inlao",
- "taitham",
- "lao",
- "laoo",
+ "otheridcontinue",
+ "odi",
"dia",
- "idc",
- "ps",
- "insundanese",
- "pi",
- "cwl",
- "pf",
- "mand",
- "insylotinagri",
- "vs",
- "mongolian",
- "pc",
- "inmandaic",
- "invai",
- "lineseparator",
- "pe",
+ "otheridstart",
+ "oldturkic",
+ "diacritic",
+ "oldpersian",
+ "radical",
+ "sinh",
+ "ideo",
+ "shavian",
+ "format",
+ "inscriptionalparthian",
"vai",
"vaii",
- "idst",
- "indominotiles",
- "inshavian",
- "inspacingmodifierletters",
- "format",
- "inphaistosdisc",
- "hano",
-#endif /* USE_UNICODE_PROPERTIES */
- "space",
-#ifdef USE_UNICODE_PROPERTIES
- "indeseret",
- "inolchiki",
- "hira",
- "joincontrol",
+ "tifinagh",
+ "cf",
+ "othersymbol",
+ "ideographic",
+ "inherited",
+ "glagolitic",
"idcontinue",
- "inmahjongtiles",
- "patws",
- "inlydian",
- "cher",
- "inhiragana",
- "inogham",
- "avst",
+ "asciihexdigit",
"inscriptionalpahlavi",
- "incoptic",
- "java",
- "inmathematicalalphanumericsymbols",
- "letter",
- "injavanese",
+ "s",
+ "gothic",
+ "cs",
"avestan",
- "age=1.1",
- "lepc",
- "age=2.1",
- "inlepcha",
- "javanese",
- "shaw",
- "finalpunctuation",
- "alpha",
- "age=5.1",
- "inmongolian",
- "age=5.2",
- "age=2.0",
- "ahex",
- "ingeneralpunctuation",
- "oids",
- "odi",
- "age=5.0",
"tavt",
- "intaiviet",
- "age=6.1",
- "age=3.1",
- "insundanesesupplement",
- "age=3.2",
- "age=4.1",
- "oidc",
- "tfng",
- "insmallformvariants",
- "ideo",
- "intags",
- "age=6.0",
- "age=3.0",
- "whitespace",
- "age=4.0",
- "inolditalic",
- "oalpha",
- "ingujarati",
- "control",
- "diacritic",
+ "zs",
+ "decimalnumber",
"tagbanwa",
- "inphoenician",
- "ininscriptionalparthian",
- "ininscriptionalpahlavi",
+ "joinc",
+ "geor",
+ "hang",
+ "georgian",
+ "cased",
+ "joincontrol",
+ "oids",
+ "variationselector",
+ "graph",
+ "changeswhenlowercased",
+ "nd",
+ "goth",
+ "pc",
+ "po",
+ "ogrext",
"coptic",
+ "grext",
+ "logicalorderexception",
+ "idst",
+#endif /* USE_UNICODE_PROPERTIES */
+ "alpha",
+#ifdef USE_UNICODE_PROPERTIES
+ "pi",
"dsrt",
- "inmodifiertoneletters",
- "xids",
- "hanunoo",
- "inoldturkic",
- "xidc",
- "idstart",
- "inimperialaramaic",
- "invariationselectors",
+ "dash",
+ "otherdefaultignorablecodepoint",
"copt",
- "caseignorable",
- "prti",
- "nchar",
- "deseret",
- "decimalnumber",
+ "idstart",
+ "closepunctuation",
+ "changeswhentitlecased",
+ "lepc",
+ "avst",
"cprt",
- "inlatin1supplement",
- "imperialaramaic",
- "privateuse",
- "casedletter",
- "lowercase",
- "spaceseparator",
- "radical",
- "mong",
- "canadianaboriginal",
- "letternumber",
- "insorasompeng",
- "dash",
- "wspace",
- "ogam",
- "invariationselectorssupplement",
+ "runic",
+ "patsyn",
+ "mc",
+ "tfng",
+ "lepcha",
+ "prti",
"print",
- "otheridcontinue",
- "ingurmukhi",
- "closepunctuation",
- "olditalic",
- "noncharactercodepoint",
- "sharada",
- "ingeometricshapes",
- "otheralphabetic",
- "patternwhitespace",
- "po",
- "rjng",
- "ingreekandcoptic",
- "xdigit",
- "gothic",
- "inoldsoutharabian",
- "xidstart",
- "inrejang",
- "idsbinaryoperator",
- "olower",
- "hex",
- "inenclosedideographicsupplement",
- "inalphabeticpresentationforms",
- "inbasiclatin",
- "othersymbol",
- "nd",
- "sd",
- "omath",
- "separator",
- "inarabic",
- "xidcontinue",
- "otheridstart",
- "grext",
- "otherlowercase",
"phli",
- "cased",
- "hang",
- "xpeo",
+ "mn",
+ "idsbinaryoperator",
+ "talu",
+ "runr",
+ "graphemebase",
+ "common",
#endif /* USE_UNICODE_PROPERTIES */
- "lower",
+ "alnum",
#ifndef USE_UNICODE_PROPERTIES
- "graph",
+ "xdigit",
+ "newline",
+ "upper",
+ "ascii",
+ "cntrl",
#else /* USE_UNICODE_PROPERTIES */
- "modifierletter",
- "inphoneticextensions",
- "inarabicpresentationformsa",
- "innumberforms",
- "oldpersian",
- "incyrillicextendeda",
- "inverticalforms",
- "p",
- "inbyzantinemusicalsymbols",
- "inmathematicaloperators",
- "intibetan",
- "zp",
- "ingeorgian",
- "inbraillepatterns",
- "lepcha",
- "geor",
- "invedicextensions",
- "linb",
- "other",
+ "phoenician",
"deva",
- "indevanagari",
- "othernumber",
- "bamum",
- "shrd",
- "bali",
+ "changeswhencasefolded",
+ "pe",
+ "mongolian",
+ "armn",
+ "deseret",
+ "softdotted",
+ "armi",
"devanagari",
- "extender",
- "inherited",
- "glagolitic",
- "tibt",
- "inbalinese",
- "ingothic",
- "inmiscellaneousmathematicalsymbolsb",
- "limb",
- "bengali",
- "phoenician",
- "insuperscriptsandsubscripts",
- "inmeroitichieroglyphs",
- "tibetan",
- "inphoneticextensionssupplement",
- "balinese",
- "lowercaseletter",
- "indingbats",
- "inprivateusearea",
+ "digit",
+ "caseignorable",
+ "taml",
+ "tamil",
+ "telu",
+ "ids",
+ "armenian",
+ "sd",
+ "privateuse",
"assigned",
- "patternsyntax",
- "inhangulsyllables",
- "sarb",
- "brai",
- "insupplementalmathematicaloperators",
- "phnx",
- "ingreekextended",
- "otherletter",
- "arab",
- "inlatinextendedd",
- "word",
- "inphagspa",
- "inblockelements",
+ "cham",
+ "omath",
+ "otherpunctuation",
+ "taitham",
+ "defaultignorablecodepoint",
+ "glag",
"ethiopic",
- "inethiopicextendeda",
- "brahmi",
- "logicalorderexception",
- "inoldpersian",
- "inletterlikesymbols",
- "sorasompeng",
- "hiragana",
- "inhanguljamoextendeda",
- "othermath",
+ "vs",
+ "me",
+ "cwl",
+ "mtei",
+ "math",
+ "term",
+ "java",
+ "tglg",
+ "lower",
+ "patternwhitespace",
+ "finalpunctuation",
+ "tagalog",
+ "patws",
+ "lisu",
+ "otheruppercase",
#endif /* USE_UNICODE_PROPERTIES */
- "digit",
-#ifndef USE_UNICODE_PROPERTIES
- "blank"
-#else /* USE_UNICODE_PROPERTIES */
- "goth",
- "ogham",
+ "space",
+#ifdef USE_UNICODE_PROPERTIES
+ "graphemeextend",
+ "saur",
+ "uideo",
+ "lowercase",
+ "rjng",
+ "osma",
+ "linb",
+ "bali",
+ "cwt",
+ "separator",
+ "othermath",
+ "unassigned",
+ "lowercaseletter",
+ "arab",
+ "samr",
+ "brai",
"sundanese",
- "saurashtra",
+ "samaritan",
+ "ahex",
"linearb",
- "graphemebase",
- "inunifiedcanadianaboriginalsyllabics",
- "cuneiform",
- "inkannada",
+ "pf",
+ "ext",
+ "olck",
+ "nko",
+ "nkoo",
+ "newline",
+ "tibetan",
+ "javanese",
+ "bengali",
+ "newtailue",
"kana",
- "inancientgreeknumbers",
- "incjkstrokes",
- "inglagolitic",
- "inancientgreekmusicalnotation",
- "inchakma",
- "plrd",
- "inbrahmi",
- "cakm",
- "incjkcompatibilityforms",
- "lisu",
- "incjkcompatibilityideographs",
- "intagalog",
- "inkaithi",
- "insupplementalarrowsa",
- "takri",
- "ideographic",
- "hexdigit",
- "glag",
- "softdotted",
- "variationselector",
- "inkatakana",
- "meeteimayek",
- "otherpunctuation",
- "inhanguljamo",
+ "olchiki",
"kali",
+ "cwcf",
+ "ps",
"braille",
- "incombininghalfmarks",
- "talu",
- "incjkcompatibilityideographssupplement",
- "telu",
- "idsb",
- "tglg",
- "inmeeteimayek",
- "yi",
- "phagspa",
- "yiii",
- "inarabicmathematicalalphabeticsymbols",
- "saur",
- "ogrext",
- "bidic",
- "inkanasupplement",
- "runic",
- "inalchemicalsymbols",
- "georgian",
- "inugaritic",
- "insaurashtra",
- "inhighprivateusesurrogates",
- "pd",
- "incountingrodnumerals",
- "inarabicextendeda",
- "inkharoshthi",
- "idstrinaryoperator",
+ "tibt",
+ "sterm",
+ "ugar",
+ "nonspacingmark",
"phag",
- "brah",
- "mark",
+ "kaithi",
+ "xidc",
+ "balinese",
+ "mong",
+ "ogam",
+ "modifierletter",
+ "ugaritic",
+ "katakana",
+ "pd",
"hebr",
- "inkhmersymbols",
- "dep",
- "inkhmer",
- "deprecated",
- "rejang",
- "lyci",
- "intakri",
- "takr",
- "incyrillicsupplement",
- "changeswhencasefolded",
- "indevanagariextended",
- "lycian",
- "inbengali",
- "beng",
+ "p",
+ "orkh",
+#endif /* USE_UNICODE_PROPERTIES */
+ "word",
+#ifndef USE_UNICODE_PROPERTIES
+ "lower",
"graph",
- "inyijinghexagramsymbols",
- "olck",
- "inarabicsupplement",
- "inbuginese",
- "changeswhencasemapped",
- "olchiki",
- "inaegeannumbers",
- "mlym",
- "alphabetic",
- "sylotinagri",
- "changeswhentitlecased",
- "tagalog",
- "tagb",
- "runr",
- "malayalam",
- "inoriya",
- "intagbanwa",
- "syrc",
- "nko",
- "nkoo",
- "inethiopicextended",
- "kaithi",
- "mathsymbol",
- "inyiradicals",
- "insupplementaryprivateuseareaa",
- "osmanya",
- "syriac",
- "otherdefaultignorablecodepoint",
- "number",
- "inlinearbsyllabary",
- "kthi",
+ "digit",
+ "blank"
+#else /* USE_UNICODE_PROPERTIES */
+ "saurashtra",
+ "khar",
"sund",
- "mymr",
- "incombiningdiacriticalmarks",
- "enclosingmark",
- "incombiningdiacriticalmarksforsymbols",
- "inethiopicsupplement",
- "unassigned",
- "sylo",
- "combiningmark",
- "myanmar",
- "graphemeextend",
+ "zp",
+ "changeswhenuppercased",
+ "xidstart",
+ "shaw",
+ "kthi",
+ "ogham",
+ "spaceseparator",
+ "changeswhencasemapped",
+ "sarb",
+ "xidcontinue",
+ "bidic",
+ "deprecated",
+ "xdigit",
"bidicontrol",
- "inhalfwidthandfullwidthforms",
+ "lu",
+ "dashpunctuation",
+ "extender",
+ "idstrinaryoperator",
+ "cherokee",
+ "punct",
+ "phagspa",
+ "oupper",
+ "lyci",
+ "whitespace",
+ "lycian",
+ "yi",
"cyrl",
"knda",
- "inunifiedcanadianaboriginalsyllabicsextended",
- "xsux",
- "modifiersymbol",
- "incombiningdiacriticalmarkssupplement",
- "inhanunoo",
- "inbuhid",
- "kannada",
- "inhebrew",
- "grbase",
- "spacingmark",
- "inkatakanaphoneticextensions",
- "hangul",
- "incjksymbolsandpunctuation",
- "bopo",
"orya",
- "inbopomofo",
- "kharoshthi",
- "khar",
- "changeswhenlowercased",
- "khmr",
- "punct",
- "symbol",
- "cherokee",
"cyrillic",
- "inkangxiradicals",
- "hebrew",
- "inarabicpresentationformsb",
- "incyrillicextendedb",
- "ugaritic",
- "incurrencysymbols",
- "meroitichieroglyphs",
- "inhighsurrogates",
- "nonspacingmark",
- "lydi",
- "patsyn",
- "orkh",
- "lydian",
- "ugar",
- "othergraphemeextend",
- "inlatinextendedb",
+ "yiii",
+ "kannada",
+ "xids",
+ "limbu",
+ "m",
+ "unifiedideograph",
+ "paragraphseparator",
+ "lm",
+ "openpunctuation",
+ "tagb",
+ "kharoshthi",
+ "enclosingmark",
+ "surrogate",
+ "beng",
+ "number",
+ "telugu",
+ "rejang",
+ "malayalam",
+ "idsb",
+ "hexdigit",
+ "xpeo",
+ "phnx",
+ "bopo",
"bopomofo",
- "khmer",
- "uideo",
- "otheruppercase",
+ "dep",
+ "sylo",
+ "grbase",
+ "alphabetic",
+ "cwcm",
+ "patternsyntax",
"grek",
+ "greek",
+ "syrc",
+ "syriac",
+ "cuneiform",
"gujr",
+ "lydi",
"gujarati",
- "inhanguljamoextendedb",
- "defaultignorablecodepoint",
- "inplayingcards",
- "bamu",
- "inkanbun",
- "incjkradicalssupplement",
- "cypriot",
- "inbamum",
- "inmeroiticcursive",
- "oldturkic",
- "insupplementalarrowsb",
- "surrogate",
- "batk",
- "inbatak",
- "inlimbu",
- "incypriotsyllabary",
- "dashpunctuation",
- "innoblock",
- "hyphen",
- "insupplementalpunctuation",
- "ingeorgiansupplement",
- "oupper",
- "paragraphseparator",
- "inbamumsupplement",
- "uppercase",
+ "sylotinagri",
+ "lydian",
+ "sm",
"currencysymbol",
- "sk",
- "lu",
- "openpunctuation",
- "inlisu",
+ "limb",
+ "othergraphemeextend",
+ "guru",
"qmark",
- "egyp",
- "insupplementaryprivateuseareab",
- "limbu",
- "inegyptianhieroglyphs",
- "unifiedideograph",
- "intelugu",
- "katakana",
- "inhangulcompatibilityjamo",
+ "mark",
+ "quotationmark",
+ "hex",
"upper",
- "inkayahli",
- "cwu",
- "incjkcompatibility",
+ "wspace",
+ "khmr",
+ "khmer",
+ "oldsoutharabian",
+ "spacingmark",
+ "punctuation",
+ "uppercase",
+ "meeteimayek",
"uppercaseletter",
+ "cypriot",
+ "buhd",
+ "buhid",
+ "modifiersymbol",
+ "blank",
+ "hyphen",
"bugi",
+ "myanmar",
+ "imperialaramaic",
+ "mathsymbol",
+ "cwu",
+ "gurmukhi",
"buginese",
- "any",
- "inyisyllables",
- "inbopomofoextended",
- "inboxdrawing",
- "changeswhenuppercased",
- "unknown",
- "quotationmark",
- "buhd",
- "punctuation",
- "oldsoutharabian",
+ "symbol",
+ "osmanya",
+ "bamu",
+ "sk",
+ "bamum",
"kayahli",
- "incjkunifiedideographs",
- "incjkunifiedideographsextensiona",
- "incjkunifiedideographsextensionc",
- "telugu",
- "guru",
- "greek",
+ "egyp",
"grlink",
- "buhid",
- "batak",
- "blank",
- "incjkunifiedideographsextensiond",
+ "xsux",
+ "any",
"graphemelink",
+ "mlym",
+ "mymr",
+ "hebrew",
"egyptianhieroglyphs",
- "incjkunifiedideographsextensionb",
- "zyyy",
- "gurmukhi"
+ "zyyy"
#endif /* USE_UNICODE_PROPERTIES */
};
#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
@@ -27365,1236 +17271,601 @@ uniname2ctype_p (str, len)
{
#ifdef USE_UNICODE_PROPERTIES
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 34},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 46},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 17},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 51},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 18},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 54},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 208},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 20},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 21},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 22},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 60},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 17},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 19},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 23},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 26},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 47},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 36},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 33},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 24},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 20},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 35},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 101},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 114},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 33},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 14},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 93},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 93},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 51},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 50},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 18},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 18},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 128},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 401},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 377},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 226},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 31},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 239},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 30},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 49},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 32},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 232},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 412},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 168},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 382},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 413},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 252},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 127},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 59},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 419},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 304},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 150},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 175},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 113},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 355},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 312},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 430},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 79},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 147},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 237},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124, 120},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125, 159},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str133, 151},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134, 384},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135, 432},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136, 298},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 92},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151, 347},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156, 306},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 86},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 147},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str158, 204},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 356},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172, 26},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 3},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175, 152},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179, 379},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180, 276},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 38},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 179},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 74},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 74},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str184, 75},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186, 75},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str187, 111},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189, 13},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str199, 250},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 110},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 115},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 27},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str201, 272},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202, 120},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205, 23},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 108},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207, 36},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 115},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 100},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209, 52},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str216, 247},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str217, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218, 224},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 97},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 108},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220, 314},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223, 263},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224, 385},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225, 235},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 181},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 113},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 119},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227, 148},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str230, 358},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str231, 124},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str232, 28},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str233, 172},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str234, 410},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 190},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 105},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239, 230},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str240, 148},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245, 155},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 119},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 51},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247, 160},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248, 323},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252, 392},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str254, 255},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255, 155},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256, 80},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 81},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str259, 260},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 105},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 92},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261, 39},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 42},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 17},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263, 170},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264, 297},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 81},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268, 300},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str279, 431},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281, 178},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288, 3},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 99},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301, 333},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 26},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303, 64},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str304, 405},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str308, 25},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str313, 182},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str316, 287},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321, 201},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329, 129},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330, 65},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339, 428},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346, 92},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347, 114},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 36},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 23},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349, 170},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353, 109},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357, 109},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358, 299},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360, 50},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str364, 273},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365, 251},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 46},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367, 238},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 49},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372, 21},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375, 123},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378, 182},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386, 421},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387, 258},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 151},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 181},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 98},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130, 100},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135, 27},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136, 14},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str389, 174},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str398, 295},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138, 35},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139, 175},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400, 150},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141, 179},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str403, 365},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 66},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405, 87},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str406, 189},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str409, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146, 192},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147, 91},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148, 171},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412, 74},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151, 110},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152, 69},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153, 192},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414, 416},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420, 93},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155, 187},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156, 177},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str425, 317},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426, 99},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427, 171},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str428, 169},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429, 82},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430, 162},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432, 131},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436, 28},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445, 82},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449, 185},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450, 55},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161, 191},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162, 163},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 177},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str168, 132},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str453, 70},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454, 66},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460, 27},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171, 185},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468, 253},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str470, 151},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179, 91},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str475, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476, 188},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183, 176},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str478, 67},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480, 45},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481, 278},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str484, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485, 61},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490, 42},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str495, 168},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496, 346},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str497, 205},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185, 122},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186, 19},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str503, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504, 39},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506, 240},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509, 341},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str511, 52},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514, 41},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515, 143},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516, 143},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str517, 195},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520, 426},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521, 391},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522, 227},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str524, 19},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192, 161},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str528, 383},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531, 116},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str532, 9},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542, 390},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545, 281},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548, 106},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str196, 142},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197, 142},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553, 178},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202, 130},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203, 19},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str555, 67},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558, 425},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560, 206},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563, 396},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564, 100},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str568, 325},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str572, 262},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205, 49},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str574, 153},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575, 163},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207, 176},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str579, 315},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587, 158},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211, 113},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212, 129},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218, 66},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str589, 423},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594, 23},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str604, 354},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220, 174},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608, 153},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str612, 209},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str613, 141},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str614, 211},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616, 280},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617, 158},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618, 123},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str619, 42},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str621, 218},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622, 269},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623, 219},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626, 210},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627, 185},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630, 289},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str631, 202},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str632, 198},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str633, 217},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636, 152},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637, 357},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638, 221},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639, 213},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640, 282},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str641, 214},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str642, 216},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str643, 203},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646, 131},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str647, 374},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str648, 187},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649, 438},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str650, 220},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651, 212},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224, 162},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225, 45},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226, 111},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227, 22},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653, 176},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654, 215},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str655, 386},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660, 186},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str668, 245},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672, 18},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229, 152},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235, 151},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236, 53},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679, 188},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243, 34},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244, 117},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245, 167},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str682, 118},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str690, 395},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248, 96},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249, 97},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701, 402},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251, 96},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703, 403},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str704, 128},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706, 344},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253, 58},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709, 68},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713, 116},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str715, 404},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str721, 69},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725, 66},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729, 394},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730, 370},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str734, 128},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256, 167},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257, 191},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str737, 60},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str738, 162},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str739, 192},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str746, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str747, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748, 125},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260, 194},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str750, 223},
- {-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_str771, 160},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776, 21},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str778, 57},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262, 5},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263, 60},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264, 34},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268, 111},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269, 38},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str780, 54},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271, 43},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272, 182},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str784, 196},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276, 127},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str277, 70},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282, 190},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str787, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str788, 101},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792, 36},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str796, 408},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797, 179},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str798, 176},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str799, 102},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285, 184},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str802, 439},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str803, 7},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str811, 203},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str815, 244},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288, 1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str289, 42},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str818, 41},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292, 112},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823, 111},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str824, 192},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297, 168},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298, 187},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302, 127},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306, 65},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307, 40},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str826, 173},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str827, 303},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309, 62},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830, 186},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str831, 206},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str832, 44},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str833, 146},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str835, 229},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str841, 11},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str850, 112},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851, 400},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str852, 68},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str854, 352},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str860, 194},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867, 190},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869, 184},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str870, 429},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str874, 368},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str879, 222},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str312, 140},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884, 50},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317, 152},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318, 124},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319, 102},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320, 196},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321, 30},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str889, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str890, 200},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str900, 183},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str901, 51},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str907, 234},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str912, 69},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str913, 202},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str914, 71},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str917, 190},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326, 130},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327, 140},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328, 161},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329, 7},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330, 162},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331, 32},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332, 183},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str919, 163},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str920, 59},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str923, 98},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str931, 133},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334, 128},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335, 102},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str933, 6},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337, 71},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338, 73},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339, 13},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340, 136},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341, 82},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343, 40},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344, 104},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352, 77},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353, 112},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354, 189},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936, 26},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357, 159},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358, 82},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938, 284},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939, 369},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str943, 294},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str945, 133},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str946, 319},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947, 371},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360, 4},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361, 59},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362, 87},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363, 87},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str949, 38},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950, 418},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951, 296},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str952, 254},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str953, 53},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365, 88},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366, 65},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367, 77},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956, 256},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960, 308},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370, 189},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str962, 141},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str963, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str964, 283},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str965, 121},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966, 17},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str970, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372, 21},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373, 16},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972, 242},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str973, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str974, 157},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375, 149},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str976, 173},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str977, 135},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str981, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str377, 172},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378, 43},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379, 150},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str983, 189},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str988, 114},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str989, 130},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str990, 95},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str994, 277},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str996, 387},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str997, 310},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str998, 119},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1000, 84},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1003, 137},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1004, 290},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1006, 397},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1007, 95},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1010, 285},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381, 69},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1016, 135},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1021, 25},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1031, 305},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1035, 366},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1039, 16},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1044, 207},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1051, 361},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065, 161},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1067, 126},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069, 311},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1070, 137},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072, 288},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387, 129},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388, 98},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1074, 27},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1076, 80},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1078, 345},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1081, 12},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1084, 348},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1087, 302},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390, 194},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1092, 99},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1094, 359},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1107, 167},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1110, 201},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395, 31},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396, 60},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114, 389},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129, 293},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400, 158},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1133, 174},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str404, 54},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407, 171},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408, 157},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1135, 106},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1142, 353},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1147, 183},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410, 114},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1150, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1151, 112},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1156, 102},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1162, 140},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1170, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413, 6},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414, 195},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1173, 121},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417, 41},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418, 114},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419, 195},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420, 155},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1179, 72},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1185, 261},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1186, 136},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1188, 249},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426, 180},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427, 9},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1190, 107},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429, 70},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430, 143},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1195, 381},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1196, 331},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1198, 313},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1202, 420},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1212, 409},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435, 186},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1215, 172},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1219, 406},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1224, 169},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1225, 373},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1229, 156},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1230, 367},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1231, 264},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1244, 407},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1245, 307},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1249, 175},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1253, 187},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1256, 184},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1259, 130},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438, 56},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1261, 200},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1262, 205},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440, 145},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1264, 326},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1265, 159},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1274, 44},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1279, 257},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1282, 145},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1289, 126},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1298, 372},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1300, 129},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442, 123},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1302, 437},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1306, 89},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1307, 194},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444, 120},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445, 134},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1310, 115},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1313, 360},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1315, 110},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448, 62},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449, 50},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450, 172},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451, 20},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1318, 138},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454, 24},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455, 79},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1321, 110},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458, 154},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459, 125},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460, 139},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1323, 424},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1328, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462, 154},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463, 174},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1330, 193},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1334, 177},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1341, 417},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465, 120},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1343, 103},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1344, 433},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1350, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1351, 388},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1354, 349},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467, 41},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1356, 364},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1362, 40},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1372, 422},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469, 178},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1377, 241},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1389, 399},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1393, 195},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1396, 138},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474, 141},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476, 138},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477, 138},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1398, 167},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479, 0},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480, 94},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481, 157},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1402, 30},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486, 128},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487, 106},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488, 141},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491, 44},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1404, 79},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1411, 274},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493, 125},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494, 94},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502, 193},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1413, 199},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504, 121},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str505, 32},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1416, 268},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1422, 199},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1424, 146},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1429, 147},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1431, 411},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1432, 175},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508, 137},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509, 164},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435, 231},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1436, 64},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512, 68},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1438, 350},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514, 134},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515, 104},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516, 101},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1442, 147},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1443, 243},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1448, 84},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520, 25},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521, 121},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522, 106},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523, 39},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1450, 5},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str525, 78},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531, 37},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1452, 336},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1457, 142},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533, 163},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1460, 236},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1462, 275},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463, 65},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1468, 142},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1478, 380},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1479, 91},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1480, 56},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536, 12},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537, 143},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538, 133},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539, 139},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1492, 132},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1498, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542, 52},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1504, 115},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1505, 118},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1506, 103},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1510, 91},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1512, 246},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548, 61},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1516, 267},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1517, 81},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552, 67},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553, 122},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554, 164},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1519, 139},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1520, 139},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1523, 318},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556, 101},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1525, 165},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1530, 49},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1531, 339},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1536, 440},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1540, 124},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1546, 81},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558, 53},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559, 64},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560, 160},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1548, 198},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1561, 34},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1565, 378},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1566, 165},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1567, 140},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562, 68},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1569, 96},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1571, 228},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1578, 32},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564, 166},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570, 188},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1581, 292},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573, 11},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1583, 259},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1590, 20},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1591, 132},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1595, 30},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575, 166},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584, 28},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1598, 96},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1605, 71},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1606, 177},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587, 39},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1609, 376},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1617, 77},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str590, 178},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1620, 90},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1634, 270},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1635, 136},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636, 48},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1643, 286},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593, 184},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594, 99},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str595, 8},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1645, 265},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1648, 266},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1649, 90},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1658, 233},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1662, 72},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597, 137},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598, 180},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599, 146},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1664, 31},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1670, 332},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1676, 98},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1683, 324},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1688, 108},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1692, 87},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1699, 327},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601, 165},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602, 146},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603, 109},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str606, 76},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1701, 134},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608, 89},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1703, 134},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1709, 61},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1724, 104},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1725, 8},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1729, 46},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1732, 100},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str610, 86},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611, 76},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1737, 77},
- {-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_str1759, 322},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1761, 79},
- {-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_str1780, 375},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1787, 342},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1790, 122},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1829, 291},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616, 109},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1831, 171},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1835, 363},
- {-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_str1853, 33},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618, 89},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1858, 149},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1864, 207},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1868, 164},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623, 67},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1871, 149},
- {-1}, {-1}, {-1}, {-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_str1896, 122},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1899, 193},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1900, 225},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1904, 108},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1917, 104},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1925, 197},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1932, 191},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626, 118},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635, 29},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1944, 76},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638, 186},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639, 52},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640, 25},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1949, 86},
- {-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_str645, 44},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646, 117},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1970, 86},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1983, 362},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1988, 70},
- {-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_str2005, 427},
- {-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_str2022, 157},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2028, 329},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2033, 321},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2046, 125},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2051, 343},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649, 133},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2053, 398},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651, 31},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str652, 22},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654, 33},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2055, 164},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str656, 88},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2086, 309},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2087, 22},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2094, 166},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2102, 279},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660, 145},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str661, 90},
{-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_str2119, 271},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2123, 393},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2129, 40},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2130, 442},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674, 183},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2141, 180},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676, 173},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677, 132},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2162, 320},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689, 136},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2165, 316},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2178, 191},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2189, 53},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2194, 415},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str692, 107},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2299, 58},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2313, 47},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2322, 48},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2338, 29},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698, 107},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699, 188},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701, 131},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2342, 45},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2349, 340},
- {-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_str705, 71},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706, 55},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707, 64},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708, 196},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709, 75},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710, 75},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2371, 181},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2372, 154},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2377, 441},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2379, 119},
- {-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_str714, 80},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2400, 414},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2401, 197},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717, 80},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722, 135},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str723, 85},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2413, 248},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str726, 148},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727, 85},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728, 131},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729, 148},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2429, 107},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748, 48},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751, 46},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2442, 328},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str755, 118},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2454, 10},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758, 182},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-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_str2495, 351},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str786, 84},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2515, 62},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2523, 334},
- {-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_str2542, 29},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2549, 127},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2588, 127},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str797, 170},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2627, 15},
- {-1}, {-1}, {-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_str2651, 338},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str809, 29},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2671, 330},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2710, 301},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2724, 62},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820, 170},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2727, 208},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2737, 181},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2753, 117},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823, 173},
{-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_str842, 10},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843, 165},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2785, 38},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str848, 103},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849, 103},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-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_str2888, 161},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2925, 145},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2940, 337},
- {-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_str2961, 335},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2962, 435},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-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_str2995, 89},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3000, 85},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str863, 160},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864, 30},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866, 37},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867, 57},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878, 158},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3104, 76},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-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_str3189, 73},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883, 28},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884, 124},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886, 116},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str887, 116},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3197, 117},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str895, 47},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3254, 166},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898, 2},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str908, 169},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909, 126},
{-1}, {-1}, {-1}, {-1}, {-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_str935, 95},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3292, 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},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937, 159},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947, 48},
{-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_str966, 61},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3391, 436},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str975, 84},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str978, 126},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-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_str3459, 73},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#endif /* USE_UNICODE_PROPERTIES */
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 7},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 8},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 13},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 11},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 0},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 10},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 14},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 3},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 9},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 12},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 6},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 5},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 4},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 2}
+#else /* USE_UNICODE_PROPERTIES */
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1022, 45},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1024, 123},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3480, 154},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036, 156},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040, 47},
{-1}, {-1}, {-1}, {-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_str1065, 156},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072, 153},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28602,18 +17873,31 @@ uniname2ctype_p (str, len)
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-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_str1140, 72},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141, 135},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-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_str1174, 15},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187, 72},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-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_str1221, 90},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235, 95},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-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_str1277, 78},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28628,26 +17912,6 @@ uniname2ctype_p (str, len)
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_PROPERTIES */
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 8},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 3},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 2}
-#else /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3802, 434},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28660,12 +17924,11 @@ uniname2ctype_p (str, len)
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3922, 74},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-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_str1542, 153},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28690,7 +17953,7 @@ uniname2ctype_p (str, len)
{-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_str4167, 85}
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1751, 73}
#endif /* USE_UNICODE_PROPERTIES */
};
diff --git a/enc/unicode/name2ctype.h.blt b/enc/unicode/name2ctype.h.blt
index 2e80edf525..2248b8f7cb 100644
--- a/enc/unicode/name2ctype.h.blt
+++ b/enc/unicode/name2ctype.h.blt
@@ -3,7 +3,7 @@
#ifndef USE_UNICODE_PROPERTIES
/* Computed positions: -k'1,3' */
#else /* USE_UNICODE_PROPERTIES */
-/* Computed positions: -k'1-3,5-6,12,16,$' */
+/* Computed positions: -k'1-3,6,12,16,$' */
#endif /* USE_UNICODE_PROPERTIES */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -34,4276 +34,9 @@ error "gperf generated tables don't work with this execution character set. Plea
#endif
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 540,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x065f,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x103f,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1baf,
- 0x1bba, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa90a, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9cf,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x11100, 0x11132,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x11680, 0x116b5,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* 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[] = {
- 42,
- 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,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xa9d0, 0xa9d9,
- 0xaa50, 0xaa59,
- 0xabf0, 0xabf9,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x11066, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 544,
- 0x0021, 0x007e,
- 0x00a1, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 0x167f,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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,
- 0x200b, 0x2027,
- 0x202a, 0x202e,
- 0x2030, 0x205e,
- 0x2060, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 618,
- 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, 0x02b8,
- 0x02c0, 0x02c1,
- 0x02e0, 0x02e4,
- 0x0345, 0x0345,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037a, 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,
- 0x0525, 0x0525,
- 0x0527, 0x0527,
- 0x0561, 0x0587,
- 0x1d00, 0x1dbf,
- 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,
- 0x2090, 0x209c,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2170, 0x217f,
- 0x2184, 0x2184,
- 0x24d0, 0x24e9,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7d,
- 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,
- 0x2cec, 0x2cec,
- 0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 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,
- 0xa661, 0xa661,
- 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, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7f8, 0xa7fa,
- 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[] = {
- 541,
- 0x0020, 0x007e,
- 0x00a0, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 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,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x2027,
- 0x202a, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 140,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00ab, 0x00ab,
- 0x00b6, 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,
- 0x0830, 0x083e,
- 0x085e, 0x085e,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0af0, 0x0af0,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1360, 0x1368,
- 0x1400, 0x1400,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x1a1e, 0x1a1f,
- 0x1aa0, 0x1aa6,
- 0x1aa8, 0x1aad,
- 0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd3, 0x1cd3,
- 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,
- 0x2d70, 0x2d70,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e3b,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa4fe, 0xa4ff,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa6f2, 0xa6f7,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa8f8, 0xa8fa,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xa9c1, 0xa9cd,
- 0xa9de, 0xa9df,
- 0xaa5c, 0xaa5f,
- 0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
- 0xabeb, 0xabeb,
- 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, 0x10102,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x10857, 0x10857,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x10a7f, 0x10a7f,
- 0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
- 0x110bb, 0x110bc,
- 0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
- 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[] = {
- 610,
- 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,
- 0x0524, 0x0524,
- 0x0526, 0x0526,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 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,
- 0x2160, 0x216f,
- 0x2183, 0x2183,
- 0x24b6, 0x24cf,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c70,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c7e, 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,
- 0x2ceb, 0x2ceb,
- 0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
- 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,
- 0xa660, 0xa660,
- 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,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
- 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[] = {
- 564,
- 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, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06df, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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,
- 0x135d, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3007,
- 0x3021, 0x302f,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa672,
- 0xa674, 0xa67d,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa8e0, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xa960, 0xa97c,
- 0xa980, 0xa9c0,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabec, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 0x10140, 0x10174,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
- 0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 566,
- 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,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07c0, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f20, 0x0f29,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x1049,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x1090, 0x1099,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8d0, 0xa8d9,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11066, 0x1106f,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11132,
- 0x11136, 0x1113f,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b5,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* 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,
@@ -4312,35 +45,34 @@ static const OnigCodePoint CR_Any[] = {
/* 'Assigned': - */
static const OnigCodePoint CR_Assigned[] = {
- 539,
+ 485,
0x0000, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x0591, 0x05c7,
0x05d0, 0x05ea,
0x05f0, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0606, 0x061b,
- 0x061e, 0x070d,
+ 0x061e, 0x061f,
+ 0x0621, 0x065e,
+ 0x0660, 0x070d,
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
0x0800, 0x082d,
0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -4384,7 +116,8 @@ static const OnigCodePoint CR_Assigned[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -4398,7 +131,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -4446,10 +179,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -4484,17 +218,17 @@ static const OnigCodePoint CR_Assigned[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -4510,7 +244,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
0x1400, 0x169c,
@@ -4547,14 +281,14 @@ static const OnigCodePoint CR_Assigned[] = {
0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -4573,25 +307,38 @@ static const OnigCodePoint CR_Assigned[] = {
0x2000, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -4600,7 +347,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -4610,21 +357,21 @@ static const OnigCodePoint CR_Assigned[] = {
0x3099, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa82b,
0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
@@ -4640,18 +387,14 @@ static const OnigCodePoint CR_Assigned[] = {
0xaa50, 0xaa59,
0xaa5c, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xd800, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -4660,7 +403,7 @@ static const OnigCodePoint CR_Assigned[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -4713,8 +456,6 @@ static const OnigCodePoint CR_Assigned[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -4730,26 +471,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -4777,75 +503,28 @@ static const OnigCodePoint CR_Assigned[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
@@ -4856,560 +535,44 @@ static const OnigCodePoint CR_Assigned[] = {
/* 'C': Major Category */
static const OnigCodePoint CR_C[] = {
- 541,
+ 20,
0x0000, 0x001f,
0x007f, 0x009f,
0x00ad, 0x00ad,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x0605,
- 0x061c, 0x061d,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
- 0x070e, 0x070f,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
+ 0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
- 0x2060, 0x206f,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfffb,
- 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
+ 0x2060, 0x2064,
+ 0x206a, 0x206f,
+ 0xd800, 0xf8ff,
+ 0xfeff, 0xfeff,
+ 0xfff9, 0xfffb,
0x110bd, 0x110bd,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
0x1d173, 0x1d17a,
- 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe00ff,
- 0xe01f0, 0x10ffff,
+ 0xe0001, 0xe0001,
+ 0xe0020, 0xe007f,
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10ffff,
}; /* CR_C */
/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
+static const OnigCodePoint CR_Cc[] = {
+ 2,
+ 0x0000, 0x001f,
+ 0x007f, 0x009f,
+}; /* CR_Cc */
/* 'Cf': General Category */
static const OnigCodePoint CR_Cf[] = {
- 14,
+ 15,
0x00ad, 0x00ad,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
0x2060, 0x2064,
@@ -5424,35 +587,34 @@ static const OnigCodePoint CR_Cf[] = {
/* 'Cn': General Category */
static const OnigCodePoint CR_Cn[] = {
- 539,
+ 485,
0x0378, 0x0379,
0x037f, 0x0383,
0x038b, 0x038b,
0x038d, 0x038d,
0x03a2, 0x03a2,
- 0x0528, 0x0530,
+ 0x0526, 0x0530,
0x0557, 0x0558,
0x0560, 0x0560,
0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
+ 0x058b, 0x0590,
0x05c8, 0x05cf,
0x05eb, 0x05ef,
0x05f5, 0x05ff,
- 0x0605, 0x0605,
+ 0x0604, 0x0605,
0x061c, 0x061d,
+ 0x0620, 0x0620,
+ 0x065f, 0x065f,
0x070e, 0x070e,
0x074b, 0x074c,
0x07b2, 0x07bf,
0x07fb, 0x07ff,
0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
+ 0x083f, 0x08ff,
+ 0x093a, 0x093b,
+ 0x094f, 0x094f,
+ 0x0956, 0x0957,
+ 0x0973, 0x0978,
0x0980, 0x0980,
0x0984, 0x0984,
0x098d, 0x098e,
@@ -5496,6 +658,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0ace, 0x0acf,
0x0ad1, 0x0adf,
0x0ae4, 0x0ae5,
+ 0x0af0, 0x0af0,
0x0af2, 0x0b00,
0x0b04, 0x0b04,
0x0b0d, 0x0b0e,
@@ -5510,7 +673,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0b58, 0x0b5b,
0x0b5e, 0x0b5e,
0x0b64, 0x0b65,
- 0x0b78, 0x0b81,
+ 0x0b72, 0x0b81,
0x0b84, 0x0b84,
0x0b8b, 0x0b8d,
0x0b91, 0x0b91,
@@ -5558,10 +721,11 @@ static const OnigCodePoint CR_Cn[] = {
0x0d04, 0x0d04,
0x0d0d, 0x0d0d,
0x0d11, 0x0d11,
- 0x0d3b, 0x0d3c,
+ 0x0d29, 0x0d29,
+ 0x0d3a, 0x0d3c,
0x0d45, 0x0d45,
0x0d49, 0x0d49,
- 0x0d4f, 0x0d56,
+ 0x0d4e, 0x0d56,
0x0d58, 0x0d5f,
0x0d64, 0x0d65,
0x0d76, 0x0d78,
@@ -5596,16 +760,16 @@ static const OnigCodePoint CR_Cn[] = {
0x0ec7, 0x0ec7,
0x0ece, 0x0ecf,
0x0eda, 0x0edb,
- 0x0ee0, 0x0eff,
+ 0x0ede, 0x0eff,
0x0f48, 0x0f48,
0x0f6d, 0x0f70,
+ 0x0f8c, 0x0f8f,
0x0f98, 0x0f98,
0x0fbd, 0x0fbd,
0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
+ 0x0fd9, 0x0fff,
+ 0x10c6, 0x10cf,
+ 0x10fd, 0x10ff,
0x1249, 0x1249,
0x124e, 0x124f,
0x1257, 0x1257,
@@ -5621,7 +785,7 @@ static const OnigCodePoint CR_Cn[] = {
0x12d7, 0x12d7,
0x1311, 0x1311,
0x1316, 0x1317,
- 0x135b, 0x135c,
+ 0x135b, 0x135e,
0x137d, 0x137f,
0x139a, 0x139f,
0x13f5, 0x13ff,
@@ -5659,13 +823,13 @@ static const OnigCodePoint CR_Cn[] = {
0x1aae, 0x1aff,
0x1b4c, 0x1b4f,
0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
+ 0x1bab, 0x1bad,
+ 0x1bba, 0x1bff,
0x1c38, 0x1c3a,
0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
+ 0x1c80, 0x1ccf,
+ 0x1cf3, 0x1cff,
+ 0x1de7, 0x1dfc,
0x1f16, 0x1f17,
0x1f1e, 0x1f1f,
0x1f46, 0x1f47,
@@ -5685,24 +849,37 @@ static const OnigCodePoint CR_Cn[] = {
0x2065, 0x2069,
0x2072, 0x2073,
0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
+ 0x2095, 0x209f,
+ 0x20b9, 0x20cf,
0x20f1, 0x20ff,
0x218a, 0x218f,
- 0x23f4, 0x23ff,
+ 0x23e9, 0x23ff,
0x2427, 0x243f,
0x244b, 0x245f,
+ 0x26ce, 0x26ce,
+ 0x26e2, 0x26e2,
+ 0x26e4, 0x26e7,
0x2700, 0x2700,
+ 0x2705, 0x2705,
+ 0x270a, 0x270b,
+ 0x2728, 0x2728,
+ 0x274c, 0x274c,
+ 0x274e, 0x274e,
+ 0x2753, 0x2755,
+ 0x275f, 0x2760,
+ 0x2795, 0x2797,
+ 0x27b0, 0x27b0,
+ 0x27bf, 0x27bf,
+ 0x27cb, 0x27cb,
+ 0x27cd, 0x27cf,
0x2b4d, 0x2b4f,
0x2b5a, 0x2bff,
0x2c2f, 0x2c2f,
0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
+ 0x2cf2, 0x2cf8,
+ 0x2d26, 0x2d2f,
+ 0x2d66, 0x2d6e,
+ 0x2d70, 0x2d7f,
0x2d97, 0x2d9f,
0x2da7, 0x2da7,
0x2daf, 0x2daf,
@@ -5712,7 +889,7 @@ static const OnigCodePoint CR_Cn[] = {
0x2dcf, 0x2dcf,
0x2dd7, 0x2dd7,
0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
+ 0x2e32, 0x2e7f,
0x2e9a, 0x2e9a,
0x2ef4, 0x2eff,
0x2fd6, 0x2fef,
@@ -5722,20 +899,20 @@ static const OnigCodePoint CR_Cn[] = {
0x3100, 0x3104,
0x312e, 0x3130,
0x318f, 0x318f,
- 0x31bb, 0x31bf,
+ 0x31b8, 0x31bf,
0x31e4, 0x31ef,
0x321f, 0x321f,
0x32ff, 0x32ff,
0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
+ 0x9fcc, 0x9fff,
0xa48d, 0xa48f,
0xa4c7, 0xa4cf,
0xa62c, 0xa63f,
- 0xa698, 0xa69e,
+ 0xa660, 0xa661,
+ 0xa674, 0xa67b,
+ 0xa698, 0xa69f,
0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
+ 0xa78d, 0xa7fa,
0xa82c, 0xa82f,
0xa83a, 0xa83f,
0xa878, 0xa87f,
@@ -5752,17 +929,13 @@ static const OnigCodePoint CR_Cn[] = {
0xaa5a, 0xaa5b,
0xaa7c, 0xaa7f,
0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
+ 0xaae0, 0xabbf,
0xabee, 0xabef,
0xabfa, 0xabff,
0xd7a4, 0xd7af,
0xd7c7, 0xd7ca,
0xd7fc, 0xd7ff,
+ 0xfa2e, 0xfa2f,
0xfa6e, 0xfa6f,
0xfada, 0xfaff,
0xfb07, 0xfb12,
@@ -5772,7 +945,7 @@ static const OnigCodePoint CR_Cn[] = {
0xfb3f, 0xfb3f,
0xfb42, 0xfb42,
0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
+ 0xfbb2, 0xfbd2,
0xfd40, 0xfd4f,
0xfd90, 0xfd91,
0xfdc8, 0xfdef,
@@ -5824,9 +997,7 @@ static const OnigCodePoint CR_Cn[] = {
0x10860, 0x108ff,
0x1091c, 0x1091e,
0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
+ 0x10940, 0x109ff,
0x10a04, 0x10a04,
0x10a07, 0x10a0b,
0x10a14, 0x10a14,
@@ -5841,27 +1012,12 @@ static const OnigCodePoint CR_Cn[] = {
0x10b73, 0x10b77,
0x10b80, 0x10bff,
0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
+ 0x10e7f, 0x1107f,
+ 0x110c2, 0x11fff,
0x1236f, 0x123ff,
0x12463, 0x1246f,
0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
+ 0x1342f, 0x1cfff,
0x1d0f6, 0x1d0ff,
0x1d127, 0x1d128,
0x1d1de, 0x1d1ff,
@@ -5888,76 +1044,29 @@ static const OnigCodePoint CR_Cn[] = {
0x1d551, 0x1d551,
0x1d6a6, 0x1d6a7,
0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
+ 0x1d800, 0x1efff,
0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
+ 0x1f094, 0x1f0ff,
0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
+ 0x1f12f, 0x1f130,
+ 0x1f132, 0x1f13c,
+ 0x1f13e, 0x1f13e,
+ 0x1f140, 0x1f141,
+ 0x1f143, 0x1f145,
+ 0x1f147, 0x1f149,
+ 0x1f14f, 0x1f156,
+ 0x1f158, 0x1f15e,
+ 0x1f160, 0x1f178,
+ 0x1f17a, 0x1f17a,
+ 0x1f17d, 0x1f17e,
+ 0x1f180, 0x1f189,
+ 0x1f18e, 0x1f18f,
+ 0x1f191, 0x1f1ff,
+ 0x1f201, 0x1f20f,
+ 0x1f232, 0x1f23f,
+ 0x1f249, 0x1ffff,
0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
+ 0x2b735, 0x2f7ff,
0x2fa1e, 0xe0000,
0xe0002, 0xe001f,
0xe0080, 0xe00ff,
@@ -5982,7 +1091,7 @@ static const OnigCodePoint CR_Cs[] = {
/* 'L': Major Category */
static const OnigCodePoint CR_L[] = {
- 486,
+ 422,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -6004,13 +1113,13 @@ static const OnigCodePoint CR_L[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -6029,14 +1138,11 @@ static const OnigCodePoint CR_L[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -6105,12 +1211,11 @@ static const OnigCodePoint CR_L[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -6137,11 +1242,11 @@ static const OnigCodePoint CR_L[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -6152,10 +1257,9 @@ static const OnigCodePoint CR_L[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -6202,13 +1306,11 @@ static const OnigCodePoint CR_L[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -6231,7 +1333,7 @@ static const OnigCodePoint CR_L[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -6250,11 +1352,8 @@ static const OnigCodePoint CR_L[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -6275,24 +1374,23 @@ static const OnigCodePoint CR_L[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6e5,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -6317,18 +1415,12 @@ static const OnigCodePoint CR_L[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -6377,8 +1469,6 @@ static const OnigCodePoint CR_L[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -6388,20 +1478,9 @@ static const OnigCodePoint CR_L[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -6432,168 +1511,18 @@ static const OnigCodePoint CR_L[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_L */
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
- 113,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00b5, 0x00b5,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x01ba,
- 0x01bc, 0x01bf,
- 0x01c4, 0x0293,
- 0x0295, 0x02af,
- 0x0370, 0x0373,
- 0x0376, 0x0377,
- 0x037b, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0561, 0x0587,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1d9a,
- 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,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c7b,
- 0x2c7e, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
- 0xa680, 0xa697,
- 0xa722, 0xa76f,
- 0xa771, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7fa, 0xa7fa,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0x10400, 0x1044f,
- 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,
-}; /* CR_LC */
-
/* 'Ll': General Category */
static const OnigCodePoint CR_Ll[] = {
- 611,
+ 599,
0x0061, 0x007a,
+ 0x00aa, 0x00aa,
0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
0x00df, 0x00f6,
0x00f8, 0x00ff,
0x0101, 0x0101,
@@ -6856,10 +1785,9 @@ static const OnigCodePoint CR_Ll[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
+ 0x1d62, 0x1d77,
0x1d79, 0x1d9a,
0x1e01, 0x1e01,
0x1e03, 0x1e03,
@@ -7023,7 +1951,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2c6c, 0x2c6c,
0x2c71, 0x2c71,
0x2c73, 0x2c74,
- 0x2c76, 0x2c7b,
+ 0x2c76, 0x2c7c,
0x2c81, 0x2c81,
0x2c83, 0x2c83,
0x2c85, 0x2c85,
@@ -7076,10 +2004,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2ce3, 0x2ce4,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -7096,7 +2021,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -7162,15 +2086,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7fa, 0xa7fa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -7207,7 +2122,7 @@ static const OnigCodePoint CR_Ll[] = {
/* 'Lm': General Category */
static const OnigCodePoint CR_Lm[] = {
- 52,
+ 49,
0x02b0, 0x02c1,
0x02c6, 0x02d1,
0x02e0, 0x02e4,
@@ -7231,13 +2146,13 @@ static const OnigCodePoint CR_Lm[] = {
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c78, 0x1c7d,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
- 0x2c7c, 0x2c7d,
+ 0x2090, 0x2094,
+ 0x2c7d, 0x2c7d,
0x2d6f, 0x2d6f,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
@@ -7252,27 +2167,22 @@ static const OnigCodePoint CR_Lm[] = {
0xa717, 0xa71f,
0xa770, 0xa770,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
0xff9e, 0xff9f,
- 0x16f93, 0x16f9f,
}; /* CR_Lm */
/* 'Lo': General Category */
static const OnigCodePoint CR_Lo[] = {
- 371,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 311,
0x01bb, 0x01bb,
0x01c0, 0x01c3,
0x0294, 0x0294,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
@@ -7286,14 +2196,11 @@ static const OnigCodePoint CR_Lo[] = {
0x07b1, 0x07b1,
0x07ca, 0x07ea,
0x0800, 0x0815,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0972, 0x0977,
+ 0x0972, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -7362,12 +2269,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -7393,11 +2299,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0eb2, 0x0eb3,
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -7408,7 +2314,7 @@ static const OnigCodePoint CR_Lo[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10d0, 0x10fa,
- 0x10fd, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -7454,15 +2360,13 @@ static const OnigCodePoint CR_Lo[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c77,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x2135, 0x2138,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -7480,10 +2384,10 @@ static const OnigCodePoint CR_Lo[] = {
0x30ff, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa014,
0xa016, 0xa48c,
0xa4d0, 0xa4f7,
@@ -7517,18 +2421,12 @@ static const OnigCodePoint CR_Lo[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadc,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf2,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb1d, 0xfb1d,
0xfb1f, 0xfb28,
@@ -7575,8 +2473,6 @@ static const OnigCodePoint CR_Lo[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -7586,55 +2482,11 @@ static const OnigCodePoint CR_Lo[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x1b000, 0x1b001,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Lo */
@@ -7655,7 +2507,7 @@ static const OnigCodePoint CR_Lt[] = {
/* 'Lu': General Category */
static const OnigCodePoint CR_Lu[] = {
- 608,
+ 594,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -7921,11 +2773,8 @@ static const OnigCodePoint CR_Lu[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -8140,7 +2989,6 @@ static const OnigCodePoint CR_Lu[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -8157,7 +3005,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -8222,15 +3069,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
0x1d400, 0x1d419,
@@ -8268,7 +3106,7 @@ static const OnigCodePoint CR_Lu[] = {
/* 'M': Major Category */
static const OnigCodePoint CR_M[] = {
- 204,
+ 188,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -8277,10 +3115,10 @@ static const OnigCodePoint CR_M[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -8291,12 +3129,10 @@ static const OnigCodePoint CR_M[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093c,
- 0x093e, 0x094f,
- 0x0951, 0x0957,
+ 0x093c, 0x093c,
+ 0x093e, 0x094e,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09bc, 0x09bc,
@@ -8370,7 +3206,7 @@ static const OnigCodePoint CR_M[] = {
0x0f3e, 0x0f3f,
0x0f71, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102b, 0x103e,
@@ -8382,12 +3218,12 @@ static const OnigCodePoint CR_M[] = {
0x1082, 0x108d,
0x108f, 0x108f,
0x109a, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17d3,
+ 0x17b6, 0x17d3,
0x17dd, 0x17dd,
0x180b, 0x180d,
0x18a9, 0x18a9,
@@ -8403,24 +3239,21 @@ static const OnigCodePoint CR_M[] = {
0x1b34, 0x1b44,
0x1b6b, 0x1b73,
0x1b80, 0x1b82,
- 0x1ba1, 0x1bad,
- 0x1be6, 0x1bf3,
+ 0x1ba1, 0x1baa,
0x1c24, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf2, 0x1cf4,
+ 0x1cf2, 0x1cf2,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8442,8 +3275,6 @@ static const OnigCodePoint CR_M[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf6,
0xabe3, 0xabea,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
@@ -8455,17 +3286,8 @@ static const OnigCodePoint CR_M[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11000, 0x11002,
- 0x11038, 0x11046,
0x11080, 0x11082,
0x110b0, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x11134,
- 0x11180, 0x11182,
- 0x111b3, 0x111c0,
- 0x116ab, 0x116b7,
- 0x16f51, 0x16f7e,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -8477,12 +3299,11 @@ static const OnigCodePoint CR_M[] = {
/* 'Mc': General Category */
static const OnigCodePoint CR_Mc[] = {
- 126,
+ 106,
0x0903, 0x0903,
- 0x093b, 0x093b,
0x093e, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x094f,
+ 0x094e, 0x094e,
0x0982, 0x0983,
0x09be, 0x09c0,
0x09c7, 0x09c8,
@@ -8559,16 +3380,10 @@ static const OnigCodePoint CR_Mc[] = {
0x1ba1, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
0x1c24, 0x1c2b,
0x1c34, 0x1c35,
0x1ce1, 0x1ce1,
- 0x1cf2, 0x1cf3,
- 0x302e, 0x302f,
+ 0x1cf2, 0x1cf2,
0xa823, 0xa824,
0xa827, 0xa827,
0xa880, 0xa881,
@@ -8582,34 +3397,22 @@ static const OnigCodePoint CR_Mc[] = {
0xaa33, 0xaa34,
0xaa4d, 0xaa4d,
0xaa7b, 0xaa7b,
- 0xaaeb, 0xaaeb,
- 0xaaee, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabea,
0xabec, 0xabec,
- 0x11000, 0x11000,
- 0x11002, 0x11002,
0x11082, 0x11082,
0x110b0, 0x110b2,
0x110b7, 0x110b8,
- 0x1112c, 0x1112c,
- 0x11182, 0x11182,
- 0x111b3, 0x111b5,
- 0x111bf, 0x111c0,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x16f51, 0x16f7e,
0x1d165, 0x1d166,
0x1d16d, 0x1d172,
}; /* CR_Mc */
/* 'Me': General Category */
static const OnigCodePoint CR_Me[] = {
- 4,
+ 5,
0x0488, 0x0489,
+ 0x06de, 0x06de,
0x20dd, 0x20e0,
0x20e2, 0x20e4,
0xa670, 0xa672,
@@ -8617,7 +3420,7 @@ static const OnigCodePoint CR_Me[] = {
/* 'Mn': General Category */
static const OnigCodePoint CR_Mn[] = {
- 220,
+ 194,
0x0300, 0x036f,
0x0483, 0x0487,
0x0591, 0x05bd,
@@ -8626,7 +3429,7 @@ static const OnigCodePoint CR_Mn[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06df, 0x06e4,
@@ -8640,14 +3443,11 @@ static const OnigCodePoint CR_Mn[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -8708,7 +3508,7 @@ static const OnigCodePoint CR_Mn[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -8722,12 +3522,11 @@ static const OnigCodePoint CR_Mn[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -8755,31 +3554,23 @@ static const OnigCodePoint CR_Mn[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa66f,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8803,8 +3594,6 @@ static const OnigCodePoint CR_Mn[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -8817,21 +3606,9 @@ static const OnigCodePoint CR_Mn[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d167, 0x1d169,
0x1d17b, 0x1d182,
0x1d185, 0x1d18b,
@@ -8842,7 +3619,7 @@ static const OnigCodePoint CR_Mn[] = {
/* 'N': Major Category */
static const OnigCodePoint CR_N[] = {
- 88,
+ 81,
0x0030, 0x0039,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
@@ -8856,7 +3633,6 @@ static const OnigCodePoint CR_N[] = {
0x0a66, 0x0a6f,
0x0ae6, 0x0aef,
0x0b66, 0x0b6f,
- 0x0b72, 0x0b77,
0x0be6, 0x0bf2,
0x0c66, 0x0c6f,
0x0c78, 0x0c7e,
@@ -8894,7 +3670,6 @@ static const OnigCodePoint CR_N[] = {
0x3038, 0x303a,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8922,11 +3697,6 @@ static const OnigCodePoint CR_N[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
0x12400, 0x12462,
0x1d360, 0x1d371,
0x1d7ce, 0x1d7ff,
@@ -8934,7 +3704,46 @@ static const OnigCodePoint CR_N[] = {
}; /* CR_N */
/* 'Nd': General Category */
-#define CR_Nd CR_Digit
+static const OnigCodePoint CR_Nd[] = {
+ 37,
+ 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, 0x19da,
+ 0x1a80, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1b50, 0x1b59,
+ 0x1bb0, 0x1bb9,
+ 0x1c40, 0x1c49,
+ 0x1c50, 0x1c59,
+ 0xa620, 0xa629,
+ 0xa8d0, 0xa8d9,
+ 0xa900, 0xa909,
+ 0xa9d0, 0xa9d9,
+ 0xaa50, 0xaa59,
+ 0xabf0, 0xabf9,
+ 0xff10, 0xff19,
+ 0x104a0, 0x104a9,
+ 0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
/* 'Nl': General Category */
static const OnigCodePoint CR_Nl[] = {
@@ -8955,19 +3764,17 @@ static const OnigCodePoint CR_Nl[] = {
/* 'No': General Category */
static const OnigCodePoint CR_No[] = {
- 42,
+ 38,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
0x00bc, 0x00be,
0x09f4, 0x09f9,
- 0x0b72, 0x0b77,
0x0bf0, 0x0bf2,
0x0c78, 0x0c7e,
0x0d70, 0x0d75,
0x0f2a, 0x0f33,
0x1369, 0x137c,
0x17f0, 0x17f9,
- 0x19da, 0x19da,
0x2070, 0x2070,
0x2074, 0x2079,
0x2080, 0x2089,
@@ -8979,7 +3786,6 @@ static const OnigCodePoint CR_No[] = {
0x2cfd, 0x2cfd,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8995,13 +3801,143 @@ static const OnigCodePoint CR_No[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x11065,
0x1d360, 0x1d371,
0x1f100, 0x1f10a,
}; /* CR_No */
/* 'P': Major Category */
-#define CR_P CR_Punct
+static const OnigCodePoint CR_P[] = {
+ 129,
+ 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,
+ 0x0830, 0x083e,
+ 0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0df4, 0x0df4,
+ 0x0e4f, 0x0e4f,
+ 0x0e5a, 0x0e5b,
+ 0x0f04, 0x0f12,
+ 0x0f3a, 0x0f3d,
+ 0x0f85, 0x0f85,
+ 0x0fd0, 0x0fd4,
+ 0x104a, 0x104f,
+ 0x10fb, 0x10fb,
+ 0x1361, 0x1368,
+ 0x1400, 0x1400,
+ 0x166d, 0x166e,
+ 0x169b, 0x169c,
+ 0x16eb, 0x16ed,
+ 0x1735, 0x1736,
+ 0x17d4, 0x17d6,
+ 0x17d8, 0x17da,
+ 0x1800, 0x180a,
+ 0x1944, 0x1945,
+ 0x19de, 0x19df,
+ 0x1a1e, 0x1a1f,
+ 0x1aa0, 0x1aa6,
+ 0x1aa8, 0x1aad,
+ 0x1b5a, 0x1b60,
+ 0x1c3b, 0x1c3f,
+ 0x1c7e, 0x1c7f,
+ 0x1cd3, 0x1cd3,
+ 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, 0x2e31,
+ 0x3001, 0x3003,
+ 0x3008, 0x3011,
+ 0x3014, 0x301f,
+ 0x3030, 0x3030,
+ 0x303d, 0x303d,
+ 0x30a0, 0x30a0,
+ 0x30fb, 0x30fb,
+ 0xa4fe, 0xa4ff,
+ 0xa60d, 0xa60f,
+ 0xa673, 0xa673,
+ 0xa67e, 0xa67e,
+ 0xa6f2, 0xa6f7,
+ 0xa874, 0xa877,
+ 0xa8ce, 0xa8cf,
+ 0xa8f8, 0xa8fa,
+ 0xa92e, 0xa92f,
+ 0xa95f, 0xa95f,
+ 0xa9c1, 0xa9cd,
+ 0xa9de, 0xa9df,
+ 0xaa5c, 0xaa5f,
+ 0xaade, 0xaadf,
+ 0xabeb, 0xabeb,
+ 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,
+ 0x10857, 0x10857,
+ 0x1091f, 0x1091f,
+ 0x1093f, 0x1093f,
+ 0x10a50, 0x10a58,
+ 0x10a7f, 0x10a7f,
+ 0x10b39, 0x10b3f,
+ 0x110bb, 0x110bc,
+ 0x110be, 0x110c1,
+ 0x12470, 0x12473,
+}; /* CR_P */
/* 'Pc': General Category */
static const OnigCodePoint CR_Pc[] = {
@@ -9016,7 +3952,7 @@ static const OnigCodePoint CR_Pc[] = {
/* 'Pd': General Category */
static const OnigCodePoint CR_Pd[] = {
- 16,
+ 15,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -9025,7 +3961,6 @@ static const OnigCodePoint CR_Pd[] = {
0x2010, 0x2015,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -9143,7 +4078,7 @@ static const OnigCodePoint CR_Pi[] = {
/* 'Po': General Category */
static const OnigCodePoint CR_Po[] = {
- 135,
+ 124,
0x0021, 0x0023,
0x0025, 0x0027,
0x002a, 0x002a,
@@ -9153,8 +4088,7 @@ static const OnigCodePoint CR_Po[] = {
0x003f, 0x0040,
0x005c, 0x005c,
0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00b6, 0x00b7,
+ 0x00b7, 0x00b7,
0x00bf, 0x00bf,
0x037e, 0x037e,
0x0387, 0x0387,
@@ -9173,21 +4107,17 @@ static const OnigCodePoint CR_Po[] = {
0x0700, 0x070d,
0x07f7, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0970, 0x0970,
- 0x0af0, 0x0af0,
0x0df4, 0x0df4,
0x0e4f, 0x0e4f,
0x0e5a, 0x0e5b,
0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
0x0f85, 0x0f85,
0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
0x104a, 0x104f,
0x10fb, 0x10fb,
- 0x1360, 0x1368,
+ 0x1361, 0x1368,
0x166d, 0x166e,
0x16eb, 0x16ed,
0x1735, 0x1736,
@@ -9196,14 +4126,13 @@ static const OnigCodePoint CR_Po[] = {
0x1800, 0x1805,
0x1807, 0x180a,
0x1944, 0x1945,
+ 0x19de, 0x19df,
0x1a1e, 0x1a1f,
0x1aa0, 0x1aa6,
0x1aa8, 0x1aad,
0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
0x1c3b, 0x1c3f,
0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x2016, 0x2017,
0x2020, 0x2027,
@@ -9215,7 +4144,6 @@ static const OnigCodePoint CR_Po[] = {
0x2055, 0x205e,
0x2cf9, 0x2cfc,
0x2cfe, 0x2cff,
- 0x2d70, 0x2d70,
0x2e00, 0x2e01,
0x2e06, 0x2e08,
0x2e0b, 0x2e0b,
@@ -9224,7 +4152,7 @@ static const OnigCodePoint CR_Po[] = {
0x2e1b, 0x2e1b,
0x2e1e, 0x2e1f,
0x2e2a, 0x2e2e,
- 0x2e30, 0x2e39,
+ 0x2e30, 0x2e31,
0x3001, 0x3003,
0x303d, 0x303d,
0x30fb, 0x30fb,
@@ -9242,7 +4170,6 @@ static const OnigCodePoint CR_Po[] = {
0xa9de, 0xa9df,
0xaa5c, 0xaa5f,
0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe10, 0xfe16,
0xfe19, 0xfe19,
@@ -9264,7 +4191,7 @@ static const OnigCodePoint CR_Po[] = {
0xff3c, 0xff3c,
0xff61, 0xff61,
0xff64, 0xff65,
- 0x10100, 0x10102,
+ 0x10100, 0x10101,
0x1039f, 0x1039f,
0x103d0, 0x103d0,
0x10857, 0x10857,
@@ -9273,11 +4200,8 @@ static const OnigCodePoint CR_Po[] = {
0x10a50, 0x10a58,
0x10a7f, 0x10a7f,
0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
0x12470, 0x12473,
}; /* CR_Po */
@@ -9368,11 +4292,11 @@ static const OnigCodePoint CR_S[] = {
0x0060, 0x0060,
0x007c, 0x007c,
0x007e, 0x007e,
- 0x00a2, 0x00a6,
- 0x00a8, 0x00a9,
+ 0x00a2, 0x00a9,
0x00ac, 0x00ac,
0x00ae, 0x00b1,
0x00b4, 0x00b4,
+ 0x00b6, 0x00b6,
0x00b8, 0x00b8,
0x00d7, 0x00d7,
0x00f7, 0x00f7,
@@ -9385,11 +4309,9 @@ static const OnigCodePoint CR_S[] = {
0x0384, 0x0385,
0x03f6, 0x03f6,
0x0482, 0x0482,
- 0x058f, 0x058f,
0x0606, 0x0608,
0x060b, 0x060b,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9399,11 +4321,11 @@ static const OnigCodePoint CR_S[] = {
0x0b70, 0x0b70,
0x0bf3, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0e3f, 0x0e3f,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9413,10 +4335,11 @@ static const OnigCodePoint CR_S[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x17db, 0x17db,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x1fbd, 0x1fbd,
@@ -9429,7 +4352,7 @@ static const OnigCodePoint CR_S[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
@@ -9445,14 +4368,29 @@ static const OnigCodePoint CR_S[] = {
0x214a, 0x214d,
0x214f, 0x214f,
0x2190, 0x2328,
- 0x232b, 0x23f3,
+ 0x232b, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
- 0x2500, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x2500, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27c4,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x2982,
0x2999, 0x29d7,
0x29dc, 0x29fb,
@@ -9473,8 +4411,7 @@ static const OnigCodePoint CR_S[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9488,7 +4425,6 @@ static const OnigCodePoint CR_S[] = {
0xa836, 0xa839,
0xaa77, 0xaa79,
0xfb29, 0xfb29,
- 0xfbb2, 0xfbc1,
0xfdfc, 0xfdfd,
0xfe62, 0xfe62,
0xfe64, 0xfe66,
@@ -9503,6 +4439,7 @@ static const OnigCodePoint CR_S[] = {
0xffe0, 0xffe6,
0xffe8, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9527,46 +4464,32 @@ static const OnigCodePoint CR_S[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_S */
/* 'Sc': General Category */
static const OnigCodePoint CR_Sc[] = {
- 17,
+ 16,
0x0024, 0x0024,
0x00a2, 0x00a5,
- 0x058f, 0x058f,
0x060b, 0x060b,
0x09f2, 0x09f3,
0x09fb, 0x09fb,
@@ -9574,7 +4497,7 @@ static const OnigCodePoint CR_Sc[] = {
0x0bf9, 0x0bf9,
0x0e3f, 0x0e3f,
0x17db, 0x17db,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0xa838, 0xa838,
0xfdfc, 0xfdfc,
0xfe69, 0xfe69,
@@ -9585,7 +4508,7 @@ static const OnigCodePoint CR_Sc[] = {
/* 'Sk': General Category */
static const OnigCodePoint CR_Sk[] = {
- 27,
+ 26,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -9609,7 +4532,6 @@ static const OnigCodePoint CR_Sk[] = {
0xa700, 0xa716,
0xa720, 0xa721,
0xa789, 0xa78a,
- 0xfbb2, 0xfbc1,
0xff3e, 0xff3e,
0xff40, 0xff40,
0xffe3, 0xffe3,
@@ -9632,7 +4554,6 @@ static const OnigCodePoint CR_Sm[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x2118, 0x2118,
0x2140, 0x2144,
0x214b, 0x214b,
0x2190, 0x2194,
@@ -9655,7 +4576,9 @@ static const OnigCodePoint CR_Sm[] = {
0x25f8, 0x25ff,
0x266f, 0x266f,
0x27c0, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x27ff,
0x2900, 0x2982,
0x2999, 0x29d7,
@@ -9682,19 +4605,18 @@ static const OnigCodePoint CR_Sm[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
}; /* CR_Sm */
/* 'So': General Category */
static const OnigCodePoint CR_So[] = {
- 153,
- 0x00a6, 0x00a6,
+ 154,
+ 0x00a6, 0x00a7,
0x00a9, 0x00a9,
0x00ae, 0x00ae,
0x00b0, 0x00b0,
+ 0x00b6, 0x00b6,
0x0482, 0x0482,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9703,10 +4625,10 @@ static const OnigCodePoint CR_So[] = {
0x0bf3, 0x0bf8,
0x0bfa, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9716,16 +4638,17 @@ static const OnigCodePoint CR_So[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
0x2114, 0x2114,
- 0x2116, 0x2117,
+ 0x2116, 0x2118,
0x211e, 0x2123,
0x2125, 0x2125,
0x2127, 0x2127,
@@ -9750,7 +4673,7 @@ static const OnigCodePoint CR_So[] = {
0x232b, 0x237b,
0x237d, 0x239a,
0x23b4, 0x23db,
- 0x23e2, 0x23f3,
+ 0x23e2, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
@@ -9758,9 +4681,21 @@ static const OnigCodePoint CR_So[] = {
0x25b8, 0x25c0,
0x25c2, 0x25f7,
0x2600, 0x266e,
- 0x2670, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27bf,
+ 0x2670, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
0x2800, 0x28ff,
0x2b00, 0x2b2f,
0x2b45, 0x2b46,
@@ -9779,8 +4714,7 @@ static const OnigCodePoint CR_So[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9796,6 +4730,7 @@ static const OnigCodePoint CR_So[] = {
0xffe8, 0xffe8,
0xffed, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9812,35 +4747,23 @@ static const OnigCodePoint CR_So[] = {
0x1d300, 0x1d356,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_So */
/* 'Z': Major Category */
@@ -9884,7 +4807,7 @@ static const OnigCodePoint CR_Zs[] = {
/* 'Math': Derived Property */
static const OnigCodePoint CR_Math[] = {
- 138,
+ 105,
0x002b, 0x002b,
0x003c, 0x003e,
0x005e, 0x005e,
@@ -9912,10 +4835,9 @@ static const OnigCodePoint CR_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
- 0x2118, 0x211d,
+ 0x2119, 0x211d,
0x2124, 0x2124,
0x2128, 0x2129,
0x212c, 0x212d,
@@ -9953,7 +4875,9 @@ static const OnigCodePoint CR_Math[] = {
0x2642, 0x2642,
0x2660, 0x2663,
0x266d, 0x266f,
- 0x27c0, 0x27ff,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2aff,
0x2b30, 0x2b44,
0x2b47, 0x2b4c,
@@ -9989,54 +4913,1698 @@ static const OnigCodePoint CR_Math[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Math */
/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
+static const OnigCodePoint CR_Alphabetic[] = {
+ 474,
+ 0x0041, 0x005a,
+ 0x0061, 0x007a,
+ 0x00aa, 0x00aa,
+ 0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
+ 0x00c0, 0x00d6,
+ 0x00d8, 0x00f6,
+ 0x00f8, 0x02c1,
+ 0x02c6, 0x02d1,
+ 0x02e0, 0x02e4,
+ 0x02ec, 0x02ec,
+ 0x02ee, 0x02ee,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
+ 0x038c, 0x038c,
+ 0x038e, 0x03a1,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
+ 0x0531, 0x0556,
+ 0x0559, 0x0559,
+ 0x0561, 0x0587,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
+ 0x05d0, 0x05ea,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06ef,
+ 0x06fa, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
+ 0x074d, 0x07b1,
+ 0x07ca, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0971, 0x0972,
+ 0x0979, 0x097f,
+ 0x0981, 0x0983,
+ 0x0985, 0x098c,
+ 0x098f, 0x0990,
+ 0x0993, 0x09a8,
+ 0x09aa, 0x09b0,
+ 0x09b2, 0x09b2,
+ 0x09b6, 0x09b9,
+ 0x09bd, 0x09c4,
+ 0x09c7, 0x09c8,
+ 0x09cb, 0x09cc,
+ 0x09ce, 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,
+ 0x0a3e, 0x0a42,
+ 0x0a47, 0x0a48,
+ 0x0a4b, 0x0a4c,
+ 0x0a51, 0x0a51,
+ 0x0a59, 0x0a5c,
+ 0x0a5e, 0x0a5e,
+ 0x0a70, 0x0a75,
+ 0x0a81, 0x0a83,
+ 0x0a85, 0x0a8d,
+ 0x0a8f, 0x0a91,
+ 0x0a93, 0x0aa8,
+ 0x0aaa, 0x0ab0,
+ 0x0ab2, 0x0ab3,
+ 0x0ab5, 0x0ab9,
+ 0x0abd, 0x0ac5,
+ 0x0ac7, 0x0ac9,
+ 0x0acb, 0x0acc,
+ 0x0ad0, 0x0ad0,
+ 0x0ae0, 0x0ae3,
+ 0x0b01, 0x0b03,
+ 0x0b05, 0x0b0c,
+ 0x0b0f, 0x0b10,
+ 0x0b13, 0x0b28,
+ 0x0b2a, 0x0b30,
+ 0x0b32, 0x0b33,
+ 0x0b35, 0x0b39,
+ 0x0b3d, 0x0b44,
+ 0x0b47, 0x0b48,
+ 0x0b4b, 0x0b4c,
+ 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, 0x0bcc,
+ 0x0bd0, 0x0bd0,
+ 0x0bd7, 0x0bd7,
+ 0x0c01, 0x0c03,
+ 0x0c05, 0x0c0c,
+ 0x0c0e, 0x0c10,
+ 0x0c12, 0x0c28,
+ 0x0c2a, 0x0c33,
+ 0x0c35, 0x0c39,
+ 0x0c3d, 0x0c44,
+ 0x0c46, 0x0c48,
+ 0x0c4a, 0x0c4c,
+ 0x0c55, 0x0c56,
+ 0x0c58, 0x0c59,
+ 0x0c60, 0x0c63,
+ 0x0c82, 0x0c83,
+ 0x0c85, 0x0c8c,
+ 0x0c8e, 0x0c90,
+ 0x0c92, 0x0ca8,
+ 0x0caa, 0x0cb3,
+ 0x0cb5, 0x0cb9,
+ 0x0cbd, 0x0cc4,
+ 0x0cc6, 0x0cc8,
+ 0x0cca, 0x0ccc,
+ 0x0cd5, 0x0cd6,
+ 0x0cde, 0x0cde,
+ 0x0ce0, 0x0ce3,
+ 0x0d02, 0x0d03,
+ 0x0d05, 0x0d0c,
+ 0x0d0e, 0x0d10,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
+ 0x0d3d, 0x0d44,
+ 0x0d46, 0x0d48,
+ 0x0d4a, 0x0d4c,
+ 0x0d57, 0x0d57,
+ 0x0d60, 0x0d63,
+ 0x0d7a, 0x0d7f,
+ 0x0d82, 0x0d83,
+ 0x0d85, 0x0d96,
+ 0x0d9a, 0x0db1,
+ 0x0db3, 0x0dbb,
+ 0x0dbd, 0x0dbd,
+ 0x0dc0, 0x0dc6,
+ 0x0dcf, 0x0dd4,
+ 0x0dd6, 0x0dd6,
+ 0x0dd8, 0x0ddf,
+ 0x0df2, 0x0df3,
+ 0x0e01, 0x0e3a,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 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,
+ 0x0ecd, 0x0ecd,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f40, 0x0f47,
+ 0x0f49, 0x0f6c,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
+ 0x0f99, 0x0fbc,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x103f,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 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, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
+ 0x1700, 0x170c,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
+ 0x1740, 0x1753,
+ 0x1760, 0x176c,
+ 0x176e, 0x1770,
+ 0x1772, 0x1773,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
+ 0x1820, 0x1877,
+ 0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
+ 0x1900, 0x191c,
+ 0x1920, 0x192b,
+ 0x1930, 0x1938,
+ 0x1950, 0x196d,
+ 0x1970, 0x1974,
+ 0x1980, 0x19ab,
+ 0x19b0, 0x19c9,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1baf,
+ 0x1c00, 0x1c35,
+ 0x1c4d, 0x1c4f,
+ 0x1c5a, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
+ 0x2c00, 0x2c2e,
+ 0x2c30, 0x2c5e,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 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, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
+ 0x3041, 0x3096,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
+ 0x3105, 0x312d,
+ 0x3131, 0x318e,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
+ 0xa000, 0xa48c,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa61f,
+ 0xa62a, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa90a, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
+ 0xa9cf, 0xa9cf,
+ 0xaa00, 0xaa36,
+ 0xaa40, 0xaa4d,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xac00, 0xd7a3,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
+ 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,
+ 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,
+ 0x10140, 0x10174,
+ 0x10280, 0x1029c,
+ 0x102a0, 0x102d0,
+ 0x10300, 0x1031e,
+ 0x10330, 0x1034a,
+ 0x10380, 0x1039d,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
+ 0x10400, 0x1049d,
+ 0x10800, 0x10805,
+ 0x10808, 0x10808,
+ 0x1080a, 0x10835,
+ 0x10837, 0x10838,
+ 0x1083c, 0x1083c,
+ 0x1083f, 0x10855,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
+ 0x10a00, 0x10a03,
+ 0x10a05, 0x10a06,
+ 0x10a0c, 0x10a13,
+ 0x10a15, 0x10a17,
+ 0x10a19, 0x10a33,
+ 0x10a60, 0x10a7c,
+ 0x10b00, 0x10b35,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
+ 0x10c00, 0x10c48,
+ 0x11082, 0x110b8,
+ 0x12000, 0x1236e,
+ 0x12400, 0x12462,
+ 0x13000, 0x1342e,
+ 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, 0x2a6d6,
+ 0x2a700, 0x2b734,
+ 0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
+static const OnigCodePoint CR_Lowercase[] = {
+ 602,
+ 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, 0x02b8,
+ 0x02c0, 0x02c1,
+ 0x02e0, 0x02e4,
+ 0x0345, 0x0345,
+ 0x0371, 0x0371,
+ 0x0373, 0x0373,
+ 0x0377, 0x0377,
+ 0x037a, 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,
+ 0x0525, 0x0525,
+ 0x0561, 0x0587,
+ 0x1d00, 0x1dbf,
+ 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,
+ 0x2090, 0x2094,
+ 0x210a, 0x210a,
+ 0x210e, 0x210f,
+ 0x2113, 0x2113,
+ 0x212f, 0x212f,
+ 0x2134, 0x2134,
+ 0x2139, 0x2139,
+ 0x213c, 0x213d,
+ 0x2146, 0x2149,
+ 0x214e, 0x214e,
+ 0x2170, 0x217f,
+ 0x2184, 0x2184,
+ 0x24d0, 0x24e9,
+ 0x2c30, 0x2c5e,
+ 0x2c61, 0x2c61,
+ 0x2c65, 0x2c66,
+ 0x2c68, 0x2c68,
+ 0x2c6a, 0x2c6a,
+ 0x2c6c, 0x2c6c,
+ 0x2c71, 0x2c71,
+ 0x2c73, 0x2c74,
+ 0x2c76, 0x2c7d,
+ 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,
+ 0x2cec, 0x2cec,
+ 0x2cee, 0x2cee,
+ 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, 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_Lowercase */
/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
+static const OnigCodePoint CR_Uppercase[] = {
+ 596,
+ 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,
+ 0x0524, 0x0524,
+ 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,
+ 0x2160, 0x216f,
+ 0x2183, 0x2183,
+ 0x24b6, 0x24cf,
+ 0x2c00, 0x2c2e,
+ 0x2c60, 0x2c60,
+ 0x2c62, 0x2c64,
+ 0x2c67, 0x2c67,
+ 0x2c69, 0x2c69,
+ 0x2c6b, 0x2c6b,
+ 0x2c6d, 0x2c70,
+ 0x2c72, 0x2c72,
+ 0x2c75, 0x2c75,
+ 0x2c7e, 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,
+ 0x2ceb, 0x2ceb,
+ 0x2ced, 0x2ced,
+ 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_Uppercase */
/* 'Cased': Derived Property */
static const OnigCodePoint CR_Cased[] = {
- 119,
+ 110,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -10060,12 +6628,10 @@ static const OnigCodePoint CR_Cased[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -10086,9 +6652,7 @@ static const OnigCodePoint CR_Cased[] = {
0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -10110,17 +6674,12 @@ static const OnigCodePoint CR_Cased[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7fa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -10160,7 +6719,7 @@ static const OnigCodePoint CR_Cased[] = {
/* 'Case_Ignorable': Derived Property */
static const OnigCodePoint CR_Case_Ignorable[] = {
- 295,
+ 266,
0x0027, 0x0027,
0x002e, 0x002e,
0x003a, 0x003a,
@@ -10184,13 +6743,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x05f4, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0610, 0x061a,
0x0640, 0x0640,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
- 0x06d6, 0x06dd,
- 0x06df, 0x06e8,
+ 0x06d6, 0x06e8,
0x06ea, 0x06ed,
0x070f, 0x070f,
0x0711, 0x0711,
@@ -10199,14 +6757,11 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x07eb, 0x07f5,
0x07fa, 0x07fa,
0x0816, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0971, 0x0971,
0x0981, 0x0981,
@@ -10269,7 +6824,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -10284,7 +6839,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x108d, 0x108d,
0x109d, 0x109d,
0x10fc, 0x10fc,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
@@ -10320,11 +6875,6 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
@@ -10332,11 +6882,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x1fbd, 0x1fbd,
0x1fbf, 0x1fc1,
0x1fcd, 0x1fcf,
@@ -10352,16 +6901,15 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x206a, 0x206f,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0x2cef, 0x2cf1,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3031, 0x3035,
0x303b, 0x303b,
0x3099, 0x309e,
@@ -10370,14 +6918,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xa4f8, 0xa4fd,
0xa60c, 0xa60c,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
+ 0xa67c, 0xa67d,
0xa67f, 0xa67f,
- 0xa69f, 0xa69f,
0xa6f0, 0xa6f1,
0xa700, 0xa721,
0xa770, 0xa770,
0xa788, 0xa78a,
- 0xa7f8, 0xa7f9,
0xa802, 0xa802,
0xa806, 0xa806,
0xa80b, 0xa80b,
@@ -10403,14 +6949,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xaabe, 0xaabf,
0xaac1, 0xaac1,
0xaadd, 0xaadd,
- 0xaaec, 0xaaed,
- 0xaaf3, 0xaaf4,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
0xfb1e, 0xfb1e,
- 0xfbb2, 0xfbc1,
0xfe00, 0xfe0f,
0xfe13, 0xfe13,
0xfe20, 0xfe26,
@@ -10432,22 +6974,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
0x110bd, 0x110bd,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d173, 0x1d182,
0x1d185, 0x1d18b,
@@ -10460,7 +6990,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
/* 'Changes_When_Lowercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Lowercased[] = {
- 571,
+ 557,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -10725,11 +7255,8 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -10939,7 +7466,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -10956,7 +7482,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -11021,22 +7546,13 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
}; /* CR_Changes_When_Lowercased */
/* 'Changes_When_Uppercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Uppercased[] = {
- 586,
+ 573,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11186,7 +7702,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11316,7 +7831,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -11527,10 +8041,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -11547,7 +8058,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -11612,13 +8122,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -11627,7 +8130,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
/* 'Changes_When_Titlecased': Derived Property */
static const OnigCodePoint CR_Changes_When_Titlecased[] = {
- 587,
+ 574,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11778,7 +8281,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11908,7 +8410,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -12119,10 +8620,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -12139,7 +8637,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -12204,13 +8701,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -12219,7 +8709,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
/* 'Changes_When_Casefolded': Derived Property */
static const OnigCodePoint CR_Changes_When_Casefolded[] = {
- 582,
+ 568,
0x0041, 0x005a,
0x00b5, 0x00b5,
0x00c0, 0x00d6,
@@ -12490,12 +8980,9 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x0587, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -12707,7 +9194,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -12724,7 +9210,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -12789,15 +9274,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12806,7 +9282,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
/* 'Changes_When_Casemapped': Derived Property */
static const OnigCodePoint CR_Changes_When_Casemapped[] = {
- 104,
+ 97,
0x0041, 0x005a,
0x0061, 0x007a,
0x00b5, 0x00b5,
@@ -12827,7 +9303,6 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -12851,12 +9326,10 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x03f4, 0x03f5,
0x03f7, 0x03fb,
0x03fd, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
0x1e00, 0x1e9b,
@@ -12894,18 +9367,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x2c75, 0x2c76,
0x2c7e, 0x2ce3,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa72f,
0xa732, 0xa76f,
0xa779, 0xa787,
- 0xa78b, 0xa78d,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12915,7 +9384,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
/* 'ID_Start': Derived Property */
static const OnigCodePoint CR_ID_Start[] = {
- 488,
+ 424,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -12937,13 +9406,13 @@ static const OnigCodePoint CR_ID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -12962,14 +9431,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -13038,12 +9504,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -13070,11 +9535,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -13085,10 +9550,9 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13136,13 +9600,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -13165,7 +9627,7 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -13183,11 +9645,8 @@ static const OnigCodePoint CR_ID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -13208,24 +9667,23 @@ static const OnigCodePoint CR_ID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -13250,18 +9708,12 @@ static const OnigCodePoint CR_ID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13311,8 +9763,6 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -13322,21 +9772,10 @@ static const OnigCodePoint CR_ID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -13367,48 +9806,14 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_ID_Start */
/* 'ID_Continue': Derived Property */
static const OnigCodePoint CR_ID_Continue[] = {
- 564,
+ 506,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -13433,7 +9838,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -13445,7 +9850,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -13456,13 +9862,12 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -13564,14 +9969,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -13607,7 +10012,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -13617,16 +10022,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13642,7 +10047,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -13658,7 +10063,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -13684,14 +10090,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -13714,7 +10121,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -13734,13 +10141,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -13760,24 +10165,23 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -13795,20 +10199,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13865,8 +10263,6 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -13879,25 +10275,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -13935,49 +10316,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_ID_Continue */
/* 'XID_Start': Derived Property */
static const OnigCodePoint CR_XID_Start[] = {
- 495,
+ 431,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -13999,13 +10346,13 @@ static const OnigCodePoint CR_XID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -14024,14 +10371,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -14100,12 +10444,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -14132,11 +10475,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -14147,10 +10490,9 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14198,13 +10540,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -14227,7 +10567,7 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -14245,11 +10585,8 @@ static const OnigCodePoint CR_XID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -14270,24 +10607,23 @@ static const OnigCodePoint CR_XID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -14312,18 +10648,12 @@ static const OnigCodePoint CR_XID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14380,8 +10710,6 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -14391,21 +10719,10 @@ static const OnigCodePoint CR_XID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -14436,48 +10753,14 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_XID_Start */
/* 'XID_Continue': Derived Property */
static const OnigCodePoint CR_XID_Continue[] = {
- 571,
+ 513,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -14502,7 +10785,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -14514,7 +10797,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -14525,13 +10809,12 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -14633,14 +10916,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -14676,7 +10959,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -14686,16 +10969,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14711,7 +10994,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -14727,7 +11010,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -14753,14 +11037,15 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -14783,7 +11068,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -14803,13 +11088,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -14830,24 +11113,23 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -14865,20 +11147,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14941,8 +11217,6 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -14955,25 +11229,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -15011,42 +11270,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_XID_Continue */
@@ -15073,7 +11298,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
/* 'Grapheme_Extend': Derived Property */
static const OnigCodePoint CR_Grapheme_Extend[] = {
- 232,
+ 206,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -15082,10 +11307,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -15096,14 +11321,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -15174,7 +11396,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -15188,12 +11410,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -15221,30 +11442,22 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -15268,8 +11481,6 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -15283,21 +11494,9 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d165,
0x1d167, 0x1d169,
0x1d16e, 0x1d172,
@@ -15310,7 +11509,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
/* 'Grapheme_Base': Derived Property */
static const OnigCodePoint CR_Grapheme_Base[] = {
- 643,
+ 567,
0x0020, 0x007e,
0x00a0, 0x00ac,
0x00ae, 0x02ff,
@@ -15320,12 +11519,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x038c, 0x038c,
0x038e, 0x03a1,
0x03a3, 0x0482,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x05be, 0x05be,
0x05c0, 0x05c0,
0x05c3, 0x05c3,
@@ -15334,10 +11532,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x05f0, 0x05f4,
0x0606, 0x060f,
0x061b, 0x061b,
- 0x061e, 0x064a,
+ 0x061e, 0x061f,
+ 0x0621, 0x064a,
0x0660, 0x066f,
0x0671, 0x06d5,
- 0x06de, 0x06de,
0x06e5, 0x06e6,
0x06e9, 0x06e9,
0x06ee, 0x070d,
@@ -15352,17 +11550,13 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0824, 0x0824,
0x0828, 0x0828,
0x0830, 0x083e,
- 0x0840, 0x0858,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0903, 0x0939,
- 0x093b, 0x093b,
0x093d, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x0950,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
0x0958, 0x0961,
- 0x0964, 0x0977,
+ 0x0964, 0x0972,
0x0979, 0x097f,
0x0982, 0x0983,
0x0985, 0x098c,
@@ -15404,7 +11598,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae1,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b02, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -15418,7 +11613,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0b4b, 0x0b4c,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b61,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b83, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -15465,12 +11660,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
0x0d3f, 0x0d40,
0x0d46, 0x0d48,
0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d66, 0x0d75,
0x0d79, 0x0d7f,
@@ -15504,7 +11699,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f17,
0x0f1a, 0x0f34,
0x0f36, 0x0f36,
@@ -15513,10 +11708,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0f49, 0x0f6c,
0x0f7f, 0x0f7f,
0x0f85, 0x0f85,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x0fbe, 0x0fc5,
0x0fc7, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x102c,
0x1031, 0x1031,
0x1038, 0x1038,
@@ -15529,9 +11724,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1087, 0x108c,
0x108e, 0x109c,
0x109e, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -15604,21 +11798,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1b82, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
- 0x1bfc, 0x1c2b,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c2b,
0x1c34, 0x1c35,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -15641,24 +11829,36 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x202f, 0x205f,
0x2070, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -15668,7 +11868,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -15679,24 +11879,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x309b, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa673, 0xa673,
0xa67e, 0xa697,
0xa6a0, 0xa6ef,
0xa6f2, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa824,
@@ -15730,13 +11929,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xaab9, 0xaabd,
0xaac0, 0xaac0,
0xaac2, 0xaac2,
- 0xaadb, 0xaaeb,
- 0xaaee, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabec,
@@ -15744,7 +11937,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -15754,7 +11948,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -15806,8 +12000,6 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -15821,36 +12013,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x11000,
- 0x11002, 0x11037,
- 0x11047, 0x1104d,
- 0x11052, 0x1106f,
0x11082, 0x110b2,
0x110b7, 0x110b8,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11103, 0x11126,
- 0x1112c, 0x1112c,
- 0x11136, 0x11143,
- 0x11182, 0x111b5,
- 0x111bf, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116aa,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d164,
@@ -15884,81 +12054,34 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Grapheme_Base */
/* 'Grapheme_Link': Derived Property */
static const OnigCodePoint CR_Grapheme_Link[] = {
- 33,
+ 26,
0x094d, 0x094d,
0x09cd, 0x09cd,
0x0a4d, 0x0a4d,
@@ -15977,26 +12100,19 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
0x17d2, 0x17d2,
0x1a60, 0x1a60,
0x1b44, 0x1b44,
- 0x1baa, 0x1bab,
- 0x1bf2, 0x1bf3,
- 0x2d7f, 0x2d7f,
+ 0x1baa, 0x1baa,
0xa806, 0xa806,
0xa8c4, 0xa8c4,
0xa953, 0xa953,
0xa9c0, 0xa9c0,
- 0xaaf6, 0xaaf6,
0xabed, 0xabed,
0x10a3f, 0x10a3f,
- 0x11046, 0x11046,
0x110b9, 0x110b9,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b6,
}; /* CR_Grapheme_Link */
/* 'Common': Script */
static const OnigCodePoint CR_Common[] = {
- 157,
+ 159,
0x0000, 0x0040,
0x005b, 0x0060,
0x007b, 0x00a9,
@@ -16005,13 +12121,13 @@ static const OnigCodePoint CR_Common[] = {
0x00d7, 0x00d7,
0x00f7, 0x00f7,
0x02b9, 0x02df,
- 0x02e5, 0x02e9,
- 0x02ec, 0x02ff,
+ 0x02e5, 0x02ff,
0x0374, 0x0374,
0x037e, 0x037e,
0x0385, 0x0385,
0x0387, 0x0387,
0x0589, 0x0589,
+ 0x0600, 0x0603,
0x060c, 0x060c,
0x061b, 0x061b,
0x061f, 0x061f,
@@ -16019,6 +12135,8 @@ static const OnigCodePoint CR_Common[] = {
0x0660, 0x0669,
0x06dd, 0x06dd,
0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0cf1, 0x0cf2,
0x0e3f, 0x0e3f,
0x0fd5, 0x0fd8,
0x10fb, 0x10fb,
@@ -16029,28 +12147,42 @@ static const OnigCodePoint CR_Common[] = {
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x2000, 0x200b,
0x200e, 0x2064,
0x206a, 0x2070,
0x2074, 0x207e,
0x2080, 0x208e,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2125,
0x2127, 0x2129,
0x212c, 0x2131,
0x2133, 0x214d,
0x214f, 0x215f,
0x2189, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ff,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2b4c,
0x2b50, 0x2b59,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2ff0, 0x2ffb,
0x3000, 0x3004,
0x3006, 0x3006,
@@ -16121,44 +12253,30 @@ static const OnigCodePoint CR_Common[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f1ff,
- 0x1f201, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
}; /* CR_Common */
/* 'Latin': Script */
static const OnigCodePoint CR_Latin[] = {
- 30,
+ 28,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -16175,17 +12293,15 @@ static const OnigCodePoint CR_Latin[] = {
0x1e00, 0x1eff,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x212a, 0x212b,
0x2132, 0x2132,
0x214e, 0x214e,
0x2160, 0x2188,
0x2c60, 0x2c7f,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7ff,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa7ff,
0xfb00, 0xfb06,
0xff21, 0xff3a,
0xff41, 0xff5a,
@@ -16231,24 +12347,24 @@ static const OnigCodePoint CR_Greek[] = {
/* 'Cyrillic': Script */
static const OnigCodePoint CR_Cyrillic[] = {
- 7,
+ 8,
0x0400, 0x0484,
- 0x0487, 0x0527,
+ 0x0487, 0x0525,
0x1d2b, 0x1d2b,
0x1d78, 0x1d78,
0x2de0, 0x2dff,
- 0xa640, 0xa697,
- 0xa69f, 0xa69f,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
}; /* CR_Cyrillic */
/* 'Armenian': Script */
static const OnigCodePoint CR_Armenian[] = {
- 6,
+ 5,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x058a, 0x058a,
- 0x058f, 0x058f,
0xfb13, 0xfb17,
}; /* CR_Armenian */
@@ -16268,22 +12384,18 @@ static const OnigCodePoint CR_Hebrew[] = {
/* 'Arabic': Script */
static const OnigCodePoint CR_Arabic[] = {
- 56,
- 0x0600, 0x0604,
+ 18,
0x0606, 0x060b,
0x060d, 0x061a,
0x061e, 0x061e,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x0656, 0x065e,
0x066a, 0x066f,
0x0671, 0x06dc,
0x06de, 0x06ff,
0x0750, 0x077f,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0xfb50, 0xfbc1,
+ 0xfb50, 0xfbb1,
0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -16291,40 +12403,6 @@ static const OnigCodePoint CR_Arabic[] = {
0xfe70, 0xfe74,
0xfe76, 0xfefc,
0x10e60, 0x10e7e,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Arabic */
/* 'Syriac': Script */
@@ -16343,10 +12421,14 @@ static const OnigCodePoint CR_Thaana[] = {
/* 'Devanagari': Script */
static const OnigCodePoint CR_Devanagari[] = {
- 5,
- 0x0900, 0x0950,
- 0x0953, 0x0963,
- 0x0966, 0x0977,
+ 9,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0950,
+ 0x0953, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0xa8e0, 0xa8fb,
}; /* CR_Devanagari */
@@ -16393,7 +12475,7 @@ static const OnigCodePoint CR_Gurmukhi[] = {
/* 'Gujarati': Script */
static const OnigCodePoint CR_Gujarati[] = {
- 13,
+ 14,
0x0a81, 0x0a83,
0x0a85, 0x0a8d,
0x0a8f, 0x0a91,
@@ -16406,7 +12488,8 @@ static const OnigCodePoint CR_Gujarati[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
}; /* CR_Gujarati */
/* 'Oriya': Script */
@@ -16425,7 +12508,7 @@ static const OnigCodePoint CR_Oriya[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
}; /* CR_Oriya */
/* 'Tamil': Script */
@@ -16470,7 +12553,7 @@ static const OnigCodePoint CR_Telugu[] = {
/* 'Kannada': Script */
static const OnigCodePoint CR_Kannada[] = {
- 14,
+ 13,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -16484,19 +12567,19 @@ static const OnigCodePoint CR_Kannada[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
}; /* CR_Kannada */
/* 'Malayalam': Script */
static const OnigCodePoint CR_Malayalam[] = {
- 11,
+ 12,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -16546,7 +12629,7 @@ static const OnigCodePoint CR_Lao[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
}; /* CR_Lao */
/* 'Tibetan': Script */
@@ -16554,11 +12637,11 @@ static const OnigCodePoint CR_Tibetan[] = {
7,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
0x0fce, 0x0fd4,
- 0x0fd9, 0x0fda,
}; /* CR_Tibetan */
/* 'Myanmar': Script */
@@ -16570,22 +12653,17 @@ static const OnigCodePoint CR_Myanmar[] = {
/* 'Georgian': Script */
static const OnigCodePoint CR_Georgian[] = {
- 8,
+ 4,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x10ff,
+ 0x10fc, 0x10fc,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
}; /* CR_Georgian */
/* 'Hangul': Script */
static const OnigCodePoint CR_Hangul[] = {
- 14,
+ 13,
0x1100, 0x11ff,
- 0x302e, 0x302f,
0x3131, 0x318e,
0x3200, 0x321e,
0x3260, 0x327e,
@@ -16602,7 +12680,7 @@ static const OnigCodePoint CR_Hangul[] = {
/* 'Ethiopic': Script */
static const OnigCodePoint CR_Ethiopic[] = {
- 32,
+ 27,
0x1200, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -16619,7 +12697,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -16630,11 +12708,6 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
}; /* CR_Ethiopic */
/* 'Cherokee': Script */
@@ -16685,16 +12758,15 @@ static const OnigCodePoint CR_Mongolian[] = {
/* 'Hiragana': Script */
static const OnigCodePoint CR_Hiragana[] = {
- 4,
+ 3,
0x3041, 0x3096,
0x309d, 0x309f,
- 0x1b001, 0x1b001,
0x1f200, 0x1f200,
}; /* CR_Hiragana */
/* 'Katakana': Script */
static const OnigCodePoint CR_Katakana[] = {
- 8,
+ 7,
0x30a1, 0x30fa,
0x30fd, 0x30ff,
0x31f0, 0x31ff,
@@ -16702,15 +12774,13 @@ static const OnigCodePoint CR_Katakana[] = {
0x3300, 0x3357,
0xff66, 0xff6f,
0xff71, 0xff9d,
- 0x1b000, 0x1b000,
}; /* CR_Katakana */
/* 'Bopomofo': Script */
static const OnigCodePoint CR_Bopomofo[] = {
- 3,
- 0x02ea, 0x02eb,
+ 2,
0x3105, 0x312d,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
}; /* CR_Bopomofo */
/* 'Han': Script */
@@ -16724,12 +12794,12 @@ static const OnigCodePoint CR_Han[] = {
0x3021, 0x3029,
0x3038, 0x303b,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Han */
@@ -16761,23 +12831,21 @@ static const OnigCodePoint CR_Deseret[] = {
/* 'Inherited': Script */
static const OnigCodePoint CR_Inherited[] = {
- 25,
+ 23,
0x0300, 0x036f,
0x0485, 0x0486,
0x064b, 0x0655,
- 0x065f, 0x065f,
0x0670, 0x0670,
0x0951, 0x0952,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xfe00, 0xfe0f,
0xfe20, 0xfe26,
@@ -16893,7 +12961,7 @@ static const OnigCodePoint CR_Buginese[] = {
static const OnigCodePoint CR_Coptic[] = {
3,
0x03e2, 0x03ef,
- 0x2c80, 0x2cf3,
+ 0x2c80, 0x2cf1,
0x2cf9, 0x2cff,
}; /* CR_Coptic */
@@ -16915,10 +12983,9 @@ static const OnigCodePoint CR_Glagolitic[] = {
/* 'Tifinagh': Script */
static const OnigCodePoint CR_Tifinagh[] = {
- 3,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d7f,
+ 2,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
}; /* CR_Tifinagh */
/* 'Syloti_Nagri': Script */
@@ -16984,8 +13051,8 @@ static const OnigCodePoint CR_Nko[] = {
/* 'Sundanese': Script */
static const OnigCodePoint CR_Sundanese[] = {
2,
- 0x1b80, 0x1bbf,
- 0x1cc0, 0x1cc7,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
}; /* CR_Sundanese */
/* 'Lepcha': Script */
@@ -17101,9 +13168,8 @@ static const OnigCodePoint CR_Lisu[] = {
/* 'Bamum': Script */
static const OnigCodePoint CR_Bamum[] = {
- 2,
+ 1,
0xa6a0, 0xa6f7,
- 0x16800, 0x16a38,
}; /* CR_Bamum */
/* 'Javanese': Script */
@@ -17116,8 +13182,7 @@ static const OnigCodePoint CR_Javanese[] = {
/* 'Meetei_Mayek': Script */
static const OnigCodePoint CR_Meetei_Mayek[] = {
- 3,
- 0xaae0, 0xaaf6,
+ 2,
0xabc0, 0xabed,
0xabf0, 0xabf9,
}; /* CR_Meetei_Mayek */
@@ -17161,78 +13226,21 @@ static const OnigCodePoint CR_Kaithi[] = {
0x11080, 0x110c1,
}; /* CR_Kaithi */
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
- 2,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
- 2,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
- 2,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
- 2,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
- 2,
- 0x109a0, 0x109b7,
- 0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
- 1,
- 0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
- 3,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
- 2,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
- 2,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
- 2,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
-}; /* CR_Takri */
-
/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
+static const OnigCodePoint CR_White_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_White_Space */
/* 'Bidi_Control': Binary Property */
static const OnigCodePoint CR_Bidi_Control[] = {
@@ -17249,7 +13257,7 @@ static const OnigCodePoint CR_Join_Control[] = {
/* 'Dash': Binary Property */
static const OnigCodePoint CR_Dash[] = {
- 20,
+ 19,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -17262,7 +13270,6 @@ static const OnigCodePoint CR_Dash[] = {
0x2212, 0x2212,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -17306,7 +13313,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
/* 'Terminal_Punctuation': Binary Property */
static const OnigCodePoint CR_Terminal_Punctuation[] = {
- 70,
+ 65,
0x0021, 0x0021,
0x002c, 0x002c,
0x002e, 0x002e,
@@ -17324,7 +13331,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x070c, 0x070c,
0x07f8, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0e5a, 0x0e5b,
0x0f08, 0x0f08,
@@ -17356,7 +13362,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0xa9c7, 0xa9c9,
0xaa5d, 0xaa5f,
0xaadf, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe50, 0xfe52,
0xfe54, 0xfe57,
@@ -17372,16 +13377,13 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x10857, 0x10857,
0x1091f, 0x1091f,
0x10b3a, 0x10b3f,
- 0x11047, 0x1104d,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
0x12470, 0x12473,
}; /* CR_Terminal_Punctuation */
/* 'Other_Math': Binary Property */
static const OnigCodePoint CR_Other_Math[] = {
- 133,
+ 99,
0x005e, 0x005e,
0x03d0, 0x03d2,
0x03d5, 0x03d5,
@@ -17398,7 +13400,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
0x2119, 0x211d,
@@ -17482,39 +13483,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
}; /* CR_Other_Math */
/* 'Hex_Digit': Binary Property */
@@ -17529,11 +13497,16 @@ static const OnigCodePoint CR_Hex_Digit[] = {
}; /* CR_Hex_Digit */
/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+ 3,
+ 0x0030, 0x0039,
+ 0x0041, 0x0046,
+ 0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
/* 'Other_Alphabetic': Binary Property */
static const OnigCodePoint CR_Other_Alphabetic[] = {
- 158,
+ 141,
0x0345, 0x0345,
0x05b0, 0x05bd,
0x05bf, 0x05bf,
@@ -17542,7 +13515,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x05c7, 0x05c7,
0x0610, 0x061a,
0x064b, 0x0657,
- 0x0659, 0x065f,
+ 0x0659, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06e1, 0x06e4,
@@ -17555,13 +13528,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082c,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093b,
0x093e, 0x094c,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
+ 0x094e, 0x094e,
+ 0x0955, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09be, 0x09c4,
@@ -17623,7 +13593,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x0ebb, 0x0ebc,
0x0ecd, 0x0ecd,
0x0f71, 0x0f81,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x102b, 0x1036,
0x1038, 0x1038,
@@ -17653,21 +13623,17 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x1b35, 0x1b43,
0x1b80, 0x1b82,
0x1ba1, 0x1ba9,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1bf1,
0x1c24, 0x1c35,
- 0x1cf2, 0x1cf3,
+ 0x1cf2, 0x1cf2,
0x24b6, 0x24e9,
0x2de0, 0x2dff,
- 0xa674, 0xa67b,
- 0xa69f, 0xa69f,
0xa823, 0xa827,
0xa880, 0xa881,
0xa8b4, 0xa8c3,
0xa926, 0xa92a,
0xa947, 0xa952,
0xa980, 0xa983,
- 0xa9b4, 0xa9bf,
+ 0xa9b3, 0xa9bf,
0xaa29, 0xaa36,
0xaa43, 0xaa43,
0xaa4c, 0xaa4d,
@@ -17675,23 +13641,13 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0xaab2, 0xaab4,
0xaab7, 0xaab8,
0xaabe, 0xaabe,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabea,
0xfb1e, 0xfb1e,
0x10a01, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a0f,
- 0x11000, 0x11002,
- 0x11038, 0x11045,
0x11082, 0x11082,
0x110b0, 0x110b8,
- 0x11100, 0x11102,
- 0x11127, 0x11132,
- 0x11180, 0x11182,
- 0x111b3, 0x111bf,
- 0x116ab, 0x116b5,
- 0x16f51, 0x16f7e,
}; /* CR_Other_Alphabetic */
/* 'Ideographic': Binary Property */
@@ -17701,18 +13657,18 @@ static const OnigCodePoint CR_Ideographic[] = {
0x3021, 0x3029,
0x3038, 0x303a,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Ideographic */
/* 'Diacritic': Binary Property */
static const OnigCodePoint CR_Diacritic[] = {
- 125,
+ 117,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -17741,7 +13697,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0x07a6, 0x07b0,
0x07eb, 0x07f5,
0x0818, 0x0819,
- 0x08e4, 0x08fe,
0x093c, 0x093c,
0x094d, 0x094d,
0x0951, 0x0954,
@@ -17784,12 +13739,11 @@ static const OnigCodePoint CR_Diacritic[] = {
0x1b34, 0x1b34,
0x1b44, 0x1b44,
0x1b6b, 0x1b73,
- 0x1baa, 0x1bab,
+ 0x1baa, 0x1baa,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
0x1cd0, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1d2c, 0x1d6a,
0x1dc4, 0x1dcf,
0x1dfd, 0x1dff,
@@ -17810,7 +13764,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa6f0, 0xa6f1,
0xa717, 0xa721,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa8c4, 0xa8c4,
0xa8e0, 0xa8f1,
0xa92b, 0xa92e,
@@ -17819,7 +13772,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa9c0, 0xa9c0,
0xaa7b, 0xaa7b,
0xaabf, 0xaac2,
- 0xaaf6, 0xaaf6,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
0xfe20, 0xfe26,
@@ -17829,10 +13781,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xff9e, 0xff9f,
0xffe3, 0xffe3,
0x110b9, 0x110ba,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -17842,14 +13790,13 @@ static const OnigCodePoint CR_Diacritic[] = {
/* 'Extender': Binary Property */
static const OnigCodePoint CR_Extender[] = {
- 22,
+ 20,
0x00b7, 0x00b7,
0x02d0, 0x02d1,
0x0640, 0x0640,
0x07fa, 0x07fa,
0x0e46, 0x0e46,
0x0ec6, 0x0ec6,
- 0x180a, 0x180a,
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c36, 0x1c36,
@@ -17863,31 +13810,25 @@ static const OnigCodePoint CR_Extender[] = {
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
}; /* CR_Extender */
/* 'Other_Lowercase': Binary Property */
static const OnigCodePoint CR_Other_Lowercase[] = {
- 18,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 13,
0x02b0, 0x02b8,
0x02c0, 0x02c1,
0x02e0, 0x02e4,
0x0345, 0x0345,
0x037a, 0x037a,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2170, 0x217f,
0x24d0, 0x24e9,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0xa770, 0xa770,
- 0xa7f8, 0xa7f9,
}; /* CR_Other_Lowercase */
/* 'Other_Uppercase': Binary Property */
@@ -17922,7 +13863,7 @@ static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
/* 'Other_Grapheme_Extend': Binary Property */
static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
- 17,
+ 16,
0x09be, 0x09be,
0x09d7, 0x09d7,
0x0b3e, 0x0b3e,
@@ -17936,7 +13877,6 @@ static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
0x0dcf, 0x0dcf,
0x0ddf, 0x0ddf,
0x200c, 0x200d,
- 0x302e, 0x302f,
0xff9e, 0xff9f,
0x1d165, 0x1d165,
0x1d16e, 0x1d172,
@@ -17965,9 +13905,9 @@ static const OnigCodePoint CR_Radical[] = {
/* 'Unified_Ideograph': Binary Property */
static const OnigCodePoint CR_Unified_Ideograph[] = {
- 12,
+ 11,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xfa0e, 0xfa0f,
0xfa11, 0xfa11,
0xfa13, 0xfa14,
@@ -17977,15 +13917,13 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
0xfa27, 0xfa29,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
}; /* CR_Unified_Ideograph */
/* 'Other_Default_Ignorable_Code_Point': Binary Property */
static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
- 11,
+ 10,
0x034f, 0x034f,
0x115f, 0x1160,
- 0x17b4, 0x17b5,
0x2065, 0x2069,
0x3164, 0x3164,
0xffa0, 0xffa0,
@@ -17998,9 +13936,8 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
/* 'Deprecated': Binary Property */
static const OnigCodePoint CR_Deprecated[] = {
- 9,
+ 8,
0x0149, 0x0149,
- 0x0673, 0x0673,
0x0f77, 0x0f77,
0x0f79, 0x0f79,
0x17a3, 0x17a4,
@@ -18066,16 +14003,15 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
/* 'Other_ID_Continue': Binary Property */
static const OnigCodePoint CR_Other_ID_Continue[] = {
- 4,
+ 3,
0x00b7, 0x00b7,
0x0387, 0x0387,
0x1369, 0x1371,
- 0x19da, 0x19da,
}; /* CR_Other_ID_Continue */
/* 'STerm': Binary Property */
static const OnigCodePoint CR_STerm[] = {
- 50,
+ 43,
0x0021, 0x0021,
0x002e, 0x002e,
0x003f, 0x003f,
@@ -18091,11 +14027,9 @@ static const OnigCodePoint CR_STerm[] = {
0x1362, 0x1362,
0x1367, 0x1368,
0x166e, 0x166e,
- 0x1735, 0x1736,
0x1803, 0x1803,
0x1809, 0x1809,
0x1944, 0x1945,
- 0x1aa8, 0x1aab,
0x1b5a, 0x1b5b,
0x1b5e, 0x1b5f,
0x1c3b, 0x1c3c,
@@ -18113,7 +14047,6 @@ static const OnigCodePoint CR_STerm[] = {
0xa92f, 0xa92f,
0xa9c8, 0xa9c9,
0xaa5d, 0xaa5f,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe52, 0xfe52,
0xfe56, 0xfe57,
@@ -18121,11 +14054,7 @@ static const OnigCodePoint CR_STerm[] = {
0xff0e, 0xff0e,
0xff1f, 0xff1f,
0xff61, 0xff61,
- 0x10a56, 0x10a57,
- 0x11047, 0x11048,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
}; /* CR_STerm */
/* 'Variation_Selector': Binary Property */
@@ -18178,3965 +14107,48 @@ static const OnigCodePoint CR_Pattern_Syntax[] = {
0xfd3e, 0xfd3f,
0xfe45, 0xfe46,
}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
+#endif /* USE_UNICODE_PROPERTIES */
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
- 537,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0605, 0x0605,
- 0x061c, 0x061d,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
- 288,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x05b0, 0x05b9,
- 0x05bb, 0x05c3,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9a,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20aa,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xe000, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ab,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ac,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
- 369,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f3,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
- 402,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f5,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+ 1,
+ 0x000a, 0x000a,
+}; /* CR_NEWLINE */
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
- 397,
- 0x0000, 0x0220,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034f,
- 0x0360, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03f6,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b1,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2052,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213a,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23ce,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24fe,
- 0x2500, 0x2613,
- 0x2616, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2689,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2aff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321c,
- 0x3220, 0x3243,
- 0x3251, 0x327b,
- 0x327f, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfc,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe46,
- 0xfe49, 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, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
- 412,
- 0x0000, 0x0236,
- 0x0250, 0x0357,
- 0x035d, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03fb,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060c, 0x0615,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0658,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x19e0, 0x19ff,
- 0x1d00, 0x1d6b,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2054,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213b,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23d0,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2691,
- 0x26a0, 0x26a1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b0d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x327d,
- 0x327f, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d300, 0x1d356,
- 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, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
+/* '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 */
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
- 430,
- 0x0000, 0x0241,
- 0x0250, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05b9,
- 0x05bb, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x097d, 0x097d,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1d00, 0x1dc3,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20eb,
- 0x2100, 0x214c,
- 0x2153, 0x2183,
- 0x2190, 0x23db,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c6,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b13,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa800, 0xa82b,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 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, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
- 440,
- 0x0000, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x0513,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 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,
- 0x1d00, 0x1dca,
- 0x1dfe, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20ef,
- 0x2100, 0x214e,
- 0x2153, 0x2184,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b2,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b1a,
- 0x2b20, 0x2b23,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6c,
- 0x2c74, 0x2c77,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa71a,
- 0xa720, 0xa721,
- 0xa800, 0xa82b,
- 0xa840, 0xa877,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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, 0x1091f,
- 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,
- 0x1d12a, 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,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
- 455,
- 0x0000, 0x0377,
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+ 490,
+ 0x0021, 0x007e,
+ 0x00a1, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0523,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
@@ -22152,11 +14164,13 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
+ 0x0800, 0x082d,
+ 0x0830, 0x083e,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
0x0958, 0x0972,
- 0x097b, 0x097f,
+ 0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -22170,7 +14184,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fa,
+ 0x09e6, 0x09fb,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -22308,14 +14322,10 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
+ 0x0fce, 0x0fd8,
+ 0x1000, 0x10c5,
0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -22334,8 +14344,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
+ 0x1400, 0x167f,
+ 0x1681, 0x169c,
0x16a0, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
@@ -22347,21 +14357,26 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1780, 0x17dd,
0x17e0, 0x17e9,
0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x1800, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
0x1940, 0x1940,
0x1944, 0x196d,
0x1970, 0x1974,
- 0x1980, 0x19a9,
+ 0x1980, 0x19ab,
0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
+ 0x19d0, 0x19da,
0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
+ 0x1a1e, 0x1a5e,
+ 0x1a60, 0x1a7c,
+ 0x1a7f, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
0x1b80, 0x1baa,
@@ -22369,8 +14384,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -22386,40 +14402,40 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x200b, 0x2027,
+ 0x202a, 0x202e,
+ 0x2030, 0x205e,
+ 0x2060, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
- 0x20a0, 0x20b5,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
+ 0x2100, 0x2189,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
0x2701, 0x2704,
0x2706, 0x2709,
0x270c, 0x2727,
0x2729, 0x274b,
0x274d, 0x274d,
0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
+ 0x2756, 0x275e,
0x2761, 0x2794,
0x2798, 0x27af,
0x27b1, 0x27be,
0x27c0, 0x27ca,
0x27cc, 0x27cc,
0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
+ 0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
@@ -22432,12 +14448,12 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x3001, 0x303f,
0x3041, 0x3096,
0x3099, 0x30ff,
0x3105, 0x312d,
@@ -22445,30 +14461,41 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
+ 0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fc3,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
- 0xa500, 0xa62b,
+ 0xa4d0, 0xa62b,
0xa640, 0xa65f,
0xa662, 0xa673,
0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
0xa700, 0xa78c,
0xa7fb, 0xa82b,
+ 0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
0xa8ce, 0xa8d9,
+ 0xa8e0, 0xa8fb,
0xa900, 0xa953,
- 0xa95f, 0xa95f,
+ 0xa95f, 0xa97c,
+ 0xa980, 0xa9cd,
+ 0xa9cf, 0xa9d9,
+ 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
+ 0xaa5c, 0xaa7b,
+ 0xaa80, 0xaac2,
+ 0xaadb, 0xaadf,
+ 0xabc0, 0xabed,
+ 0xabf0, 0xabf9,
0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xe000, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -22481,7 +14508,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22497,7 +14524,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -22524,8 +14552,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1080a, 0x10835,
0x10837, 0x10838,
0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
+ 0x1083f, 0x10855,
+ 0x10857, 0x1085f,
+ 0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
0x10a00, 0x10a03,
@@ -22536,9 +14565,18 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x10a38, 0x10a3a,
0x10a3f, 0x10a47,
0x10a50, 0x10a58,
+ 0x10a60, 0x10a7f,
+ 0x10b00, 0x10b35,
+ 0x10b39, 0x10b55,
+ 0x10b58, 0x10b72,
+ 0x10b78, 0x10b7f,
+ 0x10c00, 0x10c48,
+ 0x10e60, 0x10e7e,
+ 0x11080, 0x110c1,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
+ 0x13000, 0x1342e,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -22568,30 +14606,42 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1fffe, 0x2a6d6,
+ 0x1f100, 0x1f10a,
+ 0x1f110, 0x1f12e,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
+ 0x1f240, 0x1f248,
+ 0x20000, 0x2a6d6,
+ 0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Graph */
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
- 495,
- 0x0000, 0x0377,
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+ 487,
+ 0x0020, 0x007e,
+ 0x00a0, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
@@ -22849,7 +14899,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x2000, 0x2027,
+ 0x202a, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
@@ -22938,7 +14989,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xe000, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
@@ -22952,7 +15003,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22968,7 +15019,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -23067,54 +15119,84 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1f200, 0x1f200,
0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Print */
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
- 511,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+ 506,
+ 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, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x0483, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
+ 0x0591, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06de, 0x06e8,
+ 0x06ea, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x074a,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
+ 0x07c0, 0x07f5,
+ 0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23129,7 +15211,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23159,7 +15241,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23173,7 +15254,8 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23189,7 +15271,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0bca, 0x0bcd,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23203,7 +15285,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -23217,18 +15298,18 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 0x0d66, 0x0d6f,
+ 0x0d7a, 0x0d7f,
0x0d82, 0x0d83,
0x0d85, 0x0d96,
0x0d9a, 0x0db1,
@@ -23239,9 +15320,10 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0dcf, 0x0dd4,
0x0dd6, 0x0dd6,
0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e4e,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23260,14 +15342,24 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
+ 0x0f00, 0x0f00,
+ 0x0f18, 0x0f19,
+ 0x0f20, 0x0f29,
+ 0x0f35, 0x0f35,
+ 0x0f37, 0x0f37,
+ 0x0f39, 0x0f39,
+ 0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f84,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10d0, 0x10fc,
+ 0x0fc6, 0x0fc6,
+ 0x1000, 0x1049,
+ 0x1050, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -23284,22 +15376,27 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x1720, 0x1734,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dd,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x180b, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
@@ -23307,29 +15404,29 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
0x1a60, 0x1a7c,
0x1a7f, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
+ 0x1aa7, 0x1aa7,
0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
+ 0x1b50, 0x1b59,
+ 0x1b6b, 0x1b73,
0x1b80, 0x1baa,
0x1bae, 0x1bb9,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cd0, 0x1cf2,
+ 0x1c00, 0x1c37,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1cd0, 0x1cd2,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23339,34 +15436,44 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x1ff6, 0x1ffc,
+ 0x203f, 0x2040,
+ 0x2054, 0x2054,
+ 0x2071, 0x2071,
+ 0x207f, 0x207f,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27ce, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf1,
- 0x2cf9, 0x2d25,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cf1,
+ 0x2d00, 0x2d25,
0x2d30, 0x2d65,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23375,108 +15482,107 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e31,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x302f,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x3099, 0x309a,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcb,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa673,
- 0xa67c, 0xa697,
- 0xa6a0, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa791,
- 0xa7a0, 0xa7a9,
- 0xa7fa, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa672,
+ 0xa67c, 0xa67d,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6f1,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
+ 0xa840, 0xa873,
0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa8d0, 0xa8d9,
+ 0xa8e0, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92d,
+ 0xa930, 0xa953,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9c0,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaadf,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xf900, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
+ 0xfdf0, 0xfdfb,
+ 0xfe00, 0xfe0f,
0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfe33, 0xfe34,
+ 0xfe4d, 0xfe4f,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff3f, 0xff3f,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
+ 0x101fd, 0x101fd,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -23485,40 +15591,30 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a3f, 0x10a3f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
+ 0x11080, 0x110ba,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
+ 0x1d165, 0x1d169,
+ 0x1d16d, 0x1d172,
+ 0x1d17b, 0x1d182,
+ 0x1d185, 0x1d18b,
+ 0x1d1aa, 0x1d1ad,
+ 0x1d242, 0x1d244,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -23538,103 +15634,85 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f169,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f5ff,
- 0x1f601, 0x1f610,
- 0x1f612, 0x1f614,
- 0x1f616, 0x1f616,
- 0x1f618, 0x1f618,
- 0x1f61a, 0x1f61a,
- 0x1f61c, 0x1f61e,
- 0x1f620, 0x1f625,
- 0x1f628, 0x1f62b,
- 0x1f62d, 0x1f62d,
- 0x1f630, 0x1f633,
- 0x1f635, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
+}; /* CR_Word */
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
- 549,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+ 497,
+ 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,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x07c0, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23643,13 +15721,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x09aa, 0x09b0,
0x09b2, 0x09b2,
0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
+ 0x09bd, 0x09c4,
0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
+ 0x09cb, 0x09cc,
+ 0x09ce, 0x09ce,
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23658,10 +15737,9 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0a32, 0x0a33,
0x0a35, 0x0a36,
0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
0x0a3e, 0x0a42,
0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
+ 0x0a4b, 0x0a4c,
0x0a51, 0x0a51,
0x0a59, 0x0a5c,
0x0a5e, 0x0a5e,
@@ -23673,12 +15751,12 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0aaa, 0x0ab0,
0x0ab2, 0x0ab3,
0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
+ 0x0abd, 0x0ac5,
0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
+ 0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23686,13 +15764,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0b2a, 0x0b30,
0x0b32, 0x0b33,
0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
+ 0x0b3d, 0x0b44,
0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
+ 0x0b4b, 0x0b4c,
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23705,10 +15784,10 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0bae, 0x0bb9,
0x0bbe, 0x0bc2,
0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
+ 0x0bca, 0x0bcc,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23717,50 +15796,50 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0c35, 0x0c39,
0x0c3d, 0x0c44,
0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
+ 0x0c4a, 0x0c4c,
0x0c55, 0x0c56,
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
0x0c92, 0x0ca8,
0x0caa, 0x0cb3,
0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
+ 0x0cbd, 0x0cc4,
0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
+ 0x0cca, 0x0ccc,
0x0cd5, 0x0cd6,
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4c,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 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, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23776,19 +15855,30 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0ebb, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
+ 0x0ecd, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f47,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f20, 0x0f29,
+ 0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x1049,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x1090, 0x1099,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -23804,51 +15894,57 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1930, 0x1938,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1a80, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b50, 0x1b59,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c35,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 0x1d00, 0x1dbf,
+ 0x1e00, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23858,34 +15954,41 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 0x2d00, 0x2d25,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23894,106 +15997,103 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8d0, 0xa8d9,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfdf0, 0xfdfb,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -24002,53 +16102,22 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
+ 0x11082, 0x110b8,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -24068,1430 +16137,28 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
- 1,
- 0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
- 1,
- 0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
- 1,
- 0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
- 1,
- 0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
- 1,
- 0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
- 1,
- 0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
- 1,
- 0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
- 1,
- 0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
- 1,
- 0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
- 1,
- 0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
- 1,
- 0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
- 1,
- 0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
- 1,
- 0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
- 1,
- 0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
- 1,
- 0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
- 1,
- 0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
- 1,
- 0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
- 1,
- 0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
- 1,
- 0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
- 1,
- 0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
- 1,
- 0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
- 1,
- 0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
- 1,
- 0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
- 1,
- 0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
- 1,
- 0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
- 1,
- 0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
- 1,
- 0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
- 1,
- 0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
- 1,
- 0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
- 1,
- 0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
- 1,
- 0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
- 1,
- 0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
- 1,
- 0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
- 1,
- 0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
- 1,
- 0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
- 1,
- 0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
- 1,
- 0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
- 1,
- 0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
- 1,
- 0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
- 1,
- 0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
- 1,
- 0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
- 1,
- 0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
- 1,
- 0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
- 1,
- 0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
- 1,
- 0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
- 1,
- 0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
- 1,
- 0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
- 1,
- 0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
- 1,
- 0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
- 1,
- 0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
- 1,
- 0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
- 1,
- 0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
- 1,
- 0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
- 1,
- 0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
- 1,
- 0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
- 1,
- 0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
- 1,
- 0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
- 1,
- 0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
- 1,
- 0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
- 1,
- 0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
- 1,
- 0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
- 1,
- 0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
- 1,
- 0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
- 1,
- 0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
- 1,
- 0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
- 1,
- 0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
- 1,
- 0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
- 1,
- 0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
- 1,
- 0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
- 1,
- 0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
- 1,
- 0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
- 1,
- 0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
- 1,
- 0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
- 1,
- 0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
- 1,
- 0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
- 1,
- 0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
- 1,
- 0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
- 1,
- 0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
- 1,
- 0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
- 1,
- 0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
- 1,
- 0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
- 1,
- 0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
- 1,
- 0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
- 1,
- 0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
- 1,
- 0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
- 1,
- 0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
- 1,
- 0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
- 1,
- 0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
- 1,
- 0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
- 1,
- 0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
- 1,
- 0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
- 1,
- 0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
- 1,
- 0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
- 1,
- 0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
- 1,
- 0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
- 1,
- 0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
- 1,
- 0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
- 1,
- 0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
- 1,
- 0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
- 1,
- 0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
- 1,
- 0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
- 1,
- 0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
- 1,
- 0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
- 1,
- 0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
- 1,
- 0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
- 1,
- 0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
- 1,
- 0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
- 1,
- 0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
- 1,
- 0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
- 1,
- 0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
- 1,
- 0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
- 1,
- 0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
- 1,
- 0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
- 1,
- 0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
- 1,
- 0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
- 1,
- 0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
- 1,
- 0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
- 1,
- 0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
- 1,
- 0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
- 1,
- 0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
- 1,
- 0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
- 1,
- 0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
- 1,
- 0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
- 1,
- 0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-#define CR_In_Kayah_Li CR_Kayah_Li
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
- 1,
- 0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
- 1,
- 0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
- 1,
- 0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
- 1,
- 0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
- 1,
- 0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
- 1,
- 0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
- 1,
- 0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
- 1,
- 0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
- 1,
- 0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
- 1,
- 0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
- 1,
- 0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
- 1,
- 0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
- 1,
- 0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
- 1,
- 0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
- 1,
- 0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
- 1,
- 0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
- 1,
- 0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
- 1,
- 0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
- 1,
- 0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
- 1,
- 0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
- 1,
- 0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
- 1,
- 0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
- 1,
- 0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
- 1,
- 0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
- 1,
- 0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
- 1,
- 0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
- 1,
- 0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
- 1,
- 0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
- 1,
- 0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
- 1,
- 0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
- 1,
- 0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
- 1,
- 0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
- 1,
- 0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
- 1,
- 0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
- 1,
- 0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
- 1,
- 0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
- 1,
- 0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
- 1,
- 0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
- 1,
- 0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
- 1,
- 0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
- 1,
- 0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
- 1,
- 0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
- 1,
- 0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
- 1,
- 0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
- 1,
- 0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
- 1,
- 0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
- 1,
- 0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
- 1,
- 0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
- 1,
- 0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
- 1,
- 0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
- 1,
- 0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
- 1,
- 0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
- 1,
- 0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
- 1,
- 0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
- 1,
- 0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
- 1,
- 0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
- 1,
- 0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
- 1,
- 0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
- 1,
- 0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
- 1,
- 0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
- 1,
- 0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
- 1,
- 0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
- 1,
- 0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
- 1,
- 0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
- 1,
- 0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
- 1,
- 0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
- 1,
- 0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
- 1,
- 0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
- 1,
- 0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
- 1,
- 0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
- 1,
- 0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
- 1,
- 0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
- 1,
- 0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
- 1,
- 0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
- 1,
- 0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
- 1,
- 0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Transport_And_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
- 1,
- 0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_And_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
- 1,
- 0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
- 1,
- 0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
- 1,
- 0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
- 1,
- 0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
- 1,
- 0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
- 1,
- 0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
- 1,
- 0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
- 1,
- 0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
+}; /* CR_Alnum */
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
1,
- 0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
- 36,
- 0x0860, 0x089f,
- 0x1ab0, 0x1aff,
- 0x1c80, 0x1cbf,
- 0x2fe0, 0x2fef,
- 0xa9e0, 0xa9ff,
- 0xab30, 0xabbf,
- 0x10200, 0x1027f,
- 0x102e0, 0x102ff,
- 0x10350, 0x1037f,
- 0x103e0, 0x103ff,
- 0x104b0, 0x107ff,
- 0x10860, 0x108ff,
- 0x10940, 0x1097f,
- 0x10a80, 0x10aff,
- 0x10b80, 0x10bff,
- 0x10c50, 0x10e5f,
- 0x10e80, 0x10fff,
- 0x11150, 0x1117f,
- 0x111e0, 0x1167f,
- 0x116d0, 0x11fff,
- 0x12480, 0x12fff,
- 0x13430, 0x167ff,
- 0x16a40, 0x16eff,
- 0x16fa0, 0x1afff,
- 0x1b100, 0x1cfff,
- 0x1d250, 0x1d2ff,
- 0x1d380, 0x1d3ff,
- 0x1d800, 0x1edff,
- 0x1ef00, 0x1efff,
- 0x1f650, 0x1f67f,
- 0x1f780, 0x1ffff,
- 0x2a6e0, 0x2a6ff,
- 0x2b820, 0x2f7ff,
- 0x2fa20, 0xdffff,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
+ 0x0000, 0x007f,
+}; /* CR_ASCII */
static const OnigCodePoint* const CodeRanges[] = {
CR_NEWLINE,
@@ -25510,6 +16177,7 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Alnum,
CR_ASCII,
#ifdef USE_UNICODE_PROPERTIES
+#ifdef USE_UNICODE_PROPERTIES
CR_Any,
CR_Assigned,
CR_C,
@@ -25519,7 +16187,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Co,
CR_Cs,
CR_L,
- CR_LC,
CR_Ll,
CR_Lm,
CR_Lo,
@@ -25661,16 +16328,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Inscriptional_Pahlavi,
CR_Old_Turkic,
CR_Kaithi,
- CR_Batak,
- CR_Brahmi,
- CR_Mandaic,
- CR_Chakma,
- CR_Meroitic_Cursive,
- CR_Meroitic_Hieroglyphs,
- CR_Miao,
- CR_Sharada,
- CR_Sora_Sompeng,
- CR_Takri,
CR_White_Space,
CR_Bidi_Control,
CR_Join_Control,
@@ -25703,241 +16360,7 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Variation_Selector,
CR_Pattern_White_Space,
CR_Pattern_Syntax,
- CR_Unknown,
- CR_Age_1_1,
- CR_Age_2_0,
- CR_Age_2_1,
- CR_Age_3_0,
- CR_Age_3_1,
- CR_Age_3_2,
- CR_Age_4_0,
- CR_Age_4_1,
- CR_Age_5_0,
- CR_Age_5_1,
- CR_Age_5_2,
- CR_Age_6_0,
- CR_Age_6_1,
- CR_In_Basic_Latin,
- CR_In_Latin_1_Supplement,
- CR_In_Latin_Extended_A,
- CR_In_Latin_Extended_B,
- CR_In_IPA_Extensions,
- CR_In_Spacing_Modifier_Letters,
- CR_In_Combining_Diacritical_Marks,
- CR_In_Greek_and_Coptic,
- CR_In_Cyrillic,
- CR_In_Cyrillic_Supplement,
- CR_In_Armenian,
- CR_In_Hebrew,
- CR_In_Arabic,
- CR_In_Syriac,
- CR_In_Arabic_Supplement,
- CR_In_Thaana,
- CR_In_NKo,
- CR_In_Samaritan,
- CR_In_Mandaic,
- CR_In_Arabic_Extended_A,
- CR_In_Devanagari,
- CR_In_Bengali,
- CR_In_Gurmukhi,
- CR_In_Gujarati,
- CR_In_Oriya,
- CR_In_Tamil,
- CR_In_Telugu,
- CR_In_Kannada,
- CR_In_Malayalam,
- CR_In_Sinhala,
- CR_In_Thai,
- CR_In_Lao,
- CR_In_Tibetan,
- CR_In_Myanmar,
- CR_In_Georgian,
- CR_In_Hangul_Jamo,
- CR_In_Ethiopic,
- CR_In_Ethiopic_Supplement,
- CR_In_Cherokee,
- CR_In_Unified_Canadian_Aboriginal_Syllabics,
- CR_In_Ogham,
- CR_In_Runic,
- CR_In_Tagalog,
- CR_In_Hanunoo,
- CR_In_Buhid,
- CR_In_Tagbanwa,
- CR_In_Khmer,
- CR_In_Mongolian,
- CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
- CR_In_Limbu,
- CR_In_Tai_Le,
- CR_In_New_Tai_Lue,
- CR_In_Khmer_Symbols,
- CR_In_Buginese,
- CR_In_Tai_Tham,
- CR_In_Balinese,
- CR_In_Sundanese,
- CR_In_Batak,
- CR_In_Lepcha,
- CR_In_Ol_Chiki,
- CR_In_Sundanese_Supplement,
- CR_In_Vedic_Extensions,
- CR_In_Phonetic_Extensions,
- CR_In_Phonetic_Extensions_Supplement,
- CR_In_Combining_Diacritical_Marks_Supplement,
- CR_In_Latin_Extended_Additional,
- CR_In_Greek_Extended,
- CR_In_General_Punctuation,
- CR_In_Superscripts_and_Subscripts,
- CR_In_Currency_Symbols,
- CR_In_Combining_Diacritical_Marks_for_Symbols,
- CR_In_Letterlike_Symbols,
- CR_In_Number_Forms,
- CR_In_Arrows,
- CR_In_Mathematical_Operators,
- CR_In_Miscellaneous_Technical,
- CR_In_Control_Pictures,
- CR_In_Optical_Character_Recognition,
- CR_In_Enclosed_Alphanumerics,
- CR_In_Box_Drawing,
- CR_In_Block_Elements,
- CR_In_Geometric_Shapes,
- CR_In_Miscellaneous_Symbols,
- CR_In_Dingbats,
- CR_In_Miscellaneous_Mathematical_Symbols_A,
- CR_In_Supplemental_Arrows_A,
- CR_In_Braille_Patterns,
- CR_In_Supplemental_Arrows_B,
- CR_In_Miscellaneous_Mathematical_Symbols_B,
- CR_In_Supplemental_Mathematical_Operators,
- CR_In_Miscellaneous_Symbols_and_Arrows,
- CR_In_Glagolitic,
- CR_In_Latin_Extended_C,
- CR_In_Coptic,
- CR_In_Georgian_Supplement,
- CR_In_Tifinagh,
- CR_In_Ethiopic_Extended,
- CR_In_Cyrillic_Extended_A,
- CR_In_Supplemental_Punctuation,
- CR_In_CJK_Radicals_Supplement,
- CR_In_Kangxi_Radicals,
- CR_In_Ideographic_Description_Characters,
- CR_In_CJK_Symbols_and_Punctuation,
- CR_In_Hiragana,
- CR_In_Katakana,
- CR_In_Bopomofo,
- CR_In_Hangul_Compatibility_Jamo,
- CR_In_Kanbun,
- CR_In_Bopomofo_Extended,
- CR_In_CJK_Strokes,
- CR_In_Katakana_Phonetic_Extensions,
- CR_In_Enclosed_CJK_Letters_and_Months,
- CR_In_CJK_Compatibility,
- CR_In_CJK_Unified_Ideographs_Extension_A,
- CR_In_Yijing_Hexagram_Symbols,
- CR_In_CJK_Unified_Ideographs,
- CR_In_Yi_Syllables,
- CR_In_Yi_Radicals,
- CR_In_Lisu,
- CR_In_Vai,
- CR_In_Cyrillic_Extended_B,
- CR_In_Bamum,
- CR_In_Modifier_Tone_Letters,
- CR_In_Latin_Extended_D,
- CR_In_Syloti_Nagri,
- CR_In_Common_Indic_Number_Forms,
- CR_In_Phags_pa,
- CR_In_Saurashtra,
- CR_In_Devanagari_Extended,
- CR_In_Kayah_Li,
- CR_In_Rejang,
- CR_In_Hangul_Jamo_Extended_A,
- CR_In_Javanese,
- CR_In_Cham,
- CR_In_Myanmar_Extended_A,
- CR_In_Tai_Viet,
- CR_In_Meetei_Mayek_Extensions,
- CR_In_Ethiopic_Extended_A,
- CR_In_Meetei_Mayek,
- CR_In_Hangul_Syllables,
- CR_In_Hangul_Jamo_Extended_B,
- CR_In_High_Surrogates,
- CR_In_High_Private_Use_Surrogates,
- CR_In_Low_Surrogates,
- CR_In_Private_Use_Area,
- CR_In_CJK_Compatibility_Ideographs,
- CR_In_Alphabetic_Presentation_Forms,
- CR_In_Arabic_Presentation_Forms_A,
- CR_In_Variation_Selectors,
- CR_In_Vertical_Forms,
- CR_In_Combining_Half_Marks,
- CR_In_CJK_Compatibility_Forms,
- CR_In_Small_Form_Variants,
- CR_In_Arabic_Presentation_Forms_B,
- CR_In_Halfwidth_and_Fullwidth_Forms,
- CR_In_Specials,
- CR_In_Linear_B_Syllabary,
- CR_In_Linear_B_Ideograms,
- CR_In_Aegean_Numbers,
- CR_In_Ancient_Greek_Numbers,
- CR_In_Ancient_Symbols,
- CR_In_Phaistos_Disc,
- CR_In_Lycian,
- CR_In_Carian,
- CR_In_Old_Italic,
- CR_In_Gothic,
- CR_In_Ugaritic,
- CR_In_Old_Persian,
- CR_In_Deseret,
- CR_In_Shavian,
- CR_In_Osmanya,
- CR_In_Cypriot_Syllabary,
- CR_In_Imperial_Aramaic,
- CR_In_Phoenician,
- CR_In_Lydian,
- CR_In_Meroitic_Hieroglyphs,
- CR_In_Meroitic_Cursive,
- CR_In_Kharoshthi,
- CR_In_Old_South_Arabian,
- CR_In_Avestan,
- CR_In_Inscriptional_Parthian,
- CR_In_Inscriptional_Pahlavi,
- CR_In_Old_Turkic,
- CR_In_Rumi_Numeral_Symbols,
- CR_In_Brahmi,
- CR_In_Kaithi,
- CR_In_Sora_Sompeng,
- CR_In_Chakma,
- CR_In_Sharada,
- CR_In_Takri,
- CR_In_Cuneiform,
- CR_In_Cuneiform_Numbers_and_Punctuation,
- CR_In_Egyptian_Hieroglyphs,
- CR_In_Bamum_Supplement,
- CR_In_Miao,
- CR_In_Kana_Supplement,
- CR_In_Byzantine_Musical_Symbols,
- CR_In_Musical_Symbols,
- CR_In_Ancient_Greek_Musical_Notation,
- CR_In_Tai_Xuan_Jing_Symbols,
- CR_In_Counting_Rod_Numerals,
- CR_In_Mathematical_Alphanumeric_Symbols,
- CR_In_Arabic_Mathematical_Alphabetic_Symbols,
- CR_In_Mahjong_Tiles,
- CR_In_Domino_Tiles,
- CR_In_Playing_Cards,
- CR_In_Enclosed_Alphanumeric_Supplement,
- CR_In_Enclosed_Ideographic_Supplement,
- CR_In_Miscellaneous_Symbols_And_Pictographs,
- CR_In_Emoticons,
- CR_In_Transport_And_Map_Symbols,
- CR_In_Alchemical_Symbols,
- CR_In_CJK_Unified_Ideographs_Extension_B,
- CR_In_CJK_Unified_Ideographs_Extension_C,
- CR_In_CJK_Unified_Ideographs_Extension_D,
- CR_In_CJK_Compatibility_Ideographs_Supplement,
- CR_In_Tags,
- CR_In_Variation_Selectors_Supplement,
- CR_In_Supplementary_Private_Use_Area_A,
- CR_In_Supplementary_Private_Use_Area_B,
- CR_In_No_Block,
+#endif /* USE_UNICODE_PROPERTIES */
#endif /* USE_UNICODE_PROPERTIES */
};
struct uniname2ctype_struct {
@@ -25947,19 +16370,19 @@ struct uniname2ctype_struct {
static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 14
+#define TOTAL_KEYWORDS 15
#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 19
-/* maximum key range = 14, duplicates = 0 */
+#define MAX_WORD_LENGTH 7
+#define MIN_HASH_VALUE 7
+#define MAX_HASH_VALUE 21
+/* maximum key range = 15, duplicates = 0 */
#else /* USE_UNICODE_PROPERTIES */
-#define TOTAL_KEYWORDS 625
+#define TOTAL_KEYWORDS 367
#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 44
+#define MAX_WORD_LENGTH 30
#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 4167
-/* maximum key range = 4165, duplicates = 0 */
+#define MAX_HASH_VALUE 1751
+/* maximum key range = 1749, duplicates = 0 */
#endif /* USE_UNICODE_PROPERTIES */
#ifdef __GNUC__
@@ -25981,33 +16404,33 @@ uniname2ctype_hash (str, len)
#endif /* USE_UNICODE_PROPERTIES */
{
#ifndef USE_UNICODE_PROPERTIES
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 3, 11, 5,
- 4, 20, 20, 9, 20, 1, 20, 20, 10, 20,
- 2, 20, 1, 20, 1, 7, 4, 6, 20, 1,
- 4, 20, 20, 20, 20, 20, 20, 20
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 22, 22, 22, 22, 22, 22, 3, 13, 6,
+ 4, 22, 22, 11, 22, 1, 22, 22, 10, 22,
+ 2, 22, 1, 22, 10, 8, 4, 7, 22, 3,
+ 4, 22, 22, 22, 22, 22, 22, 22
#else /* USE_UNICODE_PROPERTIES */
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 1, 4168, 13, 1,
- 3, 28, 31, 10, 27, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
- 4168, 4168, 4168, 4168, 4168, 4168, 4168, 13, 854, 14,
- 443, 19, 7, 570, 335, 4, 66, 1159, 102, 34,
- 1, 178, 474, 1, 192, 2, 64, 1117, 491, 264,
- 256, 1305, 3, 4168, 4168, 4168, 4168, 4168
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752, 1752,
+ 1752, 1752, 1752, 1752, 1752, 1752, 1752, 7, 419, 1,
+ 128, 38, 100, 186, 46, 11, 226, 463, 4, 317,
+ 6, 2, 265, 5, 18, 112, 30, 289, 164, 384,
+ 368, 579, 10, 1752, 1752, 1752, 1752, 1752
#endif /* USE_UNICODE_PROPERTIES */
};
#ifndef USE_UNICODE_PROPERTIES
@@ -26035,8 +16458,6 @@ uniname2ctype_hash (str, len)
hval += asso_values[(unsigned char)str[5]];
/*FALLTHROUGH*/
case 5:
- hval += asso_values[(unsigned char)str[4]];
- /*FALLTHROUGH*/
case 4:
case 3:
hval += asso_values[(unsigned char)str[2]];
@@ -26055,1298 +16476,783 @@ uniname2ctype_hash (str, len)
struct uniname2ctype_pool_t
{
#ifndef USE_UNICODE_PROPERTIES
- char uniname2ctype_pool_str6[sizeof("word")];
char uniname2ctype_pool_str7[sizeof("print")];
char uniname2ctype_pool_str8[sizeof("punct")];
char uniname2ctype_pool_str9[sizeof("alpha")];
char uniname2ctype_pool_str10[sizeof("alnum")];
char uniname2ctype_pool_str11[sizeof("xdigit")];
- char uniname2ctype_pool_str12[sizeof("upper")];
- char uniname2ctype_pool_str13[sizeof("ascii")];
- char uniname2ctype_pool_str14[sizeof("cntrl")];
- char uniname2ctype_pool_str15[sizeof("space")];
- char uniname2ctype_pool_str16[sizeof("lower")];
- char uniname2ctype_pool_str17[sizeof("graph")];
- char uniname2ctype_pool_str18[sizeof("digit")];
- char uniname2ctype_pool_str19[sizeof("blank")];
+ char uniname2ctype_pool_str12[sizeof("newline")];
+ char uniname2ctype_pool_str13[sizeof("upper")];
+ char uniname2ctype_pool_str14[sizeof("ascii")];
+ char uniname2ctype_pool_str15[sizeof("cntrl")];
+ char uniname2ctype_pool_str16[sizeof("space")];
+ char uniname2ctype_pool_str17[sizeof("word")];
+ char uniname2ctype_pool_str18[sizeof("lower")];
+ char uniname2ctype_pool_str19[sizeof("graph")];
+ char uniname2ctype_pool_str20[sizeof("digit")];
+ char uniname2ctype_pool_str21[sizeof("blank")];
#else /* USE_UNICODE_PROPERTIES */
- char uniname2ctype_pool_str3[sizeof("n")];
- char uniname2ctype_pool_str5[sizeof("s")];
- char uniname2ctype_pool_str7[sizeof("z")];
- char uniname2ctype_pool_str9[sizeof("zs")];
- char uniname2ctype_pool_str16[sizeof("zzzz")];
- char uniname2ctype_pool_str18[sizeof("cn")];
- char uniname2ctype_pool_str20[sizeof("cs")];
- char uniname2ctype_pool_str24[sizeof("ci")];
- char uniname2ctype_pool_str29[sizeof("c")];
- char uniname2ctype_pool_str30[sizeof("cf")];
- char uniname2ctype_pool_str32[sizeof("sc")];
- char uniname2ctype_pool_str34[sizeof("cans")];
- char uniname2ctype_pool_str35[sizeof("qaai")];
- char uniname2ctype_pool_str38[sizeof("mn")];
- char uniname2ctype_pool_str42[sizeof("ascii")];
- char uniname2ctype_pool_str44[sizeof("cc")];
- char uniname2ctype_pool_str45[sizeof("qaac")];
- char uniname2ctype_pool_str49[sizeof("inavestan")];
- char uniname2ctype_pool_str52[sizeof("inspecials")];
- char uniname2ctype_pool_str62[sizeof("inipaextensions")];
- char uniname2ctype_pool_str64[sizeof("mc")];
- char uniname2ctype_pool_str66[sizeof("insamaritan")];
- char uniname2ctype_pool_str69[sizeof("m")];
- char uniname2ctype_pool_str72[sizeof("sm")];
- char uniname2ctype_pool_str74[sizeof("me")];
- char uniname2ctype_pool_str82[sizeof("inarmenian")];
- char uniname2ctype_pool_str84[sizeof("incuneiform")];
- char uniname2ctype_pool_str86[sizeof("mandaic")];
- char uniname2ctype_pool_str90[sizeof("inancientsymbols")];
- char uniname2ctype_pool_str92[sizeof("incuneiformnumbersandpunctuation")];
- char uniname2ctype_pool_str96[sizeof("inthai")];
- char uniname2ctype_pool_str99[sizeof("inmusicalsymbols")];
- char uniname2ctype_pool_str100[sizeof("inmiscellaneoussymbols")];
- char uniname2ctype_pool_str106[sizeof("incham")];
- char uniname2ctype_pool_str109[sizeof("inmiscellaneoussymbolsandarrows")];
- char uniname2ctype_pool_str113[sizeof("initialpunctuation")];
- char uniname2ctype_pool_str114[sizeof("inmiscellaneoussymbolsandpictographs")];
- char uniname2ctype_pool_str116[sizeof("inthaana")];
- char uniname2ctype_pool_str124[sizeof("taile")];
- char uniname2ctype_pool_str125[sizeof("mtei")];
- char uniname2ctype_pool_str132[sizeof("lc")];
- char uniname2ctype_pool_str133[sizeof("lana")];
- char uniname2ctype_pool_str134[sizeof("inlycian")];
- char uniname2ctype_pool_str135[sizeof("intransportandmapsymbols")];
- char uniname2ctype_pool_str136[sizeof("incontrolpictures")];
- char uniname2ctype_pool_str142[sizeof("sinhala")];
- char uniname2ctype_pool_str151[sizeof("incommonindicnumberforms")];
- char uniname2ctype_pool_str156[sizeof("inmiscellaneousmathematicalsymbolsa")];
- char uniname2ctype_pool_str158[sizeof("sterm")];
- char uniname2ctype_pool_str167[sizeof("inmyanmarextendeda")];
- char uniname2ctype_pool_str172[sizeof("lm")];
- char uniname2ctype_pool_str175[sizeof("taiviet")];
- char uniname2ctype_pool_str179[sizeof("inlinearbideograms")];
- char uniname2ctype_pool_str180[sizeof("intaitham")];
- char uniname2ctype_pool_str184[sizeof("latn")];
- char uniname2ctype_pool_str186[sizeof("latin")];
- char uniname2ctype_pool_str187[sizeof("ital")];
- char uniname2ctype_pool_str189[sizeof("alnum")];
- char uniname2ctype_pool_str199[sizeof("inmalayalam")];
- char uniname2ctype_pool_str201[sizeof("intaile")];
- char uniname2ctype_pool_str202[sizeof("tale")];
- char uniname2ctype_pool_str205[sizeof("l")];
- char uniname2ctype_pool_str207[sizeof("nl")];
- char uniname2ctype_pool_str209[sizeof("zl")];
- char uniname2ctype_pool_str216[sizeof("intamil")];
- char uniname2ctype_pool_str217[sizeof("taml")];
- char uniname2ctype_pool_str218[sizeof("inlatinextendeda")];
- char uniname2ctype_pool_str220[sizeof("inlatinextendedc")];
- char uniname2ctype_pool_str223[sizeof("inrunic")];
- char uniname2ctype_pool_str224[sizeof("incarian")];
- char uniname2ctype_pool_str225[sizeof("insyriac")];
- char uniname2ctype_pool_str227[sizeof("cari")];
- char uniname2ctype_pool_str230[sizeof("inmeeteimayekextensions")];
- char uniname2ctype_pool_str231[sizeof("osma")];
- char uniname2ctype_pool_str232[sizeof("lt")];
- char uniname2ctype_pool_str233[sizeof("miao")];
- char uniname2ctype_pool_str234[sizeof("insharada")];
- char uniname2ctype_pool_str239[sizeof("incyrillic")];
- char uniname2ctype_pool_str240[sizeof("carian")];
- char uniname2ctype_pool_str244[sizeof("armn")];
- char uniname2ctype_pool_str245[sizeof("samr")];
- char uniname2ctype_pool_str247[sizeof("armi")];
- char uniname2ctype_pool_str248[sizeof("inideographicdescriptioncharacters")];
- char uniname2ctype_pool_str252[sizeof("inosmanya")];
- char uniname2ctype_pool_str253[sizeof("armenian")];
- char uniname2ctype_pool_str254[sizeof("inmyanmar")];
- char uniname2ctype_pool_str255[sizeof("samaritan")];
- char uniname2ctype_pool_str256[sizeof("arabic")];
- char uniname2ctype_pool_str259[sizeof("incherokee")];
- char uniname2ctype_pool_str261[sizeof("connectorpunctuation")];
- char uniname2ctype_pool_str263[sizeof("merc")];
- char uniname2ctype_pool_str264[sizeof("inmiscellaneoustechnical")];
- char uniname2ctype_pool_str268[sizeof("inenclosedalphanumerics")];
- char uniname2ctype_pool_str279[sizeof("inemoticons")];
- char uniname2ctype_pool_str281[sizeof("joinc")];
- char uniname2ctype_pool_str288[sizeof("cntrl")];
- char uniname2ctype_pool_str301[sizeof("inenclosedcjklettersandmonths")];
- char uniname2ctype_pool_str303[sizeof("cwcf")];
- char uniname2ctype_pool_str304[sizeof("inruminumeralsymbols")];
- char uniname2ctype_pool_str308[sizeof("ll")];
- char uniname2ctype_pool_str313[sizeof("term")];
- char uniname2ctype_pool_str316[sizeof("inlatinextendedadditional")];
- char uniname2ctype_pool_str320[sizeof("tamil")];
- char uniname2ctype_pool_str321[sizeof("loe")];
- char uniname2ctype_pool_str329[sizeof("newtailue")];
- char uniname2ctype_pool_str330[sizeof("cwcm")];
- char uniname2ctype_pool_str339[sizeof("inenclosedalphanumericsupplement")];
- char uniname2ctype_pool_str346[sizeof("sinh")];
- char uniname2ctype_pool_str347[sizeof("zinh")];
- char uniname2ctype_pool_str349[sizeof("meroiticcursive")];
- char uniname2ctype_pool_str353[sizeof("han")];
- char uniname2ctype_pool_str357[sizeof("hani")];
- char uniname2ctype_pool_str358[sizeof("inopticalcharacterrecognition")];
- char uniname2ctype_pool_str359[sizeof("no")];
- char uniname2ctype_pool_str360[sizeof("so")];
- char uniname2ctype_pool_str364[sizeof("innewtailue")];
- char uniname2ctype_pool_str365[sizeof("insinhala")];
- char uniname2ctype_pool_str367[sizeof("innko")];
- char uniname2ctype_pool_str372[sizeof("co")];
- char uniname2ctype_pool_str375[sizeof("shavian")];
- char uniname2ctype_pool_str378[sizeof("terminalpunctuation")];
- char uniname2ctype_pool_str386[sizeof("intaixuanjingsymbols")];
- char uniname2ctype_pool_str387[sizeof("inethiopic")];
- char uniname2ctype_pool_str389[sizeof("sora")];
- char uniname2ctype_pool_str398[sizeof("inarrows")];
- char uniname2ctype_pool_str400[sizeof("cham")];
- char uniname2ctype_pool_str403[sizeof("inlowsurrogates")];
- char uniname2ctype_pool_str405[sizeof("oriya")];
- char uniname2ctype_pool_str406[sizeof("ext")];
- char uniname2ctype_pool_str409[sizeof("cwt")];
- char uniname2ctype_pool_str412[sizeof("common")];
- char uniname2ctype_pool_str414[sizeof("inmiao")];
- char uniname2ctype_pool_str420[sizeof("thai")];
- char uniname2ctype_pool_str425[sizeof("intifinagh")];
- char uniname2ctype_pool_str426[sizeof("ethi")];
- char uniname2ctype_pool_str427[sizeof("mero")];
- char uniname2ctype_pool_str428[sizeof("chakma")];
- char uniname2ctype_pool_str429[sizeof("thaa")];
- char uniname2ctype_pool_str430[sizeof("inscriptionalparthian")];
- char uniname2ctype_pool_str432[sizeof("tifinagh")];
- char uniname2ctype_pool_str436[sizeof("titlecaseletter")];
- char uniname2ctype_pool_str445[sizeof("thaana")];
- char uniname2ctype_pool_str449[sizeof("asciihexdigit")];
- char uniname2ctype_pool_str450[sizeof("math")];
- char uniname2ctype_pool_str453[sizeof("di")];
- char uniname2ctype_pool_str454[sizeof("ids")];
- char uniname2ctype_pool_str460[sizeof("lo")];
- char uniname2ctype_pool_str468[sizeof("inlao")];
- char uniname2ctype_pool_str470[sizeof("taitham")];
- char uniname2ctype_pool_str474[sizeof("lao")];
- char uniname2ctype_pool_str475[sizeof("laoo")];
- char uniname2ctype_pool_str476[sizeof("dia")];
- char uniname2ctype_pool_str478[sizeof("idc")];
- char uniname2ctype_pool_str480[sizeof("ps")];
- char uniname2ctype_pool_str481[sizeof("insundanese")];
- char uniname2ctype_pool_str484[sizeof("pi")];
- char uniname2ctype_pool_str485[sizeof("cwl")];
- char uniname2ctype_pool_str490[sizeof("pf")];
- char uniname2ctype_pool_str495[sizeof("mand")];
- char uniname2ctype_pool_str496[sizeof("insylotinagri")];
- char uniname2ctype_pool_str497[sizeof("vs")];
- char uniname2ctype_pool_str503[sizeof("mongolian")];
- char uniname2ctype_pool_str504[sizeof("pc")];
- char uniname2ctype_pool_str506[sizeof("inmandaic")];
- char uniname2ctype_pool_str509[sizeof("invai")];
- char uniname2ctype_pool_str511[sizeof("lineseparator")];
- char uniname2ctype_pool_str514[sizeof("pe")];
- char uniname2ctype_pool_str515[sizeof("vai")];
- char uniname2ctype_pool_str516[sizeof("vaii")];
- char uniname2ctype_pool_str517[sizeof("idst")];
- char uniname2ctype_pool_str520[sizeof("indominotiles")];
- char uniname2ctype_pool_str521[sizeof("inshavian")];
- char uniname2ctype_pool_str522[sizeof("inspacingmodifierletters")];
- char uniname2ctype_pool_str524[sizeof("format")];
- char uniname2ctype_pool_str528[sizeof("inphaistosdisc")];
- char uniname2ctype_pool_str531[sizeof("hano")];
- char uniname2ctype_pool_str532[sizeof("space")];
- char uniname2ctype_pool_str542[sizeof("indeseret")];
- char uniname2ctype_pool_str545[sizeof("inolchiki")];
- char uniname2ctype_pool_str548[sizeof("hira")];
- char uniname2ctype_pool_str553[sizeof("joincontrol")];
- char uniname2ctype_pool_str555[sizeof("idcontinue")];
- char uniname2ctype_pool_str558[sizeof("inmahjongtiles")];
- char uniname2ctype_pool_str560[sizeof("patws")];
- char uniname2ctype_pool_str563[sizeof("inlydian")];
- char uniname2ctype_pool_str564[sizeof("cher")];
- char uniname2ctype_pool_str568[sizeof("inhiragana")];
- char uniname2ctype_pool_str572[sizeof("inogham")];
- char uniname2ctype_pool_str574[sizeof("avst")];
- char uniname2ctype_pool_str575[sizeof("inscriptionalpahlavi")];
- char uniname2ctype_pool_str579[sizeof("incoptic")];
- char uniname2ctype_pool_str587[sizeof("java")];
- char uniname2ctype_pool_str589[sizeof("inmathematicalalphanumericsymbols")];
- char uniname2ctype_pool_str594[sizeof("letter")];
- char uniname2ctype_pool_str604[sizeof("injavanese")];
- char uniname2ctype_pool_str608[sizeof("avestan")];
- char uniname2ctype_pool_str612[sizeof("age=1.1")];
- char uniname2ctype_pool_str613[sizeof("lepc")];
- char uniname2ctype_pool_str614[sizeof("age=2.1")];
- char uniname2ctype_pool_str616[sizeof("inlepcha")];
- char uniname2ctype_pool_str617[sizeof("javanese")];
- char uniname2ctype_pool_str618[sizeof("shaw")];
- char uniname2ctype_pool_str619[sizeof("finalpunctuation")];
- char uniname2ctype_pool_str620[sizeof("alpha")];
- char uniname2ctype_pool_str621[sizeof("age=5.1")];
- char uniname2ctype_pool_str622[sizeof("inmongolian")];
- char uniname2ctype_pool_str623[sizeof("age=5.2")];
- char uniname2ctype_pool_str626[sizeof("age=2.0")];
- char uniname2ctype_pool_str627[sizeof("ahex")];
- char uniname2ctype_pool_str630[sizeof("ingeneralpunctuation")];
- char uniname2ctype_pool_str631[sizeof("oids")];
- char uniname2ctype_pool_str632[sizeof("odi")];
- char uniname2ctype_pool_str633[sizeof("age=5.0")];
- char uniname2ctype_pool_str636[sizeof("tavt")];
- char uniname2ctype_pool_str637[sizeof("intaiviet")];
- char uniname2ctype_pool_str638[sizeof("age=6.1")];
- char uniname2ctype_pool_str639[sizeof("age=3.1")];
- char uniname2ctype_pool_str640[sizeof("insundanesesupplement")];
- char uniname2ctype_pool_str641[sizeof("age=3.2")];
- char uniname2ctype_pool_str642[sizeof("age=4.1")];
- char uniname2ctype_pool_str643[sizeof("oidc")];
- char uniname2ctype_pool_str646[sizeof("tfng")];
- char uniname2ctype_pool_str647[sizeof("insmallformvariants")];
- char uniname2ctype_pool_str648[sizeof("ideo")];
- char uniname2ctype_pool_str649[sizeof("intags")];
- char uniname2ctype_pool_str650[sizeof("age=6.0")];
- char uniname2ctype_pool_str651[sizeof("age=3.0")];
- char uniname2ctype_pool_str653[sizeof("whitespace")];
- char uniname2ctype_pool_str654[sizeof("age=4.0")];
- char uniname2ctype_pool_str655[sizeof("inolditalic")];
- char uniname2ctype_pool_str660[sizeof("oalpha")];
- char uniname2ctype_pool_str668[sizeof("ingujarati")];
- char uniname2ctype_pool_str672[sizeof("control")];
- char uniname2ctype_pool_str679[sizeof("diacritic")];
- char uniname2ctype_pool_str682[sizeof("tagbanwa")];
- char uniname2ctype_pool_str690[sizeof("inphoenician")];
- char uniname2ctype_pool_str701[sizeof("ininscriptionalparthian")];
- char uniname2ctype_pool_str703[sizeof("ininscriptionalpahlavi")];
- char uniname2ctype_pool_str704[sizeof("coptic")];
- char uniname2ctype_pool_str705[sizeof("dsrt")];
- char uniname2ctype_pool_str706[sizeof("inmodifiertoneletters")];
- char uniname2ctype_pool_str709[sizeof("xids")];
- char uniname2ctype_pool_str713[sizeof("hanunoo")];
- char uniname2ctype_pool_str715[sizeof("inoldturkic")];
- char uniname2ctype_pool_str721[sizeof("xidc")];
- char uniname2ctype_pool_str725[sizeof("idstart")];
- char uniname2ctype_pool_str729[sizeof("inimperialaramaic")];
- char uniname2ctype_pool_str730[sizeof("invariationselectors")];
- char uniname2ctype_pool_str734[sizeof("copt")];
- char uniname2ctype_pool_str737[sizeof("caseignorable")];
- char uniname2ctype_pool_str738[sizeof("prti")];
- char uniname2ctype_pool_str739[sizeof("nchar")];
- char uniname2ctype_pool_str746[sizeof("deseret")];
- char uniname2ctype_pool_str747[sizeof("decimalnumber")];
- char uniname2ctype_pool_str748[sizeof("cprt")];
- char uniname2ctype_pool_str750[sizeof("inlatin1supplement")];
- char uniname2ctype_pool_str771[sizeof("imperialaramaic")];
- char uniname2ctype_pool_str776[sizeof("privateuse")];
- char uniname2ctype_pool_str777[sizeof("casedletter")];
- char uniname2ctype_pool_str778[sizeof("lowercase")];
- char uniname2ctype_pool_str780[sizeof("spaceseparator")];
- char uniname2ctype_pool_str784[sizeof("radical")];
- char uniname2ctype_pool_str787[sizeof("mong")];
- char uniname2ctype_pool_str788[sizeof("canadianaboriginal")];
- char uniname2ctype_pool_str792[sizeof("letternumber")];
- char uniname2ctype_pool_str796[sizeof("insorasompeng")];
- char uniname2ctype_pool_str797[sizeof("dash")];
- char uniname2ctype_pool_str798[sizeof("wspace")];
- char uniname2ctype_pool_str799[sizeof("ogam")];
- char uniname2ctype_pool_str802[sizeof("invariationselectorssupplement")];
- char uniname2ctype_pool_str803[sizeof("print")];
- char uniname2ctype_pool_str811[sizeof("otheridcontinue")];
- char uniname2ctype_pool_str815[sizeof("ingurmukhi")];
- char uniname2ctype_pool_str818[sizeof("closepunctuation")];
- char uniname2ctype_pool_str823[sizeof("olditalic")];
- char uniname2ctype_pool_str824[sizeof("noncharactercodepoint")];
- char uniname2ctype_pool_str826[sizeof("sharada")];
- char uniname2ctype_pool_str827[sizeof("ingeometricshapes")];
- char uniname2ctype_pool_str830[sizeof("otheralphabetic")];
- char uniname2ctype_pool_str831[sizeof("patternwhitespace")];
- char uniname2ctype_pool_str832[sizeof("po")];
- char uniname2ctype_pool_str833[sizeof("rjng")];
- char uniname2ctype_pool_str835[sizeof("ingreekandcoptic")];
- char uniname2ctype_pool_str841[sizeof("xdigit")];
- char uniname2ctype_pool_str850[sizeof("gothic")];
- char uniname2ctype_pool_str851[sizeof("inoldsoutharabian")];
- char uniname2ctype_pool_str852[sizeof("xidstart")];
- char uniname2ctype_pool_str854[sizeof("inrejang")];
- char uniname2ctype_pool_str860[sizeof("idsbinaryoperator")];
- char uniname2ctype_pool_str867[sizeof("olower")];
- char uniname2ctype_pool_str869[sizeof("hex")];
- char uniname2ctype_pool_str870[sizeof("inenclosedideographicsupplement")];
- char uniname2ctype_pool_str874[sizeof("inalphabeticpresentationforms")];
- char uniname2ctype_pool_str879[sizeof("inbasiclatin")];
- char uniname2ctype_pool_str884[sizeof("othersymbol")];
- char uniname2ctype_pool_str889[sizeof("nd")];
- char uniname2ctype_pool_str890[sizeof("sd")];
- char uniname2ctype_pool_str900[sizeof("omath")];
- char uniname2ctype_pool_str901[sizeof("separator")];
- char uniname2ctype_pool_str907[sizeof("inarabic")];
- char uniname2ctype_pool_str912[sizeof("xidcontinue")];
- char uniname2ctype_pool_str913[sizeof("otheridstart")];
- char uniname2ctype_pool_str914[sizeof("grext")];
- char uniname2ctype_pool_str917[sizeof("otherlowercase")];
- char uniname2ctype_pool_str919[sizeof("phli")];
- char uniname2ctype_pool_str920[sizeof("cased")];
- char uniname2ctype_pool_str923[sizeof("hang")];
- char uniname2ctype_pool_str931[sizeof("xpeo")];
- char uniname2ctype_pool_str933[sizeof("lower")];
- char uniname2ctype_pool_str936[sizeof("modifierletter")];
- char uniname2ctype_pool_str938[sizeof("inphoneticextensions")];
- char uniname2ctype_pool_str939[sizeof("inarabicpresentationformsa")];
- char uniname2ctype_pool_str943[sizeof("innumberforms")];
- char uniname2ctype_pool_str945[sizeof("oldpersian")];
- char uniname2ctype_pool_str946[sizeof("incyrillicextendeda")];
- char uniname2ctype_pool_str947[sizeof("inverticalforms")];
- char uniname2ctype_pool_str949[sizeof("p")];
- char uniname2ctype_pool_str950[sizeof("inbyzantinemusicalsymbols")];
- char uniname2ctype_pool_str951[sizeof("inmathematicaloperators")];
- char uniname2ctype_pool_str952[sizeof("intibetan")];
- char uniname2ctype_pool_str953[sizeof("zp")];
- char uniname2ctype_pool_str956[sizeof("ingeorgian")];
- char uniname2ctype_pool_str960[sizeof("inbraillepatterns")];
- char uniname2ctype_pool_str962[sizeof("lepcha")];
- char uniname2ctype_pool_str963[sizeof("geor")];
- char uniname2ctype_pool_str964[sizeof("invedicextensions")];
- char uniname2ctype_pool_str965[sizeof("linb")];
- char uniname2ctype_pool_str966[sizeof("other")];
- char uniname2ctype_pool_str970[sizeof("deva")];
- char uniname2ctype_pool_str972[sizeof("indevanagari")];
- char uniname2ctype_pool_str973[sizeof("othernumber")];
- char uniname2ctype_pool_str974[sizeof("bamum")];
- char uniname2ctype_pool_str976[sizeof("shrd")];
- char uniname2ctype_pool_str977[sizeof("bali")];
- char uniname2ctype_pool_str981[sizeof("devanagari")];
- char uniname2ctype_pool_str983[sizeof("extender")];
- char uniname2ctype_pool_str988[sizeof("inherited")];
- char uniname2ctype_pool_str989[sizeof("glagolitic")];
- char uniname2ctype_pool_str990[sizeof("tibt")];
- char uniname2ctype_pool_str994[sizeof("inbalinese")];
- char uniname2ctype_pool_str996[sizeof("ingothic")];
- char uniname2ctype_pool_str997[sizeof("inmiscellaneousmathematicalsymbolsb")];
- char uniname2ctype_pool_str998[sizeof("limb")];
- char uniname2ctype_pool_str1000[sizeof("bengali")];
- char uniname2ctype_pool_str1003[sizeof("phoenician")];
- char uniname2ctype_pool_str1004[sizeof("insuperscriptsandsubscripts")];
- char uniname2ctype_pool_str1006[sizeof("inmeroitichieroglyphs")];
- char uniname2ctype_pool_str1007[sizeof("tibetan")];
- char uniname2ctype_pool_str1010[sizeof("inphoneticextensionssupplement")];
- char uniname2ctype_pool_str1016[sizeof("balinese")];
- char uniname2ctype_pool_str1021[sizeof("lowercaseletter")];
- char uniname2ctype_pool_str1031[sizeof("indingbats")];
- char uniname2ctype_pool_str1035[sizeof("inprivateusearea")];
- char uniname2ctype_pool_str1039[sizeof("assigned")];
- char uniname2ctype_pool_str1044[sizeof("patternsyntax")];
- char uniname2ctype_pool_str1051[sizeof("inhangulsyllables")];
- char uniname2ctype_pool_str1065[sizeof("sarb")];
- char uniname2ctype_pool_str1067[sizeof("brai")];
- char uniname2ctype_pool_str1069[sizeof("insupplementalmathematicaloperators")];
- char uniname2ctype_pool_str1070[sizeof("phnx")];
- char uniname2ctype_pool_str1072[sizeof("ingreekextended")];
- char uniname2ctype_pool_str1074[sizeof("otherletter")];
- char uniname2ctype_pool_str1076[sizeof("arab")];
- char uniname2ctype_pool_str1078[sizeof("inlatinextendedd")];
- char uniname2ctype_pool_str1081[sizeof("word")];
- char uniname2ctype_pool_str1084[sizeof("inphagspa")];
- char uniname2ctype_pool_str1087[sizeof("inblockelements")];
- char uniname2ctype_pool_str1092[sizeof("ethiopic")];
- char uniname2ctype_pool_str1094[sizeof("inethiopicextendeda")];
- char uniname2ctype_pool_str1107[sizeof("brahmi")];
- char uniname2ctype_pool_str1110[sizeof("logicalorderexception")];
- char uniname2ctype_pool_str1114[sizeof("inoldpersian")];
- char uniname2ctype_pool_str1129[sizeof("inletterlikesymbols")];
- char uniname2ctype_pool_str1133[sizeof("sorasompeng")];
- char uniname2ctype_pool_str1135[sizeof("hiragana")];
- char uniname2ctype_pool_str1142[sizeof("inhanguljamoextendeda")];
- char uniname2ctype_pool_str1147[sizeof("othermath")];
- char uniname2ctype_pool_str1150[sizeof("digit")];
- char uniname2ctype_pool_str1151[sizeof("goth")];
- char uniname2ctype_pool_str1156[sizeof("ogham")];
- char uniname2ctype_pool_str1162[sizeof("sundanese")];
- char uniname2ctype_pool_str1170[sizeof("saurashtra")];
- char uniname2ctype_pool_str1173[sizeof("linearb")];
- char uniname2ctype_pool_str1179[sizeof("graphemebase")];
- char uniname2ctype_pool_str1185[sizeof("inunifiedcanadianaboriginalsyllabics")];
- char uniname2ctype_pool_str1186[sizeof("cuneiform")];
- char uniname2ctype_pool_str1188[sizeof("inkannada")];
- char uniname2ctype_pool_str1190[sizeof("kana")];
- char uniname2ctype_pool_str1195[sizeof("inancientgreeknumbers")];
- char uniname2ctype_pool_str1196[sizeof("incjkstrokes")];
- char uniname2ctype_pool_str1198[sizeof("inglagolitic")];
- char uniname2ctype_pool_str1202[sizeof("inancientgreekmusicalnotation")];
- char uniname2ctype_pool_str1212[sizeof("inchakma")];
- char uniname2ctype_pool_str1215[sizeof("plrd")];
- char uniname2ctype_pool_str1219[sizeof("inbrahmi")];
- char uniname2ctype_pool_str1224[sizeof("cakm")];
- char uniname2ctype_pool_str1225[sizeof("incjkcompatibilityforms")];
- char uniname2ctype_pool_str1229[sizeof("lisu")];
- char uniname2ctype_pool_str1230[sizeof("incjkcompatibilityideographs")];
- char uniname2ctype_pool_str1231[sizeof("intagalog")];
- char uniname2ctype_pool_str1244[sizeof("inkaithi")];
- char uniname2ctype_pool_str1245[sizeof("insupplementalarrowsa")];
- char uniname2ctype_pool_str1249[sizeof("takri")];
- char uniname2ctype_pool_str1253[sizeof("ideographic")];
- char uniname2ctype_pool_str1256[sizeof("hexdigit")];
- char uniname2ctype_pool_str1259[sizeof("glag")];
- char uniname2ctype_pool_str1261[sizeof("softdotted")];
- char uniname2ctype_pool_str1262[sizeof("variationselector")];
- char uniname2ctype_pool_str1264[sizeof("inkatakana")];
- char uniname2ctype_pool_str1265[sizeof("meeteimayek")];
- char uniname2ctype_pool_str1274[sizeof("otherpunctuation")];
- char uniname2ctype_pool_str1279[sizeof("inhanguljamo")];
- char uniname2ctype_pool_str1282[sizeof("kali")];
- char uniname2ctype_pool_str1289[sizeof("braille")];
- char uniname2ctype_pool_str1298[sizeof("incombininghalfmarks")];
- char uniname2ctype_pool_str1300[sizeof("talu")];
- char uniname2ctype_pool_str1302[sizeof("incjkcompatibilityideographssupplement")];
- char uniname2ctype_pool_str1306[sizeof("telu")];
- char uniname2ctype_pool_str1307[sizeof("idsb")];
- char uniname2ctype_pool_str1310[sizeof("tglg")];
- char uniname2ctype_pool_str1313[sizeof("inmeeteimayek")];
- char uniname2ctype_pool_str1315[sizeof("yi")];
- char uniname2ctype_pool_str1318[sizeof("phagspa")];
- char uniname2ctype_pool_str1321[sizeof("yiii")];
- char uniname2ctype_pool_str1323[sizeof("inarabicmathematicalalphabeticsymbols")];
- char uniname2ctype_pool_str1328[sizeof("saur")];
- char uniname2ctype_pool_str1330[sizeof("ogrext")];
- char uniname2ctype_pool_str1334[sizeof("bidic")];
- char uniname2ctype_pool_str1341[sizeof("inkanasupplement")];
- char uniname2ctype_pool_str1343[sizeof("runic")];
- char uniname2ctype_pool_str1344[sizeof("inalchemicalsymbols")];
- char uniname2ctype_pool_str1350[sizeof("georgian")];
- char uniname2ctype_pool_str1351[sizeof("inugaritic")];
- char uniname2ctype_pool_str1354[sizeof("insaurashtra")];
- char uniname2ctype_pool_str1356[sizeof("inhighprivateusesurrogates")];
- char uniname2ctype_pool_str1362[sizeof("pd")];
- char uniname2ctype_pool_str1372[sizeof("incountingrodnumerals")];
- char uniname2ctype_pool_str1377[sizeof("inarabicextendeda")];
- char uniname2ctype_pool_str1389[sizeof("inkharoshthi")];
- char uniname2ctype_pool_str1393[sizeof("idstrinaryoperator")];
- char uniname2ctype_pool_str1396[sizeof("phag")];
- char uniname2ctype_pool_str1398[sizeof("brah")];
- char uniname2ctype_pool_str1402[sizeof("mark")];
- char uniname2ctype_pool_str1404[sizeof("hebr")];
- char uniname2ctype_pool_str1411[sizeof("inkhmersymbols")];
- char uniname2ctype_pool_str1413[sizeof("dep")];
- char uniname2ctype_pool_str1416[sizeof("inkhmer")];
- char uniname2ctype_pool_str1422[sizeof("deprecated")];
- char uniname2ctype_pool_str1424[sizeof("rejang")];
- char uniname2ctype_pool_str1429[sizeof("lyci")];
- char uniname2ctype_pool_str1431[sizeof("intakri")];
- char uniname2ctype_pool_str1432[sizeof("takr")];
- char uniname2ctype_pool_str1435[sizeof("incyrillicsupplement")];
- char uniname2ctype_pool_str1436[sizeof("changeswhencasefolded")];
- char uniname2ctype_pool_str1438[sizeof("indevanagariextended")];
- char uniname2ctype_pool_str1442[sizeof("lycian")];
- char uniname2ctype_pool_str1443[sizeof("inbengali")];
- char uniname2ctype_pool_str1448[sizeof("beng")];
- char uniname2ctype_pool_str1450[sizeof("graph")];
- char uniname2ctype_pool_str1452[sizeof("inyijinghexagramsymbols")];
- char uniname2ctype_pool_str1457[sizeof("olck")];
- char uniname2ctype_pool_str1460[sizeof("inarabicsupplement")];
- char uniname2ctype_pool_str1462[sizeof("inbuginese")];
- char uniname2ctype_pool_str1463[sizeof("changeswhencasemapped")];
- char uniname2ctype_pool_str1468[sizeof("olchiki")];
- char uniname2ctype_pool_str1478[sizeof("inaegeannumbers")];
- char uniname2ctype_pool_str1479[sizeof("mlym")];
- char uniname2ctype_pool_str1480[sizeof("alphabetic")];
- char uniname2ctype_pool_str1492[sizeof("sylotinagri")];
- char uniname2ctype_pool_str1498[sizeof("changeswhentitlecased")];
- char uniname2ctype_pool_str1504[sizeof("tagalog")];
- char uniname2ctype_pool_str1505[sizeof("tagb")];
- char uniname2ctype_pool_str1506[sizeof("runr")];
- char uniname2ctype_pool_str1510[sizeof("malayalam")];
- char uniname2ctype_pool_str1512[sizeof("inoriya")];
- char uniname2ctype_pool_str1516[sizeof("intagbanwa")];
- char uniname2ctype_pool_str1517[sizeof("syrc")];
- char uniname2ctype_pool_str1519[sizeof("nko")];
- char uniname2ctype_pool_str1520[sizeof("nkoo")];
- char uniname2ctype_pool_str1523[sizeof("inethiopicextended")];
- char uniname2ctype_pool_str1525[sizeof("kaithi")];
- char uniname2ctype_pool_str1530[sizeof("mathsymbol")];
- char uniname2ctype_pool_str1531[sizeof("inyiradicals")];
- char uniname2ctype_pool_str1536[sizeof("insupplementaryprivateuseareaa")];
- char uniname2ctype_pool_str1540[sizeof("osmanya")];
- char uniname2ctype_pool_str1546[sizeof("syriac")];
- char uniname2ctype_pool_str1548[sizeof("otherdefaultignorablecodepoint")];
- char uniname2ctype_pool_str1561[sizeof("number")];
- char uniname2ctype_pool_str1565[sizeof("inlinearbsyllabary")];
- char uniname2ctype_pool_str1566[sizeof("kthi")];
- char uniname2ctype_pool_str1567[sizeof("sund")];
- char uniname2ctype_pool_str1569[sizeof("mymr")];
- char uniname2ctype_pool_str1571[sizeof("incombiningdiacriticalmarks")];
- char uniname2ctype_pool_str1578[sizeof("enclosingmark")];
- char uniname2ctype_pool_str1581[sizeof("incombiningdiacriticalmarksforsymbols")];
- char uniname2ctype_pool_str1583[sizeof("inethiopicsupplement")];
- char uniname2ctype_pool_str1590[sizeof("unassigned")];
- char uniname2ctype_pool_str1591[sizeof("sylo")];
- char uniname2ctype_pool_str1595[sizeof("combiningmark")];
- char uniname2ctype_pool_str1598[sizeof("myanmar")];
- char uniname2ctype_pool_str1605[sizeof("graphemeextend")];
- char uniname2ctype_pool_str1606[sizeof("bidicontrol")];
- char uniname2ctype_pool_str1609[sizeof("inhalfwidthandfullwidthforms")];
- char uniname2ctype_pool_str1617[sizeof("cyrl")];
- char uniname2ctype_pool_str1620[sizeof("knda")];
- char uniname2ctype_pool_str1634[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
- char uniname2ctype_pool_str1635[sizeof("xsux")];
- char uniname2ctype_pool_str1636[sizeof("modifiersymbol")];
- char uniname2ctype_pool_str1643[sizeof("incombiningdiacriticalmarkssupplement")];
- char uniname2ctype_pool_str1645[sizeof("inhanunoo")];
- char uniname2ctype_pool_str1648[sizeof("inbuhid")];
- char uniname2ctype_pool_str1649[sizeof("kannada")];
- char uniname2ctype_pool_str1658[sizeof("inhebrew")];
- char uniname2ctype_pool_str1662[sizeof("grbase")];
- char uniname2ctype_pool_str1664[sizeof("spacingmark")];
- char uniname2ctype_pool_str1670[sizeof("inkatakanaphoneticextensions")];
- char uniname2ctype_pool_str1676[sizeof("hangul")];
- char uniname2ctype_pool_str1683[sizeof("incjksymbolsandpunctuation")];
- char uniname2ctype_pool_str1688[sizeof("bopo")];
- char uniname2ctype_pool_str1692[sizeof("orya")];
- char uniname2ctype_pool_str1699[sizeof("inbopomofo")];
- char uniname2ctype_pool_str1701[sizeof("kharoshthi")];
- char uniname2ctype_pool_str1703[sizeof("khar")];
- char uniname2ctype_pool_str1709[sizeof("changeswhenlowercased")];
- char uniname2ctype_pool_str1724[sizeof("khmr")];
- char uniname2ctype_pool_str1725[sizeof("punct")];
- char uniname2ctype_pool_str1729[sizeof("symbol")];
- char uniname2ctype_pool_str1732[sizeof("cherokee")];
- char uniname2ctype_pool_str1737[sizeof("cyrillic")];
- char uniname2ctype_pool_str1759[sizeof("inkangxiradicals")];
- char uniname2ctype_pool_str1761[sizeof("hebrew")];
- char uniname2ctype_pool_str1780[sizeof("inarabicpresentationformsb")];
- char uniname2ctype_pool_str1787[sizeof("incyrillicextendedb")];
- char uniname2ctype_pool_str1790[sizeof("ugaritic")];
- char uniname2ctype_pool_str1829[sizeof("incurrencysymbols")];
- char uniname2ctype_pool_str1831[sizeof("meroitichieroglyphs")];
- char uniname2ctype_pool_str1835[sizeof("inhighsurrogates")];
- char uniname2ctype_pool_str1853[sizeof("nonspacingmark")];
- char uniname2ctype_pool_str1858[sizeof("lydi")];
- char uniname2ctype_pool_str1864[sizeof("patsyn")];
- char uniname2ctype_pool_str1868[sizeof("orkh")];
- char uniname2ctype_pool_str1871[sizeof("lydian")];
- char uniname2ctype_pool_str1896[sizeof("ugar")];
- char uniname2ctype_pool_str1899[sizeof("othergraphemeextend")];
- char uniname2ctype_pool_str1900[sizeof("inlatinextendedb")];
- char uniname2ctype_pool_str1904[sizeof("bopomofo")];
- char uniname2ctype_pool_str1917[sizeof("khmer")];
- char uniname2ctype_pool_str1925[sizeof("uideo")];
- char uniname2ctype_pool_str1932[sizeof("otheruppercase")];
- char uniname2ctype_pool_str1944[sizeof("grek")];
- char uniname2ctype_pool_str1949[sizeof("gujr")];
- char uniname2ctype_pool_str1970[sizeof("gujarati")];
- char uniname2ctype_pool_str1983[sizeof("inhanguljamoextendedb")];
- char uniname2ctype_pool_str1988[sizeof("defaultignorablecodepoint")];
- char uniname2ctype_pool_str2005[sizeof("inplayingcards")];
- char uniname2ctype_pool_str2022[sizeof("bamu")];
- char uniname2ctype_pool_str2028[sizeof("inkanbun")];
- char uniname2ctype_pool_str2033[sizeof("incjkradicalssupplement")];
- char uniname2ctype_pool_str2046[sizeof("cypriot")];
- char uniname2ctype_pool_str2051[sizeof("inbamum")];
- char uniname2ctype_pool_str2053[sizeof("inmeroiticcursive")];
- char uniname2ctype_pool_str2055[sizeof("oldturkic")];
- char uniname2ctype_pool_str2086[sizeof("insupplementalarrowsb")];
- char uniname2ctype_pool_str2087[sizeof("surrogate")];
- char uniname2ctype_pool_str2094[sizeof("batk")];
- char uniname2ctype_pool_str2102[sizeof("inbatak")];
- char uniname2ctype_pool_str2119[sizeof("inlimbu")];
- char uniname2ctype_pool_str2123[sizeof("incypriotsyllabary")];
- char uniname2ctype_pool_str2129[sizeof("dashpunctuation")];
- char uniname2ctype_pool_str2130[sizeof("innoblock")];
- char uniname2ctype_pool_str2141[sizeof("hyphen")];
- char uniname2ctype_pool_str2162[sizeof("insupplementalpunctuation")];
- char uniname2ctype_pool_str2165[sizeof("ingeorgiansupplement")];
- char uniname2ctype_pool_str2178[sizeof("oupper")];
- char uniname2ctype_pool_str2189[sizeof("paragraphseparator")];
- char uniname2ctype_pool_str2194[sizeof("inbamumsupplement")];
- char uniname2ctype_pool_str2299[sizeof("uppercase")];
- char uniname2ctype_pool_str2313[sizeof("currencysymbol")];
- char uniname2ctype_pool_str2322[sizeof("sk")];
- char uniname2ctype_pool_str2338[sizeof("lu")];
- char uniname2ctype_pool_str2342[sizeof("openpunctuation")];
- char uniname2ctype_pool_str2349[sizeof("inlisu")];
- char uniname2ctype_pool_str2371[sizeof("qmark")];
- char uniname2ctype_pool_str2372[sizeof("egyp")];
- char uniname2ctype_pool_str2377[sizeof("insupplementaryprivateuseareab")];
- char uniname2ctype_pool_str2379[sizeof("limbu")];
- char uniname2ctype_pool_str2400[sizeof("inegyptianhieroglyphs")];
- char uniname2ctype_pool_str2401[sizeof("unifiedideograph")];
- char uniname2ctype_pool_str2413[sizeof("intelugu")];
- char uniname2ctype_pool_str2429[sizeof("katakana")];
- char uniname2ctype_pool_str2442[sizeof("inhangulcompatibilityjamo")];
- char uniname2ctype_pool_str2454[sizeof("upper")];
- char uniname2ctype_pool_str2495[sizeof("inkayahli")];
- char uniname2ctype_pool_str2515[sizeof("cwu")];
- char uniname2ctype_pool_str2523[sizeof("incjkcompatibility")];
- char uniname2ctype_pool_str2542[sizeof("uppercaseletter")];
- char uniname2ctype_pool_str2549[sizeof("bugi")];
- char uniname2ctype_pool_str2588[sizeof("buginese")];
- char uniname2ctype_pool_str2627[sizeof("any")];
- char uniname2ctype_pool_str2651[sizeof("inyisyllables")];
- char uniname2ctype_pool_str2671[sizeof("inbopomofoextended")];
- char uniname2ctype_pool_str2710[sizeof("inboxdrawing")];
- char uniname2ctype_pool_str2724[sizeof("changeswhenuppercased")];
- char uniname2ctype_pool_str2727[sizeof("unknown")];
- char uniname2ctype_pool_str2737[sizeof("quotationmark")];
- char uniname2ctype_pool_str2753[sizeof("buhd")];
- char uniname2ctype_pool_str2785[sizeof("punctuation")];
- char uniname2ctype_pool_str2888[sizeof("oldsoutharabian")];
- char uniname2ctype_pool_str2925[sizeof("kayahli")];
- char uniname2ctype_pool_str2940[sizeof("incjkunifiedideographs")];
- char uniname2ctype_pool_str2961[sizeof("incjkunifiedideographsextensiona")];
- char uniname2ctype_pool_str2962[sizeof("incjkunifiedideographsextensionc")];
- char uniname2ctype_pool_str2995[sizeof("telugu")];
- char uniname2ctype_pool_str3000[sizeof("guru")];
- char uniname2ctype_pool_str3104[sizeof("greek")];
- char uniname2ctype_pool_str3189[sizeof("grlink")];
- char uniname2ctype_pool_str3197[sizeof("buhid")];
- char uniname2ctype_pool_str3254[sizeof("batak")];
- char uniname2ctype_pool_str3292[sizeof("blank")];
- char uniname2ctype_pool_str3391[sizeof("incjkunifiedideographsextensiond")];
- char uniname2ctype_pool_str3459[sizeof("graphemelink")];
- char uniname2ctype_pool_str3480[sizeof("egyptianhieroglyphs")];
- char uniname2ctype_pool_str3802[sizeof("incjkunifiedideographsextensionb")];
- char uniname2ctype_pool_str3922[sizeof("zyyy")];
- char uniname2ctype_pool_str4167[sizeof("gurmukhi")];
+ char uniname2ctype_pool_str3[sizeof("c")];
+ char uniname2ctype_pool_str5[sizeof("cc")];
+ char uniname2ctype_pool_str7[sizeof("co")];
+ char uniname2ctype_pool_str9[sizeof("l")];
+ char uniname2ctype_pool_str10[sizeof("lo")];
+ char uniname2ctype_pool_str12[sizeof("no")];
+ char uniname2ctype_pool_str13[sizeof("n")];
+ char uniname2ctype_pool_str14[sizeof("ll")];
+ char uniname2ctype_pool_str15[sizeof("cn")];
+ char uniname2ctype_pool_str16[sizeof("nl")];
+ char uniname2ctype_pool_str18[sizeof("lao")];
+ char uniname2ctype_pool_str19[sizeof("laoo")];
+ char uniname2ctype_pool_str20[sizeof("zl")];
+ char uniname2ctype_pool_str21[sizeof("z")];
+ char uniname2ctype_pool_str22[sizeof("control")];
+ char uniname2ctype_pool_str24[sizeof("qaac")];
+ char uniname2ctype_pool_str25[sizeof("ci")];
+ char uniname2ctype_pool_str28[sizeof("lana")];
+ char uniname2ctype_pool_str33[sizeof("oalpha")];
+ char uniname2ctype_pool_str34[sizeof("qaai")];
+ char uniname2ctype_pool_str40[sizeof("arabic")];
+ char uniname2ctype_pool_str41[sizeof("cari")];
+ char uniname2ctype_pool_str43[sizeof("oriya")];
+ char uniname2ctype_pool_str44[sizeof("carian")];
+ char uniname2ctype_pool_str46[sizeof("cntrl")];
+ char uniname2ctype_pool_str49[sizeof("connectorpunctuation")];
+ char uniname2ctype_pool_str50[sizeof("olower")];
+ char uniname2ctype_pool_str51[sizeof("latn")];
+ char uniname2ctype_pool_str52[sizeof("latin")];
+ char uniname2ctype_pool_str56[sizeof("ital")];
+ char uniname2ctype_pool_str65[sizeof("hano")];
+ char uniname2ctype_pool_str66[sizeof("lt")];
+ char uniname2ctype_pool_str68[sizeof("han")];
+ char uniname2ctype_pool_str70[sizeof("hanunoo")];
+ char uniname2ctype_pool_str71[sizeof("canadianaboriginal")];
+ char uniname2ctype_pool_str73[sizeof("hangul")];
+ char uniname2ctype_pool_str74[sizeof("hani")];
+ char uniname2ctype_pool_str76[sizeof("nchar")];
+ char uniname2ctype_pool_str77[sizeof("zinh")];
+ char uniname2ctype_pool_str83[sizeof("tale")];
+ char uniname2ctype_pool_str85[sizeof("loe")];
+ char uniname2ctype_pool_str86[sizeof("hira")];
+ char uniname2ctype_pool_str91[sizeof("taile")];
+ char uniname2ctype_pool_str92[sizeof("lineseparator")];
+ char uniname2ctype_pool_str94[sizeof("thaa")];
+ char uniname2ctype_pool_str97[sizeof("hiragana")];
+ char uniname2ctype_pool_str98[sizeof("thai")];
+ char uniname2ctype_pool_str100[sizeof("initialpunctuation")];
+ char uniname2ctype_pool_str101[sizeof("other")];
+ char uniname2ctype_pool_str103[sizeof("thaana")];
+ char uniname2ctype_pool_str107[sizeof("cher")];
+ char uniname2ctype_pool_str111[sizeof("otherletter")];
+ char uniname2ctype_pool_str113[sizeof("othernumber")];
+ char uniname2ctype_pool_str114[sizeof("letter")];
+ char uniname2ctype_pool_str116[sizeof("sc")];
+ char uniname2ctype_pool_str118[sizeof("so")];
+ char uniname2ctype_pool_str123[sizeof("taiviet")];
+ char uniname2ctype_pool_str128[sizeof("noncharactercodepoint")];
+ char uniname2ctype_pool_str129[sizeof("ethi")];
+ char uniname2ctype_pool_str130[sizeof("cans")];
+ char uniname2ctype_pool_str135[sizeof("titlecaseletter")];
+ char uniname2ctype_pool_str136[sizeof("ascii")];
+ char uniname2ctype_pool_str138[sizeof("letternumber")];
+ char uniname2ctype_pool_str139[sizeof("otheralphabetic")];
+ char uniname2ctype_pool_str141[sizeof("otherlowercase")];
+ char uniname2ctype_pool_str144[sizeof("idc")];
+ char uniname2ctype_pool_str146[sizeof("oidc")];
+ char uniname2ctype_pool_str147[sizeof("sinhala")];
+ char uniname2ctype_pool_str148[sizeof("terminalpunctuation")];
+ char uniname2ctype_pool_str151[sizeof("olditalic")];
+ char uniname2ctype_pool_str152[sizeof("di")];
+ char uniname2ctype_pool_str153[sizeof("otheridcontinue")];
+ char uniname2ctype_pool_str155[sizeof("odi")];
+ char uniname2ctype_pool_str156[sizeof("dia")];
+ char uniname2ctype_pool_str161[sizeof("otheridstart")];
+ char uniname2ctype_pool_str162[sizeof("oldturkic")];
+ char uniname2ctype_pool_str167[sizeof("diacritic")];
+ char uniname2ctype_pool_str168[sizeof("oldpersian")];
+ char uniname2ctype_pool_str171[sizeof("radical")];
+ char uniname2ctype_pool_str179[sizeof("sinh")];
+ char uniname2ctype_pool_str183[sizeof("ideo")];
+ char uniname2ctype_pool_str185[sizeof("shavian")];
+ char uniname2ctype_pool_str186[sizeof("format")];
+ char uniname2ctype_pool_str192[sizeof("inscriptionalparthian")];
+ char uniname2ctype_pool_str196[sizeof("vai")];
+ char uniname2ctype_pool_str197[sizeof("vaii")];
+ char uniname2ctype_pool_str202[sizeof("tifinagh")];
+ char uniname2ctype_pool_str203[sizeof("cf")];
+ char uniname2ctype_pool_str205[sizeof("othersymbol")];
+ char uniname2ctype_pool_str207[sizeof("ideographic")];
+ char uniname2ctype_pool_str211[sizeof("inherited")];
+ char uniname2ctype_pool_str212[sizeof("glagolitic")];
+ char uniname2ctype_pool_str218[sizeof("idcontinue")];
+ char uniname2ctype_pool_str220[sizeof("asciihexdigit")];
+ char uniname2ctype_pool_str224[sizeof("inscriptionalpahlavi")];
+ char uniname2ctype_pool_str225[sizeof("s")];
+ char uniname2ctype_pool_str226[sizeof("gothic")];
+ char uniname2ctype_pool_str227[sizeof("cs")];
+ char uniname2ctype_pool_str229[sizeof("avestan")];
+ char uniname2ctype_pool_str235[sizeof("tavt")];
+ char uniname2ctype_pool_str236[sizeof("zs")];
+ char uniname2ctype_pool_str243[sizeof("decimalnumber")];
+ char uniname2ctype_pool_str244[sizeof("tagbanwa")];
+ char uniname2ctype_pool_str245[sizeof("joinc")];
+ char uniname2ctype_pool_str248[sizeof("geor")];
+ char uniname2ctype_pool_str249[sizeof("hang")];
+ char uniname2ctype_pool_str251[sizeof("georgian")];
+ char uniname2ctype_pool_str253[sizeof("cased")];
+ char uniname2ctype_pool_str256[sizeof("joincontrol")];
+ char uniname2ctype_pool_str257[sizeof("oids")];
+ char uniname2ctype_pool_str260[sizeof("variationselector")];
+ char uniname2ctype_pool_str262[sizeof("graph")];
+ char uniname2ctype_pool_str263[sizeof("changeswhenlowercased")];
+ char uniname2ctype_pool_str264[sizeof("nd")];
+ char uniname2ctype_pool_str268[sizeof("goth")];
+ char uniname2ctype_pool_str269[sizeof("pc")];
+ char uniname2ctype_pool_str271[sizeof("po")];
+ char uniname2ctype_pool_str272[sizeof("ogrext")];
+ char uniname2ctype_pool_str276[sizeof("coptic")];
+ char uniname2ctype_pool_str277[sizeof("grext")];
+ char uniname2ctype_pool_str282[sizeof("logicalorderexception")];
+ char uniname2ctype_pool_str285[sizeof("idst")];
+ char uniname2ctype_pool_str288[sizeof("alpha")];
+ char uniname2ctype_pool_str289[sizeof("pi")];
+ char uniname2ctype_pool_str292[sizeof("dsrt")];
+ char uniname2ctype_pool_str297[sizeof("dash")];
+ char uniname2ctype_pool_str298[sizeof("otherdefaultignorablecodepoint")];
+ char uniname2ctype_pool_str302[sizeof("copt")];
+ char uniname2ctype_pool_str306[sizeof("idstart")];
+ char uniname2ctype_pool_str307[sizeof("closepunctuation")];
+ char uniname2ctype_pool_str309[sizeof("changeswhentitlecased")];
+ char uniname2ctype_pool_str312[sizeof("lepc")];
+ char uniname2ctype_pool_str317[sizeof("avst")];
+ char uniname2ctype_pool_str318[sizeof("cprt")];
+ char uniname2ctype_pool_str319[sizeof("runic")];
+ char uniname2ctype_pool_str320[sizeof("patsyn")];
+ char uniname2ctype_pool_str321[sizeof("mc")];
+ char uniname2ctype_pool_str326[sizeof("tfng")];
+ char uniname2ctype_pool_str327[sizeof("lepcha")];
+ char uniname2ctype_pool_str328[sizeof("prti")];
+ char uniname2ctype_pool_str329[sizeof("print")];
+ char uniname2ctype_pool_str330[sizeof("phli")];
+ char uniname2ctype_pool_str331[sizeof("mn")];
+ char uniname2ctype_pool_str332[sizeof("idsbinaryoperator")];
+ char uniname2ctype_pool_str334[sizeof("talu")];
+ char uniname2ctype_pool_str335[sizeof("runr")];
+ char uniname2ctype_pool_str337[sizeof("graphemebase")];
+ char uniname2ctype_pool_str338[sizeof("common")];
+ char uniname2ctype_pool_str339[sizeof("alnum")];
+ char uniname2ctype_pool_str340[sizeof("phoenician")];
+ char uniname2ctype_pool_str341[sizeof("deva")];
+ char uniname2ctype_pool_str342[sizeof("changeswhencasefolded")];
+ char uniname2ctype_pool_str343[sizeof("pe")];
+ char uniname2ctype_pool_str344[sizeof("mongolian")];
+ char uniname2ctype_pool_str352[sizeof("armn")];
+ char uniname2ctype_pool_str353[sizeof("deseret")];
+ char uniname2ctype_pool_str354[sizeof("softdotted")];
+ char uniname2ctype_pool_str357[sizeof("armi")];
+ char uniname2ctype_pool_str358[sizeof("devanagari")];
+ char uniname2ctype_pool_str360[sizeof("digit")];
+ char uniname2ctype_pool_str361[sizeof("caseignorable")];
+ char uniname2ctype_pool_str362[sizeof("taml")];
+ char uniname2ctype_pool_str363[sizeof("tamil")];
+ char uniname2ctype_pool_str365[sizeof("telu")];
+ char uniname2ctype_pool_str366[sizeof("ids")];
+ char uniname2ctype_pool_str367[sizeof("armenian")];
+ char uniname2ctype_pool_str370[sizeof("sd")];
+ char uniname2ctype_pool_str372[sizeof("privateuse")];
+ char uniname2ctype_pool_str373[sizeof("assigned")];
+ char uniname2ctype_pool_str375[sizeof("cham")];
+ char uniname2ctype_pool_str377[sizeof("omath")];
+ char uniname2ctype_pool_str378[sizeof("otherpunctuation")];
+ char uniname2ctype_pool_str379[sizeof("taitham")];
+ char uniname2ctype_pool_str381[sizeof("defaultignorablecodepoint")];
+ char uniname2ctype_pool_str387[sizeof("glag")];
+ char uniname2ctype_pool_str388[sizeof("ethiopic")];
+ char uniname2ctype_pool_str390[sizeof("vs")];
+ char uniname2ctype_pool_str395[sizeof("me")];
+ char uniname2ctype_pool_str396[sizeof("cwl")];
+ char uniname2ctype_pool_str400[sizeof("mtei")];
+ char uniname2ctype_pool_str404[sizeof("math")];
+ char uniname2ctype_pool_str407[sizeof("term")];
+ char uniname2ctype_pool_str408[sizeof("java")];
+ char uniname2ctype_pool_str410[sizeof("tglg")];
+ char uniname2ctype_pool_str413[sizeof("lower")];
+ char uniname2ctype_pool_str414[sizeof("patternwhitespace")];
+ char uniname2ctype_pool_str417[sizeof("finalpunctuation")];
+ char uniname2ctype_pool_str418[sizeof("tagalog")];
+ char uniname2ctype_pool_str419[sizeof("patws")];
+ char uniname2ctype_pool_str420[sizeof("lisu")];
+ char uniname2ctype_pool_str426[sizeof("otheruppercase")];
+ char uniname2ctype_pool_str427[sizeof("space")];
+ char uniname2ctype_pool_str429[sizeof("graphemeextend")];
+ char uniname2ctype_pool_str430[sizeof("saur")];
+ char uniname2ctype_pool_str435[sizeof("uideo")];
+ char uniname2ctype_pool_str438[sizeof("lowercase")];
+ char uniname2ctype_pool_str440[sizeof("rjng")];
+ char uniname2ctype_pool_str442[sizeof("osma")];
+ char uniname2ctype_pool_str444[sizeof("linb")];
+ char uniname2ctype_pool_str445[sizeof("bali")];
+ char uniname2ctype_pool_str448[sizeof("cwt")];
+ char uniname2ctype_pool_str449[sizeof("separator")];
+ char uniname2ctype_pool_str450[sizeof("othermath")];
+ char uniname2ctype_pool_str451[sizeof("unassigned")];
+ char uniname2ctype_pool_str454[sizeof("lowercaseletter")];
+ char uniname2ctype_pool_str455[sizeof("arab")];
+ char uniname2ctype_pool_str458[sizeof("samr")];
+ char uniname2ctype_pool_str459[sizeof("brai")];
+ char uniname2ctype_pool_str460[sizeof("sundanese")];
+ char uniname2ctype_pool_str462[sizeof("samaritan")];
+ char uniname2ctype_pool_str463[sizeof("ahex")];
+ char uniname2ctype_pool_str465[sizeof("linearb")];
+ char uniname2ctype_pool_str467[sizeof("pf")];
+ char uniname2ctype_pool_str469[sizeof("ext")];
+ char uniname2ctype_pool_str474[sizeof("olck")];
+ char uniname2ctype_pool_str476[sizeof("nko")];
+ char uniname2ctype_pool_str477[sizeof("nkoo")];
+ char uniname2ctype_pool_str479[sizeof("newline")];
+ char uniname2ctype_pool_str480[sizeof("tibetan")];
+ char uniname2ctype_pool_str481[sizeof("javanese")];
+ char uniname2ctype_pool_str485[sizeof("bengali")];
+ char uniname2ctype_pool_str486[sizeof("newtailue")];
+ char uniname2ctype_pool_str487[sizeof("kana")];
+ char uniname2ctype_pool_str488[sizeof("olchiki")];
+ char uniname2ctype_pool_str489[sizeof("kali")];
+ char uniname2ctype_pool_str490[sizeof("cwcf")];
+ char uniname2ctype_pool_str491[sizeof("ps")];
+ char uniname2ctype_pool_str493[sizeof("braille")];
+ char uniname2ctype_pool_str494[sizeof("tibt")];
+ char uniname2ctype_pool_str502[sizeof("sterm")];
+ char uniname2ctype_pool_str504[sizeof("ugar")];
+ char uniname2ctype_pool_str505[sizeof("nonspacingmark")];
+ char uniname2ctype_pool_str508[sizeof("phag")];
+ char uniname2ctype_pool_str509[sizeof("kaithi")];
+ char uniname2ctype_pool_str512[sizeof("xidc")];
+ char uniname2ctype_pool_str514[sizeof("balinese")];
+ char uniname2ctype_pool_str515[sizeof("mong")];
+ char uniname2ctype_pool_str516[sizeof("ogam")];
+ char uniname2ctype_pool_str520[sizeof("modifierletter")];
+ char uniname2ctype_pool_str521[sizeof("ugaritic")];
+ char uniname2ctype_pool_str522[sizeof("katakana")];
+ char uniname2ctype_pool_str523[sizeof("pd")];
+ char uniname2ctype_pool_str525[sizeof("hebr")];
+ char uniname2ctype_pool_str531[sizeof("p")];
+ char uniname2ctype_pool_str533[sizeof("orkh")];
+ char uniname2ctype_pool_str536[sizeof("word")];
+ char uniname2ctype_pool_str537[sizeof("saurashtra")];
+ char uniname2ctype_pool_str538[sizeof("khar")];
+ char uniname2ctype_pool_str539[sizeof("sund")];
+ char uniname2ctype_pool_str542[sizeof("zp")];
+ char uniname2ctype_pool_str548[sizeof("changeswhenuppercased")];
+ char uniname2ctype_pool_str552[sizeof("xidstart")];
+ char uniname2ctype_pool_str553[sizeof("shaw")];
+ char uniname2ctype_pool_str554[sizeof("kthi")];
+ char uniname2ctype_pool_str556[sizeof("ogham")];
+ char uniname2ctype_pool_str558[sizeof("spaceseparator")];
+ char uniname2ctype_pool_str559[sizeof("changeswhencasemapped")];
+ char uniname2ctype_pool_str560[sizeof("sarb")];
+ char uniname2ctype_pool_str562[sizeof("xidcontinue")];
+ char uniname2ctype_pool_str564[sizeof("bidic")];
+ char uniname2ctype_pool_str570[sizeof("deprecated")];
+ char uniname2ctype_pool_str573[sizeof("xdigit")];
+ char uniname2ctype_pool_str575[sizeof("bidicontrol")];
+ char uniname2ctype_pool_str584[sizeof("lu")];
+ char uniname2ctype_pool_str587[sizeof("dashpunctuation")];
+ char uniname2ctype_pool_str590[sizeof("extender")];
+ char uniname2ctype_pool_str593[sizeof("idstrinaryoperator")];
+ char uniname2ctype_pool_str594[sizeof("cherokee")];
+ char uniname2ctype_pool_str595[sizeof("punct")];
+ char uniname2ctype_pool_str597[sizeof("phagspa")];
+ char uniname2ctype_pool_str598[sizeof("oupper")];
+ char uniname2ctype_pool_str599[sizeof("lyci")];
+ char uniname2ctype_pool_str601[sizeof("whitespace")];
+ char uniname2ctype_pool_str602[sizeof("lycian")];
+ char uniname2ctype_pool_str603[sizeof("yi")];
+ char uniname2ctype_pool_str606[sizeof("cyrl")];
+ char uniname2ctype_pool_str608[sizeof("knda")];
+ char uniname2ctype_pool_str610[sizeof("orya")];
+ char uniname2ctype_pool_str611[sizeof("cyrillic")];
+ char uniname2ctype_pool_str616[sizeof("yiii")];
+ char uniname2ctype_pool_str618[sizeof("kannada")];
+ char uniname2ctype_pool_str623[sizeof("xids")];
+ char uniname2ctype_pool_str626[sizeof("limbu")];
+ char uniname2ctype_pool_str635[sizeof("m")];
+ char uniname2ctype_pool_str638[sizeof("unifiedideograph")];
+ char uniname2ctype_pool_str639[sizeof("paragraphseparator")];
+ char uniname2ctype_pool_str640[sizeof("lm")];
+ char uniname2ctype_pool_str645[sizeof("openpunctuation")];
+ char uniname2ctype_pool_str646[sizeof("tagb")];
+ char uniname2ctype_pool_str649[sizeof("kharoshthi")];
+ char uniname2ctype_pool_str651[sizeof("enclosingmark")];
+ char uniname2ctype_pool_str652[sizeof("surrogate")];
+ char uniname2ctype_pool_str653[sizeof("beng")];
+ char uniname2ctype_pool_str654[sizeof("number")];
+ char uniname2ctype_pool_str656[sizeof("telugu")];
+ char uniname2ctype_pool_str660[sizeof("rejang")];
+ char uniname2ctype_pool_str661[sizeof("malayalam")];
+ char uniname2ctype_pool_str674[sizeof("idsb")];
+ char uniname2ctype_pool_str676[sizeof("hexdigit")];
+ char uniname2ctype_pool_str677[sizeof("xpeo")];
+ char uniname2ctype_pool_str689[sizeof("phnx")];
+ char uniname2ctype_pool_str692[sizeof("bopo")];
+ char uniname2ctype_pool_str698[sizeof("bopomofo")];
+ char uniname2ctype_pool_str699[sizeof("dep")];
+ char uniname2ctype_pool_str701[sizeof("sylo")];
+ char uniname2ctype_pool_str705[sizeof("grbase")];
+ char uniname2ctype_pool_str706[sizeof("alphabetic")];
+ char uniname2ctype_pool_str707[sizeof("cwcm")];
+ char uniname2ctype_pool_str708[sizeof("patternsyntax")];
+ char uniname2ctype_pool_str709[sizeof("grek")];
+ char uniname2ctype_pool_str710[sizeof("greek")];
+ char uniname2ctype_pool_str714[sizeof("syrc")];
+ char uniname2ctype_pool_str717[sizeof("syriac")];
+ char uniname2ctype_pool_str722[sizeof("cuneiform")];
+ char uniname2ctype_pool_str723[sizeof("gujr")];
+ char uniname2ctype_pool_str726[sizeof("lydi")];
+ char uniname2ctype_pool_str727[sizeof("gujarati")];
+ char uniname2ctype_pool_str728[sizeof("sylotinagri")];
+ char uniname2ctype_pool_str729[sizeof("lydian")];
+ char uniname2ctype_pool_str748[sizeof("sm")];
+ char uniname2ctype_pool_str751[sizeof("currencysymbol")];
+ char uniname2ctype_pool_str755[sizeof("limb")];
+ char uniname2ctype_pool_str758[sizeof("othergraphemeextend")];
+ char uniname2ctype_pool_str786[sizeof("guru")];
+ char uniname2ctype_pool_str797[sizeof("qmark")];
+ char uniname2ctype_pool_str809[sizeof("mark")];
+ char uniname2ctype_pool_str820[sizeof("quotationmark")];
+ char uniname2ctype_pool_str823[sizeof("hex")];
+ char uniname2ctype_pool_str842[sizeof("upper")];
+ char uniname2ctype_pool_str843[sizeof("wspace")];
+ char uniname2ctype_pool_str848[sizeof("khmr")];
+ char uniname2ctype_pool_str849[sizeof("khmer")];
+ char uniname2ctype_pool_str863[sizeof("oldsoutharabian")];
+ char uniname2ctype_pool_str864[sizeof("spacingmark")];
+ char uniname2ctype_pool_str866[sizeof("punctuation")];
+ char uniname2ctype_pool_str867[sizeof("uppercase")];
+ char uniname2ctype_pool_str878[sizeof("meeteimayek")];
+ char uniname2ctype_pool_str883[sizeof("uppercaseletter")];
+ char uniname2ctype_pool_str884[sizeof("cypriot")];
+ char uniname2ctype_pool_str886[sizeof("buhd")];
+ char uniname2ctype_pool_str887[sizeof("buhid")];
+ char uniname2ctype_pool_str895[sizeof("modifiersymbol")];
+ char uniname2ctype_pool_str898[sizeof("blank")];
+ char uniname2ctype_pool_str908[sizeof("hyphen")];
+ char uniname2ctype_pool_str909[sizeof("bugi")];
+ char uniname2ctype_pool_str935[sizeof("myanmar")];
+ char uniname2ctype_pool_str937[sizeof("imperialaramaic")];
+ char uniname2ctype_pool_str947[sizeof("mathsymbol")];
+ char uniname2ctype_pool_str966[sizeof("cwu")];
+ char uniname2ctype_pool_str975[sizeof("gurmukhi")];
+ char uniname2ctype_pool_str978[sizeof("buginese")];
+ char uniname2ctype_pool_str1022[sizeof("symbol")];
+ char uniname2ctype_pool_str1024[sizeof("osmanya")];
+ char uniname2ctype_pool_str1036[sizeof("bamu")];
+ char uniname2ctype_pool_str1040[sizeof("sk")];
+ char uniname2ctype_pool_str1065[sizeof("bamum")];
+ char uniname2ctype_pool_str1071[sizeof("kayahli")];
+ char uniname2ctype_pool_str1072[sizeof("egyp")];
+ char uniname2ctype_pool_str1140[sizeof("grlink")];
+ char uniname2ctype_pool_str1141[sizeof("xsux")];
+ char uniname2ctype_pool_str1174[sizeof("any")];
+ char uniname2ctype_pool_str1187[sizeof("graphemelink")];
+ char uniname2ctype_pool_str1221[sizeof("mlym")];
+ char uniname2ctype_pool_str1235[sizeof("mymr")];
+ char uniname2ctype_pool_str1277[sizeof("hebrew")];
+ char uniname2ctype_pool_str1542[sizeof("egyptianhieroglyphs")];
+ char uniname2ctype_pool_str1751[sizeof("zyyy")];
#endif /* USE_UNICODE_PROPERTIES */
};
static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
{
#ifndef USE_UNICODE_PROPERTIES
- "word",
"print",
"punct",
- "alpha",
- "alnum",
- "xdigit",
- "upper",
#else /* USE_UNICODE_PROPERTIES */
- "n",
- "s",
- "z",
- "zs",
- "zzzz",
- "cn",
- "cs",
- "ci",
"c",
- "cf",
- "sc",
- "cans",
- "qaai",
- "mn",
-#endif /* USE_UNICODE_PROPERTIES */
- "ascii",
-#ifdef USE_UNICODE_PROPERTIES
"cc",
- "qaac",
- "inavestan",
- "inspecials",
- "inipaextensions",
- "mc",
- "insamaritan",
- "m",
- "sm",
- "me",
- "inarmenian",
- "incuneiform",
- "mandaic",
- "inancientsymbols",
- "incuneiformnumbersandpunctuation",
- "inthai",
- "inmusicalsymbols",
- "inmiscellaneoussymbols",
- "incham",
- "inmiscellaneoussymbolsandarrows",
- "initialpunctuation",
- "inmiscellaneoussymbolsandpictographs",
- "inthaana",
- "taile",
- "mtei",
- "lc",
- "lana",
- "inlycian",
- "intransportandmapsymbols",
- "incontrolpictures",
- "sinhala",
- "incommonindicnumberforms",
- "inmiscellaneousmathematicalsymbolsa",
- "sterm",
- "inmyanmarextendeda",
- "lm",
- "taiviet",
- "inlinearbideograms",
- "intaitham",
- "latn",
- "latin",
- "ital",
- "alnum",
- "inmalayalam",
- "intaile",
- "tale",
+ "co",
"l",
+ "lo",
+ "no",
+ "n",
+ "ll",
+ "cn",
"nl",
+ "lao",
+ "laoo",
"zl",
- "intamil",
- "taml",
- "inlatinextendeda",
- "inlatinextendedc",
- "inrunic",
- "incarian",
- "insyriac",
+ "z",
+ "control",
+ "qaac",
+ "ci",
+ "lana",
+ "oalpha",
+ "qaai",
+ "arabic",
"cari",
- "inmeeteimayekextensions",
- "osma",
- "lt",
- "miao",
- "insharada",
- "incyrillic",
+ "oriya",
"carian",
- "armn",
- "samr",
- "armi",
- "inideographicdescriptioncharacters",
- "inosmanya",
- "armenian",
- "inmyanmar",
- "samaritan",
- "arabic",
- "incherokee",
- "connectorpunctuation",
- "merc",
- "inmiscellaneoustechnical",
- "inenclosedalphanumerics",
- "inemoticons",
- "joinc",
-#endif /* USE_UNICODE_PROPERTIES */
"cntrl",
-#ifdef USE_UNICODE_PROPERTIES
- "inenclosedcjklettersandmonths",
- "cwcf",
- "inruminumeralsymbols",
- "ll",
- "term",
- "inlatinextendedadditional",
- "tamil",
- "loe",
- "newtailue",
- "cwcm",
- "inenclosedalphanumericsupplement",
- "sinh",
- "zinh",
- "meroiticcursive",
+ "connectorpunctuation",
+ "olower",
+ "latn",
+ "latin",
+ "ital",
+ "hano",
+ "lt",
"han",
+ "hanunoo",
+ "canadianaboriginal",
+ "hangul",
"hani",
- "inopticalcharacterrecognition",
- "no",
- "so",
- "innewtailue",
- "insinhala",
- "innko",
- "co",
- "shavian",
- "terminalpunctuation",
- "intaixuanjingsymbols",
- "inethiopic",
- "sora",
- "inarrows",
- "cham",
- "inlowsurrogates",
- "oriya",
- "ext",
- "cwt",
- "common",
- "inmiao",
+ "nchar",
+ "zinh",
+ "tale",
+ "loe",
+ "hira",
+ "taile",
+ "lineseparator",
+ "thaa",
+ "hiragana",
"thai",
- "intifinagh",
+ "initialpunctuation",
+ "other",
+ "thaana",
+ "cher",
+ "otherletter",
+ "othernumber",
+ "letter",
+ "sc",
+ "so",
+ "taiviet",
+ "noncharactercodepoint",
"ethi",
- "mero",
- "chakma",
- "thaa",
- "inscriptionalparthian",
- "tifinagh",
+ "cans",
"titlecaseletter",
- "thaana",
- "asciihexdigit",
- "math",
+ "ascii",
+ "letternumber",
+ "otheralphabetic",
+ "otherlowercase",
+ "idc",
+ "oidc",
+ "sinhala",
+ "terminalpunctuation",
+ "olditalic",
"di",
- "ids",
- "lo",
- "inlao",
- "taitham",
- "lao",
- "laoo",
+ "otheridcontinue",
+ "odi",
"dia",
- "idc",
- "ps",
- "insundanese",
- "pi",
- "cwl",
- "pf",
- "mand",
- "insylotinagri",
- "vs",
- "mongolian",
- "pc",
- "inmandaic",
- "invai",
- "lineseparator",
- "pe",
+ "otheridstart",
+ "oldturkic",
+ "diacritic",
+ "oldpersian",
+ "radical",
+ "sinh",
+ "ideo",
+ "shavian",
+ "format",
+ "inscriptionalparthian",
"vai",
"vaii",
- "idst",
- "indominotiles",
- "inshavian",
- "inspacingmodifierletters",
- "format",
- "inphaistosdisc",
- "hano",
-#endif /* USE_UNICODE_PROPERTIES */
- "space",
-#ifdef USE_UNICODE_PROPERTIES
- "indeseret",
- "inolchiki",
- "hira",
- "joincontrol",
+ "tifinagh",
+ "cf",
+ "othersymbol",
+ "ideographic",
+ "inherited",
+ "glagolitic",
"idcontinue",
- "inmahjongtiles",
- "patws",
- "inlydian",
- "cher",
- "inhiragana",
- "inogham",
- "avst",
+ "asciihexdigit",
"inscriptionalpahlavi",
- "incoptic",
- "java",
- "inmathematicalalphanumericsymbols",
- "letter",
- "injavanese",
+ "s",
+ "gothic",
+ "cs",
"avestan",
- "age=1.1",
- "lepc",
- "age=2.1",
- "inlepcha",
- "javanese",
- "shaw",
- "finalpunctuation",
- "alpha",
- "age=5.1",
- "inmongolian",
- "age=5.2",
- "age=2.0",
- "ahex",
- "ingeneralpunctuation",
- "oids",
- "odi",
- "age=5.0",
"tavt",
- "intaiviet",
- "age=6.1",
- "age=3.1",
- "insundanesesupplement",
- "age=3.2",
- "age=4.1",
- "oidc",
- "tfng",
- "insmallformvariants",
- "ideo",
- "intags",
- "age=6.0",
- "age=3.0",
- "whitespace",
- "age=4.0",
- "inolditalic",
- "oalpha",
- "ingujarati",
- "control",
- "diacritic",
+ "zs",
+ "decimalnumber",
"tagbanwa",
- "inphoenician",
- "ininscriptionalparthian",
- "ininscriptionalpahlavi",
+ "joinc",
+ "geor",
+ "hang",
+ "georgian",
+ "cased",
+ "joincontrol",
+ "oids",
+ "variationselector",
+ "graph",
+ "changeswhenlowercased",
+ "nd",
+ "goth",
+ "pc",
+ "po",
+ "ogrext",
"coptic",
+ "grext",
+ "logicalorderexception",
+ "idst",
+#endif /* USE_UNICODE_PROPERTIES */
+ "alpha",
+#ifdef USE_UNICODE_PROPERTIES
+ "pi",
"dsrt",
- "inmodifiertoneletters",
- "xids",
- "hanunoo",
- "inoldturkic",
- "xidc",
- "idstart",
- "inimperialaramaic",
- "invariationselectors",
+ "dash",
+ "otherdefaultignorablecodepoint",
"copt",
- "caseignorable",
- "prti",
- "nchar",
- "deseret",
- "decimalnumber",
+ "idstart",
+ "closepunctuation",
+ "changeswhentitlecased",
+ "lepc",
+ "avst",
"cprt",
- "inlatin1supplement",
- "imperialaramaic",
- "privateuse",
- "casedletter",
- "lowercase",
- "spaceseparator",
- "radical",
- "mong",
- "canadianaboriginal",
- "letternumber",
- "insorasompeng",
- "dash",
- "wspace",
- "ogam",
- "invariationselectorssupplement",
+ "runic",
+ "patsyn",
+ "mc",
+ "tfng",
+ "lepcha",
+ "prti",
"print",
- "otheridcontinue",
- "ingurmukhi",
- "closepunctuation",
- "olditalic",
- "noncharactercodepoint",
- "sharada",
- "ingeometricshapes",
- "otheralphabetic",
- "patternwhitespace",
- "po",
- "rjng",
- "ingreekandcoptic",
- "xdigit",
- "gothic",
- "inoldsoutharabian",
- "xidstart",
- "inrejang",
- "idsbinaryoperator",
- "olower",
- "hex",
- "inenclosedideographicsupplement",
- "inalphabeticpresentationforms",
- "inbasiclatin",
- "othersymbol",
- "nd",
- "sd",
- "omath",
- "separator",
- "inarabic",
- "xidcontinue",
- "otheridstart",
- "grext",
- "otherlowercase",
"phli",
- "cased",
- "hang",
- "xpeo",
+ "mn",
+ "idsbinaryoperator",
+ "talu",
+ "runr",
+ "graphemebase",
+ "common",
#endif /* USE_UNICODE_PROPERTIES */
- "lower",
+ "alnum",
#ifndef USE_UNICODE_PROPERTIES
- "graph",
+ "xdigit",
+ "newline",
+ "upper",
+ "ascii",
+ "cntrl",
#else /* USE_UNICODE_PROPERTIES */
- "modifierletter",
- "inphoneticextensions",
- "inarabicpresentationformsa",
- "innumberforms",
- "oldpersian",
- "incyrillicextendeda",
- "inverticalforms",
- "p",
- "inbyzantinemusicalsymbols",
- "inmathematicaloperators",
- "intibetan",
- "zp",
- "ingeorgian",
- "inbraillepatterns",
- "lepcha",
- "geor",
- "invedicextensions",
- "linb",
- "other",
+ "phoenician",
"deva",
- "indevanagari",
- "othernumber",
- "bamum",
- "shrd",
- "bali",
+ "changeswhencasefolded",
+ "pe",
+ "mongolian",
+ "armn",
+ "deseret",
+ "softdotted",
+ "armi",
"devanagari",
- "extender",
- "inherited",
- "glagolitic",
- "tibt",
- "inbalinese",
- "ingothic",
- "inmiscellaneousmathematicalsymbolsb",
- "limb",
- "bengali",
- "phoenician",
- "insuperscriptsandsubscripts",
- "inmeroitichieroglyphs",
- "tibetan",
- "inphoneticextensionssupplement",
- "balinese",
- "lowercaseletter",
- "indingbats",
- "inprivateusearea",
+ "digit",
+ "caseignorable",
+ "taml",
+ "tamil",
+ "telu",
+ "ids",
+ "armenian",
+ "sd",
+ "privateuse",
"assigned",
- "patternsyntax",
- "inhangulsyllables",
- "sarb",
- "brai",
- "insupplementalmathematicaloperators",
- "phnx",
- "ingreekextended",
- "otherletter",
- "arab",
- "inlatinextendedd",
- "word",
- "inphagspa",
- "inblockelements",
+ "cham",
+ "omath",
+ "otherpunctuation",
+ "taitham",
+ "defaultignorablecodepoint",
+ "glag",
"ethiopic",
- "inethiopicextendeda",
- "brahmi",
- "logicalorderexception",
- "inoldpersian",
- "inletterlikesymbols",
- "sorasompeng",
- "hiragana",
- "inhanguljamoextendeda",
- "othermath",
+ "vs",
+ "me",
+ "cwl",
+ "mtei",
+ "math",
+ "term",
+ "java",
+ "tglg",
+ "lower",
+ "patternwhitespace",
+ "finalpunctuation",
+ "tagalog",
+ "patws",
+ "lisu",
+ "otheruppercase",
#endif /* USE_UNICODE_PROPERTIES */
- "digit",
-#ifndef USE_UNICODE_PROPERTIES
- "blank"
-#else /* USE_UNICODE_PROPERTIES */
- "goth",
- "ogham",
+ "space",
+#ifdef USE_UNICODE_PROPERTIES
+ "graphemeextend",
+ "saur",
+ "uideo",
+ "lowercase",
+ "rjng",
+ "osma",
+ "linb",
+ "bali",
+ "cwt",
+ "separator",
+ "othermath",
+ "unassigned",
+ "lowercaseletter",
+ "arab",
+ "samr",
+ "brai",
"sundanese",
- "saurashtra",
+ "samaritan",
+ "ahex",
"linearb",
- "graphemebase",
- "inunifiedcanadianaboriginalsyllabics",
- "cuneiform",
- "inkannada",
+ "pf",
+ "ext",
+ "olck",
+ "nko",
+ "nkoo",
+ "newline",
+ "tibetan",
+ "javanese",
+ "bengali",
+ "newtailue",
"kana",
- "inancientgreeknumbers",
- "incjkstrokes",
- "inglagolitic",
- "inancientgreekmusicalnotation",
- "inchakma",
- "plrd",
- "inbrahmi",
- "cakm",
- "incjkcompatibilityforms",
- "lisu",
- "incjkcompatibilityideographs",
- "intagalog",
- "inkaithi",
- "insupplementalarrowsa",
- "takri",
- "ideographic",
- "hexdigit",
- "glag",
- "softdotted",
- "variationselector",
- "inkatakana",
- "meeteimayek",
- "otherpunctuation",
- "inhanguljamo",
+ "olchiki",
"kali",
+ "cwcf",
+ "ps",
"braille",
- "incombininghalfmarks",
- "talu",
- "incjkcompatibilityideographssupplement",
- "telu",
- "idsb",
- "tglg",
- "inmeeteimayek",
- "yi",
- "phagspa",
- "yiii",
- "inarabicmathematicalalphabeticsymbols",
- "saur",
- "ogrext",
- "bidic",
- "inkanasupplement",
- "runic",
- "inalchemicalsymbols",
- "georgian",
- "inugaritic",
- "insaurashtra",
- "inhighprivateusesurrogates",
- "pd",
- "incountingrodnumerals",
- "inarabicextendeda",
- "inkharoshthi",
- "idstrinaryoperator",
+ "tibt",
+ "sterm",
+ "ugar",
+ "nonspacingmark",
"phag",
- "brah",
- "mark",
+ "kaithi",
+ "xidc",
+ "balinese",
+ "mong",
+ "ogam",
+ "modifierletter",
+ "ugaritic",
+ "katakana",
+ "pd",
"hebr",
- "inkhmersymbols",
- "dep",
- "inkhmer",
- "deprecated",
- "rejang",
- "lyci",
- "intakri",
- "takr",
- "incyrillicsupplement",
- "changeswhencasefolded",
- "indevanagariextended",
- "lycian",
- "inbengali",
- "beng",
+ "p",
+ "orkh",
+#endif /* USE_UNICODE_PROPERTIES */
+ "word",
+#ifndef USE_UNICODE_PROPERTIES
+ "lower",
"graph",
- "inyijinghexagramsymbols",
- "olck",
- "inarabicsupplement",
- "inbuginese",
- "changeswhencasemapped",
- "olchiki",
- "inaegeannumbers",
- "mlym",
- "alphabetic",
- "sylotinagri",
- "changeswhentitlecased",
- "tagalog",
- "tagb",
- "runr",
- "malayalam",
- "inoriya",
- "intagbanwa",
- "syrc",
- "nko",
- "nkoo",
- "inethiopicextended",
- "kaithi",
- "mathsymbol",
- "inyiradicals",
- "insupplementaryprivateuseareaa",
- "osmanya",
- "syriac",
- "otherdefaultignorablecodepoint",
- "number",
- "inlinearbsyllabary",
- "kthi",
+ "digit",
+ "blank"
+#else /* USE_UNICODE_PROPERTIES */
+ "saurashtra",
+ "khar",
"sund",
- "mymr",
- "incombiningdiacriticalmarks",
- "enclosingmark",
- "incombiningdiacriticalmarksforsymbols",
- "inethiopicsupplement",
- "unassigned",
- "sylo",
- "combiningmark",
- "myanmar",
- "graphemeextend",
+ "zp",
+ "changeswhenuppercased",
+ "xidstart",
+ "shaw",
+ "kthi",
+ "ogham",
+ "spaceseparator",
+ "changeswhencasemapped",
+ "sarb",
+ "xidcontinue",
+ "bidic",
+ "deprecated",
+ "xdigit",
"bidicontrol",
- "inhalfwidthandfullwidthforms",
+ "lu",
+ "dashpunctuation",
+ "extender",
+ "idstrinaryoperator",
+ "cherokee",
+ "punct",
+ "phagspa",
+ "oupper",
+ "lyci",
+ "whitespace",
+ "lycian",
+ "yi",
"cyrl",
"knda",
- "inunifiedcanadianaboriginalsyllabicsextended",
- "xsux",
- "modifiersymbol",
- "incombiningdiacriticalmarkssupplement",
- "inhanunoo",
- "inbuhid",
- "kannada",
- "inhebrew",
- "grbase",
- "spacingmark",
- "inkatakanaphoneticextensions",
- "hangul",
- "incjksymbolsandpunctuation",
- "bopo",
"orya",
- "inbopomofo",
- "kharoshthi",
- "khar",
- "changeswhenlowercased",
- "khmr",
- "punct",
- "symbol",
- "cherokee",
"cyrillic",
- "inkangxiradicals",
- "hebrew",
- "inarabicpresentationformsb",
- "incyrillicextendedb",
- "ugaritic",
- "incurrencysymbols",
- "meroitichieroglyphs",
- "inhighsurrogates",
- "nonspacingmark",
- "lydi",
- "patsyn",
- "orkh",
- "lydian",
- "ugar",
- "othergraphemeextend",
- "inlatinextendedb",
+ "yiii",
+ "kannada",
+ "xids",
+ "limbu",
+ "m",
+ "unifiedideograph",
+ "paragraphseparator",
+ "lm",
+ "openpunctuation",
+ "tagb",
+ "kharoshthi",
+ "enclosingmark",
+ "surrogate",
+ "beng",
+ "number",
+ "telugu",
+ "rejang",
+ "malayalam",
+ "idsb",
+ "hexdigit",
+ "xpeo",
+ "phnx",
+ "bopo",
"bopomofo",
- "khmer",
- "uideo",
- "otheruppercase",
+ "dep",
+ "sylo",
+ "grbase",
+ "alphabetic",
+ "cwcm",
+ "patternsyntax",
"grek",
+ "greek",
+ "syrc",
+ "syriac",
+ "cuneiform",
"gujr",
+ "lydi",
"gujarati",
- "inhanguljamoextendedb",
- "defaultignorablecodepoint",
- "inplayingcards",
- "bamu",
- "inkanbun",
- "incjkradicalssupplement",
- "cypriot",
- "inbamum",
- "inmeroiticcursive",
- "oldturkic",
- "insupplementalarrowsb",
- "surrogate",
- "batk",
- "inbatak",
- "inlimbu",
- "incypriotsyllabary",
- "dashpunctuation",
- "innoblock",
- "hyphen",
- "insupplementalpunctuation",
- "ingeorgiansupplement",
- "oupper",
- "paragraphseparator",
- "inbamumsupplement",
- "uppercase",
+ "sylotinagri",
+ "lydian",
+ "sm",
"currencysymbol",
- "sk",
- "lu",
- "openpunctuation",
- "inlisu",
+ "limb",
+ "othergraphemeextend",
+ "guru",
"qmark",
- "egyp",
- "insupplementaryprivateuseareab",
- "limbu",
- "inegyptianhieroglyphs",
- "unifiedideograph",
- "intelugu",
- "katakana",
- "inhangulcompatibilityjamo",
+ "mark",
+ "quotationmark",
+ "hex",
"upper",
- "inkayahli",
- "cwu",
- "incjkcompatibility",
+ "wspace",
+ "khmr",
+ "khmer",
+ "oldsoutharabian",
+ "spacingmark",
+ "punctuation",
+ "uppercase",
+ "meeteimayek",
"uppercaseletter",
+ "cypriot",
+ "buhd",
+ "buhid",
+ "modifiersymbol",
+ "blank",
+ "hyphen",
"bugi",
+ "myanmar",
+ "imperialaramaic",
+ "mathsymbol",
+ "cwu",
+ "gurmukhi",
"buginese",
- "any",
- "inyisyllables",
- "inbopomofoextended",
- "inboxdrawing",
- "changeswhenuppercased",
- "unknown",
- "quotationmark",
- "buhd",
- "punctuation",
- "oldsoutharabian",
+ "symbol",
+ "osmanya",
+ "bamu",
+ "sk",
+ "bamum",
"kayahli",
- "incjkunifiedideographs",
- "incjkunifiedideographsextensiona",
- "incjkunifiedideographsextensionc",
- "telugu",
- "guru",
- "greek",
+ "egyp",
"grlink",
- "buhid",
- "batak",
- "blank",
- "incjkunifiedideographsextensiond",
+ "xsux",
+ "any",
"graphemelink",
+ "mlym",
+ "mymr",
+ "hebrew",
"egyptianhieroglyphs",
- "incjkunifiedideographsextensionb",
- "zyyy",
- "gurmukhi"
+ "zyyy"
#endif /* USE_UNICODE_PROPERTIES */
};
#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
@@ -27365,1236 +17271,601 @@ uniname2ctype_p (str, len)
{
#ifdef USE_UNICODE_PROPERTIES
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 34},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 46},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3, 17},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 51},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5, 18},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 54},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 208},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 20},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 21},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 22},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 60},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29, 17},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30, 19},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 23},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 26},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32, 47},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 36},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 33},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 24},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 20},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 35},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 101},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35, 114},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38, 33},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42, 14},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 93},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 93},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 51},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 50},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str22, 18},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 18},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45, 128},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 401},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 377},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62, 226},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64, 31},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 239},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69, 30},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72, 49},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 32},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82, 232},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84, 412},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 168},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90, 382},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 413},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96, 252},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24, 127},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str25, 59},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99, 419},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 304},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str28, 150},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str33, 175},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34, 113},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106, 355},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109, 312},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 430},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str40, 79},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str41, 147},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 237},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124, 120},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125, 159},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str133, 151},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134, 384},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135, 432},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136, 298},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142, 92},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151, 347},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156, 306},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str43, 86},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44, 147},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str158, 204},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 356},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172, 26},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46, 3},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175, 152},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179, 379},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180, 276},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49, 38},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str50, 179},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51, 74},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52, 74},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str184, 75},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186, 75},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str187, 111},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189, 13},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str199, 250},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56, 110},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65, 115},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66, 27},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str201, 272},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202, 120},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205, 23},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str68, 108},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207, 36},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str70, 115},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str71, 100},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209, 52},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str216, 247},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str217, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218, 224},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str73, 97},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74, 108},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220, 314},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223, 263},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224, 385},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225, 235},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str76, 181},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str77, 113},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str83, 119},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227, 148},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str230, 358},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str231, 124},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str232, 28},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str233, 172},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str234, 410},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85, 190},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86, 105},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239, 230},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str240, 148},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245, 155},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str91, 119},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92, 51},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247, 160},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248, 323},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252, 392},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253, 78},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str254, 255},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255, 155},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256, 80},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str94, 81},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str259, 260},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97, 105},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98, 92},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261, 39},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100, 42},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str101, 17},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263, 170},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264, 297},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str103, 81},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268, 300},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str279, 431},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281, 178},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288, 3},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str107, 99},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301, 333},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str111, 26},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303, 64},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str304, 405},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str308, 25},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str313, 182},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str316, 287},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320, 88},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321, 201},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329, 129},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330, 65},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339, 428},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346, 92},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347, 114},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113, 36},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114, 23},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349, 170},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353, 109},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357, 109},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358, 299},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360, 50},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str364, 273},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365, 251},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116, 46},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367, 238},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str118, 49},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372, 21},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375, 123},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378, 182},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386, 421},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387, 258},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str123, 151},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str128, 181},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str129, 98},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130, 100},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135, 27},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136, 14},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str389, 174},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str398, 295},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str138, 35},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str139, 175},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400, 150},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141, 179},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str403, 365},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144, 66},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405, 87},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str406, 189},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str409, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str146, 192},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147, 91},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str148, 171},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412, 74},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151, 110},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str152, 69},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153, 192},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414, 416},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420, 93},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155, 187},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156, 177},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str425, 317},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426, 99},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427, 171},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str428, 169},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429, 82},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430, 162},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432, 131},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436, 28},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445, 82},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449, 185},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450, 55},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161, 191},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str162, 163},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167, 177},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str168, 132},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str453, 70},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454, 66},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460, 27},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str171, 185},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468, 253},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str470, 151},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179, 91},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str475, 94},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476, 188},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183, 176},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str478, 67},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480, 45},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481, 278},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str484, 43},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485, 61},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490, 42},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str495, 168},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496, 346},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str497, 205},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str185, 122},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186, 19},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str503, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504, 39},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506, 240},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509, 341},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str511, 52},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514, 41},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515, 143},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516, 143},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str517, 195},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520, 426},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521, 391},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522, 227},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str524, 19},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str192, 161},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str528, 383},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531, 116},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str532, 9},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542, 390},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545, 281},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548, 106},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str196, 142},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str197, 142},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553, 178},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202, 130},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203, 19},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str555, 67},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558, 425},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560, 206},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563, 396},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564, 100},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str568, 325},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str572, 262},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205, 49},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str574, 153},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575, 163},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207, 176},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str579, 315},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587, 158},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str211, 113},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str212, 129},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218, 66},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str589, 423},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594, 23},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str604, 354},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220, 174},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608, 153},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str612, 209},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str613, 141},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str614, 211},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616, 280},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617, 158},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618, 123},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str619, 42},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str621, 218},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622, 269},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623, 219},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626, 210},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627, 185},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630, 289},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str631, 202},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str632, 198},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str633, 217},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636, 152},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637, 357},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638, 221},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639, 213},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640, 282},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str641, 214},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str642, 216},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str643, 203},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646, 131},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str647, 374},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str648, 187},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649, 438},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str650, 220},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651, 212},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224, 162},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225, 45},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226, 111},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227, 22},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653, 176},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654, 215},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str655, 386},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660, 186},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str668, 245},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672, 18},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str229, 152},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str235, 151},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str236, 53},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679, 188},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243, 34},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244, 117},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245, 167},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str682, 118},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str690, 395},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248, 96},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str249, 97},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701, 402},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str251, 96},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703, 403},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str704, 128},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706, 344},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253, 58},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709, 68},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713, 116},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str715, 404},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str721, 69},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725, 66},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729, 394},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730, 370},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str734, 128},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256, 167},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257, 191},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str737, 60},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str738, 162},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str739, 192},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str746, 113},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str747, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748, 125},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260, 194},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str750, 223},
- {-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_str771, 160},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776, 21},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777, 24},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str778, 57},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str262, 5},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263, 60},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264, 34},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268, 111},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str269, 38},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str780, 54},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str271, 43},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272, 182},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str784, 196},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str276, 127},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str277, 70},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str282, 190},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str787, 105},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str788, 101},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792, 36},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str796, 408},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797, 179},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str798, 176},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str799, 102},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str285, 184},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str802, 439},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str803, 7},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str811, 203},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str815, 244},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288, 1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str289, 42},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str818, 41},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str292, 112},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823, 111},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str824, 192},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str297, 168},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298, 187},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302, 127},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str306, 65},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307, 40},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str826, 173},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str827, 303},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str309, 62},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830, 186},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str831, 206},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str832, 44},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str833, 146},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str835, 229},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str841, 11},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str850, 112},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851, 400},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str852, 68},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str854, 352},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str860, 194},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867, 190},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869, 184},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str870, 429},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str874, 368},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str879, 222},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str312, 140},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884, 50},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317, 152},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318, 124},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str319, 102},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320, 196},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321, 30},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str889, 35},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str890, 200},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str900, 183},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str901, 51},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str907, 234},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str912, 69},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str913, 202},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str914, 71},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str917, 190},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str326, 130},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327, 140},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str328, 161},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329, 7},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330, 162},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331, 32},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332, 183},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str919, 163},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str920, 59},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str923, 98},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str931, 133},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str334, 128},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335, 102},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str933, 6},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337, 71},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str338, 73},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339, 13},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str340, 136},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str341, 82},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str342, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str343, 40},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str344, 104},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str352, 77},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353, 112},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str354, 189},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936, 26},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357, 159},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358, 82},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938, 284},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939, 369},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str943, 294},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str945, 133},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str946, 319},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947, 371},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360, 4},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str361, 59},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362, 87},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363, 87},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str949, 38},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950, 418},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951, 296},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str952, 254},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str953, 53},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365, 88},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366, 65},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367, 77},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956, 256},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960, 308},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str370, 189},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str962, 141},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str963, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str964, 283},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str965, 121},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966, 17},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str970, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372, 21},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str373, 16},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972, 242},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str973, 37},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str974, 157},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375, 149},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str976, 173},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str977, 135},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str981, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str377, 172},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378, 43},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str379, 150},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str983, 189},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str988, 114},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str989, 130},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str990, 95},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str994, 277},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str996, 387},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str997, 310},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str998, 119},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1000, 84},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1003, 137},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1004, 290},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1006, 397},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1007, 95},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1010, 285},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str381, 69},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1016, 135},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1021, 25},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1031, 305},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1035, 366},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1039, 16},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1044, 207},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1051, 361},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065, 161},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1067, 126},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069, 311},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1070, 137},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072, 288},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387, 129},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388, 98},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1074, 27},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1076, 80},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1078, 345},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1081, 12},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1084, 348},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1087, 302},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390, 194},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1092, 99},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1094, 359},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1107, 167},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1110, 201},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str395, 31},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str396, 60},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114, 389},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129, 293},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400, 158},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1133, 174},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str404, 54},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407, 171},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408, 157},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1135, 106},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1142, 353},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1147, 183},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410, 114},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1150, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1151, 112},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1156, 102},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1162, 140},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1170, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str413, 6},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414, 195},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1173, 121},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str417, 41},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418, 114},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419, 195},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420, 155},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1179, 72},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1185, 261},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1186, 136},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1188, 249},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426, 180},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427, 9},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1190, 107},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429, 70},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430, 143},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1195, 381},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1196, 331},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1198, 313},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1202, 420},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1212, 409},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str435, 186},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1215, 172},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1219, 406},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1224, 169},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1225, 373},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1229, 156},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1230, 367},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1231, 264},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1244, 407},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1245, 307},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1249, 175},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1253, 187},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1256, 184},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1259, 130},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str438, 56},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1261, 200},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1262, 205},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str440, 145},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1264, 326},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1265, 159},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1274, 44},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1279, 257},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1282, 145},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1289, 126},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1298, 372},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1300, 129},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str442, 123},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1302, 437},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1306, 89},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1307, 194},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str444, 120},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445, 134},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1310, 115},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1313, 360},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1315, 110},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str448, 62},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449, 50},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450, 172},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str451, 20},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1318, 138},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454, 24},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str455, 79},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1321, 110},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str458, 154},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str459, 125},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460, 139},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1323, 424},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1328, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str462, 154},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str463, 174},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1330, 193},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1334, 177},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1341, 417},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str465, 120},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1343, 103},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1344, 433},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1350, 97},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1351, 388},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1354, 349},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str467, 41},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1356, 364},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1362, 40},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1372, 422},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str469, 178},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1377, 241},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1389, 399},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1393, 195},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1396, 138},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474, 141},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476, 138},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477, 138},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1398, 167},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str479, 0},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480, 94},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481, 157},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1402, 30},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str486, 128},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487, 106},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str488, 141},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str491, 44},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1404, 79},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1411, 274},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493, 125},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str494, 94},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502, 193},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1413, 199},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504, 121},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str505, 32},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1416, 268},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1422, 199},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1424, 146},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1429, 147},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1431, 411},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1432, 175},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508, 137},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509, 164},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435, 231},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1436, 64},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str512, 68},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1438, 350},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514, 134},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515, 104},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516, 101},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1442, 147},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1443, 243},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1448, 84},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520, 25},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521, 121},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522, 106},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str523, 39},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1450, 5},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str525, 78},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531, 37},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1452, 336},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1457, 142},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str533, 163},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1460, 236},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1462, 275},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463, 65},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1468, 142},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1478, 380},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1479, 91},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1480, 56},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536, 12},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str537, 143},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str538, 133},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str539, 139},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1492, 132},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1498, 63},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542, 52},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1504, 115},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1505, 118},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1506, 103},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1510, 91},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1512, 246},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548, 61},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1516, 267},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1517, 81},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str552, 67},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553, 122},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554, 164},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1519, 139},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1520, 139},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1523, 318},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556, 101},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1525, 165},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1530, 49},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1531, 339},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1536, 440},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1540, 124},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1546, 81},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558, 53},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str559, 64},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560, 160},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1548, 198},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1561, 34},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1565, 378},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1566, 165},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1567, 140},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str562, 68},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1569, 96},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1571, 228},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1578, 32},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564, 166},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570, 188},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1581, 292},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573, 11},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1583, 259},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1590, 20},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1591, 132},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1595, 30},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575, 166},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584, 28},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1598, 96},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1605, 71},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1606, 177},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587, 39},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1609, 376},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1617, 77},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str590, 178},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1620, 90},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1634, 270},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1635, 136},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636, 48},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1643, 286},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593, 184},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594, 99},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str595, 8},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1645, 265},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1648, 266},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1649, 90},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1658, 233},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1662, 72},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597, 137},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598, 180},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str599, 146},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1664, 31},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1670, 332},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1676, 98},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1683, 324},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1688, 108},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1692, 87},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1699, 327},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601, 165},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str602, 146},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603, 109},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str606, 76},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1701, 134},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608, 89},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1703, 134},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1709, 61},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1724, 104},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1725, 8},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1729, 46},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1732, 100},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str610, 86},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611, 76},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1737, 77},
- {-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_str1759, 322},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1761, 79},
- {-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_str1780, 375},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1787, 342},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1790, 122},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1829, 291},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616, 109},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1831, 171},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1835, 363},
- {-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_str1853, 33},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618, 89},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1858, 149},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1864, 207},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1868, 164},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623, 67},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1871, 149},
- {-1}, {-1}, {-1}, {-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_str1896, 122},
- {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1899, 193},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1900, 225},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1904, 108},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1917, 104},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1925, 197},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1932, 191},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626, 118},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str635, 29},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1944, 76},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638, 186},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639, 52},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640, 25},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1949, 86},
- {-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_str645, 44},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646, 117},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1970, 86},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1983, 362},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1988, 70},
- {-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_str2005, 427},
- {-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_str2022, 157},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2028, 329},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2033, 321},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2046, 125},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2051, 343},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649, 133},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2053, 398},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651, 31},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str652, 22},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653, 83},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654, 33},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2055, 164},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str656, 88},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2086, 309},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2087, 22},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2094, 166},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2102, 279},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660, 145},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str661, 90},
{-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_str2119, 271},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2123, 393},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2129, 40},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2130, 442},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str674, 183},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2141, 180},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str676, 173},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str677, 132},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2162, 320},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str689, 136},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2165, 316},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2178, 191},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2189, 53},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2194, 415},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str692, 107},
{-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2299, 58},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2313, 47},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2322, 48},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2338, 29},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str698, 107},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699, 188},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701, 131},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2342, 45},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2349, 340},
- {-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_str705, 71},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706, 55},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str707, 64},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708, 196},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709, 75},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str710, 75},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2371, 181},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2372, 154},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2377, 441},
- {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2379, 119},
- {-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_str714, 80},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2400, 414},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2401, 197},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str717, 80},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722, 135},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str723, 85},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2413, 248},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str726, 148},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727, 85},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728, 131},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729, 148},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2429, 107},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748, 48},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str751, 46},
{-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2442, 328},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str755, 118},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2454, 10},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758, 182},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-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_str2495, 351},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str786, 84},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2515, 62},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2523, 334},
- {-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_str2542, 29},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2549, 127},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2588, 127},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str797, 170},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2627, 15},
- {-1}, {-1}, {-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_str2651, 338},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str809, 29},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2671, 330},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2710, 301},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2724, 62},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820, 170},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2727, 208},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2737, 181},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2753, 117},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823, 173},
{-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_str842, 10},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str843, 165},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2785, 38},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str848, 103},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849, 103},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-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_str2888, 161},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2925, 145},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2940, 337},
- {-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_str2961, 335},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2962, 435},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-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_str2995, 89},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3000, 85},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str863, 160},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864, 30},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866, 37},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867, 57},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str878, 158},
{-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3104, 76},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-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_str3189, 73},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str883, 28},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884, 124},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str886, 116},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str887, 116},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3197, 117},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str895, 47},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3254, 166},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898, 2},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str908, 169},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909, 126},
{-1}, {-1}, {-1}, {-1}, {-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_str935, 95},
{-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3292, 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},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str937, 159},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947, 48},
{-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_str966, 61},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3391, 436},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str975, 84},
+ {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str978, 126},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-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_str3459, 73},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#endif /* USE_UNICODE_PROPERTIES */
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#ifndef USE_UNICODE_PROPERTIES
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 7},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 8},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 13},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 11},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 0},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 10},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 14},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 3},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 9},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 12},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 6},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 5},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20, 4},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21, 2}
+#else /* USE_UNICODE_PROPERTIES */
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1022, 45},
+ {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1024, 123},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3480, 154},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036, 156},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040, 47},
{-1}, {-1}, {-1}, {-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_str1065, 156},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1071, 144},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072, 153},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28602,18 +17873,31 @@ uniname2ctype_p (str, len)
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-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_str1140, 72},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141, 135},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-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_str1174, 15},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187, 72},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-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_str1221, 90},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1},
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235, 95},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-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_str1277, 78},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28628,26 +17912,6 @@ uniname2ctype_p (str, len)
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#endif /* USE_UNICODE_PROPERTIES */
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6, 12},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7, 7},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str8, 8},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9, 1},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10, 13},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11, 11},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str12, 10},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13, 14},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14, 3},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15, 9},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16, 6},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17, 5},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18, 4},
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19, 2}
-#else /* USE_UNICODE_PROPERTIES */
- {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3802, 434},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28660,12 +17924,11 @@ uniname2ctype_p (str, len)
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3922, 74},
- {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-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_str1542, 153},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -28690,7 +17953,7 @@ uniname2ctype_p (str, len)
{-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_str4167, 85}
+ {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1751, 73}
#endif /* USE_UNICODE_PROPERTIES */
};
diff --git a/enc/unicode/name2ctype.kwd b/enc/unicode/name2ctype.kwd
index ff94d68b3b..ff136177ca 100644
--- a/enc/unicode/name2ctype.kwd
+++ b/enc/unicode/name2ctype.kwd
@@ -1,4272 +1,4 @@
%{
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 540,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x065f,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x103f,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1baf,
- 0x1bba, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa90a, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9cf,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x11100, 0x11132,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x11680, 0x116b5,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* 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[] = {
- 42,
- 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,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xa9d0, 0xa9d9,
- 0xaa50, 0xaa59,
- 0xabf0, 0xabf9,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x11066, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 544,
- 0x0021, 0x007e,
- 0x00a1, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 0x167f,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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,
- 0x200b, 0x2027,
- 0x202a, 0x202e,
- 0x2030, 0x205e,
- 0x2060, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 618,
- 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, 0x02b8,
- 0x02c0, 0x02c1,
- 0x02e0, 0x02e4,
- 0x0345, 0x0345,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037a, 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,
- 0x0525, 0x0525,
- 0x0527, 0x0527,
- 0x0561, 0x0587,
- 0x1d00, 0x1dbf,
- 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,
- 0x2090, 0x209c,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2170, 0x217f,
- 0x2184, 0x2184,
- 0x24d0, 0x24e9,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7d,
- 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,
- 0x2cec, 0x2cec,
- 0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 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,
- 0xa661, 0xa661,
- 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, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7f8, 0xa7fa,
- 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[] = {
- 541,
- 0x0020, 0x007e,
- 0x00a0, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 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,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x2027,
- 0x202a, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 140,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00ab, 0x00ab,
- 0x00b6, 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,
- 0x0830, 0x083e,
- 0x085e, 0x085e,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0af0, 0x0af0,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1360, 0x1368,
- 0x1400, 0x1400,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x1a1e, 0x1a1f,
- 0x1aa0, 0x1aa6,
- 0x1aa8, 0x1aad,
- 0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd3, 0x1cd3,
- 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,
- 0x2d70, 0x2d70,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e3b,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa4fe, 0xa4ff,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa6f2, 0xa6f7,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa8f8, 0xa8fa,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xa9c1, 0xa9cd,
- 0xa9de, 0xa9df,
- 0xaa5c, 0xaa5f,
- 0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
- 0xabeb, 0xabeb,
- 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, 0x10102,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x10857, 0x10857,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x10a7f, 0x10a7f,
- 0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
- 0x110bb, 0x110bc,
- 0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
- 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[] = {
- 610,
- 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,
- 0x0524, 0x0524,
- 0x0526, 0x0526,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 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,
- 0x2160, 0x216f,
- 0x2183, 0x2183,
- 0x24b6, 0x24cf,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c70,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c7e, 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,
- 0x2ceb, 0x2ceb,
- 0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
- 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,
- 0xa660, 0xa660,
- 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,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
- 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[] = {
- 564,
- 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, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06df, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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,
- 0x135d, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3007,
- 0x3021, 0x302f,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa672,
- 0xa674, 0xa67d,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa8e0, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xa960, 0xa97c,
- 0xa980, 0xa9c0,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabec, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 0x10140, 0x10174,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
- 0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 566,
- 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,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07c0, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f20, 0x0f29,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x1049,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x1090, 0x1099,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8d0, 0xa8d9,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11066, 0x1106f,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11132,
- 0x11136, 0x1113f,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b5,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
- 1,
- 0x0000, 0x007f,
-}; /* CR_ASCII */
#ifdef USE_UNICODE_PROPERTIES
/* 'Any': - */
@@ -4277,35 +9,34 @@ static const OnigCodePoint CR_Any[] = {
/* 'Assigned': - */
static const OnigCodePoint CR_Assigned[] = {
- 539,
+ 485,
0x0000, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x0591, 0x05c7,
0x05d0, 0x05ea,
0x05f0, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0606, 0x061b,
- 0x061e, 0x070d,
+ 0x061e, 0x061f,
+ 0x0621, 0x065e,
+ 0x0660, 0x070d,
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
0x0800, 0x082d,
0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -4349,7 +80,8 @@ static const OnigCodePoint CR_Assigned[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -4363,7 +95,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -4411,10 +143,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -4449,17 +182,17 @@ static const OnigCodePoint CR_Assigned[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -4475,7 +208,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
0x1400, 0x169c,
@@ -4512,14 +245,14 @@ static const OnigCodePoint CR_Assigned[] = {
0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -4538,25 +271,38 @@ static const OnigCodePoint CR_Assigned[] = {
0x2000, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -4565,7 +311,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -4575,21 +321,21 @@ static const OnigCodePoint CR_Assigned[] = {
0x3099, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa82b,
0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
@@ -4605,18 +351,14 @@ static const OnigCodePoint CR_Assigned[] = {
0xaa50, 0xaa59,
0xaa5c, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xd800, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -4625,7 +367,7 @@ static const OnigCodePoint CR_Assigned[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -4678,8 +420,6 @@ static const OnigCodePoint CR_Assigned[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -4695,26 +435,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -4742,75 +467,28 @@ static const OnigCodePoint CR_Assigned[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
@@ -4821,560 +499,44 @@ static const OnigCodePoint CR_Assigned[] = {
/* 'C': Major Category */
static const OnigCodePoint CR_C[] = {
- 541,
+ 20,
0x0000, 0x001f,
0x007f, 0x009f,
0x00ad, 0x00ad,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x0605,
- 0x061c, 0x061d,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
- 0x070e, 0x070f,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
+ 0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
- 0x2060, 0x206f,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfffb,
- 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
+ 0x2060, 0x2064,
+ 0x206a, 0x206f,
+ 0xd800, 0xf8ff,
+ 0xfeff, 0xfeff,
+ 0xfff9, 0xfffb,
0x110bd, 0x110bd,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
0x1d173, 0x1d17a,
- 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe00ff,
- 0xe01f0, 0x10ffff,
+ 0xe0001, 0xe0001,
+ 0xe0020, 0xe007f,
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10ffff,
}; /* CR_C */
/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
+static const OnigCodePoint CR_Cc[] = {
+ 2,
+ 0x0000, 0x001f,
+ 0x007f, 0x009f,
+}; /* CR_Cc */
/* 'Cf': General Category */
static const OnigCodePoint CR_Cf[] = {
- 14,
+ 15,
0x00ad, 0x00ad,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
0x2060, 0x2064,
@@ -5389,35 +551,34 @@ static const OnigCodePoint CR_Cf[] = {
/* 'Cn': General Category */
static const OnigCodePoint CR_Cn[] = {
- 539,
+ 485,
0x0378, 0x0379,
0x037f, 0x0383,
0x038b, 0x038b,
0x038d, 0x038d,
0x03a2, 0x03a2,
- 0x0528, 0x0530,
+ 0x0526, 0x0530,
0x0557, 0x0558,
0x0560, 0x0560,
0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
+ 0x058b, 0x0590,
0x05c8, 0x05cf,
0x05eb, 0x05ef,
0x05f5, 0x05ff,
- 0x0605, 0x0605,
+ 0x0604, 0x0605,
0x061c, 0x061d,
+ 0x0620, 0x0620,
+ 0x065f, 0x065f,
0x070e, 0x070e,
0x074b, 0x074c,
0x07b2, 0x07bf,
0x07fb, 0x07ff,
0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
+ 0x083f, 0x08ff,
+ 0x093a, 0x093b,
+ 0x094f, 0x094f,
+ 0x0956, 0x0957,
+ 0x0973, 0x0978,
0x0980, 0x0980,
0x0984, 0x0984,
0x098d, 0x098e,
@@ -5461,6 +622,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0ace, 0x0acf,
0x0ad1, 0x0adf,
0x0ae4, 0x0ae5,
+ 0x0af0, 0x0af0,
0x0af2, 0x0b00,
0x0b04, 0x0b04,
0x0b0d, 0x0b0e,
@@ -5475,7 +637,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0b58, 0x0b5b,
0x0b5e, 0x0b5e,
0x0b64, 0x0b65,
- 0x0b78, 0x0b81,
+ 0x0b72, 0x0b81,
0x0b84, 0x0b84,
0x0b8b, 0x0b8d,
0x0b91, 0x0b91,
@@ -5523,10 +685,11 @@ static const OnigCodePoint CR_Cn[] = {
0x0d04, 0x0d04,
0x0d0d, 0x0d0d,
0x0d11, 0x0d11,
- 0x0d3b, 0x0d3c,
+ 0x0d29, 0x0d29,
+ 0x0d3a, 0x0d3c,
0x0d45, 0x0d45,
0x0d49, 0x0d49,
- 0x0d4f, 0x0d56,
+ 0x0d4e, 0x0d56,
0x0d58, 0x0d5f,
0x0d64, 0x0d65,
0x0d76, 0x0d78,
@@ -5561,16 +724,16 @@ static const OnigCodePoint CR_Cn[] = {
0x0ec7, 0x0ec7,
0x0ece, 0x0ecf,
0x0eda, 0x0edb,
- 0x0ee0, 0x0eff,
+ 0x0ede, 0x0eff,
0x0f48, 0x0f48,
0x0f6d, 0x0f70,
+ 0x0f8c, 0x0f8f,
0x0f98, 0x0f98,
0x0fbd, 0x0fbd,
0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
+ 0x0fd9, 0x0fff,
+ 0x10c6, 0x10cf,
+ 0x10fd, 0x10ff,
0x1249, 0x1249,
0x124e, 0x124f,
0x1257, 0x1257,
@@ -5586,7 +749,7 @@ static const OnigCodePoint CR_Cn[] = {
0x12d7, 0x12d7,
0x1311, 0x1311,
0x1316, 0x1317,
- 0x135b, 0x135c,
+ 0x135b, 0x135e,
0x137d, 0x137f,
0x139a, 0x139f,
0x13f5, 0x13ff,
@@ -5624,13 +787,13 @@ static const OnigCodePoint CR_Cn[] = {
0x1aae, 0x1aff,
0x1b4c, 0x1b4f,
0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
+ 0x1bab, 0x1bad,
+ 0x1bba, 0x1bff,
0x1c38, 0x1c3a,
0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
+ 0x1c80, 0x1ccf,
+ 0x1cf3, 0x1cff,
+ 0x1de7, 0x1dfc,
0x1f16, 0x1f17,
0x1f1e, 0x1f1f,
0x1f46, 0x1f47,
@@ -5650,24 +813,37 @@ static const OnigCodePoint CR_Cn[] = {
0x2065, 0x2069,
0x2072, 0x2073,
0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
+ 0x2095, 0x209f,
+ 0x20b9, 0x20cf,
0x20f1, 0x20ff,
0x218a, 0x218f,
- 0x23f4, 0x23ff,
+ 0x23e9, 0x23ff,
0x2427, 0x243f,
0x244b, 0x245f,
+ 0x26ce, 0x26ce,
+ 0x26e2, 0x26e2,
+ 0x26e4, 0x26e7,
0x2700, 0x2700,
+ 0x2705, 0x2705,
+ 0x270a, 0x270b,
+ 0x2728, 0x2728,
+ 0x274c, 0x274c,
+ 0x274e, 0x274e,
+ 0x2753, 0x2755,
+ 0x275f, 0x2760,
+ 0x2795, 0x2797,
+ 0x27b0, 0x27b0,
+ 0x27bf, 0x27bf,
+ 0x27cb, 0x27cb,
+ 0x27cd, 0x27cf,
0x2b4d, 0x2b4f,
0x2b5a, 0x2bff,
0x2c2f, 0x2c2f,
0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
+ 0x2cf2, 0x2cf8,
+ 0x2d26, 0x2d2f,
+ 0x2d66, 0x2d6e,
+ 0x2d70, 0x2d7f,
0x2d97, 0x2d9f,
0x2da7, 0x2da7,
0x2daf, 0x2daf,
@@ -5677,7 +853,7 @@ static const OnigCodePoint CR_Cn[] = {
0x2dcf, 0x2dcf,
0x2dd7, 0x2dd7,
0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
+ 0x2e32, 0x2e7f,
0x2e9a, 0x2e9a,
0x2ef4, 0x2eff,
0x2fd6, 0x2fef,
@@ -5687,20 +863,20 @@ static const OnigCodePoint CR_Cn[] = {
0x3100, 0x3104,
0x312e, 0x3130,
0x318f, 0x318f,
- 0x31bb, 0x31bf,
+ 0x31b8, 0x31bf,
0x31e4, 0x31ef,
0x321f, 0x321f,
0x32ff, 0x32ff,
0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
+ 0x9fcc, 0x9fff,
0xa48d, 0xa48f,
0xa4c7, 0xa4cf,
0xa62c, 0xa63f,
- 0xa698, 0xa69e,
+ 0xa660, 0xa661,
+ 0xa674, 0xa67b,
+ 0xa698, 0xa69f,
0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
+ 0xa78d, 0xa7fa,
0xa82c, 0xa82f,
0xa83a, 0xa83f,
0xa878, 0xa87f,
@@ -5717,17 +893,13 @@ static const OnigCodePoint CR_Cn[] = {
0xaa5a, 0xaa5b,
0xaa7c, 0xaa7f,
0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
+ 0xaae0, 0xabbf,
0xabee, 0xabef,
0xabfa, 0xabff,
0xd7a4, 0xd7af,
0xd7c7, 0xd7ca,
0xd7fc, 0xd7ff,
+ 0xfa2e, 0xfa2f,
0xfa6e, 0xfa6f,
0xfada, 0xfaff,
0xfb07, 0xfb12,
@@ -5737,7 +909,7 @@ static const OnigCodePoint CR_Cn[] = {
0xfb3f, 0xfb3f,
0xfb42, 0xfb42,
0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
+ 0xfbb2, 0xfbd2,
0xfd40, 0xfd4f,
0xfd90, 0xfd91,
0xfdc8, 0xfdef,
@@ -5789,9 +961,7 @@ static const OnigCodePoint CR_Cn[] = {
0x10860, 0x108ff,
0x1091c, 0x1091e,
0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
+ 0x10940, 0x109ff,
0x10a04, 0x10a04,
0x10a07, 0x10a0b,
0x10a14, 0x10a14,
@@ -5806,27 +976,12 @@ static const OnigCodePoint CR_Cn[] = {
0x10b73, 0x10b77,
0x10b80, 0x10bff,
0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
+ 0x10e7f, 0x1107f,
+ 0x110c2, 0x11fff,
0x1236f, 0x123ff,
0x12463, 0x1246f,
0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
+ 0x1342f, 0x1cfff,
0x1d0f6, 0x1d0ff,
0x1d127, 0x1d128,
0x1d1de, 0x1d1ff,
@@ -5853,76 +1008,29 @@ static const OnigCodePoint CR_Cn[] = {
0x1d551, 0x1d551,
0x1d6a6, 0x1d6a7,
0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
+ 0x1d800, 0x1efff,
0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
+ 0x1f094, 0x1f0ff,
0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
+ 0x1f12f, 0x1f130,
+ 0x1f132, 0x1f13c,
+ 0x1f13e, 0x1f13e,
+ 0x1f140, 0x1f141,
+ 0x1f143, 0x1f145,
+ 0x1f147, 0x1f149,
+ 0x1f14f, 0x1f156,
+ 0x1f158, 0x1f15e,
+ 0x1f160, 0x1f178,
+ 0x1f17a, 0x1f17a,
+ 0x1f17d, 0x1f17e,
+ 0x1f180, 0x1f189,
+ 0x1f18e, 0x1f18f,
+ 0x1f191, 0x1f1ff,
+ 0x1f201, 0x1f20f,
+ 0x1f232, 0x1f23f,
+ 0x1f249, 0x1ffff,
0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
+ 0x2b735, 0x2f7ff,
0x2fa1e, 0xe0000,
0xe0002, 0xe001f,
0xe0080, 0xe00ff,
@@ -5947,7 +1055,7 @@ static const OnigCodePoint CR_Cs[] = {
/* 'L': Major Category */
static const OnigCodePoint CR_L[] = {
- 486,
+ 422,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -5969,13 +1077,13 @@ static const OnigCodePoint CR_L[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -5994,14 +1102,11 @@ static const OnigCodePoint CR_L[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -6070,12 +1175,11 @@ static const OnigCodePoint CR_L[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -6102,11 +1206,11 @@ static const OnigCodePoint CR_L[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -6117,10 +1221,9 @@ static const OnigCodePoint CR_L[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -6167,13 +1270,11 @@ static const OnigCodePoint CR_L[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -6196,7 +1297,7 @@ static const OnigCodePoint CR_L[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -6215,11 +1316,8 @@ static const OnigCodePoint CR_L[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -6240,24 +1338,23 @@ static const OnigCodePoint CR_L[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6e5,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -6282,18 +1379,12 @@ static const OnigCodePoint CR_L[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -6342,8 +1433,6 @@ static const OnigCodePoint CR_L[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -6353,20 +1442,9 @@ static const OnigCodePoint CR_L[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -6397,168 +1475,18 @@ static const OnigCodePoint CR_L[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_L */
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
- 113,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00b5, 0x00b5,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x01ba,
- 0x01bc, 0x01bf,
- 0x01c4, 0x0293,
- 0x0295, 0x02af,
- 0x0370, 0x0373,
- 0x0376, 0x0377,
- 0x037b, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0561, 0x0587,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1d9a,
- 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,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c7b,
- 0x2c7e, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
- 0xa680, 0xa697,
- 0xa722, 0xa76f,
- 0xa771, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7fa, 0xa7fa,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0x10400, 0x1044f,
- 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,
-}; /* CR_LC */
-
/* 'Ll': General Category */
static const OnigCodePoint CR_Ll[] = {
- 611,
+ 599,
0x0061, 0x007a,
+ 0x00aa, 0x00aa,
0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
0x00df, 0x00f6,
0x00f8, 0x00ff,
0x0101, 0x0101,
@@ -6821,10 +1749,9 @@ static const OnigCodePoint CR_Ll[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
+ 0x1d62, 0x1d77,
0x1d79, 0x1d9a,
0x1e01, 0x1e01,
0x1e03, 0x1e03,
@@ -6988,7 +1915,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2c6c, 0x2c6c,
0x2c71, 0x2c71,
0x2c73, 0x2c74,
- 0x2c76, 0x2c7b,
+ 0x2c76, 0x2c7c,
0x2c81, 0x2c81,
0x2c83, 0x2c83,
0x2c85, 0x2c85,
@@ -7041,10 +1968,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2ce3, 0x2ce4,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -7061,7 +1985,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -7127,15 +2050,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7fa, 0xa7fa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -7172,7 +2086,7 @@ static const OnigCodePoint CR_Ll[] = {
/* 'Lm': General Category */
static const OnigCodePoint CR_Lm[] = {
- 52,
+ 49,
0x02b0, 0x02c1,
0x02c6, 0x02d1,
0x02e0, 0x02e4,
@@ -7196,13 +2110,13 @@ static const OnigCodePoint CR_Lm[] = {
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c78, 0x1c7d,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
- 0x2c7c, 0x2c7d,
+ 0x2090, 0x2094,
+ 0x2c7d, 0x2c7d,
0x2d6f, 0x2d6f,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
@@ -7217,27 +2131,22 @@ static const OnigCodePoint CR_Lm[] = {
0xa717, 0xa71f,
0xa770, 0xa770,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
0xff9e, 0xff9f,
- 0x16f93, 0x16f9f,
}; /* CR_Lm */
/* 'Lo': General Category */
static const OnigCodePoint CR_Lo[] = {
- 371,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 311,
0x01bb, 0x01bb,
0x01c0, 0x01c3,
0x0294, 0x0294,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
@@ -7251,14 +2160,11 @@ static const OnigCodePoint CR_Lo[] = {
0x07b1, 0x07b1,
0x07ca, 0x07ea,
0x0800, 0x0815,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0972, 0x0977,
+ 0x0972, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -7327,12 +2233,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -7358,11 +2263,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0eb2, 0x0eb3,
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -7373,7 +2278,7 @@ static const OnigCodePoint CR_Lo[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10d0, 0x10fa,
- 0x10fd, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -7419,15 +2324,13 @@ static const OnigCodePoint CR_Lo[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c77,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x2135, 0x2138,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -7445,10 +2348,10 @@ static const OnigCodePoint CR_Lo[] = {
0x30ff, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa014,
0xa016, 0xa48c,
0xa4d0, 0xa4f7,
@@ -7482,18 +2385,12 @@ static const OnigCodePoint CR_Lo[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadc,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf2,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb1d, 0xfb1d,
0xfb1f, 0xfb28,
@@ -7540,8 +2437,6 @@ static const OnigCodePoint CR_Lo[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -7551,55 +2446,11 @@ static const OnigCodePoint CR_Lo[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x1b000, 0x1b001,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Lo */
@@ -7620,7 +2471,7 @@ static const OnigCodePoint CR_Lt[] = {
/* 'Lu': General Category */
static const OnigCodePoint CR_Lu[] = {
- 608,
+ 594,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -7886,11 +2737,8 @@ static const OnigCodePoint CR_Lu[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -8105,7 +2953,6 @@ static const OnigCodePoint CR_Lu[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -8122,7 +2969,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -8187,15 +3033,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
0x1d400, 0x1d419,
@@ -8233,7 +3070,7 @@ static const OnigCodePoint CR_Lu[] = {
/* 'M': Major Category */
static const OnigCodePoint CR_M[] = {
- 204,
+ 188,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -8242,10 +3079,10 @@ static const OnigCodePoint CR_M[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -8256,12 +3093,10 @@ static const OnigCodePoint CR_M[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093c,
- 0x093e, 0x094f,
- 0x0951, 0x0957,
+ 0x093c, 0x093c,
+ 0x093e, 0x094e,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09bc, 0x09bc,
@@ -8335,7 +3170,7 @@ static const OnigCodePoint CR_M[] = {
0x0f3e, 0x0f3f,
0x0f71, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102b, 0x103e,
@@ -8347,12 +3182,12 @@ static const OnigCodePoint CR_M[] = {
0x1082, 0x108d,
0x108f, 0x108f,
0x109a, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17d3,
+ 0x17b6, 0x17d3,
0x17dd, 0x17dd,
0x180b, 0x180d,
0x18a9, 0x18a9,
@@ -8368,24 +3203,21 @@ static const OnigCodePoint CR_M[] = {
0x1b34, 0x1b44,
0x1b6b, 0x1b73,
0x1b80, 0x1b82,
- 0x1ba1, 0x1bad,
- 0x1be6, 0x1bf3,
+ 0x1ba1, 0x1baa,
0x1c24, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf2, 0x1cf4,
+ 0x1cf2, 0x1cf2,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8407,8 +3239,6 @@ static const OnigCodePoint CR_M[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf6,
0xabe3, 0xabea,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
@@ -8420,17 +3250,8 @@ static const OnigCodePoint CR_M[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11000, 0x11002,
- 0x11038, 0x11046,
0x11080, 0x11082,
0x110b0, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x11134,
- 0x11180, 0x11182,
- 0x111b3, 0x111c0,
- 0x116ab, 0x116b7,
- 0x16f51, 0x16f7e,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -8442,12 +3263,11 @@ static const OnigCodePoint CR_M[] = {
/* 'Mc': General Category */
static const OnigCodePoint CR_Mc[] = {
- 126,
+ 106,
0x0903, 0x0903,
- 0x093b, 0x093b,
0x093e, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x094f,
+ 0x094e, 0x094e,
0x0982, 0x0983,
0x09be, 0x09c0,
0x09c7, 0x09c8,
@@ -8524,16 +3344,10 @@ static const OnigCodePoint CR_Mc[] = {
0x1ba1, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
0x1c24, 0x1c2b,
0x1c34, 0x1c35,
0x1ce1, 0x1ce1,
- 0x1cf2, 0x1cf3,
- 0x302e, 0x302f,
+ 0x1cf2, 0x1cf2,
0xa823, 0xa824,
0xa827, 0xa827,
0xa880, 0xa881,
@@ -8547,34 +3361,22 @@ static const OnigCodePoint CR_Mc[] = {
0xaa33, 0xaa34,
0xaa4d, 0xaa4d,
0xaa7b, 0xaa7b,
- 0xaaeb, 0xaaeb,
- 0xaaee, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabea,
0xabec, 0xabec,
- 0x11000, 0x11000,
- 0x11002, 0x11002,
0x11082, 0x11082,
0x110b0, 0x110b2,
0x110b7, 0x110b8,
- 0x1112c, 0x1112c,
- 0x11182, 0x11182,
- 0x111b3, 0x111b5,
- 0x111bf, 0x111c0,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x16f51, 0x16f7e,
0x1d165, 0x1d166,
0x1d16d, 0x1d172,
}; /* CR_Mc */
/* 'Me': General Category */
static const OnigCodePoint CR_Me[] = {
- 4,
+ 5,
0x0488, 0x0489,
+ 0x06de, 0x06de,
0x20dd, 0x20e0,
0x20e2, 0x20e4,
0xa670, 0xa672,
@@ -8582,7 +3384,7 @@ static const OnigCodePoint CR_Me[] = {
/* 'Mn': General Category */
static const OnigCodePoint CR_Mn[] = {
- 220,
+ 194,
0x0300, 0x036f,
0x0483, 0x0487,
0x0591, 0x05bd,
@@ -8591,7 +3393,7 @@ static const OnigCodePoint CR_Mn[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06df, 0x06e4,
@@ -8605,14 +3407,11 @@ static const OnigCodePoint CR_Mn[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -8673,7 +3472,7 @@ static const OnigCodePoint CR_Mn[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -8687,12 +3486,11 @@ static const OnigCodePoint CR_Mn[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -8720,31 +3518,23 @@ static const OnigCodePoint CR_Mn[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa66f,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8768,8 +3558,6 @@ static const OnigCodePoint CR_Mn[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -8782,21 +3570,9 @@ static const OnigCodePoint CR_Mn[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d167, 0x1d169,
0x1d17b, 0x1d182,
0x1d185, 0x1d18b,
@@ -8807,7 +3583,7 @@ static const OnigCodePoint CR_Mn[] = {
/* 'N': Major Category */
static const OnigCodePoint CR_N[] = {
- 88,
+ 81,
0x0030, 0x0039,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
@@ -8821,7 +3597,6 @@ static const OnigCodePoint CR_N[] = {
0x0a66, 0x0a6f,
0x0ae6, 0x0aef,
0x0b66, 0x0b6f,
- 0x0b72, 0x0b77,
0x0be6, 0x0bf2,
0x0c66, 0x0c6f,
0x0c78, 0x0c7e,
@@ -8859,7 +3634,6 @@ static const OnigCodePoint CR_N[] = {
0x3038, 0x303a,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8887,11 +3661,6 @@ static const OnigCodePoint CR_N[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
0x12400, 0x12462,
0x1d360, 0x1d371,
0x1d7ce, 0x1d7ff,
@@ -8899,7 +3668,46 @@ static const OnigCodePoint CR_N[] = {
}; /* CR_N */
/* 'Nd': General Category */
-#define CR_Nd CR_Digit
+static const OnigCodePoint CR_Nd[] = {
+ 37,
+ 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, 0x19da,
+ 0x1a80, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1b50, 0x1b59,
+ 0x1bb0, 0x1bb9,
+ 0x1c40, 0x1c49,
+ 0x1c50, 0x1c59,
+ 0xa620, 0xa629,
+ 0xa8d0, 0xa8d9,
+ 0xa900, 0xa909,
+ 0xa9d0, 0xa9d9,
+ 0xaa50, 0xaa59,
+ 0xabf0, 0xabf9,
+ 0xff10, 0xff19,
+ 0x104a0, 0x104a9,
+ 0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
/* 'Nl': General Category */
static const OnigCodePoint CR_Nl[] = {
@@ -8920,19 +3728,17 @@ static const OnigCodePoint CR_Nl[] = {
/* 'No': General Category */
static const OnigCodePoint CR_No[] = {
- 42,
+ 38,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
0x00bc, 0x00be,
0x09f4, 0x09f9,
- 0x0b72, 0x0b77,
0x0bf0, 0x0bf2,
0x0c78, 0x0c7e,
0x0d70, 0x0d75,
0x0f2a, 0x0f33,
0x1369, 0x137c,
0x17f0, 0x17f9,
- 0x19da, 0x19da,
0x2070, 0x2070,
0x2074, 0x2079,
0x2080, 0x2089,
@@ -8944,7 +3750,6 @@ static const OnigCodePoint CR_No[] = {
0x2cfd, 0x2cfd,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8960,13 +3765,143 @@ static const OnigCodePoint CR_No[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x11065,
0x1d360, 0x1d371,
0x1f100, 0x1f10a,
}; /* CR_No */
/* 'P': Major Category */
-#define CR_P CR_Punct
+static const OnigCodePoint CR_P[] = {
+ 129,
+ 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,
+ 0x0830, 0x083e,
+ 0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0df4, 0x0df4,
+ 0x0e4f, 0x0e4f,
+ 0x0e5a, 0x0e5b,
+ 0x0f04, 0x0f12,
+ 0x0f3a, 0x0f3d,
+ 0x0f85, 0x0f85,
+ 0x0fd0, 0x0fd4,
+ 0x104a, 0x104f,
+ 0x10fb, 0x10fb,
+ 0x1361, 0x1368,
+ 0x1400, 0x1400,
+ 0x166d, 0x166e,
+ 0x169b, 0x169c,
+ 0x16eb, 0x16ed,
+ 0x1735, 0x1736,
+ 0x17d4, 0x17d6,
+ 0x17d8, 0x17da,
+ 0x1800, 0x180a,
+ 0x1944, 0x1945,
+ 0x19de, 0x19df,
+ 0x1a1e, 0x1a1f,
+ 0x1aa0, 0x1aa6,
+ 0x1aa8, 0x1aad,
+ 0x1b5a, 0x1b60,
+ 0x1c3b, 0x1c3f,
+ 0x1c7e, 0x1c7f,
+ 0x1cd3, 0x1cd3,
+ 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, 0x2e31,
+ 0x3001, 0x3003,
+ 0x3008, 0x3011,
+ 0x3014, 0x301f,
+ 0x3030, 0x3030,
+ 0x303d, 0x303d,
+ 0x30a0, 0x30a0,
+ 0x30fb, 0x30fb,
+ 0xa4fe, 0xa4ff,
+ 0xa60d, 0xa60f,
+ 0xa673, 0xa673,
+ 0xa67e, 0xa67e,
+ 0xa6f2, 0xa6f7,
+ 0xa874, 0xa877,
+ 0xa8ce, 0xa8cf,
+ 0xa8f8, 0xa8fa,
+ 0xa92e, 0xa92f,
+ 0xa95f, 0xa95f,
+ 0xa9c1, 0xa9cd,
+ 0xa9de, 0xa9df,
+ 0xaa5c, 0xaa5f,
+ 0xaade, 0xaadf,
+ 0xabeb, 0xabeb,
+ 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,
+ 0x10857, 0x10857,
+ 0x1091f, 0x1091f,
+ 0x1093f, 0x1093f,
+ 0x10a50, 0x10a58,
+ 0x10a7f, 0x10a7f,
+ 0x10b39, 0x10b3f,
+ 0x110bb, 0x110bc,
+ 0x110be, 0x110c1,
+ 0x12470, 0x12473,
+}; /* CR_P */
/* 'Pc': General Category */
static const OnigCodePoint CR_Pc[] = {
@@ -8981,7 +3916,7 @@ static const OnigCodePoint CR_Pc[] = {
/* 'Pd': General Category */
static const OnigCodePoint CR_Pd[] = {
- 16,
+ 15,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -8990,7 +3925,6 @@ static const OnigCodePoint CR_Pd[] = {
0x2010, 0x2015,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -9108,7 +4042,7 @@ static const OnigCodePoint CR_Pi[] = {
/* 'Po': General Category */
static const OnigCodePoint CR_Po[] = {
- 135,
+ 124,
0x0021, 0x0023,
0x0025, 0x0027,
0x002a, 0x002a,
@@ -9118,8 +4052,7 @@ static const OnigCodePoint CR_Po[] = {
0x003f, 0x0040,
0x005c, 0x005c,
0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00b6, 0x00b7,
+ 0x00b7, 0x00b7,
0x00bf, 0x00bf,
0x037e, 0x037e,
0x0387, 0x0387,
@@ -9138,21 +4071,17 @@ static const OnigCodePoint CR_Po[] = {
0x0700, 0x070d,
0x07f7, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0970, 0x0970,
- 0x0af0, 0x0af0,
0x0df4, 0x0df4,
0x0e4f, 0x0e4f,
0x0e5a, 0x0e5b,
0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
0x0f85, 0x0f85,
0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
0x104a, 0x104f,
0x10fb, 0x10fb,
- 0x1360, 0x1368,
+ 0x1361, 0x1368,
0x166d, 0x166e,
0x16eb, 0x16ed,
0x1735, 0x1736,
@@ -9161,14 +4090,13 @@ static const OnigCodePoint CR_Po[] = {
0x1800, 0x1805,
0x1807, 0x180a,
0x1944, 0x1945,
+ 0x19de, 0x19df,
0x1a1e, 0x1a1f,
0x1aa0, 0x1aa6,
0x1aa8, 0x1aad,
0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
0x1c3b, 0x1c3f,
0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x2016, 0x2017,
0x2020, 0x2027,
@@ -9180,7 +4108,6 @@ static const OnigCodePoint CR_Po[] = {
0x2055, 0x205e,
0x2cf9, 0x2cfc,
0x2cfe, 0x2cff,
- 0x2d70, 0x2d70,
0x2e00, 0x2e01,
0x2e06, 0x2e08,
0x2e0b, 0x2e0b,
@@ -9189,7 +4116,7 @@ static const OnigCodePoint CR_Po[] = {
0x2e1b, 0x2e1b,
0x2e1e, 0x2e1f,
0x2e2a, 0x2e2e,
- 0x2e30, 0x2e39,
+ 0x2e30, 0x2e31,
0x3001, 0x3003,
0x303d, 0x303d,
0x30fb, 0x30fb,
@@ -9207,7 +4134,6 @@ static const OnigCodePoint CR_Po[] = {
0xa9de, 0xa9df,
0xaa5c, 0xaa5f,
0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe10, 0xfe16,
0xfe19, 0xfe19,
@@ -9229,7 +4155,7 @@ static const OnigCodePoint CR_Po[] = {
0xff3c, 0xff3c,
0xff61, 0xff61,
0xff64, 0xff65,
- 0x10100, 0x10102,
+ 0x10100, 0x10101,
0x1039f, 0x1039f,
0x103d0, 0x103d0,
0x10857, 0x10857,
@@ -9238,11 +4164,8 @@ static const OnigCodePoint CR_Po[] = {
0x10a50, 0x10a58,
0x10a7f, 0x10a7f,
0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
0x12470, 0x12473,
}; /* CR_Po */
@@ -9333,11 +4256,11 @@ static const OnigCodePoint CR_S[] = {
0x0060, 0x0060,
0x007c, 0x007c,
0x007e, 0x007e,
- 0x00a2, 0x00a6,
- 0x00a8, 0x00a9,
+ 0x00a2, 0x00a9,
0x00ac, 0x00ac,
0x00ae, 0x00b1,
0x00b4, 0x00b4,
+ 0x00b6, 0x00b6,
0x00b8, 0x00b8,
0x00d7, 0x00d7,
0x00f7, 0x00f7,
@@ -9350,11 +4273,9 @@ static const OnigCodePoint CR_S[] = {
0x0384, 0x0385,
0x03f6, 0x03f6,
0x0482, 0x0482,
- 0x058f, 0x058f,
0x0606, 0x0608,
0x060b, 0x060b,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9364,11 +4285,11 @@ static const OnigCodePoint CR_S[] = {
0x0b70, 0x0b70,
0x0bf3, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0e3f, 0x0e3f,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9378,10 +4299,11 @@ static const OnigCodePoint CR_S[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x17db, 0x17db,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x1fbd, 0x1fbd,
@@ -9394,7 +4316,7 @@ static const OnigCodePoint CR_S[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
@@ -9410,14 +4332,29 @@ static const OnigCodePoint CR_S[] = {
0x214a, 0x214d,
0x214f, 0x214f,
0x2190, 0x2328,
- 0x232b, 0x23f3,
+ 0x232b, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
- 0x2500, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x2500, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27c4,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x2982,
0x2999, 0x29d7,
0x29dc, 0x29fb,
@@ -9438,8 +4375,7 @@ static const OnigCodePoint CR_S[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9453,7 +4389,6 @@ static const OnigCodePoint CR_S[] = {
0xa836, 0xa839,
0xaa77, 0xaa79,
0xfb29, 0xfb29,
- 0xfbb2, 0xfbc1,
0xfdfc, 0xfdfd,
0xfe62, 0xfe62,
0xfe64, 0xfe66,
@@ -9468,6 +4403,7 @@ static const OnigCodePoint CR_S[] = {
0xffe0, 0xffe6,
0xffe8, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9492,46 +4428,32 @@ static const OnigCodePoint CR_S[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_S */
/* 'Sc': General Category */
static const OnigCodePoint CR_Sc[] = {
- 17,
+ 16,
0x0024, 0x0024,
0x00a2, 0x00a5,
- 0x058f, 0x058f,
0x060b, 0x060b,
0x09f2, 0x09f3,
0x09fb, 0x09fb,
@@ -9539,7 +4461,7 @@ static const OnigCodePoint CR_Sc[] = {
0x0bf9, 0x0bf9,
0x0e3f, 0x0e3f,
0x17db, 0x17db,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0xa838, 0xa838,
0xfdfc, 0xfdfc,
0xfe69, 0xfe69,
@@ -9550,7 +4472,7 @@ static const OnigCodePoint CR_Sc[] = {
/* 'Sk': General Category */
static const OnigCodePoint CR_Sk[] = {
- 27,
+ 26,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -9574,7 +4496,6 @@ static const OnigCodePoint CR_Sk[] = {
0xa700, 0xa716,
0xa720, 0xa721,
0xa789, 0xa78a,
- 0xfbb2, 0xfbc1,
0xff3e, 0xff3e,
0xff40, 0xff40,
0xffe3, 0xffe3,
@@ -9597,7 +4518,6 @@ static const OnigCodePoint CR_Sm[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x2118, 0x2118,
0x2140, 0x2144,
0x214b, 0x214b,
0x2190, 0x2194,
@@ -9620,7 +4540,9 @@ static const OnigCodePoint CR_Sm[] = {
0x25f8, 0x25ff,
0x266f, 0x266f,
0x27c0, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x27ff,
0x2900, 0x2982,
0x2999, 0x29d7,
@@ -9647,19 +4569,18 @@ static const OnigCodePoint CR_Sm[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
}; /* CR_Sm */
/* 'So': General Category */
static const OnigCodePoint CR_So[] = {
- 153,
- 0x00a6, 0x00a6,
+ 154,
+ 0x00a6, 0x00a7,
0x00a9, 0x00a9,
0x00ae, 0x00ae,
0x00b0, 0x00b0,
+ 0x00b6, 0x00b6,
0x0482, 0x0482,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9668,10 +4589,10 @@ static const OnigCodePoint CR_So[] = {
0x0bf3, 0x0bf8,
0x0bfa, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9681,16 +4602,17 @@ static const OnigCodePoint CR_So[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
0x2114, 0x2114,
- 0x2116, 0x2117,
+ 0x2116, 0x2118,
0x211e, 0x2123,
0x2125, 0x2125,
0x2127, 0x2127,
@@ -9715,7 +4637,7 @@ static const OnigCodePoint CR_So[] = {
0x232b, 0x237b,
0x237d, 0x239a,
0x23b4, 0x23db,
- 0x23e2, 0x23f3,
+ 0x23e2, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
@@ -9723,9 +4645,21 @@ static const OnigCodePoint CR_So[] = {
0x25b8, 0x25c0,
0x25c2, 0x25f7,
0x2600, 0x266e,
- 0x2670, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27bf,
+ 0x2670, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
0x2800, 0x28ff,
0x2b00, 0x2b2f,
0x2b45, 0x2b46,
@@ -9744,8 +4678,7 @@ static const OnigCodePoint CR_So[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9761,6 +4694,7 @@ static const OnigCodePoint CR_So[] = {
0xffe8, 0xffe8,
0xffed, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9777,35 +4711,23 @@ static const OnigCodePoint CR_So[] = {
0x1d300, 0x1d356,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_So */
/* 'Z': Major Category */
@@ -9849,7 +4771,7 @@ static const OnigCodePoint CR_Zs[] = {
/* 'Math': Derived Property */
static const OnigCodePoint CR_Math[] = {
- 138,
+ 105,
0x002b, 0x002b,
0x003c, 0x003e,
0x005e, 0x005e,
@@ -9877,10 +4799,9 @@ static const OnigCodePoint CR_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
- 0x2118, 0x211d,
+ 0x2119, 0x211d,
0x2124, 0x2124,
0x2128, 0x2129,
0x212c, 0x212d,
@@ -9918,7 +4839,9 @@ static const OnigCodePoint CR_Math[] = {
0x2642, 0x2642,
0x2660, 0x2663,
0x266d, 0x266f,
- 0x27c0, 0x27ff,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2aff,
0x2b30, 0x2b44,
0x2b47, 0x2b4c,
@@ -9954,54 +4877,1698 @@ static const OnigCodePoint CR_Math[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Math */
/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
+static const OnigCodePoint CR_Alphabetic[] = {
+ 474,
+ 0x0041, 0x005a,
+ 0x0061, 0x007a,
+ 0x00aa, 0x00aa,
+ 0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
+ 0x00c0, 0x00d6,
+ 0x00d8, 0x00f6,
+ 0x00f8, 0x02c1,
+ 0x02c6, 0x02d1,
+ 0x02e0, 0x02e4,
+ 0x02ec, 0x02ec,
+ 0x02ee, 0x02ee,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
+ 0x038c, 0x038c,
+ 0x038e, 0x03a1,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
+ 0x0531, 0x0556,
+ 0x0559, 0x0559,
+ 0x0561, 0x0587,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
+ 0x05d0, 0x05ea,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06ef,
+ 0x06fa, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
+ 0x074d, 0x07b1,
+ 0x07ca, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0971, 0x0972,
+ 0x0979, 0x097f,
+ 0x0981, 0x0983,
+ 0x0985, 0x098c,
+ 0x098f, 0x0990,
+ 0x0993, 0x09a8,
+ 0x09aa, 0x09b0,
+ 0x09b2, 0x09b2,
+ 0x09b6, 0x09b9,
+ 0x09bd, 0x09c4,
+ 0x09c7, 0x09c8,
+ 0x09cb, 0x09cc,
+ 0x09ce, 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,
+ 0x0a3e, 0x0a42,
+ 0x0a47, 0x0a48,
+ 0x0a4b, 0x0a4c,
+ 0x0a51, 0x0a51,
+ 0x0a59, 0x0a5c,
+ 0x0a5e, 0x0a5e,
+ 0x0a70, 0x0a75,
+ 0x0a81, 0x0a83,
+ 0x0a85, 0x0a8d,
+ 0x0a8f, 0x0a91,
+ 0x0a93, 0x0aa8,
+ 0x0aaa, 0x0ab0,
+ 0x0ab2, 0x0ab3,
+ 0x0ab5, 0x0ab9,
+ 0x0abd, 0x0ac5,
+ 0x0ac7, 0x0ac9,
+ 0x0acb, 0x0acc,
+ 0x0ad0, 0x0ad0,
+ 0x0ae0, 0x0ae3,
+ 0x0b01, 0x0b03,
+ 0x0b05, 0x0b0c,
+ 0x0b0f, 0x0b10,
+ 0x0b13, 0x0b28,
+ 0x0b2a, 0x0b30,
+ 0x0b32, 0x0b33,
+ 0x0b35, 0x0b39,
+ 0x0b3d, 0x0b44,
+ 0x0b47, 0x0b48,
+ 0x0b4b, 0x0b4c,
+ 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, 0x0bcc,
+ 0x0bd0, 0x0bd0,
+ 0x0bd7, 0x0bd7,
+ 0x0c01, 0x0c03,
+ 0x0c05, 0x0c0c,
+ 0x0c0e, 0x0c10,
+ 0x0c12, 0x0c28,
+ 0x0c2a, 0x0c33,
+ 0x0c35, 0x0c39,
+ 0x0c3d, 0x0c44,
+ 0x0c46, 0x0c48,
+ 0x0c4a, 0x0c4c,
+ 0x0c55, 0x0c56,
+ 0x0c58, 0x0c59,
+ 0x0c60, 0x0c63,
+ 0x0c82, 0x0c83,
+ 0x0c85, 0x0c8c,
+ 0x0c8e, 0x0c90,
+ 0x0c92, 0x0ca8,
+ 0x0caa, 0x0cb3,
+ 0x0cb5, 0x0cb9,
+ 0x0cbd, 0x0cc4,
+ 0x0cc6, 0x0cc8,
+ 0x0cca, 0x0ccc,
+ 0x0cd5, 0x0cd6,
+ 0x0cde, 0x0cde,
+ 0x0ce0, 0x0ce3,
+ 0x0d02, 0x0d03,
+ 0x0d05, 0x0d0c,
+ 0x0d0e, 0x0d10,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
+ 0x0d3d, 0x0d44,
+ 0x0d46, 0x0d48,
+ 0x0d4a, 0x0d4c,
+ 0x0d57, 0x0d57,
+ 0x0d60, 0x0d63,
+ 0x0d7a, 0x0d7f,
+ 0x0d82, 0x0d83,
+ 0x0d85, 0x0d96,
+ 0x0d9a, 0x0db1,
+ 0x0db3, 0x0dbb,
+ 0x0dbd, 0x0dbd,
+ 0x0dc0, 0x0dc6,
+ 0x0dcf, 0x0dd4,
+ 0x0dd6, 0x0dd6,
+ 0x0dd8, 0x0ddf,
+ 0x0df2, 0x0df3,
+ 0x0e01, 0x0e3a,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 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,
+ 0x0ecd, 0x0ecd,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f40, 0x0f47,
+ 0x0f49, 0x0f6c,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
+ 0x0f99, 0x0fbc,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x103f,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 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, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
+ 0x1700, 0x170c,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
+ 0x1740, 0x1753,
+ 0x1760, 0x176c,
+ 0x176e, 0x1770,
+ 0x1772, 0x1773,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
+ 0x1820, 0x1877,
+ 0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
+ 0x1900, 0x191c,
+ 0x1920, 0x192b,
+ 0x1930, 0x1938,
+ 0x1950, 0x196d,
+ 0x1970, 0x1974,
+ 0x1980, 0x19ab,
+ 0x19b0, 0x19c9,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1baf,
+ 0x1c00, 0x1c35,
+ 0x1c4d, 0x1c4f,
+ 0x1c5a, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
+ 0x2c00, 0x2c2e,
+ 0x2c30, 0x2c5e,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 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, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
+ 0x3041, 0x3096,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
+ 0x3105, 0x312d,
+ 0x3131, 0x318e,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
+ 0xa000, 0xa48c,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa61f,
+ 0xa62a, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa90a, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
+ 0xa9cf, 0xa9cf,
+ 0xaa00, 0xaa36,
+ 0xaa40, 0xaa4d,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xac00, 0xd7a3,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
+ 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,
+ 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,
+ 0x10140, 0x10174,
+ 0x10280, 0x1029c,
+ 0x102a0, 0x102d0,
+ 0x10300, 0x1031e,
+ 0x10330, 0x1034a,
+ 0x10380, 0x1039d,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
+ 0x10400, 0x1049d,
+ 0x10800, 0x10805,
+ 0x10808, 0x10808,
+ 0x1080a, 0x10835,
+ 0x10837, 0x10838,
+ 0x1083c, 0x1083c,
+ 0x1083f, 0x10855,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
+ 0x10a00, 0x10a03,
+ 0x10a05, 0x10a06,
+ 0x10a0c, 0x10a13,
+ 0x10a15, 0x10a17,
+ 0x10a19, 0x10a33,
+ 0x10a60, 0x10a7c,
+ 0x10b00, 0x10b35,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
+ 0x10c00, 0x10c48,
+ 0x11082, 0x110b8,
+ 0x12000, 0x1236e,
+ 0x12400, 0x12462,
+ 0x13000, 0x1342e,
+ 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, 0x2a6d6,
+ 0x2a700, 0x2b734,
+ 0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
+static const OnigCodePoint CR_Lowercase[] = {
+ 602,
+ 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, 0x02b8,
+ 0x02c0, 0x02c1,
+ 0x02e0, 0x02e4,
+ 0x0345, 0x0345,
+ 0x0371, 0x0371,
+ 0x0373, 0x0373,
+ 0x0377, 0x0377,
+ 0x037a, 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,
+ 0x0525, 0x0525,
+ 0x0561, 0x0587,
+ 0x1d00, 0x1dbf,
+ 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,
+ 0x2090, 0x2094,
+ 0x210a, 0x210a,
+ 0x210e, 0x210f,
+ 0x2113, 0x2113,
+ 0x212f, 0x212f,
+ 0x2134, 0x2134,
+ 0x2139, 0x2139,
+ 0x213c, 0x213d,
+ 0x2146, 0x2149,
+ 0x214e, 0x214e,
+ 0x2170, 0x217f,
+ 0x2184, 0x2184,
+ 0x24d0, 0x24e9,
+ 0x2c30, 0x2c5e,
+ 0x2c61, 0x2c61,
+ 0x2c65, 0x2c66,
+ 0x2c68, 0x2c68,
+ 0x2c6a, 0x2c6a,
+ 0x2c6c, 0x2c6c,
+ 0x2c71, 0x2c71,
+ 0x2c73, 0x2c74,
+ 0x2c76, 0x2c7d,
+ 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,
+ 0x2cec, 0x2cec,
+ 0x2cee, 0x2cee,
+ 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, 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_Lowercase */
/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
+static const OnigCodePoint CR_Uppercase[] = {
+ 596,
+ 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,
+ 0x0524, 0x0524,
+ 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,
+ 0x2160, 0x216f,
+ 0x2183, 0x2183,
+ 0x24b6, 0x24cf,
+ 0x2c00, 0x2c2e,
+ 0x2c60, 0x2c60,
+ 0x2c62, 0x2c64,
+ 0x2c67, 0x2c67,
+ 0x2c69, 0x2c69,
+ 0x2c6b, 0x2c6b,
+ 0x2c6d, 0x2c70,
+ 0x2c72, 0x2c72,
+ 0x2c75, 0x2c75,
+ 0x2c7e, 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,
+ 0x2ceb, 0x2ceb,
+ 0x2ced, 0x2ced,
+ 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_Uppercase */
/* 'Cased': Derived Property */
static const OnigCodePoint CR_Cased[] = {
- 119,
+ 110,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -10025,12 +6592,10 @@ static const OnigCodePoint CR_Cased[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -10051,9 +6616,7 @@ static const OnigCodePoint CR_Cased[] = {
0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -10075,17 +6638,12 @@ static const OnigCodePoint CR_Cased[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7fa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -10125,7 +6683,7 @@ static const OnigCodePoint CR_Cased[] = {
/* 'Case_Ignorable': Derived Property */
static const OnigCodePoint CR_Case_Ignorable[] = {
- 295,
+ 266,
0x0027, 0x0027,
0x002e, 0x002e,
0x003a, 0x003a,
@@ -10149,13 +6707,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x05f4, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0610, 0x061a,
0x0640, 0x0640,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
- 0x06d6, 0x06dd,
- 0x06df, 0x06e8,
+ 0x06d6, 0x06e8,
0x06ea, 0x06ed,
0x070f, 0x070f,
0x0711, 0x0711,
@@ -10164,14 +6721,11 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x07eb, 0x07f5,
0x07fa, 0x07fa,
0x0816, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0971, 0x0971,
0x0981, 0x0981,
@@ -10234,7 +6788,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -10249,7 +6803,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x108d, 0x108d,
0x109d, 0x109d,
0x10fc, 0x10fc,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
@@ -10285,11 +6839,6 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
@@ -10297,11 +6846,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x1fbd, 0x1fbd,
0x1fbf, 0x1fc1,
0x1fcd, 0x1fcf,
@@ -10317,16 +6865,15 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x206a, 0x206f,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0x2cef, 0x2cf1,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3031, 0x3035,
0x303b, 0x303b,
0x3099, 0x309e,
@@ -10335,14 +6882,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xa4f8, 0xa4fd,
0xa60c, 0xa60c,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
+ 0xa67c, 0xa67d,
0xa67f, 0xa67f,
- 0xa69f, 0xa69f,
0xa6f0, 0xa6f1,
0xa700, 0xa721,
0xa770, 0xa770,
0xa788, 0xa78a,
- 0xa7f8, 0xa7f9,
0xa802, 0xa802,
0xa806, 0xa806,
0xa80b, 0xa80b,
@@ -10368,14 +6913,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xaabe, 0xaabf,
0xaac1, 0xaac1,
0xaadd, 0xaadd,
- 0xaaec, 0xaaed,
- 0xaaf3, 0xaaf4,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
0xfb1e, 0xfb1e,
- 0xfbb2, 0xfbc1,
0xfe00, 0xfe0f,
0xfe13, 0xfe13,
0xfe20, 0xfe26,
@@ -10397,22 +6938,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
0x110bd, 0x110bd,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d173, 0x1d182,
0x1d185, 0x1d18b,
@@ -10425,7 +6954,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
/* 'Changes_When_Lowercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Lowercased[] = {
- 571,
+ 557,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -10690,11 +7219,8 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -10904,7 +7430,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -10921,7 +7446,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -10986,22 +7510,13 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
}; /* CR_Changes_When_Lowercased */
/* 'Changes_When_Uppercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Uppercased[] = {
- 586,
+ 573,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11151,7 +7666,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11281,7 +7795,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -11492,10 +8005,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -11512,7 +8022,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -11577,13 +8086,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -11592,7 +8094,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
/* 'Changes_When_Titlecased': Derived Property */
static const OnigCodePoint CR_Changes_When_Titlecased[] = {
- 587,
+ 574,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11743,7 +8245,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11873,7 +8374,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -12084,10 +8584,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -12104,7 +8601,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -12169,13 +8665,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -12184,7 +8673,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
/* 'Changes_When_Casefolded': Derived Property */
static const OnigCodePoint CR_Changes_When_Casefolded[] = {
- 582,
+ 568,
0x0041, 0x005a,
0x00b5, 0x00b5,
0x00c0, 0x00d6,
@@ -12455,12 +8944,9 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x0587, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -12672,7 +9158,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -12689,7 +9174,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -12754,15 +9238,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12771,7 +9246,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
/* 'Changes_When_Casemapped': Derived Property */
static const OnigCodePoint CR_Changes_When_Casemapped[] = {
- 104,
+ 97,
0x0041, 0x005a,
0x0061, 0x007a,
0x00b5, 0x00b5,
@@ -12792,7 +9267,6 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -12816,12 +9290,10 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x03f4, 0x03f5,
0x03f7, 0x03fb,
0x03fd, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
0x1e00, 0x1e9b,
@@ -12859,18 +9331,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x2c75, 0x2c76,
0x2c7e, 0x2ce3,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa72f,
0xa732, 0xa76f,
0xa779, 0xa787,
- 0xa78b, 0xa78d,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12880,7 +9348,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
/* 'ID_Start': Derived Property */
static const OnigCodePoint CR_ID_Start[] = {
- 488,
+ 424,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -12902,13 +9370,13 @@ static const OnigCodePoint CR_ID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -12927,14 +9395,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -13003,12 +9468,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -13035,11 +9499,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -13050,10 +9514,9 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13101,13 +9564,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -13130,7 +9591,7 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -13148,11 +9609,8 @@ static const OnigCodePoint CR_ID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -13173,24 +9631,23 @@ static const OnigCodePoint CR_ID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -13215,18 +9672,12 @@ static const OnigCodePoint CR_ID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13276,8 +9727,6 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -13287,21 +9736,10 @@ static const OnigCodePoint CR_ID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -13332,48 +9770,14 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_ID_Start */
/* 'ID_Continue': Derived Property */
static const OnigCodePoint CR_ID_Continue[] = {
- 564,
+ 506,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -13398,7 +9802,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -13410,7 +9814,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -13421,13 +9826,12 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -13529,14 +9933,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -13572,7 +9976,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -13582,16 +9986,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13607,7 +10011,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -13623,7 +10027,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -13649,14 +10054,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -13679,7 +10085,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -13699,13 +10105,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -13725,24 +10129,23 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -13760,20 +10163,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13830,8 +10227,6 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -13844,25 +10239,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -13900,49 +10280,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_ID_Continue */
/* 'XID_Start': Derived Property */
static const OnigCodePoint CR_XID_Start[] = {
- 495,
+ 431,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -13964,13 +10310,13 @@ static const OnigCodePoint CR_XID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -13989,14 +10335,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -14065,12 +10408,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -14097,11 +10439,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -14112,10 +10454,9 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14163,13 +10504,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -14192,7 +10531,7 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -14210,11 +10549,8 @@ static const OnigCodePoint CR_XID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -14235,24 +10571,23 @@ static const OnigCodePoint CR_XID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -14277,18 +10612,12 @@ static const OnigCodePoint CR_XID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14345,8 +10674,6 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -14356,21 +10683,10 @@ static const OnigCodePoint CR_XID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -14401,48 +10717,14 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_XID_Start */
/* 'XID_Continue': Derived Property */
static const OnigCodePoint CR_XID_Continue[] = {
- 571,
+ 513,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -14467,7 +10749,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -14479,7 +10761,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -14490,13 +10773,12 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -14598,14 +10880,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -14641,7 +10923,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -14651,16 +10933,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14676,7 +10958,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -14692,7 +10974,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -14718,14 +11001,15 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -14748,7 +11032,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -14768,13 +11052,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -14795,24 +11077,23 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -14830,20 +11111,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14906,8 +11181,6 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -14920,25 +11193,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -14976,42 +11234,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_XID_Continue */
@@ -15038,7 +11262,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
/* 'Grapheme_Extend': Derived Property */
static const OnigCodePoint CR_Grapheme_Extend[] = {
- 232,
+ 206,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -15047,10 +11271,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -15061,14 +11285,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -15139,7 +11360,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -15153,12 +11374,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -15186,30 +11406,22 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -15233,8 +11445,6 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -15248,21 +11458,9 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d165,
0x1d167, 0x1d169,
0x1d16e, 0x1d172,
@@ -15275,7 +11473,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
/* 'Grapheme_Base': Derived Property */
static const OnigCodePoint CR_Grapheme_Base[] = {
- 643,
+ 567,
0x0020, 0x007e,
0x00a0, 0x00ac,
0x00ae, 0x02ff,
@@ -15285,12 +11483,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x038c, 0x038c,
0x038e, 0x03a1,
0x03a3, 0x0482,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x05be, 0x05be,
0x05c0, 0x05c0,
0x05c3, 0x05c3,
@@ -15299,10 +11496,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x05f0, 0x05f4,
0x0606, 0x060f,
0x061b, 0x061b,
- 0x061e, 0x064a,
+ 0x061e, 0x061f,
+ 0x0621, 0x064a,
0x0660, 0x066f,
0x0671, 0x06d5,
- 0x06de, 0x06de,
0x06e5, 0x06e6,
0x06e9, 0x06e9,
0x06ee, 0x070d,
@@ -15317,17 +11514,13 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0824, 0x0824,
0x0828, 0x0828,
0x0830, 0x083e,
- 0x0840, 0x0858,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0903, 0x0939,
- 0x093b, 0x093b,
0x093d, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x0950,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
0x0958, 0x0961,
- 0x0964, 0x0977,
+ 0x0964, 0x0972,
0x0979, 0x097f,
0x0982, 0x0983,
0x0985, 0x098c,
@@ -15369,7 +11562,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae1,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b02, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -15383,7 +11577,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0b4b, 0x0b4c,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b61,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b83, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -15430,12 +11624,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
0x0d3f, 0x0d40,
0x0d46, 0x0d48,
0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d66, 0x0d75,
0x0d79, 0x0d7f,
@@ -15469,7 +11663,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f17,
0x0f1a, 0x0f34,
0x0f36, 0x0f36,
@@ -15478,10 +11672,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0f49, 0x0f6c,
0x0f7f, 0x0f7f,
0x0f85, 0x0f85,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x0fbe, 0x0fc5,
0x0fc7, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x102c,
0x1031, 0x1031,
0x1038, 0x1038,
@@ -15494,9 +11688,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1087, 0x108c,
0x108e, 0x109c,
0x109e, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -15569,21 +11762,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1b82, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
- 0x1bfc, 0x1c2b,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c2b,
0x1c34, 0x1c35,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -15606,24 +11793,36 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x202f, 0x205f,
0x2070, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -15633,7 +11832,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -15644,24 +11843,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x309b, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa673, 0xa673,
0xa67e, 0xa697,
0xa6a0, 0xa6ef,
0xa6f2, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa824,
@@ -15695,13 +11893,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xaab9, 0xaabd,
0xaac0, 0xaac0,
0xaac2, 0xaac2,
- 0xaadb, 0xaaeb,
- 0xaaee, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabec,
@@ -15709,7 +11901,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -15719,7 +11912,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -15771,8 +11964,6 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -15786,36 +11977,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x11000,
- 0x11002, 0x11037,
- 0x11047, 0x1104d,
- 0x11052, 0x1106f,
0x11082, 0x110b2,
0x110b7, 0x110b8,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11103, 0x11126,
- 0x1112c, 0x1112c,
- 0x11136, 0x11143,
- 0x11182, 0x111b5,
- 0x111bf, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116aa,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d164,
@@ -15849,81 +12018,34 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Grapheme_Base */
/* 'Grapheme_Link': Derived Property */
static const OnigCodePoint CR_Grapheme_Link[] = {
- 33,
+ 26,
0x094d, 0x094d,
0x09cd, 0x09cd,
0x0a4d, 0x0a4d,
@@ -15942,26 +12064,19 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
0x17d2, 0x17d2,
0x1a60, 0x1a60,
0x1b44, 0x1b44,
- 0x1baa, 0x1bab,
- 0x1bf2, 0x1bf3,
- 0x2d7f, 0x2d7f,
+ 0x1baa, 0x1baa,
0xa806, 0xa806,
0xa8c4, 0xa8c4,
0xa953, 0xa953,
0xa9c0, 0xa9c0,
- 0xaaf6, 0xaaf6,
0xabed, 0xabed,
0x10a3f, 0x10a3f,
- 0x11046, 0x11046,
0x110b9, 0x110b9,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b6,
}; /* CR_Grapheme_Link */
/* 'Common': Script */
static const OnigCodePoint CR_Common[] = {
- 157,
+ 159,
0x0000, 0x0040,
0x005b, 0x0060,
0x007b, 0x00a9,
@@ -15970,13 +12085,13 @@ static const OnigCodePoint CR_Common[] = {
0x00d7, 0x00d7,
0x00f7, 0x00f7,
0x02b9, 0x02df,
- 0x02e5, 0x02e9,
- 0x02ec, 0x02ff,
+ 0x02e5, 0x02ff,
0x0374, 0x0374,
0x037e, 0x037e,
0x0385, 0x0385,
0x0387, 0x0387,
0x0589, 0x0589,
+ 0x0600, 0x0603,
0x060c, 0x060c,
0x061b, 0x061b,
0x061f, 0x061f,
@@ -15984,6 +12099,8 @@ static const OnigCodePoint CR_Common[] = {
0x0660, 0x0669,
0x06dd, 0x06dd,
0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0cf1, 0x0cf2,
0x0e3f, 0x0e3f,
0x0fd5, 0x0fd8,
0x10fb, 0x10fb,
@@ -15994,28 +12111,42 @@ static const OnigCodePoint CR_Common[] = {
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x2000, 0x200b,
0x200e, 0x2064,
0x206a, 0x2070,
0x2074, 0x207e,
0x2080, 0x208e,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2125,
0x2127, 0x2129,
0x212c, 0x2131,
0x2133, 0x214d,
0x214f, 0x215f,
0x2189, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ff,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2b4c,
0x2b50, 0x2b59,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2ff0, 0x2ffb,
0x3000, 0x3004,
0x3006, 0x3006,
@@ -16086,44 +12217,30 @@ static const OnigCodePoint CR_Common[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f1ff,
- 0x1f201, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
}; /* CR_Common */
/* 'Latin': Script */
static const OnigCodePoint CR_Latin[] = {
- 30,
+ 28,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -16140,17 +12257,15 @@ static const OnigCodePoint CR_Latin[] = {
0x1e00, 0x1eff,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x212a, 0x212b,
0x2132, 0x2132,
0x214e, 0x214e,
0x2160, 0x2188,
0x2c60, 0x2c7f,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7ff,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa7ff,
0xfb00, 0xfb06,
0xff21, 0xff3a,
0xff41, 0xff5a,
@@ -16196,24 +12311,24 @@ static const OnigCodePoint CR_Greek[] = {
/* 'Cyrillic': Script */
static const OnigCodePoint CR_Cyrillic[] = {
- 7,
+ 8,
0x0400, 0x0484,
- 0x0487, 0x0527,
+ 0x0487, 0x0525,
0x1d2b, 0x1d2b,
0x1d78, 0x1d78,
0x2de0, 0x2dff,
- 0xa640, 0xa697,
- 0xa69f, 0xa69f,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
}; /* CR_Cyrillic */
/* 'Armenian': Script */
static const OnigCodePoint CR_Armenian[] = {
- 6,
+ 5,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x058a, 0x058a,
- 0x058f, 0x058f,
0xfb13, 0xfb17,
}; /* CR_Armenian */
@@ -16233,22 +12348,18 @@ static const OnigCodePoint CR_Hebrew[] = {
/* 'Arabic': Script */
static const OnigCodePoint CR_Arabic[] = {
- 56,
- 0x0600, 0x0604,
+ 18,
0x0606, 0x060b,
0x060d, 0x061a,
0x061e, 0x061e,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x0656, 0x065e,
0x066a, 0x066f,
0x0671, 0x06dc,
0x06de, 0x06ff,
0x0750, 0x077f,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0xfb50, 0xfbc1,
+ 0xfb50, 0xfbb1,
0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -16256,40 +12367,6 @@ static const OnigCodePoint CR_Arabic[] = {
0xfe70, 0xfe74,
0xfe76, 0xfefc,
0x10e60, 0x10e7e,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Arabic */
/* 'Syriac': Script */
@@ -16308,10 +12385,14 @@ static const OnigCodePoint CR_Thaana[] = {
/* 'Devanagari': Script */
static const OnigCodePoint CR_Devanagari[] = {
- 5,
- 0x0900, 0x0950,
- 0x0953, 0x0963,
- 0x0966, 0x0977,
+ 9,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0950,
+ 0x0953, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0xa8e0, 0xa8fb,
}; /* CR_Devanagari */
@@ -16358,7 +12439,7 @@ static const OnigCodePoint CR_Gurmukhi[] = {
/* 'Gujarati': Script */
static const OnigCodePoint CR_Gujarati[] = {
- 13,
+ 14,
0x0a81, 0x0a83,
0x0a85, 0x0a8d,
0x0a8f, 0x0a91,
@@ -16371,7 +12452,8 @@ static const OnigCodePoint CR_Gujarati[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
}; /* CR_Gujarati */
/* 'Oriya': Script */
@@ -16390,7 +12472,7 @@ static const OnigCodePoint CR_Oriya[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
}; /* CR_Oriya */
/* 'Tamil': Script */
@@ -16435,7 +12517,7 @@ static const OnigCodePoint CR_Telugu[] = {
/* 'Kannada': Script */
static const OnigCodePoint CR_Kannada[] = {
- 14,
+ 13,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -16449,19 +12531,19 @@ static const OnigCodePoint CR_Kannada[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
}; /* CR_Kannada */
/* 'Malayalam': Script */
static const OnigCodePoint CR_Malayalam[] = {
- 11,
+ 12,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -16511,7 +12593,7 @@ static const OnigCodePoint CR_Lao[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
}; /* CR_Lao */
/* 'Tibetan': Script */
@@ -16519,11 +12601,11 @@ static const OnigCodePoint CR_Tibetan[] = {
7,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
0x0fce, 0x0fd4,
- 0x0fd9, 0x0fda,
}; /* CR_Tibetan */
/* 'Myanmar': Script */
@@ -16535,22 +12617,17 @@ static const OnigCodePoint CR_Myanmar[] = {
/* 'Georgian': Script */
static const OnigCodePoint CR_Georgian[] = {
- 8,
+ 4,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x10ff,
+ 0x10fc, 0x10fc,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
}; /* CR_Georgian */
/* 'Hangul': Script */
static const OnigCodePoint CR_Hangul[] = {
- 14,
+ 13,
0x1100, 0x11ff,
- 0x302e, 0x302f,
0x3131, 0x318e,
0x3200, 0x321e,
0x3260, 0x327e,
@@ -16567,7 +12644,7 @@ static const OnigCodePoint CR_Hangul[] = {
/* 'Ethiopic': Script */
static const OnigCodePoint CR_Ethiopic[] = {
- 32,
+ 27,
0x1200, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -16584,7 +12661,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -16595,11 +12672,6 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
}; /* CR_Ethiopic */
/* 'Cherokee': Script */
@@ -16650,16 +12722,15 @@ static const OnigCodePoint CR_Mongolian[] = {
/* 'Hiragana': Script */
static const OnigCodePoint CR_Hiragana[] = {
- 4,
+ 3,
0x3041, 0x3096,
0x309d, 0x309f,
- 0x1b001, 0x1b001,
0x1f200, 0x1f200,
}; /* CR_Hiragana */
/* 'Katakana': Script */
static const OnigCodePoint CR_Katakana[] = {
- 8,
+ 7,
0x30a1, 0x30fa,
0x30fd, 0x30ff,
0x31f0, 0x31ff,
@@ -16667,15 +12738,13 @@ static const OnigCodePoint CR_Katakana[] = {
0x3300, 0x3357,
0xff66, 0xff6f,
0xff71, 0xff9d,
- 0x1b000, 0x1b000,
}; /* CR_Katakana */
/* 'Bopomofo': Script */
static const OnigCodePoint CR_Bopomofo[] = {
- 3,
- 0x02ea, 0x02eb,
+ 2,
0x3105, 0x312d,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
}; /* CR_Bopomofo */
/* 'Han': Script */
@@ -16689,12 +12758,12 @@ static const OnigCodePoint CR_Han[] = {
0x3021, 0x3029,
0x3038, 0x303b,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Han */
@@ -16726,23 +12795,21 @@ static const OnigCodePoint CR_Deseret[] = {
/* 'Inherited': Script */
static const OnigCodePoint CR_Inherited[] = {
- 25,
+ 23,
0x0300, 0x036f,
0x0485, 0x0486,
0x064b, 0x0655,
- 0x065f, 0x065f,
0x0670, 0x0670,
0x0951, 0x0952,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xfe00, 0xfe0f,
0xfe20, 0xfe26,
@@ -16858,7 +12925,7 @@ static const OnigCodePoint CR_Buginese[] = {
static const OnigCodePoint CR_Coptic[] = {
3,
0x03e2, 0x03ef,
- 0x2c80, 0x2cf3,
+ 0x2c80, 0x2cf1,
0x2cf9, 0x2cff,
}; /* CR_Coptic */
@@ -16880,10 +12947,9 @@ static const OnigCodePoint CR_Glagolitic[] = {
/* 'Tifinagh': Script */
static const OnigCodePoint CR_Tifinagh[] = {
- 3,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d7f,
+ 2,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
}; /* CR_Tifinagh */
/* 'Syloti_Nagri': Script */
@@ -16949,8 +13015,8 @@ static const OnigCodePoint CR_Nko[] = {
/* 'Sundanese': Script */
static const OnigCodePoint CR_Sundanese[] = {
2,
- 0x1b80, 0x1bbf,
- 0x1cc0, 0x1cc7,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
}; /* CR_Sundanese */
/* 'Lepcha': Script */
@@ -17066,9 +13132,8 @@ static const OnigCodePoint CR_Lisu[] = {
/* 'Bamum': Script */
static const OnigCodePoint CR_Bamum[] = {
- 2,
+ 1,
0xa6a0, 0xa6f7,
- 0x16800, 0x16a38,
}; /* CR_Bamum */
/* 'Javanese': Script */
@@ -17081,8 +13146,7 @@ static const OnigCodePoint CR_Javanese[] = {
/* 'Meetei_Mayek': Script */
static const OnigCodePoint CR_Meetei_Mayek[] = {
- 3,
- 0xaae0, 0xaaf6,
+ 2,
0xabc0, 0xabed,
0xabf0, 0xabf9,
}; /* CR_Meetei_Mayek */
@@ -17126,78 +13190,21 @@ static const OnigCodePoint CR_Kaithi[] = {
0x11080, 0x110c1,
}; /* CR_Kaithi */
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
- 2,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
- 2,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
- 2,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
- 2,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
- 2,
- 0x109a0, 0x109b7,
- 0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
- 1,
- 0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
- 3,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
- 2,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
- 2,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
- 2,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
-}; /* CR_Takri */
-
/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
+static const OnigCodePoint CR_White_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_White_Space */
/* 'Bidi_Control': Binary Property */
static const OnigCodePoint CR_Bidi_Control[] = {
@@ -17214,7 +13221,7 @@ static const OnigCodePoint CR_Join_Control[] = {
/* 'Dash': Binary Property */
static const OnigCodePoint CR_Dash[] = {
- 20,
+ 19,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -17227,7 +13234,6 @@ static const OnigCodePoint CR_Dash[] = {
0x2212, 0x2212,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -17271,7 +13277,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
/* 'Terminal_Punctuation': Binary Property */
static const OnigCodePoint CR_Terminal_Punctuation[] = {
- 70,
+ 65,
0x0021, 0x0021,
0x002c, 0x002c,
0x002e, 0x002e,
@@ -17289,7 +13295,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x070c, 0x070c,
0x07f8, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0e5a, 0x0e5b,
0x0f08, 0x0f08,
@@ -17321,7 +13326,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0xa9c7, 0xa9c9,
0xaa5d, 0xaa5f,
0xaadf, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe50, 0xfe52,
0xfe54, 0xfe57,
@@ -17337,16 +13341,13 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x10857, 0x10857,
0x1091f, 0x1091f,
0x10b3a, 0x10b3f,
- 0x11047, 0x1104d,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
0x12470, 0x12473,
}; /* CR_Terminal_Punctuation */
/* 'Other_Math': Binary Property */
static const OnigCodePoint CR_Other_Math[] = {
- 133,
+ 99,
0x005e, 0x005e,
0x03d0, 0x03d2,
0x03d5, 0x03d5,
@@ -17363,7 +13364,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
0x2119, 0x211d,
@@ -17447,39 +13447,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
}; /* CR_Other_Math */
/* 'Hex_Digit': Binary Property */
@@ -17494,11 +13461,16 @@ static const OnigCodePoint CR_Hex_Digit[] = {
}; /* CR_Hex_Digit */
/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+ 3,
+ 0x0030, 0x0039,
+ 0x0041, 0x0046,
+ 0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
/* 'Other_Alphabetic': Binary Property */
static const OnigCodePoint CR_Other_Alphabetic[] = {
- 158,
+ 141,
0x0345, 0x0345,
0x05b0, 0x05bd,
0x05bf, 0x05bf,
@@ -17507,7 +13479,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x05c7, 0x05c7,
0x0610, 0x061a,
0x064b, 0x0657,
- 0x0659, 0x065f,
+ 0x0659, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06e1, 0x06e4,
@@ -17520,13 +13492,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082c,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093b,
0x093e, 0x094c,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
+ 0x094e, 0x094e,
+ 0x0955, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09be, 0x09c4,
@@ -17588,7 +13557,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x0ebb, 0x0ebc,
0x0ecd, 0x0ecd,
0x0f71, 0x0f81,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x102b, 0x1036,
0x1038, 0x1038,
@@ -17618,21 +13587,17 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x1b35, 0x1b43,
0x1b80, 0x1b82,
0x1ba1, 0x1ba9,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1bf1,
0x1c24, 0x1c35,
- 0x1cf2, 0x1cf3,
+ 0x1cf2, 0x1cf2,
0x24b6, 0x24e9,
0x2de0, 0x2dff,
- 0xa674, 0xa67b,
- 0xa69f, 0xa69f,
0xa823, 0xa827,
0xa880, 0xa881,
0xa8b4, 0xa8c3,
0xa926, 0xa92a,
0xa947, 0xa952,
0xa980, 0xa983,
- 0xa9b4, 0xa9bf,
+ 0xa9b3, 0xa9bf,
0xaa29, 0xaa36,
0xaa43, 0xaa43,
0xaa4c, 0xaa4d,
@@ -17640,23 +13605,13 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0xaab2, 0xaab4,
0xaab7, 0xaab8,
0xaabe, 0xaabe,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabea,
0xfb1e, 0xfb1e,
0x10a01, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a0f,
- 0x11000, 0x11002,
- 0x11038, 0x11045,
0x11082, 0x11082,
0x110b0, 0x110b8,
- 0x11100, 0x11102,
- 0x11127, 0x11132,
- 0x11180, 0x11182,
- 0x111b3, 0x111bf,
- 0x116ab, 0x116b5,
- 0x16f51, 0x16f7e,
}; /* CR_Other_Alphabetic */
/* 'Ideographic': Binary Property */
@@ -17666,18 +13621,18 @@ static const OnigCodePoint CR_Ideographic[] = {
0x3021, 0x3029,
0x3038, 0x303a,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Ideographic */
/* 'Diacritic': Binary Property */
static const OnigCodePoint CR_Diacritic[] = {
- 125,
+ 117,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -17706,7 +13661,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0x07a6, 0x07b0,
0x07eb, 0x07f5,
0x0818, 0x0819,
- 0x08e4, 0x08fe,
0x093c, 0x093c,
0x094d, 0x094d,
0x0951, 0x0954,
@@ -17749,12 +13703,11 @@ static const OnigCodePoint CR_Diacritic[] = {
0x1b34, 0x1b34,
0x1b44, 0x1b44,
0x1b6b, 0x1b73,
- 0x1baa, 0x1bab,
+ 0x1baa, 0x1baa,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
0x1cd0, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1d2c, 0x1d6a,
0x1dc4, 0x1dcf,
0x1dfd, 0x1dff,
@@ -17775,7 +13728,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa6f0, 0xa6f1,
0xa717, 0xa721,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa8c4, 0xa8c4,
0xa8e0, 0xa8f1,
0xa92b, 0xa92e,
@@ -17784,7 +13736,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa9c0, 0xa9c0,
0xaa7b, 0xaa7b,
0xaabf, 0xaac2,
- 0xaaf6, 0xaaf6,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
0xfe20, 0xfe26,
@@ -17794,10 +13745,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xff9e, 0xff9f,
0xffe3, 0xffe3,
0x110b9, 0x110ba,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -17807,14 +13754,13 @@ static const OnigCodePoint CR_Diacritic[] = {
/* 'Extender': Binary Property */
static const OnigCodePoint CR_Extender[] = {
- 22,
+ 20,
0x00b7, 0x00b7,
0x02d0, 0x02d1,
0x0640, 0x0640,
0x07fa, 0x07fa,
0x0e46, 0x0e46,
0x0ec6, 0x0ec6,
- 0x180a, 0x180a,
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c36, 0x1c36,
@@ -17828,31 +13774,25 @@ static const OnigCodePoint CR_Extender[] = {
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
}; /* CR_Extender */
/* 'Other_Lowercase': Binary Property */
static const OnigCodePoint CR_Other_Lowercase[] = {
- 18,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 13,
0x02b0, 0x02b8,
0x02c0, 0x02c1,
0x02e0, 0x02e4,
0x0345, 0x0345,
0x037a, 0x037a,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2170, 0x217f,
0x24d0, 0x24e9,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0xa770, 0xa770,
- 0xa7f8, 0xa7f9,
}; /* CR_Other_Lowercase */
/* 'Other_Uppercase': Binary Property */
@@ -17887,7 +13827,7 @@ static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
/* 'Other_Grapheme_Extend': Binary Property */
static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
- 17,
+ 16,
0x09be, 0x09be,
0x09d7, 0x09d7,
0x0b3e, 0x0b3e,
@@ -17901,7 +13841,6 @@ static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
0x0dcf, 0x0dcf,
0x0ddf, 0x0ddf,
0x200c, 0x200d,
- 0x302e, 0x302f,
0xff9e, 0xff9f,
0x1d165, 0x1d165,
0x1d16e, 0x1d172,
@@ -17930,9 +13869,9 @@ static const OnigCodePoint CR_Radical[] = {
/* 'Unified_Ideograph': Binary Property */
static const OnigCodePoint CR_Unified_Ideograph[] = {
- 12,
+ 11,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xfa0e, 0xfa0f,
0xfa11, 0xfa11,
0xfa13, 0xfa14,
@@ -17942,15 +13881,13 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
0xfa27, 0xfa29,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
}; /* CR_Unified_Ideograph */
/* 'Other_Default_Ignorable_Code_Point': Binary Property */
static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
- 11,
+ 10,
0x034f, 0x034f,
0x115f, 0x1160,
- 0x17b4, 0x17b5,
0x2065, 0x2069,
0x3164, 0x3164,
0xffa0, 0xffa0,
@@ -17963,9 +13900,8 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
/* 'Deprecated': Binary Property */
static const OnigCodePoint CR_Deprecated[] = {
- 9,
+ 8,
0x0149, 0x0149,
- 0x0673, 0x0673,
0x0f77, 0x0f77,
0x0f79, 0x0f79,
0x17a3, 0x17a4,
@@ -18031,16 +13967,15 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
/* 'Other_ID_Continue': Binary Property */
static const OnigCodePoint CR_Other_ID_Continue[] = {
- 4,
+ 3,
0x00b7, 0x00b7,
0x0387, 0x0387,
0x1369, 0x1371,
- 0x19da, 0x19da,
}; /* CR_Other_ID_Continue */
/* 'STerm': Binary Property */
static const OnigCodePoint CR_STerm[] = {
- 50,
+ 43,
0x0021, 0x0021,
0x002e, 0x002e,
0x003f, 0x003f,
@@ -18056,11 +13991,9 @@ static const OnigCodePoint CR_STerm[] = {
0x1362, 0x1362,
0x1367, 0x1368,
0x166e, 0x166e,
- 0x1735, 0x1736,
0x1803, 0x1803,
0x1809, 0x1809,
0x1944, 0x1945,
- 0x1aa8, 0x1aab,
0x1b5a, 0x1b5b,
0x1b5e, 0x1b5f,
0x1c3b, 0x1c3c,
@@ -18078,7 +14011,6 @@ static const OnigCodePoint CR_STerm[] = {
0xa92f, 0xa92f,
0xa9c8, 0xa9c9,
0xaa5d, 0xaa5f,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe52, 0xfe52,
0xfe56, 0xfe57,
@@ -18086,11 +14018,7 @@ static const OnigCodePoint CR_STerm[] = {
0xff0e, 0xff0e,
0xff1f, 0xff1f,
0xff61, 0xff61,
- 0x10a56, 0x10a57,
- 0x11047, 0x11048,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
}; /* CR_STerm */
/* 'Variation_Selector': Binary Property */
@@ -18143,3965 +14071,47 @@ static const OnigCodePoint CR_Pattern_Syntax[] = {
0xfd3e, 0xfd3f,
0xfe45, 0xfe46,
}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
- 537,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0605, 0x0605,
- 0x061c, 0x061d,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
- 288,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x05b0, 0x05b9,
- 0x05bb, 0x05c3,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9a,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20aa,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xe000, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ab,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ac,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
- 369,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f3,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
- 402,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f5,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+ 1,
+ 0x000a, 0x000a,
+}; /* CR_NEWLINE */
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
- 397,
- 0x0000, 0x0220,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034f,
- 0x0360, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03f6,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b1,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2052,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213a,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23ce,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24fe,
- 0x2500, 0x2613,
- 0x2616, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2689,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2aff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321c,
- 0x3220, 0x3243,
- 0x3251, 0x327b,
- 0x327f, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfc,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe46,
- 0xfe49, 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, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
- 412,
- 0x0000, 0x0236,
- 0x0250, 0x0357,
- 0x035d, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03fb,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060c, 0x0615,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0658,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x19e0, 0x19ff,
- 0x1d00, 0x1d6b,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2054,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213b,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23d0,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2691,
- 0x26a0, 0x26a1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b0d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x327d,
- 0x327f, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d300, 0x1d356,
- 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, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
+/* '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 */
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
- 430,
- 0x0000, 0x0241,
- 0x0250, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05b9,
- 0x05bb, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x097d, 0x097d,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1d00, 0x1dc3,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20eb,
- 0x2100, 0x214c,
- 0x2153, 0x2183,
- 0x2190, 0x23db,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c6,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b13,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa800, 0xa82b,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 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, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
- 440,
- 0x0000, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x0513,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 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,
- 0x1d00, 0x1dca,
- 0x1dfe, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20ef,
- 0x2100, 0x214e,
- 0x2153, 0x2184,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b2,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b1a,
- 0x2b20, 0x2b23,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6c,
- 0x2c74, 0x2c77,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa71a,
- 0xa720, 0xa721,
- 0xa800, 0xa82b,
- 0xa840, 0xa877,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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, 0x1091f,
- 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,
- 0x1d12a, 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,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
- 455,
- 0x0000, 0x0377,
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+ 490,
+ 0x0021, 0x007e,
+ 0x00a1, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0523,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
@@ -22117,11 +14127,13 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
+ 0x0800, 0x082d,
+ 0x0830, 0x083e,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
0x0958, 0x0972,
- 0x097b, 0x097f,
+ 0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -22135,7 +14147,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fa,
+ 0x09e6, 0x09fb,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -22273,14 +14285,10 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
+ 0x0fce, 0x0fd8,
+ 0x1000, 0x10c5,
0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -22299,8 +14307,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
+ 0x1400, 0x167f,
+ 0x1681, 0x169c,
0x16a0, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
@@ -22312,21 +14320,26 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1780, 0x17dd,
0x17e0, 0x17e9,
0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x1800, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
0x1940, 0x1940,
0x1944, 0x196d,
0x1970, 0x1974,
- 0x1980, 0x19a9,
+ 0x1980, 0x19ab,
0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
+ 0x19d0, 0x19da,
0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
+ 0x1a1e, 0x1a5e,
+ 0x1a60, 0x1a7c,
+ 0x1a7f, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
0x1b80, 0x1baa,
@@ -22334,8 +14347,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -22351,40 +14365,40 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x200b, 0x2027,
+ 0x202a, 0x202e,
+ 0x2030, 0x205e,
+ 0x2060, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
- 0x20a0, 0x20b5,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
+ 0x2100, 0x2189,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
0x2701, 0x2704,
0x2706, 0x2709,
0x270c, 0x2727,
0x2729, 0x274b,
0x274d, 0x274d,
0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
+ 0x2756, 0x275e,
0x2761, 0x2794,
0x2798, 0x27af,
0x27b1, 0x27be,
0x27c0, 0x27ca,
0x27cc, 0x27cc,
0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
+ 0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
@@ -22397,12 +14411,12 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x3001, 0x303f,
0x3041, 0x3096,
0x3099, 0x30ff,
0x3105, 0x312d,
@@ -22410,30 +14424,41 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
+ 0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fc3,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
- 0xa500, 0xa62b,
+ 0xa4d0, 0xa62b,
0xa640, 0xa65f,
0xa662, 0xa673,
0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
0xa700, 0xa78c,
0xa7fb, 0xa82b,
+ 0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
0xa8ce, 0xa8d9,
+ 0xa8e0, 0xa8fb,
0xa900, 0xa953,
- 0xa95f, 0xa95f,
+ 0xa95f, 0xa97c,
+ 0xa980, 0xa9cd,
+ 0xa9cf, 0xa9d9,
+ 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
+ 0xaa5c, 0xaa7b,
+ 0xaa80, 0xaac2,
+ 0xaadb, 0xaadf,
+ 0xabc0, 0xabed,
+ 0xabf0, 0xabf9,
0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xe000, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -22446,7 +14471,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22462,7 +14487,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -22489,8 +14515,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1080a, 0x10835,
0x10837, 0x10838,
0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
+ 0x1083f, 0x10855,
+ 0x10857, 0x1085f,
+ 0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
0x10a00, 0x10a03,
@@ -22501,9 +14528,18 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x10a38, 0x10a3a,
0x10a3f, 0x10a47,
0x10a50, 0x10a58,
+ 0x10a60, 0x10a7f,
+ 0x10b00, 0x10b35,
+ 0x10b39, 0x10b55,
+ 0x10b58, 0x10b72,
+ 0x10b78, 0x10b7f,
+ 0x10c00, 0x10c48,
+ 0x10e60, 0x10e7e,
+ 0x11080, 0x110c1,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
+ 0x13000, 0x1342e,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -22533,30 +14569,42 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1fffe, 0x2a6d6,
+ 0x1f100, 0x1f10a,
+ 0x1f110, 0x1f12e,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
+ 0x1f240, 0x1f248,
+ 0x20000, 0x2a6d6,
+ 0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Graph */
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
- 495,
- 0x0000, 0x0377,
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+ 487,
+ 0x0020, 0x007e,
+ 0x00a0, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
@@ -22814,7 +14862,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x2000, 0x2027,
+ 0x202a, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
@@ -22903,7 +14952,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xe000, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
@@ -22917,7 +14966,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22933,7 +14982,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -23032,54 +15082,84 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1f200, 0x1f200,
0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Print */
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
- 511,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+ 506,
+ 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, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x0483, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
+ 0x0591, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06de, 0x06e8,
+ 0x06ea, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x074a,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
+ 0x07c0, 0x07f5,
+ 0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23094,7 +15174,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23124,7 +15204,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23138,7 +15217,8 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23154,7 +15234,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0bca, 0x0bcd,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23168,7 +15248,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -23182,18 +15261,18 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 0x0d66, 0x0d6f,
+ 0x0d7a, 0x0d7f,
0x0d82, 0x0d83,
0x0d85, 0x0d96,
0x0d9a, 0x0db1,
@@ -23204,9 +15283,10 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0dcf, 0x0dd4,
0x0dd6, 0x0dd6,
0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e4e,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23225,14 +15305,24 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
+ 0x0f00, 0x0f00,
+ 0x0f18, 0x0f19,
+ 0x0f20, 0x0f29,
+ 0x0f35, 0x0f35,
+ 0x0f37, 0x0f37,
+ 0x0f39, 0x0f39,
+ 0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f84,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10d0, 0x10fc,
+ 0x0fc6, 0x0fc6,
+ 0x1000, 0x1049,
+ 0x1050, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -23249,22 +15339,27 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x1720, 0x1734,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dd,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x180b, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
@@ -23272,29 +15367,29 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
0x1a60, 0x1a7c,
0x1a7f, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
+ 0x1aa7, 0x1aa7,
0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
+ 0x1b50, 0x1b59,
+ 0x1b6b, 0x1b73,
0x1b80, 0x1baa,
0x1bae, 0x1bb9,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cd0, 0x1cf2,
+ 0x1c00, 0x1c37,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1cd0, 0x1cd2,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23304,34 +15399,44 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x1ff6, 0x1ffc,
+ 0x203f, 0x2040,
+ 0x2054, 0x2054,
+ 0x2071, 0x2071,
+ 0x207f, 0x207f,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27ce, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf1,
- 0x2cf9, 0x2d25,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cf1,
+ 0x2d00, 0x2d25,
0x2d30, 0x2d65,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23340,108 +15445,107 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e31,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x302f,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x3099, 0x309a,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcb,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa673,
- 0xa67c, 0xa697,
- 0xa6a0, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa791,
- 0xa7a0, 0xa7a9,
- 0xa7fa, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa672,
+ 0xa67c, 0xa67d,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6f1,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
+ 0xa840, 0xa873,
0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa8d0, 0xa8d9,
+ 0xa8e0, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92d,
+ 0xa930, 0xa953,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9c0,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaadf,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xf900, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
+ 0xfdf0, 0xfdfb,
+ 0xfe00, 0xfe0f,
0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfe33, 0xfe34,
+ 0xfe4d, 0xfe4f,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff3f, 0xff3f,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
+ 0x101fd, 0x101fd,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -23450,40 +15554,30 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a3f, 0x10a3f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
+ 0x11080, 0x110ba,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
+ 0x1d165, 0x1d169,
+ 0x1d16d, 0x1d172,
+ 0x1d17b, 0x1d182,
+ 0x1d185, 0x1d18b,
+ 0x1d1aa, 0x1d1ad,
+ 0x1d242, 0x1d244,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -23503,103 +15597,85 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f169,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f5ff,
- 0x1f601, 0x1f610,
- 0x1f612, 0x1f614,
- 0x1f616, 0x1f616,
- 0x1f618, 0x1f618,
- 0x1f61a, 0x1f61a,
- 0x1f61c, 0x1f61e,
- 0x1f620, 0x1f625,
- 0x1f628, 0x1f62b,
- 0x1f62d, 0x1f62d,
- 0x1f630, 0x1f633,
- 0x1f635, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
+}; /* CR_Word */
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
- 549,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+ 497,
+ 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,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x07c0, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23608,13 +15684,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x09aa, 0x09b0,
0x09b2, 0x09b2,
0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
+ 0x09bd, 0x09c4,
0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
+ 0x09cb, 0x09cc,
+ 0x09ce, 0x09ce,
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23623,10 +15700,9 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0a32, 0x0a33,
0x0a35, 0x0a36,
0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
0x0a3e, 0x0a42,
0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
+ 0x0a4b, 0x0a4c,
0x0a51, 0x0a51,
0x0a59, 0x0a5c,
0x0a5e, 0x0a5e,
@@ -23638,12 +15714,12 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0aaa, 0x0ab0,
0x0ab2, 0x0ab3,
0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
+ 0x0abd, 0x0ac5,
0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
+ 0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23651,13 +15727,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0b2a, 0x0b30,
0x0b32, 0x0b33,
0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
+ 0x0b3d, 0x0b44,
0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
+ 0x0b4b, 0x0b4c,
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23670,10 +15747,10 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0bae, 0x0bb9,
0x0bbe, 0x0bc2,
0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
+ 0x0bca, 0x0bcc,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23682,50 +15759,50 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0c35, 0x0c39,
0x0c3d, 0x0c44,
0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
+ 0x0c4a, 0x0c4c,
0x0c55, 0x0c56,
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
0x0c92, 0x0ca8,
0x0caa, 0x0cb3,
0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
+ 0x0cbd, 0x0cc4,
0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
+ 0x0cca, 0x0ccc,
0x0cd5, 0x0cd6,
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4c,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 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, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23741,19 +15818,30 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0ebb, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
+ 0x0ecd, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f47,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f20, 0x0f29,
+ 0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x1049,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x1090, 0x1099,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -23769,51 +15857,57 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1930, 0x1938,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1a80, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b50, 0x1b59,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c35,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 0x1d00, 0x1dbf,
+ 0x1e00, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23823,34 +15917,41 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 0x2d00, 0x2d25,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23859,106 +15960,103 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8d0, 0xa8d9,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfdf0, 0xfdfb,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -23967,53 +16065,22 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
+ 0x11082, 0x110b8,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -24033,1430 +16100,28 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
- 1,
- 0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
- 1,
- 0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
- 1,
- 0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
- 1,
- 0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
- 1,
- 0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
- 1,
- 0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
- 1,
- 0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
- 1,
- 0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
- 1,
- 0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
- 1,
- 0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
- 1,
- 0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
- 1,
- 0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
- 1,
- 0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
- 1,
- 0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
- 1,
- 0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
- 1,
- 0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
- 1,
- 0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
- 1,
- 0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
- 1,
- 0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
- 1,
- 0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
- 1,
- 0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
- 1,
- 0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
- 1,
- 0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
- 1,
- 0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
- 1,
- 0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
- 1,
- 0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
- 1,
- 0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
- 1,
- 0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
- 1,
- 0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
- 1,
- 0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
- 1,
- 0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
- 1,
- 0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
- 1,
- 0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
- 1,
- 0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
- 1,
- 0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
- 1,
- 0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
- 1,
- 0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
- 1,
- 0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
- 1,
- 0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
- 1,
- 0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
- 1,
- 0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
- 1,
- 0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
- 1,
- 0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
- 1,
- 0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
- 1,
- 0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
- 1,
- 0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
- 1,
- 0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
- 1,
- 0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
- 1,
- 0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
- 1,
- 0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
- 1,
- 0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
- 1,
- 0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
- 1,
- 0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
- 1,
- 0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
- 1,
- 0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
- 1,
- 0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
- 1,
- 0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
- 1,
- 0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
- 1,
- 0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
- 1,
- 0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
- 1,
- 0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
- 1,
- 0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
- 1,
- 0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
- 1,
- 0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
- 1,
- 0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
- 1,
- 0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
- 1,
- 0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
- 1,
- 0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
- 1,
- 0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
- 1,
- 0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
- 1,
- 0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
- 1,
- 0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
- 1,
- 0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
- 1,
- 0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
- 1,
- 0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
- 1,
- 0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
- 1,
- 0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
- 1,
- 0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
- 1,
- 0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
- 1,
- 0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
- 1,
- 0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
- 1,
- 0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
- 1,
- 0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
- 1,
- 0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
- 1,
- 0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
- 1,
- 0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
- 1,
- 0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
- 1,
- 0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
- 1,
- 0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
- 1,
- 0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
- 1,
- 0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
- 1,
- 0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
- 1,
- 0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
- 1,
- 0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
- 1,
- 0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
- 1,
- 0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
- 1,
- 0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
- 1,
- 0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
- 1,
- 0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
- 1,
- 0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
- 1,
- 0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
- 1,
- 0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
- 1,
- 0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
- 1,
- 0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
- 1,
- 0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
- 1,
- 0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
- 1,
- 0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
- 1,
- 0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
- 1,
- 0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
- 1,
- 0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
- 1,
- 0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
- 1,
- 0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
- 1,
- 0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
- 1,
- 0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
- 1,
- 0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
- 1,
- 0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
- 1,
- 0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
- 1,
- 0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
- 1,
- 0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
- 1,
- 0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
- 1,
- 0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
- 1,
- 0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
- 1,
- 0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
- 1,
- 0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-#define CR_In_Kayah_Li CR_Kayah_Li
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
- 1,
- 0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
- 1,
- 0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
- 1,
- 0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
- 1,
- 0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
- 1,
- 0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
- 1,
- 0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
- 1,
- 0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
- 1,
- 0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
- 1,
- 0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
- 1,
- 0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
- 1,
- 0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
- 1,
- 0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
- 1,
- 0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
- 1,
- 0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
- 1,
- 0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
- 1,
- 0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
- 1,
- 0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
- 1,
- 0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
- 1,
- 0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
- 1,
- 0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
- 1,
- 0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
- 1,
- 0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
- 1,
- 0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
- 1,
- 0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
- 1,
- 0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
- 1,
- 0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
- 1,
- 0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
- 1,
- 0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
- 1,
- 0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
- 1,
- 0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
- 1,
- 0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
- 1,
- 0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
- 1,
- 0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
- 1,
- 0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
- 1,
- 0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
- 1,
- 0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
- 1,
- 0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
- 1,
- 0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
- 1,
- 0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
- 1,
- 0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
- 1,
- 0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
- 1,
- 0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
- 1,
- 0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
- 1,
- 0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
- 1,
- 0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
- 1,
- 0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
- 1,
- 0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
- 1,
- 0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
- 1,
- 0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
- 1,
- 0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
- 1,
- 0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
- 1,
- 0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
- 1,
- 0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
- 1,
- 0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
- 1,
- 0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
- 1,
- 0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
- 1,
- 0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
- 1,
- 0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
- 1,
- 0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
- 1,
- 0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
- 1,
- 0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
- 1,
- 0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
- 1,
- 0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
- 1,
- 0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
- 1,
- 0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
- 1,
- 0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
- 1,
- 0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
- 1,
- 0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
- 1,
- 0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
- 1,
- 0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
- 1,
- 0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
- 1,
- 0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
- 1,
- 0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
- 1,
- 0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
- 1,
- 0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
- 1,
- 0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Transport_And_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
- 1,
- 0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_And_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
- 1,
- 0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
- 1,
- 0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
- 1,
- 0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
- 1,
- 0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
- 1,
- 0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
- 1,
- 0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
- 1,
- 0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
- 1,
- 0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
+}; /* CR_Alnum */
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
1,
- 0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
- 36,
- 0x0860, 0x089f,
- 0x1ab0, 0x1aff,
- 0x1c80, 0x1cbf,
- 0x2fe0, 0x2fef,
- 0xa9e0, 0xa9ff,
- 0xab30, 0xabbf,
- 0x10200, 0x1027f,
- 0x102e0, 0x102ff,
- 0x10350, 0x1037f,
- 0x103e0, 0x103ff,
- 0x104b0, 0x107ff,
- 0x10860, 0x108ff,
- 0x10940, 0x1097f,
- 0x10a80, 0x10aff,
- 0x10b80, 0x10bff,
- 0x10c50, 0x10e5f,
- 0x10e80, 0x10fff,
- 0x11150, 0x1117f,
- 0x111e0, 0x1167f,
- 0x116d0, 0x11fff,
- 0x12480, 0x12fff,
- 0x13430, 0x167ff,
- 0x16a40, 0x16eff,
- 0x16fa0, 0x1afff,
- 0x1b100, 0x1cfff,
- 0x1d250, 0x1d2ff,
- 0x1d380, 0x1d3ff,
- 0x1d800, 0x1edff,
- 0x1ef00, 0x1efff,
- 0x1f650, 0x1f67f,
- 0x1f780, 0x1ffff,
- 0x2a6e0, 0x2a6ff,
- 0x2b820, 0x2f7ff,
- 0x2fa20, 0xdffff,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
+ 0x0000, 0x007f,
+}; /* CR_ASCII */
static const OnigCodePoint* const CodeRanges[] = {
CR_NEWLINE,
@@ -25484,7 +16149,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Co,
CR_Cs,
CR_L,
- CR_LC,
CR_Ll,
CR_Lm,
CR_Lo,
@@ -25626,16 +16290,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Inscriptional_Pahlavi,
CR_Old_Turkic,
CR_Kaithi,
- CR_Batak,
- CR_Brahmi,
- CR_Mandaic,
- CR_Chakma,
- CR_Meroitic_Cursive,
- CR_Meroitic_Hieroglyphs,
- CR_Miao,
- CR_Sharada,
- CR_Sora_Sompeng,
- CR_Takri,
CR_White_Space,
CR_Bidi_Control,
CR_Join_Control,
@@ -25668,241 +16322,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Variation_Selector,
CR_Pattern_White_Space,
CR_Pattern_Syntax,
- CR_Unknown,
- CR_Age_1_1,
- CR_Age_2_0,
- CR_Age_2_1,
- CR_Age_3_0,
- CR_Age_3_1,
- CR_Age_3_2,
- CR_Age_4_0,
- CR_Age_4_1,
- CR_Age_5_0,
- CR_Age_5_1,
- CR_Age_5_2,
- CR_Age_6_0,
- CR_Age_6_1,
- CR_In_Basic_Latin,
- CR_In_Latin_1_Supplement,
- CR_In_Latin_Extended_A,
- CR_In_Latin_Extended_B,
- CR_In_IPA_Extensions,
- CR_In_Spacing_Modifier_Letters,
- CR_In_Combining_Diacritical_Marks,
- CR_In_Greek_and_Coptic,
- CR_In_Cyrillic,
- CR_In_Cyrillic_Supplement,
- CR_In_Armenian,
- CR_In_Hebrew,
- CR_In_Arabic,
- CR_In_Syriac,
- CR_In_Arabic_Supplement,
- CR_In_Thaana,
- CR_In_NKo,
- CR_In_Samaritan,
- CR_In_Mandaic,
- CR_In_Arabic_Extended_A,
- CR_In_Devanagari,
- CR_In_Bengali,
- CR_In_Gurmukhi,
- CR_In_Gujarati,
- CR_In_Oriya,
- CR_In_Tamil,
- CR_In_Telugu,
- CR_In_Kannada,
- CR_In_Malayalam,
- CR_In_Sinhala,
- CR_In_Thai,
- CR_In_Lao,
- CR_In_Tibetan,
- CR_In_Myanmar,
- CR_In_Georgian,
- CR_In_Hangul_Jamo,
- CR_In_Ethiopic,
- CR_In_Ethiopic_Supplement,
- CR_In_Cherokee,
- CR_In_Unified_Canadian_Aboriginal_Syllabics,
- CR_In_Ogham,
- CR_In_Runic,
- CR_In_Tagalog,
- CR_In_Hanunoo,
- CR_In_Buhid,
- CR_In_Tagbanwa,
- CR_In_Khmer,
- CR_In_Mongolian,
- CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
- CR_In_Limbu,
- CR_In_Tai_Le,
- CR_In_New_Tai_Lue,
- CR_In_Khmer_Symbols,
- CR_In_Buginese,
- CR_In_Tai_Tham,
- CR_In_Balinese,
- CR_In_Sundanese,
- CR_In_Batak,
- CR_In_Lepcha,
- CR_In_Ol_Chiki,
- CR_In_Sundanese_Supplement,
- CR_In_Vedic_Extensions,
- CR_In_Phonetic_Extensions,
- CR_In_Phonetic_Extensions_Supplement,
- CR_In_Combining_Diacritical_Marks_Supplement,
- CR_In_Latin_Extended_Additional,
- CR_In_Greek_Extended,
- CR_In_General_Punctuation,
- CR_In_Superscripts_and_Subscripts,
- CR_In_Currency_Symbols,
- CR_In_Combining_Diacritical_Marks_for_Symbols,
- CR_In_Letterlike_Symbols,
- CR_In_Number_Forms,
- CR_In_Arrows,
- CR_In_Mathematical_Operators,
- CR_In_Miscellaneous_Technical,
- CR_In_Control_Pictures,
- CR_In_Optical_Character_Recognition,
- CR_In_Enclosed_Alphanumerics,
- CR_In_Box_Drawing,
- CR_In_Block_Elements,
- CR_In_Geometric_Shapes,
- CR_In_Miscellaneous_Symbols,
- CR_In_Dingbats,
- CR_In_Miscellaneous_Mathematical_Symbols_A,
- CR_In_Supplemental_Arrows_A,
- CR_In_Braille_Patterns,
- CR_In_Supplemental_Arrows_B,
- CR_In_Miscellaneous_Mathematical_Symbols_B,
- CR_In_Supplemental_Mathematical_Operators,
- CR_In_Miscellaneous_Symbols_and_Arrows,
- CR_In_Glagolitic,
- CR_In_Latin_Extended_C,
- CR_In_Coptic,
- CR_In_Georgian_Supplement,
- CR_In_Tifinagh,
- CR_In_Ethiopic_Extended,
- CR_In_Cyrillic_Extended_A,
- CR_In_Supplemental_Punctuation,
- CR_In_CJK_Radicals_Supplement,
- CR_In_Kangxi_Radicals,
- CR_In_Ideographic_Description_Characters,
- CR_In_CJK_Symbols_and_Punctuation,
- CR_In_Hiragana,
- CR_In_Katakana,
- CR_In_Bopomofo,
- CR_In_Hangul_Compatibility_Jamo,
- CR_In_Kanbun,
- CR_In_Bopomofo_Extended,
- CR_In_CJK_Strokes,
- CR_In_Katakana_Phonetic_Extensions,
- CR_In_Enclosed_CJK_Letters_and_Months,
- CR_In_CJK_Compatibility,
- CR_In_CJK_Unified_Ideographs_Extension_A,
- CR_In_Yijing_Hexagram_Symbols,
- CR_In_CJK_Unified_Ideographs,
- CR_In_Yi_Syllables,
- CR_In_Yi_Radicals,
- CR_In_Lisu,
- CR_In_Vai,
- CR_In_Cyrillic_Extended_B,
- CR_In_Bamum,
- CR_In_Modifier_Tone_Letters,
- CR_In_Latin_Extended_D,
- CR_In_Syloti_Nagri,
- CR_In_Common_Indic_Number_Forms,
- CR_In_Phags_pa,
- CR_In_Saurashtra,
- CR_In_Devanagari_Extended,
- CR_In_Kayah_Li,
- CR_In_Rejang,
- CR_In_Hangul_Jamo_Extended_A,
- CR_In_Javanese,
- CR_In_Cham,
- CR_In_Myanmar_Extended_A,
- CR_In_Tai_Viet,
- CR_In_Meetei_Mayek_Extensions,
- CR_In_Ethiopic_Extended_A,
- CR_In_Meetei_Mayek,
- CR_In_Hangul_Syllables,
- CR_In_Hangul_Jamo_Extended_B,
- CR_In_High_Surrogates,
- CR_In_High_Private_Use_Surrogates,
- CR_In_Low_Surrogates,
- CR_In_Private_Use_Area,
- CR_In_CJK_Compatibility_Ideographs,
- CR_In_Alphabetic_Presentation_Forms,
- CR_In_Arabic_Presentation_Forms_A,
- CR_In_Variation_Selectors,
- CR_In_Vertical_Forms,
- CR_In_Combining_Half_Marks,
- CR_In_CJK_Compatibility_Forms,
- CR_In_Small_Form_Variants,
- CR_In_Arabic_Presentation_Forms_B,
- CR_In_Halfwidth_and_Fullwidth_Forms,
- CR_In_Specials,
- CR_In_Linear_B_Syllabary,
- CR_In_Linear_B_Ideograms,
- CR_In_Aegean_Numbers,
- CR_In_Ancient_Greek_Numbers,
- CR_In_Ancient_Symbols,
- CR_In_Phaistos_Disc,
- CR_In_Lycian,
- CR_In_Carian,
- CR_In_Old_Italic,
- CR_In_Gothic,
- CR_In_Ugaritic,
- CR_In_Old_Persian,
- CR_In_Deseret,
- CR_In_Shavian,
- CR_In_Osmanya,
- CR_In_Cypriot_Syllabary,
- CR_In_Imperial_Aramaic,
- CR_In_Phoenician,
- CR_In_Lydian,
- CR_In_Meroitic_Hieroglyphs,
- CR_In_Meroitic_Cursive,
- CR_In_Kharoshthi,
- CR_In_Old_South_Arabian,
- CR_In_Avestan,
- CR_In_Inscriptional_Parthian,
- CR_In_Inscriptional_Pahlavi,
- CR_In_Old_Turkic,
- CR_In_Rumi_Numeral_Symbols,
- CR_In_Brahmi,
- CR_In_Kaithi,
- CR_In_Sora_Sompeng,
- CR_In_Chakma,
- CR_In_Sharada,
- CR_In_Takri,
- CR_In_Cuneiform,
- CR_In_Cuneiform_Numbers_and_Punctuation,
- CR_In_Egyptian_Hieroglyphs,
- CR_In_Bamum_Supplement,
- CR_In_Miao,
- CR_In_Kana_Supplement,
- CR_In_Byzantine_Musical_Symbols,
- CR_In_Musical_Symbols,
- CR_In_Ancient_Greek_Musical_Notation,
- CR_In_Tai_Xuan_Jing_Symbols,
- CR_In_Counting_Rod_Numerals,
- CR_In_Mathematical_Alphanumeric_Symbols,
- CR_In_Arabic_Mathematical_Alphabetic_Symbols,
- CR_In_Mahjong_Tiles,
- CR_In_Domino_Tiles,
- CR_In_Playing_Cards,
- CR_In_Enclosed_Alphanumeric_Supplement,
- CR_In_Enclosed_Ideographic_Supplement,
- CR_In_Miscellaneous_Symbols_And_Pictographs,
- CR_In_Emoticons,
- CR_In_Transport_And_Map_Symbols,
- CR_In_Alchemical_Symbols,
- CR_In_CJK_Unified_Ideographs_Extension_B,
- CR_In_CJK_Unified_Ideographs_Extension_C,
- CR_In_CJK_Unified_Ideographs_Extension_D,
- CR_In_CJK_Compatibility_Ideographs_Supplement,
- CR_In_Tags,
- CR_In_Variation_Selectors_Supplement,
- CR_In_Supplementary_Private_Use_Area_A,
- CR_In_Supplementary_Private_Use_Area_B,
- CR_In_No_Block,
#endif /* USE_UNICODE_PROPERTIES */
};
struct uniname2ctype_struct {
@@ -25913,6 +16332,7 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
%}
struct uniname2ctype_struct;
%%
+newline, 0
alpha, 1
blank, 2
cntrl, 3
@@ -25937,233 +16357,221 @@ cn, 20
co, 21
cs, 22
l, 23
-lc, 24
-ll, 25
-lm, 26
-lo, 27
-lt, 28
-lu, 29
-m, 30
-mc, 31
-me, 32
-mn, 33
-n, 34
-nd, 35
-nl, 36
-no, 37
-p, 38
-pc, 39
-pd, 40
-pe, 41
-pf, 42
-pi, 43
-po, 44
-ps, 45
-s, 46
-sc, 47
-sk, 48
-sm, 49
-so, 50
-z, 51
-zl, 52
-zp, 53
-zs, 54
-math, 55
-alphabetic, 56
-lowercase, 57
-uppercase, 58
-cased, 59
-caseignorable, 60
-changeswhenlowercased, 61
-changeswhenuppercased, 62
-changeswhentitlecased, 63
-changeswhencasefolded, 64
-changeswhencasemapped, 65
-idstart, 66
-idcontinue, 67
-xidstart, 68
-xidcontinue, 69
-defaultignorablecodepoint, 70
-graphemeextend, 71
-graphemebase, 72
-graphemelink, 73
-common, 74
-latin, 75
-greek, 76
-cyrillic, 77
-armenian, 78
-hebrew, 79
-arabic, 80
-syriac, 81
-thaana, 82
-devanagari, 83
-bengali, 84
-gurmukhi, 85
-gujarati, 86
-oriya, 87
-tamil, 88
-telugu, 89
-kannada, 90
-malayalam, 91
-sinhala, 92
-thai, 93
-lao, 94
-tibetan, 95
-myanmar, 96
-georgian, 97
-hangul, 98
-ethiopic, 99
-cherokee, 100
-canadianaboriginal, 101
-ogham, 102
-runic, 103
-khmer, 104
-mongolian, 105
-hiragana, 106
-katakana, 107
-bopomofo, 108
-han, 109
-yi, 110
-olditalic, 111
-gothic, 112
-deseret, 113
-inherited, 114
-tagalog, 115
-hanunoo, 116
-buhid, 117
-tagbanwa, 118
-limbu, 119
-taile, 120
-linearb, 121
-ugaritic, 122
-shavian, 123
-osmanya, 124
-cypriot, 125
-braille, 126
-buginese, 127
-coptic, 128
-newtailue, 129
-glagolitic, 130
-tifinagh, 131
-sylotinagri, 132
-oldpersian, 133
-kharoshthi, 134
-balinese, 135
-cuneiform, 136
-phoenician, 137
-phagspa, 138
-nko, 139
-sundanese, 140
-lepcha, 141
-olchiki, 142
-vai, 143
-saurashtra, 144
-kayahli, 145
-rejang, 146
-lycian, 147
-carian, 148
-lydian, 149
-cham, 150
-taitham, 151
-taiviet, 152
-avestan, 153
-egyptianhieroglyphs, 154
-samaritan, 155
-lisu, 156
-bamum, 157
-javanese, 158
-meeteimayek, 159
-imperialaramaic, 160
-oldsoutharabian, 161
-inscriptionalparthian, 162
-inscriptionalpahlavi, 163
-oldturkic, 164
-kaithi, 165
-batak, 166
-brahmi, 167
-mandaic, 168
-chakma, 169
-meroiticcursive, 170
-meroitichieroglyphs, 171
-miao, 172
-sharada, 173
-sorasompeng, 174
-takri, 175
-whitespace, 176
-bidicontrol, 177
-joincontrol, 178
-dash, 179
-hyphen, 180
-quotationmark, 181
-terminalpunctuation, 182
-othermath, 183
-hexdigit, 184
-asciihexdigit, 185
-otheralphabetic, 186
-ideographic, 187
-diacritic, 188
-extender, 189
-otherlowercase, 190
-otheruppercase, 191
-noncharactercodepoint, 192
-othergraphemeextend, 193
-idsbinaryoperator, 194
-idstrinaryoperator, 195
-radical, 196
-unifiedideograph, 197
-otherdefaultignorablecodepoint, 198
-deprecated, 199
-softdotted, 200
-logicalorderexception, 201
-otheridstart, 202
-otheridcontinue, 203
-sterm, 204
-variationselector, 205
-patternwhitespace, 206
-patternsyntax, 207
-unknown, 208
-ahex, 185
-bidic, 177
-ci, 60
-cwcf, 64
-cwcm, 65
-cwl, 61
-cwt, 63
-cwu, 62
-dep, 199
-di, 70
-dia, 188
-ext, 189
-grbase, 72
-grext, 71
-grlink, 73
-hex, 184
-idc, 67
-ideo, 187
-ids, 66
-idsb, 194
-idst, 195
-joinc, 178
-loe, 201
-nchar, 192
-oalpha, 186
-odi, 198
-ogrext, 193
-oidc, 203
-oids, 202
-olower, 190
-omath, 183
-oupper, 191
-patsyn, 207
-patws, 206
-qmark, 181
-sd, 200
-term, 182
-uideo, 197
-vs, 205
-wspace, 176
-xidc, 69
-xids, 68
+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
+math, 54
+alphabetic, 55
+lowercase, 56
+uppercase, 57
+cased, 58
+caseignorable, 59
+changeswhenlowercased, 60
+changeswhenuppercased, 61
+changeswhentitlecased, 62
+changeswhencasefolded, 63
+changeswhencasemapped, 64
+idstart, 65
+idcontinue, 66
+xidstart, 67
+xidcontinue, 68
+defaultignorablecodepoint, 69
+graphemeextend, 70
+graphemebase, 71
+graphemelink, 72
+common, 73
+latin, 74
+greek, 75
+cyrillic, 76
+armenian, 77
+hebrew, 78
+arabic, 79
+syriac, 80
+thaana, 81
+devanagari, 82
+bengali, 83
+gurmukhi, 84
+gujarati, 85
+oriya, 86
+tamil, 87
+telugu, 88
+kannada, 89
+malayalam, 90
+sinhala, 91
+thai, 92
+lao, 93
+tibetan, 94
+myanmar, 95
+georgian, 96
+hangul, 97
+ethiopic, 98
+cherokee, 99
+canadianaboriginal, 100
+ogham, 101
+runic, 102
+khmer, 103
+mongolian, 104
+hiragana, 105
+katakana, 106
+bopomofo, 107
+han, 108
+yi, 109
+olditalic, 110
+gothic, 111
+deseret, 112
+inherited, 113
+tagalog, 114
+hanunoo, 115
+buhid, 116
+tagbanwa, 117
+limbu, 118
+taile, 119
+linearb, 120
+ugaritic, 121
+shavian, 122
+osmanya, 123
+cypriot, 124
+braille, 125
+buginese, 126
+coptic, 127
+newtailue, 128
+glagolitic, 129
+tifinagh, 130
+sylotinagri, 131
+oldpersian, 132
+kharoshthi, 133
+balinese, 134
+cuneiform, 135
+phoenician, 136
+phagspa, 137
+nko, 138
+sundanese, 139
+lepcha, 140
+olchiki, 141
+vai, 142
+saurashtra, 143
+kayahli, 144
+rejang, 145
+lycian, 146
+carian, 147
+lydian, 148
+cham, 149
+taitham, 150
+taiviet, 151
+avestan, 152
+egyptianhieroglyphs, 153
+samaritan, 154
+lisu, 155
+bamum, 156
+javanese, 157
+meeteimayek, 158
+imperialaramaic, 159
+oldsoutharabian, 160
+inscriptionalparthian, 161
+inscriptionalpahlavi, 162
+oldturkic, 163
+kaithi, 164
+whitespace, 165
+bidicontrol, 166
+joincontrol, 167
+dash, 168
+hyphen, 169
+quotationmark, 170
+terminalpunctuation, 171
+othermath, 172
+hexdigit, 173
+asciihexdigit, 174
+otheralphabetic, 175
+ideographic, 176
+diacritic, 177
+extender, 178
+otherlowercase, 179
+otheruppercase, 180
+noncharactercodepoint, 181
+othergraphemeextend, 182
+idsbinaryoperator, 183
+idstrinaryoperator, 184
+radical, 185
+unifiedideograph, 186
+otherdefaultignorablecodepoint, 187
+deprecated, 188
+softdotted, 189
+logicalorderexception, 190
+otheridstart, 191
+otheridcontinue, 192
+sterm, 193
+variationselector, 194
+patternwhitespace, 195
+patternsyntax, 196
+ahex, 174
+bidic, 166
+ci, 59
+cwcf, 63
+cwcm, 64
+cwl, 60
+cwt, 62
+cwu, 61
+dep, 188
+di, 69
+dia, 177
+ext, 178
+grbase, 71
+grext, 70
+grlink, 72
+hex, 173
+idc, 66
+ideo, 176
+ids, 65
+idsb, 183
+idst, 184
+joinc, 167
+loe, 190
+nchar, 181
+oalpha, 175
+odi, 187
+ogrext, 182
+oidc, 192
+oids, 191
+olower, 179
+omath, 172
+oupper, 180
+patsyn, 196
+patws, 195
+qmark, 170
+sd, 189
+term, 171
+uideo, 186
+vs, 194
+wspace, 165
+xidc, 68
+xids, 67
other, 17
control, 18
format, 19
@@ -26171,374 +16579,127 @@ unassigned, 20
privateuse, 21
surrogate, 22
letter, 23
-casedletter, 24
-lowercaseletter, 25
-modifierletter, 26
-otherletter, 27
-titlecaseletter, 28
-uppercaseletter, 29
-mark, 30
-combiningmark, 30
-spacingmark, 31
-enclosingmark, 32
-nonspacingmark, 33
-number, 34
-decimalnumber, 35
-letternumber, 36
-othernumber, 37
-punctuation, 38
-connectorpunctuation, 39
-dashpunctuation, 40
-closepunctuation, 41
-finalpunctuation, 42
-initialpunctuation, 43
-otherpunctuation, 44
-openpunctuation, 45
-symbol, 46
-currencysymbol, 47
-modifiersymbol, 48
-mathsymbol, 49
-othersymbol, 50
-separator, 51
-lineseparator, 52
-paragraphseparator, 53
-spaceseparator, 54
-arab, 80
-armi, 160
-armn, 78
-avst, 153
-bali, 135
-bamu, 157
-batk, 166
-beng, 84
-bopo, 108
-brah, 167
-brai, 126
-bugi, 127
-buhd, 117
-cakm, 169
-cans, 101
-cari, 148
-cher, 100
-copt, 128
-qaac, 128
-cprt, 125
-cyrl, 77
-deva, 83
-dsrt, 113
-egyp, 154
-ethi, 99
-geor, 97
-glag, 130
-goth, 112
-grek, 76
-gujr, 86
-guru, 85
-hang, 98
-hani, 109
-hano, 116
-hebr, 79
-hira, 106
-ital, 111
-java, 158
-kali, 145
-kana, 107
-khar, 134
-khmr, 104
-knda, 90
-kthi, 165
-lana, 151
-laoo, 94
-latn, 75
-lepc, 141
-limb, 119
-linb, 121
-lyci, 147
-lydi, 149
-mand, 168
-merc, 170
-mero, 171
-mlym, 91
-mong, 105
-mtei, 159
-mymr, 96
-nkoo, 139
-ogam, 102
-olck, 142
-orkh, 164
-orya, 87
-osma, 124
-phag, 138
-phli, 163
-phnx, 137
-plrd, 172
-prti, 162
-rjng, 146
-runr, 103
-samr, 155
-sarb, 161
-saur, 144
-shaw, 123
-shrd, 173
-sinh, 92
-sora, 174
-sund, 140
-sylo, 132
-syrc, 81
-tagb, 118
-takr, 175
-tale, 120
-talu, 129
-taml, 88
-tavt, 152
-telu, 89
-tfng, 131
-tglg, 115
-thaa, 82
-tibt, 95
-ugar, 122
-vaii, 143
-xpeo, 133
-xsux, 136
-yiii, 110
-zinh, 114
-qaai, 114
-zyyy, 74
-zzzz, 208
-age=1.1, 209
-age=2.0, 210
-age=2.1, 211
-age=3.0, 212
-age=3.1, 213
-age=3.2, 214
-age=4.0, 215
-age=4.1, 216
-age=5.0, 217
-age=5.1, 218
-age=5.2, 219
-age=6.0, 220
-age=6.1, 221
-inbasiclatin, 222
-inlatin1supplement, 223
-inlatinextendeda, 224
-inlatinextendedb, 225
-inipaextensions, 226
-inspacingmodifierletters, 227
-incombiningdiacriticalmarks, 228
-ingreekandcoptic, 229
-incyrillic, 230
-incyrillicsupplement, 231
-inarmenian, 232
-inhebrew, 233
-inarabic, 234
-insyriac, 235
-inarabicsupplement, 236
-inthaana, 237
-innko, 238
-insamaritan, 239
-inmandaic, 240
-inarabicextendeda, 241
-indevanagari, 242
-inbengali, 243
-ingurmukhi, 244
-ingujarati, 245
-inoriya, 246
-intamil, 247
-intelugu, 248
-inkannada, 249
-inmalayalam, 250
-insinhala, 251
-inthai, 252
-inlao, 253
-intibetan, 254
-inmyanmar, 255
-ingeorgian, 256
-inhanguljamo, 257
-inethiopic, 258
-inethiopicsupplement, 259
-incherokee, 260
-inunifiedcanadianaboriginalsyllabics, 261
-inogham, 262
-inrunic, 263
-intagalog, 264
-inhanunoo, 265
-inbuhid, 266
-intagbanwa, 267
-inkhmer, 268
-inmongolian, 269
-inunifiedcanadianaboriginalsyllabicsextended, 270
-inlimbu, 271
-intaile, 272
-innewtailue, 273
-inkhmersymbols, 274
-inbuginese, 275
-intaitham, 276
-inbalinese, 277
-insundanese, 278
-inbatak, 279
-inlepcha, 280
-inolchiki, 281
-insundanesesupplement, 282
-invedicextensions, 283
-inphoneticextensions, 284
-inphoneticextensionssupplement, 285
-incombiningdiacriticalmarkssupplement, 286
-inlatinextendedadditional, 287
-ingreekextended, 288
-ingeneralpunctuation, 289
-insuperscriptsandsubscripts, 290
-incurrencysymbols, 291
-incombiningdiacriticalmarksforsymbols, 292
-inletterlikesymbols, 293
-innumberforms, 294
-inarrows, 295
-inmathematicaloperators, 296
-inmiscellaneoustechnical, 297
-incontrolpictures, 298
-inopticalcharacterrecognition, 299
-inenclosedalphanumerics, 300
-inboxdrawing, 301
-inblockelements, 302
-ingeometricshapes, 303
-inmiscellaneoussymbols, 304
-indingbats, 305
-inmiscellaneousmathematicalsymbolsa, 306
-insupplementalarrowsa, 307
-inbraillepatterns, 308
-insupplementalarrowsb, 309
-inmiscellaneousmathematicalsymbolsb, 310
-insupplementalmathematicaloperators, 311
-inmiscellaneoussymbolsandarrows, 312
-inglagolitic, 313
-inlatinextendedc, 314
-incoptic, 315
-ingeorgiansupplement, 316
-intifinagh, 317
-inethiopicextended, 318
-incyrillicextendeda, 319
-insupplementalpunctuation, 320
-incjkradicalssupplement, 321
-inkangxiradicals, 322
-inideographicdescriptioncharacters, 323
-incjksymbolsandpunctuation, 324
-inhiragana, 325
-inkatakana, 326
-inbopomofo, 327
-inhangulcompatibilityjamo, 328
-inkanbun, 329
-inbopomofoextended, 330
-incjkstrokes, 331
-inkatakanaphoneticextensions, 332
-inenclosedcjklettersandmonths, 333
-incjkcompatibility, 334
-incjkunifiedideographsextensiona, 335
-inyijinghexagramsymbols, 336
-incjkunifiedideographs, 337
-inyisyllables, 338
-inyiradicals, 339
-inlisu, 340
-invai, 341
-incyrillicextendedb, 342
-inbamum, 343
-inmodifiertoneletters, 344
-inlatinextendedd, 345
-insylotinagri, 346
-incommonindicnumberforms, 347
-inphagspa, 348
-insaurashtra, 349
-indevanagariextended, 350
-inkayahli, 351
-inrejang, 352
-inhanguljamoextendeda, 353
-injavanese, 354
-incham, 355
-inmyanmarextendeda, 356
-intaiviet, 357
-inmeeteimayekextensions, 358
-inethiopicextendeda, 359
-inmeeteimayek, 360
-inhangulsyllables, 361
-inhanguljamoextendedb, 362
-inhighsurrogates, 363
-inhighprivateusesurrogates, 364
-inlowsurrogates, 365
-inprivateusearea, 366
-incjkcompatibilityideographs, 367
-inalphabeticpresentationforms, 368
-inarabicpresentationformsa, 369
-invariationselectors, 370
-inverticalforms, 371
-incombininghalfmarks, 372
-incjkcompatibilityforms, 373
-insmallformvariants, 374
-inarabicpresentationformsb, 375
-inhalfwidthandfullwidthforms, 376
-inspecials, 377
-inlinearbsyllabary, 378
-inlinearbideograms, 379
-inaegeannumbers, 380
-inancientgreeknumbers, 381
-inancientsymbols, 382
-inphaistosdisc, 383
-inlycian, 384
-incarian, 385
-inolditalic, 386
-ingothic, 387
-inugaritic, 388
-inoldpersian, 389
-indeseret, 390
-inshavian, 391
-inosmanya, 392
-incypriotsyllabary, 393
-inimperialaramaic, 394
-inphoenician, 395
-inlydian, 396
-inmeroitichieroglyphs, 397
-inmeroiticcursive, 398
-inkharoshthi, 399
-inoldsoutharabian, 400
-inavestan, 401
-ininscriptionalparthian, 402
-ininscriptionalpahlavi, 403
-inoldturkic, 404
-inruminumeralsymbols, 405
-inbrahmi, 406
-inkaithi, 407
-insorasompeng, 408
-inchakma, 409
-insharada, 410
-intakri, 411
-incuneiform, 412
-incuneiformnumbersandpunctuation, 413
-inegyptianhieroglyphs, 414
-inbamumsupplement, 415
-inmiao, 416
-inkanasupplement, 417
-inbyzantinemusicalsymbols, 418
-inmusicalsymbols, 419
-inancientgreekmusicalnotation, 420
-intaixuanjingsymbols, 421
-incountingrodnumerals, 422
-inmathematicalalphanumericsymbols, 423
-inarabicmathematicalalphabeticsymbols, 424
-inmahjongtiles, 425
-indominotiles, 426
-inplayingcards, 427
-inenclosedalphanumericsupplement, 428
-inenclosedideographicsupplement, 429
-inmiscellaneoussymbolsandpictographs, 430
-inemoticons, 431
-intransportandmapsymbols, 432
-inalchemicalsymbols, 433
-incjkunifiedideographsextensionb, 434
-incjkunifiedideographsextensionc, 435
-incjkunifiedideographsextensiond, 436
-incjkcompatibilityideographssupplement, 437
-intags, 438
-invariationselectorssupplement, 439
-insupplementaryprivateuseareaa, 440
-insupplementaryprivateuseareab, 441
-innoblock, 442
+lowercaseletter, 24
+modifierletter, 25
+otherletter, 26
+titlecaseletter, 27
+uppercaseletter, 28
+mark, 29
+spacingmark, 30
+enclosingmark, 31
+nonspacingmark, 32
+number, 33
+decimalnumber, 34
+letternumber, 35
+othernumber, 36
+punctuation, 37
+connectorpunctuation, 38
+dashpunctuation, 39
+closepunctuation, 40
+finalpunctuation, 41
+initialpunctuation, 42
+otherpunctuation, 43
+openpunctuation, 44
+symbol, 45
+currencysymbol, 46
+modifiersymbol, 47
+mathsymbol, 48
+othersymbol, 49
+separator, 50
+lineseparator, 51
+paragraphseparator, 52
+spaceseparator, 53
+arab, 79
+armi, 159
+armn, 77
+avst, 152
+bali, 134
+bamu, 156
+beng, 83
+bopo, 107
+brai, 125
+bugi, 126
+buhd, 116
+cans, 100
+cari, 147
+cher, 99
+copt, 127
+qaac, 127
+cprt, 124
+cyrl, 76
+deva, 82
+dsrt, 112
+egyp, 153
+ethi, 98
+geor, 96
+glag, 129
+goth, 111
+grek, 75
+gujr, 85
+guru, 84
+hang, 97
+hani, 108
+hano, 115
+hebr, 78
+hira, 105
+ital, 110
+java, 157
+kali, 144
+kana, 106
+khar, 133
+khmr, 103
+knda, 89
+kthi, 164
+lana, 150
+laoo, 93
+latn, 74
+lepc, 140
+limb, 118
+linb, 120
+lyci, 146
+lydi, 148
+mlym, 90
+mong, 104
+mtei, 158
+mymr, 95
+nkoo, 138
+ogam, 101
+olck, 141
+orkh, 163
+orya, 86
+osma, 123
+phag, 137
+phli, 162
+phnx, 136
+prti, 161
+rjng, 145
+runr, 102
+samr, 154
+sarb, 160
+saur, 143
+shaw, 122
+sinh, 91
+sund, 139
+sylo, 131
+syrc, 80
+tagb, 117
+tale, 119
+talu, 128
+taml, 87
+tavt, 151
+telu, 88
+tfng, 130
+tglg, 114
+thaa, 81
+tibt, 94
+ugar, 121
+vaii, 142
+xpeo, 132
+xsux, 135
+yiii, 109
+zinh, 113
+qaai, 113
+zyyy, 73
#endif /* USE_UNICODE_PROPERTIES */
%%
static int
diff --git a/enc/unicode/name2ctype.src b/enc/unicode/name2ctype.src
index ff94d68b3b..ff136177ca 100644
--- a/enc/unicode/name2ctype.src
+++ b/enc/unicode/name2ctype.src
@@ -1,4272 +1,4 @@
%{
-#define long size_t
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
- 1,
- 0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
- 540,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00aa, 0x00aa,
- 0x00b5, 0x00b5,
- 0x00ba, 0x00ba,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x02c1,
- 0x02c6, 0x02d1,
- 0x02e0, 0x02e4,
- 0x02ec, 0x02ec,
- 0x02ee, 0x02ee,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x065f,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06ef,
- 0x06fa, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07ca, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a70, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x103f,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1950, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1baf,
- 0x1bba, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c4d, 0x1c4f,
- 0x1c5a, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa61f,
- 0xa62a, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa90a, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9cf,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x11100, 0x11132,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x11680, 0x116b5,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* 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[] = {
- 42,
- 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,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1b50, 0x1b59,
- 0x1bb0, 0x1bb9,
- 0x1c40, 0x1c49,
- 0x1c50, 0x1c59,
- 0xa620, 0xa629,
- 0xa8d0, 0xa8d9,
- 0xa900, 0xa909,
- 0xa9d0, 0xa9d9,
- 0xaa50, 0xaa59,
- 0xabf0, 0xabf9,
- 0xff10, 0xff19,
- 0x104a0, 0x104a9,
- 0x11066, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
- 0x1d7ce, 0x1d7ff,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
- 544,
- 0x0021, 0x007e,
- 0x00a1, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 0x167f,
- 0x1681, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dd,
- 0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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,
- 0x200b, 0x2027,
- 0x202a, 0x202e,
- 0x2030, 0x205e,
- 0x2060, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3001, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
- 618,
- 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, 0x02b8,
- 0x02c0, 0x02c1,
- 0x02e0, 0x02e4,
- 0x0345, 0x0345,
- 0x0371, 0x0371,
- 0x0373, 0x0373,
- 0x0377, 0x0377,
- 0x037a, 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,
- 0x0525, 0x0525,
- 0x0527, 0x0527,
- 0x0561, 0x0587,
- 0x1d00, 0x1dbf,
- 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,
- 0x2090, 0x209c,
- 0x210a, 0x210a,
- 0x210e, 0x210f,
- 0x2113, 0x2113,
- 0x212f, 0x212f,
- 0x2134, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213d,
- 0x2146, 0x2149,
- 0x214e, 0x214e,
- 0x2170, 0x217f,
- 0x2184, 0x2184,
- 0x24d0, 0x24e9,
- 0x2c30, 0x2c5e,
- 0x2c61, 0x2c61,
- 0x2c65, 0x2c66,
- 0x2c68, 0x2c68,
- 0x2c6a, 0x2c6a,
- 0x2c6c, 0x2c6c,
- 0x2c71, 0x2c71,
- 0x2c73, 0x2c74,
- 0x2c76, 0x2c7d,
- 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,
- 0x2cec, 0x2cec,
- 0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 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,
- 0xa661, 0xa661,
- 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, 0xa778,
- 0xa77a, 0xa77a,
- 0xa77c, 0xa77c,
- 0xa77f, 0xa77f,
- 0xa781, 0xa781,
- 0xa783, 0xa783,
- 0xa785, 0xa785,
- 0xa787, 0xa787,
- 0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7f8, 0xa7fa,
- 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[] = {
- 541,
- 0x0020, 0x007e,
- 0x00a0, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
- 0x0979, 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, 0x09fb,
- 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, 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, 0x0b77,
- 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, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 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,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
- 0x13a0, 0x13f4,
- 0x1400, 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,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x2027,
- 0x202a, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
- 0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xe000, 0xfa6d,
- 0xfa70, 0xfad9,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 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, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
- 0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
- 0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x12470, 0x12473,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xf0000, 0xffffd,
- 0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
- 140,
- 0x0021, 0x0023,
- 0x0025, 0x002a,
- 0x002c, 0x002f,
- 0x003a, 0x003b,
- 0x003f, 0x0040,
- 0x005b, 0x005d,
- 0x005f, 0x005f,
- 0x007b, 0x007b,
- 0x007d, 0x007d,
- 0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00ab, 0x00ab,
- 0x00b6, 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,
- 0x0830, 0x083e,
- 0x085e, 0x085e,
- 0x0964, 0x0965,
- 0x0970, 0x0970,
- 0x0af0, 0x0af0,
- 0x0df4, 0x0df4,
- 0x0e4f, 0x0e4f,
- 0x0e5a, 0x0e5b,
- 0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
- 0x0f3a, 0x0f3d,
- 0x0f85, 0x0f85,
- 0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
- 0x104a, 0x104f,
- 0x10fb, 0x10fb,
- 0x1360, 0x1368,
- 0x1400, 0x1400,
- 0x166d, 0x166e,
- 0x169b, 0x169c,
- 0x16eb, 0x16ed,
- 0x1735, 0x1736,
- 0x17d4, 0x17d6,
- 0x17d8, 0x17da,
- 0x1800, 0x180a,
- 0x1944, 0x1945,
- 0x1a1e, 0x1a1f,
- 0x1aa0, 0x1aa6,
- 0x1aa8, 0x1aad,
- 0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
- 0x1c3b, 0x1c3f,
- 0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd3, 0x1cd3,
- 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,
- 0x2d70, 0x2d70,
- 0x2e00, 0x2e2e,
- 0x2e30, 0x2e3b,
- 0x3001, 0x3003,
- 0x3008, 0x3011,
- 0x3014, 0x301f,
- 0x3030, 0x3030,
- 0x303d, 0x303d,
- 0x30a0, 0x30a0,
- 0x30fb, 0x30fb,
- 0xa4fe, 0xa4ff,
- 0xa60d, 0xa60f,
- 0xa673, 0xa673,
- 0xa67e, 0xa67e,
- 0xa6f2, 0xa6f7,
- 0xa874, 0xa877,
- 0xa8ce, 0xa8cf,
- 0xa8f8, 0xa8fa,
- 0xa92e, 0xa92f,
- 0xa95f, 0xa95f,
- 0xa9c1, 0xa9cd,
- 0xa9de, 0xa9df,
- 0xaa5c, 0xaa5f,
- 0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
- 0xabeb, 0xabeb,
- 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, 0x10102,
- 0x1039f, 0x1039f,
- 0x103d0, 0x103d0,
- 0x10857, 0x10857,
- 0x1091f, 0x1091f,
- 0x1093f, 0x1093f,
- 0x10a50, 0x10a58,
- 0x10a7f, 0x10a7f,
- 0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
- 0x110bb, 0x110bc,
- 0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
- 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[] = {
- 610,
- 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,
- 0x0524, 0x0524,
- 0x0526, 0x0526,
- 0x0531, 0x0556,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 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,
- 0x2160, 0x216f,
- 0x2183, 0x2183,
- 0x24b6, 0x24cf,
- 0x2c00, 0x2c2e,
- 0x2c60, 0x2c60,
- 0x2c62, 0x2c64,
- 0x2c67, 0x2c67,
- 0x2c69, 0x2c69,
- 0x2c6b, 0x2c6b,
- 0x2c6d, 0x2c70,
- 0x2c72, 0x2c72,
- 0x2c75, 0x2c75,
- 0x2c7e, 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,
- 0x2ceb, 0x2ceb,
- 0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
- 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,
- 0xa660, 0xa660,
- 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,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
- 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[] = {
- 564,
- 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, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x0591, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06df, 0x06e8,
- 0x06ea, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x074a,
- 0x074d, 0x07b1,
- 0x07c0, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
- 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, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f18, 0x0f19,
- 0x0f20, 0x0f29,
- 0x0f35, 0x0f35,
- 0x0f37, 0x0f37,
- 0x0f39, 0x0f39,
- 0x0f3e, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fc6, 0x0fc6,
- 0x1000, 0x1049,
- 0x1050, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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,
- 0x135d, 0x135f,
- 0x1380, 0x138f,
- 0x13a0, 0x13f4,
- 0x1401, 0x166c,
- 0x166f, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1734,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17d3,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dd,
- 0x17e0, 0x17e9,
- 0x180b, 0x180d,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
- 0x1c00, 0x1c37,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
- 0x2da0, 0x2da6,
- 0x2da8, 0x2dae,
- 0x2db0, 0x2db6,
- 0x2db8, 0x2dbe,
- 0x2dc0, 0x2dc6,
- 0x2dc8, 0x2dce,
- 0x2dd0, 0x2dd6,
- 0x2dd8, 0x2dde,
- 0x2de0, 0x2dff,
- 0x2e2f, 0x2e2f,
- 0x3005, 0x3007,
- 0x3021, 0x302f,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x3099, 0x309a,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa672,
- 0xa674, 0xa67d,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c4,
- 0xa8d0, 0xa8d9,
- 0xa8e0, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92d,
- 0xa930, 0xa953,
- 0xa960, 0xa97c,
- 0xa980, 0xa9c0,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabec, 0xabed,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 0x10140, 0x10174,
- 0x101fd, 0x101fd,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a3f,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
- 0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
- 0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
- 566,
- 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,
- 0x0345, 0x0345,
- 0x0370, 0x0374,
- 0x0376, 0x0377,
- 0x037a, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0559, 0x0559,
- 0x0561, 0x0587,
- 0x05b0, 0x05bd,
- 0x05bf, 0x05bf,
- 0x05c1, 0x05c2,
- 0x05c4, 0x05c5,
- 0x05c7, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f2,
- 0x0610, 0x061a,
- 0x0620, 0x0657,
- 0x0659, 0x0669,
- 0x066e, 0x06d3,
- 0x06d5, 0x06dc,
- 0x06e1, 0x06e8,
- 0x06ed, 0x06fc,
- 0x06ff, 0x06ff,
- 0x0710, 0x073f,
- 0x074d, 0x07b1,
- 0x07c0, 0x07ea,
- 0x07f4, 0x07f5,
- 0x07fa, 0x07fa,
- 0x0800, 0x0817,
- 0x081a, 0x082c,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
- 0x0900, 0x093b,
- 0x093d, 0x094c,
- 0x094e, 0x0950,
- 0x0955, 0x0963,
- 0x0966, 0x096f,
- 0x0971, 0x0977,
- 0x0979, 0x097f,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bd, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cc,
- 0x09ce, 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,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4c,
- 0x0a51, 0x0a51,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a75,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abd, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acc,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae3,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b35, 0x0b39,
- 0x0b3d, 0x0b44,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4c,
- 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, 0x0bcc,
- 0x0bd0, 0x0bd0,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bef,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3d, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4c,
- 0x0c55, 0x0c56,
- 0x0c58, 0x0c59,
- 0x0c60, 0x0c63,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbd, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccc,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce3,
- 0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
- 0x0d3d, 0x0d44,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d63,
- 0x0d66, 0x0d6f,
- 0x0d7a, 0x0d7f,
- 0x0d82, 0x0d83,
- 0x0d85, 0x0d96,
- 0x0d9a, 0x0db1,
- 0x0db3, 0x0dbb,
- 0x0dbd, 0x0dbd,
- 0x0dc0, 0x0dc6,
- 0x0dcf, 0x0dd4,
- 0x0dd6, 0x0dd6,
- 0x0dd8, 0x0ddf,
- 0x0df2, 0x0df3,
- 0x0e01, 0x0e3a,
- 0x0e40, 0x0e46,
- 0x0e4d, 0x0e4d,
- 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,
- 0x0ecd, 0x0ecd,
- 0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f00,
- 0x0f20, 0x0f29,
- 0x0f40, 0x0f47,
- 0x0f49, 0x0f6c,
- 0x0f71, 0x0f81,
- 0x0f88, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x1000, 0x1036,
- 0x1038, 0x1038,
- 0x103b, 0x1049,
- 0x1050, 0x1062,
- 0x1065, 0x1068,
- 0x106e, 0x1086,
- 0x108e, 0x108e,
- 0x1090, 0x1099,
- 0x109c, 0x109d,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x10fa,
- 0x10fc, 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, 0x167f,
- 0x1681, 0x169a,
- 0x16a0, 0x16ea,
- 0x16ee, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1713,
- 0x1720, 0x1733,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17b3,
- 0x17b6, 0x17c8,
- 0x17d7, 0x17d7,
- 0x17dc, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18aa,
- 0x18b0, 0x18f5,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x1938,
- 0x1946, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19ab,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x1a00, 0x1a1b,
- 0x1a20, 0x1a5e,
- 0x1a61, 0x1a74,
- 0x1a80, 0x1a89,
- 0x1a90, 0x1a99,
- 0x1aa7, 0x1aa7,
- 0x1b00, 0x1b33,
- 0x1b35, 0x1b43,
- 0x1b45, 0x1b4b,
- 0x1b50, 0x1b59,
- 0x1b80, 0x1ba9,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1bf1,
- 0x1c00, 0x1c35,
- 0x1c40, 0x1c49,
- 0x1c4d, 0x1c7d,
- 0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
- 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, 0x209c,
- 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,
- 0x2160, 0x2188,
- 0x24b6, 0x24e9,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 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, 0x3007,
- 0x3021, 0x3029,
- 0x3031, 0x3035,
- 0x3038, 0x303c,
- 0x3041, 0x3096,
- 0x309d, 0x309f,
- 0x30a1, 0x30fa,
- 0x30fc, 0x30ff,
- 0x3105, 0x312d,
- 0x3131, 0x318e,
- 0x31a0, 0x31ba,
- 0x31f0, 0x31ff,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xa000, 0xa48c,
- 0xa4d0, 0xa4fd,
- 0xa500, 0xa60c,
- 0xa610, 0xa62b,
- 0xa640, 0xa66e,
- 0xa674, 0xa67b,
- 0xa67f, 0xa697,
- 0xa69f, 0xa6ef,
- 0xa717, 0xa71f,
- 0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
- 0xa803, 0xa805,
- 0xa807, 0xa80a,
- 0xa80c, 0xa827,
- 0xa840, 0xa873,
- 0xa880, 0xa8c3,
- 0xa8d0, 0xa8d9,
- 0xa8f2, 0xa8f7,
- 0xa8fb, 0xa8fb,
- 0xa900, 0xa92a,
- 0xa930, 0xa952,
- 0xa960, 0xa97c,
- 0xa980, 0xa9b2,
- 0xa9b4, 0xa9bf,
- 0xa9cf, 0xa9d9,
- 0xaa00, 0xaa36,
- 0xaa40, 0xaa4d,
- 0xaa50, 0xaa59,
- 0xaa60, 0xaa76,
- 0xaa7a, 0xaa7a,
- 0xaa80, 0xaabe,
- 0xaac0, 0xaac0,
- 0xaac2, 0xaac2,
- 0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabea,
- 0xabf0, 0xabf9,
- 0xac00, 0xd7a3,
- 0xd7b0, 0xd7c6,
- 0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
- 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,
- 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,
- 0x10140, 0x10174,
- 0x10280, 0x1029c,
- 0x102a0, 0x102d0,
- 0x10300, 0x1031e,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x103a0, 0x103c3,
- 0x103c8, 0x103cf,
- 0x103d1, 0x103d5,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x10855,
- 0x10900, 0x10915,
- 0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a60, 0x10a7c,
- 0x10b00, 0x10b35,
- 0x10b40, 0x10b55,
- 0x10b60, 0x10b72,
- 0x10c00, 0x10c48,
- 0x11000, 0x11045,
- 0x11066, 0x1106f,
- 0x11082, 0x110b8,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11132,
- 0x11136, 0x1113f,
- 0x11180, 0x111bf,
- 0x111c1, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b5,
- 0x116c0, 0x116c9,
- 0x12000, 0x1236e,
- 0x12400, 0x12462,
- 0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
- 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,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x20000, 0x2a6d6,
- 0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
- 0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
- 1,
- 0x0000, 0x007f,
-}; /* CR_ASCII */
#ifdef USE_UNICODE_PROPERTIES
/* 'Any': - */
@@ -4277,35 +9,34 @@ static const OnigCodePoint CR_Any[] = {
/* 'Assigned': - */
static const OnigCodePoint CR_Assigned[] = {
- 539,
+ 485,
0x0000, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x0591, 0x05c7,
0x05d0, 0x05ea,
0x05f0, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0606, 0x061b,
- 0x061e, 0x070d,
+ 0x061e, 0x061f,
+ 0x0621, 0x065e,
+ 0x0660, 0x070d,
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
0x0800, 0x082d,
0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -4349,7 +80,8 @@ static const OnigCodePoint CR_Assigned[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -4363,7 +95,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -4411,10 +143,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -4449,17 +182,17 @@ static const OnigCodePoint CR_Assigned[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -4475,7 +208,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
0x1400, 0x169c,
@@ -4512,14 +245,14 @@ static const OnigCodePoint CR_Assigned[] = {
0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -4538,25 +271,38 @@ static const OnigCodePoint CR_Assigned[] = {
0x2000, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -4565,7 +311,7 @@ static const OnigCodePoint CR_Assigned[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -4575,21 +321,21 @@ static const OnigCodePoint CR_Assigned[] = {
0x3099, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa82b,
0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
@@ -4605,18 +351,14 @@ static const OnigCodePoint CR_Assigned[] = {
0xaa50, 0xaa59,
0xaa5c, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xd800, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -4625,7 +367,7 @@ static const OnigCodePoint CR_Assigned[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -4678,8 +420,6 @@ static const OnigCodePoint CR_Assigned[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -4695,26 +435,11 @@ static const OnigCodePoint CR_Assigned[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -4742,75 +467,28 @@ static const OnigCodePoint CR_Assigned[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
@@ -4821,560 +499,44 @@ static const OnigCodePoint CR_Assigned[] = {
/* 'C': Major Category */
static const OnigCodePoint CR_C[] = {
- 541,
+ 20,
0x0000, 0x001f,
0x007f, 0x009f,
0x00ad, 0x00ad,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x0605,
- 0x061c, 0x061d,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
- 0x070e, 0x070f,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
+ 0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
- 0x2060, 0x206f,
- 0x2072, 0x2073,
- 0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
- 0xfd40, 0xfd4f,
- 0xfd90, 0xfd91,
- 0xfdc8, 0xfdef,
- 0xfdfe, 0xfdff,
- 0xfe1a, 0xfe1f,
- 0xfe27, 0xfe2f,
- 0xfe53, 0xfe53,
- 0xfe67, 0xfe67,
- 0xfe6c, 0xfe6f,
- 0xfe75, 0xfe75,
- 0xfefd, 0xff00,
- 0xffbf, 0xffc1,
- 0xffc8, 0xffc9,
- 0xffd0, 0xffd1,
- 0xffd8, 0xffd9,
- 0xffdd, 0xffdf,
- 0xffe7, 0xffe7,
- 0xffef, 0xfffb,
- 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
+ 0x2060, 0x2064,
+ 0x206a, 0x206f,
+ 0xd800, 0xf8ff,
+ 0xfeff, 0xfeff,
+ 0xfff9, 0xfffb,
0x110bd, 0x110bd,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
- 0x1d0f6, 0x1d0ff,
- 0x1d127, 0x1d128,
0x1d173, 0x1d17a,
- 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe00ff,
- 0xe01f0, 0x10ffff,
+ 0xe0001, 0xe0001,
+ 0xe0020, 0xe007f,
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10ffff,
}; /* CR_C */
/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
+static const OnigCodePoint CR_Cc[] = {
+ 2,
+ 0x0000, 0x001f,
+ 0x007f, 0x009f,
+}; /* CR_Cc */
/* 'Cf': General Category */
static const OnigCodePoint CR_Cf[] = {
- 14,
+ 15,
0x00ad, 0x00ad,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x06dd, 0x06dd,
0x070f, 0x070f,
+ 0x17b4, 0x17b5,
0x200b, 0x200f,
0x202a, 0x202e,
0x2060, 0x2064,
@@ -5389,35 +551,34 @@ static const OnigCodePoint CR_Cf[] = {
/* 'Cn': General Category */
static const OnigCodePoint CR_Cn[] = {
- 539,
+ 485,
0x0378, 0x0379,
0x037f, 0x0383,
0x038b, 0x038b,
0x038d, 0x038d,
0x03a2, 0x03a2,
- 0x0528, 0x0530,
+ 0x0526, 0x0530,
0x0557, 0x0558,
0x0560, 0x0560,
0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
+ 0x058b, 0x0590,
0x05c8, 0x05cf,
0x05eb, 0x05ef,
0x05f5, 0x05ff,
- 0x0605, 0x0605,
+ 0x0604, 0x0605,
0x061c, 0x061d,
+ 0x0620, 0x0620,
+ 0x065f, 0x065f,
0x070e, 0x070e,
0x074b, 0x074c,
0x07b2, 0x07bf,
0x07fb, 0x07ff,
0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
+ 0x083f, 0x08ff,
+ 0x093a, 0x093b,
+ 0x094f, 0x094f,
+ 0x0956, 0x0957,
+ 0x0973, 0x0978,
0x0980, 0x0980,
0x0984, 0x0984,
0x098d, 0x098e,
@@ -5461,6 +622,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0ace, 0x0acf,
0x0ad1, 0x0adf,
0x0ae4, 0x0ae5,
+ 0x0af0, 0x0af0,
0x0af2, 0x0b00,
0x0b04, 0x0b04,
0x0b0d, 0x0b0e,
@@ -5475,7 +637,7 @@ static const OnigCodePoint CR_Cn[] = {
0x0b58, 0x0b5b,
0x0b5e, 0x0b5e,
0x0b64, 0x0b65,
- 0x0b78, 0x0b81,
+ 0x0b72, 0x0b81,
0x0b84, 0x0b84,
0x0b8b, 0x0b8d,
0x0b91, 0x0b91,
@@ -5523,10 +685,11 @@ static const OnigCodePoint CR_Cn[] = {
0x0d04, 0x0d04,
0x0d0d, 0x0d0d,
0x0d11, 0x0d11,
- 0x0d3b, 0x0d3c,
+ 0x0d29, 0x0d29,
+ 0x0d3a, 0x0d3c,
0x0d45, 0x0d45,
0x0d49, 0x0d49,
- 0x0d4f, 0x0d56,
+ 0x0d4e, 0x0d56,
0x0d58, 0x0d5f,
0x0d64, 0x0d65,
0x0d76, 0x0d78,
@@ -5561,16 +724,16 @@ static const OnigCodePoint CR_Cn[] = {
0x0ec7, 0x0ec7,
0x0ece, 0x0ecf,
0x0eda, 0x0edb,
- 0x0ee0, 0x0eff,
+ 0x0ede, 0x0eff,
0x0f48, 0x0f48,
0x0f6d, 0x0f70,
+ 0x0f8c, 0x0f8f,
0x0f98, 0x0f98,
0x0fbd, 0x0fbd,
0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
+ 0x0fd9, 0x0fff,
+ 0x10c6, 0x10cf,
+ 0x10fd, 0x10ff,
0x1249, 0x1249,
0x124e, 0x124f,
0x1257, 0x1257,
@@ -5586,7 +749,7 @@ static const OnigCodePoint CR_Cn[] = {
0x12d7, 0x12d7,
0x1311, 0x1311,
0x1316, 0x1317,
- 0x135b, 0x135c,
+ 0x135b, 0x135e,
0x137d, 0x137f,
0x139a, 0x139f,
0x13f5, 0x13ff,
@@ -5624,13 +787,13 @@ static const OnigCodePoint CR_Cn[] = {
0x1aae, 0x1aff,
0x1b4c, 0x1b4f,
0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
+ 0x1bab, 0x1bad,
+ 0x1bba, 0x1bff,
0x1c38, 0x1c3a,
0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
+ 0x1c80, 0x1ccf,
+ 0x1cf3, 0x1cff,
+ 0x1de7, 0x1dfc,
0x1f16, 0x1f17,
0x1f1e, 0x1f1f,
0x1f46, 0x1f47,
@@ -5650,24 +813,37 @@ static const OnigCodePoint CR_Cn[] = {
0x2065, 0x2069,
0x2072, 0x2073,
0x208f, 0x208f,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
+ 0x2095, 0x209f,
+ 0x20b9, 0x20cf,
0x20f1, 0x20ff,
0x218a, 0x218f,
- 0x23f4, 0x23ff,
+ 0x23e9, 0x23ff,
0x2427, 0x243f,
0x244b, 0x245f,
+ 0x26ce, 0x26ce,
+ 0x26e2, 0x26e2,
+ 0x26e4, 0x26e7,
0x2700, 0x2700,
+ 0x2705, 0x2705,
+ 0x270a, 0x270b,
+ 0x2728, 0x2728,
+ 0x274c, 0x274c,
+ 0x274e, 0x274e,
+ 0x2753, 0x2755,
+ 0x275f, 0x2760,
+ 0x2795, 0x2797,
+ 0x27b0, 0x27b0,
+ 0x27bf, 0x27bf,
+ 0x27cb, 0x27cb,
+ 0x27cd, 0x27cf,
0x2b4d, 0x2b4f,
0x2b5a, 0x2bff,
0x2c2f, 0x2c2f,
0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
+ 0x2cf2, 0x2cf8,
+ 0x2d26, 0x2d2f,
+ 0x2d66, 0x2d6e,
+ 0x2d70, 0x2d7f,
0x2d97, 0x2d9f,
0x2da7, 0x2da7,
0x2daf, 0x2daf,
@@ -5677,7 +853,7 @@ static const OnigCodePoint CR_Cn[] = {
0x2dcf, 0x2dcf,
0x2dd7, 0x2dd7,
0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
+ 0x2e32, 0x2e7f,
0x2e9a, 0x2e9a,
0x2ef4, 0x2eff,
0x2fd6, 0x2fef,
@@ -5687,20 +863,20 @@ static const OnigCodePoint CR_Cn[] = {
0x3100, 0x3104,
0x312e, 0x3130,
0x318f, 0x318f,
- 0x31bb, 0x31bf,
+ 0x31b8, 0x31bf,
0x31e4, 0x31ef,
0x321f, 0x321f,
0x32ff, 0x32ff,
0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
+ 0x9fcc, 0x9fff,
0xa48d, 0xa48f,
0xa4c7, 0xa4cf,
0xa62c, 0xa63f,
- 0xa698, 0xa69e,
+ 0xa660, 0xa661,
+ 0xa674, 0xa67b,
+ 0xa698, 0xa69f,
0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
+ 0xa78d, 0xa7fa,
0xa82c, 0xa82f,
0xa83a, 0xa83f,
0xa878, 0xa87f,
@@ -5717,17 +893,13 @@ static const OnigCodePoint CR_Cn[] = {
0xaa5a, 0xaa5b,
0xaa7c, 0xaa7f,
0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
+ 0xaae0, 0xabbf,
0xabee, 0xabef,
0xabfa, 0xabff,
0xd7a4, 0xd7af,
0xd7c7, 0xd7ca,
0xd7fc, 0xd7ff,
+ 0xfa2e, 0xfa2f,
0xfa6e, 0xfa6f,
0xfada, 0xfaff,
0xfb07, 0xfb12,
@@ -5737,7 +909,7 @@ static const OnigCodePoint CR_Cn[] = {
0xfb3f, 0xfb3f,
0xfb42, 0xfb42,
0xfb45, 0xfb45,
- 0xfbc2, 0xfbd2,
+ 0xfbb2, 0xfbd2,
0xfd40, 0xfd4f,
0xfd90, 0xfd91,
0xfdc8, 0xfdef,
@@ -5789,9 +961,7 @@ static const OnigCodePoint CR_Cn[] = {
0x10860, 0x108ff,
0x1091c, 0x1091e,
0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
+ 0x10940, 0x109ff,
0x10a04, 0x10a04,
0x10a07, 0x10a0b,
0x10a14, 0x10a14,
@@ -5806,27 +976,12 @@ static const OnigCodePoint CR_Cn[] = {
0x10b73, 0x10b77,
0x10b80, 0x10bff,
0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
+ 0x10e7f, 0x1107f,
+ 0x110c2, 0x11fff,
0x1236f, 0x123ff,
0x12463, 0x1246f,
0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 0x1cfff,
+ 0x1342f, 0x1cfff,
0x1d0f6, 0x1d0ff,
0x1d127, 0x1d128,
0x1d1de, 0x1d1ff,
@@ -5853,76 +1008,29 @@ static const OnigCodePoint CR_Cn[] = {
0x1d551, 0x1d551,
0x1d6a6, 0x1d6a7,
0x1d7cc, 0x1d7cd,
- 0x1d800, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
+ 0x1d800, 0x1efff,
0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
+ 0x1f094, 0x1f0ff,
0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
+ 0x1f12f, 0x1f130,
+ 0x1f132, 0x1f13c,
+ 0x1f13e, 0x1f13e,
+ 0x1f140, 0x1f141,
+ 0x1f143, 0x1f145,
+ 0x1f147, 0x1f149,
+ 0x1f14f, 0x1f156,
+ 0x1f158, 0x1f15e,
+ 0x1f160, 0x1f178,
+ 0x1f17a, 0x1f17a,
+ 0x1f17d, 0x1f17e,
+ 0x1f180, 0x1f189,
+ 0x1f18e, 0x1f18f,
+ 0x1f191, 0x1f1ff,
+ 0x1f201, 0x1f20f,
+ 0x1f232, 0x1f23f,
+ 0x1f249, 0x1ffff,
0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
+ 0x2b735, 0x2f7ff,
0x2fa1e, 0xe0000,
0xe0002, 0xe001f,
0xe0080, 0xe00ff,
@@ -5947,7 +1055,7 @@ static const OnigCodePoint CR_Cs[] = {
/* 'L': Major Category */
static const OnigCodePoint CR_L[] = {
- 486,
+ 422,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -5969,13 +1077,13 @@ static const OnigCodePoint CR_L[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -5994,14 +1102,11 @@ static const OnigCodePoint CR_L[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -6070,12 +1175,11 @@ static const OnigCodePoint CR_L[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -6102,11 +1206,11 @@ static const OnigCodePoint CR_L[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -6117,10 +1221,9 @@ static const OnigCodePoint CR_L[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -6167,13 +1270,11 @@ static const OnigCodePoint CR_L[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -6196,7 +1297,7 @@ static const OnigCodePoint CR_L[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -6215,11 +1316,8 @@ static const OnigCodePoint CR_L[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -6240,24 +1338,23 @@ static const OnigCodePoint CR_L[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6e5,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -6282,18 +1379,12 @@ static const OnigCodePoint CR_L[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -6342,8 +1433,6 @@ static const OnigCodePoint CR_L[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -6353,20 +1442,9 @@ static const OnigCodePoint CR_L[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -6397,168 +1475,18 @@ static const OnigCodePoint CR_L[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_L */
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
- 113,
- 0x0041, 0x005a,
- 0x0061, 0x007a,
- 0x00b5, 0x00b5,
- 0x00c0, 0x00d6,
- 0x00d8, 0x00f6,
- 0x00f8, 0x01ba,
- 0x01bc, 0x01bf,
- 0x01c4, 0x0293,
- 0x0295, 0x02af,
- 0x0370, 0x0373,
- 0x0376, 0x0377,
- 0x037b, 0x037d,
- 0x0386, 0x0386,
- 0x0388, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03f5,
- 0x03f7, 0x0481,
- 0x048a, 0x0527,
- 0x0531, 0x0556,
- 0x0561, 0x0587,
- 0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
- 0x1d79, 0x1d9a,
- 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,
- 0x2102, 0x2102,
- 0x2107, 0x2107,
- 0x210a, 0x2113,
- 0x2115, 0x2115,
- 0x2119, 0x211d,
- 0x2124, 0x2124,
- 0x2126, 0x2126,
- 0x2128, 0x2128,
- 0x212a, 0x212d,
- 0x212f, 0x2134,
- 0x2139, 0x2139,
- 0x213c, 0x213f,
- 0x2145, 0x2149,
- 0x214e, 0x214e,
- 0x2183, 0x2184,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c7b,
- 0x2c7e, 0x2ce4,
- 0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
- 0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
- 0xa680, 0xa697,
- 0xa722, 0xa76f,
- 0xa771, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7fa, 0xa7fa,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xff21, 0xff3a,
- 0xff41, 0xff5a,
- 0x10400, 0x1044f,
- 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,
-}; /* CR_LC */
-
/* 'Ll': General Category */
static const OnigCodePoint CR_Ll[] = {
- 611,
+ 599,
0x0061, 0x007a,
+ 0x00aa, 0x00aa,
0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
0x00df, 0x00f6,
0x00f8, 0x00ff,
0x0101, 0x0101,
@@ -6821,10 +1749,9 @@ static const OnigCodePoint CR_Ll[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d00, 0x1d2b,
- 0x1d6b, 0x1d77,
+ 0x1d62, 0x1d77,
0x1d79, 0x1d9a,
0x1e01, 0x1e01,
0x1e03, 0x1e03,
@@ -6988,7 +1915,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2c6c, 0x2c6c,
0x2c71, 0x2c71,
0x2c73, 0x2c74,
- 0x2c76, 0x2c7b,
+ 0x2c76, 0x2c7c,
0x2c81, 0x2c81,
0x2c83, 0x2c83,
0x2c85, 0x2c85,
@@ -7041,10 +1968,7 @@ static const OnigCodePoint CR_Ll[] = {
0x2ce3, 0x2ce4,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -7061,7 +1985,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -7127,15 +2050,6 @@ static const OnigCodePoint CR_Ll[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa78e, 0xa78e,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
- 0xa7fa, 0xa7fa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -7172,7 +2086,7 @@ static const OnigCodePoint CR_Ll[] = {
/* 'Lm': General Category */
static const OnigCodePoint CR_Lm[] = {
- 52,
+ 49,
0x02b0, 0x02c1,
0x02c6, 0x02d1,
0x02e0, 0x02e4,
@@ -7196,13 +2110,13 @@ static const OnigCodePoint CR_Lm[] = {
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c78, 0x1c7d,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
- 0x2c7c, 0x2c7d,
+ 0x2090, 0x2094,
+ 0x2c7d, 0x2c7d,
0x2d6f, 0x2d6f,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
@@ -7217,27 +2131,22 @@ static const OnigCodePoint CR_Lm[] = {
0xa717, 0xa71f,
0xa770, 0xa770,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
0xff9e, 0xff9f,
- 0x16f93, 0x16f9f,
}; /* CR_Lm */
/* 'Lo': General Category */
static const OnigCodePoint CR_Lo[] = {
- 371,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 311,
0x01bb, 0x01bb,
0x01c0, 0x01c3,
0x0294, 0x0294,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
@@ -7251,14 +2160,11 @@ static const OnigCodePoint CR_Lo[] = {
0x07b1, 0x07b1,
0x07ca, 0x07ea,
0x0800, 0x0815,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0972, 0x0977,
+ 0x0972, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -7327,12 +2233,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -7358,11 +2263,11 @@ static const OnigCodePoint CR_Lo[] = {
0x0eb2, 0x0eb3,
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -7373,7 +2278,7 @@ static const OnigCodePoint CR_Lo[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10d0, 0x10fa,
- 0x10fd, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -7419,15 +2324,13 @@ static const OnigCodePoint CR_Lo[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c77,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x2135, 0x2138,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -7445,10 +2348,10 @@ static const OnigCodePoint CR_Lo[] = {
0x30ff, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa014,
0xa016, 0xa48c,
0xa4d0, 0xa4f7,
@@ -7482,18 +2385,12 @@ static const OnigCodePoint CR_Lo[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadc,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf2,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb1d, 0xfb1d,
0xfb1f, 0xfb28,
@@ -7540,8 +2437,6 @@ static const OnigCodePoint CR_Lo[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -7551,55 +2446,11 @@ static const OnigCodePoint CR_Lo[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x1b000, 0x1b001,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Lo */
@@ -7620,7 +2471,7 @@ static const OnigCodePoint CR_Lt[] = {
/* 'Lu': General Category */
static const OnigCodePoint CR_Lu[] = {
- 608,
+ 594,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -7886,11 +2737,8 @@ static const OnigCodePoint CR_Lu[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -8105,7 +2953,6 @@ static const OnigCodePoint CR_Lu[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -8122,7 +2969,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -8187,15 +3033,6 @@ static const OnigCodePoint CR_Lu[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
0x1d400, 0x1d419,
@@ -8233,7 +3070,7 @@ static const OnigCodePoint CR_Lu[] = {
/* 'M': Major Category */
static const OnigCodePoint CR_M[] = {
- 204,
+ 188,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -8242,10 +3079,10 @@ static const OnigCodePoint CR_M[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -8256,12 +3093,10 @@ static const OnigCodePoint CR_M[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093c,
- 0x093e, 0x094f,
- 0x0951, 0x0957,
+ 0x093c, 0x093c,
+ 0x093e, 0x094e,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09bc, 0x09bc,
@@ -8335,7 +3170,7 @@ static const OnigCodePoint CR_M[] = {
0x0f3e, 0x0f3f,
0x0f71, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102b, 0x103e,
@@ -8347,12 +3182,12 @@ static const OnigCodePoint CR_M[] = {
0x1082, 0x108d,
0x108f, 0x108f,
0x109a, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17d3,
+ 0x17b6, 0x17d3,
0x17dd, 0x17dd,
0x180b, 0x180d,
0x18a9, 0x18a9,
@@ -8368,24 +3203,21 @@ static const OnigCodePoint CR_M[] = {
0x1b34, 0x1b44,
0x1b6b, 0x1b73,
0x1b80, 0x1b82,
- 0x1ba1, 0x1bad,
- 0x1be6, 0x1bf3,
+ 0x1ba1, 0x1baa,
0x1c24, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf2, 0x1cf4,
+ 0x1cf2, 0x1cf2,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8407,8 +3239,6 @@ static const OnigCodePoint CR_M[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf6,
0xabe3, 0xabea,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
@@ -8420,17 +3250,8 @@ static const OnigCodePoint CR_M[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11000, 0x11002,
- 0x11038, 0x11046,
0x11080, 0x11082,
0x110b0, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x11134,
- 0x11180, 0x11182,
- 0x111b3, 0x111c0,
- 0x116ab, 0x116b7,
- 0x16f51, 0x16f7e,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -8442,12 +3263,11 @@ static const OnigCodePoint CR_M[] = {
/* 'Mc': General Category */
static const OnigCodePoint CR_Mc[] = {
- 126,
+ 106,
0x0903, 0x0903,
- 0x093b, 0x093b,
0x093e, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x094f,
+ 0x094e, 0x094e,
0x0982, 0x0983,
0x09be, 0x09c0,
0x09c7, 0x09c8,
@@ -8524,16 +3344,10 @@ static const OnigCodePoint CR_Mc[] = {
0x1ba1, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
0x1c24, 0x1c2b,
0x1c34, 0x1c35,
0x1ce1, 0x1ce1,
- 0x1cf2, 0x1cf3,
- 0x302e, 0x302f,
+ 0x1cf2, 0x1cf2,
0xa823, 0xa824,
0xa827, 0xa827,
0xa880, 0xa881,
@@ -8547,34 +3361,22 @@ static const OnigCodePoint CR_Mc[] = {
0xaa33, 0xaa34,
0xaa4d, 0xaa4d,
0xaa7b, 0xaa7b,
- 0xaaeb, 0xaaeb,
- 0xaaee, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabea,
0xabec, 0xabec,
- 0x11000, 0x11000,
- 0x11002, 0x11002,
0x11082, 0x11082,
0x110b0, 0x110b2,
0x110b7, 0x110b8,
- 0x1112c, 0x1112c,
- 0x11182, 0x11182,
- 0x111b3, 0x111b5,
- 0x111bf, 0x111c0,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x16f51, 0x16f7e,
0x1d165, 0x1d166,
0x1d16d, 0x1d172,
}; /* CR_Mc */
/* 'Me': General Category */
static const OnigCodePoint CR_Me[] = {
- 4,
+ 5,
0x0488, 0x0489,
+ 0x06de, 0x06de,
0x20dd, 0x20e0,
0x20e2, 0x20e4,
0xa670, 0xa672,
@@ -8582,7 +3384,7 @@ static const OnigCodePoint CR_Me[] = {
/* 'Mn': General Category */
static const OnigCodePoint CR_Mn[] = {
- 220,
+ 194,
0x0300, 0x036f,
0x0483, 0x0487,
0x0591, 0x05bd,
@@ -8591,7 +3393,7 @@ static const OnigCodePoint CR_Mn[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06df, 0x06e4,
@@ -8605,14 +3407,11 @@ static const OnigCodePoint CR_Mn[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -8673,7 +3472,7 @@ static const OnigCodePoint CR_Mn[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -8687,12 +3486,11 @@ static const OnigCodePoint CR_Mn[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -8720,31 +3518,23 @@ static const OnigCodePoint CR_Mn[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa66f,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -8768,8 +3558,6 @@ static const OnigCodePoint CR_Mn[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -8782,21 +3570,9 @@ static const OnigCodePoint CR_Mn[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d167, 0x1d169,
0x1d17b, 0x1d182,
0x1d185, 0x1d18b,
@@ -8807,7 +3583,7 @@ static const OnigCodePoint CR_Mn[] = {
/* 'N': Major Category */
static const OnigCodePoint CR_N[] = {
- 88,
+ 81,
0x0030, 0x0039,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
@@ -8821,7 +3597,6 @@ static const OnigCodePoint CR_N[] = {
0x0a66, 0x0a6f,
0x0ae6, 0x0aef,
0x0b66, 0x0b6f,
- 0x0b72, 0x0b77,
0x0be6, 0x0bf2,
0x0c66, 0x0c6f,
0x0c78, 0x0c7e,
@@ -8859,7 +3634,6 @@ static const OnigCodePoint CR_N[] = {
0x3038, 0x303a,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8887,11 +3661,6 @@ static const OnigCodePoint CR_N[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x1106f,
- 0x110f0, 0x110f9,
- 0x11136, 0x1113f,
- 0x111d0, 0x111d9,
- 0x116c0, 0x116c9,
0x12400, 0x12462,
0x1d360, 0x1d371,
0x1d7ce, 0x1d7ff,
@@ -8899,7 +3668,46 @@ static const OnigCodePoint CR_N[] = {
}; /* CR_N */
/* 'Nd': General Category */
-#define CR_Nd CR_Digit
+static const OnigCodePoint CR_Nd[] = {
+ 37,
+ 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, 0x19da,
+ 0x1a80, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1b50, 0x1b59,
+ 0x1bb0, 0x1bb9,
+ 0x1c40, 0x1c49,
+ 0x1c50, 0x1c59,
+ 0xa620, 0xa629,
+ 0xa8d0, 0xa8d9,
+ 0xa900, 0xa909,
+ 0xa9d0, 0xa9d9,
+ 0xaa50, 0xaa59,
+ 0xabf0, 0xabf9,
+ 0xff10, 0xff19,
+ 0x104a0, 0x104a9,
+ 0x1d7ce, 0x1d7ff,
+}; /* CR_Nd */
/* 'Nl': General Category */
static const OnigCodePoint CR_Nl[] = {
@@ -8920,19 +3728,17 @@ static const OnigCodePoint CR_Nl[] = {
/* 'No': General Category */
static const OnigCodePoint CR_No[] = {
- 42,
+ 38,
0x00b2, 0x00b3,
0x00b9, 0x00b9,
0x00bc, 0x00be,
0x09f4, 0x09f9,
- 0x0b72, 0x0b77,
0x0bf0, 0x0bf2,
0x0c78, 0x0c7e,
0x0d70, 0x0d75,
0x0f2a, 0x0f33,
0x1369, 0x137c,
0x17f0, 0x17f9,
- 0x19da, 0x19da,
0x2070, 0x2070,
0x2074, 0x2079,
0x2080, 0x2089,
@@ -8944,7 +3750,6 @@ static const OnigCodePoint CR_No[] = {
0x2cfd, 0x2cfd,
0x3192, 0x3195,
0x3220, 0x3229,
- 0x3248, 0x324f,
0x3251, 0x325f,
0x3280, 0x3289,
0x32b1, 0x32bf,
@@ -8960,13 +3765,143 @@ static const OnigCodePoint CR_No[] = {
0x10b58, 0x10b5f,
0x10b78, 0x10b7f,
0x10e60, 0x10e7e,
- 0x11052, 0x11065,
0x1d360, 0x1d371,
0x1f100, 0x1f10a,
}; /* CR_No */
/* 'P': Major Category */
-#define CR_P CR_Punct
+static const OnigCodePoint CR_P[] = {
+ 129,
+ 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,
+ 0x0830, 0x083e,
+ 0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0df4, 0x0df4,
+ 0x0e4f, 0x0e4f,
+ 0x0e5a, 0x0e5b,
+ 0x0f04, 0x0f12,
+ 0x0f3a, 0x0f3d,
+ 0x0f85, 0x0f85,
+ 0x0fd0, 0x0fd4,
+ 0x104a, 0x104f,
+ 0x10fb, 0x10fb,
+ 0x1361, 0x1368,
+ 0x1400, 0x1400,
+ 0x166d, 0x166e,
+ 0x169b, 0x169c,
+ 0x16eb, 0x16ed,
+ 0x1735, 0x1736,
+ 0x17d4, 0x17d6,
+ 0x17d8, 0x17da,
+ 0x1800, 0x180a,
+ 0x1944, 0x1945,
+ 0x19de, 0x19df,
+ 0x1a1e, 0x1a1f,
+ 0x1aa0, 0x1aa6,
+ 0x1aa8, 0x1aad,
+ 0x1b5a, 0x1b60,
+ 0x1c3b, 0x1c3f,
+ 0x1c7e, 0x1c7f,
+ 0x1cd3, 0x1cd3,
+ 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, 0x2e31,
+ 0x3001, 0x3003,
+ 0x3008, 0x3011,
+ 0x3014, 0x301f,
+ 0x3030, 0x3030,
+ 0x303d, 0x303d,
+ 0x30a0, 0x30a0,
+ 0x30fb, 0x30fb,
+ 0xa4fe, 0xa4ff,
+ 0xa60d, 0xa60f,
+ 0xa673, 0xa673,
+ 0xa67e, 0xa67e,
+ 0xa6f2, 0xa6f7,
+ 0xa874, 0xa877,
+ 0xa8ce, 0xa8cf,
+ 0xa8f8, 0xa8fa,
+ 0xa92e, 0xa92f,
+ 0xa95f, 0xa95f,
+ 0xa9c1, 0xa9cd,
+ 0xa9de, 0xa9df,
+ 0xaa5c, 0xaa5f,
+ 0xaade, 0xaadf,
+ 0xabeb, 0xabeb,
+ 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,
+ 0x10857, 0x10857,
+ 0x1091f, 0x1091f,
+ 0x1093f, 0x1093f,
+ 0x10a50, 0x10a58,
+ 0x10a7f, 0x10a7f,
+ 0x10b39, 0x10b3f,
+ 0x110bb, 0x110bc,
+ 0x110be, 0x110c1,
+ 0x12470, 0x12473,
+}; /* CR_P */
/* 'Pc': General Category */
static const OnigCodePoint CR_Pc[] = {
@@ -8981,7 +3916,7 @@ static const OnigCodePoint CR_Pc[] = {
/* 'Pd': General Category */
static const OnigCodePoint CR_Pd[] = {
- 16,
+ 15,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -8990,7 +3925,6 @@ static const OnigCodePoint CR_Pd[] = {
0x2010, 0x2015,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -9108,7 +4042,7 @@ static const OnigCodePoint CR_Pi[] = {
/* 'Po': General Category */
static const OnigCodePoint CR_Po[] = {
- 135,
+ 124,
0x0021, 0x0023,
0x0025, 0x0027,
0x002a, 0x002a,
@@ -9118,8 +4052,7 @@ static const OnigCodePoint CR_Po[] = {
0x003f, 0x0040,
0x005c, 0x005c,
0x00a1, 0x00a1,
- 0x00a7, 0x00a7,
- 0x00b6, 0x00b7,
+ 0x00b7, 0x00b7,
0x00bf, 0x00bf,
0x037e, 0x037e,
0x0387, 0x0387,
@@ -9138,21 +4071,17 @@ static const OnigCodePoint CR_Po[] = {
0x0700, 0x070d,
0x07f7, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0970, 0x0970,
- 0x0af0, 0x0af0,
0x0df4, 0x0df4,
0x0e4f, 0x0e4f,
0x0e5a, 0x0e5b,
0x0f04, 0x0f12,
- 0x0f14, 0x0f14,
0x0f85, 0x0f85,
0x0fd0, 0x0fd4,
- 0x0fd9, 0x0fda,
0x104a, 0x104f,
0x10fb, 0x10fb,
- 0x1360, 0x1368,
+ 0x1361, 0x1368,
0x166d, 0x166e,
0x16eb, 0x16ed,
0x1735, 0x1736,
@@ -9161,14 +4090,13 @@ static const OnigCodePoint CR_Po[] = {
0x1800, 0x1805,
0x1807, 0x180a,
0x1944, 0x1945,
+ 0x19de, 0x19df,
0x1a1e, 0x1a1f,
0x1aa0, 0x1aa6,
0x1aa8, 0x1aad,
0x1b5a, 0x1b60,
- 0x1bfc, 0x1bff,
0x1c3b, 0x1c3f,
0x1c7e, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x2016, 0x2017,
0x2020, 0x2027,
@@ -9180,7 +4108,6 @@ static const OnigCodePoint CR_Po[] = {
0x2055, 0x205e,
0x2cf9, 0x2cfc,
0x2cfe, 0x2cff,
- 0x2d70, 0x2d70,
0x2e00, 0x2e01,
0x2e06, 0x2e08,
0x2e0b, 0x2e0b,
@@ -9189,7 +4116,7 @@ static const OnigCodePoint CR_Po[] = {
0x2e1b, 0x2e1b,
0x2e1e, 0x2e1f,
0x2e2a, 0x2e2e,
- 0x2e30, 0x2e39,
+ 0x2e30, 0x2e31,
0x3001, 0x3003,
0x303d, 0x303d,
0x30fb, 0x30fb,
@@ -9207,7 +4134,6 @@ static const OnigCodePoint CR_Po[] = {
0xa9de, 0xa9df,
0xaa5c, 0xaa5f,
0xaade, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe10, 0xfe16,
0xfe19, 0xfe19,
@@ -9229,7 +4155,7 @@ static const OnigCodePoint CR_Po[] = {
0xff3c, 0xff3c,
0xff61, 0xff61,
0xff64, 0xff65,
- 0x10100, 0x10102,
+ 0x10100, 0x10101,
0x1039f, 0x1039f,
0x103d0, 0x103d0,
0x10857, 0x10857,
@@ -9238,11 +4164,8 @@ static const OnigCodePoint CR_Po[] = {
0x10a50, 0x10a58,
0x10a7f, 0x10a7f,
0x10b39, 0x10b3f,
- 0x11047, 0x1104d,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x11140, 0x11143,
- 0x111c5, 0x111c8,
0x12470, 0x12473,
}; /* CR_Po */
@@ -9333,11 +4256,11 @@ static const OnigCodePoint CR_S[] = {
0x0060, 0x0060,
0x007c, 0x007c,
0x007e, 0x007e,
- 0x00a2, 0x00a6,
- 0x00a8, 0x00a9,
+ 0x00a2, 0x00a9,
0x00ac, 0x00ac,
0x00ae, 0x00b1,
0x00b4, 0x00b4,
+ 0x00b6, 0x00b6,
0x00b8, 0x00b8,
0x00d7, 0x00d7,
0x00f7, 0x00f7,
@@ -9350,11 +4273,9 @@ static const OnigCodePoint CR_S[] = {
0x0384, 0x0385,
0x03f6, 0x03f6,
0x0482, 0x0482,
- 0x058f, 0x058f,
0x0606, 0x0608,
0x060b, 0x060b,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9364,11 +4285,11 @@ static const OnigCodePoint CR_S[] = {
0x0b70, 0x0b70,
0x0bf3, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0e3f, 0x0e3f,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9378,10 +4299,11 @@ static const OnigCodePoint CR_S[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x17db, 0x17db,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x1fbd, 0x1fbd,
@@ -9394,7 +4316,7 @@ static const OnigCodePoint CR_S[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
@@ -9410,14 +4332,29 @@ static const OnigCodePoint CR_S[] = {
0x214a, 0x214d,
0x214f, 0x214f,
0x2190, 0x2328,
- 0x232b, 0x23f3,
+ 0x232b, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
- 0x2500, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x2500, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27c4,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x2982,
0x2999, 0x29d7,
0x29dc, 0x29fb,
@@ -9438,8 +4375,7 @@ static const OnigCodePoint CR_S[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9453,7 +4389,6 @@ static const OnigCodePoint CR_S[] = {
0xa836, 0xa839,
0xaa77, 0xaa79,
0xfb29, 0xfb29,
- 0xfbb2, 0xfbc1,
0xfdfc, 0xfdfd,
0xfe62, 0xfe62,
0xfe64, 0xfe66,
@@ -9468,6 +4403,7 @@ static const OnigCodePoint CR_S[] = {
0xffe0, 0xffe6,
0xffe8, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9492,46 +4428,32 @@ static const OnigCodePoint CR_S[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_S */
/* 'Sc': General Category */
static const OnigCodePoint CR_Sc[] = {
- 17,
+ 16,
0x0024, 0x0024,
0x00a2, 0x00a5,
- 0x058f, 0x058f,
0x060b, 0x060b,
0x09f2, 0x09f3,
0x09fb, 0x09fb,
@@ -9539,7 +4461,7 @@ static const OnigCodePoint CR_Sc[] = {
0x0bf9, 0x0bf9,
0x0e3f, 0x0e3f,
0x17db, 0x17db,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0xa838, 0xa838,
0xfdfc, 0xfdfc,
0xfe69, 0xfe69,
@@ -9550,7 +4472,7 @@ static const OnigCodePoint CR_Sc[] = {
/* 'Sk': General Category */
static const OnigCodePoint CR_Sk[] = {
- 27,
+ 26,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -9574,7 +4496,6 @@ static const OnigCodePoint CR_Sk[] = {
0xa700, 0xa716,
0xa720, 0xa721,
0xa789, 0xa78a,
- 0xfbb2, 0xfbc1,
0xff3e, 0xff3e,
0xff40, 0xff40,
0xffe3, 0xffe3,
@@ -9597,7 +4518,6 @@ static const OnigCodePoint CR_Sm[] = {
0x2052, 0x2052,
0x207a, 0x207c,
0x208a, 0x208c,
- 0x2118, 0x2118,
0x2140, 0x2144,
0x214b, 0x214b,
0x2190, 0x2194,
@@ -9620,7 +4540,9 @@ static const OnigCodePoint CR_Sm[] = {
0x25f8, 0x25ff,
0x266f, 0x266f,
0x27c0, 0x27c4,
- 0x27c7, 0x27e5,
+ 0x27c7, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27e5,
0x27f0, 0x27ff,
0x2900, 0x2982,
0x2999, 0x29d7,
@@ -9647,19 +4569,18 @@ static const OnigCodePoint CR_Sm[] = {
0x1d789, 0x1d789,
0x1d7a9, 0x1d7a9,
0x1d7c3, 0x1d7c3,
- 0x1eef0, 0x1eef1,
}; /* CR_Sm */
/* 'So': General Category */
static const OnigCodePoint CR_So[] = {
- 153,
- 0x00a6, 0x00a6,
+ 154,
+ 0x00a6, 0x00a7,
0x00a9, 0x00a9,
0x00ae, 0x00ae,
0x00b0, 0x00b0,
+ 0x00b6, 0x00b6,
0x0482, 0x0482,
0x060e, 0x060f,
- 0x06de, 0x06de,
0x06e9, 0x06e9,
0x06fd, 0x06fe,
0x07f6, 0x07f6,
@@ -9668,10 +4589,10 @@ static const OnigCodePoint CR_So[] = {
0x0bf3, 0x0bf8,
0x0bfa, 0x0bfa,
0x0c7f, 0x0c7f,
+ 0x0cf1, 0x0cf2,
0x0d79, 0x0d79,
0x0f01, 0x0f03,
- 0x0f13, 0x0f13,
- 0x0f15, 0x0f17,
+ 0x0f13, 0x0f17,
0x0f1a, 0x0f1f,
0x0f34, 0x0f34,
0x0f36, 0x0f36,
@@ -9681,16 +4602,17 @@ static const OnigCodePoint CR_So[] = {
0x0fce, 0x0fcf,
0x0fd5, 0x0fd8,
0x109e, 0x109f,
+ 0x1360, 0x1360,
0x1390, 0x1399,
0x1940, 0x1940,
- 0x19de, 0x19ff,
+ 0x19e0, 0x19ff,
0x1b61, 0x1b6a,
0x1b74, 0x1b7c,
0x2100, 0x2101,
0x2103, 0x2106,
0x2108, 0x2109,
0x2114, 0x2114,
- 0x2116, 0x2117,
+ 0x2116, 0x2118,
0x211e, 0x2123,
0x2125, 0x2125,
0x2127, 0x2127,
@@ -9715,7 +4637,7 @@ static const OnigCodePoint CR_So[] = {
0x232b, 0x237b,
0x237d, 0x239a,
0x23b4, 0x23db,
- 0x23e2, 0x23f3,
+ 0x23e2, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
0x249c, 0x24e9,
@@ -9723,9 +4645,21 @@ static const OnigCodePoint CR_So[] = {
0x25b8, 0x25c0,
0x25c2, 0x25f7,
0x2600, 0x266e,
- 0x2670, 0x26ff,
- 0x2701, 0x2767,
- 0x2794, 0x27bf,
+ 0x2670, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2767,
+ 0x2794, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
0x2800, 0x28ff,
0x2b00, 0x2b2f,
0x2b45, 0x2b46,
@@ -9744,8 +4678,7 @@ static const OnigCodePoint CR_So[] = {
0x3196, 0x319f,
0x31c0, 0x31e3,
0x3200, 0x321e,
- 0x322a, 0x3247,
- 0x3250, 0x3250,
+ 0x322a, 0x3250,
0x3260, 0x327f,
0x328a, 0x32b0,
0x32c0, 0x32fe,
@@ -9761,6 +4694,7 @@ static const OnigCodePoint CR_So[] = {
0xffe8, 0xffe8,
0xffed, 0xffee,
0xfffc, 0xfffd,
+ 0x10102, 0x10102,
0x10137, 0x1013f,
0x10179, 0x10189,
0x10190, 0x1019b,
@@ -9777,35 +4711,23 @@ static const OnigCodePoint CR_So[] = {
0x1d300, 0x1d356,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
}; /* CR_So */
/* 'Z': Major Category */
@@ -9849,7 +4771,7 @@ static const OnigCodePoint CR_Zs[] = {
/* 'Math': Derived Property */
static const OnigCodePoint CR_Math[] = {
- 138,
+ 105,
0x002b, 0x002b,
0x003c, 0x003e,
0x005e, 0x005e,
@@ -9877,10 +4799,9 @@ static const OnigCodePoint CR_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
- 0x2118, 0x211d,
+ 0x2119, 0x211d,
0x2124, 0x2124,
0x2128, 0x2129,
0x212c, 0x212d,
@@ -9918,7 +4839,9 @@ static const OnigCodePoint CR_Math[] = {
0x2642, 0x2642,
0x2660, 0x2663,
0x266d, 0x266f,
- 0x27c0, 0x27ff,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2aff,
0x2b30, 0x2b44,
0x2b47, 0x2b4c,
@@ -9954,54 +4877,1698 @@ static const OnigCodePoint CR_Math[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Math */
/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
+static const OnigCodePoint CR_Alphabetic[] = {
+ 474,
+ 0x0041, 0x005a,
+ 0x0061, 0x007a,
+ 0x00aa, 0x00aa,
+ 0x00b5, 0x00b5,
+ 0x00ba, 0x00ba,
+ 0x00c0, 0x00d6,
+ 0x00d8, 0x00f6,
+ 0x00f8, 0x02c1,
+ 0x02c6, 0x02d1,
+ 0x02e0, 0x02e4,
+ 0x02ec, 0x02ec,
+ 0x02ee, 0x02ee,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
+ 0x038c, 0x038c,
+ 0x038e, 0x03a1,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
+ 0x0531, 0x0556,
+ 0x0559, 0x0559,
+ 0x0561, 0x0587,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
+ 0x05d0, 0x05ea,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06ef,
+ 0x06fa, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
+ 0x074d, 0x07b1,
+ 0x07ca, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0971, 0x0972,
+ 0x0979, 0x097f,
+ 0x0981, 0x0983,
+ 0x0985, 0x098c,
+ 0x098f, 0x0990,
+ 0x0993, 0x09a8,
+ 0x09aa, 0x09b0,
+ 0x09b2, 0x09b2,
+ 0x09b6, 0x09b9,
+ 0x09bd, 0x09c4,
+ 0x09c7, 0x09c8,
+ 0x09cb, 0x09cc,
+ 0x09ce, 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,
+ 0x0a3e, 0x0a42,
+ 0x0a47, 0x0a48,
+ 0x0a4b, 0x0a4c,
+ 0x0a51, 0x0a51,
+ 0x0a59, 0x0a5c,
+ 0x0a5e, 0x0a5e,
+ 0x0a70, 0x0a75,
+ 0x0a81, 0x0a83,
+ 0x0a85, 0x0a8d,
+ 0x0a8f, 0x0a91,
+ 0x0a93, 0x0aa8,
+ 0x0aaa, 0x0ab0,
+ 0x0ab2, 0x0ab3,
+ 0x0ab5, 0x0ab9,
+ 0x0abd, 0x0ac5,
+ 0x0ac7, 0x0ac9,
+ 0x0acb, 0x0acc,
+ 0x0ad0, 0x0ad0,
+ 0x0ae0, 0x0ae3,
+ 0x0b01, 0x0b03,
+ 0x0b05, 0x0b0c,
+ 0x0b0f, 0x0b10,
+ 0x0b13, 0x0b28,
+ 0x0b2a, 0x0b30,
+ 0x0b32, 0x0b33,
+ 0x0b35, 0x0b39,
+ 0x0b3d, 0x0b44,
+ 0x0b47, 0x0b48,
+ 0x0b4b, 0x0b4c,
+ 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, 0x0bcc,
+ 0x0bd0, 0x0bd0,
+ 0x0bd7, 0x0bd7,
+ 0x0c01, 0x0c03,
+ 0x0c05, 0x0c0c,
+ 0x0c0e, 0x0c10,
+ 0x0c12, 0x0c28,
+ 0x0c2a, 0x0c33,
+ 0x0c35, 0x0c39,
+ 0x0c3d, 0x0c44,
+ 0x0c46, 0x0c48,
+ 0x0c4a, 0x0c4c,
+ 0x0c55, 0x0c56,
+ 0x0c58, 0x0c59,
+ 0x0c60, 0x0c63,
+ 0x0c82, 0x0c83,
+ 0x0c85, 0x0c8c,
+ 0x0c8e, 0x0c90,
+ 0x0c92, 0x0ca8,
+ 0x0caa, 0x0cb3,
+ 0x0cb5, 0x0cb9,
+ 0x0cbd, 0x0cc4,
+ 0x0cc6, 0x0cc8,
+ 0x0cca, 0x0ccc,
+ 0x0cd5, 0x0cd6,
+ 0x0cde, 0x0cde,
+ 0x0ce0, 0x0ce3,
+ 0x0d02, 0x0d03,
+ 0x0d05, 0x0d0c,
+ 0x0d0e, 0x0d10,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
+ 0x0d3d, 0x0d44,
+ 0x0d46, 0x0d48,
+ 0x0d4a, 0x0d4c,
+ 0x0d57, 0x0d57,
+ 0x0d60, 0x0d63,
+ 0x0d7a, 0x0d7f,
+ 0x0d82, 0x0d83,
+ 0x0d85, 0x0d96,
+ 0x0d9a, 0x0db1,
+ 0x0db3, 0x0dbb,
+ 0x0dbd, 0x0dbd,
+ 0x0dc0, 0x0dc6,
+ 0x0dcf, 0x0dd4,
+ 0x0dd6, 0x0dd6,
+ 0x0dd8, 0x0ddf,
+ 0x0df2, 0x0df3,
+ 0x0e01, 0x0e3a,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 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,
+ 0x0ecd, 0x0ecd,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f40, 0x0f47,
+ 0x0f49, 0x0f6c,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
+ 0x0f99, 0x0fbc,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x103f,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 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, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
+ 0x1700, 0x170c,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
+ 0x1740, 0x1753,
+ 0x1760, 0x176c,
+ 0x176e, 0x1770,
+ 0x1772, 0x1773,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
+ 0x1820, 0x1877,
+ 0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
+ 0x1900, 0x191c,
+ 0x1920, 0x192b,
+ 0x1930, 0x1938,
+ 0x1950, 0x196d,
+ 0x1970, 0x1974,
+ 0x1980, 0x19ab,
+ 0x19b0, 0x19c9,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1baf,
+ 0x1c00, 0x1c35,
+ 0x1c4d, 0x1c4f,
+ 0x1c5a, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
+ 0x2c00, 0x2c2e,
+ 0x2c30, 0x2c5e,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 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, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
+ 0x3041, 0x3096,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
+ 0x3105, 0x312d,
+ 0x3131, 0x318e,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
+ 0xa000, 0xa48c,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa61f,
+ 0xa62a, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa90a, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
+ 0xa9cf, 0xa9cf,
+ 0xaa00, 0xaa36,
+ 0xaa40, 0xaa4d,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xac00, 0xd7a3,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
+ 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,
+ 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,
+ 0x10140, 0x10174,
+ 0x10280, 0x1029c,
+ 0x102a0, 0x102d0,
+ 0x10300, 0x1031e,
+ 0x10330, 0x1034a,
+ 0x10380, 0x1039d,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
+ 0x10400, 0x1049d,
+ 0x10800, 0x10805,
+ 0x10808, 0x10808,
+ 0x1080a, 0x10835,
+ 0x10837, 0x10838,
+ 0x1083c, 0x1083c,
+ 0x1083f, 0x10855,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
+ 0x10a00, 0x10a03,
+ 0x10a05, 0x10a06,
+ 0x10a0c, 0x10a13,
+ 0x10a15, 0x10a17,
+ 0x10a19, 0x10a33,
+ 0x10a60, 0x10a7c,
+ 0x10b00, 0x10b35,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
+ 0x10c00, 0x10c48,
+ 0x11082, 0x110b8,
+ 0x12000, 0x1236e,
+ 0x12400, 0x12462,
+ 0x13000, 0x1342e,
+ 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, 0x2a6d6,
+ 0x2a700, 0x2b734,
+ 0x2f800, 0x2fa1d,
+}; /* CR_Alphabetic */
/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
+static const OnigCodePoint CR_Lowercase[] = {
+ 602,
+ 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, 0x02b8,
+ 0x02c0, 0x02c1,
+ 0x02e0, 0x02e4,
+ 0x0345, 0x0345,
+ 0x0371, 0x0371,
+ 0x0373, 0x0373,
+ 0x0377, 0x0377,
+ 0x037a, 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,
+ 0x0525, 0x0525,
+ 0x0561, 0x0587,
+ 0x1d00, 0x1dbf,
+ 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,
+ 0x2090, 0x2094,
+ 0x210a, 0x210a,
+ 0x210e, 0x210f,
+ 0x2113, 0x2113,
+ 0x212f, 0x212f,
+ 0x2134, 0x2134,
+ 0x2139, 0x2139,
+ 0x213c, 0x213d,
+ 0x2146, 0x2149,
+ 0x214e, 0x214e,
+ 0x2170, 0x217f,
+ 0x2184, 0x2184,
+ 0x24d0, 0x24e9,
+ 0x2c30, 0x2c5e,
+ 0x2c61, 0x2c61,
+ 0x2c65, 0x2c66,
+ 0x2c68, 0x2c68,
+ 0x2c6a, 0x2c6a,
+ 0x2c6c, 0x2c6c,
+ 0x2c71, 0x2c71,
+ 0x2c73, 0x2c74,
+ 0x2c76, 0x2c7d,
+ 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,
+ 0x2cec, 0x2cec,
+ 0x2cee, 0x2cee,
+ 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, 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_Lowercase */
/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
+static const OnigCodePoint CR_Uppercase[] = {
+ 596,
+ 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,
+ 0x0524, 0x0524,
+ 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,
+ 0x2160, 0x216f,
+ 0x2183, 0x2183,
+ 0x24b6, 0x24cf,
+ 0x2c00, 0x2c2e,
+ 0x2c60, 0x2c60,
+ 0x2c62, 0x2c64,
+ 0x2c67, 0x2c67,
+ 0x2c69, 0x2c69,
+ 0x2c6b, 0x2c6b,
+ 0x2c6d, 0x2c70,
+ 0x2c72, 0x2c72,
+ 0x2c75, 0x2c75,
+ 0x2c7e, 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,
+ 0x2ceb, 0x2ceb,
+ 0x2ced, 0x2ced,
+ 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_Uppercase */
/* 'Cased': Derived Property */
static const OnigCodePoint CR_Cased[] = {
- 119,
+ 110,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -10025,12 +6592,10 @@ static const OnigCodePoint CR_Cased[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -10051,9 +6616,7 @@ static const OnigCodePoint CR_Cased[] = {
0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffc,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -10075,17 +6638,12 @@ static const OnigCodePoint CR_Cased[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7fa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -10125,7 +6683,7 @@ static const OnigCodePoint CR_Cased[] = {
/* 'Case_Ignorable': Derived Property */
static const OnigCodePoint CR_Case_Ignorable[] = {
- 295,
+ 266,
0x0027, 0x0027,
0x002e, 0x002e,
0x003a, 0x003a,
@@ -10149,13 +6707,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x05f4, 0x05f4,
- 0x0600, 0x0604,
+ 0x0600, 0x0603,
0x0610, 0x061a,
0x0640, 0x0640,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
- 0x06d6, 0x06dd,
- 0x06df, 0x06e8,
+ 0x06d6, 0x06e8,
0x06ea, 0x06ed,
0x070f, 0x070f,
0x0711, 0x0711,
@@ -10164,14 +6721,11 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x07eb, 0x07f5,
0x07fa, 0x07fa,
0x0816, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0971, 0x0971,
0x0981, 0x0981,
@@ -10234,7 +6788,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -10249,7 +6803,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x108d, 0x108d,
0x109d, 0x109d,
0x10fc, 0x10fc,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
@@ -10285,11 +6839,6 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
@@ -10297,11 +6846,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x1fbd, 0x1fbd,
0x1fbf, 0x1fc1,
0x1fcd, 0x1fcf,
@@ -10317,16 +6865,15 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x206a, 0x206f,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0x2cef, 0x2cf1,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x2e2f, 0x2e2f,
0x3005, 0x3005,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3031, 0x3035,
0x303b, 0x303b,
0x3099, 0x309e,
@@ -10335,14 +6882,12 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xa4f8, 0xa4fd,
0xa60c, 0xa60c,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
+ 0xa67c, 0xa67d,
0xa67f, 0xa67f,
- 0xa69f, 0xa69f,
0xa6f0, 0xa6f1,
0xa700, 0xa721,
0xa770, 0xa770,
0xa788, 0xa78a,
- 0xa7f8, 0xa7f9,
0xa802, 0xa802,
0xa806, 0xa806,
0xa80b, 0xa80b,
@@ -10368,14 +6913,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0xaabe, 0xaabf,
0xaac1, 0xaac1,
0xaadd, 0xaadd,
- 0xaaec, 0xaaed,
- 0xaaf3, 0xaaf4,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
0xfb1e, 0xfb1e,
- 0xfbb2, 0xfbc1,
0xfe00, 0xfe0f,
0xfe13, 0xfe13,
0xfe20, 0xfe26,
@@ -10397,22 +6938,10 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
0x110bd, 0x110bd,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d173, 0x1d182,
0x1d185, 0x1d18b,
@@ -10425,7 +6954,7 @@ static const OnigCodePoint CR_Case_Ignorable[] = {
/* 'Changes_When_Lowercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Lowercased[] = {
- 571,
+ 557,
0x0041, 0x005a,
0x00c0, 0x00d6,
0x00d8, 0x00de,
@@ -10690,11 +7219,8 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -10904,7 +7430,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -10921,7 +7446,6 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -10986,22 +7510,13 @@ static const OnigCodePoint CR_Changes_When_Lowercased[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xff21, 0xff3a,
0x10400, 0x10427,
}; /* CR_Changes_When_Lowercased */
/* 'Changes_When_Uppercased': Derived Property */
static const OnigCodePoint CR_Changes_When_Uppercased[] = {
- 586,
+ 573,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11151,7 +7666,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11281,7 +7795,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -11492,10 +8005,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -11512,7 +8022,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -11577,13 +8086,6 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -11592,7 +8094,7 @@ static const OnigCodePoint CR_Changes_When_Uppercased[] = {
/* 'Changes_When_Titlecased': Derived Property */
static const OnigCodePoint CR_Changes_When_Titlecased[] = {
- 587,
+ 574,
0x0061, 0x007a,
0x00b5, 0x00b5,
0x00df, 0x00f6,
@@ -11743,7 +8245,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -11873,7 +8374,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x0521, 0x0521,
0x0523, 0x0523,
0x0525, 0x0525,
- 0x0527, 0x0527,
0x0561, 0x0587,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
@@ -12084,10 +8584,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0x2ce3, 0x2ce3,
0x2cec, 0x2cec,
0x2cee, 0x2cee,
- 0x2cf3, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
0xa641, 0xa641,
0xa643, 0xa643,
0xa645, 0xa645,
@@ -12104,7 +8601,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa65b, 0xa65b,
0xa65d, 0xa65d,
0xa65f, 0xa65f,
- 0xa661, 0xa661,
0xa663, 0xa663,
0xa665, 0xa665,
0xa667, 0xa667,
@@ -12169,13 +8665,6 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
0xa785, 0xa785,
0xa787, 0xa787,
0xa78c, 0xa78c,
- 0xa791, 0xa791,
- 0xa793, 0xa793,
- 0xa7a1, 0xa7a1,
- 0xa7a3, 0xa7a3,
- 0xa7a5, 0xa7a5,
- 0xa7a7, 0xa7a7,
- 0xa7a9, 0xa7a9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff41, 0xff5a,
@@ -12184,7 +8673,7 @@ static const OnigCodePoint CR_Changes_When_Titlecased[] = {
/* 'Changes_When_Casefolded': Derived Property */
static const OnigCodePoint CR_Changes_When_Casefolded[] = {
- 582,
+ 568,
0x0041, 0x005a,
0x00b5, 0x00b5,
0x00c0, 0x00d6,
@@ -12455,12 +8944,9 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x0520, 0x0520,
0x0522, 0x0522,
0x0524, 0x0524,
- 0x0526, 0x0526,
0x0531, 0x0556,
0x0587, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1e00, 0x1e00,
0x1e02, 0x1e02,
0x1e04, 0x1e04,
@@ -12672,7 +9158,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0x2ce2, 0x2ce2,
0x2ceb, 0x2ceb,
0x2ced, 0x2ced,
- 0x2cf2, 0x2cf2,
0xa640, 0xa640,
0xa642, 0xa642,
0xa644, 0xa644,
@@ -12689,7 +9174,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa65a, 0xa65a,
0xa65c, 0xa65c,
0xa65e, 0xa65e,
- 0xa660, 0xa660,
0xa662, 0xa662,
0xa664, 0xa664,
0xa666, 0xa666,
@@ -12754,15 +9238,6 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
0xa784, 0xa784,
0xa786, 0xa786,
0xa78b, 0xa78b,
- 0xa78d, 0xa78d,
- 0xa790, 0xa790,
- 0xa792, 0xa792,
- 0xa7a0, 0xa7a0,
- 0xa7a2, 0xa7a2,
- 0xa7a4, 0xa7a4,
- 0xa7a6, 0xa7a6,
- 0xa7a8, 0xa7a8,
- 0xa7aa, 0xa7aa,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12771,7 +9246,7 @@ static const OnigCodePoint CR_Changes_When_Casefolded[] = {
/* 'Changes_When_Casemapped': Derived Property */
static const OnigCodePoint CR_Changes_When_Casemapped[] = {
- 104,
+ 97,
0x0041, 0x005a,
0x0061, 0x007a,
0x00b5, 0x00b5,
@@ -12792,7 +9267,6 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x025b, 0x025b,
0x0260, 0x0260,
0x0263, 0x0263,
- 0x0265, 0x0266,
0x0268, 0x0269,
0x026b, 0x026b,
0x026f, 0x026f,
@@ -12816,12 +9290,10 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x03f4, 0x03f5,
0x03f7, 0x03fb,
0x03fd, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0561, 0x0587,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x1d79, 0x1d79,
0x1d7d, 0x1d7d,
0x1e00, 0x1e9b,
@@ -12859,18 +9331,14 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
0x2c75, 0x2c76,
0x2c7e, 0x2ce3,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0xa640, 0xa66d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66d,
0xa680, 0xa697,
0xa722, 0xa72f,
0xa732, 0xa76f,
0xa779, 0xa787,
- 0xa78b, 0xa78d,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
+ 0xa78b, 0xa78c,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
0xff21, 0xff3a,
@@ -12880,7 +9348,7 @@ static const OnigCodePoint CR_Changes_When_Casemapped[] = {
/* 'ID_Start': Derived Property */
static const OnigCodePoint CR_ID_Start[] = {
- 488,
+ 424,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -12902,13 +9370,13 @@ static const OnigCodePoint CR_ID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -12927,14 +9395,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -13003,12 +9468,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -13035,11 +9499,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -13050,10 +9514,9 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13101,13 +9564,11 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -13130,7 +9591,7 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -13148,11 +9609,8 @@ static const OnigCodePoint CR_ID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -13173,24 +9631,23 @@ static const OnigCodePoint CR_ID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -13215,18 +9672,12 @@ static const OnigCodePoint CR_ID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13276,8 +9727,6 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -13287,21 +9736,10 @@ static const OnigCodePoint CR_ID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -13332,48 +9770,14 @@ static const OnigCodePoint CR_ID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_ID_Start */
/* 'ID_Continue': Derived Property */
static const OnigCodePoint CR_ID_Continue[] = {
- 564,
+ 506,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -13398,7 +9802,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -13410,7 +9814,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -13421,13 +9826,12 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -13529,14 +9933,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -13572,7 +9976,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -13582,16 +9986,16 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -13607,7 +10011,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -13623,7 +10027,8 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -13649,14 +10054,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -13679,7 +10085,7 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -13699,13 +10105,11 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -13725,24 +10129,23 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -13760,20 +10163,14 @@ static const OnigCodePoint CR_ID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -13830,8 +10227,6 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -13844,25 +10239,10 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -13900,49 +10280,15 @@ static const OnigCodePoint CR_ID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_ID_Continue */
/* 'XID_Start': Derived Property */
static const OnigCodePoint CR_XID_Start[] = {
- 495,
+ 431,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -13964,13 +10310,13 @@ static const OnigCodePoint CR_XID_Start[] = {
0x038e, 0x03a1,
0x03a3, 0x03f5,
0x03f7, 0x0481,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
0x05d0, 0x05ea,
0x05f0, 0x05f2,
- 0x0620, 0x064a,
+ 0x0621, 0x064a,
0x066e, 0x066f,
0x0671, 0x06d3,
0x06d5, 0x06d5,
@@ -13989,14 +10335,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x081a, 0x081a,
0x0824, 0x0824,
0x0828, 0x0828,
- 0x0840, 0x0858,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0904, 0x0939,
0x093d, 0x093d,
0x0950, 0x0950,
0x0958, 0x0961,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -14065,12 +10408,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0cbd, 0x0cbd,
0x0cde, 0x0cde,
0x0ce0, 0x0ce1,
- 0x0cf1, 0x0cf2,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d7a, 0x0d7f,
0x0d85, 0x0d96,
@@ -14097,11 +10439,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x0ebd, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x1000, 0x102a,
0x103f, 0x103f,
0x1050, 0x1055,
@@ -14112,10 +10454,9 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1075, 0x1081,
0x108e, 0x108e,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14163,13 +10504,11 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1b45, 0x1b4b,
0x1b83, 0x1ba0,
0x1bae, 0x1baf,
- 0x1bba, 0x1be5,
0x1c00, 0x1c23,
0x1c4d, 0x1c4f,
0x1c5a, 0x1c7d,
0x1ce9, 0x1cec,
0x1cee, 0x1cf1,
- 0x1cf5, 0x1cf6,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -14192,7 +10531,7 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1ff6, 0x1ffc,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2102, 0x2102,
0x2107, 0x2107,
0x210a, 0x2113,
@@ -14210,11 +10549,8 @@ static const OnigCodePoint CR_XID_Start[] = {
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
0x2ceb, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -14235,24 +10571,23 @@ static const OnigCodePoint CR_XID_Start[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa61f,
0xa62a, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa67f, 0xa697,
0xa6a0, 0xa6ef,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa822,
@@ -14277,18 +10612,12 @@ static const OnigCodePoint CR_XID_Start[] = {
0xaac0, 0xaac0,
0xaac2, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaea,
- 0xaaf2, 0xaaf4,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabe2,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14345,8 +10674,6 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -14356,21 +10683,10 @@ static const OnigCodePoint CR_XID_Start[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11003, 0x11037,
0x11083, 0x110af,
- 0x110d0, 0x110e8,
- 0x11103, 0x11126,
- 0x11183, 0x111b2,
- 0x111c1, 0x111c4,
- 0x11680, 0x116aa,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f50,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -14401,48 +10717,14 @@ static const OnigCodePoint CR_XID_Start[] = {
0x1d78a, 0x1d7a8,
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_XID_Start */
/* 'XID_Continue': Derived Property */
static const OnigCodePoint CR_XID_Continue[] = {
- 571,
+ 513,
0x0030, 0x0039,
0x0041, 0x005a,
0x005f, 0x005f,
@@ -14467,7 +10749,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x03a3, 0x03f5,
0x03f7, 0x0481,
0x0483, 0x0487,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x0559,
0x0561, 0x0587,
@@ -14479,7 +10761,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x05d0, 0x05ea,
0x05f0, 0x05f2,
0x0610, 0x061a,
- 0x0620, 0x0669,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
0x066e, 0x06d3,
0x06d5, 0x06dc,
0x06df, 0x06e8,
@@ -14490,13 +10773,12 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x07c0, 0x07f5,
0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0840, 0x085b,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0963,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
0x0966, 0x096f,
- 0x0971, 0x0977,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -14598,14 +10880,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d6f,
@@ -14641,7 +10923,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f00,
0x0f18, 0x0f19,
0x0f20, 0x0f29,
@@ -14651,16 +10933,16 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
0x0f71, 0x0f84,
- 0x0f86, 0x0f97,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x1000, 0x1049,
0x1050, 0x109d,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x1248,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -14676,7 +10958,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1369, 0x1371,
0x1380, 0x138f,
0x13a0, 0x13f4,
@@ -14692,7 +10974,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17d3,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
0x17d7, 0x17d7,
0x17dc, 0x17dd,
0x17e0, 0x17e9,
@@ -14718,14 +11001,15 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1b00, 0x1b4b,
0x1b50, 0x1b59,
0x1b6b, 0x1b73,
- 0x1b80, 0x1bf3,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
0x1c00, 0x1c37,
0x1c40, 0x1c49,
0x1c4d, 0x1c7d,
0x1cd0, 0x1cd2,
- 0x1cd4, 0x1cf6,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -14748,7 +11032,7 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2054, 0x2054,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x20d0, 0x20dc,
0x20e1, 0x20e1,
0x20e5, 0x20f0,
@@ -14768,13 +11052,11 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2ce4,
- 0x2ceb, 0x2cf3,
+ 0x2ceb, 0x2cf1,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
+ 0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
- 0x2d7f, 0x2d96,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -14795,24 +11077,23 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
0x31f0, 0x31ff,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
0xa4d0, 0xa4fd,
0xa500, 0xa60c,
0xa610, 0xa62b,
- 0xa640, 0xa66f,
- 0xa674, 0xa67d,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66f,
+ 0xa67c, 0xa67d,
0xa67f, 0xa697,
- 0xa69f, 0xa6f1,
+ 0xa6a0, 0xa6f1,
0xa717, 0xa71f,
0xa722, 0xa788,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa827,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
0xa840, 0xa873,
0xa880, 0xa8c4,
0xa8d0, 0xa8d9,
@@ -14830,20 +11111,14 @@ static const OnigCodePoint CR_XID_Continue[] = {
0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
0xaadb, 0xaadd,
- 0xaae0, 0xaaef,
- 0xaaf2, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
0xabc0, 0xabea,
0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -14906,8 +11181,6 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1083f, 0x10855,
0x10900, 0x10915,
0x10920, 0x10939,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
@@ -14920,25 +11193,10 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x10b40, 0x10b55,
0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x11000, 0x11046,
- 0x11066, 0x1106f,
0x11080, 0x110ba,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x1113f,
- 0x11180, 0x111c4,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d165, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -14976,42 +11234,8 @@ static const OnigCodePoint CR_XID_Continue[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
0xe0100, 0xe01ef,
}; /* CR_XID_Continue */
@@ -15038,7 +11262,7 @@ static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
/* 'Grapheme_Extend': Derived Property */
static const OnigCodePoint CR_Grapheme_Extend[] = {
- 232,
+ 206,
0x0300, 0x036f,
0x0483, 0x0489,
0x0591, 0x05bd,
@@ -15047,10 +11271,10 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x05c4, 0x05c5,
0x05c7, 0x05c7,
0x0610, 0x061a,
- 0x064b, 0x065f,
+ 0x064b, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
- 0x06df, 0x06e4,
+ 0x06de, 0x06e4,
0x06e7, 0x06e8,
0x06ea, 0x06ed,
0x0711, 0x0711,
@@ -15061,14 +11285,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082d,
- 0x0859, 0x085b,
- 0x08e4, 0x08fe,
0x0900, 0x0902,
- 0x093a, 0x093a,
0x093c, 0x093c,
0x0941, 0x0948,
0x094d, 0x094d,
- 0x0951, 0x0957,
+ 0x0951, 0x0955,
0x0962, 0x0963,
0x0981, 0x0981,
0x09bc, 0x09bc,
@@ -15139,7 +11360,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x0f71, 0x0f7e,
0x0f80, 0x0f84,
0x0f86, 0x0f87,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fc6, 0x0fc6,
0x102d, 0x1030,
@@ -15153,12 +11374,11 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1085, 0x1086,
0x108d, 0x108d,
0x109d, 0x109d,
- 0x135d, 0x135f,
+ 0x135f, 0x135f,
0x1712, 0x1714,
0x1732, 0x1734,
0x1752, 0x1753,
0x1772, 0x1773,
- 0x17b4, 0x17b5,
0x17b7, 0x17bd,
0x17c6, 0x17c6,
0x17c9, 0x17d3,
@@ -15186,30 +11406,22 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x1b80, 0x1b81,
0x1ba2, 0x1ba5,
0x1ba8, 0x1ba9,
- 0x1bab, 0x1bab,
- 0x1be6, 0x1be6,
- 0x1be8, 0x1be9,
- 0x1bed, 0x1bed,
- 0x1bef, 0x1bf1,
0x1c2c, 0x1c33,
0x1c36, 0x1c37,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
0x2cef, 0x2cf1,
- 0x2d7f, 0x2d7f,
0x2de0, 0x2dff,
0x302a, 0x302f,
0x3099, 0x309a,
0xa66f, 0xa672,
- 0xa674, 0xa67d,
- 0xa69f, 0xa69f,
+ 0xa67c, 0xa67d,
0xa6f0, 0xa6f1,
0xa802, 0xa802,
0xa806, 0xa806,
@@ -15233,8 +11445,6 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0xaab7, 0xaab8,
0xaabe, 0xaabf,
0xaac1, 0xaac1,
- 0xaaec, 0xaaed,
- 0xaaf6, 0xaaf6,
0xabe5, 0xabe5,
0xabe8, 0xabe8,
0xabed, 0xabed,
@@ -15248,21 +11458,9 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
0x10a0c, 0x10a0f,
0x10a38, 0x10a3a,
0x10a3f, 0x10a3f,
- 0x11001, 0x11001,
- 0x11038, 0x11046,
0x11080, 0x11081,
0x110b3, 0x110b6,
0x110b9, 0x110ba,
- 0x11100, 0x11102,
- 0x11127, 0x1112b,
- 0x1112d, 0x11134,
- 0x11180, 0x11181,
- 0x111b6, 0x111be,
- 0x116ab, 0x116ab,
- 0x116ad, 0x116ad,
- 0x116b0, 0x116b5,
- 0x116b7, 0x116b7,
- 0x16f8f, 0x16f92,
0x1d165, 0x1d165,
0x1d167, 0x1d169,
0x1d16e, 0x1d172,
@@ -15275,7 +11473,7 @@ static const OnigCodePoint CR_Grapheme_Extend[] = {
/* 'Grapheme_Base': Derived Property */
static const OnigCodePoint CR_Grapheme_Base[] = {
- 643,
+ 567,
0x0020, 0x007e,
0x00a0, 0x00ac,
0x00ae, 0x02ff,
@@ -15285,12 +11483,11 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x038c, 0x038c,
0x038e, 0x03a1,
0x03a3, 0x0482,
- 0x048a, 0x0527,
+ 0x048a, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x0589, 0x058a,
- 0x058f, 0x058f,
0x05be, 0x05be,
0x05c0, 0x05c0,
0x05c3, 0x05c3,
@@ -15299,10 +11496,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x05f0, 0x05f4,
0x0606, 0x060f,
0x061b, 0x061b,
- 0x061e, 0x064a,
+ 0x061e, 0x061f,
+ 0x0621, 0x064a,
0x0660, 0x066f,
0x0671, 0x06d5,
- 0x06de, 0x06de,
0x06e5, 0x06e6,
0x06e9, 0x06e9,
0x06ee, 0x070d,
@@ -15317,17 +11514,13 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0824, 0x0824,
0x0828, 0x0828,
0x0830, 0x083e,
- 0x0840, 0x0858,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
0x0903, 0x0939,
- 0x093b, 0x093b,
0x093d, 0x0940,
0x0949, 0x094c,
- 0x094e, 0x0950,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
0x0958, 0x0961,
- 0x0964, 0x0977,
+ 0x0964, 0x0972,
0x0979, 0x097f,
0x0982, 0x0983,
0x0985, 0x098c,
@@ -15369,7 +11562,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae1,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
0x0b02, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -15383,7 +11577,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0b4b, 0x0b4c,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b61,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
0x0b83, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -15430,12 +11624,12 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d3d,
0x0d3f, 0x0d40,
0x0d46, 0x0d48,
0x0d4a, 0x0d4c,
- 0x0d4e, 0x0d4e,
0x0d60, 0x0d61,
0x0d66, 0x0d75,
0x0d79, 0x0d7f,
@@ -15469,7 +11663,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
0x0f00, 0x0f17,
0x0f1a, 0x0f34,
0x0f36, 0x0f36,
@@ -15478,10 +11672,10 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x0f49, 0x0f6c,
0x0f7f, 0x0f7f,
0x0f85, 0x0f85,
- 0x0f88, 0x0f8c,
+ 0x0f88, 0x0f8b,
0x0fbe, 0x0fc5,
0x0fc7, 0x0fcc,
- 0x0fce, 0x0fda,
+ 0x0fce, 0x0fd8,
0x1000, 0x102c,
0x1031, 0x1031,
0x1038, 0x1038,
@@ -15494,9 +11688,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1087, 0x108c,
0x108e, 0x109c,
0x109e, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x10d0, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -15569,21 +11762,15 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1b82, 0x1ba1,
0x1ba6, 0x1ba7,
0x1baa, 0x1baa,
- 0x1bac, 0x1be5,
- 0x1be7, 0x1be7,
- 0x1bea, 0x1bec,
- 0x1bee, 0x1bee,
- 0x1bf2, 0x1bf3,
- 0x1bfc, 0x1c2b,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c2b,
0x1c34, 0x1c35,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x1d00, 0x1dbf,
0x1e00, 0x1f15,
0x1f18, 0x1f1d,
@@ -15606,24 +11793,36 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x202f, 0x205f,
0x2070, 0x2071,
0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x2090, 0x2094,
+ 0x20a0, 0x20b8,
0x2100, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x2b4c,
0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
0x2c60, 0x2cee,
- 0x2cf2, 0x2cf3,
0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
@@ -15633,7 +11832,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
@@ -15644,24 +11843,23 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x309b, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
+ 0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
0xa4d0, 0xa62b,
- 0xa640, 0xa66e,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
0xa673, 0xa673,
0xa67e, 0xa697,
0xa6a0, 0xa6ef,
0xa6f2, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa801,
+ 0xa700, 0xa78c,
+ 0xa7fb, 0xa801,
0xa803, 0xa805,
0xa807, 0xa80a,
0xa80c, 0xa824,
@@ -15695,13 +11893,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xaab9, 0xaabd,
0xaac0, 0xaac0,
0xaac2, 0xaac2,
- 0xaadb, 0xaaeb,
- 0xaaee, 0xaaf5,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
+ 0xaadb, 0xaadf,
0xabc0, 0xabe4,
0xabe6, 0xabe7,
0xabe9, 0xabec,
@@ -15709,7 +11901,8 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xf900, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -15719,7 +11912,7 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
+ 0xfb46, 0xfbb1,
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -15771,8 +11964,6 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
0x10a00, 0x10a00,
0x10a10, 0x10a13,
0x10a15, 0x10a17,
@@ -15786,36 +11977,14 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x10b78, 0x10b7f,
0x10c00, 0x10c48,
0x10e60, 0x10e7e,
- 0x11000, 0x11000,
- 0x11002, 0x11037,
- 0x11047, 0x1104d,
- 0x11052, 0x1106f,
0x11082, 0x110b2,
0x110b7, 0x110b8,
0x110bb, 0x110bc,
0x110be, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11103, 0x11126,
- 0x1112c, 0x1112c,
- 0x11136, 0x11143,
- 0x11182, 0x111b5,
- 0x111bf, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116aa,
- 0x116ac, 0x116ac,
- 0x116ae, 0x116af,
- 0x116b6, 0x116b6,
- 0x116c0, 0x116c9,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f93, 0x16f9f,
- 0x1b000, 0x1b001,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d164,
@@ -15849,81 +12018,34 @@ static const OnigCodePoint CR_Grapheme_Base[] = {
0x1d552, 0x1d6a5,
0x1d6a8, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Grapheme_Base */
/* 'Grapheme_Link': Derived Property */
static const OnigCodePoint CR_Grapheme_Link[] = {
- 33,
+ 26,
0x094d, 0x094d,
0x09cd, 0x09cd,
0x0a4d, 0x0a4d,
@@ -15942,26 +12064,19 @@ static const OnigCodePoint CR_Grapheme_Link[] = {
0x17d2, 0x17d2,
0x1a60, 0x1a60,
0x1b44, 0x1b44,
- 0x1baa, 0x1bab,
- 0x1bf2, 0x1bf3,
- 0x2d7f, 0x2d7f,
+ 0x1baa, 0x1baa,
0xa806, 0xa806,
0xa8c4, 0xa8c4,
0xa953, 0xa953,
0xa9c0, 0xa9c0,
- 0xaaf6, 0xaaf6,
0xabed, 0xabed,
0x10a3f, 0x10a3f,
- 0x11046, 0x11046,
0x110b9, 0x110b9,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b6,
}; /* CR_Grapheme_Link */
/* 'Common': Script */
static const OnigCodePoint CR_Common[] = {
- 157,
+ 159,
0x0000, 0x0040,
0x005b, 0x0060,
0x007b, 0x00a9,
@@ -15970,13 +12085,13 @@ static const OnigCodePoint CR_Common[] = {
0x00d7, 0x00d7,
0x00f7, 0x00f7,
0x02b9, 0x02df,
- 0x02e5, 0x02e9,
- 0x02ec, 0x02ff,
+ 0x02e5, 0x02ff,
0x0374, 0x0374,
0x037e, 0x037e,
0x0385, 0x0385,
0x0387, 0x0387,
0x0589, 0x0589,
+ 0x0600, 0x0603,
0x060c, 0x060c,
0x061b, 0x061b,
0x061f, 0x061f,
@@ -15984,6 +12099,8 @@ static const OnigCodePoint CR_Common[] = {
0x0660, 0x0669,
0x06dd, 0x06dd,
0x0964, 0x0965,
+ 0x0970, 0x0970,
+ 0x0cf1, 0x0cf2,
0x0e3f, 0x0e3f,
0x0fd5, 0x0fd8,
0x10fb, 0x10fb,
@@ -15994,28 +12111,42 @@ static const OnigCodePoint CR_Common[] = {
0x1cd3, 0x1cd3,
0x1ce1, 0x1ce1,
0x1ce9, 0x1cec,
- 0x1cee, 0x1cf3,
- 0x1cf5, 0x1cf6,
+ 0x1cee, 0x1cf2,
0x2000, 0x200b,
0x200e, 0x2064,
0x206a, 0x2070,
0x2074, 0x207e,
0x2080, 0x208e,
- 0x20a0, 0x20b9,
+ 0x20a0, 0x20b8,
0x2100, 0x2125,
0x2127, 0x2129,
0x212c, 0x2131,
0x2133, 0x214d,
0x214f, 0x215f,
0x2189, 0x2189,
- 0x2190, 0x23f3,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ff,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
+ 0x2701, 0x2704,
+ 0x2706, 0x2709,
+ 0x270c, 0x2727,
+ 0x2729, 0x274b,
+ 0x274d, 0x274d,
+ 0x274f, 0x2752,
+ 0x2756, 0x275e,
+ 0x2761, 0x2794,
+ 0x2798, 0x27af,
+ 0x27b1, 0x27be,
+ 0x27c0, 0x27ca,
+ 0x27cc, 0x27cc,
+ 0x27d0, 0x27ff,
0x2900, 0x2b4c,
0x2b50, 0x2b59,
- 0x2e00, 0x2e3b,
+ 0x2e00, 0x2e31,
0x2ff0, 0x2ffb,
0x3000, 0x3004,
0x3006, 0x3006,
@@ -16086,44 +12217,30 @@ static const OnigCodePoint CR_Common[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
0x1f100, 0x1f10a,
0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f1ff,
- 0x1f201, 0x1f202,
- 0x1f210, 0x1f23a,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
}; /* CR_Common */
/* 'Latin': Script */
static const OnigCodePoint CR_Latin[] = {
- 30,
+ 28,
0x0041, 0x005a,
0x0061, 0x007a,
0x00aa, 0x00aa,
@@ -16140,17 +12257,15 @@ static const OnigCodePoint CR_Latin[] = {
0x1e00, 0x1eff,
0x2071, 0x2071,
0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x212a, 0x212b,
0x2132, 0x2132,
0x214e, 0x214e,
0x2160, 0x2188,
0x2c60, 0x2c7f,
0xa722, 0xa787,
- 0xa78b, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa7ff,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa7ff,
0xfb00, 0xfb06,
0xff21, 0xff3a,
0xff41, 0xff5a,
@@ -16196,24 +12311,24 @@ static const OnigCodePoint CR_Greek[] = {
/* 'Cyrillic': Script */
static const OnigCodePoint CR_Cyrillic[] = {
- 7,
+ 8,
0x0400, 0x0484,
- 0x0487, 0x0527,
+ 0x0487, 0x0525,
0x1d2b, 0x1d2b,
0x1d78, 0x1d78,
0x2de0, 0x2dff,
- 0xa640, 0xa697,
- 0xa69f, 0xa69f,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa673,
+ 0xa67c, 0xa697,
}; /* CR_Cyrillic */
/* 'Armenian': Script */
static const OnigCodePoint CR_Armenian[] = {
- 6,
+ 5,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
0x058a, 0x058a,
- 0x058f, 0x058f,
0xfb13, 0xfb17,
}; /* CR_Armenian */
@@ -16233,22 +12348,18 @@ static const OnigCodePoint CR_Hebrew[] = {
/* 'Arabic': Script */
static const OnigCodePoint CR_Arabic[] = {
- 56,
- 0x0600, 0x0604,
+ 18,
0x0606, 0x060b,
0x060d, 0x061a,
0x061e, 0x061e,
- 0x0620, 0x063f,
+ 0x0621, 0x063f,
0x0641, 0x064a,
0x0656, 0x065e,
0x066a, 0x066f,
0x0671, 0x06dc,
0x06de, 0x06ff,
0x0750, 0x077f,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0xfb50, 0xfbc1,
+ 0xfb50, 0xfbb1,
0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
@@ -16256,40 +12367,6 @@ static const OnigCodePoint CR_Arabic[] = {
0xfe70, 0xfe74,
0xfe76, 0xfefc,
0x10e60, 0x10e7e,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
}; /* CR_Arabic */
/* 'Syriac': Script */
@@ -16308,10 +12385,14 @@ static const OnigCodePoint CR_Thaana[] = {
/* 'Devanagari': Script */
static const OnigCodePoint CR_Devanagari[] = {
- 5,
- 0x0900, 0x0950,
- 0x0953, 0x0963,
- 0x0966, 0x0977,
+ 9,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0950,
+ 0x0953, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0xa8e0, 0xa8fb,
}; /* CR_Devanagari */
@@ -16358,7 +12439,7 @@ static const OnigCodePoint CR_Gurmukhi[] = {
/* 'Gujarati': Script */
static const OnigCodePoint CR_Gujarati[] = {
- 13,
+ 14,
0x0a81, 0x0a83,
0x0a85, 0x0a8d,
0x0a8f, 0x0a91,
@@ -16371,7 +12452,8 @@ static const OnigCodePoint CR_Gujarati[] = {
0x0acb, 0x0acd,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
+ 0x0af1, 0x0af1,
}; /* CR_Gujarati */
/* 'Oriya': Script */
@@ -16390,7 +12472,7 @@ static const OnigCodePoint CR_Oriya[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b71,
}; /* CR_Oriya */
/* 'Tamil': Script */
@@ -16435,7 +12517,7 @@ static const OnigCodePoint CR_Telugu[] = {
/* 'Kannada': Script */
static const OnigCodePoint CR_Kannada[] = {
- 14,
+ 13,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -16449,19 +12531,19 @@ static const OnigCodePoint CR_Kannada[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
}; /* CR_Kannada */
/* 'Malayalam': Script */
static const OnigCodePoint CR_Malayalam[] = {
- 11,
+ 12,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
0x0d66, 0x0d75,
@@ -16511,7 +12593,7 @@ static const OnigCodePoint CR_Lao[] = {
0x0ec6, 0x0ec6,
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
+ 0x0edc, 0x0edd,
}; /* CR_Lao */
/* 'Tibetan': Script */
@@ -16519,11 +12601,11 @@ static const OnigCodePoint CR_Tibetan[] = {
7,
0x0f00, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
0x0fce, 0x0fd4,
- 0x0fd9, 0x0fda,
}; /* CR_Tibetan */
/* 'Myanmar': Script */
@@ -16535,22 +12617,17 @@ static const OnigCodePoint CR_Myanmar[] = {
/* 'Georgian': Script */
static const OnigCodePoint CR_Georgian[] = {
- 8,
+ 4,
0x10a0, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
0x10d0, 0x10fa,
- 0x10fc, 0x10ff,
+ 0x10fc, 0x10fc,
0x2d00, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
}; /* CR_Georgian */
/* 'Hangul': Script */
static const OnigCodePoint CR_Hangul[] = {
- 14,
+ 13,
0x1100, 0x11ff,
- 0x302e, 0x302f,
0x3131, 0x318e,
0x3200, 0x321e,
0x3260, 0x327e,
@@ -16567,7 +12644,7 @@ static const OnigCodePoint CR_Hangul[] = {
/* 'Ethiopic': Script */
static const OnigCodePoint CR_Ethiopic[] = {
- 32,
+ 27,
0x1200, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -16584,7 +12661,7 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
+ 0x135f, 0x137c,
0x1380, 0x1399,
0x2d80, 0x2d96,
0x2da0, 0x2da6,
@@ -16595,11 +12672,6 @@ static const OnigCodePoint CR_Ethiopic[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
}; /* CR_Ethiopic */
/* 'Cherokee': Script */
@@ -16650,16 +12722,15 @@ static const OnigCodePoint CR_Mongolian[] = {
/* 'Hiragana': Script */
static const OnigCodePoint CR_Hiragana[] = {
- 4,
+ 3,
0x3041, 0x3096,
0x309d, 0x309f,
- 0x1b001, 0x1b001,
0x1f200, 0x1f200,
}; /* CR_Hiragana */
/* 'Katakana': Script */
static const OnigCodePoint CR_Katakana[] = {
- 8,
+ 7,
0x30a1, 0x30fa,
0x30fd, 0x30ff,
0x31f0, 0x31ff,
@@ -16667,15 +12738,13 @@ static const OnigCodePoint CR_Katakana[] = {
0x3300, 0x3357,
0xff66, 0xff6f,
0xff71, 0xff9d,
- 0x1b000, 0x1b000,
}; /* CR_Katakana */
/* 'Bopomofo': Script */
static const OnigCodePoint CR_Bopomofo[] = {
- 3,
- 0x02ea, 0x02eb,
+ 2,
0x3105, 0x312d,
- 0x31a0, 0x31ba,
+ 0x31a0, 0x31b7,
}; /* CR_Bopomofo */
/* 'Han': Script */
@@ -16689,12 +12758,12 @@ static const OnigCodePoint CR_Han[] = {
0x3021, 0x3029,
0x3038, 0x303b,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Han */
@@ -16726,23 +12795,21 @@ static const OnigCodePoint CR_Deseret[] = {
/* 'Inherited': Script */
static const OnigCodePoint CR_Inherited[] = {
- 25,
+ 23,
0x0300, 0x036f,
0x0485, 0x0486,
0x064b, 0x0655,
- 0x065f, 0x065f,
0x0670, 0x0670,
0x0951, 0x0952,
0x1cd0, 0x1cd2,
0x1cd4, 0x1ce0,
0x1ce2, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1dc0, 0x1de6,
- 0x1dfc, 0x1dff,
+ 0x1dfd, 0x1dff,
0x200c, 0x200d,
0x20d0, 0x20f0,
- 0x302a, 0x302d,
+ 0x302a, 0x302f,
0x3099, 0x309a,
0xfe00, 0xfe0f,
0xfe20, 0xfe26,
@@ -16858,7 +12925,7 @@ static const OnigCodePoint CR_Buginese[] = {
static const OnigCodePoint CR_Coptic[] = {
3,
0x03e2, 0x03ef,
- 0x2c80, 0x2cf3,
+ 0x2c80, 0x2cf1,
0x2cf9, 0x2cff,
}; /* CR_Coptic */
@@ -16880,10 +12947,9 @@ static const OnigCodePoint CR_Glagolitic[] = {
/* 'Tifinagh': Script */
static const OnigCodePoint CR_Tifinagh[] = {
- 3,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d7f,
+ 2,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
}; /* CR_Tifinagh */
/* 'Syloti_Nagri': Script */
@@ -16949,8 +13015,8 @@ static const OnigCodePoint CR_Nko[] = {
/* 'Sundanese': Script */
static const OnigCodePoint CR_Sundanese[] = {
2,
- 0x1b80, 0x1bbf,
- 0x1cc0, 0x1cc7,
+ 0x1b80, 0x1baa,
+ 0x1bae, 0x1bb9,
}; /* CR_Sundanese */
/* 'Lepcha': Script */
@@ -17066,9 +13132,8 @@ static const OnigCodePoint CR_Lisu[] = {
/* 'Bamum': Script */
static const OnigCodePoint CR_Bamum[] = {
- 2,
+ 1,
0xa6a0, 0xa6f7,
- 0x16800, 0x16a38,
}; /* CR_Bamum */
/* 'Javanese': Script */
@@ -17081,8 +13146,7 @@ static const OnigCodePoint CR_Javanese[] = {
/* 'Meetei_Mayek': Script */
static const OnigCodePoint CR_Meetei_Mayek[] = {
- 3,
- 0xaae0, 0xaaf6,
+ 2,
0xabc0, 0xabed,
0xabf0, 0xabf9,
}; /* CR_Meetei_Mayek */
@@ -17126,78 +13190,21 @@ static const OnigCodePoint CR_Kaithi[] = {
0x11080, 0x110c1,
}; /* CR_Kaithi */
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
- 2,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
- 2,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
- 2,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
- 2,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
- 2,
- 0x109a0, 0x109b7,
- 0x109be, 0x109bf,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
- 1,
- 0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
- 3,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
- 2,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
- 2,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
- 2,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
-}; /* CR_Takri */
-
/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
+static const OnigCodePoint CR_White_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_White_Space */
/* 'Bidi_Control': Binary Property */
static const OnigCodePoint CR_Bidi_Control[] = {
@@ -17214,7 +13221,7 @@ static const OnigCodePoint CR_Join_Control[] = {
/* 'Dash': Binary Property */
static const OnigCodePoint CR_Dash[] = {
- 20,
+ 19,
0x002d, 0x002d,
0x058a, 0x058a,
0x05be, 0x05be,
@@ -17227,7 +13234,6 @@ static const OnigCodePoint CR_Dash[] = {
0x2212, 0x2212,
0x2e17, 0x2e17,
0x2e1a, 0x2e1a,
- 0x2e3a, 0x2e3b,
0x301c, 0x301c,
0x3030, 0x3030,
0x30a0, 0x30a0,
@@ -17271,7 +13277,7 @@ static const OnigCodePoint CR_Quotation_Mark[] = {
/* 'Terminal_Punctuation': Binary Property */
static const OnigCodePoint CR_Terminal_Punctuation[] = {
- 70,
+ 65,
0x0021, 0x0021,
0x002c, 0x002c,
0x002e, 0x002e,
@@ -17289,7 +13295,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x070c, 0x070c,
0x07f8, 0x07f9,
0x0830, 0x083e,
- 0x085e, 0x085e,
0x0964, 0x0965,
0x0e5a, 0x0e5b,
0x0f08, 0x0f08,
@@ -17321,7 +13326,6 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0xa9c7, 0xa9c9,
0xaa5d, 0xaa5f,
0xaadf, 0xaadf,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe50, 0xfe52,
0xfe54, 0xfe57,
@@ -17337,16 +13341,13 @@ static const OnigCodePoint CR_Terminal_Punctuation[] = {
0x10857, 0x10857,
0x1091f, 0x1091f,
0x10b3a, 0x10b3f,
- 0x11047, 0x1104d,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
0x12470, 0x12473,
}; /* CR_Terminal_Punctuation */
/* 'Other_Math': Binary Property */
static const OnigCodePoint CR_Other_Math[] = {
- 133,
+ 99,
0x005e, 0x005e,
0x03d0, 0x03d2,
0x03d5, 0x03d5,
@@ -17363,7 +13364,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x20e5, 0x20e6,
0x20eb, 0x20ef,
0x2102, 0x2102,
- 0x2107, 0x2107,
0x210a, 0x2113,
0x2115, 0x2115,
0x2119, 0x211d,
@@ -17447,39 +13447,6 @@ static const OnigCodePoint CR_Other_Math[] = {
0x1d7aa, 0x1d7c2,
0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
}; /* CR_Other_Math */
/* 'Hex_Digit': Binary Property */
@@ -17494,11 +13461,16 @@ static const OnigCodePoint CR_Hex_Digit[] = {
}; /* CR_Hex_Digit */
/* 'ASCII_Hex_Digit': Binary Property */
-#define CR_ASCII_Hex_Digit CR_XDigit
+static const OnigCodePoint CR_ASCII_Hex_Digit[] = {
+ 3,
+ 0x0030, 0x0039,
+ 0x0041, 0x0046,
+ 0x0061, 0x0066,
+}; /* CR_ASCII_Hex_Digit */
/* 'Other_Alphabetic': Binary Property */
static const OnigCodePoint CR_Other_Alphabetic[] = {
- 158,
+ 141,
0x0345, 0x0345,
0x05b0, 0x05bd,
0x05bf, 0x05bf,
@@ -17507,7 +13479,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x05c7, 0x05c7,
0x0610, 0x061a,
0x064b, 0x0657,
- 0x0659, 0x065f,
+ 0x0659, 0x065e,
0x0670, 0x0670,
0x06d6, 0x06dc,
0x06e1, 0x06e4,
@@ -17520,13 +13492,10 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x081b, 0x0823,
0x0825, 0x0827,
0x0829, 0x082c,
- 0x08e4, 0x08e9,
- 0x08f0, 0x08fe,
0x0900, 0x0903,
- 0x093a, 0x093b,
0x093e, 0x094c,
- 0x094e, 0x094f,
- 0x0955, 0x0957,
+ 0x094e, 0x094e,
+ 0x0955, 0x0955,
0x0962, 0x0963,
0x0981, 0x0983,
0x09be, 0x09c4,
@@ -17588,7 +13557,7 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x0ebb, 0x0ebc,
0x0ecd, 0x0ecd,
0x0f71, 0x0f81,
- 0x0f8d, 0x0f97,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x102b, 0x1036,
0x1038, 0x1038,
@@ -17618,21 +13587,17 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0x1b35, 0x1b43,
0x1b80, 0x1b82,
0x1ba1, 0x1ba9,
- 0x1bac, 0x1bad,
- 0x1be7, 0x1bf1,
0x1c24, 0x1c35,
- 0x1cf2, 0x1cf3,
+ 0x1cf2, 0x1cf2,
0x24b6, 0x24e9,
0x2de0, 0x2dff,
- 0xa674, 0xa67b,
- 0xa69f, 0xa69f,
0xa823, 0xa827,
0xa880, 0xa881,
0xa8b4, 0xa8c3,
0xa926, 0xa92a,
0xa947, 0xa952,
0xa980, 0xa983,
- 0xa9b4, 0xa9bf,
+ 0xa9b3, 0xa9bf,
0xaa29, 0xaa36,
0xaa43, 0xaa43,
0xaa4c, 0xaa4d,
@@ -17640,23 +13605,13 @@ static const OnigCodePoint CR_Other_Alphabetic[] = {
0xaab2, 0xaab4,
0xaab7, 0xaab8,
0xaabe, 0xaabe,
- 0xaaeb, 0xaaef,
- 0xaaf5, 0xaaf5,
0xabe3, 0xabea,
0xfb1e, 0xfb1e,
0x10a01, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a0f,
- 0x11000, 0x11002,
- 0x11038, 0x11045,
0x11082, 0x11082,
0x110b0, 0x110b8,
- 0x11100, 0x11102,
- 0x11127, 0x11132,
- 0x11180, 0x11182,
- 0x111b3, 0x111bf,
- 0x116ab, 0x116b5,
- 0x16f51, 0x16f7e,
}; /* CR_Other_Alphabetic */
/* 'Ideographic': Binary Property */
@@ -17666,18 +13621,18 @@ static const OnigCodePoint CR_Ideographic[] = {
0x3021, 0x3029,
0x3038, 0x303a,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
- 0xf900, 0xfa6d,
+ 0x4e00, 0x9fcb,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
}; /* CR_Ideographic */
/* 'Diacritic': Binary Property */
static const OnigCodePoint CR_Diacritic[] = {
- 125,
+ 117,
0x005e, 0x005e,
0x0060, 0x0060,
0x00a8, 0x00a8,
@@ -17706,7 +13661,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0x07a6, 0x07b0,
0x07eb, 0x07f5,
0x0818, 0x0819,
- 0x08e4, 0x08fe,
0x093c, 0x093c,
0x094d, 0x094d,
0x0951, 0x0954,
@@ -17749,12 +13703,11 @@ static const OnigCodePoint CR_Diacritic[] = {
0x1b34, 0x1b34,
0x1b44, 0x1b44,
0x1b6b, 0x1b73,
- 0x1baa, 0x1bab,
+ 0x1baa, 0x1baa,
0x1c36, 0x1c37,
0x1c78, 0x1c7d,
0x1cd0, 0x1ce8,
0x1ced, 0x1ced,
- 0x1cf4, 0x1cf4,
0x1d2c, 0x1d6a,
0x1dc4, 0x1dcf,
0x1dfd, 0x1dff,
@@ -17775,7 +13728,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa6f0, 0xa6f1,
0xa717, 0xa721,
0xa788, 0xa788,
- 0xa7f8, 0xa7f9,
0xa8c4, 0xa8c4,
0xa8e0, 0xa8f1,
0xa92b, 0xa92e,
@@ -17784,7 +13736,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xa9c0, 0xa9c0,
0xaa7b, 0xaa7b,
0xaabf, 0xaac2,
- 0xaaf6, 0xaaf6,
0xabec, 0xabed,
0xfb1e, 0xfb1e,
0xfe20, 0xfe26,
@@ -17794,10 +13745,6 @@ static const OnigCodePoint CR_Diacritic[] = {
0xff9e, 0xff9f,
0xffe3, 0xffe3,
0x110b9, 0x110ba,
- 0x11133, 0x11134,
- 0x111c0, 0x111c0,
- 0x116b6, 0x116b7,
- 0x16f8f, 0x16f9f,
0x1d167, 0x1d169,
0x1d16d, 0x1d172,
0x1d17b, 0x1d182,
@@ -17807,14 +13754,13 @@ static const OnigCodePoint CR_Diacritic[] = {
/* 'Extender': Binary Property */
static const OnigCodePoint CR_Extender[] = {
- 22,
+ 20,
0x00b7, 0x00b7,
0x02d0, 0x02d1,
0x0640, 0x0640,
0x07fa, 0x07fa,
0x0e46, 0x0e46,
0x0ec6, 0x0ec6,
- 0x180a, 0x180a,
0x1843, 0x1843,
0x1aa7, 0x1aa7,
0x1c36, 0x1c36,
@@ -17828,31 +13774,25 @@ static const OnigCodePoint CR_Extender[] = {
0xa9cf, 0xa9cf,
0xaa70, 0xaa70,
0xaadd, 0xaadd,
- 0xaaf3, 0xaaf4,
0xff70, 0xff70,
}; /* CR_Extender */
/* 'Other_Lowercase': Binary Property */
static const OnigCodePoint CR_Other_Lowercase[] = {
- 18,
- 0x00aa, 0x00aa,
- 0x00ba, 0x00ba,
+ 13,
0x02b0, 0x02b8,
0x02c0, 0x02c1,
0x02e0, 0x02e4,
0x0345, 0x0345,
0x037a, 0x037a,
- 0x1d2c, 0x1d6a,
+ 0x1d2c, 0x1d61,
0x1d78, 0x1d78,
0x1d9b, 0x1dbf,
- 0x2071, 0x2071,
- 0x207f, 0x207f,
- 0x2090, 0x209c,
+ 0x2090, 0x2094,
0x2170, 0x217f,
0x24d0, 0x24e9,
- 0x2c7c, 0x2c7d,
+ 0x2c7d, 0x2c7d,
0xa770, 0xa770,
- 0xa7f8, 0xa7f9,
}; /* CR_Other_Lowercase */
/* 'Other_Uppercase': Binary Property */
@@ -17887,7 +13827,7 @@ static const OnigCodePoint CR_Noncharacter_Code_Point[] = {
/* 'Other_Grapheme_Extend': Binary Property */
static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
- 17,
+ 16,
0x09be, 0x09be,
0x09d7, 0x09d7,
0x0b3e, 0x0b3e,
@@ -17901,7 +13841,6 @@ static const OnigCodePoint CR_Other_Grapheme_Extend[] = {
0x0dcf, 0x0dcf,
0x0ddf, 0x0ddf,
0x200c, 0x200d,
- 0x302e, 0x302f,
0xff9e, 0xff9f,
0x1d165, 0x1d165,
0x1d16e, 0x1d172,
@@ -17930,9 +13869,9 @@ static const OnigCodePoint CR_Radical[] = {
/* 'Unified_Ideograph': Binary Property */
static const OnigCodePoint CR_Unified_Ideograph[] = {
- 12,
+ 11,
0x3400, 0x4db5,
- 0x4e00, 0x9fcc,
+ 0x4e00, 0x9fcb,
0xfa0e, 0xfa0f,
0xfa11, 0xfa11,
0xfa13, 0xfa14,
@@ -17942,15 +13881,13 @@ static const OnigCodePoint CR_Unified_Ideograph[] = {
0xfa27, 0xfa29,
0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
}; /* CR_Unified_Ideograph */
/* 'Other_Default_Ignorable_Code_Point': Binary Property */
static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
- 11,
+ 10,
0x034f, 0x034f,
0x115f, 0x1160,
- 0x17b4, 0x17b5,
0x2065, 0x2069,
0x3164, 0x3164,
0xffa0, 0xffa0,
@@ -17963,9 +13900,8 @@ static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
/* 'Deprecated': Binary Property */
static const OnigCodePoint CR_Deprecated[] = {
- 9,
+ 8,
0x0149, 0x0149,
- 0x0673, 0x0673,
0x0f77, 0x0f77,
0x0f79, 0x0f79,
0x17a3, 0x17a4,
@@ -18031,16 +13967,15 @@ static const OnigCodePoint CR_Other_ID_Start[] = {
/* 'Other_ID_Continue': Binary Property */
static const OnigCodePoint CR_Other_ID_Continue[] = {
- 4,
+ 3,
0x00b7, 0x00b7,
0x0387, 0x0387,
0x1369, 0x1371,
- 0x19da, 0x19da,
}; /* CR_Other_ID_Continue */
/* 'STerm': Binary Property */
static const OnigCodePoint CR_STerm[] = {
- 50,
+ 43,
0x0021, 0x0021,
0x002e, 0x002e,
0x003f, 0x003f,
@@ -18056,11 +13991,9 @@ static const OnigCodePoint CR_STerm[] = {
0x1362, 0x1362,
0x1367, 0x1368,
0x166e, 0x166e,
- 0x1735, 0x1736,
0x1803, 0x1803,
0x1809, 0x1809,
0x1944, 0x1945,
- 0x1aa8, 0x1aab,
0x1b5a, 0x1b5b,
0x1b5e, 0x1b5f,
0x1c3b, 0x1c3c,
@@ -18078,7 +14011,6 @@ static const OnigCodePoint CR_STerm[] = {
0xa92f, 0xa92f,
0xa9c8, 0xa9c9,
0xaa5d, 0xaa5f,
- 0xaaf0, 0xaaf1,
0xabeb, 0xabeb,
0xfe52, 0xfe52,
0xfe56, 0xfe57,
@@ -18086,11 +14018,7 @@ static const OnigCodePoint CR_STerm[] = {
0xff0e, 0xff0e,
0xff1f, 0xff1f,
0xff61, 0xff61,
- 0x10a56, 0x10a57,
- 0x11047, 0x11048,
0x110be, 0x110c1,
- 0x11141, 0x11143,
- 0x111c5, 0x111c6,
}; /* CR_STerm */
/* 'Variation_Selector': Binary Property */
@@ -18143,3965 +14071,47 @@ static const OnigCodePoint CR_Pattern_Syntax[] = {
0xfd3e, 0xfd3f,
0xfe45, 0xfe46,
}; /* CR_Pattern_Syntax */
+#endif /* USE_UNICODE_PROPERTIES */
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
- 537,
- 0x0378, 0x0379,
- 0x037f, 0x0383,
- 0x038b, 0x038b,
- 0x038d, 0x038d,
- 0x03a2, 0x03a2,
- 0x0528, 0x0530,
- 0x0557, 0x0558,
- 0x0560, 0x0560,
- 0x0588, 0x0588,
- 0x058b, 0x058e,
- 0x0590, 0x0590,
- 0x05c8, 0x05cf,
- 0x05eb, 0x05ef,
- 0x05f5, 0x05ff,
- 0x0605, 0x0605,
- 0x061c, 0x061d,
- 0x070e, 0x070e,
- 0x074b, 0x074c,
- 0x07b2, 0x07bf,
- 0x07fb, 0x07ff,
- 0x082e, 0x082f,
- 0x083f, 0x083f,
- 0x085c, 0x085d,
- 0x085f, 0x089f,
- 0x08a1, 0x08a1,
- 0x08ad, 0x08e3,
- 0x08ff, 0x08ff,
- 0x0978, 0x0978,
- 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,
- 0x09fc, 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,
- 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,
- 0x0b78, 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,
- 0x0d3b, 0x0d3c,
- 0x0d45, 0x0d45,
- 0x0d49, 0x0d49,
- 0x0d4f, 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,
- 0x0ee0, 0x0eff,
- 0x0f48, 0x0f48,
- 0x0f6d, 0x0f70,
- 0x0f98, 0x0f98,
- 0x0fbd, 0x0fbd,
- 0x0fcd, 0x0fcd,
- 0x0fdb, 0x0fff,
- 0x10c6, 0x10c6,
- 0x10c8, 0x10cc,
- 0x10ce, 0x10cf,
- 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, 0x135c,
- 0x137d, 0x137f,
- 0x139a, 0x139f,
- 0x13f5, 0x13ff,
- 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, 0x18af,
- 0x18f6, 0x18ff,
- 0x191d, 0x191f,
- 0x192c, 0x192f,
- 0x193c, 0x193f,
- 0x1941, 0x1943,
- 0x196e, 0x196f,
- 0x1975, 0x197f,
- 0x19ac, 0x19af,
- 0x19ca, 0x19cf,
- 0x19db, 0x19dd,
- 0x1a1c, 0x1a1d,
- 0x1a5f, 0x1a5f,
- 0x1a7d, 0x1a7e,
- 0x1a8a, 0x1a8f,
- 0x1a9a, 0x1a9f,
- 0x1aae, 0x1aff,
- 0x1b4c, 0x1b4f,
- 0x1b7d, 0x1b7f,
- 0x1bf4, 0x1bfb,
- 0x1c38, 0x1c3a,
- 0x1c4a, 0x1c4c,
- 0x1c80, 0x1cbf,
- 0x1cc8, 0x1ccf,
- 0x1cf7, 0x1cff,
- 0x1de7, 0x1dfb,
- 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,
- 0x209d, 0x209f,
- 0x20ba, 0x20cf,
- 0x20f1, 0x20ff,
- 0x218a, 0x218f,
- 0x23f4, 0x23ff,
- 0x2427, 0x243f,
- 0x244b, 0x245f,
- 0x2700, 0x2700,
- 0x2b4d, 0x2b4f,
- 0x2b5a, 0x2bff,
- 0x2c2f, 0x2c2f,
- 0x2c5f, 0x2c5f,
- 0x2cf4, 0x2cf8,
- 0x2d26, 0x2d26,
- 0x2d28, 0x2d2c,
- 0x2d2e, 0x2d2f,
- 0x2d68, 0x2d6e,
- 0x2d71, 0x2d7e,
- 0x2d97, 0x2d9f,
- 0x2da7, 0x2da7,
- 0x2daf, 0x2daf,
- 0x2db7, 0x2db7,
- 0x2dbf, 0x2dbf,
- 0x2dc7, 0x2dc7,
- 0x2dcf, 0x2dcf,
- 0x2dd7, 0x2dd7,
- 0x2ddf, 0x2ddf,
- 0x2e3c, 0x2e7f,
- 0x2e9a, 0x2e9a,
- 0x2ef4, 0x2eff,
- 0x2fd6, 0x2fef,
- 0x2ffc, 0x2fff,
- 0x3040, 0x3040,
- 0x3097, 0x3098,
- 0x3100, 0x3104,
- 0x312e, 0x3130,
- 0x318f, 0x318f,
- 0x31bb, 0x31bf,
- 0x31e4, 0x31ef,
- 0x321f, 0x321f,
- 0x32ff, 0x32ff,
- 0x4db6, 0x4dbf,
- 0x9fcd, 0x9fff,
- 0xa48d, 0xa48f,
- 0xa4c7, 0xa4cf,
- 0xa62c, 0xa63f,
- 0xa698, 0xa69e,
- 0xa6f8, 0xa6ff,
- 0xa78f, 0xa78f,
- 0xa794, 0xa79f,
- 0xa7ab, 0xa7f7,
- 0xa82c, 0xa82f,
- 0xa83a, 0xa83f,
- 0xa878, 0xa87f,
- 0xa8c5, 0xa8cd,
- 0xa8da, 0xa8df,
- 0xa8fc, 0xa8ff,
- 0xa954, 0xa95e,
- 0xa97d, 0xa97f,
- 0xa9ce, 0xa9ce,
- 0xa9da, 0xa9dd,
- 0xa9e0, 0xa9ff,
- 0xaa37, 0xaa3f,
- 0xaa4e, 0xaa4f,
- 0xaa5a, 0xaa5b,
- 0xaa7c, 0xaa7f,
- 0xaac3, 0xaada,
- 0xaaf7, 0xab00,
- 0xab07, 0xab08,
- 0xab0f, 0xab10,
- 0xab17, 0xab1f,
- 0xab27, 0xab27,
- 0xab2f, 0xabbf,
- 0xabee, 0xabef,
- 0xabfa, 0xabff,
- 0xd7a4, 0xd7af,
- 0xd7c7, 0xd7ca,
- 0xd7fc, 0xf8ff,
- 0xfa6e, 0xfa6f,
- 0xfada, 0xfaff,
- 0xfb07, 0xfb12,
- 0xfb18, 0xfb1c,
- 0xfb37, 0xfb37,
- 0xfb3d, 0xfb3d,
- 0xfb3f, 0xfb3f,
- 0xfb42, 0xfb42,
- 0xfb45, 0xfb45,
- 0xfbc2, 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,
- 0x10856, 0x10856,
- 0x10860, 0x108ff,
- 0x1091c, 0x1091e,
- 0x1093a, 0x1093e,
- 0x10940, 0x1097f,
- 0x109b8, 0x109bd,
- 0x109c0, 0x109ff,
- 0x10a04, 0x10a04,
- 0x10a07, 0x10a0b,
- 0x10a14, 0x10a14,
- 0x10a18, 0x10a18,
- 0x10a34, 0x10a37,
- 0x10a3b, 0x10a3e,
- 0x10a48, 0x10a4f,
- 0x10a59, 0x10a5f,
- 0x10a80, 0x10aff,
- 0x10b36, 0x10b38,
- 0x10b56, 0x10b57,
- 0x10b73, 0x10b77,
- 0x10b80, 0x10bff,
- 0x10c49, 0x10e5f,
- 0x10e7f, 0x10fff,
- 0x1104e, 0x11051,
- 0x11070, 0x1107f,
- 0x110c2, 0x110cf,
- 0x110e9, 0x110ef,
- 0x110fa, 0x110ff,
- 0x11135, 0x11135,
- 0x11144, 0x1117f,
- 0x111c9, 0x111cf,
- 0x111da, 0x1167f,
- 0x116b8, 0x116bf,
- 0x116ca, 0x11fff,
- 0x1236f, 0x123ff,
- 0x12463, 0x1246f,
- 0x12474, 0x12fff,
- 0x1342f, 0x167ff,
- 0x16a39, 0x16eff,
- 0x16f45, 0x16f4f,
- 0x16f7f, 0x16f8e,
- 0x16fa0, 0x1afff,
- 0x1b002, 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, 0x1edff,
- 0x1ee04, 0x1ee04,
- 0x1ee20, 0x1ee20,
- 0x1ee23, 0x1ee23,
- 0x1ee25, 0x1ee26,
- 0x1ee28, 0x1ee28,
- 0x1ee33, 0x1ee33,
- 0x1ee38, 0x1ee38,
- 0x1ee3a, 0x1ee3a,
- 0x1ee3c, 0x1ee41,
- 0x1ee43, 0x1ee46,
- 0x1ee48, 0x1ee48,
- 0x1ee4a, 0x1ee4a,
- 0x1ee4c, 0x1ee4c,
- 0x1ee50, 0x1ee50,
- 0x1ee53, 0x1ee53,
- 0x1ee55, 0x1ee56,
- 0x1ee58, 0x1ee58,
- 0x1ee5a, 0x1ee5a,
- 0x1ee5c, 0x1ee5c,
- 0x1ee5e, 0x1ee5e,
- 0x1ee60, 0x1ee60,
- 0x1ee63, 0x1ee63,
- 0x1ee65, 0x1ee66,
- 0x1ee6b, 0x1ee6b,
- 0x1ee73, 0x1ee73,
- 0x1ee78, 0x1ee78,
- 0x1ee7d, 0x1ee7d,
- 0x1ee7f, 0x1ee7f,
- 0x1ee8a, 0x1ee8a,
- 0x1ee9c, 0x1eea0,
- 0x1eea4, 0x1eea4,
- 0x1eeaa, 0x1eeaa,
- 0x1eebc, 0x1eeef,
- 0x1eef2, 0x1efff,
- 0x1f02c, 0x1f02f,
- 0x1f094, 0x1f09f,
- 0x1f0af, 0x1f0b0,
- 0x1f0bf, 0x1f0c0,
- 0x1f0d0, 0x1f0d0,
- 0x1f0e0, 0x1f0ff,
- 0x1f10b, 0x1f10f,
- 0x1f12f, 0x1f12f,
- 0x1f16c, 0x1f16f,
- 0x1f19b, 0x1f1e5,
- 0x1f203, 0x1f20f,
- 0x1f23b, 0x1f23f,
- 0x1f249, 0x1f24f,
- 0x1f252, 0x1f2ff,
- 0x1f321, 0x1f32f,
- 0x1f336, 0x1f336,
- 0x1f37d, 0x1f37f,
- 0x1f394, 0x1f39f,
- 0x1f3c5, 0x1f3c5,
- 0x1f3cb, 0x1f3df,
- 0x1f3f1, 0x1f3ff,
- 0x1f43f, 0x1f43f,
- 0x1f441, 0x1f441,
- 0x1f4f8, 0x1f4f8,
- 0x1f4fd, 0x1f4ff,
- 0x1f53e, 0x1f53f,
- 0x1f544, 0x1f54f,
- 0x1f568, 0x1f5fa,
- 0x1f641, 0x1f644,
- 0x1f650, 0x1f67f,
- 0x1f6c6, 0x1f6ff,
- 0x1f774, 0x1ffff,
- 0x2a6d7, 0x2a6ff,
- 0x2b735, 0x2b73f,
- 0x2b81e, 0x2f7ff,
- 0x2fa1e, 0xe0000,
- 0xe0002, 0xe001f,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
- 288,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x05b0, 0x05b9,
- 0x05bb, 0x05c3,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9a,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20aa,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xe000, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ab,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffd, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
- 312,
- 0x0000, 0x01f5,
- 0x01fa, 0x0217,
- 0x0250, 0x02a8,
- 0x02b0, 0x02de,
- 0x02e0, 0x02e9,
- 0x0300, 0x0345,
- 0x0360, 0x0361,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d6,
- 0x03da, 0x03da,
- 0x03dc, 0x03dc,
- 0x03de, 0x03de,
- 0x03e0, 0x03e0,
- 0x03e2, 0x03f3,
- 0x0401, 0x040c,
- 0x040e, 0x044f,
- 0x0451, 0x045c,
- 0x045e, 0x0486,
- 0x0490, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04eb,
- 0x04ee, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x0589,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0652,
- 0x0660, 0x066d,
- 0x0670, 0x06b7,
- 0x06ba, 0x06be,
- 0x06c0, 0x06ce,
- 0x06d0, 0x06ed,
- 0x06f0, 0x06f9,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f69,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f95,
- 0x0f97, 0x0f97,
- 0x0f99, 0x0fad,
- 0x0fb1, 0x0fb7,
- 0x0fb9, 0x0fb9,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x202e,
- 0x2030, 0x2046,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20ac,
- 0x20d0, 0x20e1,
- 0x2100, 0x2138,
- 0x2153, 0x2182,
- 0x2190, 0x21ea,
- 0x2200, 0x22f1,
- 0x2300, 0x2300,
- 0x2302, 0x237a,
- 0x2400, 0x2424,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25ef,
- 0x2600, 0x2613,
- 0x261a, 0x266f,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x3000, 0x3037,
- 0x303f, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x319f,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x4e00, 0x9fa5,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1e, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfffc, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
- 369,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f3,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdf0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x1fffe, 0x1ffff,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
- 402,
- 0x0000, 0x021f,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034e,
- 0x0360, 0x0362,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03d7,
- 0x03da, 0x03f5,
- 0x0400, 0x0486,
- 0x0488, 0x0489,
- 0x048c, 0x04c4,
- 0x04c7, 0x04c8,
- 0x04cb, 0x04cc,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x066d,
- 0x0670, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b0,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f6,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2046,
- 0x2048, 0x204d,
- 0x206a, 0x2070,
- 0x2074, 0x208e,
- 0x20a0, 0x20af,
- 0x20d0, 0x20e3,
- 0x2100, 0x213a,
- 0x2153, 0x2183,
- 0x2190, 0x21f3,
- 0x2200, 0x22f1,
- 0x2300, 0x237b,
- 0x237d, 0x239a,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24ea,
- 0x2500, 0x2595,
- 0x25a0, 0x25f7,
- 0x2600, 0x2613,
- 0x2619, 0x2671,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2767,
- 0x2776, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x2800, 0x28ff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303a,
- 0x303e, 0x303f,
- 0x3041, 0x3094,
- 0x3099, 0x309e,
- 0x30a1, 0x30fe,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x3200, 0x321c,
- 0x3220, 0x3243,
- 0x3260, 0x327b,
- 0x327f, 0x32b0,
- 0x32c0, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4a1,
- 0xa4a4, 0xa4b3,
- 0xa4b5, 0xa4c0,
- 0xa4c2, 0xa4c4,
- 0xa4c6, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfb,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe44,
- 0xfe49, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
- 0xfe70, 0xfe72,
- 0xfe74, 0xfe74,
- 0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xff5e,
- 0xff61, 0xffbe,
- 0xffc2, 0xffc7,
- 0xffca, 0xffcf,
- 0xffd2, 0xffd7,
- 0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+ 1,
+ 0x000a, 0x000a,
+}; /* CR_NEWLINE */
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
- 397,
- 0x0000, 0x0220,
- 0x0222, 0x0233,
- 0x0250, 0x02ad,
- 0x02b0, 0x02ee,
- 0x0300, 0x034f,
- 0x0360, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03f6,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x060c, 0x060c,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0655,
- 0x0660, 0x06ed,
- 0x06f0, 0x06fe,
- 0x0700, 0x070d,
- 0x070f, 0x072c,
- 0x0730, 0x074a,
- 0x0780, 0x07b1,
- 0x0901, 0x0903,
- 0x0905, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09bc,
- 0x09be, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 0x09d7, 0x09d7,
- 0x09dc, 0x09dd,
- 0x09df, 0x09e3,
- 0x09e6, 0x09fa,
- 0x0a02, 0x0a02,
- 0x0a05, 0x0a0a,
- 0x0a0f, 0x0a10,
- 0x0a13, 0x0a28,
- 0x0a2a, 0x0a30,
- 0x0a32, 0x0a33,
- 0x0a35, 0x0a36,
- 0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
- 0x0a3e, 0x0a42,
- 0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 0x0a81, 0x0a83,
- 0x0a85, 0x0a8b,
- 0x0a8d, 0x0a8d,
- 0x0a8f, 0x0a91,
- 0x0a93, 0x0aa8,
- 0x0aaa, 0x0ab0,
- 0x0ab2, 0x0ab3,
- 0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
- 0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
- 0x0ad0, 0x0ad0,
- 0x0ae0, 0x0ae0,
- 0x0ae6, 0x0aef,
- 0x0b01, 0x0b03,
- 0x0b05, 0x0b0c,
- 0x0b0f, 0x0b10,
- 0x0b13, 0x0b28,
- 0x0b2a, 0x0b30,
- 0x0b32, 0x0b33,
- 0x0b36, 0x0b39,
- 0x0b3c, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b70,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bf2,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 0x0c66, 0x0c6f,
- 0x0c82, 0x0c83,
- 0x0c85, 0x0c8c,
- 0x0c8e, 0x0c90,
- 0x0c92, 0x0ca8,
- 0x0caa, 0x0cb3,
- 0x0cb5, 0x0cb9,
- 0x0cbe, 0x0cc4,
- 0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
- 0x0cd5, 0x0cd6,
- 0x0cde, 0x0cde,
- 0x0ce0, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
- 0x16a0, 0x16f0,
- 0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
- 0x1740, 0x1753,
- 0x1760, 0x176c,
- 0x176e, 0x1770,
- 0x1772, 0x1773,
- 0x1780, 0x17dc,
- 0x17e0, 0x17e9,
- 0x1800, 0x180e,
- 0x1810, 0x1819,
- 0x1820, 0x1877,
- 0x1880, 0x18a9,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2052,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213a,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23ce,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x24fe,
- 0x2500, 0x2613,
- 0x2616, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2689,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2aff,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321c,
- 0x3220, 0x3243,
- 0x3251, 0x327b,
- 0x327f, 0x32cb,
- 0x32d0, 0x32fe,
- 0x3300, 0x3376,
- 0x337b, 0x33dd,
- 0x33e0, 0x33fe,
- 0x3400, 0x4db5,
- 0x4e00, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfc,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 0xfe30, 0xfe46,
- 0xfe49, 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, 0xffff,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10400, 0x10425,
- 0x10428, 0x1044d,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d400, 0x1d454,
- 0x1d456, 0x1d49c,
- 0x1d49e, 0x1d49f,
- 0x1d4a2, 0x1d4a2,
- 0x1d4a5, 0x1d4a6,
- 0x1d4a9, 0x1d4ac,
- 0x1d4ae, 0x1d4b9,
- 0x1d4bb, 0x1d4bb,
- 0x1d4bd, 0x1d4c0,
- 0x1d4c2, 0x1d4c3,
- 0x1d4c5, 0x1d505,
- 0x1d507, 0x1d50a,
- 0x1d50d, 0x1d514,
- 0x1d516, 0x1d51c,
- 0x1d51e, 0x1d539,
- 0x1d53b, 0x1d53e,
- 0x1d540, 0x1d544,
- 0x1d546, 0x1d546,
- 0x1d54a, 0x1d550,
- 0x1d552, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
+/* 'Alpha': [[:Alpha:]] */
+#define CR_Alpha CR_Alphabetic
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
- 412,
- 0x0000, 0x0236,
- 0x0250, 0x0357,
- 0x035d, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x03fb,
- 0x0400, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f5,
- 0x04f8, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05a1,
- 0x05a3, 0x05b9,
- 0x05bb, 0x05c4,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060c, 0x0615,
- 0x061b, 0x061b,
- 0x061f, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x0658,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x074f,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x0981, 0x0983,
- 0x0985, 0x098c,
- 0x098f, 0x0990,
- 0x0993, 0x09a8,
- 0x09aa, 0x09b0,
- 0x09b2, 0x09b2,
- 0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
- 0x09c7, 0x09c8,
- 0x09cb, 0x09cd,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 0x0b66, 0x0b71,
- 0x0b82, 0x0b83,
- 0x0b85, 0x0b8a,
- 0x0b8e, 0x0b90,
- 0x0b92, 0x0b95,
- 0x0b99, 0x0b9a,
- 0x0b9c, 0x0b9c,
- 0x0b9e, 0x0b9f,
- 0x0ba3, 0x0ba4,
- 0x0ba8, 0x0baa,
- 0x0bae, 0x0bb5,
- 0x0bb7, 0x0bb9,
- 0x0bbe, 0x0bc2,
- 0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
- 0x0bd7, 0x0bd7,
- 0x0be7, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fcf,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 0x10c5,
- 0x10d0, 0x10f8,
- 0x10fb, 0x10fb,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1206,
- 0x1208, 0x1246,
- 0x1248, 0x1248,
- 0x124a, 0x124d,
- 0x1250, 0x1256,
- 0x1258, 0x1258,
- 0x125a, 0x125d,
- 0x1260, 0x1286,
- 0x1288, 0x1288,
- 0x128a, 0x128d,
- 0x1290, 0x12ae,
- 0x12b0, 0x12b0,
- 0x12b2, 0x12b5,
- 0x12b8, 0x12be,
- 0x12c0, 0x12c0,
- 0x12c2, 0x12c5,
- 0x12c8, 0x12ce,
- 0x12d0, 0x12d6,
- 0x12d8, 0x12ee,
- 0x12f0, 0x130e,
- 0x1310, 0x1310,
- 0x1312, 0x1315,
- 0x1318, 0x131e,
- 0x1320, 0x1346,
- 0x1348, 0x135a,
- 0x1361, 0x137c,
- 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x19e0, 0x19ff,
- 0x1d00, 0x1d6b,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2054,
- 0x2057, 0x2057,
- 0x205f, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x20a0, 0x20b1,
- 0x20d0, 0x20ea,
- 0x2100, 0x213b,
- 0x213d, 0x214b,
- 0x2153, 0x2183,
- 0x2190, 0x23d0,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x2617,
- 0x2619, 0x267d,
- 0x2680, 0x2691,
- 0x26a0, 0x26a1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b0d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x327d,
- 0x327f, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fa5,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
- 0xfb00, 0xfb06,
- 0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
- 0xfb38, 0xfb3c,
- 0xfb3e, 0xfb3e,
- 0xfb40, 0xfb41,
- 0xfb43, 0xfb44,
- 0xfb46, 0xfbb1,
- 0xfbd3, 0xfd3f,
- 0xfd50, 0xfd8f,
- 0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe0f,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1013f,
- 0x10300, 0x1031e,
- 0x10320, 0x10323,
- 0x10330, 0x1034a,
- 0x10380, 0x1039d,
- 0x1039f, 0x1039f,
- 0x10400, 0x1049d,
- 0x104a0, 0x104a9,
- 0x10800, 0x10805,
- 0x10808, 0x10808,
- 0x1080a, 0x10835,
- 0x10837, 0x10838,
- 0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d300, 0x1d356,
- 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, 0x1d6a3,
- 0x1d6a8, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
+/* '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 */
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
- 430,
- 0x0000, 0x0241,
- 0x0250, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037a,
- 0x037e, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x04ce,
- 0x04d0, 0x04f9,
- 0x0500, 0x050f,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05b9,
- 0x05bb, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 0x097d, 0x097d,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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, 0x0ce1,
- 0x0ce6, 0x0cef,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 0x1900, 0x191c,
- 0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
- 0x1970, 0x1974,
- 0x1980, 0x19a9,
- 0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
- 0x1d00, 0x1dc3,
- 0x1e00, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20eb,
- 0x2100, 0x214c,
- 0x2153, 0x2183,
- 0x2190, 0x23db,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b1,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27c6,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b13,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa716,
- 0xa800, 0xa82b,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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,
- 0x10a00, 0x10a03,
- 0x10a05, 0x10a06,
- 0x10a0c, 0x10a13,
- 0x10a15, 0x10a17,
- 0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d12a, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 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, 0x1d7c9,
- 0x1d7ce, 0x1d7ff,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
+/* 'Cntrl': [[:Cntrl:]] */
+#define CR_Cntrl CR_Cc
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
- 440,
- 0x0000, 0x036f,
- 0x0374, 0x0375,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
- 0x038c, 0x038c,
- 0x038e, 0x03a1,
- 0x03a3, 0x03ce,
- 0x03d0, 0x0486,
- 0x0488, 0x0513,
- 0x0531, 0x0556,
- 0x0559, 0x055f,
- 0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
- 0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x060b, 0x0615,
- 0x061b, 0x061b,
- 0x061e, 0x061f,
- 0x0621, 0x063a,
- 0x0640, 0x065e,
- 0x0660, 0x070d,
- 0x070f, 0x074a,
- 0x074d, 0x076d,
- 0x0780, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
- 0x0958, 0x0970,
- 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,
- 0x0a59, 0x0a5c,
- 0x0a5e, 0x0a5e,
- 0x0a66, 0x0a74,
- 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, 0x0b43,
- 0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
- 0x0b56, 0x0b57,
- 0x0b5c, 0x0b5d,
- 0x0b5f, 0x0b61,
- 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,
- 0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
- 0x0c01, 0x0c03,
- 0x0c05, 0x0c0c,
- 0x0c0e, 0x0c10,
- 0x0c12, 0x0c28,
- 0x0c2a, 0x0c33,
- 0x0c35, 0x0c39,
- 0x0c3e, 0x0c44,
- 0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
- 0x0c55, 0x0c56,
- 0x0c60, 0x0c61,
- 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,
- 0x0cf1, 0x0cf2,
- 0x0d02, 0x0d03,
- 0x0d05, 0x0d0c,
- 0x0d0e, 0x0d10,
- 0x0d12, 0x0d28,
- 0x0d2a, 0x0d39,
- 0x0d3e, 0x0d43,
- 0x0d46, 0x0d48,
- 0x0d4a, 0x0d4d,
- 0x0d57, 0x0d57,
- 0x0d60, 0x0d61,
- 0x0d66, 0x0d6f,
- 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, 0x0f6a,
- 0x0f71, 0x0f8b,
- 0x0f90, 0x0f97,
- 0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fcf, 0x0fd1,
- 0x1000, 0x1021,
- 0x1023, 0x1027,
- 0x1029, 0x102a,
- 0x102c, 0x1032,
- 0x1036, 0x1039,
- 0x1040, 0x1059,
- 0x10a0, 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, 0x18a9,
- 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,
- 0x1d00, 0x1dca,
- 0x1dfe, 0x1e9b,
- 0x1ea0, 0x1ef9,
- 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,
- 0x2000, 0x2063,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x2094,
- 0x20a0, 0x20b5,
- 0x20d0, 0x20ef,
- 0x2100, 0x214e,
- 0x2153, 0x2184,
- 0x2190, 0x23e7,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x269c,
- 0x26a0, 0x26b2,
- 0x2701, 0x2704,
- 0x2706, 0x2709,
- 0x270c, 0x2727,
- 0x2729, 0x274b,
- 0x274d, 0x274d,
- 0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
- 0x2761, 0x2794,
- 0x2798, 0x27af,
- 0x27b1, 0x27be,
- 0x27c0, 0x27ca,
- 0x27d0, 0x27eb,
- 0x27f0, 0x2b1a,
- 0x2b20, 0x2b23,
- 0x2c00, 0x2c2e,
- 0x2c30, 0x2c5e,
- 0x2c60, 0x2c6c,
- 0x2c74, 0x2c77,
- 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,
- 0x2e00, 0x2e17,
- 0x2e1c, 0x2e1d,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
- 0x3041, 0x3096,
- 0x3099, 0x30ff,
- 0x3105, 0x312c,
- 0x3131, 0x318e,
- 0x3190, 0x31b7,
- 0x31c0, 0x31cf,
- 0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fbb,
- 0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa700, 0xa71a,
- 0xa720, 0xa721,
- 0xa800, 0xa82b,
- 0xa840, 0xa877,
- 0xac00, 0xd7a3,
- 0xd800, 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,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe23,
- 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, 0x1000b,
- 0x1000d, 0x10026,
- 0x10028, 0x1003a,
- 0x1003c, 0x1003d,
- 0x1003f, 0x1004d,
- 0x10050, 0x1005d,
- 0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 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, 0x1091f,
- 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,
- 0x1d12a, 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,
- 0x1fffe, 0x2a6d6,
- 0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
+/* 'Digit': [[:Digit:]] */
+#define CR_Digit CR_Nd
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
- 455,
- 0x0000, 0x0377,
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+ 490,
+ 0x0021, 0x007e,
+ 0x00a1, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0523,
+ 0x03a3, 0x0525,
0x0531, 0x0556,
0x0559, 0x055f,
0x0561, 0x0587,
@@ -22117,11 +14127,13 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x070f, 0x074a,
0x074d, 0x07b1,
0x07c0, 0x07fa,
- 0x0901, 0x0939,
- 0x093c, 0x094d,
- 0x0950, 0x0954,
+ 0x0800, 0x082d,
+ 0x0830, 0x083e,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
0x0958, 0x0972,
- 0x097b, 0x097f,
+ 0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
0x098f, 0x0990,
@@ -22135,7 +14147,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fa,
+ 0x09e6, 0x09fb,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -22273,14 +14285,10 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x0f90, 0x0f97,
0x0f99, 0x0fbc,
0x0fbe, 0x0fcc,
- 0x0fce, 0x0fd4,
- 0x1000, 0x1099,
- 0x109e, 0x10c5,
+ 0x0fce, 0x0fd8,
+ 0x1000, 0x10c5,
0x10d0, 0x10fc,
- 0x1100, 0x1159,
- 0x115f, 0x11a2,
- 0x11a8, 0x11f9,
- 0x1200, 0x1248,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -22299,8 +14307,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x135f, 0x137c,
0x1380, 0x1399,
0x13a0, 0x13f4,
- 0x1401, 0x1676,
- 0x1680, 0x169c,
+ 0x1400, 0x167f,
+ 0x1681, 0x169c,
0x16a0, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
@@ -22312,21 +14320,26 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1780, 0x17dd,
0x17e0, 0x17e9,
0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x1800, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
+ 0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
0x1940, 0x1940,
0x1944, 0x196d,
0x1970, 0x1974,
- 0x1980, 0x19a9,
+ 0x1980, 0x19ab,
0x19b0, 0x19c9,
- 0x19d0, 0x19d9,
+ 0x19d0, 0x19da,
0x19de, 0x1a1b,
- 0x1a1e, 0x1a1f,
+ 0x1a1e, 0x1a5e,
+ 0x1a60, 0x1a7c,
+ 0x1a7f, 0x1a89,
+ 0x1a90, 0x1a99,
+ 0x1aa0, 0x1aad,
0x1b00, 0x1b4b,
0x1b50, 0x1b7c,
0x1b80, 0x1baa,
@@ -22334,8 +14347,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1c00, 0x1c37,
0x1c3b, 0x1c49,
0x1c4d, 0x1c7f,
+ 0x1cd0, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfe, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -22351,40 +14365,40 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x200b, 0x2027,
+ 0x202a, 0x202e,
+ 0x2030, 0x205e,
+ 0x2060, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
- 0x20a0, 0x20b5,
+ 0x20a0, 0x20b8,
0x20d0, 0x20f0,
- 0x2100, 0x214f,
- 0x2153, 0x2188,
- 0x2190, 0x23e7,
+ 0x2100, 0x2189,
+ 0x2190, 0x23e8,
0x2400, 0x2426,
0x2440, 0x244a,
- 0x2460, 0x269d,
- 0x26a0, 0x26bc,
- 0x26c0, 0x26c3,
+ 0x2460, 0x26cd,
+ 0x26cf, 0x26e1,
+ 0x26e3, 0x26e3,
+ 0x26e8, 0x26ff,
0x2701, 0x2704,
0x2706, 0x2709,
0x270c, 0x2727,
0x2729, 0x274b,
0x274d, 0x274d,
0x274f, 0x2752,
- 0x2756, 0x2756,
- 0x2758, 0x275e,
+ 0x2756, 0x275e,
0x2761, 0x2794,
0x2798, 0x27af,
0x27b1, 0x27be,
0x27c0, 0x27ca,
0x27cc, 0x27cc,
0x27d0, 0x2b4c,
- 0x2b50, 0x2b54,
+ 0x2b50, 0x2b59,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2c6f,
- 0x2c71, 0x2c7d,
- 0x2c80, 0x2cea,
+ 0x2c60, 0x2cf1,
0x2cf9, 0x2d25,
0x2d30, 0x2d65,
0x2d6f, 0x2d6f,
@@ -22397,12 +14411,12 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e30,
+ 0x2de0, 0x2e31,
0x2e80, 0x2e99,
0x2e9b, 0x2ef3,
0x2f00, 0x2fd5,
0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x3001, 0x303f,
0x3041, 0x3096,
0x3099, 0x30ff,
0x3105, 0x312d,
@@ -22410,30 +14424,41 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x3190, 0x31b7,
0x31c0, 0x31e3,
0x31f0, 0x321e,
- 0x3220, 0x3243,
- 0x3250, 0x32fe,
+ 0x3220, 0x32fe,
0x3300, 0x4db5,
- 0x4dc0, 0x9fc3,
+ 0x4dc0, 0x9fcb,
0xa000, 0xa48c,
0xa490, 0xa4c6,
- 0xa500, 0xa62b,
+ 0xa4d0, 0xa62b,
0xa640, 0xa65f,
0xa662, 0xa673,
0xa67c, 0xa697,
+ 0xa6a0, 0xa6f7,
0xa700, 0xa78c,
0xa7fb, 0xa82b,
+ 0xa830, 0xa839,
0xa840, 0xa877,
0xa880, 0xa8c4,
0xa8ce, 0xa8d9,
+ 0xa8e0, 0xa8fb,
0xa900, 0xa953,
- 0xa95f, 0xa95f,
+ 0xa95f, 0xa97c,
+ 0xa980, 0xa9cd,
+ 0xa9cf, 0xa9d9,
+ 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa5f,
+ 0xaa5c, 0xaa7b,
+ 0xaa80, 0xaac2,
+ 0xaadb, 0xaadf,
+ 0xabc0, 0xabed,
+ 0xabf0, 0xabf9,
0xac00, 0xd7a3,
- 0xd800, 0xfa2d,
- 0xfa30, 0xfa6a,
+ 0xd7b0, 0xd7c6,
+ 0xd7cb, 0xd7fb,
+ 0xe000, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
@@ -22446,7 +14471,7 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22462,7 +14487,8 @@ static const OnigCodePoint CR_Age_5_1[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -22489,8 +14515,9 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1080a, 0x10835,
0x10837, 0x10838,
0x1083c, 0x1083c,
- 0x1083f, 0x1083f,
- 0x10900, 0x10919,
+ 0x1083f, 0x10855,
+ 0x10857, 0x1085f,
+ 0x10900, 0x1091b,
0x1091f, 0x10939,
0x1093f, 0x1093f,
0x10a00, 0x10a03,
@@ -22501,9 +14528,18 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x10a38, 0x10a3a,
0x10a3f, 0x10a47,
0x10a50, 0x10a58,
+ 0x10a60, 0x10a7f,
+ 0x10b00, 0x10b35,
+ 0x10b39, 0x10b55,
+ 0x10b58, 0x10b72,
+ 0x10b78, 0x10b7f,
+ 0x10c00, 0x10c48,
+ 0x10e60, 0x10e7e,
+ 0x11080, 0x110c1,
0x12000, 0x1236e,
0x12400, 0x12462,
0x12470, 0x12473,
+ 0x13000, 0x1342e,
0x1d000, 0x1d0f5,
0x1d100, 0x1d126,
0x1d129, 0x1d1dd,
@@ -22533,30 +14569,42 @@ static const OnigCodePoint CR_Age_5_1[] = {
0x1d7ce, 0x1d7ff,
0x1f000, 0x1f02b,
0x1f030, 0x1f093,
- 0x1fffe, 0x2a6d6,
+ 0x1f100, 0x1f10a,
+ 0x1f110, 0x1f12e,
+ 0x1f131, 0x1f131,
+ 0x1f13d, 0x1f13d,
+ 0x1f13f, 0x1f13f,
+ 0x1f142, 0x1f142,
+ 0x1f146, 0x1f146,
+ 0x1f14a, 0x1f14e,
+ 0x1f157, 0x1f157,
+ 0x1f15f, 0x1f15f,
+ 0x1f179, 0x1f179,
+ 0x1f17b, 0x1f17c,
+ 0x1f17f, 0x1f17f,
+ 0x1f18a, 0x1f18d,
+ 0x1f190, 0x1f190,
+ 0x1f200, 0x1f200,
+ 0x1f210, 0x1f231,
+ 0x1f240, 0x1f248,
+ 0x20000, 0x2a6d6,
+ 0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Graph */
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
- 495,
- 0x0000, 0x0377,
+/* 'Lower': [[:Lower:]] */
+#define CR_Lower CR_Lowercase
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+ 487,
+ 0x0020, 0x007e,
+ 0x00a0, 0x0377,
0x037a, 0x037e,
0x0384, 0x038a,
0x038c, 0x038c,
@@ -22814,7 +14862,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1fdd, 0x1fef,
0x1ff2, 0x1ff4,
0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
+ 0x2000, 0x2027,
+ 0x202a, 0x2064,
0x206a, 0x2071,
0x2074, 0x208e,
0x2090, 0x2094,
@@ -22903,7 +14952,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xe000, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
@@ -22917,7 +14966,7 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xfbd3, 0xfd3f,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
+ 0xfdf0, 0xfdfd,
0xfe00, 0xfe19,
0xfe20, 0xfe26,
0xfe30, 0xfe52,
@@ -22933,7 +14982,8 @@ static const OnigCodePoint CR_Age_5_2[] = {
0xffda, 0xffdc,
0xffe0, 0xffe6,
0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0xfff9, 0xfffd,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
@@ -23032,54 +15082,84 @@ static const OnigCodePoint CR_Age_5_2[] = {
0x1f200, 0x1f200,
0x1f210, 0x1f231,
0x1f240, 0x1f248,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
0xe0001, 0xe0001,
0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
+ 0xf0000, 0xffffd,
+ 0x100000, 0x10fffd,
+}; /* CR_Print */
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
- 511,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Punct': [[:Punct:]] */
+#define CR_Punct CR_P
+
+/* 'Space': [[:Space:]] */
+#define CR_Space CR_White_Space
+
+/* 'Upper': [[:Upper:]] */
+#define CR_Upper CR_Uppercase
+
+/* 'XDigit': [[:XDigit:]] */
+#define CR_XDigit CR_ASCII_Hex_Digit
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+ 506,
+ 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, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x0483, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x0591, 0x05c7,
+ 0x0591, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0603,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06de, 0x06e8,
+ 0x06ea, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x074a,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
+ 0x07c0, 0x07f5,
+ 0x07fa, 0x07fa,
0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x0900, 0x0977,
+ 0x0900, 0x0939,
+ 0x093c, 0x094e,
+ 0x0950, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23094,7 +15174,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23124,7 +15204,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
0x0ae6, 0x0aef,
- 0x0af1, 0x0af1,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23138,7 +15217,8 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23154,7 +15234,7 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0bca, 0x0bcd,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23168,7 +15248,6 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
@@ -23182,18 +15261,18 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4d,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 0x0d66, 0x0d6f,
+ 0x0d7a, 0x0d7f,
0x0d82, 0x0d83,
0x0d85, 0x0d96,
0x0d9a, 0x0db1,
@@ -23204,9 +15283,10 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0dcf, 0x0dd4,
0x0dd6, 0x0dd6,
0x0dd8, 0x0ddf,
- 0x0df2, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e4e,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23225,14 +15305,24 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x0ec8, 0x0ecd,
0x0ed0, 0x0ed9,
0x0edc, 0x0edd,
- 0x0f00, 0x0f47,
+ 0x0f00, 0x0f00,
+ 0x0f18, 0x0f19,
+ 0x0f20, 0x0f29,
+ 0x0f35, 0x0f35,
+ 0x0f37, 0x0f37,
+ 0x0f39, 0x0f39,
+ 0x0f3e, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f84,
+ 0x0f86, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10d0, 0x10fc,
+ 0x0fc6, 0x0fc6,
+ 0x1000, 0x1049,
+ 0x1050, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
@@ -23249,22 +15339,27 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x1720, 0x1734,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17d3,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dd,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
+ 0x180b, 0x180d,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
@@ -23272,29 +15367,29 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1900, 0x191c,
0x1920, 0x192b,
0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
0x1a60, 0x1a7c,
0x1a7f, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
+ 0x1aa7, 0x1aa7,
0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
+ 0x1b50, 0x1b59,
+ 0x1b6b, 0x1b73,
0x1b80, 0x1baa,
0x1bae, 0x1bb9,
- 0x1bc0, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cd0, 0x1cf2,
+ 0x1c00, 0x1c37,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1cd0, 0x1cd2,
+ 0x1cd4, 0x1cf2,
0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1dfd, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23304,34 +15399,44 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
+ 0x1ff6, 0x1ffc,
+ 0x203f, 0x2040,
+ 0x2054, 0x2054,
+ 0x2071, 0x2071,
+ 0x207f, 0x207f,
+ 0x2090, 0x2094,
0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x27ca,
- 0x27cc, 0x27cc,
- 0x27ce, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf1,
- 0x2cf9, 0x2d25,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cf1,
+ 0x2d00, 0x2d25,
0x2d30, 0x2d65,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23340,108 +15445,107 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e31,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x302f,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x3099, 0x309a,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcb,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa673,
- 0xa67c, 0xa697,
- 0xa6a0, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa791,
- 0xa7a0, 0xa7a9,
- 0xa7fa, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa672,
+ 0xa67c, 0xa67d,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6f1,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa827,
+ 0xa840, 0xa873,
0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa8d0, 0xa8d9,
+ 0xa8e0, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92d,
+ 0xa930, 0xa953,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9c0,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7b,
0xaa80, 0xaac2,
- 0xaadb, 0xaadf,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
+ 0xabec, 0xabed,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa2d,
+ 0xf900, 0xfa2d,
0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
+ 0xfdf0, 0xfdfb,
+ 0xfe00, 0xfe0f,
0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfe33, 0xfe34,
+ 0xfe4d, 0xfe4f,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff3f, 0xff3f,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
+ 0x101fd, 0x101fd,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -23450,40 +15554,30 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a3f, 0x10a3f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
+ 0x11080, 0x110ba,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
+ 0x1d165, 0x1d169,
+ 0x1d16d, 0x1d172,
+ 0x1d17b, 0x1d182,
+ 0x1d185, 0x1d18b,
+ 0x1d1aa, 0x1d1ad,
+ 0x1d242, 0x1d244,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -23503,103 +15597,85 @@ static const OnigCodePoint CR_Age_6_0[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f169,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f5ff,
- 0x1f601, 0x1f610,
- 0x1f612, 0x1f614,
- 0x1f616, 0x1f616,
- 0x1f618, 0x1f618,
- 0x1f61a, 0x1f61a,
- 0x1f61c, 0x1f61e,
- 0x1f620, 0x1f625,
- 0x1f628, 0x1f62b,
- 0x1f62d, 0x1f62d,
- 0x1f630, 0x1f633,
- 0x1f635, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
+}; /* CR_Word */
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
- 549,
- 0x0000, 0x0377,
- 0x037a, 0x037e,
- 0x0384, 0x038a,
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+ 497,
+ 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,
+ 0x0345, 0x0345,
+ 0x0370, 0x0374,
+ 0x0376, 0x0377,
+ 0x037a, 0x037d,
+ 0x0386, 0x0386,
+ 0x0388, 0x038a,
0x038c, 0x038c,
0x038e, 0x03a1,
- 0x03a3, 0x0527,
+ 0x03a3, 0x03f5,
+ 0x03f7, 0x0481,
+ 0x048a, 0x0525,
0x0531, 0x0556,
- 0x0559, 0x055f,
+ 0x0559, 0x0559,
0x0561, 0x0587,
- 0x0589, 0x058a,
- 0x058f, 0x058f,
- 0x0591, 0x05c7,
+ 0x05b0, 0x05bd,
+ 0x05bf, 0x05bf,
+ 0x05c1, 0x05c2,
+ 0x05c4, 0x05c5,
+ 0x05c7, 0x05c7,
0x05d0, 0x05ea,
- 0x05f0, 0x05f4,
- 0x0600, 0x0604,
- 0x0606, 0x061b,
- 0x061e, 0x070d,
- 0x070f, 0x074a,
+ 0x05f0, 0x05f2,
+ 0x0610, 0x061a,
+ 0x0621, 0x0657,
+ 0x0659, 0x065e,
+ 0x0660, 0x0669,
+ 0x066e, 0x06d3,
+ 0x06d5, 0x06dc,
+ 0x06e1, 0x06e8,
+ 0x06ed, 0x06fc,
+ 0x06ff, 0x06ff,
+ 0x0710, 0x073f,
0x074d, 0x07b1,
- 0x07c0, 0x07fa,
- 0x0800, 0x082d,
- 0x0830, 0x083e,
- 0x0840, 0x085b,
- 0x085e, 0x085e,
- 0x08a0, 0x08a0,
- 0x08a2, 0x08ac,
- 0x08e4, 0x08fe,
- 0x0900, 0x0977,
+ 0x07c0, 0x07ea,
+ 0x07f4, 0x07f5,
+ 0x07fa, 0x07fa,
+ 0x0800, 0x0817,
+ 0x081a, 0x082c,
+ 0x0900, 0x0939,
+ 0x093d, 0x094c,
+ 0x094e, 0x094e,
+ 0x0950, 0x0950,
+ 0x0955, 0x0955,
+ 0x0958, 0x0963,
+ 0x0966, 0x096f,
+ 0x0971, 0x0972,
0x0979, 0x097f,
0x0981, 0x0983,
0x0985, 0x098c,
@@ -23608,13 +15684,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x09aa, 0x09b0,
0x09b2, 0x09b2,
0x09b6, 0x09b9,
- 0x09bc, 0x09c4,
+ 0x09bd, 0x09c4,
0x09c7, 0x09c8,
- 0x09cb, 0x09ce,
+ 0x09cb, 0x09cc,
+ 0x09ce, 0x09ce,
0x09d7, 0x09d7,
0x09dc, 0x09dd,
0x09df, 0x09e3,
- 0x09e6, 0x09fb,
+ 0x09e6, 0x09f1,
0x0a01, 0x0a03,
0x0a05, 0x0a0a,
0x0a0f, 0x0a10,
@@ -23623,10 +15700,9 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0a32, 0x0a33,
0x0a35, 0x0a36,
0x0a38, 0x0a39,
- 0x0a3c, 0x0a3c,
0x0a3e, 0x0a42,
0x0a47, 0x0a48,
- 0x0a4b, 0x0a4d,
+ 0x0a4b, 0x0a4c,
0x0a51, 0x0a51,
0x0a59, 0x0a5c,
0x0a5e, 0x0a5e,
@@ -23638,12 +15714,12 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0aaa, 0x0ab0,
0x0ab2, 0x0ab3,
0x0ab5, 0x0ab9,
- 0x0abc, 0x0ac5,
+ 0x0abd, 0x0ac5,
0x0ac7, 0x0ac9,
- 0x0acb, 0x0acd,
+ 0x0acb, 0x0acc,
0x0ad0, 0x0ad0,
0x0ae0, 0x0ae3,
- 0x0ae6, 0x0af1,
+ 0x0ae6, 0x0aef,
0x0b01, 0x0b03,
0x0b05, 0x0b0c,
0x0b0f, 0x0b10,
@@ -23651,13 +15727,14 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0b2a, 0x0b30,
0x0b32, 0x0b33,
0x0b35, 0x0b39,
- 0x0b3c, 0x0b44,
+ 0x0b3d, 0x0b44,
0x0b47, 0x0b48,
- 0x0b4b, 0x0b4d,
+ 0x0b4b, 0x0b4c,
0x0b56, 0x0b57,
0x0b5c, 0x0b5d,
0x0b5f, 0x0b63,
- 0x0b66, 0x0b77,
+ 0x0b66, 0x0b6f,
+ 0x0b71, 0x0b71,
0x0b82, 0x0b83,
0x0b85, 0x0b8a,
0x0b8e, 0x0b90,
@@ -23670,10 +15747,10 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0bae, 0x0bb9,
0x0bbe, 0x0bc2,
0x0bc6, 0x0bc8,
- 0x0bca, 0x0bcd,
+ 0x0bca, 0x0bcc,
0x0bd0, 0x0bd0,
0x0bd7, 0x0bd7,
- 0x0be6, 0x0bfa,
+ 0x0be6, 0x0bef,
0x0c01, 0x0c03,
0x0c05, 0x0c0c,
0x0c0e, 0x0c10,
@@ -23682,50 +15759,50 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0c35, 0x0c39,
0x0c3d, 0x0c44,
0x0c46, 0x0c48,
- 0x0c4a, 0x0c4d,
+ 0x0c4a, 0x0c4c,
0x0c55, 0x0c56,
0x0c58, 0x0c59,
0x0c60, 0x0c63,
0x0c66, 0x0c6f,
- 0x0c78, 0x0c7f,
0x0c82, 0x0c83,
0x0c85, 0x0c8c,
0x0c8e, 0x0c90,
0x0c92, 0x0ca8,
0x0caa, 0x0cb3,
0x0cb5, 0x0cb9,
- 0x0cbc, 0x0cc4,
+ 0x0cbd, 0x0cc4,
0x0cc6, 0x0cc8,
- 0x0cca, 0x0ccd,
+ 0x0cca, 0x0ccc,
0x0cd5, 0x0cd6,
0x0cde, 0x0cde,
0x0ce0, 0x0ce3,
0x0ce6, 0x0cef,
- 0x0cf1, 0x0cf2,
0x0d02, 0x0d03,
0x0d05, 0x0d0c,
0x0d0e, 0x0d10,
- 0x0d12, 0x0d3a,
+ 0x0d12, 0x0d28,
+ 0x0d2a, 0x0d39,
0x0d3d, 0x0d44,
0x0d46, 0x0d48,
- 0x0d4a, 0x0d4e,
+ 0x0d4a, 0x0d4c,
0x0d57, 0x0d57,
0x0d60, 0x0d63,
- 0x0d66, 0x0d75,
- 0x0d79, 0x0d7f,
+ 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, 0x0df4,
+ 0x0df2, 0x0df3,
0x0e01, 0x0e3a,
- 0x0e3f, 0x0e5b,
+ 0x0e40, 0x0e46,
+ 0x0e4d, 0x0e4d,
+ 0x0e50, 0x0e59,
0x0e81, 0x0e82,
0x0e84, 0x0e84,
0x0e87, 0x0e88,
@@ -23741,19 +15818,30 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x0ebb, 0x0ebd,
0x0ec0, 0x0ec4,
0x0ec6, 0x0ec6,
- 0x0ec8, 0x0ecd,
+ 0x0ecd, 0x0ecd,
0x0ed0, 0x0ed9,
- 0x0edc, 0x0edf,
- 0x0f00, 0x0f47,
+ 0x0edc, 0x0edd,
+ 0x0f00, 0x0f00,
+ 0x0f20, 0x0f29,
+ 0x0f40, 0x0f47,
0x0f49, 0x0f6c,
- 0x0f71, 0x0f97,
+ 0x0f71, 0x0f81,
+ 0x0f88, 0x0f8b,
+ 0x0f90, 0x0f97,
0x0f99, 0x0fbc,
- 0x0fbe, 0x0fcc,
- 0x0fce, 0x0fda,
- 0x1000, 0x10c5,
- 0x10c7, 0x10c7,
- 0x10cd, 0x10cd,
- 0x10d0, 0x1248,
+ 0x1000, 0x1036,
+ 0x1038, 0x1038,
+ 0x103b, 0x1049,
+ 0x1050, 0x1062,
+ 0x1065, 0x1068,
+ 0x106e, 0x1086,
+ 0x108e, 0x108e,
+ 0x1090, 0x1099,
+ 0x109c, 0x109d,
+ 0x10a0, 0x10c5,
+ 0x10d0, 0x10fa,
+ 0x10fc, 0x10fc,
+ 0x1100, 0x1248,
0x124a, 0x124d,
0x1250, 0x1256,
0x1258, 0x1258,
@@ -23769,51 +15857,57 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x12d8, 0x1310,
0x1312, 0x1315,
0x1318, 0x135a,
- 0x135d, 0x137c,
- 0x1380, 0x1399,
+ 0x135f, 0x135f,
+ 0x1380, 0x138f,
0x13a0, 0x13f4,
- 0x1400, 0x169c,
- 0x16a0, 0x16f0,
+ 0x1401, 0x166c,
+ 0x166f, 0x167f,
+ 0x1681, 0x169a,
+ 0x16a0, 0x16ea,
+ 0x16ee, 0x16f0,
0x1700, 0x170c,
- 0x170e, 0x1714,
- 0x1720, 0x1736,
+ 0x170e, 0x1713,
+ 0x1720, 0x1733,
0x1740, 0x1753,
0x1760, 0x176c,
0x176e, 0x1770,
0x1772, 0x1773,
- 0x1780, 0x17dd,
+ 0x1780, 0x17b3,
+ 0x17b6, 0x17c8,
+ 0x17d7, 0x17d7,
+ 0x17dc, 0x17dc,
0x17e0, 0x17e9,
- 0x17f0, 0x17f9,
- 0x1800, 0x180e,
0x1810, 0x1819,
0x1820, 0x1877,
0x1880, 0x18aa,
0x18b0, 0x18f5,
0x1900, 0x191c,
0x1920, 0x192b,
- 0x1930, 0x193b,
- 0x1940, 0x1940,
- 0x1944, 0x196d,
+ 0x1930, 0x1938,
+ 0x1946, 0x196d,
0x1970, 0x1974,
0x1980, 0x19ab,
0x19b0, 0x19c9,
0x19d0, 0x19da,
- 0x19de, 0x1a1b,
- 0x1a1e, 0x1a5e,
- 0x1a60, 0x1a7c,
- 0x1a7f, 0x1a89,
+ 0x1a00, 0x1a1b,
+ 0x1a20, 0x1a5e,
+ 0x1a61, 0x1a74,
+ 0x1a80, 0x1a89,
0x1a90, 0x1a99,
- 0x1aa0, 0x1aad,
- 0x1b00, 0x1b4b,
- 0x1b50, 0x1b7c,
- 0x1b80, 0x1bf3,
- 0x1bfc, 0x1c37,
- 0x1c3b, 0x1c49,
- 0x1c4d, 0x1c7f,
- 0x1cc0, 0x1cc7,
- 0x1cd0, 0x1cf6,
- 0x1d00, 0x1de6,
- 0x1dfc, 0x1f15,
+ 0x1aa7, 0x1aa7,
+ 0x1b00, 0x1b33,
+ 0x1b35, 0x1b43,
+ 0x1b45, 0x1b4b,
+ 0x1b50, 0x1b59,
+ 0x1b80, 0x1ba9,
+ 0x1bae, 0x1bb9,
+ 0x1c00, 0x1c35,
+ 0x1c40, 0x1c49,
+ 0x1c4d, 0x1c7d,
+ 0x1ce9, 0x1cec,
+ 0x1cee, 0x1cf2,
+ 0x1d00, 0x1dbf,
+ 0x1e00, 0x1f15,
0x1f18, 0x1f1d,
0x1f20, 0x1f45,
0x1f48, 0x1f4d,
@@ -23823,34 +15917,41 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1f5d, 0x1f5d,
0x1f5f, 0x1f7d,
0x1f80, 0x1fb4,
- 0x1fb6, 0x1fc4,
- 0x1fc6, 0x1fd3,
+ 0x1fb6, 0x1fbc,
+ 0x1fbe, 0x1fbe,
+ 0x1fc2, 0x1fc4,
+ 0x1fc6, 0x1fcc,
+ 0x1fd0, 0x1fd3,
0x1fd6, 0x1fdb,
- 0x1fdd, 0x1fef,
+ 0x1fe0, 0x1fec,
0x1ff2, 0x1ff4,
- 0x1ff6, 0x1ffe,
- 0x2000, 0x2064,
- 0x206a, 0x2071,
- 0x2074, 0x208e,
- 0x2090, 0x209c,
- 0x20a0, 0x20b9,
- 0x20d0, 0x20f0,
- 0x2100, 0x2189,
- 0x2190, 0x23f3,
- 0x2400, 0x2426,
- 0x2440, 0x244a,
- 0x2460, 0x26ff,
- 0x2701, 0x2b4c,
- 0x2b50, 0x2b59,
+ 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,
+ 0x2160, 0x2188,
+ 0x24b6, 0x24e9,
0x2c00, 0x2c2e,
0x2c30, 0x2c5e,
- 0x2c60, 0x2cf3,
- 0x2cf9, 0x2d25,
- 0x2d27, 0x2d27,
- 0x2d2d, 0x2d2d,
- 0x2d30, 0x2d67,
- 0x2d6f, 0x2d70,
- 0x2d7f, 0x2d96,
+ 0x2c60, 0x2ce4,
+ 0x2ceb, 0x2cee,
+ 0x2d00, 0x2d25,
+ 0x2d30, 0x2d65,
+ 0x2d6f, 0x2d6f,
+ 0x2d80, 0x2d96,
0x2da0, 0x2da6,
0x2da8, 0x2dae,
0x2db0, 0x2db6,
@@ -23859,106 +15960,103 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x2dc8, 0x2dce,
0x2dd0, 0x2dd6,
0x2dd8, 0x2dde,
- 0x2de0, 0x2e3b,
- 0x2e80, 0x2e99,
- 0x2e9b, 0x2ef3,
- 0x2f00, 0x2fd5,
- 0x2ff0, 0x2ffb,
- 0x3000, 0x303f,
+ 0x2de0, 0x2dff,
+ 0x2e2f, 0x2e2f,
+ 0x3005, 0x3007,
+ 0x3021, 0x3029,
+ 0x3031, 0x3035,
+ 0x3038, 0x303c,
0x3041, 0x3096,
- 0x3099, 0x30ff,
+ 0x309d, 0x309f,
+ 0x30a1, 0x30fa,
+ 0x30fc, 0x30ff,
0x3105, 0x312d,
0x3131, 0x318e,
- 0x3190, 0x31ba,
- 0x31c0, 0x31e3,
- 0x31f0, 0x321e,
- 0x3220, 0x32fe,
- 0x3300, 0x4db5,
- 0x4dc0, 0x9fcc,
+ 0x31a0, 0x31b7,
+ 0x31f0, 0x31ff,
+ 0x3400, 0x4db5,
+ 0x4e00, 0x9fcb,
0xa000, 0xa48c,
- 0xa490, 0xa4c6,
- 0xa4d0, 0xa62b,
- 0xa640, 0xa697,
- 0xa69f, 0xa6f7,
- 0xa700, 0xa78e,
- 0xa790, 0xa793,
- 0xa7a0, 0xa7aa,
- 0xa7f8, 0xa82b,
- 0xa830, 0xa839,
- 0xa840, 0xa877,
- 0xa880, 0xa8c4,
- 0xa8ce, 0xa8d9,
- 0xa8e0, 0xa8fb,
- 0xa900, 0xa953,
- 0xa95f, 0xa97c,
- 0xa980, 0xa9cd,
+ 0xa4d0, 0xa4fd,
+ 0xa500, 0xa60c,
+ 0xa610, 0xa62b,
+ 0xa640, 0xa65f,
+ 0xa662, 0xa66e,
+ 0xa67f, 0xa697,
+ 0xa6a0, 0xa6ef,
+ 0xa717, 0xa71f,
+ 0xa722, 0xa788,
+ 0xa78b, 0xa78c,
+ 0xa7fb, 0xa801,
+ 0xa803, 0xa805,
+ 0xa807, 0xa80a,
+ 0xa80c, 0xa827,
+ 0xa840, 0xa873,
+ 0xa880, 0xa8c3,
+ 0xa8d0, 0xa8d9,
+ 0xa8f2, 0xa8f7,
+ 0xa8fb, 0xa8fb,
+ 0xa900, 0xa92a,
+ 0xa930, 0xa952,
+ 0xa960, 0xa97c,
+ 0xa980, 0xa9bf,
0xa9cf, 0xa9d9,
- 0xa9de, 0xa9df,
0xaa00, 0xaa36,
0xaa40, 0xaa4d,
0xaa50, 0xaa59,
- 0xaa5c, 0xaa7b,
- 0xaa80, 0xaac2,
- 0xaadb, 0xaaf6,
- 0xab01, 0xab06,
- 0xab09, 0xab0e,
- 0xab11, 0xab16,
- 0xab20, 0xab26,
- 0xab28, 0xab2e,
- 0xabc0, 0xabed,
+ 0xaa60, 0xaa76,
+ 0xaa7a, 0xaa7a,
+ 0xaa80, 0xaabe,
+ 0xaac0, 0xaac0,
+ 0xaac2, 0xaac2,
+ 0xaadb, 0xaadd,
+ 0xabc0, 0xabea,
0xabf0, 0xabf9,
0xac00, 0xd7a3,
0xd7b0, 0xd7c6,
0xd7cb, 0xd7fb,
- 0xd800, 0xfa6d,
+ 0xf900, 0xfa2d,
+ 0xfa30, 0xfa6d,
0xfa70, 0xfad9,
0xfb00, 0xfb06,
0xfb13, 0xfb17,
- 0xfb1d, 0xfb36,
+ 0xfb1d, 0xfb28,
+ 0xfb2a, 0xfb36,
0xfb38, 0xfb3c,
0xfb3e, 0xfb3e,
0xfb40, 0xfb41,
0xfb43, 0xfb44,
- 0xfb46, 0xfbc1,
- 0xfbd3, 0xfd3f,
+ 0xfb46, 0xfbb1,
+ 0xfbd3, 0xfd3d,
0xfd50, 0xfd8f,
0xfd92, 0xfdc7,
- 0xfdd0, 0xfdfd,
- 0xfe00, 0xfe19,
- 0xfe20, 0xfe26,
- 0xfe30, 0xfe52,
- 0xfe54, 0xfe66,
- 0xfe68, 0xfe6b,
+ 0xfdf0, 0xfdfb,
0xfe70, 0xfe74,
0xfe76, 0xfefc,
- 0xfeff, 0xfeff,
- 0xff01, 0xffbe,
+ 0xff10, 0xff19,
+ 0xff21, 0xff3a,
+ 0xff41, 0xff5a,
+ 0xff66, 0xffbe,
0xffc2, 0xffc7,
0xffca, 0xffcf,
0xffd2, 0xffd7,
0xffda, 0xffdc,
- 0xffe0, 0xffe6,
- 0xffe8, 0xffee,
- 0xfff9, 0x1000b,
+ 0x10000, 0x1000b,
0x1000d, 0x10026,
0x10028, 0x1003a,
0x1003c, 0x1003d,
0x1003f, 0x1004d,
0x10050, 0x1005d,
0x10080, 0x100fa,
- 0x10100, 0x10102,
- 0x10107, 0x10133,
- 0x10137, 0x1018a,
- 0x10190, 0x1019b,
- 0x101d0, 0x101fd,
+ 0x10140, 0x10174,
0x10280, 0x1029c,
0x102a0, 0x102d0,
0x10300, 0x1031e,
- 0x10320, 0x10323,
0x10330, 0x1034a,
0x10380, 0x1039d,
- 0x1039f, 0x103c3,
- 0x103c8, 0x103d5,
+ 0x103a0, 0x103c3,
+ 0x103c8, 0x103cf,
+ 0x103d1, 0x103d5,
0x10400, 0x1049d,
0x104a0, 0x104a9,
0x10800, 0x10805,
@@ -23967,53 +16065,22 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x10837, 0x10838,
0x1083c, 0x1083c,
0x1083f, 0x10855,
- 0x10857, 0x1085f,
- 0x10900, 0x1091b,
- 0x1091f, 0x10939,
- 0x1093f, 0x1093f,
- 0x10980, 0x109b7,
- 0x109be, 0x109bf,
+ 0x10900, 0x10915,
+ 0x10920, 0x10939,
0x10a00, 0x10a03,
0x10a05, 0x10a06,
0x10a0c, 0x10a13,
0x10a15, 0x10a17,
0x10a19, 0x10a33,
- 0x10a38, 0x10a3a,
- 0x10a3f, 0x10a47,
- 0x10a50, 0x10a58,
- 0x10a60, 0x10a7f,
+ 0x10a60, 0x10a7c,
0x10b00, 0x10b35,
- 0x10b39, 0x10b55,
- 0x10b58, 0x10b72,
- 0x10b78, 0x10b7f,
+ 0x10b40, 0x10b55,
+ 0x10b60, 0x10b72,
0x10c00, 0x10c48,
- 0x10e60, 0x10e7e,
- 0x11000, 0x1104d,
- 0x11052, 0x1106f,
- 0x11080, 0x110c1,
- 0x110d0, 0x110e8,
- 0x110f0, 0x110f9,
- 0x11100, 0x11134,
- 0x11136, 0x11143,
- 0x11180, 0x111c8,
- 0x111d0, 0x111d9,
- 0x11680, 0x116b7,
- 0x116c0, 0x116c9,
+ 0x11082, 0x110b8,
0x12000, 0x1236e,
0x12400, 0x12462,
- 0x12470, 0x12473,
0x13000, 0x1342e,
- 0x16800, 0x16a38,
- 0x16f00, 0x16f44,
- 0x16f50, 0x16f7e,
- 0x16f8f, 0x16f9f,
- 0x1b000, 0x1b001,
- 0x1d000, 0x1d0f5,
- 0x1d100, 0x1d126,
- 0x1d129, 0x1d1dd,
- 0x1d200, 0x1d245,
- 0x1d300, 0x1d356,
- 0x1d360, 0x1d371,
0x1d400, 0x1d454,
0x1d456, 0x1d49c,
0x1d49e, 0x1d49f,
@@ -24033,1430 +16100,28 @@ static const OnigCodePoint CR_Age_6_1[] = {
0x1d546, 0x1d546,
0x1d54a, 0x1d550,
0x1d552, 0x1d6a5,
- 0x1d6a8, 0x1d7cb,
+ 0x1d6a8, 0x1d6c0,
+ 0x1d6c2, 0x1d6da,
+ 0x1d6dc, 0x1d6fa,
+ 0x1d6fc, 0x1d714,
+ 0x1d716, 0x1d734,
+ 0x1d736, 0x1d74e,
+ 0x1d750, 0x1d76e,
+ 0x1d770, 0x1d788,
+ 0x1d78a, 0x1d7a8,
+ 0x1d7aa, 0x1d7c2,
+ 0x1d7c4, 0x1d7cb,
0x1d7ce, 0x1d7ff,
- 0x1ee00, 0x1ee03,
- 0x1ee05, 0x1ee1f,
- 0x1ee21, 0x1ee22,
- 0x1ee24, 0x1ee24,
- 0x1ee27, 0x1ee27,
- 0x1ee29, 0x1ee32,
- 0x1ee34, 0x1ee37,
- 0x1ee39, 0x1ee39,
- 0x1ee3b, 0x1ee3b,
- 0x1ee42, 0x1ee42,
- 0x1ee47, 0x1ee47,
- 0x1ee49, 0x1ee49,
- 0x1ee4b, 0x1ee4b,
- 0x1ee4d, 0x1ee4f,
- 0x1ee51, 0x1ee52,
- 0x1ee54, 0x1ee54,
- 0x1ee57, 0x1ee57,
- 0x1ee59, 0x1ee59,
- 0x1ee5b, 0x1ee5b,
- 0x1ee5d, 0x1ee5d,
- 0x1ee5f, 0x1ee5f,
- 0x1ee61, 0x1ee62,
- 0x1ee64, 0x1ee64,
- 0x1ee67, 0x1ee6a,
- 0x1ee6c, 0x1ee72,
- 0x1ee74, 0x1ee77,
- 0x1ee79, 0x1ee7c,
- 0x1ee7e, 0x1ee7e,
- 0x1ee80, 0x1ee89,
- 0x1ee8b, 0x1ee9b,
- 0x1eea1, 0x1eea3,
- 0x1eea5, 0x1eea9,
- 0x1eeab, 0x1eebb,
- 0x1eef0, 0x1eef1,
- 0x1f000, 0x1f02b,
- 0x1f030, 0x1f093,
- 0x1f0a0, 0x1f0ae,
- 0x1f0b1, 0x1f0be,
- 0x1f0c1, 0x1f0cf,
- 0x1f0d1, 0x1f0df,
- 0x1f100, 0x1f10a,
- 0x1f110, 0x1f12e,
- 0x1f130, 0x1f16b,
- 0x1f170, 0x1f19a,
- 0x1f1e6, 0x1f202,
- 0x1f210, 0x1f23a,
- 0x1f240, 0x1f248,
- 0x1f250, 0x1f251,
- 0x1f300, 0x1f320,
- 0x1f330, 0x1f335,
- 0x1f337, 0x1f37c,
- 0x1f380, 0x1f393,
- 0x1f3a0, 0x1f3c4,
- 0x1f3c6, 0x1f3ca,
- 0x1f3e0, 0x1f3f0,
- 0x1f400, 0x1f43e,
- 0x1f440, 0x1f440,
- 0x1f442, 0x1f4f7,
- 0x1f4f9, 0x1f4fc,
- 0x1f500, 0x1f53d,
- 0x1f540, 0x1f543,
- 0x1f550, 0x1f567,
- 0x1f5fb, 0x1f640,
- 0x1f645, 0x1f64f,
- 0x1f680, 0x1f6c5,
- 0x1f700, 0x1f773,
- 0x1fffe, 0x2a6d6,
+ 0x20000, 0x2a6d6,
0x2a700, 0x2b734,
- 0x2b740, 0x2b81d,
0x2f800, 0x2fa1d,
- 0x2fffe, 0x2ffff,
- 0x3fffe, 0x3ffff,
- 0x4fffe, 0x4ffff,
- 0x5fffe, 0x5ffff,
- 0x6fffe, 0x6ffff,
- 0x7fffe, 0x7ffff,
- 0x8fffe, 0x8ffff,
- 0x9fffe, 0x9ffff,
- 0xafffe, 0xaffff,
- 0xbfffe, 0xbffff,
- 0xcfffe, 0xcffff,
- 0xdfffe, 0xdffff,
- 0xe0001, 0xe0001,
- 0xe0020, 0xe007f,
- 0xe0100, 0xe01ef,
- 0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
- 1,
- 0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
- 1,
- 0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
- 1,
- 0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
- 1,
- 0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
- 1,
- 0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
- 1,
- 0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
- 1,
- 0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
- 1,
- 0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
- 1,
- 0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
- 1,
- 0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
- 1,
- 0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
- 1,
- 0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
- 1,
- 0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
- 1,
- 0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
- 1,
- 0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
- 1,
- 0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
- 1,
- 0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
- 1,
- 0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
- 1,
- 0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
- 1,
- 0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
- 1,
- 0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
- 1,
- 0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
- 1,
- 0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
- 1,
- 0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
- 1,
- 0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
- 1,
- 0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
- 1,
- 0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
- 1,
- 0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
- 1,
- 0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
- 1,
- 0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
- 1,
- 0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
- 1,
- 0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
- 1,
- 0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
- 1,
- 0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
- 1,
- 0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
- 1,
- 0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
- 1,
- 0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
- 1,
- 0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
- 1,
- 0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
- 1,
- 0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
- 1,
- 0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
- 1,
- 0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
- 1,
- 0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
- 1,
- 0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
- 1,
- 0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
- 1,
- 0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
- 1,
- 0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
- 1,
- 0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
- 1,
- 0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
- 1,
- 0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
- 1,
- 0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
- 1,
- 0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
- 1,
- 0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
- 1,
- 0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
- 1,
- 0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
- 1,
- 0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
- 1,
- 0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
- 1,
- 0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
- 1,
- 0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
- 1,
- 0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
- 1,
- 0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
- 1,
- 0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
- 1,
- 0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
- 1,
- 0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
- 1,
- 0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
- 1,
- 0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
- 1,
- 0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
- 1,
- 0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
- 1,
- 0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
- 1,
- 0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
- 1,
- 0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
- 1,
- 0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
- 1,
- 0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
- 1,
- 0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
- 1,
- 0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
- 1,
- 0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
- 1,
- 0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
- 1,
- 0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
- 1,
- 0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
- 1,
- 0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
- 1,
- 0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
- 1,
- 0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
- 1,
- 0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
- 1,
- 0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
- 1,
- 0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
- 1,
- 0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
- 1,
- 0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
- 1,
- 0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
- 1,
- 0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
- 1,
- 0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
- 1,
- 0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
- 1,
- 0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
- 1,
- 0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
- 1,
- 0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
- 1,
- 0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
- 1,
- 0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
- 1,
- 0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
- 1,
- 0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
- 1,
- 0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
- 1,
- 0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
- 1,
- 0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
- 1,
- 0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
- 1,
- 0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
- 1,
- 0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
- 1,
- 0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
- 1,
- 0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
- 1,
- 0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
- 1,
- 0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
- 1,
- 0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
- 1,
- 0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
- 1,
- 0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
- 1,
- 0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
- 1,
- 0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
- 1,
- 0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
- 1,
- 0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
- 1,
- 0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
- 1,
- 0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
- 1,
- 0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
- 1,
- 0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
- 1,
- 0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
- 1,
- 0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
- 1,
- 0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
- 1,
- 0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
- 1,
- 0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
- 1,
- 0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-#define CR_In_Kayah_Li CR_Kayah_Li
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
- 1,
- 0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
- 1,
- 0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
- 1,
- 0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
- 1,
- 0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
- 1,
- 0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
- 1,
- 0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
- 1,
- 0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
- 1,
- 0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
- 1,
- 0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
- 1,
- 0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
- 1,
- 0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
- 1,
- 0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
- 1,
- 0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
- 1,
- 0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
- 1,
- 0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
- 1,
- 0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
- 1,
- 0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
- 1,
- 0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
- 1,
- 0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
- 1,
- 0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
- 1,
- 0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
- 1,
- 0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
- 1,
- 0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
- 1,
- 0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
- 1,
- 0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
- 1,
- 0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
- 1,
- 0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
- 1,
- 0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
- 1,
- 0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
- 1,
- 0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
- 1,
- 0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
- 1,
- 0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
- 1,
- 0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
- 1,
- 0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
- 1,
- 0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
- 1,
- 0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
- 1,
- 0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
- 1,
- 0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
- 1,
- 0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
- 1,
- 0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
- 1,
- 0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
- 1,
- 0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
- 1,
- 0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
- 1,
- 0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
- 1,
- 0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
- 1,
- 0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
- 1,
- 0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
- 1,
- 0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
- 1,
- 0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
- 1,
- 0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
- 1,
- 0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
- 1,
- 0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
- 1,
- 0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
- 1,
- 0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
- 1,
- 0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
- 1,
- 0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
- 1,
- 0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
- 1,
- 0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
- 1,
- 0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
- 1,
- 0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
- 1,
- 0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
- 1,
- 0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
- 1,
- 0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
- 1,
- 0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
- 1,
- 0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
- 1,
- 0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
- 1,
- 0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
- 1,
- 0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
- 1,
- 0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
- 1,
- 0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
- 1,
- 0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
- 1,
- 0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
- 1,
- 0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
- 1,
- 0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
- 1,
- 0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
- 1,
- 0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Transport_And_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
- 1,
- 0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_And_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
- 1,
- 0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
- 1,
- 0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
- 1,
- 0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
- 1,
- 0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
- 1,
- 0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
- 1,
- 0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
- 1,
- 0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
- 1,
- 0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
+}; /* CR_Alnum */
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
1,
- 0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
- 36,
- 0x0860, 0x089f,
- 0x1ab0, 0x1aff,
- 0x1c80, 0x1cbf,
- 0x2fe0, 0x2fef,
- 0xa9e0, 0xa9ff,
- 0xab30, 0xabbf,
- 0x10200, 0x1027f,
- 0x102e0, 0x102ff,
- 0x10350, 0x1037f,
- 0x103e0, 0x103ff,
- 0x104b0, 0x107ff,
- 0x10860, 0x108ff,
- 0x10940, 0x1097f,
- 0x10a80, 0x10aff,
- 0x10b80, 0x10bff,
- 0x10c50, 0x10e5f,
- 0x10e80, 0x10fff,
- 0x11150, 0x1117f,
- 0x111e0, 0x1167f,
- 0x116d0, 0x11fff,
- 0x12480, 0x12fff,
- 0x13430, 0x167ff,
- 0x16a40, 0x16eff,
- 0x16fa0, 0x1afff,
- 0x1b100, 0x1cfff,
- 0x1d250, 0x1d2ff,
- 0x1d380, 0x1d3ff,
- 0x1d800, 0x1edff,
- 0x1ef00, 0x1efff,
- 0x1f650, 0x1f67f,
- 0x1f780, 0x1ffff,
- 0x2a6e0, 0x2a6ff,
- 0x2b820, 0x2f7ff,
- 0x2fa20, 0xdffff,
- 0xe0080, 0xe00ff,
- 0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-#endif /* USE_UNICODE_PROPERTIES */
+ 0x0000, 0x007f,
+}; /* CR_ASCII */
static const OnigCodePoint* const CodeRanges[] = {
CR_NEWLINE,
@@ -25484,7 +16149,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Co,
CR_Cs,
CR_L,
- CR_LC,
CR_Ll,
CR_Lm,
CR_Lo,
@@ -25626,16 +16290,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Inscriptional_Pahlavi,
CR_Old_Turkic,
CR_Kaithi,
- CR_Batak,
- CR_Brahmi,
- CR_Mandaic,
- CR_Chakma,
- CR_Meroitic_Cursive,
- CR_Meroitic_Hieroglyphs,
- CR_Miao,
- CR_Sharada,
- CR_Sora_Sompeng,
- CR_Takri,
CR_White_Space,
CR_Bidi_Control,
CR_Join_Control,
@@ -25668,241 +16322,6 @@ static const OnigCodePoint* const CodeRanges[] = {
CR_Variation_Selector,
CR_Pattern_White_Space,
CR_Pattern_Syntax,
- CR_Unknown,
- CR_Age_1_1,
- CR_Age_2_0,
- CR_Age_2_1,
- CR_Age_3_0,
- CR_Age_3_1,
- CR_Age_3_2,
- CR_Age_4_0,
- CR_Age_4_1,
- CR_Age_5_0,
- CR_Age_5_1,
- CR_Age_5_2,
- CR_Age_6_0,
- CR_Age_6_1,
- CR_In_Basic_Latin,
- CR_In_Latin_1_Supplement,
- CR_In_Latin_Extended_A,
- CR_In_Latin_Extended_B,
- CR_In_IPA_Extensions,
- CR_In_Spacing_Modifier_Letters,
- CR_In_Combining_Diacritical_Marks,
- CR_In_Greek_and_Coptic,
- CR_In_Cyrillic,
- CR_In_Cyrillic_Supplement,
- CR_In_Armenian,
- CR_In_Hebrew,
- CR_In_Arabic,
- CR_In_Syriac,
- CR_In_Arabic_Supplement,
- CR_In_Thaana,
- CR_In_NKo,
- CR_In_Samaritan,
- CR_In_Mandaic,
- CR_In_Arabic_Extended_A,
- CR_In_Devanagari,
- CR_In_Bengali,
- CR_In_Gurmukhi,
- CR_In_Gujarati,
- CR_In_Oriya,
- CR_In_Tamil,
- CR_In_Telugu,
- CR_In_Kannada,
- CR_In_Malayalam,
- CR_In_Sinhala,
- CR_In_Thai,
- CR_In_Lao,
- CR_In_Tibetan,
- CR_In_Myanmar,
- CR_In_Georgian,
- CR_In_Hangul_Jamo,
- CR_In_Ethiopic,
- CR_In_Ethiopic_Supplement,
- CR_In_Cherokee,
- CR_In_Unified_Canadian_Aboriginal_Syllabics,
- CR_In_Ogham,
- CR_In_Runic,
- CR_In_Tagalog,
- CR_In_Hanunoo,
- CR_In_Buhid,
- CR_In_Tagbanwa,
- CR_In_Khmer,
- CR_In_Mongolian,
- CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
- CR_In_Limbu,
- CR_In_Tai_Le,
- CR_In_New_Tai_Lue,
- CR_In_Khmer_Symbols,
- CR_In_Buginese,
- CR_In_Tai_Tham,
- CR_In_Balinese,
- CR_In_Sundanese,
- CR_In_Batak,
- CR_In_Lepcha,
- CR_In_Ol_Chiki,
- CR_In_Sundanese_Supplement,
- CR_In_Vedic_Extensions,
- CR_In_Phonetic_Extensions,
- CR_In_Phonetic_Extensions_Supplement,
- CR_In_Combining_Diacritical_Marks_Supplement,
- CR_In_Latin_Extended_Additional,
- CR_In_Greek_Extended,
- CR_In_General_Punctuation,
- CR_In_Superscripts_and_Subscripts,
- CR_In_Currency_Symbols,
- CR_In_Combining_Diacritical_Marks_for_Symbols,
- CR_In_Letterlike_Symbols,
- CR_In_Number_Forms,
- CR_In_Arrows,
- CR_In_Mathematical_Operators,
- CR_In_Miscellaneous_Technical,
- CR_In_Control_Pictures,
- CR_In_Optical_Character_Recognition,
- CR_In_Enclosed_Alphanumerics,
- CR_In_Box_Drawing,
- CR_In_Block_Elements,
- CR_In_Geometric_Shapes,
- CR_In_Miscellaneous_Symbols,
- CR_In_Dingbats,
- CR_In_Miscellaneous_Mathematical_Symbols_A,
- CR_In_Supplemental_Arrows_A,
- CR_In_Braille_Patterns,
- CR_In_Supplemental_Arrows_B,
- CR_In_Miscellaneous_Mathematical_Symbols_B,
- CR_In_Supplemental_Mathematical_Operators,
- CR_In_Miscellaneous_Symbols_and_Arrows,
- CR_In_Glagolitic,
- CR_In_Latin_Extended_C,
- CR_In_Coptic,
- CR_In_Georgian_Supplement,
- CR_In_Tifinagh,
- CR_In_Ethiopic_Extended,
- CR_In_Cyrillic_Extended_A,
- CR_In_Supplemental_Punctuation,
- CR_In_CJK_Radicals_Supplement,
- CR_In_Kangxi_Radicals,
- CR_In_Ideographic_Description_Characters,
- CR_In_CJK_Symbols_and_Punctuation,
- CR_In_Hiragana,
- CR_In_Katakana,
- CR_In_Bopomofo,
- CR_In_Hangul_Compatibility_Jamo,
- CR_In_Kanbun,
- CR_In_Bopomofo_Extended,
- CR_In_CJK_Strokes,
- CR_In_Katakana_Phonetic_Extensions,
- CR_In_Enclosed_CJK_Letters_and_Months,
- CR_In_CJK_Compatibility,
- CR_In_CJK_Unified_Ideographs_Extension_A,
- CR_In_Yijing_Hexagram_Symbols,
- CR_In_CJK_Unified_Ideographs,
- CR_In_Yi_Syllables,
- CR_In_Yi_Radicals,
- CR_In_Lisu,
- CR_In_Vai,
- CR_In_Cyrillic_Extended_B,
- CR_In_Bamum,
- CR_In_Modifier_Tone_Letters,
- CR_In_Latin_Extended_D,
- CR_In_Syloti_Nagri,
- CR_In_Common_Indic_Number_Forms,
- CR_In_Phags_pa,
- CR_In_Saurashtra,
- CR_In_Devanagari_Extended,
- CR_In_Kayah_Li,
- CR_In_Rejang,
- CR_In_Hangul_Jamo_Extended_A,
- CR_In_Javanese,
- CR_In_Cham,
- CR_In_Myanmar_Extended_A,
- CR_In_Tai_Viet,
- CR_In_Meetei_Mayek_Extensions,
- CR_In_Ethiopic_Extended_A,
- CR_In_Meetei_Mayek,
- CR_In_Hangul_Syllables,
- CR_In_Hangul_Jamo_Extended_B,
- CR_In_High_Surrogates,
- CR_In_High_Private_Use_Surrogates,
- CR_In_Low_Surrogates,
- CR_In_Private_Use_Area,
- CR_In_CJK_Compatibility_Ideographs,
- CR_In_Alphabetic_Presentation_Forms,
- CR_In_Arabic_Presentation_Forms_A,
- CR_In_Variation_Selectors,
- CR_In_Vertical_Forms,
- CR_In_Combining_Half_Marks,
- CR_In_CJK_Compatibility_Forms,
- CR_In_Small_Form_Variants,
- CR_In_Arabic_Presentation_Forms_B,
- CR_In_Halfwidth_and_Fullwidth_Forms,
- CR_In_Specials,
- CR_In_Linear_B_Syllabary,
- CR_In_Linear_B_Ideograms,
- CR_In_Aegean_Numbers,
- CR_In_Ancient_Greek_Numbers,
- CR_In_Ancient_Symbols,
- CR_In_Phaistos_Disc,
- CR_In_Lycian,
- CR_In_Carian,
- CR_In_Old_Italic,
- CR_In_Gothic,
- CR_In_Ugaritic,
- CR_In_Old_Persian,
- CR_In_Deseret,
- CR_In_Shavian,
- CR_In_Osmanya,
- CR_In_Cypriot_Syllabary,
- CR_In_Imperial_Aramaic,
- CR_In_Phoenician,
- CR_In_Lydian,
- CR_In_Meroitic_Hieroglyphs,
- CR_In_Meroitic_Cursive,
- CR_In_Kharoshthi,
- CR_In_Old_South_Arabian,
- CR_In_Avestan,
- CR_In_Inscriptional_Parthian,
- CR_In_Inscriptional_Pahlavi,
- CR_In_Old_Turkic,
- CR_In_Rumi_Numeral_Symbols,
- CR_In_Brahmi,
- CR_In_Kaithi,
- CR_In_Sora_Sompeng,
- CR_In_Chakma,
- CR_In_Sharada,
- CR_In_Takri,
- CR_In_Cuneiform,
- CR_In_Cuneiform_Numbers_and_Punctuation,
- CR_In_Egyptian_Hieroglyphs,
- CR_In_Bamum_Supplement,
- CR_In_Miao,
- CR_In_Kana_Supplement,
- CR_In_Byzantine_Musical_Symbols,
- CR_In_Musical_Symbols,
- CR_In_Ancient_Greek_Musical_Notation,
- CR_In_Tai_Xuan_Jing_Symbols,
- CR_In_Counting_Rod_Numerals,
- CR_In_Mathematical_Alphanumeric_Symbols,
- CR_In_Arabic_Mathematical_Alphabetic_Symbols,
- CR_In_Mahjong_Tiles,
- CR_In_Domino_Tiles,
- CR_In_Playing_Cards,
- CR_In_Enclosed_Alphanumeric_Supplement,
- CR_In_Enclosed_Ideographic_Supplement,
- CR_In_Miscellaneous_Symbols_And_Pictographs,
- CR_In_Emoticons,
- CR_In_Transport_And_Map_Symbols,
- CR_In_Alchemical_Symbols,
- CR_In_CJK_Unified_Ideographs_Extension_B,
- CR_In_CJK_Unified_Ideographs_Extension_C,
- CR_In_CJK_Unified_Ideographs_Extension_D,
- CR_In_CJK_Compatibility_Ideographs_Supplement,
- CR_In_Tags,
- CR_In_Variation_Selectors_Supplement,
- CR_In_Supplementary_Private_Use_Area_A,
- CR_In_Supplementary_Private_Use_Area_B,
- CR_In_No_Block,
#endif /* USE_UNICODE_PROPERTIES */
};
struct uniname2ctype_struct {
@@ -25913,6 +16332,7 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
%}
struct uniname2ctype_struct;
%%
+newline, 0
alpha, 1
blank, 2
cntrl, 3
@@ -25937,233 +16357,221 @@ cn, 20
co, 21
cs, 22
l, 23
-lc, 24
-ll, 25
-lm, 26
-lo, 27
-lt, 28
-lu, 29
-m, 30
-mc, 31
-me, 32
-mn, 33
-n, 34
-nd, 35
-nl, 36
-no, 37
-p, 38
-pc, 39
-pd, 40
-pe, 41
-pf, 42
-pi, 43
-po, 44
-ps, 45
-s, 46
-sc, 47
-sk, 48
-sm, 49
-so, 50
-z, 51
-zl, 52
-zp, 53
-zs, 54
-math, 55
-alphabetic, 56
-lowercase, 57
-uppercase, 58
-cased, 59
-caseignorable, 60
-changeswhenlowercased, 61
-changeswhenuppercased, 62
-changeswhentitlecased, 63
-changeswhencasefolded, 64
-changeswhencasemapped, 65
-idstart, 66
-idcontinue, 67
-xidstart, 68
-xidcontinue, 69
-defaultignorablecodepoint, 70
-graphemeextend, 71
-graphemebase, 72
-graphemelink, 73
-common, 74
-latin, 75
-greek, 76
-cyrillic, 77
-armenian, 78
-hebrew, 79
-arabic, 80
-syriac, 81
-thaana, 82
-devanagari, 83
-bengali, 84
-gurmukhi, 85
-gujarati, 86
-oriya, 87
-tamil, 88
-telugu, 89
-kannada, 90
-malayalam, 91
-sinhala, 92
-thai, 93
-lao, 94
-tibetan, 95
-myanmar, 96
-georgian, 97
-hangul, 98
-ethiopic, 99
-cherokee, 100
-canadianaboriginal, 101
-ogham, 102
-runic, 103
-khmer, 104
-mongolian, 105
-hiragana, 106
-katakana, 107
-bopomofo, 108
-han, 109
-yi, 110
-olditalic, 111
-gothic, 112
-deseret, 113
-inherited, 114
-tagalog, 115
-hanunoo, 116
-buhid, 117
-tagbanwa, 118
-limbu, 119
-taile, 120
-linearb, 121
-ugaritic, 122
-shavian, 123
-osmanya, 124
-cypriot, 125
-braille, 126
-buginese, 127
-coptic, 128
-newtailue, 129
-glagolitic, 130
-tifinagh, 131
-sylotinagri, 132
-oldpersian, 133
-kharoshthi, 134
-balinese, 135
-cuneiform, 136
-phoenician, 137
-phagspa, 138
-nko, 139
-sundanese, 140
-lepcha, 141
-olchiki, 142
-vai, 143
-saurashtra, 144
-kayahli, 145
-rejang, 146
-lycian, 147
-carian, 148
-lydian, 149
-cham, 150
-taitham, 151
-taiviet, 152
-avestan, 153
-egyptianhieroglyphs, 154
-samaritan, 155
-lisu, 156
-bamum, 157
-javanese, 158
-meeteimayek, 159
-imperialaramaic, 160
-oldsoutharabian, 161
-inscriptionalparthian, 162
-inscriptionalpahlavi, 163
-oldturkic, 164
-kaithi, 165
-batak, 166
-brahmi, 167
-mandaic, 168
-chakma, 169
-meroiticcursive, 170
-meroitichieroglyphs, 171
-miao, 172
-sharada, 173
-sorasompeng, 174
-takri, 175
-whitespace, 176
-bidicontrol, 177
-joincontrol, 178
-dash, 179
-hyphen, 180
-quotationmark, 181
-terminalpunctuation, 182
-othermath, 183
-hexdigit, 184
-asciihexdigit, 185
-otheralphabetic, 186
-ideographic, 187
-diacritic, 188
-extender, 189
-otherlowercase, 190
-otheruppercase, 191
-noncharactercodepoint, 192
-othergraphemeextend, 193
-idsbinaryoperator, 194
-idstrinaryoperator, 195
-radical, 196
-unifiedideograph, 197
-otherdefaultignorablecodepoint, 198
-deprecated, 199
-softdotted, 200
-logicalorderexception, 201
-otheridstart, 202
-otheridcontinue, 203
-sterm, 204
-variationselector, 205
-patternwhitespace, 206
-patternsyntax, 207
-unknown, 208
-ahex, 185
-bidic, 177
-ci, 60
-cwcf, 64
-cwcm, 65
-cwl, 61
-cwt, 63
-cwu, 62
-dep, 199
-di, 70
-dia, 188
-ext, 189
-grbase, 72
-grext, 71
-grlink, 73
-hex, 184
-idc, 67
-ideo, 187
-ids, 66
-idsb, 194
-idst, 195
-joinc, 178
-loe, 201
-nchar, 192
-oalpha, 186
-odi, 198
-ogrext, 193
-oidc, 203
-oids, 202
-olower, 190
-omath, 183
-oupper, 191
-patsyn, 207
-patws, 206
-qmark, 181
-sd, 200
-term, 182
-uideo, 197
-vs, 205
-wspace, 176
-xidc, 69
-xids, 68
+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
+math, 54
+alphabetic, 55
+lowercase, 56
+uppercase, 57
+cased, 58
+caseignorable, 59
+changeswhenlowercased, 60
+changeswhenuppercased, 61
+changeswhentitlecased, 62
+changeswhencasefolded, 63
+changeswhencasemapped, 64
+idstart, 65
+idcontinue, 66
+xidstart, 67
+xidcontinue, 68
+defaultignorablecodepoint, 69
+graphemeextend, 70
+graphemebase, 71
+graphemelink, 72
+common, 73
+latin, 74
+greek, 75
+cyrillic, 76
+armenian, 77
+hebrew, 78
+arabic, 79
+syriac, 80
+thaana, 81
+devanagari, 82
+bengali, 83
+gurmukhi, 84
+gujarati, 85
+oriya, 86
+tamil, 87
+telugu, 88
+kannada, 89
+malayalam, 90
+sinhala, 91
+thai, 92
+lao, 93
+tibetan, 94
+myanmar, 95
+georgian, 96
+hangul, 97
+ethiopic, 98
+cherokee, 99
+canadianaboriginal, 100
+ogham, 101
+runic, 102
+khmer, 103
+mongolian, 104
+hiragana, 105
+katakana, 106
+bopomofo, 107
+han, 108
+yi, 109
+olditalic, 110
+gothic, 111
+deseret, 112
+inherited, 113
+tagalog, 114
+hanunoo, 115
+buhid, 116
+tagbanwa, 117
+limbu, 118
+taile, 119
+linearb, 120
+ugaritic, 121
+shavian, 122
+osmanya, 123
+cypriot, 124
+braille, 125
+buginese, 126
+coptic, 127
+newtailue, 128
+glagolitic, 129
+tifinagh, 130
+sylotinagri, 131
+oldpersian, 132
+kharoshthi, 133
+balinese, 134
+cuneiform, 135
+phoenician, 136
+phagspa, 137
+nko, 138
+sundanese, 139
+lepcha, 140
+olchiki, 141
+vai, 142
+saurashtra, 143
+kayahli, 144
+rejang, 145
+lycian, 146
+carian, 147
+lydian, 148
+cham, 149
+taitham, 150
+taiviet, 151
+avestan, 152
+egyptianhieroglyphs, 153
+samaritan, 154
+lisu, 155
+bamum, 156
+javanese, 157
+meeteimayek, 158
+imperialaramaic, 159
+oldsoutharabian, 160
+inscriptionalparthian, 161
+inscriptionalpahlavi, 162
+oldturkic, 163
+kaithi, 164
+whitespace, 165
+bidicontrol, 166
+joincontrol, 167
+dash, 168
+hyphen, 169
+quotationmark, 170
+terminalpunctuation, 171
+othermath, 172
+hexdigit, 173
+asciihexdigit, 174
+otheralphabetic, 175
+ideographic, 176
+diacritic, 177
+extender, 178
+otherlowercase, 179
+otheruppercase, 180
+noncharactercodepoint, 181
+othergraphemeextend, 182
+idsbinaryoperator, 183
+idstrinaryoperator, 184
+radical, 185
+unifiedideograph, 186
+otherdefaultignorablecodepoint, 187
+deprecated, 188
+softdotted, 189
+logicalorderexception, 190
+otheridstart, 191
+otheridcontinue, 192
+sterm, 193
+variationselector, 194
+patternwhitespace, 195
+patternsyntax, 196
+ahex, 174
+bidic, 166
+ci, 59
+cwcf, 63
+cwcm, 64
+cwl, 60
+cwt, 62
+cwu, 61
+dep, 188
+di, 69
+dia, 177
+ext, 178
+grbase, 71
+grext, 70
+grlink, 72
+hex, 173
+idc, 66
+ideo, 176
+ids, 65
+idsb, 183
+idst, 184
+joinc, 167
+loe, 190
+nchar, 181
+oalpha, 175
+odi, 187
+ogrext, 182
+oidc, 192
+oids, 191
+olower, 179
+omath, 172
+oupper, 180
+patsyn, 196
+patws, 195
+qmark, 170
+sd, 189
+term, 171
+uideo, 186
+vs, 194
+wspace, 165
+xidc, 68
+xids, 67
other, 17
control, 18
format, 19
@@ -26171,374 +16579,127 @@ unassigned, 20
privateuse, 21
surrogate, 22
letter, 23
-casedletter, 24
-lowercaseletter, 25
-modifierletter, 26
-otherletter, 27
-titlecaseletter, 28
-uppercaseletter, 29
-mark, 30
-combiningmark, 30
-spacingmark, 31
-enclosingmark, 32
-nonspacingmark, 33
-number, 34
-decimalnumber, 35
-letternumber, 36
-othernumber, 37
-punctuation, 38
-connectorpunctuation, 39
-dashpunctuation, 40
-closepunctuation, 41
-finalpunctuation, 42
-initialpunctuation, 43
-otherpunctuation, 44
-openpunctuation, 45
-symbol, 46
-currencysymbol, 47
-modifiersymbol, 48
-mathsymbol, 49
-othersymbol, 50
-separator, 51
-lineseparator, 52
-paragraphseparator, 53
-spaceseparator, 54
-arab, 80
-armi, 160
-armn, 78
-avst, 153
-bali, 135
-bamu, 157
-batk, 166
-beng, 84
-bopo, 108
-brah, 167
-brai, 126
-bugi, 127
-buhd, 117
-cakm, 169
-cans, 101
-cari, 148
-cher, 100
-copt, 128
-qaac, 128
-cprt, 125
-cyrl, 77
-deva, 83
-dsrt, 113
-egyp, 154
-ethi, 99
-geor, 97
-glag, 130
-goth, 112
-grek, 76
-gujr, 86
-guru, 85
-hang, 98
-hani, 109
-hano, 116
-hebr, 79
-hira, 106
-ital, 111
-java, 158
-kali, 145
-kana, 107
-khar, 134
-khmr, 104
-knda, 90
-kthi, 165
-lana, 151
-laoo, 94
-latn, 75
-lepc, 141
-limb, 119
-linb, 121
-lyci, 147
-lydi, 149
-mand, 168
-merc, 170
-mero, 171
-mlym, 91
-mong, 105
-mtei, 159
-mymr, 96
-nkoo, 139
-ogam, 102
-olck, 142
-orkh, 164
-orya, 87
-osma, 124
-phag, 138
-phli, 163
-phnx, 137
-plrd, 172
-prti, 162
-rjng, 146
-runr, 103
-samr, 155
-sarb, 161
-saur, 144
-shaw, 123
-shrd, 173
-sinh, 92
-sora, 174
-sund, 140
-sylo, 132
-syrc, 81
-tagb, 118
-takr, 175
-tale, 120
-talu, 129
-taml, 88
-tavt, 152
-telu, 89
-tfng, 131
-tglg, 115
-thaa, 82
-tibt, 95
-ugar, 122
-vaii, 143
-xpeo, 133
-xsux, 136
-yiii, 110
-zinh, 114
-qaai, 114
-zyyy, 74
-zzzz, 208
-age=1.1, 209
-age=2.0, 210
-age=2.1, 211
-age=3.0, 212
-age=3.1, 213
-age=3.2, 214
-age=4.0, 215
-age=4.1, 216
-age=5.0, 217
-age=5.1, 218
-age=5.2, 219
-age=6.0, 220
-age=6.1, 221
-inbasiclatin, 222
-inlatin1supplement, 223
-inlatinextendeda, 224
-inlatinextendedb, 225
-inipaextensions, 226
-inspacingmodifierletters, 227
-incombiningdiacriticalmarks, 228
-ingreekandcoptic, 229
-incyrillic, 230
-incyrillicsupplement, 231
-inarmenian, 232
-inhebrew, 233
-inarabic, 234
-insyriac, 235
-inarabicsupplement, 236
-inthaana, 237
-innko, 238
-insamaritan, 239
-inmandaic, 240
-inarabicextendeda, 241
-indevanagari, 242
-inbengali, 243
-ingurmukhi, 244
-ingujarati, 245
-inoriya, 246
-intamil, 247
-intelugu, 248
-inkannada, 249
-inmalayalam, 250
-insinhala, 251
-inthai, 252
-inlao, 253
-intibetan, 254
-inmyanmar, 255
-ingeorgian, 256
-inhanguljamo, 257
-inethiopic, 258
-inethiopicsupplement, 259
-incherokee, 260
-inunifiedcanadianaboriginalsyllabics, 261
-inogham, 262
-inrunic, 263
-intagalog, 264
-inhanunoo, 265
-inbuhid, 266
-intagbanwa, 267
-inkhmer, 268
-inmongolian, 269
-inunifiedcanadianaboriginalsyllabicsextended, 270
-inlimbu, 271
-intaile, 272
-innewtailue, 273
-inkhmersymbols, 274
-inbuginese, 275
-intaitham, 276
-inbalinese, 277
-insundanese, 278
-inbatak, 279
-inlepcha, 280
-inolchiki, 281
-insundanesesupplement, 282
-invedicextensions, 283
-inphoneticextensions, 284
-inphoneticextensionssupplement, 285
-incombiningdiacriticalmarkssupplement, 286
-inlatinextendedadditional, 287
-ingreekextended, 288
-ingeneralpunctuation, 289
-insuperscriptsandsubscripts, 290
-incurrencysymbols, 291
-incombiningdiacriticalmarksforsymbols, 292
-inletterlikesymbols, 293
-innumberforms, 294
-inarrows, 295
-inmathematicaloperators, 296
-inmiscellaneoustechnical, 297
-incontrolpictures, 298
-inopticalcharacterrecognition, 299
-inenclosedalphanumerics, 300
-inboxdrawing, 301
-inblockelements, 302
-ingeometricshapes, 303
-inmiscellaneoussymbols, 304
-indingbats, 305
-inmiscellaneousmathematicalsymbolsa, 306
-insupplementalarrowsa, 307
-inbraillepatterns, 308
-insupplementalarrowsb, 309
-inmiscellaneousmathematicalsymbolsb, 310
-insupplementalmathematicaloperators, 311
-inmiscellaneoussymbolsandarrows, 312
-inglagolitic, 313
-inlatinextendedc, 314
-incoptic, 315
-ingeorgiansupplement, 316
-intifinagh, 317
-inethiopicextended, 318
-incyrillicextendeda, 319
-insupplementalpunctuation, 320
-incjkradicalssupplement, 321
-inkangxiradicals, 322
-inideographicdescriptioncharacters, 323
-incjksymbolsandpunctuation, 324
-inhiragana, 325
-inkatakana, 326
-inbopomofo, 327
-inhangulcompatibilityjamo, 328
-inkanbun, 329
-inbopomofoextended, 330
-incjkstrokes, 331
-inkatakanaphoneticextensions, 332
-inenclosedcjklettersandmonths, 333
-incjkcompatibility, 334
-incjkunifiedideographsextensiona, 335
-inyijinghexagramsymbols, 336
-incjkunifiedideographs, 337
-inyisyllables, 338
-inyiradicals, 339
-inlisu, 340
-invai, 341
-incyrillicextendedb, 342
-inbamum, 343
-inmodifiertoneletters, 344
-inlatinextendedd, 345
-insylotinagri, 346
-incommonindicnumberforms, 347
-inphagspa, 348
-insaurashtra, 349
-indevanagariextended, 350
-inkayahli, 351
-inrejang, 352
-inhanguljamoextendeda, 353
-injavanese, 354
-incham, 355
-inmyanmarextendeda, 356
-intaiviet, 357
-inmeeteimayekextensions, 358
-inethiopicextendeda, 359
-inmeeteimayek, 360
-inhangulsyllables, 361
-inhanguljamoextendedb, 362
-inhighsurrogates, 363
-inhighprivateusesurrogates, 364
-inlowsurrogates, 365
-inprivateusearea, 366
-incjkcompatibilityideographs, 367
-inalphabeticpresentationforms, 368
-inarabicpresentationformsa, 369
-invariationselectors, 370
-inverticalforms, 371
-incombininghalfmarks, 372
-incjkcompatibilityforms, 373
-insmallformvariants, 374
-inarabicpresentationformsb, 375
-inhalfwidthandfullwidthforms, 376
-inspecials, 377
-inlinearbsyllabary, 378
-inlinearbideograms, 379
-inaegeannumbers, 380
-inancientgreeknumbers, 381
-inancientsymbols, 382
-inphaistosdisc, 383
-inlycian, 384
-incarian, 385
-inolditalic, 386
-ingothic, 387
-inugaritic, 388
-inoldpersian, 389
-indeseret, 390
-inshavian, 391
-inosmanya, 392
-incypriotsyllabary, 393
-inimperialaramaic, 394
-inphoenician, 395
-inlydian, 396
-inmeroitichieroglyphs, 397
-inmeroiticcursive, 398
-inkharoshthi, 399
-inoldsoutharabian, 400
-inavestan, 401
-ininscriptionalparthian, 402
-ininscriptionalpahlavi, 403
-inoldturkic, 404
-inruminumeralsymbols, 405
-inbrahmi, 406
-inkaithi, 407
-insorasompeng, 408
-inchakma, 409
-insharada, 410
-intakri, 411
-incuneiform, 412
-incuneiformnumbersandpunctuation, 413
-inegyptianhieroglyphs, 414
-inbamumsupplement, 415
-inmiao, 416
-inkanasupplement, 417
-inbyzantinemusicalsymbols, 418
-inmusicalsymbols, 419
-inancientgreekmusicalnotation, 420
-intaixuanjingsymbols, 421
-incountingrodnumerals, 422
-inmathematicalalphanumericsymbols, 423
-inarabicmathematicalalphabeticsymbols, 424
-inmahjongtiles, 425
-indominotiles, 426
-inplayingcards, 427
-inenclosedalphanumericsupplement, 428
-inenclosedideographicsupplement, 429
-inmiscellaneoussymbolsandpictographs, 430
-inemoticons, 431
-intransportandmapsymbols, 432
-inalchemicalsymbols, 433
-incjkunifiedideographsextensionb, 434
-incjkunifiedideographsextensionc, 435
-incjkunifiedideographsextensiond, 436
-incjkcompatibilityideographssupplement, 437
-intags, 438
-invariationselectorssupplement, 439
-insupplementaryprivateuseareaa, 440
-insupplementaryprivateuseareab, 441
-innoblock, 442
+lowercaseletter, 24
+modifierletter, 25
+otherletter, 26
+titlecaseletter, 27
+uppercaseletter, 28
+mark, 29
+spacingmark, 30
+enclosingmark, 31
+nonspacingmark, 32
+number, 33
+decimalnumber, 34
+letternumber, 35
+othernumber, 36
+punctuation, 37
+connectorpunctuation, 38
+dashpunctuation, 39
+closepunctuation, 40
+finalpunctuation, 41
+initialpunctuation, 42
+otherpunctuation, 43
+openpunctuation, 44
+symbol, 45
+currencysymbol, 46
+modifiersymbol, 47
+mathsymbol, 48
+othersymbol, 49
+separator, 50
+lineseparator, 51
+paragraphseparator, 52
+spaceseparator, 53
+arab, 79
+armi, 159
+armn, 77
+avst, 152
+bali, 134
+bamu, 156
+beng, 83
+bopo, 107
+brai, 125
+bugi, 126
+buhd, 116
+cans, 100
+cari, 147
+cher, 99
+copt, 127
+qaac, 127
+cprt, 124
+cyrl, 76
+deva, 82
+dsrt, 112
+egyp, 153
+ethi, 98
+geor, 96
+glag, 129
+goth, 111
+grek, 75
+gujr, 85
+guru, 84
+hang, 97
+hani, 108
+hano, 115
+hebr, 78
+hira, 105
+ital, 110
+java, 157
+kali, 144
+kana, 106
+khar, 133
+khmr, 103
+knda, 89
+kthi, 164
+lana, 150
+laoo, 93
+latn, 74
+lepc, 140
+limb, 118
+linb, 120
+lyci, 146
+lydi, 148
+mlym, 90
+mong, 104
+mtei, 158
+mymr, 95
+nkoo, 138
+ogam, 101
+olck, 141
+orkh, 163
+orya, 86
+osma, 123
+phag, 137
+phli, 162
+phnx, 136
+prti, 161
+rjng, 145
+runr, 102
+samr, 154
+sarb, 160
+saur, 143
+shaw, 122
+sinh, 91
+sund, 139
+sylo, 131
+syrc, 80
+tagb, 117
+tale, 119
+talu, 128
+taml, 87
+tavt, 151
+telu, 88
+tfng, 130
+tglg, 114
+thaa, 81
+tibt, 94
+ugar, 121
+vaii, 142
+xpeo, 132
+xsux, 135
+yiii, 109
+zinh, 113
+qaai, 113
+zyyy, 73
#endif /* USE_UNICODE_PROPERTIES */
%%
static int
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
index 1b47778391..2e96dd3846 100644
--- a/enc/us_ascii.c
+++ b/enc/us_ascii.c
@@ -24,9 +24,7 @@ OnigEncodingDefine(us_ascii, US_ASCII) = {
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,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("ASCII", "US-ASCII")
ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
diff --git a/enc/utf_16_32.h b/enc/utf_16_32.h
deleted file mode 100644
index b232767ee3..0000000000
--- a/enc/utf_16_32.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "regenc.h"
-/* dummy for unsupported, statefull encoding */
-#define ENC_DUMMY_UNICODE(name) ENC_DUMMY(name)
-ENC_DUMMY_UNICODE("UTF-16");
-ENC_DUMMY_UNICODE("UTF-32");
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
index 8b25d473a7..1e33c2ec7d 100644
--- a/enc/utf_16be.c
+++ b/enc/utf_16be.c
@@ -88,8 +88,11 @@ utf16be_is_mbc_newline(const UChar* p, const UChar* end,
if (*(p+1) == 0x0a && *p == 0x00)
return 1;
#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((*(p+1) == 0x0b || *(p+1) == 0x0c || *(p+1) == 0x0d || *(p+1) == 0x85)
- && *p == 0x00)
+ 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;
@@ -249,8 +252,6 @@ OnigEncodingDefine(utf_16be, UTF_16BE) = {
onigenc_unicode_is_code_ctype,
onigenc_utf16_32_get_ctype_code_range,
utf16be_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_UNICODE,
+ 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
index 8feb7ad769..bec3d22388 100644
--- a/enc/utf_16le.c
+++ b/enc/utf_16le.c
@@ -56,8 +56,7 @@ static int
utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e,
OnigEncoding enc ARG_UNUSED)
{
- int len = (int)(e - p);
- UChar byte;
+ int len = e-p, byte;
if (len < 2)
return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
byte = p[1];
@@ -81,8 +80,11 @@ utf16le_is_mbc_newline(const UChar* p, const UChar* end,
if (*p == 0x0a && *(p+1) == 0x00)
return 1;
#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((*p == 0x0b || *p == 0x0c || *p == 0x0d || *p == 0x85)
- && *(p+1) == 0x00)
+ 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;
@@ -242,7 +244,5 @@ OnigEncodingDefine(utf_16le, UTF_16LE) = {
onigenc_unicode_is_code_ctype,
onigenc_utf16_32_get_ctype_code_range,
utf16le_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_UNICODE,
+ onigenc_always_false_is_allowed_reverse_match
};
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
index 43c07e2e8f..61e7d0f1b5 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -44,7 +44,11 @@ utf32be_is_mbc_newline(const UChar* p, const UChar* end,
if (*(p+3) == 0x0a && *(p+2) == 0 && *(p+1) == 0 && *p == 0)
return 1;
#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((*(p+3) == 0x0b || *(p+3) == 0x0c || *(p+3) == 0x0d || *(p+3) == 0x85)
+ 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)
@@ -151,11 +155,11 @@ static UChar*
utf32be_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
OnigEncoding enc ARG_UNUSED)
{
- ptrdiff_t rem;
+ int rem;
if (s <= start) return (UChar* )s;
- rem = (int )((s - start) % 4);
+ rem = (s - start) % 4;
return (UChar* )(s - rem);
}
@@ -185,9 +189,7 @@ OnigEncodingDefine(utf_32be, UTF_32BE) = {
onigenc_unicode_is_code_ctype,
onigenc_utf16_32_get_ctype_code_range,
utf32be_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_UNICODE,
+ 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
index 31693eed05..3a0a41bba7 100644
--- a/enc/utf_32le.c
+++ b/enc/utf_32le.c
@@ -44,7 +44,11 @@ utf32le_is_mbc_newline(const UChar* p, const UChar* end,
if (*p == 0x0a && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0)
return 1;
#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if ((*p == 0x0b ||*p == 0x0c ||*p == 0x0d || *p == 0x85)
+ 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)
@@ -151,11 +155,11 @@ static UChar*
utf32le_left_adjust_char_head(const UChar* start, const UChar* s, const UChar* end,
OnigEncoding enc ARG_UNUSED)
{
- ptrdiff_t rem;
+ int rem;
if (s <= start) return (UChar* )s;
- rem = (int )((s - start) % 4);
+ rem = (s - start) % 4;
return (UChar* )(s - rem);
}
@@ -185,8 +189,6 @@ OnigEncodingDefine(utf_32le, UTF_32LE) = {
onigenc_unicode_is_code_ctype,
onigenc_utf16_32_get_ctype_code_range,
utf32le_left_adjust_char_head,
- onigenc_always_false_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_UNICODE,
+ onigenc_always_false_is_allowed_reverse_match
};
ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_8.c b/enc/utf_8.c
index dae1f3a1bc..0c44a3efeb 100644
--- a/enc/utf_8.c
+++ b/enc/utf_8.c
@@ -84,7 +84,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -102,7 +102,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -120,7 +120,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -138,7 +138,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -156,7 +156,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -174,7 +174,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -192,7 +192,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* 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,
@@ -210,7 +210,7 @@ static const signed char trans[][0x100] = {
/* 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
+ /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F
},
};
#undef A
@@ -248,7 +248,9 @@ is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
if (*p == 0x0a) return 1;
#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
- if (*p == 0x0b || *p == 0x0c || *p == 0x0d) return 1;
+#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;
@@ -270,7 +272,7 @@ mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
int c, len;
OnigCodePoint n;
- len = mbc_enc_len(p, end, enc);
+ len = enclen(enc, p, end);
c = *p++;
if (len > 1) {
len--;
@@ -361,7 +363,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
}
*p++ = UTF8_TRAIL0(code);
- return (int )(p - buf);
+ return (int)(p - buf);
}
}
@@ -438,9 +440,7 @@ OnigEncodingDefine(utf_8, UTF_8) = {
onigenc_unicode_is_code_ctype,
get_ctype_code_range,
left_adjust_char_head,
- onigenc_always_true_is_allowed_reverse_match,
- 0,
- ONIGENC_FLAG_UNICODE,
+ onigenc_always_true_is_allowed_reverse_match
};
ENC_ALIAS("CP65001", "UTF-8")
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
index 73060962c3..1cb4da4960 100644
--- a/enc/windows_1251.c
+++ b/enc/windows_1251.c
@@ -196,9 +196,7 @@ OnigEncodingDefine(windows_1251, Windows_1251) = {
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,
- 0,
- ONIGENC_FLAG_NONE,
+ onigenc_always_true_is_allowed_reverse_match
};
/*
* Name: windows-1251
diff --git a/enc/windows_31j.c b/enc/windows_31j.c
deleted file mode 100644
index c4193819d4..0000000000
--- a/enc/windows_31j.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/**********************************************************************
- cp932.c - Onigmo (Oniguruma-mod) (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2009 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc 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.
- */
-
-#define ENC_CP932
-#include "shift_jis.c"
-
-OnigEncodingDefine(windows_31j, Windows_31J) = {
- mbc_enc_len,
- "Windows-31J", /* 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,
- apply_all_case_fold,
- 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,
- ONIGENC_FLAG_NONE,
-};
-/*
- * 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
- *
- * Windows Standard Character Set and its mapping to Unicode by Microsoft.
- * Since 1.9.3, SJIS is the alias of Windows-31J because its character
- * set is usually this one even if its mapping may differ.
- */
-ENC_ALIAS("CP932", "Windows-31J")
-ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA. IE6 don't accept Windows-31J but csWindows31J. */
-ENC_ALIAS("SJIS", "Windows-31J")
-
-/*
- * Name: PCK
- * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/x-2chn0/index.html
- * Link: http://download.oracle.com/docs/cd/E19253-01/819-0606/appb-pckwarn-1/index.html
- *
- * Solaris's SJIS variant. Its set is Windows Standard Character Set; it
- * consists JIS X 0201 Latin (US-ASCII), JIS X 0201 Katakana, JIS X 0208, NEC
- * special characters, NEC-selected IBM extended characters, and IBM extended
- * characters. Solaris's iconv seems to use SJIS-open.
- */
-ENC_ALIAS("PCK", "Windows-31J")
diff --git a/encoding.c b/encoding.c
index 788e9837c5..a7950a8251 100644
--- a/encoding.c
+++ b/encoding.c
@@ -11,7 +11,6 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include "regenc.h"
#include <ctype.h>
#ifndef NO_LOCALE_CHARMAP
@@ -24,18 +23,6 @@
#endif
#include "ruby/util.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-int rb_enc_register(const char *name, rb_encoding *encoding);
-void rb_enc_set_base(const char *name, const char *orig);
-void rb_encdb_declare(const char *name);
-int rb_encdb_replicate(const char *name, const char *orig);
-int rb_encdb_dummy(const char *name);
-int rb_encdb_alias(const char *alias, const char *orig);
-void rb_encdb_set_unicode(int index);
-#pragma GCC visibility pop
-#endif
-
static ID id_encoding;
VALUE rb_cEncoding;
static VALUE rb_encoding_list;
@@ -72,8 +59,7 @@ enc_memsize(const void *p)
}
static const rb_data_type_t encoding_data_type = {
- "encoding",
- {0, 0, enc_memsize,},
+ "encoding", 0, 0, enc_memsize,
};
#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
@@ -160,9 +146,8 @@ rb_to_encoding_index(VALUE enc)
return rb_enc_find_index(StringValueCStr(enc));
}
-/* Returns encoding index or UNSPECIFIED_ENCODING */
-static int
-str_find_encindex(VALUE enc)
+static rb_encoding *
+to_encoding(VALUE enc)
{
int idx;
@@ -171,40 +156,17 @@ str_find_encindex(VALUE enc)
rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
}
idx = rb_enc_find_index(StringValueCStr(enc));
- return idx;
-}
-
-static int
-str_to_encindex(VALUE enc)
-{
- int idx = str_find_encindex(enc);
if (idx < 0) {
rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
}
- return idx;
-}
-
-static rb_encoding *
-str_to_encoding(VALUE enc)
-{
- return rb_enc_from_index(str_to_encindex(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 str_to_encoding(enc);
-}
-
-rb_encoding *
-rb_find_encoding(VALUE enc)
-{
- int idx;
- if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data;
- idx = str_find_encindex(enc);
- if (idx < 0) return NULL;
- return rb_enc_from_index(idx);
+ return to_encoding(enc);
}
void
@@ -458,32 +420,24 @@ enc_ascii_compatible_p(VALUE enc)
int
rb_enc_unicode_p(rb_encoding *enc)
{
- return ONIGENC_IS_UNICODE(enc);
+ const char *name = rb_enc_name(enc);
+ return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7';
}
-static st_data_t
-enc_dup_name(st_data_t name)
-{
- return (st_data_t)strdup((const char *)name);
-}
-
-/*
- * Returns copied alias name when the key is added for st_table,
- * else returns NULL.
- */
-static int
+static const char *
enc_alias_internal(const char *alias, int idx)
{
- return st_insert2(enc_table.names, (st_data_t)alias, (st_data_t)idx,
- enc_dup_name);
+ 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;
- if (!enc_alias_internal(alias, idx))
- set_encoding_const(alias, rb_enc_from_index(idx));
+ alias = enc_alias_internal(alias, idx);
+ set_encoding_const(alias, rb_enc_from_index(idx));
return idx;
}
@@ -513,12 +467,6 @@ rb_encdb_alias(const char *alias, const char *orig)
return enc_alias(alias, idx);
}
-void
-rb_encdb_set_unicode(int index)
-{
- rb_enc_from_index(index)->flags |= ONIGENC_FLAG_UNICODE;
-}
-
enum {
ENCINDEX_ASCII,
ENCINDEX_UTF_8,
@@ -572,8 +520,7 @@ rb_enc_registered(const char *name)
static VALUE
require_enc(VALUE enclib)
{
- int safe = rb_safe_level();
- return rb_require_safe(enclib, safe > 3 ? 3 : safe);
+ return rb_require_safe(enclib, rb_safe_level());
}
static int
@@ -582,25 +529,22 @@ load_encoding(const char *name)
VALUE enclib = rb_sprintf("enc/%s.so", name);
VALUE verbose = ruby_verbose;
VALUE debug = ruby_debug;
- VALUE errinfo;
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 = (char)TOLOWER(*s);
+ else if (ISUPPER(*s)) *s = TOLOWER(*s);
++s;
}
- FL_UNSET(enclib, FL_TAINT|FL_UNTRUSTED);
OBJ_FREEZE(enclib);
ruby_verbose = Qfalse;
ruby_debug = Qfalse;
- errinfo = rb_errinfo();
loaded = rb_protect(require_enc, enclib, 0);
ruby_verbose = verbose;
ruby_debug = debug;
- rb_set_errinfo(errinfo);
+ 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;
@@ -630,7 +574,6 @@ enc_autoload(rb_encoding *enc)
return i;
}
-/* Return encoding index or UNSPECIFIED_ENCODING from encoding name */
int
rb_enc_find_index(const char *name)
{
@@ -726,8 +669,8 @@ rb_enc_get_index(VALUE obj)
return i;
}
-static void
-enc_set_index(VALUE obj, int idx)
+void
+rb_enc_set_index(VALUE obj, int idx)
{
if (idx < ENCODING_INLINE_MAX) {
ENCODING_SET_INLINED(obj, idx);
@@ -735,20 +678,13 @@ enc_set_index(VALUE obj, int idx)
}
ENCODING_SET_INLINED(obj, ENCODING_INLINE_MAX);
rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
-}
-
-void
-rb_enc_set_index(VALUE obj, int idx)
-{
- rb_check_frozen(obj);
- enc_set_index(obj, idx);
+ return;
}
VALUE
rb_enc_associate_index(VALUE obj, int idx)
{
/* enc_check_capable(obj);*/
- rb_check_frozen(obj);
if (rb_enc_get_index(obj) == idx)
return obj;
if (SPECIAL_CONST_P(obj)) {
@@ -758,7 +694,7 @@ rb_enc_associate_index(VALUE obj, int idx)
!rb_enc_asciicompat(rb_enc_from_index(idx))) {
ENC_CODERANGE_CLEAR(obj);
}
- enc_set_index(obj, idx);
+ rb_enc_set_index(obj, idx);
return obj;
}
@@ -790,7 +726,6 @@ rb_enc_compatible(VALUE str1, VALUE str2)
{
int idx1, idx2;
rb_encoding *enc1, *enc2;
- int isstr1, isstr2;
idx1 = rb_enc_get_index(str1);
idx2 = rb_enc_get_index(str2);
@@ -804,38 +739,33 @@ rb_enc_compatible(VALUE str1, VALUE str2)
enc1 = rb_enc_from_index(idx1);
enc2 = rb_enc_from_index(idx2);
- isstr2 = RB_TYPE_P(str2, T_STRING);
- if (isstr2 && RSTRING_LEN(str2) == 0)
- return enc1;
- isstr1 = RB_TYPE_P(str1, T_STRING);
- if (isstr1 && RSTRING_LEN(str1) == 0)
- return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2;
+ 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 (!isstr2 && idx2 == ENCINDEX_US_ASCII)
+ if (BUILTIN_TYPE(str2) != T_STRING && idx2 == ENCINDEX_US_ASCII)
return enc1;
- if (!isstr1 && idx1 == ENCINDEX_US_ASCII)
+ if (BUILTIN_TYPE(str1) != T_STRING && idx1 == ENCINDEX_US_ASCII)
return enc2;
- if (!isstr1) {
+ if (BUILTIN_TYPE(str1) != T_STRING) {
VALUE tmp = str1;
int idx0 = idx1;
str1 = str2;
str2 = tmp;
idx1 = idx2;
idx2 = idx0;
- idx0 = isstr1;
- isstr1 = isstr2;
- isstr2 = idx0;
}
- if (isstr1) {
+ if (BUILTIN_TYPE(str1) == T_STRING) {
int cr1, cr2;
cr1 = rb_enc_str_coderange(str1);
- if (isstr2) {
+ if (BUILTIN_TYPE(str2) == T_STRING) {
cr2 = rb_enc_str_coderange(str2);
if (cr1 != cr2) {
/* may need to handle ENC_CODERANGE_BROKEN */
@@ -843,6 +773,7 @@ rb_enc_compatible(VALUE str1, VALUE str2)
if (cr2 == ENC_CODERANGE_7BIT) return enc1;
}
if (cr2 == ENC_CODERANGE_7BIT) {
+ if (idx1 == ENCINDEX_ASCII) return enc2;
return enc1;
}
}
@@ -869,11 +800,11 @@ rb_enc_copy(VALUE obj1, VALUE obj2)
VALUE
rb_obj_encoding(VALUE obj)
{
- int idx = rb_enc_get_index(obj);
- if (idx < 0) {
+ rb_encoding *enc = rb_enc_get(obj);
+ if (!enc) {
rb_raise(rb_eTypeError, "unknown encoding");
}
- return rb_enc_from_encoding_index(idx);
+ return rb_enc_from_encoding(enc);
}
int
@@ -936,11 +867,12 @@ rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc)
if (e <= p)
rb_raise(rb_eArgError, "empty string");
r = rb_enc_precise_mbclen(p, e, enc);
- if (!MBCLEN_CHARFOUND_P(r)) {
- rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+ if (MBCLEN_CHARFOUND_P(r)) {
+ if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r);
+ return rb_enc_mbc_to_codepoint(p, e, enc);
}
- 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
@@ -1066,11 +998,13 @@ enc_list(VALUE klass)
/*
* 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.
+ * <i>name</i> should be a string or symbol.
*
* Encoding.find("US-ASCII") #=> #<Encoding:US-ASCII>
+ * Encoding.find(:Shift_JIS) #=> #<Encoding:Shift_JIS>
*
* Names which this method accept are encoding names and aliases
* including following special aliases
@@ -1088,23 +1022,17 @@ enc_list(VALUE klass)
static VALUE
enc_find(VALUE klass, VALUE enc)
{
- int idx;
- if (RB_TYPE_P(enc, T_DATA) && is_data_encoding(enc))
- return enc;
- idx = str_to_encindex(enc);
- if (idx == UNSPECIFIED_ENCODING) return Qnil;
- return rb_enc_from_encoding_index(idx);
+ return rb_enc_from_encoding(to_encoding(enc));
}
/*
* call-seq:
- * Encoding.compatible?(obj1, obj2) -> enc or nil
+ * Encoding.compatible?(str1, str2) -> enc or nil
*
- * Checks the compatibility of two objects.
- *
- * If the objects are both strings they are compatible when they are
- * concatenatable. The encoding of the concatenated string will be returned
- * if they are compatible, nil if they are not.
+ * Checks the compatibility of two strings.
+ * If they are compatible, means concatenatable,
+ * returns an encoding which the concatenated string will be.
+ * If they are not compatible, nil is returned.
*
* Encoding.compatible?("\xa1".force_encoding("iso-8859-1"), "b")
* #=> #<Encoding:ISO-8859-1>
@@ -1114,11 +1042,6 @@ enc_find(VALUE klass, VALUE enc)
* "\xa1\xa1".force_encoding("euc-jp"))
* #=> nil
*
- * If the objects are non-strings their encodings are compatible when they
- * have an encoding and:
- * * Either encoding is US-ASCII compatible
- * * One of the encodings is a 7-bit encoding
- *
*/
static VALUE
enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
@@ -1308,25 +1231,7 @@ rb_enc_default_external(void)
*
* Returns default external encoding.
*
- * The default external encoding is used by default for strings created from
- * the following locations:
- *
- * * CSV
- * * File data read from disk
- * * SDBM
- * * StringIO
- * * Zlib::GzipReader
- * * Zlib::GzipWriter
- * * String#inspect
- * * Regexp#inspect
- *
- * While strings created from these locations will have this encoding, the
- * encoding may not be valid. Be sure to check String#valid_encoding?.
- *
- * File data written to disk will be transcoded to the default external
- * encoding when written.
- *
- * The default external encoding is initialized by the locale or -E option.
+ * It is initialized by the locale or -E option.
*/
static VALUE
get_default_external(VALUE klass)
@@ -1348,14 +1253,7 @@ rb_enc_set_default_external(VALUE encoding)
* call-seq:
* Encoding.default_external = enc
*
- * Sets default external encoding. You should not set
- * Encoding::default_external in ruby code as strings created before changing
- * the value may have a different encoding from strings created after the value
- * was changed., instead you should use <tt>ruby -E</tt> to invoke ruby with
- * the correct default_external.
- *
- * See Encoding::default_external for information on how the default external
- * encoding is used.
+ * Sets default external encoding.
*/
static VALUE
set_default_external(VALUE klass, VALUE encoding)
@@ -1387,32 +1285,9 @@ rb_enc_default_internal(void)
* call-seq:
* Encoding.default_internal -> enc
*
- * Returns default internal encoding. Strings will be transcoded to the
- * default internal encoding in the following places if the default internal
- * encoding is not nil:
- *
- * * CSV
- * * Etc.sysconfdir and Etc.systmpdir
- * * File data read from disk
- * * File names from Dir
- * * Integer#chr
- * * String#inspect and Regexp#inspect
- * * Strings returned from Curses
- * * Strings returned from Readline
- * * Strings returned from SDBM
- * * Time#zone
- * * Values from ENV
- * * Values in ARGV including $PROGRAM_NAME
- * * __FILE__
- *
- * Additionally String#encode and String#encode! use the default internal
- * encoding if no encoding is given.
- *
- * The locale encoding (__ENCODING__), not default_internal, is used as the
- * encoding of created strings.
+ * Returns default internal encoding.
*
- * Encoding::default_internal is initialized by the source file's
- * internal_encoding or -E option.
+ * It is initialized by the source internal_encoding or -E option.
*/
static VALUE
get_default_internal(VALUE klass)
@@ -1431,14 +1306,8 @@ rb_enc_set_default_internal(VALUE encoding)
* call-seq:
* Encoding.default_internal = enc or nil
*
- * Sets default internal encoding or removes default internal encoding when
- * passed nil. You should not set Encoding::default_internal in ruby code as
- * strings created before changing the value may have a different encoding
- * from strings created after the change. Instead you should use
- * <tt>ruby -E</tt> to invoke ruby with the correct default_internal.
- *
- * See Encoding::default_internal for information on how the default internal
- * encoding is used.
+ * Sets default internal encoding.
+ * Or removes default internal encoding when passed nil.
*/
static VALUE
set_default_internal(VALUE klass, VALUE encoding)
@@ -1453,7 +1322,6 @@ set_default_internal(VALUE klass, VALUE encoding)
* Encoding.locale_charmap -> string
*
* Returns the locale charmap name.
- * It returns nil if no appropriate information.
*
* Debian GNU/Linux
* LANG=C
@@ -1479,16 +1347,11 @@ rb_locale_charmap(VALUE klass)
#if defined NO_LOCALE_CHARMAP
return rb_usascii_str_new2("ASCII-8BIT");
#elif defined _WIN32 || defined __CYGWIN__
- const char *codeset = 0;
- char cp[sizeof(int) * 3 + 4];
-# ifdef __CYGWIN__
const char *nl_langinfo_codeset(void);
- codeset = nl_langinfo_codeset();
-# endif
+ const char *codeset = nl_langinfo_codeset();
+ char cp[sizeof(int) * 3 + 4];
if (!codeset) {
- UINT codepage = GetConsoleCP();
- if (!codepage) codepage = GetACP();
- snprintf(cp, sizeof(cp), "CP%d", codepage);
+ snprintf(cp, sizeof(cp), "CP%d", GetConsoleCP());
codeset = cp;
}
return rb_usascii_str_new2(codeset);
@@ -1631,206 +1494,6 @@ rb_enc_aliases(VALUE klass)
return aliases[0];
}
-/*
- * An Encoding instance represents a character encoding usable in Ruby. It is
- * defined as a constant under the Encoding namespace. It has a name and
- * optionally, aliases:
- *
- * Encoding::ISO_8859_1.name
- * #=> #<Encoding:ISO-8859-1>
- *
- * Encoding::ISO_8859_1.names
- * #=> ["ISO-8859-1", "ISO8859-1"]
- *
- * Ruby methods dealing with encodings return or accept Encoding instances as
- * arguments (when a method accepts an Encoding instance as an argument, it
- * can be passed an Encoding name or alias instead).
- *
- * "some string".encoding
- * #=> #<Encoding:UTF-8>
- *
- * string = "some string".encode(Encoding::ISO_8859_1)
- * #=> "some string"
- * string.encoding
- * #=> #<Encoding:ISO-8859-1>
- *
- * "some string".encode "ISO-8859-1"
- * #=> "some string"
- *
- * <code>Encoding::ASCII_8BIT</code> is a special encoding that is usually
- * used for a byte string, not a character string. But as the name insists,
- * its characters in the range of ASCII are considered as ASCII characters.
- * This is useful when you use ASCII-8BIT characters with other ASCII
- * compatible characters.
- *
- * == Changing an encoding
- *
- * The associated Encoding of a String can be changed in two different ways.
- *
- * First, it is possible to set the Encoding of a string to a new Encoding
- * without changing the internal byte representation of the string, with
- * String#force_encoding. This is how you can tell Ruby the correct encoding
- * of a string.
- *
- * string
- * #=> "R\xC3\xA9sum\xC3\xA9"
- * string.encoding
- * #=> #<Encoding:ISO-8859-1>
- * string.force_encoding(Encoding::UTF-8)
- * #=> "R\u00E9sum\u00E9"
- *
- * Second, it is possible to transcode a string, i.e. translate its internal
- * byte representation to another encoding. Its associated encoding is also
- * set to the other encoding. See String#encode for the various forms of
- * transcoding, and the Encoding::Converter class for additional control over
- * the transcoding process.
- *
- * string
- * #=> "R\u00E9sum\u00E9"
- * string.encoding
- * #=> #<Encoding:UTF-8>
- * string = string.encode!(Encoding::ISO_8859_1)
- * #=> "R\xE9sum\xE9"
- * string.encoding
- * #=> #<Encoding::ISO-8859-1>
- *
- * == Script encoding
- *
- * All Ruby script code has an associated Encoding which any String literal
- * created in the source code will be associated to.
- *
- * The default script encoding is <code>Encoding::US-ASCII</code>, but it can
- * be changed by a magic comment on the first line of the source code file (or
- * second line, if there is a shebang line on the first). The comment must
- * contain the word <code>coding</code> or <code>encoding</code>, followed
- * by a colon, space and the Encoding name or alias:
- *
- * # encoding: UTF-8
- *
- * "some string".encoding
- * #=> #<Encoding:UTF-8>
- *
- * The <code>__ENCODING__</code> keyword returns the script encoding of the file
- * which the keyword is written:
- *
- * # encoding: ISO-8859-1
- *
- * __ENCODING__
- * #=> #<Encoding:ISO-8859-1>
- *
- * <code>ruby -K</code> will change the default locale encoding, but this is
- * not recommended. Ruby source files should declare its script encoding by a
- * magic comment even when they only depend on US-ASCII strings or regular
- * expressions.
- *
- * == Locale encoding
- *
- * The default encoding of the environment. Usually derived from locale.
- *
- * see Encoding.locale_charmap, Encoding.find('locale')
- *
- * == Filesystem encoding
- *
- * The default encoding of strings from the filesystem of the environment.
- * This is used for strings of file names or paths.
- *
- * see Encoding.find('filesystem')
- *
- * == External encoding
- *
- * Each IO object has an external encoding which indicates the encoding that
- * Ruby will use to read its data. By default Ruby sets the external encoding
- * of an IO object to the default external encoding. The default external
- * encoding is set by locale encoding or the interpreter <code>-E</code> option.
- * Encoding.default_external returns the current value of the external
- * encoding.
- *
- * ENV["LANG"]
- * #=> "UTF-8"
- * Encoding.default_external
- * #=> #<Encoding:UTF-8>
- *
- * $ ruby -E ISO-8859-1 -e "p Encoding.default_external"
- * #<Encoding:ISO-8859-1>
- *
- * $ LANG=C ruby -e 'p Encoding.default_external'
- * #<Encoding:US-ASCII>
- *
- * The default external encoding may also be set through
- * Encoding.default_external=, but you should not do this as strings created
- * before and after the change will have inconsistent encodings. Instead use
- * <code>ruby -E</code> to invoke ruby with the correct external encoding.
- *
- * When you know that the actual encoding of the data of an IO object is not
- * the default external encoding, you can reset its external encoding with
- * IO#set_encoding or set it at IO object creation (see IO.new options).
- *
- * == Internal encoding
- *
- * To process the data of an IO object which has an encoding different
- * from its external encoding, you can set its internal encoding. Ruby will use
- * this internal encoding to transcode the data when it is read from the IO
- * object.
- *
- * Conversely, when data is written to the IO object it is transcoded from the
- * internal encoding to the external encoding of the IO object.
- *
- * The internal encoding of an IO object can be set with
- * IO#set_encoding or at IO object creation (see IO.new options).
- *
- * The internal encoding is optional and when not set, the Ruby default
- * internal encoding is used. If not explicitly set this default internal
- * encoding is +nil+ meaning that by default, no transcoding occurs.
- *
- * The default internal encoding can be set with the interpreter option
- * <code>-E</code>. Encoding.default_internal returns the current internal
- * encoding.
- *
- * $ ruby -e 'p Encoding.default_internal'
- * nil
- *
- * $ ruby -E ISO-8859-1:UTF-8 -e "p [Encoding.default_external, \
- * Encoding.default_internal]"
- * [#<Encoding:ISO-8859-1>, #<Encoding:UTF-8>]
- *
- * The default internal encoding may also be set through
- * Encoding.default_internal=, but you should not do this as strings created
- * before and after the change will have inconsistent encodings. Instead use
- * <code>ruby -E</code> to invoke ruby with the correct internal encoding.
- *
- * == IO encoding example
- *
- * In the following example a UTF-8 encoded string "R\u00E9sum\u00E9" is transcoded for
- * output to ISO-8859-1 encoding, then read back in and transcoded to UTF-8:
- *
- * string = "R\u00E9sum\u00E9"
- *
- * open("transcoded.txt", "w:ISO-8859-1") do |io|
- * io.write(string)
- * end
- *
- * puts "raw text:"
- * p File.binread("transcoded.txt")
- * puts
- *
- * open("transcoded.txt", "r:ISO-8859-1:UTF-8") do |io|
- * puts "transcoded text:"
- * p io.read
- * end
- *
- * While writing the file, the internal encoding is not specified as it is
- * only necessary for reading. While reading the file both the internal and
- * external encoding must be specified to obtain the correct result.
- *
- * $ ruby t.rb
- * raw text:
- * "R\xE9sum\xE9"
- *
- * transcoded text:
- * "R\u00E9sum\u00E9"
- *
- */
-
void
Init_Encoding(void)
{
@@ -1874,10 +1537,10 @@ Init_Encoding(void)
}
}
-/* locale insensitive ctype functions */
+/* locale insensitive functions */
#define ctype_test(c, ctype) \
- (rb_isascii(c) && ONIGENC_IS_ASCII_CODE_CTYPE((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); }
diff --git a/enum.c b/enum.c
index 40bea4fe3c..8d4692ae6d 100644
--- a/enum.c
+++ b/enum.c
@@ -12,25 +12,12 @@
#include "ruby/ruby.h"
#include "ruby/util.h"
#include "node.h"
-#include "id.h"
-#include "internal.h"
-
-#define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[1 - 2*!(expr)]
VALUE rb_mEnumerable;
+static ID id_each, id_eqq, id_cmp, id_next, id_size;
-static ID id_next;
-static ID id_div;
-static ID id_call;
-static ID id_size;
-
-#define id_each idEach
-#define id_eqq idEqq
-#define id_cmp idCmp
-#define id_lshift idLTLT
-
-VALUE
-rb_enum_values_pack(int argc, VALUE *argv)
+static VALUE
+enum_values_pack(int argc, VALUE *argv)
{
if (argc == 0) return Qnil;
if (argc == 1) return argv[0];
@@ -38,7 +25,7 @@ rb_enum_values_pack(int argc, VALUE *argv)
}
#define ENUM_WANT_SVALUE() do { \
- i = rb_enum_values_pack(argc, argv); \
+ i = enum_values_pack(argc, argv); \
} while (0)
#define enum_yield rb_yield_values2
@@ -46,11 +33,11 @@ rb_enum_values_pack(int argc, VALUE *argv)
static VALUE
grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
+ VALUE *arg = (VALUE *)args;
ENUM_WANT_SVALUE();
- if (RTEST(rb_funcall(memo->u1.value, id_eqq, 1, i))) {
- rb_ary_push(memo->u2.value, i);
+ if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
+ rb_ary_push(arg[1], i);
}
return Qnil;
}
@@ -58,19 +45,19 @@ grep_i(VALUE i, VALUE args, int argc, VALUE *argv)
static VALUE
grep_iter_i(VALUE i, VALUE args, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
+ VALUE *arg = (VALUE *)args;
ENUM_WANT_SVALUE();
- if (RTEST(rb_funcall(memo->u1.value, id_eqq, 1, i))) {
- rb_ary_push(memo->u2.value, rb_yield(i));
+ if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
+ rb_ary_push(arg[1], rb_yield(i));
}
return Qnil;
}
/*
* call-seq:
- * enum.grep(pattern) -> array
- * enum.grep(pattern) { |obj| block } -> array
+ * enum.grep(pattern) -> array
+ * enum.grep(pattern) {| obj | block } -> array
*
* Returns an array of every element in <i>enum</i> for which
* <code>Pattern === element</code>. If the optional <em>block</em> is
@@ -80,7 +67,7 @@ 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]
- * res = c.grep(/SEEK/) { |v| IO.const_get(v) }
+ * res = c.grep(/SEEK/) {|v| IO.const_get(v) }
* res #=> [0, 1, 2]
*
*/
@@ -89,9 +76,12 @@ static VALUE
enum_grep(VALUE obj, VALUE pat)
{
VALUE ary = rb_ary_new();
- NODE *memo = NEW_MEMO(pat, ary, 0);
+ VALUE arg[2];
+
+ arg[0] = pat;
+ arg[1] = ary;
- rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
+ rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
return ary;
}
@@ -99,12 +89,12 @@ enum_grep(VALUE obj, VALUE pat)
static VALUE
count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{
- NODE *memo = RNODE(memop);
+ VALUE *memo = (VALUE*)memop;
ENUM_WANT_SVALUE();
- if (rb_equal(i, memo->u1.value)) {
- memo->u3.cnt++;
+ if (rb_equal(i, memo[1])) {
+ memo[0]++;
}
return Qnil;
}
@@ -112,10 +102,10 @@ count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
static VALUE
count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{
- NODE *memo = RNODE(memop);
+ VALUE *memo = (VALUE*)memop;
if (RTEST(enum_yield(argc, argv))) {
- memo->u3.cnt++;
+ memo[0]++;
}
return Qnil;
}
@@ -123,35 +113,35 @@ count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
static VALUE
count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{
- NODE *memo = RNODE(memop);
+ VALUE *memo = (VALUE*)memop;
- memo->u3.cnt++;
+ memo[0]++;
return Qnil;
}
/*
* call-seq:
- * enum.count -> int
- * enum.count(item) -> int
- * enum.count { |obj| block } -> int
+ * enum.count -> int
+ * enum.count(item) -> int
+ * enum.count {| obj | block } -> int
*
- * Returns the number of items in +enum+ through enumeration.
- * If an argument is given, the number of items in +enum+ that
- * are equal to +item+ are counted. If a block is given, it
- * counts the number of elements yielding a true value.
+ * Returns the number of items in <i>enum</i>, where #size is called
+ * if it responds to it, otherwise the items are counted through
+ * enumeration. If an argument is given, counts the number of items
+ * in <i>enum</i>, for which equals to <i>item</i>. If a block is
+ * given, counts the number of elements yielding a true value.
*
* ary = [1, 2, 4, 2]
- * ary.count #=> 4
- * ary.count(2) #=> 2
- * ary.count{ |x| x%2==0 } #=> 3
+ * ary.count #=> 4
+ * ary.count(2) #=> 2
+ * ary.count{|x|x%2==0} #=> 3
*
*/
static VALUE
enum_count(int argc, VALUE *argv, VALUE obj)
{
- VALUE item = Qnil;
- NODE *memo;
+ VALUE memo[2]; /* [count, condition value] */
rb_block_call_func *func;
if (argc == 0) {
@@ -163,27 +153,25 @@ enum_count(int argc, VALUE *argv, VALUE obj)
}
}
else {
- rb_scan_args(argc, argv, "1", &item);
+ rb_scan_args(argc, argv, "1", &memo[1]);
if (rb_block_given_p()) {
rb_warn("given block not used");
}
func = count_i;
}
- memo = NEW_MEMO(item, 0, 0);
- rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
- return INT2NUM(memo->u3.cnt);
+ memo[0] = 0;
+ rb_block_call(obj, id_each, 0, 0, func, (VALUE)&memo);
+ return INT2NUM(memo[0]);
}
static VALUE
-find_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
ENUM_WANT_SVALUE();
if (RTEST(rb_yield(i))) {
- NODE *memo = RNODE(memop);
- memo->u1.value = i;
- memo->u3.cnt = 1;
+ *memo = i;
rb_iter_break();
}
return Qnil;
@@ -191,10 +179,10 @@ find_i(VALUE i, VALUE memop, int argc, VALUE *argv)
/*
* call-seq:
- * enum.detect(ifnone = nil) { |obj| block } -> obj or nil
- * enum.find(ifnone = nil) { |obj| block } -> obj or nil
- * enum.detect(ifnone = nil) -> an_enumerator
- * enum.find(ifnone = nil) -> an_enumerator
+ * enum.detect(ifnone = nil) {| obj | block } -> obj or nil
+ * enum.find(ifnone = nil) {| obj | block } -> obj or nil
+ * enum.detect(ifnone = nil) -> an_enumerator
+ * enum.find(ifnone = nil) -> an_enumerator
*
* Passes each entry in <i>enum</i> to <em>block</em>. Returns the
* first for which <em>block</em> is not false. If no
@@ -203,26 +191,25 @@ find_i(VALUE i, VALUE memop, int argc, VALUE *argv)
*
* If no block is given, an enumerator is returned instead.
*
- * (1..10).detect { |i| i % 5 == 0 and i % 7 == 0 } #=> nil
- * (1..100).find { |i| i % 5 == 0 and i % 7 == 0 } #=> 35
+ * (1..10).detect {|i| i % 5 == 0 and i % 7 == 0 } #=> nil
+ * (1..100).detect {|i| i % 5 == 0 and i % 7 == 0 } #=> 35
*
*/
static VALUE
enum_find(int argc, VALUE *argv, VALUE obj)
{
- NODE *memo;
+ VALUE memo = Qundef;
VALUE if_none;
rb_scan_args(argc, argv, "01", &if_none);
RETURN_ENUMERATOR(obj, argc, argv);
- memo = NEW_MEMO(Qundef, 0, 0);
- rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
- if (memo->u3.cnt) {
- return memo->u1.value;
+ rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)&memo);
+ if (memo != Qundef) {
+ return memo;
}
if (!NIL_P(if_none)) {
- return rb_funcall(if_none, id_call, 0, 0);
+ return rb_funcall(if_none, rb_intern("call"), 0, 0);
}
return Qnil;
}
@@ -230,36 +217,36 @@ enum_find(int argc, VALUE *argv, VALUE obj)
static VALUE
find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{
- NODE *memo = RNODE(memop);
+ VALUE *memo = (VALUE*)memop;
ENUM_WANT_SVALUE();
- if (rb_equal(i, memo->u2.value)) {
- memo->u1.value = UINT2NUM(memo->u3.cnt);
+ if (rb_equal(i, memo[2])) {
+ memo[0] = UINT2NUM(memo[1]);
rb_iter_break();
}
- memo->u3.cnt++;
+ memo[1]++;
return Qnil;
}
static VALUE
find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{
- NODE *memo = RNODE(memop);
+ VALUE *memo = (VALUE*)memop;
if (RTEST(enum_yield(argc, argv))) {
- memo->u1.value = UINT2NUM(memo->u3.cnt);
+ memo[0] = UINT2NUM(memo[1]);
rb_iter_break();
}
- memo->u3.cnt++;
+ memo[1]++;
return Qnil;
}
/*
* call-seq:
- * enum.find_index(value) -> int or nil
- * enum.find_index { |obj| block } -> int or nil
- * enum.find_index -> an_enumerator
+ * enum.find_index(value) -> int or nil
+ * enum.find_index {| obj | block } -> int or nil
+ * enum.find_index -> an_enumerator
*
* Compares each entry in <i>enum</i> with <em>value</em> or passes
* to <em>block</em>. Returns the index for the first for which the
@@ -268,8 +255,8 @@ find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
*
* If neither block nor argument is given, an enumerator is returned instead.
*
- * (1..10).find_index { |i| i % 5 == 0 and i % 7 == 0 } #=> nil
- * (1..100).find_index { |i| i % 5 == 0 and i % 7 == 0 } #=> 34
+ * (1..10).find_index {|i| i % 5 == 0 and i % 7 == 0 } #=> nil
+ * (1..100).find_index {|i| i % 5 == 0 and i % 7 == 0 } #=> 34
* (1..100).find_index(50) #=> 49
*
*/
@@ -277,8 +264,7 @@ find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
static VALUE
enum_find_index(int argc, VALUE *argv, VALUE obj)
{
- NODE *memo; /* [return value, current index, ] */
- VALUE condition_value = Qnil;
+ VALUE memo[3]; /* [return value, current index, condition value] */
rb_block_call_func *func;
if (argc == 0) {
@@ -286,16 +272,17 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
func = find_index_iter_i;
}
else {
- rb_scan_args(argc, argv, "1", &condition_value);
+ rb_scan_args(argc, argv, "1", &memo[2]);
if (rb_block_given_p()) {
rb_warn("given block not used");
}
func = find_index_i;
}
- memo = NEW_MEMO(Qnil, condition_value, 0);
+ memo[0] = Qnil;
+ memo[1] = 0;
rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
- return memo->u1.value;
+ return memo[0];
}
static VALUE
@@ -309,32 +296,22 @@ find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
return Qnil;
}
-static VALUE
-enum_size(VALUE self, VALUE args)
-{
- VALUE r;
- r = rb_check_funcall(self, id_size, 0, 0);
- return (r == Qundef) ? Qnil : r;
-}
-
/*
* call-seq:
- * enum.find_all { |obj| block } -> array
- * enum.select { |obj| block } -> array
- * enum.find_all -> an_enumerator
- * enum.select -> an_enumerator
- *
- * Returns an array containing all elements of +enum+
- * for which the given +block+ returns a true value.
+ * enum.find_all {| obj | block } -> array
+ * enum.select {| obj | block } -> array
+ * enum.find_all -> an_enumerator
+ * enum.select -> an_enumerator
*
- * If no block is given, an Enumerator is returned instead.
+ * Returns an array containing all elements of <i>enum</i> for which
+ * <em>block</em> is not <code>false</code> (see also
+ * <code>Enumerable#reject</code>).
*
+ * If no block is given, an enumerator is returned instead.
*
- * (1..10).find_all { |i| i % 3 == 0 } #=> [3, 6, 9]
*
- * [1,2,3,4,5].select { |num| num.even? } #=> [2, 4]
+ * (1..10).find_all {|i| i % 3 == 0 } #=> [3, 6, 9]
*
- * See also Enumerable#reject.
*/
static VALUE
@@ -342,7 +319,7 @@ enum_find_all(VALUE obj)
{
VALUE ary;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
ary = rb_ary_new();
rb_block_call(obj, id_each, 0, 0, find_all_i, ary);
@@ -363,19 +340,16 @@ reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
/*
* call-seq:
- * enum.reject { |obj| block } -> array
- * enum.reject -> an_enumerator
+ * enum.reject {| obj | block } -> array
+ * enum.reject -> an_enumerator
*
- * Returns an array for all elements of +enum+ for which the given
- * +block+ returns false.
+ * Returns an array for all elements of <i>enum</i> for which
+ * <em>block</em> is false (see also <code>Enumerable#find_all</code>).
*
- * If no block is given, an Enumerator is returned instead.
- *
- * (1..10).reject { |i| i % 3 == 0 } #=> [1, 2, 4, 5, 7, 8, 10]
+ * If no block is given, an enumerator is returned instead.
*
- * [1, 2, 3, 4, 5].reject { |num| num.even? } #=> [1, 3, 5]
+ * (1..10).reject {|i| i % 3 == 0 } #=> [1, 2, 4, 5, 7, 8, 10]
*
- * See also Enumerable#find_all.
*/
static VALUE
@@ -383,7 +357,7 @@ enum_reject(VALUE obj)
{
VALUE ary;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
ary = rb_ary_new();
rb_block_call(obj, id_each, 0, 0, reject_i, ary);
@@ -403,24 +377,24 @@ static VALUE
collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
{
rb_thread_check_ints();
- rb_ary_push(ary, rb_enum_values_pack(argc, argv));
+ rb_ary_push(ary, enum_values_pack(argc, argv));
return Qnil;
}
/*
* call-seq:
- * enum.collect { |obj| block } -> array
- * enum.map { |obj| block } -> array
- * enum.collect -> an_enumerator
- * enum.map -> an_enumerator
+ * enum.collect {| obj | block } -> array
+ * enum.map {| obj | block } -> array
+ * enum.collect -> an_enumerator
+ * enum.map -> an_enumerator
*
* Returns a new array with the results of running <em>block</em> once
* for every element in <i>enum</i>.
*
* If no block is given, an enumerator is returned instead.
*
- * (1..4).collect { |i| i*i } #=> [1, 4, 9, 16]
+ * (1..4).collect {|i| i*i } #=> [1, 4, 9, 16]
* (1..4).collect { "cat" } #=> ["cat", "cat", "cat", "cat"]
*
*/
@@ -430,7 +404,7 @@ enum_collect(VALUE obj)
{
VALUE ary;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
ary = rb_ary_new();
rb_block_call(obj, id_each, 0, 0, collect_i, ary);
@@ -457,18 +431,17 @@ flat_map_i(VALUE i, VALUE ary, int argc, VALUE *argv)
/*
* call-seq:
- * enum.flat_map { |obj| block } -> array
- * enum.collect_concat { |obj| block } -> array
- * enum.flat_map -> an_enumerator
- * enum.collect_concat -> an_enumerator
+ * enum.flat_map {| obj | block } -> array
+ * enum.collect_concat {| obj | block } -> array
+ * enum.flat_map -> an_enumerator
+ * enum.collect_concat -> an_enumerator
*
* Returns a new array with the concatenated results of running
* <em>block</em> once for every element in <i>enum</i>.
*
* If no block is given, an enumerator is returned instead.
*
- * [1, 2, 3, 4].flat_map { |e| [e, -e] } #=> [1, -1, 2, -2, 3, -3, 4, -4]
- * [[1, 2], [3, 4]].flat_map { |e| e + [100] } #=> [1, 2, 100, 3, 4, 100]
+ * [[1,2],[3,4]].flat_map {|i| i } #=> [1, 2, 3, 4]
*
*/
@@ -477,7 +450,7 @@ enum_flat_map(VALUE obj)
{
VALUE ary;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
ary = rb_ary_new();
rb_block_call(obj, id_each, 0, 0, flat_map_i, ary);
@@ -487,8 +460,8 @@ enum_flat_map(VALUE obj)
/*
* call-seq:
- * enum.to_a -> array
- * enum.entries -> array
+ * enum.to_a -> array
+ * enum.entries -> array
*
* Returns an array containing the items in <i>enum</i>.
*
@@ -509,16 +482,15 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
static VALUE
inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
{
- NODE *memo = RNODE(p);
+ VALUE *memo = (VALUE *)p;
ENUM_WANT_SVALUE();
- if (memo->u2.argc == 0) {
- memo->u2.argc = 1;
- memo->u1.value = i;
+ if (memo[0] == Qundef) {
+ memo[0] = i;
}
else {
- memo->u1.value = rb_yield_values(2, memo->u1.value, i);
+ memo[0] = rb_yield_values(2, memo[0], i);
}
return Qnil;
}
@@ -526,16 +498,15 @@ inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
static VALUE
inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
{
- NODE *memo = RNODE(p);
+ VALUE *memo = (VALUE *)p;
ENUM_WANT_SVALUE();
- if (memo->u2.argc == 0) {
- memo->u2.argc = 1;
- memo->u1.value = i;
+ if (memo[0] == Qundef) {
+ memo[0] = i;
}
else {
- memo->u1.value = rb_funcall(memo->u1.value, memo->u3.id, 1, i);
+ memo[0] = rb_funcall(memo[0], (ID)memo[1], 1, i);
}
return Qnil;
}
@@ -544,12 +515,13 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
* call-seq:
* enum.inject(initial, sym) -> obj
* enum.inject(sym) -> obj
- * enum.inject(initial) { |memo, obj| block } -> obj
- * enum.inject { |memo, obj| block } -> obj
+ * enum.inject(initial) {| memo, obj | block } -> obj
+ * enum.inject {| memo, obj | block } -> obj
+ *
* enum.reduce(initial, sym) -> obj
* enum.reduce(sym) -> obj
- * enum.reduce(initial) { |memo, obj| block } -> obj
- * enum.reduce { |memo, obj| block } -> obj
+ * enum.reduce(initial) {| memo, obj | block } -> obj
+ * enum.reduce {| memo, obj | block } -> obj
*
* Combines all elements of <i>enum</i> by applying a binary
* operation, specified by a block or a symbol that names a
@@ -561,81 +533,78 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
* will be passed to the named method of <i>memo</i>.
* In either case, the result becomes the new value for <i>memo</i>.
* At the end of the iteration, the final value of <i>memo</i> is the
- * return value for the method.
+ * return value fo the method.
*
* If you do not explicitly specify an <i>initial</i> value for <i>memo</i>,
- * then the first element of collection is used as the initial value
+ * then uses the first element of collection is used as the initial value
* of <i>memo</i>.
*
+ * Examples:
*
* # Sum some numbers
- * (5..10).reduce(:+) #=> 45
+ * (5..10).reduce(:+) #=> 45
* # Same using a block and inject
- * (5..10).inject { |sum, n| sum + n } #=> 45
+ * (5..10).inject {|sum, n| sum + n } #=> 45
* # Multiply some numbers
- * (5..10).reduce(1, :*) #=> 151200
+ * (5..10).reduce(1, :*) #=> 151200
* # Same using a block
- * (5..10).inject(1) { |product, n| product * n } #=> 151200
+ * (5..10).inject(1) {|product, n| product * n } #=> 151200
* # find the longest word
- * longest = %w{ cat sheep bear }.inject do |memo, word|
+ * longest = %w{ cat sheep bear }.inject do |memo,word|
* memo.length > word.length ? memo : word
* end
- * longest #=> "sheep"
+ * longest #=> "sheep"
*
*/
static VALUE
enum_inject(int argc, VALUE *argv, VALUE obj)
{
- NODE *memo;
- VALUE init, op;
+ VALUE memo[2];
VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i;
- switch (rb_scan_args(argc, argv, "02", &init, &op)) {
+ switch (rb_scan_args(argc, argv, "02", &memo[0], &memo[1])) {
case 0:
+ memo[0] = Qundef;
break;
case 1:
if (rb_block_given_p()) {
break;
}
- op = (VALUE)rb_to_id(init);
- argc = 0;
- init = Qnil;
+ memo[1] = (VALUE)rb_to_id(memo[0]);
+ memo[0] = Qundef;
iter = inject_op_i;
break;
case 2:
if (rb_block_given_p()) {
rb_warning("given block not used");
}
- op = (VALUE)rb_to_id(op);
+ memo[1] = (VALUE)rb_to_id(memo[1]);
iter = inject_op_i;
break;
}
- memo = NEW_MEMO(init, argc, op);
rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
- return memo->u1.value;
+ if (memo[0] == Qundef) return Qnil;
+ return memo[0];
}
static VALUE
-partition_i(VALUE i, VALUE arys, int argc, VALUE *argv)
+partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
{
- NODE *memo = RNODE(arys);
- VALUE ary;
ENUM_WANT_SVALUE();
if (RTEST(rb_yield(i))) {
- ary = memo->u1.value;
+ rb_ary_push(ary[0], i);
}
else {
- ary = memo->u2.value;
+ rb_ary_push(ary[1], i);
}
- rb_ary_push(ary, i);
return Qnil;
}
/*
* call-seq:
- * enum.partition { |obj| block } -> [ true_array, false_array ]
- * enum.partition -> an_enumerator
+ * enum.partition {| obj | block } -> [ true_array, false_array ]
+ * enum.partition -> an_enumerator
*
* Returns two arrays, the first containing the elements of
* <i>enum</i> for which the block evaluates to true, the second
@@ -643,21 +612,22 @@ partition_i(VALUE i, VALUE arys, int argc, VALUE *argv)
*
* If no block is given, an enumerator is returned instead.
*
- * (1..6).partition { |v| v.even? } #=> [[2, 4, 6], [1, 3, 5]]
+ * (1..6).partition {|i| (i&1).zero?} #=> [[2, 4, 6], [1, 3, 5]]
*
*/
static VALUE
enum_partition(VALUE obj)
{
- NODE *memo;
+ VALUE ary[2];
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
- memo = NEW_MEMO(rb_ary_new(), rb_ary_new(), 0);
- rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)memo);
+ ary[0] = rb_ary_new();
+ ary[1] = rb_ary_new();
+ rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)ary);
- return rb_assoc_new(memo->u1.value, memo->u2.value);
+ return rb_assoc_new(ary[0], ary[1]);
}
static VALUE
@@ -670,7 +640,7 @@ group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
group = rb_yield(i);
values = rb_hash_aref(hash, group);
- if (!RB_TYPE_P(values, T_ARRAY)) {
+ if (NIL_P(values)) {
values = rb_ary_new3(1, i);
rb_hash_aset(hash, group, values);
}
@@ -682,16 +652,16 @@ group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
/*
* call-seq:
- * enum.group_by { |obj| block } -> a_hash
- * enum.group_by -> an_enumerator
+ * enum.group_by {| obj | block } -> a_hash
+ * enum.group_by -> an_enumerator
*
- * Groups the collection by result of the block. Returns a hash where the
- * keys are the evaluated result from the block and the values are
- * arrays of elements in the collection that correspond to the key.
+ * Returns a hash, which keys are evaluated result from the
+ * block, and values are arrays of elements in <i>enum</i>
+ * corresponding to the key.
*
- * If no block is given an enumerator is returned.
+ * If no block is given, an enumerator is returned instead.
*
- * (1..6).group_by { |i| i%3 } #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
+ * (1..6).group_by {|i| i%3} #=> {0=>[3, 6], 1=>[1, 4], 2=>[2, 5]}
*
*/
@@ -700,7 +670,7 @@ enum_group_by(VALUE obj)
{
VALUE hash;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
hash = rb_hash_new();
rb_block_call(obj, id_each, 0, 0, group_by_i, hash);
@@ -710,19 +680,27 @@ enum_group_by(VALUE obj)
}
static VALUE
-first_i(VALUE i, VALUE params, int argc, VALUE *argv)
+first_i(VALUE i, VALUE *params, int argc, VALUE *argv)
{
- NODE *memo = RNODE(params);
ENUM_WANT_SVALUE();
- memo->u1.value = i;
- rb_iter_break();
+ if (NIL_P(params[1])) {
+ params[1] = i;
+ rb_iter_break();
+ }
+ else {
+ long n = params[0];
- UNREACHABLE;
+ rb_ary_push(params[1], i);
+ n--;
+ if (n <= 0) {
+ rb_iter_break();
+ }
+ params[0] = n;
+ }
+ return Qnil;
}
-static VALUE enum_take(VALUE obj, VALUE n);
-
/*
* call-seq:
* enum.first -> obj or nil
@@ -732,33 +710,38 @@ static VALUE enum_take(VALUE obj, VALUE n);
* If the enumerable is empty, the first form returns <code>nil</code>, and the
* second form returns an empty array.
*
- * %w[foo bar baz].first #=> "foo"
- * %w[foo bar baz].first(2) #=> ["foo", "bar"]
- * %w[foo bar baz].first(10) #=> ["foo", "bar", "baz"]
- * [].first #=> nil
- *
*/
static VALUE
enum_first(int argc, VALUE *argv, VALUE obj)
{
- NODE *memo;
- rb_check_arity(argc, 0, 1);
- if (argc > 0) {
- return enum_take(obj, argv[0]);
+ VALUE n, params[2];
+
+ if (argc == 0) {
+ params[0] = params[1] = Qnil;
}
else {
- memo = NEW_MEMO(Qnil, 0, 0);
- rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)memo);
- return memo->u1.value;
+ 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);
}
+ rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)params);
+
+ return params[1];
}
/*
* call-seq:
- * enum.sort -> array
- * enum.sort { |a, b| block } -> array
+ * enum.sort -> array
+ * enum.sort {| a, b | block } -> array
*
* Returns an array containing the items in <i>enum</i> sorted,
* either according to their own <code><=></code> method, or by using
@@ -768,8 +751,8 @@ enum_first(int argc, VALUE *argv, VALUE obj)
* built-in Schwartzian Transform, useful when key computation or
* comparison is expensive.
*
- * %w(rhea kea flea).sort #=> ["flea", "kea", "rhea"]
- * (1..10).sort { |a, b| b <=> a } #=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
+ * %w(rhea kea flea).sort #=> ["flea", "kea", "rhea"]
+ * (1..10).sort {|a,b| b <=> a} #=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
*/
static VALUE
@@ -778,83 +761,60 @@ enum_sort(VALUE obj)
return rb_ary_sort(enum_to_a(0, 0, obj));
}
-#define SORT_BY_BUFSIZE 16
-struct sort_by_data {
- VALUE ary;
- VALUE buf;
- long n;
-};
-
static VALUE
-sort_by_i(VALUE i, VALUE _data, int argc, VALUE *argv)
+sort_by_i(VALUE i, VALUE ary, int argc, VALUE *argv)
{
- struct sort_by_data *data = (struct sort_by_data *)&RNODE(_data)->u1;
- VALUE ary = data->ary;
- VALUE v;
+ NODE *memo;
ENUM_WANT_SVALUE();
- v = rb_yield(i);
-
if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered");
}
- if (RARRAY_LEN(data->buf) != SORT_BY_BUFSIZE*2) {
- rb_raise(rb_eRuntimeError, "sort_by reentered");
- }
-
- RARRAY_PTR(data->buf)[data->n*2] = v;
- RARRAY_PTR(data->buf)[data->n*2+1] = i;
- data->n++;
- if (data->n == SORT_BY_BUFSIZE) {
- rb_ary_concat(ary, data->buf);
- data->n = 0;
- }
+ /* use NODE_DOT2 as memo(v, v, -) */
+ memo = rb_node_newnode(NODE_DOT2, rb_yield(i), i, 0);
+ rb_ary_push(ary, (VALUE)memo);
return Qnil;
}
static int
sort_by_cmp(const void *ap, const void *bp, void *data)
{
- VALUE a;
- VALUE b;
+ VALUE a = (*(NODE *const *)ap)->u1.value;
+ VALUE b = (*(NODE *const *)bp)->u1.value;
VALUE ary = (VALUE)data;
if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered");
}
-
- a = *(VALUE *)ap;
- b = *(VALUE *)bp;
-
return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
}
/*
* call-seq:
- * enum.sort_by { |obj| block } -> array
- * enum.sort_by -> an_enumerator
+ * enum.sort_by {| obj | block } -> array
+ * enum.sort_by -> an_enumerator
*
* Sorts <i>enum</i> using a set of keys generated by mapping the
* values in <i>enum</i> through the given block.
*
* If no block is given, an enumerator is returned instead.
*
- * %w{apple pear fig}.sort_by { |word| word.length}
+ * %w{ apple pear fig }.sort_by {|word| word.length}
* #=> ["fig", "pear", "apple"]
*
* The current implementation of <code>sort_by</code> generates an
* array of tuples containing the original collection element and the
* mapped value. This makes <code>sort_by</code> fairly expensive when
- * the keysets are simple.
+ * the keysets are simple
*
* require 'benchmark'
*
- * a = (1..100000).map { rand(100000) }
+ * a = (1..100000).map {rand(100000)}
*
* Benchmark.bm(10) do |b|
* b.report("Sort") { a.sort }
- * b.report("Sort by") { a.sort_by { |a| a } }
+ * b.report("Sort by") { a.sort_by {|a| a} }
* end
*
* <em>produces:</em>
@@ -868,7 +828,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
* using the basic <code>sort</code> method.
*
* files = Dir["*"]
- * sorted = files.sort { |a, b| File.new(a).mtime <=> File.new(b).mtime }
+ * sorted = files.sort {|a,b| File.new(a).mtime <=> File.new(b).mtime}
* sorted #=> ["mon", "tues", "wed", "thurs"]
*
* This sort is inefficient: it generates two new <code>File</code>
@@ -877,7 +837,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
* times directly.
*
* files = Dir["*"]
- * sorted = files.sort { |a, b|
+ * sorted = files.sort { |a,b|
* test(?M, a) <=> test(?M, b)
* }
* sorted #=> ["mon", "tues", "wed", "thurs"]
@@ -897,55 +857,38 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
*
* This is exactly what <code>sort_by</code> does internally.
*
- * sorted = Dir["*"].sort_by { |f| test(?M, f) }
+ * sorted = Dir["*"].sort_by {|f| test(?M, f)}
* sorted #=> ["mon", "tues", "wed", "thurs"]
*/
static VALUE
enum_sort_by(VALUE obj)
{
- VALUE ary, buf;
- NODE *memo;
+ VALUE ary;
long i;
- struct sort_by_data *data;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
- if (RB_TYPE_P(obj, T_ARRAY) && RARRAY_LEN(obj) <= LONG_MAX/2) {
- ary = rb_ary_new2(RARRAY_LEN(obj)*2);
+ if (TYPE(obj) == T_ARRAY) {
+ ary = rb_ary_new2(RARRAY_LEN(obj));
}
else {
ary = rb_ary_new();
}
RBASIC(ary)->klass = 0;
- buf = rb_ary_tmp_new(SORT_BY_BUFSIZE*2);
- rb_ary_store(buf, SORT_BY_BUFSIZE*2-1, Qnil);
- memo = NEW_MEMO(0, 0, 0);
- OBJ_INFECT(memo, obj);
- data = (struct sort_by_data *)&memo->u1;
- data->ary = ary;
- data->buf = buf;
- data->n = 0;
- rb_block_call(obj, id_each, 0, 0, sort_by_i, (VALUE)memo);
- ary = data->ary;
- buf = data->buf;
- if (data->n) {
- rb_ary_resize(buf, data->n*2);
- rb_ary_concat(ary, buf);
- }
- if (RARRAY_LEN(ary) > 2) {
- ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary)/2, 2*sizeof(VALUE),
+ 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);
}
if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered");
}
- for (i=1; i<RARRAY_LEN(ary); i+=2) {
- RARRAY_PTR(ary)[i/2] = RARRAY_PTR(ary)[i];
+ for (i=0; i<RARRAY_LEN(ary); i++) {
+ RARRAY_PTR(ary)[i] = RNODE(RARRAY_PTR(ary)[i])->u2.value;
}
- rb_ary_resize(ary, RARRAY_LEN(ary)/2);
RBASIC(ary)->klass = rb_cArray;
- OBJ_INFECT(ary, memo);
+ OBJ_INFECT(ary, obj);
return ary;
}
@@ -953,27 +896,27 @@ enum_sort_by(VALUE obj)
#define ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
#define DEFINE_ENUMFUNCS(name) \
-static VALUE enum_##name##_func(VALUE result, NODE *memo); \
+static VALUE enum_##name##_func(VALUE result, VALUE *memo); \
\
static VALUE \
-name##_i(VALUE i, VALUE memo, int argc, VALUE *argv) \
+name##_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
{ \
- return enum_##name##_func(rb_enum_values_pack(argc, argv), RNODE(memo)); \
+ return enum_##name##_func(enum_values_pack(argc, argv), memo); \
} \
\
static VALUE \
-name##_iter_i(VALUE i, VALUE memo, int argc, VALUE *argv) \
+name##_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
{ \
- return enum_##name##_func(enum_yield(argc, argv), RNODE(memo)); \
+ return enum_##name##_func(enum_yield(argc, argv), memo); \
} \
\
static VALUE \
-enum_##name##_func(VALUE result, NODE *memo)
+enum_##name##_func(VALUE result, VALUE *memo)
DEFINE_ENUMFUNCS(all)
{
if (!RTEST(result)) {
- memo->u1.value = Qfalse;
+ *memo = Qfalse;
rb_iter_break();
}
return Qnil;
@@ -981,33 +924,34 @@ DEFINE_ENUMFUNCS(all)
/*
* call-seq:
- * enum.all? [{ |obj| block } ] -> true or false
+ * enum.all? [{|obj| block } ] -> true or false
*
* Passes each element of the collection to the given block. The method
* returns <code>true</code> if the block never returns
* <code>false</code> or <code>nil</code>. If the block is not given,
- * Ruby adds an implicit block of <code>{ |obj| obj }</code> which will
- * cause #all? to return +true+ when none of the collection members are
- * +false+ or +nil+.
+ * Ruby adds an implicit block of <code>{|obj| obj}</code> (that is
+ * <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)
{
- NODE *memo = NEW_MEMO(Qtrue, 0, 0);
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)memo);
- return memo->u1.value;
+ VALUE result = Qtrue;
+
+ rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)&result);
+ return result;
}
DEFINE_ENUMFUNCS(any)
{
if (RTEST(result)) {
- memo->u1.value = Qtrue;
+ *memo = Qtrue;
rb_iter_break();
}
return Qnil;
@@ -1015,37 +959,39 @@ DEFINE_ENUMFUNCS(any)
/*
* call-seq:
- * enum.any? [{ |obj| block }] -> true or false
+ * enum.any? [{|obj| block } ] -> true or false
*
* Passes each element of the collection to the given block. The method
* returns <code>true</code> if the block ever returns a value other
* than <code>false</code> or <code>nil</code>. If the block is not
- * given, Ruby adds an implicit block of <code>{ |obj| obj }</code> that
- * will cause #any? to return +true+ if at least one of the collection
- * members is not +false+ or +nil+.
+ * given, Ruby adds an implicit block of <code>{|obj| obj}</code> (that
+ * is <code>any?</code> will return <code>true</code> if at least one
+ * 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)
{
- NODE *memo = NEW_MEMO(Qfalse, 0, 0);
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
- return memo->u1.value;
+ VALUE result = Qfalse;
+
+ rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)&result);
+ return result;
}
DEFINE_ENUMFUNCS(one)
{
if (RTEST(result)) {
- if (memo->u1.value == Qundef) {
- memo->u1.value = Qtrue;
+ if (*memo == Qundef) {
+ *memo = Qtrue;
}
- else if (memo->u1.value == Qtrue) {
- memo->u1.value = Qfalse;
+ else if (*memo == Qtrue) {
+ *memo = Qfalse;
rb_iter_break();
}
}
@@ -1054,7 +1000,7 @@ DEFINE_ENUMFUNCS(one)
/*
* call-seq:
- * enum.one? [{ |obj| block }] -> true or false
+ * enum.one? [{|obj| block }] -> true or false
*
* Passes each element of the collection to the given block. The method
* returns <code>true</code> if the block returns <code>true</code>
@@ -1062,22 +1008,20 @@ DEFINE_ENUMFUNCS(one)
* <code>true</code> only if exactly one of the collection members is
* true.
*
- * %w{ant bear cat}.one? { |word| word.length == 4 } #=> true
- * %w{ant bear cat}.one? { |word| word.length > 4 } #=> false
- * %w{ant bear cat}.one? { |word| word.length < 4 } #=> false
- * [ nil, true, 99 ].one? #=> false
- * [ nil, true, false ].one? #=> true
+ * %w{ant bear cat}.one? {|word| word.length == 4} #=> true
+ * %w{ant bear cat}.one? {|word| word.length > 4} #=> false
+ * %w{ant bear cat}.one? {|word| word.length < 4} #=> false
+ * [ nil, true, 99 ].one? #=> false
+ * [ nil, true, false ].one? #=> true
*
*/
static VALUE
enum_one(VALUE obj)
{
- NODE *memo = NEW_MEMO(Qundef, 0, 0);
- VALUE result;
+ VALUE result = Qundef;
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)memo);
- result = memo->u1.value;
+ rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)&result);
if (result == Qundef) return Qfalse;
return result;
}
@@ -1085,7 +1029,7 @@ enum_one(VALUE obj)
DEFINE_ENUMFUNCS(none)
{
if (RTEST(result)) {
- memo->u1.value = Qfalse;
+ *memo = Qfalse;
rb_iter_break();
}
return Qnil;
@@ -1093,62 +1037,61 @@ DEFINE_ENUMFUNCS(none)
/*
* call-seq:
- * enum.none? [{ |obj| block }] -> true or false
+ * enum.none? [{|obj| block }] -> true or false
*
* Passes each element of the collection to the given block. The method
* returns <code>true</code> if the block never returns <code>true</code>
* for all elements. If the block is not given, <code>none?</code> will return
* <code>true</code> only if none of the collection members is true.
*
- * %w{ant bear cat}.none? { |word| word.length == 5 } #=> true
- * %w{ant bear cat}.none? { |word| word.length >= 4 } #=> false
- * [].none? #=> true
- * [nil].none? #=> true
- * [nil, false].none? #=> true
+ * %w{ant bear cat}.none? {|word| word.length == 5} #=> true
+ * %w{ant bear cat}.none? {|word| word.length >= 4} #=> false
+ * [].none? #=> true
+ * [nil].none? #=> true
+ * [nil,false].none? #=> true
*/
static VALUE
enum_none(VALUE obj)
{
- NODE *memo = NEW_MEMO(Qtrue, 0, 0);
- rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)memo);
- return memo->u1.value;
+ VALUE result = Qtrue;
+
+ rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)&result);
+ return result;
}
static VALUE
-min_i(VALUE i, VALUE args, int argc, VALUE *argv)
+min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
VALUE cmp;
- NODE *memo = RNODE(args);
ENUM_WANT_SVALUE();
- if (memo->u1.value == Qundef) {
- memo->u1.value = i;
+ if (*memo == Qundef) {
+ *memo = i;
}
else {
- cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
- if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
- memo->u1.value = i;
+ cmp = rb_funcall(i, id_cmp, 1, *memo);
+ if (rb_cmpint(cmp, i, *memo) < 0) {
+ *memo = i;
}
}
return Qnil;
}
static VALUE
-min_ii(VALUE i, VALUE args, int argc, VALUE *argv)
+min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
VALUE cmp;
- NODE *memo = RNODE(args);
ENUM_WANT_SVALUE();
- if (memo->u1.value == Qundef) {
- memo->u1.value = i;
+ if (*memo == Qundef) {
+ *memo = i;
}
else {
- cmp = rb_yield_values(2, i, memo->u1.value);
- if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
- memo->u1.value = i;
+ cmp = rb_yield_values(2, i, *memo);
+ if (rb_cmpint(cmp, i, *memo) < 0) {
+ *memo = i;
}
}
return Qnil;
@@ -1157,70 +1100,66 @@ min_ii(VALUE i, VALUE args, int argc, VALUE *argv)
/*
* call-seq:
- * enum.min -> obj
- * enum.min { |a, b| block } -> obj
+ * enum.min -> obj
+ * enum.min {| a,b | block } -> obj
*
* Returns the object in <i>enum</i> with the minimum 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.min #=> "albatross"
- * a.min { |a, b| a.length <=> b.length } #=> "dog"
+ * a.min #=> "albatross"
+ * a.min {|a,b| a.length <=> b.length } #=> "dog"
*/
static VALUE
enum_min(VALUE obj)
{
- NODE *memo = NEW_MEMO(Qundef, 0, 0);
- VALUE result;
+ VALUE result = Qundef;
if (rb_block_given_p()) {
- rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)memo);
+ rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)&result);
}
else {
- rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)memo);
+ rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)&result);
}
- result = memo->u1.value;
if (result == Qundef) return Qnil;
return result;
}
static VALUE
-max_i(VALUE i, VALUE args, int argc, VALUE *argv)
+max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
VALUE cmp;
ENUM_WANT_SVALUE();
- if (memo->u1.value == Qundef) {
- memo->u1.value = i;
+ if (*memo == Qundef) {
+ *memo = i;
}
else {
- cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
- if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
- memo->u1.value = i;
+ cmp = rb_funcall(i, id_cmp, 1, *memo);
+ if (rb_cmpint(cmp, i, *memo) > 0) {
+ *memo = i;
}
}
return Qnil;
}
static VALUE
-max_ii(VALUE i, VALUE args, int argc, VALUE *argv)
+max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
VALUE cmp;
ENUM_WANT_SVALUE();
- if (memo->u1.value == Qundef) {
- memo->u1.value = i;
+ if (*memo == Qundef) {
+ *memo = i;
}
else {
- cmp = rb_yield_values(2, i, memo->u1.value);
- if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
- memo->u1.value = i;
+ cmp = rb_yield_values(2, i, *memo);
+ if (rb_cmpint(cmp, i, *memo) > 0) {
+ *memo = i;
}
}
return Qnil;
@@ -1228,31 +1167,29 @@ max_ii(VALUE i, VALUE args, int argc, VALUE *argv)
/*
* call-seq:
- * enum.max -> obj
- * enum.max { |a, b| block } -> obj
+ * enum.max -> obj
+ * enum.max {|a,b| block } -> obj
*
* Returns the object in _enum_ 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"
+ * a.max #=> "horse"
+ * a.max {|a,b| a.length <=> b.length } #=> "albatross"
*/
static VALUE
enum_max(VALUE obj)
{
- NODE *memo = NEW_MEMO(Qundef, 0, 0);
- VALUE result;
+ VALUE result = Qundef;
if (rb_block_given_p()) {
- rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo);
+ rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)&result);
}
else {
- rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)memo);
+ rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)&result);
}
- result = memo->u1.value;
if (result == Qundef) return Qnil;
return result;
}
@@ -1263,8 +1200,6 @@ struct minmax_t {
VALUE last;
};
-STATIC_ASSERT(minmax_t, sizeof(struct minmax_t) <= sizeof(NODE) - offsetof(NODE, u1));
-
static void
minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
{
@@ -1289,7 +1224,7 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
static VALUE
minmax_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
{
- struct minmax_t *memo = (struct minmax_t *)&RNODE(_memo)->u1.value;
+ struct minmax_t *memo = (struct minmax_t *)_memo;
int n;
VALUE j;
@@ -1341,7 +1276,7 @@ minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
static VALUE
minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
{
- struct minmax_t *memo = (struct minmax_t *)&RNODE(_memo)->u1.value;
+ struct minmax_t *memo = (struct minmax_t *)_memo;
int n;
VALUE j;
@@ -1371,8 +1306,8 @@ minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
/*
* call-seq:
- * enum.minmax -> [min, max]
- * enum.minmax { |a, b| block } -> [min, max]
+ * enum.minmax -> [min,max]
+ * enum.minmax {|a,b| block } -> [min,max]
*
* Returns two elements array which contains the minimum and the
* maximum value in the enumerable. The first form assumes all
@@ -1381,59 +1316,57 @@ minmax_ii(VALUE i, VALUE _memo, int argc, VALUE *argv)
*
* a = %w(albatross dog horse)
* a.minmax #=> ["albatross", "horse"]
- * a.minmax { |a, b| a.length <=> b.length } #=> ["dog", "albatross"]
+ * a.minmax {|a,b| a.length <=> b.length } #=> ["dog", "albatross"]
*/
static VALUE
enum_minmax(VALUE obj)
{
- NODE *memo = NEW_MEMO(Qundef, Qundef, Qundef);
- struct minmax_t *m = (struct minmax_t *)&memo->u1.value;
+ struct minmax_t memo;
VALUE ary = rb_ary_new3(2, Qnil, Qnil);
- m->min = Qundef;
- m->last = Qundef;
+ memo.min = Qundef;
+ memo.last = Qundef;
if (rb_block_given_p()) {
- rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)memo);
- if (m->last != Qundef)
- minmax_ii_update(m->last, m->last, m);
+ rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)&memo);
+ if (memo.last != Qundef)
+ minmax_ii_update(memo.last, memo.last, &memo);
}
else {
- rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)memo);
- if (m->last != Qundef)
- minmax_i_update(m->last, m->last, m);
+ rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)&memo);
+ if (memo.last != Qundef)
+ minmax_i_update(memo.last, memo.last, &memo);
}
- if (m->min != Qundef) {
- rb_ary_store(ary, 0, m->min);
- rb_ary_store(ary, 1, m->max);
+ if (memo.min != Qundef) {
+ rb_ary_store(ary, 0, memo.min);
+ rb_ary_store(ary, 1, memo.max);
}
return ary;
}
static VALUE
-min_by_i(VALUE i, VALUE args, int argc, VALUE *argv)
+min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
VALUE v;
ENUM_WANT_SVALUE();
v = rb_yield(i);
- if (memo->u1.value == Qundef) {
- memo->u1.value = v;
- memo->u2.value = i;
+ if (memo[0] == Qundef) {
+ memo[0] = v;
+ memo[1] = i;
}
- else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->u1.value), v, memo->u1.value) < 0) {
- memo->u1.value = v;
- memo->u2.value = i;
+ else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) < 0) {
+ memo[0] = v;
+ memo[1] = i;
}
return Qnil;
}
/*
* call-seq:
- * enum.min_by { |obj| block } -> obj
- * enum.min_by -> an_enumerator
+ * enum.min_by {|obj| block } -> obj
+ * enum.min_by -> an_enumerator
*
* Returns the object in <i>enum</i> that gives the minimum
* value from the given block.
@@ -1441,45 +1374,45 @@ min_by_i(VALUE i, VALUE args, int argc, VALUE *argv)
* If no block is given, an enumerator is returned instead.
*
* a = %w(albatross dog horse)
- * a.min_by { |x| x.length } #=> "dog"
+ * a.min_by {|x| x.length } #=> "dog"
*/
static VALUE
enum_min_by(VALUE obj)
{
- NODE *memo;
+ VALUE memo[2];
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
- memo = NEW_MEMO(Qundef, Qnil, 0);
+ memo[0] = Qundef;
+ memo[1] = Qnil;
rb_block_call(obj, id_each, 0, 0, min_by_i, (VALUE)memo);
- return memo->u2.value;
+ return memo[1];
}
static VALUE
-max_by_i(VALUE i, VALUE args, int argc, VALUE *argv)
+max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
VALUE v;
ENUM_WANT_SVALUE();
v = rb_yield(i);
- if (memo->u1.value == Qundef) {
- memo->u1.value = v;
- memo->u2.value = i;
+ if (memo[0] == Qundef) {
+ memo[0] = v;
+ memo[1] = i;
}
- else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->u1.value), v, memo->u1.value) > 0) {
- memo->u1.value = v;
- memo->u2.value = i;
+ else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo[0]), v, memo[0]) > 0) {
+ memo[0] = v;
+ memo[1] = i;
}
return Qnil;
}
/*
* call-seq:
- * enum.max_by { |obj| block } -> obj
- * enum.max_by -> an_enumerator
+ * enum.max_by {|obj| block } -> obj
+ * enum.max_by -> an_enumerator
*
* Returns the object in <i>enum</i> that gives the maximum
* value from the given block.
@@ -1487,19 +1420,20 @@ max_by_i(VALUE i, VALUE args, int argc, VALUE *argv)
* If no block is given, an enumerator is returned instead.
*
* a = %w(albatross dog horse)
- * a.max_by { |x| x.length } #=> "albatross"
+ * a.max_by {|x| x.length } #=> "albatross"
*/
static VALUE
enum_max_by(VALUE obj)
{
- NODE *memo;
+ VALUE memo[2];
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
- memo = NEW_MEMO(Qundef, Qnil, 0);
+ memo[0] = Qundef;
+ memo[1] = Qnil;
rb_block_call(obj, id_each, 0, 0, max_by_i, (VALUE)memo);
- return memo->u2.value;
+ return memo[1];
}
struct minmax_by_t {
@@ -1535,7 +1469,7 @@ minmax_by_i_update(VALUE v1, VALUE v2, VALUE i1, VALUE i2, struct minmax_by_t *m
static VALUE
minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
{
- struct minmax_by_t *memo = MEMO_FOR(struct minmax_by_t, _memo);
+ struct minmax_by_t *memo = (struct minmax_by_t *)_memo;
VALUE vi, vj, j;
int n;
@@ -1574,47 +1508,43 @@ minmax_by_i(VALUE i, VALUE _memo, int argc, VALUE *argv)
/*
* call-seq:
- * enum.minmax_by { |obj| block } -> [min, max]
- * enum.minmax_by -> an_enumerator
+ * enum.minmax_by {|obj| block } -> [min, max]
+ * enum.minmax_by -> an_enumerator
*
- * Returns a two element array containing the objects in
- * <i>enum</i> that correspond to the minimum and maximum values respectively
+ * Returns two elements array array containing the objects in
+ * <i>enum</i> that gives the minimum and maximum values respectively
* from the given block.
*
* If no block is given, an enumerator is returned instead.
*
* a = %w(albatross dog horse)
- * a.minmax_by { |x| x.length } #=> ["dog", "albatross"]
+ * a.minmax_by {|x| x.length } #=> ["dog", "albatross"]
*/
static VALUE
enum_minmax_by(VALUE obj)
{
- VALUE memo;
- struct minmax_by_t *m = NEW_MEMO_FOR(struct minmax_by_t, memo);
+ struct minmax_by_t memo;
- RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
+ RETURN_ENUMERATOR(obj, 0, 0);
- m->min_bv = Qundef;
- m->max_bv = Qundef;
- m->min = Qnil;
- m->max = Qnil;
- m->last_bv = Qundef;
- m->last = Qundef;
- rb_block_call(obj, id_each, 0, 0, minmax_by_i, memo);
- if (m->last_bv != Qundef)
- minmax_by_i_update(m->last_bv, m->last_bv, m->last, m->last, m);
- m = MEMO_FOR(struct minmax_by_t, memo);
- return rb_assoc_new(m->min, m->max);
+ memo.min_bv = Qundef;
+ memo.max_bv = Qundef;
+ memo.min = Qnil;
+ memo.max = Qnil;
+ memo.last_bv = Qundef;
+ memo.last = Qundef;
+ rb_block_call(obj, id_each, 0, 0, minmax_by_i, (VALUE)&memo);
+ if (memo.last_bv != Qundef)
+ minmax_by_i_update(memo.last_bv, memo.last_bv, memo.last, memo.last, &memo);
+ return rb_assoc_new(memo.min, memo.max);
}
static VALUE
-member_i(VALUE iter, VALUE args, int argc, VALUE *argv)
+member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
-
- if (rb_equal(rb_enum_values_pack(argc, argv), memo->u1.value)) {
- memo->u2.value = Qtrue;
+ if (rb_equal(enum_values_pack(argc, argv), memo[0])) {
+ memo[1] = Qtrue;
rb_iter_break();
}
return Qnil;
@@ -1636,24 +1566,26 @@ member_i(VALUE iter, VALUE args, int argc, VALUE *argv)
static VALUE
enum_member(VALUE obj, VALUE val)
{
- NODE *memo = NEW_MEMO(val, Qfalse, 0);
+ VALUE memo[2];
+ memo[0] = val;
+ memo[1] = Qfalse;
rb_block_call(obj, id_each, 0, 0, member_i, (VALUE)memo);
- return memo->u2.value;
+ return memo[1];
}
static VALUE
each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
{
- long n = RNODE(memo)->u3.cnt++;
+ long n = (*(VALUE *)memo)++;
- return rb_yield_values(2, rb_enum_values_pack(argc, argv), INT2NUM(n));
+ return rb_yield_values(2, enum_values_pack(argc, argv), INT2NUM(n));
}
/*
* call-seq:
- * enum.each_with_index(*args) { |obj, i| block } -> enum
- * enum.each_with_index(*args) -> an_enumerator
+ * enum.each_with_index(*args) {|obj, i| block } -> enum
+ * enum.each_with_index(*args) -> an_enumerator
*
* Calls <em>block</em> with two arguments, the item and its index,
* for each item in <i>enum</i>. Given arguments are passed through
@@ -1662,7 +1594,7 @@ each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
* If no block is given, an enumerator is returned instead.
*
* hash = Hash.new
- * %w(cat dog wombat).each_with_index { |item, index|
+ * %w(cat dog wombat).each_with_index {|item, index|
* hash[item] = index
* }
* hash #=> {"cat"=>0, "dog"=>1, "wombat"=>2}
@@ -1672,32 +1604,25 @@ each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
static VALUE
enum_each_with_index(int argc, VALUE *argv, VALUE obj)
{
- NODE *memo;
+ long memo;
- RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
+ RETURN_ENUMERATOR(obj, argc, argv);
- memo = NEW_MEMO(0, 0, 0);
- rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)memo);
+ memo = 0;
+ rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)&memo);
return obj;
}
/*
* call-seq:
- * enum.reverse_each(*args) { |item| block } -> enum
- * enum.reverse_each(*args) -> an_enumerator
+ * enum.reverse_each(*args) {|item| block } -> enum
+ * enum.reverse_each(*args) -> an_enumerator
*
* Builds a temporary array and traverses that array in reverse order.
*
* If no block is given, an enumerator is returned instead.
*
- * (1..3).reverse_each { |v| p v }
- *
- * produces:
- *
- * 3
- * 2
- * 1
*/
static VALUE
@@ -1706,7 +1631,7 @@ enum_reverse_each(int argc, VALUE *argv, VALUE obj)
VALUE ary;
long i;
- RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
+ RETURN_ENUMERATOR(obj, argc, argv);
ary = enum_to_a(argc, argv, obj);
@@ -1728,8 +1653,8 @@ each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
/*
* call-seq:
- * enum.each_entry { |obj| block } -> enum
- * enum.each_entry -> an_enumerator
+ * enum.each_entry {|obj| block} -> enum
+ * enum.each_entry -> an_enumerator
*
* Calls <i>block</i> once for each element in +self+, passing that
* element as a parameter, converting multiple values from yield to an
@@ -1741,70 +1666,52 @@ each_val_i(VALUE i, VALUE p, int argc, VALUE *argv)
* include Enumerable
* def each
* yield 1
- * yield 1, 2
- * yield
+ * yield 1,2
* end
* end
- * Foo.new.each_entry{ |o| p o }
+ * Foo.new.each_entry{|o| print o, " -- "}
*
* produces:
*
- * 1
- * [1, 2]
- * nil
- *
+ * 1 -- [1, 2] --
*/
static VALUE
enum_each_entry(int argc, VALUE *argv, VALUE obj)
{
- RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
+ RETURN_ENUMERATOR(obj, argc, argv);
rb_block_call(obj, id_each, argc, argv, each_val_i, 0);
return obj;
}
static VALUE
-each_slice_i(VALUE i, VALUE m, int argc, VALUE *argv)
+each_slice_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(m);
- VALUE ary = memo->u1.value;
+ VALUE ary = memo[0];
VALUE v = Qnil;
- long size = memo->u3.cnt;
+ long size = (long)memo[1];
ENUM_WANT_SVALUE();
rb_ary_push(ary, i);
if (RARRAY_LEN(ary) == size) {
v = rb_yield(ary);
- memo->u1.value = rb_ary_new2(size);
+ memo[0] = rb_ary_new2(size);
}
return v;
}
-static VALUE
-enum_each_slice_size(VALUE obj, VALUE args)
-{
- VALUE n, size;
- long slice_size = NUM2LONG(RARRAY_PTR(args)[0]);
- if (slice_size <= 0) rb_raise(rb_eArgError, "invalid slice size");
-
- size = enum_size(obj, 0);
- if (size == Qnil) return Qnil;
-
- n = rb_funcall(size, '+', 1, LONG2NUM(slice_size-1));
- return rb_funcall(n, id_div, 1, LONG2FIX(slice_size));
-}
-
/*
* call-seq:
- * enum.each_slice(n) { ... } -> nil
- * enum.each_slice(n) -> an_enumerator
+ * enum.each_slice(n) {...} -> nil
+ * enum.each_slice(n) -> an_enumerator
*
* Iterates the given block for each slice of <n> elements. If no
* block is given, returns an enumerator.
*
- * (1..10).each_slice(3) { |a| p a }
+ * e.g.:
+ * (1..10).each_slice(3) {|a| p a}
* # outputs below
* [1, 2, 3]
* [4, 5, 6]
@@ -1816,27 +1723,27 @@ static VALUE
enum_each_slice(VALUE obj, VALUE n)
{
long size = NUM2LONG(n);
- VALUE ary;
- NODE *memo;
+ VALUE args[2], ary;
if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
- RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_slice_size);
- ary = rb_ary_new2(size);
- memo = NEW_MEMO(ary, 0, size);
- rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)memo);
- ary = memo->u1.value;
+ RETURN_ENUMERATOR(obj, 1, &n);
+ args[0] = rb_ary_new2(size);
+ args[1] = (VALUE)size;
+
+ rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)args);
+
+ ary = args[0];
if (RARRAY_LEN(ary) > 0) rb_yield(ary);
return Qnil;
}
static VALUE
-each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv)
+each_cons_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
- VALUE ary = memo->u1.value;
+ VALUE ary = memo[0];
VALUE v = Qnil;
- long size = memo->u3.cnt;
+ long size = (long)memo[1];
ENUM_WANT_SVALUE();
if (RARRAY_LEN(ary) == size) {
@@ -1849,30 +1756,16 @@ each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv)
return v;
}
-static VALUE
-enum_each_cons_size(VALUE obj, VALUE args)
-{
- VALUE n, size;
- long cons_size = NUM2LONG(RARRAY_PTR(args)[0]);
- if (cons_size <= 0) rb_raise(rb_eArgError, "invalid size");
-
- size = enum_size(obj, 0);
- if (size == Qnil) return Qnil;
-
- n = rb_funcall(size, '+', 1, LONG2NUM(1 - cons_size));
- return (rb_cmpint(rb_funcall(n, id_cmp, 1, LONG2FIX(0)), n, LONG2FIX(0)) == -1) ? LONG2FIX(0) : n;
-}
-
/*
* call-seq:
- * enum.each_cons(n) { ... } -> nil
+ * enum.each_cons(n) {...} -> nil
* enum.each_cons(n) -> an_enumerator
*
* Iterates the given block for each array of consecutive <n>
* elements. If no block is given, returns an enumerator.
*
* e.g.:
- * (1..10).each_cons(3) { |a| p a }
+ * (1..10).each_cons(3) {|a| p a}
* # outputs below
* [1, 2, 3]
* [2, 3, 4]
@@ -1888,12 +1781,14 @@ static VALUE
enum_each_cons(VALUE obj, VALUE n)
{
long size = NUM2LONG(n);
- NODE *memo;
+ VALUE args[2];
if (size <= 0) rb_raise(rb_eArgError, "invalid size");
- RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_cons_size);
- memo = NEW_MEMO(rb_ary_new2(size), 0, size);
- rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo);
+ RETURN_ENUMERATOR(obj, 1, &n);
+ args[0] = rb_ary_new2(size);
+ args[1] = (VALUE)size;
+
+ rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)args);
return Qnil;
}
@@ -1907,22 +1802,23 @@ each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv)
/*
* call-seq:
- * enum.each_with_object(obj) { |(*args), memo_obj| ... } -> obj
- * enum.each_with_object(obj) -> an_enumerator
+ * enum.each_with_object(obj) {|(*args), memo_obj| ... } -> obj
+ * enum.each_with_object(obj) -> an_enumerator
*
* 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.
*
- * evens = (1..10).each_with_object([]) { |i, a| a << i*2 }
+ * 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_SIZED_ENUMERATOR(obj, 1, &memo, enum_size);
+ RETURN_ENUMERATOR(obj, 1, &memo);
rb_block_call(obj, id_each, 0, 0, each_with_object_i, memo);
@@ -1939,7 +1835,7 @@ zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv)
int i;
tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
- rb_ary_store(tmp, 0, rb_enum_values_pack(argc, argv));
+ rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
for (i=0; i<RARRAY_LEN(args); i++) {
VALUE e = RARRAY_PTR(args)[i];
@@ -1980,7 +1876,7 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
int i;
tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
- rb_ary_store(tmp, 0, rb_enum_values_pack(argc, argv));
+ 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);
@@ -1989,7 +1885,7 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
VALUE v[2];
v[1] = RARRAY_PTR(args)[i];
- rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, (VALUE)0);
+ 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;
@@ -2008,8 +1904,8 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
/*
* call-seq:
- * enum.zip(arg, ...) -> an_array_of_array
- * enum.zip(arg, ...) { |arr| block } -> nil
+ * enum.zip(arg, ...) -> an_array_of_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
@@ -2023,9 +1919,9 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
* 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,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]]
*
*/
@@ -2051,10 +1947,6 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
if (!allary) {
CONST_ID(conv, "to_enum");
for (i=0; i<argc; i++) {
- if (!rb_respond_to(argv[i], id_each)) {
- rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
- rb_obj_classname(argv[i]));
- }
argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
}
}
@@ -2069,11 +1961,10 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
}
static VALUE
-take_i(VALUE i, VALUE args, int argc, VALUE *argv)
+take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
- rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv));
- if (--memo->u3.cnt == 0) rb_iter_break();
+ rb_ary_push(arg[0], enum_values_pack(argc, argv));
+ if (--arg[1] == 0) rb_iter_break();
return Qnil;
}
@@ -2091,8 +1982,7 @@ take_i(VALUE i, VALUE args, int argc, VALUE *argv)
static VALUE
enum_take(VALUE obj, VALUE n)
{
- NODE *memo;
- VALUE result;
+ VALUE args[2];
long len = NUM2LONG(n);
if (len < 0) {
@@ -2100,25 +1990,25 @@ enum_take(VALUE obj, VALUE n)
}
if (len == 0) return rb_ary_new2(0);
- result = rb_ary_new2(len);
- memo = NEW_MEMO(result, 0, len);
- rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)memo);
- return result;
+ args[0] = rb_ary_new();
+ args[1] = len;
+ 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(VALUE i, VALUE *ary, int argc, VALUE *argv)
{
if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
- rb_ary_push(ary, rb_enum_values_pack(argc, argv));
+ rb_ary_push(*ary, enum_values_pack(argc, argv));
return Qnil;
}
/*
* call-seq:
- * enum.take_while { |arr| block } -> array
- * enum.take_while -> an_enumerator
+ * enum.take_while {|arr| block } -> array
+ * enum.take_while -> an_enumerator
*
* Passes elements to the block until the block returns +nil+ or +false+,
* then stops iterating and returns an array of all prior elements.
@@ -2126,7 +2016,7 @@ take_while_i(VALUE i, VALUE ary, int argc, VALUE *argv)
* If no block is given, an enumerator is returned instead.
*
* a = [1, 2, 3, 4, 5, 0]
- * a.take_while { |i| i < 3 } #=> [1, 2]
+ * a.take_while {|i| i < 3 } #=> [1, 2]
*
*/
@@ -2137,19 +2027,18 @@ enum_take_while(VALUE obj)
RETURN_ENUMERATOR(obj, 0, 0);
ary = rb_ary_new();
- rb_block_call(obj, id_each, 0, 0, take_while_i, ary);
+ rb_block_call(obj, id_each, 0, 0, take_while_i, (VALUE)&ary);
return ary;
}
static VALUE
-drop_i(VALUE i, VALUE args, int argc, VALUE *argv)
+drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
- if (memo->u3.cnt == 0) {
- rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv));
+ if (arg[1] == 0) {
+ rb_ary_push(arg[0], enum_values_pack(argc, argv));
}
else {
- memo->u3.cnt--;
+ arg[1]--;
}
return Qnil;
}
@@ -2169,39 +2058,37 @@ drop_i(VALUE i, VALUE args, int argc, VALUE *argv)
static VALUE
enum_drop(VALUE obj, VALUE n)
{
- VALUE result;
- NODE *memo;
+ VALUE args[2];
long len = NUM2LONG(n);
if (len < 0) {
rb_raise(rb_eArgError, "attempt to drop negative size");
}
- result = rb_ary_new();
- memo = NEW_MEMO(result, 0, len);
- rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)memo);
- return result;
+ args[1] = len;
+ args[0] = rb_ary_new();
+ rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)args);
+ return args[0];
}
static VALUE
-drop_while_i(VALUE i, VALUE args, int argc, VALUE *argv)
+drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
{
- NODE *memo = RNODE(args);
ENUM_WANT_SVALUE();
- if (!memo->u3.state && !RTEST(rb_yield(i))) {
- memo->u3.state = TRUE;
+ if (!args[1] && !RTEST(rb_yield(i))) {
+ args[1] = Qtrue;
}
- if (memo->u3.state) {
- rb_ary_push(memo->u1.value, i);
+ if (args[1]) {
+ rb_ary_push(args[0], i);
}
return Qnil;
}
/*
* call-seq:
- * enum.drop_while { |arr| block } -> array
+ * enum.drop_while {|arr| block } -> array
* enum.drop_while -> an_enumerator
*
* Drops elements up to, but not including, the first element for
@@ -2211,21 +2098,20 @@ drop_while_i(VALUE i, VALUE args, int argc, VALUE *argv)
* If no block is given, an enumerator is returned instead.
*
* a = [1, 2, 3, 4, 5, 0]
- * a.drop_while { |i| i < 3 } #=> [3, 4, 5, 0]
+ * a.drop_while {|i| i < 3 } #=> [3, 4, 5, 0]
*
*/
static VALUE
enum_drop_while(VALUE obj)
{
- VALUE result;
- NODE *memo;
+ VALUE args[2];
RETURN_ENUMERATOR(obj, 0, 0);
- result = rb_ary_new();
- memo = NEW_MEMO(result, 0, FALSE);
- rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)memo);
- return result;
+ args[0] = rb_ary_new();
+ args[1] = Qfalse;
+ rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)args);
+ return args[0];
}
static VALUE
@@ -2238,27 +2124,9 @@ cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
return Qnil;
}
-static VALUE
-enum_cycle_size(VALUE self, VALUE args)
-{
- long mul;
- VALUE n = Qnil;
- VALUE size = enum_size(self, args);
-
- if (size == Qnil) return Qnil;
-
- if (args && (RARRAY_LEN(args) > 0)) {
- n = RARRAY_PTR(args)[0];
- }
- if (n == Qnil) return DBL2NUM(INFINITY);
- mul = NUM2LONG(n);
- if (mul <= 0) return INT2FIX(0);
- return rb_funcall(size, '*', 1, LONG2FIX(mul));
-}
-
/*
* call-seq:
- * enum.cycle(n=nil) { |obj| block } -> nil
+ * enum.cycle(n=nil) {|obj| block } -> nil
* enum.cycle(n=nil) -> an_enumerator
*
* Calls <i>block</i> for each element of <i>enum</i> repeatedly _n_
@@ -2272,8 +2140,8 @@ enum_cycle_size(VALUE self, VALUE args)
* If no block is given, an enumerator is returned instead.
*
* 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.
+ * 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.
*
*/
@@ -2286,7 +2154,7 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
rb_scan_args(argc, argv, "01", &nv);
- RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_cycle_size);
+ RETURN_ENUMERATOR(obj, argc, argv);
if (NIL_P(nv)) {
n = -1;
}
@@ -2318,7 +2186,7 @@ struct chunk_arg {
static VALUE
chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
{
- struct chunk_arg *argp = MEMO_FOR(struct chunk_arg, _argp);
+ struct chunk_arg *argp = (struct chunk_arg *)_argp;
VALUE v;
VALUE alone = ID2SYM(rb_intern("_alone"));
VALUE separator = ID2SYM(rb_intern("_separator"));
@@ -2326,20 +2194,20 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
ENUM_WANT_SVALUE();
if (NIL_P(argp->state))
- v = rb_funcall(argp->categorize, id_call, 1, i);
+ v = rb_funcall(argp->categorize, rb_intern("call"), 1, i);
else
- v = rb_funcall(argp->categorize, id_call, 2, i, argp->state);
+ v = rb_funcall(argp->categorize, rb_intern("call"), 2, i, argp->state);
if (v == alone) {
if (!NIL_P(argp->prev_value)) {
- rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+ rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
argp->prev_value = argp->prev_elts = Qnil;
}
- rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(v, rb_ary_new3(1, i)));
+ rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(v, rb_ary_new3(1, i)));
}
else if (NIL_P(v) || v == separator) {
if (!NIL_P(argp->prev_value)) {
- rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+ rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
argp->prev_value = argp->prev_elts = Qnil;
}
}
@@ -2356,7 +2224,7 @@ chunk_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
rb_ary_push(argp->prev_elts, i);
}
else {
- rb_funcall(argp->yielder, id_lshift, 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
+ rb_funcall(argp->yielder, rb_intern("<<"), 1, rb_assoc_new(argp->prev_value, argp->prev_elts));
argp->prev_value = v;
argp->prev_elts = rb_ary_new3(1, i);
}
@@ -2369,42 +2237,44 @@ static VALUE
chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
{
VALUE enumerable;
- VALUE arg;
- struct chunk_arg *memo = NEW_MEMO_FOR(struct chunk_arg, arg);
+ struct chunk_arg arg;
enumerable = rb_ivar_get(enumerator, rb_intern("chunk_enumerable"));
- memo->categorize = rb_ivar_get(enumerator, rb_intern("chunk_categorize"));
- memo->state = rb_ivar_get(enumerator, rb_intern("chunk_initial_state"));
- memo->prev_value = Qnil;
- memo->prev_elts = Qnil;
- memo->yielder = yielder;
-
- if (!NIL_P(memo->state))
- memo->state = rb_obj_dup(memo->state);
-
- rb_block_call(enumerable, id_each, 0, 0, chunk_ii, arg);
- memo = MEMO_FOR(struct chunk_arg, arg);
- if (!NIL_P(memo->prev_elts))
- rb_funcall(memo->yielder, id_lshift, 1, rb_assoc_new(memo->prev_value, memo->prev_elts));
+ arg.categorize = rb_ivar_get(enumerator, rb_intern("chunk_categorize"));
+ arg.state = rb_ivar_get(enumerator, rb_intern("chunk_initial_state"));
+ arg.prev_value = Qnil;
+ arg.prev_elts = Qnil;
+ arg.yielder = yielder;
+
+ if (!NIL_P(arg.state))
+ arg.state = rb_obj_dup(arg.state);
+
+ rb_block_call(enumerable, id_each, 0, 0, chunk_ii, (VALUE)&arg);
+ if (!NIL_P(arg.prev_elts))
+ rb_funcall(arg.yielder, rb_intern("<<"), 1, rb_assoc_new(arg.prev_value, arg.prev_elts));
return Qnil;
}
/*
* call-seq:
- * enum.chunk { |elt| ... } -> an_enumerator
- * enum.chunk(initial_state) { |elt, state| ... } -> an_enumerator
+ * enum.chunk {|elt| ... } -> an_enumerator
+ * enum.chunk(initial_state) {|elt, state| ... } -> an_enumerator
+ *
+ * Creates an enumerator for each chunked elements.
+ * The consecutive elements which have same block value are chunked.
*
- * Enumerates over the items, chunking them together based on the return
- * value of the block.
+ * The result enumerator yields the block value and an array of chunked elements.
+ * So "each" method can be called as follows.
*
- * Consecutive elements which return the same block value are chunked together.
+ * enum.chunk {|elt| key }.each {|key, ary| ... }
+ * enum.chunk(initial_state) {|elt, state| key }.each {|key, ary| ... }
*
* For example, consecutive even numbers and odd numbers can be
- * chunked as follows.
+ * splitted as follows.
*
- * [3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5].chunk { |n|
+ * [3,1,4,1,5,9,2,6,5,3,5].chunk {|n|
* n.even?
- * }.each { |even, ary|
+ * }.each {|even, ary|
* p [even, ary]
* }
* #=> [false, [3, 1]]
@@ -2416,8 +2286,8 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* This method is especially useful for sorted series of elements.
* The following example counts words for each initial letter.
*
- * open("/usr/share/dict/words", "r:iso-8859-1") { |f|
- * f.chunk { |line| line.ord }.each { |ch, lines| p [ch.chr, lines.length] }
+ * open("/usr/share/dict/words", "r:iso-8859-1") {|f|
+ * f.chunk {|line| line.ord }.each {|ch, lines| p [ch.chr, lines.length] }
* }
* #=> ["\n", 1]
* # ["A", 1327]
@@ -2426,24 +2296,19 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* # ["D", 791]
* # ...
*
- * The following key values have special meaning:
- * - +nil+ and +:_separator+ specifies that the elements should be dropped.
- * - +:_alone+ specifies that the element should be chunked by itself.
- *
- * Any other symbols that begin with an underscore will raise an error:
+ * The following key values has special meaning:
+ * - nil and :_separator specifies that the elements are dropped.
+ * - :_alone specifies that the element should be chunked as a singleton.
+ * Other symbols which begins an underscore are reserved.
*
- * items.chunk { |item| :_underscore }
- * #=> RuntimeError: symbol begins with an underscore is reserved
- *
- * +nil+ and +:_separator+ can be used to ignore some elements.
- *
- * For example, the sequence of hyphens in svn log can be eliminated as follows:
+ * nil and :_separator can be used to ignore some elements.
+ * For example, the sequence of hyphens in svn log can be eliminated as follows.
*
* sep = "-"*72 + "\n"
- * IO.popen("svn log README") { |f|
- * f.chunk { |line|
+ * IO.popen("svn log README") {|f|
+ * f.chunk {|line|
* line != sep || nil
- * }.each { |_, lines|
+ * }.each {|_, lines|
* pp lines
* }
* }
@@ -2457,30 +2322,34 @@ chunk_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* # "\n"]
* # ...
*
- * Paragraphs separated by empty lines can be parsed as follows:
+ * paragraphs separated by empty lines can be parsed as follows.
*
- * File.foreach("README").chunk { |line|
+ * File.foreach("README").chunk {|line|
* /\A\s*\z/ !~ line || nil
- * }.each { |_, lines|
+ * }.each {|_, lines|
* pp lines
* }
*
- * +:_alone+ can be used to force items into their own chunk.
- * For example, you can put lines that contain a URL by themselves,
- * and chunk the rest of the lines together, like this:
+ * :_alone can be used to pass through bunch of elements.
+ * For example, sort consecutive lines formed as Foo#bar and
+ * pass other lines, chunk can be used as follows.
*
- * pattern = /http/
- * open(filename) { |f|
- * f.chunk { |line| line =~ pattern ? :_alone : true }.each { |key, lines|
- * pp lines
+ * pat = /\A[A-Z][A-Za-z0-9_]+\#/
+ * open(filename) {|f|
+ * f.chunk {|line| pat =~ line ? $& : :_alone }.each {|key, lines|
+ * if key != :_alone
+ * print lines.sort.join('')
+ * else
+ * print lines.join('')
+ * end
* }
* }
*
* If the block needs to maintain state over multiple elements,
- * an +initial_state+ argument can be used.
- * If a non-nil value is given,
- * a reference to it is passed as the 2nd argument of the block for the
- * +chunk+ method, so state-changes to it persist across block calls.
+ * _initial_state_ argument can be used.
+ * If non-nil value is given,
+ * it is duplicated for each "each" method invocation of the enumerator.
+ * The duplicated object is passed to 2nd argument of the block for "chunk" method.
*
*/
static VALUE
@@ -2489,7 +2358,7 @@ enum_chunk(int argc, VALUE *argv, VALUE enumerable)
VALUE initial_state;
VALUE enumerator;
- if (!rb_block_given_p())
+ if(!rb_block_given_p())
rb_raise(rb_eArgError, "no block given");
rb_scan_args(argc, argv, "01", &initial_state);
@@ -2497,7 +2366,7 @@ enum_chunk(int argc, VALUE *argv, VALUE enumerable)
rb_ivar_set(enumerator, rb_intern("chunk_enumerable"), enumerable);
rb_ivar_set(enumerator, rb_intern("chunk_categorize"), rb_block_proc());
rb_ivar_set(enumerator, rb_intern("chunk_initial_state"), initial_state);
- rb_block_call(enumerator, idInitialize, 0, 0, chunk_i, enumerator);
+ rb_block_call(enumerator, rb_intern("initialize"), 0, 0, chunk_i, enumerator);
return enumerator;
}
@@ -2513,7 +2382,7 @@ struct slicebefore_arg {
static VALUE
slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
{
- struct slicebefore_arg *argp = MEMO_FOR(struct slicebefore_arg, _argp);
+ struct slicebefore_arg *argp = (struct slicebefore_arg *)_argp;
VALUE header_p;
ENUM_WANT_SVALUE();
@@ -2521,12 +2390,12 @@ slicebefore_ii(VALUE i, VALUE _argp, int argc, VALUE *argv)
if (!NIL_P(argp->sep_pat))
header_p = rb_funcall(argp->sep_pat, id_eqq, 1, i);
else if (NIL_P(argp->state))
- header_p = rb_funcall(argp->sep_pred, id_call, 1, i);
+ header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 1, i);
else
- header_p = rb_funcall(argp->sep_pred, id_call, 2, i, argp->state);
+ header_p = rb_funcall(argp->sep_pred, rb_intern("call"), 2, i, argp->state);
if (RTEST(header_p)) {
if (!NIL_P(argp->prev_elts))
- rb_funcall(argp->yielder, id_lshift, 1, argp->prev_elts);
+ rb_funcall(argp->yielder, rb_intern("<<"), 1, argp->prev_elts);
argp->prev_elts = rb_ary_new3(1, i);
}
else {
@@ -2543,71 +2412,69 @@ static VALUE
slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
{
VALUE enumerable;
- VALUE arg;
- struct slicebefore_arg *memo = NEW_MEMO_FOR(struct slicebefore_arg, arg);
+ struct slicebefore_arg arg;
enumerable = rb_ivar_get(enumerator, rb_intern("slicebefore_enumerable"));
- memo->sep_pred = rb_attr_get(enumerator, rb_intern("slicebefore_sep_pred"));
- memo->sep_pat = NIL_P(memo->sep_pred) ? rb_ivar_get(enumerator, rb_intern("slicebefore_sep_pat")) : Qnil;
- memo->state = rb_attr_get(enumerator, rb_intern("slicebefore_initial_state"));
- memo->prev_elts = Qnil;
- memo->yielder = yielder;
-
- if (!NIL_P(memo->state))
- memo->state = rb_obj_dup(memo->state);
-
- rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, arg);
- memo = MEMO_FOR(struct slicebefore_arg, arg);
- if (!NIL_P(memo->prev_elts))
- rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
+ arg.sep_pred = rb_attr_get(enumerator, rb_intern("slicebefore_sep_pred"));
+ arg.sep_pat = NIL_P(arg.sep_pred) ? rb_ivar_get(enumerator, rb_intern("slicebefore_sep_pat")) : Qnil;
+ arg.state = rb_ivar_get(enumerator, rb_intern("slicebefore_initial_state"));
+ arg.prev_elts = Qnil;
+ arg.yielder = yielder;
+
+ if (!NIL_P(arg.state))
+ arg.state = rb_obj_dup(arg.state);
+
+ rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, (VALUE)&arg);
+ if (!NIL_P(arg.prev_elts))
+ rb_funcall(arg.yielder, rb_intern("<<"), 1, arg.prev_elts);
return Qnil;
}
/*
* call-seq:
- * enum.slice_before(pattern) -> an_enumerator
- * enum.slice_before { |elt| bool } -> an_enumerator
- * enum.slice_before(initial_state) { |elt, state| bool } -> an_enumerator
+ * enum.slice_before(pattern) -> an_enumerator
+ * enum.slice_before {|elt| bool } -> an_enumerator
+ * enum.slice_before(initial_state) {|elt, state| bool } -> an_enumerator
*
* Creates an enumerator for each chunked elements.
* The beginnings of chunks are defined by _pattern_ and the block.
-
- * If <code>_pattern_ === _elt_</code> returns <code>true</code> or the block
- * returns <code>true</code> for the element, the element is beginning of a
- * chunk.
-
- * The <code>===</code> and _block_ is called from the first element to the last
- * element of _enum_. The result for the first element is ignored.
-
- * The result enumerator yields the chunked elements as an array.
- * So +each+ method can be called as follows:
+ * If _pattern_ === _elt_ returns true or
+ * the block returns true for the element,
+ * the element is beginning of a chunk.
*
- * enum.slice_before(pattern).each { |ary| ... }
- * enum.slice_before { |elt| bool }.each { |ary| ... }
- * enum.slice_before(initial_state) { |elt, state| bool }.each { |ary| ... }
+ * The === and block is called from the first element to the last element
+ * of _enum_.
+ * The result for the first element is ignored.
*
- * Other methods of the Enumerator class and Enumerable module,
+ * The result enumerator yields the chunked elements as an array for +each+
+ * method.
+ * +each+ method can be called as follows.
+ *
+ * enum.slice_before(pattern).each {|ary| ... }
+ * enum.slice_before {|elt| bool }.each {|ary| ... }
+ * enum.slice_before(initial_state) {|elt, state| bool }.each {|ary| ... }
+ *
+ * Other methods of Enumerator class and Enumerable module,
* such as map, etc., are also usable.
*
* For example, iteration over ChangeLog entries can be implemented as
- * follows:
+ * follows.
*
* # iterate over ChangeLog entries.
- * open("ChangeLog") { |f|
- * f.slice_before(/\A\S/).each { |e| pp e }
+ * open("ChangeLog") {|f|
+ * f.slice_before(/\A\S/).each {|e| pp e}
* }
*
* # same as above. block is used instead of pattern argument.
- * open("ChangeLog") { |f|
- * f.slice_before { |line| /\A\S/ === line }.each { |e| pp e }
+ * open("ChangeLog") {|f|
+ * f.slice_before {|line| /\A\S/ === line }.each {|e| pp e}
* }
*
+ * "svn proplist -R" produces multiline output for each file.
+ * They can be chunked as follows:
*
- * "svn proplist -R" produces multiline output for each file.
- * They can be chunked as follows:
- *
- * IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) { |f|
- * f.lines.slice_before(/\AProp/).each { |lines| p lines }
+ * IO.popen([{"LC_ALL"=>"C"}, "svn", "proplist", "-R"]) {|f|
+ * f.lines.slice_before(/\AProp/).each {|lines| p lines }
* }
* #=> ["Properties on '.':\n", " svn:ignore\n", " svk:merge\n"]
* # ["Properties on 'goruby.c':\n", " svn:eol-style\n"]
@@ -2620,29 +2487,30 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* For example, three or more consecutive increasing numbers can be squashed
* as follows:
*
- * a = [0, 2, 3, 4, 6, 7, 9]
+ * a = [0,2,3,4,6,7,9]
* prev = a[0]
- * p a.slice_before { |e|
+ * p a.slice_before {|e|
* prev, prev2 = e, prev
* prev2 + 1 != e
- * }.map { |es|
+ * }.map {|es|
* es.length <= 2 ? es.join(",") : "#{es.first}-#{es.last}"
* }.join(",")
* #=> "0,2-4,6,7,9"
*
* However local variables are not appropriate to maintain state
* if the result enumerator is used twice or more.
- * In such a case, the last state of the 1st +each+ is used in the 2nd +each+.
- * The _initial_state_ argument can be used to avoid this problem.
+ * In such case, the last state of the 1st +each+ is used in 2nd +each+.
+ * _initial_state_ argument can be used to avoid this problem.
* If non-nil value is given as _initial_state_,
- * it is duplicated for each +each+ method invocation of the enumerator.
+ * it is duplicated for each "each" method invocation of the enumerator.
* The duplicated object is passed to 2nd argument of the block for
* +slice_before+ method.
*
- * # Word wrapping. This assumes all characters have same width.
+ * # word wrapping.
+ * # this assumes all characters have same width.
* def wordwrap(words, maxwidth)
* # if cols is a local variable, 2nd "each" may start with non-zero cols.
- * words.slice_before(cols: 0) { |w, h|
+ * words.slice_before(cols: 0) {|w, h|
* h[:cols] += 1 if h[:cols] != 0
* h[:cols] += w.length
* if maxwidth < h[:cols]
@@ -2656,7 +2524,7 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* text = (1..20).to_a.join(" ")
* enum = wordwrap(text.split(/\s+/), 10)
* puts "-"*10
- * enum.each { |ws| puts ws.join(" ") }
+ * enum.each {|ws| puts ws.join(" ") }
* puts "-"*10
* #=> ----------
* # 1 2 3 4 5
@@ -2667,20 +2535,20 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* # 20
* # ----------
*
- * mbox contains series of mails which start with Unix From line.
- * So each mail can be extracted by slice before Unix From line.
+ * mbox contains series of mails which start with Unix From line.
+ * So each mail can be extracted by slice before Unix From line.
*
* # parse mbox
- * open("mbox") { |f|
- * f.slice_before { |line|
+ * open("mbox") {|f|
+ * f.slice_before {|line|
* line.start_with? "From "
- * }.each { |mail|
+ * }.each {|mail|
* unix_from = mail.shift
* i = mail.index("\n")
* header = mail[0...i]
* body = mail[(i+1)..-1]
* body.pop if body.last == "\n"
- * fields = header.slice_before { |line| !" \t".include?(line[0]) }.to_a
+ * fields = header.slice_before {|line| !" \t".include?(line[0]) }.to_a
* p unix_from
* pp fields
* pp body
@@ -2688,12 +2556,12 @@ slicebefore_i(VALUE yielder, VALUE enumerator, int argc, VALUE *argv)
* }
*
* # split mails in mbox (slice before Unix From line after an empty line)
- * open("mbox") { |f|
- * f.slice_before(emp: true) { |line, h|
+ * open("mbox") {|f|
+ * f.slice_before(emp: true) {|line,h|
* prevemp = h[:emp]
* h[:emp] = line == "\n"
* prevemp && line.start_with?("From ")
- * }.each { |mail|
+ * }.each {|mail|
* mail.pop if mail.last == "\n"
* pp mail
* }
@@ -2719,7 +2587,7 @@ enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
rb_ivar_set(enumerator, rb_intern("slicebefore_sep_pat"), sep_pat);
}
rb_ivar_set(enumerator, rb_intern("slicebefore_enumerable"), enumerable);
- rb_block_call(enumerator, idInitialize, 0, 0, slicebefore_i, enumerator);
+ rb_block_call(enumerator, rb_intern("initialize"), 0, 0, slicebefore_i, enumerator);
return enumerator;
}
@@ -2791,8 +2659,10 @@ Init_Enumerable(void)
rb_define_method(rb_mEnumerable, "chunk", enum_chunk, -1);
rb_define_method(rb_mEnumerable, "slice_before", enum_slice_before, -1);
+ id_eqq = rb_intern("===");
+ id_each = rb_intern("each");
+ id_cmp = rb_intern("<=>");
id_next = rb_intern("next");
- id_call = rb_intern("call");
id_size = rb_intern("size");
- id_div = rb_intern("div");
}
+
diff --git a/enumerator.c b/enumerator.c
index 23590fbf43..bdf3bb80d2 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -13,63 +13,37 @@
************************************************/
#include "ruby/ruby.h"
-#include "node.h"
-#include "internal.h"
/*
* Document-class: Enumerator
*
- * A class which allows both internal and external iteration.
+ * A class which provides a method `each' to be used as an Enumerable
+ * object.
*
- * An Enumerator can be created by the following methods.
+ * An enumerator can be created by following methods.
* - Kernel#to_enum
* - Kernel#enum_for
* - Enumerator.new
*
- * Most methods have two forms: a block form where the contents
- * are evaluated for each item in the enumeration, and a non-block form
- * which returns a new Enumerator wrapping the iteration.
+ * 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.
*
- * enumerator = %w(one two three).each
- * puts enumerator.class # => Enumerator
+ * p %w[foo bar baz].map.with_index {|w,i| "#{i}:#{w}" }
+ * #=> ["0:foo", "1:bar", "2:baz"]
*
- * enumerator.each_with_object("foo") do |item, obj|
- * puts "#{obj}: #{item}"
- * end
- *
- * # foo: one
- * # foo: two
- * # foo: three
- *
- * enum_with_obj = enumerator.each_with_object("foo")
- * puts enum_with_obj.class # => Enumerator
- *
- * enum_with_obj.each do |item, obj|
- * puts "#{obj}: #{item}"
- * end
- *
- * # foo: one
- * # foo: two
- * # foo: three
- *
- * This allows you to chain Enumerators together. For example, you
- * can map a list's elements to strings containing the index
- * and the element as a string via:
- *
- * puts %w[foo bar baz].map.with_index { |w, i| "#{i}:#{w}" }
- * # => ["0:foo", "1:bar", "2:baz"]
- *
- * An Enumerator can also be used as an external iterator.
- * For example, Enumerator#next returns the next value of the iterator
- * or raises StopIteration if the Enumerator is at the end.
+ * 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.
- * puts e.next # => 1
- * puts e.next # => 2
- * puts e.next # => 3
- * puts e.next # raises StopIteration
+ * p e.next #=> 1
+ * p e.next #=> 2
+ * p e.next #=> 3
+ * p e.next #raises StopIteration
*
- * You can use this to implement an internal iterator as follows:
+ * An external iterator can be used to implement an internal iterator as follows.
*
* def ext_each(e)
* while true
@@ -84,29 +58,26 @@
* end
*
* o = Object.new
- *
* def o.each
- * puts yield
- * puts yield(1)
- * puts yield(1, 2)
+ * p yield
+ * p yield(1)
+ * p yield(1, 2)
* 3
* end
*
* # use o.each as an internal iterator directly.
- * puts o.each {|*x| puts x; [:b, *x] }
- * # => [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
+ * 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.
- * puts ext_each(o.to_enum) {|*x| puts x; [:b, *x] }
- * # => [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
+ * p ext_each(o.to_enum) {|*x| p x; [:b, *x] }
+ * #=> [], [:b], [1], [:b, 1], [1, 2], [:b, 1, 2], 3
*
*/
VALUE rb_cEnumerator;
-VALUE rb_cLazy;
-static ID id_rewind, id_each, id_new, id_initialize, id_yield, id_call, id_size, id_to_enum;
-static ID id_eqq, id_next, id_result, id_lazy, id_receiver, id_arguments, id_memo, id_method, id_force;
-static VALUE sym_each, sym_cycle;
+static ID id_rewind, id_each;
+static VALUE sym_each;
VALUE rb_eStopIteration;
@@ -119,8 +90,6 @@ struct enumerator {
VALUE lookahead;
VALUE feedvalue;
VALUE stop_exc;
- VALUE size;
- VALUE (*size_fn)(ANYARGS);
};
static VALUE rb_cGenerator, rb_cYielder;
@@ -150,7 +119,6 @@ enumerator_mark(void *p)
rb_gc_mark(ptr->lookahead);
rb_gc_mark(ptr->feedvalue);
rb_gc_mark(ptr->stop_exc);
- rb_gc_mark(ptr->size);
}
#define enumerator_free RUBY_TYPED_DEFAULT_FREE
@@ -163,11 +131,9 @@ enumerator_memsize(const void *p)
static const rb_data_type_t enumerator_data_type = {
"enumerator",
- {
- enumerator_mark,
- enumerator_free,
- enumerator_memsize,
- },
+ enumerator_mark,
+ enumerator_free,
+ enumerator_memsize,
};
static struct enumerator *
@@ -183,74 +149,34 @@ enumerator_ptr(VALUE obj)
}
/*
- * call-seq:
- * obj.to_enum(method = :each, *args) -> enum
- * obj.enum_for(method = :each, *args) -> enum
- * obj.to_enum(method = :each, *args) {|*args| block} -> enum
- * obj.enum_for(method = :each, *args){|*args| block} -> enum
- *
- * Creates a new Enumerator which will enumerate by calling +method+ on
- * +obj+, passing +args+ if any.
- *
- * If a block is given, it will be used to calculate the size of
- * the enumerator without the need to iterate it (see Enumerator#size).
- *
- * === Examples
+ * call-seq:
+ * obj.to_enum(method = :each, *args)
+ * obj.enum_for(method = :each, *args)
*
- * str = "xyz"
+ * Returns Enumerator.new(self, method, *args).
*
- * enum = str.enum_for(:each_byte)
- * enum.each { |b| puts b }
- * # => 120
- * # => 121
- * # => 122
+ * e.g.:
*
- * # protect an array from being modified by some_method
- * a = [1, 2, 3]
- * some_method(a.to_enum)
+ * str = "xyz"
*
- * It is typical to call to_enum when defining methods for
- * a generic Enumerable, in case no block is passed.
+ * enum = str.enum_for(:each_byte)
+ * a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
*
- * Here is such an example, with parameter passing and a sizing block:
+ * # protects an array from being modified
+ * a = [1, 2, 3]
+ * some_method(a.to_enum)
*
- * module Enumerable
- * # a generic method to repeat the values of any enumerable
- * def repeat(n)
- * raise ArgumentError, "#{n} is negative!" if n < 0
- * unless block_given?
- * return to_enum(__method__, n) do # __method__ is :repeat here
- * sz = size # Call size and multiply by n...
- * sz * n if sz # but return nil if size itself is nil
- * end
- * end
- * each do |*val|
- * n.times { yield *val }
- * end
- * end
- * end
- *
- * %i[hello world].repeat(2) { |w| puts w }
- * # => Prints 'hello', 'hello', 'world', 'world'
- * enum = (1..14).repeat(3)
- * # => returns an Enumerator when called without a block
- * enum.first(4) # => [1, 1, 1, 2]
- * enum.size # => 42
*/
static VALUE
obj_to_enum(int argc, VALUE *argv, VALUE obj)
{
- VALUE enumerator, meth = sym_each;
+ VALUE meth = sym_each;
if (argc > 0) {
--argc;
meth = *argv++;
}
- enumerator = rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
- if (rb_block_given_p()) {
- enumerator_ptr(enumerator)->size = rb_block_proc();
- }
- return enumerator;
+ return rb_enumeratorize(obj, meth, argc, argv);
}
static VALUE
@@ -266,7 +192,7 @@ enumerator_allocate(VALUE klass)
}
static VALUE
-enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv, VALUE (*size_fn)(ANYARGS), VALUE size)
+enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
{
struct enumerator *ptr;
@@ -284,72 +210,54 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv, VA
ptr->lookahead = Qundef;
ptr->feedvalue = Qundef;
ptr->stop_exc = Qfalse;
- ptr->size = size;
- ptr->size_fn = size_fn;
return enum_obj;
}
/*
- * call-seq:
- * Enumerator.new(size = nil) { |yielder| ... }
- * Enumerator.new(obj, method = :each, *args)
- *
- * Creates a new Enumerator object, which can be used as an
- * Enumerable.
- *
- * In the first 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 (aliased as +<<+):
- *
- * fib = Enumerator.new do |y|
- * a = b = 1
- * loop do
- * y << a
- * a, b = b, a + b
- * end
- * end
+ * call-seq:
+ * Enumerator.new(obj, method = :each, *args)
+ * Enumerator.new { |y| ... }
*
- * p fib.take(10) # => [1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
+ * Creates a new Enumerator object, which is to be used as an
+ * Enumerable object iterating in a given way.
*
- * The optional parameter can be used to specify how to calculate the size
- * in a lazy fashion (see Enumerator#size). It can either be a value or
- * a callable object.
+ * 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.
*
- * In the second, deprecated, form, a generated Enumerator iterates over the
- * given object using the given method with the given arguments passed.
+ * e = Enumerator.new(ObjectSpace, :each_object)
+ * #-> ObjectSpace.enum_for(:each_object)
*
- * Use of this form is discouraged. Use Kernel#enum_for or Kernel#to_enum
- * instead.
+ * e.select { |obj| obj.is_a?(Class) } #=> array of all classes
*
- * e = Enumerator.new(ObjectSpace, :each_object)
- * #-> ObjectSpace.enum_for(:each_object)
+ * 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 +<<+.
*
- * e.select { |obj| obj.is_a?(Class) } #=> array of all classes
+ * 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]
*/
static VALUE
enumerator_initialize(int argc, VALUE *argv, VALUE obj)
{
VALUE recv, meth = sym_each;
- VALUE size = Qnil;
- if (rb_block_given_p()) {
- rb_check_arity(argc, 0, 1);
+ 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());
- if (argc) {
- if (NIL_P(argv[0]) || rb_obj_is_proc(argv[0]) ||
- (RB_TYPE_P(argv[0], T_FLOAT) && RFLOAT_VALUE(argv[0]) == INFINITY)) {
- size = argv[0];
- } else {
- size = rb_to_int(argv[0]);
- }
- argc = 0;
- }
}
else {
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
- rb_warn("Enumerator.new without a block is deprecated; use Object#to_enum");
recv = *argv++;
if (--argc) {
meth = *argv++;
@@ -357,7 +265,7 @@ enumerator_initialize(int argc, VALUE *argv, VALUE obj)
}
}
- return enumerator_init(obj, recv, meth, argc, argv, 0, size);
+ return enumerator_init(obj, recv, meth, argc, argv);
}
/* :nodoc: */
@@ -366,7 +274,6 @@ enumerator_init_copy(VALUE obj, VALUE orig)
{
struct enumerator *ptr0, *ptr1;
- if (!OBJ_INIT_COPY(obj, orig)) return obj;
ptr0 = enumerator_ptr(orig);
if (ptr0->fib) {
/* Fibers cannot be copied */
@@ -385,34 +292,14 @@ enumerator_init_copy(VALUE obj, VALUE orig)
ptr1->fib = 0;
ptr1->lookahead = Qundef;
ptr1->feedvalue = Qundef;
- ptr1->size = ptr0->size;
- ptr1->size_fn = ptr0->size_fn;
return obj;
}
-/*
- * For backwards compatibility; use rb_enumeratorize_with_size
- */
VALUE
rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
{
- return rb_enumeratorize_with_size(obj, meth, argc, argv, 0);
-}
-
-static VALUE
-lazy_to_enum_i(VALUE self, VALUE meth, int argc, VALUE *argv, VALUE (*size_fn)(ANYARGS));
-
-VALUE
-rb_enumeratorize_with_size(VALUE obj, VALUE meth, int argc, VALUE *argv, VALUE (*size_fn)(ANYARGS))
-{
- /* Similar effect as calling obj.to_enum, i.e. dispatching to either
- Kernel#to_enum vs Lazy#to_enum */
- if (RTEST(rb_obj_is_kind_of(obj, rb_cLazy)))
- return lazy_to_enum_i(obj, meth, argc, argv, size_fn);
- else
- return enumerator_init(enumerator_allocate(rb_cEnumerator),
- obj, meth, argc, argv, size_fn, Qnil);
+ return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
}
static VALUE
@@ -431,28 +318,16 @@ enumerator_block_call(VALUE obj, rb_block_call_func *func, VALUE arg)
}
/*
- * call-seq:
- * enum.each {...}
+ * call-seq:
+ * enum.each {...}
*
- * Iterates over the block according to how this Enumerable was constructed.
- * If no block is given, returns self.
+ * Iterates the given block using the object and the method specified
+ * in the first place. If no block is given, returns self.
*
*/
static VALUE
-enumerator_each(int argc, VALUE *argv, VALUE obj)
+enumerator_each(VALUE obj)
{
- if (argc > 0) {
- struct enumerator *e = enumerator_ptr(obj = rb_obj_dup(obj));
- VALUE args = e->args;
- if (args) {
- args = rb_ary_dup(args);
- rb_ary_cat(args, argv, argc);
- }
- else {
- args = rb_ary_new4(argc, argv);
- }
- e->args = args;
- }
if (!rb_block_given_p()) return obj;
return enumerator_block_call(obj, 0, obj);
}
@@ -460,9 +335,11 @@ enumerator_each(int argc, VALUE *argv, VALUE obj)
static VALUE
enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
{
- NODE *memo = (NODE *)m;
- VALUE idx = memo->u1.value;
- memo->u1.value = rb_int_succ(idx);
+ VALUE idx;
+ VALUE *memo = (VALUE *)m;
+
+ idx = INT2FIX(*memo);
+ ++*memo;
if (argc <= 1)
return rb_yield_values(2, val, idx);
@@ -470,19 +347,13 @@ enumerator_with_index_i(VALUE val, VALUE m, int argc, VALUE *argv)
return rb_yield_values(2, rb_ary_new4(argc, argv), idx);
}
-static VALUE
-enumerator_size(VALUE obj);
-
/*
- * call-seq:
- * e.with_index(offset = 0) {|(*args), idx| ... }
- * e.with_index(offset = 0)
- *
- * Iterates the given block for each element with an index, which
- * starts from +offset+. If no block is given, returns a new Enumerator
- * that includes the index, starting from +offset+
+ * call-seq:
+ * e.with_index(offset = 0) {|(*args), idx| ... }
+ * e.with_index(offset = 0)
*
- * +offset+:: the starting index to use
+ * Iterates the given block for each element with an index, which
+ * starts from +offset+. If no block is given, returns an enumerator.
*
*/
static VALUE
@@ -491,22 +362,18 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
VALUE memo;
rb_scan_args(argc, argv, "01", &memo);
- RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_size);
- if (NIL_P(memo))
- memo = INT2FIX(0);
- else
- memo = rb_to_int(memo);
- return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)NEW_MEMO(memo, 0, 0));
+ RETURN_ENUMERATOR(obj, argc, argv);
+ memo = NIL_P(memo) ? 0 : (VALUE)NUM2LONG(memo);
+ return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo);
}
/*
- * call-seq:
- * e.each_with_index {|(*args), idx| ... }
- * e.each_with_index
- *
- * Same as Enumerator#with_index(0), i.e. there is no starting offset.
+ * call-seq:
+ * e.each_with_index {|(*args), idx| ... }
+ * e.each_with_index
*
- * If no block is given, a new Enumerator is returned that includes the index.
+ * Same as Enumerator#with_index, except each_with_index does not
+ * receive an offset argument.
*
*/
static VALUE
@@ -525,36 +392,20 @@ enumerator_with_object_i(VALUE val, VALUE memo, int argc, VALUE *argv)
}
/*
- * call-seq:
- * e.with_object(obj) {|(*args), obj| ... }
- * e.with_object(obj)
- *
- * Iterates the given block for each element with an arbitrary object, +obj+,
- * and returns +obj+
- *
- * If no block is given, returns a new Enumerator.
- *
- * === Example
+ * call-seq:
+ * e.with_object(obj) {|(*args), memo_obj| ... }
+ * e.with_object(obj)
*
- * to_three = Enumerator.new do |y|
- * 3.times do |x|
- * y << x
- * end
- * end
+ * Iterates the given block for each element with an arbitrary
+ * object given, and returns the initially given object.
*
- * to_three_with_string = to_three.with_object("foo")
- * to_three_with_string.each do |x,string|
- * puts "#{string}: #{x}"
- * end
+ * If no block is given, returns an enumerator.
*
- * # => foo:0
- * # => foo:1
- * # => foo:2
*/
static VALUE
enumerator_with_object(VALUE obj, VALUE memo)
{
- RETURN_SIZED_ENUMERATOR(obj, 1, &memo, enumerator_size);
+ RETURN_ENUMERATOR(obj, 1, &memo);
enumerator_block_call(obj, enumerator_with_object_i, memo);
return memo;
@@ -583,7 +434,7 @@ next_i(VALUE curr, VALUE obj)
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, id_result, result);
+ rb_ivar_set(e->stop_exc, rb_intern("result"), result);
return rb_fiber_yield(1, &nil);
}
@@ -625,14 +476,11 @@ get_next_values(VALUE obj, struct enumerator *e)
* 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.
+ * 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>.
- *
- * === Example
+ * This method can be used to distinguish <code>yield</code> and <code>yield nil</code>.
*
* o = Object.new
* def o.each
@@ -662,9 +510,9 @@ get_next_values(VALUE obj, struct enumerator *e)
* # yield nil [nil] nil
* # yield [1, 2] [[1, 2]] [1, 2]
*
- * Note that +next_values+ does not affect other non-external enumeration
- * methods unless underlying iteration method itself has side-effect, e.g.
- * IO#each_line.
+ * 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.
*
*/
@@ -686,7 +534,7 @@ enumerator_next_values(VALUE obj)
static VALUE
ary2sv(VALUE args, int dup)
{
- if (!RB_TYPE_P(args, T_ARRAY))
+ if (TYPE(args) != T_ARRAY)
return args;
switch (RARRAY_LEN(args)) {
@@ -707,10 +555,9 @@ ary2sv(VALUE args, int dup)
* 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, StopIteration is raised.
- *
- * === Example
+ * 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
@@ -719,9 +566,9 @@ ary2sv(VALUE args, int dup)
* p e.next #=> 3
* p e.next #raises StopIteration
*
- * Note that enumeration sequence by +next+ does not affect other non-external
- * enumeration methods, unless the underlying iteration methods itself has
- * side-effect, e.g. IO#each_line.
+ * 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.
*
*/
@@ -747,11 +594,9 @@ enumerator_peek_values(VALUE obj)
* call-seq:
* e.peek_values -> array
*
- * Returns the next object as an array, similar to Enumerator#next_values, but
- * doesn't move the internal position forward. If the position is already at
- * the end, StopIteration is raised.
- *
- * === Example
+ * 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
@@ -781,12 +626,10 @@ enumerator_peek_values_m(VALUE obj)
* call-seq:
* e.peek -> object
*
- * Returns the next object in the enumerator, but doesn't move the internal
- * position forward. If the position is already at the end, StopIteration
+ * 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.
*
- * === Example
- *
* a = [1,2,3]
* e = a.to_enum
* p e.next #=> 1
@@ -795,7 +638,7 @@ enumerator_peek_values_m(VALUE obj)
* p e.peek #=> 2
* p e.next #=> 2
* p e.next #=> 3
- * p e.peek #raises StopIteration
+ * p e.next #raises StopIteration
*
*/
@@ -810,28 +653,36 @@ enumerator_peek(VALUE obj)
* call-seq:
* e.feed obj -> nil
*
- * Sets the value to be returned by the next yield inside +e+.
+ * 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 being yielded.
+ * This value is cleared after used.
*
* o = Object.new
* def o.each
- * x = yield # (2) blocks
- * p x # (5) => "foo"
- * x = yield # (6) blocks
- * p x # (8) => nil
- * x = yield # (9) blocks
- * p x # not reached w/o another e.next
+ * # (2)
+ * x = yield
+ * p x #=> "foo"
+ * # (5)
+ * x = yield
+ * p x #=> nil
+ * # (7)
+ * x = yield
+ * # not reached
+ * p x
* end
- *
* e = o.to_enum
- * e.next # (1)
- * e.feed "foo" # (3)
- * e.next # (4)
- * e.next # (7)
- * # (10)
+ * # (1)
+ * e.next
+ * # (3)
+ * e.feed "foo"
+ * # (4)
+ * e.next
+ * # (6)
+ * e.next
+ * # (8)
+ *
*/
static VALUE
@@ -851,7 +702,7 @@ enumerator_feed(VALUE obj, VALUE v)
* call-seq:
* e.rewind -> e
*
- * Rewinds the enumeration sequence to the beginning.
+ * Rewinds the enumeration sequence by the next method.
*
* If the enclosed object responds to a "rewind" method, it is called.
*/
@@ -876,7 +727,7 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
{
struct enumerator *e;
const char *cname;
- VALUE eobj, eargs, str, method;
+ VALUE eobj, str;
int tainted, untrusted;
TypedData_Get_Struct(obj, struct enumerator, &enumerator_data_type, e);
@@ -893,10 +744,7 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
return str;
}
- eobj = rb_attr_get(obj, id_receiver);
- if (NIL_P(eobj)) {
- eobj = e->obj;
- }
+ eobj = e->obj;
tainted = OBJ_TAINTED(eobj);
untrusted = OBJ_UNTRUSTED(eobj);
@@ -904,37 +752,23 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
/* (1..100).each_cons(2) => "#<Enumerator: 1..100:each_cons(2)>" */
str = rb_sprintf("#<%s: ", cname);
rb_str_concat(str, rb_inspect(eobj));
- method = rb_attr_get(obj, id_method);
- if (NIL_P(method)) {
- rb_str_buf_cat2(str, ":");
- rb_str_buf_cat2(str, rb_id2name(e->meth));
- }
- else if (method != Qfalse) {
- Check_Type(method, T_SYMBOL);
- rb_str_buf_cat2(str, ":");
- rb_str_buf_cat2(str, rb_id2name(SYM2ID(method)));
- }
+ rb_str_buf_cat2(str, ":");
+ rb_str_buf_cat2(str, rb_id2name(e->meth));
- eargs = rb_attr_get(obj, id_arguments);
- if (NIL_P(eargs)) {
- eargs = e->args;
- }
- if (eargs != Qfalse) {
- long argc = RARRAY_LEN(eargs);
- VALUE *argv = RARRAY_PTR(eargs);
+ if (e->args) {
+ long argc = RARRAY_LEN(e->args);
+ VALUE *argv = RARRAY_PTR(e->args);
- if (argc > 0) {
- rb_str_buf_cat2(str, "(");
+ rb_str_buf_cat2(str, "(");
- while (argc--) {
- VALUE arg = *argv++;
+ while (argc--) {
+ VALUE arg = *argv++;
- rb_str_concat(str, rb_inspect(arg));
- rb_str_buf_cat2(str, argc > 0 ? ", " : ")");
+ 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;
- }
+ if (OBJ_TAINTED(arg)) tainted = TRUE;
+ if (OBJ_UNTRUSTED(arg)) untrusted = TRUE;
}
}
@@ -949,7 +783,7 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
* call-seq:
* e.inspect -> string
*
- * Creates a printable version of <i>e</i>.
+ * Create a printable version of <i>e</i>.
*/
static VALUE
@@ -959,34 +793,6 @@ enumerator_inspect(VALUE obj)
}
/*
- * call-seq:
- * e.size -> int, Float::INFINITY or nil
- *
- * Returns the size of the enumerator, or +nil+ if it can't be calculated lazily.
- *
- * (1..100).to_a.permutation(4).size # => 94109400
- * loop.size # => Float::INFINITY
- * (1..100).drop_while.size # => nil
- */
-
-static VALUE
-enumerator_size(VALUE obj)
-{
- struct enumerator *e = enumerator_ptr(obj);
-
- if (e->size_fn) {
- return (*e->size_fn)(e->obj, e->args, obj);
- }
- if (rb_obj_is_proc(e->size)) {
- if (e->args)
- return rb_proc_call(e->size, e->args);
- else
- return rb_proc_call_with_block(e->size, 0, 0, Qnil);
- }
- return e->size;
-}
-
-/*
* Yielder
*/
static void
@@ -1006,11 +812,9 @@ yielder_memsize(const void *p)
static const rb_data_type_t yielder_data_type = {
"yielder",
- {
- yielder_mark,
- yielder_free,
- yielder_memsize,
- },
+ yielder_mark,
+ yielder_free,
+ yielder_memsize,
};
static struct yielder *
@@ -1111,11 +915,9 @@ generator_memsize(const void *p)
static const rb_data_type_t generator_data_type = {
"generator",
- {
- generator_mark,
- generator_free,
- generator_memsize,
- },
+ generator_mark,
+ generator_free,
+ generator_memsize,
};
static struct generator *
@@ -1159,6 +961,8 @@ generator_init(VALUE obj, VALUE proc)
return obj;
}
+VALUE rb_obj_is_proc(VALUE proc);
+
/* :nodoc: */
static VALUE
generator_initialize(int argc, VALUE *argv, VALUE obj)
@@ -1169,8 +973,7 @@ generator_initialize(int argc, VALUE *argv, VALUE obj)
rb_need_block();
proc = rb_block_proc();
- }
- else {
+ } else {
rb_scan_args(argc, argv, "1", &proc);
if (!rb_obj_is_proc(proc))
@@ -1192,8 +995,6 @@ generator_init_copy(VALUE obj, VALUE orig)
{
struct generator *ptr0, *ptr1;
- if (!OBJ_INIT_COPY(obj, orig)) return obj;
-
ptr0 = generator_ptr(orig);
TypedData_Get_Struct(obj, struct generator, &generator_data_type, ptr1);
@@ -1209,678 +1010,38 @@ generator_init_copy(VALUE obj, VALUE orig)
/* :nodoc: */
static VALUE
-generator_each(int argc, VALUE *argv, VALUE obj)
+generator_each(VALUE obj)
{
struct generator *ptr = generator_ptr(obj);
- VALUE args = rb_ary_new2(argc + 1);
-
- rb_ary_push(args, yielder_new());
- if (argc > 0) {
- rb_ary_cat(args, argv, argc);
- }
-
- return rb_proc_call(ptr->proc, args);
-}
-
-/* Lazy Enumerator methods */
-static VALUE
-enum_size(VALUE self)
-{
- VALUE r = rb_check_funcall(self, id_size, 0, 0);
- return (r == Qundef) ? Qnil : r;
-}
-
-static VALUE
-lazy_size(VALUE self)
-{
- return enum_size(rb_ivar_get(self, id_receiver));
-}
-
-static VALUE
-lazy_receiver_size(VALUE generator, VALUE args, VALUE lazy)
-{
- return lazy_size(lazy);
-}
+ VALUE yielder;
-static VALUE
-lazy_init_iterator(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE result;
- if (argc == 1) {
- VALUE args[2];
- args[0] = m;
- args[1] = val;
- result = rb_yield_values2(2, args);
- }
- else {
- VALUE args;
- int len = rb_long2int((long)argc + 1);
+ yielder = yielder_new();
- args = rb_ary_tmp_new(len);
- rb_ary_push(args, m);
- if (argc > 0) {
- rb_ary_cat(args, argv, argc);
- }
- result = rb_yield_values2(len, RARRAY_PTR(args));
- RB_GC_GUARD(args);
- }
- if (result == Qundef) rb_iter_break();
- return Qnil;
-}
-
-static VALUE
-lazy_init_block_i(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- rb_block_call(m, id_each, argc-1, argv+1, lazy_init_iterator, val);
- return Qnil;
+ return rb_proc_call(ptr->proc, rb_ary_new3(1, yielder));
}
/*
- * call-seq:
- * Lazy.new(obj, size=nil) { |yielder, *values| ... }
+ * Document-class: StopIteration
*
- * Creates a new Lazy enumerator. When the enumerator is actually enumerated
- * (e.g. by calling #force), +obj+ will be enumerated and each value passed
- * to the given block. The block can yield values back using +yielder+.
- * For example, to create a method +filter_map+ in both lazy and
- * non-lazy fashions:
+ * Raised to stop the iteration, in particular by Enumerator#next. It is
+ * rescued by Kernel#loop.
*
- * module Enumerable
- * def filter_map(&block)
- * map(&block).compact
+ * loop do
+ * puts "Hello"
+ * raise StopIteration
+ * puts "World"
* end
- * end
+ * puts "Done!"
*
- * class Enumerator::Lazy
- * def filter_map
- * Lazy.new(self) do |yielder, *values|
- * result = yield *values
- * yielder << result if result
- * end
- * end
- * end
+ * <em>produces:</em>
*
- * (1..Float::INFINITY).lazy.filter_map{|i| i*i if i.even?}.first(5)
- * # => [4, 16, 36, 64, 100]
- */
-static VALUE
-lazy_initialize(int argc, VALUE *argv, VALUE self)
-{
- VALUE obj, size = Qnil;
- VALUE generator;
-
- rb_check_arity(argc, 1, 2);
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy new without a block");
- }
- obj = argv[0];
- if (argc > 1) {
- size = argv[1];
- }
- generator = generator_allocate(rb_cGenerator);
- rb_block_call(generator, id_initialize, 0, 0, lazy_init_block_i, obj);
- enumerator_init(self, generator, sym_each, 0, 0, 0, size);
- rb_ivar_set(self, id_receiver, obj);
-
- return self;
-}
-
-static VALUE
-lazy_set_method(VALUE lazy, VALUE args, VALUE (*size_fn)(ANYARGS))
-{
- ID id = rb_frame_this_func();
- struct enumerator *e = enumerator_ptr(lazy);
- rb_ivar_set(lazy, id_method, ID2SYM(id));
- if (NIL_P(args)) {
- /* Qfalse indicates that the arguments are empty */
- rb_ivar_set(lazy, id_arguments, Qfalse);
- }
- else {
- rb_ivar_set(lazy, id_arguments, args);
- }
- e->size_fn = size_fn;
- return lazy;
-}
-
-/*
- * call-seq:
- * e.lazy -> lazy_enumerator
- *
- * Returns a lazy enumerator, whose methods map/collect,
- * flat_map/collect_concat, select/find_all, reject, grep, zip, take,
- * take_while, drop, and drop_while enumerate values only on an
- * as-needed basis. However, if a block is given to zip, values
- * are enumerated immediately.
- *
- * === Example
- *
- * The following program finds pythagorean triples:
- *
- * def pythagorean_triples
- * (1..Float::INFINITY).lazy.flat_map {|z|
- * (1..z).flat_map {|x|
- * (x..z).select {|y|
- * x**2 + y**2 == z**2
- * }.map {|y|
- * [x, y, z]
- * }
- * }
- * }
- * end
- * # show first ten pythagorean triples
- * p pythagorean_triples.take(10).force # take is lazy, so force is needed
- * p pythagorean_triples.first(10) # first is eager
- * # show pythagorean triples less than 100
- * p pythagorean_triples.take_while { |*, z| z < 100 }.force
+ * Hello
+ * Done!
*/
-static VALUE
-enumerable_lazy(VALUE obj)
-{
- VALUE result = lazy_to_enum_i(obj, sym_each, 0, 0, enum_size);
- /* Qfalse indicates that the Enumerator::Lazy has no method name */
- rb_ivar_set(result, id_method, Qfalse);
- return result;
-}
-
-static VALUE
-lazy_to_enum_i(VALUE obj, VALUE meth, int argc, VALUE *argv, VALUE (*size_fn)(ANYARGS))
-{
- return enumerator_init(enumerator_allocate(rb_cLazy),
- obj, meth, argc, argv, size_fn, Qnil);
-}
/*
* call-seq:
- * lzy.to_enum(method = :each, *args) -> lazy_enum
- * lzy.enum_for(method = :each, *args) -> lazy_enum
- * lzy.to_enum(method = :each, *args) {|*args| block} -> lazy_enum
- * lzy.enum_for(method = :each, *args){|*args| block} -> lazy_enum
- *
- * Similar to Kernel#to_enum, except it returns a lazy enumerator.
- * This makes it easy to define Enumerable methods that will
- * naturally remain lazy if called from a lazy enumerator.
- *
- * For example, continuing from the example in Kernel#to_enum:
- *
- * # See Kernel#to_enum for the definition of repeat
- * r = 1..Float::INFINITY
- * r.repeat(2).first(5) # => [1, 1, 2, 2, 3]
- * r.repeat(2).class # => Enumerator
- * r.repeat(2).map{|n| n ** 2}.first(5) # => endless loop!
- * # works naturally on lazy enumerator:
- * r.lazy.repeat(2).class # => Enumerator::Lazy
- * r.lazy.repeat(2).map{|n| n ** 2}.first(5) # => [1, 1, 4, 4, 9]
- */
-
-static VALUE
-lazy_to_enum(int argc, VALUE *argv, VALUE self)
-{
- VALUE lazy, meth = sym_each;
-
- if (argc > 0) {
- --argc;
- meth = *argv++;
- }
- lazy = lazy_to_enum_i(self, meth, argc, argv, 0);
- if (rb_block_given_p()) {
- enumerator_ptr(lazy)->size = rb_block_proc();
- }
- return lazy;
-}
-
-static VALUE
-lazy_map_func(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE result = rb_yield_values2(argc - 1, &argv[1]);
-
- rb_funcall(argv[0], id_yield, 1, result);
- return Qnil;
-}
-
-static VALUE
-lazy_map(VALUE obj)
-{
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy map without a block");
- }
-
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_map_func, 0),
- Qnil, lazy_receiver_size);
-}
-
-static VALUE
-lazy_flat_map_i(VALUE i, VALUE yielder, int argc, VALUE *argv)
-{
- return rb_funcall2(yielder, id_yield, argc, argv);
-}
-
-static VALUE
-lazy_flat_map_each(VALUE obj, VALUE yielder)
-{
- rb_block_call(obj, id_each, 0, 0, lazy_flat_map_i, yielder);
- return Qnil;
-}
-
-static VALUE
-lazy_flat_map_to_ary(VALUE obj, VALUE yielder)
-{
- VALUE ary = rb_check_array_type(obj);
- if (NIL_P(ary)) {
- rb_funcall(yielder, id_yield, 1, obj);
- }
- else {
- long i;
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- rb_funcall(yielder, id_yield, 1, RARRAY_PTR(ary)[i]);
- }
- }
- return Qnil;
-}
-
-static VALUE
-lazy_flat_map_func(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE result = rb_yield_values2(argc - 1, &argv[1]);
- if (RB_TYPE_P(result, T_ARRAY)) {
- long i;
- for (i = 0; i < RARRAY_LEN(result); i++) {
- rb_funcall(argv[0], id_yield, 1, RARRAY_PTR(result)[i]);
- }
- }
- else {
- if (rb_respond_to(result, id_force) && rb_respond_to(result, id_each)) {
- lazy_flat_map_each(result, argv[0]);
- }
- else {
- lazy_flat_map_to_ary(result, argv[0]);
- }
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * lazy.flat_map { |obj| block } -> a_lazy_enumerator
- *
- * Returns a new lazy enumerator with the concatenated results of running
- * <i>block</i> once for every element in <i>lazy</i>.
- *
- * ["foo", "bar"].lazy.flat_map {|i| i.each_char.lazy}.force
- * #=> ["f", "o", "o", "b", "a", "r"]
- *
- * A value <i>x</i> returned by <i>block</i> is decomposed if either of
- * the following conditions is true:
- *
- * a) <i>x</i> responds to both each and force, which means that
- * <i>x</i> is a lazy enumerator.
- * b) <i>x</i> is an array or responds to to_ary.
- *
- * Otherwise, <i>x</i> is contained as-is in the return value.
- *
- * [{a:1}, {b:2}].lazy.flat_map {|i| i}.force
- * #=> [{:a=>1}, {:b=>2}]
- */
-static VALUE
-lazy_flat_map(VALUE obj)
-{
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy flat_map without a block");
- }
-
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_flat_map_func, 0),
- Qnil, 0);
-}
-
-static VALUE
-lazy_select_func(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
-
- if (RTEST(rb_yield(element))) {
- return rb_funcall(argv[0], id_yield, 1, element);
- }
- return Qnil;
-}
-
-static VALUE
-lazy_select(VALUE obj)
-{
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy select without a block");
- }
-
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_select_func, 0),
- Qnil, 0);
-}
-
-static VALUE
-lazy_reject_func(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
-
- if (!RTEST(rb_yield(element))) {
- return rb_funcall(argv[0], id_yield, 1, element);
- }
- return Qnil;
-}
-
-static VALUE
-lazy_reject(VALUE obj)
-{
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy reject without a block");
- }
-
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_reject_func, 0),
- Qnil, 0);
-}
-
-static VALUE
-lazy_grep_func(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
- VALUE result = rb_funcall(m, id_eqq, 1, i);
-
- if (RTEST(result)) {
- rb_funcall(argv[0], id_yield, 1, i);
- }
- return Qnil;
-}
-
-static VALUE
-lazy_grep_iter(VALUE val, VALUE m, int argc, VALUE *argv)
-{
- VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
- VALUE result = rb_funcall(m, id_eqq, 1, i);
-
- if (RTEST(result)) {
- rb_funcall(argv[0], id_yield, 1, rb_yield(i));
- }
- return Qnil;
-}
-
-static VALUE
-lazy_grep(VALUE obj, VALUE pattern)
-{
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- rb_block_given_p() ?
- lazy_grep_iter : lazy_grep_func,
- pattern),
- rb_ary_new3(1, pattern), 0);
-}
-
-static VALUE
-call_next(VALUE obj)
-{
- return rb_funcall(obj, id_next, 0);
-}
-
-static VALUE
-next_stopped(VALUE obj)
-{
- return Qnil;
-}
-
-static VALUE
-lazy_zip_arrays_func(VALUE val, VALUE arrays, int argc, VALUE *argv)
-{
- VALUE yielder, ary, memo;
- long i, count;
-
- yielder = argv[0];
- memo = rb_attr_get(yielder, id_memo);
- count = NIL_P(memo) ? 0 : NUM2LONG(memo);
-
- ary = rb_ary_new2(RARRAY_LEN(arrays) + 1);
- rb_ary_push(ary, argv[1]);
- for (i = 0; i < RARRAY_LEN(arrays); i++) {
- rb_ary_push(ary, rb_ary_entry(RARRAY_PTR(arrays)[i], count));
- }
- rb_funcall(yielder, id_yield, 1, ary);
- rb_ivar_set(yielder, id_memo, LONG2NUM(++count));
- return Qnil;
-}
-
-static VALUE
-lazy_zip_func(VALUE val, VALUE zip_args, int argc, VALUE *argv)
-{
- VALUE yielder, ary, arg, v;
- long i;
-
- yielder = argv[0];
- arg = rb_attr_get(yielder, id_memo);
- if (NIL_P(arg)) {
- arg = rb_ary_new2(RARRAY_LEN(zip_args));
- for (i = 0; i < RARRAY_LEN(zip_args); i++) {
- rb_ary_push(arg, rb_funcall(RARRAY_PTR(zip_args)[i], id_to_enum, 0));
- }
- rb_ivar_set(yielder, id_memo, arg);
- }
-
- ary = rb_ary_new2(RARRAY_LEN(arg) + 1);
- v = Qnil;
- if (--argc > 0) {
- ++argv;
- v = argc > 1 ? rb_ary_new4(argc, argv) : *argv;
- }
- rb_ary_push(ary, v);
- for (i = 0; i < RARRAY_LEN(arg); i++) {
- v = rb_rescue2(call_next, RARRAY_PTR(arg)[i], next_stopped, 0,
- rb_eStopIteration, (VALUE)0);
- rb_ary_push(ary, v);
- }
- rb_funcall(yielder, id_yield, 1, ary);
- return Qnil;
-}
-
-static VALUE
-lazy_zip(int argc, VALUE *argv, VALUE obj)
-{
- VALUE ary, v;
- long i;
- rb_block_call_func *func = lazy_zip_arrays_func;
-
- if (rb_block_given_p()) {
- return rb_call_super(argc, argv);
- }
-
- ary = rb_ary_new2(argc);
- for (i = 0; i < argc; i++) {
- v = rb_check_array_type(argv[i]);
- if (NIL_P(v)) {
- for (; i < argc; i++) {
- if (!rb_respond_to(argv[i], id_each)) {
- rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
- rb_obj_classname(argv[i]));
- }
- }
- ary = rb_ary_new4(argc, argv);
- func = lazy_zip_func;
- break;
- }
- rb_ary_push(ary, v);
- }
-
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- func, ary),
- ary, lazy_receiver_size);
-}
-
-static VALUE
-lazy_take_func(VALUE val, VALUE args, int argc, VALUE *argv)
-{
- long remain;
- VALUE memo = rb_attr_get(argv[0], id_memo);
- if (NIL_P(memo)) {
- memo = args;
- }
-
- rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
- if ((remain = NUM2LONG(memo)-1) == 0) {
- return Qundef;
- }
- else {
- rb_ivar_set(argv[0], id_memo, LONG2NUM(remain));
- return Qnil;
- }
-}
-
-static VALUE
-lazy_take_size(VALUE generator, VALUE args, VALUE lazy)
-{
- VALUE receiver = lazy_size(lazy);
- long len = NUM2LONG(RARRAY_PTR(rb_ivar_get(lazy, id_arguments))[0]);
- if (NIL_P(receiver) || (FIXNUM_P(receiver) && FIX2LONG(receiver) < len))
- return receiver;
- return LONG2NUM(len);
-}
-
-static VALUE
-lazy_take(VALUE obj, VALUE n)
-{
- long len = NUM2LONG(n);
- VALUE lazy;
-
- if (len < 0) {
- rb_raise(rb_eArgError, "attempt to take negative size");
- }
- if (len == 0) {
- VALUE len = INT2NUM(0);
- lazy = lazy_to_enum_i(obj, sym_cycle, 1, &len, 0);
- }
- else {
- lazy = rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_take_func, n);
- }
- return lazy_set_method(lazy, rb_ary_new3(1, n), lazy_take_size);
-}
-
-static VALUE
-lazy_take_while_func(VALUE val, VALUE args, int argc, VALUE *argv)
-{
- VALUE result = rb_yield_values2(argc - 1, &argv[1]);
- if (!RTEST(result)) return Qundef;
- rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
- return Qnil;
-}
-
-static VALUE
-lazy_take_while(VALUE obj)
-{
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy take_while without a block");
- }
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_take_while_func, 0),
- Qnil, 0);
-}
-
-static VALUE
-lazy_drop_size(VALUE generator, VALUE args, VALUE lazy)
-{
- long len = NUM2LONG(RARRAY_PTR(rb_ivar_get(lazy, id_arguments))[0]);
- VALUE receiver = lazy_size(lazy);
- if (NIL_P(receiver))
- return receiver;
- if (FIXNUM_P(receiver)) {
- len = FIX2LONG(receiver) - len;
- return LONG2FIX(len < 0 ? 0 : len);
- }
- return rb_funcall(receiver, '-', 1, LONG2NUM(len));
-}
-
-static VALUE
-lazy_drop_func(VALUE val, VALUE args, int argc, VALUE *argv)
-{
- long remain;
- VALUE memo = rb_attr_get(argv[0], id_memo);
- if (NIL_P(memo)) {
- memo = args;
- }
- if ((remain = NUM2LONG(memo)) == 0) {
- rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
- }
- else {
- rb_ivar_set(argv[0], id_memo, LONG2NUM(--remain));
- }
- return Qnil;
-}
-
-static VALUE
-lazy_drop(VALUE obj, VALUE n)
-{
- long len = NUM2LONG(n);
-
- if (len < 0) {
- rb_raise(rb_eArgError, "attempt to drop negative size");
- }
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_drop_func, n),
- rb_ary_new3(1, n), lazy_drop_size);
-}
-
-static VALUE
-lazy_drop_while_func(VALUE val, VALUE args, int argc, VALUE *argv)
-{
- VALUE memo = rb_attr_get(argv[0], id_memo);
- if (NIL_P(memo) && !RTEST(rb_yield_values2(argc - 1, &argv[1]))) {
- rb_ivar_set(argv[0], id_memo, memo = Qtrue);
- }
- if (memo == Qtrue) {
- rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
- }
- return Qnil;
-}
-
-static VALUE
-lazy_drop_while(VALUE obj)
-{
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "tried to call lazy drop_while without a block");
- }
- return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
- lazy_drop_while_func, 0),
- Qnil, 0);
-}
-
-static VALUE
-lazy_super(int argc, VALUE *argv, VALUE lazy)
-{
- return enumerable_lazy(rb_call_super(argc, argv));
-}
-
-static VALUE
-lazy_lazy(VALUE obj)
-{
- return obj;
-}
-
-/*
- * Document-class: StopIteration
- *
- * Raised to stop the iteration, in particular by Enumerator#next. It is
- * rescued by Kernel#loop.
- *
- * loop do
- * puts "Hello"
- * raise StopIteration
- * puts "World"
- * end
- * puts "Done!"
- *
- * <em>produces:</em>
- *
- * Hello
- * Done!
- */
-
-/*
- * call-seq:
- * result -> value
+ * stopiteration.result -> value
*
* Returns the return value of the iterator.
*
@@ -1891,29 +1052,25 @@ lazy_lazy(VALUE obj)
* yield 3
* 100
* end
- *
* e = o.to_enum
- *
- * puts e.next #=> 1
- * puts e.next #=> 2
- * puts e.next #=> 3
- *
+ * p e.next #=> 1
+ * p e.next #=> 2
+ * p e.next #=> 3
* begin
* e.next
- * rescue StopIteration => ex
- * puts ex.result #=> 100
+ * rescue StopIteration
+ * p $!.result #=> 100
* end
*
*/
-
static VALUE
stop_result(VALUE self)
{
- return rb_attr_get(self, id_result);
+ return rb_attr_get(self, rb_intern("result"));
}
void
-InitVM_Enumerator(void)
+Init_Enumerator(void)
{
rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
@@ -1924,7 +1081,7 @@ InitVM_Enumerator(void)
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, -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);
@@ -1936,32 +1093,6 @@ InitVM_Enumerator(void)
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_define_method(rb_cEnumerator, "size", enumerator_size, 0);
-
- /* Lazy */
- rb_cLazy = rb_define_class_under(rb_cEnumerator, "Lazy", rb_cEnumerator);
- rb_define_method(rb_mEnumerable, "lazy", enumerable_lazy, 0);
- rb_define_method(rb_cLazy, "initialize", lazy_initialize, -1);
- rb_define_method(rb_cLazy, "to_enum", lazy_to_enum, -1);
- rb_define_method(rb_cLazy, "enum_for", lazy_to_enum, -1);
- rb_define_method(rb_cLazy, "map", lazy_map, 0);
- rb_define_method(rb_cLazy, "collect", lazy_map, 0);
- rb_define_method(rb_cLazy, "flat_map", lazy_flat_map, 0);
- rb_define_method(rb_cLazy, "collect_concat", lazy_flat_map, 0);
- rb_define_method(rb_cLazy, "select", lazy_select, 0);
- rb_define_method(rb_cLazy, "find_all", lazy_select, 0);
- rb_define_method(rb_cLazy, "reject", lazy_reject, 0);
- rb_define_method(rb_cLazy, "grep", lazy_grep, 1);
- rb_define_method(rb_cLazy, "zip", lazy_zip, -1);
- rb_define_method(rb_cLazy, "take", lazy_take, 1);
- rb_define_method(rb_cLazy, "take_while", lazy_take_while, 0);
- rb_define_method(rb_cLazy, "drop", lazy_drop, 1);
- rb_define_method(rb_cLazy, "drop_while", lazy_drop_while, 0);
- rb_define_method(rb_cLazy, "lazy", lazy_lazy, 0);
- rb_define_method(rb_cLazy, "chunk", lazy_super, -1);
- rb_define_method(rb_cLazy, "slice_before", lazy_super, -1);
-
- rb_define_alias(rb_cLazy, "force", "to_a");
rb_eStopIteration = rb_define_class("StopIteration", rb_eIndexError);
rb_define_method(rb_eStopIteration, "result", stop_result, 0);
@@ -1972,7 +1103,7 @@ InitVM_Enumerator(void)
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, -1);
+ rb_define_method(rb_cGenerator, "each", generator_each, 0);
/* Yielder */
rb_cYielder = rb_define_class_under(rb_cEnumerator, "Yielder", rb_cObject);
@@ -1981,31 +1112,9 @@ InitVM_Enumerator(void)
rb_define_method(rb_cYielder, "yield", yielder_yield, -2);
rb_define_method(rb_cYielder, "<<", yielder_yield_push, -2);
- rb_provide("enumerator.so"); /* for backward compatibility */
-}
-
-void
-Init_Enumerator(void)
-{
id_rewind = rb_intern("rewind");
id_each = rb_intern("each");
- id_call = rb_intern("call");
- id_size = rb_intern("size");
- id_yield = rb_intern("yield");
- id_new = rb_intern("new");
- id_initialize = rb_intern("initialize");
- id_next = rb_intern("next");
- id_result = rb_intern("result");
- id_lazy = rb_intern("lazy");
- id_eqq = rb_intern("===");
- id_receiver = rb_intern("receiver");
- id_arguments = rb_intern("arguments");
- id_memo = rb_intern("memo");
- id_method = rb_intern("method");
- id_force = rb_intern("force");
- id_to_enum = rb_intern("to_enum");
sym_each = ID2SYM(id_each);
- sym_cycle = ID2SYM(rb_intern("cycle"));
- InitVM(Enumerator);
+ rb_provide("enumerator.so"); /* for backward compatibility */
}
diff --git a/error.c b/error.c
index 3988e5645e..459b964df0 100644
--- a/error.c
+++ b/error.c
@@ -12,7 +12,6 @@
#include "ruby/ruby.h"
#include "ruby/st.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include "vm_core.h"
#include <stdio.h>
@@ -21,42 +20,17 @@
#include <stdlib.h>
#endif
#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif
-#ifndef WIFEXITED
-#define WIFEXITED(status) 1
-#endif
-
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(status) (status)
-#endif
-
extern const char ruby_description[];
-static const char REPORTBUG_MSG[] =
- "[NOTE]\n" \
- "You may have encountered a bug in the Ruby interpreter" \
- " or extension libraries.\n" \
- "Bug reports are welcome.\n" \
- ""
-#if defined __APPLE__
- "Don't forget to include the above Crash Report log file.\n"
-#endif
- "For details: http://www.ruby-lang.org/bugreport.html\n\n" \
- ;
-
static const char *
rb_strerrno(int err)
{
-#define defined_error(name, num) if (err == (num)) return (name);
+#define defined_error(name, num) if (err == num) return name;
#define undefined_error(name)
#include "known_errors.inc"
#undef defined_error
@@ -78,110 +52,84 @@ err_position_0(char *buf, long len, const char *file, int line)
}
}
-static VALUE
-compile_snprintf(rb_encoding *enc, const char *pre, const char *file, int line, const char *fmt, va_list args)
+static int
+err_position(char *buf, long len)
{
- VALUE str = rb_enc_str_new(0, 0, enc);
-
- if (file) {
- rb_str_cat2(str, file);
- if (line) rb_str_catf(str, ":%d", line);
- rb_str_cat2(str, ": ");
- }
- if (pre) rb_str_cat2(str, pre);
- rb_str_vcatf(str, fmt, args);
- return str;
+ return err_position_0(buf, len, rb_sourcefile(), rb_sourceline());
}
static void
-compile_err_append(VALUE mesg)
+err_snprintf(char *buf, long len, const char *fmt, va_list args)
{
- rb_thread_t *th = GET_THREAD();
- VALUE err = th->errinfo;
- rb_block_t *prev_base_block = th->base_block;
- th->base_block = 0;
- /* base_block should be zero while normal Ruby execution */
- /* after this line, any Ruby code *can* run */
-
- if (th->mild_compile_error) {
- if (RTEST(err)) {
- VALUE str = rb_obj_as_string(err);
+ long n;
- rb_str_cat2(str, "\n");
- rb_str_append(str, mesg);
- mesg = str;
- }
- err = rb_exc_new3(rb_eSyntaxError, mesg);
- th->errinfo = err;
+ n = err_position(buf, len);
+ if (len > n) {
+ vsnprintf((char*)buf+n, len-n, fmt, args);
}
- else {
- if (!RTEST(err)) {
- err = rb_exc_new2(rb_eSyntaxError, "compile error");
- th->errinfo = err;
- }
- rb_str_cat2(mesg, "\n");
- rb_write_error_str(mesg);
- }
-
- /* returned to the parser world */
- th->base_block = prev_base_block;
}
-void
-rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...)
+static void
+compile_snprintf(char *buf, long len, const char *file, int line, const char *fmt, va_list args)
{
- va_list args;
- VALUE str;
+ long n;
- va_start(args, fmt);
- str = compile_snprintf(enc, NULL, file, line, fmt, args);
- va_end(args);
- compile_err_append(str);
+ n = err_position_0(buf, len, file, line);
+ if (len > n) {
+ vsnprintf((char*)buf+n, len-n, fmt, args);
+ }
}
+static void err_append(const char*);
+
void
rb_compile_error(const char *file, int line, const char *fmt, ...)
{
va_list args;
- VALUE str;
+ char buf[BUFSIZ];
va_start(args, fmt);
- str = compile_snprintf(NULL, NULL, file, line, fmt, args);
+ compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
va_end(args);
- compile_err_append(str);
+ err_append(buf);
}
void
rb_compile_error_append(const char *fmt, ...)
{
va_list args;
- VALUE str;
+ char buf[BUFSIZ];
va_start(args, fmt);
- str = rb_vsprintf(fmt, args);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
- compile_err_append(str);
+ err_append(buf);
}
static void
compile_warn_print(const char *file, int line, const char *fmt, va_list args)
{
- VALUE str;
+ char buf[BUFSIZ];
+ int len;
- str = compile_snprintf(NULL, "warning: ", file, line, fmt, args);
- rb_str_cat2(str, "\n");
- rb_write_error_str(str);
+ 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];
va_list args;
if (NIL_P(ruby_verbose)) return;
+ snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
va_start(args, fmt);
- compile_warn_print(file, line, fmt, args);
+ compile_warn_print(file, line, buf, args);
va_end(args);
}
@@ -189,43 +137,42 @@ rb_compile_warn(const char *file, int line, const char *fmt, ...)
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, fmt, args);
+ compile_warn_print(file, line, buf, args);
va_end(args);
}
static void
warn_print(const char *fmt, va_list args)
{
- VALUE str = rb_str_new(0, 0);
- VALUE file = rb_sourcefilename();
-
- if (!NIL_P(file)) {
- int line = rb_sourceline();
- str = rb_str_append(str, file);
- if (line) rb_str_catf(str, ":%d", line);
- rb_str_cat2(str, ": ");
- }
+ char buf[BUFSIZ];
+ int len;
- rb_str_cat2(str, "warning: ");
- rb_str_vcatf(str, fmt, args);
- rb_str_cat2(str, "\n");
- rb_write_error_str(str);
+ err_snprintf(buf, BUFSIZ, fmt, args);
+ len = (int)strlen(buf);
+ buf[len++] = '\n';
+ rb_write_error2(buf, len);
}
void
rb_warn(const char *fmt, ...)
{
+ char buf[BUFSIZ];
va_list args;
if (NIL_P(ruby_verbose)) return;
+ snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
va_start(args, fmt);
- warn_print(fmt, args);
+ warn_print(buf, args);
va_end(args);
}
@@ -233,61 +180,60 @@ rb_warn(const char *fmt, ...)
void
rb_warning(const char *fmt, ...)
{
+ char buf[BUFSIZ];
va_list args;
if (!RTEST(ruby_verbose)) return;
+ snprintf(buf, BUFSIZ, "warning: %s", fmt);
+
va_start(args, fmt);
- warn_print(fmt, args);
+ warn_print(buf, args);
va_end(args);
}
/*
* call-seq:
- * warn(msg, ...) -> nil
- *
- * Displays each of the given messages followed by a record separator on
- * STDERR unless warnings have been disabled (for example with the
- * <code>-W0</code> flag).
+ * warn(msg) -> nil
*
- * warn("warning 1", "warning 2")
- *
- * <em>produces:</em>
- *
- * warning 1
- * warning 2
+ * Display the given message (followed by a newline) on STDERR unless
+ * warnings are disabled (for example with the <code>-W0</code> flag).
*/
static VALUE
-rb_warn_m(int argc, VALUE *argv, VALUE exc)
+rb_warn_m(VALUE self, VALUE mesg)
{
- if (!NIL_P(ruby_verbose) && argc > 0) {
- rb_io_puts(argc, argv, rb_stderr);
+ if (!NIL_P(ruby_verbose)) {
+ rb_io_write(rb_stderr, mesg);
+ rb_io_write(rb_stderr, rb_default_rs);
}
return Qnil;
}
+void rb_vm_bugreport(void);
+
static void
report_bug(const char *file, int line, const char *fmt, va_list args)
{
- /* SIGSEGV handler might have a very small stack. Thus we need to use it carefully. */
- char buf[256];
+ char buf[BUFSIZ];
FILE *out = stderr;
- int len = err_position_0(buf, 256, file, line);
+ 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) {
fputs("[BUG] ", out);
- vsnprintf(buf, 256, fmt, args);
- fputs(buf, out);
- snprintf(buf, 256, "\n%s\n\n", ruby_description);
- fputs(buf, out);
-
+ vfprintf(out, fmt, args);
+ fprintf(out, "\n%s\n\n", ruby_description);
rb_vm_bugreport();
- fprintf(out, REPORTBUG_MSG);
+ 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");
}
}
@@ -295,19 +241,12 @@ void
rb_bug(const char *fmt, ...)
{
va_list args;
- const char *file = NULL;
- int line = 0;
-
- if (GET_THREAD()) {
- file = rb_sourcefile();
- line = rb_sourceline();
- }
va_start(args, fmt);
- report_bug(file, line, fmt, args);
+ report_bug(rb_sourcefile(), rb_sourceline(), fmt, args);
va_end(args);
-#if defined(_WIN32) && defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 80
+#if defined(_WIN32) && defined(RT_VER) && RT_VER >= 80
_set_abort_behavior( 0, _CALL_REPORTFAULT);
#endif
@@ -328,37 +267,6 @@ rb_bug_errno(const char *mesg, int errno_arg)
}
}
-/*
- * this is safe to call inside signal handler and timer thread
- * (which isn't a Ruby Thread object)
- */
-#define write_or_abort(fd, str, len) (write((fd), (str), (len)) < 0 ? abort() : (void)0)
-#define WRITE_CONST(fd,str) write_or_abort((fd),(str),sizeof(str) - 1)
-
-void
-rb_async_bug_errno(const char *mesg, int errno_arg)
-{
- WRITE_CONST(2, "[ASYNC BUG] ");
- write_or_abort(2, mesg, strlen(mesg));
- WRITE_CONST(2, "\n");
-
- if (errno_arg == 0) {
- WRITE_CONST(2, "errno == 0 (NOERROR)\n");
- }
- else {
- const char *errno_str = rb_strerrno(errno_arg);
-
- if (!errno_str)
- errno_str = "undefined errno";
- write_or_abort(2, errno_str, strlen(errno_str));
- }
- WRITE_CONST(2, "\n\n");
- write_or_abort(2, ruby_description, strlen(ruby_description));
- WRITE_CONST(2, "\n\n");
- WRITE_CONST(2, REPORTBUG_MSG);
- abort();
-}
-
void
rb_compile_bug(const char *file, int line, const char *fmt, ...)
{
@@ -371,79 +279,41 @@ rb_compile_bug(const char *file, int line, const char *fmt, ...)
abort();
}
-static const char builtin_types[][10] = {
- "", /* 0x00, */
- "Object",
- "Class",
- "Module",
- "Float",
- "String",
- "Regexp",
- "Array",
- "Hash",
- "Struct",
- "Bignum",
- "File",
- "Data", /* internal use: wrapped C pointers */
- "MatchData", /* data of $~ */
- "Complex",
- "Rational",
- "", /* 0x10 */
- "nil",
- "true",
- "false",
- "Symbol", /* :symbol */
- "Fixnum",
- "", /* 0x16 */
- "", /* 0x17 */
- "", /* 0x18 */
- "", /* 0x19 */
- "", /* 0x1a */
- "undef", /* internal use: #undef; should not happen */
- "Node", /* internal use: syntax tree node */
- "iClass", /* internal use: mixed-in module holder */
-};
-
-const char *
-rb_builtin_type_name(int t)
-{
+static const struct types {
+ int type;
const char *name;
- if ((unsigned int)t >= numberof(builtin_types)) return 0;
- name = builtin_types[t];
- if (*name) return name;
- return 0;
-}
-
-#define builtin_class_name rb_builtin_class_name
-const char *
-rb_builtin_class_name(VALUE x)
-{
- const char *etype;
-
- if (NIL_P(x)) {
- etype = "nil";
- }
- else if (FIXNUM_P(x)) {
- etype = "Fixnum";
- }
- else if (SYMBOL_P(x)) {
- etype = "Symbol";
- }
- else if (RB_TYPE_P(x, T_TRUE)) {
- etype = "true";
- }
- else if (RB_TYPE_P(x, T_FALSE)) {
- etype = "false";
- }
- else {
- etype = rb_obj_classname(x);
- }
- return etype;
-}
+} builtin_types[] = {
+ {T_NIL, "nil"},
+ {T_OBJECT, "Object"},
+ {T_CLASS, "Class"},
+ {T_ICLASS, "iClass"}, /* internal use: mixed-in module holder */
+ {T_MODULE, "Module"},
+ {T_FLOAT, "Float"},
+ {T_STRING, "String"},
+ {T_REGEXP, "Regexp"},
+ {T_ARRAY, "Array"},
+ {T_FIXNUM, "Fixnum"},
+ {T_HASH, "Hash"},
+ {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_NODE, "Node"}, /* internal use: syntax tree node */
+ {T_UNDEF, "undef"}, /* internal use: #undef; should not happen */
+};
void
rb_check_type(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;
if (x == Qundef) {
@@ -452,33 +322,40 @@ rb_check_type(VALUE x, int t)
xt = TYPE(x);
if (xt != t || (xt == T_DATA && RTYPEDDATA_P(x))) {
- const char *tname = rb_builtin_type_name(t);
- if (tname) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
- builtin_class_name(x), tname);
- }
- if (xt > T_MASK && xt <= 0x3f) {
- rb_fatal("unknown type 0x%x (0x%x given, probably comes from extension library for ruby 1.8)", t, xt);
+ while (type < typeend) {
+ if (type->type == t) {
+ const char *etype;
+
+ if (NIL_P(x)) {
+ etype = "nil";
+ }
+ else if (FIXNUM_P(x)) {
+ etype = "Fixnum";
+ }
+ else if (SYMBOL_P(x)) {
+ etype = "Symbol";
+ }
+ else if (rb_special_const_p(x)) {
+ x = rb_obj_as_string(x);
+ etype = StringValuePtr(x);
+ }
+ else {
+ etype = rb_obj_classname(x);
+ }
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
+ etype, type->name);
+ }
+ type++;
}
- rb_bug("unknown type 0x%x (0x%x given)", t, xt);
+ rb_bug("unknown type 0x%x (0x%x given)", t, TYPE(x));
}
}
int
-rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent)
-{
- while (child) {
- if (child == parent) return 1;
- child = child->parent;
- }
- return 0;
-}
-
-int
rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type)
{
- if (!RB_TYPE_P(obj, T_DATA) ||
- !RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
+ if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA ||
+ !RTYPEDDATA_P(obj) || RTYPEDDATA_TYPE(obj) != data_type) {
return 0;
}
return 1;
@@ -490,15 +367,14 @@ 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 (!RB_TYPE_P(obj, T_DATA)) {
- etype = builtin_class_name(obj);
- rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
+ 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);
}
- else if (!rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
+ 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);
}
@@ -614,11 +490,10 @@ static VALUE
exc_to_s(VALUE exc)
{
VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
- VALUE r = Qnil;
if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
- r = rb_String(mesg);
- return r;
+ if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
+ return mesg;
}
/*
@@ -641,7 +516,7 @@ exc_message(VALUE exc)
* call-seq:
* exception.inspect -> string
*
- * Return this exception's class name and message
+ * Return this exception's class name an message
*/
static VALUE
@@ -698,17 +573,9 @@ static VALUE
exc_backtrace(VALUE exc)
{
ID bt;
- VALUE obj;
CONST_ID(bt, "bt");
- obj = rb_attr_get(exc, bt);
-
- if (rb_backtrace_p(obj)) {
- obj = rb_backtrace_to_str_ary(obj);
- /* rb_iv_set(exc, "bt", obj); */
- }
-
- return obj;
+ return rb_attr_get(exc, bt);
}
VALUE
@@ -718,13 +585,14 @@ rb_check_backtrace(VALUE bt)
static const char err[] = "backtrace must be Array of String";
if (!NIL_P(bt)) {
- if (RB_TYPE_P(bt, T_STRING)) return rb_ary_new3(1, bt);
- if (rb_backtrace_p(bt)) return bt;
- if (!RB_TYPE_P(bt, T_ARRAY)) {
+ int t = TYPE(bt);
+
+ if (t == T_STRING) return rb_ary_new3(1, bt);
+ if (t != T_ARRAY) {
rb_raise(rb_eTypeError, err);
}
for (i=0;i<RARRAY_LEN(bt);i++) {
- if (!RB_TYPE_P(RARRAY_PTR(bt)[i], T_STRING)) {
+ if (TYPE(RARRAY_PTR(bt)[i]) != T_STRING) {
rb_raise(rb_eTypeError, err);
}
}
@@ -734,11 +602,11 @@ rb_check_backtrace(VALUE bt)
/*
* call-seq:
- * exc.set_backtrace(backtrace) -> array
+ * exc.set_backtrace(array) -> array
*
- * Sets the backtrace information associated with +exc+. The +backtrace+ must
- * be an array of String objects or a single String in the format described
- * in Exception#backtrace.
+ * 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>.
*
*/
@@ -748,20 +616,6 @@ exc_set_backtrace(VALUE exc, VALUE bt)
return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
}
-VALUE
-rb_exc_set_backtrace(VALUE exc, VALUE bt)
-{
- return exc_set_backtrace(exc, bt);
-}
-
-static VALUE
-try_convert_to_exception(VALUE obj)
-{
- ID id_exception;
- CONST_ID(id_exception, "exception");
- return rb_check_funcall(obj, id_exception, 0, 0);
-}
-
/*
* call-seq:
* exc == obj -> true or false
@@ -781,17 +635,10 @@ exc_equal(VALUE exc, VALUE obj)
CONST_ID(id_mesg, "mesg");
if (rb_obj_class(exc) != rb_obj_class(obj)) {
- int status = 0;
ID id_message, id_backtrace;
CONST_ID(id_message, "message");
CONST_ID(id_backtrace, "backtrace");
- obj = rb_protect(try_convert_to_exception, obj, &status);
- if (status || obj == Qundef) {
- rb_set_errinfo(Qnil);
- return Qfalse;
- }
- if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse;
mesg = rb_check_funcall(obj, id_message, 0, 0);
if (mesg == Qundef) return Qfalse;
backtrace = rb_check_funcall(obj, id_backtrace, 0, 0);
@@ -811,52 +658,18 @@ exc_equal(VALUE exc, VALUE obj)
/*
* call-seq:
- * SystemExit.new -> system_exit
- * SystemExit.new(status) -> system_exit
- * SystemExit.new(status, msg) -> system_exit
- * SystemExit.new(msg) -> system_exit
- *
- * Create a new +SystemExit+ exception with the given status and message.
- * Status is true, false, or an integer.
- * If status is not given, true is used.
+ * SystemExit.new(status=0) -> system_exit
+ *
+ * Create a new +SystemExit+ exception with the given status.
*/
static VALUE
exit_initialize(int argc, VALUE *argv, VALUE exc)
{
- VALUE status;
- if (argc > 0) {
- status = *argv;
-
- switch (status) {
- case Qtrue:
- status = INT2FIX(EXIT_SUCCESS);
- ++argv;
- --argc;
- break;
- case Qfalse:
- status = INT2FIX(EXIT_FAILURE);
- ++argv;
- --argc;
- break;
- default:
- status = rb_check_to_int(status);
- if (NIL_P(status)) {
- status = INT2FIX(EXIT_SUCCESS);
- }
- else {
-#if EXIT_SUCCESS != 0
- if (status == INT2FIX(0))
- status = INT2FIX(EXIT_SUCCESS);
-#endif
- ++argv;
- --argc;
- }
- break;
- }
- }
- else {
- status = INT2FIX(EXIT_SUCCESS);
+ VALUE status = INT2FIX(EXIT_SUCCESS);
+ if (argc > 0 && FIXNUM_P(argv[0])) {
+ status = *argv++;
+ --argc;
}
rb_call_super(argc, argv);
rb_iv_set(exc, "status", status);
@@ -888,15 +701,9 @@ exit_status(VALUE exc)
static VALUE
exit_success_p(VALUE exc)
{
- VALUE status_val = rb_attr_get(exc, rb_intern("status"));
- int status;
-
- if (NIL_P(status_val))
- return Qtrue;
- status = NUM2INT(status_val);
- if (WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS)
- return Qtrue;
-
+ VALUE status = rb_attr_get(exc, rb_intern("status"));
+ if (NIL_P(status)) return Qtrue;
+ if (status == INT2FIX(EXIT_SUCCESS)) return Qtrue;
return Qfalse;
}
@@ -915,21 +722,6 @@ rb_name_error(ID id, const char *fmt, ...)
rb_exc_raise(exc);
}
-void
-rb_name_error_str(VALUE str, const char *fmt, ...)
-{
- VALUE exc, argv[2];
- va_list args;
-
- va_start(args, fmt);
- argv[0] = rb_vsprintf(fmt, args);
- va_end(args);
-
- argv[1] = str;
- exc = rb_class_new_instance(2, argv, rb_eNameError);
- rb_exc_raise(exc);
-}
-
/*
* call-seq:
* NameError.new(msg [, name]) -> name_error
@@ -978,7 +770,11 @@ name_err_to_s(VALUE exc)
if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
StringValue(str);
- return str;
+ if (str != mesg) {
+ rb_iv_set(exc, "mesg", mesg = str);
+ }
+ if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
+ return mesg;
}
/*
@@ -1020,11 +816,9 @@ name_err_mesg_memsize(const void *p)
static const rb_data_type_t name_err_mesg_data_type = {
"name_err_mesg",
- {
- name_err_mesg_mark,
- name_err_mesg_free,
- name_err_mesg_memsize,
- },
+ name_err_mesg_mark,
+ name_err_mesg_free,
+ name_err_mesg_memsize,
};
/* :nodoc: */
@@ -1076,23 +870,20 @@ name_err_mesg_to_str(VALUE obj)
else {
const char *desc = 0;
VALUE d = 0, args[NAME_ERR_MESG_COUNT];
- int state = 0;
obj = ptr[1];
- switch (obj) {
- case Qnil:
+ switch (TYPE(obj)) {
+ case T_NIL:
desc = "nil";
break;
- case Qtrue:
+ case T_TRUE:
desc = "true";
break;
- case Qfalse:
+ case T_FALSE:
desc = "false";
break;
default:
- d = rb_protect(rb_inspect, obj, &state);
- if (state)
- rb_set_errinfo(Qnil);
+ d = rb_protect(rb_inspect, obj, 0);
if (NIL_P(d) || RSTRING_LEN(d) > 65) {
d = rb_any_to_s(obj);
}
@@ -1102,25 +893,19 @@ name_err_mesg_to_str(VALUE obj)
if (desc && desc[0] != '#') {
d = d ? rb_str_dup(d) : rb_str_new2(desc);
rb_str_cat2(d, ":");
- rb_str_append(d, rb_class_name(CLASS_OF(obj)));
+ rb_str_cat2(d, rb_obj_classname(obj));
}
args[0] = mesg;
args[1] = ptr[2];
args[2] = d;
mesg = rb_f_sprintf(NAME_ERR_MESG_COUNT, args);
}
+ if (OBJ_TAINTED(obj)) OBJ_TAINT(mesg);
return mesg;
}
/* :nodoc: */
static VALUE
-name_err_mesg_dump(VALUE obj, VALUE limit)
-{
- return name_err_mesg_to_str(obj);
-}
-
-/* :nodoc: */
-static VALUE
name_err_mesg_load(VALUE klass, VALUE str)
{
return str;
@@ -1143,9 +928,9 @@ nometh_err_args(VALUE self)
void
rb_invalid_str(const char *str, const char *type)
{
- VALUE s = rb_str_new2(str);
+ volatile VALUE s = rb_str_inspect(rb_str_new2(str));
- rb_raise(rb_eArgError, "invalid value for %s: %+"PRIsVALUE, type, s);
+ rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING_PTR(s));
}
/*
@@ -1184,7 +969,7 @@ static st_table *syserr_tbl;
static VALUE
set_syserr(int n, const char *name)
{
- st_data_t error;
+ VALUE error;
if (!st_lookup(syserr_tbl, n, &error)) {
error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
@@ -1200,7 +985,7 @@ set_syserr(int n, const char *name)
static VALUE
get_syserr(int n)
{
- st_data_t error;
+ VALUE error;
if (!st_lookup(syserr_tbl, n, &error)) {
char name[8]; /* some Windows' errno have 5 digits. */
@@ -1233,15 +1018,13 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
VALUE klass = rb_obj_class(self);
if (klass == rb_eSystemCallError) {
- st_data_t data = (st_data_t)klass;
rb_scan_args(argc, argv, "11", &mesg, &error);
if (argc == 1 && FIXNUM_P(mesg)) {
error = mesg; mesg = Qnil;
}
- if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &data)) {
- klass = (VALUE)data;
+ if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &klass)) {
/* change class */
- if (!RB_TYPE_P(self, T_OBJECT)) { /* insurance to avoid type crash */
+ if (TYPE(self) != T_OBJECT) { /* insurance to avoid type crash */
rb_raise(rb_eTypeError, "invalid instance type");
}
RBASIC(self)->klass = klass;
@@ -1254,21 +1037,16 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
if (!NIL_P(error)) err = strerror(NUM2INT(error));
else err = "unknown error";
if (!NIL_P(mesg)) {
- rb_encoding *le = rb_locale_encoding();
- VALUE str = StringValue(mesg);
- rb_encoding *me = rb_enc_get(mesg);
-
- mesg = rb_sprintf("%s - %"PRIsVALUE, err, mesg);
- if (le != me && rb_enc_asciicompat(me)) {
- le = me;
- }/* else assume err is non ASCII string. */
- OBJ_INFECT(mesg, str);
- rb_enc_associate(mesg, le);
+ VALUE str = mesg;
+
+ StringValue(str);
+ mesg = rb_sprintf("%s - %.*s", err,
+ (int)RSTRING_LEN(str), RSTRING_PTR(str));
}
else {
mesg = rb_str_new2(err);
- rb_enc_associate(mesg, rb_locale_encoding());
}
+ rb_enc_associate(mesg, rb_locale_encoding());
rb_call_super(1, &mesg);
rb_iv_set(self, "errno", error);
return self;
@@ -1354,7 +1132,6 @@ syserr_eqq(VALUE self, VALUE exc)
*
* begin
* Process.kill('HUP',Process.pid)
- * sleep # wait for receiver to handle signal sent by Process.kill
* rescue SignalException => e
* puts "received Exception #{e}"
* end
@@ -1396,7 +1173,7 @@ syserr_eqq(VALUE self, VALUE exc)
*
* <em>raises the exception:</em>
*
- * TypeError: no implicit conversion of String into Integer
+ * TypeError: can't convert String into Integer
*
*/
@@ -1602,12 +1379,6 @@ syserr_eqq(VALUE self, VALUE exc)
*/
/*
- * Document-class: EncodingError
- *
- * EncodingError is the base class for encoding errors.
- */
-
-/*
* Document-class: Encoding::CompatibilityError
*
* Raised by Encoding and String methods when the source encoding is
@@ -1615,91 +1386,14 @@ syserr_eqq(VALUE self, VALUE exc)
*/
/*
- * Document-class: fatal
- *
- * fatal is an Exception that is raised when ruby has encountered a fatal
- * error and must exit. You are not able to rescue fatal.
- */
-
-/*
- * Document-class: NameError::message
- * :nodoc:
- */
-
-/*
- * Descendants of class Exception are used to communicate between
- * Kernel#raise and +rescue+ statements in <code>begin ... end</code> blocks.
- * Exception objects carry information about the exception -- its type (the
- * exception's class name), an optional descriptive string, and optional
- * traceback information. Exception subclasses may add additional
- * information like NameError#name.
- *
- * Programs may make subclasses of Exception, typically of StandardError or
- * RuntimeError, to provide custom classes and add additional information.
- * See the subclass list below for defaults for +raise+ and +rescue+.
- *
- * When an exception has been raised but not yet handled (in +rescue+,
- * +ensure+, +at_exit+ and +END+ blocks) the global variable <code>$!</code>
- * will contain the current exception and <code>$@</code> contains the
- * current exception's backtrace.
- *
- * It is recommended that a library should have one subclass of StandardError
- * or RuntimeError and have specific exception types inherit from it. This
- * allows the user to rescue a generic exception type to catch all exceptions
- * the library may raise even if future versions of the library add new
- * exception subclasses.
- *
- * For example:
- *
- * class MyLibrary
- * class Error < RuntimeError
- * end
- *
- * class WidgetError < Error
- * end
- *
- * class FrobError < Error
- * end
- *
- * end
- *
- * To handle both WidgetError and FrobError the library user can rescue
- * MyLibrary::Error.
- *
- * The built-in subclasses of Exception are:
- *
- * * NoMemoryError
- * * ScriptError
- * * LoadError
- * * NotImplementedError
- * * SyntaxError
- * * SecurityError
- * * SignalException
- * * Interrupt
- * * StandardError -- default for +rescue+
- * * ArgumentError
- * * EncodingError
- * * FiberError
- * * IOError
- * * EOFError
- * * IndexError
- * * KeyError
- * * StopIteration
- * * LocalJumpError
- * * NameError
- * * NoMethodError
- * * RangeError
- * * FloatDomainError
- * * RegexpError
- * * RuntimeError -- default for +raise+
- * * SystemCallError
- * * Errno::*
- * * ThreadError
- * * TypeError
- * * ZeroDivisionError
- * * SystemExit
- * * SystemStackError
- * * fatal -- impossible to rescue
+ * Descendants 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
+ * <code>Exception</code>, or more typically <code>StandardError</code>
+ * to provide custom classes and add additional information.
*/
void
@@ -1734,10 +1428,7 @@ Init_Exception(void)
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_attr(rb_eLoadError, rb_intern("path"), 1, 0, Qfalse);
-
rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
rb_eNameError = rb_define_class("NameError", rb_eStandardError);
@@ -1748,7 +1439,7 @@ Init_Exception(void)
rb_define_singleton_method(rb_cNameErrorMesg, "!", rb_name_err_mesg_new, NAME_ERR_MESG_COUNT);
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_dump, 1);
+ rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_to_str, 1);
rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
rb_eNoMethodError = rb_define_class("NoMethodError", rb_eNameError);
rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
@@ -1768,20 +1459,7 @@ Init_Exception(void)
rb_mErrno = rb_define_module("Errno");
- rb_define_global_function("warn", rb_warn_m, -1);
-}
-
-void
-rb_enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
-{
- va_list args;
- VALUE mesg;
-
- va_start(args, fmt);
- mesg = rb_enc_vsprintf(enc, fmt, args);
- va_end(args);
-
- rb_exc_raise(rb_exc_new3(exc, mesg));
+ rb_define_global_function("warn", rb_warn_m, 1);
}
void
@@ -1796,16 +1474,6 @@ rb_raise(VALUE exc, const char *fmt, ...)
rb_exc_raise(rb_exc_new3(exc, mesg));
}
-NORETURN(static void raise_loaderror(VALUE path, VALUE mesg));
-
-static void
-raise_loaderror(VALUE path, VALUE mesg)
-{
- VALUE err = rb_exc_new3(rb_eLoadError, mesg);
- rb_ivar_set(err, rb_intern("@path"), path);
- rb_exc_raise(err);
-}
-
void
rb_loaderror(const char *fmt, ...)
{
@@ -1815,19 +1483,7 @@ rb_loaderror(const char *fmt, ...)
va_start(args, fmt);
mesg = rb_enc_vsprintf(rb_locale_encoding(), fmt, args);
va_end(args);
- raise_loaderror(Qnil, mesg);
-}
-
-void
-rb_loaderror_with_path(VALUE path, const char *fmt, ...)
-{
- va_list args;
- VALUE mesg;
-
- va_start(args, fmt);
- mesg = rb_enc_vsprintf(rb_locale_encoding(), fmt, args);
- va_end(args);
- raise_loaderror(path, mesg);
+ rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg));
}
void
@@ -1855,67 +1511,24 @@ static VALUE
make_errno_exc(const char *mesg)
{
int n = errno;
+ VALUE arg;
errno = 0;
if (n == 0) {
rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : "");
}
- return rb_syserr_new(n, mesg);
-}
-static VALUE
-make_errno_exc_str(VALUE mesg)
-{
- int n = errno;
-
- errno = 0;
- if (!mesg) mesg = Qnil;
- if (n == 0) {
- const char *s = !NIL_P(mesg) ? RSTRING_PTR(mesg) : "";
- rb_bug("rb_sys_fail_str(%s) - errno == 0", s);
- }
- return rb_syserr_new_str(n, mesg);
-}
-
-VALUE
-rb_syserr_new(int n, const char *mesg)
-{
- VALUE arg;
arg = mesg ? rb_str_new2(mesg) : Qnil;
- return rb_syserr_new_str(n, arg);
-}
-
-VALUE
-rb_syserr_new_str(int n, VALUE arg)
-{
return rb_class_new_instance(1, &arg, get_syserr(n));
}
void
-rb_syserr_fail(int e, const char *mesg)
-{
- rb_exc_raise(rb_syserr_new(e, mesg));
-}
-
-void
-rb_syserr_fail_str(int e, VALUE mesg)
-{
- rb_exc_raise(rb_syserr_new_str(e, mesg));
-}
-
-void
rb_sys_fail(const char *mesg)
{
rb_exc_raise(make_errno_exc(mesg));
}
void
-rb_sys_fail_str(VALUE mesg)
-{
- rb_exc_raise(make_errno_exc_str(mesg));
-}
-
-void
rb_mod_sys_fail(VALUE mod, const char *mesg)
{
VALUE exc = make_errno_exc(mesg);
@@ -1924,30 +1537,6 @@ rb_mod_sys_fail(VALUE mod, const char *mesg)
}
void
-rb_mod_sys_fail_str(VALUE mod, VALUE mesg)
-{
- VALUE exc = make_errno_exc_str(mesg);
- rb_extend_object(exc, mod);
- rb_exc_raise(exc);
-}
-
-void
-rb_mod_syserr_fail(VALUE mod, int e, const char *mesg)
-{
- VALUE exc = rb_syserr_new(e, mesg);
- rb_extend_object(exc, mod);
- rb_exc_raise(exc);
-}
-
-void
-rb_mod_syserr_fail_str(VALUE mod, int e, VALUE mesg)
-{
- VALUE exc = rb_syserr_new_str(e, mesg);
- rb_extend_object(exc, mod);
- rb_exc_raise(exc);
-}
-
-void
rb_sys_warning(const char *fmt, ...)
{
char buf[BUFSIZ];
@@ -1968,12 +1557,9 @@ rb_sys_warning(const char *fmt, ...)
}
void
-rb_load_fail(VALUE path, const char *err)
+rb_load_fail(const char *path)
{
- VALUE mesg = rb_str_buf_new_cstr(err);
- rb_str_cat2(mesg, " -- ");
- rb_str_append(mesg, path); /* should be ASCII compatible */
- raise_loaderror(path, mesg);
+ rb_loaderror("%s -- %s", strerror(errno), path);
}
void
@@ -1982,51 +1568,48 @@ rb_error_frozen(const char *what)
rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
}
-#undef rb_check_frozen
void
rb_check_frozen(VALUE obj)
{
- rb_check_frozen_internal(obj);
+ if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
}
void
-rb_error_untrusted(VALUE obj)
+Init_syserr(void)
{
- if (rb_safe_level() >= 4) {
- rb_raise(rb_eSecurityError, "Insecure: can't modify %s",
- rb_obj_classname(obj));
- }
+ rb_eNOERROR = set_syserr(0, "NOERROR");
+#define defined_error(name, num) set_syserr(num, name);
+#define undefined_error(name) set_syserr(0, name);
+#include "known_errors.inc"
+#undef defined_error
+#undef undefined_error
}
-#undef rb_check_trusted
-void
-rb_check_trusted(VALUE obj)
+static void
+err_append(const char *s)
{
- rb_check_trusted_internal(obj);
-}
+ rb_thread_t *th = GET_THREAD();
+ VALUE err = th->errinfo;
-void
-rb_check_copyable(VALUE obj, VALUE orig)
-{
- if (!FL_ABLE(obj)) return;
- rb_check_frozen_internal(obj);
- rb_check_trusted_internal(obj);
- if (!FL_ABLE(orig)) return;
- if ((~RBASIC(obj)->flags & RBASIC(orig)->flags) & (FL_UNTRUSTED|FL_TAINT)) {
- if (rb_safe_level() > 0) {
- rb_raise(rb_eSecurityError, "Insecure: can't modify %"PRIsVALUE,
- RBASIC(obj)->klass);
+ if (th->mild_compile_error) {
+ if (!RTEST(err)) {
+ err = rb_exc_new2(rb_eSyntaxError, s);
+ th->errinfo = err;
}
- }
-}
+ else {
+ VALUE str = rb_obj_as_string(err);
-void
-Init_syserr(void)
-{
- rb_eNOERROR = set_syserr(0, "NOERROR");
-#define defined_error(name, num) set_syserr((num), (name));
-#define undefined_error(name) set_syserr(0, (name));
-#include "known_errors.inc"
-#undef defined_error
-#undef undefined_error
+ rb_str_cat2(str, "\n");
+ rb_str_cat2(str, s);
+ th->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 453795d7b8..a2516f9ec9 100644
--- a/eval.c
+++ b/eval.c
@@ -16,16 +16,14 @@
#include "gc.h"
#include "ruby/vm.h"
#include "ruby/encoding.h"
-#include "internal.h"
-#include "vm_core.h"
-#include "probes_helper.h"
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+VALUE proc_invoke(VALUE, VALUE, VALUE, VALUE);
+VALUE rb_binding_new(void);
NORETURN(void rb_raise_jump(VALUE));
-NODE *rb_vm_get_cref(const rb_iseq_t *, const VALUE *);
-
+ID rb_frame_callee(void);
VALUE rb_eLocalJumpError;
VALUE rb_eSysStackError;
@@ -34,18 +32,23 @@ VALUE rb_eSysStackError;
#include "eval_error.c"
#include "eval_jump.c"
-/* Initializes the Ruby VM and builtin libraries.
- * @retval 0 if succeeded.
- * @retval non-zero an error occured.
- */
-int
-ruby_setup(void)
+/* initialize ruby */
+
+void rb_clear_trace_func(void);
+void rb_thread_stop_timer_thread(void);
+
+void rb_call_inits(void);
+void Init_heap(void);
+void Init_BareVM(void);
+
+void
+ruby_init(void)
{
static int initialized = 0;
int state;
if (initialized)
- return 0;
+ return;
initialized = 1;
ruby_init_stack((void *)&state);
@@ -56,37 +59,18 @@ ruby_setup(void)
if ((state = EXEC_TAG()) == 0) {
rb_call_inits();
ruby_prog_init();
- GET_VM()->running = 1;
}
POP_TAG();
- return state;
-}
-
-/* Calls ruby_setup() and check error.
- *
- * Prints errors and calls exit(3) if an error occured.
- */
-void
-ruby_init(void)
-{
- int state = ruby_setup();
if (state) {
error_print();
exit(EXIT_FAILURE);
}
+ GET_VM()->running = 1;
}
-/*! Processes command line arguments and compiles the Ruby source to execute.
- *
- * This function does:
- * \li Processses the given command line flags and arguments for ruby(1)
- * \li compiles the source code from the given argument, -e or stdin, and
- * \li returns the compiled source as an opaque pointer to an internal data structure
- *
- * @return an opaque pointer to the compiled source or an internal special value.
- * @sa ruby_executable_node().
- */
+extern void rb_clear_trace_func(void);
+
void *
ruby_options(int argc, char **argv)
{
@@ -127,13 +111,6 @@ ruby_finalize_1(void)
rb_gc_call_finalizer_at_exit();
}
-/** Runs the VM finalization processes.
- *
- * <code>END{}</code> and procs registered by <code>Kernel.#at_exit</code> are
- * executed here. See the Ruby language spec for more details.
- *
- * @note This function is allowed to raise an exception if an error occurred.
- */
void
ruby_finalize(void)
{
@@ -141,16 +118,8 @@ ruby_finalize(void)
ruby_finalize_1();
}
-/** Destructs the VM.
- *
- * Runs the VM finalization processes as well as ruby_finalize(), and frees
- * resources used by the VM.
- *
- * @param ex Default value to the return value.
- * @return If an error occured returns a non-zero. If otherwise, returns the
- * given ex.
- * @note This function does not raise any exception.
- */
+void rb_thread_stop_timer_thread(void);
+
int
ruby_cleanup(volatile int ex)
{
@@ -158,12 +127,14 @@ ruby_cleanup(volatile int ex)
volatile VALUE errs[2];
rb_thread_t *th = GET_THREAD();
int nerr;
+ void rb_threadptr_interrupt(rb_thread_t *th);
+ void rb_threadptr_check_signal(rb_thread_t *mth);
rb_threadptr_interrupt(th);
rb_threadptr_check_signal(th);
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
- SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(th); });
+ SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(); });
}
POP_TAG();
@@ -177,9 +148,6 @@ ruby_cleanup(volatile int ex)
}
POP_TAG();
- /* protect from Thread#raise */
- th->status = THREAD_KILLED;
-
errs[0] = th->errinfo;
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
@@ -191,22 +159,8 @@ ruby_cleanup(volatile int ex)
th->errinfo = errs[1];
ex = error_handle(ex);
ruby_finalize_1();
-
- /* unlock again if finalizer took mutexes. */
- rb_threadptr_unlock_all_locking_mutexes(GET_THREAD());
POP_TAG();
- rb_thread_stop_timer_thread(1);
-
-#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
- switch (ex) {
-#if EXIT_SUCCESS != 0
- case 0: ex = EXIT_SUCCESS; break;
-#endif
-#if EXIT_FAILURE != 1
- case 1: ex = EXIT_FAILURE; break;
-#endif
- }
-#endif
+ rb_thread_stop_timer_thread();
state = 0;
for (nerr = 0; nerr < numberof(errs); ++nerr) {
@@ -215,24 +169,34 @@ ruby_cleanup(volatile int ex)
if (!RTEST(err)) continue;
/* th->errinfo contains a NODE while break'ing */
- if (RB_TYPE_P(err, T_NODE)) continue;
+ if (TYPE(err) == T_NODE) continue;
if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
- ex = sysexit_status(err);
- break;
+ return sysexit_status(err);
}
else if (rb_obj_is_kind_of(err, rb_eSignal)) {
VALUE sig = rb_iv_get(err, "signo");
state = NUM2INT(sig);
break;
}
- else if (ex == EXIT_SUCCESS) {
- ex = EXIT_FAILURE;
+ else if (ex == 0) {
+ ex = 1;
}
}
ruby_vm_destruct(GET_VM());
if (state) ruby_default_signal(state);
+#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
+ switch (ex) {
+#if EXIT_SUCCESS != 0
+ case 0: return EXIT_SUCCESS;
+#endif
+#if EXIT_FAILURE != 1
+ case 1: return EXIT_FAILURE;
+#endif
+ }
+#endif
+
return ex;
}
@@ -256,25 +220,12 @@ ruby_exec_internal(void *n)
return state;
}
-/*! Calls ruby_cleanup() and exits the process */
void
ruby_stop(int ex)
{
exit(ruby_cleanup(ex));
}
-/*! Checks the return value of ruby_options().
- * @param n return value of ruby_options().
- * @param status pointer to the exit status of this process.
- *
- * ruby_options() sometimes returns a special value to indicate this process
- * should immediately exit. This function checks if the case. Also stores the
- * exit status that the caller have to pass to exit(3) into
- * <code>*status</code>.
- *
- * @retval non-zero if the given opaque pointer is actually a compiled source.
- * @retval 0 if the given value is such a special value.
- */
int
ruby_executable_node(void *n, int *status)
{
@@ -292,10 +243,6 @@ ruby_executable_node(void *n, int *status)
return FALSE;
}
-/*! Runs the given compiled source and exits this process.
- * @retval 0 if successfully run thhe source
- * @retval non-zero if an error occurred.
-*/
int
ruby_run_node(void *n)
{
@@ -307,7 +254,6 @@ ruby_run_node(void *n)
return ruby_cleanup(ruby_exec_node(n));
}
-/*! Runs the given compiled source */
int
ruby_exec_node(void *n)
{
@@ -350,23 +296,15 @@ rb_mod_nesting(void)
/*
* call-seq:
* Module.constants -> array
- * Module.constants(inherited) -> array
*
- * In the first form, returns an array of the names of all
- * constants accessible from the point of call.
- * This list includes the names of all modules and classes
- * defined in the global scope.
+ * Returns an array of the names of all constants defined in the
+ * system. This list includes the names of all modules and classes.
*
- * Module.constants.first(4)
- * # => [:ARGF, :ARGV, :ArgumentError, :Array]
+ * p Module.constants.sort[1..5]
*
- * Module.constants.include?(:SEEK_SET) # => false
- *
- * class IO
- * Module.constants.include?(:SEEK_SET) # => true
- * end
+ * <em>produces:</em>
*
- * The second form calls the instance method +constants+.
+ * ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
*/
static VALUE
@@ -377,14 +315,13 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
VALUE cbase = 0;
void *data = 0;
- if (argc > 0 || mod != rb_cModule) {
- return rb_mod_constants(argc, argv, mod);
+ if (argc > 0) {
+ return rb_mod_constants(argc, argv, rb_cModule);
}
while (cref) {
klass = cref->nd_clss;
- if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
- !NIL_P(klass)) {
+ if (!NIL_P(klass)) {
data = rb_mod_const_at(cref->nd_clss, data);
if (!cbase) {
cbase = klass;
@@ -432,10 +369,8 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
const char *file;
volatile int line = 0;
- if (NIL_P(mesg)) {
+ if (NIL_P(mesg))
mesg = th->errinfo;
- if (INTERNAL_EXCEPTION_P(mesg)) JUMP_TAG(TAG_FATAL);
- }
if (NIL_P(mesg)) {
mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
}
@@ -451,7 +386,7 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
else {
at = get_backtrace(mesg);
if (NIL_P(at)) {
- at = rb_vm_backtrace_object();
+ at = rb_make_backtrace();
if (OBJ_FROZEN(mesg)) {
mesg = rb_obj_dup(mesg);
}
@@ -467,23 +402,23 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
!rb_obj_is_kind_of(e, rb_eSystemExit)) {
int status;
- mesg = e;
PUSH_TAG();
if ((status = EXEC_TAG()) == 0) {
- th->errinfo = Qnil;
- e = rb_obj_as_string(mesg);
- th->errinfo = mesg;
+ RB_GC_GUARD(e) = rb_obj_as_string(e);
if (file && line) {
- warn_printf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
- rb_obj_class(mesg), file, line, e);
+ warn_printf("Exception `%s' at %s:%d - %s\n",
+ rb_obj_classname(th->errinfo),
+ file, line, RSTRING_PTR(e));
}
else if (file) {
- warn_printf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
- rb_obj_class(mesg), file, e);
+ warn_printf("Exception `%s' at %s - %s\n",
+ rb_obj_classname(th->errinfo),
+ file, RSTRING_PTR(e));
}
else {
- warn_printf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
- rb_obj_class(mesg), e);
+ warn_printf("Exception `%s' - %s\n",
+ rb_obj_classname(th->errinfo),
+ RSTRING_PTR(e));
}
}
POP_TAG();
@@ -502,13 +437,10 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg)
JUMP_TAG(TAG_FATAL);
}
+ rb_trap_restore_mask();
+
if (tag != TAG_FATAL) {
- if (RUBY_DTRACE_RAISE_ENABLED()) {
- RUBY_DTRACE_RAISE(rb_obj_classname(th->errinfo),
- rb_sourcefile(),
- rb_sourceline());
- }
- EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0, mesg);
+ EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0);
}
}
@@ -585,8 +517,7 @@ rb_f_raise(int argc, VALUE *argv)
}
}
rb_raise_jump(rb_make_exception(argc, argv));
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
static VALUE
@@ -625,7 +556,7 @@ make_exception(int argc, VALUE *argv, int isstr)
}
break;
default:
- rb_check_arity(argc, 0, 3);
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..3)", argc);
break;
}
if (argc > 0) {
@@ -657,7 +588,7 @@ rb_raise_jump(VALUE mesg)
setup_exception(th, TAG_RAISE, mesg);
- EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass, Qnil);
+ EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass);
rb_thread_raised_clear(th);
JUMP_TAG(TAG_RAISE);
}
@@ -673,7 +604,8 @@ rb_block_given_p(void)
{
rb_thread_t *th = GET_THREAD();
- if (rb_vm_control_frame_block_ptr(th->cfp)) {
+ if ((th->cfp->lfp[0] & 0x02) == 0 &&
+ GC_GUARDED_PTR_REF(th->cfp->lfp[0])) {
return TRUE;
}
else {
@@ -708,13 +640,13 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
volatile VALUE e_info = th->errinfo;
va_list args;
- TH_PUSH_TAG(th);
- if ((state = TH_EXEC_TAG()) == 0) {
+ PUSH_TAG();
+ if ((state = EXEC_TAG()) == 0) {
retry_entry:
result = (*b_proc) (data1);
}
else {
- rb_vm_rewind_cfp(th, cfp);
+ th->cfp = cfp; /* restore */
if (state == TAG_RAISE) {
int handle = FALSE;
@@ -752,7 +684,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
}
}
}
- TH_POP_TAG();
+ POP_TAG();
if (state)
JUMP_TAG(state);
@@ -779,21 +711,21 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
protect_tag.prev = th->protect_tag;
- TH_PUSH_TAG(th);
+ PUSH_TAG();
th->protect_tag = &protect_tag;
MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
- if ((status = TH_EXEC_TAG()) == 0) {
+ if ((status = EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
}
MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
th->protect_tag = protect_tag.prev;
- TH_POP_TAG();
+ POP_TAG();
if (state) {
*state = status;
}
if (status != 0) {
- rb_vm_rewind_cfp(th, cfp);
+ th->cfp = cfp;
return Qnil;
}
@@ -805,8 +737,6 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE
{
int state;
volatile VALUE result = Qnil;
- volatile VALUE errinfo;
- rb_thread_t *const th = GET_THREAD();
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
@@ -815,9 +745,7 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE
POP_TAG();
/* TODO: fix me */
/* retval = prot_tag ? prot_tag->retval : Qnil; */ /* save retval */
- errinfo = th->errinfo;
(*e_proc) (data2);
- th->errinfo = errinfo;
if (state)
JUMP_TAG(state);
return result;
@@ -848,8 +776,6 @@ frame_func_id(rb_control_frame_t *cfp)
}
while (iseq) {
if (RUBY_VM_IFUNC_P(iseq)) {
- NODE *ifunc = (NODE *)iseq;
- if (ifunc->nd_aid) return ifunc->nd_aid;
return rb_intern("<ifunc>");
}
me_local = method_entry_of_iseq(cfp, iseq);
@@ -868,80 +794,35 @@ frame_func_id(rb_control_frame_t *cfp)
return 0;
}
-static ID
-frame_called_id(rb_control_frame_t *cfp)
-{
- const rb_method_entry_t *me_local;
- rb_iseq_t *iseq = cfp->iseq;
- if (cfp->me) {
- return cfp->me->called_id;
- }
- while (iseq) {
- if (RUBY_VM_IFUNC_P(iseq)) {
- NODE *ifunc = (NODE *)iseq;
- if (ifunc->nd_aid) return ifunc->nd_aid;
- return rb_intern("<ifunc>");
- }
- me_local = method_entry_of_iseq(cfp, iseq);
- if (me_local) {
- cfp->me = me_local;
- return me_local->called_id;
- }
- if (iseq->defined_method_id) {
- return iseq->defined_method_id;
- }
- if (iseq->local_iseq == iseq) {
- break;
- }
- iseq = iseq->parent_iseq;
- }
- return 0;
-}
-
ID
rb_frame_this_func(void)
{
return frame_func_id(GET_THREAD()->cfp);
}
-static rb_control_frame_t *
-previous_frame(rb_thread_t *th)
-{
- 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;
- }
- return prev_cfp;
-}
-
ID
rb_frame_callee(void)
{
- rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
- if (!prev_cfp) return 0;
- return frame_called_id(prev_cfp);
+ return frame_func_id(GET_THREAD()->cfp);
}
static ID
rb_frame_caller(void)
{
- rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
- if (!prev_cfp) return 0;
+ 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;
+ }
return frame_func_id(prev_cfp);
}
-ID
-rb_frame_last_func(void)
+void
+rb_frame_pop(void)
{
rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = th->cfp;
- ID mid;
-
- while (!(mid = frame_func_id(cfp)) &&
- (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
- !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)));
- return mid;
+ th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
}
/*
@@ -983,252 +864,16 @@ static VALUE
rb_mod_include(int argc, VALUE *argv, VALUE module)
{
int i;
- ID id_append_features, id_included;
-
- CONST_ID(id_append_features, "append_features");
- CONST_ID(id_included, "included");
for (i = 0; i < argc; i++)
Check_Type(argv[i], T_MODULE);
while (argc--) {
- rb_funcall(argv[argc], id_append_features, 1, module);
- rb_funcall(argv[argc], id_included, 1, module);
+ rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
+ rb_funcall(argv[argc], rb_intern("included"), 1, module);
}
return module;
}
-/*
- * call-seq:
- * prepend_features(mod) -> mod
- *
- * When this module is prepended in another, Ruby calls
- * <code>prepend_features</code> in this module, passing it the
- * receiving module in _mod_. Ruby's default implementation is
- * to overlay the constants, methods, and module variables of this module
- * to _mod_ if this module has not already been added to
- * _mod_ or one of its ancestors. See also <code>Module#prepend</code>.
- */
-
-static VALUE
-rb_mod_prepend_features(VALUE module, VALUE prepend)
-{
- switch (TYPE(prepend)) {
- case T_CLASS:
- case T_MODULE:
- break;
- default:
- Check_Type(prepend, T_CLASS);
- break;
- }
- rb_prepend_module(prepend, module);
-
- return module;
-}
-
-/*
- * call-seq:
- * prepend(module, ...) -> self
- *
- * Invokes <code>Module.prepend_features</code> on each parameter in reverse order.
- */
-
-static VALUE
-rb_mod_prepend(int argc, VALUE *argv, VALUE module)
-{
- int i;
- ID id_prepend_features, id_prepended;
-
- CONST_ID(id_prepend_features, "prepend_features");
- CONST_ID(id_prepended, "prepended");
- for (i = 0; i < argc; i++)
- Check_Type(argv[i], T_MODULE);
- while (argc--) {
- rb_funcall(argv[argc], id_prepend_features, 1, module);
- rb_funcall(argv[argc], id_prepended, 1, module);
- }
- return module;
-}
-
-static void
-warn_refinements_once()
-{
- static int warned = 0;
-
- if (warned)
- return;
- rb_warn("Refinements are experimental, and the behavior may change in future versions of Ruby!");
- warned = 1;
-}
-
-static VALUE
-hidden_identity_hash_new()
-{
- VALUE hash = rb_hash_new();
-
- rb_funcall(hash, rb_intern("compare_by_identity"), 0);
- RBASIC(hash)->klass = 0; /* hide from ObjectSpace */
- return hash;
-}
-
-void
-rb_using_refinement(NODE *cref, VALUE klass, VALUE module)
-{
- VALUE iclass, c, superclass = klass;
-
- Check_Type(klass, T_CLASS);
- Check_Type(module, T_MODULE);
- if (NIL_P(cref->nd_refinements)) {
- cref->nd_refinements = hidden_identity_hash_new();
- }
- else {
- if (cref->flags & NODE_FL_CREF_OMOD_SHARED) {
- cref->nd_refinements = rb_hash_dup(cref->nd_refinements);
- cref->flags &= ~NODE_FL_CREF_OMOD_SHARED;
- }
- if (!NIL_P(c = rb_hash_lookup(cref->nd_refinements, klass))) {
- superclass = c;
- while (c && RB_TYPE_P(c, T_ICLASS)) {
- if (RBASIC(c)->klass == module) {
- /* already used refinement */
- return;
- }
- c = RCLASS_SUPER(c);
- }
- }
- }
- FL_SET(module, RMODULE_IS_OVERLAID);
- c = iclass = rb_include_class_new(module, superclass);
- RCLASS_REFINED_CLASS(c) = klass;
- RCLASS_M_TBL(c) = RCLASS_M_TBL(module);
- module = RCLASS_SUPER(module);
- while (module && module != klass) {
- FL_SET(module, RMODULE_IS_OVERLAID);
- c = RCLASS_SUPER(c) = rb_include_class_new(module, RCLASS_SUPER(c));
- RCLASS_REFINED_CLASS(c) = klass;
- module = RCLASS_SUPER(module);
- }
- rb_hash_aset(cref->nd_refinements, klass, iclass);
-}
-
-static int
-using_refinement(VALUE klass, VALUE module, VALUE arg)
-{
- NODE *cref = (NODE *) arg;
-
- rb_using_refinement(cref, klass, module);
- return ST_CONTINUE;
-}
-
-void
-rb_using_module(NODE *cref, VALUE module)
-{
- ID id_refinements;
- VALUE refinements;
-
- Check_Type(module, T_MODULE);
- CONST_ID(id_refinements, "__refinements__");
- refinements = rb_attr_get(module, id_refinements);
- if (NIL_P(refinements)) return;
- rb_hash_foreach(refinements, using_refinement, (VALUE) cref);
-}
-
-VALUE rb_refinement_module_get_refined_class(VALUE module)
-{
- ID id_refined_class;
-
- CONST_ID(id_refined_class, "__refined_class__");
- return rb_attr_get(module, id_refined_class);
-}
-
-static void
-add_activated_refinement(VALUE activated_refinements,
- VALUE klass, VALUE refinement)
-{
- VALUE iclass, c, superclass = klass;
-
- if (!NIL_P(c = rb_hash_lookup(activated_refinements, klass))) {
- superclass = c;
- while (c && RB_TYPE_P(c, T_ICLASS)) {
- if (RBASIC(c)->klass == refinement) {
- /* already used refinement */
- return;
- }
- c = RCLASS_SUPER(c);
- }
- }
- FL_SET(refinement, RMODULE_IS_OVERLAID);
- c = iclass = rb_include_class_new(refinement, superclass);
- RCLASS_REFINED_CLASS(c) = klass;
- refinement = RCLASS_SUPER(refinement);
- while (refinement) {
- FL_SET(refinement, RMODULE_IS_OVERLAID);
- c = RCLASS_SUPER(c) =
- rb_include_class_new(refinement, RCLASS_SUPER(c));
- RCLASS_REFINED_CLASS(c) = klass;
- refinement = RCLASS_SUPER(refinement);
- }
- rb_hash_aset(activated_refinements, klass, iclass);
-}
-
-VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements);
-
-/*
- * call-seq:
- * refine(klass) { block } -> module
- *
- * Refine <i>klass</i> in the receiver.
- *
- * Returns an overlaid module.
- */
-
-static VALUE
-rb_mod_refine(VALUE module, VALUE klass)
-{
- VALUE refinement;
- ID id_refinements, id_activated_refinements,
- id_refined_class, id_defined_at;
- VALUE refinements, activated_refinements;
- rb_thread_t *th = GET_THREAD();
- rb_block_t *block = rb_vm_control_frame_block_ptr(th->cfp);
-
- warn_refinements_once();
- if (!block) {
- rb_raise(rb_eArgError, "no block given");
- }
- if (block->proc) {
- rb_raise(rb_eArgError,
- "can't pass a Proc as a block to Module#refine");
- }
- Check_Type(klass, T_CLASS);
- CONST_ID(id_refinements, "__refinements__");
- refinements = rb_attr_get(module, id_refinements);
- if (NIL_P(refinements)) {
- refinements = hidden_identity_hash_new();
- rb_ivar_set(module, id_refinements, refinements);
- }
- CONST_ID(id_activated_refinements, "__activated_refinements__");
- activated_refinements = rb_attr_get(module, id_activated_refinements);
- if (NIL_P(activated_refinements)) {
- activated_refinements = hidden_identity_hash_new();
- rb_ivar_set(module, id_activated_refinements,
- activated_refinements);
- }
- refinement = rb_hash_lookup(refinements, klass);
- if (NIL_P(refinement)) {
- refinement = rb_module_new();
- RCLASS_SUPER(refinement) = klass;
- FL_SET(refinement, RMODULE_IS_REFINEMENT);
- CONST_ID(id_refined_class, "__refined_class__");
- rb_ivar_set(refinement, id_refined_class, klass);
- CONST_ID(id_defined_at, "__defined_at__");
- rb_ivar_set(refinement, id_defined_at, module);
- rb_hash_aset(refinements, klass, refinement);
- add_activated_refinement(activated_refinements, klass, refinement);
- }
- rb_yield_refine_block(refinement, activated_refinements);
- return refinement;
-}
-
void
rb_obj_call_init(VALUE obj, int argc, VALUE *argv)
{
@@ -1305,17 +950,15 @@ static VALUE
rb_obj_extend(int argc, VALUE *argv, VALUE obj)
{
int i;
- ID id_extend_object, id_extended;
- CONST_ID(id_extend_object, "extend_object");
- CONST_ID(id_extended, "extended");
-
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+ if (argc == 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+ }
for (i = 0; i < argc; i++)
Check_Type(argv[i], T_MODULE);
while (argc--) {
- rb_funcall(argv[argc], id_extend_object, 1, obj);
- rb_funcall(argv[argc], id_extended, 1, obj);
+ rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
+ rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
}
return obj;
}
@@ -1336,35 +979,15 @@ top_include(int argc, VALUE *argv, VALUE self)
rb_secure(4);
if (th->top_wrapper) {
- rb_warning("main.include in the wrapped load is effective only in wrapper module");
+ rb_warning
+ ("main#include in the wrapped load is effective only in wrapper module");
return rb_mod_include(argc, argv, th->top_wrapper);
}
return rb_mod_include(argc, argv, rb_cObject);
}
-/*
- * call-seq:
- * using(module) -> self
- *
- * Import class refinements from <i>module</i> into the scope where
- * <code>using</code> is called.
- */
-
-static VALUE
-top_using(VALUE self, VALUE module)
-{
- NODE *cref = rb_vm_cref();
- rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
-
- warn_refinements_once();
- if (cref->nd_next || (prev_cfp && prev_cfp->me)) {
- rb_raise(rb_eRuntimeError, "using is permitted only at toplevel");
- }
- Check_Type(module, T_MODULE);
- rb_using_module(cref, module);
- rb_clear_cache();
- return self;
-}
+VALUE rb_f_trace_var();
+VALUE rb_f_untrace_var();
static VALUE *
errinfo_place(rb_thread_t *th)
@@ -1375,12 +998,12 @@ errinfo_place(rb_thread_t *th)
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->ep[-2];
+ return &cfp->dfp[-2];
}
else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
- !RB_TYPE_P(cfp->ep[-2], T_NODE) &&
- !FIXNUM_P(cfp->ep[-2])) {
- return &cfp->ep[-2];
+ TYPE(cfp->dfp[-2]) != T_NODE &&
+ !FIXNUM_P(cfp->dfp[-2])) {
+ return &cfp->dfp[-2];
}
}
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
@@ -1498,40 +1121,6 @@ rb_f_method_name(void)
}
}
-static VALUE
-rb_f_callee_name(void)
-{
- ID fname = rb_frame_callee(); /* need *callee* ID */
-
- if (fname) {
- return ID2SYM(fname);
- }
- else {
- return Qnil;
- }
-}
-
-/*
- * call-seq:
- * __dir__ -> string
- *
- * Returns the canonicalized absolute path of the directory of the file from
- * which this method is called. It means symlinks in the path is resolved.
- * If <code>__FILE__</code> is <code>nil</code>, it returns <code>nil</code>.
- * The return value equals to <code>File.dirname(File.realpath(__FILE__))</code>.
- *
- */
-static VALUE
-f_current_dirname(void)
-{
- VALUE base = rb_current_realfilepath();
- if (NIL_P(base)) {
- return Qnil;
- }
- base = rb_file_dirname(base);
- return base;
-}
-
void
Init_eval(void)
{
@@ -1544,29 +1133,25 @@ Init_eval(void)
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_callee_name, 0);
- rb_define_global_function("__dir__", f_current_dirname, 0);
+ rb_define_global_function("__callee__", rb_f_method_name, 0);
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, "prepend_features", rb_mod_prepend_features, 1);
- rb_define_private_method(rb_cModule, "prepend", rb_mod_prepend, -1);
- rb_define_private_method(rb_cModule, "refine", rb_mod_refine, 1);
- rb_undef_method(rb_cClass, "refine");
rb_undef_method(rb_cClass, "module_function");
- Init_vm_eval();
- Init_eval_method();
+ {
+ extern void Init_vm_eval(void);
+ extern void Init_eval_method(void);
+ Init_vm_eval();
+ Init_eval_method();
+ }
rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
- rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
- "include", top_include, -1);
- rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
- "using", top_using, 1);
+ rb_define_singleton_method(rb_vm_top_self(), "include", top_include, -1);
rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
diff --git a/eval_error.c b/eval_error.c
index 54d6db9fb8..41fcbb0abb 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -6,18 +6,17 @@
static void
warn_printf(const char *fmt, ...)
{
- VALUE str;
+ char buf[BUFSIZ];
va_list args;
va_init_list(args, fmt);
- str = rb_vsprintf(fmt, args);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
- rb_write_error_str(str);
+ rb_write_error(buf);
}
#define warn_print(x) rb_write_error(x)
-#define warn_print2(x,l) rb_write_error2((x),(l))
-#define warn_print_str(x) rb_write_error_str(x)
+#define warn_print2(x,l) rb_write_error2(x,l)
static void
error_pos(void)
@@ -39,6 +38,8 @@ error_pos(void)
}
}
+VALUE rb_check_backtrace(VALUE);
+
static VALUE
get_backtrace(VALUE info)
{
@@ -56,22 +57,9 @@ rb_get_backtrace(VALUE info)
return get_backtrace(info);
}
-VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);
-
static void
set_backtrace(VALUE info, VALUE bt)
{
- ID set_backtrace = rb_intern("set_backtrace");
-
- if (rb_backtrace_p(bt)) {
- if (rb_method_basic_definition_p(CLASS_OF(info), set_backtrace)) {
- rb_exc_set_backtrace(info, bt);
- return;
- }
- else {
- bt = rb_backtrace_to_str_ary(bt);
- }
- }
rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
}
@@ -90,14 +78,14 @@ error_print(void)
return;
rb_thread_raised_clear(th);
- TH_PUSH_TAG(th);
- if (TH_EXEC_TAG() == 0) {
+ PUSH_TAG();
+ if (EXEC_TAG() == 0) {
errat = get_backtrace(errinfo);
}
else {
errat = Qnil;
}
- if (TH_EXEC_TAG())
+ if (EXEC_TAG())
goto error;
if (NIL_P(errat)) {
const char *file = rb_sourcefile();
@@ -118,12 +106,12 @@ error_print(void)
if (NIL_P(mesg))
error_pos();
else {
- warn_print_str(mesg);
+ warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
}
}
eclass = CLASS_OF(errinfo);
- if (TH_EXEC_TAG() == 0) {
+ if (EXEC_TAG() == 0) {
e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
StringValue(e);
einfo = RSTRING_PTR(e);
@@ -133,7 +121,7 @@ error_print(void)
einfo = "";
elen = 0;
}
- if (TH_EXEC_TAG())
+ if (EXEC_TAG())
goto error;
if (eclass == rb_eRuntimeError && elen == 0) {
warn_print(": unhandled exception\n");
@@ -144,7 +132,7 @@ error_print(void)
epath = rb_class_name(eclass);
if (elen == 0) {
warn_print(": ");
- warn_print_str(epath);
+ warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
warn_print("\n");
}
else {
@@ -161,7 +149,7 @@ error_print(void)
warn_print2(einfo, len);
if (epath) {
warn_print(" (");
- warn_print_str(epath);
+ warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
warn_print(")\n");
}
if (tail) {
@@ -182,8 +170,8 @@ error_print(void)
#define TRACE_TAIL 5
for (i = 1; i < len; i++) {
- if (RB_TYPE_P(ptr[i], T_STRING)) {
- warn_printf("\tfrom %"PRIsVALUE"\n", ptr[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",
@@ -193,7 +181,7 @@ error_print(void)
}
}
error:
- TH_POP_TAG();
+ POP_TAG();
rb_thread_raised_set(th, raised_flag);
}
@@ -214,19 +202,10 @@ rb_print_undef(VALUE klass, ID id, int scope)
case NOEX_PRIVATE: v = " private"; break;
case NOEX_PROTECTED: v = " protected"; break;
}
- rb_name_error(id, "undefined%s method `%"PRIsVALUE"' for %s `%"PRIsVALUE"'", v,
- QUOTE_ID(id),
- (RB_TYPE_P(klass, T_MODULE)) ? "module" : "class",
- rb_class_name(klass));
-}
-
-void
-rb_print_undef_str(VALUE klass, VALUE name)
-{
- rb_name_error_str(name, "undefined method `%"PRIsVALUE"' for %s `%"PRIsVALUE"'",
- QUOTE(name),
- (RB_TYPE_P(klass, T_MODULE)) ? "module" : "class",
- rb_class_name(klass));
+ 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
diff --git a/eval_intern.h b/eval_intern.h
index a47480a953..3e1996c345 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -5,7 +5,7 @@
#include "vm_core.h"
#define PASS_PASSED_BLOCK_TH(th) do { \
- (th)->passed_block = rb_vm_control_frame_block_ptr(th->cfp); \
+ (th)->passed_block = GC_GUARDED_PTR_REF((rb_block_t *)(th)->cfp->lfp[0]); \
(th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
} while (0)
@@ -28,13 +28,30 @@
#include <setjmp.h>
#ifdef __APPLE__
-# ifdef HAVE_CRT_EXTERNS_H
-# include <crt_externs.h>
-# else
-# include "missing/crt_externs.h"
-# endif
+#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
@@ -48,7 +65,7 @@ char *strrchr(const char *, const char);
#endif
#define ruby_setjmp(env) RUBY_SETJMP(env)
-#define ruby_longjmp(env,val) RUBY_LONGJMP((env),(val))
+#define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
#ifdef __CYGWIN__
# ifndef _setjmp
int _setjmp(jmp_buf);
@@ -73,8 +90,7 @@ NORETURN(void _longjmp(jmp_buf, int));
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))
-extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+#define select(n, r, w, e, t) select_large_fdset(n, r, w, e, t)
#endif
#ifdef HAVE_SYS_PARAM_H
@@ -83,44 +99,16 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval
#include <sys/stat.h>
-#ifdef _MSC_VER
-#define SAVE_ROOT_JMPBUF_BEFORE_STMT \
- __try {
-#define SAVE_ROOT_JMPBUF_AFTER_STMT \
- } \
- __except (GetExceptionCode() == EXCEPTION_STACK_OVERFLOW ? \
- (rb_thread_raised_set(GET_THREAD(), RAISED_STACKOVERFLOW), \
- raise(SIGSEGV), \
- EXCEPTION_EXECUTE_HANDLER) : \
- EXCEPTION_CONTINUE_SEARCH) { \
- /* never reaches here */ \
- }
-#elif defined(__MINGW32__)
-LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
-#define SAVE_ROOT_JMPBUF_BEFORE_STMT \
- do { \
- PVOID _handler = AddVectoredExceptionHandler(1, rb_w32_stack_overflow_handler);
-
-#define SAVE_ROOT_JMPBUF_AFTER_STMT \
- RemoveVectoredExceptionHandler(_handler); \
- } while (0);
-#else
-#define SAVE_ROOT_JMPBUF_BEFORE_STMT
-#define SAVE_ROOT_JMPBUF_AFTER_STMT
-#endif
-
#define SAVE_ROOT_JMPBUF(th, stmt) do \
if (ruby_setjmp((th)->root_jmpbuf) == 0) { \
- SAVE_ROOT_JMPBUF_BEFORE_STMT \
stmt; \
- SAVE_ROOT_JMPBUF_AFTER_STMT \
} \
else { \
rb_fiber_start(); \
} while (0)
#define TH_PUSH_TAG(th) do { \
- rb_thread_t * const _th = (th); \
+ rb_thread_t * const _th = th; \
struct rb_vm_tag _tag; \
_tag.tag = 0; \
_tag.prev = _th->tag; \
@@ -142,12 +130,10 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
TH_EXEC_TAG()
#define TH_JUMP_TAG(th, st) do { \
- ruby_longjmp((th)->tag->buf,(st)); \
+ ruby_longjmp(th->tag->buf,(st)); \
} while (0)
-#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), (st))
-
-#define INTERNAL_EXCEPTION_P(exc) FIXNUM_P(exc)
+#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), st)
enum ruby_tag_type {
RUBY_TAG_RETURN = 0x1,
@@ -185,6 +171,12 @@ enum ruby_tag_type {
#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 *)((char *)(((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);
@@ -203,27 +195,26 @@ int rb_threadptr_reset_raised(rb_thread_t *th);
VALUE rb_f_eval(int argc, VALUE *argv, VALUE self);
VALUE rb_make_exception(int argc, VALUE *argv);
-NORETURN(void rb_method_name_error(VALUE, VALUE));
-
NORETURN(void rb_fiber_start(void));
NORETURN(void rb_print_undef(VALUE, ID, int));
-NORETURN(void rb_print_undef_str(VALUE, VALUE));
NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
-NORETURN(void rb_vm_jump_tag_but_local_jump(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_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
+VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename, VALUE filepath);
void rb_vm_set_progname(VALUE filename);
void rb_thread_terminate_all(void);
VALUE rb_vm_top_self();
VALUE rb_vm_cbase(void);
+int rb_vm_get_sourceline(const rb_control_frame_t *);
+void rb_trap_restore_mask(void);
#ifndef CharNext /* defined as CharNext[AW] on Windows. */
-#define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE))
+#define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
#endif
#if defined DOSISH || defined __CYGWIN__
diff --git a/eval_jump.c b/eval_jump.c
index 24bf2a2286..18b6835c9c 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -54,7 +54,7 @@ struct end_proc_data {
struct end_proc_data *next;
};
-static struct end_proc_data *end_procs, *ephemeral_end_procs;
+static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
void
rb_set_end_proc(void (*func)(VALUE), VALUE data)
@@ -91,58 +91,58 @@ rb_mark_end_proc(void)
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 endproc;
- struct end_proc_data volatile *link;
+ struct end_proc_data *volatile link;
+ struct end_proc_data *tmp;
int status;
volatile int safe = rb_safe_level();
- rb_thread_t *th = GET_THREAD();
- volatile VALUE errinfo = th->errinfo;
while (ephemeral_end_procs) {
- link = ephemeral_end_procs;
- ephemeral_end_procs = link->next;
- endproc = *link;
- xfree((void *)link);
- link = &endproc;
-
- 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);
- if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
+ 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) {
- link = end_procs;
- end_procs = link->next;
- endproc = *link;
- xfree((void *)link);
- link = &endproc;
-
- 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);
- if (!NIL_P(th->errinfo)) errinfo = th->errinfo;
+ 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);
- th->errinfo = errinfo;
}
void
diff --git a/ext/-test-/array/resize/extconf.rb b/ext/-test-/array/resize/extconf.rb
deleted file mode 100644
index 6500a878fc..0000000000
--- a/ext/-test-/array/resize/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/array/resize")
diff --git a/ext/-test-/array/resize/resize.c b/ext/-test-/array/resize/resize.c
deleted file mode 100644
index 08bcee3e7a..0000000000
--- a/ext/-test-/array/resize/resize.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "ruby/ruby.h"
-
-static VALUE
-ary_resize(VALUE ary, VALUE len)
-{
- rb_ary_resize(ary, NUM2LONG(len));
- return ary;
-}
-
-void
-Init_resize(void)
-{
- rb_define_method(rb_cArray, "__resize__", ary_resize, 1);
-}
diff --git a/ext/-test-/bug-3571/bug.c b/ext/-test-/bug-3571/bug.c
deleted file mode 100644
index 72d6bd1021..0000000000
--- a/ext/-test-/bug-3571/bug.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-bug_i(VALUE i, VALUE arg)
-{
- rb_notimplement();
- return ID2SYM(rb_frame_this_func());
-}
-
-static VALUE
-bug_start(VALUE self, VALUE hash)
-{
- VALUE ary = rb_ary_new3(1, Qnil);
- rb_block_call(ary, rb_intern("map"), 0, 0, bug_i, self);
- return ary;
-}
-
-void
-Init_bug(void)
-{
- VALUE mBug = rb_define_module("Bug");
- rb_define_module_function(mBug, "start", bug_start, 0);
-}
diff --git a/ext/-test-/bug-3571/extconf.rb b/ext/-test-/bug-3571/extconf.rb
deleted file mode 100644
index 6390fce219..0000000000
--- a/ext/-test-/bug-3571/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/bug-3571/bug")
diff --git a/ext/-test-/bug-5832/bug.c b/ext/-test-/bug-5832/bug.c
deleted file mode 100644
index 67be5844b6..0000000000
--- a/ext/-test-/bug-5832/bug.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-bug_funcall_callback(VALUE self, VALUE obj)
-{
- return rb_funcall(obj, rb_intern("callback"), 0);
-}
-
-void
-Init_bug(void)
-{
- VALUE mBug = rb_define_module("Bug");
- rb_define_module_function(mBug, "funcall_callback", bug_funcall_callback, 1);
-}
diff --git a/ext/-test-/bug-5832/extconf.rb b/ext/-test-/bug-5832/extconf.rb
deleted file mode 100644
index 55a4b7d93f..0000000000
--- a/ext/-test-/bug-5832/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/bug-5832/bug")
diff --git a/ext/-test-/debug/extconf.rb b/ext/-test-/debug/extconf.rb
deleted file mode 100644
index 8f7922e1a6..0000000000
--- a/ext/-test-/debug/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-inits = $srcs.map {|s| File.basename(s, ".*")}
-inits.delete("init")
-inits.map! {|s|"X(#{s})"}
-$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/debug")
diff --git a/ext/-test-/debug/init.c b/ext/-test-/debug/init.c
deleted file mode 100644
index fe3979cbc5..0000000000
--- a/ext/-test-/debug/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_debug(void)
-{
- VALUE mBug = rb_define_module("Bug");
- VALUE klass = rb_define_module_under(mBug, "Debug");
- TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/debug/inspector.c b/ext/-test-/debug/inspector.c
deleted file mode 100644
index f0c58e59f9..0000000000
--- a/ext/-test-/debug/inspector.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "ruby/ruby.h"
-#include "ruby/debug.h"
-
-static VALUE
-callback(const rb_debug_inspector_t *dbg_context, void *data)
-{
- VALUE locs = rb_debug_inspector_backtrace_locations(dbg_context);
- long i, len = RARRAY_LEN(locs);
- VALUE binds = rb_ary_new();
- for (i = 0; i < len; ++i) {
- VALUE entry = rb_ary_new();
- rb_ary_push(binds, entry);
- rb_ary_push(entry, rb_debug_inspector_frame_self_get(dbg_context, i));
- rb_ary_push(entry, rb_debug_inspector_frame_binding_get(dbg_context, i));
- rb_ary_push(entry, rb_debug_inspector_frame_class_get(dbg_context, i));
- rb_ary_push(entry, rb_debug_inspector_frame_iseq_get(dbg_context, i));
- rb_ary_push(entry, rb_ary_entry(locs, i));
- }
- return binds;
-}
-
-static VALUE
-debug_inspector(VALUE self)
-{
- return rb_debug_inspector_open(callback, NULL);
-}
-
-void
-Init_inspector(VALUE klass)
-{
- rb_define_module_function(klass, "inspector", debug_inspector, 0);
-}
diff --git a/ext/-test-/exception/enc_raise.c b/ext/-test-/exception/enc_raise.c
deleted file mode 100644
index dc8a42cf3f..0000000000
--- a/ext/-test-/exception/enc_raise.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <ruby.h>
-#include <ruby/encoding.h>
-
-static VALUE
-enc_raise(VALUE exc, VALUE encoding, VALUE mesg)
-{
- rb_enc_raise(rb_to_encoding(encoding), exc, "%s", StringValueCStr(mesg));
- UNREACHABLE;
-}
-
-void
-Init_enc_raise(VALUE klass)
-{
- rb_define_module_function(klass, "enc_raise", enc_raise, 2);
-}
diff --git a/ext/-test-/exception/ensured.c b/ext/-test-/exception/ensured.c
deleted file mode 100644
index 365e1f4f79..0000000000
--- a/ext/-test-/exception/ensured.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-begin(VALUE object)
-{
- return rb_funcall(object, rb_intern("try_method"), 0);
-}
-
-static VALUE
-ensure(VALUE object)
-{
- return rb_funcall(object, rb_intern("ensured_method"), 0);
-}
-
-static VALUE
-ensured(VALUE module, VALUE object)
-{
- return rb_ensure(begin, object, ensure, object);
-}
-
-void
-Init_ensured(VALUE klass)
-{
- rb_define_module_function(klass, "ensured", ensured, 1);
-}
diff --git a/ext/-test-/exception/extconf.rb b/ext/-test-/exception/extconf.rb
deleted file mode 100644
index 0faf6d53ed..0000000000
--- a/ext/-test-/exception/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-inits = $srcs.map {|s| File.basename(s, ".*")}
-inits.delete("init")
-inits.map! {|s|"X(#{s})"}
-$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/exception")
diff --git a/ext/-test-/exception/init.c b/ext/-test-/exception/init.c
deleted file mode 100644
index 853bb68f79..0000000000
--- a/ext/-test-/exception/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_exception(void)
-{
- VALUE mBug = rb_define_module("Bug");
- VALUE klass = rb_define_class_under(mBug, "Exception", rb_eStandardError);
- TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/fatal/extconf.rb b/ext/-test-/fatal/extconf.rb
deleted file mode 100644
index e0cfeb2095..0000000000
--- a/ext/-test-/fatal/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/fatal/rb_fatal")
diff --git a/ext/-test-/fatal/rb_fatal.c b/ext/-test-/fatal/rb_fatal.c
deleted file mode 100644
index 71aef4658a..0000000000
--- a/ext/-test-/fatal/rb_fatal.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-ruby_fatal(VALUE obj, VALUE msg)
-{
- const char *cmsg = NULL;
-
- (void)obj;
-
- cmsg = RSTRING_PTR(msg);
- rb_fatal("%s", cmsg);
- return 0; /* never reached */
-}
-
-void
-Init_rb_fatal(void)
-{
- rb_define_method(rb_mKernel, "rb_fatal", ruby_fatal, 1);
-}
diff --git a/ext/-test-/funcall/extconf.rb b/ext/-test-/funcall/extconf.rb
deleted file mode 100644
index 8a9179ab2f..0000000000
--- a/ext/-test-/funcall/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile("-test-/funcall/funcall")
diff --git a/ext/-test-/funcall/passing_block.c b/ext/-test-/funcall/passing_block.c
deleted file mode 100644
index 0200f80369..0000000000
--- a/ext/-test-/funcall/passing_block.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "ruby.h"
-
-VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
-
-static VALUE
-with_funcall2(int argc, VALUE *argv, VALUE self)
-{
- return rb_funcall2(self, rb_intern("target"), argc, argv);
-}
-
-static VALUE
-with_funcall_passing_block(int argc, VALUE *argv, VALUE self)
-{
- return rb_funcall_passing_block(self, rb_intern("target"), argc, argv);
-}
-
-void
-Init_funcall(void)
-{
- VALUE cRelay = rb_path2class("TestFuncall::Relay");
-
- rb_define_singleton_method(cRelay,
- "with_funcall2",
- with_funcall2,
- -1);
- rb_define_singleton_method(cRelay,
- "with_funcall_passing_block",
- with_funcall_passing_block,
- -1);
-}
diff --git a/ext/-test-/iter/break.c b/ext/-test-/iter/break.c
deleted file mode 100644
index 56ba7e7ffd..0000000000
--- a/ext/-test-/iter/break.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-iter_break(VALUE self)
-{
- rb_iter_break();
-
- UNREACHABLE;
-}
-
-static VALUE
-iter_break_value(VALUE self, VALUE val)
-{
- rb_iter_break_value(val);
-
- UNREACHABLE;
-}
-
-void
-Init_break(void)
-{
- VALUE breakable = rb_define_module_under(rb_define_module("Bug"), "Breakable");
- rb_define_module_function(breakable, "iter_break", iter_break, 0);
- rb_define_module_function(breakable, "iter_break_value", iter_break_value, 1);
-}
diff --git a/ext/-test-/iter/extconf.rb b/ext/-test-/iter/extconf.rb
deleted file mode 100644
index 695b5e9f6d..0000000000
--- a/ext/-test-/iter/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/iter/break")
diff --git a/ext/-test-/load/dot.dot/dot.dot.c b/ext/-test-/load/dot.dot/dot.dot.c
deleted file mode 100644
index 936d28931a..0000000000
--- a/ext/-test-/load/dot.dot/dot.dot.c
+++ /dev/null
@@ -1 +0,0 @@
-void Init_dot(void) {}
diff --git a/ext/-test-/load/dot.dot/extconf.rb b/ext/-test-/load/dot.dot/extconf.rb
deleted file mode 100644
index 6287db6bd8..0000000000
--- a/ext/-test-/load/dot.dot/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/load/dot.dot/dot.dot")
diff --git a/ext/-test-/marshal/compat/extconf.rb b/ext/-test-/marshal/compat/extconf.rb
deleted file mode 100644
index bb11ebfb8c..0000000000
--- a/ext/-test-/marshal/compat/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/marshal/compat")
diff --git a/ext/-test-/marshal/compat/usrcompat.c b/ext/-test-/marshal/compat/usrcompat.c
deleted file mode 100644
index f812df5631..0000000000
--- a/ext/-test-/marshal/compat/usrcompat.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-usr_dumper(VALUE self)
-{
- return self;
-}
-
-static VALUE
-usr_loader(VALUE self, VALUE m)
-{
- VALUE val = rb_ivar_get(m, rb_intern("@value"));
- *(int *)DATA_PTR(self) = NUM2INT(val);
- return self;
-}
-
-static VALUE
-compat_mload(VALUE self, VALUE data)
-{
- rb_ivar_set(self, rb_intern("@value"), data);
- return self;
-}
-
-void
-Init_compat(void)
-{
- VALUE newclass = rb_path2class("Bug::Marshal::UsrMarshal");
- VALUE oldclass = rb_define_class_under(newclass, "compat", rb_cObject);
-
- rb_define_method(oldclass, "marshal_load", compat_mload, 1);
- rb_marshal_define_compat(newclass, oldclass, usr_dumper, usr_loader);
-}
diff --git a/ext/-test-/marshal/usr/extconf.rb b/ext/-test-/marshal/usr/extconf.rb
deleted file mode 100644
index c662b23dd5..0000000000
--- a/ext/-test-/marshal/usr/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/marshal/usr")
diff --git a/ext/-test-/marshal/usr/usrmarshal.c b/ext/-test-/marshal/usr/usrmarshal.c
deleted file mode 100644
index b30bd52c13..0000000000
--- a/ext/-test-/marshal/usr/usrmarshal.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-usr_alloc(VALUE klass)
-{
- int *p;
- return Data_Make_Struct(klass, int, 0, RUBY_DEFAULT_FREE, p);
-}
-
-static VALUE
-usr_init(VALUE self, VALUE val)
-{
- *(int *)DATA_PTR(self) = NUM2INT(val);
- return self;
-}
-
-static VALUE
-usr_value(VALUE self)
-{
- int val = *(int *)DATA_PTR(self);
- return INT2NUM(val);
-}
-
-void
-Init_usr(void)
-{
- VALUE mMarshal = rb_define_module_under(rb_define_module("Bug"), "Marshal");
- VALUE newclass = rb_define_class_under(mMarshal, "UsrMarshal", rb_cObject);
-
- rb_define_alloc_func(newclass, usr_alloc);
- rb_define_method(newclass, "initialize", usr_init, 1);
- rb_define_method(newclass, "value", usr_value, 0);
- rb_define_method(newclass, "marshal_load", usr_init, 1);
- rb_define_method(newclass, "marshal_dump", usr_value, 0);
-}
diff --git a/ext/-test-/method/arity.c b/ext/-test-/method/arity.c
deleted file mode 100644
index 239b9f7f10..0000000000
--- a/ext/-test-/method/arity.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-obj_method_arity(VALUE self, VALUE obj, VALUE mid)
-{
- int arity = rb_obj_method_arity(obj, rb_check_id(&mid));
- return INT2FIX(arity);
-}
-
-static VALUE
-mod_method_arity(VALUE self, VALUE mod, VALUE mid)
-{
- int arity = rb_mod_method_arity(mod, rb_check_id(&mid));
- return INT2FIX(arity);
-}
-
-void
-Init_arity(VALUE mod)
-{
- rb_define_module_function(mod, "obj_method_arity", obj_method_arity, 2);
- rb_define_module_function(mod, "mod_method_arity", mod_method_arity, 2);
-}
diff --git a/ext/-test-/method/extconf.rb b/ext/-test-/method/extconf.rb
deleted file mode 100644
index 658b7af1f1..0000000000
--- a/ext/-test-/method/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-inits = $srcs.map {|s| File.basename(s, ".*")}
-inits.delete("init")
-inits.map! {|s|"X(#{s})"}
-$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/method")
diff --git a/ext/-test-/method/init.c b/ext/-test-/method/init.c
deleted file mode 100644
index cea2346240..0000000000
--- a/ext/-test-/method/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_method(void)
-{
- VALUE mBug = rb_define_module("Bug");
- VALUE klass = rb_define_module_under(mBug, "Method");
- TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/num2int/depend b/ext/-test-/num2int/depend
deleted file mode 100644
index 7a85cdb6c0..0000000000
--- a/ext/-test-/num2int/depend
+++ /dev/null
@@ -1 +0,0 @@
-num2int.o: $(top_srcdir)/numeric.c $(hdrdir)/ruby/ruby.h
diff --git a/ext/-test-/num2int/extconf.rb b/ext/-test-/num2int/extconf.rb
deleted file mode 100644
index 2bc820e480..0000000000
--- a/ext/-test-/num2int/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/num2int/num2int")
diff --git a/ext/-test-/num2int/num2int.c b/ext/-test-/num2int/num2int.c
deleted file mode 100644
index fb1ea9678d..0000000000
--- a/ext/-test-/num2int/num2int.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <ruby.h>
-
-static VALUE
-print_num2short(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%d", NUM2SHORT(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-static VALUE
-print_num2ushort(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%u", NUM2USHORT(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-static VALUE
-print_num2int(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%d", NUM2INT(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-static VALUE
-print_num2uint(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%u", NUM2UINT(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-static VALUE
-print_num2long(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%ld", NUM2LONG(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-static VALUE
-print_num2ulong(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%lu", NUM2ULONG(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-#ifdef HAVE_LONG_LONG
-static VALUE
-print_num2ll(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%"PRI_LL_PREFIX"d", NUM2LL(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-
-static VALUE
-print_num2ull(VALUE obj, VALUE num)
-{
- char buf[128];
- VALUE str;
-
- sprintf(buf, "%"PRI_LL_PREFIX"u", NUM2ULL(num));
- str = rb_str_new_cstr(buf);
- rb_io_write(rb_stdout, str);
- return Qnil;
-}
-#endif
-
-void
-Init_num2int(void)
-{
- VALUE cNum2int = rb_path2class("TestNum2int::Num2int");
-
- rb_define_singleton_method(cNum2int, "print_num2short", print_num2short, 1);
- rb_define_singleton_method(cNum2int, "print_num2ushort", print_num2ushort, 1);
-
- rb_define_singleton_method(cNum2int, "print_num2int", print_num2int, 1);
- rb_define_singleton_method(cNum2int, "print_num2uint", print_num2uint, 1);
-
- rb_define_singleton_method(cNum2int, "print_num2long", print_num2long, 1);
- rb_define_singleton_method(cNum2int, "print_num2ulong", print_num2ulong, 1);
-
-#ifdef HAVE_LONG_LONG
- rb_define_singleton_method(cNum2int, "print_num2ll", print_num2ll, 1);
- rb_define_singleton_method(cNum2int, "print_num2ull", print_num2ull, 1);
-#endif
-}
-
diff --git a/ext/-test-/old_thread_select/depend b/ext/-test-/old_thread_select/depend
deleted file mode 100644
index a2bc836e1f..0000000000
--- a/ext/-test-/old_thread_select/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-old_thread_select.o: $(top_srcdir)/thread.c \
- $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/io.h
diff --git a/ext/-test-/old_thread_select/extconf.rb b/ext/-test-/old_thread_select/extconf.rb
deleted file mode 100644
index 730d9ec901..0000000000
--- a/ext/-test-/old_thread_select/extconf.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-$warnflags = "-Wno-deprecated-declarations"
-$warnflags = "" unless try_compile("", $warnflags)
-
-create_makefile("-test-/old_thread_select/old_thread_select")
diff --git a/ext/-test-/old_thread_select/old_thread_select.c b/ext/-test-/old_thread_select/old_thread_select.c
deleted file mode 100644
index e374f02355..0000000000
--- a/ext/-test-/old_thread_select/old_thread_select.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* test case for deprecated C API */
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-
-static fd_set * array2fdset(fd_set *fds, VALUE ary, int *max)
-{
- long i;
-
- if (NIL_P(ary))
- return NULL;
-
- FD_ZERO(fds);
- Check_Type(ary, T_ARRAY);
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- VALUE val = RARRAY_PTR(ary)[i];
- int fd;
-
- Check_Type(val, T_FIXNUM);
- fd = FIX2INT(val);
- if (fd >= *max)
- *max = fd + 1;
- FD_SET(fd, fds);
- }
-
- return fds;
-}
-
-static void fdset2array(VALUE dst, fd_set *fds, int max)
-{
- int i;
-
- rb_ary_clear(dst);
-
- for (i = 0; i < max; i++) {
- if (FD_ISSET(i, fds))
- rb_ary_push(dst, INT2NUM(i));
- }
-}
-
-static VALUE
-old_thread_select(VALUE klass, VALUE r, VALUE w, VALUE e, VALUE timeout)
-{
- struct timeval tv;
- struct timeval *tvp = NULL;
- fd_set rfds, wfds, efds;
- fd_set *rp, *wp, *ep;
- int rc;
- int max = 0;
-
- if (!NIL_P(timeout)) {
- tv = rb_time_timeval(timeout);
- tvp = &tv;
- }
- rp = array2fdset(&rfds, r, &max);
- wp = array2fdset(&wfds, w, &max);
- ep = array2fdset(&efds, e, &max);
- rc = rb_thread_select(max, rp, wp, ep, tvp);
- if (rc == -1)
- rb_sys_fail("rb_wait_for_single_fd");
-
- if (rp)
- fdset2array(r, &rfds, max);
- if (wp)
- fdset2array(w, &wfds, max);
- if (ep)
- fdset2array(e, &efds, max);
- return INT2NUM(rc);
-}
-
-void
-Init_old_thread_select(void)
-{
- rb_define_singleton_method(rb_cIO, "old_thread_select",
- old_thread_select, 4);
-}
diff --git a/ext/-test-/path_to_class/extconf.rb b/ext/-test-/path_to_class/extconf.rb
deleted file mode 100644
index e1072b1443..0000000000
--- a/ext/-test-/path_to_class/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-inits = $srcs.map {|s| File.basename(s, ".*")}
-inits.delete("init")
-inits.map! {|s|"X(#{s})"}
-$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/path_to_class/path_to_class")
diff --git a/ext/-test-/path_to_class/path_to_class.c b/ext/-test-/path_to_class/path_to_class.c
deleted file mode 100644
index c8c2831b09..0000000000
--- a/ext/-test-/path_to_class/path_to_class.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-path_to_class(VALUE klass, VALUE path)
-{
- return rb_path_to_class(path);
-}
-
-void
-Init_path_to_class(void)
-{
- VALUE klass = rb_path2class("Test_PathToClass");
-
- rb_define_singleton_method(klass, "path_to_class", path_to_class, 1);
-}
diff --git a/ext/-test-/printf/extconf.rb b/ext/-test-/printf/extconf.rb
deleted file mode 100644
index 7b96da0c85..0000000000
--- a/ext/-test-/printf/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/printf")
diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c
deleted file mode 100644
index 1eb93566bb..0000000000
--- a/ext/-test-/printf/printf.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <ruby.h>
-#include <ruby/encoding.h>
-
-static VALUE
-printf_test_i(VALUE self, VALUE obj)
-{
- char buf[256];
- snprintf(buf, sizeof(buf), "<%"PRIsVALUE">", obj);
- return rb_usascii_str_new2(buf);
-}
-
-static VALUE
-printf_test_s(VALUE self, VALUE obj)
-{
- return rb_enc_sprintf(rb_usascii_encoding(), "<%"PRIsVALUE">", obj);
-}
-
-static VALUE
-printf_test_v(VALUE self, VALUE obj)
-{
- return rb_enc_sprintf(rb_usascii_encoding(), "{%+"PRIsVALUE"}", obj);
-}
-
-static VALUE
-printf_test_q(VALUE self, VALUE obj)
-{
- return rb_enc_sprintf(rb_usascii_encoding(), "[% "PRIsVALUE"]", obj);
-}
-
-static char *
-utoa(char *p, char *e, unsigned int x)
-{
- char *e0 = e;
- if (e <= p) return p;
- do {
- *--e = x % 10 + '0';
- } while ((x /= 10) != 0 && e > p);
- memmove(p, e, e0 - e);
- return p + (e0 - e);
-}
-
-static VALUE
-printf_test_call(int argc, VALUE *argv, VALUE self)
-{
- VALUE opt, type, num, result;
- char format[sizeof(int) * 6 + 8], *p = format, cnv;
- int n;
- const char *s;
-
- rb_scan_args(argc, argv, "2:", &type, &num, &opt);
- Check_Type(type, T_STRING);
- if (RSTRING_LEN(type) != 1) rb_raise(rb_eArgError, "wrong length(%ld)", RSTRING_LEN(type));
- switch (cnv = RSTRING_PTR(type)[0]) {
- case 'd': case 'x': case 'o': case 'X':
- n = NUM2INT(num);
- break;
- case 's':
- s = StringValueCStr(num);
- break;
- default: rb_raise(rb_eArgError, "wrong conversion(%c)", cnv);
- }
- *p++ = '%';
- if (!NIL_P(opt)) {
- VALUE v;
- Check_Type(opt, T_HASH);
- if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("space"))))) {
- *p++ = ' ';
- }
- if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("hash"))))) {
- *p++ = '#';
- }
- if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("plus"))))) {
- *p++ = '+';
- }
- if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("minus"))))) {
- *p++ = '-';
- }
- if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("zero"))))) {
- *p++ = '0';
- }
- if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) {
- p = utoa(p, format + sizeof(format), NUM2UINT(v));
- }
- if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) {
- *p++ = '.';
- if (FIXNUM_P(v))
- p = utoa(p, format + sizeof(format), NUM2UINT(v));
- }
- }
- *p++ = cnv;
- *p++ = '\0';
- if (cnv == 's') {
- result = rb_enc_sprintf(rb_usascii_encoding(), format, s);
- }
- else {
- result = rb_enc_sprintf(rb_usascii_encoding(), format, n);
- }
- return rb_assoc_new(result, rb_usascii_str_new_cstr(format));
-}
-
-void
-Init_printf(void)
-{
- VALUE m = rb_define_module_under(rb_define_module("Bug"), "Printf");
- rb_define_singleton_method(m, "i", printf_test_i, 1);
- rb_define_singleton_method(m, "s", printf_test_s, 1);
- rb_define_singleton_method(m, "v", printf_test_v, 1);
- rb_define_singleton_method(m, "call", printf_test_call, -1);
- rb_define_singleton_method(m, "q", printf_test_q, 1);
-}
diff --git a/ext/-test-/st/numhash/extconf.rb b/ext/-test-/st/numhash/extconf.rb
deleted file mode 100644
index 867fd75d2a..0000000000
--- a/ext/-test-/st/numhash/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/st/numhash")
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
deleted file mode 100644
index d4dbd1a0ce..0000000000
--- a/ext/-test-/st/numhash/numhash.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <ruby.h>
-#include <ruby/st.h>
-
-static void
-numhash_free(void *ptr)
-{
- if (ptr) st_free_table(ptr);
-}
-
-static VALUE
-numhash_alloc(VALUE klass)
-{
- return Data_Wrap_Struct(klass, 0, numhash_free, 0);
-}
-
-static VALUE
-numhash_init(VALUE self)
-{
- st_table *tbl = (st_table *)DATA_PTR(self);
- if (tbl) st_free_table(tbl);
- DATA_PTR(self) = st_init_numtable();
- return self;
-}
-
-static VALUE
-numhash_aref(VALUE self, VALUE key)
-{
- st_data_t data;
- if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const");
- if (st_lookup((st_table *)DATA_PTR(self), (st_data_t)key, &data))
- return (VALUE)data;
- return Qnil;
-}
-
-static VALUE
-numhash_aset(VALUE self, VALUE key, VALUE data)
-{
- if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const");
- if (!SPECIAL_CONST_P(data)) rb_raise(rb_eArgError, "not a special const");
- st_insert((st_table *)DATA_PTR(self), (st_data_t)key, (st_data_t)data);
- return self;
-}
-
-static int
-numhash_i(st_data_t key, st_data_t value, st_data_t arg)
-{
- VALUE ret;
- ret = rb_yield_values(3, (VALUE)key, (VALUE)value, (VALUE)arg);
- if (ret == Qtrue) return ST_CHECK;
- return ST_CONTINUE;
-}
-
-static VALUE
-numhash_each(VALUE self)
-{
- st_table *table = DATA_PTR(self);
- st_data_t data = (st_data_t)self;
- return st_foreach_check(table, numhash_i, data, data) ? Qtrue : Qfalse;
-}
-
-static int
-update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
-{
- VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)*key, (VALUE)*value);
- switch (ret) {
- case Qfalse:
- return ST_STOP;
- case Qnil:
- return ST_DELETE;
- default:
- *value = ret;
- return ST_CONTINUE;
- }
-}
-
-static VALUE
-numhash_update(VALUE self, VALUE key)
-{
- if (st_update((st_table *)DATA_PTR(self), (st_data_t)key, update_func, 0))
- return Qtrue;
- else
- return Qfalse;
-}
-
-#if SIZEOF_LONG == SIZEOF_VOIDP
-# define ST2NUM(x) ULONG2NUM(x)
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-# define ST2NUM(x) ULL2NUM(x)
-#endif
-
-static VALUE
-numhash_size(VALUE self)
-{
- return ST2NUM(((st_table *)DATA_PTR(self))->num_entries);
-}
-
-static VALUE
-numhash_delete_safe(VALUE self, VALUE key)
-{
- st_data_t val, k = (st_data_t)key;
- if (st_delete_safe((st_table *)DATA_PTR(self), &k, &val, (st_data_t)self)) {
- return val;
- }
- return Qnil;
-}
-
-void
-Init_numhash(void)
-{
- VALUE st = rb_define_class_under(rb_define_module("Bug"), "StNumHash", rb_cData);
- rb_define_alloc_func(st, numhash_alloc);
- rb_define_method(st, "initialize", numhash_init, 0);
- rb_define_method(st, "[]", numhash_aref, 1);
- rb_define_method(st, "[]=", numhash_aset, 2);
- rb_define_method(st, "each", numhash_each, 0);
- rb_define_method(st, "update", numhash_update, 1);
- rb_define_method(st, "size", numhash_size, 0);
- rb_define_method(st, "delete_safe", numhash_delete_safe, 1);
-}
-
diff --git a/ext/-test-/st/update/extconf.rb b/ext/-test-/st/update/extconf.rb
deleted file mode 100644
index 96dbae43ab..0000000000
--- a/ext/-test-/st/update/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/st/update")
diff --git a/ext/-test-/st/update/update.c b/ext/-test-/st/update/update.c
deleted file mode 100644
index 979ad3e334..0000000000
--- a/ext/-test-/st/update/update.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <ruby.h>
-#include <ruby/st.h>
-
-static int
-update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
-{
- VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)*key, (VALUE)*value);
- switch (ret) {
- case Qfalse:
- return ST_STOP;
- case Qnil:
- return ST_DELETE;
- default:
- *value = ret;
- return ST_CONTINUE;
- }
-}
-
-static VALUE
-test_st_update(VALUE self, VALUE key)
-{
- if (st_update(RHASH_TBL(self), (st_data_t)key, update_func, 0))
- return Qtrue;
- else
- return Qfalse;
-}
-
-void
-Init_update(void)
-{
- VALUE st = rb_define_class_under(rb_define_module("Bug"), "StTable", rb_cHash);
- rb_define_method(st, "st_update", test_st_update, 1);
-}
-
diff --git a/ext/-test-/string/coderange.c b/ext/-test-/string/coderange.c
deleted file mode 100644
index 2f1e6a06a8..0000000000
--- a/ext/-test-/string/coderange.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-
-static VALUE sym_7bit, sym_valid, sym_unknown, sym_broken;
-static VALUE
-str_coderange(VALUE str)
-{
- switch (ENC_CODERANGE(str)) {
- case ENC_CODERANGE_7BIT:
- return sym_7bit;
- case ENC_CODERANGE_VALID:
- return sym_valid;
- case ENC_CODERANGE_UNKNOWN:
- return sym_unknown;
- case ENC_CODERANGE_BROKEN:
- return sym_broken;
- }
- rb_bug("wrong condition of coderange");
- UNREACHABLE;
-}
-
-void
-Init_coderange(VALUE klass)
-{
- sym_7bit = ID2SYM(rb_intern("7bit"));
- sym_valid = ID2SYM(rb_intern("valid"));
- sym_unknown = ID2SYM(rb_intern("unknown"));
- sym_broken = ID2SYM(rb_intern("broken"));
- rb_define_method(klass, "coderange", str_coderange, 0);
-}
diff --git a/ext/-test-/string/ellipsize.c b/ext/-test-/string/ellipsize.c
deleted file mode 100644
index 0451519492..0000000000
--- a/ext/-test-/string/ellipsize.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-bug_str_ellipsize(VALUE str, VALUE len)
-{
- return rb_str_ellipsize(str, NUM2LONG(len));
-}
-
-void
-Init_ellipsize(VALUE klass)
-{
- rb_define_method(klass, "ellipsize", bug_str_ellipsize, 1);
-}
diff --git a/ext/-test-/string/enc_associate.c b/ext/-test-/string/enc_associate.c
deleted file mode 100644
index d6614fb298..0000000000
--- a/ext/-test-/string/enc_associate.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "ruby.h"
-#include "ruby/encoding.h"
-
-VALUE
-bug_str_enc_associate(VALUE str, VALUE enc)
-{
- return rb_enc_associate(str, rb_to_encoding(enc));
-}
-
-void
-Init_enc_associate(VALUE klass)
-{
- rb_define_method(klass, "associate_encoding!", bug_str_enc_associate, 1);
-}
diff --git a/ext/-test-/string/enc_str_buf_cat.c b/ext/-test-/string/enc_str_buf_cat.c
deleted file mode 100644
index 5d583c65dc..0000000000
--- a/ext/-test-/string/enc_str_buf_cat.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-
-static VALUE
-enc_str_buf_cat(VALUE str, VALUE str2)
-{
- return rb_enc_str_buf_cat(str, RSTRING_PTR(str2), RSTRING_LEN(str2), rb_enc_get(str2));
-}
-
-void
-Init_enc_str_buf_cat(VALUE klass)
-{
- rb_define_method(klass, "enc_str_buf_cat", enc_str_buf_cat, 1);
-}
diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c
index 0b3e4a6ff2..793181d148 100644
--- a/ext/-test-/string/init.c
+++ b/ext/-test-/string/init.c
@@ -2,10 +2,18 @@
#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+VALUE
+bug_str_modify(VALUE str)
+{
+ rb_str_modify(str);
+ return str;
+}
+
void
Init_string(void)
{
VALUE mBug = rb_define_module("Bug");
VALUE klass = rb_define_class_under(mBug, "String", rb_cString);
+ rb_define_method(klass, "modify!", bug_str_modify, 0);
TEST_INIT_FUNCS(init);
}
diff --git a/ext/-test-/string/modify.c b/ext/-test-/string/modify.c
deleted file mode 100644
index ddd2efd8f0..0000000000
--- a/ext/-test-/string/modify.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "ruby.h"
-
-VALUE
-bug_str_modify(VALUE str)
-{
- rb_str_modify(str);
- return str;
-}
-
-VALUE
-bug_str_modify_expand(VALUE str, VALUE expand)
-{
- rb_str_modify_expand(str, NUM2LONG(expand));
- return str;
-}
-
-void
-Init_modify(VALUE klass)
-{
- rb_define_method(klass, "modify!", bug_str_modify, 0);
- rb_define_method(klass, "modify_expand!", bug_str_modify_expand, 1);
-}
diff --git a/ext/-test-/string/qsort.c b/ext/-test-/string/qsort.c
deleted file mode 100644
index 0b34936d38..0000000000
--- a/ext/-test-/string/qsort.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "ruby.h"
-#include "ruby/util.h"
-#include "ruby/encoding.h"
-
-struct sort_data {
- rb_encoding *enc;
- long elsize;
-};
-
-static int
-cmp_1(const void *ap, const void *bp, void *dummy)
-{
- struct sort_data *d = dummy;
- VALUE a = rb_enc_str_new(ap, d->elsize, d->enc);
- VALUE b = rb_enc_str_new(bp, d->elsize, d->enc);
- VALUE retval = rb_yield_values(2, a, b);
- return rb_cmpint(retval, a, b);
-}
-
-static int
-cmp_2(const void *ap, const void *bp, void *dummy)
-{
- int a = *(const unsigned char *)ap;
- int b = *(const unsigned char *)bp;
- return a - b;
-}
-
-static VALUE
-bug_str_qsort_bang(int argc, VALUE *argv, VALUE str)
-{
- VALUE beg, len, size;
- long l, b = 0, n, s = 1;
- struct sort_data d;
-
- rb_scan_args(argc, argv, "03", &beg, &len, &size);
- l = RSTRING_LEN(str);
- if (!NIL_P(beg) && (b = NUM2INT(beg)) < 0 && (b += l) < 0) {
- rb_raise(rb_eArgError, "out of bounds");
- }
- if (!NIL_P(size) && (s = NUM2INT(size)) < 0) {
- rb_raise(rb_eArgError, "negative size");
- }
- if (NIL_P(len) ||
- (((n = NUM2INT(len)) < 0) ?
- (rb_raise(rb_eArgError, "negative length"), 0) :
- (b + n * s > l))) {
- n = (l - b) / s;
- }
- rb_str_modify(str);
- d.enc = rb_enc_get(str);
- d.elsize = s;
- ruby_qsort(RSTRING_PTR(str) + b, n, s,
- rb_block_given_p() ? cmp_1 : cmp_2, &d);
- return str;
-}
-
-void
-Init_qsort(VALUE klass)
-{
- rb_define_method(klass, "qsort!", bug_str_qsort_bang, -1);
-}
diff --git a/ext/-test-/struct/extconf.rb b/ext/-test-/struct/extconf.rb
deleted file mode 100644
index 0e4f9551f2..0000000000
--- a/ext/-test-/struct/extconf.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
-$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-inits = $srcs.map {|s| File.basename(s, ".*")}
-inits.delete("init")
-inits.map! {|s|"X(#{s})"}
-$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/struct")
diff --git a/ext/-test-/struct/init.c b/ext/-test-/struct/init.c
deleted file mode 100644
index 459a939e79..0000000000
--- a/ext/-test-/struct/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_struct(void)
-{
- VALUE mBug = rb_define_module("Bug");
- VALUE klass = rb_define_class_under(mBug, "Struct", rb_cStruct);
- TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/struct/member.c b/ext/-test-/struct/member.c
deleted file mode 100644
index 1d404039b4..0000000000
--- a/ext/-test-/struct/member.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-bug_struct_get(VALUE obj, VALUE name)
-{
- ID id = rb_check_id(&name);
-
- if (!id) {
- rb_name_error_str(name, "`%"PRIsVALUE"' is not a struct member", name);
- }
- return rb_struct_getmember(obj, id);
-}
-
-void
-Init_member(VALUE klass)
-{
- rb_define_method(klass, "get", bug_struct_get, 1);
-}
diff --git a/ext/-test-/symbol/extconf.rb b/ext/-test-/symbol/extconf.rb
deleted file mode 100644
index d093ff682a..0000000000
--- a/ext/-test-/symbol/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-$srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
-inits = $srcs.map {|s| File.basename(s, ".*")}
-inits.delete("init")
-inits.map! {|s|"X(#{s})"}
-$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/symbol/symbol")
diff --git a/ext/-test-/symbol/init.c b/ext/-test-/symbol/init.c
deleted file mode 100644
index e740345f2a..0000000000
--- a/ext/-test-/symbol/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_symbol(void)
-{
- VALUE mBug = rb_define_module("Bug");
- VALUE klass = rb_define_class_under(mBug, "Symbol", rb_cSymbol);
- TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/symbol/intern.c b/ext/-test-/symbol/intern.c
deleted file mode 100644
index 6ae86a6104..0000000000
--- a/ext/-test-/symbol/intern.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-bug_sym_interned_p(VALUE self, VALUE name)
-{
- ID id = rb_check_id(&name);
- return id ? Qtrue : Qfalse;
-}
-
-void
-Init_intern(VALUE klass)
-{
- rb_define_singleton_method(klass, "interned?", bug_sym_interned_p, 1);
-}
diff --git a/ext/-test-/symbol/type.c b/ext/-test-/symbol/type.c
deleted file mode 100644
index e0b2fff2f9..0000000000
--- a/ext/-test-/symbol/type.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "ruby.h"
-
-#ifdef HAVE_RB_IS_CONST_NAME
-# define get_symbol_type(type, t, name) do { \
- ID id = rb_check_id(&name); \
- t = (id ? rb_is_##type##_id(id) : rb_is_##type##_name(name)); \
- } while (0)
-#else
-# define get_symbol_type(type, t, name) do { \
- t = rb_is_##type##_id(rb_to_id(name)); \
- } while (0)
-#endif
-
-#define define_symbol_type_p(type) \
-static VALUE \
-bug_sym_##type##_p(VALUE self, VALUE name) \
-{ \
- int t; \
- get_symbol_type(type, t, name); \
- return (t ? Qtrue : Qfalse); \
-}
-
-#define declare_symbol_type_p(type) \
- rb_define_singleton_method(klass, #type"?", bug_sym_##type##_p, 1);
-
-#define FOREACH_ID_TYPES(x) x(const) x(class) x(global) x(instance) x(attrset) x(local) x(junk)
-
-FOREACH_ID_TYPES(define_symbol_type_p)
-
-static VALUE
-bug_sym_attrset(VALUE self, VALUE name)
-{
- ID id = rb_to_id(name);
- id = rb_id_attrset(id);
- return ID2SYM(id);
-}
-
-void
-Init_type(VALUE klass)
-{
- FOREACH_ID_TYPES(declare_symbol_type_p);
- rb_define_singleton_method(klass, "attrset", bug_sym_attrset, 1);
-}
diff --git a/ext/-test-/typeddata/extconf.rb b/ext/-test-/typeddata/extconf.rb
deleted file mode 100644
index 02e3e41c8b..0000000000
--- a/ext/-test-/typeddata/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/typeddata/typeddata")
diff --git a/ext/-test-/typeddata/typeddata.c b/ext/-test-/typeddata/typeddata.c
deleted file mode 100644
index 1c5d677713..0000000000
--- a/ext/-test-/typeddata/typeddata.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <ruby.h>
-
-static const rb_data_type_t test_data = {
- "typed_data",
-};
-
-static VALUE
-test_check(VALUE self, VALUE obj)
-{
- rb_check_typeddata(obj, &test_data);
- return obj;
-}
-
-void
-Init_typeddata(void)
-{
- VALUE mBug = rb_define_module("Bug");
- VALUE klass = rb_define_class_under(mBug, "TypedData", rb_cData);
- rb_define_singleton_method(klass, "check", test_check, 1);
-}
diff --git a/ext/-test-/wait_for_single_fd/depend b/ext/-test-/wait_for_single_fd/depend
deleted file mode 100644
index d9cd50a542..0000000000
--- a/ext/-test-/wait_for_single_fd/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-wait_for_single_fd.o: $(top_srcdir)/thread.c \
- $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/io.h
diff --git a/ext/-test-/wait_for_single_fd/extconf.rb b/ext/-test-/wait_for_single_fd/extconf.rb
deleted file mode 100644
index 1a28b23da3..0000000000
--- a/ext/-test-/wait_for_single_fd/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("-test-/wait_for_single_fd/wait_for_single_fd")
diff --git a/ext/-test-/wait_for_single_fd/wait_for_single_fd.c b/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
deleted file mode 100644
index d406724a3f..0000000000
--- a/ext/-test-/wait_for_single_fd/wait_for_single_fd.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-
-static VALUE
-wait_for_single_fd(VALUE ign, VALUE fd, VALUE events, VALUE timeout)
-{
- struct timeval tv;
- struct timeval *tvp = NULL;
- int rc;
-
- if (!NIL_P(timeout)) {
- tv = rb_time_timeval(timeout);
- tvp = &tv;
- }
-
- rc = rb_wait_for_single_fd(NUM2INT(fd), NUM2INT(events), tvp);
- if (rc == -1)
- rb_sys_fail("rb_wait_for_single_fd");
- return INT2NUM(rc);
-}
-
-void
-Init_wait_for_single_fd(void)
-{
- rb_define_const(rb_cObject, "RB_WAITFD_IN", INT2NUM(RB_WAITFD_IN));
- rb_define_const(rb_cObject, "RB_WAITFD_OUT", INT2NUM(RB_WAITFD_OUT));
- rb_define_const(rb_cObject, "RB_WAITFD_PRI", INT2NUM(RB_WAITFD_PRI));
- rb_define_singleton_method(rb_cIO, "wait_for_single_fd",
- wait_for_single_fd, 3);
-}
diff --git a/ext/-test-/win32/dln/dlntest.c b/ext/-test-/win32/dln/dlntest.c
deleted file mode 100644
index 3e6037ac07..0000000000
--- a/ext/-test-/win32/dln/dlntest.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <ruby.h>
-
-extern __declspec(dllimport) void dlntest_ordinal(void);
-
-static VALUE
-dln_dlntest(VALUE self)
-{
- dlntest_ordinal();
- return self;
-}
-
-void
-Init_dln(void)
-{
- VALUE m = rb_define_module_under(rb_define_module("Bug"), "Win32");
- rb_define_module_function(m, "dlntest", dln_dlntest, 0);
-}
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
deleted file mode 100644
index 0b5089af14..0000000000
--- a/ext/-test-/win32/dln/extconf.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-if $mingw or $mswin
- $objs = ["dlntest.o"]
- testdll = "$(topdir)/dlntest.dll"
- $cleanfiles << testdll
- config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)}
-
- create_makefile("-test-/win32/dln")
- m = File.read("Makefile")
- dlntestlib = "dlntest.#{$LIBEXT}"
- m.sub!(/^OBJS =.*/) {"#{$&} #{dlntestlib}"}
- FileUtils.rm_f(RbConfig.expand(testdll.dup))
- open("Makefile", "wb") do |mf|
- mf.puts m, "\n"
- sodir = $extout ? "$(RUBYARCHDIR)/" : ''
- mf.print "#{sodir}$(DLLIB): #{dlntestlib}"
- mf.puts
- mf.puts "#{dlntestlib}: $(topdir)/dlntest.dll"
- mf.puts
- if $mingw
- mf.puts "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def"
- mf.puts "$(topdir)/dlntest.dll: DLDFLAGS += -Wl,--out-implib,#{dlntestlib}"
- end
- mf.puts depend_rules("$(topdir)/dlntest.dll: libdlntest.o libdlntest.def")
- mf.puts "\t$(ECHO) linking shared-object $(@F)\n"
- mf.print "\t-$(Q)$(RM) $@\n"
- mf.print "\t-$(Q)$(MAKEDIRS) $(@D)\n" if $extout
- link_so = LINK_SO.gsub(/^/, "\t$(Q) ")
- link_so.sub!(/\$\(LOCAL_LIBS\)/, '')
- link_so.gsub!(/-\$\(arch\)/, '')
- link_so.gsub!(/:.so=/, ':.dll=')
- link_so.sub!(/\$\(OBJS\)/, "libdlntest.#{$OBJEXT}")
- link_so.sub!(/\$\(DEFFILE\)/, "$(srcdir)/libdlntest.def")
- mf.puts link_so
- mf.puts
- end
-end
diff --git a/ext/-test-/win32/dln/libdlntest.c b/ext/-test-/win32/dln/libdlntest.c
deleted file mode 100644
index 040ae8125d..0000000000
--- a/ext/-test-/win32/dln/libdlntest.c
+++ /dev/null
@@ -1,4 +0,0 @@
-extern __declspec(dllexport) void
-dlntest_ordinal(void)
-{
-}
diff --git a/ext/-test-/win32/dln/libdlntest.def b/ext/-test-/win32/dln/libdlntest.def
deleted file mode 100644
index 85bc9c7a55..0000000000
--- a/ext/-test-/win32/dln/libdlntest.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-dlntest_ordinal @1 NONAME
diff --git a/ext/-test-/win32/fd_setsize/depend b/ext/-test-/win32/fd_setsize/depend
deleted file mode 100644
index 4936d6b28c..0000000000
--- a/ext/-test-/win32/fd_setsize/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-fd_setsize.o: $(top_srcdir)/win32/win32.c \
- $(hdrdir)/ruby/ruby.h
diff --git a/ext/-test-/win32/fd_setsize/extconf.rb b/ext/-test-/win32/fd_setsize/extconf.rb
deleted file mode 100644
index ed40f8b1d7..0000000000
--- a/ext/-test-/win32/fd_setsize/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if $mingw or $mswin
- create_makefile("-test-/win32/fd_setsize")
-end
diff --git a/ext/-test-/win32/fd_setsize/fd_setsize.c b/ext/-test-/win32/fd_setsize/fd_setsize.c
deleted file mode 100644
index 8da8b1eaa0..0000000000
--- a/ext/-test-/win32/fd_setsize/fd_setsize.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#undef FD_SETSIZE
-/* redefine smaller size then default 64 */
-#define FD_SETSIZE 32
-#include <ruby.h>
-
-static VALUE
-test_select(VALUE self)
-{
- int sd = socket(AF_INET, SOCK_DGRAM, 0);
- struct timeval zero;
- fd_set read;
- fd_set write;
- fd_set error;
-
- zero.tv_sec = 0;
- zero.tv_usec = 0;
-
- FD_ZERO(&read);
- FD_ZERO(&write);
- FD_ZERO(&error);
-
- FD_SET(sd, &read);
- FD_SET(sd, &write);
- FD_SET(sd, &error);
-
- select(sd+1, &read, &write, &error, &zero);
-
- return Qtrue;
-}
-
-static VALUE
-test_fdset(VALUE self)
-{
- int i;
- fd_set set;
-
- FD_ZERO(&set);
-
- for (i = 0; i < FD_SETSIZE * 2; i++) {
- int sd = socket(AF_INET, SOCK_DGRAM, 0);
- FD_SET(sd, &set);
- if (set.fd_count > FD_SETSIZE) {
- return Qfalse;
- }
- }
- return Qtrue;
-}
-
-void
-Init_fd_setsize(void)
-{
- VALUE m = rb_define_module_under(rb_define_module("Bug"), "Win32");
- rb_define_module_function(m, "test_select", test_select, 0);
- rb_define_module_function(m, "test_fdset", test_fdset, 0);
-}
diff --git a/ext/.cvsignore b/ext/.cvsignore
new file mode 100644
index 0000000000..ab2424ff7a
--- /dev/null
+++ b/ext/.cvsignore
@@ -0,0 +1,2 @@
+extinit.c
+*.log
diff --git a/ext/.document b/ext/.document
index d7f7ff0683..3e767d20a8 100644
--- a/ext/.document
+++ b/ext/.document
@@ -2,52 +2,22 @@
bigdecimal/bigdecimal.c
bigdecimal/lib
-continuation/continuation.c
coverage/coverage.c
-curses/curses.c
-date/date_core.c
-dbm/dbm.c
-digest/bubblebabble/bubblebabble.c
digest/digest.c
-digest/lib
-digest/md5/md5init.c
-digest/rmd160/rmd160init.c
-digest/sha1/sha1init.c
-digest/sha2/sha2init.c
-dl/cfunc.c
-dl/cptr.c
-dl/dl.c
-dl/handle.c
-dl/lib
-dl/win32/lib
etc/etc.c
fcntl/fcntl.c
-fiber/fiber.c
-fiddle/closure.c
-fiddle/conversions.c
-fiddle/fiddle.c
-fiddle/function.c
-fiddle/pointer.c
-fiddle/handle.c
-fiddle/lib
-fiddle/win32/lib
gdbm/gdbm.c
-io/console/console.c
-io/nonblock/nonblock.c
-io/wait/lib
+iconv/iconv.c
io/wait/wait.c
+io/wait/lib
json/ext/generator/generator.c
json/ext/parser/parser.c
json/lib
-mathn/complex/complex.c
-mathn/rational/rational.c
-nkf/lib
+nkf/lib/kconv.rb
nkf/nkf.c
objspace/objspace.c
-openssl/lib
openssl/ossl.c
openssl/ossl_asn1.c
-openssl/ossl_bio.c
openssl/ossl_bn.c
openssl/ossl_cipher.c
openssl/ossl_config.c
@@ -56,9 +26,9 @@ openssl/ossl_engine.c
openssl/ossl_hmac.c
openssl/ossl_ns_spki.c
openssl/ossl_ocsp.c
-openssl/ossl_pkcs12.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
@@ -76,26 +46,14 @@ openssl/ossl_x509name.c
openssl/ossl_x509req.c
openssl/ossl_x509revoked.c
openssl/ossl_x509store.c
-pathname/lib
-pathname/pathname.c
-psych/emitter.c
-psych/lib
-psych/parser.c
-psych/psych.c
-psych/to_ruby.c
-psych/yaml_tree.c
-pty/lib
+openssl/lib/openssl/buffering.rb
pty/pty.c
-racc/cparse/cparse.c
+pty/lib
readline/readline.c
-ripper/lib
ripper/ripper.c
-sdbm/init.c
+ripper/lib
socket
stringio/stringio.c
strscan/strscan.c
-syslog/syslog.c
-syslog/lib
-win32ole/lib
-win32ole/win32ole.c
+win32ole
zlib/zlib.c
diff --git a/ext/Setup b/ext/Setup
index 6870035e45..b0f29b9f7b 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -13,6 +13,7 @@
#etc
#fcntl
#gdbm
+#iconv
#io/wait
#nkf
#openssl
@@ -24,6 +25,7 @@
#socket
#stringio
#strscan
+#syck
#syslog
#tk
#win32ole
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index c4028ef1f2..6e0b8ae5a6 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -14,6 +14,7 @@ enumerator
etc
fcntl
gdbm
+iconv
io/wait
nkf
#openssl
@@ -25,6 +26,7 @@ sdbm
socket
stringio
strscan
+syck
syslog
#tk
#win32ole
diff --git a/ext/Setup.emx b/ext/Setup.emx
index bf9e2e32f9..fade917e92 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -14,6 +14,7 @@ enumerator
etc
fcntl
#gdbm
+#iconv
#io/wait
nkf
#openssl
@@ -25,6 +26,7 @@ racc/cparse
socket
stringio
strscan
+#syck
#syslog
#tk
#win32ole
diff --git a/ext/Setup.nacl b/ext/Setup.nacl
deleted file mode 100644
index 3e7f469f92..0000000000
--- a/ext/Setup.nacl
+++ /dev/null
@@ -1,49 +0,0 @@
-# #option nodynamic
-#
-# #Win32API
-# bigdecimal
-# continuation
-# coverage
-# #curses
-# date
-# #dbm
-# digest/bubblebabble
-# digest
-# digest/md5
-# digest/rmd160
-# digest/sha1
-# digest/sha2
-# dl
-# dl/callback
-# #dl/win32
-# etc
-# fcntl
-# fiber
-# #fiddle
-# #gdbm
-# #iconv
-# io/console
-# io/nonblock
-# io/wait
-# #json
-# json/generator
-# json/parser
-# mathn/complex
-# mathn/rational
-# nkf
-# objspace
-# #openssl
-# pathname
-# #psych
-# #pty
-# racc/cparse
-# #readline
-# ripper
-# #sdbm
-# #socket
-# stringio
-# strscan
-# #syslog
-# #tk
-# #tk/tkutil
-# #zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index 8aec238152..c8574ba70a 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -14,6 +14,7 @@ enumerator
etc
fcntl
#gdbm
+#iconv
#io/wait
nkf
#openssl
@@ -25,6 +26,7 @@ sdbm
socket
stringio
strscan
+syck
#syslog
#tk
win32ole
diff --git a/ext/bigdecimal/.cvsignore b/ext/bigdecimal/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/bigdecimal/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/bigdecimal/README b/ext/bigdecimal/README
index 7a4362826c..a233f47f64 100644
--- a/ext/bigdecimal/README
+++ b/ext/bigdecimal/README
@@ -51,10 +51,10 @@ You can redistribute it and/or modify it under either the terms of the GPL
* The Author
-Feel free to send comments and bug reports to the ruby-core team.
+Feel free to send comments and bug reports to the author. Here is the
+author's latest mail address:
- http://bugs.ruby-lang.org
+ shigeo@tinyforest.gr.jp
-------------------------------------------------------
created at: Thu Dec 22 1999
-updated at: Wed Sep 28 2011
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 2b70e1eace..1a712e9cb9 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -13,22 +13,13 @@
*
*/
-/* #define BIGDECIMAL_DEBUG 1 */
-#ifdef BIGDECIMAL_DEBUG
-# define BIGDECIMAL_ENABLE_VPRINT 1
-#endif
-#include "bigdecimal.h"
-
-#ifndef BIGDECIMAL_DEBUG
-# define NDEBUG
-#endif
-#include <assert.h>
-
+#include "ruby/ruby.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <float.h>
#include <math.h>
#include "math.h"
@@ -39,83 +30,33 @@
/* #define ENABLE_NUMERIC_STRING */
VALUE rb_cBigDecimal;
-VALUE rb_mBigMath;
-
-static ID id_BigDecimal_exception_mode;
-static ID id_BigDecimal_rounding_mode;
-static ID id_BigDecimal_precision_limit;
-
-static ID id_up;
-static ID id_down;
-static ID id_truncate;
-static ID id_half_up;
-static ID id_default;
-static ID id_half_down;
-static ID id_half_even;
-static ID id_banker;
-static ID id_ceiling;
-static ID id_ceil;
-static ID id_floor;
-static ID id_to_r;
-static ID id_eq;
+
+#include "bigdecimal.h"
/* MACRO's to guard objects from GC by keeping them in stack */
-#define ENTER(n) volatile VALUE RB_UNUSED_VAR(vStack[n]);int iStack=0
+#define ENTER(n) volatile VALUE vStack[n];int iStack=0
#define PUSH(x) vStack[iStack++] = (VALUE)(x);
#define SAVE(p) PUSH(p->obj);
#define GUARD_OBJ(p,y) {p=y;SAVE(p);}
-#define BASE_FIG RMPD_COMPONENT_FIGURES
-#define BASE RMPD_BASE
-
+#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
-#ifndef RBIGNUM_ZERO_P
-# define RBIGNUM_ZERO_P(x) (RBIGNUM_LEN(x) == 0 || \
- (RBIGNUM_DIGITS(x)[0] == 0 && \
- (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
-#endif
-
-static inline int
-bigzero_p(VALUE x)
-{
- long i;
- BDIGIT *ds = RBIGNUM_DIGITS(x);
-
- for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
- if (ds[i]) return 0;
- }
- return 1;
-}
-
-#ifndef RRATIONAL_ZERO_P
-# define RRATIONAL_ZERO_P(x) (FIXNUM_P(RRATIONAL(x)->num) && \
- FIX2LONG(RRATIONAL(x)->num) == 0)
-#endif
-
-#ifndef RRATIONAL_NEGATIVE_P
-# define RRATIONAL_NEGATIVE_P(x) RTEST(rb_funcall((x), '<', 1, INT2FIX(0)))
-#endif
-
-#ifndef DECIMAL_SIZE_OF_BITS
-#define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
-/* an approximation of ceil(n * log10(2)), upto 65536 at least */
-#endif
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
/*
* ================== Ruby Interface part ==========================
*/
@@ -123,6 +64,9 @@ bigzero_p(VALUE x)
/*
* Returns the BigDecimal version number.
+ *
+ * Ruby 1.8.0 returns 1.0.0.
+ * Ruby 1.8.1 thru 1.8.3 return 1.0.1.
*/
static VALUE
BigDecimal_version(VALUE self)
@@ -130,9 +74,8 @@ BigDecimal_version(VALUE self)
/*
* 1.0.0: Ruby 1.8.0
* 1.0.1: Ruby 1.8.1
- * 1.1.0: Ruby 1.9.3
*/
- return rb_str_new2("1.1.0");
+ return rb_str_new2("1.0.1");
}
/*
@@ -140,9 +83,8 @@ BigDecimal_version(VALUE self)
*/
static unsigned short VpGetException(void);
static void VpSetException(unsigned short f);
-static void VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v);
-static int VpLimitRound(Real *c, size_t ixDigit);
-static Real *VpCopy(Real *pv, Real const* const x);
+static void VpInternalRound(Real *c,U_LONG ixDigit,U_LONG vPrev,U_LONG v);
+static int VpLimitRound(Real *c,U_LONG ixDigit);
/*
* **** BigDecimal part ****
@@ -158,20 +100,14 @@ static size_t
BigDecimal_memsize(const void *ptr)
{
const Real *pv = ptr;
- return pv ? (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT)) : 0;
+ return pv ? (sizeof(*pv) + pv->MaxPrec * sizeof(U_LONG)) : 0;
}
static const rb_data_type_t BigDecimal_data_type = {
"BigDecimal",
- {0, BigDecimal_delete, BigDecimal_memsize,},
+ 0, BigDecimal_delete, BigDecimal_memsize,
};
-static inline int
-is_kind_of_BigDecimal(VALUE const v)
-{
- return rb_typeddata_is_kind_of(v, &BigDecimal_data_type);
-}
-
static VALUE
ToValue(Real *p)
{
@@ -185,107 +121,66 @@ ToValue(Real *p)
return p->obj;
}
-NORETURN(static void cannot_be_coerced_into_BigDecimal(VALUE, VALUE));
-
-static void
-cannot_be_coerced_into_BigDecimal(VALUE exc_class, VALUE v)
-{
- VALUE str;
-
- if (rb_special_const_p(v)) {
- str = rb_inspect(v);
- }
- else {
- str = rb_class_name(rb_obj_class(v));
- }
-
- str = rb_str_cat2(rb_str_dup(str), " can't be coerced into BigDecimal");
- rb_exc_raise(rb_exc_new3(exc_class, str));
-}
-
-static VALUE BigDecimal_div2(int, VALUE*, VALUE);
-
-static Real*
-GetVpValueWithPrec(VALUE v, long prec, int must)
+static Real *
+GetVpValue(VALUE v, int must)
{
Real *pv;
- VALUE num, bg, args[2];
+ VALUE bg;
char szD[128];
VALUE orig = Qundef;
+ int util_loaded = 0;
again:
switch(TYPE(v))
{
- case T_FLOAT:
- if (prec < 0) goto unable_to_coerce_without_prec;
- if (prec > DBL_DIG+1)goto SomeOneMayDoIt;
- v = rb_funcall(v, id_to_r, 0);
- goto again;
- case T_RATIONAL:
- if (prec < 0) goto unable_to_coerce_without_prec;
-
- if (orig == Qundef ? (orig = v, 1) : orig != v) {
- num = RRATIONAL(v)->num;
- pv = GetVpValueWithPrec(num, -1, must);
- if (pv == NULL) goto SomeOneMayDoIt;
-
- args[0] = RRATIONAL(v)->den;
- args[1] = LONG2NUM(prec);
- v = BigDecimal_div2(2, args, ToValue(pv));
- goto again;
- }
-
- v = orig;
- goto SomeOneMayDoIt;
-
- case T_DATA:
- if (is_kind_of_BigDecimal(v)) {
- pv = DATA_PTR(v);
- return pv;
- }
- else {
- goto SomeOneMayDoIt;
- }
- break;
+ case T_RATIONAL:
+ if(orig == Qundef ? (orig = v, 1) : orig != v) {
+ if(!util_loaded) {
+ rb_require("bigdecimal/util");
+ util_loaded = 1;
+ }
+ v = rb_funcall2(v, rb_intern("to_d"), 0, 0);
+ goto again;
+ }
+ v = orig;
+ goto SomeOneMayDoIt;
- case T_FIXNUM:
- sprintf(szD, "%ld", FIX2LONG(v));
- return VpCreateRbObject(VpBaseFig() * 2 + 1, szD);
+ case T_DATA:
+ if(rb_typeddata_is_kind_of(v, &BigDecimal_data_type)) {
+ pv = DATA_PTR(v);
+ return pv;
+ } else {
+ goto SomeOneMayDoIt;
+ }
+ break;
+ case T_FIXNUM:
+ sprintf(szD, "%ld", FIX2LONG(v));
+ return VpCreateRbObject(VpBaseFig() * 2 + 1, szD);
#ifdef ENABLE_NUMERIC_STRING
- case T_STRING:
- SafeStringValue(v);
- return VpCreateRbObject(strlen(RSTRING_PTR(v)) + VpBaseFig() + 1,
- RSTRING_PTR(v));
+ case T_STRING:
+ SafeStringValue(v);
+ return VpCreateRbObject(strlen(RSTRING_PTR(v)) + VpBaseFig() + 1,
+ RSTRING_PTR(v));
#endif /* ENABLE_NUMERIC_STRING */
- case T_BIGNUM:
- bg = rb_big2str(v, 10);
- return VpCreateRbObject(strlen(RSTRING_PTR(bg)) + VpBaseFig() + 1,
- RSTRING_PTR(bg));
- default:
- goto SomeOneMayDoIt;
+ case T_BIGNUM:
+ bg = rb_big2str(v, 10);
+ return VpCreateRbObject(strlen(RSTRING_PTR(bg)) + VpBaseFig() + 1,
+ RSTRING_PTR(bg));
+ default:
+ goto SomeOneMayDoIt;
}
SomeOneMayDoIt:
- if (must) {
- cannot_be_coerced_into_BigDecimal(rb_eTypeError, v);
+ if(must) {
+ rb_raise(rb_eTypeError, "%s can't be coerced into BigDecimal",
+ rb_special_const_p(v)?
+ RSTRING_PTR(rb_inspect(v)):
+ rb_obj_classname(v)
+ );
}
return NULL; /* NULL means to coerce */
-
-unable_to_coerce_without_prec:
- if (must) {
- rb_raise(rb_eArgError,
- "%"PRIsVALUE" can't be coerced into BigDecimal without a precision",
- RB_OBJ_CLASSNAME(v));
- }
- return NULL;
-}
-
-static Real*
-GetVpValue(VALUE v, int must)
-{
- return GetVpValueWithPrec(v, -1, must);
}
/* call-seq:
@@ -323,43 +218,26 @@ BigDecimal_prec(VALUE self)
return obj;
}
-/*
- * call-seq: hash
- *
- * Creates a hash for this BigDecimal.
- *
- * Two BigDecimals with equal sign,
- * fractional part and exponent have the same hash.
- */
static VALUE
BigDecimal_hash(VALUE self)
{
ENTER(1);
Real *p;
- st_index_t hash;
+ U_LONG hash,i;
GUARD_OBJ(p,GetVpValue(self,1));
- hash = (st_index_t)p->sign;
+ hash = (U_LONG)p->sign;
/* hash!=2: the case for 0(1),NaN(0) or +-Infinity(3) is sign itself */
- if(hash == 2 || hash == (st_index_t)-2) {
- hash ^= rb_memhash(p->frac, sizeof(BDIGIT)*p->Prec);
- hash += p->exponent;
+ if(hash==2) {
+ for(i = 0; i < p->Prec;i++) {
+ hash = 31 * hash + p->frac[i];
+ hash ^= p->frac[i];
+ }
+ hash += p->exponent;
}
return INT2FIX(hash);
}
-/*
- * call-seq: _dump
- *
- * Method used to provide marshalling support.
- *
- * inf = BigDecimal.new('Infinity')
- * => #<BigDecimal:1e16fa8,'Infinity',9(9)>
- * BigDecimal._load(inf._dump)
- * => #<BigDecimal:1df8dc8,'Infinity',9(9)>
- *
- * See the Marshal module.
- */
static VALUE
BigDecimal_dump(int argc, VALUE *argv, VALUE self)
{
@@ -373,7 +251,7 @@ BigDecimal_dump(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(vp,GetVpValue(self,1));
dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
psz = RSTRING_PTR(dump);
- sprintf(psz, "%"PRIuSIZE":", VpMaxPrec(vp)*VpBaseFig());
+ sprintf(psz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
VpToString(vp, psz+strlen(psz), 0, 0);
rb_str_resize(dump, strlen(psz));
return dump;
@@ -407,80 +285,44 @@ BigDecimal_load(VALUE self, VALUE str)
return ToValue(pv);
}
-static unsigned short
-check_rounding_mode(VALUE const v)
-{
- unsigned short sw;
- ID id;
- switch (TYPE(v)) {
- case T_SYMBOL:
- id = SYM2ID(v);
- if (id == id_up)
- return VP_ROUND_UP;
- if (id == id_down || id == id_truncate)
- return VP_ROUND_DOWN;
- if (id == id_half_up || id == id_default)
- return VP_ROUND_HALF_UP;
- if (id == id_half_down)
- return VP_ROUND_HALF_DOWN;
- if (id == id_half_even || id == id_banker)
- return VP_ROUND_HALF_EVEN;
- if (id == id_ceiling || id == id_ceil)
- return VP_ROUND_CEIL;
- if (id == id_floor)
- return VP_ROUND_FLOOR;
- rb_raise(rb_eArgError, "invalid rounding mode");
-
- default:
- break;
- }
-
- Check_Type(v, T_FIXNUM);
- sw = (unsigned short)FIX2UINT(v);
- if (!VpIsRoundMode(sw)) {
- rb_raise(rb_eArgError, "invalid rounding mode");
- }
- return sw;
-}
-
-/* call-seq:
- * BigDecimal.mode(mode, value)
- *
- * Controls handling of arithmetic exceptions and rounding. If no value
- * is supplied, the current value is returned.
- *
- * Six values of the mode parameter control the handling of arithmetic
- * exceptions:
- *
- * BigDecimal::EXCEPTION_NaN
- * BigDecimal::EXCEPTION_INFINITY
- * BigDecimal::EXCEPTION_UNDERFLOW
- * BigDecimal::EXCEPTION_OVERFLOW
- * BigDecimal::EXCEPTION_ZERODIVIDE
- * BigDecimal::EXCEPTION_ALL
- *
- * For each mode parameter above, if the value set is false, computation
- * continues after an arithmetic exception of the appropriate type.
- * When computation continues, results are as follows:
- *
- * EXCEPTION_NaN:: NaN
- * EXCEPTION_INFINITY:: +infinity or -infinity
- * EXCEPTION_UNDERFLOW:: 0
- * EXCEPTION_OVERFLOW:: +infinity or -infinity
- * EXCEPTION_ZERODIVIDE:: +infinity or -infinity
- *
- * One value of the mode parameter controls the rounding of numeric values:
- * BigDecimal::ROUND_MODE. The values it can take are:
- *
- * ROUND_UP, :up:: round away from zero
- * ROUND_DOWN, :down, :truncate:: round towards zero (truncate)
- * ROUND_HALF_UP, :half_up, :default:: round towards the nearest neighbor, unless both neighbors are equidistant, in which case round away from zero. (default)
- * ROUND_HALF_DOWN, :half_down:: round towards the nearest neighbor, unless both neighbors are equidistant, in which case round towards zero.
- * ROUND_HALF_EVEN, :half_even, :banker:: round towards the nearest neighbor, unless both neighbors are equidistant, in which case round towards the even neighbor (Banker's rounding)
- * ROUND_CEILING, :ceiling, :ceil:: round towards positive infinity (ceil)
- * ROUND_FLOOR, :floor:: round towards negative infinity (floor)
- *
- */
+ /* call-seq:
+ * BigDecimal.mode(mode, value)
+ *
+ * Controls handling of arithmetic exceptions and rounding. If no value
+ * is supplied, the current value is returned.
+ *
+ * Six values of the mode parameter control the handling of arithmetic
+ * exceptions:
+ *
+ * BigDecimal::EXCEPTION_NaN
+ * BigDecimal::EXCEPTION_INFINITY
+ * BigDecimal::EXCEPTION_UNDERFLOW
+ * BigDecimal::EXCEPTION_OVERFLOW
+ * BigDecimal::EXCEPTION_ZERODIVIDE
+ * BigDecimal::EXCEPTION_ALL
+ *
+ * For each mode parameter above, if the value set is false, computation
+ * continues after an arithmetic exception of the appropriate type.
+ * When computation continues, results are as follows:
+ *
+ * EXCEPTION_NaN:: NaN
+ * EXCEPTION_INFINITY:: +infinity or -infinity
+ * EXCEPTION_UNDERFLOW:: 0
+ * EXCEPTION_OVERFLOW:: +infinity or -infinity
+ * EXCEPTION_ZERODIVIDE:: +infinity or -infinity
+ *
+ * One value of the mode parameter controls the rounding of numeric values:
+ * BigDecimal::ROUND_MODE. The values it can take are:
+ *
+ * ROUND_UP:: round away from zero
+ * ROUND_DOWN:: round towards zero (truncate)
+ * ROUND_HALF_UP:: round up if the appropriate digit >= 5, otherwise truncate (default)
+ * ROUND_HALF_DOWN:: round up if the appropriate digit >= 6, otherwise truncate
+ * ROUND_HALF_EVEN:: round towards the even neighbor (Banker's rounding)
+ * ROUND_CEILING:: round towards positive infinity (ceil)
+ * ROUND_FLOOR:: round towards negative infinity (floor)
+ *
+ */
static VALUE
BigDecimal_mode(int argc, VALUE *argv, VALUE self)
{
@@ -498,7 +340,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
fo = VpGetException();
if(val==Qnil) return INT2FIX(fo);
if(val!=Qfalse && val!=Qtrue) {
- rb_raise(rb_eArgError, "second argument must be true or false");
+ rb_raise(rb_eTypeError, "second argument must be true or false");
return Qnil; /* Not reached */
}
if(f&VP_EXCEPTION_INFINITY) {
@@ -523,54 +365,57 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
fo = VpGetException();
return INT2FIX(fo);
}
- if (VP_ROUND_MODE == f) {
- /* Rounding mode setting */
- unsigned short sw;
- fo = VpGetRoundMode();
- if (NIL_P(val)) return INT2FIX(fo);
- sw = check_rounding_mode(val);
- fo = VpSetRoundMode(sw);
- return INT2FIX(fo);
+ if(VP_ROUND_MODE==f) {
+ /* Rounding mode setting */
+ fo = VpGetRoundMode();
+ if(val==Qnil) return INT2FIX(fo);
+ Check_Type(val, T_FIXNUM);
+ if(!VpIsRoundMode(FIX2INT(val))) {
+ rb_raise(rb_eTypeError, "invalid rounding mode");
+ return Qnil;
+ }
+ fo = VpSetRoundMode((unsigned long)FIX2INT(val));
+ return INT2FIX(fo);
}
rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid");
return Qnil;
}
-static size_t
+static U_LONG
GetAddSubPrec(Real *a, Real *b)
{
- size_t mxs;
- size_t mx = a->Prec;
- SIGNED_VALUE d;
+ U_LONG mxs;
+ U_LONG mx = a->Prec;
+ S_INT d;
- if(!VpIsDef(a) || !VpIsDef(b)) return (size_t)-1L;
+ if(!VpIsDef(a) || !VpIsDef(b)) return (-1L);
if(mx < b->Prec) mx = b->Prec;
if(a->exponent!=b->exponent) {
mxs = mx;
d = a->exponent - b->exponent;
- if (d < 0) d = -d;
- mx = mx + (size_t)d;
- if (mx<mxs) {
+ if(d<0) d = -d;
+ mx = mx+(U_LONG)d;
+ if(mx<mxs) {
return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
}
}
return mx;
}
-static SIGNED_VALUE
+static S_INT
GetPositiveInt(VALUE v)
{
- SIGNED_VALUE n;
+ S_INT n;
Check_Type(v, T_FIXNUM);
n = FIX2INT(v);
- if (n < 0) {
+ if(n < 0) {
rb_raise(rb_eArgError, "argument must be positive");
}
return n;
}
VP_EXPORT Real *
-VpNewRbClass(size_t mx, const char *str, VALUE klass)
+VpNewRbClass(U_LONG mx, char *str, VALUE klass)
{
Real *pv = VpAlloc(mx,str);
pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
@@ -578,32 +423,13 @@ VpNewRbClass(size_t mx, const char *str, VALUE klass)
}
VP_EXPORT Real *
-VpCreateRbObject(size_t mx, const char *str)
+VpCreateRbObject(U_LONG mx, const char *str)
{
Real *pv = VpAlloc(mx,str);
pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
return pv;
}
-#define VpAllocReal(prec) (Real *)VpMemAlloc(offsetof(Real, frac) + (prec) * sizeof(BDIGIT))
-#define VpReallocReal(ptr, prec) (Real *)VpMemRealloc((ptr), offsetof(Real, frac) + (prec) * sizeof(BDIGIT))
-
-static Real *
-VpCopy(Real *pv, Real const* const x)
-{
- assert(x != NULL);
-
- pv = VpReallocReal(pv, x->MaxPrec);
- pv->MaxPrec = x->MaxPrec;
- pv->Prec = x->Prec;
- pv->exponent = x->exponent;
- pv->sign = x->sign;
- pv->flag = x->flag;
- MEMCPY(pv->frac, x->frac, BDIGIT, pv->MaxPrec);
-
- return pv;
-}
-
/* Returns True if the value is Not a Number */
static VALUE
BigDecimal_IsNaN(VALUE self)
@@ -657,7 +483,7 @@ static VALUE
BigDecimal_to_i(VALUE self)
{
ENTER(5);
- ssize_t e, nf;
+ S_LONG e,nf;
Real *p;
GUARD_OBJ(p,GetVpValue(self,1));
@@ -667,30 +493,26 @@ BigDecimal_to_i(VALUE self)
if(e<=0) return INT2FIX(0);
nf = VpBaseFig();
if(e<=nf) {
- return LONG2NUM((long)(VpGetSign(p)*(BDIGIT_DBL_SIGNED)p->frac[0]));
+ e = VpGetSign(p)*p->frac[0];
+ return INT2FIX(e);
}
else {
VALUE a = BigDecimal_split(self);
VALUE digits = RARRAY_PTR(a)[1];
VALUE numerator = rb_funcall(digits, rb_intern("to_i"), 0);
- VALUE ret;
- ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
+ S_LONG dpower = e - RSTRING_LEN(digits);
if (VpGetSign(p) < 0) {
numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
}
if (dpower < 0) {
- ret = rb_funcall(numerator, rb_intern("div"), 1,
+ return rb_funcall(numerator, rb_intern("div"), 1,
rb_funcall(INT2FIX(10), rb_intern("**"), 1,
INT2FIX(-dpower)));
}
- else
- ret = rb_funcall(numerator, '*', 1,
- rb_funcall(INT2FIX(10), rb_intern("**"), 1,
- INT2FIX(dpower)));
- if (RB_TYPE_P(ret, T_FLOAT))
- rb_raise(rb_eFloatDomainError, "Infinity");
- return ret;
+ return rb_funcall(numerator, '*', 1,
+ rb_funcall(INT2FIX(10), rb_intern("**"), 1,
+ INT2FIX(dpower)));
}
}
@@ -704,42 +526,25 @@ BigDecimal_to_f(VALUE self)
ENTER(1);
Real *p;
double d;
- SIGNED_VALUE e;
+ 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 > (SIGNED_VALUE)(DBL_MAX_10_EXP+BASE_FIG))
- goto overflow;
- if (e < (SIGNED_VALUE)(DBL_MIN_10_EXP-BASE_FIG))
- goto underflow;
-
+ 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);
VpToString(p, buf, 0, 0);
errno = 0;
d = strtod(buf, 0);
- if (errno == ERANGE) {
- if (d == 0.0) goto underflow;
- if (fabs(d) >= HUGE_VAL) goto overflow;
+ if(errno == ERANGE) {
+ erange:
+ VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
+ if(d>0.0) d = VpGetDoublePosInf();
+ else d = VpGetDoubleNegInf();
}
return rb_float_new(d);
-
-overflow:
- VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
- if (p->sign >= 0)
- return rb_float_new(VpGetDoublePosInf());
- else
- return rb_float_new(VpGetDoubleNegInf());
-
-underflow:
- VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
- if (p->sign >= 0)
- return rb_float_new(0.0);
- else
- return rb_float_new(-0.0);
}
@@ -749,7 +554,7 @@ static VALUE
BigDecimal_to_r(VALUE self)
{
Real *p;
- ssize_t sign, power, denomi_power;
+ S_LONG sign, power, denomi_power;
VALUE a, digits, numerator;
p = GetVpValue(self,1);
@@ -797,43 +602,22 @@ BigDecimal_coerce(VALUE self, VALUE other)
ENTER(2);
VALUE obj;
Real *b;
-
- if (RB_TYPE_P(other, T_FLOAT)) {
+ if (TYPE(other) == T_FLOAT) {
obj = rb_assoc_new(other, BigDecimal_to_f(self));
- }
- else {
- if (RB_TYPE_P(other, T_RATIONAL)) {
- Real* pv = DATA_PTR(self);
- GUARD_OBJ(b, GetVpValueWithPrec(other, pv->Prec*VpBaseFig(), 1));
- }
- else {
- GUARD_OBJ(b, GetVpValue(other, 1));
- }
+ } else {
+ GUARD_OBJ(b,GetVpValue(other,1));
obj = rb_assoc_new(b->obj, self);
}
-
return obj;
}
-/*
- * call-seq: +@
- *
- * Return self.
- *
- * e.g.
- * b = +a # b == a
- */
static VALUE
BigDecimal_uplus(VALUE self)
{
return self;
}
- /*
- * Document-method: BigDecimal#add
- * Document-method: BigDecimal#+
- *
- * call-seq:
+ /* call-seq:
* add(value, digits)
*
* Add the specified value.
@@ -842,47 +626,31 @@ BigDecimal_uplus(VALUE self)
* c = a.add(b,n)
* c = a + b
*
- * digits:: If specified and less than the number of significant digits of the
- * result, the result is rounded to that number of digits, according to
- * BigDecimal.mode.
+ * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
*/
static VALUE
BigDecimal_add(VALUE self, VALUE r)
{
ENTER(5);
Real *c, *a, *b;
- size_t mx;
-
- GUARD_OBJ(a, GetVpValue(self, 1));
- if (RB_TYPE_P(r, T_FLOAT)) {
- b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
- }
- else if (RB_TYPE_P(r, T_RATIONAL)) {
- b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
- }
- else {
- b = GetVpValue(r,0);
- }
-
- if (!b) return DoSomeOne(self,r,'+');
+ U_LONG mx;
+ GUARD_OBJ(a,GetVpValue(self,1));
+ b = GetVpValue(r,0);
+ if(!b) return DoSomeOne(self,r,'+');
SAVE(b);
-
- if (VpIsNaN(b)) return b->obj;
- if (VpIsNaN(a)) return a->obj;
-
- mx = GetAddSubPrec(a, b);
- if (mx == (size_t)-1L) {
- GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
- VpAddSub(c, a, b, 1);
- }
- else {
- GUARD_OBJ(c, VpCreateRbObject(mx * (VpBaseFig() + 1), "0"));
- if(!mx) {
- VpSetInf(c, VpGetSign(a));
- }
- else {
- VpAddSub(c, a, b, 1);
- }
+ if(VpIsNaN(b)) return b->obj;
+ if(VpIsNaN(a)) return a->obj;
+ mx = GetAddSubPrec(a,b);
+ if(mx==(U_LONG)-1L) {
+ GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
+ VpAddSub(c, a, b, 1);
+ } else {
+ GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
+ if(!mx) {
+ VpSetInf(c,VpGetSign(a));
+ } else {
+ VpAddSub(c, a, b, 1);
+ }
}
return ToValue(c);
}
@@ -896,28 +664,17 @@ BigDecimal_add(VALUE self, VALUE r)
* c = a.sub(b,n)
* c = a - b
*
- * digits:: If specified and less than the number of significant digits of the
- * result, the result is rounded to that number of digits, according to
- * BigDecimal.mode.
+ * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
*/
static VALUE
BigDecimal_sub(VALUE self, VALUE r)
{
ENTER(5);
Real *c, *a, *b;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
- if (RB_TYPE_P(r, T_FLOAT)) {
- b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
- }
- else if (RB_TYPE_P(r, T_RATIONAL)) {
- b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
- }
- else {
- b = GetVpValue(r,0);
- }
-
+ b = GetVpValue(r,0);
if(!b) return DoSomeOne(self,r,'-');
SAVE(b);
@@ -925,7 +682,7 @@ BigDecimal_sub(VALUE self, VALUE r)
if(VpIsNaN(a)) return a->obj;
mx = GetAddSubPrec(a,b);
- if (mx == (size_t)-1L) {
+ if(mx==(U_LONG)-1L) {
GUARD_OBJ(c,VpCreateRbObject(VpBaseFig() + 1, "0"));
VpAddSub(c, a, b, -1);
} else {
@@ -943,94 +700,36 @@ static VALUE
BigDecimalCmp(VALUE self, VALUE r,char op)
{
ENTER(5);
- SIGNED_VALUE e;
- Real *a, *b=0;
+ S_INT e;
+ Real *a, *b;
GUARD_OBJ(a,GetVpValue(self,1));
- switch (TYPE(r)) {
- case T_DATA:
- if (!is_kind_of_BigDecimal(r)) break;
- /* fall through */
- case T_FIXNUM:
- /* fall through */
- case T_BIGNUM:
- GUARD_OBJ(b, GetVpValue(r,0));
- break;
-
- case T_FLOAT:
- GUARD_OBJ(b, GetVpValueWithPrec(r, DBL_DIG+1, 0));
- break;
-
- case T_RATIONAL:
- GUARD_OBJ(b, GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 0));
- break;
-
- default:
- break;
- }
- if (b == NULL) {
+ b = GetVpValue(r,0);
+ if(!b) {
ID f = 0;
- switch (op) {
- case '*':
- return rb_num_coerce_cmp(self, r, rb_intern("<=>"));
-
- case '=':
- return RTEST(rb_num_coerce_cmp(self, r, rb_intern("=="))) ? Qtrue : Qfalse;
-
- case 'G':
- f = rb_intern(">=");
- break;
-
- case 'L':
- f = rb_intern("<=");
- break;
-
- case '>':
- /* fall through */
- case '<':
- f = (ID)op;
- break;
-
- default:
- break;
+ switch(op)
+ {
+ case '*': return rb_num_coerce_cmp(self,r,rb_intern("<=>"));
+ case '=': return RTEST(rb_num_coerce_cmp(self,r,rb_intern("=="))) ? Qtrue : Qfalse;
+ case 'G': f = rb_intern(">="); break;
+ case 'L': f = rb_intern("<="); break;
+ case '>': case '<': f = (ID)op; break;
}
- return rb_num_coerce_relop(self, r, f);
+ return rb_num_coerce_relop(self,r,f);
}
SAVE(b);
e = VpComp(a, b);
- if (e == 999)
- return (op == '*') ? Qnil : Qfalse;
- switch (op) {
- case '*':
- return INT2FIX(e); /* any op */
-
- case '=':
- if(e==0) return Qtrue;
- return Qfalse;
-
- case 'G':
- if(e>=0) return Qtrue;
- return Qfalse;
-
- case '>':
- if(e> 0) return Qtrue;
- return Qfalse;
-
- case 'L':
- if(e<=0) return Qtrue;
- return Qfalse;
-
- case '<':
- if(e< 0) return Qtrue;
- return Qfalse;
-
- default:
- break;
+ if(e==999) return (op == '*') ? Qnil : Qfalse;
+ switch(op)
+ {
+ case '*': return INT2FIX(e); /* any op */
+ case '=': if(e==0) return Qtrue ; return Qfalse;
+ case 'G': if(e>=0) return Qtrue ; return Qfalse;
+ case '>': if(e> 0) return Qtrue ; return Qfalse;
+ case 'L': if(e<=0) return Qtrue ; return Qfalse;
+ case '<': if(e< 0) return Qtrue ; return Qfalse;
}
-
rb_bug("Undefined operation in BigDecimalCmp()");
-
- UNREACHABLE;
}
/* Returns True if the value is zero. */
@@ -1077,9 +776,8 @@ BigDecimal_eq(VALUE self, VALUE r)
/* call-seq:
* a < b
*
- * Returns true if a is less than b.
- *
- * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce).
+ * Returns true if a is less than b. Values may be coerced to perform the
+ * comparison (see ==, coerce).
*/
static VALUE
BigDecimal_lt(VALUE self, VALUE r)
@@ -1090,9 +788,8 @@ BigDecimal_lt(VALUE self, VALUE r)
/* call-seq:
* a <= b
*
- * Returns true if a is less than or equal to b.
- *
- * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce).
+ * Returns true if a is less than or equal to b. Values may be coerced to
+ * perform the comparison (see ==, coerce).
*/
static VALUE
BigDecimal_le(VALUE self, VALUE r)
@@ -1103,9 +800,8 @@ BigDecimal_le(VALUE self, VALUE r)
/* call-seq:
* a > b
*
- * Returns true if a is greater than b.
- *
- * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce).
+ * Returns true if a is greater than b. Values may be coerced to
+ * perform the comparison (see ==, coerce).
*/
static VALUE
BigDecimal_gt(VALUE self, VALUE r)
@@ -1116,9 +812,8 @@ BigDecimal_gt(VALUE self, VALUE r)
/* call-seq:
* a >= b
*
- * Returns true if a is greater than or equal to b.
- *
- * Values may be coerced to perform the comparison (see ==, BigDecimal#coerce)
+ * Returns true if a is greater than or equal to b. Values may be coerced to
+ * perform the comparison (see ==, coerce)
*/
static VALUE
BigDecimal_ge(VALUE self, VALUE r)
@@ -1126,15 +821,6 @@ BigDecimal_ge(VALUE self, VALUE r)
return BigDecimalCmp(self, r, 'G');
}
-/*
- * call-seq: -@
- *
- * Return the negation of self.
- *
- * e.g.
- * b = -a
- * b == a * -1
- */
static VALUE
BigDecimal_neg(VALUE self)
{
@@ -1146,10 +832,8 @@ BigDecimal_neg(VALUE self)
return ToValue(c);
}
- /*
- * Document-method: BigDecimal#mult
- *
- * call-seq: mult(value, digits)
+ /* call-seq:
+ * mult(value, digits)
*
* Multiply by the specified value.
*
@@ -1157,28 +841,17 @@ BigDecimal_neg(VALUE self)
* c = a.mult(b,n)
* c = a * b
*
- * digits:: If specified and less than the number of significant digits of the
- * result, the result is rounded to that number of digits, according to
- * BigDecimal.mode.
+ * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
*/
static VALUE
BigDecimal_mult(VALUE self, VALUE r)
{
ENTER(5);
Real *c, *a, *b;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
- if (RB_TYPE_P(r, T_FLOAT)) {
- b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
- }
- else if (RB_TYPE_P(r, T_RATIONAL)) {
- b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
- }
- else {
- b = GetVpValue(r,0);
- }
-
+ b = GetVpValue(r,0);
if(!b) return DoSomeOne(self,r,'*');
SAVE(b);
@@ -1194,25 +867,15 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
{
ENTER(5);
Real *a, *b;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
- if (RB_TYPE_P(r, T_FLOAT)) {
- b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
- }
- else if (RB_TYPE_P(r, T_RATIONAL)) {
- b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
- }
- else {
- b = GetVpValue(r,0);
- }
-
+ b = GetVpValue(r,0);
if(!b) return DoSomeOne(self,r,'/');
SAVE(b);
-
*div = b;
- mx = a->Prec + vabs(a->exponent);
- if(mx<b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
+ mx = a->Prec+abs(a->exponent);
+ if(mx<b->Prec+abs(b->exponent)) mx = b->Prec+abs(b->exponent);
mx =(mx + 1) * VpBaseFig();
GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
@@ -1229,15 +892,13 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
* e.g.
* c = a.div(b,n)
*
- * digits:: If specified and less than the number of significant digits of the
- * result, the result is rounded to that number of digits, according to
- * BigDecimal.mode.
+ * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
*
* If digits is 0, the result is the same as the / operator. If not, the
* result is an integer BigDecimal, by analogy with Float#div.
*
- * The alias quo is provided since <code>div(value, 0)</code> is the same as
- * computing the quotient; see BigDecimal#divmod.
+ * The alias quo is provided since div(value, 0) is the same as computing
+ * the quotient; see divmod.
*/
static VALUE
BigDecimal_div(VALUE self, VALUE r)
@@ -1254,7 +915,7 @@ BigDecimal_div(VALUE self, VALUE r)
*/
/* Round */
if(VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
- VpInternalRound(c, 0, c->frac[c->Prec-1], (BDIGIT)(VpBaseVal()*(BDIGIT_DBL)res->frac[0]/div->frac[0]));
+ VpInternalRound(c,0,c->frac[c->Prec-1],(VpBaseVal()*res->frac[0])/div->frac[0]);
}
return ToValue(c);
}
@@ -1269,19 +930,10 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
ENTER(8);
Real *c=NULL, *d=NULL, *res=NULL;
Real *a, *b;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
- if (RB_TYPE_P(r, T_FLOAT)) {
- b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
- }
- else if (RB_TYPE_P(r, T_RATIONAL)) {
- b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
- }
- else {
- b = GetVpValue(r,0);
- }
-
+ b = GetVpValue(r,0);
if(!b) return Qfalse;
SAVE(b);
@@ -1292,7 +944,7 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
}
if(VpIsInf(a)) {
GUARD_OBJ(d,VpCreateRbObject(1, "0"));
- VpSetInf(d, (SIGNED_VALUE)(VpGetSign(a) == VpGetSign(b) ? 1 : -1));
+ VpSetInf(d,(S_INT)(VpGetSign(a) == VpGetSign(b) ? 1 : -1));
GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
*div = d;
*mod = c;
@@ -1312,8 +964,8 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
return Qtrue;
}
- mx = a->Prec + vabs(a->exponent);
- if(mx<b->Prec + vabs(b->exponent)) mx = b->Prec + vabs(b->exponent);
+ mx = a->Prec+abs(a->exponent);
+ if(mx<b->Prec+abs(b->exponent)) mx = b->Prec+abs(b->exponent);
mx =(mx + 1) * VpBaseFig();
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
@@ -1347,9 +999,7 @@ NaN:
* a % b
* a.modulo(b)
*
- * Returns the modulus from dividing by b.
- *
- * See BigDecimal#divmod.
+ * Returns the modulus from dividing by b. See divmod.
*/
static VALUE
BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
@@ -1368,21 +1018,12 @@ static VALUE
BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
{
ENTER(10);
- size_t mx;
+ U_LONG mx;
Real *a=NULL, *b=NULL, *c=NULL, *res=NULL, *d=NULL, *rr=NULL, *ff=NULL;
Real *f=NULL;
GUARD_OBJ(a,GetVpValue(self,1));
- if (RB_TYPE_P(r, T_FLOAT)) {
- b = GetVpValueWithPrec(r, DBL_DIG+1, 1);
- }
- else if (RB_TYPE_P(r, T_RATIONAL)) {
- b = GetVpValueWithPrec(r, a->Prec*VpBaseFig(), 1);
- }
- else {
- b = GetVpValue(r,0);
- }
-
+ b = GetVpValue(r,0);
if(!b) return DoSomeOne(self,r,rb_intern("remainder"));
SAVE(b);
@@ -1456,9 +1097,6 @@ BigDecimal_divmod(VALUE self, VALUE r)
return DoSomeOne(self,r,rb_intern("divmod"));
}
-/*
- * See BigDecimal#quo
- */
static VALUE
BigDecimal_div2(int argc, VALUE *argv, VALUE self)
{
@@ -1473,13 +1111,13 @@ BigDecimal_div2(int argc, VALUE *argv, VALUE self)
}
return DoSomeOne(self,b,rb_intern("div"));
} else { /* div in BigDecimal sense */
- SIGNED_VALUE ix = GetPositiveInt(n);
- if (ix == 0) return BigDecimal_div(self, b);
+ S_INT ix = GetPositiveInt(n);
+ if(ix==0) return BigDecimal_div(self,b);
else {
Real *res=NULL;
Real *av=NULL, *bv=NULL, *cv=NULL;
- size_t mx = (ix+VpBaseFig()*2);
- size_t pl = VpSetPrecLimit(0);
+ U_LONG mx = (ix+VpBaseFig()*2);
+ U_LONG pl = VpSetPrecLimit(0);
GUARD_OBJ(cv,VpCreateRbObject(mx,"0"));
GUARD_OBJ(av,GetVpValue(self,1));
@@ -1489,7 +1127,7 @@ BigDecimal_div2(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(res,VpCreateRbObject((mx * 2 + 2)*VpBaseFig(), "#0"));
VpDivd(cv,res,av,bv);
VpSetPrecLimit(pl);
- VpLeftRound(cv,VpGetRoundMode(),ix);
+ VpLeftRound(cv,(int)VpGetRoundMode(),ix);
return ToValue(cv);
}
}
@@ -1500,14 +1138,14 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
{
ENTER(2);
Real *cv;
- SIGNED_VALUE mx = GetPositiveInt(n);
- if (mx == 0) return BigDecimal_add(self, b);
+ S_INT mx = GetPositiveInt(n);
+ if(mx==0) return BigDecimal_add(self,b);
else {
- size_t pl = VpSetPrecLimit(0);
+ U_LONG pl = VpSetPrecLimit(0);
VALUE c = BigDecimal_add(self,b);
VpSetPrecLimit(pl);
GUARD_OBJ(cv,GetVpValue(c,1));
- VpLeftRound(cv,VpGetRoundMode(),mx);
+ VpLeftRound(cv,(int)VpGetRoundMode(),mx);
return ToValue(cv);
}
}
@@ -1517,14 +1155,14 @@ BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
{
ENTER(2);
Real *cv;
- SIGNED_VALUE mx = GetPositiveInt(n);
- if (mx == 0) return BigDecimal_sub(self, b);
+ S_INT mx = GetPositiveInt(n);
+ if(mx==0) return BigDecimal_sub(self,b);
else {
- size_t pl = VpSetPrecLimit(0);
+ U_LONG pl = VpSetPrecLimit(0);
VALUE c = BigDecimal_sub(self,b);
VpSetPrecLimit(pl);
GUARD_OBJ(cv,GetVpValue(c,1));
- VpLeftRound(cv,VpGetRoundMode(),mx);
+ VpLeftRound(cv,(int)VpGetRoundMode(),mx);
return ToValue(cv);
}
}
@@ -1534,14 +1172,14 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
{
ENTER(2);
Real *cv;
- SIGNED_VALUE mx = GetPositiveInt(n);
- if (mx == 0) return BigDecimal_mult(self, b);
+ S_INT mx = GetPositiveInt(n);
+ if(mx==0) return BigDecimal_mult(self,b);
else {
- size_t pl = VpSetPrecLimit(0);
+ U_LONG pl = VpSetPrecLimit(0);
VALUE c = BigDecimal_mult(self,b);
VpSetPrecLimit(pl);
GUARD_OBJ(cv,GetVpValue(c,1));
- VpLeftRound(cv,VpGetRoundMode(),mx);
+ VpLeftRound(cv,(int)VpGetRoundMode(),mx);
return ToValue(cv);
}
}
@@ -1557,13 +1195,13 @@ BigDecimal_abs(VALUE self)
{
ENTER(5);
Real *c, *a;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
mx = a->Prec *(VpBaseFig() + 1);
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
VpAsgn(c, a, 1);
- VpChangeSign(c, 1);
+ VpChangeSign(c,(S_INT)1);
return ToValue(c);
}
@@ -1572,14 +1210,14 @@ BigDecimal_abs(VALUE self)
*
* Returns the square root of the value.
*
- * Result has at least n significant digits.
+ * If n is specified, returns at least that many significant digits.
*/
static VALUE
BigDecimal_sqrt(VALUE self, VALUE nFig)
{
ENTER(5);
Real *c, *a;
- size_t mx, n;
+ U_LONG mx, n;
GUARD_OBJ(a,GetVpValue(self,1));
mx = a->Prec *(VpBaseFig() + 1);
@@ -1598,7 +1236,7 @@ BigDecimal_fix(VALUE self)
{
ENTER(5);
Real *c, *a;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
mx = a->Prec *(VpBaseFig() + 1);
@@ -1608,12 +1246,13 @@ BigDecimal_fix(VALUE self)
}
/* call-seq:
- * round(n, mode)
+ * round(n,mode)
*
* Round to the nearest 1 (by default), returning the result as a BigDecimal.
*
- * BigDecimal('3.14159').round #=> 3
- * BigDecimal('8.7').round #=> 9
+ * BigDecimal('3.14159').round -> 3
+ *
+ * BigDecimal('8.7').round -> 9
*
* If n is specified and positive, the fractional part of the result has no
* more than that many digits.
@@ -1621,8 +1260,9 @@ BigDecimal_fix(VALUE self)
* If n is specified and negative, at least that many digits to the left of the
* decimal point will be 0 in the result.
*
- * BigDecimal('3.14159').round(3) #=> 3.142
- * BigDecimal('13345.234').round(-2) #=> 13300.0
+ * BigDecimal('3.14159').round(3) -> 3.142
+ *
+ * BigDecimal('13345.234').round(-2) -> 13300.0
*
* The value of the optional mode argument can be used to determine how
* rounding is performed; see BigDecimal.mode.
@@ -1633,13 +1273,15 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
ENTER(5);
Real *c, *a;
int iLoc = 0;
+ U_LONG mx;
VALUE vLoc;
VALUE vRound;
- size_t mx, pl;
+ U_LONG pl;
- unsigned short sw = VpGetRoundMode();
+ int sw = (int)VpGetRoundMode();
- switch (rb_scan_args(argc, argv, "02", &vLoc, &vRound)) {
+ int na = rb_scan_args(argc,argv,"02",&vLoc,&vRound);
+ switch(na) {
case 0:
iLoc = 0;
break;
@@ -1648,10 +1290,15 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
iLoc = FIX2INT(vLoc);
break;
case 2:
- Check_Type(vLoc, T_FIXNUM);
- iLoc = FIX2INT(vLoc);
- sw = check_rounding_mode(vRound);
- break;
+ Check_Type(vLoc, T_FIXNUM);
+ iLoc = FIX2INT(vLoc);
+ Check_Type(vRound, T_FIXNUM);
+ sw = FIX2INT(vRound);
+ if(!VpIsRoundMode(sw)) {
+ rb_raise(rb_eTypeError, "invalid rounding mode");
+ return Qnil;
+ }
+ break;
}
pl = VpSetPrecLimit(0);
@@ -1671,8 +1318,9 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
*
* Truncate to the nearest 1, returning the result as a BigDecimal.
*
- * BigDecimal('3.14159').truncate #=> 3
- * BigDecimal('8.7').truncate #=> 8
+ * BigDecimal('3.14159').truncate -> 3
+ *
+ * BigDecimal('8.7').truncate -> 8
*
* If n is specified and positive, the fractional part of the result has no
* more than that many digits.
@@ -1680,8 +1328,9 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
* If n is specified and negative, at least that many digits to the left of the
* decimal point will be 0 in the result.
*
- * BigDecimal('3.14159').truncate(3) #=> 3.141
- * BigDecimal('13345.234').truncate(-2) #=> 13300.0
+ * BigDecimal('3.14159').truncate(3) -> 3.141
+ *
+ * BigDecimal('13345.234').truncate(-2) -> 13300.0
*/
static VALUE
BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
@@ -1689,8 +1338,9 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
ENTER(5);
Real *c, *a;
int iLoc;
+ U_LONG mx;
VALUE vLoc;
- size_t mx, pl = VpSetPrecLimit(0);
+ U_LONG pl = VpSetPrecLimit(0);
if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
iLoc = 0;
@@ -1717,7 +1367,7 @@ BigDecimal_frac(VALUE self)
{
ENTER(5);
Real *c, *a;
- size_t mx;
+ U_LONG mx;
GUARD_OBJ(a,GetVpValue(self,1));
mx = a->Prec *(VpBaseFig() + 1);
@@ -1731,8 +1381,9 @@ BigDecimal_frac(VALUE self)
*
* Return the largest integer less than or equal to the value, as a BigDecimal.
*
- * BigDecimal('3.14159').floor #=> 3
- * BigDecimal('-9.1').floor #=> -10
+ * BigDecimal('3.14159').floor -> 3
+ *
+ * BigDecimal('-9.1').floor -> -10
*
* If n is specified and positive, the fractional part of the result has no
* more than that many digits.
@@ -1740,17 +1391,19 @@ BigDecimal_frac(VALUE self)
* If n is specified and negative, at least that
* many digits to the left of the decimal point will be 0 in the result.
*
- * BigDecimal('3.14159').floor(3) #=> 3.141
- * BigDecimal('13345.234').floor(-2) #=> 13300.0
+ * BigDecimal('3.14159').floor(3) -> 3.141
+ *
+ * BigDecimal('13345.234').floor(-2) -> 13300.0
*/
static VALUE
BigDecimal_floor(int argc, VALUE *argv, VALUE self)
{
ENTER(5);
Real *c, *a;
+ U_LONG mx;
int iLoc;
VALUE vLoc;
- size_t mx, pl = VpSetPrecLimit(0);
+ U_LONG pl = VpSetPrecLimit(0);
if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
iLoc = 0;
@@ -1764,9 +1417,6 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
VpSetPrecLimit(pl);
VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
-#ifdef BIGDECIMAL_DEBUG
- VPrint(stderr, "floor: c=%\n", c);
-#endif
if (argc == 0) {
return BigDecimal_to_i(ToValue(c));
}
@@ -1778,8 +1428,9 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
*
* Return the smallest integer greater than or equal to the value, as a BigDecimal.
*
- * BigDecimal('3.14159').ceil #=> 4
- * BigDecimal('-9.1').ceil #=> -9
+ * BigDecimal('3.14159').ceil -> 4
+ *
+ * BigDecimal('-9.1').ceil -> -9
*
* If n is specified and positive, the fractional part of the result has no
* more than that many digits.
@@ -1787,17 +1438,19 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
* If n is specified and negative, at least that
* many digits to the left of the decimal point will be 0 in the result.
*
- * BigDecimal('3.14159').ceil(3) #=> 3.142
- * BigDecimal('13345.234').ceil(-2) #=> 13400.0
+ * BigDecimal('3.14159').ceil(3) -> 3.142
+ *
+ * BigDecimal('13345.234').ceil(-2) -> 13400.0
*/
static VALUE
BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
{
ENTER(5);
Real *c, *a;
+ U_LONG mx;
int iLoc;
VALUE vLoc;
- size_t mx, pl = VpSetPrecLimit(0);
+ U_LONG pl = VpSetPrecLimit(0);
if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
iLoc = 0;
@@ -1841,77 +1494,63 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
*
* Examples:
*
- * BigDecimal.new('-123.45678901234567890').to_s('5F')
- * #=> '-123.45678 90123 45678 9'
+ * BigDecimal.new('-123.45678901234567890').to_s('5F') -> '-123.45678 90123 45678 9'
*
- * BigDecimal.new('123.45678901234567890').to_s('+8F')
- * #=> '+123.45678901 23456789'
+ * BigDecimal.new('123.45678901234567890').to_s('+8F') -> '+123.45678901 23456789'
*
- * BigDecimal.new('123.45678901234567890').to_s(' F')
- * #=> ' 123.4567890123456789'
+ * BigDecimal.new('123.45678901234567890').to_s(' F') -> ' 123.4567890123456789'
*/
static VALUE
BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
{
ENTER(5);
- int fmt = 0; /* 0:E format */
- int fPlus = 0; /* =0:default,=1: set ' ' before digits ,set '+' before digits. */
+ 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;
- size_t nc, mc = 0;
+ U_LONG nc;
+ S_INT mc = 0;
VALUE f;
GUARD_OBJ(vp,GetVpValue(self,1));
- if (rb_scan_args(argc,argv,"01",&f)==1) {
- if (RB_TYPE_P(f, T_STRING)) {
- SafeStringValue(f);
- psz = RSTRING_PTR(f);
- if (*psz == ' ') {
- fPlus = 1;
- psz++;
- }
- else if (*psz == '+') {
- fPlus = 2;
- psz++;
- }
- while ((ch = *psz++) != 0) {
- if (ISSPACE(ch)) {
- continue;
- }
- if (!ISDIGIT(ch)) {
- if (ch == 'F' || ch == 'f') {
- fmt = 1; /* F format */
- }
- break;
- }
- mc = mc * 10 + ch - '0';
- }
- }
- else {
- mc = (size_t)GetPositiveInt(f);
- }
- }
- if (fmt) {
- nc = VpNumOfChars(vp, "F");
- }
- else {
- nc = VpNumOfChars(vp, "E");
+ if(rb_scan_args(argc,argv,"01",&f)==1) {
+ if(TYPE(f)==T_STRING) {
+ SafeStringValue(f);
+ psz = RSTRING_PTR(f);
+ if(*psz==' ') {
+ fPlus = 1; psz++;
+ } else if(*psz=='+') {
+ fPlus = 2; psz++;
+ }
+ while((ch=*psz++)!=0) {
+ if(ISSPACE(ch)) continue;
+ if(!ISDIGIT(ch)) {
+ if(ch=='F' || ch=='f') fmt = 1; /* F format */
+ break;
+ }
+ mc = mc * 10 + ch - '0';
+ }
+ } else {
+ mc = GetPositiveInt(f);
+ }
}
- if (mc > 0) {
- nc += (nc + mc - 1) / mc + 1;
+ if(fmt) {
+ nc = VpNumOfChars(vp,"F");
+ } else {
+ nc = VpNumOfChars(vp,"E");
}
+ if(mc>0) nc += (nc + mc - 1) / mc + 1;
str = rb_str_new(0, nc);
psz = RSTRING_PTR(str);
- if (fmt) {
- VpToFString(vp, psz, mc, fPlus);
- }
- else {
- VpToString (vp, psz, mc, fPlus);
+ if(fmt) {
+ VpToFString(vp, psz, mc, fPlus);
+ } else {
+ VpToString (vp, psz, mc, fPlus);
}
rb_str_resize(str, strlen(psz));
return str;
@@ -1947,7 +1586,8 @@ BigDecimal_split(VALUE self)
ENTER(5);
Real *vp;
VALUE obj,str;
- ssize_t e, s;
+ S_LONG e;
+ S_LONG s;
char *psz1;
GUARD_OBJ(vp,GetVpValue(self,1));
@@ -1981,7 +1621,7 @@ BigDecimal_split(VALUE self)
static VALUE
BigDecimal_exponent(VALUE self)
{
- ssize_t e = VpExponent10(GetVpValue(self, 1));
+ S_LONG e = VpExponent10(GetVpValue(self,1));
return INT2NUM(e);
}
@@ -2001,7 +1641,7 @@ BigDecimal_inspect(VALUE self)
ENTER(5);
Real *vp;
volatile VALUE obj;
- size_t nc;
+ U_LONG nc;
char *psz, *tmp;
GUARD_OBJ(vp,GetVpValue(self,1));
@@ -2010,489 +1650,95 @@ BigDecimal_inspect(VALUE self)
obj = rb_str_new(0, nc+256);
psz = RSTRING_PTR(obj);
- sprintf(psz,"#<BigDecimal:%"PRIxVALUE",'",self);
+ sprintf(psz,"#<BigDecimal:%lx,'",self);
tmp = psz + strlen(psz);
VpToString(vp, tmp, 10, 0);
tmp += strlen(tmp);
- sprintf(tmp, "',%"PRIuSIZE"(%"PRIuSIZE")>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig());
+ sprintf(tmp,"',%lu(%lu)>",VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
rb_str_resize(obj, strlen(psz));
return obj;
}
-static VALUE BigMath_s_exp(VALUE, VALUE, VALUE);
-static VALUE BigMath_s_log(VALUE, VALUE, VALUE);
-
-#define BigMath_exp(x, n) BigMath_s_exp(rb_mBigMath, (x), (n))
-#define BigMath_log(x, n) BigMath_s_log(rb_mBigMath, (x), (n))
-
-inline static int
-is_integer(VALUE x)
-{
- return (RB_TYPE_P(x, T_FIXNUM) || RB_TYPE_P(x, T_BIGNUM));
-}
-
-inline static int
-is_negative(VALUE x)
-{
- if (FIXNUM_P(x)) {
- return FIX2LONG(x) < 0;
- }
- else if (RB_TYPE_P(x, T_BIGNUM)) {
- return RBIGNUM_NEGATIVE_P(x);
- }
- else if (RB_TYPE_P(x, T_FLOAT)) {
- return RFLOAT_VALUE(x) < 0.0;
- }
- return RTEST(rb_funcall(x, '<', 1, INT2FIX(0)));
-}
-
-#define is_positive(x) (!is_negative(x))
-
-inline static int
-is_zero(VALUE x)
-{
- VALUE num;
-
- switch (TYPE(x)) {
- case T_FIXNUM:
- return FIX2LONG(x) == 0;
-
- case T_BIGNUM:
- return Qfalse;
-
- case T_RATIONAL:
- num = RRATIONAL(x)->num;
- return FIXNUM_P(num) && FIX2LONG(num) == 0;
-
- default:
- break;
- }
-
- return RTEST(rb_funcall(x, id_eq, 1, INT2FIX(0)));
-}
-
-inline static int
-is_one(VALUE x)
-{
- VALUE num, den;
-
- switch (TYPE(x)) {
- case T_FIXNUM:
- return FIX2LONG(x) == 1;
-
- case T_BIGNUM:
- return Qfalse;
-
- case T_RATIONAL:
- num = RRATIONAL(x)->num;
- den = RRATIONAL(x)->den;
- return FIXNUM_P(den) && FIX2LONG(den) == 1 &&
- FIXNUM_P(num) && FIX2LONG(num) == 1;
-
- default:
- break;
- }
-
- return RTEST(rb_funcall(x, id_eq, 1, INT2FIX(1)));
-}
-
-inline static int
-is_even(VALUE x)
-{
- switch (TYPE(x)) {
- case T_FIXNUM:
- return (FIX2LONG(x) % 2) == 0;
-
- case T_BIGNUM:
- return (RBIGNUM_DIGITS(x)[0] % 2) == 0;
-
- default:
- break;
- }
-
- return 0;
-}
-
-static VALUE
-rmpd_power_by_big_decimal(Real const* x, Real const* exp, ssize_t const n)
-{
- VALUE log_x, multiplied, y;
- volatile VALUE obj = exp->obj;
-
- if (VpIsZero(exp)) {
- return ToValue(VpCreateRbObject(n, "1"));
- }
-
- log_x = BigMath_log(x->obj, SSIZET2NUM(n+1));
- multiplied = BigDecimal_mult2(exp->obj, log_x, SSIZET2NUM(n+1));
- y = BigMath_exp(multiplied, SSIZET2NUM(n));
- RB_GC_GUARD(obj);
-
- return y;
-}
-
/* call-seq:
* power(n)
- * power(n, prec)
- *
- * Returns the value raised to the power of n.
*
- * Note that n must be an Integer.
+ * Returns the value raised to the power of n. Note that n must be an Integer.
*
* Also available as the operator **
*/
static VALUE
-BigDecimal_power(int argc, VALUE*argv, VALUE self)
+BigDecimal_power(VALUE self, VALUE p)
{
ENTER(5);
- VALUE vexp, prec;
- Real* exp = NULL;
Real *x, *y;
- ssize_t mp, ma, n;
- SIGNED_VALUE int_exp;
- double d;
-
- rb_scan_args(argc, argv, "11", &vexp, &prec);
-
- GUARD_OBJ(x, GetVpValue(self, 1));
- n = NIL_P(prec) ? (ssize_t)(x->Prec*VpBaseFig()) : NUM2SSIZET(prec);
-
- if (VpIsNaN(x)) {
- y = VpCreateRbObject(n, "0#");
- RB_GC_GUARD(y->obj);
- VpSetNaN(y);
- return ToValue(y);
- }
-
-retry:
- switch (TYPE(vexp)) {
- case T_FIXNUM:
- break;
-
- case T_BIGNUM:
- break;
-
- case T_FLOAT:
- d = RFLOAT_VALUE(vexp);
- if (d == round(d)) {
- vexp = LL2NUM((LONG_LONG)round(d));
- goto retry;
- }
- exp = GetVpValueWithPrec(vexp, DBL_DIG+1, 1);
- break;
-
- case T_RATIONAL:
- if (is_zero(RRATIONAL(vexp)->num)) {
- if (is_positive(vexp)) {
- vexp = INT2FIX(0);
- goto retry;
- }
- }
- else if (is_one(RRATIONAL(vexp)->den)) {
- vexp = RRATIONAL(vexp)->num;
- goto retry;
- }
- exp = GetVpValueWithPrec(vexp, n, 1);
- break;
-
- case T_DATA:
- if (is_kind_of_BigDecimal(vexp)) {
- VALUE zero = INT2FIX(0);
- VALUE rounded = BigDecimal_round(1, &zero, vexp);
- if (RTEST(BigDecimal_eq(vexp, rounded))) {
- vexp = BigDecimal_to_i(vexp);
- goto retry;
- }
- exp = DATA_PTR(vexp);
- break;
- }
- /* fall through */
- default:
- rb_raise(rb_eTypeError,
- "wrong argument type %"PRIsVALUE" (expected scalar Numeric)",
- RB_OBJ_CLASSNAME(vexp));
- }
-
- if (VpIsZero(x)) {
- if (is_negative(vexp)) {
- y = VpCreateRbObject(n, "#0");
- RB_GC_GUARD(y->obj);
- if (VpGetSign(x) < 0) {
- if (is_integer(vexp)) {
- if (is_even(vexp)) {
- /* (-0) ** (-even_integer) -> Infinity */
- VpSetPosInf(y);
- }
- else {
- /* (-0) ** (-odd_integer) -> -Infinity */
- VpSetNegInf(y);
- }
- }
- else {
- /* (-0) ** (-non_integer) -> Infinity */
- VpSetPosInf(y);
- }
- }
- else {
- /* (+0) ** (-num) -> Infinity */
- VpSetPosInf(y);
- }
- return ToValue(y);
- }
- else if (is_zero(vexp)) {
- return ToValue(VpCreateRbObject(n, "1"));
- }
- else {
- return ToValue(VpCreateRbObject(n, "0"));
- }
- }
-
- if (is_zero(vexp)) {
- return ToValue(VpCreateRbObject(n, "1"));
- }
- else if (is_one(vexp)) {
- return self;
- }
-
- if (VpIsInf(x)) {
- if (is_negative(vexp)) {
- if (VpGetSign(x) < 0) {
- if (is_integer(vexp)) {
- if (is_even(vexp)) {
- /* (-Infinity) ** (-even_integer) -> +0 */
- return ToValue(VpCreateRbObject(n, "0"));
- }
- else {
- /* (-Infinity) ** (-odd_integer) -> -0 */
- return ToValue(VpCreateRbObject(n, "-0"));
- }
- }
- else {
- /* (-Infinity) ** (-non_integer) -> -0 */
- return ToValue(VpCreateRbObject(n, "-0"));
- }
- }
- else {
- return ToValue(VpCreateRbObject(n, "0"));
- }
- }
- else {
- y = VpCreateRbObject(n, "0#");
- if (VpGetSign(x) < 0) {
- if (is_integer(vexp)) {
- if (is_even(vexp)) {
- VpSetPosInf(y);
- }
- else {
- VpSetNegInf(y);
- }
- }
- else {
- /* TODO: support complex */
- rb_raise(rb_eMathDomainError,
- "a non-integral exponent for a negative base");
- }
- }
- else {
- VpSetPosInf(y);
- }
- return ToValue(y);
- }
- }
-
- if (exp != NULL) {
- return rmpd_power_by_big_decimal(x, exp, n);
- }
- else if (RB_TYPE_P(vexp, T_BIGNUM)) {
- VALUE abs_value = BigDecimal_abs(self);
- if (is_one(abs_value)) {
- return ToValue(VpCreateRbObject(n, "1"));
- }
- else if (RTEST(rb_funcall(abs_value, '<', 1, INT2FIX(1)))) {
- if (is_negative(vexp)) {
- y = VpCreateRbObject(n, "0#");
- if (is_even(vexp)) {
- VpSetInf(y, VpGetSign(x));
- }
- else {
- VpSetInf(y, -VpGetSign(x));
- }
- return ToValue(y);
- }
- else if (VpGetSign(x) < 0 && is_even(vexp)) {
- return ToValue(VpCreateRbObject(n, "-0"));
- }
- else {
- return ToValue(VpCreateRbObject(n, "0"));
- }
- }
- else {
- if (is_positive(vexp)) {
- y = VpCreateRbObject(n, "0#");
- if (is_even(vexp)) {
- VpSetInf(y, VpGetSign(x));
- }
- else {
- VpSetInf(y, -VpGetSign(x));
- }
- return ToValue(y);
- }
- else if (VpGetSign(x) < 0 && is_even(vexp)) {
- return ToValue(VpCreateRbObject(n, "-0"));
- }
- else {
- return ToValue(VpCreateRbObject(n, "0"));
- }
- }
- }
-
- int_exp = FIX2INT(vexp);
- ma = int_exp;
- if (ma < 0) ma = -ma;
- if (ma == 0) ma = 1;
-
- if (VpIsDef(x)) {
- mp = x->Prec * (VpBaseFig() + 1);
- GUARD_OBJ(y, VpCreateRbObject(mp * (ma + 1), "0"));
- }
- else {
- GUARD_OBJ(y, VpCreateRbObject(1, "0"));
+ S_LONG mp, ma;
+ S_INT n;
+
+ Check_Type(p, T_FIXNUM);
+ n = FIX2INT(p);
+ ma = n;
+ if(ma < 0) ma = -ma;
+ if(ma == 0) ma = 1;
+
+ GUARD_OBJ(x,GetVpValue(self,1));
+ if(VpIsDef(x)) {
+ mp = x->Prec *(VpBaseFig() + 1);
+ GUARD_OBJ(y,VpCreateRbObject(mp *(ma + 1), "0"));
+ } else {
+ GUARD_OBJ(y,VpCreateRbObject(1, "0"));
}
- VpPower(y, x, int_exp);
+ VpPower(y, x, n);
return ToValue(y);
}
-/* call-seq:
- * big_decimal ** exp -> big_decimal
- *
- * It is a synonym of BigDecimal#power(exp).
- */
static VALUE
-BigDecimal_power_op(VALUE self, VALUE exp)
-{
- return BigDecimal_power(1, &exp, self);
-}
-
-static VALUE
-BigDecimal_s_allocate(VALUE klass)
-{
- return VpNewRbClass(0, NULL, klass)->obj;
-}
-
-static Real *BigDecimal_new(int argc, VALUE *argv);
-
-/* call-seq:
- * new(initial, digits)
- *
- * Create a new BigDecimal object.
- *
- * initial:: The initial value, as an Integer, a Float, a Rational,
- * a BigDecimal, or a String.
- *
- * If it is a String, spaces are ignored and unrecognized characters
- * terminate the value.
- *
- * digits:: The number of significant digits, as a Fixnum. If omitted or 0,
- * the number of significant digits is determined from the initial
- * value.
- *
- * The actual number of significant digits used in computation is usually
- * larger than the specified number.
- */
-static VALUE
-BigDecimal_initialize(int argc, VALUE *argv, VALUE self)
-{
- ENTER(1);
- Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
- Real *x;
-
- GUARD_OBJ(x, BigDecimal_new(argc, argv));
- if (ToValue(x)) {
- pv = VpCopy(pv, x);
- }
- else {
- VpFree(pv);
- pv = x;
- }
- DATA_PTR(self) = pv;
- pv->obj = self;
- return self;
-}
-
-/* :nodoc:
- *
- * private method to dup and clone the provided BigDecimal +other+
- */
-static VALUE
-BigDecimal_initialize_copy(VALUE self, VALUE other)
-{
- Real *pv = rb_check_typeddata(self, &BigDecimal_data_type);
- Real *x = rb_check_typeddata(other, &BigDecimal_data_type);
-
- if (self != other) {
- DATA_PTR(self) = VpCopy(pv, x);
- }
- return self;
-}
-
-static Real *
-BigDecimal_new(int argc, VALUE *argv)
+BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
{
- size_t mf;
+ ENTER(5);
+ Real *pv;
+ S_LONG mf;
VALUE nFig;
VALUE iniValue;
- if (rb_scan_args(argc, argv, "11", &iniValue, &nFig) == 1) {
+ if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
mf = 0;
- }
- else {
+ } else {
mf = GetPositiveInt(nFig);
}
-
- switch (TYPE(iniValue)) {
- case T_DATA:
- if (is_kind_of_BigDecimal(iniValue)) {
- return DATA_PTR(iniValue);
- }
- break;
-
- case T_FIXNUM:
- /* fall through */
- case T_BIGNUM:
- return GetVpValue(iniValue, 1);
-
- case T_FLOAT:
- if (mf > DBL_DIG+1) {
- rb_raise(rb_eArgError, "precision too large.");
- }
- /* fall through */
- case T_RATIONAL:
- if (NIL_P(nFig)) {
- rb_raise(rb_eArgError,
- "can't omit precision for a %"PRIsVALUE".",
- RB_OBJ_CLASSNAME(iniValue));
- }
- return GetVpValueWithPrec(iniValue, mf, 1);
-
- case T_STRING:
- /* fall through */
- default:
- break;
- }
- StringValueCStr(iniValue);
- return VpAlloc(mf, RSTRING_PTR(iniValue));
+ SafeStringValue(iniValue);
+ GUARD_OBJ(pv,VpCreateRbObject(mf, RSTRING_PTR(iniValue)));
+ return ToValue(pv);
}
+ /* call-seq:
+ * new(initial, digits)
+ *
+ * Create a new BigDecimal object.
+ *
+ * initial:: The initial value, as a String. Spaces are ignored, unrecognized characters terminate the value.
+ *
+ * digits:: The number of significant digits, as a Fixnum. If omitted or 0, the number of significant digits is determined from the initial value.
+ *
+ * The actual number of significant digits used in computation is usually
+ * larger than the specified number.
+ */
static VALUE
-BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
+BigDecimal_new(int argc, VALUE *argv, VALUE self)
{
- ENTER(1);
+ ENTER(5);
Real *pv;
+ S_LONG mf;
+ VALUE nFig;
+ VALUE iniValue;
- GUARD_OBJ(pv, BigDecimal_new(argc, argv));
- if (ToValue(pv)) pv = VpCopy(NULL, pv);
- pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
- return pv->obj;
+ if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
+ mf = 0;
+ } else {
+ mf = GetPositiveInt(nFig);
+ }
+ SafeStringValue(iniValue);
+ GUARD_OBJ(pv,VpNewRbClass(mf, RSTRING_PTR(iniValue),self));
+ return ToValue(pv);
}
/* call-seq:
@@ -2549,382 +1795,10 @@ BigDecimal_sign(VALUE self)
return INT2FIX(s);
}
-/*
- * call-seq: BigDecimal.save_exception_mode { ... }
- *
- * Excecute the provided block, but preserve the exception mode
- *
- * BigDecimal.save_exception_mode do
- * BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- * BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- *
- * BigDecimal.new(BigDecimal('Infinity'))
- * BigDecimal.new(BigDecimal('-Infinity'))
- * BigDecimal(BigDecimal.new('NaN'))
- * end
- *
- * For use with the BigDecimal::EXCEPTION_*
- *
- * See BigDecimal.mode
- */
-static VALUE
-BigDecimal_save_exception_mode(VALUE self)
-{
- unsigned short const exception_mode = VpGetException();
- int state;
- VALUE ret = rb_protect(rb_yield, Qnil, &state);
- VpSetException(exception_mode);
- if (state) rb_jump_tag(state);
- return ret;
-}
-
-/*
- * call-seq: BigDecimal.save_rounding_mode { ... }
- *
- * Excecute the provided block, but preserve the rounding mode
- *
- * BigDecimal.save_exception_mode do
- * BigDecimal.mode(BigDecimal::ROUND_MODE, :up)
- * puts BigDecimal.mode(BigDecimal::ROUND_MODE)
- * end
- *
- * For use with the BigDecimal::ROUND_*
- *
- * See BigDecimal.mode
- */
-static VALUE
-BigDecimal_save_rounding_mode(VALUE self)
-{
- unsigned short const round_mode = VpGetRoundMode();
- int state;
- VALUE ret = rb_protect(rb_yield, Qnil, &state);
- VpSetRoundMode(round_mode);
- if (state) rb_jump_tag(state);
- return ret;
-}
-
-/*
- * call-seq: BigDecimal.save_limit { ... }
- *
- * Excecute the provided block, but preserve the precision limit
- *
- * BigDecimal.limit(100)
- * puts BigDecimal.limit
- * BigDecimal.save_limit do
- * BigDecimal.limit(200)
- * puts BigDecimal.limit
- * end
- * puts BigDecimal.limit
- *
- */
-static VALUE
-BigDecimal_save_limit(VALUE self)
-{
- size_t const limit = VpGetPrecLimit();
- int state;
- VALUE ret = rb_protect(rb_yield, Qnil, &state);
- VpSetPrecLimit(limit);
- if (state) rb_jump_tag(state);
- return ret;
-}
-
-/* call-seq:
- * BigMath.exp(x, prec)
- *
- * 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 infinity, returns Infinity.
- *
- * If x is NaN, returns NaN.
- */
-static VALUE
-BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
-{
- ssize_t prec, n, i;
- Real* vx = NULL;
- VALUE one, d, x1, y, z;
- int negative = 0;
- int infinite = 0;
- int nan = 0;
- double flo;
-
- prec = NUM2SSIZET(vprec);
- if (prec <= 0) {
- rb_raise(rb_eArgError, "Zero or negative precision for exp");
- }
-
- /* TODO: the following switch statement is almostly the same as one in the
- * BigDecimalCmp function. */
- switch (TYPE(x)) {
- case T_DATA:
- if (!is_kind_of_BigDecimal(x)) break;
- vx = DATA_PTR(x);
- negative = VpGetSign(vx) < 0;
- infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
- nan = VpIsNaN(vx);
- break;
-
- case T_FIXNUM:
- /* fall through */
- case T_BIGNUM:
- vx = GetVpValue(x, 0);
- break;
-
- case T_FLOAT:
- flo = RFLOAT_VALUE(x);
- negative = flo < 0;
- infinite = isinf(flo);
- nan = isnan(flo);
- if (!infinite && !nan) {
- vx = GetVpValueWithPrec(x, DBL_DIG+1, 0);
- }
- break;
-
- case T_RATIONAL:
- vx = GetVpValueWithPrec(x, prec, 0);
- break;
-
- default:
- break;
- }
- if (infinite) {
- if (negative) {
- return ToValue(GetVpValueWithPrec(INT2NUM(0), prec, 1));
- }
- else {
- Real* vy;
- vy = VpCreateRbObject(prec, "#0");
- RB_GC_GUARD(vy->obj);
- VpSetInf(vy, VP_SIGN_POSITIVE_INFINITE);
- return ToValue(vy);
- }
- }
- else if (nan) {
- Real* vy;
- vy = VpCreateRbObject(prec, "#0");
- RB_GC_GUARD(vy->obj);
- VpSetNaN(vy);
- return ToValue(vy);
- }
- else if (vx == NULL) {
- cannot_be_coerced_into_BigDecimal(rb_eArgError, x);
- }
- x = RB_GC_GUARD(vx->obj);
-
- n = prec + rmpd_double_figures();
- negative = VpGetSign(vx) < 0;
- if (negative) {
- VpSetSign(vx, 1);
- }
-
- RB_GC_GUARD(one) = ToValue(VpCreateRbObject(1, "1"));
- RB_GC_GUARD(x1) = one;
- RB_GC_GUARD(y) = one;
- RB_GC_GUARD(d) = y;
- RB_GC_GUARD(z) = one;
- i = 0;
-
- while (!VpIsZero((Real*)DATA_PTR(d))) {
- VALUE argv[2];
- SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
- SIGNED_VALUE const ed = VpExponent10(DATA_PTR(d));
- ssize_t m = n - vabs(ey - ed);
- if (m <= 0) {
- break;
- }
- else if ((size_t)m < rmpd_double_figures()) {
- m = rmpd_double_figures();
- }
-
- x1 = BigDecimal_mult2(x1, x, SSIZET2NUM(n));
- ++i;
- z = BigDecimal_mult(z, SSIZET2NUM(i));
- argv[0] = z;
- argv[1] = SSIZET2NUM(m);
- d = BigDecimal_div2(2, argv, x1);
- y = BigDecimal_add(y, d);
- }
-
- if (negative) {
- VALUE argv[2];
- argv[0] = y;
- argv[1] = vprec;
- return BigDecimal_div2(2, argv, one);
- }
- else {
- vprec = SSIZET2NUM(prec - VpExponent10(DATA_PTR(y)));
- return BigDecimal_round(1, &vprec, y);
- }
-}
-
-/* call-seq:
- * BigMath.log(x, prec)
- *
- * Computes the natural logarithm of x to the specified number of digits of
- * precision.
- *
- * If x is zero or negative, raises Math::DomainError.
- *
- * If x is positive infinity, returns Infinity.
- *
- * If x is NaN, returns NaN.
- */
-static VALUE
-BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
-{
- ssize_t prec, n, i;
- SIGNED_VALUE expo;
- Real* vx = NULL;
- VALUE argv[2], vn, one, two, w, x2, y, d;
- int zero = 0;
- int negative = 0;
- int infinite = 0;
- int nan = 0;
- double flo;
- long fix;
-
- if (!is_integer(vprec)) {
- rb_raise(rb_eArgError, "precision must be an Integer");
- }
-
- prec = NUM2SSIZET(vprec);
- if (prec <= 0) {
- rb_raise(rb_eArgError, "Zero or negative precision for exp");
- }
-
- /* TODO: the following switch statement is almostly the same as one in the
- * BigDecimalCmp function. */
- switch (TYPE(x)) {
- case T_DATA:
- if (!is_kind_of_BigDecimal(x)) break;
- vx = DATA_PTR(x);
- zero = VpIsZero(vx);
- negative = VpGetSign(vx) < 0;
- infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
- nan = VpIsNaN(vx);
- break;
-
- case T_FIXNUM:
- fix = FIX2LONG(x);
- zero = fix == 0;
- negative = fix < 0;
- goto get_vp_value;
-
- case T_BIGNUM:
- zero = RBIGNUM_ZERO_P(x);
- negative = RBIGNUM_NEGATIVE_P(x);
-get_vp_value:
- if (zero || negative) break;
- vx = GetVpValue(x, 0);
- break;
-
- case T_FLOAT:
- flo = RFLOAT_VALUE(x);
- zero = flo == 0;
- negative = flo < 0;
- infinite = isinf(flo);
- nan = isnan(flo);
- if (!zero && !negative && !infinite && !nan) {
- vx = GetVpValueWithPrec(x, DBL_DIG+1, 1);
- }
- break;
-
- case T_RATIONAL:
- zero = RRATIONAL_ZERO_P(x);
- negative = RRATIONAL_NEGATIVE_P(x);
- if (zero || negative) break;
- vx = GetVpValueWithPrec(x, prec, 1);
- break;
-
- case T_COMPLEX:
- rb_raise(rb_eMathDomainError,
- "Complex argument for BigMath.log");
-
- default:
- break;
- }
- if (infinite && !negative) {
- Real* vy;
- vy = VpCreateRbObject(prec, "#0");
- RB_GC_GUARD(vy->obj);
- VpSetInf(vy, VP_SIGN_POSITIVE_INFINITE);
- return ToValue(vy);
- }
- else if (nan) {
- Real* vy;
- vy = VpCreateRbObject(prec, "#0");
- RB_GC_GUARD(vy->obj);
- VpSetNaN(vy);
- return ToValue(vy);
- }
- else if (zero || negative) {
- rb_raise(rb_eMathDomainError,
- "Zero or negative argument for log");
- }
- else if (vx == NULL) {
- cannot_be_coerced_into_BigDecimal(rb_eArgError, x);
- }
- x = ToValue(vx);
-
- RB_GC_GUARD(one) = ToValue(VpCreateRbObject(1, "1"));
- RB_GC_GUARD(two) = ToValue(VpCreateRbObject(1, "2"));
-
- n = prec + rmpd_double_figures();
- RB_GC_GUARD(vn) = SSIZET2NUM(n);
- expo = VpExponent10(vx);
- if (expo < 0 || expo >= 3) {
- char buf[16];
- snprintf(buf, 16, "1E%"PRIdVALUE, -expo);
- x = BigDecimal_mult2(x, ToValue(VpCreateRbObject(1, buf)), vn);
- }
- else {
- expo = 0;
- }
- w = BigDecimal_sub(x, one);
- argv[0] = BigDecimal_add(x, one);
- argv[1] = vn;
- x = BigDecimal_div2(2, argv, w);
- RB_GC_GUARD(x2) = BigDecimal_mult2(x, x, vn);
- RB_GC_GUARD(y) = x;
- RB_GC_GUARD(d) = y;
- i = 1;
- while (!VpIsZero((Real*)DATA_PTR(d))) {
- SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
- SIGNED_VALUE const ed = VpExponent10(DATA_PTR(d));
- ssize_t m = n - vabs(ey - ed);
- if (m <= 0) {
- break;
- }
- else if ((size_t)m < rmpd_double_figures()) {
- m = rmpd_double_figures();
- }
-
- x = BigDecimal_mult2(x2, x, vn);
- i += 2;
- argv[0] = SSIZET2NUM(i);
- argv[1] = SSIZET2NUM(m);
- d = BigDecimal_div2(2, argv, x);
- y = BigDecimal_add(y, d);
- }
-
- y = BigDecimal_mult(y, two);
- if (expo != 0) {
- VALUE log10, vexpo, dy;
- log10 = BigMath_s_log(klass, INT2FIX(10), vprec);
- vexpo = ToValue(GetVpValue(SSIZET2NUM(expo), 1));
- dy = BigDecimal_mult(log10, vexpo);
- y = BigDecimal_add(y, dy);
- }
-
- return y;
-}
-
/* Document-class: BigDecimal
* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
*
* Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
- *
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file
* of the BigDecimal distribution.
@@ -2934,10 +1808,9 @@ get_vp_value:
* = Introduction
*
* Ruby provides built-in support for arbitrary precision integer arithmetic.
- *
* For example:
*
- * 42**13 #=> 1265437718438866624512
+ * 42**13 -> 1265437718438866624512
*
* BigDecimal provides similar support for very large or very accurate floating
* point numbers.
@@ -2945,15 +1818,13 @@ get_vp_value:
* Decimal arithmetic is also useful for general calculation, because it
* provides the correct answers people expect--whereas normal binary floating
* point arithmetic often introduces subtle errors because of the conversion
- * between base 10 and base 2.
- *
- * For example, try:
+ * between base 10 and base 2. For example, try:
*
* sum = 0
* for i in (1..10000)
* sum = sum + 0.0001
* end
- * print sum #=> 0.9999999999999062
+ * print sum
*
* and contrast with the output from:
*
@@ -2963,13 +1834,13 @@ get_vp_value:
* for i in (1..10000)
* sum = sum + BigDecimal.new("0.0001")
* end
- * print sum #=> 0.1E1
+ * print sum
*
* Similarly:
*
- * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") #=> true
+ * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
*
- * (1.2 - 1.0) == 0.2 #=> false
+ * (1.2 - 1.0) == 0.2 -> false
*
* = Special features of accurate decimal arithmetic
*
@@ -2981,29 +1852,30 @@ get_vp_value:
* BigDecimal sometimes needs to return infinity, for example if you divide
* a value by zero.
*
- * BigDecimal.new("1.0") / BigDecimal.new("0.0") #=> infinity
- * BigDecimal.new("-1.0") / BigDecimal.new("0.0") #=> -infinity
+ * BigDecimal.new("1.0") / BigDecimal.new("0.0") -> infinity
+ *
+ * BigDecimal.new("-1.0") / BigDecimal.new("0.0") -> -infinity
*
* You can represent infinite numbers to BigDecimal using the strings
- * <code>'Infinity'</code>, <code>'+Infinity'</code> and
- * <code>'-Infinity'</code> (case-sensitive)
+ * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
*
* == Not a Number
*
- * When a computation results in an undefined value, the special value +NaN+
+ * When a computation results in an undefined value, the special value NaN
* (for 'not a number') is returned.
*
* Example:
*
- * BigDecimal.new("0.0") / BigDecimal.new("0.0") #=> NaN
+ * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
+ *
+ * You can also create undefined values. NaN is never considered to be the
+ * same as any other value, even NaN itself:
*
- * You can also create undefined values.
+ * n = BigDecimal.new('NaN')
*
- * NaN is never considered to be the same as any other value, even NaN itself:
+ * n == 0.0 -> nil
*
- * n = BigDecimal.new('NaN')
- * n == 0.0 #=> nil
- * n == n #=> nil
+ * n == n -> nil
*
* == Positive and negative zero
*
@@ -3012,17 +1884,16 @@ get_vp_value:
* be returned.
*
* If the value which is too small to be represented is negative, a BigDecimal
- * value of negative zero is returned.
+ * value of negative zero is returned. If the value is positive, a value of
+ * positive zero is returned.
*
- * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") #=> -0.0
+ * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
*
- * If the value is positive, a value of positive zero is returned.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("Infinity") #=> 0.0
+ * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
*
* (See BigDecimal.mode for how to specify limits of precision.)
*
- * Note that +-0.0+ and +0.0+ are considered to be the same for the purposes of
+ * Note that -0.0 and 0.0 are considered to be the same for the purposes of
* comparison.
*
* Note also that in mathematics, there is no particular concept of negative
@@ -3031,33 +1902,23 @@ get_vp_value:
void
Init_bigdecimal(void)
{
- VALUE arg;
-
- id_BigDecimal_exception_mode = rb_intern_const("BigDecimal.exception_mode");
- id_BigDecimal_rounding_mode = rb_intern_const("BigDecimal.rounding_mode");
- id_BigDecimal_precision_limit = rb_intern_const("BigDecimal.precision_limit");
-
/* Initialize VP routines */
- VpInit(0UL);
+ VpInit((U_LONG)0);
/* Class and method registration */
rb_cBigDecimal = rb_define_class("BigDecimal",rb_cNumeric);
- rb_define_alloc_func(rb_cBigDecimal, BigDecimal_s_allocate);
/* Global function */
rb_define_global_function("BigDecimal", BigDecimal_global_new, -1);
/* Class methods */
+ rb_define_singleton_method(rb_cBigDecimal, "new", BigDecimal_new, -1);
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, "_load", BigDecimal_load, 1);
rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
- rb_define_singleton_method(rb_cBigDecimal, "save_exception_mode", BigDecimal_save_exception_mode, 0);
- rb_define_singleton_method(rb_cBigDecimal, "save_rounding_mode", BigDecimal_save_rounding_mode, 0);
- rb_define_singleton_method(rb_cBigDecimal, "save_limit", BigDecimal_save_limit, 0);
-
/* Constants definition */
/*
@@ -3067,7 +1928,7 @@ Init_bigdecimal(void)
* guarantee that two groups could always be multiplied together without
* overflow.)
*/
- rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((SIGNED_VALUE)VpBaseVal()));
+ rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
/* Exceptions */
@@ -3162,17 +2023,7 @@ Init_bigdecimal(void)
/* -3: Indicates that a value is negative and infinite. See BigDecimal.sign. */
rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
- arg = rb_str_new2("+Infinity");
- /* Positive infinity value. */
- rb_define_const(rb_cBigDecimal, "INFINITY", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
- arg = rb_str_new2("NaN");
- /* 'Not a Number' value. */
- rb_define_const(rb_cBigDecimal, "NAN", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
-
-
/* instance methods */
- rb_define_method(rb_cBigDecimal, "initialize", BigDecimal_initialize, -1);
- rb_define_method(rb_cBigDecimal, "initialize_copy", BigDecimal_initialize_copy, 1);
rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
@@ -3205,8 +2056,8 @@ Init_bigdecimal(void)
rb_define_method(rb_cBigDecimal, "frac", BigDecimal_frac, 0);
rb_define_method(rb_cBigDecimal, "floor", BigDecimal_floor, -1);
rb_define_method(rb_cBigDecimal, "ceil", BigDecimal_ceil, -1);
- rb_define_method(rb_cBigDecimal, "power", BigDecimal_power, -1);
- rb_define_method(rb_cBigDecimal, "**", BigDecimal_power_op, 1);
+ rb_define_method(rb_cBigDecimal, "power", BigDecimal_power, 1);
+ rb_define_method(rb_cBigDecimal, "**", BigDecimal_power, 1);
rb_define_method(rb_cBigDecimal, "<=>", BigDecimal_comp, 1);
rb_define_method(rb_cBigDecimal, "==", BigDecimal_eq, 1);
rb_define_method(rb_cBigDecimal, "===", BigDecimal_eq, 1);
@@ -3226,25 +2077,6 @@ Init_bigdecimal(void)
rb_define_method(rb_cBigDecimal, "finite?", BigDecimal_IsFinite, 0);
rb_define_method(rb_cBigDecimal, "truncate", BigDecimal_truncate, -1);
rb_define_method(rb_cBigDecimal, "_dump", BigDecimal_dump, -1);
-
- /* mathematical functions */
- rb_mBigMath = rb_define_module("BigMath");
- rb_define_singleton_method(rb_mBigMath, "exp", BigMath_s_exp, 2);
- rb_define_singleton_method(rb_mBigMath, "log", BigMath_s_log, 2);
-
- id_up = rb_intern_const("up");
- id_down = rb_intern_const("down");
- id_truncate = rb_intern_const("truncate");
- id_half_up = rb_intern_const("half_up");
- id_default = rb_intern_const("default");
- id_half_down = rb_intern_const("half_down");
- id_half_even = rb_intern_const("half_even");
- id_banker = rb_intern_const("banker");
- id_ceiling = rb_intern_const("ceiling");
- id_ceil = rb_intern_const("ceil");
- id_floor = rb_intern_const("floor");
- id_to_r = rb_intern_const("to_r");
- id_eq = rb_intern_const("==");
}
/*
@@ -3263,6 +2095,9 @@ static int gfCheckVal = 1; /* Value checking flag in VpNmlz() */
#endif
#endif /* BIGDECIMAL_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 */
+
static Real *VpConstOne; /* constant 1.0 */
static Real *VpPt5; /* constant 0.5 */
#define maxnr 100UL /* Maximum iterations for calcurating sqrt. */
@@ -3273,42 +2108,32 @@ static Real *VpPt5; /* constant 0.5 */
#define StrCmp(x,y) strcmp(x,y)
static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
-static int AddExponent(Real *a, SIGNED_VALUE n);
-static BDIGIT VpAddAbs(Real *a,Real *b,Real *c);
-static BDIGIT VpSubAbs(Real *a,Real *b,Real *c);
-static size_t VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos, BDIGIT *av, BDIGIT *bv);
+static int AddExponent(Real *a,S_INT n);
+static U_LONG VpAddAbs(Real *a,Real *b,Real *c);
+static U_LONG VpSubAbs(Real *a,Real *b,Real *c);
+static U_LONG VpSetPTR(Real *a,Real *b,Real *c,U_LONG *a_pos,U_LONG *b_pos,U_LONG *c_pos,U_LONG *av,U_LONG *bv);
static int VpNmlz(Real *a);
-static void VpFormatSt(char *psz, size_t fFmt);
-static int VpRdup(Real *m, size_t ind_m);
+static void VpFormatSt(char *psz,S_INT fFmt);
+static int VpRdup(Real *m,U_LONG ind_m);
#ifdef BIGDECIMAL_DEBUG
static int gnAlloc=0; /* Memory allocation counter */
#endif /* BIGDECIMAL_DEBUG */
VP_EXPORT void *
-VpMemAlloc(size_t mb)
+VpMemAlloc(U_LONG mb)
{
- void *p = xmalloc(mb);
- if (!p) {
- VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1);
+ void *p = xmalloc((unsigned int)mb);
+ if(!p) {
+ VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1);
}
- memset(p, 0, mb);
+ memset(p,0,mb);
#ifdef BIGDECIMAL_DEBUG
gnAlloc++; /* Count allocation call */
#endif /* BIGDECIMAL_DEBUG */
return p;
}
-VP_EXPORT void *
-VpMemRealloc(void *ptr, size_t mb)
-{
- void *p = xrealloc(ptr, mb);
- if (!p) {
- VpException(VP_EXCEPTION_MEMORY, "failed to allocate memory", 1);
- }
- return p;
-}
-
VP_EXPORT void
VpFree(Real *pv)
{
@@ -3331,127 +2156,57 @@ VpFree(Real *pv)
/*
* EXCEPTION Handling.
*/
-
-#define rmpd_set_thread_local_exception_mode(mode) \
- rb_thread_local_aset( \
- rb_thread_current(), \
- id_BigDecimal_exception_mode, \
- INT2FIX((int)(mode)) \
- )
+static unsigned short gfDoException = 0; /* Exception flag */
static unsigned short
VpGetException (void)
{
- VALUE const vmode = rb_thread_local_aref(
- rb_thread_current(),
- id_BigDecimal_exception_mode
- );
-
- if (NIL_P(vmode)) {
- rmpd_set_thread_local_exception_mode(RMPD_EXCEPTION_MODE_DEFAULT);
- return RMPD_EXCEPTION_MODE_DEFAULT;
- }
-
- return (unsigned short)FIX2UINT(vmode);
+ return gfDoException;
}
static void
VpSetException(unsigned short f)
{
- rmpd_set_thread_local_exception_mode(f);
+ gfDoException = f;
}
-/*
- * Precision limit.
- */
-
-#define rmpd_set_thread_local_precision_limit(limit) \
- rb_thread_local_aset( \
- rb_thread_current(), \
- id_BigDecimal_precision_limit, \
- SIZET2NUM(limit) \
- )
-#define RMPD_PRECISION_LIMIT_DEFAULT ((size_t)0)
-
/* These 2 functions added at v1.1.7 */
-VP_EXPORT size_t
+VP_EXPORT U_LONG
VpGetPrecLimit(void)
{
- VALUE const vlimit = rb_thread_local_aref(
- rb_thread_current(),
- id_BigDecimal_precision_limit
- );
-
- if (NIL_P(vlimit)) {
- rmpd_set_thread_local_precision_limit(RMPD_PRECISION_LIMIT_DEFAULT);
- return RMPD_PRECISION_LIMIT_DEFAULT;
- }
-
- return NUM2SIZET(vlimit);
+ return gnPrecLimit;
}
-VP_EXPORT size_t
-VpSetPrecLimit(size_t n)
+VP_EXPORT U_LONG
+VpSetPrecLimit(U_LONG n)
{
- size_t const s = VpGetPrecLimit();
- rmpd_set_thread_local_precision_limit(n);
+ U_LONG s = gnPrecLimit;
+ gnPrecLimit = n;
return s;
}
-/*
- * Rounding mode.
- */
-
-#define rmpd_set_thread_local_rounding_mode(mode) \
- rb_thread_local_aset( \
- rb_thread_current(), \
- id_BigDecimal_rounding_mode, \
- INT2FIX((int)(mode)) \
- )
-
-VP_EXPORT unsigned short
+VP_EXPORT unsigned long
VpGetRoundMode(void)
{
- VALUE const vmode = rb_thread_local_aref(
- rb_thread_current(),
- id_BigDecimal_rounding_mode
- );
-
- if (NIL_P(vmode)) {
- rmpd_set_thread_local_rounding_mode(RMPD_ROUNDING_MODE_DEFAULT);
- return RMPD_ROUNDING_MODE_DEFAULT;
- }
-
- return (unsigned short)FIX2INT(vmode);
+ return gfRoundMode;
}
VP_EXPORT int
-VpIsRoundMode(unsigned short n)
+VpIsRoundMode(unsigned long n)
{
- switch (n) {
- case VP_ROUND_UP:
- case VP_ROUND_DOWN:
- case VP_ROUND_HALF_UP:
- case VP_ROUND_HALF_DOWN:
- case VP_ROUND_CEIL:
- case VP_ROUND_FLOOR:
- case VP_ROUND_HALF_EVEN:
- return 1;
-
- default:
- return 0;
- }
+ 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;
}
-VP_EXPORT unsigned short
-VpSetRoundMode(unsigned short n)
+VP_EXPORT unsigned long
+VpSetRoundMode(unsigned long n)
{
- if (VpIsRoundMode(n)) {
- rmpd_set_thread_local_rounding_mode(n);
- return n;
- }
-
- return VpGetRoundMode();
+ if(VpIsRoundMode(n)) gfRoundMode = n;
+ return gfRoundMode;
}
/*
@@ -3476,6 +2231,24 @@ One(void)
return gOne_ABCED9B4_CE73__00400511F31D;
}
+VP_EXPORT U_LONG
+VpBaseFig(void)
+{
+ return BASE_FIG;
+}
+
+VP_EXPORT U_LONG
+VpDblFig(void)
+{
+ return DBLE_FIG;
+}
+
+VP_EXPORT U_LONG
+VpBaseVal(void)
+{
+ return BASE;
+}
+
/*
----------------------------------------------------------------
Value of sign in Real structure is reserved for future use.
@@ -3536,11 +2309,10 @@ VpException(unsigned short f, const char *str,int always)
{
VALUE exc;
int fatal=0;
- unsigned short const exception_mode = VpGetException();
if(f==VP_EXCEPTION_OP || f==VP_EXCEPTION_MEMORY) always = 1;
- if (always || (exception_mode & f)) {
+ if(always||(gfDoException&f)) {
switch(f)
{
/*
@@ -3668,11 +2440,11 @@ NaN:
/*
* returns number of chars needed to represent vp in specified format.
*/
-VP_EXPORT size_t
+VP_EXPORT U_LONG
VpNumOfChars(Real *vp,const char *pszFmt)
{
- SIGNED_VALUE ex;
- size_t nc;
+ S_INT ex;
+ U_LONG nc;
if(vp == NULL) return BASE_FIG*2+6;
if(!VpIsDef(vp)) return 32; /* not sure,may be OK */
@@ -3682,12 +2454,11 @@ VpNumOfChars(Real *vp,const char *pszFmt)
case 'F':
nc = BASE_FIG*(vp->Prec + 1)+2;
ex = vp->exponent;
- if(ex < 0) {
- nc += BASE_FIG*(size_t)(-ex);
- }
- else {
- if((size_t)ex > vp->Prec) {
- nc += BASE_FIG*((size_t)ex - vp->Prec);
+ if(ex<0) {
+ nc += BASE_FIG*(-ex);
+ } else {
+ if(ex > (S_INT)vp->Prec) {
+ nc += BASE_FIG*(ex - (S_INT)vp->Prec);
}
}
break;
@@ -3707,13 +2478,13 @@ VpNumOfChars(Real *vp,const char *pszFmt)
* that BASE is as large as possible satisfying the
* relation MaxVal <= BASE*(BASE+1). Where the value
* MaxVal is the largest value which can be represented
- * by one BDIGIT word in the computer used.
+ * by one U_LONG word(LONG) in the computer used.
*
* [Returns]
- * 1+DBL_DIG ... OK
+ * DBLE_FIG ... OK
*/
-VP_EXPORT size_t
-VpInit(BDIGIT BaseVal)
+VP_EXPORT U_LONG
+VpInit(U_LONG BaseVal)
{
/* Setup +/- Inf NaN -0 */
VpGetDoubleNaN();
@@ -3721,9 +2492,30 @@ VpInit(BDIGIT BaseVal)
VpGetDoubleNegInf();
VpGetDoubleNegZero();
+#ifndef BASE_FIG
+ if(BaseVal <= 0) {
+ U_LONG w;
+ /* Base <= 0, then determine Base by calcuration. */
+ BASE = 1;
+ while(
+ (BASE > 0) &&
+ ((w = BASE *(BASE + 1)) > BASE) &&((w / BASE) ==(BASE + 1))
+ ) {
+ BaseVal = BASE;
+ BASE = BaseVal * 10L;
+ }
+ }
+ /* Set Base Values */
+ BASE = BaseVal;
+ HALF_BASE = BASE / 2;
+ BASE1 = BASE / 10;
+ BASE_FIG = 0;
+ while(BaseVal /= 10) ++BASE_FIG;
+#endif
+
/* Allocates Vp constants. */
- VpConstOne = VpAlloc(1UL, "1");
- VpPt5 = VpAlloc(1UL, ".5");
+ VpConstOne = VpAlloc((U_LONG)1, "1");
+ VpPt5 = VpAlloc((U_LONG)1, ".5");
#ifdef BIGDECIMAL_DEBUG
gnAlloc = 0;
@@ -3735,12 +2527,12 @@ VpInit(BDIGIT BaseVal)
printf(" BASE = %lu\n", BASE);
printf(" HALF_BASE = %lu\n", HALF_BASE);
printf(" BASE1 = %lu\n", BASE1);
- printf(" BASE_FIG = %u\n", BASE_FIG);
+ printf(" BASE_FIG = %d\n", BASE_FIG);
printf(" DBLE_FIG = %d\n", DBLE_FIG);
}
#endif /* BIGDECIMAL_DEBUG */
- return rmpd_double_figures();
+ return DBLE_FIG;
}
VP_EXPORT Real *
@@ -3751,20 +2543,20 @@ VpOne(void)
/* If exponent overflows,then raise exception or returns 0 */
static int
-AddExponent(Real *a, SIGNED_VALUE n)
+AddExponent(Real *a,S_INT n)
{
- SIGNED_VALUE e = a->exponent;
- SIGNED_VALUE m = e+n;
- SIGNED_VALUE eb, mb;
+ S_INT e = a->exponent;
+ S_INT m = e+n;
+ S_INT eb,mb;
if(e>0) {
if(n>0) {
- mb = m*(SIGNED_VALUE)BASE_FIG;
- eb = e*(SIGNED_VALUE)BASE_FIG;
+ mb = m*BASE_FIG;
+ eb = e*BASE_FIG;
if(mb<eb) goto overflow;
}
} else if(n<0) {
- mb = m*(SIGNED_VALUE)BASE_FIG;
- eb = e*(SIGNED_VALUE)BASE_FIG;
+ mb = m*BASE_FIG;
+ eb = e*BASE_FIG;
if(mb>eb) goto underflow;
}
a->exponent = m;
@@ -3794,35 +2586,33 @@ overflow:
* NULL be returned if memory allocation is failed,or any error.
*/
VP_EXPORT Real *
-VpAlloc(size_t mx, const char *szVal)
+VpAlloc(U_LONG mx, const char *szVal)
{
- size_t i, ni, ipn, ipf, nf, ipe, ne, nalloc;
+ U_LONG i, ni, ipn, ipf, nf, ipe, ne, nalloc;
char v,*psz;
int sign=1;
Real *vp = NULL;
- size_t mf = VpGetPrecLimit();
+ U_LONG mf = VpGetPrecLimit();
VALUE buf;
mx = (mx + BASE_FIG - 1) / BASE_FIG + 1; /* Determine allocation unit. */
- if (szVal) {
- while (ISSPACE(*szVal)) szVal++;
- if (*szVal != '#') {
- if (mf) {
+ if(szVal) {
+ while(ISSPACE(*szVal)) szVal++;
+ if(*szVal!='#') {
+ if(mf) {
mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
- if (mx > mf) {
+ if(mx>mf) {
mx = mf;
}
}
- }
- else {
+ } else {
++szVal;
}
- }
- else {
+ } else {
/* necessary to be able to store */
/* at least mx digits. */
/* szVal==NULL ==> allocate zero value. */
- vp = VpAllocReal(mx);
+ vp = (Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(U_LONG));
/* xmalloc() alway returns(or throw interruption) */
vp->MaxPrec = mx; /* set max precision */
VpSetZero(vp,1); /* initialize vp to zero. */
@@ -3835,39 +2625,38 @@ VpAlloc(size_t mx, const char *szVal)
psz = RSTRING_PTR(buf);
i = 0;
ipn = 0;
- while ((psz[i]=szVal[ipn]) != 0) {
- if (ISDIGIT(psz[i])) ++ni;
- if (psz[i] == '_') {
- if (ni > 0) { ipn++; continue; }
- psz[i] = 0;
+ while((psz[i]=szVal[ipn])!=0) {
+ if(ISDIGIT(psz[i])) ++ni;
+ if(psz[i]=='_') {
+ if(ni>0) {ipn++;continue;}
+ psz[i]=0;
break;
}
- ++i;
- ++ipn;
+ ++i; ++ipn;
}
/* Skip trailing spaces */
- while (--i > 0) {
- if (ISSPACE(psz[i])) psz[i] = 0;
- else break;
+ while((--i)>0) {
+ if(ISSPACE(psz[i])) psz[i] = 0;
+ else break;
}
szVal = psz;
/* Check on Inf & NaN */
- if (StrCmp(szVal, SZ_PINF) == 0 ||
- StrCmp(szVal, SZ_INF) == 0 ) {
- vp = VpAllocReal(1);
+ if(StrCmp(szVal,SZ_PINF)==0 ||
+ StrCmp(szVal,SZ_INF)==0 ) {
+ vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
vp->MaxPrec = 1; /* set max precision */
VpSetPosInf(vp);
return vp;
}
- if (StrCmp(szVal, SZ_NINF) == 0) {
- vp = VpAllocReal(1);
+ if(StrCmp(szVal,SZ_NINF)==0) {
+ vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
vp->MaxPrec = 1; /* set max precision */
VpSetNegInf(vp);
return vp;
}
- if (StrCmp(szVal, SZ_NaN) == 0) {
- vp = VpAllocReal(1);
+ if(StrCmp(szVal,SZ_NaN)==0) {
+ vp = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
vp->MaxPrec = 1; /* set max precision */
VpSetNaN(vp);
return vp;
@@ -3875,12 +2664,12 @@ VpAlloc(size_t mx, const char *szVal)
/* check on number szVal[] */
ipn = i = 0;
- if (szVal[i] == '-') { sign=-1; ++i; }
- else if (szVal[i] == '+') ++i;
+ if (szVal[i] == '-') {sign=-1;++i;}
+ else if(szVal[i] == '+') ++i;
/* Skip digits */
ni = 0; /* digits in mantissa */
- while ((v = szVal[i]) != 0) {
- if (!ISDIGIT(v)) break;
+ while((v = szVal[i]) != 0) {
+ if(!ISDIGIT(v)) break;
++i;
++ni;
}
@@ -3888,30 +2677,31 @@ VpAlloc(size_t mx, const char *szVal)
ipf = 0;
ipe = 0;
ne = 0;
- if (v) {
+ if(v) {
/* other than digit nor \0 */
- if (szVal[i] == '.') { /* xxx. */
+ if(szVal[i] == '.') { /* xxx. */
++i;
ipf = i;
- while ((v = szVal[i]) != 0) { /* get fraction part. */
- if (!ISDIGIT(v)) break;
+ while((v = szVal[i]) != 0) { /* get fraction part. */
+ if(!ISDIGIT(v)) break;
++i;
++nf;
}
}
ipe = 0; /* Exponent */
- switch (szVal[i]) {
- case '\0':
- break;
- case 'e': case 'E':
- case 'd': case 'D':
+ switch(szVal[i]) {
+ case '\0': break;
+ case 'e':
+ case 'E':
+ case 'd':
+ case 'D':
++i;
ipe = i;
v = szVal[i];
- if ((v == '-') || (v == '+')) ++i;
- while ((v=szVal[i]) != 0) {
- if (!ISDIGIT(v)) break;
+ if((v == '-') ||(v == '+')) ++i;
+ while((v=szVal[i])!=0) {
+ if(!ISDIGIT(v)) break;
++i;
++ne;
}
@@ -3920,16 +2710,16 @@ VpAlloc(size_t mx, const char *szVal)
break;
}
}
- nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1; /* set effective allocation */
+ nalloc =(ni + nf + BASE_FIG - 1) / BASE_FIG + 1; /* set effective allocation */
/* units for szVal[] */
- if (mx <= 0) mx = 1;
+ if(mx <= 0) mx = 1;
nalloc = Max(nalloc, mx);
mx = nalloc;
- vp = VpAllocReal(mx);
+ vp =(Real *) VpMemAlloc(sizeof(Real) + mx * sizeof(U_LONG));
/* xmalloc() alway returns(or throw interruption) */
vp->MaxPrec = mx; /* set max precision */
- VpSetZero(vp, sign);
- VpCtoV(vp, &szVal[ipn], ni, &szVal[ipf], nf, &szVal[ipe], ne);
+ VpSetZero(vp,sign);
+ VpCtoV(vp, &(szVal[ipn]), ni, &(szVal[ipf]), nf, &(szVal[ipe]), ne);
rb_str_resize(buf, 0);
return vp;
}
@@ -3946,10 +2736,10 @@ VpAlloc(size_t mx, const char *szVal)
* [Output]
* c ... LHSV
*/
-VP_EXPORT size_t
+VP_EXPORT U_LONG
VpAsgn(Real *c, Real *a, int isw)
{
- size_t n;
+ U_LONG n;
if(VpIsNaN(a)) {
VpSetNaN(c);
return 0;
@@ -3965,7 +2755,7 @@ VpAsgn(Real *c, Real *a, int isw)
VpSetSign(c,(isw*VpGetSign(a))); /* set sign */
n =(a->Prec < c->MaxPrec) ?(a->Prec) :(c->MaxPrec);
c->Prec = n;
- memcpy(c->frac, a->frac, n * sizeof(BDIGIT));
+ memcpy(c->frac, a->frac, n * sizeof(U_LONG));
/* Needs round ? */
if(isw!=10) {
/* Not in ActiveRound */
@@ -3988,13 +2778,13 @@ VpAsgn(Real *c, Real *a, int isw)
* = a - b when operation = -1 or -2.
* Returns number of significant digits of c
*/
-VP_EXPORT size_t
+VP_EXPORT U_LONG
VpAddSub(Real *c, Real *a, Real *b, int operation)
{
- short sw, isw;
+ S_INT sw, isw;
Real *a_ptr, *b_ptr;
- size_t n, na, nb, i;
- BDIGIT mrv;
+ U_LONG n, na, nb, i;
+ U_LONG mrv;
#ifdef BIGDECIMAL_DEBUG
if(gfDebug) {
@@ -4086,11 +2876,11 @@ end_if:
* else c =(Sign ofisw)(|a_ptr|+|b_ptr|)
*/
if(isw) { /* addition */
- VpSetSign(c, 1);
+ VpSetSign(c,(S_INT)1);
mrv = VpAddAbs(a_ptr, b_ptr, c);
- VpSetSign(c, isw / 2);
+ VpSetSign(c,isw / 2);
} else { /* subtraction */
- VpSetSign(c, 1);
+ VpSetSign(c,(S_INT)1);
mrv = VpSubAbs(a_ptr, b_ptr, c);
if(a_ptr == a) {
VpSetSign(c,VpGetSign(a));
@@ -4116,17 +2906,18 @@ end_if:
* a and b assuming abs(a)>abs(b).
* c = abs(a) + abs(b) ; where |a|>=|b|
*/
-static BDIGIT
+static U_LONG
VpAddAbs(Real *a, Real *b, Real *c)
{
- size_t word_shift;
- size_t ap;
- size_t bp;
- size_t cp;
- size_t a_pos;
- size_t b_pos, b_pos_with_word_shift;
- size_t c_pos;
- BDIGIT av, bv, carry, mrv;
+ U_LONG word_shift;
+ U_LONG carry;
+ U_LONG ap;
+ U_LONG bp;
+ U_LONG cp;
+ U_LONG a_pos;
+ U_LONG b_pos;
+ U_LONG c_pos;
+ U_LONG av, bv, mrv;
#ifdef BIGDECIMAL_DEBUG
if(gfDebug) {
@@ -4139,8 +2930,8 @@ VpAddAbs(Real *a, Real *b, Real *c)
a_pos = ap;
b_pos = bp;
c_pos = cp;
- if(word_shift==(size_t)-1L) return 0; /* Overflow */
- if(b_pos == (size_t)-1L) goto Assign_a;
+ if(word_shift==(U_LONG)-1L) return 0; /* Overflow */
+ if(b_pos == (U_LONG)-1L) goto Assign_a;
mrv = av + bv; /* Most right val. Used for round. */
@@ -4158,8 +2949,8 @@ VpAddAbs(Real *a, Real *b, Real *c)
/* Just assign the last few digits of a to c because b has no */
/* corresponding digits to be added. */
- b_pos_with_word_shift = b_pos + word_shift;
- while(a_pos > b_pos_with_word_shift) {
+ bv = b_pos + word_shift;
+ while(a_pos > bv) {
c->frac[--c_pos] = a->frac[--a_pos];
}
carry = 0; /* set first carry be zero */
@@ -4207,17 +2998,19 @@ Exit:
/*
* c = abs(a) - abs(b)
*/
-static BDIGIT
+static U_LONG
VpSubAbs(Real *a, Real *b, Real *c)
{
- size_t word_shift;
- size_t ap;
- size_t bp;
- size_t cp;
- size_t a_pos;
- size_t b_pos, b_pos_with_word_shift;
- size_t c_pos;
- BDIGIT av, bv, borrow, mrv;
+ U_LONG word_shift;
+ U_LONG mrv;
+ U_LONG borrow;
+ U_LONG ap;
+ U_LONG bp;
+ U_LONG cp;
+ U_LONG a_pos;
+ U_LONG b_pos;
+ U_LONG c_pos;
+ U_LONG av, bv;
#ifdef BIGDECIMAL_DEBUG
if(gfDebug) {
@@ -4230,8 +3023,8 @@ VpSubAbs(Real *a, Real *b, Real *c)
a_pos = ap;
b_pos = bp;
c_pos = cp;
- if(word_shift==(size_t)-1L) return 0; /* Overflow */
- if(b_pos == (size_t)-1L) goto Assign_a;
+ if(word_shift==(U_LONG)-1L) return 0; /* Overflow */
+ if(b_pos == (U_LONG)-1L) goto Assign_a;
if(av >= bv) {
mrv = av - bv;
@@ -4259,8 +3052,8 @@ VpSubAbs(Real *a, Real *b, Real *c)
/* Just assign the last few digits of a to c because b has no */
/* corresponding digits to subtract. */
- b_pos_with_word_shift = b_pos + word_shift;
- while(a_pos > b_pos_with_word_shift) {
+ bv = b_pos + word_shift;
+ while(a_pos > bv) {
c->frac[--c_pos] = a->frac[--a_pos];
}
@@ -4319,10 +3112,10 @@ Exit:
* b_pos = |
* c_pos = |
*/
-static size_t
-VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos, BDIGIT *av, BDIGIT *bv)
+static U_LONG
+VpSetPTR(Real *a, Real *b, Real *c, U_LONG *a_pos, U_LONG *b_pos, U_LONG *c_pos, U_LONG *av, U_LONG *bv)
{
- size_t left_word, right_word, word_shift;
+ U_LONG left_word, right_word, word_shift;
c->frac[0] = 0;
*av = *bv = 0;
word_shift =((a->exponent) -(b->exponent));
@@ -4395,7 +3188,7 @@ VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos,
}
c->Prec = *c_pos;
c->exponent = a->exponent;
- if(!AddExponent(c,1)) return (size_t)-1L;
+ if(!AddExponent(c,1)) return (U_LONG)-1L;
return word_shift;
}
@@ -4414,14 +3207,13 @@ VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos,
* nc <---|
* MaxAB |--------------------|
*/
-VP_EXPORT size_t
+VP_EXPORT U_LONG
VpMult(Real *c, Real *a, Real *b)
{
- size_t MxIndA, MxIndB, MxIndAB, MxIndC;
- size_t ind_c, i, ii, nc;
- size_t ind_as, ind_ae, ind_bs;
- BDIGIT carry;
- BDIGIT_DBL s;
+ U_LONG MxIndA, MxIndB, MxIndAB, MxIndC;
+ U_LONG ind_c, i, ii, nc;
+ U_LONG ind_as, ind_ae, ind_bs, ind_be;
+ U_LONG Carry, s;
Real *w;
#ifdef BIGDECIMAL_DEBUG
@@ -4461,7 +3253,7 @@ VpMult(Real *c, Real *a, Real *b)
if(MxIndC < MxIndAB) { /* The Max. prec. of c < Prec(a)+Prec(b) */
w = c;
- c = VpAlloc((size_t)((MxIndAB + 1) * BASE_FIG), "#0");
+ c = VpAlloc((U_LONG)((MxIndAB + 1) * BASE_FIG), "#0");
MxIndC = MxIndAB;
}
@@ -4473,42 +3265,45 @@ VpMult(Real *c, Real *a, Real *b)
return 0;
}
VpSetSign(c,VpGetSign(a)*VpGetSign(b)); /* set sign */
- carry = 0;
+ Carry = 0;
nc = ind_c = MxIndAB;
- memset(c->frac, 0, (nc + 1) * sizeof(BDIGIT)); /* Initialize c */
+ memset(c->frac, 0, (nc + 1) * sizeof(U_LONG)); /* Initialize c */
c->Prec = nc + 1; /* set precision */
for(nc = 0; nc < MxIndAB; ++nc, --ind_c) {
if(nc < MxIndB) { /* The left triangle of the Fig. */
ind_as = MxIndA - nc;
ind_ae = MxIndA;
ind_bs = MxIndB;
+ ind_be = MxIndB - nc;
} else if(nc <= MxIndA) { /* The middle rectangular of the Fig. */
ind_as = MxIndA - nc;
ind_ae = MxIndA -(nc - MxIndB);
ind_bs = MxIndB;
+ ind_be = 0;
} else if(nc > MxIndA) { /* The right triangle of the Fig. */
ind_as = 0;
ind_ae = MxIndAB - nc - 1;
ind_bs = MxIndB -(nc - MxIndA);
+ ind_be = 0;
}
for(i = ind_as; i <= ind_ae; ++i) {
- s = (BDIGIT_DBL)a->frac[i] * b->frac[ind_bs--];
- carry = (BDIGIT)(s / BASE);
- s -= (BDIGIT_DBL)carry * BASE;
- c->frac[ind_c] += (BDIGIT)s;
+ s =((a->frac[i]) *(b->frac[ind_bs--]));
+ Carry = s / BASE;
+ s = s -(Carry * BASE);
+ c->frac[ind_c] += s;
if(c->frac[ind_c] >= BASE) {
s = c->frac[ind_c] / BASE;
- carry += (BDIGIT)s;
- c->frac[ind_c] -= (BDIGIT)(s * BASE);
+ Carry += s;
+ c->frac[ind_c] -= (s * BASE);
}
- if(carry) {
+ if(Carry) {
ii = ind_c;
while(ii-- > 0) {
- c->frac[ii] += carry;
+ c->frac[ii] += Carry;
if(c->frac[ii] >= BASE) {
- carry = c->frac[ii] / BASE;
- c->frac[ii] -= (carry * BASE);
+ Carry = c->frac[ii] / BASE;
+ c->frac[ii] -=(Carry * BASE);
} else {
break;
}
@@ -4539,15 +3334,14 @@ Exit:
/*
* c = a / b, remainder = r
*/
-VP_EXPORT size_t
+VP_EXPORT U_LONG
VpDivd(Real *c, Real *r, Real *a, Real *b)
{
- size_t word_a, word_b, word_c, word_r;
- size_t i, n, ind_a, ind_b, ind_c, ind_r;
- size_t nLoop;
- BDIGIT_DBL q, b1, b1p1, b1b2, b1b2p1, r1r2;
- BDIGIT borrow, borrow1, borrow2;
- BDIGIT_DBL qb;
+ U_LONG word_a, word_b, word_c, word_r;
+ U_LONG i, n, ind_a, ind_b, ind_c, ind_r;
+ U_LONG nLoop;
+ U_LONG q, b1, b1p1, b1b2, b1b2p1, r1r2;
+ U_LONG borrow, borrow1, borrow2, qb;
#ifdef BIGDECIMAL_DEBUG
if(gfDebug) {
@@ -4618,7 +3412,7 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
++ind_c;
continue;
}
- r1r2 = (BDIGIT_DBL)r->frac[ind_c] * BASE + r->frac[ind_c + 1];
+ r1r2 = r->frac[ind_c] * BASE + r->frac[ind_c + 1];
if(r1r2 == b1b2) {
/* The first two word digits is the same */
ind_b = 2;
@@ -4639,7 +3433,7 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
n = ind_b;
for(i = 0; i <= n; ++i) {
if(r->frac[ind_r] < b->frac[ind_b] + borrow) {
- r->frac[ind_r] += (BASE - (b->frac[ind_b] + borrow));
+ r->frac[ind_r] +=(BASE -(b->frac[ind_b] + borrow));
borrow = 1;
} else {
r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
@@ -4648,22 +3442,22 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
--ind_r;
--ind_b;
}
- ++c->frac[ind_c];
+ ++(c->frac[ind_c]);
goto carry;
}
/* The first two word digits is not the same, */
/* then compare magnitude, and divide actually. */
if(r1r2 >= b1b2p1) {
- q = r1r2 / b1b2p1; /* q == (BDIGIT)q */
- c->frac[ind_c] += (BDIGIT)q;
+ q = r1r2 / b1b2p1;
+ c->frac[ind_c] += q;
ind_r = b->Prec + ind_c - 1;
goto sub_mult;
}
div_b1p1:
if(ind_c + 1 >= word_c) goto out_side;
- q = r1r2 / b1p1; /* q == (BDIGIT)q */
- c->frac[ind_c + 1] += (BDIGIT)q;
+ q = r1r2 / b1p1;
+ c->frac[ind_c + 1] += q;
ind_r = b->Prec + ind_c;
sub_mult:
@@ -4673,22 +3467,22 @@ sub_mult:
n = ind_b;
for(i = 0; i <= n; ++i) {
/* now, perform r = r - q * b */
- qb = q * b->frac[ind_b];
- if (qb < BASE) borrow1 = 0;
+ qb = q *(b->frac[ind_b]);
+ if(qb < BASE) borrow1 = 0;
else {
- borrow1 = (BDIGIT)(qb / BASE);
- qb -= (BDIGIT_DBL)borrow1 * BASE; /* get qb < BASE */
+ borrow1 = qb / BASE;
+ qb = qb - borrow1 * BASE;
}
if(r->frac[ind_r] < qb) {
- r->frac[ind_r] += (BDIGIT)(BASE - qb);
+ r->frac[ind_r] +=(BASE - qb);
borrow2 = borrow2 + borrow1 + 1;
} else {
- r->frac[ind_r] -= (BDIGIT)qb;
+ r->frac[ind_r] -= qb;
borrow2 += borrow1;
}
if(borrow2) {
if(r->frac[ind_r - 1] < borrow2) {
- r->frac[ind_r - 1] += (BASE - borrow2);
+ r->frac[ind_r - 1] +=(BASE - borrow2);
borrow2 = 1;
} else {
r->frac[ind_r - 1] -= borrow2;
@@ -4705,7 +3499,7 @@ carry:
while(c->frac[ind_r] >= BASE) {
c->frac[ind_r] -= BASE;
--ind_r;
- ++c->frac[ind_r];
+ ++(c->frac[ind_r]);
}
}
/* End of operation, now final arrangement */
@@ -4753,32 +3547,32 @@ Exit:
static int
VpNmlz(Real *a)
{
- size_t ind_a, i;
+ U_LONG ind_a, i;
- if (!VpIsDef(a)) goto NoVal;
- if (VpIsZero(a)) goto NoVal;
+ if(!VpIsDef(a)) goto NoVal;
+ if(VpIsZero(a)) goto NoVal;
ind_a = a->Prec;
- while (ind_a--) {
- if (a->frac[ind_a]) {
+ while(ind_a--) {
+ if(a->frac[ind_a]) {
a->Prec = ind_a + 1;
i = 0;
- while (a->frac[i] == 0) ++i; /* skip the first few zeros */
- if (i) {
+ while(a->frac[i] == 0) ++i; /* skip the first few zeros */
+ if(i) {
a->Prec -= i;
- if (!AddExponent(a, -(SIGNED_VALUE)i)) return 0;
- memmove(&a->frac[0], &a->frac[i], a->Prec*sizeof(BDIGIT));
+ if(!AddExponent(a,-((S_INT)i))) return 0;
+ memmove(&(a->frac[0]),&(a->frac[i]),(a->Prec)*sizeof(U_LONG));
}
return 1;
}
}
/* a is zero(no non-zero digit) */
- VpSetZero(a, VpGetSign(a));
+ VpSetZero(a,VpGetSign(a));
return 0;
NoVal:
a->frac[0] = 0;
- a->Prec = 1;
+ a->Prec=1;
return 0;
}
@@ -4792,7 +3586,7 @@ VP_EXPORT int
VpComp(Real *a, Real *b)
{
int val;
- size_t mx, ind;
+ U_LONG mx, ind;
int e;
val = 0;
if(VpIsNaN(a)||VpIsNaN(b)) return 999;
@@ -4873,7 +3667,7 @@ Exit:
return (int)val;
}
-#ifdef BIGDECIMAL_ENABLE_VPRINT
+#ifdef BIGDECIMAL_DEBUG
/*
* cntl_chr ... ASCIIZ Character, print control characters
* Available control codes:
@@ -4887,8 +3681,8 @@ Exit:
VP_EXPORT int
VPrint(FILE *fp, const char *cntl_chr, Real *a)
{
- size_t i, j, nc, nd, ZeroSup;
- BDIGIT m, e, nn;
+ U_LONG i, j, nc, nd, ZeroSup;
+ U_LONG n, m, e, nn;
/* Check if NaN & Inf. */
if(VpIsNaN(a)) {
@@ -4922,13 +3716,14 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
++nc;
}
nc += fprintf(fp, "0.");
- for(i=0; i < a->Prec; ++i) {
+ n = a->Prec;
+ for(i=0;i < n;++i) {
m = BASE1;
e = a->frac[i];
while(m) {
nn = e / m;
if((!ZeroSup) || nn) {
- nc += fprintf(fp, "%lu", (unsigned long)nn); /* The leading zero(s) */
+ nc += fprintf(fp, "%lu", nn); /* The leading zero(s) */
/* as 0.00xx will not */
/* be printed. */
++nd;
@@ -4942,7 +3737,7 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
m /= 10;
}
}
- nc += fprintf(fp, "E%"PRIdSIZE, VpExponent10(a));
+ nc += fprintf(fp, "E%ld", VpExponent10(a));
} else {
nc += fprintf(fp, "0.0");
}
@@ -4975,12 +3770,14 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
}
return (int)nc;
}
-#endif /* BIGDECIMAL_ENABLE_VPRINT */
+#endif /* BIGDECIMAL_DEBUG */
static void
-VpFormatSt(char *psz, size_t fFmt)
+VpFormatSt(char *psz,S_INT fFmt)
{
- size_t ie, i, nf = 0;
+ U_LONG ie;
+ U_LONG i;
+ S_INT nf = 0;
char ch;
if(fFmt<=0) return;
@@ -5002,17 +3799,17 @@ VpFormatSt(char *psz, size_t fFmt)
}
}
-VP_EXPORT ssize_t
+VP_EXPORT S_LONG
VpExponent10(Real *a)
{
- ssize_t ex;
- size_t n;
+ S_LONG ex;
+ U_LONG n;
- if (!VpHasVal(a)) return 0;
+ if(!VpHasVal(a)) return 0;
- ex = a->exponent * (ssize_t)BASE_FIG;
+ ex =(a->exponent) * BASE_FIG;
n = BASE1;
- while ((a->frac[0] / n) == 0) {
+ while((a->frac[0] / n) == 0) {
--ex;
n /= 10;
}
@@ -5022,8 +3819,8 @@ VpExponent10(Real *a)
VP_EXPORT void
VpSzMantissa(Real *a,char *psz)
{
- size_t i, n, ZeroSup;
- BDIGIT_DBL m, e, nn;
+ U_LONG i, ZeroSup;
+ U_LONG n, m, e, nn;
if(VpIsNaN(a)) {
sprintf(psz,SZ_NaN);
@@ -5042,13 +3839,13 @@ VpSzMantissa(Real *a,char *psz)
if(!VpIsZero(a)) {
if(VpGetSign(a) < 0) *psz++ = '-';
n = a->Prec;
- for (i=0; i < n; ++i) {
+ for(i=0;i < n;++i) {
m = BASE1;
e = a->frac[i];
- while (m) {
+ while(m) {
nn = e / m;
if((!ZeroSup) || nn) {
- sprintf(psz, "%lu", (unsigned long)nn); /* The leading zero(s) */
+ sprintf(psz, "%lu", nn); /* The leading zero(s) */
psz += strlen(psz);
/* as 0.00xx will be ignored. */
ZeroSup = 0; /* Set to print succeeding zeros */
@@ -5099,21 +3896,21 @@ VpToSpecialString(Real *a,char *psz,int fPlus)
}
VP_EXPORT void
-VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
+VpToString(Real *a,char *psz,int fFmt,int fPlus)
/* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */
{
- size_t i, n, ZeroSup;
- BDIGIT shift, m, e, nn;
+ U_LONG i, ZeroSup;
+ U_LONG n, m, e, nn;
char *pszSav = psz;
- ssize_t ex;
+ S_LONG ex;
- if (VpToSpecialString(a, psz, fPlus)) return;
+ if(VpToSpecialString(a,psz,fPlus)) return;
ZeroSup = 1; /* Flag not to print the leading zeros as 0.00xxxxEnn */
- if (VpGetSign(a) < 0) *psz++ = '-';
- else if (fPlus == 1) *psz++ = ' ';
- else if (fPlus == 2) *psz++ = '+';
+ if(VpGetSign(a) < 0) *psz++ = '-';
+ else if(fPlus==1) *psz++ = ' ';
+ else if(fPlus==2) *psz++ = '+';
*psz++ = '0';
*psz++ = '.';
@@ -5124,7 +3921,7 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
while(m) {
nn = e / m;
if((!ZeroSup) || nn) {
- sprintf(psz, "%lu", (unsigned long)nn); /* The reading 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 */
@@ -5133,25 +3930,25 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
m /= 10;
}
}
- ex = a->exponent * (ssize_t)BASE_FIG;
- shift = BASE1;
- while(a->frac[0] / shift == 0) {
+ ex =(a->exponent) * BASE_FIG;
+ n = BASE1;
+ while((a->frac[0] / n) == 0) {
--ex;
- shift /= 10;
+ n /= 10;
}
while(psz[-1]=='0') *(--psz) = 0;
- sprintf(psz, "E%"PRIdSIZE, ex);
+ sprintf(psz, "E%ld", ex);
if(fFmt) VpFormatSt(pszSav, fFmt);
}
VP_EXPORT void
-VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
+VpToFString(Real *a,char *psz,int fFmt,int fPlus)
/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
{
- size_t i, n;
- BDIGIT m, e, nn;
+ U_LONG i;
+ U_LONG n, m, e, nn;
char *pszSav = psz;
- ssize_t ex;
+ S_LONG ex;
if(VpToSpecialString(a,psz,fPlus)) return;
@@ -5173,7 +3970,7 @@ VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
for(i=0;i < n;++i) {
--ex;
if(i==0 && ex >= 0) {
- sprintf(psz, "%lu", (unsigned long)a->frac[i]);
+ sprintf(psz, "%lu", a->frac[i]);
psz += strlen(psz);
} else {
m = BASE1;
@@ -5210,12 +4007,12 @@ VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
* ne ... number of characters in exp_chr[],not including '+/-'.
*/
VP_EXPORT int
-VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, const char *exp_chr, size_t ne)
+VpCtoV(Real *a, const char *int_chr, U_LONG ni, const char *frac, U_LONG nf, const char *exp_chr, U_LONG ne)
{
- size_t i, j, ind_a, ma, mi, me;
- SIGNED_VALUE e, es, eb, ef;
- int sign, signe, exponent_overflow;
-
+ U_LONG i, j, ind_a, ma, mi, me;
+ U_LONG loc;
+ S_LONG e,es, eb, ef;
+ S_INT sign, signe, exponent_overflow;
/* get exponent part */
e = 0;
ma = a->MaxPrec;
@@ -5223,22 +4020,21 @@ VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, con
me = ne;
signe = 1;
exponent_overflow = 0;
- memset(a->frac, 0, ma * sizeof(BDIGIT));
- if (ne > 0) {
+ memset(a->frac, 0, ma * sizeof(U_LONG));
+ if(ne > 0) {
i = 0;
- if (exp_chr[0] == '-') {
+ if(exp_chr[0] == '-') {
signe = -1;
++i;
++me;
- }
- else if (exp_chr[0] == '+') {
+ } else if(exp_chr[0] == '+') {
++i;
++me;
}
- while (i < me) {
- es = e * (SIGNED_VALUE)BASE_FIG;
+ while(i < me) {
+ es = e*((S_INT)BASE_FIG);
e = e * 10 + exp_chr[i] - '0';
- if (es > (SIGNED_VALUE)(e*BASE_FIG)) {
+ if(es > (S_INT)(e*BASE_FIG)) {
exponent_overflow = 1;
e = es; /* keep sign */
break;
@@ -5264,57 +4060,58 @@ VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, con
e = signe * e; /* e: The value of exponent part. */
e = e + ni; /* set actual exponent size. */
- if (e > 0) signe = 1;
- else signe = -1;
+ if(e > 0) signe = 1;
+ else signe = -1;
/* Adjust the exponent so that it is the multiple of BASE_FIG. */
j = 0;
ef = 1;
- while (ef) {
- if (e >= 0) eb = e;
- else eb = -e;
- ef = eb / (SIGNED_VALUE)BASE_FIG;
- ef = eb - ef * (SIGNED_VALUE)BASE_FIG;
- if (ef) {
+ while(ef) {
+ if(e>=0) eb = e;
+ else eb = -e;
+ ef = eb / ((S_INT)BASE_FIG);
+ ef = eb - ef * ((S_INT)BASE_FIG);
+ if(ef) {
++j; /* Means to add one more preceeding zero */
++e;
}
}
- eb = e / (SIGNED_VALUE)BASE_FIG;
+ eb = e / ((S_INT)BASE_FIG);
- if (exponent_overflow) {
+ if(exponent_overflow) {
int zero = 1;
- for ( ; i < mi && zero; i++) zero = int_chr[i] == '0';
- for (i = 0; i < nf && zero; i++) zero = frac[i] == '0';
- if (!zero && signe > 0) {
+ for( ; i < mi && zero; i++) zero = int_chr[i] == '0';
+ for(i = 0; i < nf && zero; i++) zero = frac[i] == '0';
+ if(!zero && signe > 0) {
VpSetInf(a, sign);
- VpException(VP_EXCEPTION_INFINITY, "exponent overflow",0);
+ VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
}
else VpSetZero(a, sign);
return 1;
}
ind_a = 0;
- while (i < mi) {
+ while(i < mi) {
a->frac[ind_a] = 0;
- while ((j < BASE_FIG) && (i < mi)) {
+ while((j < (U_LONG)BASE_FIG) &&(i < mi)) {
a->frac[ind_a] = a->frac[ind_a] * 10 + int_chr[i] - '0';
++j;
++i;
}
- if (i < mi) {
+ if(i < mi) {
++ind_a;
- if (ind_a >= ma) goto over_flow;
+ if(ind_a >= ma) goto over_flow;
j = 0;
}
}
+ loc = 1;
/* get fraction part */
i = 0;
while(i < nf) {
- while((j < BASE_FIG) && (i < nf)) {
+ while((j < (U_LONG)BASE_FIG) &&(i < nf)) {
a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
++j;
++i;
@@ -5331,13 +4128,13 @@ over_flow:
rb_warn("Conversion from String to BigDecimal overflow (last few digits discarded).");
Final:
- if (ind_a >= ma) ind_a = ma - 1;
- while (j < BASE_FIG) {
+ if(ind_a >= ma) ind_a = ma - 1;
+ while(j < (U_LONG)BASE_FIG) {
a->frac[ind_a] = a->frac[ind_a] * 10;
++j;
}
a->Prec = ind_a + 1;
- a->exponent = eb;
+ a->exponent = (S_INT)eb;
VpSetSign(a,sign);
VpNmlz(a);
return 1;
@@ -5348,7 +4145,7 @@ Final:
* *m ... Real
* [Output]
* *d ... fraction part of m(d = 0.xxxxxxx). where # of 'x's is fig.
- * *e ... exponent of m.
+ * *e ... U_LONG,exponent of m.
* DBLE_FIG ... Number of digits in a double variable.
*
* m -> d*10**e, 0<d<BASE
@@ -5359,9 +4156,9 @@ Final:
* -1 ... NaN
*/
VP_EXPORT int
-VpVtoD(double *d, SIGNED_VALUE *e, Real *m)
+VpVtoD(double *d, S_LONG *e, Real *m)
{
- size_t ind_m, mm, fig;
+ U_LONG ind_m, mm, fig;
double div;
int f = 1;
@@ -5402,10 +4199,10 @@ VpVtoD(double *d, SIGNED_VALUE *e, Real *m)
*d = 0.0;
div = 1.;
while(ind_m < mm) {
- div /= (double)BASE;
- *d = *d + (double)m->frac[ind_m++] * div;
+ div /=(double)((S_INT)BASE);
+ *d = *d +((double) ((S_INT)m->frac[ind_m++])) * div;
}
- *e = m->exponent * (SIGNED_VALUE)BASE_FIG;
+ *e = m->exponent * ((S_INT)BASE_FIG);
*d *= VpGetSign(m);
Exit:
@@ -5425,9 +4222,8 @@ Exit:
VP_EXPORT void
VpDtoV(Real *m, double d)
{
- size_t ind_m, mm;
- SIGNED_VALUE ne;
- BDIGIT i;
+ U_LONG i, ind_m, mm;
+ S_INT ne;
double val, val2;
if(isnan(d)) {
@@ -5448,33 +4244,37 @@ VpDtoV(Real *m, double d)
ne = 0;
if(val >= 1.0) {
while(val >= 1.0) {
- val /= (double)BASE;
+ val /=(double)((S_INT)BASE);
++ne;
}
} else {
- val2 = 1.0 /(double)BASE;
+ val2 = 1.0 /(double)((S_INT)BASE);
while(val < val2) {
- val *= (double)BASE;
+ val *=(double)((S_INT)BASE);
--ne;
}
}
/* Now val = 0.xxxxx*BASE**ne */
mm = m->MaxPrec;
- memset(m->frac, 0, mm * sizeof(BDIGIT));
+ memset(m->frac, 0, mm * sizeof(U_LONG));
for(ind_m = 0;val > 0.0 && ind_m < mm;ind_m++) {
- val *= (double)BASE;
- i = (BDIGIT)val;
- val -= (double)i;
+ val *=(double)((S_INT)BASE);
+ i =(U_LONG) val;
+ val -=(double)((S_INT)i);
m->frac[ind_m] = i;
}
if(ind_m >= mm) ind_m = mm - 1;
- VpSetSign(m, (d > 0.0) ? 1 : -1);
+ if(d > 0.0) {
+ VpSetSign(m, (S_INT)1);
+ } else {
+ VpSetSign(m,-(S_INT)1);
+ }
m->Prec = ind_m + 1;
m->exponent = ne;
- VpInternalRound(m, 0, (m->Prec > 0) ? m->frac[m->Prec-1] : 0,
- (BDIGIT)(val*(double)BASE));
+ VpInternalRound(m,0,(m->Prec>0)?m->frac[m->Prec-1]:0,
+ (U_LONG)(val*((double)((S_INT)BASE))));
Exit:
#ifdef BIGDECIMAL_DEBUG
@@ -5491,12 +4291,12 @@ Exit:
*/
#if 0 /* unused */
VP_EXPORT void
-VpItoV(Real *m, SIGNED_VALUE ival)
+VpItoV(Real *m, S_INT ival)
{
- size_t mm, ind_m;
- size_t val, v1, v2, v;
+ U_LONG mm, ind_m;
+ U_LONG val, v1, v2, v;
int isign;
- SIGNED_VALUE ne;
+ S_INT ne;
if(ival == 0) {
VpSetZero(m,1);
@@ -5506,7 +4306,7 @@ VpItoV(Real *m, SIGNED_VALUE ival)
val = ival;
if(ival < 0) {
isign = -1;
- val =(size_t)(-ival);
+ val =(U_LONG)(-ival);
}
ne = 0;
ind_m = 0;
@@ -5557,10 +4357,11 @@ VpSqrt(Real *y, Real *x)
{
Real *f = NULL;
Real *r = NULL;
- size_t y_prec;
- SIGNED_VALUE n, e;
- SIGNED_VALUE prec;
- ssize_t nr;
+ S_LONG y_prec, f_prec;
+ S_LONG n;
+ S_LONG e;
+ S_LONG prec;
+ S_LONG nr;
double val;
/* Zero, NaN or Infinity ? */
@@ -5586,38 +4387,37 @@ VpSqrt(Real *y, Real *x)
goto Exit;
}
- n = (SIGNED_VALUE)y->MaxPrec;
- if (x->MaxPrec > (size_t)n) n = (ssize_t)x->MaxPrec;
+ n = (S_LONG)y->MaxPrec;
+ if((S_LONG)x->MaxPrec > n) n = (S_LONG)x->MaxPrec;
/* allocate temporally variables */
- f = VpAlloc(y->MaxPrec * (BASE_FIG + 2), "#1");
- r = VpAlloc((n + n) * (BASE_FIG + 2), "#1");
+ f = VpAlloc(y->MaxPrec *(BASE_FIG + 2), "#1");
+ r = VpAlloc((n + n) *(BASE_FIG + 2), "#1");
nr = 0;
- y_prec = y->MaxPrec;
-
- prec = x->exponent - (ssize_t)y_prec;
- if (x->exponent > 0)
- ++prec;
- else
- --prec;
+ y_prec = (S_LONG)y->MaxPrec;
+ f_prec = (S_LONG)f->MaxPrec;
+ prec = x->exponent;
+ if(prec > 0) ++prec;
+ else --prec;
+ prec = prec - (S_LONG)y->MaxPrec;
VpVtoD(&val, &e, x); /* val <- x */
- e /= (SIGNED_VALUE)BASE_FIG;
+ e /= ((S_LONG)BASE_FIG);
n = e / 2;
- if (e - n * 2 != 0) {
- val /= BASE;
- n = (e + 1) / 2;
+ if(e - n * 2 != 0) {
+ val /=(double)((S_INT)BASE);
+ n =(e + 1) / 2;
}
VpDtoV(y, sqrt(val)); /* y <- sqrt(val) */
- y->exponent += n;
- n = (SIGNED_VALUE)((DBLE_FIG + BASE_FIG - 1) / BASE_FIG);
- y->MaxPrec = Min((size_t)n , y_prec);
+ y->exponent += (S_INT)n;
+ n = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
+ y->MaxPrec = (U_LONG)Min(n , y_prec);
f->MaxPrec = y->MaxPrec + 1;
- n = (SIGNED_VALUE)(y_prec * BASE_FIG);
- if (n < (SIGNED_VALUE)maxnr) n = (SIGNED_VALUE)maxnr;
+ n = y_prec*((S_LONG)BASE_FIG);
+ if((U_LONG)n<maxnr) n = (U_LONG)maxnr;
do {
y->MaxPrec *= 2;
- if (y->MaxPrec > y_prec) y->MaxPrec = y_prec;
+ if(y->MaxPrec > (U_LONG)y_prec) y->MaxPrec = (U_LONG)y_prec;
f->MaxPrec = y->MaxPrec;
VpDivd(f, r, x, y); /* f = x/y */
VpAddSub(r, f, y, -1); /* r = f - y */
@@ -5637,12 +4437,12 @@ VpSqrt(Real *y, Real *x)
y->MaxPrec = y_prec;
converge:
- VpChangeSign(y, 1);
+ VpChangeSign(y,(S_INT)1);
#ifdef BIGDECIMAL_DEBUG
if(gfDebug) {
VpMult(r, y, y);
VpAddSub(f, x, r, -1);
- printf("VpSqrt: iterations = %"PRIdSIZE"\n", nr);
+ printf("VpSqrt: iterations = %lu\n", nr);
VPrint(stdout, " y =% \n", y);
VPrint(stdout, " x =% \n", x);
VPrint(stdout, " x-y*y = % \n", f);
@@ -5662,7 +4462,7 @@ Exit:
*
*/
VP_EXPORT int
-VpMidRound(Real *y, unsigned short f, ssize_t nf)
+VpMidRound(Real *y, int f, S_LONG nf)
/*
* Round reletively from the decimal point.
* f: rounding mode
@@ -5670,14 +4470,13 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
*/
{
/* fracf: any positive digit under rounding position? */
- /* fracf_1further: any positive digits under one further than the rounding position? */
/* exptoadd: number of digits needed to compensate negative nf */
- int fracf, fracf_1further;
- ssize_t n,i,ix,ioffset, exptoadd;
- BDIGIT v, shifter;
- BDIGIT div;
+ int fracf;
+ S_LONG n,i,ix,ioffset,exptoadd;
+ U_LONG v,shifter;
+ U_LONG div;
- nf += y->exponent * (ssize_t)BASE_FIG;
+ nf += y->exponent*((int)BASE_FIG);
exptoadd=0;
if (nf < 0) {
/* rounding position too left(large). */
@@ -5685,122 +4484,72 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
VpSetZero(y,VpGetSign(y)); /* truncate everything */
return 0;
}
- exptoadd = -nf;
- nf = 0;
+ exptoadd = -nf;
+ nf = 0;
}
- ix = nf / (ssize_t)BASE_FIG;
- if ((size_t)ix >= y->Prec) return 0; /* rounding position too right(small). */
- v = y->frac[ix];
+ /* 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). */
+ ioffset = nf - ix*((int)BASE_FIG);
- ioffset = nf - ix*(ssize_t)BASE_FIG;
- n = (ssize_t)BASE_FIG - ioffset - 1;
- for (shifter=1,i=0; i<n; ++i) shifter *= 10;
-
- /* so the representation used (in y->frac) is an array of BDIGIT, where
- each BDIGIT contains a value between 0 and BASE-1, consisting of BASE_FIG
- decimal places.
-
- (that numbers of decimal places are typed as ssize_t is somewhat confusing)
-
- nf is now position (in decimal places) of the digit from the start of
- the array.
- ix is the position (in BDIGITS) of the BDIGIT containing the decimal digit,
- from the start of the array.
- v is the value of this BDIGIT
- ioffset is the number of extra decimal places along of this decimal digit
- within v.
- n is the number of decimal digits remaining within v after this decimal digit
- shifter is 10**n,
- v % shifter are the remaining digits within v
- v % (shifter * 10) are the digit together with the remaining digits within v
- v / shifter are the digit's predecessors together with the digit
- div = v / shifter / 10 is just the digit's precessors
- (v / shifter) - div*10 is just the digit, which is what v ends up being reassigned to.
- */
-
- fracf = (v % (shifter * 10) > 0);
- fracf_1further = ((v % shifter) > 0);
+ v = y->frac[ix];
+ /* drop digits after pointed digit */
+ n = BASE_FIG - ioffset - 1;
+ for(shifter=1,i=0;i<n;++i) shifter *= 10;
+ fracf = (v%(shifter*10) > 0);
v /= shifter;
- div = v / 10;
+ div = v/10;
v = v - div*10;
- /* now v is just the digit required.
- now fracf is whether the digit or any of the remaining digits within v are non-zero
- now fracf_1further is whether any of the remaining digits within v are non-zero
- */
-
- /* now check all the remaining BDIGITS for zero-ness a whole BDIGIT at a time.
- if we spot any non-zeroness, that means that we foudn a positive digit under
- rounding position, and we also found a positive digit under one further than
- the rounding position, so both searches (to see if any such non-zero digit exists)
- can stop */
-
- for (i=ix+1; (size_t)i < y->Prec; i++) {
- if (y->frac[i] % BASE) {
- fracf = fracf_1further = 1;
- break;
- }
+ if (fracf == 0) {
+ for(i=ix+1;(U_LONG)i<y->Prec;i++) {
+ if (y->frac[i]%BASE) {
+ fracf = 1;
+ break;
+ }
+ }
}
-
- /* now fracf = does any positive digit exist under the rounding position?
- now fracf_1further = does any positive digit exist under one further than the
- rounding position?
- now v = the first digit under the rounding position */
-
- /* drop digits after pointed digit */
- memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(BDIGIT));
-
+ memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
switch(f) {
case VP_ROUND_DOWN: /* Truncate */
break;
case VP_ROUND_UP: /* Roundup */
- if (fracf) ++div;
- break;
- case VP_ROUND_HALF_UP:
- if (v>=5) ++div;
+ if(fracf) ++div;
+ break;
+ case VP_ROUND_HALF_UP: /* Round half up */
+ if(v>=5) ++div;
break;
- case VP_ROUND_HALF_DOWN:
- if (v > 5 || (v == 5 && fracf_1further)) ++div;
+ case VP_ROUND_HALF_DOWN: /* Round half down */
+ if(v>=6) ++div;
break;
- case VP_ROUND_CEIL:
- if (fracf && (VpGetSign(y)>0)) ++div;
+ case VP_ROUND_CEIL: /* ceil */
+ if(fracf && (VpGetSign(y)>0)) ++div;
break;
- case VP_ROUND_FLOOR:
- if (fracf && (VpGetSign(y)<0)) ++div;
+ case VP_ROUND_FLOOR: /* floor */
+ if(fracf && (VpGetSign(y)<0)) ++div;
break;
case VP_ROUND_HALF_EVEN: /* Banker's rounding */
- if (v > 5) ++div;
- else if (v == 5) {
- if (fracf_1further) {
- ++div;
- }
- else {
- if (ioffset == 0) {
- /* v is the first decimal digit of its BDIGIT;
- need to grab the previous BDIGIT if present
- to check for evenness of the previous decimal
- digit (which is same as that of the BDIGIT since
- base 10 has a factor of 2) */
- if (ix && (y->frac[ix-1] % 2)) ++div;
- }
- else {
- if (div % 2) ++div;
- }
- }
- }
- break;
+ if(v>5) ++div;
+ else if(v==5) {
+ if((U_LONG)i==(BASE_FIG-1)) {
+ if(ix && (y->frac[ix-1]%2)) ++div;
+ } else {
+ if(div%2) ++div;
+ }
+ }
+ break;
}
- for (i=0; i<=n; ++i) div *= 10;
- if (div>=BASE) {
+ for(i=0;i<=n;++i) div *= 10;
+ if(div>=BASE) {
if(ix) {
y->frac[ix] = 0;
VpRdup(y,ix);
} else {
- short s = VpGetSign(y);
- SIGNED_VALUE e = y->exponent;
+ S_INT s = VpGetSign(y);
+ int e = y->exponent;
VpSetOne(y);
- VpSetSign(y, s);
+ VpSetSign(y,s);
y->exponent = e+1;
}
} else {
@@ -5808,8 +4557,8 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
VpNmlz(y);
}
if (exptoadd > 0) {
- y->exponent += (SIGNED_VALUE)(exptoadd/BASE_FIG);
- exptoadd %= (ssize_t)BASE_FIG;
+ y->exponent += (S_INT)(exptoadd/BASE_FIG);
+ exptoadd %= BASE_FIG;
for(i=0;i<exptoadd;i++) {
y->frac[0] *= 10;
if (y->frac[0] >= BASE) {
@@ -5822,83 +4571,74 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
}
VP_EXPORT int
-VpLeftRound(Real *y, unsigned short f, ssize_t nf)
+VpLeftRound(Real *y, int f, S_LONG nf)
/*
* Round from the left hand side of the digits.
*/
{
- BDIGIT v;
- if (!VpHasVal(y)) return 0; /* Unable to round */
+ U_LONG v;
+ if(!VpHasVal(y)) return 0; /* Unable to round */
v = y->frac[0];
- nf -= VpExponent(y)*(ssize_t)BASE_FIG;
- while ((v /= 10) != 0) nf--;
- nf += (ssize_t)BASE_FIG-1;
+ nf -= VpExponent(y)*BASE_FIG;
+ while((v /= 10) != 0) nf--;
+ nf += (BASE_FIG-1);
return VpMidRound(y,f,nf);
}
VP_EXPORT int
-VpActiveRound(Real *y, Real *x, unsigned short f, ssize_t nf)
+VpActiveRound(Real *y, Real *x, int f, S_LONG nf)
{
/* First,assign whole value in truncation mode */
- if (VpAsgn(y, x, 10) <= 1) return 0; /* Zero,NaN,or Infinity */
+ if(VpAsgn(y, x, 10)<=1) return 0; /* Zero,NaN,or Infinity */
return VpMidRound(y,f,nf);
}
static int
-VpLimitRound(Real *c, size_t ixDigit)
+VpLimitRound(Real *c,U_LONG ixDigit)
{
- size_t ix = VpGetPrecLimit();
+ U_LONG ix = VpGetPrecLimit();
if(!VpNmlz(c)) return -1;
if(!ix) return 0;
if(!ixDigit) ixDigit = c->Prec-1;
if((ix+BASE_FIG-1)/BASE_FIG > ixDigit+1) return 0;
- return VpLeftRound(c, VpGetRoundMode(), (ssize_t)ix);
+ return VpLeftRound(c,(int)VpGetRoundMode(),(S_LONG)ix);
}
-/* If I understand correctly, this is only ever used to round off the final decimal
- digit of precision */
static void
-VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v)
+VpInternalRound(Real *c,U_LONG ixDigit,U_LONG vPrev,U_LONG v)
{
int f = 0;
- unsigned short const rounding_mode = VpGetRoundMode();
-
- if (VpLimitRound(c, ixDigit)) return;
- if (!v) return;
+ if(VpLimitRound(c,ixDigit)) return;
+ if(!v) return;
v /= BASE1;
- switch (rounding_mode) {
+ switch(gfRoundMode) {
case VP_ROUND_DOWN:
- break;
+ break;
case VP_ROUND_UP:
- if (v) f = 1;
- break;
+ if(v) f = 1;
+ break;
case VP_ROUND_HALF_UP:
- if (v >= 5) f = 1;
- break;
+ if(v >= 5) f = 1;
+ break;
case VP_ROUND_HALF_DOWN:
- /* this is ok - because this is the last digit of precision,
- the case where v == 5 and some further digits are nonzero
- will never occur */
- if (v >= 6) f = 1;
- break;
- case VP_ROUND_CEIL:
- if (v && (VpGetSign(c) > 0)) f = 1;
- break;
- case VP_ROUND_FLOOR:
- if (v && (VpGetSign(c) < 0)) f = 1;
- break;
+ if(v >= 6) f = 1;
+ break;
+ case VP_ROUND_CEIL: /* ceil */
+ if(v && (VpGetSign(c)>0)) f = 1;
+ break;
+ case VP_ROUND_FLOOR: /* floor */
+ if(v && (VpGetSign(c)<0)) f = 1;
+ break;
case VP_ROUND_HALF_EVEN: /* Banker's rounding */
- /* as per VP_ROUND_HALF_DOWN, because this is the last digit of precision,
- there is no case to worry about where v == 5 and some further digits are nonzero */
- if (v > 5) f = 1;
- else if (v == 5 && vPrev % 2) f = 1;
- break;
+ if(v>5) f = 1;
+ else if(v==5 && vPrev%2) f = 1;
+ break;
}
- if (f) {
- VpRdup(c, ixDigit);
- VpNmlz(c);
+ if(f) {
+ VpRdup(c,ixDigit); /* round up */
+ VpNmlz(c);
}
}
@@ -5906,20 +4646,20 @@ VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v)
* Rounds up m(plus one to final digit of m).
*/
static int
-VpRdup(Real *m, size_t ind_m)
+VpRdup(Real *m,U_LONG ind_m)
{
- BDIGIT carry;
+ U_LONG carry;
- if (!ind_m) ind_m = m->Prec;
+ if(!ind_m) ind_m = m->Prec;
carry = 1;
- while (carry > 0 && (ind_m--)) {
+ while(carry > 0 && (ind_m--)) {
m->frac[ind_m] += carry;
- if (m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
- else carry = 0;
+ if(m->frac[ind_m] >= BASE) m->frac[ind_m] -= BASE;
+ else carry = 0;
}
if(carry > 0) { /* Overflow,count exponent and set fraction part be 1 */
- if (!AddExponent(m, 1)) return 0;
+ if(!AddExponent(m,1)) return 0;
m->Prec = m->frac[0] = 1;
} else {
VpNmlz(m);
@@ -5933,25 +4673,22 @@ VpRdup(Real *m, size_t ind_m)
VP_EXPORT void
VpFrac(Real *y, Real *x)
{
- size_t my, ind_y, ind_x;
+ U_LONG my, ind_y, ind_x;
if(!VpHasVal(x)) {
VpAsgn(y,x,1);
goto Exit;
}
- if (x->exponent > 0 && (size_t)x->exponent >= x->Prec) {
+ if(x->exponent > 0 && (U_LONG)x->exponent >= x->Prec) {
VpSetZero(y,VpGetSign(x));
goto Exit;
- }
- else if(x->exponent <= 0) {
+ } else if(x->exponent <= 0) {
VpAsgn(y, x, 1);
goto Exit;
}
- /* satisfy: x->exponent > 0 */
-
- y->Prec = x->Prec - (size_t)x->exponent;
+ y->Prec = x->Prec -(U_LONG) x->exponent;
y->Prec = Min(y->Prec, y->MaxPrec);
y->exponent = 0;
VpSetSign(y,VpGetSign(x));
@@ -5979,10 +4716,10 @@ Exit:
* y = x ** n
*/
VP_EXPORT int
-VpPower(Real *y, Real *x, SIGNED_VALUE n)
+VpPower(Real *y, Real *x, S_INT n)
{
- size_t s, ss;
- ssize_t sign;
+ U_LONG s, ss;
+ S_LONG sign;
Real *w1 = NULL;
Real *w2 = NULL;
@@ -6024,7 +4761,7 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
VpSetOne(y);
if(VpGetSign(x) > 0) goto Exit;
if((n % 2) == 0) goto Exit;
- VpSetSign(y, -1);
+ VpSetSign(y,-(S_INT)1);
goto Exit;
}
@@ -6048,11 +4785,11 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
while(n > 0) {
VpAsgn(w1, x, 1);
s = 1;
- while (ss = s, (s += s) <= (size_t)n) {
+ while (ss = s, (s += s) <= (U_LONG)n) {
VpMult(w2, w1, w1);
VpAsgn(w1, w2, 1);
}
- n -= (SIGNED_VALUE)ss;
+ n -= (S_INT)ss;
VpMult(w2, y, w1);
VpAsgn(y, w2, 1);
}
@@ -6086,24 +4823,24 @@ VpVarCheck(Real * v)
* other ... error
*/
{
- size_t i;
+ U_LONG i;
if(v->MaxPrec <= 0) {
- printf("ERROR(VpVarCheck): Illegal Max. Precision(=%"PRIuSIZE")\n",
+ printf("ERROR(VpVarCheck): Illegal Max. Precision(=%lu)\n",
v->MaxPrec);
return 1;
}
if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) {
- printf("ERROR(VpVarCheck): Illegal Precision(=%"PRIuSIZE")\n", v->Prec);
- printf(" Max. Prec.=%"PRIuSIZE"\n", v->MaxPrec);
+ printf("ERROR(VpVarCheck): Illegal Precision(=%lu)\n", v->Prec);
+ printf(" Max. Prec.=%lu\n", v->MaxPrec);
return 2;
}
for(i = 0; i < v->Prec; ++i) {
if((v->frac[i] >= BASE)) {
printf("ERROR(VpVarCheck): Illegal fraction\n");
- printf(" Frac[%"PRIuSIZE"]=%lu\n", i, v->frac[i]);
- printf(" Prec. =%"PRIuSIZE"\n", v->Prec);
- printf(" Exp. =%"PRIdVALUE"\n", v->exponent);
+ printf(" Frac[%ld]=%lu\n", i, v->frac[i]);
+ printf(" Prec. =%lu\n", v->Prec);
+ printf(" Exp. =%d\n", v->exponent);
printf(" BASE =%lu\n", BASE);
return 3;
}
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
deleted file mode 100644
index 4240f827e4..0000000000
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- ruby -*-
-_VERSION = "1.2.0"
-
-Gem::Specification.new do |s|
- s.name = "bigdecimal"
- s.version = _VERSION
- s.date = "2012-02-19"
- s.summary = "Arbitrary-precision decimal floating-point number library."
- s.homepage = "http://www.ruby-lang.org"
- s.email = "mrkn@mrkn.jp"
- s.description = "This library provides arbitrary-precision decimal floating-point number class."
- s.authors = ["Kenta Murata", "Shigeo Kobayashi"]
- s.require_path = %[.]
- s.files = %w[
- bigdecimal.gemspec
- bigdecimal.c
- bigdecimal.h
- README
- depend extconf.rb
- lib/bigdecimal/jacobian.rb
- lib/bigdecimal/ludcmp.rb
- lib/bigdecimal/math.rb
- lib/bigdecimal/newton.rb
- lib/bigdecimal/util.rb
- sample/linear.rb
- sample/nlsolve.rb
- sample/pi.rb
- ]
- s.extensions = %w[extconf.rb]
-end
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index a04d1bbfea..af18a9a874 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -13,68 +13,13 @@
*
*/
-#ifndef RUBY_BIG_DECIMAL_H
-#define RUBY_BIG_DECIMAL_H 1
-
-#include "ruby/ruby.h"
-#include <float.h>
+#ifndef ____BIG_DECIMAL__H____
+#define ____BIG_DECIMAL__H____
#if defined(__cplusplus)
extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef HAVE_LABS
-static inline long
-labs(long const x)
-{
- if (x < 0) return -x;
- return x;
-}
-#endif
-
-#ifndef HAVE_LLABS
-static inline LONG_LONG
-llabs(LONG_LONG const x)
-{
- if (x < 0) return -x;
- return x;
-}
-#endif
-
-#ifdef vabs
-# undef vabs
-#endif
-#if SIZEOF_VALUE <= SIZEOF_INT
-# define vabs abs
-#elif SIZEOF_VALUE <= SIZEOF_LONG
-# define vabs labs
-#elif SIZEOF_VALUE <= SIZEOF_LONG_LONG
-# define vabs llabs
-#endif
-
-extern VALUE rb_cBigDecimal;
-
-#if 0 || SIZEOF_BDIGITS >= 16
-# define RMPD_COMPONENT_FIGURES 38
-# define RMPD_BASE ((BDIGIT)100000000000000000000000000000000000000U)
-#elif SIZEOF_BDIGITS >= 8
-# define RMPD_COMPONENT_FIGURES 19
-# define RMPD_BASE ((BDIGIT)10000000000000000000U)
-#elif SIZEOF_BDIGITS >= 4
-# define RMPD_COMPONENT_FIGURES 9
-# define RMPD_BASE ((BDIGIT)1000000000U)
-#elif SIZEOF_BDIGITS >= 2
-# define RMPD_COMPONENT_FIGURES 4
-# define RMPD_BASE ((BDIGIT)10000U)
-#else
-# define RMPD_COMPONENT_FIGURES 2
-# define RMPD_BASE ((BDIGIT)100U)
#endif
-
/*
* NaN & Infinity
*/
@@ -89,6 +34,11 @@ extern VALUE rb_cBigDecimal;
*/
#define VP_EXPORT static
+#define U_LONG unsigned long
+#define S_LONG long
+#define U_INT unsigned int
+#define S_INT int
+
/* Exception codes */
#define VP_EXCEPTION_ALL ((unsigned short)0x00FF)
#define VP_EXCEPTION_INFINITY ((unsigned short)0x0001)
@@ -101,8 +51,6 @@ extern VALUE rb_cBigDecimal;
#define VP_EXCEPTION_OP ((unsigned short)0x0020)
#define VP_EXCEPTION_MEMORY ((unsigned short)0x0040)
-#define RMPD_EXCEPTION_MODE_DEFAULT 0U
-
/* Computation mode */
#define VP_ROUND_MODE ((unsigned short)0x0100)
#define VP_ROUND_UP 1
@@ -113,8 +61,6 @@ extern VALUE rb_cBigDecimal;
#define VP_ROUND_FLOOR 6
#define VP_ROUND_HALF_EVEN 7
-#define RMPD_ROUNDING_MODE_DEFAULT VP_ROUND_HALF_UP
-
#define VP_SIGN_NaN 0 /* NaN */
#define VP_SIGN_POSITIVE_ZERO 1 /* Positive zero */
#define VP_SIGN_NEGATIVE_ZERO -1 /* Negative zero */
@@ -123,25 +69,19 @@ extern VALUE rb_cBigDecimal;
#define VP_SIGN_POSITIVE_INFINITE 3 /* Positive infinite number */
#define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
-#ifdef __GNUC__
-#define FLEXIBLE_ARRAY_SIZE 0
-#else
-#define FLEXIBLE_ARRAY_SIZE 1
-#endif
-
/*
* VP representation
* r = 0.xxxxxxxxx *BASE**exponent
*/
typedef struct {
VALUE obj; /* Back pointer(VALUE) for Ruby object. */
- size_t MaxPrec; /* Maximum precision size */
+ U_LONG MaxPrec; /* Maximum precision size */
/* This is the actual size of pfrac[] */
/*(frac[0] to frac[MaxPrec] are available). */
- size_t Prec; /* Current precision size. */
+ U_LONG Prec; /* Current precision size. */
/* This indicates how much the. */
/* the array frac[] is actually used. */
- SIGNED_VALUE exponent; /* Exponent part. */
+ S_INT exponent;/* Exponent part. */
short sign; /* Attributes of the value. */
/*
* ==0 : NaN
@@ -153,7 +93,7 @@ typedef struct {
* -3 : Negative infinite number
*/
short flag; /* Not used in vp_routines,space for user. */
- BDIGIT frac[FLEXIBLE_ARRAY_SIZE]; /* Array of fraction part. */
+ U_LONG frac[1]; /* Pointer to array of fraction part. */
} Real;
/*
@@ -163,20 +103,13 @@ typedef struct {
*/
VP_EXPORT Real *
-VpNewRbClass(size_t mx, char const *str, VALUE klass);
+VpNewRbClass(U_LONG mx,char *str,VALUE klass);
-VP_EXPORT Real *VpCreateRbObject(size_t mx,const char *str);
+VP_EXPORT Real *VpCreateRbObject(U_LONG mx,const char *str);
-static inline BDIGIT
-rmpd_base_value(void) { return RMPD_BASE; }
-static inline size_t
-rmpd_component_figures(void) { return RMPD_COMPONENT_FIGURES; }
-static inline size_t
-rmpd_double_figures(void) { return 1+DBL_DIG; }
-
-#define VpBaseFig() rmpd_component_figures()
-#define VpDblFig() rmpd_double_figures()
-#define VpBaseVal() rmpd_base_value()
+VP_EXPORT U_LONG VpBaseFig(void);
+VP_EXPORT U_LONG VpDblFig(void);
+VP_EXPORT U_LONG VpBaseVal(void);
/* Zero,Inf,NaN (isinf(),isnan() used to check) */
VP_EXPORT double VpGetDoubleNaN(void);
@@ -185,46 +118,45 @@ VP_EXPORT double VpGetDoubleNegInf(void);
VP_EXPORT double VpGetDoubleNegZero(void);
/* These 2 functions added at v1.1.7 */
-VP_EXPORT size_t VpGetPrecLimit(void);
-VP_EXPORT size_t VpSetPrecLimit(size_t n);
+VP_EXPORT U_LONG VpGetPrecLimit(void);
+VP_EXPORT U_LONG VpSetPrecLimit(U_LONG n);
/* Round mode */
-VP_EXPORT int VpIsRoundMode(unsigned short n);
-VP_EXPORT unsigned short VpGetRoundMode(void);
-VP_EXPORT unsigned short VpSetRoundMode(unsigned short n);
+VP_EXPORT int VpIsRoundMode(unsigned long n);
+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 size_t VpNumOfChars(Real *vp,const char *pszFmt);
-VP_EXPORT size_t VpInit(BDIGIT BaseVal);
-VP_EXPORT void *VpMemAlloc(size_t mb);
-VP_EXPORT void *VpMemRealloc(void *ptr, size_t mb);
+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);
VP_EXPORT void VpFree(Real *pv);
-VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal);
-VP_EXPORT size_t VpAsgn(Real *c, Real *a, int isw);
-VP_EXPORT size_t VpAddSub(Real *c,Real *a,Real *b,int operation);
-VP_EXPORT size_t VpMult(Real *c,Real *a,Real *b);
-VP_EXPORT size_t VpDivd(Real *c,Real *r,Real *a,Real *b);
+VP_EXPORT Real *VpAlloc(U_LONG mx, const char *szVal);
+VP_EXPORT U_LONG VpAsgn(Real *c,Real *a,int isw);
+VP_EXPORT U_LONG VpAddSub(Real *c,Real *a,Real *b,int operation);
+VP_EXPORT U_LONG VpMult(Real *c,Real *a,Real *b);
+VP_EXPORT U_LONG VpDivd(Real *c,Real *r,Real *a,Real *b);
VP_EXPORT int VpComp(Real *a,Real *b);
-VP_EXPORT ssize_t VpExponent10(Real *a);
+VP_EXPORT S_LONG VpExponent10(Real *a);
VP_EXPORT void VpSzMantissa(Real *a,char *psz);
VP_EXPORT int VpToSpecialString(Real *a,char *psz,int fPlus);
-VP_EXPORT void VpToString(Real *a, char *psz, size_t fFmt, int fPlus);
-VP_EXPORT void VpToFString(Real *a, char *psz, size_t fFmt, int fPlus);
-VP_EXPORT int VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, const char *exp_chr, size_t ne);
-VP_EXPORT int VpVtoD(double *d, SIGNED_VALUE *e, Real *m);
+VP_EXPORT void VpToString(Real *a,char *psz,int fFmt,int fPlus);
+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, unsigned short f, ssize_t il);
-VP_EXPORT int VpMidRound(Real *y, unsigned short f, ssize_t nf);
-VP_EXPORT int VpLeftRound(Real *y, unsigned short f, ssize_t nf);
-VP_EXPORT void VpFrac(Real *y, Real *x);
-VP_EXPORT int VpPower(Real *y, Real *x, SIGNED_VALUE n);
+VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,S_LONG il);
+VP_EXPORT int VpMidRound(Real *y, int f, S_LONG nf);
+VP_EXPORT int VpLeftRound(Real *y, int f, S_LONG nf);
+VP_EXPORT void VpFrac(Real *y,Real *x);
+VP_EXPORT int VpPower(Real *y,Real *x,S_INT n);
/* VP constants */
VP_EXPORT Real *VpOne(void);
@@ -247,12 +179,12 @@ VP_EXPORT Real *VpOne(void);
/* VpGetSign(a) returns 1,-1 if a>0,a<0 respectively */
#define VpGetSign(a) (((a)->sign>0)?1:(-1))
/* Change sign of a to a>0,a<0 if s = 1,-1 respectively */
-#define VpChangeSign(a,s) {if((s)>0) (a)->sign=(short)Abs((ssize_t)(a)->sign);else (a)->sign=-(short)Abs((ssize_t)(a)->sign);}
+#define VpChangeSign(a,s) {if((s)>0) (a)->sign=(short)Abs((S_LONG)(a)->sign);else (a)->sign=-(short)Abs((S_LONG)(a)->sign);}
/* Sets sign of a to a>0,a<0 if s = 1,-1 respectively */
#define VpSetSign(a,s) {if((s)>0) (a)->sign=(short)VP_SIGN_POSITIVE_FINITE;else (a)->sign=(short)VP_SIGN_NEGATIVE_FINITE;}
/* 1 */
-#define VpSetOne(a) {(a)->Prec=(a)->exponent=(a)->frac[0]=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
+#define VpSetOne(a) {(a)->frac[0]=(a)->Prec=(a)->exponent=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
/* ZEROs */
#define VpIsPosZero(a) ((a)->sign==VP_SIGN_POSITIVE_ZERO)
@@ -283,9 +215,6 @@ VP_EXPORT int VPrint(FILE *fp,const char *cntl_chr,Real *a);
#endif /* BIGDECIMAL_DEBUG */
#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
} /* extern "C" { */
#endif
-#endif /* RUBY_BIG_DECIMAL_H */
+#endif /* ____BIG_DECIMAL__H____ */
diff --git a/ext/bigdecimal/bigdecimal_en.html b/ext/bigdecimal/bigdecimal_en.html
new file mode 100644
index 0000000000..82acd2a2a5
--- /dev/null
+++ b/ext/bigdecimal/bigdecimal_en.html
@@ -0,0 +1,792 @@
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html">
+<style type="text/css"><!--
+body { color: #3f0f0f; background: #fefeff; margin-left: 2em; margin-right: 2em;}
+h1 { color: #ffffff; background-color: #3939AD; border-color: #FF00FF; width: 100%; border-style: solid;
+ border-top-width: 0.1em; border-bottom-width: 0.1em; border-right: none; border-left: none;
+ padding: 0.1em; font-weight: bold; font-size: 160%; text-align: center;}
+h2 { color: #00007f; background-color: #e7e7ff; border-color: #000094; width: 100%; border-style: solid; border-le ft: none; border-right: none; border-top-width: 0.1em; border-bottom-width: 0.1em; padding: 0.1em;
+ font-weight: bold; font-size: 110%;
+}
+h3 { color: #00007f; padding: 0.2em; font-size: 110%;}
+h4, h5 { color: #000000; padding: 0.2em; font-size: 100%;}
+table { margin-top: 0.2em; margin-bottom: 0.2em; margin-left: 2em; margin-right: 2em;}
+caption { color: #7f0000; font-weight: bold;}
+th { background: #e7e7ff; padding-left: 0.2em; padding-right: 0.2em;}
+td { background: #f3f7ff; padding-left: 0.2em; padding-right: 0.2em;}
+code { color: #0000df;}
+dt { margin-top: 0.2em;}
+li { margin-top: 0.2em;}
+pre
+{ BACKGROUND-COLOR: #d0d0d0; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none;
+ BORDER-RIGHT: medium none; BORDER-TOP: medium none; LINE-HEIGHT: 100%; MARGIN: 12px 12px 12px 12px;
+ PADDING-BOTTOM: 12px; PADDING-LEFT: 12px; PADDING-RIGHT: 12px; PADDING-TOP: 12px;
+ WHITE-SPACE: pre; WIDTH: 100%
+}
+--></style>
+
+<TITLE>BigDecimal:An extension library for Ruby</TITLE>
+</HEAD>
+<BODY BGCOLOR=#FFFFE0>
+<H1>BigDecimal(Variable Precision Floating Library for Ruby)</H1>
+<DIV align="right"><A HREF="./bigdecimal_ja.html">Japanese</A></DIV><BR>
+BigDecimal is an extension library for the Ruby interpreter.
+Using BigDecimal class, you can obtain any number of significant digits in computation.
+For the details about Ruby see:<BR>
+<UL>
+<LI><A HREF="http://www.ruby-lang.org/en/">http://www.ruby-lang.org/en/</A>:Official Ruby page(English).</LI>
+<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>:Mutually linked pages relating to Ruby(Japanese).
+</LI>
+</UL>
+NOTE:<BR>
+ This software is provided "AS IS" and without any express or
+ implied warranties,including,without limitation,the implied
+ warranties of merchantability and fitness for a particular
+ purpose. For the details,see COPYING and README included in this
+ distribution.
+<BR>
+<hr>
+
+<H2>Contents</H2>
+<UL>
+<LI><A HREF="#INTRO">Introduction</LI>
+<LI><A HREF="#SPEC">Usage and methods</A></LI>
+<LI><A HREF="#UNDEF">Infinity,NaN,Zero</A></LI>
+<LI><A HREF="#STRUCT">Internal structure</A></LI>
+<LI><A HREF="#BASE">Binary or decimal number representation</A></LI>
+<LI><A HREF="#PREC">Resulting number of significant digits</A></LI>
+</UL>
+<HR>
+
+<A NAME="#INTRO">
+<H2>Introduction</H2>
+Ruby already has builtin (variable length integer number) class Bignum. Using Bignum class,you can obtain
+ any integer value in magnitude. But, variable length decimal number class is not yet built in.
+This is why I made variable length floating class BigDecimal.
+Feel free to send any comments or bug reports to me.
+<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
+I will try(but can't promise) to fix bugs reported.
+<hr>
+<H2>Installation</H2>
+The Ruby latest version can be downloaded from <A HREF="http://www.ruby-lang.org/en/">Official Ruby page</A>.
+Once decompress the downloaded Ruby archive,follow the normal installation procedures according to the
+documents included.
+
+<A NAME="#SPEC">
+<H2>Usage and methods</H2>
+Suppose you already know Ruby programming,
+to create BigDecimal objects,the program would like:<BR>
+
+<CODE><PRE>
+ require 'bigdecimal'
+ a=BigDecimal::new("0.123456789123456789")
+ b=BigDecimal("123456.78912345678",40)
+ c=a+b
+</PRE></CODE>
+
+<H3>List of methods</H3>
+In 32 bits integer system,every 4 digits(in decimal) are computed simultaneously.
+This means the number of significant digits in BigDecimal is always a multiple of 4.
+<P>
+Some more methods are available in Ruby code (not C code).
+Functions such as sin,cos ...,are in math.rb in bigdecimal directory.
+To use them,require math.rb as:
+<CODE><PRE>
+require "bigdecimal/math.rb"
+</PRE></CODE>
+For details,see the math.rb code and comments.
+Other utility methods are in util.rb.
+To use util.rb, require it as:
+<CODE><PRE>
+require "bigdecimal/util.rb"
+</PRE></CODE>
+For details,see the util.rb code.
+
+<H4><U>Class methods</U></H4>
+<UL>
+<LI><B>new</B></LI><BLOCKQUOTE>
+"new" method creates a new BigDecimal object.<BR>
+a=BigDecimal::new(s[,n]) or<BR>
+a=BigDecimal(s[,n]) or<BR>
+where:<BR>
+s: Initial value string. Spaces will be ignored. Any unrecognizable character for
+representing initial value terminates the string.<BR>
+n: Maximum number of significant digits of a. n must be a Fixnum object.
+If n is omitted or is equal to 0,then the maximum number of significant digits of a is determined from the length of s.
+Actual number of digits handled in computations are usually greater than n.<BR>
+n is useful when performing divisions like
+<CODE><PRE>
+BigDecimal("1") / BigDecimal("3") # => 0.3333333333 33E0
+BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
+</PRE></CODE>
+but the resulting digits obtained may differ in future version.
+</BLOCKQUOTE>
+
+<LI><B>mode</B></LI><BLOCKQUOTE>
+f = BigDecimal.mode(s[,v])<BR>
+mode method controls BigDecimal computation. If the second argument is not given or is nil,then the value
+of current setting is returned.
+Following usage are defined.<BR>
+<P><B>[EXCEPTION control]</B><P>
+Actions when computation results NaN or Infinity can be defined as follows.
+<P>
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
+</BLOCKQUOTE>
+EXCEPTION_NaN controls the execution when computation results to NaN.<BR>
+EXCEPTION_INFINITY controls the execution when computation results to Infinity.<BR>
+EXCEPTION_UNDERFLOW controls the execution when computation underflows.<BR>
+EXCEPTION_OVERFLOW controls the execution when computation overflows.<BR>
+EXCEPTION_ZERODIVIDE controls the execution when zero-division occurs.<BR>
+EXCEPTION_ALL controls the execution when any defined exception occurs.<BR>
+If the flag is true,then the relating exception is thrown.<BR>
+No exception is thrown when the flag is false(default) and computation
+continues with the result:<BR>
+<BLOCKQUOTE>
+EXCEPTION_NaN results to NaN<BR>
+EXCEPTION_INFINITY results to +Infinity or -Infinity<BR>
+EXCEPTION_UNDERFLOW results to 0.<BR>
+EXCEPTION_OVERFLOW results to +Infinity or -Infinity<BR>
+EXCEPTION_ZERODIVIDE results to +Infinity or -Infinity<BR>
+</BLOCKQUOTE>
+EXCEPTION_INFINITY,EXCEPTION_OVERFLOW, and EXCEPTION_ZERODIVIDE are
+ currently the same.<BR>
+The return value of mode method is the value set.<BR>
+If nil is specified for the second argument,then current setting is returned.<BR>
+Suppose the return value of the mode method is f,then
+ f &amp; BigDecimal::EXCEPTION_NaN !=0 means EXCEPTION_NaN is set to on.
+<P>
+<B>[ROUND error control]</B><P>
+Rounding operation can be controlled as:
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
+</BLOCKQUOTE>
+where flag must be one of:
+<TABLE>
+
+<TR><TD>ROUND_UP</TD><TD>round away from zero.</TD></TR>
+<TR><TD>ROUND_DOWN</TD><TD>round towards zero(truncate).</TD></TR>
+<TR><TD>ROUND_HALF_UP</TD><TD>round up if the digit &gt;= 5 otherwise truncated(default).</TD></TR>
+<TR><TD>ROUND_HALF_DOWN</TD><TD>round up if the digit &gt;= 6 otherwise truncated.</TD></TR>
+<TR><TD>ROUND_HALF_EVEN</TD><TD>round towards the even neighbor(Banker's rounding).
+<TR><TD>ROUND_CEILING</TD><TD>round towards positive infinity(ceil).</TD></TR>
+<TR><TD>ROUND_FLOOR</TD><TD>round towards negative infinity(floor).</TD></TR>
+</TABLE>
+New rounding mode is returned. If nil is specified for the second argument,then current setting is returned.<BR>
+The digit location for rounding operation can not be specified by this mode method,
+use truncate/round/ceil/floor/add/sub/mult/div methods for each instance instead.
+</BLOCKQUOTE>
+
+<LI><B>limit[(n)]</B></LI><BLOCKQUOTE>
+Limits the maximum digits that the newly created BigDecimal objects can hold never exceed n.
+This means the rounding operation specified by BigDecimal.mode is
+performed if necessary.
+limit returns the value before set if n is nil or is not specified.
+Zero,the default value,means no upper limit.<BR>
+The limit has no more priority than instance methods such as truncate,round,ceil,floor,add,sub,mult,and div. <BR>
+mf = BigDecimal::limit(n)<BR>
+</BLOCKQUOTE>
+
+<LI><B>double_fig</B></LI><BLOCKQUOTE>
+double_fig is a class method which returns the number of digits
+the Float class can have.
+<CODE><PRE>
+ p BigDecimal::double_fig # ==> 20 (depends on the CPU etc.)
+</PRE></CODE>
+The equivalent C programs which calculates the value of
+double_fig is:
+<CODE><PRE>
+ double v = 1.0;
+ int double_fig = 0;
+ while(v + 1.0 > 1.0) {
+ ++double_fig;
+ v /= 10;
+ }
+</PRE></CODE>
+</BLOCKQUOTE>
+
+<LI><B>BASE</B></LI><BLOCKQUOTE>
+Base value used in the BigDecimal calculation.
+On 32 bits integer system,the value of BASE is 10000.<BR>
+b = BigDecimal::BASE<BR>
+</BLOCKQUOTE>
+</UL>
+
+<H4><U>Instance methods</U></H4>
+<UL>
+<LI><B>+</B></LI><BLOCKQUOTE>
+addition(c = a + b)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+
+</BLOCKQUOTE>
+<LI><B>-</B></LI><BLOCKQUOTE>
+subtraction (c = a - b) or negation (c = -a)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+
+</BLOCKQUOTE>
+<LI><B>*</B></LI><BLOCKQUOTE>
+multiplication(c = a * b)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+
+</BLOCKQUOTE>
+<LI><B>/</B></LI><BLOCKQUOTE>
+division(c = a / b)<BR>
+For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
+</BLOCKQUOTE>
+
+<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
+c = a.add(b,n)<BR>
+c = a.add(b,n) performs c = a + b.<BR>
+If n is less than the actual significant digits of a + b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as +'s.
+</BLOCKQUOTE>
+<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
+c = a.sub(b,n)<BR>
+c = a.sub(b,n) performs c = a - b.<BR>
+If n is less than the actual significant digits of a - b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as -'s.
+
+</BLOCKQUOTE>
+<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
+c = a.mult(b,n)<BR>
+c = a.mult(b,n) performs c = a * b.<BR>
+If n is less than the actual significant digits of a * b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as *'s.
+
+</BLOCKQUOTE>
+<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
+c = a.div(b,n)<BR>
+c = a.div(b,n) performs c = a / b.<BR>
+If n is less than the actual significant digits of a / b,
+then c is rounded properly according to the BigDecimal.limit.<BR>
+If n is zero,then the result is the same as /'s.
+If n is not given,then the result will be an integer(BigDecimal) like Float#div.
+</BLOCKQUOTE>
+
+<LI><B>fix</B></LI><BLOCKQUOTE>
+c = a.fix<BR>
+returns integer part of a.<BR>
+
+</BLOCKQUOTE>
+<LI><B>frac</B></LI><BLOCKQUOTE>
+c = a.frac<BR>
+returns fraction part of a.<BR>
+
+</BLOCKQUOTE>
+<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
+c = a.floor<BR>
+returns the maximum integer value (in BigDecimal) which is less than or equal to a.
+<CODE><PRE>
+ c = BigDecimal("1.23456").floor # ==> 1
+ c = BigDecimal("-1.23456").floor # ==> -2
+</PRE></CODE>
+
+As shown in the following example,an optional integer argument (n) specifying the position
+of the target digit can be given.<BR>
+If n> 0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+<CODE><PRE>
+ c = BigDecimal("1.23456").floor(4) # ==> 1.2345
+ c = BigDecimal("15.23456").floor(-1) # ==> 10.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
+c = a.ceil<BR>
+returns the minimum integer value (in BigDecimal) which is greater than or equal to a.
+<CODE><PRE>
+ c = BigDecimal("1.23456").ceil # ==> 2
+ c = BigDecimal("-1.23456").ceil # ==> -1
+</PRE></CODE>
+
+As shown in the following example,an optional integer argument (n) specifying the position
+of the target digit can be given.<BR>
+If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+<CODE><PRE>
+ c = BigDecimal("1.23456").ceil(4) # ==> 1.2346
+ c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
+c = a.round<BR>
+round a to the nearest 1(default)Ã…D<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").round # ==> 1
+ c = BigDecimal("-1.23456").round # ==> -1
+</PRE></CODE>
+The rounding operation changes according to BigDecimal::mode(BigDecimal::ROUND_MODE,flag) if specified.
+
+As shown in the following example,an optional integer argument (n) specifying the position
+of the target digit can be given.<BR>
+If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+<CODE><PRE>
+c = BigDecimal::new("1.23456").round(4) # ==> 1.2346
+c = BigDecimal::new("15.23456").round(-1) # ==> 20.0
+</PRE></CODE>
+
+Rounding operation can be specified by setting the second optional argument b with the valid ROUND_MODE.<BR>
+<CODE><PRE>
+c = BigDecimal::new("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN) # ==> 1.234
+c = BigDecimal::new("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN) # ==> 1.234
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>truncate[(n)]</B></LI><BLOCKQUOTE>
+c = a.truncate<BR>
+truncate a to the nearest 1Ã…D<BR>
+As shown in the following example,an optional integer argument (n) specifying the position
+of the target digit can be given.<BR>
+If n>0,then the (n+1)th digit counted from the decimal point in fraction part is processed(resulting number of fraction part digits is less than or equal to n).<BR>
+If n<0,then the n-th digit counted from the decimal point in integer part is processed(at least n 0's are placed from the decimal point to left).
+
+<CODE><PRE>
+c = BigDecimal::new("1.23456").truncate(4) # ==> 1.2345
+c = BigDecimal::new("15.23456").truncate(-1) # ==> 10.0
+</PRE></CODE>
+</BLOCKQUOTE>
+<LI><B>abs</B></LI><BLOCKQUOTE>
+c = a.abs<BR>
+returns an absolute value of a.<BR>
+
+</BLOCKQUOTE>
+<LI><B>to_i</B></LI><BLOCKQUOTE>
+changes a to an integer.<BR>
+i = a.to_i<BR>
+i becomes to Fixnum or Bignum.
+If a is Infinity or NaN,then i becomes to nil.
+
+</BLOCKQUOTE>
+<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
+converts to string(default results look like "0.xxxxxEn").
+<CODE><PRE>
+BigDecimal("1.23456").to_s # ==> "0.123456E1"
+</PRE></CODE>
+If n(>0) is given,then a space is inserted to each of two parts divided by the decimal point
+after every n digits for readability.
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(10) # ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+n can be a string representing a positive integer number.
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s("10") # ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+If the first character is '+'(or ' '),then '+'(or ' ') will be set before value string
+when the value is positive.
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(" 10") # ==> " 0.1234567890 123456789E0"
+BigDecimal("0.1234567890123456789").to_s("+10") # ==> "+0.1234567890 123456789E0"
+BigDecimal("-0.1234567890123456789").to_s("10") # ==> "-0.1234567890 123456789E0"
+</PRE></CODE>
+
+At the end of the string,'E'(or 'e') or 'F'(or 'f') can be specified to change
+number representation.
+<CODE><PRE>
+BigDecimal("1234567890.123456789").to_s("E") # ==> "0.1234567890123456789E10"
+BigDecimal("1234567890.123456789").to_s("F") # ==> "1234567890.123456789"
+BigDecimal("1234567890.123456789").to_s("5E") # ==> "0.12345 67890 12345 6789E10"
+BigDecimal("1234567890.123456789").to_s("5F") # ==> "12345 67890.12345 6789"
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>exponent</B></LI><BLOCKQUOTE>
+returns an integer holding exponent value of a.<BR>
+n = a.exponent <BR>
+means a = 0.xxxxxxx*10**n.
+</BLOCKQUOTE>
+
+<LI><B>precs</B></LI><BLOCKQUOTE>
+n,m = a.precs <BR>
+precs returns number of significant digits (n) and maximum number of
+significant digits (m) of a.
+</BLOCKQUOTE>
+
+<LI><B>to_f</B></LI><BLOCKQUOTE>
+Creates a new Float object having (nearly) the same value.
+Use split method if you want to convert by yourself.
+</BLOCKQUOTE>
+
+</BLOCKQUOTE>
+<LI><B>sign</B></LI><BLOCKQUOTE>
+n = a.sign <BR>
+returns positive value if a &gt; 0,negative value if a &lt; 0,
+otherwise zero if a == 0.<BR>
+where the value of n means that a is:<BR>
+n = BigDecimal::SIGN_NaN(0) : a is NaN<BR>
+n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a is +0<BR>
+n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a is -0<BR>
+n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a is positive<BR>
+n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a is negative<BR>
+n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a is +Infinity<BR>
+n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a is -Infinity<BR>
+The value in () is the actual value,see (<A HREF="#STRUCT">Internal structure</A>.<BR>
+
+</BLOCKQUOTE>
+<LI><B>nan?</B></LI><BLOCKQUOTE>
+a.nan? returns True when a is NaN.
+
+</BLOCKQUOTE>
+<LI><B>infinite?</B></LI><BLOCKQUOTE>
+a.infinite? returns 1 when a is Infinity, -1 when a is -Infinity, nil otherwise.
+
+</BLOCKQUOTE>
+<LI><B>finite?</B></LI><BLOCKQUOTE>
+a.finite? returns true when a is neither Infinity nor NaN.
+</BLOCKQUOTE>
+
+<LI><B>zero?</B></LI><BLOCKQUOTE>
+c = a.zero?<BR>
+returns true if a is equal to 0,otherwise returns false<BR>
+</BLOCKQUOTE>
+<LI><B>nonzero?</B></LI><BLOCKQUOTE>
+c = a.nonzero?<BR>
+returns nil if a is 0,otherwise returns a itself.<BR>
+</BLOCKQUOTE>
+
+<LI><B>split</B></LI><BLOCKQUOTE>
+decomposes a BigDecimal value to 4 parts.
+All 4 parts are returned as an array.<BR>
+Parts consist of a sign(0 when the value is NaN,+1 for positive and
+ -1 for negative value), a string representing fraction part,base value(always 10 currently),and an integer(Fixnum) for exponent respectively.
+a=BigDecimal::new("3.14159265")<BR>
+f,x,y,z = a.split<BR>
+where f=+1,x="314159265",y=10 and z=1<BR>
+therefore,you can translate BigDecimal value to Float as:<BR>
+s = "0."+x<BR>
+b = f*(s.to_f)*(y**z)<BR>
+
+</BLOCKQUOTE>
+<LI><B>inspect</B></LI><BLOCKQUOTE>
+is used for debugging output.<BR>
+p a=BigDecimal::new("3.14",10)<BR>
+should produce output like "#&lt;0x112344:'0.314E1',4(12)%gt;".
+where "0x112344" is the address,
+'0.314E1' is the value,4 is the number of the significant digits,
+and 12 is the maximum number of the significant digits
+the object can hold.
+</BLOCKQUOTE>
+
+<LI><B>sqrt</B></LI><BLOCKQUOTE>
+c = a.sqrt(n)<BR>
+computes square root value of a with significant digit number n at least.<BR>
+</BLOCKQUOTE>
+
+<LI><B>**</B></LI><BLOCKQUOTE>
+c = a ** n<BR>
+returns the value of a powered by n.
+n must be an integer.<BR>
+
+</BLOCKQUOTE>
+<LI><B>power</B></LI><BLOCKQUOTE>
+The same as ** method.<BR>
+c = a.power(n)<BR>
+returns the value of a powered by n(c=a**n).
+n must be an integer.<BR>
+</BLOCKQUOTE>
+
+<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
+See,corresponding methods in Float class.
+</BLOCKQUOTE>
+
+</BLOCKQUOTE>
+<LI><B>&lt;=&gt;</B></LI><BLOCKQUOTE>
+c = a &lt;=&gt; b <BR>
+returns 0 if a==b,1 if a &gt b,and returns -1 if a &lt b.<BR>
+</BLOCKQUOTE>
+</UL>
+
+Following methods need no explanation.<BR>
+<UL>
+<LI>==</LI>
+<LI>===</LI>
+same as ==,used in case statement.
+<LI>!=</LI>
+<LI>&lt;</LI>
+<LI>&lt;=</LI>
+<LI>&gt;</LI>
+<LI>&gt;=</LI>
+</UL>
+
+<HR>
+<H3>About 'coerce'</H3>
+<B>For the binary operation like A op B:</B>
+<DL>
+<DT> 1.Both A and B are BigDecimal objects</DT>
+<DD> A op B is normally performed.</DD>
+<DT> 2.A is the BigDecimal object but B is other than BigDecimal object</DT>
+<DD> Operation is performed,after B is translated to corresponding BigDecimal object(because BigDecimal supports coerce method).</DD>
+<DT> 3.A is not the BigDecimal object but B is BigDecimal object</DT>
+<DD>If A has coerce method,then B will translate A to corresponding
+BigDecimal object and the operation is performed,otherwise an error occures.</DD>
+</DL>
+
+String is not translated to BigDecimal in default.
+Uncomment /* #define ENABLE_NUMERIC_STRING */ in bigdecimal.c, compile and install
+again if you want to enable string to BigDecimal conversion.
+Translation stops without error at the character representing non digit.
+For instance,"10XX" is translated to 10,"XXXX" is translated to 0.<BR>
+String representing zero or infinity such as "Infinity","+Infinity","-Infinity",and "NaN" can also be translated to BigDecimal unless false is specified by mode method.<BR>
+
+BigDecimal class supports coerce method(for the details about coerce method,see Ruby documentations). This means the most binary operation can be performed if the BigDecimal object is at the left hand side of the operation.<BR><BR>
+
+ For example:
+<CODE><PRE>
+ a = BigDecimal.E(20)
+ c = a * "0.123456789123456789123456789" # A String is changed to BigDecimal object.
+</PRE></CODE>
+is performed normally.<BR>
+ But,because String does not have coerce method,the following example can not be performed.<BR>
+
+<CODE><PRE>
+ a = BigDecimal.E(20)
+ c = "0.123456789123456789123456789" * a # ERROR
+</PRE></CODE>
+
+If you actually have any inconvenience about the error above.
+You can define a new class derived from String class,
+and define coerce method within the new class.<BR>
+
+<hr>
+<A NAME="#UNDEF">
+<H2>Infinity,Not a Number(NaN),Zero</H2>
+Infinite numbers and NaN can be represented by string writing "+Infinity"(or "Infinity"),"-Infinity",and "NaN" respectively in your program.
+Infinite numbers can be obtained by 1.0/0.0(=Infinity) or -1.0/0.0(=-Infinity).
+<BR><BR>
+NaN(Not a number) can be obtained by undefined computation like 0.0/0.0
+or Infinity-Infinity.
+Any computation including NaN results to NaN.
+Comparisons with NaN never become true,including comparison with NaN itself.
+<BR><BR>
+Zero has two different variations as +0.0 and -0.0.
+But,still, +0.0==-0.0 is true.
+<BR><BR>
+Computation results including Infinity,NaN,+0.0 or -0.0 become complicated.
+Run following program and confirm the results.
+Send me any incorrect result if you find.
+
+<CODE><PRE>
+ require "bigdecimal"
+ aa = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+ ba = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+ opa = %w(+ - * / <=> > >= < == != <=)
+ for a in aa
+ for b in ba
+ for op in opa
+ x = BigDecimal::new(a)
+ y = BigDecimal::new(b)
+ eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
+ end
+ end
+ end
+</PRE></CODE>
+<hr>
+
+<A NAME="#STRUCT">
+<H2>Internal structure</H2>
+BigDecimal number is defined by the structure Real in BigDecimal.h.
+Digits representing a float number are kept in the array frac[] defined in the structure.
+In the program,any floating number(BigDecimal number) is represented as:<BR>
+ <BigDecimal number> = 0.xxxxxxxxx*BASE**n<BR><BR>
+where 'x' is any digit representing mantissa(kept in the array frac[]),
+BASE is base value(=10000 in 32 bit integer system),
+and n is the exponent value.<BR>
+Larger BASE value enables smaller size of the array frac[],and increases computation speed.
+The value of BASE is defined ind VpInit(). In 32 bit integer system, this value is
+10000. In 64 bit integer system, the value is 1000000000.
+When BASE is 10000,an element of the array frac[] can have value of from 0 to 9999.
+(up to 4 digits).<BR>
+The structure Real is defined in bigdecimal.h as:<BR>
+<CODE><PRE>
+ typedef struct {
+ VALUE obj; /* Back pointer(VALUE) for Ruby object. */
+ unsigned long MaxPrec; /* The size of the array frac[] */
+ unsigned long Prec; /* Current size of frac[] actually used. */
+ short sign; /* Attribute of the value. */
+ /* ==0 : NaN */
+ /* 1 : +0 */
+ /* -1 : -0 */
+ /* 2 : Positive number */
+ /* -2 : Negative number */
+ /* 3 : +Infinity */
+ /* -3 : -Infinity */
+ unsigned short flag; /* Control flag */
+ int exponent; /* Exponent value(0.xxxx*BASE**exponent) */
+ unsigned long frac[1]; /* An array holding mantissa(Variable) */
+ } Real;
+</CODE></PRE>
+The decimal value 1234.56784321 is represented as(BASE=10000):<BR>
+<PRE>
+ 0.1234 5678 4321*(10000)**1
+</PRE>
+where frac[0]=1234,frac[1]=5678,frac[2]=4321,
+Prec=3,sign=2,exponent=1. MaxPrec can be any value greater than or equal to
+Prec.
+<hr>
+
+<A NAME="#BASE">
+<H2>Binary or decimal number representation</H2>
+I adopted decimal number representation for BigDecimal implementation.
+Of cource,binary number representation is common on the most computers.
+
+<H3>Advantages using decimal representation</H3>
+The reason why I adopted decimal number representation for BigDecimal is:<BR>
+<DL>
+<DT>Easy for debugging
+<DD>The floating number 1234.56784321 can be easily represented as:<BR>
+ frac[0]=1234,frac[1]=5678,frac[2]=4321,exponent=1,and sign=2.
+<DT>Exact representation
+<DD>Following program can add all numbers(in decimal) in a file
+ without any error(no round operation).<BR>
+
+<CODE><PRE>
+ file = File::open(....,"r")
+ s = BigDecimal::new("0")
+ while line = file.gets
+ s = s + line
+ end
+</PRE></CODE>
+
+If the internal representation is binary,translation from decimal to
+binary is required and the translation error is inevitable.
+For example, 0.1 can not exactly be represented in binary.<BR>
+0.1 => b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....<BR>
+where b1=0,b2=0,b3=0,b4=1...<BR>
+bn(n=1,2,3,...) is infinite series of digit with value of 0 or 1,
+and rounding operation is necessary but where we should round the series ?
+Of course, exact "0.1" is printed if the rounding operation is properly done,
+<DT>Significant digit we can have is automatically determined
+<DD>In binary representation,0.1 can not be represented in finite series of digit.
+
+But we only need one element(frac[0]=1) in decimal representation.
+This means that we can always determine the size of the array frac[] in Real
+structure.
+</DL>
+
+<H3>Disadvantage of decimal representation</H3>
+Because most computers have no internal decimal representation.
+Once you use BigDecimal,you need to keep using it without
+considering computation cost if exact computation is required.
+
+<H4>Which is the first input?</H4>
+Because most people uses decimal notation for numeric data representation,
+BigDecimal can handle numeric data without loss of translation error.
+<hr>
+
+<A NAME="#PREC">
+<H2>Resulting number of significant digits</H2>
+For the fundamental arithmetics such as addition,subtraction,
+multiplication,and division,I prepared 2 group of methods<BR>
+
+<H3>1. +,-,*,/</H3>
+For the operation + - * /,you can not specify the resulting
+number of significant digits.<BR>
+Resulting number of significant digits are defined as:<BR>
+1.1 For *,resulting number of significant digits is the sum of the
+significant digits of both side of the operator. For / ,resulting number of significant digits is the sum of the
+maximum significant digits of both side of the operator.<BR>
+1.2 For + and -,resulting number of significant digits is determined so that
+ no round operation is needed. <br>
+For example, c has more than 100 significant digits if c is computed as:<BR>
+c = 0.1+0.1*10**(-100)<br>
+<BR>
+As +,-,and * are always exact(no round operation is performed unless BigDecimal.limit is specified),
+which means more memory is required to keep computation results.
+But,the division such as c=1.0/3.0 will always be rounded.<BR>
+
+<H3>2. add,sub,mult,div</H3>
+The length of the significant digits obtained from +,-,*,/
+is always defined by that of right and left side of the operator.
+To specify the length of the significant digits by your self,
+use methos add,sub,mult,div.
+<CODE><PRE>
+ BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
+</PRE></CODE>
+</BLOCKQUOTE>
+
+<H3>3. truncate,round,ceil,floor</H3>
+Using these methods,you can specify rounding location relatively from
+decimal point.
+<CODE><PRE>
+ BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
+</PRE></CODE>
+</BLOCKQUOTE>
+
+
+<H3>4. Example</H3>
+Following example compute the ratio of the circumference of a circle to
+its diameter(pi=3.14159265358979....) using J.Machin's formula.
+<BR><BR>
+<CODE><PRE>
+#!/usr/local/bin/ruby
+
+require "bigdecimal"
+#
+# Calculates 3.1415.... (the number of times that a circle's diameter
+# will fit around the circle) using J. Machin's formula.
+#
+def big_pi(sig) # sig: Number of significant figures
+ exp = -sig
+ pi = BigDecimal::new("0")
+ two = BigDecimal::new("2")
+ m25 = BigDecimal::new("-0.04")
+ m57121 = BigDecimal::new("-57121")
+
+ u = BigDecimal::new("1")
+ k = BigDecimal::new("1")
+ w = BigDecimal::new("1")
+ t = BigDecimal::new("-80")
+ while (u.nonzero? && u.exponent >= exp)
+ t = t*m25
+ u = t.div(k,sig)
+ pi = pi + u
+ k = k+two
+ end
+
+ u = BigDecimal::new("1")
+ k = BigDecimal::new("1")
+ w = BigDecimal::new("1")
+ t = BigDecimal::new("956")
+ while (u.nonzero? && u.exponent >= exp )
+ t = t.div(m57121,sig)
+ u = t.div(k,sig)
+ pi = pi + u
+ k = k+two
+ end
+ pi
+end
+
+if $0 == __FILE__
+ if ARGV.size == 1
+ print "PI("+ARGV[0]+"):\n"
+ p big_pi(ARGV[0].to_i)
+ else
+ print "TRY: ruby pi.rb 1000 \n"
+ end
+end
+
+</PRE></CODE>
+<HR>
+<FONT size=2>
+<I>
+<A HREF="http://www.tinyforest.gr.jp">
+Shigeo Kobayashi
+</A>
+(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&lt;shigeo@tinyforest.gr.jp&gt;</U></A>)
+</I>
+</FONT>
+</TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/ext/bigdecimal/bigdecimal_ja.html b/ext/bigdecimal/bigdecimal_ja.html
new file mode 100644
index 0000000000..37bbcbbb09
--- /dev/null
+++ b/ext/bigdecimal/bigdecimal_ja.html
@@ -0,0 +1,799 @@
+<!-- saved from url=(0022)http://internet.e-mail -->
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
+<style type="text/css"><!--
+body { color: #3f0f0f; background: #fefeff; margin-left: 2em; margin-right: 2em;}
+h1 { color: #ffffff; background-color: #3939AD; border-color: #FF00FF; width: 100%;
+ border-style: solid; border-top-width: 0.1em; border-bottom-width: 0.1em; border-right: none;
+ border-left: none; padding: 0.1em; font-weight: bold; font-size: 160%; text-align: center;
+}
+h2 { color: #00007f; background-color: #e7e7ff; border-color: #000094; width: 100%;
+ border-style: solid; border-left: none; border-right: none; border-top-width: 0.1em; border-bottom-width: 0.1em;
+ padding: 0.1em;
+ font-weight: bold; font-size: 110%;
+}
+h3 { color: #00007f; padding: 0.2em; font-size: 110%;}
+h4, h5 { color: #000000; padding: 0.2em; font-size: 100%;}
+table { margin-top: 0.2em; margin-bottom: 0.2em; margin-left: 2em; margin-right: 2em;}
+caption { color: #7f0000; font-weight: bold;}
+th { background: #e7e7ff; padding-left: 0.2em; padding-right: 0.2em;}
+td { background: #f3f7ff; padding-left: 0.2em; padding-right: 0.2em;}
+code { color: #0000df;}
+dt { margin-top: 0.2em;}
+li { margin-top: 0.2em;}
+pre
+{ BACKGROUND-COLOR: #d0d0d0; BORDER-BOTTOM: medium none; BORDER-LEFT: medium none;
+ BORDER-RIGHT: medium none; BORDER-TOP: medium none; LINE-HEIGHT: 100%; MARGIN: 12px 12px 12px 12px;
+ PADDING-BOTTOM: 12px; PADDING-LEFT: 12px; PADDING-RIGHT: 12px; PADDING-TOP: 12px;
+ WHITE-SPACE: pre; WIDTH: 100%
+}
+--></style>
+
+<TITLE>BigDecimal:An extension library for Ruby</TITLE>
+</HEAD>
+<BODY BGCOLOR=#FFFFE0>
+<H1>BigDecimal(‰Â•Ï’·•‚“®­”“_‰‰ŽZ—pŠg’£ƒ‰ƒCƒuƒ‰ƒŠ)</H1>
+<DIV align="right"><A HREF="./bigdecimal_en.html">English</A></DIV><BR>
+BigDecimal ‚̓IƒuƒWƒFƒNƒgŽwŒü‚Ì‹­—͂ȃXƒNƒŠƒvƒgŒ¾Œê‚Å‚ ‚é Ruby ‚ɉ•ϒ·•‚“®¬”“_
+ŒvŽZ‹@”\‚ð’ljÁ‚·‚邽‚߂̊g’£ƒ‰ƒCƒuƒ‰ƒŠ‚Å‚·B
+Ruby ‚ɂ‚¢‚Ä‚ÌÚ‚µ‚¢“à—e‚͈ȉº‚ÌURL‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
+<UL>
+<LI><A HREF="http://www.ruby-lang.org/ja/">http://www.ruby-lang.org/ja/</A>FRubyŒöŽ®ƒy[ƒW</LI>
+<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>FRuby‚ÉŠÖ‚·‚éƒy[ƒW‚ð’H‚ê‚Ü‚·</LI>
+</UL>
+<hr>
+<H2>–ÚŽŸ</H2>
+<UL>
+<LI><A HREF="#INTRO">‚Í‚¶‚ß‚É</LI>
+<LI><A HREF="#SPEC">Žg—p•û–@‚ƃƒ\ƒbƒh‚̈ꗗ</A></LI>
+<LI><A HREF="#UNDEF">–³ŒÀA”ñ”Aƒ[ƒ‚̈µ‚¢</A></LI>
+<LI><A HREF="#STRUCT">“à•”\‘¢</A></LI>
+<LI><A HREF="#BASE">2i‚Æ10i</A></LI>
+<LI><A HREF="#PREC">ŒvŽZ¸“x‚ɂ‚¢‚Ä</A></LI>
+</UL>
+
+<HR>
+<A NAME="#INTRO">
+<H2>‚Í‚¶‚ß‚É</H2>
+Ruby ‚É‚Í Bignum ‚Æ‚¢‚¤ƒNƒ‰ƒX‚ª‚ ‚èA”•SŒ…‚Ì®”‚Å‚àŒvŽZ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B
+‚½‚¾A”CˆÓŒ…‚Ì•‚“®­”“_‰‰ŽZ—pƒNƒ‰ƒX‚ª–³‚¢‚悤‚Å‚·B‚»‚±‚ÅA
+”CˆÓŒ…‚Ì•‚“®­”“_‰‰ŽZ—pŠg’£ƒ‰ƒCƒuƒ‰ƒŠ BigDecimal ‚ð쬂µ‚Ü‚µ‚½B
+•s‹ï‡‚╌¾E’ñˆÄ‚ª‚ ‚éꇂǂµ‚Ç‚µA
+<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
+‚܂ł¨’m‚点‚­‚¾‚³‚¢B•s‹ï‡‚𒼂·‹C‚͑傢‚É‚ ‚è‚Ü‚·B‚½‚¾AŽžŠÔ‚Ȃǂ̊֌W‚Å–ñ‘©
+‚͂ł«‚Ü‚¹‚ñB‚Ü‚½AŒ‹‰Ê‚ɂ‚¢‚Ä‚à•ÛØ‚Å‚«‚é‚à‚̂ł͂ ‚è‚Ü‚¹‚ñB
+—\‚ßA‚²—¹³‚­‚¾‚³‚¢B
+<BR><BR>
+‚±‚̃vƒƒOƒ‰ƒ€‚ÍAŽ©—R‚É”z•zE‰ü•Ï‚µ‚Ä\‚¢‚Ü‚¹‚ñB‚½‚¾‚µA’˜ìŒ ‚Í•úŠü‚µ‚Ä‚¢‚Ü‚¹‚ñB
+”z•zE‰ü•Ï“™‚ÌŒ —˜‚Í Ruby ‚Ì‚»‚ê‚É€‚¶‚Ü‚·BÚ‚µ‚­‚Í README ‚ð“Ç‚ñ‚Å‚­‚¾‚³‚¢B
+
+<hr>
+<H2>ƒCƒ“ƒXƒg[ƒ‹‚ɂ‚¢‚Ä</H2>
+BigDecimal ‚ðŠÜ‚Þ Ruby ‚ÌÅV”Å‚Í<A HREF="http://www.ruby-lang.org/ja/">RubyŒöŽ®ƒy[ƒW</A>‚©‚çƒ_ƒEƒ“ƒ[ƒh‚Å‚«‚Ü‚·B
+ƒ_ƒEƒ“ƒ[ƒh‚µ‚½ÅV”Å‚ð‰ð“€‚µ‚½‚çA’Êí‚̃Cƒ“ƒXƒg[ƒ‹Žè‡‚ðŽÀs‚µ‚ĉº‚³‚¢B
+Ruby ‚ª³‚µ‚­ƒCƒ“ƒXƒg[ƒ‹‚³‚ê‚ê‚ÎA“¯Žž‚É BigDecimal ‚à—˜—p‚Å‚«‚邿‚¤‚ɂȂé‚Í‚¸‚Å‚·B
+ƒ\[ƒXƒtƒ@ƒCƒ‹‚Í
+bigdecimal.c,bigdecimal.h
+‚Ì‚QŒÂ‚݂̂ł·B<BR>
+
+<hr>
+<A NAME="#SPEC">
+<H2>Žg—p•û–@‚ƃƒ\ƒbƒh‚̈ꗗ</H2>
+uRuby‚ÍŠù‚É‘‚¯‚év‚Æ‚¢‚¤‘O’ñ‚ÅA
+<CODE><PRE>
+require 'bigdecimal'
+a=BigDecimal::new("0.123456789123456789")
+b=BigDecimal("123456.78912345678",40)
+c=a+b
+</PRE></CODE>
+<br>
+‚Æ‚¢‚¤‚悤‚ÈŠ´‚¶‚ÅŽg—p‚µ‚Ü‚·B
+
+<H3>ƒƒ\ƒbƒhˆê——</H3>
+ˆÈ‰º‚̃ƒ\ƒbƒh‚ª—˜—p‰Â”\‚Å‚·B
+u—LŒøŒ…”v‚Æ‚Í BigDecimal ‚ª¸“x‚ð•ÛØ‚·‚錅”‚Å‚·B
+‚Ò‚Á‚½‚è‚ł͂ ‚è‚Ü‚¹‚ñAŽáб‚Ì—]—T‚ðŽ‚Á‚ÄŒvŽZ‚³‚ê‚Ü‚·B
+‚Ü‚½A—Ⴆ‚΂R‚Qƒrƒbƒg‚̃VƒXƒeƒ€‚ł͂P‚Oi‚Å‚SŒ…–ˆ‚ÉŒvŽZ‚µ‚Ü‚·B]‚Á‚ÄAŒ»ó‚Å‚ÍA
+“à•”‚Ìu—LŒøŒ…”v‚Í‚S‚Ì”{”‚ƂȂÁ‚Ä‚¢‚Ü‚·B
+<P>
+ˆÈ‰º‚̃ƒ\ƒbƒhˆÈŠO‚É‚àA(C ‚ł͂Ȃ¢) Ruby ƒ\[ƒX‚ÌŒ`‚Å
+’ñ‹Ÿ‚³‚ê‚Ä‚¢‚é‚à‚Ì‚à‚ ‚è‚Ü‚·B—Ⴆ‚ÎA
+<CODE><PRE>
+require "bigdecimal/math.rb"
+</PRE></CODE>
+‚Æ‚·‚邱‚Æ‚ÅAsin ‚â cos ‚Æ‚¢‚Á‚½ŠÖ”‚ªŽg—p‚Å‚«‚邿‚¤‚ɂȂè‚Ü‚·B
+Žg—p•û–@‚È‚ÇAÚ×‚Í math.rb ‚Ì“à—e‚ðŽQÆ‚µ‚ĉº‚³‚¢B
+
+‚»‚Ì‘¼AFloat ‚Æ‚Ì‘ŠŒÝ•ÏŠ·‚Ȃǂ̃ƒ\ƒbƒh‚ª util.rb ‚ŃTƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚·B
+—˜—p‚·‚é‚É‚Í
+<CODE><PRE>
+require "bigdecimal/util.rb"
+</PRE></CODE>
+‚̂悤‚É‚µ‚Ü‚·BÚ×‚Í util.rb ‚Ì“à—e‚ðŽQÆ‚µ‚ĉº‚³‚¢B
+
+<H4><U>ƒNƒ‰ƒXƒƒ\ƒbƒh</U></H4>
+<UL>
+<LI><B>new</B></LI><BLOCKQUOTE>
+V‚µ‚¢ BigDecimal ƒIƒuƒWƒFƒNƒg‚𶬂µ‚Ü‚·B<BR>
+a=BigDecimal::new(s[,n]) ‚Ü‚½‚Í<BR>
+a=BigDecimal(s[,n])<BR>
+s ‚Í”Žš‚ð•\Œ»‚·‚鉊ú’l‚ð•¶Žš—ñ‚ÅŽw’肵‚Ü‚·B
+ƒXƒy[ƒX‚Í–³Ž‹‚³‚ê‚Ü‚·B‚Ü‚½A”»’f‚Å‚«‚È‚¢•¶Žš‚ªoŒ»‚µ‚½Žž“_‚Å
+•¶Žš—ñ‚ÍI—¹‚µ‚½‚à‚̂Ƃ݂Ȃ³‚ê‚Ü‚·B
+n ‚Í•K—v‚È—LŒøŒ…”ia ‚ÌÅ‘å—LŒøŒ…”j‚ð®”‚ÅŽw’肵‚Ü‚·B
+n ‚ª 0 ‚Ü‚½‚ÍÈ—ª‚³‚ꂽ‚Æ‚«‚ÍAn ‚Ì’l‚Í s ‚Ì—LŒøŒ…”‚Ƃ݂Ȃ³‚ê‚Ü‚·B
+s ‚Ì—LŒøŒ…”‚æ‚è n ‚ª¬‚³‚¢‚Æ‚«‚à n=0 ‚̂Ƃ«‚Æ“¯‚¶‚Å‚·B
+a ‚ÌÅ‘å—LŒøŒ…”‚Í n ‚æ‚èŽáб‘å‚¢’l‚ªÌ—p‚³‚ê‚Ü‚·B
+Å‘å—LŒøŒ…”‚͈ȉº‚̂悤‚ÈŠ„‚èŽZ‚ðŽÀs‚·‚邯‚«“™‚ɈӖ¡‚ðŽ‚¿‚Ü‚·B
+<CODE><PRE>
+BigDecimal("1") / BigDecimal("3") # => 0.3333333333 33E0
+BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
+</PRE></CODE>
+‚½‚¾‚µAŒÂX‚̉‰ŽZ‚É‚¨‚¯‚éÅ‘å—LŒøŒ…” n ‚ÌŽæ‚舵‚¢‚Í«—ˆ‚̃o[ƒWƒ‡ƒ“‚Å
+Žáб•ÏX‚³‚ê‚é‰Â”\«‚ª‚ ‚è‚Ü‚·B
+</BLOCKQUOTE>
+
+<LI><B>mode</B></LI><BLOCKQUOTE>
+f = BigDecimal.mode(s[,v])<BR>
+BigDecimal‚ÌŽÀsŒ‹‰Ê‚ð§Œä‚µ‚Ü‚·B‘æ‚Qˆø”‚ðÈ—ªA‚Ü‚½‚Í nil ‚ðŽw’è‚·‚邯
+Œ»ó‚ÌÝ’è’l‚ª–ß‚è‚Ü‚·B<BR>
+ˆÈ‰º‚ÌŽg—p•û–@‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚·B
+<P>
+<B>[—áŠOˆ—]</B><P>
+ŒvŽZŒ‹‰Ê‚ª”ñ”(NaN)‚âƒ[ƒ‚É‚æ‚霎Z‚ɂȂÁ‚½‚Æ‚«‚̈—‚ð’è‹`‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_NaN,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_INFINITY,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_UNDERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_OVERFLOW,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ZERODIVIDE,flag)<BR>
+f = BigDecimal::mode(BigDecimal::EXCEPTION_ALL,flag)<BR>
+</BLOCKQUOTE>
+
+EXCEPTION_NaN ‚ÍŒ‹‰Ê‚ª NaN ‚ɂȂÁ‚½‚Æ‚«‚ÌŽw’è‚Å‚·B<BR>
+EXCEPTION_INFINITY ‚ÍŒ‹‰Ê‚ª–³ŒÀ‘å(}Infinity)‚ɂȂÁ‚½‚Æ‚«‚ÌŽw’è‚Å‚·B<BR>
+EXCEPTION_UNDERFLOW ‚ÍŽw”•”‚ªƒAƒ“ƒ_[ƒtƒ[‚·‚邯‚«‚ÌŽw’è‚Å‚·B<BR>
+EXCEPTION_OVERFLOW ‚ÍŽw”•”‚ªƒI[ƒo[ƒtƒ[‚·‚邯‚«‚ÌŽw’è‚Å‚·B<BR>
+EXCEPTION_ZERODIVIDE ‚̓[ƒ‚É‚æ‚銄‚èŽZ‚ðŽÀs‚µ‚½‚Æ‚«‚ÌŽw’è‚Å‚·B<BR>
+EXCEPTION_ALL ‚ÍA‰Â”\‚È‘S‚Ăɑ΂µ‚Ĉꊇ‚µ‚ÄÝ’è‚·‚邯‚«‚ÉŽg—p‚µ‚Ü‚·B<BR><BR>
+
+flag ‚ª true ‚̂Ƃ«‚ÍAŽw’肵‚½ó‘ԂɂȂÁ‚½‚Æ‚«‚É—áŠO‚ð”­s‚·‚邿‚¤‚ɂȂè‚Ü‚·B<BR>
+flag ‚ª falseiƒfƒtƒHƒ‹ƒgj‚È‚çA—áŠO‚Í”­s‚³‚ê‚Ü‚¹‚ñBŒvŽZŒ‹‰Ê‚͈ȉº‚̂悤‚ɂȂè‚Ü‚·B<BR>
+<BLOCKQUOTE>
+EXCEPTION_NaN ‚̂Ƃ«A”ñ”(NaN)<BR>
+EXCEPTION_INFINITY ‚̂Ƃ«A–³ŒÀ(+ or -Infinity)<BR>
+EXCEPTION_UNDERFLOW ‚̂Ƃ«Aƒ[ƒ<BR>
+EXCEPTION_OVERFLOW ‚̂Ƃ«A+Infinity ‚© -Infinity<BR>
+EXCEPTION_ZERODIVIDE ‚̂Ƃ«A+Infinity ‚© -Infinity<BR>
+</BLOCKQUOTE>
+EXCEPTION_INFINITYAEXCEPTION_OVERFLOWAEXCEPTION_ZERODIVIDE
+‚Í¡‚̂Ƃ±‚듯‚¶‚Å‚·B<BR>
+–ß‚è’l‚ÍAÝ’èŒã‚Ì’l‚Å‚·Bu’lv‚̈Ӗ¡‚ÍA—Ⴆ‚Î
+BigDecimal::EXCEPTION_NaN‚Æu’lv‚Ì & ‚ª ƒ[ƒˆÈŠO‚È‚ç‚Î
+EXCEPTION_NaN‚ªÝ’肳‚ê‚Ä‚¢‚邯‚¢‚¤ˆÓ–¡‚Å‚·B
+
+<P>
+<B>[ŠÛ‚߈—Žw’è]</B><P>
+ŒvŽZ“r’†‚ÌŠÛ‚ß‘€ì‚ÌŽw’肪‚Å‚«‚Ü‚·B
+<BLOCKQUOTE>
+f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
+</BLOCKQUOTE>
+‚ÌŒ`Ž®‚ÅŽw’肵‚Ü‚·B<BR>
+‚±‚±‚ÅAflag ‚͈ȉº(ЇŒÊ“à‚͑Ήž‚·‚éƒCƒ“ƒXƒ^ƒ“ƒXƒƒ\ƒbƒh)‚̈ê‚‚ðŽw’肵‚Ü‚·B
+<TABLE>
+<TR><TD>ROUND_UP</TD><TD>‘S‚ÄØ‚èã‚°‚Ü‚·B</TD></TR>
+<TR><TD>ROUND_DOWN</TD><TD>‘S‚ÄØ‚èŽÌ‚Ă܂·(truncate)B</TD></TR>
+<TR><TD>ROUND_HALF_UP</TD><TD>ŽlŽÌŒÜ“ü‚µ‚Ü‚·(ƒfƒtƒHƒ‹ƒg)B</TD></TR>
+<TR><TD>ROUND_HALF_DOWN</TD><TD>ŒÜŽÌ˜Z“ü‚µ‚Ü‚·B</TD></TR>
+<TR><TD>ROUND_HALF_EVEN</TD><TD>ŽlŽÌ˜Z“ü‚µ‚Ü‚·B‚T‚ÌŽž‚ÍãˆÊ‚PŒ…‚ªŠï”‚ÌŽž‚̂݌J‚èã‚°‚Ü‚·(Banker's rounding)B</TD></TR>
+<TR><TD>ROUND_CEILING</TD><TD>”’l‚̑傫‚¢•û‚ÉŒJ‚èã‚°‚Ü‚·(ceil)B</TD></TR>
+<TR><TD>ROUND_FLOOR</TD><TD>”’l‚̬‚³‚¢•û‚ÉŒJ‚艺‚°‚Ü‚·(floor)B</TD></TR>
+
+</TABLE>
+–ß‚è’l‚ÍŽw’èŒã‚Ì flag ‚Ì’l‚Å‚·B
+‘æ‚Qˆø”‚É nil ‚ðŽw’è‚·‚邯AŒ»ó‚ÌÝ’è’l‚ª•Ô‚è‚Ü‚·B
+mode ƒƒ\ƒbƒh‚ł͊ۂߑ€ì‚̈ʒu‚ðƒ†[ƒU‚ªŽw’è‚·‚邱‚Ƃ͂ł«‚Ü‚¹‚ñB
+ŠÛ‚ß‘€ì‚ƈʒu‚ðŽ©•ª‚ŧŒä‚µ‚½‚¢ê‡‚Í BigDecimal::limit ‚â truncate/round/ceil/floorA
+add/sub/mult/div ‚Æ‚¢‚Á‚½ƒCƒ“ƒXƒ^ƒ“ƒXƒƒ\ƒbƒh‚ðŽg—p‚µ‚ĉº‚³‚¢B
+</BLOCKQUOTE>
+<LI><B>limit([n])</B></LI><BLOCKQUOTE>
+¶¬‚³‚ê‚éBigDecimalƒIƒuƒWƒFƒNƒg‚Ìő包”‚ðnŒ…‚ɧŒÀ‚µ‚Ü‚·B
+–ß‚è’l‚ÍÝ’è‚·‚é‘O‚Ì’l‚Å‚·BÝ’è’l‚̃fƒtƒHƒ‹ƒg’l‚Í‚O‚ÅAŒ…”–³§ŒÀ‚Æ‚¢‚¤ˆÓ–¡‚Å‚·B
+n ‚ðŽw’肵‚È‚¢A‚Ü‚½‚Í n ‚ª nil ‚ÌꇂÍAŒ»ó‚Ìő包”‚ª•Ô‚è‚Ü‚·B<BR>
+ŒvŽZ‚ð‘±s‚·‚éŠÔ‚ÉA”Žš‚ÌŒ…”‚ª–³§ŒÀ‚É‘‚¦‚Ä‚µ‚Ü‚¤‚悤‚Èê‡
+ limit ‚Å—\‚ߌ…”‚ð§ŒÀ‚Å‚«‚Ü‚·B‚±‚Ìê‡ BigDecimal.mode ‚ÅŽw’肳‚ꂽ
+ŠÛ‚߈—‚ªŽÀs‚³‚ê‚Ü‚·B
+‚½‚¾‚µAƒCƒ“ƒXƒ^ƒ“ƒXƒƒ\ƒbƒh (truncate/round/ceil/floor/add/sub/mult/div) ‚Ì
+Œ…”§ŒÀ‚Í limit ‚æ‚è—D悳‚ê‚Ü‚·B<BR>
+mf = BigDecimal::limit(n)<BR>
+</BLOCKQUOTE>
+
+<LI><B>double_fig</B></LI><BLOCKQUOTE>
+Ruby ‚Ì Float ƒNƒ‰ƒX‚ª•ÛŽ‚Å‚«‚é—LŒø”Žš‚Ì”‚ð•Ô‚µ‚Ü‚·B
+<CODE><PRE>
+ p BigDecimal::double_fig # ==> 20 (depends on the CPU etc.)
+</PRE></CODE>
+double_fig‚͈ȉº‚Ì C ƒvƒƒOƒ‰ƒ€‚ÌŒ‹‰Ê‚Æ“¯‚¶‚Å‚·B
+<CODE><PRE>
+ double v = 1.0;
+ int double_fig = 0;
+ while(v + 1.0 > 1.0) {
+ ++double_fig;
+ v /= 10;
+ }
+</PRE></CODE>
+</BLOCKQUOTE>
+
+<LI><B>BASE</B></LI><BLOCKQUOTE>
+“à•”‚ÅŽg—p‚³‚ê‚éŠî”‚Ì’l‚Å‚·B®”‚ª 32 ƒrƒbƒg‚̈—Œn‚Å‚Í10000‚Å‚·B<BR>
+b = BigDecimal::BASE<BR>
+</BLOCKQUOTE>
+</UL>
+
+<H4><U>ƒCƒ“ƒXƒ^ƒ“ƒXƒƒ\ƒbƒh</U></H4>
+<UL>
+<LI><B>+</B></LI><BLOCKQUOTE>
+‰ÁŽZic = a + bj<BR>
+c ‚̸“x‚ɂ‚¢‚Ä‚Íu<A HREF="#PREC">ŒvŽZ¸“x‚ɂ‚¢‚Ä</A>v‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
+</BLOCKQUOTE>
+
+<LI><B>-</B></LI><BLOCKQUOTE>
+Œ¸ŽZic = a - bjA‚Ü‚½‚Í•„†”½“]ic = -aj<BR>
+c ‚̸“x‚ɂ‚¢‚Ä‚Íu<A HREF="#PREC">ŒvŽZ¸“x‚ɂ‚¢‚Ä</A>v‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
+
+</BLOCKQUOTE>
+<LI><B>*</B></LI><BLOCKQUOTE>
+æŽZ(c = a * b)<BR>
+c‚̸“x‚Í(a‚̸“x)+(b‚̸“x)’ö“x‚Å‚·B<br>
+Ú‚µ‚­‚Íu<A HREF="#PREC">ŒvŽZ¸“x‚ɂ‚¢‚Ä</A>v‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
+
+</BLOCKQUOTE>
+<LI><B>/</B></LI><BLOCKQUOTE>
+œŽZ(c = a / b)<BR>
+c ‚̸“x‚ɂ‚¢‚Ä‚Íu<A HREF="#PREC">ŒvŽZ¸“x‚ɂ‚¢‚Ä</A>v‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
+
+</BLOCKQUOTE>
+
+<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
+ˆÈ‰º‚̂悤‚ÉŽg—p‚µ‚Ü‚·B<BR>
+c = a.add(b,n)<BR>
+c = a + b ‚ðÅ‘å‚Å n Œ…‚܂ŌvŽZ‚µ‚Ü‚·B<BR>
+a + b ‚̸“x‚ª n ‚æ‚è‘å‚«‚¢‚Æ‚«‚Í BigDecimal.mode ‚ÅŽw’肳‚ꂽ•û–@‚ÅŠÛ‚ß‚ç‚ê‚Ü‚·B<BR>
+n ‚ªƒ[ƒ‚È‚ç + ‚Æ“¯‚¶‚Å‚·B
+</BLOCKQUOTE>
+<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
+ˆÈ‰º‚̂悤‚ÉŽg—p‚µ‚Ü‚·B<BR>
+c = a.sub(b,n)<BR>
+c = a - b ‚ðÅ‘å‚Å n Œ…‚܂ŌvŽZ‚µ‚Ü‚·B<BR>
+a - b ‚̸“x‚ª n ‚æ‚è‘å‚«‚¢‚Æ‚«‚Í BigDecimal.mode ‚ÅŽw’肳‚ꂽ•û–@‚ÅŠÛ‚ß‚ç‚ê‚Ü‚·B<BR>
+n ‚ªƒ[ƒ‚È‚ç - ‚Æ“¯‚¶‚Å‚·B
+
+</BLOCKQUOTE>
+<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
+ˆÈ‰º‚̂悤‚ÉŽg—p‚µ‚Ü‚·B<BR>
+c = a.mult(b,n)<BR>
+c = a * b ‚ðÅ‘å‚Å n Œ…‚܂ŌvŽZ‚µ‚Ü‚·B<BR>
+a * b ‚̸“x‚ª n ‚æ‚è‘å‚«‚¢‚Æ‚«‚Í BigDecimal.mode ‚ÅŽw’肳‚ꂽ•û–@‚ÅŠÛ‚ß‚ç‚ê‚Ü‚·B<BR>
+n ‚ªƒ[ƒ‚È‚ç * ‚Æ“¯‚¶‚Å‚·B
+
+</BLOCKQUOTE>
+<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
+ˆÈ‰º‚̂悤‚ÉŽg—p‚µ‚Ü‚·B<BR>
+c = a.div(b,n)<BR>
+c = a / b ‚ðÅ‘å‚Å n Œ…‚܂ŌvŽZ‚µ‚Ü‚·B
+a / b ‚̸“x‚ª n ‚æ‚è‘å‚«‚¢‚Æ‚«‚Í BigDecimal.mode ‚ÅŽw’肳‚ꂽ•û–@‚ÅŠÛ‚ß‚ç‚ê‚Ü‚·B<BR>
+n ‚ªƒ[ƒ‚È‚ç / ‚Æ“¯‚¶‚Å‚·B<BR>
+n ‚ªÈ—ª‚³‚ꂽ‚Æ‚«‚Í Float#div ‚Æ“¯—l‚ÉŒ‹‰Ê‚ª®”(BigDecimal)‚ɂȂè‚Ü‚·B
+</BLOCKQUOTE>
+
+<LI><B>fix</B></LI><BLOCKQUOTE>
+a ‚̬”“_ˆÈ‰º‚ÌØ‚èŽÌ‚ÄB<BR>
+c = a.fix
+</BLOCKQUOTE>
+<LI><B>frac</B></LI><BLOCKQUOTE>
+a ‚Ì®”•”•ª‚ÌØ‚èŽÌ‚ÄB<BR>
+c = a.frac
+</BLOCKQUOTE>
+
+<LI><B>floor[(n)]</B></LI><BLOCKQUOTE>
+c = a.floor<BR>
+a ˆÈ‰º‚Ìő宔iBigDecimal ’lj‚ð•Ô‚µ‚Ü‚·B
+<CODE><PRE>
+c = BigDecimal("1.23456").floor # ==> 1
+c = BigDecimal("-1.23456").floor # ==> -2
+</PRE></CODE>
+ˆÈ‰º‚̂悤‚Ɉø” n ‚ð—^‚¦‚邱‚Æ‚à‚Å‚«‚Ü‚·B<BR>
+n>=0 ‚È‚çA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ð‘€ì‚µ‚Ü‚·(­”“_ˆÈ‰º‚ðAÅ‘å n Œ…‚É‚µ‚Ü‚·)B<BR>
+n ‚ª•‰‚̂Ƃ«‚ͬ”“_ˆÈã n Œ…–Ú‚ð‘€ì‚µ‚Ü‚·(¬”“_ˆÊ’u‚©‚ç¶‚É­‚È‚­‚Æ‚à n ŒÂ‚Ì 0 ‚ª•À‚т܂·)B<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").floor(4) # ==> 1.2345
+ c = BigDecimal("15.23456").floor(-1) # ==> 10.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>ceil[(n)]</B></LI><BLOCKQUOTE>
+c = a.ceil<BR>
+a ˆÈã‚Ì®”‚Ì‚¤‚¿Ałଂ³‚¢®”‚ðŒvŽZ‚µA‚»‚Ì’liBigDecimal ’lj‚ð•Ô‚µ‚Ü‚·B
+<CODE><PRE>
+c = BigDecimal("1.23456").ceil # ==> 2
+c = BigDecimal("-1.23456").ceil # ==> -1
+</PRE></CODE>
+
+ˆÈ‰º‚̂悤‚Ɉø”‚ð—^‚¦‚ÄA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ð‘€ì‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·B<BR>
+n>=0 ‚È‚çA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ð‘€ì‚µ‚Ü‚·(­”“_ˆÈ‰º‚ðAÅ‘å n Œ…‚É‚µ‚Ü‚·)B<BR>
+ n ‚ª•‰‚̂Ƃ«‚ͬ”“_ˆÈã n Œ…–Ú‚ð‚ð‘€ì‚µ‚Ü‚·(¬”“_ˆÊ’u‚©‚ç¶‚É­‚È‚­‚Æ‚à n ŒÂ‚Ì 0 ‚ª•À‚т܂·)B<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").ceil(4) # ==> 1.2346
+ c = BigDecimal("15.23456").ceil(-1) # ==> 20.0
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>round[(n[,b])]</B></LI><BLOCKQUOTE>
+c = a.round<BR>
+
+ƒNƒ‰ƒXƒƒ\ƒbƒh BigDecimal::mode(BigDecimal::ROUND_MODE,flag) ‚ÅŽw’肵‚½
+ROUND_MODE ‚É]‚Á‚ÄŠÛ‚ß‘€ì‚ðŽÀs‚µ‚Ü‚·B
+BigDecimal::mode(BigDecimal::ROUND_MODE,flag) ‚ʼn½‚àŽw’肹‚¸A‚©‚ÂAˆø”
+‚ðŽw’肵‚È‚¢ê‡‚Íu¬”“_ˆÈ‰º‘æˆêˆÊ‚Ì”‚ðŽlŽÌŒÜ“ü‚µ‚Ä®”iBigDecimal ’ljv‚É‚µ‚Ü‚·B<BR>
+<CODE><PRE>
+ c = BigDecimal("1.23456").round # ==> 1
+ c = BigDecimal("-1.23456").round # ==> -1
+</PRE></CODE>
+
+ˆÈ‰º‚̂悤‚Ɉø”‚ð—^‚¦‚ÄA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ð‘€ì‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·B<BR>
+n ‚ª³‚ÌŽž‚ÍA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ðŠÛ‚߂܂·(­”“_ˆÈ‰º‚ðAÅ‘å n Œ…‚É‚µ‚Ü‚·)B<BR>
+n ‚ª•‰‚̂Ƃ«‚ͬ”“_ˆÈã n Œ…–Ú‚ðŠÛ‚߂܂·(¬”“_ˆÊ’u‚©‚ç¶‚É­‚È‚­‚Æ‚à n ŒÂ‚Ì 0 ‚ª•À‚т܂·)B
+<CODE><PRE>
+c = BigDecimal("1.23456").round(4) # ==> 1.2346
+c = BigDecimal("15.23456").round(-1) # ==> 20.0
+</PRE></CODE>
+‚Q”Ԗڂ̈ø”‚ðŽw’è‚·‚邯ABigDecimal#mode ‚ÌŽw’è‚𖳎‹‚µ‚ÄAŽw’肳‚ꂽ•û–@‚Å
+ŠÛ‚ß‘€ì‚ðŽÀs‚µ‚Ü‚·B
+<CODE><PRE>
+c = BigDecimal("1.23456").round(3,BigDecimal::ROUND_HALF_EVEN) # ==> 1.234
+c = BigDecimal("1.23356").round(3,BigDecimal::ROUND_HALF_EVEN) # ==> 1.234
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>truncate</B></LI><BLOCKQUOTE>
+c = a.truncate<BR>
+¬”“_ˆÈ‰º‚Ì”‚ðØ‚èŽÌ‚ĂĮ”iBigDecimal ’lj‚É‚µ‚Ü‚·B<BR>
+ˆÈ‰º‚̂悤‚Ɉø”‚ð—^‚¦‚ÄA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ð‘€ì‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·B<BR>
+n ‚ª³‚ÌŽž‚ÍA¬”“_ˆÈ‰º n+1 ˆÊ‚Ì”Žš‚ðØ‚èŽÌ‚Ă܂·(­”“_ˆÈ‰º‚ðAÅ‘å n Œ…‚É‚µ‚Ü‚·)B
+n ‚ª•‰‚̂Ƃ«‚ͬ”“_ˆÈã n Œ…–Ú‚ð‚ð‘€ì‚µ‚Ü‚·(¬”“_ˆÊ’u‚©‚ç¶‚É­‚È‚­‚Æ‚à n ŒÂ‚Ì 0 ‚ª•À‚т܂·)B<BR>
+<CODE><PRE>
+c = BigDecimal("1.23456").truncate(4) # ==> 1.2345
+c = BigDecimal("15.23456").truncate(-1) # ==> 10.0
+</PRE></CODE>
+</BLOCKQUOTE>
+
+</BLOCKQUOTE>
+<LI><B>abs</B></LI><BLOCKQUOTE>
+‚‚Ìâ‘Î’l<BR>
+c = a.abs<BR>
+
+</BLOCKQUOTE>
+<LI><B>to_i</B></LI><BLOCKQUOTE>
+­”“_ˆÈ‰º‚ðØ‚èŽÌ‚ĂĮ”‚ɕϊ·‚µ‚Ü‚·B<BR>
+i = a.to_i<BR>
+i ‚Í’l‚ɉž‚¶‚Ä Fixnum ‚© Bignum ‚ɂȂè‚Ü‚·B
+a ‚ª Infinity ‚â NaN ‚̂Ƃ«Ai ‚Í nil ‚ɂȂè‚Ü‚·B
+</BLOCKQUOTE>
+<LI><B>to_f</B></LI><BLOCKQUOTE>
+Float ƒIƒuƒWƒFƒNƒg‚ɕϊ·‚µ‚Ü‚·B
+‚æ‚è‚«‚ßׂ©‚¢’l‚ª•K—v‚È‚ç‚Î split ƒƒ\ƒbƒh‚ð—˜—p‚µ‚Ä
+‚­‚¾‚³‚¢B
+</BLOCKQUOTE>
+<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
+•¶Žš—ñ‚ɕϊ·‚µ‚Ü‚·(ƒfƒtƒHƒ‹ƒg‚Í "0.xxxxxEn" ‚ÌŒ`‚ɂȂè‚Ü‚·jB
+<CODE><PRE>
+BigDecimal("1.23456").to_s # ==> "0.123456E1"
+</PRE></CODE>
+ˆø” n ‚ɳ‚Ì®”‚ªŽw’肳‚ꂽ‚Æ‚«‚ÍA­”“_‚Å•ª‚¯‚ç‚ê‚鶉E•”•ª‚ðA‚»‚ꂼ‚ê n Œ…–ˆ
+‚É‹ó”’‚Å‹æØ‚è‚Ü‚·B
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(10) # ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+ˆø” n ‚ɳ‚Ì®”‚ð•\‚·•¶Žš—ñ‚ðŽw’è‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·B
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s("10") # ==> "0.1234567890 123456789E0"
+</PRE></CODE>
+•¶Žš—ñ‚Ìʼn‚É '+'i‚Ü‚½‚Í ' 'j‚ð•t‚¯‚邯A’l‚ª³‚Ìê‡A擪‚É '+'i‚Ü‚½‚Í ' 'j‚ª•t‚«‚Ü‚·
+i•‰‚ÌꇂÍAí‚É '-' ‚ª•t‚«‚Ü‚·BjB
+<CODE><PRE>
+BigDecimal("0.1234567890123456789").to_s(" 10") # ==> " 0.1234567890 123456789E0"
+BigDecimal("0.1234567890123456789").to_s("+10") # ==> "+0.1234567890 123456789E0"
+BigDecimal("-0.1234567890123456789").to_s("10") # ==> "-0.1234567890 123456789E0"
+</PRE></CODE>
+
+‚³‚ç‚É•¶Žš—ñ‚ÌÅŒã‚É E(‚Ü‚½‚Í e) ‚© F(‚Ü‚½‚Í f) ‚ðŽw’è‚·‚邱‚Æ‚ÅAˆÈ‰º‚̂悤‚É
+•\ަŒ`Ž®‚ð•ÏX‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B
+<CODE><PRE>
+BigDecimal("1234567890.123456789").to_s("E") # ==> "0.1234567890123456789E10"
+BigDecimal("1234567890.123456789").to_s("F") # ==> "1234567890.123456789"
+BigDecimal("1234567890.123456789").to_s("5E") # ==> "0.12345 67890 12345 6789E10"
+BigDecimal("1234567890.123456789").to_s("5F") # ==> "12345 67890.12345 6789"
+</PRE></CODE>
+
+</BLOCKQUOTE>
+<LI><B>exponent</B></LI><BLOCKQUOTE>
+Žw”•”‚ð®”’l‚ŕԂµ‚Ü‚·B
+n = a.exponent <BR>
+‚Í a ‚Ì’l‚ª 0.xxxxxxx*10**n ‚ðˆÓ–¡‚µ‚Ü‚·B
+</BLOCKQUOTE>
+
+<LI><B>precs</B></LI><BLOCKQUOTE>
+n,m = a.precs<BR>
+a ‚Ì—LŒø”Žš (n) ‚ÆÅ‘å—LŒø”Žš (m) ‚Ì”z—ñ‚ð•Ô‚µ‚Ü‚·B
+
+</BLOCKQUOTE>
+
+<LI><B>sign</B></LI><BLOCKQUOTE>
+’l‚ª³(sign &gt; 0)A•‰(sign &lt; 0)A‚»‚Ì‘¼(sigh==0)‚Å‚ ‚é‚©‚Ìî•ñ‚ð•Ô‚µ‚Ü‚·B
+n = a.sign <BR>
+‚Æ‚µ‚½‚Æ‚« n ‚Ì’l‚Í a ‚ªˆÈ‰º‚̂Ƃ«‚ðˆÓ–¡‚µ‚Ü‚·B<BR>
+() ‚Ì’†‚Ì”Žš‚ÍAŽÀÛ‚Ì’l‚Å‚·(<A HREF="#STRUCT">u“à•”\‘¢v</A>‚ðŽQÆ)B<BR>
+n = BigDecimal::SIGN_NaN(0) : a ‚Í NaN<BR>
+n = BigDecimal::SIGN_POSITIVE_ZERO(1) : a ‚Í +0<BR>
+n = BigDecimal::SIGN_NEGATIVE_ZERO(-1) : a ‚Í -0<BR>
+n = BigDecimal::SIGN_POSITIVE_FINITE(2) : a ‚ͳ‚Ì’l<BR>
+n = BigDecimal::SIGN_NEGATIVE_FINITE(-2) : a ‚Í•‰‚Ì’l<BR>
+n = BigDecimal::SIGN_POSITIVE_INFINITE(3) : a ‚Í+Infinity<BR>
+n = BigDecimal::SIGN_NEGATIVE_INFINITE(-3) : a ‚Í-Infinity<BR>
+
+</BLOCKQUOTE>
+<LI><B>nan?</B></LI><BLOCKQUOTE>
+a.nan? ‚Í a ‚ªNaN‚̂Ƃ«^‚ð•Ô‚µ‚Ü‚·B
+</BLOCKQUOTE>
+<LI><B>infinite?</B></LI><BLOCKQUOTE>
+a.infinite? ‚Í a ‚ª+‡‚̂Ƃ« 1 A-‡‚̂Ƃ«‚Í -1A‚»‚êˆÈŠO‚̂Ƃ«‚Í nil ‚ð•Ô‚µ‚Ü‚·B
+</BLOCKQUOTE>
+<LI><B>finite?</B></LI><BLOCKQUOTE>
+a.finite? ‚Í a ‚ª‡‚Ü‚½‚Í NaN ‚łȂ¢‚Æ‚«^‚ð•Ô‚µ‚Ü‚·B
+</BLOCKQUOTE>
+
+<LI><B>zero?</B></LI><BLOCKQUOTE>
+a ‚ª 0 ‚È‚ç true ‚ɂȂè‚Ü‚·B<BR>
+c = a.zero?
+</BLOCKQUOTE>
+<LI><B>nonzero?</B></LI><BLOCKQUOTE>
+a ‚ª 0 ‚È‚ç nilA0 ˆÈŠO‚È‚ç a ‚»‚Ì‚à‚Ì‚ª•Ô‚è‚Ü‚·B<BR>
+c = a.nonzero?
+
+</BLOCKQUOTE>
+<LI><B>split</B></LI><BLOCKQUOTE>
+BigDecimal ’l‚ð 0.xxxxxxx*10**n ‚Æ•\Œ»‚µ‚½‚Æ‚«‚ÉA•„†iNaN‚̂Ƃ«‚Í
+0A‚»‚êˆÈŠO‚Í+1‚©-1‚ɂȂè‚Ü‚·jA
+‰¼”•”•ª‚Ì•¶Žš—ñi"xxxxxxx"j‚ÆAŠî”i10jAX‚ÉŽw” n ‚ð”z—ñ‚Å
+•Ô‚µ‚Ü‚·B<BR>
+a=BigDecimal::new("3.14159265")<BR>
+f,x,y,z = a.split<BR>
+‚Æ‚·‚邯Af=+1Ax="314159265"Ay=10Az=1‚ɂȂè‚Ü‚·B<BR>
+]‚Á‚ÄA<BR>
+s = "0."+x<BR>
+b = f*(s.to_f)*(y**z)<BR>
+‚Å Float ‚ɕϊ·‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B
+</BLOCKQUOTE>
+<LI><B>inspect</B></LI><BLOCKQUOTE>
+ƒfƒoƒbƒOo—͂Ɏg—p‚³‚ê‚Ü‚·B<BR>
+p a=BigDecimal::new("3.14",10)<BR>
+‚Æ‚·‚邯A[0x112344:'0.314E1',4(12)]‚̂悤‚Éo—Í‚³‚ê‚Ü‚·B
+ʼn‚Ì16i”‚̓IƒuƒWƒFƒNƒg‚̃AƒhƒŒƒXAŽŸ‚Ì '0.314E1' ‚Í’lA
+ŽŸ‚Ì4‚ÍŒ»Ý‚Ì—LŒøŒ…”(•\ަ‚æ‚èŽáб‘å‚«‚¢‚±‚Æ‚ª‚ ‚è‚Ü‚·)A
+ÅŒã‚̓IƒuƒWƒFƒNƒg‚ªŽæ‚蓾‚éő包”‚ɂȂè‚Ü‚·B
+</BLOCKQUOTE>
+<LI><B>**</B></LI><BLOCKQUOTE>
+a ‚Ì n æ‚ðŒvŽZ‚µ‚Ü‚·B‚Ž‚Í®”B<BR>
+c = a ** n<BR>
+Œ‹‰Ê‚Æ‚µ‚Ä c ‚Ì—LŒøŒ…‚Í a ‚Ì n ”{ˆÈã‚ɂȂé‚̂ŒˆÓB
+</BLOCKQUOTE>
+<LI><B>power</B></LI><BLOCKQUOTE>
+** ‚Æ“¯‚¶‚ÅAa ‚Ì n æ‚ðŒvŽZ‚µ‚Ü‚·B‚Ž‚Í®”B<BR>
+c = a.power(n)<BR>
+Œ‹‰Ê‚Æ‚µ‚Ä c ‚Ì—LŒøŒ…‚Í a ‚Ì n ”{ˆÈã‚ɂȂé‚̂ŒˆÓB
+</BLOCKQUOTE>
+<LI><B>sqrt</B></LI><BLOCKQUOTE>
+a‚Ì—LŒøŒ… n Œ…‚Ì•½•ûªin ‚Ì•½•ûª‚ł͂ ‚è‚Ü‚¹‚ñj‚ð
+ƒjƒ…[ƒgƒ“–@‚ÅŒvŽZ‚µ‚Ü‚·B<BR>
+c = a.sqrt(n)<BR>
+</BLOCKQUOTE>
+
+<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
+Úׂ͑Ήž‚·‚é Float ‚ÌŠeƒƒ\ƒbƒh‚ðŽQÆ‚µ‚ĉº‚³‚¢B
+</BLOCKQUOTE>
+
+<LI><B>&lt=&gt</B></LI><BLOCKQUOTE>
+a==b ‚È‚ç 0Aa &gt b ‚È‚ç 1Aa &lt b ‚È‚ç -1 ‚ɂȂè‚Ü‚·B<BR>
+c = a &lt=&gt b
+</BLOCKQUOTE>
+</UL>
+Œã‚ÍA“Ç‚ñ‚ÅŽš‚Ì”@‚­‚Å‚·B<BR>
+<UL>
+<LI><B>==</B></LI>
+<LI><B>===</B></LI>
+u==v‚Æ“¯‚¶‚Å‚·‚ª case •¶‚ÅŽg—p‚³‚ê‚Ü‚·B
+<LI><B>!=</B></LI>
+<LI><B>&lt</B></LI>
+<LI><B>&lt=</B></LI>
+<LI><B>&gt</B></LI>
+<LI><B>&gt=</B></LI>
+</UL>
+
+<H3>coerce‚ɂ‚¢‚Ä</H3>
+BigDecimal ƒIƒuƒWƒFƒNƒg‚ªŽZp‰‰ŽZŽq‚̶‚É‚ ‚邯‚«‚ÍABigDecimal ƒIƒuƒWƒFƒNƒg‚ª
+‰E‚É‚ ‚éƒIƒuƒWƒFƒNƒg‚ð(•K—v‚È‚ç) BigDecimal ‚ɕϊ·‚µ‚Ä‚©‚çŒvŽZ‚µ‚Ü‚·B
+]‚Á‚ÄABigDecimal ƒIƒuƒWƒFƒNƒgˆÈŠO‚Å‚à”’l‚ðˆÓ–¡‚·‚é‚à‚̂Ȃç‰E‚É’u‚¯‚Î
+‰‰ŽZ‚͉”\‚Å‚·B<BR>
+‚½‚¾‚µA•¶Žš—ñ‚Íi’Êíj”’l‚ÉŽ©“®•ÏŠ·‚·‚邱‚Ƃ͂ł«‚Ü‚¹‚ñB
+•¶Žš—ñ‚ð”’l‚ÉŽ©“®•ÏŠ·‚µ‚½‚¢ê‡‚Í bigfloat.c ‚Ì
+u/* #define ENABLE_NUMERIC_STRING */v‚̃Rƒƒ“ƒg‚ðŠO‚µ‚Ä‚©‚çA
+ăRƒ“ƒpƒCƒ‹AăCƒ“ƒXƒg[ƒ‹‚·‚é•K—v‚ª‚ ‚è‚Ü‚·B
+•¶Žš—ñ‚Å”’l‚ð—^‚¦‚éꇂ͒ˆÓ‚ª•K—v‚Å‚·B”’l‚ɕϊ·‚Å‚«‚È‚¢•¶Žš‚ª‚ ‚邯A
+’P‚ɕϊ·‚ðŽ~‚߂邾‚¯‚ŃGƒ‰[‚ɂ͂Ȃè‚Ü‚¹‚ñB"10XX"‚È‚ç‚P‚OA"XXXX"‚Í‚O
+‚ƈµ‚í‚ê‚Ü‚·B<BR>
+<CODE><PRE>
+ a = BigDecimal.E(20)
+ c = a * "0.123456789123456789123456789" # •¶Žš‚ð BigDecimal ‚ɕϊ·‚µ‚Ä‚©‚çŒvŽZ
+</PRE></CODE>
+–³ŒÀ‘å‚â”ñ”‚ð•\‚·•¶Žš‚Æ‚µ‚ÄA"Infinity"A"+Infinity"A"-Infinity"A"NaN"
+‚àŽg—p‚Å‚«‚Ü‚·(‘å•¶ŽšE¬•¶Žš‚ð‹æ•Ê‚µ‚Ü‚·)B‚½‚¾‚µAmode ƒƒ\ƒbƒh‚Å false ‚ð
+Žw’肵‚½ê‡‚Í—áŠO‚ª”­¶‚µ‚Ü‚·B
+<BR>
+‚Ü‚½ABigDecimalƒNƒ‰ƒX‚Í coerceiRuby–{ŽQÆj‚ðƒTƒ|[ƒg‚µ‚Ä‚¢‚Ü‚·B
+]‚Á‚ÄABigDecimal ƒIƒuƒWƒFƒNƒg‚ª‰E‚É‚ ‚éꇂà‘å’ï‚Í‘åä•v‚Å‚·B
+‚½‚¾AŒ»Ý‚Ì Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚ÌŽd—lãA•¶Žš—ñ‚ª¶‚É‚ ‚邯ŒvŽZ‚Å‚«‚Ü‚¹‚ñB<BR>
+<CODE><PRE>
+ a = BigDecimal.E(20)
+ c = "0.123456789123456789123456789" * a # ƒGƒ‰[
+</PRE></CODE>
+•K—v«‚ª‚ ‚邯‚ÍŽv‚¢‚Ü‚¹‚ñ‚ªA‚Ç‚¤‚µ‚Ä‚à‚ÆŒ¾‚¤l‚Í
+ String ƒIƒuƒWƒFƒNƒg‚ðŒp³‚µ‚½V‚½‚ȃNƒ‰ƒX‚ð쬂µ‚Ä‚©‚çA
+‚»‚̃Nƒ‰ƒX‚Å coerce ‚ðƒTƒ|[ƒg‚µ‚Ä‚­‚¾‚³‚¢B
+
+<hr>
+<A NAME="#UNDEF">
+<H2>–³ŒÀA”ñ”Aƒ[ƒ‚̈µ‚¢</H2>
+u–³ŒÀv‚Ƃ͕\Œ»‚Å‚«‚È‚¢‚­‚ç‚¢‘å‚«‚È”‚Å‚·B“Á•ʂɈµ‚¤‚½‚ß‚É
+ +Infinityi³‚Ì–³ŒÀ‘åj‚â -Infinityi•‰‚Ì–³ŒÀ‘åj‚Æ‚¢‚¤
+‚悤‚É•\‹L‚³‚ê‚Ü‚·B
+–³ŒÀ‚Í 1.0/0.0 ‚̂悤‚Ƀ[ƒ‚ÅŠ„‚邿‚¤‚ÈŒvŽZ‚ð‚µ‚½‚Æ‚«‚ɶ¬‚³‚ê‚Ü‚·B
+<BR><BR>
+u”ñ”v‚Í 0.0/0.0 ‚â Infinity-Infinity “™‚ÌŒ‹‰Ê‚ª’è‹`‚Å‚«‚È‚¢
+ŒvŽZ‚ð‚µ‚½‚Æ‚«‚ɶ¬‚³‚ê‚Ü‚·B”ñ”‚Í NaNiNot a Numberj‚Æ•\‹L‚³‚ê‚Ü‚·B
+NaN ‚ðŠÜ‚ÞŒvŽZ‚Í‘S‚Ä NaN ‚ɂȂè‚Ü‚·B‚Ü‚½ NaN ‚ÍŽ©•ª‚àŠÜ‚ß‚ÄA‚Ç‚ñ‚È”
+‚Æ‚àˆê’v‚µ‚Ü‚¹‚ñB
+<BR><BR>
+ƒ[ƒ‚Í +0.0 ‚Æ -0.0 ‚ª‘¶Ý‚µ‚Ü‚·B‚½‚¾‚µA+0.0==-0.0 ‚Í true ‚Å‚·B
+<BR><BR>
+InfinityANaNA +0.0 ‚Æ -0.0 “™‚ðŠÜ‚ñ‚¾ŒvŽZŒ‹‰Ê‚Í‘g‚݇‚킹‚É
+‚æ‚è•¡ŽG‚Å‚·B‹»–¡‚Ì‚ ‚él‚ÍAˆÈ‰º‚̃vƒƒOƒ‰ƒ€‚ðŽÀs‚µ‚ÄŒ‹‰Ê‚ð
+Šm”F‚µ‚Ä‚­‚¾‚³‚¢iŒ‹‰Ê‚ɂ‚¢‚ÄA‹^–â‚âŠÔˆá‚¢‚ð”­Œ©‚³‚ꂽ•û‚Í
+‚¨’m‚点Šè‚¢‚Ü‚·jB
+
+<PRE>
+<CODE>
+require "bigdecimal"
+
+aa = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+ba = %w(1 -1 +0.0 -0.0 +Infinity -Infinity NaN)
+opa = %w(+ - * / <=> > >= < == != <=)
+
+for a in aa
+ for b in ba
+ for op in opa
+ x = BigDecimal::new(a)
+ y = BigDecimal::new(b)
+ eval("ans= x #{op} y;print a,' ',op,' ',b,' ==> ',ans.to_s,\"\n\"")
+ end
+ end
+end
+</CODE>
+</PRE>
+
+<hr>
+<A NAME="#STRUCT">
+<H2>“à•”\‘¢</H2>
+BigDecimal“à•”‚Å•‚“®¬”“_‚Í\‘¢‘Ì(Real)‚Å•\Œ»‚³‚ê‚Ü‚·B
+‚»‚Ì‚¤‚¿‰¼”•”‚Í unsigned long ‚Ì”z—ñ(ˆÈ‰º‚Ì\‘¢‘Ì—v‘ffrac)‚ÅŠÇ—‚³‚ê‚Ü‚·B
+ŠT”O“I‚É‚ÍAˆÈ‰º‚̂悤‚ɂȂè‚Ü‚·B<BR><BR>
+ <•‚“®¬”“_”> = 0.xxxxxxxxx*BASE**n<BR><BR>
+‚±‚±‚ÅAx‚͉¼”•”‚ð•\‚·”ŽšABASE‚ÍŠî”i‚P‚Oi‚È‚ç‚P‚OjAn‚ÍŽw”•”‚ð•\‚·
+®”’l‚Å‚·BBASE‚ª‘å‚«‚¢‚Ù‚ÇA‘å‚«‚È”’l‚ª•\Œ»‚Å‚«‚Ü‚·B‚‚܂èA”z—ñ‚̃TƒCƒY‚ð
+­‚È‚­‚Å‚«‚Ü‚·BBASE‚͑傫‚¢‚Ù‚Ç“s‡‚ª‚æ‚¢‚킯‚Å‚·‚ªAƒfƒoƒbƒO‚Ì‚â‚è‚â‚·‚³‚Ȃǂð
+l—¶‚µ‚ÄA10000‚ɂȂÁ‚Ä‚¢‚Ü‚·iBASE‚ÍVpInit()ŠÖ”‚ÅŽ©“®“I‚ÉŒvŽZ‚µ‚Ü‚·jB
+‚±‚ê‚ÍA32ƒrƒbƒg®”‚Ìꇂł·B64ƒrƒbƒg®”‚Ìꇂ͂à‚Á‚Ƒ傫‚È’l‚ɂȂè‚Ü‚·B
+Žc”O‚È‚ª‚çA64ƒrƒbƒg®”‚ł̃eƒXƒg‚͂܂¾‚â‚Á‚Ä‚¢‚Ü‚¹‚ñi‚à‚µA‚â‚ç‚ꂽ•û‚ª‚¢‚ê‚Î
+Œ‹‰Ê‚ð‹³‚¦‚Ä‚¢‚½‚¾‚¯‚ê‚΂ ‚肪‚½‚¢‚Å‚·jB
+BASE‚ª10000‚̂Ƃ«‚ÍAˆÈ‰º‚̉¼”•”‚Ì”z—ñ(frac)‚ÌŠe—v‘f‚É‚ÍÅ‘å‚Å‚SŒ…‚Ì
+”Žš‚ªŠi”[‚³‚ê‚Ü‚·B<BR><BR>
+•‚“®¬”“_\‘¢‘Ì(Real)‚͈ȉº‚̂悤‚ɂȂÁ‚Ä‚¢‚Ü‚·B
+<BR>
+<CODE><PRE>
+ typedef struct {
+ unsigned long MaxPrec; // ő帓x(frac[]‚Ì”z—ñƒTƒCƒY)
+ unsigned long Prec; // ¸“x(frac[]‚ÌŽg—pƒTƒCƒY)
+ short sign; // ˆÈ‰º‚̂悤‚É•„†“™‚Ìó‘Ô‚ð’è‹`‚µ‚Ü‚·B
+ // ==0 : NaN
+ // 1 : +0
+ // -1 : -0
+ // 2 : ³‚Ì’l
+ // -2 : •‰‚Ì’l
+ // 3 : +Infinity
+ // -3 : -Infinity
+ unsigned short flag; // ŠeŽí‚̧Œäƒtƒ‰ƒbƒO
+ int exponent; // Žw”•”‚Ì’l(‰¼”•”*BASE**exponent)
+ unsigned long frac[1]; // ‰¼”•”‚Ì”z—ñ(‰Â•Ï)
+ } Real;
+</CODE></PRE>
+—Ⴆ‚Î 1234.56784321 ‚Æ‚¢‚¤”Žš‚Í(BASE=10000‚È‚ç)<BR>
+<PRE>
+ 0.1234 5678 4321*(10000)**1
+</PRE>
+‚Å‚·‚©‚ç frac[0]=1234Afrac[1]=5678Afrac[2]=4321A
+Prec=3Asign=2Aexponent=1 ‚ƂȂè‚Ü‚·BMaxPrec‚Í
+Prec ‚æ‚è‘å‚«‚¯‚ê‚΂¢‚­‚Â‚Å‚à‚©‚Ü‚¢‚Ü‚¹‚ñBflag ‚Ì
+Žg—p•û–@‚ÍŽÀ‘•‚Ɉˑ¶‚µ‚Ä“à•”‚ÅŽg—p‚³‚ê‚Ü‚·B
+
+<hr>
+<A NAME="#BASE">
+<H2>2i‚Æ10i</H2>
+BigDecimal ‚Í <•‚“®¬”“_”> = 0.xxxxxxxxx*10**n ‚Æ‚¢‚¤10iŒ`Ž®‚Å”’l‚ð•ÛŽ‚µ‚Ü‚·B
+‚µ‚©‚µAŒvŽZ‹@‚Ì•‚“®¬”“_”‚Ì“à•”•\Œ»‚ÍAŒ¾‚¤‚܂łà‚È‚­ <•‚“®¬”“_”> = 0.bbbbbbbb*2**n ‚Æ‚¢‚¤
+2iŒ`Ž®‚ª•’ʂł·(x ‚Í 0 ‚©‚ç 9 ‚Ü‚ÅAb ‚Í 0 ‚© 1 ‚Ì”Žš)B
+BigDecimal ‚ª‚È‚º10i‚Ì“à•”•\Œ»Œ`Ž®‚ðÌ—p‚µ‚½‚Ì‚©‚ðˆÈ‰º‚Éà–¾‚µ‚Ü‚·B
+<H4>10i‚̃ƒŠƒbƒg</H4>
+<DL>
+<DT>ƒfƒoƒbƒO‚Ì‚µ‚â‚·‚³
+<DD>‚Ü‚¸AƒvƒƒOƒ‰ƒ€ì¬‚ªŠy‚Å‚·Bfrac[0]=1234Afrac[1]=5678Afrac[2]=4321A
+exponent=1Asign=2 ‚Ȃ甒l‚ª 1234.56784321 ‚Å‚ ‚é‚̂͌©‚ê‚Î’¼‚®‚É•ª‚©‚è‚Ü‚·B
+
+<DT>10i•\‹L‚³‚ꂽ”’l‚È‚çŠmŽÀ‚É“à•”•\Œ»‚ɕϊ·‚Å‚«‚é
+<DD>—Ⴆ‚ÎAˆÈ‰º‚̂悤‚ȃvƒƒOƒ‰ƒ€‚Í‘S‚­Œë·–³‚µ‚Å
+ŒvŽZ‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·BˆÈ‰º‚Ì—á‚ÍAˆês‚Ɉê‚‚̔’l
+‚ª‘‚¢‚Ä‚ ‚éƒtƒ@ƒCƒ‹ file ‚̇Œv”’l‚ð‹‚ß‚é‚à‚̂ł·B
+<CODE><PRE>
+ file = File::open(....,"r")
+ s = BigDecimal::new("0")
+ while line = file.gets
+ s = s + line
+ end
+</PRE></CODE>
+‚±‚Ì—á‚ð2i”‚Å‚â‚邯Œë·‚ª“ü‚螂މ”\«‚ª‚ ‚è‚Ü‚·B
+—Ⴆ‚Î 0.1 ‚ð2i‚Å•\Œ»‚·‚邯 0.1 = b1*2**(-1)+b1*2**(-2)+b3*2**(-3)+b4*2**(-4)....
+‚Æ–³ŒÀ‚É‘±‚¢‚Ä‚µ‚Ü‚¢‚Ü‚·(b1=0,b2=0,b3=0,b4=1...)B‚±‚±‚Å bn(n=1,2,3,...) ‚Í
+2i‚ð•\Œ»‚·‚é 0 ‚© 1 ‚Ì”Žš—ñ‚Å‚·B]‚Á‚ÄA‚Ç‚±‚©‚őł¿Ø‚é•K—v‚ª‚ ‚è‚Ü‚·B
+‚±‚±‚ŕϊ·Œë·‚ª“ü‚è‚Ü‚·B‚à‚¿‚ë‚ñA‚±‚ê‚ðÄ“x10i•\‹L‚É‚µ‚Ĉóü‚·‚邿‚¤‚È
+ꇂ͓K؂Ȋۂߑ€ìiŽlŽÌŒÜ“üj‚É‚æ‚Á‚ÄÄ‚Ñ "0.1" ‚Æ•\ަ‚³‚ê‚Ü‚·B‚µ‚©‚µA
+“à•”‚łͳŠm‚È 0.1 ‚ł͂ ‚è‚Ü‚¹‚ñB
+
+<DT>—LŒøŒ…”‚Í—LŒÀ‚Å‚ ‚éi‚‚܂莩“®Œˆ’è‚Å‚«‚éj
+<DD>0.1 ‚ð•\Œ»‚·‚邽‚߂̗̈æ‚Í‚½‚Á‚½ˆê‚‚̔z—ñ—v‘fi frac[0]=1 j‚Åς݂܂·B
+”z—ñ—v‘f‚Ì”‚Í10i”’l‚©‚玩“®“I‚ÉŒˆ’è‚Å‚«‚Ü‚·B‚±‚ê‚ÍA‰Â•Ï’·•‚“®¬”“_‰‰ŽZ‚Å‚Í
+‘厖‚È‚±‚Ƃł·B‹t‚É 0.1 ‚ð2i•\Œ»‚µ‚½‚Æ‚«‚É‚Í2i‚Ì—LŒøŒ…‚ð‚¢‚­‚‚ɂ·‚é‚Ì‚© 0.1 ‚ð
+Œ©‚½‚¾‚¯‚ł͌ˆ’è‚Å‚«‚Ü‚¹‚ñB
+</DL>
+
+<H3>10i‚̃fƒƒŠƒbƒg</H3>
+ŽÀ‚Í¡‚܂ł̃ƒŠƒbƒg‚ÍA‚»‚̂܂܃fƒƒŠƒbƒg‚É‚à‚È‚è‚Ü‚·B
+‚»‚à‚»‚àA10i‚ð2i‚ɕϊ·‚·‚邿‚¤‚È‘€ì‚͕ϊ·Œë·
+‚𔺂¤ê‡‚ð‰ñ”ð‚·‚é‚±‚Ƃ͂ł«‚Ü‚¹‚ñB
+‘åŠT‚̃Rƒ“ƒsƒ…[ƒ^‚Í10i‚Ì“à•”•\Œ»‚ðŽ‚Á‚Ä‚¢‚È‚¢‚Ì‚ÅA
+BigDecimal ‚ð—˜—p‚µ‚Č뷖³‚µ‚ÌŒvŽZ‚ð‚·‚éꇂÍAŒvŽZ‘¬“x
+‚𖳎‹‚µ‚Ä‚àÅŒã‚܂ŠBigDecimal ‚ðŽg—p‘±‚¯‚é•K—v‚ª‚ ‚è‚Ü‚·B
+
+<H3>ʼn‚͉½‚©H</H3>
+Ž©•ª‚ÅŒvŽZ‚·‚邯‚«‚ɂ킴‚í‚´2i”‚ðŽg‚¤l‚͋ɂ߂Ă܂ê‚Å‚·B
+ŒvŽZ‹@‚Ƀf[ƒ^‚ð“ü—Í‚·‚邯‚«‚à‚Ù‚Æ‚ñ‚Ç‚Ìê‡A
+10i”‚Å“ü—Í‚µ‚Ü‚·B‚»‚ÌŒ‹‰ÊAdouble “™‚ÌŒvŽZ‹@“à•”
+•\Œ»‚Íʼn‚©‚çŒë·‚ª“ü‚Á‚Ä‚¢‚éꇂª‚ ‚è‚Ü‚·B
+BigDecimal ‚̓†[ƒU“ü—Í‚ðŒë·–³‚µ‚ÅŽæ‚螂ނ±‚Æ‚ª‚Å‚«‚Ü‚·B
+ƒfƒoƒbƒO‚ª‚µ‚â‚·‚¢‚Ì‚ÆAƒf[ƒ^“ǂ݂±‚ÝŽž‚Ɍ뷂ª“ü‚ç‚È‚¢
+‚Æ‚¢‚¤‚Ì‚ªŽÀۂ̃ƒŠƒbƒg‚Å‚·B
+
+<hr>
+<A NAME="#PREC">
+<H2>ŒvŽZ¸“x‚ɂ‚¢‚Ä</H2>
+c = a op b ‚Æ‚¢‚¤ŒvŽZ(op ‚Í + - * /)‚ð‚µ‚½‚Æ‚«‚Ì“®ì‚Í
+ˆÈ‰º‚̂悤‚ɂȂè‚Ü‚·B<BR><BR>
+‚PDæŽZ‚Í(a ‚Ì—LŒøŒ…”)+(b ‚Ì—LŒøŒ…”)A
+œŽZ‚Í(a ‚ÌÅ‘å—LŒøŒ…”)+(b ‚ÌÅ‘å—LŒøŒ…”)•ª‚Ìő包”iŽÀÛ‚ÍA—]—T‚ðŽ‚Á‚ÄA
+‚à‚¤­‚µ‘å‚«‚­‚È‚è‚Ü‚·j‚ðŽ‚Â•Ï” c ‚ðV‚½‚ɶ¬‚µ‚Ü‚·B
+‰ÁŒ¸ŽZ‚ÌꇂÍAŒë·‚ªo‚È‚¢‚¾‚¯‚̸“x‚ðŽ‚Â c ‚𶬂µ‚Ü‚·B—Ⴆ‚Î
+ c = 0.1+0.1*10**(-100) ‚̂悤‚Èê‡Ac ‚̸“x‚Í‚P‚O‚OŒ…ˆÈã‚̸“x‚ð
+Ž‚Â‚æ‚¤‚ɂȂè‚Ü‚·B
+<BR><BR>
+‚QDŽŸ‚É c = a op b ‚ÌŒvŽZ‚ðŽÀs‚µ‚Ü‚·B<BR><BR>
+‚±‚̂悤‚ÉA‰ÁŒ¸ŽZ‚ÆæŽZ‚Å‚Ì c ‚Í•K‚¸uŒë·‚ªo‚È‚¢v‚¾‚¯‚̸“x‚ð
+Ž‚Á‚ͬ‚³‚ê‚Ü‚·(BigDecimal.limit ‚ðŽw’肵‚È‚¢ê‡)B
+œŽZ‚Í(a ‚ÌÅ‘å—LŒøŒ…”)+(b ‚ÌÅ‘å—LŒøŒ…”)•ª‚Ìő包”
+‚ðŽ‚Â c ‚ª¶¬‚³‚ê‚Ü‚·‚ªAc = 1.0/3.0 ‚̂悤‚ÈŒvŽZ‚Å–¾‚ç‚©‚Ȃ悤‚ÉA
+ c ‚Ìő帓x‚ð’´‚¦‚邯‚±‚ë‚ÅŒvŽZ‚ª‘Å‚¿Ø‚ç‚ê‚éꇂª‚ ‚è‚Ü‚·B<BR><BR>
+‚¢‚¸‚ê‚É‚¹‚æAc ‚Ìő帓x‚Í a ‚â b ‚æ‚è‘å‚«‚­‚È‚è‚Ü‚·‚̂Šc ‚ª•K—v‚Æ‚·‚é
+ƒƒ‚ƒŠ[—̈æ‚͑傫‚­‚Ȃ邱‚ƂɒˆÓ‚µ‚ĉº‚³‚¢B
+<BR><BR>
+’ˆÓFu+,-,*,/v‚ł͌‹‰Ê‚̸“xi—LŒøŒ…”j‚ðŽ©•ª‚ÅŽw’è‚Å‚«‚Ü‚¹‚ñB
+¸“x‚ðƒRƒ“ƒgƒ[ƒ‹‚µ‚½‚¢ê‡‚ÍAˆÈ‰º‚̃Cƒ“ƒXƒ^ƒ“ƒXƒƒ\ƒbƒh‚ðŽg—p‚µ‚Ü‚·B<BR>
+<UL>
+<LI>add,sub,mult,div</LI><BLOCKQUOTE>
+‚±‚ê‚ç‚̃ƒ\ƒbƒh‚Íæ“ª(Ŷ)‚Ì”Žš‚©‚ç‚ÌŒ…”‚ðŽw’è‚Å‚«‚Ü‚·B
+<CODE><PRE>
+ BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
+</PRE></CODE>
+</BLOCKQUOTE>
+<LI>truncate,round,ceil,floor</LI><BLOCKQUOTE>
+‚±‚ê‚ç‚̃ƒ\ƒbƒh‚ͬ”“_‚©‚ç‚Ì‘Š‘ÎˆÊ’u‚ðŽw’肵‚ÄŒ…”‚ðŒˆ’è‚µ‚Ü‚·B
+<CODE><PRE>
+ BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
+</PRE></CODE>
+</BLOCKQUOTE>
+</UL>
+<H3>Ž©•ª‚Ÿ“x‚ðƒRƒ“ƒgƒ[ƒ‹‚µ‚½‚¢ê‡</H3>
+Ž©•ª‚Ÿ“x(—LŒøŒ…”)‚ðƒRƒ“ƒgƒ[ƒ‹‚µ‚½‚¢ê‡‚Í addAsubAmultAdiv “™‚̃ƒ\ƒbƒh
+‚ªŽg—p‚Å‚«‚Ü‚·B
+ˆÈ‰º‚̉~Žü—¦‚ðŒvŽZ‚·‚éƒvƒƒOƒ‰ƒ€—á‚̂悤‚ÉA
+‹‚߂錅”‚ÍŽ©•ª‚ÅŽw’è‚·‚邱‚Æ‚ª‚Å‚«‚Ü‚·B
+<BR><BR>
+<CODE><PRE>
+#!/usr/local/bin/ruby
+
+require "bigdecimal"
+#
+# Calculates 3.1415.... (the number of times that a circle's diameter
+# will fit around the circle) using J. Machin's formula.
+#
+def big_pi(sig) # sig: Number of significant figures
+ exp = -sig
+ pi = BigDecimal::new("0")
+ two = BigDecimal::new("2")
+ m25 = BigDecimal::new("-0.04")
+ m57121 = BigDecimal::new("-57121")
+
+ u = BigDecimal::new("1")
+ k = BigDecimal::new("1")
+ w = BigDecimal::new("1")
+ t = BigDecimal::new("-80")
+ while (u.nonzero? && u.exponent >= exp)
+ t = t*m25
+ u = t.div(k,sig)
+ pi = pi + u
+ k = k+two
+ end
+
+ u = BigDecimal::new("1")
+ k = BigDecimal::new("1")
+ w = BigDecimal::new("1")
+ t = BigDecimal::new("956")
+ while (u.nonzero? && u.exponent >= exp )
+ t = t.div(m57121,sig)
+ u = t.div(k,sig)
+ pi = pi + u
+ k = k+two
+ end
+ pi
+end
+
+if $0 == __FILE__
+ if ARGV.size == 1
+ print "PI("+ARGV[0]+"):\n"
+ p big_pi(ARGV[0].to_i)
+ else
+ print "TRY: ruby pi.rb 1000 \n"
+ end
+end
+
+</PRE></CODE>
+<HR>
+<FONT size=2>
+<I>
+<A HREF="http://www.tinyforest.gr.jp">
+¬—Ñ –ΗY
+</A>
+(E-Mail:<A HREF="mailto:shigeo@tinyforest.gr.jp">&ltshigeo@tinyforest.gr.jp&gt</U></A>)
+</I>
+</FONT>
+</TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
index d6be3e584e..0c8b98e4a3 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,6 +1,10 @@
require 'mkmf'
-have_func("labs", "stdlib.h")
-have_func("llabs", "stdlib.h")
+base_fig = 0
+src = "(BASE * (BASE+1)) / BASE == (BASE+1)"
+while try_static_assert(src, nil, "-DBASE=10#{'0'*base_fig}UL")
+ base_fig += 1
+end
+$defs << "-DBASE=1#{'0'*base_fig}UL" << "-DBASE_FIG=#{base_fig}"
create_makefile('bigdecimal')
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index a416e06832..e4420df158 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -11,7 +11,7 @@
#
# f.zero:: returns 0.0
# f.one:: returns 1.0
-# f.two:: returns 2.0
+# f.two:: returns 1.0
# f.ten:: returns 10.0
#
# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
@@ -23,7 +23,7 @@
module Jacobian
module_function
- # Determines the equality of two numbers by comparing to zero, or using the epsilon value
+ #--
def isEqual(a,b,zero=0.0,e=1.0e-8)
aa = a.abs
bb = b.abs
@@ -37,7 +37,7 @@ module Jacobian
end
end
end
-
+ #++
# Computes the derivative of f[i] at x[i].
# fx is the value of f at x.
@@ -53,8 +53,7 @@ module Jacobian
until ok>0 do
s = f.zero
deriv = []
- nRetry += 1
- if nRetry > 100
+ if(nRetry>100) then
raise "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
end
dx = dx*f.two
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index 16cf9c8731..41fc69f66c 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -7,6 +7,8 @@ require 'bigdecimal'
# sin (x, prec)
# cos (x, prec)
# atan(x, prec) Note: |x|<1, x=0.9999 may not converge.
+# exp (x, prec)
+# log (x, prec)
# PI (prec)
# E (prec) == exp(1.0,prec)
#
@@ -144,6 +146,74 @@ module BigMath
y
end
+ # 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.
+ #
+ # BigMath::exp(BigDecimal.new('1'), 10).to_s
+ # -> "0.271828182845904523536028752390026306410273E1"
+ def exp(x, prec)
+ raise ArgumentError, "Zero or negative precision for exp" if prec <= 0
+ return BigDecimal("NaN") if x.infinite? || x.nan?
+ n = prec + BigDecimal.double_fig
+ one = BigDecimal("1")
+ x = -x if neg = x < 0
+ x1 = one
+ y = one
+ d = y
+ z = one
+ i = 0
+ while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+ m = BigDecimal.double_fig if m < BigDecimal.double_fig
+ x1 = x1.mult(x,n)
+ i += 1
+ z *= i
+ d = x1.div(z,m)
+ y += d
+ end
+ if neg
+ one.div(y, prec)
+ else
+ y.round(prec - y.exponent)
+ end
+ end
+
+ # Computes the natural logarithm of x to the specified number of digits
+ # of precision.
+ #
+ # Returns x if x is infinite or NaN.
+ #
+ def log(x, prec)
+ raise ArgumentError, "Zero or negative argument for log" if x <= 0 || prec <= 0
+ return x if x.infinite? || x.nan?
+ one = BigDecimal("1")
+ two = BigDecimal("2")
+ n = prec + BigDecimal.double_fig
+ if (expo = x.exponent) < 0 || expo >= 3
+ x = x.mult(BigDecimal("1E#{-expo}"), n)
+ else
+ expo = nil
+ end
+ x = (x - one).div(x + one,n)
+ x2 = x.mult(x,n)
+ y = x
+ d = y
+ i = one
+ while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
+ m = BigDecimal.double_fig if m < BigDecimal.double_fig
+ x = x2.mult(x,n)
+ i += two
+ d = x.div(i,m)
+ y += d
+ end
+ y *= two
+ if expo
+ y += log(BigDecimal("10"),prec) * BigDecimal(expo.to_s)
+ end
+ y
+ end
+
# Computes the value of pi to the specified number of digits of precision.
def PI(prec)
raise ArgumentError, "Zero or negative argument for PI" if prec <= 0
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index 1110652801..96defc3c06 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -18,7 +18,7 @@ require "bigdecimal/jacobian"
#
# f.zero:: returns 0.0
# f.one:: returns 1.0
-# f.two:: returns 2.0
+# f.two:: returns 1.0
# f.ten:: returns 10.0
#
# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 4c8fc07b7d..474266476f 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,106 +1,53 @@
-class Integer < Numeric
- # call-seq:
- # int.to_d -> bigdecimal
- #
- # Convert +int+ to a BigDecimal and return it.
- #
- # require 'bigdecimal'
- # require 'bigdecimal/util'
- #
- # 42.to_d
- # # => #<BigDecimal:1008ef070,'0.42E2',9(36)>
- #
- def to_d
- BigDecimal(self)
- end
-end
-
+#
+# BigDecimal utility library.
+#
+# To use these functions, require 'bigdecimal/util'
+#
+# The following methods are provided to convert other types to BigDecimals:
+#
+# String#to_d -> BigDecimal
+# Float#to_d -> BigDecimal
+# Rational#to_d -> BigDecimal
+#
+# The following method is provided to convert BigDecimals to other types:
+#
+# BigDecimal#to_r -> Rational
+#
+# ----------------------------------------------------------------------
+#
class Float < Numeric
- # call-seq:
- # flt.to_d -> bigdecimal
- #
- # Convert +flt+ to a BigDecimal and return it.
- #
- # require 'bigdecimal'
- # require 'bigdecimal/util'
- #
- # 0.5.to_d
- # # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
- #
- def to_d(precision=nil)
- BigDecimal(self, precision || Float::DIG+1)
+ def to_d
+ BigDecimal(self.to_s)
end
end
class String
- # call-seq:
- # string.to_d -> bigdecimal
- #
- # Convert +string+ to a BigDecimal and return it.
- #
- # require 'bigdecimal'
- # require 'bigdecimal/util'
- #
- # "0.5".to_d
- # # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
- #
def to_d
BigDecimal(self)
end
end
class BigDecimal < Numeric
- # call-seq:
- # a.to_digits -> string
- #
# Converts a BigDecimal to a String of the form "nnnnnn.mmm".
# This method is deprecated; use BigDecimal#to_s("F") instead.
- #
- # require 'bigdecimal'
- # require 'bigdecimal/util'
- #
- # d = BigDecimal.new("3.14")
- # d.to_digits
- # # => "3.14"
def to_digits
if self.nan? || self.infinite? || self.zero?
self.to_s
else
i = self.to_i.to_s
- _,f,_,z = self.frac.split
+ s,f,y,z = self.frac.split
i + "." + ("0"*(-z)) + f
end
end
-
- # call-seq:
- # a.to_d -> bigdecimal
- #
- # Returns self.
- def to_d
- self
- end
end
class Rational < Numeric
- # call-seq:
- # r.to_d(precision) -> bigdecimal
- #
- # Converts a Rational to a BigDecimal.
- #
- # The required +precision+ parameter is used to determine the amount of
- # significant digits for the result. See BigDecimal#div for more information,
- # as it is used along with the #denominator and the +precision+ for
- # parameters.
- #
- # r = (22/7.0).to_r
- # # => (7077085128725065/2251799813685248)
- # r.to_d(3)
- # # => #<BigDecimal:1a44d08,'0.314E1',18(36)>
- def to_d(precision)
- if precision <= 0
- raise ArgumentError, "negative precision"
+ # Converts a Rational to a BigDecimal
+ def to_d(nFig=0)
+ num = self.numerator.to_s
+ if nFig<=0
+ nFig = BigDecimal.double_fig*2+1
end
- num = self.numerator
- BigDecimal(num).div(self.denominator, precision)
+ BigDecimal.new(num).div(self.denominator,nFig)
end
end
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
index d2cdb357e0..145be1834d 100644
--- a/ext/coverage/coverage.c
+++ b/ext/coverage/coverage.c
@@ -9,9 +9,10 @@
************************************************/
#include "ruby.h"
-#include "vm_core.h"
-static VALUE rb_coverages = Qundef;
+extern VALUE rb_get_coverages(void);
+extern void rb_set_coverages(VALUE);
+extern void rb_reset_coverages(void);
/*
* call-seq:
@@ -23,25 +24,19 @@ static VALUE
rb_coverage_start(VALUE klass)
{
if (!RTEST(rb_get_coverages())) {
- if (rb_coverages == Qundef) {
- rb_coverages = rb_hash_new();
- RBASIC(rb_coverages)->klass = 0;
- }
- rb_set_coverages(rb_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 h)
+coverage_result_i(st_data_t key, st_data_t val, st_data_t dummy)
{
- VALUE path = (VALUE)key;
VALUE coverage = (VALUE)val;
- VALUE coverages = (VALUE)h;
- coverage = rb_ary_dup(coverage);
- rb_ary_clear((VALUE)val);
+ RBASIC(coverage)->klass = rb_cArray;
rb_ary_freeze(coverage);
- rb_hash_aset(coverages, path, coverage);
return ST_CONTINUE;
}
@@ -56,14 +51,14 @@ static VALUE
rb_coverage_result(VALUE klass)
{
VALUE coverages = rb_get_coverages();
- VALUE ncoverages = rb_hash_new();
if (!RTEST(coverages)) {
rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
}
- st_foreach(RHASH_TBL(coverages), coverage_result_i, ncoverages);
- rb_hash_freeze(ncoverages);
+ RBASIC(coverages)->klass = rb_cHash;
+ st_foreach(RHASH_TBL(coverages), coverage_result_i, 0);
+ rb_hash_freeze(coverages);
rb_reset_coverages();
- return ncoverages;
+ return coverages;
}
/* Coverage provides coverage measurement feature for Ruby.
@@ -71,13 +66,11 @@ rb_coverage_result(VALUE klass)
*
* = 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. A coverage array gives, for each line, the
- * number of line execution by the interpreter. A +nil+ value means
- * coverage is disabled for this line (lines like +else+ and +end+).
+ * (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
*
@@ -105,5 +98,4 @@ 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);
- rb_gc_register_address(&rb_coverages);
}
diff --git a/ext/coverage/extconf.rb b/ext/coverage/extconf.rb
index cf10ca89c5..3ebced54a6 100644
--- a/ext/coverage/extconf.rb
+++ b/ext/coverage/extconf.rb
@@ -1,3 +1,2 @@
require 'mkmf'
-$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
create_makefile('coverage')
diff --git a/ext/curses/.cvsignore b/ext/curses/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/curses/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 88b1bdb3aa..7f68b2186a 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -11,14 +11,10 @@
*
* maintainers:
* - Takaaki Tateishi (ttate@kt.jaist.ac.jp)
- *
- * doumentation:
- * - Vincent Batts (vbatts@hashbangbash.com)
*/
#include "ruby.h"
#include "ruby/io.h"
-#include "ruby/thread.h"
#if defined(HAVE_NCURSES_H)
# include <ncurses.h>
@@ -64,7 +60,6 @@
static VALUE mCurses;
static VALUE mKey;
static VALUE cWindow;
-static VALUE cPad;
#ifdef USE_MOUSE
static VALUE cMouseEvent;
#endif
@@ -75,6 +70,8 @@ struct windata {
WINDOW *window;
};
+#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);
@@ -88,34 +85,18 @@ no_window(void)
#define GetWINDOW(obj, winp) do {\
if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
- TypedData_Get_Struct((obj), struct windata, &windata_type, (winp));\
- if ((winp)->window == 0) no_window();\
+ Data_Get_Struct(obj, struct windata, winp);\
+ if (winp->window == 0) no_window();\
} while (0)
static void
-window_free(void *p)
+free_window(struct windata *winp)
{
- struct windata *winp = p;
if (winp->window && winp->window != stdscr) delwin(winp->window);
winp->window = 0;
xfree(winp);
}
-static size_t
-window_memsize(const void *p)
-{
- const struct windata *winp = p;
- size_t size = sizeof(*winp);
- if (!winp) return 0;
- if (winp->window && winp->window != stdscr) size += sizeof(winp->window);
- return size;
-}
-
-static const rb_data_type_t windata_type = {
- "windata",
- {0, window_free, window_memsize,}
-};
-
static VALUE
prep_window(VALUE class, WINDOW *window)
{
@@ -127,7 +108,7 @@ prep_window(VALUE class, WINDOW *window)
}
obj = rb_obj_alloc(class);
- TypedData_Get_Struct(obj, struct windata, &windata_type, winp);
+ Data_Get_Struct(obj, struct windata, winp);
winp->window = window;
return obj;
@@ -135,13 +116,7 @@ prep_window(VALUE class, WINDOW *window)
/*-------------------------- module Curses --------------------------*/
-/*
- * Document-method: Curses.init_screen
- *
- * Initialize a standard screen
- *
- * see also Curses.stdscr
- */
+/* def init_screen */
static VALUE
curses_init_screen(void)
{
@@ -156,31 +131,10 @@ curses_init_screen(void)
return rb_stdscr;
}
-/*
- * Document-method: Curses.stdscr
- *
- * The Standard Screen.
- *
- * Upon initializing curses, a default window called stdscr,
- * which is the size of the terminal screen, is created.
- *
- * Many curses functions use this window.
- */
+/* def stdscr */
#define curses_stdscr curses_init_screen
-/*
- * Document-method: Curses.close_screen
- *
- * A program should always call Curses.close_screen before exiting or
- * escaping from curses mode temporarily. This routine
- * restores tty modes, moves the cursor to the lower
- * left-hand corner of the screen and resets the terminal
- * into the proper non-visual mode.
- *
- * Calling Curses.refresh or Curses.doupdate after a temporary
- * escape causes the program to resume visual mode.
- *
- */
+/* def close_screen */
static VALUE
curses_close_screen(void)
{
@@ -193,13 +147,6 @@ curses_close_screen(void)
return Qnil;
}
-/*
- * This is no runtime method,
- * but a function called before the proc ends
- *
- * Similar to Curses.close_screen, except that it also
- * garbage collects/unregisters the Curses.stdscr
- */
static void
curses_finalize(VALUE dummy)
{
@@ -214,13 +161,7 @@ curses_finalize(VALUE dummy)
}
#ifdef HAVE_ISENDWIN
-/*
- * Document-method: Curses.closed?
- *
- * Returns +true+ if the window/screen has been closed,
- * without any subsequent Curses.refresh calls,
- * returns +false+ otherwise.
- */
+/* def closed? */
static VALUE
curses_closed(void)
{
@@ -234,13 +175,7 @@ curses_closed(void)
#define curses_closed rb_f_notimplement
#endif
-/*
- * Document-method: Curses.clear
- *
- * Clears every position on the screen completely,
- * so that a subsequent call by Curses.refresh for the screen/window
- * will be repainted from scratch.
- */
+/* def clear */
static VALUE
curses_clear(VALUE obj)
{
@@ -249,11 +184,7 @@ curses_clear(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.clrtoeol
- *
- * Clears to the end of line, that the cursor is currently on.
- */
+/* def clrtoeol */
static VALUE
curses_clrtoeol(void)
{
@@ -262,12 +193,7 @@ curses_clrtoeol(void)
return Qnil;
}
-/*
- * Document-method: Curses.refresh
- *
- * Refreshes the windows and lines.
- *
- */
+/* def refresh */
static VALUE
curses_refresh(VALUE obj)
{
@@ -276,14 +202,7 @@ curses_refresh(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.doupdate
- *
- * Refreshes the windows and lines.
- *
- * Curses.doupdate allows multiple updates with
- * more efficiency than Curses.refresh alone.
- */
+/* def doupdate */
static VALUE
curses_doupdate(VALUE obj)
{
@@ -296,12 +215,7 @@ curses_doupdate(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.echo
- *
- * Enables characters typed by the user
- * to be echoed by Curses.getch as they are typed.
- */
+/* def echo */
static VALUE
curses_echo(VALUE obj)
{
@@ -310,12 +224,7 @@ curses_echo(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.noecho
- *
- * Disables characters typed by the user
- * to be echoed by Curses.getch as they are typed.
- */
+/* def noecho */
static VALUE
curses_noecho(VALUE obj)
{
@@ -324,20 +233,7 @@ curses_noecho(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.raw
- *
- * Put the terminal into raw mode.
- *
- * Raw mode is similar to Curses.cbreak mode, in that characters typed
- * are immediately passed through to the user program.
- *
- * The differences are that in raw mode, the interrupt, quit,
- * suspend, and flow control characters are all passed through
- * uninterpreted, instead of generating a signal. The behavior
- * of the BREAK key depends on other bits in the tty driver
- * that are not set by curses.
- */
+/* def raw */
static VALUE
curses_raw(VALUE obj)
{
@@ -346,13 +242,7 @@ curses_raw(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.noraw
- *
- * Put the terminal out of raw mode.
- *
- * see Curses.raw for more detail
- */
+/* def noraw */
static VALUE
curses_noraw(VALUE obj)
{
@@ -361,28 +251,7 @@ curses_noraw(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.cbreak
- *
- * Put the terminal into cbreak mode.
- *
- * Normally, the tty driver buffers typed characters until
- * a newline or carriage return is typed. The Curses.cbreak
- * routine disables line buffering and erase/kill
- * character-processing (interrupt and flow control characters
- * are unaffected), making characters typed by the user
- * immediately available to the program.
- *
- * The Curses.nocbreak routine returns the terminal to normal (cooked) mode.
- *
- * Initially the terminal may or may not be in cbreak mode,
- * as the mode is inherited; therefore, a program should
- * call Curses.cbreak or Curses.nocbreak explicitly.
- * Most interactive programs using curses set the cbreak mode.
- * Note that Curses.cbreak overrides Curses.raw.
- *
- * see also Curses.raw
- */
+/* def cbreak */
static VALUE
curses_cbreak(VALUE obj)
{
@@ -391,13 +260,7 @@ curses_cbreak(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.nocbreak
- *
- * Put the terminal into normal mode (out of cbreak mode).
- *
- * See Curses.cbreak for more detail.
- */
+/* def nocbreak */
static VALUE
curses_nocbreak(VALUE obj)
{
@@ -406,20 +269,7 @@ curses_nocbreak(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.nl
- *
- * Enable the underlying display device to translate
- * the return key into newline on input, and whether it
- * translates newline into return and line-feed on output
- * (in either case, the call Curses.addch('\n') does the
- * equivalent of return and line feed on the virtual screen).
- *
- * Initially, these translations do occur. If you disable
- * them using Curses.nonl, curses will be able to make better use
- * of the line-feed capability, resulting in faster cursor
- * motion. Also, curses will then be able to detect the return key.
- */
+/* def nl */
static VALUE
curses_nl(VALUE obj)
{
@@ -428,14 +278,7 @@ curses_nl(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.nl
- *
- * Disable the underlying display device to translate
- * the return key into newline on input
- *
- * See Curses.nl for more detail
- */
+/* def nonl */
static VALUE
curses_nonl(VALUE obj)
{
@@ -444,14 +287,7 @@ curses_nonl(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.beep
- *
- * Sounds an audible alarm on the terminal, if possible;
- * otherwise it flashes the screen (visual bell).
- *
- * see also Curses.flash
- */
+/* def beep */
static VALUE
curses_beep(VALUE obj)
{
@@ -462,14 +298,7 @@ curses_beep(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.flash
- *
- * Flashs the screen, for visual alarm on the terminal, if possible;
- * otherwise it sounds the alert.
- *
- * see also Curses.beep
- */
+/* def flash */
static VALUE
curses_flash(VALUE obj)
{
@@ -502,15 +331,7 @@ curses_char(VALUE c)
}
#ifdef HAVE_UNGETCH
-/*
- * Document-method: Curses.ungetch
- * call-seq: ungetch(ch)
- *
- * Places +ch+ back onto the input queue to be returned by
- * the next call to Curses.getch.
- *
- * There is just one input queue for all windows.
- */
+/* def ungetch */
static VALUE
curses_ungetch(VALUE obj, VALUE ch)
{
@@ -523,14 +344,7 @@ curses_ungetch(VALUE obj, VALUE ch)
#define curses_ungetch rb_f_notimplement
#endif
-/*
- * Document-method: Curses.setpos
- * call-seq: setpos(y, x)
- *
- * A setter for the position of the cursor,
- * using coordinates +x+ and +y+
- *
- */
+/* def setpos(y, x) */
static VALUE
curses_setpos(VALUE obj, VALUE y, VALUE x)
{
@@ -539,15 +353,7 @@ curses_setpos(VALUE obj, VALUE y, VALUE x)
return Qnil;
}
-/*
- * Document-method: Curses.standout
- *
- * Enables the best highlighting mode of the terminal.
- *
- * This is equivalent to Curses:Window.attron(A_STANDOUT)
- *
- * see also Curses::Window.attrset additional information
- */
+/* def standout */
static VALUE
curses_standout(VALUE obj)
{
@@ -556,15 +362,7 @@ curses_standout(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.standend
- *
- * Enables the Normal display (no highlight)
- *
- * This is equivalent to Curses.attron(A_NORMAL)
- *
- * see also Curses::Window.attrset for additional information.
- */
+/* def standend */
static VALUE
curses_standend(VALUE obj)
{
@@ -573,11 +371,7 @@ curses_standend(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.inch
- *
- * Returns the character at the current position.
- */
+/* def inch */
static VALUE
curses_inch(VALUE obj)
{
@@ -585,14 +379,7 @@ curses_inch(VALUE obj)
return CH2FIX(inch());
}
-/*
- * Document-method: Curses.addch
- * call-seq: addch(ch)
- *
- * Add a character +ch+, with attributes, then advance the cursor.
- *
- * see also the system manual for curs_addch(3)
- */
+/* def addch(ch) */
static VALUE
curses_addch(VALUE obj, VALUE ch)
{
@@ -601,13 +388,7 @@ curses_addch(VALUE obj, VALUE ch)
return Qnil;
}
-/*
- * Document-method: Curses.insch
- * call-seq: insch(ch)
- *
- * Insert a character +ch+, before the cursor.
- *
- */
+/* def insch(ch) */
static VALUE
curses_insch(VALUE obj, VALUE ch)
{
@@ -616,13 +397,7 @@ curses_insch(VALUE obj, VALUE ch)
return Qnil;
}
-/*
- * Document-method: Curses.addstr
- * call-seq: addstr(str)
- *
- * add a string of characters +str+, to the window and advance cursor
- *
- */
+/* def addstr(str) */
static VALUE
curses_addstr(VALUE obj, VALUE str)
{
@@ -635,29 +410,22 @@ curses_addstr(VALUE obj, VALUE str)
return Qnil;
}
-static void *
+static VALUE
getch_func(void *arg)
{
int *ip = (int *)arg;
*ip = getch();
- return 0;
+ return Qnil;
}
-/*
- * Document-method: Curses.getch
- *
- * Read and returns a character from the window.
- *
- * See Curses::Key to all the function KEY_* available
- *
- */
+/* def getch */
static VALUE
curses_getch(VALUE obj)
{
int c;
curses_stdscr();
- rb_thread_call_without_gvl(getch_func, &c, RUBY_UBF_IO, 0);
+ rb_thread_blocking_region(getch_func, (void *)&c, RUBY_UBF_IO, 0);
if (c == EOF) return Qnil;
if (rb_isprint(c)) {
char ch = (char)c;
@@ -670,7 +438,7 @@ curses_getch(VALUE obj)
/* This should be big enough.. I hope */
#define GETSTR_BUF_SIZE 1024
-static void *
+static VALUE
getstr_func(void *arg)
{
char *rtn = (char *)arg;
@@ -679,31 +447,21 @@ getstr_func(void *arg)
#else
getstr(rtn);
#endif
- return 0;
+ return Qnil;
}
-/*
- * Document-method: Curses.getstr
- *
- * This is equivalent to a series f Curses::Window.getch calls
- *
- */
+/* def getstr */
static VALUE
curses_getstr(VALUE obj)
{
char rtn[GETSTR_BUF_SIZE];
curses_stdscr();
- rb_thread_call_without_gvl(getstr_func, rtn, RUBY_UBF_IO, 0);
+ rb_thread_blocking_region(getstr_func, (void *)rtn, RUBY_UBF_IO, 0);
return rb_locale_str_new_cstr(rtn);
}
-/*
- * Document-method: Curses.delch
- *
- * Delete the character under the cursor
- *
- */
+/* def delch */
static VALUE
curses_delch(VALUE obj)
{
@@ -712,12 +470,7 @@ curses_delch(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.deleteln
- *
- * Delete the line under the cursor.
- *
- */
+/* def delelteln */
static VALUE
curses_deleteln(VALUE obj)
{
@@ -728,12 +481,7 @@ curses_deleteln(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.insertln
- *
- * Inserts a line above the cursor, and the bottom line is lost
- *
- */
+/* def insertln */
static VALUE
curses_insertln(VALUE obj)
{
@@ -744,12 +492,7 @@ curses_insertln(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses.keyname
- * call-seq: keyname(c)
- *
- * Returns the character string corresponding to key +c+
- */
+/* def keyname */
static VALUE
curses_keyname(VALUE obj, VALUE c)
{
@@ -770,32 +513,19 @@ curses_keyname(VALUE obj, VALUE c)
#endif
}
-/*
- * Document-method: Curses.lines
- *
- * Returns the number of lines on the screen
- */
static VALUE
curses_lines(void)
{
return INT2FIX(LINES);
}
-/*
- * Document-method: Curses.cols
- *
- * Returns the number of columns on the screen
- */
static VALUE
curses_cols(void)
{
return INT2FIX(COLS);
}
-/*
- * Document-method: Curses.curs_set
- * call-seq: curs_set(visibility)
- *
+/**
* Sets Cursor Visibility.
* 0: invisible
* 1: visible
@@ -813,18 +543,6 @@ curses_curs_set(VALUE obj, VALUE visibility)
#endif
}
-/*
- * Document-method: Curses.scrl
- * call-seq: scrl(num)
- *
- * Scrolls the current window Fixnum +num+ lines.
- * The current cursor position is not changed.
- *
- * For positive +num+, it scrolls up.
- *
- * For negative +num+, it scrolls down.
- *
- */
static VALUE
curses_scrl(VALUE obj, VALUE n)
{
@@ -837,21 +555,6 @@ curses_scrl(VALUE obj, VALUE n)
#endif
}
-/*
- * Document-method: Curses.setscrreg
- *
- * call-seq:
- * setscrreg(top, bottom)
- *
- * Set a software scrolling region in a window.
- * +top+ and +bottom+ are lines numbers of the margin.
- *
- * If this option and Curses.scrollok are enabled, an attempt to move off
- * the bottom margin line causes all lines in the scrolling region
- * to scroll one line in the direction of the first line.
- * Only the text of the window is scrolled.
- *
- */
static VALUE
curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
{
@@ -864,14 +567,6 @@ curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
#endif
}
-/*
- * Document-method: Curses.attroff
- * call-seq: attroff(attrs)
- *
- * Turns on the named attributes +attrs+ without affecting any others.
- *
- * See also Curses::Window.attrset for additional information.
- */
static VALUE
curses_attroff(VALUE obj, VALUE attrs)
{
@@ -880,15 +575,6 @@ curses_attroff(VALUE obj, VALUE attrs)
/* return INT2FIX(attroff(NUM2INT(attrs))); */
}
-/*
- * Document-method: Curses.attron
- * call-seq: attron(attrs)
- *
- * Turns off the named attributes +attrs+
- * without turning any other attributes on or off.
- *
- * See also Curses::Window.attrset for additional information.
- */
static VALUE
curses_attron(VALUE obj, VALUE attrs)
{
@@ -897,15 +583,6 @@ curses_attron(VALUE obj, VALUE attrs)
/* return INT2FIX(attroff(NUM2INT(attrs))); */
}
-/*
- * Document-method: Curses.attrset
- * call-seq: attrset(attrs)
- *
- * Sets the current attributes of the given window to +attrs+.
- *
- * see also Curses::Window.attrset
- *
- */
static VALUE
curses_attrset(VALUE obj, VALUE attrs)
{
@@ -914,19 +591,6 @@ curses_attrset(VALUE obj, VALUE attrs)
/* return INT2FIX(attroff(NUM2INT(attrs))); */
}
-/*
- * Document-method: Curses.bkgdset
- * call-seq: bkgdset(ch)
- *
- * Manipulate the background of the named window
- * with character Integer +ch+
- *
- * The background becomes a property of the character
- * and moves with the character through any scrolling
- * and insert/delete line/character operations.
- *
- * see also the system manual for curs_bkgd(3)
- */
static VALUE
curses_bkgdset(VALUE obj, VALUE ch)
{
@@ -937,17 +601,6 @@ curses_bkgdset(VALUE obj, VALUE ch)
return Qnil;
}
-/*
- * call-seq: bkgd(ch)
- *
- * Window background manipulation routines.
- *
- * Set the background property of the current
- * and then apply the character Integer +ch+ setting
- * to every character position in that window.
- *
- * see also the system manual for curs_bkgd(3)
- */
static VALUE
curses_bkgd(VALUE obj, VALUE ch)
{
@@ -960,11 +613,6 @@ curses_bkgd(VALUE obj, VALUE ch)
}
#if defined(HAVE_USE_DEFAULT_COLORS)
-/*
- * tells the curses library to use terminal's default colors.
- *
- * see also the system manual for default_colors(3)
- */
static VALUE
curses_use_default_colors(VALUE obj)
{
@@ -977,12 +625,6 @@ curses_use_default_colors(VALUE obj)
#endif
#if defined(HAVE_TABSIZE)
-/*
- * Document-method: Curses.TABSIZE=
- * call-seq: TABSIZE=(value)
- *
- * Sets the TABSIZE to Integer +value+
- */
static VALUE
curses_tabsize_set(VALUE obj, VALUE val)
{
@@ -994,9 +636,6 @@ curses_tabsize_set(VALUE obj, VALUE val)
#endif
#if defined(HAVE_TABSIZE)
-/*
- * Returns the number of positions in a tab.
- */
static VALUE
curses_tabsize_get(VALUE ojb)
{
@@ -1007,11 +646,6 @@ curses_tabsize_get(VALUE ojb)
#endif
#if defined(HAVE_ESCDELAY)
-/*
- * call-seq: Curses.ESCDELAY=(value)
- *
- * Sets the ESCDELAY to Integer +value+
- */
static VALUE
curses_escdelay_set(VALUE obj, VALUE val)
{
@@ -1023,10 +657,6 @@ curses_escdelay_set(VALUE obj, VALUE val)
#endif
#if defined(HAVE_ESCDELAY)
-/*
- * Returns the total time, in milliseconds, for which
- * curses will await a character sequence, e.g., a function key
- */
static VALUE
curses_escdelay_get(VALUE obj)
{
@@ -1036,21 +666,6 @@ curses_escdelay_get(VALUE obj)
#define curses_escdelay_get rb_f_notimplement
#endif
-/*
- * Document-method: Curses.resize
- * call-seq: resize(lines, cols)
- *
- * alias for Curses.resizeterm
- *
- */
-
-/*
- * Document-method: Curses.resizeterm
- * call-seq: resizeterm(lines, cols)
- *
- * Resize the current term to Fixnum +lines+ and Fixnum +cols+
- *
- */
static VALUE
curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
{
@@ -1063,14 +678,6 @@ curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
}
#ifdef USE_COLOR
-/*
- * Document-method: Curses.start_color
- *
- * Initializes the color attributes, for terminals that support it.
- *
- * This must be called, in order to use color attributes.
- * It is good practice to call it just after Curses.init_screen
- */
static VALUE
curses_start_color(VALUE obj)
{
@@ -1079,20 +686,6 @@ curses_start_color(VALUE obj)
return (start_color() == OK) ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses.init_pair
- * call-seq: init_pair(pair, f, b)
- *
- * Changes the definition of a color-pair.
- *
- * It takes three arguments: the number of the color-pair to be changed +pair+,
- * the foreground color number +f+, and the background color number +b+.
- *
- * If the color-pair was previously initialized, the screen is
- * refreshed and all occurrences of that color-pair are changed
- * to the new definition.
- *
- */
static VALUE
curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
{
@@ -1101,22 +694,6 @@ curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses.init_color
- * call-seq: init_color(color, r, g, b)
- *
- * Changes the definition of a color. It takes four arguments:
- * * the number of the color to be changed, +color+
- * * the amount of red, +r+
- * * the amount of green, +g+
- * * the amount of blue, +b+
- *
- * The value of the first argument must be between 0 and COLORS.
- * (See the section Colors for the default color index.) Each
- * of the last three arguments must be a value between 0 and 1000.
- * When Curses.init_color is used, all occurrences of that color
- * on the screen immediately change to the new definition.
- */
static VALUE
curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
{
@@ -1126,11 +703,6 @@ curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses.has_colors?
- *
- * Returns +true+ or +false+ depending on whether the terminal has color capbilities.
- */
static VALUE
curses_has_colors(VALUE obj)
{
@@ -1138,11 +710,6 @@ curses_has_colors(VALUE obj)
return has_colors() ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses.can_change_color?
- *
- * Returns +true+ or +false+ depending on whether the terminal can change color attributes
- */
static VALUE
curses_can_change_color(VALUE obj)
{
@@ -1151,11 +718,6 @@ curses_can_change_color(VALUE obj)
}
#if defined(HAVE_COLORS)
-/*
- * Document-method: Curses.color
- *
- * returns COLORS
- */
static VALUE
curses_colors(VALUE obj)
{
@@ -1165,12 +727,6 @@ curses_colors(VALUE obj)
#define curses_colors rb_f_notimplement
#endif
-/*
- * Document-method: Curses.color_content
- * call-seq: color_content(color)
- *
- * Returns an 3 item Array of the RGB values in +color+
- */
static VALUE
curses_color_content(VALUE obj, VALUE color)
{
@@ -1183,11 +739,6 @@ curses_color_content(VALUE obj, VALUE color)
#if defined(HAVE_COLOR_PAIRS)
-/*
- * Document-method: Curses.color_pairs
- *
- * Returns the COLOR_PAIRS available, if the curses library supports it.
- */
static VALUE
curses_color_pairs(VALUE obj)
{
@@ -1197,13 +748,6 @@ curses_color_pairs(VALUE obj)
#define curses_color_pairs rb_f_notimplement
#endif
-/*
- * Document-method: Curses.pair_content
- * call-seq: pair_content(pair)
- *
- * Returns a 2 item Array, with the foreground and
- * background color, in +pair+
- */
static VALUE
curses_pair_content(VALUE obj, VALUE pair)
{
@@ -1214,33 +758,17 @@ curses_pair_content(VALUE obj, VALUE pair)
return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
}
-/*
- * Document-method: Curses.color_pair
- * call-seq: color_pair(attrs)
- *
- * Sets the color pair attributes to +attrs+.
- *
- * This should be equivalent to Curses.attrset(COLOR_PAIR(+attrs+))
- *
- * TODO: validate that equivalency
- */
static VALUE
curses_color_pair(VALUE obj, VALUE attrs)
{
return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
}
-/*
- * Document-method: Curses.pair_number
- * call-seq: pair_number(attrs)
- *
- * Returns the Fixnum color pair number of attributes +attrs+.
- */
static VALUE
curses_pair_number(VALUE obj, VALUE attrs)
{
curses_stdscr();
- return INT2FIX(PAIR_NUMBER(NUM2LONG(attrs)));
+ return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
}
#endif /* USE_COLOR */
@@ -1258,42 +786,17 @@ no_mevent(void)
#define GetMOUSE(obj, data) do {\
if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
- TypedData_Get_Struct((obj), struct mousedata, &mousedata_type, (data));\
- if ((data)->mevent == 0) no_mevent();\
+ Data_Get_Struct(obj, struct mousedata, data);\
+ if (data->mevent == 0) no_mevent();\
} while (0)
static void
-curses_mousedata_free(void *p)
+curses_mousedata_free(struct mousedata *mdata)
{
- struct mousedata *mdata = p;
if (mdata->mevent)
xfree(mdata->mevent);
}
-static size_t
-curses_mousedata_memsize(const void *p)
-{
- const struct mousedata *mdata = p;
- size_t size = sizeof(*mdata);
- if (!mdata) return 0;
- if (mdata->mevent) size += sizeof(mdata->mevent);
- return size;
-}
-
-static const rb_data_type_t mousedata_type = {
- "mousedata",
- {0, curses_mousedata_free, curses_mousedata_memsize,}
-};
-
-/*
- * Document-method: Curses.getmouse
- *
- * Returns coordinates of the mouse.
- *
- * This will read and pop the mouse event data off the queue
- *
- * See the BUTTON*, ALL_MOUSE_EVENTS and REPORT_MOUSE_POSITION constants, to examine the mask of the event
- */
static VALUE
curses_getmouse(VALUE obj)
{
@@ -1301,20 +804,12 @@ curses_getmouse(VALUE obj)
VALUE val;
curses_stdscr();
- val = TypedData_Make_Struct(cMouseEvent,struct mousedata,
- &mousedata_type,mdata);
+ 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;
}
-/*
- * Document-method: Curses.ungetmouse
- *
- * It pushes a KEY_MOUSE event onto the input queue, and associates with that
- * event the given state data and screen-relative character-cell coordinates.
- *
- * The Curses.ungetmouse function behaves analogously to Curses.ungetch.
- */
static VALUE
curses_ungetmouse(VALUE obj, VALUE mevent)
{
@@ -1325,22 +820,6 @@ curses_ungetmouse(VALUE obj, VALUE mevent)
return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses.mouseinterval
- * call-seq: mouseinterval(interval)
- *
- * The Curses.mouseinterval function sets the maximum time
- * (in thousands of a second) that can elapse between press
- * and release events for them to be recognized as a click.
- *
- * Use Curses.mouseinterval(0) to disable click resolution.
- * This function returns the previous interval value.
- *
- * Use Curses.mouseinterval(-1) to obtain the interval without
- * altering it.
- *
- * The default is one sixth of a second.
- */
static VALUE
curses_mouseinterval(VALUE obj, VALUE interval)
{
@@ -1348,12 +827,6 @@ curses_mouseinterval(VALUE obj, VALUE interval)
return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses.mousemask
- * call-seq: mousemask(mask)
- *
- * Returns the +mask+ of the reportable events
- */
static VALUE
curses_mousemask(VALUE obj, VALUE mask)
{
@@ -1369,51 +842,15 @@ static VALUE func_name (VALUE mouse) \
return (UINT2NUM(mdata->mevent -> mem)); \
}
-/*
- * Document-method: Curses::MouseEvent.eid
- *
- * Returns the current mouse id
- */
DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
-/*
- * Document-method: Curses::MouseEvent.x
- *
- * Returns the current mouse's X coordinate
- */
DEFINE_MOUSE_GET_MEMBER(curs_mouse_x, x)
-/*
- * Document-method: Curses::MouseEvent.y
- *
- * Returns the current mouse's Y coordinate
- */
DEFINE_MOUSE_GET_MEMBER(curs_mouse_y, y)
-/*
- * Document-method: Curses::MouseEvent.z
- *
- * Returns the current mouse's Z coordinate
- */
DEFINE_MOUSE_GET_MEMBER(curs_mouse_z, z)
-/*
- * Document-method: Curses::MouseEvent.bstate
- *
- * Returns the current mouse's button state. Use this with the button state
- * constants to determine which buttons were pressed.
- */
DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
#undef define_curs_mouse_member
#endif /* USE_MOUSE */
#ifdef HAVE_TIMEOUT
-/*
- * Document-method: Curses.timeout=
- * call-seq: timeout=(delay)
- *
- * Sets block and non-blocking reads for the window.
- * - If delay is negative, blocking read is used (i.e., waits indefinitely for input).
- * - If delay is zero, then non-blocking read is used (i.e., read returns ERR if no input is waiting).
- * - If delay is positive, then read blocks for delay milliseconds, and returns ERR if there is still no input.
- *
- */
static VALUE
curses_timeout(VALUE obj, VALUE delay)
{
@@ -1426,14 +863,6 @@ curses_timeout(VALUE obj, VALUE delay)
#endif
#ifdef HAVE_DEF_PROG_MODE
-/*
- * Document-method: Curses.def_prog_mode
- *
- * Save the current terminal modes as the "program"
- * state for use by the Curses.reset_prog_mode
- *
- * This is done automatically by Curses.init_screen
- */
static VALUE
curses_def_prog_mode(VALUE obj)
{
@@ -1445,14 +874,6 @@ curses_def_prog_mode(VALUE obj)
#endif
#ifdef HAVE_RESET_PROG_MODE
-/*
- * Document-method: Curses.reset_prog_mode
- *
- * Reset the current terminal modes to the saved state
- * by the Curses.def_prog_mode
- *
- * This is done automatically by Curses.close_screen
- */
static VALUE
curses_reset_prog_mode(VALUE obj)
{
@@ -1465,26 +886,16 @@ curses_reset_prog_mode(VALUE obj)
/*-------------------------- class Window --------------------------*/
-/* returns a Curses::Window object */
+/* def self.allocate */
static VALUE
window_s_allocate(VALUE class)
{
struct windata *winp;
- return TypedData_Make_Struct(class, struct windata, &windata_type, winp);
+ return Data_Make_Struct(class, struct windata, 0, free_window, winp);
}
-/*
- * Document-method: Curses::Window.new
- * call-seq: new(height, width, top, left)
- *
- * Contruct a new Curses::Window with constraints of
- * +height+ lines, +width+ columns, begin at +top+ line, and begin +left+ most column.
- *
- * A new window using full screen is called as
- * Curses::Window.new(0,0,0,0)
- *
- */
+/* def initialize(h, w, top, left) */
static VALUE
window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
{
@@ -1493,7 +904,7 @@ window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
rb_secure(4);
curses_init_screen();
- TypedData_Get_Struct(obj, struct windata, &windata_type, winp);
+ Data_Get_Struct(obj, struct windata, winp);
if (winp->window) delwin(winp->window);
window = newwin(NUM2INT(h), NUM2INT(w), NUM2INT(top), NUM2INT(left));
wclear(window);
@@ -1502,14 +913,7 @@ window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
return obj;
}
-/*
- * Document-method: Curses::Window.subwin
- * call-seq: subwin(height, width, top, left)
- *
- * Contruct a new subwindow with constraints of
- * +height+ lines, +width+ columns, begin at +top+ line, and begin +left+ most column.
- *
- */
+/* def subwin(height, width, top, left) */
static VALUE
window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
{
@@ -1529,11 +933,7 @@ window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
return win;
}
-/*
- * Document-method: Curses::Window.close
- *
- * Deletes the window, and frees the memory
- */
+/* def close */
static VALUE
window_close(VALUE obj)
{
@@ -1546,11 +946,7 @@ window_close(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.clear
- *
- * Clear the window.
- */
+/* def clear */
static VALUE
window_clear(VALUE obj)
{
@@ -1562,11 +958,7 @@ window_clear(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.clrtoeol
- *
- * Clear the window to the end of line, that the cursor is currently on.
- */
+/* def clrtoeol */
static VALUE
window_clrtoeol(VALUE obj)
{
@@ -1578,12 +970,7 @@ window_clrtoeol(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.refresh
- *
- * Refreshes the windows and lines.
- *
- */
+/* def refresh */
static VALUE
window_refresh(VALUE obj)
{
@@ -1595,14 +982,7 @@ window_refresh(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.noutrefresh
- *
- * Refreshes the windows and lines.
- *
- * Curses::Window.noutrefresh allows multiple updates with
- * more efficiency than Curses::Window.refresh alone.
- */
+/* def noutrefresh */
static VALUE
window_noutrefresh(VALUE obj)
{
@@ -1618,12 +998,7 @@ window_noutrefresh(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.move
- * call-seq: move(y,x)
- *
- * Moves the window so that the upper left-hand corner is at position (+y+, +x+)
- */
+/* def move(y, x) */
static VALUE
window_move(VALUE obj, VALUE y, VALUE x)
{
@@ -1635,15 +1010,7 @@ window_move(VALUE obj, VALUE y, VALUE x)
return Qnil;
}
-/*
- * Document-method: Curses::Window.setpos
- * call-seq: setpos(y, x)
- *
- * A setter for the position of the cursor
- * in the current window,
- * using coordinates +x+ and +y+
- *
- */
+/* def setpos(y, x) */
static VALUE
window_setpos(VALUE obj, VALUE y, VALUE x)
{
@@ -1654,43 +1021,31 @@ window_setpos(VALUE obj, VALUE y, VALUE x)
return Qnil;
}
-/*
- * Document-method: Curses::Window.cury
- *
- * A getter for the current line (Y coord) of the window
- */
+/* def cury */
static VALUE
window_cury(VALUE obj)
{
struct windata *winp;
- int RB_UNUSED_VAR(x), y;
+ int x, y;
GetWINDOW(obj, winp);
getyx(winp->window, y, x);
return INT2FIX(y);
}
-/*
- * Document-method: Curses::Window.curx
- *
- * A getter for the current column (X coord) of the window
- */
+/* def curx */
static VALUE
window_curx(VALUE obj)
{
struct windata *winp;
- int x, RB_UNUSED_VAR(y);
+ int x, y;
GetWINDOW(obj, winp);
getyx(winp->window, y, x);
return INT2FIX(x);
}
-/*
- * Document-method: Curses::Window.maxy
- *
- * A getter for the maximum lines for the window
- */
+/* def maxy */
static VALUE
window_maxy(VALUE obj)
{
@@ -1710,11 +1065,7 @@ window_maxy(VALUE obj)
#endif
}
-/*
- * Document-method: Curses::Window.maxx
- *
- * A getter for the maximum columns for the window
- */
+/* def maxx */
static VALUE
window_maxx(VALUE obj)
{
@@ -1734,57 +1085,39 @@ window_maxx(VALUE obj)
#endif
}
-/*
- * Document-method: Curses::Window.begy
- *
- * A getter for the beginning line (Y coord) of the window
- */
+/* def begy */
static VALUE
window_begy(VALUE obj)
{
struct windata *winp;
- int RB_UNUSED_VAR(x), y;
+ int x, y;
GetWINDOW(obj, winp);
#ifdef getbegyx
getbegyx(winp->window, y, x);
+ return INT2FIX(y);
#else
- y = winp->window->_begy;
+ return INT2FIX(winp->window->_begy);
#endif
- return INT2FIX(y);
}
-/*
- * Document-method: Curses::Window.begx
- *
- * A getter for the beginning column (X coord) of the window
- */
+/* def begx */
static VALUE
window_begx(VALUE obj)
{
struct windata *winp;
- int x, RB_UNUSED_VAR(y);
+ int x, y;
GetWINDOW(obj, winp);
#ifdef getbegyx
getbegyx(winp->window, y, x);
+ return INT2FIX(x);
#else
- x = winp->window->_begx;
+ return INT2FIX(winp->window->_begx);
#endif
- return INT2FIX(x);
}
-/*
- * Document-method: Curses::Window.box
- * call-seq: box(vert, hor)
- *
- * set the characters to frame the window in.
- * The vertical +vert+ and horizontal +hor+ character.
- *
- * win = Curses::Window.new(5,5,5,5)
- * win.box(?|, ?-)
- *
- */
+/* def box(vert, hor) */
static VALUE
window_box(int argc, VALUE *argv, VALUE self)
{
@@ -1818,15 +1151,7 @@ window_box(int argc, VALUE *argv, VALUE self)
return Qnil;
}
-/*
- * Document-method: Curses::Window.standout
- *
- * Enables the best highlighting mode of the terminal.
- *
- * This is equivalent to Curses::Window.attron(A_STANDOUT)
- *
- * see also Curses::Window.attrset
- */
+/* def standout */
static VALUE
window_standout(VALUE obj)
{
@@ -1837,15 +1162,7 @@ window_standout(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.standend
- *
- * Enables the Normal display (no highlight)
- *
- * This is equivalent to Curses::Window.attron(A_NORMAL)
- *
- * see also Curses::Window.attrset
- */
+/* def standend */
static VALUE
window_standend(VALUE obj)
{
@@ -1856,11 +1173,7 @@ window_standend(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.inch
- *
- * Returns the character at the current position of the window.
- */
+/* def inch */
static VALUE
window_inch(VALUE obj)
{
@@ -1870,14 +1183,7 @@ window_inch(VALUE obj)
return CH2FIX(winch(winp->window));
}
-/*
- * Document-method: Curses::Window.addch
- * call-seq: addch(ch)
- *
- * Add a character +ch+, with attributes, to the window, then advance the cursor.
- *
- * see also the system manual for curs_addch(3)
- */
+/* def addch(ch) */
static VALUE
window_addch(VALUE obj, VALUE ch)
{
@@ -1889,13 +1195,7 @@ window_addch(VALUE obj, VALUE ch)
return Qnil;
}
-/*
- * Document-method: Curses::Window.insch
- * call-seq: insch(ch)
- *
- * Insert a character +ch+, before the cursor, in the current window
- *
- */
+/* def insch(ch) */
static VALUE
window_insch(VALUE obj, VALUE ch)
{
@@ -1907,13 +1207,7 @@ window_insch(VALUE obj, VALUE ch)
return Qnil;
}
-/*
- * Document-method: Curses::Window.addstr
- * call-seq: addstr(str)
- *
- * add a string of characters +str+, to the window and advance cursor
- *
- */
+/* def addstr(str) */
static VALUE
window_addstr(VALUE obj, VALUE str)
{
@@ -1928,16 +1222,7 @@ window_addstr(VALUE obj, VALUE str)
return Qnil;
}
-/*
- * Document-method: Curses::Window.<<
- *
- * call-seq:
- * <<(str)
- *
- * Add String +str+ to the current string.
- *
- * See also Curses::Window.addstr
- */
+/* def <<(str) */
static VALUE
window_addstr2(VALUE obj, VALUE str)
{
@@ -1950,22 +1235,15 @@ struct wgetch_arg {
int c;
};
-static void *
+static VALUE
wgetch_func(void *_arg)
{
struct wgetch_arg *arg = (struct wgetch_arg *)_arg;
arg->c = wgetch(arg->win);
- return 0;
+ return Qnil;
}
-/*
- * Document-method: Curses::Window.getch
- *
- * Read and returns a character from the window.
- *
- * See Curses::Key to all the function KEY_* available
- *
- */
+/* def getch */
static VALUE
window_getch(VALUE obj)
{
@@ -1975,7 +1253,7 @@ window_getch(VALUE obj)
GetWINDOW(obj, winp);
arg.win = winp->window;
- rb_thread_call_without_gvl(wgetch_func, (void *)&arg, RUBY_UBF_IO, 0);
+ rb_thread_blocking_region(wgetch_func, (void *)&arg, RUBY_UBF_IO, 0);
c = arg.c;
if (c == EOF) return Qnil;
if (rb_isprint(c)) {
@@ -1991,7 +1269,7 @@ struct wgetstr_arg {
char rtn[GETSTR_BUF_SIZE];
};
-static void *
+static VALUE
wgetstr_func(void *_arg)
{
struct wgetstr_arg *arg = (struct wgetstr_arg *)_arg;
@@ -2000,15 +1278,10 @@ wgetstr_func(void *_arg)
#else
wgetstr(arg->win, arg->rtn);
#endif
- return 0;
+ return Qnil;
}
-/*
- * Document-method: Curses::Window.getstr
- *
- * This is equivalent to a series f Curses::Window.getch calls
- *
- */
+/* def getstr */
static VALUE
window_getstr(VALUE obj)
{
@@ -2017,16 +1290,11 @@ window_getstr(VALUE obj)
GetWINDOW(obj, winp);
arg.win = winp->window;
- rb_thread_call_without_gvl(wgetstr_func, (void *)&arg, RUBY_UBF_IO, 0);
+ rb_thread_blocking_region(wgetstr_func, (void *)&arg, RUBY_UBF_IO, 0);
return rb_locale_str_new_cstr(arg.rtn);
}
-/*
- * Document-method: Curses::Window.delch
- *
- * Delete the character under the cursor
- *
- */
+/* def delch */
static VALUE
window_delch(VALUE obj)
{
@@ -2037,12 +1305,7 @@ window_delch(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.deleteln
- *
- * Delete the line under the cursor.
- *
- */
+/* def delelteln */
static VALUE
window_deleteln(VALUE obj)
{
@@ -2055,12 +1318,7 @@ window_deleteln(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.insertln
- *
- * Inserts a line above the cursor, and the bottom line is lost
- *
- */
+/* def insertln */
static VALUE
window_insertln(VALUE obj)
{
@@ -2073,21 +1331,6 @@ window_insertln(VALUE obj)
return Qnil;
}
-/*
- * Document-method: Curses::Window.scrollok
- * call-seq: scrollok(bool)
- *
- * Controls what happens when the cursor of a window
- * is moved off the edge of the window or scrolling region,
- * either as a result of a newline action on the bottom line,
- * or typing the last character of the last line.
- *
- * If disabled, (+bool+ is false), the cursor is left on the bottom line.
- *
- * If enabled, (+bool+ is true), the window is scrolled up one line
- * (Note that to get the physical scrolling effect on the terminal,
- * it is also necessary to call Curses::Window.idlok)
- */
static VALUE
window_scrollok(VALUE obj, VALUE bf)
{
@@ -2098,22 +1341,6 @@ window_scrollok(VALUE obj, VALUE bf)
return Qnil;
}
-/*
- * Document-method: Curses::Window.idlok
- * call-seq: idlok(bool)
- *
- * If +bool+ is +true+ curses considers using the hardware insert/delete
- * line feature of terminals so equipped.
- *
- * If +bool+ is +false+, disables use of line insertion and deletion.
- * This option should be enabled only if the application needs insert/delete
- * line, for example, for a screen editor.
- *
- * It is disabled by default because insert/delete line tends to be visually
- * annoying when used in applications where it is not really needed.
- * If insert/delete line cannot be used, curses redraws the changed portions of all lines.
- *
- */
static VALUE
window_idlok(VALUE obj, VALUE bf)
{
@@ -2124,20 +1351,6 @@ window_idlok(VALUE obj, VALUE bf)
return Qnil;
}
-/*
- * Document-method: Curses::Window.setscrreg
- * call-seq:
- * setscrreg(top, bottom)
- *
- * Set a software scrolling region in a window.
- * +top+ and +bottom+ are lines numbers of the margin.
- *
- * If this option and Curses::Window.scrollok are enabled, an attempt to move
- * off the bottom margin line causes all lines in the scrolling region to
- * scroll one line in the direction of the first line. Only the text of the
- * window is scrolled.
- *
- */
static VALUE
window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
{
@@ -2155,13 +1368,6 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
}
#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-/*
- * Document-method: Curses::Window.color_set
- * call-seq: color_set(col)
- *
- * Sets the current color of the given window to the
- * foreground/background combination described by the Fixnum +col+.
- */
static VALUE
window_color_set(VALUE obj, VALUE col)
{
@@ -2174,11 +1380,6 @@ window_color_set(VALUE obj, VALUE col)
}
#endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
-/*
- * Document-method: Curses::Window.scroll
- *
- * Scrolls the current window up one line.
- */
static VALUE
window_scroll(VALUE obj)
{
@@ -2189,18 +1390,6 @@ window_scroll(VALUE obj)
return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
}
-/*
- * Document-method: Curses::Window.scrl
- * call-seq: scrl(num)
- *
- * Scrolls the current window Fixnum +num+ lines.
- * The current cursor position is not changed.
- *
- * For positive +num+, it scrolls up.
- *
- * For negative +num+, it scrolls down.
- *
- */
static VALUE
window_scrl(VALUE obj, VALUE n)
{
@@ -2215,14 +1404,6 @@ window_scrl(VALUE obj, VALUE n)
#endif
}
-/*
- * Document-method: Curses::Window.attroff
- * call-seq: attroff(attrs)
- *
- * Turns on the named attributes +attrs+ without affecting any others.
- *
- * See also Curses::Window.attrset
- */
static VALUE
window_attroff(VALUE obj, VALUE attrs)
{
@@ -2236,15 +1417,6 @@ window_attroff(VALUE obj, VALUE attrs)
#endif
}
-/*
- * Document-method: Curses::Window.attron
- * call-seq: attron(attrs)
- *
- * Turns off the named attributes +attrs+
- * without turning any other attributes on or off.
- *
- * See also Curses::Window.attrset
- */
static VALUE
window_attron(VALUE obj, VALUE attrs)
{
@@ -2267,32 +1439,6 @@ window_attron(VALUE obj, VALUE attrs)
#endif
}
-/*
- * Document-method: Curses::Window.attrset
- * call-seq: attrset(attrs)
- *
- * Sets the current attributes of the given window to +attrs+.
- *
- * The following video attributes, defined in <curses.h>, can
- * be passed to the routines Curses::Window.attron, Curses::Window.attroff,
- * and Curses::Window.attrset, or OR'd with the characters passed to addch.
- * A_NORMAL Normal display (no highlight)
- * A_STANDOUT Best highlighting mode of the terminal.
- * A_UNDERLINE Underlining
- * A_REVERSE Reverse video
- * A_BLINK Blinking
- * A_DIM Half bright
- * A_BOLD Extra bright or bold
- * A_PROTECT Protected mode
- * A_INVIS Invisible or blank mode
- * A_ALTCHARSET Alternate character set
- * A_CHARTEXT Bit-mask to extract a character
- * COLOR_PAIR(n) Color-pair number n
- *
- * TODO: provide some examples here.
- *
- * see also system manual curs_attr(3)
- */
static VALUE
window_attrset(VALUE obj, VALUE attrs)
{
@@ -2306,15 +1452,6 @@ window_attrset(VALUE obj, VALUE attrs)
#endif
}
-/*
- * Document-method: Curses::Window.bkgdset
- * call-seq: bkgdset(ch)
- *
- * Manipulate the background of the current window
- * with character Integer +ch+
- *
- * see also Curses.bkgdset
- */
static VALUE
window_bkgdset(VALUE obj, VALUE ch)
{
@@ -2327,15 +1464,6 @@ window_bkgdset(VALUE obj, VALUE ch)
return Qnil;
}
-/*
- * Document-method: Curses::Window.bkgd
- * call-seq: bkgd(ch)
- *
- * Set the background of the current window
- * and apply character Integer +ch+ to every character.
- *
- * see also Curses.bkgd
- */
static VALUE
window_bkgd(VALUE obj, VALUE ch)
{
@@ -2349,11 +1477,6 @@ window_bkgd(VALUE obj, VALUE ch)
#endif
}
-/*
- * Document-method: Curses::Window.getbkgd
- *
- * Returns an Interer (+ch+) for the character property in the current window.
- */
static VALUE
window_getbkgd(VALUE obj)
{
@@ -2368,13 +1491,6 @@ window_getbkgd(VALUE obj)
#endif
}
-/*
- * Document-method: Curses::Window.resize
- * call-seq: resize(lines, cols)
- *
- * Resize the current window to Fixnum +lines+ and Fixnum +cols+
- *
- */
static VALUE
window_resize(VALUE obj, VALUE lin, VALUE col)
{
@@ -2390,33 +1506,6 @@ window_resize(VALUE obj, VALUE lin, VALUE col)
#ifdef HAVE_KEYPAD
-/*
- * Document-method: Curses::Window.keypad=
- * call-seq:
- * keypad=(bool)
- *
- * See Curses::Window.keypad
- */
-
-/*
- * Document-method: Curses::Window.keypad
- * call-seq:
- * keypad(bool)
- *
- * Enables the keypad of the user's terminal.
- *
- * If enabled (+bool+ is +true+), the user can press a function key
- * (such as an arrow key) and wgetch returns a single value representing
- * the function key, as in KEY_LEFT. If disabled (+bool+ is +false+),
- * curses does not treat function keys specially and the program has to
- * interpret the escape sequences itself. If the keypad in the terminal
- * can be turned on (made to transmit) and off (made to work locally),
- * turning on this option causes the terminal keypad to be turned on when
- * Curses::Window.getch is called.
- *
- * The default value for keypad is false.
- *
- */
static VALUE
window_keypad(VALUE obj, VALUE val)
{
@@ -2438,18 +1527,6 @@ window_keypad(VALUE obj, VALUE val)
#endif
#ifdef HAVE_NODELAY
-/*
- * Document-method: Curses::Window.nodelay
- * call-seq:
- * window.nodelay = bool
- *
- * When in no-delay mode Curses::Window#getch is a non-blocking call. If no
- * input is ready #getch returns ERR.
- *
- * When in delay mode (+bool+ is +false+ which is the default),
- * Curses::Window#getch blocks until a key is pressed.
- *
- */
static VALUE
window_nodelay(VALUE obj, VALUE val)
{
@@ -2469,16 +1546,6 @@ window_nodelay(VALUE obj, VALUE val)
#endif
#ifdef HAVE_WTIMEOUT
-/*
- * Document-method: Curses::Window.timeout=
- * call-seq: timeout=(delay)
- *
- * Sets block and non-blocking reads for the window.
- * - If delay is negative, blocking read is used (i.e., waits indefinitely for input).
- * - If delay is zero, then non-blocking read is used (i.e., read returns ERR if no input is waiting).
- * - If delay is positive, then read blocks for delay milliseconds, and returns ERR if there is still no input.
- *
- */
static VALUE
window_timeout(VALUE obj, VALUE delay)
{
@@ -2492,200 +1559,16 @@ window_timeout(VALUE obj, VALUE delay)
#define window_timeout rb_f_notimplement
#endif
-/*--------------------------- class Pad ----------------------------*/
-
-#ifdef HAVE_NEWPAD
-/*
- * Document-method: Curses::Pad.new
- *
- * call-seq:
- * new(height, width)
- *
- * Contruct a new Curses::Pad with constraints of +height+ lines, +width+
- * columns
- *
- */
-static VALUE
-pad_initialize(VALUE obj, VALUE h, VALUE w)
-{
- struct windata *padp;
- WINDOW *window;
-
- rb_secure(4);
- curses_init_screen();
- TypedData_Get_Struct(obj, struct windata, &windata_type, padp);
- if (padp->window) delwin(padp->window);
- window = newpad(NUM2INT(h), NUM2INT(w));
- wclear(window);
- padp->window = window;
-
- return obj;
-}
-
-#if 1
-#define pad_subpad window_subwin
-#else
-/*
- * Document-method: Curses::Pad.subpad
- * call-seq:
- * subpad(height, width, begin_x, begin_y)
- *
- * Contruct a new subpad with constraints of +height+ lines, +width+ columns,
- * begin at +begin_x+ line, and +begin_y+ columns on the pad.
- *
- */
-static VALUE
-pad_subpad(VALUE obj, VALUE height, VALUE width, VALUE begin_x, VALUE begin_y)
-{
- struct windata *padp;
- WINDOW *subpad;
- VALUE pad;
- int h, w, x, y;
-
- h = NUM2INT(height);
- w = NUM2INT(width);
- x = NUM2INT(begin_x);
- y = NUM2INT(begin_y);
- GetWINDOW(obj, padp);
- subpad = subwin(padp->window, h, w, x, y);
- pad = prep_window(rb_obj_class(obj), subpad);
-
- return pad;
-}
-#endif
-
-/*
- * Document-method: Curses::Pad.refresh
- *
- * call-seq:
- * pad.refresh(pad_minrow, pad_mincol, screen_minrow, screen_mincol, screen_maxrow, screen_maxcol)
- *
- * Refreshes the pad. +pad_minrow+ and pad_mincol+ define the upper-left
- * corner of the rectangle to be displayed. +screen_minrow+, +screen_mincol+,
- * +screen_maxrow+, +screen_maxcol+ define the edges of the rectangle to be
- * displayed on the screen.
- *
- */
-static VALUE
-pad_refresh(VALUE obj, VALUE pminrow, VALUE pmincol, VALUE sminrow,
- VALUE smincol, VALUE smaxrow, VALUE smaxcol)
-{
- struct windata *padp;
- int pmr, pmc, smr, smc, sxr, sxc;
-
- pmr = NUM2INT(pminrow);
- pmc = NUM2INT(pmincol);
- smr = NUM2INT(sminrow);
- smc = NUM2INT(smincol);
- sxr = NUM2INT(smaxrow);
- sxc = NUM2INT(smaxcol);
-
- GetWINDOW(obj, padp);
- prefresh(padp->window, pmr, pmc, smr, smc, sxr, sxc);
-
- return Qnil;
-}
-
-/*
- * Document-method: Curses::Pad.noutrefresh
- *
- * call-seq:
- * pad.noutrefresh(pad_minrow, pad_mincol, screen_minrow, screen_mincol, screen_maxrow, screen_maxcol)
- *
- * Refreshes the pad. +pad_minrow+ and pad_mincol+ define the upper-left
- * corner of the rectangle to be displayed. +screen_minrow+, +screen_mincol+,
- * +screen_maxrow+, +screen_maxcol+ define the edges of the rectangle to be
- * displayed on the screen.
- *
- */
-static VALUE
-pad_noutrefresh(VALUE obj, VALUE pminrow, VALUE pmincol, VALUE sminrow,
- VALUE smincol, VALUE smaxrow, VALUE smaxcol)
-{
- struct windata *padp;
- int pmr, pmc, smr, smc, sxr, sxc;
-
- pmr = NUM2INT(pminrow);
- pmc = NUM2INT(pmincol);
- smr = NUM2INT(sminrow);
- smc = NUM2INT(smincol);
- sxr = NUM2INT(smaxrow);
- sxc = NUM2INT(smaxcol);
-
- GetWINDOW(obj, padp);
-#ifdef HAVE_DOUPDATE
- pnoutrefresh(padp->window, pmr, pmc, smr, smc, sxr, sxc);
-#else
- prefresh(padp->window, pmr, pmc, smr, smc, sxr, sxc);
-#endif
-
- return Qnil;
-}
-#endif /* HAVE_NEWPAD */
-
/*------------------------- Initialization -------------------------*/
-
-/*
- * Document-module: Curses
- *
- * == Description
- * An implementation of the CRT screen handling and optimization library.
- *
- * == Structures and such
- *
- * === Classes
- *
- * * Curses::Window - class with the means to draw a window or box
- * * Curses::MouseEvent - class for collecting mouse events
- *
- * === Modules
- *
- * Curses:: The curses implementation
- * Curses::Key:: Collection of constants for keypress events
- *
- * == Examples
- *
- * * hello.rb
- * :include: hello.rb
- *
- *
- * * rain.rb
- * :include: rain.rb
- *
- *
- */
void
Init_curses(void)
{
mCurses = rb_define_module("Curses");
-
- /*
- * Document-module: Curses::Key
- *
- *
- * a container for the KEY_* values.
- *
- * See also system manual for getch(3)
- *
- */
mKey = rb_define_module_under(mCurses, "Key");
rb_gc_register_address(&rb_stdscr);
#ifdef USE_MOUSE
- /*
- * Document-class: Curses::MouseEvent
- *
- * == Description
- *
- * Curses::MouseEvent
- *
- * == Example
- *
- * * mouse.rb
- * :include: mouse.rb
- *
- */
cMouseEvent = rb_define_class_under(mCurses,"MouseEvent",rb_cObject);
rb_undef_method(CLASS_OF(cMouseEvent),"new");
rb_define_method(cMouseEvent, "eid", curs_mouse_id, 0);
@@ -2715,7 +1598,7 @@ 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_cbreak, 0);
+ rb_define_module_function(mCurses, "crmode", curses_nocbreak, 0);
rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0);
rb_define_module_function(mCurses, "nl", curses_nl, 0);
rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
@@ -2772,62 +1655,6 @@ Init_curses(void)
rb_define_module_function(mCurses, "def_prog_mode", curses_def_prog_mode, 0);
rb_define_module_function(mCurses, "reset_prog_mode", curses_reset_prog_mode, 0);
- {
- VALUE version;
-#if defined(HAVE_FUNC_CURSES_VERSION)
- /* ncurses and PDcurses */
- version = rb_str_new2(curses_version());
-#elif defined(HAVE_VAR_CURSES_VERSION)
- /* SVR4 curses has an undocumented and undeclared variable, curses_version.
- * It contains a string, "SVR4". */
- RUBY_EXTERN char *curses_version;
- version = rb_sprintf("curses (%s)", curses_version);
-#else
- /* BSD curses, perhaps. NetBSD 5 still use it. */
- version = rb_str_new2("curses (unknown)");
-#endif
- /*
- * Identifies curses library version.
- *
- * - "ncurses 5.9.20110404"
- * - "PDCurses 3.4 - Public Domain 2008"
- * - "curses (SVR4)" (System V curses)
- * - "curses (unknown)" (The original BSD curses? NetBSD maybe.)
- *
- */
- rb_define_const(mCurses, "VERSION", version);
- }
-
- /*
- * Document-class: Curses::Window
- *
- * == Description
- *
- * The means by which to create and manage frames or windows.
- * While there may be more than one window at a time, only one window
- * will receive input.
- *
- * == Usage
- *
- * require 'curses'
- *
- * Curses.init_screen()
- *
- * my_str = "LOOK! PONIES!"
- * win = Curses::Window.new( 8, (my_str.length + 10),
- * (Curses.lines - 8) / 2,
- * (Curses.cols - (my_str.length + 10)) / 2 )
- * win.box("|", "-")
- * win.setpos(2,3)
- * win.addstr(my_str)
- * # or even
- * win << "\nORLY"
- * win << "\nYES!! " + my_str
- * win.refresh
- * win.getch
- * win.close
- *
- */
cWindow = rb_define_class_under(mCurses, "Window", rb_cData);
rb_define_alloc_func(cWindow, window_s_allocate);
rb_define_method(cWindow, "initialize", window_initialize, 4);
@@ -2880,595 +1707,168 @@ Init_curses(void)
rb_define_method(cWindow, "nodelay=", window_nodelay, 1);
rb_define_method(cWindow, "timeout=", window_timeout, 1);
-#ifdef HAVE_NEWPAD
- /*
- * Document-class: Curses::Pad
- *
- * == Description
- *
- * A Pad is like a Window but allows for scrolling of contents that cannot
- * fit on the screen. Pads do not refresh automatically, use Pad#refresh
- * or Pad#noutrefresh instead.
- *
- */
- cPad = rb_define_class_under(mCurses, "Pad", cWindow);
- /* inherits alloc_func from cWindow */
- rb_define_method(cPad, "initialize", pad_initialize, 2);
- rb_define_method(cPad, "subpad", pad_subpad, 4);
- rb_define_method(cPad, "refresh", pad_refresh, 6);
- rb_define_method(cPad, "noutrefresh", pad_noutrefresh, 6);
- rb_undef_method(cPad, "subwin");
-#endif
-
#define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
#ifdef USE_COLOR
- /* Document-const: A_ATTRIBUTES
- *
- * Character attribute mask:
- * Bit-mask to extract attributes
- *
- * See Curses.inch or Curses::Window.inch
- */
rb_curses_define_const(A_ATTRIBUTES);
#ifdef A_NORMAL
- /* Document-const: A_NORMAL
- *
- * Attribute mask:
- * Normal display (no highlight)
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_NORMAL);
#endif
- /* Document-const: A_STANDOUT
- *
- * Attribute mask:
- * Best highlighting mode of the terminal.
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_STANDOUT);
- /* Document-const: A_UNDERLINE
- *
- * Attribute mask:
- * Underlining
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_UNDERLINE);
- /* Document-const: A_REVERSE
- *
- * Attribute mask:
- * Reverse video
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_REVERSE);
- /* Document-const: A_BLINK
- *
- * Attribute mask:
- * Blinking
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_BLINK);
- /* Document-const: A_DIM
- *
- * Attribute mask:
- * Half bright
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_DIM);
- /* Document-const: A_BOLD
- *
- * Attribute mask:
- * Extra bright or bold
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_BOLD);
- /* Document-const: A_PROTECT
- *
- * Attribute mask:
- * Protected mode
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_PROTECT);
#ifdef A_INVIS /* for NetBSD */
- /* Document-const: A_INVIS
- *
- * Attribute mask:
- * Invisible or blank mode
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_INVIS);
#endif
- /* Document-const: A_ALTCHARSET
- *
- * Attribute mask:
- * Alternate character set
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_ALTCHARSET);
- /* Document-const: A_CHARTEXT
- *
- * Attribute mask:
- * Bit-mask to extract a character
- *
- * See Curses.attrset
- */
rb_curses_define_const(A_CHARTEXT);
#ifdef A_HORIZONTAL
- /* Document-const: A_HORIZONTAL
- *
- * Attribute mask:
- * horizontal highlight
- *
- * Check system curs_attr(3x) for support
- */
rb_curses_define_const(A_HORIZONTAL);
#endif
#ifdef A_LEFT
- /* Document-const: A_LEFT
- *
- * Attribute mask:
- * left highlight
- *
- * Check system curs_attr(3x) for support
- */
rb_curses_define_const(A_LEFT);
#endif
#ifdef A_LOW
- /* Document-const: A_LOW
- *
- * Attribute mask:
- * low highlight
- *
- * Check system curs_attr(3x) for support
- */
rb_curses_define_const(A_LOW);
#endif
#ifdef A_RIGHT
- /* Document-const: A_RIGHT
- *
- * Attribute mask:
- * right highlight
- *
- * Check system curs_attr(3x) for support
- */
rb_curses_define_const(A_RIGHT);
#endif
#ifdef A_TOP
- /* Document-const: A_TOP
- *
- * Attribute mask:
- * top highlight
- *
- * Check system curs_attr(3x) for support
- */
rb_curses_define_const(A_TOP);
#endif
#ifdef A_VERTICAL
- /* Document-const: A_VERTICAL
- *
- * Attribute mask:
- * vertical highlight
- *
- * Check system curs_attr(3x) for support
- */
rb_curses_define_const(A_VERTICAL);
#endif
- /* Document-const: A_COLOR
- *
- * Character attribute mask:
- * Bit-mask to extract color-pair field information
- *
- * See Curses.inch or Curses::Window.inch
- */
rb_curses_define_const(A_COLOR);
#ifdef COLORS
- /*
- * Document-const: Curses::COLORS
- *
- * Number of the colors available
- */
rb_curses_define_const(COLORS);
#endif
- /*
- * Document-const: Curses::COLOR_BLACK
- *
- * Value of the color black
- */
rb_curses_define_const(COLOR_BLACK);
- /*
- * Document-const: COLOR_RED
- *
- * Value of the color red
- */
rb_curses_define_const(COLOR_RED);
- /*
- * Document-const: COLOR_GREEN
- *
- * Value of the color green
- */
rb_curses_define_const(COLOR_GREEN);
- /*
- * Document-const: COLOR_YELLOW
- *
- * Value of the color yellow
- */
rb_curses_define_const(COLOR_YELLOW);
- /*
- * Document-const: COLOR_BLUE
- *
- * Value of the color blue
- */
rb_curses_define_const(COLOR_BLUE);
- /*
- * Document-const: COLOR_MAGENTA
- *
- * Value of the color magenta
- */
rb_curses_define_const(COLOR_MAGENTA);
- /*
- * Document-const: COLOR_CYAN
- *
- * Value of the color cyan
- */
rb_curses_define_const(COLOR_CYAN);
- /*
- * Document-const: COLOR_WHITE
- *
- * Value of the color white
- */
rb_curses_define_const(COLOR_WHITE);
#endif /* USE_COLOR */
#ifdef USE_MOUSE
#ifdef BUTTON1_PRESSED
- /* Document-const: BUTTON1_PRESSED
- *
- * Mouse event mask:
- * mouse button 1 down
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON1_PRESSED);
#endif
#ifdef BUTTON1_RELEASED
- /* Document-const: BUTTON1_RELEASED
- *
- * Mouse event mask:
- * mouse button 1 up
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON1_RELEASED);
#endif
#ifdef BUTTON1_CLICKED
- /* Document-const: BUTTON1_CLICKED
- *
- * Mouse event mask:
- * mouse button 1 clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON1_CLICKED);
#endif
#ifdef BUTTON1_DOUBLE_CLICKED
- /* Document-const: BUTTON1_DOUBLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 1 double clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON1_DOUBLE_CLICKED);
#endif
#ifdef BUTTON1_TRIPLE_CLICKED
- /* Document-const: BUTTON1_TRIPLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 1 triple clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON1_TRIPLE_CLICKED);
#endif
#ifdef BUTTON2_PRESSED
- /* Document-const: BUTTON2_PRESSED
- *
- * Mouse event mask:
- * mouse button 2 down
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON2_PRESSED);
#endif
#ifdef BUTTON2_RELEASED
- /* Document-const: BUTTON2_RELEASED
- *
- * Mouse event mask:
- * mouse button 2 up
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON2_RELEASED);
#endif
#ifdef BUTTON2_CLICKED
- /* Document-const: BUTTON2_CLICKED
- *
- * Mouse event mask:
- * mouse button 2 clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON2_CLICKED);
#endif
#ifdef BUTTON2_DOUBLE_CLICKED
- /* Document-const: BUTTON2_DOUBLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 2 double clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON2_DOUBLE_CLICKED);
#endif
#ifdef BUTTON2_TRIPLE_CLICKED
- /* Document-const: BUTTON2_TRIPLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 2 triple clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON2_TRIPLE_CLICKED);
#endif
#ifdef BUTTON3_PRESSED
- /* Document-const: BUTTON3_PRESSED
- *
- * Mouse event mask:
- * mouse button 3 down
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON3_PRESSED);
#endif
#ifdef BUTTON3_RELEASED
- /* Document-const: BUTTON3_RELEASED
- *
- * Mouse event mask:
- * mouse button 3 up
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON3_RELEASED);
#endif
#ifdef BUTTON3_CLICKED
- /* Document-const: BUTTON3_CLICKED
- *
- * Mouse event mask:
- * mouse button 3 clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON3_CLICKED);
#endif
#ifdef BUTTON3_DOUBLE_CLICKED
- /* Document-const: BUTTON3_DOUBLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 3 double clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON3_DOUBLE_CLICKED);
#endif
#ifdef BUTTON3_TRIPLE_CLICKED
- /* Document-const: BUTTON3_TRIPLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 3 triple clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON3_TRIPLE_CLICKED);
#endif
#ifdef BUTTON4_PRESSED
- /* Document-const: BUTTON4_PRESSED
- *
- * Mouse event mask:
- * mouse button 4 down
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON4_PRESSED);
#endif
#ifdef BUTTON4_RELEASED
- /* Document-const: BUTTON4_RELEASED
- *
- * Mouse event mask:
- * mouse button 4 up
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON4_RELEASED);
#endif
#ifdef BUTTON4_CLICKED
- /* Document-const: BUTTON4_CLICKED
- *
- * Mouse event mask:
- * mouse button 4 clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON4_CLICKED);
#endif
#ifdef BUTTON4_DOUBLE_CLICKED
- /* Document-const: BUTTON4_DOUBLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 4 double clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON4_DOUBLE_CLICKED);
#endif
#ifdef BUTTON4_TRIPLE_CLICKED
- /* Document-const: BUTTON4_TRIPLE_CLICKED
- *
- * Mouse event mask:
- * mouse button 4 triple clicked
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON4_TRIPLE_CLICKED);
#endif
#ifdef BUTTON_SHIFT
- /* Document-const: BUTTON_SHIFT
- *
- * Mouse event mask:
- * shift was down during button state change
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON_SHIFT);
#endif
#ifdef BUTTON_CTRL
- /* Document-const: BUTTON_CTRL
- *
- * Mouse event mask:
- * control was down during button state change
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON_CTRL);
#endif
#ifdef BUTTON_ALT
- /* Document-const: BUTTON_ALT
- *
- * Mouse event mask:
- * alt was down during button state change
- *
- * See Curses.getmouse
- */
rb_curses_define_const(BUTTON_ALT);
#endif
#ifdef ALL_MOUSE_EVENTS
- /* Document-const: ALL_MOUSE_EVENTS
- *
- * Mouse event mask:
- * report all button state changes
- *
- * See Curses.getmouse
- */
rb_curses_define_const(ALL_MOUSE_EVENTS);
#endif
#ifdef REPORT_MOUSE_POSITION
- /* Document-const: REPORT_MOUSE_POSITION
- *
- * Mouse event mask:
- * report mouse movement
- *
- * See Curses.getmouse
- */
rb_curses_define_const(REPORT_MOUSE_POSITION);
#endif
#endif /* USE_MOUSE */
#if defined(KEY_MOUSE) && defined(USE_MOUSE)
- /* Document-const: KEY_MOUSE
- * Mouse event read
- */
- /* Document-const: MOUSE
- * Mouse event read
- */
rb_curses_define_const(KEY_MOUSE);
rb_define_const(mKey, "MOUSE", INT2NUM(KEY_MOUSE));
#endif
#ifdef KEY_MIN
- /* Document-const: KEY_MIN
- * The minimum allowed curses key value.
- */
- /* Document-const: MIN
- * The minimum allowed curses key value.
- */
rb_curses_define_const(KEY_MIN);
rb_define_const(mKey, "MIN", INT2NUM(KEY_MIN));
#endif
#ifdef KEY_BREAK
- /* Document-const: KEY_BREAK
- * Break key
- */
- /* Document-const: BREAK
- * Break key
- */
rb_curses_define_const(KEY_BREAK);
rb_define_const(mKey, "BREAK", INT2NUM(KEY_BREAK));
#endif
#ifdef KEY_DOWN
- /* Document-const: KEY_DOWN
- * the down arrow key
- */
- /* Document-const: DOWN
- * the down arrow key
- */
rb_curses_define_const(KEY_DOWN);
rb_define_const(mKey, "DOWN", INT2NUM(KEY_DOWN));
#endif
#ifdef KEY_UP
- /* Document-const: KEY_UP
- * the up arrow key
- */
- /* Document-const: UP
- * the up arrow key
- */
rb_curses_define_const(KEY_UP);
rb_define_const(mKey, "UP", INT2NUM(KEY_UP));
#endif
#ifdef KEY_LEFT
- /* Document-const: KEY_LEFT
- * the left arrow key
- */
- /* Document-const: LEFT
- * the left arrow key
- */
rb_curses_define_const(KEY_LEFT);
rb_define_const(mKey, "LEFT", INT2NUM(KEY_LEFT));
#endif
#ifdef KEY_RIGHT
- /* Document-const: KEY_RIGHT
- * the right arrow key
- */
- /* Document-const: RIGHT
- * the right arrow key
- */
rb_curses_define_const(KEY_RIGHT);
rb_define_const(mKey, "RIGHT", INT2NUM(KEY_RIGHT));
#endif
#ifdef KEY_HOME
- /* Document-const: KEY_HOME
- * Home key (upward+left arrow)
- */
- /* Document-const: HOME
- * Home key (upward+left arrow)
- */
rb_curses_define_const(KEY_HOME);
rb_define_const(mKey, "HOME", INT2NUM(KEY_HOME));
#endif
#ifdef KEY_BACKSPACE
- /* Document-const: KEY_BACKSPACE
- * Backspace
- */
- /* Document-const: BACKSPACE
- * Backspace
- */
rb_curses_define_const(KEY_BACKSPACE);
rb_define_const(mKey, "BACKSPACE", INT2NUM(KEY_BACKSPACE));
#endif
@@ -3486,832 +1886,334 @@ Init_curses(void)
}
#endif
#ifdef KEY_DL
- /* Document-const: KEY_DL
- * Delete line
- */
- /* Document-const: DL
- * Delete line
- */
rb_curses_define_const(KEY_DL);
rb_define_const(mKey, "DL", INT2NUM(KEY_DL));
#endif
#ifdef KEY_IL
- /* Document-const: KEY_IL
- * Insert line
- */
- /* Document-const: IL
- * Insert line
- */
rb_curses_define_const(KEY_IL);
rb_define_const(mKey, "IL", INT2NUM(KEY_IL));
#endif
#ifdef KEY_DC
- /* Document-const: KEY_DC
- * Delete character
- */
- /* Document-const: DC
- * Delete character
- */
rb_curses_define_const(KEY_DC);
rb_define_const(mKey, "DC", INT2NUM(KEY_DC));
#endif
#ifdef KEY_IC
- /* Document-const: KEY_IC
- * Insert char or enter insert mode
- */
- /* Document-const: IC
- * Insert char or enter insert mode
- */
rb_curses_define_const(KEY_IC);
rb_define_const(mKey, "IC", INT2NUM(KEY_IC));
#endif
#ifdef KEY_EIC
- /* Document-const: KEY_EIC
- * Enter insert char mode
- */
- /* Document-const: EIC
- * Enter insert char mode
- */
rb_curses_define_const(KEY_EIC);
rb_define_const(mKey, "EIC", INT2NUM(KEY_EIC));
#endif
#ifdef KEY_CLEAR
- /* Document-const: KEY_CLEAR
- * Clear Screen
- */
- /* Document-const: CLEAR
- * Clear Screen
- */
rb_curses_define_const(KEY_CLEAR);
rb_define_const(mKey, "CLEAR", INT2NUM(KEY_CLEAR));
#endif
#ifdef KEY_EOS
- /* Document-const: KEY_EOS
- * Clear to end of screen
- */
- /* Document-const: EOS
- * Clear to end of screen
- */
rb_curses_define_const(KEY_EOS);
rb_define_const(mKey, "EOS", INT2NUM(KEY_EOS));
#endif
#ifdef KEY_EOL
- /* Document-const: KEY_EOL
- * Clear to end of line
- */
- /* Document-const: EOL
- * Clear to end of line
- */
rb_curses_define_const(KEY_EOL);
rb_define_const(mKey, "EOL", INT2NUM(KEY_EOL));
#endif
#ifdef KEY_SF
- /* Document-const: KEY_SF
- * Scroll 1 line forward
- */
- /* Document-const: SF
- * Scroll 1 line forward
- */
rb_curses_define_const(KEY_SF);
rb_define_const(mKey, "SF", INT2NUM(KEY_SF));
#endif
#ifdef KEY_SR
- /* Document-const: KEY_SR
- * Scroll 1 line backware (reverse)
- */
- /* Document-const: SR
- * Scroll 1 line backware (reverse)
- */
rb_curses_define_const(KEY_SR);
rb_define_const(mKey, "SR", INT2NUM(KEY_SR));
#endif
#ifdef KEY_NPAGE
- /* Document-const: KEY_NPAGE
- * Next page
- */
- /* Document-const: NPAGE
- * Next page
- */
rb_curses_define_const(KEY_NPAGE);
rb_define_const(mKey, "NPAGE", INT2NUM(KEY_NPAGE));
#endif
#ifdef KEY_PPAGE
- /* Document-const: KEY_PPAGE
- * Previous page
- */
- /* Document-const: PPAGE
- * Previous page
- */
rb_curses_define_const(KEY_PPAGE);
rb_define_const(mKey, "PPAGE", INT2NUM(KEY_PPAGE));
#endif
#ifdef KEY_STAB
- /* Document-const: KEY_STAB
- * Set tab
- */
- /* Document-const: STAB
- * Set tab
- */
rb_curses_define_const(KEY_STAB);
rb_define_const(mKey, "STAB", INT2NUM(KEY_STAB));
#endif
#ifdef KEY_CTAB
- /* Document-const: KEY_CTAB
- * Clear tab
- */
- /* Document-const: CTAB
- * Clear tab
- */
rb_curses_define_const(KEY_CTAB);
rb_define_const(mKey, "CTAB", INT2NUM(KEY_CTAB));
#endif
#ifdef KEY_CATAB
- /* Document-const: KEY_CATAB
- * Clear all tabs
- */
- /* Document-const: CATAB
- * Clear all tabs
- */
rb_curses_define_const(KEY_CATAB);
rb_define_const(mKey, "CATAB", INT2NUM(KEY_CATAB));
#endif
#ifdef KEY_ENTER
- /* Document-const: KEY_ENTER
- * Enter or send
- */
- /* Document-const: ENTER
- * Enter or send
- */
rb_curses_define_const(KEY_ENTER);
rb_define_const(mKey, "ENTER", INT2NUM(KEY_ENTER));
#endif
#ifdef KEY_SRESET
- /* Document-const: KEY_SRESET
- * Soft (partial) reset
- */
- /* Document-const: SRESET
- * Soft (partial) reset
- */
rb_curses_define_const(KEY_SRESET);
rb_define_const(mKey, "SRESET", INT2NUM(KEY_SRESET));
#endif
#ifdef KEY_RESET
- /* Document-const: KEY_RESET
- * Reset or hard reset
- */
- /* Document-const: RESET
- * Reset or hard reset
- */
rb_curses_define_const(KEY_RESET);
rb_define_const(mKey, "RESET", INT2NUM(KEY_RESET));
#endif
#ifdef KEY_PRINT
- /* Document-const: KEY_PRINT
- * Print or copy
- */
- /* Document-const: PRINT
- * Print or copy
- */
rb_curses_define_const(KEY_PRINT);
rb_define_const(mKey, "PRINT", INT2NUM(KEY_PRINT));
#endif
#ifdef KEY_LL
- /* Document-const: KEY_LL
- * Home down or bottom (lower left)
- */
- /* Document-const: LL
- * Home down or bottom (lower left)
- */
rb_curses_define_const(KEY_LL);
rb_define_const(mKey, "LL", INT2NUM(KEY_LL));
#endif
#ifdef KEY_A1
- /* Document-const: KEY_A1
- * Upper left of keypad
- */
- /* Document-const: A1
- * Upper left of keypad
- */
rb_curses_define_const(KEY_A1);
rb_define_const(mKey, "A1", INT2NUM(KEY_A1));
#endif
#ifdef KEY_A3
- /* Document-const: KEY_A3
- * Upper right of keypad
- */
- /* Document-const: A3
- * Upper right of keypad
- */
rb_curses_define_const(KEY_A3);
rb_define_const(mKey, "A3", INT2NUM(KEY_A3));
#endif
#ifdef KEY_B2
- /* Document-const: KEY_B2
- * Center of keypad
- */
- /* Document-const: B2
- * Center of keypad
- */
rb_curses_define_const(KEY_B2);
rb_define_const(mKey, "B2", INT2NUM(KEY_B2));
#endif
#ifdef KEY_C1
- /* Document-const: KEY_C1
- * Lower left of keypad
- */
- /* Document-const: C1
- * Lower left of keypad
- */
rb_curses_define_const(KEY_C1);
rb_define_const(mKey, "C1", INT2NUM(KEY_C1));
#endif
#ifdef KEY_C3
- /* Document-const: KEY_C3
- * Lower right of keypad
- */
- /* Document-const: C3
- * Lower right of keypad
- */
rb_curses_define_const(KEY_C3);
rb_define_const(mKey, "C3", INT2NUM(KEY_C3));
#endif
#ifdef KEY_BTAB
- /* Document-const: BTAB
- * Back tab key
- */
- /* Document-const: KEY_BTAB
- * Back tab key
- */
rb_curses_define_const(KEY_BTAB);
rb_define_const(mKey, "BTAB", INT2NUM(KEY_BTAB));
#endif
#ifdef KEY_BEG
- /* Document-const: KEY_BEG
- * Beginning key
- */
- /* Document-const: BEG
- * Beginning key
- */
rb_curses_define_const(KEY_BEG);
rb_define_const(mKey, "BEG", INT2NUM(KEY_BEG));
#endif
#ifdef KEY_CANCEL
- /* Document-const: KEY_CANCEL
- * Cancel key
- */
- /* Document-const: CANCEL
- * Cancel key
- */
rb_curses_define_const(KEY_CANCEL);
rb_define_const(mKey, "CANCEL", INT2NUM(KEY_CANCEL));
#endif
#ifdef KEY_CLOSE
- /* Document-const: KEY_CLOSE
- * Close key
- */
- /* Document-const: CLOSE
- * Close key
- */
rb_curses_define_const(KEY_CLOSE);
rb_define_const(mKey, "CLOSE", INT2NUM(KEY_CLOSE));
#endif
#ifdef KEY_COMMAND
- /* Document-const: KEY_COMMAND
- * Cmd (command) key
- */
- /* Document-const: COMMAND
- * Cmd (command) key
- */
rb_curses_define_const(KEY_COMMAND);
rb_define_const(mKey, "COMMAND", INT2NUM(KEY_COMMAND));
#endif
#ifdef KEY_COPY
- /* Document-const: KEY_COPY
- * Copy key
- */
- /* Document-const: COPY
- * Copy key
- */
rb_curses_define_const(KEY_COPY);
rb_define_const(mKey, "COPY", INT2NUM(KEY_COPY));
#endif
#ifdef KEY_CREATE
- /* Document-const: KEY_CREATE
- * Create key
- */
- /* Document-const: CREATE
- * Create key
- */
rb_curses_define_const(KEY_CREATE);
rb_define_const(mKey, "CREATE", INT2NUM(KEY_CREATE));
#endif
#ifdef KEY_END
- /* Document-const: KEY_END
- * End key
- */
- /* Document-const: END
- * End key
- */
rb_curses_define_const(KEY_END);
rb_define_const(mKey, "END", INT2NUM(KEY_END));
#endif
#ifdef KEY_EXIT
- /* Document-const: KEY_EXIT
- * Exit key
- */
- /* Document-const: EXIT
- * Exit key
- */
rb_curses_define_const(KEY_EXIT);
rb_define_const(mKey, "EXIT", INT2NUM(KEY_EXIT));
#endif
#ifdef KEY_FIND
- /* Document-const: KEY_FIND
- * Find key
- */
- /* Document-const: FIND
- * Find key
- */
rb_curses_define_const(KEY_FIND);
rb_define_const(mKey, "FIND", INT2NUM(KEY_FIND));
#endif
#ifdef KEY_HELP
- /* Document-const: KEY_HELP
- * Help key
- */
- /* Document-const: HELP
- * Help key
- */
rb_curses_define_const(KEY_HELP);
rb_define_const(mKey, "HELP", INT2NUM(KEY_HELP));
#endif
#ifdef KEY_MARK
- /* Document-const: KEY_MARK
- * Mark key
- */
- /* Document-const: MARK
- * Mark key
- */
rb_curses_define_const(KEY_MARK);
rb_define_const(mKey, "MARK", INT2NUM(KEY_MARK));
#endif
#ifdef KEY_MESSAGE
- /* Document-const: KEY_MESSAGE
- * Message key
- */
- /* Document-const: MESSAGE
- * Message key
- */
rb_curses_define_const(KEY_MESSAGE);
rb_define_const(mKey, "MESSAGE", INT2NUM(KEY_MESSAGE));
#endif
#ifdef KEY_MOVE
- /* Document-const: KEY_MOVE
- * Move key
- */
- /* Document-const: MOVE
- * Move key
- */
rb_curses_define_const(KEY_MOVE);
rb_define_const(mKey, "MOVE", INT2NUM(KEY_MOVE));
#endif
#ifdef KEY_NEXT
- /* Document-const: KEY_NEXT
- * Next object key
- */
- /* Document-const: NEXT
- * Next object key
- */
rb_curses_define_const(KEY_NEXT);
rb_define_const(mKey, "NEXT", INT2NUM(KEY_NEXT));
#endif
#ifdef KEY_OPEN
- /* Document-const: KEY_OPEN
- * Open key
- */
- /* Document-const: OPEN
- * Open key
- */
rb_curses_define_const(KEY_OPEN);
rb_define_const(mKey, "OPEN", INT2NUM(KEY_OPEN));
#endif
#ifdef KEY_OPTIONS
- /* Document-const: KEY_OPTIONS
- * Options key
- */
- /* Document-const: OPTIONS
- * Options key
- */
rb_curses_define_const(KEY_OPTIONS);
rb_define_const(mKey, "OPTIONS", INT2NUM(KEY_OPTIONS));
#endif
#ifdef KEY_PREVIOUS
- /* Document-const: KEY_PREVIOUS
- * Previous object key
- */
- /* Document-const: PREVIOUS
- * Previous object key
- */
rb_curses_define_const(KEY_PREVIOUS);
rb_define_const(mKey, "PREVIOUS", INT2NUM(KEY_PREVIOUS));
#endif
#ifdef KEY_REDO
- /* Document-const: KEY_REDO
- * Redo key
- */
- /* Document-const: REDO
- * Redo key
- */
rb_curses_define_const(KEY_REDO);
rb_define_const(mKey, "REDO", INT2NUM(KEY_REDO));
#endif
#ifdef KEY_REFERENCE
- /* Document-const: KEY_REFERENCE
- * Reference key
- */
- /* Document-const: REFERENCE
- * Reference key
- */
rb_curses_define_const(KEY_REFERENCE);
rb_define_const(mKey, "REFERENCE", INT2NUM(KEY_REFERENCE));
#endif
#ifdef KEY_REFRESH
- /* Document-const: KEY_REFRESH
- * Refresh key
- */
- /* Document-const: REFRESH
- * Refresh key
- */
rb_curses_define_const(KEY_REFRESH);
rb_define_const(mKey, "REFRESH", INT2NUM(KEY_REFRESH));
#endif
#ifdef KEY_REPLACE
- /* Document-const: KEY_REPLACE
- * Replace key
- */
- /* Document-const: REPLACE
- * Replace key
- */
rb_curses_define_const(KEY_REPLACE);
rb_define_const(mKey, "REPLACE", INT2NUM(KEY_REPLACE));
#endif
#ifdef KEY_RESTART
- /* Document-const: KEY_RESTART
- * Restart key
- */
- /* Document-const: RESTART
- * Restart key
- */
rb_curses_define_const(KEY_RESTART);
rb_define_const(mKey, "RESTART", INT2NUM(KEY_RESTART));
#endif
#ifdef KEY_RESUME
- /* Document-const: KEY_RESUME
- * Resume key
- */
- /* Document-const: RESUME
- * Resume key
- */
rb_curses_define_const(KEY_RESUME);
rb_define_const(mKey, "RESUME", INT2NUM(KEY_RESUME));
#endif
#ifdef KEY_SAVE
- /* Document-const: KEY_SAVE
- * Save key
- */
- /* Document-const: SAVE
- * Save key
- */
rb_curses_define_const(KEY_SAVE);
rb_define_const(mKey, "SAVE", INT2NUM(KEY_SAVE));
#endif
#ifdef KEY_SBEG
- /* Document-const: KEY_SBEG
- * Shifted beginning key
- */
- /* Document-const: SBEG
- * Shifted beginning key
- */
rb_curses_define_const(KEY_SBEG);
rb_define_const(mKey, "SBEG", INT2NUM(KEY_SBEG));
#endif
#ifdef KEY_SCANCEL
- /* Document-const: KEY_SCANCEL
- * Shifted cancel key
- */
- /* Document-const: SCANCEL
- * Shifted cancel key
- */
rb_curses_define_const(KEY_SCANCEL);
rb_define_const(mKey, "SCANCEL", INT2NUM(KEY_SCANCEL));
#endif
#ifdef KEY_SCOMMAND
- /* Document-const: KEY_SCOMMAND
- * Shifted command key
- */
- /* Document-const: SCOMMAND
- * Shifted command key
- */
rb_curses_define_const(KEY_SCOMMAND);
rb_define_const(mKey, "SCOMMAND", INT2NUM(KEY_SCOMMAND));
#endif
#ifdef KEY_SCOPY
- /* Document-const: KEY_SCOPY
- * Shifted copy key
- */
- /* Document-const: SCOPY
- * Shifted copy key
- */
rb_curses_define_const(KEY_SCOPY);
rb_define_const(mKey, "SCOPY", INT2NUM(KEY_SCOPY));
#endif
#ifdef KEY_SCREATE
- /* Document-const: KEY_SCREATE
- * Shifted create key
- */
- /* Document-const: SCREATE
- * Shifted create key
- */
rb_curses_define_const(KEY_SCREATE);
rb_define_const(mKey, "SCREATE", INT2NUM(KEY_SCREATE));
#endif
#ifdef KEY_SDC
- /* Document-const: KEY_SDC
- * Shifted delete char key
- */
- /* Document-const: SDC
- * Shifted delete char key
- */
rb_curses_define_const(KEY_SDC);
rb_define_const(mKey, "SDC", INT2NUM(KEY_SDC));
#endif
#ifdef KEY_SDL
- /* Document-const: KEY_SDL
- * Shifted delete line key
- */
- /* Document-const: SDL
- * Shifted delete line key
- */
rb_curses_define_const(KEY_SDL);
rb_define_const(mKey, "SDL", INT2NUM(KEY_SDL));
#endif
#ifdef KEY_SELECT
- /* Document-const: KEY_SELECT
- * Select key
- */
- /* Document-const: SELECT
- * Select key
- */
rb_curses_define_const(KEY_SELECT);
rb_define_const(mKey, "SELECT", INT2NUM(KEY_SELECT));
#endif
#ifdef KEY_SEND
- /* Document-const: KEY_SEND
- * Shifted end key
- */
- /* Document-const: SEND
- * Shifted end key
- */
rb_curses_define_const(KEY_SEND);
rb_define_const(mKey, "SEND", INT2NUM(KEY_SEND));
#endif
#ifdef KEY_SEOL
- /* Document-const: KEY_SEOL
- * Shifted clear line key
- */
- /* Document-const: SEOL
- * Shifted clear line key
- */
rb_curses_define_const(KEY_SEOL);
rb_define_const(mKey, "SEOL", INT2NUM(KEY_SEOL));
#endif
#ifdef KEY_SEXIT
- /* Document-const: KEY_SEXIT
- * Shifted exit key
- */
- /* Document-const: SEXIT
- * Shifted exit key
- */
rb_curses_define_const(KEY_SEXIT);
rb_define_const(mKey, "SEXIT", INT2NUM(KEY_SEXIT));
#endif
#ifdef KEY_SFIND
- /* Document-const: KEY_SFIND
- * Shifted find key
- */
- /* Document-const: SFIND
- * Shifted find key
- */
rb_curses_define_const(KEY_SFIND);
rb_define_const(mKey, "SFIND", INT2NUM(KEY_SFIND));
#endif
#ifdef KEY_SHELP
- /* Document-const: KEY_SHELP
- * Shifted help key
- */
- /* Document-const: SHELP
- * Shifted help key
- */
rb_curses_define_const(KEY_SHELP);
rb_define_const(mKey, "SHELP", INT2NUM(KEY_SHELP));
#endif
#ifdef KEY_SHOME
- /* Document-const: KEY_SHOME
- * Shifted home key
- */
- /* Document-const: SHOME
- * Shifted home key
- */
rb_curses_define_const(KEY_SHOME);
rb_define_const(mKey, "SHOME", INT2NUM(KEY_SHOME));
#endif
#ifdef KEY_SIC
- /* Document-const: KEY_SIC
- * Shifted input key
- */
- /* Document-const: SIC
- * Shifted input key
- */
rb_curses_define_const(KEY_SIC);
rb_define_const(mKey, "SIC", INT2NUM(KEY_SIC));
#endif
#ifdef KEY_SLEFT
- /* Document-const: KEY_SLEFT
- * Shifted left arrow key
- */
- /* Document-const: SLEFT
- * Shifted left arrow key
- */
rb_curses_define_const(KEY_SLEFT);
rb_define_const(mKey, "SLEFT", INT2NUM(KEY_SLEFT));
#endif
#ifdef KEY_SMESSAGE
- /* Document-const: KEY_SMESSAGE
- * Shifted message key
- */
- /* Document-const: SMESSAGE
- * Shifted message key
- */
rb_curses_define_const(KEY_SMESSAGE);
rb_define_const(mKey, "SMESSAGE", INT2NUM(KEY_SMESSAGE));
#endif
#ifdef KEY_SMOVE
- /* Document-const: KEY_SMOVE
- * Shifted move key
- */
- /* Document-const: SMOVE
- * Shifted move key
- */
rb_curses_define_const(KEY_SMOVE);
rb_define_const(mKey, "SMOVE", INT2NUM(KEY_SMOVE));
#endif
#ifdef KEY_SNEXT
- /* Document-const: KEY_SNEXT
- * Shifted next key
- */
- /* Document-const: SNEXT
- * Shifted next key
- */
rb_curses_define_const(KEY_SNEXT);
rb_define_const(mKey, "SNEXT", INT2NUM(KEY_SNEXT));
#endif
#ifdef KEY_SOPTIONS
- /* Document-const: KEY_SOPTIONS
- * Shifted options key
- */
- /* Document-const: SOPTIONS
- * Shifted options key
- */
rb_curses_define_const(KEY_SOPTIONS);
rb_define_const(mKey, "SOPTIONS", INT2NUM(KEY_SOPTIONS));
#endif
#ifdef KEY_SPREVIOUS
- /* Document-const: KEY_SPREVIOUS
- * Shifted previous key
- */
- /* Document-const: SPREVIOUS
- * Shifted previous key
- */
rb_curses_define_const(KEY_SPREVIOUS);
rb_define_const(mKey, "SPREVIOUS", INT2NUM(KEY_SPREVIOUS));
#endif
#ifdef KEY_SPRINT
- /* Document-const: KEY_SPRINT
- * Shifted print key
- */
- /* Document-const: SPRINT
- * Shifted print key
- */
rb_curses_define_const(KEY_SPRINT);
rb_define_const(mKey, "SPRINT", INT2NUM(KEY_SPRINT));
#endif
#ifdef KEY_SREDO
- /* Document-const: KEY_SREDO
- * Shifted redo key
- */
- /* Document-const: SREDO
- * Shifted redo key
- */
rb_curses_define_const(KEY_SREDO);
rb_define_const(mKey, "SREDO", INT2NUM(KEY_SREDO));
#endif
#ifdef KEY_SREPLACE
- /* Document-const: KEY_SREPLACE
- * Shifted replace key
- */
- /* Document-const: SREPLACE
- * Shifted replace key
- */
rb_curses_define_const(KEY_SREPLACE);
rb_define_const(mKey, "SREPLACE", INT2NUM(KEY_SREPLACE));
#endif
#ifdef KEY_SRIGHT
- /* Document-const: KEY_SRIGHT
- * Shifted right arrow key
- */
- /* Document-const: SRIGHT
- * Shifted right arrow key
- */
rb_curses_define_const(KEY_SRIGHT);
rb_define_const(mKey, "SRIGHT", INT2NUM(KEY_SRIGHT));
#endif
#ifdef KEY_SRSUME
- /* Document-const: KEY_SRSUME
- * Shifted resume key
- */
- /* Document-const: SRSUME
- * Shifted resume key
- */
rb_curses_define_const(KEY_SRSUME);
rb_define_const(mKey, "SRSUME", INT2NUM(KEY_SRSUME));
#endif
#ifdef KEY_SSAVE
- /* Document-const: KEY_SSAVE
- * Shifted save key
- */
- /* Document-const: SSAVE
- * Shifted save key
- */
rb_curses_define_const(KEY_SSAVE);
rb_define_const(mKey, "SSAVE", INT2NUM(KEY_SSAVE));
#endif
#ifdef KEY_SSUSPEND
- /* Document-const: KEY_SSUSPEND
- * Shifted suspend key
- */
- /* Document-const: SSUSPEND
- * Shifted suspend key
- */
rb_curses_define_const(KEY_SSUSPEND);
rb_define_const(mKey, "SSUSPEND", INT2NUM(KEY_SSUSPEND));
#endif
#ifdef KEY_SUNDO
- /* Document-const: KEY_SUNDO
- * Shifted undo key
- */
- /* Document-const: SUNDO
- * Shifted undo key
- */
rb_curses_define_const(KEY_SUNDO);
rb_define_const(mKey, "SUNDO", INT2NUM(KEY_SUNDO));
#endif
#ifdef KEY_SUSPEND
- /* Document-const: KEY_SUSPEND
- * Suspend key
- */
- /* Document-const: SUSPEND
- * Suspend key
- */
rb_curses_define_const(KEY_SUSPEND);
rb_define_const(mKey, "SUSPEND", INT2NUM(KEY_SUSPEND));
#endif
#ifdef KEY_UNDO
- /* Document-const: KEY_UNDO
- * Undo key
- */
- /* Document-const: UNDO
- * Undo key
- */
rb_curses_define_const(KEY_UNDO);
rb_define_const(mKey, "UNDO", INT2NUM(KEY_UNDO));
#endif
#ifdef KEY_RESIZE
- /* Document-const: KEY_RESIZE
- * Screen Resized
- */
- /* Document-const: RESIZE
- * Screen Resized
- */
rb_curses_define_const(KEY_RESIZE);
rb_define_const(mKey, "RESIZE", INT2NUM(KEY_RESIZE));
#endif
#ifdef KEY_MAX
- /* Document-const: KEY_MAX
- * The maximum allowed curses key value.
- */
- /* Document-const: MAX
- * The maximum allowed curses key value.
- */
rb_curses_define_const(KEY_MAX);
rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
#endif
diff --git a/ext/curses/depend b/ext/curses/depend
index 66742b7208..ecb79e512d 100644
--- a/ext/curses/depend
+++ b/ext/curses/depend
@@ -1 +1 @@
-curses.o: curses.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/thread.h
+curses.o: curses.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index f63de1cd6c..4172c8a6b6 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -1,116 +1,36 @@
require 'mkmf'
-def have_all(*args)
- old_libs = $libs.dup
- old_defs = $defs.dup
- result = []
- begin
- args.each {|arg|
- r = arg.call(*result)
- if !r
- return nil
- end
- result << r
- }
- result
- ensure
- if result.length != args.length
- $libs = old_libs
- $defs = old_defs
- end
- end
-end
-
dir_config('curses')
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"))
+ make=true
+elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
+ make=true
+elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
+ curses.unshift("varargs.h")
+ make=true
+elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
+ make=true
+end
-header_library = nil
-[
- ["ncurses.h", ["ncursesw", "ncurses"]],
- ["ncurses/curses.h", ["ncurses"]],
- ["curses_colr/curses.h", ["cur_colr"]],
- ["curses.h", ["curses", "pdcurses"]],
- # ["xcurses.h", ["XCurses"]], # XCurses (PDCurses for X11)
-].each {|hdr, libs|
- header_library = have_all(
- lambda { have_header(hdr) && hdr },
- lambda {|h| libs.find {|lib| have_library(lib, "initscr", h) } })
- if header_library
- break;
- end
-}
-
-if header_library
- header, library = header_library
- puts "header: #{header}"
- puts "library: #{library}"
-
- curses = [header]
- if header == 'curses_colr/curses.h'
- curses.unshift("varargs.h")
- end
-
- 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 newpad)
+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)
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)
+ if try_static_assert("sizeof(char*)>sizeof(int)", %w[stdio.h stdlib.h]+curses , flag)
$defs << flag
end
have_var("ESCDELAY", curses)
have_var("TABSIZE", curses)
have_var("COLORS", curses)
have_var("COLOR_PAIRS", curses)
-
- # SVR4 curses has a (undocumented) variable char *curses_version.
- # ncurses and PDcurses has a function char *curses_version().
- # Note that the original BSD curses doesn't provide version information.
-
- prolog = cpp_include(curses)
- if checking_for(checking_message('function curses_version', curses)) {
- try_run(<<-"End")
- #{prolog}
- int main(int argc, char *argv[])
- {
- curses_version();
- return EXIT_SUCCESS;
- }
- End
- }
- $defs << '-DHAVE_FUNC_CURSES_VERSION'
- end
-
- if checking_for(checking_message('variable curses_version', curses)) {
- try_run(<<-"End")
- #{prolog}
- extern char *curses_version;
- int main(int argc, char *argv[])
- {
- int i = 0;
- for (i = 0; i < 100; i++) {
- if (curses_version[i] == 0)
- return 0 < i ? EXIT_SUCCESS : EXIT_FAILURE;
- if (curses_version[i] & 0x80)
- return EXIT_FAILURE;
- }
- return EXIT_FAILURE;
- }
- End
- }
- $defs << '-DHAVE_VAR_CURSES_VERSION'
- end
-
create_makefile("curses")
end
diff --git a/ext/curses/rain.rb b/ext/curses/rain.rb
index a6019b26e0..36f0f84de2 100644
--- a/ext/curses/rain.rb
+++ b/ext/curses/rain.rb
@@ -14,7 +14,7 @@ def ranf
end
# main #
-for i in %w[HUP INT QUIT TERM]
+for i in 1 .. 15 # SIGHUP .. SIGTERM
if trap(i, "SIG_IGN") != 0 then # 0 for SIG_IGN
trap(i) {|sig| onsig(sig) }
end
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
index bc54aeb9af..e033fd8ae2 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -40,7 +40,7 @@ while TRUE
while i < lines
setpos(i, 0)
#clrtoeol
- addstr(data_lines[lptr + i] || '')
+ addstr(data_lines[lptr + i]) #if data_lines[lptr + i]
i += 1
end
refresh
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
deleted file mode 100644
index e3e6c4c2ae..0000000000
--- a/ext/date/date_core.c
+++ /dev/null
@@ -1,9673 +0,0 @@
-/*
- date_core.c: Coded by Tadayoshi Funaba 2010-2013
-*/
-
-#include "ruby.h"
-#include "ruby/encoding.h"
-#include <math.h>
-#include <time.h>
-
-#define NDEBUG
-#include <assert.h>
-
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-#define USE_PACK
-
-static ID id_cmp, id_le_p, id_ge_p, id_eqeq_p;
-static VALUE cDate, cDateTime;
-static VALUE half_days_in_day, day_in_nanoseconds;
-static double positive_inf, negative_inf;
-
-#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
-
-#define f_abs(x) rb_funcall(x, rb_intern("abs"), 0)
-#define f_negate(x) rb_funcall(x, rb_intern("-@"), 0)
-#define f_add(x,y) rb_funcall(x, '+', 1, y)
-#define f_sub(x,y) rb_funcall(x, '-', 1, y)
-#define f_mul(x,y) rb_funcall(x, '*', 1, y)
-#define f_div(x,y) rb_funcall(x, '/', 1, y)
-#define f_quo(x,y) rb_funcall(x, rb_intern("quo"), 1, y)
-#define f_idiv(x,y) rb_funcall(x, rb_intern("div"), 1, y)
-#define f_mod(x,y) rb_funcall(x, '%', 1, y)
-#define f_remainder(x,y) rb_funcall(x, rb_intern("remainder"), 1, y)
-#define f_expt(x,y) rb_funcall(x, rb_intern("**"), 1, y)
-#define f_floor(x) rb_funcall(x, rb_intern("floor"), 0)
-#define f_ceil(x) rb_funcall(x, rb_intern("ceil"), 0)
-#define f_truncate(x) rb_funcall(x, rb_intern("truncate"), 0)
-#define f_round(x) rb_funcall(x, rb_intern("round"), 0)
-
-#define f_to_i(x) rb_funcall(x, rb_intern("to_i"), 0)
-#define f_to_r(x) rb_funcall(x, rb_intern("to_r"), 0)
-#define f_to_s(x) rb_funcall(x, rb_intern("to_s"), 0)
-#define f_inspect(x) rb_funcall(x, rb_intern("inspect"), 0)
-
-#define f_add3(x,y,z) f_add(f_add(x, y), z)
-#define f_sub3(x,y,z) f_sub(f_sub(x, y), z)
-
-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_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);
-}
-
-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_le_p(VALUE x, VALUE y)
-{
- if (FIXNUM_P(x) && FIXNUM_P(y))
- return f_boolcast(FIX2LONG(x) <= FIX2LONG(y));
- return rb_funcall(x, id_le_p, 1, y);
-}
-
-inline static VALUE
-f_ge_p(VALUE x, VALUE y)
-{
- if (FIXNUM_P(x) && FIXNUM_P(y))
- return f_boolcast(FIX2LONG(x) >= FIX2LONG(y));
- return rb_funcall(x, rb_intern(">="), 1, y);
-}
-
-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, rb_intern("=="), 1, y);
-}
-
-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, INT2FIX(0));
-}
-
-#define f_nonzero_p(x) (!f_zero_p(x))
-
-inline static VALUE
-f_negative_p(VALUE x)
-{
- if (FIXNUM_P(x))
- return f_boolcast(FIX2LONG(x) < 0);
- return rb_funcall(x, '<', 1, INT2FIX(0));
-}
-
-#define f_positive_p(x) (!f_negative_p(x))
-
-#define f_ajd(x) rb_funcall(x, rb_intern("ajd"), 0)
-#define f_jd(x) rb_funcall(x, rb_intern("jd"), 0)
-#define f_year(x) rb_funcall(x, rb_intern("year"), 0)
-#define f_mon(x) rb_funcall(x, rb_intern("mon"), 0)
-#define f_mday(x) rb_funcall(x, rb_intern("mday"), 0)
-#define f_wday(x) rb_funcall(x, rb_intern("wday"), 0)
-#define f_hour(x) rb_funcall(x, rb_intern("hour"), 0)
-#define f_min(x) rb_funcall(x, rb_intern("min"), 0)
-#define f_sec(x) rb_funcall(x, rb_intern("sec"), 0)
-
-/* copied from time.c */
-#define NDIV(x,y) (-(-((x)+1)/(y))-1)
-#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1)
-#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d))
-#define MOD(n,d) ((n)<0 ? NMOD((n),(d)) : (n)%(d))
-
-#define HAVE_JD (1 << 0)
-#define HAVE_DF (1 << 1)
-#define HAVE_CIVIL (1 << 2)
-#define HAVE_TIME (1 << 3)
-#define COMPLEX_DAT (1 << 7)
-
-#define have_jd_p(x) ((x)->flags & HAVE_JD)
-#define have_df_p(x) ((x)->flags & HAVE_DF)
-#define have_civil_p(x) ((x)->flags & HAVE_CIVIL)
-#define have_time_p(x) ((x)->flags & HAVE_TIME)
-#define complex_dat_p(x) ((x)->flags & COMPLEX_DAT)
-#define simple_dat_p(x) (!complex_dat_p(x))
-
-#define ITALY 2299161 /* 1582-10-15 */
-#define ENGLAND 2361222 /* 1752-09-14 */
-#define JULIAN positive_inf
-#define GREGORIAN negative_inf
-#define DEFAULT_SG ITALY
-
-#define UNIX_EPOCH_IN_CJD INT2FIX(2440588) /* 1970-01-01 */
-
-#define MINUTE_IN_SECONDS 60
-#define HOUR_IN_SECONDS 3600
-#define DAY_IN_SECONDS 86400
-#define SECOND_IN_MILLISECONDS 1000
-#define SECOND_IN_NANOSECONDS 1000000000
-
-#define JC_PERIOD0 1461 /* 365.25 * 4 */
-#define GC_PERIOD0 146097 /* 365.2425 * 400 */
-#define CM_PERIOD0 71149239 /* (lcm 7 1461 146097) */
-#define CM_PERIOD (0xfffffff / CM_PERIOD0 * CM_PERIOD0)
-#define CM_PERIOD_JCY (CM_PERIOD / JC_PERIOD0 * 4)
-#define CM_PERIOD_GCY (CM_PERIOD / GC_PERIOD0 * 400)
-
-#define REFORM_BEGIN_YEAR 1582
-#define REFORM_END_YEAR 1930
-#define REFORM_BEGIN_JD 2298874 /* ns 1582-01-01 */
-#define REFORM_END_JD 2426355 /* os 1930-12-31 */
-
-#ifdef USE_PACK
-#define SEC_WIDTH 6
-#define MIN_WIDTH 6
-#define HOUR_WIDTH 5
-#define MDAY_WIDTH 5
-#define MON_WIDTH 4
-
-#define SEC_SHIFT 0
-#define MIN_SHIFT SEC_WIDTH
-#define HOUR_SHIFT (MIN_WIDTH + SEC_WIDTH)
-#define MDAY_SHIFT (HOUR_WIDTH + MIN_WIDTH + SEC_WIDTH)
-#define MON_SHIFT (MDAY_WIDTH + HOUR_WIDTH + MIN_WIDTH + SEC_WIDTH)
-
-#define PK_MASK(x) ((1 << (x)) - 1)
-
-#define EX_SEC(x) (((x) >> SEC_SHIFT) & PK_MASK(SEC_WIDTH))
-#define EX_MIN(x) (((x) >> MIN_SHIFT) & PK_MASK(MIN_WIDTH))
-#define EX_HOUR(x) (((x) >> HOUR_SHIFT) & PK_MASK(HOUR_WIDTH))
-#define EX_MDAY(x) (((x) >> MDAY_SHIFT) & PK_MASK(MDAY_WIDTH))
-#define EX_MON(x) (((x) >> MON_SHIFT) & PK_MASK(MON_WIDTH))
-
-#define PACK5(m,d,h,min,s) \
- (((m) << MON_SHIFT) | ((d) << MDAY_SHIFT) |\
- ((h) << HOUR_SHIFT) | ((min) << MIN_SHIFT) | ((s) << SEC_SHIFT))
-
-#define PACK2(m,d) \
- (((m) << MON_SHIFT) | ((d) << MDAY_SHIFT))
-#endif
-
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
-
-#if defined(FLT_RADIX) && defined(FLT_MANT_DIG) && FLT_RADIX == 2 && FLT_MANT_DIG > 22
-#define date_sg_t float
-#else
-#define date_sg_t double
-#endif
-
-/* A set of nth, jd, df and sf denote ajd + 1/2. Each ajd begin at
- * noon of GMT (assume equal to UTC). However, this begins at
- * midnight.
- */
-
-struct SimpleDateData
-{
- unsigned flags;
- VALUE nth; /* not always canonicalized */
- int jd; /* as utc */
- /* df is zero */
- /* sf is zero */
- /* of is zero */
- date_sg_t sg; /* 2298874..2426355 or -/+oo -- at most 22 bits */
- /* decoded as utc=local */
- int year; /* truncated */
-#ifndef USE_PACK
- int mon;
- int mday;
- /* hour is zero */
- /* min is zero */
- /* sec is zero */
-#else
- /* packed civil */
- unsigned pc;
-#endif
-};
-
-struct ComplexDateData
-{
- unsigned flags;
- VALUE nth; /* not always canonicalized */
- int jd; /* as utc */
- int df; /* as utc, in secs */
- VALUE sf; /* in nano secs */
- int of; /* in secs */
- date_sg_t sg; /* 2298874..2426355 or -/+oo -- at most 22 bits */
- /* decoded as local */
- int year; /* truncated */
-#ifndef USE_PACK
- int mon;
- int mday;
- int hour;
- int min;
- int sec;
-#else
- /* packed civil */
- unsigned pc;
-#endif
-};
-
-union DateData {
- unsigned flags;
- struct SimpleDateData s;
- struct ComplexDateData c;
-};
-
-#define get_d1(x)\
- union DateData *dat;\
- Data_Get_Struct(x, union DateData, dat);
-
-#define get_d1a(x)\
- union DateData *adat;\
- Data_Get_Struct(x, union DateData, adat);
-
-#define get_d1b(x)\
- union DateData *bdat;\
- Data_Get_Struct(x, union DateData, bdat);
-
-#define get_d2(x,y)\
- union DateData *adat, *bdat;\
- Data_Get_Struct(x, union DateData, adat);\
- Data_Get_Struct(y, union DateData, bdat);
-
-inline static VALUE
-canon(VALUE x)
-{
- if (TYPE(x) == T_RATIONAL) {
- VALUE den = RRATIONAL(x)->den;
- if (FIXNUM_P(den) && FIX2LONG(den) == 1)
- return RRATIONAL(x)->num;
- }
- return x;
-}
-
-#ifndef USE_PACK
-#define set_to_simple(x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
-{\
- (x)->nth = canon(_nth);\
- (x)->jd = _jd;\
- (x)->sg = (date_sg_t)(_sg);\
- (x)->year = _year;\
- (x)->mon = _mon;\
- (x)->mday = _mday;\
- (x)->flags = _flags;\
-}
-#else
-#define set_to_simple(x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
-{\
- (x)->nth = canon(_nth);\
- (x)->jd = _jd;\
- (x)->sg = (date_sg_t)(_sg);\
- (x)->year = _year;\
- (x)->pc = PACK2(_mon, _mday);\
- (x)->flags = _flags;\
-}
-#endif
-
-#ifndef USE_PACK
-#define set_to_complex(x, _nth, _jd ,_df, _sf, _of, _sg,\
-_year, _mon, _mday, _hour, _min, _sec, _flags) \
-{\
- (x)->nth = canon(_nth);\
- (x)->jd = _jd;\
- (x)->df = _df;\
- (x)->sf = canon(_sf);\
- (x)->of = _of;\
- (x)->sg = (date_sg_t)(_sg);\
- (x)->year = _year;\
- (x)->mon = _mon;\
- (x)->mday = _mday;\
- (x)->hour = _hour;\
- (x)->min = _min;\
- (x)->sec = _sec;\
- (x)->flags = _flags;\
-}
-#else
-#define set_to_complex(x, _nth, _jd ,_df, _sf, _of, _sg,\
-_year, _mon, _mday, _hour, _min, _sec, _flags) \
-{\
- (x)->nth = canon(_nth);\
- (x)->jd = _jd;\
- (x)->df = _df;\
- (x)->sf = canon(_sf);\
- (x)->of = _of;\
- (x)->sg = (date_sg_t)(_sg);\
- (x)->year = _year;\
- (x)->pc = PACK5(_mon, _mday, _hour, _min, _sec);\
- (x)->flags = _flags;\
-}
-#endif
-
-#ifndef USE_PACK
-#define copy_simple_to_complex(x, y) \
-{\
- (x)->nth = (y)->nth;\
- (x)->jd = (y)->jd;\
- (x)->df = 0;\
- (x)->sf = INT2FIX(0);\
- (x)->of = 0;\
- (x)->sg = (date_sg_t)((y)->sg);\
- (x)->year = (y)->year;\
- (x)->mon = (y)->mon;\
- (x)->mday = (y)->mday;\
- (x)->hour = 0;\
- (x)->min = 0;\
- (x)->sec = 0;\
- (x)->flags = (y)->flags;\
-}
-#else
-#define copy_simple_to_complex(x, y) \
-{\
- (x)->nth = (y)->nth;\
- (x)->jd = (y)->jd;\
- (x)->df = 0;\
- (x)->sf = INT2FIX(0);\
- (x)->of = 0;\
- (x)->sg = (date_sg_t)((y)->sg);\
- (x)->year = (y)->year;\
- (x)->pc = PACK5(EX_MON((y)->pc), EX_MDAY((y)->pc), 0, 0, 0);\
- (x)->flags = (y)->flags;\
-}
-#endif
-
-#ifndef USE_PACK
-#define copy_complex_to_simple(x, y) \
-{\
- (x)->nth = (y)->nth;\
- (x)->jd = (y)->jd;\
- (x)->sg = (date_sg_t)((y)->sg);\
- (x)->year = (y)->year;\
- (x)->mon = (y)->mon;\
- (x)->mday = (y)->mday;\
- (x)->flags = (y)->flags;\
-}
-#else
-#define copy_complex_to_simple(x, y) \
-{\
- (x)->nth = (y)->nth;\
- (x)->jd = (y)->jd;\
- (x)->sg = (date_sg_t)((y)->sg);\
- (x)->year = (y)->year;\
- (x)->pc = PACK2(EX_MON((y)->pc), EX_MDAY((y)->pc));\
- (x)->flags = (y)->flags;\
-}
-#endif
-
-/* base */
-
-static int c_valid_civil_p(int, int, int, double,
- int *, int *, int *, int *);
-
-static int
-c_find_fdoy(int y, double sg, int *rjd, int *ns)
-{
- int d, rm, rd;
-
- for (d = 1; d < 31; d++)
- if (c_valid_civil_p(y, 1, d, sg, &rm, &rd, rjd, ns))
- return 1;
- return 0;
-}
-
-static int
-c_find_ldoy(int y, double sg, int *rjd, int *ns)
-{
- int i, rm, rd;
-
- for (i = 0; i < 30; i++)
- if (c_valid_civil_p(y, 12, 31 - i, sg, &rm, &rd, rjd, ns))
- return 1;
- return 0;
-}
-
-#ifndef NDEBUG
-static int
-c_find_fdom(int y, int m, double sg, int *rjd, int *ns)
-{
- int d, rm, rd;
-
- for (d = 1; d < 31; d++)
- if (c_valid_civil_p(y, m, d, sg, &rm, &rd, rjd, ns))
- return 1;
- return 0;
-}
-#endif
-
-static int
-c_find_ldom(int y, int m, double sg, int *rjd, int *ns)
-{
- int i, rm, rd;
-
- for (i = 0; i < 30; i++)
- if (c_valid_civil_p(y, m, 31 - i, sg, &rm, &rd, rjd, ns))
- return 1;
- return 0;
-}
-
-static void
-c_civil_to_jd(int y, int m, int d, double sg, int *rjd, int *ns)
-{
- double a, b, jd;
-
- if (m <= 2) {
- y -= 1;
- m += 12;
- }
- a = floor(y / 100.0);
- b = 2 - a + floor(a / 4.0);
- jd = floor(365.25 * (y + 4716)) +
- floor(30.6001 * (m + 1)) +
- d + b - 1524;
- if (jd < sg) {
- jd -= b;
- *ns = 0;
- }
- else
- *ns = 1;
-
- *rjd = (int)jd;
-}
-
-static void
-c_jd_to_civil(int jd, double sg, int *ry, int *rm, int *rdom)
-{
- double x, a, b, c, d, e, y, m, dom;
-
- if (jd < sg)
- a = jd;
- else {
- x = floor((jd - 1867216.25) / 36524.25);
- a = jd + 1 + x - floor(x / 4.0);
- }
- b = a + 1524;
- c = floor((b - 122.1) / 365.25);
- d = floor(365.25 * c);
- e = floor((b - d) / 30.6001);
- dom = b - d - floor(30.6001 * e);
- if (e <= 13) {
- m = e - 1;
- y = c - 4716;
- }
- else {
- m = e - 13;
- y = c - 4715;
- }
-
- *ry = (int)y;
- *rm = (int)m;
- *rdom = (int)dom;
-}
-
-static void
-c_ordinal_to_jd(int y, int d, double sg, int *rjd, int *ns)
-{
- int ns2;
-
- c_find_fdoy(y, sg, rjd, &ns2);
- *rjd += d - 1;
- *ns = (*rjd < sg) ? 0 : 1;
-}
-
-static void
-c_jd_to_ordinal(int jd, double sg, int *ry, int *rd)
-{
- int rm2, rd2, rjd, ns;
-
- c_jd_to_civil(jd, sg, ry, &rm2, &rd2);
- c_find_fdoy(*ry, sg, &rjd, &ns);
- *rd = (jd - rjd) + 1;
-}
-
-static void
-c_commercial_to_jd(int y, int w, int d, double sg, int *rjd, int *ns)
-{
- int rjd2, ns2;
-
- c_find_fdoy(y, sg, &rjd2, &ns2);
- rjd2 += 3;
- *rjd =
- (rjd2 - MOD((rjd2 - 1) + 1, 7)) +
- 7 * (w - 1) +
- (d - 1);
- *ns = (*rjd < sg) ? 0 : 1;
-}
-
-static void
-c_jd_to_commercial(int jd, double sg, int *ry, int *rw, int *rd)
-{
- int ry2, rm2, rd2, a, rjd2, ns2;
-
- c_jd_to_civil(jd - 3, sg, &ry2, &rm2, &rd2);
- a = ry2;
- c_commercial_to_jd(a + 1, 1, 1, sg, &rjd2, &ns2);
- if (jd >= rjd2)
- *ry = a + 1;
- else {
- c_commercial_to_jd(a, 1, 1, sg, &rjd2, &ns2);
- *ry = a;
- }
- *rw = 1 + DIV(jd - rjd2, 7);
- *rd = MOD(jd + 1, 7);
- if (*rd == 0)
- *rd = 7;
-}
-
-static void
-c_weeknum_to_jd(int y, int w, int d, int f, double sg, int *rjd, int *ns)
-{
- int rjd2, ns2;
-
- c_find_fdoy(y, sg, &rjd2, &ns2);
- rjd2 += 6;
- *rjd = (rjd2 - MOD(((rjd2 - f) + 1), 7) - 7) + 7 * w + d;
- *ns = (*rjd < sg) ? 0 : 1;
-}
-
-static void
-c_jd_to_weeknum(int jd, int f, double sg, int *ry, int *rw, int *rd)
-{
- int rm, rd2, rjd, ns, j;
-
- c_jd_to_civil(jd, sg, ry, &rm, &rd2);
- c_find_fdoy(*ry, sg, &rjd, &ns);
- rjd += 6;
- j = jd - (rjd - MOD((rjd - f) + 1, 7)) + 7;
- *rw = (int)DIV(j, 7);
- *rd = (int)MOD(j, 7);
-}
-
-#ifndef NDEBUG
-static void
-c_nth_kday_to_jd(int y, int m, int n, int k, double sg, int *rjd, int *ns)
-{
- int rjd2, ns2;
-
- if (n > 0) {
- c_find_fdom(y, m, sg, &rjd2, &ns2);
- rjd2 -= 1;
- }
- else {
- c_find_ldom(y, m, sg, &rjd2, &ns2);
- rjd2 += 7;
- }
- *rjd = (rjd2 - MOD((rjd2 - k) + 1, 7)) + 7 * n;
- *ns = (*rjd < sg) ? 0 : 1;
-}
-#endif
-
-inline static int
-c_jd_to_wday(int jd)
-{
- return MOD(jd + 1, 7);
-}
-
-#ifndef NDEBUG
-static void
-c_jd_to_nth_kday(int jd, double sg, int *ry, int *rm, int *rn, int *rk)
-{
- int rd, rjd, ns2;
-
- c_jd_to_civil(jd, sg, ry, rm, &rd);
- c_find_fdom(*ry, *rm, sg, &rjd, &ns2);
- *rn = DIV(jd - rjd, 7) + 1;
- *rk = c_jd_to_wday(jd);
-}
-#endif
-
-static int
-c_valid_ordinal_p(int y, int d, double sg,
- int *rd, int *rjd, int *ns)
-{
- int ry2, rd2;
-
- if (d < 0) {
- int rjd2, ns2;
-
- if (!c_find_ldoy(y, sg, &rjd2, &ns2))
- return 0;
- c_jd_to_ordinal(rjd2 + d + 1, sg, &ry2, &rd2);
- if (ry2 != y)
- return 0;
- d = rd2;
- }
- c_ordinal_to_jd(y, d, sg, rjd, ns);
- c_jd_to_ordinal(*rjd, sg, &ry2, &rd2);
- if (ry2 != y || rd2 != d)
- return 0;
- return 1;
-}
-
-static const int monthtab[2][13] = {
- { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
- { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-inline static int
-c_julian_leap_p(int y)
-{
- return MOD(y, 4) == 0;
-}
-
-inline static int
-c_gregorian_leap_p(int y)
-{
- return MOD(y, 4) == 0 && y % 100 != 0 || MOD(y, 400) == 0;
-}
-
-static int
-c_julian_last_day_of_month(int y, int m)
-{
- assert(m >= 1 && m <= 12);
- return monthtab[c_julian_leap_p(y) ? 1 : 0][m];
-}
-
-static int
-c_gregorian_last_day_of_month(int y, int m)
-{
- assert(m >= 1 && m <= 12);
- return monthtab[c_gregorian_leap_p(y) ? 1 : 0][m];
-}
-
-static int
-c_valid_julian_p(int y, int m, int d, int *rm, int *rd)
-{
- int last;
-
- if (m < 0)
- m += 13;
- if (m < 1 || m > 12)
- return 0;
- last = c_julian_last_day_of_month(y, m);
- if (d < 0)
- d = last + d + 1;
- if (d < 1 || d > last)
- return 0;
- *rm = m;
- *rd = d;
- return 1;
-}
-
-static int
-c_valid_gregorian_p(int y, int m, int d, int *rm, int *rd)
-{
- int last;
-
- if (m < 0)
- m += 13;
- if (m < 1 || m > 12)
- return 0;
- last = c_gregorian_last_day_of_month(y, m);
- if (d < 0)
- d = last + d + 1;
- if (d < 1 || d > last)
- return 0;
- *rm = m;
- *rd = d;
- return 1;
-}
-
-static int
-c_valid_civil_p(int y, int m, int d, double sg,
- int *rm, int *rd, int *rjd, int *ns)
-{
- int ry;
-
- if (m < 0)
- m += 13;
- if (d < 0) {
- if (!c_find_ldom(y, m, sg, rjd, ns))
- return 0;
- c_jd_to_civil(*rjd + d + 1, sg, &ry, rm, rd);
- if (ry != y || *rm != m)
- return 0;
- d = *rd;
- }
- c_civil_to_jd(y, m, d, sg, rjd, ns);
- c_jd_to_civil(*rjd, sg, &ry, rm, rd);
- if (ry != y || *rm != m || *rd != d)
- return 0;
- return 1;
-}
-
-static int
-c_valid_commercial_p(int y, int w, int d, double sg,
- int *rw, int *rd, int *rjd, int *ns)
-{
- int ns2, ry2, rw2, rd2;
-
- if (d < 0)
- d += 8;
- if (w < 0) {
- int rjd2;
-
- c_commercial_to_jd(y + 1, 1, 1, sg, &rjd2, &ns2);
- c_jd_to_commercial(rjd2 + w * 7, sg, &ry2, &rw2, &rd2);
- if (ry2 != y)
- return 0;
- w = rw2;
- }
- c_commercial_to_jd(y, w, d, sg, rjd, ns);
- c_jd_to_commercial(*rjd, sg, &ry2, rw, rd);
- if (y != ry2 || w != *rw || d != *rd)
- return 0;
- return 1;
-}
-
-static int
-c_valid_weeknum_p(int y, int w, int d, int f, double sg,
- int *rw, int *rd, int *rjd, int *ns)
-{
- int ns2, ry2, rw2, rd2;
-
- if (d < 0)
- d += 7;
- if (w < 0) {
- int rjd2;
-
- c_weeknum_to_jd(y + 1, 1, f, f, sg, &rjd2, &ns2);
- c_jd_to_weeknum(rjd2 + w * 7, f, sg, &ry2, &rw2, &rd2);
- if (ry2 != y)
- return 0;
- w = rw2;
- }
- c_weeknum_to_jd(y, w, d, f, sg, rjd, ns);
- c_jd_to_weeknum(*rjd, f, sg, &ry2, rw, rd);
- if (y != ry2 || w != *rw || d != *rd)
- return 0;
- return 1;
-}
-
-#ifndef NDEBUG
-static int
-c_valid_nth_kday_p(int y, int m, int n, int k, double sg,
- int *rm, int *rn, int *rk, int *rjd, int *ns)
-{
- int ns2, ry2, rm2, rn2, rk2;
-
- if (k < 0)
- k += 7;
- if (n < 0) {
- int t, ny, nm, rjd2;
-
- t = y * 12 + m;
- ny = DIV(t, 12);
- nm = MOD(t, 12) + 1;
-
- c_nth_kday_to_jd(ny, nm, 1, k, sg, &rjd2, &ns2);
- c_jd_to_nth_kday(rjd2 + n * 7, sg, &ry2, &rm2, &rn2, &rk2);
- if (ry2 != y || rm2 != m)
- return 0;
- n = rn2;
- }
- c_nth_kday_to_jd(y, m, n, k, sg, rjd, ns);
- c_jd_to_nth_kday(*rjd, sg, &ry2, rm, rn, rk);
- if (y != ry2 || m != *rm || n != *rn || k != *rk)
- return 0;
- return 1;
-}
-#endif
-
-static int
-c_valid_time_p(int h, int min, int s, int *rh, int *rmin, int *rs)
-{
- if (h < 0)
- h += 24;
- if (min < 0)
- min += 60;
- if (s < 0)
- s += 60;
- *rh = h;
- *rmin = min;
- *rs = s;
- return !(h < 0 || h > 24 ||
- min < 0 || min > 59 ||
- s < 0 || s > 59 ||
- (h == 24 && (min > 0 || s > 0)));
-}
-
-inline static int
-c_valid_start_p(double sg)
-{
- if (isnan(sg))
- return 0;
- if (isinf(sg))
- return 1;
- if (sg < REFORM_BEGIN_JD || sg > REFORM_END_JD)
- return 0;
- return 1;
-}
-
-inline static int
-df_local_to_utc(int df, int of)
-{
- df -= of;
- if (df < 0)
- df += DAY_IN_SECONDS;
- else if (df >= DAY_IN_SECONDS)
- df -= DAY_IN_SECONDS;
- return df;
-}
-
-inline static int
-df_utc_to_local(int df, int of)
-{
- df += of;
- if (df < 0)
- df += DAY_IN_SECONDS;
- else if (df >= DAY_IN_SECONDS)
- df -= DAY_IN_SECONDS;
- return df;
-}
-
-inline static int
-jd_local_to_utc(int jd, int df, int of)
-{
- df -= of;
- if (df < 0)
- jd -= 1;
- else if (df >= DAY_IN_SECONDS)
- jd += 1;
- return jd;
-}
-
-inline static int
-jd_utc_to_local(int jd, int df, int of)
-{
- df += of;
- if (df < 0)
- jd -= 1;
- else if (df >= DAY_IN_SECONDS)
- jd += 1;
- return jd;
-}
-
-inline static int
-time_to_df(int h, int min, int s)
-{
- return h * HOUR_IN_SECONDS + min * MINUTE_IN_SECONDS + s;
-}
-
-inline static void
-df_to_time(int df, int *h, int *min, int *s)
-{
- *h = df / HOUR_IN_SECONDS;
- df %= HOUR_IN_SECONDS;
- *min = df / MINUTE_IN_SECONDS;
- *s = df % MINUTE_IN_SECONDS;
-}
-
-static VALUE
-sec_to_day(VALUE s)
-{
- if (FIXNUM_P(s))
- return rb_rational_new2(s, INT2FIX(DAY_IN_SECONDS));
- return f_quo(s, INT2FIX(DAY_IN_SECONDS));
-}
-
-inline static VALUE
-isec_to_day(int s)
-{
- return sec_to_day(INT2FIX(s));
-}
-
-static VALUE
-ns_to_day(VALUE n)
-{
- if (FIXNUM_P(n))
- return rb_rational_new2(n, day_in_nanoseconds);
- return f_quo(n, day_in_nanoseconds);
-}
-
-#ifndef NDEBUG
-static VALUE
-ms_to_sec(VALUE m)
-{
- if (FIXNUM_P(m))
- return rb_rational_new2(m, INT2FIX(SECOND_IN_MILLISECONDS));
- return f_quo(m, INT2FIX(SECOND_IN_MILLISECONDS));
-}
-#endif
-
-static VALUE
-ns_to_sec(VALUE n)
-{
- if (FIXNUM_P(n))
- return rb_rational_new2(n, INT2FIX(SECOND_IN_NANOSECONDS));
- return f_quo(n, INT2FIX(SECOND_IN_NANOSECONDS));
-}
-
-#ifndef NDEBUG
-inline static VALUE
-ins_to_day(int n)
-{
- return ns_to_day(INT2FIX(n));
-}
-#endif
-
-static int
-safe_mul_p(VALUE x, long m)
-{
- long ix;
-
- if (!FIXNUM_P(x))
- return 0;
- ix = FIX2LONG(x);
- if (ix < 0) {
- if (ix <= (FIXNUM_MIN / m))
- return 0;
- }
- else {
- if (ix >= (FIXNUM_MAX / m))
- return 0;
- }
- return 1;
-}
-
-static VALUE
-day_to_sec(VALUE d)
-{
- if (safe_mul_p(d, DAY_IN_SECONDS))
- return LONG2FIX(FIX2LONG(d) * DAY_IN_SECONDS);
- return f_mul(d, INT2FIX(DAY_IN_SECONDS));
-}
-
-#ifndef NDEBUG
-static VALUE
-day_to_ns(VALUE d)
-{
- return f_mul(d, day_in_nanoseconds);
-}
-#endif
-
-static VALUE
-sec_to_ms(VALUE s)
-{
- if (safe_mul_p(s, SECOND_IN_MILLISECONDS))
- return LONG2FIX(FIX2LONG(s) * SECOND_IN_MILLISECONDS);
- return f_mul(s, INT2FIX(SECOND_IN_MILLISECONDS));
-}
-
-static VALUE
-sec_to_ns(VALUE s)
-{
- if (safe_mul_p(s, SECOND_IN_NANOSECONDS))
- return LONG2FIX(FIX2LONG(s) * SECOND_IN_NANOSECONDS);
- return f_mul(s, INT2FIX(SECOND_IN_NANOSECONDS));
-}
-
-#ifndef NDEBUG
-static VALUE
-isec_to_ns(int s)
-{
- return sec_to_ns(INT2FIX(s));
-}
-#endif
-
-static VALUE
-div_day(VALUE d, VALUE *f)
-{
- if (f)
- *f = f_mod(d, INT2FIX(1));
- return f_floor(d);
-}
-
-static VALUE
-div_df(VALUE d, VALUE *f)
-{
- VALUE s = day_to_sec(d);
-
- if (f)
- *f = f_mod(s, INT2FIX(1));
- return f_floor(s);
-}
-
-#ifndef NDEBUG
-static VALUE
-div_sf(VALUE s, VALUE *f)
-{
- VALUE n = sec_to_ns(s);
-
- if (f)
- *f = f_mod(n, INT2FIX(1));
- return f_floor(n);
-}
-#endif
-
-static void
-decode_day(VALUE d, VALUE *jd, VALUE *df, VALUE *sf)
-{
- VALUE f;
-
- *jd = div_day(d, &f);
- *df = div_df(f, &f);
- *sf = sec_to_ns(f);
-}
-
-inline static double
-s_virtual_sg(union DateData *x)
-{
- if (isinf(x->s.sg))
- return x->s.sg;
- if (f_zero_p(x->s.nth))
- return x->s.sg;
- else if (f_negative_p(x->s.nth))
- return positive_inf;
- return negative_inf;
-}
-
-inline static double
-c_virtual_sg(union DateData *x)
-{
- if (isinf(x->c.sg))
- return x->c.sg;
- if (f_zero_p(x->c.nth))
- return x->c.sg;
- else if (f_negative_p(x->c.nth))
- return positive_inf;
- return negative_inf;
-}
-
-inline static double
-m_virtual_sg(union DateData *x)
-{
- if (simple_dat_p(x))
- return s_virtual_sg(x);
- else
- return c_virtual_sg(x);
-}
-
-#define canonicalize_jd(_nth, _jd) \
-{\
- if (_jd < 0) {\
- _nth = f_sub(_nth, INT2FIX(1));\
- _jd += CM_PERIOD;\
- }\
- if (_jd >= CM_PERIOD) {\
- _nth = f_add(_nth, INT2FIX(1));\
- _jd -= CM_PERIOD;\
- }\
-}
-
-inline static void
-canonicalize_s_jd(union DateData *x)
-{
- int j = x->s.jd;
- assert(have_jd_p(x));
- canonicalize_jd(x->s.nth, x->s.jd);
- if (x->s.jd != j)
- x->flags &= ~HAVE_CIVIL;
-}
-
-inline static void
-get_s_jd(union DateData *x)
-{
- assert(simple_dat_p(x));
- if (!have_jd_p(x)) {
- int jd, ns;
-
- assert(have_civil_p(x));
-#ifndef USE_PACK
- c_civil_to_jd(x->s.year, x->s.mon, x->s.mday,
- s_virtual_sg(x), &jd, &ns);
-#else
- c_civil_to_jd(x->s.year, EX_MON(x->s.pc), EX_MDAY(x->s.pc),
- s_virtual_sg(x), &jd, &ns);
-#endif
- x->s.jd = jd;
- x->s.flags |= HAVE_JD;
- }
-}
-
-inline static void
-get_s_civil(union DateData *x)
-{
- assert(simple_dat_p(x));
- if (!have_civil_p(x)) {
- int y, m, d;
-
- assert(have_jd_p(x));
- c_jd_to_civil(x->s.jd, s_virtual_sg(x), &y, &m, &d);
- x->s.year = y;
-#ifndef USE_PACK
- x->s.mon = m;
- x->s.mday = d;
-#else
- x->s.pc = PACK2(m, d);
-#endif
- x->s.flags |= HAVE_CIVIL;
- }
-}
-
-inline static void
-get_c_df(union DateData *x)
-{
- assert(complex_dat_p(x));
- if (!have_df_p(x)) {
- assert(have_time_p(x));
-#ifndef USE_PACK
- x->c.df = df_local_to_utc(time_to_df(x->c.hour, x->c.min, x->c.sec),
- x->c.of);
-#else
- x->c.df = df_local_to_utc(time_to_df(EX_HOUR(x->c.pc),
- EX_MIN(x->c.pc),
- EX_SEC(x->c.pc)),
- x->c.of);
-#endif
- x->c.flags |= HAVE_DF;
- }
-}
-
-inline static void
-get_c_time(union DateData *x)
-{
- assert(complex_dat_p(x));
- if (!have_time_p(x)) {
-#ifndef USE_PACK
- int r;
- assert(have_df_p(x));
- r = df_utc_to_local(x->c.df, x->c.of);
- df_to_time(r, &x->c.hour, &x->c.min, &x->c.sec);
- x->c.flags |= HAVE_TIME;
-#else
- int r, m, d, h, min, s;
-
- assert(have_df_p(x));
- m = EX_MON(x->c.pc);
- d = EX_MDAY(x->c.pc);
- r = df_utc_to_local(x->c.df, x->c.of);
- df_to_time(r, &h, &min, &s);
- x->c.pc = PACK5(m, d, h, min, s);
- x->c.flags |= HAVE_TIME;
-#endif
- }
-}
-
-inline static void
-canonicalize_c_jd(union DateData *x)
-{
- int j = x->c.jd;
- assert(have_jd_p(x));
- canonicalize_jd(x->c.nth, x->c.jd);
- if (x->c.jd != j)
- x->flags &= ~HAVE_CIVIL;
-}
-
-inline static void
-get_c_jd(union DateData *x)
-{
- assert(complex_dat_p(x));
- if (!have_jd_p(x)) {
- int jd, ns;
-
- assert(have_civil_p(x));
-#ifndef USE_PACK
- c_civil_to_jd(x->c.year, x->c.mon, x->c.mday,
- c_virtual_sg(x), &jd, &ns);
-#else
- c_civil_to_jd(x->c.year, EX_MON(x->c.pc), EX_MDAY(x->c.pc),
- c_virtual_sg(x), &jd, &ns);
-#endif
-
- get_c_time(x);
-#ifndef USE_PACK
- x->c.jd = jd_local_to_utc(jd,
- time_to_df(x->c.hour, x->c.min, x->c.sec),
- x->c.of);
-#else
- x->c.jd = jd_local_to_utc(jd,
- time_to_df(EX_HOUR(x->c.pc),
- EX_MIN(x->c.pc),
- EX_SEC(x->c.pc)),
- x->c.of);
-#endif
- x->c.flags |= HAVE_JD;
- }
-}
-
-inline static void
-get_c_civil(union DateData *x)
-{
- assert(complex_dat_p(x));
- if (!have_civil_p(x)) {
-#ifndef USE_PACK
- int jd, y, m, d;
-#else
- int jd, y, m, d, h, min, s;
-#endif
-
- assert(have_jd_p(x));
- get_c_df(x);
- jd = jd_utc_to_local(x->c.jd, x->c.df, x->c.of);
- c_jd_to_civil(jd, c_virtual_sg(x), &y, &m, &d);
- x->c.year = y;
-#ifndef USE_PACK
- x->c.mon = m;
- x->c.mday = d;
-#else
- h = EX_HOUR(x->c.pc);
- min = EX_MIN(x->c.pc);
- s = EX_SEC(x->c.pc);
- x->c.pc = PACK5(m, d, h, min, s);
-#endif
- x->c.flags |= HAVE_CIVIL;
- }
-}
-
-inline static int
-local_jd(union DateData *x)
-{
- assert(complex_dat_p(x));
- assert(have_jd_p(x));
- assert(have_df_p(x));
- return jd_utc_to_local(x->c.jd, x->c.df, x->c.of);
-}
-
-inline static int
-local_df(union DateData *x)
-{
- assert(complex_dat_p(x));
- assert(have_df_p(x));
- return df_utc_to_local(x->c.df, x->c.of);
-}
-
-static void
-decode_year(VALUE y, double style,
- VALUE *nth, int *ry)
-{
- int period;
- VALUE t;
-
- period = (style < 0) ?
- CM_PERIOD_GCY :
- CM_PERIOD_JCY;
- if (FIXNUM_P(y)) {
- long iy, it, inth;
-
- iy = FIX2LONG(y);
- if (iy >= (FIXNUM_MAX - 4712))
- goto big;
- it = iy + 4712; /* shift */
- inth = DIV(it, ((long)period));
- *nth = LONG2FIX(inth);
- if (inth)
- it = MOD(it, ((long)period));
- *ry = (int)it - 4712; /* unshift */
- return;
- }
- big:
- t = f_add(y, INT2FIX(4712)); /* shift */
- *nth = f_idiv(t, INT2FIX(period));
- if (f_nonzero_p(*nth))
- t = f_mod(t, INT2FIX(period));
- *ry = FIX2INT(t) - 4712; /* unshift */
-}
-
-static void
-encode_year(VALUE nth, int y, double style,
- VALUE *ry)
-{
- int period;
- VALUE t;
-
- period = (style < 0) ?
- CM_PERIOD_GCY :
- CM_PERIOD_JCY;
- if (f_zero_p(nth))
- *ry = INT2FIX(y);
- else {
- t = f_mul(INT2FIX(period), nth);
- t = f_add(t, INT2FIX(y));
- *ry = t;
- }
-}
-
-static void
-decode_jd(VALUE jd, VALUE *nth, int *rjd)
-{
- assert(FIXNUM_P(jd) || RB_TYPE_P(jd, T_BIGNUM));
- *nth = f_idiv(jd, INT2FIX(CM_PERIOD));
- if (f_zero_p(*nth)) {
- assert(FIXNUM_P(jd));
- *rjd = FIX2INT(jd);
- return;
- }
- *rjd = FIX2INT(f_mod(jd, INT2FIX(CM_PERIOD)));
-}
-
-static void
-encode_jd(VALUE nth, int jd, VALUE *rjd)
-{
- if (f_zero_p(nth)) {
- *rjd = INT2FIX(jd);
- return;
- }
- *rjd = f_add(f_mul(INT2FIX(CM_PERIOD), nth), INT2FIX(jd));
-}
-
-inline static double
-guess_style(VALUE y, double sg) /* -/+oo or zero */
-{
- double style = 0;
-
- if (isinf(sg))
- style = sg;
- else if (!FIXNUM_P(y))
- style = f_positive_p(y) ? negative_inf : positive_inf;
- else {
- long iy = FIX2LONG(y);
-
- assert(FIXNUM_P(y));
- if (iy < REFORM_BEGIN_YEAR)
- style = positive_inf;
- else if (iy > REFORM_END_YEAR)
- style = negative_inf;
- }
- return style;
-}
-
-inline static void
-m_canonicalize_jd(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_jd(x);
- canonicalize_s_jd(x);
- }
- else {
- get_c_jd(x);
- canonicalize_c_jd(x);
- }
-}
-
-inline static VALUE
-m_nth(union DateData *x)
-{
- if (simple_dat_p(x))
- return x->s.nth;
- else {
- get_c_civil(x);
- return x->c.nth;
- }
-}
-
-inline static int
-m_jd(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_jd(x);
- return x->s.jd;
- }
- else {
- get_c_jd(x);
- return x->c.jd;
- }
-}
-
-static VALUE
-m_real_jd(union DateData *x)
-{
- VALUE nth, rjd;
- int jd;
-
- nth = m_nth(x);
- jd = m_jd(x);
-
- encode_jd(nth, jd, &rjd);
- return rjd;
-}
-
-static int
-m_local_jd(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_jd(x);
- return x->s.jd;
- }
- else {
- get_c_jd(x);
- get_c_df(x);
- return local_jd(x);
- }
-}
-
-static VALUE
-m_real_local_jd(union DateData *x)
-{
- VALUE nth, rjd;
- int jd;
-
- nth = m_nth(x);
- jd = m_local_jd(x);
-
- encode_jd(nth, jd, &rjd);
- return rjd;
-}
-
-inline static int
-m_df(union DateData *x)
-{
- if (simple_dat_p(x))
- return 0;
- else {
- get_c_df(x);
- return x->c.df;
- }
-}
-
-#ifndef NDEBUG
-static VALUE
-m_df_in_day(union DateData *x)
-{
- return isec_to_day(m_df(x));
-}
-#endif
-
-static int
-m_local_df(union DateData *x)
-{
- if (simple_dat_p(x))
- return 0;
- else {
- get_c_df(x);
- return local_df(x);
- }
-}
-
-#ifndef NDEBUG
-static VALUE
-m_local_df_in_day(union DateData *x)
-{
- return isec_to_day(m_local_df(x));
-}
-#endif
-
-inline static VALUE
-m_sf(union DateData *x)
-{
- if (simple_dat_p(x))
- return INT2FIX(0);
- else
- return x->c.sf;
-}
-
-#ifndef NDEBUG
-static VALUE
-m_sf_in_day(union DateData *x)
-{
- return ns_to_day(m_sf(x));
-}
-#endif
-
-static VALUE
-m_sf_in_sec(union DateData *x)
-{
- return ns_to_sec(m_sf(x));
-}
-
-static VALUE
-m_fr(union DateData *x)
-{
- if (simple_dat_p(x))
- return INT2FIX(0);
- else {
- int df;
- VALUE sf, fr;
-
- df = m_local_df(x);
- sf = m_sf(x);
- fr = isec_to_day(df);
- if (f_nonzero_p(sf))
- fr = f_add(fr, ns_to_day(sf));
- return fr;
- }
-}
-
-#define HALF_DAYS_IN_SECONDS (DAY_IN_SECONDS / 2)
-
-static VALUE
-m_ajd(union DateData *x)
-{
- VALUE r, sf;
- int df;
-
- if (simple_dat_p(x)) {
- r = m_real_jd(x);
- if (FIXNUM_P(r) && FIX2LONG(r) <= (FIXNUM_MAX / 2)) {
- long ir = FIX2LONG(r);
- ir = ir * 2 - 1;
- return rb_rational_new2(LONG2FIX(ir), INT2FIX(2));
- }
- else
- return rb_rational_new2(f_sub(f_mul(r,
- INT2FIX(2)),
- INT2FIX(1)),
- INT2FIX(2));
- }
-
- r = m_real_jd(x);
- df = m_df(x);
- df -= HALF_DAYS_IN_SECONDS;
- if (df)
- r = f_add(r, isec_to_day(df));
- sf = m_sf(x);
- if (f_nonzero_p(sf))
- r = f_add(r, ns_to_day(sf));
-
- return r;
-}
-
-static VALUE
-m_amjd(union DateData *x)
-{
- VALUE r, sf;
- int df;
-
- r = m_real_jd(x);
- if (FIXNUM_P(r) && FIX2LONG(r) >= (FIXNUM_MIN + 2400001)) {
- long ir = FIX2LONG(r);
- ir -= 2400001;
- r = rb_rational_new1(LONG2FIX(ir));
- }
- else
- r = rb_rational_new1(f_sub(m_real_jd(x),
- INT2FIX(2400001)));
-
- if (simple_dat_p(x))
- return r;
-
- df = m_df(x);
- if (df)
- r = f_add(r, isec_to_day(df));
- sf = m_sf(x);
- if (f_nonzero_p(sf))
- r = f_add(r, ns_to_day(sf));
-
- return r;
-}
-
-inline static int
-m_of(union DateData *x)
-{
- if (simple_dat_p(x))
- return 0;
- else {
- get_c_jd(x);
- return x->c.of;
- }
-}
-
-static VALUE
-m_of_in_day(union DateData *x)
-{
- return isec_to_day(m_of(x));
-}
-
-inline static double
-m_sg(union DateData *x)
-{
- if (simple_dat_p(x))
- return x->s.sg;
- else {
- get_c_jd(x);
- return x->c.sg;
- }
-}
-
-static int
-m_julian_p(union DateData *x)
-{
- int jd;
- double sg;
-
- if (simple_dat_p(x)) {
- get_s_jd(x);
- jd = x->s.jd;
- sg = s_virtual_sg(x);
- }
- else {
- get_c_jd(x);
- jd = x->c.jd;
- sg = c_virtual_sg(x);
- }
- if (isinf(sg))
- return sg == positive_inf;
- return jd < sg;
-}
-
-inline static int
-m_gregorian_p(union DateData *x)
-{
- return !m_julian_p(x);
-}
-
-inline static int
-m_proleptic_julian_p(union DateData *x)
-{
- double sg;
-
- sg = m_sg(x);
- if (isinf(sg) && sg > 0)
- return 1;
- return 0;
-}
-
-inline static int
-m_proleptic_gregorian_p(union DateData *x)
-{
- double sg;
-
- sg = m_sg(x);
- if (isinf(sg) && sg < 0)
- return 1;
- return 0;
-}
-
-inline static int
-m_year(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_civil(x);
- return x->s.year;
- }
- else {
- get_c_civil(x);
- return x->c.year;
- }
-}
-
-static VALUE
-m_real_year(union DateData *x)
-{
- VALUE nth, ry;
- int year;
-
- nth = m_nth(x);
- year = m_year(x);
-
- if (f_zero_p(nth))
- return INT2FIX(year);
-
- encode_year(nth, year,
- m_gregorian_p(x) ? -1 : +1,
- &ry);
- return ry;
-}
-
-
-#ifdef USE_PACK
-inline static int
-m_pc(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_civil(x);
- return x->s.pc;
- }
- else {
- get_c_civil(x);
- get_c_time(x);
- return x->c.pc;
- }
-}
-#endif
-
-inline static int
-m_mon(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_civil(x);
-#ifndef USE_PACK
- return x->s.mon;
-#else
- return EX_MON(x->s.pc);
-#endif
- }
- else {
- get_c_civil(x);
-#ifndef USE_PACK
- return x->c.mon;
-#else
- return EX_MON(x->c.pc);
-#endif
- }
-}
-
-inline static int
-m_mday(union DateData *x)
-{
- if (simple_dat_p(x)) {
- get_s_civil(x);
-#ifndef USE_PACK
- return x->s.mday;
-#else
- return EX_MDAY(x->s.pc);
-#endif
- }
- else {
- get_c_civil(x);
-#ifndef USE_PACK
- return x->c.mday;
-#else
- return EX_MDAY(x->c.pc);
-#endif
- }
-}
-
-static const int yeartab[2][13] = {
- { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
- { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
-};
-
-static int
-c_julian_to_yday(int y, int m, int d)
-{
- assert(m >= 1 && m <= 12);
- return yeartab[c_julian_leap_p(y) ? 1 : 0][m] + d;
-}
-
-static int
-c_gregorian_to_yday(int y, int m, int d)
-{
- assert(m >= 1 && m <= 12);
- return yeartab[c_gregorian_leap_p(y) ? 1 : 0][m] + d;
-}
-
-static int
-m_yday(union DateData *x)
-{
- int jd, ry, rd;
- double sg;
-
- jd = m_local_jd(x);
- sg = m_virtual_sg(x); /* !=m_sg() */
-
- if (m_proleptic_gregorian_p(x) ||
- (jd - sg) > 366)
- return c_gregorian_to_yday(m_year(x), m_mon(x), m_mday(x));
- if (m_proleptic_julian_p(x))
- return c_julian_to_yday(m_year(x), m_mon(x), m_mday(x));
- c_jd_to_ordinal(jd, sg, &ry, &rd);
- return rd;
-}
-
-static int
-m_wday(union DateData *x)
-{
- return c_jd_to_wday(m_local_jd(x));
-}
-
-static int
-m_cwyear(union DateData *x)
-{
- int ry, rw, rd;
-
- c_jd_to_commercial(m_local_jd(x), m_virtual_sg(x), /* !=m_sg() */
- &ry, &rw, &rd);
- return ry;
-}
-
-static VALUE
-m_real_cwyear(union DateData *x)
-{
- VALUE nth, ry;
- int year;
-
- nth = m_nth(x);
- year = m_cwyear(x);
-
- if (f_zero_p(nth))
- return INT2FIX(year);
-
- encode_year(nth, year,
- m_gregorian_p(x) ? -1 : +1,
- &ry);
- return ry;
-}
-
-static int
-m_cweek(union DateData *x)
-{
- int ry, rw, rd;
-
- c_jd_to_commercial(m_local_jd(x), m_virtual_sg(x), /* !=m_sg() */
- &ry, &rw, &rd);
- return rw;
-}
-
-static int
-m_cwday(union DateData *x)
-{
- int w;
-
- w = m_wday(x);
- if (w == 0)
- w = 7;
- return w;
-}
-
-static int
-m_wnumx(union DateData *x, int f)
-{
- int ry, rw, rd;
-
- c_jd_to_weeknum(m_local_jd(x), f, m_virtual_sg(x), /* !=m_sg() */
- &ry, &rw, &rd);
- return rw;
-}
-
-static int
-m_wnum0(union DateData *x)
-{
- return m_wnumx(x, 0);
-}
-
-static int
-m_wnum1(union DateData *x)
-{
- return m_wnumx(x, 1);
-}
-
-inline static int
-m_hour(union DateData *x)
-{
- if (simple_dat_p(x))
- return 0;
- else {
- get_c_time(x);
-#ifndef USE_PACK
- return x->c.hour;
-#else
- return EX_HOUR(x->c.pc);
-#endif
- }
-}
-
-inline static int
-m_min(union DateData *x)
-{
- if (simple_dat_p(x))
- return 0;
- else {
- get_c_time(x);
-#ifndef USE_PACK
- return x->c.min;
-#else
- return EX_MIN(x->c.pc);
-#endif
- }
-}
-
-inline static int
-m_sec(union DateData *x)
-{
- if (simple_dat_p(x))
- return 0;
- else {
- get_c_time(x);
-#ifndef USE_PACK
- return x->c.sec;
-#else
- return EX_SEC(x->c.pc);
-#endif
- }
-}
-
-#define decode_offset(of,s,h,m)\
-{\
- int a;\
- s = (of < 0) ? '-' : '+';\
- a = (of < 0) ? -of : of;\
- h = a / HOUR_IN_SECONDS;\
- m = a % HOUR_IN_SECONDS / MINUTE_IN_SECONDS;\
-}
-
-static VALUE
-of2str(int of)
-{
- int s, h, m;
-
- decode_offset(of, s, h, m);
- return rb_enc_sprintf(rb_usascii_encoding(), "%c%02d:%02d", s, h, m);
-}
-
-static VALUE
-m_zone(union DateData *x)
-{
- if (simple_dat_p(x))
- return rb_usascii_str_new2("+00:00");
- return of2str(m_of(x));
-}
-
-inline static VALUE
-f_kind_of_p(VALUE x, VALUE c)
-{
- return rb_obj_is_kind_of(x, c);
-}
-
-inline static VALUE
-k_date_p(VALUE x)
-{
- return f_kind_of_p(x, cDate);
-}
-
-inline static VALUE
-k_datetime_p(VALUE x)
-{
- return f_kind_of_p(x, cDateTime);
-}
-
-inline static VALUE
-k_numeric_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cNumeric);
-}
-
-inline static VALUE
-k_rational_p(VALUE x)
-{
- return f_kind_of_p(x, rb_cRational);
-}
-
-#ifndef NDEBUG
-static void
-civil_to_jd(VALUE y, int m, int d, double sg,
- VALUE *nth, int *ry,
- int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
-
- if (style == 0) {
- int jd;
-
- c_civil_to_jd(FIX2INT(y), m, d, sg, &jd, ns);
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- c_civil_to_jd(*ry, m, d, style, rjd, ns);
- }
-}
-
-static void
-jd_to_civil(VALUE jd, double sg,
- VALUE *nth, int *rjd,
- int *ry, int *rm, int *rd)
-{
- decode_jd(jd, nth, rjd);
- c_jd_to_civil(*rjd, sg, ry, rm, rd);
-}
-
-static void
-ordinal_to_jd(VALUE y, int d, double sg,
- VALUE *nth, int *ry,
- int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
-
- if (style == 0) {
- int jd;
-
- c_ordinal_to_jd(FIX2INT(y), d, sg, &jd, ns);
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- c_ordinal_to_jd(*ry, d, style, rjd, ns);
- }
-}
-
-static void
-jd_to_ordinal(VALUE jd, double sg,
- VALUE *nth, int *rjd,
- int *ry, int *rd)
-{
- decode_jd(jd, nth, rjd);
- c_jd_to_ordinal(*rjd, sg, ry, rd);
-}
-
-static void
-commercial_to_jd(VALUE y, int w, int d, double sg,
- VALUE *nth, int *ry,
- int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
-
- if (style == 0) {
- int jd;
-
- c_commercial_to_jd(FIX2INT(y), w, d, sg, &jd, ns);
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- c_commercial_to_jd(*ry, w, d, style, rjd, ns);
- }
-}
-
-static void
-jd_to_commercial(VALUE jd, double sg,
- VALUE *nth, int *rjd,
- int *ry, int *rw, int *rd)
-{
- decode_jd(jd, nth, rjd);
- c_jd_to_commercial(*rjd, sg, ry, rw, rd);
-}
-
-static void
-weeknum_to_jd(VALUE y, int w, int d, int f, double sg,
- VALUE *nth, int *ry,
- int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
-
- if (style == 0) {
- int jd;
-
- c_weeknum_to_jd(FIX2INT(y), w, d, f, sg, &jd, ns);
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- c_weeknum_to_jd(*ry, w, d, f, style, rjd, ns);
- }
-}
-
-static void
-jd_to_weeknum(VALUE jd, int f, double sg,
- VALUE *nth, int *rjd,
- int *ry, int *rw, int *rd)
-{
- decode_jd(jd, nth, rjd);
- c_jd_to_weeknum(*rjd, f, sg, ry, rw, rd);
-}
-
-static void
-nth_kday_to_jd(VALUE y, int m, int n, int k, double sg,
- VALUE *nth, int *ry,
- int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
-
- if (style == 0) {
- int jd;
-
- c_nth_kday_to_jd(FIX2INT(y), m, n, k, sg, &jd, ns);
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- c_nth_kday_to_jd(*ry, m, n, k, style, rjd, ns);
- }
-}
-
-static void
-jd_to_nth_kday(VALUE jd, double sg,
- VALUE *nth, int *rjd,
- int *ry, int *rm, int *rn, int *rk)
-{
- decode_jd(jd, nth, rjd);
- c_jd_to_nth_kday(*rjd, sg, ry, rm, rn, rk);
-}
-#endif
-
-static int
-valid_ordinal_p(VALUE y, int d, double sg,
- VALUE *nth, int *ry,
- int *rd, int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
- int r;
-
- if (style == 0) {
- int jd;
-
- r = c_valid_ordinal_p(FIX2INT(y), d, sg, rd, &jd, ns);
- if (!r)
- return 0;
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- r = c_valid_ordinal_p(*ry, d, style, rd, rjd, ns);
- }
- return r;
-}
-
-static int
-valid_gregorian_p(VALUE y, int m, int d,
- VALUE *nth, int *ry,
- int *rm, int *rd)
-{
- decode_year(y, -1, nth, ry);
- return c_valid_gregorian_p(*ry, m, d, rm, rd);
-}
-
-static int
-valid_civil_p(VALUE y, int m, int d, double sg,
- VALUE *nth, int *ry,
- int *rm, int *rd, int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
- int r;
-
- if (style == 0) {
- int jd;
-
- r = c_valid_civil_p(FIX2INT(y), m, d, sg, rm, rd, &jd, ns);
- if (!r)
- return 0;
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- if (style < 0)
- r = c_valid_gregorian_p(*ry, m, d, rm, rd);
- else
- r = c_valid_julian_p(*ry, m, d, rm, rd);
- if (!r)
- return 0;
- c_civil_to_jd(*ry, *rm, *rd, style, rjd, ns);
- }
- return r;
-}
-
-static int
-valid_commercial_p(VALUE y, int w, int d, double sg,
- VALUE *nth, int *ry,
- int *rw, int *rd, int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
- int r;
-
- if (style == 0) {
- int jd;
-
- r = c_valid_commercial_p(FIX2INT(y), w, d, sg, rw, rd, &jd, ns);
- if (!r)
- return 0;
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- r = c_valid_commercial_p(*ry, w, d, style, rw, rd, rjd, ns);
- }
- return r;
-}
-
-static int
-valid_weeknum_p(VALUE y, int w, int d, int f, double sg,
- VALUE *nth, int *ry,
- int *rw, int *rd, int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
- int r;
-
- if (style == 0) {
- int jd;
-
- r = c_valid_weeknum_p(FIX2INT(y), w, d, f, sg, rw, rd, &jd, ns);
- if (!r)
- return 0;
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- r = c_valid_weeknum_p(*ry, w, d, f, style, rw, rd, rjd, ns);
- }
- return r;
-}
-
-#ifndef NDEBUG
-static int
-valid_nth_kday_p(VALUE y, int m, int n, int k, double sg,
- VALUE *nth, int *ry,
- int *rm, int *rn, int *rk, int *rjd,
- int *ns)
-{
- double style = guess_style(y, sg);
- int r;
-
- if (style == 0) {
- int jd;
-
- r = c_valid_nth_kday_p(FIX2INT(y), m, n, k, sg, rm, rn, rk, &jd, ns);
- if (!r)
- return 0;
- decode_jd(INT2FIX(jd), nth, rjd);
- if (f_zero_p(*nth))
- *ry = FIX2INT(y);
- else {
- VALUE nth2;
- decode_year(y, *ns ? -1 : +1, &nth2, ry);
- }
- }
- else {
- decode_year(y, style, nth, ry);
- r = c_valid_nth_kday_p(*ry, m, n, k, style, rm, rn, rk, rjd, ns);
- }
- return r;
-}
-#endif
-
-VALUE date_zone_to_diff(VALUE);
-
-static int
-offset_to_sec(VALUE vof, int *rof)
-{
- switch (TYPE(vof)) {
- case T_FIXNUM:
- {
- long n;
-
- n = FIX2LONG(vof);
- if (n != -1 && n != 0 && n != 1)
- return 0;
- *rof = (int)n * DAY_IN_SECONDS;
- return 1;
- }
- case T_FLOAT:
- {
- double n;
-
- n = RFLOAT_VALUE(vof) * DAY_IN_SECONDS;
- if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
- return 0;
- *rof = (int)round(n);
- if (*rof != n)
- rb_warning("fraction of offset is ignored");
- return 1;
- }
- default:
- if (!k_numeric_p(vof))
- rb_raise(rb_eTypeError, "expected numeric");
- vof = f_to_r(vof);
-#ifdef CANONICALIZATION_FOR_MATHN
- if (!k_rational_p(vof))
- return offset_to_sec(vof, rof);
-#endif
- /* fall through */
- case T_RATIONAL:
- {
- VALUE vs, vn, vd;
- long n;
-
- vs = day_to_sec(vof);
-
-#ifdef CANONICALIZATION_FOR_MATHN
- if (!k_rational_p(vs)) {
- if (!FIXNUM_P(vs))
- return 0;
- n = FIX2LONG(vs);
- if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
- return 0;
- *rof = (int)n;
- return 1;
- }
-#endif
- vn = RRATIONAL(vs)->num;
- vd = RRATIONAL(vs)->den;
-
- if (FIXNUM_P(vn) && FIXNUM_P(vd) && (FIX2LONG(vd) == 1))
- n = FIX2LONG(vn);
- else {
- vn = f_round(vs);
- if (!f_eqeq_p(vn, vs))
- rb_warning("fraction of offset is ignored");
- if (!FIXNUM_P(vn))
- return 0;
- n = FIX2LONG(vn);
- if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
- return 0;
- }
- *rof = (int)n;
- return 1;
- }
- case T_STRING:
- {
- VALUE vs = date_zone_to_diff(vof);
- long n;
-
- if (!FIXNUM_P(vs))
- return 0;
- n = FIX2LONG(vs);
- if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
- return 0;
- *rof = (int)n;
- return 1;
- }
- }
- return 0;
-}
-
-/* date */
-
-#define valid_sg(sg) \
-{\
- if (!c_valid_start_p(sg)) {\
- sg = 0;\
- rb_warning("invalid start is ignored");\
- }\
-}
-
-static VALUE
-valid_jd_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
-{
- double sg = NUM2DBL(argv[1]);
- valid_sg(sg);
- return argv[0];
-}
-
-#ifndef NDEBUG
-static VALUE
-date_s__valid_jd_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vjd, vsg;
- VALUE argv2[2];
-
- rb_scan_args(argc, argv, "11", &vjd, &vsg);
-
- argv2[0] = vjd;
- if (argc < 2)
- argv2[1] = DBL2NUM(GREGORIAN);
- else
- argv2[1] = vsg;
-
- return valid_jd_sub(2, argv2, klass, 1);
-}
-#endif
-
-/*
- * call-seq:
- * Date.valid_jd?(jd[, start=Date::ITALY]) -> bool
- *
- * Just returns true. It's nonsense, but is for symmetry.
- *
- * Date.valid_jd?(2451944) #=> true
- *
- * See also jd.
- */
-static VALUE
-date_s_valid_jd_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vjd, vsg;
- VALUE argv2[2];
-
- rb_scan_args(argc, argv, "11", &vjd, &vsg);
-
- argv2[0] = vjd;
- if (argc < 2)
- argv2[1] = INT2FIX(DEFAULT_SG);
- else
- argv2[1] = vsg;
-
- if (NIL_P(valid_jd_sub(2, argv2, klass, 0)))
- return Qfalse;
- return Qtrue;
-}
-
-static VALUE
-valid_civil_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
-{
- VALUE nth, y;
- int m, d, ry, rm, rd;
- double sg;
-
- y = argv[0];
- m = NUM2INT(argv[1]);
- d = NUM2INT(argv[2]);
- sg = NUM2DBL(argv[3]);
-
- valid_sg(sg);
-
- if (!need_jd && (guess_style(y, sg) < 0)) {
- if (!valid_gregorian_p(y, m, d,
- &nth, &ry,
- &rm, &rd))
- return Qnil;
- return INT2FIX(0); /* dummy */
- }
- else {
- int rjd, ns;
- VALUE rjd2;
-
- if (!valid_civil_p(y, m, d, sg,
- &nth, &ry,
- &rm, &rd, &rjd,
- &ns))
- return Qnil;
- if (!need_jd)
- return INT2FIX(0); /* dummy */
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
- }
-}
-
-#ifndef NDEBUG
-static VALUE
-date_s__valid_civil_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vd, vsg;
- VALUE argv2[4];
-
- rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vm;
- argv2[2] = vd;
- if (argc < 4)
- argv2[3] = DBL2NUM(GREGORIAN);
- else
- argv2[3] = vsg;
-
- return valid_civil_sub(4, argv2, klass, 1);
-}
-#endif
-
-/*
- * call-seq:
- * Date.valid_civil?(year, month, mday[, start=Date::ITALY]) -> bool
- * Date.valid_date?(year, month, mday[, start=Date::ITALY]) -> bool
- *
- * Returns true if the given calendar date is valid, and false if not.
- *
- * Date.valid_date?(2001,2,3) #=> true
- * Date.valid_date?(2001,2,29) #=> false
- *
- * See also jd and civil.
- */
-static VALUE
-date_s_valid_civil_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vd, vsg;
- VALUE argv2[4];
-
- rb_scan_args(argc, argv, "31", &vy, &vm, &vd, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vm;
- argv2[2] = vd;
- if (argc < 4)
- argv2[3] = INT2FIX(DEFAULT_SG);
- else
- argv2[3] = vsg;
-
- if (NIL_P(valid_civil_sub(4, argv2, klass, 0)))
- return Qfalse;
- return Qtrue;
-}
-
-static VALUE
-valid_ordinal_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
-{
- VALUE nth, y;
- int d, ry, rd;
- double sg;
-
- y = argv[0];
- d = NUM2INT(argv[1]);
- sg = NUM2DBL(argv[2]);
-
- valid_sg(sg);
-
- {
- int rjd, ns;
- VALUE rjd2;
-
- if (!valid_ordinal_p(y, d, sg,
- &nth, &ry,
- &rd, &rjd,
- &ns))
- return Qnil;
- if (!need_jd)
- return INT2FIX(0); /* dummy */
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
- }
-}
-
-#ifndef NDEBUG
-static VALUE
-date_s__valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vd, vsg;
- VALUE argv2[3];
-
- rb_scan_args(argc, argv, "21", &vy, &vd, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vd;
- if (argc < 3)
- argv2[2] = DBL2NUM(GREGORIAN);
- else
- argv2[2] = vsg;
-
- return valid_ordinal_sub(3, argv2, klass, 1);
-}
-#endif
-
-/*
- * call-seq:
- * Date.valid_ordinal?(year, yday[, start=Date::ITALY]) -> bool
- *
- * Returns true if the given ordinal date is valid, and false if not.
- *
- * Date.valid_ordinal?(2001,34) #=> true
- * Date.valid_ordinal?(2001,366) #=> false
- *
- * See also jd and ordinal.
- */
-static VALUE
-date_s_valid_ordinal_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vd, vsg;
- VALUE argv2[3];
-
- rb_scan_args(argc, argv, "21", &vy, &vd, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vd;
- if (argc < 3)
- argv2[2] = INT2FIX(DEFAULT_SG);
- else
- argv2[2] = vsg;
-
- if (NIL_P(valid_ordinal_sub(3, argv2, klass, 0)))
- return Qfalse;
- return Qtrue;
-}
-
-static VALUE
-valid_commercial_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
-{
- VALUE nth, y;
- int w, d, ry, rw, rd;
- double sg;
-
- y = argv[0];
- w = NUM2INT(argv[1]);
- d = NUM2INT(argv[2]);
- sg = NUM2DBL(argv[3]);
-
- valid_sg(sg);
-
- {
- int rjd, ns;
- VALUE rjd2;
-
- if (!valid_commercial_p(y, w, d, sg,
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- return Qnil;
- if (!need_jd)
- return INT2FIX(0); /* dummy */
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
- }
-}
-
-#ifndef NDEBUG
-static VALUE
-date_s__valid_commercial_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vsg;
- VALUE argv2[4];
-
- rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vw;
- argv2[2] = vd;
- if (argc < 4)
- argv2[3] = DBL2NUM(GREGORIAN);
- else
- argv2[3] = vsg;
-
- return valid_commercial_sub(4, argv2, klass, 1);
-}
-#endif
-
-/*
- * call-seq:
- * Date.valid_commercial?(cwyear, cweek, cwday[, start=Date::ITALY]) -> bool
- *
- * Returns true if the given week date is valid, and false if not.
- *
- * Date.valid_commercial?(2001,5,6) #=> true
- * Date.valid_commercial?(2001,5,8) #=> false
- *
- * See also jd and commercial.
- */
-static VALUE
-date_s_valid_commercial_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vsg;
- VALUE argv2[4];
-
- rb_scan_args(argc, argv, "31", &vy, &vw, &vd, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vw;
- argv2[2] = vd;
- if (argc < 4)
- argv2[3] = INT2FIX(DEFAULT_SG);
- else
- argv2[3] = vsg;
-
- if (NIL_P(valid_commercial_sub(4, argv2, klass, 0)))
- return Qfalse;
- return Qtrue;
-}
-
-#ifndef NDEBUG
-static VALUE
-valid_weeknum_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
-{
- VALUE nth, y;
- int w, d, f, ry, rw, rd;
- double sg;
-
- y = argv[0];
- w = NUM2INT(argv[1]);
- d = NUM2INT(argv[2]);
- f = NUM2INT(argv[3]);
- sg = NUM2DBL(argv[4]);
-
- valid_sg(sg);
-
- {
- int rjd, ns;
- VALUE rjd2;
-
- if (!valid_weeknum_p(y, w, d, f, sg,
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- return Qnil;
- if (!need_jd)
- return INT2FIX(0); /* dummy */
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
- }
-}
-
-static VALUE
-date_s__valid_weeknum_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vf, vsg;
- VALUE argv2[5];
-
- rb_scan_args(argc, argv, "41", &vy, &vw, &vd, &vf, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vw;
- argv2[2] = vd;
- argv2[3] = vf;
- if (argc < 5)
- argv2[4] = DBL2NUM(GREGORIAN);
- else
- argv2[4] = vsg;
-
- return valid_weeknum_sub(5, argv2, klass, 1);
-}
-
-static VALUE
-date_s_valid_weeknum_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vf, vsg;
- VALUE argv2[5];
-
- rb_scan_args(argc, argv, "41", &vy, &vw, &vd, &vf, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vw;
- argv2[2] = vd;
- argv2[3] = vf;
- if (argc < 5)
- argv2[4] = INT2FIX(DEFAULT_SG);
- else
- argv2[4] = vsg;
-
- if (NIL_P(valid_weeknum_sub(5, argv2, klass, 0)))
- return Qfalse;
- return Qtrue;
-}
-
-static VALUE
-valid_nth_kday_sub(int argc, VALUE *argv, VALUE klass, int need_jd)
-{
- VALUE nth, y;
- int m, n, k, ry, rm, rn, rk;
- double sg;
-
- y = argv[0];
- m = NUM2INT(argv[1]);
- n = NUM2INT(argv[2]);
- k = NUM2INT(argv[3]);
- sg = NUM2DBL(argv[4]);
-
- {
- int rjd, ns;
- VALUE rjd2;
-
- if (!valid_nth_kday_p(y, m, n, k, sg,
- &nth, &ry,
- &rm, &rn, &rk, &rjd,
- &ns))
- return Qnil;
- if (!need_jd)
- return INT2FIX(0); /* dummy */
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
- }
-}
-
-static VALUE
-date_s__valid_nth_kday_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vn, vk, vsg;
- VALUE argv2[5];
-
- rb_scan_args(argc, argv, "41", &vy, &vm, &vn, &vk, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vm;
- argv2[2] = vn;
- argv2[3] = vk;
- if (argc < 5)
- argv2[4] = DBL2NUM(GREGORIAN);
- else
- argv2[4] = vsg;
-
- return valid_nth_kday_sub(5, argv2, klass, 1);
-}
-
-static VALUE
-date_s_valid_nth_kday_p(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vn, vk, vsg;
- VALUE argv2[5];
-
- rb_scan_args(argc, argv, "41", &vy, &vm, &vn, &vk, &vsg);
-
- argv2[0] = vy;
- argv2[1] = vm;
- argv2[2] = vn;
- argv2[3] = vk;
- if (argc < 5)
- argv2[4] = INT2FIX(DEFAULT_SG);
- else
- argv2[4] = vsg;
-
- if (NIL_P(valid_nth_kday_sub(5, argv2, klass, 0)))
- return Qfalse;
- return Qtrue;
-}
-
-static VALUE
-date_s_zone_to_diff(VALUE klass, VALUE str)
-{
- return date_zone_to_diff(str);
-}
-#endif
-
-/*
- * call-seq:
- * Date.julian_leap?(year) -> bool
- *
- * Returns true if the given year is a leap year of the proleptic
- * Julian calendar.
- *
- * Date.julian_leap?(1900) #=> true
- * Date.julian_leap?(1901) #=> false
- */
-static VALUE
-date_s_julian_leap_p(VALUE klass, VALUE y)
-{
- VALUE nth;
- int ry;
-
- decode_year(y, +1, &nth, &ry);
- return f_boolcast(c_julian_leap_p(ry));
-}
-
-/*
- * call-seq:
- * Date.gregorian_leap?(year) -> bool
- * Date.leap?(year) -> bool
- *
- * Returns true if the given year is a leap year of the proleptic
- * Gregorian calendar.
- *
- * Date.gregorian_leap?(1900) #=> false
- * Date.gregorian_leap?(2000) #=> true
- */
-static VALUE
-date_s_gregorian_leap_p(VALUE klass, VALUE y)
-{
- VALUE nth;
- int ry;
-
- decode_year(y, -1, &nth, &ry);
- return f_boolcast(c_gregorian_leap_p(ry));
-}
-
-static void
-d_lite_gc_mark(union DateData *dat)
-{
- if (simple_dat_p(dat))
- rb_gc_mark(dat->s.nth);
- else {
- rb_gc_mark(dat->c.nth);
- rb_gc_mark(dat->c.sf);
-
- }
-}
-
-inline static VALUE
-d_simple_new_internal(VALUE klass,
- VALUE nth, int jd,
- double sg,
- int y, int m, int d,
- unsigned flags)
-{
- struct SimpleDateData *dat;
- VALUE obj;
-
- obj = Data_Make_Struct(klass, struct SimpleDateData,
- d_lite_gc_mark, -1, dat);
- set_to_simple(dat, nth, jd, sg, y, m, d, flags & ~COMPLEX_DAT);
-
- assert(have_jd_p(dat) || have_civil_p(dat));
-
- return obj;
-}
-
-inline static VALUE
-d_complex_new_internal(VALUE klass,
- VALUE nth, int jd,
- int df, VALUE sf,
- int of, double sg,
- int y, int m, int d,
- int h, int min, int s,
- unsigned flags)
-{
- struct ComplexDateData *dat;
- VALUE obj;
-
- obj = Data_Make_Struct(klass, struct ComplexDateData,
- d_lite_gc_mark, -1, dat);
- set_to_complex(dat, nth, jd, df, sf, of, sg,
- y, m, d, h, min, s, flags | COMPLEX_DAT);
-
- assert(have_jd_p(dat) || have_civil_p(dat));
- assert(have_df_p(dat) || have_time_p(dat));
-
- return obj;
-}
-
-static VALUE
-d_lite_s_alloc_simple(VALUE klass)
-{
- return d_simple_new_internal(klass,
- INT2FIX(0), 0,
- DEFAULT_SG,
- 0, 0, 0,
- HAVE_JD);
-}
-
-static VALUE
-d_lite_s_alloc_complex(VALUE klass)
-{
- return d_complex_new_internal(klass,
- INT2FIX(0), 0,
- 0, INT2FIX(0),
- 0, DEFAULT_SG,
- 0, 0, 0,
- 0, 0, 0,
- HAVE_JD | HAVE_DF);
-}
-
-static VALUE
-d_lite_s_alloc(VALUE klass)
-{
- return d_lite_s_alloc_complex(klass);
-}
-
-static void
-old_to_new(VALUE ajd, VALUE of, VALUE sg,
- VALUE *rnth, int *rjd, int *rdf, VALUE *rsf,
- int *rof, double *rsg)
-{
- VALUE jd, df, sf, of2, t;
-
- decode_day(f_add(ajd, half_days_in_day),
- &jd, &df, &sf);
- t = day_to_sec(of);
- of2 = f_round(t);
-
- if (!f_eqeq_p(of2, t))
- rb_warning("fraction of offset is ignored");
-
- decode_jd(jd, rnth, rjd);
-
- *rdf = NUM2INT(df);
- *rsf = sf;
- *rof = NUM2INT(of2);
- *rsg = NUM2DBL(sg);
-
- if (*rdf < 0 || *rdf >= DAY_IN_SECONDS)
- rb_raise(rb_eArgError, "invalid day fraction");
-
- if (f_lt_p(*rsf, INT2FIX(0)) ||
- f_ge_p(*rsf, INT2FIX(SECOND_IN_NANOSECONDS)))
-
- if (*rof < -DAY_IN_SECONDS || *rof > DAY_IN_SECONDS) {
- *rof = 0;
- rb_warning("invalid offset is ignored");
- }
-
- if (!c_valid_start_p(*rsg)) {
- *rsg = DEFAULT_SG;
- rb_warning("invalid start is ignored");
- }
-}
-
-#ifndef NDEBUG
-static VALUE
-date_s_new_bang(int argc, VALUE *argv, VALUE klass)
-{
- VALUE ajd, of, sg, nth, sf;
- int jd, df, rof;
- double rsg;
-
- rb_scan_args(argc, argv, "03", &ajd, &of, &sg);
-
- switch (argc) {
- case 0:
- ajd = INT2FIX(0);
- case 1:
- of = INT2FIX(0);
- case 2:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- old_to_new(ajd, of, sg,
- &nth, &jd, &df, &sf, &rof, &rsg);
-
- if (!df && f_zero_p(sf) && !rof)
- return d_simple_new_internal(klass,
- nth, jd,
- rsg,
- 0, 0, 0,
- HAVE_JD);
- else
- return d_complex_new_internal(klass,
- nth, jd,
- df, sf,
- rof, rsg,
- 0, 0, 0,
- 0, 0, 0,
- HAVE_JD | HAVE_DF);
-}
-#endif
-
-inline static int
-wholenum_p(VALUE x)
-{
- if (FIXNUM_P(x))
- return 1;
- switch (TYPE(x)) {
- case T_BIGNUM:
- return 1;
- case T_FLOAT:
- {
- double d = RFLOAT_VALUE(x);
- return round(d) == d;
- }
- break;
- case T_RATIONAL:
- {
- VALUE den = RRATIONAL(x)->den;
- return FIXNUM_P(den) && FIX2LONG(den) == 1;
- }
- break;
- }
- return 0;
-}
-
-inline static VALUE
-to_integer(VALUE x)
-{
- if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM))
- return x;
- return f_to_i(x);
-}
-
-inline static VALUE
-d_trunc(VALUE d, VALUE *fr)
-{
- VALUE rd;
-
- if (wholenum_p(d)) {
- rd = to_integer(d);
- *fr = INT2FIX(0);
- }
- else {
- rd = f_idiv(d, INT2FIX(1));
- *fr = f_mod(d, INT2FIX(1));
- }
- return rd;
-}
-
-#define jd_trunc d_trunc
-#define k_trunc d_trunc
-
-inline static VALUE
-h_trunc(VALUE h, VALUE *fr)
-{
- VALUE rh;
-
- if (wholenum_p(h)) {
- rh = to_integer(h);
- *fr = INT2FIX(0);
- }
- else {
- rh = f_idiv(h, INT2FIX(1));
- *fr = f_mod(h, INT2FIX(1));
- *fr = f_quo(*fr, INT2FIX(24));
- }
- return rh;
-}
-
-inline static VALUE
-min_trunc(VALUE min, VALUE *fr)
-{
- VALUE rmin;
-
- if (wholenum_p(min)) {
- rmin = to_integer(min);
- *fr = INT2FIX(0);
- }
- else {
- rmin = f_idiv(min, INT2FIX(1));
- *fr = f_mod(min, INT2FIX(1));
- *fr = f_quo(*fr, INT2FIX(1440));
- }
- return rmin;
-}
-
-inline static VALUE
-s_trunc(VALUE s, VALUE *fr)
-{
- VALUE rs;
-
- if (wholenum_p(s)) {
- rs = to_integer(s);
- *fr = INT2FIX(0);
- }
- else {
- rs = f_idiv(s, INT2FIX(1));
- *fr = f_mod(s, INT2FIX(1));
- *fr = f_quo(*fr, INT2FIX(86400));
- }
- return rs;
-}
-
-#define num2num_with_frac(s,n) \
-{\
- s = s##_trunc(v##s, &fr);\
- if (f_nonzero_p(fr)) {\
- if (argc > n)\
- rb_raise(rb_eArgError, "invalid fraction");\
- fr2 = fr;\
- }\
-}
-
-#define num2int_with_frac(s,n) \
-{\
- s = NUM2INT(s##_trunc(v##s, &fr));\
- if (f_nonzero_p(fr)) {\
- if (argc > n)\
- rb_raise(rb_eArgError, "invalid fraction");\
- fr2 = fr;\
- }\
-}
-
-#define canon24oc() \
-{\
- if (rh == 24) {\
- rh = 0;\
- fr2 = f_add(fr2, INT2FIX(1));\
- }\
-}
-
-#define add_frac() \
-{\
- if (f_nonzero_p(fr2))\
- ret = d_lite_plus(ret, fr2);\
-}
-
-#define val2sg(vsg,dsg) \
-{\
- dsg = NUM2DBL(vsg);\
- if (!c_valid_start_p(dsg)) {\
- dsg = DEFAULT_SG;\
- rb_warning("invalid start is ignored");\
- }\
-}
-
-static VALUE d_lite_plus(VALUE, VALUE);
-
-/*
- * call-seq:
- * Date.jd([jd=0[, start=Date::ITALY]]) -> date
- *
- * Creates a date object denoting the given chronological Julian day
- * number.
- *
- * Date.jd(2451944) #=> #<Date: 2001-02-03 ...>
- * Date.jd(2451945) #=> #<Date: 2001-02-04 ...>
- * Date.jd(0) #=> #<Date: -4712-01-01 ...>
- *
- * See also new.
- */
-static VALUE
-date_s_jd(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vjd, vsg, jd, fr, fr2, ret;
- double sg;
-
- rb_scan_args(argc, argv, "02", &vjd, &vsg);
-
- jd = INT2FIX(0);
- fr2 = INT2FIX(0);
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 2:
- val2sg(vsg, sg);
- case 1:
- num2num_with_frac(jd, positive_inf);
- }
-
- {
- VALUE nth;
- int rjd;
-
- decode_jd(jd, &nth, &rjd);
- ret = d_simple_new_internal(klass,
- nth, rjd,
- sg,
- 0, 0, 0,
- HAVE_JD);
- }
- add_frac();
- return ret;
-}
-
-/*
- * call-seq:
- * Date.ordinal([year=-4712[, yday=1[, start=Date::ITALY]]]) -> date
- *
- * Creates a date object denoting the given ordinal date.
- *
- * The day of year should be a negative or a positive number (as a
- * relative day from the end of year when negative). It should not be
- * zero.
- *
- * Date.ordinal(2001) #=> #<Date: 2001-01-01 ...>
- * Date.ordinal(2001,34) #=> #<Date: 2001-02-03 ...>
- * Date.ordinal(2001,-1) #=> #<Date: 2001-12-31 ...>
- *
- * See also jd and new.
- */
-static VALUE
-date_s_ordinal(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vd, vsg, y, fr, fr2, ret;
- int d;
- double sg;
-
- rb_scan_args(argc, argv, "03", &vy, &vd, &vsg);
-
- y = INT2FIX(-4712);
- d = 1;
- fr2 = INT2FIX(0);
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 3:
- val2sg(vsg, sg);
- case 2:
- num2int_with_frac(d, positive_inf);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rd, rjd, ns;
-
- if (!valid_ordinal_p(y, d, sg,
- &nth, &ry,
- &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
-
- ret = d_simple_new_internal(klass,
- nth, rjd,
- sg,
- 0, 0, 0,
- HAVE_JD);
- }
- add_frac();
- return ret;
-}
-
-/*
- * call-seq:
- * Date.civil([year=-4712[, month=1[, mday=1[, start=Date::ITALY]]]]) -> date
- * Date.new([year=-4712[, month=1[, mday=1[, start=Date::ITALY]]]]) -> date
- *
- * Creates a date object denoting the given calendar date.
- *
- * In this class, BCE years are counted astronomically. Thus, the
- * year before the year 1 is the year zero, and the year preceding the
- * year zero is the year -1. The month and the day of month should be
- * a negative or a positive number (as a relative month/day from the
- * end of year/month when negative). They should not be zero.
- *
- * The last argument should be a Julian day number which denotes the
- * day of calendar reform. Date::ITALY (2299161=1582-10-15),
- * Date::ENGLAND (2361222=1752-09-14), Date::GREGORIAN (the proleptic
- * Gregorian calendar) and Date::JULIAN (the proleptic Julian
- * calendar) can be specified as a day of calendar reform.
- *
- * Date.new(2001) #=> #<Date: 2001-01-01 ...>
- * Date.new(2001,2,3) #=> #<Date: 2001-02-03 ...>
- * Date.new(2001,2,-1) #=> #<Date: 2001-02-28 ...>
- *
- * See also jd.
- */
-static VALUE
-date_s_civil(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vd, vsg, y, fr, fr2, ret;
- int m, d;
- double sg;
-
- rb_scan_args(argc, argv, "04", &vy, &vm, &vd, &vsg);
-
- y = INT2FIX(-4712);
- m = 1;
- d = 1;
- fr2 = INT2FIX(0);
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 4:
- val2sg(vsg, sg);
- case 3:
- num2int_with_frac(d, positive_inf);
- case 2:
- m = NUM2INT(vm);
- case 1:
- y = vy;
- }
-
- if (guess_style(y, sg) < 0) {
- VALUE nth;
- int ry, rm, rd;
-
- if (!valid_gregorian_p(y, m, d,
- &nth, &ry,
- &rm, &rd))
- rb_raise(rb_eArgError, "invalid date");
-
- ret = d_simple_new_internal(klass,
- nth, 0,
- sg,
- ry, rm, rd,
- HAVE_CIVIL);
- }
- else {
- VALUE nth;
- int ry, rm, rd, rjd, ns;
-
- if (!valid_civil_p(y, m, d, sg,
- &nth, &ry,
- &rm, &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
-
- ret = d_simple_new_internal(klass,
- nth, rjd,
- sg,
- ry, rm, rd,
- HAVE_JD | HAVE_CIVIL);
- }
- add_frac();
- return ret;
-}
-
-/*
- * call-seq:
- * Date.commercial([cwyear=-4712[, cweek=1[, cwday=1[, start=Date::ITALY]]]]) -> date
- *
- * Creates a date object denoting the given week date.
- *
- * The week and the day of week should be a negative or a positive
- * number (as a relative week/day from the end of year/week when
- * negative). They should not be zero.
- *
- * Date.commercial(2001) #=> #<Date: 2001-01-01 ...>
- * Date.commercial(2002) #=> #<Date: 2001-12-31 ...>
- * Date.commercial(2001,5,6) #=> #<Date: 2001-02-03 ...>
- *
- * See also jd and new.
- */
-static VALUE
-date_s_commercial(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vsg, y, fr, fr2, ret;
- int w, d;
- double sg;
-
- rb_scan_args(argc, argv, "04", &vy, &vw, &vd, &vsg);
-
- y = INT2FIX(-4712);
- w = 1;
- d = 1;
- fr2 = INT2FIX(0);
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 4:
- val2sg(vsg, sg);
- case 3:
- num2int_with_frac(d, positive_inf);
- case 2:
- w = NUM2INT(vw);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rw, rd, rjd, ns;
-
- if (!valid_commercial_p(y, w, d, sg,
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
-
- ret = d_simple_new_internal(klass,
- nth, rjd,
- sg,
- 0, 0, 0,
- HAVE_JD);
- }
- add_frac();
- return ret;
-}
-
-#ifndef NDEBUG
-static VALUE
-date_s_weeknum(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vf, vsg, y, fr, fr2, ret;
- int w, d, f;
- double sg;
-
- rb_scan_args(argc, argv, "05", &vy, &vw, &vd, &vf, &vsg);
-
- y = INT2FIX(-4712);
- w = 0;
- d = 1;
- f = 0;
- fr2 = INT2FIX(0);
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 5:
- val2sg(vsg, sg);
- case 4:
- f = NUM2INT(vf);
- case 3:
- num2int_with_frac(d, positive_inf);
- case 2:
- w = NUM2INT(vw);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rw, rd, rjd, ns;
-
- if (!valid_weeknum_p(y, w, d, f, sg,
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
-
- ret = d_simple_new_internal(klass,
- nth, rjd,
- sg,
- 0, 0, 0,
- HAVE_JD);
- }
- add_frac();
- return ret;
-}
-
-static VALUE
-date_s_nth_kday(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vn, vk, vsg, y, fr, fr2, ret;
- int m, n, k;
- double sg;
-
- rb_scan_args(argc, argv, "05", &vy, &vm, &vn, &vk, &vsg);
-
- y = INT2FIX(-4712);
- m = 1;
- n = 1;
- k = 1;
- fr2 = INT2FIX(0);
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 5:
- val2sg(vsg, sg);
- case 4:
- num2int_with_frac(k, positive_inf);
- case 3:
- n = NUM2INT(vn);
- case 2:
- m = NUM2INT(vm);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rm, rn, rk, rjd, ns;
-
- if (!valid_nth_kday_p(y, m, n, k, sg,
- &nth, &ry,
- &rm, &rn, &rk, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
-
- ret = d_simple_new_internal(klass,
- nth, rjd,
- sg,
- 0, 0, 0,
- HAVE_JD);
- }
- add_frac();
- return ret;
-}
-#endif
-
-#if !defined(HAVE_GMTIME_R)
-static struct tm*
-gmtime_r(const time_t *t, struct tm *tm)
-{
- auto struct tm *tmp = gmtime(t);
- if (tmp)
- *tm = *tmp;
- return tmp;
-}
-
-static struct tm*
-localtime_r(const time_t *t, struct tm *tm)
-{
- auto struct tm *tmp = localtime(t);
- if (tmp)
- *tm = *tmp;
- return tmp;
-}
-#endif
-
-static void set_sg(union DateData *, double);
-
-/*
- * call-seq:
- * Date.today([start=Date::ITALY]) -> date
- *
- * Date.today #=> #<Date: 2011-06-11 ..>
- *
- * Creates a date object denoting the present day.
- */
-static VALUE
-date_s_today(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vsg, nth, ret;
- double sg;
- time_t t;
- struct tm tm;
- int y, ry, m, d;
-
- rb_scan_args(argc, argv, "01", &vsg);
-
- if (argc < 1)
- sg = DEFAULT_SG;
- else
- val2sg(vsg, sg);
-
- if (time(&t) == -1)
- rb_sys_fail("time");
- tzset();
- if (!localtime_r(&t, &tm))
- rb_sys_fail("localtime");
-
- y = tm.tm_year + 1900;
- m = tm.tm_mon + 1;
- d = tm.tm_mday;
-
- decode_year(INT2FIX(y), -1, &nth, &ry);
-
- ret = d_simple_new_internal(klass,
- nth, 0,
- GREGORIAN,
- ry, m, d,
- HAVE_CIVIL);
- {
- get_d1(ret);
- set_sg(dat, sg);
- }
- return ret;
-}
-
-#define set_hash0(k,v) rb_hash_aset(hash, k, v)
-#define ref_hash0(k) rb_hash_aref(hash, k)
-#define del_hash0(k) rb_hash_delete(hash, k)
-
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
-
-static VALUE
-rt_rewrite_frags(VALUE hash)
-{
- VALUE seconds;
-
- seconds = ref_hash("seconds");
- if (!NIL_P(seconds)) {
- VALUE d, h, min, s, fr;
-
- d = f_idiv(seconds, INT2FIX(DAY_IN_SECONDS));
- fr = f_mod(seconds, INT2FIX(DAY_IN_SECONDS));
-
- h = f_idiv(fr, INT2FIX(HOUR_IN_SECONDS));
- fr = f_mod(fr, INT2FIX(HOUR_IN_SECONDS));
-
- min = f_idiv(fr, INT2FIX(MINUTE_IN_SECONDS));
- fr = f_mod(fr, INT2FIX(MINUTE_IN_SECONDS));
-
- s = f_idiv(fr, INT2FIX(1));
- fr = f_mod(fr, INT2FIX(1));
-
- set_hash("jd", f_add(UNIX_EPOCH_IN_CJD, d));
- set_hash("hour", h);
- set_hash("min", min);
- set_hash("sec", s);
- set_hash("sec_fraction", fr);
- del_hash("seconds");
- del_hash("offset");
- }
- return hash;
-}
-
-#define sym(x) ID2SYM(rb_intern(x))
-
-static VALUE d_lite_year(VALUE);
-static VALUE d_lite_wday(VALUE);
-static VALUE d_lite_jd(VALUE);
-
-static VALUE
-rt_complete_frags(VALUE klass, VALUE hash)
-{
- static VALUE tab = Qnil;
- int g, e;
- VALUE k, a, d;
-
- if (NIL_P(tab)) {
- tab = rb_ary_new3(11,
- rb_ary_new3(2,
- sym("time"),
- rb_ary_new3(3,
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- Qnil,
- rb_ary_new3(1,
- sym("jd"))),
- rb_ary_new3(2,
- sym("ordinal"),
- rb_ary_new3(5,
- sym("year"),
- sym("yday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- sym("civil"),
- rb_ary_new3(6,
- sym("year"),
- sym("mon"),
- sym("mday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- sym("commercial"),
- rb_ary_new3(6,
- sym("cwyear"),
- sym("cweek"),
- sym("cwday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- sym("wday"),
- rb_ary_new3(4,
- sym("wday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- sym("wnum0"),
- rb_ary_new3(6,
- sym("year"),
- sym("wnum0"),
- sym("wday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- sym("wnum1"),
- rb_ary_new3(6,
- sym("year"),
- sym("wnum1"),
- sym("wday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- Qnil,
- rb_ary_new3(6,
- sym("cwyear"),
- sym("cweek"),
- sym("wday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- Qnil,
- rb_ary_new3(6,
- sym("year"),
- sym("wnum0"),
- sym("cwday"),
- sym("hour"),
- sym("min"),
- sym("sec"))),
- rb_ary_new3(2,
- Qnil,
- rb_ary_new3(6,
- sym("year"),
- sym("wnum1"),
- sym("cwday"),
- sym("hour"),
- sym("min"),
- sym("sec"))));
- rb_gc_register_mark_object(tab);
- }
-
- {
- int i, eno = 0, idx = 0;
-
- for (i = 0; i < RARRAY_LENINT(tab); i++) {
- VALUE x, a;
-
- x = RARRAY_PTR(tab)[i];
- a = RARRAY_PTR(x)[1];
-
- {
- int j, n = 0;
-
- for (j = 0; j < RARRAY_LENINT(a); j++)
- if (!NIL_P(ref_hash0(RARRAY_PTR(a)[j])))
- n++;
- if (n > eno) {
- eno = n;
- idx = i;
- }
- }
- }
- if (eno == 0)
- g = 0;
- else {
- g = 1;
- k = RARRAY_PTR(RARRAY_PTR(tab)[idx])[0];
- a = RARRAY_PTR(RARRAY_PTR(tab)[idx])[1];
- e = eno;
- }
- }
-
- d = Qnil;
-
- if (g && !NIL_P(k) && (RARRAY_LENINT(a) - e)) {
- if (k == sym("ordinal")) {
- if (NIL_P(ref_hash("year"))) {
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- set_hash("year", d_lite_year(d));
- }
- if (NIL_P(ref_hash("yday")))
- set_hash("yday", INT2FIX(1));
- }
- else if (k == sym("civil")) {
- int i;
-
- for (i = 0; i < RARRAY_LENINT(a); i++) {
- VALUE e = RARRAY_PTR(a)[i];
-
- if (!NIL_P(ref_hash0(e)))
- break;
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- set_hash0(e, rb_funcall(d, SYM2ID(e), 0));
- }
- if (NIL_P(ref_hash("mon")))
- set_hash("mon", INT2FIX(1));
- if (NIL_P(ref_hash("mday")))
- set_hash("mday", INT2FIX(1));
- }
- else if (k == sym("commercial")) {
- int i;
-
- for (i = 0; i < RARRAY_LENINT(a); i++) {
- VALUE e = RARRAY_PTR(a)[i];
-
- if (!NIL_P(ref_hash0(e)))
- break;
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- set_hash0(e, rb_funcall(d, SYM2ID(e), 0));
- }
- if (NIL_P(ref_hash("cweek")))
- set_hash("cweek", INT2FIX(1));
- if (NIL_P(ref_hash("cwday")))
- set_hash("cwday", INT2FIX(1));
- }
- else if (k == sym("wday")) {
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- set_hash("jd", d_lite_jd(f_add(f_sub(d,
- d_lite_wday(d)),
- ref_hash("wday"))));
- }
- else if (k == sym("wnum0")) {
- int i;
-
- for (i = 0; i < RARRAY_LENINT(a); i++) {
- VALUE e = RARRAY_PTR(a)[i];
-
- if (!NIL_P(ref_hash0(e)))
- break;
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- set_hash0(e, rb_funcall(d, SYM2ID(e), 0));
- }
- if (NIL_P(ref_hash("wnum0")))
- set_hash("wnum0", INT2FIX(0));
- if (NIL_P(ref_hash("wday")))
- set_hash("wday", INT2FIX(0));
- }
- else if (k == sym("wnum1")) {
- int i;
-
- for (i = 0; i < RARRAY_LENINT(a); i++) {
- VALUE e = RARRAY_PTR(a)[i];
-
- if (!NIL_P(ref_hash0(e)))
- break;
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- set_hash0(e, rb_funcall(d, SYM2ID(e), 0));
- }
- if (NIL_P(ref_hash("wnum1")))
- set_hash("wnum1", INT2FIX(0));
- if (NIL_P(ref_hash("wday")))
- set_hash("wday", INT2FIX(1));
- }
- }
-
- if (g && k == sym("time")) {
- if (f_le_p(klass, cDateTime)) {
- if (NIL_P(d))
- d = date_s_today(0, (VALUE *)0, cDate);
- if (NIL_P(ref_hash("jd")))
- set_hash("jd", d_lite_jd(d));
- }
- }
-
- if (NIL_P(ref_hash("hour")))
- set_hash("hour", INT2FIX(0));
- if (NIL_P(ref_hash("min")))
- set_hash("min", INT2FIX(0));
- if (NIL_P(ref_hash("sec")))
- set_hash("sec", INT2FIX(0));
- else if (f_gt_p(ref_hash("sec"), INT2FIX(59)))
- set_hash("sec", INT2FIX(59));
-
- return hash;
-}
-
-static VALUE
-rt__valid_jd_p(VALUE jd, VALUE sg)
-{
- return jd;
-}
-
-static VALUE
-rt__valid_ordinal_p(VALUE y, VALUE d, VALUE sg)
-{
- VALUE nth, rjd2;
- int ry, rd, rjd, ns;
-
- if (!valid_ordinal_p(y, NUM2INT(d), NUM2DBL(sg),
- &nth, &ry,
- &rd, &rjd,
- &ns))
- return Qnil;
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
-}
-
-static VALUE
-rt__valid_civil_p(VALUE y, VALUE m, VALUE d, VALUE sg)
-{
- VALUE nth, rjd2;
- int ry, rm, rd, rjd, ns;
-
- if (!valid_civil_p(y, NUM2INT(m), NUM2INT(d), NUM2DBL(sg),
- &nth, &ry,
- &rm, &rd, &rjd,
- &ns))
- return Qnil;
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
-}
-
-static VALUE
-rt__valid_commercial_p(VALUE y, VALUE w, VALUE d, VALUE sg)
-{
- VALUE nth, rjd2;
- int ry, rw, rd, rjd, ns;
-
- if (!valid_commercial_p(y, NUM2INT(w), NUM2INT(d), NUM2DBL(sg),
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- return Qnil;
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
-}
-
-static VALUE
-rt__valid_weeknum_p(VALUE y, VALUE w, VALUE d, VALUE f, VALUE sg)
-{
- VALUE nth, rjd2;
- int ry, rw, rd, rjd, ns;
-
- if (!valid_weeknum_p(y, NUM2INT(w), NUM2INT(d), NUM2INT(f), NUM2DBL(sg),
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- return Qnil;
- encode_jd(nth, rjd, &rjd2);
- return rjd2;
-}
-
-static VALUE
-rt__valid_date_frags_p(VALUE hash, VALUE sg)
-{
- {
- VALUE vjd;
-
- if (!NIL_P(vjd = ref_hash("jd"))) {
- VALUE jd = rt__valid_jd_p(vjd, sg);
- if (!NIL_P(jd))
- return jd;
- }
- }
-
- {
- VALUE year, yday;
-
- if (!NIL_P(yday = ref_hash("yday")) &&
- !NIL_P(year = ref_hash("year"))) {
- VALUE jd = rt__valid_ordinal_p(year, yday, sg);
- if (!NIL_P(jd))
- return jd;
- }
- }
-
- {
- VALUE year, mon, mday;
-
- if (!NIL_P(mday = ref_hash("mday")) &&
- !NIL_P(mon = ref_hash("mon")) &&
- !NIL_P(year = ref_hash("year"))) {
- VALUE jd = rt__valid_civil_p(year, mon, mday, sg);
- if (!NIL_P(jd))
- return jd;
- }
- }
-
- {
- VALUE year, week, wday;
-
- wday = ref_hash("cwday");
- if (NIL_P(wday)) {
- wday = ref_hash("wday");
- if (!NIL_P(wday))
- if (f_zero_p(wday))
- wday = INT2FIX(7);
- }
-
- if (!NIL_P(wday) &&
- !NIL_P(week = ref_hash("cweek")) &&
- !NIL_P(year = ref_hash("cwyear"))) {
- VALUE jd = rt__valid_commercial_p(year, week, wday, sg);
- if (!NIL_P(jd))
- return jd;
- }
- }
-
- {
- VALUE year, week, wday;
-
- wday = ref_hash("wday");
- if (NIL_P(wday)) {
- wday = ref_hash("cwday");
- if (!NIL_P(wday))
- if (f_eqeq_p(wday, INT2FIX(7)))
- wday = INT2FIX(0);
- }
-
- if (!NIL_P(wday) &&
- !NIL_P(week = ref_hash("wnum0")) &&
- !NIL_P(year = ref_hash("year"))) {
- VALUE jd = rt__valid_weeknum_p(year, week, wday, INT2FIX(0), sg);
- if (!NIL_P(jd))
- return jd;
- }
- }
-
- {
- VALUE year, week, wday;
-
- wday = ref_hash("wday");
- if (NIL_P(wday))
- wday = ref_hash("cwday");
- if (!NIL_P(wday))
- wday = f_mod(f_sub(wday, INT2FIX(1)),
- INT2FIX(7));
-
- if (!NIL_P(wday) &&
- !NIL_P(week = ref_hash("wnum1")) &&
- !NIL_P(year = ref_hash("year"))) {
- VALUE jd = rt__valid_weeknum_p(year, week, wday, INT2FIX(1), sg);
- if (!NIL_P(jd))
- return jd;
- }
- }
- return Qnil;
-}
-
-static VALUE
-d_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
-{
- VALUE jd;
-
- if (!c_valid_start_p(NUM2DBL(sg))) {
- sg = INT2FIX(DEFAULT_SG);
- rb_warning("invalid start is ignored");
- }
-
- if (NIL_P(hash))
- rb_raise(rb_eArgError, "invalid date");
-
- if (NIL_P(ref_hash("jd")) &&
- NIL_P(ref_hash("yday")) &&
- !NIL_P(ref_hash("year")) &&
- !NIL_P(ref_hash("mon")) &&
- !NIL_P(ref_hash("mday")))
- jd = rt__valid_civil_p(ref_hash("year"),
- ref_hash("mon"),
- ref_hash("mday"), sg);
- else {
- hash = rt_rewrite_frags(hash);
- hash = rt_complete_frags(klass, hash);
- jd = rt__valid_date_frags_p(hash, sg);
- }
-
- if (NIL_P(jd))
- rb_raise(rb_eArgError, "invalid date");
- {
- VALUE nth;
- int rjd;
-
- decode_jd(jd, &nth, &rjd);
- return d_simple_new_internal(klass,
- nth, rjd,
- NUM2DBL(sg),
- 0, 0, 0,
- HAVE_JD);
- }
-}
-
-VALUE date__strptime(const char *str, size_t slen,
- const char *fmt, size_t flen, VALUE hash);
-
-static VALUE
-date_s__strptime_internal(int argc, VALUE *argv, VALUE klass,
- const char *default_fmt)
-{
- VALUE vstr, vfmt, hash;
- const char *str, *fmt;
- size_t slen, flen;
-
- rb_scan_args(argc, argv, "11", &vstr, &vfmt);
-
- StringValue(vstr);
- if (!rb_enc_str_asciicompat_p(vstr))
- rb_raise(rb_eArgError,
- "string should have ASCII compatible encoding");
- str = RSTRING_PTR(vstr);
- slen = RSTRING_LEN(vstr);
- if (argc < 2) {
- fmt = default_fmt;
- flen = strlen(default_fmt);
- }
- else {
- StringValue(vfmt);
- if (!rb_enc_str_asciicompat_p(vfmt))
- rb_raise(rb_eArgError,
- "format should have ASCII compatible encoding");
- fmt = RSTRING_PTR(vfmt);
- flen = RSTRING_LEN(vfmt);
- }
- hash = rb_hash_new();
- if (NIL_P(date__strptime(str, slen, fmt, flen, hash)))
- return Qnil;
-
- {
- VALUE zone = ref_hash("zone");
- VALUE left = ref_hash("leftover");
-
- if (!NIL_P(zone)) {
- rb_enc_copy(zone, vstr);
- OBJ_INFECT(zone, vstr);
- set_hash("zone", zone);
- }
- if (!NIL_P(left)) {
- rb_enc_copy(left, vstr);
- OBJ_INFECT(left, vstr);
- set_hash("leftover", left);
- }
- }
-
- return hash;
-}
-
-/*
- * call-seq:
- * Date._strptime(string[, format='%F']) -> hash
- *
- * Parses the given representation of date and time with the given
- * template, and returns a hash of parsed elements. _strptime does
- * not support specification of flags and width unlike strftime.
- *
- * Date._strptime('2001-02-03', '%Y-%m-%d')
- * #=> {:year=>2001, :mon=>2, :mday=>3}
- *
- * See also strptime(3) and strftime.
- */
-static VALUE
-date_s__strptime(int argc, VALUE *argv, VALUE klass)
-{
- return date_s__strptime_internal(argc, argv, klass, "%F");
-}
-
-/*
- * call-seq:
- * Date.strptime([string='-4712-01-01'[, format='%F'[, start=ITALY]]]) -> date
- *
- * Parses the given representation of date and time with the given
- * template, and creates a date object. strptime does not support
- * specification of flags and width unlike strftime.
- *
- * Date.strptime('2001-02-03', '%Y-%m-%d') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('03-02-2001', '%d-%m-%Y') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('2001-034', '%Y-%j') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('2001-W05-6', '%G-W%V-%u') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('2001 04 6', '%Y %U %w') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('2001 05 6', '%Y %W %u') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('sat3feb01', '%a%d%b%y') #=> #<Date: 2001-02-03 ...>
- *
- * See also strptime(3) and strftime.
- */
-static VALUE
-date_s_strptime(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, fmt, sg;
-
- rb_scan_args(argc, argv, "03", &str, &fmt, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01");
- case 1:
- fmt = rb_str_new2("%F");
- case 2:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE argv2[2], hash;
-
- argv2[0] = str;
- argv2[1] = fmt;
- hash = date_s__strptime(2, argv2, klass);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-VALUE date__parse(VALUE str, VALUE comp);
-
-static VALUE
-date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vstr, vcomp, hash;
-
- rb_scan_args(argc, argv, "11", &vstr, &vcomp);
- StringValue(vstr);
- if (!rb_enc_str_asciicompat_p(vstr))
- rb_raise(rb_eArgError,
- "string should have ASCII compatible encoding");
- if (argc < 2)
- vcomp = Qtrue;
-
- hash = date__parse(vstr, vcomp);
-
- {
- VALUE zone = ref_hash("zone");
-
- if (!NIL_P(zone)) {
- rb_enc_copy(zone, vstr);
- OBJ_INFECT(zone, vstr);
- set_hash("zone", zone);
- }
- }
-
- return hash;
-}
-
-/*
- * call-seq:
- * Date._parse(string[, comp=true]) -> hash
- *
- * Parses the given representation of date and time, and returns a
- * hash of parsed elements. This method does not function as a
- * validator.
- *
- * If the optional second argument is true and the detected year is in
- * the range "00" to "99", considers the year a 2-digit form and makes
- * it full.
- *
- * Date._parse('2001-02-03') #=> {:year=>2001, :mon=>2, :mday=>3}
- */
-static VALUE
-date_s__parse(int argc, VALUE *argv, VALUE klass)
-{
- return date_s__parse_internal(argc, argv, klass);
-}
-
-/*
- * call-seq:
- * Date.parse(string='-4712-01-01'[, comp=true[, start=ITALY]]) -> date
- *
- * Parses the given representation of date and time, and creates a
- * date object. This method does not function as a validator.
- *
- * If the optional second argument is true and the detected year is in
- * the range "00" to "99", considers the year a 2-digit form and makes
- * it full.
- *
- * Date.parse('2001-02-03') #=> #<Date: 2001-02-03 ...>
- * Date.parse('20010203') #=> #<Date: 2001-02-03 ...>
- * Date.parse('3rd Feb 2001') #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_parse(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, comp, sg;
-
- rb_scan_args(argc, argv, "03", &str, &comp, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01");
- case 1:
- comp = Qtrue;
- case 2:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE argv2[2], hash;
-
- argv2[0] = str;
- argv2[1] = comp;
- hash = date_s__parse(2, argv2, klass);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-VALUE date__iso8601(VALUE);
-VALUE date__rfc3339(VALUE);
-VALUE date__xmlschema(VALUE);
-VALUE date__rfc2822(VALUE);
-VALUE date__httpdate(VALUE);
-VALUE date__jisx0301(VALUE);
-
-/*
- * call-seq:
- * Date._iso8601(string) -> hash
- *
- * Returns a hash of parsed elements.
- */
-static VALUE
-date_s__iso8601(VALUE klass, VALUE str)
-{
- return date__iso8601(str);
-}
-
-/*
- * call-seq:
- * Date.iso8601(string='-4712-01-01'[, start=ITALY]) -> date
- *
- * Creates a new Date object by parsing from a string according to
- * some typical ISO 8601 formats.
- *
- * Date.iso8601('2001-02-03') #=> #<Date: 2001-02-03 ...>
- * Date.iso8601('20010203') #=> #<Date: 2001-02-03 ...>
- * Date.iso8601('2001-W05-6') #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_iso8601(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__iso8601(klass, str);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * Date._rfc3339(string) -> hash
- *
- * Returns a hash of parsed elements.
- */
-static VALUE
-date_s__rfc3339(VALUE klass, VALUE str)
-{
- return date__rfc3339(str);
-}
-
-/*
- * call-seq:
- * Date.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY]) -> date
- *
- * Creates a new Date object by parsing from a string according to
- * some typical RFC 3339 formats.
- *
- * Date.rfc3339('2001-02-03T04:05:06+07:00') #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_rfc3339(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__rfc3339(klass, str);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * Date._xmlschema(string) -> hash
- *
- * Returns a hash of parsed elements.
- */
-static VALUE
-date_s__xmlschema(VALUE klass, VALUE str)
-{
- return date__xmlschema(str);
-}
-
-/*
- * call-seq:
- * Date.xmlschema(string='-4712-01-01'[, start=ITALY]) -> date
- *
- * Creates a new Date object by parsing from a string according to
- * some typical XML Schema formats.
- *
- * Date.xmlschema('2001-02-03') #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_xmlschema(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__xmlschema(klass, str);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * Date._rfc2822(string) -> hash
- * Date._rfc822(string) -> hash
- *
- * Returns a hash of parsed elements.
- */
-static VALUE
-date_s__rfc2822(VALUE klass, VALUE str)
-{
- return date__rfc2822(str);
-}
-
-/*
- * call-seq:
- * Date.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY]) -> date
- * Date.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY]) -> date
- *
- * Creates a new Date object by parsing from a string according to
- * some typical RFC 2822 formats.
- *
- * Date.rfc2822('Sat, 3 Feb 2001 00:00:00 +0000')
- * #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_rfc2822(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("Mon, 1 Jan -4712 00:00:00 +0000");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__rfc2822(klass, str);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * Date._httpdate(string) -> hash
- *
- * Returns a hash of parsed elements.
- */
-static VALUE
-date_s__httpdate(VALUE klass, VALUE str)
-{
- return date__httpdate(str);
-}
-
-/*
- * call-seq:
- * Date.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY]) -> date
- *
- * Creates a new Date object by parsing from a string according to
- * some RFC 2616 format.
- *
- * Date.httpdate('Sat, 03 Feb 2001 00:00:00 GMT')
- * #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_httpdate(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("Mon, 01 Jan -4712 00:00:00 GMT");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__httpdate(klass, str);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * Date._jisx0301(string) -> hash
- *
- * Returns a hash of parsed elements.
- */
-static VALUE
-date_s__jisx0301(VALUE klass, VALUE str)
-{
- return date__jisx0301(str);
-}
-
-/*
- * call-seq:
- * Date.jisx0301(string='-4712-01-01'[, start=ITALY]) -> date
- *
- * Creates a new Date object by parsing from a string according to
- * some typical JIS X 0301 formats.
- *
- * Date.jisx0301('H13.02.03') #=> #<Date: 2001-02-03 ...>
- */
-static VALUE
-date_s_jisx0301(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__jisx0301(klass, str);
- return d_new_by_frags(klass, hash, sg);
- }
-}
-
-static VALUE
-dup_obj(VALUE self)
-{
- get_d1a(self);
-
- if (simple_dat_p(adat)) {
- VALUE new = d_lite_s_alloc_simple(rb_obj_class(self));
- {
- get_d1b(new);
- bdat->s = adat->s;
- return new;
- }
- }
- else {
- VALUE new = d_lite_s_alloc_complex(rb_obj_class(self));
- {
- get_d1b(new);
- bdat->c = adat->c;
- return new;
- }
- }
-}
-
-static VALUE
-dup_obj_as_complex(VALUE self)
-{
- get_d1a(self);
-
- if (simple_dat_p(adat)) {
- VALUE new = d_lite_s_alloc_complex(rb_obj_class(self));
- {
- get_d1b(new);
- copy_simple_to_complex(&bdat->c, &adat->s);
- bdat->c.flags |= HAVE_DF | COMPLEX_DAT;
- return new;
- }
- }
- else {
- VALUE new = d_lite_s_alloc_complex(rb_obj_class(self));
- {
- get_d1b(new);
- bdat->c = adat->c;
- return new;
- }
- }
-}
-
-#define val2off(vof,iof) \
-{\
- if (!offset_to_sec(vof, &iof)) {\
- iof = 0;\
- rb_warning("invalid offset is ignored");\
- }\
-}
-
-#ifndef NDEBUG
-static VALUE
-d_lite_initialize(int argc, VALUE *argv, VALUE self)
-{
- VALUE jd, vjd, vdf, sf, vsf, vof, vsg;
- int df, of;
- double sg;
-
- rb_check_frozen(self);
- rb_check_trusted(self);
-
- rb_scan_args(argc, argv, "05", &vjd, &vdf, &vsf, &vof, &vsg);
-
- jd = INT2FIX(0);
- df = 0;
- sf = INT2FIX(0);
- of = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 5:
- val2sg(vsg, sg);
- case 4:
- val2off(vof, of);
- case 3:
- sf = vsf;
- if (f_lt_p(sf, INT2FIX(0)) ||
- f_ge_p(sf, INT2FIX(SECOND_IN_NANOSECONDS)))
- rb_raise(rb_eArgError, "invalid second fraction");
- case 2:
- df = NUM2INT(vdf);
- if (df < 0 || df >= DAY_IN_SECONDS)
- rb_raise(rb_eArgError, "invalid day fraction");
- case 1:
- jd = vjd;
- }
-
- {
- VALUE nth;
- int rjd;
-
- get_d1(self);
-
- decode_jd(jd, &nth, &rjd);
- if (!df && f_zero_p(sf) && !of) {
- set_to_simple(&dat->s, nth, rjd, sg, 0, 0, 0, HAVE_JD);
- }
- else {
- if (!complex_dat_p(dat))
- rb_raise(rb_eArgError,
- "cannot load complex into simple");
-
- set_to_complex(&dat->c, nth, rjd, df, sf, of, sg,
- 0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF | COMPLEX_DAT);
- }
- }
- return self;
-}
-#endif
-
-/* :nodoc: */
-static VALUE
-d_lite_initialize_copy(VALUE copy, VALUE date)
-{
- rb_check_frozen(copy);
- rb_check_trusted(copy);
-
- if (copy == date)
- return copy;
- {
- get_d2(copy, date);
- if (simple_dat_p(bdat)) {
- adat->s = bdat->s;
- adat->s.flags &= ~COMPLEX_DAT;
- }
- else {
- if (!complex_dat_p(adat))
- rb_raise(rb_eArgError,
- "cannot load complex into simple");
-
- adat->c = bdat->c;
- adat->c.flags |= COMPLEX_DAT;
- }
- }
- return copy;
-}
-
-#ifndef NDEBUG
-static VALUE
-d_lite_fill(VALUE self)
-{
- get_d1(self);
-
- if (simple_dat_p(dat)) {
- get_s_jd(dat);
- get_s_civil(dat);
- }
- else {
- get_c_jd(dat);
- get_c_civil(dat);
- get_c_df(dat);
- get_c_time(dat);
- }
- return self;
-}
-#endif
-
-/*
- * call-seq:
- * d.ajd -> rational
- *
- * Returns the astronomical Julian day number. This is a fractional
- * number, which is not adjusted by the offset.
- *
- * DateTime.new(2001,2,3,4,5,6,'+7').ajd #=> (11769328217/4800)
- * DateTime.new(2001,2,2,14,5,6,'-7').ajd #=> (11769328217/4800)
- */
-static VALUE
-d_lite_ajd(VALUE self)
-{
- get_d1(self);
- return m_ajd(dat);
-}
-
-/*
- * call-seq:
- * d.amjd -> rational
- *
- * Returns the astronomical modified Julian day number. This is
- * a fractional number, which is not adjusted by the offset.
- *
- * DateTime.new(2001,2,3,4,5,6,'+7').amjd #=> (249325817/4800)
- * DateTime.new(2001,2,2,14,5,6,'-7').amjd #=> (249325817/4800)
- */
-static VALUE
-d_lite_amjd(VALUE self)
-{
- get_d1(self);
- return m_amjd(dat);
-}
-
-/*
- * call-seq:
- * d.jd -> integer
- *
- * Returns the Julian day number. This is a whole number, which is
- * adjusted by the offset as the local time.
- *
- * DateTime.new(2001,2,3,4,5,6,'+7').jd #=> 2451944
- * DateTime.new(2001,2,3,4,5,6,'-7').jd #=> 2451944
- */
-static VALUE
-d_lite_jd(VALUE self)
-{
- get_d1(self);
- return m_real_local_jd(dat);
-}
-
-/*
- * call-seq:
- * d.mjd -> integer
- *
- * Returns the modified Julian day number. This is a whole number,
- * which is adjusted by the offset as the local time.
- *
- * DateTime.new(2001,2,3,4,5,6,'+7').mjd #=> 51943
- * DateTime.new(2001,2,3,4,5,6,'-7').mjd #=> 51943
- */
-static VALUE
-d_lite_mjd(VALUE self)
-{
- get_d1(self);
- return f_sub(m_real_local_jd(dat), INT2FIX(2400001));
-}
-
-/*
- * call-seq:
- * d.ld -> integer
- *
- * Returns the Lilian day number. This is a whole number, which is
- * adjusted by the offset as the local time.
- *
- * Date.new(2001,2,3).ld #=> 152784
- */
-static VALUE
-d_lite_ld(VALUE self)
-{
- get_d1(self);
- return f_sub(m_real_local_jd(dat), INT2FIX(2299160));
-}
-
-/*
- * call-seq:
- * d.year -> integer
- *
- * Returns the year.
- *
- * Date.new(2001,2,3).year #=> 2001
- * (Date.new(1,1,1) - 1).year #=> 0
- */
-static VALUE
-d_lite_year(VALUE self)
-{
- get_d1(self);
- return m_real_year(dat);
-}
-
-/*
- * call-seq:
- * d.yday -> fixnum
- *
- * Returns the day of the year (1-366).
- *
- * Date.new(2001,2,3).yday #=> 34
- */
-static VALUE
-d_lite_yday(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_yday(dat));
-}
-
-/*
- * call-seq:
- * d.mon -> fixnum
- * d.month -> fixnum
- *
- * Returns the month (1-12).
- *
- * Date.new(2001,2,3).mon #=> 2
- */
-static VALUE
-d_lite_mon(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_mon(dat));
-}
-
-/*
- * call-seq:
- * d.mday -> fixnum
- * d.day -> fixnum
- *
- * Returns the day of the month (1-31).
- *
- * Date.new(2001,2,3).mday #=> 3
- */
-static VALUE
-d_lite_mday(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_mday(dat));
-}
-
-/*
- * call-seq:
- * d.day_fraction -> rational
- *
- * Returns the fractional part of the day.
- *
- * DateTime.new(2001,2,3,12).day_fraction #=> (1/2)
- */
-static VALUE
-d_lite_day_fraction(VALUE self)
-{
- get_d1(self);
- if (simple_dat_p(dat))
- return INT2FIX(0);
- return m_fr(dat);
-}
-
-/*
- * call-seq:
- * d.cwyear -> integer
- *
- * Returns the calendar week based year.
- *
- * Date.new(2001,2,3).cwyear #=> 2001
- * Date.new(2000,1,1).cwyear #=> 1999
- */
-static VALUE
-d_lite_cwyear(VALUE self)
-{
- get_d1(self);
- return m_real_cwyear(dat);
-}
-
-/*
- * call-seq:
- * d.cweek -> fixnum
- *
- * Returns the calendar week number (1-53).
- *
- * Date.new(2001,2,3).cweek #=> 5
- */
-static VALUE
-d_lite_cweek(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_cweek(dat));
-}
-
-/*
- * call-seq:
- * d.cwday -> fixnum
- *
- * Returns the day of calendar week (1-7, Monday is 1).
- *
- * Date.new(2001,2,3).cwday #=> 6
- */
-static VALUE
-d_lite_cwday(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_cwday(dat));
-}
-
-#ifndef NDEBUG
-static VALUE
-d_lite_wnum0(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_wnum0(dat));
-}
-
-static VALUE
-d_lite_wnum1(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_wnum1(dat));
-}
-#endif
-
-/*
- * call-seq:
- * d.wday -> fixnum
- *
- * Returns the day of week (0-6, Sunday is zero).
- *
- * Date.new(2001,2,3).wday #=> 6
- */
-static VALUE
-d_lite_wday(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_wday(dat));
-}
-
-/*
- * call-seq:
- * d.sunday? -> bool
- *
- * Returns true if the date is Sunday.
- */
-static VALUE
-d_lite_sunday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 0);
-}
-
-/*
- * call-seq:
- * d.monday? -> bool
- *
- * Returns true if the date is Monday.
- */
-static VALUE
-d_lite_monday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 1);
-}
-
-/*
- * call-seq:
- * d.tuesday? -> bool
- *
- * Returns true if the date is Tuesday.
- */
-static VALUE
-d_lite_tuesday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 2);
-}
-
-/*
- * call-seq:
- * d.wednesday? -> bool
- *
- * Returns true if the date is Wednesday.
- */
-static VALUE
-d_lite_wednesday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 3);
-}
-
-/*
- * call-seq:
- * d.thursday? -> bool
- *
- * Returns true if the date is Thursday.
- */
-static VALUE
-d_lite_thursday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 4);
-}
-
-/*
- * call-seq:
- * d.friday? -> bool
- *
- * Returns true if the date is Friday.
- */
-static VALUE
-d_lite_friday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 5);
-}
-
-/*
- * call-seq:
- * d.saturday? -> bool
- *
- * Returns true if the date is Saturday.
- */
-static VALUE
-d_lite_saturday_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_wday(dat) == 6);
-}
-
-#ifndef NDEBUG
-static VALUE
-d_lite_nth_kday_p(VALUE self, VALUE n, VALUE k)
-{
- int rjd, ns;
-
- get_d1(self);
-
- if (NUM2INT(k) != m_wday(dat))
- return Qfalse;
-
- c_nth_kday_to_jd(m_year(dat), m_mon(dat),
- NUM2INT(n), NUM2INT(k), m_virtual_sg(dat), /* !=m_sg() */
- &rjd, &ns);
- if (m_local_jd(dat) != rjd)
- return Qfalse;
- return Qtrue;
-}
-#endif
-
-/*
- * call-seq:
- * d.hour -> fixnum
- *
- * Returns the hour (0-23).
- *
- * DateTime.new(2001,2,3,4,5,6).hour #=> 4
- */
-static VALUE
-d_lite_hour(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_hour(dat));
-}
-
-/*
- * call-seq:
- * d.min -> fixnum
- * d.minute -> fixnum
- *
- * Returns the minute (0-59).
- *
- * DateTime.new(2001,2,3,4,5,6).min #=> 5
- */
-static VALUE
-d_lite_min(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_min(dat));
-}
-
-/*
- * call-seq:
- * d.sec -> fixnum
- * d.second -> fixnum
- *
- * Returns the second (0-59).
- *
- * DateTime.new(2001,2,3,4,5,6).sec #=> 6
- */
-static VALUE
-d_lite_sec(VALUE self)
-{
- get_d1(self);
- return INT2FIX(m_sec(dat));
-}
-
-/*
- * call-seq:
- * d.sec_fraction -> rational
- * d.second_fraction -> rational
- *
- * Returns the fractional part of the second.
- *
- * DateTime.new(2001,2,3,4,5,6.5).sec_fraction #=> (1/2)
- */
-static VALUE
-d_lite_sec_fraction(VALUE self)
-{
- get_d1(self);
- return m_sf_in_sec(dat);
-}
-
-/*
- * call-seq:
- * d.offset -> rational
- *
- * Returns the offset.
- *
- * DateTime.parse('04pm+0730').offset #=> (5/16)
- */
-static VALUE
-d_lite_offset(VALUE self)
-{
- get_d1(self);
- return m_of_in_day(dat);
-}
-
-/*
- * call-seq:
- * d.zone -> string
- *
- * Returns the timezone.
- *
- * DateTime.parse('04pm+0730').zone #=> "+07:30"
- */
-static VALUE
-d_lite_zone(VALUE self)
-{
- get_d1(self);
- return m_zone(dat);
-}
-
-/*
- * call-seq:
- * d.julian? -> bool
- *
- * Retruns true if the date is before the day of calendar reform.
- *
- * Date.new(1582,10,15).julian? #=> false
- * (Date.new(1582,10,15) - 1).julian? #=> true
- */
-static VALUE
-d_lite_julian_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_julian_p(dat));
-}
-
-/*
- * call-seq:
- * d.gregorian? -> bool
- *
- * Retunrs true if the date is on or after the day of calendar reform.
- *
- * Date.new(1582,10,15).gregorian? #=> true
- * (Date.new(1582,10,15) - 1).gregorian? #=> false
- */
-static VALUE
-d_lite_gregorian_p(VALUE self)
-{
- get_d1(self);
- return f_boolcast(m_gregorian_p(dat));
-}
-
-/*
- * call-seq:
- * d.leap? -> bool
- *
- * Returns true if the year is a leap year.
- *
- * Date.new(2000).leap? #=> true
- * Date.new(2001).leap? #=> false
- */
-static VALUE
-d_lite_leap_p(VALUE self)
-{
- int rjd, ns, ry, rm, rd;
-
- get_d1(self);
- if (m_gregorian_p(dat))
- return f_boolcast(c_gregorian_leap_p(m_year(dat)));
-
- c_civil_to_jd(m_year(dat), 3, 1, m_virtual_sg(dat),
- &rjd, &ns);
- c_jd_to_civil(rjd - 1, m_virtual_sg(dat), &ry, &rm, &rd);
- return f_boolcast(rd == 29);
-}
-
-/*
- * call-seq:
- * d.start -> float
- *
- * Returns the Julian day number denoting the day of calendar reform.
- *
- * Date.new(2001,2,3).start #=> 2299161.0
- * Date.new(2001,2,3,Date::GREGORIAN).start #=> -Infinity
- */
-static VALUE
-d_lite_start(VALUE self)
-{
- get_d1(self);
- return DBL2NUM(m_sg(dat));
-}
-
-static void
-clear_civil(union DateData *x)
-{
- if (simple_dat_p(x)) {
- x->s.year = 0;
-#ifndef USE_PACK
- x->s.mon = 0;
- x->s.mday = 0;
-#else
- x->s.pc = 0;
-#endif
- x->s.flags &= ~HAVE_CIVIL;
- }
- else {
- x->c.year = 0;
-#ifndef USE_PACK
- x->c.mon = 0;
- x->c.mday = 0;
- x->c.hour = 0;
- x->c.min = 0;
- x->c.sec = 0;
-#else
- x->c.pc = 0;
-#endif
- x->c.flags &= ~(HAVE_CIVIL | HAVE_TIME);
- }
-}
-
-static void
-set_sg(union DateData *x, double sg)
-{
- if (simple_dat_p(x)) {
- get_s_jd(x);
- clear_civil(x);
- x->s.sg = (date_sg_t)sg;
- } else {
- get_c_jd(x);
- get_c_df(x);
- clear_civil(x);
- x->c.sg = (date_sg_t)sg;
- }
-}
-
-static VALUE
-dup_obj_with_new_start(VALUE obj, double sg)
-{
- volatile VALUE dup = dup_obj(obj);
- {
- get_d1(dup);
- set_sg(dat, sg);
- }
- return dup;
-}
-
-/*
- * call-seq:
- * d.new_start([start=Date::ITALY]) -> date
- *
- * Duplicates self and resets its the day of calendar reform.
- *
- * d = Date.new(1582,10,15)
- * d.new_start(Date::JULIAN) #=> #<Date: 1582-10-05 ...>
- */
-static VALUE
-d_lite_new_start(int argc, VALUE *argv, VALUE self)
-{
- VALUE vsg;
- double sg;
-
- rb_scan_args(argc, argv, "01", &vsg);
-
- sg = DEFAULT_SG;
- if (argc >= 1)
- val2sg(vsg, sg);
-
- return dup_obj_with_new_start(self, sg);
-}
-
-/*
- * call-seq:
- * d.italy -> date
- *
- * This method is equivalent to new_start(Date::ITALY).
- */
-static VALUE
-d_lite_italy(VALUE self)
-{
- return dup_obj_with_new_start(self, ITALY);
-}
-
-/*
- * call-seq:
- * d.england -> date
- *
- * This method is equivalent to new_start(Date::ENGLAND).
- */
-static VALUE
-d_lite_england(VALUE self)
-{
- return dup_obj_with_new_start(self, ENGLAND);
-}
-
-/*
- * call-seq:
- * d.julian -> date
- *
- * This method is equivalent to new_start(Date::JULIAN).
- */
-static VALUE
-d_lite_julian(VALUE self)
-{
- return dup_obj_with_new_start(self, JULIAN);
-}
-
-/*
- * call-seq:
- * d.gregorian -> date
- *
- * This method is equivalent to new_start(Date::GREGORIAN).
- */
-static VALUE
-d_lite_gregorian(VALUE self)
-{
- return dup_obj_with_new_start(self, GREGORIAN);
-}
-
-static void
-set_of(union DateData *x, int of)
-{
- assert(complex_dat_p(x));
- get_c_jd(x);
- get_c_df(x);
- clear_civil(x);
- x->c.of = of;
-}
-
-static VALUE
-dup_obj_with_new_offset(VALUE obj, int of)
-{
- volatile VALUE dup = dup_obj_as_complex(obj);
- {
- get_d1(dup);
- set_of(dat, of);
- }
- return dup;
-}
-
-/*
- * call-seq:
- * d.new_offset([offset=0]) -> date
- *
- * Duplicates self and resets its offset.
- *
- * d = DateTime.new(2001,2,3,4,5,6,'-02:00')
- * #=> #<DateTime: 2001-02-03T04:05:06-02:00 ...>
- * d.new_offset('+09:00') #=> #<DateTime: 2001-02-03T15:05:06+09:00 ...>
- */
-static VALUE
-d_lite_new_offset(int argc, VALUE *argv, VALUE self)
-{
- VALUE vof;
- int rof;
-
- rb_scan_args(argc, argv, "01", &vof);
-
- rof = 0;
- if (argc >= 1)
- val2off(vof, rof);
-
- return dup_obj_with_new_offset(self, rof);
-}
-
-/*
- * call-seq:
- * d + other -> date
- *
- * Returns a date object pointing other days after self. The other
- * should be a numeric value. If the other is flonum, assumes its
- * precision is at most nanosecond.
- *
- * Date.new(2001,2,3) + 1 #=> #<Date: 2001-02-04 ...>
- * DateTime.new(2001,2,3) + Rational(1,2)
- * #=> #<DateTime: 2001-02-03T12:00:00+00:00 ...>
- * DateTime.new(2001,2,3) + Rational(-1,2)
- * #=> #<DateTime: 2001-02-02T12:00:00+00:00 ...>
- * DateTime.jd(0,12) + DateTime.new(2001,2,3).ajd
- * #=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
- */
-static VALUE
-d_lite_plus(VALUE self, VALUE other)
-{
- get_d1(self);
-
- switch (TYPE(other)) {
- case T_FIXNUM:
- {
- VALUE nth;
- long t;
- int jd;
-
- nth = m_nth(dat);
- t = FIX2LONG(other);
- if (DIV(t, CM_PERIOD)) {
- nth = f_add(nth, INT2FIX(DIV(t, CM_PERIOD)));
- t = MOD(t, CM_PERIOD);
- }
-
- if (!t)
- jd = m_jd(dat);
- else {
- jd = m_jd(dat) + (int)t;
- canonicalize_jd(nth, jd);
- }
-
- if (simple_dat_p(dat))
- return d_simple_new_internal(rb_obj_class(self),
- nth, jd,
- dat->s.sg,
- 0, 0, 0,
- (dat->s.flags | HAVE_JD) &
- ~HAVE_CIVIL);
- else
- return d_complex_new_internal(rb_obj_class(self),
- nth, jd,
- dat->c.df, dat->c.sf,
- dat->c.of, dat->c.sg,
- 0, 0, 0,
-#ifndef USE_PACK
- dat->c.hour,
- dat->c.min,
- dat->c.sec,
-#else
- EX_HOUR(dat->c.pc),
- EX_MIN(dat->c.pc),
- EX_SEC(dat->c.pc),
-#endif
- (dat->c.flags | HAVE_JD) &
- ~HAVE_CIVIL);
- }
- break;
- case T_BIGNUM:
- {
- VALUE nth;
- int jd, s;
-
- if (f_positive_p(other))
- s = +1;
- else {
- s = -1;
- other = f_negate(other);
- }
-
- nth = f_idiv(other, INT2FIX(CM_PERIOD));
- jd = FIX2INT(f_mod(other, INT2FIX(CM_PERIOD)));
-
- if (s < 0) {
- nth = f_negate(nth);
- jd = -jd;
- }
-
- if (!jd)
- jd = m_jd(dat);
- else {
- jd = m_jd(dat) + jd;
- canonicalize_jd(nth, jd);
- }
-
- if (f_zero_p(nth))
- nth = m_nth(dat);
- else
- nth = f_add(m_nth(dat), nth);
-
- if (simple_dat_p(dat))
- return d_simple_new_internal(rb_obj_class(self),
- nth, jd,
- dat->s.sg,
- 0, 0, 0,
- (dat->s.flags | HAVE_JD) &
- ~HAVE_CIVIL);
- else
- return d_complex_new_internal(rb_obj_class(self),
- nth, jd,
- dat->c.df, dat->c.sf,
- dat->c.of, dat->c.sg,
- 0, 0, 0,
-#ifndef USE_PACK
- dat->c.hour,
- dat->c.min,
- dat->c.sec,
-#else
- EX_HOUR(dat->c.pc),
- EX_MIN(dat->c.pc),
- EX_SEC(dat->c.pc),
-#endif
- (dat->c.flags | HAVE_JD) &
- ~HAVE_CIVIL);
- }
- break;
- case T_FLOAT:
- {
- double jd, o, tmp;
- int s, df;
- VALUE nth, sf;
-
- o = RFLOAT_VALUE(other);
-
- if (o > 0)
- s = +1;
- else {
- s = -1;
- o = -o;
- }
-
- o = modf(o, &tmp);
-
- if (!floor(tmp / CM_PERIOD)) {
- nth = INT2FIX(0);
- jd = (int)tmp;
- }
- else {
- double i, f;
-
- f = modf(tmp / CM_PERIOD, &i);
- nth = f_floor(DBL2NUM(i));
- jd = (int)(f * CM_PERIOD);
- }
-
- o *= DAY_IN_SECONDS;
- o = modf(o, &tmp);
- df = (int)tmp;
- o *= SECOND_IN_NANOSECONDS;
- sf = INT2FIX((int)round(o));
-
- if (s < 0) {
- jd = -jd;
- df = -df;
- sf = f_negate(sf);
- }
-
- if (f_zero_p(sf))
- sf = m_sf(dat);
- else {
- sf = f_add(m_sf(dat), sf);
- if (f_lt_p(sf, INT2FIX(0))) {
- df -= 1;
- sf = f_add(sf, INT2FIX(SECOND_IN_NANOSECONDS));
- }
- else if (f_ge_p(sf, INT2FIX(SECOND_IN_NANOSECONDS))) {
- df += 1;
- sf = f_sub(sf, INT2FIX(SECOND_IN_NANOSECONDS));
- }
- }
-
- if (!df)
- df = m_df(dat);
- else {
- df = m_df(dat) + df;
- if (df < 0) {
- jd -= 1;
- df += DAY_IN_SECONDS;
- }
- else if (df >= DAY_IN_SECONDS) {
- jd += 1;
- df -= DAY_IN_SECONDS;
- }
- }
-
- if (!jd)
- jd = m_jd(dat);
- else {
- jd = m_jd(dat) + jd;
- canonicalize_jd(nth, jd);
- }
-
- if (f_zero_p(nth))
- nth = m_nth(dat);
- else
- nth = f_add(m_nth(dat), nth);
-
- if (!df && f_zero_p(sf) && !m_of(dat))
- return d_simple_new_internal(rb_obj_class(self),
- nth, (int)jd,
- m_sg(dat),
- 0, 0, 0,
- (dat->s.flags | HAVE_JD) &
- ~(HAVE_CIVIL | HAVE_TIME |
- COMPLEX_DAT));
- else
- return d_complex_new_internal(rb_obj_class(self),
- nth, (int)jd,
- df, sf,
- m_of(dat), m_sg(dat),
- 0, 0, 0,
- 0, 0, 0,
- (dat->c.flags |
- HAVE_JD | HAVE_DF) &
- ~(HAVE_CIVIL | HAVE_TIME));
- }
- break;
- default:
- if (!k_numeric_p(other))
- rb_raise(rb_eTypeError, "expected numeric");
- other = f_to_r(other);
-#ifdef CANONICALIZATION_FOR_MATHN
- if (!k_rational_p(other))
- return d_lite_plus(self, other);
-#endif
- /* fall through */
- case T_RATIONAL:
- {
- VALUE nth, sf, t;
- int jd, df, s;
-
- if (wholenum_p(other))
- return d_lite_plus(self, RRATIONAL(other)->num);
-
- if (f_positive_p(other))
- s = +1;
- else {
- s = -1;
- other = f_negate(other);
- }
-
- nth = f_idiv(other, INT2FIX(CM_PERIOD));
- t = f_mod(other, INT2FIX(CM_PERIOD));
-
- jd = FIX2INT(f_idiv(t, INT2FIX(1)));
- t = f_mod(t, INT2FIX(1));
-
- t = f_mul(t, INT2FIX(DAY_IN_SECONDS));
- df = FIX2INT(f_idiv(t, INT2FIX(1)));
- t = f_mod(t, INT2FIX(1));
-
- sf = f_mul(t, INT2FIX(SECOND_IN_NANOSECONDS));
-
- if (s < 0) {
- nth = f_negate(nth);
- jd = -jd;
- df = -df;
- sf = f_negate(sf);
- }
-
- if (f_zero_p(sf))
- sf = m_sf(dat);
- else {
- sf = f_add(m_sf(dat), sf);
- if (f_lt_p(sf, INT2FIX(0))) {
- df -= 1;
- sf = f_add(sf, INT2FIX(SECOND_IN_NANOSECONDS));
- }
- else if (f_ge_p(sf, INT2FIX(SECOND_IN_NANOSECONDS))) {
- df += 1;
- sf = f_sub(sf, INT2FIX(SECOND_IN_NANOSECONDS));
- }
- }
-
- if (!df)
- df = m_df(dat);
- else {
- df = m_df(dat) + df;
- if (df < 0) {
- jd -= 1;
- df += DAY_IN_SECONDS;
- }
- else if (df >= DAY_IN_SECONDS) {
- jd += 1;
- df -= DAY_IN_SECONDS;
- }
- }
-
- if (!jd)
- jd = m_jd(dat);
- else {
- jd = m_jd(dat) + jd;
- canonicalize_jd(nth, jd);
- }
-
- if (f_zero_p(nth))
- nth = m_nth(dat);
- else
- nth = f_add(m_nth(dat), nth);
-
- if (!df && f_zero_p(sf) && !m_of(dat))
- return d_simple_new_internal(rb_obj_class(self),
- nth, jd,
- m_sg(dat),
- 0, 0, 0,
- (dat->s.flags | HAVE_JD) &
- ~(HAVE_CIVIL | HAVE_TIME |
- COMPLEX_DAT));
- else
- return d_complex_new_internal(rb_obj_class(self),
- nth, jd,
- df, sf,
- m_of(dat), m_sg(dat),
- 0, 0, 0,
- 0, 0, 0,
- (dat->c.flags |
- HAVE_JD | HAVE_DF) &
- ~(HAVE_CIVIL | HAVE_TIME));
- }
- break;
- }
-}
-
-static VALUE
-minus_dd(VALUE self, VALUE other)
-{
- get_d2(self, other);
-
- {
- int d, df;
- VALUE n, sf, r;
-
- n = f_sub(m_nth(adat), m_nth(bdat));
- d = m_jd(adat) - m_jd(bdat);
- df = m_df(adat) - m_df(bdat);
- sf = f_sub(m_sf(adat), m_sf(bdat));
- canonicalize_jd(n, d);
-
- if (df < 0) {
- d -= 1;
- df += DAY_IN_SECONDS;
- }
- else if (df >= DAY_IN_SECONDS) {
- d += 1;
- df -= DAY_IN_SECONDS;
- }
-
- if (f_lt_p(sf, INT2FIX(0))) {
- df -= 1;
- sf = f_add(sf, INT2FIX(SECOND_IN_NANOSECONDS));
- }
- else if (f_ge_p(sf, INT2FIX(SECOND_IN_NANOSECONDS))) {
- df += 1;
- sf = f_sub(sf, INT2FIX(SECOND_IN_NANOSECONDS));
- }
-
- if (f_zero_p(n))
- r = INT2FIX(0);
- else
- r = f_mul(n, INT2FIX(CM_PERIOD));
-
- if (d)
- r = f_add(r, rb_rational_new1(INT2FIX(d)));
- if (df)
- r = f_add(r, isec_to_day(df));
- if (f_nonzero_p(sf))
- r = f_add(r, ns_to_day(sf));
-
- if (TYPE(r) == T_RATIONAL)
- return r;
- return rb_rational_new1(r);
- }
-}
-
-/*
- * call-seq:
- * d - other -> date or rational
- *
- * Returns the difference between the two dates if the other is a date
- * object. If the other is a numeric value, returns a date object
- * pointing other days before self. If the other is flonum, assumes
- * its precision is at most nanosecond.
- *
- * Date.new(2001,2,3) - 1 #=> #<Date: 2001-02-02 ...>
- * DateTime.new(2001,2,3) - Rational(1,2)
- * #=> #<DateTime: 2001-02-02T12:00:00+00:00 ...>
- * Date.new(2001,2,3) - Date.new(2001)
- * #=> (33/1)
- * DateTime.new(2001,2,3) - DateTime.new(2001,2,2,12)
- * #=> (1/2)
- */
-static VALUE
-d_lite_minus(VALUE self, VALUE other)
-{
- if (k_date_p(other))
- return minus_dd(self, other);
-
- switch (TYPE(other)) {
- case T_FIXNUM:
- return d_lite_plus(self, LONG2NUM(-FIX2LONG(other)));
- case T_FLOAT:
- return d_lite_plus(self, DBL2NUM(-RFLOAT_VALUE(other)));
- default:
- if (!k_numeric_p(other))
- rb_raise(rb_eTypeError, "expected numeric");
- /* fall through */
- case T_BIGNUM:
- case T_RATIONAL:
- return d_lite_plus(self, f_negate(other));
- }
-}
-
-/*
- * call-seq:
- * d.next_day([n=1]) -> date
- *
- * This method is equivalent to d + n.
- */
-static VALUE
-d_lite_next_day(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
- if (argc < 1)
- n = INT2FIX(1);
- return d_lite_plus(self, n);
-}
-
-/*
- * call-seq:
- * d.prev_day([n=1]) -> date
- *
- * This method is equivalent to d - n.
- */
-static VALUE
-d_lite_prev_day(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
- if (argc < 1)
- n = INT2FIX(1);
- return d_lite_minus(self, n);
-}
-
-/*
- * call-seq:
- * d.next -> date
- *
- * Returns a date object denoting the following day.
- */
-static VALUE
-d_lite_next(VALUE self)
-{
- return d_lite_next_day(0, (VALUE *)NULL, self);
-}
-
-/*
- * call-seq:
- * d >> n -> date
- *
- * Returns a date object pointing n months after self. The n should
- * be a numeric value.
- *
- * Date.new(2001,2,3) >> 1 #=> #<Date: 2001-03-03 ...>
- * Date.new(2001,1,31) >> 1 #=> #<Date: 2001-02-28 ...>
- * Date.new(2001,2,3) >> -2 #=> #<Date: 2000-12-03 ...>
- */
-static VALUE
-d_lite_rshift(VALUE self, VALUE other)
-{
- VALUE t, y, nth, rjd2;
- int m, d, rjd;
- double sg;
-
- get_d1(self);
- t = f_add3(f_mul(m_real_year(dat), INT2FIX(12)),
- INT2FIX(m_mon(dat) - 1),
- other);
- if (FIXNUM_P(t)) {
- long it = FIX2LONG(t);
- y = LONG2NUM(DIV(it, 12));
- it = MOD(it, 12);
- m = (int)it + 1;
- }
- else {
- y = f_idiv(t, INT2FIX(12));
- t = f_mod(t, INT2FIX(12));
- m = FIX2INT(t) + 1;
- }
- d = m_mday(dat);
- sg = m_sg(dat);
-
- while (1) {
- int ry, rm, rd, ns;
-
- if (valid_civil_p(y, m, d, sg,
- &nth, &ry,
- &rm, &rd, &rjd, &ns))
- break;
- if (--d < 1)
- rb_raise(rb_eArgError, "invalid date");
- }
- encode_jd(nth, rjd, &rjd2);
- return d_lite_plus(self, f_sub(rjd2, m_real_local_jd(dat)));
-}
-
-/*
- * call-seq:
- * d << n -> date
- *
- * Returns a date object pointing n months before self. The n should
- * be a numeric value.
- *
- * Date.new(2001,2,3) << 1 #=> #<Date: 2001-01-03 ...>
- * Date.new(2001,1,31) << 11 #=> #<Date: 2000-02-29 ...>
- * Date.new(2001,2,3) << -1 #=> #<Date: 2001-03-03 ...>
- */
-static VALUE
-d_lite_lshift(VALUE self, VALUE other)
-{
- return d_lite_rshift(self, f_negate(other));
-}
-
-/*
- * call-seq:
- * d.next_month([n=1]) -> date
- *
- * This method is equivalent to d >> n
- */
-static VALUE
-d_lite_next_month(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
- if (argc < 1)
- n = INT2FIX(1);
- return d_lite_rshift(self, n);
-}
-
-/*
- * call-seq:
- * d.prev_month([n=1]) -> date
- *
- * This method is equivalent to d << n
- */
-static VALUE
-d_lite_prev_month(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
- if (argc < 1)
- n = INT2FIX(1);
- return d_lite_lshift(self, n);
-}
-
-/*
- * call-seq:
- * d.next_year([n=1]) -> date
- *
- * This method is equivalent to d >> (n * 12)
- */
-static VALUE
-d_lite_next_year(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
- if (argc < 1)
- n = INT2FIX(1);
- return d_lite_rshift(self, f_mul(n, INT2FIX(12)));
-}
-
-/*
- * call-seq:
- * d.prev_year([n=1]) -> date
- *
- * This method is equivalent to d << (n * 12)
- */
-static VALUE
-d_lite_prev_year(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
- if (argc < 1)
- n = INT2FIX(1);
- return d_lite_lshift(self, f_mul(n, INT2FIX(12)));
-}
-
-static VALUE d_lite_cmp(VALUE, VALUE);
-
-/*
- * call-seq:
- * d.step(limit[, step=1]) -> enumerator
- * d.step(limit[, step=1]){|date| ...} -> self
- *
- * Iterates evaluation of the given block, which takes a date object.
- * The limit should be a date object.
- *
- * Date.new(2001).step(Date.new(2001,-1,-1)).select{|d| d.sunday?}.size
- * #=> 52
- */
-static VALUE
-d_lite_step(int argc, VALUE *argv, VALUE self)
-{
- VALUE limit, step, date;
-
- rb_scan_args(argc, argv, "11", &limit, &step);
-
- if (argc < 2)
- step = INT2FIX(1);
-
-#if 0
- if (f_zero_p(step))
- rb_raise(rb_eArgError, "step can't be 0");
-#endif
-
- RETURN_ENUMERATOR(self, argc, argv);
-
- date = self;
- switch (FIX2INT(f_cmp(step, INT2FIX(0)))) {
- case -1:
- while (FIX2INT(d_lite_cmp(date, limit)) >= 0) {
- rb_yield(date);
- date = d_lite_plus(date, step);
- }
- break;
- case 0:
- while (1)
- rb_yield(date);
- break;
- case 1:
- while (FIX2INT(d_lite_cmp(date, limit)) <= 0) {
- rb_yield(date);
- date = d_lite_plus(date, step);
- }
- break;
- default:
- abort();
- }
- return self;
-}
-
-/*
- * call-seq:
- * d.upto(max) -> enumerator
- * d.upto(max){|date| ...} -> self
- *
- * This method is equivalent to step(max, 1){|date| ...}.
- */
-static VALUE
-d_lite_upto(VALUE self, VALUE max)
-{
- VALUE date;
-
- RETURN_ENUMERATOR(self, 1, &max);
-
- date = self;
- while (FIX2INT(d_lite_cmp(date, max)) <= 0) {
- rb_yield(date);
- date = d_lite_plus(date, INT2FIX(1));
- }
- return self;
-}
-
-/*
- * call-seq:
- * d.downto(min) -> enumerator
- * d.downto(min){|date| ...} -> self
- *
- * This method is equivalent to step(min, -1){|date| ...}.
- */
-static VALUE
-d_lite_downto(VALUE self, VALUE min)
-{
- VALUE date;
-
- RETURN_ENUMERATOR(self, 1, &min);
-
- date = self;
- while (FIX2INT(d_lite_cmp(date, min)) >= 0) {
- rb_yield(date);
- date = d_lite_plus(date, INT2FIX(-1));
- }
- return self;
-}
-
-static VALUE
-cmp_gen(VALUE self, VALUE other)
-{
- get_d1(self);
-
- if (k_numeric_p(other))
- return f_cmp(m_ajd(dat), other);
- else if (k_date_p(other))
- return f_cmp(m_ajd(dat), f_ajd(other));
- return rb_num_coerce_cmp(self, other, rb_intern("<=>"));
-}
-
-static VALUE
-cmp_dd(VALUE self, VALUE other)
-{
- get_d2(self, other);
-
- {
- VALUE a_nth, b_nth,
- a_sf, b_sf;
- int a_jd, b_jd,
- a_df, b_df;
-
- m_canonicalize_jd(adat);
- m_canonicalize_jd(bdat);
- a_nth = m_nth(adat);
- b_nth = m_nth(bdat);
- if (f_eqeq_p(a_nth, b_nth)) {
- a_jd = m_jd(adat);
- b_jd = m_jd(bdat);
- if (a_jd == b_jd) {
- a_df = m_df(adat);
- b_df = m_df(bdat);
- if (a_df == b_df) {
- a_sf = m_sf(adat);
- b_sf = m_sf(bdat);
- if (f_eqeq_p(a_sf, b_sf)) {
- return INT2FIX(0);
- }
- else if (f_lt_p(a_sf, b_sf)) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else if (a_df < b_df) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else if (a_jd < b_jd) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else if (f_lt_p(a_nth, b_nth)) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
-}
-
-/*
- * call-seq:
- * d <=> other -> -1, 0, +1 or nil
- *
- * Compares the two dates and returns -1, zero, 1 or nil. The other
- * should be a date object or a numeric value as an astronomical
- * Julian day number.
- *
- * Date.new(2001,2,3) <=> Date.new(2001,2,4) #=> -1
- * Date.new(2001,2,3) <=> Date.new(2001,2,3) #=> 0
- * Date.new(2001,2,3) <=> Date.new(2001,2,2) #=> 1
- * Date.new(2001,2,3) <=> Object.new #=> nil
- * Date.new(2001,2,3) <=> Rational(4903887,2)#=> 0
- *
- * See also Comparable.
- */
-static VALUE
-d_lite_cmp(VALUE self, VALUE other)
-{
- if (!k_date_p(other))
- return cmp_gen(self, other);
-
- {
- get_d2(self, other);
-
- if (!(simple_dat_p(adat) && simple_dat_p(bdat) &&
- m_gregorian_p(adat) == m_gregorian_p(bdat)))
- return cmp_dd(self, other);
-
- if (have_jd_p(adat) &&
- have_jd_p(bdat)) {
- VALUE a_nth, b_nth;
- int a_jd, b_jd;
-
- m_canonicalize_jd(adat);
- m_canonicalize_jd(bdat);
- a_nth = m_nth(adat);
- b_nth = m_nth(bdat);
- if (f_eqeq_p(a_nth, b_nth)) {
- a_jd = m_jd(adat);
- b_jd = m_jd(bdat);
- if (a_jd == b_jd) {
- return INT2FIX(0);
- }
- else if (a_jd < b_jd) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else if (f_lt_p(a_nth, b_nth)) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else {
-#ifndef USE_PACK
- VALUE a_nth, b_nth;
- int a_year, b_year,
- a_mon, b_mon,
- a_mday, b_mday;
-#else
- VALUE a_nth, b_nth;
- int a_year, b_year,
- a_pd, b_pd;
-#endif
-
- m_canonicalize_jd(adat);
- m_canonicalize_jd(bdat);
- a_nth = m_nth(adat);
- b_nth = m_nth(bdat);
- if (f_eqeq_p(a_nth, b_nth)) {
- a_year = m_year(adat);
- b_year = m_year(bdat);
- if (a_year == b_year) {
-#ifndef USE_PACK
- a_mon = m_mon(adat);
- b_mon = m_mon(bdat);
- if (a_mon == b_mon) {
- a_mday = m_mday(adat);
- b_mday = m_mday(bdat);
- if (a_mday == b_mday) {
- return INT2FIX(0);
- }
- else if (a_mday < b_mday) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else if (a_mon < b_mon) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
-#else
- a_pd = m_pc(adat);
- b_pd = m_pc(bdat);
- if (a_pd == b_pd) {
- return INT2FIX(0);
- }
- else if (a_pd < b_pd) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
-#endif
- }
- else if (a_year < b_year) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- else if (f_lt_p(a_nth, b_nth)) {
- return INT2FIX(-1);
- }
- else {
- return INT2FIX(1);
- }
- }
- }
-}
-
-static VALUE
-equal_gen(VALUE self, VALUE other)
-{
- get_d1(self);
-
- if (k_numeric_p(other))
- return f_eqeq_p(m_real_local_jd(dat), other);
- else if (k_date_p(other))
- return f_eqeq_p(m_real_local_jd(dat), f_jd(other));
- return rb_num_coerce_cmp(self, other, rb_intern("=="));
-}
-
-/*
- * call-seq:
- * d === other -> bool
- *
- * Returns true if they are the same day.
- *
- * Date.new(2001,2,3) === Date.new(2001,2,3)
- * #=> true
- * Date.new(2001,2,3) === Date.new(2001,2,4)
- * #=> false
- * DateTime.new(2001,2,3) === DateTime.new(2001,2,3,12)
- * #=> true
- * DateTime.new(2001,2,3) === DateTime.new(2001,2,3,0,0,0,'+24:00')
- * #=> true
- * DateTime.new(2001,2,3) === DateTime.new(2001,2,4,0,0,0,'+24:00')
- * #=> false
- */
-static VALUE
-d_lite_equal(VALUE self, VALUE other)
-{
- if (!k_date_p(other))
- return equal_gen(self, other);
-
- {
- get_d2(self, other);
-
- if (!(m_gregorian_p(adat) == m_gregorian_p(bdat)))
- return equal_gen(self, other);
-
- if (have_jd_p(adat) &&
- have_jd_p(bdat)) {
- VALUE a_nth, b_nth;
- int a_jd, b_jd;
-
- m_canonicalize_jd(adat);
- m_canonicalize_jd(bdat);
- a_nth = m_nth(adat);
- b_nth = m_nth(bdat);
- a_jd = m_local_jd(adat);
- b_jd = m_local_jd(bdat);
- if (f_eqeq_p(a_nth, b_nth) &&
- a_jd == b_jd)
- return Qtrue;
- return Qfalse;
- }
- else {
-#ifndef USE_PACK
- VALUE a_nth, b_nth;
- int a_year, b_year,
- a_mon, b_mon,
- a_mday, b_mday;
-#else
- VALUE a_nth, b_nth;
- int a_year, b_year,
- a_pd, b_pd;
-#endif
-
- m_canonicalize_jd(adat);
- m_canonicalize_jd(bdat);
- a_nth = m_nth(adat);
- b_nth = m_nth(bdat);
- if (f_eqeq_p(a_nth, b_nth)) {
- a_year = m_year(adat);
- b_year = m_year(bdat);
- if (a_year == b_year) {
-#ifndef USE_PACK
- a_mon = m_mon(adat);
- b_mon = m_mon(bdat);
- if (a_mon == b_mon) {
- a_mday = m_mday(adat);
- b_mday = m_mday(bdat);
- if (a_mday == b_mday)
- return Qtrue;
- }
-#else
- /* mon and mday only */
- a_pd = (m_pc(adat) >> MDAY_SHIFT);
- b_pd = (m_pc(bdat) >> MDAY_SHIFT);
- if (a_pd == b_pd) {
- return Qtrue;
- }
-#endif
- }
- }
- return Qfalse;
- }
- }
-}
-
-/* :nodoc: */
-static VALUE
-d_lite_eql_p(VALUE self, VALUE other)
-{
- if (!k_date_p(other))
- return Qfalse;
- return f_zero_p(d_lite_cmp(self, other));
-}
-
-/* :nodoc: */
-static VALUE
-d_lite_hash(VALUE self)
-{
- st_index_t v, h[4];
-
- get_d1(self);
- h[0] = m_nth(dat);
- h[1] = m_jd(dat);
- h[2] = m_df(dat);
- h[3] = m_sf(dat);
- v = rb_memhash(h, sizeof(h));
- return LONG2FIX(v);
-}
-
-#include "date_tmx.h"
-static void set_tmx(VALUE, struct tmx *);
-static VALUE strftimev(const char *, VALUE,
- void (*)(VALUE, struct tmx *));
-
-/*
- * call-seq:
- * d.to_s -> string
- *
- * Returns a string in an ISO 8601 format (This method doesn't use the
- * expanded representations).
- *
- * Date.new(2001,2,3).to_s #=> "2001-02-03"
- */
-static VALUE
-d_lite_to_s(VALUE self)
-{
- return strftimev("%Y-%m-%d", self, set_tmx);
-}
-
-#ifndef NDEBUG
-static VALUE
-mk_inspect_flags(union DateData *x)
-{
- return rb_enc_sprintf(rb_usascii_encoding(),
- "%c%c%c%c%c",
- (x->flags & COMPLEX_DAT) ? 'C' : 'S',
- (x->flags & HAVE_JD) ? 'j' : '-',
- (x->flags & HAVE_DF) ? 'd' : '-',
- (x->flags & HAVE_CIVIL) ? 'c' : '-',
- (x->flags & HAVE_TIME) ? 't' : '-');
-}
-
-static VALUE
-mk_inspect_raw(union DateData *x, const char *klass)
-{
- if (simple_dat_p(x)) {
- VALUE nth, flags;
-
- RB_GC_GUARD(nth) = f_inspect(x->s.nth);
- RB_GC_GUARD(flags) = mk_inspect_flags(x);
-
- return rb_enc_sprintf(rb_usascii_encoding(),
- "#<%s: "
- "(%sth,%dj),+0s,%.0fj; "
- "%dy%dm%dd; %s>",
- klass ? klass : "?",
- RSTRING_PTR(nth), x->s.jd, x->s.sg,
-#ifndef USE_PACK
- x->s.year, x->s.mon, x->s.mday,
-#else
- x->s.year,
- EX_MON(x->s.pc), EX_MDAY(x->s.pc),
-#endif
- RSTRING_PTR(flags));
- }
- else {
- VALUE nth, sf, flags;
-
- RB_GC_GUARD(nth) = f_inspect(x->c.nth);
- RB_GC_GUARD(sf) = f_inspect(x->c.sf);
- RB_GC_GUARD(flags) = mk_inspect_flags(x);
-
- return rb_enc_sprintf(rb_usascii_encoding(),
- "#<%s: "
- "(%sth,%dj,%ds,%sn),%+ds,%.0fj; "
- "%dy%dm%dd %dh%dm%ds; %s>",
- klass ? klass : "?",
- RSTRING_PTR(nth), x->c.jd, x->c.df,
- RSTRING_PTR(sf),
- x->c.of, x->c.sg,
-#ifndef USE_PACK
- x->c.year, x->c.mon, x->c.mday,
- x->c.hour, x->c.min, x->c.sec,
-#else
- x->c.year,
- EX_MON(x->c.pc), EX_MDAY(x->c.pc),
- EX_HOUR(x->c.pc), EX_MIN(x->c.pc),
- EX_SEC(x->c.pc),
-#endif
- RSTRING_PTR(flags));
- }
-}
-
-static VALUE
-d_lite_inspect_raw(VALUE self)
-{
- get_d1(self);
- return mk_inspect_raw(dat, rb_obj_classname(self));
-}
-#endif
-
-static VALUE
-mk_inspect(union DateData *x, const char *klass, const char *to_s)
-{
- VALUE jd, sf;
-
- RB_GC_GUARD(jd) = f_inspect(m_real_jd(x));
- RB_GC_GUARD(sf) = f_inspect(m_sf(x));
-
- return rb_enc_sprintf(rb_usascii_encoding(),
- "#<%s: %s ((%sj,%ds,%sn),%+ds,%.0fj)>",
- klass ? klass : "?",
- to_s ? to_s : "?",
- RSTRING_PTR(jd), m_df(x), RSTRING_PTR(sf),
- m_of(x), m_sg(x));
-}
-
-/*
- * call-seq:
- * d.inspect -> string
- *
- * Returns the value as a string for inspection.
- *
- * Date.new(2001,2,3).inspect
- * #=> "#<Date: 2001-02-03 ((2451944j,0s,0n),+0s,2299161j)>"
- * DateTime.new(2001,2,3,4,5,6,'-7').inspect
- * #=> "#<DateTime: 2001-02-03T04:05:06-07:00 ((2451944j,39906s,0n),-25200s,2299161j)>"
- */
-static VALUE
-d_lite_inspect(VALUE self)
-{
- get_d1(self);
- {
- VALUE to_s;
-
- RB_GC_GUARD(to_s) = f_to_s(self);
- return mk_inspect(dat, rb_obj_classname(self), RSTRING_PTR(to_s));
- }
-}
-
-#include <errno.h>
-#include "date_tmx.h"
-
-size_t date_strftime(char *s, size_t maxsize, const char *format,
- const struct tmx *tmx);
-
-#define SMALLBUF 100
-static size_t
-date_strftime_alloc(char **buf, const char *format,
- struct tmx *tmx)
-{
- size_t size, len, flen;
-
- (*buf)[0] = '\0';
- flen = strlen(format);
- if (flen == 0) {
- return 0;
- }
- errno = 0;
- len = date_strftime(*buf, SMALLBUF, format, tmx);
- if (len != 0 || (**buf == '\0' && errno != ERANGE)) return len;
- for (size=1024; ; size*=2) {
- *buf = xmalloc(size);
- (*buf)[0] = '\0';
- len = date_strftime(*buf, size, format, tmx);
- /*
- * buflen can be zero EITHER because there's not enough
- * room in the string, or because the control command
- * goes to the empty string. Make a reasonable guess that
- * if the buffer is 1024 times bigger than the length of the
- * format string, it's not failing for lack of room.
- */
- if (len > 0) break;
- xfree(*buf);
- if (size >= 1024 * flen) {
- rb_sys_fail(format);
- break;
- }
- }
- return len;
-}
-
-static VALUE
-tmx_m_secs(union DateData *x)
-{
- VALUE s;
- int df;
-
- s = day_to_sec(f_sub(m_real_jd(x),
- UNIX_EPOCH_IN_CJD));
- if (simple_dat_p(x))
- return s;
- df = m_df(x);
- if (df)
- s = f_add(s, INT2FIX(df));
- return s;
-}
-
-#define MILLISECOND_IN_NANOSECONDS 1000000
-
-static VALUE
-tmx_m_msecs(union DateData *x)
-{
- VALUE s, sf;
-
- s = sec_to_ms(tmx_m_secs(x));
- if (simple_dat_p(x))
- return s;
- sf = m_sf(x);
- if (f_nonzero_p(sf))
- s = f_add(s, f_div(sf, INT2FIX(MILLISECOND_IN_NANOSECONDS)));
- return s;
-}
-
-static int
-tmx_m_of(union DateData *x)
-{
- return m_of(x);
-}
-
-static char *
-tmx_m_zone(union DateData *x)
-{
- return RSTRING_PTR(m_zone(x));
-}
-
-static struct tmx_funcs tmx_funcs = {
- (VALUE (*)(void *))m_real_year,
- (int (*)(void *))m_yday,
- (int (*)(void *))m_mon,
- (int (*)(void *))m_mday,
- (VALUE (*)(void *))m_real_cwyear,
- (int (*)(void *))m_cweek,
- (int (*)(void *))m_cwday,
- (int (*)(void *))m_wnum0,
- (int (*)(void *))m_wnum1,
- (int (*)(void *))m_wday,
- (int (*)(void *))m_hour,
- (int (*)(void *))m_min,
- (int (*)(void *))m_sec,
- (VALUE (*)(void *))m_sf_in_sec,
- (VALUE (*)(void *))tmx_m_secs,
- (VALUE (*)(void *))tmx_m_msecs,
- (int (*)(void *))tmx_m_of,
- (char *(*)(void *))tmx_m_zone
-};
-
-static void
-set_tmx(VALUE self, struct tmx *tmx)
-{
- get_d1(self);
- tmx->dat = (void *)dat;
- tmx->funcs = &tmx_funcs;
-}
-
-static VALUE
-date_strftime_internal(int argc, VALUE *argv, VALUE self,
- const char *default_fmt,
- void (*func)(VALUE, struct tmx *))
-{
- VALUE vfmt;
- const char *fmt;
- long len;
- char buffer[SMALLBUF], *buf = buffer;
- struct tmx tmx;
- VALUE str;
-
- rb_scan_args(argc, argv, "01", &vfmt);
-
- if (argc < 1)
- vfmt = rb_usascii_str_new2(default_fmt);
- else {
- StringValue(vfmt);
- if (!rb_enc_str_asciicompat_p(vfmt)) {
- rb_raise(rb_eArgError,
- "format should have ASCII compatible encoding");
- }
- }
- fmt = RSTRING_PTR(vfmt);
- len = RSTRING_LEN(vfmt);
- (*func)(self, &tmx);
- if (memchr(fmt, '\0', len)) {
- /* Ruby string may contain \0's. */
- const char *p = fmt, *pe = fmt + len;
-
- str = rb_str_new(0, 0);
- while (p < pe) {
- len = date_strftime_alloc(&buf, p, &tmx);
- rb_str_cat(str, buf, len);
- p += strlen(p);
- if (buf != buffer) {
- xfree(buf);
- buf = buffer;
- }
- for (fmt = p; p < pe && !*p; ++p);
- if (p > fmt) rb_str_cat(str, fmt, p - fmt);
- }
- rb_enc_copy(str, vfmt);
- OBJ_INFECT(str, vfmt);
- return str;
- }
- else
- len = date_strftime_alloc(&buf, fmt, &tmx);
-
- str = rb_str_new(buf, len);
- if (buf != buffer) xfree(buf);
- rb_enc_copy(str, vfmt);
- OBJ_INFECT(str, vfmt);
- return str;
-}
-
-/*
- * call-seq:
- * d.strftime([format='%F']) -> string
- *
- * Formats date according to the directives in the given format
- * string.
- * The directives begins with a percent (%) character.
- * Any text not listed as a directive will be passed through to the
- * output string.
- *
- * The directive consists of a percent (%) character,
- * zero or more flags, optional minimum field width,
- * optional modifier and a conversion specifier
- * as follows.
- *
- * %<flags><width><modifier><conversion>
- *
- * Flags:
- * - don't pad a numerical output.
- * _ use spaces for padding.
- * 0 use zeros for padding.
- * ^ upcase the result string.
- * # change case.
- *
- * The minimum field width specifies the minimum width.
- *
- * The modifiers are "E", "O", ":", "::" and ":::".
- * "E" and "O" are ignored. No effect to result currently.
- *
- * Format directives:
- *
- * Date (Year, Month, Day):
- * %Y - Year with century (can be negative, 4 digits at least)
- * -0001, 0000, 1995, 2009, 14292, etc.
- * %C - year / 100 (round down. 20 in 2009)
- * %y - year % 100 (00..99)
- *
- * %m - Month of the year, zero-padded (01..12)
- * %_m blank-padded ( 1..12)
- * %-m no-padded (1..12)
- * %B - The full month name (``January'')
- * %^B uppercased (``JANUARY'')
- * %b - The abbreviated month name (``Jan'')
- * %^b uppercased (``JAN'')
- * %h - Equivalent to %b
- *
- * %d - Day of the month, zero-padded (01..31)
- * %-d no-padded (1..31)
- * %e - Day of the month, blank-padded ( 1..31)
- *
- * %j - Day of the year (001..366)
- *
- * Time (Hour, Minute, Second, Subsecond):
- * %H - Hour of the day, 24-hour clock, zero-padded (00..23)
- * %k - Hour of the day, 24-hour clock, blank-padded ( 0..23)
- * %I - Hour of the day, 12-hour clock, zero-padded (01..12)
- * %l - Hour of the day, 12-hour clock, blank-padded ( 1..12)
- * %P - Meridian indicator, lowercase (``am'' or ``pm'')
- * %p - Meridian indicator, uppercase (``AM'' or ``PM'')
- *
- * %M - Minute of the hour (00..59)
- *
- * %S - Second of the minute (00..59)
- *
- * %L - Millisecond of the second (000..999)
- * %N - Fractional seconds digits, default is 9 digits (nanosecond)
- * %3N millisecond (3 digits) %15N femtosecond (15 digits)
- * %6N microsecond (6 digits) %18N attosecond (18 digits)
- * %9N nanosecond (9 digits) %21N zeptosecond (21 digits)
- * %12N picosecond (12 digits) %24N yoctosecond (24 digits)
- *
- * Time zone:
- * %z - Time zone as hour and minute offset from UTC (e.g. +0900)
- * %:z - hour and minute offset from UTC with a colon (e.g. +09:00)
- * %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
- * %:::z - hour, minute and second offset from UTC
- * (e.g. +09, +09:30, +09:30:30)
- * %Z - Time zone abbreviation name or something similar information.
- *
- * Weekday:
- * %A - The full weekday name (``Sunday'')
- * %^A uppercased (``SUNDAY'')
- * %a - The abbreviated name (``Sun'')
- * %^a uppercased (``SUN'')
- * %u - Day of the week (Monday is 1, 1..7)
- * %w - Day of the week (Sunday is 0, 0..6)
- *
- * ISO 8601 week-based year and week number:
- * The week 1 of YYYY starts with a Monday and includes YYYY-01-04.
- * The days in the year before the first week are in the last week of
- * the previous year.
- * %G - The week-based year
- * %g - The last 2 digits of the week-based year (00..99)
- * %V - Week number of the week-based year (01..53)
- *
- * Week number:
- * The week 1 of YYYY starts with a Sunday or Monday (according to %U
- * or %W). The days in the year before the first week are in week 0.
- * %U - Week number of the year. The week starts with Sunday. (00..53)
- * %W - Week number of the year. The week starts with Monday. (00..53)
- *
- * Seconds since the Unix Epoch:
- * %s - Number of seconds since 1970-01-01 00:00:00 UTC.
- * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC.
- *
- * Literal string:
- * %n - Newline character (\n)
- * %t - Tab character (\t)
- * %% - Literal ``%'' character
- *
- * Combination:
- * %c - date and time (%a %b %e %T %Y)
- * %D - Date (%m/%d/%y)
- * %F - The ISO 8601 date format (%Y-%m-%d)
- * %v - VMS date (%e-%b-%Y)
- * %x - Same as %D
- * %X - Same as %T
- * %r - 12-hour time (%I:%M:%S %p)
- * %R - 24-hour time (%H:%M)
- * %T - 24-hour time (%H:%M:%S)
- * %+ - date(1) (%a %b %e %H:%M:%S %Z %Y)
- *
- * This method is similar to strftime() function defined in ISO C and POSIX.
- * Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
- * are locale dependent in the function.
- * However this method is locale independent.
- * So, the result may differ even if a same format string is used in other
- * systems such as C.
- * It is good practice to avoid %x and %X because there are corresponding
- * locale independent representations, %D and %T.
- *
- * Examples:
- *
- * d = DateTime.new(2007,11,19,8,37,48,"-06:00")
- * #=> #<DateTime: 2007-11-19T08:37:48-0600 ...>
- * d.strftime("Printed on %m/%d/%Y") #=> "Printed on 11/19/2007"
- * d.strftime("at %I:%M%p") #=> "at 08:37AM"
- *
- * Various ISO 8601 formats:
- * %Y%m%d => 20071119 Calendar date (basic)
- * %F => 2007-11-19 Calendar date (extended)
- * %Y-%m => 2007-11 Calendar date, reduced accuracy, specific month
- * %Y => 2007 Calendar date, reduced accuracy, specific year
- * %C => 20 Calendar date, reduced accuracy, specific century
- * %Y%j => 2007323 Ordinal date (basic)
- * %Y-%j => 2007-323 Ordinal date (extended)
- * %GW%V%u => 2007W471 Week date (basic)
- * %G-W%V-%u => 2007-W47-1 Week date (extended)
- * %GW%V => 2007W47 Week date, reduced accuracy, specific week (basic)
- * %G-W%V => 2007-W47 Week date, reduced accuracy, specific week (extended)
- * %H%M%S => 083748 Local time (basic)
- * %T => 08:37:48 Local time (extended)
- * %H%M => 0837 Local time, reduced accuracy, specific minute (basic)
- * %H:%M => 08:37 Local time, reduced accuracy, specific minute (extended)
- * %H => 08 Local time, reduced accuracy, specific hour
- * %H%M%S,%L => 083748,000 Local time with decimal fraction, comma as decimal sign (basic)
- * %T,%L => 08:37:48,000 Local time with decimal fraction, comma as decimal sign (extended)
- * %H%M%S.%L => 083748.000 Local time with decimal fraction, full stop as decimal sign (basic)
- * %T.%L => 08:37:48.000 Local time with decimal fraction, full stop as decimal sign (extended)
- * %H%M%S%z => 083748-0600 Local time and the difference from UTC (basic)
- * %T%:z => 08:37:48-06:00 Local time and the difference from UTC (extended)
- * %Y%m%dT%H%M%S%z => 20071119T083748-0600 Date and time of day for calendar date (basic)
- * %FT%T%:z => 2007-11-19T08:37:48-06:00 Date and time of day for calendar date (extended)
- * %Y%jT%H%M%S%z => 2007323T083748-0600 Date and time of day for ordinal date (basic)
- * %Y-%jT%T%:z => 2007-323T08:37:48-06:00 Date and time of day for ordinal date (extended)
- * %GW%V%uT%H%M%S%z => 2007W471T083748-0600 Date and time of day for week date (basic)
- * %G-W%V-%uT%T%:z => 2007-W47-1T08:37:48-06:00 Date and time of day for week date (extended)
- * %Y%m%dT%H%M => 20071119T0837 Calendar date and local time (basic)
- * %FT%R => 2007-11-19T08:37 Calendar date and local time (extended)
- * %Y%jT%H%MZ => 2007323T0837Z Ordinal date and UTC of day (basic)
- * %Y-%jT%RZ => 2007-323T08:37Z Ordinal date and UTC of day (extended)
- * %GW%V%uT%H%M%z => 2007W471T0837-0600 Week date and local time and difference from UTC (basic)
- * %G-W%V-%uT%R%:z => 2007-W47-1T08:37-06:00 Week date and local time and difference from UTC (extended)
- *
- * See also strftime(3) and strptime.
- */
-static VALUE
-d_lite_strftime(int argc, VALUE *argv, VALUE self)
-{
- return date_strftime_internal(argc, argv, self,
- "%Y-%m-%d", set_tmx);
-}
-
-static VALUE
-strftimev(const char *fmt, VALUE self,
- void (*func)(VALUE, struct tmx *))
-{
- char buffer[SMALLBUF], *buf = buffer;
- struct tmx tmx;
- long len;
- VALUE str;
-
- (*func)(self, &tmx);
- len = date_strftime_alloc(&buf, fmt, &tmx);
- str = rb_usascii_str_new(buf, len);
- if (buf != buffer) xfree(buf);
- return str;
-}
-
-/*
- * call-seq:
- * d.asctime -> string
- * d.ctime -> string
- *
- * Returns a string in asctime(3) format (but without "\n\0" at the
- * end). This method is equivalent to strftime('%c').
- *
- * See also asctime(3) or ctime(3).
- */
-static VALUE
-d_lite_asctime(VALUE self)
-{
- return strftimev("%a %b %e %H:%M:%S %Y", self, set_tmx);
-}
-
-/*
- * call-seq:
- * d.iso8601 -> string
- * d.xmlschema -> string
- *
- * This method is equivalent to strftime('%F').
- */
-static VALUE
-d_lite_iso8601(VALUE self)
-{
- return strftimev("%Y-%m-%d", self, set_tmx);
-}
-
-/*
- * call-seq:
- * d.rfc3339 -> string
- *
- * This method is equivalent to strftime('%FT%T%:z').
- */
-static VALUE
-d_lite_rfc3339(VALUE self)
-{
- return strftimev("%Y-%m-%dT%H:%M:%S%:z", self, set_tmx);
-}
-
-/*
- * call-seq:
- * d.rfc2822 -> string
- * d.rfc822 -> string
- *
- * This method is equivalent to strftime('%a, %-d %b %Y %T %z').
- */
-static VALUE
-d_lite_rfc2822(VALUE self)
-{
- return strftimev("%a, %-d %b %Y %T %z", self, set_tmx);
-}
-
-/*
- * call-seq:
- * d.httpdate -> string
- *
- * This method is equivalent to strftime('%a, %d %b %Y %T GMT').
- * See also RFC 2616.
- */
-static VALUE
-d_lite_httpdate(VALUE self)
-{
- volatile VALUE dup = dup_obj_with_new_offset(self, 0);
- return strftimev("%a, %d %b %Y %T GMT", dup, set_tmx);
-}
-
-static VALUE
-jisx0301_date(VALUE jd, VALUE y)
-{
- VALUE a[2];
-
- if (f_lt_p(jd, INT2FIX(2405160)))
- return rb_usascii_str_new2("%Y-%m-%d");
- if (f_lt_p(jd, INT2FIX(2419614))) {
- a[0] = rb_usascii_str_new2("M%02d" ".%%m.%%d");
- a[1] = f_sub(y, INT2FIX(1867));
- }
- else if (f_lt_p(jd, INT2FIX(2424875))) {
- a[0] = rb_usascii_str_new2("T%02d" ".%%m.%%d");
- a[1] = f_sub(y, INT2FIX(1911));
- }
- else if (f_lt_p(jd, INT2FIX(2447535))) {
- a[0] = rb_usascii_str_new2("S%02d" ".%%m.%%d");
- a[1] = f_sub(y, INT2FIX(1925));
- }
- else {
- a[0] = rb_usascii_str_new2("H%02d" ".%%m.%%d");
- a[1] = f_sub(y, INT2FIX(1988));
- }
- return rb_f_sprintf(2, a);
-}
-
-/*
- * call-seq:
- * d.jisx0301 -> string
- *
- * Returns a string in a JIS X 0301 format.
- *
- * Date.new(2001,2,3).jisx0301 #=> "H13.02.03"
- */
-static VALUE
-d_lite_jisx0301(VALUE self)
-{
- VALUE s;
-
- get_d1(self);
- s = jisx0301_date(m_real_local_jd(dat),
- m_real_year(dat));
- return strftimev(RSTRING_PTR(s), self, set_tmx);
-}
-
-#ifndef NDEBUG
-static VALUE
-d_lite_marshal_dump_old(VALUE self)
-{
- VALUE a;
-
- get_d1(self);
-
- a = rb_ary_new3(3,
- m_ajd(dat),
- m_of_in_day(dat),
- DBL2NUM(m_sg(dat)));
-
- if (FL_TEST(self, FL_EXIVAR)) {
- rb_copy_generic_ivar(a, self);
- FL_SET(a, FL_EXIVAR);
- }
-
- return a;
-}
-#endif
-
-/* :nodoc: */
-static VALUE
-d_lite_marshal_dump(VALUE self)
-{
- VALUE a;
-
- get_d1(self);
-
- a = rb_ary_new3(6,
- m_nth(dat),
- INT2FIX(m_jd(dat)),
- INT2FIX(m_df(dat)),
- m_sf(dat),
- INT2FIX(m_of(dat)),
- DBL2NUM(m_sg(dat)));
-
- if (FL_TEST(self, FL_EXIVAR)) {
- rb_copy_generic_ivar(a, self);
- FL_SET(a, FL_EXIVAR);
- }
-
- return a;
-}
-
-/* :nodoc: */
-static VALUE
-d_lite_marshal_load(VALUE self, VALUE a)
-{
- get_d1(self);
-
- rb_check_frozen(self);
- rb_check_trusted(self);
-
- if (TYPE(a) != T_ARRAY)
- rb_raise(rb_eTypeError, "expected an array");
-
- switch (RARRAY_LEN(a)) {
- case 2: /* 1.6.x */
- case 3: /* 1.8.x, 1.9.2 */
- {
- VALUE ajd, of, sg, nth, sf;
- int jd, df, rof;
- double rsg;
-
-
- if (RARRAY_LEN(a) == 2) {
- ajd = f_sub(RARRAY_PTR(a)[0], half_days_in_day);
- of = INT2FIX(0);
- sg = RARRAY_PTR(a)[1];
- if (!k_numeric_p(sg))
- sg = DBL2NUM(RTEST(sg) ? GREGORIAN : JULIAN);
- }
- else {
- ajd = RARRAY_PTR(a)[0];
- of = RARRAY_PTR(a)[1];
- sg = RARRAY_PTR(a)[2];
- }
-
- old_to_new(ajd, of, sg,
- &nth, &jd, &df, &sf, &rof, &rsg);
-
- if (!df && f_zero_p(sf) && !rof) {
- set_to_simple(&dat->s, nth, jd, rsg, 0, 0, 0, HAVE_JD);
- } else {
- if (!complex_dat_p(dat))
- rb_raise(rb_eArgError,
- "cannot load complex into simple");
-
- set_to_complex(&dat->c, nth, jd, df, sf, rof, rsg,
- 0, 0, 0, 0, 0, 0,
- HAVE_JD | HAVE_DF | COMPLEX_DAT);
- }
- }
- break;
- case 6:
- {
- VALUE nth, sf;
- int jd, df, of;
- double sg;
-
- nth = RARRAY_PTR(a)[0];
- jd = NUM2INT(RARRAY_PTR(a)[1]);
- df = NUM2INT(RARRAY_PTR(a)[2]);
- sf = RARRAY_PTR(a)[3];
- of = NUM2INT(RARRAY_PTR(a)[4]);
- sg = NUM2DBL(RARRAY_PTR(a)[5]);
- if (!df && f_zero_p(sf) && !of) {
- set_to_simple(&dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
- } else {
- if (!complex_dat_p(dat))
- rb_raise(rb_eArgError,
- "cannot load complex into simple");
-
- set_to_complex(&dat->c, nth, jd, df, sf, of, sg,
- 0, 0, 0, 0, 0, 0,
- HAVE_JD | HAVE_DF | COMPLEX_DAT);
- }
- }
- break;
- default:
- rb_raise(rb_eTypeError, "invalid size");
- break;
- }
-
- if (FL_TEST(a, FL_EXIVAR)) {
- rb_copy_generic_ivar(self, a);
- FL_SET(self, FL_EXIVAR);
- }
-
- return self;
-}
-
-/* :nodoc: */
-static VALUE
-date_s__load(VALUE klass, VALUE s)
-{
- VALUE a, obj;
-
- a = rb_marshal_load(s);
- obj = d_lite_s_alloc(klass);
- return d_lite_marshal_load(obj, a);
-}
-
-/* datetime */
-
-/*
- * call-seq:
- * DateTime.jd([jd=0[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]) -> datetime
- *
- * Creates a datetime object denoting the given chronological Julian
- * day number.
- *
- * DateTime.jd(2451944) #=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
- * DateTime.jd(2451945) #=> #<DateTime: 2001-02-04T00:00:00+00:00 ...>
- * DateTime.jd(Rational('0.5'))
- * #=> #<DateTime: -4712-01-01T12:00:00+00:00 ...>
- */
-static VALUE
-datetime_s_jd(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vjd, vh, vmin, vs, vof, vsg, jd, fr, fr2, ret;
- int h, min, s, rof;
- double sg;
-
- rb_scan_args(argc, argv, "06", &vjd, &vh, &vmin, &vs, &vof, &vsg);
-
- jd = INT2FIX(0);
-
- h = min = s = 0;
- fr2 = INT2FIX(0);
- rof = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 6:
- val2sg(vsg, sg);
- case 5:
- val2off(vof, rof);
- case 4:
- num2int_with_frac(s, positive_inf);
- case 3:
- num2int_with_frac(min, 3);
- case 2:
- num2int_with_frac(h, 2);
- case 1:
- num2num_with_frac(jd, 1);
- }
-
- {
- VALUE nth;
- int rh, rmin, rs, rjd, rjd2;
-
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- decode_jd(jd, &nth, &rjd);
- rjd2 = jd_local_to_utc(rjd,
- time_to_df(rh, rmin, rs),
- rof);
-
- ret = d_complex_new_internal(klass,
- nth, rjd2,
- 0, INT2FIX(0),
- rof, sg,
- 0, 0, 0,
- rh, rmin, rs,
- HAVE_JD | HAVE_TIME);
- }
- add_frac();
- return ret;
-}
-
-/*
- * call-seq:
- * DateTime.ordinal([year=-4712[, yday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]) -> datetime
- *
- * Creates a date-time object denoting the given ordinal date.
- *
- * DateTime.ordinal(2001,34) #=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
- * DateTime.ordinal(2001,34,4,5,6,'+7')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.ordinal(2001,-332,-20,-55,-54,'+7')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_ordinal(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vd, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
- int d, h, min, s, rof;
- double sg;
-
- rb_scan_args(argc, argv, "07", &vy, &vd, &vh, &vmin, &vs, &vof, &vsg);
-
- y = INT2FIX(-4712);
- d = 1;
-
- h = min = s = 0;
- fr2 = INT2FIX(0);
- rof = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 7:
- val2sg(vsg, sg);
- case 6:
- val2off(vof, rof);
- case 5:
- num2int_with_frac(s, positive_inf);
- case 4:
- num2int_with_frac(min, 4);
- case 3:
- num2int_with_frac(h, 3);
- case 2:
- num2int_with_frac(d, 2);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rd, rh, rmin, rs, rjd, rjd2, ns;
-
- if (!valid_ordinal_p(y, d, sg,
- &nth, &ry,
- &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- rjd2 = jd_local_to_utc(rjd,
- time_to_df(rh, rmin, rs),
- rof);
-
- ret = d_complex_new_internal(klass,
- nth, rjd2,
- 0, INT2FIX(0),
- rof, sg,
- 0, 0, 0,
- rh, rmin, rs,
- HAVE_JD | HAVE_TIME);
- }
- add_frac();
- return ret;
-}
-
-/*
- * call-seq:
- * DateTime.civil([year=-4712[, month=1[, mday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]]) -> datetime
- * DateTime.new([year=-4712[, month=1[, mday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]]) -> datetime
- *
- * Creates a date-time object denoting the given calendar date.
- *
- * DateTime.new(2001,2,3) #=> #<DateTime: 2001-02-03T00:00:00+00:00 ...>
- * DateTime.new(2001,2,3,4,5,6,'+7')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.new(2001,-11,-26,-20,-55,-54,'+7')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_civil(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vd, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
- int m, d, h, min, s, rof;
- double sg;
-
- rb_scan_args(argc, argv, "08", &vy, &vm, &vd, &vh, &vmin, &vs, &vof, &vsg);
-
- y = INT2FIX(-4712);
- m = 1;
- d = 1;
-
- h = min = s = 0;
- fr2 = INT2FIX(0);
- rof = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 8:
- val2sg(vsg, sg);
- case 7:
- val2off(vof, rof);
- case 6:
- num2int_with_frac(s, positive_inf);
- case 5:
- num2int_with_frac(min, 5);
- case 4:
- num2int_with_frac(h, 4);
- case 3:
- num2int_with_frac(d, 3);
- case 2:
- m = NUM2INT(vm);
- case 1:
- y = vy;
- }
-
- if (guess_style(y, sg) < 0) {
- VALUE nth;
- int ry, rm, rd, rh, rmin, rs;
-
- if (!valid_gregorian_p(y, m, d,
- &nth, &ry,
- &rm, &rd))
- rb_raise(rb_eArgError, "invalid date");
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- ret = d_complex_new_internal(klass,
- nth, 0,
- 0, INT2FIX(0),
- rof, sg,
- ry, rm, rd,
- rh, rmin, rs,
- HAVE_CIVIL | HAVE_TIME);
- }
- else {
- VALUE nth;
- int ry, rm, rd, rh, rmin, rs, rjd, rjd2, ns;
-
- if (!valid_civil_p(y, m, d, sg,
- &nth, &ry,
- &rm, &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- rjd2 = jd_local_to_utc(rjd,
- time_to_df(rh, rmin, rs),
- rof);
-
- ret = d_complex_new_internal(klass,
- nth, rjd2,
- 0, INT2FIX(0),
- rof, sg,
- ry, rm, rd,
- rh, rmin, rs,
- HAVE_JD | HAVE_CIVIL | HAVE_TIME);
- }
- add_frac();
- return ret;
-}
-
-/*
- * call-seq:
- * DateTime.commercial([cwyear=-4712[, cweek=1[, cwday=1[, hour=0[, minute=0[, second=0[, offset=0[, start=Date::ITALY]]]]]]]]) -> datetime
- *
- * Creates a date-time object denoting the given week date.
- *
- * DateTime.commercial(2001) #=> #<DateTime: 2001-01-01T00:00:00+00:00 ...>
- * DateTime.commercial(2002) #=> #<DateTime: 2001-12-31T00:00:00+00:00 ...>
- * DateTime.commercial(2001,5,6,4,5,6,'+7')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_commercial(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
- int w, d, h, min, s, rof;
- double sg;
-
- rb_scan_args(argc, argv, "08", &vy, &vw, &vd, &vh, &vmin, &vs, &vof, &vsg);
-
- y = INT2FIX(-4712);
- w = 1;
- d = 1;
-
- h = min = s = 0;
- fr2 = INT2FIX(0);
- rof = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 8:
- val2sg(vsg, sg);
- case 7:
- val2off(vof, rof);
- case 6:
- num2int_with_frac(s, positive_inf);
- case 5:
- num2int_with_frac(min, 5);
- case 4:
- num2int_with_frac(h, 4);
- case 3:
- num2int_with_frac(d, 3);
- case 2:
- w = NUM2INT(vw);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rw, rd, rh, rmin, rs, rjd, rjd2, ns;
-
- if (!valid_commercial_p(y, w, d, sg,
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- rjd2 = jd_local_to_utc(rjd,
- time_to_df(rh, rmin, rs),
- rof);
-
- ret = d_complex_new_internal(klass,
- nth, rjd2,
- 0, INT2FIX(0),
- rof, sg,
- 0, 0, 0,
- rh, rmin, rs,
- HAVE_JD | HAVE_TIME);
- }
- add_frac();
- return ret;
-}
-
-#ifndef NDEBUG
-static VALUE
-datetime_s_weeknum(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vw, vd, vf, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
- int w, d, f, h, min, s, rof;
- double sg;
-
- rb_scan_args(argc, argv, "09", &vy, &vw, &vd, &vf,
- &vh, &vmin, &vs, &vof, &vsg);
-
- y = INT2FIX(-4712);
- w = 0;
- d = 1;
- f = 0;
-
- h = min = s = 0;
- fr2 = INT2FIX(0);
- rof = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 9:
- val2sg(vsg, sg);
- case 8:
- val2off(vof, rof);
- case 7:
- num2int_with_frac(s, positive_inf);
- case 6:
- num2int_with_frac(min, 6);
- case 5:
- num2int_with_frac(h, 5);
- case 4:
- f = NUM2INT(vf);
- case 3:
- num2int_with_frac(d, 4);
- case 2:
- w = NUM2INT(vw);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rw, rd, rh, rmin, rs, rjd, rjd2, ns;
-
- if (!valid_weeknum_p(y, w, d, f, sg,
- &nth, &ry,
- &rw, &rd, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- rjd2 = jd_local_to_utc(rjd,
- time_to_df(rh, rmin, rs),
- rof);
- ret = d_complex_new_internal(klass,
- nth, rjd2,
- 0, INT2FIX(0),
- rof, sg,
- 0, 0, 0,
- rh, rmin, rs,
- HAVE_JD | HAVE_TIME);
- }
- add_frac();
- return ret;
-}
-
-static VALUE
-datetime_s_nth_kday(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vy, vm, vn, vk, vh, vmin, vs, vof, vsg, y, fr, fr2, ret;
- int m, n, k, h, min, s, rof;
- double sg;
-
- rb_scan_args(argc, argv, "09", &vy, &vm, &vn, &vk,
- &vh, &vmin, &vs, &vof, &vsg);
-
- y = INT2FIX(-4712);
- m = 1;
- n = 1;
- k = 1;
-
- h = min = s = 0;
- fr2 = INT2FIX(0);
- rof = 0;
- sg = DEFAULT_SG;
-
- switch (argc) {
- case 9:
- val2sg(vsg, sg);
- case 8:
- val2off(vof, rof);
- case 7:
- num2int_with_frac(s, positive_inf);
- case 6:
- num2int_with_frac(min, 6);
- case 5:
- num2int_with_frac(h, 5);
- case 4:
- num2int_with_frac(k, 4);
- case 3:
- n = NUM2INT(vn);
- case 2:
- m = NUM2INT(vm);
- case 1:
- y = vy;
- }
-
- {
- VALUE nth;
- int ry, rm, rn, rk, rh, rmin, rs, rjd, rjd2, ns;
-
- if (!valid_nth_kday_p(y, m, n, k, sg,
- &nth, &ry,
- &rm, &rn, &rk, &rjd,
- &ns))
- rb_raise(rb_eArgError, "invalid date");
- if (!c_valid_time_p(h, min, s, &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
- canon24oc();
-
- rjd2 = jd_local_to_utc(rjd,
- time_to_df(rh, rmin, rs),
- rof);
- ret = d_complex_new_internal(klass,
- nth, rjd2,
- 0, INT2FIX(0),
- rof, sg,
- 0, 0, 0,
- rh, rmin, rs,
- HAVE_JD | HAVE_TIME);
- }
- add_frac();
- return ret;
-}
-#endif
-
-/*
- * call-seq:
- * DateTime.now([start=Date::ITALY]) -> datetime
- *
- * Creates a date-time object denoting the present time.
- *
- * DateTime.now #=> #<DateTime: 2011-06-11T21:20:44+09:00 ...>
- */
-static VALUE
-datetime_s_now(int argc, VALUE *argv, VALUE klass)
-{
- VALUE vsg, nth, ret;
- double sg;
-#ifdef HAVE_CLOCK_GETTIME
- struct timespec ts;
-#else
- struct timeval tv;
-#endif
- time_t sec;
- struct tm tm;
- long sf, of;
- int y, ry, m, d, h, min, s;
-
- rb_scan_args(argc, argv, "01", &vsg);
-
- if (argc < 1)
- sg = DEFAULT_SG;
- else
- sg = NUM2DBL(vsg);
-
-#ifdef HAVE_CLOCK_GETTIME
- if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
- rb_sys_fail("clock_gettime");
- sec = ts.tv_sec;
-#else
- if (gettimeofday(&tv, NULL) == -1)
- rb_sys_fail("gettimeofday");
- sec = tv.tv_sec;
-#endif
- tzset();
- if (!localtime_r(&sec, &tm))
- rb_sys_fail("localtime");
-
- y = tm.tm_year + 1900;
- m = tm.tm_mon + 1;
- d = tm.tm_mday;
- h = tm.tm_hour;
- min = tm.tm_min;
- s = tm.tm_sec;
- if (s == 60)
- s = 59;
-#ifdef HAVE_STRUCT_TM_TM_GMTOFF
- of = tm.tm_gmtoff;
-#elif defined(HAVE_VAR_TIMEZONE)
-#ifdef HAVE_VAR_ALTZONE
- of = (long)-((tm.tm_isdst > 0) ? altzone : timezone);
-#else
- of = (long)-timezone;
- if (tm.tm_isdst) {
- time_t sec2;
-
- tm.tm_isdst = 0;
- sec2 = mktime(&tm);
- of += (long)difftime(sec2, sec);
- }
-#endif
-#elif defined(HAVE_TIMEGM)
- {
- time_t sec2;
-
- sec2 = timegm(&tm);
- of = (long)difftime(sec2, sec);
- }
-#else
- {
- struct tm tm2;
- time_t sec2;
-
- if (!gmtime_r(&sec, &tm2))
- rb_sys_fail("gmtime");
- tm2.tm_isdst = tm.tm_isdst;
- sec2 = mktime(&tm2);
- of = (long)difftime(sec, sec2);
- }
-#endif
-#ifdef HAVE_CLOCK_GETTIME
- sf = ts.tv_nsec;
-#else
- sf = tv.tv_usec * 1000;
-#endif
-
- if (of < -DAY_IN_SECONDS || of > DAY_IN_SECONDS) {
- of = 0;
- rb_warning("invalid offset is ignored");
- }
-
- decode_year(INT2FIX(y), -1, &nth, &ry);
-
- ret = d_complex_new_internal(klass,
- nth, 0,
- 0, LONG2NUM(sf),
- (int)of, GREGORIAN,
- ry, m, d,
- h, min, s,
- HAVE_CIVIL | HAVE_TIME);
- {
- get_d1(ret);
- set_sg(dat, sg);
- }
- return ret;
-}
-
-static VALUE
-dt_new_by_frags(VALUE klass, VALUE hash, VALUE sg)
-{
- VALUE jd, sf, t;
- int df, of;
-
- if (!c_valid_start_p(NUM2DBL(sg))) {
- sg = INT2FIX(DEFAULT_SG);
- rb_warning("invalid start is ignored");
- }
-
- if (NIL_P(hash))
- rb_raise(rb_eArgError, "invalid date");
-
- if (NIL_P(ref_hash("jd")) &&
- NIL_P(ref_hash("yday")) &&
- !NIL_P(ref_hash("year")) &&
- !NIL_P(ref_hash("mon")) &&
- !NIL_P(ref_hash("mday"))) {
- jd = rt__valid_civil_p(ref_hash("year"),
- ref_hash("mon"),
- ref_hash("mday"), sg);
-
- if (NIL_P(ref_hash("hour")))
- set_hash("hour", INT2FIX(0));
- if (NIL_P(ref_hash("min")))
- set_hash("min", INT2FIX(0));
- if (NIL_P(ref_hash("sec")))
- set_hash("sec", INT2FIX(0));
- else if (f_eqeq_p(ref_hash("sec"), INT2FIX(60)))
- set_hash("sec", INT2FIX(59));
- }
- else {
- hash = rt_rewrite_frags(hash);
- hash = rt_complete_frags(klass, hash);
- jd = rt__valid_date_frags_p(hash, sg);
- }
-
- if (NIL_P(jd))
- rb_raise(rb_eArgError, "invalid date");
-
- {
- int rh, rmin, rs;
-
- if (!c_valid_time_p(NUM2INT(ref_hash("hour")),
- NUM2INT(ref_hash("min")),
- NUM2INT(ref_hash("sec")),
- &rh, &rmin, &rs))
- rb_raise(rb_eArgError, "invalid date");
-
- df = time_to_df(rh, rmin, rs);
- }
-
- t = ref_hash("sec_fraction");
- if (NIL_P(t))
- sf = INT2FIX(0);
- else
- sf = sec_to_ns(t);
-
- t = ref_hash("offset");
- if (NIL_P(t))
- of = 0;
- else {
- of = NUM2INT(t);
- if (of < -DAY_IN_SECONDS || of > DAY_IN_SECONDS) {
- of = 0;
- rb_warning("invalid offset is ignored");
- }
- }
- {
- VALUE nth;
- int rjd, rjd2;
-
- decode_jd(jd, &nth, &rjd);
- rjd2 = jd_local_to_utc(rjd, df, of);
- df = df_local_to_utc(df, of);
-
- return d_complex_new_internal(klass,
- nth, rjd2,
- df, sf,
- of, NUM2DBL(sg),
- 0, 0, 0,
- 0, 0, 0,
- HAVE_JD | HAVE_DF);
- }
-}
-
-/*
- * call-seq:
- * DateTime._strptime(string[, format='%FT%T%z']) -> hash
- *
- * Parses the given representation of date and time with the given
- * template, and returns a hash of parsed elements. _strptime does
- * not support specification of flags and width unlike strftime.
- *
- * See also strptime(3) and strftime.
- */
-static VALUE
-datetime_s__strptime(int argc, VALUE *argv, VALUE klass)
-{
- return date_s__strptime_internal(argc, argv, klass, "%FT%T%z");
-}
-
-/*
- * call-seq:
- * DateTime.strptime([string='-4712-01-01T00:00:00+00:00'[, format='%FT%T%z'[ ,start=ITALY]]]) -> datetime
- *
- * Parses the given representation of date and time with the given
- * template, and creates a date object. strptime does not support
- * specification of flags and width unlike strftime.
- *
- * DateTime.strptime('2001-02-03T04:05:06+07:00', '%Y-%m-%dT%H:%M:%S%z')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.strptime('03-02-2001 04:05:06 PM', '%d-%m-%Y %I:%M:%S %p')
- * #=> #<DateTime: 2001-02-03T16:05:06+00:00 ...>
- * DateTime.strptime('2001-W05-6T04:05:06+07:00', '%G-W%V-%uT%H:%M:%S%z')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.strptime('2001 04 6 04 05 06 +7', '%Y %U %w %H %M %S %z')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.strptime('2001 05 6 04 05 06 +7', '%Y %W %u %H %M %S %z')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.strptime('-1', '%s')
- * #=> #<DateTime: 1969-12-31T23:59:59+00:00 ...>
- * DateTime.strptime('-1000', '%Q')
- * #=> #<DateTime: 1969-12-31T23:59:59+00:00 ...>
- * DateTime.strptime('sat3feb014pm+7', '%a%d%b%y%H%p%z')
- * #=> #<DateTime: 2001-02-03T16:00:00+07:00 ...>
- *
- * See also strptime(3) and strftime.
- */
-static VALUE
-datetime_s_strptime(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, fmt, sg;
-
- rb_scan_args(argc, argv, "03", &str, &fmt, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- fmt = rb_str_new2("%FT%T%z");
- case 2:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE argv2[2], hash;
-
- argv2[0] = str;
- argv2[1] = fmt;
- hash = date_s__strptime(2, argv2, klass);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.parse(string='-4712-01-01T00:00:00+00:00'[, comp=true[, start=ITALY]]) -> datetime
- *
- * Parses the given representation of date and time, and creates a
- * date object. This method does not function as a validator.
- *
- * If the optional second argument is true and the detected year is in
- * the range "00" to "99", makes it full.
- *
- * DateTime.parse('2001-02-03T04:05:06+07:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.parse('20010203T040506+0700')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.parse('3rd Feb 2001 04:05:06 PM')
- * #=> #<DateTime: 2001-02-03T16:05:06+00:00 ...>
- */
-static VALUE
-datetime_s_parse(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, comp, sg;
-
- rb_scan_args(argc, argv, "03", &str, &comp, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- comp = Qtrue;
- case 2:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE argv2[2], hash;
-
- argv2[0] = str;
- argv2[1] = comp;
- hash = date_s__parse(2, argv2, klass);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.iso8601(string='-4712-01-01T00:00:00+00:00'[, start=ITALY]) -> datetime
- *
- * Creates a new Date object by parsing from a string according to
- * some typical ISO 8601 formats.
- *
- * DateTime.iso8601('2001-02-03T04:05:06+07:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.iso8601('20010203T040506+0700')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- * DateTime.iso8601('2001-W05-6T04:05:06+07:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_iso8601(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__iso8601(klass, str);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.rfc3339(string='-4712-01-01T00:00:00+00:00'[, start=ITALY]) -> datetime
- *
- * Creates a new Date object by parsing from a string according to
- * some typical RFC 3339 formats.
- *
- * DateTime.rfc3339('2001-02-03T04:05:06+07:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_rfc3339(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__rfc3339(klass, str);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.xmlschema(string='-4712-01-01T00:00:00+00:00'[, start=ITALY]) -> datetime
- *
- * Creates a new Date object by parsing from a string according to
- * some typical XML Schema formats.
- *
- * DateTime.xmlschema('2001-02-03T04:05:06+07:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_xmlschema(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__xmlschema(klass, str);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.rfc2822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY]) -> datetime
- * DateTime.rfc822(string='Mon, 1 Jan -4712 00:00:00 +0000'[, start=ITALY]) -> datetime
- *
- * Creates a new Date object by parsing from a string according to
- * some typical RFC 2822 formats.
- *
- * DateTime.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_rfc2822(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("Mon, 1 Jan -4712 00:00:00 +0000");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__rfc2822(klass, str);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.httpdate(string='Mon, 01 Jan -4712 00:00:00 GMT'[, start=ITALY]) -> datetime
- *
- * Creates a new Date object by parsing from a string according to
- * some RFC 2616 format.
- *
- * DateTime.httpdate('Sat, 03 Feb 2001 04:05:06 GMT')
- * #=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
- */
-static VALUE
-datetime_s_httpdate(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("Mon, 01 Jan -4712 00:00:00 GMT");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__httpdate(klass, str);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * DateTime.jisx0301(string='-4712-01-01T00:00:00+00:00'[, start=ITALY]) -> datetime
- *
- * Creates a new Date object by parsing from a string according to
- * some typical JIS X 0301 formats.
- *
- * DateTime.jisx0301('H13.02.03T04:05:06+07:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+07:00 ...>
- */
-static VALUE
-datetime_s_jisx0301(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str, sg;
-
- rb_scan_args(argc, argv, "02", &str, &sg);
-
- switch (argc) {
- case 0:
- str = rb_str_new2("-4712-01-01T00:00:00+00:00");
- case 1:
- sg = INT2FIX(DEFAULT_SG);
- }
-
- {
- VALUE hash = date_s__jisx0301(klass, str);
- return dt_new_by_frags(klass, hash, sg);
- }
-}
-
-/*
- * call-seq:
- * dt.to_s -> string
- *
- * Returns a string in an ISO 8601 format (This method doesn't use the
- * expanded representations).
- *
- * DateTime.new(2001,2,3,4,5,6,'-7').to_s
- * #=> "2001-02-03T04:05:06-07:00"
- */
-static VALUE
-dt_lite_to_s(VALUE self)
-{
- return strftimev("%Y-%m-%dT%H:%M:%S%:z", self, set_tmx);
-}
-
-/*
- * call-seq:
- * dt.strftime([format='%FT%T%:z']) -> string
- *
- * Formats date according to the directives in the given format
- * string.
- * The directives begins with a percent (%) character.
- * Any text not listed as a directive will be passed through to the
- * output string.
- *
- * The directive consists of a percent (%) character,
- * zero or more flags, optional minimum field width,
- * optional modifier and a conversion specifier
- * as follows.
- *
- * %<flags><width><modifier><conversion>
- *
- * Flags:
- * - don't pad a numerical output.
- * _ use spaces for padding.
- * 0 use zeros for padding.
- * ^ upcase the result string.
- * # change case.
- * : use colons for %z.
- *
- * The minimum field width specifies the minimum width.
- *
- * The modifier is "E" and "O".
- * They are ignored.
- *
- * Format directives:
- *
- * Date (Year, Month, Day):
- * %Y - Year with century (can be negative, 4 digits at least)
- * -0001, 0000, 1995, 2009, 14292, etc.
- * %C - year / 100 (round down. 20 in 2009)
- * %y - year % 100 (00..99)
- *
- * %m - Month of the year, zero-padded (01..12)
- * %_m blank-padded ( 1..12)
- * %-m no-padded (1..12)
- * %B - The full month name (``January'')
- * %^B uppercased (``JANUARY'')
- * %b - The abbreviated month name (``Jan'')
- * %^b uppercased (``JAN'')
- * %h - Equivalent to %b
- *
- * %d - Day of the month, zero-padded (01..31)
- * %-d no-padded (1..31)
- * %e - Day of the month, blank-padded ( 1..31)
- *
- * %j - Day of the year (001..366)
- *
- * Time (Hour, Minute, Second, Subsecond):
- * %H - Hour of the day, 24-hour clock, zero-padded (00..23)
- * %k - Hour of the day, 24-hour clock, blank-padded ( 0..23)
- * %I - Hour of the day, 12-hour clock, zero-padded (01..12)
- * %l - Hour of the day, 12-hour clock, blank-padded ( 1..12)
- * %P - Meridian indicator, lowercase (``am'' or ``pm'')
- * %p - Meridian indicator, uppercase (``AM'' or ``PM'')
- *
- * %M - Minute of the hour (00..59)
- *
- * %S - Second of the minute (00..59)
- *
- * %L - Millisecond of the second (000..999)
- * %N - Fractional seconds digits, default is 9 digits (nanosecond)
- * %3N millisecond (3 digits) %15N femtosecond (15 digits)
- * %6N microsecond (6 digits) %18N attosecond (18 digits)
- * %9N nanosecond (9 digits) %21N zeptosecond (21 digits)
- * %12N picosecond (12 digits) %24N yoctosecond (24 digits)
- *
- * Time zone:
- * %z - Time zone as hour and minute offset from UTC (e.g. +0900)
- * %:z - hour and minute offset from UTC with a colon (e.g. +09:00)
- * %::z - hour, minute and second offset from UTC (e.g. +09:00:00)
- * %:::z - hour, minute and second offset from UTC
- * (e.g. +09, +09:30, +09:30:30)
- * %Z - Time zone abbreviation name or something similar information.
- *
- * Weekday:
- * %A - The full weekday name (``Sunday'')
- * %^A uppercased (``SUNDAY'')
- * %a - The abbreviated name (``Sun'')
- * %^a uppercased (``SUN'')
- * %u - Day of the week (Monday is 1, 1..7)
- * %w - Day of the week (Sunday is 0, 0..6)
- *
- * ISO 8601 week-based year and week number:
- * The week 1 of YYYY starts with a Monday and includes YYYY-01-04.
- * The days in the year before the first week are in the last week of
- * the previous year.
- * %G - The week-based year
- * %g - The last 2 digits of the week-based year (00..99)
- * %V - Week number of the week-based year (01..53)
- *
- * Week number:
- * The week 1 of YYYY starts with a Sunday or Monday (according to %U
- * or %W). The days in the year before the first week are in week 0.
- * %U - Week number of the year. The week starts with Sunday. (00..53)
- * %W - Week number of the year. The week starts with Monday. (00..53)
- *
- * Seconds since the Unix Epoch:
- * %s - Number of seconds since 1970-01-01 00:00:00 UTC.
- * %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC.
- *
- * Literal string:
- * %n - Newline character (\n)
- * %t - Tab character (\t)
- * %% - Literal ``%'' character
- *
- * Combination:
- * %c - date and time (%a %b %e %T %Y)
- * %D - Date (%m/%d/%y)
- * %F - The ISO 8601 date format (%Y-%m-%d)
- * %v - VMS date (%e-%b-%Y)
- * %x - Same as %D
- * %X - Same as %T
- * %r - 12-hour time (%I:%M:%S %p)
- * %R - 24-hour time (%H:%M)
- * %T - 24-hour time (%H:%M:%S)
- * %+ - date(1) (%a %b %e %H:%M:%S %Z %Y)
- *
- * This method is similar to strftime() function defined in ISO C and POSIX.
- * Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
- * are locale dependent in the function.
- * However this method is locale independent.
- * So, the result may differ even if a same format string is used in other
- * systems such as C.
- * It is good practice to avoid %x and %X because there are corresponding
- * locale independent representations, %D and %T.
- *
- * Examples:
- *
- * d = DateTime.new(2007,11,19,8,37,48,"-06:00")
- * #=> #<DateTime: 2007-11-19T08:37:48-0600 ...>
- * d.strftime("Printed on %m/%d/%Y") #=> "Printed on 11/19/2007"
- * d.strftime("at %I:%M%p") #=> "at 08:37AM"
- *
- * Various ISO 8601 formats:
- * %Y%m%d => 20071119 Calendar date (basic)
- * %F => 2007-11-19 Calendar date (extended)
- * %Y-%m => 2007-11 Calendar date, reduced accuracy, specific month
- * %Y => 2007 Calendar date, reduced accuracy, specific year
- * %C => 20 Calendar date, reduced accuracy, specific century
- * %Y%j => 2007323 Ordinal date (basic)
- * %Y-%j => 2007-323 Ordinal date (extended)
- * %GW%V%u => 2007W471 Week date (basic)
- * %G-W%V-%u => 2007-W47-1 Week date (extended)
- * %GW%V => 2007W47 Week date, reduced accuracy, specific week (basic)
- * %G-W%V => 2007-W47 Week date, reduced accuracy, specific week (extended)
- * %H%M%S => 083748 Local time (basic)
- * %T => 08:37:48 Local time (extended)
- * %H%M => 0837 Local time, reduced accuracy, specific minute (basic)
- * %H:%M => 08:37 Local time, reduced accuracy, specific minute (extended)
- * %H => 08 Local time, reduced accuracy, specific hour
- * %H%M%S,%L => 083748,000 Local time with decimal fraction, comma as decimal sign (basic)
- * %T,%L => 08:37:48,000 Local time with decimal fraction, comma as decimal sign (extended)
- * %H%M%S.%L => 083748.000 Local time with decimal fraction, full stop as decimal sign (basic)
- * %T.%L => 08:37:48.000 Local time with decimal fraction, full stop as decimal sign (extended)
- * %H%M%S%z => 083748-0600 Local time and the difference from UTC (basic)
- * %T%:z => 08:37:48-06:00 Local time and the difference from UTC (extended)
- * %Y%m%dT%H%M%S%z => 20071119T083748-0600 Date and time of day for calendar date (basic)
- * %FT%T%:z => 2007-11-19T08:37:48-06:00 Date and time of day for calendar date (extended)
- * %Y%jT%H%M%S%z => 2007323T083748-0600 Date and time of day for ordinal date (basic)
- * %Y-%jT%T%:z => 2007-323T08:37:48-06:00 Date and time of day for ordinal date (extended)
- * %GW%V%uT%H%M%S%z => 2007W471T083748-0600 Date and time of day for week date (basic)
- * %G-W%V-%uT%T%:z => 2007-W47-1T08:37:48-06:00 Date and time of day for week date (extended)
- * %Y%m%dT%H%M => 20071119T0837 Calendar date and local time (basic)
- * %FT%R => 2007-11-19T08:37 Calendar date and local time (extended)
- * %Y%jT%H%MZ => 2007323T0837Z Ordinal date and UTC of day (basic)
- * %Y-%jT%RZ => 2007-323T08:37Z Ordinal date and UTC of day (extended)
- * %GW%V%uT%H%M%z => 2007W471T0837-0600 Week date and local time and difference from UTC (basic)
- * %G-W%V-%uT%R%:z => 2007-W47-1T08:37-06:00 Week date and local time and difference from UTC (extended)
- *
- * See also strftime(3) and strptime.
- */
-static VALUE
-dt_lite_strftime(int argc, VALUE *argv, VALUE self)
-{
- return date_strftime_internal(argc, argv, self,
- "%Y-%m-%dT%H:%M:%S%:z", set_tmx);
-}
-
-static VALUE
-iso8601_timediv(VALUE self, VALUE n)
-{
- VALUE fmt;
-
- n = to_integer(n);
- fmt = rb_usascii_str_new2("T%H:%M:%S");
- if (f_gt_p(n, INT2FIX(0))) {
- VALUE argv[3];
-
- get_d1(self);
-
- argv[0] = rb_usascii_str_new2(".%0*d");
- argv[1] = n;
- argv[2] = f_round(f_quo(m_sf_in_sec(dat),
- f_quo(INT2FIX(1),
- f_expt(INT2FIX(10), n))));
- rb_str_append(fmt, rb_f_sprintf(3, argv));
- }
- rb_str_append(fmt, rb_usascii_str_new2("%:z"));
- return strftimev(RSTRING_PTR(fmt), self, set_tmx);
-}
-
-/*
- * call-seq:
- * dt.iso8601([n=0]) -> string
- * dt.xmlschema([n=0]) -> string
- *
- * This method is equivalent to strftime('%FT%T'). The optional
- * argument n is length of fractional seconds.
- *
- * DateTime.parse('2001-02-03T04:05:06.123456789+07:00').iso8601(9)
- * #=> "2001-02-03T04:05:06.123456789+07:00"
- */
-static VALUE
-dt_lite_iso8601(int argc, VALUE *argv, VALUE self)
-{
- VALUE n;
-
- rb_scan_args(argc, argv, "01", &n);
-
- if (argc < 1)
- n = INT2FIX(0);
-
- return f_add(strftimev("%Y-%m-%d", self, set_tmx),
- iso8601_timediv(self, n));
-}
-
-/*
- * call-seq:
- * dt.rfc3339([n=0]) -> string
- *
- * This method is equivalent to strftime('%FT%T'). The optional
- * argument n is length of fractional seconds.
- *
- * DateTime.parse('2001-02-03T04:05:06.123456789+07:00').rfc3339(9)
- * #=> "2001-02-03T04:05:06.123456789+07:00"
- */
-static VALUE
-dt_lite_rfc3339(int argc, VALUE *argv, VALUE self)
-{
- return dt_lite_iso8601(argc, argv, self);
-}
-
-/*
- * call-seq:
- * dt.jisx0301([n=0]) -> string
- *
- * Returns a string in a JIS X 0301 format. The optional argument n
- * is length of fractional seconds.
- *
- * DateTime.parse('2001-02-03T04:05:06.123456789+07:00').jisx0301(9)
- * #=> "H13.02.03T04:05:06.123456789+07:00"
- */
-static VALUE
-dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
-{
- VALUE n, s;
-
- rb_scan_args(argc, argv, "01", &n);
-
- if (argc < 1)
- n = INT2FIX(0);
-
- {
- get_d1(self);
- s = jisx0301_date(m_real_local_jd(dat),
- m_real_year(dat));
- return rb_str_append(strftimev(RSTRING_PTR(s), self, set_tmx),
- iso8601_timediv(self, n));
- }
-}
-
-/* conversions */
-
-#define f_getlocal(x) rb_funcall(x, rb_intern("getlocal"), 0)
-#define f_subsec(x) rb_funcall(x, rb_intern("subsec"), 0)
-#define f_utc_offset(x) rb_funcall(x, rb_intern("utc_offset"), 0)
-#define f_local3(x,y,m,d) rb_funcall(x, rb_intern("local"), 3, y, m, d)
-#define f_utc6(x,y,m,d,h,min,s) rb_funcall(x, rb_intern("utc"), 6,\
- y, m, d, h, min, s)
-
-/*
- * call-seq:
- * t.to_time -> time
- *
- * Returns a copy of self as local mode.
- */
-static VALUE
-time_to_time(VALUE self)
-{
- return f_getlocal(self);
-}
-
-/*
- * call-seq:
- * t.to_date -> date
- *
- * Returns a Date object which denotes self.
- */
-static VALUE
-time_to_date(VALUE self)
-{
- VALUE y, nth, ret;
- int ry, m, d;
-
- y = f_year(self);
- m = FIX2INT(f_mon(self));
- d = FIX2INT(f_mday(self));
-
- decode_year(y, -1, &nth, &ry);
-
- ret = d_simple_new_internal(cDate,
- nth, 0,
- GREGORIAN,
- ry, m, d,
- HAVE_CIVIL);
- {
- get_d1(ret);
- set_sg(dat, DEFAULT_SG);
- }
- return ret;
-}
-
-/*
- * call-seq:
- * t.to_datetime -> datetime
- *
- * Returns a DateTime object which denotes self.
- */
-static VALUE
-time_to_datetime(VALUE self)
-{
- VALUE y, sf, nth, ret;
- int ry, m, d, h, min, s, of;
-
- y = f_year(self);
- m = FIX2INT(f_mon(self));
- d = FIX2INT(f_mday(self));
-
- h = FIX2INT(f_hour(self));
- min = FIX2INT(f_min(self));
- s = FIX2INT(f_sec(self));
- if (s == 60)
- s = 59;
-
- sf = sec_to_ns(f_subsec(self));
- of = FIX2INT(f_utc_offset(self));
-
- decode_year(y, -1, &nth, &ry);
-
- ret = d_complex_new_internal(cDateTime,
- nth, 0,
- 0, sf,
- of, DEFAULT_SG,
- ry, m, d,
- h, min, s,
- HAVE_CIVIL | HAVE_TIME);
- {
- get_d1(ret);
- set_sg(dat, DEFAULT_SG);
- }
- return ret;
-}
-
-/*
- * call-seq:
- * d.to_time -> time
- *
- * Returns a Time object which denotes self.
- */
-static VALUE
-date_to_time(VALUE self)
-{
- get_d1(self);
-
- return f_local3(rb_cTime,
- m_real_year(dat),
- INT2FIX(m_mon(dat)),
- INT2FIX(m_mday(dat)));
-}
-
-/*
- * call-seq:
- * d.to_date -> self
- *
- * Returns self;
- */
-static VALUE
-date_to_date(VALUE self)
-{
- return self;
-}
-
-/*
- * call-seq:
- * d.to_datetime -> datetime
- *
- * Returns a DateTime object which denotes self.
- */
-static VALUE
-date_to_datetime(VALUE self)
-{
- get_d1a(self);
-
- if (simple_dat_p(adat)) {
- VALUE new = d_lite_s_alloc_simple(cDateTime);
- {
- get_d1b(new);
- bdat->s = adat->s;
- return new;
- }
- }
- else {
- VALUE new = d_lite_s_alloc_complex(cDateTime);
- {
- get_d1b(new);
- bdat->c = adat->c;
- bdat->c.df = 0;
- bdat->c.sf = INT2FIX(0);
-#ifndef USE_PACK
- bdat->c.hour = 0;
- bdat->c.min = 0;
- bdat->c.sec = 0;
-#else
- bdat->c.pc = PACK5(EX_MON(adat->c.pc), EX_MDAY(adat->c.pc),
- 0, 0, 0);
- bdat->c.flags |= HAVE_DF | HAVE_TIME;
-#endif
- return new;
- }
- }
-}
-
-/*
- * call-seq:
- * dt.to_time -> time
- *
- * Returns a Time object which denotes self.
- */
-static VALUE
-datetime_to_time(VALUE self)
-{
- volatile VALUE dup = dup_obj_with_new_offset(self, 0);
- {
- VALUE t;
-
- get_d1(dup);
-
- t = f_utc6(rb_cTime,
- m_real_year(dat),
- INT2FIX(m_mon(dat)),
- INT2FIX(m_mday(dat)),
- INT2FIX(m_hour(dat)),
- INT2FIX(m_min(dat)),
- f_add(INT2FIX(m_sec(dat)),
- m_sf_in_sec(dat)));
- return f_getlocal(t);
- }
-}
-
-/*
- * call-seq:
- * dt.to_date -> date
- *
- * Returns a Date object which denotes self.
- */
-static VALUE
-datetime_to_date(VALUE self)
-{
- get_d1a(self);
-
- if (simple_dat_p(adat)) {
- VALUE new = d_lite_s_alloc_simple(cDate);
- {
- get_d1b(new);
- bdat->s = adat->s;
- bdat->s.jd = m_local_jd(adat);
- return new;
- }
- }
- else {
- VALUE new = d_lite_s_alloc_simple(cDate);
- {
- get_d1b(new);
- copy_complex_to_simple(&bdat->s, &adat->c)
- bdat->s.jd = m_local_jd(adat);
- bdat->s.flags &= ~(HAVE_DF | HAVE_TIME | COMPLEX_DAT);
- return new;
- }
- }
-}
-
-/*
- * call-seq:
- * dt.to_datetime -> self
- *
- * Returns self.
- */
-static VALUE
-datetime_to_datetime(VALUE self)
-{
- return self;
-}
-
-#ifndef NDEBUG
-/* tests */
-
-#define MIN_YEAR -4713
-#define MAX_YEAR 1000000
-#define MIN_JD -327
-#define MAX_JD 366963925
-
-static int
-test_civil(int from, int to, double sg)
-{
- int j;
-
- fprintf(stderr, "test_civil: %d...%d (%d) - %.0f\n",
- from, to, to - from, sg);
- for (j = from; j <= to; j++) {
- int y, m, d, rj, ns;
-
- c_jd_to_civil(j, sg, &y, &m, &d);
- c_civil_to_jd(y, m, d, sg, &rj, &ns);
- if (j != rj) {
- fprintf(stderr, "%d != %d\n", j, rj);
- return 0;
- }
- }
- return 1;
-}
-
-static VALUE
-date_s_test_civil(VALUE klass)
-{
- if (!test_civil(MIN_JD, MIN_JD + 366, GREGORIAN))
- return Qfalse;
- if (!test_civil(2305814, 2598007, GREGORIAN))
- return Qfalse;
- if (!test_civil(MAX_JD - 366, MAX_JD, GREGORIAN))
- return Qfalse;
-
- if (!test_civil(MIN_JD, MIN_JD + 366, ITALY))
- return Qfalse;
- if (!test_civil(2305814, 2598007, ITALY))
- return Qfalse;
- if (!test_civil(MAX_JD - 366, MAX_JD, ITALY))
- return Qfalse;
-
- return Qtrue;
-}
-
-static int
-test_ordinal(int from, int to, double sg)
-{
- int j;
-
- fprintf(stderr, "test_ordinal: %d...%d (%d) - %.0f\n",
- from, to, to - from, sg);
- for (j = from; j <= to; j++) {
- int y, d, rj, ns;
-
- c_jd_to_ordinal(j, sg, &y, &d);
- c_ordinal_to_jd(y, d, sg, &rj, &ns);
- if (j != rj) {
- fprintf(stderr, "%d != %d\n", j, rj);
- return 0;
- }
- }
- return 1;
-}
-
-static VALUE
-date_s_test_ordinal(VALUE klass)
-{
- if (!test_ordinal(MIN_JD, MIN_JD + 366, GREGORIAN))
- return Qfalse;
- if (!test_ordinal(2305814, 2598007, GREGORIAN))
- return Qfalse;
- if (!test_ordinal(MAX_JD - 366, MAX_JD, GREGORIAN))
- return Qfalse;
-
- if (!test_ordinal(MIN_JD, MIN_JD + 366, ITALY))
- return Qfalse;
- if (!test_ordinal(2305814, 2598007, ITALY))
- return Qfalse;
- if (!test_ordinal(MAX_JD - 366, MAX_JD, ITALY))
- return Qfalse;
-
- return Qtrue;
-}
-
-static int
-test_commercial(int from, int to, double sg)
-{
- int j;
-
- fprintf(stderr, "test_commercial: %d...%d (%d) - %.0f\n",
- from, to, to - from, sg);
- for (j = from; j <= to; j++) {
- int y, w, d, rj, ns;
-
- c_jd_to_commercial(j, sg, &y, &w, &d);
- c_commercial_to_jd(y, w, d, sg, &rj, &ns);
- if (j != rj) {
- fprintf(stderr, "%d != %d\n", j, rj);
- return 0;
- }
- }
- return 1;
-}
-
-static VALUE
-date_s_test_commercial(VALUE klass)
-{
- if (!test_commercial(MIN_JD, MIN_JD + 366, GREGORIAN))
- return Qfalse;
- if (!test_commercial(2305814, 2598007, GREGORIAN))
- return Qfalse;
- if (!test_commercial(MAX_JD - 366, MAX_JD, GREGORIAN))
- return Qfalse;
-
- if (!test_commercial(MIN_JD, MIN_JD + 366, ITALY))
- return Qfalse;
- if (!test_commercial(2305814, 2598007, ITALY))
- return Qfalse;
- if (!test_commercial(MAX_JD - 366, MAX_JD, ITALY))
- return Qfalse;
-
- return Qtrue;
-}
-
-static int
-test_weeknum(int from, int to, int f, double sg)
-{
- int j;
-
- fprintf(stderr, "test_weeknum: %d...%d (%d) - %.0f\n",
- from, to, to - from, sg);
- for (j = from; j <= to; j++) {
- int y, w, d, rj, ns;
-
- c_jd_to_weeknum(j, f, sg, &y, &w, &d);
- c_weeknum_to_jd(y, w, d, f, sg, &rj, &ns);
- if (j != rj) {
- fprintf(stderr, "%d != %d\n", j, rj);
- return 0;
- }
- }
- return 1;
-}
-
-static VALUE
-date_s_test_weeknum(VALUE klass)
-{
- int f;
-
- for (f = 0; f <= 1; f++) {
- if (!test_weeknum(MIN_JD, MIN_JD + 366, f, GREGORIAN))
- return Qfalse;
- if (!test_weeknum(2305814, 2598007, f, GREGORIAN))
- return Qfalse;
- if (!test_weeknum(MAX_JD - 366, MAX_JD, f, GREGORIAN))
- return Qfalse;
-
- if (!test_weeknum(MIN_JD, MIN_JD + 366, f, ITALY))
- return Qfalse;
- if (!test_weeknum(2305814, 2598007, f, ITALY))
- return Qfalse;
- if (!test_weeknum(MAX_JD - 366, MAX_JD, f, ITALY))
- return Qfalse;
- }
-
- return Qtrue;
-}
-
-static int
-test_nth_kday(int from, int to, double sg)
-{
- int j;
-
- fprintf(stderr, "test_nth_kday: %d...%d (%d) - %.0f\n",
- from, to, to - from, sg);
- for (j = from; j <= to; j++) {
- int y, m, n, k, rj, ns;
-
- c_jd_to_nth_kday(j, sg, &y, &m, &n, &k);
- c_nth_kday_to_jd(y, m, n, k, sg, &rj, &ns);
- if (j != rj) {
- fprintf(stderr, "%d != %d\n", j, rj);
- return 0;
- }
- }
- return 1;
-}
-
-static VALUE
-date_s_test_nth_kday(VALUE klass)
-{
- if (!test_nth_kday(MIN_JD, MIN_JD + 366, GREGORIAN))
- return Qfalse;
- if (!test_nth_kday(2305814, 2598007, GREGORIAN))
- return Qfalse;
- if (!test_nth_kday(MAX_JD - 366, MAX_JD, GREGORIAN))
- return Qfalse;
-
- if (!test_nth_kday(MIN_JD, MIN_JD + 366, ITALY))
- return Qfalse;
- if (!test_nth_kday(2305814, 2598007, ITALY))
- return Qfalse;
- if (!test_nth_kday(MAX_JD - 366, MAX_JD, ITALY))
- return Qfalse;
-
- return Qtrue;
-}
-
-static int
-test_unit_v2v(VALUE i,
- VALUE (* conv1)(VALUE),
- VALUE (* conv2)(VALUE))
-{
- VALUE c, o;
- c = (*conv1)(i);
- o = (*conv2)(c);
- return f_eqeq_p(o, i);
-}
-
-static int
-test_unit_v2v_iter2(VALUE (* conv1)(VALUE),
- VALUE (* conv2)(VALUE))
-{
- if (!test_unit_v2v(INT2FIX(0), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2FIX(1), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2FIX(2), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2FIX(3), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2FIX(11), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2FIX(65535), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2FIX(1073741823), conv1, conv2))
- return 0;
- if (!test_unit_v2v(INT2NUM(1073741824), conv1, conv2))
- return 0;
- if (!test_unit_v2v(rb_rational_new2(INT2FIX(0), INT2FIX(1)), conv1, conv2))
- return 0;
- if (!test_unit_v2v(rb_rational_new2(INT2FIX(1), INT2FIX(1)), conv1, conv2))
- return 0;
- if (!test_unit_v2v(rb_rational_new2(INT2FIX(1), INT2FIX(2)), conv1, conv2))
- return 0;
- if (!test_unit_v2v(rb_rational_new2(INT2FIX(2), INT2FIX(3)), conv1, conv2))
- return 0;
- return 1;
-}
-
-static int
-test_unit_v2v_iter(VALUE (* conv1)(VALUE),
- VALUE (* conv2)(VALUE))
-{
- if (!test_unit_v2v_iter2(conv1, conv2))
- return 0;
- if (!test_unit_v2v_iter2(conv2, conv1))
- return 0;
- return 1;
-}
-
-static VALUE
-date_s_test_unit_conv(VALUE klass)
-{
- if (!test_unit_v2v_iter(sec_to_day, day_to_sec))
- return Qfalse;
- if (!test_unit_v2v_iter(ms_to_sec, sec_to_ms))
- return Qfalse;
- if (!test_unit_v2v_iter(ns_to_day, day_to_ns))
- return Qfalse;
- if (!test_unit_v2v_iter(ns_to_sec, sec_to_ns))
- return Qfalse;
- return Qtrue;
-}
-
-static VALUE
-date_s_test_all(VALUE klass)
-{
- if (date_s_test_civil(klass) == Qfalse)
- return Qfalse;
- if (date_s_test_ordinal(klass) == Qfalse)
- return Qfalse;
- if (date_s_test_commercial(klass) == Qfalse)
- return Qfalse;
- if (date_s_test_weeknum(klass) == Qfalse)
- return Qfalse;
- if (date_s_test_nth_kday(klass) == Qfalse)
- return Qfalse;
- if (date_s_test_unit_conv(klass) == Qfalse)
- return Qfalse;
- return Qtrue;
-}
-#endif
-
-static const char *monthnames[] = {
- NULL,
- "January", "February", "March",
- "April", "May", "June",
- "July", "August", "September",
- "October", "November", "December"
-};
-
-static const char *abbr_monthnames[] = {
- NULL,
- "Jan", "Feb", "Mar", "Apr",
- "May", "Jun", "Jul", "Aug",
- "Sep", "Oct", "Nov", "Dec"
-};
-
-static const char *daynames[] = {
- "Sunday", "Monday", "Tuesday", "Wednesday",
- "Thursday", "Friday", "Saturday"
-};
-
-static const char *abbr_daynames[] = {
- "Sun", "Mon", "Tue", "Wed",
- "Thu", "Fri", "Sat"
-};
-
-static VALUE
-mk_ary_of_str(long len, const char *a[])
-{
- VALUE o;
- long i;
-
- o = rb_ary_new2(len);
- for (i = 0; i < len; i++) {
- VALUE e;
-
- if (!a[i])
- e = Qnil;
- else {
- e = rb_usascii_str_new2(a[i]);
- rb_obj_freeze(e);
- }
- rb_ary_push(o, e);
- }
- rb_obj_freeze(o);
- return o;
-}
-
-void
-Init_date_core(void)
-{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
-
- assert(fprintf(stderr, "assert() is now active\n"));
-
- id_cmp = rb_intern("<=>");
- id_le_p = rb_intern("<=");
- id_ge_p = rb_intern(">=");
- id_eqeq_p = rb_intern("==");
-
- half_days_in_day = rb_rational_new2(INT2FIX(1), INT2FIX(2));
-
-#if (LONG_MAX / DAY_IN_SECONDS) > SECOND_IN_NANOSECONDS
- day_in_nanoseconds = LONG2NUM((long)DAY_IN_SECONDS *
- SECOND_IN_NANOSECONDS);
-#elif defined HAVE_LONG_LONG
- day_in_nanoseconds = LL2NUM((LONG_LONG)DAY_IN_SECONDS *
- SECOND_IN_NANOSECONDS);
-#else
- day_in_nanoseconds = f_mul(INT2FIX(DAY_IN_SECONDS),
- INT2FIX(SECOND_IN_NANOSECONDS));
-#endif
-
- rb_gc_register_mark_object(half_days_in_day);
- rb_gc_register_mark_object(day_in_nanoseconds);
-
- positive_inf = +INFINITY;
- negative_inf = -INFINITY;
-
- /*
- * date and datetime class - Tadayoshi Funaba 1998-2011
- *
- * 'date' provides two classes Date and DateTime.
- *
- * == Terms and definitions
- *
- * Some terms and definitions are based on ISO 8601 and JIS X 0301.
- *
- * === calendar date
- *
- * The calendar date is a particular day of a calendar year,
- * identified by its ordinal number within a calendar month within
- * that year.
- *
- * In those classes, this is so-called "civil".
- *
- * === ordinal date
- *
- * The ordinal date is a particular day of a calendar year identified
- * by its ordinal number within the year.
- *
- * In those classes, this is so-called "ordinal".
- *
- * === week date
- *
- * The week date is a date identified by calendar week and day numbers.
- *
- * The calendar week is a seven day period within a calendar year,
- * starting on a Monday and identified by its ordinal number within
- * the year; the first calendar week of the year is the one that
- * includes the first Thursday of that year. In the Gregorian
- * calendar, this is equivalent to the week which includes January 4.
- *
- * In those classes, this so-called "commercial".
- *
- * === julian day number
- *
- * The Julian day number is in elapsed days since noon (Greenwich mean
- * time) on January 1, 4713 BCE (in the Julian calendar).
- *
- * In this document, the astronomical Julian day number is same as the
- * original Julian day number. And the chronological Julian day
- * number is a variation of the Julian day number. Its days begin at
- * midnight on local time.
- *
- * In this document, when the term "Julian day number" simply appears,
- * it just refers to "chronological Julian day number", not the
- * original.
- *
- * In those classes, those are so-called "ajd" and "jd".
- *
- * === modified julian day number
- *
- * The modified Julian day number is in elapsed days since midnight
- * (Coordinated universal time) on November 17, 1858 CE (in the
- * Gregorian calendar).
- *
- * In this document, the astronomical modified Julian day number is
- * same as the original modified Julian day number. And the
- * chronological modified Julian day number is a variation of the
- * modified Julian day number. Its days begin at midnight on local
- * time.
- *
- * In this document, when the term "modified Julian day number" simply
- * appears, it just refers to "chronological modified Julian day
- * number", not the original.
- *
- * In those classes, this is so-called "mjd".
- *
- *
- * == Date
- *
- * A subclass of Object includes Comparable module, easily handles
- * date.
- *
- * Date object is created with Date::new, Date::jd, Date::ordinal,
- * Date::commercial, Date::parse, Date::strptime, Date::today,
- * Time#to_date or etc.
- *
- * require 'date'
- *
- * Date.new(2001,2,3) #=> #<Date: 2001-02-03 ...>
- * Date.jd(2451944) #=> #<Date: 2001-02-03 ...>
- * Date.ordinal(2001,34) #=> #<Date: 2001-02-03 ...>
- * Date.commercial(2001,5,6) #=> #<Date: 2001-02-03 ...>
- * Date.parse('2001-02-03') #=> #<Date: 2001-02-03 ...>
- * Date.strptime('03-02-2001', '%d-%m-%Y')
- * #=> #<Date: 2001-02-03 ...>
- * Time.new(2001,2,3).to_date #=> #<Date: 2001-02-03 ...>
- *
- * All date objects are immutable; hence cannot modify themselves.
- *
- * The concept of this date object can be represented as a tuple
- * of the day count, the offset and the day of calendar reform.
- *
- * The day count denotes the absolute position of a temporal
- * dimension. The offset is relative adjustment, which determines
- * decoded local time with the day count. The day of calendar
- * reform denotes the start day of the new style. The old style
- * of the West is the Julian calendar which was adopted by
- * Caersar. The new style is the Gregorian calendar, which is the
- * current civil calendar of many countries.
- *
- * The day count is virtually the astronomical Julian day number.
- * The offset in this class is usually zero, and cannot be
- * specified directly.
- *
- * An optional argument the day of calendar reform (start) as a
- * Julian day number, which should be 2298874 to 2426355 or -/+oo.
- * The default value is Date::ITALY (2299161=1582-10-15). See
- * also sample/cal.rb.
- *
- * $ ruby sample/cal.rb -c it 10 1582
- * October 1582
- * S M Tu W Th F S
- * 1 2 3 4 15 16
- * 17 18 19 20 21 22 23
- * 24 25 26 27 28 29 30
- * 31
- *
- * $ ruby sample/cal.rb -c gb 9 1752
- * September 1752
- * S M Tu W Th F S
- * 1 2 14 15 16
- * 17 18 19 20 21 22 23
- * 24 25 26 27 28 29 30
- *
- * Date object has various methods. See each reference.
- *
- * d = Date.parse('3rd Feb 2001')
- * #=> #<Date: 2001-02-03 ...>
- * d.year #=> 2001
- * d.mon #=> 2
- * d.mday #=> 3
- * d.wday #=> 6
- * d += 1 #=> #<Date: 2001-02-04 ...>
- * d.strftime('%a %d %b %Y') #=> "Sun 04 Feb 2001"
- *
- *
- * == DateTime
- *
- * A subclass of Date easily handles date, hour, minute, second and
- * offset.
- *
- * DateTime does not consider any leapseconds, does not track
- * any summer time rules.
- *
- * DateTime object is created with DateTime::new, DateTime::jd,
- * DateTime::ordinal, DateTime::commercial, DateTime::parse,
- * DateTime::strptime, DateTime::now, Time#to_datetime or etc.
- *
- * require 'date'
- *
- * DateTime.new(2001,2,3,4,5,6)
- * #=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
- *
- * The last element of day, hour, minute or senond can be
- * fractional number. The fractional number's precision is assumed
- * at most nanosecond.
- *
- * DateTime.new(2001,2,3.5)
- * #=> #<DateTime: 2001-02-03T12:00:00+00:00 ...>
- *
- * An optional argument the offset indicates the difference
- * between the local time and UTC. For example, Rational(3,24)
- * represents ahead of 3 hours of UTC, Rational(-5,24) represents
- * behind of 5 hours of UTC. The offset should be -1 to +1, and
- * its precision is assumed at most second. The default value is
- * zero (equals to UTC).
- *
- * DateTime.new(2001,2,3,4,5,6,Rational(3,24))
- * #=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
- * also accepts string form.
- *
- * DateTime.new(2001,2,3,4,5,6,'+03:00')
- * #=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
- *
- * An optional argument the day of calendar reform (start) denotes
- * a Julian day number, which should be 2298874 to 2426355 or
- * -/+oo. The default value is Date::ITALY (2299161=1582-10-15).
- *
- * DateTime object has various methods. See each reference.
- *
- * d = DateTime.parse('3rd Feb 2001 04:05:06+03:30')
- * #=> #<DateTime: 2001-02-03T04:05:06+03:30 ...>
- * d.hour #=> 4
- * d.min #=> 5
- * d.sec #=> 6
- * d.offset #=> (7/48)
- * d.zone #=> "+03:30"
- * d += Rational('1.5')
- * #=> #<DateTime: 2001-02-04%16:05:06+03:30 ...>
- * d = d.new_offset('+09:00')
- * #=> #<DateTime: 2001-02-04%21:35:06+09:00 ...>
- * d.strftime('%I:%M:%S %p')
- * #=> "09:35:06 PM"
- * d > DateTime.new(1999)
- * #=> true
- */
- cDate = rb_define_class("Date", rb_cObject);
-
- rb_include_module(cDate, rb_mComparable);
-
- /* An array of stirng of full month name in English. The first
- * element is nil.
- */
- rb_define_const(cDate, "MONTHNAMES", mk_ary_of_str(13, monthnames));
-
- /* An array of string of abbreviated month name in English. The
- * first element is nil.
- */
- rb_define_const(cDate, "ABBR_MONTHNAMES",
- mk_ary_of_str(13, abbr_monthnames));
-
- /* An array of string of full name of days of the week in English.
- * The first is "Sunday".
- */
- rb_define_const(cDate, "DAYNAMES", mk_ary_of_str(7, daynames));
-
- /* An array of string of abbreviated day name in English. The
- * first is "Sun".
- */
- rb_define_const(cDate, "ABBR_DAYNAMES", mk_ary_of_str(7, abbr_daynames));
-
- /* The Julian day number of the day of calendar reform for Italy
- * and some catholic countries.
- */
- rb_define_const(cDate, "ITALY", INT2FIX(ITALY));
-
- /* The Julian day number of the day of calendar reform for England
- * and her colonies.
- */
- rb_define_const(cDate, "ENGLAND", INT2FIX(ENGLAND));
-
- /* The Julian day number of the day of calendar reform for the
- * proleptic Julian calendar
- */
- rb_define_const(cDate, "JULIAN", DBL2NUM(JULIAN));
-
- /* The Julian day number of the day of calendar reform for the
- * proleptic Gregorian calendar
- */
- rb_define_const(cDate, "GREGORIAN", DBL2NUM(GREGORIAN));
-
- rb_define_alloc_func(cDate, d_lite_s_alloc);
-
-#ifndef NDEBUG
-#define de_define_private_method rb_define_private_method
- de_define_private_method(CLASS_OF(cDate), "_valid_jd?",
- date_s__valid_jd_p, -1);
- de_define_private_method(CLASS_OF(cDate), "_valid_ordinal?",
- date_s__valid_ordinal_p, -1);
- de_define_private_method(CLASS_OF(cDate), "_valid_civil?",
- date_s__valid_civil_p, -1);
- de_define_private_method(CLASS_OF(cDate), "_valid_date?",
- date_s__valid_civil_p, -1);
- de_define_private_method(CLASS_OF(cDate), "_valid_commercial?",
- date_s__valid_commercial_p, -1);
- de_define_private_method(CLASS_OF(cDate), "_valid_weeknum?",
- date_s__valid_weeknum_p, -1);
- de_define_private_method(CLASS_OF(cDate), "_valid_nth_kday?",
- date_s__valid_nth_kday_p, -1);
-#endif
-
- rb_define_singleton_method(cDate, "valid_jd?", date_s_valid_jd_p, -1);
- rb_define_singleton_method(cDate, "valid_ordinal?",
- date_s_valid_ordinal_p, -1);
- rb_define_singleton_method(cDate, "valid_civil?", date_s_valid_civil_p, -1);
- rb_define_singleton_method(cDate, "valid_date?", date_s_valid_civil_p, -1);
- rb_define_singleton_method(cDate, "valid_commercial?",
- date_s_valid_commercial_p, -1);
-
-#ifndef NDEBUG
- de_define_private_method(CLASS_OF(cDate), "valid_weeknum?",
- date_s_valid_weeknum_p, -1);
- de_define_private_method(CLASS_OF(cDate), "valid_nth_kday?",
- date_s_valid_nth_kday_p, -1);
- de_define_private_method(CLASS_OF(cDate), "zone_to_diff",
- date_s_zone_to_diff, 1);
-#endif
-
- rb_define_singleton_method(cDate, "julian_leap?", date_s_julian_leap_p, 1);
- rb_define_singleton_method(cDate, "gregorian_leap?",
- date_s_gregorian_leap_p, 1);
- rb_define_singleton_method(cDate, "leap?",
- date_s_gregorian_leap_p, 1);
-
-#ifndef NDEBUG
-#define de_define_singleton_method rb_define_singleton_method
-#define de_define_alias rb_define_alias
- de_define_singleton_method(cDate, "new!", date_s_new_bang, -1);
- de_define_alias(rb_singleton_class(cDate), "new_l!", "new");
-#endif
-
- rb_define_singleton_method(cDate, "jd", date_s_jd, -1);
- rb_define_singleton_method(cDate, "ordinal", date_s_ordinal, -1);
- rb_define_singleton_method(cDate, "civil", date_s_civil, -1);
- rb_define_singleton_method(cDate, "new", date_s_civil, -1);
- rb_define_singleton_method(cDate, "commercial", date_s_commercial, -1);
-
-#ifndef NDEBUG
- de_define_singleton_method(cDate, "weeknum", date_s_weeknum, -1);
- de_define_singleton_method(cDate, "nth_kday", date_s_nth_kday, -1);
-#endif
-
- rb_define_singleton_method(cDate, "today", date_s_today, -1);
- rb_define_singleton_method(cDate, "_strptime", date_s__strptime, -1);
- rb_define_singleton_method(cDate, "strptime", date_s_strptime, -1);
- rb_define_singleton_method(cDate, "_parse", date_s__parse, -1);
- rb_define_singleton_method(cDate, "parse", date_s_parse, -1);
- rb_define_singleton_method(cDate, "_iso8601", date_s__iso8601, 1);
- rb_define_singleton_method(cDate, "iso8601", date_s_iso8601, -1);
- rb_define_singleton_method(cDate, "_rfc3339", date_s__rfc3339, 1);
- rb_define_singleton_method(cDate, "rfc3339", date_s_rfc3339, -1);
- rb_define_singleton_method(cDate, "_xmlschema", date_s__xmlschema, 1);
- rb_define_singleton_method(cDate, "xmlschema", date_s_xmlschema, -1);
- rb_define_singleton_method(cDate, "_rfc2822", date_s__rfc2822, 1);
- rb_define_singleton_method(cDate, "_rfc822", date_s__rfc2822, 1);
- rb_define_singleton_method(cDate, "rfc2822", date_s_rfc2822, -1);
- rb_define_singleton_method(cDate, "rfc822", date_s_rfc2822, -1);
- rb_define_singleton_method(cDate, "_httpdate", date_s__httpdate, 1);
- rb_define_singleton_method(cDate, "httpdate", date_s_httpdate, -1);
- rb_define_singleton_method(cDate, "_jisx0301", date_s__jisx0301, 1);
- rb_define_singleton_method(cDate, "jisx0301", date_s_jisx0301, -1);
-
-#ifndef NDEBUG
-#define de_define_method rb_define_method
- de_define_method(cDate, "initialize", d_lite_initialize, -1);
-#endif
- rb_define_method(cDate, "initialize_copy", d_lite_initialize_copy, 1);
-
-#ifndef NDEBUG
- de_define_method(cDate, "fill", d_lite_fill, 0);
-#endif
-
- rb_define_method(cDate, "ajd", d_lite_ajd, 0);
- rb_define_method(cDate, "amjd", d_lite_amjd, 0);
- rb_define_method(cDate, "jd", d_lite_jd, 0);
- rb_define_method(cDate, "mjd", d_lite_mjd, 0);
- rb_define_method(cDate, "ld", d_lite_ld, 0);
-
- rb_define_method(cDate, "year", d_lite_year, 0);
- rb_define_method(cDate, "yday", d_lite_yday, 0);
- rb_define_method(cDate, "mon", d_lite_mon, 0);
- rb_define_method(cDate, "month", d_lite_mon, 0);
- rb_define_method(cDate, "mday", d_lite_mday, 0);
- rb_define_method(cDate, "day", d_lite_mday, 0);
- rb_define_method(cDate, "day_fraction", d_lite_day_fraction, 0);
-
- rb_define_method(cDate, "cwyear", d_lite_cwyear, 0);
- rb_define_method(cDate, "cweek", d_lite_cweek, 0);
- rb_define_method(cDate, "cwday", d_lite_cwday, 0);
-
-#ifndef NDEBUG
- de_define_private_method(cDate, "wnum0", d_lite_wnum0, 0);
- de_define_private_method(cDate, "wnum1", d_lite_wnum1, 0);
-#endif
-
- rb_define_method(cDate, "wday", d_lite_wday, 0);
-
- rb_define_method(cDate, "sunday?", d_lite_sunday_p, 0);
- rb_define_method(cDate, "monday?", d_lite_monday_p, 0);
- rb_define_method(cDate, "tuesday?", d_lite_tuesday_p, 0);
- rb_define_method(cDate, "wednesday?", d_lite_wednesday_p, 0);
- rb_define_method(cDate, "thursday?", d_lite_thursday_p, 0);
- rb_define_method(cDate, "friday?", d_lite_friday_p, 0);
- rb_define_method(cDate, "saturday?", d_lite_saturday_p, 0);
-
-#ifndef NDEBUG
- de_define_method(cDate, "nth_kday?", d_lite_nth_kday_p, 2);
-#endif
-
- rb_define_private_method(cDate, "hour", d_lite_hour, 0);
- rb_define_private_method(cDate, "min", d_lite_min, 0);
- rb_define_private_method(cDate, "minute", d_lite_min, 0);
- rb_define_private_method(cDate, "sec", d_lite_sec, 0);
- rb_define_private_method(cDate, "second", d_lite_sec, 0);
- rb_define_private_method(cDate, "sec_fraction", d_lite_sec_fraction, 0);
- rb_define_private_method(cDate, "second_fraction", d_lite_sec_fraction, 0);
- rb_define_private_method(cDate, "offset", d_lite_offset, 0);
- rb_define_private_method(cDate, "zone", d_lite_zone, 0);
-
- rb_define_method(cDate, "julian?", d_lite_julian_p, 0);
- rb_define_method(cDate, "gregorian?", d_lite_gregorian_p, 0);
- rb_define_method(cDate, "leap?", d_lite_leap_p, 0);
-
- rb_define_method(cDate, "start", d_lite_start, 0);
- rb_define_method(cDate, "new_start", d_lite_new_start, -1);
- rb_define_method(cDate, "italy", d_lite_italy, 0);
- rb_define_method(cDate, "england", d_lite_england, 0);
- rb_define_method(cDate, "julian", d_lite_julian, 0);
- rb_define_method(cDate, "gregorian", d_lite_gregorian, 0);
-
- rb_define_private_method(cDate, "new_offset", d_lite_new_offset, -1);
-
- rb_define_method(cDate, "+", d_lite_plus, 1);
- rb_define_method(cDate, "-", d_lite_minus, 1);
-
- rb_define_method(cDate, "next_day", d_lite_next_day, -1);
- rb_define_method(cDate, "prev_day", d_lite_prev_day, -1);
- rb_define_method(cDate, "next", d_lite_next, 0);
- rb_define_method(cDate, "succ", d_lite_next, 0);
-
- rb_define_method(cDate, ">>", d_lite_rshift, 1);
- rb_define_method(cDate, "<<", d_lite_lshift, 1);
-
- rb_define_method(cDate, "next_month", d_lite_next_month, -1);
- rb_define_method(cDate, "prev_month", d_lite_prev_month, -1);
- rb_define_method(cDate, "next_year", d_lite_next_year, -1);
- rb_define_method(cDate, "prev_year", d_lite_prev_year, -1);
-
- rb_define_method(cDate, "step", d_lite_step, -1);
- rb_define_method(cDate, "upto", d_lite_upto, 1);
- rb_define_method(cDate, "downto", d_lite_downto, 1);
-
- rb_define_method(cDate, "<=>", d_lite_cmp, 1);
- rb_define_method(cDate, "===", d_lite_equal, 1);
- rb_define_method(cDate, "eql?", d_lite_eql_p, 1);
- rb_define_method(cDate, "hash", d_lite_hash, 0);
-
- rb_define_method(cDate, "to_s", d_lite_to_s, 0);
-#ifndef NDEBUG
- de_define_method(cDate, "inspect_raw", d_lite_inspect_raw, 0);
-#endif
- rb_define_method(cDate, "inspect", d_lite_inspect, 0);
-
- rb_define_method(cDate, "strftime", d_lite_strftime, -1);
-
- rb_define_method(cDate, "asctime", d_lite_asctime, 0);
- rb_define_method(cDate, "ctime", d_lite_asctime, 0);
- rb_define_method(cDate, "iso8601", d_lite_iso8601, 0);
- rb_define_method(cDate, "xmlschema", d_lite_iso8601, 0);
- rb_define_method(cDate, "rfc3339", d_lite_rfc3339, 0);
- rb_define_method(cDate, "rfc2822", d_lite_rfc2822, 0);
- rb_define_method(cDate, "rfc822", d_lite_rfc2822, 0);
- rb_define_method(cDate, "httpdate", d_lite_httpdate, 0);
- rb_define_method(cDate, "jisx0301", d_lite_jisx0301, 0);
-
-#ifndef NDEBUG
- de_define_method(cDate, "marshal_dump_old", d_lite_marshal_dump_old, 0);
-#endif
- rb_define_method(cDate, "marshal_dump", d_lite_marshal_dump, 0);
- rb_define_method(cDate, "marshal_load", d_lite_marshal_load, 1);
- rb_define_singleton_method(cDate, "_load", date_s__load, 1);
-
- /* datetime */
-
- cDateTime = rb_define_class("DateTime", cDate);
-
- rb_define_singleton_method(cDateTime, "jd", datetime_s_jd, -1);
- rb_define_singleton_method(cDateTime, "ordinal", datetime_s_ordinal, -1);
- rb_define_singleton_method(cDateTime, "civil", datetime_s_civil, -1);
- rb_define_singleton_method(cDateTime, "new", datetime_s_civil, -1);
- rb_define_singleton_method(cDateTime, "commercial",
- datetime_s_commercial, -1);
-
-#ifndef NDEBUG
- de_define_singleton_method(cDateTime, "weeknum",
- datetime_s_weeknum, -1);
- de_define_singleton_method(cDateTime, "nth_kday",
- datetime_s_nth_kday, -1);
-#endif
-
- rb_undef_method(CLASS_OF(cDateTime), "today");
-
- rb_define_singleton_method(cDateTime, "now", datetime_s_now, -1);
- rb_define_singleton_method(cDateTime, "_strptime",
- datetime_s__strptime, -1);
- rb_define_singleton_method(cDateTime, "strptime",
- datetime_s_strptime, -1);
- rb_define_singleton_method(cDateTime, "parse",
- datetime_s_parse, -1);
- rb_define_singleton_method(cDateTime, "iso8601",
- datetime_s_iso8601, -1);
- rb_define_singleton_method(cDateTime, "rfc3339",
- datetime_s_rfc3339, -1);
- rb_define_singleton_method(cDateTime, "xmlschema",
- datetime_s_xmlschema, -1);
- rb_define_singleton_method(cDateTime, "rfc2822",
- datetime_s_rfc2822, -1);
- rb_define_singleton_method(cDateTime, "rfc822",
- datetime_s_rfc2822, -1);
- rb_define_singleton_method(cDateTime, "httpdate",
- datetime_s_httpdate, -1);
- rb_define_singleton_method(cDateTime, "jisx0301",
- datetime_s_jisx0301, -1);
-
-#define f_public(m,s) rb_funcall(m, rb_intern("public"), 1,\
- ID2SYM(rb_intern(s)))
-
- f_public(cDateTime, "hour");
- f_public(cDateTime, "min");
- f_public(cDateTime, "minute");
- f_public(cDateTime, "sec");
- f_public(cDateTime, "second");
- f_public(cDateTime, "sec_fraction");
- f_public(cDateTime, "second_fraction");
- f_public(cDateTime, "offset");
- f_public(cDateTime, "zone");
- f_public(cDateTime, "new_offset");
-
- rb_define_method(cDateTime, "to_s", dt_lite_to_s, 0);
-
- rb_define_method(cDateTime, "strftime", dt_lite_strftime, -1);
-
- rb_define_method(cDateTime, "iso8601", dt_lite_iso8601, -1);
- rb_define_method(cDateTime, "xmlschema", dt_lite_iso8601, -1);
- rb_define_method(cDateTime, "rfc3339", dt_lite_rfc3339, -1);
- rb_define_method(cDateTime, "jisx0301", dt_lite_jisx0301, -1);
-
- /* conversions */
-
- rb_define_method(rb_cTime, "to_time", time_to_time, 0);
- rb_define_method(rb_cTime, "to_date", time_to_date, 0);
- rb_define_method(rb_cTime, "to_datetime", time_to_datetime, 0);
-
- rb_define_method(cDate, "to_time", date_to_time, 0);
- rb_define_method(cDate, "to_date", date_to_date, 0);
- rb_define_method(cDate, "to_datetime", date_to_datetime, 0);
-
- rb_define_method(cDateTime, "to_time", datetime_to_time, 0);
- rb_define_method(cDateTime, "to_date", datetime_to_date, 0);
- rb_define_method(cDateTime, "to_datetime", datetime_to_datetime, 0);
-
-#ifndef NDEBUG
- /* tests */
-
- de_define_singleton_method(cDate, "test_civil", date_s_test_civil, 0);
- de_define_singleton_method(cDate, "test_ordinal", date_s_test_ordinal, 0);
- de_define_singleton_method(cDate, "test_commercial",
- date_s_test_commercial, 0);
- de_define_singleton_method(cDate, "test_weeknum", date_s_test_weeknum, 0);
- de_define_singleton_method(cDate, "test_nth_kday", date_s_test_nth_kday, 0);
- de_define_singleton_method(cDate, "test_unit_conv",
- date_s_test_unit_conv, 0);
- de_define_singleton_method(cDate, "test_all", date_s_test_all, 0);
-#endif
-}
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
deleted file mode 100644
index 3003b45239..0000000000
--- a/ext/date/date_parse.c
+++ /dev/null
@@ -1,3128 +0,0 @@
-/*
- date_parse.c: Coded by Tadayoshi Funaba 2011,2012
-*/
-
-#include "ruby.h"
-#include "ruby/encoding.h"
-#include "ruby/re.h"
-#include <ctype.h>
-
-/* #define TIGHT_PARSER */
-
-#define sizeof_array(o) (sizeof o / sizeof o[0])
-
-#define f_negate(x) rb_funcall(x, rb_intern("-@"), 0)
-#define f_add(x,y) rb_funcall(x, '+', 1, y)
-#define f_sub(x,y) rb_funcall(x, '-', 1, y)
-#define f_mul(x,y) rb_funcall(x, '*', 1, y)
-#define f_div(x,y) rb_funcall(x, '/', 1, y)
-#define f_idiv(x,y) rb_funcall(x, rb_intern("div"), 1, y)
-#define f_mod(x,y) rb_funcall(x, '%', 1, y)
-#define f_expt(x,y) rb_funcall(x, rb_intern("**"), 1, y)
-
-#define f_lt_p(x,y) rb_funcall(x, '<', 1, y)
-#define f_gt_p(x,y) rb_funcall(x, '>', 1, y)
-#define f_le_p(x,y) rb_funcall(x, rb_intern("<="), 1, y)
-#define f_ge_p(x,y) rb_funcall(x, rb_intern(">="), 1, y)
-
-#define f_to_s(x) rb_funcall(x, rb_intern("to_s"), 0)
-
-#define f_match(r,s) rb_funcall(r, rb_intern("match"), 1, s)
-#define f_aref(o,i) rb_funcall(o, rb_intern("[]"), 1, i)
-#define f_aref2(o,i,j) rb_funcall(o, rb_intern("[]"), 2, i, j)
-#define f_begin(o,i) rb_funcall(o, rb_intern("begin"), 1, i)
-#define f_end(o,i) rb_funcall(o, rb_intern("end"), 1, i)
-#define f_aset(o,i,v) rb_funcall(o, rb_intern("[]="), 2, i, v)
-#define f_aset2(o,i,j,v) rb_funcall(o, rb_intern("[]="), 3, i, j, v)
-#define f_sub_bang(s,r,x) rb_funcall(s, rb_intern("sub!"), 2, r, x)
-#define f_gsub_bang(s,r,x) rb_funcall(s, rb_intern("gsub!"), 2, r, x)
-
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
-
-#define cstr2num(s) rb_cstr_to_inum(s, 10, 0)
-#define str2num(s) rb_str_to_inum(s, 10, 0)
-
-static const char *abbr_days[] = {
- "sun", "mon", "tue", "wed",
- "thu", "fri", "sat"
-};
-
-static const char *abbr_months[] = {
- "jan", "feb", "mar", "apr", "may", "jun",
- "jul", "aug", "sep", "oct", "nov", "dec"
-};
-
-#define issign(c) ((c) == '-' || (c) == '+')
-#define asp_string() rb_str_new(" ", 1)
-#ifdef TIGHT_PARSER
-#define asuba_string() rb_str_new("\001", 1)
-#define asubb_string() rb_str_new("\002", 1)
-#define asubw_string() rb_str_new("\027", 1)
-#define asubt_string() rb_str_new("\024", 1)
-#endif
-
-#define DECDIGIT "0123456789"
-
-static void
-s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
-{
- VALUE c = Qnil;
-
- if (TYPE(m) != T_STRING)
- m = f_to_s(m);
-
- if (!NIL_P(y) && !NIL_P(m) && NIL_P(d)) {
- VALUE oy = y;
- VALUE om = m;
- VALUE od = d;
-
- y = od;
- m = oy;
- d = om;
- }
-
- if (NIL_P(y)) {
- if (!NIL_P(d) && RSTRING_LEN(d) > 2) {
- y = d;
- d = Qnil;
- }
- if (!NIL_P(d) && *RSTRING_PTR(d) == '\'') {
- y = d;
- d = Qnil;
- }
- }
-
- if (!NIL_P(y)) {
- const char *s, *bp, *ep;
- size_t l;
-
- s = RSTRING_PTR(y);
- while (!issign((unsigned char)*s) && !isdigit((unsigned char)*s))
- s++;
- bp = s;
- if (issign((unsigned char)*s))
- s++;
- l = strspn(s, DECDIGIT);
- ep = s + l;
- if (*ep) {
- y = d;
- d = rb_str_new(bp, ep - bp);
- }
- }
-
- if (!NIL_P(m)) {
- const char *s;
-
- s = RSTRING_PTR(m);
- if (*s == '\'' || RSTRING_LEN(m) > 2) {
- /* us -> be */
- VALUE oy = y;
- VALUE om = m;
- VALUE od = d;
-
- y = om;
- m = od;
- d = oy;
- }
- }
-
- if (!NIL_P(d)) {
- const char *s;
-
- s = RSTRING_PTR(d);
- if (*s == '\'' || RSTRING_LEN(d) > 2) {
- VALUE oy = y;
- VALUE od = d;
-
- y = od;
- d = oy;
- }
- }
-
- if (!NIL_P(y)) {
- const char *s, *bp, *ep;
- int sign = 0;
- size_t l;
- VALUE iy;
-
- s = RSTRING_PTR(y);
- while (!issign((unsigned char)*s) && !isdigit((unsigned char)*s))
- s++;
- bp = s;
- if (issign(*s)) {
- s++;
- sign = 1;
- }
- if (sign)
- c = Qfalse;
- l = strspn(s, DECDIGIT);
- ep = s + l;
- if (l > 2)
- c = Qfalse;
- {
- char *buf;
-
- buf = ALLOCA_N(char, ep - bp + 1);
- memcpy(buf, bp, ep - bp);
- buf[ep - bp] = '\0';
- iy = cstr2num(buf);
- }
- set_hash("year", iy);
- }
-
- if (bc)
- set_hash("_bc", Qtrue);
-
- if (!NIL_P(m)) {
- const char *s, *bp, *ep;
- size_t l;
- VALUE im;
-
- s = RSTRING_PTR(m);
- while (!isdigit((unsigned char)*s))
- s++;
- bp = s;
- l = strspn(s, DECDIGIT);
- ep = s + l;
- {
- char *buf;
-
- buf = ALLOCA_N(char, ep - bp + 1);
- memcpy(buf, bp, ep - bp);
- buf[ep - bp] = '\0';
- im = cstr2num(buf);
- }
- set_hash("mon", im);
- }
-
- if (!NIL_P(d)) {
- const char *s, *bp, *ep;
- size_t l;
- VALUE id;
-
- s = RSTRING_PTR(d);
- while (!isdigit((unsigned char)*s))
- s++;
- bp = s;
- l = strspn(s, DECDIGIT);
- ep = s + l;
- {
- char *buf;
-
- buf = ALLOCA_N(char, ep - bp + 1);
- memcpy(buf, bp, ep - bp);
- buf[ep - bp] = '\0';
- id = cstr2num(buf);
- }
- set_hash("mday", id);
- }
-
- if (!NIL_P(c))
- set_hash("_comp", c);
-}
-
-#define DAYS "sunday|monday|tuesday|wednesday|thursday|friday|saturday"
-#define MONTHS "january|february|march|april|may|june|july|august|september|october|november|december"
-#define ABBR_DAYS "sun|mon|tue|wed|thu|fri|sat"
-#define ABBR_MONTHS "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec"
-
-#ifdef TIGHT_PARSER
-#define VALID_DAYS "(?:" DAYS ")" "|(?:tues|wednes|thurs|thur|" ABBR_DAYS ")\\.?"
-#define VALID_MONTHS "(?:" MONTHS ")" "|(?:sept|" ABBR_MONTHS ")\\.?"
-#define DOTLESS_VALID_MONTHS "(?:" MONTHS ")" "|(?:sept|" ABBR_MONTHS ")"
-#define BOS "\\A\\s*"
-#define FPA "\\001"
-#define FPB "\\002"
-#define FPW "\\027"
-#define FPT "\\024"
-#define FPW_COM "\\s*(?:" FPW "\\s*,?)?\\s*"
-#define FPT_COM "\\s*(?:" FPT "\\s*,?)?\\s*"
-#define COM_FPW "\\s*(?:,?\\s*" FPW ")?\\s*"
-#define COM_FPT "\\s*(?:,?\\s*(?:@|\\b[aA][tT]\\b)?\\s*" FPT ")?\\s*"
-#define TEE_FPT "\\s*(?:[tT]?" FPT ")?"
-#define EOS "\\s*\\z"
-#endif
-
-static VALUE
-regcomp(const char *source, long len, int opt)
-{
- VALUE pat;
-
- pat = rb_reg_new(source, len, opt);
- rb_gc_register_mark_object(pat);
- return pat;
-}
-
-#define REGCOMP(pat,opt) \
-{ \
- if (NIL_P(pat)) \
- pat = regcomp(pat##_source, sizeof pat##_source - 1, opt); \
-}
-
-#define REGCOMP_0(pat) REGCOMP(pat, 0)
-#define REGCOMP_I(pat) REGCOMP(pat, ONIG_OPTION_IGNORECASE)
-
-#define MATCH(s,p,c) \
-{ \
- return match(s, p, hash, c); \
-}
-
-static int
-match(VALUE str, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
-{
- VALUE m;
-
- m = f_match(pat, str);
-
- if (NIL_P(m))
- return 0;
-
- (*cb)(m, hash);
-
- return 1;
-}
-
-static int
-subx(VALUE str, VALUE rep, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
-{
- VALUE m;
-
- m = f_match(pat, str);
-
- if (NIL_P(m))
- return 0;
-
- {
- VALUE be, en;
-
- be = f_begin(m, INT2FIX(0));
- en = f_end(m, INT2FIX(0));
- f_aset2(str, be, LONG2NUM(NUM2LONG(en) - NUM2LONG(be)), rep);
- (*cb)(m, hash);
- }
-
- return 1;
-}
-
-#define SUBS(s,p,c) \
-{ \
- return subx(s, asp_string(), p, hash, c); \
-}
-
-#ifdef TIGHT_PARSER
-#define SUBA(s,p,c) \
-{ \
- return subx(s, asuba_string(), p, hash, c); \
-}
-
-#define SUBB(s,p,c) \
-{ \
- return subx(s, asubb_string(), p, hash, c); \
-}
-
-#define SUBW(s,p,c) \
-{ \
- return subx(s, asubw_string(), p, hash, c); \
-}
-
-#define SUBT(s,p,c) \
-{ \
- return subx(s, asubt_string(), p, hash, c); \
-}
-#endif
-
-struct zone {
- const char *name;
- int offset;
-};
-
-static struct zone zones_source[] = {
- {"ut", 0*3600}, {"gmt", 0*3600}, {"est", -5*3600}, {"edt", -4*3600},
- {"cst", -6*3600}, {"cdt", -5*3600}, {"mst", -7*3600}, {"mdt", -6*3600},
- {"pst", -8*3600}, {"pdt", -7*3600},
- {"a", 1*3600}, {"b", 2*3600}, {"c", 3*3600}, {"d", 4*3600},
- {"e", 5*3600}, {"f", 6*3600}, {"g", 7*3600}, {"h", 8*3600},
- {"i", 9*3600}, {"k", 10*3600}, {"l", 11*3600}, {"m", 12*3600},
- {"n", -1*3600}, {"o", -2*3600}, {"p", -3*3600}, {"q", -4*3600},
- {"r", -5*3600}, {"s", -6*3600}, {"t", -7*3600}, {"u", -8*3600},
- {"v", -9*3600}, {"w", -10*3600}, {"x", -11*3600}, {"y", -12*3600},
- {"z", 0*3600},
-
- {"utc", 0*3600}, {"wet", 0*3600},
- {"at", -2*3600}, {"brst",-2*3600}, {"ndt", -(2*3600+1800)},
- {"art", -3*3600}, {"adt", -3*3600}, {"brt", -3*3600}, {"clst",-3*3600},
- {"nst", -(3*3600+1800)},
- {"ast", -4*3600}, {"clt", -4*3600},
- {"akdt",-8*3600}, {"ydt", -8*3600},
- {"akst",-9*3600}, {"hadt",-9*3600}, {"hdt", -9*3600}, {"yst", -9*3600},
- {"ahst",-10*3600},{"cat",-10*3600}, {"hast",-10*3600},{"hst",-10*3600},
- {"nt", -11*3600},
- {"idlw",-12*3600},
- {"bst", 1*3600}, {"cet", 1*3600}, {"fwt", 1*3600}, {"met", 1*3600},
- {"mewt", 1*3600}, {"mez", 1*3600}, {"swt", 1*3600}, {"wat", 1*3600},
- {"west", 1*3600},
- {"cest", 2*3600}, {"eet", 2*3600}, {"fst", 2*3600}, {"mest", 2*3600},
- {"mesz", 2*3600}, {"sast", 2*3600}, {"sst", 2*3600},
- {"bt", 3*3600}, {"eat", 3*3600}, {"eest", 3*3600}, {"msk", 3*3600},
- {"msd", 4*3600}, {"zp4", 4*3600},
- {"zp5", 5*3600}, {"ist", (5*3600+1800)},
- {"zp6", 6*3600},
- {"wast", 7*3600},
- {"cct", 8*3600}, {"sgt", 8*3600}, {"wadt", 8*3600},
- {"jst", 9*3600}, {"kst", 9*3600},
- {"east",10*3600}, {"gst", 10*3600},
- {"eadt",11*3600},
- {"idle",12*3600}, {"nzst",12*3600}, {"nzt", 12*3600},
- {"nzdt",13*3600},
-
- {"afghanistan", 16200}, {"alaskan", -32400},
- {"arab", 10800}, {"arabian", 14400},
- {"arabic", 10800}, {"atlantic", -14400},
- {"aus central", 34200}, {"aus eastern", 36000},
- {"azores", -3600}, {"canada central", -21600},
- {"cape verde", -3600}, {"caucasus", 14400},
- {"cen. australia", 34200}, {"central america", -21600},
- {"central asia", 21600}, {"central europe", 3600},
- {"central european", 3600}, {"central pacific", 39600},
- {"central", -21600}, {"china", 28800},
- {"dateline", -43200}, {"e. africa", 10800},
- {"e. australia", 36000}, {"e. europe", 7200},
- {"e. south america", -10800}, {"eastern", -18000},
- {"egypt", 7200}, {"ekaterinburg", 18000},
- {"fiji", 43200}, {"fle", 7200},
- {"greenland", -10800}, {"greenwich", 0},
- {"gtb", 7200}, {"hawaiian", -36000},
- {"india", 19800}, {"iran", 12600},
- {"jerusalem", 7200}, {"korea", 32400},
- {"mexico", -21600}, {"mid-atlantic", -7200},
- {"mountain", -25200}, {"myanmar", 23400},
- {"n. central asia", 21600}, {"nepal", 20700},
- {"new zealand", 43200}, {"newfoundland", -12600},
- {"north asia east", 28800}, {"north asia", 25200},
- {"pacific sa", -14400}, {"pacific", -28800},
- {"romance", 3600}, {"russian", 10800},
- {"sa eastern", -10800}, {"sa pacific", -18000},
- {"sa western", -14400}, {"samoa", -39600},
- {"se asia", 25200}, {"malay peninsula", 28800},
- {"south africa", 7200}, {"sri lanka", 21600},
- {"taipei", 28800}, {"tasmania", 36000},
- {"tokyo", 32400}, {"tonga", 46800},
- {"us eastern", -18000}, {"us mountain", -25200},
- {"vladivostok", 36000}, {"w. australia", 28800},
- {"w. central africa", 3600}, {"w. europe", 3600},
- {"west asia", 18000}, {"west pacific", 36000},
- {"yakutsk", 32400}
-};
-
-VALUE
-date_zone_to_diff(VALUE str)
-{
- VALUE offset = Qnil;
-
- long l, i;
- char *s, *dest, *d;
- int sp = 1;
-
- l = RSTRING_LEN(str);
- s = RSTRING_PTR(str);
-
- dest = d = ALLOCA_N(char, l + 1);
-
- for (i = 0; i < l; i++) {
- if (isspace((unsigned char)s[i]) || s[i] == '\0') {
- if (!sp)
- *d++ = ' ';
- sp = 1;
- }
- else {
- if (isalpha((unsigned char)s[i]))
- *d++ = tolower((unsigned char)s[i]);
- else
- *d++ = s[i];
- sp = 0;
- }
- }
- if (d > dest) {
- if (*(d - 1) == ' ')
- --d;
- *d = '\0';
- }
- str = rb_str_new2(dest);
- {
-#define STD " standard time"
-#define DST " daylight time"
- char *ss, *ds;
- long sl, dl;
- int dst = 0;
-
- sl = RSTRING_LEN(str) - (sizeof STD - 1);
- ss = RSTRING_PTR(str) + sl;
- dl = RSTRING_LEN(str) - (sizeof DST - 1);
- ds = RSTRING_PTR(str) + dl;
-
- if (sl >= 0 && strcmp(ss, STD) == 0) {
- str = rb_str_new(RSTRING_PTR(str), sl);
- }
- else if (dl >= 0 && strcmp(ds, DST) == 0) {
- str = rb_str_new(RSTRING_PTR(str), dl);
- dst = 1;
- }
-#undef STD
-#undef DST
- else {
-#define DST " dst"
- char *ds;
- long dl;
-
- dl = RSTRING_LEN(str) - (sizeof DST - 1);
- ds = RSTRING_PTR(str) + dl;
-
- if (dl >= 0 && strcmp(ds, DST) == 0) {
- str = rb_str_new(RSTRING_PTR(str), dl);
- dst = 1;
- }
-#undef DST
- }
- {
- static VALUE zones = Qnil;
-
- if (NIL_P(zones)) {
- int i;
-
- zones = rb_hash_new();
- rb_gc_register_mark_object(zones);
- for (i = 0; i < (int)sizeof_array(zones_source); i++) {
- VALUE name = rb_str_new2(zones_source[i].name);
- VALUE offset = INT2FIX(zones_source[i].offset);
- rb_hash_aset(zones, name, offset);
- }
- }
-
- offset = f_aref(zones, str);
- if (!NIL_P(offset)) {
- if (dst)
- offset = f_add(offset, INT2FIX(3600));
- goto ok;
- }
- }
- {
- char *s, *p;
- VALUE sign;
- VALUE hour = Qnil, min = Qnil, sec = Qnil;
- VALUE str_orig;
-
- s = RSTRING_PTR(str);
- str_orig = str;
-
- if (strncmp(s, "gmt", 3) == 0 ||
- strncmp(s, "utc", 3) == 0)
- s += 3;
- if (issign(*s)) {
- sign = rb_str_new(s, 1);
- s++;
-
- str = rb_str_new2(s);
-
- if (p = strchr(s, ':')) {
- hour = rb_str_new(s, p - s);
- s = ++p;
- if (p = strchr(s, ':')) {
- min = rb_str_new(s, p - s);
- s = ++p;
- if (p = strchr(s, ':')) {
- sec = rb_str_new(s, p - s);
- }
- else
- sec = rb_str_new2(s);
- }
- else
- min = rb_str_new2(s);
- RB_GC_GUARD(str_orig);
- goto num;
- }
- if (strpbrk(RSTRING_PTR(str), ",.")) {
- char *a, *b;
-
- a = ALLOCA_N(char, RSTRING_LEN(str) + 1);
- strcpy(a, RSTRING_PTR(str));
- b = strpbrk(a, ",.");
- *b = '\0';
- b++;
-
- hour = cstr2num(a);
- min = f_mul(rb_rational_new2
- (cstr2num(b),
- f_expt(INT2FIX(10),
- LONG2NUM((long)strlen(b)))),
- INT2FIX(60));
- goto num;
- }
- {
- const char *cs = RSTRING_PTR(str);
- long cl = RSTRING_LEN(str);
-
- if (cl % 2) {
- if (cl >= 1)
- hour = rb_str_new(&cs[0], 1);
- if (cl >= 3)
- min = rb_str_new(&cs[1], 2);
- if (cl >= 5)
- sec = rb_str_new(&cs[3], 2);
- }
- else {
- if (cl >= 2)
- hour = rb_str_new(&cs[0], 2);
- if (cl >= 4)
- min = rb_str_new(&cs[2], 2);
- if (cl >= 6)
- sec = rb_str_new(&cs[4], 2);
- }
- goto num;
- }
- num:
- if (NIL_P(hour))
- offset = INT2FIX(0);
- else {
- if (TYPE(hour) == T_STRING)
- hour = str2num(hour);
- offset = f_mul(hour, INT2FIX(3600));
- }
- if (!NIL_P(min)) {
- if (TYPE(min) == T_STRING)
- min = str2num(min);
- offset = f_add(offset, f_mul(min, INT2FIX(60)));
- }
- if (!NIL_P(sec))
- offset = f_add(offset, str2num(sec));
- if (!NIL_P(sign) &&
- RSTRING_LEN(sign) == 1 &&
- *RSTRING_PTR(sign) == '-')
- offset = f_negate(offset);
- }
- }
- }
- RB_GC_GUARD(str);
- ok:
- return offset;
-}
-
-static int
-day_num(VALUE s)
-{
- int i;
-
- for (i = 0; i < (int)sizeof_array(abbr_days); i++)
- if (strncasecmp(abbr_days[i], RSTRING_PTR(s), 3) == 0)
- break;
- return i;
-}
-
-static int
-mon_num(VALUE s)
-{
- int i;
-
- for (i = 0; i < (int)sizeof_array(abbr_months); i++)
- if (strncasecmp(abbr_months[i], RSTRING_PTR(s), 3) == 0)
- break;
- return i + 1;
-}
-
-static int
-parse_day_cb(VALUE m, VALUE hash)
-{
- VALUE s;
-
- s = rb_reg_nth_match(1, m);
- set_hash("wday", INT2FIX(day_num(s)));
- return 1;
-}
-
-static int
-parse_day(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b(" ABBR_DAYS ")[^-/\\d\\s]*"
-#else
- "(" VALID_DAYS ")"
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
-#ifndef TIGHT_PARSER
- SUBS(str, pat, parse_day_cb);
-#else
- SUBW(str, pat, parse_day_cb);
-#endif
-}
-
-static int
-parse_time2_cb(VALUE m, VALUE hash)
-{
- VALUE h, min, s, f, p;
-
- h = rb_reg_nth_match(1, m);
- h = str2num(h);
-
- min = rb_reg_nth_match(2, m);
- if (!NIL_P(min))
- min = str2num(min);
-
- s = rb_reg_nth_match(3, m);
- if (!NIL_P(s))
- s = str2num(s);
-
- f = rb_reg_nth_match(4, m);
-
- if (!NIL_P(f))
- f = rb_rational_new2(str2num(f),
- f_expt(INT2FIX(10), LONG2NUM(RSTRING_LEN(f))));
-
- p = rb_reg_nth_match(5, m);
-
- if (!NIL_P(p)) {
- int ih = NUM2INT(h);
- ih %= 12;
- if (*RSTRING_PTR(p) == 'P' || *RSTRING_PTR(p) == 'p')
- ih += 12;
- h = INT2FIX(ih);
- }
-
- set_hash("hour", h);
- if (!NIL_P(min))
- set_hash("min", min);
- if (!NIL_P(s))
- set_hash("sec", s);
- if (!NIL_P(f))
- set_hash("sec_fraction", f);
-
- return 1;
-}
-
-static int
-parse_time_cb(VALUE m, VALUE hash)
-{
- static const char pat_source[] =
- "\\A(\\d+)h?"
- "(?:\\s*:?\\s*(\\d+)m?"
- "(?:"
- "\\s*:?\\s*(\\d+)(?:[,.](\\d+))?s?"
- ")?"
- ")?"
- "(?:\\s*([ap])(?:m\\b|\\.m\\.))?";
- static VALUE pat = Qnil;
- VALUE s1, s2;
-
- s1 = rb_reg_nth_match(1, m);
- s2 = rb_reg_nth_match(2, m);
-
- if (!NIL_P(s2))
- set_hash("zone", s2);
-
- REGCOMP_I(pat);
-
- {
- VALUE m = f_match(pat, s1);
-
- if (NIL_P(m))
- return 0;
- parse_time2_cb(m, hash);
- }
-
- return 1;
-}
-
-static int
-parse_time(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "("
- "(?:"
- "\\d+\\s*:\\s*\\d+"
- "(?:"
-#ifndef TIGHT_PARSER
- "\\s*:\\s*\\d+(?:[,.]\\d*)?"
-#else
- "\\s*:\\s*\\d+(?:[,.]\\d+)?"
-#endif
- ")?"
- "|"
- "\\d+\\s*h(?:\\s*\\d+m?(?:\\s*\\d+s?)?)?"
- ")"
- "(?:"
- "\\s*"
- "[ap](?:m\\b|\\.m\\.)"
- ")?"
- "|"
- "\\d+\\s*[ap](?:m\\b|\\.m\\.)"
- ")"
- "(?:"
- "\\s*"
- "("
- "(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?"
- "|"
- "(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\stime\\b"
- "|"
- "(?-i:[[:alpha:]]+)(?:\\sdst)?\\b"
- ")"
- ")?";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
-#ifndef TIGHT_PARSER
- SUBS(str, pat, parse_time_cb);
-#else
- SUBT(str, pat, parse_time_cb);
-#endif
-}
-
-#ifdef TIGHT_PARSER
-static int
-parse_era1_cb(VALUE m, VALUE hash)
-{
- return 1;
-}
-
-static int
-parse_era1(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "(a(?:d|\\.d\\.))";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBA(str, pat, parse_era1_cb);
-}
-
-static int
-parse_era2_cb(VALUE m, VALUE hash)
-{
- VALUE b;
-
- b = rb_reg_nth_match(1, m);
- if (*RSTRING_PTR(b) == 'B' ||
- *RSTRING_PTR(b) == 'b')
- set_hash("_bc", Qtrue);
- return 1;
-}
-
-static int
-parse_era2(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "(c(?:e|\\.e\\.)|b(?:ce|\\.c\\.e\\.)|b(?:c|\\.c\\.))";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBB(str, pat, parse_era2_cb);
-}
-
-static int
-parse_era(VALUE str, VALUE hash)
-{
- if (parse_era1(str, hash)) /* pre */
- goto ok;
- if (parse_era2(str, hash)) /* post */
- goto ok;
- return 0;
- ok:
- return 1;
-}
-#endif
-
-#ifdef TIGHT_PARSER
-static int
-check_year_width(VALUE y)
-{
- char *s;
- size_t l;
-
- s = RSTRING_PTR(y);
- l = strcspn(s, DECDIGIT);
- s += l;
- l = strspn(s, DECDIGIT);
- if (l != 2)
- return 0;
- return 1;
-}
-
-static int
-check_apost(VALUE a, VALUE b, VALUE c)
-{
- int f = 0;
-
- if (!NIL_P(a) && *RSTRING_PTR(a) == '\'') {
- if (!check_year_width(a))
- return 0;
- f++;
- }
- if (!NIL_P(b) && *RSTRING_PTR(b) == '\'') {
- if (!check_year_width(b))
- return 0;
- if (!NIL_P(c))
- return 0;
- f++;
- }
- if (!NIL_P(c) && *RSTRING_PTR(c) == '\'') {
- if (!check_year_width(c))
- return 0;
- f++;
- }
- if (f > 1)
- return 0;
- return 1;
-}
-#endif
-
-static int
-parse_eu_cb(VALUE m, VALUE hash)
-{
-#ifndef TIGHT_PARSER
- VALUE y, mon, d, b;
-
- d = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- b = rb_reg_nth_match(3, m);
- y = rb_reg_nth_match(4, m);
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, !NIL_P(b) &&
- (*RSTRING_PTR(b) == 'B' ||
- *RSTRING_PTR(b) == 'b'));
-#else
- VALUE y, mon, d;
-
- d = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
- if (!check_apost(d, mon, y))
- return 0;
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
-#endif
- return 1;
-}
-
-static int
-parse_eu(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifdef TIGHT_PARSER
- BOS
- FPW_COM FPT_COM
-#endif
-#ifndef TIGHT_PARSER
- "('?\\d+)[^-\\d\\s]*"
-#else
- "(\\d+)(?:(?:st|nd|rd|th)\\b)?"
-#endif
- "\\s*"
-#ifndef TIGHT_PARSER
- "(" ABBR_MONTHS ")[^-\\d\\s']*"
-#else
- "(" VALID_MONTHS ")"
-#endif
- "(?:"
- "\\s*"
-#ifndef TIGHT_PARSER
- "(c(?:e|\\.e\\.)|b(?:ce|\\.c\\.e\\.)|a(?:d|\\.d\\.)|b(?:c|\\.c\\.))?"
- "\\s*"
- "('?-?\\d+(?:(?:st|nd|rd|th)\\b)?)"
-#else
- "(?:" FPA ")?"
- "\\s*"
- "([-']?\\d+)"
- "\\s*"
- "(?:" FPA "|" FPB ")?"
-#endif
- ")?"
-#ifdef TIGHT_PARSER
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_eu_cb);
-}
-
-static int
-parse_us_cb(VALUE m, VALUE hash)
-{
-#ifndef TIGHT_PARSER
- VALUE y, mon, d, b;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
-
- b = rb_reg_nth_match(3, m);
- y = rb_reg_nth_match(4, m);
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, !NIL_P(b) &&
- (*RSTRING_PTR(b) == 'B' ||
- *RSTRING_PTR(b) == 'b'));
-#else
- VALUE y, mon, d;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
- if (!check_apost(mon, d, y))
- return 0;
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
-#endif
- return 1;
-}
-
-static int
-parse_us(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifdef TIGHT_PARSER
- BOS
- FPW_COM FPT_COM
-#endif
-#ifndef TIGHT_PARSER
- "\\b(" ABBR_MONTHS ")[^-\\d\\s']*"
-#else
- "\\b(" VALID_MONTHS ")"
-#endif
- "\\s*"
-#ifndef TIGHT_PARSER
- "('?\\d+)[^-\\d\\s']*"
-#else
- "('?\\d+)(?:(?:st|nd|rd|th)\\b)?"
- COM_FPT
-#endif
- "(?:"
- "\\s*,?"
- "\\s*"
-#ifndef TIGHT_PARSER
- "(c(?:e|\\.e\\.)|b(?:ce|\\.c\\.e\\.)|a(?:d|\\.d\\.)|b(?:c|\\.c\\.))?"
- "\\s*"
- "('?-?\\d+)"
-#else
- "(?:" FPA ")?"
- "\\s*"
- "([-']?\\d+)"
- "\\s*"
- "(?:" FPA "|" FPB ")?"
-#endif
- ")?"
-#ifdef TIGHT_PARSER
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_us_cb);
-}
-
-static int
-parse_iso_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- y = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- d = rb_reg_nth_match(3, m);
-
-#ifdef TIGHT_PARSER
- if (!check_apost(y, mon, d))
- return 0;
-#endif
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_iso(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "('?[-+]?\\d+)-(\\d+)-('?-?\\d+)"
-#else
- BOS
- FPW_COM FPT_COM
- "([-+']?\\d+)-(\\d+)-([-']?\\d+)"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_iso_cb);
-}
-
-static int
-parse_iso21_cb(VALUE m, VALUE hash)
-{
- VALUE y, w, d;
-
- y = rb_reg_nth_match(1, m);
- w = rb_reg_nth_match(2, m);
- d = rb_reg_nth_match(3, m);
-
- if (!NIL_P(y))
- set_hash("cwyear", str2num(y));
- set_hash("cweek", str2num(w));
- if (!NIL_P(d))
- set_hash("cwday", str2num(d));
-
- return 1;
-}
-
-static int
-parse_iso21(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b(\\d{2}|\\d{4})?-?w(\\d{2})(?:-?(\\d))?\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "(\\d{2}|\\d{4})?-?w(\\d{2})(?:-?(\\d))?"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_iso21_cb);
-}
-
-static int
-parse_iso22_cb(VALUE m, VALUE hash)
-{
- VALUE d;
-
- d = rb_reg_nth_match(1, m);
- set_hash("cwday", str2num(d));
- return 1;
-}
-
-static int
-parse_iso22(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "-w-(\\d)\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "-w-(\\d)"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_iso22_cb);
-}
-
-static int
-parse_iso23_cb(VALUE m, VALUE hash)
-{
- VALUE mon, d;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
-
- if (!NIL_P(mon))
- set_hash("mon", str2num(mon));
- set_hash("mday", str2num(d));
-
- return 1;
-}
-
-static int
-parse_iso23(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "--(\\d{2})?-(\\d{2})\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "--(\\d{2})?-(\\d{2})"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_iso23_cb);
-}
-
-static int
-parse_iso24_cb(VALUE m, VALUE hash)
-{
- VALUE mon, d;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
-
- set_hash("mon", str2num(mon));
- if (!NIL_P(d))
- set_hash("mday", str2num(d));
-
- return 1;
-}
-
-static int
-parse_iso24(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "--(\\d{2})(\\d{2})?\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "--(\\d{2})(\\d{2})?"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_iso24_cb);
-}
-
-static int
-parse_iso25_cb(VALUE m, VALUE hash)
-{
- VALUE y, d;
-
- y = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
-
- set_hash("year", str2num(y));
- set_hash("yday", str2num(d));
-
- return 1;
-}
-
-static int
-parse_iso25(VALUE str, VALUE hash)
-{
- static const char pat0_source[] =
-#ifndef TIGHT_PARSER
- "[,.](\\d{2}|\\d{4})-\\d{3}\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "[,.](\\d{2}|\\d{4})-\\d{3}"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat0 = Qnil;
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b(\\d{2}|\\d{4})-(\\d{3})\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "(\\d{2}|\\d{4})-(\\d{3})"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat0);
- REGCOMP_0(pat);
-
- if (!NIL_P(f_match(pat0, str)))
- return 0;
- SUBS(str, pat, parse_iso25_cb);
-}
-
-static int
-parse_iso26_cb(VALUE m, VALUE hash)
-{
- VALUE d;
-
- d = rb_reg_nth_match(1, m);
- set_hash("yday", str2num(d));
-
- return 1;
-}
-static int
-parse_iso26(VALUE str, VALUE hash)
-{
- static const char pat0_source[] =
-#ifndef TIGHT_PARSER
- "\\d-\\d{3}\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "\\d-\\d{3}"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat0 = Qnil;
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b-(\\d{3})\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "-(\\d{3})"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat0);
- REGCOMP_0(pat);
-
- if (!NIL_P(f_match(pat0, str)))
- return 0;
- SUBS(str, pat, parse_iso26_cb);
-}
-
-static int
-parse_iso2(VALUE str, VALUE hash)
-{
- if (parse_iso21(str, hash))
- goto ok;
- if (parse_iso22(str, hash))
- goto ok;
- if (parse_iso23(str, hash))
- goto ok;
- if (parse_iso24(str, hash))
- goto ok;
- if (parse_iso25(str, hash))
- goto ok;
- if (parse_iso26(str, hash))
- goto ok;
- return 0;
-
- ok:
- return 1;
-}
-
-static int
-gengo(int c)
-{
- int e;
-
- switch (c) {
- case 'M': case 'm': e = 1867; break;
- case 'T': case 't': e = 1911; break;
- case 'S': case 's': e = 1925; break;
- case 'H': case 'h': e = 1988; break;
- default: e = 0; break;
- }
- return e;
-}
-
-static int
-parse_jis_cb(VALUE m, VALUE hash)
-{
- VALUE e, y, mon, d;
- int ep;
-
- e = rb_reg_nth_match(1, m);
- y = rb_reg_nth_match(2, m);
- mon = rb_reg_nth_match(3, m);
- d = rb_reg_nth_match(4, m);
-
- ep = gengo(*RSTRING_PTR(e));
-
- set_hash("year", f_add(str2num(y), INT2FIX(ep)));
- set_hash("mon", str2num(mon));
- set_hash("mday", str2num(d));
-
- return 1;
-}
-
-static int
-parse_jis(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)"
-#else
- BOS
- FPW_COM FPT_COM
- "([mtsh])(\\d+)\\.(\\d+)\\.(\\d+)"
- TEE_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_jis_cb);
-}
-
-static int
-parse_vms11_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- d = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
-#ifdef TIGHT_PARSER
- if (!check_apost(d, mon, y))
- return 0;
-#endif
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_vms11(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "('?-?\\d+)-(" ABBR_MONTHS ")[^-/.]*"
- "-('?-?\\d+)"
-#else
- BOS
- FPW_COM FPT_COM
- "([-']?\\d+)-(" DOTLESS_VALID_MONTHS ")"
- "-([-']?\\d+)"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_vms11_cb);
-}
-
-static int
-parse_vms12_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
-#ifdef TIGHT_PARSER
- if (!check_apost(mon, d, y))
- return 0;
-#endif
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_vms12(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b(" ABBR_MONTHS ")[^-/.]*"
- "-('?-?\\d+)(?:-('?-?\\d+))?"
-#else
- BOS
- FPW_COM FPT_COM
- "(" DOTLESS_VALID_MONTHS ")"
- "-([-']?\\d+)(?:-([-']?\\d+))?"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_vms12_cb);
-}
-
-static int
-parse_vms(VALUE str, VALUE hash)
-{
- if (parse_vms11(str, hash))
- goto ok;
- if (parse_vms12(str, hash))
- goto ok;
- return 0;
-
- ok:
- return 1;
-}
-
-static int
-parse_sla_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- y = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- d = rb_reg_nth_match(3, m);
-
-#ifdef TIGHT_PARSER
- if (!check_apost(y, mon, d))
- return 0;
-#endif
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_sla(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "('?-?\\d+)/\\s*('?\\d+)(?:\\D\\s*('?-?\\d+))?"
-#else
- BOS
- FPW_COM FPT_COM
- "([-']?\\d+)/\\s*('?\\d+)(?:(?:[-/]|\\s+)\\s*([-']?\\d+))?"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_sla_cb);
-}
-
-#ifdef TIGHT_PARSER
-static int
-parse_sla2_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- d = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
- if (!check_apost(d, mon, y))
- return 0;
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_sla2(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- BOS
- FPW_COM FPT_COM
- "([-']?\\d+)/\\s*(" DOTLESS_VALID_MONTHS ")(?:(?:[-/]|\\s+)\\s*([-']?\\d+))?"
- COM_FPT COM_FPW
- EOS
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_sla2_cb);
-}
-
-static int
-parse_sla3_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
- if (!check_apost(mon, d, y))
- return 0;
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_sla3(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- BOS
- FPW_COM FPT_COM
- "(" DOTLESS_VALID_MONTHS ")/\\s*([-']?\\d+)(?:(?:[-/]|\\s+)\\s*([-']?\\d+))?"
- COM_FPT COM_FPW
- EOS
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_sla3_cb);
-}
-#endif
-
-static int
-parse_dot_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- y = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- d = rb_reg_nth_match(3, m);
-
-#ifdef TIGHT_PARSER
- if (!check_apost(y, mon, d))
- return 0;
-#endif
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_dot(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "('?-?\\d+)\\.\\s*('?\\d+)\\.\\s*('?-?\\d+)"
-#else
- BOS
- FPW_COM FPT_COM
- "([-']?\\d+)\\.\\s*(\\d+)\\.\\s*([-']?\\d+)"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_dot_cb);
-}
-
-#ifdef TIGHT_PARSER
-static int
-parse_dot2_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- d = rb_reg_nth_match(1, m);
- mon = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
- if (!check_apost(d, mon, y))
- return 0;
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_dot2(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- BOS
- FPW_COM FPT_COM
- "([-']?\\d+)\\.\\s*(" DOTLESS_VALID_MONTHS ")(?:(?:[./])\\s*([-']?\\d+))?"
- COM_FPT COM_FPW
- EOS
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_dot2_cb);
-}
-
-static int
-parse_dot3_cb(VALUE m, VALUE hash)
-{
- VALUE y, mon, d;
-
- mon = rb_reg_nth_match(1, m);
- d = rb_reg_nth_match(2, m);
- y = rb_reg_nth_match(3, m);
-
- if (!check_apost(mon, d, y))
- return 0;
-
- mon = INT2FIX(mon_num(mon));
-
- s3e(hash, y, mon, d, 0);
- return 1;
-}
-
-static int
-parse_dot3(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- BOS
- FPW_COM FPT_COM
- "(" DOTLESS_VALID_MONTHS ")\\.\\s*([-']?\\d+)(?:(?:[./])\\s*([-']?\\d+))?"
- COM_FPT COM_FPW
- EOS
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_dot3_cb);
-}
-#endif
-
-static int
-parse_year_cb(VALUE m, VALUE hash)
-{
- VALUE y;
-
- y = rb_reg_nth_match(1, m);
- set_hash("year", str2num(y));
- return 1;
-}
-
-static int
-parse_year(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "'(\\d+)\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "'(\\d+)"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_year_cb);
-}
-
-static int
-parse_mon_cb(VALUE m, VALUE hash)
-{
- VALUE mon;
-
- mon = rb_reg_nth_match(1, m);
- set_hash("mon", INT2FIX(mon_num(mon)));
- return 1;
-}
-
-static int
-parse_mon(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "\\b(" ABBR_MONTHS ")\\S*"
-#else
- BOS
- FPW_COM FPT_COM
- "(" VALID_MONTHS ")"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_mon_cb);
-}
-
-static int
-parse_mday_cb(VALUE m, VALUE hash)
-{
- VALUE d;
-
- d = rb_reg_nth_match(1, m);
- set_hash("mday", str2num(d));
- return 1;
-}
-
-static int
-parse_mday(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "(\\d+)(st|nd|rd|th)\\b"
-#else
- BOS
- FPW_COM FPT_COM
- "(\\d+)(st|nd|rd|th)"
- COM_FPT COM_FPW
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_mday_cb);
-}
-
-static int
-n2i(const char *s, long f, long w)
-{
- long e, i;
- int v;
-
- e = f + w;
- v = 0;
- for (i = f; i < e; i++) {
- v *= 10;
- v += s[i] - '0';
- }
- return v;
-}
-
-static int
-parse_ddd_cb(VALUE m, VALUE hash)
-{
- VALUE s1, s2, s3, s4, s5;
- const char *cs2, *cs3, *cs5;
- long l2, l3, l4, l5;
-
- s1 = rb_reg_nth_match(1, m);
- s2 = rb_reg_nth_match(2, m);
- s3 = rb_reg_nth_match(3, m);
- s4 = rb_reg_nth_match(4, m);
- s5 = rb_reg_nth_match(5, m);
-
- cs2 = RSTRING_PTR(s2);
- l2 = RSTRING_LEN(s2);
-
- switch (l2) {
- case 2:
- if (NIL_P(s3) && !NIL_P(s4))
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- else
- set_hash("mday", INT2FIX(n2i(cs2, 0, 2)));
- break;
- case 4:
- if (NIL_P(s3) && !NIL_P(s4)) {
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- set_hash("min", INT2FIX(n2i(cs2, l2-4, 2)));
- }
- else {
- set_hash("mon", INT2FIX(n2i(cs2, 0, 2)));
- set_hash("mday", INT2FIX(n2i(cs2, 2, 2)));
- }
- break;
- case 6:
- if (NIL_P(s3) && !NIL_P(s4)) {
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- set_hash("min", INT2FIX(n2i(cs2, l2-4, 2)));
- set_hash("hour", INT2FIX(n2i(cs2, l2-6, 2)));
- }
- else {
- int y = n2i(cs2, 0, 2);
- if (!NIL_P(s1) && *RSTRING_PTR(s1) == '-')
- y = -y;
- set_hash("year", INT2FIX(y));
- set_hash("mon", INT2FIX(n2i(cs2, 2, 2)));
- set_hash("mday", INT2FIX(n2i(cs2, 4, 2)));
- }
- break;
- case 8:
- case 10:
- case 12:
- case 14:
- if (NIL_P(s3) && !NIL_P(s4)) {
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- set_hash("min", INT2FIX(n2i(cs2, l2-4, 2)));
- set_hash("hour", INT2FIX(n2i(cs2, l2-6, 2)));
- set_hash("mday", INT2FIX(n2i(cs2, l2-8, 2)));
- if (l2 >= 10)
- set_hash("mon", INT2FIX(n2i(cs2, l2-10, 2)));
- if (l2 == 12) {
- int y = n2i(cs2, l2-12, 2);
- if (!NIL_P(s1) && *RSTRING_PTR(s1) == '-')
- y = -y;
- set_hash("year", INT2FIX(y));
- }
- if (l2 == 14) {
- int y = n2i(cs2, l2-14, 4);
- if (!NIL_P(s1) && *RSTRING_PTR(s1) == '-')
- y = -y;
- set_hash("year", INT2FIX(y));
- set_hash("_comp", Qfalse);
- }
- }
- else {
- int y = n2i(cs2, 0, 4);
- if (!NIL_P(s1) && *RSTRING_PTR(s1) == '-')
- y = -y;
- set_hash("year", INT2FIX(y));
- set_hash("mon", INT2FIX(n2i(cs2, 4, 2)));
- set_hash("mday", INT2FIX(n2i(cs2, 6, 2)));
- if (l2 >= 10)
- set_hash("hour", INT2FIX(n2i(cs2, 8, 2)));
- if (l2 >= 12)
- set_hash("min", INT2FIX(n2i(cs2, 10, 2)));
- if (l2 >= 14)
- set_hash("sec", INT2FIX(n2i(cs2, 12, 2)));
- set_hash("_comp", Qfalse);
- }
- break;
- case 3:
- if (NIL_P(s3) && !NIL_P(s4)) {
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- set_hash("min", INT2FIX(n2i(cs2, l2-3, 1)));
- }
- else
- set_hash("yday", INT2FIX(n2i(cs2, 0, 3)));
- break;
- case 5:
- if (NIL_P(s3) && !NIL_P(s4)) {
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- set_hash("min", INT2FIX(n2i(cs2, l2-4, 2)));
- set_hash("hour", INT2FIX(n2i(cs2, l2-5, 1)));
- }
- else {
- int y = n2i(cs2, 0, 2);
- if (!NIL_P(s1) && *RSTRING_PTR(s1) == '-')
- y = -y;
- set_hash("year", INT2FIX(y));
- set_hash("yday", INT2FIX(n2i(cs2, 2, 3)));
- }
- break;
- case 7:
- if (NIL_P(s3) && !NIL_P(s4)) {
- set_hash("sec", INT2FIX(n2i(cs2, l2-2, 2)));
- set_hash("min", INT2FIX(n2i(cs2, l2-4, 2)));
- set_hash("hour", INT2FIX(n2i(cs2, l2-6, 2)));
- set_hash("mday", INT2FIX(n2i(cs2, l2-7, 1)));
- }
- else {
- int y = n2i(cs2, 0, 4);
- if (!NIL_P(s1) && *RSTRING_PTR(s1) == '-')
- y = -y;
- set_hash("year", INT2FIX(y));
- set_hash("yday", INT2FIX(n2i(cs2, 4, 3)));
- }
- break;
- }
- RB_GC_GUARD(s2);
- if (!NIL_P(s3)) {
- cs3 = RSTRING_PTR(s3);
- l3 = RSTRING_LEN(s3);
-
- if (!NIL_P(s4)) {
- switch (l3) {
- case 2:
- case 4:
- case 6:
- set_hash("sec", INT2FIX(n2i(cs3, l3-2, 2)));
- if (l3 >= 4)
- set_hash("min", INT2FIX(n2i(cs3, l3-4, 2)));
- if (l3 >= 6)
- set_hash("hour", INT2FIX(n2i(cs3, l3-6, 2)));
- break;
- }
- }
- else {
- switch (l3) {
- case 2:
- case 4:
- case 6:
- set_hash("hour", INT2FIX(n2i(cs3, 0, 2)));
- if (l3 >= 4)
- set_hash("min", INT2FIX(n2i(cs3, 2, 2)));
- if (l3 >= 6)
- set_hash("sec", INT2FIX(n2i(cs3, 4, 2)));
- break;
- }
- }
- RB_GC_GUARD(s3);
- }
- if (!NIL_P(s4)) {
- l4 = RSTRING_LEN(s4);
-
- set_hash("sec_fraction",
- rb_rational_new2(str2num(s4),
- f_expt(INT2FIX(10), LONG2NUM(l4))));
- }
- if (!NIL_P(s5)) {
- cs5 = RSTRING_PTR(s5);
- l5 = RSTRING_LEN(s5);
-
- set_hash("zone", s5);
-
- if (*cs5 == '[') {
- char *buf = ALLOCA_N(char, l5 + 1);
- char *s1, *s2, *s3;
- VALUE zone;
-
- memcpy(buf, cs5, l5);
- buf[l5 - 1] = '\0';
-
- s1 = buf + 1;
- s2 = strchr(buf, ':');
- if (s2) {
- *s2 = '\0';
- s2++;
- }
- if (s2)
- s3 = s2;
- else
- s3 = s1;
- zone = rb_str_new2(s3);
- set_hash("zone", zone);
- if (isdigit((unsigned char)*s1))
- *--s1 = '+';
- set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
- }
- RB_GC_GUARD(s5);
- }
-
- return 1;
-}
-
-static int
-parse_ddd(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
-#ifdef TIGHT_PARSER
- BOS
-#endif
- "([-+]?)(\\d{2,14})"
- "(?:"
- "\\s*"
- "t?"
- "\\s*"
- "(\\d{2,6})?(?:[,.](\\d*))?"
- ")?"
- "(?:"
- "\\s*"
- "("
- "z\\b"
- "|"
- "[-+]\\d{1,4}\\b"
- "|"
- "\\[[-+]?\\d[^\\]]*\\]"
- ")"
- ")?"
-#ifdef TIGHT_PARSER
- EOS
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_ddd_cb);
-}
-
-#ifndef TIGHT_PARSER
-static int
-parse_bc_cb(VALUE m, VALUE hash)
-{
- set_hash("_bc", Qtrue);
- return 1;
-}
-
-static int
-parse_bc(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\b(bc\\b|bce\\b|b\\.c\\.|b\\.c\\.e\\.)";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_bc_cb);
-}
-
-static int
-parse_frag_cb(VALUE m, VALUE hash)
-{
- VALUE s, n;
-
- s = rb_reg_nth_match(1, m);
-
- if (!NIL_P(ref_hash("hour")) && NIL_P(ref_hash("mday"))) {
- n = str2num(s);
- if (f_ge_p(n, INT2FIX(1)) &&
- f_le_p(n, INT2FIX(31)))
- set_hash("mday", n);
- }
- if (!NIL_P(ref_hash("mday")) && NIL_P(ref_hash("hour"))) {
- n = str2num(s);
- if (f_ge_p(n, INT2FIX(0)) &&
- f_le_p(n, INT2FIX(24)))
- set_hash("hour", n);
- }
-
- return 1;
-}
-
-static int
-parse_frag(VALUE str, VALUE hash)
-{
- static const char pat_source[] = "\\A\\s*(\\d{1,2})\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- SUBS(str, pat, parse_frag_cb);
-}
-#endif
-
-#ifdef TIGHT_PARSER
-static int
-parse_dummy_cb(VALUE m, VALUE hash)
-{
- return 1;
-}
-
-static int
-parse_wday_only(VALUE str, VALUE hash)
-{
- static const char pat_source[] = "\\A\\s*" FPW "\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_dummy_cb);
-}
-
-static int
-parse_time_only(VALUE str, VALUE hash)
-{
- static const char pat_source[] = "\\A\\s*" FPT "\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_dummy_cb);
-}
-
-static int
-parse_wday_and_time(VALUE str, VALUE hash)
-{
- static const char pat_source[] = "\\A\\s*(" FPW "\\s+" FPT "|" FPT "\\s+" FPW ")\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- SUBS(str, pat, parse_dummy_cb);
-}
-
-static unsigned
-have_invalid_char_p(VALUE s)
-{
- long i;
-
- for (i = 0; i < RSTRING_LEN(s); i++)
- if (iscntrl((unsigned char)RSTRING_PTR(s)[i]) &&
- !isspace((unsigned char)RSTRING_PTR(s)[i]))
- return 1;
- return 0;
-}
-#endif
-
-#define HAVE_ALPHA (1<<0)
-#define HAVE_DIGIT (1<<1)
-#define HAVE_DASH (1<<2)
-#define HAVE_DOT (1<<3)
-#define HAVE_SLASH (1<<4)
-
-static unsigned
-check_class(VALUE s)
-{
- unsigned flags;
- long i;
-
- flags = 0;
- for (i = 0; i < RSTRING_LEN(s); i++) {
- if (isalpha((unsigned char)RSTRING_PTR(s)[i]))
- flags |= HAVE_ALPHA;
- if (isdigit((unsigned char)RSTRING_PTR(s)[i]))
- flags |= HAVE_DIGIT;
- if (RSTRING_PTR(s)[i] == '-')
- flags |= HAVE_DASH;
- if (RSTRING_PTR(s)[i] == '.')
- flags |= HAVE_DOT;
- if (RSTRING_PTR(s)[i] == '/')
- flags |= HAVE_SLASH;
- }
- return flags;
-}
-
-#define HAVE_ELEM_P(x) ((check_class(str) & (x)) == (x))
-
-#ifdef TIGHT_PARSER
-#define PARSER_ERROR return rb_hash_new()
-#endif
-
-VALUE
-date__parse(VALUE str, VALUE comp)
-{
- VALUE backref, hash;
-
-#ifdef TIGHT_PARSER
- if (have_invalid_char_p(str))
- PARSER_ERROR;
-#endif
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- {
- static const char pat_source[] =
-#ifndef TIGHT_PARSER
- "[^-+',./:@[:alnum:]\\[\\]]+"
-#else
- "[^[:graph:]]+"
-#endif
- ;
- static VALUE pat = Qnil;
-
- REGCOMP_0(pat);
- str = rb_str_dup(str);
- f_gsub_bang(str, pat, asp_string());
- }
-
- hash = rb_hash_new();
- set_hash("_comp", comp);
-
- if (HAVE_ELEM_P(HAVE_ALPHA))
- parse_day(str, hash);
- if (HAVE_ELEM_P(HAVE_DIGIT))
- parse_time(str, hash);
-
-#ifdef TIGHT_PARSER
- if (HAVE_ELEM_P(HAVE_ALPHA))
- parse_era(str, hash);
-#endif
-
- if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT)) {
- if (parse_eu(str, hash))
- goto ok;
- if (parse_us(str, hash))
- goto ok;
- }
- if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_DASH))
- if (parse_iso(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_DOT))
- if (parse_jis(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT|HAVE_DASH))
- if (parse_vms(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_SLASH))
- if (parse_sla(str, hash))
- goto ok;
-#ifdef TIGHT_PARSER
- if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT|HAVE_SLASH)) {
- if (parse_sla2(str, hash))
- goto ok;
- if (parse_sla3(str, hash))
- goto ok;
- }
-#endif
- if (HAVE_ELEM_P(HAVE_DIGIT|HAVE_DOT))
- if (parse_dot(str, hash))
- goto ok;
-#ifdef TIGHT_PARSER
- if (HAVE_ELEM_P(HAVE_ALPHA|HAVE_DIGIT|HAVE_DOT)) {
- if (parse_dot2(str, hash))
- goto ok;
- if (parse_dot3(str, hash))
- goto ok;
- }
-#endif
- if (HAVE_ELEM_P(HAVE_DIGIT))
- if (parse_iso2(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_DIGIT))
- if (parse_year(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_ALPHA))
- if (parse_mon(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_DIGIT))
- if (parse_mday(str, hash))
- goto ok;
- if (HAVE_ELEM_P(HAVE_DIGIT))
- if (parse_ddd(str, hash))
- goto ok;
-
-#ifdef TIGHT_PARSER
- if (parse_wday_only(str, hash))
- goto ok;
- if (parse_time_only(str, hash))
- goto ok;
- if (parse_wday_and_time(str, hash))
- goto ok;
-
- PARSER_ERROR; /* not found */
-#endif
-
- ok:
-#ifndef TIGHT_PARSER
- if (HAVE_ELEM_P(HAVE_ALPHA))
- parse_bc(str, hash);
- if (HAVE_ELEM_P(HAVE_DIGIT))
- parse_frag(str, hash);
-#endif
-
- {
- if (RTEST(ref_hash("_bc"))) {
- VALUE y;
-
- y = ref_hash("cwyear");
- if (!NIL_P(y)) {
- y = f_add(f_negate(y), INT2FIX(1));
- set_hash("cwyear", y);
- }
- y = ref_hash("year");
- if (!NIL_P(y)) {
- y = f_add(f_negate(y), INT2FIX(1));
- set_hash("year", y);
- }
- }
-
- if (RTEST(ref_hash("_comp"))) {
- VALUE y;
-
- y = ref_hash("cwyear");
- if (!NIL_P(y))
- if (f_ge_p(y, INT2FIX(0)) && f_le_p(y, INT2FIX(99))) {
- if (f_ge_p(y, INT2FIX(69)))
- set_hash("cwyear", f_add(y, INT2FIX(1900)));
- else
- set_hash("cwyear", f_add(y, INT2FIX(2000)));
- }
- y = ref_hash("year");
- if (!NIL_P(y))
- if (f_ge_p(y, INT2FIX(0)) && f_le_p(y, INT2FIX(99))) {
- if (f_ge_p(y, INT2FIX(69)))
- set_hash("year", f_add(y, INT2FIX(1900)));
- else
- set_hash("year", f_add(y, INT2FIX(2000)));
- }
- }
-
- }
-
- del_hash("_bc");
- del_hash("_comp");
-
- {
- VALUE zone = ref_hash("zone");
- if (!NIL_P(zone) && NIL_P(ref_hash("offset")))
- set_hash("offset", date_zone_to_diff(zone));
- }
-
- rb_backref_set(backref);
-
- return hash;
-}
-
-static VALUE
-comp_year69(VALUE y)
-{
- if (f_ge_p(y, INT2FIX(69)))
- return f_add(y, INT2FIX(1900));
- return f_add(y, INT2FIX(2000));
-}
-
-static VALUE
-comp_year50(VALUE y)
-{
- if (f_ge_p(y, INT2FIX(50)))
- return f_add(y, INT2FIX(1900));
- return f_add(y, INT2FIX(2000));
-}
-
-static VALUE
-sec_fraction(VALUE f)
-{
- return rb_rational_new2(str2num(f),
- f_expt(INT2FIX(10),
- LONG2NUM(RSTRING_LEN(f))));
-}
-
-#define SNUM 14
-
-static int
-iso8601_ext_datetime_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1], y;
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- if (!NIL_P(s[3])) {
- set_hash("mday", str2num(s[3]));
- if (strcmp(RSTRING_PTR(s[1]), "-") != 0) {
- y = str2num(s[1]);
- if (RSTRING_LEN(s[1]) < 4)
- y = comp_year69(y);
- set_hash("year", y);
- }
- if (NIL_P(s[2])) {
- if (strcmp(RSTRING_PTR(s[1]), "-") != 0)
- return 0;
- }
- else
- set_hash("mon", str2num(s[2]));
- }
- else if (!NIL_P(s[5])) {
- set_hash("yday", str2num(s[5]));
- if (!NIL_P(s[4])) {
- y = str2num(s[4]);
- if (RSTRING_LEN(s[4]) < 4)
- y = comp_year69(y);
- set_hash("year", y);
- }
- }
- else if (!NIL_P(s[8])) {
- set_hash("cweek", str2num(s[7]));
- set_hash("cwday", str2num(s[8]));
- if (!NIL_P(s[6])) {
- y = str2num(s[6]);
- if (RSTRING_LEN(s[6]) < 4)
- y = comp_year69(y);
- set_hash("cwyear", y);
- }
- }
- else if (!NIL_P(s[9])) {
- set_hash("cwday", str2num(s[9]));
- }
- if (!NIL_P(s[10])) {
- set_hash("hour", str2num(s[10]));
- set_hash("min", str2num(s[11]));
- if (!NIL_P(s[12]))
- set_hash("sec", str2num(s[12]));
- }
- if (!NIL_P(s[13])) {
- set_hash("sec_fraction", sec_fraction(s[13]));
- }
- if (!NIL_P(s[14])) {
- set_hash("zone", s[14]);
- set_hash("offset", date_zone_to_diff(s[14]));
- }
-
- return 1;
-}
-
-static int
-iso8601_ext_datetime(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(?:([-+]?\\d{2,}|-)-(\\d{2})?-(\\d{2})|"
- "([-+]?\\d{2,})?-(\\d{3})|"
- "(\\d{4}|\\d{2})?-w(\\d{2})-(\\d)|"
- "-w-(\\d))"
- "(?:t"
- "(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d+))?)?"
- "(z|[-+]\\d{2}(?::?\\d{2})?)?)?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, iso8601_ext_datetime_cb);
-}
-
-#undef SNUM
-#define SNUM 17
-
-static int
-iso8601_bas_datetime_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1], y;
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- if (!NIL_P(s[3])) {
- set_hash("mday", str2num(s[3]));
- if (strcmp(RSTRING_PTR(s[1]), "--") != 0) {
- y = str2num(s[1]);
- if (RSTRING_LEN(s[1]) < 4)
- y = comp_year69(y);
- set_hash("year", y);
- }
- if (*RSTRING_PTR(s[2]) == '-') {
- if (strcmp(RSTRING_PTR(s[1]), "--") != 0)
- return 0;
- }
- else
- set_hash("mon", str2num(s[2]));
- }
- else if (!NIL_P(s[5])) {
- set_hash("yday", str2num(s[5]));
- y = str2num(s[4]);
- if (RSTRING_LEN(s[4]) < 4)
- y = comp_year69(y);
- set_hash("year", y);
- }
- else if (!NIL_P(s[6])) {
- set_hash("yday", str2num(s[6]));
- }
- else if (!NIL_P(s[9])) {
- set_hash("cweek", str2num(s[8]));
- set_hash("cwday", str2num(s[9]));
- y = str2num(s[7]);
- if (RSTRING_LEN(s[7]) < 4)
- y = comp_year69(y);
- set_hash("cwyear", y);
- }
- else if (!NIL_P(s[11])) {
- set_hash("cweek", str2num(s[10]));
- set_hash("cwday", str2num(s[11]));
- }
- else if (!NIL_P(s[12])) {
- set_hash("cwday", str2num(s[12]));
- }
- if (!NIL_P(s[13])) {
- set_hash("hour", str2num(s[13]));
- set_hash("min", str2num(s[14]));
- if (!NIL_P(s[15]))
- set_hash("sec", str2num(s[15]));
- }
- if (!NIL_P(s[16])) {
- set_hash("sec_fraction", sec_fraction(s[16]));
- }
- if (!NIL_P(s[17])) {
- set_hash("zone", s[17]);
- set_hash("offset", date_zone_to_diff(s[17]));
- }
-
- return 1;
-}
-
-static int
-iso8601_bas_datetime(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(?:([-+]?(?:\\d{4}|\\d{2})|--)(\\d{2}|-)(\\d{2})|"
- "([-+]?(?:\\d{4}|\\d{2}))(\\d{3})|"
- "-(\\d{3})|"
- "(\\d{4}|\\d{2})w(\\d{2})(\\d)|"
- "-w(\\d{2})(\\d)|"
- "-w-(\\d))"
- "(?:t?"
- "(\\d{2})(\\d{2})(?:(\\d{2})(?:[,.](\\d+))?)?"
- "(z|[-+]\\d{2}(?:\\d{2})?)?)?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, iso8601_bas_datetime_cb);
-}
-
-#undef SNUM
-#define SNUM 5
-
-static int
-iso8601_ext_time_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("hour", str2num(s[1]));
- set_hash("min", str2num(s[2]));
- if (!NIL_P(s[3]))
- set_hash("sec", str2num(s[3]));
- if (!NIL_P(s[4]))
- set_hash("sec_fraction", sec_fraction(s[4]));
- if (!NIL_P(s[5])) {
- set_hash("zone", s[5]);
- set_hash("offset", date_zone_to_diff(s[5]));
- }
-
- return 1;
-}
-
-#define iso8601_bas_time_cb iso8601_ext_time_cb
-
-static int
-iso8601_ext_time(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d+))?"
- "(z|[-+]\\d{2}(:?\\d{2})?)?)?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, iso8601_ext_time_cb);
-}
-
-static int
-iso8601_bas_time(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(\\d{2})(\\d{2})(?:(\\d{2})(?:[,.](\\d+))?"
- "(z|[-+]\\d{2}(\\d{2})?)?)?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, iso8601_bas_time_cb);
-}
-
-VALUE
-date__iso8601(VALUE str)
-{
- VALUE backref, hash;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- hash = rb_hash_new();
-
- if (iso8601_ext_datetime(str, hash))
- goto ok;
- if (iso8601_bas_datetime(str, hash))
- goto ok;
- if (iso8601_ext_time(str, hash))
- goto ok;
- if (iso8601_bas_time(str, hash))
- goto ok;
-
- ok:
- rb_backref_set(backref);
-
- return hash;
-}
-
-#undef SNUM
-#define SNUM 8
-
-static int
-rfc3339_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("year", str2num(s[1]));
- set_hash("mon", str2num(s[2]));
- set_hash("mday", str2num(s[3]));
- set_hash("hour", str2num(s[4]));
- set_hash("min", str2num(s[5]));
- set_hash("sec", str2num(s[6]));
- set_hash("zone", s[8]);
- set_hash("offset", date_zone_to_diff(s[8]));
- if (!NIL_P(s[7]))
- set_hash("sec_fraction", sec_fraction(s[7]));
-
- return 1;
-}
-
-static int
-rfc3339(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(-?\\d{4})-(\\d{2})-(\\d{2})"
- "(?:t|\\s)"
- "(\\d{2}):(\\d{2}):(\\d{2})(?:\\.(\\d+))?"
- "(z|[-+]\\d{2}:\\d{2})\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, rfc3339_cb);
-}
-
-VALUE
-date__rfc3339(VALUE str)
-{
- VALUE backref, hash;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- hash = rb_hash_new();
- rfc3339(str, hash);
- rb_backref_set(backref);
- return hash;
-}
-
-#undef SNUM
-#define SNUM 8
-
-static int
-xmlschema_datetime_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("year", str2num(s[1]));
- if (!NIL_P(s[2]))
- set_hash("mon", str2num(s[2]));
- if (!NIL_P(s[3]))
- set_hash("mday", str2num(s[3]));
- if (!NIL_P(s[4]))
- set_hash("hour", str2num(s[4]));
- if (!NIL_P(s[5]))
- set_hash("min", str2num(s[5]));
- if (!NIL_P(s[6]))
- set_hash("sec", str2num(s[6]));
- if (!NIL_P(s[7]))
- set_hash("sec_fraction", sec_fraction(s[7]));
- if (!NIL_P(s[8])) {
- set_hash("zone", s[8]);
- set_hash("offset", date_zone_to_diff(s[8]));
- }
-
- return 1;
-}
-
-static int
-xmlschema_datetime(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(-?\\d{4,})(?:-(\\d{2})(?:-(\\d{2}))?)?"
- "(?:t"
- "(\\d{2}):(\\d{2}):(\\d{2})(?:\\.(\\d+))?)?"
- "(z|[-+]\\d{2}:\\d{2})?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, xmlschema_datetime_cb);
-}
-
-#undef SNUM
-#define SNUM 5
-
-static int
-xmlschema_time_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("hour", str2num(s[1]));
- set_hash("min", str2num(s[2]));
- if (!NIL_P(s[3]))
- set_hash("sec", str2num(s[3]));
- if (!NIL_P(s[4]))
- set_hash("sec_fraction", sec_fraction(s[4]));
- if (!NIL_P(s[5])) {
- set_hash("zone", s[5]);
- set_hash("offset", date_zone_to_diff(s[5]));
- }
-
- return 1;
-}
-
-static int
-xmlschema_time(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(\\d{2}):(\\d{2}):(\\d{2})(?:\\.(\\d+))?"
- "(z|[-+]\\d{2}:\\d{2})?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, xmlschema_time_cb);
-}
-
-#undef SNUM
-#define SNUM 4
-
-static int
-xmlschema_trunc_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- if (!NIL_P(s[1]))
- set_hash("mon", str2num(s[1]));
- if (!NIL_P(s[2]))
- set_hash("mday", str2num(s[2]));
- if (!NIL_P(s[3]))
- set_hash("mday", str2num(s[3]));
- if (!NIL_P(s[4])) {
- set_hash("zone", s[4]);
- set_hash("offset", date_zone_to_diff(s[4]));
- }
-
- return 1;
-}
-
-static int
-xmlschema_trunc(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(?:--(\\d{2})(?:-(\\d{2}))?|---(\\d{2}))"
- "(z|[-+]\\d{2}:\\d{2})?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, xmlschema_trunc_cb);
-}
-
-VALUE
-date__xmlschema(VALUE str)
-{
- VALUE backref, hash;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- hash = rb_hash_new();
-
- if (xmlschema_datetime(str, hash))
- goto ok;
- if (xmlschema_time(str, hash))
- goto ok;
- if (xmlschema_trunc(str, hash))
- goto ok;
-
- ok:
- rb_backref_set(backref);
-
- return hash;
-}
-
-#undef SNUM
-#define SNUM 8
-
-static int
-rfc2822_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1], y;
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- if (!NIL_P(s[1])) {
- set_hash("wday", INT2FIX(day_num(s[1])));
- }
- set_hash("mday", str2num(s[2]));
- set_hash("mon", INT2FIX(mon_num(s[3])));
- y = str2num(s[4]);
- if (RSTRING_LEN(s[4]) < 4)
- y = comp_year50(y);
- set_hash("year", y);
- set_hash("hour", str2num(s[5]));
- set_hash("min", str2num(s[6]));
- if (!NIL_P(s[7]))
- set_hash("sec", str2num(s[7]));
- set_hash("zone", s[8]);
- set_hash("offset", date_zone_to_diff(s[8]));
-
- return 1;
-}
-
-static int
-rfc2822(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(?:(" ABBR_DAYS ")\\s*,\\s+)?"
- "(\\d{1,2})\\s+"
- "(" ABBR_MONTHS ")\\s+"
- "(-?\\d{2,})\\s+"
- "(\\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";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, rfc2822_cb);
-}
-
-VALUE
-date__rfc2822(VALUE str)
-{
- VALUE backref, hash;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- hash = rb_hash_new();
- rfc2822(str, hash);
- rb_backref_set(backref);
- return hash;
-}
-
-#undef SNUM
-#define SNUM 8
-
-static int
-httpdate_type1_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("wday", INT2FIX(day_num(s[1])));
- set_hash("mday", str2num(s[2]));
- set_hash("mon", INT2FIX(mon_num(s[3])));
- set_hash("year", str2num(s[4]));
- set_hash("hour", str2num(s[5]));
- set_hash("min", str2num(s[6]));
- set_hash("sec", str2num(s[7]));
- set_hash("zone", s[8]);
- set_hash("offset", INT2FIX(0));
-
- return 1;
-}
-
-static int
-httpdate_type1(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(" ABBR_DAYS ")\\s*,\\s+"
- "(\\d{2})\\s+"
- "(" ABBR_MONTHS ")\\s+"
- "(-?\\d{4})\\s+"
- "(\\d{2}):(\\d{2}):(\\d{2})\\s+"
- "(gmt)\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, httpdate_type1_cb);
-}
-
-#undef SNUM
-#define SNUM 8
-
-static int
-httpdate_type2_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1], y;
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("wday", INT2FIX(day_num(s[1])));
- set_hash("mday", str2num(s[2]));
- set_hash("mon", INT2FIX(mon_num(s[3])));
- y = str2num(s[4]);
- if (f_ge_p(y, INT2FIX(0)) && f_le_p(y, INT2FIX(99)))
- y = comp_year69(y);
- set_hash("year", y);
- set_hash("hour", str2num(s[5]));
- set_hash("min", str2num(s[6]));
- set_hash("sec", str2num(s[7]));
- set_hash("zone", s[8]);
- set_hash("offset", INT2FIX(0));
-
- return 1;
-}
-
-static int
-httpdate_type2(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(" DAYS ")\\s*,\\s+"
- "(\\d{2})\\s*-\\s*"
- "(" ABBR_MONTHS ")\\s*-\\s*"
- "(\\d{2})\\s+"
- "(\\d{2}):(\\d{2}):(\\d{2})\\s+"
- "(gmt)\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, httpdate_type2_cb);
-}
-
-#undef SNUM
-#define SNUM 7
-
-static int
-httpdate_type3_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- set_hash("wday", INT2FIX(day_num(s[1])));
- set_hash("mon", INT2FIX(mon_num(s[2])));
- set_hash("mday", str2num(s[3]));
- set_hash("hour", str2num(s[4]));
- set_hash("min", str2num(s[5]));
- set_hash("sec", str2num(s[6]));
- set_hash("year", str2num(s[7]));
-
- return 1;
-}
-
-static int
-httpdate_type3(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*(" ABBR_DAYS ")\\s+"
- "(" ABBR_MONTHS ")\\s+"
- "(\\d{1,2})\\s+"
- "(\\d{2}):(\\d{2}):(\\d{2})\\s+"
- "(\\d{4})\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, httpdate_type3_cb);
-}
-
-VALUE
-date__httpdate(VALUE str)
-{
- VALUE backref, hash;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- hash = rb_hash_new();
-
- if (httpdate_type1(str, hash))
- goto ok;
- if (httpdate_type2(str, hash))
- goto ok;
- if (httpdate_type3(str, hash))
- goto ok;
-
- ok:
- rb_backref_set(backref);
-
- return hash;
-}
-
-#undef SNUM
-#define SNUM 9
-
-static int
-jisx0301_cb(VALUE m, VALUE hash)
-{
- VALUE s[SNUM + 1];
- int ep;
-
- {
- int i;
- s[0] = Qnil;
- for (i = 1; i <= SNUM; i++)
- s[i] = rb_reg_nth_match(i, m);
- }
-
- ep = gengo(NIL_P(s[1]) ? 'h' : *RSTRING_PTR(s[1]));
- set_hash("year", f_add(str2num(s[2]), INT2FIX(ep)));
- set_hash("mon", str2num(s[3]));
- set_hash("mday", str2num(s[4]));
- if (!NIL_P(s[5])) {
- set_hash("hour", str2num(s[5]));
- if (!NIL_P(s[6]))
- set_hash("min", str2num(s[6]));
- if (!NIL_P(s[7]))
- set_hash("sec", str2num(s[7]));
- }
- if (!NIL_P(s[8]))
- set_hash("sec_fraction", sec_fraction(s[8]));
- if (!NIL_P(s[9])) {
- set_hash("zone", s[9]);
- set_hash("offset", date_zone_to_diff(s[9]));
- }
-
- return 1;
-}
-
-static int
-jisx0301(VALUE str, VALUE hash)
-{
- static const char pat_source[] =
- "\\A\\s*([mtsh])?(\\d{2})\\.(\\d{2})\\.(\\d{2})"
- "(?:t"
- "(?:(\\d{2}):(\\d{2})(?::(\\d{2})(?:[,.](\\d*))?)?"
- "(z|[-+]\\d{2}(?::?\\d{2})?)?)?)?\\s*\\z";
- static VALUE pat = Qnil;
-
- REGCOMP_I(pat);
- MATCH(str, pat, jisx0301_cb);
-}
-
-VALUE
-date__jisx0301(VALUE str)
-{
- VALUE backref, hash;
-
- backref = rb_backref_get();
- rb_match_busy(backref);
-
- hash = rb_hash_new();
- if (jisx0301(str, hash))
- goto ok;
- hash = date__iso8601(str);
-
- ok:
- rb_backref_set(backref);
- return hash;
-}
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c
deleted file mode 100644
index 20931a3124..0000000000
--- a/ext/date/date_strftime.c
+++ /dev/null
@@ -1,633 +0,0 @@
-/*
- date_strftime.c: based on a public-domain implementation of ANSI C
- library routine strftime, which is originally written by Arnold
- Robbins.
- */
-
-#include "ruby/ruby.h"
-#include "date_tmx.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
-#undef strchr /* avoid AIX weirdness */
-
-#define range(low, item, hi) (item)
-
-#define add(x,y) (rb_funcall((x), '+', 1, (y)))
-#define sub(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)))
-#define div(x,y) (rb_funcall((x), rb_intern("div"), 1, (y)))
-#define mod(x,y) (rb_funcall((x), '%', 1, (y)))
-
-static void
-upcase(char *s, size_t i)
-{
- do {
- if (ISLOWER(*s))
- *s = TOUPPER(*s);
- } while (s++, --i);
-}
-
-static void
-downcase(char *s, size_t i)
-{
- do {
- if (ISUPPER(*s))
- *s = TOLOWER(*s);
- } while (s++, --i);
-}
-
-/* strftime --- produce formatted time */
-
-static size_t
-date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
- const struct tmx *tmx)
-{
- char *endp = s + maxsize;
- char *start = s;
- const char *sp, *tp;
- auto char tbuf[100];
- ptrdiff_t i;
- int v, w;
- size_t colons;
- int precision, flags;
- char padding;
- /* LOCALE_[OE] and COLONS are actually modifiers, not flags */
- enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E, COLONS};
-#define BIT_OF(n) (1U<<(n))
-
- /* various tables for locale C */
- static const char days_l[][10] = {
- "Sunday", "Monday", "Tuesday", "Wednesday",
- "Thursday", "Friday", "Saturday",
- };
- static const char months_l[][10] = {
- "January", "February", "March", "April",
- "May", "June", "July", "August", "September",
- "October", "November", "December",
- };
- static const char ampm[][3] = { "AM", "PM", };
-
- if (s == NULL || format == NULL || tmx == NULL || maxsize == 0)
- return 0;
-
- /* quick check if we even need to bother */
- if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) {
- err:
- errno = ERANGE;
- return 0;
- }
-
- for (; *format && s < endp - 1; format++) {
-#define FLAG_FOUND() do { \
- if (precision > 0 || flags & (BIT_OF(LOCALE_E) | BIT_OF(LOCALE_O) | BIT_OF(COLONS))) \
- goto unknown; \
- } while (0)
-#define NEEDS(n) do if (s >= endp || (n) >= endp - s - 1) goto err; while (0)
-#define FILL_PADDING(i) do { \
- if (!(flags & BIT_OF(LEFT)) && precision > (i)) { \
- NEEDS(precision); \
- memset(s, padding ? padding : ' ', precision - (i)); \
- s += precision - (i); \
- } \
- else { \
- NEEDS(i); \
- } \
- } while (0);
-#define FMT(def_pad, def_prec, fmt, val) \
- do { \
- int l; \
- if (precision <= 0) precision = (def_prec); \
- if (flags & BIT_OF(LEFT)) precision = 1; \
- l = snprintf(s, endp - s, \
- ((padding == '0' || (!padding && (def_pad) == '0')) ? \
- "%0*"fmt : "%*"fmt), \
- precision, (val)); \
- if (l < 0) goto err; \
- s += l; \
- } while (0)
-#define STRFTIME(fmt) \
- do { \
- i = date_strftime_with_tmx(s, endp - s, (fmt), tmx); \
- if (!i) return 0; \
- if (flags & BIT_OF(UPPER)) \
- upcase(s, i); \
- if (!(flags & BIT_OF(LEFT)) && precision > i) { \
- if (start + maxsize < s + precision) { \
- errno = ERANGE; \
- return 0; \
- } \
- memmove(s + precision - i, s, i); \
- memset(s, padding ? padding : ' ', precision - i); \
- s += precision; \
- } \
- else s += i; \
- } while (0)
-#define FMTV(def_pad, def_prec, fmt, val) \
- do { \
- VALUE tmp = (val); \
- if (FIXNUM_P(tmp)) { \
- FMT((def_pad), (def_prec), "l"fmt, FIX2LONG(tmp)); \
- } \
- else { \
- VALUE args[2], result; \
- size_t l; \
- if (precision <= 0) precision = (def_prec); \
- if (flags & BIT_OF(LEFT)) precision = 1; \
- args[0] = INT2FIX(precision); \
- args[1] = (val); \
- if (padding == '0' || (!padding && (def_pad) == '0')) \
- result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \
- else \
- result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \
- l = strlcpy(s, StringValueCStr(result), endp - s); \
- if ((size_t)(endp - s) <= l) \
- goto err; \
- s += l; \
- } \
- } while (0)
-
- if (*format != '%') {
- *s++ = *format;
- continue;
- }
- tp = tbuf;
- sp = format;
- precision = -1;
- flags = 0;
- padding = 0;
- colons = 0;
- again:
- switch (*++format) {
- case '\0':
- format--;
- goto unknown;
-
- case 'A': /* full weekday name */
- case 'a': /* abbreviated weekday name */
- if (flags & BIT_OF(CHCASE)) {
- flags &= ~(BIT_OF(LOWER) | BIT_OF(CHCASE));
- flags |= BIT_OF(UPPER);
- }
- {
- int wday = tmx_wday;
- if (wday < 0 || wday > 6)
- i = 1, tp = "?";
- else {
- if (*format == 'A')
- i = strlen(tp = days_l[wday]);
- else
- i = 3, tp = days_l[wday];
- }
- }
- break;
-
- case 'B': /* full month name */
- case 'b': /* abbreviated month name */
- case 'h': /* same as %b */
- if (flags & BIT_OF(CHCASE)) {
- flags &= ~(BIT_OF(LOWER) | BIT_OF(CHCASE));
- flags |= BIT_OF(UPPER);
- }
- {
- int mon = tmx_mon;
- if (mon < 1 || mon > 12)
- i = 1, tp = "?";
- else {
- if (*format == 'B')
- i = strlen(tp = months_l[mon - 1]);
- else
- i = 3, tp = months_l[mon - 1];
- }
- }
- break;
-
- case 'C': /* century (year/100) */
- FMTV('0', 2, "d", div(tmx_year, INT2FIX(100)));
- continue;
-
- case 'c': /* appropriate date and time representation */
- STRFTIME("%a %b %e %H:%M:%S %Y");
- continue;
-
- case 'D':
- STRFTIME("%m/%d/%y");
- continue;
-
- case 'd': /* day of the month, 01 - 31 */
- case 'e': /* day of month, blank padded */
- v = range(1, tmx_mday, 31);
- FMT((*format == 'd') ? '0' : ' ', 2, "d", v);
- continue;
-
- case 'F':
- STRFTIME("%Y-%m-%d");
- continue;
-
- case 'G': /* year of ISO week with century */
- case 'Y': /* year with century */
- {
- VALUE year = (*format == 'G') ? tmx_cwyear : tmx_year;
- if (FIXNUM_P(year)) {
- long y = FIX2LONG(year);
- FMT('0', 0 <= y ? 4 : 5, "ld", y);
- }
- else {
- FMTV('0', 4, "d", year);
- }
- }
- continue;
-
- case 'g': /* year of ISO week without a century */
- case 'y': /* year without a century */
- v = NUM2INT(mod((*format == 'g') ? tmx_cwyear : tmx_year, INT2FIX(100)));
- FMT('0', 2, "d", v);
- continue;
-
- case 'H': /* hour, 24-hour clock, 00 - 23 */
- case 'k': /* hour, 24-hour clock, blank pad */
- v = range(0, tmx_hour, 23);
- FMT((*format == 'H') ? '0' : ' ', 2, "d", v);
- continue;
-
- case 'I': /* hour, 12-hour clock, 01 - 12 */
- case 'l': /* hour, 12-hour clock, 1 - 12, blank pad */
- v = range(0, tmx_hour, 23);
- if (v == 0)
- v = 12;
- else if (v > 12)
- v -= 12;
- FMT((*format == 'I') ? '0' : ' ', 2, "d", v);
- continue;
-
- case 'j': /* day of the year, 001 - 366 */
- v = range(1, tmx_yday, 366);
- FMT('0', 3, "d", v);
- continue;
-
- case 'L': /* millisecond */
- case 'N': /* nanosecond */
- if (*format == 'L')
- w = 3;
- else
- w = 9;
- if (precision <= 0)
- precision = w;
- NEEDS(precision);
-
- {
- VALUE subsec = tmx_sec_fraction;
- int ww;
- long n;
-
- ww = precision;
- while (9 <= ww) {
- subsec = mul(subsec, INT2FIX(1000000000));
- ww -= 9;
- }
- n = 1;
- for (; 0 < ww; ww--)
- n *= 10;
- if (n != 1)
- subsec = mul(subsec, INT2FIX(n));
- subsec = div(subsec, INT2FIX(1));
-
- if (FIXNUM_P(subsec)) {
- (void)snprintf(s, endp - s, "%0*ld",
- precision, FIX2LONG(subsec));
- s += precision;
- }
- else {
- VALUE args[2], result;
- args[0] = INT2FIX(precision);
- args[1] = subsec;
- result = rb_str_format(2, args, rb_str_new2("%0*d"));
- (void)strlcpy(s, StringValueCStr(result), endp - s);
- s += precision;
- }
- }
- continue;
-
- case 'M': /* minute, 00 - 59 */
- v = range(0, tmx_min, 59);
- FMT('0', 2, "d", v);
- continue;
-
- case 'm': /* month, 01 - 12 */
- v = range(1, tmx_mon, 12);
- FMT('0', 2, "d", v);
- continue;
-
- case 'n': /* same as \n */
- FILL_PADDING(1);
- *s++ = '\n';
- continue;
-
- case 't': /* same as \t */
- FILL_PADDING(1);
- *s++ = '\t';
- continue;
-
- case 'P': /* am or pm based on 12-hour clock */
- case 'p': /* AM or PM based on 12-hour clock */
- if ((*format == 'p' && (flags & BIT_OF(CHCASE))) ||
- (*format == 'P' && !(flags & (BIT_OF(CHCASE) | BIT_OF(UPPER))))) {
- flags &= ~(BIT_OF(UPPER) | BIT_OF(CHCASE));
- flags |= BIT_OF(LOWER);
- }
- v = range(0, tmx_hour, 23);
- if (v < 12)
- tp = ampm[0];
- else
- tp = ampm[1];
- i = 2;
- break;
-
- case 'Q': /* milliseconds since Unix epoch */
- FMTV('0', 1, "d", tmx_msecs);
- continue;
-
- case 'R':
- STRFTIME("%H:%M");
- continue;
-
- case 'r':
- STRFTIME("%I:%M:%S %p");
- continue;
-
- case 'S': /* second, 00 - 59 */
- v = range(0, tmx_sec, 59);
- FMT('0', 2, "d", v);
- continue;
-
- case 's': /* seconds since Unix epoch */
- FMTV('0', 1, "d", tmx_secs);
- continue;
-
- case 'T':
- STRFTIME("%H:%M:%S");
- continue;
-
- case 'U': /* week of year, Sunday is first day of week */
- case 'W': /* week of year, Monday is first day of week */
- v = range(0, (*format == 'U') ? tmx_wnum0 : tmx_wnum1, 53);
- FMT('0', 2, "d", v);
- continue;
-
- case 'u': /* weekday, Monday == 1, 1 - 7 */
- v = range(1, tmx_cwday, 7);
- FMT('0', 1, "d", v);
- continue;
-
- case 'V': /* week of year according ISO 8601 */
- v = range(1, tmx_cweek, 53);
- FMT('0', 2, "d", v);
- continue;
-
- case 'v':
- STRFTIME("%e-%b-%Y");
- continue;
-
- case 'w': /* weekday, Sunday == 0, 0 - 6 */
- v = range(0, tmx_wday, 6);
- FMT('0', 1, "d", v);
- continue;
-
- case 'X': /* appropriate time representation */
- STRFTIME("%H:%M:%S");
- continue;
-
- case 'x': /* appropriate date representation */
- STRFTIME("%m/%d/%y");
- continue;
-
- case 'Z': /* time zone name or abbreviation */
- if (flags & BIT_OF(CHCASE)) {
- flags &= ~(BIT_OF(UPPER) | BIT_OF(CHCASE));
- flags |= BIT_OF(LOWER);
- }
- {
- char *zone = tmx_zone;
- if (zone == NULL)
- tp = "";
- else
- tp = zone;
- i = strlen(tp);
- }
- break;
-
- case 'z': /* offset from UTC */
- {
- long off, aoff;
- int hl, hw;
-
- off = tmx_offset;
- aoff = off;
- if (aoff < 0)
- aoff = -off;
-
- if ((aoff / 3600) < 10)
- hl = 1;
- else
- hl = 2;
- hw = 2;
- if (flags & BIT_OF(LEFT) && hl == 1)
- hw = 1;
-
- switch (colons) {
- case 0: /* %z -> +hhmm */
- precision = precision <= (3 + hw) ? hw : precision - 3;
- NEEDS(precision + 3);
- break;
-
- case 1: /* %:z -> +hh:mm */
- precision = precision <= (4 + hw) ? hw : precision - 4;
- NEEDS(precision + 4);
- break;
-
- case 2: /* %::z -> +hh:mm:ss */
- precision = precision <= (7 + hw) ? hw : precision - 7;
- NEEDS(precision + 7);
- break;
-
- case 3: /* %:::z -> +hh[:mm[:ss]] */
- {
- if (aoff % 3600 == 0) {
- precision = precision <= (1 + hw) ?
- hw : precision - 1;
- NEEDS(precision + 3);
- }
- else if (aoff % 60 == 0) {
- precision = precision <= (4 + hw) ?
- hw : precision - 4;
- NEEDS(precision + 4);
- }
- else {
- precision = precision <= (7 + hw) ?
- hw : precision - 7;
- NEEDS(precision + 7);
- }
- }
- break;
-
- default:
- format--;
- goto unknown;
- }
- if (padding == ' ' && precision > hl) {
- i = snprintf(s, endp - s, "%*s", precision - hl, "");
- precision = hl;
- if (i < 0) goto err;
- s += i;
- }
- if (off < 0) {
- off = -off;
- *s++ = '-';
- } else {
- *s++ = '+';
- }
- i = snprintf(s, endp - s, "%.*ld", precision, off / 3600);
- if (i < 0) goto err;
- s += i;
- off = off % 3600;
- if (colons == 3 && off == 0)
- continue;
- if (1 <= colons)
- *s++ = ':';
- i = snprintf(s, endp - s, "%02d", (int)(off / 60));
- if (i < 0) goto err;
- s += i;
- off = off % 60;
- if (colons == 3 && off == 0)
- continue;
- if (2 <= colons) {
- *s++ = ':';
- i = snprintf(s, endp - s, "%02d", (int)off);
- if (i < 0) goto err;
- s += i;
- }
- }
- continue;
-
- case '+':
- STRFTIME("%a %b %e %H:%M:%S %Z %Y");
- continue;
-
- case 'E':
- /* POSIX locale extensions, ignored for now */
- flags |= BIT_OF(LOCALE_E);
- if (*(format + 1) && strchr("cCxXyY", *(format + 1)))
- goto again;
- goto unknown;
- case 'O':
- /* POSIX locale extensions, ignored for now */
- flags |= BIT_OF(LOCALE_O);
- if (*(format + 1) && strchr("deHkIlmMSuUVwWy", *(format + 1)))
- goto again;
- goto unknown;
-
- case ':':
- flags |= BIT_OF(COLONS);
- {
- size_t l = strspn(format, ":");
- format += l;
- if (*format == 'z') {
- colons = l;
- format--;
- goto again;
- }
- format -= l;
- }
- goto unknown;
-
- case '_':
- FLAG_FOUND();
- padding = ' ';
- goto again;
-
- case '-':
- FLAG_FOUND();
- flags |= BIT_OF(LEFT);
- goto again;
-
- case '^':
- FLAG_FOUND();
- flags |= BIT_OF(UPPER);
- goto again;
-
- case '#':
- FLAG_FOUND();
- flags |= BIT_OF(CHCASE);
- goto again;
-
- case '0':
- FLAG_FOUND();
- padding = '0';
- case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- {
- char *e;
- precision = (int)strtoul(format, &e, 10);
- format = e - 1;
- goto again;
- }
-
- case '%':
- FILL_PADDING(1);
- *s++ = '%';
- continue;
-
- default:
- unknown:
- i = format - sp + 1;
- tp = sp;
- precision = -1;
- flags = 0;
- padding = 0;
- colons = 0;
- break;
- }
- if (i) {
- FILL_PADDING(i);
- memcpy(s, tp, i);
- switch (flags & (BIT_OF(UPPER) | BIT_OF(LOWER))) {
- case BIT_OF(UPPER):
- upcase(s, i);
- break;
- case BIT_OF(LOWER):
- downcase(s, i);
- break;
- }
- s += i;
- }
- }
- if (s >= endp) {
- goto err;
- }
- if (*format == '\0') {
- *s = '\0';
- return (s - start);
- }
- return 0;
-}
-
-size_t
-date_strftime(char *s, size_t maxsize, const char *format,
- const struct tmx *tmx)
-{
- return date_strftime_with_tmx(s, maxsize, format, tmx);
-}
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c
deleted file mode 100644
index 3e1b0f85ea..0000000000
--- a/ext/date/date_strptime.c
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- date_strptime.c: Coded by Tadayoshi Funaba 2011,2012
-*/
-
-#include "ruby.h"
-#include "ruby/encoding.h"
-#include "ruby/re.h"
-#include <ctype.h>
-
-static const char *day_names[] = {
- "Sunday", "Monday", "Tuesday", "Wednesday",
- "Thursday", "Friday", "Saturday",
- "Sun", "Mon", "Tue", "Wed",
- "Thu", "Fri", "Sat"
-};
-
-static const char *month_names[] = {
- "January", "February", "March", "April",
- "May", "June", "July", "August", "September",
- "October", "November", "December",
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static const char *merid_names[] = {
- "am", "pm",
- "a.m.", "p.m."
-};
-
-static const char *extz_pats[] = {
- ":z",
- "::z",
- ":::z"
-};
-
-#define sizeof_array(o) (sizeof o / sizeof o[0])
-
-#define f_negate(x) rb_funcall(x, rb_intern("-@"), 0)
-#define f_add(x,y) rb_funcall(x, '+', 1, y)
-#define f_sub(x,y) rb_funcall(x, '-', 1, y)
-#define f_mul(x,y) rb_funcall(x, '*', 1, y)
-#define f_div(x,y) rb_funcall(x, '/', 1, y)
-#define f_idiv(x,y) rb_funcall(x, rb_intern("div"), 1, y)
-#define f_mod(x,y) rb_funcall(x, '%', 1, y)
-#define f_expt(x,y) rb_funcall(x, rb_intern("**"), 1, y)
-
-#define f_lt_p(x,y) rb_funcall(x, '<', 1, y)
-#define f_gt_p(x,y) rb_funcall(x, '>', 1, y)
-#define f_le_p(x,y) rb_funcall(x, rb_intern("<="), 1, y)
-#define f_ge_p(x,y) rb_funcall(x, rb_intern(">="), 1, y)
-
-#define f_match(r,s) rb_funcall(r, rb_intern("match"), 1, s)
-#define f_aref(o,i) rb_funcall(o, rb_intern("[]"), 1, i)
-#define f_end(o,i) rb_funcall(o, rb_intern("end"), 1, i)
-
-#define issign(c) ((c) == '-' || (c) == '+')
-
-static int
-num_pattern_p(const char *s)
-{
- if (isdigit((unsigned char)*s))
- return 1;
- if (*s == '%') {
- s++;
- if (*s == 'E' || *s == 'O')
- s++;
- if (*s &&
- (strchr("CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy", *s) ||
- isdigit((unsigned char)*s)))
- return 1;
- }
- return 0;
-}
-
-#define NUM_PATTERN_P() num_pattern_p(&fmt[fi + 1])
-
-static long
-read_digits(const char *s, VALUE *n, size_t width)
-{
- size_t l;
-
- l = strspn(s, "0123456789");
-
- if (l == 0)
- return 0;
-
- if (width < l)
- l = width;
-
- if ((4 * l * sizeof(char)) <= (sizeof(long)*CHAR_BIT)) {
- const char *os = s;
- long v;
-
- v = 0;
- while ((size_t)(s - os) < l) {
- v *= 10;
- v += *s - '0';
- s++;
- }
- if (os == s)
- return 0;
- *n = LONG2NUM(v);
- return l;
- }
- else {
- char *s2 = ALLOCA_N(char, l + 1);
- memcpy(s2, s, l);
- s2[l] = '\0';
- *n = rb_cstr_to_inum(s2, 10, 0);
- return l;
- }
-}
-
-#define set_hash(k,v) rb_hash_aset(hash, ID2SYM(rb_intern(k)), v)
-#define ref_hash(k) rb_hash_aref(hash, ID2SYM(rb_intern(k)))
-#define del_hash(k) rb_hash_delete(hash, ID2SYM(rb_intern(k)))
-
-#define fail() \
-{ \
- set_hash("_fail", Qtrue); \
- return 0; \
-}
-
-#define fail_p() (!NIL_P(ref_hash("_fail")))
-
-#define READ_DIGITS(n,w) \
-{ \
- size_t l; \
- l = read_digits(&str[si], &n, w); \
- if (l == 0) \
- fail(); \
- si += l; \
-}
-
-#define READ_DIGITS_MAX(n) READ_DIGITS(n, LONG_MAX)
-
-static int
-valid_range_p(VALUE v, int a, int b)
-{
- if (FIXNUM_P(v)) {
- int vi = FIX2INT(v);
- return !(vi < a || vi > b);
- }
- return !(f_lt_p(v, INT2NUM(a)) || f_gt_p(v, INT2NUM(b)));
-}
-
-#define recur(fmt) \
-{ \
- size_t l; \
- l = date__strptime_internal(&str[si], slen - si, \
- fmt, sizeof fmt - 1, hash); \
- if (fail_p()) \
- return 0; \
- si += l; \
-}
-
-VALUE date_zone_to_diff(VALUE);
-
-static size_t
-date__strptime_internal(const char *str, size_t slen,
- const char *fmt, size_t flen, VALUE hash)
-{
- size_t si, fi;
- int c;
-
- si = fi = 0;
-
- while (fi < flen) {
-
- switch (fmt[fi]) {
- case '%':
-
- again:
- fi++;
- c = fmt[fi];
-
- switch (c) {
- case 'E':
- if (fmt[fi + 1] && strchr("cCxXyY", fmt[fi + 1]))
- goto again;
- fi--;
- goto ordinal;
- case 'O':
- if (fmt[fi + 1] && strchr("deHImMSuUVwWy", fmt[fi + 1]))
- goto again;
- fi--;
- goto ordinal;
- case ':':
- {
- int i;
-
- for (i = 0; i < (int)sizeof_array(extz_pats); i++)
- if (strncmp(extz_pats[i], &fmt[fi],
- strlen(extz_pats[i])) == 0) {
- fi += i;
- goto again;
- }
- fail();
- }
-
- case 'A':
- case 'a':
- {
- int i;
-
- for (i = 0; i < (int)sizeof_array(day_names); i++) {
- size_t l = strlen(day_names[i]);
- if (strncasecmp(day_names[i], &str[si], l) == 0) {
- si += l;
- set_hash("wday", INT2FIX(i % 7));
- goto matched;
- }
- }
- fail();
- }
- case 'B':
- case 'b':
- case 'h':
- {
- int i;
-
- for (i = 0; i < (int)sizeof_array(month_names); i++) {
- size_t l = strlen(month_names[i]);
- if (strncasecmp(month_names[i], &str[si], l) == 0) {
- si += l;
- set_hash("mon", INT2FIX((i % 12) + 1));
- goto matched;
- }
- }
- fail();
- }
-
- case 'C':
- {
- VALUE n;
-
- if (NUM_PATTERN_P())
- READ_DIGITS(n, 2)
- else
- READ_DIGITS_MAX(n)
- set_hash("_cent", n);
- goto matched;
- }
-
- case 'c':
- recur("%a %b %e %H:%M:%S %Y");
- goto matched;
-
- case 'D':
- recur("%m/%d/%y");
- goto matched;
-
- case 'd':
- case 'e':
- {
- VALUE n;
-
- if (str[si] == ' ') {
- si++;
- READ_DIGITS(n, 1);
- } else {
- READ_DIGITS(n, 2);
- }
- if (!valid_range_p(n, 1, 31))
- fail();
- set_hash("mday", n);
- goto matched;
- }
-
- case 'F':
- recur("%Y-%m-%d");
- goto matched;
-
- case 'G':
- {
- VALUE n;
-
- if (NUM_PATTERN_P())
- READ_DIGITS(n, 4)
- else
- READ_DIGITS_MAX(n)
- set_hash("cwyear", n);
- goto matched;
- }
-
- case 'g':
- {
- VALUE n;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 0, 99))
- fail();
- set_hash("cwyear",n);
- set_hash("_cent",
- INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
- goto matched;
- }
-
- case 'H':
- case 'k':
- {
- VALUE n;
-
- if (str[si] == ' ') {
- si++;
- READ_DIGITS(n, 1);
- } else {
- READ_DIGITS(n, 2);
- }
- if (!valid_range_p(n, 0, 24))
- fail();
- set_hash("hour", n);
- goto matched;
- }
-
- case 'I':
- case 'l':
- {
- VALUE n;
-
- if (str[si] == ' ') {
- si++;
- READ_DIGITS(n, 1);
- } else {
- READ_DIGITS(n, 2);
- }
- if (!valid_range_p(n, 1, 12))
- fail();
- set_hash("hour", n);
- goto matched;
- }
-
- case 'j':
- {
- VALUE n;
-
- READ_DIGITS(n, 3);
- if (!valid_range_p(n, 1, 366))
- fail();
- set_hash("yday", n);
- goto matched;
- }
-
- case 'L':
- case 'N':
- {
- VALUE n;
- int sign = 1;
- size_t osi;
-
- if (issign(str[si])) {
- if (str[si] == '-')
- sign = -1;
- si++;
- }
- osi = si;
- if (NUM_PATTERN_P())
- READ_DIGITS(n, c == 'L' ? 3 : 9)
- else
- READ_DIGITS_MAX(n)
- if (sign == -1)
- n = f_negate(n);
- set_hash("sec_fraction",
- rb_rational_new2(n,
- f_expt(INT2FIX(10),
- ULONG2NUM(si - osi))));
- goto matched;
- }
-
- case 'M':
- {
- VALUE n;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 0, 59))
- fail();
- set_hash("min", n);
- goto matched;
- }
-
- case 'm':
- {
- VALUE n;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 1, 12))
- fail();
- set_hash("mon", n);
- goto matched;
- }
-
- case 'n':
- case 't':
- recur(" ");
- goto matched;
-
- case 'P':
- case 'p':
- {
- int i;
-
- for (i = 0; i < 4; i++) {
- size_t l = strlen(merid_names[i]);
- if (strncasecmp(merid_names[i], &str[si], l) == 0) {
- si += l;
- set_hash("_merid", INT2FIX((i % 2) == 0 ? 0 : 12));
- goto matched;
- }
- }
- fail();
- }
-
- case 'Q':
- {
- VALUE n;
- int sign = 1;
-
- if (str[si] == '-') {
- sign = -1;
- si++;
- }
- READ_DIGITS_MAX(n);
- if (sign == -1)
- n = f_negate(n);
- set_hash("seconds",
- rb_rational_new2(n,
- f_expt(INT2FIX(10),
- INT2FIX(3))));
- goto matched;
- }
-
- case 'R':
- recur("%H:%M");
- goto matched;
-
- case 'r':
- recur("%I:%M:%S %p");
- goto matched;
-
- case 'S':
- {
- VALUE n;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 0, 60))
- fail();
- set_hash("sec", n);
- goto matched;
- }
-
- case 's':
- {
- VALUE n;
- int sign = 1;
-
- if (str[si] == '-') {
- sign = -1;
- si++;
- }
- READ_DIGITS_MAX(n);
- if (sign == -1)
- n = f_negate(n);
- set_hash("seconds", n);
- goto matched;
- }
-
- case 'T':
- recur("%H:%M:%S");
- goto matched;
-
- case 'U':
- case 'W':
- {
- VALUE n;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 0, 53))
- fail();
- set_hash(c == 'U' ? "wnum0" : "wnum1", n);
- goto matched;
- }
-
- case 'u':
- {
- VALUE n;
-
- READ_DIGITS(n, 1);
- if (!valid_range_p(n, 1, 7))
- fail();
- set_hash("cwday", n);
- goto matched;
- }
-
- case 'V':
- {
- VALUE n;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 1, 53))
- fail();
- set_hash("cweek", n);
- goto matched;
- }
-
- case 'v':
- recur("%e-%b-%Y");
- goto matched;
-
- case 'w':
- {
- VALUE n;
-
- READ_DIGITS(n, 1);
- if (!valid_range_p(n, 0, 6))
- fail();
- set_hash("wday", n);
- goto matched;
- }
-
- case 'X':
- recur("%H:%M:%S");
- goto matched;
-
- case 'x':
- recur("%m/%d/%y");
- goto matched;
-
- case 'Y':
- {
- VALUE n;
- int sign = 1;
-
- if (issign(str[si])) {
- if (str[si] == '-')
- sign = -1;
- si++;
- }
- if (NUM_PATTERN_P())
- READ_DIGITS(n, 4)
- else
- READ_DIGITS_MAX(n)
- if (sign == -1)
- n = f_negate(n);
- set_hash("year", n);
- goto matched;
- }
-
- case 'y':
- {
- VALUE n;
- int sign = 1;
-
- READ_DIGITS(n, 2);
- if (!valid_range_p(n, 0, 99))
- fail();
- if (sign == -1)
- n = f_negate(n);
- set_hash("year", n);
- set_hash("_cent",
- INT2FIX(f_ge_p(n, INT2FIX(69)) ? 19 : 20));
- goto matched;
- }
-
- case 'Z':
- case 'z':
- {
- static const char pat_source[] =
- "\\A("
- "(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?"
- "|(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\s+time\\b"
- "|(?-i:[[:alpha:]]+)(?:\\s+dst)?\\b"
- ")";
- static VALUE pat = Qnil;
- VALUE m, b;
-
- if (NIL_P(pat)) {
- pat = rb_reg_new(pat_source, sizeof pat_source - 1,
- ONIG_OPTION_IGNORECASE);
- rb_gc_register_mark_object(pat);
- }
-
- b = rb_backref_get();
- rb_match_busy(b);
- m = f_match(pat, rb_usascii_str_new2(&str[si]));
-
- if (!NIL_P(m)) {
- VALUE s, l, o;
-
- s = rb_reg_nth_match(1, m);
- l = f_end(m, INT2FIX(0));
- o = date_zone_to_diff(s);
- si += NUM2LONG(l);
- set_hash("zone", s);
- set_hash("offset", o);
- rb_backref_set(b);
- goto matched;
- }
- rb_backref_set(b);
- fail();
- }
-
- case '%':
- if (str[si] != '%')
- fail();
- si++;
- goto matched;
-
- case '+':
- recur("%a %b %e %H:%M:%S %Z %Y");
- goto matched;
-
- default:
- if (str[si] != '%')
- fail();
- si++;
- if (fi < flen)
- if (str[si] != fmt[fi])
- fail();
- si++;
- goto matched;
- }
- case ' ':
- case '\t':
- case '\n':
- case '\v':
- case '\f':
- case '\r':
- while (isspace((unsigned char)str[si]))
- si++;
- fi++;
- break;
- default:
- ordinal:
- if (str[si] != fmt[fi])
- fail();
- si++;
- fi++;
- break;
- matched:
- fi++;
- break;
- }
- }
-
- return si;
-}
-
-VALUE
-date__strptime(const char *str, size_t slen,
- const char *fmt, size_t flen, VALUE hash)
-{
- size_t si;
- VALUE cent, merid;
-
- si = date__strptime_internal(str, slen, fmt, flen, hash);
-
- if (slen > si) {
- VALUE s;
-
- s = rb_usascii_str_new(&str[si], slen - si);
- set_hash("leftover", s);
- }
-
- if (fail_p())
- return Qnil;
-
- cent = ref_hash("_cent");
- if (!NIL_P(cent)) {
- VALUE year;
-
- year = ref_hash("cwyear");
- if (!NIL_P(year))
- set_hash("cwyear", f_add(year, f_mul(cent, INT2FIX(100))));
- year = ref_hash("year");
- if (!NIL_P(year))
- set_hash("year", f_add(year, f_mul(cent, INT2FIX(100))));
- del_hash("_cent");
- }
-
- merid = ref_hash("_merid");
- if (!NIL_P(merid)) {
- VALUE hour;
-
- hour = ref_hash("hour");
- if (!NIL_P(hour)) {
- hour = f_mod(hour, INT2FIX(12));
- set_hash("hour", f_add(hour, merid));
- }
- del_hash("_merid");
- }
-
- return hash;
-}
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/ext/date/date_tmx.h b/ext/date/date_tmx.h
deleted file mode 100644
index ed06501228..0000000000
--- a/ext/date/date_tmx.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef DATE_TMX_H
-#define DATE_TMX_H
-
-struct tmx_funcs {
- VALUE (*year)(void *dat);
- int (*yday)(void *dat);
- int (*mon)(void *dat);
- int (*mday)(void *dat);
- VALUE (*cwyear)(void *dat);
- int (*cweek)(void *dat);
- int (*cwday)(void *dat);
- int (*wnum0)(void *dat);
- int (*wnum1)(void *dat);
- int (*wday)(void *dat);
- int (*hour)(void *dat);
- int (*min)(void *dat);
- int (*sec)(void *dat);
- VALUE (*sec_fraction)(void *dat);
- VALUE (*secs)(void *dat);
- VALUE (*msecs)(void *dat);
- int (*offset)(void *dat);
- char *(*zone)(void *dat);
-};
-struct tmx {
- void *dat;
- struct tmx_funcs *funcs;
-};
-
-#define tmx_attr(x) (tmx->funcs->x)(tmx->dat)
-
-#define tmx_year tmx_attr(year)
-#define tmx_yday tmx_attr(yday)
-#define tmx_mon tmx_attr(mon)
-#define tmx_mday tmx_attr(mday)
-#define tmx_cwyear tmx_attr(cwyear)
-#define tmx_cweek tmx_attr(cweek)
-#define tmx_cwday tmx_attr(cwday)
-#define tmx_wnum0 tmx_attr(wnum0)
-#define tmx_wnum1 tmx_attr(wnum1)
-#define tmx_wday tmx_attr(wday)
-#define tmx_hour tmx_attr(hour)
-#define tmx_min tmx_attr(min)
-#define tmx_sec tmx_attr(sec)
-#define tmx_sec_fraction tmx_attr(sec_fraction)
-#define tmx_secs tmx_attr(secs)
-#define tmx_msecs tmx_attr(msecs)
-#define tmx_offset tmx_attr(offset)
-#define tmx_zone tmx_attr(zone)
-
-#endif
-
-/*
-Local variables:
-c-file-style: "ruby"
-End:
-*/
diff --git a/ext/date/depend b/ext/date/depend
deleted file mode 100644
index e6afa56162..0000000000
--- a/ext/date/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-$(OBJS): $(ruby_headers)
-date_core.o: date_tmx.h
-date_strftime.o: date_tmx.h
diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb
deleted file mode 100644
index 9f7d3e8f0b..0000000000
--- a/ext/date/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('date_core')
diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb
deleted file mode 100644
index d235d76e6f..0000000000
--- a/ext/date/lib/date.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-# date.rb: Written by Tadayoshi Funaba 1998-2011
-
-require 'date_core'
-require 'date/format'
-
-class Date
-
- class Infinity < Numeric # :nodoc:
-
- include Comparable
-
- def initialize(d=1) @d = d <=> 0 end
-
- def d() @d end
-
- protected :d
-
- def zero? () false end
- def finite? () false end
- def infinite? () d.nonzero? end
- def nan? () d.zero? end
-
- def abs() self.class.new end
-
- def -@ () self.class.new(-d) end
- def +@ () self.class.new(+d) end
-
- def <=> (other)
- case other
- when Infinity; return d <=> other.d
- when Numeric; return d
- else
- begin
- l, r = other.coerce(self)
- return l <=> r
- rescue NoMethodError
- end
- end
- nil
- end
-
- def coerce(other)
- case other
- when Numeric; return -d, d
- else
- super
- end
- end
-
- def to_f
- return 0 if @d == 0
- if @d > 0
- Float::INFINITY
- else
- -Float::INFINITY
- end
- end
-
- end
-
-end
diff --git a/ext/date/lib/date/format.rb b/ext/date/lib/date/format.rb
deleted file mode 100644
index 892e7aacaa..0000000000
--- a/ext/date/lib/date/format.rb
+++ /dev/null
@@ -1 +0,0 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2011
diff --git a/ext/dbm/.cvsignore b/ext/dbm/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/dbm/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 57d227e8ad..893146d582 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -21,21 +21,12 @@
#include <fcntl.h>
#include <errno.h>
-#define DSIZE_TYPE TYPEOF_DATUM_DSIZE
-#if SIZEOF_DATUM_DSIZE > SIZEOF_INT
-# define RSTRING_DSIZE(s) RSTRING_LEN(s)
-# define TOO_LONG(n) 0
-#else
-# define RSTRING_DSIZE(s) RSTRING_LENINT(s)
-# define TOO_LONG(n) ((long)(+(DSIZE_TYPE)(n)) != (n))
-#endif
-
static VALUE rb_cDBM, rb_eDBMError;
#define RUBY_DBM_RW_BIT 0x20000000
struct dbmdata {
- long di_size;
+ int di_size;
DBM *di_dbm;
};
@@ -46,13 +37,13 @@ closed_dbm(void)
}
#define GetDBM(obj, dbmp) {\
- Data_Get_Struct((obj), struct dbmdata, (dbmp));\
- if ((dbmp) == 0) closed_dbm();\
- if ((dbmp)->di_dbm == 0) closed_dbm();\
+ Data_Get_Struct(obj, struct dbmdata, dbmp);\
+ if (dbmp == 0) closed_dbm();\
+ if (dbmp->di_dbm == 0) closed_dbm();\
}
#define GetDBM2(obj, data, dbm) {\
- GetDBM((obj), (data));\
+ GetDBM(obj, data);\
(dbm) = dbmp->di_dbm;\
}
@@ -65,12 +56,6 @@ free_dbm(struct dbmdata *dbmp)
}
}
-/*
- * call-seq:
- * dbm.close
- *
- * Closes the database.
- */
static VALUE
fdbm_close(VALUE obj)
{
@@ -83,12 +68,6 @@ fdbm_close(VALUE obj)
return Qnil;
}
-/*
- * call-seq:
- * dbm.closed? -> true or false
- *
- * Returns true if the database is closed, false otherwise.
- */
static VALUE
fdbm_closed(VALUE obj)
{
@@ -109,19 +88,6 @@ fdbm_alloc(VALUE klass)
return Data_Wrap_Struct(klass, 0, free_dbm, 0);
}
-/*
- * call-seq:
- * DBM.new(filename[, mode[, flags]]) -> dbm
- *
- * Open a dbm database with the specified name, which can include a directory
- * path. Any file extensions needed will be supplied automatically by the dbm
- * library. For example, Berkeley DB appends '.db', and GNU gdbm uses two
- * physical files with extensions '.dir' and '.pag'.
- *
- * The mode should be an integer, as for Unix chmod.
- *
- * Flags should be one of READER, WRITER, WRCREAT or NEWDB.
- */
static VALUE
fdbm_initialize(int argc, VALUE *argv, VALUE obj)
{
@@ -146,67 +112,26 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
FilePathValue(file);
- /*
- * Note:
- * gdbm 1.10 works with O_CLOEXEC. gdbm 1.9.1 silently ignore it.
- */
-#ifndef O_CLOEXEC
-# define O_CLOEXEC 0
-#endif
-
if (flags & RUBY_DBM_RW_BIT) {
flags &= ~RUBY_DBM_RW_BIT;
- dbm = dbm_open(RSTRING_PTR(file), flags|O_CLOEXEC, mode);
+ dbm = dbm_open(RSTRING_PTR(file), flags, mode);
}
else {
dbm = 0;
if (mode >= 0) {
- dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT|O_CLOEXEC, mode);
+ dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
}
if (!dbm) {
- dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CLOEXEC, 0);
+ dbm = dbm_open(RSTRING_PTR(file), O_RDWR, 0);
}
if (!dbm) {
- dbm = dbm_open(RSTRING_PTR(file), O_RDONLY|O_CLOEXEC, 0);
+ dbm = dbm_open(RSTRING_PTR(file), O_RDONLY, 0);
}
}
- if (dbm) {
- /*
- * History of dbm_pagfno() and dbm_dirfno() in ndbm and its compatibles.
- * (dbm_pagfno() and dbm_dirfno() is not standardized.)
- *
- * 1986: 4.3BSD provides ndbm.
- * It provides dbm_pagfno() and dbm_dirfno() as macros.
- * 1991: gdbm-1.5 provides them as functions.
- * They returns a same descriptor.
- * (Earlier releases may have the functions too.)
- * 1991: Net/2 provides Berkeley DB.
- * It doesn't provide dbm_pagfno() and dbm_dirfno().
- * 1992: 4.4BSD Alpha provides Berkeley DB with dbm_dirfno() as a function.
- * dbm_pagfno() is a macro as DBM_PAGFNO_NOT_AVAILABLE.
- * 1997: Berkeley DB 2.0 is released by Sleepycat Software, Inc.
- * It defines dbm_pagfno() and dbm_dirfno() as macros.
- * 2011: gdbm-1.9 creates a separate dir file.
- * dbm_pagfno() and dbm_dirfno() returns different descriptors.
- */
-#if defined(HAVE_DBM_PAGFNO)
- rb_fd_fix_cloexec(dbm_pagfno(dbm));
-#endif
-#if defined(HAVE_DBM_DIRFNO)
- rb_fd_fix_cloexec(dbm_dirfno(dbm));
-#endif
-
-#if defined(RUBYDBM_DB_HEADER) && defined(HAVE_TYPE_DBC)
- /* Disable Berkeley DB error messages such as:
- * DB->put: attempt to modify a read-only database */
- ((DBC*)dbm)->dbp->set_errfile(((DBC*)dbm)->dbp, NULL);
-#endif
- }
-
if (!dbm) {
if (mode == -1) return Qnil;
- rb_sys_fail_str(file);
+ rb_sys_fail(RSTRING_PTR(file));
}
dbmp = ALLOC(struct dbmdata);
@@ -217,14 +142,6 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
return obj;
}
-/*
- * call-seq:
- * DBM.open(filename[, mode[, flags]]) -> dbm
- * DBM.open(filename[, mode[, flags]]) {|dbm| block}
- *
- * Open a dbm database and yields it if a block is given. See also
- * <code>DBM.new</code>.
- */
static VALUE
fdbm_s_open(int argc, VALUE *argv, VALUE klass)
{
@@ -247,18 +164,14 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
datum key, value;
struct dbmdata *dbmp;
DBM *dbm;
- long len;
ExportStringValue(keystr);
- len = RSTRING_LEN(keystr);
- if (TOO_LONG(len)) goto not_found;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (DSIZE_TYPE)len;
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
value = dbm_fetch(dbm, key);
if (value.dptr == 0) {
- not_found:
if (ifnone == Qnil && rb_block_given_p())
return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
return ifnone;
@@ -266,27 +179,12 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
return rb_tainted_str_new(value.dptr, value.dsize);
}
-/*
- * call-seq:
- * dbm[key] -> string value or nil
- *
- * Return a value from the database by locating the key string
- * provided. If the key is not found, returns nil.
- */
static VALUE
fdbm_aref(VALUE obj, VALUE keystr)
{
return fdbm_fetch(obj, keystr, Qnil);
}
-/*
- * call-seq:
- * dbm.fetch(key[, ifnone]) -> value
- *
- * Return a value from the database by locating the key string
- * provided. If the key is not found, returns +ifnone+. If +ifnone+
- * is not given, raises IndexError.
- */
static VALUE
fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
{
@@ -300,30 +198,21 @@ fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
return valstr;
}
-/*
- * call-seq:
- * dbm.key(value) -> string
- *
- * Returns the key for the specified value.
- */
static VALUE
fdbm_key(VALUE obj, VALUE valstr)
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- long len;
ExportStringValue(valstr);
- len = RSTRING_LEN(valstr);
- if (TOO_LONG(len)) return Qnil;
val.dptr = RSTRING_PTR(valstr);
- val.dsize = (DSIZE_TYPE)len;
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
- if ((long)val.dsize == RSTRING_LEN(valstr) &&
+ if (val.dsize == RSTRING_LEN(valstr) &&
memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
return rb_tainted_str_new(key.dptr, key.dsize);
}
@@ -331,7 +220,6 @@ fdbm_key(VALUE obj, VALUE valstr)
return Qnil;
}
-/* :nodoc: */
static VALUE
fdbm_index(VALUE hash, VALUE value)
{
@@ -339,13 +227,6 @@ fdbm_index(VALUE hash, VALUE value)
return fdbm_key(hash, value);
}
-/*
- * call-seq:
- * dbm.select {|key, value| block} -> array
- *
- * Returns a new array consisting of the [key, value] pairs for which the code
- * block returns true.
- */
static VALUE
fdbm_select(VALUE obj)
{
@@ -370,12 +251,6 @@ fdbm_select(VALUE obj)
return new;
}
-/*
- * call-seq:
- * dbm.values_at(key, ...) -> Array
- *
- * Returns an array containing the values associated with the given keys.
- */
static VALUE
fdbm_values_at(int argc, VALUE *argv, VALUE obj)
{
@@ -396,12 +271,6 @@ fdbm_modify(VALUE obj)
if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
}
-/*
- * call-seq:
- * dbm.delete(key)
- *
- * Deletes an entry from the database.
- */
static VALUE
fdbm_delete(VALUE obj, VALUE keystr)
{
@@ -409,20 +278,16 @@ fdbm_delete(VALUE obj, VALUE keystr)
struct dbmdata *dbmp;
DBM *dbm;
VALUE valstr;
- long len;
fdbm_modify(obj);
ExportStringValue(keystr);
- len = RSTRING_LEN(keystr);
- if (TOO_LONG(len)) goto not_found;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (DSIZE_TYPE)len;
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
value = dbm_fetch(dbm, key);
if (value.dptr == 0) {
- not_found:
if (rb_block_given_p()) return rb_yield(keystr);
return Qnil;
}
@@ -440,14 +305,6 @@ fdbm_delete(VALUE obj, VALUE keystr)
return valstr;
}
-/*
- * call-seq:
- * dbm.shift() -> [key, value]
- *
- * Removes a [key, value] pair from the database, and returns it.
- * If the database is empty, returns nil.
- * The order in which values are removed/returned is not guaranteed.
- */
static VALUE
fdbm_shift(VALUE obj)
{
@@ -470,14 +327,6 @@ fdbm_shift(VALUE obj)
return rb_assoc_new(keystr, valstr);
}
-/*
- * call-seq:
- * dbm.reject! {|key, value| block} -> self
- * dbm.delete_if {|key, value| block} -> self
- *
- * Deletes all entries for which the code block returns true.
- * Returns self.
- */
static VALUE
fdbm_delete_if(VALUE obj)
{
@@ -485,9 +334,8 @@ fdbm_delete_if(VALUE obj)
struct dbmdata *dbmp;
DBM *dbm;
VALUE keystr, valstr;
- VALUE ret, ary = rb_ary_tmp_new(0);
- int i, status = 0;
- long n;
+ VALUE ret, ary = rb_ary_new();
+ int i, status = 0, n;
fdbm_modify(obj);
GetDBM2(obj, dbmp, dbm);
@@ -497,7 +345,6 @@ fdbm_delete_if(VALUE obj)
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
keystr = rb_tainted_str_new(key.dptr, key.dsize);
- OBJ_FREEZE(keystr);
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;
@@ -507,25 +354,19 @@ fdbm_delete_if(VALUE obj)
for (i = 0; i < RARRAY_LEN(ary); i++) {
keystr = RARRAY_PTR(ary)[i];
+ ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (DSIZE_TYPE)RSTRING_LEN(keystr);
+ key.dsize = RSTRING_LEN(keystr);
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);
- rb_ary_clear(ary);
return obj;
}
-/*
- * call-seq:
- * dbm.clear
- *
- * Deletes all data from the database.
- */
static VALUE
fdbm_clear(VALUE obj)
{
@@ -546,13 +387,6 @@ fdbm_clear(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * dbm.invert -> hash
- *
- * Returns a Hash (not a DBM database) created by using each value in the
- * database as a key, with the corresponding key as its value.
- */
static VALUE
fdbm_invert(VALUE obj)
{
@@ -585,14 +419,6 @@ update_i(VALUE pair, VALUE dbm)
return Qnil;
}
-/*
- * call-seq:
- * dbm.update(obj)
- *
- * Updates the database with multiple values from the specified object.
- * Takes any object which implements the each_pair method, including
- * Hash and DBM objects.
- */
static VALUE
fdbm_update(VALUE obj, VALUE other)
{
@@ -600,14 +426,6 @@ fdbm_update(VALUE obj, VALUE other)
return obj;
}
-/*
- * call-seq:
- * dbm.replace(obj)
- *
- * Replaces the contents of the database with the contents of the specified
- * object. Takes any object which implements the each_pair method, including
- * Hash and DBM objects.
- */
static VALUE
fdbm_replace(VALUE obj, VALUE other)
{
@@ -616,14 +434,6 @@ fdbm_replace(VALUE obj, VALUE other)
return obj;
}
-/*
- * call-seq:
- * dbm.store(key, value) -> value
- * dbm[key] = value
- *
- * Stores the specified string value in the database, indexed via the
- * string key provided.
- */
static VALUE
fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
{
@@ -636,15 +446,17 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
valstr = rb_obj_as_string(valstr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_DSIZE(keystr);
+ key.dsize = RSTRING_LEN(keystr);
val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_DSIZE(valstr);
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
if (dbm_store(dbm, key, val, DBM_REPLACE)) {
+#ifdef HAVE_DBM_CLEARERR
dbm_clearerr(dbm);
+#endif
if (errno == EPERM) rb_sys_fail(0);
rb_raise(rb_eDBMError, "dbm_store failed");
}
@@ -652,12 +464,6 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
return valstr;
}
-/*
- * call-seq:
- * dbm.length -> integer
- *
- * Returns the number of entries in the database.
- */
static VALUE
fdbm_length(VALUE obj)
{
@@ -677,40 +483,29 @@ fdbm_length(VALUE obj)
return INT2FIX(i);
}
-/*
- * call-seq:
- * dbm.empty?
- *
- * Returns true if the database is empty, false otherwise.
- */
static VALUE
fdbm_empty_p(VALUE obj)
{
datum key;
struct dbmdata *dbmp;
DBM *dbm;
+ int i = 0;
GetDBM2(obj, dbmp, dbm);
if (dbmp->di_size < 0) {
dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
- return Qfalse;
+ i++;
}
}
else {
- if (dbmp->di_size)
- return Qfalse;
+ i = dbmp->di_size;
}
- return Qtrue;
+ if (i == 0) return Qtrue;
+ return Qfalse;
}
-/*
- * call-seq:
- * dbm.each_value {|value| block} -> self
- *
- * Calls the block once for each value string in the database. Returns self.
- */
static VALUE
fdbm_each_value(VALUE obj)
{
@@ -729,12 +524,6 @@ fdbm_each_value(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * dbm.each_key {|key| block} -> self
- *
- * Calls the block once for each key string in the database. Returns self.
- */
static VALUE
fdbm_each_key(VALUE obj)
{
@@ -752,13 +541,6 @@ fdbm_each_key(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * dbm.each_pair {|key,value| block} -> self
- *
- * Calls the block once for each [key, value] pair in the database.
- * Returns self.
- */
static VALUE
fdbm_each_pair(VALUE obj)
{
@@ -782,12 +564,6 @@ fdbm_each_pair(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * dbm.keys -> array
- *
- * Returns an array of all the string keys in the database.
- */
static VALUE
fdbm_keys(VALUE obj)
{
@@ -806,12 +582,6 @@ fdbm_keys(VALUE obj)
return ary;
}
-/*
- * call-seq:
- * dbm.values -> array
- *
- * Returns an array of all the string values in the database.
- */
static VALUE
fdbm_values(VALUE obj)
{
@@ -830,25 +600,16 @@ fdbm_values(VALUE obj)
return ary;
}
-/*
- * call-seq:
- * dbm.has_key?(key) -> boolean
- *
- * Returns true if the database contains the specified key, false otherwise.
- */
static VALUE
fdbm_has_key(VALUE obj, VALUE keystr)
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- long len;
ExportStringValue(keystr);
- len = RSTRING_LEN(keystr);
- if (TOO_LONG(len)) return Qfalse;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (DSIZE_TYPE)len;
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
val = dbm_fetch(dbm, key);
@@ -856,44 +617,27 @@ fdbm_has_key(VALUE obj, VALUE keystr)
return Qfalse;
}
-/*
- * call-seq:
- * dbm.has_value?(value) -> boolean
- *
- * Returns true if the database contains the specified string value, false
- * otherwise.
- */
static VALUE
fdbm_has_value(VALUE obj, VALUE valstr)
{
datum key, val;
struct dbmdata *dbmp;
DBM *dbm;
- long len;
ExportStringValue(valstr);
- len = RSTRING_LEN(valstr);
- if (TOO_LONG(len)) return Qfalse;
val.dptr = RSTRING_PTR(valstr);
- val.dsize = (DSIZE_TYPE)len;
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
- if ((DSIZE_TYPE)val.dsize == (DSIZE_TYPE)RSTRING_LEN(valstr) &&
+ if (val.dsize == RSTRING_LEN(valstr) &&
memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
return Qtrue;
}
return Qfalse;
}
-/*
- * call-seq:
- * dbm.to_a -> array
- *
- * Converts the contents of the database to an array of [key, value] arrays,
- * and returns it.
- */
static VALUE
fdbm_to_a(VALUE obj)
{
@@ -913,13 +657,6 @@ fdbm_to_a(VALUE obj)
return ary;
}
-/*
- * call-seq:
- * dbm.to_hash -> hash
- *
- * Converts the contents of the database to an in-memory Hash object, and
- * returns it.
- */
static VALUE
fdbm_to_hash(VALUE obj)
{
@@ -939,88 +676,16 @@ fdbm_to_hash(VALUE obj)
return hash;
}
-/*
- * call-seq:
- * dbm.reject {|key,value| block} -> Hash
- *
- * Converts the contents of the database to an in-memory Hash, then calls
- * Hash#reject with the specified code block, returning a new Hash.
- */
static VALUE
fdbm_reject(VALUE obj)
{
return rb_hash_delete_if(fdbm_to_hash(obj));
}
-/*
- * Documented by mathew meta@pobox.com.
- * = Introduction
- *
- * The DBM class provides a wrapper to a Unix-style
- * {dbm}[http://en.wikipedia.org/wiki/Dbm] or Database Manager library.
- *
- * Dbm databases do not have tables or columns; they are simple key-value
- * data stores, like a Ruby Hash except not resident in RAM. Keys and values
- * must be strings.
- *
- * The exact library used depends on how Ruby was compiled. It could be any
- * of the following:
- *
- * - The original ndbm library is released in 4.3BSD.
- * It is based on dbm library in Unix Version 7 but has different API to
- * support multiple databases in a process.
- * - {Berkeley DB}[http://en.wikipedia.org/wiki/Berkeley_DB] versions
- * 1 thru 5, also known as BDB and Sleepycat DB, now owned by Oracle
- * Corporation.
- * - Berkeley DB 1.x, still found in 4.4BSD derivatives (FreeBSD, OpenBSD, etc).
- * - {gdbm}[http://www.gnu.org/software/gdbm/], the GNU implementation of dbm.
- * - {qdbm}[http://fallabs.com/qdbm/index.html], another open source
- * reimplementation of dbm.
- *
- * All of these dbm implementations have their own Ruby interfaces
- * available, which provide richer (but varying) APIs.
- *
- * = Cautions
- *
- * Before you decide to use DBM, there are some issues you should consider:
- *
- * - Each implementation of dbm has its own file format. Generally, dbm
- * libraries will not read each other's files. This makes dbm files
- * a bad choice for data exchange.
- *
- * - Even running the same OS and the same dbm implementation, the database
- * file format may depend on the CPU architecture. For example, files may
- * not be portable between PowerPC and 386, or between 32 and 64 bit Linux.
- *
- * - Different versions of Berkeley DB use different file formats. A change to
- * the OS may therefore break DBM access to existing files.
- *
- * - Data size limits vary between implementations. Original Berkeley DB was
- * limited to 2GB of data. Dbm libraries also sometimes limit the total
- * size of a key/value pair, and the total size of all the keys that hash
- * to the same value. These limits can be as little as 512 bytes. That said,
- * gdbm and recent versions of Berkeley DB do away with these limits.
- *
- * Given the above cautions, DBM is not a good choice for long term storage of
- * important data. It is probably best used as a fast and easy alternative
- * to a Hash for processing large amounts of data.
- *
- * = Example
- *
- * require 'dbm'
- * db = DBM.open('rfcs', 666, DBM::CREATRW)
- * db['822'] = 'Standard for the Format of ARPA Internet Text Messages'
- * db['1123'] = 'Requirements for Internet Hosts - Application and Support'
- * db['3068'] = 'An Anycast Prefix for 6to4 Relay Routers'
- * puts db['822']
- */
void
Init_dbm(void)
{
rb_cDBM = rb_define_class("DBM", rb_cObject);
- /* Document-class: DBMError
- * Exception class used to return errors from the dbm library.
- */
rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
rb_include_module(rb_cDBM, rb_mEnumerable);
@@ -1053,9 +718,9 @@ Init_dbm(void)
rb_define_method(rb_cDBM, "reject!", fdbm_delete_if, 0);
rb_define_method(rb_cDBM, "reject", fdbm_reject, 0);
rb_define_method(rb_cDBM, "clear", fdbm_clear, 0);
- rb_define_method(rb_cDBM, "invert", fdbm_invert, 0);
- rb_define_method(rb_cDBM, "update", fdbm_update, 1);
- rb_define_method(rb_cDBM, "replace", fdbm_replace, 1);
+ rb_define_method(rb_cDBM,"invert", fdbm_invert, 0);
+ rb_define_method(rb_cDBM,"update", fdbm_update, 1);
+ rb_define_method(rb_cDBM,"replace", fdbm_replace, 1);
rb_define_method(rb_cDBM, "include?", fdbm_has_key, 1);
rb_define_method(rb_cDBM, "has_key?", fdbm_has_key, 1);
@@ -1067,67 +732,15 @@ Init_dbm(void)
rb_define_method(rb_cDBM, "to_a", fdbm_to_a, 0);
rb_define_method(rb_cDBM, "to_hash", fdbm_to_hash, 0);
- /* Indicates that dbm_open() should open the database in read-only mode */
+ /* flags for dbm_open() */
rb_define_const(rb_cDBM, "READER", INT2FIX(O_RDONLY|RUBY_DBM_RW_BIT));
-
- /* Indicates that dbm_open() should open the database in read/write mode */
rb_define_const(rb_cDBM, "WRITER", INT2FIX(O_RDWR|RUBY_DBM_RW_BIT));
-
- /* Indicates that dbm_open() should open the database in read/write mode,
- * and create it if it does not already exist
- */
rb_define_const(rb_cDBM, "WRCREAT", INT2FIX(O_RDWR|O_CREAT|RUBY_DBM_RW_BIT));
-
- /* Indicates that dbm_open() should open the database in read/write mode,
- * create it if it does not already exist, and delete all contents if it
- * does already exist.
- */
rb_define_const(rb_cDBM, "NEWDB", INT2FIX(O_RDWR|O_CREAT|O_TRUNC|RUBY_DBM_RW_BIT));
- {
- VALUE version;
-#if defined(_DBM_IOERR)
- version = rb_str_new2("ndbm (4.3BSD)");
-#elif defined(RUBYDBM_GDBM_HEADER)
-# if defined(HAVE_DECLARED_LIBVAR_GDBM_VERSION)
- /* since gdbm 1.9 */
- version = rb_str_new2(gdbm_version);
-# elif defined(HAVE_UNDECLARED_LIBVAR_GDBM_VERSION)
- /* ndbm.h doesn't declare gdbm_version until gdbm 1.8.3.
- * See extconf.rb for more information. */
- RUBY_EXTERN char *gdbm_version;
- version = rb_str_new2(gdbm_version);
-# else
- version = rb_str_new2("GDBM (unknown)");
-# endif
-#elif defined(RUBYDBM_DB_HEADER)
-# if defined(HAVE_DB_VERSION)
- /* The version of the dbm library, if using Berkeley DB */
- version = rb_str_new2(db_version(NULL, NULL, NULL));
-# else
- version = rb_str_new2("Berkeley DB (unknown)");
-# endif
-#elif defined(_RELIC_H)
-# if defined(HAVE_DPVERSION)
- version = rb_sprintf("QDBM %s", dpversion);
-# else
- version = rb_str_new2("QDBM (unknown)");
-# endif
+#ifdef DB_VERSION_STRING
+ rb_define_const(rb_cDBM, "VERSION", rb_str_new2(DB_VERSION_STRING));
#else
- version = rb_str_new2("ndbm (unknown)");
+ rb_define_const(rb_cDBM, "VERSION", rb_str_new2("unknown"));
#endif
- /*
- * Identifies ndbm library version.
- *
- * Examples:
- *
- * - "ndbm (4.3BSD)"
- * - "Berkeley DB 4.8.30: (April 9, 2010)"
- * - "Berkeley DB (unknown)" (4.4BSD, maybe)
- * - "GDBM version 1.8.3. 10/15/2002 (built Jul 1 2011 12:32:45)"
- * - "QDBM 1.8.78"
- *
- */
- rb_define_const(rb_cDBM, "VERSION", version);
- }
}
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 32a944634a..4d12264063 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -5,250 +5,49 @@ dir_config("dbm")
if dblib = with_config("dbm-type", nil)
dblib = dblib.split(/[ ,]+/)
else
- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
+ dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
end
headers = {
- "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
"db" => ["db.h"],
"db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
"db2" => ["db2/db.h", "db2.h", "db.h"],
- "db3" => ["db3/db.h", "db3.h", "db.h"],
- "db4" => ["db4/db.h", "db4.h", "db.h"],
- "db5" => ["db5/db.h", "db5.h", "db.h"],
- "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
- "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
- "qdbm" => ["qdbm/relic.h", "relic.h"],
+ "dbm" => ["ndbm.h"],
+ "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
+ "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
+ "qdbm" => ["relic.h"],
}
-class << headers
- attr_accessor :found
- attr_accessor :defs
-end
-headers.found = []
-headers.defs = nil
-
-def headers.db_check(db, hdr)
- old_libs = $libs.dup
- old_defs = $defs.dup
- result = db_check2(db, hdr)
- if !result
- $libs = old_libs
- $defs = old_defs
- end
- result
-end
-
-def have_declared_libvar(var, headers = nil, opt = "", &b)
- checking_for checking_message([*var].compact.join(' '), headers, opt) do
- try_declared_libvar(var, headers, opt, &b)
- end
-end
-
-def try_declared_libvar(var, headers = nil, opt = "", &b)
- if try_link(<<"SRC", opt, &b)
-#{cpp_include(headers)}
-/*top*/
-int main(int argc, char *argv[]) {
- void *conftest_var = &#{var};
- return 0;
-}
-SRC
- $defs.push(format("-DHAVE_DECLARED_LIBVAR_%s", var.tr_cpp))
- true
- else
- false
- end
-end
-
-def have_undeclared_libvar(var, headers = nil, opt = "", &b)
- checking_for checking_message([*var].compact.join(' '), headers, opt) do
- try_undeclared_libvar(var, headers, opt, &b)
- end
-end
-
-def try_undeclared_libvar(var, headers = nil, opt = "", &b)
- var, type = *var
- if try_link(<<"SRC", opt, &b)
-#{cpp_include(headers)}
-/*top*/
-int main(int argc, char *argv[]) {
- typedef #{type || 'int'} conftest_type;
- extern conftest_type #{var};
- conftest_type *conftest_var = &#{var};
- return 0;
-}
-SRC
- $defs.push(format("-DHAVE_UNDECLARED_LIBVAR_%s", var.tr_cpp))
- true
- else
- false
- end
-end
-
-def have_empty_macro_dbm_clearerr(headers = nil, opt = "", &b)
- checking_for checking_message('empty macro of dbm_clearerr(foobarbaz)',
- headers, opt) do
- try_toplevel('dbm_clearerr(foobarbaz)', headers, opt, &b)
- end
-end
-
-def try_toplevel(src, headers = nil, opt = "", &b)
- if try_compile(<<"SRC", opt, &b)
-#{cpp_include(headers)}
-/*top*/
-#{src}
-SRC
- true
- else
- false
- end
-end
-
-
-def headers.db_check2(db, hdr)
- $defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'})
- $defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'})
-
+def headers.db_check(db)
+ db_prefix = nil
+ have_gdbm = false
hsearch = nil
case db
- when /^db[2-5]?$/
- hsearch = "-DDB_DBM_HSEARCH"
+ when /^db2?$/
+ db_prefix = "__db_n"
+ hsearch = "-DDB_DBM_HSEARCH "
+ when "gdbm"
+ have_gdbm = true
when "gdbm_compat"
+ have_gdbm = true
have_library("gdbm") or return false
end
+ db_prefix ||= ""
- if !have_type("DBM", hdr, hsearch)
- return false
- end
-
- # 'libc' means ndbm is provided by libc.
- # 4.3BSD original ndbm is contained in libc.
- # 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc.
- if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
- have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch))
- return false
- end
-
- # Skip a mismatch of Berkeley DB's ndbm.h and old GDBM library.
- #
- # dbm_clearerr() should be available for any ndbm implementation.
- # It is available since the original (4.3BSD) ndbm and standardized by POSIX.
- #
- # However "can't resolve symbol 'dbm_clearerr'" problem may be caused by
- # header/library mismatch: Berkeley DB ndbm.h and GDBM library until 1.8.3.
- # GDBM (until 1.8.3) provides dbm_clearerr() as a empty macro in the header
- # and the library don't provide dbm_clearerr().
- # Berkeley DB provides dbm_clearerr() as a usual function.
- # So Berkeley DB header with GDBM library causes the problem.
- #
- if !have_func('dbm_clearerr((DBM *)0)', hdr, hsearch)
- return false
- end
-
- # Berkeley DB's ndbm.h (since 1.85 at least) defines DBM_SUFFIX.
- # Note that _DB_H_ is not defined on Mac OS X because
- # it uses Berkeley DB 1 but ndbm.h doesn't include db.h.
- have_db_header = have_macro('DBM_SUFFIX', hdr, hsearch)
-
- # Old GDBM's ndbm.h, until 1.8.3, defines dbm_clearerr as a macro which
- # expands to no tokens.
- have_gdbm_header1 = have_empty_macro_dbm_clearerr(hdr, hsearch)
-
- # Recent GDBM's ndbm.h, since 1.9, includes gdbm.h and it defines _GDBM_H_.
- # ndbm compatibility layer of GDBM is provided by libgdbm (until 1.8.0)
- # and libgdbm_compat (since 1.8.1).
- have_gdbm_header2 = have_macro('_GDBM_H_', hdr, hsearch)
-
- # 4.3BSD's ndbm.h defines _DBM_IOERR.
- # The original ndbm is provided by libc in 4.3BSD.
- have_ndbm_header = have_macro('_DBM_IOERR', hdr, hsearch)
-
- # GDBM provides ndbm functions in libgdbm_compat since GDBM 1.8.1.
- # GDBM's ndbm.h defines _GDBM_H_ since GDBM 1.9.
- # If _GDBM_H_ is defined, 'gdbm_compat' is required and reject 'gdbm'.
- if have_gdbm_header2 && db == 'gdbm'
- return false
- end
-
- if have_db_header
- $defs.push('-DRUBYDBM_DB_HEADER')
- end
-
- have_gdbm_header = have_gdbm_header1 | have_gdbm_header2
- if have_gdbm_header
- $defs.push('-DRUBYDBM_GDBM_HEADER')
- end
-
- # ndbm.h is provided by the original (4.3BSD) ndbm,
- # Berkeley DB 1 in libc of 4.4BSD and
- # ndbm compatibility layer of GDBM.
- # So, try to check header/library mismatch.
- #
- # Several (possibly historical) distributions provides libndbm.
- # It may be Berkeley DB, GDBM or 4.3BSD ndbm.
- # So mismatch check is not performed for that.
- # Note that libndbm is searched only when --with-dbm-type=ndbm is
- # given for configure.
- #
- if hdr == 'ndbm.h' && db != 'libc' && db != 'ndbm'
- if /\Adb\d?\z/ !~ db && have_db_header
- return false
- end
-
- if /\Agdbm/ !~ db && have_gdbm_header
- return false
- end
-
- if have_ndbm_header
- return false
- end
- end
-
- # Berkeley DB
- have_func('db_version((int *)0, (int *)0, (int *)0)', hdr, hsearch)
-
- # GDBM
- have_gdbm_version = have_declared_libvar("gdbm_version", hdr, hsearch)
- # gdbm_version is available since very old version (GDBM 1.5 at least).
- # However it is not declared by ndbm.h until GDBM 1.8.3.
- # We can't include both ndbm.h and gdbm.h because they both define datum type.
- # ndbm.h includes gdbm.h and gdbm_version is declared since GDBM 1.9.
- have_gdbm_version |= have_undeclared_libvar(["gdbm_version", "char *"], hdr, hsearch)
-
- # QDBM
- have_var("dpversion", hdr, hsearch)
-
- # detect mismatch between GDBM header and other library.
- # If GDBM header is included, GDBM library should be linked.
- if have_gdbm_header && !have_gdbm_version
- return false
- end
-
- # DBC type is required to disable error messages by Berkeley DB 2 or later.
- if have_db_header
- have_type("DBC", hdr, hsearch)
- end
-
- if hsearch
- $defs << hsearch
- @defs = hsearch
+ 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)}
+ have_func(db_prefix+"dbm_clearerr") unless have_gdbm
+ $defs << hsearch if hsearch
+ $defs << '-DDBM_HDR="<'+hdr+'>"'
+ true
+ else
+ false
end
- $defs << '-DDBM_HDR="<'+hdr+'>"'
- @found << hdr
-
- puts "header: #{hdr}"
- puts "library: #{db}"
-
- true
end
-if dblib.any? {|db| headers.fetch(db, ["ndbm.h"]).any? {|hdr| headers.db_check(db, hdr) } }
+if dblib.any? {|db| headers.db_check(db)}
have_header("cdefs.h")
have_header("sys/cdefs.h")
- have_func("dbm_pagfno((DBM *)0)", headers.found, headers.defs)
- have_func("dbm_dirfno((DBM *)0)", headers.found, headers.defs)
- convertible_int("datum.dsize", headers.found, headers.defs)
create_makefile("dbm")
end
diff --git a/ext/digest/.cvsignore b/ext/digest/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/digest/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/digest/bubblebabble/.cvsignore b/ext/digest/bubblebabble/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/digest/bubblebabble/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
index c92ae52cd9..e4e3173074 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -12,7 +12,7 @@
************************************************/
#include "ruby.h"
-#include "digest.h"
+#include "../digest.h"
static ID id_digest;
diff --git a/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb
index 53cb83934a..1214add293 100644
--- a/ext/digest/bubblebabble/extconf.rb
+++ b/ext/digest/bubblebabble/extconf.rb
@@ -1,6 +1,5 @@
require 'mkmf'
$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
create_makefile('digest/bubblebabble')
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 02fc12bd63..29ac36fc99 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -29,53 +29,6 @@ RUBY_EXTERN void Init_digest_base(void);
* Document-module: Digest
*
* This module provides a framework for message digest libraries.
- *
- * You may want to look at OpenSSL::Digest as it supports support more
- * algorithms.
- *
- * A cryptographic hash function is a procedure that takes data and return a
- * fixed bit string : the hash value, also known as _digest_. Hash functions
- * are also called one-way functions, it is easy to compute a digest from
- * a message, but it is infeasible to generate a message from a digest.
- *
- * == Example
- *
- * require 'digest'
- *
- * # Compute a complete digest
- * sha256 = Digest::SHA256.new
- * digest = sha256.digest message
- *
- * # Compute digest by chunks
- * sha256 = Digest::SHA256.new
- * sha256.update message1
- * sha256 << message2 # << is an alias for update
- *
- * digest = sha256.digest
- *
- * == Digest algorithms
- *
- * Different digest algorithms (or hash functions) are available :
- *
- * HMAC::
- * See FIPS PUB 198 The Keyed-Hash Message Authentication Code (HMAC)
- * RIPEMD-160::
- * (as Digest::RMD160) see
- * http://homes.esat.kuleuven.be/~bosselae/ripemd160.html
- * SHA1::
- * See FIPS 180 Secure Hash Standard
- * SHA2 family::
- * See FIPS 180 Secure Hash Standard which defines the following algorithms:
- * * SHA512
- * * SHA384
- * * SHA256
- *
- * The latest versions of the FIPS publications can be found here:
- * http://csrc.nist.gov/publications/PubsFIPS.html
- *
- * Additionally Digest::BubbleBabble encodes a digest as a sequence of
- * consonants and vowels which is more recognizable and comparable than a
- * hexadecimal digest. See http://en.wikipedia.org/wiki/Bubblebabble
*/
static VALUE
@@ -99,7 +52,7 @@ hexencode_str_new(VALUE str_digest)
rb_raise(rb_eRuntimeError, "digest string too long");
}
- str = rb_usascii_str_new(0, digest_len * 2);
+ str = rb_str_new(0, digest_len * 2);
for (i = 0, p = RSTRING_PTR(str); i < digest_len; i++) {
unsigned char byte = digest[i];
@@ -154,8 +107,6 @@ static VALUE
rb_digest_instance_update(VALUE self, VALUE str)
{
rb_digest_instance_method_unimpl(self, "update");
-
- UNREACHABLE;
}
/*
@@ -174,8 +125,6 @@ static VALUE
rb_digest_instance_finish(VALUE self)
{
rb_digest_instance_method_unimpl(self, "finish");
-
- UNREACHABLE;
}
/*
@@ -190,8 +139,6 @@ static VALUE
rb_digest_instance_reset(VALUE self)
{
rb_digest_instance_method_unimpl(self, "reset");
-
- UNREACHABLE;
}
/*
@@ -356,8 +303,7 @@ rb_digest_instance_equal(VALUE self, VALUE other)
str2 = rb_digest_instance_digest(0, 0, other);
} else {
str1 = rb_digest_instance_to_s(self);
- str2 = rb_check_string_type(other);
- if (NIL_P(str2)) return Qfalse;
+ str2 = other;
}
/* never blindly assume that subclass methods return strings */
@@ -416,8 +362,6 @@ static VALUE
rb_digest_instance_block_length(VALUE self)
{
rb_digest_instance_method_unimpl(self, "block_length");
-
- UNREACHABLE;
}
/*
@@ -471,13 +415,6 @@ rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
}
-/* :nodoc: */
-static VALUE
-rb_digest_class_init(VALUE self)
-{
- return self;
-}
-
/*
* Document-class: Digest::Base
*
@@ -492,14 +429,14 @@ get_digest_base_metadata(VALUE klass)
VALUE obj;
rb_digest_metadata_t *algo;
- for (p = klass; !NIL_P(p); p = rb_class_superclass(p)) {
+ for (p = klass; p; p = RCLASS_SUPER(p)) {
if (rb_ivar_defined(p, id_metadata)) {
obj = rb_ivar_get(p, id_metadata);
break;
}
}
- if (NIL_P(p))
+ if (!p)
rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
Data_Get_Struct(obj, rb_digest_metadata_t, algo);
@@ -685,7 +622,6 @@ Init_digest(void)
* class Digest::Class
*/
rb_cDigest_Class = rb_define_class_under(rb_mDigest, "Class", rb_cObject);
- rb_define_method(rb_cDigest_Class, "initialize", rb_digest_class_init, 0);
rb_include_module(rb_cDigest_Class, rb_mDigest_Instance);
/* class methods */
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index 4a98af2eae..857501722e 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -1,7 +1,7 @@
require 'digest.so'
module Digest
- def self.const_missing(name) # :nodoc:
+ def self.const_missing(name)
case name
when :SHA256, :SHA384, :SHA512
lib = 'digest/sha2.so'
@@ -11,7 +11,7 @@ module Digest
begin
require lib
- rescue LoadError
+ rescue LoadError => e
raise LoadError, "library not found for class Digest::#{name} -- #{lib}", caller(1)
end
unless Digest.const_defined?(name)
@@ -23,8 +23,8 @@ 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"
+ # p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest
+ # # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534"
def self.file(name)
new.file(name)
end
@@ -53,8 +53,8 @@ module Digest
# If none is given, returns the resulting hash value of the digest
# in a base64 encoded form, keeping the digest's state.
#
- # If a +string+ is given, returns the hash value for the given
- # +string+ in a base64 encoded form, resetting the digest to the
+ # If a _string_ is given, returns the hash value for the given
+ # _string_ in a base64 encoded form, resetting the digest to the
# initial state before and after the process.
#
# In either case, the return value is properly padded with '=' and
@@ -71,18 +71,6 @@ module Digest
end
end
-# call-seq:
-# Digest(name) -> digest_subclass
-#
-# Returns a Digest subclass by +name+.
-#
-# require 'digest'
-#
-# Digest("MD5")
-# # => Digest::MD5
-#
-# Digest("Foo")
-# # => LoadError: library not found for class Digest::Foo -- digest/foo
def Digest(name)
Digest.const_get(name)
end
diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
index 470b0226d4..98f98a69cf 100644
--- a/ext/digest/lib/digest/hmac.rb
+++ b/ext/digest/lib/digest/hmac.rb
@@ -1,3 +1,34 @@
+# = digest/hmac.rb
+#
+# An implementation of HMAC keyed-hashing algorithm
+#
+# == Overview
+#
+# CAUTION: Use of this library is discouraged, because this
+# implementation was meant to be experimental but somehow got into the
+# 1.9 series without being noticed. Please use OpenSSL::HMAC in the
+# "openssl" library instead.
+#
+# 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>
@@ -15,38 +46,7 @@ warn "use of the experimetal library 'digest/hmac' is discouraged; require 'open
require 'digest'
module Digest
- # = digest/hmac.rb
- #
- # An experimental implementation of HMAC keyed-hashing algorithm
- #
- # == Overview
- #
- # CAUTION: Use of this library is discouraged, because this
- # implementation was meant to be experimental but somehow got into the
- # 1.9 series without being noticed. Please use OpenSSL::HMAC in the
- # "openssl" library instead.
- #
- # == 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
- #
class HMAC < Digest::Class
-
- # Creates a Digest::HMAC instance.
-
def initialize(key, digester)
@md = digester.new
@@ -70,32 +70,23 @@ module Digest
@md.update(@ipad)
end
- def initialize_copy(other) # :nodoc:
+ def initialize_copy(other)
@md = other.instance_eval { @md.clone }
end
- # call-seq:
- # hmac.update(string) -> hmac
- # hmac << string -> hmac
- #
- # Updates the hmac using a given +string+ and returns self.
def update(text)
@md.update(text)
self
end
alias << update
- # call-seq:
- # hmac.reset -> hmac
- #
- # Resets the hmac to the initial state and returns self.
def reset
@md.reset
@md.update(@ipad)
self
end
- def finish # :nodoc:
+ def finish
d = @md.digest!
@md.update(@opad)
@md.update(d)
@@ -103,26 +94,14 @@ module Digest
end
private :finish
- # call-seq:
- # hmac.digest_length -> Integer
- #
- # Returns the length in bytes of the hash value of the digest.
def digest_length
@md.digest_length
end
- # call-seq:
- # hmac.block_length -> Integer
- #
- # Returns the block length in bytes of the hmac.
def block_length
@md.block_length
end
- # call-seq:
- # hmac.inspect -> string
- #
- # Creates a printable version of the hmac object.
def inspect
sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
end
diff --git a/ext/digest/md5/.cvsignore b/ext/digest/md5/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/digest/md5/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index 5a57fd3eea..43a663ca2e 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -1,20 +1,16 @@
-# -*- coding: us-ascii -*-
# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
# $Id$
require "mkmf"
$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "md5init.#{$OBJEXT}" ]
dir_config("openssl")
-pkg_config("openssl")
-require File.expand_path('../../../openssl/deprecation', __FILE__)
if !with_config("bundled-md5") &&
- have_library("crypto") && OpenSSL.check_func("MD5_Transform", "openssl/md5.h")
+ have_library("crypto") && have_header("openssl/md5.h")
$objs << "md5ossl.#{$OBJEXT}"
else
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index f4580ef5e7..91118a8adf 100644
--- a/ext/digest/md5/md5.h
+++ b/ext/digest/md5/md5.h
@@ -46,7 +46,7 @@
#ifndef MD5_INCLUDED
# define MD5_INCLUDED
-#include "defs.h"
+#include "../defs.h"
/*
* This code has some adaptations for the Ghostscript environment, but it
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 3591782f6e..190d7d049f 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,7 +1,7 @@
/* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
/* $Id$ */
-#include "digest.h"
+#include "../digest.h"
#if defined(HAVE_OPENSSL_MD5_H)
#include "md5ossl.h"
#else
@@ -30,9 +30,6 @@ Init_md5()
rb_require("digest");
-#if 0
- mDigest = rb_define_module("Digest"); /* let rdoc know */
-#endif
mDigest = rb_path2class("Digest");
cDigest_Base = rb_path2class("Digest::Base");
diff --git a/ext/digest/rmd160/.cvsignore b/ext/digest/rmd160/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/digest/rmd160/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index d487d6da80..4af4f156c3 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -1,20 +1,16 @@
-# -*- coding: us-ascii -*-
# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
# $Id$
require "mkmf"
$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "rmd160init.#{$OBJEXT}" ]
dir_config("openssl")
-pkg_config("openssl")
-require File.expand_path('../../../openssl/deprecation', __FILE__)
if !with_config("bundled-rmd160") &&
- have_library("crypto") && OpenSSL.check_func("RMD160_Transform", "openssl/ripemd.h")
+ have_library("crypto") && have_header("openssl/ripemd.h")
$objs << "rmd160ossl.#{$OBJEXT}"
else
$objs << "rmd160.#{$OBJEXT}"
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
index bac77833b1..88918728cd 100644
--- a/ext/digest/rmd160/rmd160.c
+++ b/ext/digest/rmd160/rmd160.c
@@ -362,20 +362,16 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
_DIAGASSERT(data != NULL);
/* update length[] */
-#if SIZEOF_SIZE_T * CHAR_BIT > 32
- context->length[1] += (uint32_t)((context->length[0] + nbytes) >> 32);
-#else
if (context->length[0] + nbytes < context->length[0])
context->length[1]++; /* overflow to msb of length */
-#endif
- context->length[0] += (uint32_t)nbytes;
+ context->length[0] += nbytes;
(void)memset(X, 0, sizeof(X));
if ( context->buflen + nbytes < 64 )
{
(void)memcpy(context->bbuffer + context->buflen, data, nbytes);
- context->buflen += (uint32_t)nbytes;
+ context->buflen += nbytes;
}
else
{
@@ -405,7 +401,7 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
/*
* Put last bytes from data into context's buffer
*/
- context->buflen = (uint32_t)nbytes & 63;
+ context->buflen = nbytes & 63;
memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
}
}
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 2c98f11cd0..cbfd0ab998 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -26,7 +26,7 @@
#ifndef _RMD160_H_
#define _RMD160_H_
-#include "defs.h"
+#include "../defs.h"
typedef struct {
uint32_t state[5]; /* state (ABCDE) */
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index c214ca9f33..c02be3dd0e 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -1,7 +1,7 @@
/* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
/* $Id$ */
-#include "digest.h"
+#include "../digest.h"
#if defined(HAVE_OPENSSL_RIPEMD_H)
#include "rmd160ossl.h"
#else
@@ -30,9 +30,6 @@ Init_rmd160()
rb_require("digest");
-#if 0
- mDigest = rb_define_module("Digest"); /* let rdoc know */
-#endif
mDigest = rb_path2class("Digest");
cDigest_Base = rb_path2class("Digest::Base");
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index f24e63e3d8..bbfff8bbe2 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -1,6 +1,6 @@
/* $Id$ */
-#include "defs.h"
+#include "../defs.h"
#include "rmd160ossl.h"
void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
diff --git a/ext/digest/sha1/.cvsignore b/ext/digest/sha1/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/digest/sha1/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index d7e52fe731..810f1515b5 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -1,20 +1,16 @@
-# -*- coding: us-ascii -*-
# $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
# $Id$
require "mkmf"
$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "sha1init.#{$OBJEXT}" ]
dir_config("openssl")
-pkg_config("openssl")
-require File.expand_path('../../../openssl/deprecation', __FILE__)
if !with_config("bundled-sha1") &&
- have_library("crypto") && OpenSSL.check_func("SHA1_Transform", "openssl/sha.h")
+ have_library("crypto") && have_header("openssl/sha.h")
$objs << "sha1ossl.#{$OBJEXT}"
else
$objs << "sha1.#{$OBJEXT}"
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 55997e73dd..c196a3d9fe 100644
--- a/ext/digest/sha1/sha1.h
+++ b/ext/digest/sha1/sha1.h
@@ -11,7 +11,7 @@
#ifndef _SYS_SHA1_H_
#define _SYS_SHA1_H_
-#include "defs.h"
+#include "../defs.h"
typedef struct {
uint32_t state[5];
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index d52eef58b3..4c3f26b9e8 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -1,7 +1,7 @@
/* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
/* $Id$ */
-#include "digest.h"
+#include "../digest.h"
#if defined(HAVE_OPENSSL_SHA_H)
#include "sha1ossl.h"
#else
@@ -30,9 +30,6 @@ Init_sha1()
rb_require("digest");
-#if 0
- mDigest = rb_define_module("Digest"); /* let rdoc know */
-#endif
mDigest = rb_path2class("Digest");
cDigest_Base = rb_path2class("Digest::Base");
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
index 452cf35084..0fcb2d6b1e 100644
--- a/ext/digest/sha1/sha1ossl.c
+++ b/ext/digest/sha1/sha1ossl.c
@@ -1,6 +1,6 @@
/* $Id$ */
-#include "defs.h"
+#include "../defs.h"
#include "sha1ossl.h"
void
diff --git a/ext/digest/sha2/.cvsignore b/ext/digest/sha2/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/digest/sha2/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index 5ab2d35af5..503880f13c 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -1,21 +1,17 @@
-# -*- coding: us-ascii -*-
# $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
# $Id$
require "mkmf"
$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "sha2init.#{$OBJEXT}" ]
dir_config("openssl")
-pkg_config("openssl")
-require File.expand_path('../../../openssl/deprecation', __FILE__)
if !with_config("bundled-sha2") &&
have_library("crypto") &&
- %w[SHA256 SHA512].all? {|d| OpenSSL.check_func("#{d}_Transform", "openssl/sha.h")} &&
+ %w[SHA256 SHA512].all? {|d| have_func("#{d}_Transform", "openssl/sha.h")} &&
%w[SHA256 SHA512].all? {|d| have_type("#{d}_CTX", "openssl/sha.h")}
$objs << "sha2ossl.#{$OBJEXT}"
$defs << "-DSHA2_USE_OPENSSL"
@@ -28,6 +24,4 @@ have_header("sys/cdefs.h")
$preload = %w[digest]
-if have_type("uint64_t", "defs.h", $defs.join(' '))
- create_makefile("digest/sha2")
-end
+create_makefile("digest/sha2")
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 58d12e9b09..b8e4609478 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -18,11 +18,9 @@ module Digest
#
class SHA2 < Digest::Class
# call-seq:
- # Digest::SHA2.new(bitlen = 256) -> digest_obj
+ # Digest::SHA2.new(bitlen = 256) -> digest_obj
#
# Creates a new SHA2 hash object with a given bit length.
- #
- # Valid bit lengths are 256, 384 and 512.
def initialize(bitlen = 256)
case bitlen
when 256
@@ -37,70 +35,39 @@ module Digest
@bitlen = bitlen
end
- # call-seq:
- # digest_obj.reset -> digest_obj
- #
- # Resets the digest to the initial state and returns self.
+ # :nodoc:
def reset
@sha2.reset
self
end
- # call-seq:
- # digest_obj.update(string) -> digest_obj
- # digest_obj << string -> digest_obj
- #
- # Updates the digest using a given _string_ and returns self.
+ # :nodoc:
def update(str)
@sha2.update(str)
self
end
alias << update
- def finish # :nodoc:
+ def finish
@sha2.digest!
end
private :finish
-
- # call-seq:
- # digest_obj.block_length -> Integer
- #
- # Returns the block length of the digest in bytes.
- #
- # Digest::SHA256.new.block_length * 8
- # # => 512
- # Digest::SHA384.new.block_length * 8
- # # => 1024
- # Digest::SHA512.new.block_length * 8
- # # => 1024
def block_length
@sha2.block_length
end
- # call-seq:
- # digest_obj.digest_length -> Integer
- #
- # Returns the length of the hash value of the digest in bytes.
- #
- # Digest::SHA256.new.digest_length * 8
- # # => 256
- # Digest::SHA384.new.digest_length * 8
- # # => 384
- # Digest::SHA512.new.digest_length * 8
- # # => 512
- #
- # For example, digests produced by Digest::SHA256 will always be 32 bytes
- # (256 bits) in size.
def digest_length
@sha2.digest_length
end
- def initialize_copy(other) # :nodoc:
+ # :nodoc:
+ def initialize_copy(other)
@sha2 = other.instance_eval { @sha2.clone }
end
- def inspect # :nodoc:
+ # :nodoc:
+ def inspect
"#<%s:%d %s>" % [self.class.name, @bitlen, hexdigest]
end
end
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
index 0fe64489ab..650442d72d 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -34,7 +34,7 @@
* $Id$
*/
-#include "defs.h"
+#include "../defs.h"
#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
#include <assert.h> /* assert() */
#include "sha2.h"
@@ -138,7 +138,7 @@ typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
#define REVERSE32(w,x) { \
sha2_word32 tmp = (w); \
tmp = (tmp >> 16) | (tmp << 16); \
- (x) = ((tmp & (sha2_word32)0xff00ff00UL) >> 8) | ((tmp & (sha2_word32)0x00ff00ffUL) << 8); \
+ (x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
}
#define REVERSE64(w,x) { \
sha2_word64 tmp = (w); \
@@ -559,8 +559,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 */
- MEMCPY_BCOPY(context->buffer, data, SHA256_BLOCK_LENGTH);
- SHA256_Transform(context, (sha2_word32*)context->buffer);
+ SHA256_Transform(context, (sha2_word32*)data);
context->bitcount += SHA256_BLOCK_LENGTH << 3;
len -= SHA256_BLOCK_LENGTH;
data += SHA256_BLOCK_LENGTH;
@@ -633,7 +632,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
}
/* Clean up state data: */
- MEMSET_BZERO(context, sizeof(*context));
+ MEMSET_BZERO(context, sizeof(context));
usedspace = 0;
}
@@ -653,7 +652,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) {
}
*buffer = (char)0;
} else {
- MEMSET_BZERO(context, sizeof(*context));
+ MEMSET_BZERO(context, sizeof(context));
}
MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
return buffer;
@@ -881,8 +880,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 */
- MEMCPY_BCOPY(context->buffer, data, SHA512_BLOCK_LENGTH);
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ SHA512_Transform(context, (sha2_word64*)data);
ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
len -= SHA512_BLOCK_LENGTH;
data += SHA512_BLOCK_LENGTH;
@@ -963,7 +961,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
}
/* Zero out state data */
- MEMSET_BZERO(context, sizeof(*context));
+ MEMSET_BZERO(context, sizeof(context));
}
char *SHA512_End(SHA512_CTX* context, char buffer[]) {
@@ -982,7 +980,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) {
}
*buffer = (char)0;
} else {
- MEMSET_BZERO(context, sizeof(*context));
+ MEMSET_BZERO(context, sizeof(context));
}
MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
return buffer;
@@ -1037,7 +1035,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
}
/* Zero out state data */
- MEMSET_BZERO(context, sizeof(*context));
+ MEMSET_BZERO(context, sizeof(context));
}
char *SHA384_End(SHA384_CTX* context, char buffer[]) {
@@ -1056,7 +1054,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) {
}
*buffer = (char)0;
} else {
- MEMSET_BZERO(context, sizeof(*context));
+ MEMSET_BZERO(context, sizeof(context));
}
MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
return buffer;
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 13df4bcb78..2e6a61a09f 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -1,7 +1,7 @@
/* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
/* $Id$ */
-#include "digest.h"
+#include "../digest.h"
#if defined(SHA2_USE_OPENSSL)
#include "sha2ossl.h"
#else
diff --git a/ext/digest/sha2/sha2ossl.c b/ext/digest/sha2/sha2ossl.c
index 34353be8b8..1316d93759 100644
--- a/ext/digest/sha2/sha2ossl.c
+++ b/ext/digest/sha2/sha2ossl.c
@@ -1,12 +1,10 @@
-#include "defs.h"
+#include "../defs.h"
#include "sha2ossl.h"
#define SHA_Finish(bit) \
void SHA##bit##_Finish(SHA##bit##_CTX *ctx, char *buf) \
{ SHA##bit##_Final((unsigned char *)buf, ctx);}
-#ifndef __DragonFly__
#define SHA384_Final SHA512_Final
-#endif
SHA_Finish(256)
SHA_Finish(384)
diff --git a/ext/dl/.cvsignore b/ext/dl/.cvsignore
new file mode 100644
index 0000000000..6c0b25a1c5
--- /dev/null
+++ b/ext/dl/.cvsignore
@@ -0,0 +1,10 @@
+Makefile
+mkmf.log
+dlconfig.h
+dlconfig.rb
+callback.h
+*.func
+*.o
+*~
+*.def
+extconf.h
diff --git a/ext/dl/callback/mkcallback.rb b/ext/dl/callback/mkcallback.rb
index e94a196247..d2f9e3f2e1 100644
--- a/ext/dl/callback/mkcallback.rb
+++ b/ext/dl/callback/mkcallback.rb
@@ -121,24 +121,20 @@ def foreach_proc_entry
end
def gencallback(ty, calltype, proc_entry, argc, n)
- dltype = DLTYPE[ty]
- ret = dltype[:conv]
- src = <<-EOS
+ <<-EOS
#{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""}
-static #{dltype[:type]}
-FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack#{i}"}.join(", ")})
+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 ? "ret, " : ""}cb#{argc > 0 ? ", args[#{argc}]" : ""};
+ VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""};
#{
(0...argc).collect{|i|
- "\n args[#{i}] = PTR2NUM(stack#{i});"
- }.join("")
+ " args[%d] = LONG2NUM(stack%d);" % [i,i]
+ }.join("\n")
}
cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
- #{ret ? "ret = " : ""}rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
- EOS
- src << " return #{ret % "ret"};\n" if ret
- src << <<-EOS
+ 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
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
index 2a96b30bed..6a42dcd79e 100644
--- a/ext/dl/cfunc.c
+++ b/ext/dl/cfunc.c
@@ -2,11 +2,12 @@
* $Id$
*/
-#include <ruby/ruby.h>
-#include <ruby/util.h>
+#include <ruby.h>
#include <errno.h>
#include "dl.h"
+VALUE rb_big2ulong_pack(VALUE x);
+
VALUE rb_cDLCFunc;
static ID id_last_error;
@@ -42,14 +43,6 @@ rb_dl_set_win32_last_error(VALUE self, VALUE val)
}
#endif
-static void
-dlcfunc_mark(void *ptr)
-{
- struct cfunc_data *data = ptr;
- if (data->wrap) {
- rb_gc_mark(data->wrap);
- }
-}
static void
dlcfunc_free(void *ptr)
@@ -77,7 +70,7 @@ dlcfunc_memsize(const void *ptr)
const rb_data_type_t dlcfunc_data_type = {
"dl/cfunc",
- {dlcfunc_mark, dlcfunc_free, dlcfunc_memsize,},
+ 0, dlcfunc_free, dlcfunc_memsize,
};
VALUE
@@ -152,15 +145,14 @@ rb_dlcfunc_kind_p(VALUE func)
static VALUE
rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
{
- VALUE addr, name, type, calltype, addrnum;
+ VALUE addr, name, type, calltype;
struct cfunc_data *data;
void *saddr;
const char *sname;
rb_scan_args(argc, argv, "13", &addr, &type, &name, &calltype);
- addrnum = rb_Integer(addr);
- saddr = (void*)(NUM2PTR(addrnum));
+ saddr = (void*)(NUM2PTR(rb_Integer(addr)));
sname = NIL_P(name) ? NULL : StringValuePtr(name);
TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, data);
@@ -169,7 +161,6 @@ rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
data->name = sname ? strdup(sname) : 0;
data->type = NIL_P(type) ? DLTYPE_VOID : NUM2INT(type);
data->calltype = NIL_P(calltype) ? CFUNC_CDECL : SYM2ID(calltype);
- data->wrap = (addrnum == addr) ? 0 : addr;
return Qnil;
}
@@ -309,10 +300,10 @@ rb_dlcfunc_inspect(VALUE self)
# define DECL_FUNC_CDECL(f,ret,args,val) \
- ret (FUNC_CDECL(*(f)))(args) = (ret (FUNC_CDECL(*))(args))(VALUE)(val)
+ ret (FUNC_CDECL(*f))(args) = (ret (FUNC_CDECL(*))(args))(VALUE)(val)
#ifdef FUNC_STDCALL
# define DECL_FUNC_STDCALL(f,ret,args,val) \
- ret (FUNC_STDCALL(*(f)))(args) = (ret (FUNC_STDCALL(*))(args))(VALUE)(val)
+ ret (FUNC_STDCALL(*f))(args) = (ret (FUNC_STDCALL(*))(args))(VALUE)(val)
#endif
#define CALL_CASE switch( RARRAY_LEN(ary) ){ \
@@ -325,7 +316,7 @@ rb_dlcfunc_inspect(VALUE self)
}
-#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER >= 1400 && _MSC_VER < 1600
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
# pragma optimize("", off)
#endif
/*
@@ -367,11 +358,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
stack[i] = (DLSTACK_TYPE)FIX2LONG(arg);
}
else if (RB_TYPE_P(arg, T_BIGNUM)) {
-#if SIZEOF_VOIDP == SIZEOF_LONG
stack[i] = (DLSTACK_TYPE)rb_big2ulong_pack(arg);
-#else
- stack[i] = (DLSTACK_TYPE)rb_big2ull(arg);
-#endif
}
else {
Check_Type(arg, T_FIXNUM);
@@ -581,15 +568,13 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
}
#endif
else{
- const char *name = rb_id2name(cfunc->calltype);
- if( name ){
- rb_raise(rb_eDLError, "unsupported call type: %s",
- name);
- }
- else{
- rb_raise(rb_eDLError, "unsupported call type: %"PRIxVALUE,
- cfunc->calltype);
- }
+ 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));
@@ -599,7 +584,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
return result;
}
-#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER >= 1400 && _MSC_VER < 1600
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
# pragma optimize("", on)
#endif
@@ -625,38 +610,10 @@ Init_dlcfunc(void)
#if defined(_WIN32)
id_win32_last_error = rb_intern("__DL2_WIN32_LAST_ERROR__");
#endif
-
- /*
- * Document-class: DL::CFunc
- *
- * A direct accessor to a function in a C library
- *
- * == Example
- *
- * libc_so = "/lib64/libc.so.6"
- * => "/lib64/libc.so.6"
- * libc = DL::dlopen(libc_so)
- * => #<DL::Handle:0x00000000e05b00>
- * @cfunc = DL::CFunc.new(libc,['strcpy'], DL::TYPE_VOIDP, 'strcpy')
- * => #<DL::CFunc:0x000000012daec0 ptr=0x007f62ca5a8300 type=1 name='strcpy'>
- *
- */
rb_cDLCFunc = rb_define_class_under(rb_mDL, "CFunc", rb_cObject);
rb_define_alloc_func(rb_cDLCFunc, rb_dlcfunc_s_allocate);
-
- /*
- * Document-method: last_error
- *
- * Returns the last error for the current executing thread
- */
rb_define_module_function(rb_cDLCFunc, "last_error", rb_dl_get_last_error, 0);
#if defined(_WIN32)
-
- /*
- * Document-method: win32_last_error
- *
- * Returns the last win32 error for the current executing thread
- */
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);
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index b315a46186..bafbc48be6 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -10,37 +10,20 @@
VALUE rb_cDLCPtr;
static inline freefunc_t
-get_freefunc(VALUE func, volatile VALUE *wrap)
+get_freefunc(VALUE func)
{
- VALUE addrnum;
if (NIL_P(func)) {
- *wrap = 0;
return NULL;
}
if (rb_dlcfunc_kind_p(func)) {
- *wrap = func;
return (freefunc_t)(VALUE)RCFUNC_DATA(func)->ptr;
}
- addrnum = rb_Integer(func);
- *wrap = (addrnum != func) ? func : 0;
- return (freefunc_t)(VALUE)NUM2PTR(addrnum);
+ return (freefunc_t)(VALUE)NUM2PTR(rb_Integer(func));
}
static ID id_to_ptr;
static void
-dlptr_mark(void *ptr)
-{
- struct ptr_data *data = ptr;
- if (data->wrap[0]) {
- rb_gc_mark(data->wrap[0]);
- }
- if (data->wrap[1]) {
- rb_gc_mark(data->wrap[1]);
- }
-}
-
-static void
dlptr_free(void *ptr)
{
struct ptr_data *data = ptr;
@@ -49,7 +32,6 @@ dlptr_free(void *ptr)
(*(data->free))(data->ptr);
}
}
- xfree(ptr);
}
static size_t
@@ -61,9 +43,18 @@ dlptr_memsize(const void *ptr)
static const rb_data_type_t dlptr_data_type = {
"dl/ptr",
- {dlptr_mark, dlptr_free, dlptr_memsize,},
+ 0, dlptr_free, dlptr_memsize,
};
+void
+dlptr_init(VALUE val)
+{
+ struct ptr_data *data;
+
+ TypedData_Get_Struct(val, struct ptr_data, &dlptr_data_type, data);
+ OBJ_TAINT(val);
+}
+
VALUE
rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
{
@@ -75,7 +66,7 @@ rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
data->ptr = ptr;
data->free = func;
data->size = size;
- OBJ_TAINT(val);
+ dlptr_init(val);
return val;
}
@@ -144,22 +135,27 @@ rb_dlptr_s_allocate(VALUE klass)
static VALUE
rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
{
- VALUE ptr, sym, size, wrap = 0, funcwrap = 0;
+ VALUE ptr, sym, size;
struct ptr_data *data;
void *p = NULL;
freefunc_t f = NULL;
long s = 0;
- if (rb_scan_args(argc, argv, "12", &ptr, &size, &sym) >= 1) {
- VALUE addrnum = rb_Integer(ptr);
- if (addrnum != ptr) wrap = ptr;
- p = NUM2PTR(addrnum);
- }
- if (argc >= 2) {
+ 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);
- }
- if (argc >= 3) {
- f = get_freefunc(sym, &funcwrap);
+ 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) {
@@ -168,8 +164,6 @@ rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
/* Free previous memory. Use of inappropriate initialize may cause SEGV. */
(*(data->free))(data->ptr);
}
- data->wrap[0] = wrap;
- data->wrap[1] = funcwrap;
data->ptr = p;
data->size = s;
data->free = f;
@@ -191,7 +185,7 @@ rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
static VALUE
rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
{
- VALUE size, sym, obj, wrap = 0;
+ VALUE size, sym, obj;
long s;
freefunc_t f;
@@ -202,14 +196,13 @@ rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
break;
case 2:
s = NUM2LONG(size);
- f = get_freefunc(sym, &wrap);
+ f = get_freefunc(sym);
break;
default:
rb_bug("rb_dlptr_s_malloc");
}
obj = rb_dlptr_malloc(s,f);
- if (wrap) RPTR_DATA(obj)->wrap[1] = wrap;
return obj;
}
@@ -296,7 +289,7 @@ rb_dlptr_free_set(VALUE self, VALUE val)
struct ptr_data *data;
TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
- data->free = get_freefunc(val, &data->wrap[1]);
+ data->free = get_freefunc(val);
return Qnil;
}
@@ -392,10 +385,12 @@ static VALUE
rb_dlptr_inspect(VALUE self)
{
struct ptr_data *data;
+ char str[1024];
TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
- return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
- rb_obj_class(self), data, data->ptr, data->size, data->free);
+ 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);
}
/*
@@ -492,19 +487,16 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
VALUE arg0, arg1;
VALUE retval = Qnil;
size_t offset, len;
- struct ptr_data *data;
- TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
- if (!data->ptr) rb_raise(rb_eDLError, "NULL pointer dereference");
switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
case 1:
offset = NUM2ULONG(arg0);
- retval = INT2NUM(*((char *)data->ptr + offset));
+ retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
break;
case 2:
offset = NUM2ULONG(arg0);
len = NUM2ULONG(arg1);
- retval = rb_tainted_str_new((char *)data->ptr + offset, len);
+ retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
break;
default:
rb_bug("rb_dlptr_aref()");
@@ -528,20 +520,17 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
VALUE retval = Qnil;
size_t offset, len;
void *mem;
- struct ptr_data *data;
- TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
- if (!data->ptr) rb_raise(rb_eDLError, "NULL pointer dereference");
switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
case 2:
offset = NUM2ULONG(arg0);
- ((char*)data->ptr)[offset] = NUM2UINT(arg1);
+ ((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
retval = arg1;
break;
case 3:
offset = NUM2ULONG(arg0);
len = NUM2ULONG(arg1);
- if (RB_TYPE_P(arg2, T_STRING)) {
+ if( TYPE(arg2) == T_STRING ){
mem = StringValuePtr(arg2);
}
else if( rb_obj_is_kind_of(arg2, rb_cDLCPtr) ){
@@ -550,7 +539,7 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
else{
mem = NUM2PTR(arg2);
}
- memcpy((char *)data->ptr + offset, mem, len);
+ memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
retval = arg2;
break;
default:
@@ -593,7 +582,7 @@ rb_dlptr_size_get(VALUE self)
static VALUE
rb_dlptr_s_to_ptr(VALUE self, VALUE val)
{
- VALUE ptr, wrap = val, vptr;
+ VALUE ptr;
if (RTEST(rb_obj_is_kind_of(val, rb_cIO))){
rb_io_t *fptr;
@@ -606,22 +595,20 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
char *str = StringValuePtr(val);
ptr = rb_dlptr_new(str, RSTRING_LEN(val), NULL);
}
- else if ((vptr = rb_check_funcall(val, id_to_ptr, 0, 0)) != Qundef){
+ 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;
- wrap = 0;
}
else{
rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
}
}
else{
- VALUE num = rb_Integer(val);
- if (num == val) wrap = 0;
- ptr = rb_dlptr_new(NUM2PTR(num), 0, NULL);
+ ptr = rb_dlptr_new(NUM2PTR(rb_Integer(val)), 0, NULL);
}
OBJ_INFECT(ptr, val);
- if (wrap) RPTR_DATA(ptr)->wrap[0] = wrap;
+ rb_iv_set(ptr, "wrapping", val);
return ptr;
}
@@ -630,11 +617,6 @@ Init_dlptr(void)
{
id_to_ptr = rb_intern("to_ptr");
- /* Document-class: DL::CPtr
- *
- * CPtr is a class to handle C pointers
- *
- */
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);
@@ -664,9 +646,5 @@ Init_dlptr(void)
rb_define_method(rb_cDLCPtr, "size", rb_dlptr_size_get, 0);
rb_define_method(rb_cDLCPtr, "size=", rb_dlptr_size_set, 1);
- /* Document-const: NULL
- *
- * A NULL pointer
- */
rb_define_const(rb_mDL, "NULL", rb_dlptr_new(0, 0, 0));
}
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 49fa7c81ac..9635794883 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,10 +1,3 @@
-/*
- * ext/dl/dl.c
- *
- * doumentation:
- * - Vincent Batts (vbatts@hashbangbash.com)
- *
- */
#include <ruby/ruby.h>
#include <ruby/io.h>
#include <ctype.h>
@@ -17,53 +10,6 @@ VALUE rb_eDLTypeError;
ID rbdl_id_cdecl;
ID rbdl_id_stdcall;
-#ifndef DLTYPE_SSIZE_T
-# if SIZEOF_SIZE_T == SIZEOF_INT
-# define DLTYPE_SSIZE_T DLTYPE_INT
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define DLTYPE_SSIZE_T DLTYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-# define DLTYPE_SSIZE_T DLTYPE_LONG_LONG
-# endif
-#endif
-#define DLTYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*DLTYPE_SSIZE_T)
-
-#ifndef DLTYPE_PTRDIFF_T
-# if SIZEOF_PTRDIFF_T == SIZEOF_INT
-# define DLTYPE_PTRDIFF_T DLTYPE_INT
-# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-# define DLTYPE_PTRDIFF_T DLTYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
-# define DLTYPE_PTRDIFF_T DLTYPE_LONG_LONG
-# endif
-#endif
-
-#ifndef DLTYPE_INTPTR_T
-# if SIZEOF_INTPTR_T == SIZEOF_INT
-# define DLTYPE_INTPTR_T DLTYPE_INT
-# elif SIZEOF_INTPTR_T == SIZEOF_LONG
-# define DLTYPE_INTPTR_T DLTYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
-# define DLTYPE_INTPTR_T DLTYPE_LONG_LONG
-# endif
-#endif
-#define DLTYPE_UINTPTR_T (-DLTYPE_INTPTR_T)
-
-/*
- * call-seq: DL.dlopen(so_lib)
- *
- * An interface to the dynamic linking loader
- *
- * This is a shortcut to DL::Handle.new and takes the same arguments.
- *
- * Example:
- *
- * libc_so = "/lib64/libc.so.6"
- * => "/lib64/libc.so.6"
- *
- * libc = DL.dlopen(libc_so)
- * => #<DL::Handle:0x00000000e05b00>
- */
VALUE
rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
{
@@ -71,7 +17,7 @@ rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
}
/*
- * call-seq: DL.malloc(size)
+ * call-seq: DL.malloc
*
* Allocate +size+ bytes of memory and return the integer memory address
* for the allocated memory.
@@ -118,22 +64,6 @@ rb_dl_free(VALUE self, VALUE addr)
return Qnil;
}
-/*
- * call-seq: DL.dlunwrap(addr)
- *
- * Returns the hexadecimal representation of a memory pointer address +addr+
- *
- * Example:
- *
- * lib = DL.dlopen('/lib64/libc-2.15.so')
- * => #<DL::Handle:0x00000001342460>
- *
- * lib['strcpy'].to_s(16)
- * => "7f59de6dd240"
- *
- * DL.dlunwrap(DL.dlwrap(lib['strcpy'].to_s(16)))
- * => "7f59de6dd240"
- */
VALUE
rb_dl_ptr2value(VALUE self, VALUE addr)
{
@@ -141,19 +71,6 @@ rb_dl_ptr2value(VALUE self, VALUE addr)
return (VALUE)NUM2PTR(addr);
}
-/*
- * call-seq: DL.dlwrap(val)
- *
- * Returns a memory pointer of a function's hexadecimal address location +val+
- *
- * Example:
- *
- * lib = DL.dlopen('/lib64/libc-2.15.so')
- * => #<DL::Handle:0x00000001342460>
- *
- * DL.dlwrap(lib['strcpy'].to_s(16))
- * => 25522520
- */
VALUE
rb_dl_value2ptr(VALUE self, VALUE val)
{
@@ -183,360 +100,53 @@ Init_dl(void)
rbdl_id_cdecl = rb_intern_const("cdecl");
rbdl_id_stdcall = rb_intern_const("stdcall");
- /* Document-module: DL
- *
- * A bridge to the dlopen() or dynamic library linker function.
- *
- * == Example
- *
- * bash $> cat > sum.c <<EOF
- * double sum(double *arry, int len)
- * {
- * double ret = 0;
- * int i;
- * for(i = 0; i < len; i++){
- * ret = ret + arry[i];
- * }
- * return ret;
- * }
- *
- * double split(double num)
- * {
- * double ret = 0;
- * ret = num / 2;
- * return ret;
- * }
- * EOF
- * bash $> gcc -o libsum.so -shared sum.c
- * bash $> cat > sum.rb <<EOF
- * require 'dl'
- * require 'dl/import'
- *
- * module LibSum
- * extend DL::Importer
- * dlload './libsum.so'
- * extern 'double sum(double*, int)'
- * extern 'double split(double)'
- * end
- *
- * a = [2.0, 3.0, 4.0]
- *
- * sum = LibSum.sum(a.pack("d*"), a.count)
- * p LibSum.split(sum)
- * EOF
- * bash $> ruby sum.rb
- * 4.5
- *
- * WIN! :-)
- */
rb_mDL = rb_define_module("DL");
-
- /*
- * Document-class: DL::DLError
- *
- * standard dynamic load exception
- */
rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
-
- /*
- * Document-class: DL::DLTypeError
- *
- * dynamic load incorrect type exception
- */
rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
- /* Document-const: MAX_CALLBACK
- *
- * Maximum number of callbacks
- */
rb_define_const(rb_mDL, "MAX_CALLBACK", INT2NUM(MAX_CALLBACK));
-
- /* Document-const: DLSTACK_SIZE
- *
- * Dynamic linker stack size
- */
rb_define_const(rb_mDL, "DLSTACK_SIZE", INT2NUM(DLSTACK_SIZE));
rb_dl_init_callbacks(rb_mDL);
- /* Document-const: RTLD_GLOBAL
- *
- * rtld DL::Handle flag.
- *
- * The symbols defined by this library will be made available for symbol
- * resolution of subsequently loaded libraries.
- */
rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
-
- /* Document-const: RTLD_LAZY
- *
- * rtld DL::Handle flag.
- *
- * Perform lazy binding. Only resolve symbols as the code that references
- * them is executed. If the symbol is never referenced, then it is never
- * resolved. (Lazy binding is only performed for function references;
- * references to variables are always immediately bound when the library
- * is loaded.)
- */
rb_define_const(rb_mDL, "RTLD_LAZY", INT2NUM(RTLD_LAZY));
-
- /* Document-const: RTLD_NOW
- *
- * rtld DL::Handle flag.
- *
- * If this value is specified or the environment variable LD_BIND_NOW is
- * set to a nonempty string, all undefined symbols in the library are
- * resolved before dlopen() returns. If this cannot be done an error is
- * returned.
- */
rb_define_const(rb_mDL, "RTLD_NOW", INT2NUM(RTLD_NOW));
- /* Document-const: TYPE_VOID
- *
- * DL::CFunc type - void
- */
rb_define_const(rb_mDL, "TYPE_VOID", INT2NUM(DLTYPE_VOID));
-
- /* Document-const: TYPE_VOIDP
- *
- * DL::CFunc type - void*
- */
rb_define_const(rb_mDL, "TYPE_VOIDP", INT2NUM(DLTYPE_VOIDP));
-
- /* Document-const: TYPE_CHAR
- *
- * DL::CFunc type - char
- */
rb_define_const(rb_mDL, "TYPE_CHAR", INT2NUM(DLTYPE_CHAR));
-
- /* Document-const: TYPE_SHORT
- *
- * DL::CFunc type - short
- */
rb_define_const(rb_mDL, "TYPE_SHORT", INT2NUM(DLTYPE_SHORT));
-
- /* Document-const: TYPE_INT
- *
- * DL::CFunc type - int
- */
rb_define_const(rb_mDL, "TYPE_INT", INT2NUM(DLTYPE_INT));
-
- /* Document-const: TYPE_LONG
- *
- * DL::CFunc type - long
- */
rb_define_const(rb_mDL, "TYPE_LONG", INT2NUM(DLTYPE_LONG));
-
#if HAVE_LONG_LONG
- /* Document-const: TYPE_LONG_LONG
- *
- * DL::CFunc type - long long
- */
rb_define_const(rb_mDL, "TYPE_LONG_LONG", INT2NUM(DLTYPE_LONG_LONG));
#endif
-
- /* Document-const: TYPE_FLOAT
- *
- * DL::CFunc type - float
- */
rb_define_const(rb_mDL, "TYPE_FLOAT", INT2NUM(DLTYPE_FLOAT));
-
- /* Document-const: TYPE_DOUBLE
- *
- * DL::CFunc type - double
- */
rb_define_const(rb_mDL, "TYPE_DOUBLE", INT2NUM(DLTYPE_DOUBLE));
- /* Document-const: TYPE_SIZE_T
- *
- * DL::CFunc type - size_t
- */
- rb_define_const(rb_mDL, "TYPE_SIZE_T", INT2NUM(DLTYPE_SIZE_T));
-
- /* Document-const: TYPE_SSIZE_T
- *
- * DL::CFunc type - ssize_t
- */
- rb_define_const(rb_mDL, "TYPE_SSIZE_T", INT2NUM(DLTYPE_SSIZE_T));
-
- /* Document-const: TYPE_PTRDIFF_T
- *
- * DL::CFunc type - ptrdiff_t
- */
- rb_define_const(rb_mDL, "TYPE_PTRDIFF_T", INT2NUM(DLTYPE_PTRDIFF_T));
-
- /* Document-const: TYPE_INTPTR_T
- *
- * DL::CFunc type - intptr_t
- */
- rb_define_const(rb_mDL, "TYPE_INTPTR_T", INT2NUM(DLTYPE_INTPTR_T));
-
- /* Document-const: TYPE_UINTPTR_T
- *
- * DL::CFunc type - uintptr_t
- */
- rb_define_const(rb_mDL, "TYPE_UINTPTR_T", INT2NUM(DLTYPE_UINTPTR_T));
-
- /* Document-const: ALIGN_VOIDP
- *
- * The alignment size of a void*
- */
rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
- /* Document-const: ALIGN_CHAR
- *
- * The alignment size of a char
- */
rb_define_const(rb_mDL, "ALIGN_CHAR", INT2NUM(ALIGN_CHAR));
-
- /* Document-const: ALIGN_SHORT
- *
- * The alignment size of a short
- */
rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-
- /* Document-const: ALIGN_INT
- *
- * The alignment size of an int
- */
rb_define_const(rb_mDL, "ALIGN_INT", INT2NUM(ALIGN_INT));
-
- /* Document-const: ALIGN_LONG
- *
- * The alignment size of a long
- */
rb_define_const(rb_mDL, "ALIGN_LONG", INT2NUM(ALIGN_LONG));
-
#if HAVE_LONG_LONG
- /* Document-const: ALIGN_LONG_LONG
- *
- * The alignment size of a long long
- */
rb_define_const(rb_mDL, "ALIGN_LONG_LONG", INT2NUM(ALIGN_LONG_LONG));
#endif
-
- /* Document-const: ALIGN_FLOAT
- *
- * The alignment size of a float
- */
rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-
- /* Document-const: ALIGN_DOUBLE
- *
- * The alignment size of a double
- */
rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
- /* Document-const: ALIGN_SIZE_T
- *
- * The alignment size of a size_t
- */
- rb_define_const(rb_mDL, "ALIGN_SIZE_T", INT2NUM(ALIGN_OF(size_t)));
-
- /* Document-const: ALIGN_SSIZE_T
- *
- * The alignment size of a ssize_t
- */
- rb_define_const(rb_mDL, "ALIGN_SSIZE_T", INT2NUM(ALIGN_OF(size_t))); /* same as size_t */
-
- /* Document-const: ALIGN_PTRDIFF_T
- *
- * The alignment size of a ptrdiff_t
- */
- rb_define_const(rb_mDL, "ALIGN_PTRDIFF_T", INT2NUM(ALIGN_OF(ptrdiff_t)));
-
- /* Document-const: ALIGN_INTPTR_T
- *
- * The alignment size of a intptr_t
- */
- rb_define_const(rb_mDL, "ALIGN_INTPTR_T", INT2NUM(ALIGN_OF(intptr_t)));
-
- /* Document-const: ALIGN_UINTPTR_T
- *
- * The alignment size of a uintptr_t
- */
- rb_define_const(rb_mDL, "ALIGN_UINTPTR_T", INT2NUM(ALIGN_OF(uintptr_t)));
-
- /* Document-const: SIZEOF_VOIDP
- *
- * size of a void*
- */
rb_define_const(rb_mDL, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
-
- /* Document-const: SIZEOF_CHAR
- *
- * size of a char
- */
rb_define_const(rb_mDL, "SIZEOF_CHAR", INT2NUM(sizeof(char)));
-
- /* Document-const: SIZEOF_SHORT
- *
- * size of a short
- */
rb_define_const(rb_mDL, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
-
- /* Document-const: SIZEOF_INT
- *
- * size of an int
- */
rb_define_const(rb_mDL, "SIZEOF_INT", INT2NUM(sizeof(int)));
-
- /* Document-const: SIZEOF_LONG
- *
- * size of a long
- */
rb_define_const(rb_mDL, "SIZEOF_LONG", INT2NUM(sizeof(long)));
-
#if HAVE_LONG_LONG
- /* Document-const: SIZEOF_LONG_LONG
- *
- * size of a long long
- */
rb_define_const(rb_mDL, "SIZEOF_LONG_LONG", INT2NUM(sizeof(LONG_LONG)));
#endif
-
- /* Document-const: SIZEOF_FLOAT
- *
- * size of a float
- */
rb_define_const(rb_mDL, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
-
- /* Document-const: SIZEOF_DOUBLE
- *
- * size of a double
- */
rb_define_const(rb_mDL, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
- /* Document-const: SIZEOF_SIZE_T
- *
- * size of a size_t
- */
- rb_define_const(rb_mDL, "SIZEOF_SIZE_T", INT2NUM(sizeof(size_t)));
-
- /* Document-const: SIZEOF_SSIZE_T
- *
- * size of a ssize_t
- */
- rb_define_const(rb_mDL, "SIZEOF_SSIZE_T", INT2NUM(sizeof(size_t))); /* same as size_t */
-
- /* Document-const: SIZEOF_PTRDIFF_T
- *
- * size of a ptrdiff_t
- */
- rb_define_const(rb_mDL, "SIZEOF_PTRDIFF_T", INT2NUM(sizeof(ptrdiff_t)));
-
- /* Document-const: SIZEOF_INTPTR_T
- *
- * size of a intptr_t
- */
- rb_define_const(rb_mDL, "SIZEOF_INTPTR_T", INT2NUM(sizeof(intptr_t)));
-
- /* Document-const: SIZEOF_UINTPTR_T
- *
- * size of a uintptr_t
- */
- rb_define_const(rb_mDL, "SIZEOF_UINTPTR_T", INT2NUM(sizeof(uintptr_t)));
-
rb_define_module_function(rb_mDL, "dlwrap", rb_dl_value2ptr, 1);
rb_define_module_function(rb_mDL, "dlunwrap", rb_dl_ptr2value, 1);
@@ -545,26 +155,8 @@ Init_dl(void)
rb_define_module_function(rb_mDL, "realloc", rb_dl_realloc, 2);
rb_define_module_function(rb_mDL, "free", rb_dl_free, 1);
- /* Document-const: RUBY_FREE
- *
- * Address of the ruby_xfree() function
- */
rb_define_const(rb_mDL, "RUBY_FREE", PTR2NUM(ruby_xfree));
-
- /* Document-const: BUILD_RUBY_PLATFORM
- *
- * Platform built against (i.e. "x86_64-linux", etc.)
- *
- * See also RUBY_PLATFORM
- */
rb_define_const(rb_mDL, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
-
- /* Document-const: BUILD_RUBY_VERSION
- *
- * Ruby Version built. (i.e. "1.9.3")
- *
- * See also RUBY_VERSION
- */
rb_define_const(rb_mDL, "BUILD_RUBY_VERSION", rb_str_new2(RUBY_VERSION));
Init_dlhandle();
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index 07adbbf680..2b3b1f827e 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -24,7 +24,7 @@
# include <windows.h>
# define dlopen(name,flag) ((void*)LoadLibrary(name))
# define dlerror() strerror(rb_w32_map_errno(GetLastError()))
-# define dlsym(handle,name) ((void*)GetProcAddress((handle),(name)))
+# define dlsym(handle,name) ((void*)GetProcAddress(handle,name))
# define RTLD_LAZY -1
# define RTLD_NOW -1
# define RTLD_GLOBAL -1
@@ -40,10 +40,10 @@
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]
+ 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
@@ -107,26 +107,26 @@
#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]
+#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]
extern VALUE rb_mDL;
extern VALUE rb_cDLHandle;
@@ -134,21 +134,30 @@ extern VALUE rb_cDLSymbol;
extern VALUE rb_eDLError;
extern VALUE rb_eDLTypeError;
-#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
+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 ALIGN_OF(void*)
-#define ALIGN_SHORT ALIGN_OF(short)
-#define ALIGN_CHAR ALIGN_OF(char)
-#define ALIGN_INT ALIGN_OF(int)
-#define ALIGN_LONG ALIGN_OF(long)
+#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 ALIGN_OF(LONG_LONG)
+#define ALIGN_LONG_LONG (sizeof(s_long_long) - sizeof(LONG_LONG))
#endif
-#define ALIGN_FLOAT ALIGN_OF(float)
-#define ALIGN_DOUBLE ALIGN_OF(double)
+#define ALIGN_FLOAT (sizeof(s_float) - sizeof(float))
+#define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
-#define DLALIGN(ptr,offset,align) \
- ((offset) += ((align) - ((uintptr_t)((char *)(ptr) + (offset))) % (align)) % (align))
+#define DLALIGN(ptr,offset,align) {\
+ while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
+}
#define DLTYPE_VOID 0
@@ -173,8 +182,8 @@ extern VALUE rb_eDLTypeError;
# define NUM2PTR(x) ((void*)(NUM2ULL(x)))
#endif
-#define BOOL2INT(x) (((x) == Qtrue)?1:0)
-#define INT2BOOL(x) ((x)?Qtrue:Qfalse)
+#define BOOL2INT(x) ((x == Qtrue)?1:0)
+#define INT2BOOL(x) (x?Qtrue:Qfalse)
typedef void (*freefunc_t)(void*);
@@ -190,7 +199,6 @@ struct cfunc_data {
char *name;
int type;
ID calltype;
- VALUE wrap;
};
extern ID rbdl_id_cdecl;
extern ID rbdl_id_stdcall;
@@ -201,7 +209,6 @@ struct ptr_data {
void *ptr;
long size;
freefunc_t free;
- VALUE wrap[2];
};
#define RDL_HANDLE(obj) ((struct dl_handle *)(DATA_PTR(obj)))
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index 53e73c3a8b..8317ac35ad 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -1,13 +1,7 @@
require 'mkmf'
if RbConfig::CONFIG['GCC'] == 'yes'
- flag = " -fno-defer-pop"
- if have_macro("__clang__")
- $LDFLAGS << flag if try_ldflags(flag)
- else
- $CFLAGS << flag
- end
- $CFLAGS << " -fno-omit-frame-pointer"
+ $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
end
$INSTALLFILES = [
@@ -30,19 +24,6 @@ else
end
if check
- config = File.read(RbConfig.expand(File.join($arch_hdrdir, "ruby/config.h")))
- types = {"SIZE_T"=>"SSIZE_T", "PTRDIFF_T"=>nil, "INTPTR_T"=>nil}
- types.each do |type, signed|
- if /^\#define\s+SIZEOF_#{type}\s+(SIZEOF_(.+)|\d+)/ =~ config
- if size = $2 and size != 'VOIDP'
- size = types.fetch(size) {size}
- $defs << format("-DDLTYPE_%s=DLTYPE_%s", signed||type, size)
- end
- if signed
- check_signedness(type.downcase, "stddef.h")
- end
- end
- end
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
create_makefile("dl")
end
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 6b90e089ee..d567a4f48c 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -38,7 +38,6 @@ dlhandle_free(void *ptr)
if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
dlclose(dlhandle->ptr);
}
- xfree(ptr);
}
static size_t
@@ -49,7 +48,7 @@ dlhandle_memsize(const void *ptr)
static const rb_data_type_t dlhandle_data_type = {
"dl/handle",
- {0, dlhandle_free, dlhandle_memsize,},
+ 0, dlhandle_free, dlhandle_memsize,
};
/*
@@ -79,8 +78,6 @@ rb_dlhandle_close(VALUE self)
return INT2NUM(ret);
}
rb_raise(rb_eDLError, "dlclose() called too many times");
-
- UNREACHABLE;
}
VALUE
@@ -308,15 +305,12 @@ dlhandle_sym(void *handle, const char *name)
void (*func)();
rb_secure(2);
-#ifdef HAVE_DLERROR
- dlerror();
-#endif
func = (void (*)())(VALUE)dlsym(handle, name);
CHECK_DLERROR;
#if defined(FUNC_STDCALL)
if( !func ){
int i;
- int len = (int)strlen(name);
+ int len = strlen(name);
char *name_n;
#if defined(__CYGWIN__) || defined(_WIN32) || defined(__MINGW32__)
{
@@ -364,59 +358,11 @@ dlhandle_sym(void *handle, const char *name)
void
Init_dlhandle(void)
{
- /*
- * Document-class: DL::Handle
- *
- * The DL::Handle is the manner to access the dynamic library
- *
- * == Example
- *
- * === Setup
- *
- * libc_so = "/lib64/libc.so.6"
- * => "/lib64/libc.so.6"
- * @handle = DL::Handle.new(libc_so)
- * => #<DL::Handle:0x00000000d69ef8>
- *
- * === Setup, with flags
- *
- * libc_so = "/lib64/libc.so.6"
- * => "/lib64/libc.so.6"
- * @handle = DL::Handle.new(libc_so, DL::RTLD_LAZY | DL::RTLD_GLOBAL)
- * => #<DL::Handle:0x00000000d69ef8>
- *
- * === Addresses to symbols
- *
- * strcpy_addr = @handle['strcpy']
- * => 140062278451968
- *
- * or
- *
- * strcpy_addr = @handle.sym('strcpy')
- * => 140062278451968
- *
- */
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);
-
- /* Document-const: NEXT
- *
- * A predefined pseudo-handle of RTLD_NEXT
- *
- * Which will find the next occurrence of a function in the search order
- * after the current library.
- */
rb_define_const(rb_cDLHandle, "NEXT", predefined_dlhandle(RTLD_NEXT));
-
- /* Document-const: DEFAULT
- *
- * A predefined pseudo-handle of RTLD_DEFAULT
- *
- * Which will find the first occurrence of the desired symbol using the
- * default library search order
- */
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);
diff --git a/ext/dl/lib/dl.rb b/ext/dl/lib/dl.rb
index 8e615ae718..80d46b685a 100644
--- a/ext/dl/lib/dl.rb
+++ b/ext/dl/lib/dl.rb
@@ -5,10 +5,7 @@ begin
rescue LoadError
end
-warn "DL is deprecated, please use Fiddle"
-
module DL
- # Returns true if DL is using Fiddle, the libffi wrapper.
def self.fiddle?
Object.const_defined?(:Fiddle)
end
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
index 1722d3c6b9..0863c70d4d 100644
--- a/ext/dl/lib/dl/callback.rb
+++ b/ext/dl/lib/dl/callback.rb
@@ -2,29 +2,13 @@ require 'dl'
require 'thread'
module DL
- # The mutual exclusion (Mutex) semaphore for the DL module
- SEM = Mutex.new # :nodoc:
+ SEM = Mutex.new
if DL.fiddle?
- # A Hash of callback Procs
- #
- # Uses Fiddle
- CdeclCallbackProcs = {} # :nodoc:
-
- # A Hash of the addresses of callback Proc
- #
- # Uses Fiddle
- CdeclCallbackAddrs = {} # :nodoc:
-
- # A Hash of Stdcall callback Procs
- #
- # Uses Fiddle on win32
- StdcallCallbackProcs = {} # :nodoc:
-
- # A Hash of the addresses of Stdcall callback Procs
- #
- # Uses Fiddle on win32
- StdcallCallbackAddrs = {} # :nodoc:
+ CdeclCallbackProcs = {}
+ CdeclCallbackAddrs = {}
+ StdcallCallbackProcs = {}
+ StdcallCallbackAddrs = {}
end
def set_callback_internal(proc_entry, addr_entry, argc, ty, abi = nil, &cbp)
diff --git a/ext/dl/lib/dl/cparser.rb b/ext/dl/lib/dl/cparser.rb
index e70e0f1dc1..210f953471 100644
--- a/ext/dl/lib/dl/cparser.rb
+++ b/ext/dl/lib/dl/cparser.rb
@@ -1,13 +1,5 @@
module DL
- # Methods for parsing C struct and C prototype signatures.
module CParser
- # Parses a C struct's members
- #
- # Example:
- #
- # parse_struct_signature(['int i', 'char c'])
- # => [[DL::TYPE_INT, DL::TYPE_CHAR], ["i", "c"]]
- #
def parse_struct_signature(signature, tymap=nil)
if( signature.is_a?(String) )
signature = signature.split(/\s*,\s*/)
@@ -43,16 +35,6 @@ module DL
return tys, mems
end
- # Parses a C prototype signature
- #
- # Example:
- #
- # include DL::CParser
- # => Object
- #
- # parse_signature('double sum(double, double)')
- # => ["sum", DL::TYPE_DOUBLE, [DL::TYPE_DOUBLE, DL::TYPE_DOUBLE]]
- #
def parse_signature(signature, tymap=nil)
tymap ||= {}
signature = signature.gsub(/\s+/, " ").strip
@@ -74,25 +56,6 @@ module DL
end
end
- # Given a String of C type +ty+, return the corresponding DL constant.
- #
- # +ty+ can also accept an Array of C type Strings, and will returned in a
- # corresponding Array.
- #
- # If Hash +tymap+ is provided, +ty+ is expected to be the key, and the
- # value will be the C type to be looked up.
- #
- # Example:
- #
- # parse_ctype('int')
- # => DL::TYPE_INT
- #
- # parse_ctype('double')
- # => DL::TYPE_DOUBLE
- #
- # parse_ctype('unsigned char')
- # => -DL::TYPE_CHAR
- #
def parse_ctype(ty, tymap=nil)
tymap ||= {}
case ty
@@ -132,16 +95,6 @@ module DL
return TYPE_FLOAT
when "double"
return TYPE_DOUBLE
- when "size_t"
- return TYPE_SIZE_T
- when "ssize_t"
- return TYPE_SSIZE_T
- when "ptrdiff_t"
- return TYPE_PTRDIFF_T
- when "intptr_t"
- return TYPE_INTPTR_T
- when "uintptr_t"
- return TYPE_UINTPTR_T
when /\*/, /\[\s*\]/
return TYPE_VOIDP
else
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb
index 543711f651..3c2245f413 100644
--- a/ext/dl/lib/dl/func.rb
+++ b/ext/dl/lib/dl/func.rb
@@ -11,50 +11,13 @@ module DL
include DL
include ValueUtil
- if DL.fiddle?
- # :stopdoc:
- CALL_TYPE_TO_ABI = Hash.new { |h, k|
- raise RuntimeError, "unsupported call type: #{k}"
- }.merge({ :stdcall =>
- (Fiddle::Function::STDCALL rescue Fiddle::Function::DEFAULT),
- :cdecl => Fiddle::Function::DEFAULT,
- nil => Fiddle::Function::DEFAULT
- }).freeze
- private_constant :CALL_TYPE_TO_ABI
- # :startdoc:
-
- def self.call_type_to_abi(call_type) # :nodoc:
- CALL_TYPE_TO_ABI[call_type]
- end
- private_class_method :call_type_to_abi
-
- class FiddleClosureCFunc < Fiddle::Closure # :nodoc: all
- def initialize ctype, arg, abi, name
- @name = name
- super(ctype, arg, abi)
- end
- def name
- @name
- end
- def ptr
- to_i
- end
- end
- private_constant :FiddleClosureCFunc
-
- def self.class_fiddle_closure_cfunc # :nodoc:
- FiddleClosureCFunc
- end
- private_class_method :class_fiddle_closure_cfunc
- end
-
def initialize cfunc, argtypes, abi = nil, &block
if DL.fiddle?
- abi ||= CALL_TYPE_TO_ABI[(cfunc.calltype rescue nil)]
+ abi ||= Fiddle::Function::DEFAULT
if block_given?
- @cfunc = Class.new(FiddleClosureCFunc) {
+ @cfunc = Class.new(Fiddle::Closure) {
define_method(:call, block)
- }.new(cfunc.ctype, argtypes, abi, cfunc.name)
+ }.new(cfunc.ctype, argtypes)
else
@cfunc = cfunc
end
@@ -92,9 +55,6 @@ module DL
super
else
funcs = []
- if $SAFE >= 1 && args.any? { |x| x.tainted? }
- raise SecurityError, "tainted parameter not allowed"
- end
_args = wrap_args(args, @stack.types, funcs, &block)
r = @cfunc.call(@stack.pack(_args))
funcs.each{|f| f.unbind_at_call()}
@@ -116,25 +76,20 @@ module DL
def bind(&block)
if DL.fiddle?
- @cfunc = Class.new(FiddleClosureCFunc) {
- def initialize ctype, args, abi, name, block
- super(ctype, args, abi, name)
+ @cfunc = Class.new(Fiddle::Closure) {
+ def initialize ctype, args, block
+ super(ctype, args)
@block = block
end
def call *args
@block.call(*args)
end
- }.new(@cfunc.ctype, @args, abi, name, block)
- @ptr = @cfunc
- return nil
+ }.new(@cfunc.ctype, @args, block)
else
if( !block )
raise(RuntimeError, "block must be given.")
end
- unless block.lambda?
- block = Class.new(self.class){define_method(:call, block); def initialize(obj); obj.instance_variables.each{|s| instance_variable_set(s, obj.instance_variable_get(s))}; end}.new(self).method(:call)
- end
if( @cfunc.ptr == 0 )
cb = Proc.new{|*args|
ary = @stack.unpack(args)
@@ -163,25 +118,6 @@ module DL
end
def unbind()
- if DL.fiddle? then
- if @cfunc.kind_of?(Fiddle::Closure) and @cfunc.ptr != 0 then
- call_type = case abi
- when CALL_TYPE_TO_ABI[nil]
- nil
- when CALL_TYPE_TO_ABI[:stdcall]
- :stdcall
- else
- raise(RuntimeError, "unsupported abi: #{abi}")
- end
- @cfunc = CFunc.new(0, @cfunc.ctype, name, call_type)
- return 0
- elsif @cfunc.ptr != 0 then
- @cfunc.ptr = 0
- return 0
- else
- return nil
- end
- end
if( @cfunc.ptr != 0 )
case @cfunc.calltype
when :cdecl
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 6f157ccf28..fd23bc9676 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -31,22 +31,6 @@ module DL
end
end
- # DL::Importer includes the means to dynamically load libraries and build
- # modules around them including calling extern functions within the C
- # library that has been loaded.
- #
- # == Example
- #
- # require 'dl'
- # require 'dl/import'
- #
- # module LibSum
- # extend DL::Importer
- # dlload './libsum.so'
- # extern 'double sum(double*, int)'
- # extern 'double split(double)'
- # end
- #
module Importer
include DL
include CParser
@@ -79,7 +63,6 @@ module DL
end
def sizeof(ty)
- @type_alias ||= nil
case ty
when String
ty = parse_ctype(ty, @type_alias).abs()
@@ -113,6 +96,7 @@ module DL
def parse_bind_options(opts)
h = {}
+ prekey = nil
while( opt = opts.shift() )
case opt
when :stdcall, :cdecl
@@ -129,7 +113,6 @@ module DL
private :parse_bind_options
def extern(signature, *opts)
- @type_alias ||= nil
symname, ctype, argtype = parse_signature(signature, @type_alias)
opt = parse_bind_options(opts)
f = import_function(symname, ctype, argtype, opt[:call_type])
@@ -152,7 +135,6 @@ module DL
end
def bind(signature, *opts, &blk)
- @type_alias ||= nil
name, ctype, argtype = parse_signature(signature, @type_alias)
h = parse_bind_options(opts)
case h[:callback_type]
@@ -182,20 +164,12 @@ module DL
f
end
- # Creates a class to wrap the C struct described by +signature+.
- #
- # MyStruct = struct ['int i', 'char c']
def struct(signature)
- @type_alias ||= nil
tys, mems = parse_struct_signature(signature, @type_alias)
DL::CStructBuilder.create(CStruct, tys, mems)
end
- # Creates a class to wrap the C union described by +signature+.
- #
- # MyUnion = union ['int i', 'char c']
def union(signature)
- @type_alias ||= nil
tys, mems = parse_struct_signature(signature, @type_alias)
DL::CStructBuilder.create(CUnion, tys, mems)
end
@@ -220,13 +194,8 @@ module DL
return ptr
end
- def handler
- defined?(@handler) or raise "call dlload before importing symbols and functions"
- @handler
- end
-
def import_symbol(name)
- addr = handler.sym(name)
+ addr = @handler.sym(name)
if( !addr )
raise(DLError, "cannot find the symbol: #{name}")
end
@@ -234,7 +203,7 @@ module DL
end
def import_function(name, ctype, argtype, call_type = nil)
- addr = handler.sym(name)
+ addr = @handler.sym(name)
if( !addr )
raise(DLError, "cannot find the function: #{name}()")
end
@@ -243,13 +212,11 @@ module DL
def bind_function(name, ctype, argtype, call_type = nil, &block)
if DL.fiddle?
- klass = Function.instance_eval { class_fiddle_closure_cfunc }
- abi = Function.instance_eval { call_type_to_abi(call_type) }
- closure = Class.new(klass) {
+ closure = Class.new(Fiddle::Closure) {
define_method(:call, block)
- }.new(ctype, argtype, abi, name)
+ }.new(ctype, argtype)
- Function.new(closure, argtype, abi)
+ Function.new(closure, argtype)
else
f = Function.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
f.bind(&block)
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index e2d91a6d14..dc116f3be5 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -1,52 +1,20 @@
require 'dl'
-require 'dl/value'
require 'dl/pack.rb'
module DL
- # C struct shell
class CStruct
- # accessor to DL::CStructEntity
def CStruct.entity_class()
CStructEntity
end
end
- # C union shell
class CUnion
- # accessor to DL::CUnionEntity
def CUnion.entity_class()
CUnionEntity
end
end
- # Used to construct C classes (CUnion, CStruct, etc)
- #
- # DL::Importer#struct and DL::Importer#union wrap this functionality in an
- # easy-to-use manner.
module CStructBuilder
- # Construct a new class given a C:
- # * class +klass+ (CUnion, CStruct, or other that provide an
- # #entity_class)
- # * +types+ (DL:TYPE_INT, DL::TYPE_SIZE_T, etc., see the C types
- # constants)
- # * corresponding +members+
- #
- # DL::Importer#struct and DL::Importer#union wrap this functionality in an
- # easy-to-use manner.
- #
- # Example:
- #
- # require 'dl/struct'
- # require 'dl/cparser'
- #
- # include DL::CParser
- #
- # types, members = parse_struct_signature(['int i','char c'])
- #
- # MyStruct = DL::CStructBuilder.create(CUnion, types, members)
- #
- # obj = MyStruct.allocate
- #
def create(klass, types, members)
new_class = Class.new(klass){
define_method(:initialize){|addr|
@@ -75,76 +43,76 @@ module DL
module_function :create
end
- # A C struct wrapper
- class CStructEntity < (DL.fiddle? ? Fiddle::Pointer : CPtr)
+ class CStructEntity < CPtr
include PackInfo
include ValueUtil
- # Allocates a C struct the +types+ provided. The C function +func+ is
- # called when the instance is garbage collected.
def CStructEntity.malloc(types, func = nil)
addr = DL.malloc(CStructEntity.size(types))
CStructEntity.new(addr, types, func)
end
- # Given +types+, returns the offset for the packed sizes of those types
- #
- # DL::CStructEntity.size([DL::TYPE_DOUBLE, DL::TYPE_INT, DL::TYPE_CHAR,
- # DL::TYPE_VOIDP])
- # => 24
def CStructEntity.size(types)
offset = 0
-
- max_align = types.map { |type, count = 1|
- last_offset = offset
-
- align = PackInfo::ALIGN_MAP[type]
- offset = PackInfo.align(last_offset, align) +
- (PackInfo::SIZE_MAP[type] * count)
-
- align
- }.max
-
- PackInfo.align(offset, max_align)
+ 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
- # Wraps the C pointer +addr+ as a C struct with the given +types+. The C
- # function +func+ is called when the instance is garbage collected.
- #
- # See also DL::CPtr.new
def initialize(addr, types, func = nil)
set_ctypes(types)
super(addr, @size, func)
end
- # Set the names of the +members+ in this C struct
def assign_names(members)
@members = members
end
- # Given +types+, calculate the offsets and sizes for the types in the
- # struct.
def set_ctypes(types)
@ctypes = types
@offset = []
offset = 0
-
- max_align = types.map { |type, count = 1|
+ max_align = 0
+ types.each_with_index{|t,i|
orig_offset = offset
- align = ALIGN_MAP[type]
+ if( t.is_a?(Array) )
+ align = ALIGN_MAP[t[0]]
+ else
+ align = ALIGN_MAP[t]
+ end
offset = PackInfo.align(orig_offset, align)
-
- @offset << offset
-
- offset += (SIZE_MAP[type] * count)
-
- align
- }.max
-
- @size = PackInfo.align(offset, max_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
- # Fetch struct member +name+
def [](name)
idx = @members.index(name)
if( idx.nil? )
@@ -178,7 +146,6 @@ module DL
end
end
- # Set struct member +name+, to value +val+
def []=(name, val)
idx = @members.index(name)
if( idx.nil? )
@@ -198,38 +165,48 @@ module DL
end
end
- def to_s() # :nodoc:
+ def to_s()
super(@size)
end
end
- # A C union wrapper
class CUnionEntity < CStructEntity
include PackInfo
- # Allocates a C union the +types+ provided. The C function +func+ is
- # called when the instance is garbage collected.
def CUnionEntity.malloc(types, func=nil)
addr = DL.malloc(CUnionEntity.size(types))
CUnionEntity.new(addr, types, func)
end
- # Given +types+, returns the size needed for the union.
- #
- # DL::CUnionEntity.size([DL::TYPE_DOUBLE, DL::TYPE_INT, DL::TYPE_CHAR,
- # DL::TYPE_VOIDP])
- # => 8
def CUnionEntity.size(types)
- types.map { |type, count = 1|
- PackInfo::SIZE_MAP[type] * count
- }.max
+ 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
- # Given +types+, calculate the necessary offset and for each union member
def set_ctypes(types)
@ctypes = types
- @offset = Array.new(types.length, 0)
- @size = self.class.size 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
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index d5724e407b..b85ac890cd 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -1,36 +1,9 @@
module DL
- # Adds Windows type aliases to the including class for use with
- # DL::Importer.
- #
- # The aliases added are:
- # * ATOM
- # * BOOL
- # * BYTE
- # * DWORD
- # * DWORD32
- # * DWORD64
- # * HANDLE
- # * HDC
- # * HINSTANCE
- # * HWND
- # * LPCSTR
- # * LPSTR
- # * PBYTE
- # * PDWORD
- # * PHANDLE
- # * PVOID
- # * PWORD
- # * UCHAR
- # * UINT
- # * ULONG
- # * WORD
module Win32Types
- def included(m) # :nodoc:
+ def included(m)
m.module_eval{
typealias "DWORD", "unsigned long"
typealias "PDWORD", "unsigned long *"
- typealias "DWORD32", "unsigned long"
- typealias "DWORD64", "unsigned long long"
typealias "WORD", "unsigned short"
typealias "PWORD", "unsigned short *"
typealias "BOOL", "int"
@@ -40,7 +13,7 @@ module DL
typealias "UINT", "unsigned int"
typealias "ULONG", "unsigned long"
typealias "UCHAR", "unsigned char"
- typealias "HANDLE", "uintptr_t"
+ typealias "HANDLE", "unsigned long"
typealias "PHANDLE", "void*"
typealias "PVOID", "void*"
typealias "LPCSTR", "char*"
@@ -53,12 +26,8 @@ module DL
module_function :included
end
- # Adds basic type aliases to the including class for use with DL::Importer.
- #
- # The aliases added are +uint+ and +u_int+ (<tt>unsigned int</tt>) and
- # +ulong+ and +u_long+ (<tt>unsigned long</tt>)
module BasicTypes
- def included(m) # :nodoc:
+ def included(m)
m.module_eval{
typealias "uint", "unsigned int"
typealias "u_int", "unsigned int"
diff --git a/ext/dl/lib/dl/value.rb b/ext/dl/lib/dl/value.rb
index 147d9d120a..51f96b293b 100644
--- a/ext/dl/lib/dl/value.rb
+++ b/ext/dl/lib/dl/value.rb
@@ -13,7 +13,7 @@ module DL
when TYPE_LONG
[val].pack("l!").unpack("L!")[0]
when TYPE_LONG_LONG
- [val].pack("q").unpack("Q")[0]
+ [val].pack("q!").unpack("Q!")[0]
else
val
end
@@ -30,7 +30,7 @@ module DL
when TYPE_LONG
[val].pack("L!").unpack("l!")[0]
when TYPE_LONG_LONG
- [val].pack("Q").unpack("q")[0]
+ [val].pack("Q!").unpack("q!")[0]
else
val
end
@@ -46,8 +46,6 @@ module DL
end
def wrap_arg(arg, ty, funcs = [], &block)
- require 'dl/func'
-
funcs ||= []
case arg
when nil
diff --git a/ext/dl/win32/extconf.rb b/ext/dl/win32/extconf.rb
index 03590f24fa..a72ca49c06 100644
--- a/ext/dl/win32/extconf.rb
+++ b/ext/dl/win32/extconf.rb
@@ -1,3 +1,3 @@
-if compiled?('dl') and !compiled?('fiddle') and $mswin||$bccwin||$mingw||$cygwin
+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
index 4d7d4887a5..f18cec5749 100644
--- a/ext/dl/win32/lib/Win32API.rb
+++ b/ext/dl/win32/lib/Win32API.rb
@@ -7,7 +7,6 @@ require 'dl'
class Win32API
DLL = {}
TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
- POINTER_TYPE = DL::SIZEOF_VOIDP == DL::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
def initialize(dllname, func, import, export = "0", calltype = :stdcall)
@proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
@@ -20,7 +19,7 @@ class Win32API
def call(*args)
import = @proto.split("")
args.each_with_index do |x, i|
- args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
+ 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)
diff --git a/ext/dl/win32/lib/win32/resolv.rb b/ext/dl/win32/lib/win32/resolv.rb
index 8a65472877..a164fd54d2 100644
--- a/ext/dl/win32/lib/win32/resolv.rb
+++ b/ext/dl/win32/lib/win32/resolv.rb
@@ -73,7 +73,7 @@ if info.unpack('V5')[4] == 2 # VER_PLATFORM_WIN32_NT
unless nvdom.empty?
@search = [ nvdom ]
if reg.read_i('UseDomainNameDevolution') != 0
- if /^\w+\./ =~ nvdom
+ if /^[\w\d]+\./ =~ nvdom
devo = $'
end
end
diff --git a/ext/etc/.cvsignore b/ext/etc/.cvsignore
new file mode 100644
index 0000000000..4088712231
--- /dev/null
+++ b/ext/etc/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+*.def
diff --git a/ext/etc/depend b/ext/etc/depend
index f2c04f5879..ac706477b0 100644
--- a/ext/etc/depend
+++ b/ext/etc/depend
@@ -1 +1 @@
-etc.o : etc.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+etc.o : etc.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index b9aceffcad..0a01acf47d 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -40,17 +40,9 @@ char *getenv();
#endif
char *getlogin();
-/* call-seq:
- * getlogin -> String
- *
- * Returns the short user name of the currently logged in user.
- * Unfortunately, it is often rather easy to fool ::getlogin.
- *
- * Avoid ::getlogin for security-related purposes.
- *
- * If ::getlogin fails, try ::getpwuid.
- *
- * See the unix manpage for <code>getpwuid(3)</code> for more detail.
+/* Returns the short user name of the currently logged in user.
+ * Unfortunately, it is often rather easy to fool getlogin().
+ * Avoid getlogin() for security-related purposes.
*
* e.g.
* Etc.getlogin -> 'guest'
@@ -68,15 +60,8 @@ etc_getlogin(VALUE obj)
login = getenv("USER");
#endif
- if (login) {
-#ifdef _WIN32
- rb_encoding *extenc = rb_utf8_encoding();
-#else
- rb_encoding *extenc = rb_locale_encoding();
-#endif
- return rb_external_str_new_with_enc(login, strlen(login), extenc);
- }
-
+ if (login)
+ return rb_tainted_str_new2(login);
return Qnil;
}
@@ -129,22 +114,14 @@ setup_passwd(struct passwd *pwd)
}
#endif
-/* call-seq:
- * getpwuid(uid) -> Passwd
- *
- * Returns the /etc/passwd information for the user with the given integer +uid+.
- *
- * The information is returned as a Passwd struct.
- *
- * If +uid+ is omitted, the value from <code>Passwd[:uid]</code> is returned
- * instead.
- *
- * See the unix manpage for <code>getpwuid(3)</code> for more detail.
+/* Returns the /etc/passwd information for the user with specified integer
+ * user id (uid).
*
- * === Example:
+ * The information is returned as a Struct::Passwd; see getpwent above for
+ * details.
*
- * Etc.getpwuid(0)
- * #=> #<struct Struct::Passwd name="root", passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
+ * e.g. * Etc.getpwuid(0) -> #<struct Struct::Passwd name="root",
+ * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
*/
static VALUE
etc_getpwuid(int argc, VALUE *argv, VALUE obj)
@@ -169,20 +146,13 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
#endif
}
-/* call-seq:
- * getpwnam(name) -> Passwd
+/* Returns the /etc/passwd information for the user with specified login name.
*
- * Returns the /etc/passwd information for the user with specified login
- * +name+.
+ * The information is returned as a Struct::Passwd; see getpwent above for
+ * details.
*
- * The information is returned as a Passwd struct.
- *
- * See the unix manpage for <code>getpwnam(3)</code> for more detail.
- *
- * === Example:
- *
- * Etc.getpwnam('root')
- * #=> #<struct Struct::Passwd name="root", passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
+ * e.g. * Etc.getpwnam('root') -> #<struct Struct::Passwd name="root",
+ * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
*/
static VALUE
etc_getpwnam(VALUE obj, VALUE nam)
@@ -192,7 +162,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
SafeStringValue(nam);
pwd = getpwnam(RSTRING_PTR(nam));
- if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam);
+ if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING_PTR(nam));
return setup_passwd(pwd);
#else
return Qnil;
@@ -204,7 +174,6 @@ static int passwd_blocking = 0;
static VALUE
passwd_ensure(void)
{
- endpwent();
passwd_blocking = (int)Qfalse;
return Qnil;
}
@@ -218,6 +187,7 @@ passwd_iterate(void)
while (pw = getpwent()) {
rb_yield(setup_passwd(pw));
}
+ endpwent();
return Qnil;
}
@@ -232,16 +202,11 @@ each_passwd(void)
}
#endif
-/* call-seq:
- * Etc.passwd { |struct| block } -> Passwd
- * Etc.passwd -> Passwd
- *
- * Provides a convenient Ruby iterator which executes a block for each entry
+/* Provides a convenient Ruby iterator which executes a block for each entry
* in the /etc/passwd file.
*
- * The code block is passed an Passwd struct.
- *
- * See ::getpwent above for details.
+ * The code block is passed an Struct::Passwd struct; see getpwent above for
+ * details.
*
* Example:
*
@@ -269,17 +234,11 @@ etc_passwd(VALUE obj)
return Qnil;
}
-/* call-seq:
- * Etc::Passwd.each { |struct| block } -> Passwd
- * Etc::Passwd.each -> Enumerator
- *
- * Iterates for each entry in the /etc/passwd file if a block is given.
- *
- * If no block is given, returns the Enumerator.
+/* 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 Passwd struct.
- *
- * See ::getpwent above for details.
+ * The code block is passed an Struct::Passwd struct; see getpwent above for
+ * details.
*
* Example:
*
@@ -304,7 +263,7 @@ etc_each_passwd(VALUE obj)
}
/* Resets the process of reading the /etc/passwd file, so that the next call
- * to ::getpwent will return the first entry again.
+ * to getpwent will return the first entry again.
*/
static VALUE
etc_setpwent(VALUE obj)
@@ -316,7 +275,7 @@ etc_setpwent(VALUE obj)
}
/* Ends the process of scanning through the /etc/passwd file begun with
- * ::getpwent, and closes the file.
+ * getpwent, and closes the file.
*/
static VALUE
etc_endpwent(VALUE obj)
@@ -327,16 +286,31 @@ etc_endpwent(VALUE obj)
return Qnil;
}
-/* Returns an entry from the /etc/passwd file.
+/* Returns an entry from the /etc/passwd file. The first time it is called it
+ * opens the file and returns the first entry; each successive call returns
+ * the next entry, or nil if the end of the file has been reached.
+ *
+ * To close the file when processing is complete, call endpwent.
+ *
+ * Each entry is returned as a Struct::Passwd:
*
- * The first time it is called it opens the file and returns the first entry;
- * each successive call returns the next entry, or +nil+ if the end of the file
- * has been reached.
+ * - Passwd#name contains the short login name of the user as a String.
*
- * To close the file when processing is complete, call ::endpwent.
+ * - Passwd#passwd contains the encrypted password of the user as a String.
+ * an 'x' is returned if shadow passwords are in use. An '*' is returned
+ * if the user cannot log in using a password.
*
- * Each entry is returned as a Passwd struct.
+ * - Passwd#uid contains the integer user ID (uid) of the user.
*
+ * - Passwd#gid contains the integer group ID (gid) of the user's primary group.
+ *
+ * - Passwd#gecos contains a longer String description of the user, such as
+ * a full name. Some Unix systems provide structured information in the
+ * gecos field, but this is system-dependent.
+ *
+ * - Passwd#dir contains the path to the home directory of the user as a String.
+ *
+ * - Passwd#shell contains the path to the login shell of the user as a String.
*/
static VALUE
etc_getpwent(VALUE obj)
@@ -374,20 +348,14 @@ setup_group(struct group *grp)
}
#endif
-/* call-seq:
- * getgrgid(group_id) -> Group
- *
- * Returns information about the group with specified integer +group_id+,
+/* Returns information about the group with specified integer group id (gid),
* as found in /etc/group.
*
- * The information is returned as a Group struct.
+ * The information is returned as a Struct::Group; see getgrent above for
+ * details.
*
- * See the unix manpage for <code>getgrgid(3)</code> for more detail.
- *
- * === Example:
- *
- * Etc.getgrgid(100)
- * #=> #<struct Struct::Group name="users", passwd="x", gid=100, mem=["meta", "root"]>
+ * e.g. Etc.getgrgid(100) -> #<struct Struct::Group name="users", passwd="x",
+ * gid=100, mem=["meta", "root"]>
*
*/
static VALUE
@@ -413,20 +381,14 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
#endif
}
-/* call-seq:
- * getgrnam(name) -> Group
- *
- * Returns information about the group with specified +name+, as found in
- * /etc/group.
+/* Returns information about the group with specified String name, as found
+ * in /etc/group.
*
- * The information is returned as a Group struct.
+ * The information is returned as a Struct::Group; see getgrent above for
+ * details.
*
- * See the unix manpage for <code>getgrnam(3)</code> for more detail.
- *
- * === Example:
- *
- * Etc.getgrnam('users')
- * #=> #<struct Struct::Group name="users", passwd="x", gid=100, mem=["meta", "root"]>
+ * e.g. Etc.getgrnam('users') -> #<struct Struct::Group name="users",
+ * passwd="x", gid=100, mem=["meta", "root"]>
*
*/
static VALUE
@@ -438,7 +400,7 @@ etc_getgrnam(VALUE obj, VALUE nam)
rb_secure(4);
SafeStringValue(nam);
grp = getgrnam(RSTRING_PTR(nam));
- if (grp == 0) rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, nam);
+ if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(nam));
return setup_group(grp);
#else
return Qnil;
@@ -450,12 +412,10 @@ static int group_blocking = 0;
static VALUE
group_ensure(void)
{
- endgrent();
group_blocking = (int)Qfalse;
return Qnil;
}
-
static VALUE
group_iterate(void)
{
@@ -465,6 +425,7 @@ group_iterate(void)
while (pw = getgrent()) {
rb_yield(setup_group(pw));
}
+ endgrent();
return Qnil;
}
@@ -482,9 +443,8 @@ each_group(void)
/* Provides a convenient Ruby iterator which executes a block for each entry
* in the /etc/group file.
*
- * The code block is passed an Group struct.
- *
- * See ::getgrent above for details.
+ * The code block is passed an Struct::Group struct; see getgrent above for
+ * details.
*
* Example:
*
@@ -513,15 +473,11 @@ etc_group(VALUE obj)
}
#ifdef HAVE_GETGRENT
-/* call-seq:
- * Etc::Group.each { |group| block } -> obj
- * Etc::Group.each -> Enumerator
+/* Iterates for each entry in the /etc/group file if a block is given.
+ * If no block is given, returns the enumerator.
*
- * 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 a Group struct.
+ * The code block is passed an Struct::Group struct; see getpwent above for
+ * details.
*
* Example:
*
@@ -545,7 +501,7 @@ etc_each_group(VALUE obj)
#endif
/* Resets the process of reading the /etc/group file, so that the next call
- * to ::getgrent will return the first entry again.
+ * to getgrent will return the first entry again.
*/
static VALUE
etc_setgrent(VALUE obj)
@@ -557,7 +513,7 @@ etc_setgrent(VALUE obj)
}
/* Ends the process of scanning through the /etc/group file begun by
- * ::getgrent, and closes the file.
+ * getgrent, and closes the file.
*/
static VALUE
etc_endgrent(VALUE obj)
@@ -568,15 +524,25 @@ etc_endgrent(VALUE obj)
return Qnil;
}
-/* Returns an entry from the /etc/group file.
+/* Returns an entry from the /etc/group file. The first time it is called it
+ * opens the file and returns the first entry; each successive call returns
+ * the next entry, or nil if the end of the file has been reached.
+ *
+ * To close the file when processing is complete, call endgrent.
+ *
+ * Each entry is returned as a Struct::Group:
*
- * The first time it is called it opens the file and returns the first entry;
- * each successive call returns the next entry, or +nil+ if the end of the file
- * has been reached.
+ * - Group#name contains the name of the group as a String.
*
- * To close the file when processing is complete, call ::endgrent.
+ * - Group#passwd contains the encrypted password as a String. An 'x' is
+ * returned if password access to the group is not available; an empty
+ * string is returned if no password is needed to obtain membership of
+ * the group.
*
- * Each entry is returned as a Group struct
+ * - Group#gid contains the group's numeric ID as an integer.
+ *
+ * - Group#mem is an Array of Strings containing the short login names of the
+ * members of the group.
*/
static VALUE
etc_getgrent(VALUE obj)
@@ -591,7 +557,7 @@ etc_getgrent(VALUE obj)
return Qnil;
}
-#define numberof(array) (sizeof(array) / sizeof(*(array)))
+#define numberof(array) (sizeof(array) / sizeof(*array))
#ifdef _WIN32
VALUE rb_w32_special_folder(int type);
@@ -601,10 +567,6 @@ VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
/*
* Returns system configuration directory.
- *
- * This is typically "/etc", but is modified by the prefix used when Ruby was
- * compiled. For example, if Ruby is built and installed in /usr/local, returns
- * "/usr/local/etc".
*/
static VALUE
etc_sysconfdir(VALUE obj)
@@ -617,49 +579,25 @@ etc_sysconfdir(VALUE obj)
}
/*
- * Returns system temporary directory; typically "/tmp".
+ * Returns system temporary directory.
*/
static VALUE
etc_systmpdir(void)
{
- VALUE tmpdir;
#ifdef _WIN32
WCHAR path[_MAX_PATH];
UINT len = rb_w32_system_tmpdir(path, numberof(path));
if (!len) return Qnil;
- tmpdir = rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
+ return rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
#else
- tmpdir = rb_filesystem_str_new_cstr("/tmp");
+ return rb_filesystem_str_new_cstr("/tmp");
#endif
- FL_UNSET(tmpdir, FL_TAINT|FL_UNTRUSTED);
- return tmpdir;
}
/*
- * The Etc module provides access to information typically stored in
- * files in the /etc directory on Unix systems.
- *
- * The information accessible consists of the information found in the
- * /etc/passwd and /etc/group files, plus information about the system's
- * temporary directory (/tmp) and configuration directory (/etc).
- *
- * The Etc module provides a more reliable way to access information about
- * the logged in user than environment variables such as +$USER+.
- *
- * == Example:
- *
- * require 'etc'
- *
- * login = Etc.getlogin
- * info = Etc.getpwnam(login)
- * username = info.gecos.split(/,/).first
- * puts "Hello #{username}, I see your login name is #{login}"
- *
- * Note that the methods provided by this module are not always secure.
- * It should be used for informational purposes, and not for security.
+ * The etc module provides access to information from the running OS.
*
- * All operations defined in this module are class methods, so that you can
- * include the Etc module into your class.
+ * Documented by mathew <meta@pobox.com>.
*/
void
Init_etc(void)
@@ -710,45 +648,6 @@ Init_etc(void)
"expire",
#endif
NULL);
- /* Define-const: Passwd
- *
- * Passwd is a Struct that contains the following members:
- *
- * name::
- * contains the short login name of the user as a String.
- * passwd::
- * contains the encrypted password of the user as a String.
- * an 'x' is returned if shadow passwords are in use. An '*' is returned
- * if the user cannot log in using a password.
- * uid::
- * contains the integer user ID (uid) of the user.
- * gid::
- * contains the integer group ID (gid) of the user's primary group.
- * dir::
- * contains the path to the home directory of the user as a String.
- * shell::
- * contains the path to the login shell of the user as a String.
- *
- * === The following members below are optional, and must be compiled with special flags:
- *
- * gecos::
- * contains a longer String description of the user, such as
- * a full name. Some Unix systems provide structured information in the
- * gecos field, but this is system-dependent.
- * must be compiled with +HAVE_ST_PW_GECOS+
- * change::
- * password change time(integer) must be compiled with +HAVE_ST_PW_CHANGE+
- * quota::
- * quota value(integer) must be compiled with +HAVE_ST_PW_QUOTA+
- * age::
- * password age(integer) must be compiled with +HAVE_ST_PW_AGE+
- * class::
- * user access class(string) must be compiled with +HAVE_ST_PW_CLASS+
- * comment::
- * comment(string) must be compiled with +HAVE_ST_PW_COMMENT+
- * expire::
- * account expiration time(integer) must be compiled with +HAVE_ST_PW_EXPIRE+
- */
rb_define_const(mEtc, "Passwd", sPasswd);
rb_extend_object(sPasswd, rb_mEnumerable);
rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
@@ -760,27 +659,6 @@ Init_etc(void)
#endif
"gid", "mem", NULL);
- /* Define-const: Group
- *
- * Group is a Struct that is only available when compiled with +HAVE_GETGRENT+.
- *
- * The struct contains the following members:
- *
- * name::
- * contains the name of the group as a String.
- * passwd::
- * contains the encrypted password as a String. An 'x' is
- * returned if password access to the group is not available; an empty
- * string is returned if no password is needed to obtain membership of
- * the group.
- *
- * Must be compiled with +HAVE_ST_GR_PASSWD+.
- * gid::
- * contains the group's numeric ID as an integer.
- * mem::
- * is an Array of Strings containing the short login names of the
- * members of the group.
- */
rb_define_const(mEtc, "Group", sGroup);
rb_extend_object(sGroup, rb_mEnumerable);
rb_define_singleton_method(sGroup, "each", etc_each_group, 0);
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 597fc78f60..ab48634c1a 100755..100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -1,5 +1,5 @@
#! /usr/local/bin/ruby
-# -*- mode: ruby; coding: us-ascii -*-
+# -*- ruby -*-
$extension = nil
$extstatic = nil
@@ -10,14 +10,13 @@ $dryrun = false
$clean = nil
$nodynamic = nil
$extinit = nil
-$extobjs = []
+$extobjs = nil
$extflags = ""
$extlibs = nil
$extpath = nil
$ignore = nil
$message = nil
$command_output = nil
-$configure_only = false
$progname = $0
alias $PROGRAM_NAME $0
@@ -26,8 +25,6 @@ alias $0 $progname
$extlist = []
$compiled = {}
-DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
-
srcdir = File.dirname(File.dirname(__FILE__))
unless defined?(CROSS_COMPILING) and CROSS_COMPILING
$:.replace([File.expand_path("lib", srcdir), Dir.pwd])
@@ -42,39 +39,18 @@ $" << "mkmf.rb"
load File.expand_path("lib/mkmf.rb", srcdir)
require 'optparse/shellwords'
-if defined?(File::NULL)
- @null = File::NULL
-elsif !File.chardev?(@null = "/dev/null")
- @null = "nul"
-end
-
def sysquote(x)
@quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
@quote ? x.quote : x
end
-def verbose?
- $mflags.defined?("V") == "1"
-end
-
-def system(*args)
- if verbose?
- if args.size == 1
- puts args
- else
- puts Shellwords.join(args)
- end
- end
- super
-end
-
def extract_makefile(makefile, keep = true)
m = File.read(makefile)
if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
return keep
end
installrb = {}
- m.scan(/^install-rb-default:.*[ \t](\S+)(?:[ \t].*)?\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
+ m.scan(/^install-rb-default:[ \t]*(\S+)\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
oldrb = installrb.keys.sort
newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
@@ -86,17 +62,11 @@ 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 => verbose?)
+ FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, :verbose => true)
end
end
return false
end
- srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].map {|fn| File.basename(fn)}.sort
- if !srcs.empty?
- old_srcs = m[/^ORIG_SRCS[ \t]*=[ \t](.*)/, 1] or return false
- old_srcs.split.sort == srcs or return false
- end
$target = target
$extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
if $static.nil?
@@ -119,10 +89,8 @@ def extract_makefile(makefile, keep = true)
end
def extmake(target)
- unless $configure_only || verbose?
- print "#{$message} #{target}\n"
- $stdout.flush
- end
+ print "#{$message} #{target}\n"
+ $stdout.flush
FileUtils.mkpath target unless File.directory?(target)
begin
@@ -166,7 +134,7 @@ def extmake(target)
remove_const(:MAKEFILE_CONFIG)
const_set(:MAKEFILE_CONFIG, mkconfig)
}
- MakeMakefile.class_eval {
+ Object.class_eval {
remove_const(:CONFIG)
const_set(:CONFIG, mkconfig)
}
@@ -176,29 +144,16 @@ def extmake(target)
old_objs = $objs
old_cleanfiles = $distcleanfiles
conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
- if (!ok || ($extconf_h && !File.exist?($extconf_h)) ||
+ if (($extconf_h && !File.exist?($extconf_h)) ||
!(t = modified?(makefile, MTIMES)) ||
[conf, "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
then
ok = false
- if $configure_only
- if verbose?
- print "#{conf}\n" if conf
- else
- print "#{$message} #{target}\n"
- end
- $stdout.flush
- end
init_mkmf
Logging::logfile 'mkmf.log'
rm_f makefile
if conf
- Logging.open do
- unless verbose?
- $stderr.reopen($stdout.reopen(@null))
- end
- load $0 = conf
- end
+ load $0 = conf
else
create_makefile(target)
end
@@ -207,42 +162,30 @@ def extmake(target)
end
rescue SystemExit
# ignore
- rescue => error
- ok = false
ensure
rm_f "conftest*"
+ config = $0
$0 = $PROGRAM_NAME
end
end
- ok &&= File.open(makefile){|f| !f.gets[DUMMY_SIGNATURE]}
ok = yield(ok) if block_given?
unless ok
open(makefile, "w") do |f|
- f.puts "# " + DUMMY_SIGNATURE
f.print(*dummy_makefile(CONFIG["srcdir"]))
end
-
- mess = "Failed to configure #{target}. It will not be installed.\n"
- if error
- mess = "#{error}\n#{mess}"
- end
-
- Logging::message(mess) if Logging.log_opened?
- print(mess)
- $stdout.flush
return true
end
args = sysquote($mflags)
- unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
+ unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
end
- if $static and ok and !$objs.empty? and !File.fnmatch?("-*", target)
+ if $static
args += ["static"] unless $clean
- $extlist.push [$static, target, $target, $preload]
+ $extlist.push [$static, $target, File.basename($target), $preload]
end
FileUtils.rm_f(old_cleanfiles - $distcleanfiles)
FileUtils.rm_f(old_objs - $objs)
- unless $configure_only or system($make, *args)
+ unless system($make, *args)
$ignore or $continue or return false
end
$compiled[target] = true
@@ -257,13 +200,12 @@ def extmake(target)
$extlibs ||= []
$extpath ||= []
unless $mswin
- $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ")
+ $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
end
- $extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS))
+ $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
$extpath |= $LIBPATH
end
ensure
- Logging::log_close
unless $ignore
RbConfig.module_eval {
remove_const(:CONFIG)
@@ -271,7 +213,7 @@ def extmake(target)
remove_const(:MAKEFILE_CONFIG)
const_set(:MAKEFILE_CONFIG, mkconfig0)
}
- MakeMakefile.class_eval {
+ Object.class_eval {
remove_const(:CONFIG)
const_set(:CONFIG, mkconfig0)
}
@@ -296,7 +238,7 @@ end
def parse_args()
$mflags = []
- $makeflags = [] # for make command to build ruby, so quoted
+ $makeflags = []
$optparser ||= OptionParser.new do |opts|
opts.on('-n') {$dryrun = true}
@@ -387,13 +329,11 @@ if target = ARGV.shift and /^[a-z-]+$/ =~ target
$mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
"INSTALL_DATA=install -c -p -m 0644",
"MAKEDIRS=mkdir -p") if $dryrun
- when /configure/
- $configure_only = true
end
end
unless $message
if target
- $message = target.sub(/^(\w+?)e?\b/, '\1ing').tr('-', ' ')
+ $message = target.sub(/^(\w+)e?\b/, '\1ing').tr('-', ' ')
else
$message = "compiling"
end
@@ -411,7 +351,9 @@ $ruby << " -I'$(topdir)'"
unless CROSS_COMPILING
$ruby << " -I'$(top_srcdir)/lib'"
$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)}"
end
$mflags << "ruby=#$ruby"
@@ -455,7 +397,7 @@ end unless $extstatic
ext_prefix = "#{$top_srcdir}/ext"
exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
withes, withouts = %w[--with --without].collect {|w|
- if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
+ if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
nil
elsif (w = w.grep(String)).empty?
proc {true}
@@ -474,7 +416,6 @@ cond = proc {|ext, *|
withes.call(cond1) or !withouts.call(cond1)
}
($extension || %w[*]).each do |e|
- e = e.sub(/\A(?:\.\/)+/, '')
exts |= Dir.glob("#{ext_prefix}/#{e}/**/extconf.rb").collect {|d|
d = File.dirname(d)
d.slice!(0, ext_prefix.length + 1)
@@ -498,13 +439,12 @@ Dir::chdir('ext')
hdrdir = $hdrdir
$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
exts.each do |d|
- $static = $force_static ? true : $static_ext[target]
+ $static = $force_static ? $static_ext[target] : nil
if $ignore or !$nodynamic or $static
extmake(d) or abort
end
end
-
$top_srcdir = srcdir
$topdir = "."
$hdrdir = hdrdir
@@ -534,7 +474,7 @@ if $ignore
end
$extinit ||= ""
-$extobjs ||= []
+$extobjs ||= ""
$extpath ||= []
$extflags ||= ""
$extlibs ||= []
@@ -543,7 +483,7 @@ unless $extlist.empty?
list = $extlist.dup
built = []
while e = list.shift
- s,t,i,r,os = e
+ s,t,i,r = e
if r and !(r -= built).empty?
l = list.size
if (while l > 0; break true if r.include?(list[l-=1][1]) end)
@@ -551,27 +491,31 @@ unless $extlist.empty?
end
next
end
- $extinit << " init(Init_#{File.basename i}, \"#{i}.so\");\n"
- $extobjs << format("ext/%s/%s.%s", t, File.basename(i), $LIBEXT)
- built << t
+ f = format("%s/%s.%s", t, i, $LIBEXT)
+ if File.exist?(f)
+ $extinit << " init(Init_#{i}, \"#{t}.so\");\n"
+ $extobjs << "ext/#{f} "
+ built << t
+ end
end
src = %{\
-#include "ruby/ruby.h"
+#include "ruby.h"
#define init(func, name) { \\
- extern void func(void); \\
+ extern void func _((void)); \\
ruby_init_ext(name, func); \\
}
-void ruby_init_ext(const char *name, void (*init)(void));
+void ruby_init_ext _((const char *name, void (*init)(void)));
-void Init_ext(void)\n{\n#$extinit}
+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}
end
+ $extobjs = "ext/#{extinit.o} #{$extobjs}"
if RUBY_PLATFORM =~ /beos/
$extflags.delete("-L/usr/local/lib")
end
@@ -580,6 +524,7 @@ void Init_ext(void)\n{\n#$extinit}
conf = [
['LIBRUBY_SO_UPDATE', '$(LIBRUBY_EXTS)'],
['SETUP', $setup],
+ [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
].map {|n, v|
"#{n}=#{v}" if v and !(v = v.strip).empty?
@@ -604,14 +549,17 @@ Dir.chdir ".."
unless $destdir.to_s.empty?
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end
+message = "making #{rubies.join(', ')}"
+$mflags.concat(rubies)
$makeflags.uniq!
+$makeflags.concat(rubies)
if $nmake == ?b
unless (vars = $mflags.grep(/\A\w+=/n)).empty?
open(mkf = "libruby.mk", "wb") do |tmf|
tmf.puts("!include Makefile")
tmf.puts
- tmf.puts(*vars.map {|v| v.sub(/\=/, " = ")})
+ tmf.puts(*vars.map {|v| v.sub(/=/, " = ")})
tmf.puts("PRE_LIBRUBY_UPDATE = del #{mkf}")
end
$mflags.unshift("-f#{mkf}")
@@ -620,80 +568,13 @@ if $nmake == ?b
end
$mflags.unshift("topdir=#$topdir")
ENV.delete("RUBYOPT")
-if $configure_only and $command_output
- exts.map! {|d| "ext/#{d}/."}
- open($command_output, "wb") do |mf|
- mf.puts "V = 0"
- mf.puts "Q1 = $(V:1=)"
- mf.puts "Q = $(Q1:0=@)"
- mf.puts "ECHO1 = $(V:1=@:)"
- mf.puts "ECHO = $(ECHO1:0=@echo)"
- mf.puts "MFLAGS = -$(MAKEFLAGS)" if $nmake
- mf.puts
-
- def mf.macro(name, values, max = 70)
- print name, " ="
- w = w0 = name.size + 2
- h = " \\\n" + "\t" * (w / 8) + " " * (w % 8)
- values.each do |s|
- if s.size + w > max
- print h
- w = w0
- end
- print " ", s
- w += s.size + 1
- end
- puts
- end
-
- mf.macro "extensions", exts
- mf.macro "EXTOBJS", $extlist.empty? ? ["dmyext.#{$OBJEXT}"] : ["ext/extinit.#{$OBJEXT}", *$extobjs]
- mf.macro "EXTLIBS", $extlibs
- mf.macro "EXTLDFLAGS", $extflags.split
- mf.puts
- targets = %w[all install static install-so install-rb clean distclean realclean]
- targets.each do |tgt|
- mf.puts "#{tgt}: $(extensions:/.=/#{tgt})"
- end
- mf.puts
- mf.puts "clean:\n\t-$(Q)$(RM) ext/extinit.#{$OBJEXT}"
- mf.puts "distclean:\n\t-$(Q)$(RM) ext/extinit.c"
- mf.puts
- mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})"
- (["all static"] + rubies).each_with_index do |tgt, i|
- mf.print "#{tgt}:\n\t$(Q)$(MAKE) "
- mf.print "$(MFLAGS) "
- if enable_config("shared", $enable_shared)
- mf.print %[DLDOBJS="$(EXTOBJS) $(ENCOBJS)" EXTSOLIBS="$(EXTLIBS)" ]
- mf.print 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) '
- else
- mf.print %[EXTOBJS="$(EXTOBJS) $(ENCOBJS)" EXTLIBS="$(EXTLIBS)" ]
- end
- mf.print 'EXTLDFLAGS="$(EXTLDFLAGS)" '
- if i == 0
- mf.puts rubies.join(' ')
- else
- mf.puts '$@'
- end
- end
- mf.puts
- exec = config_string("exec") {|str| str + " "}
- targets.each do |tgt|
- exts.each do |d|
- mf.puts "#{d[0..-2]}#{tgt}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) V=$(V) $(@F)"
- end
- end
- end
-elsif $command_output
- message = "making #{rubies.join(', ')}"
+if $command_output
message = "echo #{message}"
- $mflags.concat(rubies)
- $makeflags.concat(rubies)
cmd = $makeflags.map {|ss|ss.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ')
open($command_output, 'wb') do |ff|
case $command_output
when /\.sh\z/
- ff.puts message, "rm -f \"$0\"; exec \"$@\" #{cmd}"
+ ff.puts message, "rm -f $0; exec \"$@\" #{cmd}"
when /\.bat\z/
["@echo off", message, "%* #{cmd}", "del %0 & exit %ERRORLEVEL%"].each do |ss|
ff.print ss, "\r\n"
@@ -703,11 +584,9 @@ elsif $command_output
end
ff.chmod(0755)
end
-elsif !$configure_only
- message = "making #{rubies.join(', ')}"
+else
puts message
$stdout.flush
- $mflags.concat(rubies)
system($make, *sysquote($mflags)) or exit($?.exitstatus)
end
diff --git a/ext/fcntl/.cvsignore b/ext/fcntl/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/fcntl/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 3538d94948..b0992f30d8 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -14,6 +14,12 @@
fcntl - load the C fcntl.h defines
+= SYNOPSIS
+
+ require "fcntl"
+ m = s.fcntl(Fcntl::F_GETFL, 0)
+ f.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK|m)
+
= DESCRIPTION
This module is just a translation of the C <fcntl.h> file.
@@ -31,34 +37,76 @@ pack up your own arguments to pass as args for locking functions, etc.
/* Fcntl loads the constants defined in the system's <fcntl.h> C header
* file, and used with both the fcntl(2) and open(2) POSIX system calls.
*
- * To perform a fcntl(2) operation, use IO::fcntl.
+ * Copyright (C) 1997-2001 Yukihiro Matsumoto
+ *
+ * Documented by mathew <meta@pobox.com>
+ *
+ * = Usage
+ *
+ * To perform a fcntl(2) operation, use IO::fcntl in the core classes.
*
* To perform an open(2) operation, use IO::sysopen.
*
- * The set of operations and constants available depends upon specific
- * operating system. Some values listed below may not be supported on your
- * system.
+ * The set of operations and constants available depends upon specific OS
+ * platform. Some values listed below may not be supported on your system.
*
- * See your fcntl(2) man page for complete details.
+ * The constants supported by Ruby for use with IO::fcntl are:
*
- * Open /tmp/tempfile as a write-only file that is created if it doesn't
- * exist:
+ * - F_DUPFD - duplicate a close-on-exec file handle to a non-close-on-exec
+ * file handle.
*
- * require 'fcntl'
+ * - F_GETFD - read the close-on-exec flag of a file handle.
*
- * fd = IO.sysopen('/tmp/tempfile',
- * Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
- * f = IO.open(fd)
- * f.syswrite("TEMP DATA")
- * f.close
+ * - F_SETFD - set the close-on-exec flag of a file handle.
+ *
+ * - FD_CLOEXEC - the value of the close-on-exec flag.
+ *
+ * - F_GETFL - get file descriptor flags.
+ *
+ * - F_SETFL - set file descriptor flags.
+ *
+ * - O_APPEND, O_NONBLOCK, etc (see below) - file descriptor flag
+ * values for the above.
+ *
+ * - F_GETLK - determine whether a given region of a file is locked.
+ *
+ * - F_SETLK - acquire a lock on a region of a file.
+ *
+ * - F_SETLKW - acquire a lock on a region of a file, waiting if necessary.
*
- * Get the flags on file +s+:
+ * - F_RDLCK, F_WRLCK, F_UNLCK - types of lock for the above.
*
- * m = s.fcntl(Fcntl::F_GETFL, 0)
+ * The constants supported by Ruby for use with IO::sysopen are:
*
- * Set the non-blocking flag on +f+ in addition to the existing flags in +m+.
+ * - O_APPEND - open file in append mode.
*
- * f.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK|m)
+ * - O_NOCTTY - open tty without it becoming controlling tty.
+ *
+ * - O_CREAT - create file if it doesn't exist.
+ *
+ * - O_EXCL - used with O_CREAT, fail if file exists.
+ *
+ * - O_TRUNC - truncate file on open.
+ *
+ * - O_NONBLOCK / O_NDELAY - open in non-blocking mode.
+ *
+ * - O_RDONLY - open read-only.
+ *
+ * - O_WRONLY - open write-only.
+ *
+ * - O_RDWR - open read-write.
+ *
+ * - O_ACCMODE - mask to extract read/write flags.
+ *
+ * Example:
+ *
+ * require 'fcntl'
+ *
+ * fd = IO::sysopen('/tmp/tempfile',
+ * Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
+ * f = IO.open(fd)
+ * f.syswrite("TEMP DATA")
+ * f.close
*
*/
void
@@ -66,180 +114,74 @@ Init_fcntl()
{
VALUE mFcntl = rb_define_module("Fcntl");
#ifdef F_DUPFD
- /* Document-const: F_DUPFD
- *
- * Duplicate a file descriptor to the mimimum unused file descriptor
- * greater than or equal to the argument.
- *
- * The close-on-exec flag of the duplicated file descriptor is set.
- * (Ruby uses F_DUPFD_CLOEXEC internally if available to avoid race
- * condition. F_SETFD is used if F_DUPFD_CLOEXEC is not available.)
- */
rb_define_const(mFcntl, "F_DUPFD", INT2NUM(F_DUPFD));
#endif
#ifdef F_GETFD
- /* Document-const: F_GETFD
- *
- * Read the close-on-exec flag of a file descriptor.
- */
rb_define_const(mFcntl, "F_GETFD", INT2NUM(F_GETFD));
#endif
#ifdef F_GETLK
- /* Document-const: F_GETLK
- *
- * Determine whether a given region of a file is locked. This uses one of
- * the F_*LK flags.
- */
rb_define_const(mFcntl, "F_GETLK", INT2NUM(F_GETLK));
#endif
#ifdef F_SETFD
- /* Document-const: F_SETFD
- *
- * Set the close-on-exec flag of a file descriptor.
- */
rb_define_const(mFcntl, "F_SETFD", INT2NUM(F_SETFD));
#endif
#ifdef F_GETFL
- /* Document-const: F_GETFL
- *
- * Get the file descriptor flags. This will be one or more of the O_*
- * flags.
- */
rb_define_const(mFcntl, "F_GETFL", INT2NUM(F_GETFL));
#endif
#ifdef F_SETFL
- /* Document-const: F_SETFL
- *
- * Set the file descriptor flags. This will be one or more of the O_*
- * flags.
- */
rb_define_const(mFcntl, "F_SETFL", INT2NUM(F_SETFL));
#endif
#ifdef F_SETLK
- /* Document-const: F_SETLK
- *
- * Acquire a lock on a region of a file. This uses one of the F_*LCK
- * flags.
- */
rb_define_const(mFcntl, "F_SETLK", INT2NUM(F_SETLK));
#endif
#ifdef F_SETLKW
- /* Document-const: F_SETLKW
- *
- * Acquire a lock on a region of a file, waiting if necessary. This uses
- * one of the F_*LCK flags
- */
rb_define_const(mFcntl, "F_SETLKW", INT2NUM(F_SETLKW));
#endif
#ifdef FD_CLOEXEC
- /* Document-const: FD_CLOEXEC
- *
- * the value of the close-on-exec flag.
- */
rb_define_const(mFcntl, "FD_CLOEXEC", INT2NUM(FD_CLOEXEC));
#endif
#ifdef F_RDLCK
- /* Document-const: F_RDLCK
- *
- * Read lock for a region of a file
- */
rb_define_const(mFcntl, "F_RDLCK", INT2NUM(F_RDLCK));
#endif
#ifdef F_UNLCK
- /* Document-const: F_UNLCK
- *
- * Remove lock for a region of a file
- */
rb_define_const(mFcntl, "F_UNLCK", INT2NUM(F_UNLCK));
#endif
#ifdef F_WRLCK
- /* Document-const: F_WRLCK
- *
- * Write lock for a region of a file
- */
rb_define_const(mFcntl, "F_WRLCK", INT2NUM(F_WRLCK));
#endif
#ifdef O_CREAT
- /* Document-const: O_CREAT
- *
- * Create the file if it doesn't exist
- */
rb_define_const(mFcntl, "O_CREAT", INT2NUM(O_CREAT));
#endif
#ifdef O_EXCL
- /* Document-const: O_EXCL
- *
- * Used with O_CREAT, fail if the file exists
- */
rb_define_const(mFcntl, "O_EXCL", INT2NUM(O_EXCL));
#endif
#ifdef O_NOCTTY
- /* Document-const: O_NOCTTY
- *
- * Open TTY without it becoming the controlling TTY
- */
rb_define_const(mFcntl, "O_NOCTTY", INT2NUM(O_NOCTTY));
#endif
#ifdef O_TRUNC
- /* Document-const: O_TRUNC
- *
- * Truncate the file on open
- */
rb_define_const(mFcntl, "O_TRUNC", INT2NUM(O_TRUNC));
#endif
#ifdef O_APPEND
- /* Document-const: O_APPEND
- *
- * Open the file in append mode
- */
rb_define_const(mFcntl, "O_APPEND", INT2NUM(O_APPEND));
#endif
#ifdef O_NONBLOCK
- /* Document-const: O_NONBLOCK
- *
- * Open the file in non-blocking mode
- */
rb_define_const(mFcntl, "O_NONBLOCK", INT2NUM(O_NONBLOCK));
#endif
#ifdef O_NDELAY
- /* Document-const: O_NDELAY
- *
- * Open the file in non-blocking mode
- */
rb_define_const(mFcntl, "O_NDELAY", INT2NUM(O_NDELAY));
#endif
#ifdef O_RDONLY
- /* Document-const: O_RDONLY
- *
- * Open the file in read-only mode
- */
rb_define_const(mFcntl, "O_RDONLY", INT2NUM(O_RDONLY));
#endif
#ifdef O_RDWR
- /* Document-const: O_RDWR
- *
- * Open the file in read-write mode
- */
rb_define_const(mFcntl, "O_RDWR", INT2NUM(O_RDWR));
#endif
#ifdef O_WRONLY
- /* Document-const: O_WRONLY
- *
- * Open the file in write-only mode.
- */
rb_define_const(mFcntl, "O_WRONLY", INT2NUM(O_WRONLY));
#endif
#ifdef O_ACCMODE
- /* Document-const: O_ACCMODE
- *
- * Mask to extract the read/write flags
- */
rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_ACCMODE));
#else
- /* Document-const: O_ACCMODE
- *
- * Mask to extract the read/write flags
- */
rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_RDONLY | O_WRONLY | O_RDWR));
#endif
}
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index 2788bce4c5..9dc619fb94 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -5,12 +5,12 @@ VALUE cFiddleClosure;
typedef struct {
void * code;
ffi_closure *pcl;
- ffi_cif cif;
+ ffi_cif * cif;
int argc;
ffi_type **argv;
} fiddle_closure;
-#if defined(MACOSX) || defined(__linux__) || defined(__OpenBSD__)
+#if defined(MACOSX) || defined(__linux) || defined(__OpenBSD__)
#define DONT_USE_FFI_CLOSURE_ALLOC
#endif
@@ -21,8 +21,9 @@ dealloc(void * ptr)
#ifndef DONT_USE_FFI_CLOSURE_ALLOC
ffi_closure_free(cls->pcl);
#else
- munmap(cls->pcl, sizeof(*cls->pcl));
+ munmap(cls->pcl, sizeof(cls->pcl));
#endif
+ xfree(cls->cif);
if (cls->argv) xfree(cls->argv);
xfree(cls);
}
@@ -36,7 +37,7 @@ closure_memsize(const void * ptr)
if (ptr) {
size += sizeof(*cls);
#if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
- size += ffi_raw_size(&cls->cif);
+ size += ffi_raw_size(cls->cif);
#endif
size += sizeof(*cls->argv);
size += sizeof(ffi_closure);
@@ -46,7 +47,7 @@ closure_memsize(const void * ptr)
const rb_data_type_t closure_data_type = {
"fiddle/closure",
- {0, dealloc, closure_memsize,},
+ 0, dealloc, closure_memsize,
};
void
@@ -56,7 +57,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
VALUE rbargs = rb_iv_get(self, "@args");
VALUE ctype = rb_iv_get(self, "@ctype");
int argc = RARRAY_LENINT(rbargs);
- VALUE params = rb_ary_tmp_new(argc);
+ VALUE *params = xcalloc(argc, sizeof(VALUE *));
VALUE ret;
VALUE cPointer;
int i, type;
@@ -70,46 +71,27 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
argc = 0;
break;
case TYPE_INT:
- rb_ary_push(params, INT2NUM(*(int *)args[i]));
- break;
- case -TYPE_INT:
- rb_ary_push(params, UINT2NUM(*(unsigned int *)args[i]));
+ params[i] = INT2NUM(*(int *)args[i]);
break;
case TYPE_VOIDP:
- rb_ary_push(params,
- rb_funcall(cPointer, rb_intern("[]"), 1,
- PTR2NUM(*(void **)args[i])));
+ params[i] = rb_funcall(cPointer, rb_intern("[]"), 1,
+ PTR2NUM(*(void **)args[i]));
break;
case TYPE_LONG:
- rb_ary_push(params, LONG2NUM(*(long *)args[i]));
- break;
- case -TYPE_LONG:
- rb_ary_push(params, ULONG2NUM(*(unsigned long *)args[i]));
+ params[i] = LONG2NUM(*(long *)args[i]);
break;
case TYPE_CHAR:
- rb_ary_push(params, INT2NUM(*(signed char *)args[i]));
- break;
- case -TYPE_CHAR:
- rb_ary_push(params, UINT2NUM(*(unsigned char *)args[i]));
- break;
- case TYPE_SHORT:
- rb_ary_push(params, INT2NUM(*(signed short *)args[i]));
- break;
- case -TYPE_SHORT:
- rb_ary_push(params, UINT2NUM(*(unsigned short *)args[i]));
+ params[i] = INT2NUM(*(char *)args[i]);
break;
case TYPE_DOUBLE:
- rb_ary_push(params, rb_float_new(*(double *)args[i]));
+ params[i] = rb_float_new(*(double *)args[i]);
break;
case TYPE_FLOAT:
- rb_ary_push(params, rb_float_new(*(float *)args[i]));
+ params[i] = rb_float_new(*(float *)args[i]);
break;
#if HAVE_LONG_LONG
case TYPE_LONG_LONG:
- rb_ary_push(params, LL2NUM(*(LONG_LONG *)args[i]));
- break;
- case -TYPE_LONG_LONG:
- rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)args[i]));
+ params[i] = rb_ull2inum(*(unsigned LONG_LONG *)args[i]);
break;
#endif
default:
@@ -117,8 +99,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
}
}
- ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_PTR(params));
- RB_GC_GUARD(params);
+ ret = rb_funcall2(self, rb_intern("call"), argc, params);
type = NUM2INT(ctype);
switch (type) {
@@ -127,22 +108,15 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
case TYPE_LONG:
*(long *)resp = NUM2LONG(ret);
break;
- case -TYPE_LONG:
- *(unsigned long *)resp = NUM2ULONG(ret);
- break;
case TYPE_CHAR:
- case TYPE_SHORT:
- case TYPE_INT:
- *(ffi_sarg *)resp = NUM2INT(ret);
- break;
- case -TYPE_CHAR:
- case -TYPE_SHORT:
- case -TYPE_INT:
- *(ffi_arg *)resp = NUM2UINT(ret);
+ *(char *)resp = NUM2INT(ret);
break;
case TYPE_VOIDP:
*(void **)resp = NUM2PTR(ret);
break;
+ case TYPE_INT:
+ *(int *)resp = NUM2INT(ret);
+ break;
case TYPE_DOUBLE:
*(double *)resp = NUM2DBL(ret);
break;
@@ -151,15 +125,13 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
break;
#if HAVE_LONG_LONG
case TYPE_LONG_LONG:
- *(LONG_LONG *)resp = NUM2LL(ret);
- break;
- case -TYPE_LONG_LONG:
- *(unsigned LONG_LONG *)resp = NUM2ULL(ret);
+ *(unsigned LONG_LONG *)resp = rb_big2ull(ret);
break;
#endif
default:
rb_raise(rb_eRuntimeError, "closure retval: %d", type);
}
+ xfree(params);
}
static VALUE
@@ -176,6 +148,7 @@ allocate(VALUE klass)
closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);
#endif
+ closure->cif = xmalloc(sizeof(ffi_cif));
return i;
}
@@ -212,7 +185,7 @@ initialize(int rbargc, VALUE argv[], VALUE self)
rb_iv_set(self, "@ctype", ret);
rb_iv_set(self, "@args", args);
- cif = &cl->cif;
+ cif = cl->cif;
pcl = cl->pcl;
result = ffi_prep_cif(cif, NUM2INT(abi), argc,
@@ -228,10 +201,7 @@ initialize(int rbargc, VALUE argv[], VALUE self)
#else
result = ffi_prep_closure(pcl, cif, callback, (void *)self);
cl->code = (void *)pcl;
- i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC);
- if (i) {
- rb_sys_fail("mprotect");
- }
+ mprotect(pcl, sizeof(pcl), PROT_READ | PROT_EXEC);
#endif
if (FFI_OK != result)
@@ -256,55 +226,11 @@ to_i(VALUE self)
void
Init_fiddle_closure()
{
-#if 0
- mFiddle = rb_define_module("Fiddle"); /* let rdoc know about mFiddle */
-#endif
-
- /*
- * Document-class: Fiddle::Closure
- *
- * == Description
- *
- * An FFI closure wrapper, for handling callbacks.
- *
- * == Example
- *
- * closure = Class.new(Fiddle::Closure) {
- * def call
- * 10
- * end
- * }.new(Fiddle::TYPE_INT, [])
- * #=> #<#<Class:0x0000000150d308>:0x0000000150d240>
- * func = Fiddle::Function.new(closure, [], Fiddle::TYPE_INT)
- * #=> #<Fiddle::Function:0x00000001516e58>
- * func.call
- * #=> 10
- */
cFiddleClosure = rb_define_class_under(mFiddle, "Closure", rb_cObject);
rb_define_alloc_func(cFiddleClosure, allocate);
- /*
- * Document-method: new
- *
- * call-seq: new(ret, args, abi = Fiddle::DEFAULT)
- *
- * Construct a new Closure object.
- *
- * * +ret+ is the C type to be returned
- * * +args+ is an Array of arguments, passed to the callback function
- * * +abi+ is the abi of the closure
- *
- * If there is an error in preparing the ffi_cif or ffi_prep_closure,
- * then a RuntimeError will be raised.
- */
rb_define_method(cFiddleClosure, "initialize", initialize, -1);
-
- /*
- * Document-method: to_i
- *
- * Returns the memory address for this closure
- */
rb_define_method(cFiddleClosure, "to_i", to_i, 0);
}
/* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/conversions.c b/ext/fiddle/conversions.c
index d40ddc1f38..bb5361a6c8 100644
--- a/ext/fiddle/conversions.c
+++ b/ext/fiddle/conversions.c
@@ -27,7 +27,7 @@ int_to_ffi_type(int type)
return rb_ffi_type_of(long);
#if HAVE_LONG_LONG
case TYPE_LONG_LONG:
- return rb_ffi_type_of(long_long);
+ return rb_ffi_type_of(int64);
#endif
case TYPE_FLOAT:
return &ffi_type_float;
@@ -42,6 +42,13 @@ int_to_ffi_type(int type)
void
value_to_generic(int type, VALUE src, fiddle_generic * dst)
{
+ int signed_p = 1;
+
+ if (type < 0) {
+ type = -1 * type;
+ signed_p = 0;
+ }
+
switch (type) {
case TYPE_VOID:
break;
@@ -49,35 +56,19 @@ value_to_generic(int type, VALUE src, fiddle_generic * dst)
dst->pointer = NUM2PTR(rb_Integer(src));
break;
case TYPE_CHAR:
- dst->schar = (signed char)NUM2INT(src);
- break;
- case -TYPE_CHAR:
- dst->uchar = (unsigned char)NUM2UINT(src);
- break;
case TYPE_SHORT:
- dst->sshort = (unsigned short)NUM2INT(src);
- break;
- case -TYPE_SHORT:
- dst->sshort = (signed short)NUM2UINT(src);
- break;
case TYPE_INT:
dst->sint = NUM2INT(src);
break;
- case -TYPE_INT:
- dst->uint = NUM2UINT(src);
- break;
case TYPE_LONG:
- dst->slong = NUM2LONG(src);
- break;
- case -TYPE_LONG:
- dst->ulong = NUM2ULONG(src);
+ if (signed_p)
+ dst->slong = NUM2LONG(src);
+ else
+ dst->ulong = NUM2LONG(src);
break;
#if HAVE_LONG_LONG
case TYPE_LONG_LONG:
- dst->slong_long = NUM2LL(src);
- break;
- case -TYPE_LONG_LONG:
- dst->ulong_long = NUM2ULL(src);
+ dst->long_long = rb_big2ull(src);
break;
#endif
case TYPE_FLOAT:
@@ -94,11 +85,17 @@ value_to_generic(int type, VALUE src, fiddle_generic * dst)
VALUE
generic_to_value(VALUE rettype, fiddle_generic retval)
{
+ int signed_p = 1;
int type = NUM2INT(rettype);
VALUE cPointer;
cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
+ if (type < 0) {
+ type = -1 * type;
+ signed_p = 0;
+ }
+
switch (type) {
case TYPE_VOID:
return Qnil;
@@ -106,26 +103,16 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
return rb_funcall(cPointer, rb_intern("[]"), 1,
PTR2NUM((void *)retval.pointer));
case TYPE_CHAR:
- return INT2NUM((signed char)retval.fffi_sarg);
- case -TYPE_CHAR:
- return INT2NUM((unsigned char)retval.fffi_arg);
case TYPE_SHORT:
- return INT2NUM((signed short)retval.fffi_sarg);
- case -TYPE_SHORT:
- return INT2NUM((unsigned short)retval.fffi_arg);
case TYPE_INT:
- return INT2NUM((signed int)retval.fffi_sarg);
- case -TYPE_INT:
- return UINT2NUM((unsigned int)retval.fffi_arg);
+ return INT2NUM(retval.sint);
case TYPE_LONG:
- return LONG2NUM(retval.slong);
- case -TYPE_LONG:
+ if (signed_p) return LONG2NUM(retval.slong);
return ULONG2NUM(retval.ulong);
#if HAVE_LONG_LONG
case TYPE_LONG_LONG:
- return LL2NUM(retval.slong_long);
- case -TYPE_LONG_LONG:
- return ULL2NUM(retval.ulong_long);
+ return rb_ll2inum(retval.long_long);
+ break;
#endif
case TYPE_FLOAT:
return rb_float_new(retval.ffloat);
@@ -134,8 +121,6 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
default:
rb_raise(rb_eRuntimeError, "unknown type %d", type);
}
-
- UNREACHABLE;
}
/* vim: set noet sw=4 sts=4 */
diff --git a/ext/fiddle/conversions.h b/ext/fiddle/conversions.h
index d0a08d6bc0..166c5d9af4 100644
--- a/ext/fiddle/conversions.h
+++ b/ext/fiddle/conversions.h
@@ -5,8 +5,6 @@
typedef union
{
- ffi_arg fffi_arg; /* rvalue smaller than unsigned long */
- ffi_sarg fffi_sarg; /* rvalue smaller than signed long */
unsigned char uchar; /* ffi_type_uchar */
signed char schar; /* ffi_type_schar */
unsigned short ushort; /* ffi_type_sshort */
@@ -18,8 +16,7 @@ typedef union
float ffloat; /* ffi_type_float */
double ddouble; /* ffi_type_double */
#if HAVE_LONG_LONG
- unsigned LONG_LONG ulong_long; /* ffi_type_ulong_long */
- signed LONG_LONG slong_long; /* ffi_type_ulong_long */
+ unsigned LONG_LONG long_long; /* ffi_type_uint64 */
#endif
void * pointer; /* ffi_type_pointer */
} fiddle_generic;
@@ -28,9 +25,9 @@ ffi_type * int_to_ffi_type(int type);
void value_to_generic(int type, VALUE src, fiddle_generic * dst);
VALUE generic_to_value(VALUE rettype, fiddle_generic retval);
-#define VALUE2GENERIC(_type, _src, _dst) value_to_generic((_type), (_src), (_dst))
+#define VALUE2GENERIC(_type, _src, _dst) value_to_generic(_type, _src, _dst)
#define INT2FFI_TYPE(_type) int_to_ffi_type(_type)
-#define GENERIC2VALUE(_type, _retval) generic_to_value((_type), (_retval))
+#define GENERIC2VALUE(_type, _retval) generic_to_value(_type, _retval)
#if SIZEOF_VOIDP == SIZEOF_LONG
# define PTR2NUM(x) (ULONG2NUM((unsigned long)(x)))
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 2cb9ae0ace..03b0ac2765 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -9,46 +9,16 @@ unless have_header('ffi.h')
if have_header('ffi/ffi.h')
$defs.push(format('-DUSE_HEADER_HACKS'))
else
- raise "ffi.h is missing. Please install libffi."
+ abort "ffi.h is missing. Please install libffi."
end
end
unless have_library('ffi') || have_library('libffi')
- raise "libffi is missing. Please install libffi."
+ abort "libffi is missing. Please install libffi."
end
have_header 'sys/mman.h'
-if have_header "dlfcn.h"
- have_library "dl"
-
- %w{ dlopen dlclose dlsym }.each do |func|
- abort "missing function #{func}" unless have_func(func)
- end
-
- have_func "dlerror"
-elsif have_header "windows.h"
- %w{ LoadLibrary FreeLibrary GetProcAddress }.each do |func|
- abort "missing function #{func}" unless have_func(func)
- end
-end
-
-have_const('FFI_STDCALL', 'ffi.h') || have_const('FFI_STDCALL', 'ffi/ffi.h')
-
-config = File.read(RbConfig.expand(File.join($arch_hdrdir, "ruby/config.h")))
-types = {"SIZE_T"=>"SSIZE_T", "PTRDIFF_T"=>nil, "INTPTR_T"=>nil}
-types.each do |type, signed|
- if /^\#define\s+SIZEOF_#{type}\s+(SIZEOF_(.+)|\d+)/ =~ config
- if size = $2 and size != 'VOIDP'
- size = types.fetch(size) {size}
- $defs << format("-DTYPE_%s=TYPE_%s", signed||type, size)
- end
- if signed
- check_signedness(type.downcase, "stddef.h")
- end
- end
-end
-
create_makefile 'fiddle'
# :startdoc:
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c
index 89644301aa..2580ac0e53 100644
--- a/ext/fiddle/fiddle.c
+++ b/ext/fiddle/fiddle.c
@@ -1,458 +1,30 @@
#include <fiddle.h>
VALUE mFiddle;
-VALUE rb_eFiddleError;
-#ifndef TYPE_SSIZE_T
-# if SIZEOF_SIZE_T == SIZEOF_INT
-# define TYPE_SSIZE_T TYPE_INT
-# elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define TYPE_SSIZE_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-# define TYPE_SSIZE_T TYPE_LONG_LONG
-# endif
-#endif
-#define TYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*TYPE_SSIZE_T)
-
-#ifndef TYPE_PTRDIFF_T
-# if SIZEOF_PTRDIFF_T == SIZEOF_INT
-# define TYPE_PTRDIFF_T TYPE_INT
-# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-# define TYPE_PTRDIFF_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
-# define TYPE_PTRDIFF_T TYPE_LONG_LONG
-# endif
-#endif
-
-#ifndef TYPE_INTPTR_T
-# if SIZEOF_INTPTR_T == SIZEOF_INT
-# define TYPE_INTPTR_T TYPE_INT
-# elif SIZEOF_INTPTR_T == SIZEOF_LONG
-# define TYPE_INTPTR_T TYPE_LONG
-# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
-# define TYPE_INTPTR_T TYPE_LONG_LONG
-# endif
-#endif
-#define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
-
-void Init_fiddle_pointer(void);
-
-/*
- * call-seq: Fiddle.malloc(size)
- *
- * Allocate +size+ bytes of memory and return the integer memory address
- * for the allocated memory.
- */
-static VALUE
-rb_fiddle_malloc(VALUE self, VALUE size)
-{
- void *ptr;
-
- rb_secure(4);
- ptr = (void*)ruby_xmalloc(NUM2INT(size));
- return PTR2NUM(ptr);
-}
-
-/*
- * call-seq: Fiddle.realloc(addr, size)
- *
- * Change the size of the memory allocated at the memory location +addr+ to
- * +size+ bytes. Returns the memory address of the reallocated memory, which
- * may be different than the address passed in.
- */
-static VALUE
-rb_fiddle_realloc(VALUE self, VALUE addr, VALUE size)
-{
- void *ptr = NUM2PTR(addr);
-
- rb_secure(4);
- ptr = (void*)ruby_xrealloc(ptr, NUM2INT(size));
- return PTR2NUM(ptr);
-}
-
-/*
- * call-seq: Fiddle.free(addr)
- *
- * Free the memory at address +addr+
- */
-VALUE
-rb_fiddle_free(VALUE self, VALUE addr)
-{
- void *ptr = NUM2PTR(addr);
-
- rb_secure(4);
- ruby_xfree(ptr);
- return Qnil;
-}
-
-/*
- * call-seq: Fiddle.dlunwrap(addr)
- *
- * Returns the hexadecimal representation of a memory pointer address +addr+
- *
- * Example:
- *
- * lib = Fiddle.dlopen('/lib64/libc-2.15.so')
- * => #<Fiddle::Handle:0x00000001342460>
- *
- * lib['strcpy'].to_s(16)
- * => "7f59de6dd240"
- *
- * Fiddle.dlunwrap(Fiddle.dlwrap(lib['strcpy'].to_s(16)))
- * => "7f59de6dd240"
- */
-VALUE
-rb_fiddle_ptr2value(VALUE self, VALUE addr)
+void Init_fiddle()
{
- rb_secure(4);
- return (VALUE)NUM2PTR(addr);
-}
-
-/*
- * call-seq: Fiddle.dlwrap(val)
- *
- * Returns a memory pointer of a function's hexadecimal address location +val+
- *
- * Example:
- *
- * lib = Fiddle.dlopen('/lib64/libc-2.15.so')
- * => #<Fiddle::Handle:0x00000001342460>
- *
- * Fiddle.dlwrap(lib['strcpy'].to_s(16))
- * => 25522520
- */
-static VALUE
-rb_fiddle_value2ptr(VALUE self, VALUE val)
-{
- return PTR2NUM((void*)val);
-}
-
-void Init_fiddle_handle(void);
-
-void
-Init_fiddle(void)
-{
- /*
- * Document-module: Fiddle
- *
- * A libffi wrapper for Ruby.
- *
- * == Description
- *
- * Fiddle is an extension to translate a foreign function interface (FFI)
- * with ruby.
- *
- * It wraps {libffi}[http://sourceware.org/libffi/], a popular C library
- * which provides a portable interface that allows code written in one
- * language to clal code written in another language.
- *
- * == Example
- *
- * Here we will use Fiddle::Function to wrap {floor(3) from
- * libm}[http://linux.die.net/man/3/floor]
- *
- * require 'fiddle'
- *
- * libm = Fiddle.dlopen('/lib/libm.so.6')
- *
- * floor = Fiddle::Function.new(
- * libm['floor'],
- * [Fiddle::TYPE_DOUBLE],
- * Fiddle::TYPE_DOUBLE
- * )
- *
- * puts floor.call(3.14159) #=> 3.0
- *
- *
- */
mFiddle = rb_define_module("Fiddle");
- /*
- * Document-class: Fiddle::DLError
- *
- * standard dynamic load exception
- */
- rb_eFiddleError = rb_define_class_under(mFiddle, "DLError", rb_eStandardError);
-
- /* Document-const: TYPE_VOID
- *
- * C type - void
- */
rb_define_const(mFiddle, "TYPE_VOID", INT2NUM(TYPE_VOID));
-
- /* Document-const: TYPE_VOIDP
- *
- * C type - void*
- */
rb_define_const(mFiddle, "TYPE_VOIDP", INT2NUM(TYPE_VOIDP));
-
- /* Document-const: TYPE_CHAR
- *
- * C type - char
- */
rb_define_const(mFiddle, "TYPE_CHAR", INT2NUM(TYPE_CHAR));
-
- /* Document-const: TYPE_SHORT
- *
- * C type - short
- */
rb_define_const(mFiddle, "TYPE_SHORT", INT2NUM(TYPE_SHORT));
-
- /* Document-const: TYPE_INT
- *
- * C type - int
- */
rb_define_const(mFiddle, "TYPE_INT", INT2NUM(TYPE_INT));
-
- /* Document-const: TYPE_LONG
- *
- * C type - long
- */
rb_define_const(mFiddle, "TYPE_LONG", INT2NUM(TYPE_LONG));
-
#if HAVE_LONG_LONG
- /* Document-const: TYPE_LONG_LONG
- *
- * C type - long long
- */
rb_define_const(mFiddle, "TYPE_LONG_LONG", INT2NUM(TYPE_LONG_LONG));
#endif
-
- /* Document-const: TYPE_FLOAT
- *
- * C type - float
- */
rb_define_const(mFiddle, "TYPE_FLOAT", INT2NUM(TYPE_FLOAT));
-
- /* Document-const: TYPE_DOUBLE
- *
- * C type - double
- */
rb_define_const(mFiddle, "TYPE_DOUBLE", INT2NUM(TYPE_DOUBLE));
- /* Document-const: TYPE_SIZE_T
- *
- * C type - size_t
- */
- rb_define_const(mFiddle, "TYPE_SIZE_T", INT2NUM(TYPE_SIZE_T));
-
- /* Document-const: TYPE_SSIZE_T
- *
- * C type - ssize_t
- */
- rb_define_const(mFiddle, "TYPE_SSIZE_T", INT2NUM(TYPE_SSIZE_T));
-
- /* Document-const: TYPE_PTRDIFF_T
- *
- * C type - ptrdiff_t
- */
- rb_define_const(mFiddle, "TYPE_PTRDIFF_T", INT2NUM(TYPE_PTRDIFF_T));
-
- /* Document-const: TYPE_INTPTR_T
- *
- * C type - intptr_t
- */
- rb_define_const(mFiddle, "TYPE_INTPTR_T", INT2NUM(TYPE_INTPTR_T));
-
- /* Document-const: TYPE_UINTPTR_T
- *
- * C type - uintptr_t
- */
- rb_define_const(mFiddle, "TYPE_UINTPTR_T", INT2NUM(TYPE_UINTPTR_T));
-
- /* Document-const: ALIGN_VOIDP
- *
- * The alignment size of a void*
- */
- rb_define_const(mFiddle, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
- /* Document-const: ALIGN_CHAR
- *
- * The alignment size of a char
- */
- rb_define_const(mFiddle, "ALIGN_CHAR", INT2NUM(ALIGN_CHAR));
-
- /* Document-const: ALIGN_SHORT
- *
- * The alignment size of a short
- */
- rb_define_const(mFiddle, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-
- /* Document-const: ALIGN_INT
- *
- * The alignment size of an int
- */
- rb_define_const(mFiddle, "ALIGN_INT", INT2NUM(ALIGN_INT));
-
- /* Document-const: ALIGN_LONG
- *
- * The alignment size of a long
- */
- rb_define_const(mFiddle, "ALIGN_LONG", INT2NUM(ALIGN_LONG));
-
-#if HAVE_LONG_LONG
- /* Document-const: ALIGN_LONG_LONG
- *
- * The alignment size of a long long
- */
- rb_define_const(mFiddle, "ALIGN_LONG_LONG", INT2NUM(ALIGN_LONG_LONG));
-#endif
-
- /* Document-const: ALIGN_FLOAT
- *
- * The alignment size of a float
- */
- rb_define_const(mFiddle, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-
- /* Document-const: ALIGN_DOUBLE
- *
- * The alignment size of a double
- */
- rb_define_const(mFiddle, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-
- /* Document-const: ALIGN_SIZE_T
- *
- * The alignment size of a size_t
- */
- rb_define_const(mFiddle, "ALIGN_SIZE_T", INT2NUM(ALIGN_OF(size_t)));
-
- /* Document-const: ALIGN_SSIZE_T
- *
- * The alignment size of a ssize_t
- */
- rb_define_const(mFiddle, "ALIGN_SSIZE_T", INT2NUM(ALIGN_OF(size_t))); /* same as size_t */
-
- /* Document-const: ALIGN_PTRDIFF_T
- *
- * The alignment size of a ptrdiff_t
- */
- rb_define_const(mFiddle, "ALIGN_PTRDIFF_T", INT2NUM(ALIGN_OF(ptrdiff_t)));
-
- /* Document-const: ALIGN_INTPTR_T
- *
- * The alignment size of a intptr_t
- */
- rb_define_const(mFiddle, "ALIGN_INTPTR_T", INT2NUM(ALIGN_OF(intptr_t)));
-
- /* Document-const: ALIGN_UINTPTR_T
- *
- * The alignment size of a uintptr_t
- */
- rb_define_const(mFiddle, "ALIGN_UINTPTR_T", INT2NUM(ALIGN_OF(uintptr_t)));
-
- /* Document-const: WINDOWS
- *
- * Returns a boolean regarding whether the host is WIN32
- */
#if defined(_WIN32)
rb_define_const(mFiddle, "WINDOWS", Qtrue);
#else
rb_define_const(mFiddle, "WINDOWS", Qfalse);
#endif
- /* Document-const: SIZEOF_VOIDP
- *
- * size of a void*
- */
- rb_define_const(mFiddle, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
-
- /* Document-const: SIZEOF_CHAR
- *
- * size of a char
- */
- rb_define_const(mFiddle, "SIZEOF_CHAR", INT2NUM(sizeof(char)));
-
- /* Document-const: SIZEOF_SHORT
- *
- * size of a short
- */
- rb_define_const(mFiddle, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
-
- /* Document-const: SIZEOF_INT
- *
- * size of an int
- */
- rb_define_const(mFiddle, "SIZEOF_INT", INT2NUM(sizeof(int)));
-
- /* Document-const: SIZEOF_LONG
- *
- * size of a long
- */
- rb_define_const(mFiddle, "SIZEOF_LONG", INT2NUM(sizeof(long)));
-
-#if HAVE_LONG_LONG
- /* Document-const: SIZEOF_LONG_LONG
- *
- * size of a long long
- */
- rb_define_const(mFiddle, "SIZEOF_LONG_LONG", INT2NUM(sizeof(LONG_LONG)));
-#endif
-
- /* Document-const: SIZEOF_FLOAT
- *
- * size of a float
- */
- rb_define_const(mFiddle, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
-
- /* Document-const: SIZEOF_DOUBLE
- *
- * size of a double
- */
- rb_define_const(mFiddle, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
-
- /* Document-const: SIZEOF_SIZE_T
- *
- * size of a size_t
- */
- rb_define_const(mFiddle, "SIZEOF_SIZE_T", INT2NUM(sizeof(size_t)));
-
- /* Document-const: SIZEOF_SSIZE_T
- *
- * size of a ssize_t
- */
- rb_define_const(mFiddle, "SIZEOF_SSIZE_T", INT2NUM(sizeof(size_t))); /* same as size_t */
-
- /* Document-const: SIZEOF_PTRDIFF_T
- *
- * size of a ptrdiff_t
- */
- rb_define_const(mFiddle, "SIZEOF_PTRDIFF_T", INT2NUM(sizeof(ptrdiff_t)));
-
- /* Document-const: SIZEOF_INTPTR_T
- *
- * size of a intptr_t
- */
- rb_define_const(mFiddle, "SIZEOF_INTPTR_T", INT2NUM(sizeof(intptr_t)));
-
- /* Document-const: SIZEOF_UINTPTR_T
- *
- * size of a uintptr_t
- */
- rb_define_const(mFiddle, "SIZEOF_UINTPTR_T", INT2NUM(sizeof(uintptr_t)));
-
- /* Document-const: RUBY_FREE
- *
- * Address of the ruby_xfree() function
- */
- rb_define_const(mFiddle, "RUBY_FREE", PTR2NUM(ruby_xfree));
-
- /* Document-const: BUILD_RUBY_PLATFORM
- *
- * Platform built against (i.e. "x86_64-linux", etc.)
- *
- * See also RUBY_PLATFORM
- */
- rb_define_const(mFiddle, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
-
- rb_define_module_function(mFiddle, "dlwrap", rb_fiddle_value2ptr, 1);
- rb_define_module_function(mFiddle, "dlunwrap", rb_fiddle_ptr2value, 1);
- rb_define_module_function(mFiddle, "malloc", rb_fiddle_malloc, 1);
- rb_define_module_function(mFiddle, "realloc", rb_fiddle_realloc, 2);
- rb_define_module_function(mFiddle, "free", rb_fiddle_free, 1);
-
Init_fiddle_function();
Init_fiddle_closure();
- Init_fiddle_handle();
- Init_fiddle_pointer();
}
/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
index b37c37bc65..7165969225 100644
--- a/ext/fiddle/fiddle.h
+++ b/ext/fiddle/fiddle.h
@@ -12,30 +12,6 @@
#include <sys/mman.h>
#endif
-#if defined(HAVE_DLFCN_H)
-# include <dlfcn.h>
-# /* some stranger systems may not define all of these */
-#ifndef RTLD_LAZY
-#define RTLD_LAZY 0
-#endif
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-#ifndef RTLD_NOW
-#define RTLD_NOW 0
-#endif
-#else
-# if defined(_WIN32)
-# include <windows.h>
-# define dlopen(name,flag) ((void*)LoadLibrary(name))
-# define dlerror() strerror(rb_w32_map_errno(GetLastError()))
-# define dlsym(handle,name) ((void*)GetProcAddress((handle),(name)))
-# define RTLD_LAZY -1
-# define RTLD_NOW -1
-# define RTLD_GLOBAL -1
-# endif
-#endif
-
#ifdef USE_HEADER_HACKS
#include <ffi/ffi.h>
#else
@@ -91,15 +67,6 @@
# error "long size not supported"
# endif
-#if HAVE_LONG_LONG
-# if SIZEOF_LONG_LONG == 8
-# define ffi_type_slong_long ffi_type_sint64
-# define ffi_type_ulong_long ffi_type_uint64
-# else
-# error "long long size not supported"
-# endif
-#endif
-
#include <closure.h>
#include <conversions.h>
#include <function.h>
@@ -121,23 +88,7 @@
#define TYPE_FLOAT 7
#define TYPE_DOUBLE 8
-#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
-
-#define ALIGN_VOIDP ALIGN_OF(void*)
-#define ALIGN_SHORT ALIGN_OF(short)
-#define ALIGN_CHAR ALIGN_OF(char)
-#define ALIGN_INT ALIGN_OF(int)
-#define ALIGN_LONG ALIGN_OF(long)
-#if HAVE_LONG_LONG
-#define ALIGN_LONG_LONG ALIGN_OF(LONG_LONG)
-#endif
-#define ALIGN_FLOAT ALIGN_OF(float)
-#define ALIGN_DOUBLE ALIGN_OF(double)
-
extern VALUE mFiddle;
-extern VALUE rb_eFiddleError;
-
-VALUE rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type);
#endif
/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 89239bbb69..c1b75afae6 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -1,14 +1,5 @@
#include <fiddle.h>
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
VALUE cFiddleFunction;
static void
@@ -36,7 +27,7 @@ function_memsize(const void *p)
const rb_data_type_t function_data_type = {
"fiddle/function",
- {0, deallocate, function_memsize,},
+ 0, deallocate, function_memsize,
};
static VALUE
@@ -47,40 +38,16 @@ allocate(VALUE klass)
return TypedData_Make_Struct(klass, ffi_cif, &function_data_type, cif);
}
-VALUE
-rb_fiddle_new_function(VALUE address, VALUE arg_types, VALUE ret_type)
-{
- VALUE argv[3];
-
- argv[0] = address;
- argv[1] = arg_types;
- argv[2] = ret_type;
-
- return rb_class_new_instance(3, argv, cFiddleFunction);
-}
-
-static int
-parse_keyword_arg_i(VALUE key, VALUE value, VALUE self)
-{
- if (key == ID2SYM(rb_intern("name"))) {
- rb_iv_set(self, "@name", value);
- } else {
- rb_raise(rb_eArgError, "unknown keyword: %"PRIsVALUE,
- RB_OBJ_STRING(key));
- }
- return ST_CONTINUE;
-}
-
static VALUE
initialize(int argc, VALUE argv[], VALUE self)
{
ffi_cif * cif;
ffi_type **arg_types;
ffi_status result;
- VALUE ptr, args, ret_type, abi, kwds;
+ VALUE ptr, args, ret_type, abi;
int i;
- rb_scan_args(argc, argv, "31:", &ptr, &args, &ret_type, &abi, &kwds);
+ rb_scan_args(argc, argv, "31", &ptr, &args, &ret_type, &abi);
if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI);
Check_Type(args, T_ARRAY);
@@ -90,8 +57,6 @@ initialize(int argc, VALUE argv[], VALUE self)
rb_iv_set(self, "@return_type", ret_type);
rb_iv_set(self, "@abi", abi);
- if (!NIL_P(kwds)) rb_hash_foreach(kwds, parse_keyword_arg_i, self);
-
TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
@@ -136,15 +101,6 @@ function_call(int argc, VALUE argv[], VALUE self)
TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
- if (rb_safe_level() >= 1) {
- for (i = 0; i < argc; i++) {
- VALUE src = argv[i];
- if (OBJ_TAINTED(src)) {
- rb_raise(rb_eSecurityError, "tainted parameter not allowed");
- }
- }
- }
-
values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *));
generic_args = xcalloc((size_t)argc, (size_t)sizeof(fiddle_generic));
@@ -182,83 +138,17 @@ function_call(int argc, VALUE argv[], VALUE self)
void
Init_fiddle_function(void)
{
- /*
- * Document-class: Fiddle::Function
- *
- * == Description
- *
- * A representation of a C function
- *
- * == Examples
- *
- * === 'strcpy'
- *
- * @libc = Fiddle.dlopen "/lib/libc.so.6"
- * #=> #<Fiddle::Handle:0x00000001d7a8d8>
- * f = Fiddle::Function.new(
- * @libc['strcpy'],
- * [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP],
- * Fiddle::TYPE_VOIDP)
- * #=> #<Fiddle::Function:0x00000001d8ee00>
- * buff = "000"
- * #=> "000"
- * str = f.call(buff, "123")
- * #=> #<Fiddle::Pointer:0x00000001d0c380 ptr=0x000000018a21b8 size=0 free=0x00000000000000>
- * str.to_s
- * => "123"
- *
- * === ABI check
- *
- * @libc = DL.dlopen "/lib/libc.so.6"
- * #=> #<Fiddle::Handle:0x00000001d7a8d8>
- * f = Fiddle::Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
- * #=> #<Fiddle::Function:0x00000001d8ee00>
- * f.abi == Fiddle::Function::DEFAULT
- * #=> true
- */
cFiddleFunction = rb_define_class_under(mFiddle, "Function", rb_cObject);
- /*
- * Document-const: DEFAULT
- *
- * Default ABI
- *
- */
rb_define_const(cFiddleFunction, "DEFAULT", INT2NUM(FFI_DEFAULT_ABI));
-#ifdef HAVE_CONST_FFI_STDCALL
- /*
- * Document-const: STDCALL
- *
- * FFI implementation of WIN32 stdcall convention
- *
- */
+#ifdef FFI_STDCALL
rb_define_const(cFiddleFunction, "STDCALL", INT2NUM(FFI_STDCALL));
#endif
rb_define_alloc_func(cFiddleFunction, allocate);
- /*
- * Document-method: call
- *
- * Calls the constructed Function, with +args+
- *
- * For an example see Fiddle::Function
- *
- */
rb_define_method(cFiddleFunction, "call", function_call, -1);
-
- /*
- * Document-method: new
- * call-seq: new(ptr, args, ret_type, abi = DEFAULT)
- *
- * Constructs a Function object.
- * * +ptr+ is a referenced function, of a Fiddle::Handle
- * * +args+ is an Array of arguments, passed to the +ptr+ function
- * * +ret_type+ is the return type of the function
- * * +abi+ is the ABI of the function
- *
- */
rb_define_method(cFiddleFunction, "initialize", initialize, -1);
}
/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
deleted file mode 100644
index 4bb402bdfa..0000000000
--- a/ext/fiddle/handle.c
+++ /dev/null
@@ -1,470 +0,0 @@
-#include <ruby.h>
-#include <fiddle.h>
-
-VALUE rb_cHandle;
-
-struct dl_handle {
- void *ptr;
- int open;
- int enable_close;
-};
-
-#ifdef _WIN32
-# 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
-
-static void
-fiddle_handle_free(void *ptr)
-{
- struct dl_handle *fiddle_handle = ptr;
- if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
- dlclose(fiddle_handle->ptr);
- }
- xfree(ptr);
-}
-
-static size_t
-fiddle_handle_memsize(const void *ptr)
-{
- return ptr ? sizeof(struct dl_handle) : 0;
-}
-
-static const rb_data_type_t fiddle_handle_data_type = {
- "fiddle/handle",
- {0, fiddle_handle_free, fiddle_handle_memsize,},
-};
-
-/*
- * call-seq: close
- *
- * Close this handle.
- *
- * Calling close more than once will raise a Fiddle::DLError exception.
- */
-static VALUE
-rb_fiddle_handle_close(VALUE self)
-{
- struct dl_handle *fiddle_handle;
-
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- if(fiddle_handle->open) {
- int ret = dlclose(fiddle_handle->ptr);
- fiddle_handle->open = 0;
-
- /* Check dlclose for successful return value */
- if(ret) {
-#if defined(HAVE_DLERROR)
- rb_raise(rb_eFiddleError, "%s", dlerror());
-#else
- rb_raise(rb_eFiddleError, "could not close handle");
-#endif
- }
- return INT2NUM(ret);
- }
- rb_raise(rb_eFiddleError, "dlclose() called too many times");
-
- UNREACHABLE;
-}
-
-static VALUE
-rb_fiddle_handle_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct dl_handle *fiddle_handle;
-
- obj = TypedData_Make_Struct(rb_cHandle, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- fiddle_handle->ptr = 0;
- fiddle_handle->open = 0;
- fiddle_handle->enable_close = 0;
-
- return obj;
-}
-
-static VALUE
-predefined_fiddle_handle(void *handle)
-{
- VALUE obj = rb_fiddle_handle_s_allocate(rb_cHandle);
- struct dl_handle *fiddle_handle = DATA_PTR(obj);
-
- fiddle_handle->ptr = handle;
- fiddle_handle->open = 1;
- OBJ_FREEZE(obj);
- return obj;
-}
-
-/*
- * call-seq:
- * new(lib = nil, flags = Fiddle::RTLD_LAZY | Fiddle::RTLD_GLOBAL)
- *
- * Create a new handler that opens library named +lib+ with +flags+. If no
- * library is specified, RTLD_DEFAULT is used.
- */
-static VALUE
-rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
-{
- void *ptr;
- struct dl_handle *fiddle_handle;
- 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_fiddle_handle_new");
- }
-
- rb_secure(2);
-
-#if defined(_WIN32)
- 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);
-#if defined(HAVE_DLERROR)
- if( !ptr && (err = dlerror()) ){
- rb_raise(rb_eFiddleError, "%s", err);
- }
-#else
- if( !ptr ){
- err = dlerror();
- rb_raise(rb_eFiddleError, "%s", err);
- }
-#endif
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){
- dlclose(fiddle_handle->ptr);
- }
- fiddle_handle->ptr = ptr;
- fiddle_handle->open = 1;
- fiddle_handle->enable_close = 0;
-
- if( rb_block_given_p() ){
- rb_ensure(rb_yield, self, rb_fiddle_handle_close, self);
- }
-
- return Qnil;
-}
-
-/*
- * call-seq: enable_close
- *
- * Enable a call to dlclose() when this handle is garbage collected.
- */
-static VALUE
-rb_fiddle_handle_enable_close(VALUE self)
-{
- struct dl_handle *fiddle_handle;
-
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- fiddle_handle->enable_close = 1;
- return Qnil;
-}
-
-/*
- * call-seq: disable_close
- *
- * Disable a call to dlclose() when this handle is garbage collected.
- */
-static VALUE
-rb_fiddle_handle_disable_close(VALUE self)
-{
- struct dl_handle *fiddle_handle;
-
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- fiddle_handle->enable_close = 0;
- return Qnil;
-}
-
-/*
- * call-seq: close_enabled?
- *
- * Returns +true+ if dlclose() will be called when this handle is garbage collected.
- *
- * See man(3) dlclose() for more info.
- */
-static VALUE
-rb_fiddle_handle_close_enabled_p(VALUE self)
-{
- struct dl_handle *fiddle_handle;
-
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
-
- if(fiddle_handle->enable_close) return Qtrue;
- return Qfalse;
-}
-
-/*
- * call-seq: to_i
- *
- * Returns the memory address for this handle.
- */
-static VALUE
-rb_fiddle_handle_to_i(VALUE self)
-{
- struct dl_handle *fiddle_handle;
-
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- return PTR2NUM(fiddle_handle);
-}
-
-static VALUE fiddle_handle_sym(void *handle, const char *symbol);
-
-/*
- * Document-method: sym
- *
- * call-seq: sym(name)
- *
- * Get the address as an Integer for the function named +name+.
- */
-static VALUE
-rb_fiddle_handle_sym(VALUE self, VALUE sym)
-{
- struct dl_handle *fiddle_handle;
-
- TypedData_Get_Struct(self, struct dl_handle, &fiddle_handle_data_type, fiddle_handle);
- if( ! fiddle_handle->open ){
- rb_raise(rb_eFiddleError, "closed handle");
- }
-
- return fiddle_handle_sym(fiddle_handle->ptr, StringValueCStr(sym));
-}
-
-#ifndef RTLD_NEXT
-#define RTLD_NEXT NULL
-#endif
-#ifndef RTLD_DEFAULT
-#define RTLD_DEFAULT NULL
-#endif
-
-/*
- * Document-method: sym
- *
- * call-seq: sym(name)
- *
- * Get the address as an Integer for the function named +name+. The function
- * is searched via dlsym on RTLD_NEXT.
- *
- * See man(3) dlsym() for more info.
- */
-static VALUE
-rb_fiddle_handle_s_sym(VALUE self, VALUE sym)
-{
- return fiddle_handle_sym(RTLD_NEXT, StringValueCStr(sym));
-}
-
-static VALUE
-fiddle_handle_sym(void *handle, const char *name)
-{
-#if defined(HAVE_DLERROR)
- const char *err;
-# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
-#else
-# define CHECK_DLERROR
-#endif
- void (*func)();
-
- rb_secure(2);
-#ifdef HAVE_DLERROR
- dlerror();
-#endif
- func = (void (*)())(VALUE)dlsym(handle, name);
- CHECK_DLERROR;
-#if defined(FUNC_STDCALL)
- if( !func ){
- int i;
- int len = (int)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);
- }
-#else
- name_n = (char*)xmalloc(len+6);
-#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);
- }
-#endif
- if( !func ){
- rb_raise(rb_eFiddleError, "unknown symbol \"%s\"", name);
- }
-
- return PTR2NUM(func);
-}
-
-void
-Init_fiddle_handle(void)
-{
- /*
- * Document-class: Fiddle::Handle
- *
- * The Fiddle::Handle is the manner to access the dynamic library
- *
- * == Example
- *
- * === Setup
- *
- * libc_so = "/lib64/libc.so.6"
- * => "/lib64/libc.so.6"
- * @handle = Fiddle::Handle.new(libc_so)
- * => #<Fiddle::Handle:0x00000000d69ef8>
- *
- * === Setup, with flags
- *
- * libc_so = "/lib64/libc.so.6"
- * => "/lib64/libc.so.6"
- * @handle = Fiddle::Handle.new(libc_so, Fiddle::RTLD_LAZY | Fiddle::RTLD_GLOBAL)
- * => #<Fiddle::Handle:0x00000000d69ef8>
- *
- * See RTLD_LAZY and RTLD_GLOBAL
- *
- * === Addresses to symbols
- *
- * strcpy_addr = @handle['strcpy']
- * => 140062278451968
- *
- * or
- *
- * strcpy_addr = @handle.sym('strcpy')
- * => 140062278451968
- *
- */
- rb_cHandle = rb_define_class_under(mFiddle, "Handle", rb_cObject);
- rb_define_alloc_func(rb_cHandle, rb_fiddle_handle_s_allocate);
- rb_define_singleton_method(rb_cHandle, "sym", rb_fiddle_handle_s_sym, 1);
- rb_define_singleton_method(rb_cHandle, "[]", rb_fiddle_handle_s_sym, 1);
-
- /* Document-const: NEXT
- *
- * A predefined pseudo-handle of RTLD_NEXT
- *
- * Which will find the next occurrence of a function in the search order
- * after the current library.
- */
- rb_define_const(rb_cHandle, "NEXT", predefined_fiddle_handle(RTLD_NEXT));
-
- /* Document-const: DEFAULT
- *
- * A predefined pseudo-handle of RTLD_DEFAULT
- *
- * Which will find the first occurrence of the desired symbol using the
- * default library search order
- */
- rb_define_const(rb_cHandle, "DEFAULT", predefined_fiddle_handle(RTLD_DEFAULT));
-
- /* Document-const: RTLD_GLOBAL
- *
- * rtld Fiddle::Handle flag.
- *
- * The symbols defined by this library will be made available for symbol
- * resolution of subsequently loaded libraries.
- */
- rb_define_const(rb_cHandle, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
-
- /* Document-const: RTLD_LAZY
- *
- * rtld Fiddle::Handle flag.
- *
- * Perform lazy binding. Only resolve symbols as the code that references
- * them is executed. If the symbol is never referenced, then it is never
- * resolved. (Lazy binding is only performed for function references;
- * references to variables are always immediately bound when the library
- * is loaded.)
- */
- rb_define_const(rb_cHandle, "RTLD_LAZY", INT2NUM(RTLD_LAZY));
-
- /* Document-const: RTLD_NOW
- *
- * rtld Fiddle::Handle flag.
- *
- * If this value is specified or the environment variable LD_BIND_NOW is
- * set to a nonempty string, all undefined symbols in the library are
- * resolved before Fiddle.dlopen returns. If this cannot be done an error
- * is returned.
- */
- rb_define_const(rb_cHandle, "RTLD_NOW", INT2NUM(RTLD_NOW));
-
- rb_define_method(rb_cHandle, "initialize", rb_fiddle_handle_initialize, -1);
- rb_define_method(rb_cHandle, "to_i", rb_fiddle_handle_to_i, 0);
- rb_define_method(rb_cHandle, "close", rb_fiddle_handle_close, 0);
- rb_define_method(rb_cHandle, "sym", rb_fiddle_handle_sym, 1);
- rb_define_method(rb_cHandle, "[]", rb_fiddle_handle_sym, 1);
- rb_define_method(rb_cHandle, "disable_close", rb_fiddle_handle_disable_close, 0);
- rb_define_method(rb_cHandle, "enable_close", rb_fiddle_handle_enable_close, 0);
- rb_define_method(rb_cHandle, "close_enabled?", rb_fiddle_handle_close_enabled_p, 0);
-}
-
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index c8a7ef1b05..8b8c069b03 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -1,46 +1,27 @@
require 'fiddle.so'
require 'fiddle/function'
require 'fiddle/closure'
+require 'dl' unless Object.const_defined?(:DL)
module Fiddle
+ Pointer = DL::CPtr
+
if WINDOWS
- # Returns the last win32 +Error+ of the current executing +Thread+ or nil
- # if none
def self.win32_last_error
Thread.current[:__FIDDLE_WIN32_LAST_ERROR__]
end
- # Sets the last win32 +Error+ of the current executing +Thread+ to +error+
def self.win32_last_error= error
Thread.current[:__FIDDLE_WIN32_LAST_ERROR__] = error
end
end
- # Returns the last +Error+ of the current executing +Thread+ or nil if none
def self.last_error
Thread.current[:__FIDDLE_LAST_ERROR__]
end
- # Sets the last +Error+ of the current executing +Thread+ to +error+
def self.last_error= error
Thread.current[:__DL2_LAST_ERROR__] = error
Thread.current[:__FIDDLE_LAST_ERROR__] = error
end
-
- # call-seq: dlopen(library) => Fiddle::Handle
- #
- # Creates a new handler that opens +library+, and returns an instance of
- # Fiddle::Handle.
- #
- # See Fiddle::Handle.new for more.
- def dlopen library
- Fiddle::Handle.new library
- end
- module_function :dlopen
-
- # Add constants for backwards compat
-
- RTLD_GLOBAL = Handle::RTLD_GLOBAL # :nodoc:
- RTLD_LAZY = Handle::RTLD_LAZY # :nodoc:
- RTLD_NOW = Handle::RTLD_NOW # :nodoc:
end
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
index beb90ecbe5..dc2b7a65be 100644
--- a/ext/fiddle/lib/fiddle/closure.rb
+++ b/ext/fiddle/lib/fiddle/closure.rb
@@ -1,45 +1,14 @@
module Fiddle
class Closure
-
- # the C type of the return of the FFI closure
attr_reader :ctype
-
- # arguments of the FFI closure
attr_reader :args
- # Extends Fiddle::Closure to allow for building the closure in a block
class BlockCaller < Fiddle::Closure
-
- # == Description
- #
- # Construct a new BlockCaller object.
- #
- # * +ctype+ is the C type to be returned
- # * +args+ are passed the callback
- # * +abi+ is the abi of the closure
- #
- # If there is an error in preparing the +ffi_cif+ or +ffi_prep_closure+,
- # then a RuntimeError will be raised.
- #
- # == Example
- #
- # include Fiddle
- #
- # cb = Closure::BlockCaller.new(TYPE_INT, [TYPE_INT]) do |one|
- # one
- # end
- #
- # func = Function.new(cb, [TYPE_INT], TYPE_INT)
- #
def initialize ctype, args, abi = Fiddle::Function::DEFAULT, &block
super(ctype, args, abi)
@block = block
end
- # Calls the constructed BlockCaller, with +args+
- #
- # For an example see Fiddle::Closure::BlockCaller.new
- #
def call *args
@block.call(*args)
end
diff --git a/ext/fiddle/lib/fiddle/cparser.rb b/ext/fiddle/lib/fiddle/cparser.rb
deleted file mode 100644
index 43fb184a12..0000000000
--- a/ext/fiddle/lib/fiddle/cparser.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-module Fiddle
- # A mixin that provides methods for parsing C struct and prototype signatures.
- #
- # == Example
- # require 'fiddle/import'
- #
- # include Fiddle::CParser
- # #=> Object
- #
- # parse_ctype('int increment(int)')
- # #=> ["increment", Fiddle::TYPE_INT, [Fiddle::TYPE_INT]]
- #
- module CParser
- # Parses a C struct's members
- #
- # Example:
- #
- # include Fiddle::CParser
- # #=> Object
- #
- # parse_struct_signature(['int i', 'char c'])
- # #=> [[Fiddle::TYPE_INT, Fiddle::TYPE_CHAR], ["i", "c"]]
- #
- 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
-
- # Parses a C prototype signature
- #
- # If Hash +tymap+ is provided, the return value and the arguments from the
- # +signature+ are expected to be keys, and the value will be the C type to
- # be looked up.
- #
- # Example:
- #
- # include Fiddle::CParser
- # #=> Object
- #
- # parse_signature('double sum(double, double)')
- # #=> ["sum", Fiddle::TYPE_DOUBLE, [Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]]
- #
- def parse_signature(signature, tymap=nil)
- tymap ||= {}
- signature = signature.gsub(/\s+/, " ").strip
- case signature
- when /^([\w@\*\s]+)\(([\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
-
- # Given a String of C type +ty+, returns the corresponding Fiddle constant.
- #
- # +ty+ can also accept an Array of C type Strings, and will be returned in
- # a corresponding Array.
- #
- # If Hash +tymap+ is provided, +ty+ is expected to be the key, and the
- # value will be the C type to be looked up.
- #
- # Example:
- #
- # include Fiddle::CParser
- # #=> Object
- #
- # parse_ctype('int')
- # #=> Fiddle::TYPE_INT
- #
- # parse_ctype('double')
- # #=> Fiddle::TYPE_DOUBLE
- #
- # parse_ctype('unsigned char')
- # #=> -Fiddle::TYPE_CHAR
- #
- 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", 'uint'
- 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 "size_t"
- return TYPE_SIZE_T
- when "ssize_t"
- return TYPE_SSIZE_T
- when "ptrdiff_t"
- return TYPE_PTRDIFF_T
- when "intptr_t"
- return TYPE_INTPTR_T
- when "uintptr_t"
- return TYPE_UINTPTR_T
- 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/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
index ab7496e944..7b9e735874 100644
--- a/ext/fiddle/lib/fiddle/function.rb
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -1,17 +1,5 @@
module Fiddle
class Function
- # The ABI of the Function.
attr_reader :abi
-
- # The address of this function
- attr_reader :ptr
-
- # The name of this function
- attr_reader :name
-
- # The integer memory location of this function
- def to_i
- ptr.to_i
- end
end
end
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
deleted file mode 100644
index ec5ee94dcf..0000000000
--- a/ext/fiddle/lib/fiddle/import.rb
+++ /dev/null
@@ -1,314 +0,0 @@
-require 'fiddle'
-require 'fiddle/struct'
-require 'fiddle/cparser'
-
-module Fiddle
-
- # Used internally by Fiddle::Importer
- class CompositeHandler
- # Create a new handler with the open +handlers+
- #
- # Used internally by Fiddle::Importer.dlload
- def initialize(handlers)
- @handlers = handlers
- end
-
- # Array of the currently loaded libraries.
- def handlers()
- @handlers
- end
-
- # Returns the address as an Integer from any handlers with the function
- # named +symbol+.
- #
- # Raises a DLError if the handle is closed.
- def sym(symbol)
- @handlers.each{|handle|
- if( handle )
- begin
- addr = handle.sym(symbol)
- return addr
- rescue DLError
- end
- end
- }
- return nil
- end
-
- # See Fiddle::CompositeHandler.sym
- def [](symbol)
- sym(symbol)
- end
- end
-
- # A DSL that provides the means to dynamically load libraries and build
- # modules around them including calling extern functions within the C
- # library that has been loaded.
- #
- # == Example
- #
- # require 'fiddle'
- # require 'fiddle/import'
- #
- # module LibSum
- # extend Fiddle::Importer
- # dlload './libsum.so'
- # extern 'double sum(double*, int)'
- # extern 'double split(double)'
- # end
- #
- module Importer
- include Fiddle
- include CParser
- extend Importer
-
- # Creates an array of handlers for the given +libs+, can be an instance of
- # Fiddle::Handle, Fiddle::Importer, or will create a new istance of
- # Fiddle::Handle using Fiddle.dlopen
- #
- # Raises a DLError if the library cannot be loaded.
- #
- # See Fiddle.dlopen
- def dlload(*libs)
- handles = libs.collect{|lib|
- case lib
- when nil
- nil
- when Handle
- lib
- when Importer
- lib.handlers
- else
- begin
- Fiddle.dlopen(lib)
- rescue DLError
- raise(DLError, "can't load #{lib}")
- end
- end
- }.flatten()
- @handler = CompositeHandler.new(handles)
- @func_map = {}
- @type_alias = {}
- end
-
- # Sets the type alias for +alias_type+ as +orig_type+
- def typealias(alias_type, orig_type)
- @type_alias[alias_type] = orig_type
- end
-
- # Returns the sizeof +ty+, using Fiddle::Importer.parse_ctype to determine
- # the C type and the appropriate Fiddle constant.
- 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_LONG
- 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
- end
- return Pointer[ty].size()
- end
-
- def parse_bind_options(opts)
- h = {}
- 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
- end
- h
- end
- private :parse_bind_options
-
- # :stopdoc:
- CALL_TYPE_TO_ABI = Hash.new { |h, k|
- raise RuntimeError, "unsupported call type: #{k}"
- }.merge({ :stdcall => (Function::STDCALL rescue Function::DEFAULT),
- :cdecl => Function::DEFAULT,
- nil => Function::DEFAULT
- }).freeze
- private_constant :CALL_TYPE_TO_ABI
- # :startdoc:
-
- # Creates a global method from the given C +signature+.
- 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
- end
- module_eval(<<-EOS, file, line)
- def #{name}(*args, &block)
- @func_map['#{name}'].call(*args,&block)
- end
- EOS
- module_function(name)
- f
- end
-
- # Creates a global method from the given C +signature+ using the given
- # +opts+ as bind parameters with the given block.
- 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)
- else
- raise(RuntimeError, "unknown callback type: #{h[:callback_type]}")
- 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
- end
- module_eval(<<-EOS, file, line)
- def #{name}(*args,&block)
- @func_map['#{name}'].call(*args,&block)
- end
- EOS
- module_function(name)
- f
- end
-
- # Creates a class to wrap the C struct described by +signature+.
- #
- # MyStruct = struct ['int i', 'char c']
- def struct(signature)
- tys, mems = parse_struct_signature(signature, @type_alias)
- Fiddle::CStructBuilder.create(CStruct, tys, mems)
- end
-
- # Creates a class to wrap the C union described by +signature+.
- #
- # MyUnion = union ['int i', 'char c']
- def union(signature)
- tys, mems = parse_struct_signature(signature, @type_alias)
- Fiddle::CStructBuilder.create(CUnion, tys, mems)
- end
-
- # Returns the function mapped to +name+, that was created by either
- # Fiddle::Importer.extern or Fiddle::Importer.bind
- def [](name)
- @func_map[name]
- end
-
- # Creates a class to wrap the C struct with the value +ty+
- #
- # See also Fiddle::Importer.struct
- def create_value(ty, val=nil)
- s = struct([ty + " value"])
- ptr = s.malloc()
- if( val )
- ptr.value = val
- end
- return ptr
- end
- alias value create_value
-
- # Returns a new instance of the C struct with the value +ty+ at the +addr+
- # address.
- def import_value(ty, addr)
- s = struct([ty + " value"])
- ptr = s.new(addr)
- return ptr
- end
-
-
- # The Fiddle::CompositeHandler instance
- #
- # Will raise an error if no handlers are open.
- def handler
- @handler or raise "call dlload before importing symbols and functions"
- end
-
- # Returns a new Fiddle::Pointer instance at the memory address of the given
- # +name+ symbol.
- #
- # Raises a DLError if the +name+ doesn't exist.
- #
- # See Fiddle::CompositeHandler.sym and Fiddle::Handle.sym
- def import_symbol(name)
- addr = handler.sym(name)
- if( !addr )
- raise(DLError, "cannot find the symbol: #{name}")
- end
- Pointer.new(addr)
- end
-
- # Returns a new Fiddle::Function instance at the memory address of the given
- # +name+ function.
- #
- # Raises a DLError if the +name+ doesn't exist.
- #
- # * +argtype+ is an Array of arguments, passed to the +name+ function.
- # * +ctype+ is the return type of the function
- # * +call_type+ is the ABI of the function
- #
- # See also Fiddle:Function.new
- #
- # See Fiddle::CompositeHandler.sym and Fiddle::Handler.sym
- def import_function(name, ctype, argtype, call_type = nil)
- addr = handler.sym(name)
- if( !addr )
- raise(DLError, "cannot find the function: #{name}()")
- end
- Function.new(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type],
- name: name)
- end
-
- # Returns a new closure wrapper for the +name+ function.
- #
- # * +ctype+ is the return type of the function
- # * +argtype+ is an Array of arguments, passed to the callback function
- # * +call_type+ is the abi of the closure
- # * +block+ is passed to the callback
- #
- # See Fiddle::Closure
- def bind_function(name, ctype, argtype, call_type = nil, &block)
- abi = CALL_TYPE_TO_ABI[call_type]
- closure = Class.new(Fiddle::Closure) {
- define_method(:call, block)
- }.new(ctype, argtype, abi)
-
- Function.new(closure, argtype, ctype, abi, name: name)
- end
- end
-end
diff --git a/ext/fiddle/lib/fiddle/pack.rb b/ext/fiddle/lib/fiddle/pack.rb
deleted file mode 100644
index e4e9542cc0..0000000000
--- a/ext/fiddle/lib/fiddle/pack.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'fiddle'
-
-module Fiddle
- module PackInfo # :nodoc: all
- 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 # :nodoc: all
- 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_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/fiddle/lib/fiddle/struct.rb b/ext/fiddle/lib/fiddle/struct.rb
deleted file mode 100644
index 695a4d2247..0000000000
--- a/ext/fiddle/lib/fiddle/struct.rb
+++ /dev/null
@@ -1,243 +0,0 @@
-require 'fiddle'
-require 'fiddle/value'
-require 'fiddle/pack'
-
-module Fiddle
- # C struct shell
- class CStruct
- # accessor to Fiddle::CStructEntity
- def CStruct.entity_class
- CStructEntity
- end
- end
-
- # C union shell
- class CUnion
- # accessor to Fiddle::CUnionEntity
- def CUnion.entity_class
- CUnionEntity
- end
- end
-
- # Used to construct C classes (CUnion, CStruct, etc)
- #
- # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
- # easy-to-use manner.
- module CStructBuilder
- # Construct a new class given a C:
- # * class +klass+ (CUnion, CStruct, or other that provide an
- # #entity_class)
- # * +types+ (Fiddle::TYPE_INT, Fiddle::TYPE_SIZE_T, etc., see the C types
- # constants)
- # * corresponding +members+
- #
- # Fiddle::Importer#struct and Fiddle::Importer#union wrap this functionality in an
- # easy-to-use manner.
- #
- # Example:
- #
- # require 'fiddle/struct'
- # require 'fiddle/cparser'
- #
- # include Fiddle::CParser
- #
- # types, members = parse_struct_signature(['int i','char c'])
- #
- # MyStruct = Fiddle::CStructBuilder.create(Fiddle::CUnion, types, members)
- #
- # obj = MyStruct.allocate
- #
- 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 = Fiddle.malloc(#{size})
- new(addr)
- end
- EOS
- return new_class
- end
- module_function :create
- end
-
- # A C struct wrapper
- class CStructEntity < Fiddle::Pointer
- include PackInfo
- include ValueUtil
-
- # Allocates a C struct with the +types+ provided.
- #
- # When the instance is garbage collected, the C function +func+ is called.
- def CStructEntity.malloc(types, func = nil)
- addr = Fiddle.malloc(CStructEntity.size(types))
- CStructEntity.new(addr, types, func)
- end
-
- # Returns the offset for the packed sizes for the given +types+.
- #
- # Fiddle::CStructEntity.size(
- # [ Fiddle::TYPE_DOUBLE,
- # Fiddle::TYPE_INT,
- # Fiddle::TYPE_CHAR,
- # Fiddle::TYPE_VOIDP ]) #=> 24
- def CStructEntity.size(types)
- offset = 0
-
- max_align = types.map { |type, count = 1|
- last_offset = offset
-
- align = PackInfo::ALIGN_MAP[type]
- offset = PackInfo.align(last_offset, align) +
- (PackInfo::SIZE_MAP[type] * count)
-
- align
- }.max
-
- PackInfo.align(offset, max_align)
- end
-
- # Wraps the C pointer +addr+ as a C struct with the given +types+.
- #
- # When the instance is garbage collected, the C function +func+ is called.
- #
- # See also Fiddle::Pointer.new
- def initialize(addr, types, func = nil)
- set_ctypes(types)
- super(addr, @size, func)
- end
-
- # Set the names of the +members+ in this C struct
- def assign_names(members)
- @members = members
- end
-
- # Calculates the offsets and sizes for the given +types+ in the struct.
- def set_ctypes(types)
- @ctypes = types
- @offset = []
- offset = 0
-
- max_align = types.map { |type, count = 1|
- orig_offset = offset
- align = ALIGN_MAP[type]
- offset = PackInfo.align(orig_offset, align)
-
- @offset << offset
-
- offset += (SIZE_MAP[type] * count)
-
- align
- }.max
-
- @size = PackInfo.align(offset, max_align)
- end
-
- # Fetch struct member +name+
- def [](name)
- idx = @members.index(name)
- if( idx.nil? )
- raise(ArgumentError, "no such member: #{name}")
- 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| Pointer.new(v)}
- end
- when TYPE_VOIDP
- val = Pointer.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
-
- # Set struct member +name+, to value +val+
- def []=(name, val)
- idx = @members.index(name)
- if( idx.nil? )
- raise(ArgumentError, "no such member: #{name}")
- 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
- end
- end
-
- def to_s() # :nodoc:
- super(@size)
- end
- end
-
- # A C union wrapper
- class CUnionEntity < CStructEntity
- include PackInfo
-
- # Allocates a C union the +types+ provided.
- #
- # When the instance is garbage collected, the C function +func+ is called.
- def CUnionEntity.malloc(types, func=nil)
- addr = Fiddle.malloc(CUnionEntity.size(types))
- CUnionEntity.new(addr, types, func)
- end
-
- # Returns the size needed for the union with the given +types+.
- #
- # Fiddle::CUnionEntity.size(
- # [ Fiddle::TYPE_DOUBLE,
- # Fiddle::TYPE_INT,
- # Fiddle::TYPE_CHAR,
- # Fiddle::TYPE_VOIDP ]) #=> 8
- def CUnionEntity.size(types)
- types.map { |type, count = 1|
- PackInfo::SIZE_MAP[type] * count
- }.max
- end
-
- # Calculate the necessary offset and for each union member with the given
- # +types+
- def set_ctypes(types)
- @ctypes = types
- @offset = Array.new(types.length, 0)
- @size = self.class.size types
- end
- end
-end
-
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
deleted file mode 100644
index 02c1d25a37..0000000000
--- a/ext/fiddle/lib/fiddle/types.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-module Fiddle
- # Adds Windows type aliases to the including class for use with
- # Fiddle::Importer.
- #
- # The aliases added are:
- # * ATOM
- # * BOOL
- # * BYTE
- # * DWORD
- # * DWORD32
- # * DWORD64
- # * HANDLE
- # * HDC
- # * HINSTANCE
- # * HWND
- # * LPCSTR
- # * LPSTR
- # * PBYTE
- # * PDWORD
- # * PHANDLE
- # * PVOID
- # * PWORD
- # * UCHAR
- # * UINT
- # * ULONG
- # * WORD
- module Win32Types
- def included(m) # :nodoc:
- m.module_eval{
- typealias "DWORD", "unsigned long"
- typealias "PDWORD", "unsigned long *"
- typealias "DWORD32", "unsigned long"
- typealias "DWORD64", "unsigned long 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", "uintptr_t"
- typealias "PHANDLE", "void*"
- typealias "PVOID", "void*"
- typealias "LPCSTR", "char*"
- typealias "LPSTR", "char*"
- typealias "HINSTANCE", "unsigned int"
- typealias "HDC", "unsigned int"
- typealias "HWND", "unsigned int"
- }
- end
- module_function :included
- end
-
- # Adds basic type aliases to the including class for use with Fiddle::Importer.
- #
- # The aliases added are +uint+ and +u_int+ (<tt>unsigned int</tt>) and
- # +ulong+ and +u_long+ (<tt>unsigned long</tt>)
- module BasicTypes
- def included(m) # :nodoc:
- m.module_eval{
- typealias "uint", "unsigned int"
- typealias "u_int", "unsigned int"
- typealias "ulong", "unsigned long"
- typealias "u_long", "unsigned long"
- }
- end
- module_function :included
- end
-end
diff --git a/ext/fiddle/lib/fiddle/value.rb b/ext/fiddle/lib/fiddle/value.rb
deleted file mode 100644
index 8d71e47ce6..0000000000
--- a/ext/fiddle/lib/fiddle/value.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'fiddle'
-
-module Fiddle
- module ValueUtil #:nodoc: all
- 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 Pointer
- return arg.to_i
- when IO
- case ty
- when TYPE_VOIDP
- return Pointer[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/fiddle/pointer.c b/ext/fiddle/pointer.c
deleted file mode 100644
index d115d3d131..0000000000
--- a/ext/fiddle/pointer.c
+++ /dev/null
@@ -1,724 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby/ruby.h>
-#include <ruby/io.h>
-#include <ctype.h>
-#include <fiddle.h>
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#endif
-
-VALUE rb_cPointer;
-
-typedef void (*freefunc_t)(void*);
-
-struct ptr_data {
- void *ptr;
- long size;
- freefunc_t free;
- VALUE wrap[2];
-};
-
-#define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
-
-static inline freefunc_t
-get_freefunc(VALUE func, volatile VALUE *wrap)
-{
- VALUE addrnum;
- if (NIL_P(func)) {
- *wrap = 0;
- return NULL;
- }
- addrnum = rb_Integer(func);
- *wrap = (addrnum != func) ? func : 0;
- return (freefunc_t)(VALUE)NUM2PTR(addrnum);
-}
-
-static ID id_to_ptr;
-
-static void
-fiddle_ptr_mark(void *ptr)
-{
- struct ptr_data *data = ptr;
- if (data->wrap[0]) {
- rb_gc_mark(data->wrap[0]);
- }
- if (data->wrap[1]) {
- rb_gc_mark(data->wrap[1]);
- }
-}
-
-static void
-fiddle_ptr_free(void *ptr)
-{
- struct ptr_data *data = ptr;
- if (data->ptr) {
- if (data->free) {
- (*(data->free))(data->ptr);
- }
- }
- xfree(ptr);
-}
-
-static size_t
-fiddle_ptr_memsize(const void *ptr)
-{
- const struct ptr_data *data = ptr;
- return data ? sizeof(*data) + data->size : 0;
-}
-
-static const rb_data_type_t fiddle_ptr_data_type = {
- "fiddle/pointer",
- {fiddle_ptr_mark, fiddle_ptr_free, fiddle_ptr_memsize,},
-};
-
-static VALUE
-rb_fiddle_ptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
- struct ptr_data *data;
- VALUE val;
-
- rb_secure(4);
- val = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
- data->ptr = ptr;
- data->free = func;
- data->size = size;
- OBJ_TAINT(val);
-
- return val;
-}
-
-static VALUE
-rb_fiddle_ptr_new(void *ptr, long size, freefunc_t func)
-{
- return rb_fiddle_ptr_new2(rb_cPointer, ptr, size, func);
-}
-
-static VALUE
-rb_fiddle_ptr_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_fiddle_ptr_new(ptr, size, func);
-}
-
-static void *
-rb_fiddle_ptr2cptr(VALUE val)
-{
- struct ptr_data *data;
- void *ptr;
-
- if (rb_obj_is_kind_of(val, rb_cPointer)) {
- TypedData_Get_Struct(val, struct ptr_data, &fiddle_ptr_data_type, data);
- ptr = data->ptr;
- }
- else if (val == Qnil) {
- ptr = NULL;
- }
- else{
- rb_raise(rb_eTypeError, "Fiddle::Pointer was expected");
- }
-
- return ptr;
-}
-
-static VALUE
-rb_fiddle_ptr_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct ptr_data *data;
-
- rb_secure(4);
- obj = TypedData_Make_Struct(klass, struct ptr_data, &fiddle_ptr_data_type, data);
- data->ptr = 0;
- data->size = 0;
- data->free = 0;
-
- return obj;
-}
-
-/*
- * call-seq:
- * Fiddle::Pointer.new(address) => fiddle_cptr
- * new(address, size) => fiddle_cptr
- * new(address, size, freefunc) => fiddle_cptr
- *
- * Create a new pointer to +address+ with an optional +size+ and +freefunc+.
- *
- * +freefunc+ will be called when the instance is garbage collected.
- */
-static VALUE
-rb_fiddle_ptr_initialize(int argc, VALUE argv[], VALUE self)
-{
- VALUE ptr, sym, size, wrap = 0, funcwrap = 0;
- struct ptr_data *data;
- void *p = NULL;
- freefunc_t f = NULL;
- long s = 0;
-
- if (rb_scan_args(argc, argv, "12", &ptr, &size, &sym) >= 1) {
- VALUE addrnum = rb_Integer(ptr);
- if (addrnum != ptr) wrap = ptr;
- p = NUM2PTR(addrnum);
- }
- if (argc >= 2) {
- s = NUM2LONG(size);
- }
- if (argc >= 3) {
- f = get_freefunc(sym, &funcwrap);
- }
-
- if (p) {
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- if (data->ptr && data->free) {
- /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
- (*(data->free))(data->ptr);
- }
- data->wrap[0] = wrap;
- data->wrap[1] = funcwrap;
- data->ptr = p;
- data->size = s;
- data->free = f;
- }
-
- return Qnil;
-}
-
-/*
- * call-seq:
- *
- * Fiddle::Pointer.malloc(size, freefunc = nil) => fiddle pointer instance
- *
- * Allocate +size+ bytes of memory and associate it with an optional
- * +freefunc+ that will be called when the pointer is garbage collected.
- *
- * +freefunc+ must be an address pointing to a function or an instance of
- * Fiddle::Function
- */
-static VALUE
-rb_fiddle_ptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
- VALUE size, sym, obj, wrap = 0;
- long 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, &wrap);
- break;
- default:
- rb_bug("rb_fiddle_ptr_s_malloc");
- }
-
- obj = rb_fiddle_ptr_malloc(s,f);
- if (wrap) RPTR_DATA(obj)->wrap[1] = wrap;
-
- return obj;
-}
-
-/*
- * call-seq: to_i
- *
- * Returns the integer memory location of this pointer.
- */
-static VALUE
-rb_fiddle_ptr_to_i(VALUE self)
-{
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- return PTR2NUM(data->ptr);
-}
-
-/*
- * call-seq: to_value
- *
- * Cast this pointer to a ruby object.
- */
-static VALUE
-rb_fiddle_ptr_to_value(VALUE self)
-{
- struct ptr_data *data;
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- return (VALUE)(data->ptr);
-}
-
-/*
- * call-seq: ptr
- *
- * Returns a new Fiddle::Pointer instance that is a dereferenced pointer for
- * this pointer.
- *
- * Analogous to the star operator in C.
- */
-static VALUE
-rb_fiddle_ptr_ptr(VALUE self)
-{
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- return rb_fiddle_ptr_new(*((void**)(data->ptr)),0,0);
-}
-
-/*
- * call-seq: ref
- *
- * Returns a new Fiddle::Pointer instance that is a reference pointer for this
- * pointer.
- *
- * Analogous to the ampersand operator in C.
- */
-static VALUE
-rb_fiddle_ptr_ref(VALUE self)
-{
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- return rb_fiddle_ptr_new(&(data->ptr),0,0);
-}
-
-/*
- * call-seq: null?
- *
- * Returns +true+ if this is a null pointer.
- */
-static VALUE
-rb_fiddle_ptr_null_p(VALUE self)
-{
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- return data->ptr ? Qfalse : Qtrue;
-}
-
-/*
- * call-seq: free=(function)
- *
- * Set the free function for this pointer to +function+ in the given
- * Fiddle::Function.
- */
-static VALUE
-rb_fiddle_ptr_free_set(VALUE self, VALUE val)
-{
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- data->free = get_freefunc(val, &data->wrap[1]);
-
- return Qnil;
-}
-
-/*
- * call-seq: free => Fiddle::Function
- *
- * Get the free function for this pointer.
- *
- * Returns a new instance of Fiddle::Function.
- *
- * See Fiddle::Function.new
- */
-static VALUE
-rb_fiddle_ptr_free_get(VALUE self)
-{
- struct ptr_data *pdata;
- VALUE address;
- VALUE arg_types;
- VALUE ret_type;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, pdata);
-
- if (!pdata->free)
- return Qnil;
-
- address = PTR2NUM(pdata->free);
- ret_type = INT2NUM(TYPE_VOID);
- arg_types = rb_ary_new();
- rb_ary_push(arg_types, INT2NUM(TYPE_VOIDP));
-
- return rb_fiddle_new_function(address, arg_types, ret_type);
-}
-
-/*
- * call-seq:
- *
- * ptr.to_s => string
- * ptr.to_s(len) => string
- *
- * Returns the pointer contents as a string.
- *
- * When called with no arguments, this method will return the contents until
- * the first NULL byte.
- *
- * When called with +len+, a string of +len+ bytes will be returned.
- *
- * See to_str
- */
-static VALUE
-rb_fiddle_ptr_to_s(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- VALUE arg1, val;
- int len;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, 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_fiddle_ptr_to_s");
- }
-
- return val;
-}
-
-/*
- * call-seq:
- *
- * ptr.to_str => string
- * ptr.to_str(len) => string
- *
- * Returns the pointer contents as a string.
- *
- * When called with no arguments, this method will return the contents with the
- * length of this pointer's +size+.
- *
- * When called with +len+, a string of +len+ bytes will be returned.
- *
- * See to_s
- */
-static VALUE
-rb_fiddle_ptr_to_str(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- VALUE arg1, val;
- int len;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, 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_fiddle_ptr_to_str");
- }
-
- return val;
-}
-
-/*
- * call-seq: inspect
- *
- * Returns a string formatted with an easily readable representation of the
- * internal state of the pointer.
- */
-static VALUE
-rb_fiddle_ptr_inspect(VALUE self)
-{
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
- RB_OBJ_CLASSNAME(self), data, data->ptr, data->size, data->free);
-}
-
-/*
- * call-seq:
- * ptr == other => true or false
- * ptr.eql?(other) => true or false
- *
- * Returns true if +other+ wraps the same pointer, otherwise returns
- * false.
- */
-static VALUE
-rb_fiddle_ptr_eql(VALUE self, VALUE other)
-{
- void *ptr1, *ptr2;
-
- if(!rb_obj_is_kind_of(other, rb_cPointer)) return Qfalse;
-
- ptr1 = rb_fiddle_ptr2cptr(self);
- ptr2 = rb_fiddle_ptr2cptr(other);
-
- return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * ptr <=> other => -1, 0, 1, or nil
- *
- * Returns -1 if less than, 0 if equal to, 1 if greater than +other+.
- *
- * Returns nil if +ptr+ cannot be compared to +other+.
- */
-static VALUE
-rb_fiddle_ptr_cmp(VALUE self, VALUE other)
-{
- void *ptr1, *ptr2;
- SIGNED_VALUE diff;
-
- if(!rb_obj_is_kind_of(other, rb_cPointer)) return Qnil;
-
- ptr1 = rb_fiddle_ptr2cptr(self);
- ptr2 = rb_fiddle_ptr2cptr(other);
- diff = (SIGNED_VALUE)ptr1 - (SIGNED_VALUE)ptr2;
- if (!diff) return INT2FIX(0);
- return diff > 0 ? INT2NUM(1) : INT2NUM(-1);
-}
-
-/*
- * call-seq:
- * ptr + n => new cptr
- *
- * Returns a new pointer instance that has been advanced +n+ bytes.
- */
-static VALUE
-rb_fiddle_ptr_plus(VALUE self, VALUE other)
-{
- void *ptr;
- long num, size;
-
- ptr = rb_fiddle_ptr2cptr(self);
- size = RPTR_DATA(self)->size;
- num = NUM2LONG(other);
- return rb_fiddle_ptr_new((char *)ptr + num, size - num, 0);
-}
-
-/*
- * call-seq:
- * ptr - n => new cptr
- *
- * Returns a new pointer instance that has been moved back +n+ bytes.
- */
-static VALUE
-rb_fiddle_ptr_minus(VALUE self, VALUE other)
-{
- void *ptr;
- long num, size;
-
- ptr = rb_fiddle_ptr2cptr(self);
- size = RPTR_DATA(self)->size;
- num = NUM2LONG(other);
- return rb_fiddle_ptr_new((char *)ptr - num, size + num, 0);
-}
-
-/*
- * call-seq:
- * ptr[index] -> an_integer
- * ptr[start, length] -> a_string
- *
- * Returns integer stored at _index_.
- *
- * If _start_ and _length_ are given, a string containing the bytes from
- * _start_ of _length_ will be returned.
- */
-static VALUE
-rb_fiddle_ptr_aref(int argc, VALUE argv[], VALUE self)
-{
- VALUE arg0, arg1;
- VALUE retval = Qnil;
- size_t offset, len;
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- if (!data->ptr) rb_raise(rb_eFiddleError, "NULL pointer dereference");
- switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
- case 1:
- offset = NUM2ULONG(arg0);
- retval = INT2NUM(*((char *)data->ptr + offset));
- break;
- case 2:
- offset = NUM2ULONG(arg0);
- len = NUM2ULONG(arg1);
- retval = rb_tainted_str_new((char *)data->ptr + offset, len);
- break;
- default:
- rb_bug("rb_fiddle_ptr_aref()");
- }
- return retval;
-}
-
-/*
- * call-seq:
- * ptr[index] = int -> int
- * ptr[start, length] = string or cptr or addr -> string or dl_cptr or addr
- *
- * Set the value at +index+ to +int+.
- *
- * Or, set the memory at +start+ until +length+ with the contents of +string+,
- * the memory from +dl_cptr+, or the memory pointed at by the memory address
- * +addr+.
- */
-static VALUE
-rb_fiddle_ptr_aset(int argc, VALUE argv[], VALUE self)
-{
- VALUE arg0, arg1, arg2;
- VALUE retval = Qnil;
- size_t offset, len;
- void *mem;
- struct ptr_data *data;
-
- TypedData_Get_Struct(self, struct ptr_data, &fiddle_ptr_data_type, data);
- if (!data->ptr) rb_raise(rb_eFiddleError, "NULL pointer dereference");
- switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
- case 2:
- offset = NUM2ULONG(arg0);
- ((char*)data->ptr)[offset] = NUM2UINT(arg1);
- retval = arg1;
- break;
- case 3:
- offset = NUM2ULONG(arg0);
- len = NUM2ULONG(arg1);
- if (RB_TYPE_P(arg2, T_STRING)) {
- mem = StringValuePtr(arg2);
- }
- else if( rb_obj_is_kind_of(arg2, rb_cPointer) ){
- mem = rb_fiddle_ptr2cptr(arg2);
- }
- else{
- mem = NUM2PTR(arg2);
- }
- memcpy((char *)data->ptr + offset, mem, len);
- retval = arg2;
- break;
- default:
- rb_bug("rb_fiddle_ptr_aset()");
- }
- return retval;
-}
-
-/*
- * call-seq: size=(size)
- *
- * Set the size of this pointer to +size+
- */
-static VALUE
-rb_fiddle_ptr_size_set(VALUE self, VALUE size)
-{
- RPTR_DATA(self)->size = NUM2LONG(size);
- return size;
-}
-
-/*
- * call-seq: size
- *
- * Get the size of this pointer.
- */
-static VALUE
-rb_fiddle_ptr_size_get(VALUE self)
-{
- return LONG2NUM(RPTR_DATA(self)->size);
-}
-
-/*
- * call-seq:
- * Fiddle::Pointer[val] => cptr
- * to_ptr(val) => cptr
- *
- * Get the underlying pointer for ruby object +val+ and return it as a
- * Fiddle::Pointer object.
- */
-static VALUE
-rb_fiddle_ptr_s_to_ptr(VALUE self, VALUE val)
-{
- VALUE ptr, wrap = val, vptr;
-
- if (RTEST(rb_obj_is_kind_of(val, rb_cIO))){
- rb_io_t *fptr;
- FILE *fp;
- GetOpenFile(val, fptr);
- fp = rb_io_stdio_file(fptr);
- ptr = rb_fiddle_ptr_new(fp, 0, NULL);
- }
- else if (RTEST(rb_obj_is_kind_of(val, rb_cString))){
- char *str = StringValuePtr(val);
- ptr = rb_fiddle_ptr_new(str, RSTRING_LEN(val), NULL);
- }
- else if ((vptr = rb_check_funcall(val, id_to_ptr, 0, 0)) != Qundef){
- if (rb_obj_is_kind_of(vptr, rb_cPointer)){
- ptr = vptr;
- wrap = 0;
- }
- else{
- rb_raise(rb_eFiddleError, "to_ptr should return a Fiddle::Pointer object");
- }
- }
- else{
- VALUE num = rb_Integer(val);
- if (num == val) wrap = 0;
- ptr = rb_fiddle_ptr_new(NUM2PTR(num), 0, NULL);
- }
- OBJ_INFECT(ptr, val);
- if (wrap) RPTR_DATA(ptr)->wrap[0] = wrap;
- return ptr;
-}
-
-void
-Init_fiddle_pointer(void)
-{
- id_to_ptr = rb_intern("to_ptr");
-
- /* Document-class: Fiddle::Pointer
- *
- * Fiddle::Pointer is a class to handle C pointers
- *
- */
- rb_cPointer = rb_define_class_under(mFiddle, "Pointer", rb_cObject);
- rb_define_alloc_func(rb_cPointer, rb_fiddle_ptr_s_allocate);
- rb_define_singleton_method(rb_cPointer, "malloc", rb_fiddle_ptr_s_malloc, -1);
- rb_define_singleton_method(rb_cPointer, "to_ptr", rb_fiddle_ptr_s_to_ptr, 1);
- rb_define_singleton_method(rb_cPointer, "[]", rb_fiddle_ptr_s_to_ptr, 1);
- rb_define_method(rb_cPointer, "initialize", rb_fiddle_ptr_initialize, -1);
- rb_define_method(rb_cPointer, "free=", rb_fiddle_ptr_free_set, 1);
- rb_define_method(rb_cPointer, "free", rb_fiddle_ptr_free_get, 0);
- rb_define_method(rb_cPointer, "to_i", rb_fiddle_ptr_to_i, 0);
- rb_define_method(rb_cPointer, "to_int", rb_fiddle_ptr_to_i, 0);
- rb_define_method(rb_cPointer, "to_value", rb_fiddle_ptr_to_value, 0);
- rb_define_method(rb_cPointer, "ptr", rb_fiddle_ptr_ptr, 0);
- rb_define_method(rb_cPointer, "+@", rb_fiddle_ptr_ptr, 0);
- rb_define_method(rb_cPointer, "ref", rb_fiddle_ptr_ref, 0);
- rb_define_method(rb_cPointer, "-@", rb_fiddle_ptr_ref, 0);
- rb_define_method(rb_cPointer, "null?", rb_fiddle_ptr_null_p, 0);
- rb_define_method(rb_cPointer, "to_s", rb_fiddle_ptr_to_s, -1);
- rb_define_method(rb_cPointer, "to_str", rb_fiddle_ptr_to_str, -1);
- rb_define_method(rb_cPointer, "inspect", rb_fiddle_ptr_inspect, 0);
- rb_define_method(rb_cPointer, "<=>", rb_fiddle_ptr_cmp, 1);
- rb_define_method(rb_cPointer, "==", rb_fiddle_ptr_eql, 1);
- rb_define_method(rb_cPointer, "eql?", rb_fiddle_ptr_eql, 1);
- rb_define_method(rb_cPointer, "+", rb_fiddle_ptr_plus, 1);
- rb_define_method(rb_cPointer, "-", rb_fiddle_ptr_minus, 1);
- rb_define_method(rb_cPointer, "[]", rb_fiddle_ptr_aref, -1);
- rb_define_method(rb_cPointer, "[]=", rb_fiddle_ptr_aset, -1);
- rb_define_method(rb_cPointer, "size", rb_fiddle_ptr_size_get, 0);
- rb_define_method(rb_cPointer, "size=", rb_fiddle_ptr_size_set, 1);
-
- /* Document-const: NULL
- *
- * A NULL pointer
- */
- rb_define_const(mFiddle, "NULL", rb_fiddle_ptr_new(0, 0, 0));
-}
diff --git a/ext/fiddle/win32/extconf.rb b/ext/fiddle/win32/extconf.rb
deleted file mode 100644
index c4efee8149..0000000000
--- a/ext/fiddle/win32/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if compiled?('fiddle') and $mswin||$mingw||$cygwin
- create_makefile('win32')
-end
diff --git a/ext/fiddle/win32/lib/win32/registry.rb b/ext/fiddle/win32/lib/win32/registry.rb
deleted file mode 100644
index f1aa3640a8..0000000000
--- a/ext/fiddle/win32/lib/win32/registry.rb
+++ /dev/null
@@ -1,845 +0,0 @@
-require 'fiddle/import'
-module Win32
-
-=begin rdoc
-= Win32 Registry
-
-win32/registry is registry accessor library for Win32 platform.
-It uses fiddle/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
-
---- info
-
---- 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 the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp] article.
-
-=end rdoc
-
- class Registry
-
- #
- # For detail, see the MSDN[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.
- 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 Fiddle::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 method 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.to_s)
- end
- end
-
- #
- # Win32 APIs
- #
- module API
- extend Fiddle::Importer
- dlload "advapi32.dll"
- [
- "long RegOpenKeyExA(void *, void *, long, long, void *)",
- "long RegCreateKeyExA(void *, void *, long, long, long, long, void *, 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
-
- #
- # Replace %\w+% into the environment value of what is contained between the %'s
- # This method is used for REG_EXPAND_SZ.
- #
- # For detail, see expandEnvironmentStrings[http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp] \Win32 \API.
- #
- 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
-
- #
- # Convert registry type value to readable string.
- #
- def self.type2name(type)
- @@type2name[type] || type.to_s
- end
-
- #
- # Convert 64-bit FILETIME integer into Time object.
- #
- def self.wtime2time(wtime)
- Time.at((wtime - 116444736000000000) / 10000000)
- end
-
- #
- # Convert Time object or Integer object into 64-bit FILETIME.
- #
- def self.time2wtime(time)
- time.to_i * 10000000 + 116444736000000000
- end
-
- #
- # constructor
- #
- private_class_method :new
-
- #
- # --- 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 the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp].
- # If block is given, the key is closed automatically.
- 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
-
- #
- # --- 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.
- #
- 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
-
- # Returns key handle value.
- attr_reader :hkey
- # Win32::Registry object of parent key, or nil if predefeined key.
- attr_reader :parent
- # Same as subkey value of Registry.open or
- # Registry.create method.
- attr_reader :keyname
- # Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
- attr_reader :disposition
-
- #
- # Returns if key is created ((*newly*)).
- # (see Registry.create) -- basically you call create
- # then when you call created? on the instance returned
- # it will tell if it was successful or not
- #
- def created?
- @disposition == REG_CREATED_NEW_KEY
- end
-
- #
- # Returns if key is not closed.
- #
- def open?
- !@hkey.nil?
- end
-
- #
- # Full path of key such as 'HKEY_CURRENT_USER\SOFTWARE\foo\bar'.
- #
- 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 is not allowed
- #
- def _dump(depth)
- raise TypeError, "can't dump Win32::Registry"
- end
-
- #
- # Same as Win32::Registry.open (self, subkey, desired, opt)
- #
- def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
- self.class.open(self, subkey, desired, opt, &blk)
- end
-
- #
- # Same as Win32::Registry.create (self, subkey, desired, opt)
- #
- def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
- self.class.create(self, subkey, desired, opt, &blk)
- end
-
- #
- # Close key.
- #
- # After close, most method raise an error.
- #
- def close
- API.CloseKey(@hkey)
- @hkey = @parent = @keyname = nil
- @hkeyfinal[0] = nil
- end
-
- #
- # Enumerate values.
- #
- 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
-
- #
- # Enumerate subkeys.
- #
- # subkey is String which contains name of subkey.
- # wtime is last write time as FILETIME (64-bit integer).
- # (see Registry.wtime2time)
- #
- 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
-
- #
- # return keys as an array
- #
- def keys
- keys_ary = []
- each_key { |key,| keys_ary << key }
- keys_ary
- end
-
- # 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.
- 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
-
- #
- # 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.
- #
- 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
-
- # 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.
- def read_s(name)
- read(name, REG_SZ)[1]
- end
-
- #
- # 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.
- #
- 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
-
- #
- # 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.
- #
- def read_i(name)
- read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
- end
-
- #
- # 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.
- #
- def read_bin(name)
- read(name, REG_BINARY)[1]
- end
-
- #
- # 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.
- #
- 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
-
- #
- # 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
- #
- 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
-
- #
- # 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).
- #
- def write_s(name, value)
- write name, REG_SZ, value.to_s
- end
-
- #
- # 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).
- #
- def write_i(name, value)
- write name, REG_DWORD, value.to_i
- end
-
- #
- # 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).
- #
- def write_bin(name, value)
- write name, REG_BINARY, value.to_s
- end
-
- #
- # Delete a registry value named name.
- # We can not delete the `default' value.
- #
- def delete_value(name)
- API.DeleteValue(@hkey, name)
- end
- alias delete delete_value
-
- #
- # 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.
- #
- 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
-
- #
- # Write all the attributes into the registry file.
- #
- def flush
- API.FlushKey @hkey
- end
-
- #
- # 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[http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp] Win32 API.
- #
- def info
- API.QueryInfoKey(@hkey)
- end
-
- #
- # Returns an item of key information.
- #
- %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/fiddle/win32/lib/win32/resolv.rb b/ext/fiddle/win32/lib/win32/resolv.rb
deleted file mode 100644
index 1315f32c61..0000000000
--- a/ext/fiddle/win32/lib/win32/resolv.rb
+++ /dev/null
@@ -1,379 +0,0 @@
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require "fiddle/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 Fiddle::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+\./ =~ 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 Fiddle::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/gdbm/.cvsignore b/ext/gdbm/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/gdbm/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 9d958d54a2..d0616cc63a 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -73,18 +73,12 @@
*/
static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
-#if SIZEOF_LONG > SIZEOF_INT
-#define TOO_LONG(n) ((long)(+(int)(n)) != (long)(n))
-#else
-#define TOO_LONG(n) 0
-#endif
-
#define RUBY_GDBM_RW_BIT 0x20000000
#define MY_BLOCK_SIZE (2048)
#define MY_FATAL_FUNC rb_gdbm_fatal
static void
-rb_gdbm_fatal(const char *msg)
+rb_gdbm_fatal(char *msg)
{
rb_raise(rb_eGDBMFatalError, "%s", msg);
}
@@ -101,13 +95,13 @@ closed_dbm(void)
}
#define GetDBM(obj, dbmp) do {\
- Data_Get_Struct((obj), struct dbmdata, (dbmp));\
- if ((dbmp) == 0) closed_dbm();\
- if ((dbmp)->di_dbm == 0) closed_dbm();\
+ Data_Get_Struct(obj, struct dbmdata, dbmp);\
+ if (dbmp == 0) closed_dbm();\
+ if (dbmp->di_dbm == 0) closed_dbm();\
} while (0)
#define GetDBM2(obj, data, dbm) {\
- GetDBM((obj), (data));\
+ GetDBM(obj, data);\
(dbm) = dbmp->di_dbm;\
}
@@ -210,11 +204,6 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
SafeStringValue(file);
-#ifdef GDBM_CLOEXEC
- /* GDBM_CLOEXEC is available since gdbm 1.10. */
- flags |= GDBM_CLOEXEC;
-#endif
-
if (flags & RUBY_GDBM_RW_BIT) {
flags &= ~RUBY_GDBM_RW_BIT;
dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE,
@@ -233,17 +222,13 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
GDBM_READER|flags, 0, MY_FATAL_FUNC);
}
- if (dbm) {
- rb_fd_fix_cloexec(gdbm_fdesc(dbm));
- }
-
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_str(file);
+ rb_sys_fail(RSTRING_PTR(file));
else
rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
@@ -312,13 +297,10 @@ static VALUE
rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
{
datum key;
- long len;
StringValue(keystr);
- len = RSTRING_LEN(keystr);
- if (TOO_LONG(len)) return Qnil;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (int)len;
+ key.dsize = RSTRING_LEN(keystr);
return rb_gdbm_fetch(dbm, key);
}
@@ -354,12 +336,9 @@ rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
{
datum key, key2;
VALUE str;
- long len;
- len = RSTRING_LEN(keystr);
- if (TOO_LONG(len)) return Qnil;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (int)len;
+ key.dsize = RSTRING_LEN(keystr);
key2 = gdbm_nextkey(dbm, key);
if (key2.dptr == 0)
return Qnil;
@@ -437,9 +416,9 @@ fgdbm_key(VALUE obj, VALUE valstr)
valstr2 = rb_gdbm_fetch2(dbm, keystr);
if (!NIL_P(valstr2) &&
- (int)RSTRING_LEN(valstr) == (int)RSTRING_LEN(valstr2) &&
+ RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
- (int)RSTRING_LEN(valstr)) == 0) {
+ RSTRING_LEN(valstr)) == 0) {
return keystr;
}
}
@@ -516,14 +495,11 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
datum key;
struct dbmdata *dbmp;
GDBM_FILE dbm;
- long len;
rb_gdbm_modify(obj);
StringValue(keystr);
- len = RSTRING_LEN(keystr);
- if (TOO_LONG(len)) return Qnil;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (int)len;
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
if (!gdbm_exists(dbm, key)) {
@@ -594,7 +570,7 @@ fgdbm_delete_if(VALUE obj)
struct dbmdata *dbmp;
GDBM_FILE dbm;
VALUE keystr, valstr;
- VALUE ret, ary = rb_ary_tmp_new(0);
+ VALUE ret, ary = rb_ary_new();
int i, status = 0, n;
rb_gdbm_modify(obj);
@@ -605,9 +581,8 @@ fgdbm_delete_if(VALUE obj)
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- OBJ_FREEZE(keystr);
valstr = rb_gdbm_fetch2(dbm, keystr);
- ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
+ ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status);
if (status != 0) break;
if (RTEST(ret)) rb_ary_push(ary, keystr);
GetDBM2(obj, dbmp, dbm);
@@ -616,8 +591,7 @@ fgdbm_delete_if(VALUE obj)
for (i = 0; i < RARRAY_LEN(ary); i++)
rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
if (status) rb_jump_tag(status);
- if (n > 0) dbmp->di_size = n - (int)RARRAY_LEN(ary);
- rb_ary_clear(ary);
+ if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
return obj;
}
@@ -709,10 +683,10 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
StringValue(valstr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LENINT(keystr);
+ key.dsize = RSTRING_LEN(keystr);
val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LENINT(valstr);
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
@@ -965,13 +939,10 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
datum key;
struct dbmdata *dbmp;
GDBM_FILE dbm;
- long len;
StringValue(keystr);
- len = RSTRING_LENINT(keystr);
- if (TOO_LONG(len)) return Qfalse;
key.dptr = RSTRING_PTR(keystr);
- key.dsize = (int)len;
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
if (gdbm_exists(dbm, key))
@@ -1002,9 +973,9 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
valstr2 = rb_gdbm_fetch2(dbm, keystr);
if (!NIL_P(valstr2) &&
- (int)RSTRING_LEN(valstr) == (int)RSTRING_LEN(valstr2) &&
+ RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
- (int)RSTRING_LEN(valstr)) == 0) {
+ RSTRING_LEN(valstr)) == 0) {
return Qtrue;
}
}
@@ -1052,7 +1023,6 @@ fgdbm_reorganize(VALUE obj)
rb_gdbm_modify(obj);
GetDBM2(obj, dbmp, dbm);
gdbm_reorganize(dbm);
- rb_fd_fix_cloexec(gdbm_fdesc(dbm));
return obj;
}
diff --git a/ext/iconv/.cvsignore b/ext/iconv/.cvsignore
new file mode 100644
index 0000000000..66c8f5297a
--- /dev/null
+++ b/ext/iconv/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+mkmf.log
+*.def
+iconv.rb
+config.charset
+extconf.h
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
new file mode 100644
index 0000000000..cd567a8e2e
--- /dev/null
+++ b/ext/iconv/charset_alias.rb
@@ -0,0 +1,104 @@
+#! /usr/bin/ruby
+# :stopdoc:
+require 'rbconfig'
+require 'optparse'
+
+# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
+# Tue, 25 Dec 2007 00:00:00 GMT
+
+OS = RbConfig::CONFIG["target_os"]
+SHELL = RbConfig::CONFIG['SHELL']
+
+class Hash::Ordered < Hash
+ def [](key)
+ val = super and val.last
+ end
+ def []=(key, val)
+ ary = fetch(key) {return super(key, [self.size, key, val])} and
+ ary << val
+ end
+ def sort
+ values.sort.collect {|i, *rest| rest}
+ end
+ def each(&block)
+ sort.each(&block)
+ end
+end
+
+def charset_alias(config_charset, mapfile, target = OS)
+ map = Hash::Ordered.new
+ comments = []
+ open(config_charset) do |input|
+ input.find {|line| /^case "\$os" in/ =~ line} or break
+ input.find {|line|
+ /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and
+ $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)}
+ } or break
+ input.find do |line|
+ case line
+ when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
+ sys, can = $1, $2
+ can.downcase!
+ map[can] = sys
+ false
+ when /^\s*;;/
+ true
+ else
+ false
+ end
+ end
+ end
+ case target
+ when /linux|-gnu/
+ # map.delete('ascii')
+ when /cygwin|os2-emx/
+ # get rid of tilde/yen problem.
+ map['shift_jis'] = 'cp932'
+ end
+ st = Hash.new(0)
+ map = map.sort.collect do |can, *sys|
+ if sys.grep(/^en_us(?=.|$)/i) {break true} == true
+ noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i #"
+ sys.reject! {|s| noen =~ s}
+ end
+ sys = sys.first
+ st[sys] += 1
+ [can, sys]
+ end
+ st.delete_if {|sys, i| i == 1}.empty?
+ st.keys.each {|sys| st[sys] = nil}
+ st.default = nil
+ writer = proc do |f|
+ f.puts("require 'iconv.so'")
+ f.puts
+ f.puts(comments)
+ f.puts("class Iconv")
+ i = 0
+ map.each do |can, sys|
+ if s = st[sys]
+ sys = s
+ elsif st.key?(sys)
+ sys = (st[sys] = "sys#{i+=1}") + " = '#{sys}'.freeze"
+ else
+ sys = "'#{sys}'.freeze"
+ end
+ f.puts(" charset_map['#{can}'] = #{sys}")
+ end
+ f.puts("end")
+ end
+ if mapfile
+ open(mapfile, "w", &writer)
+ else
+ writer[STDOUT]
+ end
+end
+
+target = OS
+opt = nil
+ARGV.options do |opt2|
+ opt = opt2
+ opt.banner << " config.status map.rb"
+ opt.on("--target OS") {|t| target = t}
+ opt.parse! and (1..2) === ARGV.size
+end or abort opt.to_s
+charset_alias(ARGV[0], ARGV[1], target)
diff --git a/ext/iconv/depend b/ext/iconv/depend
new file mode 100644
index 0000000000..ac555596ce
--- /dev/null
+++ b/ext/iconv/depend
@@ -0,0 +1,2 @@
+iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
+ $(hdrdir)/st.h $(hdrdir)/intern.h $(hdrdir)/encoding.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
new file mode 100644
index 0000000000..c4a57c80d6
--- /dev/null
+++ b/ext/iconv/extconf.rb
@@ -0,0 +1,54 @@
+require 'mkmf'
+
+dir_config("iconv")
+
+conf = File.exist?(File.join($srcdir, "config.charset"))
+conf = with_config("config-charset", enable_config("config-charset", conf))
+
+if have_func("iconv", "iconv.h") or
+ have_library("iconv", "iconv", "iconv.h")
+ check_signedness("size_t")
+ if checking_for("const of iconv() 2nd argument") do
+ create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
+ src = xpopen(cpp_command("")) {|f|f.read}
+ if !(func = src[/^--->\s*(\w+).*\s*<---/, 1])
+ Logging::message "iconv function name not found"
+ false
+ elsif !(second = src[%r"\b#{func}\s*\(.*?,(.*?),.*?\)\s*;"m, 1])
+ Logging::message "prototype for #{func}() not found"
+ false
+ else
+ Logging::message $&+"\n"
+ /\bconst\b/ =~ second
+ end
+ 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}/"
+ if $extout
+ wrapper = "$(RUBYARCHDIR)/iconv.rb"
+ else
+ wrapper = "./iconv.rb"
+ $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
+ end
+ if String === conf
+ require 'uri'
+ scheme = URI.parse(conf).scheme
+ else
+ conf = "$(srcdir)/config.charset"
+ end
+ $cleanfiles << wrapper
+ end
+ create_makefile("iconv")
+ if conf
+ open("Makefile", "a") do |mf|
+ mf.print("\nall: #{wrapper}\n\n#{wrapper}: #{prefix}charset_alias.rb")
+ mf.print(" ", conf) unless scheme
+ mf.print("\n\t$(RUBY) $(srcdir)/charset_alias.rb #{conf} $@\n")
+ end
+ end
+end
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
new file mode 100644
index 0000000000..ff30c4e13a
--- /dev/null
+++ b/ext/iconv/iconv.c
@@ -0,0 +1,1228 @@
+/* -*- mode:c; c-file-style:"ruby" -*- */
+/**********************************************************************
+
+ iconv.c -
+
+ $Author$
+ created at: Wed Dec 1 20:28:09 JST 1999
+
+ All the files in this distribution are covered under the Ruby's
+ license (see the file COPYING).
+
+ Documentation by Yukihiro Matsumoto and Gavin Sinclair.
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include <errno.h>
+#include <iconv.h>
+#include <assert.h>
+#include "ruby/st.h"
+#include "ruby/encoding.h"
+
+/*
+ * Document-class: Iconv
+ *
+ * == Summary
+ *
+ * Ruby extension for charset conversion.
+ *
+ * == Abstract
+ *
+ * Iconv is a wrapper class for the UNIX 95 <tt>iconv()</tt> function family,
+ * which translates string between various encoding systems.
+ *
+ * See Open Group's on-line documents for more details.
+ * * <tt>iconv.h</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.h.html
+ * * <tt>iconv_open()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_open.html
+ * * <tt>iconv()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv.html
+ * * <tt>iconv_close()</tt>: http://www.opengroup.org/onlinepubs/007908799/xsh/iconv_close.html
+ *
+ * Which coding systems are available is platform-dependent.
+ *
+ * == Examples
+ *
+ * 1. Simple conversion between two charsets.
+ *
+ * converted_text = Iconv.conv('iso-8859-15', 'utf-8', text)
+ *
+ * 2. Instantiate a new Iconv and use method Iconv#iconv.
+ *
+ * cd = Iconv.new(to, from)
+ * begin
+ * input.each { |s| output << cd.iconv(s) }
+ * output << cd.iconv(nil) # Don't forget this!
+ * ensure
+ * cd.close
+ * end
+ *
+ * 3. Invoke Iconv.open with a block.
+ *
+ * Iconv.open(to, from) do |cd|
+ * input.each { |s| output << cd.iconv(s) }
+ * output << cd.iconv(nil)
+ * end
+ *
+ * 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
+ big enough to keep iconv_t */
+#define VALUE2ICONV(v) ((iconv_t)((VALUE)(v) ^ -1))
+#define ICONV2VALUE(c) ((VALUE)(c) ^ -1)
+
+struct iconv_env_t
+{
+ iconv_t cd;
+ 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;
+static VALUE rb_eIconvInvalidChar;
+static VALUE rb_eIconvOutOfRange;
+static VALUE rb_eIconvBrokenLibrary;
+
+static ID rb_success, rb_failed;
+static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
+static VALUE iconv_fail_retry _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
+static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success, VALUE failed));
+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 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, long len));
+static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, int toidx,
+ 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_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;
+
+/*
+ * Document-method: charset_map
+ * call-seq: Iconv.charset_map
+ *
+ * Returns the map from canonical name to system dependent name.
+ */
+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)
+{
+ VALUE val = StringValue(*code);
+
+ if (RHASH_SIZE(charset_map)) {
+ VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
+ StringValuePtr(key);
+ if (st_lookup(RHASH_TBL(charset_map), key, &val)) {
+ *code = val;
+ }
+ }
+ return StringValuePtr(*code);
+}
+
+NORETURN(static void rb_iconv_sys_fail(const char *s));
+static void
+rb_iconv_sys_fail(const char *s)
+{
+ if (errno == 0) {
+ rb_exc_raise(iconv_fail(rb_eIconvBrokenLibrary, Qnil, Qnil, NULL, s));
+ }
+ rb_sys_fail(s);
+}
+
+#define rb_sys_fail(s) rb_iconv_sys_fail(s)
+
+static iconv_t
+iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
+{
+ 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);
+
+ 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;
+ 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;
+ }
+ {
+ const char *s = inval ? "invalid encoding " : "iconv";
+ volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING_LEN(to) +
+ RSTRING_LEN(from) + 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));
+ if (!inval) rb_sys_fail(s);
+ rb_exc_raise(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_close(VALUE2ICONV(cd));
+}
+
+#define ICONV_FREE iconv_dfree
+
+static VALUE
+iconv_free(VALUE cd)
+{
+ if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
+ rb_sys_fail("iconv_close");
+ return Qnil;
+}
+
+static VALUE
+check_iconv(VALUE obj)
+{
+ Check_Type(obj, T_DATA);
+ if (RDATA(obj)->dfree != ICONV_FREE) {
+ rb_raise(rb_eArgError, "Iconv expected (%s)", rb_class2name(CLASS_OF(obj)));
+ }
+ return (VALUE)DATA_PTR(obj);
+}
+
+static VALUE
+iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+{
+#ifdef ICONV_INPTR_CONST
+#define ICONV_INPTR_CAST
+#else
+#define ICONV_INPTR_CAST (char **)
+#endif
+ size_t ret;
+
+ errno = 0;
+ ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
+ if (ret == (size_t)-1) {
+ if (!*inlen)
+ return Qfalse;
+ switch (errno) {
+ case E2BIG:
+ /* try the left in next loop */
+ break;
+ case EILSEQ:
+ return rb_eIconvIllegalSeq;
+ case EINVAL:
+ return rb_eIconvInvalidChar;
+ case 0:
+ return rb_eIconvBrokenLibrary;
+ default:
+ rb_sys_fail("iconv");
+ }
+ }
+ else if (*inlen > 0) {
+ /* something goes wrong */
+ return rb_eIconvIllegalSeq;
+ }
+ else if (ret) {
+ return Qnil; /* conversion */
+ }
+ return Qfalse;
+}
+
+#define FAILED_MAXLEN 16
+
+static VALUE
+iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
+{
+ rb_call_super(1, &mesg);
+ rb_ivar_set(error, rb_success, success);
+ rb_ivar_set(error, rb_failed, failed);
+ return error;
+}
+
+static VALUE
+iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+{
+ VALUE args[3];
+
+ if (mesg && *mesg) {
+ args[0] = rb_str_new2(mesg);
+ }
+ else if (TYPE(failed) != T_STRING || RSTRING_LEN(failed) < FAILED_MAXLEN) {
+ args[0] = rb_inspect(failed);
+ }
+ else {
+ args[0] = rb_inspect(rb_str_substr(failed, 0, FAILED_MAXLEN));
+ rb_str_cat2(args[0], "...");
+ }
+ args[1] = success;
+ args[2] = failed;
+ if (env) {
+ args[1] = env->append(rb_obj_dup(env->ret), success);
+ if (env->argc > 0) {
+ *(env->argv) = failed;
+ args[2] = rb_ary_new4(env->argc, env->argv);
+ }
+ }
+ return rb_class_new_instance(3, args, error);
+}
+
+static VALUE
+iconv_fail_retry(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+{
+ error = iconv_fail(error, success, failed, env, mesg);
+ if (!rb_block_given_p()) rb_exc_raise(error);
+ rb_set_errinfo(error);
+ return rb_yield(failed);
+}
+
+static VALUE
+rb_str_derive(VALUE str, const char* ptr, long len)
+{
+ 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);
+ else
+ ret = rb_str_new(ptr, len);
+ OBJ_INFECT(ret, str);
+ return ret;
+}
+
+static VALUE
+iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct iconv_env_t* env)
+{
+ VALUE ret = Qfalse;
+ VALUE error = Qfalse;
+ VALUE rescue;
+ const char *inptr, *instart;
+ size_t inlen;
+ /* I believe ONE CHARACTER never exceed this. */
+ char buffer[BUFSIZ];
+ char *outptr;
+ size_t outlen;
+
+ if (cd == (iconv_t)-1)
+ rb_raise(rb_eArgError, "closed iconv");
+
+ if (NIL_P(str)) {
+ /* Reset output pointer or something. */
+ inptr = "";
+ inlen = 0;
+ outptr = buffer;
+ outlen = sizeof(buffer);
+ error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
+ if (RTEST(error)) {
+ unsigned int i;
+ rescue = iconv_fail_retry(error, Qnil, Qnil, env, 0);
+ if (TYPE(rescue) == T_ARRAY) {
+ str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil;
+ }
+ if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
+ char c = i;
+ str = rb_str_new(&c, 1);
+ }
+ else if (!NIL_P(str)) {
+ StringValue(str);
+ }
+ }
+
+ inptr = NULL;
+ length = 0;
+ }
+ else {
+ long slen;
+
+ StringValue(str);
+ slen = RSTRING_LEN(str);
+ inptr = RSTRING_PTR(str);
+
+ inptr += start;
+ if (length < 0 || length > start + slen)
+ length = slen - start;
+ }
+ instart = inptr;
+ inlen = length;
+
+ do {
+ char errmsg[50];
+ const char *tmpstart = inptr;
+ outptr = buffer;
+ outlen = sizeof(buffer);
+
+ errmsg[0] = 0;
+ error = iconv_try(cd, &inptr, &inlen, &outptr, &outlen);
+
+ if (
+#if SIGNEDNESS_OF_SIZE_T < 0
+ 0 <= outlen &&
+#endif
+ outlen <= sizeof(buffer)) {
+ outlen = sizeof(buffer) - outlen;
+ if (NIL_P(error) || /* something converted */
+ outlen > (size_t)(inptr - tmpstart) || /* input can't contain output */
+ (outlen < (size_t)(inptr - tmpstart) && inlen > 0) || /* something skipped */
+ memcmp(buffer, tmpstart, outlen)) /* something differs */
+ {
+ if (NIL_P(str)) {
+ ret = rb_str_new(buffer, outlen);
+ if (toidx >= 0) rb_enc_associate_index(ret, toidx);
+ }
+ else {
+ if (ret) {
+ ret = rb_str_buf_cat(ret, instart, tmpstart - instart);
+ }
+ 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);
+ instart = inptr;
+ }
+ }
+ else if (!inlen) {
+ inptr = tmpstart + outlen;
+ }
+ }
+ else {
+ /* Some iconv() have a bug, return *outlen out of range */
+ sprintf(errmsg, "bug?(output length = %ld)", (long)(sizeof(buffer) - outlen));
+ error = rb_eIconvOutOfRange;
+ }
+
+ if (RTEST(error)) {
+ long len = 0;
+
+ if (!ret) {
+ ret = rb_str_derive(str, instart, inptr - instart);
+ if (toidx >= 0) rb_enc_associate_index(ret, toidx);
+ }
+ else if (inptr > instart) {
+ rb_str_cat(ret, instart, inptr - instart);
+ }
+ str = rb_str_derive(str, inptr, inlen);
+ rescue = iconv_fail_retry(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])) {
+ StringValue(str);
+ inlen = length = RSTRING_LEN(str);
+ instart = inptr = RSTRING_PTR(str);
+ continue;
+ }
+ }
+ else if (!NIL_P(rescue)) {
+ rb_str_concat(ret, rescue);
+ }
+ break;
+ }
+ } while (inlen > 0);
+
+ if (!ret) {
+ ret = rb_str_derive(str, instart, inptr - instart);
+ if (toidx >= 0) rb_enc_associate_index(ret, toidx);
+ }
+ else if (inptr > instart) {
+ rb_str_cat(ret, instart, inptr - instart);
+ }
+ return ret;
+}
+
+static VALUE
+iconv_s_allocate(VALUE klass)
+{
+ 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])
+ *
+ * Creates new code converter from a coding-system designated with +from+
+ * to another one designated with +to+.
+ *
+ * === Parameters
+ *
+ * +to+:: encoding name for destination
+ * +from+:: encoding name for source
+ * +options+:: options for converter
+ *
+ * === Exceptions
+ *
+ * TypeError:: if +to+ or +from+ aren't String
+ * InvalidEncoding:: if designated converter couldn't find out
+ * SystemCallError:: if <tt>iconv_open(3)</tt> fails
+ */
+static VALUE
+iconv_initialize(int argc, VALUE *argv, VALUE self)
+{
+ 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);
+ return self;
+}
+
+/*
+ * Document-method: open
+ * call-seq: Iconv.open(to, from) { |iconv| ... }
+ *
+ * Equivalent to Iconv.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
+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));
+
+ 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);
+ }
+ else {
+ return self;
+ }
+}
+
+static VALUE
+iconv_s_convert(struct iconv_env_t* env)
+{
+ 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);
+ 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))
+ env->append(env->ret, s);
+ }
+
+ return env->ret;
+}
+
+/*
+ * Document-method: Iconv::iconv
+ * call-seq: Iconv.iconv(to, from, *strs)
+ *
+ * Shorthand for
+ * Iconv.open(to, from) { |cd|
+ * (strs + [nil]).collect { |s| cd.iconv(s) }
+ * }
+ *
+ * === Parameters
+ *
+ * <tt>to, from</tt>:: see Iconv.new
+ * <tt>strs</tt>:: strings to be converted
+ *
+ * === Exceptions
+ *
+ * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
+ */
+static VALUE
+iconv_s_iconv(int argc, VALUE *argv, VALUE self)
+{
+ struct iconv_env_t arg;
+
+ if (argc < 2) /* needs `to' and `from' arguments at least */
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, 2);
+
+ arg.argc = argc -= 2;
+ 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);
+ return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
+}
+
+/*
+ * Document-method: Iconv::conv
+ * call-seq: Iconv.conv(to, from, str)
+ *
+ * Shorthand for
+ * Iconv.iconv(to, from, str).join
+ * See Iconv.iconv.
+ */
+static VALUE
+iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
+{
+ struct iconv_env_t arg;
+
+ arg.argc = 1;
+ arg.argv = &str;
+ arg.append = rb_str_append;
+ arg.ret = rb_str_new(0, 0);
+ arg.cd = iconv_create(to, from, NULL, &arg.toidx);
+ 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.
+ *
+ * After calling this, calling Iconv#iconv will cause an exception, but
+ * multiple calls of #close are guaranteed to end successfully.
+ *
+ * Returns a string containing the byte sequence to change the output buffer to
+ * its initial shift state.
+ */
+static VALUE
+iconv_init_state(VALUE self)
+{
+ iconv_t cd = VALUE2ICONV((VALUE)DATA_PTR(self));
+ DATA_PTR(self) = NULL;
+ return iconv_convert(cd, Qnil, 0, 0, ENCODING_GET(self), NULL);
+}
+
+static VALUE
+iconv_finish(VALUE self)
+{
+ VALUE cd = check_iconv(self);
+
+ if (!cd) return Qnil;
+ return rb_ensure(iconv_init_state, self, iconv_free, cd);
+}
+
+/*
+ * Document-method: Iconv#iconv
+ * call-seq: iconv(str, start=0, length=-1)
+ *
+ * Converts string and returns the result.
+ * * If +str+ is a String, converts <tt>str[start, length]</tt> and returns the converted string.
+ * * If +str+ is +nil+, places converter itself into initial shift state and
+ * just returns a string containing the byte sequence to change the output
+ * buffer to its initial shift state.
+ * * Otherwise, raises an exception.
+ *
+ * === Parameters
+ *
+ * str:: string to be converted, or nil
+ * start:: starting offset
+ * length:: conversion length; nil or -1 means whole the string from start
+ *
+ * === Exceptions
+ *
+ * * IconvIllegalSequence
+ * * IconvInvalidCharacter
+ * * IconvOutOfRange
+ *
+ * === Examples
+ *
+ * See the Iconv documentation.
+ */
+static VALUE
+iconv_iconv(int argc, VALUE *argv, VALUE self)
+{
+ 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 (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;
+ }
+ }
+
+ 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;
+}
+
+/*
+ * Document-class: Iconv::Failure
+ *
+ * Base attributes for Iconv exceptions.
+ */
+
+/*
+ * Document-method: success
+ * call-seq: success
+ *
+ * Returns string(s) translated successfully until the exception occurred.
+ * * In the case of failure occurred within Iconv.iconv, returned
+ * value is an array of strings translated successfully preceding
+ * failure and the last element is string on the way.
+ */
+static VALUE
+iconv_failure_success(VALUE self)
+{
+ return rb_attr_get(self, rb_success);
+}
+
+/*
+ * Document-method: failed
+ * call-seq: failed
+ *
+ * Returns substring of the original string passed to Iconv that starts at the
+ * character caused the exception.
+ */
+static VALUE
+iconv_failure_failed(VALUE self)
+{
+ return rb_attr_get(self, rb_failed);
+}
+
+/*
+ * Document-method: inspect
+ * call-seq: inspect
+ *
+ * Returns inspected string like as: #<_class_: _success_, _failed_>
+ */
+static VALUE
+iconv_failure_inspect(VALUE self)
+{
+ const char *cname = rb_class2name(CLASS_OF(self));
+ VALUE success = rb_attr_get(self, rb_success);
+ VALUE failed = rb_attr_get(self, rb_failed);
+ VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname);
+ str = rb_str_buf_cat(str, ": ", 2);
+ str = rb_str_buf_append(str, rb_inspect(success));
+ str = rb_str_buf_cat(str, ", ", 2);
+ str = rb_str_buf_append(str, rb_inspect(failed));
+ return rb_str_buf_cat(str, ">", 1);
+}
+
+/*
+ * Document-class: Iconv::InvalidEncoding
+ *
+ * Requested coding-system is not available on this system.
+ */
+
+/*
+ * Document-class: Iconv::IllegalSequence
+ *
+ * Input conversion stopped due to an input byte that does not belong to
+ * the input codeset, or the output codeset does not contain the
+ * character.
+ */
+
+/*
+ * Document-class: Iconv::InvalidCharacter
+ *
+ * Input conversion stopped due to an incomplete character or shift
+ * sequence at the end of the input buffer.
+ */
+
+/*
+ * Document-class: Iconv::OutOfRange
+ *
+ * Iconv library internal error. Must not occur.
+ */
+
+/*
+ * Document-class: Iconv::BrokenLibrary
+ *
+ * Detected a bug of underlying iconv(3) libray.
+ * * returns an error without setting errno properly
+ */
+
+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, "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, "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);
+ rb_define_method(rb_eIconvFailure, "success", iconv_failure_success, 0);
+ rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
+ rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
+
+ rb_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
+ rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
+ rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
+ rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
+ rb_eIconvBrokenLibrary = rb_define_class_under(rb_cIconv, "BrokenLibrary", rb_eRuntimeError);
+ rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure);
+ rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
+ rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
+ rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
+ rb_include_module(rb_eIconvBrokenLibrary, rb_eIconvFailure);
+
+ 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();
+ rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
+}
+
diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb
new file mode 100644
index 0000000000..44d5fcf194
--- /dev/null
+++ b/ext/iconv/mkwrapper.rb
@@ -0,0 +1,53 @@
+#! /usr/bin/ruby
+require 'rbconfig'
+require 'optparse'
+
+# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
+# Tue, 25 Dec 2007 00:00: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/console/console.c b/ext/io/console/console.c
deleted file mode 100644
index 270ae3deaf..0000000000
--- a/ext/io/console/console.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/* -*- c-file-style: "ruby" -*- */
-/*
- * console IO module
- */
-#include "ruby.h"
-#ifdef HAVE_RUBY_IO_H
-#include "ruby/io.h"
-#else
-#include "rubyio.h"
-#endif
-
-#ifndef HAVE_RB_IO_T
-typedef OpenFile rb_io_t;
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#if defined HAVE_TERMIOS_H
-# include <termios.h>
-typedef struct termios conmode;
-
-static int
-setattr(int fd, conmode *t)
-{
- while (tcsetattr(fd, TCSAFLUSH, t)) {
- if (errno != EINTR) return 0;
- }
- return 1;
-}
-# define getattr(fd, t) (tcgetattr(fd, t) == 0)
-#elif defined HAVE_TERMIO_H
-# include <termio.h>
-typedef struct termio conmode;
-# define setattr(fd, t) (ioctl(fd, TCSETAF, t) == 0)
-# define getattr(fd, t) (ioctl(fd, TCGETA, t) == 0)
-#elif defined HAVE_SGTTY_H
-# include <sgtty.h>
-typedef struct sgttyb conmode;
-# ifdef HAVE_STTY
-# define setattr(fd, t) (stty(fd, t) == 0)
-# else
-# define setattr(fd, t) (ioctl((fd), TIOCSETP, (t)) == 0)
-# endif
-# ifdef HAVE_GTTY
-# define getattr(fd, t) (gtty(fd, t) == 0)
-# else
-# define getattr(fd, t) (ioctl((fd), TIOCGETP, (t)) == 0)
-# endif
-#elif defined _WIN32
-#include <winioctl.h>
-typedef DWORD conmode;
-
-#ifdef HAVE_RB_W32_MAP_ERRNO
-#define LAST_ERROR rb_w32_map_errno(GetLastError())
-#else
-#define LAST_ERROR EBADF
-#endif
-#define SET_LAST_ERROR (errno = LAST_ERROR, 0)
-
-static int
-setattr(int fd, conmode *t)
-{
- int x = SetConsoleMode((HANDLE)rb_w32_get_osfhandle(fd), *t);
- if (!x) errno = LAST_ERROR;
- return x;
-}
-
-static int
-getattr(int fd, conmode *t)
-{
- int x = GetConsoleMode((HANDLE)rb_w32_get_osfhandle(fd), t);
- if (!x) errno = LAST_ERROR;
- return x;
-}
-#endif
-#ifndef SET_LAST_ERROR
-#define SET_LAST_ERROR (0)
-#endif
-
-#ifndef InitVM
-#define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();}
-#endif
-
-static ID id_getc, id_console;
-
-typedef struct {
- int vmin;
- int vtime;
-} rawmode_arg_t;
-
-static rawmode_arg_t *
-rawmode_opt(int argc, VALUE *argv, rawmode_arg_t *opts)
-{
- rawmode_arg_t *optp = NULL;
- VALUE vopts;
- rb_scan_args(argc, argv, "0:", &vopts);
- if (!NIL_P(vopts)) {
- VALUE vmin = rb_hash_aref(vopts, ID2SYM(rb_intern("min")));
- VALUE vtime = rb_hash_aref(vopts, ID2SYM(rb_intern("time")));
- /* default values by `stty raw` */
- opts->vmin = 1;
- opts->vtime = 0;
- if (!NIL_P(vmin)) {
- opts->vmin = NUM2INT(vmin);
- optp = opts;
- }
- if (!NIL_P(vtime)) {
- VALUE v10 = INT2FIX(10);
- vtime = rb_funcall3(vtime, '*', 1, &v10);
- opts->vtime = NUM2INT(vtime);
- optp = opts;
- }
- }
- return optp;
-}
-
-static void
-set_rawmode(conmode *t, void *arg)
-{
-#ifdef HAVE_CFMAKERAW
- cfmakeraw(t);
- t->c_lflag &= ~(ECHOE|ECHOK);
-#elif defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
- t->c_oflag &= ~OPOST;
- t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN);
- t->c_cflag &= ~(CSIZE|PARENB);
- t->c_cflag |= CS8;
-#elif defined HAVE_SGTTY_H
- t->sg_flags &= ~ECHO;
- t->sg_flags |= RAW;
-#elif defined _WIN32
- *t = 0;
-#endif
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- if (arg) {
- const rawmode_arg_t *r = arg;
- if (r->vmin >= 0) t->c_cc[VMIN] = r->vmin;
- if (r->vtime >= 0) t->c_cc[VTIME] = r->vtime;
- }
-#endif
-}
-
-static void
-set_cookedmode(conmode *t, void *arg)
-{
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- t->c_iflag |= (BRKINT|ISTRIP|ICRNL|IXON);
- t->c_oflag |= OPOST;
- t->c_lflag |= (ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN);
-#elif defined HAVE_SGTTY_H
- t->sg_flags |= ECHO;
- t->sg_flags &= ~RAW;
-#elif defined _WIN32
- *t |= ENABLE_ECHO_INPUT|ENABLE_LINE_INPUT|ENABLE_PROCESSED_INPUT;
-#endif
-}
-
-static void
-set_noecho(conmode *t, void *arg)
-{
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- t->c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
-#elif defined HAVE_SGTTY_H
- t->sg_flags &= ~ECHO;
-#elif defined _WIN32
- *t &= ~ENABLE_ECHO_INPUT;
-#endif
-}
-
-static void
-set_echo(conmode *t, void *arg)
-{
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- t->c_lflag |= (ECHO | ECHOE | ECHOK | ECHONL);
-#elif defined HAVE_SGTTY_H
- t->sg_flags |= ECHO;
-#elif defined _WIN32
- *t |= ENABLE_ECHO_INPUT;
-#endif
-}
-
-static int
-echo_p(conmode *t)
-{
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- return (t->c_lflag & (ECHO | ECHONL)) != 0;
-#elif defined HAVE_SGTTY_H
- return (t->sg_flags & ECHO) != 0;
-#elif defined _WIN32
- return (*t & ENABLE_ECHO_INPUT) != 0;
-#endif
-}
-
-static int
-set_ttymode(int fd, conmode *t, void (*setter)(conmode *, void *), void *arg)
-{
- conmode r;
- if (!getattr(fd, t)) return 0;
- r = *t;
- setter(&r, arg);
- return setattr(fd, &r);
-}
-
-#ifdef GetReadFile
-#define GetReadFD(fptr) fileno(GetReadFile(fptr))
-#else
-#define GetReadFD(fptr) ((fptr)->fd)
-#endif
-
-#ifdef GetWriteFile
-#define GetWriteFD(fptr) fileno(GetWriteFile(fptr))
-#else
-static inline int
-get_write_fd(const rb_io_t *fptr)
-{
- VALUE wio = fptr->tied_io_for_writing;
- rb_io_t *ofptr;
- if (!wio) return fptr->fd;
- GetOpenFile(wio, ofptr);
- return ofptr->fd;
-}
-#define GetWriteFD(fptr) get_write_fd(fptr)
-#endif
-
-#define FD_PER_IO 2
-
-static VALUE
-ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void *arg)
-{
- rb_io_t *fptr;
- int status = -1;
- int error = 0;
- int fd[FD_PER_IO];
- conmode t[FD_PER_IO];
- VALUE result = Qnil;
-
- GetOpenFile(io, fptr);
- fd[0] = GetReadFD(fptr);
- if (fd[0] != -1) {
- if (set_ttymode(fd[0], t+0, setter, arg)) {
- status = 0;
- }
- else {
- error = errno;
- fd[0] = -1;
- }
- }
- fd[1] = GetWriteFD(fptr);
- if (fd[1] != -1 && fd[1] != fd[0]) {
- if (set_ttymode(fd[1], t+1, setter, arg)) {
- status = 0;
- }
- else {
- error = errno;
- fd[1] = -1;
- }
- }
- if (status == 0) {
- result = rb_protect(func, io, &status);
- }
- GetOpenFile(io, fptr);
- if (fd[0] != -1 && fd[0] == GetReadFD(fptr)) {
- if (!setattr(fd[0], t+0)) {
- error = errno;
- status = -1;
- }
- }
- if (fd[1] != -1 && fd[1] != fd[0] && fd[1] == GetWriteFD(fptr)) {
- if (!setattr(fd[1], t+1)) {
- error = errno;
- status = -1;
- }
- }
- if (status) {
- if (status == -1) {
- errno = error;
- rb_sys_fail(0);
- }
- rb_jump_tag(status);
- }
- return result;
-}
-
-/*
- * call-seq:
- * io.raw(min: nil, time: nil) {|io| }
- *
- * Yields +self+ within raw mode.
- *
- * STDIN.raw(&:gets)
- *
- * will read and return a line without echo back and line editing.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_raw(int argc, VALUE *argv, VALUE io)
-{
- rawmode_arg_t opts, *optp = rawmode_opt(argc, argv, &opts);
- return ttymode(io, rb_yield, set_rawmode, optp);
-}
-
-/*
- * call-seq:
- * io.raw!(min: nil, time: nil)
- *
- * Enables raw mode.
- *
- * If the terminal mode needs to be back, use io.raw { ... }.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_set_raw(int argc, VALUE *argv, VALUE io)
-{
- conmode t;
- rb_io_t *fptr;
- int fd;
- rawmode_arg_t opts, *optp = rawmode_opt(argc, argv, &opts);
-
- GetOpenFile(io, fptr);
- fd = GetReadFD(fptr);
- if (!getattr(fd, &t)) rb_sys_fail(0);
- set_rawmode(&t, optp);
- if (!setattr(fd, &t)) rb_sys_fail(0);
- return io;
-}
-
-/*
- * call-seq:
- * io.cooked {|io| }
- *
- * Yields +self+ within cooked mode.
- *
- * STDIN.cooked(&:gets)
- *
- * will read and return a line with echo back and line editing.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_cooked(VALUE io)
-{
- return ttymode(io, rb_yield, set_cookedmode, NULL);
-}
-
-/*
- * call-seq:
- * io.cooked!
- *
- * Enables cooked mode.
- *
- * If the terminal mode needs to be back, use io.cooked { ... }.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_set_cooked(VALUE io)
-{
- conmode t;
- rb_io_t *fptr;
- int fd;
-
- GetOpenFile(io, fptr);
- fd = GetReadFD(fptr);
- if (!getattr(fd, &t)) rb_sys_fail(0);
- set_cookedmode(&t, NULL);
- if (!setattr(fd, &t)) rb_sys_fail(0);
- return io;
-}
-
-static VALUE
-getc_call(VALUE io)
-{
- return rb_funcall2(io, id_getc, 0, 0);
-}
-
-/*
- * call-seq:
- * io.getch(min: nil, time: nil) -> char
- *
- * Reads and returns a character in raw mode.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_getch(int argc, VALUE *argv, VALUE io)
-{
- rawmode_arg_t opts, *optp = rawmode_opt(argc, argv, &opts);
- return ttymode(io, getc_call, set_rawmode, optp);
-}
-
-/*
- * call-seq:
- * io.noecho {|io| }
- *
- * Yields +self+ with disabling echo back.
- *
- * STDIN.noecho(&:gets)
- *
- * will read and return a line without echo back.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_noecho(VALUE io)
-{
- return ttymode(io, rb_yield, set_noecho, NULL);
-}
-
-/*
- * call-seq:
- * io.echo = flag
- *
- * Enables/disables echo back.
- * On some platforms, all combinations of this flags and raw/cooked
- * mode may not be valid.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_set_echo(VALUE io, VALUE f)
-{
- conmode t;
- rb_io_t *fptr;
- int fd;
-
- GetOpenFile(io, fptr);
- fd = GetReadFD(fptr);
- if (!getattr(fd, &t)) rb_sys_fail(0);
- if (RTEST(f))
- set_echo(&t, NULL);
- else
- set_noecho(&t, NULL);
- if (!setattr(fd, &t)) rb_sys_fail(0);
- return io;
-}
-
-/*
- * call-seq:
- * io.echo? -> true or false
- *
- * Returns +true+ if echo back is enabled.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_echo_p(VALUE io)
-{
- conmode t;
- rb_io_t *fptr;
- int fd;
-
- GetOpenFile(io, fptr);
- fd = GetReadFD(fptr);
- if (!getattr(fd, &t)) rb_sys_fail(0);
- return echo_p(&t) ? Qtrue : Qfalse;
-}
-
-#if defined TIOCGWINSZ
-typedef struct winsize rb_console_size_t;
-#define getwinsize(fd, buf) (ioctl((fd), TIOCGWINSZ, (buf)) == 0)
-#define setwinsize(fd, buf) (ioctl((fd), TIOCSWINSZ, (buf)) == 0)
-#define winsize_row(buf) (buf)->ws_row
-#define winsize_col(buf) (buf)->ws_col
-#elif defined _WIN32
-typedef CONSOLE_SCREEN_BUFFER_INFO rb_console_size_t;
-#define getwinsize(fd, buf) ( \
- GetConsoleScreenBufferInfo((HANDLE)rb_w32_get_osfhandle(fd), (buf)) || \
- SET_LAST_ERROR)
-#define winsize_row(buf) ((buf)->srWindow.Bottom - (buf)->srWindow.Top + 1)
-#define winsize_col(buf) (buf)->dwSize.X
-#endif
-
-#if defined TIOCGWINSZ || defined _WIN32
-#define USE_CONSOLE_GETSIZE 1
-#endif
-
-#ifdef USE_CONSOLE_GETSIZE
-/*
- * call-seq:
- * io.winsize -> [rows, columns]
- *
- * Returns console size.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_winsize(VALUE io)
-{
- rb_io_t *fptr;
- int fd;
- rb_console_size_t ws;
-
- GetOpenFile(io, fptr);
- fd = GetWriteFD(fptr);
- if (!getwinsize(fd, &ws)) rb_sys_fail(0);
- return rb_assoc_new(INT2NUM(winsize_row(&ws)), INT2NUM(winsize_col(&ws)));
-}
-
-/*
- * call-seq:
- * io.winsize = [rows, columns]
- *
- * Tries to set console size. The effect depends on the platform and
- * the running environment.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_set_winsize(VALUE io, VALUE size)
-{
- rb_io_t *fptr;
- rb_console_size_t ws;
-#if defined _WIN32
- HANDLE wh;
- int newrow, newcol;
-#endif
- VALUE row, col, xpixel, ypixel;
-#if defined TIOCSWINSZ
- int fd;
-#endif
-
- GetOpenFile(io, fptr);
- size = rb_Array(size);
- rb_scan_args((int)RARRAY_LEN(size), RARRAY_PTR(size), "22",
- &row, &col, &xpixel, &ypixel);
-#if defined TIOCSWINSZ
- fd = GetWriteFD(fptr);
- ws.ws_row = ws.ws_col = ws.ws_xpixel = ws.ws_ypixel = 0;
-#define SET(m) ws.ws_##m = NIL_P(m) ? 0 : (unsigned short)NUM2UINT(m)
- SET(row);
- SET(col);
- SET(xpixel);
- SET(ypixel);
-#undef SET
- if (!setwinsize(fd, &ws)) rb_sys_fail(0);
-#elif defined _WIN32
- wh = (HANDLE)rb_w32_get_osfhandle(GetReadFD(fptr));
- newrow = (SHORT)NUM2UINT(row);
- newcol = (SHORT)NUM2UINT(col);
- if (!getwinsize(GetReadFD(fptr), &ws)) {
- rb_sys_fail("GetConsoleScreenBufferInfo");
- }
- if ((ws.dwSize.X < newcol && (ws.dwSize.X = newcol, 1)) ||
- (ws.dwSize.Y < newrow && (ws.dwSize.Y = newrow, 1))) {
- if (!(SetConsoleScreenBufferSize(wh, ws.dwSize) || SET_LAST_ERROR)) {
- rb_sys_fail("SetConsoleScreenBufferInfo");
- }
- }
- ws.srWindow.Left = 0;
- ws.srWindow.Top = 0;
- ws.srWindow.Right = newcol;
- ws.srWindow.Bottom = newrow;
- if (!(SetConsoleWindowInfo(wh, FALSE, &ws.srWindow) || SET_LAST_ERROR)) {
- rb_sys_fail("SetConsoleWindowInfo");
- }
-#endif
- return io;
-}
-#endif
-
-/*
- * call-seq:
- * io.iflush
- *
- * Flushes input buffer in kernel.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_iflush(VALUE io)
-{
- rb_io_t *fptr;
- int fd;
-
- GetOpenFile(io, fptr);
- fd = GetReadFD(fptr);
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- if (tcflush(fd, TCIFLUSH)) rb_sys_fail(0);
-#endif
- return io;
-}
-
-/*
- * call-seq:
- * io.oflush
- *
- * Flushes output buffer in kernel.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_oflush(VALUE io)
-{
- rb_io_t *fptr;
- int fd;
-
- GetOpenFile(io, fptr);
- fd = GetWriteFD(fptr);
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- if (tcflush(fd, TCOFLUSH)) rb_sys_fail(0);
-#endif
- return io;
-}
-
-/*
- * call-seq:
- * io.ioflush
- *
- * Flushes input and output buffers in kernel.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_ioflush(VALUE io)
-{
- rb_io_t *fptr;
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- int fd1, fd2;
-#endif
-
- GetOpenFile(io, fptr);
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- fd1 = GetReadFD(fptr);
- fd2 = GetWriteFD(fptr);
- if (fd2 != -1 && fd1 != fd2) {
- if (tcflush(fd1, TCIFLUSH)) rb_sys_fail(0);
- if (tcflush(fd2, TCOFLUSH)) rb_sys_fail(0);
- }
- else {
- if (tcflush(fd1, TCIOFLUSH)) rb_sys_fail(0);
- }
-#endif
- return io;
-}
-
-/*
- * call-seq:
- * IO.console -> #<File:/dev/tty>
- *
- * Returns an File instance opened console.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_dev(VALUE klass)
-{
- VALUE con = 0;
- rb_io_t *fptr;
-
- if (klass == rb_cIO) klass = rb_cFile;
- if (rb_const_defined(klass, id_console)) {
- con = rb_const_get(klass, id_console);
- if (RB_TYPE_P(con, T_FILE)) {
- if ((fptr = RFILE(con)->fptr) && GetReadFD(fptr) != -1)
- return con;
- }
- rb_mod_remove_const(klass, ID2SYM(id_console));
- }
- {
- VALUE args[2];
-#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H || defined HAVE_SGTTY_H
-# define CONSOLE_DEVICE "/dev/tty"
-#elif defined _WIN32
-# define CONSOLE_DEVICE "con$"
-# define CONSOLE_DEVICE_FOR_READING "conin$"
-# define CONSOLE_DEVICE_FOR_WRITING "conout$"
-#endif
-#ifndef CONSOLE_DEVICE_FOR_READING
-# define CONSOLE_DEVICE_FOR_READING CONSOLE_DEVICE
-#endif
-#ifdef CONSOLE_DEVICE_FOR_WRITING
- VALUE out;
- rb_io_t *ofptr;
-#endif
- int fd;
-
-#ifdef CONSOLE_DEVICE_FOR_WRITING
- fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_WRITING, O_RDWR, 0);
- if (fd < 0) return Qnil;
- rb_update_max_fd(fd);
- args[1] = INT2FIX(O_WRONLY);
- args[0] = INT2NUM(fd);
- out = rb_class_new_instance(2, args, klass);
-#endif
- fd = rb_cloexec_open(CONSOLE_DEVICE_FOR_READING, O_RDWR, 0);
- if (fd < 0) {
-#ifdef CONSOLE_DEVICE_FOR_WRITING
- rb_io_close(out);
-#endif
- return Qnil;
- }
- rb_update_max_fd(fd);
- args[1] = INT2FIX(O_RDWR);
- args[0] = INT2NUM(fd);
- con = rb_class_new_instance(2, args, klass);
- GetOpenFile(con, fptr);
- fptr->pathv = rb_obj_freeze(rb_str_new2(CONSOLE_DEVICE));
-#ifdef CONSOLE_DEVICE_FOR_WRITING
- GetOpenFile(out, ofptr);
-# ifdef HAVE_RB_IO_GET_WRITE_IO
- ofptr->pathv = fptr->pathv;
- fptr->tied_io_for_writing = out;
-# else
- fptr->f2 = ofptr->f;
- ofptr->f = 0;
-# endif
- ofptr->mode |= FMODE_SYNC;
-#endif
- fptr->mode |= FMODE_SYNC;
- rb_const_set(klass, id_console, con);
- }
- return con;
-}
-
-static VALUE
-io_getch(int argc, VALUE *argv, VALUE io)
-{
- return rb_funcall2(io, rb_intern("getc"), argc, argv);
-}
-
-/*
- * IO console methods
- */
-void
-Init_console(void)
-{
- id_getc = rb_intern("getc");
- id_console = rb_intern("console");
- InitVM(console);
-}
-
-void
-InitVM_console(void)
-{
- rb_define_method(rb_cIO, "raw", console_raw, -1);
- rb_define_method(rb_cIO, "raw!", console_set_raw, -1);
- rb_define_method(rb_cIO, "cooked", console_cooked, 0);
- rb_define_method(rb_cIO, "cooked!", console_set_cooked, 0);
- rb_define_method(rb_cIO, "getch", console_getch, -1);
- rb_define_method(rb_cIO, "echo=", console_set_echo, 1);
- rb_define_method(rb_cIO, "echo?", console_echo_p, 0);
- rb_define_method(rb_cIO, "noecho", console_noecho, 0);
- rb_define_method(rb_cIO, "winsize", console_winsize, 0);
- rb_define_method(rb_cIO, "winsize=", console_set_winsize, 1);
- rb_define_method(rb_cIO, "iflush", console_iflush, 0);
- rb_define_method(rb_cIO, "oflush", console_oflush, 0);
- rb_define_method(rb_cIO, "ioflush", console_ioflush, 0);
- rb_define_singleton_method(rb_cIO, "console", console_dev, 0);
- {
- VALUE mReadable = rb_define_module_under(rb_cIO, "readable");
- rb_define_method(mReadable, "getch", io_getch, -1);
- }
-}
diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb
deleted file mode 100644
index 57cd7ad87f..0000000000
--- a/ext/io/console/extconf.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'mkmf'
-
-ok = true
-hdr = nil
-case
-when macro_defined?("_WIN32", "")
- have_func("rb_w32_map_errno", "ruby.h")
-when hdr = %w"termios.h termio.h".find {|h| have_header(h)}
- have_func("cfmakeraw", hdr)
-when have_header(hdr = "sgtty.h")
- %w"stty gtty".each {|f| have_func(f, hdr)}
-else
- ok = false
-end
-have_header("sys/ioctl.h")
-have_func("rb_io_get_write_io", "ruby/io.h")
-have_func("dup3", "unistd.h")
-if ok
- create_makefile("io/console")
-end
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
deleted file mode 100644
index fd8a9aaf3e..0000000000
--- a/ext/io/console/io-console.gemspec
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- ruby -*-
-_VERSION = "0.4.2"
-date = %w$Date:: $[1]
-
-Gem::Specification.new do |s|
- s.name = "io-console"
- s.version = _VERSION
- s.date = date
- s.summary = "Console interface"
- s.email = "nobu@ruby-lang.org"
- s.description = "add console capabilities to IO instances."
- s.homepage = "http://www.ruby-lang.org"
- s.authors = ["Nobu Nakada"]
- s.require_path = %[.]
- s.files = %w[console.c extconf.rb lib/console/size.rb]
- s.extensions = %w[extconf.rb]
- s.licenses = "ruby"
-end
diff --git a/ext/io/console/lib/console/size.rb b/ext/io/console/lib/console/size.rb
deleted file mode 100644
index e9d8a1fbb6..0000000000
--- a/ext/io/console/lib/console/size.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-def IO.default_console_size
- [
- ENV["LINES"].to_i.nonzero? || 25,
- ENV["COLUMNS"].to_i.nonzero? || 80,
- ]
-end
-
-begin
- require 'io/console'
-rescue LoadError
- class IO
- alias console_size default_console_size
- end
-else
- def IO.console_size
- console.winsize
- rescue NoMethodError
- default_console_size
- end
-end
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
index 1d866ceb0f..d7e1ac8e01 100644
--- a/ext/io/nonblock/nonblock.c
+++ b/ext/io/nonblock/nonblock.c
@@ -47,16 +47,10 @@ rb_io_nonblock_p(VALUE io)
static void
io_nonblock_set(int fd, int f, int nb)
{
- if (nb) {
- if ((f & O_NONBLOCK) != 0)
- return;
+ if (nb)
f |= O_NONBLOCK;
- }
- else {
- if ((f & O_NONBLOCK) == 0)
- return;
+ else
f &= ~O_NONBLOCK;
- }
if (fcntl(fd, F_SETFL, f) == -1)
rb_sys_fail(0);
}
diff --git a/ext/io/wait/.cvsignore b/ext/io/wait/.cvsignore
new file mode 100644
index 0000000000..8767482975
--- /dev/null
+++ b/ext/io/wait/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+mkmf.log
+extconf.h
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index c7a290fd4f..b73c9af1ce 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -14,9 +14,6 @@
#include "ruby/io.h"
#include <sys/types.h>
-#if defined(HAVE_UNISTD_H) && (defined(__sun))
-#include <unistd.h>
-#endif
#if defined(HAVE_SYS_IOCTL_H)
#include <sys/ioctl.h>
#endif
@@ -40,10 +37,11 @@
#endif
static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait_readable _((int argc, VALUE *argv, VALUE io));
-static VALUE io_wait_writable _((int argc, VALUE *argv, VALUE io));
+static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
void Init_wait _((void));
+EXTERN struct timeval rb_time_interval _((VALUE time));
+
/*
* call-seq:
* io.nread -> int
@@ -92,6 +90,22 @@ io_ready_p(VALUE io)
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);
+}
+#endif
+
/*
* call-seq:
* io.wait -> IO, true, false or nil
@@ -102,29 +116,37 @@ io_ready_p(VALUE io)
*/
static VALUE
-io_wait_readable(int argc, VALUE *argv, VALUE io)
+io_wait(int argc, VALUE *argv, VALUE io)
{
rb_io_t *fptr;
- int i;
+ struct wait_readable_arg arg;
+ int fd, i;
ioctl_arg n;
VALUE timeout;
struct timeval timerec;
- struct timeval *tv;
GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
rb_scan_args(argc, argv, "01", &timeout);
if (NIL_P(timeout)) {
- tv = NULL;
+ arg.timeout = 0;
}
else {
timerec = rb_time_interval(timeout);
- tv = &timerec;
+ arg.timeout = &timerec;
}
if (rb_io_read_pending(fptr)) return Qtrue;
if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
- i = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_IN, tv);
+ 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)
rb_sys_fail(0);
rb_io_check_closed(fptr);
@@ -134,43 +156,6 @@ io_wait_readable(int argc, VALUE *argv, VALUE io)
}
/*
- * call-seq:
- * io.wait_writable -> IO
- * io.wait_writable(timeout) -> IO or nil
- *
- * Waits until IO writable is available or times out and returns self or
- * nil when EOF is reached.
- */
-static VALUE
-io_wait_writable(int argc, VALUE *argv, VALUE io)
-{
- rb_io_t *fptr;
- int i;
- VALUE timeout;
- struct timeval timerec;
- struct timeval *tv;
-
- GetOpenFile(io, fptr);
- rb_io_check_writable(fptr);
- rb_scan_args(argc, argv, "01", &timeout);
- if (NIL_P(timeout)) {
- tv = NULL;
- }
- else {
- timerec = rb_time_interval(timeout);
- tv = &timerec;
- }
-
- i = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_OUT, tv);
- if (i < 0)
- rb_sys_fail(0);
- rb_io_check_closed(fptr);
- if (i & RB_WAITFD_OUT)
- return io;
- return Qnil;
-}
-
-/*
* IO wait methods
*/
@@ -179,7 +164,5 @@ 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_readable, -1);
- rb_define_method(rb_cIO, "wait_readable", io_wait_readable, -1);
- rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1);
+ rb_define_method(rb_cIO, "wait", io_wait, -1);
}
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
deleted file mode 100644
index 1e860eb790..0000000000
--- a/ext/json/fbuffer/fbuffer.h
+++ /dev/null
@@ -1,190 +0,0 @@
-
-#ifndef _FBUFFER_H_
-#define _FBUFFER_H_
-
-#include "ruby.h"
-
-#ifndef RHASH_SIZE
-#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
-#endif
-
-#ifndef RFLOAT_VALUE
-#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
-#endif
-
-#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
-
-#ifdef PRIsVALUE
-# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
-# define RB_OBJ_STRING(obj) (obj)
-#else
-# define PRIsVALUE "s"
-# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
-# define RB_OBJ_STRING(obj) StringValueCStr(obj)
-#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
-
-/* We don't need to guard objects for rbx, so let's do nothing at all. */
-#ifndef RB_GC_GUARD
-#define RB_GC_GUARD(object)
-#endif
-
-typedef struct FBufferStruct {
- unsigned long initial_length;
- char *ptr;
- unsigned long len;
- unsigned long capa;
-} FBuffer;
-
-#define FBUFFER_INITIAL_LENGTH_DEFAULT 1024
-
-#define FBUFFER_PTR(fb) (fb->ptr)
-#define FBUFFER_LEN(fb) (fb->len)
-#define FBUFFER_CAPA(fb) (fb->capa)
-#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
-
-static FBuffer *fbuffer_alloc(unsigned long initial_length);
-static void fbuffer_free(FBuffer *fb);
-static void fbuffer_clear(FBuffer *fb);
-static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len);
-#ifdef JSON_GENERATOR
-static void fbuffer_append_long(FBuffer *fb, long number);
-#endif
-static void fbuffer_append_char(FBuffer *fb, char newchr);
-#ifdef JSON_GENERATOR
-static FBuffer *fbuffer_dup(FBuffer *fb);
-static VALUE fbuffer_to_s(FBuffer *fb);
-#endif
-
-static FBuffer *fbuffer_alloc(unsigned long initial_length)
-{
- FBuffer *fb;
- if (initial_length <= 0) initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
- fb = ALLOC(FBuffer);
- memset((void *) fb, 0, sizeof(FBuffer));
- fb->initial_length = initial_length;
- return fb;
-}
-
-static void fbuffer_free(FBuffer *fb)
-{
- if (fb->ptr) ruby_xfree(fb->ptr);
- ruby_xfree(fb);
-}
-
-static void fbuffer_clear(FBuffer *fb)
-{
- fb->len = 0;
-}
-
-static void fbuffer_inc_capa(FBuffer *fb, unsigned long requested)
-{
- unsigned long required;
-
- if (!fb->ptr) {
- fb->ptr = ALLOC_N(char, fb->initial_length);
- fb->capa = fb->initial_length;
- }
-
- for (required = fb->capa; requested > required - fb->len; required <<= 1);
-
- if (required > fb->capa) {
- REALLOC_N(fb->ptr, char, required);
- fb->capa = required;
- }
-}
-
-static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
-{
- if (len > 0) {
- fbuffer_inc_capa(fb, len);
- MEMCPY(fb->ptr + fb->len, newstr, char, len);
- fb->len += len;
- }
-}
-
-#ifdef JSON_GENERATOR
-static void fbuffer_append_str(FBuffer *fb, VALUE str)
-{
- const char *newstr = StringValuePtr(str);
- unsigned long len = RSTRING_LEN(str);
-
- RB_GC_GUARD(str);
-
- fbuffer_append(fb, newstr, len);
-}
-#endif
-
-static void fbuffer_append_char(FBuffer *fb, char newchr)
-{
- fbuffer_inc_capa(fb, 1);
- *(fb->ptr + fb->len) = newchr;
- fb->len++;
-}
-
-#ifdef JSON_GENERATOR
-static void freverse(char *start, char *end)
-{
- char c;
-
- while (end > start) {
- c = *end, *end-- = *start, *start++ = c;
- }
-}
-
-static long fltoa(long number, char *buf)
-{
- static char digits[] = "0123456789";
- long sign = number;
- char* tmp = buf;
-
- if (sign < 0) number = -number;
- do *tmp++ = digits[number % 10]; while (number /= 10);
- if (sign < 0) *tmp++ = '-';
- freverse(buf, tmp - 1);
- return tmp - buf;
-}
-
-static void fbuffer_append_long(FBuffer *fb, long number)
-{
- char buf[20];
- unsigned long len = fltoa(number, buf);
- fbuffer_append(fb, buf, len);
-}
-
-static FBuffer *fbuffer_dup(FBuffer *fb)
-{
- unsigned long len = fb->len;
- FBuffer *result;
-
- result = fbuffer_alloc(len);
- fbuffer_append(result, FBUFFER_PAIR(fb));
- return result;
-}
-
-static VALUE fbuffer_to_s(FBuffer *fb)
-{
- VALUE result = rb_str_new(FBUFFER_PAIR(fb));
- fbuffer_free(fb);
- FORCE_UTF8(result);
- return result;
-}
-#endif
-#endif
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index 593a8fbb54..bb76ad6400 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -1,2 +1 @@
-$(OBJS): $(ruby_headers)
-generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
+generator.o: generator.c generator.h
diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
index 8627c5f4bd..195bfde3ff 100644
--- a/ext/json/generator/extconf.rb
+++ b/ext/json/generator/extconf.rb
@@ -1,4 +1,4 @@
require 'mkmf'
+require 'rbconfig'
-$defs << "-DJSON_GENERATOR"
create_makefile 'json/ext/generator'
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index f32f866419..b25c94f8e9 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -1,4 +1,3 @@
-#include "../fbuffer/fbuffer.h"
#include "generator.h"
#ifdef HAVE_RUBY_ENCODING_H
@@ -7,16 +6,14 @@ static ID i_encoding, i_encode;
#endif
static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
- mHash, mArray, mFixnum, mBignum, mFloat, mString, mString_Extend,
+ mHash, mArray, mInteger, mFloat, mString, mString_Extend,
mTrueClass, mFalseClass, mNilClass, eGeneratorError,
- eNestingError, CRegexp_MULTILINE, CJSON_SAFE_STATE_PROTOTYPE,
- i_SAFE_STATE_PROTOTYPE;
+ eNestingError, CRegexp_MULTILINE, CJSON_SAFE_STATE_PROTOTYPE;
static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
- i_quirks_mode, i_pack, i_unpack, i_create_id, i_extend, i_key_p,
- i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth,
- i_buffer_initial_length, i_dup;
+ i_pack, i_unpack, i_create_id, i_extend, i_key_p, i_aref, i_send,
+ i_respond_to_p, i_match;
/*
* Copyright 2001-2004 Unicode, Inc.
@@ -64,7 +61,7 @@ static const char trailingBytesForUTF8[256] = {
* in a UTF-8 sequence.
*/
static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+ 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
/*
* Utility routine to tell whether a sequence of bytes is legal UTF-8.
@@ -76,7 +73,7 @@ static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080
* If presented with a length > 4, this returns 0. The Unicode
* definition of UTF-8 goes up to 4-byte sequences.
*/
-static unsigned char isLegalUTF8(const UTF8 *source, unsigned long length)
+static unsigned char isLegalUTF8(const UTF8 *source, int length)
{
UTF8 a;
const UTF8 *srcptr = source+length;
@@ -114,7 +111,7 @@ static void unicode_escape(char *buf, UTF16 character)
}
/* Escapes the UTF16 character and stores the result in the buffer buf, then
- * the buffer buf is appended to the FBuffer buffer. */
+ * the buffer buf Ñ–s appended to the FBuffer buffer. */
static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16
character)
{
@@ -225,7 +222,7 @@ static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
{
const char *ptr = RSTRING_PTR(string), *p;
- unsigned long len = RSTRING_LEN(string), start = 0, end = 0;
+ int len = RSTRING_LEN(string), start = 0, end = 0;
const char *escape = NULL;
int escape_len;
unsigned char c;
@@ -286,7 +283,7 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
fbuffer_append(buffer, ptr + start, end - start);
}
-static char *fstrndup(const char *ptr, unsigned long len) {
+static char *fstrndup(const char *ptr, int len) {
char *result;
if (len <= 0) return NULL;
result = ALLOC_N(char, len);
@@ -294,6 +291,118 @@ static char *fstrndup(const char *ptr, unsigned long len) {
return result;
}
+/* fbuffer implementation */
+
+static FBuffer *fbuffer_alloc()
+{
+ FBuffer *fb = ALLOC(FBuffer);
+ memset((void *) fb, 0, sizeof(FBuffer));
+ fb->initial_length = FBUFFER_INITIAL_LENGTH;
+ return fb;
+}
+
+static FBuffer *fbuffer_alloc_with_length(unsigned int initial_length)
+{
+ FBuffer *fb;
+ assert(initial_length > 0);
+ fb = ALLOC(FBuffer);
+ memset((void *) fb, 0, sizeof(FBuffer));
+ fb->initial_length = initial_length;
+ return fb;
+}
+
+static void fbuffer_free(FBuffer *fb)
+{
+ if (fb->ptr) ruby_xfree(fb->ptr);
+ ruby_xfree(fb);
+}
+
+static void fbuffer_free_only_buffer(FBuffer *fb)
+{
+ ruby_xfree(fb);
+}
+
+static void fbuffer_clear(FBuffer *fb)
+{
+ fb->len = 0;
+}
+
+static void fbuffer_inc_capa(FBuffer *fb, unsigned int requested)
+{
+ unsigned int required;
+
+ if (!fb->ptr) {
+ fb->ptr = ALLOC_N(char, fb->initial_length);
+ fb->capa = fb->initial_length;
+ }
+
+ for (required = fb->capa; requested > required - fb->len; required <<= 1);
+
+ if (required > fb->capa) {
+ REALLOC_N(fb->ptr, char, required);
+ fb->capa = required;
+ }
+}
+
+static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned int len)
+{
+ if (len > 0) {
+ fbuffer_inc_capa(fb, len);
+ MEMCPY(fb->ptr + fb->len, newstr, char, len);
+ fb->len += len;
+ }
+}
+
+static void fbuffer_append_char(FBuffer *fb, char newchr)
+{
+ fbuffer_inc_capa(fb, 1);
+ *(fb->ptr + fb->len) = newchr;
+ fb->len++;
+}
+
+static void freverse(char *start, char *end)
+{
+ char c;
+
+ while (end > start) {
+ c = *end, *end-- = *start, *start++ = c;
+ }
+}
+
+static int fltoa(long number, char *buf)
+{
+ static char digits[] = "0123456789";
+ long sign = number;
+ char* tmp = buf;
+
+ if (sign < 0) number = -number;
+ do *tmp++ = digits[number % 10]; while (number /= 10);
+ if (sign < 0) *tmp++ = '-';
+ freverse(buf, tmp - 1);
+ return tmp - buf;
+}
+
+static void fbuffer_append_long(FBuffer *fb, long number)
+{
+ char buf[20];
+ int len = fltoa(number, buf);
+ fbuffer_append(fb, buf, len);
+}
+
+static FBuffer *fbuffer_dup(FBuffer *fb)
+{
+ int len = fb->len;
+ FBuffer *result;
+
+ if (len > 0) {
+ result = fbuffer_alloc_with_length(len);
+ fbuffer_append(result, FBUFFER_PAIR(fb));
+ } else {
+ result = fbuffer_alloc();
+ }
+ return result;
+}
+
/*
* Document-module: JSON::Ext::Generator
*
@@ -307,38 +416,37 @@ static char *fstrndup(const char *ptr, unsigned long len) {
*/
/*
- * call-seq: to_json(state = nil)
+ * call-seq: to_json(state = nil, depth = 0)
*
* Returns a JSON string containing a JSON object, that is generated 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)
{
- GENERATE_JSON(object);
+ VALUE state, depth;
+
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
- * call-seq: to_json(state = nil)
+ * call-seq: to_json(state = nil, depth = 0)
*
* Returns a JSON string containing a JSON array, that is generated 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) {
- GENERATE_JSON(array);
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Returns a JSON string representation for this Integer number.
- */
-static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self)
-{
- GENERATE_JSON(fixnum);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
@@ -346,9 +454,12 @@ static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self)
*
* Returns a JSON string representation for this Integer number.
*/
-static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
+static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
{
- GENERATE_JSON(bignum);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
@@ -358,7 +469,10 @@ static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
*/
static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
{
- GENERATE_JSON(float);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
@@ -380,7 +494,10 @@ static VALUE mString_included_s(VALUE self, VALUE modul) {
*/
static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
{
- GENERATE_JSON(string);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
@@ -435,7 +552,10 @@ static VALUE mString_Extend_json_create(VALUE self, VALUE o)
*/
static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
{
- GENERATE_JSON(true);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
@@ -445,17 +565,22 @@ static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
*/
static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
{
- GENERATE_JSON(false);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
* call-seq: to_json(*)
*
- * Returns a JSON string for nil: 'null'.
*/
static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
{
- GENERATE_JSON(null);
+ VALUE state, depth;
+ rb_scan_args(argc, argv, "02", &state, &depth);
+ state = cState_from_state_s(cState, state);
+ return cState_partial_generate(state, self, depth);
}
/*
@@ -467,12 +592,12 @@ static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
*/
static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
{
- VALUE state;
+ VALUE state, depth;
VALUE string = rb_funcall(self, i_to_s, 0);
- rb_scan_args(argc, argv, "01", &state);
+ rb_scan_args(argc, argv, "02", &state, &depth);
Check_Type(string, T_STRING);
state = cState_from_state_s(cState, state);
- return cState_partial_generate(state, string);
+ return cState_partial_generate(state, string, depth);
}
static void State_free(JSON_Generator_State *state)
@@ -491,7 +616,6 @@ static void State_free(JSON_Generator_State *state)
static JSON_Generator_State *State_allocate()
{
JSON_Generator_State *state = ALLOC(JSON_Generator_State);
- MEMZERO(state, JSON_Generator_State, 1);
return state;
}
@@ -519,46 +643,46 @@ static VALUE cState_configure(VALUE self, VALUE opts)
opts = tmp;
tmp = rb_hash_aref(opts, ID2SYM(i_indent));
if (RTEST(tmp)) {
- unsigned long len;
+ int len;
Check_Type(tmp, T_STRING);
len = RSTRING_LEN(tmp);
- state->indent = fstrndup(RSTRING_PTR(tmp), len + 1);
+ state->indent = fstrndup(RSTRING_PTR(tmp), len);
state->indent_len = len;
}
tmp = rb_hash_aref(opts, ID2SYM(i_space));
if (RTEST(tmp)) {
- unsigned long len;
+ int len;
Check_Type(tmp, T_STRING);
len = RSTRING_LEN(tmp);
- state->space = fstrndup(RSTRING_PTR(tmp), len + 1);
+ state->space = fstrndup(RSTRING_PTR(tmp), len);
state->space_len = len;
}
tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
if (RTEST(tmp)) {
- unsigned long len;
+ int len;
Check_Type(tmp, T_STRING);
len = RSTRING_LEN(tmp);
- state->space_before = fstrndup(RSTRING_PTR(tmp), len + 1);
+ state->space_before = fstrndup(RSTRING_PTR(tmp), len);
state->space_before_len = len;
}
tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
if (RTEST(tmp)) {
- unsigned long len;
+ int len;
Check_Type(tmp, T_STRING);
len = RSTRING_LEN(tmp);
- state->array_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
+ state->array_nl = fstrndup(RSTRING_PTR(tmp), len);
state->array_nl_len = len;
}
tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
if (RTEST(tmp)) {
- unsigned long len;
+ int len;
Check_Type(tmp, T_STRING);
len = RSTRING_LEN(tmp);
- state->object_nl = fstrndup(RSTRING_PTR(tmp), len + 1);
+ state->object_nl = fstrndup(RSTRING_PTR(tmp), len);
state->object_nl_len = len;
}
tmp = ID2SYM(i_max_nesting);
- state->max_nesting = 100;
+ state->max_nesting = 19;
if (option_given_p(opts, tmp)) {
VALUE max_nesting = rb_hash_aref(opts, tmp);
if (RTEST(max_nesting)) {
@@ -568,48 +692,13 @@ static VALUE cState_configure(VALUE self, VALUE opts)
state->max_nesting = 0;
}
}
- tmp = ID2SYM(i_depth);
- state->depth = 0;
- if (option_given_p(opts, tmp)) {
- VALUE depth = rb_hash_aref(opts, tmp);
- if (RTEST(depth)) {
- Check_Type(depth, T_FIXNUM);
- state->depth = FIX2LONG(depth);
- } else {
- state->depth = 0;
- }
- }
- tmp = ID2SYM(i_buffer_initial_length);
- if (option_given_p(opts, tmp)) {
- VALUE buffer_initial_length = rb_hash_aref(opts, tmp);
- if (RTEST(buffer_initial_length)) {
- long initial_length;
- Check_Type(buffer_initial_length, T_FIXNUM);
- initial_length = FIX2LONG(buffer_initial_length);
- if (initial_length > 0) state->buffer_initial_length = initial_length;
- }
- }
tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
state->allow_nan = RTEST(tmp);
tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
state->ascii_only = RTEST(tmp);
- tmp = rb_hash_aref(opts, ID2SYM(i_quirks_mode));
- state->quirks_mode = RTEST(tmp);
return self;
}
-static void set_state_ivars(VALUE hash, VALUE state)
-{
- VALUE ivars = rb_obj_instance_variables(state);
- int i = 0;
- for (i = 0; i < RARRAY_LEN(ivars); i++) {
- VALUE key = rb_funcall(rb_ary_entry(ivars, i), i_to_s, 0);
- long key_len = RSTRING_LEN(key);
- VALUE value = rb_iv_get(state, StringValueCStr(key));
- rb_hash_aset(hash, rb_str_intern(rb_str_substr(key, 1, key_len - 1)), value);
- }
-}
-
/*
* call-seq: to_h
*
@@ -620,7 +709,6 @@ static VALUE cState_to_h(VALUE self)
{
VALUE result = rb_hash_new();
GET_STATE(self);
- set_state_ivars(result, self);
rb_hash_aset(result, ID2SYM(i_indent), rb_str_new(state->indent, state->indent_len));
rb_hash_aset(result, ID2SYM(i_space), rb_str_new(state->space, state->space_len));
rb_hash_aset(result, ID2SYM(i_space_before), rb_str_new(state->space_before, state->space_before_len));
@@ -628,10 +716,7 @@ static VALUE cState_to_h(VALUE self)
rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
- rb_hash_aset(result, ID2SYM(i_quirks_mode), state->quirks_mode ? Qtrue : Qfalse);
rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
- rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
- rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length));
return result;
}
@@ -642,226 +727,186 @@ static VALUE cState_to_h(VALUE self)
*/
static VALUE cState_aref(VALUE self, VALUE name)
{
- name = rb_funcall(name, i_to_s, 0);
+ GET_STATE(self);
if (RTEST(rb_funcall(self, i_respond_to_p, 1, name))) {
return rb_funcall(self, i_send, 1, name);
} else {
- return rb_ivar_get(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)));
- }
-}
-
-/*
-* call-seq: []=(name, value)
-*
-* Set the attribute name to value.
-*/
-static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
-{
- VALUE name_writer;
-
- name = rb_funcall(name, i_to_s, 0);
- name_writer = rb_str_cat2(rb_str_dup(name), "=");
- if (RTEST(rb_funcall(self, i_respond_to_p, 1, name_writer))) {
- return rb_funcall(self, i_send, 2, name_writer, value);
- } else {
- rb_ivar_set(self, rb_intern_str(rb_str_concat(rb_str_new2("@"), name)), value);
- }
- return Qnil;
-}
-
-static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- char *object_nl = state->object_nl;
- long object_nl_len = state->object_nl_len;
- char *indent = state->indent;
- long indent_len = state->indent_len;
- long max_nesting = state->max_nesting;
- char *delim = FBUFFER_PTR(state->object_delim);
- long delim_len = FBUFFER_LEN(state->object_delim);
- char *delim2 = FBUFFER_PTR(state->object_delim2);
- long delim2_len = FBUFFER_LEN(state->object_delim2);
- long depth = ++state->depth;
- int i, j;
- VALUE key, key_to_s, keys;
- if (max_nesting != 0 && depth > max_nesting) {
- fbuffer_free(buffer);
- rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
- }
- fbuffer_append_char(buffer, '{');
- keys = rb_funcall(obj, i_keys, 0);
- for(i = 0; i < RARRAY_LEN(keys); i++) {
- if (i > 0) fbuffer_append(buffer, delim, delim_len);
- if (object_nl) {
- fbuffer_append(buffer, object_nl, object_nl_len);
- }
- if (indent) {
- for (j = 0; j < depth; j++) {
- fbuffer_append(buffer, indent, indent_len);
- }
- }
- key = rb_ary_entry(keys, i);
- key_to_s = rb_funcall(key, i_to_s, 0);
- Check_Type(key_to_s, T_STRING);
- generate_json(buffer, Vstate, state, key_to_s);
- fbuffer_append(buffer, delim2, delim2_len);
- generate_json(buffer, Vstate, state, rb_hash_aref(obj, key));
- }
- depth = --state->depth;
- if (object_nl) {
- fbuffer_append(buffer, object_nl, object_nl_len);
- if (indent) {
- for (j = 0; j < depth; j++) {
- fbuffer_append(buffer, indent, indent_len);
- }
- }
+ return Qnil;
}
- fbuffer_append_char(buffer, '}');
}
-static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
+static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj, long depth)
{
- char *array_nl = state->array_nl;
- long array_nl_len = state->array_nl_len;
- char *indent = state->indent;
- long indent_len = state->indent_len;
- long max_nesting = state->max_nesting;
- char *delim = FBUFFER_PTR(state->array_delim);
- long delim_len = FBUFFER_LEN(state->array_delim);
- long depth = ++state->depth;
- int i, j;
- if (max_nesting != 0 && depth > max_nesting) {
- fbuffer_free(buffer);
- rb_raise(eNestingError, "nesting of %ld is too deep", --state->depth);
- }
- fbuffer_append_char(buffer, '[');
- if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
- for(i = 0; i < RARRAY_LEN(obj); i++) {
- if (i > 0) fbuffer_append(buffer, delim, delim_len);
- if (indent) {
- for (j = 0; j < depth; j++) {
- fbuffer_append(buffer, indent, indent_len);
+ VALUE tmp;
+ switch (TYPE(obj)) {
+ case T_HASH:
+ {
+ char *object_nl = state->object_nl;
+ long object_nl_len = state->object_nl_len;
+ char *indent = state->indent;
+ long indent_len = state->indent_len;
+ long max_nesting = state->max_nesting;
+ char *delim = FBUFFER_PTR(state->object_delim);
+ long delim_len = FBUFFER_LEN(state->object_delim);
+ char *delim2 = FBUFFER_PTR(state->object_delim2);
+ long delim2_len = FBUFFER_LEN(state->object_delim2);
+ int i, j;
+ VALUE key, key_to_s, keys;
+ depth++;
+ if (max_nesting != 0 && depth > max_nesting) {
+ fbuffer_free(buffer);
+ rb_raise(eNestingError, "nesting of %ld is too deep", depth);
+ }
+ fbuffer_append_char(buffer, '{');
+ keys = rb_funcall(obj, rb_intern("keys"), 0);
+ for(i = 0; i < RARRAY_LEN(keys); i++) {
+ if (i > 0) fbuffer_append(buffer, delim, delim_len);
+ if (object_nl) {
+ fbuffer_append(buffer, object_nl, object_nl_len);
+ }
+ if (indent) {
+ for (j = 0; j < depth; j++) {
+ fbuffer_append(buffer, indent, indent_len);
+ }
+ }
+ key = rb_ary_entry(keys, i);
+ key_to_s = rb_funcall(key, i_to_s, 0);
+ Check_Type(key_to_s, T_STRING);
+ generate_json(buffer, Vstate, state, key_to_s, depth);
+ fbuffer_append(buffer, delim2, delim2_len);
+ generate_json(buffer, Vstate, state, rb_hash_aref(obj, key), depth);
+ }
+ depth--;
+ if (object_nl) {
+ fbuffer_append(buffer, object_nl, object_nl_len);
+ if (indent) {
+ for (j = 0; j < depth; j++) {
+ fbuffer_append(buffer, indent, indent_len);
+ }
+ }
+ }
+ fbuffer_append_char(buffer, '}');
}
- }
- generate_json(buffer, Vstate, state, rb_ary_entry(obj, i));
- }
- state->depth = --depth;
- if (array_nl) {
- fbuffer_append(buffer, array_nl, array_nl_len);
- if (indent) {
- for (j = 0; j < depth; j++) {
- fbuffer_append(buffer, indent, indent_len);
+ break;
+ case T_ARRAY:
+ {
+ char *array_nl = state->array_nl;
+ long array_nl_len = state->array_nl_len;
+ char *indent = state->indent;
+ long indent_len = state->indent_len;
+ long max_nesting = state->max_nesting;
+ char *delim = FBUFFER_PTR(state->array_delim);
+ long delim_len = FBUFFER_LEN(state->array_delim);
+ int i, j;
+ depth++;
+ if (max_nesting != 0 && depth > max_nesting) {
+ fbuffer_free(buffer);
+ rb_raise(eNestingError, "nesting of %ld is too deep", depth);
+ }
+ fbuffer_append_char(buffer, '[');
+ if (array_nl) fbuffer_append(buffer, array_nl, array_nl_len);
+ for(i = 0; i < RARRAY_LEN(obj); i++) {
+ if (i > 0) fbuffer_append(buffer, delim, delim_len);
+ if (indent) {
+ for (j = 0; j < depth; j++) {
+ fbuffer_append(buffer, indent, indent_len);
+ }
+ }
+ generate_json(buffer, Vstate, state, rb_ary_entry(obj, i), depth);
+ }
+ depth--;
+ if (array_nl) {
+ fbuffer_append(buffer, array_nl, array_nl_len);
+ if (indent) {
+ for (j = 0; j < depth; j++) {
+ fbuffer_append(buffer, indent, indent_len);
+ }
+ }
+ }
+ fbuffer_append_char(buffer, ']');
}
- }
- }
- fbuffer_append_char(buffer, ']');
-}
-
-static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- fbuffer_append_char(buffer, '"');
+ break;
+ case T_STRING:
+ fbuffer_append_char(buffer, '"');
#ifdef HAVE_RUBY_ENCODING_H
- obj = rb_funcall(obj, i_encode, 1, CEncoding_UTF_8);
+ obj = rb_funcall(obj, i_encode, 1, CEncoding_UTF_8);
#endif
- if (state->ascii_only) {
- convert_UTF8_to_JSON_ASCII(buffer, obj);
- } else {
- convert_UTF8_to_JSON(buffer, obj);
- }
- fbuffer_append_char(buffer, '"');
-}
-
-static void generate_json_null(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- fbuffer_append(buffer, "null", 4);
-}
-
-static void generate_json_false(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- fbuffer_append(buffer, "false", 5);
-}
-
-static void generate_json_true(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- fbuffer_append(buffer, "true", 4);
-}
-
-static void generate_json_fixnum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- fbuffer_append_long(buffer, FIX2LONG(obj));
-}
-
-static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- VALUE tmp = rb_funcall(obj, i_to_s, 0);
- fbuffer_append_str(buffer, tmp);
-}
-
-static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- double value = RFLOAT_VALUE(obj);
- char allow_nan = state->allow_nan;
- VALUE tmp = rb_funcall(obj, i_to_s, 0);
- if (!allow_nan) {
- if (isinf(value)) {
- fbuffer_free(buffer);
- rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));
- } else if (isnan(value)) {
- fbuffer_free(buffer);
- rb_raise(eGeneratorError, "%u: %"PRIsVALUE" not allowed in JSON", __LINE__, RB_OBJ_STRING(tmp));
- }
- }
- fbuffer_append_str(buffer, tmp);
-}
-
-static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
- VALUE tmp;
- VALUE klass = CLASS_OF(obj);
- if (klass == rb_cHash) {
- generate_json_object(buffer, Vstate, state, obj);
- } else if (klass == rb_cArray) {
- generate_json_array(buffer, Vstate, state, obj);
- } else if (klass == rb_cString) {
- generate_json_string(buffer, Vstate, state, obj);
- } else if (obj == Qnil) {
- generate_json_null(buffer, Vstate, state, obj);
- } else if (obj == Qfalse) {
- generate_json_false(buffer, Vstate, state, obj);
- } else if (obj == Qtrue) {
- generate_json_true(buffer, Vstate, state, obj);
- } else if (klass == rb_cFixnum) {
- generate_json_fixnum(buffer, Vstate, state, obj);
- } else if (klass == rb_cBignum) {
- generate_json_bignum(buffer, Vstate, state, obj);
- } else if (klass == rb_cFloat) {
- generate_json_float(buffer, Vstate, state, obj);
- } else if (rb_respond_to(obj, i_to_json)) {
- tmp = rb_funcall(obj, i_to_json, 1, Vstate);
- Check_Type(tmp, T_STRING);
- fbuffer_append_str(buffer, tmp);
- } else {
- tmp = rb_funcall(obj, i_to_s, 0);
- Check_Type(tmp, T_STRING);
- generate_json(buffer, Vstate, state, tmp);
+ if (state->ascii_only) {
+ convert_UTF8_to_JSON_ASCII(buffer, obj);
+ } else {
+ convert_UTF8_to_JSON(buffer, obj);
+ }
+ fbuffer_append_char(buffer, '"');
+ break;
+ case T_NIL:
+ fbuffer_append(buffer, "null", 4);
+ break;
+ case T_FALSE:
+ fbuffer_append(buffer, "false", 5);
+ break;
+ case T_TRUE:
+ fbuffer_append(buffer, "true", 4);
+ break;
+ case T_FIXNUM:
+ fbuffer_append_long(buffer, FIX2LONG(obj));
+ break;
+ case T_BIGNUM:
+ tmp = rb_funcall(obj, i_to_s, 0);
+ fbuffer_append(buffer, RSTRING_PAIR(tmp));
+ break;
+ case T_FLOAT:
+ {
+ double value = RFLOAT_VALUE(obj);
+ char allow_nan = state->allow_nan;
+ tmp = rb_funcall(obj, i_to_s, 0);
+ if (!allow_nan) {
+ if (isinf(value)) {
+ fbuffer_free(buffer);
+ rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
+ } else if (isnan(value)) {
+ fbuffer_free(buffer);
+ rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
+ }
+ }
+ fbuffer_append(buffer, RSTRING_PAIR(tmp));
+ }
+ break;
+ default:
+ if (rb_respond_to(obj, i_to_json)) {
+ tmp = rb_funcall(obj, i_to_json, 2, Vstate, INT2FIX(depth + 1));
+ Check_Type(tmp, T_STRING);
+ fbuffer_append(buffer, RSTRING_PAIR(tmp));
+ } else {
+ tmp = rb_funcall(obj, i_to_s, 0);
+ Check_Type(tmp, T_STRING);
+ generate_json(buffer, Vstate, state, tmp, depth + 1);
+ }
+ break;
}
}
-static FBuffer *cState_prepare_buffer(VALUE self)
+/*
+ * call-seq: partial_generate(obj)
+ *
+ * Generates a part of a JSON document from object +obj+ and returns the
+ * result.
+ */
+static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth)
{
- FBuffer *buffer;
+ VALUE result;
+ FBuffer *buffer = fbuffer_alloc();
GET_STATE(self);
- buffer = fbuffer_alloc(state->buffer_initial_length);
if (state->object_delim) {
fbuffer_clear(state->object_delim);
} else {
- state->object_delim = fbuffer_alloc(16);
+ state->object_delim = fbuffer_alloc_with_length(16);
}
fbuffer_append_char(state->object_delim, ',');
if (state->object_delim2) {
fbuffer_clear(state->object_delim2);
} else {
- state->object_delim2 = fbuffer_alloc(16);
+ state->object_delim2 = fbuffer_alloc_with_length(16);
}
fbuffer_append_char(state->object_delim2, ':');
if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
@@ -869,34 +914,16 @@ static FBuffer *cState_prepare_buffer(VALUE self)
if (state->array_delim) {
fbuffer_clear(state->array_delim);
} else {
- state->array_delim = fbuffer_alloc(16);
+ state->array_delim = fbuffer_alloc_with_length(16);
}
fbuffer_append_char(state->array_delim, ',');
if (state->array_nl) fbuffer_append(state->array_delim, state->array_nl, state->array_nl_len);
- return buffer;
-}
-
-static VALUE cState_partial_generate(VALUE self, VALUE obj)
-{
- FBuffer *buffer = cState_prepare_buffer(self);
- GET_STATE(self);
- generate_json(buffer, self, state, obj);
- return fbuffer_to_s(buffer);
-}
-/*
- * This function returns true if string is either a JSON array or JSON object.
- * It might suffer from false positives, e. g. syntactically incorrect JSON in
- * the string or certain UTF-8 characters on the right hand side.
- */
-static int isArrayOrObject(VALUE string)
-{
- long string_len = RSTRING_LEN(string);
- char *p = RSTRING_PTR(string), *q = p + string_len - 1;
- if (string_len < 2) return 0;
- for (; p < q && isspace(*p); p++);
- for (; q > p && isspace(*q); q--);
- return (*p == '[' && *q == ']') || (*p == '{' && *q == '}');
+ generate_json(buffer, self, state, obj, NIL_P(depth) ? 0 : FIX2INT(depth));
+ result = rb_str_new(FBUFFER_PAIR(buffer));
+ fbuffer_free(buffer);
+ FORCE_UTF8(result);
+ return result;
}
/*
@@ -908,9 +935,12 @@ static int isArrayOrObject(VALUE string)
*/
static VALUE cState_generate(VALUE self, VALUE obj)
{
- VALUE result = cState_partial_generate(self, obj);
- GET_STATE(self);
- if (!state->quirks_mode && !isArrayOrObject(result)) {
+ VALUE result = cState_partial_generate(self, obj, Qnil);
+ VALUE re, args[2];
+ args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z");
+ args[1] = CRegexp_MULTILINE;
+ re = rb_class_new_instance(2, args, rb_cRegexp);
+ if (NIL_P(rb_funcall(re, i_match, 1, result))) {
rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
}
return result;
@@ -931,17 +961,13 @@ static VALUE cState_generate(VALUE self, VALUE obj)
* * *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.
- * * *quirks_mode*: Enables quirks_mode for parser, that is for example
- * generating single JSON values instead of documents is possible.
- * * *buffer_initial_length*: sets the initial length of the generator's
- * internal buffer.
*/
static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
{
VALUE opts;
GET_STATE(self);
- state->max_nesting = 100;
- state->buffer_initial_length = FBUFFER_INITIAL_LENGTH_DEFAULT;
+ MEMZERO(state, JSON_Generator_State, 1);
+ state->max_nesting = 19;
rb_scan_args(argc, argv, "01", &opts);
if (!NIL_P(opts)) cState_configure(self, opts);
return self;
@@ -957,7 +983,6 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
{
JSON_Generator_State *objState, *origState;
- if (obj == orig) return obj;
Data_Get_Struct(obj, JSON_Generator_State, objState);
Data_Get_Struct(orig, JSON_Generator_State, origState);
if (!objState) rb_raise(rb_eArgError, "unallocated JSON::State");
@@ -989,9 +1014,9 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
return rb_funcall(self, i_new, 1, opts);
} else {
if (NIL_P(CJSON_SAFE_STATE_PROTOTYPE)) {
- CJSON_SAFE_STATE_PROTOTYPE = rb_const_get(mJSON, i_SAFE_STATE_PROTOTYPE);
+ CJSON_SAFE_STATE_PROTOTYPE = rb_const_get(mJSON, rb_intern("SAFE_STATE_PROTOTYPE"));
}
- return rb_funcall(CJSON_SAFE_STATE_PROTOTYPE, i_dup, 0);
+ return CJSON_SAFE_STATE_PROTOTYPE;
}
}
@@ -1003,7 +1028,7 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
static VALUE cState_indent(VALUE self)
{
GET_STATE(self);
- return state->indent ? rb_str_new(state->indent, state->indent_len) : rb_str_new2("");
+ return state->indent ? rb_str_new2(state->indent) : rb_str_new2("");
}
/*
@@ -1013,20 +1038,16 @@ static VALUE cState_indent(VALUE self)
*/
static VALUE cState_indent_set(VALUE self, VALUE indent)
{
- unsigned long len;
GET_STATE(self);
Check_Type(indent, T_STRING);
- len = RSTRING_LEN(indent);
- if (len == 0) {
+ if (RSTRING_LEN(indent) == 0) {
if (state->indent) {
ruby_xfree(state->indent);
state->indent = NULL;
- state->indent_len = 0;
}
} else {
if (state->indent) ruby_xfree(state->indent);
state->indent = strdup(RSTRING_PTR(indent));
- state->indent_len = len;
}
return Qnil;
}
@@ -1040,7 +1061,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
static VALUE cState_space(VALUE self)
{
GET_STATE(self);
- return state->space ? rb_str_new(state->space, state->space_len) : rb_str_new2("");
+ return state->space ? rb_str_new2(state->space) : rb_str_new2("");
}
/*
@@ -1051,20 +1072,16 @@ static VALUE cState_space(VALUE self)
*/
static VALUE cState_space_set(VALUE self, VALUE space)
{
- unsigned long len;
GET_STATE(self);
Check_Type(space, T_STRING);
- len = RSTRING_LEN(space);
- if (len == 0) {
+ if (RSTRING_LEN(space) == 0) {
if (state->space) {
ruby_xfree(state->space);
state->space = NULL;
- state->space_len = 0;
}
} else {
if (state->space) ruby_xfree(state->space);
state->space = strdup(RSTRING_PTR(space));
- state->space_len = len;
}
return Qnil;
}
@@ -1077,7 +1094,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
static VALUE cState_space_before(VALUE self)
{
GET_STATE(self);
- return state->space_before ? rb_str_new(state->space_before, state->space_before_len) : rb_str_new2("");
+ return state->space_before ? rb_str_new2(state->space_before) : rb_str_new2("");
}
/*
@@ -1087,20 +1104,16 @@ static VALUE cState_space_before(VALUE self)
*/
static VALUE cState_space_before_set(VALUE self, VALUE space_before)
{
- unsigned long len;
GET_STATE(self);
Check_Type(space_before, T_STRING);
- len = RSTRING_LEN(space_before);
- if (len == 0) {
+ if (RSTRING_LEN(space_before) == 0) {
if (state->space_before) {
ruby_xfree(state->space_before);
state->space_before = NULL;
- state->space_before_len = 0;
}
} else {
if (state->space_before) ruby_xfree(state->space_before);
state->space_before = strdup(RSTRING_PTR(space_before));
- state->space_before_len = len;
}
return Qnil;
}
@@ -1114,7 +1127,7 @@ static VALUE cState_space_before_set(VALUE self, VALUE space_before)
static VALUE cState_object_nl(VALUE self)
{
GET_STATE(self);
- return state->object_nl ? rb_str_new(state->object_nl, state->object_nl_len) : rb_str_new2("");
+ return state->object_nl ? rb_str_new2(state->object_nl) : rb_str_new2("");
}
/*
@@ -1125,11 +1138,9 @@ static VALUE cState_object_nl(VALUE self)
*/
static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
{
- unsigned long len;
GET_STATE(self);
Check_Type(object_nl, T_STRING);
- len = RSTRING_LEN(object_nl);
- if (len == 0) {
+ if (RSTRING_LEN(object_nl) == 0) {
if (state->object_nl) {
ruby_xfree(state->object_nl);
state->object_nl = NULL;
@@ -1137,7 +1148,6 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
} else {
if (state->object_nl) ruby_xfree(state->object_nl);
state->object_nl = strdup(RSTRING_PTR(object_nl));
- state->object_nl_len = len;
}
return Qnil;
}
@@ -1150,7 +1160,7 @@ static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
static VALUE cState_array_nl(VALUE self)
{
GET_STATE(self);
- return state->array_nl ? rb_str_new(state->array_nl, state->array_nl_len) : rb_str_new2("");
+ return state->array_nl ? rb_str_new2(state->array_nl) : rb_str_new2("");
}
/*
@@ -1160,11 +1170,9 @@ static VALUE cState_array_nl(VALUE self)
*/
static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
{
- unsigned long len;
GET_STATE(self);
Check_Type(array_nl, T_STRING);
- len = RSTRING_LEN(array_nl);
- if (len == 0) {
+ if (RSTRING_LEN(array_nl) == 0) {
if (state->array_nl) {
ruby_xfree(state->array_nl);
state->array_nl = NULL;
@@ -1172,7 +1180,6 @@ static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
} else {
if (state->array_nl) ruby_xfree(state->array_nl);
state->array_nl = strdup(RSTRING_PTR(array_nl));
- state->array_nl_len = len;
}
return Qnil;
}
@@ -1240,83 +1247,6 @@ static VALUE cState_ascii_only_p(VALUE self)
}
/*
- * call-seq: quirks_mode?
- *
- * Returns true, if quirks mode is enabled. Otherwise returns false.
- */
-static VALUE cState_quirks_mode_p(VALUE self)
-{
- GET_STATE(self);
- return state->quirks_mode ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq: quirks_mode=(enable)
- *
- * If set to true, enables the quirks_mode mode.
- */
-static VALUE cState_quirks_mode_set(VALUE self, VALUE enable)
-{
- GET_STATE(self);
- state->quirks_mode = RTEST(enable);
- return Qnil;
-}
-
-/*
- * call-seq: depth
- *
- * This integer returns the current depth of data structure nesting.
- */
-static VALUE cState_depth(VALUE self)
-{
- GET_STATE(self);
- return LONG2FIX(state->depth);
-}
-
-/*
- * call-seq: depth=(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_depth_set(VALUE self, VALUE depth)
-{
- GET_STATE(self);
- Check_Type(depth, T_FIXNUM);
- state->depth = FIX2LONG(depth);
- return Qnil;
-}
-
-/*
- * call-seq: buffer_initial_length
- *
- * This integer returns the current inital length of the buffer.
- */
-static VALUE cState_buffer_initial_length(VALUE self)
-{
- GET_STATE(self);
- return LONG2FIX(state->buffer_initial_length);
-}
-
-/*
- * call-seq: buffer_initial_length=(length)
- *
- * This sets the initial length of the buffer to +length+, if +length+ > 0,
- * otherwise its value isn't changed.
- */
-static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_length)
-{
- long initial_length;
- GET_STATE(self);
- Check_Type(buffer_initial_length, T_FIXNUM);
- initial_length = FIX2LONG(buffer_initial_length);
- if (initial_length > 0) {
- state->buffer_initial_length = initial_length;
- }
- return Qnil;
-}
-
-/*
*
*/
void Init_generator()
@@ -1350,20 +1280,11 @@ void Init_generator()
rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
- rb_define_method(cState, "quirks_mode?", cState_quirks_mode_p, 0);
- rb_define_method(cState, "quirks_mode", cState_quirks_mode_p, 0);
- rb_define_method(cState, "quirks_mode=", cState_quirks_mode_set, 1);
- rb_define_method(cState, "depth", cState_depth, 0);
- rb_define_method(cState, "depth=", cState_depth_set, 1);
- rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
- rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
rb_define_method(cState, "configure", cState_configure, 1);
- rb_define_alias(cState, "merge", "configure");
rb_define_method(cState, "to_h", cState_to_h, 0);
- rb_define_alias(cState, "to_hash", "to_h");
rb_define_method(cState, "[]", cState_aref, 1);
- rb_define_method(cState, "[]=", cState_aset, 2);
rb_define_method(cState, "generate", cState_generate, 1);
+ rb_define_method(cState, "partial_generate", cState_partial_generate, 1);
mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
mObject = rb_define_module_under(mGeneratorMethods, "Object");
@@ -1372,10 +1293,8 @@ void Init_generator()
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);
- mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
- rb_define_method(mFixnum, "to_json", mFixnum_to_json, -1);
- mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
- rb_define_method(mBignum, "to_json", mBignum_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");
@@ -1404,9 +1323,6 @@ void Init_generator()
i_max_nesting = rb_intern("max_nesting");
i_allow_nan = rb_intern("allow_nan");
i_ascii_only = rb_intern("ascii_only");
- i_quirks_mode = rb_intern("quirks_mode");
- i_depth = rb_intern("depth");
- i_buffer_initial_length = rb_intern("buffer_initial_length");
i_pack = rb_intern("pack");
i_unpack = rb_intern("unpack");
i_create_id = rb_intern("create_id");
@@ -1416,13 +1332,10 @@ void Init_generator()
i_send = rb_intern("__send__");
i_respond_to_p = rb_intern("respond_to?");
i_match = rb_intern("match");
- i_keys = rb_intern("keys");
- i_dup = rb_intern("dup");
#ifdef HAVE_RUBY_ENCODING_H
CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
i_encoding = rb_intern("encoding");
i_encode = rb_intern("encode");
#endif
- i_SAFE_STATE_PROTOTYPE = rb_intern("SAFE_STATE_PROTOTYPE");
CJSON_SAFE_STATE_PROTOTYPE = Qnil;
}
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index b58cc4bc2f..37240a9c6b 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -2,34 +2,85 @@
#define _GENERATOR_H_
#include <string.h>
+#include <assert.h>
#include <math.h>
-#include <ctype.h>
#include "ruby.h"
-#ifdef HAVE_RUBY_RE_H
+#if HAVE_RUBY_RE_H
#include "ruby/re.h"
-#else
-#include "re.h"
#endif
-#ifndef rb_intern_str
-#define rb_intern_str(string) SYM2ID(rb_str_intern(string))
+#if HAVE_RE_H
+#include "re.h"
#endif
-#ifndef rb_obj_instance_variables
-#define rb_obj_instance_variables(object) rb_funcall(object, rb_intern("instance_variables"), 0)
+#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 option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
+#ifndef RHASH_SIZE
+#define RHASH_SIZE(hsh) (RHASH(hsh)->tbl->num_entries)
+#endif
+
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(val) (RFLOAT(val)->value)
+#endif
+
+#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
+
+#define RSTRING_PAIR(string) RSTRING_PTR(string), RSTRING_LEN(string)
+
+/* fbuffer implementation */
+
+typedef struct FBufferStruct {
+ unsigned int initial_length;
+ char *ptr;
+ unsigned int len;
+ unsigned int capa;
+} FBuffer;
+
+#define FBUFFER_INITIAL_LENGTH 4096
+
+#define FBUFFER_PTR(fb) (fb->ptr)
+#define FBUFFER_LEN(fb) (fb->len)
+#define FBUFFER_CAPA(fb) (fb->capa)
+#define FBUFFER_PAIR(fb) FBUFFER_PTR(fb), FBUFFER_LEN(fb)
+
+static char *fstrndup(const char *ptr, int len);
+static FBuffer *fbuffer_alloc();
+static FBuffer *fbuffer_alloc_with_length(unsigned initial_length);
+static void fbuffer_free(FBuffer *fb);
+static void fbuffer_free_only_buffer(FBuffer *fb);
+static void fbuffer_clear(FBuffer *fb);
+static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned int len);
+static void fbuffer_append_long(FBuffer *fb, long number);
+static void fbuffer_append_char(FBuffer *fb, char newchr);
+static FBuffer *fbuffer_dup(FBuffer *fb);
+
/* unicode defintions */
#define UNI_STRICT_CONVERSION 1
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
+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
@@ -47,12 +98,11 @@ static const int halfShift = 10; /* used for shifting by 10 bits */
static const UTF32 halfBase = 0x0010000UL;
static const UTF32 halfMask = 0x3FFUL;
-static unsigned char isLegalUTF8(const UTF8 *source, unsigned long length);
+static unsigned char isLegalUTF8(const UTF8 *source, int length);
static void unicode_escape(char *buf, UTF16 character);
static void unicode_escape_to_buffer(FBuffer *buffer, char buf[6], UTF16 character);
static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string);
static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string);
-static char *fstrndup(const char *ptr, unsigned long len);
/* ruby api and some helpers */
@@ -73,31 +123,15 @@ typedef struct JSON_Generator_StateStruct {
long max_nesting;
char allow_nan;
char ascii_only;
- char quirks_mode;
- long depth;
- long buffer_initial_length;
} JSON_Generator_State;
#define GET_STATE(self) \
JSON_Generator_State *state; \
Data_Get_Struct(self, JSON_Generator_State, state)
-#define GENERATE_JSON(type) \
- FBuffer *buffer; \
- VALUE Vstate; \
- JSON_Generator_State *state; \
- \
- rb_scan_args(argc, argv, "01", &Vstate); \
- Vstate = cState_from_state_s(cState, Vstate); \
- Data_Get_Struct(Vstate, JSON_Generator_State, state); \
- buffer = cState_prepare_buffer(Vstate); \
- generate_json_##type(buffer, Vstate, state, self); \
- return fbuffer_to_s(buffer)
-
static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self);
static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self);
-static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self);
+static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self);
static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self);
static VALUE mString_included_s(VALUE self, VALUE modul);
static VALUE mString_to_json(int argc, VALUE *argv, VALUE self);
@@ -113,17 +147,8 @@ static JSON_Generator_State *State_allocate();
static VALUE cState_s_allocate(VALUE klass);
static VALUE cState_configure(VALUE self, VALUE opts);
static VALUE cState_to_h(VALUE self);
-static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_object(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_array(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_null(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_false(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_true(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_fixnum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-static VALUE cState_partial_generate(VALUE self, VALUE obj);
+static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj, long depth);
+static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth);
static VALUE cState_generate(VALUE self, VALUE obj);
static VALUE cState_initialize(int argc, VALUE *argv, VALUE self);
static VALUE cState_from_state_s(VALUE self, VALUE opts);
@@ -141,8 +166,5 @@ static VALUE cState_max_nesting(VALUE self);
static VALUE cState_max_nesting_set(VALUE self, VALUE depth);
static VALUE cState_allow_nan_p(VALUE self);
static VALUE cState_ascii_only_p(VALUE self);
-static VALUE cState_depth(VALUE self);
-static VALUE cState_depth_set(VALUE self, VALUE depth);
-static FBuffer *cState_prepare_buffer(VALUE self);
#endif
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
index 24aa385c91..789b0de546 100644
--- a/ext/json/lib/json.rb
+++ b/ext/json/lib/json.rb
@@ -1,56 +1,4 @@
require 'json/common'
-
-##
-# = JavaScript Object Notation (JSON)
-#
-# JSON is a lightweight data-interchange format. It is easy for us
-# humans to read and write. Plus, equally simple for machines to generate or parse.
-# JSON is completely language agnostic, making it the ideal interchange format.
-#
-# Built on two universally available structures:
-# 1. A collection of name/value pairs. Often referred to as an _object_, hash table, record, struct, keyed list, or associative array.
-# 2. An ordered list of values. More commonly called an _array_, vector, sequence or list.
-#
-# To read more about JSON visit: http://json.org
-#
-# == Parsing JSON
-#
-# To parse a JSON string received by another application or generated within
-# your existing application:
-#
-# require 'json'
-#
-# my_hash = JSON.parse('{"hello": "goodbye"}')
-# puts my_hash["hello"] => "goodbye"
-#
-# Notice the extra quotes <tt>''</tt> around the hash notation. Ruby expects
-# the argument to be a string and can't convert objects like a hash or array.
-#
-# Ruby converts your string into a hash
-#
-# == Generating JSON
-#
-# Creating a JSON string for communication or serialization is
-# just as simple.
-#
-# require 'json'
-#
-# my_hash = {:hello => "goodbye"}
-# puts JSON.generate(my_hash) => "{\"hello\":\"goodbye\"}"
-#
-# Or an alternative way:
-#
-# require 'json'
-# puts {:hello => "goodbye"}.to_json => "{\"hello\":\"goodbye\"}"
-#
-# <tt>JSON.generate</tt> only allows objects or arrays to be converted
-# to JSON syntax. <tt>to_json</tt>, however, accepts many Ruby classes
-# even though it acts only as a method for serialization:
-#
-# require 'json'
-#
-# 1.to_json => "1"
-#
module JSON
require 'json/version'
diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb
deleted file mode 100644
index 0ef69f12e0..0000000000
--- a/ext/json/lib/json/add/bigdecimal.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-defined?(::BigDecimal) or require 'bigdecimal'
-
-class BigDecimal
- # Import a JSON Marshalled object.
- #
- # method used for JSON marshalling support.
- def self.json_create(object)
- BigDecimal._load object['b']
- end
-
- # Marshal the object to JSON.
- #
- # method used for JSON marshalling support.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'b' => _dump,
- }
- end
-
- # return the JSON value
- def to_json(*)
- as_json.to_json
- end
-end
diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb
deleted file mode 100644
index d7ebebf5f7..0000000000
--- a/ext/json/lib/json/add/complex.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-defined?(::Complex) or require 'complex'
-
-class Complex
- def self.json_create(object)
- Complex(object['r'], object['i'])
- end
-
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'r' => real,
- 'i' => imag,
- }
- end
-
- def to_json(*)
- as_json.to_json
- end
-end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index 77d9dc0b20..03a00dded4 100644
--- a/ext/json/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
@@ -1,11 +1,148 @@
-# This file requires the implementations of ruby core's custom objects for
+# This file contains implementations of ruby core's custom objects for
# serialisation/deserialisation.
-require 'json/add/date'
-require 'json/add/date_time'
-require 'json/add/exception'
-require 'json/add/range'
-require 'json/add/regexp'
-require 'json/add/struct'
-require 'json/add/symbol'
-require 'json/add/time'
+unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
+ ::JSON::JSON_LOADED
+ require 'json'
+end
+require 'date'
+
+class Symbol
+ def to_json(*a)
+ {
+ JSON.create_id => self.class.name,
+ 's' => to_s,
+ }.to_json(*a)
+ end
+
+ def self.json_create(o)
+ o['s'].to_sym
+ end
+end
+
+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.create_id => 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.create_id => 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.create_id => 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.create_id => 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.create_id => 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.create_id => 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.create_id => self.class.name,
+ 'o' => options,
+ 's' => source,
+ }.to_json
+ end
+end
diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb
deleted file mode 100644
index 4288237db1..0000000000
--- a/ext/json/lib/json/add/date.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-require 'date'
-
-# Date serialization/deserialization
-class Date
-
- # Deserializes JSON string by converting Julian year <tt>y</tt>, month
- # <tt>m</tt>, day <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> to Date.
- def self.json_create(object)
- civil(*object.values_at('y', 'm', 'd', 'sg'))
- end
-
- alias start sg unless method_defined?(:start)
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'y' => year,
- 'm' => month,
- 'd' => day,
- 'sg' => start,
- }
- end
-
- # Stores class name (Date) with Julian year <tt>y</tt>, month <tt>m</tt>, day
- # <tt>d</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb
deleted file mode 100644
index 5ea42ea656..0000000000
--- a/ext/json/lib/json/add/date_time.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-require 'date'
-
-# DateTime serialization/deserialization
-class DateTime
-
- # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
- # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
- # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> to 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)
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'y' => year,
- 'm' => month,
- 'd' => day,
- 'H' => hour,
- 'M' => min,
- 'S' => sec,
- 'of' => offset.to_s,
- 'sg' => start,
- }
- end
-
- # Stores class name (DateTime) with Julian year <tt>y</tt>, month <tt>m</tt>,
- # day <tt>d</tt>, hour <tt>H</tt>, minute <tt>M</tt>, second <tt>S</tt>,
- # offset <tt>of</tt> and Day of Calendar Reform <tt>sg</tt> as JSON string
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
-
-
diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb
deleted file mode 100644
index e6ad257abf..0000000000
--- a/ext/json/lib/json/add/exception.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-
-# Exception serialization/deserialization
-class Exception
-
- # Deserializes JSON string by constructing new Exception object with message
- # <tt>m</tt> and backtrace <tt>b</tt> serialized with <tt>to_json</tt>
- def self.json_create(object)
- result = new(object['m'])
- result.set_backtrace object['b']
- result
- end
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'm' => message,
- 'b' => backtrace,
- }
- end
-
- # Stores class name (Exception) with message <tt>m</tt> and backtrace array
- # <tt>b</tt> as JSON string
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb
deleted file mode 100644
index da81e107a7..0000000000
--- a/ext/json/lib/json/add/ostruct.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-require 'ostruct'
-
-# OpenStruct serialization/deserialization
-class OpenStruct
-
- # Deserializes JSON string by constructing new Struct object with values
- # <tt>v</tt> serialized by <tt>to_json</tt>.
- def self.json_create(object)
- new(object['t'] || object[:t])
- end
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- klass = self.class.name
- klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
- {
- JSON.create_id => klass,
- 't' => table,
- }
- end
-
- # Stores class name (OpenStruct) with this struct's values <tt>v</tt> as a
- # JSON string.
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
diff --git a/ext/json/lib/json/add/rails.rb b/ext/json/lib/json/add/rails.rb
new file mode 100644
index 0000000000..8ce85efe57
--- /dev/null
+++ b/ext/json/lib/json/add/rails.rb
@@ -0,0 +1,58 @@
+# 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.create_id
+ instance_variable_set "@#{key}", value
+ end
+ obj
+ end
+
+ def to_json(*a)
+ result = {
+ JSON.create_id => 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/add/range.rb b/ext/json/lib/json/add/range.rb
deleted file mode 100644
index e61e553cdb..0000000000
--- a/ext/json/lib/json/add/range.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-
-# Range serialization/deserialization
-class Range
-
- # Deserializes JSON string by constructing new Range object with arguments
- # <tt>a</tt> serialized by <tt>to_json</tt>.
- def self.json_create(object)
- new(*object['a'])
- end
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'a' => [ first, last, exclude_end? ]
- }
- end
-
- # Stores class name (Range) with JSON array of arguments <tt>a</tt> which
- # include <tt>first</tt> (integer), <tt>last</tt> (integer), and
- # <tt>exclude_end?</tt> (boolean) as JSON string.
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb
deleted file mode 100644
index 867cd92f05..0000000000
--- a/ext/json/lib/json/add/rational.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-defined?(::Rational) or require 'rational'
-
-class Rational
- def self.json_create(object)
- Rational(object['n'], object['d'])
- end
-
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'n' => numerator,
- 'd' => denominator,
- }
- end
-
- def to_json(*)
- as_json.to_json
- end
-end
diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb
deleted file mode 100644
index 2fcbb6fb14..0000000000
--- a/ext/json/lib/json/add/regexp.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-
-# Regexp serialization/deserialization
-class Regexp
-
- # Deserializes JSON string by constructing new Regexp object with source
- # <tt>s</tt> (Regexp or String) and options <tt>o</tt> serialized by
- # <tt>to_json</tt>
- def self.json_create(object)
- new(object['s'], object['o'])
- end
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 'o' => options,
- 's' => source,
- }
- end
-
- # Stores class name (Regexp) with options <tt>o</tt> and source <tt>s</tt>
- # (Regexp or String) as JSON string
- def to_json(*)
- as_json.to_json
- end
-end
diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb
deleted file mode 100644
index 6847cde99b..0000000000
--- a/ext/json/lib/json/add/struct.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-
-# Struct serialization/deserialization
-class Struct
-
- # Deserializes JSON string by constructing new Struct object with values
- # <tt>v</tt> serialized by <tt>to_json</tt>.
- def self.json_create(object)
- new(*object['v'])
- end
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- klass = self.class.name
- klass.to_s.empty? and raise JSON::JSONError, "Only named structs are supported!"
- {
- JSON.create_id => klass,
- 'v' => values,
- }
- end
-
- # Stores class name (Struct) with Struct values <tt>v</tt> as a JSON string.
- # Only named structs are supported.
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb
deleted file mode 100644
index 03dc9a56a5..0000000000
--- a/ext/json/lib/json/add/symbol.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-
-# Symbol serialization/deserialization
-class Symbol
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- {
- JSON.create_id => self.class.name,
- 's' => to_s,
- }
- end
-
- # Stores class name (Symbol) with String representation of Symbol as a JSON string.
- def to_json(*a)
- as_json.to_json(*a)
- end
-
- # Deserializes JSON string by converting the <tt>string</tt> value stored in the object to a Symbol
- def self.json_create(o)
- o['s'].to_sym
- end
-end
diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb
deleted file mode 100644
index 338209d899..0000000000
--- a/ext/json/lib/json/add/time.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
- require 'json'
-end
-
-# Time serialization/deserialization
-class Time
-
- # Deserializes JSON string by converting time since epoch to Time
- def self.json_create(object)
- if usec = object.delete('u') # used to be tv_usec -> tv_nsec
- object['n'] = usec * 1000
- end
- if instance_methods.include?(:tv_nsec)
- at(object['s'], Rational(object['n'], 1000))
- else
- at(object['s'], object['n'] / 1000)
- end
- end
-
- # Returns a hash, that will be turned into a JSON object and represent this
- # object.
- def as_json(*)
- nanoseconds = [ tv_usec * 1000 ]
- respond_to?(:tv_nsec) and nanoseconds << tv_nsec
- nanoseconds = nanoseconds.max
- {
- JSON.create_id => self.class.name,
- 's' => tv_sec,
- 'n' => nanoseconds,
- }
- end
-
- # Stores class name (Time) with number of seconds since epoch and number of
- # microseconds for Time as JSON string
- def to_json(*args)
- as_json.to_json(*args)
- end
-end
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index a547679962..244634b7a1 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,47 +1,47 @@
require 'json/version'
-require 'json/generic_object'
+require 'iconv'
module JSON
class << self
- # If _object_ is string-like, parse the string and return the parsed result
+ # 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
+ # 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)
+ JSON.parse(object.to_str, opts => {})
else
- JSON.generate(object, opts)
+ JSON.generate(object, opts => {})
end
end
- # Returns the JSON parser class that is used by JSON. This is either
+ # 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 JSON.const_defined_in?(self, :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
+ # 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.to_s.split(/::/).inject(Object) do |p, c|
case
- when c.empty? then p
- when JSON.const_defined_in?(p, c) then p.const_get(c)
+ when c.empty? then p
+ when p.const_defined?(c) then p.const_get(c)
else
begin
p.const_missing(c)
- rescue NameError => e
- raise ArgumentError, "can't get const #{path}: #{e}"
+ rescue NameError
+ raise ArgumentError, "can't find const #{path}"
end
end
end
@@ -49,7 +49,6 @@ module JSON
# Set the module _generator_ to be used by JSON.
def generator=(generator) # :nodoc:
- old, $VERBOSE = $VERBOSE, nil
@generator = generator
generator_methods = generator::GeneratorMethods
for const in generator_methods.constants
@@ -64,33 +63,31 @@ module JSON
end
self.state = generator::State
const_set :State, self.state
- const_set :SAFE_STATE_PROTOTYPE, State.new
+ const_set :SAFE_STATE_PROTOTYPE, State.new.freeze
const_set :FAST_STATE_PROTOTYPE, State.new(
:indent => '',
:space => '',
:object_nl => "",
:array_nl => "",
:max_nesting => false
- )
+ ).freeze
const_set :PRETTY_STATE_PROTOTYPE, State.new(
:indent => ' ',
:space => ' ',
:object_nl => "\n",
:array_nl => "\n"
- )
- ensure
- $VERBOSE = old
+ ).freeze
end
- # Returns the JSON generator module that is used by JSON. This is
+ # 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 is
- # either JSON::Ext::Generator::State or JSON::Pure::Generator::State.
+ # 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, which is used to decide if the _json_create_
+ # 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
@@ -103,18 +100,12 @@ module JSON
MinusInfinity = -Infinity
# The base exception for JSON errors.
- class JSONError < StandardError
- def self.wrap(exception)
- obj = new("Wrapped(#{exception.class}): #{exception.message.inspect}")
- obj.set_backtrace exception.backtrace
- obj
- end
- end
+ class JSONError < StandardError; end
- # This exception is raised if a parser error occurs.
+ # This exception is raised, if a parser error occurs.
class ParserError < JSONError; end
- # This exception is raised if the nesting of parsed data structures is too
+ # This exception is raised, if the nesting of parsed datastructures is too
# deep.
class NestingError < ParserError; end
@@ -122,13 +113,13 @@ module JSON
class CircularDatastructure < NestingError; end
# :startdoc:
- # This exception is raised if a generator or unparser error occurs.
+ # This exception is raised, if a generator or unparser error occurs.
class GeneratorError < JSONError; end
# For backwards compatibility
UnparserError = GeneratorError
- # This exception is raised if the required unicode support is missing on the
- # system. Usually this means that the iconv library is not installed.
+ # 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
@@ -138,16 +129,16 @@ module JSON
# _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 100.
+ # 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.
# * *symbolize_names*: If set to true, returns symbols for the names
- # (keys) in a JSON object. Otherwise strings are returned. Strings are
+ # (keys) in a JSON object. Otherwise strings are returned, which is also
# the default.
# * *create_additions*: If set to false, the Parser doesn't create
- # additions even if a matching class and create_id was found. This option
+ # 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
@@ -156,19 +147,19 @@ module JSON
end
# Parse the JSON document _source_ into a Ruby data structure and return it.
- # The bang version of the parse method defaults to the more dangerous values
+ # 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_ documents.
#
# _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
+ # 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 matching class and create_id was found. This option
+ # additions even if a matchin class and create_id was found. This option
# defaults to true.
def parse!(source, opts = {})
opts = {
@@ -179,10 +170,9 @@ module JSON
end
# Generate a JSON document from the Ruby data structure _obj_ and return
- # it. _state_ is
- # * a JSON::State object,
+ # it. _state_ is * a JSON::State object,
# * or a Hash like object (responding to to_hash),
- # * or an object convertible into a hash by a to_h method,
+ # * 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
@@ -193,24 +183,19 @@ module JSON
# * *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: ''),
+ # * *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: ''),
# * *allow_nan*: true if NaN, Infinity, and -Infinity should be
- # generated, otherwise an exception is thrown if these values are
+ # 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 100.
+ # 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 pretty output.
+ # defaults for a pretty output.
def generate(obj, opts = nil)
- if State === opts
- state, opts = opts, nil
- else
- state = SAFE_STATE_PROTOTYPE.dup
- end
if opts
if opts.respond_to? :to_hash
opts = opts.to_hash
@@ -219,7 +204,10 @@ module JSON
else
raise TypeError, "can't convert #{opts.class} into Hash"
end
+ state = SAFE_STATE_PROTOTYPE.dup
state = state.configure(opts)
+ else
+ state = SAFE_STATE_PROTOTYPE
end
state.generate(obj)
end
@@ -235,13 +223,8 @@ module JSON
# This method disables the checks for circles in Ruby objects.
#
# *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.
+ # _obj_ argument, because this will cause JSON to go into an infinite loop.
def fast_generate(obj, opts = nil)
- if State === opts
- state, opts = opts, nil
- else
- state = FAST_STATE_PROTOTYPE.dup
- end
if opts
if opts.respond_to? :to_hash
opts = opts.to_hash
@@ -250,7 +233,10 @@ module JSON
else
raise TypeError, "can't convert #{opts.class} into Hash"
end
+ state = FAST_STATE_PROTOTYPE.dup
state.configure(opts)
+ else
+ state = FAST_STATE_PROTOTYPE
end
state.generate(obj)
end
@@ -265,14 +251,9 @@ module JSON
# The returned document is a prettier form of the document returned by
# #unparse.
#
- # The _opts_ argument can be used to configure the generator. See the
+ # 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)
- if State === opts
- state, opts = opts, nil
- else
- state = PRETTY_STATE_PROTOTYPE.dup
- end
if opts
if opts.respond_to? :to_hash
opts = opts.to_hash
@@ -281,7 +262,10 @@ module JSON
else
raise TypeError, "can't convert #{opts.class} into Hash"
end
+ state = PRETTY_STATE_PROTOTYPE.dup
state.configure(opts)
+ else
+ state = PRETTY_STATE_PROTOTYPE
end
state.generate(obj)
end
@@ -292,52 +276,26 @@ module JSON
module_function :pretty_unparse
# :startdoc:
- class << self
- # The global default options for the JSON.load method:
- # :max_nesting: false
- # :allow_nan: true
- # :quirks_mode: true
- attr_accessor :load_default_options
- end
- self.load_default_options = {
- :max_nesting => false,
- :allow_nan => true,
- :quirks_mode => true,
- :create_additions => true,
- }
-
# 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
+ # 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. To modify the
- # default options pass in the optional _options_ argument as well.
- #
- # BEWARE: This method is meant to serialise data from trusted user input,
- # like from your own database server or clients under your control, it could
- # be dangerous to allow untrusted users to pass JSON sources into it. The
- # default options for the parser can be changed via the load_default_options
- # method.
+ # 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, options = {})
- opts = load_default_options.merge options
+ 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
- elsif source.respond_to?(:read)
+ else
source = source.read
end
- if opts[:quirks_mode] && (source.nil? || source.empty?)
- source = 'null'
- end
- result = parse(source, opts)
+ result = parse(source, :max_nesting => false, :allow_nan => true)
recurse_proc(result, &proc) if proc
result
end
- # Recursively calls passed _Proc_ if the parsed data structure is an _Array_ or _Hash_
def recurse_proc(result, &proc)
case result
when Array
@@ -354,32 +312,16 @@ module JSON
alias restore load
module_function :restore
- class << self
- # The global default options for the JSON.dump method:
- # :max_nesting: false
- # :allow_nan: true
- # :quirks_mode: true
- attr_accessor :dump_default_options
- end
- self.dump_default_options = {
- :max_nesting => false,
- :allow_nan => true,
- :quirks_mode => true,
- }
-
# 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)
+ # 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
+ # 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.
#
- # The default options for the generator can be changed via the
- # dump_default_options method.
- #
# This method is part of the implementation of the load/dump interface of
# Marshal and YAML.
def dump(obj, anIO = nil, limit = nil)
@@ -390,9 +332,8 @@ module JSON
anIO = nil
end
end
- opts = JSON.dump_default_options
- limit and opts.update(:max_nesting => limit)
- result = generate(obj, opts)
+ limit ||= 0
+ result = generate(obj, :allow_nan => true, :max_nesting => limit)
if anIO
anIO.write result
anIO
@@ -403,40 +344,9 @@ module JSON
raise ArgumentError, "exceed depth limit"
end
- # Swap consecutive bytes of _string_ in place.
- def self.swap!(string) # :nodoc:
- 0.upto(string.size / 2) do |i|
- break unless string[2 * i + 1]
- string[2 * i], string[2 * i + 1] = string[2 * i + 1], string[2 * i]
- end
- string
- end
-
# Shortuct for iconv.
- if ::String.method_defined?(:encode) &&
- # XXX Rubinius doesn't support ruby 1.9 encoding yet
- defined?(RUBY_ENGINE) && RUBY_ENGINE != 'rbx'
- then
- # Encodes string using Ruby's _String.encode_
- def self.iconv(to, from, string)
- string.encode(to, from)
- end
- else
- require 'iconv'
- # Encodes string using _iconv_ library
- def self.iconv(to, from, string)
- Iconv.conv(to, from, string)
- end
- end
-
- if ::Object.method(:const_defined?).arity == 1
- def self.const_defined_in?(modul, constant)
- modul.const_defined?(constant)
- end
- else
- def self.const_defined_in?(modul, constant)
- modul.const_defined?(constant, false)
- end
+ def self.iconv(to, from, string)
+ Iconv.iconv(to, from, string).first
end
end
@@ -461,27 +371,26 @@ module ::Kernel
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
+ # 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
+ # The _opts_ argument is passed through to generate/parse respectively, see
# generate and parse for their documentation.
- def JSON(object, *args)
+ def JSON(object, opts = {})
if object.respond_to? :to_str
- JSON.parse(object.to_str, args.first)
+ JSON.parse(object.to_str, opts)
else
- JSON.generate(object, args.first)
+ JSON.generate(object, opts)
end
end
end
-# Extends any Class to include _json_creatable?_ method.
class ::Class
- # Returns true if this class can be used to create an instance
+ # 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. The hash
- # should include the required data.
+ # method _json_create_ that expects a hash as first parameter, which includes
+ # the required data.
def json_creatable?
respond_to?(:json_create)
end
diff --git a/ext/json/lib/json/editor.rb b/ext/json/lib/json/editor.rb
new file mode 100644
index 0000000000..1e13f33c8c
--- /dev/null
+++ b/ext/json/lib/json/editor.rb
@@ -0,0 +1,1371 @@
+# 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
index c5f813181d..719e56025c 100644
--- a/ext/json/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
@@ -1,9 +1,3 @@
-if ENV['SIMPLECOV_COVERAGE'].to_i == 1
- require 'simplecov'
- SimpleCov.start do
- add_filter "/tests/"
- end
-end
require 'json/common'
module JSON
@@ -12,10 +6,10 @@ module JSON
module Ext
require 'json/ext/parser'
require 'json/ext/generator'
- $DEBUG and warn "Using Ext extension for JSON."
+ $DEBUG and warn "Using c extension for JSON."
JSON.parser = Parser
JSON.generator = Generator
end
- JSON_LOADED = true unless defined?(::JSON::JSON_LOADED)
+ JSON_LOADED = true
end
diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb
deleted file mode 100644
index 8b1074c941..0000000000
--- a/ext/json/lib/json/generic_object.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'ostruct'
-
-module JSON
- class GenericObject < OpenStruct
- class << self
- alias [] new
-
- def json_creatable?
- @json_creatable
- end
-
- attr_writer :json_creatable
-
- def json_create(data)
- data = data.dup
- data.delete JSON.create_id
- self[data]
- end
-
- def from_hash(object)
- case
- when object.respond_to?(:to_hash)
- result = new
- object.to_hash.each do |key, value|
- result[key] = from_hash(value)
- end
- result
- when object.respond_to?(:to_ary)
- object.to_ary.map { |a| from_hash(a) }
- else
- object
- end
- end
- end
- self.json_creatable = false
-
- def to_hash
- table
- end
-
- def [](name)
- table[name.to_sym]
- end
-
- def []=(name, value)
- __send__ "#{name}=", value
- end
-
- def |(other)
- self.class[other.to_hash.merge(to_hash)]
- end
-
- def as_json(*)
- { JSON.create_id => self.class.name }.merge to_hash
- end
-
- def to_json(*a)
- as_json.to_json(*a)
- end
- end
-end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 1de3d696f2..de7690b57c 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.7.7'
+ VERSION = '1.4.2'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
index d188844670..5eaf6dd040 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -1,2 +1 @@
-$(OBJS): $(ruby_headers)
-parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
+parser.o: parser.c parser.h
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index ae4f861c79..f378479875 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -1,3 +1,4 @@
require 'mkmf'
+require 'rbconfig'
create_makefile 'json/ext/parser'
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index df89f2c58b..bd8199a10c 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -1,6 +1,5 @@
#line 1 "parser.rl"
-#include "../fbuffer/fbuffer.h"
#include "parser.h"
/* unicode */
@@ -70,7 +69,7 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
#ifdef HAVE_RUBY_ENCODING_H
static VALUE CEncoding_ASCII_8BIT, CEncoding_UTF_8, CEncoding_UTF_16BE,
CEncoding_UTF_16LE, CEncoding_UTF_32BE, CEncoding_UTF_32LE;
-static ID i_encoding, i_encode;
+static ID i_encoding, i_encode, i_encode_bang, i_force_encoding;
#else
static ID i_iconv;
#endif
@@ -79,16 +78,15 @@ 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_symbolize_names, i_quirks_mode,
- i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
- i_match_string, i_aset, i_aref, i_leftshift;
+ i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class,
+ i_array_class, i_key_p, i_deep_const_get;
-#line 110 "parser.rl"
+#line 108 "parser.rl"
-#line 92 "parser.c"
+#line 90 "parser.c"
static const int JSON_object_start = 1;
static const int JSON_object_first_final = 27;
static const int JSON_object_error = 0;
@@ -96,7 +94,7 @@ static const int JSON_object_error = 0;
static const int JSON_object_en_main = 1;
-#line 151 "parser.rl"
+#line 144 "parser.rl"
static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -111,15 +109,15 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
*result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
-
-#line 116 "parser.c"
+
+#line 114 "parser.c"
{
cs = JSON_object_start;
}
-#line 166 "parser.rl"
-
-#line 123 "parser.c"
+#line 159 "parser.rl"
+
+#line 121 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -147,7 +145,7 @@ case 2:
goto st2;
goto st0;
tr2:
-#line 133 "parser.rl"
+#line 127 "parser.rl"
{
char *np;
json->parsing_name = 1;
@@ -160,7 +158,7 @@ st3:
if ( ++p == pe )
goto _test_eof3;
case 3:
-#line 164 "parser.c"
+#line 162 "parser.c"
switch( (*p) ) {
case 13: goto st3;
case 32: goto st3;
@@ -227,18 +225,14 @@ case 8:
goto st8;
goto st0;
tr11:
-#line 118 "parser.rl"
+#line 116 "parser.rl"
{
VALUE v = Qnil;
char *np = JSON_parse_value(json, p, pe, &v);
if (np == NULL) {
p--; {p++; cs = 9; goto _out;}
} else {
- if (NIL_P(json->object_class)) {
- rb_hash_aset(*result, last_name, v);
- } else {
- rb_funcall(*result, i_aset, 2, last_name, v);
- }
+ rb_hash_aset(*result, last_name, v);
{p = (( np))-1;}
}
}
@@ -247,7 +241,7 @@ st9:
if ( ++p == pe )
goto _test_eof9;
case 9:
-#line 251 "parser.c"
+#line 245 "parser.c"
switch( (*p) ) {
case 13: goto st9;
case 32: goto st9;
@@ -336,14 +330,14 @@ case 18:
goto st9;
goto st18;
tr4:
-#line 141 "parser.rl"
+#line 135 "parser.rl"
{ p--; {p++; cs = 27; goto _out;} }
goto st27;
st27:
if ( ++p == pe )
goto _test_eof27;
case 27:
-#line 347 "parser.c"
+#line 341 "parser.c"
goto st0;
st19:
if ( ++p == pe )
@@ -410,50 +404,45 @@ case 26:
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_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 167 "parser.rl"
+#line 160 "parser.rl"
if (cs >= JSON_object_first_final) {
- if (json->create_additions) {
- VALUE klassname;
- if (NIL_P(json->object_class)) {
- klassname = rb_hash_aref(*result, json->create_id);
- } else {
- klassname = rb_funcall(*result, i_aref, 1, json->create_id);
- }
+ if (RTEST(json->create_id)) {
+ VALUE klassname = rb_hash_aref(*result, json->create_id);
if (!NIL_P(klassname)) {
VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
- if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) {
+ if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
*result = rb_funcall(klass, i_json_create, 1, *result);
}
}
@@ -465,8 +454,7 @@ case 26:
}
-
-#line 470 "parser.c"
+#line 458 "parser.c"
static const int JSON_value_start = 1;
static const int JSON_value_first_final = 21;
static const int JSON_value_error = 0;
@@ -474,22 +462,22 @@ static const int JSON_value_error = 0;
static const int JSON_value_en_main = 1;
-#line 271 "parser.rl"
+#line 258 "parser.rl"
static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
{
int cs = EVIL;
-
-#line 486 "parser.c"
+
+#line 474 "parser.c"
{
cs = JSON_value_start;
}
-#line 278 "parser.rl"
-
-#line 493 "parser.c"
+#line 265 "parser.rl"
+
+#line 481 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -514,17 +502,17 @@ st0:
cs = 0;
goto _out;
tr0:
-#line 219 "parser.rl"
+#line 206 "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 224 "parser.rl"
+#line 211 "parser.rl"
{
char *np;
- if(pe > p + 9 - json->quirks_mode && !strncmp(MinusInfinity, p, 9)) {
+ if(pe > p + 9 && !strncmp(MinusInfinity, p, 9)) {
if (json->allow_nan) {
*result = CMinusInfinity;
{p = (( p + 10))-1;}
@@ -541,7 +529,7 @@ tr2:
}
goto st21;
tr5:
-#line 242 "parser.rl"
+#line 229 "parser.rl"
{
char *np;
json->current_nesting++;
@@ -551,7 +539,7 @@ tr5:
}
goto st21;
tr9:
-#line 250 "parser.rl"
+#line 237 "parser.rl"
{
char *np;
json->current_nesting++;
@@ -561,7 +549,7 @@ tr9:
}
goto st21;
tr16:
-#line 212 "parser.rl"
+#line 199 "parser.rl"
{
if (json->allow_nan) {
*result = CInfinity;
@@ -571,7 +559,7 @@ tr16:
}
goto st21;
tr18:
-#line 205 "parser.rl"
+#line 192 "parser.rl"
{
if (json->allow_nan) {
*result = CNaN;
@@ -581,19 +569,19 @@ tr18:
}
goto st21;
tr22:
-#line 199 "parser.rl"
+#line 186 "parser.rl"
{
*result = Qfalse;
}
goto st21;
tr25:
-#line 196 "parser.rl"
+#line 183 "parser.rl"
{
*result = Qnil;
}
goto st21;
tr28:
-#line 202 "parser.rl"
+#line 189 "parser.rl"
{
*result = Qtrue;
}
@@ -602,9 +590,9 @@ st21:
if ( ++p == pe )
goto _test_eof21;
case 21:
-#line 258 "parser.rl"
+#line 245 "parser.rl"
{ p--; {p++; cs = 21; goto _out;} }
-#line 608 "parser.c"
+#line 596 "parser.c"
goto st0;
st2:
if ( ++p == pe )
@@ -740,32 +728,32 @@ case 20:
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_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 279 "parser.rl"
+#line 266 "parser.rl"
if (cs >= JSON_value_first_final) {
return p;
@@ -775,31 +763,31 @@ case 20:
}
-#line 779 "parser.c"
+#line 767 "parser.c"
static const int JSON_integer_start = 1;
-static const int JSON_integer_first_final = 3;
+static const int JSON_integer_first_final = 5;
static const int JSON_integer_error = 0;
static const int JSON_integer_en_main = 1;
-#line 295 "parser.rl"
+#line 282 "parser.rl"
static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
{
int cs = EVIL;
-
-#line 795 "parser.c"
+
+#line 783 "parser.c"
{
cs = JSON_integer_start;
}
-#line 302 "parser.rl"
+#line 289 "parser.rl"
json->memo = p;
-
-#line 803 "parser.c"
+
+#line 791 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -811,7 +799,7 @@ case 1:
case 48: goto st3;
}
if ( 49 <= (*p) && (*p) <= 57 )
- goto st5;
+ goto st4;
goto st0;
st0:
cs = 0;
@@ -823,7 +811,7 @@ case 2:
if ( (*p) == 48 )
goto st3;
if ( 49 <= (*p) && (*p) <= 57 )
- goto st5;
+ goto st4;
goto st0;
st3:
if ( ++p == pe )
@@ -833,40 +821,37 @@ case 3:
goto st0;
goto tr4;
tr4:
-#line 292 "parser.rl"
- { p--; {p++; cs = 4; goto _out;} }
- goto st4;
-st4:
- if ( ++p == pe )
- goto _test_eof4;
-case 4:
-#line 844 "parser.c"
- goto st0;
+#line 279 "parser.rl"
+ { p--; {p++; cs = 5; goto _out;} }
+ goto st5;
st5:
if ( ++p == pe )
goto _test_eof5;
case 5:
+#line 832 "parser.c"
+ goto st0;
+st4:
+ if ( ++p == pe )
+ goto _test_eof4;
+case 4:
if ( 48 <= (*p) && (*p) <= 57 )
- goto st5;
+ goto st4;
goto tr4;
}
- _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_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 304 "parser.rl"
+#line 291 "parser.rl"
if (cs >= JSON_integer_first_final) {
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
- *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
+ *result = rb_Integer(rb_str_new(json->memo, len));
return p + 1;
} else {
return NULL;
@@ -874,31 +859,31 @@ case 5:
}
-#line 878 "parser.c"
+#line 863 "parser.c"
static const int JSON_float_start = 1;
-static const int JSON_float_first_final = 8;
+static const int JSON_float_first_final = 10;
static const int JSON_float_error = 0;
static const int JSON_float_en_main = 1;
-#line 329 "parser.rl"
+#line 313 "parser.rl"
static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
{
int cs = EVIL;
-
-#line 894 "parser.c"
+
+#line 879 "parser.c"
{
cs = JSON_float_start;
}
-#line 336 "parser.rl"
+#line 320 "parser.rl"
json->memo = p;
-
-#line 902 "parser.c"
+
+#line 887 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -910,7 +895,7 @@ case 1:
case 48: goto st3;
}
if ( 49 <= (*p) && (*p) <= 57 )
- goto st7;
+ goto st9;
goto st0;
st0:
cs = 0;
@@ -922,7 +907,7 @@ case 2:
if ( (*p) == 48 )
goto st3;
if ( 49 <= (*p) && (*p) <= 57 )
- goto st7;
+ goto st9;
goto st0;
st3:
if ( ++p == pe )
@@ -930,8 +915,8 @@ st3:
case 3:
switch( (*p) ) {
case 46: goto st4;
- case 69: goto st5;
- case 101: goto st5;
+ case 69: goto st6;
+ case 101: goto st6;
}
goto st0;
st4:
@@ -939,99 +924,96 @@ st4:
goto _test_eof4;
case 4:
if ( 48 <= (*p) && (*p) <= 57 )
- goto st8;
+ goto st5;
goto st0;
-st8:
+st5:
if ( ++p == pe )
- goto _test_eof8;
-case 8:
+ goto _test_eof5;
+case 5:
switch( (*p) ) {
- case 69: goto st5;
- case 101: goto st5;
+ case 69: goto st6;
+ case 101: goto st6;
}
if ( (*p) > 46 ) {
if ( 48 <= (*p) && (*p) <= 57 )
- goto st8;
+ goto st5;
} else if ( (*p) >= 45 )
goto st0;
- goto tr9;
-tr9:
-#line 323 "parser.rl"
- { p--; {p++; cs = 9; goto _out;} }
- goto st9;
-st9:
+ goto tr7;
+tr7:
+#line 307 "parser.rl"
+ { p--; {p++; cs = 10; goto _out;} }
+ goto st10;
+st10:
if ( ++p == pe )
- goto _test_eof9;
-case 9:
-#line 967 "parser.c"
+ goto _test_eof10;
+case 10:
+#line 952 "parser.c"
goto st0;
-st5:
+st6:
if ( ++p == pe )
- goto _test_eof5;
-case 5:
+ goto _test_eof6;
+case 6:
switch( (*p) ) {
- case 43: goto st6;
- case 45: goto st6;
+ case 43: goto st7;
+ case 45: goto st7;
}
if ( 48 <= (*p) && (*p) <= 57 )
- goto st10;
+ goto st8;
goto st0;
-st6:
+st7:
if ( ++p == pe )
- goto _test_eof6;
-case 6:
+ goto _test_eof7;
+case 7:
if ( 48 <= (*p) && (*p) <= 57 )
- goto st10;
+ goto st8;
goto st0;
-st10:
+st8:
if ( ++p == pe )
- goto _test_eof10;
-case 10:
+ goto _test_eof8;
+case 8:
switch( (*p) ) {
case 69: goto st0;
case 101: goto st0;
}
if ( (*p) > 46 ) {
if ( 48 <= (*p) && (*p) <= 57 )
- goto st10;
+ goto st8;
} else if ( (*p) >= 45 )
goto st0;
- goto tr9;
-st7:
+ goto tr7;
+st9:
if ( ++p == pe )
- goto _test_eof7;
-case 7:
+ goto _test_eof9;
+case 9:
switch( (*p) ) {
case 46: goto st4;
- case 69: goto st5;
- case 101: goto st5;
+ case 69: goto st6;
+ case 101: goto st6;
}
if ( 48 <= (*p) && (*p) <= 57 )
- goto st7;
+ 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_eof8: cs = 8; goto _test_eof;
- _test_eof9: cs = 9; goto _test_eof;
- _test_eof5: cs = 5; goto _test_eof;
- _test_eof6: cs = 6; goto _test_eof;
- _test_eof10: cs = 10; goto _test_eof;
- _test_eof7: cs = 7; 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 338 "parser.rl"
+#line 322 "parser.rl"
if (cs >= JSON_float_first_final) {
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
- *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+ *result = rb_Float(rb_str_new(json->memo, len));
return p + 1;
} else {
return NULL;
@@ -1040,7 +1022,7 @@ case 7:
-#line 1044 "parser.c"
+#line 1026 "parser.c"
static const int JSON_array_start = 1;
static const int JSON_array_first_final = 17;
static const int JSON_array_error = 0;
@@ -1048,7 +1030,7 @@ static const int JSON_array_error = 0;
static const int JSON_array_en_main = 1;
-#line 381 "parser.rl"
+#line 358 "parser.rl"
static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -1061,15 +1043,15 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
}
*result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
-
-#line 1066 "parser.c"
+
+#line 1048 "parser.c"
{
cs = JSON_array_start;
}
-#line 394 "parser.rl"
-
-#line 1073 "parser.c"
+#line 371 "parser.rl"
+
+#line 1055 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -1108,18 +1090,14 @@ case 2:
goto st2;
goto st0;
tr2:
-#line 358 "parser.rl"
+#line 339 "parser.rl"
{
VALUE v = Qnil;
char *np = JSON_parse_value(json, p, pe, &v);
if (np == NULL) {
p--; {p++; cs = 3; goto _out;}
} else {
- if (NIL_P(json->array_class)) {
- rb_ary_push(*result, v);
- } else {
- rb_funcall(*result, i_leftshift, 1, v);
- }
+ rb_ary_push(*result, v);
{p = (( np))-1;}
}
}
@@ -1128,7 +1106,7 @@ st3:
if ( ++p == pe )
goto _test_eof3;
case 3:
-#line 1132 "parser.c"
+#line 1110 "parser.c"
switch( (*p) ) {
case 13: goto st3;
case 32: goto st3;
@@ -1228,14 +1206,14 @@ case 12:
goto st3;
goto st12;
tr4:
-#line 373 "parser.rl"
+#line 350 "parser.rl"
{ p--; {p++; cs = 17; goto _out;} }
goto st17;
st17:
if ( ++p == pe )
goto _test_eof17;
case 17:
-#line 1239 "parser.c"
+#line 1217 "parser.c"
goto st0;
st13:
if ( ++p == pe )
@@ -1270,28 +1248,28 @@ case 16:
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_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 395 "parser.rl"
+#line 372 "parser.rl"
if(cs >= JSON_array_first_final) {
return p + 1;
@@ -1372,7 +1350,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
}
-#line 1376 "parser.c"
+#line 1354 "parser.c"
static const int JSON_string_start = 1;
static const int JSON_string_first_final = 8;
static const int JSON_string_error = 0;
@@ -1380,37 +1358,24 @@ static const int JSON_string_error = 0;
static const int JSON_string_en_main = 1;
-#line 494 "parser.rl"
-
+#line 471 "parser.rl"
-static int
-match_i(VALUE regexp, VALUE klass, VALUE memo)
-{
- if (regexp == Qundef) return ST_STOP;
- if (RTEST(rb_funcall(klass, i_json_creatable_p, 0)) &&
- RTEST(rb_funcall(regexp, i_match, 1, rb_ary_entry(memo, 0)))) {
- rb_ary_push(memo, klass);
- return ST_STOP;
- }
- return ST_CONTINUE;
-}
static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
{
int cs = EVIL;
- VALUE match_string;
*result = rb_str_buf_new(0);
-
-#line 1406 "parser.c"
+
+#line 1371 "parser.c"
{
cs = JSON_string_start;
}
-#line 515 "parser.rl"
+#line 479 "parser.rl"
json->memo = p;
-
-#line 1414 "parser.c"
+
+#line 1379 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -1435,7 +1400,7 @@ case 2:
goto st0;
goto st2;
tr2:
-#line 480 "parser.rl"
+#line 457 "parser.rl"
{
*result = json_string_unescape(*result, json->memo + 1, p);
if (NIL_P(*result)) {
@@ -1446,14 +1411,14 @@ tr2:
{p = (( p + 1))-1;}
}
}
-#line 491 "parser.rl"
+#line 468 "parser.rl"
{ p--; {p++; cs = 8; goto _out;} }
goto st8;
st8:
if ( ++p == pe )
goto _test_eof8;
case 8:
-#line 1457 "parser.c"
+#line 1422 "parser.c"
goto st0;
st3:
if ( ++p == pe )
@@ -1517,30 +1482,19 @@ case 7:
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_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 517 "parser.rl"
-
- if (json->create_additions && RTEST(match_string = json->match_string)) {
- VALUE klass;
- VALUE memo = rb_ary_new2(2);
- rb_ary_push(memo, *result);
- rb_hash_foreach(match_string, match_i, memo);
- klass = rb_ary_entry(memo, 1);
- if (RTEST(klass)) {
- *result = rb_funcall(klass, i_json_create, 1, *result);
- }
- }
+#line 481 "parser.rl"
if (json->symbolize_names && json->parsing_name) {
*result = rb_str_intern(*result);
@@ -1552,6 +1506,19 @@ case 7:
}
}
+
+
+#line 1512 "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 518 "parser.rl"
+
+
/*
* Document-class: JSON::Ext::Parser
*
@@ -1576,15 +1543,22 @@ static VALUE convert_encoding(VALUE source)
VALUE encoding = rb_funcall(source, i_encoding, 0);
if (encoding == CEncoding_ASCII_8BIT) {
if (len >= 4 && ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32BE);
+ source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32BE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
} else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16BE);
+ source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16BE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
} else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32LE);
+ source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32LE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
} else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
- } else {
source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16LE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+ } else {
FORCE_UTF8(source);
}
} else {
@@ -1618,7 +1592,7 @@ static VALUE convert_encoding(VALUE source)
* _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 100.
+ * 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.
@@ -1633,6 +1607,8 @@ static VALUE convert_encoding(VALUE source)
*/
static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
{
+ char *ptr;
+ long len;
VALUE source, opts;
GET_PARSER_INIT;
@@ -1640,6 +1616,9 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eTypeError, "already initialized instance");
}
rb_scan_args(argc, argv, "11", &source, &opts);
+ source = convert_encoding(StringValue(source));
+ ptr = RSTRING_PTR(source);
+ len = RSTRING_LEN(source);
if (!NIL_P(opts)) {
opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
if (NIL_P(opts)) {
@@ -1655,36 +1634,30 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
json->max_nesting = 0;
}
} else {
- json->max_nesting = 100;
+ json->max_nesting = 19;
}
tmp = ID2SYM(i_allow_nan);
if (option_given_p(opts, tmp)) {
- json->allow_nan = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 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_symbolize_names);
if (option_given_p(opts, tmp)) {
- json->symbolize_names = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
+ VALUE symbolize_names = rb_hash_aref(opts, tmp);
+ json->symbolize_names = RTEST(symbolize_names) ? 1 : 0;
} else {
json->symbolize_names = 0;
}
- tmp = ID2SYM(i_quirks_mode);
- if (option_given_p(opts, tmp)) {
- VALUE quirks_mode = rb_hash_aref(opts, tmp);
- json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
- } else {
- json->quirks_mode = 0;
- }
tmp = ID2SYM(i_create_additions);
if (option_given_p(opts, tmp)) {
- json->create_additions = RTEST(rb_hash_aref(opts, tmp));
- } else {
- json->create_additions = 0;
- }
- tmp = ID2SYM(i_create_id);
- if (option_given_p(opts, tmp)) {
- json->create_id = rb_hash_aref(opts, tmp);
+ 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);
}
@@ -1700,64 +1673,45 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
} else {
json->array_class = Qnil;
}
- tmp = ID2SYM(i_match_string);
- if (option_given_p(opts, tmp)) {
- VALUE match_string = rb_hash_aref(opts, tmp);
- json->match_string = RTEST(match_string) ? match_string : Qnil;
- } else {
- json->match_string = Qnil;
- }
}
} else {
- json->max_nesting = 100;
+ json->max_nesting = 19;
json->allow_nan = 0;
- json->create_additions = 1;
json->create_id = rb_funcall(mJSON, i_create_id, 0);
json->object_class = Qnil;
json->array_class = Qnil;
}
- source = rb_convert_type(source, T_STRING, "String", "to_str");
- if (!json->quirks_mode) {
- source = convert_encoding(StringValue(source));
- }
json->current_nesting = 0;
- StringValue(source);
- json->len = RSTRING_LEN(source);
- json->source = RSTRING_PTR(source);;
+ json->len = len;
+ json->source = ptr;
json->Vsource = source;
return self;
}
-
-#line 1733 "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 740 "parser.rl"
-
-
-static VALUE cParser_parse_strict(VALUE 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_PARSER;
-
-#line 1752 "parser.c"
+
+#line 1706 "parser.c"
{
cs = JSON_start;
}
-#line 750 "parser.rl"
+#line 703 "parser.rl"
p = json->source;
pe = p + json->len;
-
-#line 1761 "parser.c"
+
+#line 1715 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -1813,7 +1767,7 @@ case 5:
goto st1;
goto st5;
tr3:
-#line 729 "parser.rl"
+#line 507 "parser.rl"
{
char *np;
json->current_nesting = 1;
@@ -1822,7 +1776,7 @@ tr3:
}
goto st10;
tr4:
-#line 722 "parser.rl"
+#line 500 "parser.rl"
{
char *np;
json->current_nesting = 1;
@@ -1834,7 +1788,7 @@ st10:
if ( ++p == pe )
goto _test_eof10;
case 10:
-#line 1838 "parser.c"
+#line 1792 "parser.c"
switch( (*p) ) {
case 13: goto st10;
case 32: goto st10;
@@ -1876,22 +1830,22 @@ case 9:
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_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 753 "parser.rl"
+#line 706 "parser.rl"
if (cs >= JSON_first_final && p == pe) {
return result;
@@ -1901,202 +1855,10 @@ case 9:
}
}
-
-
-#line 1907 "parser.c"
-static const int JSON_quirks_mode_start = 1;
-static const int JSON_quirks_mode_first_final = 10;
-static const int JSON_quirks_mode_error = 0;
-
-static const int JSON_quirks_mode_en_main = 1;
-
-
-#line 778 "parser.rl"
-
-
-static VALUE cParser_parse_quirks_mode(VALUE self)
-{
- char *p, *pe;
- int cs = EVIL;
- VALUE result = Qnil;
- GET_PARSER;
-
-
-#line 1926 "parser.c"
- {
- cs = JSON_quirks_mode_start;
- }
-
-#line 788 "parser.rl"
- p = json->source;
- pe = p + json->len;
-
-#line 1935 "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 34: goto tr2;
- case 45: goto tr2;
- case 47: goto st6;
- 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 st1;
- goto st0;
-st0:
-cs = 0;
- goto _out;
-tr2:
-#line 770 "parser.rl"
- {
- char *np = JSON_parse_value(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 1979 "parser.c"
- switch( (*p) ) {
- case 13: goto st10;
- case 32: goto st10;
- case 47: goto st2;
- }
- if ( 9 <= (*p) && (*p) <= 10 )
- goto st10;
- goto st0;
-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 st10;
- }
- goto st3;
-st5:
- if ( ++p == pe )
- goto _test_eof5;
-case 5:
- if ( (*p) == 10 )
- goto st10;
- goto st5;
-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 st1;
- }
- goto st7;
-st9:
- if ( ++p == pe )
- goto _test_eof9;
-case 9:
- if ( (*p) == 10 )
- goto st1;
- goto st9;
- }
- _test_eof1: cs = 1; goto _test_eof;
- _test_eof10: cs = 10; 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_eof: {}
- _out: {}
- }
-
-#line 791 "parser.rl"
-
- if (cs >= JSON_quirks_mode_first_final && p == pe) {
- return result;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- return Qnil;
- }
-}
-
-/*
- * call-seq: parse()
- *
- * Parses the current JSON text _source_ and returns the complete data
- * structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
- GET_PARSER;
-
- if (json->quirks_mode) {
- return cParser_parse_quirks_mode(self);
- } else {
- return cParser_parse_strict(self);
- }
-}
-
-
static JSON_Parser *JSON_allocate()
{
JSON_Parser *json = ALLOC(JSON_Parser);
MEMZERO(json, JSON_Parser, 1);
- json->fbuffer = fbuffer_alloc(0);
return json;
}
@@ -2106,12 +1868,10 @@ static void JSON_mark(JSON_Parser *json)
rb_gc_mark_maybe(json->create_id);
rb_gc_mark_maybe(json->object_class);
rb_gc_mark_maybe(json->array_class);
- rb_gc_mark_maybe(json->match_string);
}
static void JSON_free(JSON_Parser *json)
{
- fbuffer_free(json->fbuffer);
ruby_xfree(json);
}
@@ -2133,18 +1893,6 @@ static VALUE cParser_source(VALUE self)
return rb_str_dup(json->Vsource);
}
-/*
- * call-seq: quirks_mode?()
- *
- * Returns a true, if this parser is in quirks_mode, false otherwise.
- */
-static VALUE cParser_quirks_mode_p(VALUE self)
-{
- GET_PARSER;
- return json->quirks_mode ? Qtrue : Qfalse;
-}
-
-
void Init_parser()
{
rb_require("json/common");
@@ -2157,7 +1905,6 @@ void Init_parser()
rb_define_method(cParser, "initialize", cParser_initialize, -1);
rb_define_method(cParser, "parse", cParser_parse, 0);
rb_define_method(cParser, "source", cParser_source, 0);
- rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
CNaN = rb_const_get(mJSON, rb_intern("NaN"));
CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
@@ -2171,16 +1918,10 @@ void Init_parser()
i_max_nesting = rb_intern("max_nesting");
i_allow_nan = rb_intern("allow_nan");
i_symbolize_names = rb_intern("symbolize_names");
- i_quirks_mode = rb_intern("quirks_mode");
i_object_class = rb_intern("object_class");
i_array_class = rb_intern("array_class");
- i_match = rb_intern("match");
- i_match_string = rb_intern("match_string");
i_key_p = rb_intern("key?");
i_deep_const_get = rb_intern("deep_const_get");
- i_aset = rb_intern("[]=");
- i_aref = rb_intern("[]");
- i_leftshift = rb_intern("<<");
#ifdef HAVE_RUBY_ENCODING_H
CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be"));
@@ -2190,15 +1931,9 @@ void Init_parser()
CEncoding_ASCII_8BIT = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("ascii-8bit"));
i_encoding = rb_intern("encoding");
i_encode = rb_intern("encode");
+ i_encode_bang = rb_intern("encode!");
+ i_force_encoding = rb_intern("force_encoding");
#else
i_iconv = rb_intern("iconv");
#endif
}
-
-/*
- * Local variables:
- * mode: c
- * c-file-style: ruby
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index b192064c09..a344da058c 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -3,23 +3,24 @@
#include "ruby.h"
-#ifndef HAVE_RUBY_RE_H
+#if HAVE_RE_H
#include "re.h"
#endif
-#ifdef HAVE_RUBY_ST_H
-#include "ruby/st.h"
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define FORCE_UTF8(obj) rb_enc_associate((obj), rb_utf8_encoding())
#else
-#include "st.h"
+#define FORCE_UTF8(obj)
#endif
#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
/* unicode */
-typedef unsigned long UTF32; /* at least 32 bits */
-typedef unsigned short UTF16; /* at least 16 bits */
-typedef unsigned char UTF8; /* typically 8 bits */
+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_SUR_HIGH_START (UTF32)0xD800
@@ -38,12 +39,8 @@ typedef struct JSON_ParserStruct {
int allow_nan;
int parsing_name;
int symbolize_names;
- int quirks_mode;
VALUE object_class;
VALUE array_class;
- int create_additions;
- VALUE match_string;
- FBuffer *fbuffer;
} JSON_Parser;
#define GET_PARSER \
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index ab8d318173..2f4e9390cd 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -1,4 +1,3 @@
-#include "../fbuffer/fbuffer.h"
#include "parser.h"
/* unicode */
@@ -68,7 +67,7 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
#ifdef HAVE_RUBY_ENCODING_H
static VALUE CEncoding_ASCII_8BIT, CEncoding_UTF_8, CEncoding_UTF_16BE,
CEncoding_UTF_16LE, CEncoding_UTF_32BE, CEncoding_UTF_32LE;
-static ID i_encoding, i_encode;
+static ID i_encoding, i_encode, i_encode_bang, i_force_encoding;
#else
static ID i_iconv;
#endif
@@ -77,9 +76,8 @@ 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_symbolize_names, i_quirks_mode,
- i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
- i_match_string, i_aset, i_aref, i_leftshift;
+ i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class,
+ i_array_class, i_key_p, i_deep_const_get;
%%{
machine JSON_common;
@@ -99,7 +97,7 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
VNaN = 'NaN';
VInfinity = 'Infinity';
VMinusInfinity = '-Infinity';
- begin_value = [nft\"\-\[\{NI] | digit;
+ begin_value = [nft"\-[{NI] | digit;
begin_object = '{';
end_object = '}';
begin_array = '[';
@@ -121,11 +119,7 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
if (np == NULL) {
fhold; fbreak;
} else {
- if (NIL_P(json->object_class)) {
- rb_hash_aset(*result, last_name, v);
- } else {
- rb_funcall(*result, i_aset, 2, last_name, v);
- }
+ rb_hash_aset(*result, last_name, v);
fexec np;
}
}
@@ -140,14 +134,13 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
action exit { fhold; fbreak; }
- pair = ignore* begin_name >parse_name ignore* name_separator ignore* begin_value >parse_value;
- next_pair = ignore* value_separator pair;
+ a_pair = ignore* begin_name >parse_name
+ ignore* name_separator ignore*
+ begin_value >parse_value;
- main := (
- begin_object
- (pair (next_pair)*)? ignore*
- end_object
- ) @exit;
+ 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)
@@ -166,16 +159,11 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
%% write exec;
if (cs >= JSON_object_first_final) {
- if (json->create_additions) {
- VALUE klassname;
- if (NIL_P(json->object_class)) {
- klassname = rb_hash_aref(*result, json->create_id);
- } else {
- klassname = rb_funcall(*result, i_aref, 1, json->create_id);
- }
+ if (RTEST(json->create_id)) {
+ VALUE klassname = rb_hash_aref(*result, json->create_id);
if (!NIL_P(klassname)) {
VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
- if (RTEST(rb_funcall(klass, i_json_creatable_p, 0))) {
+ if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
*result = rb_funcall(klass, i_json_create, 1, *result);
}
}
@@ -186,7 +174,6 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
}
}
-
%%{
machine JSON_value;
include JSON_common;
@@ -223,7 +210,7 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
action parse_number {
char *np;
- if(pe > fpc + 9 - json->quirks_mode && !strncmp(MinusInfinity, fpc, 9)) {
+ if(pe > fpc + 9 && !strncmp(MinusInfinity, fpc, 9)) {
if (json->allow_nan) {
*result = CMinusInfinity;
fexec p + 10;
@@ -291,7 +278,7 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
action exit { fhold; fbreak; }
- main := '-'? ('0' | [1-9][0-9]*) (^[0-9]? @exit);
+ main := '-'? ('0' | [1-9][0-9]*) (^[0-9] @exit);
}%%
static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -304,10 +291,7 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
if (cs >= JSON_integer_first_final) {
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
- *result = rb_cstr2inum(FBUFFER_PTR(json->fbuffer), 10);
+ *result = rb_Integer(rb_str_new(json->memo, len));
return p + 1;
} else {
return NULL;
@@ -325,7 +309,7 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
main := '-'? (
(('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
| (('0' | [1-9][0-9]*) ([Ee] [+\-]?[0-9]+))
- ) (^[0-9Ee.\-]? @exit );
+ ) (^[0-9Ee.\-] @exit );
}%%
static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -338,10 +322,7 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
if (cs >= JSON_float_first_final) {
long len = p - json->memo;
- fbuffer_clear(json->fbuffer);
- fbuffer_append(json->fbuffer, json->memo, len);
- fbuffer_append_char(json->fbuffer, '\0');
- *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+ *result = rb_Float(rb_str_new(json->memo, len));
return p + 1;
} else {
return NULL;
@@ -361,11 +342,7 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
if (np == NULL) {
fhold; fbreak;
} else {
- if (NIL_P(json->array_class)) {
- rb_ary_push(*result, v);
- } else {
- rb_funcall(*result, i_leftshift, 1, v);
- }
+ rb_ary_push(*result, v);
fexec np;
}
}
@@ -490,42 +467,18 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
action exit { fhold; fbreak; }
- main := '"' ((^([\"\\] | 0..0x1f) | '\\'[\"\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^([\"\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
+ main := '"' ((^(["\\] | 0..0x1f) | '\\'["\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^(["\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
}%%
-static int
-match_i(VALUE regexp, VALUE klass, VALUE memo)
-{
- if (regexp == Qundef) return ST_STOP;
- if (RTEST(rb_funcall(klass, i_json_creatable_p, 0)) &&
- RTEST(rb_funcall(regexp, i_match, 1, rb_ary_entry(memo, 0)))) {
- rb_ary_push(memo, klass);
- return ST_STOP;
- }
- return ST_CONTINUE;
-}
-
static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
{
int cs = EVIL;
- VALUE match_string;
*result = rb_str_buf_new(0);
%% write init;
json->memo = p;
%% write exec;
- if (json->create_additions && RTEST(match_string = json->match_string)) {
- VALUE klass;
- VALUE memo = rb_ary_new2(2);
- rb_ary_push(memo, *result);
- rb_hash_foreach(match_string, match_i, memo);
- klass = rb_ary_entry(memo, 1);
- if (RTEST(klass)) {
- *result = rb_funcall(klass, i_json_create, 1, *result);
- }
- }
-
if (json->symbolize_names && json->parsing_name) {
*result = rb_str_intern(*result);
}
@@ -536,6 +489,34 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
}
}
+
+%%{
+ 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
*
@@ -560,15 +541,22 @@ static VALUE convert_encoding(VALUE source)
VALUE encoding = rb_funcall(source, i_encoding, 0);
if (encoding == CEncoding_ASCII_8BIT) {
if (len >= 4 && ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32BE);
+ source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32BE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
} else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16BE);
+ source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16BE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
} else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32LE);
+ source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32LE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
} else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
- source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
- } else {
source = rb_str_dup(source);
+ rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16LE);
+ source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+ } else {
FORCE_UTF8(source);
}
} else {
@@ -602,7 +590,7 @@ static VALUE convert_encoding(VALUE source)
* _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 100.
+ * 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.
@@ -617,6 +605,8 @@ static VALUE convert_encoding(VALUE source)
*/
static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
{
+ char *ptr;
+ long len;
VALUE source, opts;
GET_PARSER_INIT;
@@ -624,6 +614,9 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eTypeError, "already initialized instance");
}
rb_scan_args(argc, argv, "11", &source, &opts);
+ source = convert_encoding(StringValue(source));
+ ptr = RSTRING_PTR(source);
+ len = RSTRING_LEN(source);
if (!NIL_P(opts)) {
opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
if (NIL_P(opts)) {
@@ -639,36 +632,30 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
json->max_nesting = 0;
}
} else {
- json->max_nesting = 100;
+ json->max_nesting = 19;
}
tmp = ID2SYM(i_allow_nan);
if (option_given_p(opts, tmp)) {
- json->allow_nan = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 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_symbolize_names);
if (option_given_p(opts, tmp)) {
- json->symbolize_names = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
+ VALUE symbolize_names = rb_hash_aref(opts, tmp);
+ json->symbolize_names = RTEST(symbolize_names) ? 1 : 0;
} else {
json->symbolize_names = 0;
}
- tmp = ID2SYM(i_quirks_mode);
- if (option_given_p(opts, tmp)) {
- VALUE quirks_mode = rb_hash_aref(opts, tmp);
- json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
- } else {
- json->quirks_mode = 0;
- }
tmp = ID2SYM(i_create_additions);
if (option_given_p(opts, tmp)) {
- json->create_additions = RTEST(rb_hash_aref(opts, tmp));
- } else {
- json->create_additions = 0;
- }
- tmp = ID2SYM(i_create_id);
- if (option_given_p(opts, tmp)) {
- json->create_id = rb_hash_aref(opts, tmp);
+ 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);
}
@@ -684,62 +671,28 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
} else {
json->array_class = Qnil;
}
- tmp = ID2SYM(i_match_string);
- if (option_given_p(opts, tmp)) {
- VALUE match_string = rb_hash_aref(opts, tmp);
- json->match_string = RTEST(match_string) ? match_string : Qnil;
- } else {
- json->match_string = Qnil;
- }
}
} else {
- json->max_nesting = 100;
+ json->max_nesting = 19;
json->allow_nan = 0;
- json->create_additions = 1;
json->create_id = rb_funcall(mJSON, i_create_id, 0);
json->object_class = Qnil;
json->array_class = Qnil;
}
- source = rb_convert_type(source, T_STRING, "String", "to_str");
- if (!json->quirks_mode) {
- source = convert_encoding(StringValue(source));
- }
json->current_nesting = 0;
- StringValue(source);
- json->len = RSTRING_LEN(source);
- json->source = RSTRING_PTR(source);;
+ json->len = len;
+ json->source = ptr;
json->Vsource = source;
return self;
}
-%%{
- 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*;
-}%%
-
-static VALUE cParser_parse_strict(VALUE 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;
@@ -759,67 +712,10 @@ static VALUE cParser_parse_strict(VALUE self)
}
}
-
-%%{
- machine JSON_quirks_mode;
-
- write data;
-
- include JSON_common;
-
- action parse_value {
- char *np = JSON_parse_value(json, fpc, pe, &result);
- if (np == NULL) { fhold; fbreak; } else fexec np;
- }
-
- main := ignore* (
- begin_value >parse_value
- ) ignore*;
-}%%
-
-static VALUE cParser_parse_quirks_mode(VALUE self)
-{
- char *p, *pe;
- int cs = EVIL;
- VALUE result = Qnil;
- GET_PARSER;
-
- %% write init;
- p = json->source;
- pe = p + json->len;
- %% write exec;
-
- if (cs >= JSON_quirks_mode_first_final && p == pe) {
- return result;
- } else {
- rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
- return Qnil;
- }
-}
-
-/*
- * call-seq: parse()
- *
- * Parses the current JSON text _source_ and returns the complete data
- * structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
- GET_PARSER;
-
- if (json->quirks_mode) {
- return cParser_parse_quirks_mode(self);
- } else {
- return cParser_parse_strict(self);
- }
-}
-
-
static JSON_Parser *JSON_allocate()
{
JSON_Parser *json = ALLOC(JSON_Parser);
MEMZERO(json, JSON_Parser, 1);
- json->fbuffer = fbuffer_alloc(0);
return json;
}
@@ -829,12 +725,10 @@ static void JSON_mark(JSON_Parser *json)
rb_gc_mark_maybe(json->create_id);
rb_gc_mark_maybe(json->object_class);
rb_gc_mark_maybe(json->array_class);
- rb_gc_mark_maybe(json->match_string);
}
static void JSON_free(JSON_Parser *json)
{
- fbuffer_free(json->fbuffer);
ruby_xfree(json);
}
@@ -856,18 +750,6 @@ static VALUE cParser_source(VALUE self)
return rb_str_dup(json->Vsource);
}
-/*
- * call-seq: quirks_mode?()
- *
- * Returns a true, if this parser is in quirks_mode, false otherwise.
- */
-static VALUE cParser_quirks_mode_p(VALUE self)
-{
- GET_PARSER;
- return json->quirks_mode ? Qtrue : Qfalse;
-}
-
-
void Init_parser()
{
rb_require("json/common");
@@ -880,7 +762,6 @@ void Init_parser()
rb_define_method(cParser, "initialize", cParser_initialize, -1);
rb_define_method(cParser, "parse", cParser_parse, 0);
rb_define_method(cParser, "source", cParser_source, 0);
- rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
CNaN = rb_const_get(mJSON, rb_intern("NaN"));
CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
@@ -894,16 +775,10 @@ void Init_parser()
i_max_nesting = rb_intern("max_nesting");
i_allow_nan = rb_intern("allow_nan");
i_symbolize_names = rb_intern("symbolize_names");
- i_quirks_mode = rb_intern("quirks_mode");
i_object_class = rb_intern("object_class");
i_array_class = rb_intern("array_class");
- i_match = rb_intern("match");
- i_match_string = rb_intern("match_string");
i_key_p = rb_intern("key?");
i_deep_const_get = rb_intern("deep_const_get");
- i_aset = rb_intern("[]=");
- i_aref = rb_intern("[]");
- i_leftshift = rb_intern("<<");
#ifdef HAVE_RUBY_ENCODING_H
CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be"));
@@ -913,15 +788,9 @@ void Init_parser()
CEncoding_ASCII_8BIT = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("ascii-8bit"));
i_encoding = rb_intern("encoding");
i_encode = rb_intern("encode");
+ i_encode_bang = rb_intern("encode!");
+ i_force_encoding = rb_intern("force_encoding");
#else
i_iconv = rb_intern("iconv");
#endif
}
-
-/*
- * Local variables:
- * mode: c
- * c-file-style: ruby
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/ext/json/parser/prereq.mk b/ext/json/parser/prereq.mk
deleted file mode 100644
index 440ef4017e..0000000000
--- a/ext/json/parser/prereq.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-RAGEL = ragel
-
-.SUFFIXES: .rl
-
-.rl.c:
- $(RAGEL) -G2 $<
- $(BASERUBY) -pli -e '$$_.sub!(/[ \t]+$$/, "")' $@
-
-parser.c:
diff --git a/ext/nkf/.cvsignore b/ext/nkf/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/nkf/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/nkf/depend b/ext/nkf/depend
index f028020a20..0ed8fea8d2 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -1,4 +1 @@
-nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
- $(srcdir)/nkf-utf8/nkf.c $(srcdir)/nkf-utf8/nkf.h \
- $(srcdir)/nkf-utf8/utf8tbl.c $(srcdir)/nkf-utf8/utf8tbl.h \
- $(srcdir)/nkf-utf8/config.h
+nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf-utf8/nkf.c $(srcdir)/nkf-utf8/utf8tbl.c $(srcdir)/nkf-utf8/config.h
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index 8e9d206471..06dfc74fcb 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -20,11 +20,11 @@
*
* 3. This notice may not be removed or altered from any source distribution.
*/
-#define NKF_VERSION "2.1.3"
-#define NKF_RELEASE_DATE "2012-11-22"
+#define NKF_VERSION "2.1.1"
+#define NKF_RELEASE_DATE "2010-04-28"
#define COPY_RIGHT \
"Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
- "Copyright (C) 1996-2012, The nkf Project."
+ "Copyright (C) 1996-2010, The nkf Project."
#include "config.h"
#include "nkf.h"
@@ -356,7 +356,6 @@ static int no_cp932ext_f = FALSE;
/* ignore ZERO WIDTH NO-BREAK SPACE */
static int no_best_fit_chars_f = FALSE;
static int input_endian = ENDIAN_BIG;
-static int input_bom_f = FALSE;
static nkf_char unicode_subchar = '?'; /* the regular substitution character */
static void (*encode_fallback)(nkf_char c) = NULL;
static void w_status(struct input_code *, nkf_char);
@@ -431,8 +430,6 @@ static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
#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)
-#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
-
#ifdef NUMCHAR_OPTION
static int numchar_f = FALSE;
static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
@@ -509,7 +506,7 @@ static int fold_margin = FOLD_MARGIN;
/* process default */
static nkf_char
-no_connection2(ARG_UNUSED nkf_char c2, ARG_UNUSED nkf_char c1, ARG_UNUSED nkf_char c0)
+no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
{
fprintf(stderr,"nkf internal module connection failure.\n");
exit(EXIT_FAILURE);
@@ -623,27 +620,6 @@ static const unsigned char ev[]= {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00};
-/* X0201 kana to X0213 conversion table for han-daguten */
-/* 90-9F A0-DF */
-static const unsigned char ev_x0213[]= {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x25,0x77,0x25,0x78,
- 0x25,0x79,0x25,0x7a,0x25,0x7b,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x25,0x7c,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x25,0x7d,0x00,0x00,
- 0x25,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00};
-
/* X0208 kigou conversion table */
/* 0x8140 - 0x819e */
@@ -845,7 +821,7 @@ nkf_buf_new(int length)
buf->capa = length;
buf->len = 0;
return buf;
-}
+}
#if 0
static void
@@ -1311,7 +1287,6 @@ set_input_encoding(nkf_encoding *enc)
x0213_f = TRUE;
#ifdef SHIFTJIS_CP932
cp51932_f = FALSE;
- if (cp932inv_f == TRUE) cp932inv_f = FALSE;
#endif
break;
case EUC_JISX0213:
@@ -1382,7 +1357,6 @@ set_output_encoding(nkf_encoding *enc)
#endif
break;
case ISO_2022_JP_3:
- case ISO_2022_JP_2004:
x0212_f = TRUE;
x0213_f = TRUE;
#ifdef SHIFTJIS_CP932
@@ -1566,26 +1540,13 @@ x0212_unshift(nkf_char c)
}
#endif /* X0212_ENABLE */
-static int
-is_x0213_2_in_x0212(nkf_char c1)
-{
- static const char x0213_2_table[] =
- {0, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1};
- int ku = c1 - 0x20;
- if (ku <= 15)
- return x0213_2_table[ku]; /* 1, 3-5, 8, 12-15 */
- if (78 <= ku && ku <= 94)
- return 1;
- return 0;
-}
-
static 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 && is_x0213_2_in_x0212(ndx)){
+ 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);
@@ -1631,7 +1592,7 @@ s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
static const char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
if (0xFC < c1) return 1;
#ifdef SHIFTJIS_CP932
- if (!cp932inv_f && !x0213_f && is_ibmext_in_sjis(c2)){
+ if (!cp932inv_f && is_ibmext_in_sjis(c2)){
val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
if (val){
c2 = val >> 8;
@@ -1734,7 +1695,7 @@ nkf_utf8_to_unicode(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
/* single byte */
wc = c1;
}
- else if (c1 <= 0xC1) {
+ else if (c1 <= 0xC3) {
/* trail byte or invalid */
return -1;
}
@@ -1874,7 +1835,6 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
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 :
- x0213_f ? utf8_to_euc_2bytes_x0213 :
utf8_to_euc_2bytes;
ret = unicode_to_jis_common2(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
}else if(c0 < 0xF0){
@@ -1942,7 +1902,6 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
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 :
- x0213_f ? utf8_to_euc_3bytes_x0213 :
utf8_to_euc_3bytes;
ret = unicode_to_jis_common2(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
}else return -1;
@@ -1960,15 +1919,6 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
}
#ifdef UTF8_OUTPUT_ENABLE
-#define X0213_SURROGATE_FIND(tbl, size, euc) do { \
- int i; \
- for (i = 0; i < size; i++) \
- if (tbl[i][0] == euc) { \
- low = tbl[i][2]; \
- break; \
- } \
- } while (0)
-
static nkf_char
e2w_conv(nkf_char c2, nkf_char c1)
{
@@ -1991,9 +1941,7 @@ e2w_conv(nkf_char c2, nkf_char c1)
}
c2 = (c2&0x7f) - 0x21;
if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
- p =
- x0213_f ? x0212_to_utf8_2bytes_x0213[c2] :
- x0212_to_utf8_2bytes[c2];
+ p = x0212_to_utf8_2bytes[c2];
else
return 0;
#endif
@@ -2002,7 +1950,6 @@ e2w_conv(nkf_char c2, nkf_char c1)
c2 = (c2&0x7f) - 0x21;
if (0<=c2 && c2<sizeof_euc_to_utf8_2bytes)
p =
- x0213_f ? euc_to_utf8_2bytes_x0213[c2] :
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];
@@ -2011,39 +1958,8 @@ e2w_conv(nkf_char c2, nkf_char c1)
}
if (!p) return 0;
c1 = (c1 & 0x7f) - 0x21;
- if (0<=c1 && c1<sizeof_euc_to_utf8_1byte) {
- nkf_char val = p[c1];
- if (x0213_f && 0xD800<=val && val<=0xDBFF) {
- nkf_char euc = (c2+0x21)<<8 | (c1+0x21);
- nkf_char low = 0;
- if (p==x0212_to_utf8_2bytes_x0213[c2]) {
- X0213_SURROGATE_FIND(x0213_2_surrogate_table, sizeof_x0213_2_surrogate_table, euc);
- } else {
- X0213_SURROGATE_FIND(x0213_1_surrogate_table, sizeof_x0213_1_surrogate_table, euc);
- }
- if (!low) return 0;
- return UTF16_TO_UTF32(val, low);
- } else {
- return val;
- }
- }
- return 0;
-}
-
-static nkf_char
-e2w_combining(nkf_char comb, nkf_char c2, nkf_char c1)
-{
- nkf_char euc;
- int i;
- for (i = 0; i < sizeof_x0213_combining_chars; i++)
- if (x0213_combining_chars[i] == comb)
- break;
- if (i >= sizeof_x0213_combining_chars)
- return 0;
- euc = (c2&0x7f)<<8 | (c1&0x7f);
- for (i = 0; i < sizeof_x0213_combining_table; i++)
- if (x0213_combining_table[i][0] == euc)
- return x0213_combining_table[i][1];
+ if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
+ return p[c1];
return 0;
}
#endif
@@ -2090,25 +2006,6 @@ w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
}
}
else {
- int i;
- if (x0213_f) {
- c1 = (val >> 10) + NKF_INT32_C(0xD7C0); /* high surrogate */
- c2 = (val & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */
- for (i = 0; i < sizeof_x0213_1_surrogate_table; i++)
- if (x0213_1_surrogate_table[i][1] == c1 && x0213_1_surrogate_table[i][2] == c2) {
- val = x0213_1_surrogate_table[i][0];
- *p2 = val >> 8;
- *p1 = val & 0xFF;
- return 0;
- }
- for (i = 0; i < sizeof_x0213_2_surrogate_table; i++)
- if (x0213_2_surrogate_table[i][1] == c1 && x0213_2_surrogate_table[i][2] == c2) {
- val = x0213_2_surrogate_table[i][0];
- *p2 = PREFIX_EUCG3 | (val >> 8);
- *p1 = val & 0xFF;
- return 0;
- }
- }
*p2 = 0;
*p1 = nkf_char_unicode_new(val);
}
@@ -2181,7 +2078,7 @@ e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
}
static nkf_char
-s_iconv(ARG_UNUSED nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
+s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
{
if (c2 == JIS_X_0201_1976_K || (0xA1 <= c2 && c2 <= 0xDF)) {
if (iso2022jp_f && !x0201_f) {
@@ -2204,30 +2101,6 @@ s_iconv(ARG_UNUSED nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
return 0;
}
-static int
-x0213_wait_combining_p(nkf_char wc)
-{
- int i;
- for (i = 0; i < sizeof_x0213_combining_table; i++) {
- if (x0213_combining_table[i][1] == wc) {
- return TRUE;
- }
- }
- return FALSE;
-}
-
-static int
-x0213_combining_p(nkf_char wc)
-{
- int i;
- for (i = 0; i < sizeof_x0213_combining_chars; i++) {
- if (x0213_combining_chars[i] == wc) {
- return TRUE;
- }
- }
- return FALSE;
-}
-
static nkf_char
w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
{
@@ -2295,8 +2168,6 @@ w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
c2 = nkf_char_unicode_new(nkf_utf8_to_unicode(c1, c2, c3, c4));
c1 = 0;
} else {
- if (x0213_f && x0213_wait_combining_p(nkf_utf8_to_unicode(c1, c2, c3, c4)))
- return -3;
ret = w2e_conv(c1, c2, c3, &c1, &c2);
}
if (ret == 0){
@@ -2305,22 +2176,9 @@ w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
return ret;
}
-static nkf_char
-w_iconv_nocombine(nkf_char c1, nkf_char c2, nkf_char c3)
-{
- /* continue from the line below 'return -3;' in w_iconv() */
- nkf_char ret = w2e_conv(c1, c2, c3, &c1, &c2);
- if (ret == 0){
- (*oconv)(c1, c2);
- }
- return ret;
-}
-
#define NKF_ICONV_INVALID_CODE_RANGE -13
-#define NKF_ICONV_WAIT_COMBINING_CHAR -14
-#define NKF_ICONV_NOT_COMBINED -15
static size_t
-unicode_iconv(nkf_char wc, int nocombine)
+unicode_iconv(nkf_char wc)
{
nkf_char c1, c2;
int ret = 0;
@@ -2332,8 +2190,6 @@ unicode_iconv(nkf_char wc, int nocombine)
/* unpaired surrogate */
return NKF_ICONV_INVALID_CODE_RANGE;
}else if (wc < 0xFFFF) {
- if (!nocombine && x0213_f && x0213_wait_combining_p(wc))
- return NKF_ICONV_WAIT_COMBINING_CHAR;
ret = w16e_conv(wc, &c2, &c1);
if (ret) return ret;
}else if (wc < 0x10FFFF) {
@@ -2346,50 +2202,9 @@ unicode_iconv(nkf_char wc, int nocombine)
return 0;
}
-static nkf_char
-unicode_iconv_combine(nkf_char wc, nkf_char wc2)
-{
- nkf_char c1, c2;
- int i;
-
- if (wc2 < 0x80) {
- return NKF_ICONV_NOT_COMBINED;
- }else if ((wc2>>11) == 27) {
- /* unpaired surrogate */
- return NKF_ICONV_INVALID_CODE_RANGE;
- }else if (wc2 < 0xFFFF) {
- if (!x0213_combining_p(wc2))
- return NKF_ICONV_NOT_COMBINED;
- for (i = 0; i < sizeof_x0213_combining_table; i++) {
- if (x0213_combining_table[i][1] == wc &&
- x0213_combining_table[i][2] == wc2) {
- c2 = x0213_combining_table[i][0] >> 8;
- c1 = x0213_combining_table[i][0] & 0x7f;
- (*oconv)(c2, c1);
- return 0;
- }
- }
- }else if (wc2 < 0x10FFFF) {
- return NKF_ICONV_NOT_COMBINED;
- } else {
- return NKF_ICONV_INVALID_CODE_RANGE;
- }
- return NKF_ICONV_NOT_COMBINED;
-}
-
-static nkf_char
-w_iconv_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6)
-{
- nkf_char wc, wc2;
- wc = nkf_utf8_to_unicode(c1, c2, c3, 0);
- wc2 = nkf_utf8_to_unicode(c4, c5, c6, 0);
- if (wc2 < 0)
- return wc2;
- return unicode_iconv_combine(wc, wc2);
-}
-
#define NKF_ICONV_NEED_ONE_MORE_BYTE (size_t)-1
#define NKF_ICONV_NEED_TWO_MORE_BYTES (size_t)-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)
{
@@ -2418,63 +2233,33 @@ nkf_iconv_utf_16(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
}
}
- return (*unicode_iconv)(wc, FALSE);
-}
-
-static size_t
-nkf_iconv_utf_16_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
- nkf_char wc, wc2;
-
- if (input_endian == ENDIAN_BIG) {
- if (0xD8 <= c3 && c3 <= 0xDB) {
- return NKF_ICONV_NOT_COMBINED;
- } else {
- wc = c1 << 8 | c2;
- wc2 = c3 << 8 | c4;
- }
- } else {
- if (0xD8 <= c2 && c2 <= 0xDB) {
- return NKF_ICONV_NOT_COMBINED;
- } else {
- wc = c2 << 8 | c1;
- wc2 = c4 << 8 | c3;
- }
- }
-
- return unicode_iconv_combine(wc, wc2);
-}
-
-static size_t
-nkf_iconv_utf_16_nocombine(nkf_char c1, nkf_char c2)
-{
- nkf_char wc;
- if (input_endian == ENDIAN_BIG)
- wc = c1 << 8 | c2;
- else
- wc = c2 << 8 | c1;
- return (*unicode_iconv)(wc, TRUE);
+ return (*unicode_iconv)(wc);
}
static nkf_char
-w_iconv16(nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
+w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
{
(*oconv)(c2, c1);
return 16; /* different from w_iconv32 */
}
static nkf_char
-w_iconv32(nkf_char c2, nkf_char c1, ARG_UNUSED nkf_char c0)
+w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
{
(*oconv)(c2, c1);
return 32; /* different from w_iconv16 */
}
-static nkf_char
-utf32_to_nkf_char(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
+static size_t
+nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
{
nkf_char wc;
+ if (c1 == EOF) {
+ (*oconv)(EOF, 0);
+ return 0;
+ }
+
switch(input_endian){
case ENDIAN_BIG:
wc = c2 << 16 | c3 << 8 | c4;
@@ -2491,48 +2276,8 @@ utf32_to_nkf_char(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
default:
return NKF_ICONV_INVALID_CODE_RANGE;
}
- return wc;
-}
-
-static size_t
-nkf_iconv_utf_32(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
- nkf_char wc;
-
- if (c1 == EOF) {
- (*oconv)(EOF, 0);
- return 0;
- }
- wc = utf32_to_nkf_char(c1, c2, c3, c4);
- if (wc < 0)
- return wc;
-
- return (*unicode_iconv)(wc, FALSE);
-}
-
-static nkf_char
-nkf_iconv_utf_32_combine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4, nkf_char c5, nkf_char c6, nkf_char c7, nkf_char c8)
-{
- nkf_char wc, wc2;
-
- wc = utf32_to_nkf_char(c1, c2, c3, c4);
- if (wc < 0)
- return wc;
- wc2 = utf32_to_nkf_char(c5, c6, c7, c8);
- if (wc2 < 0)
- return wc2;
-
- return unicode_iconv_combine(wc, wc2);
-}
-
-static size_t
-nkf_iconv_utf_32_nocombine(nkf_char c1, nkf_char c2, nkf_char c3, nkf_char c4)
-{
- nkf_char wc;
-
- wc = utf32_to_nkf_char(c1, c2, c3, c4);
- return (*unicode_iconv)(wc, TRUE);
+ return (*unicode_iconv)(wc);
}
#endif
@@ -2787,19 +2532,11 @@ s_oconv(nkf_char c2, nkf_char c1)
}
#ifdef UTF8_OUTPUT_ENABLE
-#define OUTPUT_UTF8(val) do { \
- 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); \
- } while (0)
-
static void
w_oconv(nkf_char c2, nkf_char c1)
{
nkf_char c3, c4;
- nkf_char val, val2;
+ nkf_char val;
if (output_bom_f) {
output_bom_f = FALSE;
@@ -2815,7 +2552,11 @@ w_oconv(nkf_char c2, nkf_char c1)
if (c2 == 0 && nkf_char_unicode_p(c1)){
val = c1 & VALUE_MASK;
- OUTPUT_UTF8(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);
return;
}
@@ -2824,46 +2565,27 @@ w_oconv(nkf_char c2, nkf_char c1)
} else {
val = e2w_conv(c2, c1);
if (val){
- val2 = e2w_combining(val, c2, c1);
- if (val2)
- OUTPUT_UTF8(val2);
- OUTPUT_UTF8(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);
}
}
}
-#define OUTPUT_UTF16_BYTES(c1, c2) do { \
- if (output_endian == ENDIAN_LITTLE){ \
- (*o_putc)(c1); \
- (*o_putc)(c2); \
- }else{ \
- (*o_putc)(c2); \
- (*o_putc)(c1); \
- } \
- } while (0)
-
-#define OUTPUT_UTF16(val) do { \
- if (nkf_char_unicode_bmp_p(val)) { \
- c2 = (val >> 8) & 0xff; \
- c1 = val & 0xff; \
- OUTPUT_UTF16_BYTES(c1, c2); \
- } else { \
- val &= VALUE_MASK; \
- if (val <= UNICODE_MAX) { \
- c2 = (val >> 10) + NKF_INT32_C(0xD7C0); /* high surrogate */ \
- c1 = (val & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */ \
- OUTPUT_UTF16_BYTES(c2 & 0xff, (c2 >> 8) & 0xff); \
- OUTPUT_UTF16_BYTES(c1 & 0xff, (c1 >> 8) & 0xff); \
- } \
- } \
- } while (0)
-
static void
w_oconv16(nkf_char c2, nkf_char c1)
{
if (output_bom_f) {
output_bom_f = FALSE;
- OUTPUT_UTF16_BYTES(0xFF, 0xFE);
+ if (output_endian == ENDIAN_LITTLE){
+ (*o_putc)(0xFF);
+ (*o_putc)(0xFE);
+ }else{
+ (*o_putc)(0xFE);
+ (*o_putc)(0xFF);
+ }
}
if (c2 == EOF) {
@@ -2872,33 +2594,43 @@ w_oconv16(nkf_char c2, nkf_char c1)
}
if (c2 == 0 && nkf_char_unicode_p(c1)) {
- OUTPUT_UTF16(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);
+ }
+ }
+ return;
+ }
} else if (c2) {
- nkf_char val, val2;
- val = e2w_conv(c2, c1);
+ nkf_char val = e2w_conv(c2, c1);
+ c2 = (val >> 8) & 0xff;
+ c1 = val & 0xff;
if (!val) return;
- val2 = e2w_combining(val, c2, c1);
- if (val2)
- OUTPUT_UTF16(val2);
- OUTPUT_UTF16(val);
- } else {
- OUTPUT_UTF16_BYTES(c1, c2);
- }
-}
-
-#define OUTPUT_UTF32(c) do { \
- if (output_endian == ENDIAN_LITTLE){ \
- (*o_putc)( (c) & 0xFF); \
- (*o_putc)(((c) >> 8) & 0xFF); \
- (*o_putc)(((c) >> 16) & 0xFF); \
- (*o_putc)(0); \
- }else{ \
- (*o_putc)(0); \
- (*o_putc)(((c) >> 16) & 0xFF); \
- (*o_putc)(((c) >> 8) & 0xFF); \
- (*o_putc)( (c) & 0xFF); \
- } \
- } while (0)
+ }
+
+ 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)
@@ -2928,15 +2660,20 @@ w_oconv32(nkf_char c2, nkf_char c1)
} else if (c2 == 0 && nkf_char_unicode_p(c1)) {
c1 &= VALUE_MASK;
} else if (c2) {
- nkf_char val, val2;
- val = e2w_conv(c2, c1);
- if (!val) return;
- val2 = e2w_combining(val, c2, c1);
- if (val2)
- OUTPUT_UTF32(val2);
- c1 = val;
+ 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);
}
- OUTPUT_UTF32(c1);
}
#endif
@@ -2945,8 +2682,7 @@ w_oconv32(nkf_char c2, nkf_char c1)
#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_X0213 (SCORE_X0212 << 1) /* JIS X 0213 */
-#define SCORE_NO_EXIST (SCORE_X0213 << 1) /* Undefined Characters */
+#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 */
@@ -2956,35 +2692,14 @@ 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_X0213,
+ 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_X0213, SCORE_X0213,
+ SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST,
SCORE_DEPEND, SCORE_DEPEND, SCORE_CP932, SCORE_CP932,
- SCORE_CP932, SCORE_X0213, SCORE_X0213, SCORE_ERROR,
-};
-
-static const nkf_char score_table_8FA0[] = {
- 0, SCORE_X0213, SCORE_X0212, SCORE_X0213,
- SCORE_X0213, SCORE_X0213, SCORE_X0212, SCORE_X0212,
- SCORE_X0213, SCORE_X0212, SCORE_X0212, SCORE_X0212,
- SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
-};
-
-static const nkf_char score_table_8FE0[] = {
- SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
- SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
- SCORE_X0212, SCORE_X0212, SCORE_X0212, SCORE_X0212,
- SCORE_X0212, SCORE_X0212, SCORE_X0213, SCORE_X0213,
-};
-
-static const nkf_char score_table_8FF0[] = {
- SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0212,
- SCORE_X0212, SCORE_X0213, SCORE_X0213, SCORE_X0213,
- SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
- SCORE_X0213, SCORE_X0213, SCORE_X0213, SCORE_X0213,
+ SCORE_CP932, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
};
static void
@@ -3007,21 +2722,15 @@ 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){
- if ((c1 & 0x70) == 0x20){
- set_code_score(ptr, score_table_8FA0[c1 & 0x0f]);
- }else if ((c1 & 0x70) == 0x60){
- set_code_score(ptr, score_table_8FE0[c1 & 0x0f]);
- }else if ((c1 & 0x70) == 0x70){
- set_code_score(ptr, score_table_8FF0[c1 & 0x0f]);
- }else{
- set_code_score(ptr, SCORE_X0212);
- }
+ set_code_score(ptr, SCORE_X0212);
#ifdef UTF8_OUTPUT_ENABLE
}else if (!e2w_conv(c2, c1)){
set_code_score(ptr, SCORE_NO_EXIST);
@@ -3337,7 +3046,7 @@ std_getc(FILE *f)
#endif /*WIN32DLL*/
static nkf_char
-std_ungetc(nkf_char c, ARG_UNUSED FILE *f)
+std_ungetc(nkf_char c, FILE *f)
{
nkf_buf_push(nkf_state->std_gc_buf, c);
return c;
@@ -3368,7 +3077,6 @@ h_conv(FILE *f, nkf_char c1, nkf_char c2)
{
int ret;
int hold_index;
- int fromhold_count;
nkf_char c3, c4;
/** it must NOT be in the kanji shifte sequence */
@@ -3430,10 +3138,8 @@ h_conv(FILE *f, nkf_char c1, nkf_char c2)
(*iconv)(JIS_X_0201_1976_K, c1, 0);
continue;
}
- fromhold_count = 1;
if (hold_index < hold_count){
c2 = hold_buf[hold_index++];
- fromhold_count++;
}else{
c2 = (*i_getc)(f);
if (c2 == EOF){
@@ -3462,105 +3168,17 @@ h_conv(FILE *f, nkf_char c1, nkf_char c2)
code_status(c4);
(*iconv)(c1, c2, (c3<<8)|c4);
break;
- case -3:
- /* 4 bytes UTF-8 (check combining character) */
- if (hold_index < hold_count){
- c3 = hold_buf[hold_index++];
- fromhold_count++;
- } else if ((c3 = (*i_getc)(f)) == EOF) {
- w_iconv_nocombine(c1, c2, 0);
- break;
- }
- if (hold_index < hold_count){
- c4 = hold_buf[hold_index++];
- fromhold_count++;
- } else if ((c4 = (*i_getc)(f)) == EOF) {
- w_iconv_nocombine(c1, c2, 0);
- if (fromhold_count <= 2)
- (*i_ungetc)(c3,f);
- else
- hold_index--;
- continue;
- }
- if (w_iconv_combine(c1, c2, 0, c3, c4, 0)) {
- w_iconv_nocombine(c1, c2, 0);
- if (fromhold_count <= 2) {
- (*i_ungetc)(c4,f);
- (*i_ungetc)(c3,f);
- } else if (fromhold_count == 3) {
- (*i_ungetc)(c4,f);
- hold_index--;
- } else {
- hold_index -= 2;
- }
- }
- break;
case -1:
/* 3 bytes EUC or UTF-8 */
if (hold_index < hold_count){
c3 = hold_buf[hold_index++];
- fromhold_count++;
} else if ((c3 = (*i_getc)(f)) == EOF) {
ret = EOF;
break;
} else {
code_status(c3);
}
- if ((*iconv)(c1, c2, c3) == -3) {
- /* 6 bytes UTF-8 (check combining character) */
- nkf_char c5, c6;
- if (hold_index < hold_count){
- c4 = hold_buf[hold_index++];
- fromhold_count++;
- } else if ((c4 = (*i_getc)(f)) == EOF) {
- w_iconv_nocombine(c1, c2, c3);
- continue;
- }
- if (hold_index < hold_count){
- c5 = hold_buf[hold_index++];
- fromhold_count++;
- } else if ((c5 = (*i_getc)(f)) == EOF) {
- w_iconv_nocombine(c1, c2, c3);
- if (fromhold_count == 4)
- hold_index--;
- else
- (*i_ungetc)(c4,f);
- continue;
- }
- if (hold_index < hold_count){
- c6 = hold_buf[hold_index++];
- fromhold_count++;
- } else if ((c6 = (*i_getc)(f)) == EOF) {
- w_iconv_nocombine(c1, c2, c3);
- if (fromhold_count == 5) {
- hold_index -= 2;
- } else if (fromhold_count == 4) {
- hold_index--;
- (*i_ungetc)(c5,f);
- } else {
- (*i_ungetc)(c5,f);
- (*i_ungetc)(c4,f);
- }
- continue;
- }
- if (w_iconv_combine(c1, c2, c3, c4, c5, c6)) {
- w_iconv_nocombine(c1, c2, c3);
- if (fromhold_count == 6) {
- hold_index -= 3;
- } else if (fromhold_count == 5) {
- hold_index -= 2;
- (*i_ungetc)(c6,f);
- } else if (fromhold_count == 4) {
- hold_index--;
- (*i_ungetc)(c6,f);
- (*i_ungetc)(c5,f);
- } else {
- (*i_ungetc)(c6,f);
- (*i_ungetc)(c5,f);
- (*i_ungetc)(c4,f);
- }
- }
- }
+ (*iconv)(c1, c2, c3);
break;
}
if (c3 == EOF) break;
@@ -3584,7 +3202,6 @@ check_bom(FILE *f)
set_iconv(TRUE, w_iconv32);
}
if (iconv == w_iconv32) {
- input_bom_f = TRUE;
input_endian = ENDIAN_BIG;
return;
}
@@ -3615,7 +3232,6 @@ check_bom(FILE *f)
set_iconv(TRUE, w_iconv);
}
if (iconv == w_iconv) {
- input_bom_f = TRUE;
return;
}
(*i_ungetc)(0xBF,f);
@@ -3644,7 +3260,6 @@ check_bom(FILE *f)
}
if (iconv == w_iconv16) {
input_endian = ENDIAN_BIG;
- input_bom_f = TRUE;
return;
}
(*i_ungetc)(0xFF,f);
@@ -3660,7 +3275,6 @@ check_bom(FILE *f)
}
if (iconv == w_iconv32) {
input_endian = ENDIAN_LITTLE;
- input_bom_f = TRUE;
return;
}
(*i_ungetc)(0x00,f);
@@ -3672,7 +3286,6 @@ check_bom(FILE *f)
}
if (iconv == w_iconv16) {
input_endian = ENDIAN_LITTLE;
- input_bom_f = TRUE;
return;
}
(*i_ungetc)(0xFE,f);
@@ -3725,7 +3338,7 @@ broken_getc(FILE *f)
}
static nkf_char
-broken_ungetc(nkf_char c, ARG_UNUSED FILE *f)
+broken_ungetc(nkf_char c, FILE *f)
{
if (nkf_buf_length(nkf_state->broken_buf) < 2)
nkf_buf_push(nkf_state->broken_buf, c);
@@ -3881,7 +3494,7 @@ fold_conv(nkf_char c2, nkf_char c1)
f_prev = c1;
if (c2 || c2 == JIS_X_0201_1976_K)
f_prev |= 0x80; /* this is Japanese */
- f_line += c2 == JIS_X_0201_1976_K ? 1: char_size(c2,c1);
+ f_line += char_size(c2,c1);
if (f_line<=fold_len) { /* normal case */
fold_state = 1;
} else {
@@ -4000,17 +3613,13 @@ z_conv(nkf_char c2, nkf_char c1)
z_prev2 = 0;
(*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]);
return;
- } else if (x0213_f && c1 == (0xdf&0x7f) && ev_x0213[(z_prev1-SP)*2]) { /* $BH>ByE@(B */
- z_prev2 = 0;
- (*o_zconv)(ev_x0213[(z_prev1-SP)*2], ev_x0213[(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] || (x0213_f && ev_x0213[(c1-SP)*2])) {
+ if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) {
/* wait for $BByE@(B or $BH>ByE@(B */
z_prev1 = c1;
z_prev2 = c2;
@@ -4118,8 +3727,8 @@ z_conv(nkf_char c2, nkf_char c1)
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, 0x365F,
- 0x375F, 0x385F, 0x395F, 0x3A5F, 0x3E5F, 0x425F, 0x445F, 0x0000
+ 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];
@@ -4129,10 +3738,6 @@ z_conv(nkf_char c2, nkf_char c1)
}
return;
}
- } else if (c2 == 0 && nkf_char_unicode_p(c1) &&
- ((c1&VALUE_MASK) == 0x3099 || (c1&VALUE_MASK) == 0x309A)) { /* $B9g@.MQByE@!&H>ByE@(B */
- (*o_zconv)(JIS_X_0201_1976_K, 0x5E + (c1&VALUE_MASK) - 0x3099);
- return;
}
}
(*o_zconv)(c2,c1);
@@ -4273,7 +3878,7 @@ static const unsigned char *mime_pattern[] = {
/* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
- e_iconv, s_iconv, 0, 0, 0, 0, 0,
+ e_iconv, s_iconv, 0, 0, 0, 0,
#if defined(UTF8_INPUT_ENABLE)
w_iconv, w_iconv,
#endif
@@ -4321,7 +3926,7 @@ mime_input_buf_unshift(nkf_char c)
}
static nkf_char
-mime_ungetc(nkf_char c, ARG_UNUSED FILE *f)
+mime_ungetc(nkf_char c, FILE *f)
{
mime_input_buf_unshift(c);
return c;
@@ -4466,7 +4071,7 @@ mime_begin_strict(FILE *f)
static nkf_char
mime_begin(FILE *f)
{
- nkf_char c1 = 0;
+ nkf_char c1;
int i,k;
/* In NONSTRICT mode, only =? is checked. In case of failure, we */
@@ -4522,7 +4127,7 @@ mime_begin(FILE *f)
#ifdef CHECK_OPTION
static void
-no_putc(ARG_UNUSED nkf_char c)
+no_putc(nkf_char c)
{
;
}
@@ -4559,9 +4164,7 @@ get_guessed_code(void)
if (p->score & (SCORE_DEPEND|SCORE_CP932))
input_codename = "CP932";
} else if (strcmp(input_codename, "EUC-JP") == 0) {
- if (p->score & SCORE_X0213)
- input_codename = "EUC-JIS-2004";
- else if (p->score & (SCORE_X0212))
+ if (p->score & (SCORE_X0212))
input_codename = "EUCJP-MS";
else if (p->score & (SCORE_DEPEND|SCORE_CP932))
input_codename = "CP51932";
@@ -4587,13 +4190,8 @@ print_guessed_code(char *filename)
if (guess_f == 1) {
printf("%s\n", input_codename);
} else {
- printf("%s%s%s%s\n",
+ printf("%s%s\n",
input_codename,
- iconv != w_iconv16 && iconv != w_iconv32 ? "" :
- input_endian == ENDIAN_LITTLE ? " LE" :
- input_endian == ENDIAN_BIG ? " BE" :
- "[BUG]",
- input_bom_f ? " (BOM)" : "",
input_eol == CR ? " (CR)" :
input_eol == LF ? " (LF)" :
input_eol == CRLF ? " (CRLF)" :
@@ -4661,7 +4259,7 @@ numchar_getc(FILE *f)
nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
int i = 0, j;
nkf_char buf[12];
- nkf_char c = -1;
+ long c = -1;
buf[i] = (*g)(f);
if (buf[i] == '&'){
@@ -5037,7 +4635,7 @@ static const char basis_64[] =
#define MIMEOUT_BUF_LENGTH 74
static struct {
- unsigned char buf[MIMEOUT_BUF_LENGTH+1];
+ char buf[MIMEOUT_BUF_LENGTH+1];
int count;
} mimeout_state;
@@ -5349,7 +4947,7 @@ mime_putc(nkf_char c)
i = 0;
for (; i < mimeout_state.count - len; ++i) {
- if (!strncmp((char *)(mimeout_state.buf+i), str, len)) {
+ if (!strncmp(mimeout_state.buf+i, str, len)) {
i += len - 2;
break;
}
@@ -5858,45 +5456,17 @@ kanji_convert(FILE *f)
(c2 = (*i_getc)(f)) != EOF &&
(c3 = (*i_getc)(f)) != EOF &&
(c4 = (*i_getc)(f)) != EOF) {
- nkf_char c5, c6, c7, c8;
- if (nkf_iconv_utf_32(c1, c2, c3, c4) == (size_t)NKF_ICONV_WAIT_COMBINING_CHAR) {
- if ((c5 = (*i_getc)(f)) != EOF &&
- (c6 = (*i_getc)(f)) != EOF &&
- (c7 = (*i_getc)(f)) != EOF &&
- (c8 = (*i_getc)(f)) != EOF) {
- if (nkf_iconv_utf_32_combine(c1, c2, c3, c4, c5, c6, c7, c8)) {
- (*i_ungetc)(c8, f);
- (*i_ungetc)(c7, f);
- (*i_ungetc)(c6, f);
- (*i_ungetc)(c5, f);
- nkf_iconv_utf_32_nocombine(c1, c2, c3, c4);
- }
- } else {
- nkf_iconv_utf_32_nocombine(c1, c2, c3, c4);
- }
- }
+ nkf_iconv_utf_32(c1, c2, c3, c4);
}
goto finished;
}
else if (iconv == w_iconv16) {
while ((c1 = (*i_getc)(f)) != EOF &&
(c2 = (*i_getc)(f)) != EOF) {
- size_t ret = nkf_iconv_utf_16(c1, c2, 0, 0);
- if (ret == NKF_ICONV_NEED_TWO_MORE_BYTES &&
+ if (nkf_iconv_utf_16(c1, c2, 0, 0) == NKF_ICONV_NEED_TWO_MORE_BYTES &&
(c3 = (*i_getc)(f)) != EOF &&
(c4 = (*i_getc)(f)) != EOF) {
nkf_iconv_utf_16(c1, c2, c3, c4);
- } else if (ret == (size_t)NKF_ICONV_WAIT_COMBINING_CHAR) {
- if ((c3 = (*i_getc)(f)) != EOF &&
- (c4 = (*i_getc)(f)) != EOF) {
- if (nkf_iconv_utf_16_combine(c1, c2, c3, c4)) {
- (*i_ungetc)(c4, f);
- (*i_ungetc)(c3, f);
- nkf_iconv_utf_16_nocombine(c1, c2);
- }
- } else {
- nkf_iconv_utf_16_nocombine(c1, c2);
- }
}
}
goto finished;
@@ -5910,7 +5480,7 @@ kanji_convert(FILE *f)
code_status(c1);
if (c2) {
/* second byte */
- if (c2 > ((input_encoding && nkf_enc_cp5022x_p(input_encoding)) ? 0x92 : DEL)) {
+ if (c2 > DEL) {
/* in case of 8th bit is on */
if (!estab_f&&!mime_decode_mode) {
/* in case of not established yet */
@@ -6102,7 +5672,6 @@ kanji_convert(FILE *f)
else if (c1 == 'I') {
/* JIS X 0201 Katakana */
set_input_mode(JIS_X_0201_1976_K);
- shift_mode = 1;
SKIP;
}
else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
@@ -6244,52 +5813,11 @@ kanji_convert(FILE *f)
}
}
break;
- case -3:
- /* 4 bytes UTF-8 (check combining character) */
- if ((c3 = (*i_getc)(f)) != EOF) {
- if ((c4 = (*i_getc)(f)) != EOF) {
- if (w_iconv_combine(c2, c1, 0, c3, c4, 0)) {
- (*i_ungetc)(c4, f);
- (*i_ungetc)(c3, f);
- w_iconv_nocombine(c2, c1, 0);
- }
- } else {
- (*i_ungetc)(c3, f);
- w_iconv_nocombine(c2, c1, 0);
- }
- } else {
- w_iconv_nocombine(c2, c1, 0);
- }
- break;
case -1:
/* 3 bytes EUC or UTF-8 */
if ((c3 = (*i_getc)(f)) != EOF) {
code_status(c3);
- if ((*iconv)(c2, c1, c3) == -3) {
- /* 6 bytes UTF-8 (check combining character) */
- nkf_char c5, c6;
- if ((c4 = (*i_getc)(f)) != EOF) {
- if ((c5 = (*i_getc)(f)) != EOF) {
- if ((c6 = (*i_getc)(f)) != EOF) {
- if (w_iconv_combine(c2, c1, c3, c4, c5, c6)) {
- (*i_ungetc)(c6, f);
- (*i_ungetc)(c5, f);
- (*i_ungetc)(c4, f);
- w_iconv_nocombine(c2, c1, c3);
- }
- } else {
- (*i_ungetc)(c5, f);
- (*i_ungetc)(c4, f);
- w_iconv_nocombine(c2, c1, c3);
- }
- } else {
- (*i_ungetc)(c4, f);
- w_iconv_nocombine(c2, c1, c3);
- }
- } else {
- w_iconv_nocombine(c2, c1, c3);
- }
- }
+ (*iconv)(c2, c1, c3);
}
break;
}
@@ -6346,7 +5874,7 @@ finished:
/*
* int options(unsigned char *cp)
- *
+ *
* return values:
* 0: success
* -1: ArgumentError
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
index c174c9ac51..dd479a0f87 100644
--- a/ext/nkf/nkf-utf8/nkf.h
+++ b/ext/nkf/nkf-utf8/nkf.h
@@ -1,12 +1,11 @@
/*
*
* nkf.h - Header file for nkf
- *
+ *
* $Id$
*/
#ifndef NKF_H
-#define NKF_H
/* Wrapper of configurations */
@@ -18,9 +17,21 @@
#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
@@ -83,7 +94,7 @@ void setbinmode(FILE *fp)
#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
#endif
#else /* UNIX */
-#define setbinmode(fp) (void)(fp)
+#define setbinmode(fp)
#endif
#ifdef _IOFBF /* SysV and MSDOS, Windows */
@@ -174,14 +185,6 @@ void setbinmode(FILE *fp)
#define FALSE 0
#define TRUE 1
-#ifndef ARG_UNUSED
-#if defined(__GNUC__)
-# define ARG_UNUSED __attribute__ ((unused))
-#else
-# define ARG_UNUSED
-#endif
-#endif
-
#ifdef WIN32DLL
#include "nkf32.h"
#endif
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index bbf5c5f109..10eec60c5d 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -68,20 +68,6 @@ 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_A2_x0213[] = {
- 0x25C6, 0x25A1, 0x25A0, 0x25B3, 0x25B2, 0x25BD, 0x25BC,
- 0x203B, 0x3012, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, 0xFF07,
- 0xFF02, 0xFF0D, 0xFF5E, 0x3033, 0x3034, 0x3035, 0x303B, 0x303C,
- 0x30FF, 0x309F, 0x2208, 0x220B, 0x2286, 0x2287, 0x2282, 0x2283,
- 0x222A, 0x2229, 0x2284, 0x2285, 0x228A, 0x228B, 0x2209, 0x2205,
- 0x2305, 0x2306, 0x2227, 0x2228, 0x00AC, 0x21D2, 0x21D4, 0x2200,
- 0x2203, 0x2295, 0x2296, 0x2297, 0x2225, 0x2226, 0xFF5F, 0xFF60,
- 0x3018, 0x3019, 0x3016, 0x3017, 0x2220, 0x22A5, 0x2312, 0x2202,
- 0x2207, 0x2261, 0x2252, 0x226A, 0x226B, 0x221A, 0x223D, 0x221D,
- 0x2235, 0x222B, 0x222C, 0x2262, 0x2243, 0x2245, 0x2248, 0x2276,
- 0x2277, 0x2194, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
- 0x2021, 0x00B6, 0x266E, 0x266B, 0x266C, 0x2669, 0x25EF,
-};
static const unsigned short euc_to_utf8_A3[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -96,20 +82,6 @@ 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_A3_x0213[] = {
- 0x25B7, 0x25B6, 0x25C1, 0x25C0, 0x2197, 0x2198, 0x2196,
- 0x2199, 0x21C4, 0x21E8, 0x21E6, 0x21E7, 0x21E9, 0x2934, 0x2935,
- 0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17,
- 0xFF18, 0xFF19, 0x29BF, 0x25C9, 0x303D, 0xFE46, 0xFE45, 0x25E6,
- 0x2022, 0xFF21, 0xFF22, 0xFF23, 0xFF24, 0xFF25, 0xFF26, 0xFF27,
- 0xFF28, 0xFF29, 0xFF2A, 0xFF2B, 0xFF2C, 0xFF2D, 0xFF2E, 0xFF2F,
- 0xFF30, 0xFF31, 0xFF32, 0xFF33, 0xFF34, 0xFF35, 0xFF36, 0xFF37,
- 0xFF38, 0xFF39, 0xFF3A, 0x2213, 0x2135, 0x210F, 0x33CB, 0x2113,
- 0x2127, 0xFF41, 0xFF42, 0xFF43, 0xFF44, 0xFF45, 0xFF46, 0xFF47,
- 0xFF48, 0xFF49, 0xFF4A, 0xFF4B, 0xFF4C, 0xFF4D, 0xFF4E, 0xFF4F,
- 0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
- 0xFF58, 0xFF59, 0xFF5A, 0x30A0, 0x2013, 0x29FA, 0x29FB,
-};
static const unsigned short euc_to_utf8_A4[] = {
0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
@@ -124,20 +96,6 @@ 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_A4_x0213[] = {
- 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047,
- 0x3048, 0x3049, 0x304A, 0x304B, 0x304C, 0x304D, 0x304E, 0x304F,
- 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057,
- 0x3058, 0x3059, 0x305A, 0x305B, 0x305C, 0x305D, 0x305E, 0x305F,
- 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067,
- 0x3068, 0x3069, 0x306A, 0x306B, 0x306C, 0x306D, 0x306E, 0x306F,
- 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077,
- 0x3078, 0x3079, 0x307A, 0x307B, 0x307C, 0x307D, 0x307E, 0x307F,
- 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087,
- 0x3088, 0x3089, 0x308A, 0x308B, 0x308C, 0x308D, 0x308E, 0x308F,
- 0x3090, 0x3091, 0x3092, 0x3093, 0x3094, 0x3095, 0x3096, /*0x304B*/ 0x309A,
- /*0x304D*/ 0x309A, /*0x304F*/ 0x309A, /*0x3051*/ 0x309A, /*0x3053*/ 0x309A, 0, 0, 0,
-};
static const unsigned short euc_to_utf8_A5[] = {
0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
@@ -152,20 +110,6 @@ 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_A5_x0213[] = {
- 0x30A1, 0x30A2, 0x30A3, 0x30A4, 0x30A5, 0x30A6, 0x30A7,
- 0x30A8, 0x30A9, 0x30AA, 0x30AB, 0x30AC, 0x30AD, 0x30AE, 0x30AF,
- 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, 0x30B7,
- 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, 0x30BF,
- 0x30C0, 0x30C1, 0x30C2, 0x30C3, 0x30C4, 0x30C5, 0x30C6, 0x30C7,
- 0x30C8, 0x30C9, 0x30CA, 0x30CB, 0x30CC, 0x30CD, 0x30CE, 0x30CF,
- 0x30D0, 0x30D1, 0x30D2, 0x30D3, 0x30D4, 0x30D5, 0x30D6, 0x30D7,
- 0x30D8, 0x30D9, 0x30DA, 0x30DB, 0x30DC, 0x30DD, 0x30DE, 0x30DF,
- 0x30E0, 0x30E1, 0x30E2, 0x30E3, 0x30E4, 0x30E5, 0x30E6, 0x30E7,
- 0x30E8, 0x30E9, 0x30EA, 0x30EB, 0x30EC, 0x30ED, 0x30EE, 0x30EF,
- 0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6, /*0x30AB*/ 0x309A,
- /*0x30AD*/ 0x309A, /*0x30AF*/ 0x309A, /*0x30B1*/ 0x309A, /*0x30B3*/ 0x309A, /*0x30BB*/ 0x309A, /*0x30C4*/ 0x309A, /*0x30C8*/ 0x309A,
-};
static const unsigned short euc_to_utf8_A6[] = {
0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
@@ -180,20 +124,6 @@ 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_A6_x0213[] = {
- 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
- 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
- 0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8,
- 0x03A9, 0x2664, 0x2660, 0x2662, 0x2666, 0x2661, 0x2665, 0x2667,
- 0x2663, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
- 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
- 0x03C0, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8,
- 0x03C9, 0x03C2, 0x24F5, 0x24F6, 0x24F7, 0x24F8, 0x24F9, 0x24FA,
- 0x24FB, 0x24FC, 0x24FD, 0x24FE, 0x2616, 0x2617, 0x3020, 0x260E,
- 0x2600, 0x2601, 0x2602, 0x2603, 0x2668, 0x25B1, 0x31F0, 0x31F1,
- 0x31F2, 0x31F3, 0x31F4, 0x31F5, 0x31F6, 0x31F7, 0x31F8, 0x31F9,
- /*0x31F7*/ 0x309A, 0x31FA, 0x31FB, 0x31FC, 0x31FD, 0x31FE, 0x31FF,
-};
static const unsigned short euc_to_utf8_A7[] = {
0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
@@ -208,20 +138,6 @@ 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_A7_x0213[] = {
- 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401,
- 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D,
- 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425,
- 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D,
- 0x042E, 0x042F, 0x23BE, 0x23BF, 0x23C0, 0x23C1, 0x23C2, 0x23C3,
- 0x23C4, 0x23C5, 0x23C6, 0x23C7, 0x23C8, 0x23C9, 0x23CA, 0x23CB,
- 0x23CC, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451,
- 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D,
- 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445,
- 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D,
- 0x044E, 0x044F, 0x30F7, 0x30F8, 0x30F9, 0x30FA, 0x22DA, 0x22DB,
- 0x2153, 0x2154, 0x2155, 0x2713, 0x2318, 0x2423, 0x23CE,
-};
static const unsigned short euc_to_utf8_A8[] = {
0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
@@ -236,20 +152,6 @@ 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_A8_x0213[] = {
- 0x2500, 0x2502, 0x250C, 0x2510, 0x2518, 0x2514, 0x251C,
- 0x252C, 0x2524, 0x2534, 0x253C, 0x2501, 0x2503, 0x250F, 0x2513,
- 0x251B, 0x2517, 0x2523, 0x2533, 0x252B, 0x253B, 0x254B, 0x2520,
- 0x252F, 0x2528, 0x2537, 0x253F, 0x251D, 0x2530, 0x2525, 0x2538,
- 0x2542, 0x3251, 0x3252, 0x3253, 0x3254, 0x3255, 0x3256, 0x3257,
- 0x3258, 0x3259, 0x325A, 0x325B, 0x325C, 0x325D, 0x325E, 0x325F,
- 0x32B1, 0x32B2, 0x32B3, 0x32B4, 0x32B5, 0x32B6, 0x32B7, 0x32B8,
- 0x32B9, 0x32BA, 0x32BB, 0x32BC, 0x32BD, 0x32BE, 0x32BF, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x25D0,
- 0x25D1, 0x25D2, 0x25D3, 0x203C, 0x2047, 0x2048, 0x2049, 0x01CD,
- 0x01CE, 0x01D0, 0x1E3E, 0x1E3F, 0x01F8, 0x01F9, 0x01D1, 0x01D2,
- 0x01D4, 0x01D6, 0x01D8, 0x01DA, 0x01DC, 0, 0,
-};
static const unsigned short euc_to_utf8_A9[] = {
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
@@ -264,20 +166,6 @@ 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_A9_x0213[] = {
- 0x20AC, 0x00A0, 0x00A1, 0x00A4, 0x00A6, 0x00A9, 0x00AA,
- 0x00AB, 0x00AD, 0x00AE, 0x00AF, 0x00B2, 0x00B3, 0x00B7, 0x00B8,
- 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0,
- 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8,
- 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x00D0,
- 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D8, 0x00D9,
- 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1,
- 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9,
- 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x00F1,
- 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F8, 0x00F9, 0x00FA,
- 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, 0x0100, 0x012A, 0x016A,
- 0x0112, 0x014C, 0x0101, 0x012B, 0x016B, 0x0113, 0x014D,
-};
static const unsigned short euc_to_utf8_AA[] = {
0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166,
0x2167, 0x2168, 0x2169, 0x216A, 0x216B, 0, 0, 0,
@@ -292,20 +180,6 @@ 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_AA_x0213[] = {
- 0x0104, 0x02D8, 0x0141, 0x013D, 0x015A, 0x0160, 0x015E,
- 0x0164, 0x0179, 0x017D, 0x017B, 0x0105, 0x02DB, 0x0142, 0x013E,
- 0x015B, 0x02C7, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E,
- 0x017C, 0x0154, 0x0102, 0x0139, 0x0106, 0x010C, 0x0118, 0x011A,
- 0x010E, 0x0143, 0x0147, 0x0150, 0x0158, 0x016E, 0x0170, 0x0162,
- 0x0155, 0x0103, 0x013A, 0x0107, 0x010D, 0x0119, 0x011B, 0x010F,
- 0x0111, 0x0144, 0x0148, 0x0151, 0x0159, 0x016F, 0x0171, 0x0163,
- 0x02D9, 0x0108, 0x011C, 0x0124, 0x0134, 0x015C, 0x016C, 0x0109,
- 0x011D, 0x0125, 0x0135, 0x015D, 0x016D, 0x0271, 0x028B, 0x027E,
- 0x0283, 0x0292, 0x026C, 0x026E, 0x0279, 0x0288, 0x0256, 0x0273,
- 0x027D, 0x0282, 0x0290, 0x027B, 0x026D, 0x025F, 0x0272, 0x029D,
- 0x028E, 0x0261, 0x014B, 0x0270, 0x0281, 0x0127, 0x0295,
-};
static const unsigned short euc_to_utf8_AB[] = {
0x339C, 0x339F, 0x339D, 0x33A0, 0x33A4, 0, 0x33A1,
0x33A5, 0x339E, 0x33A2, 0x338E, 0, 0x338F, 0x33C4, 0x3396,
@@ -320,20 +194,6 @@ 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_AB_x0213[] = {
- 0x0294, 0x0266, 0x0298, 0x01C2, 0x0253, 0x0257, 0x0284,
- 0x0260, 0x0193, 0x0153, 0x0152, 0x0268, 0x0289, 0x0258, 0x0275,
- 0x0259, 0x025C, 0x025E, 0x0250, 0x026F, 0x028A, 0x0264, 0x028C,
- 0x0254, 0x0251, 0x0252, 0x028D, 0x0265, 0x02A2, 0x02A1, 0x0255,
- 0x0291, 0x027A, 0x0267, 0x025A, /*0x00E6*/ 0x0300, 0x01FD, 0x1F70, 0x1F71,
- /*0x0254*/ 0x0300, /*0x0254*/ 0x0301, /*0x028C*/ 0x0300, /*0x028C*/ 0x0301, /*0x0259*/ 0x0300, /*0x0259*/ 0x0301, /*0x025A*/ 0x0300, /*0x025A*/ 0x0301,
- 0x1F72, 0x1F73, 0x0361, 0x02C8, 0x02CC, 0x02D0, 0x02D1, 0x0306,
- 0x203F, 0x030B, /*0*/ 0x0301, 0x0304, /*0*/ 0x0300, 0x030F, 0x030C, 0x0302,
- /*0*/ 0x02E5, 0x02E6, 0x02E7, 0x02E8, /*0*/ 0x02E9, /*0x02E9*/ 0x02E5, /*0x02E5*/ 0x02E9, 0x0325,
- 0x032C, 0x0339, 0x031C, 0x031F, 0x0320, 0x0308, 0x033D, 0x0329,
- 0x032F, 0x02DE, 0x0324, 0x0330, 0x033C, 0x0334, 0x031D, 0x031E,
- 0x0318, 0x0319, 0x032A, 0x033A, 0x033B, 0x0303, 0x031A,
-};
static const unsigned short euc_to_utf8_AC[] = {
0x2664, 0x2667, 0x2661, 0x2662, 0x2660, 0x2663, 0x2665,
0x2666, 0, 0, 0, 0, 0, 0, 0,
@@ -362,20 +222,6 @@ static const unsigned short euc_to_utf8_AC_mac[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short euc_to_utf8_AC_x0213[] = {
- 0x2776, 0x2777, 0x2778, 0x2779, 0x277A, 0x277B, 0x277C,
- 0x277D, 0x277E, 0x277F, 0x24EB, 0x24EC, 0x24ED, 0x24EE, 0x24EF,
- 0x24F0, 0x24F1, 0x24F2, 0x24F3, 0x24F4, 0x2170, 0x2171, 0x2172,
- 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217A,
- 0x217B, 0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4, 0x24D5, 0x24D6,
- 0x24D7, 0x24D8, 0x24D9, 0x24DA, 0x24DB, 0x24DC, 0x24DD, 0x24DE,
- 0x24DF, 0x24E0, 0x24E1, 0x24E2, 0x24E3, 0x24E4, 0x24E5, 0x24E6,
- 0x24E7, 0x24E8, 0x24E9, 0x32D0, 0x32D1, 0x32D2, 0x32D3, 0x32D4,
- 0x32D5, 0x32D6, 0x32D7, 0x32D8, 0x32D9, 0x32DA, 0x32DB, 0x32DC,
- 0x32DD, 0x32DE, 0x32DF, 0x32E0, 0x32E1, 0x32E2, 0x32E3, 0x32FA,
- 0x32E9, 0x32E5, 0x32ED, 0x32EC, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x2051, 0x2042,
-};
static const unsigned short euc_to_utf8_AD[] = {
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
@@ -404,20 +250,6 @@ static const unsigned short euc_to_utf8_AD_mac[] = {
0x2252, 0x5927, 0x5C0F, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
0x533B, 0x8CA1, 0x512A, 0x52B4, 0x5370, 0x63A7, 0x79D8,
};
-static const unsigned short euc_to_utf8_AD_x0213[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466,
- 0x2467, 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E,
- 0x246F, 0x2470, 0x2471, 0x2472, 0x2473, 0x2160, 0x2161, 0x2162,
- 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168, 0x2169, 0x216A,
- 0x3349, 0x3314, 0x3322, 0x334D, 0x3318, 0x3327, 0x3303, 0x3336,
- 0x3351, 0x3357, 0x330D, 0x3326, 0x3323, 0x332B, 0x334A, 0x333B,
- 0x339C, 0x339D, 0x339E, 0x338E, 0x338F, 0x33C4, 0x33A1, 0x216B,
- 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, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
- 0x221F, 0x22BF, 0x2235, 0x2229, 0x222A, 0x2756, 0x261E,
-};
static const unsigned short euc_to_utf8_AE[] = {
0x3349, 0x3322, 0x334D, 0x3314, 0x3316, 0x3305, 0x3333,
0x334E, 0x3303, 0x3336, 0x3318, 0x3315, 0x3327, 0x3351, 0x334A,
@@ -432,20 +264,6 @@ 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_AE_x0213[] = {
- 0x4FF1, 0xD840 /*0xDC0B*/, 0x3402, 0x4E28, 0x4E2F, 0x4E30, 0x4E8D,
- 0x4EE1, 0x4EFD, 0x4EFF, 0x4F03, 0x4F0B, 0x4F60, 0x4F48, 0x4F49,
- 0x4F56, 0x4F5F, 0x4F6A, 0x4F6C, 0x4F7E, 0x4F8A, 0x4F94, 0x4F97,
- 0xFA30, 0x4FC9, 0x4FE0, 0x5001, 0x5002, 0x500E, 0x5018, 0x5027,
- 0x502E, 0x5040, 0x503B, 0x5041, 0x5094, 0x50CC, 0x50F2, 0x50D0,
- 0x50E6, 0xFA31, 0x5106, 0x5103, 0x510B, 0x511E, 0x5135, 0x514A,
- 0xFA32, 0x5155, 0x5157, 0x34B5, 0x519D, 0x51C3, 0x51CA, 0x51DE,
- 0x51E2, 0x51EE, 0x5201, 0x34DB, 0x5213, 0x5215, 0x5249, 0x5257,
- 0x5261, 0x5293, 0x52C8, 0xFA33, 0x52CC, 0x52D0, 0x52D6, 0x52DB,
- 0xFA34, 0x52F0, 0x52FB, 0x5300, 0x5307, 0x531C, 0xFA35, 0x5361,
- 0x5363, 0x537D, 0x5393, 0x539D, 0x53B2, 0x5412, 0x5427, 0x544D,
- 0x549C, 0x546B, 0x5474, 0x547F, 0x5488, 0x5496, 0x54A1,
-};
static const unsigned short euc_to_utf8_AF[] = {
0x222E, 0x221F, 0x22BF, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -460,20 +278,6 @@ 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_AF_x0213[] = {
- 0x54A9, 0x54C6, 0x54FF, 0x550E, 0x552B, 0x5535, 0x5550,
- 0x555E, 0x5581, 0x5586, 0x558E, 0xFA36, 0x55AD, 0x55CE, 0xFA37,
- 0x5608, 0x560E, 0x563B, 0x5649, 0x5676, 0x5666, 0xFA38, 0x566F,
- 0x5671, 0x5672, 0x5699, 0x569E, 0x56A9, 0x56AC, 0x56B3, 0x56C9,
- 0x56CA, 0x570A, 0xD844 /*0xDE3D*/, 0x5721, 0x572F, 0x5733, 0x5734, 0x5770,
- 0x5777, 0x577C, 0x579C, 0xFA0F, 0xD844 /*0xDF1B*/, 0x57B8, 0x57C7, 0x57C8,
- 0x57CF, 0x57E4, 0x57ED, 0x57F5, 0x57F6, 0x57FF, 0x5809, 0xFA10,
- 0x5861, 0x5864, 0xFA39, 0x587C, 0x5889, 0x589E, 0xFA3A, 0x58A9,
- 0xD845 /*0xDC6E*/, 0x58D2, 0x58CE, 0x58D4, 0x58DA, 0x58E0, 0x58E9, 0x590C,
- 0x8641, 0x595D, 0x596D, 0x598B, 0x5992, 0x59A4, 0x59C3, 0x59D2,
- 0x59DD, 0x5A13, 0x5A23, 0x5A67, 0x5A6D, 0x5A77, 0x5A7E, 0x5A84,
- 0x5A9E, 0x5AA7, 0x5AC4, 0xD846 /*0xDCBD*/, 0x5B19, 0x5B25, 0x525D,
-};
static const unsigned short euc_to_utf8_B0[] = {
0x4E9C, 0x5516, 0x5A03, 0x963F, 0x54C0, 0x611B, 0x6328,
0x59F6, 0x9022, 0x8475, 0x831C, 0x7A50, 0x60AA, 0x63E1, 0x6E25,
@@ -922,20 +726,6 @@ 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_CF_x0213[] = {
- 0x84EE, 0x9023, 0x932C, 0x5442, 0x9B6F, 0x6AD3, 0x7089,
- 0x8CC2, 0x8DEF, 0x9732, 0x52B4, 0x5A41, 0x5ECA, 0x5F04, 0x6717,
- 0x697C, 0x6994, 0x6D6A, 0x6F0F, 0x7262, 0x72FC, 0x7BED, 0x8001,
- 0x807E, 0x874B, 0x90CE, 0x516D, 0x9E93, 0x7984, 0x808B, 0x9332,
- 0x8AD6, 0x502D, 0x548C, 0x8A71, 0x6B6A, 0x8CC4, 0x8107, 0x60D1,
- 0x67A0, 0x9DF2, 0x4E99, 0x4E98, 0x9C10, 0x8A6B, 0x85C1, 0x8568,
- 0x6900, 0x6E7E, 0x7897, 0x8155, 0xD842 /*0xDF9F*/, 0x5B41, 0x5B56, 0x5B7D,
- 0x5B93, 0x5BD8, 0x5BEC, 0x5C12, 0x5C1E, 0x5C23, 0x5C2B, 0x378D,
- 0x5C62, 0xFA3B, 0xFA3C, 0xD845 /*0xDEB4*/, 0x5C7A, 0x5C8F, 0x5C9F, 0x5CA3,
- 0x5CAA, 0x5CBA, 0x5CCB, 0x5CD0, 0x5CD2, 0x5CF4, 0xD847 /*0xDE34*/, 0x37E2,
- 0x5D0D, 0x5D27, 0xFA11, 0x5D46, 0x5D47, 0x5D53, 0x5D4A, 0x5D6D,
- 0x5D81, 0x5DA0, 0x5DA4, 0x5DA7, 0x5DB8, 0x5DCB, 0x541E,
-};
static const unsigned short euc_to_utf8_D0[] = {
0x5F0C, 0x4E10, 0x4E15, 0x4E2A, 0x4E31, 0x4E36, 0x4E3C,
0x4E3F, 0x4E42, 0x4E56, 0x4E58, 0x4E82, 0x4E85, 0x8C6B, 0x4E8A,
@@ -1454,20 +1244,6 @@ 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_F4_x0213[] = {
- 0x582F, 0x69C7, 0x9059, 0x7464, 0x51DC, 0x7199, 0x5653,
- 0x5DE2, 0x5E14, 0x5E18, 0x5E58, 0x5E5E, 0x5EBE, 0xF928, 0x5ECB,
- 0x5EF9, 0x5F00, 0x5F02, 0x5F07, 0x5F1D, 0x5F23, 0x5F34, 0x5F36,
- 0x5F3D, 0x5F40, 0x5F45, 0x5F54, 0x5F58, 0x5F64, 0x5F67, 0x5F7D,
- 0x5F89, 0x5F9C, 0x5FA7, 0x5FAF, 0x5FB5, 0x5FB7, 0x5FC9, 0x5FDE,
- 0x5FE1, 0x5FE9, 0x600D, 0x6014, 0x6018, 0x6033, 0x6035, 0x6047,
- 0xFA3D, 0x609D, 0x609E, 0x60CB, 0x60D4, 0x60D5, 0x60DD, 0x60F8,
- 0x611C, 0x612B, 0x6130, 0x6137, 0xFA3E, 0x618D, 0xFA3F, 0x61BC,
- 0x61B9, 0xFA40, 0x6222, 0x623E, 0x6243, 0x6256, 0x625A, 0x626F,
- 0x6285, 0x62C4, 0x62D6, 0x62FC, 0x630A, 0x6318, 0x6339, 0x6343,
- 0x6365, 0x637C, 0x63E5, 0x63ED, 0x63F5, 0x6410, 0x6414, 0x6422,
- 0x6479, 0x6451, 0x6460, 0x646D, 0x64CE, 0x64BE, 0x64BF,
-};
static const unsigned short euc_to_utf8_F5[] = {
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -1482,62 +1258,6 @@ 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_F5_x0213[] = {
- 0x64C4, 0x64CA, 0x64D0, 0x64F7, 0x64FB, 0x6522, 0x6529,
- 0xFA41, 0x6567, 0x659D, 0xFA42, 0x6600, 0x6609, 0x6615, 0x661E,
- 0x663A, 0x6622, 0x6624, 0x662B, 0x6630, 0x6631, 0x6633, 0x66FB,
- 0x6648, 0x664C, 0xD84C /*0xDDC4*/, 0x6659, 0x665A, 0x6661, 0x6665, 0x6673,
- 0x6677, 0x6678, 0x668D, 0xFA43, 0x66A0, 0x66B2, 0x66BB, 0x66C6,
- 0x66C8, 0x3B22, 0x66DB, 0x66E8, 0x66FA, 0x6713, 0xF929, 0x6733,
- 0x6766, 0x6747, 0x6748, 0x677B, 0x6781, 0x6793, 0x6798, 0x679B,
- 0x67BB, 0x67F9, 0x67C0, 0x67D7, 0x67FC, 0x6801, 0x6852, 0x681D,
- 0x682C, 0x6831, 0x685B, 0x6872, 0x6875, 0xFA44, 0x68A3, 0x68A5,
- 0x68B2, 0x68C8, 0x68D0, 0x68E8, 0x68ED, 0x68F0, 0x68F1, 0x68FC,
- 0x690A, 0x6949, 0xD84D /*0xDDC4*/, 0x6935, 0x6942, 0x6957, 0x6963, 0x6964,
- 0x6968, 0x6980, 0xFA14, 0x69A5, 0x69AD, 0x69CF, 0x3BB6,
-};
-static const unsigned short euc_to_utf8_F6_x0213[] = {
- 0x3BC3, 0x69E2, 0x69E9, 0x69EA, 0x69F5, 0x69F6, 0x6A0F,
- 0x6A15, 0xD84D /*0xDF3F*/, 0x6A3B, 0x6A3E, 0x6A45, 0x6A50, 0x6A56, 0x6A5B,
- 0x6A6B, 0x6A73, 0xD84D /*0xDF63*/, 0x6A89, 0x6A94, 0x6A9D, 0x6A9E, 0x6AA5,
- 0x6AE4, 0x6AE7, 0x3C0F, 0xF91D, 0x6B1B, 0x6B1E, 0x6B2C, 0x6B35,
- 0x6B46, 0x6B56, 0x6B60, 0x6B65, 0x6B67, 0x6B77, 0x6B82, 0x6BA9,
- 0x6BAD, 0xF970, 0x6BCF, 0x6BD6, 0x6BD7, 0x6BFF, 0x6C05, 0x6C10,
- 0x6C33, 0x6C59, 0x6C5C, 0x6CAA, 0x6C74, 0x6C76, 0x6C85, 0x6C86,
- 0x6C98, 0x6C9C, 0x6CFB, 0x6CC6, 0x6CD4, 0x6CE0, 0x6CEB, 0x6CEE,
- 0xD84F /*0xDCFE*/, 0x6D04, 0x6D0E, 0x6D2E, 0x6D31, 0x6D39, 0x6D3F, 0x6D58,
- 0x6D65, 0xFA45, 0x6D82, 0x6D87, 0x6D89, 0x6D94, 0x6DAA, 0x6DAC,
- 0x6DBF, 0x6DC4, 0x6DD6, 0x6DDA, 0x6DDB, 0x6DDD, 0x6DFC, 0xFA46,
- 0x6E34, 0x6E44, 0x6E5C, 0x6E5E, 0x6EAB, 0x6EB1, 0x6EC1,
-};
-static const unsigned short euc_to_utf8_F7_x0213[] = {
- 0x6EC7, 0x6ECE, 0x6F10, 0x6F1A, 0xFA47, 0x6F2A, 0x6F2F,
- 0x6F33, 0x6F51, 0x6F59, 0x6F5E, 0x6F61, 0x6F62, 0x6F7E, 0x6F88,
- 0x6F8C, 0x6F8D, 0x6F94, 0x6FA0, 0x6FA7, 0x6FB6, 0x6FBC, 0x6FC7,
- 0x6FCA, 0x6FF9, 0x6FF0, 0x6FF5, 0x7005, 0x7006, 0x7028, 0x704A,
- 0x705D, 0x705E, 0x704E, 0x7064, 0x7075, 0x7085, 0x70A4, 0x70AB,
- 0x70B7, 0x70D4, 0x70D8, 0x70E4, 0x710F, 0x712B, 0x711E, 0x7120,
- 0x712E, 0x7130, 0x7146, 0x7147, 0x7151, 0xFA48, 0x7152, 0x715C,
- 0x7160, 0x7168, 0xFA15, 0x7185, 0x7187, 0x7192, 0x71C1, 0x71BA,
- 0x71C4, 0x71FE, 0x7200, 0x7215, 0x7255, 0x7256, 0x3E3F, 0x728D,
- 0x729B, 0x72BE, 0x72C0, 0x72FB, 0xD851 /*0xDFF1*/, 0x7327, 0x7328, 0xFA16,
- 0x7350, 0x7366, 0x737C, 0x7395, 0x739F, 0x73A0, 0x73A2, 0x73A6,
- 0x73AB, 0x73C9, 0x73CF, 0x73D6, 0x73D9, 0x73E3, 0x73E9,
-};
-static const unsigned short euc_to_utf8_F8_x0213[] = {
- 0x7407, 0x740A, 0x741A, 0x741B, 0xFA4A, 0x7426, 0x7428,
- 0x742A, 0x742B, 0x742C, 0x742E, 0x742F, 0x7430, 0x7444, 0x7446,
- 0x7447, 0x744B, 0x7457, 0x7462, 0x746B, 0x746D, 0x7486, 0x7487,
- 0x7489, 0x7498, 0x749C, 0x749F, 0x74A3, 0x7490, 0x74A6, 0x74A8,
- 0x74A9, 0x74B5, 0x74BF, 0x74C8, 0x74C9, 0x74DA, 0x74FF, 0x7501,
- 0x7517, 0x752F, 0x756F, 0x7579, 0x7592, 0x3F72, 0x75CE, 0x75E4,
- 0x7600, 0x7602, 0x7608, 0x7615, 0x7616, 0x7619, 0x761E, 0x762D,
- 0x7635, 0x7643, 0x764B, 0x7664, 0x7665, 0x766D, 0x766F, 0x7671,
- 0x7681, 0x769B, 0x769D, 0x769E, 0x76A6, 0x76AA, 0x76B6, 0x76C5,
- 0x76CC, 0x76CE, 0x76D4, 0x76E6, 0x76F1, 0x76FC, 0x770A, 0x7719,
- 0x7734, 0x7736, 0x7746, 0x774D, 0x774E, 0x775C, 0x775F, 0x7762,
- 0x777A, 0x7780, 0x7794, 0x77AA, 0x77E0, 0x782D, 0xD855 /*0xDC8E*/,
-};
static const unsigned short euc_to_utf8_F9[] = {
0x7E8A, 0x891C, 0x9348, 0x9288, 0x84DC, 0x4FC9, 0x70BB,
0x6631, 0x68C8, 0x92F9, 0x66FB, 0x5F45, 0x4E28, 0x4EE1, 0x4EFC,
@@ -1552,20 +1272,6 @@ 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_F9_x0213[] = {
- 0x7843, 0x784E, 0x784F, 0x7851, 0x7868, 0x786E, 0xFA4B,
- 0x78B0, 0xD855 /*0xDD0E*/, 0x78AD, 0x78E4, 0x78F2, 0x7900, 0x78F7, 0x791C,
- 0x792E, 0x7931, 0x7934, 0xFA4C, 0xFA4D, 0x7945, 0x7946, 0xFA4E,
- 0xFA4F, 0xFA50, 0x795C, 0xFA51, 0xFA19, 0xFA1A, 0x7979, 0xFA52,
- 0xFA53, 0xFA1B, 0x7998, 0x79B1, 0x79B8, 0x79C8, 0x79CA, 0xD855 /*0xDF71*/,
- 0x79D4, 0x79DE, 0x79EB, 0x79ED, 0x7A03, 0xFA54, 0x7A39, 0x7A5D,
- 0x7A6D, 0xFA55, 0x7A85, 0x7AA0, 0xD856 /*0xDDC4*/, 0x7AB3, 0x7ABB, 0x7ACE,
- 0x7AEB, 0x7AFD, 0x7B12, 0x7B2D, 0x7B3B, 0x7B47, 0x7B4E, 0x7B60,
- 0x7B6D, 0x7B6F, 0x7B72, 0x7B9E, 0xFA56, 0x7BD7, 0x7BD9, 0x7C01,
- 0x7C31, 0x7C1E, 0x7C20, 0x7C33, 0x7C36, 0x4264, 0xD857 /*0xDDA1*/, 0x7C59,
- 0x7C6D, 0x7C79, 0x7C8F, 0x7C94, 0x7CA0, 0x7CBC, 0x7CD5, 0x7CD9,
- 0x7CDD, 0x7D07, 0x7D08, 0x7D13, 0x7D1D, 0x7D23, 0x7D31,
-};
static const unsigned short euc_to_utf8_FA[] = {
0x5FDE, 0x605D, 0x6085, 0x608A, 0x60DE, 0x60D5, 0x6120,
0x60F2, 0x6111, 0x6137, 0x6130, 0x6198, 0x6213, 0x62A6, 0x63F5,
@@ -1580,20 +1286,6 @@ 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_FA_x0213[] = {
- 0x7D41, 0x7D48, 0x7D53, 0x7D5C, 0x7D7A, 0x7D83, 0x7D8B,
- 0x7DA0, 0x7DA6, 0x7DC2, 0x7DCC, 0x7DD6, 0x7DE3, 0xFA57, 0x7E28,
- 0x7E08, 0x7E11, 0x7E15, 0xFA59, 0x7E47, 0x7E52, 0x7E61, 0x7E8A,
- 0x7E8D, 0x7F47, 0xFA5A, 0x7F91, 0x7F97, 0x7FBF, 0x7FCE, 0x7FDB,
- 0x7FDF, 0x7FEC, 0x7FEE, 0x7FFA, 0xFA5B, 0x8014, 0x8026, 0x8035,
- 0x8037, 0x803C, 0x80CA, 0x80D7, 0x80E0, 0x80F3, 0x8118, 0x814A,
- 0x8160, 0x8167, 0x8168, 0x816D, 0x81BB, 0x81CA, 0x81CF, 0x81D7,
- 0xFA5C, 0x4453, 0x445B, 0x8260, 0x8274, 0xD85A /*0xDEFF*/, 0x828E, 0x82A1,
- 0x82A3, 0x82A4, 0x82A9, 0x82AE, 0x82B7, 0x82BE, 0x82BF, 0x82C6,
- 0x82D5, 0x82FD, 0x82FE, 0x8300, 0x8301, 0x8362, 0x8322, 0x832D,
- 0x833A, 0x8343, 0x8347, 0x8351, 0x8355, 0x837D, 0x8386, 0x8392,
- 0x8398, 0x83A7, 0x83A9, 0x83BF, 0x83C0, 0x83C7, 0x83CF,
-};
static const unsigned short euc_to_utf8_FB[] = {
0x72BE, 0x7324, 0xFA16, 0x7377, 0x73BD, 0x73C9, 0x73D6,
0x73E3, 0x73D2, 0x7407, 0x73F5, 0x7426, 0x742A, 0x7429, 0x742E,
@@ -1608,20 +1300,6 @@ 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_FB_x0213[] = {
- 0x83D1, 0x83E1, 0x83EA, 0x8401, 0x8406, 0x840A, 0xFA5F,
- 0x8448, 0x845F, 0x8470, 0x8473, 0x8485, 0x849E, 0x84AF, 0x84B4,
- 0x84BA, 0x84C0, 0x84C2, 0xD85B /*0xDE40*/, 0x8532, 0x851E, 0x8523, 0x852F,
- 0x8559, 0x8564, 0xFA1F, 0x85AD, 0x857A, 0x858C, 0x858F, 0x85A2,
- 0x85B0, 0x85CB, 0x85CE, 0x85ED, 0x8612, 0x85FF, 0x8604, 0x8605,
- 0x8610, 0xD85C /*0xDCF4*/, 0x8618, 0x8629, 0x8638, 0x8657, 0x865B, 0xF936,
- 0x8662, 0x459D, 0x866C, 0x8675, 0x8698, 0x86B8, 0x86FA, 0x86FC,
- 0x86FD, 0x870B, 0x8771, 0x8787, 0x8788, 0x87AC, 0x87AD, 0x87B5,
- 0x45EA, 0x87D6, 0x87EC, 0x8806, 0x880A, 0x8810, 0x8814, 0x881F,
- 0x8898, 0x88AA, 0x88CA, 0x88CE, 0xD85D /*0xDE84*/, 0x88F5, 0x891C, 0xFA60,
- 0x8918, 0x8919, 0x891A, 0x8927, 0x8930, 0x8932, 0x8939, 0x8940,
- 0x8994, 0xFA61, 0x89D4, 0x89E5, 0x89F6, 0x8A12, 0x8A15,
-};
static const unsigned short euc_to_utf8_FC[] = {
0x91D7, 0x91DE, 0x91ED, 0x91EE, 0x91E4, 0x91E5, 0x9206,
0x9210, 0x920A, 0x923A, 0x9240, 0x923C, 0x924E, 0x9259, 0x9251,
@@ -1652,413 +1330,6 @@ static const unsigned short euc_to_utf8_FC_ms[] = {
0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176,
0x2177, 0x2178, 0x2179, 0xFFE2, 0xFFE4, 0xFF07, 0xFF02,
};
-static const unsigned short euc_to_utf8_FC_x0213[] = {
- 0x8A22, 0x8A37, 0x8A47, 0x8A4E, 0x8A5D, 0x8A61, 0x8A75,
- 0x8A79, 0x8AA7, 0x8AD0, 0x8ADF, 0x8AF4, 0x8AF6, 0xFA22, 0xFA62,
- 0xFA63, 0x8B46, 0x8B54, 0x8B59, 0x8B69, 0x8B9D, 0x8C49, 0x8C68,
- 0xFA64, 0x8CE1, 0x8CF4, 0x8CF8, 0x8CFE, 0xFA65, 0x8D12, 0x8D1B,
- 0x8DAF, 0x8DCE, 0x8DD1, 0x8DD7, 0x8E20, 0x8E23, 0x8E3D, 0x8E70,
- 0x8E7B, 0xD860 /*0xDE77*/, 0x8EC0, 0x4844, 0x8EFA, 0x8F1E, 0x8F2D, 0x8F36,
- 0x8F54, 0xD860 /*0xDFCD*/, 0x8FA6, 0x8FB5, 0x8FE4, 0x8FE8, 0x8FEE, 0x9008,
- 0x902D, 0xFA67, 0x9088, 0x9095, 0x9097, 0x9099, 0x909B, 0x90A2,
- 0x90B3, 0x90BE, 0x90C4, 0x90C5, 0x90C7, 0x90D7, 0x90DD, 0x90DE,
- 0x90EF, 0x90F4, 0xFA26, 0x9114, 0x9115, 0x9116, 0x9122, 0x9123,
- 0x9127, 0x912F, 0x9131, 0x9134, 0x913D, 0x9148, 0x915B, 0x9183,
- 0x919E, 0x91AC, 0x91B1, 0x91BC, 0x91D7, 0x91FB, 0x91E4,
-};
-static const unsigned short euc_to_utf8_FD_x0213[] = {
- 0x91E5, 0x91ED, 0x91F1, 0x9207, 0x9210, 0x9238, 0x9239,
- 0x923A, 0x923C, 0x9240, 0x9243, 0x924F, 0x9278, 0x9288, 0x92C2,
- 0x92CB, 0x92CC, 0x92D3, 0x92E0, 0x92FF, 0x9304, 0x931F, 0x9321,
- 0x9325, 0x9348, 0x9349, 0x934A, 0x9364, 0x9365, 0x936A, 0x9370,
- 0x939B, 0x93A3, 0x93BA, 0x93C6, 0x93DE, 0x93DF, 0x9404, 0x93FD,
- 0x9433, 0x944A, 0x9463, 0x946B, 0x9471, 0x9472, 0x958E, 0x959F,
- 0x95A6, 0x95A9, 0x95AC, 0x95B6, 0x95BD, 0x95CB, 0x95D0, 0x95D3,
- 0x49B0, 0x95DA, 0x95DE, 0x9658, 0x9684, 0xF9DC, 0x969D, 0x96A4,
- 0x96A5, 0x96D2, 0x96DE, 0xFA68, 0x96E9, 0x96EF, 0x9733, 0x973B,
- 0x974D, 0x974E, 0x974F, 0x975A, 0x976E, 0x9773, 0x9795, 0x97AE,
- 0x97BA, 0x97C1, 0x97C9, 0x97DE, 0x97DB, 0x97F4, 0xFA69, 0x980A,
- 0x981E, 0x982B, 0x9830, 0xFA6A, 0x9852, 0x9853, 0x9856,
-};
-static const unsigned short euc_to_utf8_FE_x0213[] = {
- 0x9857, 0x9859, 0x985A, 0xF9D0, 0x9865, 0x986C, 0x98BA,
- 0x98C8, 0x98E7, 0x9958, 0x999E, 0x9A02, 0x9A03, 0x9A24, 0x9A2D,
- 0x9A2E, 0x9A38, 0x9A4A, 0x9A4E, 0x9A52, 0x9AB6, 0x9AC1, 0x9AC3,
- 0x9ACE, 0x9AD6, 0x9AF9, 0x9B02, 0x9B08, 0x9B20, 0x4C17, 0x9B2D,
- 0x9B5E, 0x9B79, 0x9B66, 0x9B72, 0x9B75, 0x9B84, 0x9B8A, 0x9B8F,
- 0x9B9E, 0x9BA7, 0x9BC1, 0x9BCE, 0x9BE5, 0x9BF8, 0x9BFD, 0x9C00,
- 0x9C23, 0x9C41, 0x9C4F, 0x9C50, 0x9C53, 0x9C63, 0x9C65, 0x9C77,
- 0x9D1D, 0x9D1E, 0x9D43, 0x9D47, 0x9D52, 0x9D63, 0x9D70, 0x9D7C,
- 0x9D8A, 0x9D96, 0x9DC0, 0x9DAC, 0x9DBC, 0x9DD7, 0xD868 /*0xDD90*/, 0x9DE7,
- 0x9E07, 0x9E15, 0x9E7C, 0x9E9E, 0x9EA4, 0x9EAC, 0x9EAF, 0x9EB4,
- 0x9EB5, 0x9EC3, 0x9ED1, 0x9F10, 0x9F39, 0x9F57, 0x9F90, 0x9F94,
- 0x9F97, 0x9FA2, 0x59F8, 0x5C5B, 0x5E77, 0x7626, 0x7E6B,
-};
-
-static const unsigned short euc_to_utf8_8FA1_x0213[] = {
- 0xD840 /*0xDC89*/, 0x4E02, 0x4E0F, 0x4E12, 0x4E29, 0x4E2B, 0x4E2E,
- 0x4E40, 0x4E47, 0x4E48, 0xD840 /*0xDCA2*/, 0x4E51, 0x3406, 0xD840 /*0xDCA4*/, 0x4E5A,
- 0x4E69, 0x4E9D, 0x342C, 0x342E, 0x4EB9, 0x4EBB, 0xD840 /*0xDDA2*/, 0x4EBC,
- 0x4EC3, 0x4EC8, 0x4ED0, 0x4EEB, 0x4EDA, 0x4EF1, 0x4EF5, 0x4F00,
- 0x4F16, 0x4F64, 0x4F37, 0x4F3E, 0x4F54, 0x4F58, 0xD840 /*0xDE13*/, 0x4F77,
- 0x4F78, 0x4F7A, 0x4F7D, 0x4F82, 0x4F85, 0x4F92, 0x4F9A, 0x4FE6,
- 0x4FB2, 0x4FBE, 0x4FC5, 0x4FCB, 0x4FCF, 0x4FD2, 0x346A, 0x4FF2,
- 0x5000, 0x5010, 0x5013, 0x501C, 0x501E, 0x5022, 0x3468, 0x5042,
- 0x5046, 0x504E, 0x5053, 0x5057, 0x5063, 0x5066, 0x506A, 0x5070,
- 0x50A3, 0x5088, 0x5092, 0x5093, 0x5095, 0x5096, 0x509C, 0x50AA,
- 0xD840 /*0xDF2B*/, 0x50B1, 0x50BA, 0x50BB, 0x50C4, 0x50C7, 0x50F3, 0xD840 /*0xDF81*/,
- 0x50CE, 0xD840 /*0xDF71*/, 0x50D4, 0x50D9, 0x50E1, 0x50E9, 0x3492,
-};
-static const unsigned short euc_to_utf8_8FA3_x0213[] = {
- 0x5108, 0xD840 /*0xDFF9*/, 0x5117, 0x511B, 0xD841 /*0xDC4A*/, 0x5160, 0xD841 /*0xDD09*/,
- 0x5173, 0x5183, 0x518B, 0x34BC, 0x5198, 0x51A3, 0x51AD, 0x34C7,
- 0x51BC, 0xD841 /*0xDDD6*/, 0xD841 /*0xDE28*/, 0x51F3, 0x51F4, 0x5202, 0x5212, 0x5216,
- 0xD841 /*0xDF4F*/, 0x5255, 0x525C, 0x526C, 0x5277, 0x5284, 0x5282, 0xD842 /*0xDC07*/,
- 0x5298, 0xD842 /*0xDC3A*/, 0x52A4, 0x52A6, 0x52AF, 0x52BA, 0x52BB, 0x52CA,
- 0x351F, 0x52D1, 0xD842 /*0xDCB9*/, 0x52F7, 0x530A, 0x530B, 0x5324, 0x5335,
- 0x533E, 0x5342, 0xD842 /*0xDD7C*/, 0xD842 /*0xDD9D*/, 0x5367, 0x536C, 0x537A, 0x53A4,
- 0x53B4, 0xD842 /*0xDED3*/, 0x53B7, 0x53C0, 0xD842 /*0xDF1D*/, 0x355D, 0x355E, 0x53D5,
- 0x53DA, 0x3563, 0x53F4, 0x53F5, 0x5455, 0x5424, 0x5428, 0x356E,
- 0x5443, 0x5462, 0x5466, 0x546C, 0x548A, 0x548D, 0x5495, 0x54A0,
- 0x54A6, 0x54AD, 0x54AE, 0x54B7, 0x54BA, 0x54BF, 0x54C3, 0xD843 /*0xDD45*/,
- 0x54EC, 0x54EF, 0x54F1, 0x54F3, 0x5500, 0x5501, 0x5509,
-};
-static const unsigned short euc_to_utf8_8FA4_x0213[] = {
- 0x553C, 0x5541, 0x35A6, 0x5547, 0x554A, 0x35A8, 0x5560,
- 0x5561, 0x5564, 0xD843 /*0xDDE1*/, 0x557D, 0x5582, 0x5588, 0x5591, 0x35C5,
- 0x55D2, 0xD843 /*0xDE95*/, 0xD843 /*0xDE6D*/, 0x55BF, 0x55C9, 0x55CC, 0x55D1, 0x55DD,
- 0x35DA, 0x55E2, 0xD843 /*0xDE64*/, 0x55E9, 0x5628, 0xD843 /*0xDF5F*/, 0x5607, 0x5610,
- 0x5630, 0x5637, 0x35F4, 0x563D, 0x563F, 0x5640, 0x5647, 0x565E,
- 0x5660, 0x566D, 0x3605, 0x5688, 0x568C, 0x5695, 0x569A, 0x569D,
- 0x56A8, 0x56AD, 0x56B2, 0x56C5, 0x56CD, 0x56DF, 0x56E8, 0x56F6,
- 0x56F7, 0xD844 /*0xDE01*/, 0x5715, 0x5723, 0xD844 /*0xDE55*/, 0x5729, 0xD844 /*0xDE7B*/, 0x5745,
- 0x5746, 0x574C, 0x574D, 0xD844 /*0xDE74*/, 0x5768, 0x576F, 0x5773, 0x5774,
- 0x5775, 0x577B, 0xD844 /*0xDEE4*/, 0xD844 /*0xDED7*/, 0x57AC, 0x579A, 0x579D, 0x579E,
- 0x57A8, 0x57D7, 0xD844 /*0xDEFD*/, 0x57CC, 0xD844 /*0xDF36*/, 0xD844 /*0xDF44*/, 0x57DE, 0x57E6,
- 0x57F0, 0x364A, 0x57F8, 0x57FB, 0x57FD, 0x5804, 0x581E,
-};
-static const unsigned short euc_to_utf8_8FA5_x0213[] = {
- 0x5820, 0x5827, 0x5832, 0x5839, 0xD844 /*0xDFC4*/, 0x5849, 0x584C,
- 0x5867, 0x588A, 0x588B, 0x588D, 0x588F, 0x5890, 0x5894, 0x589D,
- 0x58AA, 0x58B1, 0xD845 /*0xDC6D*/, 0x58C3, 0x58CD, 0x58E2, 0x58F3, 0x58F4,
- 0x5905, 0x5906, 0x590B, 0x590D, 0x5914, 0x5924, 0xD845 /*0xDDD7*/, 0x3691,
- 0x593D, 0x3699, 0x5946, 0x3696, 0xD85B /*0xDC29*/, 0x595B, 0x595F, 0xD845 /*0xDE47*/,
- 0x5975, 0x5976, 0x597C, 0x599F, 0x59AE, 0x59BC, 0x59C8, 0x59CD,
- 0x59DE, 0x59E3, 0x59E4, 0x59E7, 0x59EE, 0xD845 /*0xDF06*/, 0xD845 /*0xDF42*/, 0x36CF,
- 0x5A0C, 0x5A0D, 0x5A17, 0x5A27, 0x5A2D, 0x5A55, 0x5A65, 0x5A7A,
- 0x5A8B, 0x5A9C, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AB1, 0x5AB3, 0x5AB5,
- 0x5ABA, 0x5ABF, 0x5ADA, 0x5ADC, 0x5AE0, 0x5AE5, 0x5AF0, 0x5AEE,
- 0x5AF5, 0x5B00, 0x5B08, 0x5B17, 0x5B34, 0x5B2D, 0x5B4C, 0x5B52,
- 0x5B68, 0x5B6F, 0x5B7C, 0x5B7F, 0x5B81, 0x5B84, 0xD846 /*0xDDC3*/,
-};
-static const unsigned short euc_to_utf8_8FA8_x0213[] = {
- 0x5B96, 0x5BAC, 0x3761, 0x5BC0, 0x3762, 0x5BCE, 0x5BD6,
- 0x376C, 0x376B, 0x5BF1, 0x5BFD, 0x3775, 0x5C03, 0x5C29, 0x5C30,
- 0xD847 /*0xDC56*/, 0x5C5F, 0x5C63, 0x5C67, 0x5C68, 0x5C69, 0x5C70, 0xD847 /*0xDD2D*/,
- 0xD847 /*0xDD45*/, 0x5C7C, 0xD847 /*0xDD78*/, 0xD847 /*0xDD62*/, 0x5C88, 0x5C8A, 0x37C1, 0xD847 /*0xDDA1*/,
- 0xD847 /*0xDD9C*/, 0x5CA0, 0x5CA2, 0x5CA6, 0x5CA7, 0xD847 /*0xDD92*/, 0x5CAD, 0x5CB5,
- 0xD847 /*0xDDB7*/, 0x5CC9, 0xD847 /*0xDDE0*/, 0xD847 /*0xDE33*/, 0x5D06, 0x5D10, 0x5D2B, 0x5D1D,
- 0x5D20, 0x5D24, 0x5D26, 0x5D31, 0x5D39, 0x5D42, 0x37E8, 0x5D61,
- 0x5D6A, 0x37F4, 0x5D70, 0xD847 /*0xDF1E*/, 0x37FD, 0x5D88, 0x3800, 0x5D92,
- 0x5D94, 0x5D97, 0x5D99, 0x5DB0, 0x5DB2, 0x5DB4, 0xD847 /*0xDF76*/, 0x5DB9,
- 0x5DD1, 0x5DD7, 0x5DD8, 0x5DE0, 0xD847 /*0xDFFA*/, 0x5DE4, 0x5DE9, 0x382F,
- 0x5E00, 0x3836, 0x5E12, 0x5E15, 0x3840, 0x5E1F, 0x5E2E, 0x5E3E,
- 0x5E49, 0x385C, 0x5E56, 0x3861, 0x5E6B, 0x5E6C, 0x5E6D,
-};
-static const unsigned short euc_to_utf8_8FAC_x0213[] = {
- 0x5E6E, 0xD848 /*0xDD7B*/, 0x5EA5, 0x5EAA, 0x5EAC, 0x5EB9, 0x5EBF,
- 0x5EC6, 0x5ED2, 0x5ED9, 0xD848 /*0xDF1E*/, 0x5EFD, 0x5F08, 0x5F0E, 0x5F1C,
- 0xD848 /*0xDFAD*/, 0x5F1E, 0x5F47, 0x5F63, 0x5F72, 0x5F7E, 0x5F8F, 0x5FA2,
- 0x5FA4, 0x5FB8, 0x5FC4, 0x38FA, 0x5FC7, 0x5FCB, 0x5FD2, 0x5FD3,
- 0x5FD4, 0x5FE2, 0x5FEE, 0x5FEF, 0x5FF3, 0x5FFC, 0x3917, 0x6017,
- 0x6022, 0x6024, 0x391A, 0x604C, 0x607F, 0x608A, 0x6095, 0x60A8,
- 0xD849 /*0xDEF3*/, 0x60B0, 0x60B1, 0x60BE, 0x60C8, 0x60D9, 0x60DB, 0x60EE,
- 0x60F2, 0x60F5, 0x6110, 0x6112, 0x6113, 0x6119, 0x611E, 0x613A,
- 0x396F, 0x6141, 0x6146, 0x6160, 0x617C, 0xD84A /*0xDC5B*/, 0x6192, 0x6193,
- 0x6197, 0x6198, 0x61A5, 0x61A8, 0x61AD, 0xD84A /*0xDCAB*/, 0x61D5, 0x61DD,
- 0x61DF, 0x61F5, 0xD84A /*0xDD8F*/, 0x6215, 0x6223, 0x6229, 0x6246, 0x624C,
- 0x6251, 0x6252, 0x6261, 0x6264, 0x627B, 0x626D, 0x6273,
-};
-static const unsigned short euc_to_utf8_8FAD_x0213[] = {
- 0x6299, 0x62A6, 0x62D5, 0xD84A /*0xDEB8*/, 0x62FD, 0x6303, 0x630D,
- 0x6310, 0xD84A /*0xDF4F*/, 0xD84A /*0xDF50*/, 0x6332, 0x6335, 0x633B, 0x633C, 0x6341,
- 0x6344, 0x634E, 0xD84A /*0xDF46*/, 0x6359, 0xD84B /*0xDC1D*/, 0xD84A /*0xDFA6*/, 0x636C, 0x6384,
- 0x6399, 0xD84B /*0xDC24*/, 0x6394, 0x63BD, 0x63F7, 0x63D4, 0x63D5, 0x63DC,
- 0x63E0, 0x63EB, 0x63EC, 0x63F2, 0x6409, 0x641E, 0x6425, 0x6429,
- 0x642F, 0x645A, 0x645B, 0x645D, 0x6473, 0x647D, 0x6487, 0x6491,
- 0x649D, 0x649F, 0x64CB, 0x64CC, 0x64D5, 0x64D7, 0xD84B /*0xDDE1*/, 0x64E4,
- 0x64E5, 0x64FF, 0x6504, 0x3A6E, 0x650F, 0x6514, 0x6516, 0x3A73,
- 0x651E, 0x6532, 0x6544, 0x6554, 0x656B, 0x657A, 0x6581, 0x6584,
- 0x6585, 0x658A, 0x65B2, 0x65B5, 0x65B8, 0x65BF, 0x65C2, 0x65C9,
- 0x65D4, 0x3AD6, 0x65F2, 0x65F9, 0x65FC, 0x6604, 0x6608, 0x6621,
- 0x662A, 0x6645, 0x6651, 0x664E, 0x3AEA, 0xD84C /*0xDDC3*/, 0x6657,
-};
-static const unsigned short euc_to_utf8_8FAE_x0213[] = {
- 0x665B, 0x6663, 0xD84C /*0xDDF5*/, 0xD84C /*0xDDB6*/, 0x666A, 0x666B, 0x666C,
- 0x666D, 0x667B, 0x6680, 0x6690, 0x6692, 0x6699, 0x3B0E, 0x66AD,
- 0x66B1, 0x66B5, 0x3B1A, 0x66BF, 0x3B1C, 0x66EC, 0x3AD7, 0x6701,
- 0x6705, 0x6712, 0xD84C /*0xDF72*/, 0x6719, 0xD84C /*0xDFD3*/, 0xD84C /*0xDFD2*/, 0x674C, 0x674D,
- 0x6754, 0x675D, 0xD84C /*0xDFD0*/, 0xD84C /*0xDFE4*/, 0xD84C /*0xDFD5*/, 0x6774, 0x6776, 0xD84C /*0xDFDA*/,
- 0x6792, 0xD84C /*0xDFDF*/, 0x8363, 0x6810, 0x67B0, 0x67B2, 0x67C3, 0x67C8,
- 0x67D2, 0x67D9, 0x67DB, 0x67F0, 0x67F7, 0xD84D /*0xDC4A*/, 0xD84D /*0xDC51*/, 0xD84D /*0xDC4B*/,
- 0x6818, 0x681F, 0x682D, 0xD84D /*0xDC65*/, 0x6833, 0x683B, 0x683E, 0x6844,
- 0x6845, 0x6849, 0x684C, 0x6855, 0x6857, 0x3B77, 0x686B, 0x686E,
- 0x687A, 0x687C, 0x6882, 0x6890, 0x6896, 0x3B6D, 0x6898, 0x6899,
- 0x689A, 0x689C, 0x68AA, 0x68AB, 0x68B4, 0x68BB, 0x68FB, 0xD84D /*0xDCE4*/,
- 0xD84D /*0xDD5A*/, 0xFA13, 0x68C3, 0x68C5, 0x68CC, 0x68CF, 0x68D6,
-};
-static const unsigned short euc_to_utf8_8FAF_x0213[] = {
- 0x68D9, 0x68E4, 0x68E5, 0x68EC, 0x68F7, 0x6903, 0x6907,
- 0x3B87, 0x3B88, 0xD84D /*0xDD94*/, 0x693B, 0x3B8D, 0x6946, 0x6969, 0x696C,
- 0x6972, 0x697A, 0x697F, 0x6992, 0x3BA4, 0x6996, 0x6998, 0x69A6,
- 0x69B0, 0x69B7, 0x69BA, 0x69BC, 0x69C0, 0x69D1, 0x69D6, 0xD84D /*0xDE39*/,
- 0xD84D /*0xDE47*/, 0x6A30, 0xD84D /*0xDE38*/, 0xD84D /*0xDE3A*/, 0x69E3, 0x69EE, 0x69EF, 0x69F3,
- 0x3BCD, 0x69F4, 0x69FE, 0x6A11, 0x6A1A, 0x6A1D, 0xD84D /*0xDF1C*/, 0x6A32,
- 0x6A33, 0x6A34, 0x6A3F, 0x6A46, 0x6A49, 0x6A7A, 0x6A4E, 0x6A52,
- 0x6A64, 0xD84D /*0xDF0C*/, 0x6A7E, 0x6A83, 0x6A8B, 0x3BF0, 0x6A91, 0x6A9F,
- 0x6AA1, 0xD84D /*0xDF64*/, 0x6AAB, 0x6ABD, 0x6AC6, 0x6AD4, 0x6AD0, 0x6ADC,
- 0x6ADD, 0xD84D /*0xDFFF*/, 0xD84D /*0xDFE7*/, 0x6AEC, 0x6AF1, 0x6AF2, 0x6AF3, 0x6AFD,
- 0xD84E /*0xDC24*/, 0x6B0B, 0x6B0F, 0x6B10, 0x6B11, 0xD84E /*0xDC3D*/, 0x6B17, 0x3C26,
- 0x6B2F, 0x6B4A, 0x6B58, 0x6B6C, 0x6B75, 0x6B7A, 0x6B81,
-};
-static const unsigned short euc_to_utf8_8FEE_x0213[] = {
- 0x6B9B, 0x6BAE, 0xD84E /*0xDE98*/, 0x6BBD, 0x6BBE, 0x6BC7, 0x6BC8,
- 0x6BC9, 0x6BDA, 0x6BE6, 0x6BE7, 0x6BEE, 0x6BF1, 0x6C02, 0x6C0A,
- 0x6C0E, 0x6C35, 0x6C36, 0x6C3A, 0xD84F /*0xDC7F*/, 0x6C3F, 0x6C4D, 0x6C5B,
- 0x6C6D, 0x6C84, 0x6C89, 0x3CC3, 0x6C94, 0x6C95, 0x6C97, 0x6CAD,
- 0x6CC2, 0x6CD0, 0x3CD2, 0x6CD6, 0x6CDA, 0x6CDC, 0x6CE9, 0x6CEC,
- 0x6CED, 0xD84F /*0xDD00*/, 0x6D00, 0x6D0A, 0x6D24, 0x6D26, 0x6D27, 0x6C67,
- 0x6D2F, 0x6D3C, 0x6D5B, 0x6D5E, 0x6D60, 0x6D70, 0x6D80, 0x6D81,
- 0x6D8A, 0x6D8D, 0x6D91, 0x6D98, 0xD84F /*0xDD40*/, 0x6E17, 0xD84F /*0xDDFA*/, 0xD84F /*0xDDF9*/,
- 0xD84F /*0xDDD3*/, 0x6DAB, 0x6DAE, 0x6DB4, 0x6DC2, 0x6D34, 0x6DC8, 0x6DCE,
- 0x6DCF, 0x6DD0, 0x6DDF, 0x6DE9, 0x6DF6, 0x6E36, 0x6E1E, 0x6E22,
- 0x6E27, 0x3D11, 0x6E32, 0x6E3C, 0x6E48, 0x6E49, 0x6E4B, 0x6E4C,
- 0x6E4F, 0x6E51, 0x6E53, 0x6E54, 0x6E57, 0x6E63, 0x3D1E,
-};
-static const unsigned short euc_to_utf8_8FEF_x0213[] = {
- 0x6E93, 0x6EA7, 0x6EB4, 0x6EBF, 0x6EC3, 0x6ECA, 0x6ED9,
- 0x6F35, 0x6EEB, 0x6EF9, 0x6EFB, 0x6F0A, 0x6F0C, 0x6F18, 0x6F25,
- 0x6F36, 0x6F3C, 0xD84F /*0xDF7E*/, 0x6F52, 0x6F57, 0x6F5A, 0x6F60, 0x6F68,
- 0x6F98, 0x6F7D, 0x6F90, 0x6F96, 0x6FBE, 0x6F9F, 0x6FA5, 0x6FAF,
- 0x3D64, 0x6FB5, 0x6FC8, 0x6FC9, 0x6FDA, 0x6FDE, 0x6FE9, 0xD850 /*0xDC96*/,
- 0x6FFC, 0x7000, 0x7007, 0x700A, 0x7023, 0xD850 /*0xDD03*/, 0x7039, 0x703A,
- 0x703C, 0x7043, 0x7047, 0x704B, 0x3D9A, 0x7054, 0x7065, 0x7069,
- 0x706C, 0x706E, 0x7076, 0x707E, 0x7081, 0x7086, 0x7095, 0x7097,
- 0x70BB, 0xD850 /*0xDDC6*/, 0x709F, 0x70B1, 0xD850 /*0xDDFE*/, 0x70EC, 0x70CA, 0x70D1,
- 0x70D3, 0x70DC, 0x7103, 0x7104, 0x7106, 0x7107, 0x7108, 0x710C,
- 0x3DC0, 0x712F, 0x7131, 0x7150, 0x714A, 0x7153, 0x715E, 0x3DD4,
- 0x7196, 0x7180, 0x719B, 0x71A0, 0x71A2, 0x71AE, 0x71AF,
-};
-static const unsigned short euc_to_utf8_8FF0_x0213[] = {
- 0x71B3, 0xD850 /*0xDFBC*/, 0x71CB, 0x71D3, 0x71D9, 0x71DC, 0x7207,
- 0x3E05, 0xFA49, 0x722B, 0x7234, 0x7238, 0x7239, 0x4E2C, 0x7242,
- 0x7253, 0x7257, 0x7263, 0xD851 /*0xDE29*/, 0x726E, 0x726F, 0x7278, 0x727F,
- 0x728E, 0xD851 /*0xDEA5*/, 0x72AD, 0x72AE, 0x72B0, 0x72B1, 0x72C1, 0x3E60,
- 0x72CC, 0x3E66, 0x3E68, 0x72F3, 0x72FA, 0x7307, 0x7312, 0x7318,
- 0x7319, 0x3E83, 0x7339, 0x732C, 0x7331, 0x7333, 0x733D, 0x7352,
- 0x3E94, 0x736B, 0x736C, 0xD852 /*0xDC96*/, 0x736E, 0x736F, 0x7371, 0x7377,
- 0x7381, 0x7385, 0x738A, 0x7394, 0x7398, 0x739C, 0x739E, 0x73A5,
- 0x73A8, 0x73B5, 0x73B7, 0x73B9, 0x73BC, 0x73BF, 0x73C5, 0x73CB,
- 0x73E1, 0x73E7, 0x73F9, 0x7413, 0x73FA, 0x7401, 0x7424, 0x7431,
- 0x7439, 0x7453, 0x7440, 0x7443, 0x744D, 0x7452, 0x745D, 0x7471,
- 0x7481, 0x7485, 0x7488, 0xD852 /*0xDE4D*/, 0x7492, 0x7497, 0x7499,
-};
-static const unsigned short euc_to_utf8_8FF1_x0213[] = {
- 0x74A0, 0x74A1, 0x74A5, 0x74AA, 0x74AB, 0x74B9, 0x74BB,
- 0x74BA, 0x74D6, 0x74D8, 0x74DE, 0x74EF, 0x74EB, 0xD852 /*0xDF56*/, 0x74FA,
- 0xD852 /*0xDF6F*/, 0x7520, 0x7524, 0x752A, 0x3F57, 0xD853 /*0xDC16*/, 0x753D, 0x753E,
- 0x7540, 0x7548, 0x754E, 0x7550, 0x7552, 0x756C, 0x7572, 0x7571,
- 0x757A, 0x757D, 0x757E, 0x7581, 0xD853 /*0xDD14*/, 0x758C, 0x3F75, 0x75A2,
- 0x3F77, 0x75B0, 0x75B7, 0x75BF, 0x75C0, 0x75C6, 0x75CF, 0x75D3,
- 0x75DD, 0x75DF, 0x75E0, 0x75E7, 0x75EC, 0x75EE, 0x75F1, 0x75F9,
- 0x7603, 0x7618, 0x7607, 0x760F, 0x3FAE, 0xD853 /*0xDE0E*/, 0x7613, 0x761B,
- 0x761C, 0xD853 /*0xDE37*/, 0x7625, 0x7628, 0x763C, 0x7633, 0xD853 /*0xDE6A*/, 0x3FC9,
- 0x7641, 0xD853 /*0xDE8B*/, 0x7649, 0x7655, 0x3FD7, 0x766E, 0x7695, 0x769C,
- 0x76A1, 0x76A0, 0x76A7, 0x76A8, 0x76AF, 0xD854 /*0xDC4A*/, 0x76C9, 0xD854 /*0xDC55*/,
- 0x76E8, 0x76EC, 0xD854 /*0xDD22*/, 0x7717, 0x771A, 0x772D, 0x7735,
-};
-static const unsigned short euc_to_utf8_8FF2_x0213[] = {
- 0xD854 /*0xDDA9*/, 0x4039, 0xD854 /*0xDDE5*/, 0xD854 /*0xDDCD*/, 0x7758, 0x7760, 0x776A,
- 0xD854 /*0xDE1E*/, 0x7772, 0x777C, 0x777D, 0xD854 /*0xDE4C*/, 0x4058, 0x779A, 0x779F,
- 0x77A2, 0x77A4, 0x77A9, 0x77DE, 0x77DF, 0x77E4, 0x77E6, 0x77EA,
- 0x77EC, 0x4093, 0x77F0, 0x77F4, 0x77FB, 0xD855 /*0xDC2E*/, 0x7805, 0x7806,
- 0x7809, 0x780D, 0x7819, 0x7821, 0x782C, 0x7847, 0x7864, 0x786A,
- 0xD855 /*0xDCD9*/, 0x788A, 0x7894, 0x78A4, 0x789D, 0x789E, 0x789F, 0x78BB,
- 0x78C8, 0x78CC, 0x78CE, 0x78D5, 0x78E0, 0x78E1, 0x78E6, 0x78F9,
- 0x78FA, 0x78FB, 0x78FE, 0xD855 /*0xDDA7*/, 0x7910, 0x791B, 0x7930, 0x7925,
- 0x793B, 0x794A, 0x7958, 0x795B, 0x4105, 0x7967, 0x7972, 0x7994,
- 0x7995, 0x7996, 0x799B, 0x79A1, 0x79A9, 0x79B4, 0x79BB, 0x79C2,
- 0x79C7, 0x79CC, 0x79CD, 0x79D6, 0x4148, 0xD855 /*0xDFA9*/, 0xD855 /*0xDFB4*/, 0x414F,
- 0x7A0A, 0x7A11, 0x7A15, 0x7A1B, 0x7A1E, 0x4163, 0x7A2D,
-};
-static const unsigned short euc_to_utf8_8FF3_x0213[] = {
- 0x7A38, 0x7A47, 0x7A4C, 0x7A56, 0x7A59, 0x7A5C, 0x7A5F,
- 0x7A60, 0x7A67, 0x7A6A, 0x7A75, 0x7A78, 0x7A82, 0x7A8A, 0x7A90,
- 0x7AA3, 0x7AAC, 0xD856 /*0xDDD4*/, 0x41B4, 0x7AB9, 0x7ABC, 0x7ABE, 0x41BF,
- 0x7ACC, 0x7AD1, 0x7AE7, 0x7AE8, 0x7AF4, 0xD856 /*0xDEE4*/, 0xD856 /*0xDEE3*/, 0x7B07,
- 0xD856 /*0xDEF1*/, 0x7B3D, 0x7B27, 0x7B2A, 0x7B2E, 0x7B2F, 0x7B31, 0x41E6,
- 0x41F3, 0x7B7F, 0x7B41, 0x41EE, 0x7B55, 0x7B79, 0x7B64, 0x7B66,
- 0x7B69, 0x7B73, 0xD856 /*0xDFB2*/, 0x4207, 0x7B90, 0x7B91, 0x7B9B, 0x420E,
- 0x7BAF, 0x7BB5, 0x7BBC, 0x7BC5, 0x7BCA, 0xD857 /*0xDC4B*/, 0xD857 /*0xDC64*/, 0x7BD4,
- 0x7BD6, 0x7BDA, 0x7BEA, 0x7BF0, 0x7C03, 0x7C0B, 0x7C0E, 0x7C0F,
- 0x7C26, 0x7C45, 0x7C4A, 0x7C51, 0x7C57, 0x7C5E, 0x7C61, 0x7C69,
- 0x7C6E, 0x7C6F, 0x7C70, 0xD857 /*0xDE2E*/, 0xD857 /*0xDE56*/, 0xD857 /*0xDE65*/, 0x7CA6, 0xD857 /*0xDE62*/,
- 0x7CB6, 0x7CB7, 0x7CBF, 0xD857 /*0xDED8*/, 0x7CC4, 0xD857 /*0xDEC2*/, 0x7CC8,
-};
-static const unsigned short euc_to_utf8_8FF4_x0213[] = {
- 0x7CCD, 0xD857 /*0xDEE8*/, 0x7CD7, 0xD857 /*0xDF23*/, 0x7CE6, 0x7CEB, 0xD857 /*0xDF5C*/,
- 0x7CF5, 0x7D03, 0x7D09, 0x42C6, 0x7D12, 0x7D1E, 0xD857 /*0xDFE0*/, 0xD857 /*0xDFD4*/,
- 0x7D3D, 0x7D3E, 0x7D40, 0x7D47, 0xD858 /*0xDC0C*/, 0xD857 /*0xDFFB*/, 0x42D6, 0x7D59,
- 0x7D5A, 0x7D6A, 0x7D70, 0x42DD, 0x7D7F, 0xD858 /*0xDC17*/, 0x7D86, 0x7D88,
- 0x7D8C, 0x7D97, 0xD858 /*0xDC60*/, 0x7D9D, 0x7DA7, 0x7DAA, 0x7DB6, 0x7DB7,
- 0x7DC0, 0x7DD7, 0x7DD9, 0x7DE6, 0x7DF1, 0x7DF9, 0x4302, 0xD858 /*0xDCED*/,
- 0xFA58, 0x7E10, 0x7E17, 0x7E1D, 0x7E20, 0x7E27, 0x7E2C, 0x7E45,
- 0x7E73, 0x7E75, 0x7E7E, 0x7E86, 0x7E87, 0x432B, 0x7E91, 0x7E98,
- 0x7E9A, 0x4343, 0x7F3C, 0x7F3B, 0x7F3E, 0x7F43, 0x7F44, 0x7F4F,
- 0x34C1, 0xD858 /*0xDE70*/, 0x7F52, 0xD858 /*0xDE86*/, 0x7F61, 0x7F63, 0x7F64, 0x7F6D,
- 0x7F7D, 0x7F7E, 0xD858 /*0xDF4C*/, 0x7F90, 0x517B, 0xD84F /*0xDD0E*/, 0x7F96, 0x7F9C,
- 0x7FAD, 0xD859 /*0xDC02*/, 0x7FC3, 0x7FCF, 0x7FE3, 0x7FE5, 0x7FEF,
-};
-static const unsigned short euc_to_utf8_8FF5_x0213[] = {
- 0x7FF2, 0x8002, 0x800A, 0x8008, 0x800E, 0x8011, 0x8016,
- 0x8024, 0x802C, 0x8030, 0x8043, 0x8066, 0x8071, 0x8075, 0x807B,
- 0x8099, 0x809C, 0x80A4, 0x80A7, 0x80B8, 0xD859 /*0xDE7E*/, 0x80C5, 0x80D5,
- 0x80D8, 0x80E6, 0xD859 /*0xDEB0*/, 0x810D, 0x80F5, 0x80FB, 0x43EE, 0x8135,
- 0x8116, 0x811E, 0x43F0, 0x8124, 0x8127, 0x812C, 0xD859 /*0xDF1D*/, 0x813D,
- 0x4408, 0x8169, 0x4417, 0x8181, 0x441C, 0x8184, 0x8185, 0x4422,
- 0x8198, 0x81B2, 0x81C1, 0x81C3, 0x81D6, 0x81DB, 0xD85A /*0xDCDD*/, 0x81E4,
- 0xD85A /*0xDCEA*/, 0x81EC, 0xD85A /*0xDD51*/, 0x81FD, 0x81FF, 0xD85A /*0xDD6F*/, 0x8204, 0xD85A /*0xDDDD*/,
- 0x8219, 0x8221, 0x8222, 0xD85A /*0xDE1E*/, 0x8232, 0x8234, 0x823C, 0x8246,
- 0x8249, 0x8245, 0xD85A /*0xDE58*/, 0x824B, 0x4476, 0x824F, 0x447A, 0x8257,
- 0xD85A /*0xDE8C*/, 0x825C, 0x8263, 0xD85A /*0xDEB7*/, 0xFA5D, 0xFA5E, 0x8279, 0x4491,
- 0x827D, 0x827F, 0x8283, 0x828A, 0x8293, 0x82A7, 0x82A8,
-};
-static const unsigned short euc_to_utf8_8FF6_x0213[] = {
- 0x82B2, 0x82B4, 0x82BA, 0x82BC, 0x82E2, 0x82E8, 0x82F7,
- 0x8307, 0x8308, 0x830C, 0x8354, 0x831B, 0x831D, 0x8330, 0x833C,
- 0x8344, 0x8357, 0x44BE, 0x837F, 0x44D4, 0x44B3, 0x838D, 0x8394,
- 0x8395, 0x839B, 0x839D, 0x83C9, 0x83D0, 0x83D4, 0x83DD, 0x83E5,
- 0x83F9, 0x840F, 0x8411, 0x8415, 0xD85B /*0xDC73*/, 0x8417, 0x8439, 0x844A,
- 0x844F, 0x8451, 0x8452, 0x8459, 0x845A, 0x845C, 0xD85B /*0xDCDD*/, 0x8465,
- 0x8476, 0x8478, 0x847C, 0x8481, 0x450D, 0x84DC, 0x8497, 0x84A6,
- 0x84BE, 0x4508, 0x84CE, 0x84CF, 0x84D3, 0xD85B /*0xDE65*/, 0x84E7, 0x84EA,
- 0x84EF, 0x84F0, 0x84F1, 0x84FA, 0x84FD, 0x850C, 0x851B, 0x8524,
- 0x8525, 0x852B, 0x8534, 0x854F, 0x856F, 0x4525, 0x4543, 0x853E,
- 0x8551, 0x8553, 0x855E, 0x8561, 0x8562, 0xD85B /*0xDF94*/, 0x857B, 0x857D,
- 0x857F, 0x8581, 0x8586, 0x8593, 0x859D, 0x859F, 0xD85B /*0xDFF8*/,
-};
-static const unsigned short euc_to_utf8_8FF7_x0213[] = {
- 0xD85B /*0xDFF6*/, 0xD85B /*0xDFF7*/, 0x85B7, 0x85BC, 0x85C7, 0x85CA, 0x85D8,
- 0x85D9, 0x85DF, 0x85E1, 0x85E6, 0x85F6, 0x8600, 0x8611, 0x861E,
- 0x8621, 0x8624, 0x8627, 0xD85C /*0xDD0D*/, 0x8639, 0x863C, 0xD85C /*0xDD39*/, 0x8640,
- 0xFA20, 0x8653, 0x8656, 0x866F, 0x8677, 0x867A, 0x8687, 0x8689,
- 0x868D, 0x8691, 0x869C, 0x869D, 0x86A8, 0xFA21, 0x86B1, 0x86B3,
- 0x86C1, 0x86C3, 0x86D1, 0x86D5, 0x86D7, 0x86E3, 0x86E6, 0x45B8,
- 0x8705, 0x8707, 0x870E, 0x8710, 0x8713, 0x8719, 0x871F, 0x8721,
- 0x8723, 0x8731, 0x873A, 0x873E, 0x8740, 0x8743, 0x8751, 0x8758,
- 0x8764, 0x8765, 0x8772, 0x877C, 0xD85C /*0xDFDB*/, 0xD85C /*0xDFDA*/, 0x87A7, 0x8789,
- 0x878B, 0x8793, 0x87A0, 0xD85C /*0xDFFE*/, 0x45E5, 0x87BE, 0xD85D /*0xDC10*/, 0x87C1,
- 0x87CE, 0x87F5, 0x87DF, 0xD85D /*0xDC49*/, 0x87E3, 0x87E5, 0x87E6, 0x87EA,
- 0x87EB, 0x87ED, 0x8801, 0x8803, 0x880B, 0x8813, 0x8828,
-};
-static const unsigned short euc_to_utf8_8FF8_x0213[] = {
- 0x882E, 0x8832, 0x883C, 0x460F, 0x884A, 0x8858, 0x885F,
- 0x8864, 0xD85D /*0xDE15*/, 0xD85D /*0xDE14*/, 0x8869, 0xD85D /*0xDE31*/, 0x886F, 0x88A0, 0x88BC,
- 0x88BD, 0x88BE, 0x88C0, 0x88D2, 0xD85D /*0xDE93*/, 0x88D1, 0x88D3, 0x88DB,
- 0x88F0, 0x88F1, 0x4641, 0x8901, 0xD85D /*0xDF0E*/, 0x8937, 0xD85D /*0xDF23*/, 0x8942,
- 0x8945, 0x8949, 0xD85D /*0xDF52*/, 0x4665, 0x8962, 0x8980, 0x8989, 0x8990,
- 0x899F, 0x89B0, 0x89B7, 0x89D6, 0x89D8, 0x89EB, 0x46A1, 0x89F1,
- 0x89F3, 0x89FD, 0x89FF, 0x46AF, 0x8A11, 0x8A14, 0xD85E /*0xDD85*/, 0x8A21,
- 0x8A35, 0x8A3E, 0x8A45, 0x8A4D, 0x8A58, 0x8AAE, 0x8A90, 0x8AB7,
- 0x8ABE, 0x8AD7, 0x8AFC, 0xD85E /*0xDE84*/, 0x8B0A, 0x8B05, 0x8B0D, 0x8B1C,
- 0x8B1F, 0x8B2D, 0x8B43, 0x470C, 0x8B51, 0x8B5E, 0x8B76, 0x8B7F,
- 0x8B81, 0x8B8B, 0x8B94, 0x8B95, 0x8B9C, 0x8B9E, 0x8C39, 0xD85E /*0xDFB3*/,
- 0x8C3D, 0xD85E /*0xDFBE*/, 0xD85E /*0xDFC7*/, 0x8C45, 0x8C47, 0x8C4F, 0x8C54,
-};
-static const unsigned short euc_to_utf8_8FF9_x0213[] = {
- 0x8C57, 0x8C69, 0x8C6D, 0x8C73, 0xD85F /*0xDCB8*/, 0x8C93, 0x8C92,
- 0x8C99, 0x4764, 0x8C9B, 0x8CA4, 0x8CD6, 0x8CD5, 0x8CD9, 0xD85F /*0xDDA0*/,
- 0x8CF0, 0x8CF1, 0xD85F /*0xDE10*/, 0x8D09, 0x8D0E, 0x8D6C, 0x8D84, 0x8D95,
- 0x8DA6, 0xD85F /*0xDFB7*/, 0x8DC6, 0x8DC8, 0x8DD9, 0x8DEC, 0x8E0C, 0x47FD,
- 0x8DFD, 0x8E06, 0xD860 /*0xDC8A*/, 0x8E14, 0x8E16, 0x8E21, 0x8E22, 0x8E27,
- 0xD860 /*0xDCBB*/, 0x4816, 0x8E36, 0x8E39, 0x8E4B, 0x8E54, 0x8E62, 0x8E6C,
- 0x8E6D, 0x8E6F, 0x8E98, 0x8E9E, 0x8EAE, 0x8EB3, 0x8EB5, 0x8EB6,
- 0x8EBB, 0xD860 /*0xDE82*/, 0x8ED1, 0x8ED4, 0x484E, 0x8EF9, 0xD860 /*0xDEF3*/, 0x8F00,
- 0x8F08, 0x8F17, 0x8F2B, 0x8F40, 0x8F4A, 0x8F58, 0xD861 /*0xDC0C*/, 0x8FA4,
- 0x8FB4, 0xFA66, 0x8FB6, 0xD861 /*0xDC55*/, 0x8FC1, 0x8FC6, 0xFA24, 0x8FCA,
- 0x8FCD, 0x8FD3, 0x8FD5, 0x8FE0, 0x8FF1, 0x8FF5, 0x8FFB, 0x9002,
- 0x900C, 0x9037, 0xD861 /*0xDD6B*/, 0x9043, 0x9044, 0x905D, 0xD861 /*0xDDC8*/,
-};
-static const unsigned short euc_to_utf8_8FFA_x0213[] = {
- 0xD861 /*0xDDC9*/, 0x9085, 0x908C, 0x9090, 0x961D, 0x90A1, 0x48B5,
- 0x90B0, 0x90B6, 0x90C3, 0x90C8, 0xD861 /*0xDED7*/, 0x90DC, 0x90DF, 0xD861 /*0xDEFA*/,
- 0x90F6, 0x90F2, 0x9100, 0x90EB, 0x90FE, 0x90FF, 0x9104, 0x9106,
- 0x9118, 0x911C, 0x911E, 0x9137, 0x9139, 0x913A, 0x9146, 0x9147,
- 0x9157, 0x9159, 0x9161, 0x9164, 0x9174, 0x9179, 0x9185, 0x918E,
- 0x91A8, 0x91AE, 0x91B3, 0x91B6, 0x91C3, 0x91C4, 0x91DA, 0xD862 /*0xDD49*/,
- 0xD862 /*0xDD46*/, 0x91EC, 0x91EE, 0x9201, 0x920A, 0x9216, 0x9217, 0xD862 /*0xDD6B*/,
- 0x9233, 0x9242, 0x9247, 0x924A, 0x924E, 0x9251, 0x9256, 0x9259,
- 0x9260, 0x9261, 0x9265, 0x9267, 0x9268, 0xD862 /*0xDD87*/, 0xD862 /*0xDD88*/, 0x927C,
- 0x927D, 0x927F, 0x9289, 0x928D, 0x9297, 0x9299, 0x929F, 0x92A7,
- 0x92AB, 0xD862 /*0xDDBA*/, 0xD862 /*0xDDBB*/, 0x92B2, 0x92BF, 0x92C0, 0x92C6, 0x92CE,
- 0x92D0, 0x92D7, 0x92D9, 0x92E5, 0x92E7, 0x9311, 0xD862 /*0xDE1E*/,
-};
-static const unsigned short euc_to_utf8_8FFB_x0213[] = {
- 0xD862 /*0xDE29*/, 0x92F7, 0x92F9, 0x92FB, 0x9302, 0x930D, 0x9315,
- 0x931D, 0x931E, 0x9327, 0x9329, 0xD862 /*0xDE71*/, 0xD862 /*0xDE43*/, 0x9347, 0x9351,
- 0x9357, 0x935A, 0x936B, 0x9371, 0x9373, 0x93A1, 0xD862 /*0xDE99*/, 0xD862 /*0xDECD*/,
- 0x9388, 0x938B, 0x938F, 0x939E, 0x93F5, 0xD862 /*0xDEE4*/, 0xD862 /*0xDEDD*/, 0x93F1,
- 0x93C1, 0x93C7, 0x93DC, 0x93E2, 0x93E7, 0x9409, 0x940F, 0x9416,
- 0x9417, 0x93FB, 0x9432, 0x9434, 0x943B, 0x9445, 0xD862 /*0xDFC1*/, 0xD862 /*0xDFEF*/,
- 0x946D, 0x946F, 0x9578, 0x9579, 0x9586, 0x958C, 0x958D, 0xD863 /*0xDD10*/,
- 0x95AB, 0x95B4, 0xD863 /*0xDD71*/, 0x95C8, 0xD863 /*0xDDFB*/, 0xD863 /*0xDE1F*/, 0x962C, 0x9633,
- 0x9634, 0xD863 /*0xDE36*/, 0x963C, 0x9641, 0x9661, 0xD863 /*0xDE89*/, 0x9682, 0xD863 /*0xDEEB*/,
- 0x969A, 0xD863 /*0xDF32*/, 0x49E7, 0x96A9, 0x96AF, 0x96B3, 0x96BA, 0x96BD,
- 0x49FA, 0xD863 /*0xDFF8*/, 0x96D8, 0x96DA, 0x96DD, 0x4A04, 0x9714, 0x9723,
- 0x4A29, 0x9736, 0x9741, 0x9747, 0x9755, 0x9757, 0x975B,
-};
-static const unsigned short euc_to_utf8_8FFC_x0213[] = {
- 0x976A, 0xD864 /*0xDEA0*/, 0xD864 /*0xDEB1*/, 0x9796, 0x979A, 0x979E, 0x97A2,
- 0x97B1, 0x97B2, 0x97BE, 0x97CC, 0x97D1, 0x97D4, 0x97D8, 0x97D9,
- 0x97E1, 0x97F1, 0x9804, 0x980D, 0x980E, 0x9814, 0x9816, 0x4ABC,
- 0xD865 /*0xDC90*/, 0x9823, 0x9832, 0x9833, 0x9825, 0x9847, 0x9866, 0x98AB,
- 0x98AD, 0x98B0, 0xD865 /*0xDDCF*/, 0x98B7, 0x98B8, 0x98BB, 0x98BC, 0x98BF,
- 0x98C2, 0x98C7, 0x98CB, 0x98E0, 0xD865 /*0xDE7F*/, 0x98E1, 0x98E3, 0x98E5,
- 0x98EA, 0x98F0, 0x98F1, 0x98F3, 0x9908, 0x4B3B, 0xD865 /*0xDEF0*/, 0x9916,
- 0x9917, 0xD865 /*0xDF19*/, 0x991A, 0x991B, 0x991C, 0xD865 /*0xDF50*/, 0x9931, 0x9932,
- 0x9933, 0x993A, 0x993B, 0x993C, 0x9940, 0x9941, 0x9946, 0x994D,
- 0x994E, 0x995C, 0x995F, 0x9960, 0x99A3, 0x99A6, 0x99B9, 0x99BD,
- 0x99BF, 0x99C3, 0x99C9, 0x99D4, 0x99D9, 0x99DE, 0xD866 /*0xDCC6*/, 0x99F0,
- 0x99F9, 0x99FC, 0x9A0A, 0x9A11, 0x9A16, 0x9A1A, 0x9A20,
-};
-static const unsigned short euc_to_utf8_8FFD_x0213[] = {
- 0x9A31, 0x9A36, 0x9A44, 0x9A4C, 0x9A58, 0x4BC2, 0x9AAF,
- 0x4BCA, 0x9AB7, 0x4BD2, 0x9AB9, 0xD866 /*0xDE72*/, 0x9AC6, 0x9AD0, 0x9AD2,
- 0x9AD5, 0x4BE8, 0x9ADC, 0x9AE0, 0x9AE5, 0x9AE9, 0x9B03, 0x9B0C,
- 0x9B10, 0x9B12, 0x9B16, 0x9B1C, 0x9B2B, 0x9B33, 0x9B3D, 0x4C20,
- 0x9B4B, 0x9B63, 0x9B65, 0x9B6B, 0x9B6C, 0x9B73, 0x9B76, 0x9B77,
- 0x9BA6, 0x9BAC, 0x9BB1, 0xD867 /*0xDDDB*/, 0xD867 /*0xDE3D*/, 0x9BB2, 0x9BB8, 0x9BBE,
- 0x9BC7, 0x9BF3, 0x9BD8, 0x9BDD, 0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF,
- 0x9BEE, 0xD867 /*0xDE15*/, 0x9BFA, 0xD867 /*0xDE8A*/, 0x9BF7, 0xD867 /*0xDE49*/, 0x9C16, 0x9C18,
- 0x9C19, 0x9C1A, 0x9C1D, 0x9C22, 0x9C27, 0x9C29, 0x9C2A, 0xD867 /*0xDEC4*/,
- 0x9C31, 0x9C36, 0x9C37, 0x9C45, 0x9C5C, 0xD867 /*0xDEE9*/, 0x9C49, 0x9C4A,
- 0xD867 /*0xDEDB*/, 0x9C54, 0x9C58, 0x9C5B, 0x9C5D, 0x9C5F, 0x9C69, 0x9C6A,
- 0x9C6B, 0x9C6D, 0x9C6E, 0x9C70, 0x9C72, 0x9C75, 0x9C7A,
-};
-static const unsigned short euc_to_utf8_8FFE_x0213[] = {
- 0x9CE6, 0x9CF2, 0x9D0B, 0x9D02, 0xD867 /*0xDFCE*/, 0x9D11, 0x9D17,
- 0x9D18, 0xD868 /*0xDC2F*/, 0x4CC4, 0xD868 /*0xDC1A*/, 0x9D32, 0x4CD1, 0x9D42, 0x9D4A,
- 0x9D5F, 0x9D62, 0xD868 /*0xDCF9*/, 0x9D69, 0x9D6B, 0xD868 /*0xDC82*/, 0x9D73, 0x9D76,
- 0x9D77, 0x9D7E, 0x9D84, 0x9D8D, 0x9D99, 0x9DA1, 0x9DBF, 0x9DB5,
- 0x9DB9, 0x9DBD, 0x9DC3, 0x9DC7, 0x9DC9, 0x9DD6, 0x9DDA, 0x9DDF,
- 0x9DE0, 0x9DE3, 0x9DF4, 0x4D07, 0x9E0A, 0x9E02, 0x9E0D, 0x9E19,
- 0x9E1C, 0x9E1D, 0x9E7B, 0xD848 /*0xDE18*/, 0x9E80, 0x9E85, 0x9E9B, 0x9EA8,
- 0xD868 /*0xDF8C*/, 0x9EBD, 0xD869 /*0xDC37*/, 0x9EDF, 0x9EE7, 0x9EEE, 0x9EFF, 0x9F02,
- 0x4D77, 0x9F03, 0x9F17, 0x9F19, 0x9F2F, 0x9F37, 0x9F3A, 0x9F3D,
- 0x9F41, 0x9F45, 0x9F46, 0x9F53, 0x9F55, 0x9F58, 0xD869 /*0xDDF1*/, 0x9F5D,
- 0xD869 /*0xDE02*/, 0x9F69, 0xD869 /*0xDE1A*/, 0x9F6D, 0x9F70, 0x9F75, 0xD869 /*0xDEB2*/, 0,
- 0, 0, 0, 0, 0, 0, 0,
-};
#ifdef X0212_ENABLE
static const unsigned short euc_to_utf8_8FA2[] = {
@@ -3137,32 +2408,6 @@ const unsigned short *const euc_to_utf8_2bytes_mac[] = {
0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
euc_to_utf8_FC_ms, 0, 0,
};
-const unsigned short *const euc_to_utf8_2bytes_x0213[] = {
- euc_to_utf8_A1, euc_to_utf8_A2_x0213, euc_to_utf8_A3_x0213,
- euc_to_utf8_A4_x0213, euc_to_utf8_A5_x0213, euc_to_utf8_A6_x0213, euc_to_utf8_A7_x0213,
- euc_to_utf8_A8_x0213, euc_to_utf8_A9_x0213, euc_to_utf8_AA_x0213, euc_to_utf8_AB_x0213,
- euc_to_utf8_AC_x0213, euc_to_utf8_AD_x0213, euc_to_utf8_AE_x0213, euc_to_utf8_AF_x0213,
- 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_x0213,
- 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_x0213, euc_to_utf8_F5_x0213, euc_to_utf8_F6_x0213, euc_to_utf8_F7_x0213,
- euc_to_utf8_F8_x0213, euc_to_utf8_F9_x0213, euc_to_utf8_FA_x0213, euc_to_utf8_FB_x0213,
- euc_to_utf8_FC_x0213, euc_to_utf8_FD_x0213, euc_to_utf8_FE_x0213,
-};
#ifdef X0212_ENABLE
const unsigned short *const x0212_to_utf8_2bytes[] = {
@@ -3190,371 +2435,7 @@ const unsigned short *const x0212_to_utf8_2bytes[] = {
euc_to_utf8_8FF4, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0,};
-
-const unsigned short *const x0212_to_utf8_2bytes_x0213[] = {
- euc_to_utf8_8FA1_x0213, euc_to_utf8_8FA2, euc_to_utf8_8FA3_x0213,
- euc_to_utf8_8FA4_x0213, euc_to_utf8_8FA5_x0213, euc_to_utf8_8FA6, euc_to_utf8_8FA7,
- euc_to_utf8_8FA8_x0213, euc_to_utf8_8FA9, euc_to_utf8_8FAA, euc_to_utf8_8FAB,
- euc_to_utf8_8FAC_x0213, euc_to_utf8_8FAD_x0213, euc_to_utf8_8FAE_x0213, euc_to_utf8_8FAF_x0213,
- euc_to_utf8_8FB0, euc_to_utf8_8FB1, euc_to_utf8_8FB2, euc_to_utf8_8FB3,
- euc_to_utf8_8FB4, euc_to_utf8_8FB5, euc_to_utf8_8FB6, euc_to_utf8_8FB7,
- euc_to_utf8_8FB8, euc_to_utf8_8FB9, euc_to_utf8_8FBA, euc_to_utf8_8FBB,
- euc_to_utf8_8FBC, euc_to_utf8_8FBD, euc_to_utf8_8FBE, euc_to_utf8_8FBF,
- euc_to_utf8_8FC0, euc_to_utf8_8FC1, euc_to_utf8_8FC2, euc_to_utf8_8FC3,
- euc_to_utf8_8FC4, euc_to_utf8_8FC5, euc_to_utf8_8FC6, euc_to_utf8_8FC7,
- euc_to_utf8_8FC8, euc_to_utf8_8FC9, euc_to_utf8_8FCA, euc_to_utf8_8FCB,
- euc_to_utf8_8FCC, euc_to_utf8_8FCD, euc_to_utf8_8FCE, euc_to_utf8_8FCF,
- euc_to_utf8_8FD0, euc_to_utf8_8FD1, euc_to_utf8_8FD2, euc_to_utf8_8FD3,
- euc_to_utf8_8FD4, euc_to_utf8_8FD5, euc_to_utf8_8FD6, euc_to_utf8_8FD7,
- euc_to_utf8_8FD8, euc_to_utf8_8FD9, euc_to_utf8_8FDA, euc_to_utf8_8FDB,
- euc_to_utf8_8FDC, euc_to_utf8_8FDD, euc_to_utf8_8FDE, euc_to_utf8_8FDF,
- euc_to_utf8_8FE0, euc_to_utf8_8FE1, euc_to_utf8_8FE2, euc_to_utf8_8FE3,
- euc_to_utf8_8FE4, euc_to_utf8_8FE5, euc_to_utf8_8FE6, euc_to_utf8_8FE7,
- euc_to_utf8_8FE8, euc_to_utf8_8FE9, euc_to_utf8_8FEA, euc_to_utf8_8FEB,
- euc_to_utf8_8FEC, euc_to_utf8_8FED, euc_to_utf8_8FEE_x0213, euc_to_utf8_8FEF_x0213,
- euc_to_utf8_8FF0_x0213, euc_to_utf8_8FF1_x0213, euc_to_utf8_8FF2_x0213, euc_to_utf8_8FF3_x0213,
- euc_to_utf8_8FF4_x0213, euc_to_utf8_8FF5_x0213, euc_to_utf8_8FF6_x0213, euc_to_utf8_8FF7_x0213,
- euc_to_utf8_8FF8_x0213, euc_to_utf8_8FF9_x0213, euc_to_utf8_8FFA_x0213, euc_to_utf8_8FFB_x0213,
- euc_to_utf8_8FFC_x0213, euc_to_utf8_8FFD_x0213, euc_to_utf8_8FFE_x0213,};
#endif /* X0212_ENABLE */
-
-const unsigned short x0213_combining_chars[sizeof_x0213_combining_chars] = {
- 0x309A, 0x0300, 0x0301, 0x02E5, 0x02E9,
-};
-const unsigned short x0213_combining_table[sizeof_x0213_combining_table][3] = {
- {0x2477, 0x304B, 0x309A},
- {0x2478, 0x304D, 0x309A},
- {0x2479, 0x304F, 0x309A},
- {0x247A, 0x3051, 0x309A},
- {0x247B, 0x3053, 0x309A},
- {0x2577, 0x30AB, 0x309A},
- {0x2578, 0x30AD, 0x309A},
- {0x2579, 0x30AF, 0x309A},
- {0x257A, 0x30B1, 0x309A},
- {0x257B, 0x30B3, 0x309A},
- {0x257C, 0x30BB, 0x309A},
- {0x257D, 0x30C4, 0x309A},
- {0x257E, 0x30C8, 0x309A},
- {0x2678, 0x31F7, 0x309A},
- {0x2B44, 0x00E6, 0x0300},
- {0x2B48, 0x0254, 0x0300},
- {0x2B49, 0x0254, 0x0301},
- {0x2B4A, 0x028C, 0x0300},
- {0x2B4B, 0x028C, 0x0301},
- {0x2B4C, 0x0259, 0x0300},
- {0x2B4D, 0x0259, 0x0301},
- {0x2B4E, 0x025A, 0x0300},
- {0x2B4F, 0x025A, 0x0301},
- {0x2B65, 0x02E9, 0x02E5},
- {0x2B66, 0x02E5, 0x02E9},
-};
-const unsigned short x0213_1_surrogate_table[sizeof_x0213_1_surrogate_table][3] = {
- {0x2E22, 0xD840, 0xDC0B},
- {0x2F42, 0xD844, 0xDE3D},
- {0x2F4C, 0xD844, 0xDF1B},
- {0x2F60, 0xD845, 0xDC6E},
- {0x2F7B, 0xD846, 0xDCBD},
- {0x4F54, 0xD842, 0xDF9F},
- {0x4F63, 0xD845, 0xDEB4},
- {0x4F6E, 0xD847, 0xDE34},
- {0x753A, 0xD84C, 0xDDC4},
- {0x7572, 0xD84D, 0xDDC4},
- {0x7629, 0xD84D, 0xDF3F},
- {0x7632, 0xD84D, 0xDF63},
- {0x7660, 0xD84F, 0xDCFE},
- {0x776C, 0xD851, 0xDFF1},
- {0x787E, 0xD855, 0xDC8E},
- {0x7929, 0xD855, 0xDD0E},
- {0x7947, 0xD855, 0xDF71},
- {0x7954, 0xD856, 0xDDC4},
- {0x796E, 0xD857, 0xDDA1},
- {0x7A5D, 0xD85A, 0xDEFF},
- {0x7B33, 0xD85B, 0xDE40},
- {0x7B49, 0xD85C, 0xDCF4},
- {0x7B6C, 0xD85D, 0xDE84},
- {0x7C49, 0xD860, 0xDE77},
- {0x7C51, 0xD860, 0xDFCD},
- {0x7E66, 0xD868, 0xDD90},
-};
-const unsigned short x0213_2_surrogate_table[sizeof_x0213_2_surrogate_table][3] = {
- {0x2121, 0xD840, 0xDC89},
- {0x212B, 0xD840, 0xDCA2},
- {0x212E, 0xD840, 0xDCA4},
- {0x2136, 0xD840, 0xDDA2},
- {0x2146, 0xD840, 0xDE13},
- {0x2170, 0xD840, 0xDF2B},
- {0x2177, 0xD840, 0xDF81},
- {0x2179, 0xD840, 0xDF71},
- {0x2322, 0xD840, 0xDFF9},
- {0x2325, 0xD841, 0xDC4A},
- {0x2327, 0xD841, 0xDD09},
- {0x2331, 0xD841, 0xDDD6},
- {0x2332, 0xD841, 0xDE28},
- {0x2338, 0xD841, 0xDF4F},
- {0x233F, 0xD842, 0xDC07},
- {0x2341, 0xD842, 0xDC3A},
- {0x234A, 0xD842, 0xDCB9},
- {0x2352, 0xD842, 0xDD7C},
- {0x2353, 0xD842, 0xDD9D},
- {0x2359, 0xD842, 0xDED3},
- {0x235C, 0xD842, 0xDF1D},
- {0x2377, 0xD843, 0xDD45},
- {0x242A, 0xD843, 0xDDE1},
- {0x2431, 0xD843, 0xDE95},
- {0x2432, 0xD843, 0xDE6D},
- {0x243A, 0xD843, 0xDE64},
- {0x243D, 0xD843, 0xDF5F},
- {0x2459, 0xD844, 0xDE01},
- {0x245C, 0xD844, 0xDE55},
- {0x245E, 0xD844, 0xDE7B},
- {0x2463, 0xD844, 0xDE74},
- {0x246A, 0xD844, 0xDEE4},
- {0x246B, 0xD844, 0xDED7},
- {0x2472, 0xD844, 0xDEFD},
- {0x2474, 0xD844, 0xDF36},
- {0x2475, 0xD844, 0xDF44},
- {0x2525, 0xD844, 0xDFC4},
- {0x2532, 0xD845, 0xDC6D},
- {0x253E, 0xD845, 0xDDD7},
- {0x2544, 0xD85B, 0xDC29},
- {0x2547, 0xD845, 0xDE47},
- {0x2555, 0xD845, 0xDF06},
- {0x2556, 0xD845, 0xDF42},
- {0x257E, 0xD846, 0xDDC3},
- {0x2830, 0xD847, 0xDC56},
- {0x2837, 0xD847, 0xDD2D},
- {0x2838, 0xD847, 0xDD45},
- {0x283A, 0xD847, 0xDD78},
- {0x283B, 0xD847, 0xDD62},
- {0x283F, 0xD847, 0xDDA1},
- {0x2840, 0xD847, 0xDD9C},
- {0x2845, 0xD847, 0xDD92},
- {0x2848, 0xD847, 0xDDB7},
- {0x284A, 0xD847, 0xDDE0},
- {0x284B, 0xD847, 0xDE33},
- {0x285B, 0xD847, 0xDF1E},
- {0x2866, 0xD847, 0xDF76},
- {0x286C, 0xD847, 0xDFFA},
- {0x2C22, 0xD848, 0xDD7B},
- {0x2C2B, 0xD848, 0xDF1E},
- {0x2C30, 0xD848, 0xDFAD},
- {0x2C50, 0xD849, 0xDEF3},
- {0x2C65, 0xD84A, 0xDC5B},
- {0x2C6D, 0xD84A, 0xDCAB},
- {0x2C72, 0xD84A, 0xDD8F},
- {0x2D24, 0xD84A, 0xDEB8},
- {0x2D29, 0xD84A, 0xDF4F},
- {0x2D2A, 0xD84A, 0xDF50},
- {0x2D32, 0xD84A, 0xDF46},
- {0x2D34, 0xD84B, 0xDC1D},
- {0x2D35, 0xD84A, 0xDFA6},
- {0x2D39, 0xD84B, 0xDC24},
- {0x2D56, 0xD84B, 0xDDE1},
- {0x2D7D, 0xD84C, 0xDDC3},
- {0x2E23, 0xD84C, 0xDDF5},
- {0x2E24, 0xD84C, 0xDDB6},
- {0x2E3A, 0xD84C, 0xDF72},
- {0x2E3C, 0xD84C, 0xDFD3},
- {0x2E3D, 0xD84C, 0xDFD2},
- {0x2E42, 0xD84C, 0xDFD0},
- {0x2E43, 0xD84C, 0xDFE4},
- {0x2E44, 0xD84C, 0xDFD5},
- {0x2E47, 0xD84C, 0xDFDA},
- {0x2E49, 0xD84C, 0xDFDF},
- {0x2E55, 0xD84D, 0xDC4A},
- {0x2E56, 0xD84D, 0xDC51},
- {0x2E57, 0xD84D, 0xDC4B},
- {0x2E5B, 0xD84D, 0xDC65},
- {0x2E77, 0xD84D, 0xDCE4},
- {0x2E78, 0xD84D, 0xDD5A},
- {0x2F2A, 0xD84D, 0xDD94},
- {0x2F3F, 0xD84D, 0xDE39},
- {0x2F40, 0xD84D, 0xDE47},
- {0x2F42, 0xD84D, 0xDE38},
- {0x2F43, 0xD84D, 0xDE3A},
- {0x2F4E, 0xD84D, 0xDF1C},
- {0x2F59, 0xD84D, 0xDF0C},
- {0x2F61, 0xD84D, 0xDF64},
- {0x2F69, 0xD84D, 0xDFFF},
- {0x2F6A, 0xD84D, 0xDFE7},
- {0x2F70, 0xD84E, 0xDC24},
- {0x2F75, 0xD84E, 0xDC3D},
- {0x6E23, 0xD84E, 0xDE98},
- {0x6E34, 0xD84F, 0xDC7F},
- {0x6E49, 0xD84F, 0xDD00},
- {0x6E5C, 0xD84F, 0xDD40},
- {0x6E5E, 0xD84F, 0xDDFA},
- {0x6E5F, 0xD84F, 0xDDF9},
- {0x6E60, 0xD84F, 0xDDD3},
- {0x6F32, 0xD84F, 0xDF7E},
- {0x6F47, 0xD850, 0xDC96},
- {0x6F4D, 0xD850, 0xDD03},
- {0x6F61, 0xD850, 0xDDC6},
- {0x6F64, 0xD850, 0xDDFE},
- {0x7022, 0xD850, 0xDFBC},
- {0x7033, 0xD851, 0xDE29},
- {0x7039, 0xD851, 0xDEA5},
- {0x7053, 0xD852, 0xDC96},
- {0x707B, 0xD852, 0xDE4D},
- {0x712E, 0xD852, 0xDF56},
- {0x7130, 0xD852, 0xDF6F},
- {0x7135, 0xD853, 0xDC16},
- {0x7144, 0xD853, 0xDD14},
- {0x715D, 0xD853, 0xDE0E},
- {0x7161, 0xD853, 0xDE37},
- {0x7166, 0xD853, 0xDE6A},
- {0x7169, 0xD853, 0xDE8B},
- {0x7175, 0xD854, 0xDC4A},
- {0x7177, 0xD854, 0xDC55},
- {0x717A, 0xD854, 0xDD22},
- {0x7221, 0xD854, 0xDDA9},
- {0x7223, 0xD854, 0xDDE5},
- {0x7224, 0xD854, 0xDDCD},
- {0x7228, 0xD854, 0xDE1E},
- {0x722C, 0xD854, 0xDE4C},
- {0x723D, 0xD855, 0xDC2E},
- {0x7248, 0xD855, 0xDCD9},
- {0x725B, 0xD855, 0xDDA7},
- {0x7275, 0xD855, 0xDFA9},
- {0x7276, 0xD855, 0xDFB4},
- {0x7332, 0xD856, 0xDDD4},
- {0x733D, 0xD856, 0xDEE4},
- {0x733E, 0xD856, 0xDEE3},
- {0x7340, 0xD856, 0xDEF1},
- {0x7352, 0xD856, 0xDFB2},
- {0x735D, 0xD857, 0xDC4B},
- {0x735E, 0xD857, 0xDC64},
- {0x7373, 0xD857, 0xDE2E},
- {0x7374, 0xD857, 0xDE56},
- {0x7375, 0xD857, 0xDE65},
- {0x7377, 0xD857, 0xDE62},
- {0x737B, 0xD857, 0xDED8},
- {0x737D, 0xD857, 0xDEC2},
- {0x7422, 0xD857, 0xDEE8},
- {0x7424, 0xD857, 0xDF23},
- {0x7427, 0xD857, 0xDF5C},
- {0x742E, 0xD857, 0xDFE0},
- {0x742F, 0xD857, 0xDFD4},
- {0x7434, 0xD858, 0xDC0C},
- {0x7435, 0xD857, 0xDFFB},
- {0x743D, 0xD858, 0xDC17},
- {0x7442, 0xD858, 0xDC60},
- {0x744F, 0xD858, 0xDCED},
- {0x7469, 0xD858, 0xDE70},
- {0x746B, 0xD858, 0xDE86},
- {0x7472, 0xD858, 0xDF4C},
- {0x7475, 0xD84F, 0xDD0E},
- {0x7479, 0xD859, 0xDC02},
- {0x7535, 0xD859, 0xDE7E},
- {0x753A, 0xD859, 0xDEB0},
- {0x7546, 0xD859, 0xDF1D},
- {0x7556, 0xD85A, 0xDCDD},
- {0x7558, 0xD85A, 0xDCEA},
- {0x755A, 0xD85A, 0xDD51},
- {0x755D, 0xD85A, 0xDD6F},
- {0x755F, 0xD85A, 0xDDDD},
- {0x7563, 0xD85A, 0xDE1E},
- {0x756A, 0xD85A, 0xDE58},
- {0x7570, 0xD85A, 0xDE8C},
- {0x7573, 0xD85A, 0xDEB7},
- {0x7644, 0xD85B, 0xDC73},
- {0x764E, 0xD85B, 0xDCDD},
- {0x765D, 0xD85B, 0xDE65},
- {0x7675, 0xD85B, 0xDF94},
- {0x767E, 0xD85B, 0xDFF8},
- {0x7721, 0xD85B, 0xDFF6},
- {0x7722, 0xD85B, 0xDFF7},
- {0x7733, 0xD85C, 0xDD0D},
- {0x7736, 0xD85C, 0xDD39},
- {0x7764, 0xD85C, 0xDFDB},
- {0x7765, 0xD85C, 0xDFDA},
- {0x776B, 0xD85C, 0xDFFE},
- {0x776E, 0xD85D, 0xDC10},
- {0x7773, 0xD85D, 0xDC49},
- {0x7829, 0xD85D, 0xDE15},
- {0x782A, 0xD85D, 0xDE14},
- {0x782C, 0xD85D, 0xDE31},
- {0x7834, 0xD85D, 0xDE93},
- {0x783C, 0xD85D, 0xDF0E},
- {0x783E, 0xD85D, 0xDF23},
- {0x7842, 0xD85D, 0xDF52},
- {0x7856, 0xD85E, 0xDD85},
- {0x7863, 0xD85E, 0xDE84},
- {0x7877, 0xD85E, 0xDFB3},
- {0x7879, 0xD85E, 0xDFBE},
- {0x787A, 0xD85E, 0xDFC7},
- {0x7925, 0xD85F, 0xDCB8},
- {0x792F, 0xD85F, 0xDDA0},
- {0x7932, 0xD85F, 0xDE10},
- {0x7939, 0xD85F, 0xDFB7},
- {0x7942, 0xD860, 0xDC8A},
- {0x7948, 0xD860, 0xDCBB},
- {0x7959, 0xD860, 0xDE82},
- {0x795E, 0xD860, 0xDEF3},
- {0x7966, 0xD861, 0xDC0C},
- {0x796B, 0xD861, 0xDC55},
- {0x797A, 0xD861, 0xDD6B},
- {0x797E, 0xD861, 0xDDC8},
- {0x7A21, 0xD861, 0xDDC9},
- {0x7A2C, 0xD861, 0xDED7},
- {0x7A2F, 0xD861, 0xDEFA},
- {0x7A4F, 0xD862, 0xDD49},
- {0x7A50, 0xD862, 0xDD46},
- {0x7A57, 0xD862, 0xDD6B},
- {0x7A65, 0xD862, 0xDD87},
- {0x7A66, 0xD862, 0xDD88},
- {0x7A71, 0xD862, 0xDDBA},
- {0x7A72, 0xD862, 0xDDBB},
- {0x7A7E, 0xD862, 0xDE1E},
- {0x7B21, 0xD862, 0xDE29},
- {0x7B2C, 0xD862, 0xDE71},
- {0x7B2D, 0xD862, 0xDE43},
- {0x7B36, 0xD862, 0xDE99},
- {0x7B37, 0xD862, 0xDECD},
- {0x7B3D, 0xD862, 0xDEE4},
- {0x7B3E, 0xD862, 0xDEDD},
- {0x7B4E, 0xD862, 0xDFC1},
- {0x7B4F, 0xD862, 0xDFEF},
- {0x7B57, 0xD863, 0xDD10},
- {0x7B5A, 0xD863, 0xDD71},
- {0x7B5C, 0xD863, 0xDDFB},
- {0x7B5D, 0xD863, 0xDE1F},
- {0x7B61, 0xD863, 0xDE36},
- {0x7B65, 0xD863, 0xDE89},
- {0x7B67, 0xD863, 0xDEEB},
- {0x7B69, 0xD863, 0xDF32},
- {0x7B71, 0xD863, 0xDFF8},
- {0x7C22, 0xD864, 0xDEA0},
- {0x7C23, 0xD864, 0xDEB1},
- {0x7C38, 0xD865, 0xDC90},
- {0x7C42, 0xD865, 0xDDCF},
- {0x7C4C, 0xD865, 0xDE7F},
- {0x7C56, 0xD865, 0xDEF0},
- {0x7C59, 0xD865, 0xDF19},
- {0x7C5D, 0xD865, 0xDF50},
- {0x7C76, 0xD866, 0xDCC6},
- {0x7D2C, 0xD866, 0xDE72},
- {0x7D4B, 0xD867, 0xDDDB},
- {0x7D4C, 0xD867, 0xDE3D},
- {0x7D59, 0xD867, 0xDE15},
- {0x7D5B, 0xD867, 0xDE8A},
- {0x7D5D, 0xD867, 0xDE49},
- {0x7D67, 0xD867, 0xDEC4},
- {0x7D6D, 0xD867, 0xDEE9},
- {0x7D70, 0xD867, 0xDEDB},
- {0x7E25, 0xD867, 0xDFCE},
- {0x7E29, 0xD868, 0xDC2F},
- {0x7E2B, 0xD868, 0xDC1A},
- {0x7E32, 0xD868, 0xDCF9},
- {0x7E35, 0xD868, 0xDC82},
- {0x7E53, 0xD848, 0xDE18},
- {0x7E58, 0xD868, 0xDF8C},
- {0x7E5A, 0xD869, 0xDC37},
- {0x7E6E, 0xD869, 0xDDF1},
- {0x7E70, 0xD869, 0xDE02},
- {0x7E72, 0xD869, 0xDE1A},
- {0x7E76, 0xD869, 0xDEB2},
-};
#endif /* UTF8_OUTPUT_ENABLE */
#ifdef UTF8_INPUT_ENABLE
@@ -3598,16 +2479,6 @@ 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_C2_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2922, 0x2923, 0x2171, 0x2172, 0x2924, 0x216F, 0x2925, 0x2178,
- 0x212F, 0x2926, 0x2927, 0x2928, 0x224C, 0x2929, 0x292A, 0x292B,
- 0x216B, 0x215E, 0x292C, 0x292D, 0x212D, 0, 0x2279, 0x292E,
- 0x292F, 0x2930, 0x2931, 0x2932, 0x2933, 0x2934, 0x2935, 0x2936,
-};
static const unsigned short utf8_to_euc_C3[] = {
0xAA22, 0xAA21, 0xAA24, 0xAA2A, 0xAA23, 0xAA29, 0xA921, 0xAA2E,
0xAA32, 0xAA31, 0xAA34, 0xAA33, 0xAA40, 0xAA3F, 0xAA42, 0xAA41,
@@ -3628,16 +2499,6 @@ 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_C3_x0213[] = {
- 0x2937, 0x2938, 0x2939, 0x293A, 0x293B, 0x293C, 0x293D, 0x293E,
- 0x293F, 0x2940, 0x2941, 0x2942, 0x2943, 0x2944, 0x2945, 0x2946,
- 0x2947, 0x2948, 0x2949, 0x294A, 0x294B, 0x294C, 0x294D, 0x215F,
- 0x294E, 0x294F, 0x2950, 0x2951, 0x2952, 0x2953, 0x2954, 0x2955,
- 0x2956, 0x2957, 0x2958, 0x2959, 0x295A, 0x295B, 0x295C, 0x295D,
- 0x295E, 0x295F, 0x2960, 0x2961, 0x2962, 0x2963, 0x2964, 0x2965,
- 0x2966, 0x2967, 0x2968, 0x2969, 0x296A, 0x296B, 0x296C, 0x2160,
- 0x296D, 0x296E, 0x296F, 0x2970, 0x2971, 0x2972, 0x2973, 0x2974,
-};
static const unsigned short utf8_to_euc_C4[] = {
0xAA27, 0xAB27, 0xAA25, 0xAB25, 0xAA28, 0xAB28, 0xAA2B, 0xAB2B,
0xAA2C, 0xAB2C, 0xAA2F, 0xAB2F, 0xAA2D, 0xAB2D, 0xAA30, 0xAB30,
@@ -3648,16 +2509,6 @@ 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_C4_x0213[] = {
- 0x2975, 0x297A, 0x2A3A, 0x2A49, 0x2A21, 0x2A2C, 0x2A3C, 0x2A4B,
- 0x2A59, 0x2A5F, 0xAA2F, 0xAB2F, 0x2A3D, 0x2A4C, 0x2A40, 0x2A4F,
- 0xA922, 0x2A50, 0x2978, 0x297D, 0, 0, 0xAA36, 0xAB36,
- 0x2A3E, 0x2A4D, 0x2A3F, 0x2A4E, 0x2A5A, 0x2A60, 0xAA3B, 0xAB3B,
- 0xAA3D, 0xAB3D, 0xAA3C, 0, 0x2A5B, 0x2A61, 0xA924, 0x2A7D,
- 0xAA47, 0xAB47, 0x2976, 0x297B, 0, 0, 0xAA46, 0xAB46,
- 0xAA44, 0xA945, 0xA926, 0xA946, 0x2A5C, 0x2A62, 0xAA49, 0xAB49,
- 0xA947, 0x2A3B, 0x2A4A, 0xAA4C, 0xAB4C, 0x2A24, 0x2A2F, 0xA929,
-};
static const unsigned short utf8_to_euc_C5[] = {
0xA949, 0xA928, 0xA948, 0xAA4D, 0xAB4D, 0xAA4F, 0xAB4F, 0xAA4E,
0xAB4E, 0xA94A, 0xA92B, 0xA94B, 0xAA57, 0xAB57, 0, 0,
@@ -3668,26 +2519,6 @@ 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_C5_x0213[] = {
- 0xA949, 0x2A23, 0x2A2E, 0x2A41, 0x2A51, 0xAA4F, 0xAB4F, 0x2A42,
- 0x2A52, 0xA94A, 0xA92B, 0x2A7A, 0x2979, 0x297E, 0, 0,
- 0x2A43, 0x2A53, 0x2B2B, 0x2B2A, 0x2A39, 0x2A48, 0xAA5B, 0xAB5B,
- 0x2A44, 0x2A54, 0x2A25, 0x2A30, 0x2A5D, 0x2A63, 0x2A27, 0x2A33,
- 0x2A26, 0x2A32, 0x2A47, 0x2A57, 0x2A28, 0x2A34, 0xA92F, 0xA94F,
- 0xAA6C, 0xAB6C, 0x2977, 0x297C, 0x2A5E, 0x2A64, 0x2A45, 0x2A55,
- 0x2A46, 0x2A56, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
- 0xAA73, 0x2A29, 0x2A35, 0x2A2B, 0x2A38, 0x2A2A, 0x2A37, 0,
-};
-static const unsigned short utf8_to_euc_C6_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x2B29, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_C7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xAA26, 0xAB26, 0xAA43,
@@ -3698,36 +2529,6 @@ 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_C7_x0213[] = {
- 0, 0, 0x2B24, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x286F, 0x2870, 0xAA43,
- 0x2871, 0x2876, 0x2877, 0xAA67, 0x2878, 0xAA70, 0x2879, 0xAA6D,
- 0x287A, 0xAA6F, 0x287B, 0xAA6E, 0x287C, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xAB39, 0, 0,
- 0x2874, 0x2875, 0, 0, 0, 0x2B45, 0, 0,
-};
-static const unsigned short utf8_to_euc_C9_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2B33, 0x2B39, 0x2B3A, 0x2B25, 0x2B38, 0x2B3F, 0x2A6E, 0x2B26,
- 0x2B2E, 0x2B30, 0x2B43, 0, 0x2B31, 0, 0x2B32, 0x2A75,
- 0x2B28, 0x2A79, 0, 0, 0x2B36, 0x2B3C, 0x2B22, 0x2B42,
- 0x2B2C, 0, 0, 0, 0x2A6A, 0x2A74, 0x2A6B, 0x2B34,
- 0x2A7B, 0x2A65, 0x2A76, 0x2A6F, 0, 0x2B2F, 0, 0,
- 0, 0x2A6C, 0x2B41, 0x2A73, 0, 0x2A70, 0x2A67, 0,
-};
-static const unsigned short utf8_to_euc_CA_x0213[] = {
- 0, 0x2A7C, 0x2A71, 0x2A68, 0x2B27, 0, 0, 0,
- 0x2A6D, 0x2B2D, 0x2B35, 0x2A66, 0x2B37, 0x2B3B, 0x2A78, 0,
- 0x2A72, 0x2B40, 0x2A69, 0, 0x2B21, 0x2A7E, 0, 0,
- 0x2B23, 0, 0, 0, 0, 0x2A77, 0, 0,
- 0, 0x2B3E, 0x2B3D, 0, 0, 0, 0, 0,
- 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_CB[] = {
0, 0, 0, 0, 0, 0, 0, 0xA230,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3738,36 +2539,6 @@ 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_CB_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0x2A31,
- 0x2B53, 0, 0, 0, 0x2B54, 0, 0, 0,
- 0x2B55, 0x2B56, 0, 0, 0, 0, 0, 0,
- 0x2A22, 0x2A58, 0xA236, 0x2A2D, 0, 0x2A36, 0x2B71, 0,
- 0, 0, 0, 0, 0, 0x2B60, 0x2B61, 0x2B62,
- 0x2B63, 0x2B64, 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_CC_x0213[] = {
- 0x2B5C, 0x2B5A, 0x2B5F, 0x2B7D, 0x2B5B, 0, 0x2B57, 0,
- 0x2B6D, 0, 0, 0x2B59, 0x2B5E, 0, 0, 0x2B5D,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2B78, 0x2B79, 0x2B7E, 0, 0x2B6A, 0x2B76, 0x2B77, 0x2B6B,
- 0x2B6C, 0, 0, 0, 0x2B72, 0x2B67, 0, 0,
- 0, 0x2B6F, 0x2B7A, 0, 0x2B68, 0, 0, 0x2B70,
- 0x2B73, 0, 0, 0, 0x2B75, 0, 0, 0,
- 0, 0x2B69, 0x2B7B, 0x2B7C, 0x2B74, 0x2B6E, 0, 0,
-};
-static const unsigned short utf8_to_euc_CD_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2B52, 0, 0, 0, 0, 0, 0,
- 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_CE[] = {
0, 0, 0, 0, 0xA238, 0xA239, 0xA661, 0,
0xA662, 0xA663, 0xA664, 0, 0xA667, 0, 0xA669, 0xA66C,
@@ -3788,16 +2559,6 @@ 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_CF_x0213[] = {
- 0x2650, 0x2651, 0x2659, 0x2652, 0x2653, 0x2654, 0x2655, 0x2656,
- 0x2657, 0x2658, 0xA675, 0xA67A, 0xA677, 0xA679, 0xA67C, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_D0[] = {
0, 0x2727, 0xA742, 0xA743, 0xA744, 0xA745, 0xA746, 0xA747,
0xA748, 0xA749, 0xA74A, 0xA74B, 0xA74C, 0, 0xA74D, 0xA74E,
@@ -3818,26 +2579,6 @@ 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_E1B8_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2872, 0x2873,
-};
-static const unsigned short utf8_to_euc_E1BD_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2B46, 0x2B47, 0x2B50, 0x2B51, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E280[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3868,36 +2609,6 @@ 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_E280_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x213E, 0, 0, 0x237C, 0x213D, 0x213D, 0x2142, 0,
- 0x2146, 0x2147, 0, 0, 0x2148, 0x2149, 0, 0,
- 0x2277, 0x2278, 0x2340, 0, 0, 0x2145, 0x2144, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2273, 0, 0x216C, 0x216D, 0, 0, 0, 0,
- 0, 0, 0, 0x2228, 0x286B, 0, 0x2131, 0x2B58,
-};
-static const unsigned short utf8_to_euc_E281_x0213[] = {
- 0, 0, 0x2C7E, 0, 0, 0, 0, 0x286C,
- 0x286D, 0x286E, 0, 0, 0, 0, 0, 0,
- 0, 0x2C7D, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E282_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 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, 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_E284[] = {
0, 0, 0, 0x216E, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3918,16 +2629,6 @@ static const unsigned short utf8_to_euc_E284_mac[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E284_x0213[] = {
- 0, 0, 0, 0x216E, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x235D,
- 0, 0, 0, 0x235F, 0, 0, 0x2D62, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2D64, 0xA26F, 0, 0, 0, 0, 0x2360,
- 0, 0, 0, 0x2272, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x235C, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E285[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3948,16 +2649,6 @@ static const unsigned short utf8_to_euc_E285_mac[] = {
0x2A35, 0x2A36, 0x2A37, 0x2A38, 0x2A39, 0x2A3A, 0x2A3B, 0x2A3C,
0x2A3D, 0x2A3E, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E285_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x2778, 0x2779, 0x277A, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2D35, 0x2D36, 0x2D37, 0x2D38, 0x2D39, 0x2D3A, 0x2D3B, 0x2D3C,
- 0x2D3D, 0x2D3E, 0x2D3F, 0x2D57, 0, 0, 0, 0,
- 0x2C35, 0x2C36, 0x2C37, 0x2C38, 0x2C39, 0x2C3A, 0x2C3B, 0x2C3C,
- 0x2C3D, 0x2C3E, 0x2C3F, 0x2C40, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E286[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3968,16 +2659,6 @@ 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_E286_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x222B, 0x222C, 0x222A, 0x222D, 0x2271, 0, 0x2327, 0x2325,
- 0x2326, 0x2328, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E287[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -3988,16 +2669,6 @@ 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_E287_x0213[] = {
- 0, 0, 0, 0, 0x2329, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x224D, 0, 0x224E, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x232B, 0x232C,
- 0x232A, 0x232D, 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_E288[] = {
0x224F, 0, 0x225F, 0x2250, 0, 0, 0, 0x2260,
0x223A, 0, 0, 0x223B, 0, 0, 0, 0,
@@ -4028,16 +2699,6 @@ static const unsigned short utf8_to_euc_E288_mac[] = {
0, 0, 0, 0, 0x2168, 0x2268, 0, 0,
0, 0, 0, 0, 0, 0x2266, 0, 0,
};
-static const unsigned short utf8_to_euc_E288_x0213[] = {
- 0x224F, 0, 0x225F, 0x2250, 0, 0x2247, 0, 0x2260,
- 0x223A, 0x2246, 0, 0x223B, 0, 0, 0, 0,
- 0, 0x2D74, 0x215D, 0x235B, 0, 0, 0, 0,
- 0, 0, 0x2265, 0, 0, 0x2267, 0x2167, 0x2D78,
- 0x225C, 0, 0, 0, 0, 0x2254, 0x2255, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A, 0, 0x2D73, 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[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4048,16 +2709,6 @@ 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_E289_x0213[] = {
- 0, 0, 0, 0x226C, 0, 0x226D, 0, 0,
- 0x226E, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x2262, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2162, 0x2261, 0x226B, 0, 0, 0, 0x2165, 0x2166,
- 0, 0, 0x2263, 0x2264, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x226F, 0x2270,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E28A[] = {
0, 0, 0x223E, 0x223F, 0, 0, 0x223C, 0x223D,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4078,26 +2729,6 @@ static const unsigned short utf8_to_euc_E28A_mac[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x2F23,
};
-static const unsigned short utf8_to_euc_E28A_x0213[] = {
- 0, 0, 0x223E, 0x223F, 0x2242, 0x2243, 0x223C, 0x223D,
- 0, 0, 0x2244, 0x2245, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x2251, 0x2252, 0x2253,
- 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, 0x2D79,
-};
-static const unsigned short utf8_to_euc_E28B_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x2776, 0x2777, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E28C[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4108,46 +2739,6 @@ 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_E28C_x0213[] = {
- 0, 0, 0, 0, 0, 0x2248, 0x2249, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x225E, 0, 0, 0, 0, 0,
- 0x277C, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E28E_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2742, 0x2743,
-};
-static const unsigned short utf8_to_euc_E28F_x0213[] = {
- 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274A, 0x274B,
- 0x274C, 0x274D, 0x274E, 0x274F, 0x2750, 0, 0x277E, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E290_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x277D, 0, 0, 0, 0,
- 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_E291[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4168,16 +2759,6 @@ static const unsigned short utf8_to_euc_E291_mac[] = {
0x2931, 0x2932, 0x2933, 0x2934, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E293_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2C41, 0x2C42, 0x2C43, 0x2C44, 0x2C45, 0x2C46, 0x2C47, 0x2C48,
- 0x2C49, 0x2C4A, 0x2C4B, 0x2C4C, 0x2C4D, 0x2C4E, 0x2C4F, 0x2C50,
- 0x2C51, 0x2C52, 0x2C53, 0x2C54, 0x2C55, 0x2C56, 0x2C57, 0x2C58,
- 0x2C59, 0x2C5A, 0, 0x2C2B, 0x2C2C, 0x2C2D, 0x2C2E, 0x2C2F,
- 0x2C30, 0x2C31, 0x2C32, 0x2C33, 0x2C34, 0x265A, 0x265B, 0x265C,
- 0x265D, 0x265E, 0x265F, 0x2660, 0x2661, 0x2662, 0x2663, 0,
-};
static const unsigned short utf8_to_euc_E294[] = {
0x2821, 0x282C, 0x2822, 0x282D, 0, 0, 0, 0,
0, 0, 0, 0, 0x2823, 0, 0, 0x282E,
@@ -4208,16 +2789,6 @@ 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_E296_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2223, 0x2222, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x266D, 0x2225, 0x2224, 0, 0, 0x2322, 0x2321,
- 0, 0, 0, 0, 0x2227, 0x2226, 0, 0,
-};
static const unsigned short utf8_to_euc_E297[] = {
0, 0, 0, 0, 0, 0, 0x2221, 0x217E,
0, 0, 0, 0x217B, 0, 0, 0x217D, 0x217C,
@@ -4228,16 +2799,6 @@ 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_E297_x0213[] = {
- 0x2324, 0x2323, 0, 0, 0, 0, 0x2221, 0x217E,
- 0, 0x233B, 0, 0x217B, 0, 0, 0x217D, 0x217C,
- 0x2867, 0x2868, 0x2869, 0x286A, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x233F, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x227E,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E298[] = {
0, 0, 0, 0, 0, 0x217A, 0x2179, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4248,16 +2809,6 @@ 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_E298_x0213[] = {
- 0x2668, 0x2669, 0x266A, 0x266B, 0, 0x217A, 0x2179, 0,
- 0, 0, 0, 0, 0, 0, 0x2667, 0,
- 0, 0, 0, 0, 0, 0, 0x2664, 0x2665,
- 0, 0, 0, 0, 0, 0, 0x2D7E, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E299[] = {
0x216A, 0, 0x2169, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4268,66 +2819,6 @@ 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_E299_x0213[] = {
- 0x216A, 0, 0x2169, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x263A, 0x263D, 0x263B, 0x2640, 0x2639, 0x263E, 0x263C, 0x263F,
- 0x266C, 0x227D, 0x2276, 0x227B, 0x227C, 0x2275, 0x227A, 0x2274,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E29C_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x277B, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E29D_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2D7D, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x2C21, 0x2C22,
- 0x2C23, 0x2C24, 0x2C25, 0x2C26, 0x2C27, 0x2C28, 0x2C29, 0x2C2A,
-};
-static const unsigned short utf8_to_euc_E2A4_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x232E, 0x232F, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E2A6_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x233A,
-};
-static const unsigned short utf8_to_euc_E2A7_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x237D, 0x237E, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E380[] = {
0x2121, 0x2122, 0x2123, 0x2137, 0, 0x2139, 0x213A, 0x213B,
0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
@@ -4348,16 +2839,6 @@ 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_E380_x0213[] = {
- 0x2121, 0x2122, 0x2123, 0x2137, 0, 0x2139, 0x213A, 0x213B,
- 0x2152, 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159,
- 0x215A, 0x215B, 0x2229, 0x222E, 0x214C, 0x214D, 0x225A, 0x225B,
- 0x2258, 0x2259, 0, 0, 0x2141, 0x2D60, 0, 0x2D61,
- 0x2666, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x2233, 0x2234, 0x2235, 0, 0,
- 0, 0, 0, 0x2236, 0x2237, 0x233C, 0, 0,
-};
static const unsigned short utf8_to_euc_E381[] = {
0, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427,
0x2428, 0x2429, 0x242A, 0x242B, 0x242C, 0x242D, 0x242E, 0x242F,
@@ -4388,16 +2869,6 @@ 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_E382_x0213[] = {
- 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
- 0x2468, 0x2469, 0x246A, 0x246B, 0x246C, 0x246D, 0x246E, 0x246F,
- 0x2470, 0x2471, 0x2472, 0x2473, 0x2474, 0x2475, 0x2476, 0,
- 0, 0, 0, 0x212B, 0x212C, 0x2135, 0x2136, 0x2239,
- 0x237B, 0x2521, 0x2522, 0x2523, 0x2524, 0x2525, 0x2526, 0x2527,
- 0x2528, 0x2529, 0x252A, 0x252B, 0x252C, 0x252D, 0x252E, 0x252F,
- 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
- 0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
-};
static const unsigned short utf8_to_euc_E383[] = {
0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
@@ -4408,26 +2879,6 @@ 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_E383_x0213[] = {
- 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, 0x2545, 0x2546, 0x2547,
- 0x2548, 0x2549, 0x254A, 0x254B, 0x254C, 0x254D, 0x254E, 0x254F,
- 0x2550, 0x2551, 0x2552, 0x2553, 0x2554, 0x2555, 0x2556, 0x2557,
- 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E, 0x255F,
- 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
- 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x256D, 0x256E, 0x256F,
- 0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576, 0x2772,
- 0x2773, 0x2774, 0x2775, 0x2126, 0x213C, 0x2133, 0x2134, 0x2238,
-};
-static const unsigned short utf8_to_euc_E387_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x266E, 0x266F, 0x2670, 0x2671, 0x2672, 0x2673, 0x2674, 0x2675,
- 0x2676, 0x2677, 0x2679, 0x267A, 0x267B, 0x267C, 0x267D, 0x267E,
-};
static const unsigned short utf8_to_euc_E388[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4448,16 +2899,6 @@ static const unsigned short utf8_to_euc_E388_mac[] = {
0, 0x2D2E, 0x2D31, 0, 0, 0, 0, 0,
0, 0x2D2C, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E389_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2841, 0x2842, 0x2843, 0x2844, 0x2845, 0x2846, 0x2847,
- 0x2848, 0x2849, 0x284A, 0x284B, 0x284C, 0x284D, 0x284E, 0x284F,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E38A[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -4478,26 +2919,6 @@ 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,
};
-static const unsigned short utf8_to_euc_E38A_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x2D65, 0x2D66, 0x2D67, 0x2D68,
- 0x2D69, 0, 0, 0, 0, 0, 0, 0,
- 0, 0x2850, 0x2851, 0x2852, 0x2853, 0x2854, 0x2855, 0x2856,
- 0x2857, 0x2858, 0x2859, 0x285A, 0x285B, 0x285C, 0x285D, 0x285E,
-};
-static const unsigned short utf8_to_euc_E38B_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x2C5B, 0x2C5C, 0x2C5D, 0x2C5E, 0x2C5F, 0x2C60, 0x2C61, 0x2C62,
- 0x2C63, 0x2C64, 0x2C65, 0x2C66, 0x2C67, 0x2C68, 0x2C69, 0x2C6A,
- 0x2C6B, 0x2C6C, 0x2C6D, 0x2C6E, 0, 0x2C71, 0, 0,
- 0, 0x2C70, 0, 0, 0x2C73, 0x2C72, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x2C6F, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E38C[] = {
0, 0, 0, 0x2D46, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0x2D4A, 0, 0,
@@ -4578,796 +2999,6 @@ static const unsigned short utf8_to_euc_E38F_mac[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
-static const unsigned short utf8_to_euc_E38F_x0213[] = {
- 0, 0, 0, 0, 0x2D55, 0, 0, 0,
- 0, 0, 0, 0x235E, 0, 0x2D63, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E390_x0213[] = {
- 0, 0, 0x2E23, 0, 0, 0, 0xA12D, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xA132, 0, 0xA133, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E391_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xA15E, 0, 0xA156, 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_E392_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xA17E, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x2E53, 0, 0,
- 0, 0, 0, 0, 0xA32B, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E393_x0213[] = {
- 0, 0xF468, 0, 0, 0, 0, 0, 0xA32F,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x2E5B, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E394_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xA348,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E395_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xA35D, 0xA35E, 0,
- 0, 0, 0, 0xA361, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xA367, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E396_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xA423, 0,
- 0xA426, 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_E397_x0213[] = {
- 0, 0, 0, 0, 0, 0xA42F, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xA438, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xA442, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E398_x0213[] = {
- 0, 0, 0, 0, 0, 0xA44A, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E399_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xA479, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E39A_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xA53F, 0, 0, 0, 0, 0xA543, 0,
- 0, 0xA541, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E39B_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xA557,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E39D_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xA823, 0xA825, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xA829, 0xA828, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xA82C, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E39E_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x4F5F, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E39F_x0213[] = {
- 0, 0xA83E, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x4F6F, 0, 0, 0, 0, 0,
- 0xA856, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xA859, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xA85C, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3A0_x0213[] = {
- 0xA85E, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xA86F,
- 0, 0, 0, 0, 0, 0, 0xA871, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3A1_x0213[] = {
- 0xA874, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xA879, 0, 0, 0,
- 0, 0xA87B, 0, 0, 0, 0, 0, 0,
- 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_E3A3_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xAC3B, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3A4_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xAC46,
- 0, 0, 0xAC4A, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E3A5_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xAC60,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3A9_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xAD5B, 0,
- 0, 0, 0, 0xAD5F, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3AB_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xAD71, 0xAE36,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xAD7C, 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_E3AC_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xAE2E, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xAE32, 0, 0xAE34, 0, 0, 0,
- 0, 0, 0x7549, 0, 0, 0, 0, 0,
- 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_E3AD_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xAE6D, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xAE65,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3AE_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0xAF28,
- 0xAF29, 0, 0, 0, 0, 0xAF2C, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xAF34, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x757E, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3AF_x0213[] = {
- 0, 0, 0, 0x7621, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xAF48, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xAF5D, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3B0_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x763A,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xAF77, 0,
- 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_E3B3_x0213[] = {
- 0, 0, 0, 0xEE3B, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xEE42, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E3B4_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xEE71, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xEE7E, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E3B5_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xEF40, 0, 0, 0,
- 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_E3B6_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xEF54, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E3B7_x0213[] = {
- 0xEF70, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xEF77, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E3B8_x0213[] = {
- 0, 0, 0, 0, 0, 0xF028, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x7766,
-};
-static const unsigned short utf8_to_euc_E3B9_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xF03F, 0, 0, 0, 0, 0, 0xF041, 0,
- 0xF042, 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_E3BA_x0213[] = {
- 0, 0, 0, 0xF049, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xF050, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E3BD_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF134,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x784D, 0, 0, 0xF146, 0, 0xF148,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3BE_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF15C, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E3BF_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xF167, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF16C,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E480_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xF222, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E481_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xF22D, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E482_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xF239, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E484_x0213[] = {
- 0, 0, 0, 0, 0, 0xF264, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E485_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xF274, 0, 0, 0, 0, 0, 0, 0xF277,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xF27D, 0, 0, 0, 0,
- 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_E486_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xF333, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF337,
-};
-static const unsigned short utf8_to_euc_E487_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF347, 0,
- 0, 0, 0, 0, 0, 0, 0xF34B, 0,
- 0, 0, 0, 0xF348, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E488_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0xF353,
- 0, 0, 0, 0, 0, 0, 0xF357, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E489_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x796D, 0, 0, 0,
- 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_E48B_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0xF42B, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF436, 0,
- 0, 0, 0, 0, 0, 0xF43B, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E48C_x0213[] = {
- 0, 0, 0xF44E, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xF45D, 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_E48D_x0213[] = {
- 0, 0, 0, 0xF461, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E48F_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF53E, 0,
- 0xF542, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E490_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xF548, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF54A,
- 0, 0, 0, 0, 0xF54C, 0, 0, 0,
- 0, 0, 0xF54F, 0, 0, 0, 0, 0,
- 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_E491_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x7A59, 0, 0, 0, 0,
- 0, 0, 0, 0x7A5A, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF56C, 0,
- 0, 0, 0xF56E, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E492_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xF577, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xF635, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF632, 0,
-};
-static const unsigned short utf8_to_euc_E493_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xF634, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E494_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xF659, 0, 0, 0, 0, 0xF654, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xF66D, 0, 0,
- 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_E495_x0213[] = {
- 0, 0, 0, 0xF66E, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E496_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x7B51, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xF74F, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E497_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xF76C, 0, 0,
- 0, 0, 0x7B60, 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_E498_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF824,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E499_x0213[] = {
- 0, 0xF83A, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xF843, 0, 0,
- 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_E49A_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xF84E, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF853,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E49C_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xF86B, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E49D_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xF929, 0, 0, 0,
- 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_E49F_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xF93F, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4A0_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF949, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E4A1_x0213[] = {
- 0, 0, 0, 0, 0x7C4B, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF95C, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E4A2_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xFA27, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4A6_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x7D58, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4A7_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xFB6A,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xFB70, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4A8_x0213[] = {
- 0, 0, 0, 0, 0xFB75, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xFB78, 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_E4AA_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xFC37, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4AC_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xFC55, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_E4AF_x0213[] = {
- 0, 0, 0xFD26, 0, 0, 0, 0, 0,
- 0, 0, 0xFD28, 0, 0, 0, 0, 0,
- 0, 0, 0xFD2A, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xFD31, 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_E4B0_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x7E3E,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xFD3F, 0, 0, 0, 0, 0, 0, 0,
- 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_E4B3_x0213[] = {
- 0, 0, 0, 0, 0xFE2A, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xFE2D, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E4B4_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0xFE4B,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E4B5_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xFE60,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E4B8[] = {
0x306C, 0x437A, 0xB021, 0x3C37, 0xB022, 0xB023, 0, 0x4B7C,
0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F, 0,
@@ -5378,16 +3009,6 @@ 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_E4B8_x0213[] = {
- 0x306C, 0x437A, 0xA122, 0x3C37, 0xB022, 0xB023, 0, 0x4B7C,
- 0x3E66, 0x3B30, 0x3E65, 0x323C, 0xB024, 0x4954, 0x4D3F, 0xA123,
- 0x5022, 0x312F, 0xA124, 0, 0x336E, 0x5023, 0x4024, 0x5242,
- 0x3556, 0x4A3A, 0, 0, 0, 0, 0x3E67, 0xB026,
- 0, 0x4E3E, 0, 0xB027, 0xB028, 0, 0x4A42, 0,
- 0x2E24, 0xA125, 0x5024, 0xA126, 0xF02E, 0x4366, 0xA127, 0x2E25,
- 0x2E26, 0x5025, 0x367A, 0, 0, 0xB02E, 0x5026, 0,
- 0x345D, 0x4330, 0, 0x3C67, 0x5027, 0, 0, 0x5028,
-};
static const unsigned short utf8_to_euc_E4B9[] = {
0xB02F, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557, 0, 0xB032,
0, 0, 0, 0x4737, 0, 0x4663, 0x3843, 0x4B33,
@@ -5398,16 +3019,6 @@ 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_E4B9_x0213[] = {
- 0xA128, 0xB030, 0x5029, 0x4735, 0xB031, 0x3557, 0, 0xA129,
- 0xA12A, 0, 0, 0x4737, 0, 0x4663, 0x3843, 0x4B33,
- 0, 0xA12C, 0, 0, 0, 0x6949, 0x502A, 0x3E68,
- 0x502B, 0x3235, 0xA12F, 0, 0xB035, 0x3665, 0x3870, 0x4C69,
- 0, 0, 0x5626, 0xB036, 0, 0, 0, 0,
- 0xB037, 0xA130, 0, 0, 0, 0, 0, 0,
- 0, 0x4D70, 0, 0x467D, 0xB039, 0xB03A, 0, 0,
- 0, 0xB03B, 0, 0, 0, 0, 0x3425, 0xB03C,
-};
static const unsigned short utf8_to_euc_E4BA[] = {
0x3535, 0, 0x502C, 0, 0, 0x502D, 0x4E3B, 0,
0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0xB03D, 0x5032, 0,
@@ -5418,16 +3029,6 @@ 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_E4BA_x0213[] = {
- 0x3535, 0, 0x502C, 0, 0, 0x502D, 0x4E3B, 0,
- 0x4D3D, 0x4168, 0x502F, 0x3B76, 0x4673, 0x2E27, 0x5032, 0,
- 0, 0x313E, 0x385F, 0, 0x385E, 0x3066, 0xB03E, 0xB03F,
- 0x4F4B, 0x4F4A, 0, 0x3A33, 0x3021, 0xA131, 0x5033, 0x5034,
- 0x5035, 0x4B34, 0x5036, 0, 0x3872, 0x3067, 0x4B72, 0,
- 0x357C, 0, 0, 0x357D, 0x357E, 0x4462, 0x4E3C, 0xB041,
- 0x5037, 0, 0, 0x5038, 0, 0, 0x5039, 0,
- 0, 0xA134, 0x3F4D, 0xA135, 0xA137, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E4BB[] = {
0x3D3A, 0x3F4E, 0x503E, 0xB043, 0x503C, 0, 0x503D, 0x3558,
0, 0, 0x3A23, 0x3270, 0, 0x503B, 0x503A, 0x4A29,
@@ -5438,16 +3039,6 @@ 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_E4BB_x0213[] = {
- 0x3D3A, 0x3F4E, 0x503E, 0xA138, 0x503C, 0, 0x503D, 0x3558,
- 0xA139, 0, 0x3A23, 0x3270, 0, 0x503B, 0x503A, 0x4A29,
- 0xA13A, 0, 0, 0, 0x3B46, 0x3B45, 0x423E, 0x503F,
- 0x4955, 0x4067, 0xA13C, 0xB046, 0, 0x2138, 0x5040, 0x5042,
- 0xB047, 0x2E28, 0xB049, 0x4265, 0x4E61, 0x304A, 0, 0,
- 0xB04A, 0, 0, 0xA13B, 0, 0x5041, 0x323E, 0xB04B,
- 0x3644, 0xA13D, 0x4367, 0xB04D, 0, 0xA13E, 0x376F, 0x5043,
- 0, 0, 0, 0x4724, 0xF42F, 0x2E29, 0xB050, 0x2E2A,
-};
static const unsigned short utf8_to_euc_E4BC[] = {
0xB052, 0x346B, 0xB053, 0xB054, 0, 0, 0, 0,
0xB055, 0x5044, 0x304B, 0xB056, 0xB057, 0x3860, 0x346C, 0x497A,
@@ -5458,16 +3049,6 @@ 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_E4BC_x0213[] = {
- 0xA13F, 0x346B, 0xB053, 0x2E2B, 0, 0, 0, 0,
- 0xB055, 0x5044, 0x304B, 0x2E2C, 0xB057, 0x3860, 0x346C, 0x497A,
- 0x4832, 0x3559, 0xB058, 0, 0, 0xB059, 0xA140, 0xB05B,
- 0, 0xB05C, 0x3271, 0, 0x5067, 0x4541, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xB05D, 0x476C,
- 0x5046, 0xB05E, 0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xA142,
- 0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xA143, 0,
-};
static const unsigned short utf8_to_euc_E4BD[] = {
0xB066, 0, 0xB067, 0x4451, 0, 0, 0x4322, 0x504A,
0xB068, 0xB069, 0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
@@ -5478,16 +3059,6 @@ 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_E4BD_x0213[] = {
- 0xB066, 0, 0xB067, 0x4451, 0, 0, 0x4322, 0x504A,
- 0x2E2E, 0x2E2F, 0, 0xB06A, 0xB06B, 0x304C, 0x4463, 0x3D3B,
- 0x3A34, 0x4D24, 0xB06C, 0x424E, 0xA144, 0x323F, 0x2E30, 0x5049,
- 0xA145, 0x4D3E, 0x5045, 0x5047, 0x3A6E, 0x5048, 0x5524, 0x2E31,
- 0x2E2D, 0, 0, 0xB071, 0xA141, 0, 0, 0,
- 0, 0x5050, 0x2E32, 0, 0x2E33, 0, 0xB074, 0x5053,
- 0x5051, 0xB075, 0, 0x3242, 0, 0x4A3B, 0x504B, 0xA147,
- 0xA148, 0xB078, 0xA149, 0x504F, 0x3873, 0xA14A, 0x2E34, 0x3B48,
-};
static const unsigned short utf8_to_euc_E4BE[] = {
0, 0xB07C, 0xB07D, 0x3426, 0xB07E, 0xB121, 0x5054, 0,
0x504C, 0xB122, 0xB123, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
@@ -5498,16 +3069,6 @@ 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_E4BE_x0213[] = {
- 0, 0xB07C, 0xA14B, 0x3426, 0xB07E, 0xA14C, 0x5054, 0,
- 0x504C, 0xB122, 0x2E35, 0x4E63, 0xB124, 0x3B78, 0xB125, 0x504D,
- 0xB126, 0x5052, 0xA14D, 0xB128, 0x2E36, 0, 0x5055, 0x2E37,
- 0x504E, 0xB12B, 0xA14E, 0x3621, 0, 0x304D, 0xB12D, 0xB12E,
- 0x3622, 0x3241, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x5525, 0, 0x4B79, 0x496E, 0x3874,
- 0, 0, 0xA150, 0, 0, 0x3F2F, 0x4E37, 0xB130,
- 0, 0xB131, 0, 0xB132, 0xB133, 0xB134, 0xA151, 0x4A58,
-};
static const unsigned short utf8_to_euc_E4BF[] = {
0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xB138, 0xB139, 0,
0xB13A, 0xB13B, 0x3D53, 0xB13C, 0xB13D, 0xB13E, 0x5059, 0xB13F,
@@ -5518,16 +3079,6 @@ 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_E4BF_x0213[] = {
- 0xB136, 0xB137, 0x3738, 0x4225, 0x3264, 0xA152, 0xB139, 0,
- 0xB13A, 0x2E39, 0x3D53, 0xA153, 0xB13D, 0xB13E, 0x5059, 0xA154,
- 0x505E, 0x505C, 0xA155, 0, 0x5057, 0, 0, 0x422F,
- 0x505A, 0, 0x505D, 0x505B, 0xB141, 0x4A5D, 0, 0x5058,
- 0x2E3A, 0x3F2E, 0xB143, 0x4B73, 0x505F, 0x5060, 0xA14F, 0,
- 0, 0, 0, 0, 0, 0, 0x3D24, 0x506D,
- 0xB144, 0x2E21, 0xA157, 0x4750, 0, 0x4936, 0x5068, 0,
- 0x4A70, 0, 0x3236, 0, 0xB146, 0xB147, 0x506C, 0xB148,
-};
static const unsigned short utf8_to_euc_E580[] = {
0xB149, 0xB14A, 0, 0, 0xB14B, 0x5066, 0x506F, 0xB14C,
0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0xB14F, 0x6047,
@@ -5538,16 +3089,6 @@ 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_E580_x0213[] = {
- 0xA158, 0x2E3B, 0x2E3C, 0, 0xB14B, 0x5066, 0x506F, 0xB14C,
- 0, 0x4152, 0xB14D, 0x3844, 0xB14E, 0x475C, 0x2E3D, 0x6047,
- 0xA159, 0x506E, 0x455D, 0xA15A, 0x5063, 0, 0x3876, 0xB152,
- 0x2E3E, 0x3875, 0x5061, 0xB154, 0xA15B, 0xB156, 0xA15C, 0x3C5A,
- 0, 0x5069, 0xA15D, 0x4A6F, 0x434D, 0x5065, 0x3771, 0x2E3F,
- 0x5062, 0x506A, 0x5064, 0x4E51, 0x506B, 0x4F41, 0x2E40, 0,
- 0xB15B, 0, 0xB15C, 0xB15D, 0, 0xB15E, 0x3666, 0,
- 0, 0x3770, 0, 0x2E42, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E581[] = {
0xB15F, 0xB160, 0xB161, 0x5070, 0, 0xB162, 0xB163, 0x5071,
0x5075, 0x304E, 0xB164, 0, 0xB165, 0, 0xB166, 0x4A50,
@@ -5558,16 +3099,6 @@ 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_E581_x0213[] = {
- 0x2E41, 0x2E43, 0xA15F, 0x5070, 0, 0xB162, 0xA160, 0x5071,
- 0x5075, 0x304E, 0xB164, 0, 0xB165, 0, 0xA161, 0x4A50,
- 0x5074, 0xB167, 0xB168, 0xA162, 0, 0x5073, 0x5077, 0xA163,
- 0, 0xB16B, 0x5076, 0, 0x4464, 0, 0, 0xB16C,
- 0xB16D, 0, 0xB16E, 0xA164, 0, 0x3772, 0xA165, 0xB171,
- 0, 0, 0xA166, 0, 0x5078, 0xB173, 0, 0,
- 0xA167, 0xB175, 0x3C45, 0, 0x4226, 0x4465, 0x3676, 0,
- 0x5079, 0, 0, 0, 0, 0x3536, 0, 0,
-};
static const unsigned short utf8_to_euc_E582[] = {
0x507A, 0xB177, 0, 0xB178, 0xB179, 0x507C, 0xB17A, 0,
0, 0, 0xB17B, 0, 0, 0x4B35, 0xB17C, 0xB17D,
@@ -5578,16 +3109,6 @@ 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_E582_x0213[] = {
- 0x507A, 0xB177, 0, 0xB178, 0xB179, 0x507C, 0xB17A, 0,
- 0xA169, 0, 0xB17B, 0, 0, 0x4B35, 0xB17C, 0xB17D,
- 0xB17E, 0x3766, 0xA16A, 0xA16B, 0x2E44, 0xA16C, 0xA16D, 0,
- 0x3B31, 0x4877, 0x507B, 0xB225, 0xA16E, 0, 0xB227, 0xB228,
- 0xB229, 0xB22A, 0xB22B, 0xA168, 0, 0, 0, 0,
- 0, 0, 0xA16F, 0, 0x3A45, 0x4D43, 0, 0xB22D,
- 0xB22E, 0xA171, 0x507E, 0x5123, 0x507D, 0x3A44, 0, 0x3D7D,
- 0, 0xB22F, 0xA172, 0xA173, 0, 0xB231, 0x3739, 0,
-};
static const unsigned short utf8_to_euc_E583[] = {
0xB232, 0, 0x5124, 0xB233, 0xB234, 0x364F, 0, 0xB235,
0, 0x5121, 0x5122, 0, 0xB236, 0x462F, 0xB237, 0x417C,
@@ -5598,16 +3119,6 @@ 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_E583_x0213[] = {
- 0xB232, 0, 0x5124, 0xB233, 0xA174, 0x364F, 0, 0xA175,
- 0, 0x5121, 0x5122, 0, 0x2E45, 0x462F, 0xA178, 0x417C,
- 0x2E47, 0x3623, 0, 0xB239, 0xA17A, 0x4B4D, 0x5125, 0,
- 0xB23B, 0xA17B, 0x4E3D, 0, 0xB23C, 0xB23D, 0x5126, 0xB23E,
- 0, 0xA17C, 0xB23F, 0x5129, 0xB240, 0x5127, 0x2E48, 0x414E,
- 0xB242, 0xA17D, 0, 0, 0, 0x5128, 0x512A, 0xB244,
- 0, 0xB245, 0x2E46, 0xA176, 0xF430, 0x512C, 0xB246, 0,
- 0, 0x512B, 0xB247, 0x4A48, 0, 0, 0xB248, 0,
-};
static const unsigned short utf8_to_euc_E584[] = {
0x3537, 0x512E, 0x512F, 0xB249, 0x322F, 0, 0xB24A, 0xB24B,
0xB24C, 0x512D, 0, 0xB24D, 0xB24E, 0xB24F, 0xB250, 0,
@@ -5618,16 +3129,6 @@ 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_E584_x0213[] = {
- 0x3537, 0x512E, 0x512F, 0x2E4B, 0x322F, 0, 0x2E4A, 0xB24B,
- 0xA321, 0x512D, 0, 0x2E4C, 0xB24E, 0xB24F, 0xB250, 0,
- 0xB252, 0, 0x3C74, 0, 0x5132, 0x5131, 0x5130, 0xA323,
- 0x5056, 0xB254, 0x5133, 0xA324, 0xB256, 0xB257, 0x2E4D, 0x3D7E,
- 0, 0x5134, 0, 0xB259, 0, 0, 0, 0xB25A,
- 0xB25B, 0, 0x4D25, 0, 0xB25C, 0xB25D, 0, 0xB25E,
- 0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0x2E4E, 0, 0x5136,
- 0xB263, 0xB264, 0x5135, 0x5138, 0x5137, 0, 0, 0x5139,
-};
static const unsigned short utf8_to_euc_E585[] = {
0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
0x4068, 0x3877, 0xB266, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
@@ -5638,16 +3139,6 @@ 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_E585_x0213[] = {
- 0x513A, 0x3074, 0xB265, 0x3835, 0x373B, 0x3D3C, 0x437B, 0x3624,
- 0x4068, 0x3877, 0x2E4F, 0x396E, 0x513C, 0x4C48, 0x4546, 0xB267,
- 0x3B79, 0, 0x513B, 0xB268, 0x513D, 0x2E51, 0, 0x2E52,
- 0xB26B, 0, 0x455E, 0, 0x3375, 0, 0, 0xB26C,
- 0xA326, 0, 0x513E, 0, 0xB26D, 0x467E, 0xB26E, 0,
- 0x4134, 0x5140, 0x5141, 0x482C, 0x3878, 0x4F3B, 0x5142, 0,
- 0, 0x3626, 0, 0xA328, 0, 0x4A3C, 0x4236, 0x3671,
- 0x4535, 0, 0, 0xF474, 0x3773, 0, 0xB26F, 0,
-};
static const unsigned short utf8_to_euc_E586[] = {
0x5143, 0, 0x5144, 0xB270, 0xB271, 0x4662, 0x315F, 0,
0, 0x5147, 0x3A7D, 0xB272, 0x5146, 0x3A46, 0xB273, 0x5148,
@@ -5658,16 +3149,6 @@ 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_E586_x0213[] = {
- 0x5143, 0, 0x5144, 0xA329, 0xB271, 0x4662, 0x315F, 0,
- 0, 0x5147, 0x3A7D, 0xA32A, 0x5146, 0x3A46, 0xB273, 0x5148,
- 0x666E, 0x5149, 0x4B41, 0x514A, 0, 0x514B, 0x514C, 0x3E69,
- 0xA32C, 0x3C4C, 0, 0, 0, 0x2E54, 0, 0,
- 0x3427, 0xB276, 0x514F, 0xA32D, 0x514D, 0x4C3D, 0x514E, 0,
- 0x495A, 0x5150, 0x5151, 0x5152, 0x455F, 0xA32E, 0, 0,
- 0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
- 0xB279, 0, 0xB27A, 0, 0xA330, 0x5158, 0xB27C, 0xB27D,
-};
static const unsigned short utf8_to_euc_E587[] = {
0, 0, 0xB27E, 0, 0x4028, 0x5159, 0x3D5A, 0,
0xB321, 0x515A, 0, 0x437C, 0x4E3F, 0x4560, 0, 0xB322,
@@ -5678,16 +3159,6 @@ 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_E587_x0213[] = {
- 0, 0, 0xB27E, 0x2E55, 0x4028, 0x5159, 0x3D5A, 0,
- 0xB321, 0x515A, 0x2E56, 0x437C, 0x4E3F, 0x4560, 0, 0xB322,
- 0, 0xB323, 0xB324, 0xB325, 0, 0xB326, 0x5245, 0,
- 0xB327, 0, 0, 0x515B, 0x7425, 0x3645, 0x2E57, 0,
- 0x515C, 0x4B5E, 0x2E58, 0, 0, 0xB32A, 0x3D68, 0x427C,
- 0, 0x515E, 0x4664, 0, 0xF431, 0x515F, 0x2E59, 0,
- 0x5160, 0x332E, 0xB32C, 0xA333, 0xA334, 0x5161, 0x3627, 0xB32F,
- 0x464C, 0x317A, 0x3D50, 0, 0, 0x4821, 0x5162, 0,
-};
static const unsigned short utf8_to_euc_E588[] = {
0x4561, 0xB330, 0xB331, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
0x3422, 0, 0x3429, 0x5164, 0, 0, 0x5166, 0,
@@ -5698,16 +3169,6 @@ 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_E588_x0213[] = {
- 0x4561, 0x2E5A, 0xA335, 0x3F4F, 0x5163, 0xB332, 0x4A2C, 0x405A,
- 0x3422, 0, 0x3429, 0x5164, 0, 0, 0x5166, 0,
- 0, 0x373A, 0xA336, 0x2E5C, 0x5165, 0x2E5D, 0xA337, 0x4E73,
- 0xB337, 0, 0, 0, 0, 0x3D69, 0, 0,
- 0, 0, 0xB338, 0, 0x483D, 0x4A4C, 0, 0x5167,
- 0xB339, 0x4D78, 0x5168, 0, 0, 0, 0x5169, 0,
- 0x457E, 0xB33A, 0xB33B, 0x516A, 0, 0xB33C, 0x4029, 0x3A7E,
- 0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E589[] = {
0, 0, 0, 0x4466, 0x516D, 0xB33E, 0, 0x4227,
0, 0xB33F, 0x3A6F, 0x516E, 0x516F, 0x4130, 0, 0x516C,
@@ -5718,16 +3179,6 @@ 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_E589_x0213[] = {
- 0, 0, 0, 0x4466, 0x516D, 0xB33E, 0, 0x4227,
- 0, 0x2E5E, 0x3A6F, 0x516E, 0x516F, 0x4130, 0, 0x516C,
- 0, 0, 0, 0, 0x5171, 0xA339, 0x4B36, 0x2E5F,
- 0xB342, 0, 0xB343, 0x3964, 0xA33A, 0x2F7E, 0x5170, 0xB345,
- 0xB346, 0x2E60, 0, 0x3775, 0x3A5E, 0x476D, 0xB348, 0,
- 0, 0x5174, 0x5172, 0, 0xA33B, 0, 0xB349, 0x497B,
- 0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F, 0, 0xA33C,
- 0xB34B, 0xB34C, 0, 0, 0, 0x5177, 0, 0x5176,
-};
static const unsigned short utf8_to_euc_E58A[] = {
0xB34D, 0, 0xB34E, 0x3344, 0, 0xB34F, 0, 0x3760,
0x517C, 0x4E2D, 0xB350, 0, 0xB351, 0x5178, 0, 0,
@@ -5738,16 +3189,6 @@ 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_E58A_x0213[] = {
- 0xB34D, 0, 0xA33E, 0x3344, 0xA33D, 0xB34F, 0, 0x3760,
- 0x517C, 0x4E2D, 0xB350, 0, 0xB351, 0x5178, 0, 0,
- 0, 0x517D, 0x517A, 0x2E61, 0x5179, 0xB353, 0xB354, 0xB355,
- 0xA340, 0, 0xB357, 0x4E4F, 0xB358, 0, 0, 0x3879,
- 0x3243, 0, 0, 0x4E74, 0xA342, 0xB35A, 0xA343, 0xB35C,
- 0, 0x3D75, 0x4558, 0x3965, 0x5222, 0x5223, 0, 0xA344,
- 0xB35E, 0x4E65, 0, 0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
- 0xB361, 0x387A, 0xA345, 0xA346, 0x5224, 0xB364, 0x332F, 0,
-};
static const unsigned short utf8_to_euc_E58B[] = {
0xB365, 0x5226, 0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
0xB368, 0x4A59, 0, 0, 0xB369, 0x5227, 0, 0xB36A,
@@ -5758,16 +3199,6 @@ 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_E58B_x0213[] = {
- 0xB365, 0x5226, 0, 0x4B56, 0xB366, 0x443C, 0xB367, 0x4D26,
- 0x2E62, 0x4A59, 0xA347, 0, 0x2E64, 0x5227, 0, 0xB36A,
- 0x2E65, 0xA349, 0x7055, 0, 0xB36C, 0x4630, 0x2E66, 0x5228,
- 0x342A, 0x4C33, 0, 0x2E67, 0xB36F, 0x3E21, 0x5229, 0x4A67,
- 0x522D, 0xB370, 0x402A, 0x522A, 0x3650, 0xB371, 0x522B, 0x342B,
- 0xB372, 0xB373, 0xB374, 0, 0xB375, 0, 0, 0,
- 0x2E69, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xA34B,
- 0x5230, 0x5231, 0x3C5B, 0x2E6A, 0, 0, 0x387B, 0x4C5E,
-};
static const unsigned short utf8_to_euc_E58C[] = {
0xB37B, 0x4C68, 0x4677, 0xB37C, 0, 0x4A71, 0x5232, 0xF432,
0x5233, 0, 0xB37D, 0xB37E, 0xB421, 0x5235, 0, 0x5237,
@@ -5778,16 +3209,6 @@ 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_E58C_x0213[] = {
- 0x2E6B, 0x4C68, 0x4677, 0xB37C, 0, 0x4A71, 0x5232, 0x2E6C,
- 0x5233, 0, 0xA34C, 0xA34D, 0xB421, 0x5235, 0, 0x5237,
- 0x5236, 0xB422, 0, 0xB423, 0, 0x5238, 0x323D, 0x4B4C,
- 0xB424, 0x3A7C, 0x5239, 0xB425, 0x2E6D, 0x4159, 0xB427, 0xB428,
- 0x3E22, 0x3629, 0, 0x523A, 0xA34E, 0xB429, 0, 0xB42A,
- 0xB42B, 0xB42C, 0x485B, 0xB42D, 0xB42E, 0xB42F, 0, 0x523B,
- 0xB430, 0x523C, 0xB431, 0x523D, 0, 0xA34F, 0, 0,
- 0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xA350, 0x463F,
-};
static const unsigned short utf8_to_euc_E58D[] = {
0x523F, 0x3D3D, 0xB436, 0x4069, 0, 0x5241, 0x5240, 0x3E23,
0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244, 0, 0,
@@ -5798,16 +3219,6 @@ 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_E58D_x0213[] = {
- 0x523F, 0x3D3D, 0xA351, 0x4069, 0, 0x5241, 0x5240, 0x3E23,
- 0x3861, 0x5243, 0x483E, 0xB438, 0xB437, 0x5244, 0, 0,
- 0, 0x485C, 0x4234, 0x426E, 0x3628, 0, 0, 0x466E,
- 0x4331, 0xB439, 0x476E, 0xB43A, 0x4B4E, 0, 0x5246, 0,
- 0x406A, 0x2E6F, 0, 0x2E70, 0, 0xB43D, 0x3735, 0xA354,
- 0, 0x5247, 0, 0, 0xA355, 0xB43F, 0x5248, 0x312C,
- 0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71, 0, 0x524B,
- 0x3237, 0xB441, 0xA356, 0x524A, 0, 0x2E71, 0xB442, 0x362A,
-};
static const unsigned short utf8_to_euc_E58E[] = {
0, 0, 0x524C, 0xB443, 0x4C71, 0, 0, 0xB444,
0xB445, 0, 0, 0, 0, 0, 0xB446, 0,
@@ -5818,16 +3229,6 @@ 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_E58E_x0213[] = {
- 0, 0, 0x524C, 0xB443, 0x4C71, 0, 0, 0xB444,
- 0xB445, 0, 0, 0, 0, 0, 0xB446, 0,
- 0, 0, 0, 0x2E72, 0xB448, 0, 0x524D, 0,
- 0x4E52, 0xB449, 0x387C, 0, 0, 0x2E73, 0, 0x3836,
- 0x524E, 0xB44B, 0, 0, 0xA357, 0x5250, 0x524F, 0,
- 0x3F5F, 0x3139, 0xB44D, 0xB44E, 0, 0x315E, 0x5251, 0xB44F,
- 0x5252, 0, 0x2E74, 0x3837, 0xA358, 0xB452, 0x5253, 0xA35A,
- 0xB454, 0, 0xB455, 0x356E, 0, 0xB456, 0, 0,
-};
static const unsigned short utf8_to_euc_E58F[] = {
0xB457, 0, 0x3B32, 0x5254, 0, 0xB458, 0, 0,
0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
@@ -5838,16 +3239,6 @@ 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_E58F_x0213[] = {
- 0xA35B, 0, 0x3B32, 0x5254, 0, 0xB458, 0, 0,
- 0x4B74, 0x3A35, 0x355A, 0x4D27, 0x4150, 0x483F, 0x3C7D, 0xB459,
- 0, 0, 0xB45A, 0xB45B, 0x3D47, 0xA35F, 0x3C68, 0x3C75,
- 0, 0x3D76, 0xA360, 0x4840, 0, 0xB45E, 0xB45F, 0x5257,
- 0xB460, 0x3143, 0x4151, 0x387D, 0x3845, 0x3667, 0xB461, 0xB462,
- 0x525B, 0x4321, 0x427E, 0x362B, 0x3E24, 0x525C, 0x525A, 0x3244,
- 0x4266, 0x3C38, 0x3B4B, 0x3126, 0xA362, 0xA363, 0x3370, 0x3966,
- 0x3B4A, 0, 0x525D, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E590[] = {
0, 0x525E, 0xB464, 0x3549, 0x3346, 0, 0, 0,
0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
@@ -5858,16 +3249,6 @@ 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_E590_x0213[] = {
- 0, 0x525E, 0xB464, 0x3549, 0x3346, 0, 0, 0,
- 0x3967, 0x3548, 0x445F, 0x3125, 0x4631, 0x4C3E, 0x3921, 0x4D79,
- 0x4547, 0x387E, 0x2E75, 0xB465, 0, 0, 0, 0,
- 0, 0, 0xB466, 0x372F, 0, 0x5267, 0x4F7E, 0x3663,
- 0x4B4A, 0xB467, 0, 0, 0xA365, 0, 0x485D, 0x2E76,
- 0xA366, 0x5266, 0xB46A, 0x345E, 0x5261, 0x5262, 0x5264, 0xB46B,
- 0, 0xB46C, 0, 0, 0xB46D, 0xB46E, 0x5265, 0,
- 0x355B, 0x3F61, 0, 0x4A2D, 0x5263, 0x525F, 0x3863, 0,
-};
static const unsigned short utf8_to_euc_E591[] = {
0x5260, 0, 0x4F24, 0xB46F, 0xB470, 0, 0x4A72, 0xB471,
0x4468, 0x3862, 0x3970, 0, 0, 0xB472, 0x5268, 0xB473,
@@ -5878,16 +3259,6 @@ 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_E591_x0213[] = {
- 0x5260, 0, 0x4F24, 0xA368, 0xB470, 0, 0x4A72, 0xB471,
- 0x4468, 0x3862, 0x3970, 0, 0, 0x2E77, 0x5268, 0xB473,
- 0, 0x465D, 0, 0, 0, 0xA364, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xB474, 0x526C,
- 0, 0, 0xA369, 0, 0xB476, 0, 0xA36A, 0xB478,
- 0x3C7E, 0xB479, 0x3C76, 0x2E79, 0xA36B, 0xB47B, 0xB47C, 0,
- 0x526F, 0x526D, 0, 0x4C23, 0x2E7A, 0x526A, 0x5273, 0x526E,
- 0, 0, 0, 0x5271, 0x3846, 0x4C3F, 0, 0x2E7B,
-};
static const unsigned short utf8_to_euc_E592[] = {
0x5272, 0xB521, 0, 0xB522, 0x5274, 0xB523, 0x5276, 0,
0xB524, 0xB525, 0xF435, 0x3A70, 0x4F42, 0xB526, 0x526B, 0x5269,
@@ -5898,16 +3269,6 @@ 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_E592_x0213[] = {
- 0x5272, 0xB521, 0, 0xB522, 0x5274, 0xB523, 0x5276, 0,
- 0x2E7C, 0xB525, 0xA36C, 0x3A70, 0x4F42, 0xA36D, 0x526B, 0x5269,
- 0x5275, 0xB527, 0x5270, 0, 0, 0xA36E, 0x2E7D, 0,
- 0, 0, 0, 0, 0x2E78, 0, 0, 0xB52B,
- 0xA36F, 0x2E7E, 0x5278, 0, 0x5323, 0x527A, 0xA370, 0xB52E,
- 0x527E, 0x2F21, 0xB530, 0x5321, 0x527B, 0xA371, 0xA372, 0x533E,
- 0, 0xB533, 0x3A69, 0x3331, 0, 0, 0, 0xA373,
- 0x5279, 0xB535, 0xA374, 0xB537, 0x5325, 0x3076, 0x5324, 0xA375,
-};
static const unsigned short utf8_to_euc_E593[] = {
0x3025, 0x494A, 0x5322, 0, 0x527C, 0, 0xB539, 0x5277,
0x527D, 0x3A48, 0xB53A, 0, 0, 0xB53B, 0xB53C, 0,
@@ -5918,16 +3279,6 @@ 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_E593_x0213[] = {
- 0x3025, 0x494A, 0x5322, 0xA376, 0x527C, 0, 0x2F22, 0x5277,
- 0x527D, 0x3A48, 0xB53A, 0, 0, 0xB53B, 0xB53C, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x5326, 0, 0, 0, 0, 0, 0, 0,
- 0xB53D, 0x3077, 0x532F, 0, 0, 0x5327, 0x5328, 0,
- 0x3E25, 0x4B69, 0xB53E, 0, 0xA378, 0x532D, 0x532C, 0xA379,
- 0, 0xA37A, 0x452F, 0xA37B, 0, 0, 0xB541, 0,
- 0, 0, 0x532E, 0, 0xB542, 0x532B, 0xB543, 0x2F23,
-};
static const unsigned short utf8_to_euc_E594[] = {
0xB545, 0xB546, 0, 0, 0x3134, 0xB547, 0x3A36, 0x3F30,
0xB548, 0xB549, 0, 0, 0xB54A, 0xB54B, 0xB54C, 0x5329,
@@ -5938,16 +3289,6 @@ 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_E594_x0213[] = {
- 0xA37C, 0xA37D, 0, 0, 0x3134, 0xB547, 0x3A36, 0x3F30,
- 0xB548, 0xA37E, 0, 0, 0xB54A, 0xB54B, 0x2F24, 0x5329,
- 0x4562, 0, 0, 0, 0x532A, 0xB54D, 0x3022, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xB54E, 0x2F25, 0, 0, 0x5334, 0x4D23,
- 0, 0x3E27, 0xB550, 0x533A, 0, 0x2F26, 0xB552, 0,
- 0x5339, 0x5330, 0, 0xB553, 0xA421, 0xB555, 0x4243, 0,
-};
static const unsigned short utf8_to_euc_E595[] = {
0x5331, 0xB556, 0, 0, 0x426F, 0x5336, 0x3E26, 0xB557,
0, 0xB558, 0xB559, 0, 0x5333, 0xB55A, 0, 0x4C64,
@@ -5958,16 +3299,6 @@ 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_E595_x0213[] = {
- 0x5331, 0xA422, 0, 0, 0x426F, 0x5336, 0x3E26, 0xA424,
- 0, 0xB558, 0xA425, 0, 0x5333, 0xB55A, 0, 0x4C64,
- 0x2F27, 0xB55C, 0, 0x373C, 0, 0, 0x5337, 0x5338,
- 0xB55D, 0, 0xB55E, 0xB55F, 0x5335, 0x533B, 0x2F28, 0,
- 0xA427, 0xA428, 0, 0x5332, 0xA429, 0, 0xB564, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x5341, 0x5346, 0xA42B, 0x5342, 0xB565,
-};
static const unsigned short utf8_to_euc_E596[] = {
0x533D, 0xB566, 0xB567, 0x5347, 0x4131, 0, 0xB568, 0x5349,
0xB569, 0x3922, 0x533F, 0x437D, 0, 0, 0xB56A, 0xB56B,
@@ -5978,16 +3309,6 @@ 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_E596_x0213[] = {
- 0x533D, 0x2F29, 0xA42C, 0x5347, 0x4131, 0, 0x2F2A, 0x5349,
- 0xA42D, 0x3922, 0x533F, 0x437D, 0, 0, 0x2F2B, 0xB56B,
- 0, 0xA42E, 0xB56D, 0xB56E, 0xB56F, 0, 0, 0xB570,
- 0x5343, 0x533C, 0x342D, 0, 0x346E, 0x3365, 0x5344, 0x5340,
- 0, 0, 0, 0xB571, 0xB572, 0, 0, 0x3776,
- 0x534A, 0x5348, 0x4153, 0x354A, 0x362C, 0x2F2D, 0x5345, 0,
- 0x3674, 0, 0xB574, 0, 0, 0, 0x3144, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xA433,
-};
static const unsigned short utf8_to_euc_E597[] = {
0, 0xB576, 0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
0, 0xB579, 0, 0xB57A, 0xB57B, 0, 0xB57C, 0,
@@ -5998,16 +3319,6 @@ 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_E597_x0213[] = {
- 0, 0xB576, 0, 0xB577, 0x534E, 0x534C, 0xB578, 0x5427,
- 0, 0xA434, 0, 0xB57A, 0xA435, 0, 0x2F2E, 0,
- 0, 0xA436, 0xA430, 0xB621, 0x5351, 0, 0, 0xB622,
- 0xB623, 0, 0x534B, 0xB624, 0x534F, 0xA437, 0xB625, 0x534D,
- 0, 0, 0xA439, 0x3B4C, 0x5350, 0, 0, 0,
- 0, 0xA43B, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xB628, 0x5353,
- 0, 0x5358, 0, 0, 0, 0x5356, 0x5355, 0xB629,
-};
static const unsigned short utf8_to_euc_E598[] = {
0, 0, 0, 0, 0, 0xB62A, 0x4332, 0,
0xB62B, 0x3245, 0xB62C, 0, 0, 0xB62D, 0xB62E, 0xB62F,
@@ -6018,16 +3329,6 @@ 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_E598_x0213[] = {
- 0, 0, 0, 0, 0, 0xB62A, 0x4332, 0xA43E,
- 0x2F30, 0x3245, 0xB62C, 0, 0, 0xB62D, 0x2F31, 0xB62F,
- 0xA43F, 0xB631, 0xB632, 0, 0x5352, 0, 0x5354, 0x3E28,
- 0x3133, 0xB633, 0, 0x5357, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xA43C, 0x325E, 0, 0, 0xB634, 0, 0, 0x5362,
- 0xA440, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xA441,
- 0x535F, 0xB639, 0, 0x2F32, 0xB63B, 0xA443, 0, 0xA444,
-};
static const unsigned short utf8_to_euc_E599[] = {
0xB63E, 0xB63F, 0x313D, 0xB640, 0xB641, 0, 0xB642, 0,
0, 0xB643, 0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
@@ -6038,16 +3339,6 @@ 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_E599_x0213[] = {
- 0xA445, 0xB63F, 0x313D, 0xB640, 0xB641, 0, 0xB642, 0xA446,
- 0, 0x2F33, 0, 0xB644, 0x4139, 0xB645, 0x5359, 0xB646,
- 0x535A, 0, 0, 0x7427, 0xB647, 0, 0, 0,
- 0, 0, 0, 0x337A, 0, 0, 0xA447, 0,
- 0xA448, 0xB64A, 0xB64B, 0xB64C, 0x5361, 0, 0x2F35, 0,
- 0x346F, 0xB64E, 0x5364, 0x5360, 0x5363, 0xA449, 0, 0x2F37,
- 0, 0x2F38, 0x2F39, 0, 0x4A2E, 0xB653, 0x2F34, 0,
- 0x4655, 0, 0x4838, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E59A[] = {
0x5366, 0, 0, 0, 0xB654, 0xB655, 0x5365, 0x3345,
0xB656, 0, 0x5367, 0xB657, 0xB658, 0, 0, 0x536A,
@@ -6058,16 +3349,6 @@ 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_E59A_x0213[] = {
- 0x5366, 0, 0, 0, 0xB654, 0xB655, 0x5365, 0x3345,
- 0xA44B, 0, 0x5367, 0xB657, 0xA44C, 0, 0, 0x536A,
- 0, 0, 0, 0, 0x5369, 0xA44D, 0, 0,
- 0, 0x2F3A, 0xA44E, 0, 0, 0xA44F, 0x2F3B, 0xB65E,
- 0x5368, 0, 0x4739, 0, 0, 0x536B, 0xB65F, 0xB660,
- 0xA450, 0x2F3C, 0, 0xB663, 0x2F3D, 0xA451, 0x536C, 0,
- 0, 0xB666, 0xA452, 0x2F3E, 0x536E, 0, 0x536D, 0xB668,
- 0, 0, 0, 0, 0x5370, 0, 0xB669, 0,
-};
static const unsigned short utf8_to_euc_E59B[] = {
0x5373, 0x5371, 0x536F, 0x5372, 0, 0xB66A, 0, 0,
0x5374, 0xB66B, 0xB66C, 0xB66D, 0xB670, 0xB671, 0x5375, 0xB66E,
@@ -6078,16 +3359,6 @@ 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_E59B_x0213[] = {
- 0x5373, 0x5371, 0x536F, 0x5372, 0, 0xA453, 0, 0,
- 0x5374, 0x2F3F, 0x2F40, 0xB66D, 0xB670, 0xA454, 0x5375, 0xB66E,
- 0xB66F, 0x5376, 0, 0x5377, 0, 0, 0, 0x5378,
- 0x5145, 0xB672, 0x3C7C, 0x3B4D, 0xB673, 0xB674, 0x3273, 0xA455,
- 0x3078, 0xB676, 0, 0x4344, 0xB677, 0xB678, 0xB679, 0xB67A,
- 0xA456, 0, 0, 0xB67D, 0, 0xB67E, 0x5379, 0,
- 0x3A24, 0xB67C, 0x304F, 0x3F5E, 0, 0, 0xA457, 0xA458,
- 0, 0x537A, 0x3847, 0, 0, 0x3971, 0, 0x537C,
-};
static const unsigned short utf8_to_euc_E59C[] = {
0x537B, 0xB723, 0xB724, 0x4A60, 0x537D, 0, 0, 0xB725,
0x5421, 0x537E, 0xB726, 0x5422, 0xB727, 0x5423, 0, 0x3777,
@@ -6098,16 +3369,6 @@ 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_E59C_x0213[] = {
- 0x537B, 0xB723, 0xB724, 0x4A60, 0x537D, 0, 0, 0xB725,
- 0x5421, 0x537E, 0x2F41, 0x5422, 0xB727, 0x5423, 0, 0x3777,
- 0, 0xB728, 0x3160, 0x5424, 0, 0xA45A, 0x5426, 0,
- 0x5425, 0, 0xB72A, 0xB72B, 0x5428, 0xB72C, 0, 0x455A,
- 0xB72D, 0x2F43, 0xB72E, 0xA45B, 0xB730, 0xB731, 0x5429, 0x3035,
- 0x3A5F, 0xA45D, 0xB733, 0, 0xB734, 0x373D, 0xB735, 0x2F44,
- 0x434F, 0, 0, 0x2F45, 0x2F46, 0, 0, 0x542A,
- 0x542B, 0, 0, 0x542D, 0, 0xB739, 0xB73A, 0xB73B,
-};
static const unsigned short utf8_to_euc_E59D[] = {
0x542E, 0, 0x3A64, 0, 0, 0xB73C, 0xB73D, 0x3651,
0, 0, 0x4B37, 0, 0xB73E, 0xB73F, 0x542C, 0x542F,
@@ -6118,16 +3379,6 @@ 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_E59D_x0213[] = {
- 0x542E, 0, 0x3A64, 0, 0, 0xA45F, 0xA460, 0x3651,
- 0, 0, 0x4B37, 0, 0xA461, 0xA462, 0x542C, 0x542F,
- 0x3A41, 0x3923, 0xB740, 0, 0, 0, 0, 0,
- 0, 0xF436, 0, 0, 0, 0, 0, 0,
- 0, 0x5433, 0xB741, 0, 0x3A25, 0xB742, 0x4333, 0xB743,
- 0xA464, 0x5430, 0x445A, 0xB745, 0, 0xB746, 0xB747, 0xA465,
- 0x2F47, 0xB74A, 0, 0xA466, 0xA467, 0xA468, 0, 0x2F48,
- 0, 0xB74F, 0xB750, 0xA469, 0x2F49, 0, 0xB753, 0x5434,
-};
static const unsigned short utf8_to_euc_E59E[] = {
0, 0xB754, 0x3F62, 0xB755, 0, 0, 0, 0,
0x5432, 0x5435, 0, 0x373F, 0xB756, 0, 0, 0,
@@ -6138,16 +3389,6 @@ 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_E59E_x0213[] = {
- 0, 0xB754, 0x3F62, 0xB755, 0, 0, 0, 0,
- 0x5432, 0x5435, 0, 0x373F, 0xB756, 0, 0, 0,
- 0, 0, 0, 0x5436, 0xB757, 0xB760, 0, 0xB758,
- 0, 0xB759, 0xA46D, 0, 0x2F4A, 0xA46E, 0xA46F, 0xB75E,
- 0x5437, 0xB75F, 0x3924, 0x3340, 0x5439, 0, 0, 0xB761,
- 0xA470, 0xB763, 0x543A, 0, 0xA46C, 0, 0, 0,
- 0x543B, 0, 0, 0x5438, 0, 0, 0, 0,
- 0x2F4D, 0, 0, 0, 0, 0xB766, 0, 0,
-};
static const unsigned short utf8_to_euc_E59F[] = {
0x5431, 0, 0, 0x543C, 0, 0, 0x543D, 0xB767,
0xB768, 0, 0, 0x4B64, 0xB769, 0, 0x3E6B, 0xB76A,
@@ -6158,16 +3399,6 @@ 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_E59F_x0213[] = {
- 0x5431, 0, 0, 0x543C, 0, 0, 0x543D, 0x2F4E,
- 0x2F4F, 0, 0, 0x4B64, 0xA473, 0, 0x3E6B, 0x2F50,
- 0, 0, 0x543F, 0x5440, 0x543E, 0xB76B, 0x5442, 0xA471,
- 0, 0, 0, 0, 0x4738, 0xB76C, 0xA476, 0x3068,
- 0x4956, 0xB77E, 0, 0x5443, 0x2F51, 0, 0xA477, 0xB770,
- 0, 0xB771, 0, 0, 0, 0x2F52, 0, 0,
- 0xA478, 0, 0, 0, 0x3E7D, 0x2F53, 0x2F54, 0x3C39,
- 0xA47A, 0x475D, 0x3470, 0xA47B, 0x3A6B, 0xA47C, 0xB778, 0x2F55,
-};
static const unsigned short utf8_to_euc_E5A0[] = {
0x4B59, 0, 0x4632, 0xB77A, 0xB77B, 0x3778, 0x424F, 0,
0xB77C, 0xB77D, 0x5441, 0x5444, 0xB821, 0xB822, 0, 0,
@@ -6178,16 +3409,6 @@ 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_E5A0_x0213[] = {
- 0x4B59, 0, 0x4632, 0xB77A, 0xA47D, 0x3778, 0x424F, 0,
- 0xB77C, 0x2F56, 0x5441, 0x5444, 0xB821, 0xB822, 0, 0,
- 0, 0, 0, 0, 0, 0x4244, 0, 0,
- 0, 0x5445, 0, 0xB823, 0, 0x5446, 0xA47E, 0xB825,
- 0xA521, 0x5448, 0, 0, 0x4469, 0, 0xB827, 0xA522,
- 0, 0, 0x342E, 0, 0, 0xB829, 0, 0x7421,
- 0x3161, 0x4A73, 0xA523, 0, 0x3E6C, 0x4548, 0, 0,
- 0, 0xA524, 0x3A66, 0, 0, 0x544E, 0, 0xB82C,
-};
static const unsigned short utf8_to_euc_E5A1[] = {
0x4A3D, 0x4E5D, 0, 0, 0, 0, 0, 0,
0, 0xB82D, 0x3274, 0x544A, 0xB82E, 0xB82F, 0, 0xB830,
@@ -6198,16 +3419,6 @@ 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_E5A1_x0213[] = {
- 0x4A3D, 0x4E5D, 0, 0, 0, 0, 0, 0,
- 0, 0xA526, 0x3274, 0x544A, 0xA527, 0xB82F, 0, 0xB830,
- 0xB831, 0x413A, 0x544D, 0, 0x4563, 0xB832, 0, 0x4549,
- 0x4564, 0x4839, 0x444D, 0, 0, 0, 0x3A49, 0xB833,
- 0, 0x2F58, 0x5449, 0, 0x2F59, 0, 0, 0xA528,
- 0xB837, 0x3176, 0, 0x4536, 0, 0, 0, 0,
- 0x544B, 0, 0x5447, 0, 0, 0x3F50, 0, 0,
- 0xB838, 0x544F, 0, 0, 0x2F5B, 0, 0x3D4E, 0xB83A,
-};
static const unsigned short utf8_to_euc_E5A2[] = {
0xB83B, 0xB83C, 0, 0x362D, 0, 0x5450, 0, 0xB83D,
0xB83E, 0xB83F, 0xB840, 0, 0xB841, 0xB842, 0, 0xB843,
@@ -6218,16 +3429,6 @@ 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_E5A2_x0213[] = {
- 0xB83B, 0xB83C, 0, 0x362D, 0, 0x5450, 0, 0xB83D,
- 0xB83E, 0x2F5C, 0xA529, 0xA52A, 0xB841, 0xA52B, 0, 0xA52C,
- 0xA52D, 0, 0, 0x4A68, 0xA52E, 0, 0xB846, 0x417D,
- 0, 0, 0, 0, 0x4446, 0xA52F, 0x2F5D, 0x5452,
- 0xB848, 0xB849, 0xB84A, 0, 0, 0, 0xB84B, 0,
- 0x4B4F, 0x2F5F, 0xA530, 0x5453, 0, 0, 0x5458, 0,
- 0, 0xA531, 0xB84E, 0x4A2F, 0, 0, 0, 0,
- 0x5457, 0x5451, 0x5454, 0x5456, 0xB850, 0, 0x3A26, 0,
-};
static const unsigned short utf8_to_euc_E5A3[] = {
0, 0x4A49, 0xB851, 0, 0xB84F, 0x5459, 0, 0x4345,
0xB852, 0, 0x3275, 0, 0x3E6D, 0xB853, 0xB854, 0,
@@ -6238,16 +3439,6 @@ 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_E5A3_x0213[] = {
- 0, 0x4A49, 0xB851, 0xA533, 0xB84F, 0x5459, 0, 0x4345,
- 0xB852, 0, 0x3275, 0, 0x3E6D, 0xA534, 0x2F62, 0,
- 0xB855, 0x545B, 0x2F61, 0x545A, 0x2F63, 0x3968, 0xB858, 0x545C,
- 0x545E, 0x545D, 0x2F64, 0, 0x5460, 0xB85A, 0x5455, 0x5462,
- 0x2F65, 0xB85B, 0xA535, 0, 0x5461, 0x545F, 0, 0,
- 0, 0x2F66, 0, 0x3B4E, 0x3F51, 0, 0x4154, 0x5463,
- 0x403C, 0x306D, 0x4764, 0xA536, 0xA537, 0, 0, 0x445B,
- 0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468, 0, 0,
-};
static const unsigned short utf8_to_euc_E5A4[] = {
0, 0, 0x5469, 0, 0, 0xB85F, 0xB860, 0,
0, 0x4A51, 0x546A, 0xB861, 0xB862, 0, 0, 0x3246,
@@ -6258,16 +3449,6 @@ 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_E5A4_x0213[] = {
- 0, 0, 0x5469, 0, 0, 0xA538, 0xA539, 0,
- 0, 0x4A51, 0x546A, 0xA53A, 0x2F67, 0xA53B, 0, 0x3246,
- 0x546B, 0, 0xB863, 0xB864, 0xA53C, 0x4D3C, 0x3330, 0,
- 0x5249, 0x3D48, 0x423F, 0x546C, 0x4C6B, 0xB867, 0, 0,
- 0, 0xB868, 0x4C34, 0xB869, 0xA53D, 0x546E, 0, 0x4267,
- 0xB86B, 0x4537, 0x4240, 0x4957, 0x546F, 0x5470, 0x317B, 0xB86C,
- 0xB86D, 0x3C3A, 0x5471, 0xB86E, 0, 0xB86F, 0xB870, 0x3050,
- 0x5472, 0, 0, 0, 0, 0xA540, 0x5473, 0xB871,
-};
static const unsigned short utf8_to_euc_E5A5[] = {
0, 0, 0, 0xB872, 0x3162, 0, 0xB873, 0x3471,
0x4660, 0x4A74, 0, 0, 0, 0, 0x5477, 0x4155,
@@ -6278,16 +3459,6 @@ 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_E5A5_x0213[] = {
- 0, 0, 0, 0xB872, 0x3162, 0, 0xA542, 0x3471,
- 0x4660, 0x4A74, 0, 0, 0, 0, 0x5477, 0x4155,
- 0x5476, 0x3740, 0xB874, 0xB875, 0x4B5B, 0x5475, 0, 0x4565,
- 0x5479, 0xB876, 0x5478, 0xA545, 0, 0x2F69, 0xB879, 0xA546,
- 0x547B, 0xB87B, 0x547A, 0xB87C, 0, 0x317C, 0, 0x547C,
- 0x3E29, 0x547E, 0x4325, 0xB87D, 0x547D, 0x2F6A, 0x4A33, 0xB921,
- 0, 0, 0xB922, 0x3D77, 0x455B, 0xA548, 0xA549, 0,
- 0x5521, 0xB925, 0, 0xB926, 0xA54A, 0x3925, 0, 0,
-};
static const unsigned short utf8_to_euc_E5A6[] = {
0, 0x5522, 0x4721, 0x485E, 0x4C51, 0, 0, 0,
0, 0, 0x4725, 0xB928, 0xB929, 0x552B, 0xB92A, 0,
@@ -6298,16 +3469,6 @@ 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_E5A6_x0213[] = {
- 0, 0x5522, 0x4721, 0x485E, 0x4C51, 0, 0, 0,
- 0, 0, 0x4725, 0x2F6B, 0xB929, 0x552B, 0xB92A, 0,
- 0, 0, 0x2F6C, 0x3538, 0, 0xB92C, 0x4D45, 0xB92D,
- 0, 0x4C2F, 0, 0x562C, 0, 0x5523, 0, 0xA54B,
- 0, 0, 0, 0x5526, 0x2F6D, 0x4245, 0, 0xB930,
- 0x4B38, 0, 0, 0, 0x454A, 0xB931, 0xA54C, 0xB933,
- 0xB934, 0, 0x5527, 0xB935, 0, 0, 0, 0xB936,
- 0, 0x4B65, 0xB937, 0x3A4A, 0xA54D, 0, 0x3E2A, 0,
-};
static const unsigned short utf8_to_euc_E5A7[] = {
0, 0xB939, 0, 0xB93A, 0xB93B, 0, 0x5528, 0,
0xB93C, 0x3B50, 0xB93D, 0x3B4F, 0, 0xB93E, 0, 0,
@@ -6318,16 +3479,6 @@ 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_E5A7_x0213[] = {
- 0, 0xB939, 0, 0x2F6E, 0xB93B, 0, 0x5528, 0,
- 0xA54E, 0x3B50, 0xB93D, 0x3B4F, 0, 0xA54F, 0, 0,
- 0x3039, 0x3848, 0x2F6F, 0x402B, 0x3051, 0, 0, 0,
- 0, 0x552C, 0x552D, 0, 0x552A, 0x2F70, 0xA550, 0xB942,
- 0, 0, 0, 0xA551, 0xA552, 0x3138, 0x342F, 0xA553,
- 0x5529, 0, 0x4C45, 0x4931, 0, 0, 0xA554, 0xB947,
- 0, 0xB948, 0xB949, 0, 0xB94A, 0, 0x3028, 0xB94B,
- 0x7E7A, 0, 0, 0x3079, 0, 0, 0, 0x3B51,
-};
static const unsigned short utf8_to_euc_E5A8[] = {
0xB94C, 0x3052, 0, 0x3023, 0xB94D, 0, 0, 0,
0, 0x5532, 0, 0, 0xB94E, 0xB94F, 0xB950, 0,
@@ -6338,16 +3489,6 @@ 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_E5A8_x0213[] = {
- 0xB94C, 0x3052, 0, 0x3023, 0xB94D, 0, 0, 0,
- 0, 0x5532, 0, 0, 0xA558, 0xA559, 0xB950, 0,
- 0, 0x5530, 0xB951, 0x2F71, 0, 0, 0, 0xA55A,
- 0x4C3C, 0, 0x5533, 0, 0x5531, 0, 0xB953, 0x552F,
- 0x3F31, 0, 0, 0x2F72, 0xB955, 0x552E, 0, 0xA55B,
- 0xB957, 0x4A5A, 0xB958, 0, 0, 0xA55C, 0, 0x3864,
- 0xB95A, 0, 0, 0, 0, 0x5537, 0x5538, 0,
- 0, 0, 0, 0, 0x3E2B, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E5A9[] = {
0x5534, 0x4F2C, 0, 0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
0xB95E, 0x5536, 0, 0, 0xB95F, 0, 0, 0,
@@ -6358,16 +3499,6 @@ 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_E5A9_x0213[] = {
- 0x5534, 0x4F2C, 0, 0, 0xB95B, 0xB95C, 0x474C, 0xB95D,
- 0xB95E, 0x5536, 0, 0, 0xB95F, 0, 0, 0,
- 0xB960, 0, 0, 0, 0, 0xA55D, 0, 0,
- 0, 0, 0x3A27, 0, 0, 0, 0xB962, 0,
- 0, 0, 0x5539, 0xB963, 0, 0xA55E, 0x4958, 0x2F73,
- 0, 0, 0x553A, 0, 0x5535, 0x2F74, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x2F75,
- 0, 0, 0xA55F, 0xB969, 0, 0, 0x2F76, 0x4C3B,
-};
static const unsigned short utf8_to_euc_E5AA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0xB96B, 0, 0, 0, 0,
@@ -6378,16 +3509,6 @@ 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_E5AA_x0213[] = {
- 0, 0, 0, 0, 0x2F77, 0, 0, 0,
- 0, 0, 0, 0xA560, 0, 0, 0, 0,
- 0xB96C, 0, 0x475E, 0xB96D, 0, 0, 0xB96E, 0,
- 0, 0xB96F, 0x553B, 0x4932, 0xA561, 0, 0x2F78, 0xA562,
- 0xA563, 0, 0xA564, 0, 0, 0, 0, 0x2F79,
- 0, 0, 0, 0, 0xB976, 0, 0, 0,
- 0, 0xA565, 0xB978, 0xA566, 0, 0xA567, 0, 0,
- 0xB97B, 0, 0xA568, 0xB97D, 0x553C, 0x5540, 0x553D, 0xA569,
-};
static const unsigned short utf8_to_euc_E5AB[] = {
0, 0x3247, 0x553F, 0, 0xBA21, 0, 0xBA22, 0,
0xBA23, 0x3C3B, 0, 0x553E, 0x3779, 0, 0, 0xBA24,
@@ -6398,16 +3519,6 @@ 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_E5AB_x0213[] = {
- 0, 0x3247, 0x553F, 0, 0x2F7A, 0, 0xBA22, 0,
- 0xBA23, 0x3C3B, 0, 0x553E, 0x3779, 0, 0, 0xBA24,
- 0x554C, 0, 0, 0, 0, 0, 0x5545, 0x5542,
- 0, 0, 0xA56A, 0, 0xA56B, 0, 0, 0,
- 0xA56C, 0x4364, 0, 0x5541, 0, 0xA56D, 0x5543, 0,
- 0, 0x5544, 0xBA29, 0, 0, 0, 0xA56F, 0,
- 0xA56E, 0, 0, 0, 0, 0xA570, 0xBA2C, 0,
- 0, 0, 0x5546, 0x5547, 0, 0xBA2D, 0, 0,
-};
static const unsigned short utf8_to_euc_E5AC[] = {
0xBA2E, 0xBA2F, 0, 0, 0, 0, 0, 0,
0xBA30, 0x3472, 0, 0x5549, 0x5548, 0, 0, 0,
@@ -6418,16 +3529,6 @@ 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_E5AC_x0213[] = {
- 0xA571, 0xBA2F, 0, 0, 0, 0, 0, 0,
- 0xA572, 0x3472, 0, 0x5549, 0x5548, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x554A, 0xA573,
- 0, 0x2F7C, 0, 0xBA34, 0, 0xBA35, 0, 0,
- 0, 0xBA36, 0x3E6E, 0, 0, 0x2F7D, 0, 0,
- 0, 0, 0x554D, 0, 0x445C, 0xA575, 0, 0,
- 0x3145, 0, 0x554B, 0, 0xA574, 0, 0x554E, 0,
- 0xBA39, 0, 0, 0, 0, 0, 0x554F, 0,
-};
static const unsigned short utf8_to_euc_E5AD[] = {
0x5552, 0xBA3A, 0, 0x5550, 0, 0x5551, 0, 0,
0, 0, 0, 0xBA3B, 0xBA3C, 0, 0, 0,
@@ -6438,16 +3539,6 @@ 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_E5AD_x0213[] = {
- 0x5552, 0x4F55, 0, 0x5550, 0, 0x5551, 0, 0,
- 0, 0, 0, 0xBA3B, 0xA576, 0, 0, 0,
- 0x3B52, 0x5553, 0xA577, 0, 0x3926, 0x5554, 0x4F56, 0x3B7A,
- 0x4238, 0, 0x5555, 0x5556, 0x3B5A, 0x3927, 0xBA3F, 0x4C52,
- 0, 0, 0, 0x3528, 0x3849, 0x5557, 0x3358, 0,
- 0xA578, 0x5558, 0, 0x4239, 0, 0, 0xBA41, 0xA579,
- 0x5559, 0x5623, 0, 0x555A, 0, 0x555B, 0, 0,
- 0x555C, 0, 0x555E, 0, 0xA57A, 0x4F57, 0xBA45, 0xA57B,
-};
static const unsigned short utf8_to_euc_E5AE[] = {
0x555F, 0xBA47, 0, 0x5560, 0xBA48, 0x4270, 0xBA49, 0x3127,
0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
@@ -6458,16 +3549,6 @@ 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_E5AE_x0213[] = {
- 0x555F, 0xA57C, 0, 0x5560, 0xA57D, 0x4270, 0xBA49, 0x3127,
- 0x3C69, 0x3042, 0xBA4A, 0x4157, 0x3430, 0x3C35, 0xBA4B, 0x3928,
- 0xBA4C, 0xBA4D, 0, 0x4F58, 0xBA4F, 0x4566, 0xA821, 0x3D21,
- 0x3431, 0x4368, 0x446A, 0x3038, 0x3539, 0x4A75, 0, 0x3C42,
- 0, 0, 0x3552, 0x406B, 0x3C3C, 0x4D28, 0x5561, 0,
- 0xBA51, 0xBA52, 0, 0, 0xA822, 0xBA54, 0x355C, 0xBA55,
- 0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
- 0x5562, 0x4D46, 0xBA59, 0, 0xBA5A, 0, 0, 0x3D49,
-};
static const unsigned short utf8_to_euc_E5AF[] = {
0xBA5B, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
0, 0x5565, 0, 0, 0x4959, 0xBA5D, 0, 0xBA5E,
@@ -6478,16 +3559,6 @@ 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_E5AF_x0213[] = {
- 0xA824, 0xBA5C, 0x3C64, 0x5563, 0x3473, 0x4652, 0x4C29, 0x5564,
- 0, 0x5565, 0, 0, 0x4959, 0xBA5D, 0xA826, 0xBA5E,
- 0x5567, 0, 0x3428, 0x3677, 0x5566, 0, 0xA827, 0xBA60,
- 0x4F59, 0xBA62, 0xBA63, 0x3432, 0, 0x3F32, 0x556B, 0x3B21,
- 0xBA64, 0x3249, 0x556A, 0, 0x5568, 0x556C, 0x5569, 0x472B,
- 0x5C4D, 0x3F33, 0, 0x556D, 0x4F5A, 0, 0x4E40, 0xBA65,
- 0x556E, 0xA82A, 0, 0x5570, 0xBA67, 0x437E, 0x556F, 0,
- 0x4023, 0, 0x3B7B, 0, 0, 0xA82B, 0x4250, 0x3C77,
-};
static const unsigned short utf8_to_euc_E5B0[] = {
0, 0x4975, 0x406C, 0, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
@@ -6498,16 +3569,6 @@ 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_E5B0_x0213[] = {
- 0, 0x4975, 0x406C, 0xA82D, 0x3C4D, 0x5571, 0x3E2D, 0x5572,
- 0x5573, 0x3053, 0x423A, 0x3F52, 0xBA69, 0x5574, 0x4633, 0x3E2E,
- 0, 0x3E2F, 0x4F5B, 0x5575, 0, 0, 0x406D, 0xBA6A,
- 0, 0, 0x3E30, 0, 0, 0, 0x4F5C, 0xBA6C,
- 0x5576, 0, 0x5577, 0x4F5D, 0x4C60, 0, 0xBA6E, 0,
- 0x5578, 0xA82E, 0, 0x4F5E, 0xBA71, 0x3646, 0xBA72, 0,
- 0xA82F, 0x3D22, 0xBA74, 0, 0, 0xBA75, 0xBA76, 0,
- 0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
-};
static const unsigned short utf8_to_euc_E5B1[] = {
0x3649, 0x557B, 0, 0, 0, 0x356F, 0x557C, 0,
0x367E, 0, 0x464F, 0x3230, 0, 0x3B53, 0x557D, 0x5622,
@@ -6518,16 +3579,6 @@ 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_E5B1_x0213[] = {
- 0x3649, 0x557B, 0, 0, 0, 0x356F, 0x557C, 0,
- 0x367E, 0, 0x464F, 0x3230, 0, 0x3B53, 0x557D, 0x5622,
- 0x5621, 0x367D, 0, 0x557E, 0, 0x4538, 0, 0,
- 0, 0xBA77, 0xBA78, 0x7E7B, 0xBA79, 0, 0x4230, 0xA831,
- 0x454B, 0x3C48, 0x4F60, 0xA832, 0x4158, 0x4D7A, 0, 0xA833,
- 0xA834, 0xA835, 0, 0, 0x5624, 0xBB21, 0x5625, 0x4656,
- 0xA836, 0x3B33, 0, 0, 0xBB23, 0xBB24, 0x5627, 0,
- 0, 0x5628, 0x4F64, 0xBB26, 0xA839, 0xBB28, 0, 0,
-};
static const unsigned short utf8_to_euc_E5B2[] = {
0, 0, 0, 0, 0, 0, 0, 0xBB29,
0xBB2A, 0, 0xBB2B, 0, 0x5629, 0, 0, 0xBB2C,
@@ -6538,16 +3589,6 @@ 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_E5B2_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0xBB29,
- 0xA83C, 0, 0xA83D, 0, 0x5629, 0, 0, 0x4F65,
- 0x3474, 0x562A, 0xBB2D, 0, 0x562B, 0, 0, 0,
- 0, 0, 0, 0, 0, 0xBB2E, 0, 0x4F66,
- 0xA841, 0x322C, 0xA842, 0x4F67, 0, 0, 0xA843, 0xA844,
- 0x413B, 0x3464, 0x4F68, 0x562D, 0x4C28, 0xA846, 0, 0,
- 0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xA847, 0x562F, 0x5631,
- 0x345F, 0, 0x4F69, 0x562E, 0x5630, 0, 0x5633, 0,
-};
static const unsigned short utf8_to_euc_E5B3[] = {
0, 0, 0, 0, 0, 0x5632, 0, 0x5634,
0, 0xBB39, 0, 0xBB3A, 0, 0, 0, 0,
@@ -6558,16 +3599,6 @@ 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_E5B3_x0213[] = {
- 0, 0, 0, 0, 0, 0x5632, 0, 0x5634,
- 0, 0xA849, 0, 0x4F6A, 0, 0, 0, 0,
- 0x4F6B, 0, 0x4F6C, 0, 0, 0, 0, 0xBB3D,
- 0, 0x5635, 0, 0, 0, 0xBB3C, 0, 0,
- 0x463D, 0x362E, 0, 0, 0, 0, 0, 0,
- 0x3265, 0x5636, 0x563B, 0, 0, 0x5639, 0xBB3E, 0x4A77,
- 0x4A76, 0xBB3F, 0xBB40, 0, 0x4F6D, 0xF43B, 0x4567, 0,
- 0, 0, 0x5638, 0x3D54, 0, 0x5637, 0, 0,
-};
static const unsigned short utf8_to_euc_E5B4[] = {
0, 0xBB42, 0, 0, 0, 0, 0xBB43, 0x3F72,
0, 0, 0, 0x563C, 0, 0xBB44, 0x3A6A, 0,
@@ -6578,16 +3609,6 @@ 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_E5B4_x0213[] = {
- 0, 0xBB42, 0, 0, 0, 0, 0xA84C, 0x3F72,
- 0, 0, 0, 0x563C, 0, 0x4F70, 0x3A6A, 0,
- 0xA84D, 0x5642, 0xBB45, 0, 0x5643, 0x563D, 0x3333, 0x563E,
- 0x5647, 0x5646, 0x5645, 0x5641, 0, 0xA84F, 0, 0x5640,
- 0xA850, 0, 0x5644, 0xBB47, 0xA851, 0, 0xA852, 0x4F71,
- 0, 0x4A78, 0, 0xA84E, 0, 0, 0, 0,
- 0, 0xA853, 0, 0, 0xBB4C, 0, 0, 0,
- 0, 0xA854, 0, 0, 0, 0xBB4E, 0, 0xBB4F,
-};
static const unsigned short utf8_to_euc_E5B5[] = {
0, 0, 0xBB50, 0xBB51, 0, 0, 0xBB52, 0,
0xBB53, 0, 0xBB57, 0x564B, 0x5648, 0, 0x564A, 0,
@@ -6598,16 +3619,6 @@ 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_E5B5_x0213[] = {
- 0, 0, 0xA855, 0xBB51, 0, 0, 0x4F73, 0x4F74,
- 0xBB53, 0, 0x4F76, 0x564B, 0x5648, 0, 0x564A, 0,
- 0x4D72, 0xBB55, 0x5649, 0x4F75, 0, 0xBB54, 0, 0,
- 0, 0xBB56, 0, 0, 0x563F, 0, 0, 0xBB58,
- 0xBB59, 0xA857, 0xBB5B, 0, 0xBB5C, 0, 0, 0,
- 0, 0x3F73, 0xA858, 0, 0x564C, 0x4F77, 0, 0x3A37,
- 0xA85A, 0, 0, 0x564D, 0, 0, 0x564E, 0,
- 0, 0xBB60, 0xBB61, 0, 0, 0, 0xBB62, 0xBB63,
-};
static const unsigned short utf8_to_euc_E5B6[] = {
0, 0xBB64, 0x5651, 0xBB65, 0x5650, 0, 0, 0x564F,
0xBB66, 0, 0xBB67, 0x4568, 0x563A, 0, 0, 0,
@@ -6618,16 +3629,6 @@ 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_E5B6_x0213[] = {
- 0, 0x4F78, 0x5651, 0xBB65, 0x5650, 0, 0, 0x564F,
- 0xA85D, 0, 0xBB67, 0x4568, 0x563A, 0, 0, 0,
- 0x5657, 0, 0xA85F, 0xBB69, 0xA860, 0xBB6B, 0, 0xA861,
- 0, 0xA862, 0, 0xBB6D, 0, 0x5653, 0, 0xBB6E,
- 0x4F79, 0, 0x5652, 0, 0x4F7A, 0, 0, 0x4F7B,
- 0, 0, 0, 0xBB71, 0x5654, 0, 0x5655, 0,
- 0xA863, 0, 0xA864, 0, 0xA865, 0, 0, 0x5658,
- 0x4F7C, 0xA867, 0x4E66, 0, 0x5659, 0x5656, 0, 0,
-};
static const unsigned short utf8_to_euc_E5B7[] = {
0, 0, 0, 0xBB76, 0, 0, 0, 0xBB77,
0, 0x565A, 0, 0xBB78, 0x3460, 0x565B, 0xBB7A, 0,
@@ -6638,16 +3639,6 @@ 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_E5B7_x0213[] = {
- 0, 0, 0, 0xBB76, 0, 0, 0, 0xBB77,
- 0, 0x565A, 0, 0x4F7D, 0x3460, 0x565B, 0xBB7A, 0,
- 0xBB79, 0xA868, 0x565D, 0x565C, 0, 0, 0x565E, 0xA869,
- 0xA86A, 0xBB7C, 0, 0x565F, 0, 0x406E, 0x3D23, 0,
- 0xA86B, 0x3D64, 0x7428, 0x4163, 0xA86D, 0x3929, 0x3A38, 0x392A,
- 0x3570, 0xA86E, 0, 0x5660, 0, 0, 0x3A39, 0,
- 0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662, 0, 0x392B,
- 0xBC22, 0xBC23, 0, 0x342C, 0, 0x4327, 0x3652, 0,
-};
static const unsigned short utf8_to_euc_E5B8[] = {
0xBC24, 0, 0x3B54, 0x495B, 0, 0, 0x4841, 0xBC25,
0, 0, 0, 0x5663, 0x3475, 0xBC26, 0, 0,
@@ -6658,16 +3649,6 @@ 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_E5B8_x0213[] = {
- 0xA870, 0, 0x3B54, 0x495B, 0, 0, 0x4841, 0xBC25,
- 0, 0, 0, 0x5663, 0x3475, 0xBC26, 0, 0,
- 0, 0x5666, 0xA872, 0, 0x7429, 0xA873, 0x4421, 0,
- 0x742A, 0x5665, 0x5664, 0x5667, 0, 0x446B, 0, 0xA875,
- 0xBC2C, 0, 0, 0, 0, 0x3F63, 0, 0,
- 0xBC2E, 0, 0, 0x3B55, 0, 0x404A, 0xA876, 0x4253,
- 0x3522, 0, 0xBC2F, 0x4422, 0, 0xBC30, 0x5668, 0x5669,
- 0x3E6F, 0, 0, 0, 0, 0x4B39, 0xA877, 0,
-};
static const unsigned short utf8_to_euc_E5B9[] = {
0x566C, 0, 0, 0x566B, 0x566A, 0x497D, 0, 0x5673,
0, 0xBC34, 0, 0xBC32, 0x4B5A, 0, 0x566D, 0,
@@ -6678,16 +3659,6 @@ 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_E5B9_x0213[] = {
- 0x566C, 0, 0, 0x566B, 0x566A, 0x497D, 0, 0x5673,
- 0, 0xA878, 0, 0xBC32, 0x4B5A, 0, 0x566D, 0,
- 0xBC33, 0xBC35, 0, 0, 0x566F, 0x4B6B, 0xA87A, 0x566E,
- 0x742B, 0, 0, 0xBC38, 0xBC39, 0, 0x742C, 0x5670,
- 0, 0x4828, 0x5671, 0x4A3E, 0x5672, 0, 0, 0,
- 0xBC3B, 0, 0xBC3C, 0xA87C, 0xA87D, 0xA87E, 0xAC21, 0,
- 0xBC41, 0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675, 0x7E7C,
- 0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
-};
static const unsigned short utf8_to_euc_E5BA[] = {
0xBC42, 0x4423, 0, 0x392D, 0x3E31, 0, 0, 0x485F,
0, 0, 0x3E32, 0xBC43, 0, 0, 0xBC44, 0x3D78,
@@ -6698,16 +3669,6 @@ 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_E5BA_x0213[] = {
- 0xBC42, 0x4423, 0, 0x392D, 0x3E31, 0, 0, 0x485F,
- 0, 0, 0x3E32, 0xBC43, 0, 0, 0xBC44, 0x3D78,
- 0, 0, 0, 0, 0, 0x446C, 0x4A79, 0x4539,
- 0, 0, 0x392E, 0, 0x495C, 0, 0, 0,
- 0x5679, 0, 0xBC45, 0, 0xBC46, 0xAC23, 0x4559, 0x3A42,
- 0xBC48, 0, 0xAC24, 0x384B, 0xAC25, 0x446D, 0, 0,
- 0, 0xBC4B, 0, 0xBC4C, 0, 0x3043, 0x3D6E, 0x392F,
- 0x4D47, 0xAC26, 0, 0, 0, 0xBC4D, 0x742D, 0xAC27,
-};
static const unsigned short utf8_to_euc_E5BB[] = {
0, 0x567A, 0x567B, 0x4751, 0, 0, 0xBC50, 0,
0x567C, 0x4E77, 0x4F2D, 0xBC52, 0xBC51, 0, 0xBC53, 0x567E,
@@ -6718,16 +3679,6 @@ 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_E5BB_x0213[] = {
- 0, 0x567A, 0x567B, 0x4751, 0, 0, 0xAC28, 0,
- 0x567C, 0x4E77, 0x4F2D, 0x742F, 0xBC51, 0, 0xBC53, 0x567E,
- 0x567D, 0xBC54, 0xAC29, 0x3347, 0xBC56, 0xBC57, 0x5721, 0,
- 0, 0xAC2A, 0x5724, 0x5725, 0xBC58, 0x5723, 0xBC59, 0x4940,
- 0x3E33, 0x5727, 0x5726, 0x5722, 0, 0xBC5A, 0, 0,
- 0x5728, 0x5729, 0, 0xBC5B, 0x572A, 0, 0, 0,
- 0x572D, 0x572B, 0, 0x572C, 0x572E, 0, 0x3164, 0x446E,
- 0x572F, 0x7430, 0x377A, 0x3276, 0x4736, 0xAC2C, 0x5730, 0x467B,
-};
static const unsigned short utf8_to_euc_E5BC[] = {
0, 0x4A5B, 0xBC5C, 0x5731, 0x4F2E, 0, 0xBC5D, 0xBC5E,
0xBC5F, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xBC60, 0x3C30,
@@ -6738,16 +3689,6 @@ 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_E5BC_x0213[] = {
- 0x7431, 0x4A5B, 0x7432, 0x5731, 0x4F2E, 0, 0xBC5D, 0x7433,
- 0xAC2D, 0x5732, 0x4A40, 0x5735, 0x5021, 0x5031, 0xAC2E, 0x3C30,
- 0x4675, 0x5736, 0, 0x355D, 0x4424, 0x307A, 0x5737, 0x4A26,
- 0x3930, 0xBC61, 0, 0x4350, 0xAC2F, 0x7434, 0xAC31, 0x446F,
- 0, 0xBC64, 0xBC65, 0x7435, 0xBC67, 0x4C6F, 0x3839, 0x384C,
- 0xBC68, 0x5738, 0, 0xBC69, 0xBC6A, 0x5739, 0xBC6B, 0x573F,
- 0xBC6C, 0x3C65, 0, 0, 0x7436, 0x4425, 0x7437, 0x362F,
- 0x573A, 0, 0, 0xBC6F, 0x492B, 0x7438, 0x4346, 0xBC71,
-};
static const unsigned short utf8_to_euc_E5BD[] = {
0xBC72, 0x573B, 0, 0, 0xBC73, 0xBC74, 0, 0xBC75,
0x573C, 0, 0x3630, 0, 0x573D, 0xBC76, 0x573E, 0,
@@ -6758,16 +3699,6 @@ 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_E5BD_x0213[] = {
- 0x7439, 0x573B, 0, 0, 0xBC73, 0x743A, 0, 0xAC32,
- 0x573C, 0, 0x3630, 0, 0x573D, 0xBC76, 0x573E, 0,
- 0xBC77, 0x5740, 0, 0x4576, 0x743B, 0, 0x5741, 0x5742,
- 0x743C, 0x5743, 0, 0xBC7A, 0x5734, 0x5733, 0, 0,
- 0xBC7B, 0x5744, 0x3741, 0xAC33, 0x743D, 0, 0x4927, 0x743E,
- 0, 0x3A4C, 0x4937, 0x4426, 0x494B, 0x5745, 0, 0xBD21,
- 0x3E34, 0x3146, 0xAC34, 0x5746, 0xBD23, 0xBD24, 0, 0x5747,
- 0xBD25, 0x4C72, 0xBD26, 0, 0x4860, 0x743F, 0xAC35, 0x574A,
-};
static const unsigned short utf8_to_euc_E5BE[] = {
0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254, 0, 0x574E,
0x574C, 0xBD29, 0x574B, 0x4E27, 0x3865, 0xBD2A, 0, 0xBD2B,
@@ -6778,16 +3709,6 @@ 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_E5BE_x0213[] = {
- 0x317D, 0x402C, 0x5749, 0x5748, 0x3742, 0x4254, 0, 0x574E,
- 0x574C, 0x7440, 0x574B, 0x4E27, 0x3865, 0xBD2A, 0, 0xAC36,
- 0x3D79, 0x574D, 0x454C, 0x3D3E, 0, 0, 0xBD2C, 0x4640,
- 0x5751, 0x5750, 0, 0, 0x7441, 0xBD2E, 0x574F, 0,
- 0x5752, 0x3866, 0xAC37, 0, 0xAC38, 0, 0, 0x7442,
- 0x5753, 0x497C, 0x3D5B, 0xBD31, 0xBD33, 0x5754, 0x4879, 0x7443,
- 0xBD35, 0xBD36, 0, 0x4641, 0x4427, 0x7444, 0, 0x7445,
- 0xAC39, 0x4530, 0, 0, 0x5755, 0x352B, 0, 0,
-};
static const unsigned short utf8_to_euc_E5BF[] = {
0, 0, 0, 0x3F34, 0xBD38, 0x492C, 0, 0xBD39,
0xBD3A, 0xBD3B, 0, 0xBD3C, 0x3477, 0x4726, 0, 0,
@@ -6798,16 +3719,6 @@ 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_E5BF_x0213[] = {
- 0, 0, 0, 0x3F34, 0xAC3A, 0x492C, 0, 0xAC3C,
- 0xBD3A, 0x7446, 0, 0xAC3D, 0x3477, 0x4726, 0, 0,
- 0xBD3D, 0xBD3E, 0xAC3E, 0xAC3F, 0xAC40, 0, 0x5756, 0x3B56,
- 0x4B3A, 0x4B3B, 0, 0, 0x317E, 0x575B, 0x7447, 0,
- 0x4369, 0x7448, 0xAC41, 0, 0x5758, 0, 0, 0,
- 0xBD45, 0x7449, 0xBD47, 0x3277, 0xBD48, 0xBD49, 0xAC42, 0xAC43,
- 0x582D, 0x575A, 0xBD4C, 0xAC44, 0, 0x4730, 0xBD4E, 0,
- 0x5759, 0, 0xBD4F, 0x5757, 0xAC45, 0x397A, 0, 0x575D,
-};
static const unsigned short utf8_to_euc_E680[] = {
0, 0, 0, 0, 0, 0, 0, 0xBD51,
0, 0, 0xBD52, 0, 0, 0xBD53, 0x5763, 0x5769,
@@ -6818,16 +3729,6 @@ 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_E680_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0xBD51,
- 0, 0, 0xBD52, 0, 0, 0x744A, 0x5763, 0x5769,
- 0x5761, 0, 0x455C, 0xBD54, 0x744B, 0x5766, 0x495D, 0xAC47,
- 0x744C, 0x5760, 0xBD58, 0x5765, 0x4E67, 0x3B57, 0, 0xBD59,
- 0x4255, 0x575E, 0xAC48, 0, 0xAC49, 0x355E, 0x5768, 0x402D,
- 0x3165, 0x5762, 0x3278, 0x5767, 0, 0xBD5B, 0, 0x3631,
- 0, 0x5764, 0, 0x744D, 0, 0x744E, 0, 0,
- 0, 0, 0x576A, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E681[] = {
0xBD5E, 0x576C, 0x5776, 0x5774, 0, 0, 0x5771, 0xBD5F,
0xBD60, 0xBD61, 0x5770, 0x4E78, 0xBD62, 0x5772, 0, 0,
@@ -6838,16 +3739,6 @@ 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_E681_x0213[] = {
- 0xBD5E, 0x576C, 0x5776, 0x5774, 0, 0, 0x5771, 0x744F,
- 0xBD60, 0xBD61, 0x5770, 0x4E78, 0xAC4B, 0x5772, 0, 0,
- 0x3632, 0xBD63, 0x3931, 0, 0xBD64, 0x3D7A, 0xBD65, 0xBD66,
- 0, 0x5779, 0x576B, 0, 0, 0xBD67, 0, 0x576F,
- 0x575F, 0xBD68, 0x327A, 0x5773, 0x5775, 0x4351, 0, 0xBD69,
- 0x3A28, 0x3238, 0x576D, 0x5778, 0x5777, 0x3633, 0, 0x4229,
- 0x3366, 0xBD6A, 0, 0, 0, 0x3743, 0, 0x576E,
- 0, 0, 0, 0, 0, 0, 0xBD6B, 0xAC4C,
-};
static const unsigned short utf8_to_euc_E682[] = {
0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E, 0,
0xBD6F, 0x3C3D, 0xBD70, 0x5827, 0x4470, 0x577B, 0xBD71, 0,
@@ -6858,16 +3749,6 @@ 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_E682_x0213[] = {
- 0, 0x577A, 0xBD6D, 0x577D, 0x5821, 0xF43F, 0xBD6E, 0,
- 0xBD6F, 0x3C3D, 0xAC4D, 0x5827, 0x4470, 0x577B, 0xBD71, 0,
- 0, 0xBD72, 0x5825, 0xBD73, 0x3279, 0xAC4E, 0x5823, 0x5824,
- 0xBD75, 0, 0x577E, 0x5822, 0, 0x7451, 0x7452, 0x3867,
- 0x4D2A, 0, 0xBD78, 0x3435, 0xBD79, 0xBD7A, 0x3159, 0x5826,
- 0xAC4F, 0x473A, 0x302D, 0, 0, 0, 0, 0,
- 0xAC51, 0xAC52, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
- 0x5829, 0, 0, 0xBE21, 0x4569, 0x582E, 0xAC53, 0,
-};
static const unsigned short utf8_to_euc_E683[] = {
0, 0, 0xBE23, 0, 0xBE24, 0x3E70, 0x582F, 0x4657,
0xBE25, 0xBE26, 0xBE27, 0xBE28, 0, 0, 0xBE29, 0xBE2A,
@@ -6878,16 +3759,6 @@ 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_E683_x0213[] = {
- 0, 0, 0xBE23, 0, 0xBE24, 0x3E70, 0x582F, 0x4657,
- 0xAC54, 0xBE26, 0xBE27, 0x7453, 0, 0, 0xBE29, 0xBE2A,
- 0, 0x4F47, 0, 0x582B, 0x7454, 0x7455, 0, 0,
- 0x5831, 0xAC55, 0x397B, 0xAC56, 0x404B, 0x7456, 0xBE30, 0x3054,
- 0x582A, 0x5828, 0xBE31, 0x415A, 0, 0xBE32, 0, 0x577C,
- 0x3B34, 0, 0, 0, 0, 0, 0xAC57, 0,
- 0x4246, 0x583D, 0xAC58, 0x415B, 0x5838, 0xAC59, 0x5835, 0x5836,
- 0x7457, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37, 0, 0,
-};
static const unsigned short utf8_to_euc_E684[] = {
0x5837, 0x3D25, 0xBE38, 0x583A, 0, 0, 0x5834, 0xBE39,
0x4C7C, 0x4C7B, 0xBE3A, 0, 0xBE3B, 0x583E, 0x583F, 0x3055,
@@ -6898,16 +3769,6 @@ 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_E684_x0213[] = {
- 0x5837, 0x3D25, 0xBE38, 0x583A, 0, 0, 0x5834, 0xBE39,
- 0x4C7C, 0x4C7B, 0xBE3A, 0, 0xBE3B, 0x583E, 0x583F, 0x3055,
- 0xAC5A, 0xBE3D, 0xAC5B, 0xAC5C, 0xBE40, 0x5833, 0xBE41, 0xBE42,
- 0, 0xAC5D, 0x3672, 0x3026, 0x7458, 0, 0xAC5E, 0x3436,
- 0xF440, 0x583B, 0xBE46, 0, 0, 0, 0, 0x5843,
- 0x5842, 0, 0xBE47, 0x7459, 0x5847, 0, 0, 0,
- 0x745A, 0xBE4A, 0, 0, 0x5848, 0xBE4B, 0xBE4C, 0x745B,
- 0, 0xBE4E, 0xAC5F, 0, 0x5846, 0x5849, 0x5841, 0x5845,
-};
static const unsigned short utf8_to_euc_E685[] = {
0, 0xBE4F, 0x584A, 0, 0x584B, 0xBE50, 0xBE51, 0x5840,
0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35, 0,
@@ -6918,16 +3779,6 @@ 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_E685_x0213[] = {
- 0, 0xAC61, 0x584A, 0, 0x584B, 0xBE50, 0xAC62, 0x5840,
- 0x3B7C, 0xBE52, 0x5844, 0x4256, 0x3932, 0x5832, 0x3F35, 0,
- 0, 0, 0, 0x5858, 0, 0x4A69, 0, 0,
- 0x584E, 0x584F, 0x5850, 0, 0, 0x5857, 0xBE53, 0x5856,
- 0xAC63, 0, 0x4B7D, 0x3437, 0, 0x5854, 0, 0x3745,
- 0x3334, 0, 0, 0x5851, 0xBE55, 0, 0x4E38, 0x5853,
- 0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
- 0xBE57, 0, 0, 0xBE58, 0xAC64, 0, 0x4D5D, 0xBE5A,
-};
static const unsigned short utf8_to_euc_E686[] = {
0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E, 0, 0, 0x585C,
0, 0, 0x5860, 0xBE5F, 0, 0xBE60, 0x417E, 0,
@@ -6938,16 +3789,6 @@ 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_E686_x0213[] = {
- 0xBE5B, 0xBE5C, 0x4D2B, 0xBE5D, 0xBE5E, 0, 0, 0x585C,
- 0, 0, 0x5860, 0xBE5F, 0, 0x745D, 0x417E, 0,
- 0x4E79, 0x5861, 0xAC66, 0xAC67, 0x585E, 0, 0x585B, 0xAC68,
- 0xAC69, 0x585A, 0x585F, 0, 0xBE65, 0xBE66, 0, 0xBE67,
- 0xBE68, 0, 0, 0, 0x4A30, 0xAC6A, 0, 0x4634,
- 0xAC6B, 0x3746, 0xBE6B, 0x5862, 0x585D, 0xAC6C, 0x5863, 0,
- 0, 0, 0x377B, 0, 0, 0, 0x3231, 0,
- 0xBE6D, 0x7460, 0x586B, 0, 0x745F, 0, 0x3438, 0,
-};
static const unsigned short utf8_to_euc_E687[] = {
0xBE70, 0xBE71, 0xBE72, 0x5869, 0, 0, 0x586A, 0x3A29,
0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
@@ -6958,16 +3799,6 @@ 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_E687_x0213[] = {
- 0xBE70, 0xBE71, 0xBE72, 0x5869, 0, 0, 0x586A, 0x3A29,
- 0x5868, 0x5866, 0x5865, 0x586C, 0x5864, 0x586E, 0xBE73, 0xBE74,
- 0x327B, 0, 0, 0, 0, 0xAC6E, 0, 0,
- 0, 0, 0, 0, 0xBE76, 0xAC6F, 0xBE78, 0xAC70,
- 0, 0xBE7A, 0xBE7B, 0x5870, 0, 0xBE7E, 0x586F, 0xBE7C,
- 0, 0xBE7D, 0, 0, 0xBF21, 0xBF22, 0, 0xBF23,
- 0, 0, 0x4428, 0, 0x5873, 0xAC71, 0x5871, 0x5867,
- 0x377C, 0, 0x5872, 0, 0x5876, 0x5875, 0x5877, 0x5874,
-};
static const unsigned short utf8_to_euc_E688[] = {
0x5878, 0xBF24, 0, 0xBF25, 0xBF26, 0, 0, 0xBF27,
0x5879, 0x587A, 0x4A6A, 0, 0x587C, 0x587B, 0x3D3F, 0,
@@ -6978,16 +3809,6 @@ 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_E688_x0213[] = {
- 0x5878, 0xBF24, 0, 0xBF25, 0xBF26, 0, 0, 0xBF27,
- 0x5879, 0x587A, 0x4A6A, 0, 0x587C, 0x587B, 0x3D3F, 0,
- 0x402E, 0x3266, 0x327C, 0xBF28, 0x587D, 0xAC73, 0x303F, 0,
- 0, 0, 0x404C, 0x587E, 0xBF2A, 0x6C43, 0x5921, 0x3761,
- 0xBF2B, 0x5922, 0x7462, 0xAC74, 0, 0, 0x406F, 0xBF2E,
- 0, 0xAC75, 0x5923, 0xBF30, 0, 0, 0x5924, 0x353A,
- 0x5925, 0, 0x5926, 0x5927, 0x4257, 0, 0, 0,
- 0x384D, 0xBF31, 0, 0x4C61, 0, 0xBF32, 0x7463, 0x4B3C,
-};
static const unsigned short utf8_to_euc_E689[] = {
0x3D6A, 0x5928, 0xBF33, 0xBF34, 0xBF35, 0, 0xBF36, 0x4070,
0x6E3D, 0x4862, 0, 0x3C6A, 0xBF37, 0x3A4D, 0x5929, 0,
@@ -6998,16 +3819,6 @@ 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_E689_x0213[] = {
- 0x3D6A, 0x5928, 0xBF33, 0x7464, 0xBF35, 0, 0xAC76, 0x4070,
- 0x6E3D, 0x4862, 0, 0x3C6A, 0xAC77, 0x3A4D, 0x5929, 0,
- 0xBF38, 0xAC78, 0xAC79, 0x4247, 0xBF3B, 0x4A27, 0x7465, 0,
- 0x4271, 0, 0x7466, 0x592C, 0xBF3E, 0, 0x592A, 0,
- 0x592D, 0xAC7A, 0, 0x592B, 0xAC7B, 0, 0, 0,
- 0x592E, 0, 0, 0, 0, 0xAC7D, 0x4A31, 0x7467,
- 0, 0x3037, 0, 0xAC7E, 0, 0, 0x495E, 0,
- 0, 0x4863, 0xBF43, 0xAC7C, 0x592F, 0xBF44, 0x5932, 0x3E35,
-};
static const unsigned short utf8_to_euc_E68A[] = {
0x353B, 0, 0x5930, 0x5937, 0x3E36, 0, 0, 0,
0, 0x5931, 0x4744, 0, 0, 0xBF45, 0xBF46, 0xBF47,
@@ -7018,16 +3829,6 @@ 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_E68A_x0213[] = {
- 0x353B, 0, 0x5930, 0x5937, 0x3E36, 0x7468, 0, 0,
- 0, 0x5931, 0x4744, 0, 0, 0xBF45, 0xBF46, 0xBF47,
- 0xBF48, 0x4D5E, 0x5933, 0x5934, 0x5938, 0x456A, 0x5935, 0x3933,
- 0x405E, 0xAD21, 0, 0x5946, 0x4834, 0, 0x4272, 0,
- 0, 0, 0, 0, 0, 0, 0xAD22, 0,
- 0xBF4A, 0, 0, 0x4864, 0x5A2D, 0, 0, 0,
- 0, 0x4A7A, 0, 0xBF4B, 0, 0x4471, 0xBF4C, 0xBF4D,
- 0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
-};
static const unsigned short utf8_to_euc_E68B[] = {
0, 0, 0x5944, 0, 0xBF51, 0x4334, 0x593E, 0x5945,
0x5940, 0x5947, 0x5943, 0, 0x5942, 0x476F, 0xBF52, 0x593C,
@@ -7038,16 +3839,6 @@ 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_E68B_x0213[] = {
- 0, 0, 0x5944, 0, 0x7469, 0x4334, 0x593E, 0x5945,
- 0x5940, 0x5947, 0x5943, 0, 0x5942, 0x476F, 0xBF52, 0x593C,
- 0x327D, 0x593A, 0x3571, 0x4273, 0x5936, 0xAD23, 0x746A, 0x5939,
- 0x3934, 0x405B, 0xBF55, 0x3E37, 0x5941, 0x4752, 0, 0,
- 0x3572, 0x3348, 0, 0, 0, 0, 0, 0,
- 0, 0, 0xBF56, 0, 0x3367, 0x3F21, 0x5949, 0x594E,
- 0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
- 0, 0, 0, 0, 0x746B, 0xAD25, 0x3D26, 0x593D,
-};
static const unsigned short utf8_to_euc_E68C[] = {
0, 0x3B7D, 0x594C, 0xBF5B, 0xBF5C, 0, 0, 0x3B58,
0x594D, 0x3044, 0xBF5D, 0xBF5E, 0x5948, 0xBF5F, 0, 0,
@@ -7058,16 +3849,6 @@ 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_E68C_x0213[] = {
- 0, 0x3B7D, 0x594C, 0xAD26, 0xBF5C, 0, 0, 0x3B58,
- 0x594D, 0x3044, 0x746C, 0xBF5E, 0x5948, 0xAD27, 0, 0,
- 0xAD28, 0x4429, 0, 0xBF61, 0, 0, 0xBF62, 0,
- 0x746D, 0x3573, 0, 0, 0, 0, 0, 0x3634,
- 0, 0, 0, 0, 0, 0, 0, 0x594B,
- 0x3027, 0xBF64, 0xBF65, 0x3A43, 0, 0xBF66, 0, 0x3F36,
- 0, 0, 0xAD2B, 0, 0, 0xAD2C, 0xBF68, 0,
- 0, 0x746E, 0x4472, 0xAD2D, 0xAD2E, 0x4854, 0x5951, 0x415E,
-};
static const unsigned short utf8_to_euc_E68D[] = {
0, 0xBF6B, 0xBF6C, 0xBF6D, 0xBF6E, 0, 0xBF6F, 0,
0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xBF72, 0x5954,
@@ -7078,16 +3859,6 @@ 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_E68D_x0213[] = {
- 0, 0xAD2F, 0xBF6C, 0x746F, 0xAD30, 0, 0xBF6F, 0,
- 0, 0x422A, 0xBF70, 0xBF71, 0x3B2B, 0x5952, 0xAD31, 0x5954,
- 0x5950, 0, 0xBF73, 0xBF74, 0xBF75, 0x4A61, 0, 0x443D,
- 0xBF76, 0xAD33, 0, 0xBF77, 0x415C, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x7470, 0xBF79, 0x4A7B,
- 0x3C4E, 0x5960, 0, 0x595F, 0xAD36, 0xBF7B, 0x3F78, 0,
- 0, 0xBF7C, 0x377E, 0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
- 0xC021, 0, 0x4668, 0x4731, 0x7471, 0xC023, 0, 0xC024,
-};
static const unsigned short utf8_to_euc_E68E[] = {
0x5957, 0, 0xC025, 0x415D, 0xC026, 0, 0, 0xC027,
0x3C78, 0x595C, 0xC028, 0, 0x3E38, 0, 0x5956, 0x595B,
@@ -7098,16 +3869,6 @@ 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_E68E_x0213[] = {
- 0x5957, 0, 0xC025, 0x415D, 0xAD37, 0, 0, 0xC027,
- 0x3C78, 0x595C, 0xC028, 0, 0x3E38, 0, 0x5956, 0x595B,
- 0xC029, 0, 0x4753, 0, 0xAD3A, 0xC02B, 0x5955, 0,
- 0x3721, 0xAD38, 0xC02D, 0x335D, 0, 0, 0xC02E, 0x595D,
- 0x4E2B, 0x3A4E, 0x4335, 0x595A, 0xC02F, 0x405C, 0xC030, 0x3935,
- 0x3F64, 0x3166, 0x413C, 0x5958, 0x3545, 0xC031, 0xC032, 0xC033,
- 0, 0, 0x3747, 0, 0x444F, 0x595E, 0, 0,
- 0, 0, 0, 0x415F, 0, 0xAD3B, 0x5961, 0,
-};
static const unsigned short utf8_to_euc_E68F[] = {
0x5963, 0xC035, 0, 0x4237, 0x5969, 0xC036, 0x5964, 0,
0xC037, 0x5966, 0, 0, 0, 0, 0xC038, 0x4941,
@@ -7118,16 +3879,6 @@ 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_E68F_x0213[] = {
- 0x5963, 0xC035, 0, 0x4237, 0x5969, 0xC036, 0x5964, 0,
- 0xC037, 0x5966, 0, 0, 0, 0, 0xC038, 0x4941,
- 0x4473, 0xC039, 0x5967, 0xC03A, 0xAD3D, 0xAD3E, 0x4D2C, 0,
- 0, 0, 0x4D48, 0x3439, 0xAD3F, 0, 0, 0,
- 0xAD40, 0x302E, 0, 0x5965, 0, 0x7472, 0, 0,
- 0, 0x5962, 0xC040, 0xAD41, 0xAD42, 0x7473, 0x3478, 0,
- 0, 0, 0xAD43, 0xC043, 0x3167, 0x7474, 0x5968, 0xAD3C,
- 0xC045, 0xC046, 0x4D49, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E690[] = {
0, 0, 0, 0, 0, 0, 0x596C, 0,
0, 0xC047, 0xC048, 0, 0, 0x423B, 0, 0x5973,
@@ -7138,16 +3889,6 @@ 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_E690_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0x596C, 0,
- 0, 0xAD44, 0xC048, 0, 0, 0x423B, 0, 0x5973,
- 0x7475, 0, 0xC04A, 0x596D, 0x7476, 0, 0x596A, 0x5971,
- 0xC04C, 0, 0, 0, 0x5953, 0, 0xAD45, 0,
- 0xC04E, 0, 0x7477, 0, 0xC050, 0xAD46, 0x596E, 0,
- 0x5972, 0xAD47, 0xC053, 0, 0x4842, 0x456B, 0, 0xAD48,
- 0xC055, 0, 0, 0, 0x596B, 0xC056, 0x596F, 0,
- 0, 0, 0x3748, 0, 0, 0xC057, 0x3A71, 0xC058,
-};
static const unsigned short utf8_to_euc_E691[] = {
0, 0, 0x405D, 0, 0, 0, 0, 0,
0, 0, 0, 0xC059, 0, 0, 0x5977, 0xC05A,
@@ -7158,16 +3899,6 @@ 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_E691_x0213[] = {
- 0, 0, 0x405D, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xC059, 0, 0, 0x5977, 0xC05A,
- 0, 0x7479, 0xC05C, 0xC05D, 0xC05E, 0, 0, 0,
- 0x4526, 0, 0xAD49, 0xAD4A, 0xC061, 0xAD4B, 0, 0xC063,
- 0x747A, 0xC065, 0, 0xC066, 0, 0, 0, 0x5974,
- 0, 0x4B60, 0, 0, 0, 0x747B, 0, 0x5975,
- 0, 0, 0, 0xAD4C, 0xC069, 0, 0x5976, 0,
- 0x4C4E, 0x7478, 0x4022, 0xC06A, 0, 0xAD4D, 0, 0,
-};
static const unsigned short utf8_to_euc_E692[] = {
0, 0, 0, 0x3762, 0, 0xC06C, 0, 0xC06D,
0x597D, 0, 0, 0, 0, 0, 0, 0xC06E,
@@ -7178,16 +3909,6 @@ 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_E692_x0213[] = {
- 0, 0, 0, 0x3762, 0, 0xC06C, 0, 0xAD4E,
- 0x597D, 0, 0, 0, 0, 0, 0, 0xC06E,
- 0xC06F, 0xAD4F, 0x3B35, 0x597A, 0, 0x5979, 0, 0,
- 0xC071, 0xC072, 0x4732, 0xC073, 0, 0xAD50, 0x4635, 0xAD51,
- 0, 0xC076, 0, 0xC077, 0x4531, 0x597B, 0xC078, 0,
- 0xC079, 0x597C, 0, 0x496F, 0xC07A, 0x4745, 0x3B23, 0,
- 0x4071, 0, 0x4B50, 0xC07B, 0, 0, 0, 0,
- 0, 0x3349, 0, 0x5A25, 0x597E, 0xC07C, 0x747D, 0x747E,
-};
static const unsigned short utf8_to_euc_E693[] = {
0, 0x4D4A, 0x5A27, 0, 0xC121, 0x5A23, 0, 0x5A24,
0, 0xC122, 0xC123, 0xC124, 0xC125, 0x4160, 0xC126, 0,
@@ -7198,16 +3919,6 @@ 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_E693_x0213[] = {
- 0, 0x4D4A, 0x5A27, 0, 0x7521, 0x5A23, 0, 0x5A24,
- 0, 0xC122, 0x7522, 0xAD52, 0xAD53, 0x4160, 0x747C, 0,
- 0x7523, 0xC128, 0x5A22, 0, 0x593F, 0xAD54, 0, 0xAD55,
- 0x5A26, 0, 0x5A21, 0, 0, 0, 0, 0,
- 0x5A2B, 0x5A2C, 0x4527, 0x5A2E, 0xAD57, 0xAD58, 0x3B24, 0x5A29,
- 0, 0xC12D, 0xC12E, 0, 0x353C, 0xC12F, 0, 0x5A2F,
- 0xC130, 0x5A28, 0x5A33, 0, 0x5A32, 0xC131, 0x5A31, 0x7524,
- 0, 0, 0x5A34, 0x7525, 0, 0x5A36, 0x3E71, 0xAD59,
-};
static const unsigned short utf8_to_euc_E694[] = {
0x5A35, 0xC135, 0, 0, 0xC136, 0x5A39, 0, 0,
0xC137, 0xC138, 0xC139, 0, 0, 0, 0, 0xC13A,
@@ -7218,16 +3929,6 @@ 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_E694_x0213[] = {
- 0x5A35, 0xC135, 0, 0, 0xAD5A, 0x5A39, 0, 0,
- 0xC137, 0xC138, 0xC139, 0, 0, 0, 0, 0xAD5C,
- 0, 0, 0, 0xC13B, 0xAD5D, 0, 0xAD5E, 0,
- 0x5A37, 0xC13E, 0, 0xC13F, 0x5A38, 0x5970, 0xAD60, 0xC141,
- 0, 0, 0x7526, 0x5A3B, 0x5A3A, 0, 0xC143, 0,
- 0, 0x7527, 0x5978, 0x5A3C, 0x5A30, 0, 0xC145, 0x3B59,
- 0, 0xC146, 0xAD61, 0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
- 0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
-};
static const unsigned short utf8_to_euc_E695[] = {
0, 0, 0, 0xC14A, 0, 0x384E, 0, 0xC14B,
0x5A43, 0xC14C, 0, 0, 0, 0x5A46, 0xF441, 0x4952,
@@ -7238,16 +3939,6 @@ 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_E695_x0213[] = {
- 0, 0, 0, 0xC14A, 0xAD62, 0x384E, 0, 0xC14B,
- 0x5A43, 0xC14C, 0, 0, 0, 0x5A46, 0xF441, 0x4952,
- 0xC14D, 0x355F, 0xC14E, 0, 0xAD63, 0x5A45, 0x5A44, 0x4754,
- 0x5A47, 0x3635, 0, 0, 0, 0x5A49, 0x5A48, 0xC150,
- 0xC151, 0, 0x343A, 0x3B36, 0, 0, 0x4658, 0x7529,
- 0, 0, 0, 0xAD64, 0x3749, 0, 0, 0,
- 0x3F74, 0, 0x5A4A, 0, 0x4030, 0x4528, 0, 0x495F,
- 0x5A4B, 0, 0xAD65, 0, 0, 0xC155, 0, 0,
-};
static const unsigned short utf8_to_euc_E696[] = {
0, 0xC156, 0x5A4C, 0x5A4D, 0, 0xC157, 0, 0x4A38,
0x555D, 0x4046, 0xC158, 0, 0x494C, 0, 0x3A58, 0,
@@ -7258,16 +3949,6 @@ 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_E696_x0213[] = {
- 0, 0xAD66, 0x5A4C, 0x5A4D, 0xAD67, 0xAD68, 0, 0x4A38,
- 0x555D, 0x4046, 0xAD69, 0, 0x494C, 0, 0x3A58, 0,
- 0x4865, 0x4843, 0xC159, 0, 0, 0xC15A, 0, 0x454D,
- 0xC15B, 0x4E41, 0, 0x5A4F, 0x3C50, 0x752A, 0, 0x5A50,
- 0xC15D, 0x3036, 0, 0xC15E, 0x3654, 0x404D, 0xC15F, 0x4960,
- 0, 0, 0, 0x5A51, 0x3B42, 0x4347, 0xC160, 0x3B5B,
- 0x3F37, 0, 0xAD6A, 0xC162, 0xC163, 0xAD6B, 0, 0x5A52,
- 0xAD6C, 0x4A7D, 0, 0, 0x3177, 0x3B5C, 0, 0xAD6D,
-};
static const unsigned short utf8_to_euc_E697[] = {
0, 0x5A55, 0xC165, 0x5A53, 0x5A56, 0x4E39, 0x5A54, 0,
0xC166, 0xC167, 0, 0x407B, 0x5A57, 0, 0xC168, 0x4232,
@@ -7278,16 +3959,6 @@ 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_E697_x0213[] = {
- 0, 0x5A55, 0xAD6E, 0x5A53, 0x5A56, 0x4E39, 0x5A54, 0,
- 0xC166, 0xAD6F, 0, 0x407B, 0x5A57, 0, 0xC168, 0x4232,
- 0xC169, 0, 0x5A58, 0, 0xAD70, 0, 0xC16B, 0x347A,
- 0xC16C, 0x5A5A, 0, 0x5A59, 0, 0, 0, 0xC16D,
- 0x5A5B, 0x5A5C, 0x347B, 0, 0, 0x467C, 0x4336, 0x356C,
- 0x3B5D, 0x4161, 0, 0, 0x3D5C, 0x3030, 0, 0,
- 0xC16E, 0x5A5D, 0xAD72, 0, 0xC170, 0xC171, 0, 0,
- 0, 0xAD73, 0x3222, 0x5A61, 0xAD74, 0, 0xC173, 0xC174,
-};
static const unsigned short utf8_to_euc_E698[] = {
0xC175, 0, 0x3937, 0x5A60, 0xC176, 0, 0x3A2B, 0x3E3A,
0xC177, 0xC178, 0x5A5F, 0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
@@ -7298,16 +3969,6 @@ 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_E698_x0213[] = {
- 0x752C, 0, 0x3937, 0x5A60, 0xAD75, 0, 0x3A2B, 0x3E3A,
- 0xAD76, 0x752D, 0x5A5F, 0, 0x3E3B, 0xC179, 0x4C40, 0x3A2A,
- 0, 0xC17A, 0xC17B, 0x3057, 0x404E, 0x752E, 0xC17D, 0,
- 0, 0, 0, 0, 0x5A66, 0xC17E, 0x752F, 0x4031,
- 0x3147, 0xAD77, 0x7531, 0xC224, 0x7532, 0x3D55, 0xC226, 0x4B66,
- 0x3A72, 0xC227, 0xAD78, 0x7533, 0xC22A, 0x3E3C, 0xC22B, 0x4027,
- 0x7534, 0x7535, 0, 0x7536, 0x5A65, 0x5A63, 0x5A64, 0xC230,
- 0, 0xC22F, 0x7530, 0xF442, 0x436B, 0, 0, 0x5B26,
-};
static const unsigned short utf8_to_euc_E699[] = {
0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xC232, 0xC233, 0,
0, 0x5A69, 0xC234, 0x3F38, 0xC235, 0, 0xC237, 0x5A67,
@@ -7318,16 +3979,6 @@ 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_E699_x0213[] = {
- 0xC231, 0x5A6A, 0x3B7E, 0x3938, 0x5A68, 0xAD79, 0xC233, 0,
- 0x7538, 0x5A69, 0xC234, 0x3F38, 0x7539, 0, 0xAD7B, 0x5A67,
- 0, 0xAD7A, 0x3B2F, 0, 0, 0, 0, 0xAD7E,
- 0xC239, 0x753B, 0x753C, 0xAE21, 0xC23C, 0x5A6C, 0x5A6B, 0x5A70,
- 0xC23D, 0x753D, 0x5A71, 0xAE22, 0x5A6D, 0x753E, 0x3322, 0x5A6E,
- 0x5A6F, 0x4855, 0xAE25, 0xAE26, 0xAE27, 0xAE28, 0x4961, 0x374A,
- 0x5A72, 0, 0, 0x753F, 0x4032, 0xC245, 0x3E3D, 0x7540,
- 0x7541, 0xC249, 0x4352, 0xAE29, 0xC24C, 0, 0xC243, 0xC246,
-};
static const unsigned short utf8_to_euc_E69A[] = {
0xC24B, 0x3647, 0, 0x5A73, 0x5A77, 0, 0, 0x324B,
0x5A74, 0x5A76, 0, 0xC24D, 0xC24E, 0xC24F, 0x5A75, 0,
@@ -7338,16 +3989,6 @@ 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_E69A_x0213[] = {
- 0xAE2A, 0x3647, 0, 0x5A73, 0x5A77, 0, 0, 0x324B,
- 0x5A74, 0x5A76, 0, 0xC24D, 0xC24E, 0x7542, 0x5A75, 0,
- 0xAE2B, 0x3D6B, 0xAE2C, 0, 0, 0, 0x4348, 0x3045,
- 0x5A78, 0xAE2D, 0xC253, 0xC254, 0xC255, 0x5A79, 0, 0xC256,
- 0x7544, 0, 0x442A, 0, 0xC258, 0, 0x4E71, 0,
- 0, 0, 0, 0x3B43, 0, 0xAE2F, 0x4A6B, 0,
- 0, 0xAE30, 0x7545, 0, 0x4B3D, 0xAE31, 0, 0,
- 0x5B22, 0x5A7B, 0, 0x7546, 0x5A7E, 0, 0x5A7D, 0xAE33,
-};
static const unsigned short utf8_to_euc_E69B[] = {
0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21, 0, 0, 0x465E,
0xC262, 0x5A7C, 0, 0, 0xC263, 0, 0xC264, 0xC265,
@@ -7358,16 +3999,6 @@ 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_E69B_x0213[] = {
- 0xC25F, 0x5A7A, 0xC260, 0xC261, 0x5B21, 0, 0x7547, 0x465E,
- 0x7548, 0x5A7C, 0, 0, 0xC263, 0, 0xC264, 0xC265,
- 0, 0, 0, 0, 0xC266, 0, 0x5B23, 0,
- 0, 0x3D6C, 0x5B24, 0x754A, 0x4D4B, 0x4778, 0, 0xC268,
- 0x5B25, 0, 0, 0, 0, 0, 0x5B27, 0,
- 0x754B, 0x5B28, 0, 0xC26A, 0xAE35, 0, 0xC26C, 0,
- 0x5B29, 0, 0x364A, 0x3148, 0x3939, 0x5B2A, 0, 0x5B2B,
- 0x3D71, 0x4162, 0x754C, 0x7537, 0x5258, 0x413E, 0x413D, 0x4258,
-};
static const unsigned short utf8_to_euc_E69C[] = {
0x3A47, 0, 0, 0x5072, 0, 0xC26E, 0, 0xC26F,
0x376E, 0x4D2D, 0, 0x4A7E, 0, 0x497E, 0xC270, 0x5B2C,
@@ -7378,16 +4009,6 @@ 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_E69C_x0213[] = {
- 0x3A47, 0xAE37, 0, 0x5072, 0, 0xAE38, 0, 0xC26F,
- 0x376E, 0x4D2D, 0, 0x4A7E, 0, 0x497E, 0xC270, 0x5B2C,
- 0, 0, 0xAE39, 0x754D, 0x3A73, 0x443F, 0x5B2D, 0x4F2F,
- 0, 0xAE3B, 0, 0x4B3E, 0xC273, 0x442B, 0x5B2E, 0x347C,
- 0xC274, 0, 0xC275, 0, 0, 0, 0x5B2F, 0x5B30,
- 0x4C5A, 0, 0x4C24, 0x4B76, 0x4B5C, 0x3B25, 0x5B32, 0,
- 0, 0x3C6B, 0, 0x754F, 0x4B51, 0, 0x5B34, 0x5B37,
- 0x5B36, 0, 0x3479, 0, 0, 0x3560, 0xC277, 0x5B33,
-};
static const unsigned short utf8_to_euc_E69D[] = {
0, 0x5B35, 0, 0, 0, 0xC278, 0x5B38, 0xC279,
0xC27A, 0x3F79, 0, 0, 0xC27B, 0, 0x4D7B, 0x3049,
@@ -7398,16 +4019,6 @@ 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_E69D_x0213[] = {
- 0, 0x5B35, 0, 0, 0, 0xC278, 0x5B38, 0x7551,
- 0x7552, 0x3F79, 0, 0, 0xAE3E, 0xAE3F, 0x4D7B, 0x3049,
- 0x3A60, 0x423C, 0, 0x3C5D, 0xAE40, 0xC27D, 0x3E73, 0,
- 0, 0x5B3B, 0, 0, 0x454E, 0xAE41, 0x5B39, 0x422B,
- 0x5B3A, 0x3E72, 0x4C5D, 0x5B3C, 0x5B3D, 0x4D68, 0x7550, 0,
- 0, 0, 0x5B42, 0, 0xC322, 0x393A, 0xC323, 0x4755,
- 0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xAE45, 0x354F, 0xAE46, 0x4747,
- 0, 0, 0, 0x7553, 0x5B41, 0, 0x3E3E, 0x4844,
-};
static const unsigned short utf8_to_euc_E69E[] = {
0, 0xC327, 0, 0, 0xC328, 0x5B47, 0, 0x487A,
0, 0x5B3E, 0, 0x5B44, 0x5B43, 0, 0xC329, 0xC32A,
@@ -7418,16 +4029,6 @@ 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_E69E_x0213[] = {
- 0, 0x7554, 0, 0, 0xC328, 0x5B47, 0, 0x487A,
- 0, 0x5B3E, 0, 0x5B44, 0x5B43, 0, 0xC329, 0xC32A,
- 0x404F, 0xC32B, 0xAE48, 0x7555, 0, 0x4B6D, 0xC32D, 0x4E53,
- 0x7556, 0xC32F, 0x4B67, 0x7557, 0x324C, 0x3B5E, 0, 0,
- 0x4F48, 0x5B46, 0x3F75, 0, 0, 0, 0x5B45, 0,
- 0, 0x5B40, 0, 0, 0, 0, 0, 0x384F,
- 0xAE4C, 0xC332, 0xAE4D, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
- 0x5B4E, 0x5B54, 0, 0x7558, 0xC336, 0xC337, 0, 0,
-};
static const unsigned short utf8_to_euc_E69F[] = {
0xC339, 0x4248, 0xC33A, 0xC33B, 0x4A41, 0xC33C, 0x5B56, 0,
0xC33D, 0xC33E, 0x4922, 0, 0, 0, 0x5B55, 0x4770,
@@ -7438,16 +4039,6 @@ 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_E69F_x0213[] = {
- 0x755A, 0x4248, 0xC33A, 0xAE4E, 0x4A41, 0xC33C, 0x5B56, 0,
- 0xAE4F, 0xC33E, 0x4922, 0, 0, 0, 0x5B55, 0x4770,
- 0x4B3F, 0x343B, 0xAE50, 0x4077, 0x3D40, 0, 0, 0x755B,
- 0x4453, 0xAE51, 0x4D2E, 0xAE52, 0xC342, 0x5B51, 0x5B50, 0,
- 0, 0xC343, 0x5B52, 0, 0x5B4F, 0, 0xC344, 0x5B57,
- 0, 0x5B4D, 0, 0, 0x5B4B, 0, 0x5B53, 0x5B49,
- 0xAE53, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xAE54,
- 0, 0x7559, 0, 0x3A3A, 0x755C, 0, 0x4B6F, 0x3341,
-};
static const unsigned short utf8_to_euc_E6A0[] = {
0, 0xF446, 0x444E, 0x464A, 0x3149, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7458,16 +4049,6 @@ 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_E6A0_x0213[] = {
- 0, 0x755D, 0x444E, 0x464A, 0x3149, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xAE4B, 0, 0, 0x4072, 0xC34A, 0, 0x4034, 0x372A,
- 0xAE58, 0xC34B, 0, 0, 0, 0x755F, 0x5B59, 0xAE59,
- 0, 0x393B, 0x337C, 0, 0, 0, 0, 0xC34F,
- 0xC34E, 0x5B5B, 0x3374, 0x5B61, 0x7560, 0xAE5A, 0, 0xC352,
- 0xC353, 0x7561, 0x5B5E, 0xAE5C, 0x4073, 0, 0, 0,
- 0x334B, 0x3A2C, 0, 0xAE5D, 0x334A, 0x3A4F, 0xAE5E, 0xC357,
-};
static const unsigned short utf8_to_euc_E6A1[] = {
0x5B5C, 0x3765, 0x374B, 0x456D, 0xC358, 0xC359, 0x5B5A, 0,
0x3046, 0, 0xC35A, 0, 0xC35B, 0x5B5D, 0x5B5F, 0,
@@ -7478,16 +4059,6 @@ 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_E6A1_x0213[] = {
- 0x5B5C, 0x3765, 0x374B, 0x456D, 0xAE5F, 0xAE60, 0x5B5A, 0,
- 0x3046, 0xAE61, 0xC35A, 0, 0xAE62, 0x5B5D, 0x5B5F, 0,
- 0x364D, 0x372C, 0x755E, 0x343C, 0x354B, 0xAE63, 0, 0xAE64,
- 0xC35E, 0x5B62, 0, 0x7562, 0x3A79, 0x4B71, 0, 0x3B37,
- 0, 0, 0, 0x5B63, 0, 0, 0, 0x4930,
- 0, 0, 0, 0xAE66, 0, 0, 0xAE67, 0xC362,
- 0xC363, 0xC364, 0x7563, 0, 0x5B6F, 0x7564, 0x3233, 0x5B64,
- 0, 0xC367, 0xAE68, 0xC369, 0xAE69, 0, 0x5B75, 0x5B65,
-};
static const unsigned short utf8_to_euc_E6A2[] = {
0, 0x4E42, 0xC36B, 0x5B6C, 0xC36C, 0x475F, 0xC36D, 0,
0xC36E, 0, 0, 0, 0, 0x5B74, 0, 0x5B67,
@@ -7498,16 +4069,6 @@ 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_E6A2_x0213[] = {
- 0, 0x4E42, 0xAE6A, 0x5B6C, 0xC36C, 0x475F, 0xC36D, 0,
- 0xC36E, 0, 0, 0, 0, 0x5B74, 0, 0x5B67,
- 0xAE6B, 0, 0, 0x3034, 0x5B69, 0, 0xAE6C, 0x393C,
- 0xAE6E, 0xAE6F, 0xAE70, 0x5B6B, 0xAE71, 0x5B6A, 0, 0x5B66,
- 0x5B71, 0xC373, 0x3E3F, 0x7566, 0, 0x7567, 0x546D, 0x3868,
- 0x4D7C, 0xC376, 0xAE72, 0xAE73, 0, 0x5B68, 0xC378, 0x4474,
- 0x3323, 0x3A2D, 0x7568, 0x5B60, 0xAE74, 0x5B70, 0x3361, 0,
- 0, 0x5B6E, 0x5B72, 0xAE75, 0x456E, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E6A3[] = {
0, 0, 0, 0, 0x347E, 0xC37B, 0x5C32, 0,
0xC37C, 0x4C49, 0x5B77, 0x347D, 0xC37D, 0x5B7E, 0, 0xC37E,
@@ -7518,16 +4079,6 @@ 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_E6A3_x0213[] = {
- 0, 0, 0, 0xAE7A, 0x347E, 0xAE7B, 0x5C32, 0,
- 0x7569, 0x4C49, 0x5B77, 0x347D, 0xAE7C, 0x5B7E, 0, 0xAE7D,
- 0x756A, 0xC422, 0x4B40, 0xC423, 0x5C21, 0x5C23, 0xAE7E, 0x5C27,
- 0x5B79, 0xAF21, 0x432A, 0, 0xC426, 0xC427, 0, 0x456F,
- 0x5C2B, 0x5B7C, 0, 0x5C28, 0xAF22, 0xAF23, 0, 0x5C22,
- 0x756B, 0, 0xC42A, 0xC42B, 0xAF24, 0x756C, 0x3F39, 0x5C2C,
- 0x756D, 0x756E, 0x4033, 0, 0, 0xC430, 0xC431, 0xAF25,
- 0, 0x5C2A, 0x343D, 0xAE76, 0x756F, 0xC434, 0, 0,
-};
static const unsigned short utf8_to_euc_E6A4[] = {
0x4F50, 0x5B76, 0, 0, 0x5C26, 0x3058, 0xC435, 0,
0x5B78, 0xC436, 0xC437, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
@@ -7538,16 +4089,6 @@ 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_E6A4_x0213[] = {
- 0x4F50, 0x5B76, 0, 0xAF26, 0x5C26, 0x3058, 0xC435, 0xAF27,
- 0x5B78, 0xC436, 0x7570, 0x4C3A, 0x5B7D, 0x3F22, 0x4447, 0x5B73,
- 0xC438, 0xC439, 0x5C25, 0xC43A, 0, 0, 0xC43B, 0xC43C,
- 0, 0x3F7A, 0x5C2F, 0x3371, 0x3821, 0, 0, 0,
- 0, 0x5C31, 0x5B7A, 0x5C30, 0, 0x5C29, 0x5B7B, 0,
- 0x5C2D, 0, 0x5C2E, 0, 0, 0, 0, 0,
- 0x5C3F, 0xC43D, 0, 0xC43E, 0x464E, 0x7573, 0x5C24, 0,
- 0xC440, 0x5C3B, 0, 0xAF2B, 0, 0x5C3D, 0, 0x4458,
-};
static const unsigned short utf8_to_euc_E6A5[] = {
0, 0, 0xC442, 0, 0, 0xC443, 0, 0,
0, 0xC444, 0x4D4C, 0, 0, 0, 0xC445, 0,
@@ -7558,16 +4099,6 @@ 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_E6A5_x0213[] = {
- 0, 0, 0x7574, 0, 0, 0xC443, 0xAF2D, 0,
- 0, 0x7571, 0x4D4C, 0, 0, 0, 0xC445, 0,
- 0, 0, 0, 0x4976, 0x5C38, 0x424A, 0, 0x7575,
- 0, 0x5C3E, 0x413F, 0xC447, 0x5C35, 0x5C42, 0x5C41, 0,
- 0x466F, 0x5C40, 0x466A, 0x7576, 0x7577, 0xC44A, 0xC44B, 0,
- 0x7578, 0xAF2E, 0x5C44, 0x5C37, 0xAF2F, 0x3648, 0x5C3A, 0x3D5D,
- 0xC44F, 0xC450, 0xAF30, 0x4760, 0x5C3C, 0x364B, 0, 0x5C34,
- 0x5C36, 0x5C33, 0xAF31, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xAF32,
-};
static const unsigned short utf8_to_euc_E6A6[] = {
0xC455, 0x5C43, 0x3335, 0, 0, 0, 0, 0,
0, 0, 0x3A67, 0, 0, 0xC456, 0x315D, 0,
@@ -7578,16 +4109,6 @@ 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_E6A6_x0213[] = {
- 0x7579, 0x5C43, 0x3335, 0, 0, 0, 0, 0,
- 0, 0, 0x3A67, 0, 0, 0xC456, 0x315D, 0,
- 0, 0x5C54, 0xAF33, 0, 0x4F31, 0x5C57, 0xAF35, 0,
- 0xAF36, 0, 0, 0x3F3A, 0x5C56, 0, 0, 0,
- 0x5C55, 0xC45A, 0, 0, 0, 0x757B, 0xAF37, 0x5C52,
- 0xC45D, 0, 0, 0xC45E, 0, 0x757C, 0x5C46, 0xC460,
- 0xAF38, 0x5C63, 0x5C45, 0, 0x5C58, 0, 0, 0xAF39,
- 0xC462, 0, 0xAF3A, 0x5C50, 0xAF3B, 0, 0x5C4B, 0x5C48,
-};
static const unsigned short utf8_to_euc_E6A7[] = {
0, 0x5C49, 0, 0x5C51, 0, 0xC465, 0, 0x7422,
0xC466, 0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C, 0,
@@ -7598,16 +4119,6 @@ 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_E6A7_x0213[] = {
- 0xAF3C, 0x5C49, 0, 0x5C51, 0, 0xC465, 0, 0x7422,
- 0xC466, 0, 0x5C4E, 0x393D, 0x4448, 0x4164, 0x5C4C, 0x757D,
- 0x5C47, 0xAF3D, 0, 0x5C4A, 0, 0, 0xAF3E, 0xC469,
- 0x4D4D, 0x4B6A, 0, 0, 0, 0x5C4F, 0x5C59, 0,
- 0, 0, 0x7622, 0xAF44, 0, 0xC46B, 0, 0x5C61,
- 0x5C5A, 0x7623, 0x7624, 0x5C67, 0, 0x5C65, 0xAF45, 0xAF46,
- 0, 0xC46E, 0x5C60, 0xAF47, 0xAF49, 0x7625, 0x7626, 0,
- 0, 0x5C5F, 0, 0x4450, 0, 0x4165, 0xAF4A, 0x5C5D,
-};
static const unsigned short utf8_to_euc_E6A8[] = {
0xC472, 0xC473, 0x5C5B, 0xC474, 0, 0x5C62, 0, 0,
0, 0, 0x5C68, 0x4875, 0x5C6E, 0, 0, 0xC475,
@@ -7618,16 +4129,6 @@ 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_E6A8_x0213[] = {
- 0xC472, 0xC473, 0x5C5B, 0xC474, 0, 0x5C62, 0, 0,
- 0, 0, 0x5C68, 0x4875, 0x5C6E, 0, 0, 0x7627,
- 0, 0xAF4B, 0x5C69, 0x5C6C, 0x5C66, 0x7628, 0, 0x4374,
- 0, 0x4938, 0xAF4C, 0x5C5C, 0, 0xAF4D, 0x5C64, 0x3E40,
- 0xC47A, 0x4C4F, 0x5C78, 0x5C6B, 0xC47B, 0, 0, 0,
- 0xC47C, 0x3822, 0x3223, 0x335F, 0, 0, 0x5C53, 0,
- 0xAF41, 0, 0xAF4F, 0xAF50, 0xAF51, 0x3E41, 0x5C70, 0xC522,
- 0x5C77, 0x3C79, 0x3372, 0x762A, 0, 0x432E, 0x762B, 0xAF52,
-};
static const unsigned short utf8_to_euc_E6A9[] = {
0, 0, 0, 0, 0x5C6D, 0xC526, 0xC527, 0x5C72,
0x5C76, 0xC528, 0xC529, 0x3636, 0, 0, 0xC52A, 0,
@@ -7638,16 +4139,6 @@ 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_E6A9_x0213[] = {
- 0, 0, 0, 0, 0x5C6D, 0x762C, 0xAF53, 0x5C72,
- 0x5C76, 0xAF54, 0xC529, 0x3636, 0, 0, 0xAF56, 0,
- 0x762D, 0xC52C, 0xAF57, 0, 0, 0xC52E, 0x762E, 0,
- 0x354C, 0x5C74, 0, 0x762F, 0, 0, 0, 0x3521,
- 0, 0x464B, 0x5C73, 0, 0xAF58, 0, 0x5C75, 0xC532,
- 0, 0, 0xC533, 0x7630, 0, 0, 0, 0,
- 0, 0xC534, 0x5C6F, 0x7631, 0, 0, 0, 0,
- 0x5C71, 0, 0xAF55, 0, 0, 0, 0xAF5A, 0x3360,
-};
static const unsigned short utf8_to_euc_E6AA[] = {
0x4349, 0xC537, 0, 0xC538, 0x5C7C, 0, 0xC539, 0xC53A,
0, 0xC53B, 0, 0xC53C, 0, 0x5C7A, 0x3869, 0,
@@ -7658,16 +4149,6 @@ 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_E6AA_x0213[] = {
- 0x4349, 0xC537, 0, 0xAF5B, 0x5C7C, 0, 0xC539, 0xC53A,
- 0, 0x7633, 0, 0xAF5C, 0, 0x5C7A, 0x3869, 0,
- 0x5C79, 0xAF5E, 0, 0, 0x7634, 0, 0, 0x5D21,
- 0, 0, 0, 0xC53E, 0x5B58, 0x7635, 0x7636, 0xAF5F,
- 0x5C7B, 0xAF60, 0x5C7D, 0x5C7E, 0, 0x7637, 0, 0,
- 0, 0, 0x5D2C, 0xAF62, 0x5D28, 0, 0x5B6D, 0xC544,
- 0xC545, 0xC546, 0, 0x5D27, 0xC547, 0, 0, 0,
- 0x5D26, 0, 0, 0x5D23, 0, 0xAF63, 0xC549, 0xC54A,
-};
static const unsigned short utf8_to_euc_E6AB[] = {
0, 0x5C6A, 0x5D25, 0x5D24, 0, 0, 0xC54B, 0,
0xC54D, 0xC54C, 0, 0, 0xC54E, 0, 0, 0,
@@ -7678,16 +4159,6 @@ 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_E6AB_x0213[] = {
- 0, 0x5C6A, 0x5D25, 0x5D24, 0, 0, 0xAF64, 0,
- 0xC54D, 0xC54C, 0, 0, 0xC54E, 0, 0, 0,
- 0xAF66, 0x5D2A, 0, 0x4F26, 0xAF65, 0xC551, 0xC552, 0,
- 0, 0, 0x5D2D, 0x367B, 0xAF67, 0xAF68, 0x5D29, 0x5D2B,
- 0, 0, 0xF44A, 0, 0x7638, 0, 0, 0x7639,
- 0x4827, 0, 0x5D2E, 0, 0xAF6B, 0, 0, 0,
- 0xC558, 0xAF6C, 0xAF6D, 0xAF6E, 0, 0, 0, 0,
- 0, 0, 0x5D32, 0x5D2F, 0xC55B, 0xAF6F, 0, 0,
-};
static const unsigned short utf8_to_euc_E6AC[] = {
0, 0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
0, 0xC561, 0x5C5E, 0, 0, 0, 0, 0xC562,
@@ -7698,16 +4169,6 @@ 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_E6AC_x0213[] = {
- 0, 0, 0xC55D, 0xC55E, 0x4D73, 0x5D30, 0xC55F, 0xC560,
- 0, 0xC561, 0x5C5E, 0xAF71, 0, 0, 0, 0xAF72,
- 0xAF73, 0xAF74, 0x5D33, 0, 0, 0, 0x5D34, 0xAF76,
- 0, 0, 0, 0x763C, 0, 0x3135, 0x763D, 0x5D36,
- 0x3767, 0x3C21, 0, 0x3655, 0xC568, 0, 0, 0x3224,
- 0xC569, 0, 0, 0xC56A, 0x763E, 0, 0, 0xAF78,
- 0, 0, 0x4D5F, 0, 0, 0x763F, 0xC56E, 0x5D38,
- 0x5D37, 0x5D3A, 0x353D, 0xC56F, 0, 0x3656, 0x343E, 0xC570,
-};
static const unsigned short utf8_to_euc_E6AD[] = {
0, 0, 0, 0x5D3D, 0, 0, 0xC571, 0x5D3C,
0, 0x5D3E, 0xC572, 0, 0x324E, 0xC573, 0x4337, 0,
@@ -7718,16 +4179,6 @@ 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_E6AD_x0213[] = {
- 0, 0, 0, 0x5D3D, 0, 0, 0x7640, 0x5D3C,
- 0, 0x5D3E, 0xAF79, 0, 0x324E, 0xC573, 0x4337, 0,
- 0x5D3F, 0, 0xC574, 0x343F, 0x5D41, 0, 0x7641, 0,
- 0xAF7A, 0x5D40, 0, 0x5D42, 0, 0xC577, 0, 0x5D43,
- 0x7642, 0x5D44, 0x3B5F, 0x4035, 0x3A21, 0x7643, 0x4970, 0x7644,
- 0, 0x4A62, 0x4F44, 0xC57A, 0xAF7B, 0, 0xC57B, 0x3B75,
- 0xC57C, 0, 0, 0x3A50, 0x4E72, 0xAF7C, 0, 0x7645,
- 0x5D45, 0x5D46, 0xAF7D, 0x3B60, 0, 0xC57E, 0xC621, 0x5D47,
-};
static const unsigned short utf8_to_euc_E6AE[] = {
0x5D48, 0, 0xC622, 0x5D4A, 0x5D49, 0xC623, 0x4B58, 0,
0, 0x3D5E, 0x3C6C, 0x3B44, 0, 0x5D4B, 0, 0,
@@ -7738,16 +4189,6 @@ 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_E6AE_x0213[] = {
- 0x5D48, 0xAF7E, 0x7646, 0x5D4A, 0x5D49, 0xC623, 0x4B58, 0,
- 0, 0x3D5E, 0x3C6C, 0x3B44, 0, 0x5D4B, 0, 0,
- 0, 0, 0, 0, 0, 0x5D4D, 0x3F23, 0xC624,
- 0x5D4C, 0, 0, 0xEE21, 0, 0, 0x5D4E, 0xC626,
- 0xC627, 0, 0xC628, 0xC629, 0x5D4F, 0, 0, 0,
- 0xC62A, 0x7647, 0x5D50, 0x5D51, 0xC62C, 0x7648, 0xEE22, 0x5D52,
- 0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A, 0, 0x5D56,
- 0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xEE24, 0xEE25, 0x4542,
-};
static const unsigned short utf8_to_euc_E6AF[] = {
0x544C, 0, 0, 0xC634, 0xC635, 0x3523, 0x5D58, 0,
0, 0xC636, 0, 0x5D59, 0xC637, 0x4A6C, 0x4B68, 0,
@@ -7758,16 +4199,6 @@ 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_E6AF_x0213[] = {
- 0x544C, 0, 0, 0xC634, 0xC635, 0x3523, 0x5D58, 0xEE26,
- 0xEE27, 0xEE28, 0, 0x5D59, 0xC637, 0x4A6C, 0x4B68, 0x764A,
- 0, 0, 0x4647, 0x5D5A, 0x4866, 0, 0x764B, 0x764C,
- 0x487B, 0, 0xEE29, 0x4C53, 0, 0, 0, 0x5D5B,
- 0, 0xC63A, 0, 0xC63B, 0, 0, 0xEE2A, 0xEE2B,
- 0, 0, 0, 0x5D5D, 0x5D5C, 0, 0xEE2C, 0x5D5F,
- 0, 0xEE2D, 0, 0x5D5E, 0, 0, 0, 0xC640,
- 0, 0xC641, 0, 0, 0, 0, 0, 0x764D,
-};
static const unsigned short utf8_to_euc_E6B0[] = {
0, 0, 0xC643, 0, 0xC644, 0xC645, 0, 0,
0x5D61, 0xC646, 0, 0, 0, 0xC647, 0xC648, 0x3B61,
@@ -7778,16 +4209,6 @@ 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_E6B0_x0213[] = {
- 0, 0, 0xEE2E, 0, 0xC644, 0x764E, 0, 0,
- 0x5D61, 0xC646, 0xEE2F, 0, 0, 0xC647, 0xEE30, 0x3B61,
- 0x764F, 0x4C31, 0xC64A, 0x5D62, 0x5D63, 0, 0, 0x3524,
- 0, 0xC64B, 0, 0x5D64, 0, 0, 0, 0xC64C,
- 0, 0, 0, 0x5D66, 0x5D65, 0, 0xC64D, 0xC64E,
- 0xC64F, 0, 0, 0, 0xC650, 0, 0xC651, 0,
- 0, 0, 0, 0x7650, 0x3F65, 0xEE31, 0xEE32, 0x4939,
- 0x314A, 0, 0xEE33, 0xC656, 0, 0, 0x4845, 0xEE35,
-};
static const unsigned short utf8_to_euc_E6B1[] = {
0x4475, 0x3D41, 0x3561, 0, 0, 0, 0, 0,
0, 0, 0xC658, 0xC659, 0, 0xC65A, 0x4846, 0xC65B,
@@ -7798,16 +4219,6 @@ 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_E6B1_x0213[] = {
- 0x4475, 0x3D41, 0x3561, 0, 0, 0, 0, 0,
- 0, 0, 0xC658, 0xC659, 0, 0xEE36, 0x4846, 0xC65B,
- 0x3C2E, 0, 0xC65C, 0, 0xC65D, 0x5D68, 0, 0x3440,
- 0, 0x7651, 0x3178, 0xEE37, 0x7652, 0x4672, 0x5D67, 0x393E,
- 0x4353, 0, 0x5D69, 0, 0, 0, 0, 0xEE4F,
- 0x5D71, 0, 0x5D6A, 0xC661, 0, 0xEE38, 0, 0xC663,
- 0x4241, 0, 0x3562, 0x5D72, 0x7654, 0, 0x7655, 0,
- 0xC666, 0xC667, 0x3768, 0xC668, 0, 0x3525, 0x5D70, 0,
-};
static const unsigned short utf8_to_euc_E6B2[] = {
0, 0x5D6E, 0x5D6B, 0x4D60, 0, 0xC669, 0xC66A, 0xC66B,
0x4440, 0xC66C, 0, 0, 0x4659, 0x5D6C, 0, 0,
@@ -7818,16 +4229,6 @@ 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_E6B2_x0213[] = {
- 0, 0x5D6E, 0x5D6B, 0x4D60, 0xEE39, 0x7656, 0x7657, 0xC66B,
- 0x4440, 0xEE3A, 0, 0, 0x4659, 0x5D6C, 0, 0,
- 0x5D74, 0, 0x5D73, 0x3723, 0xEE3C, 0xEE3D, 0x322D, 0xEE3E,
- 0x7658, 0x3A3B, 0x5D6D, 0x5D6F, 0x7659, 0, 0, 0xC672,
- 0, 0x4B57, 0x4274, 0, 0, 0, 0, 0,
- 0, 0, 0x7653, 0x4B77, 0, 0xEE3F, 0x5D7C, 0,
- 0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675, 0, 0, 0,
- 0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
-};
static const unsigned short utf8_to_euc_E6B3[] = {
0, 0x3637, 0xC676, 0, 0x5D75, 0x5D7A, 0xC677, 0,
0, 0x4074, 0x4771, 0, 0x4867, 0xC678, 0, 0xC679,
@@ -7838,16 +4239,6 @@ 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_E6B3_x0213[] = {
- 0, 0x3637, 0xEE40, 0, 0x5D75, 0x5D7A, 0x765B, 0,
- 0, 0x4074, 0x4771, 0, 0x4867, 0xC678, 0, 0xC679,
- 0xEE41, 0xC67B, 0xC67C, 0x5D77, 0x765C, 0x4B21, 0xEE43, 0x5D79,
- 0, 0x5E24, 0xEE44, 0x5E22, 0xEE45, 0x5D7B, 0, 0,
- 0x765D, 0x4B22, 0x4748, 0x3563, 0, 0x4525, 0, 0xC724,
- 0x436D, 0xEE46, 0x5E25, 0x765E, 0xEE47, 0xEE48, 0x765F, 0x5E23,
- 0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A, 0, 0, 0,
- 0, 0, 0, 0x765A, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E6B4[] = {
0, 0, 0, 0, 0xC72B, 0, 0, 0xC72C,
0, 0, 0xC72D, 0x4D4E, 0x5E30, 0, 0xC72E, 0xC72F,
@@ -7858,16 +4249,6 @@ 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_E6B4_x0213[] = {
- 0xEE4A, 0, 0, 0, 0x7661, 0, 0, 0xC72C,
- 0, 0, 0xEE4B, 0x4D4E, 0x5E30, 0, 0x7662, 0xC72F,
- 0, 0xC730, 0x5E2F, 0xC731, 0, 0, 0, 0x4076,
- 0, 0x5E2C, 0xC732, 0x4D6C, 0, 0, 0x4636, 0x5E26,
- 0, 0, 0, 0, 0xEE4C, 0x4445, 0xEE4D, 0xEE4E,
- 0xC735, 0x314C, 0x393F, 0x5E29, 0, 0, 0x7663, 0xEE50,
- 0, 0x7664, 0x3D27, 0x5E2E, 0xEE65, 0x5E2D, 0x5E28, 0,
- 0x5E2B, 0x7665, 0, 0x3368, 0xEE51, 0x5E2A, 0x4749, 0x7666,
-};
static const unsigned short utf8_to_euc_E6B5[] = {
0, 0x4E2E, 0, 0, 0x3E74, 0x4075, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -7878,16 +4259,6 @@ 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_E6B5_x0213[] = {
- 0, 0x4E2E, 0, 0, 0x3E74, 0x4075, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xC73D,
- 0x7667, 0x5E36, 0x5E34, 0xEE52, 0x494D, 0, 0xEE53, 0xC73F,
- 0xEE54, 0xC740, 0, 0x5E31, 0x5E33, 0x7668, 0x313A, 0xC742,
- 0, 0x3940, 0x4F32, 0, 0x333D, 0, 0x4962, 0xC743,
- 0xEE55, 0, 0, 0, 0x4D61, 0, 0, 0x3324,
- 0x3F3B, 0x5E35, 0, 0, 0xC745, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E6B6[] = {
0, 0, 0xC746, 0, 0, 0x5E3A, 0, 0xC747,
0x3E43, 0, 0, 0, 0x4D30, 0, 0x5E37, 0,
@@ -7898,16 +4269,6 @@ 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_E6B6_x0213[] = {
- 0xEE56, 0xEE57, 0x766A, 0, 0, 0x5E3A, 0, 0x766B,
- 0x3E43, 0x766C, 0xEE58, 0, 0x4D30, 0xEE59, 0x5E37, 0,
- 0, 0xEE5A, 0xC749, 0x5E32, 0x766D, 0x5E38, 0xC74B, 0xC74C,
- 0xEE5B, 0x4E5E, 0, 0x4573, 0x4642, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x766E, 0xEE61, 0x766F, 0, 0xEE62, 0x3336,
- 0, 0, 0x3155, 0, 0xEE63, 0x5E3E, 0, 0xC751,
- 0x5E41, 0xC752, 0, 0, 0x4E43, 0xC753, 0, 0x7670,
-};
static const unsigned short utf8_to_euc_E6B7[] = {
0x4D64, 0, 0, 0, 0xC755, 0x5E48, 0x5E42, 0x5E3F,
0xC756, 0, 0xC757, 0x4E54, 0x5E45, 0, 0xC758, 0xC759,
@@ -7918,16 +4279,6 @@ 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_E6B7_x0213[] = {
- 0x4D64, 0, 0xEE64, 0, 0x7671, 0x5E48, 0x5E42, 0x5E3F,
- 0xEE66, 0, 0xC757, 0x4E54, 0x5E45, 0, 0xEE67, 0xEE68,
- 0xEE69, 0x3D4A, 0x5E47, 0, 0, 0x5E4C, 0x7672, 0,
- 0x4571, 0x5E4A, 0x7673, 0x7674, 0, 0x7675, 0x5E44, 0xEE6A,
- 0xC75E, 0x4338, 0xC75F, 0, 0x5E4B, 0xC760, 0x5E40, 0,
- 0x5E46, 0xEE6B, 0x5E4D, 0x307C, 0x5E43, 0, 0x5E4E, 0xC762,
- 0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xEE6C, 0x3A2E,
- 0xF44B, 0x5E3B, 0x5E49, 0x453A, 0x7676, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E6B8[] = {
0xC767, 0, 0, 0, 0xC768, 0x4036, 0, 0x3369,
0x3A51, 0x3E44, 0x5E3D, 0x3D42, 0, 0, 0, 0,
@@ -7938,16 +4289,6 @@ 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_E6B8_x0213[] = {
- 0xC767, 0, 0, 0, 0xC768, 0x4036, 0, 0x3369,
- 0x3A51, 0x3E44, 0x5E3D, 0x3D42, 0, 0, 0, 0,
- 0, 0, 0, 0x374C, 0, 0x5E3C, 0, 0xEE5D,
- 0, 0x5E52, 0x3D6D, 0x383A, 0, 0x5E61, 0xEE6E, 0x5E5B,
- 0x3574, 0x454F, 0xEE6F, 0x5E56, 0x5E5F, 0x302F, 0x3132, 0xEE70,
- 0, 0x3239, 0, 0x5E58, 0x422C, 0x5E4F, 0x5E51, 0x3941,
- 0, 0, 0xEE72, 0, 0x7678, 0, 0xEE6D, 0,
- 0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xEE73, 0, 0x5E55, 0,
-};
static const unsigned short utf8_to_euc_E6B9[] = {
0, 0, 0, 0x5E5C, 0xC771, 0xC772, 0, 0,
0xC773, 0xC774, 0x4C2B, 0xC775, 0, 0x5E5A, 0x5E5E, 0xC776,
@@ -7958,16 +4299,6 @@ 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_E6B9_x0213[] = {
- 0, 0, 0, 0x5E5C, 0x7679, 0xC772, 0, 0,
- 0xEE74, 0xEE75, 0x4C2B, 0xEE76, 0xEE77, 0x5E5A, 0x5E5E, 0xEE78,
- 0, 0xEE79, 0xC778, 0xEE7A, 0xEE7B, 0, 0x3850, 0xEE7C,
- 0x3E45, 0, 0, 0x4339, 0x767A, 0xC77D, 0x767B, 0x5E54,
- 0, 0, 0xC821, 0xEE7D, 0, 0, 0, 0x4D2F,
- 0xC823, 0, 0, 0x5E57, 0, 0, 0x5E50, 0x4572,
- 0, 0, 0x5E53, 0xC824, 0, 0, 0x5E59, 0,
- 0, 0, 0, 0xC825, 0, 0xC826, 0x4F51, 0x3C3E,
-};
static const unsigned short utf8_to_euc_E6BA[] = {
0x4B7E, 0, 0x5E63, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0x482E, 0xC827, 0, 0x5E6F,
@@ -7978,16 +4309,6 @@ 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_E6BA_x0213[] = {
- 0x4B7E, 0, 0x5E63, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x482E, 0xC827, 0, 0x5E6F,
- 0x383B, 0, 0, 0xEF21, 0, 0, 0x3D60, 0,
- 0x5E65, 0xC829, 0, 0, 0x4E2F, 0x3942, 0, 0x5E72,
- 0xC82A, 0, 0x306E, 0, 0, 0x5E70, 0, 0xEF22,
- 0, 0, 0x5E64, 0x767C, 0, 0xC82C, 0xC82D, 0x5E6A,
- 0, 0x767D, 0x5E6C, 0xC82F, 0xEF23, 0, 0x4D4F, 0x5E67,
- 0, 0, 0x452E, 0xC830, 0, 0x5E69, 0, 0xEF24,
-};
static const unsigned short utf8_to_euc_E6BB[] = {
0xC832, 0xC833, 0x5E71, 0xC834, 0x5E6B, 0x4C47, 0, 0xC835,
0xC836, 0x5E66, 0xC837, 0x3C22, 0x5E7E, 0xC838, 0xC839, 0xC83A,
@@ -7998,16 +4319,6 @@ 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_E6BB_x0213[] = {
- 0xC832, 0x767E, 0x5E71, 0xEF25, 0x5E6B, 0x4C47, 0, 0x7721,
- 0xC836, 0x5E66, 0xEF26, 0x3C22, 0x5E7E, 0xC838, 0x7722, 0xC83A,
- 0, 0x336A, 0, 0x5E68, 0x5E6D, 0x5E6E, 0, 0,
- 0, 0xEF27, 0, 0, 0, 0x426C, 0x425A, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0xEF29, 0x5E76, 0xC83C, 0xC83D, 0x5E7C,
- 0, 0, 0x5E7A, 0, 0x4529, 0, 0, 0x5F23,
- 0x5E77, 0xEF2A, 0, 0xEF2B, 0, 0xC840, 0x5E78, 0x5E60,
-};
static const unsigned short utf8_to_euc_E6BC[] = {
0, 0x3579, 0x493A, 0, 0xC841, 0, 0x3C3F, 0,
0xC842, 0x3977, 0xC843, 0, 0xC844, 0xC845, 0, 0x4F33,
@@ -8018,16 +4329,6 @@ 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_E6BC_x0213[] = {
- 0, 0x3579, 0x493A, 0, 0xC841, 0, 0x3C3F, 0,
- 0xC842, 0x3977, 0xEF2C, 0, 0xEF2D, 0xC845, 0, 0x4F33,
- 0x7723, 0x5E74, 0, 0x5F22, 0x3169, 0x4166, 0xC846, 0,
- 0xEF2E, 0, 0x7724, 0xC849, 0, 0, 0, 0,
- 0x4779, 0, 0x3441, 0x4E7A, 0, 0xEF2F, 0xC84A, 0,
- 0, 0xC84B, 0x7726, 0x4C21, 0x4452, 0xC853, 0, 0x7727,
- 0xC84E, 0x5E7B, 0x5E7D, 0x7728, 0, 0xEF28, 0xEF30, 0,
- 0x4132, 0, 0, 0xC851, 0xEF31, 0, 0x5F21, 0x5E79,
-};
static const unsigned short utf8_to_euc_E6BD[] = {
0, 0x5E73, 0, 0, 0, 0x3443, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xC854,
@@ -8038,16 +4339,6 @@ 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_E6BD_x0213[] = {
- 0, 0x5E73, 0, 0, 0, 0x3443, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xC854,
- 0, 0x7729, 0xEF33, 0xC857, 0x3769, 0, 0, 0xEF34,
- 0x5F2F, 0x772A, 0xEF35, 0x5F2A, 0x4078, 0xC85B, 0x772B, 0x3363,
- 0xEF36, 0x772C, 0x772D, 0, 0x3D61, 0, 0x5F33, 0,
- 0xEF37, 0, 0, 0, 0xC860, 0x5F2C, 0x442C, 0x5F29,
- 0x4459, 0, 0, 0, 0x5F4C, 0, 0, 0,
- 0x5F26, 0, 0x5F25, 0, 0x5F2E, 0xEF39, 0x772E, 0,
-};
static const unsigned short utf8_to_euc_E6BE[] = {
0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021, 0, 0x5F24, 0xC864,
0xC865, 0, 0, 0xC866, 0xC867, 0xC868, 0x5F30, 0,
@@ -8058,16 +4349,6 @@ 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_E6BE_x0213[] = {
- 0x5F28, 0x5F27, 0x5F2D, 0xC863, 0x4021, 0, 0x5F24, 0xC864,
- 0x772F, 0, 0, 0xC866, 0x7730, 0x7731, 0x5F30, 0,
- 0xEF3A, 0x5F31, 0xC86A, 0xC86B, 0x7732, 0, 0xEF3B, 0x3442,
- 0xEF38, 0, 0xC86E, 0, 0, 0, 0, 0xEF3D,
- 0x7733, 0x5F36, 0, 0x5F35, 0x5F37, 0xEF3E, 0xC872, 0x7734,
- 0xC874, 0, 0x5F3A, 0, 0, 0, 0xC875, 0xEF3F,
- 0xC877, 0x4543, 0, 0x5F34, 0, 0xEF41, 0x7735, 0,
- 0, 0x5F38, 0, 0, 0x7736, 0, 0xEF3C, 0,
-};
static const unsigned short utf8_to_euc_E6BF[] = {
0x3763, 0x4279, 0x5F32, 0x473B, 0, 0xC87B, 0x5F39, 0xC87C,
0xC87D, 0, 0xC87E, 0, 0, 0, 0, 0,
@@ -8078,16 +4359,6 @@ 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_E6BF_x0213[] = {
- 0x3763, 0x4279, 0x5F32, 0x473B, 0, 0xC87B, 0x5F39, 0x7737,
- 0xEF42, 0xEF43, 0x7738, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x5F3E, 0x5F3C, 0, 0,
- 0x5F3F, 0, 0xEF44, 0x5F42, 0, 0, 0xEF45, 0x5F3B,
- 0x396A, 0x4728, 0, 0, 0x5E39, 0, 0, 0,
- 0xC923, 0xEF46, 0, 0x4D74, 0x5F3D, 0, 0x5F41, 0x4275,
- 0x773A, 0x5F40, 0, 0x5F2B, 0, 0x773B, 0x6F69, 0,
- 0, 0x7739, 0x5F45, 0, 0xEF48, 0xC929, 0x5F49, 0,
-};
static const unsigned short utf8_to_euc_E780[] = {
0xC92A, 0x5F47, 0, 0, 0, 0xC92B, 0xC92C, 0xC92D,
0, 0x5F43, 0, 0x5F44, 0, 0xC92E, 0, 0x5F48,
@@ -8098,16 +4369,6 @@ 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_E780_x0213[] = {
- 0xEF49, 0x5F47, 0, 0, 0, 0x773C, 0x773D, 0xEF4A,
- 0, 0x5F43, 0xEF4B, 0x5F44, 0, 0xC92E, 0, 0x5F48,
- 0, 0x5F46, 0, 0, 0, 0x494E, 0, 0xC92F,
- 0x5F4E, 0, 0x5F4B, 0x5F4A, 0, 0x5F4D, 0x4654, 0x5F4F,
- 0xC930, 0, 0, 0xEF4C, 0, 0, 0x4375, 0x426D,
- 0x773E, 0, 0, 0, 0x4025, 0, 0, 0xC932,
- 0x5F50, 0, 0x5F52, 0, 0xC933, 0, 0, 0xC934,
- 0, 0xEF4E, 0xEF4F, 0, 0xEF50, 0, 0x5F51, 0,
-};
static const unsigned short utf8_to_euc_E781[] = {
0, 0, 0, 0xC937, 0xC938, 0, 0, 0,
0xC939, 0xC93A, 0xC93B, 0xC93C, 0x5E75, 0, 0xC941, 0,
@@ -8118,16 +4379,6 @@ 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_E781_x0213[] = {
- 0, 0, 0, 0xEF51, 0xC938, 0, 0, 0xEF52,
- 0xC939, 0xC93A, 0x773F, 0xEF53, 0x5E75, 0, 0x7742, 0,
- 0, 0x5F53, 0, 0, 0xEF55, 0xC93E, 0, 0,
- 0x4667, 0, 0, 0, 0, 0x7740, 0x7741, 0,
- 0, 0, 0, 0x5F54, 0x7743, 0xEF56, 0, 0,
- 0, 0xEF57, 0, 0x3250, 0xEF58, 0, 0xEF59, 0x4574,
- 0x3325, 0, 0, 0, 0, 0x7744, 0xEF5A, 0,
- 0x3564, 0, 0, 0, 0x3C5E, 0x3A52, 0xEF5B, 0,
-};
static const unsigned short utf8_to_euc_E782[] = {
0, 0xC949, 0, 0, 0, 0xC94A, 0xC94B, 0,
0, 0x4F27, 0x3F66, 0, 0, 0, 0x316A, 0,
@@ -8138,16 +4389,6 @@ 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_E782_x0213[] = {
- 0, 0xEF5C, 0, 0, 0, 0x7745, 0xEF5D, 0,
- 0, 0x4F27, 0x3F66, 0, 0, 0, 0x316A, 0,
- 0, 0, 0x5F56, 0, 0xC94C, 0xEF5E, 0xC94E, 0xEF5F,
- 0xC950, 0x5F55, 0, 0xC951, 0, 0, 0, 0xEF62,
- 0, 0, 0, 0, 0x7746, 0, 0, 0,
- 0, 0, 0, 0x7747, 0x5F59, 0x433A, 0x5F5C, 0x5F57,
- 0xC954, 0xEF63, 0, 0x5F5B, 0xC956, 0, 0, 0x7748,
- 0x5F5A, 0x4540, 0x3059, 0xEF60, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E783[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0x4E75, 0, 0xC958, 0x5F5E, 0, 0, 0, 0x3128,
@@ -8158,16 +4399,6 @@ 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_E783_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x4E75, 0, 0xEF66, 0x5F5E, 0, 0, 0, 0x3128,
- 0, 0xEF67, 0, 0xEF68, 0x7749, 0xC95C, 0xC95D, 0,
- 0x774A, 0x5F60, 0, 0, 0xEF69, 0x5F5F, 0, 0x5F5D,
- 0, 0, 0, 0, 0x774B, 0, 0, 0,
- 0, 0, 0, 0, 0xEF65, 0, 0, 0,
- 0, 0x5F58, 0, 0, 0, 0, 0, 0,
- 0, 0x4B23, 0xC961, 0, 0, 0x5F62, 0, 0,
-};
static const unsigned short utf8_to_euc_E784[] = {
0, 0, 0, 0xC962, 0xC963, 0xC964, 0xC965, 0xC966,
0, 0x5F61, 0, 0xC967, 0xC968, 0, 0, 0xC969,
@@ -8178,16 +4409,6 @@ 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_E784_x0213[] = {
- 0, 0, 0, 0xEF6A, 0xEF6B, 0xC964, 0xEF6C, 0xEF6D,
- 0xEF6E, 0x5F61, 0, 0xC967, 0xEF6F, 0, 0, 0x774C,
- 0, 0, 0, 0, 0x316B, 0, 0, 0,
- 0, 0x5F64, 0x4A32, 0, 0x5F63, 0, 0x774E, 0,
- 0x774F, 0x4C35, 0, 0, 0, 0, 0x3E47, 0,
- 0, 0, 0, 0x774D, 0, 0xC96D, 0x7750, 0xEF71,
- 0x7751, 0xEF72, 0, 0, 0, 0, 0x4133, 0,
- 0xC971, 0, 0, 0, 0x3E46, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E785[] = {
0, 0xC972, 0, 0, 0, 0xC973, 0xC974, 0xC975,
0, 0x4E7B, 0xC976, 0xC977, 0x5F6A, 0, 0x4079, 0,
@@ -8198,16 +4419,6 @@ 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_E785_x0213[] = {
- 0, 0xC972, 0, 0, 0, 0xC973, 0x7752, 0x7753,
- 0, 0x4E7B, 0xEF74, 0xC977, 0x5F6A, 0, 0x4079, 0,
- 0xEF73, 0x7754, 0x7756, 0xEF75, 0, 0x5F66, 0x5F6B, 0xC97A,
- 0, 0x316C, 0xC97B, 0, 0x7757, 0, 0xEF76, 0,
- 0x7758, 0, 0x5F69, 0, 0x4761, 0x5F65, 0x5F68, 0x3E48,
- 0x7759, 0x4851, 0, 0, 0x5F6C, 0, 0x3C51, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xCA22, 0, 0, 0, 0x407A, 0, 0,
-};
static const unsigned short utf8_to_euc_E786[] = {
0xCA23, 0, 0, 0, 0x5F6F, 0xCA24, 0, 0xCA25,
0x5F67, 0, 0x3727, 0, 0xCA26, 0, 0, 0x5F6D,
@@ -8218,16 +4429,6 @@ 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_E786_x0213[] = {
- 0xEF79, 0, 0, 0, 0x5F6F, 0x775B, 0, 0x775C,
- 0x5F67, 0, 0x3727, 0, 0xCA26, 0, 0, 0x5F6D,
- 0, 0, 0x775D, 0, 0x4D50, 0x5F70, 0xEF78, 0,
- 0, 0x7426, 0xCA28, 0xEF7A, 0, 0, 0, 0x3D4F,
- 0xEF7B, 0, 0xEF7C, 0, 0, 0, 0, 0,
- 0x5F71, 0, 0, 0, 0x5F72, 0, 0xEF7D, 0xEF7E,
- 0xCA2D, 0x472E, 0xCA2E, 0xF021, 0, 0, 0, 0,
- 0, 0x5F74, 0x775F, 0, 0, 0, 0x5F75, 0xCA31,
-};
static const unsigned short utf8_to_euc_E787[] = {
0xCA32, 0xCA33, 0, 0x4733, 0xCA34, 0, 0, 0,
0x4575, 0x5F77, 0, 0xCA35, 0xCA36, 0, 0x5F79, 0,
@@ -8238,16 +4439,6 @@ 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_E787_x0213[] = {
- 0xCA32, 0x775E, 0, 0x4733, 0x7760, 0, 0, 0,
- 0x4575, 0x5F77, 0, 0xF023, 0xCA36, 0, 0x5F79, 0,
- 0x4E55, 0, 0x5F76, 0xF024, 0x5F78, 0x316D, 0xCA38, 0x5F73,
- 0, 0xF025, 0xCA3A, 0, 0xF026, 0, 0, 0x535B,
- 0x5F7A, 0, 0, 0, 0, 0x4167, 0x3B38, 0x5F7C,
- 0, 0, 0, 0, 0x5F7B, 0x3F24, 0x5259, 0,
- 0, 0, 0, 0, 0, 0x5F7D, 0, 0,
- 0xCA3C, 0x6021, 0, 0x5F6E, 0x5F7E, 0, 0x7761, 0x6022,
-};
static const unsigned short utf8_to_euc_E788[] = {
0xCA3E, 0, 0, 0, 0, 0, 0x477A, 0xCA3F,
0xCA40, 0xCA41, 0, 0, 0, 0x6023, 0, 0,
@@ -8258,16 +4449,6 @@ 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_E788_x0213[] = {
- 0x7762, 0, 0, 0, 0, 0, 0x477A, 0xF027,
- 0xCA40, 0xCA41, 0, 0, 0, 0x6023, 0, 0,
- 0x6024, 0, 0, 0xCA42, 0, 0x7763, 0, 0xCA43,
- 0, 0, 0xCA44, 0x6025, 0, 0xCA45, 0, 0xCA46,
- 0, 0, 0, 0, 0xCA47, 0, 0, 0,
- 0x6026, 0, 0x445E, 0xF02A, 0x6028, 0x6027, 0, 0xCA49,
- 0x6029, 0, 0x602A, 0, 0xF02B, 0x3C5F, 0x4963, 0,
- 0xF02C, 0xF02D, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
-};
static const unsigned short utf8_to_euc_E789[] = {
0x602E, 0xCA4D, 0xCA4E, 0xCA4F, 0, 0xCA50, 0x602F, 0x4A52,
0x4847, 0, 0, 0x6030, 0x4757, 0, 0xCA51, 0xCA52,
@@ -8278,16 +4459,6 @@ 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_E789_x0213[] = {
- 0x602E, 0xCA4D, 0xF02F, 0xCA4F, 0, 0xCA50, 0x602F, 0x4A52,
- 0x4847, 0, 0, 0x6030, 0x4757, 0, 0xCA51, 0xCA52,
- 0xCA53, 0, 0x442D, 0xF030, 0, 0x7764, 0x7765, 0xF031,
- 0x6031, 0x3267, 0xCA57, 0x356D, 0xCA58, 0x4C46, 0xCA59, 0x4C36,
- 0xCA5A, 0x3234, 0x4F34, 0xF032, 0, 0, 0, 0x4B52,
- 0xCA5C, 0x4A2A, 0, 0xCA5D, 0, 0, 0xF034, 0xF035,
- 0, 0xCA60, 0x4037, 0, 0x6032, 0, 0, 0xCA61,
- 0xF036, 0x4643, 0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xF037,
-};
static const unsigned short utf8_to_euc_E78A[] = {
0x3A54, 0x6035, 0x6034, 0, 0xCA66, 0, 0, 0x6036,
0, 0xCA67, 0, 0, 0, 0xCA68, 0xCA69, 0,
@@ -8298,16 +4469,6 @@ 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_E78A_x0213[] = {
- 0x3A54, 0x6035, 0x6034, 0, 0xCA66, 0, 0, 0x6036,
- 0, 0xCA67, 0, 0, 0, 0x7767, 0xF038, 0,
- 0, 0, 0x6037, 0xCA6A, 0, 0, 0x6038, 0,
- 0, 0, 0, 0x7768, 0, 0, 0, 0,
- 0x353E, 0, 0x6039, 0, 0, 0, 0, 0x603A,
- 0xCA6C, 0, 0, 0, 0x3824, 0xF03A, 0xF03B, 0x4848,
- 0xF03C, 0xF03D, 0x603C, 0, 0xCA70, 0, 0x3E75, 0,
- 0, 0x603B, 0, 0, 0, 0, 0x7769, 0,
-};
static const unsigned short utf8_to_euc_E78B[] = {
0, 0xCA72, 0x3638, 0x603D, 0x603F, 0, 0x603E, 0xCA73,
0, 0xCA74, 0, 0, 0xCA75, 0, 0x6040, 0,
@@ -8318,16 +4479,6 @@ 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_E78B_x0213[] = {
- 0x776A, 0xF03E, 0x3638, 0x603D, 0x603F, 0, 0x603E, 0xCA73,
- 0, 0xCA74, 0, 0, 0xF040, 0, 0x6040, 0,
- 0x3851, 0, 0x6041, 0, 0, 0xCA76, 0xCA77, 0x3669,
- 0xCA78, 0x4140, 0, 0x397D, 0, 0, 0, 0xCA79,
- 0x6043, 0x6044, 0x6042, 0, 0, 0xCA7A, 0, 0,
- 0, 0x3C6D, 0, 0, 0x4648, 0x3639, 0, 0,
- 0, 0, 0, 0xF043, 0xCA7C, 0, 0, 0x6046,
- 0x432C, 0x6045, 0xF044, 0x776B, 0x4F35, 0x4762, 0xCB21, 0,
-};
static const unsigned short utf8_to_euc_E78C[] = {
0, 0, 0xCB22, 0, 0xCB23, 0xCB24, 0, 0xCB25,
0, 0, 0x6049, 0xCB26, 0, 0xCB27, 0, 0,
@@ -8338,16 +4489,6 @@ 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_E78C_x0213[] = {
- 0, 0, 0xCB22, 0, 0xCB23, 0xCB24, 0, 0xF045,
- 0, 0, 0x6049, 0xCB26, 0, 0xCB27, 0, 0,
- 0, 0, 0xF046, 0xCB29, 0, 0, 0x604B, 0x6048,
- 0xF047, 0xF048, 0, 0x4C54, 0x604A, 0x604C, 0xCB2C, 0x4E44,
- 0, 0, 0xCB2D, 0, 0xCB2E, 0x6050, 0, 0x776D,
- 0x776E, 0x604F, 0x4376, 0x472D, 0xF04B, 0, 0x3825, 0x604E,
- 0, 0xF04C, 0xCB33, 0xF04D, 0x604D, 0xCB34, 0x4D31, 0x4D32,
- 0, 0xF04A, 0xCB35, 0xCB36, 0, 0xF04E, 0x6051, 0x316E,
-};
static const unsigned short utf8_to_euc_E78D[] = {
0, 0, 0, 0xCB38, 0x3976, 0x3B62, 0, 0,
0, 0, 0, 0, 0, 0xCB39, 0x6052, 0x6053,
@@ -8358,16 +4499,6 @@ 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_E78D_x0213[] = {
- 0, 0, 0, 0xCB38, 0x3976, 0x3B62, 0, 0,
- 0, 0, 0, 0, 0, 0xCB39, 0x6052, 0x6053,
- 0x7770, 0, 0xF04F, 0, 0, 0, 0xCB3C, 0x6055,
- 0xCB3D, 0, 0, 0, 0, 0xCB3E, 0xCB3F, 0xCB40,
- 0xCB41, 0, 0, 0x3D43, 0, 0, 0x7771, 0xCB43,
- 0x6057, 0xCB44, 0x6056, 0xF051, 0xF052, 0, 0xF054, 0xF055,
- 0x6058, 0xF056, 0x334D, 0, 0, 0x605A, 0, 0xF057,
- 0x6059, 0xCB4B, 0x605C, 0x605B, 0x7772, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E78E[] = {
0xCB4D, 0xCB4E, 0, 0xCB4F, 0x383C, 0xCB50, 0xCB51, 0x4E28,
0, 0x364C, 0, 0x3226, 0, 0, 0xCB52, 0,
@@ -8378,16 +4509,6 @@ 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_E78E_x0213[] = {
- 0xCB4D, 0xF058, 0, 0xCB4F, 0x383C, 0xF059, 0xCB51, 0x4E28,
- 0, 0x364C, 0xF05A, 0x3226, 0, 0, 0xCB52, 0,
- 0xCB53, 0, 0, 0xCB54, 0xF05B, 0x7773, 0x366A, 0xCB56,
- 0xF05C, 0, 0, 0, 0xF05D, 0, 0xF05E, 0x7774,
- 0x7775, 0, 0x7776, 0, 0, 0xF05F, 0x7777, 0,
- 0xF060, 0x3461, 0xCB5F, 0x7778, 0, 0xCB61, 0, 0,
- 0, 0, 0x4E68, 0x605E, 0, 0xF061, 0, 0xF062,
- 0, 0xF063, 0, 0x6060, 0xF064, 0xCB66, 0, 0xF065,
-};
static const unsigned short utf8_to_euc_E78F[] = {
0x6061, 0, 0x3251, 0, 0, 0xCB68, 0xCB69, 0,
0x605D, 0xCB6A, 0x3B39, 0xCB6B, 0xCB6C, 0x4441, 0x605F, 0xCB6D,
@@ -8398,16 +4519,6 @@ 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_E78F_x0213[] = {
- 0x6061, 0, 0x3251, 0, 0, 0xF066, 0xCB69, 0,
- 0x605D, 0x7779, 0x3B39, 0xF067, 0xCB6C, 0x4441, 0x605F, 0x777A,
- 0, 0, 0xCB6E, 0xCB6F, 0, 0, 0x777B, 0,
- 0, 0x777C, 0, 0, 0, 0xCB72, 0x6064, 0,
- 0x3C6E, 0xF068, 0, 0x777D, 0, 0x6062, 0xCB75, 0xF069,
- 0, 0x777E, 0x373E, 0, 0, 0x4849, 0x6063, 0,
- 0, 0x607E, 0, 0, 0xCB78, 0xCB79, 0, 0xCB7A,
- 0x6069, 0xF06A, 0xF06C, 0xCB7D, 0, 0xCB7E, 0x383D, 0xCC21,
-};
static const unsigned short utf8_to_euc_E790[] = {
0xCC22, 0xCC23, 0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0xCC25,
0, 0x4E30, 0xCC26, 0, 0, 0, 0, 0,
@@ -8418,16 +4529,6 @@ 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_E790_x0213[] = {
- 0xCC22, 0xF06D, 0, 0x3565, 0xCC24, 0x6066, 0x4D7D, 0x7821,
- 0, 0x4E30, 0x7822, 0, 0, 0, 0, 0,
- 0, 0xCC27, 0, 0xF06B, 0, 0, 0, 0,
- 0, 0, 0x7823, 0x7824, 0, 0, 0, 0,
- 0, 0, 0x4276, 0, 0xF06E, 0x6068, 0x7826, 0,
- 0x7827, 0xCC2D, 0x7828, 0x7829, 0x782A, 0xCC31, 0x782B, 0x782C,
- 0x782D, 0xF06F, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A, 0,
- 0, 0xF070, 0x606B, 0, 0, 0, 0, 0x606D,
-};
static const unsigned short utf8_to_euc_E791[] = {
0xCC37, 0x6070, 0, 0xCC38, 0xCC39, 0, 0xCC3A, 0xCC3B,
0, 0, 0, 0xCC3C, 0, 0xCC3D, 0, 0,
@@ -8438,16 +4539,6 @@ 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_E791_x0213[] = {
- 0xF072, 0x6070, 0, 0xF073, 0x782E, 0, 0x782F, 0x7830,
- 0, 0, 0, 0x7831, 0, 0xF074, 0, 0,
- 0, 0xCC3E, 0xF075, 0xF071, 0, 0x606C, 0, 0x7832,
- 0, 0x606F, 0x386A, 0x314D, 0x6071, 0xF076, 0x3F70, 0x606E,
- 0x4E5C, 0, 0x7833, 0x6074, 0x7424, 0, 0xCC43, 0xCC44,
- 0xCC45, 0x6072, 0x6075, 0x7834, 0, 0x7835, 0xCC48, 0x6067,
- 0x6073, 0xF077, 0xCC4A, 0x3A3C, 0, 0, 0x6076, 0,
- 0, 0, 0, 0, 0, 0, 0x6077, 0,
-};
static const unsigned short utf8_to_euc_E792[] = {
0xCC4B, 0xCC4C, 0, 0x4D7E, 0, 0xCC4D, 0xCC4E, 0xCC4F,
0, 0xCC50, 0, 0x6078, 0, 0, 0, 0xCC51,
@@ -8458,16 +4549,6 @@ 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_E792_x0213[] = {
- 0xCC4B, 0xF078, 0, 0x4D7E, 0, 0xF079, 0x7836, 0x7837,
- 0xF07A, 0x7838, 0, 0x6078, 0, 0, 0, 0xCC51,
- 0x783D, 0xCC53, 0xF07C, 0, 0, 0, 0, 0xF07D,
- 0x7839, 0xF07E, 0xCC57, 0, 0x783A, 0, 0x6079, 0x783B,
- 0xF121, 0xF122, 0x6065, 0x783C, 0, 0xF123, 0x783E, 0x607A,
- 0x783F, 0x7840, 0xF124, 0xF125, 0, 0, 0xCC62, 0xCC63,
- 0x3444, 0xCC64, 0xCC65, 0, 0, 0x7841, 0, 0,
- 0, 0xF126, 0xF128, 0xF127, 0, 0x3C25, 0, 0x7842,
-};
static const unsigned short utf8_to_euc_E793[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0xCC6A, 0xCC6B, 0x607B, 0, 0xCC6C, 0, 0, 0x607C,
@@ -8478,16 +4559,6 @@ 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_E793_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x7843, 0x7844, 0x607B, 0, 0xCC6C, 0, 0, 0x607C,
- 0xCC6D, 0, 0, 0xCC6E, 0x607D, 0, 0xF129, 0,
- 0xF12A, 0, 0x7845, 0xCC71, 0x313B, 0, 0xF12B, 0xCC73,
- 0x6121, 0, 0x493B, 0x6122, 0xCC74, 0, 0x3424, 0x6123,
- 0xCC75, 0x6124, 0xCC76, 0xF12D, 0, 0, 0x6125, 0xF12C,
- 0x6127, 0x6128, 0x6126, 0, 0xCC79, 0, 0x4953, 0x612A,
- 0x6129, 0, 0xF12F, 0xCC7B, 0xCC7C, 0, 0, 0x7846,
-};
static const unsigned short utf8_to_euc_E794[] = {
0, 0xF450, 0, 0x612C, 0x612B, 0x612D, 0xCC7E, 0,
0, 0, 0, 0, 0x612E, 0x6130, 0x612F, 0,
@@ -8498,16 +4569,6 @@ 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_E794_x0213[] = {
- 0, 0x7847, 0, 0x612C, 0x612B, 0x612D, 0xCC7E, 0,
- 0, 0, 0, 0, 0x612E, 0x6130, 0x612F, 0,
- 0, 0x3979, 0xCD21, 0x6132, 0, 0x6131, 0xCD22, 0x7848,
- 0x3445, 0, 0x3F53, 0, 0x453C, 0, 0x6133, 0x4038,
- 0xF131, 0xCD25, 0, 0x3B3A, 0xF132, 0x3179, 0x6134, 0xCD27,
- 0x4D51, 0xCD28, 0xF133, 0x4A63, 0x6135, 0, 0, 0x7849,
- 0x4544, 0x4D33, 0x3943, 0x3F3D, 0, 0, 0xCD2B, 0x434B,
- 0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xF136, 0xF137, 0xCD2F,
-};
static const unsigned short utf8_to_euc_E795[] = {
0xCD30, 0, 0, 0xCD31, 0x6137, 0, 0x613C, 0xCD32,
0xCD33, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xCD34, 0x305A,
@@ -8518,16 +4579,6 @@ 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_E795_x0213[] = {
- 0xF138, 0, 0, 0xCD31, 0x6137, 0, 0x613C, 0xCD32,
- 0xF139, 0x613A, 0x6139, 0x5A42, 0x3326, 0x6138, 0xF13A, 0x305A,
- 0xF13B, 0x482A, 0xF13C, 0, 0x484A, 0, 0, 0xCD37,
- 0, 0x4E31, 0x613D, 0x613B, 0x435C, 0x4026, 0xCD38, 0xCD39,
- 0x482B, 0xCD3A, 0x492D, 0, 0x613F, 0x4E2C, 0x374D, 0x6140,
- 0, 0x613E, 0x4856, 0x6141, 0xF13D, 0x6142, 0, 0x784A,
- 0x305B, 0xF13F, 0xF13E, 0x3E76, 0x6147, 0, 0x6144, 0x466D,
- 0x6143, 0x784B, 0xF140, 0xCD3F, 0xCD40, 0xF141, 0xF142, 0x3526,
-};
static const unsigned short utf8_to_euc_E796[] = {
0, 0xCD43, 0x614A, 0, 0, 0xCD44, 0x6145, 0x6146,
0, 0x6149, 0x6148, 0x4925, 0, 0, 0x4142, 0x4141,
@@ -8538,16 +4589,6 @@ 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_E796_x0213[] = {
- 0, 0xF143, 0x614A, 0, 0, 0xCD44, 0x6145, 0x6146,
- 0, 0x6149, 0x6148, 0x4925, 0xF145, 0, 0x4142, 0x4141,
- 0xCD45, 0x353F, 0x784C, 0xCD47, 0x614B, 0xCD48, 0, 0,
- 0, 0xCD49, 0x614C, 0, 0xCD4A, 0x614D, 0, 0,
- 0, 0, 0xF147, 0x614F, 0xCD4C, 0x614E, 0, 0,
- 0, 0, 0, 0x3156, 0, 0, 0, 0,
- 0xF149, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153, 0, 0xF14A,
- 0x6155, 0x3F3E, 0xCD4E, 0, 0x6156, 0x6154, 0x3C40, 0xF14B,
-};
static const unsigned short utf8_to_euc_E797[] = {
0xCD50, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xCD53, 0x3E49,
0, 0, 0x6159, 0, 0xCD54, 0x6158, 0xCD55, 0xCD56,
@@ -8558,16 +4599,6 @@ 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_E797_x0213[] = {
- 0xF14C, 0xCD51, 0x6150, 0x6152, 0xCD52, 0x4942, 0xF14D, 0x3E49,
- 0, 0, 0x6159, 0, 0xCD54, 0x6158, 0x784E, 0xF14E,
- 0, 0, 0x615A, 0xF14F, 0x3C26, 0x3A2F, 0, 0xCD57,
- 0x4577, 0x615B, 0, 0x444B, 0xCD58, 0xF150, 0x615D, 0xF151,
- 0xF152, 0xCD5B, 0x4E21, 0x615C, 0x784F, 0, 0, 0xF153,
- 0, 0x4169, 0, 0, 0xF154, 0, 0xF155, 0xCD60,
- 0x6162, 0xF156, 0x6164, 0x6165, 0x4354, 0, 0, 0,
- 0, 0xF157, 0x6163, 0, 0x6160, 0, 0x615E, 0x615F,
-};
static const unsigned short utf8_to_euc_E798[] = {
0xCD63, 0x6161, 0xCD64, 0xCD65, 0xCD66, 0, 0, 0xCD67,
0xCD68, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167, 0, 0xCD6B,
@@ -8578,16 +4609,6 @@ 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_E798_x0213[] = {
- 0x7850, 0x6161, 0x7851, 0xF158, 0xCD66, 0, 0, 0xF15A,
- 0x7852, 0x6168, 0xCD69, 0x6166, 0xCD6A, 0x6167, 0, 0xF15B,
- 0, 0, 0xCD6C, 0xF15E, 0, 0x7853, 0x7854, 0,
- 0xF159, 0x7855, 0, 0xF15F, 0xF160, 0xCD73, 0x7856, 0x6169,
- 0x616B, 0x616C, 0x616D, 0xCD75, 0x616E, 0xF162, 0x7E7D, 0x616A,
- 0xF163, 0xCD78, 0, 0, 0, 0x7857, 0, 0,
- 0x6170, 0, 0xCD7A, 0xF165, 0x616F, 0x7858, 0, 0,
- 0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xF164, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E799[] = {
0xCE24, 0xCE25, 0x4E45, 0xCE26, 0xCE27, 0xCE28, 0x6174, 0x6172,
0x6173, 0xCE29, 0xCE23, 0xCE2A, 0x3462, 0, 0, 0,
@@ -8598,16 +4619,6 @@ 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_E799_x0213[] = {
- 0xCE24, 0xF168, 0x4E45, 0x7859, 0xCE27, 0xCE28, 0x6174, 0x6172,
- 0x6173, 0xF16A, 0xCE23, 0x785A, 0x3462, 0, 0, 0,
- 0, 0, 0x4C7E, 0, 0, 0xF16B, 0x4A4A, 0,
- 0x6176, 0xCE2C, 0, 0, 0x6175, 0, 0, 0xCE2D,
- 0, 0x6177, 0x6178, 0, 0x785B, 0x785C, 0, 0x617C,
- 0x6179, 0x617A, 0x617B, 0, 0x617D, 0x785D, 0xF16D, 0x785E,
- 0x617E, 0x785F, 0x6221, 0, 0xCE34, 0, 0x6222, 0,
- 0x6223, 0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934, 0,
-};
static const unsigned short utf8_to_euc_E79A[] = {
0x6225, 0xCE35, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
0x6227, 0, 0, 0x6228, 0xCE37, 0xCE38, 0x6229, 0,
@@ -8618,16 +4629,6 @@ 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_E79A_x0213[] = {
- 0x6225, 0x7860, 0xF451, 0x6226, 0x452A, 0xCE36, 0x3327, 0x3944,
- 0x6227, 0, 0, 0x6228, 0xCE37, 0xCE38, 0x6229, 0,
- 0x3B29, 0, 0, 0x622B, 0, 0xF16E, 0x622A, 0,
- 0, 0x622C, 0x622D, 0x7861, 0xF16F, 0x7862, 0x7863, 0xCE3D,
- 0xF171, 0xF170, 0xCE3F, 0xCE40, 0xCE41, 0xCE42, 0x7864, 0xF172,
- 0xF173, 0, 0x7865, 0, 0, 0xCE47, 0x4869, 0xF174,
- 0x622E, 0, 0, 0, 0x622F, 0, 0x7866, 0x7369,
- 0x6230, 0x6231, 0x6232, 0, 0, 0xCE48, 0, 0x3B2E,
-};
static const unsigned short utf8_to_euc_E79B[] = {
0, 0xCE49, 0x6233, 0x4756, 0, 0xCE4A, 0x4B5F, 0,
0x314E, 0xCE4B, 0x3157, 0xCE4C, 0xCE4D, 0x6234, 0xCE4E, 0,
@@ -8638,16 +4639,6 @@ 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_E79B_x0213[] = {
- 0, 0xCE49, 0x6233, 0x4756, 0, 0x7867, 0x4B5F, 0,
- 0x314E, 0xF176, 0x3157, 0xCE4C, 0x7868, 0x6234, 0x7869, 0,
- 0, 0, 0x6236, 0, 0x786A, 0, 0x6235, 0x4570,
- 0, 0xCE50, 0, 0x4039, 0x5D39, 0, 0x6237, 0x4C41,
- 0xCE51, 0x6238, 0, 0x3446, 0x4857, 0x6239, 0x786B, 0x623A,
- 0xF178, 0, 0x623B, 0, 0xF179, 0, 0x4C5C, 0,
- 0xCE55, 0x786C, 0x4C55, 0, 0x443E, 0, 0xCE57, 0,
- 0x416A, 0xCE58, 0, 0x623D, 0x786D, 0, 0x3D62, 0,
-};
static const unsigned short utf8_to_euc_E79C[] = {
0xCE5A, 0x3E4A, 0, 0, 0x6240, 0, 0xCE5B, 0x623F,
0x623E, 0x487D, 0xCE5C, 0x3447, 0x3829, 0, 0xCE5D, 0,
@@ -8658,16 +4649,6 @@ 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_E79C_x0213[] = {
- 0xCE5A, 0x3E4A, 0, 0, 0x6240, 0, 0xCE5B, 0x623F,
- 0x623E, 0x487D, 0x786E, 0x3447, 0x3829, 0, 0xCE5D, 0,
- 0, 0, 0xCE5E, 0, 0xCE5F, 0xCE60, 0, 0xF17B,
- 0, 0x786F, 0xF17C, 0x6246, 0xCE64, 0, 0x6243, 0x3F3F,
- 0x4C32, 0, 0xCE65, 0, 0x6242, 0x6244, 0x6245, 0,
- 0xCE66, 0x6241, 0, 0, 0, 0xF17D, 0xCE68, 0xCE69,
- 0, 0, 0, 0, 0x7870, 0xF17E, 0x7871, 0x6247,
- 0x6248, 0xCE6D, 0x442F, 0, 0x3463, 0xCE6E, 0xCE6F, 0,
-};
static const unsigned short utf8_to_euc_E79D[] = {
0x4365, 0, 0xCE70, 0, 0, 0xCE71, 0xCE72, 0x6249,
0, 0, 0xCE73, 0, 0, 0xCE74, 0xCE75, 0xCE76,
@@ -8678,16 +4659,6 @@ 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_E79D_x0213[] = {
- 0x4365, 0, 0xCE70, 0, 0, 0xCE71, 0x7872, 0x6249,
- 0, 0, 0xCE73, 0, 0, 0x7873, 0x7874, 0xCE76,
- 0, 0, 0xCE77, 0, 0, 0, 0xCE78, 0xCE79,
- 0xF225, 0, 0x624A, 0x624D, 0x7875, 0, 0xCE7B, 0x7876,
- 0xF226, 0x3F67, 0x7877, 0x4644, 0xCF21, 0x624E, 0x4B53, 0xCF22,
- 0x624B, 0, 0xF227, 0x624C, 0xCF24, 0, 0, 0,
- 0xCF25, 0, 0xF229, 0xCF27, 0xCF28, 0, 0, 0,
- 0, 0x6251, 0x7878, 0, 0xF22A, 0xF22B, 0x6250, 0x624F,
-};
static const unsigned short utf8_to_euc_E79E[] = {
0xCF2B, 0, 0, 0, 0xCF2C, 0, 0, 0,
0, 0, 0, 0x6253, 0xCF2D, 0xCF2E, 0x6252, 0,
@@ -8698,16 +4669,6 @@ 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_E79E_x0213[] = {
- 0x7879, 0, 0, 0, 0xCF2C, 0, 0, 0,
- 0, 0, 0, 0x6253, 0xCF2D, 0xCF2E, 0x6252, 0,
- 0, 0x6254, 0, 0, 0x787A, 0xCF30, 0xCF31, 0,
- 0, 0, 0xF22E, 0, 0, 0, 0x6256, 0xF22F,
- 0x6255, 0, 0xF230, 0, 0xF231, 0x4A4D, 0, 0xCF35,
- 0, 0xF232, 0x787B, 0, 0x3D56, 0x4E46, 0xCF37, 0xCF38,
- 0x6257, 0xCF39, 0, 0x4637, 0, 0xCF3A, 0x6258, 0,
- 0, 0x6259, 0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
-};
static const unsigned short utf8_to_euc_E79F[] = {
0, 0, 0, 0xCF3C, 0, 0, 0, 0x625E,
0, 0xCF3D, 0, 0, 0, 0x625F, 0, 0,
@@ -8718,16 +4679,6 @@ 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_E79F_x0213[] = {
- 0, 0, 0, 0xCF3C, 0, 0, 0, 0x625E,
- 0, 0xCF3D, 0, 0, 0, 0x625F, 0, 0,
- 0, 0xCF3E, 0xCF3F, 0, 0, 0xCF40, 0, 0x6260,
- 0, 0xCF41, 0x6261, 0x4C37, 0x6262, 0, 0xF233, 0xF234,
- 0x787C, 0, 0x4C70, 0x6263, 0xF235, 0x434E, 0xF236, 0x476A,
- 0, 0x366B, 0xF237, 0, 0xF238, 0x433B, 0x6264, 0x363A,
- 0xF23A, 0xCF4A, 0, 0x4050, 0xF23B, 0, 0, 0,
- 0xCF4C, 0, 0, 0xF23C, 0x6265, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E7A0[] = {
0, 0, 0x3A3D, 0, 0, 0xCF4E, 0xCF4F, 0,
0, 0xCF50, 0, 0, 0x6266, 0xCF51, 0xCF52, 0,
@@ -8738,16 +4689,6 @@ 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_E7A0_x0213[] = {
- 0, 0, 0x3A3D, 0, 0, 0xF23E, 0xF23F, 0,
- 0, 0xF240, 0, 0, 0x6266, 0xF241, 0xCF52, 0,
- 0, 0xCF53, 0x6267, 0, 0x3826, 0x3A55, 0, 0,
- 0, 0xF242, 0, 0, 0, 0xCF54, 0, 0,
- 0x6269, 0xF243, 0xCF56, 0xCF57, 0, 0x4556, 0x3A56, 0x354E,
- 0, 0, 0, 0, 0xF244, 0x787D, 0xCF59, 0,
- 0xCF5A, 0, 0x4B24, 0, 0x474B, 0xCF5B, 0, 0xCF5C,
- 0, 0, 0x4557, 0, 0, 0, 0, 0x395C,
-};
static const unsigned short utf8_to_euc_E7A1[] = {
0, 0, 0, 0xCF5D, 0xCF5E, 0x626B, 0, 0xCF5F,
0xCF60, 0, 0, 0, 0xCF61, 0, 0xCF62, 0,
@@ -8758,16 +4699,6 @@ 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_E7A1_x0213[] = {
- 0, 0, 0, 0x7921, 0xCF5E, 0x626B, 0, 0xF245,
- 0xCF60, 0, 0, 0, 0xCF61, 0, 0x7922, 0x7923,
- 0, 0x7924, 0xCF63, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0xCF64, 0x3E4B, 0xCF65, 0,
- 0xCF66, 0xCF67, 0, 0xCF68, 0xF246, 0, 0, 0,
- 0x7925, 0, 0xF247, 0x4E32, 0x3945, 0, 0x7926, 0x3827,
- 0, 0, 0x4823, 0, 0x626D, 0, 0, 0,
- 0, 0, 0xCF6D, 0, 0x626F, 0, 0xCF6E, 0,
-};
static const unsigned short utf8_to_euc_E7A2[] = {
0, 0x386B, 0, 0, 0, 0, 0x626E, 0x4476,
0, 0, 0xCF6F, 0, 0x6271, 0x3337, 0x626C, 0xCF70,
@@ -8778,16 +4709,6 @@ 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_E7A2_x0213[] = {
- 0, 0x386B, 0, 0, 0, 0, 0x626E, 0x4476,
- 0, 0, 0xF249, 0, 0x6271, 0x3337, 0x626C, 0xCF70,
- 0, 0x486A, 0, 0x3130, 0xF24A, 0x3A6C, 0, 0x4F52,
- 0xCF72, 0, 0x6270, 0, 0, 0xF24C, 0xF24D, 0xF24E,
- 0, 0xCF73, 0, 0x6272, 0xF24B, 0, 0, 0x4A4B,
- 0xCF78, 0x4059, 0x6274, 0, 0xCF79, 0x792A, 0, 0x6275,
- 0x7928, 0xCF7C, 0xCF7D, 0xCF7E, 0, 0x6273, 0, 0,
- 0, 0, 0x334E, 0xF24F, 0x627B, 0xD022, 0x627A, 0xD023,
-};
static const unsigned short utf8_to_euc_E7A3[] = {
0, 0x3C27, 0, 0, 0, 0x627C, 0x6277, 0xD024,
0xD025, 0xD026, 0x627D, 0x6278, 0xD027, 0, 0xD028, 0,
@@ -8798,16 +4719,6 @@ 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_E7A3_x0213[] = {
- 0, 0x3C27, 0, 0, 0, 0x627C, 0x6277, 0xD024,
- 0xF250, 0xD026, 0x627D, 0x6278, 0xF251, 0, 0xF252, 0,
- 0x4858, 0x6276, 0xD029, 0xD02A, 0x6279, 0xF253, 0xD02C, 0,
- 0, 0, 0x6322, 0xD02E, 0, 0, 0, 0xD02F,
- 0xF254, 0xF255, 0, 0, 0x792B, 0, 0xF256, 0x6321,
- 0x4B61, 0, 0xD033, 0, 0x627E, 0, 0, 0x306B,
- 0, 0, 0x792C, 0xD035, 0x6324, 0, 0xD037, 0x792E,
- 0, 0xF257, 0xF258, 0xF259, 0, 0x6323, 0xF25A, 0xD03B,
-};
static const unsigned short utf8_to_euc_E7A4[] = {
0xD036, 0x3E4C, 0, 0, 0, 0, 0xD03C, 0x6325,
0, 0, 0, 0, 0xD03D, 0, 0x4143, 0,
@@ -8818,16 +4729,6 @@ 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_E7A4_x0213[] = {
- 0x792D, 0x3E4C, 0, 0, 0, 0, 0xD03C, 0x6325,
- 0, 0, 0, 0, 0xD03D, 0, 0x4143, 0,
- 0xF25C, 0x6327, 0x6326, 0, 0, 0, 0, 0,
- 0, 0x6328, 0xD03F, 0xF25D, 0x792F, 0, 0xD041, 0xD042,
- 0xD043, 0, 0, 0, 0, 0xF25F, 0x6268, 0xD045,
- 0, 0xD046, 0x626A, 0x632A, 0x6329, 0xD047, 0x7930, 0,
- 0xF25E, 0x7931, 0, 0, 0x7932, 0xD04A, 0, 0,
- 0, 0, 0x3C28, 0xF260, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
-};
static const unsigned short utf8_to_euc_E7A5[] = {
0x632B, 0x3737, 0, 0, 0xD04E, 0xD04F, 0xD050, 0x3540,
0x3527, 0x3B63, 0xD051, 0xD052, 0, 0, 0, 0xD053,
@@ -8838,16 +4739,6 @@ 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_E7A5_x0213[] = {
- 0x632B, 0x3737, 0, 0, 0xD04E, 0x7935, 0x7936, 0x3540,
- 0x3527, 0x3B63, 0xF261, 0xD052, 0, 0, 0, 0xD053,
- 0x4D34, 0xD054, 0, 0x6331, 0xD055, 0x6330, 0x4144, 0x632D,
- 0xF262, 0, 0x632F, 0xF263, 0x793A, 0x3D4B, 0x3F40, 0x632E,
- 0x632C, 0, 0x472A, 0, 0, 0x3E4D, 0, 0xF265,
- 0x493C, 0xD05A, 0, 0xD05B, 0, 0x3A57, 0, 0,
- 0, 0, 0xF266, 0, 0, 0, 0, 0x4578,
- 0, 0x793E, 0x6332, 0xD05E, 0xD05F, 0, 0xD060, 0x6333,
-};
static const unsigned short utf8_to_euc_E7A6[] = {
0x6349, 0x3658, 0, 0, 0x4F3D, 0x4135, 0, 0,
0, 0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
@@ -8858,16 +4749,6 @@ 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_E7A6_x0213[] = {
- 0x6349, 0x3658, 0, 0, 0x4F3D, 0x4135, 0, 0,
- 0, 0, 0x6334, 0xD061, 0xD062, 0x3252, 0x4477, 0x4A21,
- 0, 0xD063, 0, 0xD064, 0xF267, 0xF268, 0xF269, 0,
- 0x7942, 0, 0, 0xF26A, 0xD06A, 0x6335, 0, 0,
- 0, 0xF26B, 0, 0, 0, 0, 0x357A, 0x6336,
- 0xD06C, 0xF26C, 0x6338, 0xD06E, 0, 0, 0x6339, 0xD06F,
- 0x4729, 0x7943, 0, 0x633A, 0xF26D, 0, 0, 0,
- 0x7944, 0x633B, 0x633C, 0xF26E, 0, 0x3659, 0x3253, 0x4645,
-};
static const unsigned short utf8_to_euc_E7A7[] = {
0x3D28, 0x3B64, 0xD074, 0, 0xD075, 0, 0, 0xD076,
0xD077, 0x633D, 0xD078, 0x3D29, 0, 0, 0, 0xD079,
@@ -8878,16 +4759,6 @@ 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_E7A7_x0213[] = {
- 0x3D28, 0x3B64, 0xF26F, 0, 0xD075, 0, 0, 0xF270,
- 0x7945, 0x633D, 0x7946, 0x3D29, 0xF271, 0xF272, 0, 0xD079,
- 0, 0x324A, 0x4943, 0, 0x7948, 0x633E, 0xF273, 0,
- 0x486B, 0, 0xD07C, 0, 0, 0xD07D, 0x7949, 0x4145,
- 0xD121, 0x6341, 0xD122, 0x6342, 0x4769, 0xD123, 0x3F41, 0x633F,
- 0, 0x4361, 0xD124, 0x794A, 0x6340, 0x794B, 0, 0,
- 0x3E4E, 0xD127, 0, 0, 0, 0, 0, 0,
- 0xD128, 0, 0, 0x305C, 0xD129, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E7A8[] = {
0x3529, 0, 0xD12A, 0xD12B, 0, 0, 0, 0xD12C,
0x6343, 0xD12D, 0xD12E, 0x4478, 0xD12F, 0x6344, 0x4047, 0,
@@ -8898,16 +4769,6 @@ 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_E7A8_x0213[] = {
- 0x3529, 0, 0xD12A, 0x794C, 0, 0, 0, 0xD12C,
- 0x6343, 0xD12D, 0xF278, 0x4478, 0xD12F, 0x6344, 0x4047, 0,
- 0, 0xF279, 0, 0, 0x4C2D, 0xF27A, 0, 0x4923,
- 0x6345, 0x6346, 0x4355, 0xF27B, 0x4E47, 0, 0xF27C, 0x6348,
- 0x6347, 0xD134, 0, 0, 0, 0, 0, 0xD135,
- 0, 0, 0, 0xD136, 0, 0xF27E, 0x3C6F, 0xD138,
- 0xD139, 0x634A, 0x3070, 0, 0xD13A, 0xD13B, 0, 0x634D,
- 0xF321, 0x794E, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
-};
static const unsigned short utf8_to_euc_E7A9[] = {
0x3972, 0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xD141,
0xD142, 0x6350, 0, 0, 0xD143, 0x4051, 0x314F, 0x323A,
@@ -8918,16 +4779,6 @@ 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_E7A9_x0213[] = {
- 0x3972, 0, 0x4A66, 0x634E, 0xD13F, 0xD140, 0x4B54, 0xF322,
- 0xD142, 0x6350, 0, 0, 0xF323, 0x4051, 0x314F, 0x323A,
- 0x302C, 0, 0, 0, 0, 0xD144, 0xF324, 0x634F,
- 0, 0xF325, 0, 0, 0xF326, 0x794F, 0, 0xF327,
- 0xF328, 0x6351, 0x6352, 0x3E77, 0, 0xD14B, 0, 0xF329,
- 0, 0x6353, 0xF32A, 0x334F, 0, 0x7950, 0, 0,
- 0x6355, 0, 0, 0, 0x376A, 0xF32B, 0x3566, 0,
- 0xF32C, 0x6356, 0x3675, 0, 0, 0x6357, 0xD151, 0x407C,
-};
static const unsigned short utf8_to_euc_E7AA[] = {
0xD152, 0x464D, 0xD153, 0x4060, 0x3A75, 0xD154, 0xD155, 0,
0x6358, 0, 0xD156, 0xD157, 0, 0, 0, 0,
@@ -8938,16 +4789,6 @@ 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_E7AA_x0213[] = {
- 0xD152, 0x464D, 0xF32D, 0x4060, 0x3A75, 0x7952, 0xD155, 0,
- 0x6358, 0, 0xF32E, 0xD157, 0, 0, 0, 0,
- 0xF32F, 0xD159, 0x4362, 0x416B, 0xD15A, 0x635A, 0x635C, 0x6359,
- 0x635B, 0, 0, 0, 0, 0, 0xD15B, 0x3722,
- 0x7953, 0, 0, 0xF330, 0, 0, 0, 0,
- 0, 0x635D, 0x3726, 0, 0xF331, 0, 0x3567, 0x4D52,
- 0x635F, 0, 0, 0x7955, 0, 0xD160, 0x6360, 0,
- 0, 0xF334, 0x312E, 0x7956, 0xF335, 0, 0xF336, 0x6363,
-};
static const unsigned short utf8_to_euc_E7AB[] = {
0, 0, 0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
0x635E, 0xD165, 0x6366, 0x4E29, 0xD166, 0x6367, 0xD167, 0x6368,
@@ -8958,16 +4799,6 @@ 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_E7AB_x0213[] = {
- 0, 0, 0, 0x3376, 0x6362, 0x6361, 0xD164, 0x6365,
- 0x635E, 0xD165, 0x6366, 0x4E29, 0xF338, 0x6367, 0x7957, 0x6368,
- 0, 0xF339, 0x5474, 0x636A, 0, 0x6369, 0, 0,
- 0, 0x636B, 0x636C, 0xD169, 0x4E35, 0x636D, 0, 0x706F,
- 0x3E4F, 0x636E, 0x636F, 0x3D57, 0, 0x4638, 0x6370, 0xF33A,
- 0xF33B, 0xD16B, 0x4328, 0x7958, 0xD16D, 0x6371, 0, 0x433C,
- 0x6372, 0xD16E, 0, 0, 0xF33C, 0, 0x3625, 0,
- 0x513F, 0x435D, 0x3C33, 0xD170, 0, 0x7959, 0xD172, 0x3448,
-};
static const unsigned short utf8_to_euc_E7AC[] = {
0, 0, 0x6373, 0, 0x6422, 0, 0x6376, 0xD173,
0x3568, 0, 0x6375, 0x6424, 0, 0, 0, 0x6374,
@@ -8978,16 +4809,6 @@ 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_E7AC_x0213[] = {
- 0, 0, 0x6373, 0, 0x6422, 0, 0x6376, 0xF33F,
- 0x3568, 0, 0x6375, 0x6424, 0, 0, 0, 0x6374,
- 0, 0x3E50, 0x795A, 0, 0xD174, 0, 0, 0,
- 0x6378, 0x6379, 0, 0x452B, 0, 0, 0x637A, 0xD175,
- 0x335E, 0, 0, 0xD176, 0, 0x3F5A, 0x4964, 0xF342,
- 0x637C, 0xD178, 0xF343, 0xD17A, 0x4268, 0x795B, 0xF344, 0xF345,
- 0xD17E, 0xF346, 0, 0x6377, 0xD222, 0x637B, 0x637D, 0,
- 0, 0x3A7B, 0, 0x795C, 0, 0xF341, 0, 0xD224,
-};
static const unsigned short utf8_to_euc_E7AD[] = {
0xD225, 0xD226, 0, 0, 0, 0x6426, 0x492E, 0xD227,
0x4826, 0x4579, 0, 0x365A, 0x6425, 0x6423, 0xD228, 0x4835,
@@ -8998,16 +4819,6 @@ 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_E7AD_x0213[] = {
- 0xD225, 0xF34A, 0, 0, 0, 0x6426, 0x492E, 0x795D,
- 0x4826, 0x4579, 0, 0x365A, 0x6425, 0x6423, 0x795E, 0x4835,
- 0x637E, 0x435E, 0x457B, 0, 0x457A, 0xF34C, 0x3A76, 0,
- 0, 0, 0, 0, 0, 0x6438, 0, 0,
- 0x795F, 0, 0, 0, 0xF34E, 0x6428, 0xF34F, 0x642A,
- 0, 0xF350, 0xD22E, 0, 0x642D, 0x7960, 0x642E, 0x7961,
- 0x642B, 0x642C, 0x7962, 0xF351, 0x6429, 0x6427, 0, 0xD233,
- 0, 0xF34D, 0x6421, 0, 0, 0, 0, 0xF349,
-};
static const unsigned short utf8_to_euc_E7AE[] = {
0, 0, 0, 0, 0xD234, 0, 0x4A4F, 0x3255,
0, 0xD235, 0, 0x6435, 0, 0x6432, 0xD236, 0x6437,
@@ -9018,16 +4829,6 @@ 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_E7AE_x0213[] = {
- 0, 0, 0, 0, 0xD234, 0, 0x4A4F, 0x3255,
- 0, 0xD235, 0, 0x6435, 0, 0x6432, 0xD236, 0x6437,
- 0xF354, 0xF355, 0x6436, 0, 0x4773, 0x4C27, 0xD239, 0x3B3B,
- 0x6430, 0x6439, 0x6434, 0xF356, 0x6433, 0x642F, 0x7963, 0x6431,
- 0xD23C, 0x3449, 0, 0, 0, 0xD23D, 0, 0,
- 0, 0, 0x433D, 0, 0xD23E, 0x407D, 0, 0xF358,
- 0xD240, 0x4822, 0xD241, 0, 0x643E, 0xF359, 0xD243, 0,
- 0x4824, 0, 0xD244, 0xD245, 0xF35A, 0xD247, 0, 0,
-};
static const unsigned short utf8_to_euc_E7AF[] = {
0x4061, 0x643B, 0xD248, 0, 0x484F, 0xD249, 0x643F, 0x4A53,
0xD24A, 0x435B, 0xD24B, 0x643A, 0x643C, 0, 0, 0x643D,
@@ -9038,16 +4839,6 @@ 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_E7AF_x0213[] = {
- 0x4061, 0x643B, 0xD248, 0, 0x484F, 0xF35B, 0x643F, 0x4A53,
- 0xD24A, 0x435B, 0xF35C, 0x643A, 0x643C, 0, 0, 0x643D,
- 0, 0, 0, 0, 0xF35F, 0, 0xF360, 0x7965,
- 0, 0x7966, 0xF361, 0xD251, 0, 0x6440, 0, 0,
- 0x3C44, 0, 0, 0, 0x4646, 0x6445, 0x6444, 0,
- 0xD252, 0x6441, 0xF362, 0, 0, 0x4F36, 0, 0,
- 0xF363, 0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
- 0xD257, 0xD258, 0xD259, 0, 0xD25A, 0, 0xD25B, 0,
-};
static const unsigned short utf8_to_euc_E7B0[] = {
0x6447, 0xD25C, 0xD25D, 0xD25E, 0xD25F, 0, 0xD260, 0x6448,
0, 0xD261, 0, 0xD262, 0xD263, 0x644D, 0xD264, 0xD265,
@@ -9058,16 +4849,6 @@ 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_E7B0_x0213[] = {
- 0x6447, 0x7967, 0xD25D, 0xF364, 0xD25F, 0, 0xD260, 0x6448,
- 0, 0xD261, 0, 0xF365, 0xD263, 0x644D, 0xF366, 0xF367,
- 0, 0x6442, 0x5255, 0x6449, 0x6443, 0, 0, 0x644C,
- 0, 0xD266, 0, 0xD267, 0, 0, 0x7969, 0x6452,
- 0x796A, 0x344A, 0, 0x644F, 0, 0xD269, 0xF368, 0x6450,
- 0xD26B, 0, 0x6451, 0x6454, 0xD26C, 0, 0, 0,
- 0, 0x7968, 0, 0x796B, 0xD26F, 0, 0x796C, 0x6453,
- 0x4876, 0xD271, 0xD272, 0, 0, 0x6455, 0x4E7C, 0x4A6D,
-};
static const unsigned short utf8_to_euc_E7B1[] = {
0x645A, 0, 0, 0x6457, 0, 0, 0xD273, 0,
0, 0, 0xD274, 0, 0x6456, 0x4052, 0, 0x6459,
@@ -9078,16 +4859,6 @@ 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_E7B1_x0213[] = {
- 0x645A, 0, 0, 0x6457, 0, 0xF369, 0xD273, 0,
- 0, 0, 0xF36A, 0, 0x6456, 0x4052, 0, 0x6459,
- 0x645B, 0xF36B, 0xD277, 0xD278, 0x6458, 0xD275, 0x645F, 0xF36C,
- 0x645C, 0x796F, 0xD27A, 0xD27B, 0xD27C, 0xD27D, 0xF36D, 0x645D,
- 0x6446, 0xF36E, 0, 0xD322, 0x645E, 0x6460, 0, 0xD323,
- 0, 0xF36F, 0, 0, 0x6461, 0x7970, 0xF370, 0xF371,
- 0xF372, 0, 0xD328, 0x4A46, 0, 0x6462, 0, 0,
- 0, 0x7971, 0, 0, 0xD32A, 0xD32B, 0x4C62, 0,
-};
static const unsigned short utf8_to_euc_E7B2[] = {
0, 0x364E, 0x3729, 0x6463, 0, 0, 0xD32C, 0xD32D,
0, 0x4A34, 0, 0x3F68, 0, 0x4C30, 0, 0xD32E,
@@ -9098,16 +4869,6 @@ 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_E7B2_x0213[] = {
- 0, 0x364E, 0x3729, 0x6463, 0, 0, 0xD32C, 0xD32D,
- 0, 0x4A34, 0, 0x3F68, 0, 0x4C30, 0, 0x7972,
- 0x6464, 0, 0x4E33, 0, 0x7973, 0x4774, 0, 0x4146,
- 0x4734, 0, 0, 0x3D4D, 0, 0, 0xD330, 0x3040,
- 0x7974, 0x6469, 0x6467, 0, 0x6465, 0x3421, 0xF376, 0x3E51,
- 0x646A, 0, 0, 0x6468, 0, 0x6466, 0x646E, 0,
- 0xD333, 0x646D, 0x646C, 0x646B, 0, 0, 0xF378, 0xF379,
- 0, 0x646F, 0xD336, 0xD337, 0x7975, 0x6470, 0x403A, 0xF37A,
-};
static const unsigned short utf8_to_euc_E7B3[] = {
0x6471, 0, 0x6473, 0, 0xD33A, 0x6472, 0, 0xD33B,
0xD33C, 0xD33D, 0x3852, 0, 0, 0xD33E, 0x4138, 0xD33F,
@@ -9118,16 +4879,6 @@ 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_E7B3_x0213[] = {
- 0x6471, 0, 0x6473, 0, 0xF37C, 0x6472, 0, 0xD33B,
- 0xF37E, 0xD33D, 0x3852, 0, 0, 0xF421, 0x4138, 0xD33F,
- 0, 0, 0x6475, 0xD340, 0xD341, 0x7976, 0x457C, 0xF423,
- 0x6474, 0x7977, 0xD345, 0, 0x6476, 0x7978, 0x4A35, 0x416C,
- 0x3947, 0, 0x6477, 0, 0, 0, 0xF425, 0x4E48,
- 0, 0xD348, 0, 0xF426, 0, 0, 0, 0x6479,
- 0, 0, 0x647A, 0, 0x647B, 0xF428, 0x647C, 0,
- 0x3B65, 0, 0x647D, 0x374F, 0, 0, 0x356A, 0,
-};
static const unsigned short utf8_to_euc_E7B4[] = {
0x352A, 0, 0x6521, 0xD34B, 0x4C73, 0x3948, 0x647E, 0xD34C,
0xD34D, 0xD34E, 0x6524, 0x4C66, 0, 0x473C, 0, 0xD34F,
@@ -9138,16 +4889,6 @@ 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_E7B4_x0213[] = {
- 0x352A, 0, 0x6521, 0xF429, 0x4C73, 0x3948, 0x647E, 0x7979,
- 0x797A, 0xF42A, 0x6524, 0x4C66, 0, 0x473C, 0, 0xD34F,
- 0x4933, 0xD350, 0xF42C, 0x797B, 0x3D63, 0x6523, 0xD353, 0x3C53,
- 0x3949, 0x3B66, 0x3569, 0x4A36, 0x6522, 0x797C, 0xF42D, 0,
- 0x4147, 0x4B42, 0x3A77, 0x797D, 0, 0, 0xD357, 0,
- 0, 0, 0xD358, 0x3B67, 0x445D, 0xD359, 0x6527, 0x4E5F,
- 0x3A59, 0x797E, 0x6528, 0x3F42, 0, 0x652A, 0, 0,
- 0, 0x3E52, 0x3A30, 0, 0xD35B, 0xF430, 0xF431, 0x6529,
-};
static const unsigned short utf8_to_euc_E7B5[] = {
0xD35E, 0xD35F, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xD360,
0xD361, 0, 0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
@@ -9158,16 +4899,6 @@ 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_E7B5_x0213[] = {
- 0xF432, 0x7A21, 0x3D2A, 0x383E, 0x4148, 0x6525, 0x652B, 0xF433,
- 0x7A22, 0, 0, 0x6526, 0x3750, 0xD362, 0x652E, 0x6532,
- 0x376B, 0xD363, 0, 0x7A23, 0, 0, 0x652D, 0xD365,
- 0, 0xF437, 0xF438, 0x6536, 0x7A24, 0xD369, 0x394A, 0,
- 0, 0x4D6D, 0x303C, 0x6533, 0, 0xD36A, 0x356B, 0xD36B,
- 0x6530, 0, 0xF439, 0, 0, 0, 0x6531, 0,
- 0xF43A, 0x457D, 0x652F, 0x652C, 0, 0x3328, 0x4064, 0,
- 0xD36E, 0x3828, 0x7A25, 0xD370, 0, 0x6538, 0, 0xF43C,
-};
static const unsigned short utf8_to_euc_E7B6[] = {
0, 0xD372, 0xD373, 0xD374, 0, 0xD375, 0xD376, 0,
0xD377, 0x6535, 0, 0xD378, 0xD379, 0xD37A, 0, 0x6537,
@@ -9178,16 +4909,6 @@ 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_E7B6_x0213[] = {
- 0, 0xD372, 0xD373, 0x7A26, 0, 0xD375, 0xF43E, 0,
- 0xF43F, 0x6535, 0, 0x7A27, 0xF440, 0xD37A, 0, 0x6537,
- 0, 0xD37B, 0, 0x6534, 0, 0, 0xD37C, 0xF441,
- 0, 0x3751, 0x4233, 0x6539, 0x416E, 0xF443, 0xD421, 0x6546,
- 0x7A28, 0, 0x6542, 0x653C, 0, 0, 0x7A29, 0xF444,
- 0, 0, 0xF445, 0x6540, 0x3C7A, 0x305D, 0x653B, 0x6543,
- 0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xF446, 0xF447,
- 0x6545, 0xD428, 0x653A, 0x433E, 0, 0x653F, 0x303D, 0x4C4A,
-};
static const unsigned short utf8_to_euc_E7B7[] = {
0, 0, 0xD429, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
0, 0, 0x365B, 0x486C, 0xD42E, 0xD42F, 0xD430, 0x416D,
@@ -9198,16 +4919,6 @@ 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_E7B7_x0213[] = {
- 0xF448, 0, 0x7A2A, 0xD42A, 0xD42B, 0xD42C, 0xD42D, 0x653E,
- 0, 0, 0x365B, 0x486C, 0x7A2B, 0xD42F, 0xD430, 0x416D,
- 0, 0x4E50, 0x3D6F, 0, 0, 0x656E, 0x7A2C, 0xF449,
- 0x6548, 0xF44A, 0x407E, 0, 0x6544, 0x6549, 0x654B, 0,
- 0x4479, 0x654E, 0xD434, 0x7A2D, 0x654A, 0xD435, 0xF44B, 0,
- 0x4A54, 0x344B, 0xD437, 0xD438, 0x4C4B, 0xD439, 0, 0x305E,
- 0, 0xF44C, 0x654D, 0, 0x4E7D, 0xD43B, 0xD43C, 0,
- 0, 0xF44D, 0xD43E, 0x654C, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E7B8[] = {
0xD433, 0x316F, 0, 0, 0x466C, 0x654F, 0, 0,
0xD43F, 0x6556, 0x6550, 0x6557, 0, 0, 0, 0,
@@ -9218,16 +4929,6 @@ 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_E7B8_x0213[] = {
- 0xD433, 0x316F, 0, 0, 0x466C, 0x654F, 0, 0,
- 0x7A30, 0x6556, 0x6550, 0x6557, 0, 0, 0, 0,
- 0xF451, 0x7A31, 0x6553, 0, 0, 0x7A32, 0, 0xF452,
- 0, 0, 0, 0x477B, 0xD444, 0xF453, 0x3C4A, 0x6555,
- 0xF454, 0x6552, 0x6558, 0x6551, 0, 0, 0x3D44, 0xF455,
- 0x7A2F, 0, 0, 0x4B25, 0xF456, 0xD44A, 0x3D4C, 0xD44B,
- 0, 0x6554, 0x6560, 0xD44C, 0, 0x655C, 0xD44D, 0x655F,
- 0, 0x655D, 0x6561, 0x655B, 0, 0x6541, 0x4053, 0xD44E,
-};
static const unsigned short utf8_to_euc_E7B9[] = {
0, 0x484B, 0, 0x655E, 0xD44F, 0xD450, 0x6559, 0xD451,
0, 0, 0x4121, 0x3752, 0, 0x3D2B, 0xD452, 0,
@@ -9238,16 +4939,6 @@ 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_E7B9_x0213[] = {
- 0, 0x484B, 0, 0x655E, 0xD44F, 0xF457, 0x6559, 0x7A34,
- 0, 0, 0x4121, 0x3752, 0, 0x3D2B, 0xD452, 0,
- 0xD453, 0, 0x7A35, 0, 0x3F25, 0x4136, 0x6564, 0,
- 0xD455, 0x6566, 0x6567, 0, 0, 0x6563, 0x6565, 0xD456,
- 0, 0x7A36, 0xD458, 0, 0, 0xD459, 0x655A, 0x6562,
- 0, 0x656A, 0x6569, 0x7E7E, 0, 0x4B7A, 0xD45B, 0xD45C,
- 0x372B, 0, 0, 0xF458, 0, 0xF459, 0, 0,
- 0xD45E, 0x6568, 0, 0x656C, 0x656B, 0x656F, 0xF45A, 0x6571,
-};
static const unsigned short utf8_to_euc_E7BA[] = {
0, 0xD460, 0x3B3C, 0x656D, 0, 0, 0xD461, 0xD462,
0x6572, 0x6573, 0xD463, 0, 0x6574, 0xD464, 0x657A, 0x453B,
@@ -9258,16 +4949,6 @@ 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_E7BA_x0213[] = {
- 0, 0xD460, 0x3B3C, 0x656D, 0, 0, 0xF45B, 0xF45C,
- 0x6572, 0x6573, 0x7A37, 0, 0x6574, 0x7A38, 0x657A, 0x453B,
- 0x6576, 0xF45E, 0x6575, 0x6577, 0x6578, 0xD466, 0x6579, 0,
- 0xF45F, 0, 0xF460, 0x657B, 0x657C, 0xD469, 0xD46A, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E7BC[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -9278,16 +4959,6 @@ 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_E7BC_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x344C, 0,
- 0x657D, 0, 0x657E, 0xF463, 0xF462, 0xD46D, 0xF464, 0xD46F,
-};
static const unsigned short utf8_to_euc_E7BD[] = {
0, 0, 0, 0xD470, 0xD471, 0x6621, 0, 0xD472,
0, 0, 0, 0, 0x6622, 0x6623, 0x6624, 0xD473,
@@ -9298,16 +4969,6 @@ 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_E7BD_x0213[] = {
- 0, 0, 0, 0xF465, 0xF466, 0x6621, 0, 0x7A39,
- 0, 0, 0, 0, 0x6622, 0x6623, 0x6624, 0xF467,
- 0x6625, 0x6626, 0xF46A, 0xD475, 0x6628, 0x6627, 0, 0,
- 0x6629, 0, 0, 0xD476, 0xD477, 0xD478, 0, 0x662A,
- 0x662B, 0xF46C, 0, 0xF46D, 0xF46E, 0xD47C, 0xD47D, 0x662E,
- 0x662C, 0x662D, 0x3A61, 0x3753, 0, 0xF46F, 0x4356, 0,
- 0x4833, 0xD521, 0x3D70, 0, 0, 0x474D, 0, 0x486D,
- 0x662F, 0x586D, 0, 0, 0, 0xF470, 0xF471, 0xD524,
-};
static const unsigned short utf8_to_euc_E7BE[] = {
0xD525, 0, 0x6630, 0x6632, 0, 0x4D65, 0x6631, 0x6634,
0x6633, 0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
@@ -9318,16 +4979,6 @@ 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_E7BE_x0213[] = {
- 0xD525, 0, 0x6630, 0x6632, 0, 0x4D65, 0x6631, 0x6634,
- 0x6633, 0, 0x4D53, 0xD526, 0x6635, 0xD527, 0x487E, 0xD528,
- 0xF473, 0x7A3B, 0, 0, 0x6636, 0, 0xF476, 0x7A3C,
- 0, 0, 0x6639, 0, 0xF477, 0x6638, 0x6637, 0,
- 0, 0xD52E, 0xD52F, 0x663A, 0x3732, 0, 0xD530, 0,
- 0x4122, 0x3541, 0xD531, 0, 0, 0xF478, 0x663E, 0x663B,
- 0, 0, 0x663C, 0, 0xD533, 0, 0x663F, 0,
- 0x6640, 0x663D, 0, 0, 0xD534, 0x3129, 0, 0x7A3D,
-};
static const unsigned short utf8_to_euc_E7BF[] = {
0xD536, 0x3227, 0, 0xD537, 0, 0x6642, 0x6643, 0,
0xD538, 0, 0x6644, 0, 0x4D62, 0, 0xD539, 0xD53A,
@@ -9338,16 +4989,6 @@ 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_E7BF_x0213[] = {
- 0xD536, 0x3227, 0, 0xF47A, 0, 0x6642, 0x6643, 0,
- 0xD538, 0, 0x6644, 0, 0x4D62, 0, 0x7A3E, 0xF47B,
- 0, 0, 0x3D2C, 0, 0x6646, 0x6645, 0, 0,
- 0, 0, 0, 0x7A3F, 0, 0, 0, 0x7A40,
- 0x3F69, 0x6647, 0, 0xF47C, 0, 0xF47D, 0x6648, 0,
- 0xD53F, 0x6649, 0, 0x3465, 0x7A41, 0, 0x7A42, 0xF47E,
- 0x344D, 0, 0xF521, 0x664A, 0, 0, 0, 0,
- 0, 0x664B, 0x7A43, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
-};
static const unsigned short utf8_to_euc_E880[] = {
0x4D54, 0x4F37, 0, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
0xD549, 0, 0xD54A, 0x664F, 0x3C29, 0xD54B, 0xD54C, 0xD54D,
@@ -9358,16 +4999,6 @@ 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_E880_x0213[] = {
- 0x4D54, 0x4F37, 0xF522, 0x394D, 0x664E, 0x3C54, 0x664D, 0xD548,
- 0xF524, 0, 0xF523, 0x664F, 0x3C29, 0xD54B, 0xF525, 0xD54D,
- 0x4251, 0xF526, 0x6650, 0xD54F, 0x7A45, 0x394C, 0xF527, 0x4C57,
- 0x6651, 0x6652, 0, 0, 0x6653, 0xD552, 0xD553, 0xD554,
- 0xD555, 0x6654, 0, 0, 0xF528, 0, 0x7A46, 0,
- 0x6655, 0, 0, 0, 0xF529, 0, 0xD559, 0,
- 0xF52A, 0, 0, 0x3C2A, 0xD55B, 0x7A47, 0x4C6D, 0x7A48,
- 0, 0xD55E, 0xD55F, 0x6657, 0x7A49, 0x433F, 0xD561, 0x6656,
-};
static const unsigned short utf8_to_euc_E881[] = {
0xD562, 0, 0, 0, 0xD563, 0, 0x6659, 0,
0, 0, 0x6658, 0, 0, 0, 0, 0,
@@ -9378,16 +5009,6 @@ 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_E881_x0213[] = {
- 0xD562, 0, 0, 0xF52B, 0xD563, 0, 0x6659, 0,
- 0, 0, 0x6658, 0, 0, 0, 0, 0,
- 0, 0, 0x665A, 0, 0, 0, 0x403B, 0,
- 0x665B, 0, 0x665C, 0, 0, 0, 0x4A39, 0x665D,
- 0xD564, 0x416F, 0x665E, 0, 0xD565, 0, 0xF52C, 0,
- 0x665F, 0, 0, 0, 0, 0xD567, 0, 0x4E7E,
- 0x6662, 0xF52D, 0x6661, 0x6660, 0x4430, 0xF52E, 0x6663, 0x3F26,
- 0, 0x6664, 0, 0xF52F, 0, 0x6665, 0x4F38, 0x6666,
-};
static const unsigned short utf8_to_euc_E882[] = {
0, 0xD56A, 0, 0, 0x6667, 0x6669, 0x6668, 0x4825,
0xD56B, 0x4679, 0, 0x4F3E, 0x4829, 0, 0xD56C, 0,
@@ -9398,16 +5019,6 @@ 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_E882_x0213[] = {
- 0, 0xD56A, 0, 0, 0x6667, 0x6669, 0x6668, 0x4825,
- 0xD56B, 0x4679, 0, 0x4F3E, 0x4829, 0, 0xD56C, 0,
- 0, 0, 0, 0x666B, 0, 0, 0x3E53, 0,
- 0x492A, 0xF530, 0x666C, 0x666A, 0xF531, 0x344E, 0xD56E, 0,
- 0, 0x3854, 0x3B68, 0, 0xF532, 0x486E, 0xD56F, 0xF533,
- 0, 0x382A, 0x4B43, 0xD571, 0x666F, 0x666D, 0, 0x394E,
- 0, 0x394F, 0x3069, 0, 0x3A68, 0, 0, 0,
- 0xF534, 0xD573, 0x4759, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E883[] = {
0, 0, 0, 0x305F, 0x6674, 0, 0x4340, 0,
0xD574, 0, 0, 0, 0x4758, 0xD575, 0x425B, 0xD576,
@@ -9418,16 +5029,6 @@ 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_E883_x0213[] = {
- 0, 0, 0, 0x305F, 0x6674, 0xF536, 0x4340, 0,
- 0xD574, 0, 0x7A4A, 0, 0x4758, 0xD575, 0x425B, 0xD576,
- 0, 0, 0xD577, 0, 0xD578, 0xF537, 0x6676, 0x7A4B,
- 0xF538, 0x6672, 0x6675, 0x6670, 0, 0x6673, 0x4B26, 0,
- 0x7A4C, 0x3855, 0, 0, 0x307D, 0x6671, 0xF539, 0,
- 0, 0, 0, 0, 0, 0xD57D, 0xD57E, 0x6678,
- 0xD621, 0x6679, 0xD622, 0x7A4D, 0x4639, 0xF53C, 0xD624, 0,
- 0x363B, 0xD625, 0xD626, 0xF53D, 0x6726, 0x473D, 0xD627, 0,
-};
static const unsigned short utf8_to_euc_E884[] = {
0, 0, 0x3B69, 0xD628, 0, 0x363C, 0x4048, 0x4F46,
0x4C2E, 0x6677, 0x4054, 0xD629, 0, 0, 0, 0,
@@ -9438,16 +5039,6 @@ 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_E884_x0213[] = {
- 0, 0, 0x3B69, 0xD628, 0, 0x363C, 0x4048, 0x4F46,
- 0x4C2E, 0x6677, 0x4054, 0xD629, 0, 0xF53B, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF540, 0xD62B,
- 0x7A4E, 0, 0x3553, 0x667A, 0xD62D, 0, 0xF541, 0,
- 0xD62F, 0, 0, 0x667C, 0xF543, 0, 0, 0xF544,
- 0, 0x667B, 0, 0, 0xF545, 0, 0, 0x667D,
- 0xD633, 0x4326, 0, 0x473E, 0, 0xF53F, 0, 0,
- 0, 0x4431, 0xD635, 0, 0xD636, 0xF547, 0x6723, 0,
-};
static const unsigned short utf8_to_euc_E885[] = {
0, 0, 0, 0, 0, 0xD637, 0x6722, 0xD638,
0, 0, 0xD639, 0x667E, 0xD63A, 0, 0x3F55, 0,
@@ -9458,16 +5049,6 @@ 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_E885_x0213[] = {
- 0, 0, 0, 0, 0, 0xD637, 0x6722, 0xD638,
- 0, 0, 0x7A4F, 0x667E, 0xD63A, 0, 0x3F55, 0,
- 0x4965, 0x6725, 0xD63B, 0x6724, 0x3950, 0x4F53, 0, 0xD63C,
- 0, 0, 0, 0, 0, 0, 0, 0x6735,
- 0x7A50, 0xD63E, 0, 0, 0, 0x6729, 0x672A, 0x7A51,
- 0x7A52, 0xF549, 0, 0x3C70, 0, 0x7A53, 0x6728, 0xD643,
- 0x3978, 0x6727, 0, 0, 0x672B, 0, 0, 0xD644,
- 0x4432, 0x4A22, 0x4123, 0, 0, 0, 0, 0x425C,
-};
static const unsigned short utf8_to_euc_E886[] = {
0x672F, 0xD645, 0x6730, 0x672C, 0xD647, 0xD648, 0xD649, 0,
0x672D, 0, 0x672E, 0xD64A, 0, 0, 0xD64B, 0x3951,
@@ -9478,16 +5059,6 @@ 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_E886_x0213[] = {
- 0x672F, 0xF54B, 0x6730, 0x672C, 0xF54D, 0xF54E, 0xD649, 0,
- 0x672D, 0, 0x672E, 0xD64A, 0, 0, 0xD64B, 0x3951,
- 0xD646, 0, 0, 0x6736, 0, 0x6732, 0xD64C, 0,
- 0xF550, 0, 0x4966, 0xD64E, 0x4B6C, 0x4928, 0xD64F, 0,
- 0x6731, 0, 0xD650, 0x6734, 0x6733, 0, 0, 0,
- 0x4B44, 0x6737, 0, 0, 0, 0, 0xD651, 0,
- 0x6738, 0, 0xF551, 0x4137, 0xD653, 0x6739, 0, 0,
- 0x673B, 0, 0x673F, 0x7A54, 0, 0x673C, 0x673A, 0x473F,
-};
static const unsigned short utf8_to_euc_E887[] = {
0x673D, 0, 0x673E, 0xD656, 0, 0xD657, 0x3232, 0,
0x6745, 0x6740, 0xD658, 0xD655, 0, 0x6741, 0xD659, 0xD65A,
@@ -9498,16 +5069,6 @@ 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_E887_x0213[] = {
- 0x673D, 0xF552, 0x673E, 0xF553, 0, 0xD657, 0x3232, 0,
- 0x6745, 0x6740, 0x7A55, 0xD655, 0, 0x6741, 0xD659, 0x7A56,
- 0, 0x6742, 0, 0x4221, 0, 0xD65B, 0xF554, 0x7A57,
- 0x6744, 0x6743, 0x6746, 0xF555, 0, 0xD65E, 0xD65F, 0x6747,
- 0x6748, 0xD660, 0, 0x3F43, 0xF557, 0x3269, 0, 0x6749,
- 0x4E57, 0, 0x3C2B, 0xD662, 0xF559, 0x3D2D, 0, 0,
- 0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668, 0,
- 0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xF55B, 0x674C, 0xF55C,
-};
static const unsigned short utf8_to_euc_E888[] = {
0xD66D, 0x674D, 0x674E, 0xD66E, 0, 0x674F, 0, 0x6750,
0x363D, 0x5A2A, 0x6751, 0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
@@ -9518,16 +5079,6 @@ 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_E888_x0213[] = {
- 0xD66D, 0x674D, 0x674E, 0xD66E, 0xF55E, 0x674F, 0, 0x6750,
- 0x363D, 0x5A2A, 0x6751, 0, 0x4065, 0x6752, 0x3C4B, 0xD66F,
- 0x6753, 0, 0x5030, 0xD670, 0xD671, 0, 0x6754, 0x4A5E,
- 0x345C, 0xF560, 0xD673, 0x4124, 0x3D58, 0xD674, 0x4971, 0x3D2E,
- 0, 0xF561, 0xF562, 0, 0, 0, 0, 0,
- 0xD677, 0x6755, 0x3952, 0x6756, 0x484C, 0, 0x6764, 0,
- 0, 0, 0xF564, 0x6758, 0xF565, 0x4249, 0x4775, 0x383F,
- 0x6757, 0x4125, 0xD67A, 0, 0xF566, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E889[] = {
0x6759, 0, 0, 0xD67B, 0xD67C, 0xD67D, 0xD67E, 0x447A,
0, 0, 0, 0xD721, 0, 0, 0xD722, 0xD723,
@@ -9538,16 +5089,6 @@ 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_E889_x0213[] = {
- 0x6759, 0, 0, 0xD67B, 0xD67C, 0xF569, 0xF567, 0x447A,
- 0, 0xF568, 0, 0xF56B, 0, 0, 0xD722, 0xF56D,
- 0, 0xD724, 0, 0, 0, 0, 0xD725, 0xF56F,
- 0x675B, 0x675A, 0x675D, 0, 0xF571, 0x675C, 0, 0x675E,
- 0x7A5B, 0, 0x6760, 0xF572, 0x675F, 0, 0x344F, 0xD729,
- 0x6761, 0, 0x6762, 0x6763, 0, 0xD72A, 0x3A31, 0x4E49,
- 0, 0x6765, 0x3F27, 0, 0x7A5C, 0, 0x3170, 0x6766,
- 0x6767, 0xF576, 0, 0xD72C, 0, 0xF578, 0x6768, 0xF579,
-};
static const unsigned short utf8_to_euc_E88A[] = {
0xD72F, 0xD730, 0, 0xD731, 0xD732, 0, 0, 0xD733,
0, 0xD734, 0xD735, 0x3072, 0, 0x6769, 0xD736, 0,
@@ -9558,16 +5099,6 @@ 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_E88A_x0213[] = {
- 0xD72F, 0xD730, 0, 0xF57A, 0xD732, 0, 0, 0xD733,
- 0, 0xD734, 0xF57B, 0x3072, 0, 0x6769, 0x7A5E, 0,
- 0, 0xD737, 0x676A, 0xF57C, 0xD738, 0, 0xD739, 0,
- 0xD73A, 0x4967, 0xD73B, 0xD73C, 0, 0x3C47, 0, 0x676C,
- 0xD73D, 0x7A5F, 0, 0x7A60, 0x7A61, 0x3329, 0x3032, 0xF57D,
- 0xF57E, 0x7A62, 0xD744, 0x676B, 0x676E, 0x474E, 0x7A63, 0x3F44,
- 0xD746, 0x3256, 0xF621, 0x4B27, 0xF622, 0, 0, 0x7A64,
- 0x375D, 0x365C, 0xF623, 0x676D, 0xF624, 0x326A, 0x7A65, 0x7A66,
-};
static const unsigned short utf8_to_euc_E88B[] = {
0, 0, 0, 0, 0, 0x3423, 0xD74E, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -9578,16 +5109,6 @@ 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_E88B_x0213[] = {
- 0, 0, 0, 0, 0, 0x3423, 0x7A67, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xD74F, 0x3171, 0x6772, 0x4E6A, 0x425D, 0x7A68, 0, 0x4944,
- 0, 0x677E, 0xD751, 0x3257, 0x677C, 0, 0x677A, 0x6771,
- 0xD752, 0x676F, 0xF625, 0x6770, 0xD754, 0x3C63, 0x366C, 0x4377,
- 0xF626, 0, 0xD756, 0x4651, 0, 0xD757, 0, 0xD758,
- 0, 0x3151, 0, 0x6774, 0x6773, 0, 0xD759, 0xF627,
- 0, 0x6779, 0x6775, 0x6778, 0, 0x7A69, 0x7A6A, 0,
-};
static const unsigned short utf8_to_euc_E88C[] = {
0xD75D, 0xD75E, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xD75F,
0xD760, 0x677D, 0xD761, 0xD762, 0, 0, 0x3754, 0,
@@ -9598,16 +5119,6 @@ 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_E88C_x0213[] = {
- 0x7A6B, 0x7A6C, 0x4C50, 0x6777, 0x3258, 0x337D, 0x677B, 0xF628,
- 0xF629, 0x677D, 0xD761, 0xD762, 0xF62A, 0, 0x3754, 0,
- 0, 0, 0, 0, 0, 0, 0x6823, 0x682C,
- 0x682D, 0, 0, 0xF62C, 0x302B, 0xF62D, 0xD766, 0xD767,
- 0, 0xD768, 0x7A6E, 0x6834, 0, 0, 0, 0,
- 0x3071, 0, 0, 0x682B, 0xD76A, 0x7A6F, 0xD76C, 0x682A,
- 0xF62E, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
- 0x427B, 0x6827, 0x7A70, 0, 0xF62F, 0xD772, 0, 0,
-};
static const unsigned short utf8_to_euc_E88D[] = {
0x6826, 0, 0xD773, 0xD774, 0xD775, 0x6829, 0, 0xD776,
0, 0x4170, 0x3755, 0, 0, 0xD777, 0xD778, 0x3141,
@@ -9618,16 +5129,6 @@ 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_E88D_x0213[] = {
- 0x6826, 0, 0xD773, 0x7A71, 0xF630, 0x6829, 0, 0x7A72,
- 0, 0x4170, 0x3755, 0, 0, 0xD777, 0xD778, 0x3141,
- 0x6828, 0x7A73, 0x3953, 0xD83E, 0xF62B, 0x7A74, 0xD77B, 0xF631,
- 0x4171, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x7A6D, 0xAE4A, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0xD77D, 0, 0, 0x683A, 0, 0x683B, 0, 0x3259,
- 0xD77E, 0, 0, 0x322E, 0x6838, 0x7A75, 0, 0xF633,
-};
static const unsigned short utf8_to_euc_E88E[] = {
0xD823, 0, 0xD824, 0, 0xD825, 0x682E, 0xD826, 0x6836,
0, 0x683D, 0x6837, 0, 0, 0xD827, 0x6835, 0,
@@ -9638,16 +5139,6 @@ 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_E88E_x0213[] = {
- 0xD823, 0, 0xD824, 0, 0xD825, 0x682E, 0x7A76, 0x6836,
- 0, 0x683D, 0x6837, 0, 0, 0xF636, 0x6835, 0,
- 0, 0, 0x7A77, 0x6776, 0xF637, 0xF638, 0x6833, 0,
- 0x7A78, 0xD82C, 0x682F, 0xF639, 0xD82E, 0xF63A, 0x3450, 0x6831,
- 0x683C, 0, 0x6832, 0, 0, 0, 0xD830, 0x7A79,
- 0x683E, 0x7A7A, 0x6830, 0x477C, 0xD833, 0xD84C, 0, 0,
- 0, 0x4D69, 0, 0, 0, 0x6839, 0, 0,
- 0, 0, 0, 0, 0, 0x684F, 0xD834, 0x7A7B,
-};
static const unsigned short utf8_to_euc_E88F[] = {
0xD836, 0x6847, 0, 0, 0, 0x3F7B, 0, 0xD837,
0, 0xD838, 0x3546, 0, 0x365D, 0, 0x6842, 0xD839,
@@ -9658,16 +5149,6 @@ 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_E88F_x0213[] = {
- 0x7A7C, 0x6847, 0, 0, 0, 0x3F7B, 0, 0x7A7D,
- 0, 0xF63B, 0x3546, 0, 0x365D, 0, 0x6842, 0x7A7E,
- 0xF63C, 0x7B21, 0, 0x325B, 0xF63D, 0, 0x3E54, 0,
- 0x6845, 0, 0, 0, 0x3A5A, 0xF63E, 0, 0x4551,
- 0x684A, 0x7B22, 0, 0, 0, 0xF63F, 0, 0,
- 0xD83F, 0x4A6E, 0x7B23, 0x6841, 0, 0, 0, 0x325A,
- 0x3856, 0x4929, 0x684B, 0, 0x683F, 0, 0xD841, 0x6848,
- 0xD842, 0xF640, 0, 0x6852, 0xD844, 0x6843, 0, 0,
-};
static const unsigned short utf8_to_euc_E890[] = {
0, 0xD845, 0, 0x6844, 0x463A, 0, 0xD846, 0x6849,
0, 0, 0xD847, 0x6846, 0x4B28, 0x684C, 0x3060, 0xD848,
@@ -9678,16 +5159,6 @@ 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_E890_x0213[] = {
- 0, 0x7B24, 0, 0x6844, 0x463A, 0, 0x7B25, 0x6849,
- 0, 0, 0x7B26, 0x6846, 0x4B28, 0x684C, 0x3060, 0xF641,
- 0, 0xF642, 0, 0x6840, 0, 0xF643, 0, 0xF645,
- 0, 0xD84B, 0, 0, 0, 0, 0, 0,
- 0x684E, 0, 0x684D, 0, 0, 0, 0, 0,
- 0, 0x476B, 0x6854, 0, 0x685F, 0, 0, 0xD84D,
- 0, 0x337E, 0, 0, 0, 0x6862, 0, 0,
- 0x6850, 0xF646, 0, 0, 0x6855, 0x4D6E, 0, 0,
-};
static const unsigned short utf8_to_euc_E891[] = {
0, 0, 0, 0, 0, 0xD84F, 0x685E, 0xD850,
0xD851, 0x4D55, 0xD852, 0, 0, 0xD853, 0x4E2A, 0xD854,
@@ -9698,16 +5169,6 @@ 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_E891_x0213[] = {
- 0, 0, 0, 0, 0, 0xD84F, 0x685E, 0xD850,
- 0x7B28, 0x4D55, 0xF647, 0, 0, 0xD853, 0x4E2A, 0xF648,
- 0, 0xF649, 0xF64A, 0, 0, 0, 0xD857, 0x4378,
- 0xD858, 0xF64B, 0xF64C, 0x336B, 0xF64D, 0, 0, 0x7B29,
- 0xD85C, 0x4972, 0x6864, 0x4621, 0xD85D, 0xF64F, 0x3031, 0xD85F,
- 0, 0x685D, 0xD860, 0x6859, 0x4172, 0x6853, 0x685B, 0x6860,
- 0x7B2A, 0x472C, 0, 0x7B2B, 0xD863, 0x302A, 0xF650, 0x6858,
- 0xF651, 0x6861, 0x4978, 0, 0xF652, 0xD867, 0, 0,
-};
static const unsigned short utf8_to_euc_E892[] = {
0, 0xD868, 0x685C, 0, 0x6857, 0xD869, 0, 0,
0, 0, 0, 0x3E55, 0, 0, 0, 0,
@@ -9718,16 +5179,6 @@ 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_E892_x0213[] = {
- 0, 0xF653, 0x685C, 0, 0x6857, 0x7B2C, 0, 0,
- 0, 0, 0, 0x3E55, 0, 0, 0, 0,
- 0x3D2F, 0, 0xD86A, 0xD86B, 0x3C2C, 0xD86C, 0, 0xF656,
- 0, 0x4C58, 0, 0, 0x4947, 0, 0x7B2D, 0x6867,
- 0, 0x6870, 0, 0, 0, 0, 0xF657, 0,
- 0xD86F, 0xD870, 0xD871, 0, 0, 0x685A, 0, 0x7B2E,
- 0, 0xD873, 0x3377, 0, 0x7B2F, 0, 0, 0,
- 0x3E78, 0x6865, 0x7B30, 0x686A, 0x4173, 0xD876, 0xF658, 0x6866,
-};
static const unsigned short utf8_to_euc_E893[] = {
0xD878, 0x686D, 0xD879, 0, 0x435F, 0, 0x686E, 0xD87A,
0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869, 0, 0xD87D,
@@ -9738,16 +5189,6 @@ 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_E893_x0213[] = {
- 0x7B31, 0x686D, 0x7B32, 0, 0x435F, 0, 0x686E, 0xD87A,
- 0xD87B, 0x4D56, 0x6863, 0x3338, 0xD87C, 0x6869, 0xF65A, 0xF65B,
- 0x686C, 0x4C2C, 0, 0xF65C, 0, 0, 0x686F, 0,
- 0, 0x6868, 0x686B, 0, 0xF655, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0xF65E,
- 0, 0, 0xF65F, 0, 0x4B29, 0, 0x4F21, 0xF660,
- 0xF661, 0xF662, 0xD927, 0, 0x6873, 0, 0, 0xD928,
- 0, 0, 0xF663, 0xD92B, 0x687A, 0xF664, 0, 0x6872,
-};
static const unsigned short utf8_to_euc_E894[] = {
0x3C43, 0, 0xD92D, 0xD92E, 0, 0, 0x6851, 0xD92F,
0, 0, 0, 0, 0xD930, 0, 0xD931, 0,
@@ -9758,16 +5199,6 @@ 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_E894_x0213[] = {
- 0x3C43, 0, 0xD92D, 0xD92E, 0, 0, 0x6851, 0xD92F,
- 0, 0, 0, 0, 0xF665, 0, 0xD931, 0,
- 0xD932, 0x4A4E, 0, 0x4C22, 0x6879, 0x6878, 0, 0x6874,
- 0x6875, 0, 0x3136, 0xF666, 0xD933, 0, 0x7B35, 0x6877,
- 0, 0x6871, 0xD935, 0x7B36, 0xF667, 0xF668, 0x4455, 0xD939,
- 0, 0, 0xD93A, 0xF669, 0x6876, 0x307E, 0, 0x7B37,
- 0, 0, 0x7B34, 0xD93D, 0xF66A, 0x4222, 0xD93F, 0,
- 0, 0, 0, 0, 0, 0x4A43, 0xF66F, 0xD940,
-};
static const unsigned short utf8_to_euc_E895[] = {
0x687B, 0x6921, 0, 0x4859, 0, 0, 0xD941, 0,
0x687E, 0x3E56, 0x3C49, 0x6923, 0, 0, 0x363E, 0xD942,
@@ -9778,16 +5209,6 @@ 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_E895_x0213[] = {
- 0x687B, 0x6921, 0, 0x4859, 0, 0, 0xD941, 0,
- 0x687E, 0x3E56, 0x3C49, 0x6923, 0, 0, 0x363E, 0xF66B,
- 0xD943, 0xF670, 0xD945, 0xF671, 0, 0x6924, 0xD947, 0x4979,
- 0x687D, 0x7B38, 0x6856, 0, 0xD949, 0xD94A, 0xF672, 0xD94C,
- 0xD94D, 0xF673, 0xF674, 0x687C, 0x7B39, 0, 0, 0,
- 0x4F4F, 0x4622, 0x4973, 0xD951, 0, 0x692B, 0, 0xF66C,
- 0, 0, 0, 0, 0, 0, 0, 0x6931,
- 0, 0xD953, 0x7B3C, 0xF676, 0, 0xF677, 0x6932, 0xF678,
-};
static const unsigned short utf8_to_euc_E896[] = {
0x6925, 0xD958, 0, 0, 0x4776, 0xD959, 0xD95A, 0x692F,
0x6927, 0xD95B, 0x6929, 0xD95C, 0xD95D, 0, 0, 0xD95E,
@@ -9798,16 +5219,6 @@ 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_E896_x0213[] = {
- 0x6925, 0xF679, 0, 0, 0x4776, 0xD959, 0xF67A, 0x692F,
- 0x6927, 0xD95B, 0x6929, 0xD95C, 0x7B3D, 0, 0, 0x7B3E,
- 0x6933, 0x6928, 0, 0xF67B, 0x692C, 0, 0, 0x3172,
- 0xD960, 0x4665, 0, 0x692D, 0x6930, 0xF67C, 0, 0xF67D,
- 0xD963, 0, 0x7B3F, 0, 0x6926, 0xD965, 0x4126, 0xD966,
- 0x692A, 0x3B27, 0x3F45, 0x3730, 0x4C74, 0x7B3B, 0x4C79, 0x3D72,
- 0x7B40, 0, 0, 0, 0xD967, 0, 0xD968, 0xF723,
- 0xD96A, 0x6937, 0x6935, 0, 0xF724, 0xD96C, 0xD96D, 0xD96E,
-};
static const unsigned short utf8_to_euc_E897[] = {
0, 0x4F4E, 0xD96F, 0, 0, 0, 0, 0xD970,
0, 0x6934, 0xD971, 0xD972, 0, 0x4D75, 0xD973, 0x6936,
@@ -9818,16 +5229,6 @@ 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_E897_x0213[] = {
- 0, 0x4F4E, 0xD96F, 0, 0, 0, 0, 0xF725,
- 0, 0x6934, 0xF726, 0x7B41, 0, 0x4D75, 0x7B42, 0x6936,
- 0x6938, 0, 0, 0, 0, 0x6939, 0, 0,
- 0xF727, 0xF728, 0xD976, 0, 0x693C, 0x693A, 0, 0xF729,
- 0xD978, 0xF72A, 0, 0, 0x4623, 0x693B, 0xF72B, 0,
- 0xD97A, 0x484D, 0x692E, 0, 0, 0x7B43, 0, 0,
- 0, 0, 0, 0xD97C, 0, 0, 0xF72C, 0x3D73,
- 0, 0x693D, 0x6942, 0x4174, 0xD97E, 0, 0x6941, 0x7B45,
-};
static const unsigned short utf8_to_euc_E898[] = {
0xDA22, 0, 0x6922, 0, 0xDA23, 0xDA24, 0x6943, 0x4149,
0, 0, 0x693E, 0x6940, 0, 0xDA25, 0xDA26, 0,
@@ -9838,16 +5239,6 @@ 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_E898_x0213[] = {
- 0xF72D, 0, 0x6922, 0, 0x7B46, 0x7B47, 0x6943, 0x4149,
- 0, 0, 0x693E, 0x6940, 0, 0xDA25, 0xDA26, 0,
- 0x7B48, 0xF72E, 0x7B44, 0x693F, 0, 0, 0x5D31, 0x5D22,
- 0x7B4A, 0xDA2B, 0x6945, 0xDA2C, 0, 0, 0xF72F, 0,
- 0, 0xF730, 0x6944, 0, 0xF731, 0, 0, 0xF732,
- 0, 0x7B4B, 0, 0, 0, 0x4D76, 0, 0x623C,
- 0x6946, 0, 0, 0, 0, 0, 0xDA31, 0,
- 0x7B4C, 0xF734, 0xDA33, 0, 0xF735, 0xDA35, 0, 0x6947,
-};
static const unsigned short utf8_to_euc_E899[] = {
0xDA36, 0xB866, 0xDA37, 0, 0, 0, 0xDA38, 0,
0, 0, 0, 0, 0, 0x6948, 0x3857, 0,
@@ -9858,16 +5249,6 @@ 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_E899_x0213[] = {
- 0xF737, 0x2F68, 0xDA37, 0, 0, 0, 0xDA38, 0,
- 0, 0, 0, 0, 0, 0x6948, 0x3857, 0,
- 0x3554, 0, 0xDA39, 0xF739, 0x694A, 0x515D, 0xF73A, 0x7B4D,
- 0xDA3D, 0xDA3E, 0x3575, 0x7B4E, 0x4E3A, 0xDA3F, 0x3673, 0x694B,
- 0xDA40, 0xDA41, 0x7B50, 0xDA43, 0xDA44, 0, 0, 0x694C,
- 0, 0xDA45, 0, 0x436E, 0x7B52, 0, 0, 0xF73B,
- 0, 0x694D, 0, 0, 0, 0x7B53, 0xDA49, 0xF73C,
- 0, 0x467A, 0xF73D, 0x303A, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E89A[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0xDA6D, 0, 0x3263, 0x6952, 0x6953, 0xDA4C, 0, 0,
@@ -9878,16 +5259,6 @@ 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_E89A_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0xF73E,
- 0xDA6D, 0xF73F, 0x3263, 0x6952, 0x6953, 0xF740, 0, 0,
- 0, 0xF741, 0, 0x694E, 0, 0x3B3D, 0xDA4E, 0,
- 0x7B54, 0, 0xDA50, 0, 0xF742, 0xF743, 0, 0,
- 0, 0xDA52, 0, 0x694F, 0x4742, 0, 0xDA53, 0xDA54,
- 0xF744, 0x6950, 0x6951, 0x695B, 0, 0xDA56, 0, 0x6955,
- 0x6958, 0xF746, 0, 0xF747, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
- 0x7B55, 0xDA5D, 0, 0, 0, 0, 0, 0xDA5E,
-};
static const unsigned short utf8_to_euc_E89B[] = {
0xDA5F, 0xDA60, 0, 0xDA61, 0x6956, 0xDA62, 0x6957, 0x3C58,
0, 0x6959, 0, 0x4341, 0, 0x3756, 0x3342, 0,
@@ -9898,16 +5269,6 @@ 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_E89B_x0213[] = {
- 0xDA5F, 0xF748, 0, 0xF749, 0x6956, 0xDA62, 0x6957, 0x3C58,
- 0, 0x6959, 0, 0x4341, 0, 0x3756, 0x3342, 0,
- 0, 0xF74A, 0xDA64, 0, 0x695C, 0xF74B, 0, 0xF74C,
- 0, 0x333F, 0xDA67, 0x6961, 0xDA68, 0, 0x695D, 0x6960,
- 0xDA69, 0, 0, 0xF74D, 0x483A, 0xDA6B, 0xF74E, 0xDA6C,
- 0, 0x695E, 0, 0, 0x695F, 0x4948, 0x485A, 0x6962,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x427D, 0x696C, 0x7B56, 0x6968, 0x7B57, 0x7B58, 0x326B, 0,
-};
static const unsigned short utf8_to_euc_E89C[] = {
0x6966, 0, 0x4B2A, 0x6967, 0xDA71, 0xDA72, 0x6964, 0xDA73,
0x6965, 0x696A, 0x696D, 0xDA74, 0, 0x696B, 0xDA75, 0xDA76,
@@ -9918,16 +5279,6 @@ 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_E89C_x0213[] = {
- 0x6966, 0, 0x4B2A, 0x6967, 0xDA71, 0xF750, 0x6964, 0xF751,
- 0x6965, 0x696A, 0x696D, 0x7B59, 0, 0x696B, 0xF752, 0xDA76,
- 0xF753, 0x6969, 0x6963, 0xF754, 0xDA79, 0, 0, 0,
- 0x4358, 0xF755, 0x6974, 0, 0x4C2A, 0, 0xDA7B, 0xF756,
- 0, 0xF757, 0, 0xF758, 0, 0x6972, 0, 0,
- 0xDB21, 0x6973, 0, 0, 0, 0, 0xDB22, 0xDB23,
- 0, 0xF759, 0xDB25, 0, 0x696E, 0, 0, 0x6970,
- 0, 0xDB26, 0xF75A, 0x6971, 0xDB28, 0xDB29, 0xF75B, 0x696F,
-};
static const unsigned short utf8_to_euc_E89D[] = {
0xDB2B, 0, 0, 0xDB2C, 0, 0xDB2D, 0, 0,
0, 0x4066, 0, 0x4F39, 0x6978, 0xDB2E, 0x6979, 0,
@@ -9938,16 +5289,6 @@ 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_E89D_x0213[] = {
- 0xF75C, 0, 0, 0xF75D, 0, 0xDB2D, 0, 0,
- 0, 0x4066, 0, 0x4F39, 0x6978, 0xDB2E, 0x6979, 0,
- 0, 0xF75E, 0, 0x6A21, 0, 0x3F2A, 0, 0x697B,
- 0xF75F, 0x697E, 0, 0, 0, 0xDB30, 0, 0x6976,
- 0x6975, 0xDB31, 0, 0x6A22, 0xF760, 0xF761, 0x325C, 0,
- 0x697C, 0, 0x6A23, 0, 0, 0, 0x697D, 0xDB34,
- 0, 0x7B5A, 0xF762, 0, 0x697A, 0, 0x4433, 0,
- 0x6977, 0, 0, 0xDB37, 0xF763, 0, 0, 0x4768,
-};
static const unsigned short utf8_to_euc_E89E[] = {
0, 0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0xDB3C,
0xDB3D, 0xDB3E, 0, 0xDB3F, 0xDB40, 0x4D3B, 0, 0,
@@ -9958,16 +5299,6 @@ 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_E89E_x0213[] = {
- 0, 0, 0x6A27, 0xDB38, 0xDB39, 0xDB3A, 0xDB3B, 0x7B5B,
- 0x7B5C, 0xF767, 0, 0xF768, 0xDB40, 0x4D3B, 0, 0,
- 0xDB41, 0, 0, 0xF769, 0, 0xDB43, 0, 0xDB44,
- 0xDB45, 0xDB46, 0, 0, 0, 0, 0xDB47, 0x6A26,
- 0xF76A, 0, 0x6A25, 0xDB49, 0, 0, 0, 0xF766,
- 0, 0, 0, 0x6A2E, 0x7B5D, 0x7B5E, 0xDB4D, 0x6A28,
- 0, 0xDB4E, 0, 0x6A30, 0, 0x7B5F, 0, 0,
- 0, 0, 0x4D66, 0x6A33, 0, 0x6A2A, 0xF76D, 0xDB51,
-};
static const unsigned short utf8_to_euc_E89F[] = {
0x6A2B, 0xDB52, 0, 0, 0x6A2F, 0, 0x6A32, 0x6A31,
0xDB53, 0xDB54, 0xDB55, 0x6A29, 0, 0, 0xDB56, 0,
@@ -9978,16 +5309,6 @@ 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_E89F_x0213[] = {
- 0x6A2B, 0xF76F, 0, 0, 0x6A2F, 0, 0x6A32, 0x6A31,
- 0xDB53, 0xDB54, 0xDB55, 0x6A29, 0, 0, 0xF770, 0,
- 0x6A2C, 0, 0x6A3D, 0, 0, 0xDB57, 0x7B61, 0,
- 0, 0xDB59, 0xDB5A, 0, 0xDB5B, 0, 0, 0xF772,
- 0x6A36, 0, 0xDB5D, 0xF774, 0xDB5F, 0xF775, 0xF776, 0,
- 0, 0, 0xF777, 0xF778, 0x7B62, 0xF779, 0, 0x6A34,
- 0, 0xDB63, 0x6A35, 0xDB64, 0, 0xF771, 0x6A3A, 0x6A3B,
- 0xDB65, 0x332A, 0xDB66, 0x3542, 0, 0, 0x6A39, 0xDB67,
-};
static const unsigned short utf8_to_euc_E8A0[] = {
0, 0xDB68, 0, 0xDB69, 0, 0x6A24, 0xDB6A, 0xF464,
0, 0xDB6B, 0xDB6C, 0xDB6D, 0, 0x6A38, 0x6A3C, 0x6A37,
@@ -9998,16 +5319,6 @@ 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_E8A0_x0213[] = {
- 0, 0xF77A, 0, 0xF77B, 0, 0x6A24, 0x7B63, 0xF464,
- 0, 0xDB6B, 0x7B64, 0xF77C, 0, 0x6A38, 0x6A3C, 0x6A37,
- 0x7B65, 0x6A3E, 0xDB70, 0xF77D, 0x7B66, 0x6A40, 0x6A3F, 0,
- 0xDB73, 0xDB6F, 0xDB74, 0xDB75, 0xDB76, 0, 0xDB77, 0x7B67,
- 0, 0x6A42, 0x6A41, 0x695A, 0, 0, 0, 0x6A46,
- 0xF77E, 0, 0, 0, 0, 0xDB7A, 0xF821, 0,
- 0xDB7C, 0x6A43, 0xF822, 0, 0, 0xDB7E, 0x6A44, 0,
- 0, 0x6A45, 0xDC21, 0x6A47, 0xF823, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E8A1[] = {
0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30, 0,
0xDC26, 0xDC27, 0xDC28, 0xDC29, 0x3954, 0x5E27, 0xDC2A, 0,
@@ -10018,16 +5329,6 @@ 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_E8A1_x0213[] = {
- 0x376C, 0xDC23, 0x6A49, 0xDC24, 0x6A48, 0xDC25, 0x3D30, 0,
- 0xDC26, 0xDC27, 0xF825, 0xDC29, 0x3954, 0x5E27, 0xDC2A, 0,
- 0, 0xDC2B, 0x6A4A, 0x3D51, 0, 0xDC2C, 0xDC2D, 0x3339,
- 0xF826, 0x6A4B, 0xDC2F, 0x3152, 0xDC30, 0x3E57, 0x6A4C, 0xF827,
- 0xDC32, 0x3955, 0x6A4D, 0x3061, 0xF828, 0, 0, 0,
- 0x493D, 0xF82B, 0, 0x6A4E, 0, 0, 0, 0xF82D,
- 0x3F6A, 0xDC35, 0x6A55, 0, 0, 0x6A52, 0, 0x436F,
- 0, 0xDC36, 0, 0xDC37, 0, 0x6A53, 0x6A50, 0x365E,
-};
static const unsigned short utf8_to_euc_E8A2[] = {
0xDC38, 0x6A4F, 0x6A56, 0, 0, 0, 0, 0,
0x3736, 0, 0, 0x425E, 0, 0x6A5C, 0, 0,
@@ -10038,16 +5339,6 @@ 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_E8A2_x0213[] = {
- 0xDC38, 0x6A4F, 0x6A56, 0, 0, 0, 0, 0,
- 0x3736, 0, 0, 0x425E, 0, 0x6A5C, 0, 0,
- 0, 0, 0x6A58, 0, 0, 0, 0x4235, 0x6A57,
- 0x7B68, 0x6A5A, 0xDC3A, 0xDC3B, 0xDC3C, 0, 0x6A51, 0xDC3D,
- 0xF82E, 0, 0x6A5B, 0, 0x6A5D, 0, 0, 0,
- 0xDC3F, 0, 0x7B69, 0x486F, 0, 0, 0x6A59, 0,
- 0x6A5E, 0x6A60, 0, 0, 0x3853, 0x6A54, 0, 0x3041,
- 0, 0, 0xDC41, 0, 0xF82F, 0xF830, 0xF831, 0x6A5F,
-};
static const unsigned short utf8_to_euc_E8A3[] = {
0xDC44, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175, 0, 0,
0, 0, 0xDC45, 0xDC46, 0xDC47, 0xDC48, 0xDC49, 0x4E22,
@@ -10058,16 +5349,6 @@ 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_E8A3_x0213[] = {
- 0xF832, 0x3A5B, 0x4E76, 0x6A61, 0x6A62, 0x4175, 0, 0,
- 0, 0, 0x7B6A, 0xDC46, 0xDC47, 0xDC48, 0x7B6B, 0x4E22,
- 0, 0xF835, 0xF833, 0xF836, 0x6A63, 0x4D35, 0, 0,
- 0x6A64, 0x6A65, 0, 0xF837, 0x4A64, 0x6A66, 0xDC4E, 0x3A40,
- 0, 0x4E23, 0, 0, 0, 0, 0, 0xDC4F,
- 0x6A6B, 0, 0, 0, 0, 0, 0, 0xDC50,
- 0xF838, 0xF839, 0x6A6C, 0x3E58, 0x6A6A, 0x7B6D, 0, 0xDC54,
- 0x4D67, 0x6A67, 0, 0, 0x6A69, 0x403D, 0x3F7E, 0,
-};
static const unsigned short utf8_to_euc_E8A4[] = {
0, 0xDC55, 0x6A68, 0, 0x6A6D, 0, 0xDC56, 0x4A23,
0, 0, 0x6A6F, 0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
@@ -10078,16 +5359,6 @@ 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_E8A4_x0213[] = {
- 0, 0xF83B, 0x6A68, 0, 0x6A6D, 0, 0xDC56, 0x4A23,
- 0, 0, 0x6A6F, 0, 0x6A6E, 0xDC57, 0xDC58, 0xDC59,
- 0x336C, 0, 0x4B2B, 0x6A70, 0, 0xDC5A, 0xDC5B, 0,
- 0x7B70, 0x7B71, 0x7B72, 0, 0x7B6E, 0x6A7C, 0x6A72, 0,
- 0xDC60, 0, 0, 0, 0, 0x6A73, 0xDC61, 0x7B73,
- 0xDC63, 0, 0x6A74, 0x6A75, 0, 0, 0, 0,
- 0x7B74, 0xDC65, 0x7B75, 0, 0, 0xDC67, 0x6A79, 0xF83D,
- 0x6A7A, 0x7B76, 0xDC69, 0x6A78, 0, 0, 0xDC6A, 0,
-};
static const unsigned short utf8_to_euc_E8A5[] = {
0xDC6B, 0x6A76, 0xDC6C, 0x6A71, 0x6A77, 0xDC6D, 0xDC6E, 0,
0, 0xDC6F, 0, 0, 0x6A7B, 0x7037, 0, 0xDC70,
@@ -10098,16 +5369,6 @@ 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_E8A5_x0213[] = {
- 0x7B77, 0x6A76, 0xF83F, 0x6A71, 0x6A77, 0xF840, 0xDC6E, 0,
- 0, 0xF841, 0, 0, 0x6A7B, 0x7037, 0, 0xDC70,
- 0, 0, 0xDC71, 0, 0, 0, 0x3228, 0xDC72,
- 0, 0, 0xDC73, 0xDC74, 0xDC75, 0, 0x6A7E, 0x365F,
- 0x6A7D, 0xDC76, 0xF844, 0xDC78, 0x6B22, 0, 0x6B21, 0,
- 0, 0, 0x6B24, 0xDC79, 0, 0x6B23, 0xDC7A, 0x6B25,
- 0xDC7B, 0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D, 0, 0x6B27,
- 0, 0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
-};
static const unsigned short utf8_to_euc_E8A6[] = {
0, 0x4D57, 0, 0x6B29, 0, 0, 0x4A24, 0x4746,
0x6B2A, 0xDD24, 0x6B2B, 0x382B, 0, 0xDD25, 0, 0x352C,
@@ -10118,16 +5379,6 @@ 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_E8A6_x0213[] = {
- 0xF845, 0x4D57, 0, 0x6B29, 0, 0, 0x4A24, 0x4746,
- 0x6B2A, 0xF846, 0x6B2B, 0x382B, 0, 0xDD25, 0, 0x352C,
- 0xF847, 0, 0, 0x6B2C, 0x7B78, 0xDD28, 0x3B6B, 0x4741,
- 0x6B2D, 0, 0x3350, 0xDD29, 0xDD2A, 0, 0, 0xF848,
- 0xDD2C, 0x6B2E, 0, 0, 0, 0xDD2D, 0x6B30, 0x4D77,
- 0, 0x6B2F, 0x3F46, 0, 0x6B31, 0, 0, 0x6B32,
- 0xF849, 0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xF84A,
- 0, 0, 0x6B34, 0, 0xDD33, 0x6B35, 0, 0x6B36,
-};
static const unsigned short utf8_to_euc_E8A7[] = {
0x6B37, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -10138,16 +5389,6 @@ 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_E8A7_x0213[] = {
- 0x6B37, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0x3351, 0, 0x7B7A, 0xDD35, 0xF84B, 0xDD37,
- 0xF84C, 0, 0x6B38, 0, 0x6B39, 0x6B3A, 0, 0,
- 0, 0, 0, 0x3272, 0, 0x7B7B, 0x3F28, 0x6B3B,
- 0, 0xDD3A, 0, 0xF84D, 0, 0xDD3C, 0, 0,
- 0, 0xF84F, 0, 0xF850, 0x6B3C, 0, 0x7B7C, 0,
- 0x6B3D, 0xDD40, 0, 0, 0, 0xF851, 0, 0xF852,
-};
static const unsigned short utf8_to_euc_E8A8[] = {
0x3840, 0, 0x447B, 0x6B3E, 0xDD43, 0xDD44, 0, 0xDD45,
0x3757, 0, 0x3F56, 0, 0x6B41, 0, 0x4624, 0xDD46,
@@ -10158,16 +5399,6 @@ 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_E8A8_x0213[] = {
- 0x3840, 0, 0x447B, 0x6B3E, 0xDD43, 0xDD44, 0, 0xDD45,
- 0x3757, 0, 0x3F56, 0, 0x6B41, 0, 0x4624, 0xDD46,
- 0x6B40, 0xF854, 0x7B7D, 0x3731, 0xF855, 0x7B7E, 0x6B3F, 0x4277,
- 0x352D, 0, 0, 0x6B42, 0, 0x6B43, 0xDD4B, 0x3E59,
- 0xDD4C, 0xF857, 0x7C21, 0x376D, 0xDD4E, 0x6B44, 0xDD4F, 0,
- 0, 0, 0x4B2C, 0xDD50, 0xDD51, 0x405F, 0, 0xDD52,
- 0, 0x3576, 0, 0x4C75, 0x414A, 0xF858, 0x6B45, 0x7C22,
- 0, 0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xF859, 0,
-};
static const unsigned short utf8_to_euc_E8A9[] = {
0xDD57, 0x6B46, 0, 0xDD58, 0, 0xDD59, 0x6B49, 0xDD5A,
0x6B4A, 0xDD5B, 0, 0, 0, 0xDD5C, 0xDD5D, 0,
@@ -10178,16 +5409,6 @@ 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_E8A9_x0213[] = {
- 0xDD57, 0x6B46, 0, 0xDD58, 0, 0xF85A, 0x6B49, 0x7C23,
- 0x6B4A, 0xDD5B, 0, 0, 0, 0xF85B, 0x7C24, 0,
- 0x3A3E, 0x4242, 0x6B48, 0xDD5E, 0x3E5B, 0x493E, 0xDD5F, 0xDD60,
- 0xF85C, 0, 0, 0x6B47, 0xDD62, 0x7C25, 0x3B6C, 0,
- 0x3153, 0x7C26, 0x6B4E, 0x3758, 0, 0xDD65, 0x3B6E, 0xDD66,
- 0, 0x3B6D, 0, 0x4F4D, 0x6B4D, 0x6B4C, 0x4127, 0,
- 0x354D, 0x4F43, 0x333A, 0x3E5C, 0, 0x7C27, 0xDD68, 0xDD69,
- 0, 0x7C28, 0xDD6B, 0xDD6C, 0x6B4B, 0, 0xDD6D, 0xDD6E,
-};
static const unsigned short utf8_to_euc_E8AA[] = {
0xDD6F, 0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
0, 0x4D40, 0, 0xDD72, 0x3B6F, 0x4727, 0, 0xDD73,
@@ -10198,16 +5419,6 @@ 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_E8AA_x0213[] = {
- 0xDD6F, 0, 0x6B50, 0xDD70, 0x6B51, 0x6B4F, 0xDD71, 0x3858,
- 0, 0x4D40, 0, 0xDD72, 0x3B6F, 0x4727, 0, 0xDD73,
- 0xF85E, 0x6B54, 0xDD75, 0x4040, 0, 0x4342, 0xDD76, 0xDD77,
- 0x4D36, 0xDD78, 0x6B57, 0, 0, 0, 0x386C, 0xDD79,
- 0x403F, 0x6B53, 0, 0x6B58, 0x386D, 0x6B55, 0x6B56, 0x7C29,
- 0x6B52, 0xDD7B, 0, 0, 0x4062, 0x4649, 0xF85D, 0xDD7D,
- 0x432F, 0, 0x325D, 0xDD7E, 0, 0, 0xDE21, 0xF85F,
- 0, 0x4870, 0, 0xDE23, 0x3543, 0, 0xF860, 0x4434,
-};
static const unsigned short utf8_to_euc_E8AB[] = {
0, 0, 0x6B5B, 0xDE25, 0x6B59, 0, 0xDE26, 0x434C,
0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A, 0, 0x3F5B,
@@ -10218,16 +5429,6 @@ 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_E8AB_x0213[] = {
- 0, 0, 0x6B5B, 0xDE25, 0x6B59, 0, 0xDE26, 0x434C,
- 0xDE27, 0xDE28, 0xDE29, 0x4041, 0x3452, 0x6B5A, 0, 0x3F5B,
- 0x7C2A, 0xDE2A, 0x4E4A, 0xDE2B, 0xDE2C, 0xDE2D, 0x4F40, 0xF861,
- 0, 0, 0x6B5C, 0x6B67, 0x4435, 0xDE2F, 0x6B66, 0x7C2B,
- 0x6B63, 0x6B6B, 0x6B64, 0, 0x6B60, 0, 0x447C, 0x6B5F,
- 0, 0, 0, 0x6B5D, 0xDE31, 0x4D21, 0x3B70, 0,
- 0xDE32, 0x6B61, 0, 0x6B5E, 0x7C2C, 0xDE34, 0x7C2D, 0x6B65,
- 0x3D74, 0, 0x3841, 0, 0xF862, 0, 0x427A, 0xDE37,
-};
static const unsigned short utf8_to_euc_E8AC[] = {
0x4B45, 0x315A, 0x3062, 0, 0x4625, 0xDE38, 0xDE39, 0x6B69,
0, 0, 0xDE3F, 0xDE3A, 0x6B68, 0, 0x4666, 0,
@@ -10238,16 +5439,6 @@ 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_E8AC_x0213[] = {
- 0x4B45, 0x315A, 0x3062, 0, 0x4625, 0xF865, 0xDE39, 0x6B69,
- 0, 0, 0xF864, 0xDE3A, 0x6B68, 0xF866, 0x4666, 0,
- 0x6B6D, 0xDE3B, 0, 0, 0x6B62, 0, 0x6B6C, 0x6B6E,
- 0, 0x382C, 0x6B6A, 0x3956, 0xF867, 0x3C55, 0xDE3D, 0xF868,
- 0x6B6F, 0x4D58, 0, 0, 0, 0, 0x6B72, 0,
- 0x6B75, 0, 0, 0x6B73, 0x4935, 0xF869, 0, 0,
- 0xDE41, 0, 0, 0x6B70, 0, 0, 0, 0xDE42,
- 0, 0x3660, 0, 0, 0xDE43, 0, 0x6B74, 0,
-};
static const unsigned short utf8_to_euc_E8AD[] = {
0, 0x6B76, 0xDE44, 0xDE45, 0xDE46, 0xDE47, 0xDE48, 0,
0xDE49, 0x6B7A, 0, 0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
@@ -10258,16 +5449,6 @@ 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_E8AD_x0213[] = {
- 0, 0x6B76, 0xDE44, 0xF86A, 0xDE46, 0xDE47, 0x7C31, 0,
- 0xDE49, 0x6B7A, 0, 0, 0x6B77, 0xDE4E, 0x6B79, 0x6B78,
- 0, 0xF86C, 0xDE4A, 0xDE4B, 0x7C32, 0, 0x6B7B, 0,
- 0x3C31, 0x7C33, 0x6B7D, 0x6B7C, 0x4968, 0, 0xF86D, 0x6C21,
- 0, 0, 0, 0xDE50, 0, 0, 0x3759, 0,
- 0, 0x7C34, 0, 0x6B7E, 0x6C22, 0xDE51, 0, 0x6C23,
- 0x3544, 0x6641, 0x3E79, 0, 0x6C24, 0, 0xF86E, 0x386E,
- 0xDE53, 0xDE54, 0, 0, 0xDE55, 0x6C25, 0xDE56, 0xF86F,
-};
static const unsigned short utf8_to_euc_E8AE[] = {
0x6C26, 0xDE57, 0, 0x3B3E, 0xDE58, 0xDE59, 0, 0,
0, 0, 0x5A4E, 0xDE5A, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
@@ -10278,16 +5459,6 @@ 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_E8AE_x0213[] = {
- 0x6C26, 0xF870, 0, 0x3B3E, 0xDE58, 0xDE59, 0, 0,
- 0, 0, 0x5A4E, 0xF871, 0x6C27, 0xDE5B, 0x6C28, 0xDE5C,
- 0x3D32, 0, 0x6C29, 0x6C2A, 0xF872, 0xF873, 0x6C2B, 0,
- 0, 0x6C2C, 0x6C2D, 0, 0xF874, 0x7C35, 0xF875, 0xDE61,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E8B0[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -10298,16 +5469,6 @@ 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_E8B0_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x432B,
- 0xDE62, 0xF876, 0x6C2E, 0, 0, 0xF878, 0xDE65, 0x6C30,
-};
static const unsigned short utf8_to_euc_E8B1[] = {
0, 0x6C2F, 0, 0, 0, 0xDE66, 0x4626, 0xDE67,
0x6C31, 0xDE68, 0x4B2D, 0xDE69, 0x6C32, 0, 0x6C33, 0xDE6A,
@@ -10318,16 +5479,6 @@ 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_E8B1_x0213[] = {
- 0, 0x6C2F, 0, 0, 0, 0xF87B, 0x4626, 0xF87C,
- 0x6C31, 0x7C36, 0x4B2D, 0xDE69, 0x6C32, 0, 0x6C33, 0xF87D,
- 0x6C34, 0xDE6B, 0, 0xDE6C, 0xF87E, 0x6C35, 0, 0xF921,
- 0xDE6F, 0xDE72, 0x465A, 0xDE70, 0, 0xDE71, 0, 0,
- 0, 0x3E5D, 0x6C36, 0xDE73, 0xDE74, 0, 0xDE75, 0,
- 0x7C37, 0xF922, 0x396B, 0x502E, 0x6C37, 0xF923, 0, 0,
- 0, 0, 0, 0xF924, 0, 0xDE7A, 0xDE7B, 0,
- 0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41, 0, 0xDE7D, 0,
-};
static const unsigned short utf8_to_euc_E8B2[] = {
0, 0, 0x6C3A, 0, 0, 0x6C3C, 0xDE7E, 0xDF21,
0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F, 0,
@@ -10338,16 +5489,6 @@ 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_E8B2_x0213[] = {
- 0, 0, 0x6C3A, 0, 0, 0x6C3C, 0xDE7E, 0xDF21,
- 0, 0x6C3B, 0x6C3D, 0xDF22, 0x4B46, 0x6C3E, 0x6C3F, 0,
- 0xDF23, 0, 0xF927, 0xF926, 0x6C40, 0, 0, 0,
- 0x6C42, 0xF928, 0, 0xF92A, 0xDF28, 0x332D, 0x4467, 0,
- 0x4969, 0x3A62, 0x3957, 0, 0xF92B, 0, 0, 0x494F,
- 0x325F, 0x484E, 0x6C45, 0x3453, 0x4055, 0x6C44, 0x6C49, 0x4379,
- 0x4C63, 0, 0x6C47, 0x6C48, 0x352E, 0, 0x6C4A, 0x4763,
- 0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46, 0, 0x4B47,
-};
static const unsigned short utf8_to_euc_E8B3[] = {
0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
0x6C4B, 0xDF2E, 0x4231, 0xDF2F, 0, 0x6C5C, 0x4128, 0xDF30,
@@ -10358,16 +5499,6 @@ 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_E8B3_x0213[] = {
- 0x326C, 0x6C4C, 0x4F28, 0x4442, 0x4F45, 0xDF2C, 0xDF2D, 0x3B71,
- 0x6C4B, 0xDF2E, 0x4231, 0xDF2F, 0, 0x6C5C, 0x4128, 0xDF30,
- 0, 0x4678, 0, 0x4950, 0, 0xF92D, 0xF92C, 0,
- 0, 0xF92E, 0x6C4F, 0x3B3F, 0x3B72, 0xDF34, 0x3E5E, 0,
- 0x4765, 0x7C39, 0x382D, 0x6C4E, 0x6C4D, 0, 0x496A, 0,
- 0xDF36, 0, 0x3C41, 0, 0xDF37, 0x4552, 0, 0xDF38,
- 0xF930, 0xF931, 0xDF3A, 0, 0x7C3A, 0xDF3B, 0, 0xDF3C,
- 0x7C3B, 0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0x7C3C, 0xDF3F,
-};
static const unsigned short utf8_to_euc_E8B4[] = {
0, 0xDF40, 0, 0xDF41, 0x6C53, 0x6C54, 0, 0x6C56,
0x4223, 0xDF42, 0x6C55, 0x3466, 0, 0x6C58, 0, 0x6C57,
@@ -10378,16 +5509,6 @@ 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_E8B4_x0213[] = {
- 0, 0xDF40, 0, 0xDF41, 0x6C53, 0x6C54, 0, 0x6C56,
- 0x4223, 0xF933, 0x6C55, 0x3466, 0, 0x6C58, 0xF934, 0x6C57,
- 0x6C59, 0, 0x7C3E, 0x6C5B, 0x6C5D, 0, 0x6C5E, 0xDF44,
- 0, 0, 0, 0x7C3F, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E8B5[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -10398,16 +5519,6 @@ 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_E8B5_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x4056, 0xDF46, 0x3C4F, 0x6C5F,
- 0, 0xDF47, 0, 0x3352, 0xF935, 0x6C60, 0xDF49, 0,
- 0x4176, 0x6C61, 0, 0x6C62, 0x496B, 0, 0xF468, 0x352F,
- 0, 0, 0, 0, 0, 0, 0, 0xDF4A,
-};
static const unsigned short utf8_to_euc_E8B6[] = {
0, 0x6C63, 0xDF4B, 0, 0xDF4C, 0x4436, 0, 0,
0xDF4D, 0, 0x315B, 0, 0, 0xDF4E, 0, 0,
@@ -10418,16 +5529,6 @@ 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_E8B6_x0213[] = {
- 0, 0x6C63, 0xDF4B, 0, 0xF936, 0x4436, 0, 0,
- 0xDF4D, 0, 0x315B, 0, 0, 0xDF4E, 0, 0,
- 0xDF4F, 0xDF50, 0, 0, 0, 0xF937, 0, 0,
- 0, 0x6C64, 0, 0, 0, 0, 0xDF52, 0xDF53,
- 0xDF54, 0, 0, 0x3C71, 0, 0, 0xF938, 0,
- 0x3F76, 0, 0, 0xDF56, 0xDF57, 0, 0, 0x7C40,
- 0, 0, 0xDF59, 0x422D, 0, 0xDF5A, 0, 0xDF5B,
- 0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F, 0, 0x6C66, 0,
-};
static const unsigned short utf8_to_euc_E8B7[] = {
0xDF5E, 0, 0x6C65, 0, 0, 0xDF5F, 0xDF60, 0xDF61,
0xDF62, 0, 0xDF63, 0x6C6D, 0x6C6B, 0, 0xDF64, 0x6C68,
@@ -10438,16 +5539,6 @@ 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_E8B7_x0213[] = {
- 0xDF5E, 0, 0x6C65, 0, 0, 0xDF5F, 0xF93A, 0xDF61,
- 0xF93B, 0, 0xDF63, 0x6C6D, 0x6C6B, 0, 0x7C41, 0x6C68,
- 0, 0x7C42, 0, 0, 0xDF66, 0xDF67, 0x6C6A, 0x7C43,
- 0, 0xF93C, 0x6C69, 0x6C6C, 0, 0x3577, 0, 0x6C70,
- 0, 0x4057, 0, 0x6C71, 0xDF6A, 0xDF6B, 0, 0xDF6C,
- 0x3859, 0, 0x6C6E, 0x6C6F, 0xF93D, 0, 0, 0x4F29,
- 0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129, 0, 0,
- 0, 0, 0, 0, 0x6C72, 0xF940, 0, 0x6C75,
-};
static const unsigned short utf8_to_euc_E8B8[] = {
0, 0xDF74, 0, 0, 0xDF75, 0xDF76, 0xDF77, 0,
0x6C73, 0x6C74, 0x4D59, 0xDF78, 0, 0, 0, 0x4627,
@@ -10458,16 +5549,6 @@ 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_E8B8_x0213[] = {
- 0, 0xDF74, 0, 0, 0xDF75, 0xDF76, 0xF941, 0,
- 0x6C73, 0x6C74, 0x4D59, 0xDF78, 0xF93E, 0, 0, 0x4627,
- 0x6C78, 0xDF79, 0, 0, 0xF943, 0, 0xF944, 0,
- 0, 0, 0, 0, 0, 0x6C76, 0x6C77, 0x6C79,
- 0x7C44, 0xF945, 0xF946, 0x7C45, 0, 0, 0xE022, 0xF947,
- 0, 0, 0x6D29, 0, 0, 0, 0, 0,
- 0x6C7C, 0xE024, 0, 0xE025, 0x6C7D, 0x6C7B, 0xF94A, 0xE027,
- 0xE028, 0xF94B, 0, 0, 0, 0x7C46, 0, 0,
-};
static const unsigned short utf8_to_euc_E8B9[] = {
0xE02B, 0xE02C, 0x6C7A, 0, 0x447D, 0, 0, 0x6D21,
0x6D25, 0x6D22, 0x6C7E, 0xE02D, 0x6D23, 0xE02E, 0xE02F, 0xE030,
@@ -10478,16 +5559,6 @@ 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_E8B9_x0213[] = {
- 0xE02B, 0xE02C, 0x6C7A, 0, 0x447D, 0, 0, 0x6D21,
- 0x6D25, 0x6D22, 0x6C7E, 0xF94C, 0x6D23, 0xE02E, 0xE02F, 0xE030,
- 0x6D24, 0, 0, 0, 0xF94D, 0x6D2B, 0, 0,
- 0, 0x6D26, 0, 0xE032, 0xE033, 0xE034, 0xE035, 0x4058,
- 0x6D28, 0xE036, 0xF94E, 0x6D2A, 0x6D27, 0, 0, 0,
- 0, 0xE038, 0, 0, 0xF94F, 0xF950, 0, 0xF951,
- 0x7C47, 0xE03D, 0x6D2D, 0, 0x3D33, 0, 0x6D2C, 0,
- 0, 0xE03E, 0xE03F, 0x7C48, 0x6D2E, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E8BA[] = {
0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31, 0, 0x6D30,
0, 0xE043, 0x6D34, 0x6D33, 0, 0x4C76, 0, 0,
@@ -10498,16 +5569,6 @@ 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_E8BA_x0213[] = {
- 0, 0x6D2F, 0xE041, 0xE042, 0x6D32, 0x6D31, 0, 0x6D30,
- 0, 0xE043, 0x6D34, 0x6D33, 0, 0x4C76, 0, 0,
- 0xE044, 0x6D36, 0xE045, 0x6D35, 0x6D37, 0xE046, 0, 0,
- 0xF952, 0x6D38, 0xE047, 0xE048, 0, 0xE049, 0xF953, 0,
- 0, 0x6D3A, 0xE04B, 0, 0, 0, 0, 0xE04C,
- 0, 0xE04D, 0x6D39, 0x3F48, 0x6D3B, 0xE04E, 0xF954, 0x366D,
- 0x6D3C, 0x6D3E, 0, 0xF955, 0, 0xF956, 0xF957, 0,
- 0, 0, 0xE052, 0xF958, 0, 0, 0x6D3F, 0,
-};
static const unsigned short utf8_to_euc_E8BB[] = {
0xE054, 0xE055, 0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
0x6D41, 0, 0x3C56, 0x6D42, 0x3530, 0x3733, 0, 0xE059,
@@ -10518,16 +5579,6 @@ 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_E8BB_x0213[] = {
- 0x7C4A, 0xE055, 0, 0xE056, 0xE057, 0x6D40, 0x6D3D, 0xE058,
- 0x6D41, 0, 0x3C56, 0x6D42, 0x3530, 0x3733, 0, 0xE059,
- 0, 0xF95A, 0x382E, 0, 0xF95B, 0, 0, 0,
- 0, 0, 0, 0x6D43, 0xE05C, 0, 0, 0x4670,
- 0, 0, 0x453E, 0x6D44, 0, 0, 0, 0,
- 0xE05D, 0, 0, 0x6D47, 0, 0xE064, 0xE05E, 0,
- 0xE05F, 0xE060, 0, 0, 0, 0, 0, 0xE061,
- 0x3C34, 0xF95D, 0x7C4C, 0x6D46, 0x6D45, 0x375A, 0x6D48, 0,
-};
static const unsigned short utf8_to_euc_E8BC[] = {
0xE065, 0, 0xE066, 0x3353, 0, 0x6D4A, 0, 0xE067,
0xE068, 0x3A5C, 0x6D49, 0, 0x6D52, 0, 0, 0xE069,
@@ -10538,16 +5589,6 @@ 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_E8BC_x0213[] = {
- 0xF95F, 0, 0xE066, 0x3353, 0, 0x6D4A, 0, 0xE067,
- 0xF960, 0x3A5C, 0x6D49, 0, 0x6D52, 0, 0, 0xE069,
- 0xE06A, 0, 0x6D4C, 0x6D4E, 0x4A65, 0x6D4B, 0xE06B, 0xF961,
- 0xE06D, 0x6D4D, 0, 0x6D51, 0x6D4F, 0x3531, 0x7C4D, 0x6D50,
- 0xE06F, 0xE070, 0, 0xE071, 0, 0xE072, 0x6D53, 0xE073,
- 0xE074, 0x475A, 0x4E58, 0xF962, 0xE075, 0x7C4E, 0xE077, 0x3D34,
- 0, 0, 0, 0x6D54, 0xE078, 0xE079, 0x7C4F, 0xE07B,
- 0x4D22, 0x6D56, 0xE07C, 0x6D55, 0, 0, 0x6D59, 0x4D41,
-};
static const unsigned short utf8_to_euc_E8BD[] = {
0xE07D, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
0, 0x6D5B, 0, 0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
@@ -10558,16 +5599,6 @@ 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_E8BD_x0213[] = {
- 0xF963, 0xE07E, 0x6D58, 0xE121, 0x336D, 0x6D57, 0x6D5C, 0xE122,
- 0, 0x6D5B, 0xF964, 0, 0x6D5A, 0x4532, 0x6D5D, 0xE123,
- 0, 0xE124, 0xE125, 0xE126, 0x7C50, 0xE128, 0, 0x6D5E,
- 0xF965, 0, 0, 0, 0x6D5F, 0xE12A, 0xE12B, 0x396C,
- 0, 0x3725, 0x6D60, 0x6D61, 0x6D62, 0xE12C, 0, 0,
- 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_E8BE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -10578,16 +5609,6 @@ 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_E8BE_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x3F49, 0x6D63, 0xE12D, 0x3C2D, 0x6D64,
- 0xE12E, 0xE12F, 0, 0x6D65, 0xF967, 0xE131, 0x7C52, 0x5221,
- 0x517E, 0, 0, 0, 0, 0x6D66, 0x6570, 0x6D67,
- 0x4324, 0x3F2B, 0x4740, 0, 0xF968, 0x7C53, 0xF96A, 0x6D68,
- 0xE135, 0, 0x4A55, 0x4454, 0x397E, 0, 0xE136, 0x4329,
-};
static const unsigned short utf8_to_euc_E8BF[] = {
0xE137, 0xE138, 0x312A, 0, 0x4B78, 0x3F57, 0xE139, 0,
0, 0, 0xE13A, 0xE13B, 0, 0xE13C, 0x375E, 0,
@@ -10598,16 +5619,6 @@ 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_E8BF_x0213[] = {
- 0xE137, 0xF96C, 0x312A, 0, 0x4B78, 0x3F57, 0xF96D, 0,
- 0, 0, 0xF96F, 0xE13B, 0, 0xF970, 0x375E, 0,
- 0xE13D, 0x3661, 0xE13E, 0xF971, 0x4A56, 0xF972, 0, 0,
- 0, 0, 0x6D69, 0, 0, 0, 0, 0,
- 0xF973, 0, 0x6D6B, 0xE142, 0x7C54, 0x6D6A, 0x3260, 0,
- 0x7C55, 0x4676, 0x6D6C, 0x4777, 0, 0x4533, 0x7C56, 0x6D6D,
- 0x3D52, 0xF974, 0, 0, 0x6D6F, 0xF975, 0xE148, 0x4C42,
- 0x6D7E, 0x6D71, 0x6D72, 0xF976, 0, 0x4449, 0xE14A, 0,
-};
static const unsigned short utf8_to_euc_E980[] = {
0x4260, 0x4177, 0xE14B, 0x4628, 0xE14C, 0x6D70, 0x3555, 0,
0xE14D, 0, 0, 0x6D79, 0xE14E, 0x6D76, 0x6E25, 0x4629,
@@ -10618,16 +5629,6 @@ 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_E980_x0213[] = {
- 0x4260, 0x4177, 0xF977, 0x4628, 0xE14C, 0x6D70, 0x3555, 0,
- 0x7C57, 0, 0, 0x6D79, 0xF978, 0x6D76, 0x6E25, 0x4629,
- 0x4360, 0x6D73, 0, 0x447E, 0x4553, 0x6D74, 0x6D78, 0x3F60,
- 0xE14F, 0x4767, 0x444C, 0xE150, 0, 0x4042, 0x6D77, 0x422E,
- 0x4224, 0x6D75, 0x3029, 0x4F22, 0, 0, 0, 0x6D7A,
- 0xE151, 0xE152, 0xE154, 0, 0xE155, 0x7C58, 0x4261, 0xE153,
- 0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xF979,
- 0x306F, 0x6D7D, 0, 0, 0x492F, 0, 0x6E27, 0xE15A,
-};
static const unsigned short utf8_to_euc_E981[] = {
0, 0x465B, 0x3F6B, 0xE15B, 0xE15C, 0x4359, 0, 0x3678,
0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
@@ -10638,16 +5639,6 @@ 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_E981_x0213[] = {
- 0, 0x465B, 0x3F6B, 0xF97B, 0xF97C, 0x4359, 0, 0x3678,
- 0, 0x6E26, 0x4D37, 0x313F, 0xE15D, 0x4A57, 0x3261, 0x6E21,
- 0x6E22, 0x6E23, 0x6E24, 0x463B, 0x4323, 0x3063, 0x6E28, 0,
- 0x6E29, 0x7423, 0, 0xE15E, 0x423D, 0xF97D, 0x6E2A, 0,
- 0x3173, 0x414C, 0xE160, 0x382F, 0, 0x4D5A, 0xE161, 0xE162,
- 0x6E2B, 0x452C, 0, 0, 0xE163, 0x4178, 0x3C57, 0x6E2C,
- 0xE164, 0, 0x6E2F, 0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
- 0x412A, 0xE166, 0x3064, 0, 0x4E4B, 0x6E31, 0, 0x4872,
-};
static const unsigned short utf8_to_euc_E982[] = {
0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xE167, 0, 0x6D6E,
0xE168, 0x6E35, 0x6E34, 0xE169, 0xE16A, 0, 0xE16B, 0x6E36,
@@ -10658,16 +5649,6 @@ 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_E982_x0213[] = {
- 0x6E33, 0x6E32, 0x6E30, 0x6364, 0x3454, 0xFA22, 0, 0x6D6E,
- 0x7C5A, 0x6E35, 0x6E34, 0xE169, 0xFA23, 0, 0xE16B, 0x6E36,
- 0xFA24, 0x4D38, 0, 0, 0, 0x7C5B, 0, 0x7C5C,
- 0xE16F, 0x7C5D, 0, 0x7C5E, 0, 0, 0, 0,
- 0xE172, 0xFA26, 0x7C5F, 0x4661, 0, 0xE175, 0x4B2E, 0,
- 0x6E37, 0, 0x3C59, 0, 0, 0, 0, 0x6E38,
- 0xFA28, 0x6E39, 0xE177, 0x7C60, 0xE179, 0x6E3A, 0xFA29, 0,
- 0x4521, 0, 0, 0, 0, 0xE17B, 0x7C61, 0,
-};
static const unsigned short utf8_to_euc_E983[] = {
0, 0x306A, 0, 0xE17E, 0xE221, 0xE222, 0, 0xE223,
0xE224, 0, 0x3959, 0, 0xE17C, 0, 0x4F3A, 0,
@@ -10678,16 +5659,6 @@ 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_E983_x0213[] = {
- 0, 0x306A, 0, 0xFA2A, 0x7C62, 0x7C63, 0, 0x7C64,
- 0xFA2B, 0, 0x3959, 0, 0xE17C, 0, 0x4F3A, 0,
- 0, 0, 0xE22D, 0, 0, 0xE225, 0, 0x7C65,
- 0xE227, 0xE228, 0, 0x6E3E, 0xFA2D, 0x7C66, 0x7C67, 0xFA2E,
- 0, 0x3734, 0x6E3B, 0, 0x6E3C, 0xE22C, 0, 0,
- 0x4974, 0, 0, 0xFA33, 0, 0x3354, 0, 0x7C68,
- 0xE231, 0, 0xFA31, 0, 0x7C69, 0x4D39, 0xFA30, 0x363F,
- 0, 0, 0, 0, 0, 0x4554, 0xFA34, 0xFA35,
-};
static const unsigned short utf8_to_euc_E984[] = {
0xE235, 0, 0x6E3F, 0, 0xE236, 0xE237, 0xE238, 0,
0xE239, 0, 0, 0, 0, 0xE23A, 0, 0,
@@ -10698,16 +5669,6 @@ 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_E984_x0213[] = {
- 0xFA32, 0, 0x6E3F, 0, 0xFA36, 0xE237, 0xFA37, 0,
- 0xE239, 0, 0, 0, 0, 0xE23A, 0, 0,
- 0xE23B, 0, 0x6E40, 0, 0x7C6B, 0x7C6C, 0x7C6D, 0xE23E,
- 0xFA38, 0x6E41, 0xE240, 0, 0xFA39, 0, 0xFA3A, 0,
- 0xE243, 0, 0x7C6E, 0x7C6F, 0, 0xE244, 0, 0x7C70,
- 0, 0xE248, 0, 0, 0, 0x4522, 0xE249, 0x7C71,
- 0x6E43, 0x7C72, 0x6E42, 0, 0x7C73, 0, 0xE24D, 0xFA3B,
- 0, 0xFA3C, 0xFA3D, 0, 0xE251, 0x7C74, 0, 0,
-};
static const unsigned short utf8_to_euc_E985[] = {
0, 0, 0, 0xE253, 0, 0, 0, 0xE254,
0xE255, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
@@ -10718,16 +5679,6 @@ 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_E985_x0213[] = {
- 0, 0, 0, 0xE253, 0, 0, 0xFA3E, 0xFA3F,
- 0x7C75, 0x4653, 0x6E44, 0x3D36, 0x3C60, 0x475B, 0x4371, 0xE256,
- 0, 0, 0x3C72, 0xE257, 0x3F6C, 0, 0x6E45, 0xFA40,
- 0x6E46, 0xFA41, 0xE25A, 0x7C76, 0, 0, 0, 0,
- 0, 0xFA42, 0x3F5D, 0x6E47, 0xFA43, 0x6E48, 0, 0xE25E,
- 0, 0x6E49, 0x4D6F, 0, 0x3D37, 0xE25F, 0, 0,
- 0, 0, 0x6E4B, 0x6E4A, 0xFA44, 0x395A, 0, 0x3973,
- 0x3B40, 0xFA45, 0xE262, 0xE263, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E986[] = {
0, 0xE264, 0x6E4E, 0xE265, 0, 0xE266, 0xE267, 0x3D66,
0, 0x6E4D, 0xE268, 0x6E4C, 0, 0x4269, 0xE269, 0,
@@ -10738,16 +5689,6 @@ 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_E986_x0213[] = {
- 0, 0xE264, 0x6E4E, 0x7C77, 0, 0xFA46, 0xE267, 0x3D66,
- 0, 0x6E4D, 0xE268, 0x6E4C, 0, 0x4269, 0xFA47, 0,
- 0x386F, 0xE26A, 0x4043, 0xE26B, 0xE26C, 0xE26D, 0, 0x4830,
- 0xE26E, 0, 0, 0, 0x3D39, 0, 0x7C78, 0,
- 0, 0xE270, 0x6E4F, 0, 0x3E5F, 0, 0xE271, 0,
- 0xFA48, 0, 0x6E52, 0x6E50, 0x7C79, 0xE274, 0xFA49, 0x6E51,
- 0xE276, 0x7C7A, 0xE278, 0xFA4A, 0x6E54, 0x6E53, 0xFA4B, 0,
- 0x3E7A, 0, 0x6E55, 0xE27B, 0x7C7B, 0xE27D, 0, 0xE27E,
-};
static const unsigned short utf8_to_euc_E987[] = {
0x6E56, 0x6E57, 0xE321, 0xE322, 0, 0xE323, 0x4850, 0x3A53,
0x3C61, 0x6E58, 0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
@@ -10758,16 +5699,6 @@ 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_E987_x0213[] = {
- 0x6E56, 0x6E57, 0xE321, 0xFA4C, 0xFA4D, 0xE323, 0x4850, 0x3A53,
- 0x3C61, 0x6E58, 0, 0x6E59, 0x4E24, 0x3D45, 0x4C6E, 0x4E4C,
- 0x6E5A, 0x3662, 0, 0xE324, 0xE325, 0, 0x6E5B, 0x7C7C,
- 0x4523, 0xE327, 0xFA4E, 0x6E5E, 0x3378, 0x3F4B, 0xE329, 0x6E5C,
- 0, 0x6E5D, 0, 0x4460, 0x7C7E, 0x7D21, 0x4B55, 0x367C,
- 0, 0xE32C, 0xE32D, 0, 0xFA51, 0x7D22, 0xFA52, 0xE331,
- 0xE332, 0x7D23, 0, 0, 0, 0x6E60, 0x6E61, 0xE334,
- 0, 0xE335, 0, 0x7C7D, 0x6E5F, 0xE337, 0, 0x6E63,
-};
static const unsigned short utf8_to_euc_E988[] = {
0xE338, 0xE339, 0, 0, 0xE33A, 0xE33B, 0xE33C, 0xE33D,
0, 0xE33E, 0xE33F, 0, 0xE340, 0x465F, 0x3343, 0,
@@ -10778,16 +5709,6 @@ 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_E988_x0213[] = {
- 0xE338, 0xFA53, 0, 0, 0xE33A, 0xE33B, 0xE33C, 0x7D24,
- 0, 0xE33E, 0xFA54, 0, 0xE340, 0x465F, 0x3343, 0,
- 0x7D25, 0x6E67, 0xE342, 0xE343, 0x6E64, 0x6E66, 0xFA55, 0xFA56,
- 0xE345, 0, 0, 0, 0xE346, 0xE347, 0x6E62, 0,
- 0, 0, 0, 0xE348, 0xE349, 0xE34A, 0xE34B, 0,
- 0xE34C, 0x6F4F, 0, 0, 0x6E65, 0, 0xE34D, 0xE34E,
- 0xE34F, 0, 0, 0xFA58, 0x4E6B, 0xE351, 0xE352, 0x385A,
- 0x7D26, 0x7D27, 0x7D28, 0, 0x7D29, 0, 0xE357, 0x6E6F,
-};
static const unsigned short utf8_to_euc_E989[] = {
0xE358, 0, 0xE359, 0xE35A, 0x4534, 0x6E6A, 0xE35B, 0xE35C,
0x6E6D, 0x6E6B, 0xE35D, 0x6E70, 0, 0xE35E, 0xE35F, 0xE360,
@@ -10798,16 +5719,6 @@ 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_E989_x0213[] = {
- 0x7D2A, 0, 0xFA59, 0x7D2B, 0x4534, 0x6E6A, 0xE35B, 0xFA5A,
- 0x6E6D, 0x6E6B, 0xFA5B, 0x6E70, 0, 0xE35E, 0xFA5C, 0x7D2C,
- 0x6E71, 0xFA5D, 0, 0, 0, 0, 0xFA5E, 0x6E69,
- 0xE362, 0xFA5F, 0x6E76, 0x3174, 0xE364, 0xE365, 0x6E68, 0,
- 0xFA60, 0xFA61, 0x482D, 0, 0x6E6C, 0xFA62, 0x3E60, 0xFA63,
- 0xFA64, 0xE36B, 0, 0, 0, 0, 0xE36C, 0xE36D,
- 0xE36E, 0x395B, 0, 0, 0, 0xE36F, 0xE370, 0xE371,
- 0x7D2D, 0xE373, 0, 0xE374, 0xFA67, 0xFA68, 0x4B48, 0xFA69,
-};
static const unsigned short utf8_to_euc_E98A[] = {
0x3664, 0, 0, 0x3D46, 0, 0x463C, 0, 0,
0xE378, 0xE379, 0xE37A, 0, 0, 0xE37B, 0xE37C, 0,
@@ -10818,16 +5729,6 @@ 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_E98A_x0213[] = {
- 0x3664, 0, 0, 0x3D46, 0, 0x463C, 0, 0,
- 0x7D2E, 0xFA6A, 0xE37A, 0, 0, 0xFA6B, 0xE37C, 0,
- 0, 0x412D, 0xE37D, 0x6E74, 0, 0x6E6E, 0x6E73, 0xFA6C,
- 0x4C43, 0xFA6D, 0x4438, 0x6E75, 0x6E72, 0, 0, 0xFA6E,
- 0xE423, 0, 0, 0, 0xE424, 0xE425, 0, 0xFA6F,
- 0xE427, 0, 0, 0xFA70, 0, 0x412C, 0, 0xE429,
- 0, 0, 0xFA73, 0, 0, 0, 0xE42B, 0x6E79,
- 0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430, 0, 0xFA74,
-};
static const unsigned short utf8_to_euc_E98B[] = {
0xE432, 0xE433, 0xE434, 0xE435, 0, 0xE436, 0xE437, 0xE438,
0xE439, 0, 0, 0xE43A, 0xE43B, 0xE43C, 0xE43D, 0x6E77,
@@ -10838,16 +5739,6 @@ 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_E98B_x0213[] = {
- 0xFA75, 0xE433, 0x7D2F, 0xE435, 0, 0xE436, 0xFA76, 0xE438,
- 0xE439, 0, 0, 0x7D30, 0x7D31, 0xE43C, 0xFA77, 0x6E77,
- 0xFA78, 0, 0x4B2F, 0x7D32, 0, 0xE440, 0, 0xFA79,
- 0xE442, 0xFA7A, 0, 0, 0xE444, 0xE445, 0, 0xE446,
- 0x7D33, 0xE448, 0, 0xE449, 0x3D7B, 0xFA7B, 0, 0xFA7C,
- 0xE44C, 0x6E7A, 0x4A5F, 0, 0xE44D, 0x3154, 0xE44E, 0,
- 0xE44F, 0, 0x4946, 0x4372, 0, 0, 0, 0xFB22,
- 0x3578, 0xFB23, 0x6E7C, 0xFB24, 0x395D, 0, 0, 0x7D34,
-};
static const unsigned short utf8_to_euc_E98C[] = {
0xE453, 0, 0xE454, 0, 0, 0, 0x3B2C, 0,
0xE455, 0, 0, 0, 0, 0xE456, 0, 0x6E7B,
@@ -10858,16 +5749,6 @@ 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_E98C_x0213[] = {
- 0xE453, 0, 0xFB25, 0, 0x7D35, 0, 0x3B2C, 0,
- 0xE455, 0, 0, 0, 0, 0xFB26, 0, 0x6E7B,
- 0x3F6D, 0xFA7D, 0, 0, 0xE458, 0xFB27, 0, 0,
- 0x3F6E, 0x6F21, 0x6F23, 0, 0xE45A, 0xFB28, 0xFB29, 0x7D36,
- 0x3E7B, 0x7D37, 0x6F22, 0x6F24, 0xE45F, 0x7D38, 0x3653, 0xFB2A,
- 0x4945, 0xFB2B, 0xE463, 0x3C62, 0x4F23, 0, 0x6E7E, 0x3A78,
- 0, 0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
- 0, 0, 0x6F25, 0x6F27, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E98D[] = {
0, 0, 0, 0, 0x6E7D, 0, 0, 0xE468,
0xE469, 0xE46A, 0, 0x4669, 0, 0x4555, 0, 0,
@@ -10878,16 +5759,6 @@ 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_E98D_x0213[] = {
- 0, 0, 0, 0, 0x6E7D, 0, 0, 0xFB2E,
- 0x7D39, 0x7D3A, 0x7D3B, 0x4669, 0, 0x4555, 0, 0,
- 0xE46B, 0xFB2F, 0xE46D, 0, 0x4457, 0xE46E, 0x6F2C, 0xFB30,
- 0xE470, 0, 0xFB31, 0x4343, 0x6F28, 0, 0xE472, 0,
- 0x6F29, 0, 0, 0, 0x7D3C, 0x7D3D, 0, 0xE475,
- 0, 0xE476, 0x7D3E, 0xFB32, 0x372D, 0xE478, 0x6F2B, 0xE479,
- 0x7D3F, 0xFB33, 0, 0xFB34, 0xE47D, 0x3830, 0xE47E, 0,
- 0, 0, 0xE521, 0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
-};
static const unsigned short utf8_to_euc_E98E[] = {
0xE524, 0xE525, 0xE526, 0, 0, 0, 0, 0,
0xE527, 0, 0xE528, 0xE529, 0x3379, 0xE52A, 0, 0xE52B,
@@ -10898,16 +5769,6 @@ 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_E98E_x0213[] = {
- 0xE524, 0xE525, 0xE526, 0, 0, 0, 0, 0,
- 0xFB38, 0, 0xE528, 0xFB39, 0x3379, 0xE52A, 0, 0xFB3A,
- 0, 0, 0xE52C, 0, 0x6F30, 0xE52D, 0x3A3F, 0x4179,
- 0xE52E, 0, 0x444A, 0x7D40, 0, 0, 0xFB3B, 0,
- 0, 0xFB35, 0, 0x7D41, 0xE533, 0, 0xE534, 0x333B,
- 0xE535, 0xE53B, 0, 0xE536, 0x6F2E, 0x6F2F, 0x4443, 0,
- 0x6F2D, 0, 0, 0, 0xE537, 0xE538, 0xE539, 0,
- 0, 0x6F31, 0x7D42, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E98F[] = {
0, 0xE53C, 0, 0x6F37, 0xE53D, 0xE53E, 0xE53F, 0xE540,
0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545, 0, 0,
@@ -10918,16 +5779,6 @@ 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_E98F_x0213[] = {
- 0, 0xFB40, 0, 0x6F37, 0xE53D, 0xE53E, 0x7D43, 0xFB41,
- 0x6F3A, 0xE541, 0xE542, 0xE543, 0xE544, 0xE545, 0, 0,
- 0x6F39, 0x452D, 0, 0xE546, 0, 0, 0x6F32, 0x6F33,
- 0x6F36, 0xE547, 0, 0, 0xFB42, 0x6F38, 0x7D44, 0x7D45,
- 0, 0x3640, 0xFB43, 0, 0x6F3B, 0x6F35, 0xE54C, 0xFB44,
- 0x6F34, 0, 0, 0, 0, 0, 0, 0,
- 0, 0xFB3F, 0, 0, 0, 0xFB3C, 0, 0xE54F,
- 0xE550, 0xE54E, 0xE551, 0xFB49, 0, 0x7D47, 0, 0,
-};
static const unsigned short utf8_to_euc_E990[] = {
0, 0xE554, 0xE555, 0x6F3F, 0xE556, 0, 0, 0x6F40,
0xE557, 0xE558, 0, 0, 0, 0xE559, 0xE55A, 0xE55B,
@@ -10938,16 +5789,6 @@ 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_E990_x0213[] = {
- 0, 0xE554, 0xE555, 0x6F3F, 0x7D46, 0, 0, 0x6F40,
- 0xE557, 0xFB45, 0, 0, 0, 0xE559, 0xE55A, 0xFB46,
- 0x6F41, 0, 0, 0x6F3E, 0x6F3D, 0xE55C, 0xFB47, 0xFB48,
- 0x3E62, 0x462A, 0x6F3C, 0, 0, 0, 0, 0xE55F,
- 0, 0x6F45, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x6F43, 0, 0, 0xE560, 0xE561,
- 0, 0xE562, 0xFB4A, 0x7D48, 0xFB4B, 0x6F44, 0x6F42, 0,
- 0x4278, 0, 0x6F46, 0xFB4C, 0, 0xE568, 0, 0xE567,
-};
static const unsigned short utf8_to_euc_E991[] = {
0, 0x6F47, 0, 0xE569, 0x6F49, 0xE56A, 0, 0,
0xE56B, 0, 0xE56C, 0, 0xE56D, 0, 0, 0,
@@ -10958,16 +5799,6 @@ 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_E991_x0213[] = {
- 0, 0x6F47, 0, 0xE569, 0x6F49, 0xFB4D, 0, 0,
- 0xE56B, 0, 0x7D49, 0, 0xE56D, 0, 0, 0,
- 0, 0x3455, 0x6F48, 0x4C7A, 0, 0xE56E, 0, 0,
- 0, 0xE56F, 0x6F54, 0x6F4A, 0xE570, 0, 0x6F4D, 0xE571,
- 0x6F4B, 0xE572, 0x6F4C, 0x7D4A, 0, 0, 0, 0,
- 0xE574, 0, 0x6F4E, 0x7D4B, 0, 0xFB50, 0xE577, 0xFB51,
- 0x6F50, 0x7D4C, 0x7D4D, 0, 0, 0x6F51, 0, 0x6F52,
- 0, 0, 0, 0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
-};
static const unsigned short utf8_to_euc_E992[] = {
0, 0x6F57, 0, 0xE57C, 0xE57B, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -10988,16 +5819,6 @@ 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_E995_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0x4439,
- 0xFB52, 0xFB53, 0, 0, 0, 0, 0xE621, 0,
-};
static const unsigned short utf8_to_euc_E996[] = {
0x4C67, 0, 0x6F59, 0x412E, 0xE622, 0, 0, 0x6F5A,
0xE623, 0x4A44, 0x6F5B, 0x332B, 0xE624, 0xE625, 0xE626, 0x313C,
@@ -11008,16 +5829,6 @@ 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_E996_x0213[] = {
- 0x4C67, 0, 0x6F59, 0x412E, 0xE622, 0, 0xFB54, 0x6F5A,
- 0xE623, 0x4A44, 0x6F5B, 0x332B, 0xFB55, 0xFB56, 0x7D4E, 0x313C,
- 0, 0x3457, 0xF471, 0x3456, 0x6F5C, 0, 0x6F5D, 0,
- 0x6F5E, 0x6F5F, 0, 0, 0, 0xE627, 0xE628, 0x7D4F,
- 0x6F60, 0xE62A, 0x3458, 0x3355, 0x395E, 0x4836, 0x7D50, 0x6F62,
- 0x6F61, 0x7D51, 0, 0xFB58, 0x7D52, 0x6F63, 0, 0,
- 0, 0, 0x315C, 0, 0xFB59, 0, 0x7D53, 0,
- 0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0x7D54, 0x6F67, 0xE633,
-};
static const unsigned short utf8_to_euc_E997[] = {
0, 0, 0, 0x6F6A, 0, 0, 0xE634, 0x3047,
0xE635, 0xE636, 0x6F68, 0xE637, 0x6F6C, 0x6F6B, 0, 0,
@@ -11028,16 +5839,6 @@ 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_E997_x0213[] = {
- 0, 0, 0, 0x6F6A, 0, 0, 0xE634, 0x3047,
- 0xFB5B, 0xE636, 0x6F68, 0x7D55, 0x6F6C, 0x6F6B, 0, 0,
- 0x7D56, 0xE639, 0xE63A, 0x7D57, 0x6F6E, 0x6F6D, 0x6F6F, 0,
- 0x462E, 0xE63C, 0x7D59, 0, 0x6F70, 0xE63E, 0x7D5A, 0xE640,
- 0xE641, 0x6F71, 0x6F73, 0, 0xE642, 0x6F72, 0xE643, 0,
- 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_E998[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11048,16 +5849,6 @@ 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_E998_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x496C, 0xFA25, 0xE645, 0,
- 0, 0x6F74, 0xE646, 0, 0xE647, 0xE648, 0xE649, 0,
- 0x6F75, 0, 0x3A65, 0, 0xFB5E, 0, 0x6F76, 0x6F77,
- 0, 0xE64B, 0x4B49, 0xFB5F, 0xFB60, 0, 0, 0xE64D,
- 0xE64E, 0xE64F, 0xE650, 0x414B, 0xFB62, 0xE652, 0, 0x3024,
-};
static const unsigned short utf8_to_euc_E999[] = {
0x424B, 0xE653, 0x6F78, 0, 0x496D, 0, 0, 0,
0, 0, 0, 0x6F7B, 0x6F79, 0x395F, 0, 0x6F7A,
@@ -11068,16 +5859,6 @@ 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_E999_x0213[] = {
- 0x424B, 0xFB63, 0x6F78, 0, 0x496D, 0, 0, 0,
- 0, 0, 0, 0x6F7B, 0x6F79, 0x395F, 0, 0x6F7A,
- 0x3842, 0, 0xE654, 0, 0xE655, 0, 0xE656, 0xE657,
- 0x7D5B, 0, 0, 0x4A45, 0x6F7D, 0x7021, 0x6F7E, 0x7022,
- 0, 0xFB64, 0x3121, 0x3F58, 0x3D7C, 0x3459, 0x7023, 0,
- 0, 0, 0x4766, 0, 0x7025, 0, 0xE65A, 0,
- 0x3122, 0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
- 0x4E26, 0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
-};
static const unsigned short utf8_to_euc_E99A[] = {
0, 0xE660, 0xE661, 0xE662, 0xE663, 0x3679, 0x4E34, 0,
0x3728, 0xE664, 0x4262, 0x6721, 0, 0x7026, 0x332C, 0x3F6F,
@@ -11088,16 +5869,6 @@ 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_E99A_x0213[] = {
- 0, 0xE660, 0xFB66, 0xE662, 0x7D5C, 0x3679, 0x4E34, 0,
- 0x3728, 0xE664, 0x4262, 0x6721, 0, 0x7026, 0x332C, 0x3F6F,
- 0, 0xE665, 0, 0, 0x3356, 0x7028, 0xE666, 0x7029,
- 0x7027, 0x3764, 0xFB68, 0x3A5D, 0x3E63, 0x7D5E, 0, 0xE669,
- 0x3123, 0, 0, 0x4E59, 0x7D5F, 0x7D60, 0xE66C, 0x702B,
- 0x6E2E, 0xFB6B, 0x702A, 0, 0, 0, 0xE66E, 0xFB6C,
- 0x702E, 0x702C, 0x702D, 0xFB6D, 0x702F, 0, 0x7030, 0x4E6C,
- 0x7031, 0x7032, 0xFB6E, 0x4049, 0x483B, 0xFB6F, 0, 0,
-};
static const unsigned short utf8_to_euc_E99B[] = {
0x3F7D, 0x3467, 0, 0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033, 0,
@@ -11108,16 +5879,6 @@ 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_E99B_x0213[] = {
- 0x3F7D, 0x3467, 0, 0, 0x4D3A, 0x326D, 0x3D38, 0x385B,
- 0, 0x7035, 0xE672, 0x7034, 0x3B73, 0x7036, 0x7033, 0,
- 0, 0x3B28, 0x7D61, 0, 0, 0x703A, 0x6A2D, 0,
- 0xFB72, 0x5256, 0xFB73, 0x3F77, 0x7038, 0xFB74, 0x7D62, 0xE679,
- 0, 0, 0x4E25, 0x4671, 0, 0, 0, 0,
- 0x312B, 0x7D64, 0x4063, 0x3C36, 0, 0, 0, 0x7D65,
- 0x4A37, 0xE67C, 0x3140, 0, 0, 0, 0x4E6D, 0x4D6B,
- 0, 0x703B, 0xE67D, 0x4545, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E99C[] = {
0x3C7B, 0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
0x703E, 0xE723, 0x4E6E, 0, 0, 0x7039, 0x7040, 0x7042,
@@ -11128,16 +5889,6 @@ 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_E99C_x0213[] = {
- 0x3C7B, 0, 0xE67E, 0xE721, 0x703C, 0xE722, 0x703D, 0x3F4C,
- 0x703E, 0xE723, 0x4E6E, 0, 0, 0x7039, 0x7040, 0x7042,
- 0, 0x7041, 0, 0x703F, 0xFB76, 0, 0x7043, 0,
- 0, 0x7044, 0xE724, 0xE725, 0x417A, 0xE726, 0x3262, 0,
- 0, 0xE727, 0xE728, 0xFB77, 0x7045, 0, 0, 0x4C38,
- 0xE72A, 0, 0x7046, 0, 0, 0, 0, 0,
- 0x7047, 0xE72B, 0x4F2A, 0x7D66, 0, 0, 0xFB79, 0,
- 0x5B31, 0x7048, 0, 0x7D67, 0, 0x7049, 0x704A, 0,
-};
static const unsigned short utf8_to_euc_E99D[] = {
0, 0xE72D, 0x704E, 0xE72E, 0x704B, 0, 0x704C, 0,
0x704D, 0x704F, 0xE72F, 0, 0, 0xF475, 0xE730, 0xE731,
@@ -11148,16 +5899,6 @@ 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_E99D_x0213[] = {
- 0, 0xFB7A, 0x704E, 0xE72E, 0x704B, 0, 0x704C, 0xFB7B,
- 0x704D, 0x704F, 0xE72F, 0, 0, 0x7D68, 0x7D69, 0x7D6A,
- 0, 0xF476, 0x4044, 0, 0, 0xFB7C, 0x4C77, 0xFB7D,
- 0xE734, 0x4045, 0x7D6B, 0xFB7E, 0x7050, 0, 0x4873, 0,
- 0x7051, 0x7353, 0x4C4C, 0xE737, 0x7052, 0, 0x7053, 0xE738,
- 0x7054, 0x3357, 0xFC21, 0x7056, 0, 0x3F59, 0x7D6C, 0,
- 0, 0x7057, 0, 0x7D6D, 0x3724, 0, 0xE73C, 0xE73D,
- 0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740, 0, 0xE741,
-};
static const unsigned short utf8_to_euc_E99E[] = {
0xE742, 0x705B, 0, 0, 0x3373, 0x7059, 0x705D, 0,
0, 0xE743, 0, 0x705E, 0, 0x3048, 0, 0x705F,
@@ -11168,16 +5909,6 @@ 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_E99E_x0213[] = {
- 0xE742, 0x705B, 0, 0, 0x3373, 0x7059, 0x705D, 0,
- 0, 0xE743, 0, 0x705E, 0, 0x3048, 0, 0x705F,
- 0x7060, 0, 0, 0, 0, 0x7D6E, 0xFC24, 0xE746,
- 0x3E64, 0xE747, 0xFC25, 0, 0x7061, 0, 0xFC26, 0xE74A,
- 0x3547, 0, 0xFC27, 0x7064, 0, 0, 0x7063, 0,
- 0x7062, 0, 0, 0x6B71, 0xE74C, 0x4A5C, 0x7D6F, 0,
- 0, 0xFC28, 0xFC29, 0x7065, 0x7066, 0xE750, 0xE751, 0,
- 0xE752, 0xE753, 0x7D70, 0, 0xE755, 0, 0xFC2A, 0xE757,
-};
static const unsigned short utf8_to_euc_E99F[] = {
0, 0xE758, 0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
0x7069, 0xE75C, 0xE75D, 0x706A, 0xE75E, 0xE75F, 0xE760, 0,
@@ -11188,16 +5919,6 @@ 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_E99F_x0213[] = {
- 0, 0x7D71, 0, 0x7067, 0xE759, 0xE75A, 0x7068, 0xE75B,
- 0x7069, 0x7D72, 0xE75D, 0x706A, 0xFC2B, 0xE75F, 0xE760, 0,
- 0xE761, 0xFC2C, 0, 0x345A, 0xFC2D, 0, 0, 0xE764,
- 0xFC2E, 0xFC2F, 0, 0x7D74, 0x706B, 0xE767, 0x7D73, 0,
- 0xE769, 0xFC30, 0, 0, 0xE76C, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x706C, 0x4723, 0xE76D,
- 0, 0xFC31, 0x706E, 0x323B, 0x7D75, 0x7071, 0x7070, 0xE770,
- 0xE771, 0, 0xE772, 0x3124, 0, 0, 0, 0x3641,
-};
static const unsigned short utf8_to_euc_E9A0[] = {
0, 0x4A47, 0x443A, 0x3A22, 0, 0x3960, 0x3D67, 0xE773,
0x3F5C, 0, 0xE774, 0, 0x7073, 0xE776, 0xE777, 0x7072,
@@ -11208,16 +5929,6 @@ 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_E9A0_x0213[] = {
- 0, 0x4A47, 0x443A, 0x3A22, 0xFC32, 0x3960, 0x3D67, 0xE773,
- 0x3F5C, 0, 0x7D77, 0, 0x7073, 0xFC33, 0xFC34, 0x7072,
- 0x4D42, 0x3468, 0x4852, 0x465C, 0xFC35, 0, 0xFC36, 0x3F7C,
- 0x4E4E, 0xE775, 0x375B, 0, 0xE77A, 0, 0x7D78, 0,
- 0xE77C, 0x7076, 0, 0xFC39, 0x7075, 0xFC3C, 0xE77E, 0,
- 0, 0, 0, 0x7D79, 0x4B4B, 0x462C, 0xE822, 0xE823,
- 0x7D7A, 0, 0xFC3A, 0xFC3B, 0x3150, 0xE827, 0, 0x7077,
- 0x7074, 0, 0, 0x4951, 0x4D6A, 0x7078, 0xE829, 0,
-};
static const unsigned short utf8_to_euc_E9A1[] = {
0, 0, 0, 0, 0xE82A, 0, 0x7079, 0xE82B,
0, 0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
@@ -11228,16 +5939,6 @@ 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_E9A1_x0213[] = {
- 0, 0, 0, 0, 0xE82A, 0, 0x7079, 0xFC3D,
- 0, 0, 0xE82C, 0x707B, 0x426A, 0x335B, 0x335C, 0x707A,
- 0, 0xE82D, 0x7D7C, 0x7D7D, 0x3469, 0x3832, 0x7D7E, 0x7E21,
- 0x346A, 0x7E22, 0x7E23, 0x453F, 0, 0, 0x4E60, 0,
- 0, 0, 0xE834, 0xE835, 0, 0x7E25, 0xFC3E, 0x385C,
- 0, 0, 0xE838, 0x707C, 0x7E26, 0, 0, 0x707D,
- 0x707E, 0x7121, 0, 0x7123, 0x7122, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E9A2[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11248,16 +5949,6 @@ 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_E9A2_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x4977, 0, 0x7124, 0xFC3F, 0, 0xFC40, 0xE83C, 0x7125,
- 0xFC41, 0x7126, 0, 0, 0xE83E, 0, 0x7127, 0xFC43,
- 0xFC44, 0, 0x7E27, 0xFC45, 0xFC46, 0, 0, 0xFC47,
-};
static const unsigned short utf8_to_euc_E9A3[] = {
0, 0, 0xE844, 0x7129, 0x7128, 0xE845, 0x712A, 0,
0xE846, 0, 0, 0, 0xE847, 0, 0, 0,
@@ -11268,16 +5959,6 @@ 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_E9A3_x0213[] = {
- 0, 0, 0xFC48, 0x7129, 0x7128, 0xE845, 0x712A, 0xFC49,
- 0x7E28, 0, 0, 0xFC4A, 0xE847, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0x4874, 0x664C, 0, 0, 0x3F29,
- 0xFC4B, 0xFC4D, 0x3532, 0xFC4E, 0, 0xFC4F, 0xE84B, 0x7E29,
- 0, 0x712B, 0xFC50, 0x712C, 0, 0x522C, 0x5D3B, 0x4853,
- 0xFC51, 0xFC52, 0x307B, 0xFC53, 0x303B, 0, 0xE84F, 0,
- 0, 0, 0, 0, 0x3B74, 0x4B30, 0x3E7E, 0,
-};
static const unsigned short utf8_to_euc_E9A4[] = {
0, 0, 0xE850, 0x712D, 0, 0x4C5F, 0, 0xE851,
0xE852, 0x712E, 0x4D5C, 0, 0x3142, 0, 0, 0,
@@ -11288,16 +5969,6 @@ 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_E9A4_x0213[] = {
- 0, 0, 0xE850, 0x712D, 0, 0x4C5F, 0, 0xE851,
- 0xFC54, 0x712E, 0x4D5C, 0, 0x3142, 0, 0, 0,
- 0x3B41, 0xE853, 0x712F, 0x326E, 0x7130, 0xE854, 0xFC57, 0xFC58,
- 0x7131, 0, 0xFC5A, 0xFC5B, 0xFC5C, 0x7133, 0x7134, 0xE85A,
- 0x7136, 0x7132, 0xE85B, 0, 0x7135, 0, 0xE85C, 0xE85D,
- 0x345B, 0, 0, 0xE85E, 0x7137, 0, 0x7138, 0,
- 0, 0xFC5E, 0xFC5F, 0xFC60, 0xE862, 0xE863, 0, 0,
- 0, 0xE864, 0xFC61, 0xFC62, 0xFC63, 0x7139, 0x713A, 0,
-};
static const unsigned short utf8_to_euc_E9A5[] = {
0xE868, 0xE869, 0x713B, 0, 0, 0x713D, 0xE86A, 0xE86B,
0xE86C, 0x713C, 0, 0x713F, 0x7142, 0xE86D, 0xE86E, 0,
@@ -11308,16 +5979,6 @@ 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_E9A5_x0213[] = {
- 0xFC64, 0xFC65, 0x713B, 0, 0, 0x713D, 0xFC66, 0xE86B,
- 0xE86C, 0x713C, 0, 0x713F, 0x7142, 0xFC67, 0xFC68, 0,
- 0x713E, 0x7140, 0x7141, 0, 0xE86F, 0x7143, 0, 0x3642,
- 0x7E2A, 0xE871, 0, 0xE872, 0xFC69, 0, 0xE874, 0xFC6A,
- 0xFC6B, 0, 0, 0, 0, 0, 0, 0,
- 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_E9A6[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11328,16 +5989,6 @@ 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_E9A6_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x3C73, 0x7144,
- 0x7145, 0x3961, 0, 0xE877, 0, 0xE878, 0x7E2B, 0xE879,
- 0, 0, 0, 0xFC6C, 0, 0x7146, 0xFC6D, 0,
- 0x333E, 0, 0, 0, 0x474F, 0x7147, 0x7148, 0,
- 0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E, 0, 0,
- 0, 0xFC6E, 0xE922, 0, 0x7149, 0xFC6F, 0, 0xFC70,
-};
static const unsigned short utf8_to_euc_E9A7[] = {
0, 0x477D, 0, 0xE925, 0x424C, 0x3158, 0x366E, 0,
0x366F, 0xE926, 0, 0, 0, 0, 0, 0,
@@ -11348,16 +5999,6 @@ 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_E9A7_x0213[] = {
- 0, 0x477D, 0, 0xFC71, 0x424C, 0x3158, 0x366E, 0,
- 0x366F, 0xFC72, 0, 0, 0, 0, 0, 0,
- 0x4373, 0x714E, 0x3670, 0xE927, 0xFC73, 0x326F, 0, 0,
- 0x714D, 0xFC74, 0xE92A, 0x714B, 0xE92B, 0x714C, 0xFC75, 0x714A,
- 0, 0, 0x7158, 0, 0, 0, 0, 0xE92D,
- 0, 0, 0xE92E, 0xE92F, 0xE930, 0x714F, 0x7150, 0,
- 0xFC77, 0x7151, 0x7152, 0, 0xE932, 0xE933, 0, 0,
- 0x7154, 0xFC78, 0, 0x7153, 0xFC79, 0xE935, 0xE936, 0x3D59,
-};
static const unsigned short utf8_to_euc_E9A8[] = {
0, 0x7155, 0xE937, 0xE938, 0xE939, 0x7157, 0, 0,
0, 0, 0, 0xE93A, 0xE93B, 0, 0x3533, 0x7156,
@@ -11368,16 +6009,6 @@ 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_E9A8_x0213[] = {
- 0, 0x7155, 0x7E2C, 0x7E2D, 0xE939, 0x7157, 0, 0,
- 0, 0, 0xFC7A, 0xE93A, 0xE93B, 0, 0x3533, 0x7156,
- 0xE93C, 0xFC7B, 0x417B, 0x3833, 0, 0, 0xFC7C, 0,
- 0, 0x7159, 0xFC7D, 0, 0, 0, 0xE93F, 0,
- 0xFC7E, 0, 0xE941, 0xE942, 0x7E2E, 0, 0, 0xE944,
- 0x424D, 0, 0, 0x715A, 0, 0x7E2F, 0x7E30, 0,
- 0x462D, 0xFD21, 0, 0xE947, 0, 0xE948, 0xFD22, 0x715B,
- 0x7E31, 0, 0, 0, 0, 0, 0x7160, 0,
-};
static const unsigned short utf8_to_euc_E9A9[] = {
0x715E, 0xE94C, 0x715D, 0x715F, 0xE94D, 0x715C, 0, 0xE94B,
0, 0, 0xE94E, 0xE94F, 0xE950, 0x7162, 0xE951, 0,
@@ -11388,16 +6019,6 @@ 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_E9A9_x0213[] = {
- 0x715E, 0xE94C, 0x715D, 0x715F, 0xFD23, 0x715C, 0, 0xE94B,
- 0, 0, 0x7E32, 0xE94F, 0xFD24, 0x7162, 0x7E33, 0,
- 0, 0xE952, 0x7E34, 0, 0xE953, 0x7161, 0xE954, 0x7164,
- 0xFD25, 0, 0x3643, 0x7163, 0, 0xE955, 0, 0x7165,
- 0, 0, 0x7166, 0, 0x7168, 0x7167, 0, 0,
- 0, 0x7169, 0x716B, 0x716A, 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_E9AA[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11408,16 +6029,6 @@ 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_E9AA_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x397C, 0, 0xE956, 0, 0xE957, 0x716C, 0xE958, 0xFD27,
- 0x716D, 0, 0xE95A, 0, 0xE95B, 0xE95C, 0x7E35, 0xFD29,
- 0x333C, 0xFD2B, 0, 0xE95F, 0x716E, 0, 0xE960, 0xE961,
-};
static const unsigned short utf8_to_euc_E9AB[] = {
0x716F, 0xE962, 0, 0xE963, 0x3F71, 0, 0xE964, 0,
0xE965, 0, 0, 0, 0, 0, 0xE966, 0x7170,
@@ -11428,16 +6039,6 @@ 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_E9AB_x0213[] = {
- 0x716F, 0x7E36, 0, 0x7E37, 0x3F71, 0, 0xFD2D, 0,
- 0xE965, 0, 0, 0, 0, 0, 0x7E38, 0x7170,
- 0xFD2E, 0x7171, 0xFD2F, 0x7172, 0x7173, 0xFD30, 0x7E39, 0xE96B,
- 0x3962, 0xF47B, 0, 0xE96C, 0xFD32, 0, 0x7174, 0x7175,
- 0xFD33, 0, 0x7176, 0x7177, 0xE96F, 0xFD34, 0x7178, 0xE971,
- 0, 0xFD35, 0x4831, 0x717A, 0xE973, 0x4926, 0x717B, 0x7179,
- 0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976, 0, 0x717E,
- 0, 0x7E3A, 0xE978, 0x7221, 0, 0xE979, 0, 0xE97A,
-};
static const unsigned short utf8_to_euc_E9AC[] = {
0xE97B, 0xE97C, 0xE97D, 0xE97E, 0xEA21, 0xEA22, 0x7222, 0,
0xEA23, 0xEA24, 0, 0xEA25, 0xEA26, 0xEA27, 0xEA28, 0,
@@ -11448,16 +6049,6 @@ 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_E9AC_x0213[] = {
- 0xE97B, 0xE97C, 0x7E3B, 0xFD36, 0xEA21, 0xEA22, 0x7222, 0,
- 0x7E3C, 0xEA24, 0, 0xEA25, 0xFD37, 0xEA27, 0xEA28, 0,
- 0xFD38, 0, 0xFD39, 0, 0, 0, 0xFD3A, 0,
- 0x7223, 0xEA2C, 0x7224, 0xEA2D, 0xFD3B, 0, 0, 0x7225,
- 0x7E3D, 0, 0x7226, 0x7227, 0, 0x7228, 0xEA30, 0x7229,
- 0x722A, 0x722B, 0x722C, 0xFD3C, 0, 0x7E3F, 0x722D, 0x722E,
- 0, 0x5D35, 0x722F, 0xFD3D, 0xEA34, 0xEA35, 0, 0xEA36,
- 0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xFD3E, 0, 0,
-};
static const unsigned short utf8_to_euc_E9AD[] = {
0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25, 0, 0,
0xEA3A, 0, 0, 0xEA3B, 0xEA3C, 0x7233, 0x7234, 0x7232,
@@ -11468,16 +6059,6 @@ 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_E9AD_x0213[] = {
- 0, 0x3321, 0x3A32, 0x7231, 0x7230, 0x4C25, 0, 0,
- 0xEA3A, 0, 0, 0xFD40, 0xEA3C, 0x7233, 0x7234, 0x7232,
- 0, 0x7235, 0, 0, 0x4B62, 0xEA3D, 0xEA3E, 0xEA3F,
- 0x7236, 0, 0x357B, 0xEA40, 0, 0, 0x7E40, 0,
- 0, 0xEA42, 0, 0xFD41, 0, 0xFD42, 0x7E42, 0,
- 0xEA46, 0, 0xEA47, 0xFD43, 0xFD44, 0xEA4A, 0xEA4B, 0x4F25,
- 0, 0, 0x7E43, 0xFD45, 0x7237, 0x7E44, 0xFD46, 0xFD47,
- 0xEA4F, 0x7E41, 0, 0, 0, 0, 0, 0xEA51,
-};
static const unsigned short utf8_to_euc_E9AE[] = {
0xEA52, 0, 0, 0x7239, 0xEA53, 0xEA54, 0xEA55, 0xEA56,
0, 0xEA57, 0xEA58, 0xEA59, 0, 0xEA5A, 0x303E, 0xEA5B,
@@ -11488,16 +6069,6 @@ 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_E9AE_x0213[] = {
- 0xEA52, 0, 0, 0x7239, 0x7E45, 0xEA54, 0xEA55, 0xEA56,
- 0, 0xEA57, 0x7E46, 0xEA59, 0, 0xEA5A, 0x303E, 0x7E47,
- 0xEA5C, 0x723A, 0x4A2B, 0x7238, 0xEA5D, 0, 0x723B, 0x723C,
- 0, 0, 0xEA5E, 0, 0, 0xEA5F, 0x7E48, 0x723D,
- 0x723E, 0, 0, 0, 0, 0, 0xFD48, 0x7E49,
- 0x723F, 0xEA63, 0x4B6E, 0x3B2D, 0xFD49, 0x3A7A, 0x412F, 0,
- 0xEA65, 0xFD4A, 0xFD4D, 0, 0x7240, 0, 0, 0xEA68,
- 0xFD4E, 0x7243, 0, 0xEA6A, 0xEA6B, 0, 0xFD4F, 0xEA6D,
-};
static const unsigned short utf8_to_euc_E9AF[] = {
0x7241, 0xEA6E, 0, 0, 0, 0, 0x7244, 0xEA6F,
0xEA70, 0x3871, 0x7242, 0, 0, 0, 0xEA71, 0x7245,
@@ -11508,16 +6079,6 @@ 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_E9AF_x0213[] = {
- 0x7241, 0x7E4A, 0, 0, 0, 0, 0x7244, 0xFD50,
- 0xEA70, 0x3871, 0x7242, 0, 0, 0, 0x7E4B, 0x7245,
- 0xEA72, 0x7246, 0x7247, 0, 0x724B, 0, 0x3B2A, 0xEA73,
- 0xFD52, 0, 0, 0x4264, 0, 0xFD53, 0, 0xEA76,
- 0, 0x724C, 0x7249, 0x7248, 0x724A, 0x7E4C, 0, 0xFD54,
- 0x375F, 0, 0xFD55, 0xFD56, 0, 0, 0xFD58, 0xFD57,
- 0x7250, 0x724F, 0x724E, 0xFD51, 0, 0x3033, 0, 0xFD5C,
- 0x7E4D, 0xEB21, 0xFD5A, 0, 0, 0x7E4E, 0, 0xEB24,
-};
static const unsigned short utf8_to_euc_E9B0[] = {
0xEB25, 0, 0xEB26, 0, 0x725A, 0, 0x7256, 0,
0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362, 0, 0xEB28,
@@ -11528,16 +6089,6 @@ 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_E9B0_x0213[] = {
- 0x7E4F, 0, 0xEB26, 0, 0x725A, 0, 0x7256, 0,
- 0x7257, 0x7253, 0x7259, 0xEB27, 0x7255, 0x3362, 0, 0xEB28,
- 0x4F4C, 0xEB29, 0x7258, 0x7254, 0x7252, 0x7251, 0xFD5E, 0,
- 0xFD5F, 0xFD60, 0xFD61, 0x725C, 0xEB2E, 0xFD62, 0xEB2F, 0,
- 0, 0x725F, 0xFD63, 0x7E50, 0x725E, 0x725D, 0xEB32, 0xFD64,
- 0xEB34, 0xFD65, 0xFD66, 0, 0, 0x4949, 0x725B, 0x3073,
- 0x7260, 0xFD68, 0x7262, 0, 0, 0xEB38, 0xFD69, 0xFD6A,
- 0, 0x336F, 0x724D, 0x3137, 0, 0xEB3B, 0x7264, 0,
-};
static const unsigned short utf8_to_euc_E9B1[] = {
0, 0xEB3C, 0, 0xEB3D, 0xEB3E, 0xEB3F, 0x7263, 0x7261,
0x432D, 0xEB40, 0xEB41, 0, 0, 0, 0xEB42, 0xEB43,
@@ -11548,16 +6099,6 @@ 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_E9B1_x0213[] = {
- 0, 0x7E51, 0, 0xEB3D, 0xEB3E, 0xFD6B, 0x7263, 0x7261,
- 0x432D, 0xFD6E, 0xFD6F, 0, 0, 0, 0xEB42, 0x7E52,
- 0x7E53, 0, 0x4B70, 0x7E54, 0xFD71, 0, 0xEB47, 0x4E5A,
- 0xFD72, 0, 0x7265, 0xFD73, 0xFD6C, 0xFD74, 0xEB4B, 0xFD75,
- 0x7266, 0, 0, 0x7E55, 0, 0x7E56, 0, 0x7267,
- 0xEB52, 0xFD76, 0xFD77, 0xFD78, 0, 0xFD79, 0xFD7A, 0,
- 0xFD7B, 0, 0xFD7C, 0, 0, 0xFD7D, 0x7268, 0x7E57,
- 0x7269, 0, 0xFD7E, 0xEB58, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E9B3[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11568,16 +6109,6 @@ 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_E9B3_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x443B, 0xFE21, 0x726A,
- 0, 0x4837, 0, 0x726F, 0x726B, 0, 0, 0,
- 0x726C, 0, 0xFE22, 0x4B31, 0x4C44, 0, 0x4650, 0xEB5B,
- 0, 0xEB5C, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_E9B4[] = {
0, 0, 0xEB5E, 0x7270, 0, 0, 0x7271, 0x463E,
0x726E, 0x726D, 0, 0xEB5D, 0, 0, 0x322A, 0,
@@ -11588,16 +6119,6 @@ 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_E9B4_x0213[] = {
- 0, 0, 0xFE24, 0x7270, 0, 0, 0x7271, 0x463E,
- 0x726E, 0x726D, 0, 0xFE23, 0, 0, 0x322A, 0,
- 0, 0xFE26, 0x7279, 0, 0, 0x7278, 0, 0xFE27,
- 0xFE28, 0, 0, 0x3175, 0xEB62, 0x7E58, 0x7E59, 0x7276,
- 0, 0, 0, 0x7275, 0, 0, 0x7273, 0,
- 0x337B, 0, 0x7272, 0x3C32, 0x3229, 0, 0, 0xEB65,
- 0xEB66, 0, 0xFE2C, 0xEB68, 0xEB69, 0, 0, 0,
- 0, 0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
-};
static const unsigned short utf8_to_euc_E9B5[] = {
0, 0x727A, 0xEB6E, 0xEB6F, 0x7277, 0xEB6C, 0x727D, 0xEB70,
0x727E, 0, 0xEB71, 0, 0, 0, 0, 0,
@@ -11608,16 +6129,6 @@ 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_E9B5_x0213[] = {
- 0, 0x727A, 0xFE2E, 0x7E5A, 0x7277, 0xEB6C, 0x727D, 0x7E5B,
- 0x727E, 0, 0xFE2F, 0, 0, 0, 0, 0,
- 0x7325, 0x7324, 0x7E5C, 0xEB72, 0xEB73, 0, 0, 0,
- 0, 0x7326, 0, 0, 0x312D, 0x7321, 0x7322, 0xFE30,
- 0x3974, 0x4C39, 0xFE31, 0x7E5D, 0x7323, 0xEB77, 0, 0,
- 0, 0xFE33, 0xEB79, 0xFE34, 0x4B32, 0, 0, 0x732B,
- 0x7E5E, 0, 0x7327, 0xFE36, 0, 0, 0xFE37, 0xFE38,
- 0, 0, 0x732C, 0xEB7E, 0x7E5F, 0, 0xFE39, 0,
-};
static const unsigned short utf8_to_euc_E9B6[] = {
0, 0, 0, 0xEC23, 0xEC24, 0, 0xEC25, 0x7329,
0, 0x7328, 0xEC26, 0, 0, 0xEC27, 0xEC28, 0x375C,
@@ -11628,16 +6139,6 @@ 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_E9B6_x0213[] = {
- 0, 0, 0, 0xEC23, 0xFE3A, 0, 0xEC25, 0x7329,
- 0, 0x7328, 0x7E60, 0, 0, 0xFE3B, 0xEC28, 0x375C,
- 0, 0, 0xEC29, 0xEC2A, 0, 0xEC2B, 0x7E61, 0xEC2D,
- 0xEC2E, 0xFE3C, 0x732D, 0, 0, 0, 0, 0,
- 0, 0xFE3D, 0, 0, 0x732E, 0, 0, 0,
- 0, 0x732F, 0xEC30, 0x732A, 0x7E63, 0, 0xEC32, 0x7274,
- 0, 0xEC33, 0x7330, 0, 0x4461, 0xFE3F, 0, 0,
- 0x7334, 0xFE40, 0x7335, 0x7333, 0x7E64, 0xFE41, 0, 0xFE3E,
-};
static const unsigned short utf8_to_euc_E9B7[] = {
0, 0x7332, 0x7338, 0xEC38, 0x7331, 0, 0x7336, 0xEC39,
0, 0xEC3A, 0xEC3B, 0, 0, 0, 0, 0x7337,
@@ -11648,16 +6149,6 @@ 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_E9B7_x0213[] = {
- 0x7E62, 0x7332, 0x7338, 0xFE42, 0x7331, 0, 0x7336, 0xFE43,
- 0, 0xFE44, 0xEC3B, 0, 0, 0, 0, 0x7337,
- 0, 0, 0, 0x733A, 0xEC3C, 0xEC3D, 0xFE45, 0x7E65,
- 0, 0x7339, 0xFE46, 0, 0, 0, 0xEC41, 0xFE47,
- 0xFE48, 0, 0, 0xFE49, 0, 0xEC44, 0x733C, 0x7E67,
- 0, 0xEC46, 0, 0xEC47, 0, 0x733D, 0xEC48, 0x733E,
- 0xEC49, 0, 0x4F49, 0xEC4A, 0xFE4A, 0, 0, 0,
- 0x733B, 0x426B, 0x3A6D, 0, 0, 0x733F, 0xEC4C, 0,
-};
static const unsigned short utf8_to_euc_E9B8[] = {
0, 0, 0xEC4E, 0, 0, 0, 0, 0xEC4F,
0, 0, 0xEC4D, 0, 0, 0, 0xEC50, 0,
@@ -11668,16 +6159,6 @@ 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_E9B8_x0213[] = {
- 0, 0, 0xFE4D, 0, 0, 0, 0, 0x7E68,
- 0, 0, 0xFE4C, 0, 0, 0xFE4E, 0xEC50, 0,
- 0xEC51, 0xEC52, 0xEC53, 0, 0, 0x7E69, 0xEC55, 0,
- 0, 0xFE4F, 0x7340, 0x7341, 0xFE50, 0xFE51, 0x7342, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_E9B9[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11688,16 +6169,6 @@ 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_E9B9_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x7343, 0, 0,
- 0x3834, 0x7344, 0xEC59, 0xFE52, 0x7E6A, 0x7345, 0, 0x3C2F,
-};
static const unsigned short utf8_to_euc_E9BA[] = {
0xEC5C, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xEC60, 0, 0xEC61,
0x7347, 0, 0, 0x7348, 0x7349, 0, 0xEC62, 0xEC63,
@@ -11708,16 +6179,6 @@ 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_E9BA_x0213[] = {
- 0xFE54, 0x7346, 0xEC5D, 0xEC5E, 0xEC5F, 0xFE55, 0, 0xEC61,
- 0x7347, 0, 0, 0x7348, 0x7349, 0, 0xEC62, 0xEC63,
- 0, 0x734C, 0x734A, 0x4F3C, 0, 0x734B, 0xEC64, 0x4E6F,
- 0xEC65, 0, 0, 0xFE56, 0, 0x734D, 0x7E6B, 0x4E5B,
- 0, 0, 0, 0, 0x7E6C, 0x734E, 0x477E, 0,
- 0xFE57, 0x734F, 0x7351, 0, 0x7E6D, 0x7352, 0xEC6B, 0x7E6E,
- 0xEC6D, 0, 0, 0xEC6E, 0x7E6F, 0x7E70, 0, 0,
- 0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677, 0xFE59, 0x5D60, 0x4B7B,
-};
static const unsigned short utf8_to_euc_E9BB[] = {
0, 0, 0, 0, 0x322B, 0, 0xEC71, 0,
0xEC72, 0, 0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
@@ -11728,16 +6189,6 @@ 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_E9BB_x0213[] = {
- 0, 0, 0, 0x7E71, 0x322B, 0, 0xEC71, 0,
- 0xEC72, 0, 0, 0xEC73, 0x7354, 0x3550, 0x7355, 0x7356,
- 0x7357, 0x7E72, 0x3975, 0, 0x7358, 0xEC74, 0, 0,
- 0x6054, 0x4C5B, 0, 0x4263, 0x7359, 0x735B, 0x735A, 0xFE5B,
- 0x735C, 0, 0, 0, 0xEC76, 0x735D, 0, 0xFE5C,
- 0x735E, 0, 0, 0, 0xEC78, 0xEC79, 0xFE5D, 0x735F,
- 0xEC7B, 0xEC7C, 0xEC7D, 0, 0x7360, 0xEC7E, 0x7361, 0x7362,
- 0xED21, 0x7363, 0, 0x7364, 0x7365, 0x7366, 0, 0xFE5E,
-};
static const unsigned short utf8_to_euc_E9BC[] = {
0, 0, 0xED23, 0xED24, 0, 0, 0, 0x7367,
0x7368, 0xED25, 0, 0, 0, 0, 0x4524, 0xED26,
@@ -11748,16 +6199,6 @@ 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_E9BC_x0213[] = {
- 0, 0, 0xFE5F, 0xFE61, 0, 0, 0, 0x7367,
- 0x7368, 0xED25, 0, 0, 0, 0, 0x4524, 0xED26,
- 0x7E73, 0xED28, 0xED29, 0x385D, 0xED2A, 0x736A, 0xED2B, 0xFE62,
- 0, 0xFE63, 0xED2E, 0xED2F, 0, 0, 0, 0xED30,
- 0x414D, 0x736B, 0xED31, 0, 0, 0, 0xED32, 0,
- 0, 0, 0xED33, 0xED34, 0x736C, 0, 0, 0xFE64,
- 0, 0xED36, 0xED37, 0, 0xED38, 0, 0, 0xFE65,
- 0, 0x7E74, 0xFE66, 0x4921, 0xED3C, 0xFE67, 0x736D, 0xED3E,
-};
static const unsigned short utf8_to_euc_E9BD[] = {
0, 0xED3F, 0, 0xED40, 0xED41, 0xED42, 0xED43, 0xED44,
0, 0, 0x736E, 0x6337, 0, 0, 0x6C5A, 0x706D,
@@ -11768,16 +6209,6 @@ 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_E9BD_x0213[] = {
- 0, 0xFE68, 0, 0xED40, 0xED41, 0xFE69, 0xFE6A, 0xED44,
- 0, 0, 0x736E, 0x6337, 0, 0, 0x6C5A, 0x706D,
- 0, 0, 0x736F, 0xFE6B, 0x7370, 0xFE6C, 0xED47, 0x7E75,
- 0xFE6D, 0, 0xED4A, 0, 0, 0xFE6F, 0xED4C, 0x7372,
- 0x7373, 0x7374, 0x4E70, 0x7371, 0, 0, 0x7375, 0x7376,
- 0xED4D, 0xFE71, 0x7378, 0, 0x7377, 0xFE73, 0xED50, 0xED51,
- 0xFE74, 0xED53, 0x737A, 0xED54, 0, 0xFE75, 0x737B, 0x7379,
- 0, 0, 0xED56, 0, 0, 0xED57, 0, 0,
-};
static const unsigned short utf8_to_euc_E9BE[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0x4E36, 0, 0xED58,
@@ -11788,16 +6219,6 @@ 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_E9BE_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x4E36, 0, 0xED58,
- 0x7E76, 0xED5A, 0xED5B, 0, 0x7E77, 0x737C, 0xED5D, 0x7E78,
- 0, 0, 0, 0, 0x737D, 0x6354, 0xED5F, 0,
- 0x737E, 0xED60, 0x7E79, 0xED62, 0, 0xED63, 0, 0,
- 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_EFA4[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11808,26 +6229,6 @@ 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_EFA4_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0x763B, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x742E, 0x754E, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0x7B4F, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
-static const unsigned short utf8_to_euc_EFA5_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x7649, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-};
static const unsigned short utf8_to_euc_EFA7[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -11838,16 +6239,6 @@ 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_EFA7_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0x7E24, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0x7D5D, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_EFA8[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xF434, 0xF437,
@@ -11858,36 +6249,6 @@ 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_EFA8_x0213[] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0xF434, 0x2F4B,
- 0x2F57, 0x4F72, 0xF444, 0xAE79, 0x757A, 0x775A, 0x776F, 0xF453,
- 0xF455, 0x793C, 0x793D, 0x7941, 0xF45A, 0xF45B, 0xF45E, 0x7B3A,
- 0xF738, 0xF745, 0x7C2E, 0xF469, 0xF96E, 0xF46B, 0x7C6A, 0xF46F,
- 0xF470, 0xF473, 0xF477, 0xF478, 0xF479, 0xF47D, 0, 0,
- 0x2E38, 0x2E49, 0x2E50, 0x2E63, 0x2E68, 0x2E6E, 0x2F2C, 0x2F2F,
- 0x2F36, 0x2F5A, 0x2F5E, 0x4F61, 0x4F62, 0x7450, 0x745C, 0x745E,
-};
-static const unsigned short utf8_to_euc_EFA9_x0213[] = {
- 0x7461, 0x7528, 0x752B, 0x7543, 0x7565, 0x7669, 0x7677, 0x7725,
- 0x7755, 0xF029, 0x7825, 0x7927, 0x7933, 0x7934, 0x7937, 0x7938,
- 0x7939, 0x793B, 0x793F, 0x7940, 0x794D, 0x7951, 0x7964, 0x7A2E,
- 0xF450, 0x7A33, 0x7A3A, 0x7A44, 0x7A58, 0xF574, 0xF575, 0x7B27,
- 0x7B6F, 0x7B79, 0x7C2F, 0x7C30, 0x7C38, 0x7C3D, 0xF969, 0x7C59,
- 0x7D63, 0x7D76, 0x7D7B, 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_EFB9_x0213[] = {
- 0, 0, 0, 0, 0, 0x233E, 0x233D, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 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_EFBC[] = {
0, 0x212A, 0xF42A, 0x2174, 0x2170, 0x2173, 0x2175, 0xF429,
0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x215D, 0x2125, 0x213F,
@@ -11898,16 +6259,6 @@ 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_EFBC_x0213[] = {
- 0, 0x212A, 0x2230, 0x2174, 0x2170, 0x2173, 0x2175, 0x222F,
- 0x214A, 0x214B, 0x2176, 0x215C, 0x2124, 0x2231, 0x2125, 0x213F,
- 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337,
- 0x2338, 0x2339, 0x2127, 0x2128, 0x2163, 0x2161, 0x2164, 0x2129,
- 0x2177, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347,
- 0x2348, 0x2349, 0x234A, 0x234B, 0x234C, 0x234D, 0x234E, 0x234F,
- 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
- 0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
-};
static const unsigned short utf8_to_euc_EFBD[] = {
0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
@@ -11928,16 +6279,6 @@ 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_EFBD_x0213[] = {
- 0x212E, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367,
- 0x2368, 0x2369, 0x236A, 0x236B, 0x236C, 0x236D, 0x236E, 0x236F,
- 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377,
- 0x2378, 0x2379, 0x237A, 0x2150, 0x2143, 0x2151, 0x2232, 0x2256,
- 0x2257, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27,
- 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F,
- 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
- 0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
-};
static const unsigned short utf8_to_euc_EFBE[] = {
0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47,
0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F,
@@ -11958,24 +6299,6 @@ 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_E1_x0213[] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 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_E1B8_x0213, 0, 0, 0,
- 0, utf8_to_euc_E1BD_x0213, 0, 0,
-};
static 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,
@@ -12048,24 +6371,6 @@ static const unsigned short *const utf8_to_euc_E2_mac[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E2_x0213[] = {
- utf8_to_euc_E280_x0213, utf8_to_euc_E281_x0213, utf8_to_euc_E282_x0213, 0,
- utf8_to_euc_E284_x0213, utf8_to_euc_E285_x0213, utf8_to_euc_E286_x0213, utf8_to_euc_E287_x0213,
- utf8_to_euc_E288_x0213, utf8_to_euc_E289_x0213, utf8_to_euc_E28A_x0213, utf8_to_euc_E28B_x0213,
- utf8_to_euc_E28C_x0213, 0, utf8_to_euc_E28E_x0213, utf8_to_euc_E28F_x0213,
- utf8_to_euc_E290_x0213, utf8_to_euc_E291, 0, utf8_to_euc_E293_x0213,
- utf8_to_euc_E294, utf8_to_euc_E295, utf8_to_euc_E296_x0213, utf8_to_euc_E297_x0213,
- utf8_to_euc_E298_x0213, utf8_to_euc_E299_x0213, 0, 0,
- utf8_to_euc_E29C_x0213, utf8_to_euc_E29D_x0213, 0, 0,
- 0, 0, 0, 0,
- utf8_to_euc_E2A4_x0213, 0, utf8_to_euc_E2A6_x0213, utf8_to_euc_E2A7_x0213,
- 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[] = {
utf8_to_euc_E380, utf8_to_euc_E381, utf8_to_euc_E382, utf8_to_euc_E383,
0, 0, 0, 0,
@@ -12120,24 +6425,6 @@ static const unsigned short *const utf8_to_euc_E3_mac[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-static const unsigned short *const utf8_to_euc_E3_x0213[] = {
- utf8_to_euc_E380_x0213, utf8_to_euc_E381, utf8_to_euc_E382_x0213, utf8_to_euc_E383_x0213,
- 0, 0, 0, utf8_to_euc_E387_x0213,
- utf8_to_euc_E388, utf8_to_euc_E389_x0213, utf8_to_euc_E38A_x0213, utf8_to_euc_E38B_x0213,
- utf8_to_euc_E38C, utf8_to_euc_E38D, utf8_to_euc_E38E, utf8_to_euc_E38F_x0213,
- utf8_to_euc_E390_x0213, utf8_to_euc_E391_x0213, utf8_to_euc_E392_x0213, utf8_to_euc_E393_x0213,
- utf8_to_euc_E394_x0213, utf8_to_euc_E395_x0213, utf8_to_euc_E396_x0213, utf8_to_euc_E397_x0213,
- utf8_to_euc_E398_x0213, utf8_to_euc_E399_x0213, utf8_to_euc_E39A_x0213, utf8_to_euc_E39B_x0213,
- 0, utf8_to_euc_E39D_x0213, utf8_to_euc_E39E_x0213, utf8_to_euc_E39F_x0213,
- utf8_to_euc_E3A0_x0213, utf8_to_euc_E3A1_x0213, 0, utf8_to_euc_E3A3_x0213,
- utf8_to_euc_E3A4_x0213, utf8_to_euc_E3A5_x0213, 0, 0,
- 0, utf8_to_euc_E3A9_x0213, 0, utf8_to_euc_E3AB_x0213,
- utf8_to_euc_E3AC_x0213, utf8_to_euc_E3AD_x0213, utf8_to_euc_E3AE_x0213, utf8_to_euc_E3AF_x0213,
- utf8_to_euc_E3B0_x0213, 0, 0, utf8_to_euc_E3B3_x0213,
- utf8_to_euc_E3B4_x0213, utf8_to_euc_E3B5_x0213, utf8_to_euc_E3B6_x0213, utf8_to_euc_E3B7_x0213,
- utf8_to_euc_E3B8_x0213, utf8_to_euc_E3B9_x0213, utf8_to_euc_E3BA_x0213, 0,
- 0, utf8_to_euc_E3BD_x0213, utf8_to_euc_E3BE_x0213, utf8_to_euc_E3BF_x0213,
-};
static const unsigned short *const utf8_to_euc_E4[] = {
0, 0, 0, 0,
0, 0, 0, 0,
@@ -12156,24 +6443,6 @@ 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_E4_x0213[] = {
- utf8_to_euc_E480_x0213, utf8_to_euc_E481_x0213, utf8_to_euc_E482_x0213, 0,
- utf8_to_euc_E484_x0213, utf8_to_euc_E485_x0213, utf8_to_euc_E486_x0213, utf8_to_euc_E487_x0213,
- utf8_to_euc_E488_x0213, utf8_to_euc_E489_x0213, 0, utf8_to_euc_E48B_x0213,
- utf8_to_euc_E48C_x0213, utf8_to_euc_E48D_x0213, 0, utf8_to_euc_E48F_x0213,
- utf8_to_euc_E490_x0213, utf8_to_euc_E491_x0213, utf8_to_euc_E492_x0213, utf8_to_euc_E493_x0213,
- utf8_to_euc_E494_x0213, utf8_to_euc_E495_x0213, utf8_to_euc_E496_x0213, utf8_to_euc_E497_x0213,
- utf8_to_euc_E498_x0213, utf8_to_euc_E499_x0213, utf8_to_euc_E49A_x0213, 0,
- utf8_to_euc_E49C_x0213, utf8_to_euc_E49D_x0213, 0, utf8_to_euc_E49F_x0213,
- utf8_to_euc_E4A0_x0213, utf8_to_euc_E4A1_x0213, utf8_to_euc_E4A2_x0213, 0,
- 0, 0, utf8_to_euc_E4A6_x0213, utf8_to_euc_E4A7_x0213,
- utf8_to_euc_E4A8_x0213, 0, utf8_to_euc_E4AA_x0213, 0,
- utf8_to_euc_E4AC_x0213, 0, 0, utf8_to_euc_E4AF_x0213,
- utf8_to_euc_E4B0_x0213, 0, 0, utf8_to_euc_E4B3_x0213,
- utf8_to_euc_E4B4_x0213, utf8_to_euc_E4B5_x0213, 0, 0,
- utf8_to_euc_E4B8_x0213, utf8_to_euc_E4B9_x0213, utf8_to_euc_E4BA_x0213, utf8_to_euc_E4BB_x0213,
- utf8_to_euc_E4BC_x0213, utf8_to_euc_E4BD_x0213, utf8_to_euc_E4BE_x0213, utf8_to_euc_E4BF_x0213,
-};
static 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,
@@ -12192,24 +6461,6 @@ 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_E5_x0213[] = {
- utf8_to_euc_E580_x0213, utf8_to_euc_E581_x0213, utf8_to_euc_E582_x0213, utf8_to_euc_E583_x0213,
- utf8_to_euc_E584_x0213, utf8_to_euc_E585_x0213, utf8_to_euc_E586_x0213, utf8_to_euc_E587_x0213,
- utf8_to_euc_E588_x0213, utf8_to_euc_E589_x0213, utf8_to_euc_E58A_x0213, utf8_to_euc_E58B_x0213,
- utf8_to_euc_E58C_x0213, utf8_to_euc_E58D_x0213, utf8_to_euc_E58E_x0213, utf8_to_euc_E58F_x0213,
- utf8_to_euc_E590_x0213, utf8_to_euc_E591_x0213, utf8_to_euc_E592_x0213, utf8_to_euc_E593_x0213,
- utf8_to_euc_E594_x0213, utf8_to_euc_E595_x0213, utf8_to_euc_E596_x0213, utf8_to_euc_E597_x0213,
- utf8_to_euc_E598_x0213, utf8_to_euc_E599_x0213, utf8_to_euc_E59A_x0213, utf8_to_euc_E59B_x0213,
- utf8_to_euc_E59C_x0213, utf8_to_euc_E59D_x0213, utf8_to_euc_E59E_x0213, utf8_to_euc_E59F_x0213,
- utf8_to_euc_E5A0_x0213, utf8_to_euc_E5A1_x0213, utf8_to_euc_E5A2_x0213, utf8_to_euc_E5A3_x0213,
- utf8_to_euc_E5A4_x0213, utf8_to_euc_E5A5_x0213, utf8_to_euc_E5A6_x0213, utf8_to_euc_E5A7_x0213,
- utf8_to_euc_E5A8_x0213, utf8_to_euc_E5A9_x0213, utf8_to_euc_E5AA_x0213, utf8_to_euc_E5AB_x0213,
- utf8_to_euc_E5AC_x0213, utf8_to_euc_E5AD_x0213, utf8_to_euc_E5AE_x0213, utf8_to_euc_E5AF_x0213,
- utf8_to_euc_E5B0_x0213, utf8_to_euc_E5B1_x0213, utf8_to_euc_E5B2_x0213, utf8_to_euc_E5B3_x0213,
- utf8_to_euc_E5B4_x0213, utf8_to_euc_E5B5_x0213, utf8_to_euc_E5B6_x0213, utf8_to_euc_E5B7_x0213,
- utf8_to_euc_E5B8_x0213, utf8_to_euc_E5B9_x0213, utf8_to_euc_E5BA_x0213, utf8_to_euc_E5BB_x0213,
- utf8_to_euc_E5BC_x0213, utf8_to_euc_E5BD_x0213, utf8_to_euc_E5BE_x0213, utf8_to_euc_E5BF_x0213,
-};
static 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,
@@ -12228,24 +6479,6 @@ 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_E6_x0213[] = {
- utf8_to_euc_E680_x0213, utf8_to_euc_E681_x0213, utf8_to_euc_E682_x0213, utf8_to_euc_E683_x0213,
- utf8_to_euc_E684_x0213, utf8_to_euc_E685_x0213, utf8_to_euc_E686_x0213, utf8_to_euc_E687_x0213,
- utf8_to_euc_E688_x0213, utf8_to_euc_E689_x0213, utf8_to_euc_E68A_x0213, utf8_to_euc_E68B_x0213,
- utf8_to_euc_E68C_x0213, utf8_to_euc_E68D_x0213, utf8_to_euc_E68E_x0213, utf8_to_euc_E68F_x0213,
- utf8_to_euc_E690_x0213, utf8_to_euc_E691_x0213, utf8_to_euc_E692_x0213, utf8_to_euc_E693_x0213,
- utf8_to_euc_E694_x0213, utf8_to_euc_E695_x0213, utf8_to_euc_E696_x0213, utf8_to_euc_E697_x0213,
- utf8_to_euc_E698_x0213, utf8_to_euc_E699_x0213, utf8_to_euc_E69A_x0213, utf8_to_euc_E69B_x0213,
- utf8_to_euc_E69C_x0213, utf8_to_euc_E69D_x0213, utf8_to_euc_E69E_x0213, utf8_to_euc_E69F_x0213,
- utf8_to_euc_E6A0_x0213, utf8_to_euc_E6A1_x0213, utf8_to_euc_E6A2_x0213, utf8_to_euc_E6A3_x0213,
- utf8_to_euc_E6A4_x0213, utf8_to_euc_E6A5_x0213, utf8_to_euc_E6A6_x0213, utf8_to_euc_E6A7_x0213,
- utf8_to_euc_E6A8_x0213, utf8_to_euc_E6A9_x0213, utf8_to_euc_E6AA_x0213, utf8_to_euc_E6AB_x0213,
- utf8_to_euc_E6AC_x0213, utf8_to_euc_E6AD_x0213, utf8_to_euc_E6AE_x0213, utf8_to_euc_E6AF_x0213,
- utf8_to_euc_E6B0_x0213, utf8_to_euc_E6B1_x0213, utf8_to_euc_E6B2_x0213, utf8_to_euc_E6B3_x0213,
- utf8_to_euc_E6B4_x0213, utf8_to_euc_E6B5_x0213, utf8_to_euc_E6B6_x0213, utf8_to_euc_E6B7_x0213,
- utf8_to_euc_E6B8_x0213, utf8_to_euc_E6B9_x0213, utf8_to_euc_E6BA_x0213, utf8_to_euc_E6BB_x0213,
- utf8_to_euc_E6BC_x0213, utf8_to_euc_E6BD_x0213, utf8_to_euc_E6BE_x0213, utf8_to_euc_E6BF_x0213,
-};
static 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,
@@ -12264,24 +6497,6 @@ 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_E7_x0213[] = {
- utf8_to_euc_E780_x0213, utf8_to_euc_E781_x0213, utf8_to_euc_E782_x0213, utf8_to_euc_E783_x0213,
- utf8_to_euc_E784_x0213, utf8_to_euc_E785_x0213, utf8_to_euc_E786_x0213, utf8_to_euc_E787_x0213,
- utf8_to_euc_E788_x0213, utf8_to_euc_E789_x0213, utf8_to_euc_E78A_x0213, utf8_to_euc_E78B_x0213,
- utf8_to_euc_E78C_x0213, utf8_to_euc_E78D_x0213, utf8_to_euc_E78E_x0213, utf8_to_euc_E78F_x0213,
- utf8_to_euc_E790_x0213, utf8_to_euc_E791_x0213, utf8_to_euc_E792_x0213, utf8_to_euc_E793_x0213,
- utf8_to_euc_E794_x0213, utf8_to_euc_E795_x0213, utf8_to_euc_E796_x0213, utf8_to_euc_E797_x0213,
- utf8_to_euc_E798_x0213, utf8_to_euc_E799_x0213, utf8_to_euc_E79A_x0213, utf8_to_euc_E79B_x0213,
- utf8_to_euc_E79C_x0213, utf8_to_euc_E79D_x0213, utf8_to_euc_E79E_x0213, utf8_to_euc_E79F_x0213,
- utf8_to_euc_E7A0_x0213, utf8_to_euc_E7A1_x0213, utf8_to_euc_E7A2_x0213, utf8_to_euc_E7A3_x0213,
- utf8_to_euc_E7A4_x0213, utf8_to_euc_E7A5_x0213, utf8_to_euc_E7A6_x0213, utf8_to_euc_E7A7_x0213,
- utf8_to_euc_E7A8_x0213, utf8_to_euc_E7A9_x0213, utf8_to_euc_E7AA_x0213, utf8_to_euc_E7AB_x0213,
- utf8_to_euc_E7AC_x0213, utf8_to_euc_E7AD_x0213, utf8_to_euc_E7AE_x0213, utf8_to_euc_E7AF_x0213,
- utf8_to_euc_E7B0_x0213, utf8_to_euc_E7B1_x0213, utf8_to_euc_E7B2_x0213, utf8_to_euc_E7B3_x0213,
- utf8_to_euc_E7B4_x0213, utf8_to_euc_E7B5_x0213, utf8_to_euc_E7B6_x0213, utf8_to_euc_E7B7_x0213,
- utf8_to_euc_E7B8_x0213, utf8_to_euc_E7B9_x0213, utf8_to_euc_E7BA_x0213, 0,
- utf8_to_euc_E7BC_x0213, utf8_to_euc_E7BD_x0213, utf8_to_euc_E7BE_x0213, utf8_to_euc_E7BF_x0213,
-};
static 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,
@@ -12300,24 +6515,6 @@ 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_E8_x0213[] = {
- utf8_to_euc_E880_x0213, utf8_to_euc_E881_x0213, utf8_to_euc_E882_x0213, utf8_to_euc_E883_x0213,
- utf8_to_euc_E884_x0213, utf8_to_euc_E885_x0213, utf8_to_euc_E886_x0213, utf8_to_euc_E887_x0213,
- utf8_to_euc_E888_x0213, utf8_to_euc_E889_x0213, utf8_to_euc_E88A_x0213, utf8_to_euc_E88B_x0213,
- utf8_to_euc_E88C_x0213, utf8_to_euc_E88D_x0213, utf8_to_euc_E88E_x0213, utf8_to_euc_E88F_x0213,
- utf8_to_euc_E890_x0213, utf8_to_euc_E891_x0213, utf8_to_euc_E892_x0213, utf8_to_euc_E893_x0213,
- utf8_to_euc_E894_x0213, utf8_to_euc_E895_x0213, utf8_to_euc_E896_x0213, utf8_to_euc_E897_x0213,
- utf8_to_euc_E898_x0213, utf8_to_euc_E899_x0213, utf8_to_euc_E89A_x0213, utf8_to_euc_E89B_x0213,
- utf8_to_euc_E89C_x0213, utf8_to_euc_E89D_x0213, utf8_to_euc_E89E_x0213, utf8_to_euc_E89F_x0213,
- utf8_to_euc_E8A0_x0213, utf8_to_euc_E8A1_x0213, utf8_to_euc_E8A2_x0213, utf8_to_euc_E8A3_x0213,
- utf8_to_euc_E8A4_x0213, utf8_to_euc_E8A5_x0213, utf8_to_euc_E8A6_x0213, utf8_to_euc_E8A7_x0213,
- utf8_to_euc_E8A8_x0213, utf8_to_euc_E8A9_x0213, utf8_to_euc_E8AA_x0213, utf8_to_euc_E8AB_x0213,
- utf8_to_euc_E8AC_x0213, utf8_to_euc_E8AD_x0213, utf8_to_euc_E8AE_x0213, 0,
- utf8_to_euc_E8B0_x0213, utf8_to_euc_E8B1_x0213, utf8_to_euc_E8B2_x0213, utf8_to_euc_E8B3_x0213,
- utf8_to_euc_E8B4_x0213, utf8_to_euc_E8B5_x0213, utf8_to_euc_E8B6_x0213, utf8_to_euc_E8B7_x0213,
- utf8_to_euc_E8B8_x0213, utf8_to_euc_E8B9_x0213, utf8_to_euc_E8BA_x0213, utf8_to_euc_E8BB_x0213,
- utf8_to_euc_E8BC_x0213, utf8_to_euc_E8BD_x0213, utf8_to_euc_E8BE_x0213, utf8_to_euc_E8BF_x0213,
-};
static 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,
@@ -12336,24 +6533,6 @@ 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_E9_x0213[] = {
- utf8_to_euc_E980_x0213, utf8_to_euc_E981_x0213, utf8_to_euc_E982_x0213, utf8_to_euc_E983_x0213,
- utf8_to_euc_E984_x0213, utf8_to_euc_E985_x0213, utf8_to_euc_E986_x0213, utf8_to_euc_E987_x0213,
- utf8_to_euc_E988_x0213, utf8_to_euc_E989_x0213, utf8_to_euc_E98A_x0213, utf8_to_euc_E98B_x0213,
- utf8_to_euc_E98C_x0213, utf8_to_euc_E98D_x0213, utf8_to_euc_E98E_x0213, utf8_to_euc_E98F_x0213,
- utf8_to_euc_E990_x0213, utf8_to_euc_E991_x0213, utf8_to_euc_E992, 0,
- 0, utf8_to_euc_E995_x0213, utf8_to_euc_E996_x0213, utf8_to_euc_E997_x0213,
- utf8_to_euc_E998_x0213, utf8_to_euc_E999_x0213, utf8_to_euc_E99A_x0213, utf8_to_euc_E99B_x0213,
- utf8_to_euc_E99C_x0213, utf8_to_euc_E99D_x0213, utf8_to_euc_E99E_x0213, utf8_to_euc_E99F_x0213,
- utf8_to_euc_E9A0_x0213, utf8_to_euc_E9A1_x0213, utf8_to_euc_E9A2_x0213, utf8_to_euc_E9A3_x0213,
- utf8_to_euc_E9A4_x0213, utf8_to_euc_E9A5_x0213, utf8_to_euc_E9A6_x0213, utf8_to_euc_E9A7_x0213,
- utf8_to_euc_E9A8_x0213, utf8_to_euc_E9A9_x0213, utf8_to_euc_E9AA_x0213, utf8_to_euc_E9AB_x0213,
- utf8_to_euc_E9AC_x0213, utf8_to_euc_E9AD_x0213, utf8_to_euc_E9AE_x0213, utf8_to_euc_E9AF_x0213,
- utf8_to_euc_E9B0_x0213, utf8_to_euc_E9B1_x0213, 0, utf8_to_euc_E9B3_x0213,
- utf8_to_euc_E9B4_x0213, utf8_to_euc_E9B5_x0213, utf8_to_euc_E9B6_x0213, utf8_to_euc_E9B7_x0213,
- utf8_to_euc_E9B8_x0213, utf8_to_euc_E9B9_x0213, utf8_to_euc_E9BA_x0213, utf8_to_euc_E9BB_x0213,
- utf8_to_euc_E9BC_x0213, utf8_to_euc_E9BD_x0213, utf8_to_euc_E9BE_x0213, 0,
-};
static const unsigned short *const utf8_to_euc_EF[] = {
0, 0, 0, 0,
0, 0, 0, 0,
@@ -12390,24 +6569,6 @@ static const unsigned short *const utf8_to_euc_EF_ms[] = {
0, 0, 0, 0,
utf8_to_euc_EFBC, utf8_to_euc_EFBD_ms, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
};
-static const unsigned short *const utf8_to_euc_EF_x0213[] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 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_EFA4_x0213, utf8_to_euc_EFA5_x0213, 0, utf8_to_euc_EFA7_x0213,
- utf8_to_euc_EFA8_x0213, utf8_to_euc_EFA9_x0213, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, utf8_to_euc_EFB9_x0213, 0, 0,
- utf8_to_euc_EFBC_x0213, utf8_to_euc_EFBD_x0213, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
-};
const unsigned short *const utf8_to_euc_2bytes[] = {
0, 0, 0, 0,
0, 0, 0, 0,
@@ -12528,36 +6689,6 @@ const unsigned short *const utf8_to_euc_2bytes_mac[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
-const unsigned short *const utf8_to_euc_2bytes_x0213[] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 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_x0213, utf8_to_euc_C3_x0213,
- utf8_to_euc_C4_x0213, utf8_to_euc_C5_x0213, utf8_to_euc_C6_x0213, utf8_to_euc_C7_x0213,
- 0, utf8_to_euc_C9_x0213, utf8_to_euc_CA_x0213, utf8_to_euc_CB_x0213,
- utf8_to_euc_CC_x0213, utf8_to_euc_CD_x0213, utf8_to_euc_CE, utf8_to_euc_CF_x0213,
- 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,
@@ -12582,12 +6713,6 @@ const unsigned short *const *const utf8_to_euc_3bytes_mac[] = {
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_x0213[] = {
- 0, utf8_to_euc_E1_x0213, utf8_to_euc_E2_x0213, utf8_to_euc_E3_x0213,
- utf8_to_euc_E4_x0213, utf8_to_euc_E5_x0213, utf8_to_euc_E6_x0213, utf8_to_euc_E7_x0213,
- utf8_to_euc_E8_x0213, utf8_to_euc_E9_x0213, 0, 0,
- 0, 0, 0, utf8_to_euc_EF_x0213,
-};
#ifdef UNICODE_NORMALIZATION
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
index 082fb01a5b..c3d7709ef7 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ b/ext/nkf/nkf-utf8/utf8tbl.h
@@ -1,7 +1,7 @@
/*
* utf8tbl.h - Header file for Convertion Table
*
- * $Id: utf8tbl.h,v 1.3 2008/01/23 09:10:25 naruse Exp $
+ * $Id$
*/
#ifndef _UTF8TBL_H_
@@ -14,17 +14,7 @@ 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 euc_to_utf8_2bytes_x0213[];
extern const unsigned short *const x0212_to_utf8_2bytes[];
-extern const unsigned short *const x0212_to_utf8_2bytes_x0213[];
-#define sizeof_x0213_combining_chars 5
-#define sizeof_x0213_combining_table 25
-#define sizeof_x0213_1_surrogate_table 26
-#define sizeof_x0213_2_surrogate_table 277
-extern const unsigned short x0213_combining_chars[sizeof_x0213_combining_chars];
-extern const unsigned short x0213_combining_table[sizeof_x0213_combining_table][3];
-extern const unsigned short x0213_1_surrogate_table[sizeof_x0213_1_surrogate_table][3];
-extern const unsigned short x0213_2_surrogate_table[sizeof_x0213_2_surrogate_table][3];
#endif /* UTF8_OUTPUT_ENABLE */
#ifdef UTF8_INPUT_ENABLE
@@ -36,12 +26,10 @@ 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 utf8_to_euc_2bytes_x0213[];
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[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_x0213[];
#endif /* UTF8_INPUT_ENABLE */
#ifdef UNICODE_NORMALIZATION
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 2f36866ac4..05fd36de64 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -135,7 +135,7 @@ int nkf_split_options(const char *arg)
static VALUE
rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
{
- VALUE tmp;
+ volatile VALUE tmp;
reinit();
StringValue(opt);
nkf_split_options(RSTRING_PTR(opt));
@@ -156,28 +156,23 @@ rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
StringValue(src);
input = (unsigned char *)RSTRING_PTR(src);
i_len = RSTRING_LENINT(src);
- tmp = rb_str_new(0, i_len*3 + 10);
+ tmp = result = rb_str_new(0, i_len*3 + 10);
output_ctr = 0;
- output = (unsigned char *)RSTRING_PTR(tmp);
- o_len = RSTRING_LENINT(tmp);
+ output = (unsigned char *)RSTRING_PTR(result);
+ o_len = RSTRING_LENINT(result);
*output = '\0';
- /* use _result_ begin*/
- result = tmp;
kanji_convert(NULL);
- result = Qnil;
- /* use _result_ end */
-
- rb_str_set_len(tmp, output_ctr);
- OBJ_INFECT(tmp, src);
+ rb_str_set_len(result, output_ctr);
+ OBJ_INFECT(result, src);
if (mimeout_f)
- rb_enc_associate(tmp, rb_usascii_encoding());
+ rb_enc_associate(result, rb_usascii_encoding());
else
- rb_enc_associate(tmp, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+ rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
- return tmp;
+ return result;
}
diff --git a/ext/objspace/depend b/ext/objspace/depend
deleted file mode 100644
index 83a08f7078..0000000000
--- a/ext/objspace/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-objspace.o: $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/io.h \
- $(hdrdir)/ruby/re.h $(top_srcdir)/node.h $(top_srcdir)/gc.h \
- $(top_srcdir)/regint.h $(top_srcdir)/internal.h
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
index 23a42c4c20..a0cc3cecce 100644
--- a/ext/objspace/extconf.rb
+++ b/ext/objspace/extconf.rb
@@ -1,2 +1,2 @@
-$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+
create_makefile('objspace')
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 720c918555..ebca2f8487 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -27,17 +27,19 @@
#include <ruby/st.h>
#include <ruby/io.h>
#include <ruby/re.h>
-#include "node.h"
-#include "gc.h"
-#include "regint.h"
-#include "internal.h"
+#include <../../node.h>
size_t rb_str_memsize(VALUE);
size_t rb_ary_memsize(VALUE);
-size_t rb_io_memsize(const rb_io_t *);
+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)
{
@@ -60,9 +62,7 @@ memsize_of(VALUE obj)
break;
case T_MODULE:
case T_CLASS:
- if (RCLASS_M_TBL(obj)) {
- size += st_memsize(RCLASS_M_TBL(obj));
- }
+ size += st_memsize(RCLASS_M_TBL(obj));
if (RCLASS_IV_TBL(obj)) {
size += st_memsize(RCLASS_IV_TBL(obj));
}
@@ -72,9 +72,6 @@ memsize_of(VALUE obj)
if (RCLASS(obj)->ptr->iv_tbl) {
size += st_memsize(RCLASS(obj)->ptr->iv_tbl);
}
- if (RCLASS(obj)->ptr->const_tbl) {
- size += st_memsize(RCLASS(obj)->ptr->const_tbl);
- }
size += sizeof(rb_classext_t);
break;
case T_STRING:
@@ -99,7 +96,7 @@ memsize_of(VALUE obj)
case T_MATCH:
if (RMATCH(obj)->rmatch) {
struct rmatch *rm = RMATCH(obj)->rmatch;
- size += onig_region_memsize(&rm->regs);
+ 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);
}
@@ -161,9 +158,9 @@ memsize_of(VALUE obj)
*
* Return consuming memory size of obj.
*
- * Note that the return size is incomplete. You need to deal with
- * this information as only a *HINT*. Especially, the size of
- * T_DATA may not be correct.
+ * 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.
*/
@@ -174,79 +171,6 @@ memsize_of_m(VALUE self, VALUE obj)
return SIZET2NUM(memsize_of(obj));
}
-struct total_data {
- size_t total;
- VALUE klass;
-};
-
-static int
-total_i(void *vstart, void *vend, size_t stride, void *ptr)
-{
- VALUE v;
- struct total_data *data = (struct total_data *)ptr;
-
- for (v = (VALUE)vstart; v != (VALUE)vend; v += stride) {
- if (RBASIC(v)->flags) {
- switch (BUILTIN_TYPE(v)) {
- case T_NONE:
- case T_ICLASS:
- case T_NODE:
- case T_ZOMBIE:
- continue;
- case T_CLASS:
- if (FL_TEST(v, FL_SINGLETON))
- continue;
- default:
- if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
- data->total += memsize_of(v);
- }
- }
- }
- }
-
- return 0;
-}
-
-/*
- * call-seq:
- * ObjectSpace.memsize_of_all([klass]) -> Integer
- *
- * Return consuming memory size of all living objects.
- * If klass (should be Class object) is given, return the total
- * memory size of instances of the given class.
- *
- * Note that the returned size is incomplete. You need to deal with
- * this information as only a *HINT*. Especially, the size of
- * T_DATA may not be correct.
- *
- * Note that this method does *NOT* return total malloc'ed memory size.
- *
- * This method can be defined by the following Ruby code:
- *
- * def memsize_of_all klass = false
- * total = 0
- * ObjectSpace.each_object{|e|
- * total += ObjectSpace.memsize_of(e) if klass == false || e.kind_of?(klass)
- * }
- * total
- * end
- *
- * This method is not expected to work except C Ruby.
- */
-
-static VALUE
-memsize_of_all_m(int argc, VALUE *argv, VALUE self)
-{
- struct total_data data = {0, 0};
-
- if (argc > 0) {
- rb_scan_args(argc, argv, "01", &data.klass);
- }
-
- rb_objspace_each_objects(total_i, &data);
- return SIZET2NUM(data.total);
-}
-
static int
set_zero_i(st_data_t key, st_data_t val, st_data_t arg)
{
@@ -270,43 +194,6 @@ cos_i(void *vstart, void *vend, size_t stride, void *data)
return 0;
}
-static VALUE
-type2sym(enum ruby_value_type i)
-{
- VALUE type;
- switch (i) {
-#define CASE_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
- CASE_TYPE(T_NONE);
- CASE_TYPE(T_OBJECT);
- CASE_TYPE(T_CLASS);
- CASE_TYPE(T_MODULE);
- CASE_TYPE(T_FLOAT);
- CASE_TYPE(T_STRING);
- CASE_TYPE(T_REGEXP);
- CASE_TYPE(T_ARRAY);
- CASE_TYPE(T_HASH);
- CASE_TYPE(T_STRUCT);
- CASE_TYPE(T_BIGNUM);
- CASE_TYPE(T_FILE);
- CASE_TYPE(T_DATA);
- CASE_TYPE(T_MATCH);
- CASE_TYPE(T_COMPLEX);
- CASE_TYPE(T_RATIONAL);
- CASE_TYPE(T_NIL);
- CASE_TYPE(T_TRUE);
- CASE_TYPE(T_FALSE);
- CASE_TYPE(T_SYMBOL);
- CASE_TYPE(T_FIXNUM);
- CASE_TYPE(T_UNDEF);
- CASE_TYPE(T_NODE);
- CASE_TYPE(T_ICLASS);
- CASE_TYPE(T_ZOMBIE);
-#undef CASE_TYPE
- default: rb_bug("type2sym: unknown type (%d)", i);
- }
- return type;
-}
-
/*
* call-seq:
* ObjectSpace.count_objects_size([result_hash]) -> hash
@@ -314,7 +201,7 @@ type2sym(enum ruby_value_type i)
* 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*. Especially, total size of
+ * this information as only a *HINT*. Especaially, total size of
* T_DATA may not right size.
*
* It returns a hash as:
@@ -335,11 +222,11 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
{
size_t counts[T_MASK+1];
size_t total = 0;
- enum ruby_value_type i;
+ size_t i;
VALUE hash;
if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (!RB_TYPE_P(hash, T_HASH))
+ if (TYPE(hash) != T_HASH)
rb_raise(rb_eTypeError, "non-hash given");
}
@@ -358,7 +245,37 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
for (i = 0; i <= T_MASK; i++) {
if (counts[i]) {
- VALUE type = type2sym(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]));
}
@@ -413,7 +330,7 @@ count_nodes(int argc, VALUE *argv, VALUE os)
VALUE hash;
if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (!RB_TYPE_P(hash, T_HASH))
+ if (TYPE(hash) != T_HASH)
rb_raise(rb_eTypeError, "non-hash given");
}
@@ -469,7 +386,6 @@ count_nodes(int argc, VALUE *argv, VALUE os)
COUNT_NODE(NODE_OP_ASGN2);
COUNT_NODE(NODE_OP_ASGN_AND);
COUNT_NODE(NODE_OP_ASGN_OR);
- COUNT_NODE(NODE_OP_CDECL);
COUNT_NODE(NODE_CALL);
COUNT_NODE(NODE_FCALL);
COUNT_NODE(NODE_VCALL);
@@ -503,7 +419,6 @@ count_nodes(int argc, VALUE *argv, VALUE os)
COUNT_NODE(NODE_ARGS);
COUNT_NODE(NODE_ARGS_AUX);
COUNT_NODE(NODE_OPT_ARG);
- COUNT_NODE(NODE_KW_ARG);
COUNT_NODE(NODE_POSTARG);
COUNT_NODE(NODE_ARGSCAT);
COUNT_NODE(NODE_ARGSPUSH);
@@ -521,7 +436,6 @@ count_nodes(int argc, VALUE *argv, VALUE os)
COUNT_NODE(NODE_SCLASS);
COUNT_NODE(NODE_COLON2);
COUNT_NODE(NODE_COLON3);
- COUNT_NODE(NODE_CREF);
COUNT_NODE(NODE_DOT2);
COUNT_NODE(NODE_DOT3);
COUNT_NODE(NODE_FLIP2);
@@ -541,8 +455,9 @@ count_nodes(int argc, VALUE *argv, VALUE os)
COUNT_NODE(NODE_ATTRASGN);
COUNT_NODE(NODE_PRELUDE);
COUNT_NODE(NODE_LAMBDA);
+ COUNT_NODE(NODE_OPTBLOCK);
#undef COUNT_NODE
- default: node = INT2FIX(i);
+ default: node = INT2FIX(nodes[i]);
}
rb_hash_aset(hash, node, SIZET2NUM(nodes[i]));
}
@@ -558,24 +473,14 @@ cto_i(void *vstart, void *vend, size_t stride, void *data)
for (; v != (VALUE)vend; v += stride) {
if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_DATA) {
- VALUE counter;
- VALUE key = RBASIC(v)->klass;
-
- if (key == 0) {
- const char *name = rb_objspace_data_type_name(v);
- if (name == 0) name = "unknown";
- key = ID2SYM(rb_intern(name));
- }
-
- counter = rb_hash_aref(hash, key);
+ 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, key, counter);
+ rb_hash_aset(hash, RBASIC(v)->klass, counter);
}
}
@@ -586,17 +491,13 @@ cto_i(void *vstart, void *vend, size_t stride, void *data)
* call-seq:
* ObjectSpace.count_tdata_objects([result_hash]) -> hash
*
- * Counts objects for each T_DATA type.
+ * 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:
- * {RubyVM::InstructionSequence=>504, :parser=>5, :barrier=>6,
- * :mutex=>6, Proc=>60, RubyVM::Env=>57, Mutex=>1, Encoding=>99,
- * ThreadGroup=>1, Binding=>1, Thread=>1, RubyVM=>1, :iseq=>1,
- * Random=>1, ARGF.class=>1, Data=>1, :autoload=>3, Time=>2}
- * # T_DATA objects existing at startup on r32276.
+ * {:NODE_METHOD=>2027, :NODE_FBODY=>1927, :NODE_CFUNC=>1798, ...}
*
* If the optional argument, result_hash, is given,
* it is overwritten and returned.
@@ -605,11 +506,6 @@ cto_i(void *vstart, void *vend, size_t stride, void *data)
* The contents of the returned hash is implementation defined.
* It may be changed in future.
*
- * In this version, keys are Class object or Symbol object.
- * If object is kind of normal (accessible) object, the key is Class object.
- * If object is not a kind of normal (internal) object, the key is symbol
- * name, registered by rb_data_type_struct.
- *
* This method is not expected to work except C Ruby.
*
*/
@@ -620,7 +516,7 @@ count_tdata_objects(int argc, VALUE *argv, VALUE self)
VALUE hash;
if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (!RB_TYPE_P(hash, T_HASH))
+ if (TYPE(hash) != T_HASH)
rb_raise(rb_eTypeError, "non-hash given");
}
@@ -636,149 +532,6 @@ count_tdata_objects(int argc, VALUE *argv, VALUE self)
return hash;
}
-static void
-iow_mark(void *ptr)
-{
- rb_gc_mark((VALUE)ptr);
-}
-
-static size_t
-iow_size(const void *ptr)
-{
- VALUE obj = (VALUE)ptr;
- return memsize_of(obj);
-}
-
-static const rb_data_type_t iow_data_type = {
- "ObjectSpace::InternalObjectWrapper",
- {iow_mark, 0, iow_size,},
-};
-
-static VALUE rb_mInternalObjectWrapper;
-
-static VALUE
-iow_newobj(VALUE obj)
-{
- return rb_data_typed_object_alloc(rb_mInternalObjectWrapper, (void *)obj, &iow_data_type);
-}
-
-static VALUE
-iow_type(VALUE self)
-{
- VALUE obj = (VALUE)DATA_PTR(self);
- return type2sym(BUILTIN_TYPE(obj));
-}
-
-static VALUE
-iow_inspect(VALUE self)
-{
- VALUE obj = (VALUE)DATA_PTR(self);
- VALUE type = type2sym(BUILTIN_TYPE(obj));
-
- return rb_sprintf("#<InternalObject:%p %s>", (void *)obj, rb_id2name(SYM2ID(type)));
-}
-
-static VALUE
-iow_internal_object_id(VALUE self)
-{
- VALUE obj = (VALUE)DATA_PTR(self);
- return rb_obj_id(obj);
-}
-
-struct rof_data {
- st_table *refs;
- VALUE internals;
-};
-
-static void
-reachable_object_from_i(VALUE obj, void *data_ptr)
-{
- struct rof_data *data = (struct rof_data *)data_ptr;
- VALUE key = obj;
- VALUE val = obj;
-
- if (rb_objspace_markable_object_p(obj)) {
- if (rb_objspace_internal_object_p(obj)) {
- val = iow_newobj(obj);
- rb_ary_push(data->internals, val);
- }
- st_insert(data->refs, key, val);
- }
-}
-
-static int
-collect_values(st_data_t key, st_data_t value, st_data_t data)
-{
- VALUE ary = (VALUE)data;
- rb_ary_push(ary, (VALUE)value);
- return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- * ObjectSpace.reachable_objects_from(obj) -> array or nil
- *
- * [MRI specific feature] Return all reachable objects from `obj'.
- *
- * This method returns all reachable objects from `obj'.
- * If `obj' has references two or more references to same object `x',
- * them returned array only include one `x' object.
- * If `obj' is non-markable (non-heap management) object such as
- * true, false, nil, symbols and Fixnums (and Flonum) them it simply
- * returns nil.
- *
- * If `obj' has references to internal object, then it returns
- * instances of `ObjectSpace::InternalObjectWrapper' class.
- * This object contains a reference to an internal object and
- * you can check the type of internal object with `type' method.
- *
- * If `obj' is instance of `ObjectSpace::InternalObjectWrapper'
- * class, then this method returns all reachable object from
- * an internal object, which is pointed by `obj'.
- *
- * With this method, you can find memory leaks.
- *
- * This method is not expected to work except C Ruby.
- *
- * Example:
- * ObjectSpace.reachable_objects_from(['a', 'b', 'c'])
- * #=> [Array, 'a', 'b', 'c']
- *
- * ObjectSpace.reachable_objects_from(['a', 'a', 'a'])
- * #=> [Array, 'a', 'a', 'a'] # all 'a' strings have different object id
- *
- * ObjectSpace.reachable_objects_from([v = 'a', v, v])
- * #=> [Array, 'a']
- *
- * ObjectSpace.reachable_objects_from(1)
- * #=> nil # 1 is not markable (heap managed) object
- *
- */
-
-static VALUE
-reachable_objects_from(VALUE self, VALUE obj)
-{
- if (rb_objspace_markable_object_p(obj)) {
- VALUE ret = rb_ary_new();
- struct rof_data data;
-
- if (rb_typeddata_is_kind_of(obj, &iow_data_type)) {
- obj = (VALUE)DATA_PTR(obj);
- }
-
- data.refs = st_init_numtable();
- data.internals = rb_ary_new();
-
- rb_objspace_reachable_objects_from(obj, reachable_object_from_i, &data);
-
- st_foreach(data.refs, collect_values, (st_data_t)ret);
- return ret;
- }
- else {
- return Qnil;
- }
-}
-
/* objspace library extends ObjectSpace module and add several
* methods to get internal statistic information about
* object/memory management.
@@ -794,17 +547,8 @@ Init_objspace(void)
{
VALUE rb_mObjSpace = rb_const_get(rb_cObject, rb_intern("ObjectSpace"));
- rb_define_module_function(rb_mObjSpace, "memsize_of", memsize_of_m, 1);
- rb_define_module_function(rb_mObjSpace, "memsize_of_all", memsize_of_all_m, -1);
-
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);
-
- rb_define_module_function(rb_mObjSpace, "reachable_objects_from", reachable_objects_from, 1);
-
- rb_mInternalObjectWrapper = rb_define_class_under(rb_mObjSpace, "InternalObjectWrapper", rb_cObject);
- rb_define_method(rb_mInternalObjectWrapper, "type", iow_type, 0);
- rb_define_method(rb_mInternalObjectWrapper, "inspect", iow_inspect, 0);
- rb_define_method(rb_mInternalObjectWrapper, "internal_object_id", iow_internal_object_id, 0);
}
diff --git a/ext/openssl/.cvsignore b/ext/openssl/.cvsignore
new file mode 100644
index 0000000000..3a9a9f341f
--- /dev/null
+++ b/ext/openssl/.cvsignore
@@ -0,0 +1,5 @@
+GNUmakefile
+Makefile
+mkmf.log
+dep
+extconf.h
diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb
deleted file mode 100644
index 39ebfa0d37..0000000000
--- a/ext/openssl/deprecation.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module OpenSSL
- def self.deprecated_warning_flag
- unless flag = (@deprecated_warning_flag ||= nil)
- if try_compile("", flag = "-Werror=deprecated-declarations")
- if with_config("broken-apple-openssl")
- flag = "-Wno-deprecated-declarations"
- end
- $warnflags << " #{flag}"
- else
- flag = ""
- end
- @deprecated_warning_flag = flag
- end
- flag
- end
-
- def self.check_func(func, header)
- have_func(func, header, deprecated_warning_flag) and
- have_header(header, nil, deprecated_warning_flag)
- end
-end
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 848e1f2bdc..f26d06cb1b 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -1,4 +1,3 @@
-# -*- coding: us-ascii -*-
=begin
= $RCSfile$ -- Generator for Makefile
@@ -16,55 +15,54 @@
=end
require "mkmf"
-require File.expand_path('../deprecation', __FILE__)
dir_config("openssl")
dir_config("kerberos")
-Logging::message "=== OpenSSL for Ruby configurator ===\n"
+message "=== OpenSSL for Ruby configurator ===\n"
##
-# Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used
+# Adds -Wall -DOSSL_DEBUG for compilation and some more targets when GCC is used
# To turn it on, use: --with-debug or --enable-debug
#
if with_config("debug") or enable_config("debug")
$defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+
+ if CONFIG['GCC'] == 'yes'
+ $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
+ end
end
-Logging::message "=== Checking for system dependent stuff... ===\n"
+message "=== Checking for system dependent stuff... ===\n"
have_library("nsl", "t_open")
have_library("socket", "socket")
have_header("assert.h")
-Logging::message "=== Checking for required stuff... ===\n"
+message "=== Checking for required stuff... ===\n"
if $mingw
have_library("wsock32")
have_library("gdi32")
end
-
-result = pkg_config("openssl") && have_header("openssl/ssl.h")
-
-unless result
- result = have_header("openssl/ssl.h")
- result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
- result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
- unless result
- Logging::message "=== Checking for required stuff failed. ===\n"
- Logging::message "Makefile wasn't created. Fix the errors above.\n"
+result = have_header("openssl/ssl.h")
+result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
+result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
+if !result
+ unless pkg_config("openssl") and have_header("openssl/ssl.h")
+ message "=== Checking for required stuff failed. ===\n"
+ message "Makefile wasn't created. Fix the errors above.\n"
exit 1
end
end
unless have_header("openssl/conf_api.h")
- raise "OpenSSL 0.9.6 or later required."
-end
-unless OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h")
- raise "Ignore OpenSSL broken by Apple.\nPlease use another openssl. (e.g. using `configure --with-openssl-dir=/path/to/openssl')"
+ message "OpenSSL 0.9.6 or later required.\n"
+ exit 1
end
-Logging::message "=== Checking for OpenSSL features... ===\n"
+%w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")}
+
+message "=== Checking for OpenSSL features... ===\n"
have_func("ERR_peek_last_error")
-have_func("ASN1_put_eoc")
have_func("BN_mod_add")
have_func("BN_mod_sqr")
have_func("BN_mod_sub")
@@ -93,7 +91,6 @@ have_func("X509_CRL_add0_revoked")
have_func("X509_CRL_set_issuer_name")
have_func("X509_CRL_set_version")
have_func("X509_CRL_sort")
-have_func("X509_NAME_hash_old")
have_func("X509_STORE_get_ex_data")
have_func("X509_STORE_set_ex_data")
have_func("OBJ_NAME_do_all_sorted")
@@ -103,15 +100,11 @@ have_func("OPENSSL_cleanse")
have_func("SSLv2_method")
have_func("SSLv2_server_method")
have_func("SSLv2_client_method")
-have_func("TLSv1_1_method")
-have_func("TLSv1_1_server_method")
-have_func("TLSv1_1_client_method")
-have_func("TLSv1_2_method")
-have_func("TLSv1_2_server_method")
-have_func("TLSv1_2_client_method")
-have_macro("OPENSSL_NPN_NEGOTIATED", ['openssl/ssl.h']) && $defs.push("-DHAVE_OPENSSL_NPN_NEGOTIATED")
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")
+ 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")
+ $defs.push("-DHAVE_VA_ARGS_MACRO")
end
if have_header("openssl/engine.h")
have_func("ENGINE_add")
@@ -120,7 +113,6 @@ if have_header("openssl/engine.h")
have_func("ENGINE_get_digest")
have_func("ENGINE_get_cipher")
have_func("ENGINE_cleanup")
- have_func("ENGINE_load_dynamic")
have_func("ENGINE_load_4758cca")
have_func("ENGINE_load_aep")
have_func("ENGINE_load_atalla")
@@ -129,29 +121,21 @@ if have_header("openssl/engine.h")
have_func("ENGINE_load_nuron")
have_func("ENGINE_load_sureware")
have_func("ENGINE_load_ubsec")
- have_func("ENGINE_load_padlock")
- have_func("ENGINE_load_capi")
- have_func("ENGINE_load_gmp")
- have_func("ENGINE_load_gost")
- have_func("ENGINE_load_cryptodev")
- have_func("ENGINE_load_aesni")
end
-have_func("DH_generate_parameters_ex")
-have_func("DSA_generate_parameters_ex")
-have_func("RSA_generate_key_ex")
-if checking_for('OpenSSL version is 0.9.7 or later') {
- try_static_assert('OPENSSL_VERSION_NUMBER >= 0x00907000L', 'openssl/opensslv.h')
- }
+if try_compile(<<SRC)
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+# error "OpenSSL version is less than 0.9.7."
+#endif
+SRC
have_header("openssl/ocsp.h")
end
have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
-have_macro("OPENSSL_FIPS", ['openssl/opensslconf.h']) && $defs.push("-DHAVE_OPENSSL_FIPS")
-have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION")
-Logging::message "=== Checking done. ===\n"
+message "=== Checking done. ===\n"
create_header
create_makefile("openssl")
-Logging::message "Done.\n"
+message "Done.\n"
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 19a4382d0d..70fce196a5 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -18,7 +18,7 @@ require 'openssl.so'
require 'openssl/bn'
require 'openssl/cipher'
-require 'openssl/config'
require 'openssl/digest'
-require 'openssl/x509'
-require 'openssl/ssl'
+require 'openssl/ssl-internal'
+require 'openssl/x509-internal'
+
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index 180de18db1..624c13715c 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -1,22 +1,22 @@
-#--
-#
-# $RCSfile$
-#
-# = Ruby-space definitions that completes C-space funcs for BN
-#
-# = 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$
-#
-#++
+=begin
+= $RCSfile$ -- Ruby-space definitions that completes C-space funcs for BN
+
+= 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
+
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
module OpenSSL
class BN
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index e191a00877..cc1f08f563 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -1,38 +1,23 @@
-#
-#--
-#= $RCSfile$ -- Buffering mix-in module.
-#
-#= 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$
-#++
-
-##
-# OpenSSL IO buffering mix-in module.
-#
-# This module allows an OpenSSL::SSL::SSLSocket to behave like an IO.
-
-module OpenSSL::Buffering
- include Enumerable
+=begin
+= $RCSfile$ -- Buffering mix-in module.
- ##
- # The "sync mode" of the SSLSocket.
- #
- # See IO#sync for full details.
+= Info
+ 'OpenSSL for Ruby 2' project
+ Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+ All rights reserved.
- attr_accessor :sync
+= Licence
+ This program is licenced under the same licence as Ruby.
+ (See the file 'LICENCE'.)
- ##
- # Default size to read from or write to the SSLSocket for buffer operations.
+= Version
+ $Id$
+=end
+module OpenSSL
+module Buffering
+ include Enumerable
+ attr_accessor :sync
BLOCK_SIZE = 1024*16
def initialize(*args)
@@ -46,9 +31,6 @@ module OpenSSL::Buffering
#
private
- ##
- # Fills the buffer from the underlying SSLSocket
-
def fill_rbuff
begin
@rbuffer << self.sysread(BLOCK_SIZE)
@@ -59,9 +41,6 @@ module OpenSSL::Buffering
end
end
- ##
- # Consumes +size+ bytes from the buffer
-
def consume_rbuff(size=nil)
if @rbuffer.empty?
nil
@@ -75,12 +54,6 @@ module OpenSSL::Buffering
public
- ##
- # Reads +size+ bytes from the stream. If +buf+ is provided it must
- # reference a string which will receive the data.
- #
- # See IO#read for full details.
-
def read(size=nil, buf=nil)
if size == 0
if buf
@@ -102,12 +75,6 @@ module OpenSSL::Buffering
(size && ret.empty?) ? nil : ret
end
- ##
- # Reads at most +maxlen+ bytes from the stream. If +buf+ is provided it
- # must reference a string which will receive the data.
- #
- # See IO#readpartial for full details.
-
def readpartial(maxlen, buf=nil)
if maxlen == 0
if buf
@@ -133,35 +100,38 @@ module OpenSSL::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.
+ # 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
#
- # IO::WaitReadable means SSL needs to read internally so read_nonblock
- # should be called again when the underlying IO is readable.
- #
- # IO::WaitWritable means SSL needs to write internally so read_nonblock
- # should be called again after the underlying IO is writable.
- #
- # 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 writes to the underlying IO is
- # when the peer requests a new TLS/SSL handshake. See openssl the FAQ for
- # more details. http://www.openssl.org/support/faq.html
-
def read_nonblock(maxlen, buf=nil)
if maxlen == 0
if buf
@@ -183,17 +153,6 @@ module OpenSSL::Buffering
ret
end
- ##
- # Reads the next "line+ from the stream. Lines are separated by +eol+. If
- # +limit+ is provided the result will not be longer than the given number of
- # bytes.
- #
- # +eol+ may be a String or Regexp.
- #
- # Unlike IO#gets the line read will not be assigned to +$_+.
- #
- # Unlike IO#gets the separator must be provided if a limit is provided.
-
def gets(eol=$/, limit=nil)
idx = @rbuffer.index(eol)
until @eof
@@ -212,12 +171,6 @@ module OpenSSL::Buffering
consume_rbuff(size)
end
- ##
- # Executes the block for every line in the stream where lines are separated
- # by +eol+.
- #
- # See also #gets
-
def each(eol=$/)
while line = self.gets(eol)
yield line
@@ -225,11 +178,6 @@ module OpenSSL::Buffering
end
alias each_line each
- ##
- # Reads lines from the stream which are separated by +eol+.
- #
- # See also #gets
-
def readlines(eol=$/)
ary = []
while line = self.gets(eol)
@@ -238,58 +186,31 @@ module OpenSSL::Buffering
ary
end
- ##
- # Reads a line from the stream which is separated by +eol+.
- #
- # Raises EOFError if at end of file.
-
def readline(eol=$/)
raise EOFError if eof?
gets(eol)
end
- ##
- # Reads one character from the stream. Returns nil if called at end of
- # file.
-
def getc
- read(1)
+ c = read(1)
+ c ? c[0] : nil
end
- ##
- # Calls the given block once for each byte in the stream.
-
- def each_byte # :yields: byte
+ def each_byte
while c = getc
- yield(c.ord)
+ yield(c)
end
end
- ##
- # Reads a one-character string from the stream. Raises an EOFError at end
- # of file.
-
def readchar
raise EOFError if eof?
getc
end
- ##
- # Pushes character +c+ back onto the stream such that a subsequent buffered
- # character read will return it.
- #
- # Unlike IO#getc multiple bytes may be pushed back onto the stream.
- #
- # Has no effect on unbuffered reads (such as #sysread).
-
def ungetc(c)
@rbuffer[0,0] = c.chr
end
- ##
- # Returns true if the stream is at file which means there is no more data to
- # be read.
-
def eof?
fill_rbuff if !@eof && @rbuffer.empty?
@eof && @rbuffer.empty?
@@ -301,14 +222,9 @@ module OpenSSL::Buffering
#
private
- ##
- # Writes +s+ to the buffer. When the buffer is full or #sync is true the
- # buffer is flushed to the underlying socket.
-
def do_write(s)
@wbuffer = "" unless defined? @wbuffer
@wbuffer << s
- @wbuffer.force_encoding(Encoding::BINARY)
@sync ||= false
if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/)
remain = idx ? idx + $/.size : @wbuffer.length
@@ -329,67 +245,58 @@ module OpenSSL::Buffering
public
- ##
- # Writes +s+ to the stream. If the argument is not a string it will be
- # converted using String#to_s. Returns the number of bytes written.
-
def write(s)
do_write(s)
- s.bytesize
+ s.length
end
- ##
- # Writes +str+ in the non-blocking manner.
+ # Writes _str_ in the non-blocking manner.
#
- # If there is buffered data, it is flushed first. This may block.
+ # 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.
+ # 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 the underlying IO is readable.
+ # 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.
+ # 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
#
- # # 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 reads from the underlying IO
- # is when the peer requests a new TLS/SSL handshake. See the openssl FAQ
- # for more details. http://www.openssl.org/support/faq.html
-
def write_nonblock(s)
flush
syswrite_nonblock(s)
end
- ##
- # Writes +s+ to the stream. +s+ will be converted to a String using
- # String#to_s.
-
def << (s)
do_write(s)
self
end
- ##
- # Writes +args+ to the stream along with a record separator.
- #
- # See IO#puts for full details.
-
def puts(*args)
s = ""
if args.empty?
@@ -405,11 +312,6 @@ module OpenSSL::Buffering
nil
end
- ##
- # Writes +args+ to the stream.
- #
- # See IO#print for full details.
-
def print(*args)
s = ""
args.each{ |arg| s << arg.to_s }
@@ -417,20 +319,11 @@ module OpenSSL::Buffering
nil
end
- ##
- # Formats and writes to the stream converting parameters under control of
- # the format string.
- #
- # See Kernel#sprintf for format string details.
-
def printf(s, *args)
do_write(s % args)
nil
end
- ##
- # Flushes buffered data to the SSLSocket.
-
def flush
osync = @sync
@sync = true
@@ -440,11 +333,9 @@ module OpenSSL::Buffering
@sync = osync
end
- ##
- # Closes the SSLSocket and flushes any unwritten data.
-
def close
flush rescue nil
sysclose
end
end
+end
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index b3340ff52a..290e9c1d2d 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -1,22 +1,22 @@
-#--
-#
-# $RCSfile$
-#
-# = Ruby-space predefined Cipher 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$
-#
-#++
+=begin
+= $RCSfile$ -- Ruby-space predefined Cipher 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
+
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
module OpenSSL
class Cipher
@@ -57,7 +57,7 @@ module OpenSSL
return str
end
- # This class is only provided for backwards compatibility. Use OpenSSL::Cipher in the future.
+ # This class is only provided for backwards compatibility. Use OpenSSL::Digest in the future.
class Cipher < Cipher
# add warning
end
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
deleted file mode 100644
index 24a54c91ec..0000000000
--- a/ext/openssl/lib/openssl/config.rb
+++ /dev/null
@@ -1,313 +0,0 @@
-=begin
-= Ruby-space definitions that completes C-space funcs for Config
-
-= Info
- Copyright (C) 2010 Hiroshi Nakamura <nahi@ruby-lang.org>
-
-= Licence
- This program is licenced under the same licence as Ruby.
- (See the file 'LICENCE'.)
-
-=end
-
-require 'stringio'
-
-module OpenSSL
- class Config
- include Enumerable
-
- class << self
- def parse(str)
- c = new()
- parse_config(StringIO.new(str)).each do |section, hash|
- c[section] = hash
- end
- c
- end
-
- alias load new
-
- def parse_config(io)
- begin
- parse_config_lines(io)
- rescue ConfigError => e
- e.message.replace("error in line #{io.lineno}: " + e.message)
- raise
- end
- end
-
- def get_key_string(data, section, key) # :nodoc:
- if v = data[section] && data[section][key]
- return v
- elsif section == 'ENV'
- if v = ENV[key]
- return v
- end
- end
- if v = data['default'] && data['default'][key]
- return v
- end
- end
-
- private
-
- def parse_config_lines(io)
- section = 'default'
- data = {section => {}}
- while definition = get_definition(io)
- definition = clear_comments(definition)
- next if definition.empty?
- if definition[0] == ?[
- if /\[([^\]]*)\]/ =~ definition
- section = $1.strip
- data[section] ||= {}
- else
- raise ConfigError, "missing close square bracket"
- end
- else
- if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition
- if $2
- section = $1
- key = $2
- else
- key = $1
- end
- value = unescape_value(data, section, $3)
- (data[section] ||= {})[key] = value.strip
- else
- raise ConfigError, "missing equal sign"
- end
- end
- end
- data
- end
-
- # escape with backslash
- QUOTE_REGEXP_SQ = /\A([^'\\]*(?:\\.[^'\\]*)*)'/
- # escape with backslash and doubled dq
- QUOTE_REGEXP_DQ = /\A([^"\\]*(?:""[^"\\]*|\\.[^"\\]*)*)"/
- # escaped char map
- ESCAPE_MAP = {
- "r" => "\r",
- "n" => "\n",
- "b" => "\b",
- "t" => "\t",
- }
-
- def unescape_value(data, section, value)
- scanned = []
- while m = value.match(/['"\\$]/)
- scanned << m.pre_match
- c = m[0]
- value = m.post_match
- case c
- when "'"
- if m = value.match(QUOTE_REGEXP_SQ)
- scanned << m[1].gsub(/\\(.)/, '\\1')
- value = m.post_match
- else
- break
- end
- when '"'
- if m = value.match(QUOTE_REGEXP_DQ)
- scanned << m[1].gsub(/""/, '').gsub(/\\(.)/, '\\1')
- value = m.post_match
- else
- break
- end
- when "\\"
- c = value.slice!(0, 1)
- scanned << (ESCAPE_MAP[c] || c)
- when "$"
- ref, value = extract_reference(value)
- refsec = section
- if ref.index('::')
- refsec, ref = ref.split('::', 2)
- end
- if v = get_key_string(data, refsec, ref)
- scanned << v
- else
- raise ConfigError, "variable has no value"
- end
- else
- raise 'must not reaced'
- end
- end
- scanned << value
- scanned.join
- end
-
- def extract_reference(value)
- rest = ''
- if m = value.match(/\(([^)]*)\)|\{([^}]*)\}/)
- value = m[1] || m[2]
- rest = m.post_match
- elsif [?(, ?{].include?(value[0])
- raise ConfigError, "no close brace"
- end
- if m = value.match(/[a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]*)?/)
- return m[0], m.post_match + rest
- else
- raise
- end
- end
-
- def clear_comments(line)
- # FCOMMENT
- if m = line.match(/\A([\t\n\f ]*);.*\z/)
- return m[1]
- end
- # COMMENT
- scanned = []
- while m = line.match(/[#'"\\]/)
- scanned << m.pre_match
- c = m[0]
- line = m.post_match
- case c
- when '#'
- line = nil
- break
- when "'", '"'
- regexp = (c == "'") ? QUOTE_REGEXP_SQ : QUOTE_REGEXP_DQ
- scanned << c
- if m = line.match(regexp)
- scanned << m[0]
- line = m.post_match
- else
- scanned << line
- line = nil
- break
- end
- when "\\"
- scanned << c
- scanned << line.slice!(0, 1)
- else
- raise 'must not reaced'
- end
- end
- scanned << line
- scanned.join
- end
-
- def get_definition(io)
- if line = get_line(io)
- while /[^\\]\\\z/ =~ line
- if extra = get_line(io)
- line += extra
- else
- break
- end
- end
- return line.strip
- end
- end
-
- def get_line(io)
- if line = io.gets
- line.gsub(/[\r\n]*/, '')
- end
- end
- end
-
- def initialize(filename = nil)
- @data = {}
- if filename
- File.open(filename.to_s) do |file|
- Config.parse_config(file).each do |section, hash|
- self[section] = hash
- end
- end
- end
- end
-
- def get_value(section, key)
- if section.nil?
- raise TypeError.new('nil not allowed')
- end
- section = 'default' if section.empty?
- get_key_string(section, key)
- end
-
- def value(arg1, arg2 = nil)
- warn('Config#value is deprecated; use Config#get_value')
- if arg2.nil?
- section, key = 'default', arg1
- else
- section, key = arg1, arg2
- end
- section ||= 'default'
- section = 'default' if section.empty?
- get_key_string(section, key)
- end
-
- def add_value(section, key, value)
- check_modify
- (@data[section] ||= {})[key] = value
- end
-
- def [](section)
- @data[section] || {}
- end
-
- def section(name)
- warn('Config#section is deprecated; use Config#[]')
- @data[name] || {}
- end
-
- def []=(section, pairs)
- check_modify
- @data[section] ||= {}
- pairs.each do |key, value|
- self.add_value(section, key, value)
- end
- end
-
- def sections
- @data.keys
- end
-
- def to_s
- ary = []
- @data.keys.sort.each do |section|
- ary << "[ #{section} ]\n"
- @data[section].keys.each do |key|
- ary << "#{key}=#{@data[section][key]}\n"
- end
- ary << "\n"
- end
- ary.join
- end
-
- def each
- @data.each do |section, hash|
- hash.each do |key, value|
- yield [section, key, value]
- end
- end
- end
-
- def inspect
- "#<#{self.class.name} sections=#{sections.inspect}>"
- end
-
- protected
-
- def data
- @data
- end
-
- private
-
- def initialize_copy(other)
- @data = other.data.dup
- end
-
- def check_modify
- raise TypeError.new("Insecure: can't modify OpenSSL config") if frozen?
- end
-
- def get_key_string(section, key)
- Config.get_key_string(@data, section, key)
- end
- end
-end
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index f2a47bfdf9..e603c41de4 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -1,22 +1,22 @@
-#--
-#
-# $RCSfile$
-#
-# = Ruby-space predefined Digest 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$
-#
-#++
+=begin
+= $RCSfile$ -- Ruby-space predefined Digest 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
+
+##
+# Should we care what if somebody require this file directly?
+#require 'openssl'
module OpenSSL
class Digest
@@ -26,17 +26,6 @@ module OpenSSL
alg += %w(SHA224 SHA256 SHA384 SHA512)
end
- # Return the +data+ hash computed with +name+ Digest. +name+ is either the
- # long name or short name of a supported digest algorithm.
- #
- # === Examples
- #
- # OpenSSL::Digest.digest("SHA256", "abc")
- #
- # which is equivalent to:
- #
- # OpenSSL::Digest::SHA256.digest("abc")
-
def self.digest(name, data)
super(data, name)
end
@@ -68,22 +57,5 @@ module OpenSSL
end
end # Digest
-
- # Returns a Digest subclass by +name+.
- #
- # require 'openssl'
- #
- # OpenSSL::Digest("MD5")
- # # => OpenSSL::Digest::MD5
- #
- # Digest("Foo")
- # # => NameError: wrong constant name Foo
-
- def Digest(name)
- OpenSSL::Digest.const_get(name)
- end
-
- module_function :Digest
-
end # OpenSSL
diff --git a/ext/openssl/lib/openssl/ssl-internal.rb b/ext/openssl/lib/openssl/ssl-internal.rb
new file mode 100644
index 0000000000..04a9faa0b6
--- /dev/null
+++ b/ext/openssl/lib/openssl/ssl-internal.rb
@@ -0,0 +1,177 @@
+=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 2fc875c5d4..3f17f5aa29 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1,293 +1 @@
-=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 => %w{
- ECDHE-ECDSA-AES128-GCM-SHA256
- ECDHE-RSA-AES128-GCM-SHA256
- ECDHE-ECDSA-AES256-GCM-SHA384
- ECDHE-RSA-AES256-GCM-SHA384
- DHE-RSA-AES128-GCM-SHA256
- DHE-DSS-AES128-GCM-SHA256
- DHE-RSA-AES256-GCM-SHA384
- DHE-DSS-AES256-GCM-SHA384
- ECDHE-ECDSA-AES128-SHA256
- ECDHE-RSA-AES128-SHA256
- ECDHE-ECDSA-AES128-SHA
- ECDHE-RSA-AES128-SHA
- ECDHE-ECDSA-AES256-SHA384
- ECDHE-RSA-AES256-SHA384
- ECDHE-ECDSA-AES256-SHA
- ECDHE-RSA-AES256-SHA
- DHE-RSA-AES128-SHA256
- DHE-RSA-AES256-SHA256
- DHE-RSA-AES128-SHA
- DHE-RSA-AES256-SHA
- DHE-DSS-AES128-SHA256
- DHE-DSS-AES256-SHA256
- DHE-DSS-AES128-SHA
- DHE-DSS-AES256-SHA
- AES128-GCM-SHA256
- AES256-GCM-SHA384
- AES128-SHA256
- AES256-SHA256
- AES128-SHA
- AES256-SHA
- ECDHE-ECDSA-RC4-SHA
- ECDHE-RSA-RC4-SHA
- RC4-SHA
- }.join(":"),
- :options => -> {
- opts = OpenSSL::SSL::OP_ALL
- opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
- opts |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
- opts |= OpenSSL::SSL::OP_NO_SSLv2 if defined?(OpenSSL::SSL::OP_NO_SSLv2)
- opts |= OpenSSL::SSL::OP_NO_SSLv3 if defined?(OpenSSL::SSL::OP_NO_SSLv3)
- opts
- }.call
- }
-
- 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
-
- ##
- # Sets the parameters for this SSL context to the values in +params+.
- # The keys in +params+ must be assignment methods on SSLContext.
- #
- # If the verify_mode is not VERIFY_NONE and ca_file, ca_path and
- # cert_store are not set then the system default certificate store is
- # used.
-
- 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"
- ostr = OpenSSL::ASN1.decode(ext.to_der).value.last
- sequence = OpenSSL::ASN1.decode(ostr.value)
- sequence.value.each{|san|
- case san.tag
- when 2 # dNSName in GeneralName (RFC5280)
- should_verify_common_name = false
- return true if verify_hostname(hostname, san.value)
- when 7 # iPAddress in GeneralName (RFC5280)
- should_verify_common_name = false
- # follows GENERAL_NAME_print() in x509v3/v3_alt.c
- if san.value.size == 4
- return true if san.value.unpack('C*').join('.') == hostname
- elsif san.value.size == 16
- return true if san.value.unpack('n*').map { |e| sprintf("%X", e) }.join(':') == hostname
- end
- end
- }
- }
- if should_verify_common_name
- cert.subject.to_a.each{|oid, value|
- if oid == "CN"
- return true if verify_hostname(hostname, value)
- end
- }
- end
- return false
- end
- module_function :verify_certificate_identity
-
- def verify_hostname(hostname, san) # :nodoc:
- # RFC 5280, IA5String is limited to the set of ASCII characters
- return false unless san.ascii_only?
- return false unless hostname.ascii_only?
-
- # See RFC 6125, section 6.4.1
- # Matching is case-insensitive.
- san_parts = san.downcase.split(".")
-
- # TODO: this behavior should probably be more strict
- return san == hostname if san_parts.size < 2
-
- # Matching is case-insensitive.
- host_parts = hostname.downcase.split(".")
-
- # RFC 6125, section 6.4.3, subitem 2.
- # If the wildcard character is the only character of the left-most
- # label in the presented identifier, the client SHOULD NOT compare
- # against anything but the left-most label of the reference
- # identifier (e.g., *.example.com would match foo.example.com but
- # not bar.foo.example.com or example.com).
- return false unless san_parts.size == host_parts.size
-
- # RFC 6125, section 6.4.3, subitem 1.
- # The client SHOULD NOT attempt to match a presented identifier in
- # which the wildcard character comprises a label other than the
- # left-most label (e.g., do not match bar.*.example.net).
- return false unless verify_wildcard(host_parts.shift, san_parts.shift)
-
- san_parts.join(".") == host_parts.join(".")
- end
- module_function :verify_hostname
-
- def verify_wildcard(domain_component, san_component) # :nodoc:
- parts = san_component.split("*", -1)
-
- return false if parts.size > 2
- return san_component == domain_component if parts.size == 1
-
- # RFC 6125, section 6.4.3, subitem 3.
- # The client SHOULD NOT attempt to match a presented identifier
- # where the wildcard character is embedded within an A-label or
- # U-label of an internationalized domain name.
- return false if domain_component.start_with?("xn--") && san_component != "*"
-
- parts[0].length + parts[1].length < domain_component.length &&
- domain_component.start_with?(parts[0]) &&
- domain_component.end_with?(parts[1])
- end
- module_function :verify_wildcard
-
- class SSLSocket
- include Buffering
- include SocketForwarder
- include Nonblock
-
- ##
- # Perform hostname verification after an SSL connection is established
- #
- # This method MUST be called after calling #connect to ensure that the
- # hostname of a remote peer has been verified.
- def post_connection_check(hostname)
- unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
- raise SSLError, "hostname \"#{hostname}\" does not match 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
- # see #6137 - session id may not exceed 32 bytes
- prng = ::Random.new($0.hash)
- session_id = prng.bytes(16).unpack('H*')[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
- # Socket#accept returns [socket, addrinfo].
- # TCPServer#accept returns a socket.
- # The following comma strips addrinfo.
- 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
+require 'openssl'
diff --git a/ext/openssl/lib/openssl/x509-internal.rb b/ext/openssl/lib/openssl/x509-internal.rb
new file mode 100644
index 0000000000..c3de83be66
--- /dev/null
+++ b/ext/openssl/lib/openssl/x509-internal.rb
@@ -0,0 +1,153 @@
+=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 31a4381db4..3f17f5aa29 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1,162 +1 @@
-#--
-#
-# $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$
-#
-#++
-
-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)
- 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
-
- class StoreContext
- def cleanup
- warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
- end
- end
- end
-end
+require 'openssl'
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index f88dd403be..3ffe651b5b 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -342,15 +342,3 @@ PEM_def_callback(char *buf, int num, int w, void *key)
}
#endif
-#if !defined(HAVE_ASN1_PUT_EOC)
-int
-ASN1_put_eoc(unsigned char **pp)
-{
- unsigned char *p = *pp;
- *p++ = 0;
- *p++ = 0;
- *pp = p;
- return 2;
-}
-#endif
-
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 3635f88b73..a1c256ba20 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -28,39 +28,39 @@ typedef int i2d_of_void();
#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))
+ (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(void **)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_STRING_DSA_PUBLIC,\
- (bp),(char *)(x), NULL, NULL, 0, NULL, NULL)
+ 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))
+ (d2i_of_void *)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))
+ (d2i_of_void *)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))
+ (d2i_of_void *)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))
+ (d2i_of_void *)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))
+ (d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
#endif
#if !defined(HAVE_HMAC_CTX_INIT)
@@ -96,17 +96,17 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
#endif
#if !defined(HAVE_EVP_DIGESTINIT_EX)
-# define EVP_DigestInit_ex(ctx, md, engine) EVP_DigestInit((ctx), (md))
+# define EVP_DigestInit_ex(ctx, md, engine) EVP_DigestInit(ctx, md)
#endif
#if !defined(HAVE_EVP_DIGESTFINAL_EX)
-# define EVP_DigestFinal_ex(ctx, buf, len) EVP_DigestFinal((ctx), (buf), (len))
+# define EVP_DigestFinal_ex(ctx, buf, len) EVP_DigestFinal(ctx, buf, len)
#endif
#if !defined(HAVE_EVP_CIPHERINIT_EX)
-# define EVP_CipherInit_ex(ctx, type, impl, key, iv, enc) EVP_CipherInit((ctx), (type), (key), (iv), (enc))
+# define EVP_CipherInit_ex(ctx, type, impl, key, iv, enc) EVP_CipherInit(ctx, type, key, iv, enc)
#endif
#if !defined(HAVE_EVP_CIPHERFINAL_EX)
-# define EVP_CipherFinal_ex(ctx, outm, outl) EVP_CipherFinal((ctx), (outm), (outl))
+# define EVP_CipherFinal_ex(ctx, outm, outl) EVP_CipherFinal(ctx, outm, outl)
#endif
#if !defined(EVP_CIPHER_name)
@@ -118,7 +118,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
#endif
#if !defined(HAVE_EVP_HMAC_INIT_EX)
-# define HMAC_Init_ex(ctx, key, len, digest, engine) HMAC_Init((ctx), (key), (len), (digest))
+# define HMAC_Init_ex(ctx, key, len, digest, engine) HMAC_Init(ctx, key, len, digest)
#endif
#if !defined(PKCS7_is_detached)
@@ -130,7 +130,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
#endif
#if !defined(HAVE_OPENSSL_CLEANSE)
-#define OPENSSL_cleanse(p, l) memset((p), 0, (l))
+#define OPENSSL_cleanse(p, l) memset(p, 0, l)
#endif
#if !defined(HAVE_X509_STORE_GET_EX_DATA)
@@ -185,10 +185,6 @@ char *CONF_get1_default_config_file(void);
int PEM_def_callback(char *buf, int num, int w, void *key);
#endif
-#if !defined(HAVE_ASN1_PUT_EOC)
-int ASN1_put_eoc(unsigned char **pp);
-#endif
-
#if defined(__cplusplus)
}
#endif
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index d3b511dd10..b3f76c26fc 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -47,53 +47,48 @@ string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len
/*
* Data Conversion
*/
-#define OSSL_IMPL_ARY2SK(name, type, expected_class, dup) \
-STACK_OF(type) * \
-ossl_##name##_ary2sk0(VALUE ary) \
-{ \
- STACK_OF(type) *sk; \
- VALUE val; \
- type *x; \
- int i; \
- \
- Check_Type(ary, T_ARRAY); \
- sk = sk_##type##_new_null(); \
- if (!sk) ossl_raise(eOSSLError, NULL); \
- \
- for (i = 0; i < RARRAY_LEN(ary); i++) { \
- val = rb_ary_entry(ary, i); \
- if (!rb_obj_is_kind_of(val, expected_class)) { \
- sk_##type##_pop_free(sk, type##_free); \
- ossl_raise(eOSSLError, "object in array not" \
- " of class ##type##"); \
- } \
- x = dup(val); /* NEED TO DUP */ \
- sk_##type##_push(sk, x); \
- } \
- return sk; \
-} \
- \
-STACK_OF(type) * \
-ossl_protect_##name##_ary2sk(VALUE ary, int *status) \
-{ \
- return (STACK_OF(type)*)rb_protect( \
- (VALUE(*)_((VALUE)))ossl_##name##_ary2sk0, \
- ary, \
- status); \
-} \
- \
-STACK_OF(type) * \
-ossl_##name##_ary2sk(VALUE ary) \
-{ \
- STACK_OF(type) *sk; \
- int status = 0; \
- \
- sk = ossl_protect_##name##_ary2sk(ary, &status); \
- if (status) rb_jump_tag(status); \
- \
- return sk; \
+STACK_OF(X509) *
+ossl_x509_ary2sk0(VALUE ary)
+{
+ STACK_OF(X509) *sk;
+ VALUE val;
+ X509 *x509;
+ int i;
+
+ Check_Type(ary, T_ARRAY);
+ sk = sk_X509_new_null();
+ if (!sk) ossl_raise(eOSSLError, NULL);
+
+ for (i = 0; i < RARRAY_LEN(ary); i++) {
+ val = rb_ary_entry(ary, i);
+ if (!rb_obj_is_kind_of(val, cX509Cert)) {
+ sk_X509_pop_free(sk, X509_free);
+ ossl_raise(eOSSLError, "object not X509 cert in array");
+ }
+ x509 = DupX509CertPtr(val); /* NEED TO DUP */
+ sk_X509_push(sk, x509);
+ }
+ return sk;
+}
+
+STACK_OF(X509) *
+ossl_protect_x509_ary2sk(VALUE ary, int *status)
+{
+ return (STACK_OF(X509)*)rb_protect((VALUE(*)_((VALUE)))ossl_x509_ary2sk0,
+ ary, status);
+}
+
+STACK_OF(X509) *
+ossl_x509_ary2sk(VALUE ary)
+{
+ STACK_OF(X509) *sk;
+ int status = 0;
+
+ sk = ossl_protect_x509_ary2sk(ary, &status);
+ if(status) rb_jump_tag(status);
+
+ return sk;
}
-OSSL_IMPL_ARY2SK(x509, X509, cX509Cert, DupX509CertPtr)
#define OSSL_IMPL_SK2ARY(name, type) \
VALUE \
@@ -122,7 +117,6 @@ ossl_##name##_sk2ary(STACK_OF(type) *sk) \
}
OSSL_IMPL_SK2ARY(x509, X509)
OSSL_IMPL_SK2ARY(x509crl, X509_CRL)
-OSSL_IMPL_SK2ARY(x509name, X509_NAME)
static VALUE
ossl_str_new(int size)
@@ -175,12 +169,8 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
*/
rflag = flag ? Qtrue : Qfalse;
pass = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
- if (status) {
- /* ignore an exception raised. */
- rb_set_errinfo(Qnil);
- return -1;
- }
- len = RSTRING_LENINT(pass);
+ if (status) return -1; /* exception was raised. */
+ len = RSTRING_LEN(pass);
if (len < 4) { /* 4 is OpenSSL hardcoded limit */
rb_warning("password must be longer than 4 bytes");
continue;
@@ -220,23 +210,15 @@ ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
if ((void*)proc == 0)
return ok;
if (!NIL_P(proc)) {
- ret = Qfalse;
rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
(VALUE)ctx, &state);
- if (state) {
- rb_set_errinfo(Qnil);
- rb_warn("StoreContext initialization failure");
- }
- else {
+ ret = Qfalse;
+ if (!state) {
args.proc = proc;
args.preverify_ok = ok ? Qtrue : Qfalse;
args.store_ctx = rctx;
- ret = rb_protect((VALUE(*)(VALUE))ossl_call_verify_cb_proc, (VALUE)&args, &state);
- if (state) {
- rb_set_errinfo(Qnil);
- rb_warn("exception in verify_callback is ignored");
- }
- ossl_x509stctx_clear_ptr(rctx);
+ ret = rb_ensure(ossl_call_verify_cb_proc, (VALUE)&args,
+ ossl_x509stctx_clear_ptr, rctx);
}
if (ret == Qtrue) {
X509_STORE_CTX_set_error(ctx, X509_V_OK);
@@ -293,9 +275,10 @@ ossl_to_der_if_possible(VALUE obj)
static VALUE
ossl_make_error(VALUE exc, const char *fmt, va_list args)
{
- VALUE str = Qnil;
+ char buf[BUFSIZ];
const char *msg;
long e;
+ int len = 0;
#ifdef HAVE_ERR_PEEK_LAST_ERROR
e = ERR_peek_last_error();
@@ -303,20 +286,14 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
e = ERR_peek_error();
#endif
if (fmt) {
- str = rb_vsprintf(fmt, args);
+ len = vsnprintf(buf, BUFSIZ, fmt, args);
}
- if (e) {
+ if (len < BUFSIZ && e) {
if (dOSSL == Qtrue) /* FULL INFO */
msg = ERR_error_string(e, NULL);
else
msg = ERR_reason_error_string(e);
- if (NIL_P(str)) {
- if (msg) str = rb_str_new_cstr(msg);
- }
- else {
- if (RSTRING_LEN(str)) rb_str_cat2(str, ": ");
- rb_str_cat2(str, msg ? msg : "(null)");
- }
+ len += snprintf(buf+len, BUFSIZ-len, "%s%s", (len ? ": " : ""), msg);
}
if (dOSSL == Qtrue){ /* show all errors on the stack */
while ((e = ERR_get_error()) != 0){
@@ -325,8 +302,8 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
}
ERR_clear_error();
- if (NIL_P(str)) str = rb_str_new(0, 0);
- return rb_exc_new3(exc, str);
+ if(len > BUFSIZ) len = strlen(buf);
+ return rb_exc_new(exc, buf, len);
}
void
@@ -430,519 +407,7 @@ ossl_debug_set(VALUE self, VALUE val)
}
/*
- * call-seq:
- * OpenSSL.fips_mode = boolean -> boolean
- *
- * Turns FIPS mode on or off. Turning on FIPS mode will obviously only have an
- * effect for FIPS-capable installations of the OpenSSL library. Trying to do
- * so otherwise will result in an error.
- *
- * === Examples
- *
- * OpenSSL.fips_mode = true # turn FIPS mode on
- * OpenSSL.fips_mode = false # and off again
- */
-static VALUE
-ossl_fips_mode_set(VALUE self, VALUE enabled)
-{
-
-#ifdef HAVE_OPENSSL_FIPS
- if (RTEST(enabled)) {
- int mode = FIPS_mode();
- if(!mode && !FIPS_mode_set(1)) /* turning on twice leads to an error */
- ossl_raise(eOSSLError, "Turning on FIPS mode failed");
- } else {
- if(!FIPS_mode_set(0)) /* turning off twice is OK */
- ossl_raise(eOSSLError, "Turning off FIPS mode failed");
- }
- return enabled;
-#else
- if (RTEST(enabled))
- ossl_raise(eOSSLError, "This version of OpenSSL does not support FIPS mode");
- return enabled;
-#endif
-}
-
-/*
- * OpenSSL provides SSL, TLS and general purpose cryptography. It wraps the
- * OpenSSL[http://www.openssl.org/] library.
- *
- * = Examples
- *
- * All examples assume you have loaded OpenSSL with:
- *
- * require 'openssl'
- *
- * These examples build atop each other. For example the key created in the
- * next is used in throughout these examples.
- *
- * == Keys
- *
- * === Creating a Key
- *
- * This example creates a 2048 bit RSA keypair and writes it to the current
- * directory.
- *
- * key = OpenSSL::PKey::RSA.new 2048
- *
- * open 'private_key.pem', 'w' do |io| io.write key.to_pem end
- * open 'public_key.pem', 'w' do |io| io.write key.public_key.to_pem end
- *
- * === Exporting a Key
- *
- * Keys saved to disk without encryption are not secure as anyone who gets
- * ahold of the key may use it unless it is encrypted. In order to securely
- * export a key you may export it with a pass phrase.
- *
- * cipher = OpenSSL::Cipher.new 'AES-128-CBC'
- * pass_phrase = 'my secure pass phrase goes here'
- *
- * key_secure = key.export cipher, pass_phrase
- *
- * open 'private.secure.pem', 'w' do |io|
- * io.write key_secure
- * end
- *
- * OpenSSL::Cipher.ciphers returns a list of available ciphers.
- *
- * === Loading a Key
- *
- * A key can also be loaded from a file.
- *
- * key2 = OpenSSL::PKey::RSA.new File.read 'private_key.pem'
- * key2.public? # => true
- *
- * or
- *
- * key3 = OpenSSL::PKey::RSA.new File.read 'public_key.pem'
- * key3.private? # => false
- *
- * === Loading an Encrypted Key
- *
- * OpenSSL will prompt you for your pass phrase when loading an encrypted key.
- * If you will not be able to type in the pass phrase you may provide it when
- * loading the key:
- *
- * key4_pem = File.read 'private.secure.pem'
- * key4 = OpenSSL::PKey::RSA.new key4_pem, pass_phrase
- *
- * == RSA Encryption
- *
- * RSA provides encryption and decryption using the public and private keys.
- * You can use a variety of padding methods depending upon the intended use of
- * encrypted data.
- *
- * === Encryption & Decryption
- *
- * Asymmetric public/private key encryption is slow and victim to attack in
- * cases where it is used without padding or directly to encrypt larger chunks
- * of data. Typical use cases for RSA encryption involve "wrapping" a symmetric
- * key with the public key of the recipient who would "unwrap" that symmetric
- * key again using their private key.
- * The following illustrates a simplified example of such a key transport
- * scheme. It shouldn't be used in practice, though, standardized protocols
- * should always be preferred.
- *
- * wrapped_key = key.public_encrypt key
- *
- * A symmetric key encrypted with the public key can only be decrypted with
- * the corresponding private key of the recipient.
- *
- * original_key = key.private_decrypt wrapped_key
- *
- * By default PKCS#1 padding will be used, but it is also possible to use
- * other forms of padding, see PKey::RSA for further details.
- *
- * === Signatures
- *
- * Using "private_encrypt" to encrypt some data with the private key is
- * equivalent to applying a digital signature to the data. A verifying
- * party may validate the signature by comparing the result of decrypting
- * the signature with "public_decrypt" to the original data. However,
- * OpenSSL::PKey already has methods "sign" and "verify" that handle
- * digital signatures in a standardized way - "private_encrypt" and
- * "public_decrypt" shouldn't be used in practice.
- *
- * To sign a document, a cryptographically secure hash of the document is
- * computed first, which is then signed using the private key.
- *
- * digest = OpenSSL::Digest::SHA256.new
- * signature = key.sign digest, document
- *
- * To validate the signature, again a hash of the document is computed and
- * the signature is decrypted using the public key. The result is then
- * compared to the hash just computed, if they are equal the signature was
- * valid.
- *
- * digest = OpenSSL::Digest::SHA256.new
- * if key.verify digest, signature, document
- * puts 'Valid'
- * else
- * puts 'Invalid'
- * end
- *
- * == PBKDF2 Password-based Encryption
- *
- * If supported by the underlying OpenSSL version used, Password-based
- * Encryption should use the features of PKCS5. If not supported or if
- * required by legacy applications, the older, less secure methods specified
- * in RFC 2898 are also supported (see below).
- *
- * PKCS5 supports PBKDF2 as it was specified in PKCS#5
- * v2.0[http://www.rsa.com/rsalabs/node.asp?id=2127]. It still uses a
- * password, a salt, and additionally a number of iterations that will
- * slow the key derivation process down. The slower this is, the more work
- * it requires being able to brute-force the resulting key.
- *
- * === Encryption
- *
- * The strategy is to first instantiate a Cipher for encryption, and
- * then to generate a random IV plus a key derived from the password
- * using PBKDF2. PKCS #5 v2.0 recommends at least 8 bytes for the salt,
- * the number of iterations largely depends on the hardware being used.
- *
- * cipher = OpenSSL::Cipher.new 'AES-128-CBC'
- * cipher.encrypt
- * iv = cipher.random_iv
- *
- * pwd = 'some hopefully not to easily guessable password'
- * salt = OpenSSL::Random.random_bytes 16
- * iter = 20000
- * key_len = cipher.key_len
- * digest = OpenSSL::Digest::SHA256.new
- *
- * key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
- * cipher.key = key
- *
- * Now encrypt the data:
- *
- * encrypted = cipher.update document
- * encrypted << cipher.final
- *
- * === Decryption
- *
- * Use the same steps as before to derive the symmetric AES key, this time
- * setting the Cipher up for decryption.
- *
- * cipher = OpenSSL::Cipher.new 'AES-128-CBC'
- * cipher.decrypt
- * cipher.iv = iv # the one generated with #random_iv
- *
- * pwd = 'some hopefully not to easily guessable password'
- * salt = ... # the one generated above
- * iter = 20000
- * key_len = cipher.key_len
- * digest = OpenSSL::Digest::SHA256.new
- *
- * key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
- * cipher.key = key
- *
- * Now decrypt the data:
- *
- * decrypted = cipher.update encrypted
- * decrypted << cipher.final
- *
- * == PKCS #5 Password-based Encryption
- *
- * PKCS #5 is a password-based encryption standard documented at
- * RFC2898[http://www.ietf.org/rfc/rfc2898.txt]. It allows a short password or
- * passphrase to be used to create a secure encryption key. If possible, PBKDF2
- * as described above should be used if the circumstances allow it.
- *
- * PKCS #5 uses a Cipher, a pass phrase and a salt to generate an encryption
- * key.
- *
- * pass_phrase = 'my secure pass phrase goes here'
- * salt = '8 octets'
- *
- * === Encryption
- *
- * First set up the cipher for encryption
- *
- * encrypter = OpenSSL::Cipher.new 'AES-128-CBC'
- * encrypter.encrypt
- * encrypter.pkcs5_keyivgen pass_phrase, salt
- *
- * Then pass the data you want to encrypt through
- *
- * encrypted = encrypter.update 'top secret document'
- * encrypted << encrypter.final
- *
- * === Decryption
- *
- * Use a new Cipher instance set up for decryption
- *
- * decrypter = OpenSSL::Cipher.new 'AES-128-CBC'
- * decrypter.decrypt
- * decrypter.pkcs5_keyivgen pass_phrase, salt
- *
- * Then pass the data you want to decrypt through
- *
- * plain = decrypter.update encrypted
- * plain << decrypter.final
- *
- * == X509 Certificates
- *
- * === Creating a Certificate
- *
- * This example creates a self-signed certificate using an RSA key and a SHA1
- * signature.
- *
- * name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
- *
- * cert = OpenSSL::X509::Certificate.new
- * cert.version = 2
- * cert.serial = 0
- * cert.not_before = Time.now
- * cert.not_after = Time.now + 3600
- *
- * cert.public_key = key.public_key
- * cert.subject = name
- *
- * === Certificate Extensions
- *
- * You can add extensions to the certificate with
- * OpenSSL::SSL::ExtensionFactory to indicate the purpose of the certificate.
- *
- * extension_factory = OpenSSL::X509::ExtensionFactory.new nil, cert
- *
- * cert.add_extension \
- * extension_factory.create_extension('basicConstraints', 'CA:FALSE', true)
- *
- * cert.add_extension \
- * extension_factory.create_extension(
- * 'keyUsage', 'keyEncipherment,dataEncipherment,digitalSignature')
- *
- * cert.add_extension \
- * extension_factory.create_extension('subjectKeyIdentifier', 'hash')
- *
- * The list of supported extensions (and in some cases their possible values)
- * can be derived from the "objects.h" file in the OpenSSL source code.
- *
- * === Signing a Certificate
- *
- * To sign a certificate set the issuer and use OpenSSL::X509::Certificate#sign
- * with a digest algorithm. This creates a self-signed cert because we're using
- * the same name and key to sign the certificate as was used to create the
- * certificate.
- *
- * cert.issuer = name
- * cert.sign key, OpenSSL::Digest::SHA1.new
- *
- * open 'certificate.pem', 'w' do |io| io.write cert.to_pem end
- *
- * === Loading a Certificate
- *
- * Like a key, a cert can also be loaded from a file.
- *
- * cert2 = OpenSSL::X509::Certificate.new File.read 'certificate.pem'
- *
- * === Verifying a Certificate
- *
- * Certificate#verify will return true when a certificate was signed with the
- * given public key.
- *
- * raise 'certificate can not be verified' unless cert2.verify key
- *
- * == Certificate Authority
- *
- * A certificate authority (CA) is a trusted third party that allows you to
- * verify the ownership of unknown certificates. The CA issues key signatures
- * that indicate it trusts the user of that key. A user encountering the key
- * can verify the signature by using the CA's public key.
- *
- * === CA Key
- *
- * CA keys are valuable, so we encrypt and save it to disk and make sure it is
- * not readable by other users.
- *
- * ca_key = OpenSSL::PKey::RSA.new 2048
- *
- * cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
- *
- * open 'ca_key.pem', 'w', 0400 do |io|
- * io.write key.export(cipher, pass_phrase)
- * end
- *
- * === CA Certificate
- *
- * A CA certificate is created the same way we created a certificate above, but
- * with different extensions.
- *
- * ca_name = OpenSSL::X509::Name.parse 'CN=ca/DC=example'
- *
- * ca_cert = OpenSSL::X509::Certificate.new
- * ca_cert.serial = 0
- * ca_cert.version = 2
- * ca_cert.not_before = Time.now
- * ca_cert.not_after = Time.now + 86400
- *
- * ca_cert.public_key = ca_key.public_key
- * ca_cert.subject = ca_name
- * ca_cert.issuer = ca_name
- *
- * extension_factory = OpenSSL::X509::ExtensionFactory.new
- * extension_factory.subject_certificate = ca_cert
- * extension_factory.issuer_certificate = ca_cert
- *
- * ca_cert.add_extension \
- * extension_factory.create_extension('subjectKeyIdentifier', 'hash')
- *
- * This extension indicates the CA's key may be used as a CA.
- *
- * ca_cert.add_extension \
- * extension_factory.create_extension('basicConstraints', 'CA:TRUE', true)
- *
- * This extension indicates the CA's key may be used to verify signatures on
- * both certificates and certificate revocations.
- *
- * ca_cert.add_extension \
- * extension_factory.create_extension(
- * 'keyUsage', 'cRLSign,keyCertSign', true)
- *
- * Root CA certificates are self-signed.
- *
- * ca_cert.sign ca_key, OpenSSL::Digest::SHA1.new
- *
- * The CA certificate is saved to disk so it may be distributed to all the
- * users of the keys this CA will sign.
- *
- * open 'ca_cert.pem', 'w' do |io|
- * io.write ca_cert.to_pem
- * end
- *
- * === Certificate Signing Request
- *
- * The CA signs keys through a Certificate Signing Request (CSR). The CSR
- * contains the information necessary to identify the key.
- *
- * csr = OpenSSL::X509::Request.new
- * csr.version = 0
- * csr.subject = name
- * csr.public_key = key.public_key
- * csr.sign key, OpenSSL::Digest::SHA1.new
- *
- * A CSR is saved to disk and sent to the CA for signing.
- *
- * open 'csr.pem', 'w' do |io|
- * io.write csr.to_pem
- * end
- *
- * === Creating a Certificate from a CSR
- *
- * Upon receiving a CSR the CA will verify it before signing it. A minimal
- * verification would be to check the CSR's signature.
- *
- * csr = OpenSSL::X509::Request.new File.read 'csr.pem'
- *
- * raise 'CSR can not be verified' unless csr.verify csr.public_key
- *
- * After verification a certificate is created, marked for various usages,
- * signed with the CA key and returned to the requester.
- *
- * csr_cert = OpenSSL::X509::Certificate.new
- * csr_cert.serial = 0
- * csr_cert.version = 2
- * csr_cert.not_before = Time.now
- * csr_cert.not_after = Time.now + 600
- *
- * csr_cert.subject = csr.subject
- * csr_cert.public_key = csr.public_key
- * csr_cert.issuer = ca_cert.subject
- *
- * extension_factory = OpenSSL::X509::ExtensionFactory.new
- * extension_factory.subject_certificate = csr_cert
- * extension_factory.issuer_certificate = ca_cert
- *
- * csr_cert.add_extension \
- * extension_factory.create_extension('basicConstraints', 'CA:FALSE')
- *
- * csr_cert.add_extension \
- * extension_factory.create_extension(
- * 'keyUsage', 'keyEncipherment,dataEncipherment,digitalSignature')
- *
- * csr_cert.add_extension \
- * extension_factory.create_extension('subjectKeyIdentifier', 'hash')
- *
- * csr_cert.sign ca_key, OpenSSL::Digest::SHA1.new
- *
- * open 'csr_cert.pem', 'w' do |io|
- * io.write csr_cert.to_pem
- * end
- *
- * == SSL and TLS Connections
- *
- * Using our created key and certificate we can create an SSL or TLS connection.
- * An SSLContext is used to set up an SSL session.
- *
- * context = OpenSSL::SSL::SSLContext.new
- *
- * === SSL Server
- *
- * An SSL server requires the certificate and private key to communicate
- * securely with its clients:
- *
- * context.cert = cert
- * context.key = key
- *
- * Then create an SSLServer with a TCP server socket and the context. Use the
- * SSLServer like an ordinary TCP server.
- *
- * require 'socket'
- *
- * tcp_server = TCPServer.new 5000
- * ssl_server = OpenSSL::SSL::SSLServer.new tcp_server, context
- *
- * loop do
- * ssl_connection = ssl_server.accept
- *
- * data = connection.gets
- *
- * response = "I got #{data.dump}"
- * puts response
- *
- * connection.puts "I got #{data.dump}"
- * connection.close
- * end
- *
- * === SSL client
- *
- * An SSL client is created with a TCP socket and the context.
- * SSLSocket#connect must be called to initiate the SSL handshake and start
- * encryption. A key and certificate are not required for the client socket.
- *
- * require 'socket'
- *
- * tcp_client = TCPSocket.new 'localhost', 5000
- * ssl_client = OpenSSL::SSL::SSLSocket.new client_socket, context
- * ssl_client.connect
- *
- * ssl_client.puts "hello server!"
- * puts ssl_client.gets
- *
- * === Peer Verification
- *
- * An unverified SSL connection does not provide much security. For enhanced
- * security the client or server can verify the certificate of its peer.
- *
- * The client can be modified to verify the server's certificate against the
- * certificate authority's certificate:
- *
- * context.ca_file = 'ca_cert.pem'
- * context.verify_mode = OpenSSL::SSL::VERIFY_PEER
- *
- * require 'socket'
- *
- * tcp_client = TCPSocket.new 'localhost', 5000
- * ssl_client = OpenSSL::SSL::SSLSocket.new client_socket, context
- * ssl_client.connect
- *
- * ssl_client.puts "hello server!"
- * puts ssl_client.gets
- *
- * If the server certificate is invalid or <tt>context.ca_file</tt> is not set
- * when verifying peers an OpenSSL::SSL::SSLError will be raised.
- *
+ * OSSL library init
*/
void
Init_openssl()
@@ -984,37 +449,13 @@ Init_openssl()
mOSSL = rb_define_module("OpenSSL");
/*
- * OpenSSL ruby extension version
+ * Constants
*/
rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION));
-
- /*
- * Version of OpenSSL the ruby OpenSSL extension was built with
- */
rb_define_const(mOSSL, "OPENSSL_VERSION", rb_str_new2(OPENSSL_VERSION_TEXT));
-
- /*
- * Version of OpenSSL the ruby OpenSSL extension is running with
- */
- rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
-
- /*
- * Version number of OpenSSL the ruby OpenSSL extension was built with
- * (base 16)
- */
rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
/*
- * Boolean indicating whether OpenSSL is FIPS-enabled or not
- */
-#ifdef HAVE_OPENSSL_FIPS
- rb_define_const(mOSSL, "OPENSSL_FIPS", Qtrue);
-#else
- rb_define_const(mOSSL, "OPENSSL_FIPS", Qfalse);
-#endif
- rb_define_module_function(mOSSL, "fips_mode=", ossl_fips_mode_set, 1);
-
- /*
* Generic error,
* common for all classes under OpenSSL module
*/
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 9a97656e9c..1a5b263124 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -30,7 +30,6 @@ extern "C" {
#endif
#include <ruby.h>
#include <ruby/io.h>
-#include <ruby/thread.h>
/*
* Check the OpenSSL version
@@ -46,7 +45,6 @@ extern "C" {
#endif
#if defined(_WIN32)
-# include <openssl/e_os2.h>
# define OSSL_NO_CONF_API 1
# if !defined(OPENSSL_SYS_WIN32)
# define OPENSSL_SYS_WIN32 1
@@ -75,11 +73,6 @@ extern "C" {
# include <openssl/ocsp.h>
#endif
-/* OpenSSL requires passwords for PEM-encoded files to be at least four
- * characters long
- */
-#define OSSL_MIN_PWD_LEN 4
-
/*
* Common Module
*/
@@ -94,21 +87,21 @@ extern VALUE eOSSLError;
* CheckTypes
*/
#define OSSL_Check_Kind(obj, klass) do {\
- if (!rb_obj_is_kind_of((obj), (klass))) {\
- ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected kind of %"PRIsVALUE")",\
- rb_obj_class(obj), (klass));\
+ if (!rb_obj_is_kind_of(obj, klass)) {\
+ ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\
+ rb_obj_classname(obj), rb_class2name(klass));\
}\
} while (0)
#define OSSL_Check_Instance(obj, klass) do {\
- if (!rb_obj_is_instance_of((obj), (klass))) {\
- ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected instance of %"PRIsVALUE")",\
- rb_obj_class(obj), (klass));\
+ if (!rb_obj_is_instance_of(obj, klass)) {\
+ ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\
+ rb_obj_classname(obj), rb_class2name(klass));\
}\
} while (0)
#define OSSL_Check_Same_Class(obj1, obj2) do {\
- if (!rb_obj_is_instance_of((obj1), rb_obj_class(obj2))) {\
+ if (!rb_obj_is_instance_of(obj1, rb_obj_class(obj2))) {\
ossl_raise(rb_eTypeError, "wrong argument type");\
}\
} while (0)
@@ -133,14 +126,13 @@ STACK_OF(X509) *ossl_x509_ary2sk(VALUE);
STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*);
VALUE ossl_x509_sk2ary(STACK_OF(X509) *certs);
VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
-VALUE ossl_x509name_sk2ary(STACK_OF(X509_NAME) *names);
VALUE ossl_buf2str(char *buf, int len);
#define ossl_str_adjust(str, p) \
do{\
- int len = RSTRING_LENINT(str);\
- int newlen = rb_long2int((p) - (unsigned char*)RSTRING_PTR(str));\
+ int len = RSTRING_LEN(str);\
+ int newlen = (p) - (unsigned char*)RSTRING_PTR(str);\
assert(newlen <= len);\
- rb_str_set_len((str), newlen);\
+ rb_str_set_len(str, newlen);\
}while(0)
/*
@@ -149,13 +141,6 @@ do{\
int ossl_pem_passwd_cb(char *, int, int, void *);
/*
- * Clear BIO* with this in PEM/DER fallback scenarios to avoid decoding
- * errors piling up in OpenSSL::Errors
- */
-#define OSSL_BIO_reset(bio) (void)BIO_reset((bio)); \
- ERR_clear_error();
-
-/*
* ERRor messages
*/
#define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
@@ -198,13 +183,13 @@ extern VALUE dOSSL;
} while (0)
#define OSSL_Warning(fmt, ...) do { \
- OSSL_Debug((fmt), ##__VA_ARGS__); \
- rb_warning((fmt), ##__VA_ARGS__); \
+ OSSL_Debug(fmt, ##__VA_ARGS__); \
+ rb_warning(fmt, ##__VA_ARGS__); \
} while (0)
#define OSSL_Warn(fmt, ...) do { \
- OSSL_Debug((fmt), ##__VA_ARGS__); \
- rb_warn((fmt), ##__VA_ARGS__); \
+ OSSL_Debug(fmt, ##__VA_ARGS__); \
+ rb_warn(fmt, ##__VA_ARGS__); \
} while (0)
#else
void ossl_debug(const char *, ...);
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 8bd88f3012..a9ab7e38ce 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -19,12 +19,6 @@ struct timeval {
};
#endif
-static VALUE join_der(VALUE enumerable);
-static VALUE ossl_asn1_decode0(unsigned char **pp, long length, long *offset,
- int depth, int yield, long *num_read);
-static VALUE ossl_asn1_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE ossl_asn1eoc_initialize(VALUE self);
-
/*
* DATE conversion
*/
@@ -33,22 +27,15 @@ asn1time_to_time(ASN1_TIME *time)
{
struct tm tm;
VALUE argv[6];
- int count;
if (!time || !time->data) return Qnil;
memset(&tm, 0, sizeof(struct tm));
switch (time->type) {
case V_ASN1_UTCTIME:
- count = sscanf((const char *)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);
-
- if (count == 5) {
- tm.tm_sec = 0;
- } else if (count != 6) {
- ossl_raise(rb_eTypeError, "bad UTCTIME format: \"%s\"",
- time->data);
+ if (sscanf((const char *)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");
}
if (tm.tm_year < 69) {
tm.tm_year += 2000;
@@ -156,16 +143,11 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
ASN1_INTEGER *
num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
{
- BIGNUM *bn;
-
- if (NIL_P(obj))
- ossl_raise(rb_eTypeError, "Can't convert nil into Integer");
-
- bn = GetBNPtr(obj);
+ BIGNUM *bn = GetBNPtr(obj);
- if (!(ai = BN_to_ASN1_INTEGER(bn, ai)))
+ if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
ossl_raise(eOSSLError, NULL);
-
+ }
return ai;
}
#endif
@@ -174,17 +156,15 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
/*
* ASN1 module
*/
-#define ossl_asn1_get_value(o) rb_attr_get((o),sivVALUE)
-#define ossl_asn1_get_tag(o) rb_attr_get((o),sivTAG)
-#define ossl_asn1_get_tagging(o) rb_attr_get((o),sivTAGGING)
-#define ossl_asn1_get_tag_class(o) rb_attr_get((o),sivTAG_CLASS)
-#define ossl_asn1_get_infinite_length(o) rb_attr_get((o),sivINFINITE_LENGTH)
-
-#define ossl_asn1_set_value(o,v) rb_ivar_set((o),sivVALUE,(v))
-#define ossl_asn1_set_tag(o,v) rb_ivar_set((o),sivTAG,(v))
-#define ossl_asn1_set_tagging(o,v) rb_ivar_set((o),sivTAGGING,(v))
-#define ossl_asn1_set_tag_class(o,v) rb_ivar_set((o),sivTAG_CLASS,(v))
-#define ossl_asn1_set_infinite_length(o,v) rb_ivar_set((o),sivINFINITE_LENGTH,(v))
+#define ossl_asn1_get_value(o) rb_attr_get((o),rb_intern("@value"))
+#define ossl_asn1_get_tag(o) rb_attr_get((o),rb_intern("@tag"))
+#define ossl_asn1_get_tagging(o) rb_attr_get((o),rb_intern("@tagging"))
+#define ossl_asn1_get_tag_class(o) rb_attr_get((o),rb_intern("@tag_class"))
+
+#define ossl_asn1_set_value(o,v) rb_iv_set((o),"@value",(v))
+#define ossl_asn1_set_tag(o,v) rb_iv_set((o),"@tag",(v))
+#define ossl_asn1_set_tagging(o,v) rb_iv_set((o),"@tagging",(v))
+#define ossl_asn1_set_tag_class(o,v) rb_iv_set((o),"@tag_class",(v))
VALUE mASN1;
VALUE eASN1Error;
@@ -193,7 +173,6 @@ VALUE cASN1Data;
VALUE cASN1Primitive;
VALUE cASN1Constructive;
-VALUE cASN1EndOfContent;
VALUE cASN1Boolean; /* BOOLEAN */
VALUE cASN1Integer, cASN1Enumerated; /* INTEGER */
VALUE cASN1BitString; /* BIT STRING */
@@ -210,20 +189,6 @@ VALUE cASN1Sequence, cASN1Set; /* CONSTRUCTIVE */
static ID sIMPLICIT, sEXPLICIT;
static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
-static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNUSED_BITS;
-
-/*
- * We need to implement these for backward compatibility
- * reasons, behavior of ASN1_put_object and ASN1_object_size
- * for infinite length values is different in OpenSSL <= 0.9.7
- */
-#if OPENSSL_VERSION_NUMBER < 0x00908000L
-#define ossl_asn1_object_size(cons, len, tag) (cons) == 2 ? (len) + ASN1_object_size((cons), 0, (tag)) : ASN1_object_size((cons), (len), (tag))
-#define ossl_asn1_put_object(pp, cons, len, tag, xc) (cons) == 2 ? ASN1_put_object((pp), (cons), 0, (tag), (xc)) : ASN1_put_object((pp), (cons), (len), (tag), (xc))
-#else
-#define ossl_asn1_object_size(cons, len, tag) ASN1_object_size((cons), (len), (tag))
-#define ossl_asn1_put_object(pp, cons, len, tag, xc) ASN1_put_object((pp), (cons), (len), (tag), (xc))
-#endif
/*
* Ruby to ASN1 converters
@@ -231,9 +196,6 @@ static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNU
static ASN1_BOOLEAN
obj_to_asn1bool(VALUE obj)
{
- if (NIL_P(obj))
- ossl_raise(rb_eTypeError, "Can't convert nil into Boolean");
-
#if OPENSSL_VERSION_NUMBER < 0x00907000L
return RTEST(obj) ? 0xff : 0x100;
#else
@@ -256,7 +218,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_LENINT(obj));
+ ASN1_BIT_STRING_set(bstr, (unsigned char *)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);
@@ -271,7 +233,7 @@ obj_to_asn1str(VALUE obj)
StringValue(obj);
if(!(str = ASN1_STRING_new()))
ossl_raise(eASN1Error, NULL);
- ASN1_STRING_set(str, RSTRING_PTR(obj), RSTRING_LENINT(obj));
+ ASN1_STRING_set(str, RSTRING_PTR(obj), RSTRING_LEN(obj));
return str;
}
@@ -337,7 +299,7 @@ obj_to_asn1derstr(VALUE obj)
str = ossl_to_der(obj);
if(!(a1str = ASN1_STRING_new()))
ossl_raise(eASN1Error, NULL);
- ASN1_STRING_set(a1str, RSTRING_PTR(str), RSTRING_LENINT(str));
+ ASN1_STRING_set(a1str, RSTRING_PTR(str), RSTRING_LEN(str));
return a1str;
}
@@ -346,7 +308,7 @@ obj_to_asn1derstr(VALUE obj)
* DER to Ruby converters
*/
static VALUE
-decode_bool(unsigned char* der, long length)
+decode_bool(unsigned char* der, int length)
{
int val;
const unsigned char *p;
@@ -359,7 +321,7 @@ decode_bool(unsigned char* der, long length)
}
static VALUE
-decode_int(unsigned char* der, long length)
+decode_int(unsigned char* der, int length)
{
ASN1_INTEGER *ai;
const unsigned char *p;
@@ -378,7 +340,7 @@ decode_int(unsigned char* der, long length)
}
static VALUE
-decode_bstr(unsigned char* der, long length, long *unused_bits)
+decode_bstr(unsigned char* der, int length, long *unused_bits)
{
ASN1_BIT_STRING *bstr;
const unsigned char *p;
@@ -399,7 +361,7 @@ decode_bstr(unsigned char* der, long length, long *unused_bits)
}
static VALUE
-decode_enum(unsigned char* der, long length)
+decode_enum(unsigned char* der, int length)
{
ASN1_ENUMERATED *ai;
const unsigned char *p;
@@ -418,7 +380,7 @@ decode_enum(unsigned char* der, long length)
}
static VALUE
-decode_null(unsigned char* der, long length)
+decode_null(unsigned char* der, int length)
{
ASN1_NULL *null;
const unsigned char *p;
@@ -432,7 +394,7 @@ decode_null(unsigned char* der, long length)
}
static VALUE
-decode_obj(unsigned char* der, long length)
+decode_obj(unsigned char* der, int length)
{
ASN1_OBJECT *obj;
const unsigned char *p;
@@ -461,7 +423,7 @@ decode_obj(unsigned char* der, long length)
}
static VALUE
-decode_time(unsigned char* der, long length)
+decode_time(unsigned char* der, int length)
{
ASN1_TIME *time;
const unsigned char *p;
@@ -479,15 +441,6 @@ decode_time(unsigned char* der, long length)
return ret;
}
-static VALUE
-decode_eoc(unsigned char *der, long length)
-{
- if (length != 2 || !(der[0] == 0x00 && der[1] == 0x00))
- ossl_raise(eASN1Error, NULL);
-
- return rb_str_new("", 0);
-}
-
/********/
typedef struct {
@@ -496,7 +449,7 @@ typedef struct {
} ossl_asn1_info_t;
static ossl_asn1_info_t ossl_asn1_info[] = {
- { "EOC", &cASN1EndOfContent, }, /* 0 */
+ { "EOC", NULL, }, /* 0 */
{ "BOOLEAN", &cASN1Boolean, }, /* 1 */
{ "INTEGER", &cASN1Integer, }, /* 2 */
{ "BIT_STRING", &cASN1BitString, }, /* 3 */
@@ -531,8 +484,6 @@ static ossl_asn1_info_t ossl_asn1_info[] = {
int ossl_asn1_info_size = (sizeof(ossl_asn1_info)/sizeof(ossl_asn1_info[0]));
-static VALUE class_tag_map;
-
static int ossl_asn1_default_tag(VALUE obj);
ASN1_TYPE*
@@ -542,7 +493,7 @@ ossl_asn1_get_asn1type(VALUE obj)
VALUE value, rflag;
void *ptr;
void (*free_func)();
- int tag, flag;
+ long tag, flag;
tag = ossl_asn1_default_tag(obj);
value = ossl_asn1_get_value(obj);
@@ -557,7 +508,7 @@ ossl_asn1_get_asn1type(VALUE obj)
free_func = ASN1_INTEGER_free;
break;
case V_ASN1_BIT_STRING:
- rflag = rb_attr_get(obj, sivUNUSED_BITS);
+ rflag = rb_attr_get(obj, rb_intern("@unused_bits"));
flag = NIL_P(rflag) ? -1 : NUM2INT(rflag);
ptr = obj_to_asn1bstr(value, flag);
free_func = ASN1_BIT_STRING_free;
@@ -614,18 +565,16 @@ ossl_asn1_get_asn1type(VALUE obj)
static int
ossl_asn1_default_tag(VALUE obj)
{
- VALUE tmp_class, tag;
-
- tmp_class = CLASS_OF(obj);
- while (tmp_class) {
- tag = rb_hash_lookup(class_tag_map, tmp_class);
- if (tag != Qnil) {
- return NUM2INT(tag);
- }
- tmp_class = rb_class_superclass(tmp_class);
+ int i;
+
+ for(i = 0; i < ossl_asn1_info_size; i++){
+ if(ossl_asn1_info[i].klass &&
+ rb_obj_is_kind_of(obj, *ossl_asn1_info[i].klass)){
+ return i;
+ }
}
- ossl_raise(eASN1Error, "universal tag for %"PRIsVALUE" not found",
- rb_obj_class(obj));
+ ossl_raise(eASN1Error, "universal tag for %s not found",
+ rb_class2name(CLASS_OF(obj)));
return -1; /* dummy */
}
@@ -701,22 +650,6 @@ ossl_asn1_class2sym(int tc)
return ID2SYM(sUNIVERSAL);
}
-/*
- * call-seq:
- * OpenSSL::ASN1::ASN1Data.new(value, tag, tag_class) => ASN1Data
- *
- * +value+: Please have a look at Constructive and Primitive to see how Ruby
- * types are mapped to ASN.1 types and vice versa.
- *
- * +tag+: A +Number+ indicating the tag number.
- *
- * +tag_class+: A +Symbol+ indicating the tag class. Please cf. ASN1 for
- * possible values.
- *
- * == Example
- * asn1_int = OpenSSL::ASN1Data.new(42, 2, :UNIVERSAL) # => Same as OpenSSL::ASN1::Integer.new(42)
- * tagged_int = OpenSSL::ASN1Data.new(42, 0, :CONTEXT_SPECIFIC) # implicitly 0-tagged INTEGER
- */
static VALUE
ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
{
@@ -727,7 +660,6 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
ossl_asn1_set_tag(self, tag);
ossl_asn1_set_value(self, value);
ossl_asn1_set_tag_class(self, tag_class);
- ossl_asn1_set_infinite_length(self, Qfalse);
return self;
}
@@ -749,19 +681,10 @@ join_der(VALUE enumerable)
return str;
}
-/*
- * call-seq:
- * asn1.to_der => DER-encoded String
- *
- * Encodes this ASN1Data into a DER-encoded String value. The result is
- * DER-encoded except for the possibility of infinite length encodings.
- * Infinite length encodings are not allowed in strict DER, so strictly
- * speaking the result of such an encoding would be a BER-encoding.
- */
static VALUE
ossl_asn1data_to_der(VALUE self)
{
- VALUE value, der, inf_length;
+ VALUE value, der;
int tag, tag_class, is_cons = 0;
long length;
unsigned char *p;
@@ -775,15 +698,11 @@ ossl_asn1data_to_der(VALUE self)
tag = ossl_asn1_tag(self);
tag_class = ossl_asn1_tag_class(self);
- inf_length = ossl_asn1_get_infinite_length(self);
- if (inf_length == Qtrue) {
- is_cons = 2;
- }
- if((length = ossl_asn1_object_size(is_cons, RSTRING_LENINT(value), tag)) <= 0)
+ 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);
- ossl_asn1_put_object(&p, is_cons, RSTRING_LENINT(value), tag, tag_class);
+ ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
p += RSTRING_LEN(value);
ossl_str_adjust(der, p);
@@ -792,345 +711,160 @@ ossl_asn1data_to_der(VALUE self)
}
static VALUE
-int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
- VALUE tc, long *num_read)
+ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
+ int once, int yield)
{
- VALUE value, asn1data;
- unsigned char *p;
- long flag = 0;
+ unsigned char *start, *p;
+ const unsigned char *p0;
+ long len, off = *offset;
+ int hlen, tag, tc, j;
+ VALUE ary, asn1data, value, tag_class;
+ ary = rb_ary_new();
p = *pp;
-
- if(tc == sUNIVERSAL && tag < ossl_asn1_info_size) {
- switch(tag){
- case V_ASN1_EOC:
- value = decode_eoc(p, hlen+length);
- break;
- case V_ASN1_BOOLEAN:
- value = decode_bool(p, hlen+length);
- break;
- case V_ASN1_INTEGER:
- value = decode_int(p, hlen+length);
- break;
- case V_ASN1_BIT_STRING:
- value = decode_bstr(p, hlen+length, &flag);
- break;
- case V_ASN1_NULL:
- value = decode_null(p, hlen+length);
- break;
- case V_ASN1_ENUMERATED:
- value = decode_enum(p, hlen+length);
- break;
- case V_ASN1_OBJECT:
- value = decode_obj(p, hlen+length);
- break;
- case V_ASN1_UTCTIME: /* FALLTHROUGH */
- case V_ASN1_GENERALIZEDTIME:
- value = decode_time(p, hlen+length);
- break;
- default:
- /* use original value */
- p += hlen;
- value = rb_str_new((const char *)p, length);
- break;
+ while(length > 0){
+ start = p;
+ p0 = p;
+ j = ASN1_get_object(&p0, &len, &tag, &tc, length);
+ p = (unsigned char *)p0;
+ if(j & 0x80) ossl_raise(eASN1Error, NULL);
+ hlen = p - start;
+ if(yield){
+ VALUE arg = rb_ary_new();
+ rb_ary_push(arg, LONG2NUM(depth));
+ rb_ary_push(arg, LONG2NUM(off));
+ rb_ary_push(arg, LONG2NUM(hlen));
+ rb_ary_push(arg, LONG2NUM(len));
+ rb_ary_push(arg, (j & V_ASN1_CONSTRUCTED) ? Qtrue : Qfalse);
+ rb_ary_push(arg, ossl_asn1_class2sym(tc));
+ rb_ary_push(arg, INT2NUM(tag));
+ rb_yield(arg);
}
- }
- else {
- p += hlen;
- value = rb_str_new((const char *)p, length);
- }
-
- *pp += hlen + length;
- *num_read = hlen + length;
-
- if (tc == sUNIVERSAL && tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
- VALUE klass = *ossl_asn1_info[tag].klass;
- VALUE args[4];
- args[0] = value;
- args[1] = INT2NUM(tag);
- args[2] = Qnil;
- args[3] = ID2SYM(tc);
- asn1data = rb_obj_alloc(klass);
- ossl_asn1_initialize(4, args, asn1data);
- if(tag == V_ASN1_BIT_STRING){
- rb_ivar_set(asn1data, sivUNUSED_BITS, LONG2NUM(flag));
+ length -= hlen;
+ off += hlen;
+ if(len > length) ossl_raise(eASN1Error, "value is too short");
+ if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
+ tag_class = sPRIVATE;
+ else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
+ tag_class = sCONTEXT_SPECIFIC;
+ else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
+ tag_class = sAPPLICATION;
+ else
+ tag_class = sUNIVERSAL;
+ if(j & V_ASN1_CONSTRUCTED){
+ /* TODO: if j == 0x21 it is indefinite length object. */
+ if((j == 0x21) && (len == 0)){
+ long lastoff = off;
+ value = ossl_asn1_decode0(&p, length, &off, depth+1, 0, yield);
+ len = off - lastoff;
+ }
+ else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
}
- }
- else {
- asn1data = rb_obj_alloc(cASN1Data);
- ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), ID2SYM(tc));
- }
-
- return asn1data;
-}
-
-static VALUE
-int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
- long *offset, int depth, int yield, int j,
- int tag, VALUE tc, long *num_read)
-{
- VALUE value, asn1data, ary;
- int infinite;
- long off = *offset;
-
- infinite = (j == 0x21);
- ary = rb_ary_new();
-
- while (length > 0 || infinite) {
- long inner_read = 0;
- value = ossl_asn1_decode0(pp, max_len, &off, depth + 1, yield, &inner_read);
- *num_read += inner_read;
- max_len -= inner_read;
- rb_ary_push(ary, value);
- if (length > 0)
- length -= inner_read;
-
- if (infinite &&
- NUM2INT(ossl_asn1_get_tag(value)) == V_ASN1_EOC &&
- SYM2ID(ossl_asn1_get_tag_class(value)) == sUNIVERSAL) {
- break;
+ else{
+ value = rb_str_new((const char *)p, len);
+ p += len;
+ off += len;
}
- }
-
- if (tc == sUNIVERSAL) {
- VALUE args[4];
- int not_sequence_or_set;
-
- not_sequence_or_set = tag != V_ASN1_SEQUENCE && tag != V_ASN1_SET;
-
- if (not_sequence_or_set) {
- if (infinite) {
- asn1data = rb_obj_alloc(cASN1Constructive);
+ if(tag_class == sUNIVERSAL &&
+ tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass){
+ VALUE klass = *ossl_asn1_info[tag].klass;
+ long flag = 0;
+ if(!rb_obj_is_kind_of(value, rb_cArray)){
+ switch(tag){
+ case V_ASN1_BOOLEAN:
+ value = decode_bool(start, hlen+len);
+ break;
+ case V_ASN1_INTEGER:
+ value = decode_int(start, hlen+len);
+ break;
+ case V_ASN1_BIT_STRING:
+ value = decode_bstr(start, hlen+len, &flag);
+ break;
+ case V_ASN1_NULL:
+ value = decode_null(start, hlen+len);
+ break;
+ case V_ASN1_ENUMERATED:
+ value = decode_enum(start, hlen+len);
+ break;
+ case V_ASN1_OBJECT:
+ value = decode_obj(start, hlen+len);
+ break;
+ case V_ASN1_UTCTIME: /* FALLTHROUGH */
+ case V_ASN1_GENERALIZEDTIME:
+ value = decode_time(start, hlen+len);
+ break;
+ default:
+ /* use original value */
+ break;
+ }
}
- else {
- ossl_raise(eASN1Error, "invalid non-infinite tag");
- return Qnil;
+ asn1data = rb_funcall(klass, rb_intern("new"), 1, value);
+ if(tag == V_ASN1_BIT_STRING){
+ rb_iv_set(asn1data, "@unused_bits", LONG2NUM(flag));
}
}
- else {
- VALUE klass = *ossl_asn1_info[tag].klass;
- asn1data = rb_obj_alloc(klass);
+ else{
+ asn1data = rb_funcall(cASN1Data, rb_intern("new"), 3,
+ value, INT2NUM(tag), ID2SYM(tag_class));
}
- args[0] = ary;
- args[1] = INT2NUM(tag);
- args[2] = Qnil;
- args[3] = ID2SYM(tc);
- ossl_asn1_initialize(4, args, asn1data);
+ rb_ary_push(ary, asn1data);
+ length -= len;
+ if(once) break;
}
- else {
- asn1data = rb_obj_alloc(cASN1Data);
- ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc));
- }
-
- if (infinite)
- ossl_asn1_set_infinite_length(asn1data, Qtrue);
- else
- ossl_asn1_set_infinite_length(asn1data, Qfalse);
-
+ *pp = p;
*offset = off;
- return asn1data;
-}
-
-static VALUE
-ossl_asn1_decode0(unsigned char **pp, long length, long *offset, int depth,
- int yield, long *num_read)
-{
- unsigned char *start, *p;
- const unsigned char *p0;
- long len = 0, inner_read = 0, off = *offset, hlen;
- int tag, tc, j;
- VALUE asn1data, tag_class;
- p = *pp;
- start = p;
- p0 = p;
- j = ASN1_get_object(&p0, &len, &tag, &tc, length);
- p = (unsigned char *)p0;
- if(j & 0x80) ossl_raise(eASN1Error, NULL);
- if(len > length) ossl_raise(eASN1Error, "value is too short");
- if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
- tag_class = sPRIVATE;
- else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
- tag_class = sCONTEXT_SPECIFIC;
- else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
- tag_class = sAPPLICATION;
- else
- tag_class = sUNIVERSAL;
-
- hlen = p - start;
-
- if(yield) {
- VALUE arg = rb_ary_new();
- rb_ary_push(arg, LONG2NUM(depth));
- rb_ary_push(arg, LONG2NUM(*offset));
- rb_ary_push(arg, LONG2NUM(hlen));
- rb_ary_push(arg, LONG2NUM(len));
- rb_ary_push(arg, (j & V_ASN1_CONSTRUCTED) ? Qtrue : Qfalse);
- rb_ary_push(arg, ossl_asn1_class2sym(tc));
- rb_ary_push(arg, INT2NUM(tag));
- rb_yield(arg);
- }
-
- if(j & V_ASN1_CONSTRUCTED) {
- *pp += hlen;
- off += hlen;
- asn1data = int_ossl_asn1_decode0_cons(pp, length, len, &off, depth, yield, j, tag, tag_class, &inner_read);
- inner_read += hlen;
- }
- else {
- if ((j & 0x01) && (len == 0)) ossl_raise(eASN1Error, "Infinite length for primitive value");
- asn1data = int_ossl_asn1_decode0_prim(pp, len, hlen, tag, tag_class, &inner_read);
- off += hlen + len;
- }
- if (num_read)
- *num_read = inner_read;
- if (len != 0 && inner_read != hlen + len) {
- ossl_raise(eASN1Error,
- "Type mismatch. Bytes read: %ld Bytes available: %ld",
- inner_read, hlen + len);
- }
-
- *offset = off;
- return asn1data;
-}
-
-static void
-int_ossl_decode_sanity_check(long len, long read, long offset)
-{
- if (len != 0 && (read != len || offset != len)) {
- ossl_raise(eASN1Error,
- "Type mismatch. Total bytes read: %ld Bytes available: %ld Offset: %ld",
- read, len, offset);
- }
+ return ary;
}
-/*
- * call-seq:
- * OpenSSL::ASN1.traverse(asn1) -> nil
- *
- * If a block is given, it prints out each of the elements encountered.
- * Block parameters are (in that order):
- * * depth: The recursion depth, plus one with each constructed value being encountered (Number)
- * * offset: Current byte offset (Number)
- * * header length: Combined length in bytes of the Tag and Length headers. (Number)
- * * length: The overall remaining length of the entire data (Number)
- * * constructed: Whether this value is constructed or not (Boolean)
- * * tag_class: Current tag class (Symbol)
- * * tag: The current tag (Number)
- *
- * == Example
- * der = File.binread('asn1data.der')
- * OpenSSL::ASN1.traverse(der) do | depth, offset, header_len, length, constructed, tag_class, tag|
- * puts "Depth: #{depth} Offset: #{offset} Length: #{length}"
- * puts "Header length: #{header_len} Tag: #{tag} Tag class: #{tag_class} Constructed: #{constructed}"
- * end
- */
static VALUE
ossl_asn1_traverse(VALUE self, VALUE obj)
{
unsigned char *p;
+ long offset = 0;
volatile VALUE tmp;
- long len, read = 0, offset = 0;
obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj));
p = (unsigned char *)RSTRING_PTR(tmp);
- len = RSTRING_LEN(tmp);
- ossl_asn1_decode0(&p, len, &offset, 0, 1, &read);
- int_ossl_decode_sanity_check(len, read, offset);
+ ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
+
return Qnil;
}
-/*
- * call-seq:
- * OpenSSL::ASN1.decode(der) -> ASN1Data
- *
- * Decodes a BER- or DER-encoded value and creates an ASN1Data instance. +der+
- * may be a +String+ or any object that features a +#to_der+ method transforming
- * it into a BER-/DER-encoded +String+.
- *
- * == Example
- * der = File.binread('asn1data')
- * asn1 = OpenSSL::ASN1.decode(der)
- */
static VALUE
ossl_asn1_decode(VALUE self, VALUE obj)
{
- VALUE ret;
+ VALUE ret, ary;
unsigned char *p;
+ long offset = 0;
volatile VALUE tmp;
- long len, read = 0, offset = 0;
obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj));
p = (unsigned char *)RSTRING_PTR(tmp);
- len = RSTRING_LEN(tmp);
- ret = ossl_asn1_decode0(&p, len, &offset, 0, 0, &read);
- int_ossl_decode_sanity_check(len, read, offset);
+ ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
+ ret = rb_ary_entry(ary, 0);
+
return ret;
}
-/*
- * call-seq:
- * OpenSSL::ASN1.decode_all(der) -> Array of ASN1Data
- *
- * Similar to +decode+ with the difference that +decode+ expects one
- * distinct value represented in +der+. +decode_all+ on the contrary
- * decodes a sequence of sequential BER/DER values lined up in +der+
- * and returns them as an array.
- *
- * == Example
- * ders = File.binread('asn1data_seq')
- * asn1_ary = OpenSSL::ASN1.decode_all(ders)
- */
static VALUE
ossl_asn1_decode_all(VALUE self, VALUE obj)
{
- VALUE ary, val;
+ VALUE ret;
unsigned char *p;
- long len, tmp_len = 0, read = 0, offset = 0;
+ long offset = 0;
volatile VALUE tmp;
obj = ossl_to_der_if_possible(obj);
tmp = rb_str_new4(StringValue(obj));
p = (unsigned char *)RSTRING_PTR(tmp);
- len = RSTRING_LEN(tmp);
- tmp_len = len;
- ary = rb_ary_new();
- while (tmp_len > 0) {
- long tmp_read = 0;
- val = ossl_asn1_decode0(&p, tmp_len, &offset, 0, 0, &tmp_read);
- rb_ary_push(ary, val);
- read += tmp_read;
- tmp_len -= tmp_read;
- }
- int_ossl_decode_sanity_check(len, read, offset);
- return ary;
+ ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
+
+ return ret;
}
-/*
- * call-seq:
- * OpenSSL::ASN1::Primitive.new( value [, tag, tagging, tag_class ]) => Primitive
- *
- * +value+: is mandatory.
- *
- * +tag+: optional, may be specified for tagged values. If no +tag+ is
- * specified, the UNIVERSAL tag corresponding to the Primitive sub-class
- * is used by default.
- *
- * +tagging+: may be used as an encoding hint to encode a value either
- * explicitly or implicitly, see ASN1 for possible values.
- *
- * +tag_class+: if +tag+ and +tagging+ are +nil+ then this is set to
- * +:UNIVERSAL+ by default. If either +tag+ or +tagging+ are set then
- * +:CONTEXT_SPECIFIC+ is used as the default. For possible values please
- * cf. ASN1.
- *
- * == Example
- * int = OpenSSL::ASN1::Integer.new(42)
- * zero_tagged_int = OpenSSL::ASN1::Integer.new(42, 0, :IMPLICIT)
- * private_explicit_zero_tagged_int = OpenSSL::ASN1::Integer.new(42, 0, :EXPLICIT, :PRIVATE)
- */
static VALUE
ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
{
@@ -1140,48 +874,30 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
if(argc > 1){
if(NIL_P(tag))
ossl_raise(eASN1Error, "must specify tag number");
- if(!NIL_P(tagging) && !SYMBOL_P(tagging))
- ossl_raise(eASN1Error, "invalid tagging method");
- if(NIL_P(tag_class)) {
- if (NIL_P(tagging))
- tag_class = ID2SYM(sUNIVERSAL);
- else
- tag_class = ID2SYM(sCONTEXT_SPECIFIC);
- }
+ if(NIL_P(tagging))
+ tagging = ID2SYM(sEXPLICIT);
+ if(!SYMBOL_P(tagging))
+ ossl_raise(eASN1Error, "invalid tag default");
+ if(NIL_P(tag_class))
+ tag_class = ID2SYM(sCONTEXT_SPECIFIC);
if(!SYMBOL_P(tag_class))
ossl_raise(eASN1Error, "invalid tag class");
- if(!NIL_P(tagging) && SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
+ if(SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
ossl_raise(eASN1Error, "tag number for Universal too large");
}
else{
tag = INT2NUM(ossl_asn1_default_tag(self));
- tagging = Qnil;
+ tagging = Qnil;
tag_class = ID2SYM(sUNIVERSAL);
}
ossl_asn1_set_tag(self, tag);
ossl_asn1_set_value(self, value);
ossl_asn1_set_tagging(self, tagging);
ossl_asn1_set_tag_class(self, tag_class);
- ossl_asn1_set_infinite_length(self, Qfalse);
return self;
}
-static VALUE
-ossl_asn1eoc_initialize(VALUE self) {
- VALUE tag, tagging, tag_class, value;
- tag = INT2NUM(ossl_asn1_default_tag(self));
- tagging = Qnil;
- tag_class = ID2SYM(sUNIVERSAL);
- value = rb_str_new("", 0);
- ossl_asn1_set_tag(self, tag);
- ossl_asn1_set_value(self, value);
- ossl_asn1_set_tagging(self, tagging);
- ossl_asn1_set_tag_class(self, tag_class);
- ossl_asn1_set_infinite_length(self, Qfalse);
- return self;
-}
-
static int
ossl_i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
{
@@ -1206,12 +922,6 @@ ossl_ASN1_TYPE_free(ASN1_TYPE *a)
ASN1_TYPE_free(a);
}
-/*
- * call-seq:
- * asn1.to_der => DER-encoded String
- *
- * See ASN1Data#to_der for details. *
- */
static VALUE
ossl_asn1prim_to_der(VALUE self)
{
@@ -1226,7 +936,7 @@ ossl_asn1prim_to_der(VALUE self)
explicit = ossl_asn1_is_explicit(self);
asn1 = ossl_asn1_get_asn1type(self);
- len = ossl_asn1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
+ len = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
if(!(buf = OPENSSL_malloc(len))){
ossl_ASN1_TYPE_free(asn1);
ossl_raise(eASN1Error, "cannot alloc buffer");
@@ -1235,7 +945,7 @@ ossl_asn1prim_to_der(VALUE self)
if (tc == V_ASN1_UNIVERSAL) {
ossl_i2d_ASN1_TYPE(asn1, &p);
} else if (explicit) {
- ossl_asn1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
+ 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);
@@ -1244,113 +954,45 @@ ossl_asn1prim_to_der(VALUE self)
ossl_ASN1_TYPE_free(asn1);
reallen = p - buf;
assert(reallen <= len);
- str = ossl_buf2str((char *)buf, rb_long2int(reallen)); /* buf will be free in ossl_buf2str */
+ str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
return str;
}
-/*
- * call-seq:
- * asn1.to_der => DER-encoded String
- *
- * See ASN1Data#to_der for details.
- */
static VALUE
ossl_asn1cons_to_der(VALUE self)
{
- int tag, tn, tc, explicit, constructed = 1;
- int found_prim = 0, seq_len;
- long length;
+ int tag, tn, tc, explicit;
+ long seq_len, length;
unsigned char *p;
- VALUE value, str, inf_length;
+ VALUE value, str;
+ tag = ossl_asn1_default_tag(self);
tn = NUM2INT(ossl_asn1_get_tag(self));
tc = ossl_asn1_tag_class(self);
- inf_length = ossl_asn1_get_infinite_length(self);
- if (inf_length == Qtrue) {
- VALUE ary, example;
- constructed = 2;
- if (CLASS_OF(self) == cASN1Sequence ||
- CLASS_OF(self) == cASN1Set) {
- tag = ossl_asn1_default_tag(self);
- }
- else { /* must be a constructive encoding of a primitive value */
- ary = ossl_asn1_get_value(self);
- if (!rb_obj_is_kind_of(ary, rb_cArray))
- ossl_raise(eASN1Error, "Constructive value must be an Array");
- /* Recursively descend until a primitive value is found.
- The overall value of the entire constructed encoding
- is of the type of the first primitive encoding to be
- found. */
- while (!found_prim){
- example = rb_ary_entry(ary, 0);
- if (rb_obj_is_kind_of(example, cASN1Primitive)){
- found_prim = 1;
- }
- else {
- /* example is another ASN1Constructive */
- if (!rb_obj_is_kind_of(example, cASN1Constructive)){
- ossl_raise(eASN1Error, "invalid constructed encoding");
- return Qnil; /* dummy */
- }
- ary = ossl_asn1_get_value(example);
- }
- }
- tag = ossl_asn1_default_tag(example);
- }
- }
- else {
- if (CLASS_OF(self) == cASN1Constructive)
- ossl_raise(eASN1Error, "Constructive shall only be used with infinite length");
- tag = ossl_asn1_default_tag(self);
- }
explicit = ossl_asn1_is_explicit(self);
value = join_der(ossl_asn1_get_value(self));
- seq_len = ossl_asn1_object_size(constructed, RSTRING_LENINT(value), tag);
- length = ossl_asn1_object_size(constructed, seq_len, tn);
+ 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);
if(tc == V_ASN1_UNIVERSAL)
- ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
+ ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
else{
if(explicit){
- ossl_asn1_put_object(&p, constructed, seq_len, tn, tc);
- ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tag, V_ASN1_UNIVERSAL);
- }
- else{
- ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
+ ASN1_put_object(&p, 1, seq_len, tn, tc);
+ ASN1_put_object(&p, 1, RSTRING_LEN(value), tag, V_ASN1_UNIVERSAL);
}
+ else ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
}
memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
p += RSTRING_LEN(value);
-
- /* In this case we need an additional EOC (one for the explicit part and
- * one for the Constructive itself. The EOC for the Constructive is
- * supplied by the user, but that for the "explicit wrapper" must be
- * added here.
- */
- if (explicit && inf_length == Qtrue) {
- ASN1_put_eoc(&p);
- }
ossl_str_adjust(str, p);
return str;
}
-/*
- * call-seq:
- * asn1_ary.each { |asn1| block } => asn1_ary
- *
- * Calls <i>block</i> once for each element in +self+, passing that element
- * as parameter +asn1+. If no block is given, an enumerator is returned
- * instead.
- *
- * == Example
- * asn1_ary.each do |asn1|
- * puts asn1
- * end
- */
static VALUE
ossl_asn1cons_each(VALUE self)
{
@@ -1438,7 +1080,6 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(UTCTime)
OSSL_ASN1_IMPL_FACTORY_METHOD(GeneralizedTime)
OSSL_ASN1_IMPL_FACTORY_METHOD(Sequence)
OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
-OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
void
Init_ossl_asn1()
@@ -1446,8 +1087,8 @@ Init_ossl_asn1()
VALUE ary;
int i;
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
sUNIVERSAL = rb_intern("UNIVERSAL");
@@ -1457,155 +1098,12 @@ Init_ossl_asn1()
sEXPLICIT = rb_intern("EXPLICIT");
sIMPLICIT = rb_intern("IMPLICIT");
- sivVALUE = rb_intern("@value");
- sivTAG = rb_intern("@tag");
- sivTAGGING = rb_intern("@tagging");
- sivTAG_CLASS = rb_intern("@tag_class");
- sivINFINITE_LENGTH = rb_intern("@infinite_length");
- sivUNUSED_BITS = rb_intern("@unused_bits");
-
- /*
- * Document-module: OpenSSL::ASN1
- *
- * Abstract Syntax Notation One (or ASN.1) is a notation syntax to
- * describe data structures and is defined in ITU-T X.680. ASN.1 itself
- * does not mandate any encoding or parsing rules, but usually ASN.1 data
- * structures are encoded using the Distinguished Encoding Rules (DER) or
- * less often the Basic Encoding Rules (BER) described in ITU-T X.690. DER
- * and BER encodings are binary Tag-Length-Value (TLV) encodings that are
- * quite concise compared to other popular data description formats such
- * as XML, JSON etc.
- * ASN.1 data structures are very common in cryptographic applications,
- * e.g. X.509 public key certificates or certificate revocation lists
- * (CRLs) are all defined in ASN.1 and DER-encoded. ASN.1, DER and BER are
- * the building blocks of applied cryptography.
- * The ASN1 module provides the necessary classes that allow generation
- * of ASN.1 data structures and the methods to encode them using a DER
- * encoding. The decode method allows parsing arbitrary BER-/DER-encoded
- * data to a Ruby object that can then be modified and re-encoded at will.
- *
- * == ASN.1 class hierarchy
- *
- * The base class representing ASN.1 structures is ASN1Data. ASN1Data offers
- * attributes to read and set the +tag+, the +tag_class+ and finally the
- * +value+ of a particular ASN.1 item. Upon parsing, any tagged values
- * (implicit or explicit) will be represented by ASN1Data instances because
- * their "real type" can only be determined using out-of-band information
- * from the ASN.1 type declaration. Since this information is normally
- * known when encoding a type, all sub-classes of ASN1Data offer an
- * additional attribute +tagging+ that allows to encode a value implicitly
- * (+:IMPLICIT+) or explicitly (+:EXPLICIT+).
- *
- * === Constructive
- *
- * Constructive is, as its name implies, the base class for all
- * constructed encodings, i.e. those that consist of several values,
- * opposed to "primitive" encodings with just one single value.
- * Primitive values that are encoded with "infinite length" are typically
- * constructed (their values come in multiple chunks) and are therefore
- * represented by instances of Constructive. The value of an Constructive
- * is always an Array.
- *
- * ==== ASN1::Set and ASN1::Sequence
- *
- * The most common constructive encodings are SETs and SEQUENCEs, which is
- * why there are two sub-classes of Constructive representing each of
- * them.
- *
- * === Primitive
- *
- * This is the super class of all primitive values. Primitive
- * itself is not used when parsing ASN.1 data, all values are either
- * instances of a corresponding sub-class of Primitive or they are
- * instances of ASN1Data if the value was tagged implicitly or explicitly.
- * Please cf. Primitive documentation for details on sub-classes and
- * their respective mappings of ASN.1 data types to Ruby objects.
- *
- * == Possible values for +tagging+
- *
- * When constructing an ASN1Data object the ASN.1 type definition may
- * require certain elements to be either implicitly or explicitly tagged.
- * This can be achieved by setting the +tagging+ attribute manually for
- * sub-classes of ASN1Data. Use the symbol +:IMPLICIT+ for implicit
- * tagging and +:EXPLICIT+ if the element requires explicit tagging.
- *
- * == Possible values for +tag_class+
- *
- * It is possible to create arbitrary ASN1Data objects that also support
- * a PRIVATE or APPLICATION tag class. Possible values for the +tag_class+
- * attribute are:
- * * +:UNIVERSAL+ (the default for untagged values)
- * * +:CONTEXT_SPECIFIC+ (the default for tagged values)
- * * +:APPLICATION+
- * * +:PRIVATE+
- *
- * == Tag constants
- *
- * There is a constant defined for each universal tag:
- * * OpenSSL::ASN1::EOC (0)
- * * OpenSSL::ASN1::BOOLEAN (1)
- * * OpenSSL::ASN1::INTEGER (2)
- * * OpenSSL::ASN1::BIT_STRING (3)
- * * OpenSSL::ASN1::OCTET_STRING (4)
- * * OpenSSL::ASN1::NULL (5)
- * * OpenSSL::ASN1::OBJECT (6)
- * * OpenSSL::ASN1::ENUMERATED (10)
- * * OpenSSL::ASN1::UTF8STRING (12)
- * * OpenSSL::ASN1::SEQUENCE (16)
- * * OpenSSL::ASN1::SET (17)
- * * OpenSSL::ASN1::NUMERICSTRING (18)
- * * OpenSSL::ASN1::PRINTABLESTRING (19)
- * * OpenSSL::ASN1::T61STRING (20)
- * * OpenSSL::ASN1::VIDEOTEXSTRING (21)
- * * OpenSSL::ASN1::IA5STRING (22)
- * * OpenSSL::ASN1::UTCTIME (23)
- * * OpenSSL::ASN1::GENERALIZEDTIME (24)
- * * OpenSSL::ASN1::GRAPHICSTRING (25)
- * * OpenSSL::ASN1::ISO64STRING (26)
- * * OpenSSL::ASN1::GENERALSTRING (27)
- * * OpenSSL::ASN1::UNIVERSALSTRING (28)
- * * OpenSSL::ASN1::BMPSTRING (30)
- *
- * == UNIVERSAL_TAG_NAME constant
- *
- * An Array that stores the name of a given tag number. These names are
- * the same as the name of the tag constant that is additionally defined,
- * e.g. UNIVERSAL_TAG_NAME[2] = "INTEGER" and OpenSSL::ASN1::INTEGER = 2.
- *
- * == Example usage
- *
- * === Decoding and viewing a DER-encoded file
- * require 'openssl'
- * require 'pp'
- * der = File.binread('data.der')
- * asn1 = OpenSSL::ASN1.decode(der)
- * pp der
- *
- * === Creating an ASN.1 structure and DER-encoding it
- * require 'openssl'
- * version = OpenSSL::ASN1::Integer.new(1)
- * # Explicitly 0-tagged implies context-specific tag class
- * serial = OpenSSL::ASN1::Integer.new(12345, 0, :EXPLICIT, :CONTEXT_SPECIFIC)
- * name = OpenSSL::ASN1::PrintableString.new('Data 1')
- * sequence = OpenSSL::ASN1::Sequence.new( [ version, serial, name ] )
- * der = sequence.to_der
- */
mASN1 = rb_define_module_under(mOSSL, "ASN1");
-
- /* Document-class: OpenSSL::ASN1::ASN1Error
- *
- * Generic error class for all errors raised in ASN1 and any of the
- * classes defined in it.
- */
eASN1Error = rb_define_class_under(mASN1, "ASN1Error", eOSSLError);
rb_define_module_function(mASN1, "traverse", ossl_asn1_traverse, 1);
rb_define_module_function(mASN1, "decode", ossl_asn1_decode, 1);
rb_define_module_function(mASN1, "decode_all", ossl_asn1_decode_all, 1);
ary = rb_ary_new();
-
- /*
- * Array storing tag names at the tag's index.
- */
rb_define_const(mASN1, "UNIVERSAL_TAG_NAME", ary);
for(i = 0; i < ossl_asn1_info_size; i++){
if(ossl_asn1_info[i].name[0] == '[') continue;
@@ -1613,272 +1111,20 @@ Init_ossl_asn1()
rb_ary_store(ary, i, rb_str_new2(ossl_asn1_info[i].name));
}
- /* Document-class: OpenSSL::ASN1::ASN1Data
- *
- * The top-level class representing any ASN.1 object. When parsed by
- * ASN1.decode, tagged values are always represented by an instance
- * of ASN1Data.
- *
- * == The role of ASN1Data for parsing tagged values
- *
- * When encoding an ASN.1 type it is inherently clear what original
- * type (e.g. INTEGER, OCTET STRING etc.) this value has, regardless
- * of its tagging.
- * But opposed to the time an ASN.1 type is to be encoded, when parsing
- * them it is not possible to deduce the "real type" of tagged
- * values. This is why tagged values are generally parsed into ASN1Data
- * instances, but with a different outcome for implicit and explicit
- * tagging.
- *
- * === Example of a parsed implicitly tagged value
- *
- * An implicitly 1-tagged INTEGER value will be parsed as an
- * ASN1Data with
- * * +tag+ equal to 1
- * * +tag_class+ equal to +:CONTEXT_SPECIFIC+
- * * +value+ equal to a +String+ that carries the raw encoding
- * of the INTEGER.
- * This implies that a subsequent decoding step is required to
- * completely decode implicitly tagged values.
- *
- * === Example of a parsed explicitly tagged value
- *
- * An explicitly 1-tagged INTEGER value will be parsed as an
- * ASN1Data with
- * * +tag+ equal to 1
- * * +tag_class+ equal to +:CONTEXT_SPECIFIC+
- * * +value+ equal to an +Array+ with one single element, an
- * instance of OpenSSL::ASN1::Integer, i.e. the inner element
- * is the non-tagged primitive value, and the tagging is represented
- * in the outer ASN1Data
- *
- * == Example - Decoding an implicitly tagged INTEGER
- * int = OpenSSL::ASN1::Integer.new(1, 0, :IMPLICIT) # implicit 0-tagged
- * seq = OpenSSL::ASN1::Sequence.new( [int] )
- * der = seq.to_der
- * asn1 = OpenSSL::ASN1.decode(der)
- * # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
- * # @infinite_length=false,
- * # @tag=16,
- * # @tag_class=:UNIVERSAL,
- * # @tagging=nil,
- * # @value=
- * # [#<OpenSSL::ASN1::ASN1Data:0x87326f4
- * # @infinite_length=false,
- * # @tag=0,
- * # @tag_class=:CONTEXT_SPECIFIC,
- * # @value="\x01">]>
- * raw_int = asn1.value[0]
- * # manually rewrite tag and tag class to make it an UNIVERSAL value
- * raw_int.tag = OpenSSL::ASN1::INTEGER
- * raw_int.tag_class = :UNIVERSAL
- * int2 = OpenSSL::ASN1.decode(raw_int)
- * puts int2.value # => 1
- *
- * == Example - Decoding an explicitly tagged INTEGER
- * int = OpenSSL::ASN1::Integer.new(1, 0, :EXPLICIT) # explicit 0-tagged
- * seq = OpenSSL::ASN1::Sequence.new( [int] )
- * der = seq.to_der
- * asn1 = OpenSSL::ASN1.decode(der)
- * # pp asn1 => #<OpenSSL::ASN1::Sequence:0x87326e0
- * # @infinite_length=false,
- * # @tag=16,
- * # @tag_class=:UNIVERSAL,
- * # @tagging=nil,
- * # @value=
- * # [#<OpenSSL::ASN1::ASN1Data:0x87326f4
- * # @infinite_length=false,
- * # @tag=0,
- * # @tag_class=:CONTEXT_SPECIFIC,
- * # @value=
- * # [#<OpenSSL::ASN1::Integer:0x85bf308
- * # @infinite_length=false,
- * # @tag=2,
- * # @tag_class=:UNIVERSAL
- * # @tagging=nil,
- * # @value=1>]>]>
- * int2 = asn1.value[0].value[0]
- * puts int2.value # => 1
- */
cASN1Data = rb_define_class_under(mASN1, "ASN1Data", rb_cObject);
- /*
- * Carries the value of a ASN.1 type.
- * Please confer Constructive and Primitive for the mappings between
- * ASN.1 data types and Ruby classes.
- */
rb_attr(cASN1Data, rb_intern("value"), 1, 1, 0);
- /*
- * A +Number+ representing the tag number of this ASN1Data. Never +nil+.
- */
rb_attr(cASN1Data, rb_intern("tag"), 1, 1, 0);
- /*
- * A +Symbol+ representing the tag class of this ASN1Data. Never +nil+.
- * See ASN1Data for possible values.
- */
rb_attr(cASN1Data, rb_intern("tag_class"), 1, 1, 0);
- /*
- * Never +nil+. A +Boolean+ indicating whether the encoding was infinite
- * length (in the case of parsing) or whether an infinite length encoding
- * shall be used (in the encoding case).
- * In DER, every value has a finite length associated with it. But in
- * scenarios where large amounts of data need to be transferred it
- * might be desirable to have some kind of streaming support available.
- * For example, huge OCTET STRINGs are preferably sent in smaller-sized
- * chunks, each at a time.
- * This is possible in BER by setting the length bytes of an encoding
- * to zero and by this indicating that the following value will be
- * sent in chunks. Infinite length encodings are always constructed.
- * The end of such a stream of chunks is indicated by sending a EOC
- * (End of Content) tag. SETs and SEQUENCEs may use an infinite length
- * encoding, but also primitive types such as e.g. OCTET STRINGS or
- * BIT STRINGS may leverage this functionality (cf. ITU-T X.690).
- */
- rb_attr(cASN1Data, rb_intern("infinite_length"), 1, 1, 0);
rb_define_method(cASN1Data, "initialize", ossl_asn1data_initialize, 3);
rb_define_method(cASN1Data, "to_der", ossl_asn1data_to_der, 0);
- /* Document-class: OpenSSL::ASN1::Primitive
- *
- * The parent class for all primitive encodings. Attributes are the same as
- * for ASN1Data, with the addition of +tagging+.
- * Primitive values can never be infinite length encodings, thus it is not
- * possible to set the +infinite_length+ attribute for Primitive and its
- * sub-classes.
- *
- * == Primitive sub-classes and their mapping to Ruby classes
- * * OpenSSL::ASN1::EndOfContent <=> +value+ is always +nil+
- * * OpenSSL::ASN1::Boolean <=> +value+ is a +Boolean+
- * * OpenSSL::ASN1::Integer <=> +value+ is a +Number+
- * * OpenSSL::ASN1::BitString <=> +value+ is a +String+
- * * OpenSSL::ASN1::OctetString <=> +value+ is a +String+
- * * OpenSSL::ASN1::Null <=> +value+ is always +nil+
- * * OpenSSL::ASN1::Object <=> +value+ is a +String+
- * * OpenSSL::ASN1::Enumerated <=> +value+ is a +Number+
- * * OpenSSL::ASN1::UTF8String <=> +value+ is a +String+
- * * OpenSSL::ASN1::NumericString <=> +value+ is a +String+
- * * OpenSSL::ASN1::PrintableString <=> +value+ is a +String+
- * * OpenSSL::ASN1::T61String <=> +value+ is a +String+
- * * OpenSSL::ASN1::VideotexString <=> +value+ is a +String+
- * * OpenSSL::ASN1::IA5String <=> +value+ is a +String+
- * * OpenSSL::ASN1::UTCTime <=> +value+ is a +Time+
- * * OpenSSL::ASN1::GeneralizedTime <=> +value+ is a +Time+
- * * OpenSSL::ASN1::GraphicString <=> +value+ is a +String+
- * * OpenSSL::ASN1::ISO64String <=> +value+ is a +String+
- * * OpenSSL::ASN1::GeneralString <=> +value+ is a +String+
- * * OpenSSL::ASN1::UniversalString <=> +value+ is a +String+
- * * OpenSSL::ASN1::BMPString <=> +value+ is a +String+
- *
- * == OpenSSL::ASN1::BitString
- *
- * === Additional attributes
- * +unused_bits+: if the underlying BIT STRING's
- * length is a multiple of 8 then +unused_bits+ is 0. Otherwise
- * +unused_bits+ indicates the number of bits that are to be ignored in
- * the final octet of the +BitString+'s +value+.
- *
- * == OpenSSL::ASN1::ObjectId
- *
- * === Additional attributes
- * * +sn+: the short name as defined in <openssl/objects.h>.
- * * +ln+: the long name as defined in <openssl/objects.h>.
- * * +oid+: the object identifier as a +String+, e.g. "1.2.3.4.5"
- * * +short_name+: alias for +sn+.
- * * +long_name+: alias for +ln+.
- *
- * == Examples
- * With the Exception of OpenSSL::ASN1::EndOfContent, each Primitive class
- * constructor takes at least one parameter, the +value+.
- *
- * === Creating EndOfContent
- * eoc = OpenSSL::ASN1::EndOfContent.new
- *
- * === Creating any other Primitive
- * prim = <class>.new(value) # <class> being one of the sub-classes except EndOfContent
- * prim_zero_tagged_implicit = <class>.new(value, 0, :IMPLICIT)
- * prim_zero_tagged_explicit = <class>.new(value, 0, :EXPLICIT)
- */
cASN1Primitive = rb_define_class_under(mASN1, "Primitive", cASN1Data);
- /*
- * May be used as a hint for encoding a value either implicitly or
- * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
- * +tagging+ is not set when a ASN.1 structure is parsed using
- * OpenSSL::ASN1.decode.
- */
rb_attr(cASN1Primitive, rb_intern("tagging"), 1, 1, Qtrue);
- rb_undef_method(cASN1Primitive, "infinite_length=");
rb_define_method(cASN1Primitive, "initialize", ossl_asn1_initialize, -1);
rb_define_method(cASN1Primitive, "to_der", ossl_asn1prim_to_der, 0);
- /* Document-class: OpenSSL::ASN1::Constructive
- *
- * The parent class for all constructed encodings. The +value+ attribute
- * of a Constructive is always an +Array+. Attributes are the same as
- * for ASN1Data, with the addition of +tagging+.
- *
- * == SET and SEQUENCE
- *
- * Most constructed encodings come in the form of a SET or a SEQUENCE.
- * These encodings are represented by one of the two sub-classes of
- * Constructive:
- * * OpenSSL::ASN1::Set
- * * OpenSSL::ASN1::Sequence
- * Please note that tagged sequences and sets are still parsed as
- * instances of ASN1Data. Find further details on tagged values
- * there.
- *
- * === Example - constructing a SEQUENCE
- * int = OpenSSL::ASN1::Integer.new(1)
- * str = OpenSSL::ASN1::PrintableString.new('abc')
- * sequence = OpenSSL::ASN1::Sequence.new( [ int, str ] )
- *
- * === Example - constructing a SET
- * int = OpenSSL::ASN1::Integer.new(1)
- * str = OpenSSL::ASN1::PrintableString.new('abc')
- * set = OpenSSL::ASN1::Set.new( [ int, str ] )
- *
- * == Infinite length primitive values
- *
- * The only case where Constructive is used directly is for infinite
- * length encodings of primitive values. These encodings are always
- * constructed, with the contents of the +value+ +Array+ being either
- * UNIVERSAL non-infinite length partial encodings of the actual value
- * or again constructive encodings with infinite length (i.e. infinite
- * length primitive encodings may be constructed recursively with another
- * infinite length value within an already infinite length value). Each
- * partial encoding must be of the same UNIVERSAL type as the overall
- * encoding. The value of the overall encoding consists of the
- * concatenation of each partial encoding taken in sequence. The +value+
- * array of the outer infinite length value must end with a
- * OpenSSL::ASN1::EndOfContent instance.
- *
- * Please note that it is not possible to encode Constructive without
- * the +infinite_length+ attribute being set to +true+, use
- * OpenSSL::ASN1::Sequence or OpenSSL::ASN1::Set in these cases instead.
- *
- * === Example - Infinite length OCTET STRING
- * partial1 = OpenSSL::ASN1::OctetString.new("\x01")
- * partial2 = OpenSSL::ASN1::OctetString.new("\x02")
- * inf_octets = OpenSSL::ASN1::Constructive.new( [ partial1,
- * partial2,
- * OpenSSL::ASN1::EndOfContent.new ],
- * OpenSSL::ASN1::OCTET_STRING,
- * nil,
- * :UNIVERSAL )
- * # The real value of inf_octets is "\x01\x02", i.e. the concatenation
- * # of partial1 and partial2
- * inf_octets.infinite_length = true
- * der = inf_octets.to_der
- * asn1 = OpenSSL::ASN1.decode(der)
- * puts asn1.infinite_length # => true
- */
cASN1Constructive = rb_define_class_under(mASN1,"Constructive", cASN1Data);
rb_include_module(cASN1Constructive, rb_mEnumerable);
- /*
- * May be used as a hint for encoding a value either implicitly or
- * explicitly by setting it either to +:IMPLICIT+ or to +:EXPLICIT+.
- * +tagging+ is not set when a ASN.1 structure is parsed using
- * OpenSSL::ASN1.decode.
- */
rb_attr(cASN1Constructive, rb_intern("tagging"), 1, 1, Qtrue);
rb_define_method(cASN1Constructive, "initialize", ossl_asn1_initialize, -1);
rb_define_method(cASN1Constructive, "to_der", ossl_asn1cons_to_der, 0);
@@ -1914,12 +1160,6 @@ do{\
OSSL_ASN1_DEFINE_CLASS(Sequence, Constructive);
OSSL_ASN1_DEFINE_CLASS(Set, Constructive);
- OSSL_ASN1_DEFINE_CLASS(EndOfContent, Data);
-
-
-#if 0
- cASN1ObjectId = rb_define_class_under(mASN1, "ObjectId", cASN1Primitive); /* let rdoc know */
-#endif
rb_define_singleton_method(cASN1ObjectId, "register", ossl_asn1obj_s_register, 3);
rb_define_method(cASN1ObjectId, "sn", ossl_asn1obj_get_sn, 0);
rb_define_method(cASN1ObjectId, "ln", ossl_asn1obj_get_ln, 0);
@@ -1927,32 +1167,4 @@ do{\
rb_define_alias(cASN1ObjectId, "short_name", "sn");
rb_define_alias(cASN1ObjectId, "long_name", "ln");
rb_attr(cASN1BitString, rb_intern("unused_bits"), 1, 1, 0);
-
- rb_define_method(cASN1EndOfContent, "initialize", ossl_asn1eoc_initialize, 0);
-
- class_tag_map = rb_hash_new();
- rb_hash_aset(class_tag_map, cASN1EndOfContent, INT2NUM(V_ASN1_EOC));
- rb_hash_aset(class_tag_map, cASN1Boolean, INT2NUM(V_ASN1_BOOLEAN));
- rb_hash_aset(class_tag_map, cASN1Integer, INT2NUM(V_ASN1_INTEGER));
- rb_hash_aset(class_tag_map, cASN1BitString, INT2NUM(V_ASN1_BIT_STRING));
- rb_hash_aset(class_tag_map, cASN1OctetString, INT2NUM(V_ASN1_OCTET_STRING));
- rb_hash_aset(class_tag_map, cASN1Null, INT2NUM(V_ASN1_NULL));
- rb_hash_aset(class_tag_map, cASN1ObjectId, INT2NUM(V_ASN1_OBJECT));
- rb_hash_aset(class_tag_map, cASN1Enumerated, INT2NUM(V_ASN1_ENUMERATED));
- rb_hash_aset(class_tag_map, cASN1UTF8String, INT2NUM(V_ASN1_UTF8STRING));
- rb_hash_aset(class_tag_map, cASN1Sequence, INT2NUM(V_ASN1_SEQUENCE));
- rb_hash_aset(class_tag_map, cASN1Set, INT2NUM(V_ASN1_SET));
- rb_hash_aset(class_tag_map, cASN1NumericString, INT2NUM(V_ASN1_NUMERICSTRING));
- rb_hash_aset(class_tag_map, cASN1PrintableString, INT2NUM(V_ASN1_PRINTABLESTRING));
- rb_hash_aset(class_tag_map, cASN1T61String, INT2NUM(V_ASN1_T61STRING));
- rb_hash_aset(class_tag_map, cASN1VideotexString, INT2NUM(V_ASN1_VIDEOTEXSTRING));
- rb_hash_aset(class_tag_map, cASN1IA5String, INT2NUM(V_ASN1_IA5STRING));
- rb_hash_aset(class_tag_map, cASN1UTCTime, INT2NUM(V_ASN1_UTCTIME));
- rb_hash_aset(class_tag_map, cASN1GeneralizedTime, INT2NUM(V_ASN1_GENERALIZEDTIME));
- rb_hash_aset(class_tag_map, cASN1GraphicString, INT2NUM(V_ASN1_GRAPHICSTRING));
- rb_hash_aset(class_tag_map, cASN1ISO64String, INT2NUM(V_ASN1_ISO64STRING));
- rb_hash_aset(class_tag_map, cASN1GeneralString, INT2NUM(V_ASN1_GENERALSTRING));
- rb_hash_aset(class_tag_map, cASN1UniversalString, INT2NUM(V_ASN1_UNIVERSALSTRING));
- rb_hash_aset(class_tag_map, cASN1BMPString, INT2NUM(V_ASN1_BMPSTRING));
- rb_global_variable(&class_tag_map);
}
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index a11c08c1a3..dc8732d9d9 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -25,10 +25,9 @@ ossl_obj2bio(VALUE obj)
GetOpenFile(obj, fptr);
rb_io_check_readable(fptr);
- if ((fd = rb_cloexec_dup(FPTR_TO_FD(fptr))) < 0){
+ if ((fd = dup(FPTR_TO_FD(fptr))) < 0){
rb_sys_fail(0);
}
- rb_update_max_fd(fd);
if (!(fp = fdopen(fd, "r"))){
close(fd);
rb_sys_fail(0);
@@ -40,7 +39,7 @@ ossl_obj2bio(VALUE obj)
}
else {
StringValue(obj);
- bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LENINT(obj));
+ bio = BIO_new_mem_buf(RSTRING_PTR(obj), RSTRING_LEN(obj));
if (!bio) ossl_raise(eOSSLError, NULL);
}
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 822b854efe..6adc59fc1a 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -12,22 +12,22 @@
#include "ossl.h"
#define WrapBN(klass, obj, bn) do { \
- if (!(bn)) { \
+ if (!bn) { \
ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, BN_clear_free, (bn)); \
+ obj = Data_Wrap_Struct(klass, 0, BN_clear_free, bn); \
} while (0)
#define GetBN(obj, bn) do { \
- Data_Get_Struct((obj), BIGNUM, (bn)); \
- if (!(bn)) { \
+ Data_Get_Struct(obj, BIGNUM, bn); \
+ if (!bn) { \
ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
} \
} while (0)
#define SafeGetBN(obj, bn) do { \
- OSSL_Check_Kind((obj), cBN); \
- GetBN((obj), (bn)); \
+ OSSL_Check_Kind(obj, cBN); \
+ GetBN(obj, bn); \
} while (0)
/*
@@ -70,8 +70,6 @@ GetBNPtr(VALUE obj)
}
WrapBN(cBN, obj, bn); /* Handle potencial mem leaks */
break;
- case T_NIL:
- break;
default:
ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
}
@@ -119,11 +117,11 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
if (rb_scan_args(argc, argv, "11", &str, &bs) == 2) {
base = NUM2INT(bs);
}
-
+ StringValue(str);
+ GetBN(self, bn);
if (RTEST(rb_obj_is_kind_of(str, cBN))) {
BIGNUM *other;
- GetBN(self, bn);
GetBN(str, other); /* Safe - we checked kind_of? above */
if (!BN_copy(bn, other)) {
ossl_raise(eBNError, NULL);
@@ -131,16 +129,14 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
return self;
}
- StringValue(str);
- GetBN(self, bn);
switch (base) {
case 0:
- if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) {
+ if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
ossl_raise(eBNError, NULL);
}
break;
case 2:
- if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) {
+ if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
ossl_raise(eBNError, NULL);
}
break;
@@ -200,11 +196,11 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
break;
case 10:
if (!(buf = BN_bn2dec(bn))) ossl_raise(eBNError, NULL);
- str = ossl_buf2str(buf, rb_long2int(strlen(buf)));
+ str = ossl_buf2str(buf, strlen(buf));
break;
case 16:
if (!(buf = BN_bn2hex(bn))) ossl_raise(eBNError, NULL);
- str = ossl_buf2str(buf, rb_long2int(strlen(buf)));
+ str = ossl_buf2str(buf, strlen(buf));
break;
default:
ossl_raise(rb_eArgError, "invalid radix %d", base);
@@ -735,8 +731,8 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
void
Init_ossl_bn()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
if (!(ossl_bn_ctx = BN_CTX_new())) {
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 0fa740e1cb..41dc6b7e3e 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -10,24 +10,17 @@
*/
#include "ossl.h"
-#define WrapCipher(obj, klass, ctx) \
- (obj) = Data_Wrap_Struct((klass), 0, ossl_cipher_free, (ctx))
#define MakeCipher(obj, klass, ctx) \
- (obj) = Data_Make_Struct((klass), EVP_CIPHER_CTX, 0, ossl_cipher_free, (ctx))
-#define AllocCipher(obj, ctx) \
- memset(DATA_PTR(obj) = (ctx) = ALLOC(EVP_CIPHER_CTX), 0, sizeof(EVP_CIPHER_CTX))
-#define GetCipherInit(obj, ctx) do { \
- Data_Get_Struct((obj), EVP_CIPHER_CTX, (ctx)); \
-} while (0)
+ obj = Data_Make_Struct(klass, EVP_CIPHER_CTX, 0, ossl_cipher_free, ctx)
#define GetCipher(obj, ctx) do { \
- GetCipherInit((obj), (ctx)); \
- if (!(ctx)) { \
+ Data_Get_Struct(obj, EVP_CIPHER_CTX, ctx); \
+ if (!ctx) { \
ossl_raise(rb_eRuntimeError, "Cipher not inititalized!"); \
} \
} while (0)
#define SafeGetCipher(obj, ctx) do { \
- OSSL_Check_Kind((obj), cCipher); \
- GetCipher((obj), (ctx)); \
+ OSSL_Check_Kind(obj, cCipher); \
+ GetCipher(obj, ctx); \
} while (0)
/*
@@ -58,7 +51,7 @@ ossl_cipher_new(const EVP_CIPHER *cipher)
EVP_CIPHER_CTX *ctx;
ret = ossl_cipher_alloc(cCipher);
- AllocCipher(ret, ctx);
+ GetCipher(ret, ctx);
EVP_CIPHER_CTX_init(ctx);
if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
ossl_raise(eCipherError, NULL);
@@ -81,9 +74,11 @@ ossl_cipher_free(EVP_CIPHER_CTX *ctx)
static VALUE
ossl_cipher_alloc(VALUE klass)
{
+ EVP_CIPHER_CTX *ctx;
VALUE obj;
- WrapCipher(obj, klass, 0);
+ MakeCipher(obj, klass, ctx);
+ EVP_CIPHER_CTX_init(ctx);
return obj;
}
@@ -102,31 +97,17 @@ ossl_cipher_initialize(VALUE self, VALUE str)
EVP_CIPHER_CTX *ctx;
const EVP_CIPHER *cipher;
char *name;
- unsigned char key[EVP_MAX_KEY_LENGTH];
name = StringValuePtr(str);
- GetCipherInit(self, ctx);
- if (ctx) {
- ossl_raise(rb_eRuntimeError, "Cipher already inititalized!");
- }
- AllocCipher(self, ctx);
- EVP_CIPHER_CTX_init(ctx);
+ GetCipher(self, ctx);
if (!(cipher = EVP_get_cipherbyname(name))) {
ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name);
}
- /*
- * The EVP which has EVP_CIPH_RAND_KEY flag (such as DES3) allows
- * uninitialized key, but other EVPs (such as AES) does not allow it.
- * Calling EVP_CipherUpdate() without initializing key causes SEGV so we
- * set the data filled with "\0" as the key by default.
- */
- memset(key, 0, EVP_MAX_KEY_LENGTH);
- if (EVP_CipherInit_ex(ctx, cipher, NULL, key, NULL, -1) != 1)
+ if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
ossl_raise(eCipherError, NULL);
return self;
}
-
static VALUE
ossl_cipher_copy(VALUE self, VALUE other)
{
@@ -135,10 +116,7 @@ ossl_cipher_copy(VALUE self, VALUE other)
rb_check_frozen(self);
if (self == other) return self;
- GetCipherInit(self, ctx1);
- if (!ctx1) {
- AllocCipher(self, ctx1);
- }
+ GetCipher(self, ctx1);
SafeGetCipher(other, ctx2);
if (EVP_CIPHER_CTX_copy(ctx1, ctx2) != 1)
ossl_raise(eCipherError, NULL);
@@ -182,9 +160,6 @@ ossl_s_ciphers(VALUE self)
* call-seq:
* cipher.reset -> self
*
- * Fully resets the internal state of the Cipher. By using this, the same
- * Cipher instance may be used several times for en- or decryption tasks.
- *
* Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1).
*/
static VALUE
@@ -213,9 +188,9 @@ 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.
*/
- VALUE cname = rb_class_path(rb_obj_class(self));
- rb_warn("arguments for %"PRIsVALUE"#encrypt and %"PRIsVALUE"#decrypt were deprecated; "
- "use %"PRIsVALUE"#pkcs5_keyivgen to derive key and IV",
+ const 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);
StringValue(pass);
GetCipher(self, ctx);
@@ -229,7 +204,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_LENINT(pass), 1, key, NULL);
+ (unsigned char *)RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
p_key = key;
p_iv = iv;
}
@@ -247,10 +222,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
* call-seq:
* cipher.encrypt -> self
*
- * Initializes the Cipher for encryption.
- *
- * Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
- * following methods:
+ * Make sure to call .encrypt or .decrypt before using any of the following methods:
* * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
*
* Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
@@ -265,10 +237,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
* call-seq:
* cipher.decrypt -> self
*
- * Initializes the Cipher for decryption.
- *
- * Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
- * following methods:
+ * Make sure to call .encrypt or .decrypt before using any of the following methods:
* * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
*
* Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
@@ -283,13 +252,11 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
* call-seq:
* cipher.pkcs5_keyivgen(pass [, salt [, iterations [, digest]]] ) -> nil
*
- * Generates and sets the key/IV based on a password.
+ * Generates and sets the key/iv based on a password.
*
- * WARNING: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40,
- * or DES with MD5 or SHA1. Using anything else (like AES) will generate the
- * key/iv using an OpenSSL specific method. This method is deprecated and
- * should no longer be used. Use a PKCS5 v2 key generation method from
- * OpenSSL::PKCS5 instead.
+ * WARNING: This method is only PKCS5 v1.5 compliant when using RC2, RC4-40, or DES
+ * with MD5 or SHA1. Using anything else (like AES) will generate the key/iv using an
+ * OpenSSL specific method. Use a PKCS5 v2 key generation method instead.
*
* === Parameters
* +salt+ must be an 8 byte string if provided.
@@ -313,14 +280,14 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
if(!NIL_P(vsalt)){
StringValue(vsalt);
if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN)
- ossl_raise(eCipherError, "salt must be an 8-octet string");
+ rb_raise(eCipherError, "salt must be an 8-octet string");
salt = (unsigned char *)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_LENINT(vpass), iter, key, iv);
+ (unsigned char *)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);
@@ -329,42 +296,11 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
return Qnil;
}
-static int
-ossl_cipher_update_long(EVP_CIPHER_CTX *ctx, unsigned char *out, long *out_len_ptr,
- const unsigned char *in, long in_len)
-{
- int out_part_len;
- long out_len = 0;
-#define UPDATE_LENGTH_LIMIT INT_MAX
-
-#if SIZEOF_LONG > UPDATE_LENGTH_LIMIT
- if (in_len > UPDATE_LENGTH_LIMIT) {
- const int in_part_len = (UPDATE_LENGTH_LIMIT / 2 + 1) & ~1;
- do {
- if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
- &out_part_len, in, in_part_len))
- return 0;
- out_len += out_part_len;
- in += in_part_len;
- } while ((in_len -= in_part_len) > UPDATE_LENGTH_LIMIT);
- }
-#endif
- if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
- &out_part_len, in, (int)in_len))
- return 0;
- if (out_len_ptr) *out_len_ptr = out_len += out_part_len;
- return 1;
-}
/*
* call-seq:
* cipher.update(data [, buffer]) -> string or buffer
*
- * Encrypts data in a streaming fashion. Hand consecutive blocks of data
- * to the +update+ method in order to encrypt it. Returns the encrypted
- * data chunk. When done, the output of Cipher#final should be additionally
- * added to the result.
- *
* === Parameters
* +data+ is a nonempty string.
* +buffer+ is an optional string to store the result.
@@ -374,7 +310,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
{
EVP_CIPHER_CTX *ctx;
unsigned char *in;
- long in_len, out_len;
+ int in_len, out_len;
VALUE data, str;
rb_scan_args(argc, argv, "11", &data, &str);
@@ -382,13 +318,9 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
StringValue(data);
in = (unsigned char *)RSTRING_PTR(data);
if ((in_len = RSTRING_LEN(data)) == 0)
- ossl_raise(rb_eArgError, "data must not be empty");
+ rb_raise(rb_eArgError, "data must not be empty");
GetCipher(self, ctx);
out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
- if (out_len <= 0) {
- ossl_raise(rb_eRangeError,
- "data too big to make output buffer: %ld bytes", in_len);
- }
if (NIL_P(str)) {
str = rb_str_new(0, out_len);
@@ -397,7 +329,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
rb_str_resize(str, out_len);
}
- if (!ossl_cipher_update_long(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
+ if (!EVP_CipherUpdate(ctx, (unsigned char *)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);
@@ -407,17 +339,11 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
- * cipher.final -> string
+ * cipher.final -> aString
*
- * Returns the remaining data held in the cipher object. Further calls to
- * Cipher#update or Cipher#final will return garbage. This call should always
- * be made as the last call of an encryption or decryption operation, after
- * after having fed the entire plaintext or ciphertext to the Cipher instance.
+ * Returns the remaining data held in the cipher object. Further calls to update() or final() will return garbage.
*
- * If an authenticated cipher was used, a CipherError is raised if the tag
- * could not be authenticated successfully. Only call this method after
- * setting the authentication tag and passing the entire contents of the
- * ciphertext into the cipher.
+ * See EVP_CipherFinal_ex for further information.
*/
static VALUE
ossl_cipher_final(VALUE self)
@@ -440,8 +366,7 @@ ossl_cipher_final(VALUE self)
* call-seq:
* cipher.name -> string
*
- * Returns the name of the cipher which may differ slightly from the original
- * name provided.
+ * Returns the name of the cipher which may differ slightly from the original name provided.
*/
static VALUE
ossl_cipher_name(VALUE self)
@@ -457,12 +382,9 @@ ossl_cipher_name(VALUE self)
* call-seq:
* cipher.key = string -> string
*
- * Sets the cipher key. To generate a key, you should either use a secure
- * random byte string or, if the key is to be derived from a password, you
- * should rely on PBKDF2 functionality provided by OpenSSL::PKCS5. To
- * generate a secure random-based key, Cipher#random_key may be used.
+ * Sets the cipher key.
*
- * Only call this method after calling Cipher#encrypt or Cipher#decrypt.
+ * Only call this method after calling cipher.encrypt or cipher.decrypt.
*/
static VALUE
ossl_cipher_set_key(VALUE self, VALUE key)
@@ -485,16 +407,9 @@ ossl_cipher_set_key(VALUE self, VALUE key)
* call-seq:
* cipher.iv = string -> string
*
- * Sets the cipher IV. Please note that since you should never be using ECB
- * mode, an IV is always explicitly required and should be set prior to
- * encryption. The IV itself can be safely transmitted in public, but it
- * should be unpredictable to prevent certain kinds of attacks. You may use
- * Cipher#random_iv to create a secure random IV.
- *
- * Only call this method after calling Cipher#encrypt or Cipher#decrypt.
+ * Sets the cipher iv.
*
- * If not explicitly set, the OpenSSL default of an all-zeroes ("\\0") IV is
- * used.
+ * Only call this method after calling cipher.encrypt or cipher.decrypt.
*/
static VALUE
ossl_cipher_set_iv(VALUE self, VALUE iv)
@@ -513,182 +428,13 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
return iv;
}
-#ifdef HAVE_AUTHENTICATED_ENCRYPTION
-/*
- * call-seq:
- * cipher.auth_data = string -> string
- *
- * Sets the cipher's additional authenticated data. This field must be
- * set when using AEAD cipher modes such as GCM or CCM. If no associated
- * data shall be used, this method must *still* be called with a value of "".
- * The contents of this field should be non-sensitive data which will be
- * added to the ciphertext to generate the authentication tag which validates
- * the contents of the ciphertext.
- *
- * The AAD must be set prior to encryption or decryption. In encryption mode,
- * it must be set after calling Cipher#encrypt and setting Cipher#key= and
- * Cipher#iv=. When decrypting, the authenticated data must be set after key,
- * iv and especially *after* the authentication tag has been set. I.e. set it
- * only after calling Cipher#decrypt, Cipher#key=, Cipher#iv= and
- * Cipher#auth_tag= first.
- */
-static VALUE
-ossl_cipher_set_auth_data(VALUE self, VALUE data)
-{
- EVP_CIPHER_CTX *ctx;
- unsigned char *in;
- long in_len, out_len;
-
- StringValue(data);
-
- in = (unsigned char *) RSTRING_PTR(data);
- in_len = RSTRING_LEN(data);
-
- GetCipher(self, ctx);
-
- if (!ossl_cipher_update_long(ctx, NULL, &out_len, in, in_len))
- ossl_raise(eCipherError, "couldn't set additional authenticated data");
-
- return data;
-}
-
-#define ossl_is_gcm(nid) (nid) == NID_aes_128_gcm || \
- (nid) == NID_aes_192_gcm || \
- (nid) == NID_aes_256_gcm
-
-static VALUE
-ossl_get_gcm_auth_tag(EVP_CIPHER_CTX *ctx, int len)
-{
- unsigned char *tag;
- VALUE ret;
-
- tag = ALLOC_N(unsigned char, len);
-
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, len, tag))
- ossl_raise(eCipherError, "retrieving the authentication tag failed");
-
- ret = rb_str_new((const char *) tag, len);
- xfree(tag);
- return ret;
-}
-
-/*
- * call-seq:
- * cipher.auth_tag([ tag_len ] -> string
- *
- * Gets the authentication tag generated by Authenticated Encryption Cipher
- * modes (GCM for example). This tag may be stored along with the ciphertext,
- * then set on the decryption cipher to authenticate the contents of the
- * ciphertext against changes. If the optional integer parameter +tag_len+ is
- * given, the returned tag will be +tag_len+ bytes long. If the parameter is
- * omitted, the maximum length of 16 bytes will be returned. For maximum
- * security, the default of 16 bytes should be chosen.
- *
- * The tag may only be retrieved after calling Cipher#final.
- */
-static VALUE
-ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
-{
- VALUE vtag_len;
- EVP_CIPHER_CTX *ctx;
- int nid, tag_len;
-
- if (rb_scan_args(argc, argv, "01", &vtag_len) == 0) {
- tag_len = 16;
- } else {
- tag_len = NUM2INT(vtag_len);
- }
-
- GetCipher(self, ctx);
- nid = EVP_CIPHER_CTX_nid(ctx);
-
- if (ossl_is_gcm(nid)) {
- return ossl_get_gcm_auth_tag(ctx, tag_len);
- } else {
- ossl_raise(eCipherError, "authentication tag not supported by this cipher");
- return Qnil; /* dummy */
- }
-}
-
-static inline void
-ossl_set_gcm_auth_tag(EVP_CIPHER_CTX *ctx, unsigned char *tag, int tag_len)
-{
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, tag_len, tag))
- ossl_raise(eCipherError, "unable to set GCM tag");
-}
/*
* call-seq:
- * cipher.auth_tag = string -> string
+ * cipher.key_length = integer -> integer
*
- * Sets the authentication tag to verify the contents of the
- * ciphertext. The tag must be set after calling Cipher#decrypt,
- * Cipher#key= and Cipher#iv=, but before assigning the associated
- * authenticated data using Cipher#auth_data= and of course, before
- * decrypting any of the ciphertext. After all decryption is
- * performed, the tag is verified automatically in the call to
- * Cipher#final.
- */
-static VALUE
-ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
-{
- EVP_CIPHER_CTX *ctx;
- int nid;
- unsigned char *tag;
- int tag_len;
-
- StringValue(vtag);
- tag = (unsigned char *) RSTRING_PTR(vtag);
- tag_len = RSTRING_LENINT(vtag);
-
- GetCipher(self, ctx);
- nid = EVP_CIPHER_CTX_nid(ctx);
-
- if (ossl_is_gcm(nid)) {
- ossl_set_gcm_auth_tag(ctx, tag, tag_len);
- } else {
- ossl_raise(eCipherError, "authentication tag not supported by this cipher");
- }
-
- return vtag;
-}
-
-/*
- * call-seq:
- * cipher.authenticated? -> boolean
- *
- * Indicated whether this Cipher instance uses an Authenticated Encryption
- * mode.
- */
-static VALUE
-ossl_cipher_is_authenticated(VALUE self)
-{
- EVP_CIPHER_CTX *ctx;
- int nid;
-
- GetCipher(self, ctx);
- nid = EVP_CIPHER_CTX_nid(ctx);
-
- if (ossl_is_gcm(nid)) {
- return Qtrue;
- } else {
- return Qfalse;
- }
-}
-#else
-#define ossl_cipher_set_auth_data rb_f_notimplement
-#define ossl_cipher_get_auth_tag rb_f_notimplement
-#define ossl_cipher_set_auth_tag rb_f_notimplement
-#define ossl_cipher_is_authenticated rb_f_notimplement
-#endif
-
-/*
- * call-seq:
- * cipher.key_len = integer -> integer
- *
- * Sets the key length of the cipher. If the cipher is a fixed length cipher
- * then attempting to set the key length to any value other than the fixed
- * value is an error.
+ * Sets the key length of the cipher. If the cipher is a fixed length cipher then attempting to set the key
+ * length to any value other than the fixed value is an error.
*
* Under normal circumstances you do not need to call this method (and probably shouldn't).
*
@@ -741,28 +487,30 @@ ossl_cipher_set_padding(VALUE self, VALUE padding)
GetCipher(self, ctx); \
return INT2NUM(EVP_CIPHER_##func(EVP_CIPHER_CTX_cipher(ctx))); \
}
+CIPHER_0ARG_INT(key_length)
+CIPHER_0ARG_INT(iv_length)
+CIPHER_0ARG_INT(block_size)
+#if 0
/*
* call-seq:
- * cipher.key_len -> integer
+ * cipher.key_length -> integer
*
- * Returns the key length in bytes of the Cipher.
*/
-CIPHER_0ARG_INT(key_length)
+static VALUE ossl_cipher_key_length() { }
/*
* call-seq:
- * cipher.iv_len -> integer
+ * cipher.iv_length -> integer
*
- * Returns the expected length in bytes for an IV for this Cipher.
*/
-CIPHER_0ARG_INT(iv_length)
+static VALUE ossl_cipher_iv_length() { }
/*
* call-seq:
* cipher.block_size -> integer
*
- * Returns the size in bytes of the blocks on which this Cipher operates on.
*/
-CIPHER_0ARG_INT(block_size)
+static VALUE ossl_cipher_block_size() { }
+#endif
/*
* INIT
@@ -770,207 +518,9 @@ CIPHER_0ARG_INT(block_size)
void
Init_ossl_cipher(void)
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
-
- /* Document-class: OpenSSL::Cipher
- *
- * Provides symmetric algorithms for encryption and decryption. The
- * algorithms that are available depend on the particular version
- * of OpenSSL that is installed.
- *
- * === Listing all supported algorithms
- *
- * A list of supported algorithms can be obtained by
- *
- * puts OpenSSL::Cipher.ciphers
- *
- * === Instantiating a Cipher
- *
- * There are several ways to create a Cipher instance. Generally, a
- * Cipher algorithm is categorized by its name, the key length in bits
- * and the cipher mode to be used. The most generic way to create a
- * Cipher is the following
- *
- * cipher = OpenSSL::Cipher.new('<name>-<key length>-<mode>')
- *
- * That is, a string consisting of the hyphenated concatenation of the
- * individual components name, key length and mode. Either all uppercase
- * or all lowercase strings may be used, for example:
- *
- * cipher = OpenSSL::Cipher.new('AES-128-CBC')
- *
- * For each algorithm supported, there is a class defined under the
- * Cipher class that goes by the name of the cipher, e.g. to obtain an
- * instance of AES, you could also use
- *
- * # these are equivalent
- * cipher = OpenSSL::Cipher::AES.new(128, :CBC)
- * cipher = OpenSSL::Cipher::AES.new(128, 'CBC')
- * cipher = OpenSSL::Cipher::AES.new('128-CBC')
- *
- * Finally, due to its wide-spread use, there are also extra classes
- * defined for the different key sizes of AES
- *
- * cipher = OpenSSL::Cipher::AES128.new(:CBC)
- * cipher = OpenSSL::Cipher::AES192.new(:CBC)
- * cipher = OpenSSL::Cipher::AES256.new(:CBC)
- *
- * === Choosing either encryption or decryption mode
- *
- * Encryption and decryption are often very similar operations for
- * symmetric algorithms, this is reflected by not having to choose
- * different classes for either operation, both can be done using the
- * same class. Still, after obtaining a Cipher instance, we need to
- * tell the instance what it is that we intend to do with it, so we
- * need to call either
- *
- * cipher.encrypt
- *
- * or
- *
- * cipher.decrypt
- *
- * on the Cipher instance. This should be the first call after creating
- * the instance, otherwise configuration that has already been set could
- * get lost in the process.
- *
- * === Choosing a key
- *
- * Symmetric encryption requires a key that is the same for the encrypting
- * and for the decrypting party and after initial key establishment should
- * be kept as private information. There are a lot of ways to create
- * insecure keys, the most notable is to simply take a password as the key
- * without processing the password further. A simple and secure way to
- * create a key for a particular Cipher is
- *
- * cipher = OpenSSL::AES256.new(:CFB)
- * cipher.encrypt
- * key = cipher.random_key # also sets the generated key on the Cipher
- *
- * If you absolutely need to use passwords as encryption keys, you
- * should use Password-Based Key Derivation Function 2 (PBKDF2) by
- * generating the key with the help of the functionality provided by
- * OpenSSL::PKCS5.pbkdf2_hmac_sha1 or OpenSSL::PKCS5.pbkdf2_hmac.
- *
- * Although there is Cipher#pkcs5_keyivgen, its use is deprecated and
- * it should only be used in legacy applications because it does not use
- * the newer PKCS#5 v2 algorithms.
- *
- * === Choosing an IV
- *
- * The cipher modes CBC, CFB, OFB and CTR all need an "initialization
- * vector", or short, IV. ECB mode is the only mode that does not require
- * an IV, but there is almost no legitimate use case for this mode
- * because of the fact that it does not sufficiently hide plaintext
- * patterns. Therefore
- *
- * <b>You should never use ECB mode unless you are absolutely sure that
- * you absolutely need it</b>
- *
- * Because of this, you will end up with a mode that explicitly requires
- * an IV in any case. Note that for backwards compatibility reasons,
- * setting an IV is not explicitly mandated by the Cipher API. If not
- * set, OpenSSL itself defaults to an all-zeroes IV ("\\0", not the
- * character). Although the IV can be seen as public information, i.e.
- * it may be transmitted in public once generated, it should still stay
- * unpredictable to prevent certain kinds of attacks. Therefore, ideally
- *
- * <b>Always create a secure random IV for every encryption of your
- * Cipher</b>
- *
- * A new, random IV should be created for every encryption of data. Think
- * of the IV as a nonce (number used once) - it's public but random and
- * unpredictable. A secure random IV can be created as follows
- *
- * cipher = ...
- * cipher.encrypt
- * key = cipher.random_key
- * iv = cipher.random_iv # also sets the generated IV on the Cipher
- *
- * Although the key is generally a random value, too, it is a bad choice
- * as an IV. There are elaborate ways how an attacker can take advantage
- * of such an IV. As a general rule of thumb, exposing the key directly
- * or indirectly should be avoided at all cost and exceptions only be
- * made with good reason.
- *
- * === Calling Cipher#final
- *
- * ECB (which should not be used) and CBC are both block-based modes.
- * This means that unlike for the other streaming-based modes, they
- * operate on fixed-size blocks of data, and therefore they require a
- * "finalization" step to produce or correctly decrypt the last block of
- * data by appropriately handling some form of padding. Therefore it is
- * essential to add the output of OpenSSL::Cipher#final to your
- * encryption/decryption buffer or you will end up with decryption errors
- * or truncated data.
- *
- * Although this is not really necessary for streaming-mode ciphers, it is
- * still recommended to apply the same pattern of adding the output of
- * Cipher#final there as well - it also enables you to switch between
- * modes more easily in the future.
- *
- * === Encrypting and decrypting some data
- *
- * data = "Very, very confidential data"
- *
- * cipher = OpenSSL::Cipher::AES.new(128, :CBC)
- * cipher.encrypt
- * key = cipher.random_key
- * iv = cipher.random_iv
- *
- * encrypted = cipher.update(data) + cipher.final
- * ...
- * decipher = OpenSSL::Cipher::AES.new(128, :CBC)
- * decipher.decrypt
- * decipher.key = key
- * decipher.iv = iv
- *
- * plain = decipher.update(encrypted) + decipher.final
- *
- * puts data == plain #=> true
- *
- * === Authenticated Encryption and Associated Data (AEAD)
- *
- * If the OpenSSL version used supports it, an Authenticated Encryption
- * mode (such as GCM or CCM) should always be preferred over any
- * unauthenticated mode. Currently, OpenSSL supports AE only in combination
- * with Associated Data (AEAD) where additional associated data is included
- * in the encryption process to compute a tag at the end of the encryption.
- * This tag will also be used in the decryption process and by verifying
- * its validity, the authenticity of a given ciphertext is established.
- *
- * This is superior to unauthenticated modes in that it allows to detect
- * if somebody effectively changed the ciphertext after it had been
- * encrypted. This prevents malicious modifications of the ciphertext that
- * could otherwise be exploited to modify ciphertexts in ways beneficial to
- * potential attackers.
- *
- * If no associated data is needed for encryption and later decryption,
- * the OpenSSL library still requires a value to be set - "" may be used in
- * case none is available. An example using the GCM (Galois Counter Mode):
- *
- * cipher = OpenSSL::Cipher::AES.new(128, :GCM)
- * cipher.encrypt
- * key = cipher.random_key
- * iv = cipher.random_iv
- * cipher.auth_data = ""
- *
- * encrypted = cipher.update(data) + cipher.final
- * tag = cipher.auth_tag
- *
- * decipher = OpenSSL::Cipher::AES.new(128, :GCM)
- * decipher.decrypt
- * decipher.key = key
- * decipher.iv = iv
- * decipher.auth_tag = tag
- * decipher.auth_data = ""
- *
- * plain = decipher.update(encrypted) + decipher.final
- *
- * puts data == plain #=> true
- */
cCipher = rb_define_class_under(mOSSL, "Cipher", rb_cObject);
eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
@@ -986,10 +536,6 @@ Init_ossl_cipher(void)
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);
- rb_define_method(cCipher, "auth_data=", ossl_cipher_set_auth_data, 1);
- rb_define_method(cCipher, "auth_tag=", ossl_cipher_set_auth_tag, 1);
- rb_define_method(cCipher, "auth_tag", ossl_cipher_get_auth_tag, -1);
- rb_define_method(cCipher, "authenticated?", ossl_cipher_is_authenticated, 0);
rb_define_method(cCipher, "key_len=", ossl_cipher_set_key_length, 1);
rb_define_method(cCipher, "key_len", ossl_cipher_key_length, 0);
rb_define_method(cCipher, "iv=", ossl_cipher_set_iv, 1);
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index e700833076..22ea9dea5d 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -10,6 +10,22 @@
*/
#include "ossl.h"
+#define WrapConfig(klass, obj, conf) do { \
+ if (!conf) { \
+ ossl_raise(rb_eRuntimeError, "Config wasn't intitialized!"); \
+ } \
+ obj = Data_Wrap_Struct(klass, 0, NCONF_free, conf); \
+} while (0)
+#define GetConfig(obj, conf) do { \
+ Data_Get_Struct(obj, CONF, conf); \
+ if (!conf) { \
+ ossl_raise(rb_eRuntimeError, "Config wasn't intitialized!"); \
+ } \
+} while (0)
+#define SafeGetConfig(obj, conf) do { \
+ OSSL_Check_Kind(obj, cConfig); \
+ GetConfig(obj, conf); \
+} while(0);
/*
* Classes
@@ -21,31 +37,48 @@ VALUE eConfigError;
* Public
*/
-/*
- * GetConfigPtr is a public C-level function for getting OpenSSL CONF struct
- * from an OpenSSL::Config(eConfig) instance. We decided to implement
- * OpenSSL::Config in Ruby level but we need to pass native CONF struct for
- * some OpenSSL features such as X509V3_EXT_*.
- */
+static CONF *parse_config(VALUE, CONF*);
+
CONF *
GetConfigPtr(VALUE obj)
{
CONF *conf;
+
+ SafeGetConfig(obj, conf);
+
+ return conf;
+}
+
+CONF *
+DupConfigPtr(VALUE obj)
+{
VALUE str;
- BIO *bio;
- long eline = -1;
OSSL_Check_Kind(obj, cConfig);
str = rb_funcall(obj, rb_intern("to_s"), 0);
+
+ return parse_config(str, NULL);
+}
+
+/*
+ * Private
+ */
+static CONF *
+parse_config(VALUE str, CONF *dst)
+{
+ CONF *conf;
+ BIO *bio;
+ long eline = -1;
+
bio = ossl_obj2bio(str);
- conf = NCONF_new(NULL);
+ conf = dst ? dst : NCONF_new(NULL);
if(!conf){
BIO_free(bio);
ossl_raise(eConfigError, NULL);
}
if(!NCONF_load_bio(conf, bio, &eline)){
BIO_free(bio);
- NCONF_free(conf);
+ if(!dst) NCONF_free(conf);
if (eline <= 0) ossl_raise(eConfigError, "wrong config format");
else ossl_raise(eConfigError, "error in line %d", eline);
ossl_raise(eConfigError, NULL);
@@ -55,6 +88,376 @@ GetConfigPtr(VALUE obj)
return conf;
}
+static VALUE
+ossl_config_s_parse(VALUE klass, VALUE str)
+{
+ CONF *conf;
+ VALUE obj;
+
+ conf = parse_config(str, NULL);
+ WrapConfig(klass, obj, conf);
+
+ return obj;
+}
+
+static VALUE
+ossl_config_s_alloc(VALUE klass)
+{
+ CONF *conf;
+ VALUE obj;
+
+ if(!(conf = NCONF_new(NULL)))
+ ossl_raise(eConfigError, NULL);
+ WrapConfig(klass, obj, conf);
+
+ return obj;
+}
+
+static VALUE
+ossl_config_copy(VALUE self, VALUE other)
+{
+ VALUE str;
+ CONF *conf;
+
+ str = rb_funcall(self, rb_intern("to_s"), 0);
+ GetConfig(other, conf);
+ parse_config(str, conf);
+
+ return self;
+}
+
+static VALUE
+ossl_config_initialize(int argc, VALUE *argv, VALUE self)
+{
+ CONF *conf;
+ long eline = -1;
+ char *filename;
+ VALUE path;
+
+ rb_scan_args(argc, argv, "01", &path);
+ if(!NIL_P(path)){
+ SafeStringValue(path);
+ filename = StringValuePtr(path);
+ GetConfig(self, conf);
+ if (!NCONF_load(conf, filename, &eline)){
+ if (eline <= 0)
+ ossl_raise(eConfigError, "wrong config file %s", filename);
+ else
+ ossl_raise(eConfigError, "error in %s:%d", filename, eline);
+ }
+ }
+#ifdef OSSL_NO_CONF_API
+ else rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+#else
+ else {
+ GetConfig(self, conf);
+ _CONF_new_data(conf);
+ }
+#endif
+
+ return self;
+}
+
+static VALUE
+ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
+{
+#ifdef OSSL_NO_CONF_API
+ rb_notimplement();
+#else
+ CONF *conf;
+ CONF_VALUE *sv, *cv;
+
+ StringValue(section);
+ StringValue(name);
+ StringValue(value);
+ GetConfig(self, conf);
+ if(!(sv = _CONF_get_section(conf, RSTRING_PTR(section)))){
+ if(!(sv = _CONF_new_section(conf, RSTRING_PTR(section)))){
+ ossl_raise(eConfigError, NULL);
+ }
+ }
+ if(!(cv = OPENSSL_malloc(sizeof(CONF_VALUE)))){
+ ossl_raise(eConfigError, NULL);
+ }
+ cv->name = BUF_strdup(RSTRING_PTR(name));
+ cv->value = BUF_strdup(RSTRING_PTR(value));
+ if(!cv->name || !cv->value || !_CONF_add_string(conf, sv, cv)){
+ OPENSSL_free(cv->name);
+ OPENSSL_free(cv->value);
+ OPENSSL_free(cv);
+ ossl_raise(eConfigError, "_CONF_add_string failure");
+ }
+
+ return value;
+#endif
+}
+
+static void
+rb_ossl_config_modify_check(VALUE config)
+{
+ if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config");
+ if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config");
+}
+
+#if !defined(OSSL_NO_CONF_API)
+static VALUE
+ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value)
+{
+ rb_ossl_config_modify_check(self);
+ 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)
+{
+ CONF *conf;
+ char *str;
+
+ StringValue(section);
+ StringValue(name);
+ GetConfig(self, conf);
+ str = NCONF_get_string(conf, RSTRING_PTR(section), RSTRING_PTR(name));
+ if(!str){
+ ERR_clear_error();
+ return Qnil;
+ }
+
+ return rb_str_new2(str);
+}
+
+static VALUE
+ossl_config_get_value_old(int argc, VALUE *argv, VALUE self)
+{
+ VALUE section, name;
+
+ rb_scan_args(argc, argv, "11", &section, &name);
+
+ /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */
+ if (NIL_P(section)) section = rb_str_new2("");
+ /* support conf.value("HOME") -> conf.get_value("", "HOME") */
+ if (NIL_P(name)) {
+ name = section;
+ section = rb_str_new2("");
+ }
+ /* NOTE: Don't care about conf.get_value(nil, nil) */
+ rb_warn("Config#value is deprecated; use Config#get_value");
+ return ossl_config_get_value(self, section, name);
+}
+
+static VALUE
+set_conf_section_i(VALUE i, VALUE *arg)
+{
+ VALUE name, value;
+
+ Check_Type(i, T_ARRAY);
+ name = rb_ary_entry(i, 0);
+ value = rb_ary_entry(i, 1);
+ ossl_config_add_value(arg[0], arg[1], name, value);
+
+ return Qnil;
+}
+
+static VALUE
+ossl_config_set_section(VALUE self, VALUE section, VALUE hash)
+{
+ VALUE arg[2];
+
+ rb_ossl_config_modify_check(self);
+ arg[0] = self;
+ arg[1] = section;
+ rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg);
+ return hash;
+}
+
+/*
+ * Get all numbers as strings - use str.to_i to convert
+ * long number = CONF_get_number(confp->config, sect, StringValuePtr(item));
+ */
+static VALUE
+ossl_config_get_section(VALUE self, VALUE section)
+{
+ CONF *conf;
+ STACK_OF(CONF_VALUE) *sk;
+ CONF_VALUE *entry;
+ int i, entries;
+ VALUE hash;
+
+ hash = rb_hash_new();
+ StringValue(section);
+ GetConfig(self, conf);
+ if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) {
+ ERR_clear_error();
+ return hash;
+ }
+ if ((entries = sk_CONF_VALUE_num(sk)) < 0) {
+ OSSL_Debug("# of items in section is < 0?!?");
+ return hash;
+ }
+ for (i=0; i<entries; i++) {
+ entry = sk_CONF_VALUE_value(sk, i);
+ rb_hash_aset(hash, rb_str_new2(entry->name), rb_str_new2(entry->value));
+ }
+
+ return hash;
+}
+
+static VALUE
+ossl_config_get_section_old(VALUE self, VALUE section)
+{
+ rb_warn("Config#section is deprecated; use Config#[]");
+ return ossl_config_get_section(self, section);
+}
+
+#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF)
+static void
+get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp)
+{
+ VALUE ary = (VALUE)tmp;
+ if(cv->name) return;
+ rb_ary_push(ary, rb_str_new2(cv->section));
+}
+
+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void)
+
+static VALUE
+ossl_config_get_sections(VALUE self)
+{
+ CONF *conf;
+ VALUE ary;
+
+ GetConfig(self, conf);
+ ary = rb_ary_new();
+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section),
+ (void*)ary);
+
+ return ary;
+}
+
+static void
+dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp)
+{
+ VALUE str = (VALUE)tmp;
+ STACK_OF(CONF_VALUE) *sk;
+ CONF_VALUE *v;
+ int i, num;
+
+ if (cv->name) return;
+ sk = (STACK_OF(CONF_VALUE)*)cv->value;
+ num = sk_CONF_VALUE_num(sk);
+ rb_str_cat2(str, "[ ");
+ rb_str_cat2(str, cv->section);
+ rb_str_cat2(str, " ]\n");
+ for(i = 0; i < num; i++){
+ v = sk_CONF_VALUE_value(sk, i);
+ rb_str_cat2(str, v->name ? v->name : "None");
+ rb_str_cat2(str, "=");
+ rb_str_cat2(str, v->value ? v->value : "None");
+ rb_str_cat2(str, "\n");
+ }
+ rb_str_cat2(str, "\n");
+}
+
+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void)
+
+static VALUE
+dump_conf(CONF *conf)
+{
+ VALUE str;
+
+ str = rb_str_new(0, 0);
+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value),
+ (void*)str);
+
+ return str;
+}
+
+static VALUE
+ossl_config_to_s(VALUE self)
+{
+ CONF *conf;
+
+ GetConfig(self, conf);
+
+ return dump_conf(conf);
+}
+
+static void
+each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy)
+{
+ STACK_OF(CONF_VALUE) *sk;
+ CONF_VALUE *v;
+ VALUE section, name, value, args;
+ int i, num;
+
+ if (cv->name) return;
+ sk = (STACK_OF(CONF_VALUE)*)cv->value;
+ num = sk_CONF_VALUE_num(sk);
+ section = rb_str_new2(cv->section);
+ for(i = 0; i < num; i++){
+ v = sk_CONF_VALUE_value(sk, i);
+ name = v->name ? rb_str_new2(v->name) : Qnil;
+ value = v->value ? rb_str_new2(v->value) : Qnil;
+ args = rb_ary_new3(3, section, name, value);
+ rb_yield(args);
+ }
+}
+
+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((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value),
+ (void*)NULL);
+
+ return self;
+}
+#else
+static VALUE
+ossl_config_get_sections(VALUE self)
+{
+ rb_warn("#sections don't work with %s", OPENSSL_VERSION_TEXT);
+ return rb_ary_new();
+}
+
+static VALUE
+ossl_config_to_s(VALUE self)
+{
+ rb_warn("#to_s don't work with %s", OPENSSL_VERSION_TEXT);
+ return rb_str_new(0, 0);
+}
+
+static VALUE
+ossl_config_each(VALUE self)
+{
+ rb_warn("#each don't work with %s", OPENSSL_VERSION_TEXT);
+ return self;
+}
+#endif
+
+static VALUE
+ossl_config_inspect(VALUE self)
+{
+ VALUE str, ary = ossl_config_get_sections(self);
+ const char *cname = rb_class2name(rb_obj_class(self));
+
+ str = rb_str_new2("#<");
+ rb_str_cat2(str, cname);
+ rb_str_cat2(str, " sections=");
+ rb_str_append(str, rb_inspect(ary));
+ rb_str_cat2(str, ">");
+
+ return str;
+}
/*
* INIT
@@ -70,5 +473,20 @@ Init_ossl_config()
rb_define_const(cConfig, "DEFAULT_CONFIG_FILE",
rb_str_new2(default_config_file));
OPENSSL_free(default_config_file);
- /* methods are defined by openssl/config.rb */
+ 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");
+ rb_define_alloc_func(cConfig, ossl_config_s_alloc);
+ rb_define_copy_func(cConfig, ossl_config_copy);
+ 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, "[]", 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);
+ rb_define_method(cConfig, "sections", ossl_config_get_sections, 0);
+ rb_define_method(cConfig, "to_s", ossl_config_to_s, 0);
+ rb_define_method(cConfig, "each", ossl_config_each, 0);
+ rb_define_method(cConfig, "inspect", ossl_config_inspect, 0);
}
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index fdf13e98e5..04679d37f9 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -11,14 +11,14 @@
#include "ossl.h"
#define GetDigest(obj, ctx) do { \
- Data_Get_Struct((obj), EVP_MD_CTX, (ctx)); \
- if (!(ctx)) { \
+ Data_Get_Struct(obj, EVP_MD_CTX, ctx); \
+ if (!ctx) { \
ossl_raise(rb_eRuntimeError, "Digest CTX wasn't initialized!"); \
} \
} while (0)
#define SafeGetDigest(obj, ctx) do { \
- OSSL_Check_Kind((obj), cDigest); \
- GetDigest((obj), (ctx)); \
+ OSSL_Check_Kind(obj, cDigest); \
+ GetDigest(obj, ctx); \
} while (0)
/*
@@ -36,18 +36,12 @@ const EVP_MD *
GetDigestPtr(VALUE obj)
{
const EVP_MD *md;
- ASN1_OBJECT *oid = NULL;
if (TYPE(obj) == T_STRING) {
const char *name = StringValueCStr(obj);
- md = EVP_get_digestbyname(name);
- if (!md) {
- oid = OBJ_txt2obj(name, 0);
- md = EVP_get_digestbyobj(oid);
- ASN1_OBJECT_free(oid);
- }
- if(!md)
+ md = EVP_get_digestbyname(name);
+ if (!md)
ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
} else {
EVP_MD_CTX *ctx;
@@ -68,9 +62,7 @@ ossl_digest_new(const EVP_MD *md)
ret = ossl_digest_alloc(cDigest);
GetDigest(ret, ctx);
- if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
- ossl_raise(eDigestError, "Digest initialization failed.");
- }
+ EVP_DigestInit_ex(ctx, md, NULL);
return ret;
}
@@ -96,20 +88,7 @@ VALUE ossl_digest_update(VALUE, VALUE);
/*
* call-seq:
- * Digest.new(string [, data]) -> Digest
- *
- * Creates a Digest instance based on +string+, which is either the ln
- * (long name) or sn (short name) of a supported digest algorithm.
- * If +data+ (a +String+) is given, it is used as the initial input to the
- * Digest instance, i.e.
- * digest = OpenSSL::Digest.new('sha256', 'digestdata')
- * is equal to
- * digest = OpenSSL::Digest.new('sha256')
- * digest.update('digestdata')
- *
- * === Example
- * digest = OpenSSL::Digest.new('sha1')
- *
+ * Digest.new(string) -> digest
*
*/
static VALUE
@@ -124,9 +103,7 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
if (!NIL_P(data)) StringValue(data);
GetDigest(self, ctx);
- if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
- ossl_raise(eDigestError, "Digest initialization failed.");
- }
+ EVP_DigestInit_ex(ctx, md, NULL);
if (!NIL_P(data)) return ossl_digest_update(self, data);
return self;
@@ -153,9 +130,6 @@ ossl_digest_copy(VALUE self, VALUE other)
* call-seq:
* digest.reset -> self
*
- * Resets the Digest in the sense that any Digest#update that has been
- * performed is abandoned and the Digest is set to its initial state again.
- *
*/
static VALUE
ossl_digest_reset(VALUE self)
@@ -163,9 +137,7 @@ ossl_digest_reset(VALUE self)
EVP_MD_CTX *ctx;
GetDigest(self, ctx);
- if (EVP_DigestInit_ex(ctx, EVP_MD_CTX_md(ctx), NULL) != 1) {
- ossl_raise(eDigestError, "Digest initialization failed.");
- }
+ EVP_DigestInit_ex(ctx, EVP_MD_CTX_md(ctx), NULL);
return self;
}
@@ -174,16 +146,6 @@ ossl_digest_reset(VALUE self)
* call-seq:
* digest.update(string) -> aString
*
- * Not every message digest can be computed in one single pass. If a message
- * digest is to be computed from several subsequent sources, then each may
- * be passed individually to the Digest instance.
- *
- * === Example
- * digest = OpenSSL::Digest::SHA256.new
- * digest.update('First input')
- * digest << 'Second input' # equivalent to digest.update('Second input')
- * result = digest.digest
- *
*/
VALUE
ossl_digest_update(VALUE self, VALUE data)
@@ -228,12 +190,6 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
* call-seq:
* digest.name -> string
*
- * Returns the sn of this Digest instance.
- *
- * === Example
- * digest = OpenSSL::Digest::SHA512.new
- * puts digest.name # => SHA512
- *
*/
static VALUE
ossl_digest_name(VALUE self)
@@ -247,15 +203,9 @@ ossl_digest_name(VALUE self)
/*
* call-seq:
- * digest.digest_length -> integer
- *
- * Returns the output size of the digest, i.e. the length in bytes of the
- * final message digest result.
- *
- * === Example
- * digest = OpenSSL::Digest::SHA1.new
- * puts digest.digest_length # => 20
+ * digest.digest_size -> integer
*
+ * Returns the output size of the digest.
*/
static VALUE
ossl_digest_size(VALUE self)
@@ -267,19 +217,6 @@ ossl_digest_size(VALUE self)
return INT2NUM(EVP_MD_CTX_size(ctx));
}
-/*
- * call-seq:
- * digest.block_length -> integer
- *
- * Returns the block length of the digest algorithm, i.e. the length in bytes
- * of an individual block. Most modern algorithms partition a message to be
- * digested into a sequence of fix-sized blocks that are processed
- * consecutively.
- *
- * === Example
- * digest = OpenSSL::Digest::SHA1.new
- * puts digest.block_length # => 64
- */
static VALUE
ossl_digest_block_length(VALUE self)
{
@@ -298,129 +235,11 @@ Init_ossl_digest()
{
rb_require("digest");
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
- /* Document-class: OpenSSL::Digest
- *
- * OpenSSL::Digest allows you to compute message digests (sometimes
- * interchangeably called "hashes") of arbitrary data that are
- * cryptographically secure, i.e. a Digest implements a secure one-way
- * function.
- *
- * One-way functions offer some useful properties. E.g. given two
- * distinct inputs the probability that both yield the same output
- * is highly unlikely. Combined with the fact that every message digest
- * algorithm has a fixed-length output of just a few bytes, digests are
- * often used to create unique identifiers for arbitrary data. A common
- * example is the creation of a unique id for binary documents that are
- * stored in a database.
- *
- * Another useful characteristic of one-way functions (and thus the name)
- * is that given a digest there is no indication about the original
- * data that produced it, i.e. the only way to identify the original input
- * is to "brute-force" through every possible combination of inputs.
- *
- * These characteristics make one-way functions also ideal companions
- * for public key signature algorithms: instead of signing an entire
- * document, first a hash of the document is produced with a considerably
- * faster message digest algorithm and only the few bytes of its output
- * need to be signed using the slower public key algorithm. To validate
- * the integrity of a signed document, it suffices to re-compute the hash
- * and verify that it is equal to that in the signature.
- *
- * Among the supported message digest algorithms are:
- * * SHA, SHA1, SHA224, SHA256, SHA384 and SHA512
- * * MD2, MD4, MDC2 and MD5
- * * RIPEMD160
- * * DSS, DSS1 (Pseudo algorithms to be used for DSA signatures. DSS is
- * equal to SHA and DSS1 is equal to SHA1)
- *
- * For each of these algorithms, there is a sub-class of Digest that
- * can be instantiated as simply as e.g.
- *
- * digest = OpenSSL::Digest::SHA1.new
- *
- * === Mapping between Digest class and sn/ln
- *
- * The sn (short names) and ln (long names) are defined in
- * <openssl/object.h> and <openssl/obj_mac.h>. They are textual
- * representations of ASN.1 OBJECT IDENTIFIERs. Each supported digest
- * algorithm has an OBJECT IDENTIFIER associated to it and those again
- * have short/long names assigned to them.
- * E.g. the OBJECT IDENTIFIER for SHA-1 is 1.3.14.3.2.26 and its
- * sn is "SHA1" and its ln is "sha1".
- * ==== MD2
- * * sn: MD2
- * * ln: md2
- * ==== MD4
- * * sn: MD4
- * * ln: md4
- * ==== MD5
- * * sn: MD5
- * * ln: md5
- * ==== SHA
- * * sn: SHA
- * * ln: SHA
- * ==== SHA-1
- * * sn: SHA1
- * * ln: sha1
- * ==== SHA-224
- * * sn: SHA224
- * * ln: sha224
- * ==== SHA-256
- * * sn: SHA256
- * * ln: sha256
- * ==== SHA-384
- * * sn: SHA384
- * * ln: sha384
- * ==== SHA-512
- * * sn: SHA512
- * * ln: sha512
- *
- * "Breaking" a message digest algorithm means defying its one-way
- * function characteristics, i.e. producing a collision or finding a way
- * to get to the original data by means that are more efficient than
- * brute-forcing etc. Most of the supported digest algorithms can be
- * considered broken in this sense, even the very popular MD5 and SHA1
- * algorithms. Should security be your highest concern, then you should
- * probably rely on SHA224, SHA256, SHA384 or SHA512.
- *
- * === Hashing a file
- *
- * data = File.read('document')
- * sha256 = OpenSSL::Digest::SHA256.new
- * digest = sha256.digest(data)
- *
- * === Hashing several pieces of data at once
- *
- * data1 = File.read('file1')
- * data2 = File.read('file2')
- * data3 = File.read('file3')
- * sha256 = OpenSSL::Digest::SHA256.new
- * sha256 << data1
- * sha256 << data2
- * sha256 << data3
- * digest = sha256.digest
- *
- * === Reuse a Digest instance
- *
- * data1 = File.read('file1')
- * sha256 = OpenSSL::Digest::SHA256.new
- * digest1 = sha256.digest(data1)
- *
- * data2 = File.read('file2')
- * sha256.reset
- * digest2 = sha256.digest(data2)
- *
- */
cDigest = rb_define_class_under(mOSSL, "Digest", rb_path2class("Digest::Class"));
- /* Document-class: OpenSSL::Digest::DigestError
- *
- * Generic Exception class that is raised if an error occurs during a
- * Digest operation.
- */
eDigestError = rb_define_class_under(cDigest, "DigestError", eOSSLError);
rb_define_alloc_func(cDigest, ossl_digest_alloc);
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index 6c6c80886e..3b48119b7f 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -13,20 +13,20 @@
#if defined(OSSL_ENGINE_ENABLED)
#define WrapEngine(klass, obj, engine) do { \
- if (!(engine)) { \
+ if (!engine) { \
ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, ENGINE_free, (engine)); \
+ obj = Data_Wrap_Struct(klass, 0, ENGINE_free, engine); \
} while(0)
#define GetEngine(obj, engine) do { \
- Data_Get_Struct((obj), ENGINE, (engine)); \
- if (!(engine)) { \
+ Data_Get_Struct(obj, ENGINE, engine); \
+ if (!engine) { \
ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
} \
} while (0)
#define SafeGetEngine(obj, engine) do { \
- OSSL_Check_Kind((obj), cEngine); \
- GetPKCS7((obj), (engine)); \
+ OSSL_Check_Kind(obj, cEngine); \
+ GetPKCS7(obj, engine); \
} while (0)
/*
@@ -64,47 +64,29 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
#if HAVE_ENGINE_LOAD_DYNAMIC
OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
#endif
-#if HAVE_ENGINE_LOAD_4758CCA
- OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
-#endif
-#if HAVE_ENGINE_LOAD_AEP
- OSSL_ENGINE_LOAD_IF_MATCH(aep);
-#endif
-#if HAVE_ENGINE_LOAD_ATALLA
- OSSL_ENGINE_LOAD_IF_MATCH(atalla);
+#if HAVE_ENGINE_LOAD_CSWIFT
+ OSSL_ENGINE_LOAD_IF_MATCH(cswift);
#endif
#if HAVE_ENGINE_LOAD_CHIL
OSSL_ENGINE_LOAD_IF_MATCH(chil);
#endif
-#if HAVE_ENGINE_LOAD_CSWIFT
- OSSL_ENGINE_LOAD_IF_MATCH(cswift);
+#if HAVE_ENGINE_LOAD_ATALLA
+ OSSL_ENGINE_LOAD_IF_MATCH(atalla);
#endif
#if HAVE_ENGINE_LOAD_NURON
OSSL_ENGINE_LOAD_IF_MATCH(nuron);
#endif
-#if HAVE_ENGINE_LOAD_SUREWARE
- OSSL_ENGINE_LOAD_IF_MATCH(sureware);
-#endif
#if HAVE_ENGINE_LOAD_UBSEC
OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
#endif
-#if HAVE_ENGINE_LOAD_PADLOCK
- OSSL_ENGINE_LOAD_IF_MATCH(padlock);
-#endif
-#if HAVE_ENGINE_LOAD_CAPI
- OSSL_ENGINE_LOAD_IF_MATCH(capi);
-#endif
-#if HAVE_ENGINE_LOAD_GMP
- OSSL_ENGINE_LOAD_IF_MATCH(gmp);
-#endif
-#if HAVE_ENGINE_LOAD_GOST
- OSSL_ENGINE_LOAD_IF_MATCH(gost);
+#if HAVE_ENGINE_LOAD_AEP
+ OSSL_ENGINE_LOAD_IF_MATCH(aep);
#endif
-#if HAVE_ENGINE_LOAD_CRYPTODEV
- OSSL_ENGINE_LOAD_IF_MATCH(cryptodev);
+#if HAVE_ENGINE_LOAD_SUREWARE
+ OSSL_ENGINE_LOAD_IF_MATCH(sureware);
#endif
-#if HAVE_ENGINE_LOAD_AESNI
- OSSL_ENGINE_LOAD_IF_MATCH(aesni);
+#if HAVE_ENGINE_LOAD_4758CCA
+ OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
#endif
#endif
#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
@@ -133,11 +115,7 @@ ossl_engine_s_engines(VALUE klass)
ary = rb_ary_new();
for(e = ENGINE_get_first(); e; e = ENGINE_get_next(e)){
- /* Need a ref count of two here because of ENGINE_free being
- * called internally by OpenSSL when moving to the next ENGINE
- * and by us when releasing the ENGINE reference */
- ENGINE_up_ref(e);
- WrapEngine(klass, obj, e);
+ WrapEngine(klass, obj, e);
rb_ary_push(ary, obj);
}
@@ -365,11 +343,18 @@ ossl_engine_get_cmds(VALUE self)
static VALUE
ossl_engine_inspect(VALUE self)
{
- ENGINE *e;
-
- GetEngine(self, e);
- return rb_sprintf("#<%"PRIsVALUE" id=\"%s\" name=\"%s\">",
- rb_obj_class(self), ENGINE_get_id(e), ENGINE_get_name(e));
+ VALUE str;
+ const char *cname = rb_class2name(rb_obj_class(self));
+
+ str = rb_str_new2("#<");
+ rb_str_cat2(str, cname);
+ rb_str_cat2(str, " id=\"");
+ rb_str_append(str, ossl_engine_get_id(self));
+ rb_str_cat2(str, "\" name=\"");
+ rb_str_append(str, ossl_engine_get_name(self));
+ rb_str_cat2(str, "\">");
+
+ return str;
}
#define DefEngineConst(x) rb_define_const(cEngine, #x, INT2NUM(ENGINE_##x))
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 5220c9e73d..d9a425e334 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -13,16 +13,16 @@
#include "ossl.h"
#define MakeHMAC(obj, klass, ctx) \
- (obj) = Data_Make_Struct((klass), HMAC_CTX, 0, ossl_hmac_free, (ctx))
+ obj = Data_Make_Struct(klass, HMAC_CTX, 0, ossl_hmac_free, ctx)
#define GetHMAC(obj, ctx) do { \
- Data_Get_Struct((obj), HMAC_CTX, (ctx)); \
- if (!(ctx)) { \
+ Data_Get_Struct(obj, HMAC_CTX, ctx); \
+ if (!ctx) { \
ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
} \
} while (0)
#define SafeGetHMAC(obj, ctx) do { \
- OSSL_Check_Kind((obj), cHMAC); \
- GetHMAC((obj), (ctx)); \
+ OSSL_Check_Kind(obj, cHMAC); \
+ GetHMAC(obj, ctx); \
} while (0)
/*
@@ -70,8 +70,8 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
StringValue(key);
GetHMAC(self, ctx);
- HMAC_Init(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
- GetDigestPtr(digest));
+ HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LEN(key),
+ GetDigestPtr(digest), NULL);
return self;
}
@@ -159,7 +159,7 @@ ossl_hmac_hexdigest(VALUE self)
GetHMAC(self, ctx);
hmac_final(ctx, &buf, &buf_len);
- if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
+ if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
OPENSSL_free(buf);
ossl_raise(eHMACError, "Memory alloc error");
}
@@ -180,7 +180,7 @@ ossl_hmac_reset(VALUE self)
HMAC_CTX *ctx;
GetHMAC(self, ctx);
- HMAC_Init(ctx, NULL, 0, NULL);
+ HMAC_Init_ex(ctx, NULL, 0, NULL, NULL);
return self;
}
@@ -198,7 +198,7 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
StringValue(key);
StringValue(data);
- buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
+ buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
(unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
return rb_str_new((const char *)buf, buf_len);
@@ -220,9 +220,9 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
StringValue(key);
StringValue(data);
- buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
+ buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
(unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
- if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
+ if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
}
hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
@@ -236,8 +236,8 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
void
Init_ossl_hmac()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index b80984cfee..b67dd225a1 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -11,14 +11,14 @@
#include "ossl.h"
#define WrapSPKI(klass, obj, spki) do { \
- if (!(spki)) { \
+ if (!spki) { \
ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, NETSCAPE_SPKI_free, (spki)); \
+ obj = Data_Wrap_Struct(klass, 0, NETSCAPE_SPKI_free, spki); \
} while (0)
#define GetSPKI(obj, spki) do { \
- Data_Get_Struct((obj), NETSCAPE_SPKI, (spki)); \
- if (!(spki)) { \
+ Data_Get_Struct(obj, NETSCAPE_SPKI, spki); \
+ if (!spki) { \
ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
} \
} while (0)
@@ -51,13 +51,6 @@ ossl_spki_alloc(VALUE klass)
return obj;
}
-/*
- * call-seq:
- * SPKI.new([request]) => spki
- *
- * === Parameters
- * * +request+ - optional raw request, either in PEM or DER format.
- */
static VALUE
ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
{
@@ -82,12 +75,6 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
return self;
}
-/*
- * call-seq:
- * spki.to_der => DER-encoded string
- *
- * Returns the DER encoding of this SPKI.
- */
static VALUE
ossl_spki_to_der(VALUE self)
{
@@ -108,12 +95,6 @@ ossl_spki_to_der(VALUE self)
return str;
}
-/*
- * call-seq:
- * spki.to_pem => PEM-encoded string
- *
- * Returns the PEM encoding of this SPKI.
- */
static VALUE
ossl_spki_to_pem(VALUE self)
{
@@ -125,18 +106,11 @@ ossl_spki_to_pem(VALUE self)
if (!(data = NETSCAPE_SPKI_b64_encode(spki))) {
ossl_raise(eSPKIError, NULL);
}
- str = ossl_buf2str(data, rb_long2int(strlen(data)));
+ str = ossl_buf2str(data, strlen(data));
return str;
}
-/*
- * call-seq:
- * spki.to_text => string
- *
- * Returns a textual representation of this SPKI, useful for debugging
- * purposes.
- */
static VALUE
ossl_spki_print(VALUE self)
{
@@ -160,13 +134,6 @@ ossl_spki_print(VALUE self)
return str;
}
-/*
- * call-seq:
- * spki.public_key => pkey
- *
- * Returns the public key associated with the SPKI, an instance of
- * OpenSSL::PKey.
- */
static VALUE
ossl_spki_get_public_key(VALUE self)
{
@@ -181,17 +148,6 @@ ossl_spki_get_public_key(VALUE self)
return ossl_pkey_new(pkey); /* NO DUP - OK */
}
-/*
- * call-seq:
- * spki.public_key = pub => pkey
- *
- * === Parameters
- * * +pub+ - the public key to be set for this instance
- *
- * Sets the public key to be associated with the SPKI, an instance of
- * OpenSSL::PKey. This should be the public key corresponding to the
- * private key used for signing the SPKI.
- */
static VALUE
ossl_spki_set_public_key(VALUE self, VALUE key)
{
@@ -205,12 +161,6 @@ ossl_spki_set_public_key(VALUE self, VALUE key)
return key;
}
-/*
- * call-seq:
- * spki.challenge => string
- *
- * Returns the challenge string associated with this SPKI.
- */
static VALUE
ossl_spki_get_challenge(VALUE self)
{
@@ -226,16 +176,6 @@ ossl_spki_get_challenge(VALUE self)
spki->spkac->challenge->length);
}
-/*
- * call-seq:
- * spki.challenge = str => string
- *
- * === Parameters
- * * +str+ - the challenge string to be set for this instance
- *
- * Sets the challenge to be associated with the SPKI. May be used by the
- * server, e.g. to prevent replay.
- */
static VALUE
ossl_spki_set_challenge(VALUE self, VALUE str)
{
@@ -244,26 +184,13 @@ ossl_spki_set_challenge(VALUE self, VALUE str)
StringValue(str);
GetSPKI(self, spki);
if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING_PTR(str),
- RSTRING_LENINT(str))) {
+ RSTRING_LEN(str))) {
ossl_raise(eSPKIError, NULL);
}
return str;
}
-/*
- * call-seq:
- * spki.sign(key, digest) => spki
- *
- * === Parameters
- * * +key+ - the private key to be used for signing this instance
- * * +digest+ - the digest to be used for signing this instance
- *
- * To sign an SPKI, the private key corresponding to the public key set
- * for this instance should be used, in addition to a digest algorithm in
- * the form of an OpenSSL::Digest. The private key should be an instance of
- * OpenSSL::PKey.
- */
static VALUE
ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
{
@@ -282,14 +209,7 @@ ossl_spki_sign(VALUE self, VALUE key, VALUE digest)
}
/*
- * call-seq:
- * spki.verify(key) => boolean
- *
- * === Parameters
- * * +key+ - the public key to be used for verifying the SPKI signature
- *
- * Returns +true+ if the signature is valid, +false+ otherwise. To verify an
- * SPKI, the public key contained within the SPKI should be used.
+ * Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
*/
static VALUE
ossl_spki_verify(VALUE self, VALUE key)
@@ -308,64 +228,12 @@ ossl_spki_verify(VALUE self, VALUE key)
return Qnil; /* dummy */
}
-/* Document-class: OpenSSL::Netscape::SPKI
- *
- * A Simple Public Key Infrastructure implementation (pronounced "spookey").
- * The structure is defined as
- * PublicKeyAndChallenge ::= SEQUENCE {
- * spki SubjectPublicKeyInfo,
- * challenge IA5STRING
- * }
- *
- * SignedPublicKeyAndChallenge ::= SEQUENCE {
- * publicKeyAndChallenge PublicKeyAndChallenge,
- * signatureAlgorithm AlgorithmIdentifier,
- * signature BIT STRING
- * }
- * where the definitions of SubjectPublicKeyInfo and AlgorithmIdentifier can
- * be found in RFC5280. SPKI is typically used in browsers for generating
- * a public/private key pair and a subsequent certificate request, using
- * the HTML <keygen> element.
- *
- * == Examples
- *
- * === Creating an SPKI
- * key = OpenSSL::PKey::RSA.new 2048
- * spki = OpenSSL::Netscape::SPKI.new
- * spki.challenge = "RandomChallenge"
- * spki.public_key = key.public_key
- * spki.sign(key, OpenSSL::Digest::SHA256.new)
- * #send a request containing this to a server generating a certificate
- * === Verifiying an SPKI request
- * request = #...
- * spki = OpenSSL::Netscape::SPKI.new request
- * unless spki.verify(spki.public_key)
- * # signature is invalid
- * end
- * #proceed
- */
-
-/* Document-module: OpenSSL::Netscape
- *
- * OpenSSL::Netscape is a namespace for SPKI (Simple Public Key
- * Infrastructure) which implements Signed Public Key and Challenge.
- * See {RFC 2692}[http://tools.ietf.org/html/rfc2692] and {RFC
- * 2693}[http://tools.ietf.org/html/rfc2692] for details.
- */
-
-/* Document-class: OpenSSL::Netscape::SPKIError
- *
- * Generic Exception class that is raised if an error occurs during an
- * operation on an instance of OpenSSL::Netscape::SPKI.
+/*
+ * NETSCAPE_SPKI init
*/
-
void
Init_ossl_ns_spki()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
-#endif
-
mNetscape = rb_define_module_under(mOSSL, "Netscape");
eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index e82c2d859a..7c42839153 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -14,55 +14,55 @@
#if defined(OSSL_OCSP_ENABLED)
#define WrapOCSPReq(klass, obj, req) do { \
- if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
- (obj) = Data_Wrap_Struct((klass), 0, OCSP_REQUEST_free, (req)); \
+ if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
+ obj = Data_Wrap_Struct(klass, 0, OCSP_REQUEST_free, req); \
} while (0)
#define GetOCSPReq(obj, req) do { \
- Data_Get_Struct((obj), OCSP_REQUEST, (req)); \
- if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
+ Data_Get_Struct(obj, OCSP_REQUEST, req); \
+ if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
} while (0)
#define SafeGetOCSPReq(obj, req) do { \
- OSSL_Check_Kind((obj), cOCSPReq); \
- GetOCSPReq((obj), (req)); \
+ OSSL_Check_Kind(obj, cOCSPReq); \
+ GetOCSPReq(obj, req); \
} while (0)
#define WrapOCSPRes(klass, obj, res) do { \
- if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
- (obj) = Data_Wrap_Struct((klass), 0, OCSP_RESPONSE_free, (res)); \
+ if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+ obj = Data_Wrap_Struct(klass, 0, OCSP_RESPONSE_free, res); \
} while (0)
#define GetOCSPRes(obj, res) do { \
- Data_Get_Struct((obj), OCSP_RESPONSE, (res)); \
- if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+ Data_Get_Struct(obj, OCSP_RESPONSE, res); \
+ if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
} while (0)
#define SafeGetOCSPRes(obj, res) do { \
- OSSL_Check_Kind((obj), cOCSPRes); \
- GetOCSPRes((obj), (res)); \
+ OSSL_Check_Kind(obj, cOCSPRes); \
+ GetOCSPRes(obj, res); \
} while (0)
#define WrapOCSPBasicRes(klass, obj, res) do { \
- if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
- (obj) = Data_Wrap_Struct((klass), 0, OCSP_BASICRESP_free, (res)); \
+ if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+ obj = Data_Wrap_Struct(klass, 0, OCSP_BASICRESP_free, res); \
} while (0)
#define GetOCSPBasicRes(obj, res) do { \
- Data_Get_Struct((obj), OCSP_BASICRESP, (res)); \
- if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
+ Data_Get_Struct(obj, OCSP_BASICRESP, res); \
+ if(!res) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
} while (0)
#define SafeGetOCSPBasicRes(obj, res) do { \
- OSSL_Check_Kind((obj), cOCSPBasicRes); \
- GetOCSPBasicRes((obj), (res)); \
+ OSSL_Check_Kind(obj, cOCSPBasicRes); \
+ GetOCSPBasicRes(obj, res); \
} while (0)
#define WrapOCSPCertId(klass, obj, cid) do { \
- if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
- (obj) = Data_Wrap_Struct((klass), 0, OCSP_CERTID_free, (cid)); \
+ if(!cid) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
+ obj = Data_Wrap_Struct(klass, 0, OCSP_CERTID_free, cid); \
} while (0)
#define GetOCSPCertId(obj, cid) do { \
- Data_Get_Struct((obj), OCSP_CERTID, (cid)); \
- if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
+ Data_Get_Struct(obj, OCSP_CERTID, cid); \
+ if(!cid) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
} while (0)
#define SafeGetOCSPCertId(obj, cid) do { \
- OSSL_Check_Kind((obj), cOCSPCertId); \
- GetOCSPCertId((obj), (cid)); \
+ OSSL_Check_Kind(obj, cOCSPCertId); \
+ GetOCSPCertId(obj, cid); \
} while (0)
VALUE mOCSP;
@@ -136,7 +136,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_LENINT(val));
+ ret = OCSP_request_add1_nonce(req, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
}
if(!ret) ossl_raise(eOCSPError, NULL);
@@ -440,7 +440,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_LENINT(val));
+ ret = OCSP_basic_add1_nonce(bs, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
}
if(!ret) ossl_raise(eOCSPError, NULL);
@@ -628,27 +628,14 @@ ossl_ocspcid_alloc(VALUE klass)
}
static VALUE
-ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
+ossl_ocspcid_initialize(VALUE self, VALUE subject, VALUE issuer)
{
OCSP_CERTID *id, *newid;
X509 *x509s, *x509i;
- VALUE subject, issuer, digest;
- const EVP_MD *md;
-
- if (rb_scan_args(argc, argv, "21", &subject, &issuer, &digest) == 0) {
- return self;
- }
x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
-
- if (!NIL_P(digest)) {
- md = GetDigestPtr(digest);
- newid = OCSP_cert_to_id(md, x509s, x509i);
- } else {
- newid = OCSP_cert_to_id(NULL, x509s, x509i);
- }
- if(!newid)
+ if(!(newid = OCSP_cert_to_id(NULL, x509s, x509i)))
ossl_raise(eOCSPError, NULL);
GetOCSPCertId(self, id);
OCSP_CERTID_free(id);
@@ -732,7 +719,7 @@ Init_ossl_ocsp()
cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
- rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, -1);
+ rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, 2);
rb_define_method(cOCSPCertId, "cmp", ossl_ocspcid_cmp, 1);
rb_define_method(cOCSPCertId, "cmp_issuer", ossl_ocspcid_cmp_issuer, 1);
rb_define_method(cOCSPCertId, "serial", ossl_ocspcid_get_serial, 0);
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 8a5f816082..85e092b251 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -6,18 +6,18 @@
#include "ossl.h"
#define WrapPKCS12(klass, obj, p12) do { \
- if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
- (obj) = Data_Wrap_Struct((klass), 0, PKCS12_free, (p12)); \
+ if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
+ obj = Data_Wrap_Struct(klass, 0, PKCS12_free, p12); \
} while (0)
#define GetPKCS12(obj, p12) do { \
- Data_Get_Struct((obj), PKCS12, (p12)); \
- if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
+ Data_Get_Struct(obj, PKCS12, p12); \
+ if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
} while (0)
#define SafeGetPKCS12(obj, p12) do { \
- OSSL_Check_Kind((obj), cPKCS12); \
- GetPKCS12((obj), (p12)); \
+ OSSL_Check_Kind(obj, cPKCS12); \
+ GetPKCS12(obj, p12); \
} while (0)
#define ossl_pkcs12_set_key(o,v) rb_iv_set((o), "@key", (v))
@@ -91,11 +91,11 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
/* TODO: make a VALUE to nid function */
if (!NIL_P(key_nid)) {
if ((nkey = OBJ_txt2nid(StringValuePtr(key_nid))) == NID_undef)
- ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(key_nid));
+ rb_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(key_nid));
}
if (!NIL_P(cert_nid)) {
if ((ncert = OBJ_txt2nid(StringValuePtr(cert_nid))) == NID_undef)
- ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(cert_nid));
+ rb_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(cert_nid));
}
if (!NIL_P(key_iter))
kiter = NUM2INT(key_iter);
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
index 3b615e4828..18d166d1ca 100644
--- a/ext/openssl/ossl_pkcs5.c
+++ b/ext/openssl/ossl_pkcs5.c
@@ -14,12 +14,12 @@ VALUE ePKCS5;
*
* === Parameters
* * +pass+ - string
- * * +salt+ - string - should be at least 8 bytes long.
- * * +iter+ - integer - should be greater than 1000. 20000 is better.
+ * * +salt+ - string
+ * * +iter+ - integer - should be greater than 1000. 2000 is better.
* * +keylen+ - integer
* * +digest+ - a string or OpenSSL::Digest object.
*
- * Available in OpenSSL 0.9.4.
+ * Available in OpenSSL 0.9.9?.
*
* Digests other than SHA1 may not be supported by other cryptography libraries.
*/
@@ -36,10 +36,7 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key
str = rb_str_new(0, len);
- if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LENINT(pass),
- (unsigned char *)RSTRING_PTR(salt), RSTRING_LENINT(salt),
- NUM2INT(iter), md, len,
- (unsigned char *)RSTRING_PTR(str)) != 1)
+ if (PKCS5_PBKDF2_HMAC(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), md, len, RSTRING_PTR(str)) != 1)
ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC");
return str;
@@ -56,11 +53,11 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key
*
* === Parameters
* * +pass+ - string
- * * +salt+ - string - should be at least 8 bytes long.
- * * +iter+ - integer - should be greater than 1000. 20000 is better.
+ * * +salt+ - string
+ * * +iter+ - integer - should be greater than 1000. 2000 is better.
* * +keylen+ - integer
*
- * This method is available in almost any version of OpenSSL.
+ * This method is available almost any version OpenSSL.
*
* Conforms to rfc2898.
*/
@@ -75,8 +72,8 @@ 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_LENINT(pass),
- (const unsigned char *)RSTRING_PTR(salt), RSTRING_LENINT(salt), NUM2INT(iter),
+ 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)
ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
@@ -93,95 +90,7 @@ Init_ossl_pkcs5()
* Password-based Encryption
*
*/
-
- #if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
- #endif
-
- /* Document-class: OpenSSL::PKCS5
- *
- * Provides password-based encryption functionality based on PKCS#5.
- * Typically used for securely deriving arbitrary length symmetric keys
- * to be used with an OpenSSL::Cipher from passwords. Another use case
- * is for storing passwords: Due to the ability to tweak the effort of
- * computation by increasing the iteration count, computation can be
- * slowed down artificially in order to render possible attacks infeasible.
- *
- * PKCS5 offers support for PBKDF2 with an OpenSSL::Digest::SHA1-based
- * HMAC, or an arbitrary Digest if the underlying version of OpenSSL
- * already supports it (>= 0.9.4).
- *
- * === Parameters
- * ==== Password
- * Typically an arbitrary String that represents the password to be used
- * for deriving a key.
- * ==== Salt
- * Prevents attacks based on dictionaries of common passwords. It is a
- * public value that can be safely stored along with the password (e.g.
- * if PBKDF2 is used for password storage). For maximum security, a fresh,
- * random salt should be generated for each stored password. According
- * to PKCS#5, a salt should be at least 8 bytes long.
- * ==== Iteration Count
- * Allows to tweak the length that the actual computation will take. The
- * larger the iteration count, the longer it will take.
- * ==== Key Length
- * Specifies the length in bytes of the output that will be generated.
- * Typically, the key length should be larger than or equal to the output
- * length of the underlying digest function, otherwise an attacker could
- * simply try to brute-force the key. According to PKCS#5, security is
- * limited by the output length of the underlying digest function, i.e.
- * security is not improved if a key length strictly larger than the
- * digest output length is chosen. Therefore, when using PKCS5 for
- * password storage, it suffices to store values equal to the digest
- * output length, nothing is gained by storing larger values.
- *
- * == Examples
- * === Generating a 128 bit key for a Cipher (e.g. AES)
- * pass = "secret"
- * salt = OpenSSL::Random.random_bytes(16)
- * iter = 20000
- * key_len = 16
- * key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, key_len)
- *
- * === Storing Passwords
- * pass = "secret"
- * salt = OpenSSL::Random.random_bytes(16) #store this with the generated value
- * iter = 20000
- * digest = OpenSSL::Digest::SHA256.new
- * len = digest.digest_length
- * #the final value to be stored
- * value = OpenSSL::PKCS5.pbkdf2_hmac(pass, salt, iter, len, digest)
- *
- * === Important Note on Checking Passwords
- * When comparing passwords provided by the user with previously stored
- * values, a common mistake made is comparing the two values using "==".
- * Typically, "==" short-circuits on evaluation, and is therefore
- * vulnerable to timing attacks. The proper way is to use a method that
- * always takes the same amount of time when comparing two values, thus
- * not leaking any information to potential attackers. To compare two
- * values, the following could be used:
- * def eql_time_cmp(a, b)
- * unless a.length == b.length
- * return false
- * end
- * cmp = b.bytes.to_a
- * result = 0
- * a.bytes.each_with_index {|c,i|
- * result |= c ^ cmp[i]
- * }
- * result == 0
- * end
- * Please note that the premature return in case of differing lengths
- * typically does not leak valuable information - when using PKCS#5, the
- * length of the values to be compared is of fixed size.
- */
-
mPKCS5 = rb_define_module_under(mOSSL, "PKCS5");
- /* Document-class: OpenSSL::PKCS5::PKCS5Error
- *
- * Generic Exception class that is raised if an error occurs during a
- * computation.
- */
ePKCS5 = rb_define_class_under(mPKCS5, "PKCS5Error", eOSSLError);
rb_define_module_function(mPKCS5, "pbkdf2_hmac", ossl_pkcs5_pbkdf2_hmac, 5);
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index b710280c9c..68494c2e0b 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -11,57 +11,57 @@
#include "ossl.h"
#define WrapPKCS7(klass, obj, pkcs7) do { \
- if (!(pkcs7)) { \
+ if (!pkcs7) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, PKCS7_free, (pkcs7)); \
+ obj = Data_Wrap_Struct(klass, 0, PKCS7_free, pkcs7); \
} while (0)
#define GetPKCS7(obj, pkcs7) do { \
- Data_Get_Struct((obj), PKCS7, (pkcs7)); \
- if (!(pkcs7)) { \
+ Data_Get_Struct(obj, PKCS7, pkcs7); \
+ if (!pkcs7) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \
} while (0)
#define SafeGetPKCS7(obj, pkcs7) do { \
- OSSL_Check_Kind((obj), cPKCS7); \
- GetPKCS7((obj), (pkcs7)); \
+ OSSL_Check_Kind(obj, cPKCS7); \
+ GetPKCS7(obj, pkcs7); \
} while (0)
#define WrapPKCS7si(klass, obj, p7si) do { \
- if (!(p7si)) { \
+ if (!p7si) { \
ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, PKCS7_SIGNER_INFO_free, (p7si)); \
+ obj = Data_Wrap_Struct(klass, 0, PKCS7_SIGNER_INFO_free, p7si); \
} while (0)
#define GetPKCS7si(obj, p7si) do { \
- Data_Get_Struct((obj), PKCS7_SIGNER_INFO, (p7si)); \
- if (!(p7si)) { \
+ Data_Get_Struct(obj, PKCS7_SIGNER_INFO, p7si); \
+ if (!p7si) { \
ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
} \
} while (0)
#define SafeGetPKCS7si(obj, p7si) do { \
- OSSL_Check_Kind((obj), cPKCS7Signer); \
- GetPKCS7si((obj), (p7si)); \
+ OSSL_Check_Kind(obj, cPKCS7Signer); \
+ GetPKCS7si(obj, p7si); \
} while (0)
#define WrapPKCS7ri(klass, obj, p7ri) do { \
- if (!(p7ri)) { \
+ if (!p7ri) { \
ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, PKCS7_RECIP_INFO_free, (p7ri)); \
+ obj = Data_Wrap_Struct(klass, 0, PKCS7_RECIP_INFO_free, p7ri); \
} while (0)
#define GetPKCS7ri(obj, p7ri) do { \
- Data_Get_Struct((obj), PKCS7_RECIP_INFO, (p7ri)); \
- if (!(p7ri)) { \
+ Data_Get_Struct(obj, PKCS7_RECIP_INFO, p7ri); \
+ if (!p7ri) { \
ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
} \
} while (0)
#define SafeGetPKCS7ri(obj, p7ri) do { \
- OSSL_Check_Kind((obj), cPKCS7Recipient); \
- GetPKCS7ri((obj), (p7ri)); \
+ OSSL_Check_Kind(obj, cPKCS7Recipient); \
+ GetPKCS7ri(obj, p7ri); \
} while (0)
-#define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
+#define numberof(ary) (sizeof(ary)/sizeof(ary[0]))
#define ossl_pkcs7_set_data(o,v) rb_iv_set((o), "@data", (v))
#define ossl_pkcs7_get_data(o) rb_iv_get((o), "@data")
@@ -318,17 +318,12 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE 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;
if (!p7) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
p7 = d2i_PKCS7_bio(in, &pkcs);
- if (!p7) {
- BIO_free(in);
- PKCS7_free(pkcs);
- DATA_PTR(self) = NULL;
- ossl_raise(rb_eArgError, "Could not parse the PKCS7");
- }
+ DATA_PTR(self) = pkcs;
}
- DATA_PTR(self) = pkcs;
BIO_free(in);
ossl_pkcs7_set_data(self, Qnil);
ossl_pkcs7_set_err_string(self, Qnil);
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 878b221270..16ceff4997 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -33,42 +33,6 @@ ossl_generate_cb(int p, int n, void *arg)
rb_yield(ary);
}
-#if HAVE_BN_GENCB
-/* OpenSSL 2nd version of GN generation callback */
-int
-ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
-{
- VALUE ary;
- struct ossl_generate_cb_arg *arg;
- int state;
-
- arg = (struct ossl_generate_cb_arg *)cb->arg;
- if (arg->yield) {
- ary = rb_ary_new2(2);
- rb_ary_store(ary, 0, INT2NUM(p));
- rb_ary_store(ary, 1, INT2NUM(n));
-
- /*
- * can be break by raising exception or 'break'
- */
- rb_protect(rb_yield, ary, &state);
- if (state) {
- arg->stop = 1;
- arg->state = state;
- }
- }
- if (arg->stop) return 0;
- return 1;
-}
-
-void
-ossl_generate_cb_stop(void *ptr)
-{
- struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
- arg->stop = 1;
-}
-#endif
-
/*
* Public
*/
@@ -98,8 +62,7 @@ ossl_pkey_new(EVP_PKEY *pkey)
default:
ossl_raise(ePKeyError, "unsupported key type");
}
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
VALUE
@@ -112,7 +75,6 @@ ossl_pkey_new_from_file(VALUE filename)
if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
ossl_raise(ePKeyError, "%s", strerror(errno));
}
- rb_fd_fix_cloexec(fileno(fp));
pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
fclose(fp);
@@ -123,53 +85,6 @@ ossl_pkey_new_from_file(VALUE filename)
return ossl_pkey_new(pkey);
}
-/*
- * call-seq:
- * OpenSSL::PKey.read(string [, pwd ] ) -> PKey
- * OpenSSL::PKey.read(file [, pwd ]) -> PKey
- *
- * === Parameters
- * * +string+ is a DER- or PEM-encoded string containing an arbitrary private
- * or public key.
- * * +file+ is an instance of +File+ containing a DER- or PEM-encoded
- * arbitrary private or public key.
- * * +pwd+ is an optional password in case +string+ or +file+ is an encrypted
- * PEM resource.
- */
-static VALUE
-ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
-{
- EVP_PKEY *pkey;
- BIO *bio;
- VALUE data, pass;
- char *passwd = NULL;
-
- rb_scan_args(argc, argv, "11", &data, &pass);
-
- bio = ossl_obj2bio(data);
- if (!(pkey = d2i_PrivateKey_bio(bio, NULL))) {
- OSSL_BIO_reset(bio);
- if (!NIL_P(pass)) {
- passwd = StringValuePtr(pass);
- }
- if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, passwd))) {
- OSSL_BIO_reset(bio);
- if (!(pkey = d2i_PUBKEY_bio(bio, NULL))) {
- OSSL_BIO_reset(bio);
- if (!NIL_P(pass)) {
- passwd = StringValuePtr(pass);
- }
- pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, passwd);
- }
- }
- }
-
- BIO_free(bio);
- if (!pkey)
- ossl_raise(rb_eArgError, "Could not parse PKey");
- return ossl_pkey_new(pkey);
-}
-
EVP_PKEY *
GetPKeyPtr(VALUE obj)
{
@@ -235,13 +150,6 @@ ossl_pkey_alloc(VALUE klass)
return obj;
}
-/*
- * call-seq:
- * PKeyClass.new -> self
- *
- * Because PKey is an abstract class, actually calling this method explicitly
- * will raise a +NotImplementedError+.
- */
static VALUE
ossl_pkey_initialize(VALUE self)
{
@@ -251,23 +159,6 @@ ossl_pkey_initialize(VALUE self)
return self;
}
-/*
- * call-seq:
- * pkey.sign(digest, data) -> String
- *
- * To sign the +String+ +data+, +digest+, an instance of OpenSSL::Digest, must
- * be provided. The return value is again a +String+ containing the signature.
- * A PKeyError is raised should errors occur.
- * Any previous state of the +Digest+ instance is irrelevant to the signature
- * outcome, the digest instance is reset to its initial state during the
- * operation.
- *
- * == Example
- * data = 'Sign me!'
- * digest = OpenSSL::Digest::SHA256.new
- * pkey = OpenSSL::PKey::RSA.new(2048)
- * signature = pkey.sign(digest, data)
- */
static VALUE
ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
{
@@ -292,42 +183,18 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
return str;
}
-/*
- * call-seq:
- * pkey.verify(digest, signature, data) -> String
- *
- * To verify the +String+ +signature+, +digest+, an instance of
- * OpenSSL::Digest, must be provided to re-compute the message digest of the
- * original +data+, also a +String+. The return value is +true+ if the
- * signature is valid, +false+ otherwise. A PKeyError is raised should errors
- * occur.
- * Any previous state of the +Digest+ instance is irrelevant to the validation
- * outcome, the digest instance is reset to its initial state during the
- * operation.
- *
- * == Example
- * data = 'Sign me!'
- * digest = OpenSSL::Digest::SHA256.new
- * pkey = OpenSSL::PKey::RSA.new(2048)
- * signature = pkey.sign(digest, data)
- * pub_key = pkey.public_key
- * puts pub_key.verify(digest, signature, data) # => true
- */
static VALUE
ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
{
EVP_PKEY *pkey;
EVP_MD_CTX ctx;
- int result;
GetPKey(self, pkey);
+ EVP_VerifyInit(&ctx, GetDigestPtr(digest));
StringValue(sig);
StringValue(data);
- EVP_VerifyInit(&ctx, GetDigestPtr(digest));
EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
- result = EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), pkey);
- EVP_MD_CTX_cleanup(&ctx);
- switch (result) {
+ switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
case 0:
return Qfalse;
case 1:
@@ -344,82 +211,16 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
void
Init_ossl_pkey()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
- /* Document-module: OpenSSL::PKey
- *
- * == Asymmetric Public Key Algorithms
- *
- * Asymmetric public key algorithms solve the problem of establishing and
- * sharing secret keys to en-/decrypt messages. The key in such an
- * algorithm consists of two parts: a public key that may be distributed
- * to others and a private key that needs to remain secret.
- *
- * Messages encrypted with a public key can only be encrypted by
- * recipients that are in possession of the associated private key.
- * Since public key algorithms are considerably slower than symmetric
- * key algorithms (cf. OpenSSL::Cipher) they are often used to establish
- * a symmetric key shared between two parties that are in possession of
- * each other's public key.
- *
- * Asymmetric algorithms offer a lot of nice features that are used in a
- * lot of different areas. A very common application is the creation and
- * validation of digital signatures. To sign a document, the signatory
- * generally uses a message digest algorithm (cf. OpenSSL::Digest) to
- * compute a digest of the document that is then encrypted (i.e. signed)
- * using the private key. Anyone in possession of the public key may then
- * verify the signature by computing the message digest of the original
- * document on their own, decrypting the signature using the signatory's
- * public key and comparing the result to the message digest they
- * previously computed. The signature is valid if and only if the
- * decrypted signature is equal to this message digest.
- *
- * The PKey module offers support for three popular public/private key
- * algorithms:
- * * RSA (OpenSSL::PKey::RSA)
- * * DSA (OpenSSL::PKey::DSA)
- * * Elliptic Curve Cryptography (OpenSSL::PKey::EC)
- * Each of these implementations is in fact a sub-class of the abstract
- * PKey class which offers the interface for supporting digital signatures
- * in the form of PKey#sign and PKey#verify.
- *
- * == Diffie-Hellman Key Exchange
- *
- * Finally PKey also features OpenSSL::PKey::DH, an implementation of
- * the Diffie-Hellman key exchange protocol based on discrete logarithms
- * in finite fields, the same basis that DSA is built on.
- * The Diffie-Hellman protocol can be used to exchange (symmetric) keys
- * over insecure channels without needing any prior joint knowledge
- * between the participating parties. As the security of DH demands
- * relatively long "public keys" (i.e. the part that is overtly
- * transmitted between participants) DH tends to be quite slow. If
- * security or speed is your primary concern, OpenSSL::PKey::EC offers
- * another implementation of the Diffie-Hellman protocol.
- *
- */
mPKey = rb_define_module_under(mOSSL, "PKey");
- /* Document-class: OpenSSL::PKey::PKeyError
- *
- *Raised when errors occur during PKey#sign or PKey#verify.
- */
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
- /* Document-class: OpenSSL::PKey::PKey
- *
- * An abstract class that bundles signature creation (PKey#sign) and
- * validation (PKey#verify) that is common to all implementations except
- * OpenSSL::PKey::DH
- * * OpenSSL::PKey::RSA
- * * OpenSSL::PKey::DSA
- * * OpenSSL::PKey::EC
- */
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
- rb_define_module_function(mPKey, "read", ossl_pkey_new_from_data, -1);
-
rb_define_alloc_func(cPKey, ossl_pkey_alloc);
rb_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index 686e956ee5..67ff1fddd0 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -21,34 +21,24 @@ extern ID id_private_q;
#define OSSL_PKEY_IS_PRIVATE(obj) (rb_iv_get((obj), "private") == Qtrue)
#define WrapPKey(klass, obj, pkey) do { \
- if (!(pkey)) { \
+ if (!pkey) { \
rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, EVP_PKEY_free, (pkey)); \
+ obj = Data_Wrap_Struct(klass, 0, EVP_PKEY_free, pkey); \
OSSL_PKEY_SET_PUBLIC(obj); \
} while (0)
#define GetPKey(obj, pkey) do {\
- Data_Get_Struct((obj), EVP_PKEY, (pkey));\
- if (!(pkey)) { \
+ Data_Get_Struct(obj, EVP_PKEY, pkey);\
+ if (!pkey) { \
rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
} \
} while (0)
#define SafeGetPKey(obj, pkey) do { \
- OSSL_Check_Kind((obj), cPKey); \
- GetPKey((obj), (pkey)); \
+ OSSL_Check_Kind(obj, cPKey); \
+ GetPKey(obj, pkey); \
} while (0)
void ossl_generate_cb(int, int, void *);
-#define HAVE_BN_GENCB defined(HAVE_RSA_GENERATE_KEY_EX) || defined(HAVE_DH_GENERATE_PARAMETERS_EX) || defined(HAVE_DSA_GENERATE_PARAMETERS_EX)
-#if HAVE_BN_GENCB
-struct ossl_generate_cb_arg {
- int yield;
- int stop;
- int state;
-};
-int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);
-void ossl_generate_cb_stop(void *ptr);
-#endif
VALUE ossl_pkey_new(EVP_PKEY *);
VALUE ossl_pkey_new_from_file(VALUE);
@@ -144,8 +134,8 @@ static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum) \
#define DEF_OSSL_PKEY_BN(class, keytype, name) \
do { \
- rb_define_method((class), #name, ossl_##keytype##_get_##name, 0); \
- rb_define_method((class), #name "=", ossl_##keytype##_set_##name, 1);\
+ rb_define_method(class, #name, ossl_##keytype##_get_##name, 0); \
+ rb_define_method(class, #name "=", ossl_##keytype##_set_##name, 1);\
} while (0)
#endif /* _OSSL_PKEY_H_ */
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index e0852c560d..756ce6620c 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -13,8 +13,8 @@
#include "ossl.h"
#define GetPKeyDH(obj, pkey) do { \
- GetPKey((obj), (pkey)); \
- if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_DH) { /* PARANOIA? */ \
+ GetPKey(obj, pkey); \
+ if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) { /* PARANOIA? */ \
ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \
} \
} while (0)
@@ -81,66 +81,19 @@ ossl_dh_new(EVP_PKEY *pkey)
/*
* Private
*/
-#if defined(HAVE_DH_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
-struct dh_blocking_gen_arg {
- DH *dh;
- int size;
- int gen;
- BN_GENCB *cb;
- int result;
-};
-
-static void *
-dh_blocking_gen(void *arg)
-{
- struct dh_blocking_gen_arg *gen = (struct dh_blocking_gen_arg *)arg;
- gen->result = DH_generate_parameters_ex(gen->dh, gen->size, gen->gen, gen->cb);
- return 0;
-}
-#endif
-
static DH *
dh_generate(int size, int gen)
{
-#if defined(HAVE_DH_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
- BN_GENCB cb;
- struct ossl_generate_cb_arg cb_arg;
- struct dh_blocking_gen_arg gen_arg;
- DH *dh = DH_new();
-
- if (!dh) return 0;
-
- memset(&cb_arg, 0, sizeof(struct ossl_generate_cb_arg));
- if (rb_block_given_p())
- cb_arg.yield = 1;
- BN_GENCB_set(&cb, ossl_generate_cb_2, &cb_arg);
- gen_arg.dh = dh;
- gen_arg.size = size;
- gen_arg.gen = gen;
- gen_arg.cb = &cb;
- if (cb_arg.yield == 1) {
- /* we cannot release GVL when callback proc is supplied */
- dh_blocking_gen(&gen_arg);
- } else {
- /* there's a chance to unblock */
- rb_thread_call_without_gvl(dh_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
- }
-
- if (!gen_arg.result) {
- DH_free(dh);
- if (cb_arg.state) rb_jump_tag(cb_arg.state);
- return 0;
- }
-#else
DH *dh;
- dh = DH_generate_parameters(size, gen, rb_block_given_p() ? ossl_generate_cb : NULL, NULL);
+ dh = DH_generate_parameters(size, gen,
+ rb_block_given_p() ? ossl_generate_cb : NULL,
+ NULL);
if (!dh) return 0;
-#endif
if (!DH_generate_key(dh)) {
- DH_free(dh);
- return 0;
+ DH_free(dh);
+ return 0;
}
return dh;
@@ -150,12 +103,9 @@ dh_generate(int size, int gen)
* call-seq:
* DH.generate(size [, generator]) -> dh
*
- * Creates a new DH instance from scratch by generating the private and public
- * components alike.
- *
- * === Parameters
- * * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
- * * +generator+ is a small number > 1, typically 2 or 5.
+ * === Parameters
+ * * +size+ is an integer representing the desired key size. Keys smaller than 1024 should be considered insecure.
+ * * +generator+ is a small number > 1, typically 2 or 5.
*
*/
static VALUE
@@ -182,24 +132,16 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
* call-seq:
* DH.new([size [, generator] | string]) -> dh
*
- * Either generates a DH instance from scratch or by reading already existing
- * DH parameters from +string+. Note that when reading a DH instance from
- * data that was encoded from a DH instance by using DH#to_pem or DH#to_der
- * the result will *not* contain a public/private key pair yet. This needs to
- * be generated using DH#generate_key! first.
- *
- * === Parameters
- * * +size+ is an integer representing the desired key size. Keys smaller than 1024 bits should be considered insecure.
- * * +generator+ is a small number > 1, typically 2 or 5.
- * * +string+ contains the DER or PEM encoded key.
+ * === Parameters
+ * * +size+ is an integer representing the desired key size. Keys smaller than 1024 should be considered insecure.
+ * * +generator+ is a small number > 1, typically 2 or 5.
+ * * +string+ contains the DER or PEM encoded key.
*
- * === Examples
- * DH.new # -> dh
- * DH.new(1024) # -> dh
- * DH.new(1024, 5) # -> dh
- * #Reading DH parameters
- * dh = DH.new(File.read('parameters.pem')) # -> dh, but no public/private key yet
- * dh.generate_key! # -> dh with public and private key
+ * === Examples
+ * * DH.new -> dh
+ * * DH.new(1024) -> dh
+ * * DH.new(1024, 5) -> dh
+ * * DH.new(File.read('key.pem')) -> dh
*/
static VALUE
ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
@@ -227,11 +169,13 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
in = ossl_obj2bio(arg);
dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
if (!dh){
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
dh = d2i_DHparams_bio(in, NULL);
}
BIO_free(in);
if (!dh) {
+ (void)ERR_get_error();
ossl_raise(eDHError, NULL);
}
}
@@ -246,8 +190,6 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
* call-seq:
* dh.public? -> true | false
*
- * Indicates whether this DH instance has a public key associated with it or
- * not. The public key may be retrieved with DH#pub_key.
*/
static VALUE
ossl_dh_is_public(VALUE self)
@@ -263,8 +205,6 @@ ossl_dh_is_public(VALUE self)
* call-seq:
* dh.private? -> true | false
*
- * Indicates whether this DH instance has a private key associated with it or
- * not. The private key may be retrieved with DH#priv_key.
*/
static VALUE
ossl_dh_is_private(VALUE self)
@@ -280,9 +220,6 @@ ossl_dh_is_private(VALUE self)
* call-seq:
* dh.to_pem -> aString
*
- * Encodes this DH to its PEM encoding. Note that any existing per-session
- * public/private keys will *not* get encoded, just the Diffie-Hellman
- * parameters will be encoded.
*/
static VALUE
ossl_dh_export(VALUE self)
@@ -308,10 +245,6 @@ ossl_dh_export(VALUE self)
* call-seq:
* dh.to_der -> aString
*
- * Encodes this DH to its DER encoding. Note that any existing per-session
- * public/private keys will *not* get encoded, just the Diffie-Hellman
- * parameters will be encoded.
-
*/
static VALUE
ossl_dh_to_der(VALUE self)
@@ -391,22 +324,7 @@ ossl_dh_to_text(VALUE self)
* call-seq:
* dh.public_key -> aDH
*
- * Returns a new DH instance that carries just the public information, i.e.
- * the prime +p+ and the generator +g+, but no public/private key yet. Such
- * a pair may be generated using DH#generate_key!. The "public key" needed
- * for a key exchange with DH#compute_key is considered as per-session
- * information and may be retrieved with DH#pub_key once a key pair has
- * been generated.
- * If the current instance already contains private information (and thus a
- * valid public/private key pair), this information will no longer be present
- * in the new instance generated by DH#public_key. This feature is helpful for
- * publishing the Diffie-Hellman parameters without leaking any of the private
- * per-session information.
- *
- * === Example
- * dh = OpenSSL::PKey::DH.new(2048) # has public and private key set
- * public_key = dh.public_key # contains only prime and generator
- * parameters = public_key.to_der # it's safe to publish this
+ * Makes new instance DH PUBLIC_KEY from PRIVATE_KEY
*/
static VALUE
ossl_dh_to_public_key(VALUE self)
@@ -430,9 +348,6 @@ ossl_dh_to_public_key(VALUE self)
* call-seq:
* dh.check_params -> true | false
*
- * Validates the Diffie-Hellman parameters associated with this instance.
- * It checks whether a safe prime and a suitable generator are used. If this
- * is not the case, +false+ is returned.
*/
static VALUE
ossl_dh_check_params(VALUE self)
@@ -453,19 +368,8 @@ ossl_dh_check_params(VALUE self)
/*
* call-seq:
- * dh.generate_key! -> self
+ * dh.generate_key -> self
*
- * Generates a private and public key unless a private key already exists.
- * If this DH instance was generated from public DH parameters (e.g. by
- * encoding the result of DH#public_key), then this method needs to be
- * called first in order to generate the per-session keys before performing
- * the actual key exchange.
- *
- * === Example
- * dh = OpenSSL::PKey::DH.new(2048)
- * public_key = dh.public_key #contains no private/public key yet
- * public_key.generate_key!
- * puts public_key.private? # => true
*/
static VALUE
ossl_dh_generate_key(VALUE self)
@@ -485,12 +389,13 @@ ossl_dh_generate_key(VALUE self)
* call-seq:
* dh.compute_key(pub_bn) -> aString
*
- * Returns a String containing a shared secret computed from the other party's public value.
- * See DH_compute_key() for further information.
+ * === Parameters
+ * * +pub_bn+ is a OpenSSL::BN.
+ *
+ * Returns aString containing a shared secret computed from the other parties public value.
+ *
+ * See DH_compute_key() for further information.
*
- * === Parameters
- * * +pub_bn+ is a OpenSSL::BN, *not* the DH instance returned by
- * DH#public_key as that contains the DH parameters only.
*/
static VALUE
ossl_dh_compute_key(VALUE self, VALUE pub)
@@ -572,8 +477,8 @@ ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
DH *dh;
if ((dh = DH_new()) == NULL) ossl_raise(eDHError, NULL);
- dh->p = BN_bin2bn(p, rb_long2int(plen), NULL);
- dh->g = BN_bin2bn(g, rb_long2int(glen), NULL);
+ dh->p = BN_bin2bn(p, plen, NULL);
+ dh->g = BN_bin2bn(g, glen, NULL);
if (dh->p == NULL || dh->g == NULL){
DH_free(dh);
ossl_raise(eDHError, NULL);
@@ -588,45 +493,12 @@ ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
void
Init_ossl_dh()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
+#if 0 /* let rdoc know about mOSSL and mPKey */
+ mOSSL = rb_define_module("OpenSSL");
mPKey = rb_define_module_under(mOSSL, "PKey");
#endif
- /* Document-class: OpenSSL::PKey::DHError
- *
- * Generic exception that is raised if an operation on a DH PKey
- * fails unexpectedly or in case an instantiation of an instance of DH
- * fails due to non-conformant input data.
- */
eDHError = rb_define_class_under(mPKey, "DHError", ePKeyError);
- /* Document-class: OpenSSL::PKey::DH
- *
- * An implementation of the Diffie-Hellman key exchange protocol based on
- * discrete logarithms in finite fields, the same basis that DSA is built
- * on.
- *
- * === Accessor methods for the Diffie-Hellman parameters
- * * DH#p
- * The prime (an OpenSSL::BN) of the Diffie-Hellman parameters.
- * * DH#g
- * The generator (an OpenSSL::BN) g of the Diffie-Hellman parameters.
- * * DH#pub_key
- * The per-session public key (an OpenSSL::BN) matching the private key.
- * This needs to be passed to DH#compute_key.
- * * DH#priv_key
- * The per-session private key, an OpenSSL::BN.
- *
- * === Example of a key exchange
- * dh1 = OpenSSL::PKey::DH.new(2048)
- * der = dh1.public_key.to_der #you may send this publicly to the participating party
- * dh2 = OpenSSL::PKey::DH.new(der)
- * dh2.generate_key! #generate the per-session key pair
- * symm_key1 = dh1.compute_key(dh2.pub_key)
- * symm_key2 = dh2.compute_key(dh1.pub_key)
- *
- * puts symm_key1 == symm_key2 # => true
- */
cDH = rb_define_class_under(mPKey, "DH", cPKey);
rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1);
rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
@@ -641,7 +513,6 @@ Init_ossl_dh()
rb_define_method(cDH, "params_ok?", ossl_dh_check_params, 0);
rb_define_method(cDH, "generate_key!", ossl_dh_generate_key, 0);
rb_define_method(cDH, "compute_key", ossl_dh_compute_key, 1);
-
DEF_OSSL_PKEY_BN(cDH, dh, p);
DEF_OSSL_PKEY_BN(cDH, dh, g);
DEF_OSSL_PKEY_BN(cDH, dh, pub_key);
@@ -662,3 +533,4 @@ Init_ossl_dh()
{
}
#endif /* NO_DH */
+
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index ba28ba028d..f87238a13c 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -13,8 +13,8 @@
#include "ossl.h"
#define GetPKeyDSA(obj, pkey) do { \
- GetPKey((obj), (pkey)); \
- if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_DSA) { /* PARANOIA? */ \
+ GetPKey(obj, pkey); \
+ if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) { /* PARANOIA? */ \
ossl_raise(rb_eRuntimeError, "THIS IS NOT A DSA!"); \
} \
} while (0)
@@ -75,69 +75,9 @@ ossl_dsa_new(EVP_PKEY *pkey)
/*
* Private
*/
-#if defined(HAVE_DSA_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
-struct dsa_blocking_gen_arg {
- DSA *dsa;
- int size;
- unsigned char* seed;
- int seed_len;
- int *counter;
- unsigned long *h;
- BN_GENCB *cb;
- int result;
-};
-
-static void *
-dsa_blocking_gen(void *arg)
-{
- struct dsa_blocking_gen_arg *gen = (struct dsa_blocking_gen_arg *)arg;
- gen->result = DSA_generate_parameters_ex(gen->dsa, gen->size, gen->seed, gen->seed_len, gen->counter, gen->h, gen->cb);
- return 0;
-}
-#endif
-
static DSA *
dsa_generate(int size)
{
-#if defined(HAVE_DSA_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
- BN_GENCB cb;
- struct ossl_generate_cb_arg cb_arg;
- struct dsa_blocking_gen_arg gen_arg;
- DSA *dsa = DSA_new();
- unsigned char seed[20];
- int seed_len = 20, counter;
- unsigned long h;
-
- if (!dsa) return 0;
- if (!RAND_bytes(seed, seed_len)) {
- DSA_free(dsa);
- return 0;
- }
-
- memset(&cb_arg, 0, sizeof(struct ossl_generate_cb_arg));
- if (rb_block_given_p())
- cb_arg.yield = 1;
- BN_GENCB_set(&cb, ossl_generate_cb_2, &cb_arg);
- gen_arg.dsa = dsa;
- gen_arg.size = size;
- gen_arg.seed = seed;
- gen_arg.seed_len = seed_len;
- gen_arg.counter = &counter;
- gen_arg.h = &h;
- gen_arg.cb = &cb;
- if (cb_arg.yield == 1) {
- /* we cannot release GVL when callback proc is supplied */
- dsa_blocking_gen(&gen_arg);
- } else {
- /* there's a chance to unblock */
- rb_thread_call_without_gvl(dsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
- }
- if (!gen_arg.result) {
- DSA_free(dsa);
- if (cb_arg.state) rb_jump_tag(cb_arg.state);
- return 0;
- }
-#else
DSA *dsa;
unsigned char seed[20];
int seed_len = 20, counter;
@@ -147,9 +87,9 @@ dsa_generate(int size)
return 0;
}
dsa = DSA_generate_parameters(size, seed, seed_len, &counter, &h,
- rb_block_given_p() ? ossl_generate_cb : NULL, NULL);
+ rb_block_given_p() ? ossl_generate_cb : NULL,
+ NULL);
if(!dsa) return 0;
-#endif
if (!DSA_generate_key(dsa)) {
DSA_free(dsa);
@@ -163,11 +103,8 @@ dsa_generate(int size)
* call-seq:
* DSA.generate(size) -> dsa
*
- * Creates a new DSA instance by generating a private/public key pair
- * from scratch.
- *
- * === Parameters
- * * +size+ is an integer representing the desired key size.
+ * === Parameters
+ * * +size+ is an integer representing the desired key size.
*
*/
static VALUE
@@ -188,18 +125,16 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
* call-seq:
* DSA.new([size | string [, pass]) -> dsa
*
- * Creates a new DSA instance by reading an existing key from +string+.
- *
- * === Parameters
- * * +size+ is an integer representing the desired key size.
- * * +string+ contains a DER or PEM encoded key.
- * * +pass+ is a string that contains an optional password.
+ * === Parameters
+ * * +size+ is an integer representing the desired key size.
+ * * +string+ contains a DER or PEM encoded key.
+ * * +pass+ is a string that contains a optional password.
*
- * === Examples
- * DSA.new -> dsa
- * DSA.new(1024) -> dsa
- * DSA.new(File.read('dsa.pem')) -> dsa
- * DSA.new(File.read('dsa.pem'), 'mypassword') -> dsa
+ * === Examples
+ * * DSA.new -> dsa
+ * * DSA.new(1024) -> dsa
+ * * DSA.new(File.read('dsa.pem')) -> dsa
+ * * DSA.new(File.read('dsa.pem'), 'mypassword') -> dsa
*
*/
static VALUE
@@ -226,25 +161,29 @@ 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) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
+ }
+ if (!dsa) {
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
}
if (!dsa) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
dsa = d2i_DSAPrivateKey_bio(in, NULL);
}
if (!dsa) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
dsa = d2i_DSA_PUBKEY_bio(in, NULL);
}
- if (!dsa) {
- OSSL_BIO_reset(in);
- dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
- }
BIO_free(in);
if (!dsa) {
- ERR_clear_error();
- ossl_raise(eDSAError, "Neither PUB key nor PRIV key");
+ (void)ERR_get_error();
+ ossl_raise(eDSAError, "Neither PUB key nor PRIV key:");
}
}
if (!EVP_PKEY_assign_DSA(pkey, dsa)) {
@@ -259,8 +198,6 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
* call-seq:
* dsa.public? -> true | false
*
- * Indicates whether this DSA instance has a public key associated with it or
- * not. The public key may be retrieved with DSA#public_key.
*/
static VALUE
ossl_dsa_is_public(VALUE self)
@@ -276,8 +213,6 @@ ossl_dsa_is_public(VALUE self)
* call-seq:
* dsa.private? -> true | false
*
- * Indicates whether this DSA instance has a private key associated with it or
- * not. The private key may be retrieved with DSA#private_key.
*/
static VALUE
ossl_dsa_is_private(VALUE self)
@@ -293,15 +228,13 @@ ossl_dsa_is_private(VALUE self)
* call-seq:
* dsa.to_pem([cipher, password]) -> aString
*
- * Encodes this DSA to its PEM encoding.
+ * === Parameters
+ * +cipher+ is an OpenSSL::Cipher.
+ * +password+ is a string containing your password.
*
- * === Parameters
- * * +cipher+ is an OpenSSL::Cipher.
- * * +password+ is a string containing your password.
- *
- * === Examples
- * DSA.to_pem -> aString
- * DSA.to_pem(cipher, 'mypassword') -> aString
+ * === Examples
+ * * DSA.to_pem -> aString
+ * * DSA.to_pem(cipher, 'mypassword') -> aString
*
*/
static VALUE
@@ -318,10 +251,7 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
if (!NIL_P(cipher)) {
ciph = GetCipherPtr(cipher);
if (!NIL_P(pass)) {
- StringValue(pass);
- if (RSTRING_LENINT(pass) < OSSL_MIN_PWD_LEN)
- ossl_raise(eOSSLError, "OpenSSL requires passwords to be at least four characters long");
- passwd = RSTRING_PTR(pass);
+ passwd = StringValuePtr(pass);
}
}
if (!(out = BIO_new(BIO_s_mem()))) {
@@ -334,7 +264,7 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
ossl_raise(eDSAError, NULL);
}
} else {
- if (!PEM_write_bio_DSA_PUBKEY(out, pkey->pkey.dsa)) {
+ if (!PEM_write_bio_DSAPublicKey(out, pkey->pkey.dsa)) {
BIO_free(out);
ossl_raise(eDSAError, NULL);
}
@@ -348,8 +278,6 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
* call-seq:
* dsa.to_der -> aString
*
- * Encodes this DSA to its DER encoding.
- *
*/
static VALUE
ossl_dsa_to_der(VALUE self)
@@ -435,18 +363,7 @@ ossl_dsa_to_text(VALUE self)
* call-seq:
* dsa.public_key -> aDSA
*
- * Returns a new DSA instance that carries just the public key information.
- * If the current instance has also private key information, this will no
- * longer be present in the new instance. This feature is helpful for
- * publishing the public key information without leaking any of the private
- * information.
- *
- * === Example
- * dsa = OpenSSL::PKey::DSA.new(2048) # has public and private information
- * pub_key = dsa.public_key # has only the public part available
- * pub_key_der = pub_key.to_der # it's safe to publish this
- *
- *
+ * Makes new instance DSA PUBLIC_KEY from PRIVATE_KEY
*/
static VALUE
ossl_dsa_to_public_key(VALUE self)
@@ -472,20 +389,6 @@ ossl_dsa_to_public_key(VALUE self)
* call-seq:
* dsa.syssign(string) -> aString
*
- * Computes and returns the DSA signature of +string+, where +string+ is
- * expected to be an already-computed message digest of the original input
- * data. The signature is issued using the private key of this DSA instance.
- *
- * === Parameters
- * * +string+ is a message digest of the original input data to be signed
- *
- * === Example
- * dsa = OpenSSL::PKey::DSA.new(2048)
- * doc = "Sign me"
- * digest = OpenSSL::Digest::SHA1.digest(doc)
- * sig = dsa.syssign(digest)
- *
- *
*/
static VALUE
ossl_dsa_sign(VALUE self, VALUE data)
@@ -500,7 +403,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_LENINT(data),
+ if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
(unsigned char *)RSTRING_PTR(str),
&buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
ossl_raise(eDSAError, NULL);
@@ -514,20 +417,6 @@ ossl_dsa_sign(VALUE self, VALUE data)
* call-seq:
* dsa.sysverify(digest, sig) -> true | false
*
- * Verifies whether the signature is valid given the message digest input. It
- * does so by validating +sig+ using the public key of this DSA instance.
- *
- * === Parameters
- * * +digest+ is a message digest of the original input data to be signed
- * * +sig+ is a DSA signature value
- *
- * === Example
- * dsa = OpenSSL::PKey::DSA.new(2048)
- * doc = "Sign me"
- * digest = OpenSSL::Digest::SHA1.digest(doc)
- * sig = dsa.syssign(digest)
- * puts dsa.sysverify(digest, sig) # => true
- *
*/
static VALUE
ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
@@ -539,8 +428,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_LENINT(digest),
- (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), pkey->pkey.dsa);
+ ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LEN(digest),
+ (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
if (ret < 0) {
ossl_raise(eDSAError, NULL);
}
@@ -563,31 +452,13 @@ OSSL_PKEY_BN(dsa, priv_key)
void
Init_ossl_dsa()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
+#if 0 /* let rdoc know about mOSSL and mPKey */
+ mOSSL = rb_define_module("OpenSSL");
mPKey = rb_define_module_under(mOSSL, "PKey");
#endif
- /* Document-class: OpenSSL::PKey::DSAError
- *
- * Generic exception that is raised if an operation on a DSA PKey
- * fails unexpectedly or in case an instantiation of an instance of DSA
- * fails due to non-conformant input data.
- */
eDSAError = rb_define_class_under(mPKey, "DSAError", ePKeyError);
- /* Document-class: OpenSSL::PKey::DSA
- *
- * DSA, the Digital Signature Algorithm, is specified in NIST's
- * FIPS 186-3. It is an asymmetric public key algorithm that may be used
- * similar to e.g. RSA.
- * Please note that for OpenSSL versions prior to 1.0.0 the digest
- * algorithms OpenSSL::Digest::DSS (equivalent to SHA) or
- * OpenSSL::Digest::DSS1 (equivalent to SHA-1) must be used for issuing
- * signatures with a DSA key using OpenSSL::PKey#sign.
- * Starting with OpenSSL 1.0.0, digest algorithms are no longer restricted,
- * any Digest may be used for signing.
- */
cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index 29e28ca2f4..18bcaa873c 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -22,70 +22,70 @@ typedef struct {
#define GetPKeyEC(obj, pkey) do { \
- GetPKey((obj), (pkey)); \
- if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_EC) { \
+ GetPKey(obj, pkey); \
+ if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) { \
ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \
} \
} while (0)
#define SafeGet_ec_group(obj, group) do { \
- OSSL_Check_Kind((obj), cEC_GROUP); \
- Data_Get_Struct((obj), ossl_ec_group, (group)); \
+ OSSL_Check_Kind(obj, cEC_GROUP); \
+ Data_Get_Struct(obj, ossl_ec_group, group); \
} while(0)
#define Get_EC_KEY(obj, key) do { \
EVP_PKEY *pkey; \
- GetPKeyEC((obj), pkey); \
- (key) = pkey->pkey.ec; \
+ GetPKeyEC(obj, pkey); \
+ key = pkey->pkey.ec; \
} while(0)
#define Require_EC_KEY(obj, key) do { \
- Get_EC_KEY((obj), (key)); \
- if ((key) == NULL) \
- ossl_raise(eECError, "EC_KEY is not initialized"); \
+ Get_EC_KEY(obj, key); \
+ if (key == NULL) \
+ rb_raise(eECError, "EC_KEY is not initialized"); \
} while(0)
#define SafeRequire_EC_KEY(obj, key) do { \
- OSSL_Check_Kind((obj), cEC); \
- Require_EC_KEY((obj), (key)); \
+ OSSL_Check_Kind(obj, cEC); \
+ Require_EC_KEY(obj, key); \
} while (0)
#define Get_EC_GROUP(obj, g) do { \
ossl_ec_group *ec_group; \
- Data_Get_Struct((obj), ossl_ec_group, ec_group); \
+ Data_Get_Struct(obj, ossl_ec_group, ec_group); \
if (ec_group == NULL) \
- ossl_raise(eEC_GROUP, "missing ossl_ec_group structure"); \
- (g) = ec_group->group; \
+ rb_raise(eEC_GROUP, "missing ossl_ec_group structure"); \
+ g = ec_group->group; \
} while(0)
#define Require_EC_GROUP(obj, group) do { \
- Get_EC_GROUP((obj), (group)); \
- if ((group) == NULL) \
- ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
+ Get_EC_GROUP(obj, group); \
+ if (group == NULL) \
+ rb_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
} while(0)
#define SafeRequire_EC_GROUP(obj, group) do { \
- OSSL_Check_Kind((obj), cEC_GROUP); \
- Require_EC_GROUP((obj), (group)); \
+ OSSL_Check_Kind(obj, cEC_GROUP); \
+ Require_EC_GROUP(obj, group); \
} while(0)
#define Get_EC_POINT(obj, p) do { \
ossl_ec_point *ec_point; \
- Data_Get_Struct((obj), ossl_ec_point, ec_point); \
+ Data_Get_Struct(obj, ossl_ec_point, ec_point); \
if (ec_point == NULL) \
- ossl_raise(eEC_POINT, "missing ossl_ec_point structure"); \
- (p) = ec_point->point; \
+ rb_raise(eEC_POINT, "missing ossl_ec_point structure"); \
+ p = ec_point->point; \
} while(0)
#define Require_EC_POINT(obj, point) do { \
- Get_EC_POINT((obj), (point)); \
- if ((point) == NULL) \
- ossl_raise(eEC_POINT, "EC_POINT is not initialized"); \
+ Get_EC_POINT(obj, point); \
+ if (point == NULL) \
+ rb_raise(eEC_POINT, "EC_POINT is not initialized"); \
} while(0)
#define SafeRequire_EC_POINT(obj, point) do { \
- OSSL_Check_Kind((obj), cEC_POINT); \
- Require_EC_POINT((obj), (point)); \
+ OSSL_Check_Kind(obj, cEC_POINT); \
+ Require_EC_POINT(obj, point); \
} while(0)
VALUE cEC;
@@ -152,7 +152,6 @@ VALUE ossl_ec_new(EVP_PKEY *pkey)
* OpenSSL::PKey::EC.new(ec_group)
* OpenSSL::PKey::EC.new("secp112r1")
* OpenSSL::PKey::EC.new(pem_string)
- * OpenSSL::PKey::EC.new(pem_string [, pwd])
* OpenSSL::PKey::EC.new(der_string)
*
* See the OpenSSL documentation for:
@@ -164,11 +163,10 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
EC_KEY *ec = NULL;
VALUE arg, pass;
VALUE group = Qnil;
- char *passwd = NULL;
GetPKey(self, pkey);
if (pkey->pkey.ec)
- ossl_raise(eECError, "EC_KEY already initialized");
+ rb_raise(eECError, "EC_KEY already initialized");
rb_scan_args(argc, argv, "02", &arg, &pass);
@@ -186,20 +184,20 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
} else {
BIO *in = ossl_obj2bio(arg);
- if (!NIL_P(pass)) {
- passwd = StringValuePtr(pass);
- }
- ec = PEM_read_bio_ECPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
+ ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
if (!ec) {
- OSSL_BIO_reset(in);
- ec = PEM_read_bio_EC_PUBKEY(in, NULL, ossl_pem_passwd_cb, passwd);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
}
if (!ec) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
ec = d2i_ECPrivateKey_bio(in, NULL);
}
if (!ec) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
ec = d2i_EC_PUBKEY_bio(in, NULL);
}
@@ -463,19 +461,22 @@ static VALUE ossl_ec_key_is_private_key(VALUE self)
return (EC_KEY_get0_private_key(ec) ? Qtrue : Qfalse);
}
-static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int format)
+static VALUE ossl_ec_key_to_string(VALUE self, int format)
{
EC_KEY *ec;
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);
if (EC_KEY_get0_public_key(ec) == NULL)
- ossl_raise(eECError, "can't export - no public key set");
+ rb_raise(eECError, "can't export - no public key set");
if (EC_KEY_check_key(ec) != 1)
ossl_raise(eECError, "can't export - EC_KEY_check_key failed");
@@ -489,36 +490,44 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
switch(format) {
case EXPORT_PEM:
if (private) {
- const EVP_CIPHER *cipher;
- if (!NIL_P(ciph)) {
- cipher = GetCipherPtr(ciph);
- if (!NIL_P(pass)) {
- StringValue(pass);
- if (RSTRING_LENINT(pass) < OSSL_MIN_PWD_LEN)
- ossl_raise(eOSSLError, "OpenSSL requires passwords to be at least four characters long");
- password = RSTRING_PTR(pass);
- }
- }
- else {
- cipher = NULL;
- }
+#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);
}
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);
}
break;
default:
BIO_free(out);
- ossl_raise(rb_eRuntimeError, "unknown format (internal error)");
+ rb_raise(rb_eRuntimeError, "unknown format (internal error)");
}
if (i != 1) {
@@ -533,21 +542,13 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
/*
* call-seq:
- * key.export => String
- * key.export(cipher, pass_phrase) => String
- *
- * Outputs the EC key in PEM encoding. If +cipher+ and +pass_phrase+ are
- * given they will be used to encrypt the key. +cipher+ must be an
- * OpenSSL::Cipher::Cipher instance. Note that encryption will only be
- * effective for a private key, public keys will always be encoded in plain
- * text.
+ * key.to_pem => String
*
+ * See the OpenSSL documentation for PEM_write_bio_ECPrivateKey()
*/
-static VALUE ossl_ec_key_export(int argc, VALUE *argv, VALUE self)
+static VALUE ossl_ec_key_to_pem(VALUE self)
{
- VALUE cipher, passwd;
- rb_scan_args(argc, argv, "02", &cipher, &passwd);
- return ossl_ec_key_to_string(self, cipher, passwd, EXPORT_PEM);
+ return ossl_ec_key_to_string(self, EXPORT_PEM);
}
/*
@@ -558,7 +559,7 @@ static VALUE ossl_ec_key_export(int argc, VALUE *argv, VALUE self)
*/
static VALUE ossl_ec_key_to_der(VALUE self)
{
- return ossl_ec_key_to_string(self, Qnil, Qnil, EXPORT_DER);
+ return ossl_ec_key_to_string(self, EXPORT_DER);
}
/*
@@ -674,7 +675,7 @@ static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
ossl_raise(eECError, "Private EC key needed!");
str = rb_str_new(0, ECDSA_size(ec) + 16);
- if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LENINT(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1)
+ if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1)
ossl_raise(eECError, "ECDSA_sign");
rb_str_resize(str, buf_len);
@@ -696,15 +697,13 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
StringValue(data);
StringValue(sig);
- switch (ECDSA_verify(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LENINT(data), (unsigned char *) RSTRING_PTR(sig), (int)RSTRING_LEN(sig), ec)) {
+ switch (ECDSA_verify(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LEN(data), (unsigned char *) RSTRING_PTR(sig), RSTRING_LEN(sig), ec)) {
case 1: return Qtrue;
case 0: return Qfalse;
default: break;
}
ossl_raise(eECError, "ECDSA_verify");
-
- UNREACHABLE;
}
static void ossl_ec_group_free(ossl_ec_group *ec_group)
@@ -748,7 +747,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
Data_Get_Struct(self, ossl_ec_group, ec_group);
if (ec_group->group != NULL)
- ossl_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
+ rb_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
switch (rb_scan_args(argc, argv, "13", &arg1, &arg2, &arg3, &arg4)) {
case 1:
@@ -762,17 +761,15 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
method = EC_GFp_mont_method();
} else if (id == s_GFp_nist) {
method = EC_GFp_nist_method();
-#if !defined(OPENSSL_NO_EC2M)
} else if (id == s_GF2m_simple) {
method = EC_GF2m_simple_method();
-#endif
}
if (method) {
if ((group = EC_GROUP_new(method)) == NULL)
ossl_raise(eEC_GROUP, "EC_GROUP_new");
} else {
- ossl_raise(rb_eArgError, "unknown symbol, must be :GFp_simple, :GFp_mont, :GFp_nist or :GF2m_simple");
+ rb_raise(rb_eArgError, "unknown symbol, must be :GFp_simple, :GFp_mont, :GFp_nist or :GF2m_simple");
}
} else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
const EC_GROUP *arg1_group;
@@ -785,7 +782,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
if (!group) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
group = d2i_ECPKParameters_bio(in, NULL);
}
@@ -795,7 +792,6 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
const char *name = StringValueCStr(arg1);
int nid = OBJ_sn2nid(name);
- (void)ERR_get_error();
if (nid == NID_undef)
ossl_raise(eEC_GROUP, "unknown curve name (%s)", name);
@@ -819,23 +815,21 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
if (id == s_GFp) {
new_curve = EC_GROUP_new_curve_GFp;
-#if !defined(OPENSSL_NO_EC2M)
} else if (id == s_GF2m) {
new_curve = EC_GROUP_new_curve_GF2m;
-#endif
} else {
- ossl_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
+ rb_raise(rb_eArgError, "unknown symbol, must be :GFp or :GF2m");
}
if ((group = new_curve(p, a, b, ossl_bn_ctx)) == NULL)
ossl_raise(eEC_GROUP, "EC_GROUP_new_by_GF*");
} else {
- ossl_raise(rb_eArgError, "unknown argument, must be :GFp or :GF2m");
+ rb_raise(rb_eArgError, "unknown argument, must be :GFp or :GF2m");
}
break;
default:
- ossl_raise(rb_eArgError, "wrong number of arguments");
+ rb_raise(rb_eArgError, "wrong number of arguments");
}
if (group == NULL)
@@ -975,7 +969,7 @@ static VALUE ossl_s_builtin_curves(VALUE self)
{
EC_builtin_curve *curves = NULL;
int n;
- int crv_len = rb_long2int(EC_get_builtin_curves(NULL, 0));
+ int crv_len = EC_get_builtin_curves(NULL, 0);
VALUE ary, ret;
curves = ALLOCA_N(EC_builtin_curve, crv_len);
@@ -1051,7 +1045,7 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
case POINT_CONVERSION_UNCOMPRESSED: ret = ID_uncompressed; break;
case POINT_CONVERSION_COMPRESSED: ret = ID_compressed; break;
case POINT_CONVERSION_HYBRID: ret = ID_hybrid; break;
- default: ossl_raise(eEC_GROUP, "unsupported point conversion form: %d, this module should be updated", form);
+ default: rb_raise(eEC_GROUP, "unsupported point conversion form: %d, this module should be updated", form);
}
return ID2SYM(ret);
@@ -1077,7 +1071,7 @@ static VALUE ossl_ec_group_set_point_conversion_form(VALUE self, VALUE form_v)
} else if (form_id == ID_hybrid) {
form = POINT_CONVERSION_HYBRID;
} else {
- ossl_raise(rb_eArgError, "form must be :compressed, :uncompressed, or :hybrid");
+ rb_raise(rb_eArgError, "form must be :compressed, :uncompressed, or :hybrid");
}
EC_GROUP_set_point_conversion_form(group, form);
@@ -1117,7 +1111,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)) != (size_t)RSTRING_LEN(seed))
+ if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
return seed;
@@ -1160,7 +1154,7 @@ static VALUE ossl_ec_group_to_string(VALUE self, int format)
break;
default:
BIO_free(out);
- ossl_raise(rb_eRuntimeError, "unknown format (internal error)");
+ rb_raise(rb_eRuntimeError, "unknown format (internal error)");
}
if (i != 1) {
@@ -1253,7 +1247,7 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
Data_Get_Struct(self, ossl_ec_point, ec_point);
if (ec_point->point)
- ossl_raise(eEC_POINT, "EC_POINT already initialized");
+ rb_raise(eEC_POINT, "EC_POINT already initialized");
switch (rb_scan_args(argc, argv, "11", &arg1, &arg2)) {
case 1:
@@ -1271,13 +1265,13 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
point = EC_POINT_new(group);
} else {
- ossl_raise(eEC_POINT, "wrong argument type: must be OpenSSL::PKey::EC::Point or OpenSSL::Pkey::EC::Group");
+ rb_raise(eEC_POINT, "wrong argument type: must be OpenSSL::PKey::EC::Point or OpenSSL::Pkey::EC::Group");
}
break;
case 2:
if (!rb_obj_is_kind_of(arg1, cEC_GROUP))
- ossl_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
+ rb_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
group_v = arg1;
SafeRequire_EC_GROUP(group_v, group);
@@ -1298,14 +1292,14 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
}
break;
default:
- ossl_raise(rb_eArgError, "wrong number of arguments");
+ rb_raise(rb_eArgError, "wrong number of arguments");
}
if (point == NULL)
ossl_raise(eEC_POINT, NULL);
if (NIL_P(group_v))
- ossl_raise(rb_eRuntimeError, "missing group (internal error)");
+ rb_raise(rb_eRuntimeError, "missing group (internal error)");
ec_point->point = point;
@@ -1358,8 +1352,6 @@ static VALUE ossl_ec_point_is_at_infinity(VALUE self)
case 0: return Qfalse;
default: ossl_raise(cEC_POINT, "EC_POINT_is_at_infinity");
}
-
- UNREACHABLE;
}
/*
@@ -1381,8 +1373,6 @@ static VALUE ossl_ec_point_is_on_curve(VALUE self)
case 0: return Qfalse;
default: ossl_raise(cEC_POINT, "EC_POINT_is_on_curve");
}
-
- UNREACHABLE;
}
/*
@@ -1474,78 +1464,6 @@ static VALUE ossl_ec_point_to_bn(VALUE self)
return bn_obj;
}
-/*
- * call-seq:
- * point.mul(bn) => point
- * point.mul(bn, bn) => point
- * point.mul([bn], [point]) => point
- * point.mul([bn], [point], bn) => point
- */
-static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
-{
- EC_POINT *point1, *point2;
- const EC_GROUP *group;
- VALUE group_v = rb_iv_get(self, "@group");
- VALUE bn_v1, bn_v2, r, points_v;
- BIGNUM *bn1 = NULL, *bn2 = NULL;
-
- Require_EC_POINT(self, point1);
- SafeRequire_EC_GROUP(group_v, group);
-
- r = rb_obj_alloc(cEC_POINT);
- ossl_ec_point_initialize(1, &group_v, r);
- Require_EC_POINT(r, point2);
-
- argc = rb_scan_args(argc, argv, "12", &bn_v1, &points_v, &bn_v2);
-
- if (rb_obj_is_kind_of(bn_v1, cBN)) {
- bn1 = GetBNPtr(bn_v1);
- if (argc >= 2) {
- bn2 = GetBNPtr(points_v);
- }
- if (EC_POINT_mul(group, point2, bn2, point1, bn1, ossl_bn_ctx) != 1)
- ossl_raise(eEC_POINT, "Multiplication failed");
- } else {
- size_t i, points_len, bignums_len;
- const EC_POINT **points;
- const BIGNUM **bignums;
-
- Check_Type(bn_v1, T_ARRAY);
- bignums_len = RARRAY_LEN(bn_v1);
- bignums = (const BIGNUM **)OPENSSL_malloc(bignums_len * (int)sizeof(BIGNUM *));
-
- for (i = 0; i < bignums_len; ++i) {
- bignums[i] = GetBNPtr(rb_ary_entry(bn_v1, i));
- }
-
- if (!rb_obj_is_kind_of(points_v, rb_cArray)) {
- OPENSSL_free((void *)bignums);
- rb_raise(rb_eTypeError, "Argument2 must be an array");
- }
-
- rb_ary_unshift(points_v, self);
- points_len = RARRAY_LEN(points_v);
- points = (const EC_POINT **)OPENSSL_malloc(points_len * (int)sizeof(EC_POINT *));
-
- for (i = 0; i < points_len; ++i) {
- Get_EC_POINT(rb_ary_entry(points_v, i), points[i]);
- }
-
- if (argc >= 3) {
- bn2 = GetBNPtr(bn_v2);
- }
- if (EC_POINTs_mul(group, point2, bn2, points_len, points, bignums, ossl_bn_ctx) != 1) {
- OPENSSL_free((void *)bignums);
- OPENSSL_free((void *)points);
- ossl_raise(eEC_POINT, "Multiplication failed");
- }
- OPENSSL_free((void *)bignums);
- OPENSSL_free((void *)points);
- }
-
- return r;
-}
-
static void no_copy(VALUE klass)
{
rb_undef_method(klass, "copy");
@@ -1612,8 +1530,7 @@ void Init_ossl_ec()
rb_define_method(cEC, "dsa_verify_asn1", ossl_ec_key_dsa_verify_asn1, 2);
/* do_sign/do_verify */
- rb_define_method(cEC, "export", ossl_ec_key_export, -1);
- rb_define_alias(cEC, "to_pem", "export");
+ rb_define_method(cEC, "to_pem", ossl_ec_key_to_pem, 0);
rb_define_method(cEC, "to_der", ossl_ec_key_to_der, 0);
rb_define_method(cEC, "to_text", ossl_ec_key_to_text, 0);
@@ -1667,7 +1584,6 @@ void Init_ossl_ec()
/* all the other methods */
rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
- rb_define_method(cEC_POINT, "mul", ossl_ec_point_mul, -1);
no_copy(cEC);
no_copy(cEC_GROUP);
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index e395e7108f..1b8a85332c 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -13,8 +13,8 @@
#include "ossl.h"
#define GetPKeyRSA(obj, pkey) do { \
- GetPKey((obj), (pkey)); \
- if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_RSA) { /* PARANOIA? */ \
+ GetPKey(obj, pkey); \
+ if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) { /* PARANOIA? */ \
ossl_raise(rb_eRuntimeError, "THIS IS NOT A RSA!") ; \
} \
} while (0)
@@ -76,87 +76,22 @@ ossl_rsa_new(EVP_PKEY *pkey)
/*
* Private
*/
-#if defined(HAVE_RSA_GENERATE_KEY_EX) && HAVE_BN_GENCB
-struct rsa_blocking_gen_arg {
- RSA *rsa;
- BIGNUM *e;
- int size;
- BN_GENCB *cb;
- int result;
-};
-
-static void *
-rsa_blocking_gen(void *arg)
-{
- struct rsa_blocking_gen_arg *gen = (struct rsa_blocking_gen_arg *)arg;
- gen->result = RSA_generate_key_ex(gen->rsa, gen->size, gen->e, gen->cb);
- return 0;
-}
-#endif
-
static RSA *
-rsa_generate(int size, unsigned long exp)
+rsa_generate(int size, int exp)
{
-#if defined(HAVE_RSA_GENERATE_KEY_EX) && HAVE_BN_GENCB
- int i;
- BN_GENCB cb;
- struct ossl_generate_cb_arg cb_arg;
- struct rsa_blocking_gen_arg gen_arg;
- RSA *rsa = RSA_new();
- BIGNUM *e = BN_new();
-
- if (!rsa || !e) {
- if (e) BN_free(e);
- if (rsa) RSA_free(rsa);
- return 0;
- }
- for (i = 0; i < (int)sizeof(exp) * 8; ++i) {
- if (exp & (1UL << i)) {
- if (BN_set_bit(e, i) == 0) {
- BN_free(e);
- RSA_free(rsa);
- return 0;
- }
- }
- }
-
- memset(&cb_arg, 0, sizeof(struct ossl_generate_cb_arg));
- if (rb_block_given_p())
- cb_arg.yield = 1;
- BN_GENCB_set(&cb, ossl_generate_cb_2, &cb_arg);
- gen_arg.rsa = rsa;
- gen_arg.e = e;
- gen_arg.size = size;
- gen_arg.cb = &cb;
- if (cb_arg.yield == 1) {
- /* we cannot release GVL when callback proc is supplied */
- rsa_blocking_gen(&gen_arg);
- } else {
- /* there's a chance to unblock */
- rb_thread_call_without_gvl(rsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
- }
- if (!gen_arg.result) {
- BN_free(e);
- RSA_free(rsa);
- if (cb_arg.state) rb_jump_tag(cb_arg.state);
- return 0;
- }
-
- BN_free(e);
- return rsa;
-#else
- return RSA_generate_key(size, exp, rb_block_given_p() ? ossl_generate_cb : NULL, NULL);
-#endif
+ return RSA_generate_key(size, exp,
+ rb_block_given_p() ? ossl_generate_cb : NULL,
+ NULL);
}
/*
- * call-seq:
- * RSA.generate(size) => RSA instance
- * RSA.generate(size, exponent) => RSA instance
+ * call-seq:
+ * RSA.generate(size [, exponent]) -> rsa
+ *
+ * === Parameters
+ * * +size+ is an integer representing the desired key size. Keys smaller than 1024 should be considered insecure.
+ * * +exponent+ is an odd number normally 3, 17, or 65537.
*
- * Generates an RSA keypair. +size+ is an integer representing the desired key
- * size. Keys smaller than 1024 should be considered insecure. +exponent+ is
- * an odd number normally 3, 17, or 65537.
*/
static VALUE
ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
@@ -168,7 +103,7 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
rb_scan_args(argc, argv, "11", &size, &exp);
- rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2ULONG(exp)); /* err handled by rsa_instance */
+ rsa = rsa_generate(NUM2INT(size), NIL_P(exp) ? RSA_F4 : NUM2INT(exp)); /* err handled by rsa_instance */
obj = rsa_instance(klass, rsa);
if (obj == Qfalse) {
@@ -180,24 +115,18 @@ ossl_rsa_s_generate(int argc, VALUE *argv, VALUE klass)
}
/*
- * call-seq:
- * RSA.new(key_size) => RSA instance
- * RSA.new(encoded_key) => RSA instance
- * RSA.new(encoded_key, pass_phrase) => RSA instance
- *
- * Generates or loads an RSA keypair. If an integer +key_size+ is given it
- * represents the desired key size. Keys less than 1024 bits should be
- * considered insecure.
+ * call-seq:
+ * RSA.new([size | encoded_key] [, pass]) -> rsa
*
- * A key can instead be loaded from an +encoded_key+ which must be PEM or DER
- * encoded. A +pass_phrase+ can be used to decrypt the key. If none is given
- * OpenSSL will prompt for the pass phrase.
+ * === Parameters
+ * * +size+ is an integer representing the desired key size.
+ * * +encoded_key+ is a string containing PEM or DER encoded key.
+ * * +pass+ is an optional string with the password to decrypt the encoded key.
*
- * = Examples
- *
- * OpenSSL::PKey::RSA.new 2048
- * OpenSSL::PKey::RSA.new File.read 'rsa.pem'
- * OpenSSL::PKey::RSA.new File.read('rsa.pem'), 'my pass phrase'
+ * === Examples
+ * * RSA.new(2048) -> rsa
+ * * RSA.new(File.read("rsa.pem")) -> rsa
+ * * RSA.new(File.read("rsa.pem"), "mypassword") -> rsa
*/
static VALUE
ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
@@ -213,7 +142,7 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
rsa = RSA_new();
}
else if (FIXNUM_P(arg)) {
- rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
+ rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2INT(pass));
if (!rsa) ossl_raise(eRSAError, NULL);
}
else {
@@ -222,28 +151,34 @@ 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) {
- OSSL_BIO_reset(in);
- rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
}
if (!rsa) {
- OSSL_BIO_reset(in);
- rsa = d2i_RSAPrivateKey_bio(in, NULL);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
}
if (!rsa) {
- OSSL_BIO_reset(in);
- rsa = d2i_RSA_PUBKEY_bio(in, NULL);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ rsa = d2i_RSAPrivateKey_bio(in, NULL);
}
if (!rsa) {
- OSSL_BIO_reset(in);
- rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ rsa = d2i_RSAPublicKey_bio(in, NULL);
}
if (!rsa) {
- OSSL_BIO_reset(in);
- rsa = d2i_RSAPublicKey_bio(in, NULL);
+ (void)BIO_reset(in);
+ (void)ERR_get_error();
+ rsa = d2i_RSA_PUBKEY_bio(in, NULL);
}
BIO_free(in);
if (!rsa) {
- ossl_raise(eRSAError, "Neither PUB key nor PRIV key");
+ (void)ERR_get_error();
+ ossl_raise(eRSAError, "Neither PUB key nor PRIV key:");
}
}
if (!EVP_PKEY_assign_RSA(pkey, rsa)) {
@@ -255,11 +190,11 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
}
/*
- * call-seq:
- * rsa.public? => true
+ * call-seq:
+ * rsa.public? -> true
+ *
+ * The return value is always true since every private key is also a public key.
*
- * The return value is always true since every private key is also a public
- * key.
*/
static VALUE
ossl_rsa_is_public(VALUE self)
@@ -274,10 +209,9 @@ ossl_rsa_is_public(VALUE self)
}
/*
- * call-seq:
- * rsa.private? => true | false
+ * call-seq:
+ * rsa.private? -> true | false
*
- * Does this keypair contain a private key?
*/
static VALUE
ossl_rsa_is_private(VALUE self)
@@ -290,13 +224,16 @@ ossl_rsa_is_private(VALUE self)
}
/*
- * call-seq:
- * rsa.to_pem => PEM-format String
- * rsa.to_pem(cipher, pass_phrase) => PEM-format String
+ * call-seq:
+ * rsa.to_pem([cipher, pass]) -> aString
*
- * Outputs this keypair in PEM encoding. If +cipher+ and +pass_phrase+ are
- * given they will be used to encrypt the key. +cipher+ must be an
- * OpenSSL::Cipher::Cipher instance.
+ * === Parameters
+ * * +cipher+ is a Cipher object.
+ * * +pass+ is a string.
+ *
+ * === Examples
+ * * rsa.to_pem -> aString
+ * * rsa.to_pem(cipher, pass) -> aString
*/
static VALUE
ossl_rsa_export(int argc, VALUE *argv, VALUE self)
@@ -314,10 +251,7 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
if (!NIL_P(cipher)) {
ciph = GetCipherPtr(cipher);
if (!NIL_P(pass)) {
- StringValue(pass);
- if (RSTRING_LENINT(pass) < OSSL_MIN_PWD_LEN)
- ossl_raise(eOSSLError, "OpenSSL requires passwords to be at least four characters long");
- passwd = RSTRING_PTR(pass);
+ passwd = StringValuePtr(pass);
}
}
if (!(out = BIO_new(BIO_s_mem()))) {
@@ -330,7 +264,7 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
ossl_raise(eRSAError, NULL);
}
} else {
- if (!PEM_write_bio_RSA_PUBKEY(out, pkey->pkey.rsa)) {
+ if (!PEM_write_bio_RSAPublicKey(out, pkey->pkey.rsa)) {
BIO_free(out);
ossl_raise(eRSAError, NULL);
}
@@ -341,10 +275,9 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
}
/*
- * call-seq:
- * rsa.to_der => DER-format String
+ * call-seq:
+ * rsa.to_der -> aString
*
- * Outputs this keypair in DER encoding.
*/
static VALUE
ossl_rsa_to_der(VALUE self)
@@ -359,7 +292,7 @@ ossl_rsa_to_der(VALUE self)
if(RSA_HAS_PRIVATE(pkey->pkey.rsa))
i2d_func = i2d_RSAPrivateKey;
else
- i2d_func = (int (*)(const RSA*, unsigned char**))i2d_RSA_PUBKEY;
+ i2d_func = i2d_RSAPublicKey;
if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
ossl_raise(eRSAError, NULL);
str = rb_str_new(0, len);
@@ -374,12 +307,9 @@ ossl_rsa_to_der(VALUE self)
#define ossl_rsa_buf_size(pkey) (RSA_size((pkey)->pkey.rsa)+16)
/*
- * call-seq:
- * rsa.public_encrypt(string) => String
- * rsa.public_encrypt(string, padding) => String
+ * call-seq:
+ * rsa.public_encrypt(string [, padding]) -> aString
*
- * Encrypt +string+ with the public key. +padding+ defaults to PKCS1_PADDING.
- * The encrypted string output can be decrypted using #private_decrypt.
*/
static VALUE
ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
@@ -393,7 +323,7 @@ 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_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
+ buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
(unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -403,12 +333,9 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
}
/*
- * call-seq:
- * rsa.public_decrypt(string) => String
- * rsa.public_decrypt(string, padding) => String
+ * call-seq:
+ * rsa.public_decrypt(string [, padding]) -> aString
*
- * Decrypt +string+, which has been encrypted with the private key, with the
- * public key. +padding+ defaults to PKCS1_PADDING.
*/
static VALUE
ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
@@ -422,7 +349,7 @@ 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_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
+ buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
(unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -432,12 +359,9 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
}
/*
- * call-seq:
- * rsa.private_encrypt(string) => String
- * rsa.private_encrypt(string, padding) => String
+ * call-seq:
+ * rsa.private_encrypt(string [, padding]) -> aString
*
- * Encrypt +string+ with the private key. +padding+ defaults to PKCS1_PADDING.
- * The encrypted string output can be decrypted using #public_decrypt.
*/
static VALUE
ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
@@ -454,7 +378,7 @@ 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_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
+ buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
(unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -463,13 +387,11 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
return str;
}
+
/*
- * call-seq:
- * rsa.private_decrypt(string) => String
- * rsa.private_decrypt(string, padding) => String
+ * call-seq:
+ * rsa.private_decrypt(string [, padding]) -> aString
*
- * Decrypt +string+, which has been encrypted with the public key, with the
- * private key. +padding+ defaults to PKCS1_PADDING.
*/
static VALUE
ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
@@ -486,7 +408,7 @@ 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_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
+ buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
(unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
@@ -496,15 +418,12 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
}
/*
- * call-seq:
- * rsa.params => hash
- *
- * THIS METHOD IS INSECURE, PRIVATE INFORMATION CAN LEAK OUT!!!
+ * call-seq:
+ * rsa.params -> hash
*
- * Stores all parameters of key to the hash. The hash has keys 'n', 'e', 'd',
- * 'p', 'q', 'dmp1', 'dmq1', 'iqmp'.
- *
- * Don't use :-)) (It's up to you)
+ * Stores all parameters of key to the hash
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
+ * Don't use :-)) (I's up to you)
*/
static VALUE
ossl_rsa_get_params(VALUE self)
@@ -529,13 +448,11 @@ ossl_rsa_get_params(VALUE self)
}
/*
- * call-seq:
- * rsa.to_text => String
- *
- * THIS METHOD IS INSECURE, PRIVATE INFORMATION CAN LEAK OUT!!!
- *
- * Dumps all parameters of a keypair to a String
+ * call-seq:
+ * rsa.to_text -> aString
*
+ * Prints all parameters of key to buffer
+ * INSECURE: PRIVATE INFORMATIONS CAN LEAK OUT!!!
* Don't use :-)) (It's up to you)
*/
static VALUE
@@ -559,10 +476,10 @@ ossl_rsa_to_text(VALUE self)
}
/*
- * call-seq:
- * rsa.public_key -> RSA
+ * call-seq:
+ * rsa.public_key -> aRSA
*
- * Makes new RSA instance containing the public key from the private key.
+ * Makes new instance RSA PUBLIC_KEY from PRIVATE_KEY
*/
static VALUE
ossl_rsa_to_public_key(VALUE self)
@@ -627,29 +544,13 @@ OSSL_PKEY_BN(rsa, iqmp)
void
Init_ossl_rsa()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
+#if 0 /* let rdoc know about mOSSL and mPKey */
+ mOSSL = rb_define_module("OpenSSL");
mPKey = rb_define_module_under(mOSSL, "PKey");
#endif
- /* Document-class: OpenSSL::PKey::RSAError
- *
- * Generic exception that is raised if an operation on an RSA PKey
- * fails unexpectedly or in case an instantiation of an instance of RSA
- * fails due to non-conformant input data.
- */
eRSAError = rb_define_class_under(mPKey, "RSAError", ePKeyError);
- /* Document-class: OpenSSL::PKey::RSA
- *
- * RSA is an asymmetric public key algorithm that has been formalized in
- * RFC 3447. It is in widespread use in public key infrastuctures (PKI)
- * where certificates (cf. OpenSSL::X509::Certificate) often are issued
- * on the basis of a public/private RSA key pair. RSA is used in a wide
- * field of applications such as secure (symmetric) key exchange, e.g.
- * when establishing a secure TLS/SSL connection. It is also used in
- * various digital signature schemes.
- */
cRSA = rb_define_class_under(mPKey, "RSA", cPKey);
rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index 270a4b7437..97a1b9fa95 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -37,7 +37,7 @@ static VALUE
ossl_rand_seed(VALUE self, VALUE str)
{
StringValue(str);
- RAND_seed(RSTRING_PTR(str), RSTRING_LENINT(str));
+ RAND_seed(RSTRING_PTR(str), RSTRING_LEN(str));
return str;
}
@@ -51,7 +51,7 @@ static VALUE
ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
{
StringValue(str);
- RAND_add(RSTRING_PTR(str), RSTRING_LENINT(str), NUM2DBL(entropy));
+ RAND_add(RSTRING_PTR(str), RSTRING_LEN(str), NUM2DBL(entropy));
return self;
}
@@ -149,7 +149,7 @@ ossl_rand_egd(VALUE self, VALUE filename)
static VALUE
ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
{
- int n = NUM2INT(len);
+ long n = NUM2INT(len);
SafeStringValue(filename);
@@ -172,8 +172,8 @@ ossl_rand_status(VALUE self)
}
#define DEFMETH(class, name, func, argc) \
- rb_define_method((class), (name), (func), (argc)); \
- rb_define_singleton_method((class), (name), (func), (argc));
+ rb_define_method(class, name, func, argc); \
+ rb_define_singleton_method(class, name, func, argc);
/*
* INIT
@@ -181,8 +181,8 @@ ossl_rand_status(VALUE self)
void
Init_ossl_rand()
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
mRandom = rb_define_module_under(mOSSL, "Random");
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 8cc979895a..7de1a6bb7a 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -16,12 +16,12 @@
# include <unistd.h> /* for read(), and write() */
#endif
-#define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
+#define numberof(ary) (int)(sizeof(ary)/sizeof(ary[0]))
#ifdef _WIN32
# define TO_SOCKET(s) _get_osfhandle(s)
#else
-# define TO_SOCKET(s) (s)
+# define TO_SOCKET(s) s
#endif
VALUE mSSL;
@@ -29,51 +29,47 @@ VALUE eSSLError;
VALUE cSSLContext;
VALUE cSSLSocket;
-#define ossl_sslctx_set_cert(o,v) rb_iv_set((o),"@cert",(v))
-#define ossl_sslctx_set_key(o,v) rb_iv_set((o),"@key",(v))
-#define ossl_sslctx_set_client_ca(o,v) rb_iv_set((o),"@client_ca",(v))
-#define ossl_sslctx_set_ca_file(o,v) rb_iv_set((o),"@ca_file",(v))
-#define ossl_sslctx_set_ca_path(o,v) rb_iv_set((o),"@ca_path",(v))
-#define ossl_sslctx_set_timeout(o,v) rb_iv_set((o),"@timeout",(v))
-#define ossl_sslctx_set_verify_mode(o,v) rb_iv_set((o),"@verify_mode",(v))
-#define ossl_sslctx_set_verify_dep(o,v) rb_iv_set((o),"@verify_depth",(v))
-#define ossl_sslctx_set_verify_cb(o,v) rb_iv_set((o),"@verify_callback",(v))
-#define ossl_sslctx_set_options(o,v) rb_iv_set((o),"@options",(v))
-#define ossl_sslctx_set_cert_store(o,v) rb_iv_set((o),"@cert_store",(v))
-#define ossl_sslctx_set_extra_cert(o,v) rb_iv_set((o),"@extra_chain_cert",(v))
-#define ossl_sslctx_set_client_cert_cb(o,v) rb_iv_set((o),"@client_cert_cb",(v))
-#define ossl_sslctx_set_tmp_dh_cb(o,v) rb_iv_set((o),"@tmp_dh_callback",(v))
-#define ossl_sslctx_set_sess_id_ctx(o, v) rb_iv_set((o),"@session_id_context",(v))
-
-#define ossl_sslctx_get_cert(o) rb_iv_get((o),"@cert")
-#define ossl_sslctx_get_key(o) rb_iv_get((o),"@key")
-#define ossl_sslctx_get_client_ca(o) rb_iv_get((o),"@client_ca")
-#define ossl_sslctx_get_ca_file(o) rb_iv_get((o),"@ca_file")
-#define ossl_sslctx_get_ca_path(o) rb_iv_get((o),"@ca_path")
-#define ossl_sslctx_get_timeout(o) rb_iv_get((o),"@timeout")
-#define ossl_sslctx_get_verify_mode(o) rb_iv_get((o),"@verify_mode")
-#define ossl_sslctx_get_verify_dep(o) rb_iv_get((o),"@verify_depth")
-#define ossl_sslctx_get_verify_cb(o) rb_iv_get((o),"@verify_callback")
-#define ossl_sslctx_get_options(o) rb_iv_get((o),"@options")
-#define ossl_sslctx_get_cert_store(o) rb_iv_get((o),"@cert_store")
-#define ossl_sslctx_get_extra_cert(o) rb_iv_get((o),"@extra_chain_cert")
-#define ossl_sslctx_get_client_cert_cb(o) rb_iv_get((o),"@client_cert_cb")
-#define ossl_sslctx_get_tmp_dh_cb(o) rb_iv_get((o),"@tmp_dh_callback")
-#define ossl_sslctx_get_sess_id_ctx(o) rb_iv_get((o),"@session_id_context")
+#define ossl_sslctx_set_cert(o,v) rb_iv_set((o),"@cert",(v))
+#define ossl_sslctx_set_key(o,v) rb_iv_set((o),"@key",(v))
+#define ossl_sslctx_set_client_ca(o,v) rb_iv_set((o),"@client_ca",(v))
+#define ossl_sslctx_set_ca_file(o,v) rb_iv_set((o),"@ca_file",(v))
+#define ossl_sslctx_set_ca_path(o,v) rb_iv_set((o),"@ca_path",(v))
+#define ossl_sslctx_set_timeout(o,v) rb_iv_set((o),"@timeout",(v))
+#define ossl_sslctx_set_verify_mode(o,v) rb_iv_set((o),"@verify_mode",(v))
+#define ossl_sslctx_set_verify_dep(o,v) rb_iv_set((o),"@verify_depth",(v))
+#define ossl_sslctx_set_verify_cb(o,v) rb_iv_set((o),"@verify_callback",(v))
+#define ossl_sslctx_set_options(o,v) rb_iv_set((o),"@options",(v))
+#define ossl_sslctx_set_cert_store(o,v) rb_iv_set((o),"@cert_store",(v))
+#define ossl_sslctx_set_extra_cert(o,v) rb_iv_set((o),"@extra_chain_cert",(v))
+#define ossl_sslctx_set_client_cert_cb(o,v) rb_iv_set((o),"@client_cert_cb",(v))
+#define ossl_sslctx_set_tmp_dh_cb(o,v) rb_iv_set((o),"@tmp_dh_callback",(v))
+#define ossl_sslctx_set_sess_id_ctx(o, v) rb_iv_get((o),"@session_id_context"(v))
+
+#define ossl_sslctx_get_cert(o) rb_iv_get((o),"@cert")
+#define ossl_sslctx_get_key(o) rb_iv_get((o),"@key")
+#define ossl_sslctx_get_client_ca(o) rb_iv_get((o),"@client_ca")
+#define ossl_sslctx_get_ca_file(o) rb_iv_get((o),"@ca_file")
+#define ossl_sslctx_get_ca_path(o) rb_iv_get((o),"@ca_path")
+#define ossl_sslctx_get_timeout(o) rb_iv_get((o),"@timeout")
+#define ossl_sslctx_get_verify_mode(o) rb_iv_get((o),"@verify_mode")
+#define ossl_sslctx_get_verify_dep(o) rb_iv_get((o),"@verify_depth")
+#define ossl_sslctx_get_verify_cb(o) rb_iv_get((o),"@verify_callback")
+#define ossl_sslctx_get_options(o) rb_iv_get((o),"@options")
+#define ossl_sslctx_get_cert_store(o) rb_iv_get((o),"@cert_store")
+#define ossl_sslctx_get_extra_cert(o) rb_iv_get((o),"@extra_chain_cert")
+#define ossl_sslctx_get_client_cert_cb(o) rb_iv_get((o),"@client_cert_cb")
+#define ossl_sslctx_get_tmp_dh_cb(o) rb_iv_get((o),"@tmp_dh_callback")
+#define ossl_sslctx_get_sess_id_ctx(o) rb_iv_get((o),"@session_id_context")
static const char *ossl_sslctx_attrs[] = {
"cert", "key", "client_ca", "ca_file", "ca_path",
- "timeout", "verify_mode", "verify_depth", "renegotiation_cb",
+ "timeout", "verify_mode", "verify_depth",
"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
-#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
- "npn_protocols",
- "npn_select_cb",
-#endif
};
#define ossl_ssl_get_io(o) rb_iv_get((o),"@io")
@@ -111,20 +107,8 @@ struct {
OSSL_SSL_METHOD_ENTRY(TLSv1),
OSSL_SSL_METHOD_ENTRY(TLSv1_server),
OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-#if defined(HAVE_TLSV1_2_METHOD) && defined(HAVE_TLSV1_2_SERVER_METHOD) && \
- defined(HAVE_TLSV1_2_CLIENT_METHOD)
- OSSL_SSL_METHOD_ENTRY(TLSv1_2),
- OSSL_SSL_METHOD_ENTRY(TLSv1_2_server),
- OSSL_SSL_METHOD_ENTRY(TLSv1_2_client),
-#endif
-#if defined(HAVE_TLSV1_1_METHOD) && defined(HAVE_TLSV1_1_SERVER_METHOD) && \
- defined(HAVE_TLSV1_1_CLIENT_METHOD)
- OSSL_SSL_METHOD_ENTRY(TLSv1_1),
- OSSL_SSL_METHOD_ENTRY(TLSv1_1_server),
- OSSL_SSL_METHOD_ENTRY(TLSv1_1_client),
-#endif
#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
- defined(HAVE_SSLV2_CLIENT_METHOD)
+ defined(HAVE_SSLV2_CLIENT_METHOD)
OSSL_SSL_METHOD_ENTRY(SSLv2),
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
OSSL_SSL_METHOD_ENTRY(SSLv2_client),
@@ -156,27 +140,15 @@ static VALUE
ossl_sslctx_s_alloc(VALUE klass)
{
SSL_CTX *ctx;
- long mode = SSL_MODE_ENABLE_PARTIAL_WRITE;
-
-#ifdef SSL_MODE_RELEASE_BUFFERS
- mode |= SSL_MODE_RELEASE_BUFFERS;
-#endif
ctx = SSL_CTX_new(SSLv23_method());
if (!ctx) {
- ossl_raise(eSSLError, "SSL_CTX_new");
+ ossl_raise(eSSLError, "SSL_CTX_new:");
}
- SSL_CTX_set_mode(ctx, mode);
+ SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
}
-/*
- * call-seq:
- * ctx.ssl_version = :TLSv1
- * ctx.ssl_version = "SSLv23_client"
- *
- * You can get a list of valid versions with OpenSSL::SSL::SSLContext::METHODS
- */
static VALUE
ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
{
@@ -200,7 +172,7 @@ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
}
Data_Get_Struct(self, SSL_CTX, ctx);
if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
- ossl_raise(eSSLError, "SSL_CTX_set_ssl_version");
+ ossl_raise(eSSLError, "SSL_CTX_set_ssl_version:");
}
return ssl_method;
@@ -255,12 +227,13 @@ ossl_call_client_cert_cb(VALUE obj)
static int
ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
{
- VALUE obj, success;
+ VALUE obj;
+ int status, success;
obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
success = rb_protect((VALUE(*)_((VALUE)))ossl_call_client_cert_cb,
- obj, NULL);
- if (!RTEST(success)) return 0;
+ obj, &status);
+ if (status || !success) return 0;
*x509 = DupX509CertPtr(ossl_ssl_get_x509(obj));
*pkey = DupPKeyPtr(ossl_ssl_get_key(obj));
@@ -289,14 +262,15 @@ ossl_call_tmp_dh_callback(VALUE *args)
static DH*
ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
{
- VALUE args[3], success;
+ VALUE args[3];
+ int status, success;
args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
args[1] = INT2FIX(is_export);
args[2] = INT2FIX(keylength);
success = rb_protect((VALUE(*)_((VALUE)))ossl_call_tmp_dh_callback,
- (VALUE)args, NULL);
- if (!RTEST(success)) return NULL;
+ (VALUE)args, &status);
+ if (status || !success) return NULL;
return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh;
}
@@ -395,7 +369,7 @@ ossl_call_session_new_cb(VALUE ary)
static int
ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
{
- VALUE ary, ssl_obj, sess_obj;
+ VALUE ary, ssl_obj, sess_obj, ret_obj;
void *ptr;
int state = 0;
@@ -412,21 +386,16 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
rb_ary_push(ary, ssl_obj);
rb_ary_push(ary, sess_obj);
- rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
+ ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
if (state) {
rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
+ return 0; /* what should be returned here??? */
}
- /*
- * return 0 which means to OpenSSL that the the session is still
- * valid (since we created Ruby Session object) and was not freed by us
- * with SSL_SESSION_free(). Call SSLContext#remove_session(sess) in
- * session_get_cb block if you don't want OpenSSL to cache the session
- * internally.
- */
- return 0;
+ return RTEST(ret_obj) ? 1 : 0;
}
+#if 0 /* unused */
static VALUE
ossl_call_session_remove_cb(VALUE ary)
{
@@ -440,11 +409,12 @@ 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)
{
- VALUE ary, sslctx_obj, sess_obj;
+ VALUE ary, sslctx_obj, sess_obj, ret_obj;
void *ptr;
int state = 0;
@@ -461,7 +431,7 @@ ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
rb_ary_push(ary, sslctx_obj);
rb_ary_push(ary, sess_obj);
- rb_protect((VALUE(*)_((VALUE)))ossl_call_session_remove_cb, ary, &state);
+ ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
if (state) {
/*
the SSL_CTX is frozen, nowhere to save state.
@@ -512,7 +482,7 @@ ossl_call_servername_cb(VALUE ary)
Data_Get_Struct(ret_obj, SSL_CTX, ctx2);
SSL_set_SSL_CTX(ssl, ctx2);
} else if (!NIL_P(ret_obj)) {
- ossl_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
+ rb_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
}
return ret_obj;
@@ -521,7 +491,7 @@ ossl_call_servername_cb(VALUE ary)
static int
ssl_servername_cb(SSL *ssl, int *ad, void *arg)
{
- VALUE ary, ssl_obj;
+ VALUE ary, ssl_obj, ret_obj;
void *ptr;
int state = 0;
const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
@@ -536,7 +506,7 @@ ssl_servername_cb(SSL *ssl, int *ad, void *arg)
rb_ary_push(ary, ssl_obj);
rb_ary_push(ary, rb_str_new2(servername));
- rb_protect((VALUE(*)_((VALUE)))ossl_call_servername_cb, ary, &state);
+ 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;
@@ -546,107 +516,13 @@ ssl_servername_cb(SSL *ssl, int *ad, void *arg)
}
#endif
-static void
-ssl_renegotiation_cb(const SSL *ssl)
-{
- VALUE ssl_obj, sslctx_obj, cb;
- void *ptr;
-
- if ((ptr = SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx)) == NULL)
- ossl_raise(eSSLError, "SSL object could not be retrieved");
- ssl_obj = (VALUE)ptr;
-
- sslctx_obj = rb_iv_get(ssl_obj, "@context");
- if (NIL_P(sslctx_obj)) return;
- cb = rb_iv_get(sslctx_obj, "@renegotiation_cb");
- if (NIL_P(cb)) return;
-
- (void) rb_funcall(cb, rb_intern("call"), 1, ssl_obj);
-}
-
-#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
-static VALUE
-ssl_npn_encode_protocol_i(VALUE cur, VALUE encoded)
-{
- int len = RSTRING_LENINT(cur);
- char len_byte;
- if (len < 1 || len > 255)
- ossl_raise(eSSLError, "Advertised protocol must have length 1..255");
- /* Encode the length byte */
- len_byte = len;
- rb_str_buf_cat(encoded, &len_byte, 1);
- rb_str_buf_cat(encoded, RSTRING_PTR(cur), len);
- return Qnil;
-}
-
-static void
-ssl_npn_encode_protocols(VALUE sslctx, VALUE protocols)
-{
- VALUE encoded = rb_str_new2("");
- rb_iterate(rb_each, protocols, ssl_npn_encode_protocol_i, encoded);
- StringValueCStr(encoded);
- rb_iv_set(sslctx, "@_protocols", encoded);
-}
-
-static int
-ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg)
-{
- VALUE sslctx_obj = (VALUE) arg;
- VALUE protocols = rb_iv_get(sslctx_obj, "@_protocols");
-
- *out = (const unsigned char *) RSTRING_PTR(protocols);
- *outlen = RSTRING_LENINT(protocols);
-
- return SSL_TLSEXT_ERR_OK;
-}
-
-static int
-ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
-{
- int i = 0;
- VALUE sslctx_obj, cb, protocols, selected;
-
- sslctx_obj = (VALUE) arg;
- cb = rb_iv_get(sslctx_obj, "@npn_select_cb");
- protocols = rb_ary_new();
-
- /* The format is len_1|proto_1|...|len_n|proto_n\0 */
- while (in[i]) {
- VALUE protocol = rb_str_new((const char *) &in[i + 1], in[i]);
- rb_ary_push(protocols, protocol);
- i += in[i] + 1;
- }
-
- selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
- StringValue(selected);
- *out = (unsigned char *) StringValuePtr(selected);
- *outlen = RSTRING_LENINT(selected);
-
- return SSL_TLSEXT_ERR_OK;
-}
-#endif
-
-/* This function may serve as the entry point to support further
- * callbacks. */
-static void
-ssl_info_cb(const SSL *ssl, int where, int val)
-{
- int state = SSL_state(ssl);
-
- if ((where & SSL_CB_HANDSHAKE_START) &&
- (state & SSL_ST_ACCEPT)) {
- ssl_renegotiation_cb(ssl);
- }
-}
-
/*
* call-seq:
* ctx.setup => Qtrue # first time
* ctx.setup => nil # thereafter
*
* This method is called automatically when a new SSLSocket is created.
- * Normally you do not need to call this method (unless you are writing an
- * extension in C).
+ * Normally you do not need to call this method (unless you are writing an extension in C).
*/
static VALUE
ossl_sslctx_setup(VALUE self)
@@ -698,14 +574,14 @@ ossl_sslctx_setup(VALUE self)
if (cert && key) {
if (!SSL_CTX_use_certificate(ctx, cert)) {
/* Adds a ref => Safe to FREE */
- ossl_raise(eSSLError, "SSL_CTX_use_certificate");
+ ossl_raise(eSSLError, "SSL_CTX_use_certificate:");
}
if (!SSL_CTX_use_PrivateKey(ctx, key)) {
/* Adds a ref => Safe to FREE */
- ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey");
+ ossl_raise(eSSLError, "SSL_CTX_use_PrivateKey:");
}
if (!SSL_CTX_check_private_key(ctx)) {
- ossl_raise(eSSLError, "SSL_CTX_check_private_key");
+ ossl_raise(eSSLError, "SSL_CTX_check_private_key:");
}
}
@@ -748,36 +624,22 @@ ossl_sslctx_setup(VALUE self)
if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
val = ossl_sslctx_get_verify_dep(self);
- if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2INT(val));
+ if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2LONG(val));
val = ossl_sslctx_get_options(self);
if(!NIL_P(val)) {
- SSL_CTX_set_options(ctx, NUM2LONG(val));
+ SSL_CTX_set_options(ctx, NUM2LONG(val));
} else {
SSL_CTX_set_options(ctx, SSL_OP_ALL);
}
-
-#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
- val = rb_iv_get(self, "@npn_protocols");
- if (!NIL_P(val)) {
- ssl_npn_encode_protocols(self, val);
- SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_npn_advertise_cb, (void *) self);
- OSSL_Debug("SSL NPN advertise callback added");
- }
- if (RTEST(rb_iv_get(self, "@npn_select_cb"))) {
- SSL_CTX_set_next_proto_select_cb(ctx, ssl_npn_select_cb, (void *) self);
- OSSL_Debug("SSL NPN select callback added");
- }
-#endif
-
rb_obj_freeze(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),
- RSTRING_LENINT(val))){
- ossl_raise(eSSLError, "SSL_CTX_set_session_id_context");
+ RSTRING_LEN(val))){
+ ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
}
}
@@ -824,8 +686,6 @@ ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
/*
* call-seq:
* ctx.ciphers => [[name, version, bits, alg_bits], ...]
- *
- * The list of ciphers configured for this context.
*/
static VALUE
ossl_sslctx_get_ciphers(VALUE self)
@@ -846,10 +706,10 @@ ossl_sslctx_get_ciphers(VALUE self)
if (!ciphers)
return rb_ary_new();
- num = sk_SSL_CIPHER_num(ciphers);
+ num = sk_num((STACK*)ciphers);
ary = rb_ary_new2(num);
for(i = 0; i < num; i++){
- cipher = sk_SSL_CIPHER_value(ciphers, i);
+ cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i);
rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher));
}
return ary;
@@ -860,12 +720,6 @@ ossl_sslctx_get_ciphers(VALUE self)
* ctx.ciphers = "cipher1:cipher2:..."
* ctx.ciphers = [name, ...]
* ctx.ciphers = [[name, version, bits, alg_bits], ...]
- *
- * Sets the list of available ciphers for this context. Note in a server
- * context some ciphers require the appropriate certificates. For example, an
- * RSA cipher can only be chosen when an RSA certificate is available.
- *
- * See also OpenSSL::Cipher and OpenSSL::Cipher::ciphers
*/
static VALUE
ossl_sslctx_set_ciphers(VALUE self, VALUE v)
@@ -897,17 +751,17 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
return Qnil;
}
if (!SSL_CTX_set_cipher_list(ctx, RSTRING_PTR(str))) {
- ossl_raise(eSSLError, "SSL_CTX_set_cipher_list");
+ ossl_raise(eSSLError, "SSL_CTX_set_cipher_list:");
}
return v;
}
+
/*
* call-seq:
* ctx.session_add(session) -> true | false
*
- * Adds +session+ to the session cache
*/
static VALUE
ossl_sslctx_session_add(VALUE self, VALUE arg)
@@ -925,7 +779,6 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
* call-seq:
* ctx.session_remove(session) -> true | false
*
- * Removes +session+ from the session cache
*/
static VALUE
ossl_sslctx_session_remove(VALUE self, VALUE arg)
@@ -941,9 +794,8 @@ ossl_sslctx_session_remove(VALUE self, VALUE arg)
/*
* call-seq:
- * ctx.session_cache_mode -> Integer
+ * ctx.session_cache_mode -> integer
*
- * The current session cache mode.
*/
static VALUE
ossl_sslctx_get_session_cache_mode(VALUE self)
@@ -957,11 +809,8 @@ ossl_sslctx_get_session_cache_mode(VALUE self)
/*
* call-seq:
- * ctx.session_cache_mode=(integer) -> Integer
+ * ctx.session_cache_mode=(integer) -> integer
*
- * Sets the SSL session cache mode. Bitwise-or together the desired
- * SESSION_CACHE_* constants to set. See SSL_CTX_set_session_cache_mode(3) for
- * details.
*/
static VALUE
ossl_sslctx_set_session_cache_mode(VALUE self, VALUE arg)
@@ -977,10 +826,8 @@ ossl_sslctx_set_session_cache_mode(VALUE self, VALUE arg)
/*
* call-seq:
- * ctx.session_cache_size -> Integer
+ * ctx.session_cache_size -> integer
*
- * Returns the current session cache size. Zero is used to represent an
- * unlimited cache size.
*/
static VALUE
ossl_sslctx_get_session_cache_size(VALUE self)
@@ -994,10 +841,8 @@ ossl_sslctx_get_session_cache_size(VALUE self)
/*
* call-seq:
- * ctx.session_cache_size=(integer) -> Integer
+ * ctx.session_cache_size=(integer) -> integer
*
- * Sets the session cache size. Returns the previously valid session cache
- * size. Zero is used to represent an unlimited session cache size.
*/
static VALUE
ossl_sslctx_set_session_cache_size(VALUE self, VALUE arg)
@@ -1015,23 +860,6 @@ ossl_sslctx_set_session_cache_size(VALUE self, VALUE arg)
* call-seq:
* ctx.session_cache_stats -> Hash
*
- * Returns a Hash containing the following keys:
- *
- * :accept:: Number of started SSL/TLS handshakes in server mode
- * :accept_good:: Number of established SSL/TLS sessions in server mode
- * :accept_renegotiate:: Number of start renegotiations in server mode
- * :cache_full:: Number of sessions that were removed due to cache overflow
- * :cache_hits:: Number of successfully reused connections
- * :cache_misses:: Number of sessions proposed by clients that were not found
- * in the cache
- * :cache_num:: Number of sessions in the internal session cache
- * :cb_hits:: Number of sessions retrieved from the external cache in server
- * mode
- * :connect:: Number of started SSL/TLS handshakes in client mode
- * :connect_good:: Number of established SSL/TLS sessions in client mode
- * :connect_renegotiate:: Number of start renegotiations in client mode
- * :timeouts:: Number of sessions proposed by clients that were found in the
- * cache but had expired due to timeouts
*/
static VALUE
ossl_sslctx_get_session_cache_stats(VALUE self)
@@ -1063,7 +891,6 @@ ossl_sslctx_get_session_cache_stats(VALUE self)
* call-seq:
* ctx.flush_sessions(time | nil) -> self
*
- * Removes sessions in the internal cache that have expired at +time+.
*/
static VALUE
ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
@@ -1081,7 +908,7 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
} else if (rb_obj_is_instance_of(arg1, rb_cTime)) {
tm = NUM2LONG(rb_funcall(arg1, rb_intern("to_i"), 0));
} else {
- ossl_raise(rb_eArgError, "arg must be Time or nil");
+ rb_raise(rb_eArgError, "arg must be Time or nil");
}
SSL_CTX_flush_sessions(ctx, (long)tm);
@@ -1095,27 +922,16 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
static void
ossl_ssl_shutdown(SSL *ssl)
{
- int i, rc;
-
if (ssl) {
- /* 4 is from SSL_smart_shutdown() of mod_ssl.c (v2.2.19) */
- /* It says max 2x pending + 2x data = 4 */
- for (i = 0; i < 4; ++i) {
- /*
- * Ignore the case SSL_shutdown returns -1. Empty handshake_func
- * must not happen.
- */
- if (rc = SSL_shutdown(ssl))
- break;
- }
- SSL_clear(ssl);
- ERR_clear_error();
+ SSL_shutdown(ssl);
+ SSL_clear(ssl);
}
}
static void
ossl_ssl_free(SSL *ssl)
{
+ ossl_ssl_shutdown(ssl);
SSL_free(ssl);
}
@@ -1130,11 +946,9 @@ ossl_ssl_s_alloc(VALUE klass)
* SSLSocket.new(io) => aSSLSocket
* SSLSocket.new(io, ctx) => aSSLSocket
*
- * Creates a new SSL socket from +io+ which must be a real ruby object (not an
- * IO-like object that responds to read/write.
- *
- * If +ctx+ is provided the SSL Sockets initial params will be taken from
- * the context.
+ * === Parameters
+ * * +io+ is a real ruby IO object. Not an IO like object that responds to read/write.
+ * * +ctx+ is an OpenSSLSSL::SSLContext.
*
* The OpenSSL::Buffering module provides additional IO methods.
*
@@ -1182,14 +996,14 @@ ossl_ssl_setup(VALUE self)
ssl = SSL_new(ctx);
if (!ssl) {
- ossl_raise(eSSLError, "SSL_new");
+ ossl_raise(eSSLError, "SSL_new:");
}
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");
+ ossl_raise(eSSLError, "SSL_set_tlsext_host_name:");
}
#endif
io = ossl_ssl_get_io(self);
@@ -1204,27 +1018,17 @@ ossl_ssl_setup(VALUE self)
SSL_set_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx, (void*)cb);
cb = ossl_sslctx_get_tmp_dh_cb(v_ctx);
SSL_set_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx, (void*)cb);
- SSL_set_info_callback(ssl, ssl_info_cb);
}
return Qtrue;
}
#ifdef _WIN32
-#define ssl_get_error(ssl, ret) (errno = rb_w32_map_errno(WSAGetLastError()), SSL_get_error((ssl), (ret)))
+#define ssl_get_error(ssl, ret) (errno = rb_w32_map_errno(WSAGetLastError()), SSL_get_error(ssl, ret))
#else
-#define ssl_get_error(ssl, ret) SSL_get_error((ssl), (ret))
+#define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
#endif
-#define ossl_ssl_data_get_struct(v, ssl) \
-do { \
- Data_Get_Struct((v), SSL, (ssl)); \
- if (!(ssl)) { \
- rb_warning("SSL session is not started yet."); \
- return Qnil; \
- } \
-} while (0)
-
static void
write_would_block(int nonblock)
{
@@ -1255,8 +1059,7 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
rb_ivar_set(self, ID_callback_state, Qnil);
- ossl_ssl_data_get_struct(self, ssl);
-
+ Data_Get_Struct(self, SSL, ssl);
GetOpenFile(ossl_ssl_get_io(self), fptr);
for(;;){
ret = func(ssl);
@@ -1291,9 +1094,6 @@ ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
/*
* call-seq:
* ssl.connect => self
- *
- * Initiates an SSL/TLS handshake with a server. The handshake may be started
- * after unencrypted data has been sent over the socket.
*/
static VALUE
ossl_ssl_connect(VALUE self)
@@ -1306,7 +1106,7 @@ ossl_ssl_connect(VALUE self)
* call-seq:
* ssl.connect_nonblock => self
*
- * Initiates the SSL/TLS handshake as a client in non-blocking manner.
+ * initiate the TLS/SSL handshake as a client in non-blocking manner.
*
* # emulates blocking connect
* begin
@@ -1330,9 +1130,6 @@ ossl_ssl_connect_nonblock(VALUE self)
/*
* call-seq:
* ssl.accept => self
- *
- * Waits for a SSL/TLS client to initiate a handshake. The handshake may be
- * started after unencrypted data has been sent over the socket.
*/
static VALUE
ossl_ssl_accept(VALUE self)
@@ -1345,7 +1142,7 @@ ossl_ssl_accept(VALUE self)
* call-seq:
* ssl.accept_nonblock => self
*
- * Initiates the SSL/TLS handshake as a server in non-blocking manner.
+ * initiate the TLS/SSL handshake as a server in non-blocking manner.
*
* # emulates blocking accept
* begin
@@ -1390,7 +1187,7 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
if(!nonblock && SSL_pending(ssl) <= 0)
rb_thread_wait_fd(FPTR_TO_FD(fptr));
for (;;){
- nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
+ nread = SSL_read(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
switch(ssl_get_error(ssl, nread)){
case SSL_ERROR_NONE:
goto end;
@@ -1408,7 +1205,7 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
if(ERR_peek_error() == 0 && nread == 0) rb_eof_error();
rb_sys_fail(0);
default:
- ossl_raise(eSSLError, "SSL_read");
+ ossl_raise(eSSLError, "SSL_read:");
}
}
}
@@ -1425,13 +1222,15 @@ 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
*
- * Reads +length+ bytes from the SSL connection. If a pre-allocated +buffer+
- * is provided the data will be written into it.
+ * === 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)
@@ -1444,11 +1243,9 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self)
* ssl.sysread_nonblock(length) => string
* ssl.sysread_nonblock(length, buffer) => buffer
*
- * A non-blocking version of #sysread. Raises an SSLError if reading would
- * block.
- *
- * Reads +length+ bytes from the SSL connection. If a pre-allocated +buffer+
- * is provided the data will be written into it.
+ * === Parameters
+ * * +length+ is a positive integer.
+ * * +buffer+ is a string used to store the result.
*/
static VALUE
ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
@@ -1469,7 +1266,7 @@ ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
if (ssl) {
for (;;){
- nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
+ nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LEN(str));
switch(ssl_get_error(ssl, nwrite)){
case SSL_ERROR_NONE:
goto end;
@@ -1484,7 +1281,7 @@ ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
case SSL_ERROR_SYSCALL:
if (errno) rb_sys_fail(0);
default:
- ossl_raise(eSSLError, "SSL_write");
+ ossl_raise(eSSLError, "SSL_write:");
}
}
}
@@ -1500,9 +1297,7 @@ ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock)
/*
* call-seq:
- * ssl.syswrite(string) => Integer
- *
- * Writes +string+ to the SSL connection.
+ * ssl.syswrite(string) => integer
*/
static VALUE
ossl_ssl_write(VALUE self, VALUE str)
@@ -1512,10 +1307,7 @@ ossl_ssl_write(VALUE self, VALUE str)
/*
* call-seq:
- * ssl.syswrite_nonblock(string) => Integer
- *
- * Writes +string+ to the SSL connection in a non-blocking manner. Raises an
- * SSLError if writing would block.
+ * ssl.syswrite_nonblock(string) => integer
*/
static VALUE
ossl_ssl_write_nonblock(VALUE self, VALUE str)
@@ -1526,26 +1318,16 @@ ossl_ssl_write_nonblock(VALUE self, VALUE str)
/*
* call-seq:
* ssl.sysclose => nil
- *
- * Shuts down the SSL connection and prepares it for another connection.
*/
static VALUE
ossl_ssl_close(VALUE self)
{
SSL *ssl;
- ossl_ssl_data_get_struct(self, ssl);
-
- if (ssl) {
- VALUE io = ossl_ssl_get_io(self);
- if (!RTEST(rb_funcall(io, rb_intern("closed?"), 0))) {
- ossl_ssl_shutdown(ssl);
- SSL_free(ssl);
- DATA_PTR(self) = NULL;
- if (RTEST(ossl_ssl_get_sync_close(self)))
- rb_funcall(io, rb_intern("close"), 0);
- }
- }
+ Data_Get_Struct(self, SSL, ssl);
+ ossl_ssl_shutdown(ssl);
+ if (RTEST(ossl_ssl_get_sync_close(self)))
+ rb_funcall(ossl_ssl_get_io(self), rb_intern("close"), 0);
return Qnil;
}
@@ -1553,8 +1335,6 @@ ossl_ssl_close(VALUE self)
/*
* call-seq:
* ssl.cert => cert or nil
- *
- * The X509 certificate for this socket endpoint.
*/
static VALUE
ossl_ssl_get_cert(VALUE self)
@@ -1562,7 +1342,11 @@ ossl_ssl_get_cert(VALUE self)
SSL *ssl;
X509 *cert = NULL;
- ossl_ssl_data_get_struct(self, ssl);
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
/*
* Is this OpenSSL bug? Should add a ref?
@@ -1579,8 +1363,6 @@ ossl_ssl_get_cert(VALUE self)
/*
* call-seq:
* ssl.peer_cert => cert or nil
- *
- * The X509 certificate for this socket's peer.
*/
static VALUE
ossl_ssl_get_peer_cert(VALUE self)
@@ -1589,7 +1371,12 @@ ossl_ssl_get_peer_cert(VALUE self)
X509 *cert = NULL;
VALUE obj;
- ossl_ssl_data_get_struct(self, ssl);
+ Data_Get_Struct(self, SSL, ssl);
+
+ if (!ssl){
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
cert = SSL_get_peer_certificate(ssl); /* Adds a ref => Safe to FREE. */
@@ -1605,8 +1392,6 @@ ossl_ssl_get_peer_cert(VALUE self)
/*
* call-seq:
* ssl.peer_cert_chain => [cert, ...] or nil
- *
- * The X509 certificate chain for this socket's peer.
*/
static VALUE
ossl_ssl_get_peer_cert_chain(VALUE self)
@@ -1617,8 +1402,11 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
VALUE ary;
int i, num;
- ossl_ssl_data_get_struct(self, ssl);
-
+ Data_Get_Struct(self, SSL, ssl);
+ if(!ssl){
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
chain = SSL_get_peer_cert_chain(ssl);
if(!chain) return Qnil;
num = sk_X509_num(chain);
@@ -1632,36 +1420,20 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
}
/*
-* call-seq:
-* ssl.version => String
-*
-* Returns a String representing the SSL/TLS version that was negotiated
-* for the connection, for example "TLSv1.2".
-*/
-static VALUE
-ossl_ssl_get_version(VALUE self)
-{
- SSL *ssl;
-
- ossl_ssl_data_get_struct(self, ssl);
-
- return rb_str_new2(SSL_get_version(ssl));
-}
-
-/*
-* call-seq:
-* ssl.cipher => [name, version, bits, alg_bits]
-*
-* The cipher being used for the current connection
-*/
+ * call-seq:
+ * ssl.cipher => [name, version, bits, alg_bits]
+ */
static VALUE
ossl_ssl_get_cipher(VALUE self)
{
SSL *ssl;
SSL_CIPHER *cipher;
- ossl_ssl_data_get_struct(self, ssl);
-
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
return ossl_ssl_cipher_to_ary(cipher);
@@ -1670,8 +1442,6 @@ ossl_ssl_get_cipher(VALUE self)
/*
* call-seq:
* ssl.state => string
- *
- * A description of the current connection state.
*/
static VALUE
ossl_ssl_get_state(VALUE self)
@@ -1679,8 +1449,11 @@ ossl_ssl_get_state(VALUE self)
SSL *ssl;
VALUE ret;
- ossl_ssl_data_get_struct(self, ssl);
-
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
ret = rb_str_new2(SSL_state_string(ssl));
if (ruby_verbose) {
rb_str_cat2(ret, ": ");
@@ -1691,47 +1464,49 @@ ossl_ssl_get_state(VALUE self)
/*
* call-seq:
- * ssl.pending => Integer
- *
- * The number of bytes that are immediately available for reading
+ * ssl.pending => integer
*/
static VALUE
ossl_ssl_pending(VALUE self)
{
SSL *ssl;
- ossl_ssl_data_get_struct(self, ssl);
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
return INT2NUM(SSL_pending(ssl));
}
/*
- * call-seq:
- * ssl.session_reused? -> true | false
+ * call-seq:
+ * ssl.session_reused? -> true | false
*
- * Returns true if a reused session was negotiated during the handshake.
*/
static VALUE
ossl_ssl_session_reused(VALUE self)
{
SSL *ssl;
- ossl_ssl_data_get_struct(self, ssl);
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
switch(SSL_session_reused(ssl)) {
case 1: return Qtrue;
case 0: return Qfalse;
default: ossl_raise(eSSLError, "SSL_session_reused");
}
-
- UNREACHABLE;
}
/*
- * call-seq:
- * ssl.session = session -> session
+ * call-seq:
+ * ssl.session = session -> session
*
- * Sets the Session to be used when the connection is established.
*/
static VALUE
ossl_ssl_set_session(VALUE self, VALUE arg1)
@@ -1742,7 +1517,11 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
/* why is ossl_ssl_setup delayed? */
ossl_ssl_setup(self);
- ossl_ssl_data_get_struct(self, ssl);
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
SafeGetSSLSession(arg1, sess);
@@ -1752,81 +1531,28 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
return arg1;
}
-/*
- * call-seq:
- * ssl.verify_result => Integer
- *
- * Returns the result of the peer certificates verification. See verify(1)
- * for error values and descriptions.
- *
- * If no peer certificate was presented X509_V_OK is returned.
- */
static VALUE
ossl_ssl_get_verify_result(VALUE self)
{
SSL *ssl;
- ossl_ssl_data_get_struct(self, ssl);
+ Data_Get_Struct(self, SSL, ssl);
+ if (!ssl) {
+ rb_warning("SSL session is not started yet.");
+ return Qnil;
+ }
return INT2FIX(SSL_get_verify_result(ssl));
}
-/*
- * call-seq:
- * ssl.client_ca => [x509name, ...]
- *
- * Returns the list of client CAs. Please note that in contrast to
- * SSLContext#client_ca= no array of X509::Certificate is returned but
- * X509::Name instances of the CA's subject distinguished name.
- *
- * In server mode, returns the list set by SSLContext#client_ca=.
- * In client mode, returns the list of client CAs sent from the server.
- */
-static VALUE
-ossl_ssl_get_client_ca_list(VALUE self)
-{
- SSL *ssl;
- STACK_OF(X509_NAME) *ca;
-
- ossl_ssl_data_get_struct(self, ssl);
-
- ca = SSL_get_client_CA_list(ssl);
- return ossl_x509name_sk2ary(ca);
-}
-
-#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
-/*
- * call-seq:
- * ssl.npn_protocol => String
- *
- * Returns the protocol string that was finally selected by the client
- * during the handshake.
- */
-static VALUE
-ossl_ssl_npn_protocol(VALUE self)
-{
- SSL *ssl;
- const unsigned char *out;
- unsigned int outlen;
-
- ossl_ssl_data_get_struct(self, ssl);
-
- SSL_get0_next_proto_negotiated(ssl, &out, &outlen);
- if (!outlen)
- return Qnil;
- else
- return rb_str_new((const char *) out, outlen);
-}
-#endif
-
void
Init_ossl_ssl()
{
int i;
VALUE ary;
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
#endif
ID_callback_state = rb_intern("@callback_state");
@@ -1839,230 +1565,23 @@ Init_ossl_ssl()
ossl_ssl_ex_tmp_dh_callback_idx =
SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
- /* Document-module: OpenSSL::SSL
- *
- * Use SSLContext to set up the parameters for a TLS (former SSL)
- * connection. Both client and server TLS connections are supported,
- * SSLSocket and SSLServer may be used in conjunction with an instance
- * of SSLContext to set up connections.
- */
mSSL = rb_define_module_under(mOSSL, "SSL");
- /* Document-class: OpenSSL::SSL::SSLError
- *
- * Generic error class raised by SSLSocket and SSLContext.
- */
eSSLError = rb_define_class_under(mSSL, "SSLError", eOSSLError);
Init_ossl_ssl_session();
- /* Document-class: OpenSSL::SSL::SSLContext
- *
- * An SSLContext is used to set various options regarding certificates,
- * algorithms, verification, session caching, etc. The SSLContext is
- * used to create an SSLSocket.
+ /* class SSLContext
*
- * All attributes must be set before creating an SSLSocket as the
- * SSLContext will be frozen afterward.
- *
- * The following attributes are available but don't show up in rdoc:
+ * The following attributes are available but don't show up in rdoc.
+ * All attributes must be set before calling SSLSocket.new(io, ctx).
* * ssl_version, cert, key, client_ca, ca_file, ca_path, timeout,
* * verify_mode, verify_depth client_cert_cb, tmp_dh_callback,
* * session_id_context, session_add_cb, session_new_cb, session_remove_cb
*/
cSSLContext = rb_define_class_under(mSSL, "SSLContext", rb_cObject);
rb_define_alloc_func(cSSLContext, ossl_sslctx_s_alloc);
-
- /*
- * Context certificate
- */
- rb_attr(cSSLContext, rb_intern("cert"), 1, 1, Qfalse);
-
- /*
- * Context private key
- */
- rb_attr(cSSLContext, rb_intern("key"), 1, 1, Qfalse);
-
- /*
- * A certificate or Array of certificates that will be sent to the client.
- */
- rb_attr(cSSLContext, rb_intern("client_ca"), 1, 1, Qfalse);
-
- /*
- * The path to a file containing a PEM-format CA certificate
- */
- rb_attr(cSSLContext, rb_intern("ca_file"), 1, 1, Qfalse);
-
- /*
- * The path to a directory containing CA certificates in PEM format.
- *
- * Files are looked up by subject's X509 name's hash value.
- */
- rb_attr(cSSLContext, rb_intern("ca_path"), 1, 1, Qfalse);
-
- /*
- * Maximum session lifetime.
- */
- rb_attr(cSSLContext, rb_intern("timeout"), 1, 1, Qfalse);
-
- /*
- * Session verification mode.
- *
- * Valid modes are VERIFY_NONE, VERIFY_PEER, VERIFY_CLIENT_ONCE,
- * VERIFY_FAIL_IF_NO_PEER_CERT and defined on OpenSSL::SSL
- */
- rb_attr(cSSLContext, rb_intern("verify_mode"), 1, 1, Qfalse);
-
- /*
- * Number of CA certificates to walk when verifying a certificate chain.
- */
- rb_attr(cSSLContext, rb_intern("verify_depth"), 1, 1, Qfalse);
-
- /*
- * A callback for additional certificate verification. The callback is
- * invoked for each certificate in the chain.
- *
- * The callback is invoked with two values. +preverify_ok+ indicates
- * indicates if the verification was passed (true) or not (false).
- * +store_context+ is an OpenSSL::X509::StoreContext containing the
- * context used for certificate verification.
- *
- * If the callback returns false verification is stopped.
- */
- rb_attr(cSSLContext, rb_intern("verify_callback"), 1, 1, Qfalse);
-
- /*
- * Sets various OpenSSL options.
- */
- rb_attr(cSSLContext, rb_intern("options"), 1, 1, Qfalse);
-
- /*
- * An OpenSSL::X509::Store used for certificate verification
- */
- rb_attr(cSSLContext, rb_intern("cert_store"), 1, 1, Qfalse);
-
- /*
- * An Array of extra X509 certificates to be added to the certificate
- * chain.
- */
- rb_attr(cSSLContext, rb_intern("extra_chain_cert"), 1, 1, Qfalse);
-
- /*
- * A callback invoked when a client certificate is requested by a server
- * and no certificate has been set.
- *
- * The callback is invoked with a Session and must return an Array
- * containing an OpenSSL::X509::Certificate and an OpenSSL::PKey. If any
- * other value is returned the handshake is suspended.
- */
- rb_attr(cSSLContext, rb_intern("client_cert_cb"), 1, 1, Qfalse);
-
- /*
- * A callback invoked when DH parameters are required.
- *
- * The callback is invoked with the Session for the key exchange, an
- * flag indicating the use of an export cipher and the keylength
- * required.
- *
- * The callback must return an OpenSSL::PKey::DH instance of the correct
- * key length.
- */
- rb_attr(cSSLContext, rb_intern("tmp_dh_callback"), 1, 1, Qfalse);
-
- /*
- * Sets the context in which a session can be reused. This allows
- * sessions for multiple applications to be distinguished, for exapmle, by
- * name.
- */
- rb_attr(cSSLContext, rb_intern("session_id_context"), 1, 1, Qfalse);
-
- /*
- * A callback invoked on a server when a session is proposed by the client
- * but the session could not be found in the server's internal cache.
- *
- * The callback is invoked with the SSLSocket and session id. The
- * callback may return a Session from an external cache.
- */
- rb_attr(cSSLContext, rb_intern("session_get_cb"), 1, 1, Qfalse);
-
- /*
- * A callback invoked when a new session was negotiatied.
- *
- * The callback is invoked with an SSLSocket. If false is returned the
- * session will be removed from the internal cache.
- */
- rb_attr(cSSLContext, rb_intern("session_new_cb"), 1, 1, Qfalse);
-
- /*
- * A callback invoked when a session is removed from the internal cache.
- *
- * The callback is invoked with an SSLContext and a Session.
- */
- rb_attr(cSSLContext, rb_intern("session_remove_cb"), 1, 1, Qfalse);
-
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
- /*
- * A callback invoked at connect time to distinguish between multiple
- * server names.
- *
- * The callback is invoked with an SSLSocket and a server name. The
- * callback must return an SSLContext for the server name or nil.
- */
- rb_attr(cSSLContext, rb_intern("servername_cb"), 1, 1, Qfalse);
-#endif
- /*
- * A callback invoked whenever a new handshake is initiated. May be used
- * to disable renegotiation entirely.
- *
- * The callback is invoked with the active SSLSocket. The callback's
- * return value is irrelevant, normal return indicates "approval" of the
- * renegotiation and will continue the process. To forbid renegotiation
- * and to cancel the process, an Error may be raised within the callback.
- *
- * === Disable client renegotiation
- *
- * When running a server, it is often desirable to disable client
- * renegotiation entirely. You may use a callback as follows to implement
- * this feature:
- *
- * num_handshakes = 0
- * ctx.renegotiation_cb = lambda do |ssl|
- * num_handshakes += 1
- * raise RuntimeError.new("Client renegotiation disabled") if num_handshakes > 1
- * end
- */
- rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse);
-#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
- /*
- * An Enumerable of Strings. Each String represents a protocol to be
- * advertised as the list of supported protocols for Next Protocol
- * Negotiation. Supported in OpenSSL 1.0.1 and higher. Has no effect
- * on the client side. If not set explicitly, the NPN extension will
- * not be sent by the server in the handshake.
- *
- * === Example
- *
- * ctx.npn_protocols = ["http/1.1", "spdy/2"]
- */
- rb_attr(cSSLContext, rb_intern("npn_protocols"), 1, 1, Qfalse);
- /*
- * A callback invoked on the client side when the client needs to select
- * a protocol from the list sent by the server. Supported in OpenSSL 1.0.1
- * and higher. The client MUST select a protocol of those advertised by
- * the server. If none is acceptable, raising an error in the callback
- * will cause the handshake to fail. Not setting this callback explicitly
- * means not supporting the NPN extension on the client - any protocols
- * advertised by the server will be ignored.
- *
- * === Example
- *
- * ctx.npn_select_cb = lambda do |protocols|
- * #inspect the protocols and select one
- * protocols.first
- * end
- */
- rb_attr(cSSLContext, rb_intern("npn_select_cb"), 1, 1, Qfalse);
-#endif
-
+ for(i = 0; i < numberof(ossl_sslctx_attrs); i++)
+ rb_attr(cSSLContext, rb_intern(ossl_sslctx_attrs[i]), 1, 1, Qfalse);
rb_define_alias(cSSLContext, "ssl_timeout", "timeout");
rb_define_alias(cSSLContext, "ssl_timeout=", "timeout=");
rb_define_method(cSSLContext, "initialize", ossl_sslctx_initialize, -1);
@@ -2072,53 +1591,15 @@ Init_ossl_ssl()
rb_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0);
- /*
- * No session caching for client or server
- */
- rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
- /*
- * Client sessions are added to the session cache
- */
+ rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
-
- /*
- * Server sessions are added to the session cache
- */
rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2FIX(SSL_SESS_CACHE_SERVER));
-
- /*
- * Both client and server sessions are added to the session cache
- */
rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2FIX(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
-
- /*
- * Normally the session cache is checked for expired sessions every 255
- * connections. Since this may lead to a delay that cannot be controlled,
- * the automatic flushing may be disabled and #flush_sessions can be
- * called explicitly.
- */
rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2FIX(SSL_SESS_CACHE_NO_AUTO_CLEAR));
-
- /*
- * Always perform external lookups of sessions even if they are in the
- * internal cache.
- *
- * This flag has no effect on clients
- */
rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
-
- /*
- * Never automatically store sessions in the internal store.
- */
rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_STORE));
-
- /*
- * Enables both SESSION_CACHE_NO_INTERNAL_LOOKUP and
- * SESSION_CACHE_NO_INTERNAL_STORE.
- */
rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL));
-
rb_define_method(cSSLContext, "session_add", ossl_sslctx_session_add, 1);
rb_define_method(cSSLContext, "session_remove", ossl_sslctx_session_remove, 1);
rb_define_method(cSSLContext, "session_cache_mode", ossl_sslctx_get_session_cache_mode, 0);
@@ -2133,11 +1614,10 @@ Init_ossl_ssl()
rb_ary_push(ary, ID2SYM(rb_intern(ossl_ssl_method_tab[i].name)));
}
rb_obj_freeze(ary);
- /* The list of available SSL/TLS methods */
+ /* holds a list of available SSL/TLS methods */
rb_define_const(cSSLContext, "METHODS", ary);
- /*
- * Document-class: OpenSSL::SSL::SSLSocket
+ /* class SSLSocket
*
* The following attributes are available but don't show up in rdoc.
* * io, context, sync_close
@@ -2163,18 +1643,12 @@ Init_ossl_ssl()
rb_define_method(cSSLSocket, "cert", ossl_ssl_get_cert, 0);
rb_define_method(cSSLSocket, "peer_cert", ossl_ssl_get_peer_cert, 0);
rb_define_method(cSSLSocket, "peer_cert_chain", ossl_ssl_get_peer_cert_chain, 0);
- rb_define_method(cSSLSocket, "ssl_version", ossl_ssl_get_version, 0);
rb_define_method(cSSLSocket, "cipher", ossl_ssl_get_cipher, 0);
rb_define_method(cSSLSocket, "state", ossl_ssl_get_state, 0);
rb_define_method(cSSLSocket, "pending", ossl_ssl_pending, 0);
rb_define_method(cSSLSocket, "session_reused?", ossl_ssl_session_reused, 0);
- /* implementation of OpenSSL::SSL::SSLSocket#session is in lib/openssl/ssl.rb */
rb_define_method(cSSLSocket, "session=", ossl_ssl_set_session, 1);
rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
- rb_define_method(cSSLSocket, "client_ca", ossl_ssl_get_client_ca_list, 0);
-#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
- rb_define_method(cSSLSocket, "npn_protocol", ossl_ssl_npn_protocol, 0);
-#endif
#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2NUM(SSL_##x))
@@ -2191,9 +1665,7 @@ Init_ossl_ssl()
ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG);
ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER);
-#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING)
ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
-#endif
ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG);
ossl_ssl_def_const(OP_TLS_D5_BUG);
ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG);
@@ -2214,18 +1686,9 @@ Init_ossl_ssl()
ossl_ssl_def_const(OP_NO_SSLv2);
ossl_ssl_def_const(OP_NO_SSLv3);
ossl_ssl_def_const(OP_NO_TLSv1);
-#if defined(SSL_OP_NO_TLSv1_1)
- ossl_ssl_def_const(OP_NO_TLSv1_1);
-#endif
-#if defined(SSL_OP_NO_TLSv1_2)
- ossl_ssl_def_const(OP_NO_TLSv1_2);
-#endif
#if defined(SSL_OP_NO_TICKET)
ossl_ssl_def_const(OP_NO_TICKET);
#endif
-#if defined(SSL_OP_NO_COMPRESSION)
- ossl_ssl_def_const(OP_NO_COMPRESSION);
-#endif
ossl_ssl_def_const(OP_PKCS1_CHECK_1);
ossl_ssl_def_const(OP_PKCS1_CHECK_2);
ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index 034762fc46..92df5f5599 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -12,15 +12,15 @@
#define _OSSL_SSL_H_
#define GetSSLSession(obj, sess) do { \
- Data_Get_Struct((obj), SSL_SESSION, (sess)); \
- if (!(sess)) { \
+ Data_Get_Struct(obj, SSL_SESSION, sess); \
+ if (!sess) { \
ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
} \
} while (0)
#define SafeGetSSLSession(obj, sess) do { \
- OSSL_Check_Kind((obj), cSSLSession); \
- GetSSLSession((obj), (sess)); \
+ OSSL_Check_Kind(obj, cSSLSession); \
+ GetSSLSession(obj, sess); \
} while (0)
extern VALUE mSSL;
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index a7437caf37..8df6ba4df3 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -5,15 +5,15 @@
#include "ossl.h"
#define GetSSLSession(obj, sess) do { \
- Data_Get_Struct((obj), SSL_SESSION, (sess)); \
- if (!(sess)) { \
+ Data_Get_Struct(obj, SSL_SESSION, sess); \
+ if (!sess) { \
ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
} \
} while (0)
#define SafeGetSSLSession(obj, sess) do { \
- OSSL_Check_Kind((obj), cSSLSession); \
- GetSSLSession((obj), (sess)); \
+ OSSL_Check_Kind(obj, cSSLSession); \
+ GetSSLSession(obj, sess); \
} while (0)
@@ -53,7 +53,7 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
if (!ctx) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
ctx = d2i_SSL_SESSION_bio(in, NULL);
}
@@ -176,6 +176,9 @@ static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
long t;
GetSSLSession(self, ctx);
+ if (rb_obj_is_instance_of(time_v, rb_cTime)) {
+ time_v = rb_funcall(time_v, rb_intern("to_i"), 0);
+ }
t = NUM2LONG(time_v);
SSL_SESSION_set_timeout(ctx, t);
return ossl_ssl_session_get_timeout(self);
@@ -211,21 +214,20 @@ static VALUE ossl_ssl_session_get_id(VALUE self)
static VALUE ossl_ssl_session_to_der(VALUE self)
{
SSL_SESSION *ctx;
- unsigned char *p;
+ unsigned char buf[1024*10], *p;
int len;
- VALUE str;
GetSSLSession(self, ctx);
- len = i2d_SSL_SESSION(ctx, NULL);
- if (len <= 0) {
+
+ p = buf;
+ len = i2d_SSL_SESSION(ctx, &p);
+
+ if (len <= 0)
ossl_raise(eSSLSession, "i2d_SSL_SESSION");
- }
+ else if (len >= sizeof(buf))
+ ossl_raise(eSSLSession, "i2d_SSL_SESSION too large");
- str = rb_str_new(0, len);
- p = (unsigned char *)RSTRING_PTR(str);
- i2d_SSL_SESSION(ctx, &p);
- ossl_str_adjust(str, p);
- return str;
+ return rb_str_new((const char *) p, len);
}
/*
@@ -295,8 +297,8 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
void Init_ossl_ssl_session(void)
{
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+#if 0 /* let rdoc know about mOSSL */
+ mOSSL = rb_define_module("OpenSSL");
mSSL = rb_define_module_under(mOSSL, "SSL");
#endif
cSSLSession = rb_define_class_under(mSSL, "Session", rb_cObject);
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index 1f36ca8b12..1ab13692d4 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -11,20 +11,20 @@
#include "ossl.h"
#define WrapX509Attr(klass, obj, attr) do { \
- if (!(attr)) { \
+ if (!attr) { \
ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_ATTRIBUTE_free, (attr)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_ATTRIBUTE_free, attr); \
} while (0)
#define GetX509Attr(obj, attr) do { \
- Data_Get_Struct((obj), X509_ATTRIBUTE, (attr)); \
- if (!(attr)) { \
+ Data_Get_Struct(obj, X509_ATTRIBUTE, attr); \
+ if (!attr) { \
ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509Attr(obj, attr) do { \
- OSSL_Check_Kind((obj), cX509Attr); \
- GetX509Attr((obj), (attr)); \
+ OSSL_Check_Kind(obj, cX509Attr); \
+ GetX509Attr(obj, attr); \
} while (0)
/*
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index 85bbc0d081..0217ffc0e1 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -11,20 +11,20 @@
#include "ossl.h"
#define WrapX509(klass, obj, x509) do { \
- if (!(x509)) { \
+ if (!x509) { \
ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_free, (x509)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_free, x509); \
} while (0)
#define GetX509(obj, x509) do { \
- Data_Get_Struct((obj), X509, (x509)); \
- if (!(x509)) { \
+ Data_Get_Struct(obj, X509, x509); \
+ if (!x509) { \
ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509(obj, x509) do { \
- OSSL_Check_Kind((obj), cX509Cert); \
- GetX509((obj), (x509)); \
+ OSSL_Check_Kind(obj, cX509Cert); \
+ GetX509(obj, x509); \
} while (0)
/*
@@ -66,13 +66,11 @@ ossl_x509_new_from_file(VALUE filename)
if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
ossl_raise(eX509CertError, "%s", strerror(errno));
}
- rb_fd_fix_cloexec(fileno(fp));
x509 = PEM_read_X509(fp, NULL, NULL, NULL);
/*
* prepare for DER...
#if !defined(OPENSSL_NO_FP_API)
if (!x509) {
- (void)ERR_get_error();
rewind(fp);
x509 = d2i_X509_fp(fp, NULL);
@@ -148,7 +146,7 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
DATA_PTR(self) = x;
if (!x509) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
x509 = d2i_X509_bio(in, &x);
DATA_PTR(self) = x;
}
@@ -490,7 +488,7 @@ ossl_x509_get_not_after(VALUE self)
/*
* call-seq:
- * cert.not_after = time => time
+ * cert.not_before = time => time
*/
static VALUE
ossl_x509_set_not_after(VALUE self, VALUE time)
@@ -693,15 +691,35 @@ ossl_x509_add_extension(VALUE self, VALUE extension)
static VALUE
ossl_x509_inspect(VALUE self)
{
- return rb_sprintf("#<%"PRIsVALUE": subject=%+"PRIsVALUE", "
- "issuer=%+"PRIsVALUE", serial=%+"PRIsVALUE", "
- "not_before=%+"PRIsVALUE", not_after=%+"PRIsVALUE">",
- rb_obj_class(self),
- ossl_x509_get_subject(self),
- ossl_x509_get_issuer(self),
- ossl_x509_get_serial(self),
- ossl_x509_get_not_before(self),
- ossl_x509_get_not_after(self));
+ VALUE str;
+ const char *cname = rb_class2name(rb_obj_class(self));
+
+ str = rb_str_new2("#<");
+ rb_str_cat2(str, cname);
+ rb_str_cat2(str, " ");
+
+ rb_str_cat2(str, "subject=");
+ rb_str_append(str, rb_inspect(ossl_x509_get_subject(self)));
+ rb_str_cat2(str, ", ");
+
+ rb_str_cat2(str, "issuer=");
+ rb_str_append(str, rb_inspect(ossl_x509_get_issuer(self)));
+ rb_str_cat2(str, ", ");
+
+ rb_str_cat2(str, "serial=");
+ rb_str_append(str, rb_inspect(ossl_x509_get_serial(self)));
+ rb_str_cat2(str, ", ");
+
+ rb_str_cat2(str, "not_before=");
+ rb_str_append(str, rb_inspect(ossl_x509_get_not_before(self)));
+ rb_str_cat2(str, ", ");
+
+ rb_str_cat2(str, "not_after=");
+ rb_str_append(str, rb_inspect(ossl_x509_get_not_after(self)));
+
+ str = rb_str_cat2(str, ">");
+
+ return str;
}
/*
@@ -710,106 +728,8 @@ ossl_x509_inspect(VALUE self)
void
Init_ossl_x509cert()
{
-
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
- mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
- /* Document-class: OpenSSL::X509::Certificate
- *
- * Implementation of an X.509 certificate as specified in RFC 5280.
- * Provides access to a certificate's attributes and allows certificates
- * to be read from a string, but also supports the creation of new
- * certificates from scratch.
- *
- * === Reading a certificate from a file
- *
- * Certificate is capable of handling DER-encoded certificates and
- * certificates encoded in OpenSSL's PEM format.
- *
- * raw = File.read "cert.cer" # DER- or PEM-encoded
- * certificate = OpenSSL::X509::Certificate.new raw
- *
- * === Saving a certificate to a file
- *
- * A certificate may be encoded in DER format
- *
- * cert = ...
- * File.open("cert.cer", "wb") { |f| f.print cert.to_der }
- *
- * or in PEM format
- *
- * cert = ...
- * File.open("cert.pem", "wb") { |f| f.print cert.to_pem }
- *
- * X.509 certificates are associated with a private/public key pair,
- * typically a RSA, DSA or ECC key (see also OpenSSL::PKey::RSA,
- * OpenSSL::PKey::DSA and OpenSSL::PKey::EC), the public key itself is
- * stored within the certificate and can be accessed in form of an
- * OpenSSL::PKey. Certificates are typically used to be able to associate
- * some form of identity with a key pair, for example web servers serving
- * pages over HTTPs use certificates to authenticate themselves to the user.
- *
- * The public key infrastructure (PKI) model relies on trusted certificate
- * authorities ("root CAs") that issue these certificates, so that end
- * users need to base their trust just on a selected few authorities
- * that themselves again vouch for subordinate CAs issuing their
- * certificates to end users.
- *
- * The OpenSSL::X509 module provides the tools to set up an independent
- * PKI, similar to scenarios where the 'openssl' command line tool is
- * used for issuing certificates in a private PKI.
- *
- * === Creating a root CA certificate and an end-entity certificate
- *
- * First, we need to create a "self-signed" root certificate. To do so,
- * we need to generate a key first. Please note that the choice of "1"
- * as a serial number is considered a security flaw for real certificates.
- * Secure choices are integers in the two-digit byte range and ideally
- * not sequential but secure random numbers, steps omitted here to keep
- * the example concise.
- *
- * root_key = OpenSSL::PKey::RSA.new 2048 # the CA's public/private key
- * root_ca = OpenSSL::X509::Certificate.new
- * root_ca.version = 2 # cf. RFC 5280 - to make it a "v3" certificate
- * root_ca.serial = 1
- * root_ca.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=Ruby CA"
- * root_ca.issuer = root_ca.subject # root CA's are "self-signed"
- * root_ca.public_key = root_key.public_key
- * root_ca.not_before = Time.now
- * root_ca.not_after = root_ca.not_before + 2 * 365 * 24 * 60 * 60 # 2 years validity
- * ef = OpenSSL::X509::ExtensionFactory.new
- * ef.subject_certificate = root_ca
- * ef.issuer_certificate = root_ca
- * root_ca.add_extension(ef.create_extension("basicConstraints","CA:TRUE",true))
- * root_ca.add_extension(ef.create_extension("keyUsage","keyCertSign, cRLSign", true))
- * root_ca.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
- * root_ca.add_extension(ef.create_extension("authorityKeyIdentifier","keyid:always",false))
- * root_ca.sign(root_key, OpenSSL::Digest::SHA256.new)
- *
- * The next step is to create the end-entity certificate using the root CA
- * certificate.
- *
- * key = OpenSSL::PKey::RSA.new 2048
- * cert = OpenSSL::X509::Certificate.new
- * cert.version = 2
- * cert.serial = 2
- * cert.subject = OpenSSL::X509::Name.parse "/DC=org/DC=ruby-lang/CN=Ruby certificate"
- * cert.issuer = root_ca.subject # root CA is the issuer
- * cert.public_key = key.public_key
- * cert.not_before = Time.now
- * cert.not_after = cert.not_before + 1 * 365 * 24 * 60 * 60 # 1 years validity
- * ef = OpenSSL::X509::ExtensionFactory.new
- * ef.subject_certificate = cert
- * ef.issuer_certificate = root_ca
- * cert.add_extension(ef.create_extension("keyUsage","digitalSignature", true))
- * cert.add_extension(ef.create_extension("subjectKeyIdentifier","hash",false))
- * cert.sign(root_key, OpenSSL::Digest::SHA256.new)
- *
- */
cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
rb_define_alloc_func(cX509Cert, ossl_x509_alloc);
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index dec13c8cae..d0221a18bc 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -11,20 +11,20 @@
#include "ossl.h"
#define WrapX509CRL(klass, obj, crl) do { \
- if (!(crl)) { \
+ if (!crl) { \
ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_CRL_free, (crl)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_CRL_free, crl); \
} while (0)
#define GetX509CRL(obj, crl) do { \
- Data_Get_Struct((obj), X509_CRL, (crl)); \
- if (!(crl)) { \
+ Data_Get_Struct(obj, X509_CRL, crl); \
+ if (!crl) { \
ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509CRL(obj, crl) do { \
- OSSL_Check_Kind((obj), cX509CRL); \
- GetX509CRL((obj), (crl)); \
+ OSSL_Check_Kind(obj, cX509CRL); \
+ GetX509CRL(obj, crl); \
} while (0)
/*
@@ -102,7 +102,7 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
DATA_PTR(self) = x;
if (!crl) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
crl = d2i_X509_CRL_bio(in, &x);
DATA_PTR(self) = x;
}
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index bd2e1dd2fa..416730b9b1 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -11,30 +11,30 @@
#include "ossl.h"
#define WrapX509Ext(klass, obj, ext) do { \
- if (!(ext)) { \
+ if (!ext) { \
ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_EXTENSION_free, (ext)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_EXTENSION_free, ext); \
} while (0)
#define GetX509Ext(obj, ext) do { \
- Data_Get_Struct((obj), X509_EXTENSION, (ext)); \
- if (!(ext)) { \
+ Data_Get_Struct(obj, X509_EXTENSION, ext); \
+ if (!ext) { \
ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509Ext(obj, ext) do { \
- OSSL_Check_Kind((obj), cX509Ext); \
- GetX509Ext((obj), (ext)); \
+ OSSL_Check_Kind(obj, cX509Ext); \
+ GetX509Ext(obj, ext); \
} while (0)
#define MakeX509ExtFactory(klass, obj, ctx) do { \
- if (!((ctx) = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
+ if (!(ctx = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
ossl_raise(rb_eRuntimeError, "CTX wasn't allocated!"); \
- X509V3_set_ctx((ctx), NULL, NULL, NULL, NULL, 0); \
- (obj) = Data_Wrap_Struct((klass), 0, ossl_x509extfactory_free, (ctx)); \
+ X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, 0); \
+ obj = Data_Wrap_Struct(klass, 0, ossl_x509extfactory_free, ctx); \
} while (0)
#define GetX509ExtFactory(obj, ctx) do { \
- Data_Get_Struct((obj), X509V3_CTX, (ctx)); \
- if (!(ctx)) { \
+ Data_Get_Struct(obj, X509V3_CTX, ctx); \
+ if (!ctx) { \
ossl_raise(rb_eRuntimeError, "CTX wasn't initialized!"); \
} \
} while (0)
@@ -270,18 +270,6 @@ ossl_x509ext_alloc(VALUE klass)
return obj;
}
-/*
- * call-seq:
- * OpenSSL::X509::Extension.new asn1
- * OpenSSL::X509::Extension.new name, value
- * OpenSSL::X509::Extension.new name, value, critical
- *
- * Creates an X509 extension.
- *
- * The extension may be created from +asn1+ data or from an extension +name+
- * and +value+. The +name+ may be either an OID or an extension name. If
- * +critical+ is true the extension is marked critical.
- */
static VALUE
ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
{
@@ -340,7 +328,7 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
OPENSSL_free(s);
ossl_raise(eX509ExtError, NULL);
}
- if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LENINT(data))){
+ if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LEN(data))){
OPENSSL_free(s);
ASN1_OCTET_STRING_free(asn1s);
ossl_raise(eX509ExtError, NULL);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 4b397055ab..fe53a86dc0 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -11,20 +11,20 @@
#include "ossl.h"
#define WrapX509Name(klass, obj, name) do { \
- if (!(name)) { \
+ if (!name) { \
ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_NAME_free, (name)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_NAME_free, name); \
} while (0)
#define GetX509Name(obj, name) do { \
- Data_Get_Struct((obj), X509_NAME, (name)); \
- if (!(name)) { \
+ Data_Get_Struct(obj, X509_NAME, name); \
+ if (!name) { \
ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
} \
} while (0)
#define SafeGetX509Name(obj, name) do { \
- OSSL_Check_Kind((obj), cX509Name); \
- GetX509Name((obj), (name)); \
+ OSSL_Check_Kind(obj, cX509Name); \
+ GetX509Name(obj, name); \
} while (0)
#define OBJECT_TYPE_TEMPLATE \
@@ -89,7 +89,7 @@ ossl_x509name_alloc(VALUE klass)
static ID id_aref;
static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE);
-#define rb_aref(obj, key) rb_funcall((obj), id_aref, 1, (key))
+#define rb_aref(obj, key) rb_funcall(obj, id_aref, 1, key)
static VALUE
ossl_x509name_init_i(VALUE i, VALUE args)
@@ -111,23 +111,10 @@ ossl_x509name_init_i(VALUE i, VALUE args)
/*
* call-seq:
- * X509::Name.new => name
- * X509::Name.new(der) => name
- * X509::Name.new(distinguished_name) => name
- * X509::Name.new(distinguished_name, template) => name
- *
- * Creates a new Name.
- *
- * A name may be created from a DER encoded string +der+, an Array
- * representing a +distinguished_name+ or a +distinguished_name+ along with a
- * +template+.
- *
- * name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']]
- *
- * name = OpenSSL::X509::Name.new name.to_der
- *
- * See add_entry for a description of the +distinguished_name+ Array's
- * contents
+ * X509::Name.new => name
+ * X509::Name.new(string) => name
+ * X509::Name.new(dn) => name
+ * X509::Name.new(dn, template) => name
*/
static VALUE
ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
@@ -167,16 +154,6 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
* name.add_entry(oid, value [, type]) => self
- *
- * Adds a new entry with the given +oid+ and +value+ to this name. The +oid+
- * is an object identifier defined in ASN.1. Some common OIDs are:
- *
- * C:: Country Name
- * CN:: Common Name
- * DC:: Domain Component
- * O:: Organization Name
- * OU:: Organizational Unit Name
- * ST:: State or Province Name
*/
static
VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
@@ -190,7 +167,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_LENINT(value), -1, 0)) {
+ (const unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
ossl_raise(eX509NameError, NULL);
}
@@ -215,14 +192,7 @@ ossl_x509name_to_s_old(VALUE self)
/*
* call-seq:
* name.to_s => string
- * name.to_s(flags) => string
- *
- * Returns this name as a Distinguished Name string. +flags+ may be one of:
- *
- * * OpenSSL::X509::Name::COMPAT
- * * OpenSSL::X509::Name::RFC2253
- * * OpenSSL::X509::Name::ONELINE
- * * OpenSSL::X509::Name::MULTILINE
+ * name.to_s(integer) => string
*/
static VALUE
ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
@@ -251,19 +221,16 @@ ossl_x509name_to_s(int argc, VALUE *argv, VALUE self)
/*
* call-seq:
* name.to_a => [[name, data, type], ...]
- *
- * Returns an Array representation of the distinguished name suitable for
- * passing to ::new
*/
static VALUE
ossl_x509name_to_a(VALUE self)
{
X509_NAME *name;
X509_NAME_ENTRY *entry;
- int i,entries,nid;
+ int i,entries;
char long_name[512];
const char *short_name;
- VALUE ary, vname, ret;
+ VALUE ary, ret;
GetX509Name(self, name);
entries = X509_NAME_entry_count(name);
@@ -279,15 +246,8 @@ ossl_x509name_to_a(VALUE self)
if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name), entry->object)) {
ossl_raise(eX509NameError, NULL);
}
- nid = OBJ_ln2nid(long_name);
- if (nid == NID_undef) {
- vname = rb_str_new2((const char *) &long_name);
- } else {
- short_name = OBJ_nid2sn(nid);
- vname = rb_str_new2(short_name); /*do not free*/
- }
- ary = rb_ary_new3(3,
- vname,
+ 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),
INT2FIX(entry->value->type));
rb_ary_push(ret, ary);
@@ -306,14 +266,6 @@ ossl_x509name_cmp0(VALUE self, VALUE other)
return X509_NAME_cmp(name1, name2);
}
-/*
- * call-seq:
- * name.cmp other => integer
- * name.<=> other => integer
- *
- * Compares this Name with +other+ and returns 0 if they are the same and -1 or
- * +1 if they are greater or less than each other respectively.
- */
static VALUE
ossl_x509name_cmp(VALUE self, VALUE other)
{
@@ -326,12 +278,6 @@ ossl_x509name_cmp(VALUE self, VALUE other)
return INT2FIX(0);
}
-/*
- * call-seq:
- * name.eql? other => boolean
- *
- * Returns true if +name+ and +other+ refer to the same hash key.
- */
static VALUE
ossl_x509name_eql(VALUE self, VALUE other)
{
@@ -346,9 +292,6 @@ ossl_x509name_eql(VALUE self, VALUE other)
/*
* call-seq:
* name.hash => integer
- *
- * The hash value returned is suitable for use as a certificate's filename in
- * a CA path.
*/
static VALUE
ossl_x509name_hash(VALUE self)
@@ -363,32 +306,9 @@ ossl_x509name_hash(VALUE self)
return ULONG2NUM(hash);
}
-#ifdef HAVE_X509_NAME_HASH_OLD
-/*
- * call-seq:
- * name.hash_old => integer
- *
- * Returns an MD5 based hash used in OpenSSL 0.9.X.
- */
-static VALUE
-ossl_x509name_hash_old(VALUE self)
-{
- X509_NAME *name;
- unsigned long hash;
-
- GetX509Name(self, name);
-
- hash = X509_NAME_hash_old(name);
-
- return ULONG2NUM(hash);
-}
-#endif
-
/*
* call-seq:
* name.to_der => string
- *
- * Converts the name to DER encoding
*/
static VALUE
ossl_x509name_to_der(VALUE self)
@@ -411,19 +331,8 @@ ossl_x509name_to_der(VALUE self)
}
/*
- * Document-class: OpenSSL::X509::Name
- *
- * An X.509 name represents a hostname, email address or other entity
- * associated with a public key.
- *
- * You can create a Name by parsing a distinguished name String or by
- * supplying the distinguished name as an Array.
- *
- * name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
- *
- * name = OpenSSL::X509::Name.new [['CN', 'nobody'], ['DC', 'example']]
+ * INIT
*/
-
void
Init_ossl_x509name()
{
@@ -433,8 +342,6 @@ Init_ossl_x509name()
eX509NameError = rb_define_class_under(mX509, "NameError", eOSSLError);
cX509Name = rb_define_class_under(mX509, "Name", rb_cObject);
- rb_include_module(cX509Name, rb_mComparable);
-
rb_define_alloc_func(cX509Name, ossl_x509name_alloc);
rb_define_method(cX509Name, "initialize", ossl_x509name_initialize, -1);
rb_define_method(cX509Name, "add_entry", ossl_x509name_add_entry, -1);
@@ -444,19 +351,11 @@ Init_ossl_x509name()
rb_define_alias(cX509Name, "<=>", "cmp");
rb_define_method(cX509Name, "eql?", ossl_x509name_eql, 1);
rb_define_method(cX509Name, "hash", ossl_x509name_hash, 0);
-#ifdef HAVE_X509_NAME_HASH_OLD
- rb_define_method(cX509Name, "hash_old", ossl_x509name_hash_old, 0);
-#endif
rb_define_method(cX509Name, "to_der", ossl_x509name_to_der, 0);
utf8str = INT2NUM(V_ASN1_UTF8STRING);
ptrstr = INT2NUM(V_ASN1_PRINTABLESTRING);
ia5str = INT2NUM(V_ASN1_IA5STRING);
-
- /* Document-const: DEFAULT_OBJECT_TYPE
- *
- * The default object type for name entries.
- */
rb_define_const(cX509Name, "DEFAULT_OBJECT_TYPE", utf8str);
hash = rb_hash_new();
RHASH(hash)->ifnone = utf8str;
@@ -467,43 +366,10 @@ Init_ossl_x509name()
rb_hash_aset(hash, rb_str_new2("DC"), ia5str);
rb_hash_aset(hash, rb_str_new2("domainComponent"), ia5str);
rb_hash_aset(hash, rb_str_new2("emailAddress"), ia5str);
-
- /* Document-const: OBJECT_TYPE_TEMPLATE
- *
- * The default object type template for name entries.
- */
rb_define_const(cX509Name, "OBJECT_TYPE_TEMPLATE", hash);
- /* Document-const: COMPAT
- *
- * A flag for #to_s.
- *
- * Breaks the name returned into multiple lines if longer than 80
- * characters.
- */
rb_define_const(cX509Name, "COMPAT", ULONG2NUM(XN_FLAG_COMPAT));
-
- /* Document-const: RFC2253
- *
- * A flag for #to_s.
- *
- * Returns an RFC2253 format name.
- */
rb_define_const(cX509Name, "RFC2253", ULONG2NUM(XN_FLAG_RFC2253));
-
- /* Document-const: ONELINE
- *
- * A flag for #to_s.
- *
- * Returns a more readable format than RFC2253.
- */
rb_define_const(cX509Name, "ONELINE", ULONG2NUM(XN_FLAG_ONELINE));
-
- /* Document-const: MULTILINE
- *
- * A flag for #to_s.
- *
- * Returns a multiline format.
- */
rb_define_const(cX509Name, "MULTILINE", ULONG2NUM(XN_FLAG_MULTILINE));
}
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 5927f76d44..368bff2776 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -11,20 +11,20 @@
#include "ossl.h"
#define WrapX509Req(klass, obj, req) do { \
- if (!(req)) { \
+ if (!req) { \
ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_REQ_free, (req)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_REQ_free, req); \
} while (0)
#define GetX509Req(obj, req) do { \
- Data_Get_Struct((obj), X509_REQ, (req)); \
- if (!(req)) { \
+ Data_Get_Struct(obj, X509_REQ, req); \
+ if (!req) { \
ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509Req(obj, req) do { \
- OSSL_Check_Kind((obj), cX509Req); \
- GetX509Req((obj), (req)); \
+ OSSL_Check_Kind(obj, cX509Req); \
+ GetX509Req(obj, req); \
} while (0)
/*
@@ -110,7 +110,7 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
DATA_PTR(self) = x;
if (!req) {
- OSSL_BIO_reset(in);
+ (void)BIO_reset(in);
req = d2i_X509_REQ_bio(in, &x);
DATA_PTR(self) = x;
}
@@ -171,7 +171,7 @@ ossl_x509req_to_der(VALUE self)
GetX509Req(self, req);
if ((len = i2d_X509_REQ(req, NULL)) <= 0)
- ossl_raise(eX509ReqError, NULL);
+ ossl_raise(eX509CertError, NULL);
str = rb_str_new(0, len);
p = (unsigned char *)RSTRING_PTR(str);
if (i2d_X509_REQ(req, &p) <= 0)
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index 320abaa7ae..6ba73b13b8 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -11,20 +11,20 @@
#include "ossl.h"
#define WrapX509Rev(klass, obj, rev) do { \
- if (!(rev)) { \
+ if (!rev) { \
ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_REVOKED_free, (rev)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_REVOKED_free, rev); \
} while (0)
#define GetX509Rev(obj, rev) do { \
- Data_Get_Struct((obj), X509_REVOKED, (rev)); \
- if (!(rev)) { \
+ Data_Get_Struct(obj, X509_REVOKED, rev); \
+ if (!rev) { \
ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509Rev(obj, rev) do { \
- OSSL_Check_Kind((obj), cX509Rev); \
- GetX509Rev((obj), (rev)); \
+ OSSL_Check_Kind(obj, cX509Rev); \
+ GetX509Rev(obj, rev); \
} while (0)
/*
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index 5e3094ee9f..7b4a005110 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -11,37 +11,37 @@
#include "ossl.h"
#define WrapX509Store(klass, obj, st) do { \
- if (!(st)) { \
+ if (!st) { \
ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, X509_STORE_free, (st)); \
+ obj = Data_Wrap_Struct(klass, 0, X509_STORE_free, st); \
} while (0)
#define GetX509Store(obj, st) do { \
- Data_Get_Struct((obj), X509_STORE, (st)); \
- if (!(st)) { \
+ Data_Get_Struct(obj, X509_STORE, st); \
+ if (!st) { \
ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
} \
} while (0)
#define SafeGetX509Store(obj, st) do { \
- OSSL_Check_Kind((obj), cX509Store); \
- GetX509Store((obj), (st)); \
+ OSSL_Check_Kind(obj, cX509Store); \
+ GetX509Store(obj, st); \
} while (0)
#define WrapX509StCtx(klass, obj, ctx) do { \
- if (!(ctx)) { \
+ if (!ctx) { \
ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \
} \
- (obj) = Data_Wrap_Struct((klass), 0, ossl_x509stctx_free, (ctx)); \
+ obj = Data_Wrap_Struct(klass, 0, ossl_x509stctx_free, ctx); \
} while (0)
#define GetX509StCtx(obj, ctx) do { \
- Data_Get_Struct((obj), X509_STORE_CTX, (ctx)); \
- if (!(ctx)) { \
+ Data_Get_Struct(obj, X509_STORE_CTX, ctx); \
+ if (!ctx) { \
ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
} \
} while (0)
#define SafeGetX509StCtx(obj, storep) do { \
- OSSL_Check_Kind((obj), cX509StoreContext); \
- GetX509Store((obj), (ctx)); \
+ OSSL_Check_Kind(obj, cX509StoreContext); \
+ GetX509Store(obj, ctx); \
} while (0)
/*
@@ -170,7 +170,7 @@ ossl_x509store_set_purpose(VALUE self, VALUE purpose)
{
#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
X509_STORE *store;
- int p = NUM2INT(purpose);
+ long p = NUM2LONG(purpose);
GetX509Store(self, store);
X509_STORE_set_purpose(store, p);
@@ -186,7 +186,7 @@ ossl_x509store_set_trust(VALUE self, VALUE trust)
{
#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
X509_STORE *store;
- int t = NUM2INT(trust);
+ long t = NUM2LONG(trust);
GetX509Store(self, store);
X509_STORE_set_trust(store, t);
@@ -204,15 +204,6 @@ ossl_x509store_set_time(VALUE self, VALUE time)
return time;
}
-/*
- * call-seq:
- * store.add_file(file) -> store
- *
- *
- * Adds the certificates in +file+ to the certificate store. The +file+ can
- * contain multiple PEM-encoded certificates.
- */
-
static VALUE
ossl_x509store_add_file(VALUE self, VALUE file)
{
@@ -255,16 +246,6 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
return self;
}
-/*
- * call-seq:
- * store.set_default_path
- *
- * Adds the default certificates to the certificate store. These certificates
- * are loaded from the default configuration directory which can usually be
- * determined by:
- *
- * File.dirname OpenSSL::Config::DEFAULT_CONFIG_FILE
- */
static VALUE
ossl_x509store_set_default_paths(VALUE self)
{
@@ -278,13 +259,6 @@ ossl_x509store_set_default_paths(VALUE self)
return Qnil;
}
-/*
- * call-seq:
- * store.add_cert(cert)
- *
- * Adds the OpenSSL::X509::Certificate +cert+ to the certificate store.
- */
-
static VALUE
ossl_x509store_add_cert(VALUE self, VALUE arg)
{
@@ -537,6 +511,17 @@ ossl_x509stctx_get_curr_crl(VALUE self)
}
static VALUE
+ossl_x509stctx_cleanup(VALUE self)
+{
+ X509_STORE_CTX *ctx;
+
+ GetX509StCtx(self, ctx);
+ X509_STORE_CTX_cleanup(ctx);
+
+ return self;
+}
+
+static VALUE
ossl_x509stctx_set_flags(VALUE self, VALUE flags)
{
X509_STORE_CTX *store;
@@ -552,7 +537,7 @@ static VALUE
ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
{
X509_STORE_CTX *store;
- int p = NUM2INT(purpose);
+ long p = NUM2LONG(purpose);
GetX509StCtx(self, store);
X509_STORE_CTX_set_purpose(store, p);
@@ -564,7 +549,7 @@ static VALUE
ossl_x509stctx_set_trust(VALUE self, VALUE trust)
{
X509_STORE_CTX *store;
- int t = NUM2INT(trust);
+ long t = NUM2LONG(trust);
GetX509StCtx(self, store);
X509_STORE_CTX_set_trust(store, t);
@@ -597,47 +582,8 @@ Init_ossl_x509store()
{
VALUE x509stctx;
-#if 0
- mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
- mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
eX509StoreError = rb_define_class_under(mX509, "StoreError", eOSSLError);
- /* Document-class: OpenSSL::X509::Store
- *
- * The X509 certificate store holds trusted CA certificates used to verify
- * peer certificates.
- *
- * The easiest way to create a useful certificate store is:
- *
- * cert_store = OpenSSL::X509::Store.new
- * cert_store.set_default_paths
- *
- * This will use your system's built-in certificates.
- *
- * If your system does not have a default set of certificates you can
- * obtain a set from Mozilla here: http://curl.haxx.se/docs/caextract.html
- * (Note that this set does not have an HTTPS download option so you may
- * wish to use the firefox-db2pem.sh script to extract the certificates
- * from a local install to avoid man-in-the-middle attacks.)
- *
- * After downloading or generating a cacert.pem from the above link you
- * can create a certificate store from the pem file like this:
- *
- * cert_store = OpenSSL::X509::Store.new
- * cert_store.add_file 'cacert.pem'
- *
- * The certificate store can be used with an SSLSocket like this:
- *
- * ssl_context = OpenSSL::SSL::SSLContext.new
- * ssl_context.cert_store = cert_store
- *
- * tcp_socket = TCPSocket.open 'example.com', 443
- *
- * ssl_socket = OpenSSL::SSL::SSLSocket.new tcp_socket, ssl_context
- */
-
cX509Store = rb_define_class_under(mX509, "Store", rb_cObject);
rb_attr(cX509Store, rb_intern("verify_callback"), 1, 0, Qfalse);
rb_attr(cX509Store, rb_intern("error"), 1, 0, Qfalse);
@@ -669,6 +615,7 @@ Init_ossl_x509store()
rb_define_method(x509stctx,"error_depth", ossl_x509stctx_get_err_depth, 0);
rb_define_method(x509stctx,"current_cert",ossl_x509stctx_get_curr_cert, 0);
rb_define_method(x509stctx,"current_crl", ossl_x509stctx_get_curr_crl, 0);
+ rb_define_method(x509stctx,"cleanup", ossl_x509stctx_cleanup, 0);
rb_define_method(x509stctx,"flags=", ossl_x509stctx_set_flags, 1);
rb_define_method(x509stctx,"purpose=", ossl_x509stctx_set_purpose, 1);
rb_define_method(x509stctx,"trust=", ossl_x509stctx_set_trust, 1);
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index 0f9de1c842..64b76f26b4 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -12,11 +12,11 @@
#define _OSSL_RUBY_MISSING_H_
#define rb_define_copy_func(klass, func) \
- rb_define_method((klass), "initialize_copy", (func), 1)
+ rb_define_method(klass, "initialize_copy", func, 1)
#ifndef GetReadFile
-#define FPTR_TO_FD(fptr) ((fptr)->fd)
+#define FPTR_TO_FD(fptr) (fptr->fd)
#else
#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
#endif
@@ -25,4 +25,17 @@
#define rb_io_t OpenFile
#endif
+#ifndef HAVE_RB_STR_SET_LEN
+/* these methods should probably be backported to 1.8 */
+#define rb_str_set_len(str, length) do { \
+ RSTRING(str)->ptr[length] = 0; \
+ RSTRING(str)->len = length; \
+} while(0)
+#endif /* ! HAVE_RB_STR_SET_LEN */
+
+#ifndef HAVE_RB_BLOCK_CALL
+/* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */
+#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, arg1, arg5, arg6)
+#endif /* ! HAVE_RB_BLOCK_CALL */
+
#endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/pathname/extconf.rb b/ext/pathname/extconf.rb
deleted file mode 100644
index 6720903e88..0000000000
--- a/ext/pathname/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('pathname')
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
deleted file mode 100644
index 8bce81ea10..0000000000
--- a/ext/pathname/lib/pathname.rb
+++ /dev/null
@@ -1,574 +0,0 @@
-#
-# = pathname.rb
-#
-# Object-Oriented Pathname Class
-#
-# Author:: Tanaka Akira <akr@m17n.org>
-# Documentation:: Author and Gavin Sinclair
-#
-# For documentation, see class Pathname.
-#
-
-require 'pathname.so'
-
-class Pathname
-
- # :stopdoc:
- if RUBY_VERSION < "1.9"
- TO_PATH = :to_str
- else
- # to_path is implemented so Pathname objects are usable with File.open, etc.
- TO_PATH = :to_path
- end
-
- SAME_PATHS = if File::FNM_SYSCASE.nonzero?
- # Avoid #zero? here because #casecmp can return nil.
- proc {|a, b| a.casecmp(b) == 0}
- else
- proc {|a, b| a == b}
- end
-
-
- if File::ALT_SEPARATOR
- SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
- SEPARATOR_PAT = /[#{SEPARATOR_LIST}]/
- else
- SEPARATOR_LIST = "#{Regexp.quote File::SEPARATOR}"
- SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
- end
-
- # :startdoc:
-
- # chop_basename(path) -> [pre-basename, basename] or nil
- def chop_basename(path) # :nodoc:
- base = File.basename(path)
- if /\A#{SEPARATOR_PAT}?\z/o =~ base
- return nil
- else
- return path[0, path.rindex(base)], base
- end
- end
- private :chop_basename
-
- # split_names(path) -> prefix, [name, ...]
- def split_names(path) # :nodoc:
- names = []
- while r = chop_basename(path)
- path, basename = r
- names.unshift basename
- end
- return path, names
- end
- private :split_names
-
- def prepend_prefix(prefix, relpath) # :nodoc:
- if relpath.empty?
- File.dirname(prefix)
- elsif /#{SEPARATOR_PAT}/o =~ prefix
- prefix = File.dirname(prefix)
- prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
- prefix + relpath
- else
- prefix + relpath
- end
- end
- private :prepend_prefix
-
- # Returns clean pathname of +self+ with consecutive slashes and useless dots
- # removed. The filesystem is not accessed.
- #
- # If +consider_symlink+ is +true+, then a more conservative algorithm is used
- # to avoid breaking symbolic linkages. This may retain more +..+
- # entries than absolutely necessary, but without accessing the filesystem,
- # this can't be avoided.
- #
- # See Pathname#realpath.
- #
- def cleanpath(consider_symlink=false)
- if consider_symlink
- cleanpath_conservative
- else
- cleanpath_aggressive
- end
- end
-
- #
- # Clean the path simply by resolving and removing excess +.+ and +..+ entries.
- # Nothing more, nothing less.
- #
- def cleanpath_aggressive # :nodoc:
- path = @path
- names = []
- pre = path
- while r = chop_basename(pre)
- pre, base = r
- case base
- when '.'
- when '..'
- names.unshift base
- else
- if names[0] == '..'
- names.shift
- else
- names.unshift base
- end
- end
- end
- pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
- if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
- names.shift while names[0] == '..'
- end
- self.class.new(prepend_prefix(pre, File.join(*names)))
- end
- private :cleanpath_aggressive
-
- # has_trailing_separator?(path) -> bool
- def has_trailing_separator?(path) # :nodoc:
- if r = chop_basename(path)
- pre, basename = r
- pre.length + basename.length < path.length
- else
- false
- end
- end
- private :has_trailing_separator?
-
- # add_trailing_separator(path) -> path
- def add_trailing_separator(path) # :nodoc:
- if File.basename(path + 'a') == 'a'
- path
- else
- File.join(path, "") # xxx: Is File.join is appropriate to add separator?
- end
- end
- private :add_trailing_separator
-
- def del_trailing_separator(path) # :nodoc:
- if r = chop_basename(path)
- pre, basename = r
- pre + basename
- elsif /#{SEPARATOR_PAT}+\z/o =~ path
- $` + File.dirname(path)[/#{SEPARATOR_PAT}*\z/o]
- else
- path
- end
- end
- private :del_trailing_separator
-
- def cleanpath_conservative # :nodoc:
- path = @path
- names = []
- pre = path
- while r = chop_basename(pre)
- pre, base = r
- names.unshift base if base != '.'
- end
- pre.tr!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
- if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
- names.shift while names[0] == '..'
- end
- if names.empty?
- self.class.new(File.dirname(pre))
- else
- if names.last != '..' && File.basename(path) == '.'
- names << '.'
- end
- result = prepend_prefix(pre, File.join(*names))
- if /\A(?:\.|\.\.)\z/ !~ names.last && has_trailing_separator?(path)
- self.class.new(add_trailing_separator(result))
- else
- self.class.new(result)
- end
- end
- end
- private :cleanpath_conservative
-
- # Returns the parent directory.
- #
- # This is same as <code>self + '..'</code>.
- def parent
- self + '..'
- end
-
- # Returns +true+ if +self+ points to a mountpoint.
- def mountpoint?
- begin
- stat1 = self.lstat
- stat2 = self.parent.lstat
- stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
- stat1.dev != stat2.dev
- rescue Errno::ENOENT
- false
- end
- end
-
- #
- # Predicate method for root directories. Returns +true+ if the
- # pathname consists of consecutive slashes.
- #
- # It doesn't access the filesystem. So it may return +false+ for some
- # pathnames which points to roots such as <tt>/usr/..</tt>.
- #
- def root?
- !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
- end
-
- # Predicate method for testing whether a path is absolute.
- #
- # It returns +true+ if the pathname begins with a slash.
- #
- # p = Pathname.new('/im/sure')
- # p.absolute?
- # #=> true
- #
- # p = Pathname.new('not/so/sure')
- # p.absolute?
- # #=> false
- def absolute?
- !relative?
- end
-
- # The opposite of Pathname#absolute?
- #
- # It returns +false+ if the pathname begins with a slash.
- #
- # p = Pathname.new('/im/sure')
- # p.relative?
- # #=> false
- #
- # p = Pathname.new('not/so/sure')
- # p.relative?
- # #=> true
- def relative?
- path = @path
- while r = chop_basename(path)
- path, = r
- end
- path == ''
- end
-
- #
- # Iterates over each component of the path.
- #
- # Pathname.new("/usr/bin/ruby").each_filename {|filename| ... }
- # # yields "usr", "bin", and "ruby".
- #
- # Returns an Enumerator if no block was given.
- #
- # enum = Pathname.new("/usr/bin/ruby").each_filename
- # # ... do stuff ...
- # enum.each { |e| ... }
- # # yields "usr", "bin", and "ruby".
- #
- def each_filename # :yield: filename
- return to_enum(__method__) unless block_given?
- _, names = split_names(@path)
- names.each {|filename| yield filename }
- nil
- end
-
- # Iterates over and yields a new Pathname object
- # for each element in the given path in descending order.
- #
- # Pathname.new('/path/to/some/file.rb').descend {|v| p v}
- # #<Pathname:/>
- # #<Pathname:/path>
- # #<Pathname:/path/to>
- # #<Pathname:/path/to/some>
- # #<Pathname:/path/to/some/file.rb>
- #
- # Pathname.new('path/to/some/file.rb').descend {|v| p v}
- # #<Pathname:path>
- # #<Pathname:path/to>
- # #<Pathname:path/to/some>
- # #<Pathname:path/to/some/file.rb>
- #
- # It doesn't access the filesystem.
- #
- def descend
- vs = []
- ascend {|v| vs << v }
- vs.reverse_each {|v| yield v }
- nil
- end
-
- # Iterates over and yields a new Pathname object
- # for each element in the given path in ascending order.
- #
- # Pathname.new('/path/to/some/file.rb').ascend {|v| p v}
- # #<Pathname:/path/to/some/file.rb>
- # #<Pathname:/path/to/some>
- # #<Pathname:/path/to>
- # #<Pathname:/path>
- # #<Pathname:/>
- #
- # Pathname.new('path/to/some/file.rb').ascend {|v| p v}
- # #<Pathname:path/to/some/file.rb>
- # #<Pathname:path/to/some>
- # #<Pathname:path/to>
- # #<Pathname:path>
- #
- # It doesn't access the filesystem.
- #
- def ascend
- path = @path
- yield self
- while r = chop_basename(path)
- path, = r
- break if path.empty?
- yield self.class.new(del_trailing_separator(path))
- end
- end
-
- #
- # Appends a pathname fragment to +self+ to produce a new Pathname object.
- #
- # p1 = Pathname.new("/usr") # Pathname:/usr
- # 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.
- #
- def +(other)
- other = Pathname.new(other) unless Pathname === other
- Pathname.new(plus(@path, other.to_s))
- end
-
- def plus(path1, path2) # -> path # :nodoc:
- prefix2 = path2
- index_list2 = []
- basename_list2 = []
- while r2 = chop_basename(prefix2)
- prefix2, basename2 = r2
- index_list2.unshift prefix2.length
- basename_list2.unshift basename2
- end
- return path2 if prefix2 != ''
- prefix1 = path1
- while true
- while !basename_list2.empty? && basename_list2.first == '.'
- index_list2.shift
- basename_list2.shift
- end
- break unless r1 = chop_basename(prefix1)
- prefix1, basename1 = r1
- next if basename1 == '.'
- if basename1 == '..' || basename_list2.empty? || basename_list2.first != '..'
- prefix1 = prefix1 + basename1
- break
- end
- index_list2.shift
- basename_list2.shift
- end
- r1 = chop_basename(prefix1)
- if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
- while !basename_list2.empty? && basename_list2.first == '..'
- index_list2.shift
- basename_list2.shift
- end
- end
- if !basename_list2.empty?
- suffix2 = path2[index_list2.first..-1]
- r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
- else
- r1 ? prefix1 : File.dirname(prefix1)
- end
- end
- private :plus
-
- #
- # Joins the given pathnames onto +self+ to create a new Pathname object.
- #
- # path0 = Pathname.new("/usr") # Pathname:/usr
- # path0 = path0.join("bin/ruby") # Pathname:/usr/bin/ruby
- # # is the same as
- # path1 = Pathname.new("/usr") + "bin/ruby" # Pathname:/usr/bin/ruby
- # path0 == path1
- # #=> true
- #
- def join(*args)
- args.unshift self
- result = args.pop
- result = Pathname.new(result) unless Pathname === result
- return result if result.absolute?
- args.reverse_each {|arg|
- arg = Pathname.new(arg) unless Pathname === arg
- result = arg + result
- return result if result.absolute?
- }
- result
- end
-
- #
- # Returns the children of the directory (files and subdirectories, not
- # recursive) as an array of Pathname objects.
- #
- # By default, the returned 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.
- #
- # For example:
- # pn = Pathname("/usr/lib/ruby/1.8")
- # pn.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)
- # # -> [ Pathname:English.rb, Pathname:Env.rb, Pathname:abbrev.rb, ... ]
- #
- # Note that the results never contain the entries +.+ and +..+ in
- # the directory because they are not children.
- #
- def children(with_directory=true)
- with_directory = false if @path == '.'
- result = []
- Dir.foreach(@path) {|e|
- next if e == '.' || e == '..'
- if with_directory
- result << self.class.new(File.join(@path, e))
- else
- result << self.class.new(e)
- end
- }
- 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>
- #
- # Note that the results never contain the entries +.+ and +..+ in
- # the directory because they are not children.
- #
- # See Pathname#children
- #
- def each_child(with_directory=true, &b)
- children(with_directory).each(&b)
- end
-
- #
- # Returns a relative path from the given +base_directory+ to the receiver.
- #
- # If +self+ is absolute, then +base_directory+ must be absolute too.
- #
- # If +self+ is relative, then +base_directory+ must be relative too.
- #
- # This method doesn't access the filesystem. It assumes no symlinks.
- #
- # ArgumentError is raised when it cannot find a relative path.
- #
- def relative_path_from(base_directory)
- dest_directory = self.cleanpath.to_s
- base_directory = base_directory.cleanpath.to_s
- dest_prefix = dest_directory
- dest_names = []
- while r = chop_basename(dest_prefix)
- dest_prefix, basename = r
- dest_names.unshift basename if basename != '.'
- end
- base_prefix = base_directory
- base_names = []
- while r = chop_basename(base_prefix)
- base_prefix, basename = r
- base_names.unshift basename if basename != '.'
- end
- unless SAME_PATHS[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.shift
- base_names.shift
- end
- if base_names.include? '..'
- raise ArgumentError, "base_directory has ..: #{base_directory.inspect}"
- end
- base_names.fill('..')
- relpath_names = base_names + dest_names
- if relpath_names.empty?
- Pathname.new('.')
- else
- Pathname.new(File.join(*relpath_names))
- end
- end
-end
-
-
-class Pathname # * Find *
- #
- # Iterates over the directory tree in a depth first manner, yielding a
- # Pathname for each file under "this" directory.
- #
- # Returns an Enumerator if no block is given.
- #
- # Since it is implemented by the standard library module Find, Find.prune can
- # be used to control the traversal.
- #
- # If +self+ is +.+, yielded pathnames begin with a filename in the
- # current directory, not +./+.
- #
- # See Find.find
- #
- def find # :yield: pathname
- return to_enum(__method__) unless block_given?
- require 'find'
- if @path == '.'
- Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
- else
- Find.find(@path) {|f| yield self.class.new(f) }
- end
- end
-end
-
-
-class Pathname # * FileUtils *
- # Creates a full path, including any intermediate directories that don't yet
- # exist.
- #
- # See FileUtils.mkpath and FileUtils.mkdir_p
- def mkpath
- require 'fileutils'
- FileUtils.mkpath(@path)
- nil
- end
-
- # Recursively deletes a directory, including all directories beneath it.
- #
- # See FileUtils.rm_r
- def rmtree
- # The name "rmtree" is borrowed from File::Path of Perl.
- # File::Path provides "mkpath" and "rmtree".
- require 'fileutils'
- FileUtils.rm_r(@path)
- nil
- end
-end
-
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
deleted file mode 100644
index dbd58ae7f9..0000000000
--- a/ext/pathname/pathname.c
+++ /dev/null
@@ -1,1385 +0,0 @@
-#include "ruby.h"
-#include "ruby/encoding.h"
-
-static VALUE rb_cPathname;
-static ID id_at_path, id_to_path;
-
-static VALUE
-get_strpath(VALUE obj)
-{
- VALUE strpath;
- strpath = rb_ivar_get(obj, id_at_path);
- if (!RB_TYPE_P(strpath, T_STRING))
- rb_raise(rb_eTypeError, "unexpected @path");
- return strpath;
-}
-
-static void
-set_strpath(VALUE obj, VALUE val)
-{
- rb_ivar_set(obj, id_at_path, val);
-}
-
-/*
- * Create a Pathname object from the given String (or String-like object).
- * If +path+ contains a NULL character (<tt>\0</tt>), an ArgumentError is raised.
- */
-static VALUE
-path_initialize(VALUE self, VALUE arg)
-{
- VALUE str;
- if (RB_TYPE_P(arg, T_STRING)) {
- str = arg;
- }
- else {
- str = rb_check_funcall(arg, id_to_path, 0, NULL);
- if (str == Qundef)
- str = arg;
- StringValue(str);
- }
- if (memchr(RSTRING_PTR(str), '\0', RSTRING_LEN(str)))
- rb_raise(rb_eArgError, "pathname contains null byte");
- str = rb_obj_dup(str);
-
- set_strpath(self, str);
- OBJ_INFECT(self, str);
- return self;
-}
-
-/*
- * call-seq:
- * pathname.freeze -> obj
- *
- * Freezes this Pathname.
- *
- * See Object.freeze.
- */
-static VALUE
-path_freeze(VALUE self)
-{
- rb_call_super(0, 0);
- rb_str_freeze(get_strpath(self));
- return self;
-}
-
-/*
- * call-seq:
- * pathname.taint -> obj
- *
- * Taints this Pathname.
- *
- * See Object.taint.
- */
-static VALUE
-path_taint(VALUE self)
-{
- rb_call_super(0, 0);
- rb_obj_taint(get_strpath(self));
- return self;
-}
-
-/*
- * call-seq:
- * pathname.untaint -> obj
- *
- * Untaints this Pathname.
- *
- * See Object.untaint.
- */
-static VALUE
-path_untaint(VALUE self)
-{
- rb_call_super(0, 0);
- rb_obj_untaint(get_strpath(self));
- return self;
-}
-
-/*
- * Compare this pathname with +other+. The comparison is string-based.
- * Be aware that two different paths (<tt>foo.txt</tt> and <tt>./foo.txt</tt>)
- * can refer to the same file.
- */
-static VALUE
-path_eq(VALUE self, VALUE other)
-{
- if (!rb_obj_is_kind_of(other, rb_cPathname))
- return Qfalse;
- return rb_str_equal(get_strpath(self), get_strpath(other));
-}
-
-/*
- * Provides a case-sensitive comparison operator for pathnames.
- *
- * Pathname.new('/usr') <=> Pathname.new('/usr/bin')
- * #=> -1
- * Pathname.new('/usr/bin') <=> Pathname.new('/usr/bin')
- * #=> 0
- * Pathname.new('/usr/bin') <=> Pathname.new('/USR/BIN')
- * #=> 1
- *
- * It will return +-1+, +0+ or +1+ depending on the value of the left argument
- * relative to the right argument. Or it will return +nil+ if the arguments
- * are not comparable.
- */
-static VALUE
-path_cmp(VALUE self, VALUE other)
-{
- VALUE s1, s2;
- char *p1, *p2;
- char *e1, *e2;
- if (!rb_obj_is_kind_of(other, rb_cPathname))
- return Qnil;
- s1 = get_strpath(self);
- s2 = get_strpath(other);
- p1 = RSTRING_PTR(s1);
- p2 = RSTRING_PTR(s2);
- e1 = p1 + RSTRING_LEN(s1);
- e2 = p2 + RSTRING_LEN(s2);
- while (p1 < e1 && p2 < e2) {
- int c1, c2;
- c1 = (unsigned char)*p1++;
- c2 = (unsigned char)*p2++;
- if (c1 == '/') c1 = '\0';
- if (c2 == '/') c2 = '\0';
- if (c1 != c2) {
- if (c1 < c2)
- return INT2FIX(-1);
- else
- return INT2FIX(1);
- }
- }
- if (p1 < e1)
- return INT2FIX(1);
- if (p2 < e2)
- return INT2FIX(-1);
- return INT2FIX(0);
-}
-
-/* :nodoc: */
-static VALUE
-path_hash(VALUE self)
-{
- return INT2FIX(rb_str_hash(get_strpath(self)));
-}
-
-/*
- * call-seq:
- * pathname.to_s -> string
- * pathname.to_path -> string
- *
- * Return the path as a String.
- *
- * to_path is implemented so Pathname objects are usable with File.open, etc.
- */
-static VALUE
-path_to_s(VALUE self)
-{
- return rb_obj_dup(get_strpath(self));
-}
-
-/* :nodoc: */
-static VALUE
-path_inspect(VALUE self)
-{
- const char *c = rb_obj_classname(self);
- VALUE str = get_strpath(self);
- return rb_sprintf("#<%s:%"PRIsVALUE">", c, str);
-}
-
-/*
- * Return a pathname which is substituted by String#sub.
- *
- * path1 = Pathname.new('/usr/bin/perl')
- * path1.sub('perl', 'ruby')
- * #=> #<Pathname:/usr/bin/ruby>
- */
-static VALUE
-path_sub(int argc, VALUE *argv, VALUE self)
-{
- VALUE str = get_strpath(self);
-
- if (rb_block_given_p()) {
- str = rb_block_call(str, rb_intern("sub"), argc, argv, 0, 0);
- }
- else {
- str = rb_funcall2(str, rb_intern("sub"), argc, argv);
- }
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * Return a pathname with +repl+ added as a suffix to the basename.
- *
- * If self has no extension part, +repl+ is appended.
- *
- * Pathname.new('/usr/bin/shutdown').sub_ext('.rb')
- * #=> #<Pathname:/usr/bin/shutdown.rb>
- */
-static VALUE
-path_sub_ext(VALUE self, VALUE repl)
-{
- VALUE str = get_strpath(self);
- VALUE str2;
- long extlen;
- const char *ext;
- const char *p;
-
- StringValue(repl);
- p = RSTRING_PTR(str);
- extlen = RSTRING_LEN(str);
- ext = ruby_enc_find_extname(p, &extlen, rb_enc_get(str));
- if (ext == NULL) {
- ext = p + RSTRING_LEN(str);
- }
- else if (extlen <= 1) {
- ext += extlen;
- }
- str2 = rb_str_subseq(str, 0, ext-p);
- rb_str_append(str2, repl);
- OBJ_INFECT(str2, str);
- return rb_class_new_instance(1, &str2, rb_obj_class(self));
-}
-
-/* Facade for File */
-
-/*
- * Returns the real (absolute) pathname for +self+ in the actual
- * filesystem.
- *
- * Does not contain symlinks or useless dots, +..+ and +.+.
- *
- * All components of the pathname must exist when this method is
- * called.
- *
- */
-static VALUE
-path_realpath(int argc, VALUE *argv, VALUE self)
-{
- VALUE basedir, str;
- rb_scan_args(argc, argv, "01", &basedir);
- str = rb_funcall(rb_cFile, rb_intern("realpath"), 2, get_strpath(self), basedir);
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * Returns the real (absolute) pathname of +self+ in the actual filesystem.
- *
- * Does not contain symlinks or useless dots, +..+ and +.+.
- *
- * The last component of the real pathname can be nonexistent.
- */
-static VALUE
-path_realdirpath(int argc, VALUE *argv, VALUE self)
-{
- VALUE basedir, str;
- rb_scan_args(argc, argv, "01", &basedir);
- str = rb_funcall(rb_cFile, rb_intern("realdirpath"), 2, get_strpath(self), basedir);
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * call-seq:
- * pathname.each_line {|line| ... }
- * pathname.each_line(sep=$/ [, open_args]) {|line| block } -> nil
- * pathname.each_line(limit [, open_args]) {|line| block } -> nil
- * pathname.each_line(sep, limit [, open_args]) {|line| block } -> nil
- * pathname.each_line(...) -> an_enumerator
- *
- * Iterates over each line in the file and yields a String object for each.
- */
-static VALUE
-path_each_line(int argc, VALUE *argv, VALUE self)
-{
- VALUE args[4];
- int n;
-
- args[0] = get_strpath(self);
- n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
- if (rb_block_given_p()) {
- return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0);
- }
- else {
- return rb_funcall2(rb_cIO, rb_intern("foreach"), 1+n, args);
- }
-}
-
-/*
- * call-seq:
- * pathname.read([length [, offset]]) -> string
- * pathname.read([length [, offset]], open_args) -> string
- *
- * Returns all data from the file, or the first +N+ bytes if specified.
- *
- * See IO.read.
- *
- */
-static VALUE
-path_read(int argc, VALUE *argv, VALUE self)
-{
- VALUE args[4];
- int n;
-
- args[0] = get_strpath(self);
- n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
- return rb_funcall2(rb_cIO, rb_intern("read"), 1+n, args);
-}
-
-/*
- * call-seq:
- * pathname.binread([length [, offset]]) -> string
- *
- * Returns all the bytes from the file, or the first +N+ if specified.
- *
- * See IO.binread.
- *
- */
-static VALUE
-path_binread(int argc, VALUE *argv, VALUE self)
-{
- VALUE args[3];
- int n;
-
- args[0] = get_strpath(self);
- n = rb_scan_args(argc, argv, "02", &args[1], &args[2]);
- return rb_funcall2(rb_cIO, rb_intern("binread"), 1+n, args);
-}
-
-/*
- * call-seq:
- * pathname.readlines(sep=$/ [, open_args]) -> array
- * pathname.readlines(limit [, open_args]) -> array
- * pathname.readlines(sep, limit [, open_args]) -> array
- *
- * Returns all the lines from the file.
- *
- * See IO.readlines.
- *
- */
-static VALUE
-path_readlines(int argc, VALUE *argv, VALUE self)
-{
- VALUE args[4];
- int n;
-
- args[0] = get_strpath(self);
- n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
- return rb_funcall2(rb_cIO, rb_intern("readlines"), 1+n, args);
-}
-
-/*
- * call-seq:
- * pathname.sysopen([mode, [perm]]) -> fixnum
- *
- * See IO.sysopen.
- *
- */
-static VALUE
-path_sysopen(int argc, VALUE *argv, VALUE self)
-{
- VALUE args[3];
- int n;
-
- args[0] = get_strpath(self);
- n = rb_scan_args(argc, argv, "02", &args[1], &args[2]);
- return rb_funcall2(rb_cIO, rb_intern("sysopen"), 1+n, args);
-}
-
-/*
- * call-seq:
- * pathname.atime -> time
- *
- * Returns the last access time for the file.
- *
- * See File.atime.
- */
-static VALUE
-path_atime(VALUE self)
-{
- return rb_funcall(rb_cFile, rb_intern("atime"), 1, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.ctime -> time
- *
- * Returns the last change time, using directory information, not the file itself.
- *
- * See File.ctime.
- */
-static VALUE
-path_ctime(VALUE self)
-{
- return rb_funcall(rb_cFile, rb_intern("ctime"), 1, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.mtime -> time
- *
- * Returns the last modified time of the file.
- *
- * See File.mtime.
- */
-static VALUE
-path_mtime(VALUE self)
-{
- return rb_funcall(rb_cFile, rb_intern("mtime"), 1, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.chmod -> integer
- *
- * Changes file permissions.
- *
- * See File.chmod.
- */
-static VALUE
-path_chmod(VALUE self, VALUE mode)
-{
- return rb_funcall(rb_cFile, rb_intern("chmod"), 2, mode, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.lchmod -> integer
- *
- * Same as Pathname.chmod, but does not follow symbolic links.
- *
- * See File.lchmod.
- */
-static VALUE
-path_lchmod(VALUE self, VALUE mode)
-{
- return rb_funcall(rb_cFile, rb_intern("lchmod"), 2, mode, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.chown -> integer
- *
- * Change owner and group of the file.
- *
- * See File.chown.
- */
-static VALUE
-path_chown(VALUE self, VALUE owner, VALUE group)
-{
- return rb_funcall(rb_cFile, rb_intern("chown"), 3, owner, group, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.lchown -> integer
- *
- * Same as Pathname.chown, but does not follow symbolic links.
- *
- * See File.lchown.
- */
-static VALUE
-path_lchown(VALUE self, VALUE owner, VALUE group)
-{
- return rb_funcall(rb_cFile, rb_intern("lchown"), 3, owner, group, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.fnmatch(pattern, [flags]) -> string
- * pathname.fnmatch?(pattern, [flags]) -> string
- *
- * Return +true+ if the receiver matches the given pattern.
- *
- * See File.fnmatch.
- */
-static VALUE
-path_fnmatch(int argc, VALUE *argv, VALUE self)
-{
- VALUE str = get_strpath(self);
- VALUE pattern, flags;
- if (rb_scan_args(argc, argv, "11", &pattern, &flags) == 1)
- return rb_funcall(rb_cFile, rb_intern("fnmatch"), 2, pattern, str);
- else
- return rb_funcall(rb_cFile, rb_intern("fnmatch"), 3, pattern, str, flags);
-}
-
-/*
- * call-seq:
- * pathname.ftype -> string
- *
- * Returns "type" of file ("file", "directory", etc).
- *
- * See File.ftype.
- */
-static VALUE
-path_ftype(VALUE self)
-{
- return rb_funcall(rb_cFile, rb_intern("ftype"), 1, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.make_link(old)
- *
- * Creates a hard link at _pathname_.
- *
- * See File.link.
- */
-static VALUE
-path_make_link(VALUE self, VALUE old)
-{
- return rb_funcall(rb_cFile, rb_intern("link"), 2, old, get_strpath(self));
-}
-
-/*
- * Opens the file for reading or writing.
- *
- * See File.open.
- */
-static VALUE
-path_open(int argc, VALUE *argv, VALUE self)
-{
- VALUE args[4];
- int n;
-
- args[0] = get_strpath(self);
- n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
- if (rb_block_given_p()) {
- return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0);
- }
- else {
- return rb_funcall2(rb_cFile, rb_intern("open"), 1+n, args);
- }
-}
-
-/*
- * Read symbolic link.
- *
- * See File.readlink.
- */
-static VALUE
-path_readlink(VALUE self)
-{
- VALUE str;
- str = rb_funcall(rb_cFile, rb_intern("readlink"), 1, get_strpath(self));
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * Rename the file.
- *
- * See File.rename.
- */
-static VALUE
-path_rename(VALUE self, VALUE to)
-{
- return rb_funcall(rb_cFile, rb_intern("rename"), 2, get_strpath(self), to);
-}
-
-/*
- * Returns a File::Stat object.
- *
- * See File.stat.
- */
-static VALUE
-path_stat(VALUE self)
-{
- return rb_funcall(rb_cFile, rb_intern("stat"), 1, get_strpath(self));
-}
-
-/*
- * See File.lstat.
- */
-static VALUE
-path_lstat(VALUE self)
-{
- return rb_funcall(rb_cFile, rb_intern("lstat"), 1, get_strpath(self));
-}
-
-/*
- * call-seq:
- * pathname.make_symlink(old)
- *
- * Creates a symbolic link.
- *
- * See File.symlink.
- */
-static VALUE
-path_make_symlink(VALUE self, VALUE old)
-{
- return rb_funcall(rb_cFile, rb_intern("symlink"), 2, old, get_strpath(self));
-}
-
-/*
- * Truncates the file to +length+ bytes.
- *
- * See File.truncate.
- */
-static VALUE
-path_truncate(VALUE self, VALUE length)
-{
- return rb_funcall(rb_cFile, rb_intern("truncate"), 2, get_strpath(self), length);
-}
-
-/*
- * Update the access and modification times of the file.
- *
- * See File.utime.
- */
-static VALUE
-path_utime(VALUE self, VALUE atime, VALUE mtime)
-{
- return rb_funcall(rb_cFile, rb_intern("utime"), 3, atime, mtime, get_strpath(self));
-}
-
-/*
- * Returns the last component of the path.
- *
- * See File.basename.
- */
-static VALUE
-path_basename(int argc, VALUE *argv, VALUE self)
-{
- VALUE str = get_strpath(self);
- VALUE fext;
- if (rb_scan_args(argc, argv, "01", &fext) == 0)
- str = rb_funcall(rb_cFile, rb_intern("basename"), 1, str);
- else
- str = rb_funcall(rb_cFile, rb_intern("basename"), 2, str, fext);
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * Returns all but the last component of the path.
- *
- * See File.dirname.
- */
-static VALUE
-path_dirname(VALUE self)
-{
- VALUE str = get_strpath(self);
- str = rb_funcall(rb_cFile, rb_intern("dirname"), 1, str);
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * Returns the file's extension.
- *
- * See File.extname.
- */
-static VALUE
-path_extname(VALUE self)
-{
- VALUE str = get_strpath(self);
- return rb_funcall(rb_cFile, rb_intern("extname"), 1, str);
-}
-
-/*
- * Returns the absolute path for the file.
- *
- * See File.expand_path.
- */
-static VALUE
-path_expand_path(int argc, VALUE *argv, VALUE self)
-{
- VALUE str = get_strpath(self);
- VALUE dname;
- if (rb_scan_args(argc, argv, "01", &dname) == 0)
- str = rb_funcall(rb_cFile, rb_intern("expand_path"), 1, str);
- else
- str = rb_funcall(rb_cFile, rb_intern("expand_path"), 2, str, dname);
- return rb_class_new_instance(1, &str, rb_obj_class(self));
-}
-
-/*
- * Returns the #dirname and the #basename in an Array.
- *
- * See File.split.
- */
-static VALUE
-path_split(VALUE self)
-{
- VALUE str = get_strpath(self);
- VALUE ary, dirname, basename;
- ary = rb_funcall(rb_cFile, rb_intern("split"), 1, str);
- ary = rb_check_array_type(ary);
- dirname = rb_ary_entry(ary, 0);
- basename = rb_ary_entry(ary, 1);
- dirname = rb_class_new_instance(1, &dirname, rb_obj_class(self));
- basename = rb_class_new_instance(1, &basename, rb_obj_class(self));
- return rb_ary_new3(2, dirname, basename);
-}
-
-/*
- * See FileTest.blockdev?.
- */
-static VALUE
-path_blockdev_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("blockdev?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.chardev?.
- */
-static VALUE
-path_chardev_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("chardev?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.executable?.
- */
-static VALUE
-path_executable_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("executable?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.executable_real?.
- */
-static VALUE
-path_executable_real_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("executable_real?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.exist?.
- */
-static VALUE
-path_exist_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("exist?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.grpowned?.
- */
-static VALUE
-path_grpowned_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("grpowned?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.directory?.
- */
-static VALUE
-path_directory_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.file?.
- */
-static VALUE
-path_file_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("file?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.pipe?.
- */
-static VALUE
-path_pipe_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("pipe?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.socket?.
- */
-static VALUE
-path_socket_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("socket?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.owned?.
- */
-static VALUE
-path_owned_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("owned?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.readable?.
- */
-static VALUE
-path_readable_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("readable?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.world_readable?.
- */
-static VALUE
-path_world_readable_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("world_readable?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.readable_real?.
- */
-static VALUE
-path_readable_real_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("readable_real?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.setuid?.
- */
-static VALUE
-path_setuid_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("setuid?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.setgid?.
- */
-static VALUE
-path_setgid_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("setgid?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.size.
- */
-static VALUE
-path_size(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("size"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.size?.
- */
-static VALUE
-path_size_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("size?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.sticky?.
- */
-static VALUE
-path_sticky_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("sticky?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.symlink?.
- */
-static VALUE
-path_symlink_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("symlink?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.writable?.
- */
-static VALUE
-path_writable_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("writable?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.world_writable?.
- */
-static VALUE
-path_world_writable_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("world_writable?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.writable_real?.
- */
-static VALUE
-path_writable_real_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("writable_real?"), 1, get_strpath(self));
-}
-
-/*
- * See FileTest.zero?.
- */
-static VALUE
-path_zero_p(VALUE self)
-{
- return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self));
-}
-
-static VALUE
-glob_i(VALUE elt, VALUE klass, int argc, VALUE *argv)
-{
- return rb_yield(rb_class_new_instance(1, &elt, klass));
-}
-
-/*
- * Returns or yields Pathname objects.
- *
- * Pathname.glob("config/" "*.rb")
- * #=> [#<Pathname:config/environment.rb>, #<Pathname:config/routes.rb>, ..]
- *
- * See Dir.glob.
- */
-static VALUE
-path_s_glob(int argc, VALUE *argv, VALUE klass)
-{
- VALUE args[2];
- int n;
-
- n = rb_scan_args(argc, argv, "11", &args[0], &args[1]);
- if (rb_block_given_p()) {
- return rb_block_call(rb_cDir, rb_intern("glob"), n, args, glob_i, klass);
- }
- else {
- VALUE ary;
- long i;
- ary = rb_funcall2(rb_cDir, rb_intern("glob"), n, args);
- ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- VALUE elt = RARRAY_PTR(ary)[i];
- elt = rb_class_new_instance(1, &elt, klass);
- rb_ary_store(ary, i, elt);
- }
- return ary;
- }
-}
-
-/*
- * Returns the current working directory as a Pathname.
- *
- * Pathname.getwd
- * #=> #<Pathname:/home/zzak/projects/ruby>
- *
- * See Dir.getwd.
- */
-static VALUE
-path_s_getwd(VALUE klass)
-{
- VALUE str;
- str = rb_funcall(rb_cDir, rb_intern("getwd"), 0);
- return rb_class_new_instance(1, &str, klass);
-}
-
-/*
- * Return the entries (files and subdirectories) in the directory, each as a
- * Pathname object.
- *
- * The results contains just the names in the directory, without any trailing
- * slashes or recursive look-up.
- *
- * pp Pathname.new('/usr/local').entries
- * #=> [#<Pathname:share>,
- * # #<Pathname:lib>,
- * # #<Pathname:..>,
- * # #<Pathname:include>,
- * # #<Pathname:etc>,
- * # #<Pathname:bin>,
- * # #<Pathname:man>,
- * # #<Pathname:games>,
- * # #<Pathname:.>,
- * # #<Pathname:sbin>,
- * # #<Pathname:src>]
- *
- * The result may contain the current directory <code>#<Pathname:.></code> and
- * the parent directory <code>#<Pathname:..></code>.
- *
- * If you don't want +.+ and +..+ and
- * want directories, consider Pathname#children.
- */
-static VALUE
-path_entries(VALUE self)
-{
- VALUE klass, str, ary;
- long i;
- klass = rb_obj_class(self);
- str = get_strpath(self);
- ary = rb_funcall(rb_cDir, rb_intern("entries"), 1, str);
- ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
- for (i = 0; i < RARRAY_LEN(ary); i++) {
- VALUE elt = RARRAY_PTR(ary)[i];
- elt = rb_class_new_instance(1, &elt, klass);
- rb_ary_store(ary, i, elt);
- }
- return ary;
-}
-
-/*
- * Create the referenced directory.
- *
- * See Dir.mkdir.
- */
-static VALUE
-path_mkdir(int argc, VALUE *argv, VALUE self)
-{
- VALUE str = get_strpath(self);
- VALUE vmode;
- if (rb_scan_args(argc, argv, "01", &vmode) == 0)
- return rb_funcall(rb_cDir, rb_intern("mkdir"), 1, str);
- else
- return rb_funcall(rb_cDir, rb_intern("mkdir"), 2, str, vmode);
-}
-
-/*
- * Remove the referenced directory.
- *
- * See Dir.rmdir.
- */
-static VALUE
-path_rmdir(VALUE self)
-{
- return rb_funcall(rb_cDir, rb_intern("rmdir"), 1, get_strpath(self));
-}
-
-/*
- * Opens the referenced directory.
- *
- * See Dir.open.
- */
-static VALUE
-path_opendir(VALUE self)
-{
- VALUE args[1];
-
- args[0] = get_strpath(self);
- return rb_block_call(rb_cDir, rb_intern("open"), 1, args, 0, 0);
-}
-
-static VALUE
-each_entry_i(VALUE elt, VALUE klass, int argc, VALUE *argv)
-{
- return rb_yield(rb_class_new_instance(1, &elt, klass));
-}
-
-/*
- * Iterates over the entries (files and subdirectories) in the directory,
- * yielding a Pathname object for each entry.
- */
-static VALUE
-path_each_entry(VALUE self)
-{
- VALUE args[1];
-
- args[0] = get_strpath(self);
- return rb_block_call(rb_cDir, rb_intern("foreach"), 1, args, each_entry_i, rb_obj_class(self));
-}
-
-static VALUE
-unlink_body(VALUE str)
-{
- return rb_funcall(rb_cDir, rb_intern("unlink"), 1, str);
-}
-
-static VALUE
-unlink_rescue(VALUE str, VALUE errinfo)
-{
- return rb_funcall(rb_cFile, rb_intern("unlink"), 1, str);
-}
-
-/*
- * Removes a file or directory, using File.unlink if +self+ is a file, or
- * Dir.unlink as necessary.
- */
-static VALUE
-path_unlink(VALUE self)
-{
- VALUE eENOTDIR = rb_const_get_at(rb_mErrno, rb_intern("ENOTDIR"));
- VALUE str = get_strpath(self);
- return rb_rescue2(unlink_body, str, unlink_rescue, str, eENOTDIR, (VALUE)0);
-}
-
-/*
- * Creates a new Pathname object.
- */
-static VALUE
-path_f_pathname(VALUE self, VALUE str)
-{
- return rb_class_new_instance(1, &str, rb_cPathname);
-}
-
-/*
- *
- * Pathname represents the name of a file or directory on the filesystem,
- * but not the file itself.
- *
- * The pathname depends on the Operating System: Unix, Windows, etc.
- * This library works with pathnames of local OS, however non-Unix pathnames
- * are supported experimentally.
- *
- * A Pathname can be relative or absolute. It's not until you try to
- * reference the file that it even matters whether the file exists or not.
- *
- * Pathname is immutable. It has no method for destructive update.
- *
- * The goal of this class is to manipulate file path information in a neater
- * way than standard Ruby provides. The examples below demonstrate the
- * difference.
- *
- * *All* functionality from File, FileTest, and some from Dir and FileUtils is
- * included, in an unsurprising way. It is essentially a facade for all of
- * these, and more.
- *
- * == Examples
- *
- * === 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| _ }
- *
- * === 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| _ }
- *
- * === Example 3: Special features
- *
- * p1 = Pathname.new("/usr/lib") # Pathname:/usr/lib
- * p2 = p1 + "ruby/1.8" # Pathname:/usr/lib/ruby/1.8
- * p3 = p1.parent # Pathname:/usr
- * p4 = p2.relative_path_from(p3) # Pathname:lib/ruby/1.8
- * pwd = Pathname.pwd # Pathname:/home/gavin
- * pwd.absolute? # true
- * p5 = Pathname.new "." # Pathname:.
- * p5 = p5 + "music/../articles" # Pathname:music/../articles
- * 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. None of these access the file system except for
- * #mountpoint?, #children, #each_child, #realdirpath and #realpath.
- *
- * - +
- * - #join
- * - #parent
- * - #root?
- * - #absolute?
- * - #relative?
- * - #relative_path_from
- * - #each_filename
- * - #cleanpath
- * - #realpath
- * - #realdirpath
- * - #children
- * - #each_child
- * - #mountpoint?
- *
- * === File status predicate methods
- *
- * These methods are a facade for FileTest:
- * - #blockdev?
- * - #chardev?
- * - #directory?
- * - #executable?
- * - #executable_real?
- * - #exist?
- * - #file?
- * - #grpowned?
- * - #owned?
- * - #pipe?
- * - #readable?
- * - #world_readable?
- * - #readable_real?
- * - #setgid?
- * - #setuid?
- * - #size
- * - #size?
- * - #socket?
- * - #sticky?
- * - #symlink?
- * - #writable?
- * - #world_writable?
- * - #writable_real?
- * - #zero?
- *
- * === File property and manipulation methods
- *
- * These methods are a facade for File:
- * - #atime
- * - #ctime
- * - #mtime
- * - #chmod(mode)
- * - #lchmod(mode)
- * - #chown(owner, group)
- * - #lchown(owner, group)
- * - #fnmatch(pattern, *args)
- * - #fnmatch?(pattern, *args)
- * - #ftype
- * - #make_link(old)
- * - #open(*args, &block)
- * - #readlink
- * - #rename(to)
- * - #stat
- * - #lstat
- * - #make_symlink(old)
- * - #truncate(length)
- * - #utime(atime, mtime)
- * - #basename(*args)
- * - #dirname
- * - #extname
- * - #expand_path(*args)
- * - #split
- *
- * === Directory methods
- *
- * These methods are a facade for Dir:
- * - Pathname.glob(*args)
- * - Pathname.getwd / Pathname.pwd
- * - #rmdir
- * - #entries
- * - #each_entry(&block)
- * - #mkdir(*args)
- * - #opendir(*args)
- *
- * === IO
- *
- * These methods are a facade for IO:
- * - #each_line(*args, &block)
- * - #read(*args)
- * - #binread(*args)
- * - #readlines(*args)
- * - #sysopen(*args)
- *
- * === Utilities
- *
- * These methods are a mixture of Find, FileUtils, and others:
- * - #find(&block)
- * - #mkpath
- * - #rmtree
- * - #unlink / #delete
- *
- *
- * == Method documentation
- *
- * As the above section shows, most of the methods in Pathname are facades. The
- * documentation for these methods generally just says, for instance, "See
- * FileTest.writable?", as you should be familiar with the original method
- * anyway, and its documentation (e.g. through +ri+) will contain more
- * information. In some cases, a brief description will follow.
- */
-void
-Init_pathname()
-{
- id_at_path = rb_intern("@path");
- id_to_path = rb_intern("to_path");
-
- rb_cPathname = rb_define_class("Pathname", rb_cObject);
- rb_define_method(rb_cPathname, "initialize", path_initialize, 1);
- rb_define_method(rb_cPathname, "freeze", path_freeze, 0);
- rb_define_method(rb_cPathname, "taint", path_taint, 0);
- rb_define_method(rb_cPathname, "untaint", path_untaint, 0);
- rb_define_method(rb_cPathname, "==", path_eq, 1);
- rb_define_method(rb_cPathname, "===", path_eq, 1);
- rb_define_method(rb_cPathname, "eql?", path_eq, 1);
- rb_define_method(rb_cPathname, "<=>", path_cmp, 1);
- rb_define_method(rb_cPathname, "hash", path_hash, 0);
- rb_define_method(rb_cPathname, "to_s", path_to_s, 0);
- rb_define_method(rb_cPathname, "to_path", path_to_s, 0);
- rb_define_method(rb_cPathname, "inspect", path_inspect, 0);
- rb_define_method(rb_cPathname, "sub", path_sub, -1);
- rb_define_method(rb_cPathname, "sub_ext", path_sub_ext, 1);
- rb_define_method(rb_cPathname, "realpath", path_realpath, -1);
- rb_define_method(rb_cPathname, "realdirpath", path_realdirpath, -1);
- rb_define_method(rb_cPathname, "each_line", path_each_line, -1);
- rb_define_method(rb_cPathname, "read", path_read, -1);
- rb_define_method(rb_cPathname, "binread", path_binread, -1);
- rb_define_method(rb_cPathname, "readlines", path_readlines, -1);
- rb_define_method(rb_cPathname, "sysopen", path_sysopen, -1);
- rb_define_method(rb_cPathname, "atime", path_atime, 0);
- rb_define_method(rb_cPathname, "ctime", path_ctime, 0);
- rb_define_method(rb_cPathname, "mtime", path_mtime, 0);
- rb_define_method(rb_cPathname, "chmod", path_chmod, 1);
- rb_define_method(rb_cPathname, "lchmod", path_lchmod, 1);
- rb_define_method(rb_cPathname, "chown", path_chown, 2);
- rb_define_method(rb_cPathname, "lchown", path_lchown, 2);
- rb_define_method(rb_cPathname, "fnmatch", path_fnmatch, -1);
- rb_define_method(rb_cPathname, "fnmatch?", path_fnmatch, -1);
- rb_define_method(rb_cPathname, "ftype", path_ftype, 0);
- rb_define_method(rb_cPathname, "make_link", path_make_link, 1);
- rb_define_method(rb_cPathname, "open", path_open, -1);
- rb_define_method(rb_cPathname, "readlink", path_readlink, 0);
- rb_define_method(rb_cPathname, "rename", path_rename, 1);
- rb_define_method(rb_cPathname, "stat", path_stat, 0);
- rb_define_method(rb_cPathname, "lstat", path_lstat, 0);
- rb_define_method(rb_cPathname, "make_symlink", path_make_symlink, 1);
- rb_define_method(rb_cPathname, "truncate", path_truncate, 1);
- rb_define_method(rb_cPathname, "utime", path_utime, 2);
- rb_define_method(rb_cPathname, "basename", path_basename, -1);
- rb_define_method(rb_cPathname, "dirname", path_dirname, 0);
- rb_define_method(rb_cPathname, "extname", path_extname, 0);
- rb_define_method(rb_cPathname, "expand_path", path_expand_path, -1);
- rb_define_method(rb_cPathname, "split", path_split, 0);
- rb_define_method(rb_cPathname, "blockdev?", path_blockdev_p, 0);
- rb_define_method(rb_cPathname, "chardev?", path_chardev_p, 0);
- rb_define_method(rb_cPathname, "executable?", path_executable_p, 0);
- rb_define_method(rb_cPathname, "executable_real?", path_executable_real_p, 0);
- rb_define_method(rb_cPathname, "exist?", path_exist_p, 0);
- rb_define_method(rb_cPathname, "grpowned?", path_grpowned_p, 0);
- rb_define_method(rb_cPathname, "directory?", path_directory_p, 0);
- rb_define_method(rb_cPathname, "file?", path_file_p, 0);
- rb_define_method(rb_cPathname, "pipe?", path_pipe_p, 0);
- rb_define_method(rb_cPathname, "socket?", path_socket_p, 0);
- rb_define_method(rb_cPathname, "owned?", path_owned_p, 0);
- rb_define_method(rb_cPathname, "readable?", path_readable_p, 0);
- rb_define_method(rb_cPathname, "world_readable?", path_world_readable_p, 0);
- rb_define_method(rb_cPathname, "readable_real?", path_readable_real_p, 0);
- rb_define_method(rb_cPathname, "setuid?", path_setuid_p, 0);
- rb_define_method(rb_cPathname, "setgid?", path_setgid_p, 0);
- rb_define_method(rb_cPathname, "size", path_size, 0);
- rb_define_method(rb_cPathname, "size?", path_size_p, 0);
- rb_define_method(rb_cPathname, "sticky?", path_sticky_p, 0);
- rb_define_method(rb_cPathname, "symlink?", path_symlink_p, 0);
- rb_define_method(rb_cPathname, "writable?", path_writable_p, 0);
- rb_define_method(rb_cPathname, "world_writable?", path_world_writable_p, 0);
- rb_define_method(rb_cPathname, "writable_real?", path_writable_real_p, 0);
- rb_define_method(rb_cPathname, "zero?", path_zero_p, 0);
- rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1);
- rb_define_singleton_method(rb_cPathname, "getwd", path_s_getwd, 0);
- rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0);
- rb_define_method(rb_cPathname, "entries", path_entries, 0);
- rb_define_method(rb_cPathname, "mkdir", path_mkdir, -1);
- rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
- rb_define_method(rb_cPathname, "opendir", path_opendir, 0);
- rb_define_method(rb_cPathname, "each_entry", path_each_entry, 0);
- rb_define_method(rb_cPathname, "unlink", path_unlink, 0);
- rb_define_method(rb_cPathname, "delete", path_unlink, 0);
- rb_undef_method(rb_cPathname, "=~");
- rb_define_global_function("Pathname", path_f_pathname, 1);
-}
diff --git a/ext/psych/.gitignore b/ext/psych/.gitignore
deleted file mode 100644
index 836058c169..0000000000
--- a/ext/psych/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/api.c
-/config.h
-/dumper.c
-/emitter.c
-/loader.c
-/parser.c
-/reader.c
-/scanner.c
-/writer.c
-/yaml.h
-/yaml_private.h
diff --git a/ext/psych/emitter.c b/ext/psych/emitter.c
new file mode 100644
index 0000000000..befa98e821
--- /dev/null
+++ b/ext/psych/emitter.c
@@ -0,0 +1,412 @@
+#include <psych.h>
+
+VALUE cPsychEmitter;
+static ID id_write;
+
+static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
+{
+ if(!yaml_emitter_emit(emitter, event))
+ rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+}
+
+static int writer(void *ctx, unsigned char *buffer, size_t size)
+{
+ VALUE io = (VALUE)ctx;
+ VALUE str = rb_str_new((const char *)buffer, (long)size);
+ VALUE wrote = rb_funcall(io, id_write, 1, str);
+ return (int)NUM2INT(wrote);
+}
+
+static void dealloc(yaml_emitter_t * emitter)
+{
+ yaml_emitter_delete(emitter);
+ free(emitter);
+}
+
+static VALUE allocate(VALUE klass)
+{
+ yaml_emitter_t * emitter = malloc(sizeof(yaml_emitter_t));
+ yaml_emitter_initialize(emitter);
+ yaml_emitter_set_unicode(emitter, 1);
+ yaml_emitter_set_indent(emitter, 2);
+
+ return Data_Wrap_Struct(klass, 0, dealloc, emitter);
+}
+
+/* call-seq: Psych::Emitter.new(io)
+ *
+ * Create a new Psych::Emitter that writes to +io+.
+ */
+static VALUE initialize(VALUE self, VALUE io)
+{
+ yaml_emitter_t * emitter;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_emitter_set_output(emitter, writer, (void *)io);
+
+ return self;
+}
+
+/* call-seq: emitter.start_stream(encoding)
+ *
+ * Start a stream emission with +encoding+
+ *
+ * See Psych::Handler#start_stream
+ */
+static VALUE start_stream(VALUE self, VALUE encoding)
+{
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+ Check_Type(encoding, T_FIXNUM);
+
+ yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.end_stream
+ *
+ * End a stream emission
+ *
+ * See Psych::Handler#end_stream
+ */
+static VALUE end_stream(VALUE self)
+{
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_stream_end_event_initialize(&event);
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+ yaml_emitter_t * emitter;
+ yaml_tag_directive_t * head = NULL;
+ yaml_tag_directive_t * tail = NULL;
+ yaml_event_t event;
+ yaml_version_directive_t version_directive;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+
+ Check_Type(version, T_ARRAY);
+
+ if(RARRAY_LEN(version) > 0) {
+ VALUE major = rb_ary_entry(version, (long)0);
+ VALUE minor = rb_ary_entry(version, (long)1);
+
+ version_directive.major = NUM2INT(major);
+ version_directive.minor = NUM2INT(minor);
+ }
+
+ if(RTEST(tags)) {
+ int i = 0;
+
+ Check_Type(tags, T_ARRAY);
+
+ head = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
+ tail = head;
+
+ for(i = 0; i < RARRAY_LEN(tags); i++) {
+ VALUE tuple = RARRAY_PTR(tags)[i];
+ Check_Type(tuple, T_ARRAY);
+
+ if(RARRAY_LEN(tuple) < 2) {
+ xfree(head);
+ rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+ }
+
+ tail->handle = (yaml_char_t *)StringValuePtr(RARRAY_PTR(tuple)[0]);
+ tail->prefix = (yaml_char_t *)StringValuePtr(RARRAY_PTR(tuple)[1]);
+
+ tail++;
+ }
+ }
+
+ yaml_document_start_event_initialize(
+ &event,
+ (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+ head,
+ tail,
+ imp ? 1 : 0
+ );
+
+ emit(emitter, &event);
+
+ if(head) xfree(head);
+
+ return self;
+}
+
+/* call-seq: emitter.end_document(implicit)
+ *
+ * End a document emission with an +implicit+ ending.
+ *
+ * See Psych::Handler#end_document
+ */
+static VALUE end_document(VALUE self, VALUE imp)
+{
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_document_end_event_initialize(&event, imp ? 1 : 0);
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.scalar(value, anchor, tag, plain, quoted, style)
+ *
+ * Emit a scalar with +value+, +anchor+, +tag+, and a +plain+ or +quoted+
+ * string type with +style+.
+ *
+ * See Psych::Handler#scalar
+ */
+static VALUE scalar(
+ VALUE self,
+ VALUE value,
+ VALUE anchor,
+ VALUE tag,
+ VALUE plain,
+ VALUE quoted,
+ VALUE style
+ ) {
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ Check_Type(value, T_STRING);
+
+ yaml_scalar_event_initialize(
+ &event,
+ (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+ (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+ (yaml_char_t*)StringValuePtr(value),
+ (int)RSTRING_LEN(value),
+ plain ? 1 : 0,
+ quoted ? 1 : 0,
+ (yaml_scalar_style_t)NUM2INT(style)
+ );
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.start_sequence(anchor, tag, implicit, style)
+ *
+ * Start emitting a sequence with +anchor+, a +tag+, +implicit+ sequence
+ * start and end, along with +style+.
+ *
+ * See Psych::Handler#start_sequence
+ */
+static VALUE start_sequence(
+ VALUE self,
+ VALUE anchor,
+ VALUE tag,
+ VALUE implicit,
+ VALUE style
+ ) {
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_sequence_start_event_initialize(
+ &event,
+ (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+ (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+ implicit ? 1 : 0,
+ (yaml_sequence_style_t)NUM2INT(style)
+ );
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.end_sequence
+ *
+ * End sequence emission.
+ *
+ * See Psych::Handler#end_sequence
+ */
+static VALUE end_sequence(VALUE self)
+{
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_sequence_end_event_initialize(&event);
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.start_mapping(anchor, tag, implicit, style)
+ *
+ * Start emitting a YAML map with +anchor+, +tag+, an +implicit+ start
+ * and end, and +style+.
+ *
+ * See Psych::Handler#start_mapping
+ */
+static VALUE start_mapping(
+ VALUE self,
+ VALUE anchor,
+ VALUE tag,
+ VALUE implicit,
+ VALUE style
+ ) {
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_mapping_start_event_initialize(
+ &event,
+ (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
+ (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
+ implicit ? 1 : 0,
+ (yaml_sequence_style_t)NUM2INT(style)
+ );
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.end_mapping
+ *
+ * Emit the end of a mapping.
+ *
+ * See Psych::Handler#end_mapping
+ */
+static VALUE end_mapping(VALUE self)
+{
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_mapping_end_event_initialize(&event);
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.alias(anchor)
+ *
+ * Emit an alias with +anchor+.
+ *
+ * See Psych::Handler#alias
+ */
+static VALUE alias(VALUE self, VALUE anchor)
+{
+ yaml_emitter_t * emitter;
+ yaml_event_t event;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_alias_event_initialize(
+ &event,
+ (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
+ );
+
+ emit(emitter, &event);
+
+ return self;
+}
+
+/* call-seq: emitter.canonical = true
+ *
+ * Set the output style to canonical, or not.
+ */
+static VALUE set_canonical(VALUE self, VALUE style)
+{
+ yaml_emitter_t * emitter;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
+
+ return style;
+}
+
+/* call-seq: emitter.canonical
+ *
+ * Get the output style, canonical or not.
+ */
+static VALUE canonical(VALUE self)
+{
+ yaml_emitter_t * emitter;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ return (emitter->canonical == 0) ? Qfalse : Qtrue;
+}
+
+/* call-seq: emitter.indentation = level
+ *
+ * Set the indentation level to +level+.
+ */
+static VALUE set_indentation(VALUE self, VALUE level)
+{
+ yaml_emitter_t * emitter;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ yaml_emitter_set_indent(emitter, NUM2INT(level));
+
+ return level;
+}
+
+/* call-seq: emitter.indentation
+ *
+ * Get the indentation level.
+ */
+static VALUE indentation(VALUE self)
+{
+ yaml_emitter_t * emitter;
+ Data_Get_Struct(self, yaml_emitter_t, emitter);
+
+ return INT2NUM(emitter->best_indent);
+}
+
+void Init_psych_emitter()
+{
+ VALUE psych = rb_define_module("Psych");
+ VALUE handler = rb_define_class_under(psych, "Handler", rb_cObject);
+ cPsychEmitter = rb_define_class_under(psych, "Emitter", handler);
+
+ rb_define_alloc_func(cPsychEmitter, allocate);
+
+ rb_define_method(cPsychEmitter, "initialize", initialize, 1);
+ rb_define_method(cPsychEmitter, "start_stream", start_stream, 1);
+ rb_define_method(cPsychEmitter, "end_stream", end_stream, 0);
+ rb_define_method(cPsychEmitter, "start_document", start_document, 3);
+ rb_define_method(cPsychEmitter, "end_document", end_document, 1);
+ rb_define_method(cPsychEmitter, "scalar", scalar, 6);
+ rb_define_method(cPsychEmitter, "start_sequence", start_sequence, 4);
+ rb_define_method(cPsychEmitter, "end_sequence", end_sequence, 0);
+ rb_define_method(cPsychEmitter, "start_mapping", start_mapping, 4);
+ rb_define_method(cPsychEmitter, "end_mapping", end_mapping, 0);
+ rb_define_method(cPsychEmitter, "alias", alias, 1);
+ rb_define_method(cPsychEmitter, "canonical", canonical, 0);
+ rb_define_method(cPsychEmitter, "canonical=", set_canonical, 1);
+ rb_define_method(cPsychEmitter, "indentation", indentation, 0);
+ rb_define_method(cPsychEmitter, "indentation=", set_indentation, 1);
+
+ id_write = rb_intern("write");
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_emitter.h b/ext/psych/emitter.h
index 560451ef31..560451ef31 100644
--- a/ext/psych/psych_emitter.h
+++ b/ext/psych/emitter.h
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 65e83a3554..11f44ac104 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -1,38 +1,16 @@
-# -*- coding: us-ascii -*-
require 'mkmf'
-require 'fileutils'
# :stopdoc:
dir_config 'libyaml'
-if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_library('yaml', 'yaml_get_version'))
- # Embed libyaml since we could not find it.
-
- $VPATH << "$(srcdir)/yaml"
- $INCFLAGS << " -I$(srcdir)/yaml"
-
- $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}
-
- if have_macro("_WIN32")
- $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
- end
-
- have_header 'dlfcn.h'
- have_header 'inttypes.h'
- have_header 'memory.h'
- have_header 'stdint.h'
- have_header 'stdlib.h'
- have_header 'strings.h'
- have_header 'string.h'
- have_header 'sys/stat.h'
- have_header 'sys/types.h'
- have_header 'unistd.h'
-
- find_header 'yaml.h'
- have_header 'config.h'
+def asplode missing
+ abort "#{missing} is missing. Please install libyaml."
end
+asplode('yaml.h') unless find_header 'yaml.h'
+asplode('libyaml') unless find_library 'yaml', 'yaml_get_version'
+
create_makefile 'psych'
# :startdoc:
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index e9571b7414..464fae499e 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,29 +1,23 @@
require 'psych.so'
require 'psych/nodes'
-require 'psych/streaming'
require 'psych/visitors'
require 'psych/handler'
require 'psych/tree_builder'
+require 'psych/json/tree_builder'
require 'psych/parser'
require 'psych/omap'
require 'psych/set'
require 'psych/coder'
require 'psych/core_ext'
require 'psych/deprecated'
-require 'psych/stream'
-require 'psych/json/tree_builder'
-require 'psych/json/stream'
-require 'psych/handlers/document_stream'
###
# = Overview
#
-# Psych is a YAML parser and emitter.
-# Psych leverages libyaml [Home page: http://pyyaml.org/wiki/LibYAML]
-# or [Git repo: https://github.com/zerotao/libyaml] for its YAML parsing
-# and emitting capabilities. In addition to wrapping libyaml, Psych also
-# knows how to serialize and de-serialize most Ruby objects to and from
-# the YAML format.
+# Psych is a YAML parser and emitter. Psych leverages
+# libyaml[http://libyaml.org] for it's YAML parsing and emitting capabilities.
+# In addition to wrapping libyaml, Psych also knows how to serialize and
+# de-serialize most Ruby objects to and from the YAML format.
#
# = I NEED TO PARSE OR EMIT YAML RIGHT NOW!
#
@@ -95,74 +89,42 @@ require 'psych/handlers/document_stream'
module Psych
# The version is Psych you're using
- VERSION = '2.0.0'
+ VERSION = '1.0.0'
# The version of libyaml Psych is using
LIBYAML_VERSION = Psych.libyaml_version.join '.'
- class Exception < RuntimeError
- end
-
- class BadAlias < Exception
- end
-
###
# Load +yaml+ in to a Ruby data structure. If multiple documents are
# provided, the object contained in the first document will be returned.
- # +filename+ will be used in the exception message if any exception is raised
- # while parsing.
- #
- # Raises a Psych::SyntaxError when a YAML syntax error is detected.
#
# Example:
#
- # Psych.load("--- a") # => 'a'
- # Psych.load("---\n - a\n - b") # => ['a', 'b']
- #
- # begin
- # Psych.load("--- `", "file.txt")
- # rescue Psych::SyntaxError => ex
- # ex.file # => 'file.txt'
- # ex.message # => "(file.txt): found character that cannot start any token"
- # end
- def self.load yaml, filename = nil
- result = parse(yaml, filename)
+ # Psych.load("--- a") # => 'a'
+ # Psych.load("---\n - a\n - b") # => ['a', 'b']
+ def self.load yaml
+ result = parse(yaml)
result ? result.to_ruby : result
end
###
# Parse a YAML string in +yaml+. Returns the first object of a YAML AST.
- # +filename+ is used in the exception message if a Psych::SyntaxError is
- # raised.
- #
- # Raises a Psych::SyntaxError when a YAML syntax error is detected.
#
# Example:
#
# Psych.parse("---\n - a\n - b") # => #<Psych::Nodes::Sequence:0x00>
#
- # begin
- # Psych.parse("--- `", "file.txt")
- # rescue Psych::SyntaxError => ex
- # ex.file # => 'file.txt'
- # ex.message # => "(file.txt): found character that cannot start any token"
- # end
- #
# See Psych::Nodes for more information about YAML AST.
- def self.parse yaml, filename = nil
- parse_stream(yaml, filename) do |node|
- return node
- end
- false
+ def self.parse yaml
+ children = parse_stream(yaml).children
+ children.empty? ? false : children.first.children.first
end
###
# Parse a file at +filename+. Returns the YAML AST.
- #
- # Raises a Psych::SyntaxError when a YAML syntax error is detected.
def self.parse_file filename
- File.open filename, 'r:bom|utf-8' do |f|
- parse f, filename
+ File.open filename do |f|
+ parse f
end
end
@@ -175,65 +137,24 @@ module Psych
###
# Parse a YAML string in +yaml+. Returns the full AST for the YAML document.
# This method can handle multiple YAML documents contained in +yaml+.
- # +filename+ is used in the exception message if a Psych::SyntaxError is
- # raised.
- #
- # If a block is given, a Psych::Nodes::Document node will be yielded to the
- # block as it's being parsed.
- #
- # Raises a Psych::SyntaxError when a YAML syntax error is detected.
#
# Example:
#
# Psych.parse_stream("---\n - a\n - b") # => #<Psych::Nodes::Stream:0x00>
#
- # Psych.parse_stream("--- a\n--- b") do |node|
- # node # => #<Psych::Nodes::Document:0x00>
- # end
- #
- # begin
- # Psych.parse_stream("--- `", "file.txt")
- # rescue Psych::SyntaxError => ex
- # ex.file # => 'file.txt'
- # ex.message # => "(file.txt): found character that cannot start any token"
- # end
- #
# See Psych::Nodes for more information about YAML AST.
- def self.parse_stream yaml, filename = nil, &block
- if block_given?
- parser = Psych::Parser.new(Handlers::DocumentStream.new(&block))
- parser.parse yaml, filename
- else
- parser = self.parser
- parser.parse yaml, filename
- parser.handler.root
- end
+ def self.parse_stream yaml
+ parser = self.parser
+ parser.parse yaml
+ parser.handler.root
end
###
- # call-seq:
- # Psych.dump(o) -> string of yaml
- # Psych.dump(o, options) -> string of yaml
- # Psych.dump(o, io) -> io object passed in
- # Psych.dump(o, io, options) -> io object passed in
- #
- # Dump Ruby object +o+ to a YAML string. Optional +options+ may be passed in
- # to control the output format. If an IO object is passed in, the YAML will
- # be dumped to that IO object.
+ # Dump Ruby object +o+ to a YAML string using +options+.
#
# Example:
#
- # # Dump an array, get back a YAML string
# Psych.dump(['a', 'b']) # => "---\n- a\n- b\n"
- #
- # # Dump an array to an IO object
- # Psych.dump(['a', 'b'], StringIO.new) # => #<StringIO:0x000001009d0890>
- #
- # # Dump an array with indentation set
- # Psych.dump(['a', ['b']], :indentation => 3) # => "---\n- a\n- - b\n"
- #
- # # Dump an array to an IO with indentation set
- # Psych.dump(['a', ['b']], StringIO.new, :indentation => 3)
def self.dump o, io = nil, options = {}
if Hash === io
options = io
@@ -242,7 +163,7 @@ module Psych
visitor = Psych::Visitors::YAMLTree.new options
visitor << o
- visitor.tree.yaml io, options
+ visitor.tree.to_yaml io
end
###
@@ -256,7 +177,7 @@ module Psych
objects.each do |o|
visitor << o
end
- visitor.tree.yaml
+ visitor.tree.to_yaml
end
###
@@ -264,39 +185,24 @@ module Psych
def self.to_json o
visitor = Psych::Visitors::JSONTree.new
visitor << o
- visitor.tree.yaml
+ visitor.tree.to_yaml
end
###
# Load multiple documents given in +yaml+. Returns the parsed documents
- # as a list. If a block is given, each document will be converted to ruby
- # and passed to the block during parsing
- #
- # Example:
+ # as a list. For example:
#
# Psych.load_stream("--- foo\n...\n--- bar\n...") # => ['foo', 'bar']
#
- # list = []
- # Psych.load_stream("--- foo\n...\n--- bar\n...") do |ruby|
- # list << ruby
- # end
- # list # => ['foo', 'bar']
- #
- def self.load_stream yaml, filename = nil
- if block_given?
- parse_stream(yaml, filename) do |node|
- yield node.to_ruby
- end
- else
- parse_stream(yaml, filename).children.map { |child| child.to_ruby }
- end
+ def self.load_stream yaml
+ parse_stream(yaml).children.map { |child| child.to_ruby }
end
###
# Load the document contained in +filename+. Returns the yaml contained in
# +filename+ as a ruby object
def self.load_file filename
- File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
+ self.load File.open(filename)
end
# :stopdoc:
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb
index 2b830d2b21..c06c9c1e61 100644
--- a/ext/psych/lib/psych/coder.rb
+++ b/ext/psych/lib/psych/coder.rb
@@ -6,18 +6,17 @@ module Psych
# objects like Sequence and Scalar may be emitted if +seq=+ or +scalar=+ are
# called, respectively.
class Coder
- attr_accessor :tag, :style, :implicit, :object
+ attr_accessor :tag, :style, :implicit
attr_reader :type, :seq
def initialize tag
- @map = {}
- @seq = []
- @implicit = false
- @type = :map
- @tag = tag
- @style = Psych::Nodes::Mapping::BLOCK
- @scalar = nil
- @object = nil
+ @map = {}
+ @seq = []
+ @implicit = false
+ @type = :map
+ @tag = tag
+ @style = Psych::Nodes::Mapping::BLOCK
+ @scalar = nil
end
def scalar *args
@@ -55,13 +54,6 @@ module Psych
self.map = map
end
- # Emit an arbitrary object +obj+ and +tag+
- def represent_object tag, obj
- @tag = tag
- @type = :object
- @object = obj
- end
-
# Emit a scalar with +value+
def scalar= value
@type = :scalar
diff --git a/ext/psych/lib/psych/core_ext.rb b/ext/psych/lib/psych/core_ext.rb
index 9c8134da7e..8d3e8fb7b6 100644
--- a/ext/psych/lib/psych/core_ext.rb
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -6,10 +6,9 @@ class Object
# FIXME: rename this to "to_yaml" when syck is removed
###
- # call-seq: to_yaml(options = {})
+ # call-seq: to_yaml
#
- # Convert an object to YAML. See Psych.dump for more information on the
- # available +options+.
+ # Convert an object to YAML
def psych_to_yaml options = {}
Psych.dump self, options
end
@@ -30,6 +29,10 @@ class Module
alias :yaml_as :psych_yaml_as
end
-if defined?(::IRB)
- require 'psych/y'
+module Kernel
+ def psych_y *objects
+ puts Psych.dump_stream(*objects)
+ end
+ remove_method :y rescue nil
+ alias y psych_y
end
diff --git a/ext/psych/lib/psych/deprecated.rb b/ext/psych/lib/psych/deprecated.rb
index 1e42859b22..f4034e32c0 100644
--- a/ext/psych/lib/psych/deprecated.rb
+++ b/ext/psych/lib/psych/deprecated.rb
@@ -21,7 +21,6 @@ module Psych
target.psych_to_yaml unless opts[:nodump]
end
- # This method is deprecated, use Psych.load_stream instead.
def self.load_documents yaml, &block
if $VERBOSE
warn "#{caller[0]}: load_documents is deprecated, use load_stream"
@@ -77,7 +76,6 @@ module Psych
end
class Object
- undef :to_yaml_properties rescue nil
def to_yaml_properties # :nodoc:
instance_variables
end
diff --git a/ext/psych/lib/psych/handler.rb b/ext/psych/lib/psych/handler.rb
index c55afe745f..bfc62d701f 100644
--- a/ext/psych/lib/psych/handler.rb
+++ b/ext/psych/lib/psych/handler.rb
@@ -11,34 +11,6 @@ module Psych
# See Psych::Parser for more details
class Handler
###
- # Configuration options for dumping YAML.
- class DumperOptions
- attr_accessor :line_width, :indentation, :canonical
-
- def initialize
- @line_width = 0
- @indentation = 2
- @canonical = false
- end
- end
-
- # Default dumping options
- OPTIONS = DumperOptions.new
-
- # Events that a Handler should respond to.
- EVENTS = [ :alias,
- :empty,
- :end_document,
- :end_mapping,
- :end_sequence,
- :end_stream,
- :scalar,
- :start_document,
- :start_mapping,
- :start_sequence,
- :start_stream ]
-
- ###
# Called with +encoding+ when the YAML stream starts. This method is
# called once per stream. A stream may contain multiple documents.
#
@@ -239,11 +211,5 @@ module Psych
# Called when the YAML stream ends
def end_stream
end
-
- ###
- # Is this handler a streaming handler?
- def streaming?
- false
- end
end
end
diff --git a/ext/psych/lib/psych/handlers/document_stream.rb b/ext/psych/lib/psych/handlers/document_stream.rb
deleted file mode 100644
index e429993c1c..0000000000
--- a/ext/psych/lib/psych/handlers/document_stream.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'psych/tree_builder'
-
-module Psych
- module Handlers
- class DocumentStream < Psych::TreeBuilder # :nodoc:
- def initialize &block
- super
- @block = block
- end
-
- def start_document version, tag_directives, implicit
- n = Nodes::Document.new version, tag_directives, implicit
- push n
- end
-
- def end_document implicit_end = !streaming?
- @last.implicit_end = implicit_end
- @block.call pop
- end
- end
- end
-end
diff --git a/ext/psych/lib/psych/handlers/recorder.rb b/ext/psych/lib/psych/handlers/recorder.rb
deleted file mode 100644
index 4eae62e5f9..0000000000
--- a/ext/psych/lib/psych/handlers/recorder.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'psych/handler'
-
-module Psych
- module Handlers
- ###
- # This handler will capture an event and record the event. Recorder events
- # are available vial Psych::Handlers::Recorder#events.
- #
- # For example:
- #
- # recorder = Psych::Handlers::Recorder.new
- # parser = Psych::Parser.new recorder
- # parser.parse '--- foo'
- #
- # recorder.events # => [list of events]
- #
- # # Replay the events
- #
- # emitter = Psych::Emitter.new $stdout
- # recorder.events.each do |m, args|
- # emitter.send m, *args
- # end
-
- class Recorder < Psych::Handler
- attr_reader :events
-
- def initialize
- @events = []
- super
- end
-
- EVENTS.each do |event|
- define_method event do |*args|
- @events << [event, args]
- end
- end
- end
- end
-end
diff --git a/ext/psych/lib/psych/json/ruby_events.rb b/ext/psych/lib/psych/json/ruby_events.rb
deleted file mode 100644
index 6b73249c06..0000000000
--- a/ext/psych/lib/psych/json/ruby_events.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Psych
- module JSON
- module RubyEvents # :nodoc:
- def visit_Time o
- formatted = format_time o
- @emitter.scalar formatted, nil, nil, false, true, Nodes::Scalar::DOUBLE_QUOTED
- end
-
- def visit_DateTime o
- visit_Time o.to_time
- end
-
- def visit_String o
- @emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::DOUBLE_QUOTED
- end
- alias :visit_Symbol :visit_String
- end
- end
-end
diff --git a/ext/psych/lib/psych/json/stream.rb b/ext/psych/lib/psych/json/stream.rb
deleted file mode 100644
index be1a0a8a82..0000000000
--- a/ext/psych/lib/psych/json/stream.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'psych/json/ruby_events'
-require 'psych/json/yaml_events'
-
-module Psych
- module JSON
- class Stream < Psych::Visitors::JSONTree
- include Psych::JSON::RubyEvents
- include Psych::Streaming
-
- class Emitter < Psych::Stream::Emitter # :nodoc:
- include Psych::JSON::YAMLEvents
- end
- end
- end
-end
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index b799c93f58..12e0625866 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -1,12 +1,24 @@
-require 'psych/json/yaml_events'
-
module Psych
module JSON
###
# Psych::JSON::TreeBuilder is an event based AST builder. Events are sent
# to an instance of Psych::JSON::TreeBuilder and a JSON AST is constructed.
class TreeBuilder < Psych::TreeBuilder
- include Psych::JSON::YAMLEvents
+ def start_document version, tag_directives, implicit
+ super(version, tag_directives, true)
+ end
+
+ def end_document implicit_end
+ super(true)
+ end
+
+ def start_mapping anchor, tag, implicit, style
+ super(anchor, nil, implicit, Nodes::Mapping::FLOW)
+ end
+
+ def start_sequence anchor, tag, implicit, style
+ super(anchor, nil, implicit, Nodes::Sequence::FLOW)
+ end
end
end
end
diff --git a/ext/psych/lib/psych/json/yaml_events.rb b/ext/psych/lib/psych/json/yaml_events.rb
deleted file mode 100644
index d054d9b458..0000000000
--- a/ext/psych/lib/psych/json/yaml_events.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module Psych
- module JSON
- module YAMLEvents # :nodoc:
- def start_document version, tag_directives, implicit
- super(version, tag_directives, !streaming?)
- end
-
- def end_document implicit_end = !streaming?
- super(implicit_end)
- end
-
- def start_mapping anchor, tag, implicit, style
- super(anchor, nil, true, Nodes::Mapping::FLOW)
- end
-
- def start_sequence anchor, tag, implicit, style
- super(anchor, nil, true, Nodes::Sequence::FLOW)
- end
-
- def scalar value, anchor, tag, plain, quoted, style
- if "tag:yaml.org,2002:null" == tag
- super('null', nil, nil, true, false, Nodes::Scalar::PLAIN)
- else
- super
- end
- end
- end
- end
-end
diff --git a/ext/psych/lib/psych/nodes.rb b/ext/psych/lib/psych/nodes.rb
index f3b33fe975..9e5946daa9 100644
--- a/ext/psych/lib/psych/nodes.rb
+++ b/ext/psych/lib/psych/nodes.rb
@@ -31,7 +31,7 @@ module Psych
# doc = Psych::Nodes::Document.new
# seq = Psych::Nodes::Sequence.new
# scalar = Psych::Nodes::Scalar.new('foo')
- #
+ #
# # Build up our tree
# stream.children << doc
# doc.children << seq
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
index 0cefe44e44..3ab9acae43 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -6,8 +6,6 @@ module Psych
# The base class for any Node in a YAML parse tree. This class should
# never be instantiated.
class Node
- include Enumerable
-
# The children of this node
attr_reader :children
@@ -20,14 +18,6 @@ module Psych
end
###
- # Iterate over each node in the tree. Yields each node to +block+ depth
- # first.
- def each &block
- return enum_for :each unless block_given?
- Visitors::DepthFirst.new(block).accept self
- end
-
- ###
# Convert this node to Ruby.
#
# See also Psych::Visitors::ToRuby
@@ -40,14 +30,13 @@ module Psych
# Convert this node to YAML.
#
# See also Psych::Visitors::Emitter
- def yaml io = nil, options = {}
- real_io = io || StringIO.new(''.encode('utf-8'))
+ def to_yaml io = nil
+ real_io = io || StringIO.new
- Visitors::Emitter.new(real_io, options).accept self
+ Visitors::Emitter.new(real_io).accept self
return real_io.string unless io
io
end
- alias :to_yaml :yaml
end
end
end
diff --git a/ext/psych/lib/psych/nodes/stream.rb b/ext/psych/lib/psych/nodes/stream.rb
index 7cf5e033ec..f4aab5a7dc 100644
--- a/ext/psych/lib/psych/nodes/stream.rb
+++ b/ext/psych/lib/psych/nodes/stream.rb
@@ -21,7 +21,7 @@ module Psych
UTF16BE = Psych::Parser::UTF16BE
# The encoding used for this stream
- attr_accessor :encoding
+ attr_reader :encoding
###
# Create a new Psych::Nodes::Stream node with an +encoding+ that
diff --git a/ext/psych/lib/psych/parser.rb b/ext/psych/lib/psych/parser.rb
index 84085f1fb0..0e38a4ae7d 100644
--- a/ext/psych/lib/psych/parser.rb
+++ b/ext/psych/lib/psych/parser.rb
@@ -30,22 +30,15 @@ module Psych
# construct an AST of the parsed YAML document.
class Parser
- class Mark < Struct.new(:index, :line, :column)
- end
-
# The handler on which events will be called
attr_accessor :handler
- # Set the encoding for this parser to +encoding+
- attr_writer :external_encoding
-
###
# Creates a new Psych::Parser instance with +handler+. YAML events will
# be called on +handler+. See Psych::Parser for more details.
def initialize handler = Handler.new
@handler = handler
- @external_encoding = ANY
end
end
end
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index 8aa594e333..f7aaea7435 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -7,34 +7,18 @@ module Psych
# Taken from http://yaml.org/type/timestamp.html
TIME = /^\d{4}-\d{1,2}-\d{1,2}([Tt]|\s+)\d{1,2}:\d\d:\d\d(\.\d*)?(\s*Z|[-+]\d{1,2}(:\d\d)?)?/
- # Taken from http://yaml.org/type/float.html
- FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10)
- |[-+]?[0-9][0-9_,]*(:[0-5]?[0-9])+\.[0-9_]*(?# base 60)
- |[-+]?\.(inf|Inf|INF)(?# infinity)
- |\.(nan|NaN|NAN)(?# not a number))$/x
-
- # Taken from http://yaml.org/type/int.html
- INTEGER = /^(?:[-+]?0b[0-1_]+ (?# base 2)
- |[-+]?0[0-7_]+ (?# base 8)
- |[-+]?(?:0|[1-9][0-9_]*) (?# base 10)
- |[-+]?0x[0-9a-fA-F_]+ (?# base 16))$/x
-
# Create a new scanner
def initialize
@string_cache = {}
- @symbol_cache = {}
end
# Tokenize +string+ returning the ruby object
def tokenize string
return nil if string.empty?
return string if @string_cache.key?(string)
- return @symbol_cache[string] if @symbol_cache.key?(string)
case string
- # Check for a String type, being careful not to get caught by hash keys, hex values, and
- # special floats (e.g., -.inf).
- when /^[^\d\.:-]?[A-Za-z_\s!@#\$%\^&\*\(\)\{\}\<\>\|\/\\~;=]+/
+ when /^[A-Za-z~]/
if string.length > 5
@string_cache[string] = true
return string
@@ -55,31 +39,23 @@ module Psych
string
end
when TIME
- begin
- parse_time string
- rescue ArgumentError
- string
- end
- when /^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/
+ parse_time string
+ when /^\d{4}-\d{1,2}-\d{1,2}$/
require 'date'
- begin
- Date.strptime(string, '%Y-%m-%d')
- rescue ArgumentError
- string
- end
+ Date.strptime(string, '%Y-%m-%d')
when /^\.inf$/i
- Float::INFINITY
+ 1 / 0.0
when /^-\.inf$/i
- -Float::INFINITY
+ -1 / 0.0
when /^\.nan$/i
- Float::NAN
+ 0.0 / 0.0
when /^:./
if string =~ /^:(["'])(.*)\1/
- @symbol_cache[string] = $2.sub(/^:/, '').to_sym
+ $2.sub(/^:/, '').to_sym
else
- @symbol_cache[string] = string.sub(/^:/, '').to_sym
+ string.sub(/^:/, '').to_sym
end
- when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+$/
+ when /^[-+]?[1-9][0-9_]*(:[0-5]?[0-9])+$/
i = 0
string.split(':').each_with_index do |n,e|
i += (n.to_i * 60 ** (e - 2).abs)
@@ -91,38 +67,23 @@ module Psych
i += (n.to_f * 60 ** (e - 2).abs)
end
i
- when FLOAT
- if string == '.'
- @string_cache[string] = true
- string
- else
- Float(string.gsub(/[,_]|\.$/, ''))
- end
else
- int = parse_int string.gsub(/[,_]/, '')
- return int if int
-
+ return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
+ return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
@string_cache[string] = true
string
end
end
###
- # Parse and return an int from +string+
- def parse_int string
- return unless INTEGER === string
- Integer(string)
- end
-
- ###
# Parse and return a Time from +string+
def parse_time string
date, time = *(string.split(/[ tT]/, 2))
(yy, m, dd) = date.split('-').map { |x| x.to_i }
- md = time.match(/(\d+:\d+:\d+)(?:\.(\d*))?\s*(Z|[-+]\d+(:\d\d)?)?/)
+ md = time.match(/(\d+:\d+:\d+)(\.\d*)?\s*(Z|[-+]\d+(:\d\d)?)?/)
(hh, mm, ss) = md[1].split(':').map { |x| x.to_i }
- us = (md[2] ? Rational("0.#{md[2]}") : 0) * 1000000
+ us = (md[2] ? Rational(md[2].sub(/^\./, '0.')) : 0) * 1000000
time = Time.utc(yy, m, dd, hh, mm, ss, us)
diff --git a/ext/psych/lib/psych/stream.rb b/ext/psych/lib/psych/stream.rb
deleted file mode 100644
index 567c1bb790..0000000000
--- a/ext/psych/lib/psych/stream.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module Psych
- ###
- # Psych::Stream is a streaming YAML emitter. It will not buffer your YAML,
- # but send it straight to an IO.
- #
- # Here is an example use:
- #
- # stream = Psych::Stream.new($stdout)
- # stream.start
- # stream.push({:foo => 'bar'})
- # stream.finish
- #
- # YAML will be immediately emitted to $stdout with no buffering.
- #
- # Psych::Stream#start will take a block and ensure that Psych::Stream#finish
- # is called, so you can do this form:
- #
- # stream = Psych::Stream.new($stdout)
- # stream.start do |em|
- # em.push(:foo => 'bar')
- # end
- #
- class Stream < Psych::Visitors::YAMLTree
- class Emitter < Psych::Emitter # :nodoc:
- def end_document implicit_end = !streaming?
- super
- end
-
- def streaming?
- true
- end
- end
-
- include Psych::Streaming
- end
-end
diff --git a/ext/psych/lib/psych/streaming.rb b/ext/psych/lib/psych/streaming.rb
deleted file mode 100644
index c6fa109d5a..0000000000
--- a/ext/psych/lib/psych/streaming.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Psych
- module Streaming
- ###
- # Create a new streaming emitter. Emitter will print to +io+. See
- # Psych::Stream for an example.
- def initialize io
- super({}, self.class.const_get(:Emitter).new(io))
- end
-
- ###
- # Start streaming using +encoding+
- def start encoding = Nodes::Stream::UTF8
- super.tap { yield self if block_given? }
- ensure
- finish if block_given?
- end
-
- private
- def register target, obj
- end
- end
-end
diff --git a/ext/psych/lib/psych/syntax_error.rb b/ext/psych/lib/psych/syntax_error.rb
deleted file mode 100644
index f972256f9e..0000000000
--- a/ext/psych/lib/psych/syntax_error.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Psych
- class Error < RuntimeError
- end
-
- class SyntaxError < Error
- attr_reader :file, :line, :column, :offset, :problem, :context
-
- def initialize file, line, col, offset, problem, context
- err = [problem, context].compact.join ' '
- filename = file || '<unknown>'
- message = "(%s): %s at line %d column %d" % [filename, err, line, col]
-
- @file = file
- @line = line
- @column = col
- @offset = offset
- @problem = problem
- @context = context
- super(message)
- end
- end
-end
diff --git a/ext/psych/lib/psych/tree_builder.rb b/ext/psych/lib/psych/tree_builder.rb
index c8f344787c..54d87a0b61 100644
--- a/ext/psych/lib/psych/tree_builder.rb
+++ b/ext/psych/lib/psych/tree_builder.rb
@@ -57,7 +57,7 @@ module Psych
# and +implicit+ styling.
#
# See Psych::Handler#start_document
- def end_document implicit_end = !streaming?
+ def end_document implicit_end
@last.implicit_end = implicit_end
pop
end
@@ -72,9 +72,7 @@ module Psych
end
def scalar value, anchor, tag, plain, quoted, style
- s = Nodes::Scalar.new(value,anchor,tag,plain,quoted,style)
- @last.children << s
- s
+ @last.children << Nodes::Scalar.new(value,anchor,tag,plain,quoted,style)
end
def alias anchor
diff --git a/ext/psych/lib/psych/visitors.rb b/ext/psych/lib/psych/visitors.rb
index cc98b103f1..10ac4ce270 100644
--- a/ext/psych/lib/psych/visitors.rb
+++ b/ext/psych/lib/psych/visitors.rb
@@ -3,4 +3,3 @@ require 'psych/visitors/to_ruby'
require 'psych/visitors/emitter'
require 'psych/visitors/yaml_tree'
require 'psych/visitors/json_tree'
-require 'psych/visitors/depth_first'
diff --git a/ext/psych/lib/psych/visitors/depth_first.rb b/ext/psych/lib/psych/visitors/depth_first.rb
deleted file mode 100644
index c6eb814ac0..0000000000
--- a/ext/psych/lib/psych/visitors/depth_first.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Psych
- module Visitors
- class DepthFirst < Psych::Visitors::Visitor
- def initialize block
- @block = block
- end
-
- private
-
- def nary o
- o.children.each { |x| visit x }
- @block.call o
- end
- alias :visit_Psych_Nodes_Stream :nary
- alias :visit_Psych_Nodes_Document :nary
- alias :visit_Psych_Nodes_Sequence :nary
- alias :visit_Psych_Nodes_Mapping :nary
-
- def terminal o
- @block.call o
- end
- alias :visit_Psych_Nodes_Scalar :terminal
- alias :visit_Psych_Nodes_Alias :terminal
- end
- end
-end
diff --git a/ext/psych/lib/psych/visitors/emitter.rb b/ext/psych/lib/psych/visitors/emitter.rb
index c886e5092e..0768fbb528 100644
--- a/ext/psych/lib/psych/visitors/emitter.rb
+++ b/ext/psych/lib/psych/visitors/emitter.rb
@@ -1,18 +1,8 @@
module Psych
module Visitors
class Emitter < Psych::Visitors::Visitor
- def initialize io, options = {}
- opts = [:indentation, :canonical, :line_width].find_all { |opt|
- options.key?(opt)
- }
-
- if opts.empty?
- @handler = Psych::Emitter.new io
- else
- du = Handler::DumperOptions.new
- opts.each { |option| du.send :"#{option}=", options[option] }
- @handler = Psych::Emitter.new io, du
- end
+ def initialize io
+ @handler = Psych::Emitter.new io
end
def visit_Psych_Nodes_Stream o
diff --git a/ext/psych/lib/psych/visitors/json_tree.rb b/ext/psych/lib/psych/visitors/json_tree.rb
index 0350dd1faa..dcb5ddccae 100644
--- a/ext/psych/lib/psych/visitors/json_tree.rb
+++ b/ext/psych/lib/psych/visitors/json_tree.rb
@@ -1,21 +1,29 @@
-require 'psych/json/ruby_events'
-
module Psych
module Visitors
class JSONTree < YAMLTree
- include Psych::JSON::RubyEvents
-
def initialize options = {}, emitter = Psych::JSON::TreeBuilder.new
super
end
- def accept target
- if target.respond_to?(:encode_with)
- dump_coder target
- else
- send(@dispatch_cache[target.class], target)
- end
+ def visit_NilClass o
+ @emitter.scalar 'null', nil, nil, true, false, Nodes::Scalar::PLAIN
end
+
+ def visit_Integer o
+ @emitter.scalar o.to_s, nil, nil, true, false, Nodes::Scalar::PLAIN
+ end
+
+ def visit_Float o
+ return super if o.nan? || o.infinite?
+ visit_Integer o
+ end
+
+ def visit_String o
+ @emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::DOUBLE_QUOTED
+ end
+ alias :visit_Symbol :visit_String
+
+ private
end
end
end
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index 9ccf420c34..a68c8e698e 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -1,18 +1,14 @@
require 'psych/scalar_scanner'
-unless defined?(Regexp::NOENCODING)
- Regexp::NOENCODING = 32
-end
-
module Psych
module Visitors
###
# This class walks a YAML AST, converting each node to ruby
class ToRuby < Psych::Visitors::Visitor
- def initialize ss = ScalarScanner.new
- super()
+ def initialize
+ super
@st = {}
- @ss = ss
+ @ss = ScalarScanner.new
@domain_types = Psych.domain_types
end
@@ -31,7 +27,9 @@ module Psych
result
end
- def deserialize o
+ def visit_Psych_Nodes_Scalar o
+ @st[o.anchor] = o.value if o.anchor
+
if klass = Psych.load_tags[o.tag]
instance = klass.allocate
@@ -50,16 +48,8 @@ module Psych
case o.tag
when '!binary', 'tag:yaml.org,2002:binary'
o.value.unpack('m').first
- when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
- klass = resolve_class($1)
- if klass
- klass.allocate.replace o.value
- else
- o.value
- end
- when '!ruby/object:BigDecimal'
- require 'bigdecimal'
- BigDecimal._load o.value
+ when '!str', 'tag:yaml.org,2002:str'
+ o.value
when "!ruby/object:DateTime"
require 'date'
@ss.parse_time(o.value).to_datetime
@@ -67,8 +57,6 @@ module Psych
Complex(o.value)
when "!ruby/object:Rational"
Rational(o.value)
- when "!ruby/class", "!ruby/module"
- resolve_class o.value
when "tag:yaml.org,2002:float", "!float"
Float(@ss.tokenize(o.value))
when "!ruby/regexp"
@@ -81,7 +69,9 @@ module Psych
when 'x' then options |= Regexp::EXTENDED
when 'i' then options |= Regexp::IGNORECASE
when 'm' then options |= Regexp::MULTILINE
- when 'n' then options |= Regexp::NOENCODING
+
+ # FIXME: there is no constant for ARG_ENCODING_NONE
+ when 'n' then options |= 32
else lang = option
end
end
@@ -98,11 +88,6 @@ module Psych
@ss.tokenize o.value
end
end
- private :deserialize
-
- def visit_Psych_Nodes_Scalar o
- register o, deserialize(o)
- end
def visit_Psych_Nodes_Sequence o
if klass = Psych.load_tags[o.tag]
@@ -118,34 +103,35 @@ module Psych
end
case o.tag
- when nil
- register_empty(o)
when '!omap', 'tag:yaml.org,2002:omap'
- map = register(o, Psych::Omap.new)
+ map = Psych::Omap.new
+ @st[o.anchor] = map if o.anchor
o.children.each { |a|
map[accept(a.children.first)] = accept a.children.last
}
map
- when /^!(?:seq|ruby\/array):(.*)$/
- klass = resolve_class($1)
- list = register(o, klass.allocate)
+ else
+ list = []
+ @st[o.anchor] = list if o.anchor
o.children.each { |c| list.push accept c }
list
- else
- register_empty(o)
end
end
def visit_Psych_Nodes_Mapping o
return revive(Psych.load_tags[o.tag], o) if Psych.load_tags[o.tag]
- return revive_hash({}, o) unless o.tag
case o.tag
+ when '!str', 'tag:yaml.org,2002:str'
+ members = Hash[*o.children.map { |c| accept c }]
+ string = members.delete 'str'
+ init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
when /^!ruby\/struct:?(.*)?$/
klass = resolve_class($1)
if klass
- s = register(o, klass.allocate)
+ s = klass.allocate
+ @st[o.anchor] = s if o.anchor
members = {}
struct_members = s.members.map { |x| x.to_sym }
@@ -165,46 +151,9 @@ module Psych
Struct.new(*h.map { |k,v| k.to_sym }).new(*h.map { |k,v| v })
end
- when /^!ruby\/object:?(.*)?$/
- name = $1 || 'Object'
-
- if name == 'Complex'
- h = Hash[*o.children.map { |c| accept c }]
- register o, Complex(h['real'], h['image'])
- elsif name == 'Rational'
- h = Hash[*o.children.map { |c| accept c }]
- register o, Rational(h['numerator'], h['denominator'])
- else
- obj = revive((resolve_class(name) || Object), o)
- obj
- end
-
- when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
- klass = resolve_class($1)
- members = Hash[*o.children.map { |c| accept c }]
- string = members.delete 'str'
-
- if klass
- string = klass.allocate.replace string
- register(o, string)
- end
-
- init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
- when /^!ruby\/array:(.*)$/
- klass = resolve_class($1)
- list = register(o, klass.allocate)
-
- members = Hash[o.children.map { |c| accept c }.each_slice(2).to_a]
- list.replace members['internal']
-
- members['ivars'].each do |ivar, v|
- list.instance_variable_set ivar, v
- end
- list
-
when '!ruby/range'
h = Hash[*o.children.map { |c| accept c }]
- register o, Range.new(h['begin'], h['end'], h['excl'])
+ Range.new(h['begin'], h['end'], h['excl'])
when /^!ruby\/exception:?(.*)?$/
h = Hash[*o.children.map { |c| accept c }]
@@ -221,18 +170,43 @@ module Psych
end
set
- when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
- revive_hash resolve_class($1).new, o
+ when '!ruby/object:Complex'
+ h = Hash[*o.children.map { |c| accept c }]
+ Complex(h['real'], h['image'])
- when '!omap', 'tag:yaml.org,2002:omap'
- map = register(o, Psych::Omap.new)
- o.children.each_slice(2) do |l,r|
- map[accept(l)] = accept r
- end
- map
+ when '!ruby/object:Rational'
+ h = Hash[*o.children.map { |c| accept c }]
+ Rational(h['numerator'], h['denominator'])
+ when /^!ruby\/object:?(.*)?$/
+ name = $1 || 'Object'
+ obj = revive((resolve_class(name) || Object), o)
+ @st[o.anchor] = obj if o.anchor
+ obj
else
- revive_hash({}, o)
+ hash = {}
+ @st[o.anchor] = hash if o.anchor
+
+ o.children.each_slice(2) { |k,v|
+ key = accept(k)
+
+ if key == '<<'
+ case v
+ when Nodes::Alias
+ hash.merge! accept(v)
+ when Nodes::Sequence
+ accept(v).reverse_each do |value|
+ hash.merge! value
+ end
+ else
+ hash[key] = accept(v)
+ end
+ else
+ hash[key] = accept(v)
+ end
+
+ }
+ hash
end
end
@@ -245,63 +219,12 @@ module Psych
end
def visit_Psych_Nodes_Alias o
- @st.fetch(o.anchor) { raise BadAlias, "Unknown alias: #{o.anchor}" }
+ @st[o.anchor]
end
private
- def register node, object
- @st[node.anchor] = object if node.anchor
- object
- end
-
- def register_empty object
- list = register(object, [])
- object.children.each { |c| list.push accept c }
- list
- end
-
- def revive_hash hash, o
- @st[o.anchor] = hash if o.anchor
-
- o.children.each_slice(2) { |k,v|
- key = accept(k)
- val = accept(v)
-
- if key == '<<'
- case v
- when Nodes::Alias
- begin
- hash.merge! val
- rescue TypeError
- hash[key] = val
- end
- when Nodes::Sequence
- begin
- h = {}
- val.reverse_each do |value|
- h.merge! value
- end
- hash.merge! h
- rescue TypeError
- hash[key] = val
- end
- else
- hash[key] = val
- end
- else
- hash[key] = val
- end
-
- }
- hash
- end
-
- def merge_key hash, key, val
- end
-
def revive klass, node
s = klass.allocate
- @st[node.anchor] = s if node.anchor
h = Hash[*node.children.map { |c| accept c }]
init_with(s, h, node)
end
@@ -314,7 +237,7 @@ module Psych
o.init_with c
elsif o.respond_to?(:yaml_initialize)
if $VERBOSE
- warn "Implementing #{o.class}#yaml_initialize is deprecated, please implement \"init_with(coder)\""
+ "Implementing #{o.class}#yaml_initialize is deprecated, please implement \"init_with(coder)\""
end
o.yaml_initialize c.tag, c.map
else
diff --git a/ext/psych/lib/psych/visitors/visitor.rb b/ext/psych/lib/psych/visitors/visitor.rb
index 4d7772f428..ccd8c3bd55 100644
--- a/ext/psych/lib/psych/visitors/visitor.rb
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -2,17 +2,16 @@ module Psych
module Visitors
class Visitor
def accept target
- visit target
- end
-
- private
-
- DISPATCH = Hash.new do |hash, klass|
- hash[klass] = "visit_#{klass.name.gsub('::', '_')}"
- end
-
- def visit target
- send DISPATCH[target.class], target
+ case target
+ when Psych::Nodes::Scalar then visit_Psych_Nodes_Scalar target
+ when Psych::Nodes::Mapping then visit_Psych_Nodes_Mapping target
+ when Psych::Nodes::Sequence then visit_Psych_Nodes_Sequence target
+ when Psych::Nodes::Alias then visit_Psych_Nodes_Alias target
+ when Psych::Nodes::Document then visit_Psych_Nodes_Document target
+ when Psych::Nodes::Stream then visit_Psych_Nodes_Stream target
+ else
+ raise "Can't handle #{target}"
+ end
end
end
end
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 6b6a5ffa19..271bac5a23 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -8,43 +8,13 @@ module Psych
# builder.tree # => #<Psych::Nodes::Stream .. }
#
class YAMLTree < Psych::Visitors::Visitor
- class Registrar # :nodoc:
- def initialize
- @obj_to_id = {}
- @obj_to_node = {}
- @counter = 0
- end
-
- def register target, node
- @obj_to_node[target.object_id] = node
- end
-
- def key? target
- @obj_to_node.key? target.object_id
- end
-
- def id_for target
- @obj_to_id[target.object_id] ||= (@counter += 1)
- end
-
- def node_for target
- @obj_to_node[target.object_id]
- end
- end
-
- attr_reader :started, :finished
- alias :finished? :finished
- alias :started? :started
-
- def initialize options = {}, emitter = TreeBuilder.new, ss = ScalarScanner.new
+ def initialize options = {}, emitter = Psych::TreeBuilder.new
super()
- @started = false
- @finished = false
- @emitter = emitter
- @st = Registrar.new
- @ss = ss
- @options = options
- @coders = []
+ @emitter = emitter
+ @st = {}
+ @ss = ScalarScanner.new
+
+ @emitter.start_stream Psych::Nodes::Stream::UTF8
@dispatch_cache = Hash.new do |h,klass|
method = "visit_#{(klass.name || '').split('::').join('_')}"
@@ -57,68 +27,33 @@ module Psych
end
end
- def start encoding = Nodes::Stream::UTF8
- @emitter.start_stream(encoding).tap do
- @started = true
- end
- end
-
- def finish
- @emitter.end_stream.tap do
- @finished = true
- end
- end
-
def tree
- finish unless finished?
- @emitter.root
+ @emitter.end_stream
end
- def push object
- start unless started?
- version = []
- version = [1,1] if @options[:header]
-
- case @options[:version]
- when Array
- version = @options[:version]
- when String
- version = @options[:version].split('.').map { |x| x.to_i }
- else
- version = [1,1]
- end if @options.key? :version
-
- @emitter.start_document version, [], false
+ def << object
+ @emitter.start_document [], [], false
accept object
- @emitter.end_document !@emitter.streaming?
+ @emitter.end_document true
end
- alias :<< :push
def accept target
# return any aliases we find
- if @st.key? target
- oid = @st.id_for target
- node = @st.node_for target
- anchor = oid.to_s
- node.anchor = anchor
- return @emitter.alias anchor
+ if node = @st[target.object_id]
+ node.anchor = target.object_id.to_s
+ return @emitter.alias target.object_id.to_s
end
if target.respond_to?(:to_yaml)
- begin
- loc = target.method(:to_yaml).source_location.first
- if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
- unless target.respond_to?(:encode_with)
- if $VERBOSE
- warn "implementing to_yaml is deprecated, please implement \"encode_with\""
- end
-
- target.to_yaml(:nodump => true)
+ loc = target.method(:to_yaml).source_location.first
+ if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
+ unless target.respond_to?(:encode_with)
+ if $VERBOSE
+ warn "implementing to_yaml is deprecated, please implement \"encode_with\""
end
+
+ target.to_yaml(:nodump => true)
end
- rescue
- # public_method or source_location might be overridden,
- # and it's OK to skip it since it's only to emit a warning
end
end
@@ -185,13 +120,13 @@ module Psych
end
def visit_Regexp o
- register o, @emitter.scalar(o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY)
+ @emitter.scalar o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY
end
def visit_DateTime o
formatted = format_time o.to_time
tag = '!ruby/object:DateTime'
- register o, @emitter.scalar(formatted, nil, tag, false, false, Nodes::Scalar::ANY)
+ @emitter.scalar formatted, nil, tag, false, false, Nodes::Scalar::ANY
end
def visit_Time o
@@ -200,7 +135,7 @@ module Psych
end
def visit_Rational o
- register o, @emitter.start_mapping(nil, '!ruby/object:Rational', false, Nodes::Mapping::BLOCK)
+ @emitter.start_mapping(nil, '!ruby/object:Rational', false, Nodes::Mapping::BLOCK)
[
'denominator', o.denominator.to_s,
@@ -213,7 +148,7 @@ module Psych
end
def visit_Complex o
- register o, @emitter.start_mapping(nil, '!ruby/object:Complex', false, Nodes::Mapping::BLOCK)
+ @emitter.start_mapping(nil, '!ruby/object:Complex', false, Nodes::Mapping::BLOCK)
['real', o.real.to_s, 'image', o.imag.to_s].each do |m|
@emitter.scalar m, nil, nil, true, false, Nodes::Scalar::ANY
@@ -240,52 +175,29 @@ module Psych
end
end
- def visit_BigDecimal o
- @emitter.scalar o._dump, nil, '!ruby/object:BigDecimal', false, false, Nodes::Scalar::ANY
- end
-
- def binary? string
- (string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?) ||
- string.index("\x00") ||
- string.count("\x00-\x7F", "^ -~\t\r\n").fdiv(string.length) > 0.3 ||
- string.class != String
- end
- private :binary?
-
def visit_String o
- plain = true
- quote = true
- style = Nodes::Scalar::PLAIN
- tag = nil
- str = o
+ plain = false
+ quote = false
+ style = Nodes::Scalar::ANY
- if binary?(o)
+ if o.index("\x00") || o.count("\x00-\x7F", "^ -~\t\r\n").fdiv(o.length) > 0.3
str = [o].pack('m').chomp
tag = '!binary' # FIXME: change to below when syck is removed
#tag = 'tag:yaml.org,2002:binary'
style = Nodes::Scalar::LITERAL
- plain = false
- quote = false
- elsif o =~ /\n/
- style = Nodes::Scalar::LITERAL
else
- unless String === @ss.tokenize(o)
- style = Nodes::Scalar::SINGLE_QUOTED
- end
+ str = o
+ tag = nil
+ quote = !(String === @ss.tokenize(o))
+ plain = !quote
end
ivars = find_ivars o
if ivars.empty?
- unless o.class == ::String
- tag = "!ruby/string:#{o.class}"
- end
@emitter.scalar str, nil, tag, plain, quote, style
else
- maptag = '!ruby/string'
- maptag << ":#{o.class}" unless o.class == ::String
-
- register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
+ @emitter.start_mapping nil, '!str', false, Nodes::Mapping::BLOCK
@emitter.scalar 'str', nil, nil, true, false, Nodes::Scalar::ANY
@emitter.scalar str, nil, tag, plain, quote, style
@@ -295,18 +207,12 @@ module Psych
end
end
- def visit_Module o
- raise TypeError, "can't dump anonymous module: #{o}" unless o.name
- register o, @emitter.scalar(o.name, nil, '!ruby/module', false, false, Nodes::Scalar::SINGLE_QUOTED)
- end
-
def visit_Class o
- raise TypeError, "can't dump anonymous class: #{o}" unless o.name
- register o, @emitter.scalar(o.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED)
+ raise TypeError, "can't dump anonymous class #{o.class}"
end
def visit_Range o
- register o, @emitter.start_mapping(nil, '!ruby/range', false, Nodes::Mapping::BLOCK)
+ @emitter.start_mapping nil, '!ruby/range', false, Nodes::Mapping::BLOCK
['begin', o.begin, 'end', o.end, 'excl', o.exclude_end?].each do |m|
accept m
end
@@ -314,10 +220,7 @@ module Psych
end
def visit_Hash o
- tag = o.class == ::Hash ? nil : "!ruby/hash:#{o.class}"
- implicit = !tag
-
- register(o, @emitter.start_mapping(nil, tag, implicit, Psych::Nodes::Mapping::BLOCK))
+ register(o, @emitter.start_mapping(nil, nil, true, Psych::Nodes::Mapping::BLOCK))
o.each do |k,v|
accept k
@@ -339,17 +242,13 @@ module Psych
end
def visit_Array o
- if o.class == ::Array
- register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
- o.each { |c| accept c }
- @emitter.end_sequence
- else
- visit_array_subclass o
- end
+ register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
+ o.each { |c| accept c }
+ @emitter.end_sequence
end
def visit_NilClass o
- @emitter.scalar('', nil, 'tag:yaml.org,2002:null', true, false, Nodes::Scalar::ANY)
+ @emitter.scalar('', nil, 'tag:yaml.org,2002:null', false, false, Nodes::Scalar::ANY)
end
def visit_Symbol o
@@ -357,88 +256,36 @@ module Psych
end
private
- def visit_array_subclass o
- tag = "!ruby/array:#{o.class}"
- if o.instance_variables.empty?
- node = @emitter.start_sequence(nil, tag, false, Nodes::Sequence::BLOCK)
- register o, node
- o.each { |c| accept c }
- @emitter.end_sequence
+ def format_time time
+ formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
+ if time.utc?
+ formatted += "Z"
else
- node = @emitter.start_mapping(nil, tag, false, Nodes::Sequence::BLOCK)
- register o, node
-
- # Dump the internal list
- accept 'internal'
- @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
- o.each { |c| accept c }
- @emitter.end_sequence
-
- # Dump the ivars
- accept 'ivars'
- @emitter.start_mapping(nil, nil, true, Nodes::Sequence::BLOCK)
- o.instance_variables.each do |ivar|
- accept ivar
- accept o.instance_variable_get ivar
- end
- @emitter.end_mapping
-
- @emitter.end_mapping
- end
- end
-
- def dump_list o
- end
-
- # '%:z' was no defined until 1.9.3
- if RUBY_VERSION < '1.9.3'
- def format_time time
- formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
-
- if time.utc?
- formatted += " Z"
- else
- zone = time.strftime('%z')
- formatted += " #{zone[0,3]}:#{zone[3,5]}"
- end
-
- formatted
- end
- else
- def format_time time
- if time.utc?
- time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
- else
- time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
- end
+ zone = time.strftime('%z')
+ formatted += " #{zone[0,3]}:#{zone[3,5]}"
end
+ formatted
end
# FIXME: remove this method once "to_yaml_properties" is removed
def find_ivars target
- begin
- loc = target.method(:to_yaml_properties).source_location.first
- unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb')
- if $VERBOSE
- warn "#{loc}: to_yaml_properties is deprecated, please implement \"encode_with(coder)\""
- end
- return target.to_yaml_properties
+ loc = target.method(:to_yaml_properties).source_location.first
+ unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb')
+ if $VERBOSE
+ warn "#{loc}: to_yaml_properties is deprecated, please implement \"encode_with(coder)\""
end
- rescue
- # public_method or source_location might be overridden,
- # and it's OK to skip it since it's only to emit a warning.
+ return target.to_yaml_properties
end
target.instance_variables
end
def register target, yaml_obj
- @st.register target, yaml_obj
+ @st[target.object_id] = yaml_obj
yaml_obj
end
def dump_coder o
- @coders << o
tag = Psych.dump_tags[o.class]
unless tag
klass = o.class == Object ? nil : o.class.name
@@ -467,8 +314,6 @@ module Psych
accept v
end
@emitter.end_mapping
- when :object
- accept c.object
end
end
diff --git a/ext/psych/lib/psych/y.rb b/ext/psych/lib/psych/y.rb
deleted file mode 100644
index d0e049d4e5..0000000000
--- a/ext/psych/lib/psych/y.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Kernel
- ###
- # An alias for Psych.dump_stream meant to be used with IRB.
- def y *objects
- puts Psych.dump_stream(*objects)
- end
- private :y
-end
-
diff --git a/ext/psych/parser.c b/ext/psych/parser.c
new file mode 100644
index 0000000000..a69f2763bc
--- /dev/null
+++ b/ext/psych/parser.c
@@ -0,0 +1,341 @@
+#include <psych.h>
+
+VALUE cPsychParser;
+VALUE ePsychSyntaxError;
+
+static ID id_read;
+static ID id_empty;
+static ID id_start_stream;
+static ID id_end_stream;
+static ID id_start_document;
+static ID id_end_document;
+static ID id_alias;
+static ID id_scalar;
+static ID id_start_sequence;
+static ID id_end_sequence;
+static ID id_start_mapping;
+static ID id_end_mapping;
+
+#define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
+ do { \
+ rb_enc_associate_index(_str, _yaml_enc); \
+ if(_internal_enc) \
+ _str = rb_str_export_to_enc(_str, _internal_enc); \
+ } while (0)
+
+static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
+{
+ VALUE io = (VALUE)data;
+ VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
+
+ *read = 0;
+
+ if(! NIL_P(string)) {
+ void * str = (void *)StringValuePtr(string);
+ *read = (size_t)RSTRING_LEN(string);
+ memcpy(buf, str, *read);
+ }
+
+ return 1;
+}
+
+/*
+ * call-seq:
+ * parser.parse(yaml)
+ *
+ * Parse the YAML document contained in +yaml+. Events will be called on
+ * the handler set on the parser instance.
+ *
+ * See Psych::Parser and Psych::Parser#handler
+ */
+static VALUE parse(VALUE self, VALUE yaml)
+{
+ yaml_parser_t parser;
+ yaml_event_t event;
+ int done = 0;
+ int tainted = 0;
+#ifdef HAVE_RUBY_ENCODING_H
+ int encoding = rb_enc_find_index("ASCII-8BIT");
+ rb_encoding * internal_enc;
+#endif
+ VALUE handler = rb_iv_get(self, "@handler");
+
+
+ yaml_parser_initialize(&parser);
+
+ if (OBJ_TAINTED(yaml)) tainted = 1;
+
+ if(rb_respond_to(yaml, id_read)) {
+ yaml_parser_set_input(&parser, io_reader, (void *)yaml);
+ if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
+ } else {
+ StringValue(yaml);
+ yaml_parser_set_input_string(
+ &parser,
+ (const unsigned char *)RSTRING_PTR(yaml),
+ (size_t)RSTRING_LEN(yaml)
+ );
+ }
+
+ while(!done) {
+ if(!yaml_parser_parse(&parser, &event)) {
+ size_t line = parser.mark.line + 1;
+ size_t column = parser.mark.column;
+
+ yaml_parser_delete(&parser);
+ rb_raise(ePsychSyntaxError, "couldn't parse YAML at line %d column %d",
+ (int)line, (int)column);
+ }
+
+ switch(event.type) {
+ case YAML_STREAM_START_EVENT:
+
+#ifdef HAVE_RUBY_ENCODING_H
+ switch(event.data.stream_start.encoding) {
+ case YAML_ANY_ENCODING:
+ break;
+ case YAML_UTF8_ENCODING:
+ encoding = rb_enc_find_index("UTF-8");
+ break;
+ case YAML_UTF16LE_ENCODING:
+ encoding = rb_enc_find_index("UTF-16LE");
+ break;
+ case YAML_UTF16BE_ENCODING:
+ encoding = rb_enc_find_index("UTF-16BE");
+ break;
+ default:
+ break;
+ }
+ internal_enc = rb_default_internal_encoding();
+#endif
+
+ rb_funcall(handler, id_start_stream, 1,
+ INT2NUM((long)event.data.stream_start.encoding)
+ );
+ break;
+ case YAML_DOCUMENT_START_EVENT:
+ {
+ /* Get a list of tag directives (if any) */
+ VALUE tag_directives = rb_ary_new();
+ /* Grab the document version */
+ VALUE version = event.data.document_start.version_directive ?
+ rb_ary_new3(
+ (long)2,
+ INT2NUM((long)event.data.document_start.version_directive->major),
+ INT2NUM((long)event.data.document_start.version_directive->minor)
+ ) : rb_ary_new();
+
+ if(event.data.document_start.tag_directives.start) {
+ yaml_tag_directive_t *start =
+ event.data.document_start.tag_directives.start;
+ yaml_tag_directive_t *end =
+ event.data.document_start.tag_directives.end;
+ for(; start != end; start++) {
+ VALUE handle = Qnil;
+ VALUE prefix = Qnil;
+ if(start->handle) {
+ handle = rb_str_new2((const char *)start->handle);
+ if (tainted) OBJ_TAINT(handle);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(handle, encoding, internal_enc);
+#endif
+ }
+
+ if(start->prefix) {
+ prefix = rb_str_new2((const char *)start->prefix);
+ if (tainted) OBJ_TAINT(prefix);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+#endif
+ }
+
+ rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
+ }
+ }
+ rb_funcall(handler, id_start_document, 3,
+ version, tag_directives,
+ event.data.document_start.implicit == 1 ? Qtrue : Qfalse
+ );
+ }
+ break;
+ case YAML_DOCUMENT_END_EVENT:
+ rb_funcall(handler, id_end_document, 1,
+ event.data.document_end.implicit == 1 ? Qtrue : Qfalse
+ );
+ break;
+ case YAML_ALIAS_EVENT:
+ {
+ VALUE alias = Qnil;
+ if(event.data.alias.anchor) {
+ alias = rb_str_new2((const char *)event.data.alias.anchor);
+ if (tainted) OBJ_TAINT(alias);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(alias, encoding, internal_enc);
+#endif
+ }
+
+ rb_funcall(handler, id_alias, 1, alias);
+ }
+ break;
+ case YAML_SCALAR_EVENT:
+ {
+ VALUE anchor = Qnil;
+ VALUE tag = Qnil;
+ VALUE plain_implicit, quoted_implicit, style;
+ VALUE val = rb_str_new(
+ (const char *)event.data.scalar.value,
+ (long)event.data.scalar.length
+ );
+ if (tainted) OBJ_TAINT(val);
+
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(val, encoding, internal_enc);
+#endif
+
+ if(event.data.scalar.anchor) {
+ anchor = rb_str_new2((const char *)event.data.scalar.anchor);
+ if (tainted) OBJ_TAINT(anchor);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+#endif
+ }
+
+ if(event.data.scalar.tag) {
+ tag = rb_str_new2((const char *)event.data.scalar.tag);
+ if (tainted) OBJ_TAINT(tag);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(tag, encoding, internal_enc);
+#endif
+ }
+
+ plain_implicit =
+ event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
+
+ quoted_implicit =
+ event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
+
+ style = INT2NUM((long)event.data.scalar.style);
+
+ rb_funcall(handler, id_scalar, 6,
+ val, anchor, tag, plain_implicit, quoted_implicit, style);
+ }
+ break;
+ case YAML_SEQUENCE_START_EVENT:
+ {
+ VALUE anchor = Qnil;
+ VALUE tag = Qnil;
+ VALUE implicit, style;
+ if(event.data.sequence_start.anchor) {
+ anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
+ if (tainted) OBJ_TAINT(anchor);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+#endif
+ }
+
+ tag = Qnil;
+ if(event.data.sequence_start.tag) {
+ tag = rb_str_new2((const char *)event.data.sequence_start.tag);
+ if (tainted) OBJ_TAINT(tag);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(tag, encoding, internal_enc);
+#endif
+ }
+
+ implicit =
+ event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
+
+ style = INT2NUM((long)event.data.sequence_start.style);
+
+ rb_funcall(handler, id_start_sequence, 4,
+ anchor, tag, implicit, style);
+ }
+ break;
+ case YAML_SEQUENCE_END_EVENT:
+ rb_funcall(handler, id_end_sequence, 0);
+ break;
+ case YAML_MAPPING_START_EVENT:
+ {
+ VALUE anchor = Qnil;
+ VALUE tag = Qnil;
+ VALUE implicit, style;
+ if(event.data.mapping_start.anchor) {
+ anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
+ if (tainted) OBJ_TAINT(anchor);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+#endif
+ }
+
+ if(event.data.mapping_start.tag) {
+ tag = rb_str_new2((const char *)event.data.mapping_start.tag);
+ if (tainted) OBJ_TAINT(tag);
+#ifdef HAVE_RUBY_ENCODING_H
+ PSYCH_TRANSCODE(tag, encoding, internal_enc);
+#endif
+ }
+
+ implicit =
+ event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
+
+ style = INT2NUM((long)event.data.mapping_start.style);
+
+ rb_funcall(handler, id_start_mapping, 4,
+ anchor, tag, implicit, style);
+ }
+ break;
+ case YAML_MAPPING_END_EVENT:
+ rb_funcall(handler, id_end_mapping, 0);
+ break;
+ case YAML_NO_EVENT:
+ rb_funcall(handler, id_empty, 0);
+ break;
+ case YAML_STREAM_END_EVENT:
+ rb_funcall(handler, id_end_stream, 0);
+ done = 1;
+ break;
+ }
+ yaml_event_delete(&event);
+ }
+
+ return self;
+}
+
+void Init_psych_parser()
+{
+#if 0
+ mPsych = rb_define_module("Psych");
+#endif
+
+ cPsychParser = rb_define_class_under(mPsych, "Parser", rb_cObject);
+
+ /* Any encoding: Let the parser choose the encoding */
+ rb_define_const(cPsychParser, "ANY", INT2NUM(YAML_ANY_ENCODING));
+
+ /* UTF-8 Encoding */
+ rb_define_const(cPsychParser, "UTF8", INT2NUM(YAML_UTF8_ENCODING));
+
+ /* UTF-16-LE Encoding with BOM */
+ rb_define_const(cPsychParser, "UTF16LE", INT2NUM(YAML_UTF16LE_ENCODING));
+
+ /* UTF-16-BE Encoding with BOM */
+ rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
+
+ ePsychSyntaxError = rb_define_class_under(mPsych, "SyntaxError", rb_eSyntaxError);
+
+ rb_define_method(cPsychParser, "parse", parse, 1);
+
+ id_read = rb_intern("read");
+ id_empty = rb_intern("empty");
+ id_start_stream = rb_intern("start_stream");
+ id_end_stream = rb_intern("end_stream");
+ id_start_document = rb_intern("start_document");
+ id_end_document = rb_intern("end_document");
+ id_alias = rb_intern("alias");
+ id_scalar = rb_intern("scalar");
+ id_start_sequence = rb_intern("start_sequence");
+ id_end_sequence = rb_intern("end_sequence");
+ id_start_mapping = rb_intern("start_mapping");
+ id_end_mapping = rb_intern("end_mapping");
+}
+/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_parser.h b/ext/psych/parser.h
index 25e896f01d..25e896f01d 100644
--- a/ext/psych/psych_parser.h
+++ b/ext/psych/parser.h
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
deleted file mode 100644
index c15449c6ae..0000000000
--- a/ext/psych/psych.gemspec
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
- s.name = "psych"
- s.version = "2.0.0"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Aaron Patterson"]
- s.date = "2012-11-28"
- s.description = "Psych is a YAML parser and emitter. Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]\nfor its YAML parsing and emitting capabilities. In addition to wrapping\nlibyaml, Psych also knows how to serialize and de-serialize most Ruby objects\nto and from the YAML format."
- s.email = ["aaron@tenderlovemaking.com"]
- s.extensions = ["ext/psych/extconf.rb"]
- s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc"]
- s.files = [".autotest", ".travis.yml", "CHANGELOG.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h", "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h", "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h", "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c", "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c", "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h", "lib/psych.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/deprecated.rb", "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb", "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb", "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb", "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb", "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb", "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb", "lib/psych/tree_builder.rb", "lib/psych/visitors.rb", "lib/psych/visitors/depth_first.rb", "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb", "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "test/psych/handlers/test_recorder.rb", "test/psych/helper.rb", "test/psych/json/test_stream.rb", "test/psych/nodes/test_enumerable.rb", "test/psych/test_alias_and_anchor.rb", "test/psych/test_array.rb", "test/psych/test_boolean.rb", "test/psych/test_class.rb", "test/psych/test_coder.rb", "test/psych/test_date_time.rb", "test/psych/test_deprecated.rb", "test/psych/test_document.rb", "test/psych/test_emitter.rb", "test/psych/test_encoding.rb", "test/psych/test_engine_manager.rb", "test/psych/test_exception.rb", "test/psych/test_hash.rb", "test/psych/test_json_tree.rb", "test/psych/test_merge_keys.rb", "test/psych/test_nil.rb", "test/psych/test_null.rb", "test/psych/test_numeric.rb", "test/psych/test_object.rb", "test/psych/test_object_references.rb", "test/psych/test_omap.rb", "test/psych/test_parser.rb", "test/psych/test_psych.rb", "test/psych/test_scalar.rb", "test/psych/test_scalar_scanner.rb", "test/psych/test_serialize_subclasses.rb", "test/psych/test_set.rb", "test/psych/test_stream.rb", "test/psych/test_string.rb", "test/psych/test_struct.rb", "test/psych/test_symbol.rb", "test/psych/test_tainted.rb", "test/psych/test_to_yaml_properties.rb", "test/psych/test_tree_builder.rb", "test/psych/test_yaml.rb", "test/psych/test_yamldbm.rb", "test/psych/test_yamlstore.rb", "test/psych/visitors/test_depth_first.rb", "test/psych/visitors/test_emitter.rb", "test/psych/visitors/test_to_ruby.rb", "test/psych/visitors/test_yaml_tree.rb", ".gemtest"]
- s.homepage = "http://github.com/tenderlove/psych"
- s.rdoc_options = ["--main", "README.rdoc"]
- s.require_paths = ["lib"]
- s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
- s.rubyforge_project = "psych"
- s.rubygems_version = "1.8.24"
- s.summary = "Psych is a YAML parser and emitter"
- s.test_files = ["test/psych/handlers/test_recorder.rb", "test/psych/json/test_stream.rb", "test/psych/nodes/test_enumerable.rb", "test/psych/test_alias_and_anchor.rb", "test/psych/test_array.rb", "test/psych/test_boolean.rb", "test/psych/test_class.rb", "test/psych/test_coder.rb", "test/psych/test_date_time.rb", "test/psych/test_deprecated.rb", "test/psych/test_document.rb", "test/psych/test_emitter.rb", "test/psych/test_encoding.rb", "test/psych/test_engine_manager.rb", "test/psych/test_exception.rb", "test/psych/test_hash.rb", "test/psych/test_json_tree.rb", "test/psych/test_merge_keys.rb", "test/psych/test_nil.rb", "test/psych/test_null.rb", "test/psych/test_numeric.rb", "test/psych/test_object.rb", "test/psych/test_object_references.rb", "test/psych/test_omap.rb", "test/psych/test_parser.rb", "test/psych/test_psych.rb", "test/psych/test_scalar.rb", "test/psych/test_scalar_scanner.rb", "test/psych/test_serialize_subclasses.rb", "test/psych/test_set.rb", "test/psych/test_stream.rb", "test/psych/test_string.rb", "test/psych/test_struct.rb", "test/psych/test_symbol.rb", "test/psych/test_tainted.rb", "test/psych/test_to_yaml_properties.rb", "test/psych/test_tree_builder.rb", "test/psych/test_yaml.rb", "test/psych/test_yamldbm.rb", "test/psych/test_yamlstore.rb", "test/psych/visitors/test_depth_first.rb", "test/psych/visitors/test_emitter.rb", "test/psych/visitors/test_to_ruby.rb", "test/psych/visitors/test_yaml_tree.rb"]
-
-end
diff --git a/ext/psych/psych.h b/ext/psych/psych.h
index 1830ca4b19..9f1be449a2 100644
--- a/ext/psych/psych.h
+++ b/ext/psych/psych.h
@@ -9,10 +9,10 @@
#include <yaml.h>
-#include <psych_parser.h>
-#include <psych_emitter.h>
-#include <psych_to_ruby.h>
-#include <psych_yaml_tree.h>
+#include <parser.h>
+#include <emitter.h>
+#include <to_ruby.h>
+#include <yaml_tree.h>
extern VALUE mPsych;
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
deleted file mode 100644
index f0d032649c..0000000000
--- a/ext/psych/psych_emitter.c
+++ /dev/null
@@ -1,538 +0,0 @@
-#include <psych.h>
-
-VALUE cPsychEmitter;
-static ID id_write;
-static ID id_line_width;
-static ID id_indentation;
-static ID id_canonical;
-
-static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
-{
- if(!yaml_emitter_emit(emitter, event))
- rb_raise(rb_eRuntimeError, "%s", emitter->problem);
-}
-
-static int writer(void *ctx, unsigned char *buffer, size_t size)
-{
- VALUE io = (VALUE)ctx;
- VALUE str = rb_str_new((const char *)buffer, (long)size);
- VALUE wrote = rb_funcall(io, id_write, 1, str);
- return (int)NUM2INT(wrote);
-}
-
-static void dealloc(void * ptr)
-{
- yaml_emitter_t * emitter;
-
- emitter = (yaml_emitter_t *)ptr;
- yaml_emitter_delete(emitter);
- xfree(emitter);
-}
-
-static VALUE allocate(VALUE klass)
-{
- yaml_emitter_t * emitter;
-
- emitter = xmalloc(sizeof(yaml_emitter_t));
-
- yaml_emitter_initialize(emitter);
- yaml_emitter_set_unicode(emitter, 1);
- yaml_emitter_set_indent(emitter, 2);
-
- return Data_Wrap_Struct(klass, 0, dealloc, emitter);
-}
-
-/* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
- *
- * Create a new Psych::Emitter that writes to +io+.
- */
-static VALUE initialize(int argc, VALUE *argv, VALUE self)
-{
- yaml_emitter_t * emitter;
- VALUE io, options;
- VALUE line_width;
- VALUE indent;
- VALUE canonical;
-
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
- line_width = rb_funcall(options, id_line_width, 0);
- indent = rb_funcall(options, id_indentation, 0);
- canonical = rb_funcall(options, id_canonical, 0);
-
- yaml_emitter_set_width(emitter, NUM2INT(line_width));
- yaml_emitter_set_indent(emitter, NUM2INT(indent));
- yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
- }
-
- yaml_emitter_set_output(emitter, writer, (void *)io);
-
- return self;
-}
-
-/* call-seq: emitter.start_stream(encoding)
- *
- * Start a stream emission with +encoding+
- *
- * See Psych::Handler#start_stream
- */
-static VALUE start_stream(VALUE self, VALUE encoding)
-{
- yaml_emitter_t * emitter;
- yaml_event_t event;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
- Check_Type(encoding, T_FIXNUM);
-
- yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.end_stream
- *
- * End a stream emission
- *
- * See Psych::Handler#end_stream
- */
-static VALUE end_stream(VALUE self)
-{
- yaml_emitter_t * emitter;
- yaml_event_t event;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_stream_end_event_initialize(&event);
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.start_document(version, tags, implicit)
- *
- * Start a document emission with YAML +version+, +tags+, and an +implicit+
- * start.
- *
- * See Psych::Handler#start_document
- */
-static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
-{
- yaml_emitter_t * emitter;
- yaml_tag_directive_t * head = NULL;
- yaml_tag_directive_t * tail = NULL;
- yaml_event_t event;
- yaml_version_directive_t version_directive;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-
- Check_Type(version, T_ARRAY);
-
- if(RARRAY_LEN(version) > 0) {
- VALUE major = rb_ary_entry(version, (long)0);
- VALUE minor = rb_ary_entry(version, (long)1);
-
- version_directive.major = NUM2INT(major);
- version_directive.minor = NUM2INT(minor);
- }
-
- if(RTEST(tags)) {
- int i = 0;
-#ifdef HAVE_RUBY_ENCODING_H
- rb_encoding * encoding = rb_utf8_encoding();
-#endif
-
- Check_Type(tags, T_ARRAY);
-
- head = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
- tail = head;
-
- for(i = 0; i < RARRAY_LEN(tags); i++) {
- VALUE tuple = RARRAY_PTR(tags)[i];
- VALUE name;
- VALUE value;
-
- Check_Type(tuple, T_ARRAY);
-
- if(RARRAY_LEN(tuple) < 2) {
- xfree(head);
- rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
- }
- name = RARRAY_PTR(tuple)[0];
- value = RARRAY_PTR(tuple)[1];
-#ifdef HAVE_RUBY_ENCODING_H
- name = rb_str_export_to_enc(name, encoding);
- value = rb_str_export_to_enc(value, encoding);
-#endif
-
- tail->handle = (yaml_char_t *)StringValuePtr(name);
- tail->prefix = (yaml_char_t *)StringValuePtr(value);
-
- tail++;
- }
- }
-
- yaml_document_start_event_initialize(
- &event,
- (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
- head,
- tail,
- imp ? 1 : 0
- );
-
- emit(emitter, &event);
-
- if(head) xfree(head);
-
- return self;
-}
-
-/* call-seq: emitter.end_document(implicit)
- *
- * End a document emission with an +implicit+ ending.
- *
- * See Psych::Handler#end_document
- */
-static VALUE end_document(VALUE self, VALUE imp)
-{
- yaml_emitter_t * emitter;
- yaml_event_t event;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_document_end_event_initialize(&event, imp ? 1 : 0);
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.scalar(value, anchor, tag, plain, quoted, style)
- *
- * Emit a scalar with +value+, +anchor+, +tag+, and a +plain+ or +quoted+
- * string type with +style+.
- *
- * See Psych::Handler#scalar
- */
-static VALUE scalar(
- VALUE self,
- VALUE value,
- VALUE anchor,
- VALUE tag,
- VALUE plain,
- VALUE quoted,
- VALUE style
- ) {
- yaml_emitter_t * emitter;
- yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
- rb_encoding *encoding;
-#endif
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- Check_Type(value, T_STRING);
-
-#ifdef HAVE_RUBY_ENCODING_H
- encoding = rb_utf8_encoding();
-
- value = rb_str_export_to_enc(value, encoding);
-
- if(!NIL_P(anchor)) {
- Check_Type(anchor, T_STRING);
- anchor = rb_str_export_to_enc(anchor, encoding);
- }
-
- if(!NIL_P(tag)) {
- Check_Type(tag, T_STRING);
- tag = rb_str_export_to_enc(tag, encoding);
- }
-#endif
-
- yaml_scalar_event_initialize(
- &event,
- (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
- (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
- (yaml_char_t*)StringValuePtr(value),
- (int)RSTRING_LEN(value),
- plain ? 1 : 0,
- quoted ? 1 : 0,
- (yaml_scalar_style_t)NUM2INT(style)
- );
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.start_sequence(anchor, tag, implicit, style)
- *
- * Start emitting a sequence with +anchor+, a +tag+, +implicit+ sequence
- * start and end, along with +style+.
- *
- * See Psych::Handler#start_sequence
- */
-static VALUE start_sequence(
- VALUE self,
- VALUE anchor,
- VALUE tag,
- VALUE implicit,
- VALUE style
- ) {
- yaml_emitter_t * emitter;
- yaml_event_t event;
-
-#ifdef HAVE_RUBY_ENCODING_H
- rb_encoding * encoding = rb_utf8_encoding();
-
- if(!NIL_P(anchor)) {
- Check_Type(anchor, T_STRING);
- anchor = rb_str_export_to_enc(anchor, encoding);
- }
-
- if(!NIL_P(tag)) {
- Check_Type(tag, T_STRING);
- tag = rb_str_export_to_enc(tag, encoding);
- }
-#endif
-
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_sequence_start_event_initialize(
- &event,
- (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
- (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
- implicit ? 1 : 0,
- (yaml_sequence_style_t)NUM2INT(style)
- );
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.end_sequence
- *
- * End sequence emission.
- *
- * See Psych::Handler#end_sequence
- */
-static VALUE end_sequence(VALUE self)
-{
- yaml_emitter_t * emitter;
- yaml_event_t event;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_sequence_end_event_initialize(&event);
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.start_mapping(anchor, tag, implicit, style)
- *
- * Start emitting a YAML map with +anchor+, +tag+, an +implicit+ start
- * and end, and +style+.
- *
- * See Psych::Handler#start_mapping
- */
-static VALUE start_mapping(
- VALUE self,
- VALUE anchor,
- VALUE tag,
- VALUE implicit,
- VALUE style
- ) {
- yaml_emitter_t * emitter;
- yaml_event_t event;
-#ifdef HAVE_RUBY_ENCODING_H
- rb_encoding *encoding;
-#endif
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-#ifdef HAVE_RUBY_ENCODING_H
- encoding = rb_utf8_encoding();
-
- if(!NIL_P(anchor)) {
- Check_Type(anchor, T_STRING);
- anchor = rb_str_export_to_enc(anchor, encoding);
- }
-
- if(!NIL_P(tag)) {
- Check_Type(tag, T_STRING);
- tag = rb_str_export_to_enc(tag, encoding);
- }
-#endif
-
- yaml_mapping_start_event_initialize(
- &event,
- (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor)),
- (yaml_char_t *)(NIL_P(tag) ? NULL : StringValuePtr(tag)),
- implicit ? 1 : 0,
- (yaml_mapping_style_t)NUM2INT(style)
- );
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.end_mapping
- *
- * Emit the end of a mapping.
- *
- * See Psych::Handler#end_mapping
- */
-static VALUE end_mapping(VALUE self)
-{
- yaml_emitter_t * emitter;
- yaml_event_t event;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_mapping_end_event_initialize(&event);
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.alias(anchor)
- *
- * Emit an alias with +anchor+.
- *
- * See Psych::Handler#alias
- */
-static VALUE alias(VALUE self, VALUE anchor)
-{
- yaml_emitter_t * emitter;
- yaml_event_t event;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
-#ifdef HAVE_RUBY_ENCODING_H
- if(!NIL_P(anchor)) {
- Check_Type(anchor, T_STRING);
- anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
- }
-#endif
-
- yaml_alias_event_initialize(
- &event,
- (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValuePtr(anchor))
- );
-
- emit(emitter, &event);
-
- return self;
-}
-
-/* call-seq: emitter.canonical = true
- *
- * Set the output style to canonical, or not.
- */
-static VALUE set_canonical(VALUE self, VALUE style)
-{
- yaml_emitter_t * emitter;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
-
- return style;
-}
-
-/* call-seq: emitter.canonical
- *
- * Get the output style, canonical or not.
- */
-static VALUE canonical(VALUE self)
-{
- yaml_emitter_t * emitter;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- return (emitter->canonical == 0) ? Qfalse : Qtrue;
-}
-
-/* call-seq: emitter.indentation = level
- *
- * Set the indentation level to +level+. The level must be less than 10 and
- * greater than 1.
- */
-static VALUE set_indentation(VALUE self, VALUE level)
-{
- yaml_emitter_t * emitter;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_emitter_set_indent(emitter, NUM2INT(level));
-
- return level;
-}
-
-/* call-seq: emitter.indentation
- *
- * Get the indentation level.
- */
-static VALUE indentation(VALUE self)
-{
- yaml_emitter_t * emitter;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- return INT2NUM(emitter->best_indent);
-}
-
-/* call-seq: emitter.line_width
- *
- * Get the preferred line width.
- */
-static VALUE line_width(VALUE self)
-{
- yaml_emitter_t * emitter;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- return INT2NUM(emitter->best_width);
-}
-
-/* call-seq: emitter.line_width = width
- *
- * Set the preferred line with to +width+.
- */
-static VALUE set_line_width(VALUE self, VALUE width)
-{
- yaml_emitter_t * emitter;
- Data_Get_Struct(self, yaml_emitter_t, emitter);
-
- yaml_emitter_set_width(emitter, NUM2INT(width));
-
- return width;
-}
-
-void Init_psych_emitter()
-{
- VALUE psych = rb_define_module("Psych");
- VALUE handler = rb_define_class_under(psych, "Handler", rb_cObject);
- cPsychEmitter = rb_define_class_under(psych, "Emitter", handler);
-
- rb_define_alloc_func(cPsychEmitter, allocate);
-
- rb_define_method(cPsychEmitter, "initialize", initialize, -1);
- rb_define_method(cPsychEmitter, "start_stream", start_stream, 1);
- rb_define_method(cPsychEmitter, "end_stream", end_stream, 0);
- rb_define_method(cPsychEmitter, "start_document", start_document, 3);
- rb_define_method(cPsychEmitter, "end_document", end_document, 1);
- rb_define_method(cPsychEmitter, "scalar", scalar, 6);
- rb_define_method(cPsychEmitter, "start_sequence", start_sequence, 4);
- rb_define_method(cPsychEmitter, "end_sequence", end_sequence, 0);
- rb_define_method(cPsychEmitter, "start_mapping", start_mapping, 4);
- rb_define_method(cPsychEmitter, "end_mapping", end_mapping, 0);
- rb_define_method(cPsychEmitter, "alias", alias, 1);
- rb_define_method(cPsychEmitter, "canonical", canonical, 0);
- rb_define_method(cPsychEmitter, "canonical=", set_canonical, 1);
- rb_define_method(cPsychEmitter, "indentation", indentation, 0);
- rb_define_method(cPsychEmitter, "indentation=", set_indentation, 1);
- rb_define_method(cPsychEmitter, "line_width", line_width, 0);
- rb_define_method(cPsychEmitter, "line_width=", set_line_width, 1);
-
- id_write = rb_intern("write");
- id_line_width = rb_intern("line_width");
- id_indentation = rb_intern("indentation");
- id_canonical = rb_intern("canonical");
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
deleted file mode 100644
index 8c65ce1307..0000000000
--- a/ext/psych/psych_parser.c
+++ /dev/null
@@ -1,579 +0,0 @@
-#include <psych.h>
-
-VALUE cPsychParser;
-VALUE ePsychSyntaxError;
-
-static ID id_read;
-static ID id_path;
-static ID id_empty;
-static ID id_start_stream;
-static ID id_end_stream;
-static ID id_start_document;
-static ID id_end_document;
-static ID id_alias;
-static ID id_scalar;
-static ID id_start_sequence;
-static ID id_end_sequence;
-static ID id_start_mapping;
-static ID id_end_mapping;
-
-#define PSYCH_TRANSCODE(_str, _yaml_enc, _internal_enc) \
- do { \
- rb_enc_associate_index((_str), (_yaml_enc)); \
- if(_internal_enc) \
- (_str) = rb_str_export_to_enc((_str), (_internal_enc)); \
- } while (0)
-
-static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
-{
- VALUE io = (VALUE)data;
- VALUE string = rb_funcall(io, id_read, 1, INT2NUM(size));
-
- *read = 0;
-
- if(! NIL_P(string)) {
- void * str = (void *)StringValuePtr(string);
- *read = (size_t)RSTRING_LEN(string);
- memcpy(buf, str, *read);
- }
-
- return 1;
-}
-
-static void dealloc(void * ptr)
-{
- yaml_parser_t * parser;
-
- parser = (yaml_parser_t *)ptr;
- yaml_parser_delete(parser);
- xfree(parser);
-}
-
-static VALUE allocate(VALUE klass)
-{
- yaml_parser_t * parser;
-
- parser = xmalloc(sizeof(yaml_parser_t));
- yaml_parser_initialize(parser);
-
- return Data_Wrap_Struct(klass, 0, dealloc, parser);
-}
-
-static VALUE make_exception(yaml_parser_t * parser, VALUE path)
-{
- size_t line, column;
-
- line = parser->context_mark.line + 1;
- column = parser->context_mark.column + 1;
-
- return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
- path,
- INT2NUM(line),
- INT2NUM(column),
- INT2NUM(parser->problem_offset),
- parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
- parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
-}
-
-#ifdef HAVE_RUBY_ENCODING_H
-static VALUE transcode_string(VALUE src, int * parser_encoding)
-{
- int utf8 = rb_utf8_encindex();
- int utf16le = rb_enc_find_index("UTF-16LE");
- int utf16be = rb_enc_find_index("UTF-16BE");
- int source_encoding = rb_enc_get_index(src);
-
- if (source_encoding == utf8) {
- *parser_encoding = YAML_UTF8_ENCODING;
- return src;
- }
-
- if (source_encoding == utf16le) {
- *parser_encoding = YAML_UTF16LE_ENCODING;
- return src;
- }
-
- if (source_encoding == utf16be) {
- *parser_encoding = YAML_UTF16BE_ENCODING;
- return src;
- }
-
- src = rb_str_export_to_enc(src, rb_utf8_encoding());
- RB_GC_GUARD(src);
-
- *parser_encoding = YAML_UTF8_ENCODING;
- return src;
-}
-
-static VALUE transcode_io(VALUE src, int * parser_encoding)
-{
- VALUE io_external_encoding;
- int io_external_enc_index;
-
- io_external_encoding = rb_funcall(src, rb_intern("external_encoding"), 0);
-
- /* if no encoding is returned, assume ascii8bit. */
- if (NIL_P(io_external_encoding)) {
- io_external_enc_index = rb_ascii8bit_encindex();
- } else {
- io_external_enc_index = rb_to_encoding_index(io_external_encoding);
- }
-
- /* Treat US-ASCII as utf_8 */
- if (io_external_enc_index == rb_usascii_encindex()) {
- *parser_encoding = YAML_UTF8_ENCODING;
- return src;
- }
-
- if (io_external_enc_index == rb_utf8_encindex()) {
- *parser_encoding = YAML_UTF8_ENCODING;
- return src;
- }
-
- if (io_external_enc_index == rb_enc_find_index("UTF-16LE")) {
- *parser_encoding = YAML_UTF16LE_ENCODING;
- return src;
- }
-
- if (io_external_enc_index == rb_enc_find_index("UTF-16BE")) {
- *parser_encoding = YAML_UTF16BE_ENCODING;
- return src;
- }
-
- /* Just guess on ASCII-8BIT */
- if (io_external_enc_index == rb_ascii8bit_encindex()) {
- *parser_encoding = YAML_ANY_ENCODING;
- return src;
- }
-
- /* If the external encoding is something we don't know how to handle,
- * fall back to YAML_ANY_ENCODING. */
- *parser_encoding = YAML_ANY_ENCODING;
-
- return src;
-}
-
-#endif
-
-static VALUE protected_start_stream(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall(args[0], id_start_stream, 1, args[1]);
-}
-
-static VALUE protected_start_document(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall3(args[0], id_start_document, 3, args + 1);
-}
-
-static VALUE protected_end_document(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall(args[0], id_end_document, 1, args[1]);
-}
-
-static VALUE protected_alias(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall(args[0], id_alias, 1, args[1]);
-}
-
-static VALUE protected_scalar(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall3(args[0], id_scalar, 6, args + 1);
-}
-
-static VALUE protected_start_sequence(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall3(args[0], id_start_sequence, 4, args + 1);
-}
-
-static VALUE protected_end_sequence(VALUE handler)
-{
- return rb_funcall(handler, id_end_sequence, 0);
-}
-
-static VALUE protected_start_mapping(VALUE pointer)
-{
- VALUE *args = (VALUE *)pointer;
- return rb_funcall3(args[0], id_start_mapping, 4, args + 1);
-}
-
-static VALUE protected_end_mapping(VALUE handler)
-{
- return rb_funcall(handler, id_end_mapping, 0);
-}
-
-static VALUE protected_empty(VALUE handler)
-{
- return rb_funcall(handler, id_empty, 0);
-}
-
-static VALUE protected_end_stream(VALUE handler)
-{
- return rb_funcall(handler, id_end_stream, 0);
-}
-
-/*
- * call-seq:
- * parser.parse(yaml)
- *
- * Parse the YAML document contained in +yaml+. Events will be called on
- * the handler set on the parser instance.
- *
- * See Psych::Parser and Psych::Parser#handler
- */
-static VALUE parse(int argc, VALUE *argv, VALUE self)
-{
- VALUE yaml, path;
- yaml_parser_t * parser;
- yaml_event_t event;
- int done = 0;
- int tainted = 0;
- int state = 0;
- int parser_encoding = YAML_ANY_ENCODING;
-#ifdef HAVE_RUBY_ENCODING_H
- int encoding = rb_utf8_encindex();
- rb_encoding * internal_enc = rb_default_internal_encoding();
-#endif
- VALUE handler = rb_iv_get(self, "@handler");
-
- if (rb_scan_args(argc, argv, "11", &yaml, &path) == 1) {
- if(rb_respond_to(yaml, id_path))
- path = rb_funcall(yaml, id_path, 0);
- else
- path = rb_str_new2("<unknown>");
- }
-
- Data_Get_Struct(self, yaml_parser_t, parser);
-
- yaml_parser_delete(parser);
- yaml_parser_initialize(parser);
-
- if (OBJ_TAINTED(yaml)) tainted = 1;
-
- if (rb_respond_to(yaml, id_read)) {
-#ifdef HAVE_RUBY_ENCODING_H
- yaml = transcode_io(yaml, &parser_encoding);
- yaml_parser_set_encoding(parser, parser_encoding);
-#endif
- yaml_parser_set_input(parser, io_reader, (void *)yaml);
- if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
- } else {
- StringValue(yaml);
-#ifdef HAVE_RUBY_ENCODING_H
- yaml = transcode_string(yaml, &parser_encoding);
- yaml_parser_set_encoding(parser, parser_encoding);
-#endif
- yaml_parser_set_input_string(
- parser,
- (const unsigned char *)RSTRING_PTR(yaml),
- (size_t)RSTRING_LEN(yaml)
- );
- }
-
- while(!done) {
- if(!yaml_parser_parse(parser, &event)) {
- VALUE exception;
-
- exception = make_exception(parser, path);
- yaml_parser_delete(parser);
- yaml_parser_initialize(parser);
-
- rb_exc_raise(exception);
- }
-
- switch(event.type) {
- case YAML_STREAM_START_EVENT:
- {
- VALUE args[2];
-
- args[0] = handler;
- args[1] = INT2NUM((long)event.data.stream_start.encoding);
- rb_protect(protected_start_stream, (VALUE)args, &state);
- }
- break;
- case YAML_DOCUMENT_START_EVENT:
- {
- VALUE args[4];
- /* Get a list of tag directives (if any) */
- VALUE tag_directives = rb_ary_new();
- /* Grab the document version */
- VALUE version = event.data.document_start.version_directive ?
- rb_ary_new3(
- (long)2,
- INT2NUM((long)event.data.document_start.version_directive->major),
- INT2NUM((long)event.data.document_start.version_directive->minor)
- ) : rb_ary_new();
-
- if(event.data.document_start.tag_directives.start) {
- yaml_tag_directive_t *start =
- event.data.document_start.tag_directives.start;
- yaml_tag_directive_t *end =
- event.data.document_start.tag_directives.end;
- for(; start != end; start++) {
- VALUE handle = Qnil;
- VALUE prefix = Qnil;
- if(start->handle) {
- handle = rb_str_new2((const char *)start->handle);
- if (tainted) OBJ_TAINT(handle);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(handle, encoding, internal_enc);
-#endif
- }
-
- if(start->prefix) {
- prefix = rb_str_new2((const char *)start->prefix);
- if (tainted) OBJ_TAINT(prefix);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(prefix, encoding, internal_enc);
-#endif
- }
-
- rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
- }
- }
- args[0] = handler;
- args[1] = version;
- args[2] = tag_directives;
- args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
- rb_protect(protected_start_document, (VALUE)args, &state);
- }
- break;
- case YAML_DOCUMENT_END_EVENT:
- {
- VALUE args[2];
-
- args[0] = handler;
- args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
- rb_protect(protected_end_document, (VALUE)args, &state);
- }
- break;
- case YAML_ALIAS_EVENT:
- {
- VALUE args[2];
- VALUE alias = Qnil;
- if(event.data.alias.anchor) {
- alias = rb_str_new2((const char *)event.data.alias.anchor);
- if (tainted) OBJ_TAINT(alias);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(alias, encoding, internal_enc);
-#endif
- }
-
- args[0] = handler;
- args[1] = alias;
- rb_protect(protected_alias, (VALUE)args, &state);
- }
- break;
- case YAML_SCALAR_EVENT:
- {
- VALUE args[7];
- VALUE anchor = Qnil;
- VALUE tag = Qnil;
- VALUE plain_implicit, quoted_implicit, style;
- VALUE val = rb_str_new(
- (const char *)event.data.scalar.value,
- (long)event.data.scalar.length
- );
- if (tainted) OBJ_TAINT(val);
-
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(val, encoding, internal_enc);
-#endif
-
- if(event.data.scalar.anchor) {
- anchor = rb_str_new2((const char *)event.data.scalar.anchor);
- if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
- }
-
- if(event.data.scalar.tag) {
- tag = rb_str_new2((const char *)event.data.scalar.tag);
- if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
- }
-
- plain_implicit =
- event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
-
- quoted_implicit =
- event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
-
- style = INT2NUM((long)event.data.scalar.style);
-
- args[0] = handler;
- args[1] = val;
- args[2] = anchor;
- args[3] = tag;
- args[4] = plain_implicit;
- args[5] = quoted_implicit;
- args[6] = style;
- rb_protect(protected_scalar, (VALUE)args, &state);
- }
- break;
- case YAML_SEQUENCE_START_EVENT:
- {
- VALUE args[5];
- VALUE anchor = Qnil;
- VALUE tag = Qnil;
- VALUE implicit, style;
- if(event.data.sequence_start.anchor) {
- anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
- if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
- }
-
- tag = Qnil;
- if(event.data.sequence_start.tag) {
- tag = rb_str_new2((const char *)event.data.sequence_start.tag);
- if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
- }
-
- implicit =
- event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
-
- style = INT2NUM((long)event.data.sequence_start.style);
-
- args[0] = handler;
- args[1] = anchor;
- args[2] = tag;
- args[3] = implicit;
- args[4] = style;
-
- rb_protect(protected_start_sequence, (VALUE)args, &state);
- }
- break;
- case YAML_SEQUENCE_END_EVENT:
- rb_protect(protected_end_sequence, handler, &state);
- break;
- case YAML_MAPPING_START_EVENT:
- {
- VALUE args[5];
- VALUE anchor = Qnil;
- VALUE tag = Qnil;
- VALUE implicit, style;
- if(event.data.mapping_start.anchor) {
- anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
- if (tainted) OBJ_TAINT(anchor);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-#endif
- }
-
- if(event.data.mapping_start.tag) {
- tag = rb_str_new2((const char *)event.data.mapping_start.tag);
- if (tainted) OBJ_TAINT(tag);
-#ifdef HAVE_RUBY_ENCODING_H
- PSYCH_TRANSCODE(tag, encoding, internal_enc);
-#endif
- }
-
- implicit =
- event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
-
- style = INT2NUM((long)event.data.mapping_start.style);
-
- args[0] = handler;
- args[1] = anchor;
- args[2] = tag;
- args[3] = implicit;
- args[4] = style;
-
- rb_protect(protected_start_mapping, (VALUE)args, &state);
- }
- break;
- case YAML_MAPPING_END_EVENT:
- rb_protect(protected_end_mapping, handler, &state);
- break;
- case YAML_NO_EVENT:
- rb_protect(protected_empty, handler, &state);
- break;
- case YAML_STREAM_END_EVENT:
- rb_protect(protected_end_stream, handler, &state);
- done = 1;
- break;
- }
- yaml_event_delete(&event);
- if (state) rb_jump_tag(state);
- }
-
- return self;
-}
-
-/*
- * call-seq:
- * parser.mark # => #<Psych::Parser::Mark>
- *
- * Returns a Psych::Parser::Mark object that contains line, column, and index
- * information.
- */
-static VALUE mark(VALUE self)
-{
- VALUE mark_klass;
- VALUE args[3];
- yaml_parser_t * parser;
-
- Data_Get_Struct(self, yaml_parser_t, parser);
- mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark"));
- args[0] = INT2NUM(parser->mark.index);
- args[1] = INT2NUM(parser->mark.line);
- args[2] = INT2NUM(parser->mark.column);
-
- return rb_class_new_instance(3, args, mark_klass);
-}
-
-void Init_psych_parser()
-{
-#if 0
- mPsych = rb_define_module("Psych");
-#endif
-
- cPsychParser = rb_define_class_under(mPsych, "Parser", rb_cObject);
- rb_define_alloc_func(cPsychParser, allocate);
-
- /* Any encoding: Let the parser choose the encoding */
- rb_define_const(cPsychParser, "ANY", INT2NUM(YAML_ANY_ENCODING));
-
- /* UTF-8 Encoding */
- rb_define_const(cPsychParser, "UTF8", INT2NUM(YAML_UTF8_ENCODING));
-
- /* UTF-16-LE Encoding with BOM */
- rb_define_const(cPsychParser, "UTF16LE", INT2NUM(YAML_UTF16LE_ENCODING));
-
- /* UTF-16-BE Encoding with BOM */
- rb_define_const(cPsychParser, "UTF16BE", INT2NUM(YAML_UTF16BE_ENCODING));
-
- rb_require("psych/syntax_error");
- ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
-
- rb_define_method(cPsychParser, "parse", parse, -1);
- rb_define_method(cPsychParser, "mark", mark, 0);
-
- id_read = rb_intern("read");
- id_path = rb_intern("path");
- id_empty = rb_intern("empty");
- id_start_stream = rb_intern("start_stream");
- id_end_stream = rb_intern("end_stream");
- id_start_document = rb_intern("start_document");
- id_end_document = rb_intern("end_document");
- id_alias = rb_intern("alias");
- id_scalar = rb_intern("scalar");
- id_start_sequence = rb_intern("start_sequence");
- id_end_sequence = rb_intern("end_sequence");
- id_start_mapping = rb_intern("start_mapping");
- id_end_mapping = rb_intern("end_mapping");
-}
-/* vim: set noet sws=4 sw=4: */
diff --git a/ext/psych/psych_to_ruby.c b/ext/psych/to_ruby.c
index ed5245e12e..ed5245e12e 100644
--- a/ext/psych/psych_to_ruby.c
+++ b/ext/psych/to_ruby.c
diff --git a/ext/psych/psych_to_ruby.h b/ext/psych/to_ruby.h
index 7b8e757a45..7b8e757a45 100644
--- a/ext/psych/psych_to_ruby.h
+++ b/ext/psych/to_ruby.h
diff --git a/ext/psych/yaml/LICENSE b/ext/psych/yaml/LICENSE
deleted file mode 100644
index 050ced23f6..0000000000
--- a/ext/psych/yaml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006 Kirill Simonov
-
-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.
diff --git a/ext/psych/yaml/api.c b/ext/psych/yaml/api.c
deleted file mode 100644
index e0b9d979cc..0000000000
--- a/ext/psych/yaml/api.c
+++ /dev/null
@@ -1,1415 +0,0 @@
-
-#include "yaml_private.h"
-
-/*
- * Get the library version.
- */
-
-YAML_DECLARE(const char *)
-yaml_get_version_string(void)
-{
- return YAML_VERSION_STRING;
-}
-
-/*
- * Get the library version numbers.
- */
-
-YAML_DECLARE(void)
-yaml_get_version(int *major, int *minor, int *patch)
-{
- *major = YAML_VERSION_MAJOR;
- *minor = YAML_VERSION_MINOR;
- *patch = YAML_VERSION_PATCH;
-}
-
-/*
- * Allocate a dynamic memory block.
- */
-
-YAML_DECLARE(void *)
-yaml_malloc(size_t size)
-{
- return malloc(size ? size : 1);
-}
-
-/*
- * Reallocate a dynamic memory block.
- */
-
-YAML_DECLARE(void *)
-yaml_realloc(void *ptr, size_t size)
-{
- return ptr ? realloc(ptr, size ? size : 1) : malloc(size ? size : 1);
-}
-
-/*
- * Free a dynamic memory block.
- */
-
-YAML_DECLARE(void)
-yaml_free(void *ptr)
-{
- if (ptr) free(ptr);
-}
-
-/*
- * Duplicate a string.
- */
-
-YAML_DECLARE(yaml_char_t *)
-yaml_strdup(const yaml_char_t *str)
-{
- if (!str)
- return NULL;
-
- return (yaml_char_t *)strdup((char *)str);
-}
-
-/*
- * Extend a string.
- */
-
-YAML_DECLARE(int)
-yaml_string_extend(yaml_char_t **start,
- yaml_char_t **pointer, yaml_char_t **end)
-{
- yaml_char_t *new_start = yaml_realloc(*start, (*end - *start)*2);
-
- if (!new_start) return 0;
-
- memset(new_start + (*end - *start), 0, *end - *start);
-
- *pointer = new_start + (*pointer - *start);
- *end = new_start + (*end - *start)*2;
- *start = new_start;
-
- return 1;
-}
-
-/*
- * Append a string B to a string A.
- */
-
-YAML_DECLARE(int)
-yaml_string_join(
- yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
- yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end)
-{
- if (*b_start == *b_pointer)
- return 1;
-
- while (*a_end - *a_pointer <= *b_pointer - *b_start) {
- if (!yaml_string_extend(a_start, a_pointer, a_end))
- return 0;
- }
-
- memcpy(*a_pointer, *b_start, *b_pointer - *b_start);
- *a_pointer += *b_pointer - *b_start;
-
- return 1;
-}
-
-/*
- * Extend a stack.
- */
-
-YAML_DECLARE(int)
-yaml_stack_extend(void **start, void **top, void **end)
-{
- void *new_start = yaml_realloc(*start, ((char *)*end - (char *)*start)*2);
-
- if (!new_start) return 0;
-
- *top = (char *)new_start + ((char *)*top - (char *)*start);
- *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
- *start = new_start;
-
- return 1;
-}
-
-/*
- * Extend or move a queue.
- */
-
-YAML_DECLARE(int)
-yaml_queue_extend(void **start, void **head, void **tail, void **end)
-{
- /* Check if we need to resize the queue. */
-
- if (*start == *head && *tail == *end) {
- void *new_start = yaml_realloc(*start,
- ((char *)*end - (char *)*start)*2);
-
- if (!new_start) return 0;
-
- *head = (char *)new_start + ((char *)*head - (char *)*start);
- *tail = (char *)new_start + ((char *)*tail - (char *)*start);
- *end = (char *)new_start + ((char *)*end - (char *)*start)*2;
- *start = new_start;
- }
-
- /* Check if we need to move the queue at the beginning of the buffer. */
-
- if (*tail == *end) {
- if (*head != *tail) {
- memmove(*start, *head, (char *)*tail - (char *)*head);
- }
- *tail = (char *)*tail - (char *)*head + (char *)*start;
- *head = *start;
- }
-
- return 1;
-}
-
-
-/*
- * Create a new parser object.
- */
-
-YAML_DECLARE(int)
-yaml_parser_initialize(yaml_parser_t *parser)
-{
- assert(parser); /* Non-NULL parser object expected. */
-
- memset(parser, 0, sizeof(yaml_parser_t));
- if (!BUFFER_INIT(parser, parser->raw_buffer, INPUT_RAW_BUFFER_SIZE))
- goto error;
- if (!BUFFER_INIT(parser, parser->buffer, INPUT_BUFFER_SIZE))
- goto error;
- if (!QUEUE_INIT(parser, parser->tokens, INITIAL_QUEUE_SIZE))
- goto error;
- if (!STACK_INIT(parser, parser->indents, INITIAL_STACK_SIZE))
- goto error;
- if (!STACK_INIT(parser, parser->simple_keys, INITIAL_STACK_SIZE))
- goto error;
- if (!STACK_INIT(parser, parser->states, INITIAL_STACK_SIZE))
- goto error;
- if (!STACK_INIT(parser, parser->marks, INITIAL_STACK_SIZE))
- goto error;
- if (!STACK_INIT(parser, parser->tag_directives, INITIAL_STACK_SIZE))
- goto error;
-
- return 1;
-
-error:
-
- BUFFER_DEL(parser, parser->raw_buffer);
- BUFFER_DEL(parser, parser->buffer);
- QUEUE_DEL(parser, parser->tokens);
- STACK_DEL(parser, parser->indents);
- STACK_DEL(parser, parser->simple_keys);
- STACK_DEL(parser, parser->states);
- STACK_DEL(parser, parser->marks);
- STACK_DEL(parser, parser->tag_directives);
-
- return 0;
-}
-
-/*
- * Destroy a parser object.
- */
-
-YAML_DECLARE(void)
-yaml_parser_delete(yaml_parser_t *parser)
-{
- assert(parser); /* Non-NULL parser object expected. */
-
- BUFFER_DEL(parser, parser->raw_buffer);
- BUFFER_DEL(parser, parser->buffer);
- while (!QUEUE_EMPTY(parser, parser->tokens)) {
- yaml_token_delete(&DEQUEUE(parser, parser->tokens));
- }
- QUEUE_DEL(parser, parser->tokens);
- STACK_DEL(parser, parser->indents);
- STACK_DEL(parser, parser->simple_keys);
- STACK_DEL(parser, parser->states);
- STACK_DEL(parser, parser->marks);
- while (!STACK_EMPTY(parser, parser->tag_directives)) {
- yaml_tag_directive_t tag_directive = POP(parser, parser->tag_directives);
- yaml_free(tag_directive.handle);
- yaml_free(tag_directive.prefix);
- }
- STACK_DEL(parser, parser->tag_directives);
-
- memset(parser, 0, sizeof(yaml_parser_t));
-}
-
-/*
- * String read handler.
- */
-
-static int
-yaml_string_read_handler(void *data, unsigned char *buffer, size_t size,
- size_t *size_read)
-{
- yaml_parser_t *parser = data;
-
- if (parser->input.string.current == parser->input.string.end) {
- *size_read = 0;
- return 1;
- }
-
- if (size > (size_t)(parser->input.string.end
- - parser->input.string.current)) {
- size = parser->input.string.end - parser->input.string.current;
- }
-
- memcpy(buffer, parser->input.string.current, size);
- parser->input.string.current += size;
- *size_read = size;
- return 1;
-}
-
-/*
- * File read handler.
- */
-
-static int
-yaml_file_read_handler(void *data, unsigned char *buffer, size_t size,
- size_t *size_read)
-{
- yaml_parser_t *parser = data;
-
- *size_read = fread(buffer, 1, size, parser->input.file);
- return !ferror(parser->input.file);
-}
-
-/*
- * Set a string input.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input_string(yaml_parser_t *parser,
- const unsigned char *input, size_t size)
-{
- assert(parser); /* Non-NULL parser object expected. */
- assert(!parser->read_handler); /* You can set the source only once. */
- assert(input); /* Non-NULL input string expected. */
-
- parser->read_handler = yaml_string_read_handler;
- parser->read_handler_data = parser;
-
- parser->input.string.start = input;
- parser->input.string.current = input;
- parser->input.string.end = input+size;
-}
-
-/*
- * Set a file input.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file)
-{
- assert(parser); /* Non-NULL parser object expected. */
- assert(!parser->read_handler); /* You can set the source only once. */
- assert(file); /* Non-NULL file object expected. */
-
- parser->read_handler = yaml_file_read_handler;
- parser->read_handler_data = parser;
-
- parser->input.file = file;
-}
-
-/*
- * Set a generic input.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input(yaml_parser_t *parser,
- yaml_read_handler_t *handler, void *data)
-{
- assert(parser); /* Non-NULL parser object expected. */
- assert(!parser->read_handler); /* You can set the source only once. */
- assert(handler); /* Non-NULL read handler expected. */
-
- parser->read_handler = handler;
- parser->read_handler_data = data;
-}
-
-/*
- * Set the source encoding.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_encoding(yaml_parser_t *parser, yaml_encoding_t encoding)
-{
- assert(parser); /* Non-NULL parser object expected. */
- assert(!parser->encoding); /* Encoding is already set or detected. */
-
- parser->encoding = encoding;
-}
-
-/*
- * Create a new emitter object.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_initialize(yaml_emitter_t *emitter)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- memset(emitter, 0, sizeof(yaml_emitter_t));
- if (!BUFFER_INIT(emitter, emitter->buffer, OUTPUT_BUFFER_SIZE))
- goto error;
- if (!BUFFER_INIT(emitter, emitter->raw_buffer, OUTPUT_RAW_BUFFER_SIZE))
- goto error;
- if (!STACK_INIT(emitter, emitter->states, INITIAL_STACK_SIZE))
- goto error;
- if (!QUEUE_INIT(emitter, emitter->events, INITIAL_QUEUE_SIZE))
- goto error;
- if (!STACK_INIT(emitter, emitter->indents, INITIAL_STACK_SIZE))
- goto error;
- if (!STACK_INIT(emitter, emitter->tag_directives, INITIAL_STACK_SIZE))
- goto error;
-
- return 1;
-
-error:
-
- BUFFER_DEL(emitter, emitter->buffer);
- BUFFER_DEL(emitter, emitter->raw_buffer);
- STACK_DEL(emitter, emitter->states);
- QUEUE_DEL(emitter, emitter->events);
- STACK_DEL(emitter, emitter->indents);
- STACK_DEL(emitter, emitter->tag_directives);
-
- return 0;
-}
-
-/*
- * Destroy an emitter object.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_delete(yaml_emitter_t *emitter)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- BUFFER_DEL(emitter, emitter->buffer);
- BUFFER_DEL(emitter, emitter->raw_buffer);
- STACK_DEL(emitter, emitter->states);
- while (!QUEUE_EMPTY(emitter, emitter->events)) {
- yaml_event_delete(&DEQUEUE(emitter, emitter->events));
- }
- QUEUE_DEL(emitter, emitter->events);
- STACK_DEL(emitter, emitter->indents);
- while (!STACK_EMPTY(emitter, emitter->tag_directives)) {
- yaml_tag_directive_t tag_directive = POP(emitter, emitter->tag_directives);
- yaml_free(tag_directive.handle);
- yaml_free(tag_directive.prefix);
- }
- STACK_DEL(emitter, emitter->tag_directives);
- yaml_free(emitter->anchors);
-
- memset(emitter, 0, sizeof(yaml_emitter_t));
-}
-
-/*
- * String write handler.
- */
-
-static int
-yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
-{
- yaml_emitter_t *emitter = data;
-
- if (emitter->output.string.size + *emitter->output.string.size_written
- < size) {
- memcpy(emitter->output.string.buffer
- + *emitter->output.string.size_written,
- buffer,
- emitter->output.string.size
- - *emitter->output.string.size_written);
- *emitter->output.string.size_written = emitter->output.string.size;
- return 0;
- }
-
- memcpy(emitter->output.string.buffer
- + *emitter->output.string.size_written, buffer, size);
- *emitter->output.string.size_written += size;
- return 1;
-}
-
-/*
- * File write handler.
- */
-
-static int
-yaml_file_write_handler(void *data, unsigned char *buffer, size_t size)
-{
- yaml_emitter_t *emitter = data;
-
- return (fwrite(buffer, 1, size, emitter->output.file) == size);
-}
-/*
- * Set a string output.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output_string(yaml_emitter_t *emitter,
- unsigned char *output, size_t size, size_t *size_written)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
- assert(!emitter->write_handler); /* You can set the output only once. */
- assert(output); /* Non-NULL output string expected. */
-
- emitter->write_handler = yaml_string_write_handler;
- emitter->write_handler_data = emitter;
-
- emitter->output.string.buffer = output;
- emitter->output.string.size = size;
- emitter->output.string.size_written = size_written;
- *size_written = 0;
-}
-
-/*
- * Set a file output.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
- assert(!emitter->write_handler); /* You can set the output only once. */
- assert(file); /* Non-NULL file object expected. */
-
- emitter->write_handler = yaml_file_write_handler;
- emitter->write_handler_data = emitter;
-
- emitter->output.file = file;
-}
-
-/*
- * Set a generic output handler.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output(yaml_emitter_t *emitter,
- yaml_write_handler_t *handler, void *data)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
- assert(!emitter->write_handler); /* You can set the output only once. */
- assert(handler); /* Non-NULL handler object expected. */
-
- emitter->write_handler = handler;
- emitter->write_handler_data = data;
-}
-
-/*
- * Set the output encoding.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_encoding(yaml_emitter_t *emitter, yaml_encoding_t encoding)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
- assert(!emitter->encoding); /* You can set encoding only once. */
-
- emitter->encoding = encoding;
-}
-
-/*
- * Set the canonical output style.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- emitter->canonical = (canonical != 0);
-}
-
-/*
- * Set the indentation increment.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_indent(yaml_emitter_t *emitter, int indent)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- emitter->best_indent = (1 < indent && indent < 10) ? indent : 2;
-}
-
-/*
- * Set the preferred line width.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_width(yaml_emitter_t *emitter, int width)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- emitter->best_width = (width >= 0) ? width : -1;
-}
-
-/*
- * Set if unescaped non-ASCII characters are allowed.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_unicode(yaml_emitter_t *emitter, int unicode)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- emitter->unicode = (unicode != 0);
-}
-
-/*
- * Set the preferred line break character.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_break(yaml_emitter_t *emitter, yaml_break_t line_break)
-{
- assert(emitter); /* Non-NULL emitter object expected. */
-
- emitter->line_break = line_break;
-}
-
-/*
- * Destroy a token object.
- */
-
-YAML_DECLARE(void)
-yaml_token_delete(yaml_token_t *token)
-{
- assert(token); /* Non-NULL token object expected. */
-
- switch (token->type)
- {
- case YAML_TAG_DIRECTIVE_TOKEN:
- yaml_free(token->data.tag_directive.handle);
- yaml_free(token->data.tag_directive.prefix);
- break;
-
- case YAML_ALIAS_TOKEN:
- yaml_free(token->data.alias.value);
- break;
-
- case YAML_ANCHOR_TOKEN:
- yaml_free(token->data.anchor.value);
- break;
-
- case YAML_TAG_TOKEN:
- yaml_free(token->data.tag.handle);
- yaml_free(token->data.tag.suffix);
- break;
-
- case YAML_SCALAR_TOKEN:
- yaml_free(token->data.scalar.value);
- break;
-
- default:
- break;
- }
-
- memset(token, 0, sizeof(yaml_token_t));
-}
-
-/*
- * Check if a string is a valid UTF-8 sequence.
- *
- * Check 'reader.c' for more details on UTF-8 encoding.
- */
-
-static int
-yaml_check_utf8(yaml_char_t *start, size_t length)
-{
- yaml_char_t *end = start+length;
- yaml_char_t *pointer = start;
-
- while (pointer < end) {
- unsigned char octet;
- unsigned int width;
- unsigned int value;
- size_t k;
-
- octet = pointer[0];
- width = (octet & 0x80) == 0x00 ? 1 :
- (octet & 0xE0) == 0xC0 ? 2 :
- (octet & 0xF0) == 0xE0 ? 3 :
- (octet & 0xF8) == 0xF0 ? 4 : 0;
- value = (octet & 0x80) == 0x00 ? octet & 0x7F :
- (octet & 0xE0) == 0xC0 ? octet & 0x1F :
- (octet & 0xF0) == 0xE0 ? octet & 0x0F :
- (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
- if (!width) return 0;
- if (pointer+width > end) return 0;
- for (k = 1; k < width; k ++) {
- octet = pointer[k];
- if ((octet & 0xC0) != 0x80) return 0;
- value = (value << 6) + (octet & 0x3F);
- }
- if (!((width == 1) ||
- (width == 2 && value >= 0x80) ||
- (width == 3 && value >= 0x800) ||
- (width == 4 && value >= 0x10000))) return 0;
-
- pointer += width;
- }
-
- return 1;
-}
-
-/*
- * Create STREAM-START.
- */
-
-YAML_DECLARE(int)
-yaml_stream_start_event_initialize(yaml_event_t *event,
- yaml_encoding_t encoding)
-{
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(event); /* Non-NULL event object is expected. */
-
- STREAM_START_EVENT_INIT(*event, encoding, mark, mark);
-
- return 1;
-}
-
-/*
- * Create STREAM-END.
- */
-
-YAML_DECLARE(int)
-yaml_stream_end_event_initialize(yaml_event_t *event)
-{
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(event); /* Non-NULL event object is expected. */
-
- STREAM_END_EVENT_INIT(*event, mark, mark);
-
- return 1;
-}
-
-/*
- * Create DOCUMENT-START.
- */
-
-YAML_DECLARE(int)
-yaml_document_start_event_initialize(yaml_event_t *event,
- yaml_version_directive_t *version_directive,
- yaml_tag_directive_t *tag_directives_start,
- yaml_tag_directive_t *tag_directives_end,
- int implicit)
-{
- struct {
- yaml_error_type_t error;
- } context;
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_version_directive_t *version_directive_copy = NULL;
- struct {
- yaml_tag_directive_t *start;
- yaml_tag_directive_t *end;
- yaml_tag_directive_t *top;
- } tag_directives_copy = { NULL, NULL, NULL };
- yaml_tag_directive_t value = { NULL, NULL };
-
- assert(event); /* Non-NULL event object is expected. */
- assert((tag_directives_start && tag_directives_end) ||
- (tag_directives_start == tag_directives_end));
- /* Valid tag directives are expected. */
-
- if (version_directive) {
- version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
- if (!version_directive_copy) goto error;
- version_directive_copy->major = version_directive->major;
- version_directive_copy->minor = version_directive->minor;
- }
-
- if (tag_directives_start != tag_directives_end) {
- yaml_tag_directive_t *tag_directive;
- if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
- goto error;
- for (tag_directive = tag_directives_start;
- tag_directive != tag_directives_end; tag_directive ++) {
- assert(tag_directive->handle);
- assert(tag_directive->prefix);
- if (!yaml_check_utf8(tag_directive->handle,
- strlen((char *)tag_directive->handle)))
- goto error;
- if (!yaml_check_utf8(tag_directive->prefix,
- strlen((char *)tag_directive->prefix)))
- goto error;
- value.handle = yaml_strdup(tag_directive->handle);
- value.prefix = yaml_strdup(tag_directive->prefix);
- if (!value.handle || !value.prefix) goto error;
- if (!PUSH(&context, tag_directives_copy, value))
- goto error;
- value.handle = NULL;
- value.prefix = NULL;
- }
- }
-
- DOCUMENT_START_EVENT_INIT(*event, version_directive_copy,
- tag_directives_copy.start, tag_directives_copy.top,
- implicit, mark, mark);
-
- return 1;
-
-error:
- yaml_free(version_directive_copy);
- while (!STACK_EMPTY(context, tag_directives_copy)) {
- yaml_tag_directive_t value = POP(context, tag_directives_copy);
- yaml_free(value.handle);
- yaml_free(value.prefix);
- }
- STACK_DEL(context, tag_directives_copy);
- yaml_free(value.handle);
- yaml_free(value.prefix);
-
- return 0;
-}
-
-/*
- * Create DOCUMENT-END.
- */
-
-YAML_DECLARE(int)
-yaml_document_end_event_initialize(yaml_event_t *event, int implicit)
-{
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(event); /* Non-NULL emitter object is expected. */
-
- DOCUMENT_END_EVENT_INIT(*event, implicit, mark, mark);
-
- return 1;
-}
-
-/*
- * Create ALIAS.
- */
-
-YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor)
-{
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *anchor_copy = NULL;
-
- assert(event); /* Non-NULL event object is expected. */
- assert(anchor); /* Non-NULL anchor is expected. */
-
- if (!yaml_check_utf8(anchor, strlen((char *)anchor))) return 0;
-
- anchor_copy = yaml_strdup(anchor);
- if (!anchor_copy)
- return 0;
-
- ALIAS_EVENT_INIT(*event, anchor_copy, mark, mark);
-
- return 1;
-}
-
-/*
- * Create SCALAR.
- */
-
-YAML_DECLARE(int)
-yaml_scalar_event_initialize(yaml_event_t *event,
- yaml_char_t *anchor, yaml_char_t *tag,
- yaml_char_t *value, int length,
- int plain_implicit, int quoted_implicit,
- yaml_scalar_style_t style)
-{
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *anchor_copy = NULL;
- yaml_char_t *tag_copy = NULL;
- yaml_char_t *value_copy = NULL;
- size_t value_length;
-
- assert(event); /* Non-NULL event object is expected. */
- assert(value); /* Non-NULL anchor is expected. */
-
- if (anchor) {
- if (!yaml_check_utf8(anchor, strlen((char *)anchor))) goto error;
- anchor_copy = yaml_strdup(anchor);
- if (!anchor_copy) goto error;
- }
-
- if (tag) {
- if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
- tag_copy = yaml_strdup(tag);
- if (!tag_copy) goto error;
- }
-
- if (length < 0) {
- value_length = strlen((char *)value);
- }
- else {
- value_length = (size_t)length;
- }
-
- if (!yaml_check_utf8(value, value_length)) goto error;
- value_copy = yaml_malloc(value_length+1);
- if (!value_copy) goto error;
- memcpy(value_copy, value, value_length);
- value_copy[value_length] = '\0';
-
- SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, value_length,
- plain_implicit, quoted_implicit, style, mark, mark);
-
- return 1;
-
-error:
- yaml_free(anchor_copy);
- yaml_free(tag_copy);
- yaml_free(value_copy);
-
- return 0;
-}
-
-/*
- * Create SEQUENCE-START.
- */
-
-YAML_DECLARE(int)
-yaml_sequence_start_event_initialize(yaml_event_t *event,
- yaml_char_t *anchor, yaml_char_t *tag, int implicit,
- yaml_sequence_style_t style)
-{
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *anchor_copy = NULL;
- yaml_char_t *tag_copy = NULL;
-
- assert(event); /* Non-NULL event object is expected. */
-
- if (anchor) {
- if (!yaml_check_utf8(anchor, strlen((char *)anchor))) goto error;
- anchor_copy = yaml_strdup(anchor);
- if (!anchor_copy) goto error;
- }
-
- if (tag) {
- if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
- tag_copy = yaml_strdup(tag);
- if (!tag_copy) goto error;
- }
-
- SEQUENCE_START_EVENT_INIT(*event, anchor_copy, tag_copy,
- implicit, style, mark, mark);
-
- return 1;
-
-error:
- yaml_free(anchor_copy);
- yaml_free(tag_copy);
-
- return 0;
-}
-
-/*
- * Create SEQUENCE-END.
- */
-
-YAML_DECLARE(int)
-yaml_sequence_end_event_initialize(yaml_event_t *event)
-{
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(event); /* Non-NULL event object is expected. */
-
- SEQUENCE_END_EVENT_INIT(*event, mark, mark);
-
- return 1;
-}
-
-/*
- * Create MAPPING-START.
- */
-
-YAML_DECLARE(int)
-yaml_mapping_start_event_initialize(yaml_event_t *event,
- yaml_char_t *anchor, yaml_char_t *tag, int implicit,
- yaml_mapping_style_t style)
-{
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *anchor_copy = NULL;
- yaml_char_t *tag_copy = NULL;
-
- assert(event); /* Non-NULL event object is expected. */
-
- if (anchor) {
- if (!yaml_check_utf8(anchor, strlen((char *)anchor))) goto error;
- anchor_copy = yaml_strdup(anchor);
- if (!anchor_copy) goto error;
- }
-
- if (tag) {
- if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
- tag_copy = yaml_strdup(tag);
- if (!tag_copy) goto error;
- }
-
- MAPPING_START_EVENT_INIT(*event, anchor_copy, tag_copy,
- implicit, style, mark, mark);
-
- return 1;
-
-error:
- yaml_free(anchor_copy);
- yaml_free(tag_copy);
-
- return 0;
-}
-
-/*
- * Create MAPPING-END.
- */
-
-YAML_DECLARE(int)
-yaml_mapping_end_event_initialize(yaml_event_t *event)
-{
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(event); /* Non-NULL event object is expected. */
-
- MAPPING_END_EVENT_INIT(*event, mark, mark);
-
- return 1;
-}
-
-/*
- * Destroy an event object.
- */
-
-YAML_DECLARE(void)
-yaml_event_delete(yaml_event_t *event)
-{
- yaml_tag_directive_t *tag_directive;
-
- assert(event); /* Non-NULL event object expected. */
-
- switch (event->type)
- {
- case YAML_DOCUMENT_START_EVENT:
- yaml_free(event->data.document_start.version_directive);
- for (tag_directive = event->data.document_start.tag_directives.start;
- tag_directive != event->data.document_start.tag_directives.end;
- tag_directive++) {
- yaml_free(tag_directive->handle);
- yaml_free(tag_directive->prefix);
- }
- yaml_free(event->data.document_start.tag_directives.start);
- break;
-
- case YAML_ALIAS_EVENT:
- yaml_free(event->data.alias.anchor);
- break;
-
- case YAML_SCALAR_EVENT:
- yaml_free(event->data.scalar.anchor);
- yaml_free(event->data.scalar.tag);
- yaml_free(event->data.scalar.value);
- break;
-
- case YAML_SEQUENCE_START_EVENT:
- yaml_free(event->data.sequence_start.anchor);
- yaml_free(event->data.sequence_start.tag);
- break;
-
- case YAML_MAPPING_START_EVENT:
- yaml_free(event->data.mapping_start.anchor);
- yaml_free(event->data.mapping_start.tag);
- break;
-
- default:
- break;
- }
-
- memset(event, 0, sizeof(yaml_event_t));
-}
-
-/*
- * Create a document object.
- */
-
-YAML_DECLARE(int)
-yaml_document_initialize(yaml_document_t *document,
- yaml_version_directive_t *version_directive,
- yaml_tag_directive_t *tag_directives_start,
- yaml_tag_directive_t *tag_directives_end,
- int start_implicit, int end_implicit)
-{
- struct {
- yaml_error_type_t error;
- } context;
- struct {
- yaml_node_t *start;
- yaml_node_t *end;
- yaml_node_t *top;
- } nodes = { NULL, NULL, NULL };
- yaml_version_directive_t *version_directive_copy = NULL;
- struct {
- yaml_tag_directive_t *start;
- yaml_tag_directive_t *end;
- yaml_tag_directive_t *top;
- } tag_directives_copy = { NULL, NULL, NULL };
- yaml_tag_directive_t value = { NULL, NULL };
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(document); /* Non-NULL document object is expected. */
- assert((tag_directives_start && tag_directives_end) ||
- (tag_directives_start == tag_directives_end));
- /* Valid tag directives are expected. */
-
- if (!STACK_INIT(&context, nodes, INITIAL_STACK_SIZE)) goto error;
-
- if (version_directive) {
- version_directive_copy = yaml_malloc(sizeof(yaml_version_directive_t));
- if (!version_directive_copy) goto error;
- version_directive_copy->major = version_directive->major;
- version_directive_copy->minor = version_directive->minor;
- }
-
- if (tag_directives_start != tag_directives_end) {
- yaml_tag_directive_t *tag_directive;
- if (!STACK_INIT(&context, tag_directives_copy, INITIAL_STACK_SIZE))
- goto error;
- for (tag_directive = tag_directives_start;
- tag_directive != tag_directives_end; tag_directive ++) {
- assert(tag_directive->handle);
- assert(tag_directive->prefix);
- if (!yaml_check_utf8(tag_directive->handle,
- strlen((char *)tag_directive->handle)))
- goto error;
- if (!yaml_check_utf8(tag_directive->prefix,
- strlen((char *)tag_directive->prefix)))
- goto error;
- value.handle = yaml_strdup(tag_directive->handle);
- value.prefix = yaml_strdup(tag_directive->prefix);
- if (!value.handle || !value.prefix) goto error;
- if (!PUSH(&context, tag_directives_copy, value))
- goto error;
- value.handle = NULL;
- value.prefix = NULL;
- }
- }
-
- DOCUMENT_INIT(*document, nodes.start, nodes.end, version_directive_copy,
- tag_directives_copy.start, tag_directives_copy.top,
- start_implicit, end_implicit, mark, mark);
-
- return 1;
-
-error:
- STACK_DEL(&context, nodes);
- yaml_free(version_directive_copy);
- while (!STACK_EMPTY(&context, tag_directives_copy)) {
- yaml_tag_directive_t value = POP(&context, tag_directives_copy);
- yaml_free(value.handle);
- yaml_free(value.prefix);
- }
- STACK_DEL(&context, tag_directives_copy);
- yaml_free(value.handle);
- yaml_free(value.prefix);
-
- return 0;
-}
-
-/*
- * Destroy a document object.
- */
-
-YAML_DECLARE(void)
-yaml_document_delete(yaml_document_t *document)
-{
- struct {
- yaml_error_type_t error;
- } context;
- yaml_tag_directive_t *tag_directive;
-
- context.error = YAML_NO_ERROR; /* Eliminate a compliler warning. */
-
- assert(document); /* Non-NULL document object is expected. */
-
- while (!STACK_EMPTY(&context, document->nodes)) {
- yaml_node_t node = POP(&context, document->nodes);
- yaml_free(node.tag);
- switch (node.type) {
- case YAML_SCALAR_NODE:
- yaml_free(node.data.scalar.value);
- break;
- case YAML_SEQUENCE_NODE:
- STACK_DEL(&context, node.data.sequence.items);
- break;
- case YAML_MAPPING_NODE:
- STACK_DEL(&context, node.data.mapping.pairs);
- break;
- default:
- assert(0); /* Should not happen. */
- }
- }
- STACK_DEL(&context, document->nodes);
-
- yaml_free(document->version_directive);
- for (tag_directive = document->tag_directives.start;
- tag_directive != document->tag_directives.end;
- tag_directive++) {
- yaml_free(tag_directive->handle);
- yaml_free(tag_directive->prefix);
- }
- yaml_free(document->tag_directives.start);
-
- memset(document, 0, sizeof(yaml_document_t));
-}
-
-/**
- * Get a document node.
- */
-
-YAML_DECLARE(yaml_node_t *)
-yaml_document_get_node(yaml_document_t *document, int index)
-{
- assert(document); /* Non-NULL document object is expected. */
-
- if (index > 0 && document->nodes.start + index <= document->nodes.top) {
- return document->nodes.start + index - 1;
- }
- return NULL;
-}
-
-/**
- * Get the root object.
- */
-
-YAML_DECLARE(yaml_node_t *)
-yaml_document_get_root_node(yaml_document_t *document)
-{
- assert(document); /* Non-NULL document object is expected. */
-
- if (document->nodes.top != document->nodes.start) {
- return document->nodes.start;
- }
- return NULL;
-}
-
-/*
- * Add a scalar node to a document.
- */
-
-YAML_DECLARE(int)
-yaml_document_add_scalar(yaml_document_t *document,
- yaml_char_t *tag, yaml_char_t *value, int length,
- yaml_scalar_style_t style)
-{
- struct {
- yaml_error_type_t error;
- } context;
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *tag_copy = NULL;
- yaml_char_t *value_copy = NULL;
- yaml_node_t node;
- size_t value_length;
- ptrdiff_t ret;
-
- assert(document); /* Non-NULL document object is expected. */
- assert(value); /* Non-NULL value is expected. */
-
- if (!tag) {
- tag = (yaml_char_t *)YAML_DEFAULT_SCALAR_TAG;
- }
-
- if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
- tag_copy = yaml_strdup(tag);
- if (!tag_copy) goto error;
-
- if (length < 0) {
- value_length = strlen((char *)value);
- }
- else {
- value_length = (size_t)length;
- }
-
- if (!yaml_check_utf8(value, value_length)) goto error;
- value_copy = yaml_malloc(value_length+1);
- if (!value_copy) goto error;
- memcpy(value_copy, value, value_length);
- value_copy[value_length] = '\0';
-
- SCALAR_NODE_INIT(node, tag_copy, value_copy, value_length, style, mark, mark);
- if (!PUSH(&context, document->nodes, node)) goto error;
-
- ret = document->nodes.top - document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
- if (ret > INT_MAX) goto error;
-#endif
- return (int)ret;
-
-error:
- yaml_free(tag_copy);
- yaml_free(value_copy);
-
- return 0;
-}
-
-/*
- * Add a sequence node to a document.
- */
-
-YAML_DECLARE(int)
-yaml_document_add_sequence(yaml_document_t *document,
- yaml_char_t *tag, yaml_sequence_style_t style)
-{
- struct {
- yaml_error_type_t error;
- } context;
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *tag_copy = NULL;
- struct {
- yaml_node_item_t *start;
- yaml_node_item_t *end;
- yaml_node_item_t *top;
- } items = { NULL, NULL, NULL };
- yaml_node_t node;
- ptrdiff_t ret;
-
- assert(document); /* Non-NULL document object is expected. */
-
- if (!tag) {
- tag = (yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG;
- }
-
- if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
- tag_copy = yaml_strdup(tag);
- if (!tag_copy) goto error;
-
- if (!STACK_INIT(&context, items, INITIAL_STACK_SIZE)) goto error;
-
- SEQUENCE_NODE_INIT(node, tag_copy, items.start, items.end,
- style, mark, mark);
- if (!PUSH(&context, document->nodes, node)) goto error;
-
- ret = document->nodes.top - document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
- if (ret > INT_MAX) goto error;
-#endif
- return (int)ret;
-
-error:
- STACK_DEL(&context, items);
- yaml_free(tag_copy);
-
- return 0;
-}
-
-/*
- * Add a mapping node to a document.
- */
-
-YAML_DECLARE(int)
-yaml_document_add_mapping(yaml_document_t *document,
- yaml_char_t *tag, yaml_mapping_style_t style)
-{
- struct {
- yaml_error_type_t error;
- } context;
- yaml_mark_t mark = { 0, 0, 0 };
- yaml_char_t *tag_copy = NULL;
- struct {
- yaml_node_pair_t *start;
- yaml_node_pair_t *end;
- yaml_node_pair_t *top;
- } pairs = { NULL, NULL, NULL };
- yaml_node_t node;
- ptrdiff_t ret;
-
- assert(document); /* Non-NULL document object is expected. */
-
- if (!tag) {
- tag = (yaml_char_t *)YAML_DEFAULT_MAPPING_TAG;
- }
-
- if (!yaml_check_utf8(tag, strlen((char *)tag))) goto error;
- tag_copy = yaml_strdup(tag);
- if (!tag_copy) goto error;
-
- if (!STACK_INIT(&context, pairs, INITIAL_STACK_SIZE)) goto error;
-
- MAPPING_NODE_INIT(node, tag_copy, pairs.start, pairs.end,
- style, mark, mark);
- if (!PUSH(&context, document->nodes, node)) goto error;
-
- ret = document->nodes.top - document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
- if (ret > INT_MAX) goto error;
-#endif
- return (int)ret;
-
-error:
- STACK_DEL(&context, pairs);
- yaml_free(tag_copy);
-
- return 0;
-}
-
-/*
- * Append an item to a sequence node.
- */
-
-YAML_DECLARE(int)
-yaml_document_append_sequence_item(yaml_document_t *document,
- int sequence, int item)
-{
- struct {
- yaml_error_type_t error;
- } context;
-
- assert(document); /* Non-NULL document is required. */
- assert(sequence > 0
- && document->nodes.start + sequence <= document->nodes.top);
- /* Valid sequence id is required. */
- assert(document->nodes.start[sequence-1].type == YAML_SEQUENCE_NODE);
- /* A sequence node is required. */
- assert(item > 0 && document->nodes.start + item <= document->nodes.top);
- /* Valid item id is required. */
-
- if (!PUSH(&context,
- document->nodes.start[sequence-1].data.sequence.items, item))
- return 0;
-
- return 1;
-}
-
-/*
- * Append a pair of a key and a value to a mapping node.
- */
-
-YAML_DECLARE(int)
-yaml_document_append_mapping_pair(yaml_document_t *document,
- int mapping, int key, int value)
-{
- struct {
- yaml_error_type_t error;
- } context;
-
- yaml_node_pair_t pair;
-
- assert(document); /* Non-NULL document is required. */
- assert(mapping > 0
- && document->nodes.start + mapping <= document->nodes.top);
- /* Valid mapping id is required. */
- assert(document->nodes.start[mapping-1].type == YAML_MAPPING_NODE);
- /* A mapping node is required. */
- assert(key > 0 && document->nodes.start + key <= document->nodes.top);
- /* Valid key id is required. */
- assert(value > 0 && document->nodes.start + value <= document->nodes.top);
- /* Valid value id is required. */
-
- pair.key = key;
- pair.value = value;
-
- if (!PUSH(&context,
- document->nodes.start[mapping-1].data.mapping.pairs, pair))
- return 0;
-
- return 1;
-}
-
-
diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h
deleted file mode 100644
index f54c27d339..0000000000
--- a/ext/psych/yaml/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define PACKAGE_NAME "yaml"
-#define PACKAGE_TARNAME "yaml"
-#define PACKAGE_VERSION "0.1.6"
-#define PACKAGE_STRING "yaml 0.1.6"
-#define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component libyaml"
-#define PACKAGE_URL ""
-#define YAML_VERSION_MAJOR 0
-#define YAML_VERSION_MINOR 1
-#define YAML_VERSION_PATCH 6
-#define YAML_VERSION_STRING "0.1.6"
diff --git a/ext/psych/yaml/dumper.c b/ext/psych/yaml/dumper.c
deleted file mode 100644
index 203c6a709c..0000000000
--- a/ext/psych/yaml/dumper.c
+++ /dev/null
@@ -1,394 +0,0 @@
-
-#include "yaml_private.h"
-
-/*
- * API functions.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_open(yaml_emitter_t *emitter);
-
-YAML_DECLARE(int)
-yaml_emitter_close(yaml_emitter_t *emitter);
-
-YAML_DECLARE(int)
-yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document);
-
-/*
- * Clean up functions.
- */
-
-static void
-yaml_emitter_delete_document_and_anchors(yaml_emitter_t *emitter);
-
-/*
- * Anchor functions.
- */
-
-static void
-yaml_emitter_anchor_node(yaml_emitter_t *emitter, int index);
-
-static yaml_char_t *
-yaml_emitter_generate_anchor(yaml_emitter_t *emitter, int anchor_id);
-
-
-/*
- * Serialize functions.
- */
-
-static int
-yaml_emitter_dump_node(yaml_emitter_t *emitter, int index);
-
-static int
-yaml_emitter_dump_alias(yaml_emitter_t *emitter, yaml_char_t *anchor);
-
-static int
-yaml_emitter_dump_scalar(yaml_emitter_t *emitter, yaml_node_t *node,
- yaml_char_t *anchor);
-
-static int
-yaml_emitter_dump_sequence(yaml_emitter_t *emitter, yaml_node_t *node,
- yaml_char_t *anchor);
-
-static int
-yaml_emitter_dump_mapping(yaml_emitter_t *emitter, yaml_node_t *node,
- yaml_char_t *anchor);
-
-/*
- * Issue a STREAM-START event.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_open(yaml_emitter_t *emitter)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(emitter); /* Non-NULL emitter object is required. */
- assert(!emitter->opened); /* Emitter should not be opened yet. */
-
- STREAM_START_EVENT_INIT(event, YAML_ANY_ENCODING, mark, mark);
-
- if (!yaml_emitter_emit(emitter, &event)) {
- return 0;
- }
-
- emitter->opened = 1;
-
- return 1;
-}
-
-/*
- * Issue a STREAM-END event.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_close(yaml_emitter_t *emitter)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(emitter); /* Non-NULL emitter object is required. */
- assert(emitter->opened); /* Emitter should be opened. */
-
- if (emitter->closed) return 1;
-
- STREAM_END_EVENT_INIT(event, mark, mark);
-
- if (!yaml_emitter_emit(emitter, &event)) {
- return 0;
- }
-
- emitter->closed = 1;
-
- return 1;
-}
-
-/*
- * Dump a YAML document.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- assert(emitter); /* Non-NULL emitter object is required. */
- assert(document); /* Non-NULL emitter object is expected. */
-
- emitter->document = document;
-
- if (!emitter->opened) {
- if (!yaml_emitter_open(emitter)) goto error;
- }
-
- if (STACK_EMPTY(emitter, document->nodes)) {
- if (!yaml_emitter_close(emitter)) goto error;
- yaml_emitter_delete_document_and_anchors(emitter);
- return 1;
- }
-
- assert(emitter->opened); /* Emitter should be opened. */
-
- emitter->anchors = yaml_malloc(sizeof(*(emitter->anchors))
- * (document->nodes.top - document->nodes.start));
- if (!emitter->anchors) goto error;
- memset(emitter->anchors, 0, sizeof(*(emitter->anchors))
- * (document->nodes.top - document->nodes.start));
-
- DOCUMENT_START_EVENT_INIT(event, document->version_directive,
- document->tag_directives.start, document->tag_directives.end,
- document->start_implicit, mark, mark);
- if (!yaml_emitter_emit(emitter, &event)) goto error;
-
- yaml_emitter_anchor_node(emitter, 1);
- if (!yaml_emitter_dump_node(emitter, 1)) goto error;
-
- DOCUMENT_END_EVENT_INIT(event, document->end_implicit, mark, mark);
- if (!yaml_emitter_emit(emitter, &event)) goto error;
-
- yaml_emitter_delete_document_and_anchors(emitter);
-
- return 1;
-
-error:
-
- yaml_emitter_delete_document_and_anchors(emitter);
-
- return 0;
-}
-
-/*
- * Clean up the emitter object after a document is dumped.
- */
-
-static void
-yaml_emitter_delete_document_and_anchors(yaml_emitter_t *emitter)
-{
- int index;
-
- if (!emitter->anchors) {
- yaml_document_delete(emitter->document);
- emitter->document = NULL;
- return;
- }
-
- for (index = 0; emitter->document->nodes.start + index
- < emitter->document->nodes.top; index ++) {
- yaml_node_t node = emitter->document->nodes.start[index];
- if (!emitter->anchors[index].serialized) {
- yaml_free(node.tag);
- if (node.type == YAML_SCALAR_NODE) {
- yaml_free(node.data.scalar.value);
- }
- }
- if (node.type == YAML_SEQUENCE_NODE) {
- STACK_DEL(emitter, node.data.sequence.items);
- }
- if (node.type == YAML_MAPPING_NODE) {
- STACK_DEL(emitter, node.data.mapping.pairs);
- }
- }
-
- STACK_DEL(emitter, emitter->document->nodes);
- yaml_free(emitter->anchors);
-
- emitter->anchors = NULL;
- emitter->last_anchor_id = 0;
- emitter->document = NULL;
-}
-
-/*
- * Check the references of a node and assign the anchor id if needed.
- */
-
-static void
-yaml_emitter_anchor_node(yaml_emitter_t *emitter, int index)
-{
- yaml_node_t *node = emitter->document->nodes.start + index - 1;
- yaml_node_item_t *item;
- yaml_node_pair_t *pair;
-
- emitter->anchors[index-1].references ++;
-
- if (emitter->anchors[index-1].references == 1) {
- switch (node->type) {
- case YAML_SEQUENCE_NODE:
- for (item = node->data.sequence.items.start;
- item < node->data.sequence.items.top; item ++) {
- yaml_emitter_anchor_node(emitter, *item);
- }
- break;
- case YAML_MAPPING_NODE:
- for (pair = node->data.mapping.pairs.start;
- pair < node->data.mapping.pairs.top; pair ++) {
- yaml_emitter_anchor_node(emitter, pair->key);
- yaml_emitter_anchor_node(emitter, pair->value);
- }
- break;
- default:
- break;
- }
- }
-
- else if (emitter->anchors[index-1].references == 2) {
- emitter->anchors[index-1].anchor = (++ emitter->last_anchor_id);
- }
-}
-
-/*
- * Generate a textual representation for an anchor.
- */
-
-#define ANCHOR_TEMPLATE "id%03d"
-#define ANCHOR_TEMPLATE_LENGTH 16
-
-static yaml_char_t *
-yaml_emitter_generate_anchor(yaml_emitter_t *emitter, int anchor_id)
-{
- yaml_char_t *anchor = yaml_malloc(ANCHOR_TEMPLATE_LENGTH);
-
- if (!anchor) return NULL;
-
- sprintf((char *)anchor, ANCHOR_TEMPLATE, anchor_id);
-
- return anchor;
-}
-
-/*
- * Serialize a node.
- */
-
-static int
-yaml_emitter_dump_node(yaml_emitter_t *emitter, int index)
-{
- yaml_node_t *node = emitter->document->nodes.start + index - 1;
- int anchor_id = emitter->anchors[index-1].anchor;
- yaml_char_t *anchor = NULL;
-
- if (anchor_id) {
- anchor = yaml_emitter_generate_anchor(emitter, anchor_id);
- if (!anchor) return 0;
- }
-
- if (emitter->anchors[index-1].serialized) {
- return yaml_emitter_dump_alias(emitter, anchor);
- }
-
- emitter->anchors[index-1].serialized = 1;
-
- switch (node->type) {
- case YAML_SCALAR_NODE:
- return yaml_emitter_dump_scalar(emitter, node, anchor);
- case YAML_SEQUENCE_NODE:
- return yaml_emitter_dump_sequence(emitter, node, anchor);
- case YAML_MAPPING_NODE:
- return yaml_emitter_dump_mapping(emitter, node, anchor);
- default:
- assert(0); /* Could not happen. */
- break;
- }
-
- return 0; /* Could not happen. */
-}
-
-/*
- * Serialize an alias.
- */
-
-static int
-yaml_emitter_dump_alias(yaml_emitter_t *emitter, yaml_char_t *anchor)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- ALIAS_EVENT_INIT(event, anchor, mark, mark);
-
- return yaml_emitter_emit(emitter, &event);
-}
-
-/*
- * Serialize a scalar.
- */
-
-static int
-yaml_emitter_dump_scalar(yaml_emitter_t *emitter, yaml_node_t *node,
- yaml_char_t *anchor)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- int plain_implicit = (strcmp((char *)node->tag,
- YAML_DEFAULT_SCALAR_TAG) == 0);
- int quoted_implicit = (strcmp((char *)node->tag,
- YAML_DEFAULT_SCALAR_TAG) == 0);
-
- SCALAR_EVENT_INIT(event, anchor, node->tag, node->data.scalar.value,
- node->data.scalar.length, plain_implicit, quoted_implicit,
- node->data.scalar.style, mark, mark);
-
- return yaml_emitter_emit(emitter, &event);
-}
-
-/*
- * Serialize a sequence.
- */
-
-static int
-yaml_emitter_dump_sequence(yaml_emitter_t *emitter, yaml_node_t *node,
- yaml_char_t *anchor)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- int implicit = (strcmp((char *)node->tag, YAML_DEFAULT_SEQUENCE_TAG) == 0);
-
- yaml_node_item_t *item;
-
- SEQUENCE_START_EVENT_INIT(event, anchor, node->tag, implicit,
- node->data.sequence.style, mark, mark);
- if (!yaml_emitter_emit(emitter, &event)) return 0;
-
- for (item = node->data.sequence.items.start;
- item < node->data.sequence.items.top; item ++) {
- if (!yaml_emitter_dump_node(emitter, *item)) return 0;
- }
-
- SEQUENCE_END_EVENT_INIT(event, mark, mark);
- if (!yaml_emitter_emit(emitter, &event)) return 0;
-
- return 1;
-}
-
-/*
- * Serialize a mapping.
- */
-
-static int
-yaml_emitter_dump_mapping(yaml_emitter_t *emitter, yaml_node_t *node,
- yaml_char_t *anchor)
-{
- yaml_event_t event;
- yaml_mark_t mark = { 0, 0, 0 };
-
- int implicit = (strcmp((char *)node->tag, YAML_DEFAULT_MAPPING_TAG) == 0);
-
- yaml_node_pair_t *pair;
-
- MAPPING_START_EVENT_INIT(event, anchor, node->tag, implicit,
- node->data.mapping.style, mark, mark);
- if (!yaml_emitter_emit(emitter, &event)) return 0;
-
- for (pair = node->data.mapping.pairs.start;
- pair < node->data.mapping.pairs.top; pair ++) {
- if (!yaml_emitter_dump_node(emitter, pair->key)) return 0;
- if (!yaml_emitter_dump_node(emitter, pair->value)) return 0;
- }
-
- MAPPING_END_EVENT_INIT(event, mark, mark);
- if (!yaml_emitter_emit(emitter, &event)) return 0;
-
- return 1;
-}
-
diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c
deleted file mode 100644
index bf84fafc51..0000000000
--- a/ext/psych/yaml/emitter.c
+++ /dev/null
@@ -1,2329 +0,0 @@
-
-#include "yaml_private.h"
-
-/*
- * Flush the buffer if needed.
- */
-
-#define FLUSH(emitter) \
- ((emitter->buffer.pointer+5 < emitter->buffer.end) \
- || yaml_emitter_flush(emitter))
-
-/*
- * Put a character to the output buffer.
- */
-
-#define PUT(emitter,value) \
- (FLUSH(emitter) \
- && (*(emitter->buffer.pointer++) = (yaml_char_t)(value), \
- emitter->column ++, \
- 1))
-
-/*
- * Put a line break to the output buffer.
- */
-
-#define PUT_BREAK(emitter) \
- (FLUSH(emitter) \
- && ((emitter->line_break == YAML_CR_BREAK ? \
- (*(emitter->buffer.pointer++) = (yaml_char_t) '\r') : \
- emitter->line_break == YAML_LN_BREAK ? \
- (*(emitter->buffer.pointer++) = (yaml_char_t) '\n') : \
- emitter->line_break == YAML_CRLN_BREAK ? \
- (*(emitter->buffer.pointer++) = (yaml_char_t) '\r', \
- *(emitter->buffer.pointer++) = (yaml_char_t) '\n') : 0), \
- emitter->column = 0, \
- emitter->line ++, \
- 1))
-
-/*
- * Copy a character from a string into buffer.
- */
-
-#define WRITE(emitter,string) \
- (FLUSH(emitter) \
- && (COPY(emitter->buffer,string), \
- emitter->column ++, \
- 1))
-
-/*
- * Copy a line break character from a string into buffer.
- */
-
-#define WRITE_BREAK(emitter,string) \
- (FLUSH(emitter) \
- && (CHECK(string,'\n') ? \
- ((void)PUT_BREAK(emitter), \
- string.pointer ++, \
- 1) : \
- (COPY(emitter->buffer,string), \
- emitter->column = 0, \
- emitter->line ++, \
- 1)))
-
-/*
- * API functions.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event);
-
-/*
- * Utility functions.
- */
-
-static int
-yaml_emitter_set_emitter_error(yaml_emitter_t *emitter, const char *problem);
-
-static int
-yaml_emitter_need_more_events(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_append_tag_directive(yaml_emitter_t *emitter,
- yaml_tag_directive_t value, int allow_duplicates);
-
-static int
-yaml_emitter_increase_indent(yaml_emitter_t *emitter,
- int flow, int indentless);
-
-/*
- * State functions.
- */
-
-static int
-yaml_emitter_state_machine(yaml_emitter_t *emitter, yaml_event_t *event);
-
-static int
-yaml_emitter_emit_stream_start(yaml_emitter_t *emitter,
- yaml_event_t *event);
-
-static int
-yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
- yaml_event_t *event, int first);
-
-static int
-yaml_emitter_emit_document_content(yaml_emitter_t *emitter,
- yaml_event_t *event);
-
-static int
-yaml_emitter_emit_document_end(yaml_emitter_t *emitter,
- yaml_event_t *event);
-
-static int
-yaml_emitter_emit_flow_sequence_item(yaml_emitter_t *emitter,
- yaml_event_t *event, int first);
-
-static int
-yaml_emitter_emit_flow_mapping_key(yaml_emitter_t *emitter,
- yaml_event_t *event, int first);
-
-static int
-yaml_emitter_emit_flow_mapping_value(yaml_emitter_t *emitter,
- yaml_event_t *event, int simple);
-
-static int
-yaml_emitter_emit_block_sequence_item(yaml_emitter_t *emitter,
- yaml_event_t *event, int first);
-
-static int
-yaml_emitter_emit_block_mapping_key(yaml_emitter_t *emitter,
- yaml_event_t *event, int first);
-
-static int
-yaml_emitter_emit_block_mapping_value(yaml_emitter_t *emitter,
- yaml_event_t *event, int simple);
-
-static int
-yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
- int root, int sequence, int mapping, int simple_key);
-
-static int
-yaml_emitter_emit_alias(yaml_emitter_t *emitter, yaml_event_t *event);
-
-static int
-yaml_emitter_emit_scalar(yaml_emitter_t *emitter, yaml_event_t *event);
-
-static int
-yaml_emitter_emit_sequence_start(yaml_emitter_t *emitter, yaml_event_t *event);
-
-static int
-yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event);
-
-/*
- * Checkers.
- */
-
-static int
-yaml_emitter_check_empty_document(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_check_empty_sequence(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_check_empty_mapping(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_check_simple_key(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event);
-
-/*
- * Processors.
- */
-
-static int
-yaml_emitter_process_anchor(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_process_tag(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_process_scalar(yaml_emitter_t *emitter);
-
-/*
- * Analyzers.
- */
-
-static int
-yaml_emitter_analyze_version_directive(yaml_emitter_t *emitter,
- yaml_version_directive_t version_directive);
-
-static int
-yaml_emitter_analyze_tag_directive(yaml_emitter_t *emitter,
- yaml_tag_directive_t tag_directive);
-
-static int
-yaml_emitter_analyze_anchor(yaml_emitter_t *emitter,
- yaml_char_t *anchor, int alias);
-
-static int
-yaml_emitter_analyze_tag(yaml_emitter_t *emitter,
- yaml_char_t *tag);
-
-static int
-yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length);
-
-static int
-yaml_emitter_analyze_event(yaml_emitter_t *emitter,
- yaml_event_t *event);
-
-/*
- * Writers.
- */
-
-static int
-yaml_emitter_write_bom(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_write_indent(yaml_emitter_t *emitter);
-
-static int
-yaml_emitter_write_indicator(yaml_emitter_t *emitter,
- const char *indicator, int need_whitespace,
- int is_whitespace, int is_indention);
-
-static int
-yaml_emitter_write_anchor(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length);
-
-static int
-yaml_emitter_write_tag_handle(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length);
-
-static int
-yaml_emitter_write_tag_content(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int need_whitespace);
-
-static int
-yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks);
-
-static int
-yaml_emitter_write_single_quoted_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks);
-
-static int
-yaml_emitter_write_double_quoted_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks);
-
-static int
-yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
- yaml_string_t string);
-
-static int
-yaml_emitter_write_literal_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length);
-
-static int
-yaml_emitter_write_folded_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length);
-
-/*
- * Set an emitter error and return 0.
- */
-
-static int
-yaml_emitter_set_emitter_error(yaml_emitter_t *emitter, const char *problem)
-{
- emitter->error = YAML_EMITTER_ERROR;
- emitter->problem = problem;
-
- return 0;
-}
-
-/*
- * Emit an event.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- if (!ENQUEUE(emitter, emitter->events, *event)) {
- yaml_event_delete(event);
- return 0;
- }
-
- while (!yaml_emitter_need_more_events(emitter)) {
- if (!yaml_emitter_analyze_event(emitter, emitter->events.head))
- return 0;
- if (!yaml_emitter_state_machine(emitter, emitter->events.head))
- return 0;
- yaml_event_delete(&DEQUEUE(emitter, emitter->events));
- }
-
- return 1;
-}
-
-/*
- * Check if we need to accumulate more events before emitting.
- *
- * We accumulate extra
- * - 1 event for DOCUMENT-START
- * - 2 events for SEQUENCE-START
- * - 3 events for MAPPING-START
- */
-
-static int
-yaml_emitter_need_more_events(yaml_emitter_t *emitter)
-{
- int level = 0;
- int accumulate = 0;
- yaml_event_t *event;
-
- if (QUEUE_EMPTY(emitter, emitter->events))
- return 1;
-
- switch (emitter->events.head->type) {
- case YAML_DOCUMENT_START_EVENT:
- accumulate = 1;
- break;
- case YAML_SEQUENCE_START_EVENT:
- accumulate = 2;
- break;
- case YAML_MAPPING_START_EVENT:
- accumulate = 3;
- break;
- default:
- return 0;
- }
-
- if (emitter->events.tail - emitter->events.head > accumulate)
- return 0;
-
- for (event = emitter->events.head; event != emitter->events.tail; event ++) {
- switch (event->type) {
- case YAML_STREAM_START_EVENT:
- case YAML_DOCUMENT_START_EVENT:
- case YAML_SEQUENCE_START_EVENT:
- case YAML_MAPPING_START_EVENT:
- level += 1;
- break;
- case YAML_STREAM_END_EVENT:
- case YAML_DOCUMENT_END_EVENT:
- case YAML_SEQUENCE_END_EVENT:
- case YAML_MAPPING_END_EVENT:
- level -= 1;
- break;
- default:
- break;
- }
- if (!level)
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Append a directive to the directives stack.
- */
-
-static int
-yaml_emitter_append_tag_directive(yaml_emitter_t *emitter,
- yaml_tag_directive_t value, int allow_duplicates)
-{
- yaml_tag_directive_t *tag_directive;
- yaml_tag_directive_t copy = { NULL, NULL };
-
- for (tag_directive = emitter->tag_directives.start;
- tag_directive != emitter->tag_directives.top; tag_directive ++) {
- if (strcmp((char *)value.handle, (char *)tag_directive->handle) == 0) {
- if (allow_duplicates)
- return 1;
- return yaml_emitter_set_emitter_error(emitter,
- "duplicate %TAG directive");
- }
- }
-
- copy.handle = yaml_strdup(value.handle);
- copy.prefix = yaml_strdup(value.prefix);
- if (!copy.handle || !copy.prefix) {
- emitter->error = YAML_MEMORY_ERROR;
- goto error;
- }
-
- if (!PUSH(emitter, emitter->tag_directives, copy))
- goto error;
-
- return 1;
-
-error:
- yaml_free(copy.handle);
- yaml_free(copy.prefix);
- return 0;
-}
-
-/*
- * Increase the indentation level.
- */
-
-static int
-yaml_emitter_increase_indent(yaml_emitter_t *emitter,
- int flow, int indentless)
-{
- if (!PUSH(emitter, emitter->indents, emitter->indent))
- return 0;
-
- if (emitter->indent < 0) {
- emitter->indent = flow ? emitter->best_indent : 0;
- }
- else if (!indentless) {
- emitter->indent += emitter->best_indent;
- }
-
- return 1;
-}
-
-/*
- * State dispatcher.
- */
-
-static int
-yaml_emitter_state_machine(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- switch (emitter->state)
- {
- case YAML_EMIT_STREAM_START_STATE:
- return yaml_emitter_emit_stream_start(emitter, event);
-
- case YAML_EMIT_FIRST_DOCUMENT_START_STATE:
- return yaml_emitter_emit_document_start(emitter, event, 1);
-
- case YAML_EMIT_DOCUMENT_START_STATE:
- return yaml_emitter_emit_document_start(emitter, event, 0);
-
- case YAML_EMIT_DOCUMENT_CONTENT_STATE:
- return yaml_emitter_emit_document_content(emitter, event);
-
- case YAML_EMIT_DOCUMENT_END_STATE:
- return yaml_emitter_emit_document_end(emitter, event);
-
- case YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE:
- return yaml_emitter_emit_flow_sequence_item(emitter, event, 1);
-
- case YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE:
- return yaml_emitter_emit_flow_sequence_item(emitter, event, 0);
-
- case YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE:
- return yaml_emitter_emit_flow_mapping_key(emitter, event, 1);
-
- case YAML_EMIT_FLOW_MAPPING_KEY_STATE:
- return yaml_emitter_emit_flow_mapping_key(emitter, event, 0);
-
- case YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE:
- return yaml_emitter_emit_flow_mapping_value(emitter, event, 1);
-
- case YAML_EMIT_FLOW_MAPPING_VALUE_STATE:
- return yaml_emitter_emit_flow_mapping_value(emitter, event, 0);
-
- case YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE:
- return yaml_emitter_emit_block_sequence_item(emitter, event, 1);
-
- case YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE:
- return yaml_emitter_emit_block_sequence_item(emitter, event, 0);
-
- case YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE:
- return yaml_emitter_emit_block_mapping_key(emitter, event, 1);
-
- case YAML_EMIT_BLOCK_MAPPING_KEY_STATE:
- return yaml_emitter_emit_block_mapping_key(emitter, event, 0);
-
- case YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE:
- return yaml_emitter_emit_block_mapping_value(emitter, event, 1);
-
- case YAML_EMIT_BLOCK_MAPPING_VALUE_STATE:
- return yaml_emitter_emit_block_mapping_value(emitter, event, 0);
-
- case YAML_EMIT_END_STATE:
- return yaml_emitter_set_emitter_error(emitter,
- "expected nothing after STREAM-END");
-
- default:
- assert(1); /* Invalid state. */
- }
-
- return 0;
-}
-
-/*
- * Expect STREAM-START.
- */
-
-static int
-yaml_emitter_emit_stream_start(yaml_emitter_t *emitter,
- yaml_event_t *event)
-{
- if (event->type == YAML_STREAM_START_EVENT)
- {
- if (!emitter->encoding) {
- emitter->encoding = event->data.stream_start.encoding;
- }
-
- if (!emitter->encoding) {
- emitter->encoding = YAML_UTF8_ENCODING;
- }
-
- if (emitter->best_indent < 2 || emitter->best_indent > 9) {
- emitter->best_indent = 2;
- }
-
- if (emitter->best_width >= 0
- && emitter->best_width <= emitter->best_indent*2) {
- emitter->best_width = 80;
- }
-
- if (emitter->best_width < 0) {
- emitter->best_width = INT_MAX;
- }
-
- if (!emitter->line_break) {
- emitter->line_break = YAML_LN_BREAK;
- }
-
- emitter->indent = -1;
-
- emitter->line = 0;
- emitter->column = 0;
- emitter->whitespace = 1;
- emitter->indention = 1;
-
- if (emitter->encoding != YAML_UTF8_ENCODING) {
- if (!yaml_emitter_write_bom(emitter))
- return 0;
- }
-
- emitter->state = YAML_EMIT_FIRST_DOCUMENT_START_STATE;
-
- return 1;
- }
-
- return yaml_emitter_set_emitter_error(emitter,
- "expected STREAM-START");
-}
-
-/*
- * Expect DOCUMENT-START or STREAM-END.
- */
-
-static int
-yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
- yaml_event_t *event, int first)
-{
- if (event->type == YAML_DOCUMENT_START_EVENT)
- {
- yaml_tag_directive_t default_tag_directives[] = {
- {(yaml_char_t *)"!", (yaml_char_t *)"!"},
- {(yaml_char_t *)"!!", (yaml_char_t *)"tag:yaml.org,2002:"},
- {NULL, NULL}
- };
- yaml_tag_directive_t *tag_directive;
- int implicit;
-
- if (event->data.document_start.version_directive) {
- if (!yaml_emitter_analyze_version_directive(emitter,
- *event->data.document_start.version_directive))
- return 0;
- }
-
- for (tag_directive = event->data.document_start.tag_directives.start;
- tag_directive != event->data.document_start.tag_directives.end;
- tag_directive ++) {
- if (!yaml_emitter_analyze_tag_directive(emitter, *tag_directive))
- return 0;
- if (!yaml_emitter_append_tag_directive(emitter, *tag_directive, 0))
- return 0;
- }
-
- for (tag_directive = default_tag_directives;
- tag_directive->handle; tag_directive ++) {
- if (!yaml_emitter_append_tag_directive(emitter, *tag_directive, 1))
- return 0;
- }
-
- implicit = event->data.document_start.implicit;
- if (!first || emitter->canonical) {
- implicit = 0;
- }
-
- if ((event->data.document_start.version_directive ||
- (event->data.document_start.tag_directives.start
- != event->data.document_start.tag_directives.end)) &&
- emitter->open_ended)
- {
- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
-
- if (event->data.document_start.version_directive) {
- implicit = 0;
- if (!yaml_emitter_write_indicator(emitter, "%YAML", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_indicator(emitter, "1.1", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
-
- if (event->data.document_start.tag_directives.start
- != event->data.document_start.tag_directives.end) {
- implicit = 0;
- for (tag_directive = event->data.document_start.tag_directives.start;
- tag_directive != event->data.document_start.tag_directives.end;
- tag_directive ++) {
- if (!yaml_emitter_write_indicator(emitter, "%TAG", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_tag_handle(emitter, tag_directive->handle,
- strlen((char *)tag_directive->handle)))
- return 0;
- if (!yaml_emitter_write_tag_content(emitter, tag_directive->prefix,
- strlen((char *)tag_directive->prefix), 1))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- }
-
- if (yaml_emitter_check_empty_document(emitter)) {
- implicit = 0;
- }
-
- if (!implicit) {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- if (!yaml_emitter_write_indicator(emitter, "---", 1, 0, 0))
- return 0;
- if (emitter->canonical) {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- }
-
- emitter->state = YAML_EMIT_DOCUMENT_CONTENT_STATE;
-
- return 1;
- }
-
- else if (event->type == YAML_STREAM_END_EVENT)
- {
- if (emitter->open_ended)
- {
- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
-
- if (!yaml_emitter_flush(emitter))
- return 0;
-
- emitter->state = YAML_EMIT_END_STATE;
-
- return 1;
- }
-
- return yaml_emitter_set_emitter_error(emitter,
- "expected DOCUMENT-START or STREAM-END");
-}
-
-/*
- * Expect the root node.
- */
-
-static int
-yaml_emitter_emit_document_content(yaml_emitter_t *emitter,
- yaml_event_t *event)
-{
- if (!PUSH(emitter, emitter->states, YAML_EMIT_DOCUMENT_END_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 1, 0, 0, 0);
-}
-
-/*
- * Expect DOCUMENT-END.
- */
-
-static int
-yaml_emitter_emit_document_end(yaml_emitter_t *emitter,
- yaml_event_t *event)
-{
- if (event->type == YAML_DOCUMENT_END_EVENT)
- {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- if (!event->data.document_end.implicit) {
- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- if (!yaml_emitter_flush(emitter))
- return 0;
-
- emitter->state = YAML_EMIT_DOCUMENT_START_STATE;
-
- while (!STACK_EMPTY(emitter, emitter->tag_directives)) {
- yaml_tag_directive_t tag_directive = POP(emitter,
- emitter->tag_directives);
- yaml_free(tag_directive.handle);
- yaml_free(tag_directive.prefix);
- }
-
- return 1;
- }
-
- return yaml_emitter_set_emitter_error(emitter,
- "expected DOCUMENT-END");
-}
-
-/*
- *
- * Expect a flow item node.
- */
-
-static int
-yaml_emitter_emit_flow_sequence_item(yaml_emitter_t *emitter,
- yaml_event_t *event, int first)
-{
- if (first)
- {
- if (!yaml_emitter_write_indicator(emitter, "[", 1, 1, 0))
- return 0;
- if (!yaml_emitter_increase_indent(emitter, 1, 0))
- return 0;
- emitter->flow_level ++;
- }
-
- if (event->type == YAML_SEQUENCE_END_EVENT)
- {
- emitter->flow_level --;
- emitter->indent = POP(emitter, emitter->indents);
- if (emitter->canonical && !first) {
- if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- if (!yaml_emitter_write_indicator(emitter, "]", 0, 0, 0))
- return 0;
- emitter->state = POP(emitter, emitter->states);
-
- return 1;
- }
-
- if (!first) {
- if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
- return 0;
- }
-
- if (emitter->canonical || emitter->column > emitter->best_width) {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- if (!PUSH(emitter, emitter->states, YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 1, 0, 0);
-}
-
-/*
- * Expect a flow key node.
- */
-
-static int
-yaml_emitter_emit_flow_mapping_key(yaml_emitter_t *emitter,
- yaml_event_t *event, int first)
-{
- if (first)
- {
- if (!yaml_emitter_write_indicator(emitter, "{", 1, 1, 0))
- return 0;
- if (!yaml_emitter_increase_indent(emitter, 1, 0))
- return 0;
- emitter->flow_level ++;
- }
-
- if (event->type == YAML_MAPPING_END_EVENT)
- {
- emitter->flow_level --;
- emitter->indent = POP(emitter, emitter->indents);
- if (emitter->canonical && !first) {
- if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
- return 0;
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- if (!yaml_emitter_write_indicator(emitter, "}", 0, 0, 0))
- return 0;
- emitter->state = POP(emitter, emitter->states);
-
- return 1;
- }
-
- if (!first) {
- if (!yaml_emitter_write_indicator(emitter, ",", 0, 0, 0))
- return 0;
- }
- if (emitter->canonical || emitter->column > emitter->best_width) {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
-
- if (!emitter->canonical && yaml_emitter_check_simple_key(emitter))
- {
- if (!PUSH(emitter, emitter->states,
- YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 1);
- }
- else
- {
- if (!yaml_emitter_write_indicator(emitter, "?", 1, 0, 0))
- return 0;
- if (!PUSH(emitter, emitter->states,
- YAML_EMIT_FLOW_MAPPING_VALUE_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
- }
-}
-
-/*
- * Expect a flow value node.
- */
-
-static int
-yaml_emitter_emit_flow_mapping_value(yaml_emitter_t *emitter,
- yaml_event_t *event, int simple)
-{
- if (simple) {
- if (!yaml_emitter_write_indicator(emitter, ":", 0, 0, 0))
- return 0;
- }
- else {
- if (emitter->canonical || emitter->column > emitter->best_width) {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- }
- if (!yaml_emitter_write_indicator(emitter, ":", 1, 0, 0))
- return 0;
- }
- if (!PUSH(emitter, emitter->states, YAML_EMIT_FLOW_MAPPING_KEY_STATE))
- return 0;
- return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
-}
-
-/*
- * Expect a block item node.
- */
-
-static int
-yaml_emitter_emit_block_sequence_item(yaml_emitter_t *emitter,
- yaml_event_t *event, int first)
-{
- if (first)
- {
- if (!yaml_emitter_increase_indent(emitter, 0,
- (emitter->mapping_context && !emitter->indention)))
- return 0;
- }
-
- if (event->type == YAML_SEQUENCE_END_EVENT)
- {
- emitter->indent = POP(emitter, emitter->indents);
- emitter->state = POP(emitter, emitter->states);
-
- return 1;
- }
-
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- if (!yaml_emitter_write_indicator(emitter, "-", 1, 0, 1))
- return 0;
- if (!PUSH(emitter, emitter->states,
- YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 1, 0, 0);
-}
-
-/*
- * Expect a block key node.
- */
-
-static int
-yaml_emitter_emit_block_mapping_key(yaml_emitter_t *emitter,
- yaml_event_t *event, int first)
-{
- if (first)
- {
- if (!yaml_emitter_increase_indent(emitter, 0, 0))
- return 0;
- }
-
- if (event->type == YAML_MAPPING_END_EVENT)
- {
- emitter->indent = POP(emitter, emitter->indents);
- emitter->state = POP(emitter, emitter->states);
-
- return 1;
- }
-
- if (!yaml_emitter_write_indent(emitter))
- return 0;
-
- if (yaml_emitter_check_simple_key(emitter))
- {
- if (!PUSH(emitter, emitter->states,
- YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 1);
- }
- else
- {
- if (!yaml_emitter_write_indicator(emitter, "?", 1, 0, 1))
- return 0;
- if (!PUSH(emitter, emitter->states,
- YAML_EMIT_BLOCK_MAPPING_VALUE_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
- }
-}
-
-/*
- * Expect a block value node.
- */
-
-static int
-yaml_emitter_emit_block_mapping_value(yaml_emitter_t *emitter,
- yaml_event_t *event, int simple)
-{
- if (simple) {
- if (!yaml_emitter_write_indicator(emitter, ":", 0, 0, 0))
- return 0;
- }
- else {
- if (!yaml_emitter_write_indent(emitter))
- return 0;
- if (!yaml_emitter_write_indicator(emitter, ":", 1, 0, 1))
- return 0;
- }
- if (!PUSH(emitter, emitter->states,
- YAML_EMIT_BLOCK_MAPPING_KEY_STATE))
- return 0;
-
- return yaml_emitter_emit_node(emitter, event, 0, 0, 1, 0);
-}
-
-/*
- * Expect a node.
- */
-
-static int
-yaml_emitter_emit_node(yaml_emitter_t *emitter, yaml_event_t *event,
- int root, int sequence, int mapping, int simple_key)
-{
- emitter->root_context = root;
- emitter->sequence_context = sequence;
- emitter->mapping_context = mapping;
- emitter->simple_key_context = simple_key;
-
- switch (event->type)
- {
- case YAML_ALIAS_EVENT:
- return yaml_emitter_emit_alias(emitter, event);
-
- case YAML_SCALAR_EVENT:
- return yaml_emitter_emit_scalar(emitter, event);
-
- case YAML_SEQUENCE_START_EVENT:
- return yaml_emitter_emit_sequence_start(emitter, event);
-
- case YAML_MAPPING_START_EVENT:
- return yaml_emitter_emit_mapping_start(emitter, event);
-
- default:
- return yaml_emitter_set_emitter_error(emitter,
- "expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS");
- }
-
- return 0;
-}
-
-/*
- * Expect ALIAS.
- */
-
-static int
-yaml_emitter_emit_alias(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- if (!yaml_emitter_process_anchor(emitter))
- return 0;
- emitter->state = POP(emitter, emitter->states);
-
- return 1;
-}
-
-/*
- * Expect SCALAR.
- */
-
-static int
-yaml_emitter_emit_scalar(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- if (!yaml_emitter_select_scalar_style(emitter, event))
- return 0;
- if (!yaml_emitter_process_anchor(emitter))
- return 0;
- if (!yaml_emitter_process_tag(emitter))
- return 0;
- if (!yaml_emitter_increase_indent(emitter, 1, 0))
- return 0;
- if (!yaml_emitter_process_scalar(emitter))
- return 0;
- emitter->indent = POP(emitter, emitter->indents);
- emitter->state = POP(emitter, emitter->states);
-
- return 1;
-}
-
-/*
- * Expect SEQUENCE-START.
- */
-
-static int
-yaml_emitter_emit_sequence_start(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- if (!yaml_emitter_process_anchor(emitter))
- return 0;
- if (!yaml_emitter_process_tag(emitter))
- return 0;
-
- if (emitter->flow_level || emitter->canonical
- || event->data.sequence_start.style == YAML_FLOW_SEQUENCE_STYLE
- || yaml_emitter_check_empty_sequence(emitter)) {
- emitter->state = YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE;
- }
- else {
- emitter->state = YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE;
- }
-
- return 1;
-}
-
-/*
- * Expect MAPPING-START.
- */
-
-static int
-yaml_emitter_emit_mapping_start(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- if (!yaml_emitter_process_anchor(emitter))
- return 0;
- if (!yaml_emitter_process_tag(emitter))
- return 0;
-
- if (emitter->flow_level || emitter->canonical
- || event->data.mapping_start.style == YAML_FLOW_MAPPING_STYLE
- || yaml_emitter_check_empty_mapping(emitter)) {
- emitter->state = YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE;
- }
- else {
- emitter->state = YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE;
- }
-
- return 1;
-}
-
-/*
- * Check if the document content is an empty scalar.
- */
-
-static int
-yaml_emitter_check_empty_document(yaml_emitter_t *emitter)
-{
- return 0;
-}
-
-/*
- * Check if the next events represent an empty sequence.
- */
-
-static int
-yaml_emitter_check_empty_sequence(yaml_emitter_t *emitter)
-{
- if (emitter->events.tail - emitter->events.head < 2)
- return 0;
-
- return (emitter->events.head[0].type == YAML_SEQUENCE_START_EVENT
- && emitter->events.head[1].type == YAML_SEQUENCE_END_EVENT);
-}
-
-/*
- * Check if the next events represent an empty mapping.
- */
-
-static int
-yaml_emitter_check_empty_mapping(yaml_emitter_t *emitter)
-{
- if (emitter->events.tail - emitter->events.head < 2)
- return 0;
-
- return (emitter->events.head[0].type == YAML_MAPPING_START_EVENT
- && emitter->events.head[1].type == YAML_MAPPING_END_EVENT);
-}
-
-/*
- * Check if the next node can be expressed as a simple key.
- */
-
-static int
-yaml_emitter_check_simple_key(yaml_emitter_t *emitter)
-{
- yaml_event_t *event = emitter->events.head;
- size_t length = 0;
-
- switch (event->type)
- {
- case YAML_ALIAS_EVENT:
- length += emitter->anchor_data.anchor_length;
- break;
-
- case YAML_SCALAR_EVENT:
- if (emitter->scalar_data.multiline)
- return 0;
- length += emitter->anchor_data.anchor_length
- + emitter->tag_data.handle_length
- + emitter->tag_data.suffix_length
- + emitter->scalar_data.length;
- break;
-
- case YAML_SEQUENCE_START_EVENT:
- if (!yaml_emitter_check_empty_sequence(emitter))
- return 0;
- length += emitter->anchor_data.anchor_length
- + emitter->tag_data.handle_length
- + emitter->tag_data.suffix_length;
- break;
-
- case YAML_MAPPING_START_EVENT:
- if (!yaml_emitter_check_empty_mapping(emitter))
- return 0;
- length += emitter->anchor_data.anchor_length
- + emitter->tag_data.handle_length
- + emitter->tag_data.suffix_length;
- break;
-
- default:
- return 0;
- }
-
- if (length > 128)
- return 0;
-
- return 1;
-}
-
-/*
- * Determine an acceptable scalar style.
- */
-
-static int
-yaml_emitter_select_scalar_style(yaml_emitter_t *emitter, yaml_event_t *event)
-{
- yaml_scalar_style_t style = event->data.scalar.style;
- int no_tag = (!emitter->tag_data.handle && !emitter->tag_data.suffix);
-
- if (no_tag && !event->data.scalar.plain_implicit
- && !event->data.scalar.quoted_implicit) {
- return yaml_emitter_set_emitter_error(emitter,
- "neither tag nor implicit flags are specified");
- }
-
- if (style == YAML_ANY_SCALAR_STYLE)
- style = YAML_PLAIN_SCALAR_STYLE;
-
- if (emitter->canonical)
- style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
-
- if (emitter->simple_key_context && emitter->scalar_data.multiline)
- style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
-
- if (style == YAML_PLAIN_SCALAR_STYLE)
- {
- if ((emitter->flow_level && !emitter->scalar_data.flow_plain_allowed)
- || (!emitter->flow_level && !emitter->scalar_data.block_plain_allowed))
- style = YAML_SINGLE_QUOTED_SCALAR_STYLE;
- if (!emitter->scalar_data.length
- && (emitter->flow_level || emitter->simple_key_context))
- style = YAML_SINGLE_QUOTED_SCALAR_STYLE;
- if (no_tag && !event->data.scalar.plain_implicit)
- style = YAML_SINGLE_QUOTED_SCALAR_STYLE;
- }
-
- if (style == YAML_SINGLE_QUOTED_SCALAR_STYLE)
- {
- if (!emitter->scalar_data.single_quoted_allowed)
- style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
- }
-
- if (style == YAML_LITERAL_SCALAR_STYLE || style == YAML_FOLDED_SCALAR_STYLE)
- {
- if (!emitter->scalar_data.block_allowed
- || emitter->flow_level || emitter->simple_key_context)
- style = YAML_DOUBLE_QUOTED_SCALAR_STYLE;
- }
-
- if (no_tag && !event->data.scalar.quoted_implicit
- && style != YAML_PLAIN_SCALAR_STYLE)
- {
- emitter->tag_data.handle = (yaml_char_t *)"!";
- emitter->tag_data.handle_length = 1;
- }
-
- emitter->scalar_data.style = style;
-
- return 1;
-}
-
-/*
- * Write an achor.
- */
-
-static int
-yaml_emitter_process_anchor(yaml_emitter_t *emitter)
-{
- if (!emitter->anchor_data.anchor)
- return 1;
-
- if (!yaml_emitter_write_indicator(emitter,
- (emitter->anchor_data.alias ? "*" : "&"), 1, 0, 0))
- return 0;
-
- return yaml_emitter_write_anchor(emitter,
- emitter->anchor_data.anchor, emitter->anchor_data.anchor_length);
-}
-
-/*
- * Write a tag.
- */
-
-static int
-yaml_emitter_process_tag(yaml_emitter_t *emitter)
-{
- if (!emitter->tag_data.handle && !emitter->tag_data.suffix)
- return 1;
-
- if (emitter->tag_data.handle)
- {
- if (!yaml_emitter_write_tag_handle(emitter, emitter->tag_data.handle,
- emitter->tag_data.handle_length))
- return 0;
- if (emitter->tag_data.suffix) {
- if (!yaml_emitter_write_tag_content(emitter, emitter->tag_data.suffix,
- emitter->tag_data.suffix_length, 0))
- return 0;
- }
- }
- else
- {
- if (!yaml_emitter_write_indicator(emitter, "!<", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_tag_content(emitter, emitter->tag_data.suffix,
- emitter->tag_data.suffix_length, 0))
- return 0;
- if (!yaml_emitter_write_indicator(emitter, ">", 0, 0, 0))
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Write a scalar.
- */
-
-static int
-yaml_emitter_process_scalar(yaml_emitter_t *emitter)
-{
- switch (emitter->scalar_data.style)
- {
- case YAML_PLAIN_SCALAR_STYLE:
- return yaml_emitter_write_plain_scalar(emitter,
- emitter->scalar_data.value, emitter->scalar_data.length,
- !emitter->simple_key_context);
-
- case YAML_SINGLE_QUOTED_SCALAR_STYLE:
- return yaml_emitter_write_single_quoted_scalar(emitter,
- emitter->scalar_data.value, emitter->scalar_data.length,
- !emitter->simple_key_context);
-
- case YAML_DOUBLE_QUOTED_SCALAR_STYLE:
- return yaml_emitter_write_double_quoted_scalar(emitter,
- emitter->scalar_data.value, emitter->scalar_data.length,
- !emitter->simple_key_context);
-
- case YAML_LITERAL_SCALAR_STYLE:
- return yaml_emitter_write_literal_scalar(emitter,
- emitter->scalar_data.value, emitter->scalar_data.length);
-
- case YAML_FOLDED_SCALAR_STYLE:
- return yaml_emitter_write_folded_scalar(emitter,
- emitter->scalar_data.value, emitter->scalar_data.length);
-
- default:
- assert(1); /* Impossible. */
- }
-
- return 0;
-}
-
-/*
- * Check if a %YAML directive is valid.
- */
-
-static int
-yaml_emitter_analyze_version_directive(yaml_emitter_t *emitter,
- yaml_version_directive_t version_directive)
-{
- if (version_directive.major != 1 || version_directive.minor != 1) {
- return yaml_emitter_set_emitter_error(emitter,
- "incompatible %YAML directive");
- }
-
- return 1;
-}
-
-/*
- * Check if a %TAG directive is valid.
- */
-
-static int
-yaml_emitter_analyze_tag_directive(yaml_emitter_t *emitter,
- yaml_tag_directive_t tag_directive)
-{
- yaml_string_t handle;
- yaml_string_t prefix;
- size_t handle_length;
- size_t prefix_length;
-
- handle_length = strlen((char *)tag_directive.handle);
- prefix_length = strlen((char *)tag_directive.prefix);
- STRING_ASSIGN(handle, tag_directive.handle, handle_length);
- STRING_ASSIGN(prefix, tag_directive.prefix, prefix_length);
-
- if (handle.start == handle.end) {
- return yaml_emitter_set_emitter_error(emitter,
- "tag handle must not be empty");
- }
-
- if (handle.start[0] != '!') {
- return yaml_emitter_set_emitter_error(emitter,
- "tag handle must start with '!'");
- }
-
- if (handle.end[-1] != '!') {
- return yaml_emitter_set_emitter_error(emitter,
- "tag handle must end with '!'");
- }
-
- handle.pointer ++;
-
- while (handle.pointer < handle.end-1) {
- if (!IS_ALPHA(handle)) {
- return yaml_emitter_set_emitter_error(emitter,
- "tag handle must contain alphanumerical characters only");
- }
- MOVE(handle);
- }
-
- if (prefix.start == prefix.end) {
- return yaml_emitter_set_emitter_error(emitter,
- "tag prefix must not be empty");
- }
-
- return 1;
-}
-
-/*
- * Check if an anchor is valid.
- */
-
-static int
-yaml_emitter_analyze_anchor(yaml_emitter_t *emitter,
- yaml_char_t *anchor, int alias)
-{
- size_t anchor_length;
- yaml_string_t string;
-
- anchor_length = strlen((char *)anchor);
- STRING_ASSIGN(string, anchor, anchor_length);
-
- if (string.start == string.end) {
- return yaml_emitter_set_emitter_error(emitter, alias ?
- "alias value must not be empty" :
- "anchor value must not be empty");
- }
-
- while (string.pointer != string.end) {
- if (!IS_ALPHA(string)) {
- return yaml_emitter_set_emitter_error(emitter, alias ?
- "alias value must contain alphanumerical characters only" :
- "anchor value must contain alphanumerical characters only");
- }
- MOVE(string);
- }
-
- emitter->anchor_data.anchor = string.start;
- emitter->anchor_data.anchor_length = string.end - string.start;
- emitter->anchor_data.alias = alias;
-
- return 1;
-}
-
-/*
- * Check if a tag is valid.
- */
-
-static int
-yaml_emitter_analyze_tag(yaml_emitter_t *emitter,
- yaml_char_t *tag)
-{
- size_t tag_length;
- yaml_string_t string;
- yaml_tag_directive_t *tag_directive;
-
- tag_length = strlen((char *)tag);
- STRING_ASSIGN(string, tag, tag_length);
-
- if (string.start == string.end) {
- return yaml_emitter_set_emitter_error(emitter,
- "tag value must not be empty");
- }
-
- for (tag_directive = emitter->tag_directives.start;
- tag_directive != emitter->tag_directives.top; tag_directive ++) {
- size_t prefix_length = strlen((char *)tag_directive->prefix);
- if (prefix_length < (size_t)(string.end - string.start)
- && strncmp((char *)tag_directive->prefix, (char *)string.start,
- prefix_length) == 0)
- {
- emitter->tag_data.handle = tag_directive->handle;
- emitter->tag_data.handle_length =
- strlen((char *)tag_directive->handle);
- emitter->tag_data.suffix = string.start + prefix_length;
- emitter->tag_data.suffix_length =
- (string.end - string.start) - prefix_length;
- return 1;
- }
- }
-
- emitter->tag_data.suffix = string.start;
- emitter->tag_data.suffix_length = string.end - string.start;
-
- return 1;
-}
-
-/*
- * Check if a scalar is valid.
- */
-
-static int
-yaml_emitter_analyze_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length)
-{
- yaml_string_t string;
-
- int block_indicators = 0;
- int flow_indicators = 0;
- int line_breaks = 0;
- int special_characters = 0;
-
- int leading_space = 0;
- int leading_break = 0;
- int trailing_space = 0;
- int trailing_break = 0;
- int break_space = 0;
- int space_break = 0;
-
- int preceeded_by_whitespace = 0;
- int followed_by_whitespace = 0;
- int previous_space = 0;
- int previous_break = 0;
-
- STRING_ASSIGN(string, value, length);
-
- emitter->scalar_data.value = value;
- emitter->scalar_data.length = length;
-
- if (string.start == string.end)
- {
- emitter->scalar_data.multiline = 0;
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 1;
- emitter->scalar_data.single_quoted_allowed = 1;
- emitter->scalar_data.block_allowed = 0;
-
- return 1;
- }
-
- if ((CHECK_AT(string, '-', 0)
- && CHECK_AT(string, '-', 1)
- && CHECK_AT(string, '-', 2))
- || (CHECK_AT(string, '.', 0)
- && CHECK_AT(string, '.', 1)
- && CHECK_AT(string, '.', 2))) {
- block_indicators = 1;
- flow_indicators = 1;
- }
-
- preceeded_by_whitespace = 1;
- followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
-
- while (string.pointer != string.end)
- {
- if (string.start == string.pointer)
- {
- if (CHECK(string, '#') || CHECK(string, ',')
- || CHECK(string, '[') || CHECK(string, ']')
- || CHECK(string, '{') || CHECK(string, '}')
- || CHECK(string, '&') || CHECK(string, '*')
- || CHECK(string, '!') || CHECK(string, '|')
- || CHECK(string, '>') || CHECK(string, '\'')
- || CHECK(string, '"') || CHECK(string, '%')
- || CHECK(string, '@') || CHECK(string, '`')) {
- flow_indicators = 1;
- block_indicators = 1;
- }
-
- if (CHECK(string, '?') || CHECK(string, ':')) {
- flow_indicators = 1;
- if (followed_by_whitespace) {
- block_indicators = 1;
- }
- }
-
- if (CHECK(string, '-') && followed_by_whitespace) {
- flow_indicators = 1;
- block_indicators = 1;
- }
- }
- else
- {
- if (CHECK(string, ',') || CHECK(string, '?')
- || CHECK(string, '[') || CHECK(string, ']')
- || CHECK(string, '{') || CHECK(string, '}')) {
- flow_indicators = 1;
- }
-
- if (CHECK(string, ':')) {
- flow_indicators = 1;
- if (followed_by_whitespace) {
- block_indicators = 1;
- }
- }
-
- if (CHECK(string, '#') && preceeded_by_whitespace) {
- flow_indicators = 1;
- block_indicators = 1;
- }
- }
-
- if (!IS_PRINTABLE(string)
- || (!IS_ASCII(string) && !emitter->unicode)) {
- special_characters = 1;
- }
-
- if (IS_BREAK(string)) {
- line_breaks = 1;
- }
-
- if (IS_SPACE(string))
- {
- if (string.start == string.pointer) {
- leading_space = 1;
- }
- if (string.pointer+WIDTH(string) == string.end) {
- trailing_space = 1;
- }
- if (previous_break) {
- break_space = 1;
- }
- previous_space = 1;
- previous_break = 0;
- }
- else if (IS_BREAK(string))
- {
- if (string.start == string.pointer) {
- leading_break = 1;
- }
- if (string.pointer+WIDTH(string) == string.end) {
- trailing_break = 1;
- }
- if (previous_space) {
- space_break = 1;
- }
- previous_space = 0;
- previous_break = 1;
- }
- else
- {
- previous_space = 0;
- previous_break = 0;
- }
-
- preceeded_by_whitespace = IS_BLANKZ(string);
- MOVE(string);
- if (string.pointer != string.end) {
- followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
- }
- }
-
- emitter->scalar_data.multiline = line_breaks;
-
- emitter->scalar_data.flow_plain_allowed = 1;
- emitter->scalar_data.block_plain_allowed = 1;
- emitter->scalar_data.single_quoted_allowed = 1;
- emitter->scalar_data.block_allowed = 1;
-
- if (leading_space || leading_break || trailing_space || trailing_break) {
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 0;
- }
-
- if (trailing_space) {
- emitter->scalar_data.block_allowed = 0;
- }
-
- if (break_space) {
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 0;
- emitter->scalar_data.single_quoted_allowed = 0;
- }
-
- if (space_break || special_characters) {
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 0;
- emitter->scalar_data.single_quoted_allowed = 0;
- emitter->scalar_data.block_allowed = 0;
- }
-
- if (line_breaks) {
- emitter->scalar_data.flow_plain_allowed = 0;
- emitter->scalar_data.block_plain_allowed = 0;
- }
-
- if (flow_indicators) {
- emitter->scalar_data.flow_plain_allowed = 0;
- }
-
- if (block_indicators) {
- emitter->scalar_data.block_plain_allowed = 0;
- }
-
- return 1;
-}
-
-/*
- * Check if the event data is valid.
- */
-
-static int
-yaml_emitter_analyze_event(yaml_emitter_t *emitter,
- yaml_event_t *event)
-{
- emitter->anchor_data.anchor = NULL;
- emitter->anchor_data.anchor_length = 0;
- emitter->tag_data.handle = NULL;
- emitter->tag_data.handle_length = 0;
- emitter->tag_data.suffix = NULL;
- emitter->tag_data.suffix_length = 0;
- emitter->scalar_data.value = NULL;
- emitter->scalar_data.length = 0;
-
- switch (event->type)
- {
- case YAML_ALIAS_EVENT:
- if (!yaml_emitter_analyze_anchor(emitter,
- event->data.alias.anchor, 1))
- return 0;
- return 1;
-
- case YAML_SCALAR_EVENT:
- if (event->data.scalar.anchor) {
- if (!yaml_emitter_analyze_anchor(emitter,
- event->data.scalar.anchor, 0))
- return 0;
- }
- if (event->data.scalar.tag && (emitter->canonical ||
- (!event->data.scalar.plain_implicit
- && !event->data.scalar.quoted_implicit))) {
- if (!yaml_emitter_analyze_tag(emitter, event->data.scalar.tag))
- return 0;
- }
- if (!yaml_emitter_analyze_scalar(emitter,
- event->data.scalar.value, event->data.scalar.length))
- return 0;
- return 1;
-
- case YAML_SEQUENCE_START_EVENT:
- if (event->data.sequence_start.anchor) {
- if (!yaml_emitter_analyze_anchor(emitter,
- event->data.sequence_start.anchor, 0))
- return 0;
- }
- if (event->data.sequence_start.tag && (emitter->canonical ||
- !event->data.sequence_start.implicit)) {
- if (!yaml_emitter_analyze_tag(emitter,
- event->data.sequence_start.tag))
- return 0;
- }
- return 1;
-
- case YAML_MAPPING_START_EVENT:
- if (event->data.mapping_start.anchor) {
- if (!yaml_emitter_analyze_anchor(emitter,
- event->data.mapping_start.anchor, 0))
- return 0;
- }
- if (event->data.mapping_start.tag && (emitter->canonical ||
- !event->data.mapping_start.implicit)) {
- if (!yaml_emitter_analyze_tag(emitter,
- event->data.mapping_start.tag))
- return 0;
- }
- return 1;
-
- default:
- return 1;
- }
-}
-
-/*
- * Write the BOM character.
- */
-
-static int
-yaml_emitter_write_bom(yaml_emitter_t *emitter)
-{
- if (!FLUSH(emitter)) return 0;
-
- *(emitter->buffer.pointer++) = (yaml_char_t) '\xEF';
- *(emitter->buffer.pointer++) = (yaml_char_t) '\xBB';
- *(emitter->buffer.pointer++) = (yaml_char_t) '\xBF';
-
- return 1;
-}
-
-static int
-yaml_emitter_write_indent(yaml_emitter_t *emitter)
-{
- int indent = (emitter->indent >= 0) ? emitter->indent : 0;
-
- if (!emitter->indention || emitter->column > indent
- || (emitter->column == indent && !emitter->whitespace)) {
- if (!PUT_BREAK(emitter)) return 0;
- }
-
- while (emitter->column < indent) {
- if (!PUT(emitter, ' ')) return 0;
- }
-
- emitter->whitespace = 1;
- emitter->indention = 1;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_indicator(yaml_emitter_t *emitter,
- const char *indicator, int need_whitespace,
- int is_whitespace, int is_indention)
-{
- size_t indicator_length;
- yaml_string_t string;
-
- indicator_length = strlen(indicator);
- STRING_ASSIGN(string, (yaml_char_t *)indicator, indicator_length);
-
- if (need_whitespace && !emitter->whitespace) {
- if (!PUT(emitter, ' ')) return 0;
- }
-
- while (string.pointer != string.end) {
- if (!WRITE(emitter, string)) return 0;
- }
-
- emitter->whitespace = is_whitespace;
- emitter->indention = (emitter->indention && is_indention);
- emitter->open_ended = 0;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_anchor(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length)
-{
- yaml_string_t string;
- STRING_ASSIGN(string, value, length);
-
- while (string.pointer != string.end) {
- if (!WRITE(emitter, string)) return 0;
- }
-
- emitter->whitespace = 0;
- emitter->indention = 0;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_tag_handle(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length)
-{
- yaml_string_t string;
- STRING_ASSIGN(string, value, length);
-
- if (!emitter->whitespace) {
- if (!PUT(emitter, ' ')) return 0;
- }
-
- while (string.pointer != string.end) {
- if (!WRITE(emitter, string)) return 0;
- }
-
- emitter->whitespace = 0;
- emitter->indention = 0;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_tag_content(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length,
- int need_whitespace)
-{
- yaml_string_t string;
- STRING_ASSIGN(string, value, length);
-
- if (need_whitespace && !emitter->whitespace) {
- if (!PUT(emitter, ' ')) return 0;
- }
-
- while (string.pointer != string.end) {
- if (IS_ALPHA(string)
- || CHECK(string, ';') || CHECK(string, '/')
- || CHECK(string, '?') || CHECK(string, ':')
- || CHECK(string, '@') || CHECK(string, '&')
- || CHECK(string, '=') || CHECK(string, '+')
- || CHECK(string, '$') || CHECK(string, ',')
- || CHECK(string, '_') || CHECK(string, '.')
- || CHECK(string, '~') || CHECK(string, '*')
- || CHECK(string, '\'') || CHECK(string, '(')
- || CHECK(string, ')') || CHECK(string, '[')
- || CHECK(string, ']')) {
- if (!WRITE(emitter, string)) return 0;
- }
- else {
- int width = WIDTH(string);
- unsigned int value;
- while (width --) {
- value = *(string.pointer++);
- if (!PUT(emitter, '%')) return 0;
- if (!PUT(emitter, (value >> 4)
- + ((value >> 4) < 10 ? '0' : 'A' - 10)))
- return 0;
- if (!PUT(emitter, (value & 0x0F)
- + ((value & 0x0F) < 10 ? '0' : 'A' - 10)))
- return 0;
- }
- }
- }
-
- emitter->whitespace = 0;
- emitter->indention = 0;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks)
-{
- yaml_string_t string;
- int spaces = 0;
- int breaks = 0;
-
- STRING_ASSIGN(string, value, length);
-
- if (!emitter->whitespace) {
- if (!PUT(emitter, ' ')) return 0;
- }
-
- while (string.pointer != string.end)
- {
- if (IS_SPACE(string))
- {
- if (allow_breaks && !spaces
- && emitter->column > emitter->best_width
- && !IS_SPACE_AT(string, 1)) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- MOVE(string);
- }
- else {
- if (!WRITE(emitter, string)) return 0;
- }
- spaces = 1;
- }
- else if (IS_BREAK(string))
- {
- if (!breaks && CHECK(string, '\n')) {
- if (!PUT_BREAK(emitter)) return 0;
- }
- if (!WRITE_BREAK(emitter, string)) return 0;
- emitter->indention = 1;
- breaks = 1;
- }
- else
- {
- if (breaks) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- }
- if (!WRITE(emitter, string)) return 0;
- emitter->indention = 0;
- spaces = 0;
- breaks = 0;
- }
- }
-
- emitter->whitespace = 0;
- emitter->indention = 0;
- if (emitter->root_context)
- {
- emitter->open_ended = 1;
- }
-
- return 1;
-}
-
-static int
-yaml_emitter_write_single_quoted_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks)
-{
- yaml_string_t string;
- int spaces = 0;
- int breaks = 0;
-
- STRING_ASSIGN(string, value, length);
-
- if (!yaml_emitter_write_indicator(emitter, "'", 1, 0, 0))
- return 0;
-
- while (string.pointer != string.end)
- {
- if (IS_SPACE(string))
- {
- if (allow_breaks && !spaces
- && emitter->column > emitter->best_width
- && string.pointer != string.start
- && string.pointer != string.end - 1
- && !IS_SPACE_AT(string, 1)) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- MOVE(string);
- }
- else {
- if (!WRITE(emitter, string)) return 0;
- }
- spaces = 1;
- }
- else if (IS_BREAK(string))
- {
- if (!breaks && CHECK(string, '\n')) {
- if (!PUT_BREAK(emitter)) return 0;
- }
- if (!WRITE_BREAK(emitter, string)) return 0;
- emitter->indention = 1;
- breaks = 1;
- }
- else
- {
- if (breaks) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- }
- if (CHECK(string, '\'')) {
- if (!PUT(emitter, '\'')) return 0;
- }
- if (!WRITE(emitter, string)) return 0;
- emitter->indention = 0;
- spaces = 0;
- breaks = 0;
- }
- }
-
- if (!yaml_emitter_write_indicator(emitter, "'", 0, 0, 0))
- return 0;
-
- emitter->whitespace = 0;
- emitter->indention = 0;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_double_quoted_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length, int allow_breaks)
-{
- yaml_string_t string;
- int spaces = 0;
-
- STRING_ASSIGN(string, value, length);
-
- if (!yaml_emitter_write_indicator(emitter, "\"", 1, 0, 0))
- return 0;
-
- while (string.pointer != string.end)
- {
- if (!IS_PRINTABLE(string) || (!emitter->unicode && !IS_ASCII(string))
- || IS_BOM(string) || IS_BREAK(string)
- || CHECK(string, '"') || CHECK(string, '\\'))
- {
- unsigned char octet;
- unsigned int width;
- unsigned int value;
- int k;
-
- octet = string.pointer[0];
- width = (octet & 0x80) == 0x00 ? 1 :
- (octet & 0xE0) == 0xC0 ? 2 :
- (octet & 0xF0) == 0xE0 ? 3 :
- (octet & 0xF8) == 0xF0 ? 4 : 0;
- value = (octet & 0x80) == 0x00 ? octet & 0x7F :
- (octet & 0xE0) == 0xC0 ? octet & 0x1F :
- (octet & 0xF0) == 0xE0 ? octet & 0x0F :
- (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
- for (k = 1; k < (int)width; k ++) {
- octet = string.pointer[k];
- value = (value << 6) + (octet & 0x3F);
- }
- string.pointer += width;
-
- if (!PUT(emitter, '\\')) return 0;
-
- switch (value)
- {
- case 0x00:
- if (!PUT(emitter, '0')) return 0;
- break;
-
- case 0x07:
- if (!PUT(emitter, 'a')) return 0;
- break;
-
- case 0x08:
- if (!PUT(emitter, 'b')) return 0;
- break;
-
- case 0x09:
- if (!PUT(emitter, 't')) return 0;
- break;
-
- case 0x0A:
- if (!PUT(emitter, 'n')) return 0;
- break;
-
- case 0x0B:
- if (!PUT(emitter, 'v')) return 0;
- break;
-
- case 0x0C:
- if (!PUT(emitter, 'f')) return 0;
- break;
-
- case 0x0D:
- if (!PUT(emitter, 'r')) return 0;
- break;
-
- case 0x1B:
- if (!PUT(emitter, 'e')) return 0;
- break;
-
- case 0x22:
- if (!PUT(emitter, '\"')) return 0;
- break;
-
- case 0x5C:
- if (!PUT(emitter, '\\')) return 0;
- break;
-
- case 0x85:
- if (!PUT(emitter, 'N')) return 0;
- break;
-
- case 0xA0:
- if (!PUT(emitter, '_')) return 0;
- break;
-
- case 0x2028:
- if (!PUT(emitter, 'L')) return 0;
- break;
-
- case 0x2029:
- if (!PUT(emitter, 'P')) return 0;
- break;
-
- default:
- if (value <= 0xFF) {
- if (!PUT(emitter, 'x')) return 0;
- width = 2;
- }
- else if (value <= 0xFFFF) {
- if (!PUT(emitter, 'u')) return 0;
- width = 4;
- }
- else {
- if (!PUT(emitter, 'U')) return 0;
- width = 8;
- }
- for (k = (width-1)*4; k >= 0; k -= 4) {
- int digit = (value >> k) & 0x0F;
- if (!PUT(emitter, digit + (digit < 10 ? '0' : 'A'-10)))
- return 0;
- }
- }
- spaces = 0;
- }
- else if (IS_SPACE(string))
- {
- if (allow_breaks && !spaces
- && emitter->column > emitter->best_width
- && string.pointer != string.start
- && string.pointer != string.end - 1) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- if (IS_SPACE_AT(string, 1)) {
- if (!PUT(emitter, '\\')) return 0;
- }
- MOVE(string);
- }
- else {
- if (!WRITE(emitter, string)) return 0;
- }
- spaces = 1;
- }
- else
- {
- if (!WRITE(emitter, string)) return 0;
- spaces = 0;
- }
- }
-
- if (!yaml_emitter_write_indicator(emitter, "\"", 0, 0, 0))
- return 0;
-
- emitter->whitespace = 0;
- emitter->indention = 0;
-
- return 1;
-}
-
-static int
-yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
- yaml_string_t string)
-{
- char indent_hint[2];
- const char *chomp_hint = NULL;
-
- if (IS_SPACE(string) || IS_BREAK(string))
- {
- indent_hint[0] = '0' + (char)emitter->best_indent;
- indent_hint[1] = '\0';
- if (!yaml_emitter_write_indicator(emitter, indent_hint, 0, 0, 0))
- return 0;
- }
-
- emitter->open_ended = 0;
-
- string.pointer = string.end;
- if (string.start == string.pointer)
- {
- chomp_hint = "-";
- }
- else
- {
- do {
- string.pointer --;
- } while ((*string.pointer & 0xC0) == 0x80);
- if (!IS_BREAK(string))
- {
- chomp_hint = "-";
- }
- else if (string.start == string.pointer)
- {
- chomp_hint = "+";
- emitter->open_ended = 1;
- }
- else
- {
- do {
- string.pointer --;
- } while ((*string.pointer & 0xC0) == 0x80);
- if (IS_BREAK(string))
- {
- chomp_hint = "+";
- emitter->open_ended = 1;
- }
- }
- }
-
- if (chomp_hint)
- {
- if (!yaml_emitter_write_indicator(emitter, chomp_hint, 0, 0, 0))
- return 0;
- }
-
- return 1;
-}
-
-static int
-yaml_emitter_write_literal_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length)
-{
- yaml_string_t string;
- int breaks = 1;
-
- STRING_ASSIGN(string, value, length);
-
- if (!yaml_emitter_write_indicator(emitter, "|", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_block_scalar_hints(emitter, string))
- return 0;
- if (!PUT_BREAK(emitter)) return 0;
- emitter->indention = 1;
- emitter->whitespace = 1;
-
- while (string.pointer != string.end)
- {
- if (IS_BREAK(string))
- {
- if (!WRITE_BREAK(emitter, string)) return 0;
- emitter->indention = 1;
- breaks = 1;
- }
- else
- {
- if (breaks) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- }
- if (!WRITE(emitter, string)) return 0;
- emitter->indention = 0;
- breaks = 0;
- }
- }
-
- return 1;
-}
-
-static int
-yaml_emitter_write_folded_scalar(yaml_emitter_t *emitter,
- yaml_char_t *value, size_t length)
-{
- yaml_string_t string;
- int breaks = 1;
- int leading_spaces = 1;
-
- STRING_ASSIGN(string, value, length);
-
- if (!yaml_emitter_write_indicator(emitter, ">", 1, 0, 0))
- return 0;
- if (!yaml_emitter_write_block_scalar_hints(emitter, string))
- return 0;
- if (!PUT_BREAK(emitter)) return 0;
- emitter->indention = 1;
- emitter->whitespace = 1;
-
- while (string.pointer != string.end)
- {
- if (IS_BREAK(string))
- {
- if (!breaks && !leading_spaces && CHECK(string, '\n')) {
- int k = 0;
- while (IS_BREAK_AT(string, k)) {
- k += WIDTH_AT(string, k);
- }
- if (!IS_BLANKZ_AT(string, k)) {
- if (!PUT_BREAK(emitter)) return 0;
- }
- }
- if (!WRITE_BREAK(emitter, string)) return 0;
- emitter->indention = 1;
- breaks = 1;
- }
- else
- {
- if (breaks) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- leading_spaces = IS_BLANK(string);
- }
- if (!breaks && IS_SPACE(string) && !IS_SPACE_AT(string, 1)
- && emitter->column > emitter->best_width) {
- if (!yaml_emitter_write_indent(emitter)) return 0;
- MOVE(string);
- }
- else {
- if (!WRITE(emitter, string)) return 0;
- }
- emitter->indention = 0;
- breaks = 0;
- }
- }
-
- return 1;
-}
-
diff --git a/ext/psych/yaml/loader.c b/ext/psych/yaml/loader.c
deleted file mode 100644
index cb3ea93089..0000000000
--- a/ext/psych/yaml/loader.c
+++ /dev/null
@@ -1,459 +0,0 @@
-
-#include "yaml_private.h"
-
-/*
- * API functions.
- */
-
-YAML_DECLARE(int)
-yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document);
-
-/*
- * Error handling.
- */
-
-static int
-yaml_parser_set_composer_error(yaml_parser_t *parser,
- const char *problem, yaml_mark_t problem_mark);
-
-static int
-yaml_parser_set_composer_error_context(yaml_parser_t *parser,
- const char *context, yaml_mark_t context_mark,
- const char *problem, yaml_mark_t problem_mark);
-
-
-/*
- * Alias handling.
- */
-
-static int
-yaml_parser_register_anchor(yaml_parser_t *parser,
- int index, yaml_char_t *anchor);
-
-/*
- * Clean up functions.
- */
-
-static void
-yaml_parser_delete_aliases(yaml_parser_t *parser);
-
-/*
- * Composer functions.
- */
-
-static int
-yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event);
-
-static int
-yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event);
-
-static int
-yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event);
-
-static int
-yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event);
-
-static int
-yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event);
-
-static int
-yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event);
-
-/*
- * Load the next document of the stream.
- */
-
-YAML_DECLARE(int)
-yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document)
-{
- yaml_event_t event;
-
- assert(parser); /* Non-NULL parser object is expected. */
- assert(document); /* Non-NULL document object is expected. */
-
- memset(document, 0, sizeof(yaml_document_t));
- if (!STACK_INIT(parser, document->nodes, INITIAL_STACK_SIZE))
- goto error;
-
- if (!parser->stream_start_produced) {
- if (!yaml_parser_parse(parser, &event)) goto error;
- assert(event.type == YAML_STREAM_START_EVENT);
- /* STREAM-START is expected. */
- }
-
- if (parser->stream_end_produced) {
- return 1;
- }
-
- if (!yaml_parser_parse(parser, &event)) goto error;
- if (event.type == YAML_STREAM_END_EVENT) {
- return 1;
- }
-
- if (!STACK_INIT(parser, parser->aliases, INITIAL_STACK_SIZE))
- goto error;
-
- parser->document = document;
-
- if (!yaml_parser_load_document(parser, &event)) goto error;
-
- yaml_parser_delete_aliases(parser);
- parser->document = NULL;
-
- return 1;
-
-error:
-
- yaml_parser_delete_aliases(parser);
- yaml_document_delete(document);
- parser->document = NULL;
-
- return 0;
-}
-
-/*
- * Set composer error.
- */
-
-static int
-yaml_parser_set_composer_error(yaml_parser_t *parser,
- const char *problem, yaml_mark_t problem_mark)
-{
- parser->error = YAML_COMPOSER_ERROR;
- parser->problem = problem;
- parser->problem_mark = problem_mark;
-
- return 0;
-}
-
-/*
- * Set composer error with context.
- */
-
-static int
-yaml_parser_set_composer_error_context(yaml_parser_t *parser,
- const char *context, yaml_mark_t context_mark,
- const char *problem, yaml_mark_t problem_mark)
-{
- parser->error = YAML_COMPOSER_ERROR;
- parser->context = context;
- parser->context_mark = context_mark;
- parser->problem = problem;
- parser->problem_mark = problem_mark;
-
- return 0;
-}
-
-/*
- * Delete the stack of aliases.
- */
-
-static void
-yaml_parser_delete_aliases(yaml_parser_t *parser)
-{
- while (!STACK_EMPTY(parser, parser->aliases)) {
- yaml_free(POP(parser, parser->aliases).anchor);
- }
- STACK_DEL(parser, parser->aliases);
-}
-
-/*
- * Compose a document object.
- */
-
-static int
-yaml_parser_load_document(yaml_parser_t *parser, yaml_event_t *first_event)
-{
- yaml_event_t event;
-
- assert(first_event->type == YAML_DOCUMENT_START_EVENT);
- /* DOCUMENT-START is expected. */
-
- parser->document->version_directive
- = first_event->data.document_start.version_directive;
- parser->document->tag_directives.start
- = first_event->data.document_start.tag_directives.start;
- parser->document->tag_directives.end
- = first_event->data.document_start.tag_directives.end;
- parser->document->start_implicit
- = first_event->data.document_start.implicit;
- parser->document->start_mark = first_event->start_mark;
-
- if (!yaml_parser_parse(parser, &event)) return 0;
-
- if (!yaml_parser_load_node(parser, &event)) return 0;
-
- if (!yaml_parser_parse(parser, &event)) return 0;
- assert(event.type == YAML_DOCUMENT_END_EVENT);
- /* DOCUMENT-END is expected. */
-
- parser->document->end_implicit = event.data.document_end.implicit;
- parser->document->end_mark = event.end_mark;
-
- return 1;
-}
-
-/*
- * Compose a node.
- */
-
-static int
-yaml_parser_load_node(yaml_parser_t *parser, yaml_event_t *first_event)
-{
- switch (first_event->type) {
- case YAML_ALIAS_EVENT:
- return yaml_parser_load_alias(parser, first_event);
- case YAML_SCALAR_EVENT:
- return yaml_parser_load_scalar(parser, first_event);
- case YAML_SEQUENCE_START_EVENT:
- return yaml_parser_load_sequence(parser, first_event);
- case YAML_MAPPING_START_EVENT:
- return yaml_parser_load_mapping(parser, first_event);
- default:
- assert(0); /* Could not happen. */
- return 0;
- }
-
- return 0;
-}
-
-/*
- * Add an anchor.
- */
-
-static int
-yaml_parser_register_anchor(yaml_parser_t *parser,
- int index, yaml_char_t *anchor)
-{
- yaml_alias_data_t data;
- yaml_alias_data_t *alias_data;
-
- if (!anchor) return 1;
-
- data.anchor = anchor;
- data.index = index;
- data.mark = parser->document->nodes.start[index-1].start_mark;
-
- for (alias_data = parser->aliases.start;
- alias_data != parser->aliases.top; alias_data ++) {
- if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
- yaml_free(anchor);
- return yaml_parser_set_composer_error_context(parser,
- "found duplicate anchor; first occurence",
- alias_data->mark, "second occurence", data.mark);
- }
- }
-
- if (!PUSH(parser, parser->aliases, data)) {
- yaml_free(anchor);
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Compose a node corresponding to an alias.
- */
-
-static int
-yaml_parser_load_alias(yaml_parser_t *parser, yaml_event_t *first_event)
-{
- yaml_char_t *anchor = first_event->data.alias.anchor;
- yaml_alias_data_t *alias_data;
-
- for (alias_data = parser->aliases.start;
- alias_data != parser->aliases.top; alias_data ++) {
- if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
- yaml_free(anchor);
- return alias_data->index;
- }
- }
-
- yaml_free(anchor);
- return yaml_parser_set_composer_error(parser, "found undefined alias",
- first_event->start_mark);
-}
-
-/*
- * Compose a scalar node.
- */
-
-static int
-yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
-{
- yaml_node_t node;
- ptrdiff_t node_index;
- int index;
- yaml_char_t *tag = first_event->data.scalar.tag;
-
- if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
-
- if (!tag || strcmp((char *)tag, "!") == 0) {
- yaml_free(tag);
- tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SCALAR_TAG);
- if (!tag) goto error;
- }
-
- SCALAR_NODE_INIT(node, tag, first_event->data.scalar.value,
- first_event->data.scalar.length, first_event->data.scalar.style,
- first_event->start_mark, first_event->end_mark);
-
- if (!PUSH(parser, parser->document->nodes, node)) goto error;
-
- node_index = parser->document->nodes.top - parser->document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
- if (node_index > INT_MAX) goto error;
-#endif
- index = (int)node_index;
-
- if (!yaml_parser_register_anchor(parser, index,
- first_event->data.scalar.anchor)) return 0;
-
- return index;
-
-error:
- yaml_free(tag);
- yaml_free(first_event->data.scalar.anchor);
- yaml_free(first_event->data.scalar.value);
- return 0;
-}
-
-/*
- * Compose a sequence node.
- */
-
-static int
-yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
-{
- yaml_event_t event;
- yaml_node_t node;
- struct {
- yaml_node_item_t *start;
- yaml_node_item_t *end;
- yaml_node_item_t *top;
- } items = { NULL, NULL, NULL };
- int index, item_index;
- ptrdiff_t node_index;
- yaml_char_t *tag = first_event->data.sequence_start.tag;
-
- if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
-
- if (!tag || strcmp((char *)tag, "!") == 0) {
- yaml_free(tag);
- tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_SEQUENCE_TAG);
- if (!tag) goto error;
- }
-
- if (!STACK_INIT(parser, items, INITIAL_STACK_SIZE)) goto error;
-
- SEQUENCE_NODE_INIT(node, tag, items.start, items.end,
- first_event->data.sequence_start.style,
- first_event->start_mark, first_event->end_mark);
-
- if (!PUSH(parser, parser->document->nodes, node)) goto error;
-
- node_index = parser->document->nodes.top - parser->document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
- if (node_index > INT_MAX) goto error;
-#endif
- index = (int)node_index;
-
- if (!yaml_parser_register_anchor(parser, index,
- first_event->data.sequence_start.anchor)) return 0;
-
- if (!yaml_parser_parse(parser, &event)) return 0;
-
- while (event.type != YAML_SEQUENCE_END_EVENT) {
- if (!STACK_LIMIT(parser,
- parser->document->nodes.start[index-1].data.sequence.items,
- INT_MAX-1)) return 0;
- item_index = yaml_parser_load_node(parser, &event);
- if (!item_index) return 0;
- if (!PUSH(parser,
- parser->document->nodes.start[index-1].data.sequence.items,
- item_index)) return 0;
- if (!yaml_parser_parse(parser, &event)) return 0;
- }
-
- parser->document->nodes.start[index-1].end_mark = event.end_mark;
-
- return index;
-
-error:
- yaml_free(tag);
- yaml_free(first_event->data.sequence_start.anchor);
- return 0;
-}
-
-/*
- * Compose a mapping node.
- */
-
-static int
-yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
-{
- yaml_event_t event;
- yaml_node_t node;
- struct {
- yaml_node_pair_t *start;
- yaml_node_pair_t *end;
- yaml_node_pair_t *top;
- } pairs = { NULL, NULL, NULL };
- int index;
- ptrdiff_t node_index;
- yaml_node_pair_t pair;
- yaml_char_t *tag = first_event->data.mapping_start.tag;
-
- if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
-
- if (!tag || strcmp((char *)tag, "!") == 0) {
- yaml_free(tag);
- tag = yaml_strdup((yaml_char_t *)YAML_DEFAULT_MAPPING_TAG);
- if (!tag) goto error;
- }
-
- if (!STACK_INIT(parser, pairs, INITIAL_STACK_SIZE)) goto error;
-
- MAPPING_NODE_INIT(node, tag, pairs.start, pairs.end,
- first_event->data.mapping_start.style,
- first_event->start_mark, first_event->end_mark);
-
- if (!PUSH(parser, parser->document->nodes, node)) goto error;
-
- node_index = parser->document->nodes.top - parser->document->nodes.start;
-#if PTRDIFF_MAX > INT_MAX
- if (node_index > INT_MAX) goto error;
-#endif
- index = (int)node_index;
-
- if (!yaml_parser_register_anchor(parser, index,
- first_event->data.mapping_start.anchor)) return 0;
-
- if (!yaml_parser_parse(parser, &event)) return 0;
-
- while (event.type != YAML_MAPPING_END_EVENT) {
- if (!STACK_LIMIT(parser,
- parser->document->nodes.start[index-1].data.mapping.pairs,
- INT_MAX-1)) return 0;
- pair.key = yaml_parser_load_node(parser, &event);
- if (!pair.key) return 0;
- if (!yaml_parser_parse(parser, &event)) return 0;
- pair.value = yaml_parser_load_node(parser, &event);
- if (!pair.value) return 0;
- if (!PUSH(parser,
- parser->document->nodes.start[index-1].data.mapping.pairs,
- pair)) return 0;
- if (!yaml_parser_parse(parser, &event)) return 0;
- }
-
- parser->document->nodes.start[index-1].end_mark = event.end_mark;
-
- return index;
-
-error:
- yaml_free(tag);
- yaml_free(first_event->data.mapping_start.anchor);
- return 0;
-}
-
diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c
deleted file mode 100644
index 32671b252c..0000000000
--- a/ext/psych/yaml/parser.c
+++ /dev/null
@@ -1,1370 +0,0 @@
-
-/*
- * The parser implements the following grammar:
- *
- * stream ::= STREAM-START implicit_document? explicit_document* STREAM-END
- * implicit_document ::= block_node DOCUMENT-END*
- * explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
- * block_node_or_indentless_sequence ::=
- * ALIAS
- * | properties (block_content | indentless_block_sequence)?
- * | block_content
- * | indentless_block_sequence
- * block_node ::= ALIAS
- * | properties block_content?
- * | block_content
- * flow_node ::= ALIAS
- * | properties flow_content?
- * | flow_content
- * properties ::= TAG ANCHOR? | ANCHOR TAG?
- * block_content ::= block_collection | flow_collection | SCALAR
- * flow_content ::= flow_collection | SCALAR
- * block_collection ::= block_sequence | block_mapping
- * flow_collection ::= flow_sequence | flow_mapping
- * block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
- * indentless_sequence ::= (BLOCK-ENTRY block_node?)+
- * block_mapping ::= BLOCK-MAPPING_START
- * ((KEY block_node_or_indentless_sequence?)?
- * (VALUE block_node_or_indentless_sequence?)?)*
- * BLOCK-END
- * flow_sequence ::= FLOW-SEQUENCE-START
- * (flow_sequence_entry FLOW-ENTRY)*
- * flow_sequence_entry?
- * FLOW-SEQUENCE-END
- * flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * flow_mapping ::= FLOW-MAPPING-START
- * (flow_mapping_entry FLOW-ENTRY)*
- * flow_mapping_entry?
- * FLOW-MAPPING-END
- * flow_mapping_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- */
-
-#include "yaml_private.h"
-
-/*
- * Peek the next token in the token queue.
- */
-
-#define PEEK_TOKEN(parser) \
- ((parser->token_available || yaml_parser_fetch_more_tokens(parser)) ? \
- parser->tokens.head : NULL)
-
-/*
- * Remove the next token from the queue (must be called after PEEK_TOKEN).
- */
-
-#define SKIP_TOKEN(parser) \
- (parser->token_available = 0, \
- parser->tokens_parsed ++, \
- parser->stream_end_produced = \
- (parser->tokens.head->type == YAML_STREAM_END_TOKEN), \
- parser->tokens.head ++)
-
-/*
- * Public API declarations.
- */
-
-YAML_DECLARE(int)
-yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
-
-/*
- * Error handling.
- */
-
-static int
-yaml_parser_set_parser_error(yaml_parser_t *parser,
- const char *problem, yaml_mark_t problem_mark);
-
-static int
-yaml_parser_set_parser_error_context(yaml_parser_t *parser,
- const char *context, yaml_mark_t context_mark,
- const char *problem, yaml_mark_t problem_mark);
-
-/*
- * State functions.
- */
-
-static int
-yaml_parser_state_machine(yaml_parser_t *parser, yaml_event_t *event);
-
-static int
-yaml_parser_parse_stream_start(yaml_parser_t *parser, yaml_event_t *event);
-
-static int
-yaml_parser_parse_document_start(yaml_parser_t *parser, yaml_event_t *event,
- int implicit);
-
-static int
-yaml_parser_parse_document_content(yaml_parser_t *parser, yaml_event_t *event);
-
-static int
-yaml_parser_parse_document_end(yaml_parser_t *parser, yaml_event_t *event);
-
-static int
-yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
- int block, int indentless_sequence);
-
-static int
-yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,
- yaml_event_t *event, int first);
-
-static int
-yaml_parser_parse_indentless_sequence_entry(yaml_parser_t *parser,
- yaml_event_t *event);
-
-static int
-yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,
- yaml_event_t *event, int first);
-
-static int
-yaml_parser_parse_block_mapping_value(yaml_parser_t *parser,
- yaml_event_t *event);
-
-static int
-yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
- yaml_event_t *event, int first);
-
-static int
-yaml_parser_parse_flow_sequence_entry_mapping_key(yaml_parser_t *parser,
- yaml_event_t *event);
-
-static int
-yaml_parser_parse_flow_sequence_entry_mapping_value(yaml_parser_t *parser,
- yaml_event_t *event);
-
-static int
-yaml_parser_parse_flow_sequence_entry_mapping_end(yaml_parser_t *parser,
- yaml_event_t *event);
-
-static int
-yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
- yaml_event_t *event, int first);
-
-static int
-yaml_parser_parse_flow_mapping_value(yaml_parser_t *parser,
- yaml_event_t *event, int empty);
-
-/*
- * Utility functions.
- */
-
-static int
-yaml_parser_process_empty_scalar(yaml_parser_t *parser,
- yaml_event_t *event, yaml_mark_t mark);
-
-static int
-yaml_parser_process_directives(yaml_parser_t *parser,
- yaml_version_directive_t **version_directive_ref,
- yaml_tag_directive_t **tag_directives_start_ref,
- yaml_tag_directive_t **tag_directives_end_ref);
-
-static int
-yaml_parser_append_tag_directive(yaml_parser_t *parser,
- yaml_tag_directive_t value, int allow_duplicates, yaml_mark_t mark);
-
-/*
- * Get the next event.
- */
-
-YAML_DECLARE(int)
-yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event)
-{
- assert(parser); /* Non-NULL parser object is expected. */
- assert(event); /* Non-NULL event object is expected. */
-
- /* Erase the event object. */
-
- memset(event, 0, sizeof(yaml_event_t));
-
- /* No events after the end of the stream or error. */
-
- if (parser->stream_end_produced || parser->error ||
- parser->state == YAML_PARSE_END_STATE) {
- return 1;
- }
-
- /* Generate the next event. */
-
- return yaml_parser_state_machine(parser, event);
-}
-
-/*
- * Set parser error.
- */
-
-static int
-yaml_parser_set_parser_error(yaml_parser_t *parser,
- const char *problem, yaml_mark_t problem_mark)
-{
- parser->error = YAML_PARSER_ERROR;
- parser->problem = problem;
- parser->problem_mark = problem_mark;
-
- return 0;
-}
-
-static int
-yaml_parser_set_parser_error_context(yaml_parser_t *parser,
- const char *context, yaml_mark_t context_mark,
- const char *problem, yaml_mark_t problem_mark)
-{
- parser->error = YAML_PARSER_ERROR;
- parser->context = context;
- parser->context_mark = context_mark;
- parser->problem = problem;
- parser->problem_mark = problem_mark;
-
- return 0;
-}
-
-
-/*
- * State dispatcher.
- */
-
-static int
-yaml_parser_state_machine(yaml_parser_t *parser, yaml_event_t *event)
-{
- switch (parser->state)
- {
- case YAML_PARSE_STREAM_START_STATE:
- return yaml_parser_parse_stream_start(parser, event);
-
- case YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE:
- return yaml_parser_parse_document_start(parser, event, 1);
-
- case YAML_PARSE_DOCUMENT_START_STATE:
- return yaml_parser_parse_document_start(parser, event, 0);
-
- case YAML_PARSE_DOCUMENT_CONTENT_STATE:
- return yaml_parser_parse_document_content(parser, event);
-
- case YAML_PARSE_DOCUMENT_END_STATE:
- return yaml_parser_parse_document_end(parser, event);
-
- case YAML_PARSE_BLOCK_NODE_STATE:
- return yaml_parser_parse_node(parser, event, 1, 0);
-
- case YAML_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE:
- return yaml_parser_parse_node(parser, event, 1, 1);
-
- case YAML_PARSE_FLOW_NODE_STATE:
- return yaml_parser_parse_node(parser, event, 0, 0);
-
- case YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE:
- return yaml_parser_parse_block_sequence_entry(parser, event, 1);
-
- case YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE:
- return yaml_parser_parse_block_sequence_entry(parser, event, 0);
-
- case YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE:
- return yaml_parser_parse_indentless_sequence_entry(parser, event);
-
- case YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE:
- return yaml_parser_parse_block_mapping_key(parser, event, 1);
-
- case YAML_PARSE_BLOCK_MAPPING_KEY_STATE:
- return yaml_parser_parse_block_mapping_key(parser, event, 0);
-
- case YAML_PARSE_BLOCK_MAPPING_VALUE_STATE:
- return yaml_parser_parse_block_mapping_value(parser, event);
-
- case YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE:
- return yaml_parser_parse_flow_sequence_entry(parser, event, 1);
-
- case YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE:
- return yaml_parser_parse_flow_sequence_entry(parser, event, 0);
-
- case YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE:
- return yaml_parser_parse_flow_sequence_entry_mapping_key(parser, event);
-
- case YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE:
- return yaml_parser_parse_flow_sequence_entry_mapping_value(parser, event);
-
- case YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE:
- return yaml_parser_parse_flow_sequence_entry_mapping_end(parser, event);
-
- case YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE:
- return yaml_parser_parse_flow_mapping_key(parser, event, 1);
-
- case YAML_PARSE_FLOW_MAPPING_KEY_STATE:
- return yaml_parser_parse_flow_mapping_key(parser, event, 0);
-
- case YAML_PARSE_FLOW_MAPPING_VALUE_STATE:
- return yaml_parser_parse_flow_mapping_value(parser, event, 0);
-
- case YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE:
- return yaml_parser_parse_flow_mapping_value(parser, event, 1);
-
- default:
- assert(1); /* Invalid state. */
- }
-
- return 0;
-}
-
-/*
- * Parse the production:
- * stream ::= STREAM-START implicit_document? explicit_document* STREAM-END
- * ************
- */
-
-static int
-yaml_parser_parse_stream_start(yaml_parser_t *parser, yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type != YAML_STREAM_START_TOKEN) {
- return yaml_parser_set_parser_error(parser,
- "did not find expected <stream-start>", token->start_mark);
- }
-
- parser->state = YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE;
- STREAM_START_EVENT_INIT(*event, token->data.stream_start.encoding,
- token->start_mark, token->start_mark);
- SKIP_TOKEN(parser);
-
- return 1;
-}
-
-/*
- * Parse the productions:
- * implicit_document ::= block_node DOCUMENT-END*
- * *
- * explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
- * *************************
- */
-
-static int
-yaml_parser_parse_document_start(yaml_parser_t *parser, yaml_event_t *event,
- int implicit)
-{
- yaml_token_t *token;
- yaml_version_directive_t *version_directive = NULL;
- struct {
- yaml_tag_directive_t *start;
- yaml_tag_directive_t *end;
- } tag_directives = { NULL, NULL };
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- /* Parse extra document end indicators. */
-
- if (!implicit)
- {
- while (token->type == YAML_DOCUMENT_END_TOKEN) {
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- }
- }
-
- /* Parse an implicit document. */
-
- if (implicit && token->type != YAML_VERSION_DIRECTIVE_TOKEN &&
- token->type != YAML_TAG_DIRECTIVE_TOKEN &&
- token->type != YAML_DOCUMENT_START_TOKEN &&
- token->type != YAML_STREAM_END_TOKEN)
- {
- if (!yaml_parser_process_directives(parser, NULL, NULL, NULL))
- return 0;
- if (!PUSH(parser, parser->states, YAML_PARSE_DOCUMENT_END_STATE))
- return 0;
- parser->state = YAML_PARSE_BLOCK_NODE_STATE;
- DOCUMENT_START_EVENT_INIT(*event, NULL, NULL, NULL, 1,
- token->start_mark, token->start_mark);
- return 1;
- }
-
- /* Parse an explicit document. */
-
- else if (token->type != YAML_STREAM_END_TOKEN)
- {
- yaml_mark_t start_mark, end_mark;
- start_mark = token->start_mark;
- if (!yaml_parser_process_directives(parser, &version_directive,
- &tag_directives.start, &tag_directives.end))
- return 0;
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
- if (token->type != YAML_DOCUMENT_START_TOKEN) {
- yaml_parser_set_parser_error(parser,
- "did not find expected <document start>", token->start_mark);
- goto error;
- }
- if (!PUSH(parser, parser->states, YAML_PARSE_DOCUMENT_END_STATE))
- goto error;
- parser->state = YAML_PARSE_DOCUMENT_CONTENT_STATE;
- end_mark = token->end_mark;
- DOCUMENT_START_EVENT_INIT(*event, version_directive,
- tag_directives.start, tag_directives.end, 0,
- start_mark, end_mark);
- SKIP_TOKEN(parser);
- version_directive = NULL;
- tag_directives.start = tag_directives.end = NULL;
- return 1;
- }
-
- /* Parse the stream end. */
-
- else
- {
- parser->state = YAML_PARSE_END_STATE;
- STREAM_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
- }
-
-error:
- yaml_free(version_directive);
- while (tag_directives.start != tag_directives.end) {
- yaml_free(tag_directives.end[-1].handle);
- yaml_free(tag_directives.end[-1].prefix);
- tag_directives.end --;
- }
- yaml_free(tag_directives.start);
- return 0;
-}
-
-/*
- * Parse the productions:
- * explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
- * ***********
- */
-
-static int
-yaml_parser_parse_document_content(yaml_parser_t *parser, yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_VERSION_DIRECTIVE_TOKEN ||
- token->type == YAML_TAG_DIRECTIVE_TOKEN ||
- token->type == YAML_DOCUMENT_START_TOKEN ||
- token->type == YAML_DOCUMENT_END_TOKEN ||
- token->type == YAML_STREAM_END_TOKEN) {
- parser->state = POP(parser, parser->states);
- return yaml_parser_process_empty_scalar(parser, event,
- token->start_mark);
- }
- else {
- return yaml_parser_parse_node(parser, event, 1, 0);
- }
-}
-
-/*
- * Parse the productions:
- * implicit_document ::= block_node DOCUMENT-END*
- * *************
- * explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
- * *************
- */
-
-static int
-yaml_parser_parse_document_end(yaml_parser_t *parser, yaml_event_t *event)
-{
- yaml_token_t *token;
- yaml_mark_t start_mark, end_mark;
- int implicit = 1;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- start_mark = end_mark = token->start_mark;
-
- if (token->type == YAML_DOCUMENT_END_TOKEN) {
- end_mark = token->end_mark;
- SKIP_TOKEN(parser);
- implicit = 0;
- }
-
- while (!STACK_EMPTY(parser, parser->tag_directives)) {
- yaml_tag_directive_t tag_directive = POP(parser, parser->tag_directives);
- yaml_free(tag_directive.handle);
- yaml_free(tag_directive.prefix);
- }
-
- parser->state = YAML_PARSE_DOCUMENT_START_STATE;
- DOCUMENT_END_EVENT_INIT(*event, implicit, start_mark, end_mark);
-
- return 1;
-}
-
-/*
- * Parse the productions:
- * block_node_or_indentless_sequence ::=
- * ALIAS
- * *****
- * | properties (block_content | indentless_block_sequence)?
- * ********** *
- * | block_content | indentless_block_sequence
- * *
- * block_node ::= ALIAS
- * *****
- * | properties block_content?
- * ********** *
- * | block_content
- * *
- * flow_node ::= ALIAS
- * *****
- * | properties flow_content?
- * ********** *
- * | flow_content
- * *
- * properties ::= TAG ANCHOR? | ANCHOR TAG?
- * *************************
- * block_content ::= block_collection | flow_collection | SCALAR
- * ******
- * flow_content ::= flow_collection | SCALAR
- * ******
- */
-
-static int
-yaml_parser_parse_node(yaml_parser_t *parser, yaml_event_t *event,
- int block, int indentless_sequence)
-{
- yaml_token_t *token;
- yaml_char_t *anchor = NULL;
- yaml_char_t *tag_handle = NULL;
- yaml_char_t *tag_suffix = NULL;
- yaml_char_t *tag = NULL;
- yaml_mark_t start_mark, end_mark, tag_mark;
- int implicit;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_ALIAS_TOKEN)
- {
- parser->state = POP(parser, parser->states);
- ALIAS_EVENT_INIT(*event, token->data.alias.value,
- token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
- }
-
- else
- {
- start_mark = end_mark = token->start_mark;
-
- if (token->type == YAML_ANCHOR_TOKEN)
- {
- anchor = token->data.anchor.value;
- start_mark = token->start_mark;
- end_mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
- if (token->type == YAML_TAG_TOKEN)
- {
- tag_handle = token->data.tag.handle;
- tag_suffix = token->data.tag.suffix;
- tag_mark = token->start_mark;
- end_mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
- }
- }
- else if (token->type == YAML_TAG_TOKEN)
- {
- tag_handle = token->data.tag.handle;
- tag_suffix = token->data.tag.suffix;
- start_mark = tag_mark = token->start_mark;
- end_mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
- if (token->type == YAML_ANCHOR_TOKEN)
- {
- anchor = token->data.anchor.value;
- end_mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
- }
- }
-
- if (tag_handle) {
- if (!*tag_handle) {
- tag = tag_suffix;
- yaml_free(tag_handle);
- tag_handle = tag_suffix = NULL;
- }
- else {
- yaml_tag_directive_t *tag_directive;
- for (tag_directive = parser->tag_directives.start;
- tag_directive != parser->tag_directives.top;
- tag_directive ++) {
- if (strcmp((char *)tag_directive->handle, (char *)tag_handle) == 0) {
- size_t prefix_len = strlen((char *)tag_directive->prefix);
- size_t suffix_len = strlen((char *)tag_suffix);
- tag = yaml_malloc(prefix_len+suffix_len+1);
- if (!tag) {
- parser->error = YAML_MEMORY_ERROR;
- goto error;
- }
- memcpy(tag, tag_directive->prefix, prefix_len);
- memcpy(tag+prefix_len, tag_suffix, suffix_len);
- tag[prefix_len+suffix_len] = '\0';
- yaml_free(tag_handle);
- yaml_free(tag_suffix);
- tag_handle = tag_suffix = NULL;
- break;
- }
- }
- if (!tag) {
- yaml_parser_set_parser_error_context(parser,
- "while parsing a node", start_mark,
- "found undefined tag handle", tag_mark);
- goto error;
- }
- }
- }
-
- implicit = (!tag || !*tag);
- if (indentless_sequence && token->type == YAML_BLOCK_ENTRY_TOKEN) {
- end_mark = token->end_mark;
- parser->state = YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE;
- SEQUENCE_START_EVENT_INIT(*event, anchor, tag, implicit,
- YAML_BLOCK_SEQUENCE_STYLE, start_mark, end_mark);
- return 1;
- }
- else {
- if (token->type == YAML_SCALAR_TOKEN) {
- int plain_implicit = 0;
- int quoted_implicit = 0;
- end_mark = token->end_mark;
- if ((token->data.scalar.style == YAML_PLAIN_SCALAR_STYLE && !tag)
- || (tag && strcmp((char *)tag, "!") == 0)) {
- plain_implicit = 1;
- }
- else if (!tag) {
- quoted_implicit = 1;
- }
- parser->state = POP(parser, parser->states);
- SCALAR_EVENT_INIT(*event, anchor, tag,
- token->data.scalar.value, token->data.scalar.length,
- plain_implicit, quoted_implicit,
- token->data.scalar.style, start_mark, end_mark);
- SKIP_TOKEN(parser);
- return 1;
- }
- else if (token->type == YAML_FLOW_SEQUENCE_START_TOKEN) {
- end_mark = token->end_mark;
- parser->state = YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE;
- SEQUENCE_START_EVENT_INIT(*event, anchor, tag, implicit,
- YAML_FLOW_SEQUENCE_STYLE, start_mark, end_mark);
- return 1;
- }
- else if (token->type == YAML_FLOW_MAPPING_START_TOKEN) {
- end_mark = token->end_mark;
- parser->state = YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE;
- MAPPING_START_EVENT_INIT(*event, anchor, tag, implicit,
- YAML_FLOW_MAPPING_STYLE, start_mark, end_mark);
- return 1;
- }
- else if (block && token->type == YAML_BLOCK_SEQUENCE_START_TOKEN) {
- end_mark = token->end_mark;
- parser->state = YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE;
- SEQUENCE_START_EVENT_INIT(*event, anchor, tag, implicit,
- YAML_BLOCK_SEQUENCE_STYLE, start_mark, end_mark);
- return 1;
- }
- else if (block && token->type == YAML_BLOCK_MAPPING_START_TOKEN) {
- end_mark = token->end_mark;
- parser->state = YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE;
- MAPPING_START_EVENT_INIT(*event, anchor, tag, implicit,
- YAML_BLOCK_MAPPING_STYLE, start_mark, end_mark);
- return 1;
- }
- else if (anchor || tag) {
- yaml_char_t *value = yaml_malloc(1);
- if (!value) {
- parser->error = YAML_MEMORY_ERROR;
- goto error;
- }
- value[0] = '\0';
- parser->state = POP(parser, parser->states);
- SCALAR_EVENT_INIT(*event, anchor, tag, value, 0,
- implicit, 0, YAML_PLAIN_SCALAR_STYLE,
- start_mark, end_mark);
- return 1;
- }
- else {
- yaml_parser_set_parser_error_context(parser,
- (block ? "while parsing a block node"
- : "while parsing a flow node"), start_mark,
- "did not find expected node content", token->start_mark);
- goto error;
- }
- }
- }
-
-error:
- yaml_free(anchor);
- yaml_free(tag_handle);
- yaml_free(tag_suffix);
- yaml_free(tag);
-
- return 0;
-}
-
-/*
- * Parse the productions:
- * block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
- * ******************** *********** * *********
- */
-
-static int
-yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,
- yaml_event_t *event, int first)
-{
- yaml_token_t *token;
-
- if (first) {
- token = PEEK_TOKEN(parser);
- if (!PUSH(parser, parser->marks, token->start_mark))
- return 0;
- SKIP_TOKEN(parser);
- }
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_BLOCK_ENTRY_TOKEN)
- {
- yaml_mark_t mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_BLOCK_ENTRY_TOKEN &&
- token->type != YAML_BLOCK_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 1, 0);
- }
- else {
- parser->state = YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE;
- return yaml_parser_process_empty_scalar(parser, event, mark);
- }
- }
-
- else if (token->type == YAML_BLOCK_END_TOKEN)
- {
- parser->state = POP(parser, parser->states);
- (void)POP(parser, parser->marks);
- SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
- }
-
- else
- {
- return yaml_parser_set_parser_error_context(parser,
- "while parsing a block collection", POP(parser, parser->marks),
- "did not find expected '-' indicator", token->start_mark);
- }
-}
-
-/*
- * Parse the productions:
- * indentless_sequence ::= (BLOCK-ENTRY block_node?)+
- * *********** *
- */
-
-static int
-yaml_parser_parse_indentless_sequence_entry(yaml_parser_t *parser,
- yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_BLOCK_ENTRY_TOKEN)
- {
- yaml_mark_t mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_BLOCK_ENTRY_TOKEN &&
- token->type != YAML_KEY_TOKEN &&
- token->type != YAML_VALUE_TOKEN &&
- token->type != YAML_BLOCK_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 1, 0);
- }
- else {
- parser->state = YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE;
- return yaml_parser_process_empty_scalar(parser, event, mark);
- }
- }
-
- else
- {
- parser->state = POP(parser, parser->states);
- SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->start_mark);
- return 1;
- }
-}
-
-/*
- * Parse the productions:
- * block_mapping ::= BLOCK-MAPPING_START
- * *******************
- * ((KEY block_node_or_indentless_sequence?)?
- * *** *
- * (VALUE block_node_or_indentless_sequence?)?)*
- *
- * BLOCK-END
- * *********
- */
-
-static int
-yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,
- yaml_event_t *event, int first)
-{
- yaml_token_t *token;
-
- if (first) {
- token = PEEK_TOKEN(parser);
- if (!PUSH(parser, parser->marks, token->start_mark))
- return 0;
- SKIP_TOKEN(parser);
- }
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_KEY_TOKEN)
- {
- yaml_mark_t mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_KEY_TOKEN &&
- token->type != YAML_VALUE_TOKEN &&
- token->type != YAML_BLOCK_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_BLOCK_MAPPING_VALUE_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 1, 1);
- }
- else {
- parser->state = YAML_PARSE_BLOCK_MAPPING_VALUE_STATE;
- return yaml_parser_process_empty_scalar(parser, event, mark);
- }
- }
-
- else if (token->type == YAML_BLOCK_END_TOKEN)
- {
- parser->state = POP(parser, parser->states);
- (void)POP(parser, parser->marks);
- MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
- }
-
- else
- {
- return yaml_parser_set_parser_error_context(parser,
- "while parsing a block mapping", POP(parser, parser->marks),
- "did not find expected key", token->start_mark);
- }
-}
-
-/*
- * Parse the productions:
- * block_mapping ::= BLOCK-MAPPING_START
- *
- * ((KEY block_node_or_indentless_sequence?)?
- *
- * (VALUE block_node_or_indentless_sequence?)?)*
- * ***** *
- * BLOCK-END
- *
- */
-
-static int
-yaml_parser_parse_block_mapping_value(yaml_parser_t *parser,
- yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_VALUE_TOKEN)
- {
- yaml_mark_t mark = token->end_mark;
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_KEY_TOKEN &&
- token->type != YAML_VALUE_TOKEN &&
- token->type != YAML_BLOCK_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_BLOCK_MAPPING_KEY_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 1, 1);
- }
- else {
- parser->state = YAML_PARSE_BLOCK_MAPPING_KEY_STATE;
- return yaml_parser_process_empty_scalar(parser, event, mark);
- }
- }
-
- else
- {
- parser->state = YAML_PARSE_BLOCK_MAPPING_KEY_STATE;
- return yaml_parser_process_empty_scalar(parser, event, token->start_mark);
- }
-}
-
-/*
- * Parse the productions:
- * flow_sequence ::= FLOW-SEQUENCE-START
- * *******************
- * (flow_sequence_entry FLOW-ENTRY)*
- * * **********
- * flow_sequence_entry?
- * *
- * FLOW-SEQUENCE-END
- * *****************
- * flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * *
- */
-
-static int
-yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
- yaml_event_t *event, int first)
-{
- yaml_token_t *token;
-
- if (first) {
- token = PEEK_TOKEN(parser);
- if (!PUSH(parser, parser->marks, token->start_mark))
- return 0;
- SKIP_TOKEN(parser);
- }
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type != YAML_FLOW_SEQUENCE_END_TOKEN)
- {
- if (!first) {
- if (token->type == YAML_FLOW_ENTRY_TOKEN) {
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- }
- else {
- return yaml_parser_set_parser_error_context(parser,
- "while parsing a flow sequence", POP(parser, parser->marks),
- "did not find expected ',' or ']'", token->start_mark);
- }
- }
-
- if (token->type == YAML_KEY_TOKEN) {
- parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE;
- MAPPING_START_EVENT_INIT(*event, NULL, NULL,
- 1, YAML_FLOW_MAPPING_STYLE,
- token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
- }
-
- else if (token->type != YAML_FLOW_SEQUENCE_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 0, 0);
- }
- }
-
- parser->state = POP(parser, parser->states);
- (void)POP(parser, parser->marks);
- SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
-}
-
-/*
- * Parse the productions:
- * flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * *** *
- */
-
-static int
-yaml_parser_parse_flow_sequence_entry_mapping_key(yaml_parser_t *parser,
- yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type != YAML_VALUE_TOKEN && token->type != YAML_FLOW_ENTRY_TOKEN
- && token->type != YAML_FLOW_SEQUENCE_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 0, 0);
- }
- else {
- yaml_mark_t mark = token->end_mark;
- SKIP_TOKEN(parser);
- parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE;
- return yaml_parser_process_empty_scalar(parser, event, mark);
- }
-}
-
-/*
- * Parse the productions:
- * flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * ***** *
- */
-
-static int
-yaml_parser_parse_flow_sequence_entry_mapping_value(yaml_parser_t *parser,
- yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type == YAML_VALUE_TOKEN) {
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_FLOW_ENTRY_TOKEN
- && token->type != YAML_FLOW_SEQUENCE_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 0, 0);
- }
- }
- parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE;
- return yaml_parser_process_empty_scalar(parser, event, token->start_mark);
-}
-
-/*
- * Parse the productions:
- * flow_sequence_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * *
- */
-
-static int
-yaml_parser_parse_flow_sequence_entry_mapping_end(yaml_parser_t *parser,
- yaml_event_t *event)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- parser->state = YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE;
-
- MAPPING_END_EVENT_INIT(*event, token->start_mark, token->start_mark);
- return 1;
-}
-
-/*
- * Parse the productions:
- * flow_mapping ::= FLOW-MAPPING-START
- * ******************
- * (flow_mapping_entry FLOW-ENTRY)*
- * * **********
- * flow_mapping_entry?
- * ******************
- * FLOW-MAPPING-END
- * ****************
- * flow_mapping_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * * *** *
- */
-
-static int
-yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
- yaml_event_t *event, int first)
-{
- yaml_token_t *token;
-
- if (first) {
- token = PEEK_TOKEN(parser);
- if (!PUSH(parser, parser->marks, token->start_mark))
- return 0;
- SKIP_TOKEN(parser);
- }
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (token->type != YAML_FLOW_MAPPING_END_TOKEN)
- {
- if (!first) {
- if (token->type == YAML_FLOW_ENTRY_TOKEN) {
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- }
- else {
- return yaml_parser_set_parser_error_context(parser,
- "while parsing a flow mapping", POP(parser, parser->marks),
- "did not find expected ',' or '}'", token->start_mark);
- }
- }
-
- if (token->type == YAML_KEY_TOKEN) {
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_VALUE_TOKEN
- && token->type != YAML_FLOW_ENTRY_TOKEN
- && token->type != YAML_FLOW_MAPPING_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_FLOW_MAPPING_VALUE_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 0, 0);
- }
- else {
- parser->state = YAML_PARSE_FLOW_MAPPING_VALUE_STATE;
- return yaml_parser_process_empty_scalar(parser, event,
- token->start_mark);
- }
- }
- else if (token->type != YAML_FLOW_MAPPING_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 0, 0);
- }
- }
-
- parser->state = POP(parser, parser->states);
- (void)POP(parser, parser->marks);
- MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
- SKIP_TOKEN(parser);
- return 1;
-}
-
-/*
- * Parse the productions:
- * flow_mapping_entry ::= flow_node | KEY flow_node? (VALUE flow_node?)?
- * * ***** *
- */
-
-static int
-yaml_parser_parse_flow_mapping_value(yaml_parser_t *parser,
- yaml_event_t *event, int empty)
-{
- yaml_token_t *token;
-
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
-
- if (empty) {
- parser->state = YAML_PARSE_FLOW_MAPPING_KEY_STATE;
- return yaml_parser_process_empty_scalar(parser, event,
- token->start_mark);
- }
-
- if (token->type == YAML_VALUE_TOKEN) {
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) return 0;
- if (token->type != YAML_FLOW_ENTRY_TOKEN
- && token->type != YAML_FLOW_MAPPING_END_TOKEN) {
- if (!PUSH(parser, parser->states,
- YAML_PARSE_FLOW_MAPPING_KEY_STATE))
- return 0;
- return yaml_parser_parse_node(parser, event, 0, 0);
- }
- }
-
- parser->state = YAML_PARSE_FLOW_MAPPING_KEY_STATE;
- return yaml_parser_process_empty_scalar(parser, event, token->start_mark);
-}
-
-/*
- * Generate an empty scalar event.
- */
-
-static int
-yaml_parser_process_empty_scalar(yaml_parser_t *parser, yaml_event_t *event,
- yaml_mark_t mark)
-{
- yaml_char_t *value;
-
- value = yaml_malloc(1);
- if (!value) {
- parser->error = YAML_MEMORY_ERROR;
- return 0;
- }
- value[0] = '\0';
-
- SCALAR_EVENT_INIT(*event, NULL, NULL, value, 0,
- 1, 0, YAML_PLAIN_SCALAR_STYLE, mark, mark);
-
- return 1;
-}
-
-/*
- * Parse directives.
- */
-
-static int
-yaml_parser_process_directives(yaml_parser_t *parser,
- yaml_version_directive_t **version_directive_ref,
- yaml_tag_directive_t **tag_directives_start_ref,
- yaml_tag_directive_t **tag_directives_end_ref)
-{
- yaml_tag_directive_t default_tag_directives[] = {
- {(yaml_char_t *)"!", (yaml_char_t *)"!"},
- {(yaml_char_t *)"!!", (yaml_char_t *)"tag:yaml.org,2002:"},
- {NULL, NULL}
- };
- yaml_tag_directive_t *default_tag_directive;
- yaml_version_directive_t *version_directive = NULL;
- struct {
- yaml_tag_directive_t *start;
- yaml_tag_directive_t *end;
- yaml_tag_directive_t *top;
- } tag_directives = { NULL, NULL, NULL };
- yaml_token_t *token;
-
- if (!STACK_INIT(parser, tag_directives, INITIAL_STACK_SIZE))
- goto error;
-
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
-
- while (token->type == YAML_VERSION_DIRECTIVE_TOKEN ||
- token->type == YAML_TAG_DIRECTIVE_TOKEN)
- {
- if (token->type == YAML_VERSION_DIRECTIVE_TOKEN) {
- if (version_directive) {
- yaml_parser_set_parser_error(parser,
- "found duplicate %YAML directive", token->start_mark);
- goto error;
- }
- if (token->data.version_directive.major != 1
- || token->data.version_directive.minor != 1) {
- yaml_parser_set_parser_error(parser,
- "found incompatible YAML document", token->start_mark);
- goto error;
- }
- version_directive = yaml_malloc(sizeof(yaml_version_directive_t));
- if (!version_directive) {
- parser->error = YAML_MEMORY_ERROR;
- goto error;
- }
- version_directive->major = token->data.version_directive.major;
- version_directive->minor = token->data.version_directive.minor;
- }
-
- else if (token->type == YAML_TAG_DIRECTIVE_TOKEN) {
- yaml_tag_directive_t value;
- value.handle = token->data.tag_directive.handle;
- value.prefix = token->data.tag_directive.prefix;
-
- if (!yaml_parser_append_tag_directive(parser, value, 0,
- token->start_mark))
- goto error;
- if (!PUSH(parser, tag_directives, value))
- goto error;
- }
-
- SKIP_TOKEN(parser);
- token = PEEK_TOKEN(parser);
- if (!token) goto error;
- }
-
- for (default_tag_directive = default_tag_directives;
- default_tag_directive->handle; default_tag_directive++) {
- if (!yaml_parser_append_tag_directive(parser, *default_tag_directive, 1,
- token->start_mark))
- goto error;
- }
-
- if (version_directive_ref) {
- *version_directive_ref = version_directive;
- }
- if (tag_directives_start_ref) {
- if (STACK_EMPTY(parser, tag_directives)) {
- *tag_directives_start_ref = *tag_directives_end_ref = NULL;
- STACK_DEL(parser, tag_directives);
- }
- else {
- *tag_directives_start_ref = tag_directives.start;
- *tag_directives_end_ref = tag_directives.top;
- }
- }
- else {
- STACK_DEL(parser, tag_directives);
- }
-
- return 1;
-
-error:
- yaml_free(version_directive);
- while (!STACK_EMPTY(parser, tag_directives)) {
- yaml_tag_directive_t tag_directive = POP(parser, tag_directives);
- yaml_free(tag_directive.handle);
- yaml_free(tag_directive.prefix);
- }
- STACK_DEL(parser, tag_directives);
- return 0;
-}
-
-/*
- * Append a tag directive to the directives stack.
- */
-
-static int
-yaml_parser_append_tag_directive(yaml_parser_t *parser,
- yaml_tag_directive_t value, int allow_duplicates, yaml_mark_t mark)
-{
- yaml_tag_directive_t *tag_directive;
- yaml_tag_directive_t copy = { NULL, NULL };
-
- for (tag_directive = parser->tag_directives.start;
- tag_directive != parser->tag_directives.top; tag_directive ++) {
- if (strcmp((char *)value.handle, (char *)tag_directive->handle) == 0) {
- if (allow_duplicates)
- return 1;
- return yaml_parser_set_parser_error(parser,
- "found duplicate %TAG directive", mark);
- }
- }
-
- copy.handle = yaml_strdup(value.handle);
- copy.prefix = yaml_strdup(value.prefix);
- if (!copy.handle || !copy.prefix) {
- parser->error = YAML_MEMORY_ERROR;
- goto error;
- }
-
- if (!PUSH(parser, parser->tag_directives, copy))
- goto error;
-
- return 1;
-
-error:
- yaml_free(copy.handle);
- yaml_free(copy.prefix);
- return 0;
-}
-
diff --git a/ext/psych/yaml/reader.c b/ext/psych/yaml/reader.c
deleted file mode 100644
index f1a06deb9d..0000000000
--- a/ext/psych/yaml/reader.c
+++ /dev/null
@@ -1,469 +0,0 @@
-
-#include "yaml_private.h"
-
-/*
- * Declarations.
- */
-
-static int
-yaml_parser_set_reader_error(yaml_parser_t *parser, const char *problem,
- size_t offset, int value);
-
-static int
-yaml_parser_update_raw_buffer(yaml_parser_t *parser);
-
-static int
-yaml_parser_determine_encoding(yaml_parser_t *parser);
-
-YAML_DECLARE(int)
-yaml_parser_update_buffer(yaml_parser_t *parser, size_t length);
-
-/*
- * Set the reader error and return 0.
- */
-
-static int
-yaml_parser_set_reader_error(yaml_parser_t *parser, const char *problem,
- size_t offset, int value)
-{
- parser->error = YAML_READER_ERROR;
- parser->problem = problem;
- parser->problem_offset = offset;
- parser->problem_value = value;
-
- return 0;
-}
-
-/*
- * Byte order marks.
- */
-
-#define BOM_UTF8 "\xef\xbb\xbf"
-#define BOM_UTF16LE "\xff\xfe"
-#define BOM_UTF16BE "\xfe\xff"
-
-/*
- * Determine the input stream encoding by checking the BOM symbol. If no BOM is
- * found, the UTF-8 encoding is assumed. Return 1 on success, 0 on failure.
- */
-
-static int
-yaml_parser_determine_encoding(yaml_parser_t *parser)
-{
- /* Ensure that we had enough bytes in the raw buffer. */
-
- while (!parser->eof
- && parser->raw_buffer.last - parser->raw_buffer.pointer < 3) {
- if (!yaml_parser_update_raw_buffer(parser)) {
- return 0;
- }
- }
-
- /* Determine the encoding. */
-
- if (parser->raw_buffer.last - parser->raw_buffer.pointer >= 2
- && !memcmp(parser->raw_buffer.pointer, BOM_UTF16LE, 2)) {
- parser->encoding = YAML_UTF16LE_ENCODING;
- parser->raw_buffer.pointer += 2;
- parser->offset += 2;
- }
- else if (parser->raw_buffer.last - parser->raw_buffer.pointer >= 2
- && !memcmp(parser->raw_buffer.pointer, BOM_UTF16BE, 2)) {
- parser->encoding = YAML_UTF16BE_ENCODING;
- parser->raw_buffer.pointer += 2;
- parser->offset += 2;
- }
- else if (parser->raw_buffer.last - parser->raw_buffer.pointer >= 3
- && !memcmp(parser->raw_buffer.pointer, BOM_UTF8, 3)) {
- parser->encoding = YAML_UTF8_ENCODING;
- parser->raw_buffer.pointer += 3;
- parser->offset += 3;
- }
- else {
- parser->encoding = YAML_UTF8_ENCODING;
- }
-
- return 1;
-}
-
-/*
- * Update the raw buffer.
- */
-
-static int
-yaml_parser_update_raw_buffer(yaml_parser_t *parser)
-{
- size_t size_read = 0;
-
- /* Return if the raw buffer is full. */
-
- if (parser->raw_buffer.start == parser->raw_buffer.pointer
- && parser->raw_buffer.last == parser->raw_buffer.end)
- return 1;
-
- /* Return on EOF. */
-
- if (parser->eof) return 1;
-
- /* Move the remaining bytes in the raw buffer to the beginning. */
-
- if (parser->raw_buffer.start < parser->raw_buffer.pointer
- && parser->raw_buffer.pointer < parser->raw_buffer.last) {
- memmove(parser->raw_buffer.start, parser->raw_buffer.pointer,
- parser->raw_buffer.last - parser->raw_buffer.pointer);
- }
- parser->raw_buffer.last -=
- parser->raw_buffer.pointer - parser->raw_buffer.start;
- parser->raw_buffer.pointer = parser->raw_buffer.start;
-
- /* Call the read handler to fill the buffer. */
-
- if (!parser->read_handler(parser->read_handler_data, parser->raw_buffer.last,
- parser->raw_buffer.end - parser->raw_buffer.last, &size_read)) {
- return yaml_parser_set_reader_error(parser, "input error",
- parser->offset, -1);
- }
- parser->raw_buffer.last += size_read;
- if (!size_read) {
- parser->eof = 1;
- }
-
- return 1;
-}
-
-/*
- * Ensure that the buffer contains at least `length` characters.
- * Return 1 on success, 0 on failure.
- *
- * The length is supposed to be significantly less that the buffer size.
- */
-
-YAML_DECLARE(int)
-yaml_parser_update_buffer(yaml_parser_t *parser, size_t length)
-{
- int first = 1;
-
- assert(parser->read_handler); /* Read handler must be set. */
-
- /* If the EOF flag is set and the raw buffer is empty, do nothing. */
-
- if (parser->eof && parser->raw_buffer.pointer == parser->raw_buffer.last)
- return 1;
-
- /* Return if the buffer contains enough characters. */
-
- if (parser->unread >= length)
- return 1;
-
- /* Determine the input encoding if it is not known yet. */
-
- if (!parser->encoding) {
- if (!yaml_parser_determine_encoding(parser))
- return 0;
- }
-
- /* Move the unread characters to the beginning of the buffer. */
-
- if (parser->buffer.start < parser->buffer.pointer
- && parser->buffer.pointer < parser->buffer.last) {
- size_t size = parser->buffer.last - parser->buffer.pointer;
- memmove(parser->buffer.start, parser->buffer.pointer, size);
- parser->buffer.pointer = parser->buffer.start;
- parser->buffer.last = parser->buffer.start + size;
- }
- else if (parser->buffer.pointer == parser->buffer.last) {
- parser->buffer.pointer = parser->buffer.start;
- parser->buffer.last = parser->buffer.start;
- }
-
- /* Fill the buffer until it has enough characters. */
-
- while (parser->unread < length)
- {
- /* Fill the raw buffer if necessary. */
-
- if (!first || parser->raw_buffer.pointer == parser->raw_buffer.last) {
- if (!yaml_parser_update_raw_buffer(parser)) return 0;
- }
- first = 0;
-
- /* Decode the raw buffer. */
-
- while (parser->raw_buffer.pointer != parser->raw_buffer.last)
- {
- unsigned int value = 0, value2 = 0;
- int incomplete = 0;
- unsigned char octet;
- unsigned int width = 0;
- int low, high;
- size_t k;
- size_t raw_unread = parser->raw_buffer.last - parser->raw_buffer.pointer;
-
- /* Decode the next character. */
-
- switch (parser->encoding)
- {
- case YAML_UTF8_ENCODING:
-
- /*
- * Decode a UTF-8 character. Check RFC 3629
- * (http://www.ietf.org/rfc/rfc3629.txt) for more details.
- *
- * The following table (taken from the RFC) is used for
- * decoding.
- *
- * Char. number range | UTF-8 octet sequence
- * (hexadecimal) | (binary)
- * --------------------+------------------------------------
- * 0000 0000-0000 007F | 0xxxxxxx
- * 0000 0080-0000 07FF | 110xxxxx 10xxxxxx
- * 0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
- * 0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- *
- * Additionally, the characters in the range 0xD800-0xDFFF
- * are prohibited as they are reserved for use with UTF-16
- * surrogate pairs.
- */
-
- /* Determine the length of the UTF-8 sequence. */
-
- octet = parser->raw_buffer.pointer[0];
- width = (octet & 0x80) == 0x00 ? 1 :
- (octet & 0xE0) == 0xC0 ? 2 :
- (octet & 0xF0) == 0xE0 ? 3 :
- (octet & 0xF8) == 0xF0 ? 4 : 0;
-
- /* Check if the leading octet is valid. */
-
- if (!width)
- return yaml_parser_set_reader_error(parser,
- "invalid leading UTF-8 octet",
- parser->offset, octet);
-
- /* Check if the raw buffer contains an incomplete character. */
-
- if (width > raw_unread) {
- if (parser->eof) {
- return yaml_parser_set_reader_error(parser,
- "incomplete UTF-8 octet sequence",
- parser->offset, -1);
- }
- incomplete = 1;
- break;
- }
-
- /* Decode the leading octet. */
-
- value = (octet & 0x80) == 0x00 ? octet & 0x7F :
- (octet & 0xE0) == 0xC0 ? octet & 0x1F :
- (octet & 0xF0) == 0xE0 ? octet & 0x0F :
- (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
-
- /* Check and decode the trailing octets. */
-
- for (k = 1; k < width; k ++)
- {
- octet = parser->raw_buffer.pointer[k];
-
- /* Check if the octet is valid. */
-
- if ((octet & 0xC0) != 0x80)
- return yaml_parser_set_reader_error(parser,
- "invalid trailing UTF-8 octet",
- parser->offset+k, octet);
-
- /* Decode the octet. */
-
- value = (value << 6) + (octet & 0x3F);
- }
-
- /* Check the length of the sequence against the value. */
-
- if (!((width == 1) ||
- (width == 2 && value >= 0x80) ||
- (width == 3 && value >= 0x800) ||
- (width == 4 && value >= 0x10000)))
- return yaml_parser_set_reader_error(parser,
- "invalid length of a UTF-8 sequence",
- parser->offset, -1);
-
- /* Check the range of the value. */
-
- if ((value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF)
- return yaml_parser_set_reader_error(parser,
- "invalid Unicode character",
- parser->offset, value);
-
- break;
-
- case YAML_UTF16LE_ENCODING:
- case YAML_UTF16BE_ENCODING:
-
- low = (parser->encoding == YAML_UTF16LE_ENCODING ? 0 : 1);
- high = (parser->encoding == YAML_UTF16LE_ENCODING ? 1 : 0);
-
- /*
- * The UTF-16 encoding is not as simple as one might
- * naively think. Check RFC 2781
- * (http://www.ietf.org/rfc/rfc2781.txt).
- *
- * Normally, two subsequent bytes describe a Unicode
- * character. However a special technique (called a
- * surrogate pair) is used for specifying character
- * values larger than 0xFFFF.
- *
- * A surrogate pair consists of two pseudo-characters:
- * high surrogate area (0xD800-0xDBFF)
- * low surrogate area (0xDC00-0xDFFF)
- *
- * The following formulas are used for decoding
- * and encoding characters using surrogate pairs:
- *
- * U = U' + 0x10000 (0x01 00 00 <= U <= 0x10 FF FF)
- * U' = yyyyyyyyyyxxxxxxxxxx (0 <= U' <= 0x0F FF FF)
- * W1 = 110110yyyyyyyyyy
- * W2 = 110111xxxxxxxxxx
- *
- * where U is the character value, W1 is the high surrogate
- * area, W2 is the low surrogate area.
- */
-
- /* Check for incomplete UTF-16 character. */
-
- if (raw_unread < 2) {
- if (parser->eof) {
- return yaml_parser_set_reader_error(parser,
- "incomplete UTF-16 character",
- parser->offset, -1);
- }
- incomplete = 1;
- break;
- }
-
- /* Get the character. */
-
- value = parser->raw_buffer.pointer[low]
- + (parser->raw_buffer.pointer[high] << 8);
-
- /* Check for unexpected low surrogate area. */
-
- if ((value & 0xFC00) == 0xDC00)
- return yaml_parser_set_reader_error(parser,
- "unexpected low surrogate area",
- parser->offset, value);
-
- /* Check for a high surrogate area. */
-
- if ((value & 0xFC00) == 0xD800) {
-
- width = 4;
-
- /* Check for incomplete surrogate pair. */
-
- if (raw_unread < 4) {
- if (parser->eof) {
- return yaml_parser_set_reader_error(parser,
- "incomplete UTF-16 surrogate pair",
- parser->offset, -1);
- }
- incomplete = 1;
- break;
- }
-
- /* Get the next character. */
-
- value2 = parser->raw_buffer.pointer[low+2]
- + (parser->raw_buffer.pointer[high+2] << 8);
-
- /* Check for a low surrogate area. */
-
- if ((value2 & 0xFC00) != 0xDC00)
- return yaml_parser_set_reader_error(parser,
- "expected low surrogate area",
- parser->offset+2, value2);
-
- /* Generate the value of the surrogate pair. */
-
- value = 0x10000 + ((value & 0x3FF) << 10) + (value2 & 0x3FF);
- }
-
- else {
- width = 2;
- }
-
- break;
-
- default:
- assert(1); /* Impossible. */
- }
-
- /* Check if the raw buffer contains enough bytes to form a character. */
-
- if (incomplete) break;
-
- /*
- * Check if the character is in the allowed range:
- * #x9 | #xA | #xD | [#x20-#x7E] (8 bit)
- * | #x85 | [#xA0-#xD7FF] | [#xE000-#xFFFD] (16 bit)
- * | [#x10000-#x10FFFF] (32 bit)
- */
-
- if (! (value == 0x09 || value == 0x0A || value == 0x0D
- || (value >= 0x20 && value <= 0x7E)
- || (value == 0x85) || (value >= 0xA0 && value <= 0xD7FF)
- || (value >= 0xE000 && value <= 0xFFFD)
- || (value >= 0x10000 && value <= 0x10FFFF)))
- return yaml_parser_set_reader_error(parser,
- "control characters are not allowed",
- parser->offset, value);
-
- /* Move the raw pointers. */
-
- parser->raw_buffer.pointer += width;
- parser->offset += width;
-
- /* Finally put the character into the buffer. */
-
- /* 0000 0000-0000 007F -> 0xxxxxxx */
- if (value <= 0x7F) {
- *(parser->buffer.last++) = value;
- }
- /* 0000 0080-0000 07FF -> 110xxxxx 10xxxxxx */
- else if (value <= 0x7FF) {
- *(parser->buffer.last++) = 0xC0 + (value >> 6);
- *(parser->buffer.last++) = 0x80 + (value & 0x3F);
- }
- /* 0000 0800-0000 FFFF -> 1110xxxx 10xxxxxx 10xxxxxx */
- else if (value <= 0xFFFF) {
- *(parser->buffer.last++) = 0xE0 + (value >> 12);
- *(parser->buffer.last++) = 0x80 + ((value >> 6) & 0x3F);
- *(parser->buffer.last++) = 0x80 + (value & 0x3F);
- }
- /* 0001 0000-0010 FFFF -> 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
- else {
- *(parser->buffer.last++) = 0xF0 + (value >> 18);
- *(parser->buffer.last++) = 0x80 + ((value >> 12) & 0x3F);
- *(parser->buffer.last++) = 0x80 + ((value >> 6) & 0x3F);
- *(parser->buffer.last++) = 0x80 + (value & 0x3F);
- }
-
- parser->unread ++;
- }
-
- /* On EOF, put NUL into the buffer and return. */
-
- if (parser->eof) {
- *(parser->buffer.last++) = '\0';
- parser->unread ++;
- return 1;
- }
-
- }
-
- if (parser->offset >= PTRDIFF_MAX)
- return yaml_parser_set_reader_error(parser, "input is too long",
- PTRDIFF_MAX, -1);
-
- return 1;
-}
-
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c
deleted file mode 100644
index af05766f5c..0000000000
--- a/ext/psych/yaml/scanner.c
+++ /dev/null
@@ -1,3583 +0,0 @@
-
-/*
- * Introduction
- * ************
- *
- * The following notes assume that you are familiar with the YAML specification
- * (http://yaml.org/spec/cvs/current.html). We mostly follow it, although in
- * some cases we are less restrictive that it requires.
- *
- * The process of transforming a YAML stream into a sequence of events is
- * divided on two steps: Scanning and Parsing.
- *
- * The Scanner transforms the input stream into a sequence of tokens, while the
- * parser transform the sequence of tokens produced by the Scanner into a
- * sequence of parsing events.
- *
- * The Scanner is rather clever and complicated. The Parser, on the contrary,
- * is a straightforward implementation of a recursive-descendant parser (or,
- * LL(1) parser, as it is usually called).
- *
- * Actually there are two issues of Scanning that might be called "clever", the
- * rest is quite straightforward. The issues are "block collection start" and
- * "simple keys". Both issues are explained below in details.
- *
- * Here the Scanning step is explained and implemented. We start with the list
- * of all the tokens produced by the Scanner together with short descriptions.
- *
- * Now, tokens:
- *
- * STREAM-START(encoding) # The stream start.
- * STREAM-END # The stream end.
- * VERSION-DIRECTIVE(major,minor) # The '%YAML' directive.
- * TAG-DIRECTIVE(handle,prefix) # The '%TAG' directive.
- * DOCUMENT-START # '---'
- * DOCUMENT-END # '...'
- * BLOCK-SEQUENCE-START # Indentation increase denoting a block
- * BLOCK-MAPPING-START # sequence or a block mapping.
- * BLOCK-END # Indentation decrease.
- * FLOW-SEQUENCE-START # '['
- * FLOW-SEQUENCE-END # ']'
- * BLOCK-SEQUENCE-START # '{'
- * BLOCK-SEQUENCE-END # '}'
- * BLOCK-ENTRY # '-'
- * FLOW-ENTRY # ','
- * KEY # '?' or nothing (simple keys).
- * VALUE # ':'
- * ALIAS(anchor) # '*anchor'
- * ANCHOR(anchor) # '&anchor'
- * TAG(handle,suffix) # '!handle!suffix'
- * SCALAR(value,style) # A scalar.
- *
- * The following two tokens are "virtual" tokens denoting the beginning and the
- * end of the stream:
- *
- * STREAM-START(encoding)
- * STREAM-END
- *
- * We pass the information about the input stream encoding with the
- * STREAM-START token.
- *
- * The next two tokens are responsible for tags:
- *
- * VERSION-DIRECTIVE(major,minor)
- * TAG-DIRECTIVE(handle,prefix)
- *
- * Example:
- *
- * %YAML 1.1
- * %TAG ! !foo
- * %TAG !yaml! tag:yaml.org,2002:
- * ---
- *
- * The correspoding sequence of tokens:
- *
- * STREAM-START(utf-8)
- * VERSION-DIRECTIVE(1,1)
- * TAG-DIRECTIVE("!","!foo")
- * TAG-DIRECTIVE("!yaml","tag:yaml.org,2002:")
- * DOCUMENT-START
- * STREAM-END
- *
- * Note that the VERSION-DIRECTIVE and TAG-DIRECTIVE tokens occupy a whole
- * line.
- *
- * The document start and end indicators are represented by:
- *
- * DOCUMENT-START
- * DOCUMENT-END
- *
- * Note that if a YAML stream contains an implicit document (without '---'
- * and '...' indicators), no DOCUMENT-START and DOCUMENT-END tokens will be
- * produced.
- *
- * In the following examples, we present whole documents together with the
- * produced tokens.
- *
- * 1. An implicit document:
- *
- * 'a scalar'
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * SCALAR("a scalar",single-quoted)
- * STREAM-END
- *
- * 2. An explicit document:
- *
- * ---
- * 'a scalar'
- * ...
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * DOCUMENT-START
- * SCALAR("a scalar",single-quoted)
- * DOCUMENT-END
- * STREAM-END
- *
- * 3. Several documents in a stream:
- *
- * 'a scalar'
- * ---
- * 'another scalar'
- * ---
- * 'yet another scalar'
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * SCALAR("a scalar",single-quoted)
- * DOCUMENT-START
- * SCALAR("another scalar",single-quoted)
- * DOCUMENT-START
- * SCALAR("yet another scalar",single-quoted)
- * STREAM-END
- *
- * We have already introduced the SCALAR token above. The following tokens are
- * used to describe aliases, anchors, tag, and scalars:
- *
- * ALIAS(anchor)
- * ANCHOR(anchor)
- * TAG(handle,suffix)
- * SCALAR(value,style)
- *
- * The following series of examples illustrate the usage of these tokens:
- *
- * 1. A recursive sequence:
- *
- * &A [ *A ]
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * ANCHOR("A")
- * FLOW-SEQUENCE-START
- * ALIAS("A")
- * FLOW-SEQUENCE-END
- * STREAM-END
- *
- * 2. A tagged scalar:
- *
- * !!float "3.14" # A good approximation.
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * TAG("!!","float")
- * SCALAR("3.14",double-quoted)
- * STREAM-END
- *
- * 3. Various scalar styles:
- *
- * --- # Implicit empty plain scalars do not produce tokens.
- * --- a plain scalar
- * --- 'a single-quoted scalar'
- * --- "a double-quoted scalar"
- * --- |-
- * a literal scalar
- * --- >-
- * a folded
- * scalar
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * DOCUMENT-START
- * DOCUMENT-START
- * SCALAR("a plain scalar",plain)
- * DOCUMENT-START
- * SCALAR("a single-quoted scalar",single-quoted)
- * DOCUMENT-START
- * SCALAR("a double-quoted scalar",double-quoted)
- * DOCUMENT-START
- * SCALAR("a literal scalar",literal)
- * DOCUMENT-START
- * SCALAR("a folded scalar",folded)
- * STREAM-END
- *
- * Now it's time to review collection-related tokens. We will start with
- * flow collections:
- *
- * FLOW-SEQUENCE-START
- * FLOW-SEQUENCE-END
- * FLOW-MAPPING-START
- * FLOW-MAPPING-END
- * FLOW-ENTRY
- * KEY
- * VALUE
- *
- * The tokens FLOW-SEQUENCE-START, FLOW-SEQUENCE-END, FLOW-MAPPING-START, and
- * FLOW-MAPPING-END represent the indicators '[', ']', '{', and '}'
- * correspondingly. FLOW-ENTRY represent the ',' indicator. Finally the
- * indicators '?' and ':', which are used for denoting mapping keys and values,
- * are represented by the KEY and VALUE tokens.
- *
- * The following examples show flow collections:
- *
- * 1. A flow sequence:
- *
- * [item 1, item 2, item 3]
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * FLOW-SEQUENCE-START
- * SCALAR("item 1",plain)
- * FLOW-ENTRY
- * SCALAR("item 2",plain)
- * FLOW-ENTRY
- * SCALAR("item 3",plain)
- * FLOW-SEQUENCE-END
- * STREAM-END
- *
- * 2. A flow mapping:
- *
- * {
- * a simple key: a value, # Note that the KEY token is produced.
- * ? a complex key: another value,
- * }
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * FLOW-MAPPING-START
- * KEY
- * SCALAR("a simple key",plain)
- * VALUE
- * SCALAR("a value",plain)
- * FLOW-ENTRY
- * KEY
- * SCALAR("a complex key",plain)
- * VALUE
- * SCALAR("another value",plain)
- * FLOW-ENTRY
- * FLOW-MAPPING-END
- * STREAM-END
- *
- * A simple key is a key which is not denoted by the '?' indicator. Note that
- * the Scanner still produce the KEY token whenever it encounters a simple key.
- *
- * For scanning block collections, the following tokens are used (note that we
- * repeat KEY and VALUE here):
- *
- * BLOCK-SEQUENCE-START
- * BLOCK-MAPPING-START
- * BLOCK-END
- * BLOCK-ENTRY
- * KEY
- * VALUE
- *
- * The tokens BLOCK-SEQUENCE-START and BLOCK-MAPPING-START denote indentation
- * increase that precedes a block collection (cf. the INDENT token in Python).
- * The token BLOCK-END denote indentation decrease that ends a block collection
- * (cf. the DEDENT token in Python). However YAML has some syntax pecularities
- * that makes detections of these tokens more complex.
- *
- * The tokens BLOCK-ENTRY, KEY, and VALUE are used to represent the indicators
- * '-', '?', and ':' correspondingly.
- *
- * The following examples show how the tokens BLOCK-SEQUENCE-START,
- * BLOCK-MAPPING-START, and BLOCK-END are emitted by the Scanner:
- *
- * 1. Block sequences:
- *
- * - item 1
- * - item 2
- * -
- * - item 3.1
- * - item 3.2
- * -
- * key 1: value 1
- * key 2: value 2
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * BLOCK-SEQUENCE-START
- * BLOCK-ENTRY
- * SCALAR("item 1",plain)
- * BLOCK-ENTRY
- * SCALAR("item 2",plain)
- * BLOCK-ENTRY
- * BLOCK-SEQUENCE-START
- * BLOCK-ENTRY
- * SCALAR("item 3.1",plain)
- * BLOCK-ENTRY
- * SCALAR("item 3.2",plain)
- * BLOCK-END
- * BLOCK-ENTRY
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("key 1",plain)
- * VALUE
- * SCALAR("value 1",plain)
- * KEY
- * SCALAR("key 2",plain)
- * VALUE
- * SCALAR("value 2",plain)
- * BLOCK-END
- * BLOCK-END
- * STREAM-END
- *
- * 2. Block mappings:
- *
- * a simple key: a value # The KEY token is produced here.
- * ? a complex key
- * : another value
- * a mapping:
- * key 1: value 1
- * key 2: value 2
- * a sequence:
- * - item 1
- * - item 2
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("a simple key",plain)
- * VALUE
- * SCALAR("a value",plain)
- * KEY
- * SCALAR("a complex key",plain)
- * VALUE
- * SCALAR("another value",plain)
- * KEY
- * SCALAR("a mapping",plain)
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("key 1",plain)
- * VALUE
- * SCALAR("value 1",plain)
- * KEY
- * SCALAR("key 2",plain)
- * VALUE
- * SCALAR("value 2",plain)
- * BLOCK-END
- * KEY
- * SCALAR("a sequence",plain)
- * VALUE
- * BLOCK-SEQUENCE-START
- * BLOCK-ENTRY
- * SCALAR("item 1",plain)
- * BLOCK-ENTRY
- * SCALAR("item 2",plain)
- * BLOCK-END
- * BLOCK-END
- * STREAM-END
- *
- * YAML does not always require to start a new block collection from a new
- * line. If the current line contains only '-', '?', and ':' indicators, a new
- * block collection may start at the current line. The following examples
- * illustrate this case:
- *
- * 1. Collections in a sequence:
- *
- * - - item 1
- * - item 2
- * - key 1: value 1
- * key 2: value 2
- * - ? complex key
- * : complex value
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * BLOCK-SEQUENCE-START
- * BLOCK-ENTRY
- * BLOCK-SEQUENCE-START
- * BLOCK-ENTRY
- * SCALAR("item 1",plain)
- * BLOCK-ENTRY
- * SCALAR("item 2",plain)
- * BLOCK-END
- * BLOCK-ENTRY
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("key 1",plain)
- * VALUE
- * SCALAR("value 1",plain)
- * KEY
- * SCALAR("key 2",plain)
- * VALUE
- * SCALAR("value 2",plain)
- * BLOCK-END
- * BLOCK-ENTRY
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("complex key")
- * VALUE
- * SCALAR("complex value")
- * BLOCK-END
- * BLOCK-END
- * STREAM-END
- *
- * 2. Collections in a mapping:
- *
- * ? a sequence
- * : - item 1
- * - item 2
- * ? a mapping
- * : key 1: value 1
- * key 2: value 2
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("a sequence",plain)
- * VALUE
- * BLOCK-SEQUENCE-START
- * BLOCK-ENTRY
- * SCALAR("item 1",plain)
- * BLOCK-ENTRY
- * SCALAR("item 2",plain)
- * BLOCK-END
- * KEY
- * SCALAR("a mapping",plain)
- * VALUE
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("key 1",plain)
- * VALUE
- * SCALAR("value 1",plain)
- * KEY
- * SCALAR("key 2",plain)
- * VALUE
- * SCALAR("value 2",plain)
- * BLOCK-END
- * BLOCK-END
- * STREAM-END
- *
- * YAML also permits non-indented sequences if they are included into a block
- * mapping. In this case, the token BLOCK-SEQUENCE-START is not produced:
- *
- * key:
- * - item 1 # BLOCK-SEQUENCE-START is NOT produced here.
- * - item 2
- *
- * Tokens:
- *
- * STREAM-START(utf-8)
- * BLOCK-MAPPING-START
- * KEY
- * SCALAR("key",plain)
- * VALUE
- * BLOCK-ENTRY
- * SCALAR("item 1",plain)
- * BLOCK-ENTRY
- * SCALAR("item 2",plain)
- * BLOCK-END
- */
-
-#include "yaml_private.h"
-
-/*
- * Ensure that the buffer contains the required number of characters.
- * Return 1 on success, 0 on failure (reader error or memory error).
- */
-
-#define CACHE(parser,length) \
- (parser->unread >= (length) \
- ? 1 \
- : yaml_parser_update_buffer(parser, (length)))
-
-/*
- * Advance the buffer pointer.
- */
-
-#define SKIP(parser) \
- (parser->mark.index ++, \
- parser->mark.column ++, \
- parser->unread --, \
- parser->buffer.pointer += WIDTH(parser->buffer))
-
-#define SKIP_LINE(parser) \
- (IS_CRLF(parser->buffer) ? \
- (parser->mark.index += 2, \
- parser->mark.column = 0, \
- parser->mark.line ++, \
- parser->unread -= 2, \
- parser->buffer.pointer += 2) : \
- IS_BREAK(parser->buffer) ? \
- (parser->mark.index ++, \
- parser->mark.column = 0, \
- parser->mark.line ++, \
- parser->unread --, \
- parser->buffer.pointer += WIDTH(parser->buffer)) : 0)
-
-/*
- * Copy a character to a string buffer and advance pointers.
- */
-
-#define READ(parser,string) \
- (STRING_EXTEND(parser,string) ? \
- (COPY(string,parser->buffer), \
- parser->mark.index ++, \
- parser->mark.column ++, \
- parser->unread --, \
- 1) : 0)
-
-/*
- * Copy a line break character to a string buffer and advance pointers.
- */
-
-#define READ_LINE(parser,string) \
- (STRING_EXTEND(parser,string) ? \
- (((CHECK_AT(parser->buffer,'\r',0) \
- && CHECK_AT(parser->buffer,'\n',1)) ? /* CR LF -> LF */ \
- (*((string).pointer++) = (yaml_char_t) '\n', \
- parser->buffer.pointer += 2, \
- parser->mark.index += 2, \
- parser->mark.column = 0, \
- parser->mark.line ++, \
- parser->unread -= 2) : \
- (CHECK_AT(parser->buffer,'\r',0) \
- || CHECK_AT(parser->buffer,'\n',0)) ? /* CR|LF -> LF */ \
- (*((string).pointer++) = (yaml_char_t) '\n', \
- parser->buffer.pointer ++, \
- parser->mark.index ++, \
- parser->mark.column = 0, \
- parser->mark.line ++, \
- parser->unread --) : \
- (CHECK_AT(parser->buffer,'\xC2',0) \
- && CHECK_AT(parser->buffer,'\x85',1)) ? /* NEL -> LF */ \
- (*((string).pointer++) = (yaml_char_t) '\n', \
- parser->buffer.pointer += 2, \
- parser->mark.index ++, \
- parser->mark.column = 0, \
- parser->mark.line ++, \
- parser->unread --) : \
- (CHECK_AT(parser->buffer,'\xE2',0) && \
- CHECK_AT(parser->buffer,'\x80',1) && \
- (CHECK_AT(parser->buffer,'\xA8',2) || \
- CHECK_AT(parser->buffer,'\xA9',2))) ? /* LS|PS -> LS|PS */ \
- (*((string).pointer++) = *(parser->buffer.pointer++), \
- *((string).pointer++) = *(parser->buffer.pointer++), \
- *((string).pointer++) = *(parser->buffer.pointer++), \
- parser->mark.index ++, \
- parser->mark.column = 0, \
- parser->mark.line ++, \
- parser->unread --) : 0), \
- 1) : 0)
-
-/*
- * Public API declarations.
- */
-
-YAML_DECLARE(int)
-yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token);
-
-/*
- * Error handling.
- */
-
-static int
-yaml_parser_set_scanner_error(yaml_parser_t *parser, const char *context,
- yaml_mark_t context_mark, const char *problem);
-
-/*
- * High-level token API.
- */
-
-YAML_DECLARE(int)
-yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_next_token(yaml_parser_t *parser);
-
-/*
- * Potential simple keys.
- */
-
-static int
-yaml_parser_stale_simple_keys(yaml_parser_t *parser);
-
-static int
-yaml_parser_save_simple_key(yaml_parser_t *parser);
-
-static int
-yaml_parser_remove_simple_key(yaml_parser_t *parser);
-
-static int
-yaml_parser_increase_flow_level(yaml_parser_t *parser);
-
-static int
-yaml_parser_decrease_flow_level(yaml_parser_t *parser);
-
-/*
- * Indentation treatment.
- */
-
-static int
-yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
- ptrdiff_t number, yaml_token_type_t type, yaml_mark_t mark);
-
-static int
-yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column);
-
-/*
- * Token fetchers.
- */
-
-static int
-yaml_parser_fetch_stream_start(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_stream_end(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_directive(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_document_indicator(yaml_parser_t *parser,
- yaml_token_type_t type);
-
-static int
-yaml_parser_fetch_flow_collection_start(yaml_parser_t *parser,
- yaml_token_type_t type);
-
-static int
-yaml_parser_fetch_flow_collection_end(yaml_parser_t *parser,
- yaml_token_type_t type);
-
-static int
-yaml_parser_fetch_flow_entry(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_block_entry(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_key(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_value(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_anchor(yaml_parser_t *parser, yaml_token_type_t type);
-
-static int
-yaml_parser_fetch_tag(yaml_parser_t *parser);
-
-static int
-yaml_parser_fetch_block_scalar(yaml_parser_t *parser, int literal);
-
-static int
-yaml_parser_fetch_flow_scalar(yaml_parser_t *parser, int single);
-
-static int
-yaml_parser_fetch_plain_scalar(yaml_parser_t *parser);
-
-/*
- * Token scanners.
- */
-
-static int
-yaml_parser_scan_to_next_token(yaml_parser_t *parser);
-
-static int
-yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token);
-
-static int
-yaml_parser_scan_directive_name(yaml_parser_t *parser,
- yaml_mark_t start_mark, yaml_char_t **name);
-
-static int
-yaml_parser_scan_version_directive_value(yaml_parser_t *parser,
- yaml_mark_t start_mark, int *major, int *minor);
-
-static int
-yaml_parser_scan_version_directive_number(yaml_parser_t *parser,
- yaml_mark_t start_mark, int *number);
-
-static int
-yaml_parser_scan_tag_directive_value(yaml_parser_t *parser,
- yaml_mark_t mark, yaml_char_t **handle, yaml_char_t **prefix);
-
-static int
-yaml_parser_scan_anchor(yaml_parser_t *parser, yaml_token_t *token,
- yaml_token_type_t type);
-
-static int
-yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token);
-
-static int
-yaml_parser_scan_tag_handle(yaml_parser_t *parser, int directive,
- yaml_mark_t start_mark, yaml_char_t **handle);
-
-static int
-yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
- yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri);
-
-static int
-yaml_parser_scan_uri_escapes(yaml_parser_t *parser, int directive,
- yaml_mark_t start_mark, yaml_string_t *string);
-
-static int
-yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
- int literal);
-
-static int
-yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
- int *indent, yaml_string_t *breaks,
- yaml_mark_t start_mark, yaml_mark_t *end_mark);
-
-static int
-yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
- int single);
-
-static int
-yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token);
-
-/*
- * Get the next token.
- */
-
-YAML_DECLARE(int)
-yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token)
-{
- assert(parser); /* Non-NULL parser object is expected. */
- assert(token); /* Non-NULL token object is expected. */
-
- /* Erase the token object. */
-
- memset(token, 0, sizeof(yaml_token_t));
-
- /* No tokens after STREAM-END or error. */
-
- if (parser->stream_end_produced || parser->error) {
- return 1;
- }
-
- /* Ensure that the tokens queue contains enough tokens. */
-
- if (!parser->token_available) {
- if (!yaml_parser_fetch_more_tokens(parser))
- return 0;
- }
-
- /* Fetch the next token from the queue. */
-
- *token = DEQUEUE(parser, parser->tokens);
- parser->token_available = 0;
- parser->tokens_parsed ++;
-
- if (token->type == YAML_STREAM_END_TOKEN) {
- parser->stream_end_produced = 1;
- }
-
- return 1;
-}
-
-/*
- * Set the scanner error and return 0.
- */
-
-static int
-yaml_parser_set_scanner_error(yaml_parser_t *parser, const char *context,
- yaml_mark_t context_mark, const char *problem)
-{
- parser->error = YAML_SCANNER_ERROR;
- parser->context = context;
- parser->context_mark = context_mark;
- parser->problem = problem;
- parser->problem_mark = parser->mark;
-
- return 0;
-}
-
-/*
- * Ensure that the tokens queue contains at least one token which can be
- * returned to the Parser.
- */
-
-YAML_DECLARE(int)
-yaml_parser_fetch_more_tokens(yaml_parser_t *parser)
-{
- int need_more_tokens;
-
- /* While we need more tokens to fetch, do it. */
-
- while (1)
- {
- /*
- * Check if we really need to fetch more tokens.
- */
-
- need_more_tokens = 0;
-
- if (parser->tokens.head == parser->tokens.tail)
- {
- /* Queue is empty. */
-
- need_more_tokens = 1;
- }
- else
- {
- yaml_simple_key_t *simple_key;
-
- /* Check if any potential simple key may occupy the head position. */
-
- if (!yaml_parser_stale_simple_keys(parser))
- return 0;
-
- for (simple_key = parser->simple_keys.start;
- simple_key != parser->simple_keys.top; simple_key++) {
- if (simple_key->possible
- && simple_key->token_number == parser->tokens_parsed) {
- need_more_tokens = 1;
- break;
- }
- }
- }
-
- /* We are finished. */
-
- if (!need_more_tokens)
- break;
-
- /* Fetch the next token. */
-
- if (!yaml_parser_fetch_next_token(parser))
- return 0;
- }
-
- parser->token_available = 1;
-
- return 1;
-}
-
-/*
- * The dispatcher for token fetchers.
- */
-
-static int
-yaml_parser_fetch_next_token(yaml_parser_t *parser)
-{
- /* Ensure that the buffer is initialized. */
-
- if (!CACHE(parser, 1))
- return 0;
-
- /* Check if we just started scanning. Fetch STREAM-START then. */
-
- if (!parser->stream_start_produced)
- return yaml_parser_fetch_stream_start(parser);
-
- /* Eat whitespaces and comments until we reach the next token. */
-
- if (!yaml_parser_scan_to_next_token(parser))
- return 0;
-
- /* Remove obsolete potential simple keys. */
-
- if (!yaml_parser_stale_simple_keys(parser))
- return 0;
-
- /* Check the indentation level against the current column. */
-
- if (!yaml_parser_unroll_indent(parser, parser->mark.column))
- return 0;
-
- /*
- * Ensure that the buffer contains at least 4 characters. 4 is the length
- * of the longest indicators ('--- ' and '... ').
- */
-
- if (!CACHE(parser, 4))
- return 0;
-
- /* Is it the end of the stream? */
-
- if (IS_Z(parser->buffer))
- return yaml_parser_fetch_stream_end(parser);
-
- /* Is it a directive? */
-
- if (parser->mark.column == 0 && CHECK(parser->buffer, '%'))
- return yaml_parser_fetch_directive(parser);
-
- /* Is it the document start indicator? */
-
- if (parser->mark.column == 0
- && CHECK_AT(parser->buffer, '-', 0)
- && CHECK_AT(parser->buffer, '-', 1)
- && CHECK_AT(parser->buffer, '-', 2)
- && IS_BLANKZ_AT(parser->buffer, 3))
- return yaml_parser_fetch_document_indicator(parser,
- YAML_DOCUMENT_START_TOKEN);
-
- /* Is it the document end indicator? */
-
- if (parser->mark.column == 0
- && CHECK_AT(parser->buffer, '.', 0)
- && CHECK_AT(parser->buffer, '.', 1)
- && CHECK_AT(parser->buffer, '.', 2)
- && IS_BLANKZ_AT(parser->buffer, 3))
- return yaml_parser_fetch_document_indicator(parser,
- YAML_DOCUMENT_END_TOKEN);
-
- /* Is it the flow sequence start indicator? */
-
- if (CHECK(parser->buffer, '['))
- return yaml_parser_fetch_flow_collection_start(parser,
- YAML_FLOW_SEQUENCE_START_TOKEN);
-
- /* Is it the flow mapping start indicator? */
-
- if (CHECK(parser->buffer, '{'))
- return yaml_parser_fetch_flow_collection_start(parser,
- YAML_FLOW_MAPPING_START_TOKEN);
-
- /* Is it the flow sequence end indicator? */
-
- if (CHECK(parser->buffer, ']'))
- return yaml_parser_fetch_flow_collection_end(parser,
- YAML_FLOW_SEQUENCE_END_TOKEN);
-
- /* Is it the flow mapping end indicator? */
-
- if (CHECK(parser->buffer, '}'))
- return yaml_parser_fetch_flow_collection_end(parser,
- YAML_FLOW_MAPPING_END_TOKEN);
-
- /* Is it the flow entry indicator? */
-
- if (CHECK(parser->buffer, ','))
- return yaml_parser_fetch_flow_entry(parser);
-
- /* Is it the block entry indicator? */
-
- if (CHECK(parser->buffer, '-') && IS_BLANKZ_AT(parser->buffer, 1))
- return yaml_parser_fetch_block_entry(parser);
-
- /* Is it the key indicator? */
-
- if (CHECK(parser->buffer, '?')
- && (parser->flow_level || IS_BLANKZ_AT(parser->buffer, 1)))
- return yaml_parser_fetch_key(parser);
-
- /* Is it the value indicator? */
-
- if (CHECK(parser->buffer, ':')
- && (parser->flow_level || IS_BLANKZ_AT(parser->buffer, 1)))
- return yaml_parser_fetch_value(parser);
-
- /* Is it an alias? */
-
- if (CHECK(parser->buffer, '*'))
- return yaml_parser_fetch_anchor(parser, YAML_ALIAS_TOKEN);
-
- /* Is it an anchor? */
-
- if (CHECK(parser->buffer, '&'))
- return yaml_parser_fetch_anchor(parser, YAML_ANCHOR_TOKEN);
-
- /* Is it a tag? */
-
- if (CHECK(parser->buffer, '!'))
- return yaml_parser_fetch_tag(parser);
-
- /* Is it a literal scalar? */
-
- if (CHECK(parser->buffer, '|') && !parser->flow_level)
- return yaml_parser_fetch_block_scalar(parser, 1);
-
- /* Is it a folded scalar? */
-
- if (CHECK(parser->buffer, '>') && !parser->flow_level)
- return yaml_parser_fetch_block_scalar(parser, 0);
-
- /* Is it a single-quoted scalar? */
-
- if (CHECK(parser->buffer, '\''))
- return yaml_parser_fetch_flow_scalar(parser, 1);
-
- /* Is it a double-quoted scalar? */
-
- if (CHECK(parser->buffer, '"'))
- return yaml_parser_fetch_flow_scalar(parser, 0);
-
- /*
- * Is it a plain scalar?
- *
- * A plain scalar may start with any non-blank characters except
- *
- * '-', '?', ':', ',', '[', ']', '{', '}',
- * '#', '&', '*', '!', '|', '>', '\'', '\"',
- * '%', '@', '`'.
- *
- * In the block context (and, for the '-' indicator, in the flow context
- * too), it may also start with the characters
- *
- * '-', '?', ':'
- *
- * if it is followed by a non-space character.
- *
- * The last rule is more restrictive than the specification requires.
- */
-
- if (!(IS_BLANKZ(parser->buffer) || CHECK(parser->buffer, '-')
- || CHECK(parser->buffer, '?') || CHECK(parser->buffer, ':')
- || CHECK(parser->buffer, ',') || CHECK(parser->buffer, '[')
- || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '{')
- || CHECK(parser->buffer, '}') || CHECK(parser->buffer, '#')
- || CHECK(parser->buffer, '&') || CHECK(parser->buffer, '*')
- || CHECK(parser->buffer, '!') || CHECK(parser->buffer, '|')
- || CHECK(parser->buffer, '>') || CHECK(parser->buffer, '\'')
- || CHECK(parser->buffer, '"') || CHECK(parser->buffer, '%')
- || CHECK(parser->buffer, '@') || CHECK(parser->buffer, '`')) ||
- (CHECK(parser->buffer, '-') && !IS_BLANK_AT(parser->buffer, 1)) ||
- (!parser->flow_level &&
- (CHECK(parser->buffer, '?') || CHECK(parser->buffer, ':'))
- && !IS_BLANKZ_AT(parser->buffer, 1)))
- return yaml_parser_fetch_plain_scalar(parser);
-
- /*
- * If we don't determine the token type so far, it is an error.
- */
-
- return yaml_parser_set_scanner_error(parser,
- "while scanning for the next token", parser->mark,
- "found character that cannot start any token");
-}
-
-/*
- * Check the list of potential simple keys and remove the positions that
- * cannot contain simple keys anymore.
- */
-
-static int
-yaml_parser_stale_simple_keys(yaml_parser_t *parser)
-{
- yaml_simple_key_t *simple_key;
-
- /* Check for a potential simple key for each flow level. */
-
- for (simple_key = parser->simple_keys.start;
- simple_key != parser->simple_keys.top; simple_key ++)
- {
- /*
- * The specification requires that a simple key
- *
- * - is limited to a single line,
- * - is shorter than 1024 characters.
- */
-
- if (simple_key->possible
- && (simple_key->mark.line < parser->mark.line
- || simple_key->mark.index+1024 < parser->mark.index)) {
-
- /* Check if the potential simple key to be removed is required. */
-
- if (simple_key->required) {
- return yaml_parser_set_scanner_error(parser,
- "while scanning a simple key", simple_key->mark,
- "could not find expected ':'");
- }
-
- simple_key->possible = 0;
- }
- }
-
- return 1;
-}
-
-/*
- * Check if a simple key may start at the current position and add it if
- * needed.
- */
-
-static int
-yaml_parser_save_simple_key(yaml_parser_t *parser)
-{
- /*
- * A simple key is required at the current position if the scanner is in
- * the block context and the current column coincides with the indentation
- * level.
- */
-
- int required = (!parser->flow_level
- && parser->indent == (ptrdiff_t)parser->mark.column);
-
- /*
- * A simple key is required only when it is the first token in the current
- * line. Therefore it is always allowed. But we add a check anyway.
- */
-
- assert(parser->simple_key_allowed || !required); /* Impossible. */
-
- /*
- * If the current position may start a simple key, save it.
- */
-
- if (parser->simple_key_allowed)
- {
- yaml_simple_key_t simple_key;
- simple_key.possible = 1;
- simple_key.required = required;
- simple_key.token_number =
- parser->tokens_parsed + (parser->tokens.tail - parser->tokens.head);
- simple_key.mark = parser->mark;
-
- if (!yaml_parser_remove_simple_key(parser)) return 0;
-
- *(parser->simple_keys.top-1) = simple_key;
- }
-
- return 1;
-}
-
-/*
- * Remove a potential simple key at the current flow level.
- */
-
-static int
-yaml_parser_remove_simple_key(yaml_parser_t *parser)
-{
- yaml_simple_key_t *simple_key = parser->simple_keys.top-1;
-
- if (simple_key->possible)
- {
- /* If the key is required, it is an error. */
-
- if (simple_key->required) {
- return yaml_parser_set_scanner_error(parser,
- "while scanning a simple key", simple_key->mark,
- "could not find expected ':'");
- }
- }
-
- /* Remove the key from the stack. */
-
- simple_key->possible = 0;
-
- return 1;
-}
-
-/*
- * Increase the flow level and resize the simple key list if needed.
- */
-
-static int
-yaml_parser_increase_flow_level(yaml_parser_t *parser)
-{
- yaml_simple_key_t empty_simple_key = { 0, 0, 0, { 0, 0, 0 } };
-
- /* Reset the simple key on the next level. */
-
- if (!PUSH(parser, parser->simple_keys, empty_simple_key))
- return 0;
-
- /* Increase the flow level. */
-
- if (parser->flow_level == INT_MAX) {
- parser->error = YAML_MEMORY_ERROR;
- return 0;
- }
-
- parser->flow_level++;
-
- return 1;
-}
-
-/*
- * Decrease the flow level.
- */
-
-static int
-yaml_parser_decrease_flow_level(yaml_parser_t *parser)
-{
- if (parser->flow_level) {
- parser->flow_level --;
- (void)POP(parser, parser->simple_keys);
- }
-
- return 1;
-}
-
-/*
- * Push the current indentation level to the stack and set the new level
- * the current column is greater than the indentation level. In this case,
- * append or insert the specified token into the token queue.
- *
- */
-
-static int
-yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
- ptrdiff_t number, yaml_token_type_t type, yaml_mark_t mark)
-{
- yaml_token_t token;
-
- /* In the flow context, do nothing. */
-
- if (parser->flow_level)
- return 1;
-
- if (parser->indent < column)
- {
- /*
- * Push the current indentation level to the stack and set the new
- * indentation level.
- */
-
- if (!PUSH(parser, parser->indents, parser->indent))
- return 0;
-
-#if PTRDIFF_MAX > INT_MAX
- if (column > INT_MAX) {
- parser->error = YAML_MEMORY_ERROR;
- return 0;
- }
-#endif
-
- parser->indent = (int)column;
-
- /* Create a token and insert it into the queue. */
-
- TOKEN_INIT(token, type, mark, mark);
-
- if (number == -1) {
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
- }
- else {
- if (!QUEUE_INSERT(parser,
- parser->tokens, number - parser->tokens_parsed, token))
- return 0;
- }
- }
-
- return 1;
-}
-
-/*
- * Pop indentation levels from the indents stack until the current level
- * becomes less or equal to the column. For each intendation level, append
- * the BLOCK-END token.
- */
-
-
-static int
-yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
-{
- yaml_token_t token;
-
- /* In the flow context, do nothing. */
-
- if (parser->flow_level)
- return 1;
-
- /* Loop through the intendation levels in the stack. */
-
- while (parser->indent > column)
- {
- /* Create a token and append it to the queue. */
-
- TOKEN_INIT(token, YAML_BLOCK_END_TOKEN, parser->mark, parser->mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- /* Pop the indentation level. */
-
- parser->indent = POP(parser, parser->indents);
- }
-
- return 1;
-}
-
-/*
- * Initialize the scanner and produce the STREAM-START token.
- */
-
-static int
-yaml_parser_fetch_stream_start(yaml_parser_t *parser)
-{
- yaml_simple_key_t simple_key = { 0, 0, 0, { 0, 0, 0 } };
- yaml_token_t token;
-
- /* Set the initial indentation. */
-
- parser->indent = -1;
-
- /* Initialize the simple key stack. */
-
- if (!PUSH(parser, parser->simple_keys, simple_key))
- return 0;
-
- /* A simple key is allowed at the beginning of the stream. */
-
- parser->simple_key_allowed = 1;
-
- /* We have started. */
-
- parser->stream_start_produced = 1;
-
- /* Create the STREAM-START token and append it to the queue. */
-
- STREAM_START_TOKEN_INIT(token, parser->encoding,
- parser->mark, parser->mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the STREAM-END token and shut down the scanner.
- */
-
-static int
-yaml_parser_fetch_stream_end(yaml_parser_t *parser)
-{
- yaml_token_t token;
-
- /* Force new line. */
-
- if (parser->mark.column != 0) {
- parser->mark.column = 0;
- parser->mark.line ++;
- }
-
- /* Reset the indentation level. */
-
- if (!yaml_parser_unroll_indent(parser, -1))
- return 0;
-
- /* Reset simple keys. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- parser->simple_key_allowed = 0;
-
- /* Create the STREAM-END token and append it to the queue. */
-
- STREAM_END_TOKEN_INIT(token, parser->mark, parser->mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce a VERSION-DIRECTIVE or TAG-DIRECTIVE token.
- */
-
-static int
-yaml_parser_fetch_directive(yaml_parser_t *parser)
-{
- yaml_token_t token;
-
- /* Reset the indentation level. */
-
- if (!yaml_parser_unroll_indent(parser, -1))
- return 0;
-
- /* Reset simple keys. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- parser->simple_key_allowed = 0;
-
- /* Create the YAML-DIRECTIVE or TAG-DIRECTIVE token. */
-
- if (!yaml_parser_scan_directive(parser, &token))
- return 0;
-
- /* Append the token to the queue. */
-
- if (!ENQUEUE(parser, parser->tokens, token)) {
- yaml_token_delete(&token);
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Produce the DOCUMENT-START or DOCUMENT-END token.
- */
-
-static int
-yaml_parser_fetch_document_indicator(yaml_parser_t *parser,
- yaml_token_type_t type)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
-
- /* Reset the indentation level. */
-
- if (!yaml_parser_unroll_indent(parser, -1))
- return 0;
-
- /* Reset simple keys. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- parser->simple_key_allowed = 0;
-
- /* Consume the token. */
-
- start_mark = parser->mark;
-
- SKIP(parser);
- SKIP(parser);
- SKIP(parser);
-
- end_mark = parser->mark;
-
- /* Create the DOCUMENT-START or DOCUMENT-END token. */
-
- TOKEN_INIT(token, type, start_mark, end_mark);
-
- /* Append the token to the queue. */
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the FLOW-SEQUENCE-START or FLOW-MAPPING-START token.
- */
-
-static int
-yaml_parser_fetch_flow_collection_start(yaml_parser_t *parser,
- yaml_token_type_t type)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
-
- /* The indicators '[' and '{' may start a simple key. */
-
- if (!yaml_parser_save_simple_key(parser))
- return 0;
-
- /* Increase the flow level. */
-
- if (!yaml_parser_increase_flow_level(parser))
- return 0;
-
- /* A simple key may follow the indicators '[' and '{'. */
-
- parser->simple_key_allowed = 1;
-
- /* Consume the token. */
-
- start_mark = parser->mark;
- SKIP(parser);
- end_mark = parser->mark;
-
- /* Create the FLOW-SEQUENCE-START of FLOW-MAPPING-START token. */
-
- TOKEN_INIT(token, type, start_mark, end_mark);
-
- /* Append the token to the queue. */
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the FLOW-SEQUENCE-END or FLOW-MAPPING-END token.
- */
-
-static int
-yaml_parser_fetch_flow_collection_end(yaml_parser_t *parser,
- yaml_token_type_t type)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
-
- /* Reset any potential simple key on the current flow level. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- /* Decrease the flow level. */
-
- if (!yaml_parser_decrease_flow_level(parser))
- return 0;
-
- /* No simple keys after the indicators ']' and '}'. */
-
- parser->simple_key_allowed = 0;
-
- /* Consume the token. */
-
- start_mark = parser->mark;
- SKIP(parser);
- end_mark = parser->mark;
-
- /* Create the FLOW-SEQUENCE-END of FLOW-MAPPING-END token. */
-
- TOKEN_INIT(token, type, start_mark, end_mark);
-
- /* Append the token to the queue. */
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the FLOW-ENTRY token.
- */
-
-static int
-yaml_parser_fetch_flow_entry(yaml_parser_t *parser)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
-
- /* Reset any potential simple keys on the current flow level. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- /* Simple keys are allowed after ','. */
-
- parser->simple_key_allowed = 1;
-
- /* Consume the token. */
-
- start_mark = parser->mark;
- SKIP(parser);
- end_mark = parser->mark;
-
- /* Create the FLOW-ENTRY token and append it to the queue. */
-
- TOKEN_INIT(token, YAML_FLOW_ENTRY_TOKEN, start_mark, end_mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the BLOCK-ENTRY token.
- */
-
-static int
-yaml_parser_fetch_block_entry(yaml_parser_t *parser)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
-
- /* Check if the scanner is in the block context. */
-
- if (!parser->flow_level)
- {
- /* Check if we are allowed to start a new entry. */
-
- if (!parser->simple_key_allowed) {
- return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
- "block sequence entries are not allowed in this context");
- }
-
- /* Add the BLOCK-SEQUENCE-START token if needed. */
-
- if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
- YAML_BLOCK_SEQUENCE_START_TOKEN, parser->mark))
- return 0;
- }
- else
- {
- /*
- * It is an error for the '-' indicator to occur in the flow context,
- * but we let the Parser detect and report about it because the Parser
- * is able to point to the context.
- */
- }
-
- /* Reset any potential simple keys on the current flow level. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- /* Simple keys are allowed after '-'. */
-
- parser->simple_key_allowed = 1;
-
- /* Consume the token. */
-
- start_mark = parser->mark;
- SKIP(parser);
- end_mark = parser->mark;
-
- /* Create the BLOCK-ENTRY token and append it to the queue. */
-
- TOKEN_INIT(token, YAML_BLOCK_ENTRY_TOKEN, start_mark, end_mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the KEY token.
- */
-
-static int
-yaml_parser_fetch_key(yaml_parser_t *parser)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
-
- /* In the block context, additional checks are required. */
-
- if (!parser->flow_level)
- {
- /* Check if we are allowed to start a new key (not nessesary simple). */
-
- if (!parser->simple_key_allowed) {
- return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
- "mapping keys are not allowed in this context");
- }
-
- /* Add the BLOCK-MAPPING-START token if needed. */
-
- if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
- YAML_BLOCK_MAPPING_START_TOKEN, parser->mark))
- return 0;
- }
-
- /* Reset any potential simple keys on the current flow level. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- /* Simple keys are allowed after '?' in the block context. */
-
- parser->simple_key_allowed = (!parser->flow_level);
-
- /* Consume the token. */
-
- start_mark = parser->mark;
- SKIP(parser);
- end_mark = parser->mark;
-
- /* Create the KEY token and append it to the queue. */
-
- TOKEN_INIT(token, YAML_KEY_TOKEN, start_mark, end_mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the VALUE token.
- */
-
-static int
-yaml_parser_fetch_value(yaml_parser_t *parser)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_token_t token;
- yaml_simple_key_t *simple_key = parser->simple_keys.top-1;
-
- /* Have we found a simple key? */
-
- if (simple_key->possible)
- {
-
- /* Create the KEY token and insert it into the queue. */
-
- TOKEN_INIT(token, YAML_KEY_TOKEN, simple_key->mark, simple_key->mark);
-
- if (!QUEUE_INSERT(parser, parser->tokens,
- simple_key->token_number - parser->tokens_parsed, token))
- return 0;
-
- /* In the block context, we may need to add the BLOCK-MAPPING-START token. */
-
- if (!yaml_parser_roll_indent(parser, simple_key->mark.column,
- simple_key->token_number,
- YAML_BLOCK_MAPPING_START_TOKEN, simple_key->mark))
- return 0;
-
- /* Remove the simple key. */
-
- simple_key->possible = 0;
-
- /* A simple key cannot follow another simple key. */
-
- parser->simple_key_allowed = 0;
- }
- else
- {
- /* The ':' indicator follows a complex key. */
-
- /* In the block context, extra checks are required. */
-
- if (!parser->flow_level)
- {
- /* Check if we are allowed to start a complex value. */
-
- if (!parser->simple_key_allowed) {
- return yaml_parser_set_scanner_error(parser, NULL, parser->mark,
- "mapping values are not allowed in this context");
- }
-
- /* Add the BLOCK-MAPPING-START token if needed. */
-
- if (!yaml_parser_roll_indent(parser, parser->mark.column, -1,
- YAML_BLOCK_MAPPING_START_TOKEN, parser->mark))
- return 0;
- }
-
- /* Simple keys after ':' are allowed in the block context. */
-
- parser->simple_key_allowed = (!parser->flow_level);
- }
-
- /* Consume the token. */
-
- start_mark = parser->mark;
- SKIP(parser);
- end_mark = parser->mark;
-
- /* Create the VALUE token and append it to the queue. */
-
- TOKEN_INIT(token, YAML_VALUE_TOKEN, start_mark, end_mark);
-
- if (!ENQUEUE(parser, parser->tokens, token))
- return 0;
-
- return 1;
-}
-
-/*
- * Produce the ALIAS or ANCHOR token.
- */
-
-static int
-yaml_parser_fetch_anchor(yaml_parser_t *parser, yaml_token_type_t type)
-{
- yaml_token_t token;
-
- /* An anchor or an alias could be a simple key. */
-
- if (!yaml_parser_save_simple_key(parser))
- return 0;
-
- /* A simple key cannot follow an anchor or an alias. */
-
- parser->simple_key_allowed = 0;
-
- /* Create the ALIAS or ANCHOR token and append it to the queue. */
-
- if (!yaml_parser_scan_anchor(parser, &token, type))
- return 0;
-
- if (!ENQUEUE(parser, parser->tokens, token)) {
- yaml_token_delete(&token);
- return 0;
- }
- return 1;
-}
-
-/*
- * Produce the TAG token.
- */
-
-static int
-yaml_parser_fetch_tag(yaml_parser_t *parser)
-{
- yaml_token_t token;
-
- /* A tag could be a simple key. */
-
- if (!yaml_parser_save_simple_key(parser))
- return 0;
-
- /* A simple key cannot follow a tag. */
-
- parser->simple_key_allowed = 0;
-
- /* Create the TAG token and append it to the queue. */
-
- if (!yaml_parser_scan_tag(parser, &token))
- return 0;
-
- if (!ENQUEUE(parser, parser->tokens, token)) {
- yaml_token_delete(&token);
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Produce the SCALAR(...,literal) or SCALAR(...,folded) tokens.
- */
-
-static int
-yaml_parser_fetch_block_scalar(yaml_parser_t *parser, int literal)
-{
- yaml_token_t token;
-
- /* Remove any potential simple keys. */
-
- if (!yaml_parser_remove_simple_key(parser))
- return 0;
-
- /* A simple key may follow a block scalar. */
-
- parser->simple_key_allowed = 1;
-
- /* Create the SCALAR token and append it to the queue. */
-
- if (!yaml_parser_scan_block_scalar(parser, &token, literal))
- return 0;
-
- if (!ENQUEUE(parser, parser->tokens, token)) {
- yaml_token_delete(&token);
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Produce the SCALAR(...,single-quoted) or SCALAR(...,double-quoted) tokens.
- */
-
-static int
-yaml_parser_fetch_flow_scalar(yaml_parser_t *parser, int single)
-{
- yaml_token_t token;
-
- /* A plain scalar could be a simple key. */
-
- if (!yaml_parser_save_simple_key(parser))
- return 0;
-
- /* A simple key cannot follow a flow scalar. */
-
- parser->simple_key_allowed = 0;
-
- /* Create the SCALAR token and append it to the queue. */
-
- if (!yaml_parser_scan_flow_scalar(parser, &token, single))
- return 0;
-
- if (!ENQUEUE(parser, parser->tokens, token)) {
- yaml_token_delete(&token);
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Produce the SCALAR(...,plain) token.
- */
-
-static int
-yaml_parser_fetch_plain_scalar(yaml_parser_t *parser)
-{
- yaml_token_t token;
-
- /* A plain scalar could be a simple key. */
-
- if (!yaml_parser_save_simple_key(parser))
- return 0;
-
- /* A simple key cannot follow a flow scalar. */
-
- parser->simple_key_allowed = 0;
-
- /* Create the SCALAR token and append it to the queue. */
-
- if (!yaml_parser_scan_plain_scalar(parser, &token))
- return 0;
-
- if (!ENQUEUE(parser, parser->tokens, token)) {
- yaml_token_delete(&token);
- return 0;
- }
-
- return 1;
-}
-
-/*
- * Eat whitespaces and comments until the next token is found.
- */
-
-static int
-yaml_parser_scan_to_next_token(yaml_parser_t *parser)
-{
- /* Until the next token is not found. */
-
- while (1)
- {
- /* Allow the BOM mark to start a line. */
-
- if (!CACHE(parser, 1)) return 0;
-
- if (parser->mark.column == 0 && IS_BOM(parser->buffer))
- SKIP(parser);
-
- /*
- * Eat whitespaces.
- *
- * Tabs are allowed:
- *
- * - in the flow context;
- * - in the block context, but not at the beginning of the line or
- * after '-', '?', or ':' (complex value).
- */
-
- if (!CACHE(parser, 1)) return 0;
-
- while (CHECK(parser->buffer,' ') ||
- ((parser->flow_level || !parser->simple_key_allowed) &&
- CHECK(parser->buffer, '\t'))) {
- SKIP(parser);
- if (!CACHE(parser, 1)) return 0;
- }
-
- /* Eat a comment until a line break. */
-
- if (CHECK(parser->buffer, '#')) {
- while (!IS_BREAKZ(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) return 0;
- }
- }
-
- /* If it is a line break, eat it. */
-
- if (IS_BREAK(parser->buffer))
- {
- if (!CACHE(parser, 2)) return 0;
- SKIP_LINE(parser);
-
- /* In the block context, a new line may start a simple key. */
-
- if (!parser->flow_level) {
- parser->simple_key_allowed = 1;
- }
- }
- else
- {
- /* We have found a token. */
-
- break;
- }
- }
-
- return 1;
-}
-
-/*
- * Scan a YAML-DIRECTIVE or TAG-DIRECTIVE token.
- *
- * Scope:
- * %YAML 1.1 # a comment \n
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * %TAG !yaml! tag:yaml.org,2002: \n
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
-
-int
-yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token)
-{
- yaml_mark_t start_mark, end_mark;
- yaml_char_t *name = NULL;
- int major, minor;
- yaml_char_t *handle = NULL, *prefix = NULL;
-
- /* Eat '%'. */
-
- start_mark = parser->mark;
-
- SKIP(parser);
-
- /* Scan the directive name. */
-
- if (!yaml_parser_scan_directive_name(parser, start_mark, &name))
- goto error;
-
- /* Is it a YAML directive? */
-
- if (strcmp((char *)name, "YAML") == 0)
- {
- /* Scan the VERSION directive value. */
-
- if (!yaml_parser_scan_version_directive_value(parser, start_mark,
- &major, &minor))
- goto error;
-
- end_mark = parser->mark;
-
- /* Create a VERSION-DIRECTIVE token. */
-
- VERSION_DIRECTIVE_TOKEN_INIT(*token, major, minor,
- start_mark, end_mark);
- }
-
- /* Is it a TAG directive? */
-
- else if (strcmp((char *)name, "TAG") == 0)
- {
- /* Scan the TAG directive value. */
-
- if (!yaml_parser_scan_tag_directive_value(parser, start_mark,
- &handle, &prefix))
- goto error;
-
- end_mark = parser->mark;
-
- /* Create a TAG-DIRECTIVE token. */
-
- TAG_DIRECTIVE_TOKEN_INIT(*token, handle, prefix,
- start_mark, end_mark);
- }
-
- /* Unknown directive. */
-
- else
- {
- yaml_parser_set_scanner_error(parser, "while scanning a directive",
- start_mark, "found uknown directive name");
- goto error;
- }
-
- /* Eat the rest of the line including any comments. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_BLANK(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) goto error;
- }
-
- if (CHECK(parser->buffer, '#')) {
- while (!IS_BREAKZ(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) goto error;
- }
- }
-
- /* Check if we are at the end of the line. */
-
- if (!IS_BREAKZ(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a directive",
- start_mark, "did not find expected comment or line break");
- goto error;
- }
-
- /* Eat a line break. */
-
- if (IS_BREAK(parser->buffer)) {
- if (!CACHE(parser, 2)) goto error;
- SKIP_LINE(parser);
- }
-
- yaml_free(name);
-
- return 1;
-
-error:
- yaml_free(prefix);
- yaml_free(handle);
- yaml_free(name);
- return 0;
-}
-
-/*
- * Scan the directive name.
- *
- * Scope:
- * %YAML 1.1 # a comment \n
- * ^^^^
- * %TAG !yaml! tag:yaml.org,2002: \n
- * ^^^
- */
-
-static int
-yaml_parser_scan_directive_name(yaml_parser_t *parser,
- yaml_mark_t start_mark, yaml_char_t **name)
-{
- yaml_string_t string = NULL_STRING;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
-
- /* Consume the directive name. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_ALPHA(parser->buffer))
- {
- if (!READ(parser, string)) goto error;
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Check if the name is empty. */
-
- if (string.start == string.pointer) {
- yaml_parser_set_scanner_error(parser, "while scanning a directive",
- start_mark, "could not find expected directive name");
- goto error;
- }
-
- /* Check for an blank character after the name. */
-
- if (!IS_BLANKZ(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a directive",
- start_mark, "found unexpected non-alphabetical character");
- goto error;
- }
-
- *name = string.start;
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- return 0;
-}
-
-/*
- * Scan the value of VERSION-DIRECTIVE.
- *
- * Scope:
- * %YAML 1.1 # a comment \n
- * ^^^^^^
- */
-
-static int
-yaml_parser_scan_version_directive_value(yaml_parser_t *parser,
- yaml_mark_t start_mark, int *major, int *minor)
-{
- /* Eat whitespaces. */
-
- if (!CACHE(parser, 1)) return 0;
-
- while (IS_BLANK(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) return 0;
- }
-
- /* Consume the major version number. */
-
- if (!yaml_parser_scan_version_directive_number(parser, start_mark, major))
- return 0;
-
- /* Eat '.'. */
-
- if (!CHECK(parser->buffer, '.')) {
- return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
- start_mark, "did not find expected digit or '.' character");
- }
-
- SKIP(parser);
-
- /* Consume the minor version number. */
-
- if (!yaml_parser_scan_version_directive_number(parser, start_mark, minor))
- return 0;
-
- return 1;
-}
-
-#define MAX_NUMBER_LENGTH 9
-
-/*
- * Scan the version number of VERSION-DIRECTIVE.
- *
- * Scope:
- * %YAML 1.1 # a comment \n
- * ^
- * %YAML 1.1 # a comment \n
- * ^
- */
-
-static int
-yaml_parser_scan_version_directive_number(yaml_parser_t *parser,
- yaml_mark_t start_mark, int *number)
-{
- int value = 0;
- size_t length = 0;
-
- /* Repeat while the next character is digit. */
-
- if (!CACHE(parser, 1)) return 0;
-
- while (IS_DIGIT(parser->buffer))
- {
- /* Check if the number is too long. */
-
- if (++length > MAX_NUMBER_LENGTH) {
- return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
- start_mark, "found extremely long version number");
- }
-
- value = value*10 + AS_DIGIT(parser->buffer);
-
- SKIP(parser);
-
- if (!CACHE(parser, 1)) return 0;
- }
-
- /* Check if the number was present. */
-
- if (!length) {
- return yaml_parser_set_scanner_error(parser, "while scanning a %YAML directive",
- start_mark, "did not find expected version number");
- }
-
- *number = value;
-
- return 1;
-}
-
-/*
- * Scan the value of a TAG-DIRECTIVE token.
- *
- * Scope:
- * %TAG !yaml! tag:yaml.org,2002: \n
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
-
-static int
-yaml_parser_scan_tag_directive_value(yaml_parser_t *parser,
- yaml_mark_t start_mark, yaml_char_t **handle, yaml_char_t **prefix)
-{
- yaml_char_t *handle_value = NULL;
- yaml_char_t *prefix_value = NULL;
-
- /* Eat whitespaces. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_BLANK(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Scan a handle. */
-
- if (!yaml_parser_scan_tag_handle(parser, 1, start_mark, &handle_value))
- goto error;
-
- /* Expect a whitespace. */
-
- if (!CACHE(parser, 1)) goto error;
-
- if (!IS_BLANK(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
- start_mark, "did not find expected whitespace");
- goto error;
- }
-
- /* Eat whitespaces. */
-
- while (IS_BLANK(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Scan a prefix. */
-
- if (!yaml_parser_scan_tag_uri(parser, 1, NULL, start_mark, &prefix_value))
- goto error;
-
- /* Expect a whitespace or line break. */
-
- if (!CACHE(parser, 1)) goto error;
-
- if (!IS_BLANKZ(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a %TAG directive",
- start_mark, "did not find expected whitespace or line break");
- goto error;
- }
-
- *handle = handle_value;
- *prefix = prefix_value;
-
- return 1;
-
-error:
- yaml_free(handle_value);
- yaml_free(prefix_value);
- return 0;
-}
-
-static int
-yaml_parser_scan_anchor(yaml_parser_t *parser, yaml_token_t *token,
- yaml_token_type_t type)
-{
- int length = 0;
- yaml_mark_t start_mark, end_mark;
- yaml_string_t string = NULL_STRING;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
-
- /* Eat the indicator character. */
-
- start_mark = parser->mark;
-
- SKIP(parser);
-
- /* Consume the value. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_ALPHA(parser->buffer)) {
- if (!READ(parser, string)) goto error;
- if (!CACHE(parser, 1)) goto error;
- length ++;
- }
-
- end_mark = parser->mark;
-
- /*
- * Check if length of the anchor is greater than 0 and it is followed by
- * a whitespace character or one of the indicators:
- *
- * '?', ':', ',', ']', '}', '%', '@', '`'.
- */
-
- if (!length || !(IS_BLANKZ(parser->buffer) || CHECK(parser->buffer, '?')
- || CHECK(parser->buffer, ':') || CHECK(parser->buffer, ',')
- || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '}')
- || CHECK(parser->buffer, '%') || CHECK(parser->buffer, '@')
- || CHECK(parser->buffer, '`'))) {
- yaml_parser_set_scanner_error(parser, type == YAML_ANCHOR_TOKEN ?
- "while scanning an anchor" : "while scanning an alias", start_mark,
- "did not find expected alphabetic or numeric character");
- goto error;
- }
-
- /* Create a token. */
-
- if (type == YAML_ANCHOR_TOKEN) {
- ANCHOR_TOKEN_INIT(*token, string.start, start_mark, end_mark);
- }
- else {
- ALIAS_TOKEN_INIT(*token, string.start, start_mark, end_mark);
- }
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- return 0;
-}
-
-/*
- * Scan a TAG token.
- */
-
-static int
-yaml_parser_scan_tag(yaml_parser_t *parser, yaml_token_t *token)
-{
- yaml_char_t *handle = NULL;
- yaml_char_t *suffix = NULL;
- yaml_mark_t start_mark, end_mark;
-
- start_mark = parser->mark;
-
- /* Check if the tag is in the canonical form. */
-
- if (!CACHE(parser, 2)) goto error;
-
- if (CHECK_AT(parser->buffer, '<', 1))
- {
- /* Set the handle to '' */
-
- handle = yaml_malloc(1);
- if (!handle) goto error;
- handle[0] = '\0';
-
- /* Eat '!<' */
-
- SKIP(parser);
- SKIP(parser);
-
- /* Consume the tag value. */
-
- if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
- goto error;
-
- /* Check for '>' and eat it. */
-
- if (!CHECK(parser->buffer, '>')) {
- yaml_parser_set_scanner_error(parser, "while scanning a tag",
- start_mark, "did not find the expected '>'");
- goto error;
- }
-
- SKIP(parser);
- }
- else
- {
- /* The tag has either the '!suffix' or the '!handle!suffix' form. */
-
- /* First, try to scan a handle. */
-
- if (!yaml_parser_scan_tag_handle(parser, 0, start_mark, &handle))
- goto error;
-
- /* Check if it is, indeed, handle. */
-
- if (handle[0] == '!' && handle[1] != '\0' && handle[strlen((char *)handle)-1] == '!')
- {
- /* Scan the suffix now. */
-
- if (!yaml_parser_scan_tag_uri(parser, 0, NULL, start_mark, &suffix))
- goto error;
- }
- else
- {
- /* It wasn't a handle after all. Scan the rest of the tag. */
-
- if (!yaml_parser_scan_tag_uri(parser, 0, handle, start_mark, &suffix))
- goto error;
-
- /* Set the handle to '!'. */
-
- yaml_free(handle);
- handle = yaml_malloc(2);
- if (!handle) goto error;
- handle[0] = '!';
- handle[1] = '\0';
-
- /*
- * A special case: the '!' tag. Set the handle to '' and the
- * suffix to '!'.
- */
-
- if (suffix[0] == '\0') {
- yaml_char_t *tmp = handle;
- handle = suffix;
- suffix = tmp;
- }
- }
- }
-
- /* Check the character which ends the tag. */
-
- if (!CACHE(parser, 1)) goto error;
-
- if (!IS_BLANKZ(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a tag",
- start_mark, "did not find expected whitespace or line break");
- goto error;
- }
-
- end_mark = parser->mark;
-
- /* Create a token. */
-
- TAG_TOKEN_INIT(*token, handle, suffix, start_mark, end_mark);
-
- return 1;
-
-error:
- yaml_free(handle);
- yaml_free(suffix);
- return 0;
-}
-
-/*
- * Scan a tag handle.
- */
-
-static int
-yaml_parser_scan_tag_handle(yaml_parser_t *parser, int directive,
- yaml_mark_t start_mark, yaml_char_t **handle)
-{
- yaml_string_t string = NULL_STRING;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
-
- /* Check the initial '!' character. */
-
- if (!CACHE(parser, 1)) goto error;
-
- if (!CHECK(parser->buffer, '!')) {
- yaml_parser_set_scanner_error(parser, directive ?
- "while scanning a tag directive" : "while scanning a tag",
- start_mark, "did not find expected '!'");
- goto error;
- }
-
- /* Copy the '!' character. */
-
- if (!READ(parser, string)) goto error;
-
- /* Copy all subsequent alphabetical and numerical characters. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_ALPHA(parser->buffer))
- {
- if (!READ(parser, string)) goto error;
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Check if the trailing character is '!' and copy it. */
-
- if (CHECK(parser->buffer, '!'))
- {
- if (!READ(parser, string)) goto error;
- }
- else
- {
- /*
- * It's either the '!' tag or not really a tag handle. If it's a %TAG
- * directive, it's an error. If it's a tag token, it must be a part of
- * URI.
- */
-
- if (directive && !(string.start[0] == '!' && string.start[1] == '\0')) {
- yaml_parser_set_scanner_error(parser, "while parsing a tag directive",
- start_mark, "did not find expected '!'");
- goto error;
- }
- }
-
- *handle = string.start;
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- return 0;
-}
-
-/*
- * Scan a tag.
- */
-
-static int
-yaml_parser_scan_tag_uri(yaml_parser_t *parser, int directive,
- yaml_char_t *head, yaml_mark_t start_mark, yaml_char_t **uri)
-{
- size_t length = head ? strlen((char *)head) : 0;
- yaml_string_t string = NULL_STRING;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
-
- /* Resize the string to include the head. */
-
- while ((size_t)(string.end - string.start) <= length) {
- if (!yaml_string_extend(&string.start, &string.pointer, &string.end)) {
- parser->error = YAML_MEMORY_ERROR;
- goto error;
- }
- }
-
- /*
- * Copy the head if needed.
- *
- * Note that we don't copy the leading '!' character.
- */
-
- if (length > 1) {
- memcpy(string.start, head+1, length-1);
- string.pointer += length-1;
- }
-
- /* Scan the tag. */
-
- if (!CACHE(parser, 1)) goto error;
-
- /*
- * The set of characters that may appear in URI is as follows:
- *
- * '0'-'9', 'A'-'Z', 'a'-'z', '_', '-', ';', '/', '?', ':', '@', '&',
- * '=', '+', '$', ',', '.', '!', '~', '*', '\'', '(', ')', '[', ']',
- * '%'.
- */
-
- while (IS_ALPHA(parser->buffer) || CHECK(parser->buffer, ';')
- || CHECK(parser->buffer, '/') || CHECK(parser->buffer, '?')
- || CHECK(parser->buffer, ':') || CHECK(parser->buffer, '@')
- || CHECK(parser->buffer, '&') || CHECK(parser->buffer, '=')
- || CHECK(parser->buffer, '+') || CHECK(parser->buffer, '$')
- || CHECK(parser->buffer, ',') || CHECK(parser->buffer, '.')
- || CHECK(parser->buffer, '!') || CHECK(parser->buffer, '~')
- || CHECK(parser->buffer, '*') || CHECK(parser->buffer, '\'')
- || CHECK(parser->buffer, '(') || CHECK(parser->buffer, ')')
- || CHECK(parser->buffer, '[') || CHECK(parser->buffer, ']')
- || CHECK(parser->buffer, '%'))
- {
- /* Check if it is a URI-escape sequence. */
-
- if (CHECK(parser->buffer, '%')) {
- if (!STRING_EXTEND(parser, string))
- goto error;
-
- if (!yaml_parser_scan_uri_escapes(parser,
- directive, start_mark, &string)) goto error;
- }
- else {
- if (!READ(parser, string)) goto error;
- }
-
- length ++;
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Check if the tag is non-empty. */
-
- if (!length) {
- if (!STRING_EXTEND(parser, string))
- goto error;
-
- yaml_parser_set_scanner_error(parser, directive ?
- "while parsing a %TAG directive" : "while parsing a tag",
- start_mark, "did not find expected tag URI");
- goto error;
- }
-
- *uri = string.start;
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- return 0;
-}
-
-/*
- * Decode an URI-escape sequence corresponding to a single UTF-8 character.
- */
-
-static int
-yaml_parser_scan_uri_escapes(yaml_parser_t *parser, int directive,
- yaml_mark_t start_mark, yaml_string_t *string)
-{
- int width = 0;
-
- /* Decode the required number of characters. */
-
- do {
-
- unsigned char octet = 0;
-
- /* Check for a URI-escaped octet. */
-
- if (!CACHE(parser, 3)) return 0;
-
- if (!(CHECK(parser->buffer, '%')
- && IS_HEX_AT(parser->buffer, 1)
- && IS_HEX_AT(parser->buffer, 2))) {
- return yaml_parser_set_scanner_error(parser, directive ?
- "while parsing a %TAG directive" : "while parsing a tag",
- start_mark, "did not find URI escaped octet");
- }
-
- /* Get the octet. */
-
- octet = (AS_HEX_AT(parser->buffer, 1) << 4) + AS_HEX_AT(parser->buffer, 2);
-
- /* If it is the leading octet, determine the length of the UTF-8 sequence. */
-
- if (!width)
- {
- width = (octet & 0x80) == 0x00 ? 1 :
- (octet & 0xE0) == 0xC0 ? 2 :
- (octet & 0xF0) == 0xE0 ? 3 :
- (octet & 0xF8) == 0xF0 ? 4 : 0;
- if (!width) {
- return yaml_parser_set_scanner_error(parser, directive ?
- "while parsing a %TAG directive" : "while parsing a tag",
- start_mark, "found an incorrect leading UTF-8 octet");
- }
- }
- else
- {
- /* Check if the trailing octet is correct. */
-
- if ((octet & 0xC0) != 0x80) {
- return yaml_parser_set_scanner_error(parser, directive ?
- "while parsing a %TAG directive" : "while parsing a tag",
- start_mark, "found an incorrect trailing UTF-8 octet");
- }
- }
-
- /* Copy the octet and move the pointers. */
-
- *(string->pointer++) = octet;
- SKIP(parser);
- SKIP(parser);
- SKIP(parser);
-
- } while (--width);
-
- return 1;
-}
-
-/*
- * Scan a block scalar.
- */
-
-static int
-yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
- int literal)
-{
- yaml_mark_t start_mark;
- yaml_mark_t end_mark;
- yaml_string_t string = NULL_STRING;
- yaml_string_t leading_break = NULL_STRING;
- yaml_string_t trailing_breaks = NULL_STRING;
- int chomping = 0;
- int increment = 0;
- int indent = 0;
- int leading_blank = 0;
- int trailing_blank = 0;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, leading_break, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, trailing_breaks, INITIAL_STRING_SIZE)) goto error;
-
- /* Eat the indicator '|' or '>'. */
-
- start_mark = parser->mark;
-
- SKIP(parser);
-
- /* Scan the additional block scalar indicators. */
-
- if (!CACHE(parser, 1)) goto error;
-
- /* Check for a chomping indicator. */
-
- if (CHECK(parser->buffer, '+') || CHECK(parser->buffer, '-'))
- {
- /* Set the chomping method and eat the indicator. */
-
- chomping = CHECK(parser->buffer, '+') ? +1 : -1;
-
- SKIP(parser);
-
- /* Check for an indentation indicator. */
-
- if (!CACHE(parser, 1)) goto error;
-
- if (IS_DIGIT(parser->buffer))
- {
- /* Check that the intendation is greater than 0. */
-
- if (CHECK(parser->buffer, '0')) {
- yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
- start_mark, "found an intendation indicator equal to 0");
- goto error;
- }
-
- /* Get the intendation level and eat the indicator. */
-
- increment = AS_DIGIT(parser->buffer);
-
- SKIP(parser);
- }
- }
-
- /* Do the same as above, but in the opposite order. */
-
- else if (IS_DIGIT(parser->buffer))
- {
- if (CHECK(parser->buffer, '0')) {
- yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
- start_mark, "found an intendation indicator equal to 0");
- goto error;
- }
-
- increment = AS_DIGIT(parser->buffer);
-
- SKIP(parser);
-
- if (!CACHE(parser, 1)) goto error;
-
- if (CHECK(parser->buffer, '+') || CHECK(parser->buffer, '-')) {
- chomping = CHECK(parser->buffer, '+') ? +1 : -1;
-
- SKIP(parser);
- }
- }
-
- /* Eat whitespaces and comments to the end of the line. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_BLANK(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) goto error;
- }
-
- if (CHECK(parser->buffer, '#')) {
- while (!IS_BREAKZ(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) goto error;
- }
- }
-
- /* Check if we are at the end of the line. */
-
- if (!IS_BREAKZ(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
- start_mark, "did not find expected comment or line break");
- goto error;
- }
-
- /* Eat a line break. */
-
- if (IS_BREAK(parser->buffer)) {
- if (!CACHE(parser, 2)) goto error;
- SKIP_LINE(parser);
- }
-
- end_mark = parser->mark;
-
- /* Set the intendation level if it was specified. */
-
- if (increment) {
- indent = parser->indent >= 0 ? parser->indent+increment : increment;
- }
-
- /* Scan the leading line breaks and determine the indentation level if needed. */
-
- if (!yaml_parser_scan_block_scalar_breaks(parser, &indent, &trailing_breaks,
- start_mark, &end_mark)) goto error;
-
- /* Scan the block scalar content. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while ((int)parser->mark.column == indent && !IS_Z(parser->buffer))
- {
- /*
- * We are at the beginning of a non-empty line.
- */
-
- /* Is it a trailing whitespace? */
-
- trailing_blank = IS_BLANK(parser->buffer);
-
- /* Check if we need to fold the leading line break. */
-
- if (!literal && (*leading_break.start == '\n')
- && !leading_blank && !trailing_blank)
- {
- /* Do we need to join the lines by space? */
-
- if (*trailing_breaks.start == '\0') {
- if (!STRING_EXTEND(parser, string)) goto error;
- *(string.pointer ++) = ' ';
- }
-
- CLEAR(parser, leading_break);
- }
- else {
- if (!JOIN(parser, string, leading_break)) goto error;
- CLEAR(parser, leading_break);
- }
-
- /* Append the remaining line breaks. */
-
- if (!JOIN(parser, string, trailing_breaks)) goto error;
- CLEAR(parser, trailing_breaks);
-
- /* Is it a leading whitespace? */
-
- leading_blank = IS_BLANK(parser->buffer);
-
- /* Consume the current line. */
-
- while (!IS_BREAKZ(parser->buffer)) {
- if (!READ(parser, string)) goto error;
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Consume the line break. */
-
- if (!CACHE(parser, 2)) goto error;
-
- if (!READ_LINE(parser, leading_break)) goto error;
-
- /* Eat the following intendation spaces and line breaks. */
-
- if (!yaml_parser_scan_block_scalar_breaks(parser,
- &indent, &trailing_breaks, start_mark, &end_mark)) goto error;
- }
-
- /* Chomp the tail. */
-
- if (chomping != -1) {
- if (!JOIN(parser, string, leading_break)) goto error;
- }
- if (chomping == 1) {
- if (!JOIN(parser, string, trailing_breaks)) goto error;
- }
-
- /* Create a token. */
-
- SCALAR_TOKEN_INIT(*token, string.start, string.pointer-string.start,
- literal ? YAML_LITERAL_SCALAR_STYLE : YAML_FOLDED_SCALAR_STYLE,
- start_mark, end_mark);
-
- STRING_DEL(parser, leading_break);
- STRING_DEL(parser, trailing_breaks);
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- STRING_DEL(parser, leading_break);
- STRING_DEL(parser, trailing_breaks);
-
- return 0;
-}
-
-/*
- * Scan intendation spaces and line breaks for a block scalar. Determine the
- * intendation level if needed.
- */
-
-static int
-yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
- int *indent, yaml_string_t *breaks,
- yaml_mark_t start_mark, yaml_mark_t *end_mark)
-{
- int max_indent = 0;
-
- *end_mark = parser->mark;
-
- /* Eat the intendation spaces and line breaks. */
-
- while (1)
- {
- /* Eat the intendation spaces. */
-
- if (!CACHE(parser, 1)) return 0;
-
- while ((!*indent || (int)parser->mark.column < *indent)
- && IS_SPACE(parser->buffer)) {
- SKIP(parser);
- if (!CACHE(parser, 1)) return 0;
- }
-
- if ((int)parser->mark.column > max_indent)
- max_indent = (int)parser->mark.column;
-
- /* Check for a tab character messing the intendation. */
-
- if ((!*indent || (int)parser->mark.column < *indent)
- && IS_TAB(parser->buffer)) {
- return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
- start_mark, "found a tab character where an intendation space is expected");
- }
-
- /* Have we found a non-empty line? */
-
- if (!IS_BREAK(parser->buffer)) break;
-
- /* Consume the line break. */
-
- if (!CACHE(parser, 2)) return 0;
- if (!READ_LINE(parser, *breaks)) return 0;
- *end_mark = parser->mark;
- }
-
- /* Determine the indentation level if needed. */
-
- if (!*indent) {
- *indent = max_indent;
- if (*indent < parser->indent + 1)
- *indent = parser->indent + 1;
- if (*indent < 1)
- *indent = 1;
- }
-
- return 1;
-}
-
-/*
- * Scan a quoted scalar.
- */
-
-static int
-yaml_parser_scan_flow_scalar(yaml_parser_t *parser, yaml_token_t *token,
- int single)
-{
- yaml_mark_t start_mark;
- yaml_mark_t end_mark;
- yaml_string_t string = NULL_STRING;
- yaml_string_t leading_break = NULL_STRING;
- yaml_string_t trailing_breaks = NULL_STRING;
- yaml_string_t whitespaces = NULL_STRING;
- int leading_blanks;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, leading_break, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, trailing_breaks, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, whitespaces, INITIAL_STRING_SIZE)) goto error;
-
- /* Eat the left quote. */
-
- start_mark = parser->mark;
-
- SKIP(parser);
-
- /* Consume the content of the quoted scalar. */
-
- while (1)
- {
- /* Check that there are no document indicators at the beginning of the line. */
-
- if (!CACHE(parser, 4)) goto error;
-
- if (parser->mark.column == 0 &&
- ((CHECK_AT(parser->buffer, '-', 0) &&
- CHECK_AT(parser->buffer, '-', 1) &&
- CHECK_AT(parser->buffer, '-', 2)) ||
- (CHECK_AT(parser->buffer, '.', 0) &&
- CHECK_AT(parser->buffer, '.', 1) &&
- CHECK_AT(parser->buffer, '.', 2))) &&
- IS_BLANKZ_AT(parser->buffer, 3))
- {
- yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
- start_mark, "found unexpected document indicator");
- goto error;
- }
-
- /* Check for EOF. */
-
- if (IS_Z(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a quoted scalar",
- start_mark, "found unexpected end of stream");
- goto error;
- }
-
- /* Consume non-blank characters. */
-
- if (!CACHE(parser, 2)) goto error;
-
- leading_blanks = 0;
-
- while (!IS_BLANKZ(parser->buffer))
- {
- /* Check for an escaped single quote. */
-
- if (single && CHECK_AT(parser->buffer, '\'', 0)
- && CHECK_AT(parser->buffer, '\'', 1))
- {
- if (!STRING_EXTEND(parser, string)) goto error;
- *(string.pointer++) = '\'';
- SKIP(parser);
- SKIP(parser);
- }
-
- /* Check for the right quote. */
-
- else if (CHECK(parser->buffer, single ? '\'' : '"'))
- {
- break;
- }
-
- /* Check for an escaped line break. */
-
- else if (!single && CHECK(parser->buffer, '\\')
- && IS_BREAK_AT(parser->buffer, 1))
- {
- if (!CACHE(parser, 3)) goto error;
- SKIP(parser);
- SKIP_LINE(parser);
- leading_blanks = 1;
- break;
- }
-
- /* Check for an escape sequence. */
-
- else if (!single && CHECK(parser->buffer, '\\'))
- {
- size_t code_length = 0;
-
- if (!STRING_EXTEND(parser, string)) goto error;
-
- /* Check the escape character. */
-
- switch (parser->buffer.pointer[1])
- {
- case '0':
- *(string.pointer++) = '\0';
- break;
-
- case 'a':
- *(string.pointer++) = '\x07';
- break;
-
- case 'b':
- *(string.pointer++) = '\x08';
- break;
-
- case 't':
- case '\t':
- *(string.pointer++) = '\x09';
- break;
-
- case 'n':
- *(string.pointer++) = '\x0A';
- break;
-
- case 'v':
- *(string.pointer++) = '\x0B';
- break;
-
- case 'f':
- *(string.pointer++) = '\x0C';
- break;
-
- case 'r':
- *(string.pointer++) = '\x0D';
- break;
-
- case 'e':
- *(string.pointer++) = '\x1B';
- break;
-
- case ' ':
- *(string.pointer++) = '\x20';
- break;
-
- case '"':
- *(string.pointer++) = '"';
- break;
-
- case '\'':
- *(string.pointer++) = '\'';
- break;
-
- case '\\':
- *(string.pointer++) = '\\';
- break;
-
- case 'N': /* NEL (#x85) */
- *(string.pointer++) = '\xC2';
- *(string.pointer++) = '\x85';
- break;
-
- case '_': /* #xA0 */
- *(string.pointer++) = '\xC2';
- *(string.pointer++) = '\xA0';
- break;
-
- case 'L': /* LS (#x2028) */
- *(string.pointer++) = '\xE2';
- *(string.pointer++) = '\x80';
- *(string.pointer++) = '\xA8';
- break;
-
- case 'P': /* PS (#x2029) */
- *(string.pointer++) = '\xE2';
- *(string.pointer++) = '\x80';
- *(string.pointer++) = '\xA9';
- break;
-
- case 'x':
- code_length = 2;
- break;
-
- case 'u':
- code_length = 4;
- break;
-
- case 'U':
- code_length = 8;
- break;
-
- default:
- yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
- start_mark, "found unknown escape character");
- goto error;
- }
-
- SKIP(parser);
- SKIP(parser);
-
- /* Consume an arbitrary escape code. */
-
- if (code_length)
- {
- unsigned int value = 0;
- size_t k;
-
- /* Scan the character value. */
-
- if (!CACHE(parser, code_length)) goto error;
-
- for (k = 0; k < code_length; k ++) {
- if (!IS_HEX_AT(parser->buffer, k)) {
- yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
- start_mark, "did not find expected hexdecimal number");
- goto error;
- }
- value = (value << 4) + AS_HEX_AT(parser->buffer, k);
- }
-
- /* Check the value and write the character. */
-
- if ((value >= 0xD800 && value <= 0xDFFF) || value > 0x10FFFF) {
- yaml_parser_set_scanner_error(parser, "while parsing a quoted scalar",
- start_mark, "found invalid Unicode character escape code");
- goto error;
- }
-
- if (value <= 0x7F) {
- *(string.pointer++) = value;
- }
- else if (value <= 0x7FF) {
- *(string.pointer++) = 0xC0 + (value >> 6);
- *(string.pointer++) = 0x80 + (value & 0x3F);
- }
- else if (value <= 0xFFFF) {
- *(string.pointer++) = 0xE0 + (value >> 12);
- *(string.pointer++) = 0x80 + ((value >> 6) & 0x3F);
- *(string.pointer++) = 0x80 + (value & 0x3F);
- }
- else {
- *(string.pointer++) = 0xF0 + (value >> 18);
- *(string.pointer++) = 0x80 + ((value >> 12) & 0x3F);
- *(string.pointer++) = 0x80 + ((value >> 6) & 0x3F);
- *(string.pointer++) = 0x80 + (value & 0x3F);
- }
-
- /* Advance the pointer. */
-
- for (k = 0; k < code_length; k ++) {
- SKIP(parser);
- }
- }
- }
-
- else
- {
- /* It is a non-escaped non-blank character. */
-
- if (!READ(parser, string)) goto error;
- }
-
- if (!CACHE(parser, 2)) goto error;
- }
-
- /* Check if we are at the end of the scalar. */
-
- if (CHECK(parser->buffer, single ? '\'' : '"'))
- break;
-
- /* Consume blank characters. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_BLANK(parser->buffer) || IS_BREAK(parser->buffer))
- {
- if (IS_BLANK(parser->buffer))
- {
- /* Consume a space or a tab character. */
-
- if (!leading_blanks) {
- if (!READ(parser, whitespaces)) goto error;
- }
- else {
- SKIP(parser);
- }
- }
- else
- {
- if (!CACHE(parser, 2)) goto error;
-
- /* Check if it is a first line break. */
-
- if (!leading_blanks)
- {
- CLEAR(parser, whitespaces);
- if (!READ_LINE(parser, leading_break)) goto error;
- leading_blanks = 1;
- }
- else
- {
- if (!READ_LINE(parser, trailing_breaks)) goto error;
- }
- }
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Join the whitespaces or fold line breaks. */
-
- if (leading_blanks)
- {
- /* Do we need to fold line breaks? */
-
- if (leading_break.start[0] == '\n') {
- if (trailing_breaks.start[0] == '\0') {
- if (!STRING_EXTEND(parser, string)) goto error;
- *(string.pointer++) = ' ';
- }
- else {
- if (!JOIN(parser, string, trailing_breaks)) goto error;
- CLEAR(parser, trailing_breaks);
- }
- CLEAR(parser, leading_break);
- }
- else {
- if (!JOIN(parser, string, leading_break)) goto error;
- if (!JOIN(parser, string, trailing_breaks)) goto error;
- CLEAR(parser, leading_break);
- CLEAR(parser, trailing_breaks);
- }
- }
- else
- {
- if (!JOIN(parser, string, whitespaces)) goto error;
- CLEAR(parser, whitespaces);
- }
- }
-
- /* Eat the right quote. */
-
- SKIP(parser);
-
- end_mark = parser->mark;
-
- /* Create a token. */
-
- SCALAR_TOKEN_INIT(*token, string.start, string.pointer-string.start,
- single ? YAML_SINGLE_QUOTED_SCALAR_STYLE : YAML_DOUBLE_QUOTED_SCALAR_STYLE,
- start_mark, end_mark);
-
- STRING_DEL(parser, leading_break);
- STRING_DEL(parser, trailing_breaks);
- STRING_DEL(parser, whitespaces);
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- STRING_DEL(parser, leading_break);
- STRING_DEL(parser, trailing_breaks);
- STRING_DEL(parser, whitespaces);
-
- return 0;
-}
-
-/*
- * Scan a plain scalar.
- */
-
-static int
-yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
-{
- yaml_mark_t start_mark;
- yaml_mark_t end_mark;
- yaml_string_t string = NULL_STRING;
- yaml_string_t leading_break = NULL_STRING;
- yaml_string_t trailing_breaks = NULL_STRING;
- yaml_string_t whitespaces = NULL_STRING;
- int leading_blanks = 0;
- int indent = parser->indent+1;
-
- if (!STRING_INIT(parser, string, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, leading_break, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, trailing_breaks, INITIAL_STRING_SIZE)) goto error;
- if (!STRING_INIT(parser, whitespaces, INITIAL_STRING_SIZE)) goto error;
-
- start_mark = end_mark = parser->mark;
-
- /* Consume the content of the plain scalar. */
-
- while (1)
- {
- /* Check for a document indicator. */
-
- if (!CACHE(parser, 4)) goto error;
-
- if (parser->mark.column == 0 &&
- ((CHECK_AT(parser->buffer, '-', 0) &&
- CHECK_AT(parser->buffer, '-', 1) &&
- CHECK_AT(parser->buffer, '-', 2)) ||
- (CHECK_AT(parser->buffer, '.', 0) &&
- CHECK_AT(parser->buffer, '.', 1) &&
- CHECK_AT(parser->buffer, '.', 2))) &&
- IS_BLANKZ_AT(parser->buffer, 3)) break;
-
- /* Check for a comment. */
-
- if (CHECK(parser->buffer, '#'))
- break;
-
- /* Consume non-blank characters. */
-
- while (!IS_BLANKZ(parser->buffer))
- {
- /* Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13". */
-
- if (parser->flow_level
- && CHECK(parser->buffer, ':')
- && !IS_BLANKZ_AT(parser->buffer, 1)) {
- yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
- start_mark, "found unexpected ':'");
- goto error;
- }
-
- /* Check for indicators that may end a plain scalar. */
-
- if ((CHECK(parser->buffer, ':') && IS_BLANKZ_AT(parser->buffer, 1))
- || (parser->flow_level &&
- (CHECK(parser->buffer, ',') || CHECK(parser->buffer, ':')
- || CHECK(parser->buffer, '?') || CHECK(parser->buffer, '[')
- || CHECK(parser->buffer, ']') || CHECK(parser->buffer, '{')
- || CHECK(parser->buffer, '}'))))
- break;
-
- /* Check if we need to join whitespaces and breaks. */
-
- if (leading_blanks || whitespaces.start != whitespaces.pointer)
- {
- if (leading_blanks)
- {
- /* Do we need to fold line breaks? */
-
- if (leading_break.start[0] == '\n') {
- if (trailing_breaks.start[0] == '\0') {
- if (!STRING_EXTEND(parser, string)) goto error;
- *(string.pointer++) = ' ';
- }
- else {
- if (!JOIN(parser, string, trailing_breaks)) goto error;
- CLEAR(parser, trailing_breaks);
- }
- CLEAR(parser, leading_break);
- }
- else {
- if (!JOIN(parser, string, leading_break)) goto error;
- if (!JOIN(parser, string, trailing_breaks)) goto error;
- CLEAR(parser, leading_break);
- CLEAR(parser, trailing_breaks);
- }
-
- leading_blanks = 0;
- }
- else
- {
- if (!JOIN(parser, string, whitespaces)) goto error;
- CLEAR(parser, whitespaces);
- }
- }
-
- /* Copy the character. */
-
- if (!READ(parser, string)) goto error;
-
- end_mark = parser->mark;
-
- if (!CACHE(parser, 2)) goto error;
- }
-
- /* Is it the end? */
-
- if (!(IS_BLANK(parser->buffer) || IS_BREAK(parser->buffer)))
- break;
-
- /* Consume blank characters. */
-
- if (!CACHE(parser, 1)) goto error;
-
- while (IS_BLANK(parser->buffer) || IS_BREAK(parser->buffer))
- {
- if (IS_BLANK(parser->buffer))
- {
- /* Check for tab character that abuse intendation. */
-
- if (leading_blanks && (int)parser->mark.column < indent
- && IS_TAB(parser->buffer)) {
- yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
- start_mark, "found a tab character that violate intendation");
- goto error;
- }
-
- /* Consume a space or a tab character. */
-
- if (!leading_blanks) {
- if (!READ(parser, whitespaces)) goto error;
- }
- else {
- SKIP(parser);
- }
- }
- else
- {
- if (!CACHE(parser, 2)) goto error;
-
- /* Check if it is a first line break. */
-
- if (!leading_blanks)
- {
- CLEAR(parser, whitespaces);
- if (!READ_LINE(parser, leading_break)) goto error;
- leading_blanks = 1;
- }
- else
- {
- if (!READ_LINE(parser, trailing_breaks)) goto error;
- }
- }
- if (!CACHE(parser, 1)) goto error;
- }
-
- /* Check intendation level. */
-
- if (!parser->flow_level && (int)parser->mark.column < indent)
- break;
- }
-
- /* Create a token. */
-
- SCALAR_TOKEN_INIT(*token, string.start, string.pointer-string.start,
- YAML_PLAIN_SCALAR_STYLE, start_mark, end_mark);
-
- /* Note that we change the 'simple_key_allowed' flag. */
-
- if (leading_blanks) {
- parser->simple_key_allowed = 1;
- }
-
- STRING_DEL(parser, leading_break);
- STRING_DEL(parser, trailing_breaks);
- STRING_DEL(parser, whitespaces);
-
- return 1;
-
-error:
- STRING_DEL(parser, string);
- STRING_DEL(parser, leading_break);
- STRING_DEL(parser, trailing_breaks);
- STRING_DEL(parser, whitespaces);
-
- return 0;
-}
-
diff --git a/ext/psych/yaml/writer.c b/ext/psych/yaml/writer.c
deleted file mode 100644
index 5d57f392f1..0000000000
--- a/ext/psych/yaml/writer.c
+++ /dev/null
@@ -1,141 +0,0 @@
-
-#include "yaml_private.h"
-
-/*
- * Declarations.
- */
-
-static int
-yaml_emitter_set_writer_error(yaml_emitter_t *emitter, const char *problem);
-
-YAML_DECLARE(int)
-yaml_emitter_flush(yaml_emitter_t *emitter);
-
-/*
- * Set the writer error and return 0.
- */
-
-static int
-yaml_emitter_set_writer_error(yaml_emitter_t *emitter, const char *problem)
-{
- emitter->error = YAML_WRITER_ERROR;
- emitter->problem = problem;
-
- return 0;
-}
-
-/*
- * Flush the output buffer.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_flush(yaml_emitter_t *emitter)
-{
- int low, high;
-
- assert(emitter); /* Non-NULL emitter object is expected. */
- assert(emitter->write_handler); /* Write handler must be set. */
- assert(emitter->encoding); /* Output encoding must be set. */
-
- emitter->buffer.last = emitter->buffer.pointer;
- emitter->buffer.pointer = emitter->buffer.start;
-
- /* Check if the buffer is empty. */
-
- if (emitter->buffer.start == emitter->buffer.last) {
- return 1;
- }
-
- /* If the output encoding is UTF-8, we don't need to recode the buffer. */
-
- if (emitter->encoding == YAML_UTF8_ENCODING)
- {
- if (emitter->write_handler(emitter->write_handler_data,
- emitter->buffer.start,
- emitter->buffer.last - emitter->buffer.start)) {
- emitter->buffer.last = emitter->buffer.start;
- emitter->buffer.pointer = emitter->buffer.start;
- return 1;
- }
- else {
- return yaml_emitter_set_writer_error(emitter, "write error");
- }
- }
-
- /* Recode the buffer into the raw buffer. */
-
- low = (emitter->encoding == YAML_UTF16LE_ENCODING ? 0 : 1);
- high = (emitter->encoding == YAML_UTF16LE_ENCODING ? 1 : 0);
-
- while (emitter->buffer.pointer != emitter->buffer.last)
- {
- unsigned char octet;
- unsigned int width;
- unsigned int value;
- size_t k;
-
- /*
- * See the "reader.c" code for more details on UTF-8 encoding. Note
- * that we assume that the buffer contains a valid UTF-8 sequence.
- */
-
- /* Read the next UTF-8 character. */
-
- octet = emitter->buffer.pointer[0];
-
- width = (octet & 0x80) == 0x00 ? 1 :
- (octet & 0xE0) == 0xC0 ? 2 :
- (octet & 0xF0) == 0xE0 ? 3 :
- (octet & 0xF8) == 0xF0 ? 4 : 0;
-
- value = (octet & 0x80) == 0x00 ? octet & 0x7F :
- (octet & 0xE0) == 0xC0 ? octet & 0x1F :
- (octet & 0xF0) == 0xE0 ? octet & 0x0F :
- (octet & 0xF8) == 0xF0 ? octet & 0x07 : 0;
-
- for (k = 1; k < width; k ++) {
- octet = emitter->buffer.pointer[k];
- value = (value << 6) + (octet & 0x3F);
- }
-
- emitter->buffer.pointer += width;
-
- /* Write the character. */
-
- if (value < 0x10000)
- {
- emitter->raw_buffer.last[high] = value >> 8;
- emitter->raw_buffer.last[low] = value & 0xFF;
-
- emitter->raw_buffer.last += 2;
- }
- else
- {
- /* Write the character using a surrogate pair (check "reader.c"). */
-
- value -= 0x10000;
- emitter->raw_buffer.last[high] = 0xD8 + (value >> 18);
- emitter->raw_buffer.last[low] = (value >> 10) & 0xFF;
- emitter->raw_buffer.last[high+2] = 0xDC + ((value >> 8) & 0xFF);
- emitter->raw_buffer.last[low+2] = value & 0xFF;
-
- emitter->raw_buffer.last += 4;
- }
- }
-
- /* Write the raw buffer. */
-
- if (emitter->write_handler(emitter->write_handler_data,
- emitter->raw_buffer.start,
- emitter->raw_buffer.last - emitter->raw_buffer.start)) {
- emitter->buffer.last = emitter->buffer.start;
- emitter->buffer.pointer = emitter->buffer.start;
- emitter->raw_buffer.last = emitter->raw_buffer.start;
- emitter->raw_buffer.pointer = emitter->raw_buffer.start;
- return 1;
- }
- else {
- return yaml_emitter_set_writer_error(emitter, "write error");
- }
-}
-
diff --git a/ext/psych/yaml/yaml.h b/ext/psych/yaml/yaml.h
deleted file mode 100644
index acd72ad3a3..0000000000
--- a/ext/psych/yaml/yaml.h
+++ /dev/null
@@ -1,1971 +0,0 @@
-/**
- * @file yaml.h
- * @brief Public interface for libyaml.
- *
- * Include the header file with the code:
- * @code
- * #include <yaml.h>
- * @endcode
- */
-
-#ifndef YAML_H
-#define YAML_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-/**
- * @defgroup export Export Definitions
- * @{
- */
-
-/** The public API declaration. */
-
-#ifdef _WIN32
-# if defined(YAML_DECLARE_STATIC)
-# define YAML_DECLARE(type) type
-# elif defined(YAML_DECLARE_EXPORT)
-# define YAML_DECLARE(type) __declspec(dllexport) type
-# else
-# define YAML_DECLARE(type) __declspec(dllimport) type
-# endif
-#else
-# define YAML_DECLARE(type) type
-#endif
-
-/** @} */
-
-/**
- * @defgroup version Version Information
- * @{
- */
-
-/**
- * Get the library version as a string.
- *
- * @returns The function returns the pointer to a static string of the form
- * @c "X.Y.Z", where @c X is the major version number, @c Y is a minor version
- * number, and @c Z is the patch version number.
- */
-
-YAML_DECLARE(const char *)
-yaml_get_version_string(void);
-
-/**
- * Get the library version numbers.
- *
- * @param[out] major Major version number.
- * @param[out] minor Minor version number.
- * @param[out] patch Patch version number.
- */
-
-YAML_DECLARE(void)
-yaml_get_version(int *major, int *minor, int *patch);
-
-/** @} */
-
-/**
- * @defgroup basic Basic Types
- * @{
- */
-
-/** The character type (UTF-8 octet). */
-typedef unsigned char yaml_char_t;
-
-/** The version directive data. */
-typedef struct yaml_version_directive_s {
- /** The major version number. */
- int major;
- /** The minor version number. */
- int minor;
-} yaml_version_directive_t;
-
-/** The tag directive data. */
-typedef struct yaml_tag_directive_s {
- /** The tag handle. */
- yaml_char_t *handle;
- /** The tag prefix. */
- yaml_char_t *prefix;
-} yaml_tag_directive_t;
-
-/** The stream encoding. */
-typedef enum yaml_encoding_e {
- /** Let the parser choose the encoding. */
- YAML_ANY_ENCODING,
- /** The default UTF-8 encoding. */
- YAML_UTF8_ENCODING,
- /** The UTF-16-LE encoding with BOM. */
- YAML_UTF16LE_ENCODING,
- /** The UTF-16-BE encoding with BOM. */
- YAML_UTF16BE_ENCODING
-} yaml_encoding_t;
-
-/** Line break types. */
-
-typedef enum yaml_break_e {
- /** Let the parser choose the break type. */
- YAML_ANY_BREAK,
- /** Use CR for line breaks (Mac style). */
- YAML_CR_BREAK,
- /** Use LN for line breaks (Unix style). */
- YAML_LN_BREAK,
- /** Use CR LN for line breaks (DOS style). */
- YAML_CRLN_BREAK
-} yaml_break_t;
-
-/** Many bad things could happen with the parser and emitter. */
-typedef enum yaml_error_type_e {
- /** No error is produced. */
- YAML_NO_ERROR,
-
- /** Cannot allocate or reallocate a block of memory. */
- YAML_MEMORY_ERROR,
-
- /** Cannot read or decode the input stream. */
- YAML_READER_ERROR,
- /** Cannot scan the input stream. */
- YAML_SCANNER_ERROR,
- /** Cannot parse the input stream. */
- YAML_PARSER_ERROR,
- /** Cannot compose a YAML document. */
- YAML_COMPOSER_ERROR,
-
- /** Cannot write to the output stream. */
- YAML_WRITER_ERROR,
- /** Cannot emit a YAML stream. */
- YAML_EMITTER_ERROR
-} yaml_error_type_t;
-
-/** The pointer position. */
-typedef struct yaml_mark_s {
- /** The position index. */
- size_t index;
-
- /** The position line. */
- size_t line;
-
- /** The position column. */
- size_t column;
-} yaml_mark_t;
-
-/** @} */
-
-/**
- * @defgroup styles Node Styles
- * @{
- */
-
-/** Scalar styles. */
-typedef enum yaml_scalar_style_e {
- /** Let the emitter choose the style. */
- YAML_ANY_SCALAR_STYLE,
-
- /** The plain scalar style. */
- YAML_PLAIN_SCALAR_STYLE,
-
- /** The single-quoted scalar style. */
- YAML_SINGLE_QUOTED_SCALAR_STYLE,
- /** The double-quoted scalar style. */
- YAML_DOUBLE_QUOTED_SCALAR_STYLE,
-
- /** The literal scalar style. */
- YAML_LITERAL_SCALAR_STYLE,
- /** The folded scalar style. */
- YAML_FOLDED_SCALAR_STYLE
-} yaml_scalar_style_t;
-
-/** Sequence styles. */
-typedef enum yaml_sequence_style_e {
- /** Let the emitter choose the style. */
- YAML_ANY_SEQUENCE_STYLE,
-
- /** The block sequence style. */
- YAML_BLOCK_SEQUENCE_STYLE,
- /** The flow sequence style. */
- YAML_FLOW_SEQUENCE_STYLE
-} yaml_sequence_style_t;
-
-/** Mapping styles. */
-typedef enum yaml_mapping_style_e {
- /** Let the emitter choose the style. */
- YAML_ANY_MAPPING_STYLE,
-
- /** The block mapping style. */
- YAML_BLOCK_MAPPING_STYLE,
- /** The flow mapping style. */
- YAML_FLOW_MAPPING_STYLE
-/* YAML_FLOW_SET_MAPPING_STYLE */
-} yaml_mapping_style_t;
-
-/** @} */
-
-/**
- * @defgroup tokens Tokens
- * @{
- */
-
-/** Token types. */
-typedef enum yaml_token_type_e {
- /** An empty token. */
- YAML_NO_TOKEN,
-
- /** A STREAM-START token. */
- YAML_STREAM_START_TOKEN,
- /** A STREAM-END token. */
- YAML_STREAM_END_TOKEN,
-
- /** A VERSION-DIRECTIVE token. */
- YAML_VERSION_DIRECTIVE_TOKEN,
- /** A TAG-DIRECTIVE token. */
- YAML_TAG_DIRECTIVE_TOKEN,
- /** A DOCUMENT-START token. */
- YAML_DOCUMENT_START_TOKEN,
- /** A DOCUMENT-END token. */
- YAML_DOCUMENT_END_TOKEN,
-
- /** A BLOCK-SEQUENCE-START token. */
- YAML_BLOCK_SEQUENCE_START_TOKEN,
- /** A BLOCK-SEQUENCE-END token. */
- YAML_BLOCK_MAPPING_START_TOKEN,
- /** A BLOCK-END token. */
- YAML_BLOCK_END_TOKEN,
-
- /** A FLOW-SEQUENCE-START token. */
- YAML_FLOW_SEQUENCE_START_TOKEN,
- /** A FLOW-SEQUENCE-END token. */
- YAML_FLOW_SEQUENCE_END_TOKEN,
- /** A FLOW-MAPPING-START token. */
- YAML_FLOW_MAPPING_START_TOKEN,
- /** A FLOW-MAPPING-END token. */
- YAML_FLOW_MAPPING_END_TOKEN,
-
- /** A BLOCK-ENTRY token. */
- YAML_BLOCK_ENTRY_TOKEN,
- /** A FLOW-ENTRY token. */
- YAML_FLOW_ENTRY_TOKEN,
- /** A KEY token. */
- YAML_KEY_TOKEN,
- /** A VALUE token. */
- YAML_VALUE_TOKEN,
-
- /** An ALIAS token. */
- YAML_ALIAS_TOKEN,
- /** An ANCHOR token. */
- YAML_ANCHOR_TOKEN,
- /** A TAG token. */
- YAML_TAG_TOKEN,
- /** A SCALAR token. */
- YAML_SCALAR_TOKEN
-} yaml_token_type_t;
-
-/** The token structure. */
-typedef struct yaml_token_s {
-
- /** The token type. */
- yaml_token_type_t type;
-
- /** The token data. */
- union {
-
- /** The stream start (for @c YAML_STREAM_START_TOKEN). */
- struct {
- /** The stream encoding. */
- yaml_encoding_t encoding;
- } stream_start;
-
- /** The alias (for @c YAML_ALIAS_TOKEN). */
- struct {
- /** The alias value. */
- yaml_char_t *value;
- } alias;
-
- /** The anchor (for @c YAML_ANCHOR_TOKEN). */
- struct {
- /** The anchor value. */
- yaml_char_t *value;
- } anchor;
-
- /** The tag (for @c YAML_TAG_TOKEN). */
- struct {
- /** The tag handle. */
- yaml_char_t *handle;
- /** The tag suffix. */
- yaml_char_t *suffix;
- } tag;
-
- /** The scalar value (for @c YAML_SCALAR_TOKEN). */
- struct {
- /** The scalar value. */
- yaml_char_t *value;
- /** The length of the scalar value. */
- size_t length;
- /** The scalar style. */
- yaml_scalar_style_t style;
- } scalar;
-
- /** The version directive (for @c YAML_VERSION_DIRECTIVE_TOKEN). */
- struct {
- /** The major version number. */
- int major;
- /** The minor version number. */
- int minor;
- } version_directive;
-
- /** The tag directive (for @c YAML_TAG_DIRECTIVE_TOKEN). */
- struct {
- /** The tag handle. */
- yaml_char_t *handle;
- /** The tag prefix. */
- yaml_char_t *prefix;
- } tag_directive;
-
- } data;
-
- /** The beginning of the token. */
- yaml_mark_t start_mark;
- /** The end of the token. */
- yaml_mark_t end_mark;
-
-} yaml_token_t;
-
-/**
- * Free any memory allocated for a token object.
- *
- * @param[in,out] token A token object.
- */
-
-YAML_DECLARE(void)
-yaml_token_delete(yaml_token_t *token);
-
-/** @} */
-
-/**
- * @defgroup events Events
- * @{
- */
-
-/** Event types. */
-typedef enum yaml_event_type_e {
- /** An empty event. */
- YAML_NO_EVENT,
-
- /** A STREAM-START event. */
- YAML_STREAM_START_EVENT,
- /** A STREAM-END event. */
- YAML_STREAM_END_EVENT,
-
- /** A DOCUMENT-START event. */
- YAML_DOCUMENT_START_EVENT,
- /** A DOCUMENT-END event. */
- YAML_DOCUMENT_END_EVENT,
-
- /** An ALIAS event. */
- YAML_ALIAS_EVENT,
- /** A SCALAR event. */
- YAML_SCALAR_EVENT,
-
- /** A SEQUENCE-START event. */
- YAML_SEQUENCE_START_EVENT,
- /** A SEQUENCE-END event. */
- YAML_SEQUENCE_END_EVENT,
-
- /** A MAPPING-START event. */
- YAML_MAPPING_START_EVENT,
- /** A MAPPING-END event. */
- YAML_MAPPING_END_EVENT
-} yaml_event_type_t;
-
-/** The event structure. */
-typedef struct yaml_event_s {
-
- /** The event type. */
- yaml_event_type_t type;
-
- /** The event data. */
- union {
-
- /** The stream parameters (for @c YAML_STREAM_START_EVENT). */
- struct {
- /** The document encoding. */
- yaml_encoding_t encoding;
- } stream_start;
-
- /** The document parameters (for @c YAML_DOCUMENT_START_EVENT). */
- struct {
- /** The version directive. */
- yaml_version_directive_t *version_directive;
-
- /** The list of tag directives. */
- struct {
- /** The beginning of the tag directives list. */
- yaml_tag_directive_t *start;
- /** The end of the tag directives list. */
- yaml_tag_directive_t *end;
- } tag_directives;
-
- /** Is the document indicator implicit? */
- int implicit;
- } document_start;
-
- /** The document end parameters (for @c YAML_DOCUMENT_END_EVENT). */
- struct {
- /** Is the document end indicator implicit? */
- int implicit;
- } document_end;
-
- /** The alias parameters (for @c YAML_ALIAS_EVENT). */
- struct {
- /** The anchor. */
- yaml_char_t *anchor;
- } alias;
-
- /** The scalar parameters (for @c YAML_SCALAR_EVENT). */
- struct {
- /** The anchor. */
- yaml_char_t *anchor;
- /** The tag. */
- yaml_char_t *tag;
- /** The scalar value. */
- yaml_char_t *value;
- /** The length of the scalar value. */
- size_t length;
- /** Is the tag optional for the plain style? */
- int plain_implicit;
- /** Is the tag optional for any non-plain style? */
- int quoted_implicit;
- /** The scalar style. */
- yaml_scalar_style_t style;
- } scalar;
-
- /** The sequence parameters (for @c YAML_SEQUENCE_START_EVENT). */
- struct {
- /** The anchor. */
- yaml_char_t *anchor;
- /** The tag. */
- yaml_char_t *tag;
- /** Is the tag optional? */
- int implicit;
- /** The sequence style. */
- yaml_sequence_style_t style;
- } sequence_start;
-
- /** The mapping parameters (for @c YAML_MAPPING_START_EVENT). */
- struct {
- /** The anchor. */
- yaml_char_t *anchor;
- /** The tag. */
- yaml_char_t *tag;
- /** Is the tag optional? */
- int implicit;
- /** The mapping style. */
- yaml_mapping_style_t style;
- } mapping_start;
-
- } data;
-
- /** The beginning of the event. */
- yaml_mark_t start_mark;
- /** The end of the event. */
- yaml_mark_t end_mark;
-
-} yaml_event_t;
-
-/**
- * Create the STREAM-START event.
- *
- * @param[out] event An empty event object.
- * @param[in] encoding The stream encoding.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_stream_start_event_initialize(yaml_event_t *event,
- yaml_encoding_t encoding);
-
-/**
- * Create the STREAM-END event.
- *
- * @param[out] event An empty event object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_stream_end_event_initialize(yaml_event_t *event);
-
-/**
- * Create the DOCUMENT-START event.
- *
- * The @a implicit argument is considered as a stylistic parameter and may be
- * ignored by the emitter.
- *
- * @param[out] event An empty event object.
- * @param[in] version_directive The %YAML directive value or
- * @c NULL.
- * @param[in] tag_directives_start The beginning of the %TAG
- * directives list.
- * @param[in] tag_directives_end The end of the %TAG directives
- * list.
- * @param[in] implicit If the document start indicator is
- * implicit.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_start_event_initialize(yaml_event_t *event,
- yaml_version_directive_t *version_directive,
- yaml_tag_directive_t *tag_directives_start,
- yaml_tag_directive_t *tag_directives_end,
- int implicit);
-
-/**
- * Create the DOCUMENT-END event.
- *
- * The @a implicit argument is considered as a stylistic parameter and may be
- * ignored by the emitter.
- *
- * @param[out] event An empty event object.
- * @param[in] implicit If the document end indicator is implicit.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_end_event_initialize(yaml_event_t *event, int implicit);
-
-/**
- * Create an ALIAS event.
- *
- * @param[out] event An empty event object.
- * @param[in] anchor The anchor value.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_alias_event_initialize(yaml_event_t *event, yaml_char_t *anchor);
-
-/**
- * Create a SCALAR event.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * Either the @a tag attribute or one of the @a plain_implicit and
- * @a quoted_implicit flags must be set.
- *
- * @param[out] event An empty event object.
- * @param[in] anchor The scalar anchor or @c NULL.
- * @param[in] tag The scalar tag or @c NULL.
- * @param[in] value The scalar value.
- * @param[in] length The length of the scalar value.
- * @param[in] plain_implicit If the tag may be omitted for the plain
- * style.
- * @param[in] quoted_implicit If the tag may be omitted for any
- * non-plain style.
- * @param[in] style The scalar style.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_scalar_event_initialize(yaml_event_t *event,
- yaml_char_t *anchor, yaml_char_t *tag,
- yaml_char_t *value, int length,
- int plain_implicit, int quoted_implicit,
- yaml_scalar_style_t style);
-
-/**
- * Create a SEQUENCE-START event.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * Either the @a tag attribute or the @a implicit flag must be set.
- *
- * @param[out] event An empty event object.
- * @param[in] anchor The sequence anchor or @c NULL.
- * @param[in] tag The sequence tag or @c NULL.
- * @param[in] implicit If the tag may be omitted.
- * @param[in] style The sequence style.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_sequence_start_event_initialize(yaml_event_t *event,
- yaml_char_t *anchor, yaml_char_t *tag, int implicit,
- yaml_sequence_style_t style);
-
-/**
- * Create a SEQUENCE-END event.
- *
- * @param[out] event An empty event object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_sequence_end_event_initialize(yaml_event_t *event);
-
-/**
- * Create a MAPPING-START event.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * Either the @a tag attribute or the @a implicit flag must be set.
- *
- * @param[out] event An empty event object.
- * @param[in] anchor The mapping anchor or @c NULL.
- * @param[in] tag The mapping tag or @c NULL.
- * @param[in] implicit If the tag may be omitted.
- * @param[in] style The mapping style.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_mapping_start_event_initialize(yaml_event_t *event,
- yaml_char_t *anchor, yaml_char_t *tag, int implicit,
- yaml_mapping_style_t style);
-
-/**
- * Create a MAPPING-END event.
- *
- * @param[out] event An empty event object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_mapping_end_event_initialize(yaml_event_t *event);
-
-/**
- * Free any memory allocated for an event object.
- *
- * @param[in,out] event An event object.
- */
-
-YAML_DECLARE(void)
-yaml_event_delete(yaml_event_t *event);
-
-/** @} */
-
-/**
- * @defgroup nodes Nodes
- * @{
- */
-
-/** The tag @c !!null with the only possible value: @c null. */
-#define YAML_NULL_TAG "tag:yaml.org,2002:null"
-/** The tag @c !!bool with the values: @c true and @c falce. */
-#define YAML_BOOL_TAG "tag:yaml.org,2002:bool"
-/** The tag @c !!str for string values. */
-#define YAML_STR_TAG "tag:yaml.org,2002:str"
-/** The tag @c !!int for integer values. */
-#define YAML_INT_TAG "tag:yaml.org,2002:int"
-/** The tag @c !!float for float values. */
-#define YAML_FLOAT_TAG "tag:yaml.org,2002:float"
-/** The tag @c !!timestamp for date and time values. */
-#define YAML_TIMESTAMP_TAG "tag:yaml.org,2002:timestamp"
-
-/** The tag @c !!seq is used to denote sequences. */
-#define YAML_SEQ_TAG "tag:yaml.org,2002:seq"
-/** The tag @c !!map is used to denote mapping. */
-#define YAML_MAP_TAG "tag:yaml.org,2002:map"
-
-/** The default scalar tag is @c !!str. */
-#define YAML_DEFAULT_SCALAR_TAG YAML_STR_TAG
-/** The default sequence tag is @c !!seq. */
-#define YAML_DEFAULT_SEQUENCE_TAG YAML_SEQ_TAG
-/** The default mapping tag is @c !!map. */
-#define YAML_DEFAULT_MAPPING_TAG YAML_MAP_TAG
-
-/** Node types. */
-typedef enum yaml_node_type_e {
- /** An empty node. */
- YAML_NO_NODE,
-
- /** A scalar node. */
- YAML_SCALAR_NODE,
- /** A sequence node. */
- YAML_SEQUENCE_NODE,
- /** A mapping node. */
- YAML_MAPPING_NODE
-} yaml_node_type_t;
-
-/** The forward definition of a document node structure. */
-typedef struct yaml_node_s yaml_node_t;
-
-/** An element of a sequence node. */
-typedef int yaml_node_item_t;
-
-/** An element of a mapping node. */
-typedef struct yaml_node_pair_s {
- /** The key of the element. */
- int key;
- /** The value of the element. */
- int value;
-} yaml_node_pair_t;
-
-/** The node structure. */
-struct yaml_node_s {
-
- /** The node type. */
- yaml_node_type_t type;
-
- /** The node tag. */
- yaml_char_t *tag;
-
- /** The node data. */
- union {
-
- /** The scalar parameters (for @c YAML_SCALAR_NODE). */
- struct {
- /** The scalar value. */
- yaml_char_t *value;
- /** The length of the scalar value. */
- size_t length;
- /** The scalar style. */
- yaml_scalar_style_t style;
- } scalar;
-
- /** The sequence parameters (for @c YAML_SEQUENCE_NODE). */
- struct {
- /** The stack of sequence items. */
- struct {
- /** The beginning of the stack. */
- yaml_node_item_t *start;
- /** The end of the stack. */
- yaml_node_item_t *end;
- /** The top of the stack. */
- yaml_node_item_t *top;
- } items;
- /** The sequence style. */
- yaml_sequence_style_t style;
- } sequence;
-
- /** The mapping parameters (for @c YAML_MAPPING_NODE). */
- struct {
- /** The stack of mapping pairs (key, value). */
- struct {
- /** The beginning of the stack. */
- yaml_node_pair_t *start;
- /** The end of the stack. */
- yaml_node_pair_t *end;
- /** The top of the stack. */
- yaml_node_pair_t *top;
- } pairs;
- /** The mapping style. */
- yaml_mapping_style_t style;
- } mapping;
-
- } data;
-
- /** The beginning of the node. */
- yaml_mark_t start_mark;
- /** The end of the node. */
- yaml_mark_t end_mark;
-
-};
-
-/** The document structure. */
-typedef struct yaml_document_s {
-
- /** The document nodes. */
- struct {
- /** The beginning of the stack. */
- yaml_node_t *start;
- /** The end of the stack. */
- yaml_node_t *end;
- /** The top of the stack. */
- yaml_node_t *top;
- } nodes;
-
- /** The version directive. */
- yaml_version_directive_t *version_directive;
-
- /** The list of tag directives. */
- struct {
- /** The beginning of the tag directives list. */
- yaml_tag_directive_t *start;
- /** The end of the tag directives list. */
- yaml_tag_directive_t *end;
- } tag_directives;
-
- /** Is the document start indicator implicit? */
- int start_implicit;
- /** Is the document end indicator implicit? */
- int end_implicit;
-
- /** The beginning of the document. */
- yaml_mark_t start_mark;
- /** The end of the document. */
- yaml_mark_t end_mark;
-
-} yaml_document_t;
-
-/**
- * Create a YAML document.
- *
- * @param[out] document An empty document object.
- * @param[in] version_directive The %YAML directive value or
- * @c NULL.
- * @param[in] tag_directives_start The beginning of the %TAG
- * directives list.
- * @param[in] tag_directives_end The end of the %TAG directives
- * list.
- * @param[in] start_implicit If the document start indicator is
- * implicit.
- * @param[in] end_implicit If the document end indicator is
- * implicit.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_initialize(yaml_document_t *document,
- yaml_version_directive_t *version_directive,
- yaml_tag_directive_t *tag_directives_start,
- yaml_tag_directive_t *tag_directives_end,
- int start_implicit, int end_implicit);
-
-/**
- * Delete a YAML document and all its nodes.
- *
- * @param[in,out] document A document object.
- */
-
-YAML_DECLARE(void)
-yaml_document_delete(yaml_document_t *document);
-
-/**
- * Get a node of a YAML document.
- *
- * The pointer returned by this function is valid until any of the functions
- * modifying the documents are called.
- *
- * @param[in] document A document object.
- * @param[in] index The node id.
- *
- * @returns the node objct or @c NULL if @c node_id is out of range.
- */
-
-YAML_DECLARE(yaml_node_t *)
-yaml_document_get_node(yaml_document_t *document, int index);
-
-/**
- * Get the root of a YAML document node.
- *
- * The root object is the first object added to the document.
- *
- * The pointer returned by this function is valid until any of the functions
- * modifying the documents are called.
- *
- * An empty document produced by the parser signifies the end of a YAML
- * stream.
- *
- * @param[in] document A document object.
- *
- * @returns the node object or @c NULL if the document is empty.
- */
-
-YAML_DECLARE(yaml_node_t *)
-yaml_document_get_root_node(yaml_document_t *document);
-
-/**
- * Create a SCALAR node and attach it to the document.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * @param[in,out] document A document object.
- * @param[in] tag The scalar tag.
- * @param[in] value The scalar value.
- * @param[in] length The length of the scalar value.
- * @param[in] style The scalar style.
- *
- * @returns the node id or @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_add_scalar(yaml_document_t *document,
- yaml_char_t *tag, yaml_char_t *value, int length,
- yaml_scalar_style_t style);
-
-/**
- * Create a SEQUENCE node and attach it to the document.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * @param[in,out] document A document object.
- * @param[in] tag The sequence tag.
- * @param[in] style The sequence style.
- *
- * @returns the node id or @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_add_sequence(yaml_document_t *document,
- yaml_char_t *tag, yaml_sequence_style_t style);
-
-/**
- * Create a MAPPING node and attach it to the document.
- *
- * The @a style argument may be ignored by the emitter.
- *
- * @param[in,out] document A document object.
- * @param[in] tag The sequence tag.
- * @param[in] style The sequence style.
- *
- * @returns the node id or @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_add_mapping(yaml_document_t *document,
- yaml_char_t *tag, yaml_mapping_style_t style);
-
-/**
- * Add an item to a SEQUENCE node.
- *
- * @param[in,out] document A document object.
- * @param[in] sequence The sequence node id.
- * @param[in] item The item node id.
-*
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_append_sequence_item(yaml_document_t *document,
- int sequence, int item);
-
-/**
- * Add a pair of a key and a value to a MAPPING node.
- *
- * @param[in,out] document A document object.
- * @param[in] mapping The mapping node id.
- * @param[in] key The key node id.
- * @param[in] value The value node id.
-*
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_document_append_mapping_pair(yaml_document_t *document,
- int mapping, int key, int value);
-
-/** @} */
-
-/**
- * @defgroup parser Parser Definitions
- * @{
- */
-
-/**
- * The prototype of a read handler.
- *
- * The read handler is called when the parser needs to read more bytes from the
- * source. The handler should write not more than @a size bytes to the @a
- * buffer. The number of written bytes should be set to the @a length variable.
- *
- * @param[in,out] data A pointer to an application data specified by
- * yaml_parser_set_input().
- * @param[out] buffer The buffer to write the data from the source.
- * @param[in] size The size of the buffer.
- * @param[out] size_read The actual number of bytes read from the source.
- *
- * @returns On success, the handler should return @c 1. If the handler failed,
- * the returned value should be @c 0. On EOF, the handler should set the
- * @a size_read to @c 0 and return @c 1.
- */
-
-typedef int yaml_read_handler_t(void *data, unsigned char *buffer, size_t size,
- size_t *size_read);
-
-/**
- * This structure holds information about a potential simple key.
- */
-
-typedef struct yaml_simple_key_s {
- /** Is a simple key possible? */
- int possible;
-
- /** Is a simple key required? */
- int required;
-
- /** The number of the token. */
- size_t token_number;
-
- /** The position mark. */
- yaml_mark_t mark;
-} yaml_simple_key_t;
-
-/**
- * The states of the parser.
- */
-typedef enum yaml_parser_state_e {
- /** Expect STREAM-START. */
- YAML_PARSE_STREAM_START_STATE,
- /** Expect the beginning of an implicit document. */
- YAML_PARSE_IMPLICIT_DOCUMENT_START_STATE,
- /** Expect DOCUMENT-START. */
- YAML_PARSE_DOCUMENT_START_STATE,
- /** Expect the content of a document. */
- YAML_PARSE_DOCUMENT_CONTENT_STATE,
- /** Expect DOCUMENT-END. */
- YAML_PARSE_DOCUMENT_END_STATE,
- /** Expect a block node. */
- YAML_PARSE_BLOCK_NODE_STATE,
- /** Expect a block node or indentless sequence. */
- YAML_PARSE_BLOCK_NODE_OR_INDENTLESS_SEQUENCE_STATE,
- /** Expect a flow node. */
- YAML_PARSE_FLOW_NODE_STATE,
- /** Expect the first entry of a block sequence. */
- YAML_PARSE_BLOCK_SEQUENCE_FIRST_ENTRY_STATE,
- /** Expect an entry of a block sequence. */
- YAML_PARSE_BLOCK_SEQUENCE_ENTRY_STATE,
- /** Expect an entry of an indentless sequence. */
- YAML_PARSE_INDENTLESS_SEQUENCE_ENTRY_STATE,
- /** Expect the first key of a block mapping. */
- YAML_PARSE_BLOCK_MAPPING_FIRST_KEY_STATE,
- /** Expect a block mapping key. */
- YAML_PARSE_BLOCK_MAPPING_KEY_STATE,
- /** Expect a block mapping value. */
- YAML_PARSE_BLOCK_MAPPING_VALUE_STATE,
- /** Expect the first entry of a flow sequence. */
- YAML_PARSE_FLOW_SEQUENCE_FIRST_ENTRY_STATE,
- /** Expect an entry of a flow sequence. */
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_STATE,
- /** Expect a key of an ordered mapping. */
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_KEY_STATE,
- /** Expect a value of an ordered mapping. */
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_VALUE_STATE,
- /** Expect the and of an ordered mapping entry. */
- YAML_PARSE_FLOW_SEQUENCE_ENTRY_MAPPING_END_STATE,
- /** Expect the first key of a flow mapping. */
- YAML_PARSE_FLOW_MAPPING_FIRST_KEY_STATE,
- /** Expect a key of a flow mapping. */
- YAML_PARSE_FLOW_MAPPING_KEY_STATE,
- /** Expect a value of a flow mapping. */
- YAML_PARSE_FLOW_MAPPING_VALUE_STATE,
- /** Expect an empty value of a flow mapping. */
- YAML_PARSE_FLOW_MAPPING_EMPTY_VALUE_STATE,
- /** Expect nothing. */
- YAML_PARSE_END_STATE
-} yaml_parser_state_t;
-
-/**
- * This structure holds aliases data.
- */
-
-typedef struct yaml_alias_data_s {
- /** The anchor. */
- yaml_char_t *anchor;
- /** The node id. */
- int index;
- /** The anchor mark. */
- yaml_mark_t mark;
-} yaml_alias_data_t;
-
-/**
- * The parser structure.
- *
- * All members are internal. Manage the structure using the @c yaml_parser_
- * family of functions.
- */
-
-typedef struct yaml_parser_s {
-
- /**
- * @name Error handling
- * @{
- */
-
- /** Error type. */
- yaml_error_type_t error;
- /** Error description. */
- const char *problem;
- /** The byte about which the problem occured. */
- size_t problem_offset;
- /** The problematic value (@c -1 is none). */
- int problem_value;
- /** The problem position. */
- yaml_mark_t problem_mark;
- /** The error context. */
- const char *context;
- /** The context position. */
- yaml_mark_t context_mark;
-
- /**
- * @}
- */
-
- /**
- * @name Reader stuff
- * @{
- */
-
- /** Read handler. */
- yaml_read_handler_t *read_handler;
-
- /** A pointer for passing to the read handler. */
- void *read_handler_data;
-
- /** Standard (string or file) input data. */
- union {
- /** String input data. */
- struct {
- /** The string start pointer. */
- const unsigned char *start;
- /** The string end pointer. */
- const unsigned char *end;
- /** The string current position. */
- const unsigned char *current;
- } string;
-
- /** File input data. */
- FILE *file;
- } input;
-
- /** EOF flag */
- int eof;
-
- /** The working buffer. */
- struct {
- /** The beginning of the buffer. */
- yaml_char_t *start;
- /** The end of the buffer. */
- yaml_char_t *end;
- /** The current position of the buffer. */
- yaml_char_t *pointer;
- /** The last filled position of the buffer. */
- yaml_char_t *last;
- } buffer;
-
- /* The number of unread characters in the buffer. */
- size_t unread;
-
- /** The raw buffer. */
- struct {
- /** The beginning of the buffer. */
- unsigned char *start;
- /** The end of the buffer. */
- unsigned char *end;
- /** The current position of the buffer. */
- unsigned char *pointer;
- /** The last filled position of the buffer. */
- unsigned char *last;
- } raw_buffer;
-
- /** The input encoding. */
- yaml_encoding_t encoding;
-
- /** The offset of the current position (in bytes). */
- size_t offset;
-
- /** The mark of the current position. */
- yaml_mark_t mark;
-
- /**
- * @}
- */
-
- /**
- * @name Scanner stuff
- * @{
- */
-
- /** Have we started to scan the input stream? */
- int stream_start_produced;
-
- /** Have we reached the end of the input stream? */
- int stream_end_produced;
-
- /** The number of unclosed '[' and '{' indicators. */
- int flow_level;
-
- /** The tokens queue. */
- struct {
- /** The beginning of the tokens queue. */
- yaml_token_t *start;
- /** The end of the tokens queue. */
- yaml_token_t *end;
- /** The head of the tokens queue. */
- yaml_token_t *head;
- /** The tail of the tokens queue. */
- yaml_token_t *tail;
- } tokens;
-
- /** The number of tokens fetched from the queue. */
- size_t tokens_parsed;
-
- /* Does the tokens queue contain a token ready for dequeueing. */
- int token_available;
-
- /** The indentation levels stack. */
- struct {
- /** The beginning of the stack. */
- int *start;
- /** The end of the stack. */
- int *end;
- /** The top of the stack. */
- int *top;
- } indents;
-
- /** The current indentation level. */
- int indent;
-
- /** May a simple key occur at the current position? */
- int simple_key_allowed;
-
- /** The stack of simple keys. */
- struct {
- /** The beginning of the stack. */
- yaml_simple_key_t *start;
- /** The end of the stack. */
- yaml_simple_key_t *end;
- /** The top of the stack. */
- yaml_simple_key_t *top;
- } simple_keys;
-
- /**
- * @}
- */
-
- /**
- * @name Parser stuff
- * @{
- */
-
- /** The parser states stack. */
- struct {
- /** The beginning of the stack. */
- yaml_parser_state_t *start;
- /** The end of the stack. */
- yaml_parser_state_t *end;
- /** The top of the stack. */
- yaml_parser_state_t *top;
- } states;
-
- /** The current parser state. */
- yaml_parser_state_t state;
-
- /** The stack of marks. */
- struct {
- /** The beginning of the stack. */
- yaml_mark_t *start;
- /** The end of the stack. */
- yaml_mark_t *end;
- /** The top of the stack. */
- yaml_mark_t *top;
- } marks;
-
- /** The list of TAG directives. */
- struct {
- /** The beginning of the list. */
- yaml_tag_directive_t *start;
- /** The end of the list. */
- yaml_tag_directive_t *end;
- /** The top of the list. */
- yaml_tag_directive_t *top;
- } tag_directives;
-
- /**
- * @}
- */
-
- /**
- * @name Dumper stuff
- * @{
- */
-
- /** The alias data. */
- struct {
- /** The beginning of the list. */
- yaml_alias_data_t *start;
- /** The end of the list. */
- yaml_alias_data_t *end;
- /** The top of the list. */
- yaml_alias_data_t *top;
- } aliases;
-
- /** The currently parsed document. */
- yaml_document_t *document;
-
- /**
- * @}
- */
-
-} yaml_parser_t;
-
-/**
- * Initialize a parser.
- *
- * This function creates a new parser object. An application is responsible
- * for destroying the object using the yaml_parser_delete() function.
- *
- * @param[out] parser An empty parser object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_parser_initialize(yaml_parser_t *parser);
-
-/**
- * Destroy a parser.
- *
- * @param[in,out] parser A parser object.
- */
-
-YAML_DECLARE(void)
-yaml_parser_delete(yaml_parser_t *parser);
-
-/**
- * Set a string input.
- *
- * Note that the @a input pointer must be valid while the @a parser object
- * exists. The application is responsible for destroing @a input after
- * destroying the @a parser.
- *
- * @param[in,out] parser A parser object.
- * @param[in] input A source data.
- * @param[in] size The length of the source data in bytes.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input_string(yaml_parser_t *parser,
- const unsigned char *input, size_t size);
-
-/**
- * Set a file input.
- *
- * @a file should be a file object open for reading. The application is
- * responsible for closing the @a file.
- *
- * @param[in,out] parser A parser object.
- * @param[in] file An open file.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input_file(yaml_parser_t *parser, FILE *file);
-
-/**
- * Set a generic input handler.
- *
- * @param[in,out] parser A parser object.
- * @param[in] handler A read handler.
- * @param[in] data Any application data for passing to the read
- * handler.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_input(yaml_parser_t *parser,
- yaml_read_handler_t *handler, void *data);
-
-/**
- * Set the source encoding.
- *
- * @param[in,out] parser A parser object.
- * @param[in] encoding The source encoding.
- */
-
-YAML_DECLARE(void)
-yaml_parser_set_encoding(yaml_parser_t *parser, yaml_encoding_t encoding);
-
-/**
- * Scan the input stream and produce the next token.
- *
- * Call the function subsequently to produce a sequence of tokens corresponding
- * to the input stream. The initial token has the type
- * @c YAML_STREAM_START_TOKEN while the ending token has the type
- * @c YAML_STREAM_END_TOKEN.
- *
- * An application is responsible for freeing any buffers associated with the
- * produced token object using the @c yaml_token_delete function.
- *
- * An application must not alternate the calls of yaml_parser_scan() with the
- * calls of yaml_parser_parse() or yaml_parser_load(). Doing this will break
- * the parser.
- *
- * @param[in,out] parser A parser object.
- * @param[out] token An empty token object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_parser_scan(yaml_parser_t *parser, yaml_token_t *token);
-
-/**
- * Parse the input stream and produce the next parsing event.
- *
- * Call the function subsequently to produce a sequence of events corresponding
- * to the input stream. The initial event has the type
- * @c YAML_STREAM_START_EVENT while the ending event has the type
- * @c YAML_STREAM_END_EVENT.
- *
- * An application is responsible for freeing any buffers associated with the
- * produced event object using the yaml_event_delete() function.
- *
- * An application must not alternate the calls of yaml_parser_parse() with the
- * calls of yaml_parser_scan() or yaml_parser_load(). Doing this will break the
- * parser.
- *
- * @param[in,out] parser A parser object.
- * @param[out] event An empty event object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_parser_parse(yaml_parser_t *parser, yaml_event_t *event);
-
-/**
- * Parse the input stream and produce the next YAML document.
- *
- * Call this function subsequently to produce a sequence of documents
- * constituting the input stream.
- *
- * If the produced document has no root node, it means that the document
- * end has been reached.
- *
- * An application is responsible for freeing any data associated with the
- * produced document object using the yaml_document_delete() function.
- *
- * An application must not alternate the calls of yaml_parser_load() with the
- * calls of yaml_parser_scan() or yaml_parser_parse(). Doing this will break
- * the parser.
- *
- * @param[in,out] parser A parser object.
- * @param[out] document An empty document object.
- *
- * @return @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_parser_load(yaml_parser_t *parser, yaml_document_t *document);
-
-/** @} */
-
-/**
- * @defgroup emitter Emitter Definitions
- * @{
- */
-
-/**
- * The prototype of a write handler.
- *
- * The write handler is called when the emitter needs to flush the accumulated
- * characters to the output. The handler should write @a size bytes of the
- * @a buffer to the output.
- *
- * @param[in,out] data A pointer to an application data specified by
- * yaml_emitter_set_output().
- * @param[in] buffer The buffer with bytes to be written.
- * @param[in] size The size of the buffer.
- *
- * @returns On success, the handler should return @c 1. If the handler failed,
- * the returned value should be @c 0.
- */
-
-typedef int yaml_write_handler_t(void *data, unsigned char *buffer, size_t size);
-
-/** The emitter states. */
-typedef enum yaml_emitter_state_e {
- /** Expect STREAM-START. */
- YAML_EMIT_STREAM_START_STATE,
- /** Expect the first DOCUMENT-START or STREAM-END. */
- YAML_EMIT_FIRST_DOCUMENT_START_STATE,
- /** Expect DOCUMENT-START or STREAM-END. */
- YAML_EMIT_DOCUMENT_START_STATE,
- /** Expect the content of a document. */
- YAML_EMIT_DOCUMENT_CONTENT_STATE,
- /** Expect DOCUMENT-END. */
- YAML_EMIT_DOCUMENT_END_STATE,
- /** Expect the first item of a flow sequence. */
- YAML_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE,
- /** Expect an item of a flow sequence. */
- YAML_EMIT_FLOW_SEQUENCE_ITEM_STATE,
- /** Expect the first key of a flow mapping. */
- YAML_EMIT_FLOW_MAPPING_FIRST_KEY_STATE,
- /** Expect a key of a flow mapping. */
- YAML_EMIT_FLOW_MAPPING_KEY_STATE,
- /** Expect a value for a simple key of a flow mapping. */
- YAML_EMIT_FLOW_MAPPING_SIMPLE_VALUE_STATE,
- /** Expect a value of a flow mapping. */
- YAML_EMIT_FLOW_MAPPING_VALUE_STATE,
- /** Expect the first item of a block sequence. */
- YAML_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE,
- /** Expect an item of a block sequence. */
- YAML_EMIT_BLOCK_SEQUENCE_ITEM_STATE,
- /** Expect the first key of a block mapping. */
- YAML_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE,
- /** Expect the key of a block mapping. */
- YAML_EMIT_BLOCK_MAPPING_KEY_STATE,
- /** Expect a value for a simple key of a block mapping. */
- YAML_EMIT_BLOCK_MAPPING_SIMPLE_VALUE_STATE,
- /** Expect a value of a block mapping. */
- YAML_EMIT_BLOCK_MAPPING_VALUE_STATE,
- /** Expect nothing. */
- YAML_EMIT_END_STATE
-} yaml_emitter_state_t;
-
-/**
- * The emitter structure.
- *
- * All members are internal. Manage the structure using the @c yaml_emitter_
- * family of functions.
- */
-
-typedef struct yaml_emitter_s {
-
- /**
- * @name Error handling
- * @{
- */
-
- /** Error type. */
- yaml_error_type_t error;
- /** Error description. */
- const char *problem;
-
- /**
- * @}
- */
-
- /**
- * @name Writer stuff
- * @{
- */
-
- /** Write handler. */
- yaml_write_handler_t *write_handler;
-
- /** A pointer for passing to the white handler. */
- void *write_handler_data;
-
- /** Standard (string or file) output data. */
- union {
- /** String output data. */
- struct {
- /** The buffer pointer. */
- unsigned char *buffer;
- /** The buffer size. */
- size_t size;
- /** The number of written bytes. */
- size_t *size_written;
- } string;
-
- /** File output data. */
- FILE *file;
- } output;
-
- /** The working buffer. */
- struct {
- /** The beginning of the buffer. */
- yaml_char_t *start;
- /** The end of the buffer. */
- yaml_char_t *end;
- /** The current position of the buffer. */
- yaml_char_t *pointer;
- /** The last filled position of the buffer. */
- yaml_char_t *last;
- } buffer;
-
- /** The raw buffer. */
- struct {
- /** The beginning of the buffer. */
- unsigned char *start;
- /** The end of the buffer. */
- unsigned char *end;
- /** The current position of the buffer. */
- unsigned char *pointer;
- /** The last filled position of the buffer. */
- unsigned char *last;
- } raw_buffer;
-
- /** The stream encoding. */
- yaml_encoding_t encoding;
-
- /**
- * @}
- */
-
- /**
- * @name Emitter stuff
- * @{
- */
-
- /** If the output is in the canonical style? */
- int canonical;
- /** The number of indentation spaces. */
- int best_indent;
- /** The preferred width of the output lines. */
- int best_width;
- /** Allow unescaped non-ASCII characters? */
- int unicode;
- /** The preferred line break. */
- yaml_break_t line_break;
-
- /** The stack of states. */
- struct {
- /** The beginning of the stack. */
- yaml_emitter_state_t *start;
- /** The end of the stack. */
- yaml_emitter_state_t *end;
- /** The top of the stack. */
- yaml_emitter_state_t *top;
- } states;
-
- /** The current emitter state. */
- yaml_emitter_state_t state;
-
- /** The event queue. */
- struct {
- /** The beginning of the event queue. */
- yaml_event_t *start;
- /** The end of the event queue. */
- yaml_event_t *end;
- /** The head of the event queue. */
- yaml_event_t *head;
- /** The tail of the event queue. */
- yaml_event_t *tail;
- } events;
-
- /** The stack of indentation levels. */
- struct {
- /** The beginning of the stack. */
- int *start;
- /** The end of the stack. */
- int *end;
- /** The top of the stack. */
- int *top;
- } indents;
-
- /** The list of tag directives. */
- struct {
- /** The beginning of the list. */
- yaml_tag_directive_t *start;
- /** The end of the list. */
- yaml_tag_directive_t *end;
- /** The top of the list. */
- yaml_tag_directive_t *top;
- } tag_directives;
-
- /** The current indentation level. */
- int indent;
-
- /** The current flow level. */
- int flow_level;
-
- /** Is it the document root context? */
- int root_context;
- /** Is it a sequence context? */
- int sequence_context;
- /** Is it a mapping context? */
- int mapping_context;
- /** Is it a simple mapping key context? */
- int simple_key_context;
-
- /** The current line. */
- int line;
- /** The current column. */
- int column;
- /** If the last character was a whitespace? */
- int whitespace;
- /** If the last character was an indentation character (' ', '-', '?', ':')? */
- int indention;
- /** If an explicit document end is required? */
- int open_ended;
-
- /** Anchor analysis. */
- struct {
- /** The anchor value. */
- yaml_char_t *anchor;
- /** The anchor length. */
- size_t anchor_length;
- /** Is it an alias? */
- int alias;
- } anchor_data;
-
- /** Tag analysis. */
- struct {
- /** The tag handle. */
- yaml_char_t *handle;
- /** The tag handle length. */
- size_t handle_length;
- /** The tag suffix. */
- yaml_char_t *suffix;
- /** The tag suffix length. */
- size_t suffix_length;
- } tag_data;
-
- /** Scalar analysis. */
- struct {
- /** The scalar value. */
- yaml_char_t *value;
- /** The scalar length. */
- size_t length;
- /** Does the scalar contain line breaks? */
- int multiline;
- /** Can the scalar be expessed in the flow plain style? */
- int flow_plain_allowed;
- /** Can the scalar be expressed in the block plain style? */
- int block_plain_allowed;
- /** Can the scalar be expressed in the single quoted style? */
- int single_quoted_allowed;
- /** Can the scalar be expressed in the literal or folded styles? */
- int block_allowed;
- /** The output style. */
- yaml_scalar_style_t style;
- } scalar_data;
-
- /**
- * @}
- */
-
- /**
- * @name Dumper stuff
- * @{
- */
-
- /** If the stream was already opened? */
- int opened;
- /** If the stream was already closed? */
- int closed;
-
- /** The information associated with the document nodes. */
- struct {
- /** The number of references. */
- int references;
- /** The anchor id. */
- int anchor;
- /** If the node has been emitted? */
- int serialized;
- } *anchors;
-
- /** The last assigned anchor id. */
- int last_anchor_id;
-
- /** The currently emitted document. */
- yaml_document_t *document;
-
- /**
- * @}
- */
-
-} yaml_emitter_t;
-
-/**
- * Initialize an emitter.
- *
- * This function creates a new emitter object. An application is responsible
- * for destroying the object using the yaml_emitter_delete() function.
- *
- * @param[out] emitter An empty parser object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_initialize(yaml_emitter_t *emitter);
-
-/**
- * Destroy an emitter.
- *
- * @param[in,out] emitter An emitter object.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_delete(yaml_emitter_t *emitter);
-
-/**
- * Set a string output.
- *
- * The emitter will write the output characters to the @a output buffer of the
- * size @a size. The emitter will set @a size_written to the number of written
- * bytes. If the buffer is smaller than required, the emitter produces the
- * YAML_WRITE_ERROR error.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] output An output buffer.
- * @param[in] size The buffer size.
- * @param[in] size_written The pointer to save the number of written
- * bytes.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output_string(yaml_emitter_t *emitter,
- unsigned char *output, size_t size, size_t *size_written);
-
-/**
- * Set a file output.
- *
- * @a file should be a file object open for writing. The application is
- * responsible for closing the @a file.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] file An open file.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output_file(yaml_emitter_t *emitter, FILE *file);
-
-/**
- * Set a generic output handler.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] handler A write handler.
- * @param[in] data Any application data for passing to the write
- * handler.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_output(yaml_emitter_t *emitter,
- yaml_write_handler_t *handler, void *data);
-
-/**
- * Set the output encoding.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] encoding The output encoding.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_encoding(yaml_emitter_t *emitter, yaml_encoding_t encoding);
-
-/**
- * Set if the output should be in the "canonical" format as in the YAML
- * specification.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] canonical If the output is canonical.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical);
-
-/**
- * Set the intendation increment.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] indent The indentation increment (1 < . < 10).
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_indent(yaml_emitter_t *emitter, int indent);
-
-/**
- * Set the preferred line width. @c -1 means unlimited.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] width The preferred line width.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_width(yaml_emitter_t *emitter, int width);
-
-/**
- * Set if unescaped non-ASCII characters are allowed.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] unicode If unescaped Unicode characters are allowed.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_unicode(yaml_emitter_t *emitter, int unicode);
-
-/**
- * Set the preferred line break.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in] line_break The preferred line break.
- */
-
-YAML_DECLARE(void)
-yaml_emitter_set_break(yaml_emitter_t *emitter, yaml_break_t line_break);
-
-/**
- * Emit an event.
- *
- * The event object may be generated using the yaml_parser_parse() function.
- * The emitter takes the responsibility for the event object and destroys its
- * content after it is emitted. The event object is destroyed even if the
- * function fails.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in,out] event An event object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_emit(yaml_emitter_t *emitter, yaml_event_t *event);
-
-/**
- * Start a YAML stream.
- *
- * This function should be used before yaml_emitter_dump() is called.
- *
- * @param[in,out] emitter An emitter object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_open(yaml_emitter_t *emitter);
-
-/**
- * Finish a YAML stream.
- *
- * This function should be used after yaml_emitter_dump() is called.
- *
- * @param[in,out] emitter An emitter object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_close(yaml_emitter_t *emitter);
-
-/**
- * Emit a YAML document.
- *
- * The documen object may be generated using the yaml_parser_load() function
- * or the yaml_document_initialize() function. The emitter takes the
- * responsibility for the document object and destoys its content after
- * it is emitted. The document object is destroyedeven if the function fails.
- *
- * @param[in,out] emitter An emitter object.
- * @param[in,out] document A document object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_dump(yaml_emitter_t *emitter, yaml_document_t *document);
-
-/**
- * Flush the accumulated characters to the output.
- *
- * @param[in,out] emitter An emitter object.
- *
- * @returns @c 1 if the function succeeded, @c 0 on error.
- */
-
-YAML_DECLARE(int)
-yaml_emitter_flush(yaml_emitter_t *emitter);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* #ifndef YAML_H */
-
diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h
deleted file mode 100644
index 944499c94e..0000000000
--- a/ext/psych/yaml/yaml_private.h
+++ /dev/null
@@ -1,664 +0,0 @@
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <yaml.h>
-
-#include <assert.h>
-#include <limits.h>
-#include <stddef.h>
-
-#ifndef _MSC_VER
-#include <stdint.h>
-#else
-#ifdef _WIN64
-#define PTRDIFF_MAX _I64_MAX
-#else
-#define PTRDIFF_MAX INT_MAX
-#endif
-#endif
-
-/*
- * Memory management.
- */
-
-YAML_DECLARE(void *)
-yaml_malloc(size_t size);
-
-YAML_DECLARE(void *)
-yaml_realloc(void *ptr, size_t size);
-
-YAML_DECLARE(void)
-yaml_free(void *ptr);
-
-YAML_DECLARE(yaml_char_t *)
-yaml_strdup(const yaml_char_t *);
-
-/*
- * Reader: Ensure that the buffer contains at least `length` characters.
- */
-
-YAML_DECLARE(int)
-yaml_parser_update_buffer(yaml_parser_t *parser, size_t length);
-
-/*
- * Scanner: Ensure that the token stack contains at least one token ready.
- */
-
-YAML_DECLARE(int)
-yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
-
-/*
- * The size of the input raw buffer.
- */
-
-#define INPUT_RAW_BUFFER_SIZE 16384
-
-/*
- * The size of the input buffer.
- *
- * It should be possible to decode the whole raw buffer.
- */
-
-#define INPUT_BUFFER_SIZE (INPUT_RAW_BUFFER_SIZE*3)
-
-/*
- * The size of the output buffer.
- */
-
-#define OUTPUT_BUFFER_SIZE 16384
-
-/*
- * The size of the output raw buffer.
- *
- * It should be possible to encode the whole output buffer.
- */
-
-#define OUTPUT_RAW_BUFFER_SIZE (OUTPUT_BUFFER_SIZE*2+2)
-
-/*
- * The size of other stacks and queues.
- */
-
-#define INITIAL_STACK_SIZE 16
-#define INITIAL_QUEUE_SIZE 16
-#define INITIAL_STRING_SIZE 16
-
-/*
- * Buffer management.
- */
-
-#define BUFFER_INIT(context,buffer,size) \
- (((buffer).start = yaml_malloc(size)) ? \
- ((buffer).last = (buffer).pointer = (buffer).start, \
- (buffer).end = (buffer).start+(size), \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define BUFFER_DEL(context,buffer) \
- (yaml_free((buffer).start), \
- (buffer).start = (buffer).pointer = (buffer).end = 0)
-
-/*
- * String management.
- */
-
-typedef struct {
- yaml_char_t *start;
- yaml_char_t *end;
- yaml_char_t *pointer;
-} yaml_string_t;
-
-YAML_DECLARE(int)
-yaml_string_extend(yaml_char_t **start,
- yaml_char_t **pointer, yaml_char_t **end);
-
-YAML_DECLARE(int)
-yaml_string_join(
- yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
- yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end);
-
-#define NULL_STRING { NULL, NULL, NULL }
-
-#define STRING(string,length) { (string), (string)+(length), (string) }
-
-#define STRING_ASSIGN(value,string,length) \
- ((value).start = (string), \
- (value).end = (string)+(length), \
- (value).pointer = (string))
-
-#define STRING_INIT(context,string,size) \
- (((string).start = yaml_malloc(size)) ? \
- ((string).pointer = (string).start, \
- (string).end = (string).start+(size), \
- memset((string).start, 0, (size)), \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define STRING_DEL(context,string) \
- (yaml_free((string).start), \
- (string).start = (string).pointer = (string).end = 0)
-
-#define STRING_EXTEND(context,string) \
- ((((string).pointer+5 < (string).end) \
- || yaml_string_extend(&(string).start, \
- &(string).pointer, &(string).end)) ? \
- 1 : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define CLEAR(context,string) \
- ((string).pointer = (string).start, \
- memset((string).start, 0, (string).end-(string).start))
-
-#define JOIN(context,string_a,string_b) \
- ((yaml_string_join(&(string_a).start, &(string_a).pointer, \
- &(string_a).end, &(string_b).start, \
- &(string_b).pointer, &(string_b).end)) ? \
- ((string_b).pointer = (string_b).start, \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-/*
- * String check operations.
- */
-
-/*
- * Check the octet at the specified position.
- */
-
-#define CHECK_AT(string,octet,offset) \
- ((string).pointer[offset] == (yaml_char_t)(octet))
-
-/*
- * Check the current octet in the buffer.
- */
-
-#define CHECK(string,octet) CHECK_AT((string),(octet),0)
-
-/*
- * Check if the character at the specified position is an alphabetical
- * character, a digit, '_', or '-'.
- */
-
-#define IS_ALPHA_AT(string,offset) \
- (((string).pointer[offset] >= (yaml_char_t) '0' && \
- (string).pointer[offset] <= (yaml_char_t) '9') || \
- ((string).pointer[offset] >= (yaml_char_t) 'A' && \
- (string).pointer[offset] <= (yaml_char_t) 'Z') || \
- ((string).pointer[offset] >= (yaml_char_t) 'a' && \
- (string).pointer[offset] <= (yaml_char_t) 'z') || \
- (string).pointer[offset] == '_' || \
- (string).pointer[offset] == '-')
-
-#define IS_ALPHA(string) IS_ALPHA_AT((string),0)
-
-/*
- * Check if the character at the specified position is a digit.
- */
-
-#define IS_DIGIT_AT(string,offset) \
- (((string).pointer[offset] >= (yaml_char_t) '0' && \
- (string).pointer[offset] <= (yaml_char_t) '9'))
-
-#define IS_DIGIT(string) IS_DIGIT_AT((string),0)
-
-/*
- * Get the value of a digit.
- */
-
-#define AS_DIGIT_AT(string,offset) \
- ((string).pointer[offset] - (yaml_char_t) '0')
-
-#define AS_DIGIT(string) AS_DIGIT_AT((string),0)
-
-/*
- * Check if the character at the specified position is a hex-digit.
- */
-
-#define IS_HEX_AT(string,offset) \
- (((string).pointer[offset] >= (yaml_char_t) '0' && \
- (string).pointer[offset] <= (yaml_char_t) '9') || \
- ((string).pointer[offset] >= (yaml_char_t) 'A' && \
- (string).pointer[offset] <= (yaml_char_t) 'F') || \
- ((string).pointer[offset] >= (yaml_char_t) 'a' && \
- (string).pointer[offset] <= (yaml_char_t) 'f'))
-
-#define IS_HEX(string) IS_HEX_AT((string),0)
-
-/*
- * Get the value of a hex-digit.
- */
-
-#define AS_HEX_AT(string,offset) \
- (((string).pointer[offset] >= (yaml_char_t) 'A' && \
- (string).pointer[offset] <= (yaml_char_t) 'F') ? \
- ((string).pointer[offset] - (yaml_char_t) 'A' + 10) : \
- ((string).pointer[offset] >= (yaml_char_t) 'a' && \
- (string).pointer[offset] <= (yaml_char_t) 'f') ? \
- ((string).pointer[offset] - (yaml_char_t) 'a' + 10) : \
- ((string).pointer[offset] - (yaml_char_t) '0'))
-
-#define AS_HEX(string) AS_HEX_AT((string),0)
-
-/*
- * Check if the character is ASCII.
- */
-
-#define IS_ASCII_AT(string,offset) \
- ((string).pointer[offset] <= (yaml_char_t) '\x7F')
-
-#define IS_ASCII(string) IS_ASCII_AT((string),0)
-
-/*
- * Check if the character can be printed unescaped.
- */
-
-#define IS_PRINTABLE_AT(string,offset) \
- (((string).pointer[offset] == 0x0A) /* . == #x0A */ \
- || ((string).pointer[offset] >= 0x20 /* #x20 <= . <= #x7E */ \
- && (string).pointer[offset] <= 0x7E) \
- || ((string).pointer[offset] == 0xC2 /* #0xA0 <= . <= #xD7FF */ \
- && (string).pointer[offset+1] >= 0xA0) \
- || ((string).pointer[offset] > 0xC2 \
- && (string).pointer[offset] < 0xED) \
- || ((string).pointer[offset] == 0xED \
- && (string).pointer[offset+1] < 0xA0) \
- || ((string).pointer[offset] == 0xEE) \
- || ((string).pointer[offset] == 0xEF /* #xE000 <= . <= #xFFFD */ \
- && !((string).pointer[offset+1] == 0xBB /* && . != #xFEFF */ \
- && (string).pointer[offset+2] == 0xBF) \
- && !((string).pointer[offset+1] == 0xBF \
- && ((string).pointer[offset+2] == 0xBE \
- || (string).pointer[offset+2] == 0xBF))))
-
-#define IS_PRINTABLE(string) IS_PRINTABLE_AT((string),0)
-
-/*
- * Check if the character at the specified position is NUL.
- */
-
-#define IS_Z_AT(string,offset) CHECK_AT((string),'\0',(offset))
-
-#define IS_Z(string) IS_Z_AT((string),0)
-
-/*
- * Check if the character at the specified position is BOM.
- */
-
-#define IS_BOM_AT(string,offset) \
- (CHECK_AT((string),'\xEF',(offset)) \
- && CHECK_AT((string),'\xBB',(offset)+1) \
- && CHECK_AT((string),'\xBF',(offset)+2)) /* BOM (#xFEFF) */
-
-#define IS_BOM(string) IS_BOM_AT(string,0)
-
-/*
- * Check if the character at the specified position is space.
- */
-
-#define IS_SPACE_AT(string,offset) CHECK_AT((string),' ',(offset))
-
-#define IS_SPACE(string) IS_SPACE_AT((string),0)
-
-/*
- * Check if the character at the specified position is tab.
- */
-
-#define IS_TAB_AT(string,offset) CHECK_AT((string),'\t',(offset))
-
-#define IS_TAB(string) IS_TAB_AT((string),0)
-
-/*
- * Check if the character at the specified position is blank (space or tab).
- */
-
-#define IS_BLANK_AT(string,offset) \
- (IS_SPACE_AT((string),(offset)) || IS_TAB_AT((string),(offset)))
-
-#define IS_BLANK(string) IS_BLANK_AT((string),0)
-
-/*
- * Check if the character at the specified position is a line break.
- */
-
-#define IS_BREAK_AT(string,offset) \
- (CHECK_AT((string),'\r',(offset)) /* CR (#xD)*/ \
- || CHECK_AT((string),'\n',(offset)) /* LF (#xA) */ \
- || (CHECK_AT((string),'\xC2',(offset)) \
- && CHECK_AT((string),'\x85',(offset)+1)) /* NEL (#x85) */ \
- || (CHECK_AT((string),'\xE2',(offset)) \
- && CHECK_AT((string),'\x80',(offset)+1) \
- && CHECK_AT((string),'\xA8',(offset)+2)) /* LS (#x2028) */ \
- || (CHECK_AT((string),'\xE2',(offset)) \
- && CHECK_AT((string),'\x80',(offset)+1) \
- && CHECK_AT((string),'\xA9',(offset)+2))) /* PS (#x2029) */
-
-#define IS_BREAK(string) IS_BREAK_AT((string),0)
-
-#define IS_CRLF_AT(string,offset) \
- (CHECK_AT((string),'\r',(offset)) && CHECK_AT((string),'\n',(offset)+1))
-
-#define IS_CRLF(string) IS_CRLF_AT((string),0)
-
-/*
- * Check if the character is a line break or NUL.
- */
-
-#define IS_BREAKZ_AT(string,offset) \
- (IS_BREAK_AT((string),(offset)) || IS_Z_AT((string),(offset)))
-
-#define IS_BREAKZ(string) IS_BREAKZ_AT((string),0)
-
-/*
- * Check if the character is a line break, space, or NUL.
- */
-
-#define IS_SPACEZ_AT(string,offset) \
- (IS_SPACE_AT((string),(offset)) || IS_BREAKZ_AT((string),(offset)))
-
-#define IS_SPACEZ(string) IS_SPACEZ_AT((string),0)
-
-/*
- * Check if the character is a line break, space, tab, or NUL.
- */
-
-#define IS_BLANKZ_AT(string,offset) \
- (IS_BLANK_AT((string),(offset)) || IS_BREAKZ_AT((string),(offset)))
-
-#define IS_BLANKZ(string) IS_BLANKZ_AT((string),0)
-
-/*
- * Determine the width of the character.
- */
-
-#define WIDTH_AT(string,offset) \
- (((string).pointer[offset] & 0x80) == 0x00 ? 1 : \
- ((string).pointer[offset] & 0xE0) == 0xC0 ? 2 : \
- ((string).pointer[offset] & 0xF0) == 0xE0 ? 3 : \
- ((string).pointer[offset] & 0xF8) == 0xF0 ? 4 : 0)
-
-#define WIDTH(string) WIDTH_AT((string),0)
-
-/*
- * Move the string pointer to the next character.
- */
-
-#define MOVE(string) ((string).pointer += WIDTH((string)))
-
-/*
- * Copy a character and move the pointers of both strings.
- */
-
-#define COPY(string_a,string_b) \
- ((*(string_b).pointer & 0x80) == 0x00 ? \
- (*((string_a).pointer++) = *((string_b).pointer++)) : \
- (*(string_b).pointer & 0xE0) == 0xC0 ? \
- (*((string_a).pointer++) = *((string_b).pointer++), \
- *((string_a).pointer++) = *((string_b).pointer++)) : \
- (*(string_b).pointer & 0xF0) == 0xE0 ? \
- (*((string_a).pointer++) = *((string_b).pointer++), \
- *((string_a).pointer++) = *((string_b).pointer++), \
- *((string_a).pointer++) = *((string_b).pointer++)) : \
- (*(string_b).pointer & 0xF8) == 0xF0 ? \
- (*((string_a).pointer++) = *((string_b).pointer++), \
- *((string_a).pointer++) = *((string_b).pointer++), \
- *((string_a).pointer++) = *((string_b).pointer++), \
- *((string_a).pointer++) = *((string_b).pointer++)) : 0)
-
-/*
- * Stack and queue management.
- */
-
-YAML_DECLARE(int)
-yaml_stack_extend(void **start, void **top, void **end);
-
-YAML_DECLARE(int)
-yaml_queue_extend(void **start, void **head, void **tail, void **end);
-
-#define STACK_INIT(context,stack,size) \
- (((stack).start = yaml_malloc((size)*sizeof(*(stack).start))) ? \
- ((stack).top = (stack).start, \
- (stack).end = (stack).start+(size), \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define STACK_DEL(context,stack) \
- (yaml_free((stack).start), \
- (stack).start = (stack).top = (stack).end = 0)
-
-#define STACK_EMPTY(context,stack) \
- ((void)(context), \
- ((stack).start == (stack).top))
-
-#define STACK_LIMIT(context,stack,size) \
- ((stack).top - (stack).start < (size) ? \
- 1 : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define PUSH(context,stack,value) \
- (((stack).top != (stack).end \
- || yaml_stack_extend((void **)&(stack).start, \
- (void **)&(stack).top, (void **)&(stack).end)) ? \
- (*((stack).top++) = value, \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define POP(context,stack) \
- (*(--(stack).top))
-
-#define QUEUE_INIT(context,queue,size) \
- (((queue).start = yaml_malloc((size)*sizeof(*(queue).start))) ? \
- ((queue).head = (queue).tail = (queue).start, \
- (queue).end = (queue).start+(size), \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define QUEUE_DEL(context,queue) \
- (yaml_free((queue).start), \
- (queue).start = (queue).head = (queue).tail = (queue).end = 0)
-
-#define QUEUE_EMPTY(context,queue) \
- ((queue).head == (queue).tail)
-
-#define ENQUEUE(context,queue,value) \
- (((queue).tail != (queue).end \
- || yaml_queue_extend((void **)&(queue).start, (void **)&(queue).head, \
- (void **)&(queue).tail, (void **)&(queue).end)) ? \
- (*((queue).tail++) = value, \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-#define DEQUEUE(context,queue) \
- (*((queue).head++))
-
-#define QUEUE_INSERT(context,queue,index,value) \
- (((queue).tail != (queue).end \
- || yaml_queue_extend((void **)&(queue).start, (void **)&(queue).head, \
- (void **)&(queue).tail, (void **)&(queue).end)) ? \
- (memmove((queue).head+(index)+1,(queue).head+(index), \
- ((queue).tail-(queue).head-(index))*sizeof(*(queue).start)), \
- *((queue).head+(index)) = value, \
- (queue).tail++, \
- 1) : \
- ((context)->error = YAML_MEMORY_ERROR, \
- 0))
-
-/*
- * Token initializers.
- */
-
-#define TOKEN_INIT(token,token_type,token_start_mark,token_end_mark) \
- (memset(&(token), 0, sizeof(yaml_token_t)), \
- (token).type = (token_type), \
- (token).start_mark = (token_start_mark), \
- (token).end_mark = (token_end_mark))
-
-#define STREAM_START_TOKEN_INIT(token,token_encoding,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_STREAM_START_TOKEN,(start_mark),(end_mark)), \
- (token).data.stream_start.encoding = (token_encoding))
-
-#define STREAM_END_TOKEN_INIT(token,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_STREAM_END_TOKEN,(start_mark),(end_mark)))
-
-#define ALIAS_TOKEN_INIT(token,token_value,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_ALIAS_TOKEN,(start_mark),(end_mark)), \
- (token).data.alias.value = (token_value))
-
-#define ANCHOR_TOKEN_INIT(token,token_value,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_ANCHOR_TOKEN,(start_mark),(end_mark)), \
- (token).data.anchor.value = (token_value))
-
-#define TAG_TOKEN_INIT(token,token_handle,token_suffix,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_TAG_TOKEN,(start_mark),(end_mark)), \
- (token).data.tag.handle = (token_handle), \
- (token).data.tag.suffix = (token_suffix))
-
-#define SCALAR_TOKEN_INIT(token,token_value,token_length,token_style,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_SCALAR_TOKEN,(start_mark),(end_mark)), \
- (token).data.scalar.value = (token_value), \
- (token).data.scalar.length = (token_length), \
- (token).data.scalar.style = (token_style))
-
-#define VERSION_DIRECTIVE_TOKEN_INIT(token,token_major,token_minor,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_VERSION_DIRECTIVE_TOKEN,(start_mark),(end_mark)), \
- (token).data.version_directive.major = (token_major), \
- (token).data.version_directive.minor = (token_minor))
-
-#define TAG_DIRECTIVE_TOKEN_INIT(token,token_handle,token_prefix,start_mark,end_mark) \
- (TOKEN_INIT((token),YAML_TAG_DIRECTIVE_TOKEN,(start_mark),(end_mark)), \
- (token).data.tag_directive.handle = (token_handle), \
- (token).data.tag_directive.prefix = (token_prefix))
-
-/*
- * Event initializers.
- */
-
-#define EVENT_INIT(event,event_type,event_start_mark,event_end_mark) \
- (memset(&(event), 0, sizeof(yaml_event_t)), \
- (event).type = (event_type), \
- (event).start_mark = (event_start_mark), \
- (event).end_mark = (event_end_mark))
-
-#define STREAM_START_EVENT_INIT(event,event_encoding,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_STREAM_START_EVENT,(start_mark),(end_mark)), \
- (event).data.stream_start.encoding = (event_encoding))
-
-#define STREAM_END_EVENT_INIT(event,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_STREAM_END_EVENT,(start_mark),(end_mark)))
-
-#define DOCUMENT_START_EVENT_INIT(event,event_version_directive, \
- event_tag_directives_start,event_tag_directives_end,event_implicit,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_DOCUMENT_START_EVENT,(start_mark),(end_mark)), \
- (event).data.document_start.version_directive = (event_version_directive), \
- (event).data.document_start.tag_directives.start = (event_tag_directives_start), \
- (event).data.document_start.tag_directives.end = (event_tag_directives_end), \
- (event).data.document_start.implicit = (event_implicit))
-
-#define DOCUMENT_END_EVENT_INIT(event,event_implicit,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_DOCUMENT_END_EVENT,(start_mark),(end_mark)), \
- (event).data.document_end.implicit = (event_implicit))
-
-#define ALIAS_EVENT_INIT(event,event_anchor,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_ALIAS_EVENT,(start_mark),(end_mark)), \
- (event).data.alias.anchor = (event_anchor))
-
-#define SCALAR_EVENT_INIT(event,event_anchor,event_tag,event_value,event_length, \
- event_plain_implicit, event_quoted_implicit,event_style,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_SCALAR_EVENT,(start_mark),(end_mark)), \
- (event).data.scalar.anchor = (event_anchor), \
- (event).data.scalar.tag = (event_tag), \
- (event).data.scalar.value = (event_value), \
- (event).data.scalar.length = (event_length), \
- (event).data.scalar.plain_implicit = (event_plain_implicit), \
- (event).data.scalar.quoted_implicit = (event_quoted_implicit), \
- (event).data.scalar.style = (event_style))
-
-#define SEQUENCE_START_EVENT_INIT(event,event_anchor,event_tag, \
- event_implicit,event_style,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_SEQUENCE_START_EVENT,(start_mark),(end_mark)), \
- (event).data.sequence_start.anchor = (event_anchor), \
- (event).data.sequence_start.tag = (event_tag), \
- (event).data.sequence_start.implicit = (event_implicit), \
- (event).data.sequence_start.style = (event_style))
-
-#define SEQUENCE_END_EVENT_INIT(event,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_SEQUENCE_END_EVENT,(start_mark),(end_mark)))
-
-#define MAPPING_START_EVENT_INIT(event,event_anchor,event_tag, \
- event_implicit,event_style,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_MAPPING_START_EVENT,(start_mark),(end_mark)), \
- (event).data.mapping_start.anchor = (event_anchor), \
- (event).data.mapping_start.tag = (event_tag), \
- (event).data.mapping_start.implicit = (event_implicit), \
- (event).data.mapping_start.style = (event_style))
-
-#define MAPPING_END_EVENT_INIT(event,start_mark,end_mark) \
- (EVENT_INIT((event),YAML_MAPPING_END_EVENT,(start_mark),(end_mark)))
-
-/*
- * Document initializer.
- */
-
-#define DOCUMENT_INIT(document,document_nodes_start,document_nodes_end, \
- document_version_directive,document_tag_directives_start, \
- document_tag_directives_end,document_start_implicit, \
- document_end_implicit,document_start_mark,document_end_mark) \
- (memset(&(document), 0, sizeof(yaml_document_t)), \
- (document).nodes.start = (document_nodes_start), \
- (document).nodes.end = (document_nodes_end), \
- (document).nodes.top = (document_nodes_start), \
- (document).version_directive = (document_version_directive), \
- (document).tag_directives.start = (document_tag_directives_start), \
- (document).tag_directives.end = (document_tag_directives_end), \
- (document).start_implicit = (document_start_implicit), \
- (document).end_implicit = (document_end_implicit), \
- (document).start_mark = (document_start_mark), \
- (document).end_mark = (document_end_mark))
-
-/*
- * Node initializers.
- */
-
-#define NODE_INIT(node,node_type,node_tag,node_start_mark,node_end_mark) \
- (memset(&(node), 0, sizeof(yaml_node_t)), \
- (node).type = (node_type), \
- (node).tag = (node_tag), \
- (node).start_mark = (node_start_mark), \
- (node).end_mark = (node_end_mark))
-
-#define SCALAR_NODE_INIT(node,node_tag,node_value,node_length, \
- node_style,start_mark,end_mark) \
- (NODE_INIT((node),YAML_SCALAR_NODE,(node_tag),(start_mark),(end_mark)), \
- (node).data.scalar.value = (node_value), \
- (node).data.scalar.length = (node_length), \
- (node).data.scalar.style = (node_style))
-
-#define SEQUENCE_NODE_INIT(node,node_tag,node_items_start,node_items_end, \
- node_style,start_mark,end_mark) \
- (NODE_INIT((node),YAML_SEQUENCE_NODE,(node_tag),(start_mark),(end_mark)), \
- (node).data.sequence.items.start = (node_items_start), \
- (node).data.sequence.items.end = (node_items_end), \
- (node).data.sequence.items.top = (node_items_start), \
- (node).data.sequence.style = (node_style))
-
-#define MAPPING_NODE_INIT(node,node_tag,node_pairs_start,node_pairs_end, \
- node_style,start_mark,end_mark) \
- (NODE_INIT((node),YAML_MAPPING_NODE,(node_tag),(start_mark),(end_mark)), \
- (node).data.mapping.pairs.start = (node_pairs_start), \
- (node).data.mapping.pairs.end = (node_pairs_end), \
- (node).data.mapping.pairs.top = (node_pairs_start), \
- (node).data.mapping.style = (node_style))
-
diff --git a/ext/psych/psych_yaml_tree.c b/ext/psych/yaml_tree.c
index bcf24d2070..bcf24d2070 100644
--- a/ext/psych/psych_yaml_tree.c
+++ b/ext/psych/yaml_tree.c
diff --git a/ext/psych/psych_yaml_tree.h b/ext/psych/yaml_tree.h
index 4628a69d71..4628a69d71 100644
--- a/ext/psych/psych_yaml_tree.h
+++ b/ext/psych/yaml_tree.h
diff --git a/ext/pty/.cvsignore b/ext/pty/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/pty/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 1db9f6e8aa..3d6d0f1e46 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,8 +1,6 @@
require 'mkmf'
-$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
-
-if /mswin|mingw|bccwin|nacl/ !~ RUBY_PLATFORM
+if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
have_header("sys/stropts.h")
have_func("setresuid")
have_header("libutil.h")
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index c3f3925be7..54cf709ee2 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -1,34 +1,12 @@
$expect_verbose = false
-# Expect library adds the IO instance method #expect, which does similar act to
-# tcl's expect extension.
-#
-# In order to use this method, you must require expect:
-#
-# require 'expect'
-#
-# Please see #expect for usage.
class IO
- # call-seq:
- # IO#expect(pattern,timeout=9999999) -> Array
- # IO#expect(pattern,timeout=9999999) { |result| ... } -> nil
- #
- # Reads from the IO until the given +pattern+ matches or the +timeout+ is over.
- #
- # It returns an array with the read buffer, followed by the matches.
- # If a block is given, the result is yielded to the block and returns nil.
- #
- # When called without a block, it waits until the input that matches the
- # given +pattern+ is obtained from the IO or the time specified as the
- # timeout passes. An array is returned when the pattern is obtained from the
- # IO. The first element of the array is the entire string obtained from the
- # IO until the pattern matches, followed by elements indicating which the
- # pattern which matched to the anchor in the regular expression.
- #
- # The optional timeout parameter defines, in seconds, the total time to wait
- # for the pattern. If the timeout expires or eof is found, nil is returned
- # or yielded. However, the buffer in a timeout session is kept for the next
- # expect call. The default timeout is 9999999 seconds.
+ # Reads ios until pattern matches or the timeout is over. It returns
+ # an array with the read buffer, followed by the matches. If a block is given,
+ # the result is yielded to the block and returns nil. The optional timeout parameter defines,
+ # in seconds, the total time to wait for pattern. If it is over of eof is found, it
+ # returns/yields nil. However, the buffer in a timeout session is kept for the next expect call.
+ # The default timeout is 9999999 seconds.
def expect(pat,timeout=9999999)
buf = ''
case pat
@@ -37,7 +15,7 @@ class IO
when Regexp
e_pat = pat
else
- raise TypeError, "unsupported pattern class: #{pat.class}"
+ raise TypeError, "unsupported pattern class: #{pattern.class}"
end
@unusedBuf ||= ''
while true
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index e2f5882d67..800e75959b 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -32,7 +32,6 @@
#include "ruby/ruby.h"
#include "ruby/io.h"
#include "ruby/util.h"
-#include "internal.h"
#include <signal.h>
#ifdef HAVE_SYS_STROPTS_H
@@ -45,6 +44,70 @@
#define DEVICELEN 16
+#if !defined(HAVE_OPENPTY)
+#if defined(__hpux)
+static const
+char MasterDevice[] = "/dev/ptym/pty%s",
+ SlaveDevice[] = "/dev/pty/tty%s",
+ *const deviceNo[] = {
+ "p0","p1","p2","p3","p4","p5","p6","p7",
+ "p8","p9","pa","pb","pc","pd","pe","pf",
+ "q0","q1","q2","q3","q4","q5","q6","q7",
+ "q8","q9","qa","qb","qc","qd","qe","qf",
+ "r0","r1","r2","r3","r4","r5","r6","r7",
+ "r8","r9","ra","rb","rc","rd","re","rf",
+ "s0","s1","s2","s3","s4","s5","s6","s7",
+ "s8","s9","sa","sb","sc","sd","se","sf",
+ "t0","t1","t2","t3","t4","t5","t6","t7",
+ "t8","t9","ta","tb","tc","td","te","tf",
+ "u0","u1","u2","u3","u4","u5","u6","u7",
+ "u8","u9","ua","ub","uc","ud","ue","uf",
+ "v0","v1","v2","v3","v4","v5","v6","v7",
+ "v8","v9","va","vb","vc","vd","ve","vf",
+ "w0","w1","w2","w3","w4","w5","w6","w7",
+ "w8","w9","wa","wb","wc","wd","we","wf",
+ 0,
+ };
+#elif defined(_IBMESA) /* AIX/ESA */
+static const
+char MasterDevice[] = "/dev/ptyp%s",
+ SlaveDevice[] = "/dev/ttyp%s",
+ *const deviceNo[] = {
+"00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
+"10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
+"20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
+"30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
+"40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
+"50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
+"60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
+"70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
+"80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
+"90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
+"a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
+"b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
+"c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
+"d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
+"e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
+"f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
+ };
+#elif !defined(HAVE_PTSNAME)
+static const
+char MasterDevice[] = "/dev/pty%s",
+ SlaveDevice[] = "/dev/tty%s",
+ *const deviceNo[] = {
+ "p0","p1","p2","p3","p4","p5","p6","p7",
+ "p8","p9","pa","pb","pc","pd","pe","pf",
+ "q0","q1","q2","q3","q4","q5","q6","q7",
+ "q8","q9","qa","qb","qc","qd","qe","qf",
+ "r0","r1","r2","r3","r4","r5","r6","r7",
+ "r8","r9","ra","rb","rc","rd","re","rf",
+ "s0","s1","s2","s3","s4","s5","s6","s7",
+ "s8","s9","sa","sb","sc","sd","se","sf",
+ 0,
+ };
+#endif
+#endif /* !defined(HAVE_OPENPTY) */
+
#ifndef HAVE_SETEUID
# ifdef HAVE_SETREUID
# define seteuid(e) setreuid(-1, (e))
@@ -59,9 +122,6 @@
static VALUE eChildExited;
-/* Returns the exit status of the child for which PTY#check
- * raised this exception
- */
static VALUE
echild_status(VALUE self)
{
@@ -75,24 +135,38 @@ struct pty_info {
static void getDevice(int*, int*, char [DEVICELEN], int);
+struct exec_info {
+ int argc;
+ VALUE *argv;
+};
+
+static VALUE
+pty_exec(VALUE v)
+{
+ struct exec_info *arg = (struct exec_info *)v;
+ return rb_f_exec(arg->argc, arg->argv);
+}
+
struct child_info {
int master, slave;
char *slavename;
- VALUE execarg_obj;
- struct rb_execarg *eargp;
+ int argc;
+ VALUE *argv;
};
static int
-chfunc(void *data, char *errbuf, size_t errbuf_len)
+chfunc(void *data)
{
struct child_info *carg = data;
int master = carg->master;
int slave = carg->slave;
+ int argc = carg->argc;
+ VALUE *argv = carg->argv;
-#define ERROR_EXIT(str) do { \
- strlcpy(errbuf, (str), errbuf_len); \
- return -1; \
- } while (0)
+ struct exec_info arg;
+ int status;
+
+ rb_thread_atfork_before_exec();
/*
* Set free from process group and controlling terminal
@@ -103,16 +177,15 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
# ifdef HAVE_SETPGRP
# ifdef SETGRP_VOID
if (setpgrp() == -1)
- ERROR_EXIT("setpgrp()");
+ perror("setpgrp()");
# else /* SETGRP_VOID */
if (setpgrp(0, getpid()) == -1)
- ERROR_EXIT("setpgrp()");
+ rb_sys_fail("setpgrp()");
{
- int i = rb_cloexec_open("/dev/tty", O_RDONLY, 0);
- if (i < 0) ERROR_EXIT("/dev/tty");
- rb_update_max_fd(i);
+ int i = open("/dev/tty", O_RDONLY);
+ if (i < 0) rb_sys_fail("/dev/tty");
if (ioctl(i, TIOCNOTTY, (char *)0))
- ERROR_EXIT("ioctl(TIOCNOTTY)");
+ perror("ioctl(TIOCNOTTY)");
close(i);
}
# endif /* SETGRP_VOID */
@@ -128,13 +201,14 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
/* errors ignored for sun */
#else
close(slave);
- slave = rb_cloexec_open(carg->slavename, O_RDWR, 0);
+ slave = open(carg->slavename, O_RDWR);
if (slave < 0) {
- ERROR_EXIT("open: pty slave");
+ perror("open: pty slave");
+ _exit(1);
}
- rb_update_max_fd(slave);
close(master);
#endif
+ write(slave, "", 1);
dup2(slave,0);
dup2(slave,1);
dup2(slave,2);
@@ -143,21 +217,23 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
seteuid(getuid());
#endif
- return rb_exec_async_signal_safe(carg->eargp, errbuf, sizeof(errbuf_len));
-#undef ERROR_EXIT
+ arg.argc = argc;
+ arg.argv = argv;
+ rb_protect(pty_exec, (VALUE)&arg, &status);
+ sleep(1);
+ _exit(1);
}
static void
establishShell(int argc, VALUE *argv, struct pty_info *info,
char SlaveName[DEVICELEN])
{
- int master, slave, status = 0;
+ int master,slave;
rb_pid_t pid;
- char *p, *getenv();
+ char *p, tmp, *getenv();
struct passwd *pwent;
VALUE v;
struct child_info carg;
- char errbuf[32];
if (argc == 0) {
const char *shellname;
@@ -177,33 +253,26 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
argv = &v;
}
- carg.execarg_obj = rb_execarg_new(argc, argv, 1);
- carg.eargp = rb_execarg_get(carg.execarg_obj);
- rb_execarg_fixup(carg.execarg_obj);
-
getDevice(&master, &slave, SlaveName, 0);
carg.master = master;
carg.slave = slave;
carg.slavename = SlaveName;
- errbuf[0] = '\0';
- pid = rb_fork_async_signal_safe(&status, chfunc, &carg, Qnil, errbuf, sizeof(errbuf));
+ carg.argc = argc;
+ carg.argv = argv;
+ pid = rb_fork(0, chfunc, &carg, Qnil);
if (pid < 0) {
- int e = errno;
close(master);
close(slave);
- errno = e;
- if (status) rb_jump_tag(status);
- rb_sys_fail(errbuf[0] ? errbuf : "fork failed");
+ rb_sys_fail("fork failed");
}
+ read(master, &tmp, 1);
close(slave);
info->child_pid = pid;
info->fd = master;
-
- RB_GC_GUARD(carg.execarg_obj);
}
static int
@@ -219,7 +288,6 @@ static int
get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
{
#if defined(HAVE_POSIX_OPENPT)
- /* Unix98 PTY */
int masterfd = -1, slavefd = -1;
char *slavedevice;
struct sigaction dfl, old;
@@ -228,37 +296,16 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
dfl.sa_flags = 0;
sigemptyset(&dfl.sa_mask);
-#if defined(__sun) || defined(__FreeBSD__)
- /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set. [ruby-dev:44688] */
- /* FreeBSD 8 supported O_CLOEXEC for posix_openpt, but FreeBSD 9 removed it.
- * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */
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;
- rb_fd_fix_cloexec(masterfd);
-#else
- {
- int flags = O_RDWR|O_NOCTTY;
-# if defined(O_CLOEXEC)
- /* glibc posix_openpt() in GNU/Linux calls open("/dev/ptmx", flags) internally.
- * So version dependency on GNU/Linux is same as O_CLOEXEC with open().
- * O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */
- flags |= O_CLOEXEC;
-# endif
- if ((masterfd = posix_openpt(flags)) == -1) goto error;
- }
- rb_fd_fix_cloexec(masterfd);
- if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error;
- if (grantpt(masterfd) == -1) goto grantpt_error;
-#endif
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 = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
- rb_update_max_fd(slavefd);
+ if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
-#if defined(I_PUSH) && !defined(__linux__)
+#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;
@@ -288,8 +335,6 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
if (!fail) return -1;
rb_raise(rb_eRuntimeError, "openpty() failed");
}
- rb_fd_fix_cloexec(*master);
- rb_fd_fix_cloexec(*slave);
if (no_mesg(SlaveName, nomesg) == -1) {
if (!fail) return -1;
rb_raise(rb_eRuntimeError, "can't chmod slave pty");
@@ -298,7 +343,6 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
return 0;
#elif defined HAVE__GETPTY
- /* SGI IRIX */
char *name;
mode_t mode = nomesg ? 0600 : 0622;
@@ -306,16 +350,12 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
if (!fail) return -1;
rb_raise(rb_eRuntimeError, "_getpty() failed");
}
- rb_fd_fix_cloexec(*master);
- *slave = rb_cloexec_open(name, O_RDWR, 0);
- /* error check? */
- rb_update_max_fd(*slave);
+ *slave = open(name, O_RDWR);
strlcpy(SlaveName, name, DEVICELEN);
return 0;
#elif defined(HAVE_PTSNAME)
- /* System V */
int masterfd = -1, slavefd = -1;
char *slavedevice;
void (*s)();
@@ -324,25 +364,15 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
extern int unlockpt(int);
extern int grantpt(int);
-#if defined(__sun)
- /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set. [ruby-dev:44688] */
if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
s = signal(SIGCHLD, SIG_DFL);
if(grantpt(masterfd) == -1) goto error;
- rb_fd_fix_cloexec(masterfd);
-#else
- if((masterfd = rb_cloexec_open("/dev/ptmx", O_RDWR, 0)) == -1) goto error;
- rb_update_max_fd(masterfd);
- s = signal(SIGCHLD, SIG_DFL);
- if(grantpt(masterfd) == -1) goto error;
-#endif
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 = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error;
- rb_update_max_fd(slavefd);
-#if defined(I_PUSH) && !defined(__linux__)
+ if((slavefd = open(slavedevice, O_RDWR, 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;
ioctl(slavefd, I_PUSH, "ttcompat");
@@ -358,78 +388,16 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
if (fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
return -1;
#else
- /* BSD */
int masterfd = -1, slavefd = -1;
const char *const *p;
char MasterName[DEVICELEN];
-#if defined(__hpux)
- static const char MasterDevice[] = "/dev/ptym/pty%s";
- static const char SlaveDevice[] = "/dev/pty/tty%s";
- static const char *const deviceNo[] = {
- "p0","p1","p2","p3","p4","p5","p6","p7",
- "p8","p9","pa","pb","pc","pd","pe","pf",
- "q0","q1","q2","q3","q4","q5","q6","q7",
- "q8","q9","qa","qb","qc","qd","qe","qf",
- "r0","r1","r2","r3","r4","r5","r6","r7",
- "r8","r9","ra","rb","rc","rd","re","rf",
- "s0","s1","s2","s3","s4","s5","s6","s7",
- "s8","s9","sa","sb","sc","sd","se","sf",
- "t0","t1","t2","t3","t4","t5","t6","t7",
- "t8","t9","ta","tb","tc","td","te","tf",
- "u0","u1","u2","u3","u4","u5","u6","u7",
- "u8","u9","ua","ub","uc","ud","ue","uf",
- "v0","v1","v2","v3","v4","v5","v6","v7",
- "v8","v9","va","vb","vc","vd","ve","vf",
- "w0","w1","w2","w3","w4","w5","w6","w7",
- "w8","w9","wa","wb","wc","wd","we","wf",
- 0
- };
-#elif defined(_IBMESA) /* AIX/ESA */
- static const char MasterDevice[] = "/dev/ptyp%s";
- static const char SlaveDevice[] = "/dev/ttyp%s";
- static const char *const deviceNo[] = {
- "00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f",
- "10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f",
- "20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f",
- "30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f",
- "40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f",
- "50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f",
- "60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f",
- "70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f",
- "80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f",
- "90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f",
- "a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af",
- "b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf",
- "c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf",
- "d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
- "e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
- "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
- 0
- };
-#else /* 4.2BSD */
- static const char MasterDevice[] = "/dev/pty%s";
- static const char SlaveDevice[] = "/dev/tty%s";
- static const char *const deviceNo[] = {
- "p0","p1","p2","p3","p4","p5","p6","p7",
- "p8","p9","pa","pb","pc","pd","pe","pf",
- "q0","q1","q2","q3","q4","q5","q6","q7",
- "q8","q9","qa","qb","qc","qd","qe","qf",
- "r0","r1","r2","r3","r4","r5","r6","r7",
- "r8","r9","ra","rb","rc","rd","re","rf",
- "s0","s1","s2","s3","s4","s5","s6","s7",
- "s8","s9","sa","sb","sc","sd","se","sf",
- 0
- };
-#endif
for (p = deviceNo; *p != NULL; p++) {
snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
- if ((masterfd = rb_cloexec_open(MasterName,O_RDWR,0)) >= 0) {
- rb_update_max_fd(masterfd);
+ if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) {
*master = masterfd;
snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
- if ((slavefd = rb_cloexec_open(SlaveName,O_RDWR,0)) >= 0) {
- rb_update_max_fd(slavefd);
+ 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;
@@ -463,7 +431,7 @@ pty_close_pty(VALUE assoc)
for (i = 0; i < 2; i++) {
io = rb_ary_entry(assoc, i);
- if (RB_TYPE_P(io, T_FILE) && 0 <= RFILE(io)->fptr->fd)
+ if (TYPE(io) == T_FILE && 0 <= RFILE(io)->fptr->fd)
rb_io_close(io);
}
return Qnil;
@@ -471,34 +439,49 @@ pty_close_pty(VALUE assoc)
/*
* call-seq:
- * PTY.open => [master_io, slave_file]
- * PTY.open {|master_io, slave_file| ... } => block value
+ * PTY.open => [master_io, slave_file]
+ * PTY.open {|master_io, slave_file| ... } => block value
*
* Allocates a pty (pseudo-terminal).
*
- * In the block form, yields two arguments <tt>master_io, slave_file</tt>
- * and the value of the block is returned from +open+.
- *
- * The IO and File are both closed after the block completes if they haven't
- * been already closed.
+ * 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.
*
- * PTY.open {|master, slave|
- * p master #=> #<IO:masterpty:/dev/pts/1>
- * p slave #=> #<File:/dev/pts/1>
- * p slave.path #=> "/dev/pts/1"
- * }
+ * 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.
*
- * In the non-block form, returns a two element array, <tt>[master_io,
- * slave_file]</tt>.
+ * The path name of the terminal device can be gotten by slave_file.path.
*
- * master, slave = PTY.open
- * # do something with master for IO, or the slave file
- *
- * The arguments in both forms are:
+ * PTY.open {|m, s|
+ * p m #=> #<IO:masterpty:/dev/pts/1>
+ * p s #=> #<File:/dev/pts/1>
+ * p s.path #=> "/dev/pts/1"
+ * }
*
- * +master_io+:: the master of the pty, as an IO.
- * +slave_file+:: the slave of the pty, as a File. The path to the
- * terminal device is available via +slave_file.path+
+ * # 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"
+ * w.close
+ * # The result of read operation when pty slave is closed is platform dependnet.
+ * ret = begin
+ * m.gets # FreeBSD returns nil.
+ * rescue Errno::EIO # GNU/Linux raises EIO.
+ * nil
+ * end
+ * p ret #=> nil
*
*/
static VALUE
@@ -540,31 +523,24 @@ pty_detach_process(struct pty_info *info)
/*
* call-seq:
- * PTY.spawn(command_line) { |r, w, pid| ... }
- * PTY.spawn(command_line) => [r, w, pid]
- * PTY.spawn(command, arguments, ...) { |r, w, pid| ... }
- * PTY.spawn(command, arguments, ...) => [r, w, pid]
- *
- * Spawns the specified command on a newly allocated pty. You can also use the
- * alias ::getpty.
+ * 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
*
- * The command's controlling tty is set to the slave device of the pty
- * and its standard input/output/error is redirected to the slave device.
+ * spawns the specified command on a newly allocated pty.
*
- * +command+ and +command_line+ are the full commands to run, given a String.
- * Any additional +arguments+ will be passed to the command.
+ * 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.
*
- * === Return values
+ * 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.
*
- * In the non-block form this returns an array of size three,
- * <tt>[r, w, pid]</tt>.
+ * If a block is given, two IO objects and PID is yielded.
*
- * In the block form these same values will be yielded to the block:
- *
- * +r+:: A readable IO that that contains the command's
- * standard output and standard error
- * +w+:: A writable IO that is the command's standard input
- * +pid+:: The process identifier for the command.
*/
static VALUE
pty_getpty(int argc, VALUE *argv, VALUE self)
@@ -586,10 +562,9 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
rfptr->pathv = rb_obj_freeze(rb_str_new_cstr(SlaveName));
wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
- wfptr->fd = rb_cloexec_dup(info.fd);
+ wfptr->fd = dup(info.fd);
if (wfptr->fd == -1)
rb_sys_fail("dup()");
- rb_update_max_fd(wfptr->fd);
wfptr->pathv = rfptr->pathv;
res = rb_ary_new2(3);
@@ -604,12 +579,11 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
return res;
}
-NORETURN(static void raise_from_check(pid_t pid, int status));
static void
raise_from_check(pid_t pid, int status)
{
const char *state;
- VALUE msg;
+ char buf[1024];
VALUE exc;
#if defined(WIFSTOPPED)
@@ -627,28 +601,20 @@ raise_from_check(pid_t pid, int status)
else {
state = "exited";
}
- msg = rb_sprintf("pty - %s: %ld", state, (long)pid);
- exc = rb_exc_new3(eChildExited, msg);
+ 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);
}
/*
* call-seq:
- * PTY.check(pid, raise = false) => Process::Status or nil
- * PTY.check(pid, true) => nil or raises PTY::ChildExited
- *
- * Checks the status of the child process specified by +pid+.
- * Returns +nil+ if the process is still alive.
- *
- * If the process is not alive, and +raise+ was true, a PTY::ChildExited
- * exception will be raised. Otherwise it will return a Process::Status
- * instance.
- *
- * +pid+:: The process id of the process to check
- * +raise+:: If +true+ and the process identified by +pid+ is no longer
- * alive a PTY::ChildExited is raised.
+ * PTY.check(pid[, raise=false]) => Process::Status or nil
*
+ * checks the status of the child process specified by _pid_, and
+ * returns +nil+ if the process is still alive and active. Otherwise,
+ * returns +Process::Status+ about the process if _raise_ is false, or
+ * +PTY::ChildExited+ exception is raised.
*/
static VALUE
pty_check(int argc, VALUE *argv, VALUE self)
@@ -659,87 +625,19 @@ pty_check(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "11", &pid, &exc);
cpid = rb_waitpid(NUM2PIDT(pid), &status, WNOHANG|WUNTRACED);
- if (cpid == -1 || cpid == 0) return Qnil;
+ if (cpid == -1) return Qnil;
if (!RTEST(exc)) return rb_last_status_get();
raise_from_check(cpid, status);
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
static VALUE cPTY;
-/*
- * Document-class: PTY::ChildExited
- *
- * Thrown when PTY::check is called for a pid that represents a process that
- * has exited.
- */
-
-/*
- * Document-class: PTY
- *
- * Creates and managed pseudo terminals (PTYs). See also
- * http://en.wikipedia.org/wiki/Pseudo_terminal
- *
- * PTY allows you to allocate new terminals using ::open or ::spawn a new
- * terminal with a specific command.
- *
- * == Example
- *
- * In this example we will change the buffering type in the +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.
- *
- * # start by requiring the standard library PTY
- * require 'pty'
- *
- * master, slave = PTY.open
- * read, write = IO.pipe
- * pid = spawn("factor", :in=>read, :out=>slave)
- * read.close # we dont need the read
- * slave.close # or the slave
- *
- * # pipe "42" to the factor command
- * write.puts "42"
- * # output the response from factor
- * p master.gets #=> "42: 2 3 7\n"
- *
- * # pipe "144" to factor and print out the response
- * write.puts "144"
- * p master.gets #=> "144: 2 2 2 2 3 3\n"
- * write.close # close the pipe
- *
- * # The result of read operation when pty slave is closed is platform
- * # dependent.
- * ret = begin
- * m.gets # FreeBSD returns nil.
- * rescue Errno::EIO # GNU/Linux raises EIO.
- * nil
- * end
- * p ret #=> nil
- *
- * == License
- *
- * C) Copyright 1998 by Akinori Ito.
- *
- * This software may be redistributed freely for this purpose, in full
- * or in part, provided that this entire copyright notice is included
- * on any copies of this software and applications and derivations thereof.
- *
- * This software is provided on an "as is" basis, without warranty of any
- * kind, either expressed or implied, as to any matter including, but not
- * limited to warranty of fitness of purpose, or merchantability, or
- * results obtained from use of this software.
- */
-
void
Init_pty()
{
cPTY = rb_define_module("PTY");
- /* :nodoc */
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);
diff --git a/ext/purelib.rb b/ext/purelib.rb
new file mode 100644
index 0000000000..cc1a00bdb2
--- /dev/null
+++ b/ext/purelib.rb
@@ -0,0 +1,17 @@
+nul = nil
+$:.each_with_index {|path, index|
+ if /\A(?:\.\/)*-\z/ =~ path
+ nul = index
+ break
+ 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
+end
diff --git a/ext/racc/cparse/.cvsignore b/ext/racc/cparse/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/racc/cparse/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index b653c3ad1a..3a2a8ae74e 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -416,12 +416,12 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
return;
}
- if (!RB_TYPE_P(block_args, T_ARRAY)) {
+ if (TYPE(block_args) != T_ARRAY) {
rb_raise(rb_eTypeError,
- "%s() %s %"PRIsVALUE" (must be Array[2])",
+ "%s() %s %s (must be Array[2])",
v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
v->lex_is_iterator ? "yielded" : "returned",
- rb_obj_class(block_args));
+ rb_class2name(CLASS_OF(block_args)));
}
if (RARRAY_LEN(block_args) != 2) {
rb_raise(rb_eArgError,
diff --git a/ext/readline/.cvsignore b/ext/readline/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/readline/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/readline/README.ja b/ext/readline/README.ja
index f1b42f25bc..5c8e0da508 100644
--- a/ext/readline/README.ja
+++ b/ext/readline/README.ja
@@ -1,20 +1,20 @@
-GNU Readline ã«ã‚ˆã‚‹ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³å…¥åŠ›ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã‚’æä¾›ã™ã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«
-ã§ã™ã€‚GNU Readline ã®äº’æ›ãƒ©ã‚¤ãƒ–ラリã®ã²ã¨ã¤ã§ã‚ã‚‹ Edit Line(libedit) ã‚‚
-サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚
+GNU Readline ¤Ë¤è¤ë¥³¥Þ¥ó¥É¥é¥¤¥óÆþÎÏ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤¹¤ë¥â¥¸¥å¡¼¥ë
+¤Ç¤¹¡£GNU Readline ¤Î¸ß´¹¥é¥¤¥Ö¥é¥ê¤Î¤Ò¤È¤Ä¤Ç¤¢¤ë Edit Line(libedit) ¤â
+¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
GNU Readline:: http://www.gnu.org/directory/readline.html
libedit:: http://www.thrysoee.dk/editline/
-Readline.readline を使用ã—ã¦ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰ã®å…¥åŠ›ã‚’å–å¾—ã§ãã¾ã™ã€‚ã“ã®ã¨ãã€
-GNU Readline ã®ã‚ˆã†ã«å…¥åŠ›ã®è£œå®Œã‚„Emacs ã®ã‚ˆã†ãªã‚­ãƒ¼æ“作ãªã©ãŒã§ãã¾ã™ã€‚
+Readline.readline ¤ò»ÈÍѤ·¤Æ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤò¼èÆÀ¤Ç¤­¤Þ¤¹¡£¤³¤Î¤È¤­¡¢
+GNU Readline ¤Î¤è¤¦¤ËÆþÎϤÎÊä´°¤äEmacs ¤Î¤è¤¦¤Ê¥­¡¼Áàºî¤Ê¤É¤¬¤Ç¤­¤Þ¤¹¡£
require "readline"
while buf = Readline.readline("> ", true)
p buf
end
-ユーザãŒå…¥åŠ›ã—ãŸå†…容を履歴(以下ã€ãƒ’ストリ)ã¨ã—ã¦è¨˜éŒ²ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-定数 Readline::HISTORY を使用ã—ã¦ãƒ’ストリã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ã€‚
+¥æ¡¼¥¶¤¬ÆþÎϤ·¤¿ÆâÍÆ¤òÍúÎò(°Ê²¼¡¢¥Ò¥¹¥È¥ê)¤È¤·¤Æµ­Ï¿¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+Äê¿ô Readline::HISTORY ¤ò»ÈÍѤ·¤Æ¥Ò¥¹¥È¥ê¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
require "readline"
while buf = Readline.readline("> ", true)
@@ -22,43 +22,43 @@ GNU Readline ã®ã‚ˆã†ã«å…¥åŠ›ã®è£œå®Œã‚„Emacs ã®ã‚ˆã†ãªã‚­ãƒ¼æ“作ãªã©ã
print("-> ", buf, "\n")
end
-使用ã™ã‚‹ãƒ©ã‚¤ãƒ–ラリã«ã‚ˆã‚Šã€ã„ãã¤ã‹ã®ãƒ¡ã‚½ãƒƒãƒ‰ã§ä¾‹å¤– NotImplementedError
-ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+»ÈÍѤ¹¤ë¥é¥¤¥Ö¥é¥ê¤Ë¤è¤ê¡¢¤¤¤¯¤Ä¤«¤Î¥á¥½¥Ã¥É¤ÇÎã³° NotImplementedError
+¤¬È¯À¸¤·¤Þ¤¹¡£
-$SAFE ㌠4 ã®å ´åˆã€å¤šãã®ãƒ¡ã‚½ãƒƒãƒ‰ã§ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+$SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Â¿¤¯¤Î¥á¥½¥Ã¥É¤ÇÎã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-== Readline モジュール
+== Readline ¥â¥¸¥å¡¼¥ë
-=== モジュール関数
+=== ¥â¥¸¥å¡¼¥ë´Ø¿ô
readline([prompt, [add_hist]]) -> String | nil
- prompt を出力ã—ã€ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰ã®ã‚­ãƒ¼å…¥åŠ›ã‚’å¾…ã¡ã¾ã™ã€‚
- ã‚¨ãƒ³ã‚¿ãƒ¼ã‚­ãƒ¼ã®æŠ¼ä¸‹ãªã©ã§ãƒ¦ãƒ¼ã‚¶ãŒæ–‡å­—列を入力ã—終ãˆã‚‹ã¨ã€
- 入力ã—ãŸæ–‡å­—列を返ã—ã¾ã™ã€‚
- ã“ã®ã¨ãã€add_hist ㌠true ã§ã‚れã°ã€å…¥åŠ›ã—ãŸæ–‡å­—列をヒストリã«è¿½åŠ ã—ã¾ã™ã€‚
-
- 何も入力ã—ã¦ã„ãªã„状態㧠EOF(UNIX ã§ã¯ ^D) を入力ã™ã‚‹ãªã©ã§ã€
- ユーザã‹ã‚‰ã®å…¥åŠ›ãŒãªã„å ´åˆã¯ nil ã‚’è¿”ã—ã¾ã™ã€‚
-
- æ¬¡ã®æ¡ä»¶ã‚’å…¨ã¦æº€ãŸã™å ´åˆã€ä¾‹å¤– IOError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
- 1. 標準入力㌠tty ã§ãªã„。
- 2. 標準入力をクローズã—ã¦ã„る。(isatty(2) ã® errno ㌠EBADF ã§ã‚る。)
-
- 本メソッドã¯ã‚¹ãƒ¬ãƒƒãƒ‰ã«å¯¾å¿œã—ã¦ã„ã¾ã™ã€‚
- 入力待ã¡çŠ¶æ…‹ã®ã¨ãã¯ã‚¹ãƒ¬ãƒƒãƒ‰ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆã®åˆ‡æ›¿ãˆãŒç™ºç”Ÿã—ã¾ã™ã€‚
-
- 入力時ã«ã¯è¡Œå†…編集ãŒå¯èƒ½ã§ã€vi モード㨠Emacs モードãŒç”¨æ„ã•れã¦ã„ã¾ã™ã€‚
- デフォルト㯠Emacs モードã§ã™ã€‚
-
- 本メソッドã«ã¯æ³¨æ„事項ãŒã‚りã¾ã™ã€‚
- 入力待ã¡ã®çŠ¶æ…‹ã§ ^C ã™ã‚‹ã¨ ruby インタプリタãŒçµ‚了ã—ã€ç«¯æœ«çŠ¶æ…‹ã‚’å¾©å¸°ã—ã¾ã›ã‚“。
- ã“れを回é¿ã™ã‚‹ãŸã‚ã®ä¾‹ã‚’3ã¤æŒ™ã’ã¾ã™ã€‚
-
- * ^Cã«ã‚ˆã‚‹Interrupt例外を補足ã—ã¦ã€ç«¯æœ«çŠ¶æ…‹ã‚’å¾©å¸°ã—ã¾ã™:
-
+ 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
@@ -70,329 +70,329 @@ readline([prompt, [add_hist]]) -> String | nil
end
end
end
-
- * INTシグナルを補足ã—ã¦ã€ç«¯æœ«çŠ¶æ…‹ã‚’å¾©å¸°ã—ã¾ã™:
-
+
+ * INT¥·¥°¥Ê¥ë¤òÊä­¤·¤Æ¡¢Ã¼Ëö¾õÂÖ¤òÉüµ¢¤·¤Þ¤¹:
+
require "readline"
-
+
stty_save = `stty -g`.chomp
trap("INT") { system "stty", stty_save; exit }
-
+
while buf = Readline.readline
p buf
end
-
- * å˜ã« ^C を無視ã™ã‚‹æ–¹æ³•ã‚‚ã‚りã¾ã™:
-
+
+ * ñ¤Ë ^C ¤ò̵»ë¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹:
+
require "readline"
-
+
trap("INT", "SIG_IGN")
-
+
while buf = Readline.readline
p buf
end
-
- 入力履歴 Readline::HISTORY を使用ã—ã¦ã€ç©ºè¡Œã‚„ç›´å‰ã®å…¥åŠ›ã¨åŒã˜å†…容ã¯å…¥åŠ›
- å±¥æ­´ã«æ®‹ã•ãªã„ã¨ã„ã†ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
-
+
+ ÆþÎÏÍúÎò 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
+ Readline::HISTORY.pop
end
rescue IndexError
end
-
+
# p Readline::HISTORY.to_a
print "-> ", buf, "\n"
end
+
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
-
-=== クラスメソッド
+=== ¥¯¥é¥¹¥á¥½¥Ã¥É
Readline.input = input
- Readline.readline メソッドã§ä½¿ç”¨ã™ã‚‹å…¥åŠ›ç”¨ã® File オブジェクト input
- を指定ã—ã¾ã™ã€‚
+ Readline.readline ¥á¥½¥Ã¥É¤Ç»ÈÍѤ¹¤ëÆþÎÏÍѤΠFile ¥ª¥Ö¥¸¥§¥¯¥È input
+ ¤ò»ØÄꤷ¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.output = output
- Readline.readline メソッドã§ä½¿ç”¨ã™ã‚‹å‡ºåŠ›ç”¨ã® File オブジェクト
- output を指定ã—ã¾ã™ã€‚
+ Readline.readline ¥á¥½¥Ã¥É¤Ç»ÈÍѤ¹¤ë½ÐÎÏÍѤΠFile ¥ª¥Ö¥¸¥§¥¯¥È
+ output ¤ò»ØÄꤷ¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completion_proc = proc
- ユーザã‹ã‚‰ã®å…¥åŠ›ã‚’è£œå®Œã™ã‚‹æ™‚ã®å€™è£œã‚’å–å¾—ã™ã‚‹ Proc オブジェクト proc ã‚’
- 指定ã—ã¾ã™ã€‚proc ã¯ã€æ¬¡ã®ã‚‚ã®ã‚’想定ã—ã¦ã„ã¾ã™ã€‚
- 1. call メソッドをæŒã¡ã¾ã™ã€‚
- call メソッドをæŒãŸãªã„å ´åˆã€ä¾‹å¤– ArgumentError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
- 2. 引数ã«ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰ã®å…¥åŠ›æ–‡å­—åˆ—(注1)ã‚’å–りã¾ã™ã€‚
- 3. å€™è£œã®æ–‡å­—列ã®é…列を返ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤòÊä´°¤¹¤ë»þ¤Î¸õÊä¤ò¼èÆÀ¤¹¤ë Proc ¥ª¥Ö¥¸¥§¥¯¥È proc ¤ò
+ »ØÄꤷ¤Þ¤¹¡£proc ¤Ï¡¢¼¡¤Î¤â¤Î¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
+ 1. call ¥á¥½¥Ã¥É¤ò»ý¤Á¤Þ¤¹¡£
+ call ¥á¥½¥Ã¥É¤ò»ý¤¿¤Ê¤¤¾ì¹ç¡¢Îã³° ArgumentError ¤¬È¯À¸¤·¤Þ¤¹¡£
+ 2. °ú¿ô¤Ë¥æ¡¼¥¶¤«¤é¤ÎÆþÎÏʸ»úÎó(Ãí1)¤ò¼è¤ê¤Þ¤¹¡£
+ 3. ¸õÊä¤Îʸ»úÎó¤ÎÇÛÎó¤òÊÖ¤·¤Þ¤¹¡£
- 注1:「/var/lib /vã€ã®å¾Œã§è£œå®Œã‚’行ã†ã¨ã€
- デフォルトã§ã¯ proc ã®å¼•æ•°ã«ã€Œ/vã€ãŒæ¸¡ã•れã¾ã™ã€‚
- ã“ã®ã‚ˆã†ã«ã€ãƒ¦ãƒ¼ã‚¶ãŒå…¥åŠ›ã—ãŸæ–‡å­—列を
- Readline.completer_word_break_characters ã«å«ã¾ã‚Œã‚‹æ–‡å­—ã§åŒºåˆ‡ã£ãŸã‚‚
- ã®ã‚’å˜èªžã¨ã™ã‚‹ã¨ã€ã‚«ãƒ¼ã‚½ãƒ«ãŒã‚ã‚‹å˜èªžã®æœ€åˆã®æ–‡å­—ã‹ã‚‰ç¾åœ¨ã®ã‚«ãƒ¼ã‚½ãƒ«ä½
- ç½®ã¾ã§ã®æ–‡å­—列㌠proc ã®å¼•æ•°ã«æ¸¡ã•れã¾ã™ã€‚
+ Ãí1:¡Ö/var/lib /v¡×¤Î¸å¤ÇÊä´°¤ò¹Ô¤¦¤È¡¢
+ ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï proc ¤Î°ú¿ô¤Ë¡Ö/v¡×¤¬ÅϤµ¤ì¤Þ¤¹¡£
+ ¤³¤Î¤è¤¦¤Ë¡¢¥æ¡¼¥¶¤¬ÆþÎϤ·¤¿Ê¸»úÎó¤ò
+ Readline.completer_word_break_characters ¤Ë´Þ¤Þ¤ì¤ëʸ»ú¤Ç¶èÀڤ俤â
+ ¤Î¤òñ¸ì¤È¤¹¤ë¤È¡¢¥«¡¼¥½¥ë¤¬¤¢¤ëñ¸ì¤ÎºÇ½é¤Îʸ»ú¤«¤é¸½ºß¤Î¥«¡¼¥½¥ë°Ì
+ Ã֤ޤǤÎʸ»úÎó¤¬ proc ¤Î°ú¿ô¤ËÅϤµ¤ì¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completion_proc -> proc
- ユーザã‹ã‚‰ã®å…¥åŠ›ã‚’è£œå®Œã™ã‚‹æ™‚ã®å€™è£œã‚’å–å¾—ã™ã‚‹ Proc オブジェクト proc
- ã‚’å–å¾—ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤòÊä´°¤¹¤ë»þ¤Î¸õÊä¤ò¼èÆÀ¤¹¤ë Proc ¥ª¥Ö¥¸¥§¥¯¥È proc
+ ¤ò¼èÆÀ¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completion_case_fold = bool
- ユーザã®å…¥åŠ›ã‚’è£œå®Œã™ã‚‹éš›ã€å¤§æ–‡å­—ã¨å°æ–‡å­—を区別ã™ã‚‹ï¼ã—ãªã„を指定ã—ã¾ã™ã€‚
- bool ãŒçœŸãªã‚‰ã°åŒºåˆ¥ã—ã¾ã›ã‚“。bool ãŒå½ãªã‚‰ã°åŒºåˆ¥ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤòÊä´°¤¹¤ëºÝ¡¢Âçʸ»ú¤È¾®Ê¸»ú¤ò¶èÊ̤¹¤ë¡¿¤·¤Ê¤¤¤ò»ØÄꤷ¤Þ¤¹¡£
+ bool ¤¬¿¿¤Ê¤é¤Ð¶èÊ̤·¤Þ¤»¤ó¡£bool ¤¬µ¶¤Ê¤é¤Ð¶èÊ̤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completion_case_fold -> bool
- ユーザã®å…¥åŠ›ã‚’è£œå®Œã™ã‚‹éš›ã€å¤§æ–‡å­—ã¨å°æ–‡å­—を区別ã™ã‚‹ï¼ã—ãªã„ã‚’å–å¾—ã—ã¾ã™ã€‚
- bool ãŒçœŸãªã‚‰ã°åŒºåˆ¥ã—ã¾ã›ã‚“。bool ãŒå½ãªã‚‰ã°åŒºåˆ¥ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤòÊä´°¤¹¤ëºÝ¡¢Âçʸ»ú¤È¾®Ê¸»ú¤ò¶èÊ̤¹¤ë¡¿¤·¤Ê¤¤¤ò¼èÆÀ¤·¤Þ¤¹¡£
+ bool ¤¬¿¿¤Ê¤é¤Ð¶èÊ̤·¤Þ¤»¤ó¡£bool ¤¬µ¶¤Ê¤é¤Ð¶èÊ̤·¤Þ¤¹¡£
- ãªãŠã€Readline.completion_case_fold= ãƒ¡ã‚½ãƒƒãƒ‰ã§æŒ‡å®šã—ãŸã‚ªãƒ–ジェクトを
- ãã®ã¾ã¾å–å¾—ã™ã‚‹ã®ã§ã€æ¬¡ã®ã‚ˆã†ãªå‹•作をã—ã¾ã™ã€‚
+ ¤Ê¤ª¡¢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 ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.line_buffer -> string
- 入力中ã®è¡Œå…¨ä½“ã‚’è¿”ã—ã¾ã™ã€‚complete_proc ã®ä¸­ã§ä½¿ç”¨ã™ã‚‹ã“ã¨ã‚’想定ã—
- ã¦ã„ã¾ã™ã€‚Readline.line_buffer ã®é•·ã•㯠GNU Readline ã® rl_end 変数ã®
- 値ã¨ä¸€è‡´ã—ã¾ã™ã€‚
+ ÆþÎÏÃæ¤Î¹ÔÁ´ÂΤòÊÖ¤·¤Þ¤¹¡£complete_proc ¤ÎÃæ¤Ç»ÈÍѤ¹¤ë¤³¤È¤òÁÛÄꤷ
+ ¤Æ¤¤¤Þ¤¹¡£Readline.line_buffer ¤ÎŤµ¤Ï GNU Readline ¤Î rl_end ÊÑ¿ô¤Î
+ ÃͤȰìÃפ·¤Þ¤¹¡£
Readline.point -> int
- ç¾åœ¨ã®ã‚«ãƒ¼ã‚½ãƒ«ã®ä½ç½®ã‚’è¿”ã—ã¾ã™ã€‚
- Readline モジュールã¯è£œå®Œå¯¾è±¡ã®å˜èªžã®é–‹å§‹ä½ç½®ã®æƒ…報をæä¾›ã—ã¦ã„ã¾ã›ã‚“。
- ã—ã‹ã—ãªãŒã‚‰ã€ completion_proc ã®ä¸­ã§å…¥åŠ›ã—ãŸå˜èªž text ã¨
- Readline.point を使用ã™ã‚‹ã“ã¨ã§é–‹å§‹ä½ç½®ã‚’å°Žãã“ã¨ãŒã§ãã¾ã™ã€‚
+ ¸½ºß¤Î¥«¡¼¥½¥ë¤Î°ÌÃÖ¤òÊÖ¤·¤Þ¤¹¡£
+ Readline ¥â¥¸¥å¡¼¥ë¤ÏÊä´°ÂоݤÎñ¸ì¤Î³«»Ï°ÌÃ֤ξðÊó¤òÄ󶡤·¤Æ¤¤¤Þ¤»¤ó¡£
+ ¤·¤«¤·¤Ê¤¬¤é¡¢ completion_proc ¤ÎÃæ¤ÇÆþÎϤ·¤¿Ã±¸ì text ¤È
+ Readline.point ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç³«»Ï°ÌÃÖ¤òƳ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- é–‹å§‹ä½ç½® = 入力ã—ãŸå˜èªžã®é•·ã• - Readline.point
+ ³«»Ï°ÌÃÖ = ÆþÎϤ·¤¿Ã±¸ì¤ÎŤµ - Readline.point
Readline.vi_editing_mode -> nil
- 編集モードを vi モードã«ã—ã¾ã™ã€‚
- vi モードã®è©³ç´°ã¯ã€GNU Readline ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ ÊÔ½¸¥â¡¼¥É¤ò vi ¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£
+ vi ¥â¡¼¥É¤Î¾ÜºÙ¤Ï¡¢GNU Readline ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.vi_editing_mode? -> bool
- 編集モード㌠vi モードã®å ´åˆã€true ã‚’è¿”ã—ã¾ã™ã€‚ãã†ã§ãªã‘れ㰠false
- ã‚’è¿”ã—ã¾ã™ã€‚
+ ÊÔ½¸¥â¡¼¥É¤¬ vi ¥â¡¼¥É¤Î¾ì¹ç¡¢true ¤òÊÖ¤·¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð false
+ ¤òÊÖ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.emacs_editing_mode -> nil
- 編集モードを Emacs モードã«ã—ã¾ã™ã€‚
- デフォルト㯠Emacs モードã§ã™ã€‚
- Emacs モードã®è©³ç´°ã¯ã€GNU Readline ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ ÊÔ½¸¥â¡¼¥É¤ò Emacs ¥â¡¼¥É¤Ë¤·¤Þ¤¹¡£
+ ¥Ç¥Õ¥©¥ë¥È¤Ï Emacs ¥â¡¼¥É¤Ç¤¹¡£
+ Emacs ¥â¡¼¥É¤Î¾ÜºÙ¤Ï¡¢GNU Readline ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.emacs_editing_mode? -> bool
- 編集モード㌠Emacs モードã®å ´åˆã€true ã‚’è¿”ã—ã¾ã™ã€‚ãã†ã§ãªã‘れ㰠false
- ã‚’è¿”ã—ã¾ã™ã€‚
+ ÊÔ½¸¥â¡¼¥É¤¬ Emacs ¥â¡¼¥É¤Î¾ì¹ç¡¢true ¤òÊÖ¤·¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð false
+ ¤òÊÖ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completion_append_character = char
- ユーザã®å…¥åŠ›ã®è£œå®ŒãŒå®Œäº†ã—ãŸå ´åˆã«ã€æœ€å¾Œã«ä»˜åŠ ã™ã‚‹æ–‡å­— char を指定ã—
- ã¾ã™ã€‚åŠè§’スペース「" "ã€ãªã©ã®å˜èªžã‚’区切る文字を指定ã™ã‚Œã°ã€é€£ç¶šã—ã¦
- 入力ã™ã‚‹éš›ã«ä¾¿åˆ©ã§ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤¬´°Î»¤·¤¿¾ì¹ç¤Ë¡¢ºÇ¸å¤ËÉղ乤ëʸ»ú char ¤ò»ØÄꤷ
+ ¤Þ¤¹¡£È¾³Ñ¥¹¥Ú¡¼¥¹¡Ö" "¡×¤Ê¤É¤Îñ¸ì¤ò¶èÀÚ¤ëʸ»ú¤ò»ØÄꤹ¤ì¤Ð¡¢Ï¢Â³¤·¤Æ
+ ÆþÎϤ¹¤ëºÝ¤ËÊØÍø¤Ç¤¹¡£
- 使用例:
+ »ÈÍÑÎã:
require "readline"
-
+
Readline.readline("> ", true)
Readline.completion_append_character = " "
- 実行例:
+ ¼Â¹ÔÎã:
>
- ã“ã“ã§ "/var/li" を入力ã—ã¾ã™ã€‚
-
+ ¤³¤³¤Ç "/var/li" ¤òÆþÎϤ·¤Þ¤¹¡£
+
> /var/li
- ã“ã“ã§ TAB キーを入力ã—ã¾ã™ã€‚
-
+ ¤³¤³¤Ç TAB ¥­¡¼¤òÆþÎϤ·¤Þ¤¹¡£
+
> /var/lib
- "b" ãŒè£œå®Œã•ã‚Œã€æœ€å¾Œã« " " ãŒè¿½åŠ ã•れるã®ã§ã€"/usr" を連続ã—ã¦å…¥åŠ›ã§ãã¾ã™ã€‚
-
+ "b" ¤¬Êä´°¤µ¤ì¡¢ºÇ¸å¤Ë " " ¤¬Äɲ䵤ì¤ë¤Î¤Ç¡¢"/usr" ¤òϢ³¤·¤ÆÆþÎϤǤ­¤Þ¤¹¡£
+
> /var/lib /usr
- ãªãŠã€1文字ã—ã‹æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。
- 例ãˆã°ã€"string"を指定ã—ãŸå ´åˆã¯æœ€åˆã®æ–‡å­—ã§ã‚ã‚‹"s"ã ã‘を使用ã—ã¾ã™ã€‚
+ ¤Ê¤ª¡¢1ʸ»ú¤·¤«»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+ Î㤨¤Ð¡¢"string"¤ò»ØÄꤷ¤¿¾ì¹ç¤ÏºÇ½é¤Îʸ»ú¤Ç¤¢¤ë"s"¤À¤±¤ò»ÈÍѤ·¤Þ¤¹¡£
require "readline"
Readline.completion_append_character = "string"
p Readline.completion_append_character # => "s"
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completion_append_character -> char
- ユーザã®å…¥åŠ›ã®è£œå®ŒãŒå®Œäº†ã—ãŸå ´åˆã«ã€æœ€å¾Œã«ä»˜åŠ ã™ã‚‹æ–‡å­—ã‚’å–å¾—ã—ã¾ã™ã€‚
- デフォルトã¯ç©ºç™½ (" ") ã§ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤¬´°Î»¤·¤¿¾ì¹ç¤Ë¡¢ºÇ¸å¤ËÉղ乤ëʸ»ú¤ò¼èÆÀ¤·¤Þ¤¹¡£
+ ¥Ç¥Õ¥©¥ë¥È¤Ï¶õÇò (" ") ¤Ç¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.basic_word_break_characters = string
- ユーザã®å…¥åŠ›ã®è£œå®Œã‚’行ã†éš›ã€å˜èªžã®åŒºåˆ‡ã‚Šã‚’示ã™è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる
- 文字列 string を指定ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
+ ʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
- GNU Readline ã®ãƒ‡ãƒ•ォルトã®å€¤ã¯ã€Bash ã®è£œå®Œå‡¦ç†ã§ä½¿ç”¨ã—ã¦ã„る文字列
- " \t\n\"\\'`@$><=;|&{(" (スペースをå«ã‚€) ã«ãªã£ã¦ã„ã¾ã™ã€‚
+ GNU Readline ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÃͤϡ¢Bash ¤ÎÊä´°½èÍý¤Ç»ÈÍѤ·¤Æ¤¤¤ëʸ»úÎó
+ " \t\n\"\\'`@$><=;|&{(" (¥¹¥Ú¡¼¥¹¤ò´Þ¤à) ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.basic_word_break_characters -> string
- ユーザã®å…¥åŠ›ã®è£œå®Œã‚’行ã†éš›ã€å˜èªžã®åŒºåˆ‡ã‚Šã‚’示ã™è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる
- 文字列をå–å¾—ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
+ ʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completer_word_break_characters = string
- ユーザã®å…¥åŠ›ã®è£œå®Œã‚’行ã†éš›ã€å˜èªžã®åŒºåˆ‡ã‚Šã‚’示ã™è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる
- 文字列 string を指定ã—ã¾ã™ã€‚
- Readline.basic_word_break_characters= ã¨ã®é•ã„ã¯ã€
- GNU Readline ã® rl_complete_internal 関数ã§ä½¿ç”¨ã•れるã“ã¨ã§ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
+ ʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
+ Readline.basic_word_break_characters= ¤È¤Î°ã¤¤¤Ï¡¢
+ GNU Readline ¤Î rl_complete_internal ´Ø¿ô¤Ç»ÈÍѤµ¤ì¤ë¤³¤È¤Ç¤¹¡£
- GNU Readline ã®ãƒ‡ãƒ•ォルトã®å€¤ã¯ã€
- Readline.basic_word_break_characters ã¨åŒã˜ã§ã™ã€‚
+ GNU Readline ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÃͤϡ¢
+ Readline.basic_word_break_characters ¤ÈƱ¤¸¤Ç¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completer_word_break_characters -> string
- ユーザã®å…¥åŠ›ã®è£œå®Œã‚’行ã†éš›ã€å˜èªžã®åŒºåˆ‡ã‚Šã‚’示ã™è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れãŸ
- 文字列をå–å¾—ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢Ã±¸ì¤Î¶èÀÚ¤ê¤ò¼¨¤¹Ê£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤¿
+ ʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.basic_quote_characters = string
- スペースãªã©ã®å˜èªžã®åŒºåˆ‡ã‚Šã‚’クオートã™ã‚‹ãŸã‚ã®è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる
- 文字列 string を指定ã—ã¾ã™ã€‚
+ ¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
+ ʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.basic_quote_characters -> string
- スペースãªã©ã®å˜èªžã®åŒºåˆ‡ã‚Šã‚’クオートã™ã‚‹ãŸã‚ã®è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる
- 文字列をå–å¾—ã—ã¾ã™ã€‚
+ ¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ë
+ ʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completer_quote_characters = string
- ユーザã®å…¥åŠ›ã®è£œå®Œã‚’行ã†éš›ã€ã‚¹ãƒšãƒ¼ã‚¹ãªã©ã®å˜èªžã®åŒºåˆ‡ã‚Šã‚’
- クオートã™ã‚‹ãŸã‚ã®è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる文字列 string を指定ã—ã¾ã™ã€‚
- 指定ã—ãŸæ–‡å­—ã®é–“ã§ã¯ã€Readline.completer_word_break_characters=
- ã§æŒ‡å®šã—ãŸæ–‡å­—列ã«å«ã¾ã‚Œã‚‹æ–‡å­—ã‚‚ã€æ™®é€šã®æ–‡å­—列ã¨ã—ã¦æ‰±ã‚れã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
+ ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
+ »ØÄꤷ¤¿Ê¸»ú¤Î´Ö¤Ç¤Ï¡¢Readline.completer_word_break_characters=
+ ¤Ç»ØÄꤷ¤¿Ê¸»úÎó¤Ë´Þ¤Þ¤ì¤ëʸ»ú¤â¡¢ÉáÄ̤Îʸ»úÎó¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.completer_quote_characters -> string
- ユーザã®å…¥åŠ›ã®è£œå®Œã‚’行ã†éš›ã€ã‚¹ãƒšãƒ¼ã‚¹ãªã©ã®å˜èªžã®åŒºåˆ‡ã‚Šã‚’
- クオートã™ã‚‹ãŸã‚ã®è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる文字列をå–å¾—ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎϤÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
+ ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.filename_quote_characters = string
- ユーザã®å…¥åŠ›æ™‚ã«ãƒ•ァイルåã®è£œå®Œã‚’行ã†éš›ã€ã‚¹ãƒšãƒ¼ã‚¹ãªã©ã®å˜èªžã®åŒºåˆ‡ã‚Šã‚’
- クオートã™ã‚‹ãŸã‚ã®è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる文字列 string を指定ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
+ ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó string ¤ò»ØÄꤷ¤Þ¤¹¡£
- GNU Readline ã®ãƒ‡ãƒ•ォルト値㯠nil ã§ã™ã€‚
+ GNU Readline ¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï nil ¤Ç¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
Readline.filename_quote_characters -> string
- ユーザã®å…¥åŠ›æ™‚ã«ãƒ•ァイルåã®è£œå®Œã‚’行ã†éš›ã€ã‚¹ãƒšãƒ¼ã‚¹ãªã©ã®å˜èªžã®åŒºåˆ‡ã‚Šã‚’
- クオートã™ã‚‹ãŸã‚ã®è¤‡æ•°ã®æ–‡å­—ã§æ§‹æˆã•れる文字列をå–å¾—ã—ã¾ã™ã€‚
+ ¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò¹Ô¤¦ºÝ¡¢¥¹¥Ú¡¼¥¹¤Ê¤É¤Îñ¸ì¤Î¶èÀÚ¤ê¤ò
+ ¥¯¥ª¡¼¥È¤¹¤ë¤¿¤á¤ÎÊ£¿ô¤Îʸ»ú¤Ç¹½À®¤µ¤ì¤ëʸ»úÎó¤ò¼èÆÀ¤·¤Þ¤¹¡£
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€ä¾‹å¤– NotImplementedError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢Îã³° NotImplementedError ¤¬È¯À¸¤·¤Þ¤¹¡£
- $SAFE ㌠4 ã®å ´åˆã€ä¾‹å¤– SecurityError ãŒç™ºç”Ÿã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢Îã³° SecurityError ¤¬È¯À¸¤·¤Þ¤¹¡£
-=== クラス定数
+=== ¥¯¥é¥¹Äê¿ô
HISTORY
- 定数 HISTORY を使用ã—ã¦ãƒ’ストリã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ã€‚
- Enumerable モジュールを extend ã—ã¦ãŠã‚Šã€
- é…列ã®ã‚ˆã†ã«æŒ¯ã‚‹èˆžã†ã“ã¨ãŒã§ãã¾ã™ã€‚
- 例ãˆã°ã€HISTORY[4] ã«ã‚ˆã‚Š 5 番目ã«å…¥åŠ›ã—ãŸå†…容をå–り出ã™ã“ã¨ãŒã§ãã¾ã™ã€‚
+ Äê¿ô 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
@@ -407,31 +407,31 @@ HISTORY
* HISTORY.delete_at(index) -> string
* HISTORY.clear -> self
- サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„環境ã§ã¯ã€æ¬¡ã®ãƒ¡ã‚½ãƒƒãƒ‰ã§ä¾‹å¤– NotImplementedError ãŒ
- 発生ã—ã¾ã™ã€‚
+ ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤´Ä¶­¤Ç¤Ï¡¢¼¡¤Î¥á¥½¥Ã¥É¤ÇÎã³° NotImplementedError ¤¬
+ ȯÀ¸¤·¤Þ¤¹¡£
* HISTORY[index] = string
* HISTORY.pop -> string
* HISTORY.shift -> string
* HISTORY.delete_at(index) -> string
* HISTORY.clear -> self
- $SAFE ㌠4 ã®å ´åˆã€ãƒ’ストリã«ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸã¨ãã«ä¾‹å¤– SecurityError ãŒ
- 発生ã—ã¾ã™ã€‚
+ $SAFE ¤¬ 4 ¤Î¾ì¹ç¡¢¥Ò¥¹¥È¥ê¤Ë¥¢¥¯¥»¥¹¤·¤¿¤È¤­¤ËÎã³° SecurityError ¤¬
+ ȯÀ¸¤·¤Þ¤¹¡£
FILENAME_COMPLETION_PROC
- ファイルåã®è£œå®Œã‚’行ㆠcall メソッドをæŒã¤ã‚ªãƒ–ジェクトã§ã™ã€‚
-
- Readline.completion_proc= ã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶ã®å…¥åŠ›æ™‚ã«ãƒ•ァイルåã®è£œå®Œã‚’
- 行ã†ã‚ˆã†ã«è¨­å®šã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ã‚’想定ã—ã¦ã¾ã™ã€‚
+ ¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò¹Ô¤¦ call ¥á¥½¥Ã¥É¤ò»ý¤Ä¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡£
+
+ Readline.completion_proc= ¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥Õ¥¡¥¤¥ë̾¤ÎÊä´°¤ò
+ ¹Ô¤¦¤è¤¦¤ËÀßÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤Þ¤¹¡£
USERNAME_COMPLETION_PROC
- ユーザåã®è£œå®Œã‚’行ㆠcall メソッドをæŒã¤ã‚ªãƒ–ジェクトã§ã™ã€‚
+ ¥æ¡¼¥¶Ì¾¤ÎÊä´°¤ò¹Ô¤¦ call ¥á¥½¥Ã¥É¤ò»ý¤Ä¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡£
- Readline.completion_proc= ã«ã‚ˆã‚Šã€ãƒ¦ãƒ¼ã‚¶ã®å…¥åŠ›æ™‚ã«ãƒ¦ãƒ¼ã‚¶åã®è£œå®Œã‚’行
- ã†ã‚ˆã†ã«è¨­å®šã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ã‚’想定ã—ã¦ã¾ã™ã€‚
+ Readline.completion_proc= ¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤ÎÆþÎÏ»þ¤Ë¥æ¡¼¥¶Ì¾¤ÎÊä´°¤ò¹Ô
+ ¤¦¤è¤¦¤ËÀßÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤Þ¤¹¡£
VERSION
- 使用ã—ã¦ã„ã‚‹ GNU Readline ã¾ãŸã¯ libedit ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™ã€‚
+ »ÈÍѤ·¤Æ¤¤¤ë GNU Readline ¤Þ¤¿¤Ï libedit ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 95cc91e46f..5dc7a6a3ae 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -1,26 +1,26 @@
require "mkmf"
-readline = Struct.new(:headers, :extra_check).new(["stdio.h"])
+$readline_headers = ["stdio.h"]
-def readline.have_header(header)
- if super(header, &extra_check)
- headers.push(header)
+def have_readline_header(header)
+ if have_header(header)
+ $readline_headers.push(header)
return true
else
return false
end
end
-def readline.have_var(var)
- return super(var, headers)
+def have_readline_var(var)
+ return have_var(var, $readline_headers)
end
-def readline.have_func(func)
- return super(func, headers)
+def have_readline_func(func)
+ return have_func(func, $readline_headers)
end
-def readline.have_type(type)
- return super(type, headers)
+def have_readline_macro(macro)
+ return have_macro(macro, $readline_headers)
end
dir_config('curses')
@@ -28,77 +28,58 @@ dir_config('ncurses')
dir_config('termcap')
dir_config("readline")
enable_libedit = enable_config("libedit")
-
have_library("user32", nil) if /cygwin/ === RUBY_PLATFORM
have_library("ncurses", "tgetnum") ||
have_library("termcap", "tgetnum") ||
have_library("curses", "tgetnum")
-case enable_libedit
-when true
- # --enable-libedit
- unless (readline.have_header("editline/readline.h") ||
- readline.have_header("readline/readline.h")) &&
+if enable_libedit
+ unless (have_readline_header("editline/readline.h") ||
+ have_readline_header("readline/readline.h")) &&
have_library("edit", "readline")
- raise "libedit not found"
- end
-when false
- # --disable-libedit
- unless ((readline.have_header("readline/readline.h") &&
- readline.have_header("readline/history.h")) &&
- have_library("readline", "readline"))
- raise "readline not found"
+ exit
end
else
- # does not specify
- unless ((readline.have_header("readline/readline.h") &&
- readline.have_header("readline/history.h")) &&
+ unless ((have_readline_header("readline/readline.h") &&
+ have_readline_header("readline/history.h")) &&
(have_library("readline", "readline") ||
have_library("edit", "readline"))) ||
- (readline.have_header("editline/readline.h") &&
+ (have_readline_header("editline/readline.h") &&
have_library("edit", "readline"))
- raise "readline nor libedit not found"
+ exit
end
end
-readline.have_func("rl_getc")
-readline.have_func("rl_getc_function")
-readline.have_func("rl_filename_completion_function")
-readline.have_func("rl_username_completion_function")
-readline.have_func("rl_completion_matches")
-readline.have_func("rl_refresh_line")
-readline.have_var("rl_deprep_term_function")
-readline.have_var("rl_completion_append_character")
-readline.have_var("rl_basic_word_break_characters")
-readline.have_var("rl_completer_word_break_characters")
-readline.have_var("rl_basic_quote_characters")
-readline.have_var("rl_completer_quote_characters")
-readline.have_var("rl_filename_quote_characters")
-readline.have_var("rl_attempted_completion_over")
-readline.have_var("rl_library_version")
-readline.have_var("rl_editing_mode")
-readline.have_var("rl_line_buffer")
-readline.have_var("rl_point")
+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_readline_var("rl_deprep_term_function")
+have_readline_var("rl_completion_append_character")
+have_readline_var("rl_basic_word_break_characters")
+have_readline_var("rl_completer_word_break_characters")
+have_readline_var("rl_basic_quote_characters")
+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 && readline.have_var("rl_event_hook")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_sigwinch")
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_signals")
-readline.have_var("rl_pre_input_hook")
-readline.have_var("rl_special_prefixes")
-readline.have_func("rl_cleanup_after_signal")
-readline.have_func("rl_free_line_state")
-readline.have_func("rl_clear_signals")
-readline.have_func("rl_set_screen_size")
-readline.have_func("rl_get_screen_size")
-readline.have_func("rl_vi_editing_mode")
-readline.have_func("rl_emacs_editing_mode")
-readline.have_func("replace_history_entry")
-readline.have_func("remove_history")
-readline.have_func("clear_history")
-readline.have_func("rl_redisplay")
-readline.have_func("rl_insert_text")
-unless readline.have_type("rl_hook_func_t*")
- $defs << "-Drl_hook_func_t=Function"
-end
-
+/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_macro("RL_PROMPT_START_IGNORE")
+have_readline_macro("RL_PROMPT_END_IGNORE")
create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index fe2ad7810d..dccfe5e8b0 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -40,15 +40,11 @@
#include <unistd.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
static VALUE mReadline;
#define EDIT_LINE_LIBRARY_VERSION "EditLine wrapper"
#ifndef USE_INSERT_IGNORE_ESCAPE
-# if !defined(HAVE_EDITLINE_READLINE_H) && defined(RL_PROMPT_START_IGNORE) && defined(RL_PROMPT_END_IGNORE)
+# if !defined(HAVE_EDITLINE_READLINE_H) && defined(HAVE_RL_PROMPT_START_IGNORE) && defined(HAVE_RL_PROMPT_END_IGNORE)
# define USE_INSERT_IGNORE_ESCAPE 1
# else
# define USE_INSERT_IGNORE_ESCAPE 0
@@ -61,12 +57,6 @@ static ID completion_proc, completion_case_fold;
#if USE_INSERT_IGNORE_ESCAPE
static ID id_orig_prompt, id_last_prompt;
#endif
-#if defined(HAVE_RL_PRE_INPUT_HOOK)
-static ID id_pre_input_hook;
-#endif
-#if defined(HAVE_RL_SPECIAL_PREFIXES)
-static ID id_special_prefixes;
-#endif
#ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION
# define rl_filename_completion_function filename_completion_function
@@ -79,17 +69,13 @@ static ID id_special_prefixes;
#endif
static int (*history_get_offset_func)(int);
-static int (*history_replace_offset_func)(int);
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-static int readline_completion_append_character;
-#endif
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());\
+ str = rb_str_conv_enc(str, rb_enc_get(str), rb_locale_encoding());\
} while (0)\
@@ -130,10 +116,7 @@ static char **readline_attempted_completion_function(const char *text,
#if defined HAVE_RL_GETC_FUNCTION
static VALUE readline_instream;
-
-#ifndef HAVE_RL_GETC
-#define rl_getc(f) EOF
-#endif
+static ID id_getbyte;
static int readline_getc(FILE *);
static int
@@ -144,49 +127,9 @@ readline_getc(FILE *input)
if (!readline_instream) return rl_getc(input);
GetOpenFile(readline_instream, ifp);
if (rl_instream != ifp->stdio_file) return rl_getc(input);
-#if defined(_WIN32)
- {
- INPUT_RECORD ir;
- int n;
- static int prior_key = '0';
- for (;;) {
- if (prior_key > 0xff) {
- prior_key = rl_getc(ifp->stdio_file);
- return prior_key;
- }
- if (PeekConsoleInput((HANDLE)_get_osfhandle(ifp->fd), &ir, 1, &n)) {
- if (n == 1) {
- if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) {
- prior_key = rl_getc(ifp->stdio_file);
- return prior_key;
- } else {
- ReadConsoleInput((HANDLE)_get_osfhandle(ifp->fd), &ir, 1, &n);
- }
- } else {
- HANDLE h = (HANDLE)_get_osfhandle(ifp->fd);
- rb_w32_wait_events(&h, 1, INFINITE);
- }
- } else {
- break;
- }
- }
- }
-#endif
- c = rb_io_getbyte(readline_instream);
+ c = rb_funcall(readline_instream, id_getbyte, 0, 0);
if (NIL_P(c)) return EOF;
-#ifdef ESC
- if (c == INT2FIX(ESC) &&
- RL_ISSTATE(RL_STATE_ISEARCH) && /* isn't needed in other states? */
- rb_io_read_pending(ifp)) {
- int meta = 0;
- c = rb_io_getbyte(readline_instream);
- if (FIXNUM_P(c) && isascii(FIX2INT(c))) meta = 1;
- rb_io_ungetbyte(readline_instream, c);
- if (meta) rl_execute_next(ESC);
- return ESC;
- }
-#endif
- return FIX2INT(c);
+ return NUM2CHR(c);
}
#elif defined HAVE_RL_EVENT_HOOK
#define BUSY_WAIT 0
@@ -198,7 +141,11 @@ readline_event(void)
#if BUSY_WAIT
rb_thread_schedule();
#else
- rb_wait_for_single_fd(fileno(rl_instream), RB_WAITFD_IN, NULL);
+ fd_set rset;
+
+ FD_ZERO(&rset);
+ FD_SET(fileno(rl_instream), &rset);
+ rb_thread_select(fileno(rl_instream) + 1, &rset, NULL, NULL, NULL);
return 0;
#endif
}
@@ -282,9 +229,6 @@ insert_ignore_escape(VALUE self, VALUE prompt)
static VALUE
readline_get(VALUE prompt)
{
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
- readline_completion_append_character = rl_completion_append_character;
-#endif
return (VALUE)readline((char *)prompt);
}
@@ -393,13 +337,6 @@ readline_readline(int argc, VALUE *argv, VALUE self)
}
if (!isatty(fileno(rl_instream)) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin");
- if (rl_outstream) {
- struct stat stbuf;
- int fd = fileno(rl_outstream);
- if (fd < 0 || fstat(fd, &stbuf) != 0) {
- rb_raise(rb_eIOError, "closed stdout");
- }
- }
#ifdef _WIN32
rl_prep_terminal(1);
@@ -413,9 +350,7 @@ readline_readline(int argc, VALUE *argv, VALUE self)
if (status) {
#if defined HAVE_RL_CLEANUP_AFTER_SIGNAL
/* restore terminal mode and signal handler*/
-#if defined HAVE_RL_FREE_LINE_STATE
rl_free_line_state();
-#endif
rl_cleanup_after_signal();
#elif defined HAVE_RL_DEPREP_TERM_FUNCTION
/* restore terminal mode */
@@ -485,177 +420,19 @@ readline_s_set_output(VALUE self, VALUE output)
return output;
}
-#if defined(HAVE_RL_PRE_INPUT_HOOK)
-/*
- * call-seq:
- * Readline.pre_input_hook = proc
- *
- * Specifies a Proc object +proc+ to call after the first prompt has
- * been printed and just before readline starts reading input
- * characters.
- *
- * See GNU Readline's rl_pre_input_hook variable.
- *
- * Raises ArgumentError if +proc+ does not respond to the call method.
- *
- * Raises SecurityError if $SAFE is 4.
- */
-static VALUE
-readline_s_set_pre_input_hook(VALUE self, VALUE proc)
-{
- rb_secure(4);
- if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call")))
- rb_raise(rb_eArgError, "argument must respond to `call'");
- return rb_ivar_set(mReadline, id_pre_input_hook, proc);
-}
-
-/*
- * call-seq:
- * Readline.pre_input_hook -> proc
- *
- * Returns a Proc object +proc+ to call after the first prompt has
- * been printed and just before readline starts reading input
- * characters. The default is nil.
- *
- * Raises SecurityError if $SAFE is 4.
- */
-static VALUE
-readline_s_get_pre_input_hook(VALUE self)
-{
- rb_secure(4);
- return rb_attr_get(mReadline, id_pre_input_hook);
-}
-
-static int
-readline_pre_input_hook(void)
-{
- VALUE proc;
-
- proc = rb_attr_get(mReadline, id_pre_input_hook);
- if (!NIL_P(proc))
- rb_funcall(proc, rb_intern("call"), 0);
- return 0;
-}
-#else
-#define readline_s_set_pre_input_hook rb_f_notimplement
-#define readline_s_get_pre_input_hook rb_f_notimplement
-#endif
-
-#if defined(HAVE_RL_INSERT_TEXT)
-/*
- * call-seq:
- * Readline.insert_text(string) -> self
- *
- * Insert text into the line at the current cursor position.
- *
- * See GNU Readline's rl_insert_text function.
- *
- * Raises SecurityError if $SAFE is 4.
- */
-static VALUE
-readline_s_insert_text(VALUE self, VALUE str)
-{
- rb_secure(4);
- OutputStringValue(str);
- rl_insert_text(RSTRING_PTR(str));
- return self;
-}
-#else
-#define readline_s_insert_text rb_f_notimplement
-#endif
-
-#if defined(HAVE_RL_REDISPLAY)
-/*
- * call-seq:
- * Readline.redisplay -> self
- *
- * Change what's displayed on the screen to reflect the current
- * contents.
- *
- * See GNU Readline's rl_redisplay function.
- *
- * Raises SecurityError if $SAFE is 4.
- */
-static VALUE
-readline_s_redisplay(VALUE self)
-{
- rb_secure(4);
- rl_redisplay();
- return self;
-}
-#else
-#define readline_s_redisplay rb_f_notimplement
-#endif
-
/*
* 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.
- *
- * The default completion is used if +proc+ is nil.
- *
- * The String that is passed to the Proc depends on the
- * Readline.completer_word_break_characters property. By default the word
- * under the cursor is passed to the Proc. For example, if the input is "foo
- * bar" then only "bar" would be passed to the completion Proc.
- *
- * Upon successful completion the Readline.completion_append_character will be
- * appended to the input so the user can start working on their next argument.
+ * Specifies a Proc object +proc+ to determine completion behavior. It
+ * should take input-string, and return an array of completion
+ * candidates.
*
- * = Examples
+ * Set default if +proc+ is nil.
*
- * == Completion for a Static List
+ * Raises ArgumentError exception if +proc+ does not respond to call method.
*
- * require 'readline'
- *
- * LIST = [
- * 'search', 'download', 'open',
- * 'help', 'history', 'quit',
- * 'url', 'next', 'clear',
- * 'prev', 'past'
- * ].sort
- *
- * comp = proc { |s| LIST.grep(/^#{Regexp.escape(s)}/) }
- *
- * Readline.completion_append_character = " "
- * Readline.completion_proc = comp
- *
- * while line = Readline.readline('> ', true)
- * p line
- * end
- *
- * == Completion For Directory Contents
- *
- * require 'readline'
- *
- * Readline.completion_append_character = " "
- * Readline.completion_proc = Proc.new do |str|
- * Dir[str+'*'].grep(/^#{Regexp.escape(str)}/)
- * end
- *
- * while line = Readline.readline('> ', true)
- * p line
- * end
- *
- * = Autocomplete strategies
- *
- * When working with auto-complete there are some strategies that work well.
- * To get some ideas you can take a look at the
- * completion.rb[http://svn.ruby-lang.org/repos/ruby/trunk/lib/irb/completion.rb]
- * file for irb.
- *
- * The common strategy is to take a list of possible completions and filter it
- * down to those completions that start with the user input. In the above
- * examples Enumerator.grep is used. The input is escaped to prevent Regexp
- * special characters from interfering with the matching.
- *
- * It may also be helpful to use the Abbrev library to generate completions.
- *
- * Raises ArgumentError if +proc+ does not respond to the call method.
- *
- * Raises SecurityError if $SAFE is 4.
+ * Raises SecurityError exception if $SAFE is 4.
*/
static VALUE
readline_s_set_completion_proc(VALUE self, VALUE proc)
@@ -774,34 +551,24 @@ readline_attempted_completion_function(const char *text, int start, int end)
char **result;
int case_fold;
long i, matches;
- rb_encoding *enc;
- VALUE encobj;
proc = rb_attr_get(mReadline, completion_proc);
if (NIL_P(proc))
return NULL;
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
- rl_completion_append_character = readline_completion_append_character;
-#endif
#ifdef HAVE_RL_ATTEMPTED_COMPLETION_OVER
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));
- if (!RB_TYPE_P(ary, T_ARRAY))
+ if (TYPE(ary) != T_ARRAY)
ary = rb_Array(ary);
matches = RARRAY_LEN(ary);
- if (matches == 0) return NULL;
- result = (char**)malloc((matches + 2)*sizeof(char*));
- if (result == NULL) rb_memerror();
- enc = rb_locale_encoding();
- encobj = rb_enc_from_encoding(enc);
+ 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]);
- StringValueCStr(temp); /* must be NUL-terminated */
- rb_enc_check(encobj, temp);
- result[i + 1] = (char*)malloc(RSTRING_LEN(temp) + 1);
- if (result[i + 1] == NULL) rb_memerror();
+ result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
strcpy(result[i + 1], RSTRING_PTR(temp));
}
result[matches + 1] = NULL;
@@ -810,30 +577,30 @@ readline_attempted_completion_function(const char *text, int start, int end)
result[0] = strdup(result[1]);
}
else {
- const char *result1 = result[1];
- long low = strlen(result1);
-
- for (i = 1; i < matches; ++i) {
- register int c1, c2;
- long i1, i2, l2;
- int n1, n2;
- const char *p2 = result[i + 1];
-
- l2 = strlen(p2);
- for (i1 = i2 = 0; i1 < low && i2 < l2; i1 += n1, i2 += n2) {
- c1 = rb_enc_codepoint_len(result1 + i1, result1 + low, &n1, enc);
- c2 = rb_enc_codepoint_len(p2 + i2, p2 + l2, &n2, enc);
- if (case_fold) {
- c1 = rb_tolower(c1);
- c2 = rb_tolower(c2);
- }
- if (c1 != c2) break;
+ register int i = 1;
+ int low = 100000;
+
+ while (i < matches) {
+ register int c1, c2, si;
+
+ if (case_fold) {
+ for (si = 0;
+ (c1 = TOLOWER(result[i][si])) &&
+ (c2 = TOLOWER(result[i + 1][si]));
+ si++)
+ if (c1 != c2) break;
+ } else {
+ for (si = 0;
+ (c1 = result[i][si]) &&
+ (c2 = result[i + 1][si]);
+ si++)
+ if (c1 != c2) break;
}
- low = i1;
+ if (low > si) low = si;
+ i++;
}
- result[0] = (char*)malloc(low + 1);
- if (result[0] == NULL) rb_memerror();
+ result[0] = ALLOC_N(char, low + 1);
strncpy(result[0], result[1], low);
result[0][low] = '\0';
}
@@ -1078,7 +845,7 @@ readline_s_get_completion_append_character(VALUE self)
*
* 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\"\\'`@$><=;|&{(".
+ * break words for completion in Bash: "\t\n\"\\'`@$><=;|&{(".
*
* Raises NotImplementedError if the using readline library does not support.
*
@@ -1193,74 +960,6 @@ readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
#define readline_s_get_completer_word_break_characters rb_f_notimplement
#endif
-#if defined(HAVE_RL_SPECIAL_PREFIXES)
-/*
- * call-seq:
- * Readline.special_prefixes = string
- *
- * Sets the list of characters that are word break characters, but
- * should be left in text when it is passed to the completion
- * function. Programs can use this to help determine what kind of
- * completing to do. For instance, Bash sets this variable to "$@" so
- * that it can complete shell variables and hostnames.
- *
- * See GNU Readline's rl_special_prefixes variable.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_set_special_prefixes(VALUE self, VALUE str)
-{
- rb_secure(4);
- if (!NIL_P(str)) {
- OutputStringValue(str);
- str = rb_str_dup_frozen(str);
- RBASIC(str)->klass = 0;
- }
- rb_ivar_set(mReadline, id_special_prefixes, str);
- if (NIL_P(str)) {
- rl_special_prefixes = NULL;
- }
- else {
- rl_special_prefixes = RSTRING_PTR(str);
- }
- return self;
-}
-
-/*
- * call-seq:
- * Readline.special_prefixes -> string
- *
- * Gets the list of characters that are word break characters, but
- * should be left in text when it is passed to the completion
- * function.
- *
- * See GNU Readline's rl_special_prefixes variable.
- *
- * Raises NotImplementedError if the using readline library does not support.
- *
- * Raises SecurityError exception if $SAFE is 4.
- */
-static VALUE
-readline_s_get_special_prefixes(VALUE self)
-{
- VALUE str;
- rb_secure(4);
- if (rl_special_prefixes == NULL) return Qnil;
- str = rb_ivar_get(mReadline, id_special_prefixes);
- if (!NIL_P(str)) {
- str = rb_str_dup_frozen(str);
- RBASIC(str)->klass = rb_cString;
- }
- return str;
-}
-#else
-#define readline_s_set_special_prefixes rb_f_notimplement
-#define readline_s_get_special_prefixes rb_f_notimplement
-#endif
-
#ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
/*
* call-seq:
@@ -1514,7 +1213,7 @@ hist_set(VALUE self, VALUE index, VALUE str)
i += history_length;
}
if (i >= 0) {
- entry = replace_history_entry(history_replace_offset_func(i), RSTRING_PTR(str), NULL);
+ entry = replace_history_entry(i, RSTRING_PTR(str), NULL);
}
if (entry == NULL) {
rb_raise(rb_eIndexError, "invalid index");
@@ -1566,8 +1265,7 @@ rb_remove_history(int index)
return Qnil;
#else
rb_notimplement();
-
- UNREACHABLE;
+ return Qnil; /* not reached */
#endif
}
@@ -1710,25 +1408,10 @@ Init_readline()
/* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = (char *)"Ruby";
-#if defined HAVE_RL_GETC_FUNCTION
- /* libedit check rl_getc_function only when rl_initialize() is called, */
- /* and using_history() call rl_initialize(). */
- /* This assignment should be placed before using_history() */
- rl_getc_function = readline_getc;
-#elif defined HAVE_RL_EVENT_HOOK
- rl_event_hook = readline_event;
-#endif
-
using_history();
completion_proc = rb_intern(COMPLETION_PROC);
completion_case_fold = rb_intern(COMPLETION_CASE_FOLD);
-#if defined(HAVE_RL_PRE_INPUT_HOOK)
- id_pre_input_hook = rb_intern("pre_input_hook");
-#endif
-#if defined(HAVE_RL_SPECIAL_PREFIXES)
- id_special_prefixes = rb_intern("special_prefixes");
-#endif
mReadline = rb_define_module("Readline");
rb_define_module_function(mReadline, "readline",
@@ -1787,18 +1470,6 @@ Init_readline()
readline_s_get_filename_quote_characters, 0);
rb_define_singleton_method(mReadline, "refresh_line",
readline_s_refresh_line, 0);
- rb_define_singleton_method(mReadline, "pre_input_hook=",
- readline_s_set_pre_input_hook, 1);
- rb_define_singleton_method(mReadline, "pre_input_hook",
- readline_s_get_pre_input_hook, 0);
- rb_define_singleton_method(mReadline, "insert_text",
- readline_s_insert_text, 1);
- rb_define_singleton_method(mReadline, "redisplay",
- readline_s_redisplay, 0);
- rb_define_singleton_method(mReadline, "special_prefixes=",
- readline_s_set_special_prefixes, 1);
- rb_define_singleton_method(mReadline, "special_prefixes",
- readline_s_get_special_prefixes, 0);
#if USE_INSERT_IGNORE_ESCAPE
CONST_ID(id_orig_prompt, "orig_prompt");
@@ -1847,7 +1518,6 @@ Init_readline()
*/
rb_define_const(mReadline, "USERNAME_COMPLETION_PROC", ucomp);
history_get_offset_func = history_get_offset_history_base;
- history_replace_offset_func = history_get_offset_0;
#if defined HAVE_RL_LIBRARY_VERSION
version = rb_str_new_cstr(rl_library_version);
#if defined HAVE_CLEAR_HISTORY || defined HAVE_REMOVE_HISTORY
@@ -1857,12 +1527,7 @@ Init_readline()
if (history_get(history_get_offset_func(0)) == NULL) {
history_get_offset_func = history_get_offset_0;
}
-#ifdef HAVE_REPLACE_HISTORY_ENTRY
- if (replace_history_entry(0, "a", NULL) == NULL) {
- history_replace_offset_func = history_get_offset_history_base;
- }
-#endif
-#ifdef HAVE_CLEAR_HISTORY
+#if !defined HAVE_CLEAR_HISTORY
clear_history();
#else
{
@@ -1882,12 +1547,18 @@ Init_readline()
rb_define_const(mReadline, "VERSION", version);
rl_attempted_completion_function = readline_attempted_completion_function;
-#if defined(HAVE_RL_PRE_INPUT_HOOK)
- rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
+#if defined HAVE_RL_GETC_FUNCTION
+ rl_getc_function = readline_getc;
+ id_getbyte = rb_intern_const("getbyte");
+#elif defined 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
new file mode 100644
index 0000000000..c9adce0b1a
--- /dev/null
+++ b/ext/ripper/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+mkmf.log
+eventids1.c
+eventids2table.c
+ripper.*
+ids1
+ids2
+extconf.h
diff --git a/ext/ripper/README b/ext/ripper/README
index 2ae2470e13..0825013ba9 100644
--- a/ext/ripper/README
+++ b/ext/ripper/README
@@ -8,7 +8,7 @@ Ripper README
Ripper is still early-alpha version.
I never assure any kind of backward compatibility.
-
+
Requirements
------------
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 776977847d..306a75ca9e 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -7,7 +7,7 @@ BISON = bison
src: ripper.c eventids1.c eventids2table.c
-ripper.o: ripper.c id.c lex.c eventids1.c eventids2.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 \
@@ -15,35 +15,27 @@ ripper.o: ripper.c id.c lex.c eventids1.c eventids2.c eventids2table.c \
$(hdrdir)/regex.h $(hdrdir)/st.h $(hdrdir)/util.h
.y.c:
- $(ECHO) compiling compiler $<
- $(Q) $(BISON) -t -v -oy.tab.c $<
- $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.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
- $(ECHO) extracting $@ from $(top_srcdir)/parse.y
- $(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(top_srcdir)/parse.y > ripper.tmp.y
- $(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
- $(Q) $(RM) ripper.tmp.y
+ $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
check: $(GEN) $(SRC1) $(SRC2)
- $(ECHO) checking $(SRC1) and $(SRC2)
- $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
+ $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
- $(ECHO) generating $@ from $(SRC1)
- $(Q) $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
+ $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
- $(ECHO) generating $@ from $(SRC2)
- $(Q) $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
+ $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
# Entries for Ripper maintainer
preproc: ripper.E
ripper.E: ripper.c
- $(ECHO) preprocessing ripper.c
- $(Q) $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
+ $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index 841a18c583..8b0d9c3757 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -38,8 +38,6 @@ 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_qsymbols_beg;
-static ID ripper_id_symbols_beg;
static ID ripper_id_words_sep;
static ID ripper_id_regexp_beg;
static ID ripper_id_regexp_end;
@@ -61,7 +59,7 @@ static ID ripper_id_CHAR;
#include "eventids2table.c"
static void
-ripper_init_eventids2(void)
+ripper_init_eventids2(VALUE self)
{
ripper_id_backref = rb_intern_const("on_backref");
ripper_id_backtick = rb_intern_const("on_backtick");
@@ -93,8 +91,6 @@ ripper_init_eventids2(void)
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_qsymbols_beg = rb_intern_const("on_qsymbols_beg");
- ripper_id_symbols_beg = rb_intern_const("on_symbols_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");
@@ -112,6 +108,8 @@ ripper_init_eventids2(void)
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 {
@@ -232,18 +230,14 @@ static const struct token_assoc {
{tOROP, &ripper_id_op},
{tPOW, &ripper_id_op},
{tQWORDS_BEG, &ripper_id_qwords_beg},
- {tQSYMBOLS_BEG, &ripper_id_qsymbols_beg},
- {tSYMBOLS_BEG, &ripper_id_symbols_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},
- {tDSTAR, &ripper_id_op},
{tSTRING_BEG, &ripper_id_tstring_beg},
{tSTRING_CONTENT, &ripper_id_tstring_content},
{tSTRING_DBEG, &ripper_id_embexpr_beg},
- {tSTRING_DEND, &ripper_id_embexpr_end},
{tSTRING_DVAR, &ripper_id_embvar},
{tSTRING_END, &ripper_id_tstring_end},
{tSYMBEG, &ripper_id_symbeg},
@@ -282,6 +276,4 @@ ripper_token2eventid(int tok)
return ripper_id_CHAR;
}
rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
-
- UNREACHABLE;
}
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
index db54e5ca2a..4914d70e78 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -6,7 +6,8 @@ require 'rbconfig'
def main
unless find_executable('bison')
unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
- raise 'missing bison; abort'
+ Logging.message 'missing bison; abort'
+ return
end
end
$objs = %w(ripper.o)
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
index 542bd405d2..cb19da334a 100644
--- a/ext/ripper/lib/ripper.rb
+++ b/ext/ripper/lib/ripper.rb
@@ -2,72 +2,3 @@ require 'ripper/core'
require 'ripper/lexer'
require 'ripper/filter'
require 'ripper/sexp'
-
-# Ripper is a Ruby script parser.
-#
-# You can get information from the parser with event-based style.
-# Information such as abstract syntax trees or simple lexical analysis of the
-# Ruby program.
-#
-# == Usage
-#
-# Ripper provides an easy interface for parsing your program into a symbolic
-# expression tree (or S-expression).
-#
-# Understanding the output of the parser may come as a challenge, it's
-# recommended you use PP to format the output for legibility.
-#
-# require 'ripper'
-# require 'pp'
-#
-# pp Ripper.sexp('def hello(world) "Hello, #{world}!"; end')
-# #=> [:program,
-# [[:def,
-# [:@ident, "hello", [1, 4]],
-# [:paren,
-# [:params, [[:@ident, "world", [1, 10]]], nil, nil, nil, nil, nil, nil]],
-# [:bodystmt,
-# [[:string_literal,
-# [:string_content,
-# [:@tstring_content, "Hello, ", [1, 18]],
-# [:string_embexpr, [[:var_ref, [:@ident, "world", [1, 27]]]]],
-# [:@tstring_content, "!", [1, 33]]]]],
-# nil,
-# nil,
-# nil]]]]
-#
-# You can see in the example above, the expression starts with +:program+.
-#
-# From here, a method definition at +:def+, followed by the method's identifier
-# <code>:@ident</code>. After the method's identifier comes the parentheses
-# +:paren+ and the method parameters under +:params+.
-#
-# Next is the method body, starting at +:bodystmt+ (+stmt+ meaning statement),
-# which contains the full definition of the method.
-#
-# In our case, we're simply returning a String, so next we have the
-# +:string_literal+ expression.
-#
-# Within our +:string_literal+ you'll notice two <code>@tstring_content</code>,
-# this is the literal part for <code>Hello, </code> and <code>!</code>. Between
-# the two <code>@tstring_content</code> statements is a +:string_embexpr+,
-# where _embexpr_ is an embedded expression. Our expression consists of a local
-# variable, or +var_ref+, with the identifier (<code>@ident</code>) of +world+.
-#
-# == Resources
-#
-# * {Ruby Inside}[http://www.rubyinside.com/using-ripper-to-see-how-ruby-is-parsing-your-code-5270.html]
-#
-# == Requirements
-#
-# * ruby 1.9 (support CVS HEAD only)
-# * bison 1.28 or later (Other yaccs do not work)
-#
-# == License
-#
-# Ruby License.
-#
-# Minero Aoki
-# aamine@loveruby.net
-# http://i.loveruby.net
-class Ripper; end
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
index 637a72f4ad..35aa54d090 100644
--- a/ext/ripper/lib/ripper/core.rb
+++ b/ext/ripper/lib/ripper/core.rb
@@ -12,8 +12,8 @@ require 'ripper.so'
class Ripper
- # Parses the given Ruby program read from +src+.
- # +src+ must be a String or an IO or a object with a #gets method.
+ # 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
@@ -42,12 +42,12 @@ class Ripper
end
# This method is called when weak warning is produced by the parser.
- # +fmt+ and +args+ is printf style.
+ # _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.
+ # _fmt_ and _args_ is printf style.
def warning(fmt, *args)
end
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
index 239f9f00e1..898501b23c 100644
--- a/ext/ripper/lib/ripper/filter.rb
+++ b/ext/ripper/lib/ripper/filter.rb
@@ -13,13 +13,9 @@ require 'ripper/lexer'
class Ripper
# This class handles only scanner events,
- # which are dispatched in the 'right' order (same with input).
+ # and they are dispatched in the `right' order (same with input).
class Filter
- # Creates a new Ripper::Filter instance, passes parameters +src+,
- # +filename+, and +lineno+ to Ripper::Lexer.new
- #
- # The lexer is for internal use only.
def initialize(src, filename = '-', lineno = 1)
@__lexer = Lexer.new(src, filename, lineno)
@__line = nil
@@ -45,9 +41,8 @@ class Ripper
@__col
end
- # Starts the parser.
- # +init+ is a data accumulator and is passed to the next event handler (as
- # of Enumerable#inject).
+ # 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|
@@ -62,12 +57,10 @@ class Ripper
private
- # This method is called when some event handler is undefined.
- # +event+ is :on_XXX, +token+ is the scanned token, and +data+ is a data
- # accumulator.
- #
- # The return value of this method is passed to the next event handler (as
- # of Enumerable#inject).
+ # 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
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index c0a64d1ee5..5bbee39e06 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -12,22 +12,18 @@ require 'ripper/core'
class Ripper
- # Tokenizes the Ruby program and returns an array of strings.
- #
- # p Ripper.tokenize("def m(a) nil end")
- # # => ["def", " ", "m", "(", "a", ")", " ", "nil", " ", "end"]
- #
+ # Tokenizes Ruby program and returns an Array of String.
def Ripper.tokenize(src, filename = '-', lineno = 1)
Lexer.new(src, filename, lineno).tokenize
end
- # Tokenizes the Ruby program and returns an array of an array,
- # which is formatted like <code>[[lineno, column], type, token]</code>.
+ # Tokenizes Ruby program and returns an Array of Array,
+ # which is formatted like [[lineno, column], type, token].
#
# require 'ripper'
# require 'pp'
#
- # pp Ripper.lex("def m(a) nil end")
+ # p Ripper.lex("def m(a) nil end")
# #=> [[[1, 0], :on_kw, "def"],
# [[1, 3], :on_sp, " " ],
# [[1, 4], :on_ident, "m" ],
@@ -94,12 +90,9 @@ class Ripper
class TokenPattern #:nodoc:
- class Error < ::StandardError # :nodoc:
- end
- class CompileError < Error # :nodoc:
- end
- class MatchError < Error # :nodoc:
- end
+ class Error < ::StandardError; end
+ class CompileError < Error; end
+ class MatchError < Error; end
class << self
alias compile new
@@ -162,7 +155,7 @@ class Ripper
MAP[tok] or raise CompileError, "unknown token: #{tok}"
end
- class MatchData # :nodoc:
+ class MatchData
def initialize(tokens, match)
@tokens = tokens
@match = match
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
index 66bd69134d..f2260fe8dd 100644
--- a/ext/ripper/lib/ripper/sexp.rb
+++ b/ext/ripper/lib/ripper/sexp.rb
@@ -14,32 +14,13 @@ class Ripper
# [EXPERIMENTAL]
# Parses +src+ and create S-exp tree.
- # Returns more readable tree rather than Ripper.sexp_raw.
- # This method is mainly for developer use.
+ # This method is for mainly developper use.
#
# require 'ripper'
- # require 'pp'
+ # require 'pp
#
# pp Ripper.sexp("def m(a) nil end")
# #=> [:program,
- # [[:def,
- # [:@ident, "m", [1, 4]],
- # [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil, nil]],
- # [:bodystmt, [[:var_ref, [:@kw, "nil", [1, 9]]]], nil, nil, nil]]]]
- #
- def Ripper.sexp(src, filename = '-', lineno = 1)
- SexpBuilderPP.new(src, filename, lineno).parse
- end
-
- # [EXPERIMENTAL]
- # Parses +src+ and create S-exp tree.
- # This method is mainly for developer use.
- #
- # require 'ripper'
- # require 'pp'
- #
- # pp Ripper.sexp_raw("def m(a) nil end")
- # #=> [:program,
# [:stmts_add,
# [:stmts_new],
# [:def,
@@ -51,6 +32,10 @@ class Ripper
# 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
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
index 48ad9e1d25..22c3ac0eb7 100755
--- a/ext/ripper/tools/generate.rb
+++ b/ext/ripper/tools/generate.rb
@@ -6,6 +6,7 @@ def main
mode = nil
ids1src = nil
ids2src = nil
+ template = nil
output = nil
parser = @parser = OptionParser.new
@@ -73,18 +74,15 @@ def generate_eventids1(ids)
end
buf << %Q[\n]
buf << %Q[static void\n]
- buf << %Q[ripper_init_eventids1(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[\n]
- buf << %Q[static void\n]
- buf << %Q[ripper_init_eventids1_table(VALUE self)\n]
- buf << %Q[{\n]
- buf << %Q[ VALUE h = rb_hash_new();\n]
- buf << %Q[ ID id;\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]
diff --git a/ext/sdbm/.cvsignore b/ext/sdbm/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/sdbm/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index cb09bac589..b1ffdc04f0 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -7,7 +7,12 @@
* core routines
*/
-#include "ruby/ruby.h"
+#ifndef lint
+/*char sdbm_rcsid[] = "$Id$";*/
+#endif
+
+#include "ruby/config.h"
+#include "ruby/defines.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -25,23 +30,18 @@
#ifdef BSD42
#define SEEK_SET L_SET
-#define memset(s,c,n) bzero((s), (n)) /* only when c is zero */
-#define memcpy(s1,s2,n) bcopy((s2), (s1), (n))
-#define memcmp(s1,s2,n) bcmp((s1),(s2),(n))
+#define memset(s,c,n) bzero(s, n) /* only when c is zero */
+#define memcpy(s1,s2,n) bcopy(s2, s1, n)
+#define memcmp(s1,s2,n) bcmp(s1,s2,n)
#endif
/*
* important tuning parms (hah)
*/
-#ifndef SEEDUPS
-#define SEEDUPS 1 /* always detect duplicates */
-#endif
-#ifndef BADMESS
-#define BADMESS 1 /* generate a message for worst case:
+#define SEEDUPS /* always detect duplicates */
+#define BADMESS /* generate a message for worst case:
cannot make room after SPLTMAX splits */
-#endif
-
/*
* misc
*/
@@ -55,8 +55,8 @@
#define GET_SHORT(p, i) (((unsigned)((unsigned char *)(p))[(i)*2] << 8) + (((unsigned char *)(p))[(i)*2 + 1]))
#define PUT_SHORT(p, i, s) (((unsigned char *)(p))[(i)*2] = (unsigned char)((s) >> 8), ((unsigned char *)(p))[(i)*2 + 1] = (unsigned char)(s))
#else
-#define GET_SHORT(p, i) ((p)[(i)])
-#define PUT_SHORT(p, i, s) ((p)[(i)] = (s))
+#define GET_SHORT(p, i) ((p)[i])
+#define PUT_SHORT(p, i, s) ((p)[i] = (s))
#endif
/*#include "pair.h"*/
@@ -67,7 +67,7 @@ static int delpair proto((char *, datum));
static int chkpage proto((char *));
static datum getnkey proto((char *, int));
static void splpage proto((char *, char *, long));
-#if SEEDUPS
+#ifdef SEEDUPS
static int duppair proto((char *, datum));
#endif
@@ -105,7 +105,7 @@ static int duppair proto((char *, datum));
/*
* externals
*/
-#if !defined(__sun) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(errno)
+#if !defined sun && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
extern int errno;
#endif
@@ -150,7 +150,7 @@ sdbm_open(register char *file, register int flags, register int mode)
register DBM *db;
register char *dirname;
register char *pagname;
- register size_t n;
+ register int n;
if (file == NULL || !*file)
return errno = EINVAL, (DBM *) NULL;
@@ -159,7 +159,7 @@ sdbm_open(register char *file, register int flags, register int mode)
*/
n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
- if ((dirname = malloc(n)) == NULL)
+ if ((dirname = malloc((unsigned) n)) == NULL)
return errno = ENOMEM, (DBM *) NULL;
/*
* build the file names
@@ -173,29 +173,6 @@ sdbm_open(register char *file, register int flags, register int mode)
return db;
}
-static int
-fd_set_cloexec(int fd)
-{
- /* MinGW don't have F_GETFD and FD_CLOEXEC. [ruby-core:40281] */
-#ifdef F_GETFD
- int flags, ret;
- flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
- if (flags == -1) {
- return -1;
- }
- if (2 < fd) {
- if (!(flags & FD_CLOEXEC)) {
- flags |= FD_CLOEXEC;
- ret = fcntl(fd, F_SETFD, flags);
- if (ret == -1) {
- return -1;
- }
- }
- }
-#endif
- return 0;
-}
-
DBM *
sdbm_prep(char *dirname, char *pagname, int flags, int mode)
{
@@ -205,8 +182,6 @@ sdbm_prep(char *dirname, char *pagname, int flags, int mode)
if ((db = (DBM *) malloc(sizeof(DBM))) == NULL)
return errno = ENOMEM, (DBM *) NULL;
- db->pagf = -1;
- db->dirf = -1;
db->flags = 0;
db->hmask = 0;
db->blkptr = 0;
@@ -225,38 +200,31 @@ sdbm_prep(char *dirname, char *pagname, int flags, int mode)
* If we fail anywhere, undo everything, return NULL.
*/
flags |= O_BINARY;
-#ifdef O_CLOEXEC
- flags |= O_CLOEXEC;
-#endif
-
- if ((db->pagf = open(pagname, flags, mode)) == -1) goto err;
- if (fd_set_cloexec(db->pagf) == -1) goto err;
- if ((db->dirf = open(dirname, flags, mode)) == -1) goto err;
- if (fd_set_cloexec(db->dirf) == -1) goto err;
+ if ((db->pagf = open(pagname, flags, mode)) > -1) {
+ if ((db->dirf = open(dirname, flags, mode)) > -1) {
/*
* need the dirfile size to establish max bit number.
*/
- if (fstat(db->dirf, &dstat) == -1) goto err;
+ if (fstat(db->dirf, &dstat) == 0) {
/*
* zero size: either a fresh database, or one with a single,
* unsplit data page: dirpage is all zeros.
*/
- db->dirbno = (!dstat.st_size) ? 0 : -1;
- db->pagbno = -1;
- db->maxbno = dstat.st_size * (long) BYTESIZ;
-
- (void) memset(db->pagbuf, 0, PBLKSIZ);
- (void) memset(db->dirbuf, 0, DBLKSIZ);
-/*
- * success
- */
- return db;
+ db->dirbno = (!dstat.st_size) ? 0 : -1;
+ db->pagbno = -1;
+ db->maxbno = dstat.st_size * (long) BYTESIZ;
- err:
- if (db->pagf != -1)
- (void) close(db->pagf);
- if (db->dirf != -1)
- (void) close(db->dirf);
+ (void) memset(db->pagbuf, 0, PBLKSIZ);
+ (void) memset(db->dirbuf, 0, DBLKSIZ);
+ /*
+ * success
+ */
+ return db;
+ }
+ (void) close(db->dirf);
+ }
+ (void) close(db->pagf);
+ }
free((char *) db);
return (DBM *) NULL;
}
@@ -334,7 +302,7 @@ sdbm_store(register DBM *db, datum key, datum val, int flags)
*/
if (flags == DBM_REPLACE)
(void) delpair(db->pagbuf, key);
-#if SEEDUPS
+#ifdef SEEDUPS
else if (duppair(db->pagbuf, key))
return 1;
#endif
@@ -453,8 +421,8 @@ makroom(register DBM *db, long int hash, int need)
* if we are here, this is real bad news. After SPLTMAX splits,
* we still cannot fit the key. say goodnight.
*/
-#if BADMESS
- (void) (write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44) < 0);
+#ifdef BADMESS
+ (void) write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44);
#endif
return 0;
@@ -631,6 +599,10 @@ getnext(register DBM *db)
* page-level routines
*/
+#ifndef lint
+/*char pair_rcsid[] = "$Id$";*/
+#endif
+
#ifndef BSD42
/*#include <memory.h>*/
#endif
@@ -671,8 +643,8 @@ fitpair(char *pag, int need)
register short *ino = (short *) pag;
off = ((n = GET_SHORT(ino,0)) > 0) ? GET_SHORT(ino,n) : PBLKSIZ;
- free = off - (n + 1) * (int)sizeof(short);
- need += 2 * (int)sizeof(short);
+ free = off - (n + 1) * sizeof(short);
+ need += 2 * sizeof(short);
debug(("free %d need %d\n", free, need));
@@ -726,7 +698,7 @@ getpair(char *pag, datum key)
return val;
}
-#if SEEDUPS
+#ifdef SEEDUPS
static int
duppair(char *pag, datum key)
{
@@ -778,9 +750,9 @@ delpair(char *pag, datum key)
register int m;
register char *dst = pag + (i == 1 ? PBLKSIZ : GET_SHORT(ino,i - 1));
register char *src = pag + GET_SHORT(ino,i + 1);
- register ptrdiff_t zoo = dst - src;
+ register int zoo = dst - src;
- debug(("free-up %"PRIdPTRDIFF" ", zoo));
+ debug(("free-up %d ", zoo));
/*
* shift data/keys down
*/
@@ -802,7 +774,7 @@ delpair(char *pag, datum key)
}
#else
#ifdef MEMMOVE
- memmove(dst-m, src-m, m);
+ memmove(dst, src, m);
#else
while (m--)
*--dst = *--src;
@@ -889,7 +861,7 @@ chkpage(char *pag)
register int off;
register short *ino = (short *) pag;
- if ((n = GET_SHORT(ino,0)) < 0 || n > PBLKSIZ / (int)sizeof(short))
+ if ((n = GET_SHORT(ino,0)) < 0 || n > PBLKSIZ / sizeof(short))
return 0;
if (n > 0) {
diff --git a/ext/sdbm/extconf.rb b/ext/sdbm/extconf.rb
index 67796fbf8a..cc6c8cefd1 100644
--- a/ext/sdbm/extconf.rb
+++ b/ext/sdbm/extconf.rb
@@ -1,4 +1,3 @@
require 'mkmf'
-$defs << "-D""BADMESS=0"
create_makefile("sdbm")
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 0fd837db31..fdb7fd42c9 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -15,55 +15,6 @@
#include <fcntl.h>
#include <errno.h>
-/*
- * Document-class: SDBM
- *
- * SDBM provides a simple file-based key-value store, which can only store
- * String keys and values.
- *
- * Note that Ruby comes with the source code for SDBM, while the DBM and GDBM
- * standard libraries rely on external libraries and headers.
- *
- * === Examples
- *
- * Insert values:
- *
- * require 'sdbm'
- *
- * SDBM.open 'my_database' do |db|
- * db['apple'] = 'fruit'
- * db['pear'] = 'fruit'
- * db['carrot'] = 'vegetable'
- * db['tomato'] = 'vegetable'
- * end
- *
- * Bulk update:
- *
- * require 'sdbm'
- *
- * SDBM.open 'my_database' do |db|
- * db.update('peach' => 'fruit', 'tomato' => 'fruit')
- * end
- *
- * Retrieve values:
- *
- * require 'sdbm'
- *
- * SDBM.open 'my_database' do |db|
- * db.each do |key, value|
- * puts "Key: #{key}, Value: #{value}"
- * end
- * end
- *
- * Outputs:
- *
- * Key: apple, Value: fruit
- * Key: pear, Value: fruit
- * Key: carrot, Value: vegetable
- * Key: peach, Value: fruit
- * Key: tomato, Value: fruit
- */
-
static VALUE rb_cDBM, rb_eDBMError;
struct dbmdata {
@@ -78,13 +29,13 @@ closed_sdbm()
}
#define GetDBM(obj, dbmp) {\
- Data_Get_Struct((obj), struct dbmdata, (dbmp));\
- if ((dbmp) == 0) closed_sdbm();\
- if ((dbmp)->di_dbm == 0) closed_sdbm();\
+ Data_Get_Struct(obj, struct dbmdata, dbmp);\
+ if (dbmp == 0) closed_sdbm();\
+ if (dbmp->di_dbm == 0) closed_sdbm();\
}
#define GetDBM2(obj, data, dbm) {\
- GetDBM((obj), (data));\
+ GetDBM(obj, data);\
(dbm) = dbmp->di_dbm;\
}
@@ -96,14 +47,6 @@ free_sdbm(struct dbmdata *dbmp)
ruby_xfree(dbmp);
}
-/*
- * call-seq:
- * sdbm.close -> nil
- *
- * Closes the database file.
- *
- * Raises SDBMError if the database is already closed.
- */
static VALUE
fsdbm_close(VALUE obj)
{
@@ -116,12 +59,6 @@ fsdbm_close(VALUE obj)
return Qnil;
}
-/*
-* call-seq:
-* sdbm.closed? -> true or false
-*
-* Returns +true+ if the database is closed.
-*/
static VALUE
fsdbm_closed(VALUE obj)
{
@@ -141,21 +78,7 @@ fsdbm_alloc(VALUE klass)
{
return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
}
-/*
-* call-seq:
-* SDBM.new(filename, mode = 0666)
-*
-* Creates a new database handle by opening the given +filename+. SDBM actually
-* uses two physical files, with extensions '.dir' and '.pag'. These extensions
-* will automatically be appended to the +filename+.
-*
-* If the file does not exist, a new file will be created using the given
-* +mode+, unless +mode+ is explicitly set to nil. In the latter case, no
-* database will be created.
-*
-* If the file exists, it will be opened in read/write mode. If this fails, it
-* will be opened in read-only mode.
-*/
+
static VALUE
fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
{
@@ -186,7 +109,7 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
if (!dbm) {
if (mode == -1) return Qnil;
- rb_sys_fail_str(file);
+ rb_sys_fail(RSTRING_PTR(file));
}
dbmp = ALLOC(struct dbmdata);
@@ -197,24 +120,6 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
return obj;
}
-/*
- * call-seq:
- * SDBM.open(filename, mode = 0666)
- * SDBM.open(filename, mode = 0666) { |sdbm| ... }
- *
- * If called without a block, this is the same as SDBM.new.
- *
- * If a block is given, the new database will be passed to the block and
- * will be safely closed after the block has executed.
- *
- * Example:
- *
- * require 'sdbm'
- *
- * SDBM.open('my_database') do |db|
- * db['hello'] = 'world'
- * end
- */
static VALUE
fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
{
@@ -240,7 +145,7 @@ fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LENINT(keystr);
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
value = sdbm_fetch(dbm, key);
@@ -252,34 +157,12 @@ fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
return rb_external_str_new(value.dptr, value.dsize);
}
-/*
- * call-seq:
- * sdbm[key] -> value or nil
- *
- * Returns the +value+ in the database associated with the given +key+ string.
- *
- * If no value is found, returns +nil+.
- */
static VALUE
fsdbm_aref(VALUE obj, VALUE keystr)
{
return fsdbm_fetch(obj, keystr, Qnil);
}
-/*
- * call-seq:
- * sdbm.fetch(key) -> value or nil
- * sdbm.fetch(key) { |key| ... }
- *
- * Returns the +value+ in the database associated with the given +key+ string.
- *
- * If a block is provided, the block will be called when there is no
- * +value+ associated with the given +key+. The +key+ will be passed in as an
- * argument to the block.
- *
- * If no block is provided and no value is associated with the given +key+,
- * then an IndexError will be raised.
- */
static VALUE
fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
{
@@ -293,14 +176,6 @@ fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
return valstr;
}
-/*
- * call-seq:
- * sdbm.key(value) -> key
- *
- * Returns the +key+ associated with the given +value+. If more than one
- * +key+ corresponds to the given +value+, then the first key to be found
- * will be returned. If no keys are found, +nil+ will be returned.
- */
static VALUE
fsdbm_key(VALUE obj, VALUE valstr)
{
@@ -310,7 +185,7 @@ fsdbm_key(VALUE obj, VALUE valstr)
ExportStringValue(valstr);
val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LENINT(valstr);
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
@@ -322,9 +197,6 @@ fsdbm_key(VALUE obj, VALUE valstr)
return Qnil;
}
-/*
- * :nodoc:
- */
static VALUE
fsdbm_index(VALUE hash, VALUE value)
{
@@ -332,25 +204,6 @@ fsdbm_index(VALUE hash, VALUE value)
return fsdbm_key(hash, value);
}
-/* call-seq:
- * sdbm.select { |key, value| ... } -> Array
- *
- * Returns a new Array of key-value pairs for which the block returns +true+.
- *
- * Example:
- *
- * require 'sdbm'
- *
- * SDBM.open 'my_database' do |db|
- * db['apple'] = 'fruit'
- * db['pear'] = 'fruit'
- * db['spinach'] = 'vegetable'
- *
- * veggies = db.select do |key, value|
- * value == 'vegetable'
- * end #=> [["apple", "fruit"], ["pear", "fruit"]]
- * end
- */
static VALUE
fsdbm_select(VALUE obj)
{
@@ -375,11 +228,6 @@ fsdbm_select(VALUE obj)
return new;
}
-/* call-seq:
- * sdbm.values_at(key, ...) -> Array
- *
- * Returns an Array of values corresponding to the given keys.
- */
static VALUE
fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
{
@@ -400,18 +248,6 @@ fdbm_modify(VALUE obj)
if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
}
-/*
- * call-seq:
- * sdbm.delete(key) -> value or nil
- * sdbm.delete(key) { |key, value| ... }
- *
- * Deletes the key-value pair corresponding to the given +key+. If the
- * +key+ exists, the deleted value will be returned, otherwise +nil+.
- *
- * If a block is provided, the deleted +key+ and +value+ will be passed to
- * the block as arguments. If the +key+ does not exist in the database, the
- * value will be +nil+.
- */
static VALUE
fsdbm_delete(VALUE obj, VALUE keystr)
{
@@ -423,7 +259,7 @@ fsdbm_delete(VALUE obj, VALUE keystr)
fdbm_modify(obj);
ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LENINT(keystr);
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
@@ -447,13 +283,6 @@ fsdbm_delete(VALUE obj, VALUE keystr)
return valstr;
}
-/*
- * call-seq:
- * sdbm.shift -> Array or nil
- *
- * Removes a key-value pair from the database and returns them as an
- * Array. If the database is empty, returns +nil+.
- */
static VALUE
fsdbm_shift(VALUE obj)
{
@@ -477,14 +306,6 @@ fsdbm_shift(VALUE obj)
return rb_assoc_new(keystr, valstr);
}
-/*
- * call-seq:
- * sdbm.delete_if { |key, value| ... } -> self
- * sdbm.reject! { |key, value| ... } -> self
- *
- * Iterates over the key-value pairs in the database, deleting those for
- * which the block returns +true+.
- */
static VALUE
fsdbm_delete_if(VALUE obj)
{
@@ -513,23 +334,17 @@ fsdbm_delete_if(VALUE obj)
keystr = RARRAY_PTR(ary)[i];
ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LENINT(keystr);
+ key.dsize = RSTRING_LEN(keystr);
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_LENINT(ary);
+ if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
return obj;
}
-/*
- * call-seq:
- * sdbm.clear -> self
- *
- * Deletes all data from the database.
- */
static VALUE
fsdbm_clear(VALUE obj)
{
@@ -550,22 +365,6 @@ fsdbm_clear(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * sdbm.invert -> Hash
- *
- * Returns a Hash in which the key-value pairs have been inverted.
- *
- * Example:
- *
- * require 'sdbm'
- *
- * SDBM.open 'my_database' do |db|
- * db.update('apple' => 'fruit', 'spinach' => 'vegetable')
- *
- * db.invert #=> {"fruit" => "apple", "vegetable" => "spinach"}
- * end
- */
static VALUE
fsdbm_invert(VALUE obj)
{
@@ -585,18 +384,6 @@ fsdbm_invert(VALUE obj)
return hash;
}
-/*
- * call-seq:
- * sdbm[key] = value -> value
- * sdbm.store(key, value) -> value
- *
- * Stores a new +value+ in the database with the given +key+ as an index.
- *
- * If the +key+ already exists, this will update the +value+ associated with
- * the +key+.
- *
- * Returns the given +value+.
- */
static VALUE
fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
{
@@ -614,10 +401,10 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
ExportStringValue(valstr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LENINT(keystr);
+ key.dsize = RSTRING_LEN(keystr);
val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LENINT(valstr);
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
dbmp->di_size = -1;
@@ -643,15 +430,6 @@ update_i(VALUE pair, VALUE dbm)
return Qnil;
}
-/*
- * call-seq:
- * sdbm.update(pairs) -> self
- *
- * Insert or update key-value pairs.
- *
- * This method will work with any object which implements an each_pair
- * method, such as a Hash.
- */
static VALUE
fsdbm_update(VALUE obj, VALUE other)
{
@@ -659,15 +437,6 @@ fsdbm_update(VALUE obj, VALUE other)
return obj;
}
-/*
- * call-seq:
- * sdbm.replace(pairs) -> self
- *
- * Empties the database, then inserts the given key-value pairs.
- *
- * This method will work with any object which implements an each_pair
- * method, such as a Hash.
- */
static VALUE
fsdbm_replace(VALUE obj, VALUE other)
{
@@ -676,13 +445,6 @@ fsdbm_replace(VALUE obj, VALUE other)
return obj;
}
-/*
- * call-seq:
- * sdbm.length -> integer
- * sdbm.size -> integer
- *
- * Returns the number of keys in the database.
- */
static VALUE
fsdbm_length(VALUE obj)
{
@@ -702,43 +464,29 @@ fsdbm_length(VALUE obj)
return INT2FIX(i);
}
-/*
- * call-seq:
- * sdbm.empty? -> true or false
- *
- * Returns +true+ if the database is empty.
- */
static VALUE
fsdbm_empty_p(VALUE obj)
{
datum key;
struct dbmdata *dbmp;
DBM *dbm;
+ int i = 0;
GetDBM(obj, dbmp);
if (dbmp->di_size < 0) {
dbm = dbmp->di_dbm;
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
- return Qfalse;
+ i++;
}
}
else {
- if (dbmp->di_size)
- return Qfalse;
+ i = dbmp->di_size;
}
- return Qtrue;
+ if (i == 0) return Qtrue;
+ return Qfalse;
}
-/*
- * call-seq:
- * sdbm.each_value
- * sdbm.each_value { |value| ... }
- *
- * Iterates over each +value+ in the database.
- *
- * If no block is given, returns an Enumerator.
- */
static VALUE
fsdbm_each_value(VALUE obj)
{
@@ -757,15 +505,6 @@ fsdbm_each_value(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * sdbm.each_key
- * sdbm.each_key { |key| ... }
- *
- * Iterates over each +key+ in the database.
- *
- * If no block is given, returns an Enumerator.
- */
static VALUE
fsdbm_each_key(VALUE obj)
{
@@ -783,17 +522,6 @@ fsdbm_each_key(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * sdbm.each
- * sdbm.each { |key, value| ... }
- * sdbm.each_pair
- * sdbm.each_pair { |key, value| ... }
- *
- * Iterates over each key-value pair in the database.
- *
- * If no block is given, returns an Enumerator.
- */
static VALUE
fsdbm_each_pair(VALUE obj)
{
@@ -816,12 +544,6 @@ fsdbm_each_pair(VALUE obj)
return obj;
}
-/*
- * call-seq:
- * sdbm.keys -> Array
- *
- * Returns a new Array containing the keys in the database.
- */
static VALUE
fsdbm_keys(VALUE obj)
{
@@ -839,12 +561,6 @@ fsdbm_keys(VALUE obj)
return ary;
}
-/*
- * call-seq:
- * sdbm.values -> Array
- *
- * Returns a new Array containing the values in the database.
- */
static VALUE
fsdbm_values(VALUE obj)
{
@@ -863,15 +579,6 @@ fsdbm_values(VALUE obj)
return ary;
}
-/*
- * call-seq:
- * sdbm.include?(key) -> true or false
- * sdbm.key?(key) -> true or false
- * sdbm.member?(key) -> true or false
- * sdbm.has_key?(key) -> true or false
- *
- * Returns +true+ if the database contains the given +key+.
- */
static VALUE
fsdbm_has_key(VALUE obj, VALUE keystr)
{
@@ -881,7 +588,7 @@ fsdbm_has_key(VALUE obj, VALUE keystr)
ExportStringValue(keystr);
key.dptr = RSTRING_PTR(keystr);
- key.dsize = RSTRING_LENINT(keystr);
+ key.dsize = RSTRING_LEN(keystr);
GetDBM2(obj, dbmp, dbm);
val = sdbm_fetch(dbm, key);
@@ -889,13 +596,6 @@ fsdbm_has_key(VALUE obj, VALUE keystr)
return Qfalse;
}
-/*
- * call-seq:
- * sdbm.value?(key) -> true or false
- * sdbm.has_value?(key) -> true or false
- *
- * Returns +true+ if the database contains the given +value+.
- */
static VALUE
fsdbm_has_value(VALUE obj, VALUE valstr)
{
@@ -905,34 +605,18 @@ fsdbm_has_value(VALUE obj, VALUE valstr)
ExportStringValue(valstr);
val.dptr = RSTRING_PTR(valstr);
- val.dsize = RSTRING_LENINT(valstr);
+ val.dsize = RSTRING_LEN(valstr);
GetDBM2(obj, dbmp, dbm);
for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
val = sdbm_fetch(dbm, key);
- if (val.dsize == RSTRING_LENINT(valstr) &&
+ if (val.dsize == RSTRING_LEN(valstr) &&
memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
return Qtrue;
}
return Qfalse;
}
-/*
- * call-seq:
- * sdbm.to_a -> Array
- *
- * Returns a new Array containing each key-value pair in the database.
- *
- * Example:
- *
- * require 'sdbm'
- *
- * SDBM.open 'my_database' do |db|
- * db.update('apple' => 'fruit', 'spinach' => 'vegetable')
- *
- * db.to_a #=> [["apple", "fruit"], ["spinach", "vegetable"]]
- * end
- */
static VALUE
fsdbm_to_a(VALUE obj)
{
@@ -952,12 +636,6 @@ fsdbm_to_a(VALUE obj)
return ary;
}
-/*
- * call-seq:
- * sdbm.to_hash -> Hash
- *
- * Returns a new Hash containing each key-value pair in the database.
- */
static VALUE
fsdbm_to_hash(VALUE obj)
{
@@ -977,14 +655,6 @@ fsdbm_to_hash(VALUE obj)
return hash;
}
-/*
- * call-seq:
- * sdbm.reject { |key, value| ... } -> Hash
- *
- * Creates a new Hash using the key-value pairs from the database, then
- * calls Hash#reject with the given block, which returns a Hash with
- * only the key-value pairs for which the block returns +false+.
- */
static VALUE
fsdbm_reject(VALUE obj)
{
@@ -996,9 +666,6 @@ Init_sdbm()
{
rb_cDBM = rb_define_class("SDBM", rb_cObject);
rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError);
- /* Document-class: SDBMError
- * Exception class used to return errors from the sdbm library.
- */
rb_include_module(rb_cDBM, rb_mEnumerable);
rb_define_alloc_func(rb_cDBM, fsdbm_alloc);
@@ -1034,11 +701,11 @@ Init_sdbm()
rb_define_method(rb_cDBM,"update", fsdbm_update, 1);
rb_define_method(rb_cDBM,"replace", fsdbm_replace, 1);
- rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1);
rb_define_method(rb_cDBM, "include?", fsdbm_has_key, 1);
- rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
+ rb_define_method(rb_cDBM, "has_key?", fsdbm_has_key, 1);
rb_define_method(rb_cDBM, "member?", fsdbm_has_key, 1);
rb_define_method(rb_cDBM, "has_value?", fsdbm_has_value, 1);
+ rb_define_method(rb_cDBM, "key?", fsdbm_has_key, 1);
rb_define_method(rb_cDBM, "value?", fsdbm_has_value, 1);
rb_define_method(rb_cDBM, "to_a", fsdbm_to_a, 0);
diff --git a/ext/socket/.cvsignore b/ext/socket/.cvsignore
new file mode 100644
index 0000000000..ce98586d91
--- /dev/null
+++ b/ext/socket/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+mkmf.log
+*.def
+constants.h
+extconf.h
diff --git a/ext/socket/.document b/ext/socket/.document
index 0216c5aa45..636418d086 100644
--- a/ext/socket/.document
+++ b/ext/socket/.document
@@ -1,16 +1,16 @@
-ancdata.c
-basicsocket.c
-constants.c
-constdefs.c
init.c
-ipsocket.c
-option.c
raddrinfo.c
-socket.c
-sockssocket.c
-tcpserver.c
+basicsocket.c
+ipsocket.c
tcpsocket.c
+tcpserver.c
+sockssocket.c
udpsocket.c
-unixserver.c
unixsocket.c
-lib
+unixserver.c
+socket.c
+option.c
+ancdata.c
+constants.c
+constdefs.c
+lib/socket.rb
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h
index f0b977d79c..3a478cf36c 100644
--- a/ext/socket/addrinfo.h
+++ b/ext/socket/addrinfo.h
@@ -172,7 +172,9 @@ extern int getnameinfo __P((
int flags));
extern void freehostent __P((struct hostent *));
+#ifndef HAVE_PADDRINFO
extern void freeaddrinfo __P((struct addrinfo *));
+#endif
extern
#ifdef GAI_STRERROR_CONST
const
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 37d2860224..307e21ecaa 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -86,7 +86,8 @@ ancillary_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE vtype, VALUE
static VALUE
ancdata_new(int family, int level, int type, VALUE data)
{
- NEWOBJ_OF(obj, struct RObject, rb_cAncillaryData, T_OBJECT);
+ 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;
@@ -195,7 +196,7 @@ ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass)
for (i = 0 ; i < argc; i++) {
VALUE obj = argv[i];
- if (!RB_TYPE_P(obj, T_FILE)) {
+ if (TYPE(obj) != T_FILE) {
rb_raise(rb_eTypeError, "IO expected");
}
rb_ary_push(ary, obj);
@@ -333,7 +334,7 @@ ancillary_timestamp(VALUE self)
struct bintime bt;
VALUE d, timev;
memcpy((char*)&bt, RSTRING_PTR(data), sizeof(bt));
- d = ULL2NUM(0x100000000ULL);
+ d = ULL2NUM(0x100000000UL);
d = mul(d,d);
timev = add(TIMET2NUM(bt.sec), quo(ULL2NUM(bt.frac), d));
result = rb_time_num_new(timev, Qnil);
@@ -1109,11 +1110,11 @@ struct sendmsg_args_struct {
int flags;
};
-static void *
+static VALUE
nogvl_sendmsg_func(void *ptr)
{
struct sendmsg_args_struct *args = ptr;
- return (void *)(VALUE)sendmsg(args->fd, args->msg, args->flags);
+ return sendmsg(args->fd, args->msg, args->flags);
}
static ssize_t
@@ -1123,7 +1124,7 @@ rb_sendmsg(int fd, const struct msghdr *msg, int flags)
args.fd = fd;
args.msg = msg;
args.flags = flags;
- return (ssize_t)rb_thread_call_without_gvl(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0);
+ return rb_thread_blocking_region(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0);
}
static VALUE
@@ -1163,10 +1164,8 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
#if defined(HAVE_ST_MSG_CONTROL)
int i;
size_t last_pad = 0;
-#if defined(__NetBSD__)
int last_level = 0;
int last_type = 0;
-#endif
controls_str = rb_str_tmp_new(0);
for (i = 0; i < controls_num; i++) {
VALUE elt = controls_ptr[i], v;
@@ -1205,10 +1204,8 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
cmh.cmsg_len = (socklen_t)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));
-#if defined(__NetBSD__)
last_level = cmh.cmsg_level;
last_type = cmh.cmsg_type;
-#endif
last_pad = cspace - cmh.cmsg_len;
}
if (last_pad) {
@@ -1280,11 +1277,12 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
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 && rb_io_wait_writable(fptr->fd)) {
- rb_io_check_closed(fptr);
- goto retry;
- }
if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
rb_mod_sys_fail(rb_mWaitWritable, "sendmsg(2) would block");
rb_sys_fail("sendmsg(2)");
@@ -1360,22 +1358,11 @@ struct recvmsg_args_struct {
int flags;
};
-ssize_t
-rsock_recvmsg(int socket, struct msghdr *message, int flags)
-{
-#ifdef MSG_CMSG_CLOEXEC
- /* MSG_CMSG_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */
- flags |= MSG_CMSG_CLOEXEC;
-#endif
- return recvmsg(socket, message, flags);
-}
-
-static void *
+static VALUE
nogvl_recvmsg_func(void *ptr)
{
struct recvmsg_args_struct *args = ptr;
- int flags = args->flags;
- return (void *)rsock_recvmsg(args->fd, args->msg, flags);
+ return recvmsg(args->fd, args->msg, args->flags);
}
static ssize_t
@@ -1385,31 +1372,18 @@ rb_recvmsg(int fd, struct msghdr *msg, int flags)
args.fd = fd;
args.msg = msg;
args.flags = flags;
- return (ssize_t)rb_thread_call_without_gvl(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0);
+ 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, int msg_peek_p)
+discard_cmsg(struct cmsghdr *cmh, char *msg_end)
{
-# if !defined(FD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK)
- /*
- * FreeBSD 8.2.0, NetBSD 5 and MacOS X Snow Leopard doesn't
- * allocate fds by recvmsg with MSG_PEEK.
- * [ruby-dev:44189]
- * http://bugs.ruby-lang.org/issues/5075
- *
- * Linux 2.6.38 allocate fds by recvmsg with MSG_PEEK.
- */
- if (msg_peek_p)
- return;
-# endif
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) {
- rb_fd_fix_cloexec(*fdp);
close(*fdp);
fdp++;
}
@@ -1418,7 +1392,7 @@ discard_cmsg(struct cmsghdr *cmh, char *msg_end, int msg_peek_p)
#endif
void
-rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p)
+rsock_discard_cmsg_resource(struct msghdr *mh)
{
#if defined(HAVE_ST_MSG_CONTROL)
struct cmsghdr *cmh;
@@ -1430,7 +1404,7 @@ rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p)
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, msg_peek_p);
+ discard_cmsg(cmh, msg_end);
}
#endif
}
@@ -1452,7 +1426,6 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
VALUE io;
if (fstat(fd, &stbuf) == -1)
rb_raise(rb_eSocket, "invalid fd in SCM_RIGHTS");
- rb_fd_fix_cloexec(fd);
if (S_ISSOCK(stbuf.st_mode))
io = rsock_init_sock(rb_obj_alloc(rb_cSocket), fd);
else
@@ -1498,7 +1471,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
rb_secure(4);
vopts = Qnil;
- if (0 < argc && RB_TYPE_P(argv[argc-1], T_HASH))
+ if (0 < argc && TYPE(argv[argc-1]) == T_HASH)
vopts = argv[--argc];
rb_scan_args(argc, argv, "03", &vmaxdatlen, &vflags, &vmaxctllen);
@@ -1588,11 +1561,12 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
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 && rb_io_wait_readable(fptr->fd)) {
- rb_io_check_closed(fptr);
- goto retry;
- }
if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
rb_mod_sys_fail(rb_mWaitReadable, "recvmsg(2) would block");
#if defined(HAVE_ST_MSG_CONTROL)
@@ -1624,11 +1598,11 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
if (NIL_P(vmaxctllen) && (mh.msg_flags & MSG_CTRUNC)) {
#define BIG_ENOUGH_SPACE 65536
if (BIG_ENOUGH_SPACE < maxctllen &&
- mh.msg_controllen < (socklen_t)(maxctllen - BIG_ENOUGH_SPACE)) {
+ mh.msg_controllen < maxctllen - BIG_ENOUGH_SPACE) {
/* there are big space bug truncated.
* file descriptors limit? */
if (!gc_done) {
- rsock_discard_cmsg_resource(&mh, (flags & MSG_PEEK) != 0);
+ rsock_discard_cmsg_resource(&mh);
goto gc_and_retry;
}
}
@@ -1649,14 +1623,14 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
}
#endif
if (grown) {
- rsock_discard_cmsg_resource(&mh, (flags & MSG_PEEK) != 0);
+ rsock_discard_cmsg_resource(&mh);
goto retry;
}
else {
grow_buffer = 0;
if (flags != orig_flags) {
- rsock_discard_cmsg_resource(&mh, (flags & MSG_PEEK) != 0);
flags = orig_flags;
+ rsock_discard_cmsg_resource(&mh);
goto retry;
}
}
@@ -1696,7 +1670,7 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
if (request_scm_rights)
make_io_for_unix_rights(ctl, cmh, msg_end);
else
- discard_cmsg(cmh, msg_end, (flags & MSG_PEEK) != 0);
+ discard_cmsg(cmh, msg_end);
rb_ary_push(ret, ctl);
}
}
@@ -1786,17 +1760,17 @@ rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock)
}
#endif
+/*
+ * Document-class: ::Socket::AncillaryData
+ *
+ * Socket::AncillaryData represents the ancillary data (control information)
+ * used by sendmsg and recvmsg system call.
+ * It contains socket family, cmsg level, cmsg type and cmsg data.
+ */
void
rsock_init_ancdata(void)
{
#if defined(HAVE_ST_MSG_CONTROL)
- /*
- * Document-class: Socket::AncillaryData
- *
- * Socket::AncillaryData represents the ancillary data (control information)
- * used by sendmsg and recvmsg system call. It contains socket #family,
- * control message (cmsg) #level, cmsg #type and cmsg #data.
- */
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);
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 2ef4f32692..e744ad27d3 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -247,7 +247,7 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
break;
}
-#define rb_sys_fail_path(path) rb_sys_fail_str(path)
+#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)
@@ -358,13 +358,11 @@ bsock_getsockname(VALUE sock)
{
struct sockaddr_storage buf;
socklen_t len = (socklen_t)sizeof buf;
- socklen_t len0 = len;
rb_io_t *fptr;
GetOpenFile(sock, fptr);
if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
rb_sys_fail("getsockname(2)");
- if (len0 < len) len = len0;
return rb_str_new((char*)&buf, len);
}
@@ -389,13 +387,11 @@ bsock_getpeername(VALUE sock)
{
struct sockaddr_storage buf;
socklen_t len = (socklen_t)sizeof buf;
- socklen_t len0 = len;
rb_io_t *fptr;
GetOpenFile(sock, fptr);
if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
rb_sys_fail("getpeername(2)");
- if (len0 < len) len = len0;
return rb_str_new((char*)&buf, len);
}
@@ -479,13 +475,11 @@ bsock_local_address(VALUE sock)
{
struct sockaddr_storage buf;
socklen_t len = (socklen_t)sizeof buf;
- socklen_t len0 = len;
rb_io_t *fptr;
GetOpenFile(sock, fptr);
if (getsockname(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
rb_sys_fail("getsockname(2)");
- if (len0 < len) len = len0;
return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
}
@@ -513,13 +507,11 @@ bsock_remote_address(VALUE sock)
{
struct sockaddr_storage buf;
socklen_t len = (socklen_t)sizeof buf;
- socklen_t len0 = len;
rb_io_t *fptr;
GetOpenFile(sock, fptr);
if (getpeername(fptr->fd, (struct sockaddr*)&buf, &len) < 0)
rb_sys_fail("getpeername(2)");
- if (len0 < len) len = len0;
return rsock_fd_socket_addrinfo(fptr->fd, (struct sockaddr *)&buf, len);
}
@@ -567,7 +559,7 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
arg.fd = fptr->fd;
arg.flags = NUM2INT(flags);
while (rb_thread_fd_writable(arg.fd),
- (n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) {
+ (n = (int)BLOCKING_REGION(func, &arg)) < 0) {
if (rb_io_wait_writable(arg.fd)) {
continue;
}
@@ -740,14 +732,12 @@ bsock_do_not_rev_lookup_set(VALUE self, VALUE val)
return val;
}
+/*
+ * BasicSocket is the super class for the all socket classes.
+ */
void
rsock_init_basicsocket(void)
{
- /*
- * Document-class: BasicSocket < IO
- *
- * BasicSocket is the super class for all the Socket classes.
- */
rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
rb_undef_method(rb_cBasicSocket, "initialize");
diff --git a/ext/socket/depend b/ext/socket/depend
index 1716f9cb89..f870b9f834 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,6 +1,6 @@
SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
- $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h $(hdrdir)/ruby/thread.h \
- $(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h $(top_srcdir)/internal.h
+ $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \
+ $(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h
init.o: init.c $(SOCK_HEADERS)
constants.o: constants.c constdefs.c $(SOCK_HEADERS)
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 13937ac773..92fa6bf7e1 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,11 +1,10 @@
require 'mkmf'
-$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
-
case RUBY_PLATFORM
-when /(ms|bcc)win(32|64)|mingw/
+when /(ms|bcc)win32|mingw/
test_func = "WSACleanup"
have_library("ws2_32", "WSACleanup")
+ $defs << "-DHAVE_SOCKETPAIR"
when /cygwin/
test_func = "socket"
when /beos/
@@ -23,12 +22,6 @@ else
have_library("socket", "socket")
end
-if /darwin/ =~ RUBY_PLATFORM
- # For IPv6 extension header access on OS X 10.7+ [Bug #8517]
- $CFLAGS << " -D__APPLE_USE_RFC_3542"
-end
-
-headers = []
unless $mswin or $bccwin or $mingw
headers = %w<sys/types.h netdb.h string.h sys/socket.h netinet/in.h>
end
@@ -41,7 +34,7 @@ if have_header("arpa/inet.h")
end
ipv6 = false
-default_ipv6 = /cygwin|beos|haiku/ !~ RUBY_PLATFORM
+default_ipv6 = /mswin|cygwin|beos|haiku/ !~ RUBY_PLATFORM
if enable_config("ipv6", default_ipv6)
if checking_for("ipv6") {try_link(<<EOF)}
#include <sys/types.h>
@@ -49,10 +42,9 @@ if enable_config("ipv6", default_ipv6)
#include <sys/socket.h>
#endif
int
-main(void)
+main()
{
socket(AF_INET6, SOCK_STREAM, 0);
- return 0;
}
EOF
$defs << "-DENABLE_IPV6" << "-DINET6"
@@ -62,7 +54,7 @@ end
if ipv6
if $mingw
- $CPPFLAGS << " -D_WIN32_WINNT=0x501" unless $CPPFLAGS.include?("_WIN32_WINNT")
+ $CPPFLAGS << " -D_WIN32_WINNT=0x501"
end
ipv6lib = nil
class << (fmt = "unknown")
@@ -130,128 +122,7 @@ if have_func("sendmsg") | have_func("recvmsg")
have_struct_member('struct msghdr', 'msg_accrights', ['sys/types.h', 'sys/socket.h'])
end
-if checking_for("recvmsg() with MSG_PEEK allocate file descriptors") {try_run(cpp_include(headers) + <<'EOF')}
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-int main(int argc, char *argv[])
-{
- int ps[2], sv[2];
- int ret;
- ssize_t ss;
- int s_fd, r_fd;
- struct msghdr s_msg, r_msg;
- union {
- struct cmsghdr hdr;
- char dummy[CMSG_SPACE(sizeof(int))];
- } s_cmsg, r_cmsg;
- struct iovec s_iov, r_iov;
- char s_buf[1], r_buf[1];
- struct stat s_statbuf, r_statbuf;
-
- ret = pipe(ps);
- if (ret == -1) { perror("pipe"); exit(EXIT_FAILURE); }
-
- s_fd = ps[0];
-
- ret = socketpair(AF_UNIX, SOCK_DGRAM, 0, sv);
- if (ret == -1) { perror("socketpair"); exit(EXIT_FAILURE); }
-
- s_msg.msg_name = NULL;
- s_msg.msg_namelen = 0;
- s_msg.msg_iov = &s_iov;
- s_msg.msg_iovlen = 1;
- s_msg.msg_control = &s_cmsg;
- s_msg.msg_controllen = CMSG_SPACE(sizeof(int));;
- s_msg.msg_flags = 0;
-
- s_iov.iov_base = &s_buf;
- s_iov.iov_len = sizeof(s_buf);
-
- s_buf[0] = 'a';
-
- s_cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
- s_cmsg.hdr.cmsg_level = SOL_SOCKET;
- s_cmsg.hdr.cmsg_type = SCM_RIGHTS;
- memcpy(CMSG_DATA(&s_cmsg.hdr), (char *)&s_fd, sizeof(int));
-
- ss = sendmsg(sv[0], &s_msg, 0);
- if (ss == -1) { perror("sendmsg"); exit(EXIT_FAILURE); }
-
- r_msg.msg_name = NULL;
- r_msg.msg_namelen = 0;
- r_msg.msg_iov = &r_iov;
- r_msg.msg_iovlen = 1;
- r_msg.msg_control = &r_cmsg;
- r_msg.msg_controllen = CMSG_SPACE(sizeof(int));
- r_msg.msg_flags = 0;
-
- r_iov.iov_base = &r_buf;
- r_iov.iov_len = sizeof(r_buf);
-
- r_buf[0] = '0';
-
- memset(&r_cmsg, 0xff, CMSG_SPACE(sizeof(int)));
-
- ss = recvmsg(sv[1], &r_msg, MSG_PEEK);
- if (ss == -1) { perror("recvmsg"); exit(EXIT_FAILURE); }
-
- if (ss != 1) {
- fprintf(stderr, "unexpected return value from recvmsg: %ld\n", (long)ss);
- exit(EXIT_FAILURE);
- }
- if (r_buf[0] != 'a') {
- fprintf(stderr, "unexpected return data from recvmsg: 0x%02x\n", r_buf[0]);
- exit(EXIT_FAILURE);
- }
-
- if (r_msg.msg_controllen < CMSG_LEN(sizeof(int))) {
- fprintf(stderr, "unexpected: r_msg.msg_controllen < CMSG_LEN(sizeof(int)) not hold: %ld\n",
- (long)r_msg.msg_controllen);
- exit(EXIT_FAILURE);
- }
- if (r_cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(int))) {
- fprintf(stderr, "unexpected: r_cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(int)) not hold: %ld\n",
- (long)r_cmsg.hdr.cmsg_len);
- exit(EXIT_FAILURE);
- }
- memcpy((char *)&r_fd, CMSG_DATA(&r_cmsg.hdr), sizeof(int));
-
- if (r_fd < 0) {
- fprintf(stderr, "negative r_fd: %d\n", r_fd);
- exit(EXIT_FAILURE);
- }
-
- if (r_fd == s_fd) {
- fprintf(stderr, "r_fd and s_fd is same: %d\n", r_fd);
- exit(EXIT_FAILURE);
- }
-
- ret = fstat(s_fd, &s_statbuf);
- if (ret == -1) { perror("fstat(s_fd)"); exit(EXIT_FAILURE); }
-
- ret = fstat(r_fd, &r_statbuf);
- if (ret == -1) { perror("fstat(r_fd)"); exit(EXIT_FAILURE); }
-
- if (s_statbuf.st_dev != r_statbuf.st_dev ||
- s_statbuf.st_ino != r_statbuf.st_ino) {
- fprintf(stderr, "dev/ino doesn't match: s_fd:%ld/%ld r_fd:%ld/%ld\n",
- (long)s_statbuf.st_dev, (long)s_statbuf.st_ino,
- (long)r_statbuf.st_dev, (long)r_statbuf.st_ino);
- exit(EXIT_FAILURE);
- }
-
- return EXIT_SUCCESS;
-}
-EOF
- $defs << "-DFD_PASSING_WORK_WITH_RECVMSG_MSG_PEEK"
-end
+have_type("PADDRINFO", %w[ ws2tcpip.h wspiapi.h ])
getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
(checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
@@ -270,7 +141,7 @@ getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
#endif
int
-main(void)
+main()
{
int passive, gaierr, inet4 = 0, inet6 = 0;
struct addrinfo hints, *ai, *aitop;
@@ -354,12 +225,12 @@ main(void)
if (aitop)
freeaddrinfo(aitop);
- return EXIT_SUCCESS;
+ exit(EXIT_SUCCESS);
bad:
if (aitop)
freeaddrinfo(aitop);
- return EXIT_FAILURE;
+ exit(EXIT_FAILURE);
}
EOF
if ipv6 and not getaddr_info_ok
@@ -403,8 +274,6 @@ EOF
end
end
-have_func("accept4")
-
$objs = [
"init.#{$OBJEXT}",
"constants.#{$OBJEXT}",
@@ -434,15 +303,13 @@ if getaddr_info_ok == :wide or
$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")
+ have_header("arpa/nameser.h")
+ have_header("resolv.h")
end
-have_func('inet_ntop(0, (const void *)0, (char *)0, 0)') or
- have_func("inet_ntoa(*(struct in_addr *)NULL)")
-have_func('inet_pton(0, "", (void *)0)') or have_func('inet_aton("", (struct in_addr *)0)')
-have_func('getservbyport(0, "")')
-have_header("arpa/nameser.h")
-have_header("resolv.h")
-
have_header("ifaddrs.h")
have_func("getifaddrs")
have_header("sys/ioctl.h")
@@ -459,11 +326,11 @@ end
have_header("sys/un.h")
have_header("sys/uio.h")
have_type("struct in_pktinfo", headers) {|src|
- src.sub(%r'^/\*top\*/', '\&'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
+ src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
"#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
} and have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
have_type("struct in6_pktinfo", headers) {|src|
- src.sub(%r'^/\*top\*/', '\&'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
+ src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
"#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
}
@@ -475,12 +342,6 @@ have_func("getpeereid")
have_header("ucred.h", headers)
have_func("getpeerucred")
-have_func("if_indextoname")
-
-have_type("struct ip_mreq", headers) # 4.4BSD
-have_type("struct ip_mreqn", headers) # Linux 2.4
-have_type("struct ipv6_mreq", headers) # RFC 3493
-
# workaround for recent Windows SDK
$defs << "-DIPPROTO_IPV6=IPPROTO_IPV6" if $defs.include?("-DHAVE_CONST_IPPROTO_IPV6") && !have_macro("IPPROTO_IPV6")
@@ -489,11 +350,8 @@ $distcleanfiles << "constants.h" << "constdefs.*"
if have_func(test_func)
have_func("hsterror")
have_func("getipnodebyname") or have_func("gethostbyname2")
- if !have_func("socketpair(0, 0, 0, 0)") and have_func("rb_w32_socketpair(0, 0, 0, 0)")
- $defs << "-Dsocketpair(a,b,c,d)=rb_w32_socketpair((a),(b),(c),(d))"
- $defs << "-DHAVE_SOCKETPAIR"
- end
- unless have_func("gethostname((char *)0, 0)")
+ have_func("socketpair") unless $defs.include?("-DHAVE_SOCKETPAIR")
+ unless have_func("gethostname")
have_func("uname")
end
if enable_config("socks", ENV["SOCKS_SERVER"])
@@ -503,29 +361,5 @@ if have_func(test_func)
$defs << "-DSOCKS"
end
end
- hdr = "netinet6/in6.h"
- if /darwin/ =~ RUBY_PLATFORM and !try_compile(<<"SRC", nil, :werror=>true)
-#include <netinet/in.h>
-int t(struct in6_addr *addr) {return IN6_IS_ADDR_UNSPECIFIED(addr);}
-SRC
- print "fixing apple's netinet6/in6.rb ..."; $stdout.flush
- in6 = File.read("/usr/include/#{hdr}")
- if in6.gsub!(/\*\(const\s+__uint32_t\s+\*\)\(const\s+void\s+\*\)\(&(\(\w+\))->s6_addr\[(\d+)\]\)/) do
- i, r = $2.to_i.divmod(4)
- if r.zero?
- "#$1->__u6_addr.__u6_addr32[#{i}]"
- else
- $&
- end
- end
- FileUtils.mkdir_p(File.dirname(hdr))
- open(hdr, "w") {|f| f.write(in6)}
- $distcleanfiles << hdr
- $distcleandirs << File.dirname(hdr)
- puts "done"
- else
- puts "not needed"
- end
- end
create_makefile("socket")
end
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index c03dd601ff..3382f00e52 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -182,12 +182,12 @@ if (pai->ai_flags & AI_CANONNAME) {\
error = EAI_MEMORY;\
goto free;\
}\
- memcpy((ai), pai, sizeof(struct addrinfo));\
+ memcpy(ai, pai, sizeof(struct addrinfo));\
(ai)->ai_addr = (struct sockaddr *)((ai) + 1);\
memset((ai)->ai_addr, 0, (afd)->a_socklen);\
SET_SA_LEN((ai)->ai_addr, (ai)->ai_addrlen = (afd)->a_socklen);\
(ai)->ai_addr->sa_family = (ai)->ai_family = (afd)->a_af;\
- ((struct sockinet *)(ai)->ai_addr)->si_port = (port);\
+ ((struct sockinet *)(ai)->ai_addr)->si_port = port;\
p = (char *)((ai)->ai_addr);\
memcpy(p + (afd)->a_off, (addr), (afd)->a_addrlen);\
}
@@ -589,7 +589,6 @@ get_addr(const char *hostname, int af, struct addrinfo **res, struct addrinfo *p
} else
hp = getipnodebyname(hostname, af, AI_ADDRCONFIG, &h_error);
#else
- if (strlen(hostname) >= NI_MAXHOST) ERR(EAI_NODATA);
hp = gethostbyname((char*)hostname);
h_error = h_errno;
#endif
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index d1d5ff6c73..3ee83eb2a0 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -114,6 +114,9 @@ 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)
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 7810ed4817..48718313f0 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -43,16 +43,14 @@ VALUE
rsock_init_sock(VALUE sock, int fd)
{
rb_io_t *fp;
-#ifndef _WIN32
struct stat sbuf;
+#ifndef _WIN32
if (fstat(fd, &sbuf) < 0)
rb_sys_fail(0);
- rb_update_max_fd(fd);
if (!S_ISSOCK(sbuf.st_mode))
rb_raise(rb_eArgError, "not a socket file descriptor");
#else
- rb_update_max_fd(fd);
if (!rb_w32_is_socket(fd))
rb_raise(rb_eArgError, "not a socket file descriptor");
#endif
@@ -131,7 +129,7 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
while (rb_io_check_closed(fptr),
rb_thread_wait_fd(arg.fd),
- (slen = BLOCKING_REGION_FD(recvfrom_blocking, &arg)) < 0) {
+ (slen = BLOCKING_REGION(recvfrom_blocking, &arg)) < 0) {
if (!rb_io_wait_readable(fptr->fd)) {
rb_sys_fail("recvfrom(2)");
}
@@ -155,7 +153,7 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
}
#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, arg.alen, fptr->mode & FMODE_NOREVLOOKUP));
+ return rb_assoc_new(str, rsock_ipaddr((struct sockaddr*)&arg.buf, fptr->mode & FMODE_NOREVLOOKUP));
else
return rb_assoc_new(str, Qnil);
@@ -227,7 +225,7 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type
case RECV_IP:
if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
- addr = rsock_ipaddr((struct sockaddr*)&buf, alen, fptr->mode & FMODE_NOREVLOOKUP);
+ addr = rsock_ipaddr((struct sockaddr*)&buf, fptr->mode & FMODE_NOREVLOOKUP);
break;
case RECV_SOCKET:
@@ -240,100 +238,90 @@ rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type
return rb_assoc_new(str, addr);
}
-static int
-rsock_socket0(int domain, int type, int proto)
-{
- int ret;
-
-#ifdef SOCK_CLOEXEC
- static int try_sock_cloexec = 1;
- if (try_sock_cloexec) {
- ret = socket(domain, type|SOCK_CLOEXEC, proto);
- if (ret == -1 && errno == EINVAL) {
- /* SOCK_CLOEXEC is available since Linux 2.6.27. Linux 2.6.18 fails with EINVAL */
- ret = socket(domain, type, proto);
- if (ret != -1) {
- try_sock_cloexec = 0;
- }
- }
- }
- else {
- ret = socket(domain, type, proto);
- }
-#else
- ret = socket(domain, type, proto);
-#endif
- if (ret == -1)
- return -1;
-
- rb_fd_fix_cloexec(ret);
-
- return ret;
-
-}
-
int
rsock_socket(int domain, int type, int proto)
{
int fd;
- fd = rsock_socket0(domain, type, proto);
+ fd = socket(domain, type, proto);
if (fd < 0) {
- if (errno == EMFILE || errno == ENFILE) {
- rb_gc();
- fd = rsock_socket0(domain, type, proto);
- }
+ if (errno == EMFILE || errno == ENFILE) {
+ rb_gc();
+ fd = socket(domain, type, proto);
+ }
}
- if (0 <= fd)
- rb_update_max_fd(fd);
return fd;
}
static int
-wait_connectable(int fd)
+wait_connectable0(int fd, rb_fdset_t *fds_w, rb_fdset_t *fds_e)
{
int sockerr;
socklen_t sockerrlen;
- int revents;
- int ret;
for (;;) {
- /*
- * Stevens book says, succuessful finish turn on RB_WAITFD_OUT and
- * failure finish turn on both RB_WAITFD_IN and RB_WAITFD_OUT.
- */
- revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, NULL);
+ rb_fd_zero(fds_w);
+ rb_fd_zero(fds_e);
- if (revents & (RB_WAITFD_IN|RB_WAITFD_OUT)) {
- sockerrlen = (socklen_t)sizeof(sockerr);
- ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+ rb_fd_set(fd, fds_w);
+ rb_fd_set(fd, fds_e);
- /*
- * Solaris getsockopt(SO_ERROR) return -1 and set errno
- * in getsockopt(). Let's return immediately.
- */
- if (ret < 0)
- break;
- if (sockerr == 0) {
- if (revents & RB_WAITFD_OUT)
- break;
- else
- continue; /* workaround for winsock */
- }
+ rb_thread_select(fd+1, 0, rb_fd_ptr(fds_w), rb_fd_ptr(fds_e), 0);
- /* BSD and Linux use sockerr. */
- errno = sockerr;
- ret = -1;
- break;
+ if (rb_fd_isset(fd, fds_w)) {
+ return 0;
}
-
- if ((revents & (RB_WAITFD_IN|RB_WAITFD_OUT)) == RB_WAITFD_OUT) {
- ret = 0;
- break;
+ else if (rb_fd_isset(fd, fds_e)) {
+ sockerrlen = (socklen_t)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 ret;
+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__
@@ -392,7 +380,7 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
if (socks) func = socks_connect_blocking;
#endif
for (;;) {
- status = (int)BLOCKING_REGION_FD(func, &arg);
+ status = (int)BLOCKING_REGION(func, &arg);
if (status < 0) {
switch (errno) {
case EINTR:
@@ -481,43 +469,6 @@ make_fd_nonblock(int fd)
}
}
-static int
-cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len)
-{
- int ret;
- socklen_t len0 = 0;
-#ifdef HAVE_ACCEPT4
- static int try_accept4 = 1;
-#endif
- if (address_len) len0 = *address_len;
-#ifdef HAVE_ACCEPT4
- if (try_accept4) {
- int flags = 0;
-#ifdef SOCK_CLOEXEC
- flags |= SOCK_CLOEXEC;
-#endif
- ret = accept4(socket, address, address_len, flags);
- /* accept4 is available since Linux 2.6.28, glibc 2.10. */
- if (ret != -1) {
- if (ret <= 2)
- rb_maygvl_fd_fix_cloexec(ret);
- if (address_len && len0 < *address_len) *address_len = len0;
- return ret;
- }
- if (errno != ENOSYS) {
- return -1;
- }
- try_accept4 = 0;
- }
-#endif
- ret = accept(socket, address, address_len);
- if (ret == -1) return -1;
- if (address_len && len0 < *address_len) *address_len = len0;
- rb_maygvl_fd_fix_cloexec(ret);
- return ret;
-}
-
-
VALUE
rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen_t *len)
{
@@ -525,7 +476,7 @@ rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s
rb_secure(3);
rb_io_set_nonblock(fptr);
- fd2 = cloexec_accept(fptr->fd, (struct sockaddr*)sockaddr, len);
+ fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len);
if (fd2 < 0) {
switch (errno) {
case EAGAIN:
@@ -540,7 +491,6 @@ rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s
}
rb_sys_fail("accept(2)");
}
- rb_update_max_fd(fd2);
make_fd_nonblock(fd2);
return rsock_init_sock(rb_obj_alloc(klass), fd2);
}
@@ -555,7 +505,7 @@ static VALUE
accept_blocking(void *data)
{
struct accept_arg *arg = data;
- return (VALUE)cloexec_accept(arg->fd, arg->sockaddr, arg->len);
+ return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
}
VALUE
@@ -571,7 +521,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
arg.len = len;
retry:
rb_thread_wait_fd(fd);
- fd2 = (int)BLOCKING_REGION_FD(accept_blocking, &arg);
+ fd2 = (int)BLOCKING_REGION(accept_blocking, &arg);
if (fd2 < 0) {
switch (errno) {
case EMFILE:
@@ -587,7 +537,6 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
}
rb_sys_fail(0);
}
- rb_update_max_fd(fd2);
if (!klass) return INT2NUM(fd2);
return rsock_init_sock(rb_obj_alloc(klass), fd2);
}
@@ -605,12 +554,12 @@ rsock_getfamily(int sockfd)
return ss.ss_family;
}
+/*
+ * SocketError is the error class for socket.
+ */
void
rsock_init_socket_init()
{
- /*
- * SocketError is the error class for socket.
- */
rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
rsock_init_ipsocket();
rsock_init_tcpsocket();
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index fa5c13c08f..dd7eb80b55 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -105,10 +105,10 @@ init_inetsock_internal(struct inetsock_arg *arg)
arg->fd = -1;
if (type == INET_SERVER) {
- status = listen(fd, SOMAXCONN);
+ status = listen(fd, 5);
if (status < 0) {
close(fd);
- rb_sys_fail("listen(2)");
+ syscall = "listen(2)";
}
}
@@ -139,7 +139,7 @@ static ID id_numeric, id_hostname;
int
rsock_revlookup_flag(VALUE revlookup, int *norevlookup)
{
-#define return_norevlookup(x) {*norevlookup = (x); return 1;}
+#define return_norevlookup(x) {*norevlookup = x; return 1;}
ID id;
switch (revlookup) {
@@ -194,7 +194,7 @@ ip_addr(int argc, VALUE *argv, VALUE sock)
norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
rb_sys_fail("getsockname(2)");
- return rsock_ipaddr((struct sockaddr*)&addr, len, norevlookup);
+ return rsock_ipaddr((struct sockaddr*)&addr, norevlookup);
}
/*
@@ -214,7 +214,7 @@ ip_addr(int argc, VALUE *argv, VALUE sock)
*
* TCPSocket.open("www.ruby-lang.org", 80) {|sock|
* p sock.peeraddr #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
- * p sock.peeraddr(true) #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
+ * p sock.peeraddr(true) #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
* p sock.peeraddr(false) #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
* p sock.peeraddr(:hostname) #=> ["AF_INET", 80, "carbon.ruby-lang.org", "221.186.184.68"]
* p sock.peeraddr(:numeric) #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
@@ -235,7 +235,7 @@ ip_peeraddr(int argc, VALUE *argv, VALUE sock)
norevlookup = fptr->mode & FMODE_NOREVLOOKUP;
if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
rb_sys_fail("getpeername(2)");
- return rsock_ipaddr((struct sockaddr*)&addr, len, norevlookup);
+ return rsock_ipaddr((struct sockaddr*)&addr, norevlookup);
}
/*
@@ -280,23 +280,22 @@ ip_s_getaddress(VALUE obj, VALUE host)
{
struct sockaddr_storage addr;
struct addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0);
- socklen_t len = res->ai_addrlen;
/* just take the first one */
- memcpy(&addr, res->ai_addr, len);
+ memcpy(&addr, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
- return rsock_make_ipaddr((struct sockaddr*)&addr, len);
+ return rsock_make_ipaddr((struct sockaddr*)&addr);
}
+/*
+ * Document-class: ::IPSocket < BasicSocket
+ *
+ * IPSocket is the super class of TCPSocket and UDPSocket.
+ */
void
rsock_init_ipsocket(void)
{
- /*
- * Document-class: IPSocket < BasicSocket
- *
- * IPSocket is the super class of TCPSocket and UDPSocket.
- */
rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
rb_define_method(rb_cIPSocket, "addr", ip_addr, -1);
rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, -1);
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 78b2ff45c2..b7dc446c94 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -16,12 +16,6 @@ class Addrinfo
raise ArgumentError, "no address specified"
elsif Addrinfo === args.first
raise ArgumentError, "too many arguments" if args.length != 1
- addrinfo = args.first
- if (self.pfamily != addrinfo.pfamily) ||
- (self.socktype != addrinfo.socktype)
- raise ArgumentError, "Addrinfo type mismatch"
- end
- addrinfo
elsif self.ip?
raise ArgumentError, "IP address needs host and port but #{args.length} arguments given" if args.length != 2
host, port = args
@@ -35,67 +29,30 @@ class Addrinfo
end
end
- # creates a new Socket connected to the address of +local_addrinfo+.
- #
- # If _local_addrinfo_ is nil, the address of the socket is not bound.
- #
- # The _timeout_ specify the seconds for timeout.
- # Errno::ETIMEDOUT is raised when timeout occur.
- #
- # If a block is given the created socket is yielded for each address.
- #
- def connect_internal(local_addrinfo, timeout=nil) # :yields: socket
+ 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
- if timeout
- begin
- sock.connect_nonblock(self)
- rescue IO::WaitWritable
- if !IO.select(nil, [sock], nil, timeout)
- raise Errno::ETIMEDOUT, 'user specified timeout'
- end
- begin
- sock.connect_nonblock(self) # check connection failure
- rescue Errno::EISCONN
- end
- end
- else
- sock.connect(self)
- end
- rescue Exception
- sock.close
- raise
- end
- if block_given?
- begin
+ sock.connect(self)
+ if block_given?
yield sock
- ensure
- sock.close if !sock.closed?
+ else
+ sock
end
- else
- sock
+ ensure
+ sock.close if !sock.closed? && (block_given? || $!)
end
end
private :connect_internal
- # :call-seq:
- # addrinfo.connect_from([local_addr_args], [opts]) {|socket| ... }
- # addrinfo.connect_from([local_addr_args], [opts])
- #
# 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 _local_addr_args_ is not given, the local address of the socket is not bound.
- #
- # The optional last argument _opts_ is options represented by a hash.
- # _opts_ may have following options:
- #
- # [:timeout] specify the timeout in seconds.
+ # 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.
@@ -111,23 +68,12 @@ class Addrinfo
# puts s.read
# }
#
- def connect_from(*args, &block)
- opts = Hash === args.last ? args.pop : {}
- local_addr_args = args
- connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block)
+ def connect_from(*local_addr_args, &block)
+ connect_internal(family_addrinfo(*local_addr_args), &block)
end
- # :call-seq:
- # addrinfo.connect([opts]) {|socket| ... }
- # addrinfo.connect([opts])
- #
# creates a socket connected to the address of self.
#
- # The optional argument _opts_ is options represented by a hash.
- # _opts_ may have following options:
- #
- # [:timeout] specify the timeout in seconds.
- #
# If a block is given, it is called with the socket and the value of the block is returned.
# The socket is returned otherwise.
#
@@ -136,21 +82,12 @@ class Addrinfo
# puts s.read
# }
#
- def connect(opts={}, &block)
- connect_internal(nil, opts[:timeout], &block)
+ def connect(&block)
+ connect_internal(nil, &block)
end
- # :call-seq:
- # addrinfo.connect_to([remote_addr_args], [opts]) {|socket| ... }
- # addrinfo.connect_to([remote_addr_args], [opts])
- #
# creates a socket connected to _remote_addr_args_ and bound to self.
#
- # The optional last argument _opts_ is options represented by a hash.
- # _opts_ may have following options:
- #
- # [:timeout] specify the timeout in seconds.
- #
# If a block is given, it is called with the socket and the value of the block is returned.
# The socket is returned otherwise.
#
@@ -159,11 +96,9 @@ class Addrinfo
# puts s.read
# }
#
- def connect_to(*args, &block)
- opts = Hash === args.last ? args.pop : {}
- remote_addr_args = args
+ def connect_to(*remote_addr_args, &block)
remote_addrinfo = family_addrinfo(*remote_addr_args)
- remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block)
+ remote_addrinfo.send(:connect_internal, self, &block)
end
# creates a socket bound to self.
@@ -182,41 +117,31 @@ class Addrinfo
sock.ipv6only! if self.ipv6?
sock.setsockopt(:SOCKET, :REUSEADDR, 1)
sock.bind(self)
- rescue Exception
- sock.close
- raise
- end
- if block_given?
- begin
+ if block_given?
yield sock
- ensure
- sock.close if !sock.closed?
+ else
+ sock
end
- else
- sock
+ ensure
+ sock.close if !sock.closed? && (block_given? || $!)
end
end
# creates a listening socket bound to self.
- def listen(backlog=Socket::SOMAXCONN)
+ 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)
- rescue Exception
- sock.close
- raise
- end
- if block_given?
- begin
+ if block_given?
yield sock
- ensure
- sock.close if !sock.closed?
+ else
+ sock
end
- else
- sock
+ ensure
+ sock.close if !sock.closed? && (block_given? || $!)
end
end
@@ -285,29 +210,15 @@ class Socket < BasicSocket
end
end
- # :call-seq:
- # Socket.tcp(host, port, local_host=nil, local_port=nil, [opts]) {|socket| ... }
- # Socket.tcp(host, port, local_host=nil, local_port=nil, [opts])
- #
# 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.
#
- # The optional last argument _opts_ is options represented by a hash.
- # _opts_ may have following options:
- #
- # [:connect_timeout] specify the timeout in seconds.
- #
# 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.
#
- # The optional last argument _opts_ is options represented by a hash.
- # _opts_ may have following options:
- #
- # [:timeout] specify the timeout in seconds.
- #
# If no block is given, the socket is returned.
#
# Socket.tcp("www.ruby-lang.org", 80) {|sock|
@@ -316,15 +227,10 @@ class Socket < BasicSocket
# puts sock.read
# }
#
- def self.tcp(host, port, *rest) # :yield: socket
- opts = Hash === rest.last ? rest.pop : {}
- raise ArgumentError, "wrong number of arguments (#{rest.length} for 2)" if 2 < rest.length
- local_host, local_port = rest
+ def self.tcp(host, port, local_host=nil, local_port=nil) # :yield: socket
last_error = nil
ret = nil
- connect_timeout = opts[:connect_timeout]
-
local_addr_list = nil
if local_host != nil || local_port != nil
local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
@@ -338,9 +244,7 @@ class Socket < BasicSocket
local_addr = nil
end
begin
- sock = local_addr ?
- ai.connect_from(local_addr, :timeout => connect_timeout) :
- ai.connect(:timeout => connect_timeout)
+ sock = local_addr ? ai.connect_from(local_addr) : ai.connect
rescue SystemCallError
last_error = $!
next
@@ -368,9 +272,8 @@ class Socket < BasicSocket
# :stopdoc:
def self.ip_sockets_port0(ai_list, reuseaddr)
- sockets = []
begin
- sockets.clear
+ sockets = []
port = nil
ai_list.each {|ai|
begin
@@ -391,13 +294,14 @@ class Socket < BasicSocket
end
}
rescue Errno::EADDRINUSE
- sockets.each {|s| s.close }
+ sockets.each {|s|
+ s.close
+ }
retry
- rescue Exception
- sockets.each {|s| s.close }
- raise
end
sockets
+ ensure
+ sockets.each {|s| s.close if !s.closed? } if $!
end
class << self
private :ip_sockets_port0
@@ -406,15 +310,12 @@ class Socket < BasicSocket
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)
- begin
- sockets.each {|s|
- s.listen(Socket::SOMAXCONN)
- }
- rescue Exception
- sockets.each {|s| s.close }
- raise
- end
+ 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
@@ -431,7 +332,7 @@ class Socket < BasicSocket
# The value of the block is returned.
# The socket is closed when this method returns.
#
- # If _port_ is 0, actual port number is chosen dynamically.
+ # 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.
@@ -443,7 +344,7 @@ class Socket < BasicSocket
# #=> #<Addrinfo: [::]:1296 TCP>
# # #<Addrinfo: 0.0.0.0:1296 TCP>
#
- # # IPv6 and IPv4 socket has same port number, 53114, even if it is chosen dynamically.
+ # # 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>
@@ -458,9 +359,9 @@ class Socket < BasicSocket
if port == 0
sockets = tcp_server_sockets_port0(host)
else
- last_error = nil
- sockets = []
begin
+ last_error = nil
+ sockets = []
Addrinfo.foreach(host, port, nil, :STREAM, nil, Socket::AI_PASSIVE) {|ai|
begin
s = ai.listen
@@ -473,9 +374,8 @@ class Socket < BasicSocket
if sockets.empty?
raise last_error
end
- rescue Exception
- sockets.each {|s| s.close }
- raise
+ ensure
+ sockets.each {|s| s.close if !s.closed? } if $!
end
end
if block_given?
@@ -574,8 +474,8 @@ class Socket < BasicSocket
# The value of the block is returned.
# The sockets are closed when this method returns.
#
- # If _port_ is zero, some port is chosen.
- # But the chosen port is used for the all sockets.
+ # 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|
@@ -635,10 +535,12 @@ class Socket < BasicSocket
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
}
@@ -675,7 +577,7 @@ class Socket < BasicSocket
def self.udp_server_recv(sockets)
sockets.each {|r|
begin
- msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock
+ msg, sender_addrinfo, rflags, *controls = r.recvmsg_nonblock
rescue IO::WaitReadable
next
end
@@ -737,28 +639,17 @@ class Socket < BasicSocket
# UDP/IP address information used by Socket.udp_server_loop.
class UDPSource
- # +remote_address+ is an Addrinfo object.
- #
- # +local_address+ is an Addrinfo object.
- #
- # +reply_proc+ is a Proc used to send reply back to the source.
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
- # Address of the source
- attr_reader :remote_address
-
- # Local address
- attr_reader :local_address
-
- def inspect # :nodoc:
+ def inspect
"\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>"
end
- # Sends the String +msg+ to the source
def reply(msg)
@reply_proc.call msg
end
@@ -810,14 +701,12 @@ class Socket < BasicSocket
# }
#
def self.unix_server_socket(path)
- if !unix_socket_abstract_name?(path)
- begin
- st = File.lstat(path)
- rescue Errno::ENOENT
- end
- if st && st.socket? && st.owned?
- File.unlink path
- end
+ 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?
@@ -825,23 +714,13 @@ class Socket < BasicSocket
yield s
ensure
s.close if !s.closed?
- if !unix_socket_abstract_name?(path)
- File.unlink path
- end
+ File.unlink path
end
else
s
end
end
- class << self
- private
-
- def unix_socket_abstract_name?(path)
- /linux/ =~ RUBY_PLATFORM && /\A(\0|\z)/ =~ path
- end
- end
-
# creates a UNIX socket server on _path_.
# It calls the block for each socket accepted.
#
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 3b63c39eff..fe00f30e3d 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -37,20 +37,14 @@ opt.parse!
h = {}
-COMMENTS = Hash.new { |h, name| h[name] = name }
-
DATA.each_line {|s|
- name, default_value, comment = s.chomp.split(/\s+/, 3)
+ name, default_value = s.scan(/\S+/)
next unless name && name[0] != ?#
-
- default_value = nil if default_value == 'nil'
-
if h.has_key? name
warn "#{$.}: warning: duplicate name: #{name}"
next
end
h[name] = default_value
- COMMENTS[name] = comment
}
DEFS = h.to_a
@@ -93,9 +87,9 @@ EOS
ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_const_defs_in_guard(make_value, name, default_value)")
#if defined(<%=name%>)
- /* <%= COMMENTS[name] %> */
+ /* <%=name%>: */
rb_define_const(rb_cSocket, <%=c_str name%>, <%=make_value%>(<%=name%>));
- /* <%= COMMENTS[name] %> */
+ /* <%=name%>: */
rb_define_const(rb_mSockConst, <%=c_str name%>, <%=make_value%>(<%=name%>));
#endif
EOS
@@ -284,20 +278,18 @@ result = ERB.new(<<'EOS', nil, '%').result(binding)
<%= INTERN_DEFS.map {|vardef, gen_hash, decl, func| vardef }.join("\n") %>
+/*
+ * Document-module: ::Socket::Constants
+ *
+ * Socket::Constants provides socket related constants.
+ * Following lists possible constants.
+ * If underlying platform doesn't define a constant,
+ * the corresponding Ruby constant is not defined.
+ *
+ */
static void
init_constants(void)
{
- /*
- * Document-module: Socket::Constants
- *
- * Socket::Constants provides socket-related constants. All possible
- * socket constants are listed in the documentation but they may not all
- * be present on your platform.
- *
- * If the underlying platform doesn't define a constant the corresponding
- * Ruby constant is not defined.
- *
- */
rb_mSockConst = rb_define_module_under(rb_cSocket, "Constants");
<%= gen_const_defs %>
@@ -335,371 +327,370 @@ end
__END__
-SOCK_STREAM nil A stream socket provides a sequenced, reliable two-way connection for a byte stream
-SOCK_DGRAM nil A datagram socket provides connectionless, unreliable messaging
-SOCK_RAW nil A raw socket provides low-level access for direct access or implementing network protocols
-SOCK_RDM nil A reliable datagram socket provides reliable delivery of messages
-SOCK_SEQPACKET nil A sequential packet socket provides sequenced, reliable two-way connection for datagrams
-SOCK_PACKET nil Device-level packet access
-
-AF_UNSPEC nil Unspecified protocol, any supported address family
-PF_UNSPEC nil Unspecified protocol, any supported address family
-AF_INET nil IPv4 protocol
-PF_INET nil IPv4 protocol
-AF_INET6 nil IPv6 protocol
-PF_INET6 nil IPv6 protocol
-AF_UNIX nil UNIX sockets
-PF_UNIX nil UNIX sockets
-AF_AX25 nil AX.25 protocol
-PF_AX25 nil AX.25 protocol
-AF_IPX nil IPX protocol
-PF_IPX nil IPX protocol
-AF_APPLETALK nil AppleTalk protocol
-PF_APPLETALK nil AppleTalk protocol
-AF_LOCAL nil Host-internal protocols
-PF_LOCAL nil Host-internal protocols
-AF_IMPLINK nil ARPANET IMP protocol
-PF_IMPLINK nil ARPANET IMP protocol
-AF_PUP nil PARC Universal Packet protocol
-PF_PUP nil PARC Universal Packet protocol
-AF_CHAOS nil MIT CHAOS protocols
-PF_CHAOS nil MIT CHAOS protocols
-AF_NS nil XEROX NS protocols
-PF_NS nil XEROX NS protocols
-AF_ISO nil ISO Open Systems Interconnection protocols
-PF_ISO nil ISO Open Systems Interconnection protocols
-AF_OSI nil ISO Open Systems Interconnection protocols
-PF_OSI nil ISO Open Systems Interconnection protocols
-AF_ECMA nil European Computer Manufacturers protocols
-PF_ECMA nil European Computer Manufacturers protocols
-AF_DATAKIT nil Datakit protocol
-PF_DATAKIT nil Datakit protocol
-AF_CCITT nil CCITT (now ITU-T) protocols
-PF_CCITT nil CCITT (now ITU-T) protocols
-AF_SNA nil IBM SNA protocol
-PF_SNA nil IBM SNA protocol
-AF_DEC nil DECnet protocol
-PF_DEC nil DECnet protocol
-AF_DLI nil DEC Direct Data Link Interface protocol
-PF_DLI nil DEC Direct Data Link Interface protocol
-AF_LAT nil Local Area Transport protocol
-PF_LAT nil Local Area Transport protocol
-AF_HYLINK nil NSC Hyperchannel protocol
-PF_HYLINK nil NSC Hyperchannel protocol
-AF_ROUTE nil Internal routing protocol
-PF_ROUTE nil Internal routing protocol
-AF_LINK nil Link layer interface
-PF_LINK nil Link layer interface
-AF_COIP nil Connection-oriented IP
-PF_COIP nil Connection-oriented IP
-AF_CNT nil Computer Network Technology
-PF_CNT nil Computer Network Technology
-AF_SIP nil Simple Internet Protocol
-PF_SIP nil Simple Internet Protocol
-AF_NDRV nil Network driver raw access
-PF_NDRV nil Network driver raw access
-AF_ISDN nil Integrated Services Digital Network
-PF_ISDN nil Integrated Services Digital Network
-AF_NATM nil Native ATM access
-PF_NATM nil Native ATM access
+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 nil NetBIOS
-PF_NETBIOS nil NetBIOS
-AF_PPP nil Point-to-Point Protocol
-PF_PPP nil Point-to-Point Protocol
-AF_ATM nil Asynchronous Transfer Mode
-PF_ATM nil Asynchronous Transfer Mode
-AF_NETGRAPH nil Netgraph sockets
-PF_NETGRAPH nil Netgraph sockets
-AF_MAX nil Maximum address family for this platform
-PF_MAX nil Maximum address family for this platform
-AF_PACKET nil Direct link-layer access
-PF_PACKET nil Direct link-layer access
-
-AF_E164 nil CCITT (ITU-T) E.164 recommendation
-PF_XTP nil eXpress Transfer Protocol
+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 nil Process out-of-band data
-MSG_PEEK nil Peek at incoming message
-MSG_DONTROUTE nil Send without using the routing tables
-MSG_EOR nil Data completes record
-MSG_TRUNC nil Data discarded before delivery
-MSG_CTRUNC nil Control data lost before delivery
-MSG_WAITALL nil Wait for full request or error
-MSG_DONTWAIT nil This message should be non-blocking
-MSG_EOF nil Data completes connection
-MSG_FLUSH nil Start of a hold sequence. Dumps to so_temp
-MSG_HOLD nil Hold fragment in so_temp
-MSG_SEND nil Send the packet in so_temp
-MSG_HAVEMORE nil Data ready to be read
-MSG_RCVMORE nil Data remains in the current packet
-MSG_COMPAT nil End of record
-MSG_PROXY nil Wait for full request
+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 nil Confirm path validity
+MSG_CONFIRM
MSG_RST
-MSG_ERRQUEUE nil Fetch message from error queue
-MSG_NOSIGNAL nil Do not generate SIGPIPE
-MSG_MORE nil Sender will send more
-
-SOL_SOCKET nil Socket-level options
-SOL_IP nil IP socket options
-SOL_IPX nil IPX socket options
-SOL_AX25 nil AX.25 socket options
-SOL_ATALK nil AppleTalk socket options
-SOL_TCP nil TCP socket options
-SOL_UDP nil UDP socket options
-
-IPPROTO_IP 0 Dummy protocol for IP
-IPPROTO_ICMP 1 Control message protocol
-IPPROTO_IGMP nil Group Management Protocol
-IPPROTO_GGP nil Gateway to Gateway Protocol
-IPPROTO_TCP 6 TCP
-IPPROTO_EGP nil Exterior Gateway Protocol
-IPPROTO_PUP nil PARC Universal Packet protocol
-IPPROTO_UDP 17 UDP
-IPPROTO_IDP nil XNS IDP
-IPPROTO_HELLO nil "hello" routing protocol
-IPPROTO_ND nil Sun net disk protocol
-IPPROTO_TP nil ISO transport protocol class 4
-IPPROTO_XTP nil Xpress Transport Protocol
-IPPROTO_EON nil ISO cnlp
+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 nil IP6 auth header
-IPPROTO_DSTOPTS nil IP6 destination option
-IPPROTO_ESP nil IP6 Encapsulated Security Payload
-IPPROTO_FRAGMENT nil IP6 fragmentation header
-IPPROTO_HOPOPTS nil IP6 hop-by-hop options
-IPPROTO_ICMPV6 nil ICMP6
-IPPROTO_IPV6 nil IP6 header
-IPPROTO_NONE nil IP6 no next header
-IPPROTO_ROUTING nil IP6 routing header
-
-IPPROTO_RAW 255 Raw IP packet
-IPPROTO_MAX nil Maximum IPPROTO constant
+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 Default minimum address for bind or connect
-IPPORT_USERRESERVED 5000 Default maximum address for bind or connect
+IPPORT_RESERVED 1024
+IPPORT_USERRESERVED 5000
# Some reserved IP v.4 addresses
-INADDR_ANY 0x00000000 A socket bound to INADDR_ANY receives packets from all interfaces and sends from the default IP address
-INADDR_BROADCAST 0xffffffff The network broadcast address
-INADDR_LOOPBACK 0x7F000001 The loopback address
-INADDR_UNSPEC_GROUP 0xe0000000 The reserved multicast group
-INADDR_ALLHOSTS_GROUP 0xe0000001 Multicast group for all systems on this subset
-INADDR_MAX_LOCAL_GROUP 0xe00000ff The last local network multicast group
-INADDR_NONE 0xffffffff A bitmask for matching no valid IP address
+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 nil IP options to be included in packets
-IP_HDRINCL nil Header is included with data
-IP_TOS nil IP type-of-service
-IP_TTL nil IP time-to-live
-IP_RECVOPTS nil Receive all IP options with datagram
-IP_RECVRETOPTS nil Receive all IP options for response
-IP_RECVDSTADDR nil Receive IP destination address with datagram
-IP_RETOPTS nil IP options to be included in datagrams
-IP_MINTTL nil Minimum TTL allowed for received packets
-IP_DONTFRAG nil Don't fragment packets
-IP_SENDSRCADDR nil Source address for outgoing UDP datagrams
-IP_ONESBCAST nil Force outgoing broadcast datagrams to have the undirected broadcast address
-IP_RECVTTL nil Receive IP TTL with datagrams
-IP_RECVIF nil Receive interface information with datagrams
-IP_RECVSLLA nil Receive link-layer address with datagrams
-IP_PORTRANGE nil Set the port range for sockets with unspecified port numbers
-IP_MULTICAST_IF nil IP multicast interface
-IP_MULTICAST_TTL nil IP multicast TTL
-IP_MULTICAST_LOOP nil IP multicast loopback
-IP_ADD_MEMBERSHIP nil Add a multicast group membership
-IP_DROP_MEMBERSHIP nil Drop a multicast group membership
-IP_DEFAULT_MULTICAST_TTL nil Default multicast TTL
-IP_DEFAULT_MULTICAST_LOOP nil Default multicast loopback
-IP_MAX_MEMBERSHIPS nil Maximum number multicast groups a socket can join
-IP_ROUTER_ALERT nil Notify transit routers to more closely examine the contents of an IP packet
-IP_PKTINFO nil Receive packet information with datagrams
-IP_PKTOPTIONS nil Receive packet options with datagrams
-IP_MTU_DISCOVER nil Path MTU discovery
-IP_RECVERR nil Enable extended reliable error message passing
-IP_RECVTOS nil Receive TOS with incoming packets
-IP_MTU nil The Maximum Transmission Unit of the socket
-IP_FREEBIND nil Allow binding to nonexistent IP addresses
-IP_IPSEC_POLICY nil IPsec security policy
+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 nil Retrieve security context with datagram
-IP_PMTUDISC_DONT nil Never send DF frames
-IP_PMTUDISC_WANT nil Use per-route hints
-IP_PMTUDISC_DO nil Always send DF frames
-IP_UNBLOCK_SOURCE nil Unblock IPv4 multicast packets with a give source address
-IP_BLOCK_SOURCE nil Block IPv4 multicast packets with a give source address
-IP_ADD_SOURCE_MEMBERSHIP nil Add a multicast group membership
-IP_DROP_SOURCE_MEMBERSHIP nil Drop a multicast group membership
-IP_MSFILTER nil Multicast source filtering
-
-MCAST_JOIN_GROUP nil Join a multicast group
-MCAST_BLOCK_SOURCE nil Block multicast packets from this source
-MCAST_UNBLOCK_SOURCE nil Unblock multicast packets from this source
-MCAST_LEAVE_GROUP nil Leave a multicast group
-MCAST_JOIN_SOURCE_GROUP nil Join a multicast source group
-MCAST_LEAVE_SOURCE_GROUP nil Leave a multicast source group
-MCAST_MSFILTER nil Multicast source filtering
-MCAST_EXCLUDE nil Exclusive multicast source filter
-MCAST_INCLUDE nil Inclusive multicast source filter
-
-SO_DEBUG nil Debug info recording
-SO_REUSEADDR nil Allow local address reuse
-SO_REUSEPORT nil Allow local address and port reuse
-SO_TYPE nil Get the socket type
-SO_ERROR nil Get and clear the error status
-SO_DONTROUTE nil Use interface addresses
-SO_BROADCAST nil Permit sending of broadcast messages
-SO_SNDBUF nil Send buffer size
-SO_RCVBUF nil Receive buffer size
-SO_KEEPALIVE nil Keep connections alive
-SO_OOBINLINE nil Leave received out-of-band data in-line
-SO_NO_CHECK nil Disable checksums
-SO_PRIORITY nil The protocol-defined priority for all packets on this socket
-SO_LINGER nil Linger on close if data is present
-SO_PASSCRED nil Receive SCM_CREDENTIALS messages
-SO_PEERCRED nil The credentials of the foreign process connected to this socket
-SO_RCVLOWAT nil Receive low-water mark
-SO_SNDLOWAT nil Send low-water mark
-SO_RCVTIMEO nil Receive timeout
-SO_SNDTIMEO nil Send timeout
-SO_ACCEPTCONN nil Socket has had listen() called on it
-SO_USELOOPBACK nil Bypass hardware when possible
-SO_ACCEPTFILTER nil There is an accept filter
-SO_DONTTRUNC nil Retain unread data
-SO_WANTMORE nil Give a hint when more data is ready
-SO_WANTOOBFLAG nil OOB data is wanted in MSG_FLAG on receive
-SO_NREAD nil Get first packet byte count
-SO_NKE nil Install socket-level Network Kernel Extension
-SO_NOSIGPIPE nil Don't SIGPIPE on EPIPE
+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 nil Only send packets from the given interface
-SO_ATTACH_FILTER nil Attach an accept filter
-SO_DETACH_FILTER nil Detach an accept filter
-SO_PEERNAME nil Name of the connecting user
-SO_TIMESTAMP nil Receive timestamp with datagrams (timeval)
-SO_TIMESTAMPNS nil Receive nanosecond timestamp with datagrams (timespec)
-SO_BINTIME nil Receive timestamp with datagrams (bintime)
-SO_RECVUCRED nil Receive user credentials with datagram
-SO_MAC_EXEMPT nil Mandatory Access Control exemption for unlabeled peers
-SO_ALLZONES nil Bypass zone boundaries
-
-SOPRI_INTERACTIVE nil Interactive socket priority
-SOPRI_NORMAL nil Normal socket priority
-SOPRI_BACKGROUND nil Background socket priority
+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 nil Don't delay sending to coalesce packets
-TCP_MAXSEG nil Set maximum segment size
-TCP_CORK nil Don't send partial frames
-TCP_DEFER_ACCEPT nil Don't notify a listening socket until data is ready
-TCP_INFO nil Retrieve information about this socket
-TCP_KEEPCNT nil Maximum number of keepalive probes allowed before dropping a connection
-TCP_KEEPIDLE nil Idle time before keepalive probes are sent
-TCP_KEEPINTVL nil Time between keepalive probes
-TCP_LINGER2 nil Lifetime of orphaned FIN_WAIT2 sockets
-TCP_MD5SIG nil Use MD5 digests (RFC2385)
-TCP_NOOPT nil Don't use TCP options
-TCP_NOPUSH nil Don't push the last block of write
-TCP_QUICKACK nil Enable quickack mode
-TCP_SYNCNT nil Number of SYN retransmits before a connection is dropped
-TCP_WINDOW_CLAMP nil Clamp the size of the advertised window
-
-UDP_CORK nil Don't send partial frames
-
-EAI_ADDRFAMILY nil Address family for hostname not supported
-EAI_AGAIN nil Temporary failure in name resolution
-EAI_BADFLAGS nil Invalid flags
-EAI_FAIL nil Non-recoverable failure in name resolution
-EAI_FAMILY nil Address family not supported
-EAI_MEMORY nil Memory allocation failure
-EAI_NODATA nil No address associated with hostname
-EAI_NONAME nil Hostname nor servname, or not known
-EAI_OVERFLOW nil Argument buffer overflow
-EAI_SERVICE nil Servname not supported for socket type
-EAI_SOCKTYPE nil Socket type not supported
-EAI_SYSTEM nil System error returned in errno
-EAI_BADHINTS nil Invalid value for hints
-EAI_PROTOCOL nil Resolved protocol is unknown
-EAI_MAX nil Maximum error code from getaddrinfo
-
-AI_PASSIVE nil Get address to use with bind()
-AI_CANONNAME nil Fill in the canonical name
-AI_NUMERICHOST nil Prevent host name resolution
-AI_NUMERICSERV nil Prevent service name resolution
-AI_MASK nil Valid flag mask for getaddrinfo (not for application use)
-AI_ALL nil Allow all addresses
-AI_V4MAPPED_CFG nil Accept IPv4 mapped addresses if the kernel supports it
-AI_ADDRCONFIG nil Accept only if any address is assigned
-AI_V4MAPPED nil Accept IPv4-mapped IPv6 addresses
-AI_DEFAULT nil Default flags for getaddrinfo
-
-NI_MAXHOST nil Maximum length of a hostname
-NI_MAXSERV nil Maximum length of a service name
-NI_NOFQDN nil An FQDN is not required for local hosts, return only the local part
-NI_NUMERICHOST nil Return a numeric address
-NI_NAMEREQD nil A name is required
-NI_NUMERICSERV nil Return the service name as a digit string
-NI_DGRAM nil The service specified is a datagram service (looks up UDP ports)
-
-SHUT_RD 0 Shut down the reading side of the socket
-SHUT_WR 1 Shut down the writing side of the socket
-SHUT_RDWR 2 Shut down the both sides of the socket
-
-IPV6_JOIN_GROUP nil Join a group membership
-IPV6_LEAVE_GROUP nil Leave a group membership
-IPV6_MULTICAST_HOPS nil IP6 multicast hops
-IPV6_MULTICAST_IF nil IP6 multicast interface
-IPV6_MULTICAST_LOOP nil IP6 multicast loopback
-IPV6_UNICAST_HOPS nil IP6 unicast hops
-IPV6_V6ONLY nil Only bind IPv6 with a wildcard bind
-IPV6_CHECKSUM nil Checksum offset for raw sockets
-IPV6_DONTFRAG nil Don't fragment packets
-IPV6_DSTOPTS nil Destination option
-IPV6_HOPLIMIT nil Hop limit
-IPV6_HOPOPTS nil Hop-by-hop option
-IPV6_NEXTHOP nil Next hop address
-IPV6_PATHMTU nil Retrieve current path MTU
-IPV6_PKTINFO nil Receive packet information with datagram
-IPV6_RECVDSTOPTS nil Receive all IP6 options for response
-IPV6_RECVHOPLIMIT nil Receive hop limit with datagram
-IPV6_RECVHOPOPTS nil Receive hop-by-hop options
-IPV6_RECVPKTINFO nil Receive destination IP address and incoming interface
-IPV6_RECVRTHDR nil Receive routing header
-IPV6_RECVTCLASS nil Receive traffic class
-IPV6_RTHDR nil Allows removal of sticky routing headers
-IPV6_RTHDRDSTOPTS nil Allows removal of sticky destination options header
-IPV6_RTHDR_TYPE_0 nil Routing header type 0
-IPV6_RECVPATHMTU nil Receive current path MTU with datagram
-IPV6_TCLASS nil Specify the traffic class
-IPV6_USE_MIN_MTU nil Use the minimum MTU size
-
-INET_ADDRSTRLEN 16 Maximum length of an IPv4 address string
-INET6_ADDRSTRLEN 46 Maximum length of an IPv6 address string
-IFNAMSIZ nil Maximum interface name size
-IF_NAMESIZE nil Maximum interface name size
-
-SOMAXCONN 5 Maximum connection requests that may be queued for a socket
-
-SCM_RIGHTS nil Access rights
-SCM_TIMESTAMP nil Timestamp (timeval)
-SCM_TIMESTAMPNS nil Timespec (timespec)
-SCM_BINTIME nil Timestamp (bintime)
-SCM_CREDENTIALS nil The sender's credentials
-SCM_CREDS nil Process credentials
-SCM_UCRED nil User credentials
-
-LOCAL_PEERCRED nil Retrieve peer credentials
-LOCAL_CREDS nil Pass credentials to receiver
-LOCAL_CONNWAIT nil Connect blocks until accepted
+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
index e3e59cf0c5..63bffb9f68 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -61,7 +61,8 @@ sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALU
VALUE
rsock_sockopt_new(int family, int level, int optname, VALUE data)
{
- NEWOBJ_OF(obj, struct RObject, rb_cSockOpt, T_OBJECT);
+ 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;
@@ -323,7 +324,7 @@ inspect_errno(int level, int optname, VALUE data, VALUE ret)
}
}
-#if defined(IPV6_MULTICAST_LOOP)
+#if defined(IPV6_MULTICAST_IF) || defined(IPV6_MULTICAST_LOOP)
static int
inspect_uint(int level, int optname, VALUE data, VALUE ret)
{
@@ -395,224 +396,13 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
}
}
-/*
- * socket option for IPv4 multicast is bit confusing.
- *
- * IP Multicast is implemented by Steve Deering at first:
- * IP Multicast Extensions for 4.3BSD UNIX and related systems
- * (MULTICAST 1.2 Release)
- * http://www.kohala.com/start/mcast.api.txt
- *
- * There are 3 socket options which takes a struct.
- *
- * IP_MULTICAST_IF: struct in_addr
- * IP_ADD_MEMBERSHIP: struct ip_mreq
- * IP_DROP_MEMBERSHIP: struct ip_mreq
- *
- * But they uses an IP address to specify an interface.
- * This means the API cannot specify an unnumbered interface.
- *
- * Linux 2.4 introduces struct ip_mreqn to fix this problem.
- * struct ip_mreqn has imr_ifindex field to specify interface index.
- *
- * IP_MULTICAST_IF: struct ip_mreqn
- * IP_ADD_MEMBERSHIP: struct ip_mreqn
- * IP_DROP_MEMBERSHIP: struct ip_mreqn
- *
- * FreeBSD 7 obtained struct ip_mreqn for IP_MULTICAST_IF.
- * http://www.FreeBSD.org/cgi/cvsweb.cgi/src/sys/netinet/in.h.diff?r1=1.99;r2=1.100
- *
- * Another hackish workaround is "RFC 1724 hack".
- * RFC 1724 section 3.3 suggests unnumbered interfaces
- * specified by pseudo address 0.0.0.0/8.
- * NetBSD 4 and FreeBSD 5 documented it.
- * http://cvsweb.netbsd.org/cgi-bin/cvsweb.cgi/src/share/man/man4/ip.4.diff?r1=1.16&r2=1.17
- * http://www.FreeBSD.org/cgi/cvsweb.cgi/src/share/man/man4/ip.4.diff?r1=1.37;r2=1.38
- * FreeBSD 7.0 removed it.
- * http://www.FreeBSD.org/cgi/cvsweb.cgi/src/share/man/man4/ip.4.diff?r1=1.49;r2=1.50
- *
- * RFC 1724 hack is not supported by Socket::Option#inspect because
- * it is not distinguishable by the size.
- */
-
-#ifndef HAVE_INET_NTOP
-static const char *
-inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
-{
-#ifdef HAVE_INET_NTOA
- struct in_addr in;
- memcpy(&in.s_addr, addr, sizeof(in.s_addr));
- snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
-#else
- unsigned long x = ntohl(*(unsigned long*)addr);
- snprintf(numaddr, numaddr_len, "%d.%d.%d.%d",
- (int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
- (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
-#endif
- return numaddr;
-}
-#elif defined __MINGW64__
-# define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l)
-#endif
-
-/* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295". */
-static int
-rb_if_indextoname(const char *succ_prefix, const char *fail_prefix, unsigned int ifindex, char *buf, size_t len)
-{
-#if defined(HAVE_IF_INDEXTONAME)
- char ifbuf[IFNAMSIZ];
- if (if_indextoname(ifindex, ifbuf) == NULL)
- return snprintf(buf, len, "%s%u", fail_prefix, ifindex);
- else
- return snprintf(buf, len, "%s%s", succ_prefix, ifbuf);
-#else
-# ifndef IFNAMSIZ
-# define IFNAMSIZ (sizeof(unsigned int)*3+1)
-# endif
- return snprintf(buf, len, "%s%u", fail_prefix, ifindex);
-#endif
-}
-
-#if defined(IPPROTO_IP) && defined(HAVE_TYPE_STRUCT_IP_MREQ) /* 4.4BSD, GNU/Linux */
-static int
-inspect_ipv4_mreq(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct ip_mreq)) {
- struct ip_mreq s;
- char addrbuf[INET_ADDRSTRLEN];
- memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
- if (inet_ntop(AF_INET, &s.imr_multiaddr, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- if (inet_ntop(AF_INET, &s.imr_interface, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
- rb_str_catf(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(IPPROTO_IP) && defined(HAVE_TYPE_STRUCT_IP_MREQN) /* GNU/Linux, FreeBSD 7 */
-static int
-inspect_ipv4_mreqn(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct ip_mreqn)) {
- struct ip_mreqn s;
- char addrbuf[INET_ADDRSTRLEN], ifbuf[32+IFNAMSIZ];
- memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
- if (inet_ntop(AF_INET, &s.imr_multiaddr, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- if (inet_ntop(AF_INET, &s.imr_address, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
- rb_str_catf(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- rb_if_indextoname(" ", " ifindex:", s.imr_ifindex, ifbuf, sizeof(ifbuf));
- rb_str_cat2(ret, ifbuf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(IPPROTO_IP) && defined(HAVE_TYPE_STRUCT_IP_MREQ) /* 4.4BSD, GNU/Linux */
-static int
-inspect_ipv4_add_drop_membership(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct ip_mreq))
- return inspect_ipv4_mreq(level, optname, data, ret);
-# if defined(HAVE_TYPE_STRUCT_IP_MREQN)
- else if (RSTRING_LEN(data) == sizeof(struct ip_mreqn))
- return inspect_ipv4_mreqn(level, optname, data, ret);
-# endif
- else
- return 0;
-}
-#endif
-
-#if defined(IPPROTO_IP) && defined(IP_MULTICAST_IF) && defined(HAVE_TYPE_STRUCT_IP_MREQN) /* 4.4BSD, GNU/Linux */
-static int
-inspect_ipv4_multicast_if(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct in_addr)) {
- struct in_addr s;
- char addrbuf[INET_ADDRSTRLEN];
- memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
- if (inet_ntop(AF_INET, &s, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- return 1;
- }
- else if (RSTRING_LEN(data) == sizeof(struct ip_mreqn)) {
- return inspect_ipv4_mreqn(level, optname, data, ret);
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(IPV6_MULTICAST_IF) /* POSIX, RFC 3493 */
-static int
-inspect_ipv6_multicast_if(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(int)) {
- char ifbuf[32+IFNAMSIZ];
- unsigned int ifindex;
- memcpy((char*)&ifindex, RSTRING_PTR(data), sizeof(unsigned int));
- rb_if_indextoname(" ", " ", ifindex, ifbuf, sizeof(ifbuf));
- rb_str_cat2(ret, ifbuf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(IPPROTO_IPV6) && defined(HAVE_TYPE_STRUCT_IPV6_MREQ) /* POSIX, RFC 3493 */
-static int
-inspect_ipv6_mreq(int level, int optname, VALUE data, VALUE ret)
-{
- if (RSTRING_LEN(data) == sizeof(struct ipv6_mreq)) {
- struct ipv6_mreq s;
- char addrbuf[INET6_ADDRSTRLEN], ifbuf[32+IFNAMSIZ];
- memcpy((char*)&s, RSTRING_PTR(data), sizeof(s));
- if (inet_ntop(AF_INET6, &s.ipv6mr_multiaddr, addrbuf, (socklen_t)sizeof(addrbuf)) == NULL)
- rb_str_cat2(ret, " invalid-address");
- else
- rb_str_catf(ret, " %s", addrbuf);
- rb_if_indextoname(" ", " interface:", s.ipv6mr_interface, ifbuf, sizeof(ifbuf));
- rb_str_cat2(ret, ifbuf);
- return 1;
- }
- else {
- return 0;
- }
-}
-#endif
-
-#if defined(SOL_SOCKET) && defined(SO_PEERCRED) /* GNU/Linux, OpenBSD */
-#if defined(__OpenBSD__)
-#define RUBY_SOCK_PEERCRED struct sockpeercred
-#else
-#define RUBY_SOCK_PEERCRED struct ucred
-#endif
+#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(RUBY_SOCK_PEERCRED)) {
- RUBY_SOCK_PEERCRED cred;
- memcpy(&cred, RSTRING_PTR(data), sizeof(RUBY_SOCK_PEERCRED));
+ 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)");
@@ -779,7 +569,7 @@ sockopt_inspect(VALUE self)
# 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, OpenBSD */
+# if defined(SO_PEERCRED) /* GNU/Linux */
case SO_PEERCRED: inspected = inspect_peercred(level, optname, data, ret); break;
# endif
}
@@ -792,40 +582,19 @@ sockopt_inspect(VALUE self)
case AF_INET6:
#endif
switch (level) {
-# if defined(IPPROTO_IP)
- case IPPROTO_IP:
- switch (optname) {
-# if defined(IP_MULTICAST_IF) && defined(HAVE_TYPE_STRUCT_IP_MREQN) /* 4.4BSD, GNU/Linux */
- case IP_MULTICAST_IF: inspected = inspect_ipv4_multicast_if(level, optname, data, ret); break;
-# endif
-# if defined(IP_ADD_MEMBERSHIP) /* 4.4BSD, GNU/Linux */
- case IP_ADD_MEMBERSHIP: inspected = inspect_ipv4_add_drop_membership(level, optname, data, ret); break;
-# endif
-# if defined(IP_DROP_MEMBERSHIP) /* 4.4BSD, GNU/Linux */
- case IP_DROP_MEMBERSHIP: inspected = inspect_ipv4_add_drop_membership(level, optname, data, ret); break;
-# endif
- }
- break;
-# endif
-
# 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_ipv6_multicast_if(level, optname, data, ret); break;
+ 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_JOIN_GROUP) /* POSIX */
- case IPV6_JOIN_GROUP: inspected = inspect_ipv6_mreq(level, optname, data, ret); break;
-# endif
-# if defined(IPV6_LEAVE_GROUP) /* POSIX */
- case IPV6_LEAVE_GROUP: inspected = inspect_ipv6_mreq(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
@@ -889,17 +658,16 @@ sockopt_unpack(VALUE self, VALUE template)
return rb_funcall(sockopt_data(self), rb_intern("unpack"), 1, template);
}
+/*
+ * Document-class: ::Socket::Option
+ *
+ * Socket::Option represents a socket option used by getsockopt and setsockopt
+ * system call.
+ * It contains socket family, protocol level, option name and option value.
+ */
void
rsock_init_sockopt(void)
{
- /*
- * Document-class: Socket::Option
- *
- * Socket::Option represents a socket option used by
- * BasicSocket#getsockopt and BasicSocket#setsockopt. A socket option
- * contains the socket #family, protocol #level, option name #optname and
- * option value #data.
- */
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);
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index afe5b6da34..65b2b63927 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -1,6 +1,6 @@
/************************************************
- raddrinfo.c -
+ ainfo.c -
created at: Thu Mar 31 12:21:29 JST 1994
@@ -56,7 +56,7 @@ ruby_getaddrinfo(const char *nodename, const char *servname,
#if defined(_AIX)
static int
ruby_getaddrinfo__aix(const char *nodename, const char *servname,
- const struct addrinfo *hints, struct addrinfo **res)
+ struct addrinfo *hints, struct addrinfo **res)
{
int error = getaddrinfo(nodename, servname, hints, res);
struct addrinfo *r;
@@ -100,15 +100,13 @@ ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen,
static int str_is_number(const char *);
#if defined(__APPLE__)
+/* fix [ruby-core:29427] */
static int
ruby_getaddrinfo__darwin(const char *nodename, const char *servname,
- const struct addrinfo *hints, struct addrinfo **res)
+ struct addrinfo *hints, struct addrinfo **res)
{
- /* fix [ruby-core:29427] */
const char *tmp_servname;
struct addrinfo tmp_hints;
- int error;
-
tmp_servname = servname;
MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
if (nodename && servname) {
@@ -119,26 +117,7 @@ ruby_getaddrinfo__darwin(const char *nodename, const char *servname,
#endif
}
}
-
- error = getaddrinfo(nodename, tmp_servname, &tmp_hints, res);
- if (error == 0) {
- /* [ruby-dev:23164] */
- 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;
- }
- }
-
+ int error = getaddrinfo(nodename, tmp_servname, &tmp_hints, res);
return error;
}
#undef getaddrinfo
@@ -154,20 +133,12 @@ struct getaddrinfo_arg
struct addrinfo **res;
};
-static void *
+static VALUE
nogvl_getaddrinfo(void *arg)
{
- int ret;
struct getaddrinfo_arg *ptr = arg;
- ret = getaddrinfo(ptr->node, ptr->service, ptr->hints, ptr->res);
-#ifdef __linux__
- /* On Linux (mainly Ubuntu 13.04) /etc/nsswitch.conf has mdns4 and
- * it cause getaddrinfo to return EAI_SYSTEM/ENOENT. [ruby-list:49420]
- */
- if (ret == EAI_SYSTEM && errno == ENOENT)
- ret = EAI_NONAME;
-#endif
- return (void *)(VALUE)ret;
+ return getaddrinfo(ptr->node, ptr->service,
+ ptr->hints, ptr->res);
}
#endif
@@ -186,7 +157,7 @@ rb_getaddrinfo(const char *node, const char *service,
arg.service = service;
arg.hints = hints;
arg.res = res;
- ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getaddrinfo, &arg, RUBY_UBF_IO, 0);
+ ret = (int)BLOCKING_REGION(nogvl_getaddrinfo, &arg);
return ret;
#endif
}
@@ -203,14 +174,14 @@ struct getnameinfo_arg
int flags;
};
-static void *
+static VALUE
nogvl_getnameinfo(void *arg)
{
struct getnameinfo_arg *ptr = arg;
- return (void *)(VALUE)getnameinfo(ptr->sa, ptr->salen,
- ptr->host, (socklen_t)ptr->hostlen,
- ptr->serv, (socklen_t)ptr->servlen,
- ptr->flags);
+ return getnameinfo(ptr->sa, ptr->salen,
+ ptr->host, (socklen_t)ptr->hostlen,
+ ptr->serv, (socklen_t)ptr->servlen,
+ ptr->flags);
}
#endif
@@ -231,33 +202,33 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
arg.serv = serv;
arg.servlen = servlen;
arg.flags = flags;
- ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getnameinfo, &arg, RUBY_UBF_IO, 0);
+ ret = (int)BLOCKING_REGION(nogvl_getnameinfo, &arg);
return ret;
#endif
}
static void
-make_ipaddr0(struct sockaddr *addr, socklen_t addrlen, char *buf, size_t buflen)
+make_ipaddr0(struct sockaddr *addr, char *buf, size_t len)
{
int error;
- error = rb_getnameinfo(addr, addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST);
+ 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, socklen_t addrlen)
+rsock_make_ipaddr(struct sockaddr *addr)
{
char hbuf[1024];
- make_ipaddr0(addr, addrlen, hbuf, sizeof(hbuf));
+ make_ipaddr0(addr, hbuf, sizeof(hbuf));
return rb_str_new2(hbuf);
}
static void
-make_inetaddr(unsigned int host, char *buf, size_t buflen)
+make_inetaddr(unsigned int host, char *buf, size_t len)
{
struct sockaddr_in sin;
@@ -265,7 +236,7 @@ make_inetaddr(unsigned int host, char *buf, size_t buflen)
sin.sin_family = AF_INET;
SET_SIN_LEN(&sin, sizeof(sin));
sin.sin_addr.s_addr = host;
- make_ipaddr0((struct sockaddr*)&sin, sizeof(sin), buf, buflen);
+ make_ipaddr0((struct sockaddr*)&sin, buf, len);
}
static int
@@ -284,7 +255,7 @@ str_is_number(const char *p)
}
static char*
-host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
+host_str(VALUE host, char *hbuf, size_t len, int *flags_ptr)
{
if (NIL_P(host)) {
return NULL;
@@ -292,7 +263,7 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
else if (rb_obj_is_kind_of(host, rb_cInteger)) {
unsigned int i = NUM2UINT(host);
- make_inetaddr(htonl(i), hbuf, hbuflen);
+ make_inetaddr(htonl(i), hbuf, len);
if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
return hbuf;
}
@@ -302,14 +273,14 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
SafeStringValue(host);
name = RSTRING_PTR(host);
if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
- make_inetaddr(INADDR_ANY, hbuf, hbuflen);
+ 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, hbuflen);
+ make_inetaddr(INADDR_BROADCAST, hbuf, len);
if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
}
- else if (strlen(name) >= hbuflen) {
+ else if (strlen(name) >= len) {
rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
strlen(name));
}
@@ -321,13 +292,13 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
}
static char*
-port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
+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, pbuflen, "%ld", FIX2LONG(port));
+ snprintf(pbuf, len, "%ld", FIX2LONG(port));
#ifdef AI_NUMERICSERV
if (flags_ptr) *flags_ptr |= AI_NUMERICSERV;
#endif
@@ -338,7 +309,7 @@ port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
SafeStringValue(port);
serv = RSTRING_PTR(port);
- if (strlen(serv) >= pbuflen) {
+ if (strlen(serv) >= len) {
rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
strlen(serv));
}
@@ -372,6 +343,25 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
rsock_raise_socket_error("getaddrinfo", error);
}
+#if defined(__APPLE__) && defined(__MACH__)
+ /* [ruby-dev:23164] */
+ {
+ 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;
}
@@ -388,7 +378,7 @@ rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
}
VALUE
-rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
+rsock_ipaddr(struct sockaddr *sockaddr, int norevlookup)
{
VALUE family, port, addr1, addr2;
VALUE ary;
@@ -407,13 +397,13 @@ rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
addr1 = Qnil;
if (!norevlookup) {
- error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(hbuf),
+ error = rb_getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
NULL, 0, 0);
if (! error) {
addr1 = rb_str_new2(hbuf);
}
}
- error = rb_getnameinfo(sockaddr, sockaddrlen, hbuf, sizeof(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);
@@ -429,46 +419,20 @@ rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup)
}
#ifdef HAVE_SYS_UN_H
-VALUE
-rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len)
+const char*
+rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len)
{
- char *s, *e;
- s = sockaddr->sun_path;
- e = (char *)sockaddr + len;
- while (s < e && *(e-1) == '\0')
- e--;
- if (s <= e)
- return rb_str_new(s, e-s);
+ if (sockaddr->sun_path < (char*)sockaddr + len)
+ return sockaddr->sun_path;
else
- return rb_str_new2("");
+ return "";
}
VALUE
rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len)
{
return rb_assoc_new(rb_str_new2("AF_UNIX"),
- rsock_unixpath_str(sockaddr, len));
-}
-
-socklen_t
-rsock_unix_sockaddr_len(VALUE path)
-{
-#ifdef __linux__
- if (RSTRING_LEN(path) == 0) {
- /* autobind; see unix(7) for details. */
- return (socklen_t) sizeof(sa_family_t);
- }
- else if (RSTRING_PTR(path)[0] == '\0') {
- /* abstract namespace; see unix(7) for details. */
- return (socklen_t) offsetof(struct sockaddr_un, sun_path) +
- RSTRING_LEN(path);
- }
- else {
-#endif
- return (socklen_t) sizeof(struct sockaddr_un);
-#ifdef __linux__
- }
-#endif
+ rb_str_new2(rsock_unixpath(sockaddr, len)));
}
#endif
@@ -501,8 +465,7 @@ make_hostent_internal(struct hostent_arg *arg)
}
rb_ary_push(ary, rb_str_new2(hostp));
- if (addr->ai_canonname && strlen(addr->ai_canonname) < NI_MAXHOST &&
- (h = gethostbyname(addr->ai_canonname))) {
+ 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++) {
@@ -571,7 +534,7 @@ addrinfo_memsize(const void *ptr)
static const rb_data_type_t addrinfo_type = {
"socket/addrinfo",
- {addrinfo_mark, addrinfo_free, addrinfo_memsize,},
+ addrinfo_mark, addrinfo_free, addrinfo_memsize,
};
static VALUE
@@ -580,7 +543,7 @@ addrinfo_s_allocate(VALUE klass)
return TypedData_Wrap_Struct(klass, &addrinfo_type, 0);
}
-#define IS_ADDRINFO(obj) rb_typeddata_is_kind_of((obj), &addrinfo_type)
+#define IS_ADDRINFO(obj) rb_typeddata_is_kind_of(obj, &addrinfo_type)
static inline rb_addrinfo_t *
check_addrinfo(VALUE self)
{
@@ -614,7 +577,7 @@ init_addrinfo(rb_addrinfo_t *rai, struct sockaddr *sa, socklen_t len,
int pfamily, int socktype, int protocol,
VALUE canonname, VALUE inspectname)
{
- if ((socklen_t)sizeof(rai->addr) < len)
+ if (sizeof(rai->addr) < len)
rb_raise(rb_eArgError, "sockaddr string too big");
memcpy((void *)&rai->addr, (void *)sa, len);
rai->sockaddr_len = len;
@@ -696,32 +659,31 @@ make_inspectname(VALUE node, VALUE service, struct addrinfo *res)
VALUE inspectname = Qnil;
if (res) {
- /* drop redundant information which also shown in address:port part. */
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 (RB_TYPE_P(node, T_STRING) && strcmp(hbuf, RSTRING_PTR(node)) == 0)
+ if (TYPE(node) == T_STRING && strcmp(hbuf, RSTRING_PTR(node)) == 0)
node = Qnil;
- if (RB_TYPE_P(service, T_STRING) && strcmp(pbuf, RSTRING_PTR(service)) == 0)
+ if (TYPE(service) == T_STRING && strcmp(pbuf, RSTRING_PTR(service)) == 0)
service = Qnil;
- else if (RB_TYPE_P(service, T_FIXNUM) && atoi(pbuf) == FIX2INT(service))
+ else if (TYPE(service) == T_FIXNUM && atoi(pbuf) == FIX2INT(service))
service = Qnil;
}
}
- if (RB_TYPE_P(node, T_STRING)) {
+ if (TYPE(node) == T_STRING) {
inspectname = rb_str_dup(node);
}
- if (RB_TYPE_P(service, T_STRING)) {
+ 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 (RB_TYPE_P(service, T_FIXNUM) && FIX2INT(service) != 0)
+ else if (TYPE(service) == T_FIXNUM && FIX2INT(service) != 0)
{
if (NIL_P(inspectname))
inspectname = rb_sprintf(":%d", FIX2INT(service));
@@ -799,22 +761,19 @@ static void
init_unix_addrinfo(rb_addrinfo_t *rai, VALUE path, int socktype)
{
struct sockaddr_un un;
- socklen_t len;
StringValue(path);
- if (sizeof(un.sun_path) < (size_t)RSTRING_LEN(path))
- rb_raise(rb_eArgError,
- "too long unix socket path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
- (size_t)RSTRING_LEN(path), sizeof(un.sun_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));
- len = rsock_unix_sockaddr_len(path);
- init_addrinfo(rai, (struct sockaddr *)&un, len,
+ init_addrinfo(rai, (struct sockaddr *)&un, (socklen_t)sizeof(un),
PF_UNIX, socktype, 0, Qnil, Qnil);
}
#endif
@@ -948,7 +907,7 @@ addrinfo_initialize(int argc, VALUE *argv, VALUE self)
static int
get_afamily(struct sockaddr *addr, socklen_t len)
{
- if ((socklen_t)((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr) <= len)
+ if ((char*)&addr->sa_family + sizeof(addr->sa_family) - (char*)addr <= len)
return addr->sa_family;
else
return AF_UNSPEC;
@@ -976,7 +935,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
{
struct sockaddr_in *addr;
int port;
- if (rai->sockaddr_len < (socklen_t)sizeof(struct sockaddr_in)) {
+ if (rai->sockaddr_len < sizeof(struct sockaddr_in)) {
rb_str_cat2(ret, "too-short-AF_INET-sockaddr");
}
else {
@@ -989,7 +948,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
port = ntohs(addr->sin_port);
if (port)
rb_str_catf(ret, ":%d", port);
- if ((socklen_t)sizeof(struct sockaddr_in) < rai->sockaddr_len)
+ 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;
@@ -1002,7 +961,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
char hbuf[1024];
int port;
int error;
- if (rai->sockaddr_len < (socklen_t)sizeof(struct sockaddr_in6)) {
+ if (rai->sockaddr_len < sizeof(struct sockaddr_in6)) {
rb_str_cat2(ret, "too-short-AF_INET6-sockaddr");
}
else {
@@ -1024,7 +983,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
port = ntohs(addr->sin6_port);
rb_str_catf(ret, "[%s]:%d", hbuf, port);
}
- if ((socklen_t)sizeof(struct sockaddr_in6) < rai->sockaddr_len)
+ 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;
@@ -1035,11 +994,9 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
case AF_UNIX:
{
struct sockaddr_un *addr = (struct sockaddr_un *)&rai->addr;
- char *p, *s, *e;
+ char *p, *s, *t, *e;
s = addr->sun_path;
e = (char*)addr + rai->sockaddr_len;
- while (s < e && *(e-1) == '\0')
- e--;
if (e < s)
rb_str_cat2(ret, "too-short-AF_UNIX-sockaddr");
else if (s == e)
@@ -1047,17 +1004,28 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
else {
int printable_only = 1;
p = s;
- while (p < e) {
+ while (p < e && *p != '\0') {
printable_only = printable_only && ISPRINT(*p) && !ISSPACE(*p);
p++;
}
- if (printable_only) { /* only printable, no space */
- if (s[0] != '/') /* relative path */
- rb_str_cat2(ret, "AF_UNIX ");
- rb_str_cat(ret, s, p - s);
+ 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++);
}
@@ -1090,7 +1058,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret)
*
* returns a string which shows addrinfo in human-readable form.
*
- * Addrinfo.tcp("localhost", 80).inspect #=> "#<Addrinfo: 127.0.0.1:80 TCP (localhost)>"
+ * Addrinfo.tcp("localhost", 80).inspect #=> "#<Addrinfo: 127.0.0.1:80 TCP (localhost:80)>"
* Addrinfo.unix("/tmp/sock").inspect #=> "#<Addrinfo: /tmp/sock SOCK_STREAM>"
*
*/
@@ -1231,7 +1199,7 @@ addrinfo_mdump(VALUE self)
struct sockaddr_un *su = (struct sockaddr_un *)&rai->addr;
char *s, *e;
s = su->sun_path;
- e = (char*)su + rai->sockaddr_len;
+ e = (char*)s + sizeof(su->sun_path);
while (s < e && *(e-1) == '\0')
e--;
sockaddr = rb_str_new(s, e-s);
@@ -1328,14 +1296,12 @@ addrinfo_mload(VALUE self, VALUE ary)
case AF_UNIX:
{
struct sockaddr_un uaddr;
- MEMZERO(&uaddr, struct sockaddr_un, 1);
+ 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 (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
- (size_t)RSTRING_LEN(v), sizeof(uaddr.sun_path));
+ 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 = (socklen_t)sizeof(uaddr);
memcpy(&ss, &uaddr, len);
@@ -1435,7 +1401,6 @@ addrinfo_protocol(VALUE self)
/*
* call-seq:
* addrinfo.to_sockaddr => string
- * addrinfo.to_s => string
*
* returns the socket address as packed struct sockaddr string.
*
@@ -1464,7 +1429,7 @@ addrinfo_to_sockaddr(VALUE self)
* 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)>
+ * 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"
*
*/
@@ -1825,18 +1790,6 @@ addrinfo_ipv6_sitelocal_p(VALUE self)
}
/*
- * Returns true for IPv6 unique local address (fc00::/7, RFC4193).
- * It returns false otherwise.
- */
-static VALUE
-addrinfo_ipv6_unique_local_p(VALUE self)
-{
- struct in6_addr *addr = extract_in6_addr(self);
- if (addr && IN6_IS_ADDR_UNIQUE_LOCAL(addr)) return Qtrue;
- return Qfalse;
-}
-
-/*
* Returns true for IPv4-mapped IPv6 address (::ffff:0:0/80).
* It returns false otherwise.
*/
@@ -1980,12 +1933,9 @@ addrinfo_unix_path(VALUE self)
s = addr->sun_path;
e = (char*)addr + rai->sockaddr_len;
if (e < s)
- rb_raise(rb_eSocket, "too short AF_UNIX address: %"PRIuSIZE" bytes given for minimum %"PRIuSIZE" bytes.",
- (size_t)rai->sockaddr_len, (size_t)(s - (char *)addr));
+ 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 path (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
- (size_t)(e - addr->sun_path), sizeof(addr->sun_path));
+ rb_raise(rb_eSocket, "too long AF_UNIX address");
while (s < e && *(e-1) == '\0')
e--;
return rb_str_new(s, e-s);
@@ -2015,24 +1965,15 @@ addrinfo_unix_path(VALUE self)
*
* Similarly, PF_INET6 as family restricts for IPv6.
*
- * flags should be bitwise OR of Socket::AI_??? constants such as follows.
- * Note that the exact list of the constants depends on OS.
- *
- * AI_PASSIVE Get address to use with bind()
- * AI_CANONNAME Fill in the canonical name
- * AI_NUMERICHOST Prevent host name resolution
- * AI_NUMERICSERV Prevent service name resolution
- * AI_V4MAPPED Accept IPv4-mapped IPv6 addresses
- * AI_ALL Allow all addresses
- * AI_ADDRCONFIG Accept only if any address is assigned
+ * 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 omitted 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)>,
- * # #<Addrinfo: [2001:200:dff:fff1:216:3eff:feb1:44d7]:80 TCP (www.kame.net)>]
+ * #=> [#<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
@@ -2199,8 +2140,6 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
default:
rb_raise(rb_eTypeError, "neither IO nor file descriptor");
}
-
- UNREACHABLE;
}
/*
@@ -2209,10 +2148,6 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
void
rsock_init_addrinfo(void)
{
- /*
- * The Addrinfo class maps <tt>struct addrinfo</tt> to ruby. This
- * structure identifies an Internet host and a service.
- */
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);
@@ -2251,7 +2186,6 @@ rsock_init_addrinfo(void)
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_unique_local?", addrinfo_ipv6_unique_local_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);
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 999213550b..60ac25fbbd 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -3,9 +3,7 @@
#include "ruby/ruby.h"
#include "ruby/io.h"
-#include "ruby/thread.h"
#include "ruby/util.h"
-#include "internal.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -117,10 +115,6 @@
# define IS_IP_FAMILY(af) ((af) == AF_INET)
#endif
-#ifndef IN6_IS_ADDR_UNIQUE_LOCAL
-# define IN6_IS_ADDR_UNIQUE_LOCAL(a) (((a)->s6_addr[0] == 0xfc) || ((a)->s6_addr[0] == 0xfd))
-#endif
-
#ifndef HAVE_SOCKADDR_STORAGE
/*
* RFC 2553: protocol-independent placeholder for socket addresses
@@ -144,7 +138,7 @@ struct sockaddr_storage {
};
#endif
-#ifdef __APPLE__
+#if defined __APPLE__ && defined __MACH__
/*
* CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN
* aligns up to __darwin_size_t which is 64bit, but CMSG_DATA is
@@ -203,7 +197,6 @@ int Rconnect();
#include "constdefs.h"
#define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RUBY_UBF_IO, 0)
-#define BLOCKING_REGION_FD(func, arg) (long)rb_thread_io_blocking_region((func), (arg), (arg)->fd)
#define SockAddrStringValue(v) rsock_sockaddr_string_value(&(v))
#define SockAddrStringValuePtr(v) rsock_sockaddr_string_value_ptr(&(v))
@@ -231,16 +224,15 @@ 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, socklen_t addrlen);
-VALUE rsock_ipaddr(struct sockaddr *sockaddr, socklen_t sockaddrlen, int norevlookup);
+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));
int rsock_revlookup_flag(VALUE revlookup, int *norevlookup);
#ifdef HAVE_SYS_UN_H
-VALUE rsock_unixpath_str(struct sockaddr_un *sockaddr, socklen_t len);
+const char* rsock_unixpath(struct sockaddr_un *sockaddr, socklen_t len);
VALUE rsock_unixaddr(struct sockaddr_un *sockaddr, socklen_t len);
-socklen_t rsock_unix_sockaddr_len(VALUE path);
#endif
int rsock_socket(int domain, int type, int proto);
@@ -288,14 +280,13 @@ VALUE rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock);
#if defined(HAVE_RECVMSG)
VALUE rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock);
VALUE rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock);
-ssize_t rsock_recvmsg(int socket, struct msghdr *message, int flags);
#else
#define rsock_bsock_recvmsg rb_f_notimplement
#define rsock_bsock_recvmsg_nonblock rb_f_notimplement
#endif
#ifdef HAVE_ST_MSG_CONTROL
-void rsock_discard_cmsg_resource(struct msghdr *mh, int msg_peek_p);
+void rsock_discard_cmsg_resource(struct msghdr *mh);
#endif
void rsock_init_basicsocket(void);
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 3df435bbc9..63586fc002 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -27,8 +27,9 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
*
* _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
*
- * _protocol_ is optional and should be a protocol defined in the domain.
- * If protocol is not given, 0 is used internally.
+ * _protocol_ should be a protocol defined in the domain.
+ * This is optional.
+ * If it is not given, 0 is used internally.
*
* Socket.new(:INET, :STREAM) # TCP socket
* Socket.new(:INET, :DGRAM) # UDP socket
@@ -75,59 +76,6 @@ pair_yield(VALUE pair)
#endif
#if defined HAVE_SOCKETPAIR
-
-static int
-rsock_socketpair0(int domain, int type, int protocol, int sv[2])
-{
- int ret;
-
-#ifdef SOCK_CLOEXEC
- static int try_sock_cloexec = 1;
- if (try_sock_cloexec) {
- ret = socketpair(domain, type|SOCK_CLOEXEC, protocol, sv);
- if (ret == -1 && errno == EINVAL) {
- /* SOCK_CLOEXEC is available since Linux 2.6.27. Linux 2.6.18 fails with EINVAL */
- ret = socketpair(domain, type, protocol, sv);
- if (ret != -1) {
- /* The reason of EINVAL may be other than SOCK_CLOEXEC.
- * So disable SOCK_CLOEXEC only if socketpair() succeeds without SOCK_CLOEXEC.
- * Ex. Socket.pair(:UNIX, 0xff) fails with EINVAL.
- */
- try_sock_cloexec = 0;
- }
- }
- }
- else {
- ret = socketpair(domain, type, protocol, sv);
- }
-#else
- ret = socketpair(domain, type, protocol, sv);
-#endif
-
- if (ret == -1) {
- return -1;
- }
-
- rb_fd_fix_cloexec(sv[0]);
- rb_fd_fix_cloexec(sv[1]);
-
- return ret;
-}
-
-static int
-rsock_socketpair(int domain, int type, int protocol, int sv[2])
-{
- int ret;
-
- ret = rsock_socketpair0(domain, type, protocol, sv);
- if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
- rb_gc();
- ret = rsock_socketpair0(domain, type, protocol, sv);
- }
-
- return ret;
-}
-
/*
* call-seq:
* Socket.pair(domain, type, protocol) => [socket1, socket2]
@@ -139,8 +87,8 @@ rsock_socketpair(int domain, int type, int protocol, int sv[2])
*
* _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
*
- * _protocol_ should be a protocol defined in the domain,
- * defaults to 0 for the domain.
+ * _protocol_ should be a protocol defined in the domain.
+ * 0 is default protocol for the domain.
*
* s1, s2 = Socket.pair(:UNIX, :DGRAM, 0)
* s1.send "a", 0
@@ -163,12 +111,14 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
setup_domain_and_type(domain, &d, type, &t);
p = NUM2INT(protocol);
- ret = rsock_socketpair(d, t, p, sp);
+ ret = socketpair(d, t, p, sp);
+ if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
+ rb_gc();
+ ret = socketpair(d, t, p, sp);
+ }
if (ret < 0) {
rb_sys_fail("socketpair(2)");
}
- rb_fd_fix_cloexec(sp[0]);
- rb_fd_fix_cloexec(sp[1]);
s1 = rsock_init_sock(rb_obj_alloc(klass), sp[0]);
s2 = rsock_init_sock(rb_obj_alloc(klass), sp[1]);
@@ -937,7 +887,7 @@ make_addrinfo(struct addrinfo *res0, int norevlookup)
}
base = rb_ary_new();
for (res = res0; res; res = res->ai_next) {
- ary = rsock_ipaddr(res->ai_addr, res->ai_addrlen, norevlookup);
+ ary = rsock_ipaddr(res->ai_addr, norevlookup);
if (res->ai_canonname) {
RARRAY_PTR(ary)[2] = rb_str_new2(res->ai_canonname);
}
@@ -1002,12 +952,13 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
{
VALUE addr, family;
struct hostent *h;
+ struct sockaddr *sa;
char **pch;
VALUE ary, names;
int t = AF_INET;
rb_scan_args(argc, argv, "11", &addr, &family);
- StringValue(addr);
+ sa = (struct sockaddr*)StringValuePtr(addr);
if (!NIL_P(family)) {
t = rsock_family_arg(family);
}
@@ -1133,8 +1084,8 @@ sock_s_getservbyport(int argc, VALUE *argv)
*
* _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
*
- * _protocol_ should be a protocol defined in the family,
- * and defaults to 0 for the family.
+ * _protocol_ should be a protocol defined in the family.
+ * 0 is default protocol for the family.
*
* _flags_ should be bitwise OR of Socket::AI_* constants.
*
@@ -1147,7 +1098,8 @@ sock_s_getservbyport(int argc, VALUE *argv)
* # ["AF_INET", 0, "localhost", "127.0.0.1", 2, 3, 0]] # PF_INET/SOCK_RAW/IPPROTO_IP
*
* _reverse_lookup_ directs the form of the third element, and has to
- * be one of below. If _reverse_lookup_ is omitted, the default value is +nil+.
+ * be one of below.
+ * If it is ommitted, the default value is +nil+.
*
* +true+, +:hostname+: hostname is obtained from numeric address using reverse lookup, which may take a time.
* +false+, +:numeric+: hostname is same as numeric address.
@@ -1199,8 +1151,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
*
* _flags_ should be bitwise OR of Socket::NI_* constants.
*
- * Note:
- * The last form is compatible with IPSocket#addr and IPSocket#peeraddr.
+ * 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"]
@@ -1216,10 +1167,9 @@ sock_s_getnameinfo(int argc, VALUE *argv)
char hbuf[1024], pbuf[1024];
int fl;
struct addrinfo hints, *res = NULL, *r;
- int error, saved_errno;
+ int error;
struct sockaddr_storage ss;
struct sockaddr *sap;
- socklen_t salen;
sa = flags = Qnil;
rb_scan_args(argc, argv, "11", &sa, &flags);
@@ -1239,7 +1189,6 @@ sock_s_getnameinfo(int argc, VALUE *argv)
rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
}
sap = (struct sockaddr*)&ss;
- salen = RSTRING_LEN(sa);
goto call_nameinfo;
}
tmp = rb_check_array_type(sa);
@@ -1301,14 +1250,13 @@ sock_s_getnameinfo(int argc, VALUE *argv)
error = rb_getaddrinfo(hptr, pptr, &hints, &res);
if (error) goto error_exit_addr;
sap = res->ai_addr;
- salen = res->ai_addrlen;
}
else {
rb_raise(rb_eTypeError, "expecting String or Array");
}
call_nameinfo:
- error = rb_getnameinfo(sap, salen, hbuf, sizeof(hbuf),
+ error = rb_getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
pbuf, sizeof(pbuf), fl);
if (error) goto error_exit_name;
if (res) {
@@ -1316,8 +1264,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
char hbuf2[1024], pbuf2[1024];
sap = r->ai_addr;
- salen = r->ai_addrlen;
- error = rb_getnameinfo(sap, salen, hbuf2, sizeof(hbuf2),
+ error = rb_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) {
@@ -1330,18 +1277,12 @@ sock_s_getnameinfo(int argc, VALUE *argv)
return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
error_exit_addr:
- saved_errno = errno;
if (res) freeaddrinfo(res);
- errno = saved_errno;
rsock_raise_socket_error("getaddrinfo", error);
error_exit_name:
- saved_errno = errno;
if (res) freeaddrinfo(res);
- errno = saved_errno;
rsock_raise_socket_error("getnameinfo", error);
-
- UNREACHABLE;
}
/*
@@ -1407,7 +1348,7 @@ 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, RSTRING_LEN(addr));
+ host = rsock_make_ipaddr((struct sockaddr*)sockaddr);
OBJ_INFECT(host, addr);
return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
}
@@ -1428,17 +1369,18 @@ static VALUE
sock_s_pack_sockaddr_un(VALUE self, VALUE path)
{
struct sockaddr_un sockaddr;
+ char *sun_path;
VALUE addr;
- StringValue(path);
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 (%"PRIuSIZE" bytes given but %"PRIuSIZE" bytes max)",
- (size_t)RSTRING_LEN(path), sizeof(sockaddr.sun_path));
+ sun_path = StringValueCStr(path);
+ if (sizeof(sockaddr.sun_path) <= strlen(sun_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));
- addr = rb_str_new((char*)&sockaddr, rsock_unix_sockaddr_len(path));
+ strncpy(sockaddr.sun_path, sun_path, sizeof(sockaddr.sun_path)-1);
+ addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
OBJ_INFECT(addr, path);
return addr;
@@ -1460,6 +1402,7 @@ static VALUE
sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
{
struct sockaddr_un * sockaddr;
+ const char *sun_path;
VALUE path;
sockaddr = (struct sockaddr_un*)SockAddrStringValuePtr(addr);
@@ -1475,7 +1418,13 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
}
- path = rsock_unixpath_str(sockaddr, RSTRING_LENINT(addr));
+ sun_path = rsock_unixpath(sockaddr, RSTRING_LENINT(addr));
+ if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) &&
+ sun_path == sockaddr->sun_path &&
+ sun_path + strlen(sun_path) == RSTRING_PTR(addr) + RSTRING_LEN(addr)) {
+ rb_raise(rb_eArgError, "sockaddr_un.sun_path not NUL terminated");
+ }
+ path = rb_str_new2(sun_path);
OBJ_INFECT(path, addr);
return path;
}
@@ -1841,126 +1790,48 @@ socket_s_ip_address_list(VALUE self)
#define socket_s_ip_address_list rb_f_notimplement
#endif
+/*
+ * Document-class: ::Socket < BasicSocket
+ *
+ * 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.
+ *
+ * The constants defined under Socket::Constants are also defined under Socket.
+ * For example, Socket::AF_INET is usable as well as Socket::Constants::AF_INET.
+ * See Socket::Constants for the list of constants.
+ *
+ * === Exception Handling
+ * Ruby's implementation of +Socket+ causes an exception to be raised
+ * based on the error generated by the system dependent implementation.
+ * This is why the methods are documented in a way that isolate
+ * Unix-based system exceptions from Windows based exceptions. If more
+ * information on particular exception is needed please refer to the
+ * Unix manual pages or the Windows WinSock reference.
+ *
+ * === Convenient methods
+ *
+ * Although the general way to create socket is Socket.new,
+ * there are several methods for socket creation for most cases.
+ *
+ * * TCP client socket: Socket.tcp, TCPSocket.open
+ * * TCP server socket: Socket.tcp_server_loop, TCPServer.open
+ * * UNIX client socket: Socket.unix, UNIXSocket.open
+ * * UNIX server socket: Socket.unix_server_loop, UNIXServer.open
+ *
+ * === Documentation by
+ * * Zach Dennis
+ * * Sam Roberts
+ * * <em>Programming Ruby</em> from The Pragmatic Bookshelf.
+ *
+ * Much material in this documentation is taken with permission from
+ * <em>Programming Ruby</em> from The Pragmatic Bookshelf.
+ */
void
Init_socket()
{
rsock_init_basicsocket();
- /*
- * Document-class: Socket < BasicSocket
- *
- * 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.
- *
- * The constants defined under Socket::Constants are also defined under
- * Socket. For example, Socket::AF_INET is usable as well as
- * Socket::Constants::AF_INET. See Socket::Constants for the list of
- * constants.
- *
- * === What's a socket?
- *
- * Sockets are endpoints of a bidirectionnal communication channel.
- * Sockets can communicate within a process, between processes on the same
- * machine or between different machines. There are many types of socket:
- * TCPSocket, UDPSocket or UNIXSocket for example.
- *
- * Sockets have their own vocabulary:
- *
- * *domain:*
- * The family of protocols:
- * * Socket::PF_INET
- * * Socket::PF_INET6
- * * Socket::PF_UNIX
- * * etc.
- *
- * *type:*
- * The type of communications between the two endpoints, typically
- * * Socket::SOCK_STREAM
- * * Socket::SOCK_DGRAM.
- *
- * *protocol:*
- * Typically _zero_.
- * This may be used to identify a variant of a protocol.
- *
- * *hostname:*
- * The identifier of a network interface:
- * * a string (hostname, IPv4 or IPv6 adress or +broadcast+
- * which specifies a broadcast address)
- * * a zero-length string which specifies INADDR_ANY
- * * an integer (interpreted as binary address in host byte order).
- *
- * === Quick start
- *
- * Many of the classes, such as TCPSocket, UDPSocket or UNIXSocket,
- * ease the use of sockets comparatively to the equivalent C programming interface.
- *
- * Let's create an internet socket using the IPv4 protocol in a C-like manner:
- *
- * s = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
- * s.connect Socket.pack_sockaddr_in(80, 'example.com')
- *
- * You could also use the TCPSocket class:
- *
- * s = TCPSocket.new 'example.com', 80
- *
- * A simple server might look like this:
- *
- * require 'socket'
- *
- * server = TCPServer.new 2000 # Server bound to port 2000
- *
- * loop do
- * client = server.accept # Wait for a client to connect
- * client.puts "Hello !"
- * client.puts "Time is #{Time.now}"
- * client.close
- * end
- *
- * A simple client may look like this:
- *
- * require 'socket'
- *
- * s = TCPSocket.new 'localhost', 2000
- *
- * while line = s.gets # Read lines from socket
- * puts line # and print them
- * end
- *
- * s.close # close socket when done
- *
- * === Exception Handling
- *
- * Ruby's Socket implementation raises exceptions based on the error
- * generated by the system dependent implementation. This is why the
- * methods are documented in a way that isolate Unix-based system
- * exceptions from Windows based exceptions. If more information on a
- * particular exception is needed, please refer to the Unix manual pages or
- * the Windows WinSock reference.
- *
- * === Convenience methods
- *
- * Although the general way to create socket is Socket.new,
- * there are several methods of socket creation for most cases.
- *
- * TCP client socket::
- * Socket.tcp, TCPSocket.open
- * TCP server socket::
- * Socket.tcp_server_loop, TCPServer.open
- * UNIX client socket::
- * Socket.unix, UNIXSocket.open
- * UNIX server socket::
- * Socket.unix_server_loop, UNIXServer.open
- *
- * === Documentation by
- *
- * * Zach Dennis
- * * Sam Roberts
- * * <em>Programming Ruby</em> from The Pragmatic Bookshelf.
- *
- * Much material in this documentation is taken with permission from
- * <em>Programming Ruby</em> from The Pragmatic Bookshelf.
- */
rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
rsock_init_socket_init();
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
index 48be4fcf99..cbe8792271 100644
--- a/ext/socket/sockssocket.c
+++ b/ext/socket/sockssocket.c
@@ -11,13 +11,6 @@
#include "rubysocket.h"
#ifdef SOCKS
-/*
- * call-seq:
- * SOCKSSocket.new(host, serv) => socket
- *
- * Opens a SOCKS connection to +host+ via the SOCKS server +serv+.
- *
- */
static VALUE
socks_init(VALUE sock, VALUE host, VALUE serv)
{
@@ -32,10 +25,6 @@ socks_init(VALUE sock, VALUE host, VALUE serv)
}
#ifdef SOCKS5
-/*
- * Closes the SOCKS connection.
- *
- */
static VALUE
socks_s_close(VALUE sock)
{
@@ -51,17 +40,15 @@ socks_s_close(VALUE sock)
#endif
#endif
+/*
+ * Document-class: ::SOCKSSocket < TCPSocket
+ *
+ * SOCKSSocket class
+ */
void
rsock_init_sockssocket(void)
{
#ifdef SOCKS
- /*
- * Document-class: SOCKSSocket < TCPSocket
- *
- * SOCKS is an Internet protocol that routes packets between a client and
- * a server through a proxy server. SOCKS5, if supported, additionally
- * provides authentication so only authorized users may access a server.
- */
rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
#ifdef SOCKS5
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
index 6596733239..7bb02d91f0 100644
--- a/ext/socket/tcpserver.c
+++ b/ext/socket/tcpserver.c
@@ -128,40 +128,14 @@ tcp_sysaccept(VALUE sock)
return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
}
+/*
+ * Document-class: ::TCPServer < TCPSocket
+ *
+ * TCPServer represents a TCP/IP server socket.
+ */
void
rsock_init_tcpserver(void)
{
- /*
- * Document-class: TCPServer < TCPSocket
- *
- * TCPServer represents a TCP/IP server socket.
- *
- * A simple TCP server may look like:
- *
- * require 'socket'
- *
- * server = TCPServer.new 2000 # Server bind to port 2000
- * loop do
- * client = server.accept # Wait for a client to connect
- * client.puts "Hello !"
- * client.puts "Time is #{Time.now}"
- * client.close
- * end
- *
- * A more usable server (serving multiple clients):
- *
- * require 'socket'
- *
- * server = TCPServer.new 2000
- * loop do
- * Thread.start(server.accept) do |client|
- * client.puts "Hello !"
- * client.puts "Time is #{Time.now}"
- * client.close
- * end
- * end
- *
- */
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);
diff --git a/ext/socket/tcpsocket.c b/ext/socket/tcpsocket.c
index 608156f1b2..42d75d6015 100644
--- a/ext/socket/tcpsocket.c
+++ b/ext/socket/tcpsocket.c
@@ -34,7 +34,7 @@ tcp_init(int argc, VALUE *argv, VALUE sock)
static VALUE
tcp_sockaddr(struct sockaddr *addr, size_t len)
{
- return rsock_make_ipaddr(addr, len);
+ return rsock_make_ipaddr(addr);
}
/*
@@ -55,27 +55,14 @@ tcp_s_gethostbyname(VALUE obj, VALUE host)
tcp_sockaddr);
}
+/*
+ * Document-class: ::TCPSocket < IPSocket
+ *
+ * TCPSocket represents a TCP/IP client socket.
+ */
void
rsock_init_tcpsocket(void)
{
- /*
- * Document-class: TCPSocket < IPSocket
- *
- * TCPSocket represents a TCP/IP client socket.
- *
- * A simple client may look like:
- *
- * require 'socket'
- *
- * s = TCPSocket.new 'localhost', 2000
- *
- * while line = s.gets # Read lines from socket
- * puts line # and print them
- * end
- *
- * s.close # close socket when done
- *
- */
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
index 0ba4371f1a..b278523eba 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -177,7 +177,7 @@ udp_send(int argc, VALUE *argv, VALUE sock)
arg.to = res->ai_addr;
arg.tolen = res->ai_addrlen;
rb_thread_fd_writable(arg.fd);
- n = (int)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg);
+ n = (int)BLOCKING_REGION(rsock_sendto_blocking, &arg);
if (n >= 0) {
freeaddrinfo(res0);
return INT2FIX(n);
@@ -246,15 +246,14 @@ udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
}
+/*
+ * Document-class: ::UDPSocket < IPSocket
+ *
+ * UDPSocket represents a UDP/IP socket.
+ */
void
rsock_init_udpsocket(void)
{
- /*
- * Document-class: UDPSocket < IPSocket
- *
- * UDPSocket represents a UDP/IP socket.
- *
- */
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);
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
index 9bd959d439..4fdc1d709d 100644
--- a/ext/socket/unixserver.c
+++ b/ext/socket/unixserver.c
@@ -135,16 +135,15 @@ unix_sysaccept(VALUE sock)
#endif
+/*
+ * Document-class: ::UNIXServer < UNIXSocket
+ *
+ * UNIXServer represents a UNIX domain stream server socket.
+ */
void
rsock_init_unixserver(void)
{
#ifdef HAVE_SYS_UN_H
- /*
- * Document-class: UNIXServer < UNIXSocket
- *
- * UNIXServer represents a UNIX domain stream server socket.
- *
- */
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);
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index 75da9c1a78..3e3a8ba0d7 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -13,7 +13,6 @@
#ifdef HAVE_SYS_UN_H
struct unixsock_arg {
struct sockaddr_un *sockaddr;
- socklen_t sockaddrlen;
int fd;
};
@@ -22,14 +21,13 @@ unixsock_connect_internal(VALUE a)
{
struct unixsock_arg *arg = (struct unixsock_arg *)a;
return (VALUE)rsock_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
- arg->sockaddrlen, 0);
+ (socklen_t)sizeof(*arg->sockaddr), 0);
}
VALUE
rsock_init_unixsock(VALUE sock, VALUE path, int server)
{
struct sockaddr_un sockaddr;
- socklen_t sockaddrlen;
int fd, status;
rb_io_t *fptr;
@@ -41,21 +39,19 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
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 (%ldbytes given but %dbytes max)",
- RSTRING_LEN(path), (int)sizeof(sockaddr.sun_path));
+ 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));
- sockaddrlen = rsock_unix_sockaddr_len(path);
if (server) {
- status = bind(fd, (struct sockaddr*)&sockaddr, sockaddrlen);
+ status = bind(fd, (struct sockaddr*)&sockaddr, (socklen_t)sizeof(sockaddr));
}
else {
int prot;
struct unixsock_arg arg;
arg.sockaddr = &sockaddr;
- arg.sockaddrlen = sockaddrlen;
arg.fd = fd;
status = (int)rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
if (prot) {
@@ -66,11 +62,11 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
if (status < 0) {
close(fd);
- rb_sys_fail_str(rb_inspect(path));
+ rb_sys_fail(sockaddr.sun_path);
}
if (server) {
- if (listen(fd, SOMAXCONN) < 0) {
+ if (listen(fd, 5) < 0) {
close(fd);
rb_sys_fail("listen(2)");
}
@@ -120,11 +116,9 @@ unix_path(VALUE sock)
if (NIL_P(fptr->pathv)) {
struct sockaddr_un addr;
socklen_t len = (socklen_t)sizeof(addr);
- socklen_t len0 = len;
if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
rb_sys_fail(0);
- if (len0 < len) len = len0;
- fptr->pathv = rb_obj_freeze(rsock_unixpath_str(&addr, len));
+ fptr->pathv = rb_obj_freeze(rb_str_new_cstr(rsock_unixpath(&addr, len)));
}
return rb_str_dup(fptr->pathv);
}
@@ -211,7 +205,7 @@ unix_send_io(VALUE sock, VALUE val)
#if FD_PASSING_BY_MSG_CONTROL
struct {
struct cmsghdr hdr;
- char pad[8+sizeof(int)+8];
+ char pad[8+sizeof(int)+8];
} cmsg;
#endif
@@ -254,7 +248,7 @@ unix_send_io(VALUE sock, VALUE val)
#endif
arg.fd = fptr->fd;
- while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) {
+ while ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1) {
if (!rb_io_wait_writable(arg.fd))
rb_sys_fail("sendmsg(2)");
}
@@ -270,8 +264,7 @@ static VALUE
recvmsg_blocking(void *data)
{
struct iomsg_arg *arg = data;
- int flags = 0;
- return rsock_recvmsg(arg->fd, &arg->msg, flags);
+ return recvmsg(arg->fd, &arg->msg, 0);
}
/*
@@ -306,7 +299,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
#if FD_PASSING_BY_MSG_CONTROL
struct {
struct cmsghdr hdr;
- char pad[8+sizeof(int)+8];
+ char pad[8+sizeof(int)+8];
} cmsg;
#endif
@@ -342,13 +335,13 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
#endif
arg.fd = fptr->fd;
- while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
+ while ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1) {
if (!rb_io_wait_readable(arg.fd))
rb_sys_fail("recvmsg(2)");
}
#if FD_PASSING_BY_MSG_CONTROL
- if (arg.msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr)) {
+ 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));
@@ -363,18 +356,18 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
"file descriptor was not passed (cmsg_type=%d, %d expected)",
cmsg.hdr.cmsg_type, SCM_RIGHTS);
}
- if (arg.msg.msg_controllen < (socklen_t)CMSG_LEN(sizeof(int))) {
+ 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 ((socklen_t)CMSG_SPACE(sizeof(int)) < arg.msg.msg_controllen) {
+ 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, 0);
+ 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)));
@@ -390,7 +383,6 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
#if FD_PASSING_BY_MSG_CONTROL
memcpy(&fd, CMSG_DATA(&cmsg.hdr), sizeof(int));
#endif
- rb_fd_fix_cloexec(fd);
if (klass == Qnil)
return INT2FIX(fd);
@@ -426,13 +418,11 @@ unix_addr(VALUE sock)
rb_io_t *fptr;
struct sockaddr_un addr;
socklen_t len = (socklen_t)sizeof addr;
- socklen_t len0 = len;
GetOpenFile(sock, fptr);
if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
rb_sys_fail("getsockname(2)");
- if (len0 < len) len = len0;
return rsock_unixaddr(&addr, len);
}
@@ -454,13 +444,11 @@ unix_peeraddr(VALUE sock)
rb_io_t *fptr;
struct sockaddr_un addr;
socklen_t len = (socklen_t)sizeof addr;
- socklen_t len0 = len;
GetOpenFile(sock, fptr);
if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
rb_sys_fail("getpeername(2)");
- if (len0 < len) len = len0;
return rsock_unixaddr(&addr, len);
}
@@ -503,15 +491,15 @@ unix_s_socketpair(int argc, VALUE *argv, VALUE klass)
}
#endif
+/*
+ * Document-class: ::UNIXSocket < BasicSocket
+ *
+ * UNIXSocket represents a UNIX domain stream client socket.
+ */
void
rsock_init_unixsocket(void)
{
#ifdef HAVE_SYS_UN_H
- /*
- * Document-class: UNIXSocket < BasicSocket
- *
- * UNIXSocket represents a UNIX domain stream client socket.
- */
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);
diff --git a/ext/stringio/.cvsignore b/ext/stringio/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/stringio/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/stringio/README b/ext/stringio/README
index d03f37dfd3..10dd237de8 100644
--- a/ext/stringio/README
+++ b/ext/stringio/README
@@ -13,6 +13,6 @@ This library is based on MoonWolf version written in Ruby. Thanks a lot.
* not implemented: (({fcntl})), (({reopen})).
* (({fileno})) returns nil.
* (({pos=})) returns new position, not 0.
-* (({ungetc})) does nothing at start of the string.
+* (({ungetc})) does nothing at start of the string.
=end
diff --git a/ext/stringio/depend b/ext/stringio/depend
index e3f3409ed7..338ebde529 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,3 +1,3 @@
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
+ $(hdrdir)/ruby/encoding.h
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 4dc279cd12..3ca5001fe0 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -28,9 +28,9 @@ struct StringIO {
int count;
};
-static void strio_init(int, VALUE *, struct StringIO *, VALUE);
+static void strio_init(int, VALUE *, struct StringIO *);
-#define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
+#define IS_STRIO(obj) (rb_typeddata_is_kind_of(obj, &strio_data_type))
#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
static struct StringIO *
@@ -73,14 +73,12 @@ strio_memsize(const void *p)
static const rb_data_type_t strio_data_type = {
"strio",
- {
- strio_mark,
- strio_free,
- strio_memsize,
- },
+ strio_mark,
+ strio_free,
+ strio_memsize,
};
-#define check_strio(self) ((struct StringIO*)rb_check_typeddata((self), &strio_data_type))
+#define check_strio(self) ((struct StringIO*)rb_check_typeddata(self, &strio_data_type))
static struct StringIO*
get_strio(VALUE self)
@@ -107,32 +105,23 @@ strio_substr(struct StringIO *ptr, long pos, long len)
#define StringIO(obj) get_strio(obj)
-#define STRIO_READABLE FL_USER4
-#define STRIO_WRITABLE FL_USER5
-#define STRIO_READWRITE (STRIO_READABLE|STRIO_WRITABLE)
-typedef char strio_flags_check[(STRIO_READABLE/FMODE_READABLE == STRIO_WRITABLE/FMODE_WRITABLE) * 2 - 1];
-#define STRIO_MODE_SET_P(strio, mode) \
- ((RBASIC(strio)->flags & STRIO_##mode) && \
- ((struct StringIO*)DATA_PTR(strio))->flags & FMODE_##mode)
-#define CLOSED(strio) (!STRIO_MODE_SET_P(strio, READWRITE))
-#define READABLE(strio) STRIO_MODE_SET_P(strio, READABLE)
-#define WRITABLE(strio) STRIO_MODE_SET_P(strio, WRITABLE)
+#define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
+#define READABLE(ptr) ((ptr)->flags & FMODE_READABLE)
+#define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
static struct StringIO*
-readable(VALUE strio)
+readable(struct StringIO *ptr)
{
- struct StringIO *ptr = StringIO(strio);
- if (!READABLE(strio)) {
+ if (!READABLE(ptr)) {
rb_raise(rb_eIOError, "not opened for reading");
}
return ptr;
}
static struct StringIO*
-writable(VALUE strio)
+writable(struct StringIO *ptr)
{
- struct StringIO *ptr = StringIO(strio);
- if (!WRITABLE(strio)) {
+ if (!WRITABLE(ptr)) {
rb_raise(rb_eIOError, "not opened for writing");
}
if (!OBJ_TAINTED(ptr->string)) {
@@ -169,12 +158,12 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
DATA_PTR(self) = ptr = strio_alloc();
}
rb_call_super(0, 0);
- strio_init(argc, argv, ptr, self);
+ strio_init(argc, argv, ptr);
return self;
}
static void
-strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
+strio_init(int argc, VALUE *argv, struct StringIO *ptr)
{
VALUE string, mode;
int trunc = 0;
@@ -212,7 +201,6 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
ptr->string = string;
ptr->pos = 0;
ptr->lineno = 0;
- RBASIC(self)->flags |= (ptr->flags & FMODE_READWRITE) * (STRIO_READABLE / FMODE_READABLE);
}
static VALUE
@@ -297,8 +285,7 @@ strio_unimpl(int argc, VALUE *argv, VALUE self)
{
StringIO(self);
rb_notimplement();
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
/*
@@ -342,11 +329,11 @@ strio_set_string(VALUE self, VALUE string)
static VALUE
strio_close(VALUE self)
{
- StringIO(self);
- if (CLOSED(self)) {
+ struct StringIO *ptr = StringIO(self);
+ if (CLOSED(ptr)) {
rb_raise(rb_eIOError, "closed stream");
}
- RBASIC(self)->flags &= ~STRIO_READWRITE;
+ ptr->flags &= ~FMODE_READWRITE;
return Qnil;
}
@@ -360,11 +347,11 @@ strio_close(VALUE self)
static VALUE
strio_close_read(VALUE self)
{
- StringIO(self);
- if (!READABLE(self)) {
+ struct StringIO *ptr = StringIO(self);
+ if (!READABLE(ptr)) {
rb_raise(rb_eIOError, "closing non-duplex IO for reading");
}
- RBASIC(self)->flags &= ~STRIO_READABLE;
+ ptr->flags &= ~FMODE_READABLE;
return Qnil;
}
@@ -378,11 +365,11 @@ strio_close_read(VALUE self)
static VALUE
strio_close_write(VALUE self)
{
- StringIO(self);
- if (!WRITABLE(self)) {
+ struct StringIO *ptr = StringIO(self);
+ if (!WRITABLE(ptr)) {
rb_raise(rb_eIOError, "closing non-duplex IO for writing");
}
- RBASIC(self)->flags &= ~STRIO_WRITABLE;
+ ptr->flags &= ~FMODE_WRITABLE;
return Qnil;
}
@@ -395,8 +382,8 @@ strio_close_write(VALUE self)
static VALUE
strio_closed(VALUE self)
{
- StringIO(self);
- if (!CLOSED(self)) return Qfalse;
+ struct StringIO *ptr = StringIO(self);
+ if (!CLOSED(ptr)) return Qfalse;
return Qtrue;
}
@@ -409,8 +396,8 @@ strio_closed(VALUE self)
static VALUE
strio_closed_read(VALUE self)
{
- StringIO(self);
- if (READABLE(self)) return Qfalse;
+ struct StringIO *ptr = StringIO(self);
+ if (READABLE(ptr)) return Qfalse;
return Qtrue;
}
@@ -423,8 +410,8 @@ strio_closed_read(VALUE self)
static VALUE
strio_closed_write(VALUE self)
{
- StringIO(self);
- if (WRITABLE(self)) return Qfalse;
+ struct StringIO *ptr = StringIO(self);
+ if (WRITABLE(ptr)) return Qfalse;
return Qtrue;
}
@@ -439,7 +426,7 @@ strio_closed_write(VALUE self)
static VALUE
strio_eof(VALUE self)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
return Qtrue;
}
@@ -458,8 +445,6 @@ strio_copy(VALUE copy, VALUE orig)
}
DATA_PTR(copy) = ptr;
OBJ_INFECT(copy, orig);
- RBASIC(copy)->flags &= ~STRIO_READWRITE;
- RBASIC(copy)->flags |= RBASIC(orig)->flags & STRIO_READWRITE;
++ptr->count;
return copy;
}
@@ -518,10 +503,10 @@ static VALUE
strio_reopen(int argc, VALUE *argv, VALUE self)
{
rb_io_taint_check(self);
- if (argc == 1 && !RB_TYPE_P(*argv, T_STRING)) {
+ if (argc == 1 && TYPE(*argv) != T_STRING) {
return strio_copy(self, *argv);
}
- strio_init(argc, argv, StringIO(self), self);
+ strio_init(argc, argv, StringIO(self));
return self;
}
@@ -588,7 +573,7 @@ strio_seek(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "11", NULL, &whence);
offset = NUM2LONG(argv[0]);
- if (CLOSED(self)) {
+ if (CLOSED(ptr)) {
rb_raise(rb_eIOError, "closed stream");
}
switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
@@ -630,6 +615,9 @@ strio_get_sync(VALUE self)
/*
* call-seq:
+ * strio.bytes {|byte| block } -> strio
+ * strio.bytes -> anEnumerator
+ *
* strio.each_byte {|byte| block } -> strio
* strio.each_byte -> anEnumerator
*
@@ -638,7 +626,7 @@ strio_get_sync(VALUE self)
static VALUE
strio_each_byte(VALUE self)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
RETURN_ENUMERATOR(self, 0, 0);
@@ -650,18 +638,6 @@ strio_each_byte(VALUE self)
}
/*
- * This is a deprecated alias for <code>each_byte</code>.
- */
-static VALUE
-strio_bytes(VALUE self)
-{
- rb_warn("StringIO#bytes is deprecated; use #each_byte instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(self, ID2SYM(rb_intern("each_byte")), 0, 0);
- return strio_each_byte(self);
-}
-
-/*
* call-seq:
* strio.getc -> string or nil
*
@@ -670,7 +646,7 @@ strio_bytes(VALUE self)
static VALUE
strio_getc(VALUE self)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
rb_encoding *enc = rb_enc_get(ptr->string);
int len;
char *p;
@@ -693,7 +669,7 @@ strio_getc(VALUE self)
static VALUE
strio_getbyte(VALUE self)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
int c;
if (ptr->pos >= RSTRING_LEN(ptr->string)) {
return Qnil;
@@ -731,13 +707,12 @@ strio_extend(struct StringIO *ptr, long pos, long len)
static VALUE
strio_ungetc(VALUE self, VALUE c)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
long lpos, clen;
char *p, *pend;
rb_encoding *enc, *enc2;
if (NIL_P(c)) return Qnil;
- check_modifiable(ptr);
if (FIXNUM_P(c)) {
int cc = FIX2INT(c);
char buf[16];
@@ -787,7 +762,7 @@ strio_ungetc(VALUE self, VALUE c)
static VALUE
strio_ungetbyte(VALUE self, VALUE c)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
char buf[1], *cp = buf;
long pos = ptr->pos, cl = 1;
VALUE str = ptr->string;
@@ -802,7 +777,6 @@ strio_ungetbyte(VALUE self, VALUE c)
cl = RSTRING_LEN(c);
if (cl == 0) return Qnil;
}
- check_modifiable(ptr);
rb_str_modify(str);
if (cl > pos) {
char *s;
@@ -830,7 +804,7 @@ strio_ungetbyte(VALUE self, VALUE c)
static VALUE
strio_readchar(VALUE self)
{
- VALUE c = rb_funcall2(self, rb_intern("getc"), 0, 0);
+ VALUE c = strio_getc(self);
if (NIL_P(c)) rb_eof_error();
return c;
}
@@ -844,13 +818,16 @@ strio_readchar(VALUE self)
static VALUE
strio_readbyte(VALUE self)
{
- VALUE c = rb_funcall2(self, rb_intern("getbyte"), 0, 0);
+ VALUE c = strio_getbyte(self);
if (NIL_P(c)) rb_eof_error();
return c;
}
/*
* call-seq:
+ * strio.chars {|char| block } -> strio
+ * strio.chars -> anEnumerator
+ *
* strio.each_char {|char| block } -> strio
* strio.each_char -> anEnumerator
*
@@ -870,19 +847,10 @@ strio_each_char(VALUE self)
}
/*
- * This is a deprecated alias for <code>each_char</code>.
- */
-static VALUE
-strio_chars(VALUE self)
-{
- rb_warn("StringIO#chars is deprecated; use #each_char instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(self, ID2SYM(rb_intern("each_char")), 0, 0);
- return strio_each_char(self);
-}
-
-/*
* call-seq:
+ * strio.codepoints {|c| block } -> strio
+ * strio.codepoints -> anEnumerator
+ *
* strio.each_codepoint {|c| block } -> strio
* strio.each_codepoint -> anEnumerator
*
@@ -898,7 +866,7 @@ strio_each_codepoint(VALUE self)
RETURN_ENUMERATOR(self, 0, 0);
- ptr = readable(self);
+ ptr = readable(StringIO(self));
enc = rb_enc_get(ptr->string);
for (;;) {
if (ptr->pos >= RSTRING_LEN(ptr->string)) {
@@ -913,18 +881,6 @@ strio_each_codepoint(VALUE self)
return self;
}
-/*
- * This is a deprecated alias for <code>each_codepoint</code>.
- */
-static VALUE
-strio_codepoints(VALUE self)
-{
- rb_warn("StringIO#codepoints is deprecated; use #each_codepoint instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(self, ID2SYM(rb_intern("each_codepoint")), 0, 0);
- return strio_each_codepoint(self);
-}
-
/* Boyer-Moore search: copied from regex.c */
static void
bm_init_skip(long *skip, const char *pat, long m)
@@ -972,7 +928,7 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
break;
case 1:
- if (!NIL_P(str) && !RB_TYPE_P(str, T_STRING)) {
+ if (!NIL_P(str) && TYPE(str) != T_STRING) {
VALUE tmp = rb_check_string_type(str);
if (NIL_P(tmp)) {
limit = NUM2LONG(str);
@@ -987,7 +943,7 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
case 2:
if (!NIL_P(str)) StringValue(str);
- if (!NIL_P(lim)) limit = NUM2LONG(lim);
+ limit = NUM2LONG(lim);
break;
}
@@ -1062,7 +1018,7 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
static VALUE
strio_gets(int argc, VALUE *argv, VALUE self)
{
- VALUE str = strio_getline(argc, argv, readable(self));
+ VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
rb_lastline_set(str);
return str;
@@ -1079,7 +1035,7 @@ strio_gets(int argc, VALUE *argv, VALUE self)
static VALUE
strio_readline(int argc, VALUE *argv, VALUE self)
{
- VALUE line = rb_funcall2(self, rb_intern("gets"), argc, argv);
+ VALUE line = strio_gets(argc, argv, self);
if (NIL_P(line)) rb_eof_error();
return line;
}
@@ -1096,40 +1052,28 @@ strio_readline(int argc, VALUE *argv, VALUE self)
* strio.each_line(sep,limit) {|line| block } -> strio
* strio.each_line(...) -> anEnumerator
*
+ * strio.lines(sep=$/) {|line| block } -> strio
+ * strio.lines(limit) {|line| block } -> strio
+ * strio.lines(sep,limit) {|line| block } -> strio
+ * strio.lines(...) -> anEnumerator
+ *
* See IO#each.
*/
static VALUE
strio_each(int argc, VALUE *argv, VALUE self)
{
+ struct StringIO *ptr = StringIO(self);
VALUE line;
- StringIO(self);
RETURN_ENUMERATOR(self, argc, argv);
- if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
- NUM2LONG(argv[argc-1]) == 0) {
- rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
- }
-
- while (!NIL_P(line = strio_getline(argc, argv, readable(self)))) {
+ while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
rb_yield(line);
}
return self;
}
/*
- * This is a deprecated alias for <code>each_line</code>.
- */
-static VALUE
-strio_lines(int argc, VALUE *argv, VALUE self)
-{
- rb_warn("StringIO#lines is deprecated; use #each_line instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(self, ID2SYM(rb_intern("each_line")), argc, argv);
- return strio_each(argc, argv, self);
-}
-
-/*
* call-seq:
* strio.readlines(sep=$/) -> array
* strio.readlines(limit) -> array
@@ -1140,16 +1084,9 @@ strio_lines(int argc, VALUE *argv, VALUE self)
static VALUE
strio_readlines(int argc, VALUE *argv, VALUE self)
{
- VALUE ary, line;
-
- StringIO(self);
- ary = rb_ary_new();
- if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
- NUM2LONG(argv[argc-1]) == 0) {
- rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
- }
-
- while (!NIL_P(line = strio_getline(argc, argv, readable(self)))) {
+ struct StringIO *ptr = StringIO(self);
+ VALUE ary = rb_ary_new(), line;
+ while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
rb_ary_push(ary, line);
}
return ary;
@@ -1168,16 +1105,16 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
static VALUE
strio_write(VALUE self, VALUE str)
{
- struct StringIO *ptr = writable(self);
+ struct StringIO *ptr = writable(StringIO(self));
long len, olen;
rb_encoding *enc, *enc2;
- rb_encoding *const ascii8bit = rb_ascii8bit_encoding();
- if (!RB_TYPE_P(str, T_STRING))
+ RB_GC_GUARD(str);
+ 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 != ascii8bit) {
+ if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
str = rb_str_conv_enc(str, enc2, enc);
}
len = RSTRING_LEN(str);
@@ -1188,13 +1125,7 @@ strio_write(VALUE self, VALUE str)
ptr->pos = olen;
}
if (ptr->pos == olen) {
- if (enc == ascii8bit || enc2 == ascii8bit) {
- rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc);
- OBJ_INFECT(ptr->string, str);
- }
- else {
- rb_str_buf_append(ptr->string, str);
- }
+ rb_str_cat(ptr->string, RSTRING_PTR(str), len);
}
else {
strio_extend(ptr, ptr->pos, len);
@@ -1202,7 +1133,6 @@ strio_write(VALUE self, VALUE str)
OBJ_INFECT(ptr->string, str);
}
OBJ_INFECT(ptr->string, self);
- RB_GC_GUARD(str);
ptr->pos += len;
return LONG2NUM(len);
}
@@ -1241,18 +1171,18 @@ strio_write(VALUE self, VALUE str)
static VALUE
strio_putc(VALUE self, VALUE ch)
{
- struct StringIO *ptr = writable(self);
- VALUE str;
+ struct StringIO *ptr = writable(StringIO(self));
+ int c = NUM2CHR(ch);
+ long olen;
check_modifiable(ptr);
- if (RB_TYPE_P(ch, T_STRING)) {
- str = rb_str_substr(ch, 0, 1);
- }
- else {
- char c = NUM2CHR(ch);
- str = rb_str_new(&c, 1);
+ olen = RSTRING_LEN(ptr->string);
+ if (ptr->flags & FMODE_APPEND) {
+ ptr->pos = olen;
}
- strio_write(self, str);
+ strio_extend(ptr, ptr->pos, 1);
+ RSTRING_PTR(ptr->string)[ptr->pos++] = c;
+ OBJ_INFECT(ptr->string, self);
return ch;
}
@@ -1266,25 +1196,22 @@ strio_putc(VALUE self, VALUE ch)
/*
* call-seq:
- * strio.read([length [, outbuf]]) -> string, outbuf, or nil
+ * strio.read([length [, buffer]]) -> string, buffer, or nil
*
* See IO#read.
*/
static VALUE
strio_read(int argc, VALUE *argv, VALUE self)
{
- struct StringIO *ptr = readable(self);
+ struct StringIO *ptr = readable(StringIO(self));
VALUE str = Qnil;
long len;
- int binary = 0;
switch (argc) {
case 2:
str = argv[1];
- if (!NIL_P(str)) {
- StringValue(str);
- rb_str_modify(str);
- }
+ StringValue(str);
+ rb_str_modify(str);
case 1:
if (!NIL_P(argv[0])) {
len = NUM2LONG(argv[0]);
@@ -1295,7 +1222,6 @@ strio_read(int argc, VALUE *argv, VALUE self)
if (!NIL_P(str)) rb_str_resize(str, 0);
return Qnil;
}
- binary = 1;
break;
}
/* fall through */
@@ -1319,19 +1245,21 @@ strio_read(int argc, VALUE *argv, VALUE self)
}
if (NIL_P(str)) {
str = strio_substr(ptr, ptr->pos, len);
- if (binary) rb_enc_associate(str, rb_ascii8bit_encoding());
+ if (argc > 0) rb_enc_associate(str, rb_ascii8bit_encoding());
}
else {
long rest = RSTRING_LEN(ptr->string) - ptr->pos;
if (len > rest) len = rest;
rb_str_resize(str, len);
MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
- if (binary)
- rb_enc_associate(str, rb_ascii8bit_encoding());
- else
- rb_enc_copy(str, ptr->string);
}
- ptr->pos += RSTRING_LEN(str);
+ if (NIL_P(str)) {
+ str = rb_str_new(0, 0);
+ len = 0;
+ }
+ else {
+ ptr->pos += len = RSTRING_LEN(str);
+ }
return str;
}
@@ -1345,14 +1273,14 @@ strio_read(int argc, VALUE *argv, VALUE self)
static VALUE
strio_sysread(int argc, VALUE *argv, VALUE self)
{
- VALUE val = rb_funcall2(self, rb_intern("read"), argc, argv);
+ VALUE val = strio_read(argc, argv, self);
if (NIL_P(val)) {
rb_eof_error();
}
return val;
}
-#define strio_syswrite rb_io_write
+#define strio_syswrite strio_write
/*
* call-seq:
@@ -1394,11 +1322,11 @@ strio_size(VALUE self)
static VALUE
strio_truncate(VALUE self, VALUE len)
{
- VALUE string = writable(self)->string;
+ VALUE string = writable(StringIO(self))->string;
long l = NUM2LONG(len);
long plen = RSTRING_LEN(string);
if (l < 0) {
- error_inval("negative length");
+ error_inval("negative legnth");
}
rb_str_resize(string, l);
if (plen < l) {
@@ -1437,29 +1365,17 @@ strio_internal_encoding(VALUE self)
/*
* call-seq:
- * strio.set_encoding(ext_enc, [int_enc[, opt]]) => strio
+ * strio.set_encoding(ext_enc) => strio
*
- * Specify the encoding of the StringIO as <i>ext_enc</i>.
- * Use the default external encoding if <i>ext_enc</i> is nil.
- * 2nd argument <i>int_enc</i> and optional hash <i>opt</i> argument
- * are ignored; they are for API compatibility to IO.
+ * Tagged with the encoding specified.
*/
static VALUE
-strio_set_encoding(int argc, VALUE *argv, VALUE self)
+strio_set_encoding(VALUE self, VALUE ext_enc)
{
rb_encoding* enc;
VALUE str = StringIO(self)->string;
- VALUE ext_enc, int_enc, opt;
-
- argc = rb_scan_args(argc, argv, "11:", &ext_enc, &int_enc, &opt);
-
- if (NIL_P(ext_enc)) {
- enc = rb_default_external_encoding();
- }
- else {
- enc = rb_to_encoding(ext_enc);
- }
+ enc = rb_to_encoding(ext_enc);
rb_enc_associate(str, enc);
return self;
}
@@ -1506,23 +1422,35 @@ Init_stringio()
rb_define_method(StringIO, "each", strio_each, -1);
rb_define_method(StringIO, "each_line", strio_each, -1);
- rb_define_method(StringIO, "lines", strio_lines, -1);
+ rb_define_method(StringIO, "lines", strio_each, -1);
rb_define_method(StringIO, "each_byte", strio_each_byte, 0);
- rb_define_method(StringIO, "bytes", strio_bytes, 0);
+ 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_chars, 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_codepoints, 0);
+ rb_define_method(StringIO, "codepoints", strio_each_codepoint, 0);
rb_define_method(StringIO, "getc", 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, "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, "read_nonblock", strio_sysread, -1);
rb_define_method(StringIO, "write", strio_write, 1);
+ rb_define_method(StringIO, "<<", strio_addstr, 1);
+ rb_define_method(StringIO, "print", strio_print, -1);
+ rb_define_method(StringIO, "printf", strio_printf, -1);
rb_define_method(StringIO, "putc", strio_putc, 1);
+ rb_define_method(StringIO, "puts", strio_puts, -1);
+ rb_define_method(StringIO, "syswrite", strio_syswrite, 1);
+ rb_define_method(StringIO, "write_nonblock", strio_syswrite, 1);
rb_define_method(StringIO, "isatty", strio_isatty, 0);
rb_define_method(StringIO, "tty?", strio_isatty, 0);
@@ -1534,26 +1462,5 @@ Init_stringio()
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);
-
- {
- VALUE mReadable = rb_define_module_under(rb_cIO, "readable");
- rb_define_method(mReadable, "readchar", strio_readchar, 0);
- rb_define_method(mReadable, "readbyte", strio_readbyte, 0);
- rb_define_method(mReadable, "readline", strio_readline, -1);
- rb_define_method(mReadable, "sysread", strio_sysread, -1);
- rb_define_method(mReadable, "readpartial", strio_sysread, -1);
- rb_define_method(mReadable, "read_nonblock", strio_sysread, -1);
- rb_include_module(StringIO, mReadable);
- }
- {
- VALUE mWritable = rb_define_module_under(rb_cIO, "writable");
- rb_define_method(mWritable, "<<", strio_addstr, 1);
- rb_define_method(mWritable, "print", strio_print, -1);
- rb_define_method(mWritable, "printf", strio_printf, -1);
- rb_define_method(mWritable, "puts", strio_puts, -1);
- rb_define_method(mWritable, "syswrite", strio_syswrite, 1);
- rb_define_method(mWritable, "write_nonblock", strio_syswrite, 1);
- rb_include_module(StringIO, mWritable);
- }
+ rb_define_method(StringIO, "set_encoding", strio_set_encoding, 1);
}
diff --git a/ext/strscan/.cvsignore b/ext/strscan/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/strscan/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index 3e5a295e31..0d21966fc2 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -1,3 +1,2 @@
require 'mkmf'
-$INCFLAGS << " -I$(top_srcdir)"
create_makefile 'strscan'
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 81667d8a0c..2bf1a4faa2 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -11,7 +11,6 @@
#include "ruby/ruby.h"
#include "ruby/re.h"
#include "ruby/encoding.h"
-#include "regint.h"
#define STRSCAN_VERSION "0.7.0"
@@ -21,7 +20,6 @@
static VALUE StringScanner;
static VALUE ScanError;
-static ID id_byteslice;
struct strscanner
{
@@ -53,8 +51,8 @@ struct strscanner
#define EOS_P(s) ((s)->curr >= RSTRING_LEN(p->str))
#define GET_SCANNER(obj,var) do {\
- (var) = check_strscan(obj);\
- if (NIL_P((var)->str)) rb_raise(rb_eArgError, "uninitialized StringScanner object");\
+ Data_Get_Struct(obj, struct strscanner, var);\
+ if (NIL_P(var->str)) rb_raise(rb_eArgError, "uninitialized StringScanner object");\
} while (0)
/* =======================================================================
@@ -65,10 +63,9 @@ 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));
-static struct strscanner *check_strscan _((VALUE obj));
-static void strscan_mark _((void *p));
-static void strscan_free _((void *p));
-static size_t strscan_memsize _((const void *p));
+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));
static VALUE strscan_initialize _((int argc, VALUE *argv, VALUE self));
static VALUE strscan_init_copy _((VALUE vself, VALUE vorig));
@@ -160,36 +157,18 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
======================================================================= */
static void
-strscan_mark(void *ptr)
+strscan_mark(struct strscanner *p)
{
- struct strscanner *p = ptr;
rb_gc_mark(p->str);
}
static void
-strscan_free(void *ptr)
+strscan_free(struct strscanner *p)
{
- struct strscanner *p = ptr;
onig_region_free(&(p->regs), 0);
ruby_xfree(p);
}
-static size_t
-strscan_memsize(const void *ptr)
-{
- const struct strscanner *p = ptr;
- size_t size = 0;
- if (p) {
- size = sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs);
- }
- return size;
-}
-
-static const rb_data_type_t strscanner_type = {
- "StringScanner",
- {strscan_mark, strscan_free, strscan_memsize}
-};
-
static VALUE
strscan_s_allocate(VALUE klass)
{
@@ -200,7 +179,7 @@ strscan_s_allocate(VALUE klass)
CLEAR_MATCH_STATUS(p);
onig_region_init(&(p->regs));
p->str = Qnil;
- return TypedData_Wrap_Struct(klass, &strscanner_type, p);
+ return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
}
/*
@@ -215,7 +194,7 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
struct strscanner *p;
VALUE str, need_dup;
- p = check_strscan(self);
+ Data_Get_Struct(self, struct strscanner, p);
rb_scan_args(argc, argv, "11", &str, &need_dup);
StringValue(str);
p->str = str;
@@ -223,10 +202,14 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
return self;
}
-static struct strscanner *
+void
check_strscan(VALUE obj)
{
- return rb_check_typeddata(obj, &strscanner_type);
+ if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
+ rb_raise(rb_eTypeError,
+ "wrong argument type %s (expected StringScanner)",
+ rb_obj_classname(obj));
+ }
}
/*
@@ -241,8 +224,9 @@ strscan_init_copy(VALUE vself, VALUE vorig)
{
struct strscanner *self, *orig;
- self = check_strscan(vself);
- orig = check_strscan(vorig);
+ Data_Get_Struct(vself, struct strscanner, self);
+ check_strscan(vorig);
+ Data_Get_Struct(vorig, struct strscanner, orig);
if (self != orig) {
self->flags = orig->flags;
self->str = orig->str;
@@ -333,8 +317,9 @@ strscan_get_string(VALUE self)
static VALUE
strscan_set_string(VALUE self, VALUE str)
{
- struct strscanner *p = check_strscan(self);
+ struct strscanner *p;
+ Data_Get_Struct(self, struct strscanner, p);
StringValue(str);
p->str = str;
p->curr = 0;
@@ -372,7 +357,7 @@ strscan_concat(VALUE self, VALUE str)
* value is zero. In the 'terminated' position (i.e. the string is exhausted),
* this value is the bytesize of the string.
*
- * In short, it's a 0-based index into bytes of the string.
+ * In short, it's a 0-based index into the string.
*
* s = StringScanner.new('test string')
* s.pos # -> 0
@@ -391,32 +376,6 @@ strscan_get_pos(VALUE self)
}
/*
- * Returns the character position of the scan pointer. In the 'reset' position, this
- * value is zero. In the 'terminated' position (i.e. the string is exhausted),
- * this value is the size of the string.
- *
- * In short, it's a 0-based index into the string.
- *
- * s = StringScanner.new("abcädeföghi")
- * s.charpos # -> 0
- * s.scan_until(/ä/) # -> "abcä"
- * s.pos # -> 5
- * s.charpos # -> 4
- */
-static VALUE
-strscan_get_charpos(VALUE self)
-{
- struct strscanner *p;
- VALUE substr;
-
- GET_SCANNER(self, p);
-
- substr = rb_funcall(p->str, id_byteslice, 2, INT2FIX(0), INT2NUM(p->curr));
-
- return rb_str_length(substr);
-}
-
-/*
* call-seq: pos=(n)
*
* Set the byte position of the scan pointer.
@@ -446,7 +405,7 @@ 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;
- long ret;
+ int ret;
int tmpreg;
Check_Type(regex, T_REGEXP);
@@ -696,7 +655,7 @@ static void
adjust_registers_to_matched(struct strscanner *p)
{
onig_region_clear(&(p->regs));
- onig_region_set(&(p->regs), 0, 0, (int)(p->curr - p->prev));
+ onig_region_set(&(p->regs), 0, 0, p->curr - p->prev);
}
/*
@@ -1104,69 +1063,76 @@ static VALUE
strscan_inspect(VALUE self)
{
struct strscanner *p;
+ char buf[BUFSIZE];
+ long len;
VALUE a, b;
- p = check_strscan(self);
+ Data_Get_Struct(self, struct strscanner, p);
if (NIL_P(p->str)) {
- a = rb_sprintf("#<%"PRIsVALUE" (uninitialized)>", rb_obj_class(self));
- return infect(a, p);
+ len = snprintf(buf, BUFSIZE, "#<%s (uninitialized)>",
+ rb_class2name(CLASS_OF(self)));
+ return infect(rb_str_new(buf, len), p);
}
if (EOS_P(p)) {
- a = rb_sprintf("#<%"PRIsVALUE" fin>", rb_obj_class(self));
- return infect(a, p);
+ len = snprintf(buf, BUFSIZE, "#<%s fin>",
+ rb_class2name(CLASS_OF(self)));
+ return infect(rb_str_new(buf, len), p);
}
if (p->curr == 0) {
- b = inspect2(p);
- a = rb_sprintf("#<%"PRIsVALUE" %ld/%ld @ %"PRIsVALUE">",
- rb_obj_class(self),
- p->curr, S_LEN(p),
- b);
- return infect(a, p);
+ b = inspect2(p);
+ len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
+ rb_class2name(CLASS_OF(self)),
+ p->curr, S_LEN(p),
+ RSTRING_PTR(b));
+ return infect(rb_str_new(buf, len), p);
}
a = inspect1(p);
b = inspect2(p);
- a = rb_sprintf("#<%"PRIsVALUE" %ld/%ld %"PRIsVALUE" @ %"PRIsVALUE">",
- rb_obj_class(self),
- p->curr, S_LEN(p),
- a, b);
- return infect(a, p);
+ 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));
+ return infect(rb_str_new(buf, len), p);
}
static VALUE
inspect1(struct strscanner *p)
{
- VALUE str;
+ char buf[BUFSIZE];
+ char *bp = buf;
long len;
if (p->curr == 0) return rb_str_new2("");
if (p->curr > INSPECT_LENGTH) {
- str = rb_str_new_cstr("...");
- len = INSPECT_LENGTH;
+ strcpy(bp, "..."); bp += 3;
+ len = INSPECT_LENGTH;
}
else {
- str = rb_str_new(0, 0);
- len = p->curr;
+ len = p->curr;
}
- rb_str_cat(str, CURPTR(p) - len, len);
- return rb_str_dump(str);
+ memcpy(bp, CURPTR(p) - len, len); bp += len;
+ return rb_str_dump(rb_str_new(buf, bp - buf));
}
static VALUE
inspect2(struct strscanner *p)
{
- VALUE str;
+ char buf[BUFSIZE];
+ char *bp = buf;
long len;
if (EOS_P(p)) return rb_str_new2("");
len = S_LEN(p) - p->curr;
if (len > INSPECT_LENGTH) {
- str = rb_str_new(CURPTR(p), INSPECT_LENGTH);
- rb_str_cat2(str, "...");
+ len = INSPECT_LENGTH;
+ memcpy(bp, CURPTR(p), len); bp += len;
+ strcpy(bp, "..."); bp += 3;
}
else {
- str = rb_str_new(CURPTR(p), len);
+ memcpy(bp, CURPTR(p), len); bp += len;
}
- return rb_str_dump(str);
+ return rb_str_dump(rb_str_new(buf, bp - buf));
}
/* =======================================================================
@@ -1282,8 +1248,6 @@ Init_strscan()
ID id_scanerr = rb_intern("ScanError");
VALUE tmp;
- id_byteslice = rb_intern("byteslice");
-
StringScanner = rb_define_class("StringScanner", rb_cObject);
ScanError = rb_define_class_under(StringScanner, "Error", rb_eStandardError);
if (!rb_const_defined(rb_cObject, id_scanerr)) {
@@ -1309,7 +1273,6 @@ Init_strscan()
rb_define_method(StringScanner, "<<", strscan_concat, 1);
rb_define_method(StringScanner, "pos", strscan_get_pos, 0);
rb_define_method(StringScanner, "pos=", strscan_set_pos, 1);
- rb_define_method(StringScanner, "charpos", strscan_get_charpos, 0);
rb_define_method(StringScanner, "pointer", strscan_get_pos, 0);
rb_define_method(StringScanner, "pointer=", strscan_set_pos, 1);
diff --git a/ext/syck/.cvsignore b/ext/syck/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/syck/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
new file mode 100644
index 0000000000..5cddb22831
--- /dev/null
+++ b/ext/syck/bytecode.c
@@ -0,0 +1,1165 @@
+/* Generated by re2c 0.9.10 on Mon Sep 19 23:21:26 2005 */
+#line 1 "bytecode.re"
+/*
+ * bytecode.re
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+#include "ruby/ruby.h"
+#include "syck.h"
+#include "gram.h"
+
+#define QUOTELEN 128
+
+/*
+ * They do my bidding...
+ */
+#define YYCTYPE char
+#define YYCURSOR parser->cursor
+#define YYMARKER parser->marker
+#define YYLIMIT parser->limit
+#define YYTOKEN parser->token
+#define YYTOKTMP parser->toktmp
+#define YYLINEPTR parser->lineptr
+#define YYLINECTPTR parser->linectptr
+#define YYLINE parser->linect
+#define YYFILL(n) syck_parser_read(parser)
+
+extern SyckParser *syck_parser_ptr;
+
+char *get_inline( SyckParser *parser );
+
+/*
+ * Repositions the cursor at `n' offset from the token start.
+ * Only works in `Header' and `Document' sections.
+ */
+#define YYPOS(n) YYCURSOR = YYTOKEN + n
+
+/*
+ * Track line numbers
+ */
+#define CHK_NL(ptr) if ( *( ptr - 1 ) == '\n' && ptr > YYLINECTPTR ) { YYLINEPTR = ptr; YYLINE++; YYLINECTPTR = YYLINEPTR; }
+
+/*
+ * I like seeing the level operations as macros...
+ */
+#define ADD_LEVEL(len, status) syck_parser_add_level( parser, len, status )
+#define POP_LEVEL() syck_parser_pop_level( parser )
+#define CURRENT_LEVEL() syck_parser_current_level( parser )
+
+/*
+ * Force a token next time around sycklex()
+ */
+#define FORCE_NEXT_TOKEN(tok) parser->force_token = tok;
+
+/*
+ * Adding levels in bytecode requires us to make sure
+ * we've got all our tokens worked out.
+ */
+#define ADD_BYTE_LEVEL(lvl, len, s ) \
+ switch ( lvl->status ) \
+ { \
+ case syck_lvl_seq: \
+ lvl->ncount++; \
+ ADD_LEVEL(len, syck_lvl_open); \
+ YYPOS(0); \
+ return '-'; \
+ \
+ case syck_lvl_map: \
+ lvl->ncount++; \
+ ADD_LEVEL(len, s); \
+ break; \
+ \
+ case syck_lvl_open: \
+ lvl->status = s; \
+ break; \
+ \
+ default: \
+ ADD_LEVEL(len, s); \
+ break; \
+ }
+
+/*
+ * Nice little macro to ensure we're YAML_IOPENed to the current level.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IOPEN(last_lvl, lvl_type, to_len, reset) \
+ if ( last_lvl->spaces < to_len ) \
+ { \
+ if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
+ { \
+ goto Document; \
+ } \
+ else \
+ { \
+ ADD_LEVEL( to_len, lvl_type ); \
+ if ( reset == 1 ) YYPOS(0); \
+ return YAML_IOPEN; \
+ } \
+ }
+
+/*
+ * Nice little macro to ensure closure of levels.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IEND(last_lvl, to_len) \
+ if ( last_lvl->spaces > to_len ) \
+ { \
+ syck_parser_pop_level( parser ); \
+ YYPOS(0); \
+ return YAML_IEND; \
+ }
+
+/*
+ * Concatenates string items and manages allocation
+ * to the string
+ */
+#define CAT(s, c, i, l) \
+ { \
+ if ( i + 1 >= c ) \
+ { \
+ c += QUOTELEN; \
+ S_REALLOC_N( s, char, c ); \
+ } \
+ s[i++] = l; \
+ s[i] = '\0'; \
+ }
+
+/*
+ * Parser for standard YAML Bytecode [UTF-8]
+ */
+int
+sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
+{
+ SyckLevel *lvl;
+ syck_parser_ptr = parser;
+ if ( YYCURSOR == NULL )
+ {
+ syck_parser_read( parser );
+ }
+
+ if ( parser->force_token != 0 )
+ {
+ int t = parser->force_token;
+ parser->force_token = 0;
+ return t;
+ }
+
+#line 172 "bytecode.re"
+
+
+ lvl = CURRENT_LEVEL();
+ if ( lvl->status == syck_lvl_doc )
+ {
+ goto Document;
+ }
+
+/* Header: */
+
+ YYTOKEN = YYCURSOR;
+
+
+#line 165 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
+ goto yy0;
+ ++YYCURSOR;
+yy0:
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy2;
+ case 'D': goto yy3;
+ default: goto yy5;
+ }
+yy2: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy4;
+ }
+yy3: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy6;
+ case 0x0D: goto yy8;
+ default: goto yy4;
+ }
+yy4:
+#line 199 "bytecode.re"
+{ YYPOS(0);
+ goto Document;
+ }
+#line 195 "<stdout>"
+yy5: yych = *++YYCURSOR;
+ goto yy4;
+yy6: ++YYCURSOR;
+ goto yy7;
+yy7:
+#line 186 "bytecode.re"
+{ if ( lvl->status == syck_lvl_header )
+ {
+ CHK_NL(YYCURSOR);
+ goto Directive;
+ }
+ else
+ {
+ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+ }
+#line 214 "<stdout>"
+yy8: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy6;
+ default: goto yy2;
+ }
+}
+#line 203 "bytecode.re"
+
+
+Document:
+ {
+ lvl = CURRENT_LEVEL();
+ if ( lvl->status == syck_lvl_header )
+ {
+ lvl->status = syck_lvl_doc;
+ }
+
+ YYTOKEN = YYCURSOR;
+
+
+#line 235 "<stdout>"
+{
+ YYCTYPE yych;
+ goto yy9;
+ ++YYCURSOR;
+yy9:
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy30;
+ case 0x0A: goto yy27;
+ case 0x0D: goto yy29;
+ case 'A': goto yy19;
+ case 'D': goto yy12;
+ case 'E': goto yy16;
+ case 'M': goto yy14;
+ case 'P': goto yy13;
+ case 'Q': goto yy15;
+ case 'R': goto yy21;
+ case 'S': goto yy17;
+ case 'T': goto yy23;
+ case 'c': goto yy25;
+ default: goto yy11;
+ }
+yy11:yy12: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy41;
+ case 0x0D: goto yy44;
+ default: goto yy11;
+ }
+yy13: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy41;
+ case 0x0D: goto yy43;
+ default: goto yy11;
+ }
+yy14: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy38;
+ case 0x0D: goto yy40;
+ default: goto yy11;
+ }
+yy15: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy35;
+ case 0x0D: goto yy37;
+ default: goto yy11;
+ }
+yy16: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy32;
+ case 0x0D: goto yy34;
+ default: goto yy11;
+ }
+yy17: ++YYCURSOR;
+ goto yy18;
+yy18:
+#line 288 "bytecode.re"
+{ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
+ goto Scalar;
+ }
+#line 296 "<stdout>"
+yy19: ++YYCURSOR;
+ goto yy20;
+yy20:
+#line 292 "bytecode.re"
+{ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
+ sycklval->name = get_inline( parser );
+ syck_hdlr_remove_anchor( parser, sycklval->name );
+ CHK_NL(YYCURSOR);
+ return YAML_ANCHOR;
+ }
+#line 307 "<stdout>"
+yy21: ++YYCURSOR;
+ goto yy22;
+yy22:
+#line 299 "bytecode.re"
+{ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_str);
+ sycklval->name = get_inline( parser );
+ POP_LEVEL();
+ if ( *( YYCURSOR - 1 ) == '\n' ) YYCURSOR--;
+ return YAML_ALIAS;
+ }
+#line 318 "<stdout>"
+yy23: ++YYCURSOR;
+ goto yy24;
+yy24:
+#line 306 "bytecode.re"
+{ char *qstr;
+ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_open);
+ qstr = get_inline( parser );
+ CHK_NL(YYCURSOR);
+ if ( qstr[0] == '!' )
+ {
+ int qidx = strlen( qstr );
+ if ( qstr[1] == '\0' )
+ {
+ free( qstr );
+ return YAML_ITRANSFER;
+ }
+
+ lvl = CURRENT_LEVEL();
+
+ /*
+ * URL Prefixing
+ */
+ if ( qstr[1] == '^' )
+ {
+ sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
+ sycklval->name[0] = '\0';
+ strcat( sycklval->name, lvl->domain );
+ strncat( sycklval->name, qstr + 2, qidx - 2 );
+ free( qstr );
+ }
+ else
+ {
+ char *carat = qstr + 1;
+ char *qend = qstr + qidx;
+ while ( (++carat) < qend )
+ {
+ if ( *carat == '^' )
+ break;
+ }
+
+ if ( carat < qend )
+ {
+ free( lvl->domain );
+ lvl->domain = syck_strndup( qstr + 1, carat - ( qstr + 1 ) );
+ sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
+ sycklval->name[0] = '\0';
+ strcat( sycklval->name, lvl->domain );
+ strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
+ free( qstr );
+ }
+ else
+ {
+ sycklval->name = S_ALLOC_N( char, strlen( qstr ) );
+ sycklval->name[0] = '\0';
+ S_MEMCPY( sycklval->name, qstr + 1, char, strlen( qstr ) );
+ free( qstr );
+ }
+ }
+ return YAML_TRANSFER;
+ }
+ sycklval->name = qstr;
+ return YAML_TAGURI;
+ }
+#line 382 "<stdout>"
+yy25: ++YYCURSOR;
+ goto yy26;
+yy26:
+#line 366 "bytecode.re"
+{ goto Comment; }
+#line 388 "<stdout>"
+yy27: ++YYCURSOR;
+ goto yy28;
+yy28:
+#line 368 "bytecode.re"
+{ CHK_NL(YYCURSOR);
+ if ( lvl->status == syck_lvl_seq )
+ {
+ return YAML_INDENT;
+ }
+ else if ( lvl->status == syck_lvl_map )
+ {
+ if ( lvl->ncount % 2 == 1 ) return ':';
+ else return YAML_INDENT;
+ }
+ goto Document;
+ }
+#line 405 "<stdout>"
+yy29: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy27;
+ default: goto yy11;
+ }
+yy30: ++YYCURSOR;
+ goto yy31;
+yy31:
+#line 381 "bytecode.re"
+{ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+#line 419 "<stdout>"
+yy32: ++YYCURSOR;
+ goto yy33;
+yy33:
+#line 252 "bytecode.re"
+{ if ( lvl->status == syck_lvl_seq && lvl->ncount == 0 )
+ {
+ lvl->ncount++;
+ YYPOS(0);
+ FORCE_NEXT_TOKEN( ']' );
+ return '[';
+ }
+ else if ( lvl->status == syck_lvl_map && lvl->ncount == 0 )
+ {
+ lvl->ncount++;
+ YYPOS(0);
+ FORCE_NEXT_TOKEN( '}' );
+ return '{';
+ }
+
+ POP_LEVEL();
+ lvl = CURRENT_LEVEL();
+ if ( lvl->status == syck_lvl_seq )
+ {
+ FORCE_NEXT_TOKEN(YAML_INDENT);
+ }
+ else if ( lvl->status == syck_lvl_map )
+ {
+ if ( lvl->ncount % 2 == 1 )
+ {
+ FORCE_NEXT_TOKEN(':');
+ }
+ else
+ {
+ FORCE_NEXT_TOKEN(YAML_INDENT);
+ }
+ }
+ CHK_NL(YYCURSOR);
+ return YAML_IEND;
+ }
+#line 459 "<stdout>"
+yy34: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy32;
+ default: goto yy11;
+ }
+yy35: ++YYCURSOR;
+ goto yy36;
+yy36:
+#line 237 "bytecode.re"
+{ int complex = 0;
+ if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
+ {
+ complex = 1;
+ }
+ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_seq);
+ CHK_NL(YYCURSOR);
+ if ( complex )
+ {
+ FORCE_NEXT_TOKEN( YAML_IOPEN );
+ return '?';
+ }
+ return YAML_IOPEN;
+ }
+#line 483 "<stdout>"
+yy37: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy35;
+ default: goto yy11;
+ }
+yy38: ++YYCURSOR;
+ goto yy39;
+yy39:
+#line 222 "bytecode.re"
+{ int complex = 0;
+ if ( lvl->ncount % 2 == 0 && ( lvl->status == syck_lvl_map || lvl->status == syck_lvl_seq ) )
+ {
+ complex = 1;
+ }
+ ADD_BYTE_LEVEL(lvl, lvl->spaces + 1, syck_lvl_map);
+ CHK_NL(YYCURSOR);
+ if ( complex )
+ {
+ FORCE_NEXT_TOKEN( YAML_IOPEN );
+ return '?';
+ }
+ return YAML_IOPEN;
+ }
+#line 507 "<stdout>"
+yy40: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy38;
+ default: goto yy11;
+ }
+yy41: ++YYCURSOR;
+ goto yy42;
+yy42:
+#line 217 "bytecode.re"
+{ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+#line 521 "<stdout>"
+yy43: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy41;
+ default: goto yy11;
+ }
+yy44: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy41;
+ default: goto yy11;
+ }
+}
+#line 386 "bytecode.re"
+
+
+ }
+
+Directive:
+ {
+ YYTOKEN = YYCURSOR;
+
+
+#line 543 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
+ goto yy45;
+ ++YYCURSOR;
+yy45:
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy47;
+ case 'V': goto yy48;
+ default: goto yy50;
+ }
+yy47: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy49;
+ }
+yy48: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ':':
+ case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy51;
+ default: goto yy49;
+ }
+yy49:
+#line 399 "bytecode.re"
+{ YYCURSOR = YYTOKEN;
+ return YAML_DOCSEP;
+ }
+#line 646 "<stdout>"
+yy50: yych = *++YYCURSOR;
+ goto yy49;
+yy51: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy52;
+yy52: switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy51;
+ case ':': goto yy53;
+ default: goto yy47;
+ }
+yy53: yych = *++YYCURSOR;
+ switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ':':
+ case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy54;
+ default: goto yy47;
+ }
+yy54: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy55;
+yy55: switch(yych){
+ case 0x0A: goto yy56;
+ case 0x0D: goto yy58;
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ':':
+ case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy54;
+ default: goto yy47;
+ }
+yy56: ++YYCURSOR;
+ goto yy57;
+yy57:
+#line 396 "bytecode.re"
+{ CHK_NL(YYCURSOR);
+ goto Directive; }
+#line 899 "<stdout>"
+yy58: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy56;
+ default: goto yy47;
+ }
+}
+#line 402 "bytecode.re"
+
+
+ }
+
+Comment:
+ {
+ YYTOKEN = YYCURSOR;
+
+
+#line 916 "<stdout>"
+{
+ YYCTYPE yych;
+ goto yy59;
+ ++YYCURSOR;
+yy59:
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy61;
+ case 0x0A: goto yy62;
+ case 0x0D: goto yy64;
+ default: goto yy66;
+ }
+yy61:yy62: ++YYCURSOR;
+ goto yy63;
+yy63:
+#line 412 "bytecode.re"
+{ CHK_NL(YYCURSOR);
+ goto Document; }
+#line 936 "<stdout>"
+yy64: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy67;
+ default: goto yy65;
+ }
+yy65:
+#line 415 "bytecode.re"
+{ goto Comment; }
+#line 945 "<stdout>"
+yy66: yych = *++YYCURSOR;
+ goto yy65;
+yy67: ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy63;
+}
+#line 417 "bytecode.re"
+
+
+ }
+
+Scalar:
+ {
+ int idx = 0;
+ int cap = 100;
+ char *str = S_ALLOC_N( char, cap );
+ char *tok;
+
+ str[0] = '\0';
+
+Scalar2:
+ tok = YYCURSOR;
+
+
+#line 970 "<stdout>"
+{
+ YYCTYPE yych;
+ goto yy68;
+ ++YYCURSOR;
+yy68:
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy74;
+ case 0x0A: goto yy70;
+ case 0x0D: goto yy72;
+ default: goto yy76;
+ }
+yy70: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 'C': goto yy78;
+ case 'N': goto yy80;
+ case 'Z': goto yy83;
+ default: goto yy71;
+ }
+yy71:
+#line 461 "bytecode.re"
+{ YYCURSOR = tok;
+ goto ScalarEnd;
+ }
+#line 996 "<stdout>"
+yy72: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy77;
+ default: goto yy73;
+ }
+yy73:
+#line 469 "bytecode.re"
+{ CAT(str, cap, idx, tok[0]);
+ goto Scalar2;
+ }
+#line 1007 "<stdout>"
+yy74: ++YYCURSOR;
+ goto yy75;
+yy75:
+#line 465 "bytecode.re"
+{ YYCURSOR = tok;
+ goto ScalarEnd;
+ }
+#line 1015 "<stdout>"
+yy76: yych = *++YYCURSOR;
+ goto yy73;
+yy77: yych = *++YYCURSOR;
+ switch(yych){
+ case 'C': goto yy78;
+ case 'N': goto yy80;
+ case 'Z': goto yy83;
+ default: goto yy71;
+ }
+yy78: ++YYCURSOR;
+ goto yy79;
+yy79:
+#line 435 "bytecode.re"
+{ CHK_NL(tok+1);
+ goto Scalar2; }
+#line 1031 "<stdout>"
+yy80: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy81;
+yy81: switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy80;
+ default: goto yy82;
+ }
+yy82:
+#line 438 "bytecode.re"
+{ CHK_NL(tok+1);
+ if ( tok + 2 < YYCURSOR )
+ {
+ char *count = tok + 2;
+ int total = strtod( count, NULL );
+ int i;
+ for ( i = 0; i < total; i++ )
+ {
+ CAT(str, cap, idx, '\n');
+ }
+ }
+ else
+ {
+ CAT(str, cap, idx, '\n');
+ }
+ goto Scalar2;
+ }
+#line 1068 "<stdout>"
+yy83: ++YYCURSOR;
+ goto yy84;
+yy84:
+#line 456 "bytecode.re"
+{ CHK_NL(tok+1);
+ CAT(str, cap, idx, '\0');
+ goto Scalar2;
+ }
+#line 1077 "<stdout>"
+}
+#line 473 "bytecode.re"
+
+
+ScalarEnd:
+ {
+ SyckNode *n = syck_alloc_str();
+ n->data.str->ptr = str;
+ n->data.str->len = idx;
+ sycklval->nodeData = n;
+ POP_LEVEL();
+ if ( parser->implicit_typing == 1 )
+ {
+ try_tag_implicit( sycklval->nodeData, parser->taguri_expansion );
+ }
+ return YAML_PLAIN;
+ }
+ }
+
+}
+
+char *
+get_inline( SyckParser *parser )
+{
+ int idx = 0;
+ int cap = 100;
+ char *str = S_ALLOC_N( char, cap );
+ char *tok;
+
+ str[0] = '\0';
+
+Inline:
+ {
+ tok = YYCURSOR;
+
+
+#line 1114 "<stdout>"
+{
+ YYCTYPE yych;
+ goto yy85;
+ ++YYCURSOR;
+yy85:
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy91;
+ case 0x0A: goto yy87;
+ case 0x0D: goto yy89;
+ default: goto yy93;
+ }
+yy87: ++YYCURSOR;
+ goto yy88;
+yy88:
+#line 508 "bytecode.re"
+{ CHK_NL(YYCURSOR);
+ return str; }
+#line 1134 "<stdout>"
+yy89: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy94;
+ default: goto yy90;
+ }
+yy90:
+#line 515 "bytecode.re"
+{ CAT(str, cap, idx, tok[0]);
+ goto Inline;
+ }
+#line 1145 "<stdout>"
+yy91: ++YYCURSOR;
+ goto yy92;
+yy92:
+#line 511 "bytecode.re"
+{ YYCURSOR = tok;
+ return str;
+ }
+#line 1153 "<stdout>"
+yy93: yych = *++YYCURSOR;
+ goto yy90;
+yy94: ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy88;
+}
+#line 519 "bytecode.re"
+
+
+ }
+
+}
+
diff --git a/ext/syck/depend b/ext/syck/depend
new file mode 100644
index 0000000000..3eec4de72a
--- /dev/null
+++ b/ext/syck/depend
@@ -0,0 +1,12 @@
+ruby_headers = $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
+ $(hdrdir)/missing.h $(hdrdir)/intern.h $(hdrdir)/st.h
+bytecode.o: bytecode.c syck.h gram.h $(ruby_headers)
+emitter.o: emitter.c syck.h $(ruby_headers)
+gram.o: gram.c syck.h $(hdrdir)/st.h
+handler.o: handler.c syck.h $(ruby_headers)
+implicit.o: implicit.c syck.h $(ruby_headers)
+node.o: node.c syck.h $(ruby_headers)
+rubyext.o: rubyext.c syck.h $(ruby_headers)
+syck.o: syck.c syck.h $(ruby_headers)
+token.o: token.c syck.h gram.h $(ruby_headers)
+yaml2byte.o: yaml2byte.c syck.h yamlbyte.h $(ruby_headers)
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
new file mode 100644
index 0000000000..985bfb2500
--- /dev/null
+++ b/ext/syck/emitter.c
@@ -0,0 +1,1247 @@
+/*
+ * emitter.c
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ *
+ * All Base64 code from Ruby's pack.c.
+ * Ruby is Copyright (C) 1993-2007 Yukihiro Matsumoto
+ */
+#include "ruby/ruby.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "syck.h"
+
+#define DEFAULT_ANCHOR_FORMAT "id%03d"
+
+const char hex_table[] =
+"0123456789ABCDEF";
+static char b64_table[] =
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/*
+ * Built-in base64 (from Ruby's pack.c)
+ */
+char *
+syck_base64enc( char *s, long len )
+{
+ long i = 0;
+ int padding = '=';
+ char *buff = S_ALLOC_N(char, len * 4 / 3 + 6);
+
+ while (len >= 3) {
+ buff[i++] = b64_table[077 & (*s >> 2)];
+ buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
+ buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))];
+ buff[i++] = b64_table[077 & s[2]];
+ s += 3;
+ len -= 3;
+ }
+ if (len == 2) {
+ buff[i++] = b64_table[077 & (*s >> 2)];
+ buff[i++] = b64_table[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
+ buff[i++] = b64_table[077 & (((s[1] << 2) & 074) | (('\0' >> 6) & 03))];
+ buff[i++] = padding;
+ }
+ else if (len == 1) {
+ buff[i++] = b64_table[077 & (*s >> 2)];
+ buff[i++] = b64_table[077 & (((*s << 4) & 060) | (('\0' >> 4) & 017))];
+ buff[i++] = padding;
+ buff[i++] = padding;
+ }
+ buff[i++] = '\n';
+ return buff;
+}
+
+char *
+syck_base64dec( char *s, long len )
+{
+ int a = -1,b = -1,c = 0,d;
+ static int first = 1;
+ static int b64_xtable[256];
+ char *ptr = syck_strndup( s, len );
+ char *end = ptr;
+ char *send = s + len;
+
+ if (first) {
+ int i;
+ first = 0;
+
+ for (i = 0; i < 256; i++) {
+ b64_xtable[i] = -1;
+ }
+ for (i = 0; i < 64; i++) {
+ b64_xtable[(int)b64_table[i]] = i;
+ }
+ }
+ while (s < send) {
+ while (s[0] == '\r' || s[0] == '\n') { s++; }
+ if ((a = b64_xtable[(int)s[0]]) == -1) break;
+ if ((b = b64_xtable[(int)s[1]]) == -1) break;
+ if ((c = b64_xtable[(int)s[2]]) == -1) break;
+ if ((d = b64_xtable[(int)s[3]]) == -1) break;
+ *end++ = a << 2 | b >> 4;
+ *end++ = b << 4 | c >> 2;
+ *end++ = c << 6 | d;
+ s += 4;
+ }
+ if (a != -1 && b != -1) {
+ if (s + 2 < send && s[2] == '=')
+ *end++ = a << 2 | b >> 4;
+ if (c != -1 && s + 3 < send && s[3] == '=') {
+ *end++ = a << 2 | b >> 4;
+ *end++ = b << 4 | c >> 2;
+ }
+ }
+ *end = '\0';
+ /*RSTRING_LEN(buf) = ptr - RSTRING_PTR(buf);*/
+ return ptr;
+}
+
+/*
+ * Allocate an emitter
+ */
+SyckEmitter *
+syck_new_emitter(void)
+{
+ SyckEmitter *e;
+ e = S_ALLOC( SyckEmitter );
+ e->headless = 0;
+ e->use_header = 0;
+ e->use_version = 0;
+ e->sort_keys = 0;
+ e->anchor_format = NULL;
+ e->explicit_typing = 0;
+ e->best_width = 80;
+ e->style = scalar_none;
+ e->stage = doc_open;
+ e->indent = 2;
+ e->level = -1;
+ e->anchors = NULL;
+ e->markers = NULL;
+ e->anchored = NULL;
+ e->bufsize = SYCK_BUFFERSIZE;
+ e->buffer = NULL;
+ e->marker = NULL;
+ e->bufpos = 0;
+ e->emitter_handler = NULL;
+ e->output_handler = NULL;
+ e->lvl_idx = 0;
+ e->lvl_capa = ALLOC_CT;
+ e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa );
+ syck_emitter_reset_levels( e );
+ e->bonus = NULL;
+ return e;
+}
+
+int
+syck_st_free_anchors( char *key, char *name, char *arg )
+{
+ S_FREE( name );
+ return ST_CONTINUE;
+}
+
+void
+syck_emitter_st_free( SyckEmitter *e )
+{
+ /*
+ * Free the anchor tables
+ */
+ if ( e->anchors != NULL )
+ {
+ st_foreach( e->anchors, syck_st_free_anchors, 0 );
+ st_free_table( e->anchors );
+ e->anchors = NULL;
+ }
+
+ if ( e->anchored != NULL )
+ {
+ st_free_table( e->anchored );
+ e->anchored = NULL;
+ }
+
+ /*
+ * Free the markers tables
+ */
+ if ( e->markers != NULL )
+ {
+ st_free_table( e->markers );
+ e->markers = NULL;
+ }
+}
+
+SyckLevel *
+syck_emitter_current_level( SyckEmitter *e )
+{
+ return &e->levels[e->lvl_idx-1];
+}
+
+SyckLevel *
+syck_emitter_parent_level( SyckEmitter *e )
+{
+ return &e->levels[e->lvl_idx-2];
+}
+
+void
+syck_emitter_pop_level( SyckEmitter *e )
+{
+ ASSERT( e != NULL );
+
+ /* The root level should never be popped */
+ if ( e->lvl_idx <= 1 ) return;
+
+ e->lvl_idx -= 1;
+ free( e->levels[e->lvl_idx].domain );
+}
+
+void
+syck_emitter_add_level( SyckEmitter *e, int len, enum syck_level_status status )
+{
+ ASSERT( e != NULL );
+ if ( e->lvl_idx + 1 > e->lvl_capa )
+ {
+ e->lvl_capa += ALLOC_CT;
+ S_REALLOC_N( e->levels, SyckLevel, e->lvl_capa );
+ }
+
+ ASSERT( len > e->levels[e->lvl_idx-1].spaces );
+ e->levels[e->lvl_idx].spaces = len;
+ e->levels[e->lvl_idx].ncount = 0;
+ e->levels[e->lvl_idx].domain = syck_strndup( e->levels[e->lvl_idx-1].domain, strlen( e->levels[e->lvl_idx-1].domain ) );
+ e->levels[e->lvl_idx].status = status;
+ e->levels[e->lvl_idx].anctag = 0;
+ e->lvl_idx += 1;
+}
+
+void
+syck_emitter_reset_levels( SyckEmitter *e )
+{
+ while ( e->lvl_idx > 1 )
+ {
+ syck_emitter_pop_level( e );
+ }
+
+ if ( e->lvl_idx < 1 )
+ {
+ e->lvl_idx = 1;
+ e->levels[0].spaces = -1;
+ e->levels[0].ncount = 0;
+ e->levels[0].domain = syck_strndup( "", 0 );
+ e->levels[0].anctag = 0;
+ }
+ e->levels[0].status = syck_lvl_header;
+}
+
+void
+syck_emitter_handler( SyckEmitter *e, SyckEmitterHandler hdlr )
+{
+ e->emitter_handler = hdlr;
+}
+
+void
+syck_output_handler( SyckEmitter *e, SyckOutputHandler hdlr )
+{
+ e->output_handler = hdlr;
+}
+
+void
+syck_free_emitter( SyckEmitter *e )
+{
+ /*
+ * Free tables
+ */
+ syck_emitter_st_free( e );
+ syck_emitter_reset_levels( e );
+ S_FREE( e->levels[0].domain );
+ S_FREE( e->levels );
+ if ( e->buffer != NULL )
+ {
+ S_FREE( e->buffer );
+ }
+ S_FREE( e );
+}
+
+void
+syck_emitter_clear( SyckEmitter *e )
+{
+ if ( e->buffer == NULL )
+ {
+ e->buffer = S_ALLOC_N( char, e->bufsize );
+ S_MEMZERO( e->buffer, char, e->bufsize );
+ }
+ e->buffer[0] = '\0';
+ e->marker = e->buffer;
+ e->bufpos = 0;
+}
+
+/*
+ * Raw write to the emitter buffer.
+ */
+void
+syck_emitter_write( SyckEmitter *e, const char *str, long len )
+{
+ long at;
+ ASSERT( str != NULL );
+ if ( e->buffer == NULL )
+ {
+ syck_emitter_clear( e );
+ }
+
+ /*
+ * Flush if at end of buffer
+ */
+ at = e->marker - e->buffer;
+ if ( len + at >= (long)e->bufsize )
+ {
+ syck_emitter_flush( e, 0 );
+ for (;;) {
+ long rest = e->bufsize - (e->marker - e->buffer);
+ if (len <= rest) break;
+ S_MEMCPY( e->marker, str, char, rest );
+ e->marker += rest;
+ str += rest;
+ len -= rest;
+ syck_emitter_flush( e, 0 );
+ }
+ }
+
+ /*
+ * Write to buffer
+ */
+ S_MEMCPY( e->marker, str, char, len );
+ e->marker += len;
+}
+
+/*
+ * Write a chunk of data out.
+ */
+void
+syck_emitter_flush( SyckEmitter *e, long check_room )
+{
+ /*
+ * Check for enough space in the buffer for check_room length.
+ */
+ if ( check_room > 0 )
+ {
+ if ( (long)e->bufsize > ( e->marker - e->buffer ) + check_room )
+ {
+ return;
+ }
+ }
+ else
+ {
+ check_room = e->bufsize;
+ }
+
+ /*
+ * Commit buffer.
+ */
+ if ( check_room > e->marker - e->buffer )
+ {
+ check_room = e->marker - e->buffer;
+ }
+ (e->output_handler)( e, e->buffer, check_room );
+ e->bufpos += check_room;
+ e->marker -= check_room;
+}
+
+/*
+ * Start emitting from the given node, check for anchoring and then
+ * issue the callback to the emitter handler.
+ */
+void
+syck_emit( SyckEmitter *e, st_data_t n )
+{
+ SYMID oid;
+ char *anchor_name = NULL;
+ int indent = 0;
+ long x = 0;
+ SyckLevel *lvl = syck_emitter_current_level( e );
+
+ /*
+ * Determine headers.
+ */
+ if ( e->stage == doc_open && ( e->headless == 0 || e->use_header == 1 ) )
+ {
+ if ( e->use_version == 1 )
+ {
+ char *header = S_ALLOC_N( char, 64 );
+ S_MEMZERO( header, char, 64 );
+ sprintf( header, "--- %%YAML:%d.%d ", SYCK_YAML_MAJOR, SYCK_YAML_MINOR );
+ syck_emitter_write( e, header, strlen( header ) );
+ S_FREE( header );
+ }
+ else
+ {
+ syck_emitter_write( e, "--- ", 4 );
+ }
+ e->stage = doc_processing;
+ }
+
+ /* Add new level */
+ if ( lvl->spaces >= 0 ) {
+ indent = lvl->spaces + e->indent;
+ }
+ syck_emitter_add_level( e, indent, syck_lvl_open );
+ lvl = syck_emitter_current_level( e );
+
+ /* 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 ) )
+ {
+ if ( e->anchored == NULL )
+ {
+ e->anchored = st_init_numtable();
+ }
+
+ if ( ! st_lookup( e->anchored, (st_data_t)anchor_name, (st_data_t *)&x ) )
+ {
+ char *an = S_ALLOC_N( char, strlen( anchor_name ) + 3 );
+ sprintf( an, "&%s ", anchor_name );
+ syck_emitter_write( e, an, strlen( anchor_name ) + 2 );
+ free( an );
+
+ x = 1;
+ st_insert( e->anchored, (st_data_t)anchor_name, (st_data_t)x );
+ lvl->anctag = 1;
+ }
+ else
+ {
+ char *an = S_ALLOC_N( char, strlen( anchor_name ) + 2 );
+ sprintf( an, "*%s", anchor_name );
+ syck_emitter_write( e, an, strlen( anchor_name ) + 1 );
+ free( an );
+
+ goto end_emit;
+ }
+ }
+
+ (e->emitter_handler)( e, n );
+
+ /* Pop the level */
+end_emit:
+ syck_emitter_pop_level( e );
+ if ( e->lvl_idx == 1 ) {
+ syck_emitter_write( e, "\n", 1 );
+ e->headless = 0;
+ e->stage = doc_open;
+ }
+}
+
+/*
+ * Determine what tag needs to be written, based on the taguri of the node
+ * 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 )
+{
+ SyckLevel *lvl;
+ if ( tag == NULL ) return;
+ if ( ignore != NULL && syck_tagcmp( tag, ignore ) == 0 && e->explicit_typing == 0 ) return;
+ lvl = syck_emitter_current_level( e );
+
+ /* implicit */
+ if ( strlen( tag ) == 0 ) {
+ syck_emitter_write( e, "! ", 2 );
+
+ /* global types */
+ } else if ( strncmp( tag, "tag:", 4 ) == 0 ) {
+ int taglen = strlen( tag );
+ syck_emitter_write( e, "!", 1 );
+ if ( strncmp( tag + 4, YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
+ int skip = 4 + strlen( YAML_DOMAIN ) + 1;
+ syck_emitter_write( e, tag + skip, taglen - skip );
+ } else {
+ const char *subd = tag + 4;
+ while ( *subd != ':' && *subd != '\0' ) subd++;
+ if ( *subd == ':' ) {
+ if ( subd - tag > ( (long)( strlen( YAML_DOMAIN ) + 5 )) &&
+ strncmp( subd - strlen( YAML_DOMAIN ), YAML_DOMAIN, strlen( YAML_DOMAIN ) ) == 0 ) {
+ syck_emitter_write( e, tag + 4, subd - strlen( YAML_DOMAIN ) - ( tag + 4 ) - 1 );
+ syck_emitter_write( e, "/", 1 );
+ syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
+ } else {
+ syck_emitter_write( e, tag + 4, subd - ( tag + 4 ) );
+ syck_emitter_write( e, "/", 1 );
+ syck_emitter_write( e, subd + 1, ( tag + taglen ) - ( subd + 1 ) );
+ }
+ } else {
+ /* TODO: Invalid tag (no colon after domain) */
+ return;
+ }
+ }
+ syck_emitter_write( e, " ", 1 );
+
+ /* private types */
+ } else if ( strncmp( tag, "x-private:", 10 ) == 0 ) {
+ syck_emitter_write( e, "!!", 2 );
+ syck_emitter_write( e, tag + 10, strlen( tag ) - 10 );
+ syck_emitter_write( e, " ", 1 );
+ }
+ lvl->anctag = 1;
+}
+
+/*
+ * Emit a newline and an appropriately spaced indent.
+ */
+void syck_emit_indent( SyckEmitter *e )
+{
+ int i;
+ SyckLevel *lvl = syck_emitter_current_level( e );
+ if ( e->bufpos == 0 && ( e->marker - e->buffer ) == 0 ) return;
+ if ( lvl->spaces >= 0 ) {
+ char *spcs = S_ALLOC_N( char, lvl->spaces + 2 );
+
+ spcs[0] = '\n'; spcs[lvl->spaces + 1] = '\0';
+ for ( i = 0; i < lvl->spaces; i++ ) spcs[i+1] = ' ';
+ syck_emitter_write( e, spcs, lvl->spaces + 1 );
+ free( spcs );
+ }
+}
+
+/* Clear the scan */
+#define SCAN_NONE 0
+/* All printable characters? */
+#define SCAN_NONPRINT 1
+/* Any indented lines? */
+#define SCAN_INDENTED 2
+/* Larger than the requested width? */
+#define SCAN_WIDE 4
+/* Opens or closes with whitespace? */
+#define SCAN_WHITEEDGE 8
+/* Contains a newline */
+#define SCAN_NEWLINE 16
+/* Contains a single quote */
+#define SCAN_SINGLEQ 32
+/* Contains a double quote */
+#define SCAN_DOUBLEQ 64
+/* Starts with a token */
+#define SCAN_INDIC_S 128
+/* Contains a flow indicator */
+#define SCAN_INDIC_C 256
+/* Ends without newlines */
+#define SCAN_NONL_E 512
+/* Ends with many newlines */
+#define SCAN_MANYNL_E 1024
+/* Contains flow map indicators */
+#define SCAN_FLOWMAP 2048
+/* Contains flow seq indicators */
+#define SCAN_FLOWSEQ 4096
+/* Contains a valid doc separator */
+#define SCAN_DOCSEP 8192
+
+/*
+ * Basic printable test for LATIN-1 characters.
+ */
+int
+syck_scan_scalar( int req_width, const char *cursor, long len )
+{
+ long i = 0, start = 0;
+ int flags = SCAN_NONE;
+
+ if ( len < 1 ) return flags;
+
+ /* c-indicators from the spec */
+ if ( cursor[0] == '[' || cursor[0] == ']' ||
+ cursor[0] == '{' || cursor[0] == '}' ||
+ cursor[0] == '!' || cursor[0] == '*' ||
+ cursor[0] == '&' || cursor[0] == '|' ||
+ cursor[0] == '>' || cursor[0] == '\'' ||
+ cursor[0] == '"' || cursor[0] == '#' ||
+ cursor[0] == '%' || cursor[0] == '@' ||
+ cursor[0] == '&' ) {
+ flags |= SCAN_INDIC_S;
+ }
+ if ( ( cursor[0] == '-' || cursor[0] == ':' ||
+ cursor[0] == '?' || cursor[0] == ',' ) &&
+ ( len == 1 || cursor[1] == ' ' || cursor[1] == '\n' ) )
+ {
+ flags |= SCAN_INDIC_S;
+ }
+
+ /* whitespace edges */
+ if ( cursor[len-1] != '\n' ) {
+ flags |= SCAN_NONL_E;
+ } else if ( len > 1 && cursor[len-2] == '\n' ) {
+ flags |= SCAN_MANYNL_E;
+ }
+ if (
+ ( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' || cursor[0] == '\n' || cursor[0] == '\r' ) ) ||
+ ( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) )
+ ) {
+ flags |= SCAN_WHITEEDGE;
+ }
+
+ /* opening doc sep */
+ if ( len >= 3 && strncmp( cursor, "---", 3 ) == 0 )
+ flags |= SCAN_DOCSEP;
+
+ /* scan string */
+ for ( i = 0; i < len; i++ ) {
+
+ if ( ! ( cursor[i] == 0x9 ||
+ cursor[i] == 0xA ||
+ cursor[i] == 0xD ||
+ ( cursor[i] >= 0x20 && cursor[i] <= 0x7E ) )
+ ) {
+ flags |= SCAN_NONPRINT;
+ }
+ else if ( cursor[i] == '\n' ) {
+ flags |= SCAN_NEWLINE;
+ if ( len - i >= 3 && strncmp( &cursor[i+1], "---", 3 ) == 0 )
+ flags |= SCAN_DOCSEP;
+ if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' )
+ flags |= SCAN_INDENTED;
+ if ( req_width > 0 && i - start > req_width )
+ flags |= SCAN_WIDE;
+ start = i;
+ }
+ else if ( cursor[i] == '\'' )
+ {
+ flags |= SCAN_SINGLEQ;
+ }
+ else if ( cursor[i] == '"' )
+ {
+ flags |= SCAN_DOUBLEQ;
+ }
+ else if ( cursor[i] == ']' )
+ {
+ flags |= SCAN_FLOWSEQ;
+ }
+ else if ( cursor[i] == '}' )
+ {
+ flags |= SCAN_FLOWMAP;
+ }
+ /* remember, if plain collections get implemented, to add nb-plain-flow-char */
+ else if ( ( cursor[i] == ' ' && cursor[i+1] == '#' ) ||
+ ( cursor[i] == ':' &&
+ ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) ) )
+ {
+ flags |= SCAN_INDIC_C;
+ }
+ else if ( cursor[i] == ',' &&
+ ( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) )
+ {
+ flags |= SCAN_FLOWMAP;
+ flags |= SCAN_FLOWSEQ;
+ }
+ }
+
+ /* printf( "---STR---\n%s\nFLAGS: %d\n", cursor, flags ); */
+ return flags;
+}
+/*
+ * 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 )
+{
+ 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 = "";
+
+ /* No empty nulls as map keys */
+ if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) &&
+ parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 )
+ {
+ str = "~";
+ len = 1;
+ }
+
+ scan = syck_scan_scalar( force_width, str, len );
+ match_implicit = syck_match_implicit( str, len );
+
+ /* quote strings which default to implicits */
+ implicit = syck_taguri( YAML_DOMAIN, match_implicit, strlen( match_implicit ) );
+ if ( syck_tagcmp( tag, implicit ) != 0 && syck_tagcmp( tag, "tag:yaml.org,2002:str" ) == 0 ) {
+ force_style = scalar_2quote;
+ } else {
+ /* complex key */
+ if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&
+ ( !( tag == NULL ||
+ ( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) )
+ {
+ syck_emitter_write( e, "? ", 2 );
+ parent->status = syck_lvl_mapx;
+ }
+ syck_emit_tag( e, tag, implicit );
+ }
+ S_FREE( implicit );
+
+ /* if still arbitrary, sniff a good block style. */
+ if ( force_style == scalar_none ) {
+ if ( scan & SCAN_NEWLINE ) {
+ force_style = scalar_literal;
+ } else {
+ force_style = scalar_plain;
+ }
+ }
+
+ if ( e->style == scalar_fold ) {
+ favor_style = scalar_fold;
+ }
+
+ /* Determine block style */
+ if ( scan & SCAN_NONPRINT ) {
+ force_style = scalar_2quote;
+ } else if ( scan & SCAN_WHITEEDGE ) {
+ force_style = scalar_2quote;
+ } else if ( force_style != scalar_fold && ( scan & SCAN_INDENTED ) ) {
+ force_style = scalar_literal;
+ } else if ( force_style == scalar_plain && ( scan & SCAN_NEWLINE ) ) {
+ force_style = favor_style;
+ } else if ( force_style == scalar_plain && parent->status == syck_lvl_iseq && ( scan & SCAN_FLOWSEQ ) ) {
+ force_style = scalar_2quote;
+ } else if ( force_style == scalar_plain && parent->status == syck_lvl_imap && ( scan & SCAN_FLOWMAP ) ) {
+ force_style = scalar_2quote;
+ /* } else if ( force_style == scalar_fold && ( ! ( scan & SCAN_WIDE ) ) ) {
+ force_style = scalar_literal; */
+ } else if ( force_style == scalar_plain && ( scan & SCAN_INDIC_S || scan & SCAN_INDIC_C ) ) {
+ if ( scan & SCAN_NEWLINE ) {
+ force_style = favor_style;
+ } else {
+ force_style = scalar_2quote;
+ }
+ }
+
+ if ( force_indent > 0 ) {
+ lvl->spaces = parent->spaces + force_indent;
+ } else if ( scan & SCAN_DOCSEP ) {
+ lvl->spaces = parent->spaces + e->indent;
+ }
+
+ /* For now, all ambiguous keys are going to be double-quoted */
+ if ( ( parent->status == syck_lvl_map || parent->status == syck_lvl_mapx ) && parent->ncount % 2 == 1 ) {
+ if ( force_style != scalar_plain ) {
+ force_style = scalar_2quote;
+ }
+ }
+
+ /* If the parent is an inline, double quote anything complex */
+ if ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) {
+ if ( force_style != scalar_plain && force_style != scalar_1quote ) {
+ force_style = scalar_2quote;
+ }
+ }
+
+ /* Fix the ending newlines */
+ if ( scan & SCAN_NONL_E ) {
+ keep_nl = NL_CHOMP;
+ } else if ( scan & SCAN_MANYNL_E ) {
+ keep_nl = NL_KEEP;
+ }
+
+ /* Write the text node */
+ switch ( force_style )
+ {
+ case scalar_1quote:
+ syck_emit_1quoted( e, force_width, str, len );
+ break;
+
+ case scalar_none:
+ case scalar_2quote:
+ syck_emit_2quoted( e, force_width, str, len );
+ break;
+
+ case scalar_fold:
+ syck_emit_folded( e, force_width, keep_nl, str, len );
+ break;
+
+ case scalar_literal:
+ syck_emit_literal( e, keep_nl, str, len );
+ break;
+
+ case scalar_plain:
+ syck_emitter_write( e, str, len );
+ break;
+ }
+
+ if ( parent->status == syck_lvl_mapx )
+ {
+ syck_emitter_write( e, "\n", 1 );
+ }
+}
+
+void
+syck_emitter_escape( SyckEmitter *e, const char *src, long len )
+{
+ int i;
+ for( i = 0; i < len; i++ )
+ {
+ if( (src[i] < 0x20) || (0x7E < src[i]) )
+ {
+ syck_emitter_write( e, "\\", 1 );
+ if( '\0' == src[i] )
+ syck_emitter_write( e, "0", 1 );
+ 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 );
+ }
+ }
+ else
+ {
+ syck_emitter_write( e, src + i, 1 );
+ if( '\\' == src[i] )
+ syck_emitter_write( e, "\\", 1 );
+ }
+ }
+}
+
+/*
+ * Outputs a single-quoted block.
+ */
+void
+syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
+{
+ char do_indent = 0;
+ const char *mark = str;
+ const char *start = str;
+ const char *end = str;
+ syck_emitter_write( e, "'", 1 );
+ while ( mark < str + len ) {
+ if ( do_indent ) {
+ syck_emit_indent( e );
+ do_indent = 0;
+ }
+ switch ( *mark ) {
+ case '\'': syck_emitter_write( e, "'", 1 ); break;
+
+ case '\n':
+ end = mark + 1;
+ if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
+ syck_emitter_write( e, "\n\n", 2 );
+ } else {
+ syck_emitter_write( e, "\n", 1 );
+ }
+ do_indent = 1;
+ start = mark + 1;
+ break;
+
+ case ' ':
+ if ( width > 0 && *start != ' ' && mark - end > width ) {
+ do_indent = 1;
+ end = mark + 1;
+ } else {
+ syck_emitter_write( e, " ", 1 );
+ }
+ break;
+
+ default:
+ syck_emitter_write( e, mark, 1 );
+ break;
+ }
+ mark++;
+ }
+ syck_emitter_write( e, "'", 1 );
+}
+
+/*
+ * Outputs a double-quoted block.
+ */
+void
+syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
+{
+ char do_indent = 0;
+ const char *mark = str;
+ const char *start = str;
+ const char *end = str;
+ syck_emitter_write( e, "\"", 1 );
+ while ( mark < str + len ) {
+ if ( do_indent > 0 ) {
+ if ( do_indent == 2 ) {
+ syck_emitter_write( e, "\\", 1 );
+ }
+ syck_emit_indent( e );
+ do_indent = 0;
+ }
+ switch ( *mark ) {
+
+ /* Escape sequences allowed within double quotes. */
+ case '"': syck_emitter_write( e, "\\\"", 2 ); break;
+ case '\\': syck_emitter_write( e, "\\\\", 2 ); break;
+ case '\0': syck_emitter_write( e, "\\0", 2 ); break;
+ case '\a': syck_emitter_write( e, "\\a", 2 ); break;
+ case '\b': syck_emitter_write( e, "\\b", 2 ); break;
+ case '\f': syck_emitter_write( e, "\\f", 2 ); break;
+ case '\r': syck_emitter_write( e, "\\r", 2 ); break;
+ case '\t': syck_emitter_write( e, "\\t", 2 ); break;
+ case '\v': syck_emitter_write( e, "\\v", 2 ); break;
+ case 0x1b: syck_emitter_write( e, "\\e", 2 ); break;
+
+ case '\n':
+ end = mark + 1;
+ syck_emitter_write( e, "\\n", 2 );
+ do_indent = 2;
+ start = mark + 1;
+ if ( start < str + len && ( *start == ' ' || *start == '\n' ) ) {
+ do_indent = 0;
+ }
+ break;
+
+ case ' ':
+ if ( width > 0 && *start != ' ' && mark - end > width ) {
+ do_indent = 1;
+ end = mark + 1;
+ } else {
+ syck_emitter_write( e, " ", 1 );
+ }
+ break;
+
+ default:
+ syck_emitter_escape( e, mark, 1 );
+ break;
+ }
+ mark++;
+ }
+ syck_emitter_write( e, "\"", 1 );
+}
+
+/*
+ * Outputs a literal block.
+ */
+void
+syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
+{
+ const char *mark = str;
+ const char *start = str;
+ const char *end = str;
+ syck_emitter_write( e, "|", 1 );
+ if ( keep_nl == NL_CHOMP ) {
+ syck_emitter_write( e, "-", 1 );
+ } else if ( keep_nl == NL_KEEP ) {
+ syck_emitter_write( e, "+", 1 );
+ }
+ syck_emit_indent( e );
+ while ( mark < str + len ) {
+ if ( *mark == '\n' ) {
+ end = mark;
+ if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) end += 1;
+ syck_emitter_write( e, start, end - start );
+ if ( mark + 1 == str + len ) {
+ if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
+ } else {
+ syck_emit_indent( e );
+ }
+ start = mark + 1;
+ }
+ mark++;
+ }
+ end = str + len;
+ if ( start < end ) {
+ syck_emitter_write( e, start, end - start );
+ }
+}
+
+/*
+ * Outputs a folded block.
+ */
+void
+syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long len )
+{
+ const char *mark = str;
+ const char *start = str;
+ const char *end = str;
+ syck_emitter_write( e, ">", 1 );
+ if ( keep_nl == NL_CHOMP ) {
+ syck_emitter_write( e, "-", 1 );
+ } else if ( keep_nl == NL_KEEP ) {
+ syck_emitter_write( e, "+", 1 );
+ }
+ syck_emit_indent( e );
+ if ( width <= 0 ) width = e->best_width;
+ while ( mark < str + len ) {
+ switch ( *mark ) {
+ case '\n':
+ syck_emitter_write( e, end, mark - end );
+ end = mark + 1;
+ if ( *start != ' ' && *start != '\n' && *end != '\n' && *end != ' ' ) {
+ syck_emitter_write( e, "\n", 1 );
+ }
+ if ( mark + 1 == str + len ) {
+ if ( keep_nl != NL_KEEP ) syck_emitter_write( e, "\n", 1 );
+ } else {
+ syck_emit_indent( e );
+ }
+ start = mark + 1;
+ break;
+
+ case ' ':
+ if ( *start != ' ' ) {
+ if ( mark - end > width ) {
+ syck_emitter_write( e, end, mark - end );
+ syck_emit_indent( e );
+ end = mark + 1;
+ }
+ }
+ break;
+ }
+ mark++;
+ }
+ if ( end < mark ) {
+ syck_emitter_write( e, end, mark - end );
+ }
+}
+
+/*
+ * Begins emission of a sequence.
+ */
+void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
+{
+ SyckLevel *parent = syck_emitter_parent_level( e );
+ SyckLevel *lvl = syck_emitter_current_level( e );
+ syck_emit_tag( e, tag, "tag:yaml.org,2002:seq" );
+ if ( style == seq_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
+ syck_emitter_write( e, "[", 1 );
+ lvl->status = syck_lvl_iseq;
+ } else {
+ /* complex key */
+ if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
+ syck_emitter_write( e, "? ", 2 );
+ parent->status = syck_lvl_mapx;
+ }
+ lvl->status = syck_lvl_seq;
+ }
+}
+
+/*
+ * Begins emission of a mapping.
+ */
+void
+syck_emit_map( SyckEmitter *e, const char *tag, enum map_style style )
+{
+ SyckLevel *parent = syck_emitter_parent_level( e );
+ SyckLevel *lvl = syck_emitter_current_level( e );
+ syck_emit_tag( e, tag, "tag:yaml.org,2002:map" );
+ if ( style == map_inline || ( parent->status == syck_lvl_imap || parent->status == syck_lvl_iseq ) ) {
+ syck_emitter_write( e, "{", 1 );
+ lvl->status = syck_lvl_imap;
+ } else {
+ /* complex key */
+ if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 ) {
+ syck_emitter_write( e, "? ", 2 );
+ parent->status = syck_lvl_mapx;
+ }
+ lvl->status = syck_lvl_map;
+ }
+}
+
+/*
+ * Handles emitting of a collection item (for both
+ * sequences and maps)
+ */
+void syck_emit_item( SyckEmitter *e, st_data_t n )
+{
+ SyckLevel *lvl = syck_emitter_current_level( e );
+ switch ( lvl->status )
+ {
+ case syck_lvl_seq:
+ {
+ SyckLevel *parent = syck_emitter_parent_level( e );
+
+ /* seq-in-map shortcut -- the lvl->anctag check should be unneccesary but
+ * there is a nasty shift/reduce in the parser on this point and
+ * i'm not ready to tickle it. */
+ if ( lvl->anctag == 0 && parent->status == syck_lvl_map && lvl->ncount == 0 ) {
+ lvl->spaces = parent->spaces;
+ }
+
+ /* seq-in-seq shortcut */
+ else if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
+ int spcs = ( lvl->spaces - parent->spaces ) - 2;
+ if ( spcs >= 0 ) {
+ int i = 0;
+ for ( i = 0; i < spcs; i++ ) {
+ syck_emitter_write( e, " ", 1 );
+ }
+ syck_emitter_write( e, "- ", 2 );
+ break;
+ }
+ }
+
+ syck_emit_indent( e );
+ syck_emitter_write( e, "- ", 2 );
+ }
+ break;
+
+ case syck_lvl_iseq:
+ {
+ if ( lvl->ncount > 0 ) {
+ syck_emitter_write( e, ", ", 2 );
+ }
+ }
+ break;
+
+ case syck_lvl_map:
+ {
+ SyckLevel *parent = syck_emitter_parent_level( e );
+
+ /* map-in-seq shortcut */
+ if ( lvl->anctag == 0 && parent->status == syck_lvl_seq && lvl->ncount == 0 ) {
+ int spcs = ( lvl->spaces - parent->spaces ) - 2;
+ if ( spcs >= 0 ) {
+ int i = 0;
+ for ( i = 0; i < spcs; i++ ) {
+ syck_emitter_write( e, " ", 1 );
+ }
+ break;
+ }
+ }
+
+ if ( lvl->ncount % 2 == 0 ) {
+ syck_emit_indent( e );
+ } else {
+ syck_emitter_write( e, ": ", 2 );
+ }
+ }
+ break;
+
+ case syck_lvl_mapx:
+ {
+ if ( lvl->ncount % 2 == 0 ) {
+ syck_emit_indent( e );
+ lvl->status = syck_lvl_map;
+ } else {
+ int i;
+ if ( lvl->spaces > 0 ) {
+ char *spcs = S_ALLOC_N( char, lvl->spaces + 1 );
+
+ spcs[lvl->spaces] = '\0';
+ for ( i = 0; i < lvl->spaces; i++ ) spcs[i] = ' ';
+ syck_emitter_write( e, spcs, lvl->spaces );
+ S_FREE( spcs );
+ }
+ syck_emitter_write( e, ": ", 2 );
+ }
+ }
+ break;
+
+ case syck_lvl_imap:
+ {
+ if ( lvl->ncount > 0 ) {
+ if ( lvl->ncount % 2 == 0 ) {
+ syck_emitter_write( e, ", ", 2 );
+ } else {
+ syck_emitter_write( e, ": ", 2 );
+ }
+ }
+ }
+ break;
+
+ default: break;
+ }
+ lvl->ncount++;
+
+ syck_emit( e, n );
+}
+
+/*
+ * Closes emission of a collection.
+ */
+void syck_emit_end( SyckEmitter *e )
+{
+ SyckLevel *lvl = syck_emitter_current_level( e );
+ SyckLevel *parent = syck_emitter_parent_level( e );
+ switch ( lvl->status )
+ {
+ case syck_lvl_seq:
+ if ( lvl->ncount == 0 ) {
+ syck_emitter_write( e, "[]\n", 3 );
+ } else if ( parent->status == syck_lvl_mapx ) {
+ syck_emitter_write( e, "\n", 1 );
+ }
+ break;
+
+ case syck_lvl_iseq:
+ syck_emitter_write( e, "]\n", 1 );
+ break;
+
+ case syck_lvl_map:
+ if ( lvl->ncount == 0 ) {
+ syck_emitter_write( e, "{}\n", 3 );
+ } else if ( lvl->ncount % 2 == 1 ) {
+ syck_emitter_write( e, ":\n", 1 );
+ } else if ( parent->status == syck_lvl_mapx ) {
+ syck_emitter_write( e, "\n", 1 );
+ }
+ break;
+
+ case syck_lvl_imap:
+ syck_emitter_write( e, "}\n", 1 );
+ break;
+
+ default: break;
+ }
+}
+
+/*
+ * Fill markers table with emitter nodes in the
+ * soon-to-be-emitted tree.
+ */
+SYMID
+syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
+{
+ SYMID oid = 0;
+ char *anchor_name = NULL;
+
+ /*
+ * Ensure markers table is initialized.
+ */
+ if ( e->markers == NULL )
+ {
+ e->markers = st_init_numtable();
+ }
+
+ /*
+ * Markers table initially marks the string position of the
+ * object. Doesn't yet create an anchor, simply notes the
+ * position.
+ */
+ if ( ! st_lookup( e->markers, n, (st_data_t *)&oid ) )
+ {
+ /*
+ * Store all markers
+ */
+ oid = e->markers->num_entries + 1;
+ st_insert( e->markers, n, (st_data_t)oid );
+ }
+ else
+ {
+ if ( e->anchors == NULL )
+ {
+ e->anchors = st_init_numtable();
+ }
+
+ if ( ! st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
+ {
+ int idx = 0;
+ const char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
+
+ /*
+ * Second time hitting this object, let's give it an anchor
+ */
+ idx = e->anchors->num_entries + 1;
+ anchor_name = S_ALLOC_N( char, strlen( anc ) + 10 );
+ S_MEMZERO( anchor_name, char, strlen( anc ) + 10 );
+ sprintf( anchor_name, anc, idx );
+
+ /*
+ * Insert into anchors table
+ */
+ st_insert( e->anchors, (st_data_t)oid, (st_data_t)anchor_name );
+ }
+ }
+ return oid;
+}
+
diff --git a/ext/syck/extconf.rb b/ext/syck/extconf.rb
new file mode 100644
index 0000000000..6c10448c70
--- /dev/null
+++ b/ext/syck/extconf.rb
@@ -0,0 +1,5 @@
+require 'mkmf'
+
+have_header( "st.h" )
+create_makefile( "syck" )
+
diff --git a/ext/syck/gram.c b/ext/syck/gram.c
new file mode 100644
index 0000000000..8fe4e4f3b5
--- /dev/null
+++ b/ext/syck/gram.c
@@ -0,0 +1,1894 @@
+/* A Bison parser, made by GNU Bison 1.875d. */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+ This program 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, 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, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+ This special exception was added by the Free Software Foundation
+ in version 1.24 of Bison. */
+
+/* Written by Richard Stallman by simplifying the original so called
+ ``semantic'' parser. */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+ infringing on user name space. This should be done even for local
+ variables, as they might otherwise be expanded by user macros.
+ There are some unavoidable exceptions within include files to
+ define necessary library symbols; they are noted "INFRINGES ON
+ USER NAME SPACE" below. */
+
+/* Identify Bison output. */
+#define YYBISON 1
+
+/* Skeleton name. */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers. */
+#define YYPURE 1
+
+/* Using locations. */
+#define YYLSP_NEEDED 0
+
+/* If NAME_PREFIX is specified substitute the variables and functions
+ names. */
+#define yyparse syckparse
+#define yylex sycklex
+#define yyerror syckerror
+#define yylval sycklval
+#define yychar syckchar
+#define yydebug syckdebug
+#define yynerrs sycknerrs
+
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ YAML_ANCHOR = 258,
+ YAML_ALIAS = 259,
+ YAML_TRANSFER = 260,
+ YAML_TAGURI = 261,
+ YAML_ITRANSFER = 262,
+ YAML_WORD = 263,
+ YAML_PLAIN = 264,
+ YAML_BLOCK = 265,
+ YAML_DOCSEP = 266,
+ YAML_IOPEN = 267,
+ YAML_INDENT = 268,
+ YAML_IEND = 269
+ };
+#endif
+#define YAML_ANCHOR 258
+#define YAML_ALIAS 259
+#define YAML_TRANSFER 260
+#define YAML_TAGURI 261
+#define YAML_ITRANSFER 262
+#define YAML_WORD 263
+#define YAML_PLAIN 264
+#define YAML_BLOCK 265
+#define YAML_DOCSEP 266
+#define YAML_IOPEN 267
+#define YAML_INDENT 268
+#define YAML_IEND 269
+
+
+
+
+/* Copy the first part of user declarations. */
+#line 14 "gram.y"
+
+
+#include "syck.h"
+
+void apply_seq_in_map( SyckParser *parser, SyckNode *n );
+
+#define YYPARSE_PARAM parser
+#define YYLEX_PARAM parser
+
+#define NULL_NODE(parser, node) \
+ SyckNode *node = syck_new_str( "", scalar_plain ); \
+ if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
+ { \
+ node->type_id = syck_taguri( YAML_DOMAIN, "null", 4 ); \
+ } \
+ else \
+ { \
+ node->type_id = syck_strndup( "null", 4 ); \
+ }
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 35 "gram.y"
+typedef union YYSTYPE {
+ SYMID nodeId;
+ SyckNode *nodeData;
+ char *name;
+} YYSTYPE;
+/* Line 191 of yacc.c. */
+#line 140 "gram.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations. */
+
+
+/* Line 214 of yacc.c. */
+#line 152 "gram.c"
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+# ifndef YYFREE
+# define YYFREE free
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# endif
+
+/* The parser invokes alloca or malloc; define the necessary symbols. */
+
+# ifdef YYSTACK_USE_ALLOCA
+# if YYSTACK_USE_ALLOCA
+# define YYSTACK_ALLOC alloca
+# endif
+# else
+# if defined (alloca) || defined (_ALLOCA_H)
+# define YYSTACK_ALLOC alloca
+# else
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
+# endif
+# endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# endif
+# define YYSTACK_ALLOC YYMALLOC
+# define YYSTACK_FREE YYFREE
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+#if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+ || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member. */
+union yyalloc
+{
+ short int yyss;
+ YYSTYPE yyvs;
+ };
+
+/* The size of the maximum gap between one aligned stack and the next. */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+# define YYSTACK_BYTES(N) \
+ ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
+ + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined (__GNUC__) && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ register YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (0)
+# endif
+# endif
+
+/* Relocate STACK from its old location to the new one. The
+ local variables YYSIZE and YYSTACKSIZE give the old and new number of
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (0)
+
+#endif
+
+#if defined (__STDC__) || defined (__cplusplus)
+ typedef signed char yysigned_char;
+#else
+ typedef short int yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL 52
+/* YYLAST -- Last index in YYTABLE. */
+#define YYLAST 396
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS 23
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS 29
+/* YYNRULES -- Number of rules. */
+#define YYNRULES 79
+/* YYNRULES -- Number of states. */
+#define YYNSTATES 128
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+#define YYUNDEFTOK 2
+#define YYMAXUTOK 269
+
+#define YYTRANSLATE(YYX) \
+ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+static const unsigned char yytranslate[] =
+{
+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 21, 15, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 16, 2,
+ 2, 2, 2, 22, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 17, 2, 18, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 19, 2, 20, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 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, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+ YYRHS. */
+static const unsigned char yyprhs[] =
+{
+ 0, 0, 3, 5, 8, 9, 11, 13, 15, 18,
+ 21, 24, 28, 30, 32, 36, 37, 40, 43, 46,
+ 49, 51, 54, 56, 58, 60, 63, 66, 69, 72,
+ 75, 77, 79, 81, 85, 87, 89, 91, 93, 95,
+ 99, 103, 106, 110, 113, 117, 120, 124, 127, 129,
+ 133, 136, 140, 143, 145, 149, 151, 153, 157, 161,
+ 165, 168, 172, 175, 179, 182, 184, 188, 190, 194,
+ 196, 200, 204, 207, 211, 215, 218, 220, 224, 226
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
+ 24, 0, -1, 25, -1, 11, 27, -1, -1, 33,
+ -1, 26, -1, 34, -1, 5, 26, -1, 6, 26,
+ -1, 3, 26, -1, 29, 26, 32, -1, 25, -1,
+ 28, -1, 29, 28, 30, -1, -1, 7, 28, -1,
+ 5, 28, -1, 6, 28, -1, 3, 28, -1, 12,
+ -1, 29, 13, -1, 14, -1, 13, -1, 14, -1,
+ 31, 32, -1, 5, 33, -1, 6, 33, -1, 7,
+ 33, -1, 3, 33, -1, 4, -1, 8, -1, 9,
+ -1, 29, 33, 32, -1, 10, -1, 35, -1, 39,
+ -1, 42, -1, 49, -1, 29, 37, 30, -1, 29,
+ 38, 30, -1, 15, 27, -1, 5, 31, 38, -1,
+ 5, 37, -1, 6, 31, 38, -1, 6, 37, -1,
+ 3, 31, 38, -1, 3, 37, -1, 36, -1, 38,
+ 31, 36, -1, 38, 31, -1, 17, 40, 18, -1,
+ 17, 18, -1, 41, -1, 40, 21, 41, -1, 25,
+ -1, 48, -1, 29, 43, 30, -1, 29, 47, 30,
+ -1, 5, 31, 47, -1, 5, 43, -1, 6, 31,
+ 47, -1, 6, 43, -1, 3, 31, 47, -1, 3,
+ 43, -1, 33, -1, 22, 25, 31, -1, 27, -1,
+ 44, 16, 45, -1, 46, -1, 47, 31, 36, -1,
+ 47, 31, 46, -1, 47, 31, -1, 25, 16, 27,
+ -1, 19, 50, 20, -1, 19, 20, -1, 51, -1,
+ 50, 21, 51, -1, 25, -1, 48, -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const unsigned short int yyrline[] =
+{
+ 0, 56, 56, 60, 65, 70, 71, 74, 75, 80,
+ 85, 94, 100, 101, 104, 109, 113, 121, 126, 131,
+ 145, 146, 149, 152, 155, 156, 164, 169, 174, 182,
+ 186, 194, 207, 208, 218, 219, 220, 221, 222, 228,
+ 232, 238, 244, 249, 254, 259, 264, 268, 274, 278,
+ 283, 292, 296, 302, 306, 313, 314, 320, 325, 332,
+ 337, 342, 347, 352, 356, 362, 363, 369, 379, 396,
+ 397, 409, 417, 426, 434, 438, 444, 445, 454, 461
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+ "$end", "error", "$undefined", "YAML_ANCHOR", "YAML_ALIAS",
+ "YAML_TRANSFER", "YAML_TAGURI", "YAML_ITRANSFER", "YAML_WORD",
+ "YAML_PLAIN", "YAML_BLOCK", "YAML_DOCSEP", "YAML_IOPEN", "YAML_INDENT",
+ "YAML_IEND", "'-'", "':'", "'['", "']'", "'{'", "'}'", "','", "'?'",
+ "$accept", "doc", "atom", "ind_rep", "atom_or_empty", "empty",
+ "indent_open", "indent_end", "indent_sep", "indent_flex_end", "word_rep",
+ "struct_rep", "implicit_seq", "basic_seq", "top_imp_seq",
+ "in_implicit_seq", "inline_seq", "in_inline_seq", "inline_seq_atom",
+ "implicit_map", "top_imp_map", "complex_key", "complex_value",
+ "complex_mapping", "in_implicit_map", "basic_mapping", "inline_map",
+ "in_inline_map", "inline_map_atom", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+ token YYLEX-NUM. */
+static const unsigned short int yytoknum[] =
+{
+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 266, 267, 268, 269, 45, 58, 91, 93, 123,
+ 125, 44, 63
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const unsigned char yyr1[] =
+{
+ 0, 23, 24, 24, 24, 25, 25, 26, 26, 26,
+ 26, 26, 27, 27, 28, 28, 28, 28, 28, 28,
+ 29, 29, 30, 31, 32, 32, 33, 33, 33, 33,
+ 33, 33, 33, 33, 34, 34, 34, 34, 34, 35,
+ 35, 36, 37, 37, 37, 37, 37, 37, 38, 38,
+ 38, 39, 39, 40, 40, 41, 41, 42, 42, 43,
+ 43, 43, 43, 43, 43, 44, 44, 45, 46, 47,
+ 47, 47, 47, 48, 49, 49, 50, 50, 51, 51
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const unsigned char yyr2[] =
+{
+ 0, 2, 1, 2, 0, 1, 1, 1, 2, 2,
+ 2, 3, 1, 1, 3, 0, 2, 2, 2, 2,
+ 1, 2, 1, 1, 1, 2, 2, 2, 2, 2,
+ 1, 1, 1, 3, 1, 1, 1, 1, 1, 3,
+ 3, 2, 3, 2, 3, 2, 3, 2, 1, 3,
+ 2, 3, 2, 1, 3, 1, 1, 3, 3, 3,
+ 2, 3, 2, 3, 2, 1, 3, 1, 3, 1,
+ 3, 3, 2, 3, 3, 2, 1, 3, 1, 1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+ STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+ means the default is an error. */
+static const unsigned char yydefact[] =
+{
+ 4, 0, 30, 0, 0, 0, 31, 32, 34, 15,
+ 20, 0, 0, 0, 2, 6, 0, 5, 7, 35,
+ 36, 37, 38, 10, 29, 8, 26, 9, 27, 0,
+ 0, 0, 0, 28, 15, 15, 15, 15, 12, 3,
+ 13, 15, 52, 55, 0, 53, 56, 75, 78, 79,
+ 0, 76, 1, 0, 0, 0, 21, 15, 0, 0,
+ 65, 48, 0, 0, 0, 0, 69, 0, 0, 19,
+ 17, 18, 15, 15, 15, 16, 15, 15, 15, 15,
+ 0, 15, 51, 0, 74, 0, 23, 0, 47, 64,
+ 0, 43, 60, 0, 45, 62, 41, 0, 24, 0,
+ 11, 33, 22, 39, 40, 50, 57, 15, 58, 72,
+ 14, 73, 54, 77, 65, 46, 63, 42, 59, 44,
+ 61, 66, 25, 49, 67, 68, 70, 71
+};
+
+/* YYDEFGOTO[NTERM-NUM]. */
+static const yysigned_char yydefgoto[] =
+{
+ -1, 13, 38, 15, 39, 40, 16, 103, 99, 101,
+ 17, 18, 19, 61, 62, 63, 20, 44, 45, 21,
+ 64, 65, 125, 66, 67, 46, 22, 50, 51
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+#define YYPACT_NINF -97
+static const short int yypact[] =
+{
+ 250, 318, -97, 318, 318, 374, -97, -97, -97, 335,
+ -97, 267, 232, 7, -97, -97, 192, -97, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, -97, 374,
+ 374, 374, 352, -97, 335, 335, 335, 384, -97, -97,
+ -97, 212, -97, 10, 0, -97, -97, -97, 10, -97,
+ -4, -97, -97, 284, 284, 284, -97, 335, 318, 30,
+ 30, -97, -2, 36, -2, 16, -97, 36, 30, -97,
+ -97, -97, 384, 384, 384, -97, 363, 301, 301, 301,
+ -2, 335, -97, 318, -97, 318, -97, 158, -97, -97,
+ 158, -97, -97, 158, -97, -97, -97, 24, -97, 30,
+ -97, -97, -97, -97, -97, 26, -97, 335, -97, 158,
+ -97, -97, -97, -97, -97, 24, 24, 24, 24, 24,
+ 24, -97, -97, -97, -97, -97, -97, -97
+};
+
+/* YYPGOTO[NTERM-NUM]. */
+static const yysigned_char yypgoto[] =
+{
+ -97, -97, 8, 81, -56, 109, 33, -53, 74, -54,
+ -1, -97, -97, -96, -31, -32, -97, -97, -44, -97,
+ 77, -97, -97, -52, 9, -6, -97, -97, -29
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule which
+ number is the opposite. If zero, do what YYDEFACT says.
+ If YYTABLE_NINF, syntax error. */
+#define YYTABLE_NINF -1
+static const unsigned char yytable[] =
+{
+ 24, 96, 26, 28, 33, 100, 49, 52, 14, 123,
+ 104, 106, 102, 126, 108, 60, 84, 85, 82, 43,
+ 48, 83, 88, 91, 94, 111, 81, 110, 24, 26,
+ 28, 68, 107, 24, 26, 28, 33, 86, 32, 112,
+ 60, 57, 41, 86, 98, 122, 88, 91, 94, 86,
+ 102, 124, 24, 26, 28, 115, 113, 127, 117, 0,
+ 0, 119, 32, 32, 32, 32, 97, 41, 41, 41,
+ 76, 24, 26, 28, 41, 68, 24, 26, 28, 49,
+ 0, 0, 23, 0, 25, 27, 114, 0, 0, 114,
+ 41, 43, 114, 48, 0, 0, 116, 59, 0, 118,
+ 0, 0, 120, 0, 0, 76, 76, 76, 114, 76,
+ 41, 41, 41, 0, 41, 23, 25, 27, 0, 0,
+ 32, 0, 59, 32, 0, 0, 32, 87, 90, 93,
+ 89, 92, 95, 0, 23, 25, 27, 105, 0, 0,
+ 41, 109, 32, 69, 70, 71, 75, 0, 0, 0,
+ 80, 87, 90, 93, 89, 92, 95, 0, 23, 25,
+ 27, 29, 2, 30, 31, 5, 6, 7, 0, 0,
+ 10, 121, 0, 57, 0, 0, 0, 0, 0, 0,
+ 58, 69, 70, 71, 0, 80, 69, 70, 71, 105,
+ 109, 105, 109, 105, 109, 53, 2, 54, 55, 5,
+ 6, 7, 8, 0, 10, 56, 0, 57, 0, 11,
+ 0, 12, 0, 0, 58, 77, 2, 78, 79, 37,
+ 6, 7, 8, 0, 10, 56, 0, 57, 0, 11,
+ 0, 12, 0, 0, 58, 1, 2, 3, 4, 5,
+ 6, 7, 8, 0, 10, 0, 0, 0, 0, 11,
+ 0, 12, 47, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 0, 0, 0, 0, 11, 0, 12,
+ 1, 2, 3, 4, 5, 6, 7, 8, 0, 10,
+ 0, 0, 0, 0, 11, 42, 12, 53, 2, 54,
+ 55, 5, 6, 7, 8, 0, 10, 86, 0, 0,
+ 0, 11, 0, 12, 77, 2, 78, 79, 37, 6,
+ 7, 8, 0, 10, 86, 0, 0, 0, 11, 0,
+ 12, 1, 2, 3, 4, 5, 6, 7, 8, 0,
+ 10, 0, 0, 0, 0, 11, 0, 12, 34, 2,
+ 35, 36, 37, 6, 7, 8, 0, 10, 0, 0,
+ 0, 0, 11, 0, 12, 29, 2, 30, 31, 5,
+ 6, 7, 0, 0, 10, 56, 72, 2, 73, 74,
+ 37, 6, 7, 0, 0, 10, 56, 29, 2, 30,
+ 31, 5, 6, 7, 0, 0, 10, 72, 2, 73,
+ 74, 37, 6, 7, 0, 0, 10
+};
+
+static const yysigned_char yycheck[] =
+{
+ 1, 57, 3, 4, 5, 59, 12, 0, 0, 105,
+ 63, 64, 14, 109, 67, 16, 20, 21, 18, 11,
+ 12, 21, 53, 54, 55, 81, 16, 80, 29, 30,
+ 31, 32, 16, 34, 35, 36, 37, 13, 5, 83,
+ 41, 15, 9, 13, 14, 99, 77, 78, 79, 13,
+ 14, 107, 53, 54, 55, 87, 85, 109, 90, -1,
+ -1, 93, 29, 30, 31, 32, 58, 34, 35, 36,
+ 37, 72, 73, 74, 41, 76, 77, 78, 79, 85,
+ -1, -1, 1, -1, 3, 4, 87, -1, -1, 90,
+ 57, 83, 93, 85, -1, -1, 87, 16, -1, 90,
+ -1, -1, 93, -1, -1, 72, 73, 74, 109, 76,
+ 77, 78, 79, -1, 81, 34, 35, 36, -1, -1,
+ 87, -1, 41, 90, -1, -1, 93, 53, 54, 55,
+ 53, 54, 55, -1, 53, 54, 55, 63, -1, -1,
+ 107, 67, 109, 34, 35, 36, 37, -1, -1, -1,
+ 41, 77, 78, 79, 77, 78, 79, -1, 77, 78,
+ 79, 3, 4, 5, 6, 7, 8, 9, -1, -1,
+ 12, 97, -1, 15, -1, -1, -1, -1, -1, -1,
+ 22, 72, 73, 74, -1, 76, 77, 78, 79, 115,
+ 116, 117, 118, 119, 120, 3, 4, 5, 6, 7,
+ 8, 9, 10, -1, 12, 13, -1, 15, -1, 17,
+ -1, 19, -1, -1, 22, 3, 4, 5, 6, 7,
+ 8, 9, 10, -1, 12, 13, -1, 15, -1, 17,
+ -1, 19, -1, -1, 22, 3, 4, 5, 6, 7,
+ 8, 9, 10, -1, 12, -1, -1, -1, -1, 17,
+ -1, 19, 20, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, -1, -1, -1, -1, 17, -1, 19,
+ 3, 4, 5, 6, 7, 8, 9, 10, -1, 12,
+ -1, -1, -1, -1, 17, 18, 19, 3, 4, 5,
+ 6, 7, 8, 9, 10, -1, 12, 13, -1, -1,
+ -1, 17, -1, 19, 3, 4, 5, 6, 7, 8,
+ 9, 10, -1, 12, 13, -1, -1, -1, 17, -1,
+ 19, 3, 4, 5, 6, 7, 8, 9, 10, -1,
+ 12, -1, -1, -1, -1, 17, -1, 19, 3, 4,
+ 5, 6, 7, 8, 9, 10, -1, 12, -1, -1,
+ -1, -1, 17, -1, 19, 3, 4, 5, 6, 7,
+ 8, 9, -1, -1, 12, 13, 3, 4, 5, 6,
+ 7, 8, 9, -1, -1, 12, 13, 3, 4, 5,
+ 6, 7, 8, 9, -1, -1, 12, 3, 4, 5,
+ 6, 7, 8, 9, -1, -1, 12
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
+static const unsigned char yystos[] =
+{
+ 0, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 17, 19, 24, 25, 26, 29, 33, 34, 35,
+ 39, 42, 49, 26, 33, 26, 33, 26, 33, 3,
+ 5, 6, 29, 33, 3, 5, 6, 7, 25, 27,
+ 28, 29, 18, 25, 40, 41, 48, 20, 25, 48,
+ 50, 51, 0, 3, 5, 6, 13, 15, 22, 26,
+ 33, 36, 37, 38, 43, 44, 46, 47, 33, 28,
+ 28, 28, 3, 5, 6, 28, 29, 3, 5, 6,
+ 28, 16, 18, 21, 20, 21, 13, 31, 37, 43,
+ 31, 37, 43, 31, 37, 43, 27, 25, 14, 31,
+ 32, 32, 14, 30, 30, 31, 30, 16, 30, 31,
+ 30, 27, 41, 51, 33, 38, 47, 38, 47, 38,
+ 47, 31, 32, 36, 27, 45, 36, 46
+};
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror. This remains here temporarily
+ to ease the transition to the new meaning of YYERROR, for GCC.
+ Once GCC version 2 has supplanted version 1, this can go. */
+
+#define YYFAIL goto yyerrlab
+
+#define YYRECOVERING() (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY && yylen == 1) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ yytoken = YYTRANSLATE (yychar); \
+ YYPOPSTACK; \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror ("syntax error: cannot back up");\
+ YYERROR; \
+ } \
+while (0)
+
+#define YYTERROR 1
+#define YYERRCODE 256
+
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+ are run). */
+
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ ((Current).first_line = (Rhs)[1].first_line, \
+ (Current).first_column = (Rhs)[1].first_column, \
+ (Current).last_line = (Rhs)[N].last_line, \
+ (Current).last_column = (Rhs)[N].last_column)
+#endif
+
+/* YYLEX -- calling `yylex' with the right arguments. */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval)
+#endif
+
+/* Enable debugging if requested. */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (0)
+
+# define YYDSYMPRINT(Args) \
+do { \
+ if (yydebug) \
+ yysymprint Args; \
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yysymprint (stderr, \
+ Token, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included). |
+`------------------------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short int *bottom, short int *top)
+#else
+static void
+yy_stack_print (bottom, top)
+ short int *bottom;
+ short int *top;
+#endif
+{
+ YYFPRINTF (stderr, "Stack now");
+ for (/* Nothing. */; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
+ YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced. |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+ int yyrule;
+#endif
+{
+ int yyi;
+ unsigned int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+ yyrule - 1, yylno);
+ /* Print the symbols being reduced, and their result. */
+ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
+
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (Rule); \
+} while (0)
+
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks. */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+ if the built-in stack extension method is used).
+
+ Do not make this value too large; the results are undefined if
+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+ evaluated with infinite-precision integer arithmetic. */
+
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+# if defined (__GLIBC__) && defined (_STRING_H)
+# define yystrlen strlen
+# else
+/* Return the length of YYSTR. */
+static YYSIZE_T
+# if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+# else
+yystrlen (yystr)
+ const char *yystr;
+# endif
+{
+ register const char *yys = yystr;
+
+ while (*yys++ != '\0')
+ continue;
+
+ return yys - yystr - 1;
+}
+# endif
+# endif
+
+# ifndef yystpcpy
+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+# define yystpcpy stpcpy
+# else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+ YYDEST. */
+static char *
+# if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+# else
+yystpcpy (yydest, yysrc)
+ char *yydest;
+ const char *yysrc;
+# endif
+{
+ register char *yyd = yydest;
+ register const char *yys = yysrc;
+
+ while ((*yyd++ = *yys++) != '\0')
+ continue;
+
+ return yyd - 1;
+}
+# endif
+# endif
+
+#endif /* !YYERROR_VERBOSE */
+
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+ FILE *yyoutput;
+ int yytype;
+ YYSTYPE *yyvaluep;
+#endif
+{
+ /* Pacify ``unused variable'' warnings. */
+ (void) yyvaluep;
+
+ if (yytype < YYNTOKENS)
+ {
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+ }
+ else
+ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+ switch (yytype)
+ {
+ default:
+ break;
+ }
+ YYFPRINTF (yyoutput, ")");
+}
+
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol. |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yytype, yyvaluep)
+ int yytype;
+ YYSTYPE *yyvaluep;
+#endif
+{
+ /* Pacify ``unused variable'' warnings. */
+ (void) yyvaluep;
+
+ switch (yytype)
+ {
+
+ default:
+ break;
+ }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes. */
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+
+
+
+/*----------.
+| yyparse. |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+ void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+ /* The lookahead symbol. */
+int yychar;
+
+/* The semantic value of the lookahead symbol. */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far. */
+int yynerrs;
+
+ register int yystate;
+ register int yyn;
+ int yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken = 0;
+
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ short int yyssa[YYINITDEPTH];
+ short int *yyss = yyssa;
+ register short int *yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ register YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK (yyvsp--, yyssp--)
+
+ YYSIZE_T yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+
+
+ /* When reducing, the number of symbols on the RHS of the reduced
+ rule. */
+ int yylen;
+
+ YYDPRINTF ((stderr, "Starting parse\n"));
+
+ yystate = 0;
+ yyerrstatus = 0;
+ yynerrs = 0;
+ yychar = YYEMPTY; /* Cause a token to be read. */
+
+ /* Initialize stack pointers.
+ Waste one element of value and location stack
+ so that they stay on the same level as the state stack.
+ The wasted elements are never initialized. */
+
+ yyssp = yyss;
+ yyvsp = yyvs;
+
+
+ goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate. |
+`------------------------------------------------------------*/
+ yynewstate:
+ /* In all cases, when you get here, the value and location stacks
+ have just been pushed. so pushing a state here evens the stacks.
+ */
+ yyssp++;
+
+ yysetstate:
+ *yyssp = yystate;
+
+ if (yyss + yystacksize - 1 <= yyssp)
+ {
+ /* Get the current used size of the three stacks, in elements. */
+ YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+ {
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ short int *yyss1 = yyss;
+
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow ("parser stack overflow",
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+
+ &yystacksize);
+
+ yyss = yyss1;
+ yyvs = yyvs1;
+ }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+ goto yyoverflowlab;
+# else
+ /* Extend the stack our own way. */
+ if (YYMAXDEPTH <= yystacksize)
+ goto yyoverflowlab;
+ yystacksize *= 2;
+ if (YYMAXDEPTH < yystacksize)
+ yystacksize = YYMAXDEPTH;
+
+ {
+ short int *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyoverflowlab;
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+
+# undef YYSTACK_RELOCATE
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
+ }
+# endif
+#endif /* no yyoverflow */
+
+ yyssp = yyss + yysize - 1;
+ yyvsp = yyvs + yysize - 1;
+
+
+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+ (unsigned long int) yystacksize));
+
+ if (yyss + yystacksize - 1 <= yyssp)
+ YYABORT;
+ }
+
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+ goto yybackup;
+
+/*-----------.
+| yybackup. |
+`-----------*/
+yybackup:
+
+/* Do appropriate processing given the current state. */
+/* Read a lookahead token if we need one and don't already have one. */
+/* yyresume: */
+
+ /* First try to decide what to do without reference to lookahead token. */
+
+ yyn = yypact[yystate];
+ if (yyn == YYPACT_NINF)
+ goto yydefault;
+
+ /* Not known => get a lookahead token if don't already have one. */
+
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ if (yychar == YYEMPTY)
+ {
+ YYDPRINTF ((stderr, "Reading a token: "));
+ yychar = YYLEX;
+ }
+
+ if (yychar <= YYEOF)
+ {
+ yychar = yytoken = YYEOF;
+ YYDPRINTF ((stderr, "Now at end of input.\n"));
+ }
+ else
+ {
+ yytoken = YYTRANSLATE (yychar);
+ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+ }
+
+ /* If the proper action on seeing token YYTOKEN is to reduce or to
+ detect an error, take that action. */
+ yyn += yytoken;
+ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+ goto yydefault;
+ yyn = yytable[yyn];
+ if (yyn <= 0)
+ {
+ if (yyn == 0 || yyn == YYTABLE_NINF)
+ goto yyerrlab;
+ yyn = -yyn;
+ goto yyreduce;
+ }
+
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
+ /* Shift the lookahead token. */
+ YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+
+ /* Discard the token being shifted unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
+
+ *++yyvsp = yylval;
+
+
+ /* Count tokens shifted since error; after three, turn off error
+ status. */
+ if (yyerrstatus)
+ yyerrstatus--;
+
+ yystate = yyn;
+ goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state. |
+`-----------------------------------------------------------*/
+yydefault:
+ yyn = yydefact[yystate];
+ if (yyn == 0)
+ goto yyerrlab;
+ goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction. |
+`-----------------------------*/
+yyreduce:
+ /* yyn is the number of a rule to reduce with. */
+ yylen = yyr2[yyn];
+
+ /* If YYLEN is nonzero, implement the default value of the action:
+ `$$ = $1'.
+
+ Otherwise, the following line sets YYVAL to garbage.
+ This behavior is undocumented and Bison
+ users should not rely upon it. Assigning to YYVAL
+ unconditionally makes the parser a bit smaller, and it avoids a
+ GCC warning that YYVAL may be used uninitialized. */
+ yyval = yyvsp[1-yylen];
+
+
+ YY_REDUCE_PRINT (yyn);
+ switch (yyn)
+ {
+ case 2:
+#line 57 "gram.y"
+ {
+ ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 3:
+#line 61 "gram.y"
+ {
+ ((SyckParser *)parser)->root = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 4:
+#line 65 "gram.y"
+ {
+ ((SyckParser *)parser)->eof = 1;
+ }
+ break;
+
+ case 8:
+#line 76 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 9:
+#line 81 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 10:
+#line 86 "gram.y"
+ {
+ /*
+ * _Anchors_: The language binding must keep a separate symbol table
+ * for anchors. The actual ID in the symbol table is returned to the
+ * higher nodes, though.
+ */
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 11:
+#line 95 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 14:
+#line 105 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 15:
+#line 109 "gram.y"
+ {
+ NULL_NODE( parser, n );
+ yyval.nodeData = n;
+ }
+ break;
+
+ case 16:
+#line 114 "gram.y"
+ {
+ if ( ((SyckParser *)parser)->implicit_typing == 1 )
+ {
+ try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ }
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 17:
+#line 122 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 18:
+#line 127 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 19:
+#line 132 "gram.y"
+ {
+ /*
+ * _Anchors_: The language binding must keep a separate symbol table
+ * for anchors. The actual ID in the symbol table is returned to the
+ * higher nodes, though.
+ */
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 26:
+#line 165 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 27:
+#line 170 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 28:
+#line 175 "gram.y"
+ {
+ if ( ((SyckParser *)parser)->implicit_typing == 1 )
+ {
+ try_tag_implicit( yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ }
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 29:
+#line 183 "gram.y"
+ {
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 30:
+#line 187 "gram.y"
+ {
+ /*
+ * _Aliases_: The anchor symbol table is scanned for the anchor name.
+ * The anchor's ID in the language's symbol table is returned.
+ */
+ yyval.nodeData = syck_hdlr_get_anchor( (SyckParser *)parser, yyvsp[0].name );
+ }
+ break;
+
+ case 31:
+#line 195 "gram.y"
+ {
+ SyckNode *n = yyvsp[0].nodeData;
+ if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+ {
+ n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+ }
+ else
+ {
+ n->type_id = syck_strndup( "str", 3 );
+ }
+ yyval.nodeData = n;
+ }
+ break;
+
+ case 33:
+#line 209 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 39:
+#line 229 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 40:
+#line 233 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 41:
+#line 239 "gram.y"
+ {
+ yyval.nodeId = syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 42:
+#line 245 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 43:
+#line 250 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 44:
+#line 255 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 45:
+#line 260 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 46:
+#line 265 "gram.y"
+ {
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 47:
+#line 269 "gram.y"
+ {
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 48:
+#line 275 "gram.y"
+ {
+ yyval.nodeData = syck_new_seq( yyvsp[0].nodeId );
+ }
+ break;
+
+ case 49:
+#line 279 "gram.y"
+ {
+ syck_seq_add( yyvsp[-2].nodeData, yyvsp[0].nodeId );
+ yyval.nodeData = yyvsp[-2].nodeData;
+ }
+ break;
+
+ case 50:
+#line 284 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 51:
+#line 293 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 52:
+#line 297 "gram.y"
+ {
+ yyval.nodeData = syck_alloc_seq();
+ }
+ break;
+
+ case 53:
+#line 303 "gram.y"
+ {
+ yyval.nodeData = syck_new_seq( syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+ }
+ break;
+
+ case 54:
+#line 307 "gram.y"
+ {
+ syck_seq_add( yyvsp[-2].nodeData, syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+ yyval.nodeData = yyvsp[-2].nodeData;
+ }
+ break;
+
+ case 57:
+#line 321 "gram.y"
+ {
+ apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 58:
+#line 326 "gram.y"
+ {
+ apply_seq_in_map( (SyckParser *)parser, yyvsp[-1].nodeData );
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 59:
+#line 333 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 60:
+#line 338 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, ((SyckParser *)parser)->taguri_expansion );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 61:
+#line 343 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-2].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 62:
+#line 348 "gram.y"
+ {
+ syck_add_transfer( yyvsp[-1].name, yyvsp[0].nodeData, 0 );
+ yyval.nodeData = yyvsp[0].nodeData;
+ }
+ break;
+
+ case 63:
+#line 353 "gram.y"
+ {
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-2].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 64:
+#line 357 "gram.y"
+ {
+ yyval.nodeData = syck_hdlr_add_anchor( (SyckParser *)parser, yyvsp[-1].name, yyvsp[0].nodeData );
+ }
+ break;
+
+ case 66:
+#line 364 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 68:
+#line 380 "gram.y"
+ {
+ yyval.nodeData = syck_new_map(
+ syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
+ syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+ }
+ break;
+
+ case 70:
+#line 398 "gram.y"
+ {
+ if ( yyvsp[-2].nodeData->shortcut == NULL )
+ {
+ yyvsp[-2].nodeData->shortcut = syck_new_seq( yyvsp[0].nodeId );
+ }
+ else
+ {
+ syck_seq_add( yyvsp[-2].nodeData->shortcut, yyvsp[0].nodeId );
+ }
+ yyval.nodeData = yyvsp[-2].nodeData;
+ }
+ break;
+
+ case 71:
+#line 410 "gram.y"
+ {
+ apply_seq_in_map( (SyckParser *)parser, yyvsp[-2].nodeData );
+ syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
+ syck_free_node( yyvsp[0].nodeData );
+ yyvsp[0].nodeData = NULL;
+ yyval.nodeData = yyvsp[-2].nodeData;
+ }
+ break;
+
+ case 72:
+#line 418 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 73:
+#line 427 "gram.y"
+ {
+ yyval.nodeData = syck_new_map(
+ syck_hdlr_add_node( (SyckParser *)parser, yyvsp[-2].nodeData ),
+ syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ) );
+ }
+ break;
+
+ case 74:
+#line 435 "gram.y"
+ {
+ yyval.nodeData = yyvsp[-1].nodeData;
+ }
+ break;
+
+ case 75:
+#line 439 "gram.y"
+ {
+ yyval.nodeData = syck_alloc_map();
+ }
+ break;
+
+ case 77:
+#line 446 "gram.y"
+ {
+ syck_map_update( yyvsp[-2].nodeData, yyvsp[0].nodeData );
+ syck_free_node( yyvsp[0].nodeData );
+ yyvsp[0].nodeData = NULL;
+ yyval.nodeData = yyvsp[-2].nodeData;
+ }
+ break;
+
+ case 78:
+#line 455 "gram.y"
+ {
+ NULL_NODE( parser, n );
+ yyval.nodeData = syck_new_map(
+ syck_hdlr_add_node( (SyckParser *)parser, yyvsp[0].nodeData ),
+ syck_hdlr_add_node( (SyckParser *)parser, n ) );
+ }
+ break;
+
+
+ }
+
+/* Line 1010 of yacc.c. */
+#line 1651 "gram.c"
+
+ yyvsp -= yylen;
+ yyssp -= yylen;
+
+
+ YY_STACK_PRINT (yyss, yyssp);
+
+ *++yyvsp = yyval;
+
+
+ /* Now `shift' the result of the reduction. Determine what state
+ that goes to, based on the state we popped back to and the rule
+ number reduced by. */
+
+ yyn = yyr1[yyn];
+
+ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+ yystate = yytable[yystate];
+ else
+ yystate = yydefgoto[yyn - YYNTOKENS];
+
+ goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+ /* If not already recovering from an error, report this error. */
+ if (!yyerrstatus)
+ {
+ ++yynerrs;
+#if YYERROR_VERBOSE
+ yyn = yypact[yystate];
+
+ if (YYPACT_NINF < yyn && yyn < YYLAST)
+ {
+ YYSIZE_T yysize = 0;
+ int yytype = YYTRANSLATE (yychar);
+ const char* yyprefix;
+ char *yymsg;
+ int yyx;
+
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yycount = 0;
+
+ yyprefix = ", expecting ";
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+ yycount += 1;
+ if (yycount == 5)
+ {
+ yysize = 0;
+ break;
+ }
+ }
+ yysize += (sizeof ("syntax error, unexpected ")
+ + yystrlen (yytname[yytype]));
+ yymsg = (char *) YYSTACK_ALLOC (yysize);
+ if (yymsg != 0)
+ {
+ char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+ yyp = yystpcpy (yyp, yytname[yytype]);
+
+ if (yycount < 5)
+ {
+ yyprefix = ", expecting ";
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+ {
+ yyp = yystpcpy (yyp, yyprefix);
+ yyp = yystpcpy (yyp, yytname[yyx]);
+ yyprefix = " or ";
+ }
+ }
+ yyerror (yymsg);
+ YYSTACK_FREE (yymsg);
+ }
+ else
+ yyerror ("syntax error; also virtual memory exhausted");
+ }
+ else
+#endif /* YYERROR_VERBOSE */
+ yyerror ("syntax error");
+ }
+
+
+
+ if (yyerrstatus == 3)
+ {
+ /* If just tried and failed to reuse lookahead token after an
+ error, discard it. */
+
+ if (yychar <= YYEOF)
+ {
+ /* If at end of input, pop the error token,
+ then the rest of the stack, then return failure. */
+ if (yychar == YYEOF)
+ for (;;)
+ {
+ YYPOPSTACK;
+ if (yyssp == yyss)
+ YYABORT;
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ yydestruct (yystos[*yyssp], yyvsp);
+ }
+ }
+ else
+ {
+ YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+ yydestruct (yytoken, &yylval);
+ yychar = YYEMPTY;
+
+ }
+ }
+
+ /* Else will try to reuse lookahead token after shifting the error
+ token. */
+ goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR. |
+`---------------------------------------------------*/
+yyerrorlab:
+
+#ifdef __GNUC__
+ /* Pacify GCC when the user code never invokes YYERROR and the label
+ yyerrorlab therefore never appears in user code. */
+ if (0)
+ goto yyerrorlab;
+#endif
+
+ yyvsp -= yylen;
+ yyssp -= yylen;
+ yystate = *yyssp;
+ goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR. |
+`-------------------------------------------------------------*/
+yyerrlab1:
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
+
+ for (;;)
+ {
+ yyn = yypact[yystate];
+ if (yyn != YYPACT_NINF)
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
+
+ /* Pop the current state because it cannot handle the error token. */
+ if (yyssp == yyss)
+ YYABORT;
+
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ yydestruct (yystos[yystate], yyvsp);
+ YYPOPSTACK;
+ yystate = *yyssp;
+ YY_STACK_PRINT (yyss, yyssp);
+ }
+
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
+ YYDPRINTF ((stderr, "Shifting error token, "));
+
+ *++yyvsp = yylval;
+
+
+ yystate = yyn;
+ goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here. |
+`-------------------------------------*/
+yyacceptlab:
+ yyresult = 0;
+ goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here. |
+`-----------------------------------*/
+yyabortlab:
+ yyresult = 1;
+ goto yyreturn;
+
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here. |
+`----------------------------------------------*/
+yyoverflowlab:
+ yyerror ("parser stack overflow");
+ yyresult = 2;
+ /* Fall through. */
+#endif
+
+yyreturn:
+#ifndef yyoverflow
+ if (yyss != yyssa)
+ YYSTACK_FREE (yyss);
+#endif
+ return yyresult;
+}
+
+
+#line 464 "gram.y"
+
+
+void
+apply_seq_in_map( SyckParser *parser, SyckNode *n )
+{
+ long map_len;
+ if ( n->shortcut == NULL )
+ {
+ return;
+ }
+
+ map_len = syck_map_count( n );
+ syck_map_assign( n, map_value, map_len - 1,
+ syck_hdlr_add_node( parser, n->shortcut ) );
+
+ n->shortcut = NULL;
+}
+
+
diff --git a/ext/syck/gram.h b/ext/syck/gram.h
new file mode 100644
index 0000000000..547149ab4b
--- /dev/null
+++ b/ext/syck/gram.h
@@ -0,0 +1,79 @@
+/* A Bison parser, made by GNU Bison 1.875d. */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+ This program 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, 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, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+ This special exception was added by the Free Software Foundation
+ in version 1.24 of Bison. */
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ YAML_ANCHOR = 258,
+ YAML_ALIAS = 259,
+ YAML_TRANSFER = 260,
+ YAML_TAGURI = 261,
+ YAML_ITRANSFER = 262,
+ YAML_WORD = 263,
+ YAML_PLAIN = 264,
+ YAML_BLOCK = 265,
+ YAML_DOCSEP = 266,
+ YAML_IOPEN = 267,
+ YAML_INDENT = 268,
+ YAML_IEND = 269
+ };
+#endif
+#define YAML_ANCHOR 258
+#define YAML_ALIAS 259
+#define YAML_TRANSFER 260
+#define YAML_TAGURI 261
+#define YAML_ITRANSFER 262
+#define YAML_WORD 263
+#define YAML_PLAIN 264
+#define YAML_BLOCK 265
+#define YAML_DOCSEP 266
+#define YAML_IOPEN 267
+#define YAML_INDENT 268
+#define YAML_IEND 269
+
+
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 35 "gram.y"
+typedef union YYSTYPE {
+ SYMID nodeId;
+ SyckNode *nodeData;
+ char *name;
+} YYSTYPE;
+/* Line 1285 of yacc.c. */
+#line 71 "gram.h"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+
+
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
new file mode 100644
index 0000000000..40f5ef27d0
--- /dev/null
+++ b/ext/syck/handler.c
@@ -0,0 +1,173 @@
+/*
+ * handler.c
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#include "ruby/ruby.h"
+#include "syck.h"
+
+SYMID
+syck_hdlr_add_node( SyckParser *p, SyckNode *n )
+{
+ SYMID id;
+
+ if ( ! n->id )
+ {
+ n->id = (p->handler)( p, n );
+ }
+ id = n->id;
+
+ if ( n->anchor == NULL )
+ {
+ syck_free_node( n );
+ }
+ return id;
+}
+
+SyckNode *
+syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
+{
+ SyckNode *ntmp = NULL;
+
+ n->anchor = a;
+ if ( p->bad_anchors != NULL )
+ {
+ SyckNode *bad;
+ if ( st_lookup( p->bad_anchors, (st_data_t)a, (void *)&bad ) )
+ {
+ if ( n->kind != syck_str_kind )
+ {
+ n->id = bad->id;
+ (p->handler)( p, n );
+ }
+ }
+ }
+ if ( p->anchors == NULL )
+ {
+ p->anchors = st_init_strtable();
+ }
+ if ( st_lookup( p->anchors, (st_data_t)a, (void *)&ntmp ) )
+ {
+ if ( ntmp != (void *)1 )
+ {
+ syck_free_node( ntmp );
+ }
+ }
+ st_insert( p->anchors, (st_data_t)a, (st_data_t)n );
+ return n;
+}
+
+void
+syck_hdlr_remove_anchor( SyckParser *p, char *a )
+{
+ char *atmp = a;
+ SyckNode *ntmp;
+ if ( p->anchors == NULL )
+ {
+ p->anchors = st_init_strtable();
+ }
+ if ( st_delete( p->anchors, (void *)&atmp, (void *)&ntmp ) )
+ {
+ if ( ntmp != (void *)1 )
+ {
+ syck_free_node( ntmp );
+ }
+ }
+ st_insert( p->anchors, (st_data_t)a, (st_data_t)1 );
+}
+
+SyckNode *
+syck_hdlr_get_anchor( SyckParser *p, char *a )
+{
+ SyckNode *n = NULL;
+
+ if ( p->anchors != NULL )
+ {
+ if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
+ {
+ if ( n != (void *)1 )
+ {
+ S_FREE( a );
+ return n;
+ }
+ else
+ {
+ if ( p->bad_anchors == NULL )
+ {
+ p->bad_anchors = st_init_strtable();
+ }
+ if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (void *)&n ) )
+ {
+ n = (p->bad_anchor_handler)( p, a );
+ st_insert( p->bad_anchors, (st_data_t)a, (st_data_t)n );
+ }
+ }
+ }
+ }
+
+ if ( n == NULL )
+ {
+ n = (p->bad_anchor_handler)( p, a );
+ }
+
+ if ( n->anchor )
+ {
+ S_FREE( a );
+ }
+ else
+ {
+ n->anchor = a;
+ }
+
+ return n;
+}
+
+void
+syck_add_transfer( char *uri, SyckNode *n, int taguri )
+{
+ if ( n->type_id != NULL )
+ {
+ S_FREE( n->type_id );
+ }
+
+ if ( taguri == 0 )
+ {
+ n->type_id = uri;
+ return;
+ }
+
+ n->type_id = syck_type_id_to_uri( uri );
+ S_FREE( uri );
+}
+
+char *
+syck_xprivate( const char *type_id, int type_len )
+{
+ char *uri = S_ALLOC_N( char, type_len + 14 );
+ uri[0] = '\0';
+ strcat( uri, "x-private:" );
+ strncat( uri, type_id, type_len );
+ return uri;
+}
+
+char *
+syck_taguri( const char *domain, const char *type_id, int type_len )
+{
+ char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
+ uri[0] = '\0';
+ strcat( uri, "tag:" );
+ strcat( uri, domain );
+ strcat( uri, ":" );
+ strncat( uri, type_id, type_len );
+ return uri;
+}
+
+int
+syck_try_implicit( SyckNode *n )
+{
+ return 1;
+}
+
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
new file mode 100644
index 0000000000..7d40747756
--- /dev/null
+++ b/ext/syck/implicit.c
@@ -0,0 +1,2990 @@
+/* Generated by re2c 0.9.10 on Mon Sep 19 21:46:50 2005 */
+#line 1 "implicit.re"
+/*
+ * implicit.re
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#include "ruby/ruby.h"
+#include "syck.h"
+
+#define YYCTYPE char
+#define YYCURSOR cursor
+#define YYMARKER marker
+#define YYLIMIT limit
+#define YYFILL(n) (void)0
+
+void
+try_tag_implicit( SyckNode *n, int taguri )
+{
+ const char *tid = "";
+ switch ( n->kind )
+ {
+ case syck_str_kind:
+ tid = syck_match_implicit( n->data.str->ptr, n->data.str->len );
+ break;
+
+ case syck_seq_kind:
+ tid = "seq";
+ break;
+
+ case syck_map_kind:
+ tid = "map";
+ break;
+ }
+ if ( n->type_id != NULL ) S_FREE( n->type_id );
+ if ( taguri == 1 )
+ {
+ n->type_id = syck_taguri( YAML_DOMAIN, tid, strlen( tid ) );
+ } else {
+ n->type_id = syck_strndup( tid, strlen( tid ) );
+ }
+}
+
+const char *
+syck_match_implicit( const char *str, size_t len )
+{
+ const char *cursor, *limit, *marker = 0;
+ cursor = str;
+ limit = str + len;
+
+
+#line 55 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy0;
+ ++YYCURSOR;
+yy0:
+ if((YYLIMIT - YYCURSOR) < 26) YYFILL(26);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy6;
+ case '+': goto yy16;
+ case '-': goto yy17;
+ case '.': goto yy20;
+ case '0': goto yy18;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy19;
+ case '<': goto yy22;
+ case '=': goto yy21;
+ case 'F': goto yy15;
+ case 'N': goto yy5;
+ case 'O': goto yy13;
+ case 'T': goto yy11;
+ case 'Y': goto yy9;
+ case 'f': goto yy14;
+ case 'n': goto yy4;
+ case 'o': goto yy12;
+ case 't': goto yy10;
+ case 'y': goto yy8;
+ case '~': goto yy2;
+ default: goto yy23;
+ }
+yy2: ++YYCURSOR;
+ if((yych = *YYCURSOR) <= 0x00) goto yy6;
+ goto yy3;
+yy3:
+#line 123 "implicit.re"
+{ return "str"; }
+#line 100 "<stdout>"
+yy4: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'o': goto yy172;
+ case 'u': goto yy200;
+ default: goto yy3;
+ }
+yy5: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'O': case 'o': goto yy172;
+ case 'U': goto yy195;
+ case 'u': goto yy196;
+ default: goto yy3;
+ }
+yy6: ++YYCURSOR;
+ goto yy7;
+yy7:
+#line 85 "implicit.re"
+{ return "null"; }
+#line 121 "<stdout>"
+yy8: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'e': goto yy194;
+ default: goto yy3;
+ }
+yy9: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'E': goto yy192;
+ case 'e': goto yy193;
+ default: goto yy3;
+ }
+yy10: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'r': goto yy190;
+ default: goto yy3;
+ }
+yy11: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'R': goto yy186;
+ case 'r': goto yy187;
+ default: goto yy3;
+ }
+yy12: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'f': goto yy185;
+ case 'n': goto yy182;
+ default: goto yy3;
+ }
+yy13: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'F': goto yy180;
+ case 'N': case 'n': goto yy182;
+ case 'f': goto yy181;
+ default: goto yy3;
+ }
+yy14: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'a': goto yy177;
+ default: goto yy3;
+ }
+yy15: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'A': goto yy168;
+ case 'a': goto yy169;
+ default: goto yy3;
+ }
+yy16: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '.': goto yy167;
+ case '0': goto yy158;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy47;
+ default: goto yy3;
+ }
+yy17: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '.': goto yy157;
+ case '0': goto yy158;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy47;
+ default: goto yy3;
+ }
+yy18: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x00: goto yy52;
+ case ',': goto yy142;
+ case '.': goto yy50;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7': goto yy140;
+ case '8':
+ case '9': goto yy141;
+ case ':': goto yy49;
+ case 'x': goto yy144;
+ default: goto yy3;
+ }
+yy19: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x00: goto yy52;
+ case ',': goto yy47;
+ case '.': goto yy50;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy46;
+ case ':': goto yy49;
+ default: goto yy3;
+ }
+yy20: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 'I': goto yy33;
+ case 'N': goto yy31;
+ case 'i': goto yy32;
+ case 'n': goto yy30;
+ default: goto yy3;
+ }
+yy21: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy28;
+ goto yy3;
+yy22: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '<': goto yy24;
+ default: goto yy3;
+ }
+yy23: yych = *++YYCURSOR;
+ goto yy3;
+yy24: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy26;
+ goto yy25;
+yy25: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy3;
+ }
+yy26: ++YYCURSOR;
+ goto yy27;
+yy27:
+#line 121 "implicit.re"
+{ return "merge"; }
+#line 279 "<stdout>"
+yy28: ++YYCURSOR;
+ goto yy29;
+yy29:
+#line 119 "implicit.re"
+{ return "default"; }
+#line 285 "<stdout>"
+yy30: yych = *++YYCURSOR;
+ switch(yych){
+ case 'a': goto yy45;
+ default: goto yy25;
+ }
+yy31: yych = *++YYCURSOR;
+ switch(yych){
+ case 'A': goto yy40;
+ case 'a': goto yy41;
+ default: goto yy25;
+ }
+yy32: yych = *++YYCURSOR;
+ switch(yych){
+ case 'n': goto yy39;
+ default: goto yy25;
+ }
+yy33: yych = *++YYCURSOR;
+ switch(yych){
+ case 'N': goto yy34;
+ case 'n': goto yy35;
+ default: goto yy25;
+ }
+yy34: yych = *++YYCURSOR;
+ switch(yych){
+ case 'F': goto yy36;
+ default: goto yy25;
+ }
+yy35: yych = *++YYCURSOR;
+ switch(yych){
+ case 'f': goto yy36;
+ default: goto yy25;
+ }
+yy36: yych = *++YYCURSOR;
+ if(yych >= 0x01) goto yy25;
+ goto yy37;
+yy37: ++YYCURSOR;
+ goto yy38;
+yy38:
+#line 105 "implicit.re"
+{ return "float#inf"; }
+#line 326 "<stdout>"
+yy39: yych = *++YYCURSOR;
+ switch(yych){
+ case 'f': goto yy36;
+ default: goto yy25;
+ }
+yy40: yych = *++YYCURSOR;
+ switch(yych){
+ case 'N': goto yy42;
+ default: goto yy25;
+ }
+yy41: yych = *++YYCURSOR;
+ switch(yych){
+ case 'N': goto yy42;
+ default: goto yy25;
+ }
+yy42: yych = *++YYCURSOR;
+ if(yych >= 0x01) goto yy25;
+ goto yy43;
+yy43: ++YYCURSOR;
+ goto yy44;
+yy44:
+#line 109 "implicit.re"
+{ return "float#nan"; }
+#line 350 "<stdout>"
+yy45: yych = *++YYCURSOR;
+ switch(yych){
+ case 'n': goto yy42;
+ default: goto yy25;
+ }
+yy46: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy74;
+ default: goto yy48;
+ }
+yy47: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy48;
+yy48: switch(yych){
+ case 0x00: goto yy52;
+ case ',': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy47;
+ case '.': goto yy50;
+ case ':': goto yy49;
+ default: goto yy25;
+ }
+yy49: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5': goto yy66;
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy67;
+ default: goto yy25;
+ }
+yy50: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ goto yy51;
+yy51: switch(yych){
+ case 0x00: goto yy56;
+ case ',': goto yy54;
+ case '.': goto yy58;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy50;
+ case 'E': case 'e': goto yy60;
+ default: goto yy25;
+ }
+yy52: ++YYCURSOR;
+ goto yy53;
+yy53:
+#line 97 "implicit.re"
+{ return "int"; }
+#line 432 "<stdout>"
+yy54: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy55;
+yy55: switch(yych){
+ case 0x00: goto yy56;
+ case ',': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy54;
+ default: goto yy25;
+ }
+yy56: ++YYCURSOR;
+ goto yy57;
+yy57:
+#line 99 "implicit.re"
+{ return "float#fix"; }
+#line 456 "<stdout>"
+yy58: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ goto yy59;
+yy59: switch(yych){
+ case '.': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy58;
+ case 'E': case 'e': goto yy60;
+ default: goto yy25;
+ }
+yy60: yych = *++YYCURSOR;
+ switch(yych){
+ case '+': case '-': goto yy61;
+ default: goto yy25;
+ }
+yy61: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy25;
+ goto yy63;
+yy62: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy63;
+yy63: switch(yych){
+ case 0x00: goto yy64;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy62;
+ default: goto yy25;
+ }
+yy64: ++YYCURSOR;
+ goto yy65;
+yy65:
+#line 101 "implicit.re"
+{ return "float#exp"; }
+#line 506 "<stdout>"
+yy66: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy70;
+ case '.': goto yy68;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy67;
+ case ':': goto yy49;
+ default: goto yy25;
+ }
+yy67: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy70;
+ case '.': goto yy68;
+ case ':': goto yy49;
+ default: goto yy25;
+ }
+yy68: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy69;
+yy69: switch(yych){
+ case 0x00: goto yy72;
+ case ',': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy68;
+ default: goto yy25;
+ }
+yy70: ++YYCURSOR;
+ goto yy71;
+yy71:
+#line 95 "implicit.re"
+{ return "int#base60"; }
+#line 558 "<stdout>"
+yy72: ++YYCURSOR;
+ goto yy73;
+yy73:
+#line 103 "implicit.re"
+{ return "float#base60"; }
+#line 564 "<stdout>"
+yy74: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy75;
+ default: goto yy48;
+ }
+yy75: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy76;
+ default: goto yy48;
+ }
+yy76: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy77;
+ default: goto yy25;
+ }
+yy77: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy78;
+ default: goto yy25;
+ }
+yy78: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy79;
+ default: goto yy25;
+ }
+yy79: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy80;
+ default: goto yy25;
+ }
+yy80: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy81;
+ default: goto yy25;
+ }
+yy81: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy82;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy25;
+ case 'T': goto yy84;
+ case 't': goto yy85;
+ default: goto yy87;
+ }
+yy82: ++YYCURSOR;
+ goto yy83;
+yy83:
+#line 111 "implicit.re"
+{ return "timestamp#ymd"; }
+#line 667 "<stdout>"
+yy84: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy126;
+ default: goto yy25;
+ }
+yy85: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy108;
+ default: goto yy25;
+ }
+yy86: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
+ yych = *YYCURSOR;
+ goto yy87;
+yy87: switch(yych){
+ case 0x09: case ' ': goto yy86;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy88;
+ default: goto yy25;
+ }
+yy88: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy89;
+ default: goto yy25;
+ }
+yy89: yych = *++YYCURSOR;
+ switch(yych){
+ case ':': goto yy90;
+ default: goto yy25;
+ }
+yy90: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy91;
+ default: goto yy25;
+ }
+yy91: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy92;
+ default: goto yy25;
+ }
+yy92: yych = *++YYCURSOR;
+ switch(yych){
+ case ':': goto yy93;
+ default: goto yy25;
+ }
+yy93: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy94;
+ default: goto yy25;
+ }
+yy94: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy95;
+ default: goto yy25;
+ }
+yy95: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x09: case ' ': goto yy98;
+ case '.': goto yy96;
+ default: goto yy25;
+ }
+yy96: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy97;
+yy97: switch(yych){
+ case 0x09: case ' ': goto yy98;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy96;
+ default: goto yy25;
+ }
+yy98: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+ yych = *YYCURSOR;
+ goto yy99;
+yy99: switch(yych){
+ case 0x09: case ' ': goto yy98;
+ case '+': case '-': goto yy101;
+ case 'Z': goto yy100;
+ default: goto yy25;
+ }
+yy100: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy105;
+ goto yy25;
+yy101: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy102;
+ default: goto yy25;
+ }
+yy102: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy103;
+ default: goto yy25;
+ }
+yy103: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy105;
+ case ':': goto yy104;
+ default: goto yy25;
+ }
+yy104: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy107;
+ default: goto yy25;
+ }
+yy105: ++YYCURSOR;
+ goto yy106;
+yy106:
+#line 115 "implicit.re"
+{ return "timestamp#spaced"; }
+#line 884 "<stdout>"
+yy107: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy100;
+ default: goto yy25;
+ }
+yy108: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy109;
+ default: goto yy25;
+ }
+yy109: yych = *++YYCURSOR;
+ switch(yych){
+ case ':': goto yy110;
+ default: goto yy25;
+ }
+yy110: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy111;
+ default: goto yy25;
+ }
+yy111: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy112;
+ default: goto yy25;
+ }
+yy112: yych = *++YYCURSOR;
+ switch(yych){
+ case ':': goto yy113;
+ default: goto yy25;
+ }
+yy113: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy114;
+ default: goto yy25;
+ }
+yy114: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy115;
+ default: goto yy25;
+ }
+yy115: yych = *++YYCURSOR;
+ switch(yych){
+ case '.': goto yy116;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy25;
+ default: goto yy117;
+ }
+yy116: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+ yych = *YYCURSOR;
+ goto yy117;
+yy117: switch(yych){
+ case '+': case '-': goto yy119;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy116;
+ case 'Z': goto yy118;
+ default: goto yy25;
+ }
+yy118: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy123;
+ goto yy25;
+yy119: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy120;
+ default: goto yy25;
+ }
+yy120: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy121;
+ default: goto yy25;
+ }
+yy121: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy123;
+ case ':': goto yy122;
+ default: goto yy25;
+ }
+yy122: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy125;
+ default: goto yy25;
+ }
+yy123: ++YYCURSOR;
+ goto yy124;
+yy124:
+#line 113 "implicit.re"
+{ return "timestamp#iso8601"; }
+#line 1069 "<stdout>"
+yy125: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy118;
+ default: goto yy25;
+ }
+yy126: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy127;
+ default: goto yy25;
+ }
+yy127: yych = *++YYCURSOR;
+ switch(yych){
+ case ':': goto yy128;
+ default: goto yy25;
+ }
+yy128: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy129;
+ default: goto yy25;
+ }
+yy129: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy130;
+ default: goto yy25;
+ }
+yy130: yych = *++YYCURSOR;
+ switch(yych){
+ case ':': goto yy131;
+ default: goto yy25;
+ }
+yy131: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy132;
+ default: goto yy25;
+ }
+yy132: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy133;
+ default: goto yy25;
+ }
+yy133: yych = *++YYCURSOR;
+ switch(yych){
+ case '.': goto yy134;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy25;
+ case 'Z': goto yy136;
+ default: goto yy135;
+ }
+yy134: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+ yych = *YYCURSOR;
+ goto yy135;
+yy135: switch(yych){
+ case '+': case '-': goto yy119;
+ case '0': goto yy134;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy138;
+ case 'Z': goto yy118;
+ default: goto yy25;
+ }
+yy136: yych = *++YYCURSOR;
+ if(yych >= 0x01) goto yy25;
+ goto yy137;
+yy137: yych = *++YYCURSOR;
+ goto yy124;
+yy138: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
+ yych = *YYCURSOR;
+ goto yy139;
+yy139: switch(yych){
+ case '+': case '-': goto yy119;
+ case '0': goto yy134;
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy138;
+ case 'Z': goto yy136;
+ default: goto yy25;
+ }
+yy140: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7': goto yy155;
+ case '8':
+ case '9': goto yy153;
+ default: goto yy143;
+ }
+yy141: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy153;
+ default: goto yy152;
+ }
+yy142: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy143;
+yy143: switch(yych){
+ case 0x00: goto yy149;
+ case ',': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7': goto yy142;
+ case '.': goto yy50;
+ case '8':
+ case '9': goto yy151;
+ case ':': goto yy49;
+ default: goto yy25;
+ }
+yy144: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy25;
+ goto yy146;
+yy145: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy146;
+yy146: switch(yych){
+ case 0x00: goto yy147;
+ case ',': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f': goto yy145;
+ default: goto yy25;
+ }
+yy147: ++YYCURSOR;
+ goto yy148;
+yy148:
+#line 91 "implicit.re"
+{ return "int#hex"; }
+#line 1307 "<stdout>"
+yy149: ++YYCURSOR;
+ goto yy150;
+yy150:
+#line 93 "implicit.re"
+{ return "int#oct"; }
+#line 1313 "<stdout>"
+yy151: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy152;
+yy152: switch(yych){
+ case ',': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy151;
+ case '.': goto yy50;
+ case ':': goto yy49;
+ default: goto yy25;
+ }
+yy153: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy154;
+ default: goto yy152;
+ }
+yy154: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy76;
+ default: goto yy152;
+ }
+yy155: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7': goto yy156;
+ case '8':
+ case '9': goto yy154;
+ default: goto yy143;
+ }
+yy156: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy76;
+ default: goto yy143;
+ }
+yy157: yych = *++YYCURSOR;
+ switch(yych){
+ case 'I': goto yy160;
+ case 'i': goto yy159;
+ default: goto yy25;
+ }
+yy158: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy52;
+ case 'x': goto yy144;
+ default: goto yy143;
+ }
+yy159: yych = *++YYCURSOR;
+ switch(yych){
+ case 'n': goto yy166;
+ default: goto yy25;
+ }
+yy160: yych = *++YYCURSOR;
+ switch(yych){
+ case 'N': goto yy161;
+ case 'n': goto yy162;
+ default: goto yy25;
+ }
+yy161: yych = *++YYCURSOR;
+ switch(yych){
+ case 'F': goto yy163;
+ default: goto yy25;
+ }
+yy162: yych = *++YYCURSOR;
+ switch(yych){
+ case 'f': goto yy163;
+ default: goto yy25;
+ }
+yy163: yych = *++YYCURSOR;
+ if(yych >= 0x01) goto yy25;
+ goto yy164;
+yy164: ++YYCURSOR;
+ goto yy165;
+yy165:
+#line 107 "implicit.re"
+{ return "float#neginf"; }
+#line 1412 "<stdout>"
+yy166: yych = *++YYCURSOR;
+ switch(yych){
+ case 'f': goto yy163;
+ default: goto yy25;
+ }
+yy167: yych = *++YYCURSOR;
+ switch(yych){
+ case 'I': goto yy33;
+ case 'i': goto yy32;
+ default: goto yy25;
+ }
+yy168: yych = *++YYCURSOR;
+ switch(yych){
+ case 'L': goto yy175;
+ default: goto yy25;
+ }
+yy169: yych = *++YYCURSOR;
+ switch(yych){
+ case 'l': goto yy170;
+ default: goto yy25;
+ }
+yy170: yych = *++YYCURSOR;
+ switch(yych){
+ case 's': goto yy171;
+ default: goto yy25;
+ }
+yy171: yych = *++YYCURSOR;
+ switch(yych){
+ case 'e': goto yy172;
+ default: goto yy25;
+ }
+yy172: yych = *++YYCURSOR;
+ if(yych >= 0x01) goto yy25;
+ goto yy173;
+yy173: ++YYCURSOR;
+ goto yy174;
+yy174:
+#line 89 "implicit.re"
+{ return "bool#no"; }
+#line 1452 "<stdout>"
+yy175: yych = *++YYCURSOR;
+ switch(yych){
+ case 'S': goto yy176;
+ default: goto yy25;
+ }
+yy176: yych = *++YYCURSOR;
+ switch(yych){
+ case 'E': goto yy172;
+ default: goto yy25;
+ }
+yy177: yych = *++YYCURSOR;
+ switch(yych){
+ case 'l': goto yy178;
+ default: goto yy25;
+ }
+yy178: yych = *++YYCURSOR;
+ switch(yych){
+ case 's': goto yy179;
+ default: goto yy25;
+ }
+yy179: yych = *++YYCURSOR;
+ switch(yych){
+ case 'e': goto yy172;
+ default: goto yy25;
+ }
+yy180: yych = *++YYCURSOR;
+ switch(yych){
+ case 'F': goto yy172;
+ default: goto yy25;
+ }
+yy181: yych = *++YYCURSOR;
+ switch(yych){
+ case 'f': goto yy172;
+ default: goto yy25;
+ }
+yy182: yych = *++YYCURSOR;
+ if(yych >= 0x01) goto yy25;
+ goto yy183;
+yy183: ++YYCURSOR;
+ goto yy184;
+yy184:
+#line 87 "implicit.re"
+{ return "bool#yes"; }
+#line 1496 "<stdout>"
+yy185: yych = *++YYCURSOR;
+ switch(yych){
+ case 'f': goto yy172;
+ default: goto yy25;
+ }
+yy186: yych = *++YYCURSOR;
+ switch(yych){
+ case 'U': goto yy189;
+ default: goto yy25;
+ }
+yy187: yych = *++YYCURSOR;
+ switch(yych){
+ case 'u': goto yy188;
+ default: goto yy25;
+ }
+yy188: yych = *++YYCURSOR;
+ switch(yych){
+ case 'e': goto yy182;
+ default: goto yy25;
+ }
+yy189: yych = *++YYCURSOR;
+ switch(yych){
+ case 'E': goto yy182;
+ default: goto yy25;
+ }
+yy190: yych = *++YYCURSOR;
+ switch(yych){
+ case 'u': goto yy191;
+ default: goto yy25;
+ }
+yy191: yych = *++YYCURSOR;
+ switch(yych){
+ case 'e': goto yy182;
+ default: goto yy25;
+ }
+yy192: yych = *++YYCURSOR;
+ switch(yych){
+ case 'S': goto yy182;
+ default: goto yy25;
+ }
+yy193: yych = *++YYCURSOR;
+ switch(yych){
+ case 's': goto yy182;
+ default: goto yy25;
+ }
+yy194: yych = *++YYCURSOR;
+ switch(yych){
+ case 's': goto yy182;
+ default: goto yy25;
+ }
+yy195: yych = *++YYCURSOR;
+ switch(yych){
+ case 'L': goto yy199;
+ default: goto yy25;
+ }
+yy196: yych = *++YYCURSOR;
+ switch(yych){
+ case 'l': goto yy197;
+ default: goto yy25;
+ }
+yy197: yych = *++YYCURSOR;
+ switch(yych){
+ case 'l': goto yy198;
+ default: goto yy25;
+ }
+yy198: yych = *++YYCURSOR;
+ if(yych <= 0x00) goto yy6;
+ goto yy25;
+yy199: yych = *++YYCURSOR;
+ switch(yych){
+ case 'L': goto yy198;
+ default: goto yy25;
+ }
+yy200: yych = *++YYCURSOR;
+ switch(yych){
+ case 'l': goto yy201;
+ default: goto yy25;
+ }
+yy201: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 'l': goto yy198;
+ default: goto yy25;
+ }
+}
+#line 125 "implicit.re"
+
+
+}
+
+/* Remove ending fragment and compare types */
+int
+syck_tagcmp( const char *tag1, const char *tag2 )
+{
+ if ( tag1 == tag2 ) return 1;
+ if ( tag1 == NULL || tag2 == NULL ) return 0;
+ else {
+ int i;
+ char *othorpe;
+ char *tmp1 = syck_strndup( tag1, strlen( tag1 ) );
+ char *tmp2 = syck_strndup( tag2, strlen( tag2 ) );
+ othorpe = strstr( tmp1, "#" );
+ if ( othorpe != NULL ) {
+ othorpe[0] = '\0';
+ }
+ othorpe = strstr( tmp2, "#" );
+ if ( othorpe != NULL ) {
+ othorpe[0] = '\0';
+ }
+ i = strcmp( tmp1, tmp2 );
+ S_FREE( tmp1 ); S_FREE( tmp2 );
+ return i;
+ }
+}
+
+char *
+syck_type_id_to_uri( const char *type_id )
+{
+ const char *cursor, *limit, *marker = 0;
+
+ cursor = type_id;
+ limit = type_id + strlen( type_id );
+
+
+#line 1620 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
+ goto yy202;
+ ++YYCURSOR;
+yy202:
+ if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy204;
+ case '!': goto yy208;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's': case 'u':
+ case 'v':
+ case 'w': case 'y':
+ case 'z': goto yy210;
+ case 't': goto yy205;
+ case 'x': goto yy207;
+ default: goto yy211;
+ }
+yy204: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy206;
+ }
+yy205: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case ',': goto yy216;
+ case '-': goto yy212;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy214;
+ case 'a': goto yy246;
+ default: goto yy206;
+ }
+yy206:
+#line 202 "implicit.re"
+{ return syck_taguri( YAML_DOMAIN, type_id, strlen( type_id ) ); }
+#line 1768 "<stdout>"
+yy207: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case ',': case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy215;
+ case '-': goto yy236;
+ default: goto yy206;
+ }
+yy208: ++YYCURSOR;
+ goto yy209;
+yy209:
+#line 176 "implicit.re"
+{ return syck_xprivate( type_id + 1, strlen( type_id ) - 1 ); }
+#line 1842 "<stdout>"
+yy210: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case ',': goto yy216;
+ case '-': goto yy212;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy214;
+ default: goto yy206;
+ }
+yy211: yych = *++YYCURSOR;
+ goto yy206;
+yy212: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy213;
+yy213: switch(yych){
+ case '-': goto yy212;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy214;
+ default: goto yy204;
+ }
+yy214: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy215;
+yy215: switch(yych){
+ case ',': goto yy216;
+ case '-': goto yy212;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy214;
+ default: goto yy204;
+ }
+yy216: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy224;
+ default: goto yy204;
+ }
+yy217: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy220;
+ default: goto yy204;
+ }
+yy218: ++YYCURSOR;
+ goto yy219;
+yy219:
+#line 178 "implicit.re"
+{ char *domain = S_ALLOC_N( char, ( YYCURSOR - type_id ) + 15 );
+ char *uri;
+
+ domain[0] = '\0';
+ strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
+ strcat( domain, "." );
+ strcat( domain, YAML_DOMAIN );
+ uri = syck_taguri( domain, YYCURSOR, YYLIMIT - YYCURSOR );
+
+ S_FREE( domain );
+ return uri;
+ }
+#line 2149 "<stdout>"
+yy220: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ yych = *YYCURSOR;
+ goto yy221;
+yy221: switch(yych){
+ case ',': goto yy216;
+ case '-': goto yy222;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy220;
+ default: goto yy204;
+ }
+yy222: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy223;
+yy223: switch(yych){
+ case '-': goto yy222;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy220;
+ default: goto yy204;
+ }
+yy224: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy225;
+ default: goto yy204;
+ }
+yy225: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy226;
+ default: goto yy204;
+ }
+yy226: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy227;
+ default: goto yy204;
+ }
+yy227: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy228;
+ case '/': goto yy229;
+ default: goto yy204;
+ }
+yy228: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy231;
+ default: goto yy204;
+ }
+yy229: ++YYCURSOR;
+ goto yy230;
+yy230:
+#line 191 "implicit.re"
+{ char *domain = S_ALLOC_N( char, YYCURSOR - type_id );
+ char *uri;
+
+ domain[0] = '\0';
+ strncat( domain, type_id, ( YYCURSOR - type_id ) - 1 );
+ uri = syck_taguri( domain, YYCURSOR, YYLIMIT - YYCURSOR );
+
+ S_FREE( domain );
+ return uri;
+ }
+#line 2365 "<stdout>"
+yy231: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy232;
+ default: goto yy204;
+ }
+yy232: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy233;
+ case '/': goto yy229;
+ default: goto yy204;
+ }
+yy233: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy234;
+ default: goto yy204;
+ }
+yy234: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy235;
+ default: goto yy204;
+ }
+yy235: yych = *++YYCURSOR;
+ switch(yych){
+ case '/': goto yy229;
+ default: goto yy204;
+ }
+yy236: yych = *++YYCURSOR;
+ switch(yych){
+ case 'p': goto yy237;
+ default: goto yy213;
+ }
+yy237: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 'r': goto yy238;
+ default: goto yy213;
+ }
+yy238: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 'i': goto yy239;
+ default: goto yy213;
+ }
+yy239: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 'v': goto yy240;
+ default: goto yy213;
+ }
+yy240: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 'a': goto yy241;
+ default: goto yy213;
+ }
+yy241: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 't': goto yy242;
+ default: goto yy213;
+ }
+yy242: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 'e': goto yy243;
+ default: goto yy213;
+ }
+yy243: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case ':': goto yy244;
+ default: goto yy213;
+ }
+yy244: ++YYCURSOR;
+ goto yy245;
+yy245:
+#line 174 "implicit.re"
+{ return syck_strndup( type_id, strlen( type_id ) ); }
+#line 2485 "<stdout>"
+yy246: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case 'g': goto yy247;
+ default: goto yy213;
+ }
+yy247: yych = *++YYCURSOR;
+ switch(yych){
+ case ',': goto yy216;
+ case '.': goto yy217;
+ case '/': goto yy218;
+ case ':': goto yy248;
+ default: goto yy213;
+ }
+yy248: yych = *++YYCURSOR;
+ switch(yych){
+ case ',':
+ case '-':
+ case '.': goto yy204;
+ default: goto yy250;
+ }
+yy249: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy250;
+yy250: switch(yych){
+ case ',': goto yy253;
+ case '-': goto yy251;
+ case '.': goto yy254;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy249;
+ default: goto yy204;
+ }
+yy251: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy252;
+yy252: switch(yych){
+ case '-': goto yy251;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy249;
+ default: goto yy204;
+ }
+yy253: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy259;
+ default: goto yy204;
+ }
+yy254: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy255;
+ default: goto yy204;
+ }
+yy255: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ yych = *YYCURSOR;
+ goto yy256;
+yy256: switch(yych){
+ case ',': goto yy253;
+ case '-': goto yy257;
+ case '.': goto yy254;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy255;
+ default: goto yy204;
+ }
+yy257: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy258;
+yy258: switch(yych){
+ case '-': goto yy257;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy255;
+ default: goto yy204;
+ }
+yy259: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy260;
+ default: goto yy204;
+ }
+yy260: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy261;
+ default: goto yy204;
+ }
+yy261: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy262;
+ default: goto yy204;
+ }
+yy262: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy263;
+ case ':': goto yy264;
+ default: goto yy204;
+ }
+yy263: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy266;
+ default: goto yy204;
+ }
+yy264: ++YYCURSOR;
+ goto yy265;
+yy265:
+#line 172 "implicit.re"
+{ return syck_strndup( type_id, strlen( type_id ) ); }
+#line 2932 "<stdout>"
+yy266: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy267;
+ default: goto yy204;
+ }
+yy267: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy268;
+ case ':': goto yy264;
+ default: goto yy204;
+ }
+yy268: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy269;
+ default: goto yy204;
+ }
+yy269: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy270;
+ default: goto yy204;
+ }
+yy270: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case ':': goto yy264;
+ default: goto yy204;
+ }
+}
+#line 204 "implicit.re"
+
+
+}
diff --git a/ext/syck/lib/syck.rb b/ext/syck/lib/syck.rb
new file mode 100644
index 0000000000..92fd7a15d6
--- /dev/null
+++ b/ext/syck/lib/syck.rb
@@ -0,0 +1,447 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+# $Id$
+#
+# = yaml.rb: top-level module with methods for loading and parsing YAML documents
+#
+# Author:: why the lucky stiff
+#
+
+require 'yaml/syck'
+
+# == YAML
+#
+# YAML(tm) (rhymes with 'camel') is a
+# straightforward machine parsable data serialization format designed for
+# human readability and interaction with scripting languages such as Perl
+# and Python. YAML is optimized for data serialization, formatted
+# dumping, configuration files, log files, Internet messaging and
+# filtering. This specification describes the YAML information model and
+# serialization format. Together with the Unicode standard for characters, it
+# provides all the information necessary to understand YAML Version 1.0
+# and construct computer programs to process it.
+#
+# See http://yaml.org/ for more information. For a quick tutorial, please
+# visit YAML In Five Minutes (http://yaml.kwiki.org/?YamlInFiveMinutes).
+#
+# == About This Library
+#
+# The YAML 1.0 specification outlines four stages of YAML loading and dumping.
+# This library honors all four of those stages, although data is really only
+# available to you in three stages.
+#
+# The four stages are: native, representation, serialization, and presentation.
+#
+# The native stage refers to data which has been loaded completely into Ruby's
+# own types. (See +YAML::load+.)
+#
+# The representation stage means data which has been composed into
+# +YAML::BaseNode+ objects. In this stage, the document is available as a
+# tree of node objects. You can perform YPath queries and transformations
+# at this level. (See +YAML::parse+.)
+#
+# The serialization stage happens inside the parser. The YAML parser used in
+# Ruby is called Syck. Serialized nodes are available in the extension as
+# SyckNode structs.
+#
+# The presentation stage is the YAML document itself. This is accessible
+# to you as a string. (See +YAML::dump+.)
+#
+# For more information about the various information models, see Chapter
+# 3 of the YAML 1.0 Specification (http://yaml.org/spec/#id2491269).
+#
+# The YAML module provides quick access to the most common loading (YAML::load)
+# and dumping (YAML::dump) tasks. This module also provides an API for registering
+# global types (YAML::add_domain_type).
+#
+# == Example
+#
+# A simple round-trip (load and dump) of an object.
+#
+# require "yaml"
+#
+# test_obj = ["dogs", "cats", "badgers"]
+#
+# yaml_obj = YAML::dump( test_obj )
+# # -> ---
+# - dogs
+# - cats
+# - badgers
+# ruby_obj = YAML::load( yaml_obj )
+# # => ["dogs", "cats", "badgers"]
+# ruby_obj == test_obj
+# # => true
+#
+# To register your custom types with the global resolver, use +add_domain_type+.
+#
+# YAML::add_domain_type( "your-site.com,2004", "widget" ) do |type, val|
+# Widget.new( val )
+# end
+#
+module Syck
+
+ DefaultResolver.use_types_at( @@tagged_classes )
+
+ # Returns a new default parser
+ def self.parser; Parser.new.set_resolver( self.resolver ); end
+
+ # Returns a new generic parser
+ def self.generic_parser
+ warn "#{caller[0]}: YAML.generic_parser is deprecated, switch to psych" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ Parser.new.set_resolver( GenericResolver )
+ end
+
+ # Returns the default resolver
+ def self.resolver
+ warn "#{caller[0]}: YAML.resolver is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ DefaultResolver
+ end
+
+ # Returns a new default emitter
+ def self.emitter
+ warn "#{caller[0]}: YAML.emitter is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ Emitter.new.set_resolver( self.resolver )
+ end
+
+ #
+ # Converts _obj_ to YAML and writes the YAML result to _io_.
+ #
+ # File.open( 'animals.yaml', 'w' ) do |out|
+ # YAML.dump( ['badger', 'elephant', 'tiger'], out )
+ # end
+ #
+ # If no _io_ is provided, a string containing the dumped YAML
+ # is returned.
+ #
+ # YAML.dump( :locked )
+ # #=> "--- :locked"
+ #
+ def self.dump( obj, io = nil )
+ obj.to_yaml( io || io2 = StringIO.new )
+ io || ( io2.rewind; io2.read )
+ end
+
+ #
+ # Load a document from the current _io_ stream.
+ #
+ # File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
+ # #=> ['badger', 'elephant', 'tiger']
+ #
+ # Can also load from a string.
+ #
+ # YAML.load( "--- :locked" )
+ # #=> :locked
+ #
+ def self.load( io )
+ yp = parser.load( io )
+ end
+
+ #
+ # Load a document from the file located at _filepath_.
+ #
+ # YAML.load_file( 'animals.yaml' )
+ # #=> ['badger', 'elephant', 'tiger']
+ #
+ def self.load_file( filepath )
+ File.open( filepath ) do |f|
+ load( f )
+ end
+ end
+
+ #
+ # Parse the first document from the current _io_ stream
+ #
+ # File.open( 'animals.yaml' ) { |yf| YAML::load( yf ) }
+ # #=> #<YAML::Syck::Node:0x82ccce0
+ # @kind=:seq,
+ # @value=
+ # [#<YAML::Syck::Node:0x82ccd94
+ # @kind=:scalar,
+ # @type_id="str",
+ # @value="badger">,
+ # #<YAML::Syck::Node:0x82ccd58
+ # @kind=:scalar,
+ # @type_id="str",
+ # @value="elephant">,
+ # #<YAML::Syck::Node:0x82ccd1c
+ # @kind=:scalar,
+ # @type_id="str",
+ # @value="tiger">]>
+ #
+ # Can also load from a string.
+ #
+ # YAML.parse( "--- :locked" )
+ # #=> #<YAML::Syck::Node:0x82edddc
+ # @type_id="tag:ruby.yaml.org,2002:sym",
+ # @value=":locked", @kind=:scalar>
+ #
+ def self.parse( io )
+ yp = generic_parser.load( io )
+ end
+
+ #
+ # Parse a document from the file located at _filepath_.
+ #
+ # YAML.parse_file( 'animals.yaml' )
+ # #=> #<YAML::Syck::Node:0x82ccce0
+ # @kind=:seq,
+ # @value=
+ # [#<YAML::Syck::Node:0x82ccd94
+ # @kind=:scalar,
+ # @type_id="str",
+ # @value="badger">,
+ # #<YAML::Syck::Node:0x82ccd58
+ # @kind=:scalar,
+ # @type_id="str",
+ # @value="elephant">,
+ # #<YAML::Syck::Node:0x82ccd1c
+ # @kind=:scalar,
+ # @type_id="str",
+ # @value="tiger">]>
+ #
+ def self.parse_file( filepath )
+ File.open( filepath ) do |f|
+ parse( f )
+ end
+ end
+
+ #
+ # Calls _block_ with each consecutive document in the YAML
+ # stream contained in _io_.
+ #
+ # File.open( 'many-docs.yaml' ) do |yf|
+ # YAML.each_document( yf ) do |ydoc|
+ # ## ydoc contains the single object
+ # ## from the YAML document
+ # end
+ # end
+ #
+ def self.each_document( io, &block )
+ warn "#{caller[0]}: YAML.each_document is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ yp = parser.load_documents( io, &block )
+ end
+
+ #
+ # Calls _block_ with each consecutive document in the YAML
+ # stream contained in _io_.
+ #
+ # File.open( 'many-docs.yaml' ) do |yf|
+ # YAML.load_documents( yf ) do |ydoc|
+ # ## ydoc contains the single object
+ # ## from the YAML document
+ # end
+ # end
+ #
+ def self.load_documents( io, &doc_proc )
+ yp = parser.load_documents( io, &doc_proc )
+ end
+
+ #
+ # Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
+ # each consecutive document in the YAML stream contained in _io_.
+ #
+ # File.open( 'many-docs.yaml' ) do |yf|
+ # YAML.each_node( yf ) do |ydoc|
+ # ## ydoc contains a tree of nodes
+ # ## from the YAML document
+ # end
+ # end
+ #
+ def self.each_node( io, &doc_proc )
+ warn "#{caller[0]}: YAML.each_node is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ yp = generic_parser.load_documents( io, &doc_proc )
+ end
+
+ #
+ # Calls _block_ with a tree of +YAML::BaseNodes+, one tree for
+ # each consecutive document in the YAML stream contained in _io_.
+ #
+ # File.open( 'many-docs.yaml' ) do |yf|
+ # YAML.parse_documents( yf ) do |ydoc|
+ # ## ydoc contains a tree of nodes
+ # ## from the YAML document
+ # end
+ # end
+ #
+ def self.parse_documents( io, &doc_proc )
+ warn "#{caller[0]}: YAML.parse_documents is deprecated, use load_stream" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ self.each_node( io, &doc_proc )
+ end
+
+ #
+ # Loads all documents from the current _io_ stream,
+ # returning a +YAML::Stream+ object containing all
+ # loaded documents.
+ #
+ def self.load_stream( io )
+ d = nil
+ parser.load_documents( io ) do |doc|
+ d = Stream.new if not d
+ d.add( doc )
+ end
+ return d
+ end
+
+ #
+ # Returns a YAML stream containing each of the items in +objs+,
+ # each having their own document.
+ #
+ # YAML.dump_stream( 0, [], {} )
+ # #=> --- 0
+ # --- []
+ # --- {}
+ #
+ def self.dump_stream( *objs )
+ d = Stream.new
+ objs.each do |doc|
+ d.add( doc )
+ end
+ d.emit
+ end
+
+ #
+ # Add a global handler for a YAML domain type.
+ #
+ def self.add_domain_type( domain, type_tag, &transfer_proc )
+ resolver.add_type( "tag:#{ domain }:#{ type_tag }", transfer_proc )
+ end
+
+ #
+ # Add a transfer method for a builtin type
+ #
+ def self.add_builtin_type( type_tag, &transfer_proc )
+ resolver.add_type( "tag:yaml.org,2002:#{ type_tag }", transfer_proc )
+ end
+
+ #
+ # Add a transfer method for a builtin type
+ #
+ def self.add_ruby_type( type_tag, &transfer_proc )
+ warn "#{caller[0]}: YAML.add_ruby_type is deprecated, use add_domain_type" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ resolver.add_type( "tag:ruby.yaml.org,2002:#{ type_tag }", transfer_proc )
+ end
+
+ #
+ # Add a private document type
+ #
+ def self.add_private_type( type_re, &transfer_proc )
+ warn "#{caller[0]}: YAML.add_private_type is deprecated, use add_domain_type" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ resolver.add_type( "x-private:" + type_re, transfer_proc )
+ end
+
+ #
+ # Detect typing of a string
+ #
+ def self.detect_implicit( val )
+ warn "#{caller[0]}: YAML.detect_implicit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ resolver.detect_implicit( val )
+ end
+
+ #
+ # Convert a type_id to a taguri
+ #
+ def self.tagurize( val )
+ warn "#{caller[0]}: YAML.tagurize is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ resolver.tagurize( val )
+ end
+
+ #
+ # Apply a transfer method to a Ruby object
+ #
+ def self.transfer( type_id, obj )
+ warn "#{caller[0]}: YAML.transfer is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ resolver.transfer( tagurize( type_id ), obj )
+ end
+
+ #
+ # Apply any implicit a node may qualify for
+ #
+ def self.try_implicit( obj )
+ warn "#{caller[0]}: YAML.try_implicit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ transfer( detect_implicit( obj ), obj )
+ end
+
+ #
+ # Method to extract colon-seperated type and class, returning
+ # the type and the constant of the class
+ #
+ def self.read_type_class( type, obj_class )
+ warn "#{caller[0]}: YAML.read_type_class is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ scheme, domain, type, tclass = type.split( ':', 4 )
+ tclass.split( "::" ).each { |c| obj_class = obj_class.const_get( c ) } if tclass
+ return [ type, obj_class ]
+ end
+
+ #
+ # Allocate blank object
+ #
+ def self.object_maker( obj_class, val )
+ warn "#{caller[0]}: YAML.object_maker is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ if Hash === val
+ o = obj_class.allocate
+ val.each_pair { |k,v|
+ o.instance_variable_set("@#{k}", v)
+ }
+ o
+ else
+ raise Error, "Invalid object explicitly tagged !ruby/Object: " + val.inspect
+ end
+ end
+
+ #
+ # Allocate an Emitter if needed
+ #
+ def self.quick_emit( oid, opts = {}, &e )
+ warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
+ out =
+ if opts.is_a? Emitter
+ opts
+ else
+ emitter.reset( opts )
+ end
+ out.emit( oid, &e )
+ end
+
+end
+
+module Kernel
+ #
+ # ryan:: You know how Kernel.p is a really convenient way to dump ruby
+ # structures? The only downside is that it's not as legible as
+ # YAML.
+ #
+ # _why:: (listening)
+ #
+ # ryan:: I know you don't want to urinate all over your users' namespaces.
+ # But, on the other hand, convenience of dumping for debugging is,
+ # IMO, a big YAML use case.
+ #
+ # _why:: Go nuts! Have a pony parade!
+ #
+ # ryan:: Either way, I certainly will have a pony parade.
+ #
+
+ # Prints any supplied _objects_ out in YAML. Intended as
+ # a variation on +Kernel::p+.
+ #
+ # S = Struct.new(:name, :state)
+ # s = S['dave', 'TX']
+ # y s
+ #
+ # _produces:_
+ #
+ # --- !ruby/struct:S
+ # name: dave
+ # state: TX
+ #
+ def y( object, *objects )
+ objects.unshift object
+ puts( if objects.length == 1
+ YAML.dump( *objects )
+ else
+ YAML.dump_stream( *objects )
+ end )
+ end
+ private :y
+end
+
+
diff --git a/ext/syck/lib/syck/baseemitter.rb b/ext/syck/lib/syck/baseemitter.rb
new file mode 100644
index 0000000000..5e39e450de
--- /dev/null
+++ b/ext/syck/lib/syck/baseemitter.rb
@@ -0,0 +1,242 @@
+#
+# BaseEmitter
+#
+
+require 'syck/constants'
+require 'syck/encoding'
+require 'syck/error'
+
+module Syck
+ module BaseEmitter
+ def options( opt = nil )
+ if opt
+ @options[opt] || DEFAULTS[opt]
+ else
+ @options
+ end
+ end
+
+ def options=( opt )
+ @options = opt
+ end
+
+ #
+ # Emit binary data
+ #
+ def binary_base64( value )
+ self << "!binary "
+ self.node_text( [value].pack("m"), '|' )
+ end
+
+ #
+ # Emit plain, normal flowing text
+ #
+ def node_text( value, block = nil )
+ @seq_map = false
+ valx = value.dup
+ unless block
+ block =
+ if options(:UseBlock)
+ '|'
+ elsif not options(:UseFold) and valx =~ /\n[ \t]/ and not valx =~ /#{ESCAPE_CHAR}/
+ '|'
+ else
+ '>'
+ end
+ indt = $&.to_i if block =~ /\d+/
+ if valx =~ /(\A\n*[ \t#]|^---\s+)/
+ indt = options(:Indent) unless indt.to_i > 0
+ block += indt.to_s
+ end
+
+ block +=
+ if valx =~ /\n\Z\n/
+ "+"
+ elsif valx =~ /\Z\n/
+ ""
+ else
+ "-"
+ end
+ end
+ block += "\n"
+ if block[0] == ?"
+ esc_skip = ( "\t\n" unless valx =~ /^[ \t]/ ) || ""
+ valx = fold( Syck.escape( valx, esc_skip ) + "\"" ).chomp
+ self << '"' + indent_text( valx, indt, false )
+ else
+ if block[0] == ?>
+ valx = fold( valx )
+ end
+ #p [block, indt]
+ self << block + indent_text( valx, indt )
+ end
+ end
+
+ #
+ # Emit a simple, unqouted string
+ #
+ def simple( value )
+ @seq_map = false
+ self << value.to_s
+ end
+
+ #
+ # Emit double-quoted string
+ #
+ def double( value )
+ "\"#{Syck.escape( value )}\""
+ end
+
+ #
+ # Emit single-quoted string
+ #
+ def single( value )
+ "'#{value}'"
+ end
+
+ #
+ # Write a text block with the current indent
+ #
+ def indent_text( text, mod, first_line = true )
+ return "" if text.to_s.empty?
+ spacing = indent( mod )
+ text = text.gsub( /\A([^\n])/, "#{ spacing }\\1" ) if first_line
+ return text.gsub( /\n^([^\n])/, "\n#{spacing}\\1" )
+ end
+
+ #
+ # Write a current indent
+ #
+ def indent( mod = nil )
+ #p [ self.id, level, mod, :INDENT ]
+ if level <= 0
+ mod ||= 0
+ else
+ mod ||= options(:Indent)
+ mod += ( level - 1 ) * options(:Indent)
+ end
+ return " " * mod
+ end
+
+ #
+ # Add indent to the buffer
+ #
+ def indent!
+ self << indent
+ end
+
+ #
+ # Folding paragraphs within a column
+ #
+ def fold( value )
+ value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]|\Z))|$)/ ) do
+ $1 || $2 + ( $3 || "\n" )
+ end
+ end
+
+ #
+ # Quick mapping
+ #
+ def map( type, &e )
+ val = Mapping.new
+ e.call( val )
+ self << "#{type} " if type.length.nonzero?
+
+ #
+ # Empty hashes
+ #
+ if val.length.zero?
+ self << "{}"
+ @seq_map = false
+ else
+ # FIXME
+ # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero?
+ # @headless = 1
+ # end
+
+ defkey = @options.delete( :DefaultKey )
+ if defkey
+ seq_map_shortcut
+ self << "= : "
+ defkey.to_yaml( :Emitter => self )
+ end
+
+ #
+ # Emit the key and value
+ #
+ val.each { |v|
+ seq_map_shortcut
+ if v[0].is_complex_yaml?
+ self << "? "
+ end
+ v[0].to_yaml( :Emitter => self )
+ if v[0].is_complex_yaml?
+ self << "\n"
+ indent!
+ end
+ self << ": "
+ v[1].to_yaml( :Emitter => self )
+ }
+ end
+ end
+
+ def seq_map_shortcut
+ # FIXME: seq_map needs to work with the new anchoring system
+ # if @seq_map
+ # @anchor_extras[@buffer.length - 1] = "\n" + indent
+ # @seq_map = false
+ # else
+ self << "\n"
+ indent!
+ # end
+ end
+
+ #
+ # Quick sequence
+ #
+ def seq( type, &e )
+ @seq_map = false
+ val = Sequence.new
+ e.call( val )
+ self << "#{type} " if type.length.nonzero?
+
+ #
+ # Empty arrays
+ #
+ if val.length.zero?
+ self << "[]"
+ else
+ # FIXME
+ # if @buffer.length == 1 and options(:UseHeader) == false and type.length.zero?
+ # @headless = 1
+ # end
+
+ #
+ # Emit the key and value
+ #
+ val.each { |v|
+ self << "\n"
+ indent!
+ self << "- "
+ @seq_map = true if v.class == Hash
+ v.to_yaml( :Emitter => self )
+ }
+ end
+ end
+ end
+
+ #
+ # Emitter helper classes
+ #
+ class Mapping < Array
+ def add( k, v )
+ push [k, v]
+ end
+ end
+
+ class Sequence < Array
+ def add( v )
+ push v
+ end
+ end
+end
diff --git a/ext/syck/lib/syck/basenode.rb b/ext/syck/lib/syck/basenode.rb
new file mode 100644
index 0000000000..3739331562
--- /dev/null
+++ b/ext/syck/lib/syck/basenode.rb
@@ -0,0 +1,223 @@
+#
+# YAML::BaseNode class
+#
+
+module Syck
+
+ #
+ # YAML Generic Model container
+ #
+ module BaseNode
+
+ #
+ # Search for YPath entry and return
+ # qualified nodes.
+ #
+ def select( ypath_str )
+ warn "#{caller[0]}: select is deprecated" if $VERBOSE
+ matches = match_path( ypath_str )
+
+ #
+ # Create a new generic view of the elements selected
+ #
+ if matches
+ result = []
+ matches.each { |m|
+ result.push m.last
+ }
+ Syck.transfer( 'seq', result )
+ end
+ end
+
+ #
+ # Search for YPath entry and return
+ # transformed nodes.
+ #
+ def select!( ypath_str )
+ warn "#{caller[0]}: select!() is deprecated" if $VERBOSE
+ matches = match_path( ypath_str )
+
+ #
+ # Create a new generic view of the elements selected
+ #
+ if matches
+ result = []
+ matches.each { |m|
+ result.push m.last.transform
+ }
+ result
+ end
+ end
+
+ #
+ # Search for YPath entry and return a list of
+ # qualified paths.
+ #
+ def search( ypath_str )
+ warn "#{caller[0]}: search() is deprecated" if $VERBOSE
+ matches = match_path( ypath_str )
+
+ if matches
+ matches.collect { |m|
+ path = []
+ m.each_index { |i|
+ path.push m[i] if ( i % 2 ).zero?
+ }
+ "/" + path.compact.join( "/" )
+ }
+ end
+ end
+
+ def at( seg )
+ warn "#{caller[0]}: at() is deprecated" if $VERBOSE
+ if Hash === @value
+ self[seg]
+ elsif Array === @value and seg =~ /\A\d+\Z/ and @value[seg.to_i]
+ @value[seg.to_i]
+ end
+ end
+
+ #
+ # YPath search returning a complete depth array
+ #
+ def match_path( ypath_str )
+ warn "#{caller[0]}: match_path is deprecated" if $VERBOSE
+ require 'syck/ypath'
+ depth = 0
+ matches = []
+ YPath.each_path( ypath_str ) do |ypath|
+ seg = match_segment( ypath, 0 )
+ matches += seg if seg
+ end
+ matches.uniq
+ end
+
+ #
+ # Search a node for a single YPath segment
+ #
+ def match_segment( ypath, depth )
+ warn "#{caller[0]}: match_segment is deprecated" if $VERBOSE
+ deep_nodes = []
+ seg = ypath.segments[ depth ]
+ if seg == "/"
+ unless String === @value
+ idx = -1
+ @value.collect { |v|
+ idx += 1
+ if Hash === @value
+ match_init = [v[0].transform, v[1]]
+ match_deep = v[1].match_segment( ypath, depth )
+ else
+ match_init = [idx, v]
+ match_deep = v.match_segment( ypath, depth )
+ end
+ if match_deep
+ match_deep.each { |m|
+ deep_nodes.push( match_init + m )
+ }
+ end
+ }
+ end
+ depth += 1
+ seg = ypath.segments[ depth ]
+ end
+ match_nodes =
+ case seg
+ when "."
+ [[nil, self]]
+ when ".."
+ [["..", nil]]
+ when "*"
+ if @value.is_a? Enumerable
+ idx = -1
+ @value.collect { |h|
+ idx += 1
+ if Hash === @value
+ [h[0].transform, h[1]]
+ else
+ [idx, h]
+ end
+ }
+ end
+ else
+ if seg =~ /^"(.*)"$/
+ seg = $1
+ elsif seg =~ /^'(.*)'$/
+ seg = $1
+ end
+ if ( v = at( seg ) )
+ [[ seg, v ]]
+ end
+ end
+ return deep_nodes unless match_nodes
+ pred = ypath.predicates[ depth ]
+ if pred
+ case pred
+ when /^\.=/
+ pred = $' # '
+ match_nodes.reject! { |n|
+ n.last.value != pred
+ }
+ else
+ match_nodes.reject! { |n|
+ n.last.at( pred ).nil?
+ }
+ end
+ end
+ return match_nodes + deep_nodes unless ypath.segments.length > depth + 1
+
+ #puts "DEPTH: #{depth + 1}"
+ deep_nodes = []
+ match_nodes.each { |n|
+ if n[1].is_a? BaseNode
+ match_deep = n[1].match_segment( ypath, depth + 1 )
+ if match_deep
+ match_deep.each { |m|
+ deep_nodes.push( n + m )
+ }
+ end
+ else
+ deep_nodes = []
+ end
+ }
+ deep_nodes = nil if deep_nodes.length == 0
+ deep_nodes
+ end
+
+ #
+ # We want the node to act like as Hash
+ # if it is.
+ #
+ def []( *key )
+ if Hash === @value
+ v = @value.detect { |k,| k.transform == key.first }
+ v[1] if v
+ elsif Array === @value
+ @value.[]( *key )
+ end
+ end
+
+ def children
+ if Hash === @value
+ @value.values.collect { |c| c[1] }
+ elsif Array === @value
+ @value
+ end
+ end
+
+ def children_with_index
+ warn "#{caller[0]}: children_with_index is deprecated, use children" if $VERBOSE
+ if Hash === @value
+ @value.keys.collect { |i| [self[i], i] }
+ elsif Array === @value
+ i = -1; @value.collect { |v| i += 1; [v, i] }
+ end
+ end
+
+ def emit
+ transform.to_yaml
+ end
+ end
+
+end
+
diff --git a/ext/syck/lib/syck/constants.rb b/ext/syck/lib/syck/constants.rb
new file mode 100644
index 0000000000..19fe42ef85
--- /dev/null
+++ b/ext/syck/lib/syck/constants.rb
@@ -0,0 +1,45 @@
+#
+# Constants used throughout the library
+#
+module Syck
+
+ #
+ # Constants
+ #
+ VERSION = '0.60'
+ SUPPORTED_YAML_VERSIONS = ['1.0']
+
+ #
+ # Parser tokens
+ #
+ WORD_CHAR = 'A-Za-z0-9'
+ PRINTABLE_CHAR = '-_A-Za-z0-9!?/()$\'". '
+ NOT_PLAIN_CHAR = '\x7f\x0-\x1f\x80-\x9f'
+ ESCAPE_CHAR = '[\\x00-\\x09\\x0b-\\x1f]'
+ INDICATOR_CHAR = '*&!|\\\\^@%{}[]='
+ SPACE_INDICATORS = '-#:,?'
+ RESTRICTED_INDICATORS = '#:,}]'
+ DNS_COMP_RE = "\\w(?:[-\\w]*\\w)?"
+ DNS_NAME_RE = "(?:(?:#{DNS_COMP_RE}\\.)+#{DNS_COMP_RE}|#{DNS_COMP_RE})"
+ ESCAPES = %w{\x00 \x01 \x02 \x03 \x04 \x05 \x06 \a
+ \x08 \t \n \v \f \r \x0e \x0f
+ \x10 \x11 \x12 \x13 \x14 \x15 \x16 \x17
+ \x18 \x19 \x1a \e \x1c \x1d \x1e \x1f
+ }
+ UNESCAPES = {
+ 'a' => "\x07", 'b' => "\x08", 't' => "\x09",
+ 'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
+ 'r' => "\x0d", 'e' => "\x1b", '\\' => '\\',
+ }
+
+ #
+ # Default settings
+ #
+ DEFAULTS = {
+ :Indent => 2, :UseHeader => false, :UseVersion => false, :Version => '1.0',
+ :SortKeys => false, :AnchorFormat => 'id%03d', :ExplicitTypes => false,
+ :WidthType => 'absolute', :BestWidth => 80,
+ :UseBlock => false, :UseFold => false, :Encoding => :None
+ }
+
+end
diff --git a/ext/syck/lib/syck/encoding.rb b/ext/syck/lib/syck/encoding.rb
new file mode 100644
index 0000000000..dad062994c
--- /dev/null
+++ b/ext/syck/lib/syck/encoding.rb
@@ -0,0 +1,35 @@
+#
+# Handle Unicode-to-Internal conversion
+#
+
+module Syck
+
+ #
+ # Escape the string, condensing common escapes
+ #
+ def self.escape( value, skip = "" )
+ warn "#{caller[0]}: YAML.escape is deprecated" if $VERBOSE
+ value.gsub( /\\/, "\\\\\\" ).
+ gsub( /"/, "\\\"" ).
+ gsub( /([\x00-\x1f])/ ) do
+ skip[$&] || ESCAPES[ $&.unpack("C")[0] ]
+ end
+ end
+
+ #
+ # Unescape the condenses escapes
+ #
+ def self.unescape( value )
+ warn "#{caller[0]}: YAML.unescape is deprecated" if $VERBOSE
+ value.gsub( /\\(?:([nevfbart\\])|0?x([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/ ) {
+ if $3
+ ["#$3".hex ].pack('U*')
+ elsif $2
+ [$2].pack( "H2" )
+ else
+ UNESCAPES[$1]
+ end
+ }
+ end
+
+end
diff --git a/ext/syck/lib/syck/error.rb b/ext/syck/lib/syck/error.rb
new file mode 100644
index 0000000000..0bac872411
--- /dev/null
+++ b/ext/syck/lib/syck/error.rb
@@ -0,0 +1,34 @@
+#
+# Error messages and exception class
+#
+
+module Syck
+
+ #
+ # Error messages
+ #
+
+ ERROR_NO_HEADER_NODE = "With UseHeader=false, the node Array or Hash must have elements"
+ ERROR_NEED_HEADER = "With UseHeader=false, the node must be an Array or Hash"
+ ERROR_BAD_EXPLICIT = "Unsupported explicit transfer: '%s'"
+ ERROR_MANY_EXPLICIT = "More than one explicit transfer"
+ ERROR_MANY_IMPLICIT = "More than one implicit request"
+ ERROR_NO_ANCHOR = "No anchor for alias '%s'"
+ ERROR_BAD_ANCHOR = "Invalid anchor: %s"
+ ERROR_MANY_ANCHOR = "More than one anchor"
+ ERROR_ANCHOR_ALIAS = "Can't define both an anchor and an alias"
+ ERROR_BAD_ALIAS = "Invalid alias: %s"
+ ERROR_MANY_ALIAS = "More than one alias"
+ ERROR_ZERO_INDENT = "Can't use zero as an indentation width"
+ ERROR_UNSUPPORTED_VERSION = "This release of YAML.rb does not support YAML version %s"
+ ERROR_UNSUPPORTED_ENCODING = "Attempt to use unsupported encoding: %s"
+
+ #
+ # YAML Error classes
+ #
+
+ class Error < StandardError; end
+ class ParseError < Error; end
+ class TypeError < StandardError; end
+
+end
diff --git a/ext/syck/lib/syck/loader.rb b/ext/syck/lib/syck/loader.rb
new file mode 100644
index 0000000000..925c9ee4b2
--- /dev/null
+++ b/ext/syck/lib/syck/loader.rb
@@ -0,0 +1,14 @@
+#
+# YAML::Loader class
+# .. type handling ..
+#
+module Syck
+ class Loader
+ TRANSFER_DOMAINS = {
+ 'yaml.org,2002' => {},
+ 'ruby.yaml.org,2002' => {}
+ }
+ PRIVATE_TYPES = {}
+ IMPLICIT_TYPES = [ 'null', 'bool', 'time', 'int', 'float' ]
+ end
+end
diff --git a/ext/syck/lib/syck/rubytypes.rb b/ext/syck/lib/syck/rubytypes.rb
new file mode 100644
index 0000000000..b47045504d
--- /dev/null
+++ b/ext/syck/lib/syck/rubytypes.rb
@@ -0,0 +1,465 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+require 'date'
+
+class Class
+ def to_yaml( opts = {} )
+ raise TypeError, "can't dump anonymous class %s" % self.class
+ end
+end
+
+class Object
+ yaml_as "tag:ruby.yaml.org,2002:object"
+ def to_yaml_style; end
+ def to_yaml_properties; instance_variables.sort; end
+ def to_yaml( opts = {} )
+ YAML::quick_emit( self, opts ) do |out|
+ out.map( taguri, to_yaml_style ) do |map|
+ to_yaml_properties.each do |m|
+ map.add( m[1..-1], instance_variable_get( m ) )
+ end
+ end
+ end
+ end
+ alias :syck_to_yaml :to_yaml
+end
+
+class Hash
+ yaml_as "tag:ruby.yaml.org,2002:hash"
+ yaml_as "tag:yaml.org,2002:map"
+ def yaml_initialize( tag, val )
+ if Array === val
+ update Hash.[]( *val ) # Convert the map to a sequence
+ elsif Hash === val
+ update val
+ else
+ raise YAML::TypeError, "Invalid map explicitly tagged #{ tag }: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ out.map( taguri, to_yaml_style ) do |map|
+ each do |k, v|
+ map.add( k, v )
+ end
+ end
+ end
+ end
+end
+
+class Struct
+ yaml_as "tag:ruby.yaml.org,2002:struct"
+ def self.yaml_tag_class_name; self.name.gsub( "Struct::", "" ); end
+ def self.yaml_tag_read_class( name ); "Struct::#{ name }"; end
+ def self.yaml_new( klass, tag, val )
+ if Hash === val
+ struct_type = nil
+
+ #
+ # Use existing Struct if it exists
+ #
+ props = {}
+ val.delete_if { |k,v| props[k] = v if k =~ /^@/ }
+ begin
+ struct_name, struct_type = YAML.read_type_class( tag, Struct )
+ rescue NameError
+ end
+ if not struct_type
+ struct_def = [ tag.split( ':', 4 ).last ]
+ struct_type = Struct.new( *struct_def.concat( val.keys.collect { |k| k.intern } ) )
+ end
+
+ #
+ # Set the Struct properties
+ #
+ st = YAML::object_maker( struct_type, {} )
+ st.members.each do |m|
+ st.send( "#{m}=", val[m.to_s] )
+ end
+ props.each do |k,v|
+ st.instance_variable_set(k, v)
+ end
+ st
+ else
+ raise YAML::TypeError, "Invalid Ruby Struct: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ #
+ # Basic struct is passed as a YAML map
+ #
+ out.map( taguri, to_yaml_style ) do |map|
+ self.members.each do |m|
+ map.add( m.to_s, self[m.to_s] )
+ end
+ self.to_yaml_properties.each do |m|
+ map.add( m, instance_variable_get( m ) )
+ end
+ end
+ end
+ end
+end
+
+class Array
+ yaml_as "tag:ruby.yaml.org,2002:array"
+ yaml_as "tag:yaml.org,2002:seq"
+ def yaml_initialize( tag, val ); concat( val.to_a ); end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ out.seq( taguri, to_yaml_style ) do |seq|
+ each do |x|
+ seq.add( x )
+ end
+ end
+ end
+ end
+end
+
+class Exception
+ yaml_as "tag:ruby.yaml.org,2002:exception"
+ def Exception.yaml_new( klass, tag, val )
+ o = YAML.object_maker( klass, { 'mesg' => val.delete( 'message' ) } )
+ val.each_pair do |k,v|
+ o.instance_variable_set("@#{k}", v)
+ end
+ o
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ out.map( taguri, to_yaml_style ) do |map|
+ map.add( 'message', message )
+ to_yaml_properties.each do |m|
+ map.add( m[1..-1], instance_variable_get( m ) )
+ end
+ end
+ end
+ end
+end
+
+class String
+ yaml_as "tag:ruby.yaml.org,2002:string"
+ yaml_as "tag:yaml.org,2002:binary"
+ yaml_as "tag:yaml.org,2002:str"
+ def is_complex_yaml?
+ to_yaml_style or not to_yaml_properties.empty? or self =~ /\n.+/
+ end
+ def is_binary_data?
+ self.count("\x00-\x7F", "^ -~\t\r\n").fdiv(self.size) > 0.3 || self.index("\x00") unless self.empty?
+ end
+ def String.yaml_new( klass, tag, val )
+ val = val.unpack("m")[0] if tag == "tag:yaml.org,2002:binary"
+ val = { 'str' => val } if String === val
+ if Hash === val
+ s = klass.allocate
+ # Thank you, NaHi
+ String.instance_method(:initialize).
+ bind(s).
+ call( val.delete( 'str' ) )
+ val.each { |k,v| s.instance_variable_set( k, v ) }
+ s
+ else
+ raise YAML::TypeError, "Invalid String: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( is_complex_yaml? ? self : nil, opts ) do |out|
+ if is_binary_data?
+ out.scalar( "tag:yaml.org,2002:binary", [self].pack("m"), :literal )
+ elsif to_yaml_properties.empty?
+ out.scalar( taguri, self, self =~ /^:/ ? :quote2 : to_yaml_style )
+ else
+ out.map( taguri, to_yaml_style ) do |map|
+ map.add( 'str', "#{self}" )
+ to_yaml_properties.each do |m|
+ map.add( m, instance_variable_get( m ) )
+ end
+ end
+ end
+ end
+ end
+end
+
+class Symbol
+ yaml_as "tag:ruby.yaml.org,2002:symbol"
+ yaml_as "tag:ruby.yaml.org,2002:sym"
+ def Symbol.yaml_new( klass, tag, val )
+ if String === val
+ val = YAML::load( val ) if val =~ /\A(["']).*\1\z/
+ val.intern
+ else
+ raise YAML::TypeError, "Invalid Symbol: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ out.scalar( "tag:yaml.org,2002:str", self.inspect, :plain )
+ end
+ end
+end
+
+class Range
+ yaml_as "tag:ruby.yaml.org,2002:range"
+ def Range.yaml_new( klass, tag, val )
+ inr = %r'(\w+|[+-]?\d+(?:\.\d+)?(?:e[+-]\d+)?|"(?:[^\\"]|\\.)*")'
+ opts = {}
+ if String === val and val =~ /^#{inr}(\.{2,3})#{inr}$/o
+ r1, rdots, r2 = $1, $2, $3
+ opts = {
+ 'begin' => YAML.load( "--- #{r1}" ),
+ 'end' => YAML.load( "--- #{r2}" ),
+ 'excl' => rdots.length == 3
+ }
+ val = {}
+ elsif Hash === val
+ opts['begin'] = val.delete('begin')
+ opts['end'] = val.delete('end')
+ opts['excl'] = val.delete('excl')
+ end
+ if Hash === opts
+ r = YAML::object_maker( klass, {} )
+ # Thank you, NaHi
+ Range.instance_method(:initialize).
+ bind(r).
+ call( opts['begin'], opts['end'], opts['excl'] )
+ val.each { |k,v| r.instance_variable_set( k, v ) }
+ r
+ else
+ raise YAML::TypeError, "Invalid Range: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ # if self.begin.is_complex_yaml? or self.begin.respond_to? :to_str or
+ # self.end.is_complex_yaml? or self.end.respond_to? :to_str or
+ # not to_yaml_properties.empty?
+ out.map( taguri, to_yaml_style ) do |map|
+ map.add( 'begin', self.begin )
+ map.add( 'end', self.end )
+ map.add( 'excl', self.exclude_end? )
+ to_yaml_properties.each do |m|
+ map.add( m, instance_variable_get( m ) )
+ end
+ end
+ # else
+ # out.scalar( taguri ) do |sc|
+ # sc.embed( self.begin )
+ # sc.concat( self.exclude_end? ? "..." : ".." )
+ # sc.embed( self.end )
+ # end
+ # end
+ end
+ end
+end
+
+class Regexp
+ yaml_as "tag:ruby.yaml.org,2002:regexp"
+ def Regexp.yaml_new( klass, tag, val )
+ if String === val and val =~ /^\/(.*)\/([mixn]*)$/
+ val = { 'regexp' => $1, 'mods' => $2 }
+ end
+ if Hash === val
+ mods = nil
+ unless val['mods'].to_s.empty?
+ mods = 0x00
+ mods |= Regexp::EXTENDED if val['mods'].include?( 'x' )
+ mods |= Regexp::IGNORECASE if val['mods'].include?( 'i' )
+ mods |= Regexp::MULTILINE if val['mods'].include?( 'm' )
+ mods |= 32 if val['mods'].include?( 'n' )
+ end
+ val.delete( 'mods' )
+ r = YAML::object_maker( klass, {} )
+ Regexp.instance_method(:initialize).
+ bind(r).
+ call( val.delete( 'regexp' ), mods )
+ val.each { |k,v| r.instance_variable_set( k, v ) }
+ r
+ else
+ raise YAML::TypeError, "Invalid Regular expression: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ if to_yaml_properties.empty?
+ out.scalar( taguri, self.inspect, :plain )
+ else
+ out.map( taguri, to_yaml_style ) do |map|
+ src = self.inspect
+ if src =~ /\A\/(.*)\/([a-z]*)\Z/
+ map.add( 'regexp', $1 )
+ map.add( 'mods', $2 )
+ else
+ raise YAML::TypeError, "Invalid Regular expression: " + src
+ end
+ to_yaml_properties.each do |m|
+ map.add( m, instance_variable_get( m ) )
+ end
+ end
+ end
+ end
+ end
+end
+
+class Time
+ yaml_as "tag:ruby.yaml.org,2002:time"
+ yaml_as "tag:yaml.org,2002:timestamp"
+ def Time.yaml_new( klass, tag, val )
+ if Hash === val
+ t = val.delete( 'at' )
+ val.each { |k,v| t.instance_variable_set( k, v ) }
+ t
+ else
+ raise YAML::TypeError, "Invalid Time: " + val.inspect
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ tz = "Z"
+ # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
+ unless self.utc?
+ utc_same_instant = self.dup.utc
+ utc_same_writing = Time.utc(year,month,day,hour,min,sec,usec)
+ difference_to_utc = utc_same_writing - utc_same_instant
+ if (difference_to_utc < 0)
+ difference_sign = '-'
+ absolute_difference = -difference_to_utc
+ else
+ difference_sign = '+'
+ absolute_difference = difference_to_utc
+ end
+ difference_minutes = (absolute_difference/60).round
+ tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60]
+ end
+ standard = self.strftime( "%Y-%m-%d %H:%M:%S" )
+ standard += ".%06d" % [usec] if usec.nonzero?
+ standard += " %s" % [tz]
+ if to_yaml_properties.empty?
+ out.scalar( taguri, standard, :plain )
+ else
+ out.map( taguri, to_yaml_style ) do |map|
+ map.add( 'at', standard )
+ to_yaml_properties.each do |m|
+ map.add( m, instance_variable_get( m ) )
+ end
+ end
+ end
+ end
+ end
+end
+
+class Date
+ yaml_as "tag:yaml.org,2002:timestamp#ymd"
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ out.scalar( "tag:yaml.org,2002:timestamp", self.to_s, :plain )
+ end
+ end
+end
+
+class Integer
+ yaml_as "tag:yaml.org,2002:int"
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ out.scalar( "tag:yaml.org,2002:int", self.to_s, :plain )
+ end
+ end
+end
+
+class Float
+ yaml_as "tag:yaml.org,2002:float"
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ str = self.to_s
+ if str == "Infinity"
+ str = ".Inf"
+ elsif str == "-Infinity"
+ str = "-.Inf"
+ elsif str == "NaN"
+ str = ".NaN"
+ end
+ out.scalar( "tag:yaml.org,2002:float", str, :plain )
+ end
+ end
+end
+
+class Rational
+ yaml_as "tag:ruby.yaml.org,2002:object:Rational"
+ def Rational.yaml_new( klass, tag, val )
+ if val.is_a? String
+ Rational( val )
+ else
+ Rational( val['numerator'], val['denominator'] )
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ out.map( taguri, nil ) do |map|
+ map.add( 'denominator', denominator )
+ map.add( 'numerator', numerator )
+ end
+ end
+ end
+end
+
+class Complex
+ yaml_as "tag:ruby.yaml.org,2002:object:Complex"
+ def Complex.yaml_new( klass, tag, val )
+ if val.is_a? String
+ Complex( val )
+ else
+ Complex( val['real'], val['image'] )
+ end
+ end
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( self, opts ) do |out|
+ out.map( taguri, nil ) do |map|
+ map.add( 'image', imaginary )
+ map.add( 'real', real )
+ end
+ end
+ end
+end
+
+class TrueClass
+ yaml_as "tag:yaml.org,2002:bool#yes"
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ out.scalar( taguri, "true", :plain )
+ end
+ end
+end
+
+class FalseClass
+ yaml_as "tag:yaml.org,2002:bool#no"
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ out.scalar( taguri, "false", :plain )
+ end
+ end
+end
+
+class NilClass
+ yaml_as "tag:yaml.org,2002:null"
+ def to_yaml( opts = {} )
+ return super unless YAML::ENGINE.syck?
+ YAML::quick_emit( nil, opts ) do |out|
+ out.scalar( taguri, "", :plain )
+ end
+ end
+end
+
diff --git a/ext/syck/lib/syck/stream.rb b/ext/syck/lib/syck/stream.rb
new file mode 100644
index 0000000000..cd77a033c6
--- /dev/null
+++ b/ext/syck/lib/syck/stream.rb
@@ -0,0 +1,41 @@
+module Syck
+
+ #
+ # YAML::Stream -- for emitting many documents
+ #
+ class Stream
+
+ attr_accessor :documents, :options
+
+ def initialize( opts = {} )
+ @options = opts
+ @documents = []
+ end
+
+ def []( i )
+ @documents[ i ]
+ end
+
+ def add( doc )
+ @documents << doc
+ end
+
+ def edit( doc_num, doc )
+ warn "#{caller[0]}: edit is deprecated" if $VERBOSE
+ @documents[ doc_num ] = doc
+ end
+
+ def emit( io = nil )
+ # opts = @options.dup
+ # opts[:UseHeader] = true if @documents.length > 1
+ out = Syck.emitter
+ out.reset( io || io2 = StringIO.new )
+ @documents.each { |v|
+ v.to_yaml( out )
+ }
+ io || ( io2.rewind; io2.read )
+ end
+
+ end
+
+end
diff --git a/ext/syck/lib/syck/stringio.rb b/ext/syck/lib/syck/stringio.rb
new file mode 100644
index 0000000000..77a2b827e5
--- /dev/null
+++ b/ext/syck/lib/syck/stringio.rb
@@ -0,0 +1,85 @@
+warn "#{caller[0]}: yaml/stringio is deprecated" if $VERBOSE
+
+#
+# Limited StringIO if no core lib is available
+#
+begin
+require 'stringio'
+rescue LoadError
+ # StringIO based on code by MoonWolf
+ class StringIO
+ def initialize(string="")
+ @string=string
+ @pos=0
+ @eof=(string.size==0)
+ end
+ def pos
+ @pos
+ end
+ def eof
+ @eof
+ end
+ alias eof? eof
+ def readline(rs=$/)
+ if @eof
+ raise EOFError
+ else
+ if p = @string[@pos..-1]=~rs
+ line = @string[@pos,p+1]
+ else
+ line = @string[@pos..-1]
+ end
+ @pos+=line.size
+ @eof =true if @pos==@string.size
+ $_ = line
+ end
+ end
+ def rewind
+ seek(0,0)
+ end
+ def seek(offset,whence)
+ case whence
+ when 0
+ @pos=offset
+ when 1
+ @pos+=offset
+ when 2
+ @pos=@string.size+offset
+ end
+ @eof=(@pos>=@string.size)
+ 0
+ end
+ end
+
+ #
+ # Class method for creating streams
+ #
+ def Syck.make_stream( io )
+ if String === io
+ io = StringIO.new( io )
+ elsif not IO === io
+ raise Syck::Error, "YAML stream must be an IO or String object."
+ end
+ if Syck::unicode
+ def io.readline
+ Syck.utf_to_internal( readline( @ln_sep ), @utf_encoding )
+ end
+ def io.check_unicode
+ @utf_encoding = Syck.sniff_encoding( read( 4 ) )
+ @ln_sep = Syck.enc_separator( @utf_encoding )
+ seek( -4, IO::SEEK_CUR )
+ end
+ def io.utf_encoding
+ @utf_encoding
+ end
+ io.check_unicode
+ else
+ def io.utf_encoding
+ :None
+ end
+ end
+ io
+ end
+
+end
+
diff --git a/ext/syck/lib/syck/syck.rb b/ext/syck/lib/syck/syck.rb
new file mode 100644
index 0000000000..10e5023f46
--- /dev/null
+++ b/ext/syck/lib/syck/syck.rb
@@ -0,0 +1,16 @@
+#
+# YAML::Syck module
+# .. glues syck and yaml.rb together ..
+#
+require 'syck/basenode'
+
+module Syck
+
+ #
+ # Mixin BaseNode functionality
+ #
+ class Node
+ include Syck::BaseNode
+ end
+
+end
diff --git a/ext/syck/lib/syck/tag.rb b/ext/syck/lib/syck/tag.rb
new file mode 100644
index 0000000000..9c6de57953
--- /dev/null
+++ b/ext/syck/lib/syck/tag.rb
@@ -0,0 +1,95 @@
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4
+# $Id$
+#
+# = yaml/tag.rb: methods for associating a taguri to a class.
+#
+# Author:: why the lucky stiff
+#
+module Syck
+ # A dictionary of taguris which map to
+ # Ruby classes.
+ @@tagged_classes = {}
+
+ #
+ # Associates a taguri _tag_ with a Ruby class _cls_. The taguri is used to give types
+ # to classes when loading YAML. Taguris are of the form:
+ #
+ # tag:authorityName,date:specific
+ #
+ # The +authorityName+ is a domain name or email address. The +date+ is the date the type
+ # was issued in YYYY or YYYY-MM or YYYY-MM-DD format. The +specific+ is a name for
+ # the type being added.
+ #
+ # For example, built-in YAML types have 'yaml.org' as the +authorityName+ and '2002' as the
+ # +date+. The +specific+ is simply the name of the type:
+ #
+ # tag:yaml.org,2002:int
+ # tag:yaml.org,2002:float
+ # tag:yaml.org,2002:timestamp
+ #
+ # The domain must be owned by you on the +date+ declared. If you don't own any domains on the
+ # date you declare the type, you can simply use an e-mail address.
+ #
+ # tag:why@ruby-lang.org,2004:notes/personal
+ #
+ def self.tag_class( tag, cls )
+ if @@tagged_classes.has_key? tag
+ warn "class #{ @@tagged_classes[tag] } held ownership of the #{ tag } tag"
+ end
+ @@tagged_classes[tag] = cls
+ end
+
+ # Returns the complete dictionary of taguris, paired with classes. The key for
+ # the dictionary is the full taguri. The value for each key is the class constant
+ # associated to that taguri.
+ #
+ # YAML.tagged_classes["tag:yaml.org,2002:int"] => Integer
+ #
+ def self.tagged_classes
+ @@tagged_classes
+ end
+end
+
+class Module
+ # :stopdoc:
+
+ # Adds a taguri _tag_ to a class, used when dumping or loading the class
+ # in YAML. See YAML::tag_class for detailed information on typing and
+ # taguris.
+ def syck_yaml_as( tag, sc = true )
+ verbose, $VERBOSE = $VERBOSE, nil
+ class_eval <<-"END", __FILE__, __LINE__+1
+ attr_writer :taguri
+ def taguri
+ if respond_to? :to_yaml_type
+ Syck.tagurize( to_yaml_type[1..-1] )
+ else
+ return @taguri if defined?(@taguri) and @taguri
+ tag = #{ tag.dump }
+ if self.class.yaml_tag_subclasses? and self.class != Syck.tagged_classes[tag]
+ tag = "\#{ tag }:\#{ self.class.yaml_tag_class_name }"
+ end
+ tag
+ end
+ end
+ def self.yaml_tag_subclasses?; #{ sc ? 'true' : 'false' }; end
+ END
+ Syck.tag_class tag, self
+ ensure
+ $VERBOSE = verbose
+ end
+ remove_method :yaml_as rescue nil
+ alias :yaml_as :syck_yaml_as
+
+ # Transforms the subclass name into a name suitable for display
+ # in a subclassed tag.
+ def yaml_tag_class_name
+ self.name
+ end
+ # Transforms the subclass name found in the tag into a Ruby
+ # constant name.
+ def yaml_tag_read_class( name )
+ name
+ end
+ # :startdoc:
+end
diff --git a/ext/syck/lib/syck/types.rb b/ext/syck/lib/syck/types.rb
new file mode 100644
index 0000000000..5c129acba4
--- /dev/null
+++ b/ext/syck/lib/syck/types.rb
@@ -0,0 +1,192 @@
+# -*- mode: ruby; ruby-indent-level: 4 -*- vim: sw=4
+#
+# Classes required by the full core typeset
+#
+
+module Syck
+
+ #
+ # Default private type
+ #
+ class PrivateType
+ def self.tag_subclasses?; false; end
+ verbose, $VERBOSE = $VERBOSE, nil
+ def initialize( type, val )
+ @type_id = type; @value = val
+ @value.taguri = "x-private:#{ @type_id }"
+ end
+ def to_yaml( opts = {} )
+ @value.to_yaml( opts )
+ end
+ ensure
+ $VERBOSE = verbose
+ end
+
+ #
+ # Default domain type
+ #
+ class DomainType
+ def self.tag_subclasses?; false; end
+ verbose, $VERBOSE = $VERBOSE, nil
+ def initialize( domain, type, val )
+ @domain = domain; @type_id = type; @value = val
+ @value.taguri = "tag:#{ @domain }:#{ @type_id }"
+ end
+ def to_yaml( opts = {} )
+ @value.to_yaml( opts )
+ end
+ ensure
+ $VERBOSE = verbose
+ end
+
+ #
+ # Unresolved objects
+ #
+ class Object
+ def self.tag_subclasses?; false; end
+ def to_yaml( opts = {} )
+ Syck.quick_emit( self, opts ) do |out|
+ out.map( "tag:ruby.yaml.org,2002:object:#{ @class }", to_yaml_style ) do |map|
+ @ivars.each do |k,v|
+ map.add( k, v )
+ end
+ end
+ end
+ end
+ end
+
+ #
+ # YAML Hash class to support comments and defaults
+ #
+ class SpecialHash < ::Hash
+ attr_accessor :default
+ def inspect
+ self.default.to_s
+ end
+ def to_s
+ self.default.to_s
+ end
+ def update( h )
+ if Syck::SpecialHash === h
+ @default = h.default if h.default
+ end
+ super( h )
+ end
+ def to_yaml( opts = {} )
+ opts[:DefaultKey] = self.default
+ super( opts )
+ end
+ end
+
+ #
+ # Builtin collection: !omap
+ #
+ class Omap < ::Array
+ yaml_as "tag:yaml.org,2002:omap"
+ def yaml_initialize( tag, val )
+ if Array === val
+ val.each do |v|
+ if Hash === v
+ concat( v.to_a ) # Convert the map to a sequence
+ else
+ raise Syck::Error, "Invalid !omap entry: " + val.inspect
+ end
+ end
+ else
+ raise Syck::Error, "Invalid !omap: " + val.inspect
+ end
+ self
+ end
+ def self.[]( *vals )
+ o = Omap.new
+ 0.step( vals.length - 1, 2 ) do |i|
+ o[vals[i]] = vals[i+1]
+ end
+ o
+ end
+ def []( k )
+ self.assoc( k ).to_a[1]
+ end
+ def []=( k, *rest )
+ val, set = rest.reverse
+ if ( tmp = self.assoc( k ) ) and not set
+ tmp[1] = val
+ else
+ self << [ k, val ]
+ end
+ val
+ end
+ def has_key?( k )
+ self.assoc( k ) ? true : false
+ end
+ def is_complex_yaml?
+ true
+ end
+ def to_yaml( opts = {} )
+ Syck.quick_emit( self, opts ) do |out|
+ out.seq( taguri, to_yaml_style ) do |seq|
+ self.each do |v|
+ seq.add( Hash[ *v ] )
+ end
+ end
+ end
+ end
+ end
+
+ #
+ # Builtin collection: !pairs
+ #
+ class Pairs < ::Array
+ yaml_as "tag:yaml.org,2002:pairs"
+ def yaml_initialize( tag, val )
+ if Array === val
+ val.each do |v|
+ if Hash === v
+ concat( v.to_a ) # Convert the map to a sequence
+ else
+ raise Syck::Error, "Invalid !pairs entry: " + val.inspect
+ end
+ end
+ else
+ raise Syck::Error, "Invalid !pairs: " + val.inspect
+ end
+ self
+ end
+ def self.[]( *vals )
+ p = Pairs.new
+ 0.step( vals.length - 1, 2 ) { |i|
+ p[vals[i]] = vals[i+1]
+ }
+ p
+ end
+ def []( k )
+ self.assoc( k ).to_a
+ end
+ def []=( k, val )
+ self << [ k, val ]
+ val
+ end
+ def has_key?( k )
+ self.assoc( k ) ? true : false
+ end
+ def is_complex_yaml?
+ true
+ end
+ def to_yaml( opts = {} )
+ Syck.quick_emit( self, opts ) do |out|
+ out.seq( taguri, to_yaml_style ) do |seq|
+ self.each do |v|
+ seq.add( Hash[ *v ] )
+ end
+ end
+ end
+ end
+ end
+
+ #
+ # Builtin collection: !set
+ #
+ class Set < ::Hash
+ yaml_as "tag:yaml.org,2002:set"
+ end
+end
diff --git a/ext/syck/lib/syck/yamlnode.rb b/ext/syck/lib/syck/yamlnode.rb
new file mode 100644
index 0000000000..2fa57b1f97
--- /dev/null
+++ b/ext/syck/lib/syck/yamlnode.rb
@@ -0,0 +1,54 @@
+#
+# YAML::YamlNode class
+#
+require 'syck/basenode'
+
+module Syck
+
+ #
+ # YAML Generic Model container
+ #
+ class YamlNode
+ include BaseNode
+ attr_accessor :kind, :type_id, :value, :anchor
+ def initialize(t, v)
+ @type_id = t
+ if Hash === v
+ @kind = 'map'
+ @value = {}
+ v.each {|key,val|
+ @value[key.transform] = [key, val]
+ }
+ elsif Array === v
+ @kind = 'seq'
+ @value = v
+ elsif String === v
+ @kind = 'scalar'
+ @value = v
+ end
+ end
+
+ #
+ # Transform this node fully into a native type
+ #
+ def transform
+ t = nil
+ if @value.is_a? Hash
+ t = {}
+ @value.each { |k,v|
+ t[ k ] = v[1].transform
+ }
+ elsif @value.is_a? Array
+ t = []
+ @value.each { |v|
+ t.push v.transform
+ }
+ else
+ t = @value
+ end
+ Syck.transfer_method( @type_id, t )
+ end
+
+ end
+
+end
diff --git a/ext/syck/lib/syck/ypath.rb b/ext/syck/lib/syck/ypath.rb
new file mode 100644
index 0000000000..024dcb7f4e
--- /dev/null
+++ b/ext/syck/lib/syck/ypath.rb
@@ -0,0 +1,54 @@
+#
+# YAML::YPath
+#
+
+warn "#{caller[0]}: YAML::YPath is deprecated" if $VERBOSE
+
+module Syck
+
+ class YPath
+ attr_accessor :segments, :predicates, :flags
+ def initialize( str )
+ @segments = []
+ @predicates = []
+ @flags = nil
+ while str =~ /^\/?(\/|[^\/\[]+)(?:\[([^\]]+)\])?/
+ @segments.push $1
+ @predicates.push $2
+ str = $'
+ end
+ unless str.to_s.empty?
+ @segments += str.split( "/" )
+ end
+ if @segments.length == 0
+ @segments.push "."
+ end
+ end
+ def self.each_path( str )
+ #
+ # Find choices
+ #
+ paths = []
+ str = "(#{ str })"
+ while str.sub!( /\(([^()]+)\)/, "\n#{ paths.length }\n" )
+ paths.push $1.split( '|' )
+ end
+
+ #
+ # Construct all possible paths
+ #
+ all = [ str ]
+ ( paths.length - 1 ).downto( 0 ) do |i|
+ all = all.collect do |a|
+ paths[i].collect do |p|
+ a.gsub( /\n#{ i }\n/, p )
+ end
+ end.flatten.uniq
+ end
+ all.collect do |path|
+ yield YPath.new( path )
+ end
+ end
+ end
+
+end
diff --git a/ext/syck/lib/yaml/syck.rb b/ext/syck/lib/yaml/syck.rb
new file mode 100644
index 0000000000..5b5d1c494e
--- /dev/null
+++ b/ext/syck/lib/yaml/syck.rb
@@ -0,0 +1,14 @@
+# $Id$
+#
+# = yaml/syck.rb:
+#
+
+require 'stringio'
+require 'syck.so'
+require 'syck/error'
+require 'syck/syck'
+require 'syck/tag'
+require 'syck/stream'
+require 'syck/constants'
+require 'syck/rubytypes'
+require 'syck/types'
diff --git a/ext/syck/node.c b/ext/syck/node.c
new file mode 100644
index 0000000000..35c1f45150
--- /dev/null
+++ b/ext/syck/node.c
@@ -0,0 +1,407 @@
+/*
+ * node.c
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#include "ruby/ruby.h"
+#include "syck.h"
+
+/*
+ * Node allocation functions
+ */
+SyckNode *
+syck_alloc_node( enum syck_kind_tag type )
+{
+ SyckNode *s;
+
+ s = S_ALLOC( SyckNode );
+ s->kind = type;
+ s->id = 0;
+ s->type_id = NULL;
+ s->anchor = NULL;
+ s->shortcut = NULL;
+
+ return s;
+}
+
+void
+syck_free_node( SyckNode *n )
+{
+ syck_free_members( n );
+ if ( n->type_id != NULL )
+ {
+ S_FREE( n->type_id );
+ n->type_id = NULL;
+ }
+ if ( n->anchor != NULL )
+ {
+ S_FREE( n->anchor );
+ n->anchor = NULL;
+ }
+ S_FREE( n );
+}
+
+SyckNode *
+syck_alloc_map(void)
+{
+ SyckNode *n;
+ struct SyckMap *m;
+
+ m = S_ALLOC( struct SyckMap );
+ m->style = map_none;
+ m->idx = 0;
+ m->capa = ALLOC_CT;
+ m->keys = S_ALLOC_N( SYMID, m->capa );
+ m->values = S_ALLOC_N( SYMID, m->capa );
+
+ n = syck_alloc_node( syck_map_kind );
+ n->data.pairs = m;
+
+ return n;
+}
+
+SyckNode *
+syck_alloc_seq(void)
+{
+ SyckNode *n;
+ struct SyckSeq *s;
+
+ s = S_ALLOC( struct SyckSeq );
+ s->style = seq_none;
+ s->idx = 0;
+ s->capa = ALLOC_CT;
+ s->items = S_ALLOC_N( SYMID, s->capa );
+
+ n = syck_alloc_node( syck_seq_kind );
+ n->data.list = s;
+
+ return n;
+}
+
+SyckNode *
+syck_alloc_str(void)
+{
+ SyckNode *n;
+ struct SyckStr *s;
+
+ s = S_ALLOC( struct SyckStr );
+ s->len = 0;
+ s->ptr = NULL;
+ s->style = scalar_none;
+
+ n = syck_alloc_node( syck_str_kind );
+ n->data.str = s;
+
+ return n;
+}
+
+SyckNode *
+syck_new_str( const 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 )
+{
+ SyckNode *n;
+
+ n = syck_alloc_str();
+ n->data.str->ptr = S_ALLOC_N( char, len + 1 );
+ n->data.str->len = len;
+ n->data.str->style = style;
+ memcpy( n->data.str->ptr, str, len );
+ n->data.str->ptr[len] = '\0';
+
+ return n;
+}
+
+void
+syck_replace_str( SyckNode *n, char *str, enum scalar_style style )
+{
+ syck_replace_str2( n, str, strlen( str ), style );
+}
+
+void
+syck_replace_str2( SyckNode *n, char *str, long len, enum scalar_style style )
+{
+ if ( n->data.str->ptr != NULL )
+ {
+ S_FREE( n->data.str->ptr );
+ n->data.str->ptr = NULL;
+ n->data.str->len = 0;
+ }
+ n->data.str->ptr = S_ALLOC_N( char, len + 1 );
+ n->data.str->len = len;
+ n->data.str->style = style;
+ memcpy( n->data.str->ptr, str, len );
+ n->data.str->ptr[len] = '\0';
+}
+
+void
+syck_str_blow_away_commas( SyckNode *n )
+{
+ char *go, *end;
+
+ go = n->data.str->ptr;
+ end = go + n->data.str->len;
+ while ( *(++go) != '\0' )
+ {
+ if ( *go == ',' )
+ {
+ n->data.str->len -= 1;
+ memmove( go, go + 1, end - go );
+ end -= 1;
+ }
+ }
+}
+
+char *
+syck_str_read( SyckNode *n )
+{
+ ASSERT( n != NULL );
+ return n->data.str->ptr;
+}
+
+SyckNode *
+syck_new_map( SYMID key, SYMID value )
+{
+ SyckNode *n;
+
+ n = syck_alloc_map();
+ syck_map_add( n, key, value );
+
+ return n;
+}
+
+void
+syck_map_empty( SyckNode *n )
+{
+ struct SyckMap *m;
+ ASSERT( n != NULL );
+ ASSERT( n->data.list != NULL );
+
+ S_FREE( n->data.pairs->keys );
+ S_FREE( n->data.pairs->values );
+ m = n->data.pairs;
+ m->idx = 0;
+ m->capa = ALLOC_CT;
+ m->keys = S_ALLOC_N( SYMID, m->capa );
+ m->values = S_ALLOC_N( SYMID, m->capa );
+}
+
+void
+syck_map_add( SyckNode *map, SYMID key, SYMID value )
+{
+ struct SyckMap *m;
+ long idx;
+
+ ASSERT( map != NULL );
+ ASSERT( map->data.pairs != NULL );
+
+ m = map->data.pairs;
+ idx = m->idx;
+ m->idx += 1;
+ if ( m->idx > m->capa )
+ {
+ m->capa += ALLOC_CT;
+ S_REALLOC_N( m->keys, SYMID, m->capa );
+ S_REALLOC_N( m->values, SYMID, m->capa );
+ }
+ m->keys[idx] = key;
+ m->values[idx] = value;
+}
+
+void
+syck_map_update( SyckNode *map1, SyckNode *map2 )
+{
+ struct SyckMap *m1, *m2;
+ long new_idx, new_capa;
+ ASSERT( map1 != NULL );
+ ASSERT( map2 != NULL );
+
+ m1 = map1->data.pairs;
+ m2 = map2->data.pairs;
+ if ( m2->idx < 1 ) return;
+
+ new_idx = m1->idx;
+ new_idx += m2->idx;
+ new_capa = m1->capa;
+ while ( new_idx > new_capa )
+ {
+ new_capa += ALLOC_CT;
+ }
+ if ( new_capa > m1->capa )
+ {
+ m1->capa = new_capa;
+ S_REALLOC_N( m1->keys, SYMID, m1->capa );
+ S_REALLOC_N( m1->values, SYMID, m1->capa );
+ }
+ for ( new_idx = 0; new_idx < m2->idx; m1->idx++, new_idx++ )
+ {
+ m1->keys[m1->idx] = m2->keys[new_idx];
+ m1->values[m1->idx] = m2->values[new_idx];
+ }
+}
+
+long
+syck_map_count( SyckNode *map )
+{
+ ASSERT( map != NULL );
+ ASSERT( map->data.pairs != NULL );
+ return map->data.pairs->idx;
+}
+
+void
+syck_map_assign( SyckNode *map, enum map_part p, long idx, SYMID id )
+{
+ struct SyckMap *m;
+
+ ASSERT( map != NULL );
+ m = map->data.pairs;
+ ASSERT( m != NULL );
+ if ( p == map_key )
+ {
+ m->keys[idx] = id;
+ }
+ else
+ {
+ m->values[idx] = id;
+ }
+}
+
+SYMID
+syck_map_read( SyckNode *map, enum map_part p, long idx )
+{
+ struct SyckMap *m;
+
+ ASSERT( map != NULL );
+ m = map->data.pairs;
+ ASSERT( m != NULL );
+ if ( p == map_key )
+ {
+ return m->keys[idx];
+ }
+ else
+ {
+ return m->values[idx];
+ }
+}
+
+SyckNode *
+syck_new_seq( SYMID value )
+{
+ SyckNode *n;
+
+ n = syck_alloc_seq();
+ syck_seq_add( n, value );
+
+ return n;
+}
+
+void
+syck_seq_empty( SyckNode *n )
+{
+ struct SyckSeq *s;
+ ASSERT( n != NULL );
+ ASSERT( n->data.list != NULL );
+
+ S_FREE( n->data.list->items );
+ s = n->data.list;
+ s->idx = 0;
+ s->capa = ALLOC_CT;
+ s->items = S_ALLOC_N( SYMID, s->capa );
+}
+
+void
+syck_seq_add( SyckNode *arr, SYMID value )
+{
+ struct SyckSeq *s;
+ long idx;
+
+ ASSERT( arr != NULL );
+ ASSERT( arr->data.list != NULL );
+
+ s = arr->data.list;
+ idx = s->idx;
+ s->idx += 1;
+ if ( s->idx > s->capa )
+ {
+ s->capa += ALLOC_CT;
+ S_REALLOC_N( s->items, SYMID, s->capa );
+ }
+ s->items[idx] = value;
+}
+
+long
+syck_seq_count( SyckNode *seq )
+{
+ ASSERT( seq != NULL );
+ ASSERT( seq->data.list != NULL );
+ return seq->data.list->idx;
+}
+
+void
+syck_seq_assign( SyckNode *seq, long idx, SYMID id )
+{
+ struct SyckSeq *s;
+
+ ASSERT( map != NULL );
+ s = seq->data.list;
+ ASSERT( m != NULL );
+ s->items[idx] = id;
+}
+
+SYMID
+syck_seq_read( SyckNode *seq, long idx )
+{
+ struct SyckSeq *s;
+
+ ASSERT( seq != NULL );
+ s = seq->data.list;
+ ASSERT( s != NULL );
+ return s->items[idx];
+}
+
+void
+syck_free_members( SyckNode *n )
+{
+ if ( n == NULL ) return;
+
+ switch ( n->kind )
+ {
+ case syck_str_kind:
+ if ( n->data.str != NULL )
+ {
+ S_FREE( n->data.str->ptr );
+ n->data.str->ptr = NULL;
+ n->data.str->len = 0;
+ S_FREE( n->data.str );
+ n->data.str = NULL;
+ }
+ break;
+
+ case syck_seq_kind:
+ if ( n->data.list != NULL )
+ {
+ S_FREE( n->data.list->items );
+ S_FREE( n->data.list );
+ n->data.list = NULL;
+ }
+ break;
+
+ case syck_map_kind:
+ if ( n->data.pairs != NULL )
+ {
+ S_FREE( n->data.pairs->keys );
+ S_FREE( n->data.pairs->values );
+ S_FREE( n->data.pairs );
+ n->data.pairs = NULL;
+ }
+ break;
+ }
+}
+
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
new file mode 100644
index 0000000000..1be472e040
--- /dev/null
+++ b/ext/syck/rubyext.c
@@ -0,0 +1,2324 @@
+/* -*- indent-tabs-mode: nil -*- */
+/*
+ * rubyext.c
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003-2005 why the lucky stiff
+ */
+
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "syck.h"
+#include <sys/types.h>
+#include <time.h>
+
+typedef struct RVALUE {
+ union {
+#if 0
+ struct {
+ unsigned long flags; /* always 0 for freed obj */
+ struct RVALUE *next;
+ } free;
+#endif
+ 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;*/
+ } as;
+} RVALUE;
+
+typedef struct {
+ long hash;
+ char *buffer;
+ long length;
+ long remaining;
+ int printed;
+} bytestring_t;
+
+#define RUBY_DOMAIN "ruby.yaml.org,2002"
+
+/*
+ * 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 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 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 VALUE syck_node_transform( VALUE );
+
+/*
+ * handler prototypes
+ */
+SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
+void rb_syck_err_handler _((SyckParser *, const 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));
+int syck_parser_assign_io _((SyckParser *, VALUE *));
+VALUE syck_scalar_alloc _((VALUE class));
+VALUE syck_seq_alloc _((VALUE class));
+VALUE syck_map_alloc _((VALUE class));
+
+struct parser_xtra {
+ VALUE data; /* Borrowed this idea from marshal.c to fix [ruby-core:8067] problem */
+ VALUE proc;
+ VALUE resolver;
+ int taint;
+};
+
+struct emitter_xtra {
+ VALUE oid;
+ VALUE data;
+ VALUE port;
+};
+
+/*
+ * Convert YAML to bytecode
+ */
+VALUE
+rb_syck_compile(VALUE self, VALUE port)
+{
+ SYMID oid;
+ int taint;
+ char *ret;
+ VALUE bc;
+ bytestring_t *sav = NULL;
+ void *data = NULL;
+
+ SyckParser *parser = syck_new_parser();
+ taint = syck_parser_assign_io(parser, &port);
+ syck_parser_handler( parser, syck_yaml2byte_handler );
+ syck_parser_error_handler( parser, NULL );
+ 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;
+
+ ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
+ ret[0] = '\0';
+ strcat( ret, "D\n" );
+ strcat( ret, sav->buffer );
+
+ syck_free_parser( parser );
+
+ bc = rb_str_new2( ret );
+ if ( taint ) OBJ_TAINT( bc );
+ return bc;
+}
+
+/*
+ * read from io.
+ */
+long
+rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
+{
+ long len = 0;
+
+ ASSERT( str != NULL );
+ max_size -= skip;
+
+ if ( max_size <= 0 ) max_size = 0;
+ else
+ {
+ /*
+ * call io#read.
+ */
+ VALUE src = (VALUE)str->ptr;
+ VALUE n = LONG2NUM(max_size);
+ VALUE str2 = rb_funcall2(src, s_read, 1, &n);
+ if (!NIL_P(str2))
+ {
+ StringValue(str2);
+ len = RSTRING_LEN(str2);
+ memcpy( buf + skip, RSTRING_PTR(str2), len );
+ }
+ }
+ len += skip;
+ buf[len] = '\0';
+ return len;
+}
+
+/*
+ * determine: are we reading from a string or io?
+ * (returns tainted? boolean)
+ */
+int
+syck_parser_assign_io(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 );
+ }
+ else if (rb_respond_to(port, s_read)) {
+ if (rb_respond_to(port, s_binmode)) {
+ rb_funcall2(port, s_binmode, 0, 0);
+ }
+ syck_parser_str( parser, (char *)port, 0, rb_syck_io_str_read );
+ }
+ else {
+ rb_raise(rb_eTypeError, "instance of IO needed");
+ }
+ *pport = port;
+ return taint;
+}
+
+/*
+ * Get value in hash by key, forcing an empty hash if nil.
+ */
+VALUE
+syck_get_hash_aref(VALUE hsh, VALUE key)
+{
+ VALUE val = rb_hash_aref( hsh, key );
+ if ( NIL_P( val ) )
+ {
+ val = rb_hash_new();
+ rb_hash_aset(hsh, key, val);
+ }
+ return val;
+}
+
+/*
+ * creating timestamps
+ */
+struct mktime_arg {
+ 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);
+ VALUE day = INT2FIX(0);
+ VALUE hour = INT2FIX(0);
+ VALUE min = INT2FIX(0);
+ VALUE sec = INT2FIX(0);
+ double usec;
+
+ /* Year*/
+ if ( ptr[0] != '\0' && len > 0 ) {
+ year = INT2FIX(strtol(ptr, NULL, 10));
+ }
+
+ /* Month*/
+ ptr += 4;
+ if ( ptr[0] != '\0' && len > ptr - str ) {
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ mon = INT2FIX(strtol(ptr, NULL, 10));
+ }
+
+ /* Day*/
+ ptr += 2;
+ if ( ptr[0] != '\0' && len > ptr - str ) {
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ day = INT2FIX(strtol(ptr, NULL, 10));
+ }
+
+ /* Hour*/
+ ptr += 2;
+ if ( ptr[0] != '\0' && len > ptr - str ) {
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ hour = INT2FIX(strtol(ptr, NULL, 10));
+ }
+
+ /* Minute */
+ ptr += 2;
+ if ( ptr[0] != '\0' && len > ptr - str ) {
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ min = INT2FIX(strtol(ptr, NULL, 10));
+ }
+
+ /* Second */
+ ptr += 2;
+ if ( ptr[0] != '\0' && len > ptr - str ) {
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ sec = INT2FIX(strtol(ptr, NULL, 10));
+ }
+
+ /* Millisecond */
+ ptr += 2;
+ if ( len > ptr - str && *ptr == '.' )
+ {
+ char padded[] = "000000.000000";
+ const int padding = 6;
+ const int offset = padding + 1;
+ const char *end = ptr + 1;
+ const char *begin = end;
+ int length;
+ while ( isdigit( *end ) ) end++;
+ length = (int)(end - begin) <= padding ? (int)(end - begin) : padding;
+ MEMCPY(padded, begin, char, length);
+ usec = strtod(padded, NULL);
+ }
+ else
+ {
+ usec = 0.0;
+ }
+
+ /* Time Zone*/
+ while ( len > ptr - str && *ptr != 'Z' && *ptr != '+' && *ptr != '-' && *ptr != '\0' ) ptr++;
+ if ( len > ptr - str && ( *ptr == '-' || *ptr == '+' ) )
+ {
+ time_t tz_offset = strtol(ptr, NULL, 10) * 3600;
+ VALUE tmp;
+
+ while ( *ptr != ':' && *ptr != '\0' ) ptr++;
+ if ( *ptr == ':' )
+ {
+ ptr += 1;
+ if ( tz_offset < 0 )
+ {
+ tz_offset -= strtol(ptr, NULL, 10) * 60;
+ }
+ else
+ {
+ tz_offset += strtol(ptr, NULL, 10) * 60;
+ }
+ }
+
+ /* 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, rb_float_new(usec));
+ }
+ else
+ {
+ /* Make UTC time*/
+ return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, rb_float_new(usec));
+ }
+}
+
+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 )
+{
+ VALUE tmp;
+ if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
+ {
+ entry = tmp;
+ rb_funcall( hsh, s_update, 1, entry );
+ }
+ return Qnil;
+}
+
+/*
+ * default handler for ruby.yaml.org types
+ */
+int
+yaml_org_handler( SyckNode *n, VALUE *ref )
+{
+ char *type_id = n->type_id;
+ int transferred = 0;
+ long i = 0;
+ VALUE obj = Qnil;
+
+ if ( type_id != NULL && strncmp( type_id, "tag:yaml.org,2002:", 18 ) == 0 )
+ {
+ type_id += 18;
+ }
+
+ switch (n->kind)
+ {
+ case syck_str_kind:
+ transferred = 1;
+ if ( type_id == NULL )
+ {
+ obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+ }
+ else if ( strcmp( type_id, "null" ) == 0 )
+ {
+ obj = Qnil;
+ }
+ else if ( strcmp( type_id, "binary" ) == 0 )
+ {
+ VALUE arr;
+ obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+ rb_funcall( obj, s_tr_bang, 2, rb_str_new2( "\n\t " ), rb_str_new2( "" ) );
+ arr = rb_funcall( obj, s_unpack, 1, rb_str_new2( "m" ) );
+ obj = rb_ary_shift( arr );
+ }
+ else if ( strcmp( type_id, "bool#yes" ) == 0 )
+ {
+ obj = Qtrue;
+ }
+ else if ( strcmp( type_id, "bool#no" ) == 0 )
+ {
+ obj = Qfalse;
+ }
+ else if ( strcmp( type_id, "int#hex" ) == 0 )
+ {
+ syck_str_blow_away_commas( n );
+ obj = rb_cstr2inum( n->data.str->ptr, 16 );
+ }
+ else if ( strcmp( type_id, "int#oct" ) == 0 )
+ {
+ syck_str_blow_away_commas( n );
+ obj = rb_cstr2inum( n->data.str->ptr, 8 );
+ }
+ else if ( strcmp( type_id, "int#base60" ) == 0 )
+ {
+ char *ptr, *end;
+ long sixty = 1;
+ long total = 0;
+ syck_str_blow_away_commas( n );
+ ptr = n->data.str->ptr;
+ end = n->data.str->ptr + n->data.str->len;
+ while ( end > ptr )
+ {
+ long bnum = 0;
+ char *colon = end - 1;
+ while ( colon >= ptr && *colon != ':' )
+ {
+ colon--;
+ }
+ if ( colon >= ptr && *colon == ':' ) *colon = '\0';
+
+ bnum = strtol( colon + 1, NULL, 10 );
+ total += bnum * sixty;
+ sixty *= 60;
+ end = colon;
+ }
+ obj = INT2FIX(total);
+ }
+ else if ( strncmp( type_id, "int", 3 ) == 0 )
+ {
+ syck_str_blow_away_commas( n );
+ obj = rb_cstr2inum( n->data.str->ptr, 10 );
+ }
+ else if ( strcmp( type_id, "float#base60" ) == 0 )
+ {
+ char *ptr, *end;
+ long sixty = 1;
+ double total = 0.0;
+ syck_str_blow_away_commas( n );
+ ptr = n->data.str->ptr;
+ end = n->data.str->ptr + n->data.str->len;
+ while ( end > ptr )
+ {
+ double bnum = 0;
+ char *colon = end - 1;
+ while ( colon >= ptr && *colon != ':' )
+ {
+ colon--;
+ }
+ if ( colon >= ptr && *colon == ':' ) *colon = '\0';
+
+ bnum = strtod( colon + 1, NULL );
+ total += bnum * sixty;
+ sixty *= 60;
+ end = colon;
+ }
+ obj = rb_float_new( total );
+ }
+ else if ( strcmp( type_id, "float#nan" ) == 0 )
+ {
+ obj = rb_float_new( S_nan() );
+ }
+ else if ( strcmp( type_id, "float#inf" ) == 0 )
+ {
+ obj = rb_float_new( S_inf() );
+ }
+ else if ( strcmp( type_id, "float#neginf" ) == 0 )
+ {
+ obj = rb_float_new( -S_inf() );
+ }
+ else if ( strncmp( type_id, "float", 5 ) == 0 )
+ {
+ double f;
+ syck_str_blow_away_commas( n );
+ f = strtod( n->data.str->ptr, NULL );
+ obj = rb_float_new( f );
+ }
+ else if ( strcmp( type_id, "timestamp#iso8601" ) == 0 )
+ {
+ obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+ }
+ else if ( strcmp( type_id, "timestamp#spaced" ) == 0 )
+ {
+ obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+ }
+ else if ( strcmp( type_id, "timestamp#ymd" ) == 0 )
+ {
+ char *ptr = n->data.str->ptr;
+ VALUE year, mon, day;
+
+ /* Year*/
+ ptr[4] = '\0';
+ year = INT2FIX(strtol(ptr, NULL, 10));
+
+ /* Month*/
+ ptr += 4;
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ mon = INT2FIX(strtol(ptr, NULL, 10));
+
+ /* Day*/
+ ptr += 2;
+ while ( !ISDIGIT( *ptr ) ) ptr++;
+ day = INT2FIX(strtol(ptr, NULL, 10));
+
+ if ( !cDate ) {
+ /*
+ * Load Date module
+ */
+ rb_require( "date" );
+ cDate = rb_const_get( rb_cObject, rb_intern("Date") );
+ }
+
+ obj = rb_funcall( cDate, s_new, 3, year, mon, day );
+ }
+ else if ( strncmp( type_id, "timestamp", 9 ) == 0 )
+ {
+ obj = rb_syck_mktime( n->data.str->ptr, n->data.str->len );
+ }
+ else if ( strncmp( type_id, "merge", 5 ) == 0 )
+ {
+ obj = rb_funcall( cMergeKey, s_new, 0 );
+ }
+ else if ( strncmp( type_id, "default", 7 ) == 0 )
+ {
+ obj = rb_funcall( cDefaultKey, s_new, 0 );
+ }
+ else if ( n->data.str->style == scalar_plain &&
+ n->data.str->len > 1 &&
+ strncmp( n->data.str->ptr, ":", 1 ) == 0 )
+ {
+ obj = rb_funcall( oDefaultResolver, s_transfer, 2,
+ rb_str_new2( "tag:ruby.yaml.org,2002:sym" ),
+ rb_str_new( n->data.str->ptr + 1, n->data.str->len - 1 ) );
+ }
+ 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
+ {
+ transferred = 0;
+ obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+ }
+ break;
+
+ case syck_seq_kind:
+ if ( type_id == NULL || strcmp( type_id, "seq" ) == 0 )
+ {
+ transferred = 1;
+ }
+ obj = rb_ary_new2( n->data.list->idx );
+ for ( i = 0; i < n->data.list->idx; i++ )
+ {
+ rb_ary_store( obj, i, syck_seq_read( n, i ) );
+ }
+ break;
+
+ case syck_map_kind:
+ if ( type_id == NULL || strcmp( type_id, "map" ) == 0 )
+ {
+ transferred = 1;
+ }
+ obj = rb_hash_new();
+ for ( i = 0; i < n->data.pairs->idx; i++ )
+ {
+ VALUE k = syck_map_read( n, map_key, i );
+ VALUE v = syck_map_read( n, map_value, i );
+ int skip_aset = 0;
+
+ /*
+ * Handle merge keys
+ */
+ if ( rb_obj_is_kind_of( k, cMergeKey ) )
+ {
+ VALUE tmp;
+ if ( !NIL_P(tmp = rb_check_convert_type(v, T_HASH, "Hash", "to_hash")) )
+ {
+ VALUE dup = rb_funcall( tmp, s_dup, 0 );
+ rb_funcall( dup, s_update, 1, obj );
+ obj = dup;
+ skip_aset = 1;
+ }
+ else if ( !NIL_P(tmp = rb_check_array_type(v)) )
+ {
+ VALUE end = rb_ary_pop( tmp );
+ VALUE tmph = rb_check_convert_type(end, T_HASH, "Hash", "to_hash");
+ if ( !NIL_P(tmph) )
+ {
+ 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 );
+ obj = dup;
+ skip_aset = 1;
+ }
+ }
+ }
+ else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
+ {
+ rb_funcall( obj, s_default_set, 1, v );
+ skip_aset = 1;
+ }
+
+ if ( ! skip_aset )
+ {
+ rb_hash_aset( obj, k, v );
+ }
+ }
+ break;
+ }
+
+ *ref = obj;
+ return transferred;
+}
+
+static void syck_node_mark( SyckNode *n );
+
+/*
+ * {native mode} node handler
+ * - Converts data into native Ruby types
+ */
+SYMID
+rb_syck_load_handler(SyckParser *p, SyckNode *n)
+{
+ VALUE obj = Qnil;
+ struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
+ VALUE resolver = bonus->resolver;
+ if ( NIL_P( resolver ) )
+ {
+ resolver = oDefaultResolver;
+ }
+
+ /*
+ * Create node,
+ */
+ obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
+
+ /*
+ * ID already set, let's alter the symbol table to accept the new object
+ */
+ if (n->id > 0 && !NIL_P(obj))
+ {
+ MEMCPY((void *)n->id, (void *)obj, RVALUE, 1);
+ MEMZERO((void *)obj, RVALUE, 1);
+ obj = n->id;
+ }
+
+ 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);
+ return obj;
+}
+
+/*
+ * friendly errors.
+ */
+void
+rb_syck_err_handler(SyckParser *p, const char *msg)
+{
+ char *endl = p->cursor;
+
+ while ( *endl != '\0' && *endl != '\n' )
+ endl++;
+
+ endl[0] = '\0';
+ rb_raise(rb_eArgError, "%s on line %d, col %"PRIdPTRDIFF": `%s'",
+ msg,
+ p->linect,
+ p->cursor - p->lineptr,
+ p->lineptr);
+}
+
+/*
+ * provide bad anchor object to the parser.
+ */
+SyckNode *
+rb_syck_bad_anchor_handler(SyckParser *p, char *a)
+{
+ VALUE anchor_name = rb_str_new2( a );
+ SyckNode *badanc = syck_new_map( rb_str_new2( "name" ), anchor_name );
+ badanc->type_id = syck_strndup( "tag:ruby.yaml.org,2002:object:YAML::Syck::BadAlias", 53 );
+ return badanc;
+}
+
+/*
+ * data loaded based on the model requested.
+ */
+void
+syck_set_model(VALUE p, VALUE input, VALUE model)
+{
+ SyckParser *parser;
+ Data_Get_Struct(p, SyckParser, parser);
+ syck_parser_handler( parser, rb_syck_load_handler );
+ /* WARN: gonna be obsoleted soon!! */
+ if ( model == sym_generic )
+ {
+ rb_funcall( p, s_set_resolver, 1, oGenericResolver );
+ }
+ syck_parser_implicit_typing( parser, 1 );
+ syck_parser_taguri_expansion( parser, 1 );
+
+ if ( NIL_P( input ) )
+ {
+ input = rb_ivar_get( p, s_input );
+ }
+ if ( input == sym_bytecode )
+ {
+ syck_parser_set_input_type( parser, syck_bytecode_utf8 );
+ }
+ else
+ {
+ syck_parser_set_input_type( parser, syck_yaml_utf8 );
+ }
+ syck_parser_error_handler( parser, rb_syck_err_handler );
+ syck_parser_bad_anchor_handler( parser, rb_syck_bad_anchor_handler );
+}
+
+static int
+syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
+{
+ if ( n != (void *)1 ) syck_node_mark( n );
+ return ST_CONTINUE;
+}
+
+/*
+ * mark parser nodes
+ */
+static void
+syck_mark_parser(SyckParser *parser)
+{
+ struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
+ rb_gc_mark_maybe(parser->root);
+ rb_gc_mark_maybe(parser->root_on_error);
+ rb_gc_mark( bonus->data );
+ rb_gc_mark( bonus->proc );
+ rb_gc_mark( bonus->resolver );
+
+ if ( parser->anchors != NULL )
+ {
+ st_foreach( parser->anchors, syck_st_mark_nodes, 0 );
+ }
+ if ( parser->bad_anchors != NULL )
+ {
+ st_foreach( parser->bad_anchors, syck_st_mark_nodes, 0 );
+ }
+}
+
+/*
+ * Free the parser and any bonus attachment.
+ */
+void
+rb_syck_free_parser(SyckParser *p)
+{
+ S_FREE( p->bonus );
+ syck_free_parser(p);
+}
+
+/*
+ * YAML::Syck::Parser.allocate
+ */
+VALUE syck_parser_s_alloc _((VALUE));
+VALUE
+syck_parser_s_alloc(VALUE class)
+{
+ VALUE pobj;
+ SyckParser *parser = syck_new_parser();
+
+ parser->bonus = S_ALLOC( struct parser_xtra );
+ S_MEMZERO( parser->bonus, struct parser_xtra, 1 );
+
+ pobj = Data_Wrap_Struct( class, syck_mark_parser, rb_syck_free_parser, parser );
+
+ syck_parser_set_root_on_error( parser, Qnil );
+
+ return pobj;
+}
+
+/*
+ * YAML::Syck::Parser.initialize( resolver, options )
+ */
+static VALUE
+syck_parser_initialize(int argc, VALUE *argv, VALUE self)
+{
+ VALUE options;
+ if (rb_scan_args(argc, argv, "01", &options) == 0)
+ {
+ options = rb_hash_new();
+ }
+ else
+ {
+ Check_Type(options, T_HASH);
+ }
+ rb_ivar_set(self, s_options, options);
+ rb_ivar_set(self, s_input, Qnil);
+ return self;
+}
+
+/*
+ * YAML::Syck::Parser.bufsize = Integer
+ */
+static VALUE
+syck_parser_bufsize_set(VALUE self, VALUE size)
+{
+ SyckParser *parser;
+
+ if ( rb_respond_to( size, s_to_i ) ) {
+ int n = NUM2INT(rb_funcall(size, s_to_i, 0));
+ Data_Get_Struct(self, SyckParser, parser);
+ parser->bufsize = n;
+ }
+ return self;
+}
+
+/*
+ * YAML::Syck::Parser.bufsize => Integer
+ */
+static VALUE
+syck_parser_bufsize_get(VALUE self)
+{
+ SyckParser *parser;
+
+ Data_Get_Struct(self, SyckParser, parser);
+ return INT2FIX( parser->bufsize );
+}
+
+/*
+ * YAML::Syck::Parser.load( IO or String )
+ */
+VALUE
+syck_parser_load(int argc, VALUE *argv, VALUE self)
+{
+ VALUE port, proc, model, input;
+ SyckParser *parser;
+ struct parser_xtra *bonus;
+
+ rb_scan_args(argc, argv, "11", &port, &proc);
+
+ input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
+ model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
+ Data_Get_Struct(self, SyckParser, parser);
+ syck_set_model( self, input, model );
+
+ bonus = (struct parser_xtra *)parser->bonus;
+ bonus->taint = syck_parser_assign_io(parser, &port);
+ bonus->data = rb_hash_new();
+ bonus->resolver = rb_attr_get( self, s_resolver );
+ if ( NIL_P( proc ) ) bonus->proc = 0;
+ else bonus->proc = proc;
+
+ return syck_parse( parser );
+}
+
+/*
+ * YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
+ */
+VALUE
+syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
+{
+ VALUE port, proc, v, input, model;
+ SyckParser *parser;
+ struct parser_xtra *bonus;
+
+ rb_scan_args(argc, argv, "1&", &port, &proc);
+
+ input = rb_hash_aref( rb_attr_get( self, s_options ), sym_input );
+ model = rb_hash_aref( rb_attr_get( self, s_options ), sym_model );
+ Data_Get_Struct(self, SyckParser, parser);
+ syck_set_model( self, input, model );
+
+ bonus = (struct parser_xtra *)parser->bonus;
+ bonus->taint = syck_parser_assign_io(parser, &port);
+ bonus->resolver = rb_attr_get( self, s_resolver );
+ bonus->proc = 0;
+
+ while ( 1 )
+ {
+ /* Reset hash for tracking nodes */
+ bonus->data = rb_hash_new();
+
+ /* Parse a document */
+ v = syck_parse( parser );
+ if ( parser->eof == 1 )
+ {
+ break;
+ }
+
+ /* Pass document to block */
+ rb_funcall( proc, s_call, 1, v );
+ }
+
+ return Qnil;
+}
+
+/*
+ * YAML::Syck::Parser#set_resolver
+ */
+VALUE
+syck_parser_set_resolver(VALUE self, VALUE resolver)
+{
+ rb_ivar_set( self, s_resolver, resolver );
+ return self;
+}
+
+/*
+ * YAML::Syck::Resolver.initialize
+ */
+static VALUE
+syck_resolver_initialize(VALUE self)
+{
+ rb_ivar_set(self, s_tags, rb_hash_new());
+ return self;
+}
+
+/*
+ * YAML::Syck::Resolver#add_type
+ */
+VALUE
+syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
+{
+ VALUE tags = rb_attr_get(self, s_tags);
+ rb_hash_aset( tags, taguri, cls );
+ return Qnil;
+}
+
+/*
+ * YAML::Syck::Resolver#use_types_at
+ */
+VALUE
+syck_resolver_use_types_at(VALUE self, VALUE hsh)
+{
+ rb_ivar_set( self, s_tags, hsh );
+ return Qnil;
+}
+
+/*
+ * YAML::Syck::Resolver#detect_implicit
+ */
+VALUE
+syck_resolver_detect_implicit(VALUE self, VALUE val)
+{
+ return rb_str_new2( "" );
+}
+
+/*
+ * YAML::Syck::Resolver#node_import
+ */
+VALUE
+syck_resolver_node_import(VALUE self, VALUE node)
+{
+ SyckNode *n;
+ VALUE obj = Qnil;
+ int i = 0;
+ Data_Get_Struct(node, SyckNode, n);
+
+ switch (n->kind)
+ {
+ case syck_str_kind:
+ obj = rb_str_new( n->data.str->ptr, n->data.str->len );
+ break;
+
+ case syck_seq_kind:
+ obj = rb_ary_new2( n->data.list->idx );
+ for ( i = 0; i < n->data.list->idx; i++ )
+ {
+ rb_ary_store( obj, i, syck_seq_read( n, i ) );
+ }
+ break;
+
+ case syck_map_kind:
+ obj = rb_hash_new();
+ for ( i = 0; i < n->data.pairs->idx; i++ )
+ {
+ VALUE k = syck_map_read( n, map_key, i );
+ VALUE v = syck_map_read( n, map_value, i );
+ int skip_aset = 0;
+
+ /*
+ * Handle merge keys
+ */
+ if ( rb_obj_is_kind_of( k, cMergeKey ) )
+ {
+ if ( rb_obj_is_kind_of( v, rb_cHash ) )
+ {
+ VALUE dup = rb_funcall( v, s_dup, 0 );
+ rb_funcall( dup, s_update, 1, obj );
+ obj = dup;
+ skip_aset = 1;
+ }
+ else if ( rb_obj_is_kind_of( v, rb_cArray ) )
+ {
+ VALUE end = rb_ary_pop( v );
+ if ( rb_obj_is_kind_of( end, rb_cHash ) )
+ {
+ 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 );
+ obj = dup;
+ skip_aset = 1;
+ }
+ }
+ }
+ else if ( rb_obj_is_kind_of( k, cDefaultKey ) )
+ {
+ rb_funcall( obj, s_default_set, 1, v );
+ skip_aset = 1;
+ }
+
+ if ( ! skip_aset )
+ {
+ rb_hash_aset( obj, k, v );
+ }
+ }
+ break;
+ }
+
+ if ( n->type_id != NULL )
+ {
+ obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
+ }
+ return obj;
+}
+
+/*
+ * Set instance variables
+ */
+VALUE
+syck_set_ivars(VALUE vars, VALUE obj)
+{
+ VALUE ivname = rb_ary_entry( vars, 0 );
+ char *ivn;
+ StringValue( ivname );
+ ivn = S_ALLOCA_N( char, RSTRING_LEN(ivname) + 2 );
+ ivn[0] = '@';
+ ivn[1] = '\0';
+ strncat( ivn, RSTRING_PTR(ivname), RSTRING_LEN(ivname) );
+ rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
+ return Qnil;
+}
+
+/*
+ * YAML::Syck::Resolver#const_find
+ */
+VALUE
+syck_const_find(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++ ) {
+ VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) );
+ if ( !rb_const_defined( tclass, tpart ) ) return Qnil;
+ tclass = rb_const_get( tclass, tpart );
+ }
+ return tclass;
+}
+
+/*
+ * YAML::Syck::Resolver#transfer
+ */
+VALUE
+syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
+{
+ if (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0)
+ {
+ type = rb_funcall( self, s_detect_implicit, 1, val );
+ }
+
+ if ( ! (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0) )
+ {
+ VALUE str_xprivate = rb_str_new2( "x-private" );
+ VALUE colon = rb_str_new2( ":" );
+ VALUE tags = rb_attr_get(self, s_tags);
+ VALUE target_class = rb_hash_aref( tags, type );
+ VALUE subclass = target_class;
+ VALUE obj = Qnil;
+
+ /*
+ * Should no tag match exactly, check for subclass format
+ */
+ if ( NIL_P( target_class ) )
+ {
+ VALUE subclass_parts = rb_ary_new();
+ VALUE parts = rb_str_split( type, ":" );
+
+ while ( RARRAY_LEN(parts) > 1 )
+ {
+ VALUE partial;
+ rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
+ partial = rb_ary_join( parts, colon );
+ target_class = rb_hash_aref( tags, partial );
+ if ( NIL_P( target_class ) )
+ {
+ rb_str_append( partial, colon );
+ target_class = rb_hash_aref( tags, partial );
+ }
+
+ /*
+ * Possible subclass found, see if it supports subclassing
+ */
+ if ( ! NIL_P( target_class ) )
+ {
+ subclass = target_class;
+ if ( RARRAY_LEN(subclass_parts) > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
+ RTEST( rb_funcall( target_class, s_tag_subclasses, 0 ) ) )
+ {
+ VALUE subclass_v;
+ subclass = rb_ary_join( subclass_parts, colon );
+ subclass = rb_funcall( target_class, s_tag_read_class, 1, subclass );
+ subclass_v = syck_const_find( subclass );
+
+ if ( subclass_v != Qnil )
+ {
+ subclass = subclass_v;
+ }
+ else if ( rb_cObject == target_class && subclass_v == Qnil )
+ {
+ target_class = cYObject;
+ type = subclass;
+ subclass = cYObject;
+ }
+ else /* workaround for SEGV. real fix please */
+ {
+ rb_raise( rb_eTypeError, "invalid subclass" );
+ }
+ }
+ break;
+ }
+ }
+ }
+
+ /* rb_raise(rb_eTypeError, "invalid typing scheme: %s given",
+ * scheme);
+ */
+
+ if ( rb_respond_to( target_class, s_call ) )
+ {
+ obj = rb_funcall( target_class, s_call, 2, type, val );
+ }
+ else
+ {
+ if ( rb_respond_to( target_class, s_yaml_new ) )
+ {
+ obj = rb_funcall( target_class, s_yaml_new, 3, subclass, type, val );
+ }
+ else if ( !NIL_P( target_class ) )
+ {
+ if ( subclass == rb_cBignum )
+ {
+ obj = rb_str2inum( val, 10 ); /* for yaml dumped by 1.8.3 [ruby-core:6159] */
+ }
+ else
+ {
+ obj = rb_obj_alloc( subclass );
+ }
+
+ if ( rb_respond_to( obj, s_yaml_initialize ) )
+ {
+ rb_funcall( obj, s_yaml_initialize, 2, type, 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 );
+ }
+ }
+ else
+ {
+ VALUE parts = rb_str_split( type, ":" );
+ VALUE scheme = rb_ary_shift( parts );
+ if ( rb_str_cmp( scheme, str_xprivate ) == 0 )
+ {
+ VALUE name = rb_ary_join( parts, colon );
+ obj = rb_funcall( cPrivateType, s_new, 2, name, val );
+ }
+ else
+ {
+ VALUE domain = rb_ary_shift( parts );
+ VALUE name = rb_ary_join( parts, colon );
+ obj = rb_funcall( cDomainType, s_new, 3, domain, name, val );
+ }
+ }
+ }
+ val = obj;
+ }
+
+ return val;
+}
+
+/*
+ * YAML::Syck::Resolver#tagurize
+ */
+VALUE
+syck_resolver_tagurize(VALUE self, VALUE val)
+{
+ VALUE tmp = rb_check_string_type(val);
+
+ if ( !NIL_P(tmp) )
+ {
+ char *taguri = syck_type_id_to_uri( RSTRING_PTR(tmp) );
+ val = rb_str_new2( taguri );
+ S_FREE( taguri );
+ }
+
+ return val;
+}
+
+/*
+ * YAML::Syck::DefaultResolver#detect_implicit
+ */
+VALUE
+syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
+{
+ const 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) );
+ return rb_str_new2( type_id );
+ }
+
+ return rb_str_new2( "" );
+}
+
+/*
+ * YAML::Syck::DefaultResolver#node_import
+ */
+VALUE
+syck_defaultresolver_node_import(VALUE self, VALUE node)
+{
+ SyckNode *n;
+ VALUE obj;
+ Data_Get_Struct( node, SyckNode, n );
+ if ( !yaml_org_handler( n, &obj ) )
+ {
+ obj = rb_funcall( self, s_transfer, 2, rb_str_new2( n->type_id ), obj );
+ }
+ return obj;
+}
+
+/*
+ * YAML::Syck::GenericResolver#node_import
+ */
+VALUE
+syck_genericresolver_node_import(VALUE self, VALUE node)
+{
+ SyckNode *n;
+ int i = 0;
+ VALUE t = Qnil, obj = Qnil, v = Qnil, style = Qnil;
+ Data_Get_Struct(node, SyckNode, n);
+
+ if ( n->type_id != NULL )
+ {
+ t = rb_str_new2(n->type_id);
+ }
+
+ switch (n->kind)
+ {
+ 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;
+ }
+ else if ( n->data.str->style == scalar_2quote )
+ {
+ style = sym_2quote;
+ }
+ else if ( n->data.str->style == scalar_fold )
+ {
+ style = sym_fold;
+ }
+ else if ( n->data.str->style == scalar_literal )
+ {
+ style = sym_literal;
+ }
+ else if ( n->data.str->style == scalar_plain )
+ {
+ style = sym_plain;
+ }
+ obj = rb_funcall( cScalar, s_new, 3, t, v, style );
+ }
+ break;
+
+ case syck_seq_kind:
+ v = rb_ary_new2( syck_seq_count( n ) );
+ for ( i = 0; i < syck_seq_count( n ); i++ )
+ {
+ rb_ary_store( v, i, syck_seq_read( n, i ) );
+ }
+ if ( n->data.list->style == seq_inline )
+ {
+ style = sym_inline;
+ }
+ obj = rb_funcall( cSeq, s_new, 3, t, v, style );
+ rb_iv_set(obj, "@kind", sym_seq);
+ break;
+
+ case syck_map_kind:
+ v = rb_hash_new();
+ for ( i = 0; i < syck_map_count( n ); i++ )
+ {
+ rb_hash_aset( v, syck_map_read( n, map_key, i ), syck_map_read( n, map_value, i ) );
+ }
+ if ( n->data.pairs->style == map_inline )
+ {
+ style = sym_inline;
+ }
+ obj = rb_funcall( cMap, s_new, 3, t, v, style );
+ rb_iv_set(obj, "@kind", sym_map);
+ break;
+ }
+
+ return obj;
+}
+
+/*
+ * YAML::Syck::BadAlias.initialize
+ */
+VALUE
+syck_badalias_initialize(VALUE self, VALUE val)
+{
+ rb_iv_set( self, "@name", val );
+ return self;
+}
+
+/*
+ * YAML::Syck::BadAlias.<=>
+ */
+VALUE
+syck_badalias_cmp(VALUE alias1, VALUE alias2)
+{
+ VALUE str1 = rb_ivar_get( alias1, s_name );
+ VALUE str2 = rb_ivar_get( alias2, s_name );
+ VALUE val = rb_funcall( str1, s_cmp, 1, str2 );
+ return val;
+}
+
+/*
+ * YAML::DomainType.initialize
+ */
+VALUE
+syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
+{
+ rb_iv_set( self, "@domain", domain );
+ rb_iv_set( self, "@type_id", type_id );
+ rb_iv_set( self, "@value", val );
+ return self;
+}
+
+/*
+ * YAML::Object.initialize
+ */
+VALUE
+syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
+{
+ rb_iv_set( self, "@class", klass );
+ rb_iv_set( self, "@ivars", ivars );
+ return self;
+}
+
+/*
+ * YAML::PrivateType.initialize
+ */
+VALUE
+syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
+{
+ rb_iv_set( self, "@type_id", type_id );
+ rb_iv_set( self, "@value", val );
+ return self;
+}
+
+/*
+ * Mark node contents.
+ */
+static void
+syck_node_mark(SyckNode *n)
+{
+ int i;
+ rb_gc_mark_maybe( n->id );
+ switch ( n->kind )
+ {
+ case syck_seq_kind:
+ for ( i = 0; i < n->data.list->idx; i++ )
+ {
+ rb_gc_mark( syck_seq_read( n, i ) );
+ }
+ break;
+
+ case syck_map_kind:
+ for ( i = 0; i < n->data.pairs->idx; i++ )
+ {
+ rb_gc_mark( syck_map_read( n, map_key, i ) );
+ 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 */
+#endif
+}
+
+/*
+ * YAML::Syck::Scalar.allocate
+ */
+VALUE
+syck_scalar_alloc(VALUE class)
+{
+ SyckNode *node = syck_alloc_str();
+ VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
+ node->id = obj;
+ return obj;
+}
+
+/*
+ * YAML::Syck::Scalar.initialize
+ */
+VALUE
+syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+{
+ rb_iv_set( self, "@kind", sym_scalar );
+ rb_funcall( self, s_type_id_set, 1, type_id );
+ rb_funcall( self, s_value_set, 1, val );
+ rb_funcall( self, s_style_set, 1, style );
+ return self;
+}
+
+/*
+ * YAML::Syck::Scalar.style=
+ */
+VALUE
+syck_scalar_style_set(VALUE self, VALUE style)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( NIL_P( style ) )
+ {
+ node->data.str->style = scalar_none;
+ }
+ else if ( style == sym_1quote )
+ {
+ node->data.str->style = scalar_1quote;
+ }
+ else if ( style == sym_2quote )
+ {
+ node->data.str->style = scalar_2quote;
+ }
+ else if ( style == sym_fold )
+ {
+ node->data.str->style = scalar_fold;
+ }
+ else if ( style == sym_literal )
+ {
+ node->data.str->style = scalar_literal;
+ }
+ else if ( style == sym_plain )
+ {
+ node->data.str->style = scalar_plain;
+ }
+
+ rb_iv_set( self, "@style", style );
+ return self;
+}
+
+/*
+ * YAML::Syck::Scalar.value=
+ */
+VALUE
+syck_scalar_value_set(VALUE self, VALUE 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->style = scalar_none;
+
+ rb_iv_set( self, "@value", val );
+ return val;
+}
+
+/*
+ * YAML::Syck::Seq.allocate
+ */
+VALUE
+syck_seq_alloc(VALUE class)
+{
+ SyckNode *node;
+ VALUE obj;
+ node = syck_alloc_seq();
+ obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
+ node->id = obj;
+ return obj;
+}
+
+/*
+ * YAML::Syck::Seq.initialize
+ */
+VALUE
+syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ rb_iv_set( self, "@kind", sym_seq );
+ rb_funcall( self, s_type_id_set, 1, type_id );
+ rb_funcall( self, s_value_set, 1, val );
+ rb_funcall( self, s_style_set, 1, style );
+ return self;
+}
+
+/*
+ * YAML::Syck::Seq.value=
+ */
+VALUE
+syck_seq_value_set(VALUE self, VALUE val)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ val = rb_check_array_type( val );
+ if ( !NIL_P( val ) ) {
+ int i;
+ syck_seq_empty( node );
+ for ( i = 0; i < RARRAY_LEN( val ); i++ )
+ {
+ syck_seq_add( node, rb_ary_entry(val, i) );
+ }
+ }
+
+ rb_iv_set( self, "@value", val );
+ return val;
+}
+
+/*
+ * YAML::Syck::Seq.add
+ */
+VALUE
+syck_seq_add_m(VALUE self, VALUE val)
+{
+ SyckNode *node;
+ VALUE emitter = rb_ivar_get( self, s_emitter );
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( rb_respond_to( emitter, s_node_export ) ) {
+ val = rb_funcall( emitter, s_node_export, 1, val );
+ }
+ syck_seq_add( node, val );
+ rb_ary_push( rb_ivar_get( self, s_value ), val );
+
+ return self;
+}
+
+/*
+ * YAML::Syck::Seq.style=
+ */
+VALUE
+syck_seq_style_set(VALUE self, VALUE style)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( style == sym_inline )
+ {
+ node->data.list->style = seq_inline;
+ }
+ else
+ {
+ node->data.list->style = seq_none;
+ }
+
+ rb_iv_set( self, "@style", style );
+ return self;
+}
+
+/*
+ * YAML::Syck::Map.allocate
+ */
+VALUE
+syck_map_alloc(VALUE class)
+{
+ SyckNode *node;
+ VALUE obj;
+ node = syck_alloc_map();
+ obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
+ node->id = obj;
+ return obj;
+}
+
+/*
+ * YAML::Syck::Map.initialize
+ */
+VALUE
+syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( !NIL_P( val ) )
+ {
+ VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
+ VALUE keys;
+ int i;
+ if ( NIL_P(hsh) )
+ {
+ rb_raise( rb_eTypeError, "wrong argument type" );
+ }
+
+ keys = rb_funcall( hsh, s_keys, 0 );
+ for ( i = 0; i < RARRAY_LEN(keys); i++ )
+ {
+ VALUE key = rb_ary_entry(keys, i);
+ syck_map_add( node, key, rb_hash_aref(hsh, key) );
+ }
+ }
+
+ rb_iv_set( self, "@kind", sym_seq );
+ rb_funcall( self, s_type_id_set, 1, type_id );
+ rb_funcall( self, s_value_set, 1, val );
+ rb_funcall( self, s_style_set, 1, style );
+ return self;
+}
+
+/*
+ * YAML::Syck::Map.value=
+ */
+VALUE
+syck_map_value_set(VALUE self, VALUE val)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( !NIL_P( val ) )
+ {
+ VALUE hsh = rb_check_convert_type(val, T_HASH, "Hash", "to_hash");
+ VALUE keys;
+ int i;
+ if ( NIL_P(hsh) )
+ {
+ rb_raise( rb_eTypeError, "wrong argument type" );
+ }
+
+ syck_map_empty( node );
+ keys = rb_funcall( hsh, s_keys, 0 );
+ for ( i = 0; i < RARRAY_LEN(keys); i++ )
+ {
+ VALUE key = rb_ary_entry(keys, i);
+ syck_map_add( node, key, rb_hash_aref(hsh, key) );
+ }
+ }
+
+ rb_iv_set( self, "@value", val );
+ return val;
+}
+
+/*
+ * YAML::Syck::Map.add
+ */
+VALUE
+syck_map_add_m(VALUE self, VALUE key, VALUE val)
+{
+ SyckNode *node;
+ VALUE emitter = rb_ivar_get( self, s_emitter );
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( rb_respond_to( emitter, s_node_export ) ) {
+ key = rb_funcall( emitter, s_node_export, 1, key );
+ val = rb_funcall( emitter, s_node_export, 1, val );
+ }
+ syck_map_add( node, key, val );
+ rb_hash_aset( rb_ivar_get( self, s_value ), key, val );
+
+ return self;
+}
+
+/*
+ * YAML::Syck::Map.style=
+ */
+VALUE
+syck_map_style_set(VALUE self, VALUE style)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ if ( style == sym_inline )
+ {
+ node->data.pairs->style = map_inline;
+ }
+ else
+ {
+ node->data.pairs->style = map_none;
+ }
+
+ rb_iv_set( self, "@style", style );
+ return self;
+}
+
+/*
+ * Cloning method for all node types
+ */
+VALUE
+syck_node_init_copy(VALUE copy, VALUE orig)
+{
+ SyckNode *copy_n;
+ SyckNode *orig_n;
+
+ if ( copy == orig )
+ return copy;
+
+ if ( TYPE( orig ) != T_DATA )
+ {
+ rb_raise( rb_eTypeError, "wrong argument type" );
+ }
+
+ Data_Get_Struct( orig, SyckNode, orig_n );
+ Data_Get_Struct( copy, SyckNode, copy_n );
+ MEMCPY( copy_n, orig_n, SyckNode, 1 );
+ return copy;
+}
+
+/*
+ * YAML::Syck::Node#type_id=
+ */
+VALUE
+syck_node_type_id_set(VALUE self, VALUE type_id)
+{
+ SyckNode *node;
+ Data_Get_Struct( self, SyckNode, node );
+
+ S_FREE( node->type_id );
+
+ if ( !NIL_P( type_id ) ) {
+ StringValue( type_id );
+ node->type_id = syck_strndup( RSTRING_PTR(type_id), RSTRING_LEN(type_id) );
+ }
+
+ rb_iv_set( self, "@type_id", type_id );
+ return type_id;
+}
+
+/*
+ * YAML::Syck::Node.transform
+ */
+VALUE
+syck_node_transform(VALUE self)
+{
+ VALUE t;
+ SyckNode *n = NULL;
+ SyckNode *orig_n;
+ Data_Get_Struct(self, SyckNode, orig_n);
+ t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
+
+ switch (orig_n->kind)
+ {
+ case syck_map_kind:
+ {
+ int i;
+ DATA_PTR(t) = n = syck_alloc_map();
+ for ( i = 0; i < orig_n->data.pairs->idx; i++ )
+ {
+ syck_map_add( n, rb_funcall( syck_map_read( orig_n, map_key, i ), s_transform, 0 ),
+ rb_funcall( syck_map_read( orig_n, map_value, i ), s_transform, 0 ) );
+ }
+ }
+ break;
+
+ case syck_seq_kind:
+ {
+ int i;
+ DATA_PTR(t) = n = syck_alloc_seq();
+ for ( i = 0; i < orig_n->data.list->idx; i++ )
+ {
+ syck_seq_add( n, rb_funcall( syck_seq_read( orig_n, i ), s_transform, 0 ) );
+ }
+ }
+ break;
+
+ case syck_str_kind:
+ DATA_PTR(t) = n = syck_new_str2( orig_n->data.str->ptr, orig_n->data.str->len, orig_n->data.str->style );
+ break;
+ }
+
+ if ( orig_n->type_id != NULL )
+ {
+ n->type_id = syck_strndup( orig_n->type_id, strlen( orig_n->type_id ) );
+ }
+ if ( orig_n->anchor != NULL )
+ {
+ n->anchor = syck_strndup( orig_n->anchor, strlen( orig_n->anchor ) );
+ }
+ n->id = t;
+ return rb_funcall( oDefaultResolver, s_node_import, 1, t );
+}
+
+/*
+ * Emitter callback: assembles YAML document events from
+ * Ruby symbols. This is a brilliant way to do it.
+ * No one could possibly object.
+ */
+void
+rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
+{
+ SyckNode *n;
+ Data_Get_Struct((VALUE)data, SyckNode, n);
+
+ switch (n->kind)
+ {
+ case syck_map_kind:
+ {
+ int i;
+ syck_emit_map( e, n->type_id, n->data.pairs->style );
+ for ( i = 0; i < n->data.pairs->idx; i++ )
+ {
+ syck_emit_item( e, syck_map_read( n, map_key, i ) );
+ syck_emit_item( e, syck_map_read( n, map_value, i ) );
+ }
+ syck_emit_end( e );
+ }
+ break;
+
+ case syck_seq_kind:
+ {
+ int i;
+ syck_emit_seq( e, n->type_id, n->data.list->style );
+ for ( i = 0; i < n->data.list->idx; i++ )
+ {
+ syck_emit_item( e, syck_seq_read( n, i ) );
+ }
+ syck_emit_end( e );
+ }
+ break;
+
+ case syck_str_kind:
+ {
+ syck_emit_scalar( e, n->type_id, n->data.str->style, 0, 0, 0, n->data.str->ptr, n->data.str->len );
+ }
+ break;
+ }
+}
+
+/*
+ * Handle output from the emitter
+ */
+void
+rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
+{
+ struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
+ VALUE dest = bonus->port;
+ if (TYPE(dest) == T_STRING) {
+ rb_str_cat( dest, str, len );
+ } else {
+ rb_io_write( dest, rb_str_new( str, len ) );
+ }
+}
+
+/*
+ * Helper function for marking nodes in the anchor
+ * symbol table.
+ */
+void
+syck_out_mark(VALUE emitter, VALUE node)
+{
+ SyckEmitter *emitterPtr;
+ struct emitter_xtra *bonus;
+ Data_Get_Struct(emitter, SyckEmitter, emitterPtr);
+ bonus = (struct emitter_xtra *)emitterPtr->bonus;
+ rb_ivar_set( node, s_emitter, emitter );
+ /* syck_emitter_mark_node( emitterPtr, (st_data_t)node ); */
+ if ( !NIL_P( bonus->oid ) ) {
+ rb_hash_aset( bonus->data, bonus->oid, node );
+ }
+}
+
+/*
+ * Mark emitter values.
+ */
+static void
+syck_mark_emitter(SyckEmitter *emitter)
+{
+ struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
+ rb_gc_mark( bonus->oid );
+ rb_gc_mark( bonus->data );
+ rb_gc_mark( bonus->port );
+}
+
+/*
+ * Free the emitter and any bonus attachment.
+ */
+void
+rb_syck_free_emitter(SyckEmitter *e)
+{
+ S_FREE( e->bonus );
+ syck_free_emitter(e);
+}
+
+/*
+ * YAML::Syck::Emitter.allocate
+ */
+VALUE syck_emitter_s_alloc _((VALUE));
+VALUE
+syck_emitter_s_alloc(VALUE class)
+{
+ VALUE pobj;
+ SyckEmitter *emitter = syck_new_emitter();
+
+ emitter->bonus = S_ALLOC( struct emitter_xtra );
+ S_MEMZERO( emitter->bonus, struct emitter_xtra, 1 );
+
+ pobj = Data_Wrap_Struct( class, syck_mark_emitter, rb_syck_free_emitter, emitter );
+ syck_emitter_handler( emitter, rb_syck_emitter_handler );
+ syck_output_handler( emitter, rb_syck_output_handler );
+
+ rb_ivar_set( pobj, s_out, rb_funcall( cOut, s_new, 1, pobj ) );
+ 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)
+{
+ VALUE options, tmp;
+ SyckEmitter *emitter;
+ struct emitter_xtra *bonus;
+
+ Data_Get_Struct(self, SyckEmitter, emitter);
+ bonus = (struct emitter_xtra *)emitter->bonus;
+
+ bonus->oid = Qnil;
+ bonus->port = rb_str_new2( "" );
+ bonus->data = id_hash_new();
+
+ if (rb_scan_args(argc, argv, "01", &options) == 0)
+ {
+ options = rb_hash_new();
+ rb_ivar_set(self, s_options, options);
+ }
+ else if ( !NIL_P(tmp = rb_check_string_type(options)) )
+ {
+ bonus->port = tmp;
+ }
+ else if ( rb_respond_to( options, s_write ) )
+ {
+ bonus->port = options;
+ }
+ else
+ {
+ Check_Type(options, T_HASH);
+ rb_ivar_set(self, s_options, options);
+ }
+
+ emitter->headless = 0;
+ rb_ivar_set(self, s_level, INT2FIX(0));
+ rb_ivar_set(self, s_resolver, Qnil);
+ return self;
+}
+
+/*
+ * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
+ */
+VALUE
+syck_emitter_emit(int argc, VALUE *argv, VALUE self)
+{
+ VALUE oid, proc;
+ SyckEmitter *emitter;
+ struct emitter_xtra *bonus;
+ SYMID symple;
+ int level = FIX2INT(rb_ivar_get(self, s_level)) + 1;
+ rb_ivar_set(self, s_level, INT2FIX(level));
+
+ rb_scan_args(argc, argv, "1&", &oid, &proc);
+ Data_Get_Struct(self, SyckEmitter, emitter);
+ bonus = (struct emitter_xtra *)emitter->bonus;
+
+ /* Calculate anchors, normalize nodes, build a simpler symbol table */
+ bonus->oid = oid;
+ if ( !NIL_P( oid ) && RTEST( rb_funcall( bonus->data, s_haskey, 1, oid ) ) ) {
+ symple = rb_hash_aref( bonus->data, oid );
+ } else {
+ symple = rb_funcall( proc, s_call, 1, rb_ivar_get( self, s_out ) );
+ }
+ syck_emitter_mark_node( emitter, (st_data_t)symple );
+
+ /* Second pass, build emitted string */
+ level -= 1;
+ rb_ivar_set(self, s_level, INT2FIX(level));
+ if ( level == 0 )
+ {
+ syck_emit(emitter, (st_data_t)symple);
+ syck_emitter_flush(emitter, 0);
+
+ return bonus->port;
+ }
+
+ return symple;
+}
+
+/*
+ * YAML::Syck::Emitter#node_export
+ */
+VALUE
+syck_emitter_node_export(VALUE self, VALUE node)
+{
+ return rb_funcall( node, s_to_yaml, 1, self );
+}
+
+/*
+ * YAML::Syck::Emitter#set_resolver
+ */
+VALUE
+syck_emitter_set_resolver(VALUE self, VALUE resolver)
+{
+ rb_ivar_set( self, s_resolver, resolver );
+ return self;
+}
+
+/*
+ * YAML::Syck::Out::initialize
+ */
+VALUE
+syck_out_initialize(VALUE self, VALUE emitter)
+{
+ rb_ivar_set( self, s_emitter, emitter );
+ return self;
+}
+
+/*
+ * YAML::Syck::Out::map
+ */
+VALUE
+syck_out_map(int argc, VALUE *argv, VALUE self)
+{
+ VALUE type_id, style, map;
+ if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
+ style = Qnil;
+ }
+ map = rb_funcall( cMap, s_new, 3, type_id, rb_hash_new(), style );
+ syck_out_mark( rb_ivar_get( self, s_emitter ), map );
+ rb_yield( map );
+ return map;
+}
+
+/*
+ * YAML::Syck::Out::seq
+ */
+VALUE
+syck_out_seq(int argc, VALUE *argv, VALUE self)
+{
+ VALUE type_id, style, seq;
+ if (rb_scan_args(argc, argv, "11", &type_id, &style) == 1) {
+ style = Qnil;
+ }
+ seq = rb_funcall( cSeq, s_new, 3, type_id, rb_ary_new(), style );
+ syck_out_mark( rb_ivar_get( self, s_emitter ), seq );
+ rb_yield( seq );
+ return seq;
+}
+
+/*
+ * YAML::Syck::Out::scalar
+syck_out_scalar( self, type_id, str, style )
+ VALUE self, type_id, str, style;
+ */
+VALUE
+syck_out_scalar(int argc, VALUE *argv, VALUE self)
+{
+ VALUE type_id, str, style, scalar;
+ rb_scan_args(argc, argv, "21", &type_id, &str, &style);
+ scalar = rb_funcall( cScalar, s_new, 3, type_id, str, style );
+ syck_out_mark( rb_ivar_get( self, s_emitter ), scalar );
+ return scalar;
+}
+
+/*
+ * Initialize Syck extension
+ */
+void
+Init_syck()
+{
+ VALUE rb_syck = rb_define_module_under( rb_cObject, "Syck" );
+ rb_define_module_function( rb_syck, "compile", rb_syck_compile, 1 );
+
+ /*
+ * Global symbols
+ */
+ s_new = rb_intern("new");
+ s_utc = rb_intern("utc");
+ s_at = rb_intern("at");
+ s_to_f = rb_intern("to_f");
+ s_to_i = rb_intern("to_i");
+ s_read = rb_intern("read");
+ s_binmode = rb_intern("binmode");
+ s_transfer = rb_intern("transfer");
+ s_call = rb_intern("call");
+ s_cmp = rb_intern("<=>");
+ s_intern = rb_intern("intern");
+ s_update = rb_intern("update");
+ s_detect_implicit = rb_intern("detect_implicit");
+ s_dup = rb_intern("dup");
+ s_default_set = rb_intern("default=");
+ s_match = rb_intern("match");
+ s_push = rb_intern("push");
+ s_haskey = rb_intern("has_key?");
+ s_keys = rb_intern("keys");
+ s_node_import = rb_intern("node_import");
+ s_tr_bang = rb_intern("tr!");
+ s_unpack = rb_intern("unpack");
+ s_write = rb_intern("write");
+ s_tag_read_class = rb_intern( "yaml_tag_read_class" );
+ s_tag_subclasses = rb_intern( "yaml_tag_subclasses?" );
+ s_emitter = rb_intern( "emitter" );
+ s_set_resolver = rb_intern( "set_resolver" );
+ s_node_export = rb_intern( "node_export" );
+ s_to_yaml = rb_intern( "to_yaml" );
+ 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");
+ s_options = rb_intern("@options");
+ s_kind = rb_intern("@kind");
+ s_type_id = rb_intern("@type_id");
+ s_type_id_set = rb_intern("type_id=");
+ s_resolver = rb_intern("@resolver");
+ s_level = rb_intern( "@level" );
+ s_style = rb_intern("@style");
+ s_style_set = rb_intern("style=");
+ s_value = rb_intern("@value");
+ s_value_set = rb_intern("value=");
+ s_out = rb_intern("@out");
+ s_input = rb_intern("@input");
+
+ sym_model = ID2SYM(rb_intern("Model"));
+ sym_generic = ID2SYM(rb_intern("Generic"));
+ sym_bytecode = ID2SYM(rb_intern("bytecode"));
+ sym_map = ID2SYM(rb_intern("map"));
+ sym_scalar = ID2SYM(rb_intern("scalar"));
+ sym_seq = ID2SYM(rb_intern("seq"));
+ sym_1quote = ID2SYM(rb_intern("quote1"));
+ sym_2quote = ID2SYM(rb_intern("quote2"));
+ sym_fold = ID2SYM(rb_intern("fold"));
+ sym_literal = ID2SYM(rb_intern("literal"));
+ sym_plain = ID2SYM(rb_intern("plain"));
+ sym_inline = ID2SYM(rb_intern("inline"));
+
+ /*
+ * Define YAML::Syck::Resolver class
+ */
+ cResolver = rb_define_class_under( rb_syck, "Resolver", rb_cObject );
+ rb_define_attr( cResolver, "tags", 1, 1 );
+ rb_define_method( cResolver, "initialize", syck_resolver_initialize, 0 );
+ rb_define_method( cResolver, "add_type", syck_resolver_add_type, 2 );
+ rb_define_method( cResolver, "use_types_at", syck_resolver_use_types_at, 1 );
+ rb_define_method( cResolver, "detect_implicit", syck_resolver_detect_implicit, 1 );
+ rb_define_method( cResolver, "transfer", syck_resolver_transfer, 2 );
+ rb_define_method( cResolver, "node_import", syck_resolver_node_import, 1 );
+ rb_define_method( cResolver, "tagurize", syck_resolver_tagurize, 1 );
+
+ rb_global_variable( &oDefaultResolver );
+ oDefaultResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
+ rb_define_singleton_method( oDefaultResolver, "node_import", syck_defaultresolver_node_import, 1 );
+ rb_define_singleton_method( oDefaultResolver, "detect_implicit", syck_defaultresolver_detect_implicit, 1 );
+ rb_define_const( rb_syck, "DefaultResolver", oDefaultResolver );
+ rb_global_variable( &oGenericResolver );
+ oGenericResolver = rb_funcall( cResolver, rb_intern( "new" ), 0 );
+ rb_define_singleton_method( oGenericResolver, "node_import", syck_genericresolver_node_import, 1 );
+ rb_define_const( rb_syck, "GenericResolver", oGenericResolver );
+
+ /*
+ * Define YAML::Syck::Parser class
+ */
+ cParser = rb_define_class_under( rb_syck, "Parser", rb_cObject );
+ rb_define_attr( cParser, "options", 1, 1 );
+ rb_define_attr( cParser, "resolver", 1, 1 );
+ rb_define_attr( cParser, "input", 1, 1 );
+ rb_define_alloc_func( cParser, syck_parser_s_alloc );
+ rb_define_method(cParser, "initialize", syck_parser_initialize, -1 );
+ rb_define_method(cParser, "bufsize=", syck_parser_bufsize_set, 1 );
+ rb_define_method(cParser, "bufsize", syck_parser_bufsize_get, 0 );
+ rb_define_method(cParser, "load", syck_parser_load, -1);
+ rb_define_method(cParser, "load_documents", syck_parser_load_documents, -1);
+ rb_define_method(cParser, "set_resolver", syck_parser_set_resolver, 1);
+
+ /*
+ * Define YAML::Syck::Node class
+ */
+ cNode = rb_define_class_under( rb_syck, "Node", rb_cObject );
+ rb_define_method( cNode, "initialize_copy", syck_node_init_copy, 1 );
+ rb_define_attr( cNode, "emitter", 1, 1 );
+ rb_define_attr( cNode, "resolver", 1, 1 );
+ rb_define_attr( cNode, "kind", 1, 0 );
+ rb_define_attr( cNode, "type_id", 1, 0 );
+ rb_define_attr( cNode, "value", 1, 0 );
+ rb_define_method( cNode, "type_id=", syck_node_type_id_set, 1 );
+ rb_define_method( cNode, "transform", syck_node_transform, 0);
+
+ /*
+ * Define YAML::Syck::Scalar, YAML::Syck::Seq, YAML::Syck::Map --
+ * all are the publicly usable variants of YAML::Syck::Node
+ */
+ cScalar = rb_define_class_under( rb_syck, "Scalar", cNode );
+ rb_define_alloc_func( cScalar, syck_scalar_alloc );
+ rb_define_method( cScalar, "initialize", syck_scalar_initialize, 3 );
+ rb_define_method( cScalar, "value=", syck_scalar_value_set, 1 );
+ rb_define_method( cScalar, "style=", syck_scalar_style_set, 1 );
+ cSeq = rb_define_class_under( rb_syck, "Seq", cNode );
+ rb_define_alloc_func( cSeq, syck_seq_alloc );
+ rb_define_method( cSeq, "initialize", syck_seq_initialize, 3 );
+ rb_define_method( cSeq, "value=", syck_seq_value_set, 1 );
+ rb_define_method( cSeq, "add", syck_seq_add_m, 1 );
+ rb_define_method( cSeq, "style=", syck_seq_style_set, 1 );
+ cMap = rb_define_class_under( rb_syck, "Map", cNode );
+ rb_define_alloc_func( cMap, syck_map_alloc );
+ rb_define_method( cMap, "initialize", syck_map_initialize, 3 );
+ rb_define_method( cMap, "value=", syck_map_value_set, 1 );
+ rb_define_method( cMap, "add", syck_map_add_m, 2 );
+ rb_define_method( cMap, "style=", syck_map_style_set, 1 );
+
+ /*
+ * Define YAML::PrivateType class
+ */
+ cPrivateType = rb_define_class_under( rb_syck, "PrivateType", rb_cObject );
+ rb_define_attr( cPrivateType, "type_id", 1, 1 );
+ rb_define_attr( cPrivateType, "value", 1, 1 );
+ rb_define_method( cPrivateType, "initialize", syck_privatetype_initialize, 2);
+
+ /*
+ * Define YAML::DomainType class
+ */
+ cDomainType = rb_define_class_under( rb_syck, "DomainType", rb_cObject );
+ rb_define_attr( cDomainType, "domain", 1, 1 );
+ rb_define_attr( cDomainType, "type_id", 1, 1 );
+ rb_define_attr( cDomainType, "value", 1, 1 );
+ rb_define_method( cDomainType, "initialize", syck_domaintype_initialize, 3);
+
+ /*
+ * Define YAML::Object class
+ */
+ cYObject = rb_define_class_under( rb_syck, "Object", rb_cObject );
+ rb_define_attr( cYObject, "class", 1, 1 );
+ rb_define_attr( cYObject, "ivars", 1, 1 );
+ rb_define_method( cYObject, "initialize", syck_yobject_initialize, 2);
+ rb_define_method( cYObject, "yaml_initialize", syck_yobject_initialize, 2);
+
+ /*
+ * Define YAML::Syck::BadAlias class
+ */
+ cBadAlias = rb_define_class_under( rb_syck, "BadAlias", rb_cObject );
+ rb_define_attr( cBadAlias, "name", 1, 1 );
+ rb_define_method( cBadAlias, "initialize", syck_badalias_initialize, 1);
+ rb_define_method( cBadAlias, "<=>", syck_badalias_cmp, 1);
+ rb_include_module( cBadAlias, rb_const_get( rb_cObject, rb_intern("Comparable") ) );
+
+ /*
+ * Define YAML::Syck::MergeKey class
+ */
+ cMergeKey = rb_define_class_under( rb_syck, "MergeKey", rb_cObject );
+
+ /*
+ * Define YAML::Syck::DefaultKey class
+ */
+ cDefaultKey = rb_define_class_under( rb_syck, "DefaultKey", rb_cObject );
+
+ /*
+ * Define YAML::Syck::Out classes
+ */
+ cOut = rb_define_class_under( rb_syck, "Out", rb_cObject );
+ rb_define_attr( cOut, "emitter", 1, 1 );
+ rb_define_method( cOut, "initialize", syck_out_initialize, 1 );
+ rb_define_method( cOut, "map", syck_out_map, -1 );
+ rb_define_method( cOut, "seq", syck_out_seq, -1 );
+ rb_define_method( cOut, "scalar", syck_out_scalar, -1 );
+
+ /*
+ * Define YAML::Syck::Emitter class
+ */
+ cEmitter = rb_define_class_under( rb_syck, "Emitter", rb_cObject );
+ rb_define_attr( cEmitter, "level", 1, 1 );
+ rb_define_alloc_func( cEmitter, syck_emitter_s_alloc );
+ rb_define_method( cEmitter, "initialize", syck_emitter_reset, -1 );
+ rb_define_method( cEmitter, "reset", syck_emitter_reset, -1 );
+ rb_define_method( cEmitter, "emit", syck_emitter_emit, -1 );
+ rb_define_method( cEmitter, "set_resolver", syck_emitter_set_resolver, 1);
+ rb_define_method( cEmitter, "node_export", syck_emitter_node_export, 1);
+}
+
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
new file mode 100644
index 0000000000..6ae48a75be
--- /dev/null
+++ b/ext/syck/syck.c
@@ -0,0 +1,524 @@
+/*
+ * syck.c
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+#include "ruby/ruby.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "syck.h"
+
+void syck_parser_pop_level( SyckParser * );
+
+/*
+ * Custom assert
+ */
+void
+syck_assert( const char *file_name, unsigned line_num, const char *expr )
+{
+ fflush( NULL );
+ fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
+ file_name, line_num, expr );
+ fflush( stderr );
+ abort();
+}
+
+/*
+ * Allocates and copies a string
+ */
+char *
+syck_strndup( const char *buf, long len )
+{
+ char *new = S_ALLOC_N( char, len + 1 );
+ S_MEMZERO( new, char, len + 1 );
+ S_MEMCPY( new, buf, char, len );
+ return new;
+}
+
+/*
+ * Default FILE IO function
+ */
+long
+syck_io_file_read( char *buf, SyckIoFile *file, long max_size, long skip )
+{
+ long len = 0;
+
+ ASSERT( file != NULL );
+
+ max_size -= skip;
+ len = fread( buf + skip, sizeof( char ), max_size, file->ptr );
+ len += skip;
+ buf[len] = '\0';
+
+ return len;
+}
+
+/*
+ * Default string IO function
+ */
+long
+syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
+{
+ char *beg;
+ long len = 0;
+
+ ASSERT( str != NULL );
+ beg = str->ptr;
+ if ( max_size >= 0 )
+ {
+ max_size -= skip;
+ if ( max_size <= 0 ) max_size = 0;
+ else str->ptr += max_size;
+
+ if ( str->ptr > str->end )
+ {
+ str->ptr = str->end;
+ }
+ }
+ else
+ {
+ /* Use exact string length */
+ while ( str->ptr < str->end ) {
+ if (*(str->ptr++) == '\n') break;
+ }
+ }
+ if ( beg < str->ptr )
+ {
+ len = ( str->ptr - beg );
+ S_MEMCPY( buf + skip, beg, char, len );
+ }
+ len += skip;
+ buf[len] = '\0';
+
+ return len;
+}
+
+void
+syck_parser_reset_levels( SyckParser *p )
+{
+ while ( p->lvl_idx > 1 )
+ {
+ syck_parser_pop_level( p );
+ }
+
+ if ( p->lvl_idx < 1 )
+ {
+ p->lvl_idx = 1;
+ p->levels[0].spaces = -1;
+ p->levels[0].ncount = 0;
+ p->levels[0].domain = syck_strndup( "", 0 );
+ }
+ p->levels[0].status = syck_lvl_header;
+}
+
+void
+syck_parser_reset_cursor( SyckParser *p )
+{
+ if ( p->buffer == NULL )
+ {
+ p->buffer = S_ALLOC_N( char, p->bufsize );
+ S_MEMZERO( p->buffer, char, p->bufsize );
+ }
+ p->buffer[0] = '\0';
+
+ p->cursor = NULL;
+ p->lineptr = NULL;
+ p->linectptr = NULL;
+ p->token = NULL;
+ p->toktmp = NULL;
+ p->marker = NULL;
+ p->limit = NULL;
+
+ p->root = 0;
+ p->root_on_error = 0;
+ p->linect = 0;
+ p->eof = 0;
+ p->last_token = 0;
+ p->force_token = 0;
+}
+
+/*
+ * Value to return on a parse error
+ */
+void
+syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
+{
+ p->root_on_error = roer;
+}
+
+/*
+ * Allocate the parser
+ */
+SyckParser *
+syck_new_parser(void)
+{
+ SyckParser *p;
+ p = S_ALLOC( SyckParser );
+ S_MEMZERO( p, SyckParser, 1 );
+ p->lvl_capa = ALLOC_CT;
+ p->levels = S_ALLOC_N( SyckLevel, p->lvl_capa );
+ p->input_type = syck_yaml_utf8;
+ p->io_type = syck_io_str;
+ p->io.str = NULL;
+ p->syms = NULL;
+ p->anchors = NULL;
+ p->bad_anchors = NULL;
+ p->implicit_typing = 1;
+ p->taguri_expansion = 0;
+ p->bufsize = SYCK_BUFFERSIZE;
+ p->buffer = NULL;
+ p->lvl_idx = 0;
+ syck_parser_reset_levels( p );
+ return p;
+}
+
+int
+syck_add_sym( SyckParser *p, void *data )
+{
+ SYMID id = 0;
+ if ( p->syms == NULL )
+ {
+ p->syms = st_init_numtable();
+ }
+ id = p->syms->num_entries + 1;
+ st_insert( p->syms, id, (st_data_t)data );
+ return id;
+}
+
+int
+syck_lookup_sym( SyckParser *p, SYMID id, void **datap )
+{
+ 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;
+}
+
+int
+syck_st_free_nodes( char *key, SyckNode *n, char *arg )
+{
+ if ( n != (void *)1 ) syck_free_node( n );
+ n = NULL;
+ return ST_CONTINUE;
+}
+
+void
+syck_st_free( SyckParser *p )
+{
+ /*
+ * Free the anchor tables
+ */
+ if ( p->anchors != NULL )
+ {
+ st_foreach( p->anchors, syck_st_free_nodes, 0 );
+ st_free_table( p->anchors );
+ p->anchors = NULL;
+ }
+
+ if ( p->bad_anchors != NULL )
+ {
+ st_foreach( p->bad_anchors, syck_st_free_nodes, 0 );
+ st_free_table( p->bad_anchors );
+ p->bad_anchors = NULL;
+ }
+}
+
+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 )
+{
+ /*
+ * Free the adhoc symbol table
+ */
+ if ( p->syms != NULL )
+ {
+ st_foreach( p->syms, syck_st_free_syms, 0 );
+ st_free_table( p->syms );
+ p->syms = NULL;
+ }
+
+ /*
+ * Free tables, levels
+ */
+ syck_st_free( p );
+ syck_parser_reset_levels( p );
+ S_FREE( p->levels[0].domain );
+ S_FREE( p->levels );
+
+ if ( p->buffer != NULL )
+ {
+ S_FREE( p->buffer );
+ }
+ free_any_io( p );
+ S_FREE( p );
+}
+
+void
+syck_parser_handler( SyckParser *p, SyckNodeHandler hdlr )
+{
+ ASSERT( p != NULL );
+ p->handler = hdlr;
+}
+
+void
+syck_parser_implicit_typing( SyckParser *p, int flag )
+{
+ p->implicit_typing = ( flag == 0 ? 0 : 1 );
+}
+
+void
+syck_parser_taguri_expansion( SyckParser *p, int flag )
+{
+ p->taguri_expansion = ( flag == 0 ? 0 : 1 );
+}
+
+void
+syck_parser_error_handler( SyckParser *p, SyckErrorHandler hdlr )
+{
+ ASSERT( p != NULL );
+ p->error_handler = hdlr;
+}
+
+void
+syck_parser_bad_anchor_handler( SyckParser *p, SyckBadAnchorHandler hdlr )
+{
+ ASSERT( p != NULL );
+ p->bad_anchor_handler = hdlr;
+}
+
+void
+syck_parser_set_input_type( SyckParser *p, enum syck_parser_input input_type )
+{
+ ASSERT( p != NULL );
+ p->input_type = input_type;
+}
+
+void
+syck_parser_file( SyckParser *p, FILE *fp, SyckIoFileRead read )
+{
+ ASSERT( p != NULL );
+ free_any_io( p );
+ syck_parser_reset_cursor( p );
+ p->io_type = syck_io_file;
+ p->io.file = S_ALLOC( SyckIoFile );
+ p->io.file->ptr = fp;
+ if ( read != NULL )
+ {
+ p->io.file->read = read;
+ }
+ else
+ {
+ p->io.file->read = syck_io_file_read;
+ }
+}
+
+void
+syck_parser_str( SyckParser *p, char *ptr, long len, SyckIoStrRead read )
+{
+ ASSERT( p != NULL );
+ free_any_io( p );
+ syck_parser_reset_cursor( p );
+ p->io_type = syck_io_str;
+ p->io.str = S_ALLOC( SyckIoStr );
+ p->io.str->beg = ptr;
+ p->io.str->ptr = ptr;
+ p->io.str->end = ptr + len;
+ if ( read != NULL )
+ {
+ p->io.str->read = read;
+ }
+ else
+ {
+ p->io.str->read = syck_io_str_read;
+ }
+}
+
+void
+syck_parser_str_auto( SyckParser *p, char *ptr, SyckIoStrRead read )
+{
+ syck_parser_str( p, ptr, strlen( ptr ), read );
+}
+
+SyckLevel *
+syck_parser_current_level( SyckParser *p )
+{
+ return &p->levels[p->lvl_idx-1];
+}
+
+void
+syck_parser_pop_level( SyckParser *p )
+{
+ ASSERT( p != NULL );
+
+ /* The root level should never be popped */
+ if ( p->lvl_idx <= 1 ) return;
+
+ p->lvl_idx -= 1;
+ free( p->levels[p->lvl_idx].domain );
+}
+
+void
+syck_parser_add_level( SyckParser *p, int len, enum syck_level_status status )
+{
+ ASSERT( p != NULL );
+ if ( p->lvl_idx + 1 > p->lvl_capa )
+ {
+ p->lvl_capa += ALLOC_CT;
+ S_REALLOC_N( p->levels, SyckLevel, p->lvl_capa );
+ }
+
+ ASSERT( len > p->levels[p->lvl_idx-1].spaces );
+ p->levels[p->lvl_idx].spaces = len;
+ p->levels[p->lvl_idx].ncount = 0;
+ p->levels[p->lvl_idx].domain = syck_strndup( p->levels[p->lvl_idx-1].domain, strlen( p->levels[p->lvl_idx-1].domain ) );
+ p->levels[p->lvl_idx].status = status;
+ p->lvl_idx += 1;
+}
+
+void
+free_any_io( SyckParser *p )
+{
+ ASSERT( p != NULL );
+ switch ( p->io_type )
+ {
+ case syck_io_str:
+ if ( p->io.str != NULL )
+ {
+ S_FREE( p->io.str );
+ p->io.str = NULL;
+ }
+ break;
+
+ case syck_io_file:
+ if ( p->io.file != NULL )
+ {
+ S_FREE( p->io.file );
+ p->io.file = NULL;
+ }
+ break;
+ }
+}
+
+long
+syck_move_tokens( SyckParser *p )
+{
+ long count, skip;
+ ASSERT( p->buffer != NULL );
+
+ if ( p->token == NULL )
+ return 0;
+
+ skip = p->limit - p->token;
+ if ( ( count = p->token - p->buffer ) )
+ {
+ if (skip > 0)
+ S_MEMMOVE( p->buffer, p->token, char, skip );
+ p->token = p->buffer;
+ p->marker -= count;
+ p->cursor -= count;
+ p->toktmp -= count;
+ p->limit -= count;
+ p->lineptr -= count;
+ p->linectptr -= count;
+ }
+ return skip;
+}
+
+void
+syck_check_limit( SyckParser *p, long len )
+{
+ if ( p->cursor == NULL )
+ {
+ p->cursor = p->buffer;
+ p->lineptr = p->buffer;
+ p->linectptr = p->buffer;
+ p->marker = p->buffer;
+ }
+ p->limit = p->buffer + len;
+}
+
+long
+syck_parser_read( SyckParser *p )
+{
+ long len = 0;
+ long skip = 0;
+ ASSERT( p != NULL );
+ switch ( p->io_type )
+ {
+ case syck_io_str:
+ skip = syck_move_tokens( p );
+ len = (p->io.str->read)( p->buffer, p->io.str, SYCK_BUFFERSIZE - 1, skip );
+ break;
+
+ case syck_io_file:
+ skip = syck_move_tokens( p );
+ len = (p->io.file->read)( p->buffer, p->io.file, SYCK_BUFFERSIZE - 1, skip );
+ break;
+ }
+ syck_check_limit( p, len );
+ return len;
+}
+
+long
+syck_parser_readlen( SyckParser *p, long max_size )
+{
+ long len = 0;
+ long skip = 0;
+ ASSERT( p != NULL );
+ switch ( p->io_type )
+ {
+ case syck_io_str:
+ skip = syck_move_tokens( p );
+ len = (p->io.str->read)( p->buffer, p->io.str, max_size, skip );
+ break;
+
+ case syck_io_file:
+ skip = syck_move_tokens( p );
+ len = (p->io.file->read)( p->buffer, p->io.file, max_size, skip );
+ break;
+ }
+ syck_check_limit( p, len );
+ return len;
+}
+
+SYMID
+syck_parse( SyckParser *p )
+{
+ ASSERT( p != NULL );
+
+ syck_st_free( p );
+ syck_parser_reset_levels( p );
+ syckparse( p );
+ return p->root;
+}
+
+void
+syck_default_error_handler( SyckParser *p, const char *msg )
+{
+ printf( "Error at [Line %d, Col %"PRIdPTRDIFF"]: %s\n",
+ p->linect,
+ p->cursor - p->lineptr,
+ msg );
+}
+
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
new file mode 100644
index 0000000000..2cf81a8b9a
--- /dev/null
+++ b/ext/syck/syck.h
@@ -0,0 +1,453 @@
+/*
+ * syck.h
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+
+#ifndef SYCK_H
+#define SYCK_H
+
+#define SYCK_YAML_MAJOR 1
+#define SYCK_YAML_MINOR 0
+
+#define YAML_DOMAIN "yaml.org,2002"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "ruby/st.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*
+ * Memory Allocation
+ */
+#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
+#include <alloca.h>
+#endif
+
+#if DEBUG
+void syck_assert( const char *, unsigned, const char * );
+# define ASSERT(f) \
+ (( f ) ? (void)0 : syck_assert( __FILE__, __LINE__, #f ))
+#else
+# define ASSERT(f) ((void)0)
+#endif
+
+#ifndef NULL
+# define NULL (void *)0
+#endif
+
+#define ALLOC_CT 8
+#define SYCK_BUFFERSIZE 4096
+#define S_ALLOC_N(type,n) (type*)malloc(sizeof(type)*(n))
+#define S_ALLOC(type) (type*)malloc(sizeof(type))
+#define S_REALLOC_N(var,type,n) (var)=(type*)realloc((char*)(var),sizeof(type)*(n))
+#define S_FREE(n) if (n) { free(n); n = NULL; }
+
+#define S_ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
+
+#define S_MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
+#define S_MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
+#define S_MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
+#define S_MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
+
+#define BLOCK_FOLD 10
+#define BLOCK_LIT 20
+#define BLOCK_PLAIN 30
+#define NL_CHOMP 40
+#define NL_KEEP 50
+
+/*
+ * Node definitions
+ */
+#ifndef ST_DATA_T_DEFINED
+typedef long st_data_t;
+#endif
+
+#define SYMID unsigned long
+
+typedef struct _syck_node SyckNode;
+
+enum syck_kind_tag {
+ syck_map_kind,
+ syck_seq_kind,
+ syck_str_kind
+};
+
+enum map_part {
+ map_key,
+ map_value
+};
+
+enum map_style {
+ map_none,
+ map_inline
+};
+
+enum seq_style {
+ seq_none,
+ seq_inline
+};
+
+enum scalar_style {
+ scalar_none,
+ scalar_1quote,
+ scalar_2quote,
+ scalar_fold,
+ scalar_literal,
+ scalar_plain
+};
+
+/*
+ * Node metadata struct
+ */
+struct _syck_node {
+ /* Symbol table ID */
+ SYMID id;
+ /* Underlying kind */
+ enum syck_kind_tag kind;
+ /* Fully qualified tag-uri for type */
+ char *type_id;
+ /* Anchor name */
+ char *anchor;
+ union {
+ /* Storage for map data */
+ struct SyckMap {
+ enum map_style style;
+ SYMID *keys;
+ SYMID *values;
+ long capa;
+ long idx;
+ } *pairs;
+ /* Storage for sequence data */
+ struct SyckSeq {
+ enum seq_style style;
+ SYMID *items;
+ long capa;
+ long idx;
+ } *list;
+ /* Storage for string data */
+ struct SyckStr {
+ enum scalar_style style;
+ char *ptr;
+ long len;
+ } *str;
+ } data;
+ /* Shortcut node */
+ void *shortcut;
+};
+
+/*
+ * Parser definitions
+ */
+typedef struct _syck_parser SyckParser;
+typedef struct _syck_file SyckIoFile;
+typedef struct _syck_str SyckIoStr;
+typedef struct _syck_level SyckLevel;
+
+typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
+typedef void (*SyckErrorHandler)(SyckParser *, const char *);
+typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
+typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long);
+typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
+
+enum syck_io_type {
+ syck_io_str,
+ syck_io_file
+};
+
+enum syck_parser_input {
+ syck_yaml_utf8,
+ syck_yaml_utf16,
+ syck_yaml_utf32,
+ syck_bytecode_utf8
+};
+
+enum syck_level_status {
+ syck_lvl_header,
+ syck_lvl_doc,
+ syck_lvl_open,
+ syck_lvl_seq,
+ syck_lvl_map,
+ syck_lvl_block,
+ syck_lvl_str,
+ syck_lvl_iseq,
+ syck_lvl_imap,
+ syck_lvl_end,
+ syck_lvl_pause,
+ syck_lvl_anctag,
+ syck_lvl_mapx,
+ syck_lvl_seqx
+};
+
+/*
+ * Parser structs
+ */
+struct _syck_file {
+ /* File pointer */
+ FILE *ptr;
+ /* Function which FILE -> buffer */
+ SyckIoFileRead read;
+};
+
+struct _syck_str {
+ /* String buffer pointers */
+ char *beg, *ptr, *end;
+ /* Function which string -> buffer */
+ SyckIoStrRead read;
+};
+
+struct _syck_level {
+ /* Indent */
+ int spaces;
+ /* Counts nodes emitted at this level, useful for parsing
+ * keys and pairs in bytecode */
+ int ncount;
+ /* Does node have anchors or tags? */
+ int anctag;
+ /* Domain prefixing at the given level */
+ char *domain;
+ /* Keeps a node status */
+ enum syck_level_status status;
+};
+
+struct _syck_parser {
+ /* Root node */
+ SYMID root, root_on_error;
+ /* Implicit typing flag */
+ int implicit_typing, taguri_expansion;
+ /* Scripting language function to handle nodes */
+ SyckNodeHandler handler;
+ /* Error handler */
+ SyckErrorHandler error_handler;
+ /* InvalidAnchor handler */
+ SyckBadAnchorHandler bad_anchor_handler;
+ /* Parser input type */
+ enum syck_parser_input input_type;
+ /* IO type */
+ enum syck_io_type io_type;
+ /* Custom buffer size */
+ size_t bufsize;
+ /* Buffer pointers */
+ char *buffer, *linectptr, *lineptr, *toktmp, *token, *cursor, *marker, *limit;
+ /* Line counter */
+ int linect;
+ /* Last token from yylex() */
+ int last_token;
+ /* Force a token upon next call to yylex() */
+ int force_token;
+ /* EOF flag */
+ int eof;
+ union {
+ SyckIoFile *file;
+ SyckIoStr *str;
+ } io;
+ /* Symbol table for anchors */
+ st_table *anchors, *bad_anchors;
+ /* Optional symbol table for SYMIDs */
+ st_table *syms;
+ /* Levels of indentation */
+ SyckLevel *levels;
+ int lvl_idx;
+ int lvl_capa;
+ /* Pointer for extension's use */
+ void *bonus;
+};
+
+/*
+ * Emitter definitions
+ */
+typedef struct _syck_emitter SyckEmitter;
+typedef struct _syck_emitter_node SyckEmitterNode;
+
+typedef void (*SyckOutputHandler)(SyckEmitter *, char *, long);
+typedef void (*SyckEmitterHandler)(SyckEmitter *, st_data_t);
+
+enum doc_stage {
+ doc_open,
+ doc_processing
+};
+
+/*
+ * Emitter struct
+ */
+struct _syck_emitter {
+ /* Headerless doc flag */
+ int headless;
+ /* Force header? */
+ int use_header;
+ /* Force version? */
+ int use_version;
+ /* Sort hash keys */
+ int sort_keys;
+ /* Anchor format */
+ char *anchor_format;
+ /* Explicit typing on all collections? */
+ int explicit_typing;
+ /* Best width on folded scalars */
+ int best_width;
+ /* Use literal[1] or folded[2] blocks on all text? */
+ enum scalar_style style;
+ /* Stage of written document */
+ enum doc_stage stage;
+ /* Level counter */
+ int level;
+ /* Default indentation */
+ int indent;
+ /* Object ignore ID */
+ SYMID ignore_id;
+ /* Symbol table for anchors */
+ st_table *markers, *anchors, *anchored;
+ /* Custom buffer size */
+ size_t bufsize;
+ /* Buffer */
+ char *buffer, *marker;
+ /* Absolute position of the buffer */
+ long bufpos;
+ /* Handler for emitter nodes */
+ SyckEmitterHandler emitter_handler;
+ /* Handler for output */
+ SyckOutputHandler output_handler;
+ /* Levels of indentation */
+ SyckLevel *levels;
+ int lvl_idx;
+ int lvl_capa;
+ /* Pointer for extension's use */
+ void *bonus;
+};
+
+/*
+ * Emitter node metadata struct
+ */
+struct _syck_emitter_node {
+ /* Node buffer position */
+ long pos;
+ /* Current indent */
+ long indent;
+ /* Collection? */
+ int is_shortcut;
+};
+
+/*
+ * Handler prototypes
+ */
+SYMID syck_hdlr_add_node( SyckParser *, SyckNode * );
+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 ** );
+int syck_try_implicit( SyckNode * );
+char *syck_type_id_to_uri( const char * );
+void try_tag_implicit( SyckNode *, int );
+const char *syck_match_implicit( const char *, size_t );
+
+/*
+ * API prototypes
+ */
+char *syck_strndup( const 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);
+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_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_item( SyckEmitter *, st_data_t );
+void syck_emit_map( SyckEmitter *, const char *, enum map_style );
+void syck_emit_end( SyckEmitter * );
+void syck_emit_tag( SyckEmitter *, const char *, const 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);
+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 );
+void syck_parser_handler( SyckParser *, SyckNodeHandler );
+void syck_parser_error_handler( SyckParser *, SyckErrorHandler );
+void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler );
+void syck_parser_set_input_type( SyckParser *, enum syck_parser_input );
+void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead );
+void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead );
+void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead );
+SyckLevel *syck_parser_current_level( SyckParser * );
+void syck_parser_add_level( SyckParser *, int, enum syck_level_status );
+void syck_parser_pop_level( SyckParser * );
+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 * );
+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);
+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 );
+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 * );
+char *syck_str_read( SyckNode * );
+SyckNode *syck_new_map( SYMID, SYMID );
+void syck_map_empty( SyckNode * );
+void syck_map_add( SyckNode *, SYMID, SYMID );
+SYMID syck_map_read( SyckNode *, enum map_part, long );
+void syck_map_assign( SyckNode *, enum map_part, long, SYMID );
+long syck_map_count( SyckNode * );
+void syck_map_update( SyckNode *, SyckNode * );
+SyckNode *syck_new_seq( SYMID );
+void syck_seq_empty( SyckNode * );
+void syck_seq_add( SyckNode *, SYMID );
+void syck_seq_assign( SyckNode *, long, SYMID );
+SYMID syck_seq_read( SyckNode *, long );
+long syck_seq_count( SyckNode * );
+
+/*
+ * Lexer prototypes
+ */
+void syckerror( const char * );
+int syckparse( void * );
+union YYSTYPE;
+int sycklex( union YYSTYPE *, SyckParser * );
+
+#if defined(__cplusplus)
+} /* extern "C" { */
+#endif
+
+#endif /* ifndef SYCK_H */
diff --git a/ext/syck/token.c b/ext/syck/token.c
new file mode 100644
index 0000000000..1521c5489d
--- /dev/null
+++ b/ext/syck/token.c
@@ -0,0 +1,2724 @@
+/* Generated by re2c 0.9.10 on Tue Sep 20 17:46:17 2005 */
+#line 1 "token.re"
+/*
+ * token.re
+ *
+ * $Author$
+ *
+ * Copyright (C) 2003 why the lucky stiff
+ */
+#include "ruby/ruby.h"
+#include "syck.h"
+#include "gram.h"
+
+/*
+ * Allocate quoted strings in chunks
+ */
+#define QUOTELEN 1024
+
+/*
+ * They do my bidding...
+ */
+#define YYCTYPE char
+#define YYCURSOR parser->cursor
+#define YYMARKER parser->marker
+#define YYLIMIT parser->limit
+#define YYTOKEN parser->token
+#define YYTOKTMP parser->toktmp
+#define YYLINEPTR parser->lineptr
+#define YYLINECTPTR parser->linectptr
+#define YYLINE parser->linect
+#define YYFILL(n) syck_parser_read(parser)
+
+/*
+ * Repositions the cursor at `n' offset from the token start.
+ * Only works in `Header' and `Document' sections.
+ */
+#define YYPOS(n) YYCURSOR = YYTOKEN + n
+
+/*
+ * Track line numbers
+ */
+#define NEWLINE(ptr) YYLINEPTR = ptr + newline_len(ptr); if ( YYLINEPTR > YYLINECTPTR ) { YYLINE++; YYLINECTPTR = YYLINEPTR; }
+
+/*
+ * I like seeing the level operations as macros...
+ */
+#define ADD_LEVEL(len, status) syck_parser_add_level( parser, len, status )
+#define POP_LEVEL() syck_parser_pop_level( parser )
+#define CURRENT_LEVEL() syck_parser_current_level( parser )
+
+/*
+ * Force a token next time around sycklex()
+ */
+#define FORCE_NEXT_TOKEN(tok) parser->force_token = tok;
+
+/*
+ * Nice little macro to ensure we're YAML_IOPENed to the current level.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IOPEN(last_lvl, to_len, reset) \
+ if ( last_lvl->spaces < to_len ) \
+ { \
+ if ( last_lvl->status == syck_lvl_iseq || last_lvl->status == syck_lvl_imap ) \
+ { \
+ goto Document; \
+ } \
+ else \
+ { \
+ ADD_LEVEL( to_len, syck_lvl_doc ); \
+ if ( reset == 1 ) YYPOS(0); \
+ return YAML_IOPEN; \
+ } \
+ }
+
+/*
+ * Nice little macro to ensure closure of levels.
+ * * Only use this macro in the "Document" section *
+ */
+#define ENSURE_YAML_IEND(last_lvl, to_len) \
+ if ( last_lvl->spaces > to_len ) \
+ { \
+ syck_parser_pop_level( parser ); \
+ YYPOS(0); \
+ return YAML_IEND; \
+ }
+
+/*
+ * Concatenates quoted string items and manages allocation
+ * to the quoted string
+ */
+#define QUOTECAT(s, c, i, l) \
+ { \
+ if ( i + 1 >= c ) \
+ { \
+ c += QUOTELEN; \
+ S_REALLOC_N( s, char, c ); \
+ } \
+ s[i++] = l; \
+ s[i] = '\0'; \
+ }
+
+#define QUOTECATS(s, c, i, cs, cl) \
+ { \
+ while ( i + cl >= c ) \
+ { \
+ c += QUOTELEN; \
+ S_REALLOC_N( s, char, c ); \
+ } \
+ S_MEMCPY( s + i, cs, char, cl ); \
+ i += cl; \
+ s[i] = '\0'; \
+ }
+
+/*
+ * Tags a plain scalar with a transfer method
+ * * Use only in "Plain" section *
+ */
+#define RETURN_IMPLICIT() \
+ { \
+ SyckNode *n = syck_alloc_str(); \
+ YYCURSOR = YYTOKEN; \
+ n->data.str->ptr = qstr; \
+ n->data.str->len = qidx; \
+ n->data.str->style = scalar_plain; \
+ sycklval->nodeData = n; \
+ if ( parser->implicit_typing == 1 ) \
+ { \
+ try_tag_implicit( sycklval->nodeData, parser->taguri_expansion ); \
+ } \
+ return YAML_PLAIN; \
+ }
+
+/* concat the inline characters to the plain scalar */
+#define PLAIN_NOT_INL() \
+ if ( *(YYCURSOR - 1) == ' ' || is_newline( YYCURSOR - 1 ) ) \
+ { \
+ YYCURSOR--; \
+ } \
+ QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN); \
+ goto Plain2;
+
+/* trim spaces off the end in case of indent */
+#define PLAIN_IS_INL() \
+ char *walker = qstr + qidx - 1; \
+ while ( walker > qstr && ( *walker == '\n' || *walker == ' ' || *walker == '\t' ) ) \
+ { \
+ qidx--; \
+ walker[0] = '\0'; \
+ walker--; \
+ }
+
+/*
+ * Keep or chomp block?
+ * * Use only in "ScalarBlock" section *
+ */
+#define RETURN_YAML_BLOCK() \
+ { \
+ SyckNode *n = syck_alloc_str(); \
+ if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
+ { \
+ n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 ); \
+ } \
+ else \
+ { \
+ n->type_id = syck_strndup( "str", 3 ); \
+ } \
+ n->data.str->ptr = qstr; \
+ n->data.str->len = qidx; \
+ if ( blockType == BLOCK_LIT ) { \
+ n->data.str->style = scalar_literal; \
+ } else { \
+ n->data.str->style = scalar_fold; \
+ } \
+ if ( qidx > 0 ) \
+ { \
+ if ( nlDoWhat != NL_KEEP ) \
+ { \
+ char *fc = n->data.str->ptr + n->data.str->len - 1; \
+ while ( is_newline( fc ) ) fc--; \
+ if ( nlDoWhat != NL_CHOMP && fc < n->data.str->ptr + n->data.str->len - 1 ) \
+ fc += 1; \
+ n->data.str->len = fc - n->data.str->ptr + 1; \
+ } \
+ } \
+ sycklval->nodeData = n; \
+ return YAML_BLOCK; \
+ }
+
+/*
+ * Handles newlines, calculates indent
+ */
+#define GOBBLE_UP_YAML_INDENT( ict, start ) \
+ char *indent = start; \
+ NEWLINE(indent); \
+ while ( indent < YYCURSOR ) \
+ { \
+ if ( is_newline( ++indent ) ) \
+ { \
+ NEWLINE(indent); \
+ } \
+ } \
+ ict = 0; \
+ if ( *YYCURSOR == '\0' ) \
+ { \
+ ict = -1; \
+ start = YYCURSOR - 1; \
+ } \
+ else if ( *YYLINEPTR == ' ' ) \
+ { \
+ ict = YYCURSOR - YYLINEPTR; \
+ }
+
+/*
+ * If an indent exists at the current level, back up.
+ */
+#define GET_TRUE_YAML_INDENT(indt_len) \
+ { \
+ SyckLevel *lvl_deep = CURRENT_LEVEL(); \
+ indt_len = lvl_deep->spaces; \
+ if ( lvl_deep->status == syck_lvl_seq || ( indt_len == YYCURSOR - YYLINEPTR && lvl_deep->status != syck_lvl_map ) ) \
+ { \
+ SyckLevel *lvl_over; \
+ parser->lvl_idx--; \
+ lvl_over = CURRENT_LEVEL(); \
+ indt_len = lvl_over->spaces; \
+ parser->lvl_idx++; \
+ } \
+ }
+
+/*
+ * Argjh! I hate globals! Here for syckerror() only!
+ */
+SyckParser *syck_parser_ptr = NULL;
+
+/*
+ * Accessory funcs later in this file.
+ */
+void eat_comments( SyckParser * );
+char escape_seq( char );
+int is_newline( char *ptr );
+int newline_len( char *ptr );
+int sycklex_yaml_utf8( YYSTYPE *, SyckParser * );
+int sycklex_bytecode_utf8( YYSTYPE *, SyckParser * );
+int syckwrap();
+
+/*
+ * My own re-entrant sycklex() using re2c.
+ * You really get used to the limited regexp.
+ * It's really nice to not rely on backtracking and such.
+ */
+int
+sycklex( YYSTYPE *sycklval, SyckParser *parser )
+{
+ switch ( parser->input_type )
+ {
+ case syck_yaml_utf8:
+ return sycklex_yaml_utf8( sycklval, parser );
+
+ case syck_yaml_utf16:
+ syckerror( "UTF-16 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
+ break;
+
+ case syck_yaml_utf32:
+ syckerror( "UTF-32 is not currently supported in Syck.\nPlease contribute code to help this happen!" );
+ break;
+
+ case syck_bytecode_utf8:
+ return sycklex_bytecode_utf8( sycklval, parser );
+ }
+ return YAML_DOCSEP;
+}
+
+/*
+ * Parser for standard YAML [UTF-8]
+ */
+int
+sycklex_yaml_utf8( YYSTYPE *sycklval, SyckParser *parser )
+{
+ int doc_level = 0;
+ syck_parser_ptr = parser;
+ if ( YYCURSOR == NULL )
+ {
+ syck_parser_read( parser );
+ }
+
+ if ( parser->force_token != 0 )
+ {
+ int t = parser->force_token;
+ parser->force_token = 0;
+ return t;
+ }
+
+#line 315 "token.re"
+
+
+ if ( YYLINEPTR != YYCURSOR )
+ {
+ goto Document;
+ }
+
+Header:
+
+ YYTOKEN = YYCURSOR;
+
+
+#line 307 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy0;
+ ++YYCURSOR;
+yy0:
+ if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy7;
+ case 0x09: case ' ': goto yy12;
+ case 0x0A: goto yy9;
+ case 0x0D: goto yy11;
+ case '#': goto yy5;
+ case '-': goto yy2;
+ case '.': goto yy4;
+ default: goto yy14;
+ }
+yy2: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '-': goto yy28;
+ default: goto yy3;
+ }
+yy3:
+#line 374 "token.re"
+{ YYPOS(0);
+ goto Document;
+ }
+#line 337 "<stdout>"
+yy4: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '.': goto yy21;
+ default: goto yy3;
+ }
+yy5: ++YYCURSOR;
+ goto yy6;
+yy6:
+#line 356 "token.re"
+{ eat_comments( parser );
+ goto Header;
+ }
+#line 351 "<stdout>"
+yy7: ++YYCURSOR;
+ goto yy8;
+yy8:
+#line 360 "token.re"
+{ SyckLevel *lvl = CURRENT_LEVEL();
+ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+#line 361 "<stdout>"
+yy9: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy18;
+yy10:
+#line 366 "token.re"
+{ GOBBLE_UP_YAML_INDENT( doc_level, YYTOKEN );
+ goto Header;
+ }
+#line 370 "<stdout>"
+yy11: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy17;
+ default: goto yy3;
+ }
+yy12: ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy16;
+yy13:
+#line 370 "token.re"
+{ doc_level = YYCURSOR - YYLINEPTR;
+ goto Header;
+ }
+#line 384 "<stdout>"
+yy14: yych = *++YYCURSOR;
+ goto yy3;
+yy15: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy16;
+yy16: switch(yych){
+ case 0x09: case ' ': goto yy15;
+ default: goto yy13;
+ }
+yy17: yyaccept = 1;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy18;
+yy18: switch(yych){
+ case 0x0A: case ' ': goto yy17;
+ case 0x0D: goto yy19;
+ default: goto yy10;
+ }
+yy19: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy17;
+ default: goto yy20;
+ }
+yy20: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 1: goto yy10;
+ case 0: goto yy3;
+ }
+yy21: yych = *++YYCURSOR;
+ switch(yych){
+ case '.': goto yy22;
+ default: goto yy20;
+ }
+yy22: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy23;
+ case 0x0D: goto yy27;
+ case ' ': goto yy25;
+ default: goto yy20;
+ }
+yy23: ++YYCURSOR;
+ goto yy24;
+yy24:
+#line 342 "token.re"
+{ SyckLevel *lvl = CURRENT_LEVEL();
+ if ( lvl->status == syck_lvl_header )
+ {
+ goto Header;
+ }
+ else
+ {
+ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+ return 0;
+ }
+#line 446 "<stdout>"
+yy25: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy26;
+yy26: switch(yych){
+ case ' ': goto yy25;
+ default: goto yy24;
+ }
+yy27: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy23;
+ default: goto yy20;
+ }
+yy28: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy29;
+ default: goto yy20;
+ }
+yy29: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy30;
+ case 0x0D: goto yy34;
+ case ' ': goto yy32;
+ default: goto yy20;
+ }
+yy30: ++YYCURSOR;
+ goto yy31;
+yy31:
+#line 328 "token.re"
+{ SyckLevel *lvl = CURRENT_LEVEL();
+ if ( lvl->status == syck_lvl_header )
+ {
+ YYPOS(3);
+ goto Directive;
+ }
+ else
+ {
+ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+ }
+#line 489 "<stdout>"
+yy32: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy33;
+yy33: switch(yych){
+ case ' ': goto yy32;
+ default: goto yy31;
+ }
+yy34: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy30;
+ default: goto yy20;
+ }
+}
+#line 378 "token.re"
+
+
+Document:
+ {
+ SyckLevel *lvl = CURRENT_LEVEL();
+ if ( lvl->status == syck_lvl_header )
+ {
+ lvl->status = syck_lvl_doc;
+ }
+
+ YYTOKEN = YYCURSOR;
+
+
+#line 518 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy35;
+ ++YYCURSOR;
+yy35:
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy62;
+ case 0x09: case ' ': goto yy60;
+ case 0x0A: goto yy37;
+ case 0x0D: goto yy39;
+ case '!': goto yy51;
+ case '"': goto yy55;
+ case '#': goto yy58;
+ case '&': goto yy49;
+ case '\'': goto yy53;
+ case '*': goto yy50;
+ case ',': case ':': goto yy47;
+ case '-': case '?': goto yy48;
+ case '>': case '|': goto yy57;
+ case '[': goto yy41;
+ case ']': case '}': goto yy45;
+ case '{': goto yy43;
+ default: goto yy64;
+ }
+yy37: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy92;
+yy38:
+#line 392 "token.re"
+{ /* Isolate spaces */
+ int indt_len;
+ GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
+ lvl = CURRENT_LEVEL();
+ doc_level = 0;
+
+ /* XXX: Comment lookahead */
+ if ( *YYCURSOR == '#' )
+ {
+ goto Document;
+ }
+
+ /* Ignore indentation inside inlines */
+ if ( lvl->status == syck_lvl_iseq || lvl->status == syck_lvl_imap )
+ {
+ goto Document;
+ }
+
+ /* Check for open indent */
+ ENSURE_YAML_IEND(lvl, indt_len);
+ ENSURE_YAML_IOPEN(lvl, indt_len, 0);
+ if ( indt_len == -1 )
+ {
+ return 0;
+ }
+ return YAML_INDENT;
+ }
+#line 578 "<stdout>"
+yy39: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy91;
+ default: goto yy40;
+ }
+yy40:
+#line 497 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+ goto Plain;
+ }
+#line 589 "<stdout>"
+yy41: ++YYCURSOR;
+ goto yy42;
+yy42:
+#line 420 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+ lvl = CURRENT_LEVEL();
+ ADD_LEVEL(lvl->spaces + 1, syck_lvl_iseq);
+ return YYTOKEN[0];
+ }
+#line 599 "<stdout>"
+yy43: ++YYCURSOR;
+ goto yy44;
+yy44:
+#line 426 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+ lvl = CURRENT_LEVEL();
+ ADD_LEVEL(lvl->spaces + 1, syck_lvl_imap);
+ return YYTOKEN[0];
+ }
+#line 609 "<stdout>"
+yy45: ++YYCURSOR;
+ goto yy46;
+yy46:
+#line 432 "token.re"
+{ POP_LEVEL();
+ return YYTOKEN[0];
+ }
+#line 617 "<stdout>"
+yy47: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy86;
+ case 0x0D: goto yy90;
+ case ' ': goto yy88;
+ default: goto yy40;
+ }
+yy48: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy81;
+ case 0x0D: goto yy85;
+ case ' ': goto yy83;
+ default: goto yy40;
+ }
+yy49: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy78;
+ default: goto yy40;
+ }
+yy50: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy75;
+ default: goto yy40;
+ }
+yy51: ++YYCURSOR;
+ goto yy52;
+yy52:
+#line 471 "token.re"
+{ goto TransferMethod; }
+#line 767 "<stdout>"
+yy53: ++YYCURSOR;
+ goto yy54;
+yy54:
+#line 473 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+ goto SingleQuote; }
+#line 774 "<stdout>"
+yy55: ++YYCURSOR;
+ goto yy56;
+yy56:
+#line 476 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+ goto DoubleQuote; }
+#line 781 "<stdout>"
+yy57: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy70;
+ case 0x0D: goto yy74;
+ case ' ': goto yy72;
+ case '+': case '-': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy67;
+ default: goto yy40;
+ }
+yy58: ++YYCURSOR;
+ goto yy59;
+yy59:
+#line 486 "token.re"
+{ eat_comments( parser );
+ goto Document;
+ }
+#line 807 "<stdout>"
+yy60: ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy66;
+yy61:
+#line 490 "token.re"
+{ goto Document; }
+#line 814 "<stdout>"
+yy62: ++YYCURSOR;
+ goto yy63;
+yy63:
+#line 492 "token.re"
+{ ENSURE_YAML_IEND(lvl, -1);
+ YYPOS(0);
+ return 0;
+ }
+#line 823 "<stdout>"
+yy64: yych = *++YYCURSOR;
+ goto yy40;
+yy65: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy66;
+yy66: switch(yych){
+ case 0x09: case ' ': goto yy65;
+ default: goto yy61;
+ }
+yy67: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy68;
+yy68: switch(yych){
+ case 0x0A: goto yy70;
+ case 0x0D: goto yy74;
+ case ' ': goto yy72;
+ case '+': case '-': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': goto yy67;
+ default: goto yy69;
+ }
+yy69: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy38;
+ case 1: goto yy40;
+ }
+yy70: ++YYCURSOR;
+ goto yy71;
+yy71:
+#line 479 "token.re"
+{ if ( is_newline( YYCURSOR - 1 ) )
+ {
+ YYCURSOR--;
+ }
+ goto ScalarBlock;
+ }
+#line 869 "<stdout>"
+yy72: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy73;
+yy73: switch(yych){
+ case ' ': goto yy72;
+ default: goto yy71;
+ }
+yy74: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy70;
+ default: goto yy69;
+ }
+yy75: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy76;
+yy76: switch(yych){
+ case '-': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy75;
+ default: goto yy77;
+ }
+yy77:
+#line 466 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, doc_level, 1);
+ sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
+ return YAML_ALIAS;
+ }
+#line 956 "<stdout>"
+yy78: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy79;
+yy79: switch(yych){
+ case '-': case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z': case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy78;
+ default: goto yy80;
+ }
+yy80:
+#line 455 "token.re"
+{ sycklval->name = syck_strndup( YYTOKEN + 1, YYCURSOR - YYTOKEN - 1 );
+
+ /*
+ * Remove previous anchors of the same name. Since the parser will likely
+ * construct deeper nodes first, we want those nodes to be placed in the
+ * queue for matching at a higher level of indentation.
+ */
+ syck_hdlr_remove_anchor(parser, sycklval->name);
+ return YAML_ANCHOR;
+ }
+#line 1036 "<stdout>"
+yy81: ++YYCURSOR;
+ goto yy82;
+yy82:
+#line 441 "token.re"
+{ ENSURE_YAML_IOPEN(lvl, YYTOKEN - YYLINEPTR, 1);
+ FORCE_NEXT_TOKEN(YAML_IOPEN);
+ if ( *YYCURSOR == '#' || is_newline( YYCURSOR ) || is_newline( YYCURSOR - 1 ) )
+ {
+ YYCURSOR--;
+ ADD_LEVEL((YYTOKEN + 1) - YYLINEPTR, syck_lvl_seq);
+ }
+ else /* spaces followed by content uses the space as indentation */
+ {
+ ADD_LEVEL(YYCURSOR - YYLINEPTR, syck_lvl_seq);
+ }
+ return YYTOKEN[0];
+ }
+#line 1054 "<stdout>"
+yy83: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy84;
+yy84: switch(yych){
+ case ' ': goto yy83;
+ default: goto yy82;
+ }
+yy85: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy81;
+ default: goto yy69;
+ }
+yy86: ++YYCURSOR;
+ goto yy87;
+yy87:
+#line 436 "token.re"
+{ if ( *YYTOKEN == ':' && lvl->status != syck_lvl_imap ) lvl->status = syck_lvl_map;
+ YYPOS(1);
+ return YYTOKEN[0];
+ }
+#line 1076 "<stdout>"
+yy88: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy89;
+yy89: switch(yych){
+ case ' ': goto yy88;
+ default: goto yy87;
+ }
+yy90: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy86;
+ default: goto yy69;
+ }
+yy91: yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy92;
+yy92: switch(yych){
+ case 0x0A: case ' ': goto yy91;
+ case 0x0D: goto yy93;
+ default: goto yy38;
+ }
+yy93: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy91;
+ default: goto yy69;
+ }
+}
+#line 501 "token.re"
+
+ }
+
+Directive:
+ {
+ YYTOKTMP = YYCURSOR;
+
+
+#line 1117 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
+ goto yy94;
+ ++YYCURSOR;
+yy94:
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy96;
+ case 0x09: case ' ': goto yy99;
+ case '%': goto yy97;
+ default: goto yy101;
+ }
+yy96: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy98;
+ }
+yy97: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ':':
+ case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy104;
+ default: goto yy98;
+ }
+yy98:
+#line 514 "token.re"
+{ YYCURSOR = YYTOKTMP;
+ return YAML_DOCSEP;
+ }
+#line 1221 "<stdout>"
+yy99: ++YYCURSOR;
+ yych = *YYCURSOR;
+ goto yy103;
+yy100:
+#line 512 "token.re"
+{ goto Directive; }
+#line 1228 "<stdout>"
+yy101: yych = *++YYCURSOR;
+ goto yy98;
+yy102: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy103;
+yy103: switch(yych){
+ case 0x09: case ' ': goto yy102;
+ default: goto yy100;
+ }
+yy104: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy105;
+yy105: switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy104;
+ case ':': goto yy106;
+ default: goto yy96;
+ }
+yy106: yych = *++YYCURSOR;
+ switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ':':
+ case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy107;
+ default: goto yy96;
+ }
+yy107: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy108;
+yy108: switch(yych){
+ case '.':
+ case '/':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ':':
+ case ';':
+ case '<':
+ case '=':
+ case '>':
+ case '?':
+ case '@':
+ case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F':
+ case 'G':
+ case 'H':
+ case 'I':
+ case 'J':
+ case 'K':
+ case 'L':
+ case 'M':
+ case 'N':
+ case 'O':
+ case 'P':
+ case 'Q':
+ case 'R':
+ case 'S':
+ case 'T':
+ case 'U':
+ case 'V':
+ case 'W':
+ case 'X':
+ case 'Y':
+ case 'Z':
+ case '[':
+ case '\\':
+ case ']':
+ case '^':
+ case '_': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'i':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'o':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 's':
+ case 't':
+ case 'u':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z': goto yy107;
+ default: goto yy109;
+ }
+yy109:
+#line 510 "token.re"
+{ goto Directive; }
+#line 1484 "<stdout>"
+}
+#line 517 "token.re"
+
+
+ }
+
+Plain:
+ {
+ int qidx = 0;
+ int qcapa = 100;
+ char *qstr = S_ALLOC_N( char, qcapa );
+ SyckLevel *plvl;
+ int parentIndent;
+
+ YYCURSOR = YYTOKEN;
+ plvl = CURRENT_LEVEL();
+ GET_TRUE_YAML_INDENT(parentIndent);
+
+Plain2:
+ YYTOKEN = YYCURSOR;
+
+Plain3:
+
+
+#line 1509 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy110;
+ ++YYCURSOR;
+yy110:
+ if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy124;
+ case 0x09: goto yy126;
+ case 0x0A: goto yy112;
+ case 0x0D: goto yy114;
+ case ' ': goto yy122;
+ case ',': goto yy117;
+ case ':': goto yy116;
+ case ']': goto yy120;
+ case '}': goto yy118;
+ default: goto yy127;
+ }
+yy112: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy142;
+yy113:
+#line 540 "token.re"
+{ int indt_len, nl_count = 0;
+ SyckLevel *lvl;
+ char *tok = YYTOKEN;
+ GOBBLE_UP_YAML_INDENT( indt_len, tok );
+ lvl = CURRENT_LEVEL();
+
+ if ( indt_len <= parentIndent )
+ {
+ RETURN_IMPLICIT();
+ }
+
+ while ( YYTOKEN < YYCURSOR )
+ {
+ int nl_len = newline_len( YYTOKEN++ );
+ if ( nl_len )
+ {
+ nl_count++;
+ YYTOKEN += nl_len - 1;
+ }
+ }
+ if ( nl_count <= 1 )
+ {
+ QUOTECAT(qstr, qcapa, qidx, ' ');
+ }
+ else
+ {
+ int i;
+ for ( i = 0; i < nl_count - 1; i++ )
+ {
+ QUOTECAT(qstr, qcapa, qidx, '\n');
+ }
+ }
+
+ goto Plain2;
+ }
+#line 1570 "<stdout>"
+yy114: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy141;
+ default: goto yy115;
+ }
+yy115:
+#line 627 "token.re"
+{ QUOTECATS(qstr, qcapa, qidx, YYTOKEN, YYCURSOR - YYTOKEN);
+ goto Plain2;
+ }
+#line 1581 "<stdout>"
+yy116: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy136;
+ case 0x0D: goto yy140;
+ case ' ': goto yy138;
+ default: goto yy115;
+ }
+yy117: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy130;
+ case 0x0D: goto yy134;
+ case ' ': goto yy132;
+ default: goto yy115;
+ }
+yy118: ++YYCURSOR;
+ goto yy119;
+yy119:
+#line 589 "token.re"
+{ if ( plvl->status != syck_lvl_imap )
+ {
+ PLAIN_NOT_INL();
+ }
+ else
+ {
+ PLAIN_IS_INL();
+ }
+ RETURN_IMPLICIT();
+ }
+#line 1612 "<stdout>"
+yy120: ++YYCURSOR;
+ goto yy121;
+yy121:
+#line 600 "token.re"
+{ if ( plvl->status != syck_lvl_iseq )
+ {
+ PLAIN_NOT_INL();
+ }
+ else
+ {
+ PLAIN_IS_INL();
+ }
+ RETURN_IMPLICIT();
+ }
+#line 1627 "<stdout>"
+yy122: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case '#': goto yy128;
+ default: goto yy123;
+ }
+yy123:
+#line 617 "token.re"
+{ if ( qidx == 0 )
+ {
+ goto Plain2;
+ }
+ else
+ {
+ goto Plain3;
+ }
+ }
+#line 1644 "<stdout>"
+yy124: ++YYCURSOR;
+ goto yy125;
+yy125:
+#line 615 "token.re"
+{ RETURN_IMPLICIT(); }
+#line 1650 "<stdout>"
+yy126: yych = *++YYCURSOR;
+ goto yy123;
+yy127: yych = *++YYCURSOR;
+ goto yy115;
+yy128: ++YYCURSOR;
+ goto yy129;
+yy129:
+#line 611 "token.re"
+{ eat_comments( parser );
+ RETURN_IMPLICIT();
+ }
+#line 1662 "<stdout>"
+yy130: ++YYCURSOR;
+ goto yy131;
+yy131:
+#line 578 "token.re"
+{ if ( plvl->status != syck_lvl_iseq && plvl->status != syck_lvl_imap )
+ {
+ PLAIN_NOT_INL();
+ }
+ else
+ {
+ PLAIN_IS_INL();
+ }
+ RETURN_IMPLICIT();
+ }
+#line 1677 "<stdout>"
+yy132: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy133;
+yy133: switch(yych){
+ case ' ': goto yy132;
+ default: goto yy131;
+ }
+yy134: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy130;
+ default: goto yy135;
+ }
+yy135: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy113;
+ case 1: goto yy115;
+ }
+yy136: ++YYCURSOR;
+ goto yy137;
+yy137:
+#line 576 "token.re"
+{ RETURN_IMPLICIT(); }
+#line 1701 "<stdout>"
+yy138: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy139;
+yy139: switch(yych){
+ case ' ': goto yy138;
+ default: goto yy137;
+ }
+yy140: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy136;
+ default: goto yy135;
+ }
+yy141: yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy142;
+yy142: switch(yych){
+ case 0x0A: case ' ': goto yy141;
+ case 0x0D: goto yy143;
+ default: goto yy113;
+ }
+yy143: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy141;
+ default: goto yy135;
+ }
+}
+#line 631 "token.re"
+
+ }
+
+SingleQuote:
+ {
+ int qidx = 0;
+ int qcapa = 100;
+ char *qstr = S_ALLOC_N( char, qcapa );
+
+SingleQuote2:
+ YYTOKEN = YYCURSOR;
+
+
+#line 1747 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy144;
+ ++YYCURSOR;
+yy144:
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy152;
+ case 0x0A: goto yy146;
+ case 0x0D: goto yy148;
+ case '\'': goto yy150;
+ default: goto yy153;
+ }
+yy146: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy157;
+yy147:
+#line 645 "token.re"
+{ int indt_len;
+ int nl_count = 0;
+ SyckLevel *lvl;
+ GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
+ lvl = CURRENT_LEVEL();
+
+ if ( lvl->status != syck_lvl_str )
+ {
+ ADD_LEVEL( indt_len, syck_lvl_str );
+ }
+ else if ( indt_len < lvl->spaces )
+ {
+ /* Error! */
+ }
+
+ while ( YYTOKEN < YYCURSOR )
+ {
+ int nl_len = newline_len( YYTOKEN++ );
+ if ( nl_len )
+ {
+ nl_count++;
+ YYTOKEN += nl_len - 1;
+ }
+ }
+ if ( nl_count <= 1 )
+ {
+ QUOTECAT(qstr, qcapa, qidx, ' ');
+ }
+ else
+ {
+ int i;
+ for ( i = 0; i < nl_count - 1; i++ )
+ {
+ QUOTECAT(qstr, qcapa, qidx, '\n');
+ }
+ }
+
+ goto SingleQuote2;
+ }
+#line 1807 "<stdout>"
+yy148: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy156;
+ default: goto yy149;
+ }
+yy149:
+#line 712 "token.re"
+{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
+ goto SingleQuote2;
+ }
+#line 1818 "<stdout>"
+yy150: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case '\'': goto yy154;
+ default: goto yy151;
+ }
+yy151:
+#line 689 "token.re"
+{ SyckLevel *lvl;
+ SyckNode *n = syck_alloc_str();
+ lvl = CURRENT_LEVEL();
+
+ if ( lvl->status == syck_lvl_str )
+ {
+ POP_LEVEL();
+ }
+ if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+ {
+ n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+ }
+ else
+ {
+ n->type_id = syck_strndup( "str", 3 );
+ }
+ n->data.str->ptr = qstr;
+ n->data.str->len = qidx;
+ n->data.str->style = scalar_1quote;
+ sycklval->nodeData = n;
+ return YAML_PLAIN;
+ }
+#line 1848 "<stdout>"
+yy152: yych = *++YYCURSOR;
+ goto yy151;
+yy153: yych = *++YYCURSOR;
+ goto yy149;
+yy154: ++YYCURSOR;
+ goto yy155;
+yy155:
+#line 685 "token.re"
+{ QUOTECAT(qstr, qcapa, qidx, '\'');
+ goto SingleQuote2;
+ }
+#line 1860 "<stdout>"
+yy156: yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy157;
+yy157: switch(yych){
+ case 0x0A: case ' ': goto yy156;
+ case 0x0D: goto yy158;
+ default: goto yy147;
+ }
+yy158: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy156;
+ default: goto yy159;
+ }
+yy159: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy147;
+ }
+}
+#line 716 "token.re"
+
+
+ }
+
+
+DoubleQuote:
+ {
+ int keep_nl = 1;
+ int qidx = 0;
+ int qcapa = 100;
+ char *qstr = S_ALLOC_N( char, qcapa );
+
+DoubleQuote2:
+ YYTOKEN = YYCURSOR;
+
+
+
+#line 1901 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy160;
+ ++YYCURSOR;
+yy160:
+ if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy167;
+ case 0x0A: goto yy162;
+ case 0x0D: goto yy164;
+ case '"': goto yy169;
+ case '\\': goto yy166;
+ default: goto yy170;
+ }
+yy162: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy184;
+yy163:
+#line 734 "token.re"
+{ int indt_len;
+ int nl_count = 0;
+ SyckLevel *lvl;
+ GOBBLE_UP_YAML_INDENT( indt_len, YYTOKEN );
+ lvl = CURRENT_LEVEL();
+
+ if ( lvl->status != syck_lvl_str )
+ {
+ ADD_LEVEL( indt_len, syck_lvl_str );
+ }
+ else if ( indt_len < lvl->spaces )
+ {
+ /* FIXME */
+ }
+
+ if ( keep_nl == 1 )
+ {
+ while ( YYTOKEN < YYCURSOR )
+ {
+ int nl_len = newline_len( YYTOKEN++ );
+ if ( nl_len )
+ {
+ nl_count++;
+ YYTOKEN += nl_len - 1;
+ }
+ }
+ if ( nl_count <= 1 )
+ {
+ QUOTECAT(qstr, qcapa, qidx, ' ');
+ }
+ else
+ {
+ int i;
+ for ( i = 0; i < nl_count - 1; i++ )
+ {
+ QUOTECAT(qstr, qcapa, qidx, '\n');
+ }
+ }
+ }
+
+ keep_nl = 1;
+ goto DoubleQuote2;
+ }
+#line 1966 "<stdout>"
+yy164: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy183;
+ default: goto yy165;
+ }
+yy165:
+#line 820 "token.re"
+{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
+ goto DoubleQuote2;
+ }
+#line 1977 "<stdout>"
+yy166: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case 0x0A: goto yy174;
+ case 0x0D: goto yy176;
+ case ' ': goto yy171;
+ case '"': case '0': case '\\': case 'a':
+ case 'b': case 'e':
+ case 'f': case 'n': case 'r': case 't': case 'v': goto yy178;
+ case 'x': goto yy177;
+ default: goto yy165;
+ }
+yy167: ++YYCURSOR;
+ goto yy168;
+yy168:
+#line 797 "token.re"
+{ SyckLevel *lvl;
+ SyckNode *n = syck_alloc_str();
+ lvl = CURRENT_LEVEL();
+
+ if ( lvl->status == syck_lvl_str )
+ {
+ POP_LEVEL();
+ }
+ if ( ((SyckParser *)parser)->taguri_expansion == 1 )
+ {
+ n->type_id = syck_taguri( YAML_DOMAIN, "str", 3 );
+ }
+ else
+ {
+ n->type_id = syck_strndup( "str", 3 );
+ }
+ n->data.str->ptr = qstr;
+ n->data.str->len = qidx;
+ n->data.str->style = scalar_2quote;
+ sycklval->nodeData = n;
+ return YAML_PLAIN;
+ }
+#line 2016 "<stdout>"
+yy169: yych = *++YYCURSOR;
+ goto yy168;
+yy170: yych = *++YYCURSOR;
+ goto yy165;
+yy171: ++YYCURSOR;
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ goto yy172;
+yy172: switch(yych){
+ case 0x0A: goto yy174;
+ case 0x0D: goto yy176;
+ case ' ': goto yy171;
+ default: goto yy173;
+ }
+yy173: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy163;
+ case 1: goto yy165;
+ }
+yy174: ++YYCURSOR;
+ goto yy175;
+yy175:
+#line 792 "token.re"
+{ keep_nl = 0;
+ YYCURSOR--;
+ goto DoubleQuote2;
+ }
+#line 2044 "<stdout>"
+yy176: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy174;
+ default: goto yy173;
+ }
+yy177: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f': goto yy180;
+ default: goto yy173;
+ }
+yy178: ++YYCURSOR;
+ goto yy179;
+yy179:
+#line 778 "token.re"
+{ char ch = *( YYCURSOR - 1 );
+ QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
+ goto DoubleQuote2;
+ }
+#line 2082 "<stdout>"
+yy180: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f': goto yy181;
+ default: goto yy173;
+ }
+yy181: ++YYCURSOR;
+ goto yy182;
+yy182:
+#line 783 "token.re"
+{ long ch;
+ char *chr_text = syck_strndup( YYTOKEN, 4 );
+ chr_text[0] = '0';
+ ch = strtol( chr_text, NULL, 16 );
+ free( chr_text );
+ QUOTECAT(qstr, qcapa, qidx, ch);
+ goto DoubleQuote2;
+ }
+#line 2119 "<stdout>"
+yy183: yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy184;
+yy184: switch(yych){
+ case 0x0A: case ' ': goto yy183;
+ case 0x0D: goto yy185;
+ default: goto yy163;
+ }
+yy185: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy183;
+ default: goto yy173;
+ }
+}
+#line 824 "token.re"
+
+ }
+
+TransferMethod:
+ {
+ int qidx = 0;
+ int qcapa = 100;
+ char *qstr = S_ALLOC_N( char, qcapa );
+
+TransferMethod2:
+ YYTOKTMP = YYCURSOR;
+
+
+#line 2152 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy186;
+ ++YYCURSOR;
+yy186:
+ if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy188;
+ case 0x0A: goto yy190;
+ case 0x0D: goto yy192;
+ case ' ': goto yy191;
+ case '\\': goto yy194;
+ default: goto yy195;
+ }
+yy188: ++YYCURSOR;
+ goto yy189;
+yy189:
+#line 838 "token.re"
+{ SyckLevel *lvl;
+ YYCURSOR = YYTOKTMP;
+ if ( YYCURSOR == YYTOKEN + 1 )
+ {
+ free( qstr );
+ return YAML_ITRANSFER;
+ }
+
+ lvl = CURRENT_LEVEL();
+
+ /*
+ * URL Prefixing
+ */
+ if ( *qstr == '^' )
+ {
+ sycklval->name = S_ALLOC_N( char, qidx + strlen( lvl->domain ) );
+ sycklval->name[0] = '\0';
+ strcat( sycklval->name, lvl->domain );
+ strncat( sycklval->name, qstr + 1, qidx - 1 );
+ free( qstr );
+ }
+ else
+ {
+ char *carat = qstr;
+ char *qend = qstr + qidx;
+ while ( (++carat) < qend )
+ {
+ if ( *carat == '^' )
+ break;
+ }
+
+ if ( carat < qend )
+ {
+ free( lvl->domain );
+ lvl->domain = syck_strndup( qstr, carat - qstr );
+ sycklval->name = S_ALLOC_N( char, ( qend - carat ) + strlen( lvl->domain ) );
+ sycklval->name[0] = '\0';
+ strcat( sycklval->name, lvl->domain );
+ strncat( sycklval->name, carat + 1, ( qend - carat ) - 1 );
+ free( qstr );
+ }
+ else
+ {
+ sycklval->name = qstr;
+ }
+ }
+
+ return YAML_TRANSFER;
+ }
+#line 2222 "<stdout>"
+yy190: yych = *++YYCURSOR;
+ goto yy189;
+yy191: yych = *++YYCURSOR;
+ goto yy204;
+yy192: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy188;
+ default: goto yy193;
+ }
+yy193:
+#line 905 "token.re"
+{ QUOTECAT(qstr, qcapa, qidx, *(YYCURSOR - 1));
+ goto TransferMethod2;
+ }
+#line 2237 "<stdout>"
+yy194: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '"': case '0': case '\\': case 'a':
+ case 'b': case 'e':
+ case 'f': case 'n': case 'r': case 't': case 'v': goto yy198;
+ case 'x': goto yy196;
+ default: goto yy193;
+ }
+yy195: yych = *++YYCURSOR;
+ goto yy193;
+yy196: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f': goto yy200;
+ default: goto yy197;
+ }
+yy197: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy193;
+ }
+yy198: ++YYCURSOR;
+ goto yy199;
+yy199:
+#line 891 "token.re"
+{ char ch = *( YYCURSOR - 1 );
+ QUOTECAT(qstr, qcapa, qidx, escape_seq( ch ));
+ goto TransferMethod2;
+ }
+#line 2285 "<stdout>"
+yy200: yych = *++YYCURSOR;
+ switch(yych){
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': case 'A':
+ case 'B':
+ case 'C':
+ case 'D':
+ case 'E':
+ case 'F': case 'a':
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'e':
+ case 'f': goto yy201;
+ default: goto yy197;
+ }
+yy201: ++YYCURSOR;
+ goto yy202;
+yy202:
+#line 896 "token.re"
+{ long ch;
+ char *chr_text = syck_strndup( YYTOKTMP, 4 );
+ chr_text[0] = '0';
+ ch = strtol( chr_text, NULL, 16 );
+ free( chr_text );
+ QUOTECAT(qstr, qcapa, qidx, ch);
+ goto TransferMethod2;
+ }
+#line 2322 "<stdout>"
+yy203: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy204;
+yy204: switch(yych){
+ case ' ': goto yy203;
+ default: goto yy189;
+ }
+}
+#line 910 "token.re"
+
+ }
+
+ScalarBlock:
+ {
+ int qidx = 0;
+ int qcapa = 100;
+ char *qstr = S_ALLOC_N( char, qcapa );
+ int blockType = 0;
+ int nlDoWhat = 0;
+ int lastIndent = 0;
+ int forceIndent = -1;
+ char *yyt = YYTOKEN;
+ SyckLevel *lvl = CURRENT_LEVEL();
+ int parentIndent = -1;
+
+ switch ( *yyt )
+ {
+ case '|': blockType = BLOCK_LIT; break;
+ case '>': blockType = BLOCK_FOLD; break;
+ }
+
+ while ( ++yyt <= YYCURSOR )
+ {
+ if ( *yyt == '-' )
+ {
+ nlDoWhat = NL_CHOMP;
+ }
+ else if ( *yyt == '+' )
+ {
+ nlDoWhat = NL_KEEP;
+ }
+ else if ( isdigit( *yyt ) )
+ {
+ forceIndent = strtol( yyt, NULL, 10 );
+ }
+ }
+
+ qstr[0] = '\0';
+ YYTOKEN = YYCURSOR;
+
+ScalarBlock2:
+ YYTOKEN = YYCURSOR;
+
+
+#line 2378 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy205;
+ ++YYCURSOR;
+yy205:
+ if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy213;
+ case 0x0A: goto yy207;
+ case 0x0D: goto yy209;
+ case '#': goto yy211;
+ case '-': goto yy215;
+ default: goto yy216;
+ }
+yy207: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy226;
+yy208:
+#line 956 "token.re"
+{ char *pacer;
+ char *tok = YYTOKEN;
+ int indt_len = 0, nl_count = 0, fold_nl = 0, nl_begin = 0;
+ GOBBLE_UP_YAML_INDENT( indt_len, tok );
+ lvl = CURRENT_LEVEL();
+
+ if ( lvl->status != syck_lvl_block )
+ {
+ GET_TRUE_YAML_INDENT(parentIndent);
+ if ( forceIndent > 0 ) forceIndent += parentIndent;
+ if ( indt_len > parentIndent )
+ {
+ int new_spaces = forceIndent > 0 ? forceIndent : indt_len;
+ ADD_LEVEL( new_spaces, syck_lvl_block );
+ lastIndent = indt_len - new_spaces;
+ nl_begin = 1;
+ lvl = CURRENT_LEVEL();
+ }
+ else
+ {
+ YYCURSOR = YYTOKEN;
+ RETURN_YAML_BLOCK();
+ }
+ }
+
+ /*
+ * Fold only in the event of two lines being on the leftmost
+ * indentation.
+ */
+ if ( blockType == BLOCK_FOLD && lastIndent == 0 && ( indt_len - lvl->spaces ) == 0 )
+ {
+ fold_nl = 1;
+ }
+
+ pacer = YYTOKEN;
+ while ( pacer < YYCURSOR )
+ {
+ int nl_len = newline_len( pacer++ );
+ if ( nl_len )
+ {
+ nl_count++;
+ pacer += nl_len - 1;
+ }
+ }
+
+ if ( fold_nl == 1 || nl_begin == 1 )
+ {
+ nl_count--;
+ }
+
+ if ( nl_count < 1 && nl_begin == 0 )
+ {
+ QUOTECAT(qstr, qcapa, qidx, ' ');
+ }
+ else
+ {
+ int i;
+ for ( i = 0; i < nl_count; i++ )
+ {
+ QUOTECAT(qstr, qcapa, qidx, '\n');
+ }
+ }
+
+ lastIndent = indt_len - lvl->spaces;
+ YYCURSOR -= lastIndent;
+
+ if ( indt_len < lvl->spaces )
+ {
+ POP_LEVEL();
+ YYCURSOR = YYTOKEN;
+ RETURN_YAML_BLOCK();
+ }
+ goto ScalarBlock2;
+ }
+#line 2474 "<stdout>"
+yy209: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy225;
+ default: goto yy210;
+ }
+yy210:
+#line 1070 "token.re"
+{ QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
+ goto ScalarBlock2;
+ }
+#line 2485 "<stdout>"
+yy211: ++YYCURSOR;
+ goto yy212;
+yy212:
+#line 1032 "token.re"
+{ lvl = CURRENT_LEVEL();
+ if ( lvl->status != syck_lvl_block )
+ {
+ eat_comments( parser );
+ YYTOKEN = YYCURSOR;
+ }
+ else
+ {
+ QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
+ }
+ goto ScalarBlock2;
+ }
+#line 2502 "<stdout>"
+yy213: ++YYCURSOR;
+ goto yy214;
+yy214:
+#line 1046 "token.re"
+{ YYCURSOR--;
+ POP_LEVEL();
+ RETURN_YAML_BLOCK();
+ }
+#line 2511 "<stdout>"
+yy215: yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ switch(yych){
+ case '-': goto yy217;
+ default: goto yy210;
+ }
+yy216: yych = *++YYCURSOR;
+ goto yy210;
+yy217: yych = *++YYCURSOR;
+ switch(yych){
+ case '-': goto yy219;
+ default: goto yy218;
+ }
+yy218: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy208;
+ case 1: goto yy210;
+ }
+yy219: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy220;
+ case 0x0D: goto yy224;
+ case ' ': goto yy222;
+ default: goto yy218;
+ }
+yy220: ++YYCURSOR;
+ goto yy221;
+yy221:
+#line 1051 "token.re"
+{ if ( YYTOKEN == YYLINEPTR )
+ {
+ if ( blockType == BLOCK_FOLD && qidx > 0 )
+ {
+ qidx -= 1;
+ }
+ QUOTECAT(qstr, qcapa, qidx, '\n');
+ POP_LEVEL();
+ YYCURSOR = YYTOKEN;
+ RETURN_YAML_BLOCK();
+ }
+ else
+ {
+ QUOTECAT(qstr, qcapa, qidx, *YYTOKEN);
+ YYCURSOR = YYTOKEN + 1;
+ goto ScalarBlock2;
+ }
+ }
+#line 2559 "<stdout>"
+yy222: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy223;
+yy223: switch(yych){
+ case ' ': goto yy222;
+ default: goto yy221;
+ }
+yy224: yych = *++YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy220;
+ default: goto yy218;
+ }
+yy225: yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy226;
+yy226: switch(yych){
+ case 0x0A: case ' ': goto yy225;
+ case 0x0D: goto yy227;
+ default: goto yy208;
+ }
+yy227: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy225;
+ default: goto yy218;
+ }
+}
+#line 1075 "token.re"
+
+ }
+
+ return 0;
+
+}
+
+void
+eat_comments( SyckParser *parser )
+{
+Comment:
+ {
+ YYTOKEN = YYCURSOR;
+
+
+#line 2607 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
+ goto yy228;
+ ++YYCURSOR;
+yy228:
+ if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x00: goto yy230;
+ case 0x0A: goto yy232;
+ case 0x0D: goto yy233;
+ default: goto yy235;
+ }
+yy230: ++YYCURSOR;
+ goto yy231;
+yy231:
+#line 1091 "token.re"
+{ YYCURSOR = YYTOKEN;
+ return;
+ }
+#line 2629 "<stdout>"
+yy232: yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy237;
+yy233: ++YYCURSOR;
+ switch((yych = *YYCURSOR)) {
+ case 0x0A: goto yy236;
+ default: goto yy234;
+ }
+yy234:
+#line 1095 "token.re"
+{ goto Comment;
+ }
+#line 2642 "<stdout>"
+yy235: yych = *++YYCURSOR;
+ goto yy234;
+yy236: yyaccept = 0;
+ YYMARKER = ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ goto yy237;
+yy237: switch(yych){
+ case 0x0A: goto yy236;
+ case 0x0D: goto yy238;
+ default: goto yy231;
+ }
+yy238: ++YYCURSOR;
+ if(YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ switch(yych){
+ case 0x0A: goto yy236;
+ default: goto yy239;
+ }
+yy239: YYCURSOR = YYMARKER;
+ switch(yyaccept){
+ case 0: goto yy231;
+ }
+}
+#line 1098 "token.re"
+
+
+ }
+
+}
+
+char
+escape_seq( char ch )
+{
+ switch ( ch )
+ {
+ case '0': return '\0';
+ case 'a': return 7;
+ case 'b': return '\010';
+ case 'e': return '\033';
+ case 'f': return '\014';
+ case 'n': return '\n';
+ case 'r': return '\015';
+ case 't': return '\t';
+ case 'v': return '\013';
+ default: return ch;
+ }
+}
+
+int
+is_newline( char *ptr )
+{
+ return newline_len( ptr );
+}
+
+int
+newline_len( char *ptr )
+{
+ if ( *ptr == '\n' )
+ return 1;
+
+ if ( *ptr == '\r' && *( ptr + 1 ) == '\n' )
+ return 2;
+
+ return 0;
+}
+
+int
+syckwrap()
+{
+ return 1;
+}
+
+void
+syckerror( const char *msg )
+{
+ if ( syck_parser_ptr->error_handler == NULL )
+ syck_parser_ptr->error_handler = syck_default_error_handler;
+
+ syck_parser_ptr->root = syck_parser_ptr->root_on_error;
+ (syck_parser_ptr->error_handler)(syck_parser_ptr, msg);
+}
+
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
new file mode 100644
index 0000000000..e5cc4e0779
--- /dev/null
+++ b/ext/syck/yaml2byte.c
@@ -0,0 +1,259 @@
+/*
+ * yaml2byte.c
+ *
+ * $Author$
+ *
+ * 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 <syck.h>
+#include <assert.h>
+#define YAMLBYTE_UTF8
+#include "yamlbyte.h"
+
+#include <stdio.h>
+#define TRACE0(a) \
+ do { printf(a); printf("\n"); fflush(stdout); } while(0)
+#define TRACE1(a,b) \
+ do { printf(a,b); printf("\n"); fflush(stdout); } while(0)
+#define TRACE2(a,b,c) \
+ do { printf(a,b,c); printf("\n"); fflush(stdout); } while(0)
+#define TRACE3(a,b,c,d) \
+ do { printf(a,b,c,d); printf("\n"); fflush(stdout); } while(0)
+
+/* Reinvent the wheel... */
+#define CHUNKSIZE 64
+#define HASH ((long)0xCAFECAFE)
+typedef struct {
+ long hash;
+ char *buffer;
+ long length;
+ long remaining;
+ int printed;
+} bytestring_t;
+bytestring_t *bytestring_alloc(void) {
+ bytestring_t *ret;
+ /*TRACE0("bytestring_alloc()");*/
+ ret = S_ALLOC(bytestring_t);
+ ret->hash = HASH;
+ ret->length = CHUNKSIZE;
+ ret->remaining = ret->length;
+ ret->buffer = S_ALLOC_N(char, ret->length + 1 );
+ ret->buffer[0] = 0;
+ ret->printed = 0;
+ return ret;
+}
+void bytestring_append(bytestring_t *str, char code,
+ char *start, char *finish)
+{
+ long grow;
+ long length = 2; /* CODE + LF */
+ char *curr;
+ assert(str && HASH == str->hash);
+ /*TRACE0("bytestring_append()");*/
+ if(start) {
+ if(!finish)
+ finish = start + strlen(start);
+ length += (finish-start);
+ }
+ if(length > str->remaining) {
+ grow = (length - str->remaining) + CHUNKSIZE;
+ str->remaining += grow;
+ str->length += grow;
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
+ assert(str->buffer);
+ }
+ curr = str->buffer + (str->length - str->remaining);
+ *curr = code;
+ curr += 1;
+ if(start)
+ while(start < finish)
+ *curr ++ = *start ++;
+ *curr = '\n';
+ curr += 1;
+ *curr = 0;
+ str->remaining = str->remaining - length;
+ assert( (str->buffer + str->length) - str->remaining );
+}
+void bytestring_extend(bytestring_t *str, bytestring_t *ext)
+{
+ char *from;
+ char *curr;
+ char *stop;
+ long grow;
+ long length;
+ assert(str && HASH == str->hash);
+ assert(ext && HASH == ext->hash);
+ if(ext->printed) {
+ assert(ext->buffer[0] ==YAMLBYTE_ANCHOR);
+ curr = ext->buffer;
+ while( '\n' != *curr)
+ curr++;
+ bytestring_append(str, YAMLBYTE_ALIAS, ext->buffer + 1, curr);
+ } else {
+ ext->printed = 1;
+ length = (ext->length - ext->remaining);
+ if(length > str->remaining) {
+ grow = (length - str->remaining) + CHUNKSIZE;
+ str->remaining += grow;
+ str->length += grow;
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
+ }
+ curr = str->buffer + (str->length - str->remaining);
+ from = ext->buffer;
+ stop = ext->buffer + length;
+ while( from < stop )
+ *curr ++ = *from ++;
+ *curr = 0;
+ str->remaining = str->remaining - length;
+ assert( (str->buffer + str->length) - str->remaining );
+ }
+}
+
+/* convert SyckNode into yamlbyte_buffer_t objects */
+SYMID
+syck_yaml2byte_handler(p, n)
+ SyckParser *p;
+ SyckNode *n;
+{
+ SYMID oid;
+ long i;
+ char ch;
+ char nextcode;
+ char *start;
+ char *current;
+ 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);
+ if ( n->type_id )
+ {
+ if ( p->taguri_expansion )
+ {
+ bytestring_append(val,YAMLBYTE_TRANSFER, n->type_id, NULL);
+ }
+ else
+ {
+ char *type_tag = S_ALLOC_N( char, strlen( n->type_id ) + 1 );
+ type_tag[0] = '\0';
+ strcat( type_tag, "!" );
+ strcat( type_tag, n->type_id );
+ bytestring_append( val, YAMLBYTE_TRANSFER, type_tag, NULL);
+ S_FREE(type_tag);
+ }
+ }
+ switch (n->kind)
+ {
+ case syck_str_kind:
+ nextcode = YAMLBYTE_SCALAR;
+ start = n->data.str->ptr;
+ finish = start + n->data.str->len - 1;
+ current = start;
+ /*TRACE2("SCALAR: %s %d", start, n->data.str->len); */
+ while(1) {
+ ch = *current;
+ if('\n' == ch || 0 == ch || current > finish) {
+ if(current >= start) {
+ bytestring_append(val, nextcode, start, current);
+ nextcode = YAMLBYTE_CONTINUE;
+ }
+ start = current + 1;
+ if(current > finish)
+ {
+ break;
+ }
+ else if('\n' == ch )
+ {
+ bytestring_append(val,YAMLBYTE_NEWLINE,NULL,NULL);
+ }
+ else if(0 == ch)
+ {
+ bytestring_append(val,YAMLBYTE_NULLCHAR,NULL,NULL);
+ }
+ else
+ {
+ assert("oops");
+ }
+ }
+ current += 1;
+ }
+ break;
+ case syck_seq_kind:
+ bytestring_append(val,YAMLBYTE_SEQUENCE,NULL,NULL);
+ for ( i = 0; i < n->data.list->idx; i++ )
+ {
+ oid = syck_seq_read( n, i );
+ if (syck_lookup_sym( p, oid, &data )) sav = data;
+ bytestring_extend(val, sav);
+ }
+ bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
+ break;
+ case syck_map_kind:
+ bytestring_append(val,YAMLBYTE_MAPPING,NULL,NULL);
+ 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;
+ bytestring_extend(val, sav);
+ oid = syck_map_read( n, map_value, i );
+ if (syck_lookup_sym( p, oid, &data )) sav = data;
+ bytestring_extend(val, sav);
+ }
+ bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
+ break;
+ }
+ oid = syck_add_sym( p, (char *) val );
+ /*TRACE1("Saving: %s", val->buffer );*/
+ return oid;
+}
+
+char *
+syck_yaml2byte(char *yamlstr)
+{
+ SYMID oid;
+ char *ret;
+ bytestring_t *sav;
+ void *data;
+
+ SyckParser *parser = syck_new_parser();
+ syck_parser_str_auto( parser, yamlstr, NULL );
+ syck_parser_handler( parser, syck_yaml2byte_handler );
+ syck_parser_error_handler( parser, NULL );
+ syck_parser_implicit_typing( parser, 1 );
+ syck_parser_taguri_expansion( parser, 1 );
+ oid = syck_parse( parser );
+
+ if ( syck_lookup_sym( parser, oid, &data ) ) {
+ sav = data;
+ ret = S_ALLOC_N( char, strlen( sav->buffer ) + 3 );
+ ret[0] = '\0';
+ strcat( ret, "D\n" );
+ strcat( ret, sav->buffer );
+ }
+ else
+ {
+ ret = NULL;
+ }
+
+ syck_free_parser( parser );
+ return ret;
+}
+
+#ifdef TEST_YBEXT
+#include <stdio.h>
+int main() {
+ char *yaml = "test: 1\nand: \"with new\\nline\\n\"\nalso: &3 three\nmore: *3";
+ printf("--- # YAML \n");
+ printf(yaml);
+ printf("\n...\n");
+ printf(syck_yaml2byte(yaml));
+ return 0;
+}
+#endif
+
diff --git a/ext/syck/yamlbyte.h b/ext/syck/yamlbyte.h
new file mode 100644
index 0000000000..16ca3d70de
--- /dev/null
+++ b/ext/syck/yamlbyte.h
@@ -0,0 +1,171 @@
+/* yamlbyte.h
+ *
+ * The YAML bytecode "C" interface header file. See the YAML bytecode
+ * reference for bytecode sequence rules and for the meaning of each
+ * bytecode.
+ */
+
+#ifndef YAMLBYTE_H
+#define YAMLBYTE_H
+#include <stddef.h>
+
+/* define what a character is */
+typedef unsigned char yamlbyte_utf8_t;
+typedef unsigned short yamlbyte_utf16_t;
+#ifdef YAMLBYTE_UTF8
+ #ifdef YAMLBYTE_UTF16
+ #error Must only define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
+ #endif
+ typedef yamlbyte_utf8_t yamlbyte_char_t;
+#else
+ #ifdef YAMLBYTE_UTF16
+ typedef yamlbyte_utf16_t yamlbyte_char_t;
+ #else
+ #error Must define YAMLBYTE_UTF8 or YAMLBYTE_UTF16
+ #endif
+#endif
+
+/* specify list of bytecodes */
+#define YAMLBYTE_FINISH ((yamlbyte_char_t) 0)
+#define YAMLBYTE_DOCUMENT ((yamlbyte_char_t)'D')
+#define YAMLBYTE_DIRECTIVE ((yamlbyte_char_t)'V')
+#define YAMLBYTE_PAUSE ((yamlbyte_char_t)'P')
+#define YAMLBYTE_MAPPING ((yamlbyte_char_t)'M')
+#define YAMLBYTE_SEQUENCE ((yamlbyte_char_t)'Q')
+#define YAMLBYTE_END_BRANCH ((yamlbyte_char_t)'E')
+#define YAMLBYTE_SCALAR ((yamlbyte_char_t)'S')
+#define YAMLBYTE_CONTINUE ((yamlbyte_char_t)'C')
+#define YAMLBYTE_NEWLINE ((yamlbyte_char_t)'N')
+#define YAMLBYTE_NULLCHAR ((yamlbyte_char_t)'Z')
+#define YAMLBYTE_ANCHOR ((yamlbyte_char_t)'A')
+#define YAMLBYTE_ALIAS ((yamlbyte_char_t)'R')
+#define YAMLBYTE_TRANSFER ((yamlbyte_char_t)'T')
+/* formatting bytecodes */
+#define YAMLBYTE_COMMENT ((yamlbyte_char_t)'c')
+#define YAMLBYTE_INDENT ((yamlbyte_char_t)'i')
+#define YAMLBYTE_STYLE ((yamlbyte_char_t)'s')
+/* other bytecodes */
+#define YAMLBYTE_LINE_NUMBER ((yamlbyte_char_t)'#')
+#define YAMLBYTE_WHOLE_SCALAR ((yamlbyte_char_t)'<')
+#define YAMLBYTE_NOTICE ((yamlbyte_char_t)'!')
+#define YAMLBYTE_SPAN ((yamlbyte_char_t)')')
+#define YAMLBYTE_ALLOC ((yamlbyte_char_t)'@')
+
+/* second level style bytecodes, ie "s>" */
+#define YAMLBYTE_FLOW ((yamlbyte_char_t)'>')
+#define YAMLBYTE_LITERAL ((yamlbyte_char_t)'|')
+#define YAMLBYTE_BLOCK ((yamlbyte_char_t)'b')
+#define YAMLBYTE_PLAIN ((yamlbyte_char_t)'p')
+#define YAMLBYTE_INLINE_MAPPING ((yamlbyte_char_t)'{')
+#define YAMLBYTE_INLINE_SEQUENCE ((yamlbyte_char_t)'[')
+#define YAMLBYTE_SINGLE_QUOTED ((yamlbyte_char_t)39)
+#define YAMLBYTE_DOUBLE_QUOTED ((yamlbyte_char_t)'"')
+
+/*
+ * The "C" API has two variants, one based on instructions,
+ * with events delivered via pointers; and the other one
+ * is character based where one or more instructions are
+ * serialized into a buffer.
+ *
+ * Note: In the instruction based API, WHOLE_SCALAR does
+ * not have the '<here' marshalling stuff.
+ */
+
+typedef void * yamlbyte_consumer_t;
+typedef void * yamlbyte_producer_t;
+
+/* push and pull APIs need a way to communicate results */
+typedef enum {
+ YAMLBYTE_OK = 0, /* proceed */
+ YAMLBYTE_E_MEMORY = 'M', /* could not allocate memory */
+ YAMLBYTE_E_READ = 'R', /* input stream read error */
+ YAMLBYTE_E_WRITE = 'W', /* output stream write error */
+ YAMLBYTE_E_OTHER = '?', /* some other error condition */
+ YAMLBYTE_E_PARSE = 'P', /* parse error, check bytecodes */
+ YAMLBYTE_MAX
+} yamlbyte_result_t;
+
+typedef const yamlbyte_char_t *yamlbyte_buff_t;
+
+/*
+ * The "Instruction" API
+ */
+
+typedef struct yaml_instruction {
+ yamlbyte_char_t bytecode;
+ yamlbyte_buff_t start;
+ yamlbyte_buff_t finish; /* open range, *finish is _not_ part */
+} *yamlbyte_inst_t;
+
+/* producer pushes the instruction with one bytecode event to the
+ * consumer; if the consumer's result is not YAMLBYTE_OK, then
+ * the producer should stop */
+typedef
+ yamlbyte_result_t
+ (*yamlbyte_push_t)(
+ yamlbyte_consumer_t self,
+ yamlbyte_inst_t inst
+ );
+
+/* consumer pulls a bytecode instruction from the producer; in this
+ * case the instruction (and is buffer) are owned by the producer and
+ * will remain valid till the pull function is called once again;
+ * if the instruction is NULL, then there are no more results; and
+ * it is important to call the pull function till it returns NULL so
+ * that the producer can clean up its memory allocations */
+typedef
+ yamlbyte_result_t
+ (*yamlbyte_pull_t)(
+ yamlbyte_producer_t self,
+ yamlbyte_inst_t *inst /* to be filled in by the producer */
+ );
+
+/*
+ * Buffer based API
+ */
+
+/* producer pushes a null terminated buffer filled with one or more
+ * bytecode events to the consumer; if the consumer's result is not
+ * YAMLBYTE_OK, then the producer should stop */
+typedef
+ yamlbyte_result_t
+ (*yamlbyte_pushbuff_t)(
+ yamlbyte_consumer_t self,
+ yamlbyte_buff_t buff
+ );
+
+/* consumer pulls bytecode events from the producer; in this case
+ * the buffer is owned by the producer, and will remain valid till
+ * the pull function is called once again; if the buffer pointer
+ * is set to NULL, then there are no more results; it is important
+ * to call the pull function till it returns NULL so that the
+ * producer can clean up its memory allocations */
+typedef
+ yamlbyte_result_t
+ (*yamlbyte_pullbuff_t)(
+ yamlbyte_producer_t self,
+ yamlbyte_buff_t *buff /* to be filled in by the producer */
+ );
+
+/* convert a pull interface to a push interface; the reverse process
+ * requires threads and thus is language dependent */
+#define YAMLBYTE_PULL2PUSH(pull,producer,push,consumer,result) \
+ do { \
+ yamlbyte_pullbuff_t _pull = (pull); \
+ yamlbyte_pushbuff_t _push = (push); \
+ yamlbyte_result_t _result = YAMLBYTE_OK; \
+ yamlbyte_producer_t _producer = (producer); \
+ yamlbyte_consumer_t _consumer = (consumer); \
+ while(1) { \
+ yamlbyte_buff_t buff = NULL; \
+ _result = _pull(_producer,&buff); \
+ if(YAMLBYTE_OK != result || NULL == buff) \
+ break; \
+ _result = _push(_consumer,buff); \
+ if(YAMLBYTE_OK != result) \
+ break; \
+ } \
+ (result) = _result; \
+ } while(0)
+
+#endif
diff --git a/ext/syslog/.cvsignore b/ext/syslog/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/syslog/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/syslog/lib/syslog/logger.rb b/ext/syslog/lib/syslog/logger.rb
deleted file mode 100644
index a8d089a094..0000000000
--- a/ext/syslog/lib/syslog/logger.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-require 'syslog'
-require 'logger'
-
-##
-# Syslog::Logger is a Logger work-alike that logs via syslog instead of to a
-# file. You can use Syslog::Logger to aggregate logs between multiple
-# machines.
-#
-# By default, Syslog::Logger uses the program name 'ruby', but this can be
-# changed via the first argument to Syslog::Logger.new.
-#
-# NOTE! You can only set the Syslog::Logger program name when you initialize
-# Syslog::Logger for the first time. This is a limitation of the way
-# Syslog::Logger uses syslog (and in some ways, a limitation of the way
-# syslog(3) works). Attempts to change Syslog::Logger's program name after
-# the first initialization will be ignored.
-#
-# === Example
-#
-# The following will log to syslogd on your local machine:
-#
-# require 'syslog/logger'
-#
-# log = Syslog::Logger.new 'my_program'
-# log.info 'this line will be logged via syslog(3)'
-#
-# You may need to perform some syslog.conf setup first. For a BSD machine add
-# the following lines to /etc/syslog.conf:
-#
-# !my_program
-# *.* /var/log/my_program.log
-#
-# Then touch /var/log/my_program.log and signal syslogd with a HUP
-# (killall -HUP syslogd, on FreeBSD).
-#
-# If you wish to have logs automatically roll over and archive, see the
-# newsyslog.conf(5) and newsyslog(8) man pages.
-
-class Syslog::Logger
- # Default formatter for log messages.
- class Formatter
- def call severity, time, progname, msg
- clean msg
- end
-
- private
-
- ##
- # Clean up messages so they're nice and pretty.
-
- def clean message
- message = message.to_s.strip
- message.gsub!(/\e\[[0-9;]*m/, '') # remove useless ansi color codes
- return message
- end
- end
-
- ##
- # The version of Syslog::Logger you are using.
-
- VERSION = '2.0'
-
- ##
- # Maps Logger warning types to syslog(3) warning types.
- #
- # Messages from ruby applications are not considered as critical as messages
- # from other system daemons using syslog(3), so most messages are reduced by
- # one level. For example, a fatal message for ruby's Logger is considered
- # an error for syslog(3).
-
- LEVEL_MAP = {
- ::Logger::UNKNOWN => Syslog::LOG_ALERT,
- ::Logger::FATAL => Syslog::LOG_ERR,
- ::Logger::ERROR => Syslog::LOG_WARNING,
- ::Logger::WARN => Syslog::LOG_NOTICE,
- ::Logger::INFO => Syslog::LOG_INFO,
- ::Logger::DEBUG => Syslog::LOG_DEBUG,
- }
-
- ##
- # Returns the internal Syslog object that is initialized when the
- # first instance is created.
-
- def self.syslog
- @@syslog
- end
-
- ##
- # Specifies the internal Syslog object to be used.
-
- def self.syslog= syslog
- @@syslog = syslog
- end
-
- ##
- # Builds a methods for level +meth+.
-
- def self.make_methods meth
- level = ::Logger.const_get(meth.upcase)
- eval <<-EOM, nil, __FILE__, __LINE__ + 1
- def #{meth}(message = nil, &block)
- add(#{level}, message, &block)
- end
-
- def #{meth}?
- @level <= #{level}
- end
- EOM
- end
-
- ##
- # :method: unknown
- #
- # Logs a +message+ at the unknown (syslog alert) log level, or logs the
- # message returned from the block.
-
- ##
- # :method: fatal
- #
- # Logs a +message+ at the fatal (syslog err) log level, or logs the message
- # returned from the block.
-
- ##
- # :method: error
- #
- # Logs a +message+ at the error (syslog warning) log level, or logs the
- # message returned from the block.
-
- ##
- # :method: warn
- #
- # Logs a +message+ at the warn (syslog notice) log level, or logs the
- # message returned from the block.
-
- ##
- # :method: info
- #
- # Logs a +message+ at the info (syslog info) log level, or logs the message
- # returned from the block.
-
- ##
- # :method: debug
- #
- # Logs a +message+ at the debug (syslog debug) log level, or logs the
- # message returned from the block.
-
- Logger::Severity::constants.each do |severity|
- make_methods severity.downcase
- end
-
- ##
- # Log level for Logger compatibility.
-
- attr_accessor :level
-
- # Logging formatter, as a +Proc+ that will take four arguments and
- # return the formatted message. The arguments are:
- #
- # +severity+:: The Severity of the log message.
- # +time+:: A Time instance representing when the message was logged.
- # +progname+:: The #progname configured, or passed to the logger method.
- # +msg+:: The _Object_ the user passed to the log message; not necessarily a
- # String.
- #
- # The block should return an Object that can be written to the logging
- # device via +write+. The default formatter is used when no formatter is
- # set.
- attr_accessor :formatter
-
- ##
- # Fills in variables for Logger compatibility. If this is the first
- # instance of Syslog::Logger, +program_name+ may be set to change the logged
- # program name.
- #
- # Due to the way syslog works, only one program name may be chosen.
-
- def initialize program_name = 'ruby'
- @level = ::Logger::DEBUG
- @formatter = Formatter.new
-
- @@syslog ||= Syslog.open(program_name)
- end
-
- ##
- # Almost duplicates Logger#add. +progname+ is ignored.
-
- def add severity, message = nil, progname = nil, &block
- severity ||= ::Logger::UNKNOWN
- @level <= severity and
- @@syslog.log LEVEL_MAP[severity], '%s', formatter.call(severity, Time.now, progname, (message || block.call))
- true
- end
-end
-
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index c14f05f34d..2c91c9fa08 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -2,7 +2,6 @@
* UNIX Syslog extension for Ruby
* Amos Gouaux, University of Texas at Dallas
* <amos+ruby@utdallas.edu>
- * Documented by mathew <meta@pobox.com>
*
* $RoughId: syslog.c,v 1.21 2002/02/25 12:21:17 knu Exp $
* $Id$
@@ -13,21 +12,7 @@
#include <syslog.h>
/* Syslog class */
-static VALUE mSyslog;
-/*
- * Module holding all Syslog constants. See Syslog::log and
- * Syslog::open for constant descriptions.
- */
-static VALUE mSyslogConstants;
-/* Module holding Syslog option constants */
-static VALUE mSyslogOption;
-/* Module holding Syslog facility constants */
-static VALUE mSyslogFacility;
-/* Module holding Syslog level constants */
-static VALUE mSyslogLevel;
-/* Module holding Syslog utility macros */
-static VALUE mSyslogMacros;
-
+static VALUE mSyslog, mSyslogConstants;
static const char *syslog_ident = NULL;
static int syslog_options = -1, syslog_facility = -1, syslog_mask = -1;
static int syslog_opened = 0;
@@ -51,9 +36,7 @@ static void syslog_write(int pri, int argc, VALUE *argv)
syslog(pri, "%s", RSTRING_PTR(str));
}
-/* Closes the syslog facility.
- * Raises a runtime exception if it is not open.
- */
+/* Syslog module methods */
static VALUE mSyslog_close(VALUE self)
{
rb_secure(4);
@@ -63,7 +46,7 @@ static VALUE mSyslog_close(VALUE self)
closelog();
- xfree((void *)syslog_ident);
+ free((void *)syslog_ident);
syslog_ident = NULL;
syslog_options = syslog_facility = syslog_mask = -1;
syslog_opened = 0;
@@ -71,84 +54,6 @@ static VALUE mSyslog_close(VALUE self)
return Qnil;
}
-/* call-seq:
- * open(ident, options, facility) => syslog
- *
- * :yields: syslog
- *
- * Open the syslog facility.
- * Raises a runtime exception if it is already open.
- *
- * Can be called with or without a code block. If called with a block, the
- * Syslog object created is passed to the block.
- *
- * If the syslog is already open, raises a RuntimeError.
- *
- * +ident+ is a String which identifies the calling program.
- *
- * +options+ is the logical OR of any of the following:
- *
- * LOG_CONS:: If there is an error while sending to the system logger,
- * write directly to the console instead.
- *
- * LOG_NDELAY:: Open the connection now, rather than waiting for the first
- * message to be written.
- *
- * LOG_NOWAIT:: Don't wait for any child processes created while logging
- * messages. (Has no effect on Linux.)
- *
- * LOG_ODELAY:: Opposite of LOG_NDELAY; wait until a message is sent before
- * opening the connection. (This is the default.)
- *
- * LOG_PERROR:: Print the message to stderr as well as sending it to syslog.
- * (Not in POSIX.1-2001.)
- *
- * LOG_PID:: Include the current process ID with each message.
- *
- * +facility+ describes the type of program opening the syslog, and is
- * the logical OR of any of the following which are defined for the host OS:
- *
- * LOG_AUTH:: Security or authorization. Deprecated, use LOG_AUTHPRIV
- * instead.
- *
- * LOG_AUTHPRIV:: Security or authorization messages which should be kept
- * private.
- *
- * LOG_CONSOLE:: System console message.
- *
- * LOG_CRON:: System task scheduler (cron or at).
- *
- * LOG_DAEMON:: A system daemon which has no facility value of its own.
- *
- * LOG_FTP:: An FTP server.
- *
- * LOG_KERN:: A kernel message (not sendable by user processes, so not of
- * much use to Ruby, but listed here for completeness).
- *
- * LOG_LPR:: Line printer subsystem.
- *
- * LOG_MAIL:: Mail delivery or transport subsystem.
- *
- * LOG_NEWS:: Usenet news system.
- *
- * LOG_NTP:: Network Time Protocol server.
- *
- * LOG_SECURITY:: General security message.
- *
- * LOG_SYSLOG:: Messages generated internally by syslog.
- *
- * LOG_USER:: Generic user-level message.
- *
- * LOG_UUCP:: UUCP subsystem.
- *
- * LOG_LOCAL0 to LOG_LOCAL7:: Locally-defined facilities.
- *
- * Example:
- *
- * Syslog.open("webrick", Syslog::LOG_PID,
- * Syslog::LOG_DAEMON | Syslog::LOG_LOCAL3)
- *
- */
static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
{
VALUE ident, opt, fac;
@@ -191,15 +96,6 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
return self;
}
-/* call-seq:
- * reopen(ident, options, facility) => syslog
- *
- * :yields: syslog
- *
- * Closes and then reopens the syslog.
- *
- * Arguments are the same as for open().
- */
static VALUE mSyslog_reopen(int argc, VALUE *argv, VALUE self)
{
mSyslog_close(self);
@@ -207,60 +103,31 @@ static VALUE mSyslog_reopen(int argc, VALUE *argv, VALUE self)
return mSyslog_open(argc, argv, self);
}
-/* call-seq:
- * opened?
- *
- * Returns true if the syslog is open.
- */
static VALUE mSyslog_isopen(VALUE self)
{
return syslog_opened ? Qtrue : Qfalse;
}
-/* Returns the identity string used in the last call to open()
- */
static VALUE mSyslog_ident(VALUE self)
{
return syslog_opened ? rb_str_new2(syslog_ident) : Qnil;
}
-/* Returns the options bitmask used in the last call to open()
- */
static VALUE mSyslog_options(VALUE self)
{
return syslog_opened ? INT2NUM(syslog_options) : Qnil;
}
-/* Returns the facility number used in the last call to open()
- */
static VALUE mSyslog_facility(VALUE self)
{
return syslog_opened ? INT2NUM(syslog_facility) : Qnil;
}
-/* Returns the log priority mask in effect. The mask is not reset by opening
- * or closing syslog.
- */
static VALUE mSyslog_get_mask(VALUE self)
{
return syslog_opened ? INT2NUM(syslog_mask) : Qnil;
}
-/* call-seq:
- * mask=(priority_mask)
- *
- * Sets the log priority mask. A method LOG_UPTO is defined to make it easier
- * to set mask values. Example:
- *
- * Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_ERR)
- *
- * Alternatively, specific priorities can be selected and added together using
- * binary OR. Example:
- *
- * Syslog.mask = Syslog::LOG_MASK(Syslog::LOG_ERR) | Syslog::LOG_MASK(Syslog::LOG_CRIT)
- *
- * The priority mask persists through calls to open() and close().
- */
static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
{
rb_secure(4);
@@ -273,36 +140,6 @@ static VALUE mSyslog_set_mask(VALUE self, VALUE mask)
return mask;
}
-/* call-seq:
- * log(priority, format_string, *format_args)
- *
- * Log a message with the specified priority. Example:
- *
- * Syslog.log(Syslog::LOG_CRIT, "Out of disk space")
- * Syslog.log(Syslog::LOG_CRIT, "User %s logged in", ENV['USER'])
- *
- * The priority levels, in descending order, are:
- *
- * LOG_EMERG:: System is unusable
- * LOG_ALERT:: Action needs to be taken immediately
- * LOG_CRIT:: A critical condition has occurred
- * LOG_ERR:: An error occurred
- * LOG_WARNING:: Warning of a possible problem
- * LOG_NOTICE:: A normal but significant condition occurred
- * LOG_INFO:: Informational message
- * LOG_DEBUG:: Debugging information
- *
- * Each priority level also has a shortcut method that logs with it's named priority.
- * As an example, the two following statements would produce the same result:
- *
- * Syslog.log(Syslog::LOG_ALERT, "Out of memory")
- * Syslog.alert("Out of memory")
- *
- * Format strings are as for printf/sprintf, except that in addition %m is
- * replaced with the error message string that would be returned by
- * strerror(errno).
- *
- */
static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
{
VALUE pri;
@@ -315,7 +152,7 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
pri = *argv++;
if (!FIXNUM_P(pri)) {
- rb_raise(rb_eTypeError, "type mismatch: %"PRIsVALUE" given", rb_obj_class(pri));
+ rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(pri)));
}
syslog_write(FIX2INT(pri), argc, argv);
@@ -323,25 +160,28 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
return self;
}
-/* Returns an inspect() string summarizing the object state.
- */
static VALUE mSyslog_inspect(VALUE self)
{
+ char buf[1024];
+
Check_Type(self, T_MODULE);
- if (!syslog_opened)
- return rb_sprintf("<#%"PRIsVALUE": opened=false>", self);
+ if (syslog_opened) {
+ snprintf(buf, sizeof(buf),
+ "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
+ rb_class2name(self),
+ syslog_ident,
+ syslog_options,
+ syslog_facility,
+ syslog_mask);
+ } else {
+ snprintf(buf, sizeof(buf),
+ "<#%s: opened=false>", rb_class2name(self));
+ }
- return rb_sprintf("<#%"PRIsVALUE": opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
- self,
- syslog_ident,
- syslog_options,
- syslog_facility,
- syslog_mask);
+ return rb_str_new2(buf);
}
-/* Returns self, for backward compatibility.
- */
static VALUE mSyslog_instance(VALUE self)
{
return self;
@@ -350,7 +190,7 @@ static VALUE mSyslog_instance(VALUE self)
#define define_syslog_shortcut_method(pri, name) \
static VALUE mSyslog_##name(int argc, VALUE *argv, VALUE self) \
{ \
- syslog_write((pri), argc, argv); \
+ syslog_write(pri, argc, argv); \
\
return self; \
}
@@ -380,57 +220,24 @@ define_syslog_shortcut_method(LOG_INFO, info)
define_syslog_shortcut_method(LOG_DEBUG, debug)
#endif
-/* call-seq:
- * LOG_MASK(priority_level) => priority_mask
- *
- * Generates a mask bit for a priority level. See #mask=
- */
-static VALUE mSyslogMacros_LOG_MASK(VALUE mod, VALUE pri)
+static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
{
return INT2FIX(LOG_MASK(NUM2INT(pri)));
}
-/* call-seq:
- * LOG_UPTO(priority_level) => priority_mask
- *
- * Generates a mask value for priority levels at or below the level specified.
- * See #mask=
- */
-static VALUE mSyslogMacros_LOG_UPTO(VALUE mod, VALUE pri)
+static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
{
return INT2FIX(LOG_UPTO(NUM2INT(pri)));
}
-static VALUE mSyslogMacros_included(VALUE mod, VALUE target)
-{
- rb_extend_object(target, mSyslogMacros);
- return mod;
-}
-
-/* The syslog package provides a Ruby interface to the POSIX system logging
- * facility.
- *
- * Syslog messages are typically passed to a central logging daemon.
- * The daemon may filter them; route them into different files (usually
- * found under /var/log); place them in SQL databases; forward
- * them to centralized logging servers via TCP or UDP; or even alert the
- * system administrator via email, pager or text message.
- *
- * Unlike application-level logging via Logger or Log4r, syslog is designed
- * to allow secure tamper-proof logging.
- *
- * The syslog protocol is standardized in RFC 5424.
- */
+/* Init for package syslog */
void Init_syslog()
{
mSyslog = rb_define_module("Syslog");
- mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
+ mSyslogConstants = rb_define_module_under(mSyslog, "Constants");
- mSyslogOption = rb_define_module_under(mSyslog, "Option");
- mSyslogFacility = rb_define_module_under(mSyslog, "Facility");
- mSyslogLevel = rb_define_module_under(mSyslog, "Level");
- mSyslogMacros = rb_define_module_under(mSyslog, "Macros");
+ rb_include_module(mSyslog, mSyslogConstants);
rb_define_module_function(mSyslog, "open", mSyslog_open, -1);
rb_define_module_function(mSyslog, "reopen", mSyslog_reopen, -1);
@@ -446,150 +253,143 @@ void Init_syslog()
rb_define_module_function(mSyslog, "mask", mSyslog_get_mask, 0);
rb_define_module_function(mSyslog, "mask=", mSyslog_set_mask, 1);
+ rb_define_module_function(mSyslog, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
+ rb_define_module_function(mSyslog, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
+
rb_define_module_function(mSyslog, "inspect", mSyslog_inspect, 0);
rb_define_module_function(mSyslog, "instance", mSyslog_instance, 0);
- /* Syslog options */
+ rb_define_module_function(mSyslogConstants, "LOG_MASK", mSyslogConstants_LOG_MASK, 1);
+ rb_define_module_function(mSyslogConstants, "LOG_UPTO", mSyslogConstants_LOG_UPTO, 1);
-#define rb_define_syslog_option(c) \
- rb_define_const(mSyslogOption, #c, INT2NUM(c))
+#define rb_define_syslog_const(id) \
+ rb_define_const(mSyslogConstants, #id, INT2NUM(id))
+ /* Various options when opening log */
#ifdef LOG_PID
- rb_define_syslog_option(LOG_PID);
+ rb_define_syslog_const(LOG_PID);
#endif
#ifdef LOG_CONS
- rb_define_syslog_option(LOG_CONS);
+ rb_define_syslog_const(LOG_CONS);
#endif
#ifdef LOG_ODELAY
- rb_define_syslog_option(LOG_ODELAY); /* deprecated */
+ rb_define_syslog_const(LOG_ODELAY); /* deprecated */
#endif
#ifdef LOG_NDELAY
- rb_define_syslog_option(LOG_NDELAY);
+ rb_define_syslog_const(LOG_NDELAY);
#endif
#ifdef LOG_NOWAIT
- rb_define_syslog_option(LOG_NOWAIT); /* deprecated */
+ rb_define_syslog_const(LOG_NOWAIT); /* deprecated */
#endif
#ifdef LOG_PERROR
- rb_define_syslog_option(LOG_PERROR);
+ rb_define_syslog_const(LOG_PERROR);
#endif
- /* Syslog facilities */
-
-#define rb_define_syslog_facility(c) \
- rb_define_const(mSyslogFacility, #c, INT2NUM(c))
-
+ /* Various syslog facilities */
#ifdef LOG_AUTH
- rb_define_syslog_facility(LOG_AUTH);
+ rb_define_syslog_const(LOG_AUTH);
#endif
#ifdef LOG_AUTHPRIV
- rb_define_syslog_facility(LOG_AUTHPRIV);
+ rb_define_syslog_const(LOG_AUTHPRIV);
#endif
#ifdef LOG_CONSOLE
- rb_define_syslog_facility(LOG_CONSOLE);
+ rb_define_syslog_const(LOG_CONSOLE);
#endif
#ifdef LOG_CRON
- rb_define_syslog_facility(LOG_CRON);
+ rb_define_syslog_const(LOG_CRON);
#endif
#ifdef LOG_DAEMON
- rb_define_syslog_facility(LOG_DAEMON);
+ rb_define_syslog_const(LOG_DAEMON);
#endif
#ifdef LOG_FTP
- rb_define_syslog_facility(LOG_FTP);
+ rb_define_syslog_const(LOG_FTP);
#endif
#ifdef LOG_KERN
- rb_define_syslog_facility(LOG_KERN);
+ rb_define_syslog_const(LOG_KERN);
#endif
#ifdef LOG_LPR
- rb_define_syslog_facility(LOG_LPR);
+ rb_define_syslog_const(LOG_LPR);
#endif
#ifdef LOG_MAIL
- rb_define_syslog_facility(LOG_MAIL);
+ rb_define_syslog_const(LOG_MAIL);
#endif
#ifdef LOG_NEWS
- rb_define_syslog_facility(LOG_NEWS);
+ rb_define_syslog_const(LOG_NEWS);
#endif
#ifdef LOG_NTP
- rb_define_syslog_facility(LOG_NTP);
+ rb_define_syslog_const(LOG_NTP);
#endif
#ifdef LOG_SECURITY
- rb_define_syslog_facility(LOG_SECURITY);
+ rb_define_syslog_const(LOG_SECURITY);
#endif
#ifdef LOG_SYSLOG
- rb_define_syslog_facility(LOG_SYSLOG);
+ rb_define_syslog_const(LOG_SYSLOG);
#endif
#ifdef LOG_USER
- rb_define_syslog_facility(LOG_USER);
+ rb_define_syslog_const(LOG_USER);
#endif
#ifdef LOG_UUCP
- rb_define_syslog_facility(LOG_UUCP);
+ rb_define_syslog_const(LOG_UUCP);
#endif
#ifdef LOG_LOCAL0
- rb_define_syslog_facility(LOG_LOCAL0);
+ rb_define_syslog_const(LOG_LOCAL0);
#endif
#ifdef LOG_LOCAL1
- rb_define_syslog_facility(LOG_LOCAL1);
+ rb_define_syslog_const(LOG_LOCAL1);
#endif
#ifdef LOG_LOCAL2
- rb_define_syslog_facility(LOG_LOCAL2);
+ rb_define_syslog_const(LOG_LOCAL2);
#endif
#ifdef LOG_LOCAL3
- rb_define_syslog_facility(LOG_LOCAL3);
+ rb_define_syslog_const(LOG_LOCAL3);
#endif
#ifdef LOG_LOCAL4
- rb_define_syslog_facility(LOG_LOCAL4);
+ rb_define_syslog_const(LOG_LOCAL4);
#endif
#ifdef LOG_LOCAL5
- rb_define_syslog_facility(LOG_LOCAL5);
+ rb_define_syslog_const(LOG_LOCAL5);
#endif
#ifdef LOG_LOCAL6
- rb_define_syslog_facility(LOG_LOCAL6);
+ rb_define_syslog_const(LOG_LOCAL6);
#endif
#ifdef LOG_LOCAL7
- rb_define_syslog_facility(LOG_LOCAL7);
+ rb_define_syslog_const(LOG_LOCAL7);
#endif
- /* Syslog levels and the shortcut methods */
-
-#define rb_define_syslog_level(c, m) \
- rb_define_const(mSyslogLevel, #c, INT2NUM(c)); \
- rb_define_module_function(mSyslog, #m, mSyslog_##m, -1)
+#define rb_define_syslog_shortcut(name) \
+ rb_define_module_function(mSyslog, #name, mSyslog_##name, -1)
+ /* Various syslog priorities and the shortcut methods */
#ifdef LOG_EMERG
- rb_define_syslog_level(LOG_EMERG, emerg);
+ rb_define_syslog_const(LOG_EMERG);
+ rb_define_syslog_shortcut(emerg);
#endif
#ifdef LOG_ALERT
- rb_define_syslog_level(LOG_ALERT, alert);
+ rb_define_syslog_const(LOG_ALERT);
+ rb_define_syslog_shortcut(alert);
#endif
#ifdef LOG_CRIT
- rb_define_syslog_level(LOG_CRIT, crit);
+ rb_define_syslog_const(LOG_CRIT);
+ rb_define_syslog_shortcut(crit);
#endif
#ifdef LOG_ERR
- rb_define_syslog_level(LOG_ERR, err);
+ rb_define_syslog_const(LOG_ERR);
+ rb_define_syslog_shortcut(err);
#endif
#ifdef LOG_WARNING
- rb_define_syslog_level(LOG_WARNING, warning);
+ rb_define_syslog_const(LOG_WARNING);
+ rb_define_syslog_shortcut(warning);
#endif
#ifdef LOG_NOTICE
- rb_define_syslog_level(LOG_NOTICE, notice);
+ rb_define_syslog_const(LOG_NOTICE);
+ rb_define_syslog_shortcut(notice);
#endif
#ifdef LOG_INFO
- rb_define_syslog_level(LOG_INFO, info);
+ rb_define_syslog_const(LOG_INFO);
+ rb_define_syslog_shortcut(info);
#endif
#ifdef LOG_DEBUG
- rb_define_syslog_level(LOG_DEBUG, debug);
+ rb_define_syslog_const(LOG_DEBUG);
+ rb_define_syslog_shortcut(debug);
#endif
-
- /* Syslog macros */
-
- rb_define_method(mSyslogMacros, "LOG_MASK", mSyslogMacros_LOG_MASK, 1);
- rb_define_method(mSyslogMacros, "LOG_UPTO", mSyslogMacros_LOG_UPTO, 1);
- rb_define_singleton_method(mSyslogMacros, "included", mSyslogMacros_included, 1);
-
- rb_include_module(mSyslogConstants, mSyslogOption);
- rb_include_module(mSyslogConstants, mSyslogFacility);
- rb_include_module(mSyslogConstants, mSyslogLevel);
- rb_funcall(mSyslogConstants, rb_intern("include"), 1, mSyslogMacros);
-
- rb_define_singleton_method(mSyslogConstants, "included", mSyslogMacros_included, 1);
- rb_funcall(mSyslog, rb_intern("include"), 1, mSyslogConstants);
}
diff --git a/ext/syslog/syslog.txt b/ext/syslog/syslog.txt
index 1507a87924..35bd4cb057 100644
--- a/ext/syslog/syslog.txt
+++ b/ext/syslog/syslog.txt
@@ -75,7 +75,7 @@ Module Methods:
Example:
Syslog.crit("the sky is falling in %d seconds!", 5)
-
+
mask
mask=(mask)
@@ -86,7 +86,7 @@ Module Methods:
Example:
Syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_ERR)
- close
+ close
Closes syslog.
diff --git a/ext/tk/.cvsignore b/ext/tk/.cvsignore
new file mode 100644
index 0000000000..90c83ed9b1
--- /dev/null
+++ b/ext/tk/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+*.log
+*.def
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index 52a0b7ea3a..4aa9cb61d6 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -14,13 +14,13 @@
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:
+ * 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:
+ * 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>
@@ -39,12 +39,12 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
2007-01-26 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ext/tk/lib/tkextlib/iwidgets/checkbox.rb: wrong number of arguments
+ * ext/tk/lib/tkextlib/iwidgets/checkbox.rb: wrong number of arguments
[ruby-Bugs-7776].
* ext/tk/lib/tkextlib/iwidgets/radiobox.rb: ditto.
- * ext/tk/lib/tkextlib/blt/tile/checkbutton.rb: change primary name
+ * ext/tk/lib/tkextlib/blt/tile/checkbutton.rb: change primary name
of class [ruby-dev:30080].
* ext/tk/lib/tkextlib/blt/tile/radiobutton.rb: ditto.
@@ -53,16 +53,16 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* lib/tkextlib/tile/treeview.rb : minor bug fix.
- * lib/tkextlib/blt/table.rb: fix bugs which forbade use of
+ * lib/tkextlib/blt/table.rb: fix bugs which forbade use of
'::blt::table' command. Now, probably, it'll works properly.
2006-11-06 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * lib/tkextlib/version.rb: keep release date of tkextlib on
+ * lib/tkextlib/version.rb: keep release date of tkextlib on
"Tk::Tkextlib_RELEASE_DATE".
- * lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
- Now, you can handle tree items as objects.
+ * lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
+ Now, you can handle tree items as objects.
2006-10-04 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -112,7 +112,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
2005-11-19 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's
+ * sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's
version (1.8 or 1.9).
2005-10-23 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -375,7 +375,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
* lib/tkextlib/iwidgets/scrolledcanvas.rb: bug fix on
- TkCanvas#delete when given non-TkcItem arguments.
+ TkCanvas#delete when given non-TkcItem arguments.
2005-05-10 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -496,7 +496,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
2005-04-08 ocean <ocean@ruby-lang.org>
* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
- widget, or reenter widget while dragging)
+ widget, or reenter widget while draggging)
2005-04-08 ocean <ocean@ruby-lang.org>
@@ -576,7 +576,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* lib/tkextlib/blt/component.rb: bug fix on treatment of
component objects.
- * sample/tkextlib/blt/graph6.rb: a new sample script.
+ * sample/tkextlib/blt/graph6.rb: a new sample script.
2005-03-31 ocean <ocean@ruby-lang.org>
@@ -592,7 +592,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* sample/tkextlib/iwidgets/sample/hierarchy.rb: show basename
only [ruby-dev:25970]
- * sample/tkextlib/treectrl/demo.rb: add check for existence of
+ * sample/tkextlib/treectrl/demo.rb: add check for existence of
'backgroundimage' option.
* sample/tkextlib/treectrl/bitmaps.rb: ditto.
@@ -626,7 +626,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
2005-03-29 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* lib/tkextlib/blt/component.rb: cannot create elements except
- default type of element.
+ default type of element.
* lib/tkextlib/blt/barchart.rb: ditto.
@@ -661,7 +661,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* lib/tkextlib/blt/component.rb: proper call on xaxis_* and so on.
* lib/tkextlib/blt/htext.rb: add TkVariable object to access
- special Tcl variables.
+ special Tcl variables.
* lib/tkextlib/treectrl/tktreectrl.rb: typo fix.
@@ -923,8 +923,8 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* use Tk::ValidateConfigure.__def_validcmd() method
(new function to define validatecommand methods easier)
- * tcllib.rb : avoid the loading trouble that almost all part of
- the extension is not available when some libraries are invalid.
+ * tcllib.rb : avoid the loading trouble that almost all part of
+ the extension is not available when some libraries are invalid.
2004-07-09 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -942,7 +942,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* add ICONS extension demo
- * many bug fix
+ * many bug fix
2004-07-01 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
index e9f6dc65ce..c139947da4 100644
--- a/ext/tk/MANUAL_tcltklib.eng
+++ b/ext/tk/MANUAL_tcltklib.eng
@@ -3,16 +3,16 @@
This document discribes about the 'tcltklib' library. Although there
is the 'tcltk' library (tcltk.rb) under this directory, no description
-in this document (because it is not maintained recently).
+in this document (because it is not maintained recently).
==============================================================
module TclTklib
- : Defines methods to do operations which are independed on
+ : Defines methods to do operations which are independed on
: Tcl/Tk interpreters
module TclTkLib::EventFlag
- : Defines flags to define target events on 'do_one_event' methods.
- : When to give, please use bit-operator (e.g. WINDOW | DONT_WAIT).
+ : Defines flags to define taget events on 'do_one_event' methos.
+ : When to give, please use bit-operator (e.g. WINDOW | DONT_WAIT).
[constants]
NONE
@@ -30,29 +30,29 @@ module TclTklib
IDLE
: 'idle' operation (e.g. 're-draw'; the operations when the
- : other kinds of events doesn't occur) is processed.
+ : other kinds of events doesn't occur) is processed.
ALL
- : All kinds of events are processed.
- : Same to 'WINDOW | FILE | TIMER | IDLE'.
+ : All kinds of events are processed.
+ : Same to 'WINDOW | FILE | TIMER | IDLE'.
DONT_WAIT
- : Without this flag, 'do_one_event' waits the occurence of
- : a target event. With this flag, doesn't wait and returns
- : false if there is no target event for processing.
+ : Without this flag, 'do_one_event' waits the occurence of
+ : a target event. With this flag, doesn't wait and returns
+ : false if there is no target event for processing.
module TclTkLib::VarAccessFlag
- : Defines flags to give '_get_variable' and so on. When to give,
- : please use bit-operator (e.g. GLOBAL_ONLY | LEAVE_ERR_MSG ).
+ : Defines flags to give '_get_variable' and so on. When to give,
+ : please use bit-operator (e.g. GLOBAL_ONLY | LEAVE_ERR_MSG ).
[constants]
NONE
- : Is 0. It means "set no flag".
+ : Is 0. It means "set no flag".
GLOBAL_ONLY
: (site Tcl/Tk's man page)
- : Under normal circumstances the procedures look up
- : variables as follows: If a procedure call is active
+ : Under normal circumstances the procedures look up
+ : variables as follows: If a procedure call is active
: in interp, a variable is looked up at the current
: level of procedure call. Otherwise, a variable is
: looked up first in the current namespace, then in
@@ -63,9 +63,9 @@ module TclTklib
: given, GLOBAL_ONLY is ignored.
:
: *** ATTENTION ***
- : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
+ : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
: is defined as 0, and then GLOBAL_ONLY is available
- : even if flag is (GLOBAL_ONLY | NAMESPACE_ONLY).
+ : even if flag is (GLOBAL_ONLY | NAMESPACE_ONLY).
NAMESPACE_ONLY
: (site Tcl/Tk's man page)
@@ -80,16 +80,16 @@ module TclTklib
: active.
:
: *** ATTENTION ***
- : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
+ : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
: is defined as 0.
LEAVE_ERR_MSG
: (site Tcl/Tk's man page)
- : If an error is returned and this bit is set in flags,
+ : If an error is returned and this bit is set in flags,
: then an error message will be left in the interpreter's
: result, where it can be retrieved with Tcl_GetObjResult
- : or Tcl_GetStringResult. If this flag bit isn't set then
- : no error message is left and the interpreter's result
+ : or Tcl_GetStringResult. If this flag bit isn't set then
+ : no error message is left and the interpreter's result
: will not be modified.
APPEND_VALUE
@@ -104,26 +104,26 @@ module TclTklib
: valid Tcl list element before setting (or appending
: to) the variable. A separator space is appended before
: the new list element unless the list element is going
- : to be the first element in a list or sublist (i.e. the
- : variable's current value is empty, or contains the
+ : to be the first element in a list or sublist (i.e. the
+ : variable's current value is empty, or contains the
: single character ``{'', or ends in `` }'').
PARSE_VARNAME
: (site Tcl/Tk's man page)
- : If this bit is set when calling _set_variable and so
+ : If this bit is set when calling _set_variable and so
: on, var_name argument may contain both an array and an
- : element name: if the name contains an open parenthesis
- : and ends with a close parenthesis, then the value
- : between the parentheses is treated as an element name
+ : element name: if the name contains an open parenthesis
+ : and ends with a close parenthesis, then the value
+ : between the parentheses is treated as an element name
: (which can have any string value) and the characters
- : before the first open parenthesis are treated as the
+ : before the first open parenthesis are treated as the
: name of an array variable. If the flag PARSE_VARNAME
- : is given, index_name argument should be 'nil' since the
+ : is given, index_name argument should be 'nil' since the
: array and element names are taken from var_name.
:
: *** ATTENTION ***
- : Tcl7.6 doesn't have this flag. So PARSE_VARNAME is
- : defined as 0.
+ : Tcl7.6 doesn't have this flag. So PARSE_VARNAME is
+ : defined as 0.
module TclTkLib::RELEASE_TYPE
: Defines release type number of Tcl/Tk
@@ -139,105 +139,105 @@ module TclTklib
[module methods]
get_version()
- : return an array of major, minor, release-type number,
+ : return an array of major, minor, release-type number,
: and patchlevel of current Tcl/Tk library.
mainloop(check_root = true)
- : Starts the eventloop. If 'check_root' is true, this method
- : doesn't return when a root widget exists.
+ : Starts the eventloop. If 'check_root' is true, this method
+ : doesn't return when a root widget exists.
: If 'check_root' is false, doen't return by the other
: reasons than exceptions.
mainloop_thread?
- : Returns whether the current thread executes the eventloop.
- : If true, the eventloop is working on the current thread.
+ : Returns whether the current thread executes the eventloop.
+ : If true, the eventloop is working on the current thread.
: If no eventloop is working, this method returns nil.
: And if the other thread executes the eventloop, returns false.
- :
+ :
: *** ATTENTION ***
- : When this methods returns false, it is dangerous to call a Tk
+ : When this methods returns false, it is dangerous to call a Tk
: interpreter directly.
mainloop_watchdog(check_root = true)
- : On the normal eventloop, some kinds of callback operations
+ : On the normal eventloop, some kinds of callback operations
: cause deadlock. To avoid some of such deadlocks, this
: method starts an eventloop and a watchdog-thread.
- do_one_event(flag = TclTkLib::EventFlag::ALL |
+ do_one_event(flag = TclTkLib::EventFlag::ALL |
TclTkLib::EventFlag::DONT_WAIT)
- : Do one event for processing. When processed an event,
- : returns true.
+ : Do one event for processing. When processed an event,
+ : returns true.
: If NOT set DONT_WAIT flag, this method waits occurrence of
- : a target event.
- : If set DONT_WAIT flag and no event for processing, returns
- : false immediately.
- : If $SAFE >= 4, or $SAFE >= 1 and the flag is tainted,
+ : a target event.
+ : If set DONT_WAIT flag and no event for processing, returns
+ : false immediately.
+ : If $SAFE >= 4, or $SAFE >= 1 and the flag is tainted,
: force to set DONT_WAIT flag.
set_eventloop_tick(timer_tick)
: Define the interval of thread-switching with an integer
- : value of mili-seconds.
- : Default timer_tick is 0. It means that thread-switching
- : is based on the count of processed events.
+ : value of mili-seconds.
+ : Default timer_tick is 0. It means that thread-switching
+ : is based on the count of processed events.
: ( see 'set_eventloop_weight' method )
- : However, if the eventloop thread is the only thread,
- : timer_tick cannt be set to 0. If 0, then is set to 100 ms
- : automatically (see NO_THREAD_INTERRUPT_TIME on tcltklib.c).
- : On $SAFE >= 4, cannot call this method.
+ : However, if the eventloop thread is the only thread,
+ : timer_tick cannt be set to 0. If 0, then is set to 100 ms
+ : automatically (see NO_THREAD_INTERRUPT_TIME on tcltklib.c).
+ : On $SAFE >= 4, cannot call this method.
get_eventloop_tick
: Get current value of 'timer_tick'
set_no_event_wait(no_event_wait)
- : Define sleeping time of the eventloop when two or more
- : thread are running and there is no event for processing.
+ : Define sleeping time of the eventloop when two or more
+ : thread are running and there is no event for processing.
: Default value is 20 (ms).
- : If the eventloop thread is the only thread, this value is
- : invalid.
- : On $SAFE >= 4, cannot call this method.
+ : If the eventloop thread is the only thread, this value is
+ : invalid.
+ : On $SAFE >= 4, cannot call this method.
get_no_event_wait
: Get current value of 'no_event_wait'.
set_eventloop_weight(loop_max, no_event_tick)
- : Define the weight parameters for the eventloop thread.
- : That is invalid when the eventloop is the only thread.
- : 'loop_max' is the max events for thread-switching.
- : 'no_event_tick' is the increment value of the event count
+ : Define the weight parameters for the eventloop thread.
+ : That is invalid when the eventloop is the only thread.
+ : 'loop_max' is the max events for thread-switching.
+ : 'no_event_tick' is the increment value of the event count
: when no event for processing (And then, the eventloop thead
- : sleeps 'no_event_wait' mili-seconds).
- : 'loop_max == 800' and 'no_event_tick == 10' are defalut.
- : On $SAFE >= 4, cannot call this method.
+ : sleeps 'no_event_wait' mili-seconds).
+ : 'loop_max == 800' and 'no_event_tick == 10' are defalut.
+ : On $SAFE >= 4, cannot call this method.
get_eventloop_weight
: Get current values of 'loop_max' and 'no_event_tick'.
mainloop_abort_on_exception=(bool)
- : Define whether the eventloop stops on exception or not.
- : If true (default value), stops on exception.
+ : Define whether the eventloop stops on exception or not.
+ : If true (default value), stops on exception.
: If false, show a warinig message but ignore the exception.
- : If nil, no warning message and ignore the excepsion.
+ : If nil, no warning message and ignore the excepsion.
: This parameter is sometimes useful when multiple Tk
- : interpreters are working. Because the only one eventloop
+ : interpreters are working. Because the only one eventloop
: admins all Tk interpreters, sometimes exception on a
: interpreter kills the eventloop thread. Even if such
- : situation, when abort_on_exception == false or nil,
- : the eventloop ignores the exception and continue to working.
- : On $SAFE >= 4, cannot call this method.
+ : situation, when abort_on_exception == false or nil,
+ : the eventloop ignores the exception and continue to working.
+ : On $SAFE >= 4, cannot call this method.
mainloop_abort_on_exception
- : Get current status of that.
+ : Get current status of that.
num_of_mainwindows
- : Returns the number of main-windows (root-widget).
- : Because there is only one main-window for one Tk interpreter,
- : the value is same to the number of interpreters which has
+ : Returns the number of main-windows (root-widget).
+ : Because there is only one main-window for one Tk interpreter,
+ : the value is same to the number of interpreters which has
: available Tk functions.
_merge_tklist(str, str, ... )
- : Get a Tcl's list string from arguments with a Tcl/Tk's
- : library function. Each arguemnt is converted to a valid
- : Tcl list element.
+ : Get a Tcl's list string from arguments with a Tcl/Tk's
+ : library function. Each arguemnt is converted to a valid
+ : Tcl list element.
_conv_listelement(str)
: Convert the argument to a valid Tcl list element with
@@ -252,7 +252,7 @@ module TclTklib
_subst_Tcl_backslash(str)
: Substitute backslash sequence with Tcl's rule (include \uhhhh;
: give a sixteen-bit hexadecimal value for Unicode character).
- : _subst_Tcl_backslash method parses all backslash sequence.
+ : _subst_Tcl_backslash method parses all backslash sequence.
: _subst_UTF_backslash method parses \uhhhh only.
encoding_system
@@ -268,90 +268,90 @@ module TclTklib
class TclTkIp
[class methods]
new(ip_name=nil, options='')
- : Generate an instance of TclTkIp class.
+ : Generate an instance of TclTkIp class.
: If 'ip_name' argument is given as a string, it is the name
: of the Tk interpreter which is shown by 'winfo interps'
- : command.
- : 'options' argument accepts a string which is the command
- : line options of wish; such as '-geometry' or '-use'.
- : The information is used to generate the root widget of the
- : interpreter.
+ : command.
+ : 'options' argument accepts a string which is the command
+ : line options of wish; such as '-geometry' or '-use'.
+ : The information is used to generate the root widget of the
+ : interpreter.
: ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
: If is given nil or falsr for the 'option' argument, generates
- : the Tcl interpreter without Tk library. Then the interpreter
+ : the Tcl interpreter without Tk library. Then the interpreter
: doesn't need GUI environment. Therefore, even if a window
: system doesn't exist or cannot be used, Ruby can control the
- : Tcl interpreter and the extention libraries loaded on the
- : interpreter.
+ : Tcl interpreter and the extention libraries loaded on the
+ : interpreter.
[instance methods]
create_slave(name, safe=false)
- : Create a slave interpreter.
+ : Create a slave interpreter.
: The parent of the interpreter is the receiver of this method.
- : The name of the slave interpreter is given by 'name' argument.
+ : The name of the slave interpreter is given by 'name' argument.
: The 'safe' argument decides whether the slave interpreter is
: created as a safe interpreter or not. If true, create a safe
: interpreter. Default is false. However, if the parent
: interpreter is a safe interpreter, the created interpreter is
- : a safe interpreter (ignore 'safe' argument value).
- : If $SAFE >= 4, can create a safe interpreter only.
+ : a safe interpreter (ignore 'safe' argument value).
+ : If $SAFE >= 4, can create a safe interpreter only.
make_safe
: Make the interpreter to the safe interpreter, and returns
: self. If fail, raise RuntimeError.
safe?
- : Check whether the interpreter is the safe interpreter.
- : If is the safe interpreter, returns true.
+ : Check whether the interpreter is the safe interpreter.
+ : If is the safe interpreter, returns true.
allow_ruby_exit?
- : Return the mode whether 'exit' function of ruby or 'exit'
- : command of Tcl/Tk can quit the ruby process or not on the
- : interpreter. If false, such a command quit the interpreter
+ : Return the mode whether 'exit' function of ruby or 'exit'
+ : command of Tcl/Tk can quit the ruby process or not on the
+ : interpreter. If false, such a command quit the interpreter
: only.
- : The default value for a master interpreter is true, and
+ : The default value for a master interpreter is true, and
: for a slave interpreter is false.
allow_ruby_exit=(mode)
: Change the mode of 'allow_ruby_exit?'.
- : If $SAFE >= 4 or the interpreter is a "safe" interpreter,
- : this is not permitted (raise an exception).
+ : If $SAFE >= 4 or the interpreter is a "safe" interpreter,
+ : this is not permitted (raise an exception).
delete
- : Delete the interpreter.
+ : Delete the interpreter.
: The deleted interpreter doesn't accept command and then
: raise an exception.
deleted?
: Check whether the interpreter is already deleted.
- : If deleted, returns true.
+ : If deleted, returns true.
has_mainwindow?
: Check whether the interpreter has a MainWindow (root widget).
- : If has, returns true. If doesn't, returns false.
- : If IP is already deleted, returns nil.
+ : If has, returns true. If doesn't, returns false.
+ : If IP is already deleted, returns nil.
restart
- : Restart Tk part of the interpreter.
+ : Restart Tk part of the interpreter.
: Use this when you need Tk functions after destroying the
- : root widget.
- : On $SAFE >= 4, cannot call this method.
+ : root widget.
+ : On $SAFE >= 4, cannot call this method.
_eval(str)
_invoke(*args)
- : Estimates the arguments as a command on the Tk interpreter.
+ : Estimates the arguments as a command on the Tk interpreter.
: The argument of _eval is a script of Tcl/Tk.
: Each argument of _invoke is a token of one command line of
- : Tcl/Tk.
+ : Tcl/Tk.
: Because the operation of _invoke doesn't through the
: command line parser of Tk interpreter, the cost of
: estimation is smaller than _eval. However, auto_load
- : mechanism of the Tk interpreter doesn't work on _invoke.
+ : mechanism of the Tk interpreter doesn't work on _invoke.
: So _invoke can call only the command which already
- : registered on the interpreter by 'load' command and so on.
- : On _eval command, auto_load mechanism words. So if succeed
+ : registered on the interpreter by 'load' command and so on.
+ : On _eval command, auto_load mechanism words. So if succeed
: to _eval and regist the command once, after that, the
- : command can be called by _invoke.
+ : command can be called by _invoke.
_cancel_eval(str)
_cancel_eval_unwind(str)
@@ -365,46 +365,46 @@ class TclTkIp
_thread_vwait(var_name)
_thread_tkwait(mode, target)
- : 'vwait' or 'tkwait' with thread support.
- : The difference from normal 'vwait' or 'tkwait' command is
+ : 'vwait' or 'tkwait' with thread support.
+ : The difference from normal 'vwait' or 'tkwait' command is
: doing independent wait from the vwait stack when they are
: called on the other thread than the eventloop thread.
: In the case of Tcl/Tk's vwait / tkwait, if 2nd vwait /
- : tkwait is called on waiting for 1st vwait / tkwait,
+ : tkwait is called on waiting for 1st vwait / tkwait,
: returns the order of [2nd]->[1st] regardless of the order
- : of when the wait condition was fulfilled.
+ : of when the wait condition was fulfilled.
: If _thread_vwait / _thread_tkwait is called on the
: eventloop thread, there is no difference from vwait /
: tkwait. But if called on the other thread than the
- : eventloop, stops the thread. And when the wait condition
+ : eventloop, stops the thread. And when the wait condition
: is fulfilled, the thread restarts. The meaning of
- : "independent from the vwait stack" is that the timing of
- : restarting is independent from the waiting status of the
- : other threads. That is, even if the eventloop thread is
- : waiting by vwait and is not fulfilled the condition,
+ : "independent from the vwait stack" is that the timing of
+ : restarting is independent from the waiting status of the
+ : other threads. That is, even if the eventloop thread is
+ : waiting by vwait and is not fulfilled the condition,
: _thread_vwait completes the waiting when its waiting
: condition is fulfilled and the thread which stopped by
- : _thread_vwait can continue the operation.
+ : _thread_vwait can continue the operation.
_return_value
- : Get the last result value on the interpreter.
+ : Get the last result value on the interpreter.
_get_variable(var_name, flag)
_get_variable2(var_name, index_name, flag)
- : Get the current value of a variable. If specified a
- : index_name (see also the PARSE_VARNAME flag), get the
- : value of the index_name element.
+ : Get the current value of a variable. If specified a
+ : index_name (see also the PARSE_VARNAME flag), get the
+ : value of the index_name element.
_set_variable(var_name, value, flag)
_set_variable2(var_name, index_name, value, flag)
- : Create or modify a variable. If specified a index_name
- : (see also the PARSE_VARNAME flag), create or modify the
- : index_name element.
+ : Create or modify a variable. If specified a index_name
+ : (see also the PARSE_VARNAME flag), create or modify the
+ : index_name element.
_unset_variable(var_name)
_unset_variable2(var_name, index_name)
- : Remove a variable. If specified a index_name (see also
- : the PARSE_VARNAME flag), remove the index_name element.
+ : Remove a variable. If specified a index_name (see also
+ : the PARSE_VARNAME flag), remove the index_name element.
_get_global_var(var_name)
_get_global_var2(var_name, index_name)
@@ -416,13 +416,13 @@ class TclTkIp
: (GLOBAL_ONLY | LEAVE_ERR_MSG).
_split_tklist(str)
- : Split the argument with Tcl/Tk's library function and
+ : Split the argument with Tcl/Tk's library function and
: get an array as a list of Tcl list elements.
_merge_tklist(str, str, ... )
- : Get a Tcl's list string from arguments with a Tcl/Tk's
- : library function. Each arguemnt is converted to a valid
- : Tcl list element.
+ : Get a Tcl's list string from arguments with a Tcl/Tk's
+ : library function. Each arguemnt is converted to a valid
+ : Tcl list element.
_conv_listelement(str)
: Convert the argument to a valid Tcl list element with
@@ -431,14 +431,14 @@ class TclTkIp
mainloop
mainloop_watchdog
: If on the slave interpreter, never start an eventloop and
- : returns nil.
+ : returns nil.
: With the exception that, same to the TclTkLib module method
- : with the same name.
+ : with the same name.
do_one_event
: With the exception that the argument is forced to set
: DONT_WAIT flag on the slave interpreter, same to
- : TclTkLib#do_one_event.
+ : TclTkLib#do_one_event.
set_eventloop_tick
get_eventloop_tick
@@ -450,24 +450,24 @@ class TclTkIp
mainloop_abort_on_exception=
: With the exception that it is ignored to set value on the
: slave interpreter, same to the TclTkLib module method with
- : the same name.
+ : the same name.
encoding_table
- : For Ruby m17n. Return encoding relation table between Ruby's
+ : For Ruby m17n. Return encoding relation table between Ruby's
: Encoding object and Tcl's encoding name.
class TkCallbackBreak < StandardError
class TkCallbackContinue < StandardError
- : They are exception classes to break or continue the Tk callback
- : operation.
- : If raise TkCallbackBreak on the callback procedure, Ruby returns
- : 'break' code to Tk interpreter (Then the Tk interpreter will
- : break the operation for the current event).
+ : They are exception classes to break or continue the Tk callback
+ : operation.
+ : If raise TkCallbackBreak on the callback procedure, Ruby returns
+ : 'break' code to Tk interpreter (Then the Tk interpreter will
+ : break the operation for the current event).
: If raise TkCallbackContinue, returns 'continue' code (Then the Tk
- : interpreter will break the operateion for the current bindtag and
+ : interpreter will break the operateion for the current bindtag and
: starts the operation for the next buindtag for the current event).
- : However, current tcltklib supports Ruby's 'break' and 'next' to
- : get the same effect. That is, those classes are obsolete. Those
- : exist for backward compatibility.
+ : However, current tcltklib supports Ruby's 'break' and 'next' to
+ : get the same effect. That is, those classes are obsolete. Those
+ : exist for backward compatibility.
(eof)
diff --git a/ext/tk/MANUAL_tcltklib.eucj b/ext/tk/MANUAL_tcltklib.eucj
index 1de1736f9f..26b39f7943 100644
--- a/ext/tk/MANUAL_tcltklib.eucj
+++ b/ext/tk/MANUAL_tcltklib.eucj
@@ -1,525 +1,525 @@
(tof)
2005/07/05 Hidetoshi NAGAI
-本ドキュメントã«ã¯å¤ã„ tcltk ライブラリ,tcltklib ライブラリã®èª¬æ˜Ž
-ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ãŒï¼Œãã®è¨˜è¿°å†…容ã¯å¤ã„ã‚‚ã®ã¨ãªã£ã¦ã„ã¾ã™ï¼Ž
+Ëܥɥ­¥å¥á¥ó¥È¤Ë¤Ï¸Å¤¤ tcltk ¥é¥¤¥Ö¥é¥ê¡¤tcltklib ¥é¥¤¥Ö¥é¥ê¤ÎÀâÌÀ
+¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¤¤½¤Îµ­½ÒÆâÍÆ¤Ï¸Å¤¤¤â¤Î¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
-tcltk ライブラリ(tcltk.rb)ã¯ç¾åœ¨ã§ã¯ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ãŒäº‹å®Ÿä¸Šè¡Œã‚れã¦
-ã„ãªã„ãŸã‚,å¤ã„ドキュメントã®èª¬æ˜ŽãŒãã®ã¾ã¾æœ‰åйã§ã™ï¼Žãれã«å¯¾ã—,
-tcltklib ライブラリã«ã¤ã„ã¦ã¯ï¼Œç¾åœ¨ã® Ruby/Tk(tk.rb 以下ã®ãƒ©ã‚¤ãƒ–ラ
-リ群)を稼åƒã•ã›ã‚‹ãŸã‚ã®ä¸­å¿ƒã¨ã—ã¦ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã•れã¦ã„ã‚‹ãŸã‚,少々
-é•ã„ãŒç”Ÿã˜ã¦ã„ã¾ã™ï¼Ž
+tcltk ¥é¥¤¥Ö¥é¥ê¡Êtcltk.rb¡Ë¤Ï¸½ºß¤Ç¤Ï¥á¥ó¥Æ¥Ê¥ó¥¹¤¬»ö¼Â¾å¹Ô¤ï¤ì¤Æ
+¤¤¤Ê¤¤¤¿¤á¡¤¸Å¤¤¥É¥­¥å¥á¥ó¥È¤ÎÀâÌÀ¤¬¤½¤Î¤Þ¤ÞÍ­¸ú¤Ç¤¹¡¥¤½¤ì¤ËÂФ·¡¤
+tcltklib ¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï¡¤¸½ºß¤Î Ruby/Tk¡Êtk.rb °Ê²¼¤Î¥é¥¤¥Ö¥é
+¥ê·²¡Ë¤ò²ÔƯ¤µ¤»¤ë¤¿¤á¤ÎÃæ¿´¤È¤·¤Æ¥á¥ó¥Æ¥Ê¥ó¥¹¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¤¾¯¡¹
+°ã¤¤¤¬À¸¤¸¤Æ¤¤¤Þ¤¹¡¥
-ãã“ã§ï¼Œã¾ãšå¤ã„説明文書を示ã—ãŸå¾Œï¼Œç¾åœ¨ã® tcltklib ライブラリã«ã¤
-ã„ã¦ã®èª¬æ˜Žã‚’加ãˆã¾ã™ï¼Ž
+¤½¤³¤Ç¡¤¤Þ¤º¸Å¤¤ÀâÌÀʸ½ñ¤ò¼¨¤·¤¿¸å¡¤¸½ºß¤Î tcltklib ¥é¥¤¥Ö¥é¥ê¤Ë¤Ä
+¤¤¤Æ¤ÎÀâÌÀ¤ò²Ã¤¨¤Þ¤¹¡¥
-以下ãŒãƒ©ã‚¤ãƒ–ラリã®å¤ã„説明文書ã§ã™ï¼Ž
+°Ê²¼¤¬¥é¥¤¥Ö¥é¥ê¤Î¸Å¤¤ÀâÌÀʸ½ñ¤Ç¤¹¡¥
==============================================================
MANUAL.euc
Sep. 19, 1997 Y. Shigehiro
-以下, 「tcl/tkã€ã¨ã„ã†è¡¨è¨˜ã¯, tclsh ã‚„ wish を実ç¾ã—ã¦ã„ã‚‹, 一般ã§ã„ã†
-ã¨ã“ã‚ã® tcl/tk を指ã—ã¾ã™. 「tcltk ライブラリã€, 「tcltklib ライブラ
-リã€ã¨ã„ã†è¡¨è¨˜ã¯, 本パッケージã«å«ã¾ã‚Œã‚‹ ruby 用ã®ãƒ©ã‚¤ãƒ–ラリを指ã—ã¾ã™.
+°Ê²¼, ¡Ötcl/tk¡×¤È¤¤¤¦É½µ­¤Ï, tclsh ¤ä wish ¤ò¼Â¸½¤·¤Æ¤¤¤ë, °ìÈ̤Ǥ¤¤¦
+¤È¤³¤í¤Î tcl/tk ¤ò»Ø¤·¤Þ¤¹. ¡Ötcltk ¥é¥¤¥Ö¥é¥ê¡×, ¡Ötcltklib ¥é¥¤¥Ö¥é
+¥ê¡×¤È¤¤¤¦É½µ­¤Ï, Ëܥѥ屡¼¥¸¤Ë´Þ¤Þ¤ì¤ë ruby ÍѤΥ饤¥Ö¥é¥ê¤ò»Ø¤·¤Þ¤¹.
-<< tcltk ライブラリ >>
+<< tcltk ¥é¥¤¥Ö¥é¥ê >>
-tcl/tk ã® C ライブラリを利用ã™ã‚‹ãŸã‚ã®é«˜(中?)水準インターフェースをæ
-ä¾›ã—ã¾ã™.
+tcl/tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ¹¤ë¤¿¤á¤Î¹â(Ãæ?)¿å½à¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÄó
+¶¡¤·¤Þ¤¹.
-ã“ã®ãƒ©ã‚¤ãƒ–ラリ㯠ruby ã‹ã‚‰ tcl/tk ライブラリを利用ã™ã‚‹ãŸã‚ã®ã‚‚ã®ã§, 内
-部㧠tcltklib ライブラリを利用ã—ã¦ã„ã¾ã™.
+¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï ruby ¤«¤é tcl/tk ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ¹¤ë¤¿¤á¤Î¤â¤Î¤Ç, Æâ
+Éô¤Ç tcltklib ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹.
-[説明]
+[ÀâÌÀ]
-tcl/tk インタプリタã§ã¯, ウィジェットã«ä½•ã‹æŒ‡ç¤ºã‚’é€ã‚‹ã«ã¯, ウィジェッ
-トåã«ç¶šã„ã¦ãƒ‘ラメータを書ãã¾ã™. ã—ãŸãŒã£ã¦, ウィジェットãŒã‚ªãƒ–ジェク
-トã§ã‚り, ãれã«å¯¾ã—ã¦ãƒ¡ã‚½ãƒƒãƒ‰ã‚’é€ã£ã¦ã„ã‚‹, ã¨ã¿ãªã™ã“ã¨ãŒã§ãã¾ã™. ã•
-ã¦, tcl/tk インタプリタã§ã¯, 組ã¿è¾¼ã¿ã‚³ãƒžãƒ³ãƒ‰ã‚‚, å‰è¿°ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¨
-åŒã˜ã‚ˆã†ãªæ›¸å¼ã®å‘½ä»¤ã§å®Ÿè¡Œã•れã¾ã™. ã™ãªã‚ã¡, コマンドもオブジェクトã§
-ã‚ã‚‹ã¨è€ƒãˆã‚‹ã“ã¨ãŒã§ãã¾ã™.
+tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤Ç¤Ï, ¥¦¥£¥¸¥§¥Ã¥È¤Ë²¿¤«»Ø¼¨¤òÁ÷¤ë¤Ë¤Ï, ¥¦¥£¥¸¥§¥Ã
+¥È̾¤Ë³¤¤¤Æ¥Ñ¥é¥á¡¼¥¿¤ò½ñ¤­¤Þ¤¹. ¤·¤¿¤¬¤Ã¤Æ, ¥¦¥£¥¸¥§¥Ã¥È¤¬¥ª¥Ö¥¸¥§¥¯
+¥È¤Ç¤¢¤ê, ¤½¤ì¤ËÂФ·¤Æ¥á¥½¥Ã¥É¤òÁ÷¤Ã¤Æ¤¤¤ë, ¤È¤ß¤Ê¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹. ¤µ
+¤Æ, tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤Ç¤Ï, ÁȤ߹þ¤ß¥³¥Þ¥ó¥É¤â, Á°½Ò¤Î¥¦¥£¥¸¥§¥Ã¥È¤È
+Ʊ¤¸¤è¤¦¤Ê½ñ¼°¤ÎÌ¿Îá¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹. ¤¹¤Ê¤ï¤Á, ¥³¥Þ¥ó¥É¤â¥ª¥Ö¥¸¥§¥¯¥È¤Ç
+¤¢¤ë¤È¹Í¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹.
-ã“ã®ã‚ˆã†ãªè€ƒãˆã«åŸºã¥ã, tcltk ライブラリã§ã¯, tcl/tk ã®ã‚³ãƒžãƒ³ãƒ‰ã‚„ウィ
-ジェットã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトを生æˆã—ã¾ã™. オブジェクトã«å¯¾ã™ã‚‹ãƒ¡ã‚½ãƒƒ
-ド呼ã³å‡ºã—ã¯, e() メソッドã«ã‚ˆã‚Šå®Ÿè¡Œã•れã¾ã™. 例ãˆã°, tcl/tk ã® info
-コマンドã«å¯¾å¿œã™ã‚‹ ruby ã®ã‚ªãƒ–ジェクト㌠info ã¨ã„ã†åå‰ã§ã‚ã‚‹ã¨ã™ã‚‹ã¨,
-tcl/tk ã®
+¤³¤Î¤è¤¦¤Ê¹Í¤¨¤Ë´ð¤Å¤­, tcltk ¥é¥¤¥Ö¥é¥ê¤Ç¤Ï, tcl/tk ¤Î¥³¥Þ¥ó¥É¤ä¥¦¥£
+¥¸¥§¥Ã¥È¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤òÀ¸À®¤·¤Þ¤¹. ¥ª¥Ö¥¸¥§¥¯¥È¤ËÂФ¹¤ë¥á¥½¥Ã
+¥É¸Æ¤Ó½Ð¤·¤Ï, e() ¥á¥½¥Ã¥É¤Ë¤è¤ê¼Â¹Ô¤µ¤ì¤Þ¤¹. Î㤨¤Ð, tcl/tk ¤Î info
+¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë ruby ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤¬ info ¤È¤¤¤¦Ì¾Á°¤Ç¤¢¤ë¤È¤¹¤ë¤È,
+tcl/tk ¤Î
info commands
-ã¨ã„ã†å‘½ä»¤ã¯ tcltk ライブラリã§ã¯
+¤È¤¤¤¦Ì¿Îá¤Ï tcltk ¥é¥¤¥Ö¥é¥ê¤Ç¤Ï
info.e("commands")
-ã¨è¨˜è¿°ã•れã¾ã™. ã¾ãŸ, 「.ã€ã¨ã„ã†ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ (wish 実行時ã«è‡ªå‹•çš„ã«ç”Ÿ
-æˆã•れるルートウィジェット) ã«å¯¾å¿œã™ã‚‹ ruby ã®ã‚ªãƒ–ジェクト㌠root ã¨ã„
-ã†åå‰ã§ã‚ã‚‹ã¨ã™ã‚‹ã¨,
+¤Èµ­½Ò¤µ¤ì¤Þ¤¹. ¤Þ¤¿, ¡Ö.¡×¤È¤¤¤¦¥¦¥£¥¸¥§¥Ã¥È (wish ¼Â¹Ô»þ¤Ë¼«Æ°Åª¤ËÀ¸
+À®¤µ¤ì¤ë¥ë¡¼¥È¥¦¥£¥¸¥§¥Ã¥È) ¤ËÂбþ¤¹¤ë ruby ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤¬ root ¤È¤¤
+¤¦Ì¾Á°¤Ç¤¢¤ë¤È¤¹¤ë¤È,
. configure -height 300 -width 300
-ã¨ã„ㆠtcl/tk ã®å‘½ä»¤ã¯
+¤È¤¤¤¦ tcl/tk ¤ÎÌ¿Îá¤Ï
root.e("configure -height 300 -width 300")
-ã¨è¨˜è¿°ã•れã¾ã™. ã“ã®ã‚ˆã†ãªè¨˜è¿°ã¯, 見ãŸã‚ã«ã¯ç¾Žã—ãã‚りã¾ã›ã‚“ãŒ, ãã—ã¦,
-スクリプトを読む人ã«ã¯è¦‹ã¥ã‚‰ã„ã‹ã‚‚知れã¾ã›ã‚“ãŒ, 実際ã«ã‚¹ã‚¯ãƒªãƒ—トを書ã„
-ã¦ã¿ã‚‹ã¨äºˆæƒ³å¤–ã«æ‰‹è»½ã§ã™.
+¤Èµ­½Ò¤µ¤ì¤Þ¤¹. ¤³¤Î¤è¤¦¤Êµ­½Ò¤Ï, ¸«¤¿¤á¤Ë¤ÏÈþ¤·¤¯¤¢¤ê¤Þ¤»¤ó¤¬, ¤½¤·¤Æ,
+¥¹¥¯¥ê¥×¥È¤òÆÉ¤à¿Í¤Ë¤Ï¸«¤Å¤é¤¤¤«¤âÃΤì¤Þ¤»¤ó¤¬, ¼ÂºÝ¤Ë¥¹¥¯¥ê¥×¥È¤ò½ñ¤¤
+¤Æ¤ß¤ë¤ÈͽÁÛ³°¤Ë¼ê·Ú¤Ç¤¹.
-[使用法]
+[»ÈÍÑË¡]
-1. ライブラリを読ã¿è¾¼ã‚€.
+1. ¥é¥¤¥Ö¥é¥ê¤òÆÉ¤ß¹þ¤à.
require "tcltk"
-2. tcl/tk インタプリタを生æˆã™ã‚‹.
+2. tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤òÀ¸À®¤¹¤ë.
ip = TclTkInterpreter.new()
-3. tcl/tk ã®ã‚³ãƒžãƒ³ãƒ‰ã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトを変数ã«ä»£å…¥ã—ã¦ãŠã.
- # コマンドã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトãŒå…¥ã£ãŸ Hash ã‚’å–り出ã™.
+3. tcl/tk ¤Î¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤òÊÑ¿ô¤ËÂåÆþ¤·¤Æ¤ª¤¯.
+ # ¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤¬Æþ¤Ã¤¿ Hash ¤ò¼è¤ê½Ð¤¹.
c = ip.commands()
- # 使ã„ãŸã„コマンドã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトを個別ã®å¤‰æ•°ã«ä»£å…¥ã™ã‚‹.
+ # »È¤¤¤¿¤¤¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ò¸ÄÊ̤ÎÊÑ¿ô¤ËÂåÆþ¤¹¤ë.
bind, button, info, wm = c.indexes("bind", "button", "info", "wm")
-4. å¿…è¦ãªå‡¦ç†ã‚’行ã†.
- 詳ã—ãã¯, サンプルをå‚ç…§ã®ã“ã¨.
+4. ɬÍפʽèÍý¤ò¹Ô¤¦.
+ ¾Ü¤·¤¯¤Ï, ¥µ¥ó¥×¥ë¤ò»²¾È¤Î¤³¤È.
-5. 準備ãŒã§ããŸã‚‰, イベントループã«å…¥ã‚‹.
+5. ½àÈ÷¤¬¤Ç¤­¤¿¤é, ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ËÆþ¤ë.
TclTk.mainloop()
-(( 以下, モジュール, クラス等ã®èª¬æ˜Žã‚’書ã予定.))
+(( °Ê²¼, ¥â¥¸¥å¡¼¥ë, ¥¯¥é¥¹Åù¤ÎÀâÌÀ¤ò½ñ¤¯Í½Äê.))
-<< tcltklib ライブラリ >>
+<< tcltklib ¥é¥¤¥Ö¥é¥ê >>
-tcl/tk ã® C ライブラリを利用ã™ã‚‹ãŸã‚ã®ä½Žæ°´æº–インターフェースをæä¾›ã—ã¾
-ã™.
+tcl/tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤ¹¤ë¤¿¤á¤ÎÄã¿å½à¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Þ
+¤¹.
-コンパイル/実行ã«ã¯, tcl/tk ã® C ライブラリãŒå¿…è¦ã§ã™.
+¥³¥ó¥Ñ¥¤¥ë/¼Â¹Ô¤Ë¤Ï, tcl/tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפǤ¹.
-[説明]
+[ÀâÌÀ]
-ã“ã®ãƒ©ã‚¤ãƒ–ラリを用ã„ã‚‹ã¨, ruby ã‹ã‚‰ tcl/tk ã® C ライブラリを利用ã§ãã¾
-ã™. 具体的ã«ã¯, ruby インタプリタã‹ã‚‰ tcl/tk インタプリタを呼ã³å‡ºã™ã“
-ã¨ãŒã§ãã¾ã™. ã•らã«, ãã®(ruby インタプリタã‹ã‚‰å‘¼ã³å‡ºã—ãŸ) tcl/tk イ
-ンタプリタã‹ã‚‰, 逆㫠ruby インタプリタを呼ã³å‡ºã™ã“ã¨ã‚‚ã§ãã¾ã™.
+¤³¤Î¥é¥¤¥Ö¥é¥ê¤òÍѤ¤¤ë¤È, ruby ¤«¤é tcl/tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤǤ­¤Þ
+¤¹. ¶ñÂÎŪ¤Ë¤Ï, ruby ¥¤¥ó¥¿¥×¥ê¥¿¤«¤é tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤ò¸Æ¤Ó½Ð¤¹¤³
+¤È¤¬¤Ç¤­¤Þ¤¹. ¤µ¤é¤Ë, ¤½¤Î(ruby ¥¤¥ó¥¿¥×¥ê¥¿¤«¤é¸Æ¤Ó½Ð¤·¤¿) tcl/tk ¥¤
+¥ó¥¿¥×¥ê¥¿¤«¤é, µÕ¤Ë ruby ¥¤¥ó¥¿¥×¥ê¥¿¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹.
-[使用法]
+[»ÈÍÑË¡]
-require "tcltklib" ã™ã‚‹ã¨, 以下ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«, クラスãŒåˆ©ç”¨å¯èƒ½ã§ã™.
+require "tcltklib" ¤¹¤ë¤È, °Ê²¼¤Î¥â¥¸¥å¡¼¥ë, ¥¯¥é¥¹¤¬ÍøÍѲÄǽ¤Ç¤¹.
-モジュール TclTkLib
- tcl/tk ライブラリを呼ã³å‡ºã™ãƒ¡ã‚½ãƒƒãƒ‰ã‚’集ã‚ãŸãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã§ã™. ãŸã ã—,
- tcl/tk インタプリタ関係ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯ã‚¯ãƒ©ã‚¹ TclTkIp ã«ã‚りã¾ã™.
+¥â¥¸¥å¡¼¥ë TclTkLib
+ tcl/tk ¥é¥¤¥Ö¥é¥ê¤ò¸Æ¤Ó½Ð¤¹¥á¥½¥Ã¥É¤ò½¸¤á¤¿¥â¥¸¥å¡¼¥ë¤Ç¤¹. ¤¿¤À¤·,
+ tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿´Ø·¸¤Î¥á¥½¥Ã¥É¤Ï¥¯¥é¥¹ TclTkIp ¤Ë¤¢¤ê¤Þ¤¹.
- モジュールメソッド mainloop()
- Tk_MainLoop を実行ã—ã¾ã™. å…¨ã¦ã® tk ã®ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ãŒç„¡ããªã‚‹ã¨çµ‚了
- ã—ã¾ã™(例ãˆã°, tcl/tk ã§æ›¸ãã¨ã“ã‚ã® "destroy ." ã‚’ã—ãŸå ´åˆç­‰).
- 引数: ç„¡ã—
- 戻り値: nil
+ ¥â¥¸¥å¡¼¥ë¥á¥½¥Ã¥É mainloop()
+ Tk_MainLoop ¤ò¼Â¹Ô¤·¤Þ¤¹. Á´¤Æ¤Î tk ¤Î¥¦¥¤¥ó¥É¥¦¤¬Ìµ¤¯¤Ê¤ë¤È½ªÎ»
+ ¤·¤Þ¤¹(Î㤨¤Ð, tcl/tk ¤Ç½ñ¤¯¤È¤³¤í¤Î "destroy ." ¤ò¤·¤¿¾ì¹çÅù).
+ °ú¿ô: ̵¤·
+ Ìá¤êÃÍ: nil
-クラス TclTkIp
- インスタンス㌠tcl/tk ã®ã‚¤ãƒ³ã‚¿ãƒ—リタã«å¯¾å¿œã—ã¾ã™. tcl/tk ã®ãƒ©ã‚¤ãƒ–
- ラリã®ä»•様通り, インスタンスを複数個生æˆã—ã¦ã‚‚æ­£ã—ã動作ã—ã¾ã™(ã
- ã‚“ãªã“ã¨ã‚’ã™ã‚‹å¿…è¦ã¯ã‚ã¾ã‚Šç„¡ã„ã¯ãšã§ã™ãŒ). インタプリタ㯠wish ã®
- tcl/tk コマンドを実行ã§ãã¾ã™. ã•らã«, 以下ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã§ãã¾
- ã™.
- コマンド ruby
- 引数を ruby ã§å®Ÿè¡Œã—ã¾ã™(ruby_eval_string を実行ã—ã¾ã™). 引数
- 㯠1 ã¤ã§ãªã‘れã°ãªã‚Šã¾ã›ã‚“. 戻り値㯠ruby ã®å®Ÿè¡Œçµæžœã§ã™.
- ruby ã®å®Ÿè¡Œçµæžœã¯ nil ã‹ String ã§ãªã‘れã°ãªã‚Šã¾ã›ã‚“.
+¥¯¥é¥¹ TclTkIp
+ ¥¤¥ó¥¹¥¿¥ó¥¹¤¬ tcl/tk ¤Î¥¤¥ó¥¿¥×¥ê¥¿¤ËÂбþ¤·¤Þ¤¹. tcl/tk ¤Î¥é¥¤¥Ö
+ ¥é¥ê¤Î»ÅÍÍÄ̤ê, ¥¤¥ó¥¹¥¿¥ó¥¹¤òÊ£¿ô¸ÄÀ¸À®¤·¤Æ¤âÀµ¤·¤¯Æ°ºî¤·¤Þ¤¹(¤½
+ ¤ó¤Ê¤³¤È¤ò¤¹¤ëɬÍפϤ¢¤Þ¤ê̵¤¤¤Ï¤º¤Ç¤¹¤¬). ¥¤¥ó¥¿¥×¥ê¥¿¤Ï wish ¤Î
+ tcl/tk ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹. ¤µ¤é¤Ë, °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ
+ ¤¹.
+ ¥³¥Þ¥ó¥É ruby
+ °ú¿ô¤ò ruby ¤Ç¼Â¹Ô¤·¤Þ¤¹(ruby_eval_string ¤ò¼Â¹Ô¤·¤Þ¤¹). °ú¿ô
+ ¤Ï 1 ¤Ä¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó. Ìá¤êÃÍ¤Ï ruby ¤Î¼Â¹Ô·ë²Ì¤Ç¤¹.
+ ruby ¤Î¼Â¹Ô·ë²Ì¤Ï nil ¤« String ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó.
- クラスメソッド new()
- TclTkIp クラスã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’生æˆã—ã¾ã™
- 引数: ç„¡ã—
- 戻り値 (TclTkIp): 生æˆã•れãŸã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹
+ ¥¯¥é¥¹¥á¥½¥Ã¥É new()
+ TclTkIp ¥¯¥é¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤·¤Þ¤¹
+ °ú¿ô: ̵¤·
+ Ìá¤êÃÍ (TclTkIp): À¸À®¤µ¤ì¤¿¥¤¥ó¥¹¥¿¥ó¥¹
- メソッド _eval(script)
- インタプリタ㧠script を評価ã—ã¾ã™(Tcl_Eval を実行ã—ã¾ã™). å‰è¿°
- ã®ã‚ˆã†ã«, ruby コマンドã«ã‚ˆã‚Š script 内ã‹ã‚‰ ruby スクリプトを実
- 行ã§ãã¾ã™.
- 引数: script (String) - インタプリタã§è©•価ã™ã‚‹ã‚¹ã‚¯ãƒªãƒ—ト文字列
- 戻り値 (String): è©•ä¾¡çµæžœ ((Tcl_Interp *)->result)
+ ¥á¥½¥Ã¥É _eval(script)
+ ¥¤¥ó¥¿¥×¥ê¥¿¤Ç script ¤òɾ²Á¤·¤Þ¤¹(Tcl_Eval ¤ò¼Â¹Ô¤·¤Þ¤¹). Á°½Ò
+ ¤Î¤è¤¦¤Ë, ruby ¥³¥Þ¥ó¥É¤Ë¤è¤ê script Æâ¤«¤é ruby ¥¹¥¯¥ê¥×¥È¤ò¼Â
+ ¹Ô¤Ç¤­¤Þ¤¹.
+ °ú¿ô: script (String) - ¥¤¥ó¥¿¥×¥ê¥¿¤Çɾ²Á¤¹¤ë¥¹¥¯¥ê¥×¥Èʸ»úÎó
+ Ìá¤êÃÍ (String): ɾ²Á·ë²Ì ((Tcl_Interp *)->result)
- メソッド _return_value()
- ç›´å‰ã® Tcl_Eval ã®æˆ»ã‚Šå€¤ã‚’è¿”ã—ã¾ã™. 0(TCL_OK) ã§æ­£å¸¸çµ‚了ã§ã™.
- 引数: ç„¡ã—
- 戻り値 (Fixnum): ç›´å‰ã® Tcl_Eval() ãŒè¿”ã—ãŸå€¤.
+ ¥á¥½¥Ã¥É _return_value()
+ ľÁ°¤Î Tcl_Eval ¤ÎÌá¤êÃͤòÊÖ¤·¤Þ¤¹. 0(TCL_OK) ¤ÇÀµ¾ï½ªÎ»¤Ç¤¹.
+ °ú¿ô: ̵¤·
+ Ìá¤êÃÍ (Fixnum): ľÁ°¤Î Tcl_Eval() ¤¬ÊÖ¤·¤¿ÃÍ.
==============================================================
-ä»¥ä¸‹ãŒæœ¬ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆä½œæˆæ™‚点ã§ã® tcltklib ライブラリã®èª¬æ˜Žã§ã™ï¼Ž
+°Ê²¼¤¬Ëܥɥ­¥å¥á¥ó¥ÈºîÀ®»þÅÀ¤Ç¤Î tcltklib ¥é¥¤¥Ö¥é¥ê¤ÎÀâÌÀ¤Ç¤¹¡¥
==============================================================
-モジュール TclTkLib
- : 個々㮠Tcl/Tk インタープリタã«ä¾å­˜ã—ãªã„å‡¦ç† ( == イベントルー
- : プã«é–¢ã™ã‚‹å‡¦ç† ) を呼ã³å‡ºã™ãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã—ãŸãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ï¼Ž
-
- モジュール TclTkLib::EventFlag
- : do_one_event を呼ã³å‡ºã™éš›ã®å‡¦ç†å¯¾è±¡ã‚¤ãƒ™ãƒ³ãƒˆã‚’指定ã™ã‚‹ãŸã‚ã®
- : フラグ ( WINDOW|DONT_WAIT ã¨ã„ã†ã‚ˆã†ã«ãƒ“ット演算å­ã§é€£çµã—ã¦
- : 指定 ) を定数ã¨ã—ã¦å®šç¾©ã—ãŸãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ï¼Žä»¥ä¸‹ã®å®šæ•°ãŒå«ã¾ã‚Œã‚‹ï¼Ž
-
- 定数 NONE
- : 値㯠0 ã§ï¼Œå€¤ã¨ã—ã¦ã¯ã„ã‹ãªã‚‹ç¨®é¡žã®ã‚¤ãƒ™ãƒ³ãƒˆã‚‚指定ã—ã¦ã„ãªã„
- : ã“ã¨ã«ãªã‚‹ãŒï¼Œå®Ÿéš›ã®å‡¦ç†ä¸Šã¯ ALL ã¨åŒã˜ã¨ã—ã¦æ‰±ã‚れる.
-
- 定数 WINDOW
- : window イベントを処ç†å¯¾è±¡ã¨ã™ã‚‹
-
- 定数 FILE
- : file イベントを処ç†å¯¾è±¡ã¨ã™ã‚‹
-
- 定数 TIMER
- : timer イベントを処ç†å¯¾è±¡ã¨ã™ã‚‹
-
- 定数 IDLE
- : ã‚¢ã‚¤ãƒ‰ãƒ«ãƒ«ãƒ¼ãƒ—å‡¦ç† ( å†æç”»ãªã©ï¼Œä»–ã®ç¨®é¡žã®ã‚¤ãƒ™ãƒ³ãƒˆãŒç™ºç”Ÿ
- : ã—ã¦ã„ãªã„ã¨ãã«è¡Œã‚ã‚Œã‚‹å‡¦ç† ) を処ç†å¯¾è±¡ã¨ã™ã‚‹
-
- 定数 ALL
- : ã™ã¹ã¦ã®ç¨®é¡žã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’処ç†å¯¾è±¡ã¨ã™ã‚‹
- : WINDOW|FILE|TIMER|IDLE ã¨åŒã˜
-
- 定数 DONT_WAIT
- : 処ç†å¯¾è±¡ã‚¤ãƒ™ãƒ³ãƒˆãŒå­˜åœ¨ã—ãªã„å ´åˆã«ï¼Œã‚¤ãƒ™ãƒ³ãƒˆç™ºç”Ÿã‚’å¾…ãŸãš
- : ã« do_one_event を終了 ( false を返㙠) ã™ã‚‹
-
- モジュール TclTkLib::VarAccessFlag
- : _get_variable ãªã©ã§ã®ãƒ•ラグを指定ã™ã‚‹ãŸã‚ã®ã‚‚ã®ï¼Žãƒ•ラグã«
- : ã¯ä»¥ä¸‹ã®å®šæ•°ã‚’ OR ã§é€£çµã—ã¦ä¸Žãˆã‚‹ï¼Ž
-
- 定数 NONE
- : 値㯠0 ã§ï¼Œä½•もフラグを指定ã—ã¦ã„ãªã„ã®ã«ç­‰ã—ã„.
-
- 定数 GLOBAL_ONLY
- : é€šå¸¸ï¼Œå¤‰æ•°ã®æ¤œç´¢ã¯ã¾ãšæ‰‹ç¶šã呼ã³å‡ºã—を行ã£ãŸãƒ¬ãƒ™ãƒ«ã§æ¤œ
- : ç´¢ã—,次ã«ç¾åœ¨ã®åå‰ç©ºé–“ã§æ¤œç´¢ï¼Œæœ€å¾Œã«ã‚°ãƒ­ãƒ¼ãƒãƒ«ç©ºé–“ã§
- : 検索を行ã†ï¼Žã—ã‹ã—,ã“ã®ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れãŸå ´åˆã«ã¯ï¼Œã‚°
- : ローãƒãƒ«ç©ºé–“ã§ã®ã¿æ¤œç´¢ã™ã‚‹ï¼Ž
- : ã‚‚ã— GLOBAL_ONLY 㨠NAMESPACE_ONLY ã¨ãŒä¸¡æ–¹æŒ‡å®šã•れãŸå ´
- : åˆã«ã¯ï¼ŒGLOBAL_ONLY ã®æŒ‡å®šã¯ç„¡è¦–ã•れる.
-
- 定数 NAMESPACE_ONLY
- : ã“ã®ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れãŸå ´åˆã«ã¯ï¼Œç¾åœ¨ã®åå‰ç©ºé–“ã§ã®ã¿å¤‰
- : æ•°ã®æ¤œç´¢ã‚’行ã†ï¼ŽGLOBAL_ONLY ã®èª¬æ˜Žã‚‚å‚ç…§ã™ã‚‹ã“ã¨ï¼Ž
-
- 定数 LEAVE_ERR_MSG
- : 変数アクセスã«ãŠã„ã¦ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸå ´åˆï¼Œã“ã®ãƒ•ラグãŒ
- : 指定ã•れã¦ã„れã°ï¼Œå®Ÿè¡Œçµæžœã¨ã—㦠Tcl インタープリタã«ã‚¨
- : ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒæ®‹ã•れる.ã“ã®ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れã¦ã„ãªã‘
- : れã°ï¼Œã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ä¸€åˆ‡æ®‹ã•れãªã„.
-
- 定数 APPEND_VALUE
- : ã“ã®ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れã¦ã„ãŸå ´åˆï¼Œå¤‰æ•°ã®å€¤ã‚’ç½®ãæ›ãˆã®ã§
- : ã¯ãªã,ç¾åœ¨ã®å€¤ã«ä»£å…¥å€¤ãŒè¿½åŠ  (append; 文字列連çµ) ã•
- : ã‚Œã‚‹ï¼Žå¤‰æ•°ãŒæœªå®šç¾©ã‚ã£ãŸå ´åˆï¼Œã“ã®ãƒ•ラグã¯ç„¡è¦–ã•れる.
-
- 定数 LIST_ELEMENT
- : ã“ã®ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•れã¦ã„ãŸå ´åˆï¼Œä»£å…¥å€¤ã¯ã¾ãš Tcl ã®ãƒªã‚¹
- : トè¦ç´ ã¨ã—ã¦é©åˆ‡ã¨ãªã‚‹ã‚ˆã†ã«å¤‰æ›ã•れる.代入値ãŒãƒªã‚¹ãƒˆ
- : (ã¾ãŸã¯ã‚µãƒ–リスト) ã®æœ€åˆã®è¦ç´ ã¨ãªã‚‹ã®ã§ãªã„é™ã‚Šï¼Œä»£å…¥
- : 値ã®ç›´å‰ã«ã¯ç©ºç™½æ–‡å­—ãŒè¿½åŠ ã•れる.
-
- 定数 PARSE_VARNAME
- : _set_variable ãªã©ã®å‘¼ã³å‡ºã—ã«ãŠã„ã¦ã“ã®ãƒ•ãƒ©ã‚°ãŒæŒ‡å®šã•
- : れã¦ã„ãŸå ´åˆï¼Œvar_name 引数ãŒé€£æƒ³é…列åã¨è¦ç´ åã¨ã‚’両方
- : å«ã‚€å¯èƒ½æ€§ãŒã‚ã‚‹ (é–‹ãæ‹¬å¼§ã‚’å«ã¿ï¼Œé–‰ã˜æ‹¬å¼§ã§çµ‚ã‚ã‚‹) ã“
- : ã¨ã‚’示ã™ï¼Žãã®å ´åˆï¼Œæ‹¬å¼§ã®é–“ãŒè¦ç´ å指定,最åˆã®é–‹ã括
- : å¼§ã¾ã§ãŒé€£æƒ³é…列åã¨ã—ã¦æ‰±ã‚れる._set_variable2 ãªã©ã§
- : ã“ã®ãƒ•ラグを指定ã™ã‚‹å ´åˆï¼Œé€£æƒ³é…列åã¨è¦ç´ å㯠var_name
- : ã‹ã‚‰æŠ½å‡ºã•れるã¯ãšã§ã‚ã‚‹ã‹ã‚‰ï¼Œindex_name 引数㯠nil ã¨
- : ã›ã­ã°ãªã‚‰ãªã„.
-
- モジュール TclTkLib::RELEASE_TYPE
- : Tcl/Tk ã®ãƒªãƒªãƒ¼ã‚¹ã‚¿ã‚¤ãƒ—番å·ã®å®šç¾©
-
- 定数 ALPHA
- : ALPHA リリース
-
- 定数 BETA
- : BETA リリース
-
- 定数 FINAL
- : FINAL リリース
-
- モジュールメソッド
+¥â¥¸¥å¡¼¥ë TclTkLib
+ : ¸Ä¡¹¤Î Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ë°Í¸¤·¤Ê¤¤½èÍý ( == ¥¤¥Ù¥ó¥È¥ë¡¼
+ : ¥×¤Ë´Ø¤¹¤ë½èÍý ) ¤ò¸Æ¤Ó½Ð¤¹¥á¥½¥Ã¥É¤òÄêµÁ¤·¤¿¥â¥¸¥å¡¼¥ë¡¥
+
+ ¥â¥¸¥å¡¼¥ë TclTkLib::EventFlag
+ : do_one_event ¤ò¸Æ¤Ó½Ð¤¹ºÝ¤Î½èÍýÂоݥ¤¥Ù¥ó¥È¤ò»ØÄꤹ¤ë¤¿¤á¤Î
+ : ¥Õ¥é¥° ( WINDOW|DONT_WAIT ¤È¤¤¤¦¤è¤¦¤Ë¥Ó¥Ã¥È±é»»»Ò¤ÇÏ¢·ë¤·¤Æ
+ : »ØÄê ) ¤òÄê¿ô¤È¤·¤ÆÄêµÁ¤·¤¿¥â¥¸¥å¡¼¥ë¡¥°Ê²¼¤ÎÄê¿ô¤¬´Þ¤Þ¤ì¤ë¡¥
+
+ Äê¿ô NONE
+ : ÃÍ¤Ï 0 ¤Ç¡¤ÃͤȤ·¤Æ¤Ï¤¤¤«¤Ê¤ë¼ïÎà¤Î¥¤¥Ù¥ó¥È¤â»ØÄꤷ¤Æ¤¤¤Ê¤¤
+ : ¤³¤È¤Ë¤Ê¤ë¤¬¡¤¼ÂºÝ¤Î½èÍý¾å¤Ï ALL ¤ÈƱ¤¸¤È¤·¤Æ°·¤ï¤ì¤ë¡¥
+
+ Äê¿ô WINDOW
+ : window ¥¤¥Ù¥ó¥È¤ò½èÍýÂоݤȤ¹¤ë
+
+ Äê¿ô FILE
+ : file ¥¤¥Ù¥ó¥È¤ò½èÍýÂоݤȤ¹¤ë
+
+ Äê¿ô TIMER
+ : timer ¥¤¥Ù¥ó¥È¤ò½èÍýÂоݤȤ¹¤ë
+
+ Äê¿ô IDLE
+ : ¥¢¥¤¥É¥ë¥ë¡¼¥×½èÍý ( ºÆÉÁ²è¤Ê¤É¡¤Â¾¤Î¼ïÎà¤Î¥¤¥Ù¥ó¥È¤¬È¯À¸
+ : ¤·¤Æ¤¤¤Ê¤¤¤È¤­¤Ë¹Ô¤ï¤ì¤ë½èÍý ) ¤ò½èÍýÂоݤȤ¹¤ë
+
+ Äê¿ô ALL
+ : ¤¹¤Ù¤Æ¤Î¼ïÎà¤Î¥¤¥Ù¥ó¥È¤ò½èÍýÂоݤȤ¹¤ë
+ : WINDOW|FILE|TIMER|IDLE ¤ÈƱ¤¸
+
+ Äê¿ô DONT_WAIT
+ : ½èÍýÂоݥ¤¥Ù¥ó¥È¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¡¤¥¤¥Ù¥ó¥ÈȯÀ¸¤òÂÔ¤¿¤º
+ : ¤Ë do_one_event ¤ò½ªÎ» ( false ¤òÊÖ¤¹ ) ¤¹¤ë
+
+ ¥â¥¸¥å¡¼¥ë TclTkLib::VarAccessFlag
+ : _get_variable ¤Ê¤É¤Ç¤Î¥Õ¥é¥°¤ò»ØÄꤹ¤ë¤¿¤á¤Î¤â¤Î¡¥¥Õ¥é¥°¤Ë
+ : ¤Ï°Ê²¼¤ÎÄê¿ô¤ò OR ¤ÇÏ¢·ë¤·¤ÆÍ¿¤¨¤ë¡¥
+
+ Äê¿ô NONE
+ : ÃÍ¤Ï 0 ¤Ç¡¤²¿¤â¥Õ¥é¥°¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¤Î¤ËÅù¤·¤¤¡¥
+
+ Äê¿ô GLOBAL_ONLY
+ : Ä̾ÊÑ¿ô¤Î¸¡º÷¤Ï¤Þ¤º¼ê³¤­¸Æ¤Ó½Ð¤·¤ò¹Ô¤Ã¤¿¥ì¥Ù¥ë¤Ç¸¡
+ : º÷¤·¡¤¼¡¤Ë¸½ºß¤Î̾Á°¶õ´Ö¤Ç¸¡º÷¡¤ºÇ¸å¤Ë¥°¥í¡¼¥Ð¥ë¶õ´Ö¤Ç
+ : ¸¡º÷¤ò¹Ô¤¦¡¥¤·¤«¤·¡¤¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¤¥°
+ : ¥í¡¼¥Ð¥ë¶õ´Ö¤Ç¤Î¤ß¸¡º÷¤¹¤ë¡¥
+ : ¤â¤· GLOBAL_ONLY ¤È NAMESPACE_ONLY ¤È¤¬Î¾Êý»ØÄꤵ¤ì¤¿¾ì
+ : ¹ç¤Ë¤Ï¡¤GLOBAL_ONLY ¤Î»ØÄê¤Ï̵»ë¤µ¤ì¤ë¡¥
+
+ Äê¿ô NAMESPACE_ONLY
+ : ¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¤¸½ºß¤Î̾Á°¶õ´Ö¤Ç¤Î¤ßÊÑ
+ : ¿ô¤Î¸¡º÷¤ò¹Ô¤¦¡¥GLOBAL_ONLY ¤ÎÀâÌÀ¤â»²¾È¤¹¤ë¤³¤È¡¥
+
+ Äê¿ô LEAVE_ERR_MSG
+ : ÊÑ¿ô¥¢¥¯¥»¥¹¤Ë¤ª¤¤¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¤¤³¤Î¥Õ¥é¥°¤¬
+ : »ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¤¼Â¹Ô·ë²Ì¤È¤·¤Æ Tcl ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ë¥¨
+ : ¥é¡¼¥á¥Ã¥»¡¼¥¸¤¬»Ä¤µ¤ì¤ë¡¥¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±
+ : ¤ì¤Ð¡¤¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ï°ìÀڻĤµ¤ì¤Ê¤¤¡¥
+
+ Äê¿ô APPEND_VALUE
+ : ¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¤ÊÑ¿ô¤ÎÃͤòÃÖ¤­´¹¤¨¤Î¤Ç
+ : ¤Ï¤Ê¤¯¡¤¸½ºß¤ÎÃͤËÂåÆþÃͤ¬Äɲà (append; ʸ»úÎóÏ¢·ë) ¤µ
+ : ¤ì¤ë¡¥ÊÑ¿ô¤¬Ì¤ÄêµÁ¤¢¤Ã¤¿¾ì¹ç¡¤¤³¤Î¥Õ¥é¥°¤Ï̵»ë¤µ¤ì¤ë¡¥
+
+ Äê¿ô LIST_ELEMENT
+ : ¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¡¤ÂåÆþÃͤϤޤº Tcl ¤Î¥ê¥¹
+ : ¥ÈÍ×ÁǤȤ·¤ÆÅ¬ÀڤȤʤë¤è¤¦¤ËÊÑ´¹¤µ¤ì¤ë¡¥ÂåÆþÃͤ¬¥ê¥¹¥È
+ : (¤Þ¤¿¤Ï¥µ¥Ö¥ê¥¹¥È) ¤ÎºÇ½é¤ÎÍ×ÁǤȤʤë¤Î¤Ç¤Ê¤¤¸Â¤ê¡¤ÂåÆþ
+ : ÃͤÎľÁ°¤Ë¤Ï¶õÇòʸ»ú¤¬Äɲ䵤ì¤ë¡¥
+
+ Äê¿ô PARSE_VARNAME
+ : _set_variable ¤Ê¤É¤Î¸Æ¤Ó½Ð¤·¤Ë¤ª¤¤¤Æ¤³¤Î¥Õ¥é¥°¤¬»ØÄꤵ
+ : ¤ì¤Æ¤¤¤¿¾ì¹ç¡¤var_name °ú¿ô¤¬Ï¢ÁÛÇÛÎó̾¤ÈÍ×ÁÇ̾¤È¤òξÊý
+ : ´Þ¤à²ÄǽÀ­¤¬¤¢¤ë (³«¤­³ç¸Ì¤ò´Þ¤ß¡¤ÊĤ¸³ç¸Ì¤Ç½ª¤ï¤ë) ¤³
+ : ¤È¤ò¼¨¤¹¡¥¤½¤Î¾ì¹ç¡¤³ç¸Ì¤Î´Ö¤¬Í×ÁÇ̾»ØÄꡤºÇ½é¤Î³«¤­³ç
+ : ¸Ì¤Þ¤Ç¤¬Ï¢ÁÛÇÛÎó̾¤È¤·¤Æ°·¤ï¤ì¤ë¡¥_set_variable2 ¤Ê¤É¤Ç
+ : ¤³¤Î¥Õ¥é¥°¤ò»ØÄꤹ¤ë¾ì¹ç¡¤Ï¢ÁÛÇÛÎó̾¤ÈÍ×ÁÇ̾¤Ï var_name
+ : ¤«¤éÃê½Ð¤µ¤ì¤ë¤Ï¤º¤Ç¤¢¤ë¤«¤é¡¤index_name °ú¿ô¤Ï nil ¤È
+ : ¤»¤Í¤Ð¤Ê¤é¤Ê¤¤¡¥
+
+ ¥â¥¸¥å¡¼¥ë TclTkLib::RELEASE_TYPE
+ : Tcl/Tk ¤Î¥ê¥ê¡¼¥¹¥¿¥¤¥×ÈÖ¹æ¤ÎÄêµÁ
+
+ Äê¿ô ALPHA
+ : ALPHA ¥ê¥ê¡¼¥¹
+
+ Äê¿ô BETA
+ : BETA ¥ê¥ê¡¼¥¹
+
+ Äê¿ô FINAL
+ : FINAL ¥ê¥ê¡¼¥¹
+
+ ¥â¥¸¥å¡¼¥ë¥á¥½¥Ã¥É
get_version()
- : Tcl/Tk ã® major, minor, release-type 番å·, patchlevel ã‚’
- : é…列ã«ã—ã¦è¿”ã™ï¼Ž
+ : Tcl/Tk ¤Î major, minor, release-type ÈÖ¹æ, patchlevel ¤ò
+ : ÇÛÎó¤Ë¤·¤ÆÊÖ¤¹¡¥
mainloop(check_root = true)
- : イベントループを起動ã™ã‚‹ï¼Žcheck_root ㌠true ã§ã‚れã°ï¼Œ
- : root widget ãŒå­˜åœ¨ã™ã‚‹é™ã‚Šï¼Œã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯çµ‚了ã—ãªã„.
- : check_root ㌠false ã®å ´åˆã¯ï¼Œroot widget ãŒæ¶ˆæ»…ã—ã¦ã‚‚
- : ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯çµ‚了ã—ãªã„ ( root widget ãŒæ¶ˆæ»…ã—ã¦ã‚‚,
- : WINDOW 以外ã®ã‚¤ãƒ™ãƒ³ãƒˆã¯ç™ºç”Ÿã—ã†ã‚‹ãŸã‚ ).終了ã«ã¯ï¼Œå¤–部
- : ã‹ã‚‰ã®åƒã掛㑠( スレッドを活用ã™ã‚‹ãªã© ) ãŒå¿…è¦ï¼Ž
+ : ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤òµ¯Æ°¤¹¤ë¡¥check_root ¤¬ true ¤Ç¤¢¤ì¤Ð¡¤
+ : root widget ¤¬Â¸ºß¤¹¤ë¸Â¤ê¡¤¤³¤Î¥á¥½¥Ã¥É¤Ï½ªÎ»¤·¤Ê¤¤¡¥
+ : check_root ¤¬ false ¤Î¾ì¹ç¤Ï¡¤root widget ¤¬¾ÃÌǤ·¤Æ¤â
+ : ¤³¤Î¥á¥½¥Ã¥É¤Ï½ªÎ»¤·¤Ê¤¤ ( root widget ¤¬¾ÃÌǤ·¤Æ¤â¡¤
+ : WINDOW °Ê³°¤Î¥¤¥Ù¥ó¥È¤ÏȯÀ¸¤·¤¦¤ë¤¿¤á )¡¥½ªÎ»¤Ë¤Ï¡¤³°Éô
+ : ¤«¤é¤ÎƯ¤­³Ý¤± ( ¥¹¥ì¥Ã¥É¤ò³èÍѤ¹¤ë¤Ê¤É ) ¤¬É¬Íס¥
mainloop_thread?
- : カレントスレッドãŒã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—を実行ã—ã¦ã„るスレッド
- : ã‹ã©ã†ã‹ã‚’è¿”ã™ï¼Ž
- : イベントループを実行ã—ã¦ã„るスレッドã§ã‚れ㰠true を,
- : ã©ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã§ã‚‚イベントループãŒå®Ÿè¡Œã•れã¦ã„ãªã„å ´åˆã¯
- : nil を,他ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã§ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ãŒå®Ÿè¡Œã•れã¦ã„ã‚‹å ´
- : åˆã¯ false ã‚’è¿”ã™ï¼Ž
- : false ã®éš›ã« Tk インタープリタを直接呼ã¶ã®ã¯å±é™ºã§ã‚る.
+ : ¥«¥ì¥ó¥È¥¹¥ì¥Ã¥É¤¬¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥¹¥ì¥Ã¥É
+ : ¤«¤É¤¦¤«¤òÊÖ¤¹¡¥
+ : ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥¹¥ì¥Ã¥É¤Ç¤¢¤ì¤Ð true ¤ò¡¤
+ : ¤É¤Î¥¹¥ì¥Ã¥É¤Ç¤â¥¤¥Ù¥ó¥È¥ë¡¼¥×¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï
+ : nil ¤ò¡¤Â¾¤Î¥¹¥ì¥Ã¥É¤Ç¥¤¥Ù¥ó¥È¥ë¡¼¥×¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¾ì
+ : ¹ç¤Ï false ¤òÊÖ¤¹¡¥
+ : false ¤ÎºÝ¤Ë Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤òľÀÜ¸Æ¤Ö¤Î¤Ï´í¸±¤Ç¤¢¤ë¡¥
mainloop_watchdog(check_root = true)
- : 通常ã®ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã§ã¯ï¼Œã‚¤ãƒ™ãƒ³ãƒˆå‡¦ç†ã®å†…容ã«ã‚ˆã£ã¦ã¯
- : デッドロックを引ãèµ·ã“ã™å¯èƒ½æ€§ãŒã‚ã‚‹ (例ãˆã°ã‚¤ãƒ™ãƒ³ãƒˆã«
- : 対ã™ã‚‹ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯å‡¦ç†ä¸­ã§ widget æ“作をã—,ãã®çµ‚了を
- : å¾…ã¤ãªã©).ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯ï¼Œãã†ã—ãŸãƒ‡ãƒƒãƒ‰ãƒ­ãƒƒã‚¯ã‚’回é¿ã™
- : ã‚‹ãŸã‚ã®ç›£è¦–スレッド付ãã§ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã‚’èµ·å‹•ã™ã‚‹
- : ( 監視スレッドを生æˆã—ãŸå¾Œã«ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—を実行ã™ã‚‹ ).
- : å¼•æ•°ã®æ„味㯠mainloop ã¨åŒã˜ã§ã‚る.
-
- do_one_event(flag = TclTkLib::EventFlag::ALL |
+ : Ä̾ï¤Î¥¤¥Ù¥ó¥È¥ë¡¼¥×¤Ç¤Ï¡¤¥¤¥Ù¥ó¥È½èÍý¤ÎÆâÍÆ¤Ë¤è¤Ã¤Æ¤Ï
+ : ¥Ç¥Ã¥É¥í¥Ã¥¯¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ë (Î㤨¤Ð¥¤¥Ù¥ó¥È¤Ë
+ : ÂФ¹¤ë¥³¡¼¥ë¥Ð¥Ã¥¯½èÍýÃæ¤Ç widget Áàºî¤ò¤·¡¤¤½¤Î½ªÎ»¤ò
+ : ÂԤĤʤÉ)¡¥¤³¤Î¥á¥½¥Ã¥É¤Ï¡¤¤½¤¦¤·¤¿¥Ç¥Ã¥É¥í¥Ã¥¯¤ò²óÈò¤¹
+ : ¤ë¤¿¤á¤Î´Æ»ë¥¹¥ì¥Ã¥ÉÉÕ¤­¤Ç¥¤¥Ù¥ó¥È¥ë¡¼¥×¤òµ¯Æ°¤¹¤ë
+ : ( ´Æ»ë¥¹¥ì¥Ã¥É¤òÀ¸À®¤·¤¿¸å¤Ë¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ò¼Â¹Ô¤¹¤ë )¡¥
+ : °ú¿ô¤Î°ÕÌ£¤Ï mainloop ¤ÈƱ¤¸¤Ç¤¢¤ë¡¥
+
+ do_one_event(flag = TclTkLib::EventFlag::ALL |
TclTkLib::EventFlag::DONT_WAIT)
- : 処ç†å¾…ã¡ã®ã‚¤ãƒ™ãƒ³ãƒˆ 1 個を実行ã™ã‚‹ï¼Ž
- : イベントを処ç†ã—ãŸå ´åˆã¯ true ã‚’è¿”ã™ï¼Ž
- : フラグ㧠DONT_WAIT を指定ã—ã¦ã„ãªã„å ´åˆï¼Œãƒ•ラグã§å‡¦ç†å¯¾
- : 象ã¨ãªã£ã¦ã„る種類ã®ã‚¤ãƒ™ãƒ³ãƒˆãŒç™ºç”Ÿã™ã‚‹ã¾ã§å¾…ã¡ç¶šã‘る.
- : DONT_WAIT を指定ã—ã¦ã„ãŸå ´åˆï¼Œå‡¦ç†å¯¾è±¡ã‚¤ãƒ™ãƒ³ãƒˆãŒãªãã¦ã‚‚
- : ã™ãã«çµ‚了㗠false ã‚’è¿”ã™ï¼Ž
- : $SAFE >= 4 ã‹ï¼Œ$SAFE >= 1 ã‹ã¤ flag ãŒæ±šæŸ“ã•れã¦ã„ã‚‹ãªã‚‰ã°
- : flag ã«ã¯ DONT_WAIT ãŒå¼·åˆ¶çš„ã«ä»˜ã‘られる.
+ : ½èÍýÂÔ¤Á¤Î¥¤¥Ù¥ó¥È 1 ¸Ä¤ò¼Â¹Ô¤¹¤ë¡¥
+ : ¥¤¥Ù¥ó¥È¤ò½èÍý¤·¤¿¾ì¹ç¤Ï true ¤òÊÖ¤¹¡¥
+ : ¥Õ¥é¥°¤Ç DONT_WAIT ¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¤¥Õ¥é¥°¤Ç½èÍýÂÐ
+ : ¾Ý¤È¤Ê¤Ã¤Æ¤¤¤ë¼ïÎà¤Î¥¤¥Ù¥ó¥È¤¬È¯À¸¤¹¤ë¤Þ¤ÇÂÔ¤Á³¤±¤ë¡¥
+ : DONT_WAIT ¤ò»ØÄꤷ¤Æ¤¤¤¿¾ì¹ç¡¤½èÍýÂоݥ¤¥Ù¥ó¥È¤¬¤Ê¤¯¤Æ¤â
+ : ¤¹¤°¤Ë½ªÎ»¤· false ¤òÊÖ¤¹¡¥
+ : $SAFE >= 4 ¤«¡¤$SAFE >= 1 ¤«¤Ä flag ¤¬±øÀ÷¤µ¤ì¤Æ¤¤¤ë¤Ê¤é¤Ð
+ : flag ¤Ë¤Ï DONT_WAIT ¤¬¶¯À©Åª¤ËÉÕ¤±¤é¤ì¤ë¡¥
set_eventloop_tick(timer_tick)
- : イベントループã¨åŒæ™‚ã«åˆ¥ã‚¹ãƒ¬ãƒƒãƒ‰ãŒç¨¼åƒã—ã¦ã„ã‚‹å ´åˆã«ï¼Œæ™‚
- : é–“ã«åŸºã¥ã„ãŸå¼·åˆ¶çš„ãªã‚¹ãƒ¬ãƒƒãƒ‰ã‚¹ã‚¤ãƒƒãƒãƒ³ã‚°ã‚’ã©ã®ç¨‹åº¦ã®é »åº¦
- : ( 時間間隔 ) ã§ç™ºç”Ÿã•ã›ã‚‹ã‹ã‚’ミリ秒å˜ä½ã®æ•´æ•°å€¤ã§æŒ‡å®šã™ã‚‹ï¼Ž
- : 0 を指定ã™ã‚‹ã¨ï¼Œã“ã®å¼·åˆ¶çš„ãªã‚¹ã‚¤ãƒƒãƒãƒ³ã‚°ã¯è¡Œã‚れãªã„.
- : 標準ã§ã¯ 0 ã«è¨­å®šã•れã¦ãŠã‚Šï¼Œã‚¤ãƒ™ãƒ³ãƒˆå‡¦ç†æ•°ã«åŸºã¥ãスイッ
- : ãƒãƒ³ã‚°ã ã‘ãŒè¡Œã‚れる ( see set_eventloop_weight ).
- : ãŸã ã—,稼åƒã—ã¦ã„るスレッドãŒã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã ã‘ã®å ´åˆï¼Œ
- : timer_tick ã‚’ 0 ã«è¨­å®šã™ã‚‹ã“ã¨ã¯ã§ããªã„.もã—設定ã•れã¦
- : ã„ãŸã‚‰ï¼Œ100 ms ( see NO_THREAD_INTERRUPT_TIME ) ã«è‡ªå‹•設
- : 定ã•れる.
- : 詳細ãªèª¬æ˜Žã¯ç•¥ã™ãŒï¼Œã“れ㯠CPU パワーを節約ã—ã¤ã¤å®‰å…¨ã§
- : 安定ã—ãŸå‹•作を実ç¾ã™ã‚‹ãŸã‚ã«å®Ÿè£…ã—ãŸä»•様ã§ã‚る.
- : $SAFE >= 4 ã§ã¯å®Ÿè¡ŒãŒç¦æ­¢ã•れる.
+ : ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ÈƱ»þ¤ËÊÌ¥¹¥ì¥Ã¥É¤¬²ÔƯ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¡¤»þ
+ : ´Ö¤Ë´ð¤Å¤¤¤¿¶¯À©Åª¤Ê¥¹¥ì¥Ã¥É¥¹¥¤¥Ã¥Á¥ó¥°¤ò¤É¤ÎÄøÅÙ¤ÎÉÑÅÙ
+ : ( »þ´Ö´Ö³Ö ) ¤ÇȯÀ¸¤µ¤»¤ë¤«¤ò¥ß¥êÉÃñ°Ì¤ÎÀ°¿ôÃͤǻØÄꤹ¤ë¡¥
+ : 0 ¤ò»ØÄꤹ¤ë¤È¡¤¤³¤Î¶¯À©Åª¤Ê¥¹¥¤¥Ã¥Á¥ó¥°¤Ï¹Ô¤ï¤ì¤Ê¤¤¡¥
+ : ɸ½à¤Ç¤Ï 0 ¤ËÀßÄꤵ¤ì¤Æ¤ª¤ê¡¤¥¤¥Ù¥ó¥È½èÍý¿ô¤Ë´ð¤Å¤¯¥¹¥¤¥Ã
+ : ¥Á¥ó¥°¤À¤±¤¬¹Ô¤ï¤ì¤ë ( see set_eventloop_weight )¡¥
+ : ¤¿¤À¤·¡¤²ÔƯ¤·¤Æ¤¤¤ë¥¹¥ì¥Ã¥É¤¬¥¤¥Ù¥ó¥È¥ë¡¼¥×¤À¤±¤Î¾ì¹ç¡¤
+ : timer_tick ¤ò 0 ¤ËÀßÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤¡¥¤â¤·ÀßÄꤵ¤ì¤Æ
+ : ¤¤¤¿¤é¡¤100 ms ( see NO_THREAD_INTERRUPT_TIME ) ¤Ë¼«Æ°Àß
+ : Äꤵ¤ì¤ë¡¥
+ : ¾ÜºÙ¤ÊÀâÌÀ¤Ïά¤¹¤¬¡¤¤³¤ì¤Ï CPU ¥Ñ¥ï¡¼¤òÀáÌ󤷤ĤİÂÁ´¤Ç
+ : °ÂÄꤷ¤¿Æ°ºî¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¼ÂÁõ¤·¤¿»ÅÍͤǤ¢¤ë¡¥
+ : $SAFE >= 4 ¤Ç¤Ï¼Â¹Ô¤¬¶Ø»ß¤µ¤ì¤ë¡¥
get_eventloop_tick
- : timer_tick ã®ç¾åœ¨å€¤ã‚’è¿”ã™ï¼Ž
+ : timer_tick ¤Î¸½ºßÃͤòÊÖ¤¹¡¥
set_no_event_wait(no_event_wait)
- : 複数ã®ã‚¹ãƒ¬ãƒƒãƒ‰ãŒç¨¼åƒã—ã¦ã„ã‚‹å ´åˆã§ï¼Œå‡¦ç†å¾…ã¡ã‚¤ãƒ™ãƒ³ãƒˆãŒå…¨
- : ã存在ã—ãªã‹ã£ãŸéš›ã« sleep 状態ã«å…¥ã‚‹æ™‚間長を指定ã™ã‚‹ï¼Ž
- : 稼åƒã‚¹ãƒ¬ãƒƒãƒ‰ãŒã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã ã‘ã®å ´åˆã«ã¯æ„味をãªã•ãªã„.
- : デフォルトã®å€¤ã¯ 20 (ms)
- : $SAFE >= 4 ã§ã¯å®Ÿè¡ŒãŒç¦æ­¢ã•れる.
+ : Ê£¿ô¤Î¥¹¥ì¥Ã¥É¤¬²ÔƯ¤·¤Æ¤¤¤ë¾ì¹ç¤Ç¡¤½èÍýÂÔ¤Á¥¤¥Ù¥ó¥È¤¬Á´
+ : ¤¯Â¸ºß¤·¤Ê¤«¤Ã¤¿ºÝ¤Ë sleep ¾õÂÖ¤ËÆþ¤ë»þ´ÖŤò»ØÄꤹ¤ë¡¥
+ : ²ÔƯ¥¹¥ì¥Ã¥É¤¬¥¤¥Ù¥ó¥È¥ë¡¼¥×¤À¤±¤Î¾ì¹ç¤Ë¤Ï°ÕÌ£¤ò¤Ê¤µ¤Ê¤¤¡¥
+ : ¥Ç¥Õ¥©¥ë¥È¤ÎÃÍ¤Ï 20 (ms)
+ : $SAFE >= 4 ¤Ç¤Ï¼Â¹Ô¤¬¶Ø»ß¤µ¤ì¤ë¡¥
get_no_event_wait
- : no_event_wait ã®ç¾åœ¨å€¤ã‚’è¿”ã™ï¼Ž
+ : no_event_wait ¤Î¸½ºßÃͤòÊÖ¤¹¡¥
set_eventloop_weight(loop_max, no_event_tick)
- : 複数ã®ã‚¹ãƒ¬ãƒƒãƒ‰ãŒç¨¼åƒã—ã¦ã„る際㫠Ruby/Tk ã®ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼
- : プã«å‰²ã‚Šå½“ã¦ã‚‹æ¯”é‡ã‚’定ã‚ã‚‹ãŸã‚ã®ãƒ‘ラメータを設定ã™ã‚‹ï¼Ž
- : 稼åƒã‚¹ãƒ¬ãƒƒãƒ‰ãŒã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã ã‘ã®å ´åˆã«ã¯æ„味をãªã•ãªã„.
- : 一度ã®ã‚¹ãƒ¬ãƒƒãƒ‰åˆ‡ã‚Šæ›¿ãˆã®é–“ã«å‡¦ç†ã™ã‚‹ã‚¤ãƒ™ãƒ³ãƒˆã®æœ€å¤§æ•°ã¨ï¼Œ
- : 処ç†å¾…ã¡ã®ã‚¤ãƒ™ãƒ³ãƒˆãŒå­˜åœ¨ã—ãªã„éš›ã®åŠ ç®—æ•°ã¨ã‚’設定ã™ã‚‹ï¼Ž
- : 処ç†å¾…ã¡ã‚¤ãƒ™ãƒ³ãƒˆãŒå­˜åœ¨ã—ãªã„å ´åˆã¯ no_event_wait ( see
- : set_no_event_wait ) ã ã‘ã®é–“ sleep 状態ã«å…¥ã‚‹ï¼Ž
- : デフォルトã§ã¯ãれãžã‚Œ 800 回㨠10 回,ã¤ã¾ã‚Šï¼Œ800 個ã®ã‚¤
- : ベント (アイドルイベントをå«ã‚€) を処ç†ã™ã‚‹ã¨ã‹ï¼Œã‚¤ãƒ™ãƒ³ãƒˆ
- : ãŒå…¨ã発生ã—ãªã„ã¾ã¾ã« 80 回ã®å‡¦ç†å¾…ã¡ã‚¤ãƒ™ãƒ³ãƒˆæ¤œæŸ»ãŒå®Œäº†
- : ã™ã‚‹ã¨ã‹ã§ã‚«ã‚¦ãƒ³ãƒˆãŒ 800 以上ã«ãªã‚‹ã¨ã‚¹ãƒ¬ãƒƒãƒ‰ã‚¹ã‚¤ãƒƒãƒãƒ³ã‚°
- : ãŒç™ºç”Ÿã™ã‚‹ã“ã¨ã«ãªã‚‹ï¼Ž
- : $SAFE >= 4 ã§ã¯å®Ÿè¡ŒãŒç¦æ­¢ã•れる.
+ : Ê£¿ô¤Î¥¹¥ì¥Ã¥É¤¬²ÔƯ¤·¤Æ¤¤¤ëºÝ¤Ë Ruby/Tk ¤Î¥¤¥Ù¥ó¥È¥ë¡¼
+ : ¥×¤Ë³ä¤êÅö¤Æ¤ëÈæ½Å¤òÄê¤á¤ë¤¿¤á¤Î¥Ñ¥é¥á¡¼¥¿¤òÀßÄꤹ¤ë¡¥
+ : ²ÔƯ¥¹¥ì¥Ã¥É¤¬¥¤¥Ù¥ó¥È¥ë¡¼¥×¤À¤±¤Î¾ì¹ç¤Ë¤Ï°ÕÌ£¤ò¤Ê¤µ¤Ê¤¤¡¥
+ : °ìÅ٤Υ¹¥ì¥Ã¥ÉÀÚ¤êÂØ¤¨¤Î´Ö¤Ë½èÍý¤¹¤ë¥¤¥Ù¥ó¥È¤ÎºÇÂç¿ô¤È¡¤
+ : ½èÍýÂÔ¤Á¤Î¥¤¥Ù¥ó¥È¤¬Â¸ºß¤·¤Ê¤¤ºÝ¤Î²Ã»»¿ô¤È¤òÀßÄꤹ¤ë¡¥
+ : ½èÍýÂÔ¤Á¥¤¥Ù¥ó¥È¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï no_event_wait ( see
+ : set_no_event_wait ) ¤À¤±¤Î´Ö sleep ¾õÂÖ¤ËÆþ¤ë¡¥
+ : ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¤½¤ì¤¾¤ì 800 ²ó¤È 10 ²ó¡¤¤Ä¤Þ¤ê¡¤800 ¸Ä¤Î¥¤
+ : ¥Ù¥ó¥È (¥¢¥¤¥É¥ë¥¤¥Ù¥ó¥È¤ò´Þ¤à) ¤ò½èÍý¤¹¤ë¤È¤«¡¤¥¤¥Ù¥ó¥È
+ : ¤¬Á´¤¯È¯À¸¤·¤Ê¤¤¤Þ¤Þ¤Ë 80 ²ó¤Î½èÍýÂÔ¤Á¥¤¥Ù¥ó¥È¸¡ºº¤¬´°Î»
+ : ¤¹¤ë¤È¤«¤Ç¥«¥¦¥ó¥È¤¬ 800 °Ê¾å¤Ë¤Ê¤ë¤È¥¹¥ì¥Ã¥É¥¹¥¤¥Ã¥Á¥ó¥°
+ : ¤¬È¯À¸¤¹¤ë¤³¤È¤Ë¤Ê¤ë¡¥
+ : $SAFE >= 4 ¤Ç¤Ï¼Â¹Ô¤¬¶Ø»ß¤µ¤ì¤ë¡¥
get_eventloop_weight
- : ç¾åœ¨ã® loop_max 㨠no_event_tick ã¨ã®å€¤ã‚’è¿”ã™ï¼Ž
+ : ¸½ºß¤Î loop_max ¤È no_event_tick ¤È¤ÎÃͤòÊÖ¤¹¡¥
: ( see set_eventloop_wait )
mainloop_abort_on_exception=(bool)
- : Tk インタープリタ上ã§ä¾‹å¤–を発生ã—ãŸéš›ã«ï¼Œã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã‚’
- : ã‚¨ãƒ©ãƒ¼åœæ­¢ã•ã›ã‚‹ã‹ã©ã†ã‹ã‚’指定ã™ã‚‹ï¼Žtrue を指定ã—ãŸå ´åˆã¯
- : ã‚¨ãƒ©ãƒ¼åœæ­¢ã™ã‚‹ãŒï¼Œfalse ã®å ´åˆã¯ä¾‹å¤–を無視ã—ã¦ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼
- : プを継続ã™ã‚‹ï¼Žã•ら㫠nil ã®å ´åˆã¯è­¦å‘Šãƒ¢ãƒ¼ãƒ‰ã§ãªã„é™ã‚Šã¯ã‚¨
- : ラーメッセージã®å‡ºåŠ›ã™ã‚‰çœç•¥ã—ã¦ï¼Œä¾‹å¤–を無視ã™ã‚‹ï¼Ž
- : デフォルトã§ã¯ true ã«è¨­å®šã•れã¦ã„る.
- : 1個ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã ã‘を使ã£ã¦ã„ã‚‹å ´åˆã«ã¯ã‚¨ãƒ©ãƒ¼æ™‚ã«ãã®
- : ã¾ã¾åœæ­¢ã—ã¦ã‚‚通常ã¯å•題ãªã„ãŒï¼Œè¤‡æ•°ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタãŒåŒæ™‚
- : ã«å‹•作ã—ã¦ã„ã‚‹å ´åˆã«ã¯ï¼Œãれらを管ç†ã™ã‚‹ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã¯ï¼‘
- : 個ã ã‘ã§ã‚ã‚‹ãŸã‚,ã„ãšã‚Œã‹ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã®ã‚¨ãƒ©ãƒ¼ãŒåŽŸå› ã§ï¼Œ
- : ä»–ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã®å‡¦ç†ç¶™ç¶šãŒä¸å¯èƒ½ã«ãªã‚‹ã“ã¨ãŒã‚る.ãã®
- : よã†ãªå ´åˆã§ã‚‚エラーを無視ã—ã¦ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ãŒç¨¼åƒã‚’ç¶šã‘ã‚‹
- : ã“ã¨ã§ï¼Œä»–ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—ãƒªã‚¿ãŒæ­£å¸¸ã«å‹•作ã—ç¶šã‘ã‚‹ã“ã¨ãŒã§ãる.
- : $SAFE >= 4 ã§ã¯å®Ÿè¡ŒãŒç¦æ­¢ã•れる.
+ : Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¾å¤ÇÎã³°¤òȯÀ¸¤·¤¿ºÝ¤Ë¡¤¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ò
+ : ¥¨¥é¡¼Ää»ß¤µ¤»¤ë¤«¤É¤¦¤«¤ò»ØÄꤹ¤ë¡¥true ¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï
+ : ¥¨¥é¡¼Ää»ß¤¹¤ë¤¬¡¤false ¤Î¾ì¹ç¤ÏÎã³°¤ò̵»ë¤·¤Æ¥¤¥Ù¥ó¥È¥ë¡¼
+ : ¥×¤ò·Ñ³¤¹¤ë¡¥¤µ¤é¤Ë nil ¤Î¾ì¹ç¤Ï·Ù¹ð¥â¡¼¥É¤Ç¤Ê¤¤¸Â¤ê¤Ï¥¨
+ : ¥é¡¼¥á¥Ã¥»¡¼¥¸¤Î½ÐÎϤ¹¤é¾Êά¤·¤Æ¡¤Îã³°¤ò̵»ë¤¹¤ë¡¥
+ : ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï true ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¡¥
+ : £±¸Ä¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤À¤±¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¥¨¥é¡¼»þ¤Ë¤½¤Î
+ : ¤Þ¤ÞÄä»ß¤·¤Æ¤âÄ̾ï¤ÏÌäÂê¤Ê¤¤¤¬¡¤Ê£¿ô¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬Æ±»þ
+ : ¤Ëưºî¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¤¤½¤ì¤é¤ò´ÉÍý¤¹¤ë¥¤¥Ù¥ó¥È¥ë¡¼¥×¤Ï£±
+ : ¸Ä¤À¤±¤Ç¤¢¤ë¤¿¤á¡¤¤¤¤º¤ì¤«¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î¥¨¥é¡¼¤¬¸¶°ø¤Ç¡¤
+ : ¾¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î½èÍý·Ñ³¤¬ÉÔ²Äǽ¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ë¡¥¤½¤Î
+ : ¤è¤¦¤Ê¾ì¹ç¤Ç¤â¥¨¥é¡¼¤ò̵»ë¤·¤Æ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤¬²ÔƯ¤ò³¤±¤ë
+ : ¤³¤È¤Ç¡¤Â¾¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬Àµ¾ï¤Ëưºî¤·Â³¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¡¥
+ : $SAFE >= 4 ¤Ç¤Ï¼Â¹Ô¤¬¶Ø»ß¤µ¤ì¤ë¡¥
mainloop_abort_on_exception
- : Tk インタープリタ上ã§ä¾‹å¤–を発生ã—ãŸéš›ã«ï¼Œã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—をエ
- : ãƒ©ãƒ¼åœæ­¢ã•ã›ã‚‹ã‹ã©ã†ã‹ã®è¨­å®šçŠ¶æ…‹ã‚’ true/false ã§å¾—る.
+ : Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¾å¤ÇÎã³°¤òȯÀ¸¤·¤¿ºÝ¤Ë¡¤¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ò¥¨
+ : ¥é¡¼Ää»ß¤µ¤»¤ë¤«¤É¤¦¤«¤ÎÀßÄê¾õÂÖ¤ò true/false ¤ÇÆÀ¤ë¡¥
num_of_mainwindows
- : ç¾åœ¨ã®ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ (ルートウィジェット) ã®æ•°ã‚’è¿”ã™ï¼Ž
- : メインウィンドウã¯ä¸€ã¤ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã«ä»˜ã最大一ã¤ã§ã‚ã‚‹
- : ã®ã§ï¼Œã“ã®å€¤ã¯ç¾åœ¨ Tk ã®æ©Ÿèƒ½ãŒæœ‰åйã§ã‚るインタープリタã®ç·
- : æ•°ã«ç­‰ã—ã„.
+ : ¸½ºß¤Î¥á¥¤¥ó¥¦¥£¥ó¥É¥¦ (¥ë¡¼¥È¥¦¥£¥¸¥§¥Ã¥È) ¤Î¿ô¤òÊÖ¤¹¡¥
+ : ¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Ï°ì¤Ä¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ËÉÕ¤­ºÇÂç°ì¤Ä¤Ç¤¢¤ë
+ : ¤Î¤Ç¡¤¤³¤ÎÃͤϸ½ºß Tk ¤Îµ¡Ç½¤¬Í­¸ú¤Ç¤¢¤ë¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ÎÁí
+ : ¿ô¤ËÅù¤·¤¤¡¥
_merge_tklist(str, str, ... )
- : Tcl/Tk ã®ãƒ©ã‚¤ãƒ–ラリ関数を使ã£ã¦ï¼Œå¼•æ•°ã®æ–‡å­—列ãŒãれãžã‚Œ
- : æ­£ã—ã一ã¤ã®ãƒªã‚¹ãƒˆè¦ç´ ã¨ãªã‚‹ã‚ˆã†ã«é€£çµã—ãŸæ–‡å­—列を返ã™ï¼Ž
+ : Tcl/Tk ¤Î¥é¥¤¥Ö¥é¥ê´Ø¿ô¤ò»È¤Ã¤Æ¡¤°ú¿ô¤Îʸ»úÎ󤬤½¤ì¤¾¤ì
+ : Àµ¤·¤¯°ì¤Ä¤Î¥ê¥¹¥ÈÍ×ÁǤȤʤë¤è¤¦¤ËÏ¢·ë¤·¤¿Ê¸»úÎó¤òÊÖ¤¹¡¥
_conv_listelement(str)
- : Tcl/Tk ã®ãƒ©ã‚¤ãƒ–ラリ関数を使ã£ã¦ï¼Œå¼•æ•°ã®æ–‡å­—列㌠Tcl ã®
- : 一ã¤ã®ãƒªã‚¹ãƒˆè¦ç´ ã¨ã—ã¦é©åˆ‡ãªè¡¨ç¾ã«ãªã‚‹ã‚ˆã†ã«å¤‰æ›ã—ãŸæ–‡
- : 字列を返ã™ï¼Ž
+ : Tcl/Tk ¤Î¥é¥¤¥Ö¥é¥ê´Ø¿ô¤ò»È¤Ã¤Æ¡¤°ú¿ô¤Îʸ»úÎó¤¬ Tcl ¤Î
+ : °ì¤Ä¤Î¥ê¥¹¥ÈÍ×ÁǤȤ·¤ÆÅ¬ÀÚ¤Êɽ¸½¤Ë¤Ê¤ë¤è¤¦¤ËÊÑ´¹¤·¤¿Ê¸
+ : »úÎó¤òÊÖ¤¹¡¥
_toUTF8(str, encoding=nil)
_fromUTF8(str, encoding=nil)
- : Tcl/Tk ãŒå†…蔵ã—ã¦ã„ã‚‹ UTF8 変æ›å‡¦ç†ã‚’呼ã³å‡ºã™ï¼Ž
+ : Tcl/Tk ¤¬Æâ¢¤·¤Æ¤¤¤ë UTF8 ÊÑ´¹½èÍý¤ò¸Æ¤Ó½Ð¤¹¡¥
_subst_UTF_backslash(str)
_subst_Tcl_backslash(str)
- : Tcl ã®ãƒ«ãƒ¼ãƒ«ã§ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥è¨˜æ³• ( \uhhhh ã«ã‚ˆã‚‹
- : Unicode 文字表ç¾ã‚’å«ã‚€ ) ã‚’è§£æžã™ã‚‹ï¼Ž
- : _subst_Tcl_backslash ã¯ã™ã¹ã¦ã®ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥è¨˜æ³•ã‚’
- : ç½®ãæ›ãˆã‚‹ã®ã«å¯¾ã—,_subst_UTF_backslash 㯠\uhhhh
- : ã«ã‚ˆã‚‹ Unicode 文字表ç¾ã ã‘ã‚’ç½®ãæ›ãˆã‚‹ï¼Ž
+ : Tcl ¤Î¥ë¡¼¥ë¤Ç¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥åµ­Ë¡ ( \uhhhh ¤Ë¤è¤ë
+ : Unicode ʸ»úɽ¸½¤ò´Þ¤à ) ¤ò²òÀϤ¹¤ë¡¥
+ : _subst_Tcl_backslash ¤Ï¤¹¤Ù¤Æ¤Î¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥åµ­Ë¡¤ò
+ : ÃÖ¤­´¹¤¨¤ë¤Î¤ËÂФ·¡¤_subst_UTF_backslash ¤Ï \uhhhh
+ : ¤Ë¤è¤ë Unicode ʸ»úɽ¸½¤À¤±¤òÃÖ¤­´¹¤¨¤ë¡¥
encoding_system
encoding_system=(encoding)
- : Tcl ã® system encoding ã®ç²å¾—ãŠã‚ˆã³è¨­å®š
+ : Tcl ¤Î system encoding ¤Î³ÍÆÀ¤ª¤è¤ÓÀßÄê
encoding
encoding=(encoding)
- : encoding_system / encoding_system= ã® alias
- : ( Ruby/Tk ã® tk.rb ã§ã¯ç½®ãæ›ãˆã‚‰ã‚Œã‚‹äºˆå®šã®ã‚‚ã®ï¼Ž)
+ : encoding_system / encoding_system= ¤Î alias
+ : ( Ruby/Tk ¤Î tk.rb ¤Ç¤ÏÃÖ¤­´¹¤¨¤é¤ì¤ëͽÄê¤Î¤â¤Î¡¥)
-クラス TclTkIp
- クラスメソッド
+¥¯¥é¥¹ TclTkIp
+ ¥¯¥é¥¹¥á¥½¥Ã¥É
new(ip_name=nil, options='')
- : TclTkIp クラスã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’生æˆã™ã‚‹ï¼Ž
- : ip_name ã«æ–‡å­—列を与ãˆãŸå ´åˆã¯ï¼Œãれ㌠winfo interps ãªã©ã§
- : 表示ã•れるåå‰ã«ãªã‚‹ï¼Ž
- : options ã«ã¯ï¼Œ-geometry ã‚„ -use ãªã©ï¼Œwish ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³
- : 引数ã¨ã—ã¦ä¸Žãˆã‚‹ã‚ªãƒ—ションã¨åŒæ§˜ã®æƒ…報を文字列ã¨ã—ã¦ä¸Žãˆã‚‹ï¼Ž
- : 与ãˆã‚‰ã‚ŒãŸæƒ…å ±ã¯ï¼Œroot widget 生æˆã®éš›ã«ç”¨ã„られる.
+ : TclTkIp ¥¯¥é¥¹¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òÀ¸À®¤¹¤ë¡¥
+ : ip_name ¤Ëʸ»úÎó¤òÍ¿¤¨¤¿¾ì¹ç¤Ï¡¤¤½¤ì¤¬ winfo interps ¤Ê¤É¤Ç
+ : ɽ¼¨¤µ¤ì¤ë̾Á°¤Ë¤Ê¤ë¡¥
+ : options ¤Ë¤Ï¡¤-geometry ¤ä -use ¤Ê¤É¡¤wish ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó
+ : °ú¿ô¤È¤·¤ÆÍ¿¤¨¤ë¥ª¥×¥·¥ç¥ó¤ÈƱÍͤξðÊó¤òʸ»úÎó¤È¤·¤ÆÍ¿¤¨¤ë¡¥
+ : Í¿¤¨¤é¤ì¤¿¾ðÊó¤Ï¡¤root widget À¸À®¤ÎºÝ¤ËÍѤ¤¤é¤ì¤ë¡¥
: ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
- : ã‚‚ã— options ã«æ•¢ãˆã¦ nil ã¾ãŸã¯ false を与ãˆãŸå ´åˆï¼ŒTk ライ
- : ブラリãŒå°Žå…¥ã•れã¦ã„ãªã„ (ã¤ã¾ã‚Šã¯ Tcl ã®ã¿ã®) インタープリ
- : タを生æˆã™ã‚‹ï¼Žã“ã®å ´åˆã¯ GUI 環境ã¯å¿…è¦ãªã„ãŸã‚,ウインドウ
- : システムãŒå­˜åœ¨ã—ãªã„,ã¾ãŸã¯ä½¿ç”¨ã§ããªã„環境ã§ã‚‚ Tcl インター
- : プリタを生æˆã—,Tcl ã‚„ãã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリを活用ã™ã‚‹ã“ã¨ãŒã§ãる.
+ : ¤â¤· options ¤Ë´º¤¨¤Æ nil ¤Þ¤¿¤Ï false ¤òÍ¿¤¨¤¿¾ì¹ç¡¤Tk ¥é¥¤
+ : ¥Ö¥é¥ê¤¬Æ³Æþ¤µ¤ì¤Æ¤¤¤Ê¤¤ (¤Ä¤Þ¤ê¤Ï Tcl ¤Î¤ß¤Î) ¥¤¥ó¥¿¡¼¥×¥ê
+ : ¥¿¤òÀ¸À®¤¹¤ë¡¥¤³¤Î¾ì¹ç¤Ï GUI ´Ä¶­¤ÏɬÍפʤ¤¤¿¤á¡¤¥¦¥¤¥ó¥É¥¦
+ : ¥·¥¹¥Æ¥à¤¬Â¸ºß¤·¤Ê¤¤¡¤¤Þ¤¿¤Ï»ÈÍѤǤ­¤Ê¤¤´Ä¶­¤Ç¤â Tcl ¥¤¥ó¥¿¡¼
+ : ¥×¥ê¥¿¤òÀ¸À®¤·¡¤Tcl ¤ä¤½¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ò³èÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡¥
- インスタンスメソッド
+ ¥¤¥ó¥¹¥¿¥ó¥¹¥á¥½¥Ã¥É
create_slave(name, safe=false)
- : レシーãƒã‚’親ã¨ã™ã‚‹ name ã¨ã„ã†åå‰ã®ã‚¹ãƒ¬ãƒ¼ãƒ–インタープリタを
- : 生æˆã™ã‚‹ï¼Ž
- : safe ã«ã¯ç”Ÿæˆã™ã‚‹ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタを safe インタープリタã¨ã™ã‚‹
- : ã‹ã‚’指定ã™ã‚‹ï¼Žãƒ‡ãƒ•ォルト㯠false ã¨ã„ã†ã“ã¨ã«ãªã£ã¦ã„ã‚‹ãŒï¼Œ
- : ãŸã¨ãˆæ˜Žç¢ºã« false を指定ã—ã¦ã„ãŸã¨ã—ã¦ã‚‚,親ã¨ãªã‚‹ã‚¤ãƒ³ã‚¿ãƒ¼
- : プリタ㌠safe インタープリタã§ã‚れã°ï¼Œãã®è¨­å®šã‚’引ãç¶™ã„ã§
- : safe インタープリタã¨ã—ã¦ç”Ÿæˆã•れる.
- : $SAFE >= 4 ã§ã¯ï¼Œsafe インタープリタ以外ã®ç”ŸæˆãŒç¦æ­¢ã•れる.
+ : ¥ì¥·¡¼¥Ð¤ò¿Æ¤È¤¹¤ë name ¤È¤¤¤¦Ì¾Á°¤Î¥¹¥ì¡¼¥Ö¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò
+ : À¸À®¤¹¤ë¡¥
+ : safe ¤Ë¤ÏÀ¸À®¤¹¤ë¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤È¤¹¤ë
+ : ¤«¤ò»ØÄꤹ¤ë¡¥¥Ç¥Õ¥©¥ë¥È¤Ï false ¤È¤¤¤¦¤³¤È¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤¬¡¤
+ : ¤¿¤È¤¨ÌÀ³Î¤Ë false ¤ò»ØÄꤷ¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¤¿Æ¤È¤Ê¤ë¥¤¥ó¥¿¡¼
+ : ¥×¥ê¥¿¤¬ safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ç¤¢¤ì¤Ð¡¤¤½¤ÎÀßÄê¤ò°ú¤­·Ñ¤¤¤Ç
+ : safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤È¤·¤ÆÀ¸À®¤µ¤ì¤ë¡¥
+ : $SAFE >= 4 ¤Ç¤Ï¡¤safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿°Ê³°¤ÎÀ¸À®¤¬¶Ø»ß¤µ¤ì¤ë¡¥
make_safe
- : Tcl/Tk インタープリタを safe インタープリタã«å¤‰æ›´ã™ã‚‹ï¼Ž
- : 戻り値ã¯ãƒ¬ã‚·ãƒ¼ãƒã§ã‚るインタープリタ自身ã§ã‚る.
- : 失敗ã—ãŸå ´åˆã¯ RuntimeError ã®ä¾‹å¤–を発生ã™ã‚‹ï¼Ž
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ËÊѹ¹¤¹¤ë¡¥
+ : Ìá¤êÃͤϥ쥷¡¼¥Ð¤Ç¤¢¤ë¥¤¥ó¥¿¡¼¥×¥ê¥¿¼«¿È¤Ç¤¢¤ë¡¥
+ : ¼ºÇÔ¤·¤¿¾ì¹ç¤Ï RuntimeError ¤ÎÎã³°¤òȯÀ¸¤¹¤ë¡¥
safe?
- : Tcl/Tk インタープリタ㌠safe インタープリタã§ã‚ã‚‹ã‹ã‚’調ã¹ã‚‹ï¼Ž
- : safe インタープリタã§ã‚れ㰠true ã‚’è¿”ã™ï¼Ž
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬ safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ç¤¢¤ë¤«¤òÄ´¤Ù¤ë¡¥
+ : safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ç¤¢¤ì¤Ð true ¤òÊÖ¤¹¡¥
allow_ruby_exit?
- : 対象ã¨ãªã‚‹ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタ上ã®è©•価ã§ï¼Œruby ã® exit 関数ã¾ãŸã¯
- : Tcl/Tk 上㮠exit コマンドã«ã‚ˆã£ã¦ ruby 自体を終了ã•ã›ã‚‹ã“ã¨
- : を許ã™ã‹ã©ã†ã‹ã‚’è¿”ã™ï¼Ž
- : 許ã•ãªã„å ´åˆã¯å¯¾è±¡ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã ã‘ãŒçµ‚了ã™ã‚‹ï¼Ž
- : マスターインタープリタã®ãƒ‡ãƒ•ォルト値㯠true,スレーブインター
- : プリタã®ãƒ‡ãƒ•ォルト値㯠false ã§ã‚る.
+ : ÂоݤȤʤ륤¥ó¥¿¡¼¥×¥ê¥¿¾å¤Îɾ²Á¤Ç¡¤ruby ¤Î exit ´Ø¿ô¤Þ¤¿¤Ï
+ : Tcl/Tk ¾å¤Î exit ¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ ruby ¼«ÂΤò½ªÎ»¤µ¤»¤ë¤³¤È
+ : ¤òµö¤¹¤«¤É¤¦¤«¤òÊÖ¤¹¡¥
+ : µö¤µ¤Ê¤¤¾ì¹ç¤ÏÂоݤΥ¤¥ó¥¿¡¼¥×¥ê¥¿¤À¤±¤¬½ªÎ»¤¹¤ë¡¥
+ : ¥Þ¥¹¥¿¡¼¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï true¡¤¥¹¥ì¡¼¥Ö¥¤¥ó¥¿¡¼
+ : ¥×¥ê¥¿¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï false ¤Ç¤¢¤ë¡¥
allow_ruby_exit=(mode)
- : 対象ã¨ãªã‚‹ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタ㮠allow_ruby_exit? ã®çŠ¶æ…‹ã‚’å¤‰æ›´ã™ã‚‹ï¼Ž
- : $SAFE >= 4 ã¾ãŸã¯ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタ㌠safe インタープリタã®å ´åˆã¯
- : 変更ãŒè¨±ã•れãªã„ (例外を発生).
+ : ÂоݤȤʤ륤¥ó¥¿¡¼¥×¥ê¥¿¤Î allow_ruby_exit? ¤Î¾õÂÖ¤òÊѹ¹¤¹¤ë¡¥
+ : $SAFE >= 4 ¤Þ¤¿¤Ï¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬ safe ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î¾ì¹ç¤Ï
+ : Êѹ¹¤¬µö¤µ¤ì¤Ê¤¤ (Îã³°¤òȯÀ¸)¡¥
delete
- : Tcl/Tk インタープリタを delete ã™ã‚‹ï¼Ž
- : delete ã•れãŸã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã¯ï¼Œä»¥å¾Œä¸€åˆ‡ã®æ“作ãŒã§ããªããªã‚Šï¼Œ
- : コマンドをé€ã£ã¦ã‚‚例外を発生ã™ã‚‹ã‚ˆã†ã«ãªã‚‹ï¼Ž
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò delete ¤¹¤ë¡¥
+ : delete ¤µ¤ì¤¿¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ï¡¤°Ê¸å°ìÀÚ¤ÎÁàºî¤¬¤Ç¤­¤Ê¤¯¤Ê¤ê¡¤
+ : ¥³¥Þ¥ó¥É¤òÁ÷¤Ã¤Æ¤âÎã³°¤òȯÀ¸¤¹¤ë¤è¤¦¤Ë¤Ê¤ë¡¥
deleted?
- : Tcl/Tk インタープリタãŒã™ã§ã« delete ã•れã¦ã„ã‚‹ã‹ã‚’調ã¹ã‚‹ï¼Ž
- : delete 済ã¿ã§ã‚³ãƒžãƒ³ãƒ‰ã‚’å—ã‘付ã‘ãªã„状態ã«ãªã£ã¦ã„ã‚‹ãªã‚‰ã°
- : true ã‚’è¿”ã™ï¼Ž
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬¤¹¤Ç¤Ë delete ¤µ¤ì¤Æ¤¤¤ë¤«¤òÄ´¤Ù¤ë¡¥
+ : delete ºÑ¤ß¤Ç¥³¥Þ¥ó¥É¤ò¼õ¤±ÉÕ¤±¤Ê¤¤¾õÂ֤ˤʤäƤ¤¤ë¤Ê¤é¤Ð
+ : true ¤òÊÖ¤¹¡¥
has_mainwindow?
- : Tcl/Tk インタープリタã«ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ (root widget) ãŒ
- : 存在ã™ã‚Œã° true を,存在ã—ãªã‘れ㰠false ã‚’è¿”ã™ï¼Ž
- : ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—ãƒªã‚¿ãŒæ—¢ã« delete 済ã¿ã§ã‚れ㰠nil ã‚’è¿”ã™ï¼Ž
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ë¥á¥¤¥ó¥¦¥£¥ó¥É¥¦ (root widget) ¤¬
+ : ¸ºß¤¹¤ì¤Ð true ¤ò¡¤Â¸ºß¤·¤Ê¤±¤ì¤Ð false ¤òÊÖ¤¹¡¥
+ : ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤¬´û¤Ë delete ºÑ¤ß¤Ç¤¢¤ì¤Ð nil ¤òÊÖ¤¹¡¥
restart
- : Tcl/Tk インタープリタ㮠Tk 部分ã®åˆæœŸåŒ–,å†èµ·å‹•を行ã†ï¼Ž
- : 一旦 root widget を破壊ã—ãŸå¾Œã«å†åº¦ Tk ã®æ©Ÿèƒ½ãŒå¿…è¦ã¨
- : ãªã£ãŸå ´åˆã«ç”¨ã„る.
- : $SAFE >= 4 ã§ã¯å®Ÿè¡ŒãŒç¦æ­¢ã•れる.
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î Tk Éôʬ¤Î½é´ü²½¡¤ºÆµ¯Æ°¤ò¹Ô¤¦¡¥
+ : °ìö root widget ¤òÇ˲õ¤·¤¿¸å¤ËºÆÅÙ Tk ¤Îµ¡Ç½¤¬É¬ÍפÈ
+ : ¤Ê¤Ã¤¿¾ì¹ç¤ËÍѤ¤¤ë¡¥
+ : $SAFE >= 4 ¤Ç¤Ï¼Â¹Ô¤¬¶Ø»ß¤µ¤ì¤ë¡¥
_eval(str)
_invoke(*args)
- : Tcl/Tk インタープリタ上ã§è©•価を行ã†ï¼Ž
- : _eval ã¯è©•価スクリプトãŒä¸€ã¤ã®æ–‡å­—列ã§ã‚ã‚‹ã“ã¨ã«å¯¾ã—,
- : _invoke ã¯è©•価スクリプト㮠token ã”ã¨ã«ä¸€ã¤ã®å¼•æ•°ã¨ãª
- : るよã†ã«ä¸Žãˆã‚‹ï¼Ž
- : _invoke ã®æ–¹ã¯ Tcl/Tk インタープリタã®å­—å¥è§£æžå™¨ã‚’用ã„
- : ãªã„ãŸã‚,評価ã®è² è·ãŒã‚ˆã‚Šå°‘ãªãã¦ã™ã‚€ï¼ŽãŸã ã—,ãã®ä»£
- : ã‚り㫠auto_load ã®ã‚ˆã†ãªæ©Ÿæ§‹ã¯åƒã‹ãšï¼Œload ç­‰ã«ã‚ˆã£ã¦
- : Tcl/Tk ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—ãƒªã‚¿ä¸Šã«æ—¢ã«ç™»éŒ²æ¸ˆã¿ã®ã‚³ãƒžãƒ³ãƒ‰ã—ã‹å‘¼
- : ã³å‡ºã™ã“ã¨ãŒã§ããªã„.
- : _eval ã§ã¯ auto_load 機構ãŒåƒããŸã‚,一度 _eval を実行
- : ã—ã¦ç™»éŒ²ã«æˆåŠŸã—ã•ãˆã™ã‚Œã°ï¼Œä»¥é™ã¯ _invoke ã§ã‚‚利用ã§
- : ãるよã†ã«ãªã‚‹ï¼Ž
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¾å¤Çɾ²Á¤ò¹Ô¤¦¡¥
+ : _eval ¤Ïɾ²Á¥¹¥¯¥ê¥×¥È¤¬°ì¤Ä¤Îʸ»úÎó¤Ç¤¢¤ë¤³¤È¤ËÂФ·¡¤
+ : _invoke ¤Ïɾ²Á¥¹¥¯¥ê¥×¥È¤Î token ¤´¤È¤Ë°ì¤Ä¤Î°ú¿ô¤È¤Ê
+ : ¤ë¤è¤¦¤ËÍ¿¤¨¤ë¡¥
+ : _invoke ¤ÎÊý¤Ï Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î»ú¶ç²òÀÏ´ï¤òÍѤ¤
+ : ¤Ê¤¤¤¿¤á¡¤É¾²Á¤ÎÉé²Ù¤¬¤è¤ê¾¯¤Ê¤¯¤Æ¤¹¤à¡¥¤¿¤À¤·¡¤¤½¤ÎÂå
+ : ¤ï¤ê¤Ë auto_load ¤Î¤è¤¦¤Êµ¡¹½¤ÏƯ¤«¤º¡¤load Åù¤Ë¤è¤Ã¤Æ
+ : Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿¾å¤Ë´û¤ËÅÐÏ¿ºÑ¤ß¤Î¥³¥Þ¥ó¥É¤·¤«¸Æ
+ : ¤Ó½Ð¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¡¥
+ : _eval ¤Ç¤Ï auto_load µ¡¹½¤¬Æ¯¤¯¤¿¤á¡¤°ìÅÙ _eval ¤ò¼Â¹Ô
+ : ¤·¤ÆÅÐÏ¿¤ËÀ®¸ù¤·¤µ¤¨¤¹¤ì¤Ð¡¤°Ê¹ß¤Ï _invoke ¤Ç¤âÍøÍѤÇ
+ : ¤­¤ë¤è¤¦¤Ë¤Ê¤ë¡¥
_cancel_eval(str)
_cancel_eval_unwind(str)
: (Tcl/Tk8.6 or later)
- : Tcl_CancelEval() 関数を呼ã³å‡ºã—,eval ã®å®Ÿè¡Œã‚’打ã¡åˆ‡ã‚‹ï¼Ž
+ : Tcl_CancelEval() ´Ø¿ô¤ò¸Æ¤Ó½Ð¤·¡¤eval ¤Î¼Â¹Ô¤òÂǤÁÀڤ롥
_toUTF8(str, encoding=nil)
_fromUTF8(str, encoding=nil)
- : Tcl/Tk ãŒå†…蔵ã—ã¦ã„ã‚‹ UTF8 変æ›å‡¦ç†ã‚’呼ã³å‡ºã™ï¼Ž
+ : Tcl/Tk ¤¬Æâ¢¤·¤Æ¤¤¤ë UTF8 ÊÑ´¹½èÍý¤ò¸Æ¤Ó½Ð¤¹¡¥
_thread_vwait(var_name)
_thread_tkwait(mode, target)
- : スレッド対応㮠vwait ã‚ã‚‹ã„㯠tkwait 相当ã®ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž
- : 通常㮠vwait ã‚ã‚‹ã„㯠tkwait コマンドã¨ç•°ãªã‚‹ã®ã¯ï¼Œã‚¤ãƒ™ãƒ³
- : トループã¨ã¯ç•°ãªã‚‹ã‚¹ãƒ¬ãƒƒãƒ‰ã‹ã‚‰å‘¼ã³å‡ºã—ãŸå ´åˆã« vwait ç­‰ã®
- : スタックã¨ã¯ç‹¬ç«‹ã«æ¡ä»¶ã®æˆç«‹å¾…ã¡ãŒãªã•れるã“ã¨ã§ã‚る.
- : 通常㮠vwait / tkwait ã§ã¯ï¼Œvwait / tkwait (1) ã®å¾…ã¡ã®é€”
- : 中ã§ã•ら㫠vwait / tkwait (2) ãŒå‘¼ã°ã‚ŒãŸå ´åˆï¼Œå¾…ã¡ã®å¯¾è±¡
- : ã¨ãªã£ã¦ã„ã‚‹æ¡ä»¶ã®æˆç«‹é †åºãŒã©ã†ã‚れ,(2)->(1) ã®é †ã§å¾…ã¡
- : を終了ã—ã¦æˆ»ã£ã¦ãる.
- : _thread_vwait / _thread_tkwait ã¯ï¼Œã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã®ã‚¹ãƒ¬ãƒƒ
- : ドã§å‘¼ã°ã‚ŒãŸå ´åˆã¯é€šå¸¸ã® vwait / tkwait ã¨åŒæ§˜ã«å‹•作ã™ã‚‹
- : ãŒï¼Œã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—以外ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã§å‘¼ã°ã‚ŒãŸå ´åˆã«ã¯ãã®ã‚¹
- : ãƒ¬ãƒƒãƒ‰ã‚’åœæ­¢ã•ã›ã¦å¾…ã¡ã«å…¥ã‚Šï¼Œæ¡ä»¶ãŒæˆç«‹ã—ãŸæ™‚ã«ã‚¹ãƒ¬ãƒƒãƒ‰
- : ã®å®Ÿè¡Œã‚’å†é–‹ã™ã‚‹ï¼Žã€Œvwait ç­‰ã®å¾…ã¡ã‚¹ã‚¿ãƒƒã‚¯ã¨ã¯ç‹¬ç«‹ã€ã¨ã„
- : ã†æ„味ã¯ï¼Œã“ã®å†é–‹ã®ã‚¿ã‚¤ãƒŸãƒ³ã‚°ãŒä»–ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã§ã®å¾…ã¡çжæ³
- : ã¨ã¯ç„¡é–¢ä¿‚ã¨ã„ã†ã“ã¨ã§ã‚る.ã¤ã¾ã‚Šï¼Œã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ç­‰ã®ä»–
- : ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã§ vwait ç­‰ã§å¾…ã¡ã®çŠ¶æ…‹ã«ã‚ã£ãŸã¨ã—ã¦ã‚‚ãã®å®Œäº†
- : ã‚’å¾…ã¤ã“ã¨ãªã,自らã®å¾…ã¡æ¡ä»¶ãŒæˆç«‹æ¬¡ç¬¬ï¼Œå‡¦ç†ã‚’継続ã™ã‚‹
- : ã“ã¨ã«ãªã‚‹ï¼Ž
+ : ¥¹¥ì¥Ã¥ÉÂбþ¤Î vwait ¤¢¤ë¤¤¤Ï tkwait ÁêÅö¤Î¥á¥½¥Ã¥É¡¥
+ : Ä̾ï¤Î vwait ¤¢¤ë¤¤¤Ï tkwait ¥³¥Þ¥ó¥É¤È°Û¤Ê¤ë¤Î¤Ï¡¤¥¤¥Ù¥ó
+ : ¥È¥ë¡¼¥×¤È¤Ï°Û¤Ê¤ë¥¹¥ì¥Ã¥É¤«¤é¸Æ¤Ó½Ð¤·¤¿¾ì¹ç¤Ë vwait Åù¤Î
+ : ¥¹¥¿¥Ã¥¯¤È¤ÏÆÈΩ¤Ë¾ò·ï¤ÎÀ®Î©ÂÔ¤Á¤¬¤Ê¤µ¤ì¤ë¤³¤È¤Ç¤¢¤ë¡¥
+ : Ä̾ï¤Î vwait / tkwait ¤Ç¤Ï¡¤vwait / tkwait (1) ¤ÎÂÔ¤Á¤ÎÅÓ
+ : Ãæ¤Ç¤µ¤é¤Ë vwait / tkwait (2) ¤¬¸Æ¤Ð¤ì¤¿¾ì¹ç¡¤ÂÔ¤Á¤ÎÂоÝ
+ : ¤È¤Ê¤Ã¤Æ¤¤¤ë¾ò·ï¤ÎÀ®Î©½ç½ø¤¬¤É¤¦¤¢¤ì¡¤(2)->(1) ¤Î½ç¤ÇÂÔ¤Á
+ : ¤ò½ªÎ»¤·¤ÆÌá¤Ã¤Æ¤¯¤ë¡¥
+ : _thread_vwait / _thread_tkwait ¤Ï¡¤¥¤¥Ù¥ó¥È¥ë¡¼¥×¤Î¥¹¥ì¥Ã
+ : ¥É¤Ç¸Æ¤Ð¤ì¤¿¾ì¹ç¤ÏÄ̾ï¤Î vwait / tkwait ¤ÈƱÍÍ¤ËÆ°ºî¤¹¤ë
+ : ¤¬¡¤¥¤¥Ù¥ó¥È¥ë¡¼¥×°Ê³°¤Î¥¹¥ì¥Ã¥É¤Ç¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¤½¤Î¥¹
+ : ¥ì¥Ã¥É¤òÄä»ß¤µ¤»¤ÆÂÔ¤Á¤ËÆþ¤ê¡¤¾ò·ï¤¬À®Î©¤·¤¿»þ¤Ë¥¹¥ì¥Ã¥É
+ : ¤Î¼Â¹Ô¤òºÆ³«¤¹¤ë¡¥¡Övwait Åù¤ÎÂÔ¤Á¥¹¥¿¥Ã¥¯¤È¤ÏÆÈΩ¡×¤È¤¤
+ : ¤¦°ÕÌ£¤Ï¡¤¤³¤ÎºÆ³«¤Î¥¿¥¤¥ß¥ó¥°¤¬Â¾¤Î¥¹¥ì¥Ã¥É¤Ç¤ÎÂÔ¤Á¾õ¶·
+ : ¤È¤Ï̵´Ø·¸¤È¤¤¤¦¤³¤È¤Ç¤¢¤ë¡¥¤Ä¤Þ¤ê¡¤¥¤¥Ù¥ó¥È¥ë¡¼¥×Åù¤Î¾
+ : ¤Î¥¹¥ì¥Ã¥É¤Ç vwait Åù¤ÇÂÔ¤Á¤Î¾õÂ֤ˤ¢¤Ã¤¿¤È¤·¤Æ¤â¤½¤Î´°Î»
+ : ¤òÂԤĤ³¤È¤Ê¤¯¡¤¼«¤é¤ÎÂÔ¤Á¾ò·ï¤¬À®Î©¼¡Â衤½èÍý¤ò·Ñ³¤¹¤ë
+ : ¤³¤È¤Ë¤Ê¤ë¡¥
_return_value
- : ç›´å‰ã® Tcl/Tk 上ã§ã®è©•価ã®å®Ÿè¡Œçµæžœã¨ã—ã¦ã®æˆ»ã‚Šå€¤ã‚’è¿”ã™ï¼Ž
+ : ľÁ°¤Î Tcl/Tk ¾å¤Ç¤Îɾ²Á¤Î¼Â¹Ô·ë²Ì¤È¤·¤Æ¤ÎÌá¤êÃͤòÊÖ¤¹¡¥
_get_variable(var_name, flag)
_get_variable2(var_name, index_name, flag)
- : Tcl/Tk 上㮠var ã¨ã„ã†å¤‰æ•°åã®å¤‰æ•°ã®å€¤ã‚’è¿”ã™ï¼Ž
- : ã‚‚ã— index_name ãŒæŒ‡å®š (PARSE_VARNAME フラグã®èª¬æ˜Žã‚‚å‚ç…§)
- : ã•れãŸå ´åˆã¯é€£æƒ³é…列 var_name ã® index_name ã®è¦ç´ ã‚’è¿”ã™ï¼Ž
- : flag ã«ã¯å¤‰æ•°ã‚’検索ã™ã‚‹éš›ã®æ¡ä»¶ã‚’指定ã™ã‚‹ï¼Žflag ã«ä¸Žãˆã‚‹
- : 値ã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« TclTkLib::VarAccessFlag ã‚’å‚ç…§ã™ã‚‹ã“ã¨ï¼Ž
+ : Tcl/Tk ¾å¤Î var ¤È¤¤¤¦ÊÑ¿ô̾¤ÎÊÑ¿ô¤ÎÃͤòÊÖ¤¹¡¥
+ : ¤â¤· index_name ¤¬»ØÄê (PARSE_VARNAME ¥Õ¥é¥°¤ÎÀâÌÀ¤â»²¾È)
+ : ¤µ¤ì¤¿¾ì¹ç¤ÏÏ¢ÁÛÇÛÎó var_name ¤Î index_name ¤ÎÍ×ÁǤòÊÖ¤¹¡¥
+ : flag ¤Ë¤ÏÊÑ¿ô¤ò¸¡º÷¤¹¤ëºÝ¤Î¾ò·ï¤ò»ØÄꤹ¤ë¡¥flag ¤ËÍ¿¤¨¤ë
+ : Ãͤϥ⥸¥å¡¼¥ë TclTkLib::VarAccessFlag ¤ò»²¾È¤¹¤ë¤³¤È¡¥
_set_variable(var_name, value, flag)
_set_variable2(var_name, index_name, value, flag)
- : Tcl/Tk 上㮠var ã¨ã„ã†å¤‰æ•°åã®å¤‰æ•°ã«å€¤ã‚’設定ã™ã‚‹ï¼Ž
- : ã‚‚ã— index_name ãŒæŒ‡å®š (PARSE_VARNAME フラグã®èª¬æ˜Žã‚‚å‚ç…§)
- : ã•れãŸå ´åˆã¯é€£æƒ³é…列 var_name ã® index_name ã®è¦ç´ ã‚’設定
- : ã™ã‚‹ï¼Ž
- : flag ã«ã¯å¤‰æ•°ã‚’検索ã™ã‚‹éš›ã®æ¡ä»¶ã‚’指定ã™ã‚‹ï¼Žflag ã«ä¸Žãˆã‚‹
- : 値ã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« TclTkLib::VarAccessFlag ã‚’å‚ç…§ã™ã‚‹ã“ã¨ï¼Ž
+ : Tcl/Tk ¾å¤Î var ¤È¤¤¤¦ÊÑ¿ô̾¤ÎÊÑ¿ô¤ËÃͤòÀßÄꤹ¤ë¡¥
+ : ¤â¤· index_name ¤¬»ØÄê (PARSE_VARNAME ¥Õ¥é¥°¤ÎÀâÌÀ¤â»²¾È)
+ : ¤µ¤ì¤¿¾ì¹ç¤ÏÏ¢ÁÛÇÛÎó var_name ¤Î index_name ¤ÎÍ×ÁǤòÀßÄê
+ : ¤¹¤ë¡¥
+ : flag ¤Ë¤ÏÊÑ¿ô¤ò¸¡º÷¤¹¤ëºÝ¤Î¾ò·ï¤ò»ØÄꤹ¤ë¡¥flag ¤ËÍ¿¤¨¤ë
+ : Ãͤϥ⥸¥å¡¼¥ë TclTkLib::VarAccessFlag ¤ò»²¾È¤¹¤ë¤³¤È¡¥
_unset_variable(var_name)
_unset_variable2(var_name, index_name)
- : Tcl/Tk 上㮠var_name ã¨ã„ã†å¤‰æ•°åã®å¤‰æ•°ã‚’消去ã™ã‚‹ï¼Ž
- : ã‚‚ã— index_name ãŒæŒ‡å®š (PARSE_VARNAME フラグã®èª¬æ˜Žã‚‚å‚ç…§)
- : ã•れãŸå ´åˆã¯é€£æƒ³é…列 var_name ã‹ã‚‰ index_name ã®è¦ç´ ã ã‘
- : を消去ã™ã‚‹ï¼Ž
+ : Tcl/Tk ¾å¤Î var_name ¤È¤¤¤¦ÊÑ¿ô̾¤ÎÊÑ¿ô¤ò¾Ãµî¤¹¤ë¡¥
+ : ¤â¤· index_name ¤¬»ØÄê (PARSE_VARNAME ¥Õ¥é¥°¤ÎÀâÌÀ¤â»²¾È)
+ : ¤µ¤ì¤¿¾ì¹ç¤ÏÏ¢ÁÛÇÛÎó var_name ¤«¤é index_name ¤ÎÍ×ÁǤÀ¤±
+ : ¤ò¾Ãµî¤¹¤ë¡¥
_get_global_var(var_name)
_get_global_var2(var_name, index_name)
@@ -527,31 +527,31 @@ require "tcltklib" ã™ã‚‹ã¨, 以下ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«, クラスãŒåˆ©ç”¨å¯èƒ½
_set_global_var2(var_name, index_name, value)
_unset_global_var(var_name)
_unset_global_var2(var_name, index_name)
- : ãれãžã‚Œï¼Œå¯¾å¿œã™ã‚‹å¤‰æ•°ã‚¢ã‚¯ã‚»ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã® flag ã«å¯¾ã—ã¦
- : (GLOBAL_ONLY | LEAVE_ERR_MSG) を与ãˆãŸã‚‚ã®ï¼Ž
+ : ¤½¤ì¤¾¤ì¡¤Âбþ¤¹¤ëÊÑ¿ô¥¢¥¯¥»¥¹¥á¥½¥Ã¥É¤Î flag ¤ËÂФ·¤Æ
+ : (GLOBAL_ONLY | LEAVE_ERR_MSG) ¤òÍ¿¤¨¤¿¤â¤Î¡¥
_split_tklist(str)
- : Tcl/Tk ã®ãƒ©ã‚¤ãƒ–ラリ関数を使ã£ã¦ï¼Œæ–‡å­—列 str をリストã«
- : 分割ã™ã‚‹ (文字列ã®é…列ã¨ã—ã¦è¿”ã™).
+ : Tcl/Tk ¤Î¥é¥¤¥Ö¥é¥ê´Ø¿ô¤ò»È¤Ã¤Æ¡¤Ê¸»úÎó str ¤ò¥ê¥¹¥È¤Ë
+ : ʬ³ä¤¹¤ë (ʸ»úÎó¤ÎÇÛÎó¤È¤·¤ÆÊÖ¤¹)¡¥
_merge_tklist(str, str, ... )
- : Tcl/Tk ã®ãƒ©ã‚¤ãƒ–ラリ関数を使ã£ã¦ï¼Œå¼•æ•°ã®æ–‡å­—列ãŒãれãžã‚Œ
- : æ­£ã—ã一ã¤ã®ãƒªã‚¹ãƒˆè¦ç´ ã¨ãªã‚‹ã‚ˆã†ã«é€£çµã—ãŸæ–‡å­—列を返ã™ï¼Ž
+ : Tcl/Tk ¤Î¥é¥¤¥Ö¥é¥ê´Ø¿ô¤ò»È¤Ã¤Æ¡¤°ú¿ô¤Îʸ»úÎ󤬤½¤ì¤¾¤ì
+ : Àµ¤·¤¯°ì¤Ä¤Î¥ê¥¹¥ÈÍ×ÁǤȤʤë¤è¤¦¤ËÏ¢·ë¤·¤¿Ê¸»úÎó¤òÊÖ¤¹¡¥
_conv_listelement(str)
- : Tcl/Tk ã®ãƒ©ã‚¤ãƒ–ラリ関数を使ã£ã¦ï¼Œå¼•æ•°ã®æ–‡å­—列㌠Tcl ã®
- : 一ã¤ã®ãƒªã‚¹ãƒˆè¦ç´ ã¨ã—ã¦é©åˆ‡ãªè¡¨ç¾ã«ãªã‚‹ã‚ˆã†ã«å¤‰æ›ã—ãŸæ–‡
- : 字列を返ã™ï¼Ž
+ : Tcl/Tk ¤Î¥é¥¤¥Ö¥é¥ê´Ø¿ô¤ò»È¤Ã¤Æ¡¤°ú¿ô¤Îʸ»úÎó¤¬ Tcl ¤Î
+ : °ì¤Ä¤Î¥ê¥¹¥ÈÍ×ÁǤȤ·¤ÆÅ¬ÀÚ¤Êɽ¸½¤Ë¤Ê¤ë¤è¤¦¤ËÊÑ´¹¤·¤¿Ê¸
+ : »úÎó¤òÊÖ¤¹¡¥
mainloop
mainloop_watchdog
- : スレーブ IP ã®å ´åˆã«ã¯ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã‚’èµ·å‹•ã›ãšã« nil ã‚’è¿”ã™ï¼Ž
- : ãれ以外ã®ç‚¹ã§ã¯å¼•æ•°ã‚’å«ã‚㦠TclTkLib ã®åŒåメソッドã«åŒã˜ï¼Ž
+ : ¥¹¥ì¡¼¥Ö IP ¤Î¾ì¹ç¤Ë¤Ï¥¤¥Ù¥ó¥È¥ë¡¼¥×¤òµ¯Æ°¤»¤º¤Ë nil ¤òÊÖ¤¹¡¥
+ : ¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï°ú¿ô¤ò´Þ¤á¤Æ TclTkLib ¤ÎƱ̾¥á¥½¥Ã¥É¤ËƱ¤¸¡¥
do_one_event
- : スレーブ IP ã®å ´åˆã«ã¯å¼•æ•°ã®ã‚¤ãƒ™ãƒ³ãƒˆãƒ•ラグ㫠DONT_WAIT ãŒ
- : 強制的ã«è¿½åŠ ã•れる (イベント待ã¡ã§ã‚¹ãƒªãƒ¼ãƒ—ã™ã‚‹ã“ã¨ã¯ç¦æ­¢).
- : ãれ以外ã®ç‚¹ã§ã¯å¼•æ•°ã‚’å«ã‚㦠TclTkLib ã®åŒåメソッドã«åŒã˜ï¼Ž
+ : ¥¹¥ì¡¼¥Ö IP ¤Î¾ì¹ç¤Ë¤Ï°ú¿ô¤Î¥¤¥Ù¥ó¥È¥Õ¥é¥°¤Ë DONT_WAIT ¤¬
+ : ¶¯À©Åª¤ËÄɲ䵤ì¤ë (¥¤¥Ù¥ó¥ÈÂÔ¤Á¤Ç¥¹¥ê¡¼¥×¤¹¤ë¤³¤È¤Ï¶Ø»ß)¡¥
+ : ¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï°ú¿ô¤ò´Þ¤á¤Æ TclTkLib ¤ÎƱ̾¥á¥½¥Ã¥É¤ËƱ¤¸¡¥
set_eventloop_tick
get_eventloop_tick
@@ -561,24 +561,24 @@ require "tcltklib" ã™ã‚‹ã¨, 以下ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«, クラスãŒåˆ©ç”¨å¯èƒ½
get_eventloop_weight
mainloop_abort_on_exception
mainloop_abort_on_exception=
- : スレーブ IP ã®å ´åˆã«ã¯å€¤ã®è¨­å®šãŒè¨±ã•れãªã„ (無視ã•れる).
- : ãれ以外ã®ç‚¹ã§ã¯å¼•æ•°ã‚’å«ã‚㦠TclTkLib ã®åŒåメソッドã«åŒã˜ï¼Ž
+ : ¥¹¥ì¡¼¥Ö IP ¤Î¾ì¹ç¤Ë¤ÏÃͤÎÀßÄ꤬µö¤µ¤ì¤Ê¤¤ (̵»ë¤µ¤ì¤ë)¡¥
+ : ¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï°ú¿ô¤ò´Þ¤á¤Æ TclTkLib ¤ÎƱ̾¥á¥½¥Ã¥É¤ËƱ¤¸¡¥
encoding_table
- : Ruby m17n 用㫠Ruby 㨠Tk ã¨ã®é–“ã® encoding 対応表を返ã™ï¼Ž
-
-クラス TkCallbackBreak < StandardError
-クラス TkCallbackContinue < StandardError
- : ã“れらã¯ã‚¤ãƒ™ãƒ³ãƒˆã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ã«ãŠã„ã¦ï¼Œã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯å‡¦ç†ã‚’é©åˆ‡ã«ä¸­
- : æ–­ã—ãŸã‚Šï¼Œæ¬¡ã®ãƒã‚¤ãƒ³ãƒ‰ã‚¿ã‚°ã®ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°å‡¦ç†ã«é€²ã‚ãŸã‚Šã™ã‚‹ã“ã¨
- : ã‚’å¯èƒ½ã«ã™ã‚‹ãŸã‚ã®ä¾‹å¤–クラスã§ã‚る.
- : コールãƒãƒƒã‚¯ã§ break ã‚„ continue を実ç¾ã™ã‚‹ãŸã‚ã«ã¯ï¼Œã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯
- : ã§ã‚ã‚‹ Ruby 手続ã㌠Tcl/Tk インタープリタå´ã«é©åˆ‡ãªãƒªã‚¿ãƒ¼ãƒ³ã‚³ãƒ¼
- : ドを返ã™å¿…è¦ãŒã‚る.Ruby ã®æ‰‹ç¶šããŒæ™®é€šã«å€¤ã‚’è¿”ã™ã®ã§ã¯ï¼Œãã‚ŒãŒæ™®
- : é€šã®æˆ»ã‚Šå€¤ã§ã‚ã‚‹ã®ã‹å¦ã‹ã‚’区別ãŒã§ããªã„ãŸã‚,例外発生を利用ã—ãŸ
- : 実装を行ã£ã¦ã„る.
- : ãŸã ã—ç¾åœ¨ã§ã¯ï¼Œã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯æ‰‹ç¶šãã‚’ Ruby ã® break, next ã§çµ‚了ã™
- : ã‚‹ã“ã¨ã§åŒç­‰ã®çµæžœã‚’å¾—ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã£ã¦ã„る.ãれゆãˆï¼Œ
- : ã“れらã¯å¿…è¦ãªã„ã‚‚ã®ã§ã¯ã‚ã‚‹ãŒï¼Œäº’æ›æ€§ã®ãŸã‚ã«æ®‹ã—ã¦ã‚る.
+ : Ruby m17n ÍÑ¤Ë Ruby ¤È Tk ¤È¤Î´Ö¤Î encoding Âбþɽ¤òÊÖ¤¹¡¥
+
+¥¯¥é¥¹ TkCallbackBreak < StandardError
+¥¯¥é¥¹ TkCallbackContinue < StandardError
+ : ¤³¤ì¤é¤Ï¥¤¥Ù¥ó¥È¥³¡¼¥ë¥Ð¥Ã¥¯¤Ë¤ª¤¤¤Æ¡¤¥³¡¼¥ë¥Ð¥Ã¥¯½èÍý¤òŬÀÚ¤ËÃæ
+ : ÃǤ·¤¿¤ê¡¤¼¡¤Î¥Ð¥¤¥ó¥É¥¿¥°¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°½èÍý¤Ë¿Ê¤á¤¿¤ê¤¹¤ë¤³¤È
+ : ¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤ÎÎã³°¥¯¥é¥¹¤Ç¤¢¤ë¡¥
+ : ¥³¡¼¥ë¥Ð¥Ã¥¯¤Ç break ¤ä continue ¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¤Ï¡¤¥³¡¼¥ë¥Ð¥Ã¥¯
+ : ¤Ç¤¢¤ë Ruby ¼ê³¤­¤¬ Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿Â¦¤ËŬÀڤʥ꥿¡¼¥ó¥³¡¼
+ : ¥É¤òÊÖ¤¹É¬Íפ¬¤¢¤ë¡¥Ruby ¤Î¼ê³¤­¤¬ÉáÄ̤ËÃͤòÊÖ¤¹¤Î¤Ç¤Ï¡¤¤½¤ì¤¬Éá
+ : Ä̤ÎÌá¤êÃͤǤ¢¤ë¤Î¤«Èݤ«¤ò¶èÊ̤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¤Î㳰ȯÀ¸¤òÍøÍѤ·¤¿
+ : ¼ÂÁõ¤ò¹Ô¤Ã¤Æ¤¤¤ë¡¥
+ : ¤¿¤À¤·¸½ºß¤Ç¤Ï¡¤¥³¡¼¥ë¥Ð¥Ã¥¯¼ê³¤­¤ò Ruby ¤Î break, next ¤Ç½ªÎ»¤¹
+ : ¤ë¤³¤È¤ÇƱÅù¤Î·ë²Ì¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡¥¤½¤ì¤æ¤¨¡¤
+ : ¤³¤ì¤é¤ÏɬÍפʤ¤¤â¤Î¤Ç¤Ï¤¢¤ë¤¬¡¤¸ß´¹À­¤Î¤¿¤á¤Ë»Ä¤·¤Æ¤¢¤ë¡¥
(eof)
diff --git a/ext/tk/README.1st b/ext/tk/README.1st
index 96564cc67b..fce5b0242b 100644
--- a/ext/tk/README.1st
+++ b/ext/tk/README.1st
@@ -1,19 +1,19 @@
-If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so
-which is working correctly. When you have some troubles on compiling,
-please read README.tcltklib and README.ActiveTcl.
-Even if there is a tcltklib.so on your Ruby library directry, it will not
-work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment.
-You must also check that your Tcl/Tk is installed properly.
+If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so
+which is working correctly. When you have some troubles on compiling,
+please read README.tcltklib and README.ActiveTcl.
+Even if there is a tcltklib.so on your Ruby library directry, it will not
+work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment.
+You must also check that your Tcl/Tk is installed properly.
--------------------------------------------
- ( the following is written in UTF-8 )
+ ( the following is written in EUC-JP )
-Ruby/Tk (tk.rb ãªã©) を使ã„ãŸã„å ´åˆã«ã¯ï¼Œtcltklib.so ãŒæ­£ã—ãå‹•ã„ã¦ã„ãª
-ã‘れã°ãªã‚Šã¾ã›ã‚“.コンパイル時ã«ä½•ã‹å•題ãŒç”Ÿã˜ãŸå ´åˆã¯ï¼ŒREADME.tcltklib
-ã‚„ README.ActiveTcl を見ã¦ãã ã•ã„.
-ãŸã¨ãˆ Ruby ã®ãƒ©ã‚¤ãƒ–ラリディレクトリ㫠tcltklib.so ãŒå­˜åœ¨ã—ã¦ã„ãŸã¨ã—ã¦
-も,実行環境㫠Tcl/Tk ライブラリ (libtcl8.4.so ãªã©) ãŒãªã‘ã‚Œã°æ©Ÿèƒ½ã—ã¾
-ã›ã‚“.Tcl/Tk ãŒæ­£ã—ãインストールã•れã¦ã„ã‚‹ã‹ã‚‚ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„.
+Ruby/Tk (tk.rb ¤Ê¤É) ¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ë¤Ï¡¤tcltklib.so ¤¬Àµ¤·¤¯Æ°¤¤¤Æ¤¤¤Ê
+¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡¥¥³¥ó¥Ñ¥¤¥ë»þ¤Ë²¿¤«ÌäÂ꤬À¸¤¸¤¿¾ì¹ç¤Ï¡¤README.tcltklib
+¤ä README.ActiveTcl ¤ò¸«¤Æ¤¯¤À¤µ¤¤¡¥
+¤¿¤È¤¨ Ruby ¤Î¥é¥¤¥Ö¥é¥ê¥Ç¥£¥ì¥¯¥È¥ê¤Ë tcltklib.so ¤¬Â¸ºß¤·¤Æ¤¤¤¿¤È¤·¤Æ
+¤â¡¤¼Â¹Ô´Ä¶­¤Ë Tcl/Tk ¥é¥¤¥Ö¥é¥ê (libtcl8.4.so ¤Ê¤É) ¤¬¤Ê¤±¤ì¤Ðµ¡Ç½¤·¤Þ
+¤»¤ó¡¥Tcl/Tk ¤¬Àµ¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤â¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡¥
==========================================================
Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
index b7f023c91b..c0f9ef8fe4 100644
--- a/ext/tk/README.ActiveTcl
+++ b/ext/tk/README.ActiveTcl
@@ -1,4 +1,4 @@
-ActiveTcl is ActiveState's quality-assured distribution of Tcl.
+ActiveTcl is ActiveState's quality-assured distribution of Tcl.
# see <http://www.activestate.com/Products/ActiveTcl/>
# <http://www.tcl.tk/>
@@ -12,11 +12,11 @@ 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,
+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',
+ ( When without argument; no <ActiveTcl_root>; only '--with-ActiveTcl',
it same to '--with-ActiveTcl=/opt/ActiveTcl*/lib' )
--with-tcl-dir=<ActiveTcl_root>
@@ -28,7 +28,7 @@ And use the followings if you need.
--with-tklib=<libname>
--enable-tcltk-stubs
-For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl',
+For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl',
configure --with-tcl-dir=/usr/local/ActiveTcl/ \
--with-tk-dir=/usr/local/ActiveTcl/ \
@@ -36,17 +36,17 @@ For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl',
--with-tklib=tkstub8.4 \
--enable-tcltk-stubs
-It depends on your environment that you have to add the directory of
-ActiveTcl's libraries to your library path when execute Ruby/Tk.
-One of the way is to add entries to TCLLIBPATH environment variable,
+It depends on your environment that you have to add the directory of
+ActiveTcl's libraries to your library path when execute Ruby/Tk.
+One of the way is to add entries to TCLLIBPATH environment variable,
and one of the others add to LD_LIBRARY_PATH environment variable
-Probably, using TCLLIBPATH is better. The value is appended at the
-head of Tcl's 'auto_path' variable. You can see the value of the
+Probably, using TCLLIBPATH is better. The value is appended at the
+head of Tcl's 'auto_path' variable. You can see the value of the
variable by using 'Tk::AUTO_PATH.value' or 'Tk::AUTO_PATH.list'.
-For example, on Linux, one of the ways is to use LD_LIBRARY_PATH
-environment variable.
+For example, on Linux, one of the ways is to use LD_LIBRARY_PATH
+environment variable.
-------------------------------------------------------------------------
[bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH \
ruby your-Ruby/Tk-script
@@ -57,6 +57,6 @@ Based on it, the Tcl interpreter changes auto_path variable's value.
Then, you'll be able to use Tcl/Tk extension libraries included in the
ActiveTcl package (e.g. call TkPackage.require('BWidget'), and then,
-use functions/widgets of BWidget extention).
+use functions/widgets of BWidget extention).
Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.fork b/ext/tk/README.fork
index c58d75883b..707d78fc12 100644
--- a/ext/tk/README.fork
+++ b/ext/tk/README.fork
@@ -1,13 +1,13 @@
Ruby/Tk does NOT support forking the process on which Tk interpreter
-is running (unless NEVER control Tk interpreter under the forked child
-process). In the library 'tk.rb', a Tk interpreter is initialized.
+is running (unless NEVER control Tk interpreter under the forked child
+process). In the library 'tk.rb', a Tk interpreter is initialized.
Therefore, if you want running Tk under a child process, please call
-"require 'tk'" in the child process.
+"require 'tk'" in the child process.
-# If do fork and exec(<new Ruby/Tk>) on the child process, you can
-# control Ruby/Tk interpreter on the child process by 'send' command
-# of Tcl/Tk. About this, please see Tk.appsend and Tk.rb_appsend, or
-# 'remote-tk.rb' and the sample 'sample/remote-ip_sample.rb'.
+# If do fork and exec(<new Ruby/Tk>) on the child process, you can
+# control Ruby/Tk interpreter on the child process by 'send' command
+# of Tcl/Tk. About this, please see Tk.appsend and Tk.rb_appsend, or
+# 'remote-tk.rb' and the sample 'sample/remote-ip_sample.rb'.
For example, the following sample1 will NOT work, and sample2 will
work properly.
diff --git a/ext/tk/README.macosx-aqua b/ext/tk/README.macosx-aqua
index 15630727ec..25a8ed827c 100644
--- a/ext/tk/README.macosx-aqua
+++ b/ext/tk/README.macosx-aqua
@@ -3,13 +3,13 @@
First of all, please read README.tcltklib to use Tcl/Tk Aqua Framework.
-With Tcl/Tk Aqua libraries, current tcltklib somtimes freezes when
-using Aqua specific dialogs (e.g. Tk.messageBox).
+With Tcl/Tk Aqua libraries, current tcltklib somtimes freezes when
+using Aqua specific dialogs (e.g. Tk.messageBox).
This is a known bug of Ruby-1.8.4 release.
-When you meet the trouble on your GUI, you'll be able to avoid the trouble
-by Tcl/Tk's traditional dialogs.
-If you want to do that, please call some of the following bits of script
+When you meet the trouble on your GUI, you'll be able to avoid the trouble
+by Tcl/Tk's traditional dialogs.
+If you want to do that, please call some of the following bits of script
after "reqruie 'tk'".
=================================================================
@@ -57,11 +57,11 @@ Tk.ip_eval(<<'EOS')
EOS
=================================================================
-Each of them replaces the platform specific dialog command to the
-traditional one.
+Each of them replaces the platform specific dialog command to the
+traditional one.
-If you use some MultiTkIp objects, probably, you'll have to call the
-bits of script for each MultiTkIp object.
+If you use some MultiTkIp objects, probably, you'll have to call the
+bits of script for each MultiTkIp object.
---
+--
Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
index 0064586373..251348e91a 100644
--- a/ext/tk/README.tcltklib
+++ b/ext/tk/README.tcltklib
@@ -1,67 +1,42 @@
-To compile 'tcltklib', you must have Tcl/Tk libraries on your environment.
+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),
-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.
+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
+ (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 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
+ teach the paths for loading shared-libraries
to linker.
- <paths> is a path list with the same format
+ <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>
- --with-tcltkversion=<tclversion>,<tkversion>
+ --with-tcltkversion=<version>
force version of Tcl/Tk libaray
- (e.g. libtcl8.4g.so & libtk8.4g.so ==> --with-tcltkversion=8.4g
- libtcl8.4.so & libtk8.4g.so ==> --with-tcltkversion=8.4,8.4g)
-
- --enable-tcl-h-ver-check/--disable-tcl-h-ver-check
- --enable-tk-h-ver-check/--disable-tk-h-ver-check
- enable or disable for checking MAJOR_VERSION and
- MINOR_VERSION on tcl.h/tk.h whether match with
- Tcl/Tk libraries' version or not.
-
- --with-tcl-build-dir=<dir>
- --with-tk-build-dir=<dir> If you want to compile with libraries on Tcl/Tk
- build dir (still NOT installed), you must use
- these options.
- (e.g. --with-tcl-build-dir=./build/tcl8.5.9/unix)
- When use these options, --with-tclConfig-dir and
- --with-tkConfig-dir options are ignored (however,
- --with-tclConfig-file and --with-tkConfig-file
- options are still available).
-
- --with-tclConfig-file=<file>/--without-tclConfig-file
- --with-tkConfig-file=<file>/--without-tkConfig-file
- file path of tclConfig.sh/tkConfig.sh, or don't
- refer those.
- If you want use non-standard filenames of config
- files (e.g. tclConfig-static.sh), you must use
- these options.
-
- --with-tclConfig-dir=<dir>
- --with-tkConfig-dir=<dir> the directory contains 'tclConfig.sh' and
- 'tkConfig.sh'.
- Current "extconf.rb" uses the information
+ (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.
@@ -70,14 +45,14 @@ some or all of the following options.
--enable-tcltk-stubs (if you force to enable stubs)
On old "extconf.rb", default is false.
- On current "extconf.rb", default is true when
+ 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>
+ --with-tcl-dir=<path>
equal to "--with-tcl-include=<path>/include --with-tcl-lib=<path>/lib"
- --with-tk-dir=<path>
+ --with-tk-dir=<path>
equal to "--with-tk-include=<path>/include --with-tk-lib=<path>/lib"
--with-tcl-include=<dir> the directry contains 'tcl.h'
@@ -91,9 +66,9 @@ some or all of the following options.
--enable-tcltk-framework use Tcl/Tk framework
- --with-tcltk-framework=<dir> the directory contains Tcl/Tk framework;
+ --with-tcltk-framework=<dir> the directory contains Tcl/Tk framework;
"<dir>/Tcl.framework" and "<dir>/Tk.framework".
- When this option is given, it is assumed that
+ When this option is given, it is assumed that
--enable-tcltk-framework option is given also.
--with-tcl-framework-dir=<dir>
@@ -103,17 +78,17 @@ some or all of the following options.
Tk framework directory (e.g. "/Library/Frameworks/Tk.framework")
--with-tcl-framework-header=<dir>
- Tcl framework headers directory
+ Tcl framework headers directory
(e.g. "/Library/Frameworks/Tcl.framework/Headers")
--with-tk-framework-header=<dir>
- Tk framework headers directory
+ Tk framework headers directory
(e.g. "/Library/Frameworks/Tk.framework/Headers")
--with-X11 / --without-X11 use / not use the X Window System
- --with-X11-dir=<path>
+ --with-X11-dir=<path>
equal to "--with-X11-include=<path>/include --with-X11-lib=<path>/lib"
--with-X11-include=<dir> the directry contais X11 header files
@@ -129,24 +104,24 @@ directry of Ruby sources, please try something like as the followings.
*** ATTENTION ***
-When your Tcl/Tk libraries are compiled with "pthread support",
-Ruby/Tk may cause "Hang-up" or "Segmentation Fault" frequently.
-If you have such a trouble, please try to use the '--enable-pthread'
-option of the 'configure' command and re-compile Ruby sources.
-It may help you to avoid this trouble. The following configure
+When your Tcl/Tk libraries are compiled with "pthread support",
+Ruby/Tk may cause "Hang-up" or "Segmentation Fault" frequently.
+If you have such a trouble, please try to use the '--enable-pthread'
+option of the 'configure' command and re-compile Ruby sources.
+It may help you to avoid this trouble. The following configure
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.
+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".
-When no "TCL_THREADS=?" line, if Tcl version is 7.x or 8.0 which is
-given by "TCL_MAJOR_VERSION=?" line and "TCL_MINOR_VERSION=?" line,
+When no "TCL_THREADS=?" line, if Tcl version is 7.x or 8.0 which is
+given by "TCL_MAJOR_VERSION=?" line and "TCL_MINOR_VERSION=?" line,
then --disable-tcl-thread is expected. Else, ignore the 'tclConfig.sh'.
-If --enable-tcl-thread or --disable-tcl-thread option is given, then
---with-tclConfig-file option is ignored.
+If --enable-tcl-thread or --disable-tcl-thread option is given, then
+--with-tclConfig-file option is ignored.
==========================================================
Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/config_list.in b/ext/tk/config_list.in
index 143a7b5df6..ba61797e9b 100644
--- a/ext/tk/config_list.in
+++ b/ext/tk/config_list.in
@@ -1,16 +1,12 @@
##############################################
# configure options for Ruby/Tk
-# release date: 2011-06-05
+# release date: 2009-07-28
##############################################
with tk-old-extconf
with ActiveTcl
with tk-shlib-search-path
enable tcltk-stubs
with tcltkversion
-enable tcl-h-ver-check
-enable tk-h-ver-check
-with tcl-build-dir
-with tk-build-dir
with tcl-config
with tk-config
with tclConfig-dir
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index b659d93534..2f68d01e7f 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -8,21 +8,12 @@ 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 7.6 4.2]
# %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0]
- # %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
- %w[8.5 8.4] # At present, Tcl/Tk8.6 is not supported.
-
-TkLib_Config['unsupported_versions'] =
- %w[8.8 8.7 8.6] # At present, Tcl/Tk8.6 is not supported.
+ %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
TkLib_Config['major_nums'] = '87'
##############################################################
-
-TkLib_Config['enable-shared'] = enable_config("shared")
-
-
-##############################################################
# use old extconf.rb ?
##############################################################
if with_config('tk-old-extconf')
@@ -123,7 +114,7 @@ def is_macosx?
end
def maybe_64bit?
- /64|universal|s390x/ =~ RUBY_PLATFORM
+ /64|universal/ =~ RUBY_PLATFORM
end
def check_tcltk_version(version)
@@ -322,9 +313,7 @@ def find_macosx_framework
paths.reverse! unless TkLib_Config["ActiveTcl"] # system has higher priority
paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
- next unless File.exist?(File.join(dir, "Tcl.framework", "Headers"))
next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
- next unless File.exist?(File.join(dir, "Tk.framework", "Headers"))
next unless File.directory?(tkdir = File.join(dir, "Tk.framework"))
TkLib_Config["tcltk-framework"] = dir
return [tcldir, tkdir]
@@ -551,13 +540,13 @@ end
def get_ext_list()
exts = [CONFIG['DLEXT']]
- exts.concat %w(dll) if is_win32?
- exts.concat %w(bundle dylib) if is_macosx?
+ exts.concat %w(dll lib) if is_win32?
+ exts.concat %w(bundle dylib) if is_macosx? || /nextstep|openstep|rhapsody/ =~ RUBY_PLATFORM
- if TkLib_Config["tcltk-stubs"] || TkLib_Config['enable-shared'] == false
- exts.unshift "lib" if is_win32?
- exts.unshift "a"
- exts.unshift CONFIG['LIBEXT']
+ if enable_config("shared") == false
+ [CONFIG['LIBEXT'], "a"].concat exts
+ else
+ exts.concat [CONFIG['LIBEXT'], "a"]
end
if is_win32?
@@ -745,7 +734,6 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
end
conf = nil
- progress_flag = false
config_dir.uniq!
config_dir.map{|dir|
@@ -756,7 +744,7 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
dir.strip.chomp('/')
end
}.each{|dir|
- print("."); progress_flag = true # progress
+ print(".") # progress
# print("check #{dir} ==>");
if dir.kind_of? Array
tcldir, tkdir = dir
@@ -795,36 +783,10 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
# parse tclConfig.sh/tkConfig.sh
tclconf = (tclpath)? parse_tclConfig(tclpath): nil
- if tclconf
- if tclver && ((tclver_major && tclver_major != tclconf['TCL_MAJOR_VERSION']) || (tclver_minor && tclver_minor != tclconf['TCL_MINOR_VERSION']))
- print("\n") if progress_flag
- puts "Ignore \"#{tclpath}\" (unmatch with configured version)."
- progress_flag = false
- next
- end
- if TkLib_Config['unsupported_versions'].find{|ver| ver == "#{tclconf['TCL_MAJOR_VERSION']}.#{tclconf['TCL_MINOR_VERSION']}"}
- print("\n") if progress_flag
- puts "Ignore \"#{tclpath}\" (unsupported version of Tcl/Tk)."
- progress_flag = false
- next
- end
- end
+ next if tclconf && tclver && ((tclver_major && tclver_major != tclconf['TCL_MAJOR_VERSION']) || (tclver_minor && tclver_minor != tclconf['TCL_MINOR_VERSION']))
tkconf = (tkpath)? parse_tclConfig(tkpath): nil
- if tkconf
- if tkver && ((tkver_major && tkver_major != tkconf['TK_MAJOR_VERSION']) || (tkver_minor && tkver_minor != tkconf['TK_MINOR_VERSION']))
- print("\n") if progress_flag
- puts "Ignore \"#{tkpath}\" (unmatch with configured version)."
- progress_flag = false
- next
- end
- if TkLib_Config['unsupported_versions'].find{|ver| ver == "#{tkconf['TK_MAJOR_VERSION']}.#{tkconf['TK_MINOR_VERSION']}"}
- print("\n") if progress_flag
- puts "Ignore \"#{tkpath}\" (unsupported version of Tcl/Tk)."
- progress_flag = false
- next
- end
- end
+ next if tkconf && tkver && ((tkver_major && tkver_major != tkconf['TK_MAJOR_VERSION']) || (tkver_minor && tkver_minor != tkconf['TK_MINOR_VERSION']))
# nativethread check
if !TkLib_Config["ruby_with_thread"]
@@ -1327,10 +1289,6 @@ end
def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
tcl_opt_paths, tk_opt_paths)
st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
- if !st && TkLib_Config['enable-shared'] == nil
- TkLib_Config['enable-shared'] = false
- st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
- end
unless st
puts("Warning:: cannot find Tcl library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
return false
@@ -1343,10 +1301,6 @@ def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
end
st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
- if !st && TkLib_Config['enable-shared'] == nil
- TkLib_Config['enable-shared'] = false
- st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
- end
unless st
puts("Warning:: cannot find Tk library. tcltklib will not be compiled (tcltklib is disabled on your Ruby. That is, Ruby/Tk will not work). Please check configure options.")
return false
@@ -1404,15 +1358,10 @@ def find_tcltk_header(tclver, tkver)
print(".") # progress
if major && minor
# version check on tcl.h
- version_check = proc {|code|
- code << ("#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n" \
- "#error VERSION does not match\n" \
- "#endif")
- }
+ have_tcl_h = try_cpp("#include <tcl.h>\n#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
else
- version_check = nil
+ have_tcl_h = have_header('tcl.h')
end
- have_tcl_h = have_header('tcl.h', &version_check)
unless have_tcl_h
if tclver && ! tclver.empty?
versions = [tclver]
@@ -1434,19 +1383,13 @@ def find_tcltk_header(tclver, tkver)
(File.directory?(dir))? File.expand_path(dir): nil
}.compact.uniq
- if major || minor
- version_check = proc {|code|
- code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
- code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
- code
- }
- else
- version_check = nil
- end
+ code = "#include <tcl.h>\n"
+ code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
+ code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
have_tcl_h = paths.find{|path|
print(".") # progress
inc_opt = " -I#{path.quote}"
- if try_header("tcl", inc_opt, &version_check)
+ if try_cpp(code, inc_opt)
($INCFLAGS ||= "") << inc_opt
true
else
@@ -1471,15 +1414,10 @@ def find_tcltk_header(tclver, tkver)
print(".") # progress
if major && minor
# version check on tk.h
- version_check = proc {|code|
- code << ("#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n" \
- "#error VERSION does not match\n" \
- "#endif")
- }
+ have_tk_h = try_cpp("#include <tk.h>\n#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
else
- version_check = nil
+ have_tk_h = have_header('tk.h')
end
- have_tk_h = have_header('tk.h')
unless have_tk_h
if tkver && ! tkver.empty?
versions = [tkver]
@@ -1501,19 +1439,13 @@ def find_tcltk_header(tclver, tkver)
(File.directory?(dir))? File.expand_path(dir): nil
}.compact.uniq
- if major || minor
- version_check = proc {|code|
- code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
- code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
- code
- }
- else
- version_check = nil
- end
+ code = "#include <tcl.h>\n#include <tk.h>\n"
+ code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
+ code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
have_tk_h = paths.find{|path|
print(".") # progress
inc_opt = " -I#{path.quote}"
- if try_header(%w'tcl.h tk.h', inc_opt, &version_check)
+ if try_cpp(code, inc_opt)
($INCFLAGS ||= "") << inc_opt
true
else
@@ -2015,55 +1947,53 @@ if TkLib_Config["tcltk-framework"]
puts("Use MacOS X Frameworks.")
($LDFLAGS ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-R#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"]
- libs = ''
if tcl_cfg_dir
TclConfig_Info['TCL_LIBS'] ||= ""
($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC']
- libs << ' ' << TclConfig_Info['TCL_LIBS']
+ $LDFLAGS << ' ' << TclConfig_Info['TCL_LIBS']
if stubs
if TkLib_Config["tcl-build-dir"] &&
TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC'] &&
!TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC'].strip.empty?
- libs << ' ' << TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
+ $LDFLAGS << ' ' << TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
else
- libs << ' ' << TclConfig_Info['TCL_STUB_LIB_SPEC']
+ $LDFLAGS << ' ' << TclConfig_Info['TCL_STUB_LIB_SPEC']
end
else
if TkLib_Config["tcl-build-dir"] &&
TclConfig_Info['TCL_BUILD_LIB_SPEC'] &&
!TclConfig_Info['TCL_BUILD_LIB_SPEC'].strip.empty?
- libs << ' ' << TclConfig_Info['TCL_BUILD_LIB_SPEC']
+ $LDFLAGS << ' ' << TclConfig_Info['TCL_BUILD_LIB_SPEC']
else
- libs << ' ' << TclConfig_Info['TCL_LIB_SPEC']
+ $LDFLAGS << ' ' << TclConfig_Info['TCL_LIB_SPEC']
end
end
end
- libs << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
+ $LDFLAGS << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
if tk_cfg_dir
TkConfig_Info['TK_LIBS'] ||= ""
($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC']
- libs << ' ' << TkConfig_Info['TK_LIBS']
+ $LDFLAGS << ' ' << TkConfig_Info['TK_LIBS']
if stubs
if TkLib_Config["tk-build-dir"] &&
TclConfig_Info['TK_BUILD_STUB_LIB_SPEC'] &&
!TclConfig_Info['TK_BUILD_STUB_LIB_SPEC'].strip.empty?
- libs << ' ' << TkConfig_Info['TK_BUILD_STUB_LIB_SPEC']
+ $LDFLAGS << ' ' << TkConfig_Info['TK_BUILD_STUB_LIB_SPEC']
else
- libs << ' ' << TkConfig_Info['TK_STUB_LIB_SPEC']
+ $LDFLAGS << ' ' << TkConfig_Info['TK_STUB_LIB_SPEC']
end
else
if TkLib_Config["tk-build-dir"] &&
TclConfig_Info['TK_BUILD_LIB_SPEC'] &&
!TclConfig_Info['TK_BUILD_LIB_SPEC'].strip.empty?
- libs << ' ' << TkConfig_Info['TK_BUILD_LIB_SPEC']
+ $LDFLAGS << ' ' << TkConfig_Info['TK_BUILD_LIB_SPEC']
else
- libs << ' ' << TkConfig_Info['TK_LIB_SPEC']
+ $LDFLAGS << ' ' << TkConfig_Info['TK_LIB_SPEC']
end
end
end
- $LDFLAGS << ' ' << libs
setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
end
@@ -2099,6 +2029,4 @@ if (TkLib_Config["tcltk-framework"] ||
puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."
else
puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
- puts "If you have Tcl/Tk libraries on your environment, you may be able to use them with configure options (see ext/tk/README.tcltklib)."
- puts "At present, Tcl/Tk8.6 is not supported. Although you can try to use Tcl/Tk8.6 with configure options, it will not work correctly. I recommend you to use Tcl/Tk8.5 or 8.4."
end
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
index c076755756..5918fe4bf0 100644
--- a/ext/tk/lib/README
+++ b/ext/tk/lib/README
@@ -9,8 +9,8 @@ tkextlib/ non-standard Tcl/Tk extension support libraries
*********************************************************************
*** The followings exists for backward compatibility only.
-*** The only thing which they work is that requires current
-*** library files ( tk/*.rb ).
+*** The only thing which they work is that requires current
+*** library files ( tk/*.rb ).
*********************************************************************
tkafter.rb handles Tcl after
tkbgerror.rb Tk error module
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 68bd849670..efeaf9830a 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -774,7 +774,7 @@ class MultiTkIp
ensure
# interp must be deleted before the thread for interp is dead.
- # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
+ # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
# deleted by the wrong thread.
interp.delete
end
@@ -1933,7 +1933,7 @@ class MultiTkIp
end
=end
def cb_eval(cmd, *args)
- self.eval_callback(*args,
+ self.eval_callback(*args,
&_proc_on_safelevel{|*params|
TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
})
@@ -2103,7 +2103,7 @@ end
# evaluate a procedure on the proper interpreter
class MultiTkIp
# instance & class method
- def _proc_on_safelevel(cmd=nil) # require a block for eval
+ 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)}
@@ -2121,7 +2121,7 @@ class MultiTkIp
end
err
}
- $SAFE=safe if $SAFE < safe;
+ $SAFE=safe if $SAFE < safe;
begin
yield(*args)
rescue Exception => e
@@ -2300,7 +2300,7 @@ end
current[:callback_ip] = backup_ip
end
else
- eval_proc_core(true,
+ eval_proc_core(true,
proc{|safe, *params|
Thread.new{cmd.call(safe, *params)}.value
},
diff --git a/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb
index 48ec1df09a..2df3b2fd8c 100644
--- a/ext/tk/lib/tcltk.rb
+++ b/ext/tk/lib/tcltk.rb
@@ -280,7 +280,7 @@ class TclTkWidget < TclTkCommand
# interp: interpreter(TclTkInterpreter)
# parent: parent widget
- # command: widget generating tk command(label ç­‰)
+ # command: widget generating tk command(label Åù)
# *args: argument to the command
interp, parent, command, *args = args
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 5bac92e47c..87ed2a449e 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1205,18 +1205,6 @@ module TkCore
# module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
# ----------------------------------------------------------
#
- # *** ADD (2010/07/05) ***
- # The value of TclTkLib::WINDOWING_SYSTEM is defined at compiling.
- # If it is inconsistent with linked DLL, please call the following
- # before "require 'tk'".
- # ----------------------------------------------------------
- # require 'tcltklib'
- # module TclTkLib
- # remove_const :WINDOWING_SYSTEM
- # WINDOWING_SYSTEM = 'x11' # or 'aqua'
- # end
- # ----------------------------------------------------------
- #
RUN_EVENTLOOP_ON_MAIN_THREAD = true
else
RUN_EVENTLOOP_ON_MAIN_THREAD = false
@@ -1315,7 +1303,7 @@ EOS
ensure
# interp must be deleted before the thread for interp is dead.
- # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
+ # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler
# deleted by the wrong thread.
interp.delete
end
@@ -1359,7 +1347,7 @@ EOS
INTERP.instance_eval{
# @tk_cmd_tbl = TkUtil.untrust({})
- @tk_cmd_tbl =
+ @tk_cmd_tbl =
TkUtil.untrust(Hash.new{|hash, key|
fail IndexError, "unknown command ID '#{key}'"
})
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
index f6ca261da9..2ebee9ea24 100644
--- a/ext/tk/lib/tk/autoload.rb
+++ b/ext/tk/lib/tk/autoload.rb
@@ -538,8 +538,8 @@ class << Tk
@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].
+ # 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
@@ -552,7 +552,7 @@ class << Tk
@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
@@ -566,7 +566,7 @@ class << Tk
# Keep ALIAS[sym].
# Keep OWNER[sym].
@TOPLEVEL_ALIAS_TABLE[target][sym] = obj
-
+
end
end
@@ -583,7 +583,7 @@ class << Tk
def __set_loaded_toplevel_aliases__(autopath, target, obj, *symbols)
# autopath is an autoload file
- # Currently, this method doesn't support that autoload loads
+ # 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
diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index af404213e7..f0cb755bd7 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -85,16 +85,10 @@ class Tk::Canvas<TkWindow
# create a canvas item without creating a TkcItem object
def create(type, *args)
- if type.kind_of?(Class) && type < TkcItem
- # do nothing
- elsif TkcItem.type2class(type.to_s)
- type = TkcItem.type2class(type.to_s)
- else
- fail ArgumentError, "type must a subclass of TkcItem class, or a string in CItemTypeToClass"
- end
type.create(self, *args)
end
+
def addtag(tag, mode, *args)
mode = mode.to_s
if args[0] && mode =~ /^(above|below|with(tag)?)$/
@@ -609,30 +603,6 @@ class Tk::Canvas<TkWindow
def itemtype(tag)
TkcItem.type2class(tk_send('type', tagid(tag)))
end
-
- def create_itemobj_from_id(idnum)
- id = TkcItem.id2obj(self, idnum.to_i)
- return id if id.kind_of?(TkcItem)
-
- typename = tk_send('type', id)
- unless type = TkcItem.type2class(typename)
- (itemclass = typename.dup)[0,1] = typename[0,1].upcase
- type = TkcItem.const_set(itemclass, Class.new(TkcItem))
- type.const_set("CItemTypeName", typename.freeze)
- TkcItem::CItemTypeToClass[typename] = type
- end
-
- canvas = self
- (obj = type.allocate).instance_eval{
- @parent = @c = canvas
- @path = canvas.path
- @id = id
- TkcItem::CItemID_TBL.mutex.synchronize{
- TkcItem::CItemID_TBL[@path] = {} unless TkcItem::CItemID_TBL[@path]
- TkcItem::CItemID_TBL[@path][@id] = self
- }
- }
- end
end
#TkCanvas = Tk::Canvas unless Object.const_defined? :TkCanvas
diff --git a/ext/tk/lib/tk/fontchooser.rb b/ext/tk/lib/tk/fontchooser.rb
index 694c58a607..092ffc04bf 100644
--- a/ext/tk/lib/tk/fontchooser.rb
+++ b/ext/tk/lib/tk/fontchooser.rb
@@ -86,7 +86,7 @@ class << TkFont::Chooser
def configure(option, value=None)
if option.kind_of? Hash
- tk_call('tk', 'fontchooser', 'configure',
+ tk_call('tk', 'fontchooser', 'configure',
*hash_kv(_symbolkey2str(option)))
else
opt = option.to_s
@@ -141,8 +141,8 @@ class << TkFont::Chooser
def set_for(target, title="Font")
if target.kind_of? TkFont
configs = {
- :font=>target.actual_hash,
- :command=>proc{|fnt, *args|
+ :font=>target.actual_hash,
+ :command=>proc{|fnt, *args|
target.configure(TkFont.actual_hash(fnt))
}
}
@@ -152,14 +152,14 @@ class << TkFont::Chooser
fnt = fnt.actual_hash if fnt.kind_of?(TkFont)
configs = {
:font => fnt,
- :command=>proc{|fnt, *args|
+ :command=>proc{|fnt, *args|
target[:font] = TkFont.actual_hash(fnt)
}
}
else
configs = {
- :font=>target.cget_tkstring(:font),
- :command=>proc{|fnt, *args|
+ :font=>target.cget_tkstring(:font),
+ :command=>proc{|fnt, *args|
target.font = TkFont.actual_hash_displayof(fnt, target)
}
}
diff --git a/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
index d2b0305dcd..39d63478a6 100644
--- a/ext/tk/lib/tk/image.rb
+++ b/ext/tk/lib/tk/image.rb
@@ -72,6 +72,7 @@ class TkImage<TkObject
end
unless @path
Tk_Image_ID.mutex.synchronize{
+ # @path = Tk_Image_ID.join('')
@path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
Tk_Image_ID[1].succ!
}
@@ -127,12 +128,6 @@ class TkBitmapImage<TkImage
end
end
-# A photo is an image whose pixels can display any color or be transparent.
-# At present, only GIF and PPM/PGM formats are supported, but an interface
-# exists to allow additional image file formats to be added easily.
-#
-# This class documentation is a copy from the original Tcl/Tk at
-# http://www.tcl.tk/man/tcl8.5/TkCmd/photo.htm with some rewrited parts.
class TkPhotoImage<TkImage
NullArgOptionKeys = [ "shrink", "grayscale" ]
@@ -151,49 +146,11 @@ class TkPhotoImage<TkImage
end
private :_photo_hash_kv
- # Create a new image with the given options.
- # == Examples of use :
- # === Create an empty image of 300x200 pixels
- #
- # image = TkPhotoImage.new(:height => 200, :width => 300)
- #
- # === Create an image from a file
- #
- # image = TkPhotoImage.new(:file: => 'my_image.gif')
- #
- # == Options
- # Photos support the following options:
- # * :data
- # Specifies the contents of the image as a string.
- # * :format
- # Specifies the name of the file format for the data.
- # * :file
- # Gives the name of a file that is to be read to supply data for the image.
- # * :gamma
- # Specifies that the colors allocated for displaying this image in a window
- # should be corrected for a non-linear display with the specified gamma
- # exponent value.
- # * height
- # Specifies the height of the image, in pixels. This option is useful
- # primarily in situations where the user wishes to build up the contents of
- # the image piece by piece. A value of zero (the default) allows the image
- # to expand or shrink vertically to fit the data stored in it.
- # * palette
- # Specifies the resolution of the color cube to be allocated for displaying
- # this image.
- # * width
- # Specifies the width of the image, in pixels. This option is useful
- # primarily in situations where the user wishes to build up the contents of
- # the image piece by piece. A value of zero (the default) allows the image
- # to expand or shrink horizontally to fit the data stored in it.
def initialize(*args)
@type = 'photo'
super(*args)
end
- # Blank the image; that is, set the entire image to have no data, so it will
- # be displayed as transparent, and the background of whatever window it is
- # displayed in will show through.
def blank
tk_send_without_enc('blank')
self
@@ -207,10 +164,6 @@ class TkPhotoImage<TkImage
tk_tcl2ruby(tk_send('cget', '-' << option.to_s))
end
end
-
- # Returns the current value of the configuration option given by option.
- # Example, display name of the file from which <tt>image</tt> was created:
- # puts image.cget :file
def cget(option)
unless TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__
cget_strict(option)
@@ -229,51 +182,6 @@ class TkPhotoImage<TkImage
end
end
- # Copies a region from the image called source to the image called
- # destination, possibly with pixel zooming and/or subsampling. If no options
- # are specified, this method copies the whole of source into destination,
- # starting at coordinates (0,0) in destination. The following options may be
- # specified:
- #
- # * :from [x1, y1, x2, y2]
- # Specifies a rectangular sub-region of the source image to be copied.
- # (x1,y1) and (x2,y2) specify diagonally opposite corners of the rectangle.
- # If x2 and y2 are not specified, the default value is the bottom-right
- # corner of the source image. The pixels copied will include the left and
- # top edges of the specified rectangle but not the bottom or right edges.
- # If the :from option is not given, the default is the whole source image.
- # * :to [x1, y1, x2, y2]
- # Specifies a rectangular sub-region of the destination image to be
- # affected. (x1,y1) and (x2,y2) specify diagonally opposite corners of the
- # rectangle. If x2 and y2 are not specified, the default value is (x1,y1)
- # plus the size of the source region (after subsampling and zooming, if
- # specified). If x2 and y2 are specified, the source region will be
- # replicated if necessary to fill the destination region in a tiled fashion.
- # * :shrink
- # Specifies that the size of the destination image should be reduced, if
- # necessary, so that the region being copied into is at the bottom-right
- # corner of the image. This option will not affect the width or height of
- # the image if the user has specified a non-zero value for the :width or
- # :height configuration option, respectively.
- # * :zoom [x, y]
- # Specifies that the source region should be magnified by a factor of x
- # in the X direction and y in the Y direction. If y is not given, the
- # default value is the same as x. With this option, each pixel in the
- # source image will be expanded into a block of x x y pixels in the
- # destination image, all the same color. x and y must be greater than 0.
- # * :subsample [x, y]
- # Specifies that the source image should be reduced in size by using only
- # every xth pixel in the X direction and yth pixel in the Y direction.
- # Negative values will cause the image to be flipped about the Y or X axes,
- # respectively. If y is not given, the default value is the same as x.
- # * :compositingrule rule
- # Specifies how transparent pixels in the source image are combined with
- # the destination image. When a compositing rule of <tt>overlay</tt> is set,
- # the old contents of the destination image are visible, as if the source
- # image were printed on a piece of transparent film and placed over the
- # top of the destination. When a compositing rule of <tt>set</tt> is set,
- # the old contents of the destination image are discarded and the source
- # image is used as-is. The default compositing rule is <tt>overlay</tt>.
def copy(src, *opts)
if opts.size == 0
tk_send('copy', src)
@@ -293,35 +201,11 @@ class TkPhotoImage<TkImage
self
end
- # Returns image data in the form of a string. The following options may be
- # specified:
- # * :background color
- # If the color is specified, the data will not contain any transparency
- # information. In all transparent pixels the color will be replaced by the
- # specified color.
- # * :format format-name
- # Specifies the name of the image file format handler to be used.
- # Specifically, this subcommand searches for the first handler whose name
- # matches an initial substring of format-name and which has the capability
- # to read this image data. If this option is not given, this subcommand
- # uses the first handler that has the capability to read the image data.
- # * :from [x1, y1, x2, y2]
- # Specifies a rectangular region of imageName to be returned. If only x1
- # and y1 are specified, the region extends from (x1,y1) to the bottom-right
- # corner of imageName. If all four coordinates are given, they specify
- # diagonally opposite corners of the rectangular region, including x1,y1
- # and excluding x2,y2. The default, if this option is not given, is the
- # whole image.
- # * :grayscale
- # If this options is specified, the data will not contain color information.
- # All pixel data will be transformed into grayscale.
def data(keys={})
+ #tk_send('data', *_photo_hash_kv(keys))
tk_split_list(tk_send('data', *_photo_hash_kv(keys)))
end
- # Returns the color of the pixel at coordinates (x,y) in the image as a list
- # of three integers between 0 and 255, representing the red, green and blue
- # components respectively.
def get(x, y)
tk_send('get', x, y).split.collect{|n| n.to_i}
end
@@ -362,15 +246,11 @@ class TkPhotoImage<TkImage
self
end
- # Returns a boolean indicating if the pixel at (x,y) is transparent.
def get_transparency(x, y)
bool(tk_send('transparency', 'get', x, y))
end
-
- # Makes the pixel at (x,y) transparent if <tt>state</tt> is true, and makes
- # that pixel opaque otherwise.
- def set_transparency(x, y, state)
- tk_send('transparency', 'set', x, y, state)
+ def set_transparency(x, y, st)
+ tk_send('transparency', 'set', x, y, st)
self
end
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
index cb3597eec9..9521a157d9 100644
--- a/ext/tk/lib/tk/menuspec.rb
+++ b/ext/tk/lib/tk/menuspec.rb
@@ -27,7 +27,7 @@
#
# 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',
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
index f2d0653c69..4abbcad85e 100644
--- a/ext/tk/lib/tk/msgcat.rb
+++ b/ext/tk/lib/tk/msgcat.rb
@@ -125,8 +125,6 @@ class TkMsgCatalog < TkObject
when 2 # src and trans, or, trans_list and enc
if args[0].kind_of?(Array)
- # trans_list
- self.set_translation_list(loc, *args)
else
#self.set_translation(loc, args[0], Tk::UTF8_String.new(args[1]))
self.set_translation(loc, *args)
@@ -201,11 +199,7 @@ class TkMsgCatalog < TkObject
file = File.join(dir, loc + self::MSGCAT_EXT)
if File.readable?(file)
count += 1
- if TkCore::WITH_ENCODING
- eval(IO.read(file, :encoding=>"ASCII-8BIT"))
- else
- eval(IO.read(file))
- end
+ eval(open(file){|f| f.read})
end
}
count
@@ -221,11 +215,7 @@ class TkMsgCatalog < TkObject
file = File.join(dir, loc + @msgcat_ext)
if File.readable?(file)
count += 1
- if TkCore::WITH_ENCODING
- @namespace.eval(IO.read(file, :encoding=>"ASCII-8BIT"))
- else
- @namespace.eval(IO.read(file))
- end
+ @namespace.eval(open(file){|f| f.read})
end
}
count
@@ -239,21 +229,30 @@ 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(ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}} {#{trans_str}}"))
+ Tk.UTF8_String(tk_call_without_enc('::msgcat::mcset',
+ locale,
+ _get_eval_string(src_str, true),
+ trans_str))
else
- Tk.UTF8_String(ip_eval_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)))
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))
Tk.UTF8_String(@namespace.eval{
- ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}} {#{trans_str}}")
+ tk_call_without_enc('::msgcat::mcset',
+ locale,
+ _get_eval_string(src_str, true),
+ trans_str)
})
else
Tk.UTF8_String(@namespace.eval{
- ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}}")
- })
+ tk_call_without_enc('::msgcat::mcset',
+ locale,
+ _get_eval_string(src_str, true))})
end
end
@@ -263,13 +262,12 @@ class TkMsgCatalog < TkObject
trans_list.each{|src, trans|
if trans && trans != None
list << _get_eval_string(src, true)
- list << Tk.UTF8_String(_toUTF8(trans, enc))
+ list << Tk.UTF8_Stirng(_toUTF8(trans, enc))
else
list << _get_eval_string(src, true) << ''
end
}
- #number(tk_call_without_enc('::msgcat::mcmset', locale, list))
- number(ip_eval_without_enc("::msgcat::mcmset {#{locale}} {#{_get_eval_string(list)}}"))
+ number(tk_call_without_enc('::msgcat::mcmset', locale, list))
end
def set_translation_list(locale, trans_list, enc='utf-8')
# trans_list ::= [ [src, trans], [src, trans], ... ]
@@ -283,8 +281,7 @@ class TkMsgCatalog < TkObject
end
}
number(@namespace.eval{
- #tk_call_without_enc('::msgcat::mcmset', locale, list)
- ip_eval_without_enc("::msgcat::mcmset {#{locale}} {#{_get_eval_string(list)}}")
+ tk_call_without_enc('::msgcat::mcmset', locale, list)
})
end
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
index 0119ba5ef7..4af891995e 100644
--- a/ext/tk/lib/tk/namespace.rb
+++ b/ext/tk/lib/tk/namespace.rb
@@ -325,7 +325,12 @@ class TkNamespace < TkObject
def code(script = Proc.new)
if script.kind_of?(String)
cmd = proc{|*args|
- ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
+ if TkCore::WITH_RUBY_VM ### Ruby 1.9 !!!!
+ obj = ScopeArgs.new(@fullname,*args)
+ ret = obj.instance_exec(obj, script)
+ else
+ ret = ScopeArgs.new(@fullname,*args).instance_eval(script)
+ end
id = ret.object_id
TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
id
diff --git a/ext/tk/lib/tk/ttk_selector.rb b/ext/tk/lib/tk/ttk_selector.rb
index cc9e9928cb..522249e6a9 100644
--- a/ext/tk/lib/tk/ttk_selector.rb
+++ b/ext/tk/lib/tk/ttk_selector.rb
@@ -62,7 +62,7 @@ module Tk
major, minor, type, patchlevel = TclTkLib.get_version
# ttk::spinbox is supported on Tcl/Tk8.6b1 or later
- if ([major,minor,type,patchlevel] <=>
+ if ([major,minor,type,patchlevel] <=>
[8,6,TclTkLib::RELEASE_TYPE::BETA,1]) >= 0
@TOPLEVEL_ALIAS_TABLE[:Ttk].update(
:TkSpinbox => 'tkextlib/tile/tspinbox'
diff --git a/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
index fcd5a2cbd2..b1a2ed886a 100644
--- a/ext/tk/lib/tk/wm.rb
+++ b/ext/tk/lib/tk/wm.rb
@@ -83,11 +83,11 @@ module Tk
def Wm.command(win, value=nil)
if value
- tk_call('wm', 'command', win.epath, value)
+ tk_call('wm', 'command', epath, value)
win
else
- #procedure(tk_call('wm', 'command', win.epath))
- tk_call('wm', 'command', win.epath)
+ #procedure(tk_call('wm', 'command', epath))
+ tk_call('wm', 'command', epath)
end
end
def wm_command(value=nil)
diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
index 522039b11a..6b31ababb3 100644
--- a/ext/tk/lib/tkextlib/SUPPORT_STATUS
+++ b/ext/tk/lib/tkextlib/SUPPORT_STATUS
@@ -6,56 +6,56 @@
The following list shows *CURRENT* status when this file was modifyed
at last. If you want to add other Tcl/Tk extensions to the planed list
(or change its status position), please request them at the ruby-talk,
-ruby-list, or ruby-dev ML. Although we cannot promise to support your
-requests, we'll try to do.
+ruby-list, or ruby-dev ML. Although we cannot promise to support your
+requests, we'll try to do.
-If you want to check that wrapper libraries are ready to use on your
-environment, please execute 'pkg_checker.rb' with no arguments. The
+If you want to check that wrapper libraries are ready to use on your
+environment, please execute 'pkg_checker.rb' with no arguments. The
script may give you some hints about that.
***** IMPORTANT NOTE **********************************************
- 'support' means that Ruby/Tk's wrapper libraries are released.
+ 'support' means that Ruby/Tk's wrapper libraries are released.
'not support' does *NOT* mean that the extension doesn't work
- on Ruby/Tk.
+ on Ruby/Tk.
The version number of each extension means the latest version
- which is checked its feature. That is, it does NOT means only
- version of working. Library files maybe include some features
- which is included in the former version but removed from the
- latest, and maybe able to support the later version then the
+ which is checked its feature. That is, it does NOT means only
+ version of working. Library files maybe include some features
+ which is included in the former version but removed from the
+ latest, and maybe able to support the later version then the
shown version.
- Even if the status of the extension is 'not support', you can
- control the functions/widgets of the extension without wrapper
- libraries by Tk.tk_call(), Tk.ip_eval(), and so on.
+ Even if the status of the extension is 'not support', you can
+ control the functions/widgets of the extension without wrapper
+ libraries by Tk.tk_call(), Tk.ip_eval(), and so on.
- If you cannot use installed Tcl/Tk extension, please check the
- followings.
+ If you cannot use installed Tcl/Tk extension, please check the
+ followings.
(1) On your Tcl/Tk, does the extention work?
(2) Do DLL libraries of the extension exist on DLL load-path?
(See also "<ruby archive>/ext/tcltklib/README.ActiveTcl")
- (3) Is the Tcl library directory of the extension included in
+ (3) Is the Tcl library directory of the extension included in
library search-path of the Tcl interpreter linked Ruby/Tk?
- The check results may request you to do some setup operations
- before using the extension. If so, then please write the step
- of setup oprations into the "setup.rb" file in the directory
+ The check results may request you to do some setup operations
+ before using the extension. If so, then please write the step
+ of setup oprations into the "setup.rb" file in the directory
of the wrapper libraries for the extention (It is the wrapper
- libraries have the standard structure of the libraries in this
- directory). The "setup" file is required before requiring the
- Tcl library package (TkPackage.require(<libname>)).
+ libraries have the standard structure of the libraries in this
+ directory). The "setup" file is required before requiring the
+ Tcl library package (TkPackage.require(<libname>)).
*******************************************************************
===< support with some examples (may be beta quality) >=======================
-Tcllib 1.11.1
+Tcllib 1.11.1
Tklib 0.5 http://sourceforge.net/projects/tcllib ==> tcllib
( partial support; primary support target is Tklib)
@@ -78,7 +78,7 @@ TkImg 1.3 http://sourceforge.net/projects/tkimg ==> tkimg
BLT 2.4z http://sourceforge.net/projects/blt
- * see also tcltk-ext library on RAA
+ * see also tcltk-ext library on RAA
(http://raa.ruby-lang.org/)
==> blt
@@ -97,7 +97,7 @@ IncrTcl CVS/Hd(2008-12-15)
TclX CVS/Hd(2008-12-15)
http://sourceforge.net/projects/tclx
- ==> tclx (partial support; infox command and
+ ==> tclx (partial support; infox command and
XPG/3 message catalogs only)
Trofs 0.4.4 http://math.nist.gov/~DPorter/tcltk/trofs/
@@ -129,7 +129,7 @@ Tkgeomap *** http://tkgeomap.sourceforge.net/index.html
===< not determined to supprt or not >========================================
Tix *** http://tixlibrary.sourceforge.net/
- * see also tcltk-ext library on RAA
+ * see also tcltk-ext library on RAA
(http://raa.ruby-lang.org/)
TkZinc *** http://www.tkzinc.org/
@@ -175,7 +175,7 @@ TclDOM *** http://sourceforge.net/projects/tclxml
TclSOAP *** http://sourceforge.net/projects/tclsoap
Snack *** http://www.speech.kth.se/~kare/snack2.2.tar.gz
- * use Snack for Ruby
+ * use Snack for Ruby
(see http://rbsnack.sourceforge.net/)
Tcom *** http://www.vex.net/~cthuang/tcom/
@@ -191,7 +191,7 @@ XOTcl *** http://www.xotcl.org/
===< tool (may not supprt) >==================================================
-tbcload/tclcompiler
+tbcload/tclcompiler
*** http://www.tcl.tk/software/tclpro/
diff --git a/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
index e2fd97bb6a..ecc6bfa131 100755
--- a/ext/tk/lib/tkextlib/pkg_checker.rb
+++ b/ext/tk/lib/tkextlib/pkg_checker.rb
@@ -15,7 +15,7 @@ verbose = false
def help_msg
print "Usage: #{$0} [-l] [-v] [-h] [--] [dir]\n"
- print "\tIf dir is omitted, check the directory that this command exists.\n"
+ print "\tIf dir is omitted, check the directry that this command exists.\n"
print "\tAvailable options are \n"
print "\t -l : Add dir to $LOAD_PATH\n"
print "\t (If dir == '<parent>/tkextlib', add <parent> also.)\n"
diff --git a/ext/tk/lib/tkextlib/tcllib/README b/ext/tk/lib/tkextlib/tcllib/README
index 441918adce..953239befa 100644
--- a/ext/tk/lib/tkextlib/tcllib/README
+++ b/ext/tk/lib/tkextlib/tcllib/README
@@ -4,14 +4,14 @@
Tcllib includes many utilities. But currently, supports TKLib part
only (see the following 'tcllib contents').
-If you request to support others, please send your message to one of
-ruby-talk/ruby-list/ruby-dev/ruby-ext mailing lists.
+If you request to support others, please send your message to one of
+ruby-talk/ruby-list/ruby-dev/ruby-ext mailing lists.
-----<from "What is tcllib?">----------------------------
-Tcllib is a collection of utility modules for Tcl. These modules provide
-a wide variety of functionality, from implementations of standard data
-structures to implementations of common networking protocols. The intent
-is to collect commonly used function into a single library, which users
+Tcllib is a collection of utility modules for Tcl. These modules provide
+a wide variety of functionality, from implementations of standard data
+structures to implementations of common networking protocols. The intent
+is to collect commonly used function into a single library, which users
can rely on to be available and stable.
---------------------------------------------------------
@@ -124,7 +124,7 @@ Grammars and finite automata
TKLib
* Plotchart - Simple plotting and charting package
- * autoscroll - Provides for a scrollbar to automatically mapped and
+ * autoscroll - Provides for a scrollbar to automatically mapped and
unmapped as needed
* ctext - An extended text widget with customizable Syntax highlighting
* cursor - Procedures to handle CURSOR data
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
index ba87cd3aae..0bd59511c1 100644
--- a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
+++ b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb
@@ -3,7 +3,7 @@
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
# * Part of tcllib extension
-# *
+# *
#
require 'tk'
diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
index f4ffb48ece..e2a5061112 100644
--- a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
+++ b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb
@@ -3,7 +3,7 @@
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
# * Part of tcllib extension
-# *
+# *
#
require 'tk'
diff --git a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
index ddb0340c31..860b9e899b 100644
--- a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
+++ b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb
@@ -3,7 +3,7 @@
# by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
#
# * Part of tcllib extension
-# * chatwidget - Provides a multi-paned view suitable for display of
+# * chatwidget - Provides a multi-paned view suitable for display of
# chat room or irc channel information
#
@@ -92,7 +92,7 @@ class Tk::Tcllib::ChatWidget
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
diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
index 4878cc3c23..e5e0f8d42d 100644
--- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
+++ b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
@@ -70,6 +70,6 @@ class Tk::Tcllib::IP_Entry
end
end
-class Tk::Tcllib::IP_Entry6 < Tk::Tcllib::IP_Entry
+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
index 5dc2130b35..00acff91d9 100644
--- a/ext/tk/lib/tkextlib/tcllib/khim.rb
+++ b/ext/tk/lib/tkextlib/tcllib/khim.rb
@@ -43,11 +43,11 @@ class Tk::Tcllib::KHIM
def self.set_config(*args)
if args.length == 1
- # cmd_string generated by
+ # cmd_string generated by
#Tk.ip_eval_without_enc(cmd_string)
Tk.ip_eval(cmd_string)
else
- # args for setConfig command
+ # args for setConfig command
#Tk.tk_call_without_enc('::khim::setConfig', *args)
Tk.tk_call('::khim::setConfig', *args)
end
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
index cd52a0ed4b..3c944bb266 100644
--- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb
+++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -142,7 +142,7 @@ module Tk::Tcllib::Plotchart
end
def self.pixel_to_coords(w, x, y)
- list(tk_call_without_enc('::Plotchart::pixelToCoords', w.path, x, y))
+ list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
end
def self.determine_scale(*args) # (xmin, xmax, inverted=false)
@@ -221,7 +221,7 @@ module Tk::Tcllib::Plotchart
end
def legend(series, text)
- tk_call_without_enc(@chart, 'legend',
+ tk_call_without_enc(@chart, 'legend',
_get_eval_enc_str(series), _get_eval_enc_str(text))
self
end
@@ -238,7 +238,7 @@ module Tk::Tcllib::Plotchart
text, dir = args
- tk_call_without_enc(@chart, 'balloon', x, y,
+ tk_call_without_enc(@chart, 'balloon', x, y,
_get_eval_enc_str(text), dir)
self
end
@@ -263,7 +263,7 @@ module Tk::Tcllib::Plotchart
text, dir = args
- tk_call_without_enc(@chart, 'plaintext', x, y,
+ tk_call_without_enc(@chart, 'plaintext', x, y,
_get_eval_enc_str(text), dir)
self
end
@@ -311,7 +311,7 @@ module Tk::Tcllib::Plotchart
end
def pixel_to_coords(x, y)
- list(tk_call_without_enc('::Plotchart::pixelToCoords', @path, x, y))
+ list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
end
def determine_scale(xmax, ymax)
@@ -485,7 +485,7 @@ module Tk::Tcllib::Plotchart
end
def dot(series, xcrd, ycrd, value)
- tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series),
+ tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series),
xcrd, ycrd, value)
self
end
@@ -804,7 +804,7 @@ module Tk::Tcllib::Plotchart
private :_create_chart
def plot(label, yvalue, color)
- tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label),
+ tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label),
_get_eval_enc_str(yvalue), color)
self
end
@@ -1262,8 +1262,8 @@ module Tk::Tcllib::Plotchart
# 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,
+ # ( This determines the vertical spacing. ),
+ # Expected/maximum width of items,
# Option Hash ( { key=>value, ... } )
if args[0].kind_of?(String)
@time_begin = args.shift
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
index bf5ab6620a..b40f7a5b8b 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
@@ -10,7 +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 =
+ Tk::Tcllib::Tablelist_usingTile =
TkPackage.provide('tile') || TkPackage.provide('Ttk')
end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
index 2a5c415cc7..850e75d845 100644
--- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
@@ -419,7 +419,7 @@ class Tk::Tcllib::Tablelist
columnwidth(idx, 'total')
end
- def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
+ def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
ary = []
lst.slice(3){|idx, opt, val|
ary << _to_idx(idx) << "-#{opt}" << val
@@ -439,7 +439,7 @@ class Tk::Tcllib::Tablelist
end
alias config_cells configcells
- def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
+ def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
ary = []
lst.slice(3){|idx, opt, val|
ary << _to_idx(idx) << "-#{opt}" << val
@@ -459,7 +459,7 @@ class Tk::Tcllib::Tablelist
end
alias config_columns configcolumns
- def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
+ def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...]
ary = []
lst.slice(3){|idx, opt, val|
ary << _to_idx(idx) << "-#{opt}" << val
@@ -841,11 +841,11 @@ class Tk::Tcllib::Tablelist
# default of 'labelcommand' option
- DEFAULT_labelcommand_value =
+ DEFAULT_labelcommand_value =
DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn'
# default of 'labelcommand2' option
- DEFAULT_labelcommand2_value =
+ DEFAULT_labelcommand2_value =
DEFAULT_addToSortColumns_cmd = '::tablelist::addToSortColumns'
def sortByColumn_with_event_generate(idx)
@@ -1053,7 +1053,7 @@ class << Tk::Tcllib::Tablelist
else
gmt = None
end
- Tk.tk_call('::tablelist::addDateTimeMentry',
+ Tk.tk_call('::tablelist::addDateTimeMentry',
format, date_sep, time_sep, gmt, name)
end
diff --git a/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb
index 9947e0d870..d7da0a4075 100644
--- a/ext/tk/lib/tkextlib/tile/sizegrip.rb
+++ b/ext/tk/lib/tkextlib/tile/sizegrip.rb
@@ -28,5 +28,5 @@ end
#Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip,
# :TkSizegrip, :TkSizeGrip)
Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/sizegrip.rb',
- :Ttk, Tk::Tile::Sizegrip,
+ :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 108d81f88b..f38deda503 100644
--- a/ext/tk/lib/tkextlib/tile/style.rb
+++ b/ext/tk/lib/tkextlib/tile/style.rb
@@ -295,7 +295,7 @@ class << Tk::Tile::Style
fail ArgumentError, "too many arguments" unless args.empty?
# define a Microsoft Visual Styles element
- tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi',
+ tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi',
class_name, part_id, state_map, opts)
end
diff --git a/ext/tk/lib/tkextlib/tkimg/README b/ext/tk/lib/tkextlib/tkimg/README
index f5981cb98c..65d36365d0 100644
--- a/ext/tk/lib/tkextlib/tkimg/README
+++ b/ext/tk/lib/tkextlib/tkimg/README
@@ -2,7 +2,7 @@
[ Tcl/Tk Image formats (TkImg) support ]
TkImg contains a collection of format handlers for the Tk photo
-image type, and a new image type, pixmaps.
+image type, and a new image type, pixmaps.
Supported formats of TkImg version 1.3 are
-------------------------------------------------------
diff --git a/ext/tk/lib/tkextlib/tktable/tktable.rb b/ext/tk/lib/tkextlib/tktable/tktable.rb
index f7074655ed..bc7a6c9a2e 100644
--- a/ext/tk/lib/tkextlib/tktable/tktable.rb
+++ b/ext/tk/lib/tkextlib/tktable/tktable.rb
@@ -70,7 +70,7 @@ module Tk::TkTable::ConfigMethod
private :__item_strval_optkeys
def __item_val2ruby_optkeys(id) # { key=>method, ... }
- super(id).update('window'=>proc{|k,v| window(v)})
+ super(id).update('window'=>proc{|v| window(v)})
end
private :__item_val2ruby_optkeys
diff --git a/ext/tk/old-README.tcltklib.eucj b/ext/tk/old-README.tcltklib.eucj
index e29b389402..fd75202c18 100644
--- a/ext/tk/old-README.tcltklib.eucj
+++ b/ext/tk/old-README.tcltklib.eucj
@@ -1,159 +1,159 @@
(tof)
2003/06/19 Hidetoshi NAGAI
-本ドキュメントã«ã¯å¤ã„ tcltk ライブラリ,tcltklib ライブラリã®èª¬æ˜Ž
-ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ãŒï¼Œãã®è¨˜è¿°å†…容ã¯å¤ã„ã‚‚ã®ã¨ãªã£ã¦ã„ã¾ã™ï¼Ž
+Ëܥɥ­¥å¥á¥ó¥È¤Ë¤Ï¸Å¤¤ tcltk ¥é¥¤¥Ö¥é¥ê¡¤tcltklib ¥é¥¤¥Ö¥é¥ê¤ÎÀâÌÀ
+¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¤¤½¤Îµ­½ÒÆâÍÆ¤Ï¸Å¤¤¤â¤Î¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
-ã¾ãšï¼Œç¾åœ¨ã® Ruby/Tk ã®ä¸­å¿ƒã§ã‚ã‚‹ tk.rb 㯠wish を呼ã³å‡ºã—ãŸã‚Šã¯ã›
-ãšï¼Œtcltklib ライブラリを wrap ã—ã¦å‹•作ã™ã‚‹ã‚‚ã®ã¨ãªã£ã¦ã„ã¾ã™ï¼Žãã®
-ãŸã‚,å¤ã„説明記述ã§è¿°ã¹ã‚‰ã‚Œã¦ã„るよã†ãªãƒ—ロセス間通信ã«ã‚ˆã‚‹ã‚ªãƒ¼ãƒ
-ヘッドã¯å­˜åœ¨ã—ã¾ã›ã‚“.
+¤Þ¤º¡¤¸½ºß¤Î Ruby/Tk ¤ÎÃæ¿´¤Ç¤¢¤ë tk.rb ¤Ï wish ¤ò¸Æ¤Ó½Ð¤·¤¿¤ê¤Ï¤»
+¤º¡¤tcltklib ¥é¥¤¥Ö¥é¥ê¤ò wrap ¤·¤ÆÆ°ºî¤¹¤ë¤â¤Î¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥¤½¤Î
+¤¿¤á¡¤¸Å¤¤ÀâÌÀµ­½Ò¤Ç½Ò¤Ù¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¥×¥í¥»¥¹´ÖÄÌ¿®¤Ë¤è¤ë¥ª¡¼¥Ð
+¥Ø¥Ã¥É¤Ï¸ºß¤·¤Þ¤»¤ó¡¥
-ç¾åœ¨ã® tcltklib ライブラリã§ã‚‚,Tcl/Tk ã® C ライブラリをリンクã—ã¦
-直接ã«å‹•ã‹ã™ã“ã¨ã§ï¼Œã‚ªãƒ¼ãƒãƒ˜ãƒƒãƒ‰ã‚’押ã•ãˆã¤ã¤ Tcl/Tk インタープリタ
-ã®ã»ã¼å…¨æ©Ÿèƒ½ï¼ˆæ‹¡å¼µãƒ©ã‚¤ãƒ–ラリをå«ã‚€ï¼‰ã‚’使ãˆã‚‹ç‚¹ã¯åŒã˜ã§ã™ï¼Žã—ã‹ã—,
-ãã®å½¹å‰²ã¯ã»ã¼ã€Œtk.rb 以下ã®ãƒ©ã‚¤ãƒ–ラリを効果的ã«åƒã‹ã›ã‚‹ãŸã‚ã®ã‚‚ã®ã€
-ã¨è¦‹ãªã•れã¦ãŠã‚Šï¼Œãã®ç›®çš„ã§ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã•れã¦ã„ã¾ã™ï¼Ž
+¸½ºß¤Î tcltklib ¥é¥¤¥Ö¥é¥ê¤Ç¤â¡¤Tcl/Tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤·¤Æ
+ľÀÜ¤ËÆ°¤«¤¹¤³¤È¤Ç¡¤¥ª¡¼¥Ð¥Ø¥Ã¥É¤ò²¡¤µ¤¨¤Ä¤Ä Tcl/Tk ¥¤¥ó¥¿¡¼¥×¥ê¥¿
+¤Î¤Û¤ÜÁ´µ¡Ç½¡Ê³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ò´Þ¤à¡Ë¤ò»È¤¨¤ëÅÀ¤ÏƱ¤¸¤Ç¤¹¡¥¤·¤«¤·¡¤
+¤½¤ÎÌò³ä¤Ï¤Û¤Ü¡Ötk.rb °Ê²¼¤Î¥é¥¤¥Ö¥é¥ê¤ò¸ú²ÌŪ¤ËƯ¤«¤»¤ë¤¿¤á¤Î¤â¤Î¡×
+¤È¸«¤Ê¤µ¤ì¤Æ¤ª¤ê¡¤¤½¤ÎÌÜŪ¤Ç¥á¥ó¥Æ¥Ê¥ó¥¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-tk.rb ã®é«˜æ©Ÿèƒ½åŒ–ã«ä¼´ã£ã¦ï¼Œä¸­æ°´æº–ã®ãƒ©ã‚¤ãƒ–ラリã§ã‚ã‚‹ tcltk ライブラリ
-(tcltk.rb)ã¯ãã®å­˜åœ¨æ„義を減ã˜ã¦ãŠã‚Šï¼Œç¾åœ¨ã§ã¯ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹ã¯è¡Œã‚
-れã¦ã„ã¾ã›ã‚“.
+tk.rb ¤Î¹âµ¡Ç½²½¤Ëȼ¤Ã¤Æ¡¤Ãæ¿å½à¤Î¥é¥¤¥Ö¥é¥ê¤Ç¤¢¤ë tcltk ¥é¥¤¥Ö¥é¥ê
+¡Êtcltk.rb¡Ë¤Ï¤½¤Î¸ºß°ÕµÁ¤ò¸º¤¸¤Æ¤ª¤ê¡¤¸½ºß¤Ç¤Ï¥á¥ó¥Æ¥Ê¥ó¥¹¤Ï¹Ô¤ï
+¤ì¤Æ¤¤¤Þ¤»¤ó¡¥
-ãªãŠï¼Œå¤ã„説明ã§ã¯ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã«ãŠã‘るスクリプトã®è¿½åŠ ã¯ã§ããªã„ã“
-ã¨ã¨ãªã£ã¦ã„ã¾ã™ãŒï¼Œç¾åœ¨ã® tk.rb ã§ã¯ã“れもå¯èƒ½ã§ã‚ã‚‹ã“ã¨ã‚’補足ã—ã¦
-ãŠãã¾ã™ï¼Ž
+¤Ê¤ª¡¤¸Å¤¤ÀâÌÀ¤Ç¤Ï¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤Ë¤ª¤±¤ë¥¹¥¯¥ê¥×¥È¤ÎÄɲäϤǤ­¤Ê¤¤¤³
+¤È¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¤¸½ºß¤Î tk.rb ¤Ç¤Ï¤³¤ì¤â²Äǽ¤Ç¤¢¤ë¤³¤È¤òÊä­¤·¤Æ
+¤ª¤­¤Þ¤¹¡¥
-以下ãŒãƒ©ã‚¤ãƒ–ラリã®å¤ã„説明文書ã§ã™ï¼Ž
+°Ê²¼¤¬¥é¥¤¥Ö¥é¥ê¤Î¸Å¤¤ÀâÌÀʸ½ñ¤Ç¤¹¡¥
==============================================================
- tcltk ライブラリ
- tcltklib ライブラリ
+ tcltk ¥é¥¤¥Ö¥é¥ê
+ tcltklib ¥é¥¤¥Ö¥é¥ê
Sep. 19, 1997 Y. Shigehiro
-以下, 「tcl/tkã€ã¨ã„ã†è¡¨è¨˜ã¯, tclsh ã‚„ wish を実ç¾ã—ã¦ã„ã‚‹, 一般ã§ã„ã†
-ã¨ã“ã‚ã® tcl/tk を指ã—ã¾ã™. 「tcltk ライブラリã€, 「tcltklib ライブラ
-リã€ã¨ã„ã†è¡¨è¨˜ã¯, 本パッケージã«å«ã¾ã‚Œã‚‹ ruby 用ã®ãƒ©ã‚¤ãƒ–ラリを指ã—ã¾ã™.
+°Ê²¼, ¡Ötcl/tk¡×¤È¤¤¤¦É½µ­¤Ï, tclsh ¤ä wish ¤ò¼Â¸½¤·¤Æ¤¤¤ë, °ìÈ̤Ǥ¤¤¦
+¤È¤³¤í¤Î tcl/tk ¤ò»Ø¤·¤Þ¤¹. ¡Ötcltk ¥é¥¤¥Ö¥é¥ê¡×, ¡Ötcltklib ¥é¥¤¥Ö¥é
+¥ê¡×¤È¤¤¤¦É½µ­¤Ï, Ëܥѥ屡¼¥¸¤Ë´Þ¤Þ¤ì¤ë ruby ÍѤΥ饤¥Ö¥é¥ê¤ò»Ø¤·¤Þ¤¹.
-[ファイルã«ã¤ã„ã¦]
+[¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ]
-README.euc : ã“ã®ãƒ•ァイル(注æ„, 特徴, ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®æ–¹æ³•).
-MANUAL.euc : マニュアル.
+README.euc : ¤³¤Î¥Õ¥¡¥¤¥ë(Ãí°Õ, ÆÃħ, ¥¤¥ó¥¹¥È¡¼¥ë¤ÎÊýË¡).
+MANUAL.euc : ¥Þ¥Ë¥å¥¢¥ë.
-lib/, ext/ : ライブラリã®å®Ÿä½“.
+lib/, ext/ : ¥é¥¤¥Ö¥é¥ê¤Î¼ÂÂÎ.
-sample/ : マニュアル代ã‚りã®ã‚µãƒ³ãƒ—ルプログラム.
-sample/sample0.rb : tcltklib ライブラリã®ãƒ†ã‚¹ãƒˆ.
-sample/sample1.rb : tcltk ライブラリã®ãƒ†ã‚¹ãƒˆ.
- tcl/tk (wish) ã§ã§ããã†ãªã“ã¨ã‚’一通り書ã„ã¦ã¿ã¾ã—ãŸ.
-sample/sample2.rb : tcltk ライブラリã®ã‚µãƒ³ãƒ—ル.
- maeda shugo (shugo@po.aianet.ne.jp) æ°ã«ã‚ˆã‚‹
- (`rb.tk' ã§æ›¸ã‹ã‚Œã¦ã„ãŸ) ruby ã®ã‚µãƒ³ãƒ—ルプログラム
+sample/ : ¥Þ¥Ë¥å¥¢¥ëÂå¤ï¤ê¤Î¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à.
+sample/sample0.rb : tcltklib ¥é¥¤¥Ö¥é¥ê¤Î¥Æ¥¹¥È.
+sample/sample1.rb : tcltk ¥é¥¤¥Ö¥é¥ê¤Î¥Æ¥¹¥È.
+ tcl/tk (wish) ¤Ç¤Ç¤­¤½¤¦¤Ê¤³¤È¤ò°ìÄ̤ê½ñ¤¤¤Æ¤ß¤Þ¤·¤¿.
+sample/sample2.rb : tcltk ¥é¥¤¥Ö¥é¥ê¤Î¥µ¥ó¥×¥ë.
+ maeda shugo (shugo@po.aianet.ne.jp) »á¤Ë¤è¤ë
+ (`rb.tk' ¤Ç½ñ¤«¤ì¤Æ¤¤¤¿) ruby ¤Î¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à
http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
- ã‚’ tcltk ライブラリを使ã†ã‚ˆã†ã«, 機械的ã«å¤‰æ›´ã—ã¦ã¿ã¾ã—ãŸ.
+ ¤ò tcltk ¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤è¤¦¤Ë, µ¡³£Åª¤ËÊѹ¹¤·¤Æ¤ß¤Þ¤·¤¿.
-demo/ : 100 本ã®ç·šã‚’ 100 回æãデモプログラム.
- 最åˆã«ç©ºãƒ«ãƒ¼ãƒ—ã®æ™‚間を測定ã—, ç¶šã„ã¦å®Ÿéš›ã«ç·šã‚’å¼•ãæ™‚間を測定ã—ã¾ã™.
- tcl/tk ã¯(å†)æç”»ã®ã¨ãã« backing store を使ã‚ãšã«å¾‹ç¾©ã« 10000 本(?)
- 線を引ãã®ã§, (å†)æç”»ã‚’å§‹ã‚ã‚‹ã¨, マシンãŒã‹ãªã‚Šé‡ããªã‚Šã¾ã™.
-demo/lines0.tcl : wish 用ã®ã‚¹ã‚¯ãƒªãƒ—ト.
-demo/lines1.rb : `tk.rb' 用ã®ã‚¹ã‚¯ãƒªãƒ—ト.
-demo/lines2.rb : tcltk ライブラリ用ã®ã‚¹ã‚¯ãƒªãƒ—ト.
+demo/ : 100 ËܤÎÀþ¤ò 100 ²óÉÁ¤¯¥Ç¥â¥×¥í¥°¥é¥à.
+ ºÇ½é¤Ë¶õ¥ë¡¼¥×¤Î»þ´Ö¤ò¬Äꤷ, ³¤¤¤Æ¼ÂºÝ¤ËÀþ¤ò°ú¤¯»þ´Ö¤ò¬Äꤷ¤Þ¤¹.
+ tcl/tk ¤Ï(ºÆ)ÉÁ²è¤Î¤È¤­¤Ë backing store ¤ò»È¤ï¤º¤ËΧµÁ¤Ë 10000 ËÜ(?)
+ Àþ¤ò°ú¤¯¤Î¤Ç, (ºÆ)ÉÁ²è¤ò»Ï¤á¤ë¤È, ¥Þ¥·¥ó¤¬¤«¤Ê¤ê½Å¤¯¤Ê¤ê¤Þ¤¹.
+demo/lines0.tcl : wish ÍѤΥ¹¥¯¥ê¥×¥È.
+demo/lines1.rb : `tk.rb' ÍѤΥ¹¥¯¥ê¥×¥È.
+demo/lines2.rb : tcltk ¥é¥¤¥Ö¥é¥êÍѤΥ¹¥¯¥ê¥×¥È.
-[注æ„]
+[Ãí°Õ]
-コンパイル/実行ã«ã¯, tcl/tk ã® C ライブラリãŒå¿…è¦ã§ã™.
+¥³¥ó¥Ñ¥¤¥ë/¼Â¹Ô¤Ë¤Ï, tcl/tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפǤ¹.
-ã“ã®ãƒ©ã‚¤ãƒ–ラリã¯,
+¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï,
ruby-1.0-970701, ruby-1.0-970911, ruby-1.0-970919
FreeBSD 2.2.2-RELEASE
- ãŠã‚ˆã³ãã®ãƒ‘ッケージ jp-tcl-7.6.tgz, jp-tk-4.2.tgz
+ ¤ª¤è¤Ó¤½¤Î¥Ñ¥Ã¥±¡¼¥¸ jp-tcl-7.6.tgz, jp-tk-4.2.tgz
-ã§ä½œæˆ/動作確èªã—ã¾ã—ãŸ. ä»–ã®ç’°å¢ƒã§ã¯å‹•作ã™ã‚‹ã‹ã©ã†ã‹ã‚ã‹ã‚Šã¾ã›ã‚“.
+¤ÇºîÀ®/ưºî³Îǧ¤·¤Þ¤·¤¿. ¾¤Î´Ä¶­¤Ç¤Ïưºî¤¹¤ë¤«¤É¤¦¤«¤ï¤«¤ê¤Þ¤»¤ó.
-TclTkLib.mainloop を実行中㫠Control-C ãŒåйã‹ãªã„ã®ã¯ä¸ä¾¿ãªã®ã§, ruby
-ã®ã‚½ãƒ¼ã‚¹ã‚’å‚考ã«, #include "sig.h" ã—㦠trap_immediate ã‚’æ“作ã—ã¦ã„ã¾
-ã™ãŒ, ruby ã® README.EXT ã«ã‚‚書ã„ã¦ãªã„ã®ã«, ã“ã‚“ãªã“ã¨ã‚’ã—ã¦è‰¯ã„ã®ã‹
-ã©ã†ã‹ã‚ã‹ã‚Šã¾ã›ã‚“.
+TclTkLib.mainloop ¤ò¼Â¹ÔÃæ¤Ë Control-C ¤¬¸ú¤«¤Ê¤¤¤Î¤ÏÉÔÊØ¤Ê¤Î¤Ç, ruby
+¤Î¥½¡¼¥¹¤ò»²¹Í¤Ë, #include "sig.h" ¤·¤Æ trap_immediate ¤òÁàºî¤·¤Æ¤¤¤Þ
+¤¹¤¬, ruby ¤Î README.EXT ¤Ë¤â½ñ¤¤¤Æ¤Ê¤¤¤Î¤Ë, ¤³¤ó¤Ê¤³¤È¤ò¤·¤ÆÎɤ¤¤Î¤«
+¤É¤¦¤«¤ï¤«¤ê¤Þ¤»¤ó.
--d オプションã§ãƒ‡ãƒãƒƒã‚°æƒ…報を表示ã•ã›ã‚‹ãŸã‚ã«, ruby ã®ã‚½ãƒ¼ã‚¹ã‚’å‚考ã«,
-debug ã¨ã„ã†å¤§åŸŸå¤‰æ•°ã‚’å‚ç…§ã—ã¦ã„ã¾ã™ãŒ, ruby ã® README.EXT ã«ã‚‚書ã„ã¦
-ãªã„ã®ã«, ã“ã‚“ãªã“ã¨ã‚’ã—ã¦è‰¯ã„ã®ã‹ã©ã†ã‹ã‚ã‹ã‚Šã¾ã›ã‚“.
+-d ¥ª¥×¥·¥ç¥ó¤Ç¥Ç¥Ð¥Ã¥°¾ðÊó¤òɽ¼¨¤µ¤»¤ë¤¿¤á¤Ë, ruby ¤Î¥½¡¼¥¹¤ò»²¹Í¤Ë,
+debug ¤È¤¤¤¦Âç°èÊÑ¿ô¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹¤¬, ruby ¤Î README.EXT ¤Ë¤â½ñ¤¤¤Æ
+¤Ê¤¤¤Î¤Ë, ¤³¤ó¤Ê¤³¤È¤ò¤·¤ÆÎɤ¤¤Î¤«¤É¤¦¤«¤ï¤«¤ê¤Þ¤»¤ó.
-extconf.rb ã¯æ›¸ãã¾ã—ãŸãŒ, (ã„ã‚ã„ã‚ãªæ„味ã§)ã“れã§è‰¯ã„ã®ã‹è‰¯ã分ã‹ã‚Š
-ã¾ã›ã‚“.
+extconf.rb ¤Ï½ñ¤­¤Þ¤·¤¿¤¬, (¤¤¤í¤¤¤í¤Ê°ÕÌ£¤Ç)¤³¤ì¤ÇÎɤ¤¤Î¤«Îɤ¯Ê¬¤«¤ê
+¤Þ¤»¤ó.
-[特徴]
+[ÆÃħ]
-ruby ã‹ã‚‰ tcl/tk ライブラリを利用ã§ãã¾ã™.
+ruby ¤«¤é tcl/tk ¥é¥¤¥Ö¥é¥ê¤òÍøÍѤǤ­¤Þ¤¹.
-tcl/tk インタプリタã®ã‚¹ã‚¯ãƒªãƒ—トã¯, 機械的㫠tcltk ライブラリ用㮠ruby
-スクリプトã«å¤‰æ›ã§ãã¾ã™.
+tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¹¥¯¥ê¥×¥È¤Ï, µ¡³£Åª¤Ë tcltk ¥é¥¤¥Ö¥é¥êÍѤΠruby
+¥¹¥¯¥ê¥×¥È¤ËÊÑ´¹¤Ç¤­¤Þ¤¹.
-(`tk.rb' ã¨ã®é•ã„)
+(`tk.rb' ¤È¤Î°ã¤¤)
-1. tcl/tk インタプリタã®ã‚¹ã‚¯ãƒªãƒ—トãŒ, ã©ã®ã‚ˆã†ã«, tcltk ライブラリ用ã®
- ruby スクリプトã«å¤‰æ›ã•れるã‹ãŒç†è§£ã§ãれã°, マニュアル類ãŒç„¡ã„ã«ç­‰
- ã—ã„ `tk.rb' ã¨ã¯ç•°ãªã‚Š
+1. tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¹¥¯¥ê¥×¥È¤¬, ¤É¤Î¤è¤¦¤Ë, tcltk ¥é¥¤¥Ö¥é¥êÍѤÎ
+ ruby ¥¹¥¯¥ê¥×¥È¤ËÊÑ´¹¤µ¤ì¤ë¤«¤¬Íý²ò¤Ç¤­¤ì¤Ð, ¥Þ¥Ë¥å¥¢¥ëÎब̵¤¤¤ËÅù
+ ¤·¤¤ `tk.rb' ¤È¤Ï°Û¤Ê¤ê
- tcl/tk ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚„オンラインドキュメントを用ã„ã¦
+ tcl/tk ¤Î¥Þ¥Ë¥å¥¢¥ë¤ä¥ª¥ó¥é¥¤¥ó¥É¥­¥å¥á¥ó¥È¤òÍѤ¤¤Æ
- 効率良ãプログラミングを行ã†ã“ã¨ãŒã§ãã¾ã™.
- 記述方法ãŒã‚ã‹ã‚‰ãªã„, コマンドã«ä¸Žãˆã‚‹ãƒ‘ラメータãŒã‚ã‹ã‚‰ãªã„...
- - Canvas.new { ... } ã¨, ãªãœã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ãƒ–ロックを書ã‘ã‚‹ã®??
- - Canvas ã® bbox ã¯æ•°å€¤ã®ãƒªã‚¹ãƒˆã‚’è¿”ã™ã®ã«, xview ã¯æ–‡å­—列を返ã™ã®??
- ã¨, ã„ã¡ã„ã¡, ライブラリã®ã‚½ãƒ¼ã‚¹ã‚’追ã„ã‹ã‘ã‚‹å¿…è¦ã¯ã‚りã¾ã›ã‚“.
+ ¸úΨÎɤ¯¥×¥í¥°¥é¥ß¥ó¥°¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹.
+ µ­½ÒÊýË¡¤¬¤ï¤«¤é¤Ê¤¤, ¥³¥Þ¥ó¥É¤ËÍ¿¤¨¤ë¥Ñ¥é¥á¡¼¥¿¤¬¤ï¤«¤é¤Ê¤¤...
+ - Canvas.new { ... } ¤È, ¤Ê¤¼¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤ò½ñ¤±¤ë¤Î??
+ - Canvas ¤Î bbox ¤Ï¿ôÃͤΥꥹ¥È¤òÊÖ¤¹¤Î¤Ë, xview ¤Ïʸ»úÎó¤òÊÖ¤¹¤Î??
+ ¤È, ¤¤¤Á¤¤¤Á, ¥é¥¤¥Ö¥é¥ê¤Î¥½¡¼¥¹¤òÄɤ¤¤«¤±¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó.
-2. å€‹ã€…ã®æ©Ÿèƒ½(オプション)を個別処ç†ã«ã‚ˆã‚Šã‚µãƒãƒ¼ãƒˆã—ã¦ãŠã‚Š, ãã®ãŸã‚サ
- ãƒãƒ¼ãƒˆã—ã¦ã„ãªã„機能ã¯ä½¿ã†ã“ã¨ãŒã§ããªã„(本当ã¯ä½¿ãˆãªã„ã“ã¨ã‚‚ãªã„ã®
- ã§ã™ãŒ) `tk.rb' ã¨ã¯ç•°ãªã‚Š, tcl/tk インタプリタã§å¯èƒ½ãªã“ã¨ã¯
+2. ¸Ä¡¹¤Îµ¡Ç½(¥ª¥×¥·¥ç¥ó)¤ò¸ÄÊ̽èÍý¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤·¤Æ¤ª¤ê, ¤½¤Î¤¿¤á¥µ
+ ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤µ¡Ç½¤Ï»È¤¦¤³¤È¤¬¤Ç¤­¤Ê¤¤(ËÜÅö¤Ï»È¤¨¤Ê¤¤¤³¤È¤â¤Ê¤¤¤Î
+ ¤Ç¤¹¤¬) `tk.rb' ¤È¤Ï°Û¤Ê¤ê, tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤Ç²Äǽ¤Ê¤³¤È¤Ï
- ã»ã¨ã‚“ã©
+ ¤Û¤È¤ó¤É
- ruby ã‹ã‚‰ã‚‚実行ã§ãã¾ã™. ç¾åœ¨, ruby ã‹ã‚‰å®Ÿè¡Œã§ããªã„ã“ã¨ãŒç¢ºèªã•れ
- ã¦ã„ã‚‹ã®ã¯,
+ ruby ¤«¤é¤â¼Â¹Ô¤Ç¤­¤Þ¤¹. ¸½ºß, ruby ¤«¤é¼Â¹Ô¤Ç¤­¤Ê¤¤¤³¤È¤¬³Îǧ¤µ¤ì
+ ¤Æ¤¤¤ë¤Î¤Ï,
- bind コマンドã§ã‚¹ã‚¯ãƒªãƒ—トを追加ã™ã‚‹æ§‹æ–‡
- 「bind tag sequence +scriptã€
+ bind ¥³¥Þ¥ó¥É¤Ç¥¹¥¯¥ê¥×¥È¤òÄɲ乤빽ʸ
+ ¡Öbind tag sequence +script¡×
^
- ã®ã¿ã§ã™.
- - `. configure -width' ã‚’ã—よã†ã¨ã—ã¦, `Tk.root.height()' ã¨æ›¸ã„
- ãŸã®ã«, `undefined method `height'' ã¨æ€’られã¦ã—ã¾ã£ãŸ. tk.rb ã‚’
- 読んã§ã¿ã¦, ガーン. ã§ããªã„ã®ã‹...
- ã¨ã„ã†ã“ã¨ã¯ã‚りã¾ã›ã‚“.
+ ¤Î¤ß¤Ç¤¹.
+ - `. configure -width' ¤ò¤·¤è¤¦¤È¤·¤Æ, `Tk.root.height()' ¤È½ñ¤¤
+ ¤¿¤Î¤Ë, `undefined method `height'' ¤ÈÅܤé¤ì¤Æ¤·¤Þ¤Ã¤¿. tk.rb ¤ò
+ ÆÉ¤ó¤Ç¤ß¤Æ, ¥¬¡¼¥ó. ¤Ç¤­¤Ê¤¤¤Î¤«...
+ ¤È¤¤¤¦¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó.
-3. wish プロセスを起動ã—プロセス間通信㧠wish を利用ã™ã‚‹ `tk.rb' ã¨ã¯
- ç•°ãªã‚Š, tcl/tk ã® C ライブラリをリンクã—
+3. wish ¥×¥í¥»¥¹¤òµ¯Æ°¤·¥×¥í¥»¥¹´ÖÄÌ¿®¤Ç wish ¤òÍøÍѤ¹¤ë `tk.rb' ¤È¤Ï
+ °Û¤Ê¤ê, tcl/tk ¤Î C ¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤·
- より高速㫠(ã¨ã„ã£ã¦ã‚‚, æ€ã£ãŸç¨‹ã¯é€Ÿããªã„ã§ã™ãŒ)
+ ¤è¤ê¹â®¤Ë (¤È¤¤¤Ã¤Æ¤â, »×¤Ã¤¿Äø¤Ï®¤¯¤Ê¤¤¤Ç¤¹¤¬)
- 処ç†ã‚’行ã„ã¾ã™.
+ ½èÍý¤ò¹Ô¤¤¤Þ¤¹.
-4. `tk.rb' ã»ã©, 高水準ãªã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ェースを備ãˆã¦ã„ãªã„ãŸã‚, tcl/tk イ
- ンタプリタã®ç”Ÿæˆç­‰
+4. `tk.rb' ¤Û¤É, ¹â¿å½à¤Ê¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÈ÷¤¨¤Æ¤¤¤Ê¤¤¤¿¤á, tcl/tk ¥¤
+ ¥ó¥¿¥×¥ê¥¿¤ÎÀ¸À®Åù
- 何ã‹ã‚‰ä½•ã¾ã§è‡ªåˆ†ã§è¨˜è¿°
+ ²¿¤«¤é²¿¤Þ¤Ç¼«Ê¬¤Çµ­½Ò
- ã—ãªã‘れã°ãªã‚Šã¾ã›ã‚“(ãã®ä»£ã‚り, tcl/tk ライブラリã®ä»•様通り,
- tcl/tk インタプリタを複数生æˆã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ãŒ).
- インターフェースã¯(ãŠãらã) ruby ã®æ€æƒ³ã«æ²¿ã£ãŸã‚‚ã®ã§ã¯ã‚りã¾ã›ã‚“.
- ã¾ãŸ, スクリプトã®è¨˜è¿°ã¯
+ ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó(¤½¤ÎÂå¤ï¤ê, tcl/tk ¥é¥¤¥Ö¥é¥ê¤Î»ÅÍÍÄ̤ê,
+ tcl/tk ¥¤¥ó¥¿¥×¥ê¥¿¤òÊ£¿ôÀ¸À®¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬).
+ ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Ï(¤ª¤½¤é¤¯) ruby ¤Î»×Áۤ˱è¤Ã¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó.
+ ¤Þ¤¿, ¥¹¥¯¥ê¥×¥È¤Îµ­½Ò¤Ï
- ダサダサ
+ ¥À¥µ¥À¥µ
- ã§ã™. スクリプトã¯, 一見, 読ã¿ã¥ã‚‰ã„ã‚‚ã®ã¨ãªã‚Šã¾ã™. ãŒ, 書ã人ã«ã¨ã£
- ã¦ã¯, ãれã»ã©ç…©ã‚ã—ã„ã‚‚ã®ã§ã¯ãªã„ã¨æ€ã„ã¾ã™.
+ ¤Ç¤¹. ¥¹¥¯¥ê¥×¥È¤Ï, °ì¸«, ÆÉ¤ß¤Å¤é¤¤¤â¤Î¤È¤Ê¤ê¤Þ¤¹. ¤¬, ½ñ¤¯¿Í¤Ë¤È¤Ã
+ ¤Æ¤Ï, ¤½¤ì¤Û¤ÉÈѤ路¤¤¤â¤Î¤Ç¤Ï¤Ê¤¤¤È»×¤¤¤Þ¤¹.
-[ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã®æ–¹æ³•]
+[¥¤¥ó¥¹¥È¡¼¥ë¤ÎÊýË¡]
-0. ruby ã®ã‚½ãƒ¼ã‚¹ãƒ•ァイル(ruby-1.0-ãªã‚“ãŸã‚‰.tgz)を展開ã—ã¦ãŠãã¾ã™.
+0. ruby ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë(ruby-1.0-¤Ê¤ó¤¿¤é.tgz)¤òŸ³«¤·¤Æ¤ª¤­¤Þ¤¹.
-1. ruby-1.0-ãªã‚“ãŸã‚‰/ext ã« ext/tcltklib をコピーã—ã¾ã™.
- cp -r ext/tcltklib ???/ruby-1.0-ãªã‚“ãŸã‚‰/ext/
+1. ruby-1.0-¤Ê¤ó¤¿¤é/ext ¤Ë ext/tcltklib ¤ò¥³¥Ô¡¼¤·¤Þ¤¹.
+ cp -r ext/tcltklib ???/ruby-1.0-¤Ê¤ó¤¿¤é/ext/
-2. ruby ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ³•ã«å¾“ã„ make 等をã—ã¾ã™.
+2. ruby ¤Î¥¤¥ó¥¹¥È¡¼¥ëË¡¤Ë½¾¤¤ make Åù¤ò¤·¤Þ¤¹.
-3. ruby ã®ãƒ©ã‚¤ãƒ–ラリ置場㫠lib/* をコピーã—ã¾ã™.
+3. ruby ¤Î¥é¥¤¥Ö¥é¥êÃÖ¾ì¤Ë lib/* ¤ò¥³¥Ô¡¼¤·¤Þ¤¹.
cp lib/* /usr/local/lib/ruby/
(eof)
diff --git a/ext/tk/sample/demos-en/ChangeLog.prev b/ext/tk/sample/demos-en/ChangeLog.prev
index ba808eca8b..536ce30abe 100644
--- a/ext/tk/sample/demos-en/ChangeLog.prev
+++ b/ext/tk/sample/demos-en/ChangeLog.prev
@@ -6,4 +6,4 @@
* Added test to widget and hello versus Tk::TCL_VERSION & Tk::JAPANIZED_TK (per Guy Decoux in [ruby-talk:18559]) before requiring tkencoding.rb.
-
+ \ No newline at end of file
diff --git a/ext/tk/sample/demos-en/README b/ext/tk/sample/demos-en/README
index 033dca33c6..2908aa38e4 100644
--- a/ext/tk/sample/demos-en/README
+++ b/ext/tk/sample/demos-en/README
@@ -1,14 +1,14 @@
-Current Maintainer:
+Current Maintainer:
Jonathan Conway
rise@knavery.net
- Please direct all bug reports/requests/suggestions to the above
+ Please direct all bug reports/requests/suggestions to the above
address.
Notes:
-* The files hello and widget have been changed to test Tk::TCL_VERSION
+* The files hello and widget have been changed to test Tk::TCL_VERSION
and Tk::JAPANIZED_TK before requiring tkencoding.rb to prevent an
infinite loop. This test was taken from a message in
[ruby-talk:18559] by Guy Decoux.
@@ -18,7 +18,7 @@ Notes:
able to use images exported by a graphics program as Windows
bitmaps with this demo collection nor will you be able to edit the
included images without setting the file type correctly.
-
+
-- Jonathan Conway, 2001-07-26
@@ -28,19 +28,19 @@ Notes:
# To create this version of the Ruby/Tk widget demo, I took the
# ruby-tk81-demos and removed all the Kanji strings and comments. I
# have tried to restore the original English strings and comments
-# using the Tcl/Tk8.2.2 version of the widget demo.
+# using the Tcl/Tk8.2.2 version of the widget demo.
#
# When I tried running the Kanji version, all I got was a mostly blank
# panel with a non-functional "File" button. I disovered that if all
# non-ASCII characters were replaced with blanks, then I could get the
-# gutted stuff running.
+# gutted stuff running.
#
# Since English Ruby/Tk documentation is lacking and I needed this
# code to see how it worked and to use as the basis of my try-it
# prototype (The Ruby Yielding Interactive Toolkit), plus the fact
# that no help was forthcoming for making the Kanji version work (plus
# the fact that I can't read Kanji anyway), I decided to embark on
-# this English restoration project.
+# this English restoration project.
#
# Thanks to everyone who worked on the original Ruby/Tk widget demo
# (and the preceding Tcl/Tk version for that matter). The
@@ -68,71 +68,71 @@ Notes:
Ruby/Tk81 widget-demo 1999/08/13
- 北陸先端大情報科学研究科
- 立石 <ttate@jaist.ac.jp>
+ ËÌΦÀèüÂç¾ðÊó²Ê³Ø¸¦µæ²Ê
+ ΩÀÐ <ttate@jaist.ac.jp>
-Tcl/Tk8.1ã§ã¯unicode(UTF8)ãŒæŽ¡ç”¨ã•れã€unicodeã«å¤‰æ›ã•ã‚ŒãŸæ—¥æœ¬èªžã§ã‚れã°
-Widgetã«è¡¨ç¤ºã•ã›ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚本アーカイブã«ã¯ä»¥å‰ã«æ°¸äº•ã•ã‚“ãŒä¸­å¿ƒã¨
-ãªã‚‰ã‚Œã¦ä½œæˆã•れãŸRuby/Tkã®ã‚µãƒ³ãƒ—ルã«ä¿®æ­£ã‚’加ãˆã€ä»¥ä¸‹ã®ç’°å¢ƒã«ãŠã„ã¦ã§å‹•作
-を確èªã—ãŸã‚‚ã®ã§ã™ã€‚
+Tcl/Tk8.1¤Ç¤Ïunicode(UTF8)¤¬ºÎÍѤµ¤ì¡¢unicode¤ËÊÑ´¹¤µ¤ì¤¿ÆüËܸì¤Ç¤¢¤ì¤Ð
+Widget¤Ëɽ¼¨¤µ¤»¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£ËÜ¥¢¡¼¥«¥¤¥Ö¤Ë¤Ï°ÊÁ°¤Ë±Ê°æ¤µ¤ó¤¬Ãæ¿´¤È
+¤Ê¤é¤ì¤ÆºîÀ®¤µ¤ì¤¿Ruby/Tk¤Î¥µ¥ó¥×¥ë¤Ë½¤Àµ¤ò²Ã¤¨¡¢°Ê²¼¤Î´Ä¶­¤Ë¤ª¤¤¤Æ¤Çưºî
+¤ò³Îǧ¤·¤¿¤â¤Î¤Ç¤¹¡£
* ruby-1.3.7,ruby-1.4.0
* tcl8.1, tk8.1
* linux-2.2
-Windows(Cygwin)ã«ãŠã„ã¦ã€ã‚µãƒ³ãƒ—ルを動ã‹ã™ã«ã¯rubyã‚’-Keã¨ã„ã†ã‚ªãƒ—ションを付
-ã‘ã¦èµ·å‹•ã•ã›ã‚‹ã¨è‰¯ã„ãã†ã§ã™ã€‚
- 情報æä¾›ï¼šæ¸¡è¾ºã•ã‚“
+Windows(Cygwin)¤Ë¤ª¤¤¤Æ¡¢¥µ¥ó¥×¥ë¤òư¤«¤¹¤Ë¤Ïruby¤ò-Ke¤È¤¤¤¦¥ª¥×¥·¥ç¥ó¤òÉÕ
+¤±¤Æµ¯Æ°¤µ¤»¤ë¤ÈÎɤ¤¤½¤¦¤Ç¤¹¡£
+ ¾ðÊóÄó¶¡¡§ÅÏÊÕ¤µ¤ó
<eban@os.rim.or.jp>
----------------------------------------------------------------------------
- Ruby/Tk widget-demo
+ Ruby/Tk widget-demo
version 1.1 ( 1998/07/24 )
- 永井@知能.ä¹å·¥å¤§ (nagai@ai.kyutech.ac.jp)
-
-標準é…布㮠Tcl/Tk 拡張パッケージをå–ã‚Šè¾¼ã‚“ã  Ruby (以下 Ruby/Tk ã¨å‘¼ã³ã¾ã™)
-ã§ã¯ï¼ŒTk widget を用ã„㟠GUI ã®ä½œæˆã‚’行ã†ã“ã¨ãŒã§ãã¾ã™ï¼Žå®Ÿéš›ã« GUI を作æˆ
-ã—ã¦ã„ãå ´åˆã«ã¯æ§˜ã€…ãªå®Ÿä¾‹ãŒã‚µãƒ³ãƒ—ルã¨ã—ã¦å­˜åœ¨ã™ã‚‹ã¨ä¾¿åˆ©ãªã®ã§ã™ãŒï¼ŒRuby/Tk
-ã«ã¯ãã®ã‚ˆã†ãªé©å½“ãªã‚µãƒ³ãƒ—ルスクリプト集åˆã¯å­˜åœ¨ã—ã¾ã›ã‚“ã§ã—ãŸï¼Žãれã«å¯¾ã—,
-拡張パッケージã®å…ƒã§ã‚ã‚‹ Tcl/Tk ã«ã¯ï¼ŒTk widget を用ã„ã¦ã©ã®ã‚ˆã†ãªã“ã¨ãŒã§
-ãã‚‹ã‹ã‚’示ã™ã‚‚ã®ã¨ã—㦠widget-demo ãŒå­˜åœ¨ã—ãŠã‚Šï¼ŒTcl/Tk を用ã„㟠GUI ã®ä½œæˆ
-ã‚’ç¿’å¾—ã™ã‚‹éš›ã®ä»£è¡¨çš„サンプルã¨ãªã£ã¦ã„ã¾ã™ï¼Žæœ¬ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã¯ï¼ŒRuby/Tk ã®ç¿’å¾—ã®
-ãŸã‚ã®ä»£è¡¨çš„ãªã‚µãƒ³ãƒ—ルスクリプトã¨ã™ã¹ã,Tcl/Tk ã® widget-demo ã‚’ç§»æ¤ã—ãŸã‚‚
-ã®ã§ã™ï¼Ž
-
-本アーカイブã«å«ã¾ã‚Œã‚‹ã‚¹ã‚¯ãƒªãƒ—トを実行ã™ã‚‹ãŸã‚ã«ã¯ï¼Œruby-1.1c2 以上ã§ã‚ã‚‹ã“
-ã¨ãŒå¿…è¦ã§ã™ï¼Ž1.1c1 ã®å ´åˆã¯ï¼Œæœ¬ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã«å«ã¾ã‚Œã‚‹ patck_1.1c1 ã‚’ Ruby ã®
-ライブラリã«ã‚ã¦ã¦ãã ã•ã„.組ã¿è¾¼ã‚€ Tk ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ï¼Œ4.2 ã§ã‚‚ 8.0 ã§ã‚‚ä¿®
-æ­£ãªãå‹•ã‹ã›ã‚‹ã¯ãšã§ã™ï¼ŽãŸã ã—,日本語版ã§ã®ç§»æ¤ã¨ãªã£ã¦ã„ã‚‹ãŸã‚,日本語化ã•
-れ㟠Tk ã‚’ã”利用ãã ã•ã„.スクリプトã®ãƒ†ã‚¹ãƒˆã¯ï¼ŒTk4.2jp 㨠Tk8.0jp ã®ä¸Šã§è¡Œ
-ã„ã¾ã—㟠(完璧ã«ã§ã¯ãªã„ã§ã™ãŒ).
-
-本アーカイブã«å«ã¾ã‚Œã‚‹ã‚¹ã‚¯ãƒªãƒ—トã®å¤šãã¯ï¼Œå…ƒã¨ãªã£ã¦ã„ã‚‹ Tcl/Tk ç‰ˆã«æ¯”較的近
-ã„スクリプト記述ã¨ãªã‚‹ã‚ˆã†ã«ã—ã¦ã„ã¾ã™ï¼Žãã®ãŸã‚,Ruby/Tk ã®ã‚µãƒ³ãƒ—ルã¨è¨€ã†ã«
-ã¯ï¼Œã‚ã¾ã‚Š Ruby らã—ããªã„ã¨ã‚‚言ãˆã‚‹ã§ã—ょã†ï¼Žã«ã‚‚ã‹ã‹ã‚らãšï¼Œãã®ã‚ˆã†ãªè¨˜è¿°
-ã‚’å–ã£ã¦ã„ã‚‹ç†ç”±ã¯ï¼ŒRuby/Tk ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆä¸è¶³ã«ã‚りã¾ã™ï¼Ž
-
-Tcl/Tk ã«ã¯é©å½“ãªå‚考書ãŒä½•冊ã‹å­˜åœ¨ã—ã¦ã„ã¾ã™ã‹ã‚‰ï¼ŒRuby/Tk スクリプトを作æˆ
-ã™ã‚‹éš›ã¯ï¼Œãã®ã‚ˆã†ãª Tcl/Tk ã®å‚è€ƒæ›¸ã§æƒ…報を補ã„ãªãŒã‚‰ä½œæˆã™ã‚‹ã“ã¨ã«ãªã‚‹ã¨æ€
-ã„ã¾ã™ï¼Žå„ widget ã®ä½¿ç”¨ä¾‹ã¨ã—ã¦ï¼ŒTcl/Tk ã® widget-demo ã‚’å‚ç…§ã™ã‚‹ã“ã¨ã‚‚ã‚ã‚‹
-ã§ã—ょã†ï¼ŽRuby/Tk 版ã®è¨˜è¿°ã‚’ widget-demo ã‚’ Tcl/Tk 版ã®è¨˜è¿°ã«è¿‘ã„ã‚‚ã®ã«ã—ã¦
-ãŠã‘ã°ï¼Œãã®å¯¾æ¯”ã«ã‚ˆã£ã¦ï¼ŒRuby/Tk ã®ç†è§£ã‚’æ—©ã‚ã‚‹ã“ã¨ãŒã§ãã‚‹ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ï¼Ž
-一旦 Ruby/Tk ã§ã® å„ widget ã®ä½¿ç”¨æ–¹æ³•ã‚’ç¿’å¾—ã—ã¦ã—ã¾ãˆã°ï¼ŒRuby らã—ã„スクリ
-プトを作æˆã™ã‚‹ã“ã¨ã¯é›£ã—ããªã„ã§ã—ょã†ï¼Žæœ¬ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ã‚¹ã‚¯ãƒªãƒ—トã¯ï¼ŒRuby/Tk
-を最åˆã«ç¿’å¾—ã™ã‚‹ã¾ã§ã®è¸å°ã¨ã—ã¦åˆ©ç”¨ã—ã¦ã„ãŸã ã‘れã°å¹¸ã„ã§ã™ï¼Ž
-
-widget-demo ã®ç§»æ¤ã«ã‚ãŸã£ã¦ã¯ï¼Œæ¬¡ã®æ–¹ã«ã‚‚ç§»æ¤ã—ãŸã‚¹ã‚¯ãƒªãƒ—トをæä¾›ã—ã¦ã„ãŸã 
-ãã¾ã—ãŸï¼Žã“ã“ã«æ„Ÿè¬ã®æ„を表ã—ã¾ã™ï¼Ž
-
- 立石@JAIST (ttate@jaist.ac.jp) ã•ã‚“
- å¹³æ¾ç¥¥å² (hiramatu@cdrom.co.jp) ã•ã‚“
-
-å¹³æ¾ã•ã‚“ã«ã‚ˆã‚‹ Ruby/Tk 入門㮠Web page (http://www.cdrom.co.jp/~hiramatu/)
-ã‚‚ Ruby/Tk ã®ç¿’å¾—ã«æœ‰ç”¨ã¨æ€ãˆã¾ã™ã®ã§ï¼Œãœã²ã”å‚ç…§ãã ã•ã„.
-
-ã¾ãŸï¼Œå‰æ©‹ (maebashi@iij.ad.jp) ã•ã‚“ã‚’ã¯ã˜ã‚ã¨ã—ã¦ï¼Œwidget-demo ã®ç§»æ¤ã«éš›ã—
-ã¦å¿…è¦ã¨ãªã£ãŸ Ruby ã® Tk 関連ライブラリ修正ã«ã¤ã„ã¦ï¼Œå•題点,ãƒã‚°ã®æŒ‡æ‘˜ã‚’ã—
-ã¦ã„ãŸã ã„ãŸæ–¹ã€…ã«ã‚‚感è¬è‡´ã—ã¾ã™ï¼Ž
-
-ãã—ã¦æœ€å¾Œã«æœ€å¤§ã®æ„Ÿè¬ã‚’ Ruby 設計者㮠ã¾ã¤ã‚‚㨠ゆãã²ã‚ (matz@netlab.co.jp)
-ã•ã‚“ã«æ§ã’ãŸã„ã¨æ€ã„ã¾ã™ï¼Ž
+ ±Ê°æ¡÷ÃÎǽ¡¥¶å¹©Âç (nagai@ai.kyutech.ac.jp)
+
+ɸ½àÇÛÉۤΠTcl/Tk ³ÈÄ¥¥Ñ¥Ã¥±¡¼¥¸¤ò¼è¤ê¹þ¤ó¤À Ruby (°Ê²¼ Ruby/Tk ¤È¸Æ¤Ó¤Þ¤¹)
+¤Ç¤Ï¡¤Tk widget ¤òÍѤ¤¤¿ GUI ¤ÎºîÀ®¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥¼ÂºÝ¤Ë GUI ¤òºîÀ®
+¤·¤Æ¤¤¤¯¾ì¹ç¤Ë¤ÏÍÍ¡¹¤Ê¼ÂÎ㤬¥µ¥ó¥×¥ë¤È¤·¤ÆÂ¸ºß¤¹¤ë¤ÈÊØÍø¤Ê¤Î¤Ç¤¹¤¬¡¤Ruby/Tk
+¤Ë¤Ï¤½¤Î¤è¤¦¤ÊŬÅö¤Ê¥µ¥ó¥×¥ë¥¹¥¯¥ê¥×¥È½¸¹ç¤Ï¸ºß¤·¤Þ¤»¤ó¤Ç¤·¤¿¡¥¤½¤ì¤ËÂФ·¡¤
+³ÈÄ¥¥Ñ¥Ã¥±¡¼¥¸¤Î¸µ¤Ç¤¢¤ë Tcl/Tk ¤Ë¤Ï¡¤Tk widget ¤òÍѤ¤¤Æ¤É¤Î¤è¤¦¤Ê¤³¤È¤¬¤Ç
+¤­¤ë¤«¤ò¼¨¤¹¤â¤Î¤È¤·¤Æ widget-demo ¤¬Â¸ºß¤·¤ª¤ê¡¤Tcl/Tk ¤òÍѤ¤¤¿ GUI ¤ÎºîÀ®
+¤ò½¬ÆÀ¤¹¤ëºÝ¤ÎÂåɽŪ¥µ¥ó¥×¥ë¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥ËÜ¥¢¡¼¥«¥¤¥Ö¤Ï¡¤Ruby/Tk ¤Î½¬ÆÀ¤Î
+¤¿¤á¤ÎÂåɽŪ¤Ê¥µ¥ó¥×¥ë¥¹¥¯¥ê¥×¥È¤È¤¹¤Ù¤¯¡¤Tcl/Tk ¤Î widget-demo ¤ò°Ü¿¢¤·¤¿¤â
+¤Î¤Ç¤¹¡¥
+
+ËÜ¥¢¡¼¥«¥¤¥Ö¤Ë´Þ¤Þ¤ì¤ë¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Ë¤Ï¡¤ruby-1.1c2 °Ê¾å¤Ç¤¢¤ë¤³
+¤È¤¬É¬ÍפǤ¹¡¥1.1c1 ¤Î¾ì¹ç¤Ï¡¤ËÜ¥¢¡¼¥«¥¤¥Ö¤Ë´Þ¤Þ¤ì¤ë patck_1.1c1 ¤ò Ruby ¤Î
+¥é¥¤¥Ö¥é¥ê¤Ë¤¢¤Æ¤Æ¤¯¤À¤µ¤¤¡¥ÁȤ߹þ¤à Tk ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¤4.2 ¤Ç¤â 8.0 ¤Ç¤â½¤
+Àµ¤Ê¤¯Æ°¤«¤»¤ë¤Ï¤º¤Ç¤¹¡¥¤¿¤À¤·¡¤ÆüËܸìÈǤǤΰܿ¢¤È¤Ê¤Ã¤Æ¤¤¤ë¤¿¤á¡¤ÆüËܸ첽¤µ
+¤ì¤¿ Tk ¤ò¤´ÍøÍѤ¯¤À¤µ¤¤¡¥¥¹¥¯¥ê¥×¥È¤Î¥Æ¥¹¥È¤Ï¡¤Tk4.2jp ¤È Tk8.0jp ¤Î¾å¤Ç¹Ô
+¤¤¤Þ¤·¤¿ (´°àú¤Ë¤Ç¤Ï¤Ê¤¤¤Ç¤¹¤¬)¡¥
+
+ËÜ¥¢¡¼¥«¥¤¥Ö¤Ë´Þ¤Þ¤ì¤ë¥¹¥¯¥ê¥×¥È¤Î¿¤¯¤Ï¡¤¸µ¤È¤Ê¤Ã¤Æ¤¤¤ë Tcl/Tk ÈǤËÈæ³ÓŪ¶á
+¤¤¥¹¥¯¥ê¥×¥Èµ­½Ò¤È¤Ê¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡¥¤½¤Î¤¿¤á¡¤Ruby/Tk ¤Î¥µ¥ó¥×¥ë¤È¸À¤¦¤Ë
+¤Ï¡¤¤¢¤Þ¤ê Ruby ¤é¤·¤¯¤Ê¤¤¤È¤â¸À¤¨¤ë¤Ç¤·¤ç¤¦¡¥¤Ë¤â¤«¤«¤ï¤é¤º¡¤¤½¤Î¤è¤¦¤Êµ­½Ò
+¤ò¼è¤Ã¤Æ¤¤¤ëÍýͳ¤Ï¡¤Ruby/Tk ¤Î¥É¥­¥å¥á¥ó¥ÈÉÔ­¤Ë¤¢¤ê¤Þ¤¹¡¥
+
+Tcl/Tk ¤Ë¤ÏŬÅö¤Ê»²¹Í½ñ¤¬²¿ºý¤«Â¸ºß¤·¤Æ¤¤¤Þ¤¹¤«¤é¡¤Ruby/Tk ¥¹¥¯¥ê¥×¥È¤òºîÀ®
+¤¹¤ëºÝ¤Ï¡¤¤½¤Î¤è¤¦¤Ê Tcl/Tk ¤Î»²¹Í½ñ¤Ç¾ðÊó¤òÊ䤤¤Ê¤¬¤éºîÀ®¤¹¤ë¤³¤È¤Ë¤Ê¤ë¤È»×
+¤¤¤Þ¤¹¡¥³Æ widget ¤Î»ÈÍÑÎã¤È¤·¤Æ¡¤Tcl/Tk ¤Î widget-demo ¤ò»²¾È¤¹¤ë¤³¤È¤â¤¢¤ë
+¤Ç¤·¤ç¤¦¡¥Ruby/Tk ÈǤε­½Ò¤ò widget-demo ¤ò Tcl/Tk ÈǤε­½Ò¤Ë¶á¤¤¤â¤Î¤Ë¤·¤Æ
+¤ª¤±¤Ð¡¤¤½¤ÎÂÐÈæ¤Ë¤è¤Ã¤Æ¡¤Ruby/Tk ¤ÎÍý²ò¤òÁá¤á¤ë¤³¤È¤¬¤Ç¤­¤ë¤È¹Í¤¨¤é¤ì¤Þ¤¹¡¥
+°ìö Ruby/Tk ¤Ç¤Î ³Æ widget ¤Î»ÈÍÑÊýË¡¤ò½¬ÆÀ¤·¤Æ¤·¤Þ¤¨¤Ð¡¤Ruby ¤é¤·¤¤¥¹¥¯¥ê
+¥×¥È¤òºîÀ®¤¹¤ë¤³¤È¤ÏÆñ¤·¤¯¤Ê¤¤¤Ç¤·¤ç¤¦¡¥ËÜ¥¢¡¼¥«¥¤¥Ö¤Î¥¹¥¯¥ê¥×¥È¤Ï¡¤Ruby/Tk
+¤òºÇ½é¤Ë½¬ÆÀ¤¹¤ë¤Þ¤Ç¤ÎÆ§Âæ¤È¤·¤ÆÍøÍѤ·¤Æ¤¤¤¿¤À¤±¤ì¤Ð¹¬¤¤¤Ç¤¹¡¥
+
+widget-demo ¤Î°Ü¿¢¤Ë¤¢¤¿¤Ã¤Æ¤Ï¡¤¼¡¤ÎÊý¤Ë¤â°Ü¿¢¤·¤¿¥¹¥¯¥ê¥×¥È¤òÄ󶡤·¤Æ¤¤¤¿¤À
+¤­¤Þ¤·¤¿¡¥¤³¤³¤Ë´¶¼Õ¤Î°Õ¤òɽ¤·¤Þ¤¹¡¥
+
+ ΩÀС÷JAIST (ttate@jaist.ac.jp) ¤µ¤ó
+ Ê¿¾¾¾Í»Ë (hiramatu@cdrom.co.jp) ¤µ¤ó
+
+Ê¿¾¾¤µ¤ó¤Ë¤è¤ë Ruby/Tk ÆþÌç¤Î Web page (http://www.cdrom.co.jp/~hiramatu/)
+¤â Ruby/Tk ¤Î½¬ÆÀ¤ËÍ­ÍѤȻפ¨¤Þ¤¹¤Î¤Ç¡¤¤¼¤Ò¤´»²¾È¤¯¤À¤µ¤¤¡¥
+
+¤Þ¤¿¡¤Á°¶¶ (maebashi@iij.ad.jp) ¤µ¤ó¤ò¤Ï¤¸¤á¤È¤·¤Æ¡¤widget-demo ¤Î°Ü¿¢¤ËºÝ¤·
+¤ÆÉ¬ÍפȤʤä¿ Ruby ¤Î Tk ´ØÏ¢¥é¥¤¥Ö¥é¥ê½¤Àµ¤Ë¤Ä¤¤¤Æ¡¤ÌäÂêÅÀ¡¤¥Ð¥°¤Î»ØÅ¦¤ò¤·
+¤Æ¤¤¤¿¤À¤¤¤¿Êý¡¹¤Ë¤â´¶¼ÕÃפ·¤Þ¤¹¡¥
+
+¤½¤·¤ÆºÇ¸å¤ËºÇÂç¤Î´¶¼Õ¤ò Ruby À߷׼ԤΠ¤Þ¤Ä¤â¤È ¤æ¤­¤Ò¤í (matz@netlab.co.jp)
+¤µ¤ó¤ËÊû¤²¤¿¤¤¤È»×¤¤¤Þ¤¹¡¥
diff --git a/ext/tk/sample/demos-en/README.1st b/ext/tk/sample/demos-en/README.1st
index 2ba1e275c8..e031f123d2 100644
--- a/ext/tk/sample/demos-en/README.1st
+++ b/ext/tk/sample/demos-en/README.1st
@@ -1,18 +1,18 @@
There are Ruby/Tk demo scripts.
Files with '.rb' extension are sub-scripts which are launched 'widget'
-script. Those files don't work independently. Please call them from
+script. Those files don't work independently. Please call them from
'widget' script.
If you want start some sub-scripts at same time when the launcher
-script tarts, please give the sub-script names as arguments.
+script tarts, please give the sub-script names as arguments.
(e.g. /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
You can ommit '.rb' of the sub-scripts
(e.g. /usr/local/bin/ruby widget button entry1 text )
-If you don't need launcher's main window, give -n option.
+If you don't need launcher's main window, give -n option.
(e.g. /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
-Others (browse1, hello, and so on) are standalone scripts.
+Others (browse1, hello, and so on) are standalone scripts.
2004/04/14 Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/sample/demos-en/README.tkencoding b/ext/tk/sample/demos-en/README.tkencoding
index cca8734a28..f576bc593e 100644
--- a/ext/tk/sample/demos-en/README.tkencoding
+++ b/ext/tk/sample/demos-en/README.tkencoding
@@ -1,29 +1,29 @@
-This is a original document of 'tkencoding.rb'.
-The library 'tkencoding.rb' is obsolete.
+This is a original document of 'tkencoding.rb'.
+The library 'tkencoding.rb' is obsolete.
Functions of tkencoding.rb is already included into Ruby/Tk.
-------------------------------------------------
-tkencoding.rbを用ã„ãŸæ—¥æœ¬èªžã®è¡¨ç¤ºã«ã¤ã„ã¦
+tkencoding.rb¤òÍѤ¤¤¿ÆüËܸì¤Îɽ¼¨¤Ë¤Ä¤¤¤Æ
Copyright (C) 1999/07, Takaaki Tateishi <ttate@jaist.ac.jp>
-1. tkencoding.rbã¨ã¯ï¼Ÿ
+1. tkencoding.rb¤È¤Ï¡©
-tkencoding.rbã¯Tcl/Tk8.1を利用ã—ãŸRuby/Tkã®ãŸã‚ã®ãƒ©ã‚¤ãƒ–ラリ
-ã§ã™ã€‚tkencoding.rbã‚’requireã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦Wedgetã«è¡¨ç¤ºã•
-れるテキストã¯å…¨ã¦unicode(UTF8)ã¸å¤‰æ›ã•れã¾ã™ã€‚
+tkencoding.rb¤ÏTcl/Tk8.1¤òÍøÍѤ·¤¿Ruby/Tk¤Î¤¿¤á¤Î¥é¥¤¥Ö¥é¥ê
+¤Ç¤¹¡£tkencoding.rb¤òrequire¤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆWedget¤Ëɽ¼¨¤µ
+¤ì¤ë¥Æ¥­¥¹¥È¤ÏÁ´¤Æunicode(UTF8)¤ØÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-2. ä½¿ã„æ–¹
+2. »È¤¤Êý
-tkencoding.rbã‚’requireã—ã¦Tk.encodingã§ä½¿ç”¨ã—ã¦ã„る文字コード
-を指定ã—ã¦ä¸‹ã•ã„。例ãˆã°ä»¥ä¸‹ã®ã‚ˆã†ãªæ„Ÿã˜ã«ãªã‚Šã¾ã™ã€‚
+tkencoding.rb¤òrequire¤·¤ÆTk.encoding¤Ç»ÈÍѤ·¤Æ¤¤¤ëʸ»ú¥³¡¼¥É
+¤ò»ØÄꤷ¤Æ²¼¤µ¤¤¡£Î㤨¤Ð°Ê²¼¤Î¤è¤¦¤Ê´¶¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£
----
require 'tk'
require 'tkencoding'
-Tk.encoding = "utf-8"
+Tk.encoding = "euc-jp"
# Tk.encoding = "shiftjis"
---
diff --git a/ext/tk/sample/demos-en/browse1 b/ext/tk/sample/demos-en/browse1
index 568892e4a8..03e251035a 100644
--- a/ext/tk/sample/demos-en/browse1
+++ b/ext/tk/sample/demos-en/browse1
@@ -1,16 +1,16 @@
#!/usr/bin/env ruby
# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
+# This script generates a directory browser, which lists the working
+# directory and allow you to open files or subdirectories by
+# double-clicking.
require 'tk'
-# Create a scrollbar on the right side of the main window and a listbox
+# Create a scrollbar on the right side of the main window and a listbox
# on the left side.
-listbox = TkListbox.new(nil, 'relief'=>'sunken',
+listbox = TkListbox.new(nil, 'relief'=>'sunken',
'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
pack('side'=>'right', 'fill'=>'y')
@@ -23,10 +23,10 @@ listbox = TkListbox.new(nil, 'relief'=>'sunken',
root = TkRoot.new
root.minsize(1,1)
-# The procedure below is invoked to open a browser on a given file; if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
+# The procedure below is invoked to open a browser on a given file; if the
+# file is a directory then another instance of this program is invoked; if
+# the file is a regular file then the Mx editor is invoked to display
+# the file.
def browse (dir, file)
file = dir + File::Separator + file if dir != '.'
@@ -46,7 +46,7 @@ def browse (dir, file)
end
end
-# Fill the listbox with a list of all the files in the directory (run
+# Fill the listbox with a list of all the files in the directory (run
# the "ls" command to get that information).
dir = ARGV[0] ? ARGV[0] : '.'
@@ -57,7 +57,7 @@ open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
# Set up bindings for the browser.
Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1',
+listbox.bind('Double-Button-1',
proc{TkSelection.get.each{|f| browse dir, f}})
Tk.mainloop
diff --git a/ext/tk/sample/demos-en/browse2 b/ext/tk/sample/demos-en/browse2
index 1a511c8d29..edad04dbcb 100644
--- a/ext/tk/sample/demos-en/browse2
+++ b/ext/tk/sample/demos-en/browse2
@@ -1,9 +1,9 @@
#!/usr/bin/env ruby
# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
+# This script generates a directory browser, which lists the working
+# directory and allow you to open files or subdirectories by
+# double-clicking.
require 'tk'
@@ -19,9 +19,9 @@ class Browse
title('Browse : ' + dir)
}
- # Create a scrollbar on the right side of the main window and a listbox
+ # Create a scrollbar on the right side of the main window and a listbox
# on the left side.
- list = TkListbox.new(base, 'relief'=>'sunken',
+ list = TkListbox.new(base, 'relief'=>'sunken',
'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
pack('side'=>'right', 'fill'=>'y')
@@ -30,7 +30,7 @@ class Browse
pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
- # Fill the listbox with a list of all the files in the directory (run
+ # Fill the listbox with a list of all the files in the directory (run
# the "ls" command to get that information).
open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
l.insert('end', fname.chomp)
@@ -44,14 +44,14 @@ class Browse
Browse::BROWSE_WIN_COUNTER.to_i - 1
})
base.bind('Control-c', proc{base.destroy})
- list.bind('Double-Button-1',
+ list.bind('Double-Button-1',
proc{TkSelection.get.each{|f| self.browse dir, f}})
end
- # The method below is invoked to open a browser on a given file; if the
- # file is a directory then another instance of this program is invoked; if
- # the file is a regular file then the Mx editor is invoked to display
- # the file.
+ # The method below is invoked to open a browser on a given file; if the
+ # file is a directory then another instance of this program is invoked; if
+ # the file is a regular file then the Mx editor is invoked to display
+ # the file.
def browse (dir, file)
file = dir + File::Separator + file if dir != '.'
type = File.ftype(file)
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms b/ext/tk/sample/demos-en/doc.org/license.terms
index c0a44d3fc2..03ca6fcb31 100644
--- a/ext/tk/sample/demos-en/doc.org/license.terms
+++ b/ext/tk/sample/demos-en/doc.org/license.terms
@@ -28,7 +28,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
diff --git a/ext/tk/sample/demos-en/doc.org/license.terms.tk80 b/ext/tk/sample/demos-en/doc.org/license.terms.tk80
index c0a44d3fc2..03ca6fcb31 100644
--- a/ext/tk/sample/demos-en/doc.org/license.terms.tk80
+++ b/ext/tk/sample/demos-en/doc.org/license.terms.tk80
@@ -28,7 +28,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
diff --git a/ext/tk/sample/demos-en/ixset b/ext/tk/sample/demos-en/ixset
index 40a77f487c..979894fcb8 100644
--- a/ext/tk/sample/demos-en/ixset
+++ b/ext/tk/sample/demos-en/ixset
@@ -164,8 +164,8 @@ class Xsettings
#
bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
l = TkLabel.new(bell, 'text'=>'Bell Settings')
- @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
+ @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
'label'=>"Volume (%)")
f = TkFrame.new(bell)
@@ -180,13 +180,13 @@ class Xsettings
#
# Keyboard settings
- #
+ #
kbdonoff = nil
kbdcli = nil
kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
f = TkFrame.new(kbd)
- @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
+ @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
'onvalue'=>'on', 'offvalue'=>'off',
'variable'=>@w_kbdrep ) {
def self.set(value)
@@ -198,8 +198,8 @@ class Xsettings
end
pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
}
- @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
+ @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
'label'=>'Click Volume (%)')
@w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
l.pack('side'=>'top', 'expand'=>'yes')
@@ -225,9 +225,9 @@ class Xsettings
l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
f = TkFrame.new(screen)
ff1 = TkFrame.new(f)
- [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
- 'relief'=>'flat',
- 'variable'=>@w_screenbla,
+ [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
+ 'relief'=>'flat',
+ 'variable'=>@w_screenbla,
'value'=>'blank') {
def self.set(value)
if value == 'blank'
@@ -236,10 +236,10 @@ class Xsettings
self.deselect
end
end
- },
- @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
- 'relief'=>'flat',
- 'variable'=>@w_screenbla,
+ },
+ @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
+ 'relief'=>'flat',
+ 'variable'=>@w_screenbla,
'value'=>'noblank') {
def self.set(value)
if value != 'blank'
@@ -252,7 +252,7 @@ class Xsettings
].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
ff2 = TkFrame.new(f)
- [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
+ [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
@w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
}
diff --git a/ext/tk/sample/demos-en/ixset2 b/ext/tk/sample/demos-en/ixset2
index cb99c60793..ce8472abe0 100644
--- a/ext/tk/sample/demos-en/ixset2
+++ b/ext/tk/sample/demos-en/ixset2
@@ -134,8 +134,8 @@ class Xsettings
def initialize(parent, text, length, range=[])
@frame = TkFrame.new(parent)
TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
- if range.size > 0
- @entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
+ if range.size > 0
+ @entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
'from'=>range[0], 'to'=>range[1])
else
@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
@@ -164,16 +164,16 @@ class Xsettings
# Buttons
#
btn_frame = TkFrame.new(@root)
- buttons = [
- @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
+ buttons = [
+ @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
'default'=>'active', 'text'=>'Ok'),
- @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
- 'default'=>'normal', 'text'=>'Apply',
+ @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
+ 'default'=>'normal', 'text'=>'Apply',
'state'=>'disabled'),
- @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
- 'default'=>'normal', 'text'=>'Cancel',
+ @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
+ 'default'=>'normal', 'text'=>'Cancel',
'state'=>'disabled'),
- @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
+ @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
'default'=>'normal', 'text'=>'Quit')
]
buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
@@ -201,10 +201,10 @@ class Xsettings
#
# Bell settings
#
- bell = TkLabelframe.new(@root, 'text'=>'Bell Settings',
+ bell = TkLabelframe.new(@root, 'text'=>'Bell Settings',
'padx'=>'1.5m', 'pady'=>'1.5m')
- @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
+ @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
'label'=>"Volume (%)")
f = TkFrame.new(bell)
@@ -218,13 +218,13 @@ class Xsettings
#
# Keyboard settings
- #
+ #
kbdonoff = nil
kbdcli = nil
- kbd = TkLabelframe.new(@root, 'text'=>'Keyboard Repeat Settings',
+ kbd = TkLabelframe.new(@root, 'text'=>'Keyboard Repeat Settings',
'padx'=>'1.5m', 'pady'=>'1.5m')
f = TkFrame.new(kbd)
- @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
+ @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
'onvalue'=>'on', 'offvalue'=>'off',
'variable'=>@w_kbdrep ) {
def self.set(value)
@@ -236,17 +236,17 @@ class Xsettings
end
pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
}
- @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
+ @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
'label'=>'Click Volume (%)')
- @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
+ @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
'fill'=>'x', 'padx'=>['1m', 0])
f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
#
# Mouse settings
#
- mouse = TkLabelframe.new(@root, 'text'=>'Mouse Settings',
+ mouse = TkLabelframe.new(@root, 'text'=>'Mouse Settings',
'padx'=>'1.5m', 'pady'=>'1.5m')
f = TkFrame.new(mouse)
@w_mouseacc = LabelEntry.new(f, 'Acceleration', 5)
@@ -258,11 +258,11 @@ class Xsettings
#
# Screen Saver settings
#
- screen = TkLabelframe.new(@root, 'text'=>'Screen-saver Settings',
+ screen = TkLabelframe.new(@root, 'text'=>'Screen-saver Settings',
'padx'=>'1.5m', 'pady'=>'1.5m')
- @w_screenblank = TkRadioButton.new(screen, 'text'=>'Blank',
- 'relief'=>'flat', 'anchor'=>'w',
- 'variable'=>@w_screenbla,
+ @w_screenblank = TkRadioButton.new(screen, 'text'=>'Blank',
+ 'relief'=>'flat', 'anchor'=>'w',
+ 'variable'=>@w_screenbla,
'value'=>'blank') {
def self.set(value)
if value == 'blank'
@@ -273,9 +273,9 @@ class Xsettings
end
}
- @w_screenpat = TkRadioButton.new(screen, 'text'=>'Pattern',
- 'relief'=>'flat', 'anchor'=>'w',
- 'variable'=>@w_screenbla,
+ @w_screenpat = TkRadioButton.new(screen, 'text'=>'Pattern',
+ 'relief'=>'flat', 'anchor'=>'w',
+ 'variable'=>@w_screenbla,
'value'=>'noblank') {
def self.set(value)
if value != 'blank'
@@ -297,7 +297,7 @@ class Xsettings
# Main window
#
param = {
- 'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
+ 'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
'padx'=>'1m', 'pady'=>'1m'
}
btn_frame.pack('side'=>'top', 'fill'=>'both')
diff --git a/ext/tk/sample/demos-en/rmt b/ext/tk/sample/demos-en/rmt
index dcfb328fc8..73f631180a 100644
--- a/ext/tk/sample/demos-en/rmt
+++ b/ext/tk/sample/demos-en/rmt
@@ -1,9 +1,9 @@
#!/usr/bin/env ruby
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications. It allows you to select an application and
-# then type commands to that application.
+# rmt --
+# This script implements a simple remote-control mechanism for
+# Tk applications. It allows you to select an application and
+# then type commands to that application.
require 'tk'
@@ -17,41 +17,41 @@ class Rmt
root = TkWinfo.toplevel(parent)
root.minsize(1,1)
- # The instance variable below keeps track of the remote application
- # that we're sending to. If it's an empty string then we execute
- # the commands locally.
+ # The instance variable below keeps track of the remote application
+ # that we're sending to. If it's an empty string then we execute
+ # the commands locally.
@app = 'local'
@mode = 'Ruby'
- # The instance variable below keeps track of whether we're in the
- # middle of executing a command entered via the text.
+ # The instance variable below keeps track of whether we're in the
+ # middle of executing a command entered via the text.
@executing = 0
- # The instance variable below keeps track of the last command executed,
- # so it can be re-executed in response to !! commands.
+ # The instance variable below keeps track of the last command executed,
+ # so it can be re-executed in response to !! commands.
@lastCommand = ""
- # Create menu bar. Arrange to recreate all the information in the
- # applications sub-menu whenever it is cascaded to.
+ # Create menu bar. Arrange to recreate all the information in the
+ # applications sub-menu whenever it is cascaded to.
TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
pack('side'=>'top', 'fill'=>'x')
TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
TkMenu.new(mb) {|mf|
mb.menu(mf)
- TkMenu.new(mf) {|ma|
+ TkMenu.new(mf) {|ma|
postcommand proc{win.fillAppsMenu ma}
- mf.add('cascade', 'label'=>'Select Application',
+ mf.add('cascade', 'label'=>'Select Application',
'menu'=>ma, 'underline'=>0)
}
- add('command', 'label'=>'Quit',
+ add('command', 'label'=>'Quit',
'command'=>proc{root.destroy}, 'underline'=>0)
}
pack('side'=>'left')
}
}
- # Create text window and scrollbar.
+ # Create text window and scrollbar.
@txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
@@ -60,9 +60,9 @@ class Rmt
@promptEnd = TkTextMark.new(@txt, 'insert')
- # Create a binding to forward commands to the target application,
- # plus modify many of the built-in bindings so that only information
- # in the current command can be deleted (can still set the cursor
+ # Create a binding to forward commands to the target application,
+ # plus modify many of the built-in bindings so that only information
+ # in the current command can be deleted (can still set the cursor
# earlier in the text and select and insert; just can't delete).
@txt.bindtags([@txt, TkText, root, 'all'])
@@ -151,8 +151,8 @@ class Rmt
w.see('insert')
end
- # The method below is used to print out a prompt at the
- # insertion point (which should be at the beginning of a line
+ # The method below is used to print out a prompt at the
+ # insertion point (which should be at the beginning of a line
# right now).
def prompt
@@ -162,8 +162,8 @@ class Rmt
@txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
end
- # The method below executes a command (it takes everything on the
- # current line after the prompt and either sends it to the remote
+ # The method below executes a command (it takes everything on the
+ # current line after the prompt and either sends it to the remote
# application or executes it locally, depending on "app".
def invoke
@@ -200,8 +200,8 @@ class Rmt
if complete
@lastCommand = cmd
begin
-# msg = Tk.appsend(@app, false,
-# 'ruby',
+# msg = Tk.appsend(@app, false,
+# 'ruby',
# '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
msg = Tk.rb_appsend(@app, false, cmd)
rescue
@@ -218,10 +218,10 @@ class Rmt
end
# The following method is invoked to change the application that
- # we're talking to. It also updates the prompt for the current
- # command, unless we're in the middle of executing a command from
- # the text item (in which case a new prompt is about to be output
- # so there's no need to change the old one).
+ # we're talking to. It also updates the prompt for the current
+ # command, unless we're in the middle of executing a command from
+ # the text item (in which case a new prompt is about to be output
+ # so there's no need to change the old one).
def newApp(appName, mode)
@app = appName
@@ -236,7 +236,7 @@ class Rmt
end
# The method below will fill in the applications sub-menu with a list
- # of all the applications that currently exist.
+ # of all the applications that currently exist.
def fillAppsMenu(menu)
win = self
@@ -251,14 +251,14 @@ class Rmt
else
mode = 'Ruby'
end
- menu.add('command', 'label'=>format("%s (#{mode}/Tk)", ip),
+ menu.add('command', 'label'=>format("%s (#{mode}/Tk)", ip),
'command'=>proc{win.newApp ip, mode})
rescue
- menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
+ menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
end
}
- menu.add('command', 'label'=>format("local (Ruby/Tk)"),
+ menu.add('command', 'label'=>format("local (Ruby/Tk)"),
'command'=>proc{win.newApp 'local', 'Ruby'})
end
end
diff --git a/ext/tk/sample/demos-en/rolodex b/ext/tk/sample/demos-en/rolodex
index dfc4b2b245..9a4030e902 100644
--- a/ext/tk/sample/demos-en/rolodex
+++ b/ext/tk/sample/demos-en/rolodex
@@ -2,7 +2,7 @@
#
# rolodex --
# This script is a part of Tom LaStrange's rolodex
-#
+#
# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
# Time-stamp: "03/08/02 06:23:06 nagai"
#
@@ -17,7 +17,7 @@ def show_help(topic,x=0,y=0)
topic = w
end
end
-
+
if( $helpTopics.include?(topic) )
msg = $helpTopics[topic]
else
@@ -81,7 +81,7 @@ class RolodexFrame < TkFrame
def initialize(parent=nil,keys=nil)
super(parent,keys)
self["relief"] = "flat"
-
+
@i = []
@label = []
@entry = []
diff --git a/ext/tk/sample/demos-en/square b/ext/tk/sample/demos-en/square
index bb66282154..00bfde59ff 100644
--- a/ext/tk/sample/demos-en/square
+++ b/ext/tk/sample/demos-en/square
@@ -1,10 +1,10 @@
#!/usr/bin/env ruby
# square --
-# This script generates a demo application containing only
-# a "square" widget. It's only usable if Tk has been compiled
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
-# This demo arranges the following bindings for the widget:
+# This script generates a demo application containing only
+# a "square" widget. It's only usable if Tk has been compiled
+# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
+# This demo arranges the following bindings for the widget:
#
# Button-1 press/drag: moves square to mouse
# "a": toggle size animation on/off
@@ -19,7 +19,7 @@ class TkSquare<TkWindow
tk_call 'square', path
rescue
STDERR.print "\nSorry. Your Tk interpreter does not contain " +
- 'a "square" demonstration widget.' +
+ 'a "square" demonstration widget.' +
"\n ( See documents included the Tcl/Tk source archive. )\n\n"
exit
end
@@ -53,7 +53,7 @@ def center(x,y)
end
# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
+# the box changes size in a pulsing pattern: larger, smaller, larger,
# and so on.
$inc = 0
diff --git a/ext/tk/sample/demos-en/tcolor b/ext/tk/sample/demos-en/tcolor
index 48cda6d1da..3c63d6730d 100644
--- a/ext/tk/sample/demos-en/tcolor
+++ b/ext/tk/sample/demos-en/tcolor
@@ -126,7 +126,7 @@ def _null_binding
end
private :_null_binding
-def doUpdate
+def doUpdate
newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
eval(newCmd, _null_binding)
end
@@ -134,7 +134,7 @@ end
def tc_scaleChanged
if( $updating.to_i == 1 )
- return
+ return
end
$master = :scale if $master == nil
@@ -151,7 +151,7 @@ def tc_scaleChanged
when :cmy
$red = (65535 - scale1.get * 65.535).to_i
$green = (65535 - scale2.get * 65.535).to_i
- $blue = (65535 - scale3.get * 65.535).to_i
+ $blue = (65535 - scale3.get * 65.535).to_i
when :hsb
list = hsbToRgb(scale1.get / 1000.0,
scale2.get / 1000.0,
@@ -179,7 +179,7 @@ def tc_setScales
scale1 = $root.middle.middle.scale1
scale2 = $root.middle.middle.scale2
scale3 = $root.middle.middle.scale3
-
+
case $colorSpace.value.intern
when :rgb
scale1.set($red / 65.535)
@@ -205,7 +205,7 @@ end
def tc_loadNamedColor(name)
$name.value = name
$master = :name if $master == nil
- if name[0,1] != "#"
+ if name[0,1] != "#"
list = TkWinfo.rgb($root.middle.right.swatch,name)
$red = list[0]
$green = list[1]
@@ -239,7 +239,7 @@ def tc_loadNamedColor(name)
$green = $green << shift
$blue = $blue << shift
end
-
+
tc_setScales
$color = format("#%04x%04x%04x",$red,$green,$blue)
$root.middle.right.set_color($color)
@@ -318,7 +318,7 @@ class TkColorMenuFrame<TkFrame
"underline" => "0",
"command" => proc{exit}
}
-
+
# assign File menu to File button
menu @file_menu
@@ -354,7 +354,7 @@ class TkColorBotFrame<TkFrame
self
end
-end
+end
# left side frame of middle level
@@ -459,7 +459,7 @@ class TkColorMiddleRightFrame<TkFrame
super(parent)
@swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
"background"=>$color)
- @value = TkLabel.new(self,
+ @value = TkLabel.new(self,
"text"=>$color,
"width"=>"13",
"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
diff --git a/ext/tk/sample/demos-en/text.rb b/ext/tk/sample/demos-en/text.rb
index 2f72de7583..5794a85e87 100644
--- a/ext/tk/sample/demos-en/text.rb
+++ b/ext/tk/sample/demos-en/text.rb
@@ -117,7 +117,7 @@ insertion cursor. #{
end
}
-8. Resize the window. This widget has been configured with the "setGrid"
+7. Resize the window. This widget has been configured with the "setGrid"
option on, so that if you resize the window it will always resize to an
even number of characters high and wide. Also, if you make the window
narrow you can see that long lines automatically wrap around onto
diff --git a/ext/tk/sample/demos-en/timer b/ext/tk/sample/demos-en/timer
index 6cb7c87e09..58a41d00c0 100644
--- a/ext/tk/sample/demos-en/timer
+++ b/ext/tk/sample/demos-en/timer
@@ -69,7 +69,7 @@ class CountFrame < TkFrame
def initialize(parent=nil,keys=nil)
super(parent,keys)
@counter = TkLabel.new(self,
- 'text'=>$time,
+ 'text'=>$time,
'relief'=>'raised')
@counter.pack('fill'=>'both')
self
diff --git a/ext/tk/sample/demos-en/tree.rb b/ext/tk/sample/demos-en/tree.rb
index 69154ee076..cd62ba8c9b 100644
--- a/ext/tk/sample/demos-en/tree.rb
+++ b/ext/tk/sample/demos-en/tree.rb
@@ -67,7 +67,7 @@ def populate_tree(tree, node)
path = tree.get(node, :fullpath)
tree.delete(tree.children(node))
Dir.glob("#{path}/*").sort.each{|f|
- type = File.ftype(f) rescue nil
+ type = File.ftype(f)
id = tree.insert(node, :end,
:text=>File.basename(f), :values=>[f, type]).id
if type == 'directory'
diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget
index fb49a746b9..250c589116 100644
--- a/ext/tk/sample/demos-en/widget
+++ b/ext/tk/sample/demos-en/widget
@@ -26,15 +26,15 @@ $RubyTk_WidgetDemo = true
# $demo_dir = File.dirname($0)
$demo_dir = File.dirname(__FILE__)
-# root
+# root
$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-# tk
+# tk
$tk_version = Tk::TK_VERSION
$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
$tk_patchlevel = Tk::TK_PATCHLEVEL
-# tcl_platform
+# tcl_platform
$tk_platform = TkVarAccess.new('tcl_platform')
#
@@ -104,18 +104,18 @@ $image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
EOD
end
-#
+#
if $tk_major_ver >= 8
- $root.add_menubar([[['File', 0],
+ $root.add_menubar([[['File', 0],
['About ... ', proc{aboutBox}, 0, '<F1>'],
- '---',
+ '---',
['Quit', proc{exit}, 0, 'Ctrl-Q']
]])
else
- TkMenubar.new($root,
- [[['File', 0],
+ TkMenubar.new($root,
+ [[['File', 0],
['About ... ', proc{aboutBox}, 0, '<F1>'],
- '---',
+ '---',
['Quit', proc{exit}, 0, 'Ctrl-Q']
]]).pack('side'=>'top', 'fill'=>'x')
end
@@ -135,7 +135,7 @@ TkFrame.new($root){|frame|
}.pack('side'=>'top', 'fill'=>'x')
=end
-#
+#
if $tk_version =~ /^4\.[01]/
scr = TkScrollbar.new($root, 'orient'=>'vertical')
txt = TkText.new($root) {
@@ -151,7 +151,7 @@ if $tk_version =~ /^4\.[01]/
txt.pack('expand'=>'yes', 'fill'=>'both')
else
textFrame = TkFrame.new($root)
- scr = TkScrollbar.new($root, 'orient'=>'vertical',
+ scr = TkScrollbar.new($root, 'orient'=>'vertical',
'highlightthickness'=>0, 'takefocus'=>1) {
pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
}
@@ -184,10 +184,10 @@ else
statusfont = 'Helvetica 10'
end
$statusBarLabel = \
- TkLabel.new(f, 'text'=>" ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
+ TkLabel.new(f, 'text'=>" ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
'font'=>statusfont) \
.pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
- TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
+ TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
'font'=>statusfont) \
.pack('side'=>'left', 'padx'=>2)
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
@@ -196,7 +196,7 @@ end
# Create a bunch of tags to use in the text widget, such as those for
# section titles and demo descriptions. Also define the bindings for
# tags.
-
+
if $tk_version =~ /^4.*/
tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
else
@@ -210,23 +210,23 @@ end
tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
if TkWinfo.depth($root) == 1
- tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'underline'=>1)
- $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'underline'=>1)
tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
else
- tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'foreground'=>'blue', 'underline'=>1)
- $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'foreground'=>'#303080', 'underline'=>1)
-# tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
+# tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
# 'background'=>'SeaGreen3')
tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
end
#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1',
+tag_demo.bind('ButtonRelease-1',
proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
lastLine = TkVariable.new("")
@@ -237,7 +237,7 @@ tag_demo.bind('Enter', proc{|x,y|
showStatus txt, txt.index("@#{x},#{y}")
},
'%x %y')
-tag_demo.bind('Leave',
+tag_demo.bind('Leave',
proc{
tag_hot.remove('1.0','end')
txt.configure('cursor','xterm')
@@ -248,10 +248,10 @@ tag_demo.bind('Motion', proc{|x, y|
if newLine.value != lastLine.value
tag_hot.remove('1.0','end')
lastLine.value = newLine.value
- if ( txt.tag_names("@#{x},#{y}").find{|t|
+ if ( txt.tag_names("@#{x},#{y}").find{|t|
t.kind_of?(String) && t =~ /^demo-/
} )
- tag_hot.add(lastLine.value,
+ tag_hot.add(lastLine.value,
"#{lastLine.value} lineend -1 chars")
end
end
@@ -273,7 +273,7 @@ demonstration. If you wish, you can edit the code and click the \
with the modified code. \
Don't worry about breaking the source code. \
Your modifications are not reflected on the original file. \
-Please try many kind of changes.
+Please try many kind of changes.
Some demo scripts require the recent version of Tk library \
(e.g. Tk8.4 or later) \
@@ -353,8 +353,8 @@ txt.insert('end', "1. Without scrollbars.\n", tag_demo, "demo-entry1")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "2. With scrollbars.\n", tag_demo, "demo-entry2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end',
- "3. Validated entries and password fields. (if supported)\n",
+txt.insert('end',
+ "3. Validated entries and password fields. (if supported)\n",
tag_demo, "demo-entry3")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "4. Spin-boxes. (if supported)\n", tag_demo, "demo-spin")
@@ -499,7 +499,7 @@ $showVarsWin = {}
def showVars1(parent, *args)
if $showVarsWin[parent.path]
begin
- $showVarsWin[parent.path].destroy
+ $showVarsWin[parent.path].destroy
rescue
end
end
@@ -539,7 +539,7 @@ end
def showVars2(parent, *args)
if $showVarsWin[parent.path]
begin
- $showVarsWin[parent.path].destroy
+ $showVarsWin[parent.path].destroy
rescue
end
end
@@ -548,11 +548,11 @@ def showVars2(parent, *args)
base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
- TkLabelFrame.new(base, :text=>"Variable values:",
+ TkLabelFrame.new(base, :text=>"Variable values:",
:font=>{:family=>'Helvetica', :size=>14}){|f|
args.each{|vnam,vbody|
- TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
- TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
+ TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
+ TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
:padx=>2, :pady=>2, :sticky=>'w')
}
@@ -560,7 +560,7 @@ def showVars2(parent, *args)
f.grid_columnconfig(1, :weight=>1)
f.grid_rowconfig(100, :weight=>1)
}
- TkButton.new(base, :text=>"OK", :width=>8, :default=>:active,
+ TkButton.new(base, :text=>"OK", :width=>8, :default=>:active,
:command=>proc{top.destroy}){|b|
top.bind('Return', proc{b.invoke})
top.bind('Escape', proc{b.invoke})
@@ -610,9 +610,9 @@ class Object
def method_missing(id, *args)
begin
- has_top = (top = Thread.current[:TOPLEVEL]) &&
- top.respond_to?(:pseudo_toplevel_evaluable?) &&
- top.pseudo_toplevel_evaluable? &&
+ has_top = (top = Thread.current[:TOPLEVEL]) &&
+ top.respond_to?(:pseudo_toplevel_evaluable?) &&
+ top.pseudo_toplevel_evaluable? &&
top.respond_to?(id)
rescue Exception => e
has_top = false
@@ -627,7 +627,7 @@ class Object
end
class Proc
- def initialize(*args)
+ def initialize(*args, &b)
super
@__pseudo_toplevel__ = Thread.current[:TOPLEVEL]
end
@@ -683,7 +683,7 @@ def eval_samplecode(code, file=nil)
end
}
}
- Tk.update rescue nil
+ Tk.update
end
# invoke --
@@ -699,7 +699,7 @@ def invoke(txt, idx)
cursor = txt.cget('cursor')
txt.cursor('watch')
- Tk.update rescue nil
+ Tk.update
# eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
# Tk.update
eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
@@ -738,7 +738,7 @@ def showStatus (txt, index)
newcursor = 'xterm'
else
demoname = tag[5..-1]
- $statusBarLabel.configure('text',
+ $statusBarLabel.configure('text',
"Run the \"#{demoname}\" sample program")
newcursor = 'hand2'
end
@@ -800,9 +800,9 @@ def showCode1(demo)
TkFrame.new($code_window) {|f|
pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
- hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
+ hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
'orient'=>'horizontal')
- vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
+ vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
'orient'=>'vertical')
$code_text = TkText.new($code_window) {|t|
height 40
@@ -817,11 +817,11 @@ def showCode1(demo)
vs.command(proc{|*args| $code_text.yview(*args)})
}
- $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-# xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+# xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
# 'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
# JKC 2001-07-26: segfaults under 1.7.1 (2001-06-19) [i686-linux]
@@ -866,8 +866,8 @@ def showCode2(demo)
if $code_window == nil || TkWinfo.exist?($code_window) == false
$code_window = TkToplevel.new(nil)
tf = TkFrame.new($code_window)
- $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
- :wrap=>'word', :bd=>1, :setgrid=>true,
+ $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
+ :wrap=>'word', :bd=>1, :setgrid=>true,
:highlightthickness=>0, :pady=>2, :padx=>3)
xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
@@ -890,20 +890,20 @@ def showCode2(demo)
posnum.text = pos
}
- b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active,
+ b_dis = TkButton.new(bf, :text=>'Dismiss', :default=>:active,
:command=>proc{
$code_window.destroy
$code_window = nil
- },
+ },
:image=>$image['delete'], :compound=>:left)
- b_prn = TkButton.new(bf, :text=>'Print Code',
- :command=>proc{printCode($code_text, file)},
+ b_prn = TkButton.new(bf, :text=>'Print Code',
+ :command=>proc{printCode($code_text, file)},
:image=>$image['print'], :compound=>:left)
- b_run = TkButton.new(bf, :text=>'Rerun Demo',
+ b_run = TkButton.new(bf, :text=>'Rerun Demo',
:command=>proc{
# eval($code_text.get('1.0','end'), _null_binding)
eval_samplecode($code_text.get('1.0','end'), '<viewer>')
- },
+ },
:image=>$image['refresh'], :compound=>:left)
TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
@@ -979,23 +979,23 @@ def printCode(txt, file)
when 'unix'
msg = `lp -c #{fname}`
unless $?.exitstatus == 0
- Tk.messageBox(:title=>'Print spooling failure',
+ Tk.messageBox(:title=>'Print spooling failure',
:message=>'Print spooling probably failed: ' + msg)
end
when 'windows'
begin
printTextWin32(fname)
rescue => e
- Tk.messageBox(:title=>'Print spooling failure',
- :message=>'Print spooling probably failed: ' +
+ Tk.messageBox(:title=>'Print spooling failure',
+ :message=>'Print spooling probably failed: ' +
e.message)
- end
+ end
when 'macintosh'
- Tk.messageBox(:title=>'Operation not Implemented',
+ Tk.messageBox(:title=>'Operation not Implemented',
:message=>'Oops, sorry: not implemented yet!')
else
- Tk.messageBox(:title=>'Operation not Implemented',
- :message=>'Wow! Unknown platform: ' +
+ Tk.messageBox(:title=>'Operation not Implemented',
+ :message=>'Wow! Unknown platform: ' +
Tk::TCL_PLATFORM('platform'))
end
ensure
@@ -1025,7 +1025,7 @@ def printTextWin32(fname)
pcmd.gsub!('%1', fname)
puts pcmd
cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
-
+
msg = `#{cmd}`
unless $?.exitstatus == 0
fail RuntimeError, msg
@@ -1037,16 +1037,16 @@ end
# Pops up a message box with an "about" message
#
def aboutBox
- Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
- 'message'=>"Ruby/Tk widget demonstration Ver.1.7.1-en\n\n" +
- "based on demos of Tk8.1 -- 8.5 " +
- "( Copyright of Tcl/Tk demos:: " +
- "(c) 1996-1997 Sun Microsystems, Inc. / " +
- "(c) 1997-2000 Ajuba Solutions, Inc. / " +
- "(c) 2001-2007 Donal K. Fellows / " +
+ Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
+ 'message'=>"Ruby/Tk widget demonstration Ver.1.7.1-en\n\n" +
+ "based on demos of Tk8.1 -- 8.5 " +
+ "( Copyright of Tcl/Tk demos:: " +
+ "(c) 1996-1997 Sun Microsystems, Inc. / " +
+ "(c) 1997-2000 Ajuba Solutions, Inc. / " +
+ "(c) 2001-2007 Donal K. Fellows / " +
"(c) 2002-2007 Daniel A. Steffen )\n\n" +
- "Your Ruby & Tk Version ::\n" +
- "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
+ "Your Ruby & Tk Version ::\n" +
+ "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
"Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
end
@@ -1058,13 +1058,13 @@ if ARGV[0] == '-n'
no_launcher = true if ARGV.size > 0
else
# show the root widget to make it lower then demo windows
- Tk.update rescue nil
+ Tk.update
end
-ARGV.each{|cmd|
+ARGV.each{|cmd|
if cmd =~ /(.*).rb/
cmd = $1
end
- #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
+ #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
# _null_binding)
eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
}
diff --git a/ext/tk/sample/demos-jp/README b/ext/tk/sample/demos-jp/README
index 4278124659..42bec16c60 100644
--- a/ext/tk/sample/demos-jp/README
+++ b/ext/tk/sample/demos-jp/README
@@ -1,54 +1,54 @@
- Ruby/Tk widget-demo
+ Ruby/Tk widget-demo
version 1.2 ( 2000/04/08 )
- 永井@知能.ä¹å·¥å¤§ (nagai@ai.kyutech.ac.jp)
-
-標準é…布㮠Tcl/Tk 拡張パッケージをå–ã‚Šè¾¼ã‚“ã  Ruby (以下 Ruby/Tk ã¨å‘¼ã³ã¾ã™)
-ã§ã¯ï¼ŒTk widget を用ã„㟠GUI ã®ä½œæˆã‚’行ã†ã“ã¨ãŒã§ãã¾ã™ï¼Žå®Ÿéš›ã« GUI を作æˆ
-ã—ã¦ã„ãå ´åˆã«ã¯æ§˜ã€…ãªå®Ÿä¾‹ãŒã‚µãƒ³ãƒ—ルã¨ã—ã¦å­˜åœ¨ã™ã‚‹ã¨ä¾¿åˆ©ãªã®ã§ã™ãŒï¼ŒRuby/Tk
-ã«ã¯ãã®ã‚ˆã†ãªé©å½“ãªã‚µãƒ³ãƒ—ルスクリプト集åˆã¯å­˜åœ¨ã—ã¾ã›ã‚“ã§ã—ãŸï¼Žãれã«å¯¾ã—,
-拡張パッケージã®å…ƒã§ã‚ã‚‹ Tcl/Tk ã«ã¯ï¼ŒTk widget を用ã„ã¦ã©ã®ã‚ˆã†ãªã“ã¨ãŒã§
-ãã‚‹ã‹ã‚’示ã™ã‚‚ã®ã¨ã—㦠widget-demo ãŒå­˜åœ¨ã—ãŠã‚Šï¼ŒTcl/Tk を用ã„㟠GUI ã®ä½œæˆ
-ã‚’ç¿’å¾—ã™ã‚‹éš›ã®ä»£è¡¨çš„サンプルã¨ãªã£ã¦ã„ã¾ã™ï¼Žæœ¬ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã¯ï¼ŒRuby/Tk ã®ç¿’å¾—ã®
-ãŸã‚ã®ä»£è¡¨çš„ãªã‚µãƒ³ãƒ—ルスクリプトã¨ã™ã¹ã,Tcl/Tk ã® widget-demo ã‚’ç§»æ¤ã—ãŸã‚‚
-ã®ã§ã™ï¼Ž
-
-今回ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ ruby-1.4.x ã«å¯¾å¿œã¨ã—ã¦ãŠãã¾ã™ãŒï¼Œæ—§ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«æ¯”ã¹ã¦ï¼Œ
-ã»ã¨ã‚“ã©å¤‰æ›´ã¯ã‚りã¾ã›ã‚“.ruby-1.1c2 以上ãªã‚‰å‹•ãã¨æ€ã„ã¾ã™ï¼Žruby-1.5.x ã«ã¤
-ã„ã¦ã¯ãƒ†ã‚¹ãƒˆã—ã¦ã„ã¾ã›ã‚“.ãã®ãŸã‚,éžäº’æ›ã®å½±éŸ¿ãŒå‡ºã‚‹ã“ã¨ãŒã‚ã‚‹ã‹ã‚‚ã—れã¾ã›
-ã‚“ãŒï¼Œãã®å ´åˆã§ã‚‚å°‘ã—ã®ä¿®æ­£ã§å‹•ã‹ã›ã‚‹ã¨æ€ã„ã¾ã™ï¼Žçµ„ã¿è¾¼ã‚€ Tk ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ï¼Œ
-4.2 ã§ã‚‚ 8.0 ã§ã‚‚修正ãªãå‹•ã‹ã›ã‚‹ã¯ãšã§ã™ï¼ŽãŸã ã—,日本語版ã§ã®ç§»æ¤ã¨ãªã£ã¦
-ã„ã‚‹ãŸã‚,日本語化ã•れ㟠Tk ã‚’ã”利用ãã ã•ã„.スクリプトã®ãƒ†ã‚¹ãƒˆã¯ï¼Œæ—§ãƒãƒ¼ã‚¸ãƒ§
-ンã®éš›ã« Tk4.2jp 㨠Tk8.0jp ã®ä¸Šã§è¡Œã£ã¦ã„ã¾ã™ (完璧ã«ã§ã¯ãªã„ã§ã™ãŒ).今回
-ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã¯ ruby-1.4.x + Tk8.0jp 上ã§ã®ç°¡å˜ãªãƒ†ã‚¹ãƒˆã—ã‹è¡Œã£ã¦ã„ã¾ã›ã‚“ãŒï¼Œ
-修正ã¨ã„ã†ã»ã©ã®ä¿®æ­£ã¯ã—ã¦ã„ã¾ã›ã‚“ã®ã§å•題ã¯ãªã„ã¨è€ƒãˆã¦ã„ã¾ã™ï¼Ž
-
-本アーカイブã«å«ã¾ã‚Œã‚‹ã‚¹ã‚¯ãƒªãƒ—トã®å¤šãã¯ï¼Œå…ƒã¨ãªã£ã¦ã„ã‚‹ Tcl/Tk ç‰ˆã«æ¯”較的近
-ã„スクリプト記述ã¨ãªã‚‹ã‚ˆã†ã«ã—ã¦ã„ã¾ã™ï¼Žãã®ãŸã‚,Ruby/Tk ã®ã‚µãƒ³ãƒ—ルã¨è¨€ã†ã«
-ã¯ï¼Œã‚ã¾ã‚Š Ruby らã—ããªã„ã¨ã‚‚言ãˆã‚‹ã§ã—ょã†ï¼Žã«ã‚‚ã‹ã‹ã‚らãšï¼Œãã®ã‚ˆã†ãªè¨˜è¿°
-ã‚’å–ã£ã¦ã„ã‚‹ç†ç”±ã¯ï¼ŒRuby/Tk ã®ãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆä¸è¶³ã«ã‚りã¾ã™ï¼Ž
-
-Tcl/Tk ã«ã¯é©å½“ãªå‚考書ãŒä½•冊ã‹å­˜åœ¨ã—ã¦ã„ã¾ã™ã‹ã‚‰ï¼ŒRuby/Tk スクリプトを作æˆ
-ã™ã‚‹éš›ã¯ï¼Œãã®ã‚ˆã†ãª Tcl/Tk ã®å‚è€ƒæ›¸ã§æƒ…報を補ã„ãªãŒã‚‰ä½œæˆã™ã‚‹ã“ã¨ã«ãªã‚‹ã¨æ€
-ã„ã¾ã™ï¼Žå„ widget ã®ä½¿ç”¨ä¾‹ã¨ã—ã¦ï¼ŒTcl/Tk ã® widget-demo ã‚’å‚ç…§ã™ã‚‹ã“ã¨ã‚‚ã‚ã‚‹
-ã§ã—ょã†ï¼ŽRuby/Tk 版ã®è¨˜è¿°ã‚’ widget-demo ã‚’ Tcl/Tk 版ã®è¨˜è¿°ã«è¿‘ã„ã‚‚ã®ã«ã—ã¦
-ãŠã‘ã°ï¼Œãã®å¯¾æ¯”ã«ã‚ˆã£ã¦ï¼ŒRuby/Tk ã®ç†è§£ã‚’æ—©ã‚ã‚‹ã“ã¨ãŒã§ãã‚‹ã¨è€ƒãˆã‚‰ã‚Œã¾ã™ï¼Ž
-一旦 Ruby/Tk ã§ã® å„ widget ã®ä½¿ç”¨æ–¹æ³•ã‚’ç¿’å¾—ã—ã¦ã—ã¾ãˆã°ï¼ŒRuby らã—ã„スクリ
-プトを作æˆã™ã‚‹ã“ã¨ã¯é›£ã—ããªã„ã§ã—ょã†ï¼Žæœ¬ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ã‚¹ã‚¯ãƒªãƒ—トã¯ï¼ŒRuby/Tk
-を最åˆã«ç¿’å¾—ã™ã‚‹ã¾ã§ã®è¸å°ã¨ã—ã¦åˆ©ç”¨ã—ã¦ã„ãŸã ã‘れã°å¹¸ã„ã§ã™ï¼Ž
-
-widget-demo ã®ç§»æ¤ã«ã‚ãŸã£ã¦ã¯ï¼Œæ¬¡ã®æ–¹ã«ã‚‚ç§»æ¤ã—ãŸã‚¹ã‚¯ãƒªãƒ—トをæä¾›ã—ã¦ã„ãŸã 
-ãã¾ã—ãŸï¼Žã“ã“ã«æ„Ÿè¬ã®æ„を表ã—ã¾ã™ï¼Ž
-
- 立石@JAIST (ttate@jaist.ac.jp) ã•ã‚“
- å¹³æ¾ç¥¥å² (hiramatu@cdrom.co.jp) ã•ã‚“
-
-å¹³æ¾ã•ã‚“ã«ã‚ˆã‚‹ Ruby/Tk 入門㮠Web page (http://www.cdrom.co.jp/~hiramatu/)
-ã‚‚ Ruby/Tk ã®ç¿’å¾—ã«æœ‰ç”¨ã¨æ€ãˆã¾ã™ã®ã§ï¼Œãœã²ã”å‚ç…§ãã ã•ã„.
-
-ã¾ãŸï¼Œå‰æ©‹ (maebashi@iij.ad.jp) ã•ã‚“ã‚’ã¯ã˜ã‚ã¨ã—ã¦ï¼Œwidget-demo ã®ç§»æ¤ã«éš›ã—
-ã¦å¿…è¦ã¨ãªã£ãŸ Ruby ã® Tk 関連ライブラリ修正ã«ã¤ã„ã¦ï¼Œå•題点,ãƒã‚°ã®æŒ‡æ‘˜ã‚’ã—
-ã¦ã„ãŸã ã„ãŸæ–¹ã€…ã«ã‚‚感è¬è‡´ã—ã¾ã™ï¼Ž
-
-ãã—ã¦æœ€å¾Œã«æœ€å¤§ã®æ„Ÿè¬ã‚’ Ruby 設計者㮠ã¾ã¤ã‚‚㨠ゆãã²ã‚ (matz@netlab.co.jp)
-ã•ã‚“ã«æ§ã’ãŸã„ã¨æ€ã„ã¾ã™ï¼Ž
+ ±Ê°æ¡÷ÃÎǽ¡¥¶å¹©Âç (nagai@ai.kyutech.ac.jp)
+
+ɸ½àÇÛÉۤΠTcl/Tk ³ÈÄ¥¥Ñ¥Ã¥±¡¼¥¸¤ò¼è¤ê¹þ¤ó¤À Ruby (°Ê²¼ Ruby/Tk ¤È¸Æ¤Ó¤Þ¤¹)
+¤Ç¤Ï¡¤Tk widget ¤òÍѤ¤¤¿ GUI ¤ÎºîÀ®¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥¼ÂºÝ¤Ë GUI ¤òºîÀ®
+¤·¤Æ¤¤¤¯¾ì¹ç¤Ë¤ÏÍÍ¡¹¤Ê¼ÂÎ㤬¥µ¥ó¥×¥ë¤È¤·¤ÆÂ¸ºß¤¹¤ë¤ÈÊØÍø¤Ê¤Î¤Ç¤¹¤¬¡¤Ruby/Tk
+¤Ë¤Ï¤½¤Î¤è¤¦¤ÊŬÅö¤Ê¥µ¥ó¥×¥ë¥¹¥¯¥ê¥×¥È½¸¹ç¤Ï¸ºß¤·¤Þ¤»¤ó¤Ç¤·¤¿¡¥¤½¤ì¤ËÂФ·¡¤
+³ÈÄ¥¥Ñ¥Ã¥±¡¼¥¸¤Î¸µ¤Ç¤¢¤ë Tcl/Tk ¤Ë¤Ï¡¤Tk widget ¤òÍѤ¤¤Æ¤É¤Î¤è¤¦¤Ê¤³¤È¤¬¤Ç
+¤­¤ë¤«¤ò¼¨¤¹¤â¤Î¤È¤·¤Æ widget-demo ¤¬Â¸ºß¤·¤ª¤ê¡¤Tcl/Tk ¤òÍѤ¤¤¿ GUI ¤ÎºîÀ®
+¤ò½¬ÆÀ¤¹¤ëºÝ¤ÎÂåɽŪ¥µ¥ó¥×¥ë¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥ËÜ¥¢¡¼¥«¥¤¥Ö¤Ï¡¤Ruby/Tk ¤Î½¬ÆÀ¤Î
+¤¿¤á¤ÎÂåɽŪ¤Ê¥µ¥ó¥×¥ë¥¹¥¯¥ê¥×¥È¤È¤¹¤Ù¤¯¡¤Tcl/Tk ¤Î widget-demo ¤ò°Ü¿¢¤·¤¿¤â
+¤Î¤Ç¤¹¡¥
+
+º£²ó¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï ruby-1.4.x ¤ËÂбþ¤È¤·¤Æ¤ª¤­¤Þ¤¹¤¬¡¤µì¥Ð¡¼¥¸¥ç¥ó¤ËÈæ¤Ù¤Æ¡¤
+¤Û¤È¤ó¤ÉÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡¥ruby-1.1c2 °Ê¾å¤Ê¤éư¤¯¤È»×¤¤¤Þ¤¹¡¥ruby-1.5.x ¤Ë¤Ä
+¤¤¤Æ¤Ï¥Æ¥¹¥È¤·¤Æ¤¤¤Þ¤»¤ó¡¥¤½¤Î¤¿¤á¡¤Èó¸ß´¹¤Î±Æ¶Á¤¬½Ð¤ë¤³¤È¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»
+¤ó¤¬¡¤¤½¤Î¾ì¹ç¤Ç¤â¾¯¤·¤Î½¤Àµ¤Çư¤«¤»¤ë¤È»×¤¤¤Þ¤¹¡¥ÁȤ߹þ¤à Tk ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¤
+4.2 ¤Ç¤â 8.0 ¤Ç¤â½¤Àµ¤Ê¤¯Æ°¤«¤»¤ë¤Ï¤º¤Ç¤¹¡¥¤¿¤À¤·¡¤ÆüËܸìÈǤǤΰܿ¢¤È¤Ê¤Ã¤Æ
+¤¤¤ë¤¿¤á¡¤ÆüËܸ첽¤µ¤ì¤¿ Tk ¤ò¤´ÍøÍѤ¯¤À¤µ¤¤¡¥¥¹¥¯¥ê¥×¥È¤Î¥Æ¥¹¥È¤Ï¡¤µì¥Ð¡¼¥¸¥ç
+¥ó¤ÎºÝ¤Ë Tk4.2jp ¤È Tk8.0jp ¤Î¾å¤Ç¹Ô¤Ã¤Æ¤¤¤Þ¤¹ (´°àú¤Ë¤Ç¤Ï¤Ê¤¤¤Ç¤¹¤¬)¡¥º£²ó
+¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï ruby-1.4.x + Tk8.0jp ¾å¤Ç¤Î´Êñ¤Ê¥Æ¥¹¥È¤·¤«¹Ô¤Ã¤Æ¤¤¤Þ¤»¤ó¤¬¡¤
+½¤Àµ¤È¤¤¤¦¤Û¤É¤Î½¤Àµ¤Ï¤·¤Æ¤¤¤Þ¤»¤ó¤Î¤ÇÌäÂê¤Ï¤Ê¤¤¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡¥
+
+ËÜ¥¢¡¼¥«¥¤¥Ö¤Ë´Þ¤Þ¤ì¤ë¥¹¥¯¥ê¥×¥È¤Î¿¤¯¤Ï¡¤¸µ¤È¤Ê¤Ã¤Æ¤¤¤ë Tcl/Tk ÈǤËÈæ³ÓŪ¶á
+¤¤¥¹¥¯¥ê¥×¥Èµ­½Ò¤È¤Ê¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡¥¤½¤Î¤¿¤á¡¤Ruby/Tk ¤Î¥µ¥ó¥×¥ë¤È¸À¤¦¤Ë
+¤Ï¡¤¤¢¤Þ¤ê Ruby ¤é¤·¤¯¤Ê¤¤¤È¤â¸À¤¨¤ë¤Ç¤·¤ç¤¦¡¥¤Ë¤â¤«¤«¤ï¤é¤º¡¤¤½¤Î¤è¤¦¤Êµ­½Ò
+¤ò¼è¤Ã¤Æ¤¤¤ëÍýͳ¤Ï¡¤Ruby/Tk ¤Î¥É¥­¥å¥á¥ó¥ÈÉÔ­¤Ë¤¢¤ê¤Þ¤¹¡¥
+
+Tcl/Tk ¤Ë¤ÏŬÅö¤Ê»²¹Í½ñ¤¬²¿ºý¤«Â¸ºß¤·¤Æ¤¤¤Þ¤¹¤«¤é¡¤Ruby/Tk ¥¹¥¯¥ê¥×¥È¤òºîÀ®
+¤¹¤ëºÝ¤Ï¡¤¤½¤Î¤è¤¦¤Ê Tcl/Tk ¤Î»²¹Í½ñ¤Ç¾ðÊó¤òÊ䤤¤Ê¤¬¤éºîÀ®¤¹¤ë¤³¤È¤Ë¤Ê¤ë¤È»×
+¤¤¤Þ¤¹¡¥³Æ widget ¤Î»ÈÍÑÎã¤È¤·¤Æ¡¤Tcl/Tk ¤Î widget-demo ¤ò»²¾È¤¹¤ë¤³¤È¤â¤¢¤ë
+¤Ç¤·¤ç¤¦¡¥Ruby/Tk ÈǤε­½Ò¤ò widget-demo ¤ò Tcl/Tk ÈǤε­½Ò¤Ë¶á¤¤¤â¤Î¤Ë¤·¤Æ
+¤ª¤±¤Ð¡¤¤½¤ÎÂÐÈæ¤Ë¤è¤Ã¤Æ¡¤Ruby/Tk ¤ÎÍý²ò¤òÁá¤á¤ë¤³¤È¤¬¤Ç¤­¤ë¤È¹Í¤¨¤é¤ì¤Þ¤¹¡¥
+°ìö Ruby/Tk ¤Ç¤Î ³Æ widget ¤Î»ÈÍÑÊýË¡¤ò½¬ÆÀ¤·¤Æ¤·¤Þ¤¨¤Ð¡¤Ruby ¤é¤·¤¤¥¹¥¯¥ê
+¥×¥È¤òºîÀ®¤¹¤ë¤³¤È¤ÏÆñ¤·¤¯¤Ê¤¤¤Ç¤·¤ç¤¦¡¥ËÜ¥¢¡¼¥«¥¤¥Ö¤Î¥¹¥¯¥ê¥×¥È¤Ï¡¤Ruby/Tk
+¤òºÇ½é¤Ë½¬ÆÀ¤¹¤ë¤Þ¤Ç¤ÎÆ§Âæ¤È¤·¤ÆÍøÍѤ·¤Æ¤¤¤¿¤À¤±¤ì¤Ð¹¬¤¤¤Ç¤¹¡¥
+
+widget-demo ¤Î°Ü¿¢¤Ë¤¢¤¿¤Ã¤Æ¤Ï¡¤¼¡¤ÎÊý¤Ë¤â°Ü¿¢¤·¤¿¥¹¥¯¥ê¥×¥È¤òÄ󶡤·¤Æ¤¤¤¿¤À
+¤­¤Þ¤·¤¿¡¥¤³¤³¤Ë´¶¼Õ¤Î°Õ¤òɽ¤·¤Þ¤¹¡¥
+
+ ΩÀС÷JAIST (ttate@jaist.ac.jp) ¤µ¤ó
+ Ê¿¾¾¾Í»Ë (hiramatu@cdrom.co.jp) ¤µ¤ó
+
+Ê¿¾¾¤µ¤ó¤Ë¤è¤ë Ruby/Tk ÆþÌç¤Î Web page (http://www.cdrom.co.jp/~hiramatu/)
+¤â Ruby/Tk ¤Î½¬ÆÀ¤ËÍ­ÍѤȻפ¨¤Þ¤¹¤Î¤Ç¡¤¤¼¤Ò¤´»²¾È¤¯¤À¤µ¤¤¡¥
+
+¤Þ¤¿¡¤Á°¶¶ (maebashi@iij.ad.jp) ¤µ¤ó¤ò¤Ï¤¸¤á¤È¤·¤Æ¡¤widget-demo ¤Î°Ü¿¢¤ËºÝ¤·
+¤ÆÉ¬ÍפȤʤä¿ Ruby ¤Î Tk ´ØÏ¢¥é¥¤¥Ö¥é¥ê½¤Àµ¤Ë¤Ä¤¤¤Æ¡¤ÌäÂêÅÀ¡¤¥Ð¥°¤Î»ØÅ¦¤ò¤·
+¤Æ¤¤¤¿¤À¤¤¤¿Êý¡¹¤Ë¤â´¶¼ÕÃפ·¤Þ¤¹¡¥
+
+¤½¤·¤ÆºÇ¸å¤ËºÇÂç¤Î´¶¼Õ¤ò Ruby À߷׼ԤΠ¤Þ¤Ä¤â¤È ¤æ¤­¤Ò¤í (matz@netlab.co.jp)
+¤µ¤ó¤ËÊû¤²¤¿¤¤¤È»×¤¤¤Þ¤¹¡¥
diff --git a/ext/tk/sample/demos-jp/README.1st b/ext/tk/sample/demos-jp/README.1st
index 68caf8b14d..60b278d7b6 100644
--- a/ext/tk/sample/demos-jp/README.1st
+++ b/ext/tk/sample/demos-jp/README.1st
@@ -1,20 +1,20 @@
-ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ã¯ Ruby/Tk ã®ãƒ‡ãƒ¢ã‚¹ã‚¯ãƒªãƒ—トãŒåŽã‚られã¦ã„ã¾ã™ï¼Ž
+¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï Ruby/Tk ¤Î¥Ç¥â¥¹¥¯¥ê¥×¥È¤¬¼ý¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡¥
-'.rb' ã¨ã„ã†æ‹¡å¼µå­ã‚’æŒã£ã¦ã„るファイルã¯ï¼Œãƒ©ãƒ³ãƒãƒ£â”€ã‚¹ã‚¯ãƒªãƒ—トã§
-ã‚ã‚‹ 'widget' ã‹ã‚‰å‘¼ã³å‡ºã•れるサブスクリプトã§ã™ï¼Žãれãžã‚Œç‹¬ç«‹ã«
-ã¯å‹•ãã¾ã›ã‚“.'widget' スクリプトã‹ã‚‰å‘¼ã³å‡ºã—ã¦ãã ã•ã„.
+'.rb' ¤È¤¤¤¦³ÈÄ¥»Ò¤ò»ý¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ï¡¤¥é¥ó¥Á¥ã¨¡¥¹¥¯¥ê¥×¥È¤Ç
+¤¢¤ë 'widget' ¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤ë¥µ¥Ö¥¹¥¯¥ê¥×¥È¤Ç¤¹¡¥¤½¤ì¤¾¤ìÆÈΩ¤Ë
+¤Ïư¤­¤Þ¤»¤ó¡¥'widget' ¥¹¥¯¥ê¥×¥È¤«¤é¸Æ¤Ó½Ð¤·¤Æ¤¯¤À¤µ¤¤¡¥
-ã‚‚ã—ランãƒãƒ£â”€ã‚¹ã‚¯ãƒªãƒ—ト 'widget' ã®èµ·å‹•ã¨åŒæ™‚ã«ã„ãã¤ã‹ã®ã‚µãƒ–ス
-クリプトを起動ã—ãŸã‘れã°ï¼Œãã®ã‚µãƒ–スクリプトã®åå‰ã‚’引数ã¨ã—ã¦ä¸Ž
-ãˆã¦ãã ã•ã„.
-( 例: /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
-ã‚µãƒ–ã‚¹ã‚¯ãƒªãƒ—ãƒˆã®æ‹¡å¼µå­ '.rb' ã¯çœç•¥ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ï¼Ž
-( 例: /usr/local/bin/ruby widget button entry1 text )
+¤â¤·¥é¥ó¥Á¥ã¨¡¥¹¥¯¥ê¥×¥È 'widget' ¤Îµ¯Æ°¤ÈƱ»þ¤Ë¤¤¤¯¤Ä¤«¤Î¥µ¥Ö¥¹
+¥¯¥ê¥×¥È¤òµ¯Æ°¤·¤¿¤±¤ì¤Ð¡¤¤½¤Î¥µ¥Ö¥¹¥¯¥ê¥×¥È¤Î̾Á°¤ò°ú¿ô¤È¤·¤ÆÍ¿
+¤¨¤Æ¤¯¤À¤µ¤¤¡¥
+( Îã: /usr/local/bin/ruby widget button.rb entry1.rb text.rb )
+¥µ¥Ö¥¹¥¯¥ê¥×¥È¤Î³ÈÄ¥»Ò '.rb' ¤Ï¾Êά¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡¥
+( Îã: /usr/local/bin/ruby widget button entry1 text )
-ã‚‚ã—ランãƒãƒ£â”€ã‚¹ã‚¯ãƒªãƒ—トã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒå¿…è¦ãªã„å ´åˆã«ã¯ï¼Œ'-n' オ
-プションを与ãˆã¦ãã ã•ã„.
-( 例: /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
+¤â¤·¥é¥ó¥Á¥ã¨¡¥¹¥¯¥ê¥×¥È¤Î¥¦¥£¥ó¥É¥¦¤¬É¬Íפʤ¤¾ì¹ç¤Ë¤Ï¡¤'-n' ¥ª
+¥×¥·¥ç¥ó¤òÍ¿¤¨¤Æ¤¯¤À¤µ¤¤¡¥
+( Îã: /usr/local/bin/ruby widget -n button.rb entry1.rb text.rb )
-ä»–ã®ãƒ•ァイル (browse1 ã‚„ hello ãªã©) ã¯å˜ç‹¬ã§å‹•ã‹ã™ã“ã¨ãŒå¯èƒ½ã§ã™ï¼Ž
+¾¤Î¥Õ¥¡¥¤¥ë (browse1 ¤ä hello ¤Ê¤É) ¤ÏñÆÈ¤Çư¤«¤¹¤³¤È¤¬²Äǽ¤Ç¤¹¡¥
2004/04/14 Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/sample/demos-jp/anilabel.rb b/ext/tk/sample/demos-jp/anilabel.rb
index c882f43f7e..d2f5b12041 100644
--- a/ext/tk/sample/demos-jp/anilabel.rb
+++ b/ext/tk/sample/demos-jp/anilabel.rb
@@ -1,16 +1,16 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# animated label widget demo (called by 'widget')
#
# based on Tcl/Tk8.5a2 widget demos
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($anilabel_demo) && $anilabel_demo
$anilabel_demo.destroy
$anilabel_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$anilabel_demo = TkToplevel.new {|w|
title("Animated Label Demonstration")
iconname("anilabel")
@@ -19,20 +19,20 @@ $anilabel_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($anilabel_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "下ã«ã¯4ã¤ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãƒ©ãƒ™ãƒ«ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚å·¦å´ã«ã‚るラベルã¯ã€å†…部ã®ãƒ†ã‚­ã‚¹ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’スクロールã—ãŸã‚ˆã†ã«è¦‹ã›ã‚‹ã“ã¨ã§å‹•ãを付ã‘ã¦ã„ã¾ã™ã€‚å³å´ã®ãƒ©ãƒ™ãƒ«ã¯ã€è¡¨ç¤ºã™ã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’変化ã•ã›ã‚‹ã“ã¨ã§å‹•ãを与ãˆã¦ã„ã¾ã™ã€‚"
+ text "²¼¤Ë¤Ï4¤Ä¤Î¥¢¥Ë¥á¡¼¥·¥ç¥ó¥é¥Ù¥ë¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Ë¤¢¤ë¥é¥Ù¥ë¤Ï¡¢ÆâÉô¤Î¥Æ¥­¥¹¥È¥á¥Ã¥»¡¼¥¸¤ò¥¹¥¯¥í¡¼¥ë¤·¤¿¤è¤¦¤Ë¸«¤»¤ë¤³¤È¤Çư¤­¤òÉÕ¤±¤Æ¤¤¤Þ¤¹¡£±¦Â¦¤Î¥é¥Ù¥ë¤Ï¡¢É½¼¨¤¹¤ë¥¤¥á¡¼¥¸¤òÊѲ½¤µ¤»¤ë¤³¤È¤Çư¤­¤òÍ¿¤¨¤Æ¤¤¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $anilabel_demo
$anilabel_demo = nil
@@ -41,13 +41,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'anilabel'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# label demo 用フレーム生æˆ
+# 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',
@@ -123,7 +123,7 @@ class AnimatedImageLabel < AnimatedTextLabel
private :_animation_callback
end
-# label 生æˆ
+# label À¸À®
l1 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:ridge,
:font=>{:family=>'Courier', :size=>10})
l2 = AnimatedTextLabel.new(f_left, :borderwidth=>4, :relief=>:groove,
diff --git a/ext/tk/sample/demos-jp/aniwave.rb b/ext/tk/sample/demos-jp/aniwave.rb
index 866316c331..973c1be1e9 100644
--- a/ext/tk/sample/demos-jp/aniwave.rb
+++ b/ext/tk/sample/demos-jp/aniwave.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# animated wave demo (called by 'widget')
#
@@ -24,15 +24,15 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text 'ã“ã®ãƒ‡ãƒ¢ã§ã¯ã€ãƒ©ã‚¤ãƒ³ã‚¢ã‚¤ãƒ†ãƒ ãŒä¸€ã¤ã ã‘æã‹ã‚ŒãŸã‚­ãƒ£ãƒ³ãƒã‚¹ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚アニメーション処ç†ã¯ã€ãã®ãƒ©ã‚¤ãƒ³ã‚¢ã‚¤ãƒ†ãƒ ã®åº§æ¨™å€¤ã‚’変更ã™ã‚‹ã“ã¨ã§å®Ÿç¾ã—ã¦ã„ã¾ã™ã€‚'
+ text '¤³¤Î¥Ç¥â¤Ç¤Ï¡¢¥é¥¤¥ó¥¢¥¤¥Æ¥à¤¬°ì¤Ä¤À¤±ÉÁ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹¥¦¥£¥¸¥§¥Ã¥È¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¢¥Ë¥á¡¼¥·¥ç¥ó½èÍý¤Ï¡¢¤½¤Î¥é¥¤¥ó¥¢¥¤¥Æ¥à¤ÎºÂɸÃͤòÊѹ¹¤¹¤ë¤³¤È¤Ç¼Â¸½¤·¤Æ¤¤¤Þ¤¹¡£'
}
msg.pack('side'=>'top')
# create frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $aniwave_demo
$aniwave_demo = nil
@@ -41,7 +41,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'aniwave'}
}.pack('side'=>'left', 'expand'=>'yes')
diff --git a/ext/tk/sample/demos-jp/arrow.rb b/ext/tk/sample/demos-jp/arrow.rb
index 2995f96d54..a1694d019d 100644
--- a/ext/tk/sample/demos-jp/arrow.rb
+++ b/ext/tk/sample/demos-jp/arrow.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# arrowhead widget demo (called by 'widget')
#
@@ -91,13 +91,13 @@ def arrowSetup(c)
v.count += 1
end
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($arrow_demo) && $arrow_demo
$arrow_demo.destroy
$arrow_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$arrow_demo = TkToplevel.new {|w|
title("Arrowhead Editor Demonstration")
iconname("arrow")
@@ -106,17 +106,17 @@ $arrow_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($arrow_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
- 'text'=>"ã“ã® widget ã§ã€ã‚­ãƒ£ãƒ³ãƒã‚¹ã§ä½¿ã‚れるラインã«ã¤ã„ã¦æ§˜ã€…ãªå¹…や矢å°ã®é ­ã®å½¢ã‚’試ã—ã¦ã¿ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç·šã®å¹…や矢å°ã®å½¢ã‚’変ãˆã‚‹ã«ã¯ã€æ‹¡å¤§ã•れãŸçŸ¢å°ã«ã¤ã„ã¦ã„ã‚‹ 3ã¤ã®å››è§’をドラッグã—ã¦ãã ã•ã„。å³å´ã®çŸ¢å°ã¯æ™®é€šã®å¤§ãã•ã§ã®ã‚µãƒ³ãƒ—ルを示ã—ã¦ã„ã¾ã™ã€‚下ã®ãƒ†ã‚­ã‚¹ãƒˆã¯ãƒ©ã‚¤ãƒ³ã‚¢ã‚¤ãƒ†ãƒ ã«å¯¾ã™ã‚‹è¨­å®šã‚ªãƒ—ションã§ã™ã€‚"){
+ 'text'=>"¤³¤Î widget ¤Ç¡¢¥­¥ã¥ó¥Ð¥¹¤Ç»È¤ï¤ì¤ë¥é¥¤¥ó¤Ë¤Ä¤¤¤ÆÍÍ¡¹¤ÊÉý¤äÌð°õ¤ÎƬ¤Î·Á¤ò»î¤·¤Æ¤ß¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Àþ¤ÎÉý¤äÌð°õ¤Î·Á¤òÊѤ¨¤ë¤Ë¤Ï¡¢³ÈÂ礵¤ì¤¿Ìð°õ¤Ë¤Ä¤¤¤Æ¤¤¤ë 3¤Ä¤Î»Í³Ñ¤ò¥É¥é¥Ã¥°¤·¤Æ¤¯¤À¤µ¤¤¡£±¦Â¦¤ÎÌð°õ¤ÏÉáÄ̤ÎÂ礭¤µ¤Ç¤Î¥µ¥ó¥×¥ë¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Æ¥­¥¹¥È¤Ï¥é¥¤¥ó¥¢¥¤¥Æ¥à¤ËÂФ¹¤ëÀßÄꥪ¥×¥·¥ç¥ó¤Ç¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$arrow_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $arrow_demo
$arrow_demo = nil
@@ -125,18 +125,18 @@ $arrow_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'arrow'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$arrow_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# canvas 設定
+# 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,
diff --git a/ext/tk/sample/demos-jp/bind.rb b/ext/tk/sample/demos-jp/bind.rb
index efba6e6c01..99e5c1718c 100644
--- a/ext/tk/sample/demos-jp/bind.rb
+++ b/ext/tk/sample/demos-jp/bind.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# text (tag bindings) widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($bind_demo) && $bind_demo
$bind_demo.destroy
$bind_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$bind_demo = TkToplevel.new {|w|
title("Text Demonstration - Tag Bindings")
iconname("bind")
@@ -18,11 +18,11 @@ $bind_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($bind_demo).pack(:fill=>:both, :expand=>true)
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $bind_demo
$bind_demo = nil
@@ -31,20 +31,20 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'bind'}
}.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
@@ -57,7 +57,7 @@ txt = TkText.new(base_frame){|t|
}
pack('expand'=>'yes', 'fill'=>'both')
- # スタイル設定
+ # ¥¹¥¿¥¤¥ëÀßÄê
if TkWinfo.depth($root).to_i > 1
tagstyle_bold = {'background'=>'#43ce80', 'relief'=>'raised',
'borderwidth'=>1}
@@ -67,25 +67,25 @@ txt = TkText.new(base_frame){|t|
tagstyle_normal = {'foreground'=>'', 'background'=>''}
end
- # テキスト挿入
- insert 'insert', "テキストwidgetã®è¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«ã‚’制御ã™ã‚‹ã®ã¨åŒã˜ã‚¿ã‚°ã®ãƒ¡ã‚«ãƒ‹ã‚ºãƒ ã‚’使ã£ã¦ã€ãƒ†ã‚­ã‚¹ãƒˆã«Tclã®ã‚³ãƒžãƒ³ãƒ‰ã‚’割り当ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“れã«ã‚ˆã‚Šã€ãƒžã‚¦ã‚¹ã‚„キーボードã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã§ç‰¹å®šã®Tclã®ã‚³ãƒžãƒ³ãƒ‰ãŒå®Ÿè¡Œã•れるよã†ã«ãªã‚Šã¾ã™ã€‚例ãˆã°ã€ä¸‹ã®ã‚­ãƒ£ãƒ³ãƒã‚¹ã®ãƒ‡ãƒ¢ãƒ—ログラムã«ã¤ã„ã¦ã®èª¬æ˜Žæ–‡ã«ã¯ãã®ã‚ˆã†ãªã‚¿ã‚°ãŒã¤ã„ã¦ã„ã¾ã™ã€‚マウスを説明文ã®ä¸Šã«æŒã£ã¦ã„ãã¨èª¬æ˜Žæ–‡ãŒå…‰ã‚Šã€ãƒœã‚¿ãƒ³1を押ã™ã¨ãã®èª¬æ˜Žã®ãƒ‡ãƒ¢ãŒå§‹ã¾ã‚Šã¾ã™ã€‚
+ # ¥Æ¥­¥¹¥ÈÁÞÆþ
+ insert 'insert', "¥Æ¥­¥¹¥Èwidget¤Îɽ¼¨¥¹¥¿¥¤¥ë¤òÀ©¸æ¤¹¤ë¤Î¤ÈƱ¤¸¥¿¥°¤Î¥á¥«¥Ë¥º¥à¤ò»È¤Ã¤Æ¡¢¥Æ¥­¥¹¥È¤ËTcl¤Î¥³¥Þ¥ó¥É¤ò³ä¤êÅö¤Æ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥Þ¥¦¥¹¤ä¥­¡¼¥Ü¡¼¥É¤Î¥¢¥¯¥·¥ç¥ó¤ÇÆÃÄê¤ÎTcl¤Î¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢²¼¤Î¥­¥ã¥ó¥Ð¥¹¤Î¥Ç¥â¥×¥í¥°¥é¥à¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀʸ¤Ë¤Ï¤½¤Î¤è¤¦¤Ê¥¿¥°¤¬¤Ä¤¤¤Æ¤¤¤Þ¤¹¡£¥Þ¥¦¥¹¤òÀâÌÀʸ¤Î¾å¤Ë»ý¤Ã¤Æ¤¤¤¯¤ÈÀâÌÀʸ¤¬¸÷¤ê¡¢¥Ü¥¿¥ó1¤ò²¡¤¹¤È¤½¤ÎÀâÌÀ¤Î¥Ç¥â¤¬»Ï¤Þ¤ê¤Þ¤¹¡£
"
- insert('end', '1. キャンãƒã‚¹ widget ã«ä½œã‚‹ã“ã¨ã®ã§ãるアイテムã®ç¨®é¡žå…¨ã¦ã«é–¢ã™ã‚‹ã‚µãƒ³ãƒ—ル。', (d1 = TkTextTag.new(t)) )
+ insert('end', '1. ¥­¥ã¥ó¥Ð¥¹ widget ¤Ëºî¤ë¤³¤È¤Î¤Ç¤­¤ë¥¢¥¤¥Æ¥à¤Î¼ïÎàÁ´¤Æ¤Ë´Ø¤¹¤ë¥µ¥ó¥×¥ë¡£', (d1 = TkTextTag.new(t)) )
insert('end', "\n\n")
- insert('end', '2. ç°¡å˜ãª 2次元ã®ãƒ—ロット。データを表ã™ç‚¹ã‚’å‹•ã‹ã™ã“ã¨ãŒã§ãる。', (d2 = TkTextTag.new(t)) )
+ 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. キャンãƒã‚¹ãŒã©ã†ã‚„ã£ã¦ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã™ã‚‹ã®ã‹ã‚’示ã™ã‚°ãƒªãƒƒãƒ‰ã€‚',
+ '6. ¥­¥ã¥ó¥Ð¥¹¤¬¤É¤¦¤ä¤Ã¤Æ¥¹¥¯¥í¡¼¥ë¤¹¤ë¤Î¤«¤ò¼¨¤¹¥°¥ê¥Ã¥É¡£',
(d6 = TkTextTag.new(t)) )
# binding
diff --git a/ext/tk/sample/demos-jp/bitmap.rb b/ext/tk/sample/demos-jp/bitmap.rb
index d84e9a5f09..1193e8de24 100644
--- a/ext/tk/sample/demos-jp/bitmap.rb
+++ b/ext/tk/sample/demos-jp/bitmap.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# bitmap widget demo (called by 'widget')
#
@@ -25,13 +25,13 @@ def bitmapRow(w,*args)
}
end
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($bitmap_demo) && $bitmap_demo
$bitmap_demo.destroy
$bitmap_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$bitmap_demo = TkToplevel.new {|w|
title("Bitmap Demonstration")
iconname("bitmap")
@@ -40,17 +40,17 @@ $bitmap_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($bitmap_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
- 'text'=>"ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ã€Tk ã«çµ„ã¿è¾¼ã¾ã‚ŒãŸã™ã¹ã¦ã®ãƒ“ットマップãŒã€ãれらã®åå‰ã¨å…±ã«è¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚Tcl ã®ã‚¹ã‚¯ãƒªãƒ—ト中ã§ã¯ã€ãれãžã‚Œã®åå‰ã‚’用ã„ã¦å‚ç…§ã—ã¾ã™ã€‚"){
+ 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¡¢Tk ¤ËÁȤ߹þ¤Þ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ó¥Ã¥È¥Þ¥Ã¥×¤¬¡¢¤½¤ì¤é¤Î̾Á°¤È¶¦¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Tcl ¤Î¥¹¥¯¥ê¥×¥ÈÃæ¤Ç¤Ï¡¢¤½¤ì¤¾¤ì¤Î̾Á°¤òÍѤ¤¤Æ»²¾È¤·¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$bitmap_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $bitmap_demo
$bitmap_demo = nil
@@ -59,13 +59,13 @@ $bitmap_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'bitmap'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$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-jp/browse1 b/ext/tk/sample/demos-jp/browse1
index 568892e4a8..03e251035a 100644
--- a/ext/tk/sample/demos-jp/browse1
+++ b/ext/tk/sample/demos-jp/browse1
@@ -1,16 +1,16 @@
#!/usr/bin/env ruby
# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
+# This script generates a directory browser, which lists the working
+# directory and allow you to open files or subdirectories by
+# double-clicking.
require 'tk'
-# Create a scrollbar on the right side of the main window and a listbox
+# Create a scrollbar on the right side of the main window and a listbox
# on the left side.
-listbox = TkListbox.new(nil, 'relief'=>'sunken',
+listbox = TkListbox.new(nil, 'relief'=>'sunken',
'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
TkScrollbar.new(nil, 'command'=>proc{|*args| l.yview *args}) {|s|
pack('side'=>'right', 'fill'=>'y')
@@ -23,10 +23,10 @@ listbox = TkListbox.new(nil, 'relief'=>'sunken',
root = TkRoot.new
root.minsize(1,1)
-# The procedure below is invoked to open a browser on a given file; if the
-# file is a directory then another instance of this program is invoked; if
-# the file is a regular file then the Mx editor is invoked to display
-# the file.
+# The procedure below is invoked to open a browser on a given file; if the
+# file is a directory then another instance of this program is invoked; if
+# the file is a regular file then the Mx editor is invoked to display
+# the file.
def browse (dir, file)
file = dir + File::Separator + file if dir != '.'
@@ -46,7 +46,7 @@ def browse (dir, file)
end
end
-# Fill the listbox with a list of all the files in the directory (run
+# Fill the listbox with a list of all the files in the directory (run
# the "ls" command to get that information).
dir = ARGV[0] ? ARGV[0] : '.'
@@ -57,7 +57,7 @@ open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
# Set up bindings for the browser.
Tk.bind_all('Control-c', proc{root.destroy})
-listbox.bind('Double-Button-1',
+listbox.bind('Double-Button-1',
proc{TkSelection.get.each{|f| browse dir, f}})
Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/browse2 b/ext/tk/sample/demos-jp/browse2
index 1a511c8d29..edad04dbcb 100644
--- a/ext/tk/sample/demos-jp/browse2
+++ b/ext/tk/sample/demos-jp/browse2
@@ -1,9 +1,9 @@
#!/usr/bin/env ruby
# browse --
-# This script generates a directory browser, which lists the working
-# directory and allow you to open files or subdirectories by
-# double-clicking.
+# This script generates a directory browser, which lists the working
+# directory and allow you to open files or subdirectories by
+# double-clicking.
require 'tk'
@@ -19,9 +19,9 @@ class Browse
title('Browse : ' + dir)
}
- # Create a scrollbar on the right side of the main window and a listbox
+ # Create a scrollbar on the right side of the main window and a listbox
# on the left side.
- list = TkListbox.new(base, 'relief'=>'sunken',
+ list = TkListbox.new(base, 'relief'=>'sunken',
'width'=>20, 'height'=>20, 'setgrid'=>'yes') {|l|
TkScrollbar.new(base, 'command'=>proc{|*args| l.yview *args}) {|s|
pack('side'=>'right', 'fill'=>'y')
@@ -30,7 +30,7 @@ class Browse
pack('side'=>'left', 'fill'=>'both', 'expand'=>'yes')
- # Fill the listbox with a list of all the files in the directory (run
+ # Fill the listbox with a list of all the files in the directory (run
# the "ls" command to get that information).
open("|ls -a #{dir}", 'r'){|fid| fid.readlines}.each{|fname|
l.insert('end', fname.chomp)
@@ -44,14 +44,14 @@ class Browse
Browse::BROWSE_WIN_COUNTER.to_i - 1
})
base.bind('Control-c', proc{base.destroy})
- list.bind('Double-Button-1',
+ list.bind('Double-Button-1',
proc{TkSelection.get.each{|f| self.browse dir, f}})
end
- # The method below is invoked to open a browser on a given file; if the
- # file is a directory then another instance of this program is invoked; if
- # the file is a regular file then the Mx editor is invoked to display
- # the file.
+ # The method below is invoked to open a browser on a given file; if the
+ # file is a directory then another instance of this program is invoked; if
+ # the file is a regular file then the Mx editor is invoked to display
+ # the file.
def browse (dir, file)
file = dir + File::Separator + file if dir != '.'
type = File.ftype(file)
diff --git a/ext/tk/sample/demos-jp/button.rb b/ext/tk/sample/demos-jp/button.rb
index 301100b057..87ced45810 100644
--- a/ext/tk/sample/demos-jp/button.rb
+++ b/ext/tk/sample/demos-jp/button.rb
@@ -1,36 +1,36 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# button widget demo (called by 'widget')
#
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($button_demo) && $button_demo
$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'
justify 'left'
- text "ボタンをクリックã™ã‚‹ã¨ã€ãƒœã‚¿ãƒ³ã®èƒŒæ™¯è‰²ãŒãã®ãƒœã‚¿ãƒ³ã«æ›¸ã‹ã‚Œã¦ã„る色ã«ãªã‚Šã¾ã™ã€‚ボタンã‹ã‚‰ãƒœã‚¿ãƒ³ã¸ã®ç§»å‹•ã¯ã‚¿ãƒ–を押ã™ã“ã¨ã§ã‚‚å¯èƒ½ã§ã™ã€‚ã¾ãŸã‚¹ãƒšãƒ¼ã‚¹ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+ text "¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¥Ü¥¿¥ó¤ÎÇØ·Ê¿§¤¬¤½¤Î¥Ü¥¿¥ó¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¿§¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ü¥¿¥ó¤«¤é¥Ü¥¿¥ó¤Ø¤Î°Üư¤Ï¥¿¥Ö¤ò²¡¤¹¤³¤È¤Ç¤â²Äǽ¤Ç¤¹¡£¤Þ¤¿¥¹¥Ú¡¼¥¹¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
$button_buttons = Tk::Frame.new($button_demo) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $button_demo
$button_demo = nil
@@ -39,13 +39,13 @@ $button_buttons = Tk::Frame.new($button_demo) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'button'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# button 生æˆ
+# button À¸À®
TkButton.new($button_demo){
text "Peach Puff"
width 10
diff --git a/ext/tk/sample/demos-jp/check.rb b/ext/tk/sample/demos-jp/check.rb
index 422e898ec9..762b99778b 100644
--- a/ext/tk/sample/demos-jp/check.rb
+++ b/ext/tk/sample/demos-jp/check.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# checkbutton widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($check_demo) && $check_demo
$check_demo.destroy
$check_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$check_demo = TkToplevel.new {|w|
title("Checkbutton Demonstration")
iconname("check")
@@ -18,25 +18,25 @@ $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'
justify 'left'
- text "下ã«ã¯ 3 ã¤ã®ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚クリックã™ã‚‹ã¨ãƒœã‚¿ãƒ³ã®é¸æŠžçŠ¶æ…‹ãŒå¤‰ã‚りã€Tcl 変数 ( TkVariable オブジェクトã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ ) ã«ãã®ãƒœã‚¿ãƒ³ã®çŠ¶æ…‹ã‚’ç¤ºã™å€¤ã‚’設定ã—ã¾ã™ã€‚ç¾åœ¨ã®å¤‰æ•°ã®å€¤ã‚’見るã«ã¯ã€Œå¤‰æ•°å‚ç…§ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
+ text "²¼¤Ë¤Ï 3 ¤Ä¤Î¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Ü¥¿¥ó¤ÎÁªÂò¾õÂÖ¤¬ÊѤï¤ê¡¢Tcl ÊÑ¿ô ( TkVariable ¥ª¥Ö¥¸¥§¥¯¥È¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹ ) ¤Ë¤½¤Î¥Ü¥¿¥ó¤Î¾õÂÖ¤ò¼¨¤¹ÃͤòÀßÄꤷ¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
}
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 '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $check_demo
$check_demo = nil
@@ -46,13 +46,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'check'}
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text '変数å‚ç…§'
+ text 'ÊÑ¿ô»²¾È'
command proc{
showVars(base_frame,
['wipers', wipers], ['brakes', brakes], ['sober', sober])
@@ -62,9 +62,9 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# checkbutton 生æˆ
-[ TkCheckButton.new(base_frame, 'text'=>'ワイパー OK', 'variable'=>wipers),
- TkCheckButton.new(base_frame, 'text'=>'ブレーキ OK', 'variable'=>brakes),
- TkCheckButton.new(base_frame, 'text'=>'é‹è»¢æ‰‹ ç´ é¢', 'variable'=>sober)
+# checkbutton À¸À®
+[ 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| w.relief('flat'); w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')}
diff --git a/ext/tk/sample/demos-jp/check2.rb b/ext/tk/sample/demos-jp/check2.rb
index 558e588535..9f845183f3 100644
--- a/ext/tk/sample/demos-jp/check2.rb
+++ b/ext/tk/sample/demos-jp/check2.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# checkbutton widget demo2 (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($check2_demo) && $check2_demo
$check2_demo.destroy
$check2_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$check2_demo = TkToplevel.new {|w|
title("Checkbutton Demonstration 2")
iconname("check2")
@@ -18,37 +18,37 @@ $check2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($check2_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "下ã«ã¯ï¼”ã¤ã®ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚クリックã™ã‚‹ã¨ãƒœã‚¿ãƒ³ã®é¸æŠžçŠ¶æ…‹ãŒå¤‰ã‚りã€Tcl変数(TkVariableオブジェクトã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ï¼‰ã«ãã®ãƒœã‚¿ãƒ³ã®çŠ¶æ…‹ã‚’ç¤ºã™å€¤ã‚’設定ã—ã¾ã™ã€‚最åˆã®ãƒœã‚¿ãƒ³ã®çŠ¶æ…‹ã¯ä»–ã®ï¼“ã¤ã®ãƒœã‚¿ãƒ³ã®çŠ¶æ…‹ã«ã‚‚ä¾å­˜ã—ã¦å¤‰åŒ–ã—ã¾ã™ã€‚ã‚‚ã—3ã¤ã®ãƒœã‚¿ãƒ³ã®ä¸€éƒ¨ã ã‘ã«ãƒã‚§ãƒƒã‚¯ãŒä»˜ã‘られã¦ã„ã‚‹å ´åˆã€æœ€åˆã®ãƒœã‚¿ãƒ³ã¯ãƒˆãƒ©ã‚¤ã‚¹ãƒ†ãƒ¼ãƒˆï¼ˆï¼“状態)モードã§ã®è¡¨ç¤ºã‚’行ã„ã¾ã™ã€‚ç¾åœ¨ã®å¤‰æ•°ã®å€¤ã‚’見るã«ã¯ã€Œå¤‰æ•°å‚ç…§ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
+ text "²¼¤Ë¤Ï£´¤Ä¤Î¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥Ü¥¿¥ó¤ÎÁªÂò¾õÂÖ¤¬ÊѤï¤ê¡¢TclÊÑ¿ô¡ÊTkVariable¥ª¥Ö¥¸¥§¥¯¥È¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡Ë¤Ë¤½¤Î¥Ü¥¿¥ó¤Î¾õÂÖ¤ò¼¨¤¹ÃͤòÀßÄꤷ¤Þ¤¹¡£ºÇ½é¤Î¥Ü¥¿¥ó¤Î¾õÂ֤Ͼ¤Î£³¤Ä¤Î¥Ü¥¿¥ó¤Î¾õÂ֤ˤâ°Í¸¤·¤ÆÊѲ½¤·¤Þ¤¹¡£¤â¤·£³¤Ä¤Î¥Ü¥¿¥ó¤Î°ìÉô¤À¤±¤Ë¥Á¥§¥Ã¥¯¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¢ºÇ½é¤Î¥Ü¥¿¥ó¤Ï¥È¥é¥¤¥¹¥Æ¡¼¥È¡Ê£³¾õÂ֡˥⡼¥É¤Ç¤Îɽ¼¨¤ò¹Ô¤¤¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
}
msg.pack('side'=>'top')
-# 変数生æˆ
+# ÊÑ¿ôÀ¸À®
safety = TkVariable.new(0)
wipers = TkVariable.new(0)
brakes = TkVariable.new(0)
sober = TkVariable.new(0)
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
TkGrid('x',
- TkButton.new(frame, :text=>'変数å‚ç…§',
+ TkButton.new(frame, :text=>'ÊÑ¿ô»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{
showVars($check2_demo,
['safety', safety], ['wipers', wipers],
['brakes', brakes], ['sober', sober])
}),
- TkButton.new(frame, :text=>'コードå‚ç…§',
+ TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'check2'}),
- TkButton.new(frame, :text=>'é–‰ã˜ã‚‹',
+ TkButton.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $check2_demo
@@ -61,16 +61,16 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'bottom', 'fill'=>'x')
-# checkbutton 生æˆ
-TkCheckButton.new(base_frame, :text=>'安全性検査', :variable=>safety,
+# checkbutton À¸À®
+TkCheckButton.new(base_frame, :text=>'°ÂÁ´À­¸¡ºº', :variable=>safety,
:relief=>:flat, :onvalue=>'all', :offvalue=>'none',
:tristatevalue=>'partial'){
pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
}
-[ TkCheckButton.new(base_frame, 'text'=>'ワイパー OK', 'variable'=>wipers),
- TkCheckButton.new(base_frame, 'text'=>'ブレーキ OK', 'variable'=>brakes),
- TkCheckButton.new(base_frame, 'text'=>'é‹è»¢æ‰‹ ç´ é¢', 'variable'=>sober)
+[ 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|
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 df8c76a69d..c188723c5a 100644
--- a/ext/tk/sample/demos-jp/clrpick.rb
+++ b/ext/tk/sample/demos-jp/clrpick.rb
@@ -1,35 +1,35 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# widget demo prompts the user to select a color (called by 'widget')
#
# Note: don't support ttk_wrapper. work with standard widgets only.
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($clrpick_demo) && $clrpick_demo
$clrpick_demo.destroy
$clrpick_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$clrpick_demo = TkToplevel.new {|w|
title("Color Selection Dialogs")
iconname("colors")
positionWindow(w)
}
-# label 生æˆ
+# label À¸À®
#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
- 'text'=>"以下ã®ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã€ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸Šã«ã‚るウィジェットã®å‰æ™¯è‰²ã¨èƒŒæ™¯è‰²ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„。").pack('side'=>'top')
+ 'text'=>"°Ê²¼¤Î¥Ü¥¿¥ó¤ò²¡¤·¤Æ¡¢¤³¤Î¥¦¥£¥ó¥É¥¦¾å¤Ë¤¢¤ë¥¦¥£¥¸¥§¥Ã¥È¤ÎÁ°·Ê¿§¤ÈÇØ·Ê¿§¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£").pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
# TkFrame.new($clrpick_demo) {|frame|
Tk::Frame.new($clrpick_demo) {|frame|
# TkButton.new(frame) {
Tk::Button.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $clrpick_demo
$clrpick_demo = nil
@@ -39,21 +39,21 @@ Tk::Frame.new($clrpick_demo) {|frame|
# TkButton.new(frame) {
Tk::Button.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'clrpick'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# button 生æˆ
-# TkButton.new($clrpick_demo, 'text'=>'背景色を設定 ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'背景色を設定 ...') {|b|
+# button À¸À®
+# TkButton.new($clrpick_demo, 'text'=>'ÇØ·Ê¿§¤òÀßÄê ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'ÇØ·Ê¿§¤òÀßÄê ...') {|b|
command(proc{setColor $clrpick_demo, b, 'background',
['background', 'highlightbackground']})
pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
}
-# TkButton.new($clrpick_demo, 'text'=>'剿™¯è‰²ã‚’設定 ...') {|b|
-Tk::Button.new($clrpick_demo, 'text'=>'剿™¯è‰²ã‚’設定 ...') {|b|
+# TkButton.new($clrpick_demo, 'text'=>'Á°·Ê¿§¤òÀßÄê ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'Á°·Ê¿§¤òÀßÄê ...') {|b|
command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
}
diff --git a/ext/tk/sample/demos-jp/colors.rb b/ext/tk/sample/demos-jp/colors.rb
index 5e5f47cb04..9fcf0333b5 100644
--- a/ext/tk/sample/demos-jp/colors.rb
+++ b/ext/tk/sample/demos-jp/colors.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# listbox widget demo 'colors' (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($colors_demo) && $colors_demo
$colors_demo.destroy
$colors_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$colors_demo = TkToplevel.new {|w|
title("Listbox Demonstration (colors)")
iconname("colors")
@@ -18,20 +18,20 @@ $colors_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($colors_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "下ã«ã¯è‰²ã®åå‰ãŒå…¥ã£ãŸã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ä»˜ã®ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚リストをスクロールã•ã›ã‚‹ã®ã¯ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ã§ã‚‚ã§ãã¾ã™ã—ã€ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã®ä¸­ã§ãƒžã‚¦ã‚¹ã®ãƒœã‚¿ãƒ³2(中ボタン)を押ã—ãŸã¾ã¾ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã‚‚ã§ãã¾ã™ã€‚ã‚る色をボタン1(左ボタン)ã§ãƒ€ãƒ–ルクリックã™ã‚‹ã¨ã‚¢ãƒ—リケーション全体ãŒãã®è‰²ã«ãªã‚Šã¾ã™ã€‚"
+ text "²¼¤Ë¤Ï¿§¤Î̾Á°¤¬Æþ¤Ã¤¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼ÉդΥꥹ¥È¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥ê¥¹¥È¤ò¥¹¥¯¥í¡¼¥ë¤µ¤»¤ë¤Î¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ç¤â¤Ç¤­¤Þ¤¹¤·¡¢¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤ÎÃæ¤Ç¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2(Ãæ¥Ü¥¿¥ó)¤ò²¡¤·¤¿¤Þ¤Þ¥É¥é¥Ã¥°¤·¤Æ¤â¤Ç¤­¤Þ¤¹¡£¤¢¤ë¿§¤ò¥Ü¥¿¥ó1(º¸¥Ü¥¿¥ó)¤Ç¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤¹¤ë¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥óÁ´ÂΤ¬¤½¤Î¿§¤Ë¤Ê¤ê¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $colors_demo
$colors_demo = nil
@@ -40,13 +40,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'colors'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
colors_lbox = nil
TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
s = TkScrollbar.new(w)
diff --git a/ext/tk/sample/demos-jp/combo.rb b/ext/tk/sample/demos-jp/combo.rb
index 8bbe36997d..2059662d48 100644
--- a/ext/tk/sample/demos-jp/combo.rb
+++ b/ext/tk/sample/demos-jp/combo.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# combo.rb --
#
@@ -21,16 +21,16 @@ base_frame = TkFrame.new($combo_demo).pack(:fill=>:both, :expand=>true)
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
-以下ã§ã¯3種類ã®ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ï¼Ž\
-最åˆã®ã‚‚ã®ã¯ï¼Œã‚¨ãƒ³ãƒˆãƒªã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¨åŒã˜æ§˜ã«ï¼Œ\
-ãƒã‚¤ãƒ³ãƒˆã—ãŸã‚Šï¼Œã‚¯ãƒªãƒƒã‚¯ã—ãŸã‚Šï¼Œã‚¿ã‚¤ãƒ—ã—ãŸã‚Šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ž\
-ã¾ãŸï¼ŒReturnキーを入力ã™ã‚Œã°ç¾åœ¨ã®å€¤ãŒãƒªã‚¹ãƒˆã«è¿½åŠ ã•れ,\
-ドロップダウンリストã‹ã‚‰é¸æŠžã™ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã™ï¼Ž\
-↓(下å‘ã矢å°)キーを押ã—ã¦è¡¨ç¤ºã•れãŸãƒªã‚¹ãƒˆã‹ã‚‰\
-矢å°ã‚­ãƒ¼ã§ä»–ã®å€™è£œã‚’é¸ã‚“ã§Returnキーを押ã›ã°ï¼Œå€¤ã‚’é¸æŠžã§ãã¾ã™ï¼Ž\
-2番目ã®ã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã¯ç‰¹å®šã®å€¤ã«å›ºå®šã•れã¦ãŠã‚Šï¼Œä¸€åˆ‡å¤‰æ›´ã§ãã¾ã›ã‚“.\
-3番目ã®ã‚‚ã®ã¯ã‚ªãƒ¼ã‚¹ãƒˆãƒ©ãƒªã‚¢ã®éƒ½å¸‚ã®ãƒ‰ãƒ­ãƒƒãƒ—ダウンリストã‹ã‚‰\
-é¸æŠžã™ã‚‹ã“ã¨ã ã‘ãŒå¯èƒ½ã¨ãªã£ã¦ã„ã¾ã™ï¼Ž
+°Ê²¼¤Ç¤Ï3¼ïÎà¤Î¥³¥ó¥Ü¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥\
+ºÇ½é¤Î¤â¤Î¤Ï¡¤¥¨¥ó¥È¥ê¥¦¥£¥¸¥§¥Ã¥È¤ÈƱ¤¸Íͤˡ¤\
+¥Ý¥¤¥ó¥È¤·¤¿¤ê¡¤¥¯¥ê¥Ã¥¯¤·¤¿¤ê¡¤¥¿¥¤¥×¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
+¤Þ¤¿¡¤Return¥­¡¼¤òÆþÎϤ¹¤ì¤Ð¸½ºß¤ÎÃͤ¬¥ê¥¹¥È¤ËÄɲ䵤졤\
+¥É¥í¥Ã¥×¥À¥¦¥ó¥ê¥¹¥È¤«¤éÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥\
+¢­(²¼¸þ¤­Ìð°õ)¥­¡¼¤ò²¡¤·¤ÆÉ½¼¨¤µ¤ì¤¿¥ê¥¹¥È¤«¤é\
+Ìð°õ¥­¡¼¤Ç¾¤Î¸õÊä¤òÁª¤ó¤ÇReturn¥­¡¼¤ò²¡¤»¤Ð¡¤ÃͤòÁªÂò¤Ç¤­¤Þ¤¹¡¥\
+2ÈÖÌܤΥ³¥ó¥Ü¥Ü¥Ã¥¯¥¹¤ÏÆÃÄê¤ÎÃͤ˸ÇÄꤵ¤ì¤Æ¤ª¤ê¡¤°ìÀÚÊѹ¹¤Ç¤­¤Þ¤»¤ó¡¥\
+3ÈÖÌܤΤâ¤Î¤Ï¥ª¡¼¥¹¥È¥é¥ê¥¢¤ÎÅԻԤΥɥí¥Ã¥×¥À¥¦¥ó¥ê¥¹¥È¤«¤é\
+ÁªÂò¤¹¤ë¤³¤È¤À¤±¤¬²Äǽ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
EOL
## variables
@@ -43,7 +43,7 @@ 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=>'変数å‚ç…§',
+ Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{
showVars(base_frame,
@@ -51,10 +51,10 @@ Ttk::Frame.new(base_frame) {|frame|
['secondVariable', secondValue],
['ozCity', ozCity])
}),
- Ttk::Button.new(frame, :text=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'combo'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$combo_demo.destroy
@@ -68,13 +68,13 @@ Ttk::Frame.new(base_frame) {|frame|
frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
australianCities = [
- 'キャンベラ', 'シドニー', 'メルボルン', 'パース', 'アデレード',
- 'ブリスベーン', 'ホãƒãƒ¼ãƒˆ', 'ダーウィン', 'アリス スプリングス'
+ '¥­¥ã¥ó¥Ù¥é', '¥·¥É¥Ë¡¼', '¥á¥ë¥Ü¥ë¥ó', '¥Ñ¡¼¥¹', '¥¢¥Ç¥ì¡¼¥É',
+ '¥Ö¥ê¥¹¥Ù¡¼¥ó', '¥Û¥Ð¡¼¥È', '¥À¡¼¥¦¥£¥ó', '¥¢¥ê¥¹ ¥¹¥×¥ê¥ó¥°¥¹'
]
-secondValue.value = '変更ä¸å¯'
-ozCity.value = 'シドニー'
+secondValue.value = 'Êѹ¹ÉÔ²Ä'
+ozCity.value = '¥·¥É¥Ë¡¼'
Tk.pack(Ttk::Labelframe.new(frame, :text=>'Fully Editable'){|f|
Ttk::Combobox.new(f, :textvariable=>firstValue){|b|
diff --git a/ext/tk/sample/demos-jp/cscroll.rb b/ext/tk/sample/demos-jp/cscroll.rb
index e993326aa9..0a31f28b5e 100644
--- a/ext/tk/sample/demos-jp/cscroll.rb
+++ b/ext/tk/sample/demos-jp/cscroll.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# simple scrollable canvas widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($cscroll_demo) && $cscroll_demo
$cscroll_demo.destroy
$cscroll_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$cscroll_demo = TkToplevel.new {|w|
title("Scrollable Canvas Demonstration")
iconname("cscroll")
@@ -18,17 +18,17 @@ $cscroll_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($cscroll_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i',
- 'justify'=>'left', 'text'=>"ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ã‚„マウスã®ãƒœã‚¿ãƒ³2 ã§ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã§ãるキャンãƒã‚¹ widget ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚四角ã®ä¸Šã§ãƒœã‚¿ãƒ³1 をクリックã™ã‚‹ã¨ã€ãã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãŒæ¨™æº–出力ã«å‡ºåŠ›ã•れã¾ã™ã€‚"){
+ 'justify'=>'left', 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ä¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2 ¤Ç¥¹¥¯¥í¡¼¥ë¤Ç¤­¤ë¥­¥ã¥ó¥Ð¥¹ widget ¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£»Í³Ñ¤Î¾å¤Ç¥Ü¥¿¥ó1 ¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤¬É¸½à½ÐÎϤ˽ÐÎϤµ¤ì¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$cscroll_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $cscroll_demo
$cscroll_demo = nil
@@ -37,13 +37,13 @@ $cscroll_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'cscroll'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$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)
@@ -52,7 +52,7 @@ unless $tk_version =~ /^4\.[01]/
TkGrid.columnconfigure($cscroll_grid, 0, 'weight'=>1, 'minsize'=>0)
end
-# canvas 設定
+# canvas ÀßÄê
$cscroll_canvas = TkCanvas.new(base_frame,
'relief'=>'sunken', 'borderwidth'=>2,
'scrollregion'=>['-11c', '-11c', '50c', '20c']
diff --git a/ext/tk/sample/demos-jp/ctext.rb b/ext/tk/sample/demos-jp/ctext.rb
index bb354c490e..70c1cad1a7 100644
--- a/ext/tk/sample/demos-jp/ctext.rb
+++ b/ext/tk/sample/demos-jp/ctext.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# Canvas Text widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($ctext_demo) && $ctext_demo
$ctext_demo.destroy
$ctext_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$ctext_demo = TkToplevel.new {|w|
title("Canvas Text Demonstration")
iconname("Text")
@@ -18,23 +18,23 @@ $ctext_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ctext_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
- 'text'=>"ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ã‚­ãƒ£ãƒ³ãƒã‚¹widgetã®ãƒ†ã‚­ã‚¹ãƒˆæ©Ÿèƒ½ã‚’デモã™ã‚‹ãŸã‚ã®ãƒ†ã‚­ã‚¹ãƒˆæ–‡å­—列ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚マウスを四角ã®ä¸­ã«æŒã£ã¦ã„ãã€ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã¨ä½ç½®ãŽã‚用ã®ç‚¹ã‹ã‚‰ã®ç›¸å¯¾ä½ç½®ã‚’変ãˆãŸã‚Šã€è¡Œæƒãˆã‚’変ãˆãŸã‚Šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã¾ãŸä»¥ä¸‹ã®ã‚ˆã†ãªç·¨é›†ã®ãŸã‚ã®ç°¡å˜ãªãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚
+ 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Î¥Æ¥­¥¹¥Èʸ»úÎó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Þ¥¦¥¹¤ò»Í³Ñ¤ÎÃæ¤Ë»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤¹¤ë¤È°ÌÃÖ¤®¤áÍѤÎÅÀ¤«¤é¤ÎÁêÂаÌÃÖ¤òÊѤ¨¤¿¤ê¡¢¹Ô·¤¨¤òÊѤ¨¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿°Ê²¼¤Î¤è¤¦¤ÊÊÔ½¸¤Î¤¿¤á¤Î´Êñ¤Ê¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
- 1. マウスをæŒã£ã¦ã„ãã€ã‚¯ãƒªãƒƒã‚¯ã—ã€å…¥åŠ›ã§ãã¾ã™ã€‚
- 2. ボタン1ã§é¸æŠžã§ãã¾ã™ã€‚
- 3. マウスã®ä½ç½®ã«ãƒœã‚¿ãƒ³2ã§é¸æŠžã—ãŸãƒ†ã‚­ã‚¹ãƒˆã‚’コピーã§ãã¾ã™ã€‚
- 4.ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã‚’コントロール-Hã§æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã®ç›´å‰ã®æ–‡å­—を削除ã—ã¾ã™ã€‚
- 5. Deleteã‚­ãƒ¼ã¯æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã®ç›´å¾Œã®æ–‡å­—を削除ã—ã¾ã™ã€‚"){
+ 1. ¥Þ¥¦¥¹¤ò»ý¤Ã¤Æ¤¤¤­¡¢¥¯¥ê¥Ã¥¯¤·¡¢ÆþÎϤǤ­¤Þ¤¹¡£
+ 2. ¥Ü¥¿¥ó1¤ÇÁªÂò¤Ç¤­¤Þ¤¹¡£
+ 3. ¥Þ¥¦¥¹¤Î°ÌÃ֤˥ܥ¿¥ó2¤ÇÁªÂò¤·¤¿¥Æ¥­¥¹¥È¤ò¥³¥Ô¡¼¤Ç¤­¤Þ¤¹¡£
+ 4.¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ò¥³¥ó¥È¥í¡¼¥ë-H¤ÇÁÞÆþ¥«¡¼¥½¥ë¤ÎľÁ°¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£
+ 5. Delete¥­¡¼¤ÏÁÞÆþ¥«¡¼¥½¥ë¤Îľ¸å¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$ctext_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $ctext_demo
$ctext_demo = nil
@@ -43,30 +43,30 @@ $ctext_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'ctext'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$ctext_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# canvas 生æˆ
+# 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 設定
+# canvas ÀßÄê
TkcRectangle.new($ctext_canvas, 245, 195, 255, 205,
'outline'=>'black', 'fill'=>'red')
ctag_text_param = {
- 'text'=>"ã“れã¯ã‚­ãƒ£ãƒ³ãƒã‚¹widgetã®ãƒ†ã‚­ã‚¹ãƒˆæ©Ÿèƒ½ã‚’デモã™ã‚‹ãŸã‚ã®æ–‡å­—列ã§ã™ã€‚\n上ã§è¿°ã¹ãŸã‚ˆã†ãªç·¨é›†ã‚’å¯èƒ½ã¨ã™ã‚‹ãŸã‚ã®ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°ã‚’æ–½ã—ã¦ã„ã¾ã™ã€‚",
+ 'text'=>"¤³¤ì¤Ï¥­¥ã¥ó¥Ð¥¹widget¤Î¥Æ¥­¥¹¥Èµ¡Ç½¤ò¥Ç¥â¤¹¤ë¤¿¤á¤Îʸ»úÎó¤Ç¤¹¡£\n¾å¤Ç½Ò¤Ù¤¿¤è¤¦¤ÊÊÔ½¸¤ò²Äǽ¤È¤¹¤ë¤¿¤á¤Î¥Ð¥¤¥ó¥Ç¥£¥ó¥°¤ò»Ü¤·¤Æ¤¤¤Þ¤¹¡£",
'width'=>440, 'anchor'=>'n', 'justify'=>'left'
}
if $tk_version =~ /^4.*/
diff --git a/ext/tk/sample/demos-jp/dialog1.rb b/ext/tk/sample/demos-jp/dialog1.rb
index e50c9071e5..07e50306ab 100644
--- a/ext/tk/sample/demos-jp/dialog1.rb
+++ b/ext/tk/sample/demos-jp/dialog1.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# a dialog box with a local grab (called by 'widget')
#
@@ -11,7 +11,7 @@ class TkDialog_Demo1 < TkDialog
end
def message
- 'モーダルダイアログボックスã§ã™ã€‚Tk ã® "grab" コマンドを使用ã—ã¦ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ã§ã€Œãƒ­ãƒ¼ã‚«ãƒ«ã‚°ãƒ©ãƒ–ã€ã—ã¦ã„ã¾ã™ã€‚下ã®ã„ãšã‚Œã‹ã®ãƒœã‚¿ãƒ³ã‚’実行ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã€ã“ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã«ç­”ãˆã‚‹ã¾ã§ã€ã“ã®ã‚°ãƒ©ãƒ–ã«ã‚ˆã£ã¦ã‚¢ãƒ—リケーションã®ä»–ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ã¯ã€ãƒã‚¤ãƒ³ã‚¿é–¢ä¿‚ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚’å—ã‘å–ã‚‹ã“ã¨ãŒã§ããªããªã£ã¦ã„ã¾ã™ã€‚'
+ '¥â¡¼¥À¥ë¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤Ç¤¹¡£Tk ¤Î "grab" ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤Ç¡Ö¥í¡¼¥«¥ë¥°¥é¥Ö¡×¤·¤Æ¤¤¤Þ¤¹¡£²¼¤Î¤¤¤º¤ì¤«¤Î¥Ü¥¿¥ó¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤³¤Î¥À¥¤¥¢¥í¥°¤ËÅú¤¨¤ë¤Þ¤Ç¡¢¤³¤Î¥°¥é¥Ö¤Ë¤è¤Ã¤Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¾¤Î¥¦¥£¥ó¥É¥¦¤Ç¤Ï¡¢¥Ý¥¤¥ó¥¿´Ø·¸¤Î¥¤¥Ù¥ó¥È¤ò¼õ¤±¼è¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£'
end
def bitmap
@@ -23,17 +23,17 @@ class TkDialog_Demo1 < TkDialog
end
def buttons
-# "了解 キャンセル コードå‚ç…§"
- ["了解", "キャンセル", "コードå‚ç…§"]
+# "λ²ò ¥­¥ã¥ó¥»¥ë ¥³¡¼¥É»²¾È"
+ ["λ²ò", "¥­¥ã¥ó¥»¥ë", "¥³¡¼¥É»²¾È"]
end
end
ret = TkDialog_Demo1.new('message_config'=>{'wraplength'=>'4i'}).value
case ret
when 0
- print "ã‚ãªãŸã¯ã€Œäº†è§£ã€ã‚’押ã—ã¾ã—ãŸã­ã€‚\n"
+ print "¤¢¤Ê¤¿¤Ï¡Öλ²ò¡×¤ò²¡¤·¤Þ¤·¤¿¤Í¡£\n"
when 1
- print "ã‚ãªãŸã¯ã€Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã€ã‚’押ã—ã¾ã—ãŸã­ã€‚\n"
+ print "¤¢¤Ê¤¿¤Ï¡Ö¥­¥ã¥ó¥»¥ë¡×¤ò²¡¤·¤Þ¤·¤¿¤Í¡£\n"
when 2
showCode 'dialog1'
end
diff --git a/ext/tk/sample/demos-jp/dialog2.rb b/ext/tk/sample/demos-jp/dialog2.rb
index 3e7d9619a4..f747f8d6a8 100644
--- a/ext/tk/sample/demos-jp/dialog2.rb
+++ b/ext/tk/sample/demos-jp/dialog2.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# a dialog box with a global grab (called by 'widget')
#
@@ -11,7 +11,7 @@ class TkDialog_Demo2 < TkDialog
end
def message
- 'ã“ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ã¯ã‚°ãƒ­ãƒ¼ãƒãƒ«ã‚°ãƒ©ãƒ–を使用ã—ã¦ã„ã¾ã™ã€‚下ã®ãƒœã‚¿ãƒ³ã‚’実行ã™ã‚‹ã¾ã§ã€ãƒ‡ã‚£ã‚¹ãƒ—レイ上ã®ã„ã‹ãªã‚‹ã‚‚ã®ã¨ã‚‚対話ã§ãã¾ã›ã‚“。グローãƒãƒ«ã‚°ãƒ©ãƒ–を使用ã™ã‚‹ã“ã¨ã¯ã€ã¾ãšè‰¯ã„考ãˆã§ã¯ã‚りã¾ã›ã‚“。ã©ã†ã—ã¦ã‚‚å¿…è¦ã«ãªã‚‹ã¾ã§ä½¿ãŠã†ã¨æ€ã‚ãªã„ã§ä¸‹ã•ã„。'
+ '¤³¤Î¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤Ï¥°¥í¡¼¥Ð¥ë¥°¥é¥Ö¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Ü¥¿¥ó¤ò¼Â¹Ô¤¹¤ë¤Þ¤Ç¡¢¥Ç¥£¥¹¥×¥ì¥¤¾å¤Î¤¤¤«¤Ê¤ë¤â¤Î¤È¤âÂÐÏäǤ­¤Þ¤»¤ó¡£¥°¥í¡¼¥Ð¥ë¥°¥é¥Ö¤ò»ÈÍѤ¹¤ë¤³¤È¤Ï¡¢¤Þ¤ºÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤É¤¦¤·¤Æ¤âɬÍפˤʤë¤Þ¤Ç»È¤ª¤¦¤È»×¤ï¤Ê¤¤¤Ç²¼¤µ¤¤¡£'
end
def bitmap
@@ -23,8 +23,8 @@ class TkDialog_Demo2 < TkDialog
end
def buttons
-# "了解 キャンセル コードå‚ç…§"
- ["了解", "キャンセル", "コードå‚ç…§"]
+# "λ²ò ¥­¥ã¥ó¥»¥ë ¥³¡¼¥É»²¾È"
+ ["λ²ò", "¥­¥ã¥ó¥»¥ë", "¥³¡¼¥É»²¾È"]
end
end
@@ -34,9 +34,9 @@ ret = TkDialog_Demo2.new('message_config'=>{'wraplength'=>'4i'},
}).value
case ret
when 0
- print "ã‚ãªãŸã¯ã€Œäº†è§£ã€ã‚’押ã—ã¾ã—ãŸã­ã€‚\n"
+ print "¤¢¤Ê¤¿¤Ï¡Öλ²ò¡×¤ò²¡¤·¤Þ¤·¤¿¤Í¡£\n"
when 1
- print "ã‚ãªãŸã¯ã€Œã‚­ãƒ£ãƒ³ã‚»ãƒ«ã€ã‚’押ã—ã¾ã—ãŸã­ã€‚\n"
+ print "¤¢¤Ê¤¿¤Ï¡Ö¥­¥ã¥ó¥»¥ë¡×¤ò²¡¤·¤Þ¤·¤¿¤Í¡£\n"
when 2
showCode 'dialog2'
end
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms b/ext/tk/sample/demos-jp/doc.org/license.terms
index c0a44d3fc2..03ca6fcb31 100644
--- a/ext/tk/sample/demos-jp/doc.org/license.terms
+++ b/ext/tk/sample/demos-jp/doc.org/license.terms
@@ -28,7 +28,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
diff --git a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80 b/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
index c0a44d3fc2..03ca6fcb31 100644
--- a/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
+++ b/ext/tk/sample/demos-jp/doc.org/license.terms.tk80
@@ -28,7 +28,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
diff --git a/ext/tk/sample/demos-jp/entry1.rb b/ext/tk/sample/demos-jp/entry1.rb
index 9be677d12d..eb71e87aec 100644
--- a/ext/tk/sample/demos-jp/entry1.rb
+++ b/ext/tk/sample/demos-jp/entry1.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# entry (no scrollbars) widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($entry1_demo) && $entry1_demo
$entry1_demo.destroy
$entry1_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$entry1_demo = TkToplevel.new {|w|
title("Entry Demonstration (no scrollbars)")
iconname("entry1")
@@ -18,20 +18,20 @@ $entry1_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($entry1_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
- text "3種類ã®ç•°ãªã‚‹ã‚¨ãƒ³ãƒˆãƒªãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚文字を入力ã™ã‚‹ã«ã¯ãƒã‚¤ãƒ³ã‚¿ã‚’æŒã£ã¦è¡Œãã€ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã‹ã‚‰ã‚¿ã‚¤ãƒ—ã—ã¦ãã ã•ã„。標準的ãªMotifã®ç·¨é›†æ©Ÿèƒ½ãŒã€Emacsã®ã‚­ãƒ¼ãƒã‚¤ãƒ³ãƒ‰ã¨ã¨ã‚‚ã«ã€ã‚µãƒãƒ¼ãƒˆã•れã¦ã„ã¾ã™ã€‚例ãˆã°ã€ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã¨ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-Hã¯ã‚«ãƒ¼ã‚½ãƒ«ã®å·¦ã®æ–‡å­—を削除ã—ã€ãƒ‡ãƒªãƒ¼ãƒˆã‚­ãƒ¼ã¨ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-Dã¯ã‚«ãƒ¼ã‚½ãƒ«ã®å³å´ã®æ–‡å­—を削除ã—ã¾ã™ã€‚é•·éŽãŽã¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«å…¥ã‚Šåˆ‡ã‚‰ãªã„ã‚‚ã®ã¯ã€ãƒžã‚¦ã‚¹ã®ãƒœã‚¿ãƒ³2を押ã—ãŸã¾ã¾ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚日本語を入力ã™ã‚‹ã®ã¯ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã§ã™ã€‚kinput2ãŒå‹•ã„ã¦ã„れã°å…¥åŠ›ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+ text "3¼ïÎà¤Î°Û¤Ê¤ë¥¨¥ó¥È¥ê¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ê¸»ú¤òÆþÎϤ¹¤ë¤Ë¤Ï¥Ý¥¤¥ó¥¿¤ò»ý¤Ã¤Æ¹Ô¤­¡¢¥¯¥ê¥Ã¥¯¤·¤Æ¤«¤é¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£É¸½àŪ¤ÊMotif¤ÎÊÔ½¸µ¡Ç½¤¬¡¢Emacs¤Î¥­¡¼¥Ð¥¤¥ó¥É¤È¤È¤â¤Ë¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Î㤨¤Ð¡¢¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤È¥³¥ó¥È¥í¡¼¥ë-H¤Ï¥«¡¼¥½¥ë¤Îº¸¤Îʸ»ú¤òºï½ü¤·¡¢¥Ç¥ê¡¼¥È¥­¡¼¤È¥³¥ó¥È¥í¡¼¥ë-D¤Ï¥«¡¼¥½¥ë¤Î±¦Â¦¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£Ä¹²á¤®¤Æ¥¦¥£¥ó¥É¥¦¤ËÆþ¤êÀÚ¤é¤Ê¤¤¤â¤Î¤Ï¡¢¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2¤ò²¡¤·¤¿¤Þ¤Þ¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¥¹¥¯¥í¡¼¥ë¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ÆüËܸì¤òÆþÎϤ¹¤ë¤Î¤Ï¥³¥ó¥È¥í¡¼¥ë-¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ç¤¹¡£kinput2¤¬Æ°¤¤¤Æ¤¤¤ì¤ÐÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $entry1_demo
$entry1_demo = nil
@@ -40,21 +40,21 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'entry1'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# entry 生æˆ
+# entry À¸À®
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, 'åˆæœŸå€¤')
-e2.insert('end', "ã“ã®ã‚¨ãƒ³ãƒˆãƒªã«ã¯é•·ã„文字列ãŒå…¥ã£ã¦ã„ã¦ã€")
-e2.insert('end', "é•·ã™ãŽã¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯å…¥ã‚Šåˆ‡ã‚‰ãªã„ã®ã§ã€")
-e2.insert('end', "å®Ÿéš›ã®æ‰€çµ‚りã¾ã§è¦‹ã‚‹ã«ã¯ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã•ã›ãªã‘れã°")
-e2.insert('end', "ãªã‚‰ãªã„ã§ã—ょã†ã€‚")
+# ½é´üÃÍÁÞÆþ
+e1.insert(0, '½é´üÃÍ')
+e2.insert('end', "¤³¤Î¥¨¥ó¥È¥ê¤Ë¤ÏŤ¤Ê¸»úÎ󤬯þ¤Ã¤Æ¤¤¤Æ¡¢")
+e2.insert('end', "Ť¹¤®¤Æ¥¦¥£¥ó¥É¥¦¤Ë¤ÏÆþ¤êÀÚ¤é¤Ê¤¤¤Î¤Ç¡¢")
+e2.insert('end', "¼ÂºÝ¤Î½ê½ª¤ê¤Þ¤Ç¸«¤ë¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤µ¤»¤Ê¤±¤ì¤Ð")
+e2.insert('end', "¤Ê¤é¤Ê¤¤¤Ç¤·¤ç¤¦¡£")
diff --git a/ext/tk/sample/demos-jp/entry2.rb b/ext/tk/sample/demos-jp/entry2.rb
index 5476d24ade..b5187ab508 100644
--- a/ext/tk/sample/demos-jp/entry2.rb
+++ b/ext/tk/sample/demos-jp/entry2.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# entry (with scrollbars) widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($entry2_demo) && $entry2_demo
$entry2_demo.destroy
$entry2_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$entry2_demo = TkToplevel.new {|w|
title("Entry Demonstration (with scrollbars)")
iconname("entry2")
@@ -18,20 +18,20 @@ $entry2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($entry2_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
- text "3種類ã®ç•°ãªã‚‹ã‚¨ãƒ³ãƒˆãƒªãŒå„々スクロールãƒãƒ¼ä»˜ã§è¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚文字を入力ã™ã‚‹ã«ã¯ãƒã‚¤ãƒ³ã‚¿ã‚’æŒã£ã¦è¡Œãã€ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã‹ã‚‰ã‚¿ã‚¤ãƒ—ã—ã¦ãã ã•ã„。標準的ãªMotifã®ç·¨é›†æ©Ÿèƒ½ãŒã€Emacsã®ã‚­ãƒ¼ãƒã‚¤ãƒ³ãƒ‰ã¨ã¨ã‚‚ã«ã€ã‚µãƒãƒ¼ãƒˆã•れã¦ã„ã¾ã™ã€‚例ãˆã°ã€ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã¨ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-Hã¯ã‚«ãƒ¼ã‚½ãƒ«ã®å·¦ã®æ–‡å­—を削除ã—ã€ãƒ‡ãƒªãƒ¼ãƒˆã‚­ãƒ¼ã¨ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-Dã¯ã‚«ãƒ¼ã‚½ãƒ«ã®å³å´ã®æ–‡å­—を削除ã—ã¾ã™ã€‚é•·éŽãŽã¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«å…¥ã‚Šåˆ‡ã‚‰ãªã„ã‚‚ã®ã¯ã€ãƒžã‚¦ã‚¹ã®ãƒœã‚¿ãƒ³2を押ã—ãŸã¾ã¾ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã§ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚日本語を入力ã™ã‚‹ã®ã¯ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã§ã™ã€‚kinput2ãŒå‹•ã„ã¦ã„れã°å…¥åŠ›ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+ text "3¼ïÎà¤Î°Û¤Ê¤ë¥¨¥ó¥È¥ê¤¬³Æ¡¹¥¹¥¯¥í¡¼¥ë¥Ð¡¼ÉÕ¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Ê¸»ú¤òÆþÎϤ¹¤ë¤Ë¤Ï¥Ý¥¤¥ó¥¿¤ò»ý¤Ã¤Æ¹Ô¤­¡¢¥¯¥ê¥Ã¥¯¤·¤Æ¤«¤é¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£É¸½àŪ¤ÊMotif¤ÎÊÔ½¸µ¡Ç½¤¬¡¢Emacs¤Î¥­¡¼¥Ð¥¤¥ó¥É¤È¤È¤â¤Ë¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Î㤨¤Ð¡¢¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤È¥³¥ó¥È¥í¡¼¥ë-H¤Ï¥«¡¼¥½¥ë¤Îº¸¤Îʸ»ú¤òºï½ü¤·¡¢¥Ç¥ê¡¼¥È¥­¡¼¤È¥³¥ó¥È¥í¡¼¥ë-D¤Ï¥«¡¼¥½¥ë¤Î±¦Â¦¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£Ä¹²á¤®¤Æ¥¦¥£¥ó¥É¥¦¤ËÆþ¤êÀÚ¤é¤Ê¤¤¤â¤Î¤Ï¡¢¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2¤ò²¡¤·¤¿¤Þ¤Þ¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¥¹¥¯¥í¡¼¥ë¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ÆüËܸì¤òÆþÎϤ¹¤ë¤Î¤Ï¥³¥ó¥È¥í¡¼¥ë-¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ç¤¹¡£kinput2¤¬Æ°¤¤¤Æ¤¤¤ì¤ÐÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $entry2_demo
$entry2_demo = nil
@@ -40,12 +40,12 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'entry2'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
# entry 1
s1 = TkScrollbar.new(w, 'relief'=>'sunken', 'orient'=>'horiz')
@@ -80,12 +80,12 @@ TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
e3.pack('side'=>'top', 'fill'=>'x')
s3.pack('side'=>'top', 'fill'=>'x')
- # åˆæœŸå€¤æŒ¿å…¥
- e1.insert(0, 'åˆæœŸå€¤')
- e2.insert('end', "ã“ã®ã‚¨ãƒ³ãƒˆãƒªã«ã¯é•·ã„文字列ãŒå…¥ã£ã¦ã„ã¦ã€")
- e2.insert('end', "é•·ã™ãŽã¦ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯å…¥ã‚Šåˆ‡ã‚‰ãªã„ã®ã§ã€")
- e2.insert('end', "å®Ÿéš›ã®æ‰€çµ‚りã¾ã§è¦‹ã‚‹ã«ã¯ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã•ã›ãªã‘れã°")
- e2.insert('end', "ãªã‚‰ãªã„ã§ã—ょã†ã€‚")
+ # ½é´üÃÍÁÞÆþ
+ e1.insert(0, '½é´üÃÍ')
+ e2.insert('end', "¤³¤Î¥¨¥ó¥È¥ê¤Ë¤ÏŤ¤Ê¸»úÎ󤬯þ¤Ã¤Æ¤¤¤Æ¡¢")
+ e2.insert('end', "Ť¹¤®¤Æ¥¦¥£¥ó¥É¥¦¤Ë¤ÏÆþ¤êÀÚ¤é¤Ê¤¤¤Î¤Ç¡¢")
+ e2.insert('end', "¼ÂºÝ¤Î½ê½ª¤ê¤Þ¤Ç¸«¤ë¤Ë¤Ï¥¹¥¯¥í¡¼¥ë¤µ¤»¤Ê¤±¤ì¤Ð")
+ e2.insert('end', "¤Ê¤é¤Ê¤¤¤Ç¤·¤ç¤¦¡£")
}.pack('side'=>'top', 'fill'=>'x', 'expand'=>'yes')
diff --git a/ext/tk/sample/demos-jp/entry3.rb b/ext/tk/sample/demos-jp/entry3.rb
index 59c698de62..2728de0b93 100644
--- a/ext/tk/sample/demos-jp/entry3.rb
+++ b/ext/tk/sample/demos-jp/entry3.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
# entry3.rb --
#
# This demonstration script creates several entry widgets whose
@@ -23,33 +23,33 @@ base_frame = TkFrame.new($entry3_demo).pack(:fill=>:both, :expand=>true)
TkLabel.new(base_frame,
:font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-以下ã«ã¯ï¼”種類ã®ã‚¨ãƒ³ãƒˆãƒªãƒœãƒƒã‚¯ã‚¹ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ï¼Žå„エントリボックスã¯ï¼Œ\
-マウスクリックã§é¸æŠžã—文字を打ã¡è¾¼ã‚€ã“ã¨ãŒå¯èƒ½ã§ã™ãŒï¼Œãれãžã‚ŒãŒã©ã®ã‚ˆã†ãª\
-入力をå—ã‘付ã‘ã‚‹ã“ã¨ãŒã§ãã‚‹ã‹ã«ã¯åˆ¶ç´„ãŒè¨­ã‘られã¦ã„ã¾ã™ï¼Ž\
-一ã¤ã‚ã®ã‚¨ãƒ³ãƒˆãƒªãƒœãƒƒã‚¯ã‚¹ã¯æ•´æ•°ã¨è¦‹ãªã•れる文字列ã‹å…¥åŠ›æ–‡å­—ãŒãªã„空ã®çŠ¶æ…‹ã‹\
-ã®å ´åˆã ã‘ã‚’å—ã‘付ã‘,å•題ãŒã‚ã‚‹å ´åˆã¯ã‚¨ãƒ³ãƒˆãƒªãƒœãƒƒã‚¯ã‚¹ãŒç‚¹æ»…ã—ã¾ã™\
-(フォーカスãŒåŽ»ã‚‹æ™‚ã«ãƒã‚§ãƒƒã‚¯ã•れã¾ã™ï¼‰ï¼Ž\
-二ã¤ã‚ã®ã‚¨ãƒ³ãƒˆãƒªãƒœãƒƒã‚¯ã‚¹ã¯ï¼Œå…¥åŠ›ã•ã‚ŒãŸæ–‡å­—列ã®é•·ã•ãŒ\
-ï¼‘ï¼æ–‡å­—未満ã®å ´åˆã ã‘ã‚’å—ã‘付ã‘,制é™ã‚’è¶Šãˆã¦æ›¸ã込もã†ã¨ã—ãŸã¨ãã«ã¯\
-ベルを鳴らã—ã¦çŸ¥ã‚‰ã›ã¾ã™ï¼Ž\
-三ã¤ã‚ã¯ç±³å›½ã®é›»è©±ç•ªå·ã‚’å—ã‘付ã‘るエントリボックスã§ã™ï¼Ž\
-アルファベットã¯ï¼Œé›»è©±æ©Ÿã®ãƒ€ã‚¤ãƒ¤ãƒ«ä¸Šã§å¯¾å¿œã¥ã‘られã¦ã„ã‚‹æ•°å­—ã«å¤‰æ›ã•れã¾ã™ï¼Ž\
-ä¸é©åˆ‡ãªæ–‡å­—ãŒå…¥åŠ›ã•れãŸã‚Šæ•°å­—ä»¥å¤–ã®æ–‡å­—ã®ä½ç½®ã«æ•°å­—を入力ã—よã†ã¨ã—ãŸã‚Š\
-ã—ãŸå ´åˆã«ã¯è­¦å‘Šã®ãƒ™ãƒ«ãŒé³´ã‚Šã¾ã™ï¼Ž\
-å››ã¤ã‚ã®ã‚¨ãƒ³ãƒˆãƒªãƒœãƒƒã‚¯ã‚¹ã¯ï¼Œï¼˜æ–‡å­—ã¾ã§ã®å…¥åŠ›ã‚’å—ã‘付ã‘ã‚‹\
-パスワードフィールドã§ã™ï¼ˆï¼˜æ–‡å­—以上ã¯ç‰¹ã«è­¦å‘Šã‚’出ã™ã“ã¨ãªã無視ã•れã¾ã™ï¼‰ï¼Ž\
-入力ã•ã‚ŒãŸæ–‡å­—ã¯ã‚¢ã‚¹ã‚¿ãƒªã‚¹ã‚¯è¨˜å·ã«ç½®ãæ›ãˆã¦è¡¨ç¤ºã•れã¾ã™ï¼Ž
+°Ê²¼¤Ë¤Ï£´¼ïÎà¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥³Æ¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤Ï¡¤\
+¥Þ¥¦¥¹¥¯¥ê¥Ã¥¯¤ÇÁªÂò¤·Ê¸»ú¤òÂǤÁ¹þ¤à¤³¤È¤¬²Äǽ¤Ç¤¹¤¬¡¤¤½¤ì¤¾¤ì¤¬¤É¤Î¤è¤¦¤Ê\
+ÆþÎϤò¼õ¤±ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤Ë¤ÏÀ©Ìó¤¬Àߤ±¤é¤ì¤Æ¤¤¤Þ¤¹¡¥\
+°ì¤Ä¤á¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤ÏÀ°¿ô¤È¸«¤Ê¤µ¤ì¤ëʸ»úÎ󤫯þÎÏʸ»ú¤¬¤Ê¤¤¶õ¤Î¾õÂÖ¤«\
+¤Î¾ì¹ç¤À¤±¤ò¼õ¤±ÉÕ¤±¡¤ÌäÂ꤬¤¢¤ë¾ì¹ç¤Ï¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤¬ÅÀÌǤ·¤Þ¤¹\
+¡Ê¥Õ¥©¡¼¥«¥¹¤¬µî¤ë»þ¤Ë¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤¹¡Ë¡¥\
+Æó¤Ä¤á¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤Ï¡¤ÆþÎϤµ¤ì¤¿Ê¸»úÎó¤ÎŤµ¤¬\
+£±£°Ê¸»ṳ́Ëþ¤Î¾ì¹ç¤À¤±¤ò¼õ¤±ÉÕ¤±¡¤À©¸Â¤ò±Û¤¨¤Æ½ñ¤­¹þ¤â¤¦¤È¤·¤¿¤È¤­¤Ë¤Ï\
+¥Ù¥ë¤òÌĤ餷¤ÆÃΤ餻¤Þ¤¹¡¥\
+»°¤Ä¤á¤ÏÊÆ¹ñ¤ÎÅÅÏÃÈÖ¹æ¤ò¼õ¤±ÉÕ¤±¤ë¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤Ç¤¹¡¥\
+¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Ï¡¤ÅÅÏõ¡¤Î¥À¥¤¥ä¥ë¾å¤ÇÂбþ¤Å¤±¤é¤ì¤Æ¤¤¤ë¿ô»ú¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡¥\
+ÉÔŬÀÚ¤Êʸ»ú¤¬ÆþÎϤµ¤ì¤¿¤ê¿ô»ú°Ê³°¤Îʸ»ú¤Î°ÌÃ֤˿ô»ú¤òÆþÎϤ·¤è¤¦¤È¤·¤¿¤ê\
+¤·¤¿¾ì¹ç¤Ë¤Ï·Ù¹ð¤Î¥Ù¥ë¤¬ÌĤê¤Þ¤¹¡¥\
+»Í¤Ä¤á¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤Ï¡¤£¸Ê¸»ú¤Þ¤Ç¤ÎÆþÎϤò¼õ¤±ÉÕ¤±¤ë\
+¥Ñ¥¹¥ï¡¼¥É¥Õ¥£¡¼¥ë¥É¤Ç¤¹¡Ê£¸Ê¸»ú°Ê¾å¤ÏÆÃ¤Ë·Ù¹ð¤ò½Ð¤¹¤³¤È¤Ê¤¯Ìµ»ë¤µ¤ì¤Þ¤¹¡Ë¡¥\
+ÆþÎϤµ¤ì¤¿Ê¸»ú¤Ï¥¢¥¹¥¿¥ê¥¹¥¯µ­¹æ¤ËÃÖ¤­´¹¤¨¤ÆÉ½¼¨¤µ¤ì¤Þ¤¹¡¥
EOL
TkFrame.new(base_frame){|f|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$entry3_demo.destroy
$entry3_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'entry3'
}).pack(:side=>:left, :expand=>true)
}
@@ -90,7 +90,7 @@ def focusAndFlash(widget, fg, bg, count=5)
widget.focus(true)
end
-l1 = TkLabelFrame.new(base_frame, :text=>"整数エントリ")
+l1 = TkLabelFrame.new(base_frame, :text=>"À°¿ô¥¨¥ó¥È¥ê")
TkEntry.new(l1, :validate=>:focus,
:vcmd=>[
proc{|s| s == '' || /^[+-]?\d+$/ =~ s }, '%P'
@@ -101,7 +101,7 @@ TkEntry.new(l1, :validate=>:focus,
pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
}
-l2 = TkLabelFrame.new(base_frame, :text=>"é•·ã•制約付ãエントリ")
+l2 = TkLabelFrame.new(base_frame, :text=>"ŤµÀ©ÌóÉÕ¤­¥¨¥ó¥È¥ê")
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')
@@ -190,7 +190,7 @@ def validatePhoneChange(widget, vmode, idx, char)
end
-l3 = TkLabelFrame.new(base_frame, :text=>"米国電話番å·ã‚¨ãƒ³ãƒˆãƒª")
+l3 = TkLabelFrame.new(base_frame, :text=>"ÊÆ¹ñÅÅÏÃÈֹ楨¥ó¥È¥ê")
TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
:textvariable=>entry3content,
:vcmd=>[
@@ -209,7 +209,7 @@ TkEntry.new(l3, :validate=>:key, :invcmd=>proc{Tk.bell},
pack(:fill=>:x, :expand=>true, :padx=>'1m', :pady=>'1m')
}
-l4 = TkLabelFrame.new(base_frame, :text=>"パスワードエントリ")
+l4 = TkLabelFrame.new(base_frame, :text=>"¥Ñ¥¹¥ï¡¼¥É¥¨¥ó¥È¥ê")
TkEntry.new(l4, :validate=>:key, :show=>'*',
:vcmd=>[
proc{|s| s.length <= 8},
diff --git a/ext/tk/sample/demos-jp/filebox.rb b/ext/tk/sample/demos-jp/filebox.rb
index fc014bc282..ffe5fbc5c6 100644
--- a/ext/tk/sample/demos-jp/filebox.rb
+++ b/ext/tk/sample/demos-jp/filebox.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# widget demo prompts the user to select a file (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($filebox_demo) && $entry2_demo
$filebox_demo.destroy
$filebox_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$filebox_demo = TkToplevel.new {|w|
title("File Selection Dialogs")
iconname("filebox")
@@ -18,15 +18,15 @@ $filebox_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($filebox_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
- 'text'=>"エントリã«ãƒ•ァイルåを直接入力ã™ã‚‹ã‹ã€\"Browse\" ボタンを押ã—ã¦ãƒ•ã‚¡ã‚¤ãƒ«é¸æŠžãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‹ã‚‰ãƒ•ァイルåã‚’é¸ã‚“ã§ä¸‹ã•ã„。").pack('side'=>'top')
+ 'text'=>"¥¨¥ó¥È¥ê¤Ë¥Õ¥¡¥¤¥ë̾¤òľÀÜÆþÎϤ¹¤ë¤«¡¢\"Browse\" ¥Ü¥¿¥ó¤ò²¡¤·¤Æ¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°¤«¤é¥Õ¥¡¥¤¥ë̾¤òÁª¤ó¤Ç²¼¤µ¤¤¡£").pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $filebox_demo
$filebox_demo = nil
@@ -35,15 +35,15 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'filebox'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
-['é–‹ã', 'ä¿å­˜'].each{|type|
+# frame À¸À®
+['³«¤¯', 'Êݸ'].each{|type|
TkFrame.new(base_frame) {|f|
- TkLabel.new(f, 'text'=>"ファイルを#{type}: ", 'anchor'=>'e')\
+ TkLabel.new(f, 'text'=>"¥Õ¥¡¥¤¥ë¤ò#{type}: ", 'anchor'=>'e')\
.pack('side'=>'left')
TkEntry.new(f, 'width'=>20) {|e|
@@ -61,7 +61,7 @@ TkFrame.new(base_frame) {|frame|
$tk_strictMotif = TkVarAccess.new('tk_strictMotif')
if ($tk_platform['platform'] == 'unix')
TkCheckButton.new(base_frame,
- 'text'=>'Motifスタイルã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’用ã„ã‚‹',
+ 'text'=>'Motif¥¹¥¿¥¤¥ë¤Î¥À¥¤¥¢¥í¥°¤òÍѤ¤¤ë',
'variable'=>$tk_strictMotif,
'onvalue'=>1, 'offvalue'=>0 ).pack('anchor'=>'c')
end
@@ -83,7 +83,7 @@ def fileDialog(w,ent,operation)
['All files', '*' ]
]
- if operation == 'é–‹ã'
+ if operation == '³«¤¯'
file = Tk.getOpenFile('filetypes'=>types, 'parent'=>w)
else
file = Tk.getSaveFile('filetypes'=>types, 'parent'=>w,
diff --git a/ext/tk/sample/demos-jp/floor.rb b/ext/tk/sample/demos-jp/floor.rb
index 5101a026bb..78cc23a245 100644
--- a/ext/tk/sample/demos-jp/floor.rb
+++ b/ext/tk/sample/demos-jp/floor.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# floorDisplay widget demo (called by 'widget')
#
@@ -50,7 +50,7 @@ def floorDisplay(w,active)
# Create items for the room entry and its label.
TkcWindow.new(w, 600, 100, 'anchor'=>'w', 'window'=>$floor_entry)
- TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"部屋番å·: ")
+ TkcText.new(w, 600, 100, 'anchor'=>'e', 'text'=>"Éô²°ÈÖ¹æ: ")
w['scrollregion'] = w.bbox('all')
end
@@ -1572,13 +1572,13 @@ end
# Below is the "main program" that creates the floorplan demonstration.
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($floor_demo) && $floor_demo
$floor_demo.destroy
$floor_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$floor_demo = TkToplevel.new {|w|
title("Floorplan Canvas Demonstration")
iconname("Floorplan")
@@ -1589,17 +1589,17 @@ $floor_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($floor_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
- 'text'=>"ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ãƒ‡ã‚£ã‚¸ã‚¿ãƒ«ã‚¨ã‚¯ã‚¤ãƒƒãƒ—メント社ã®ã‚¦ã‚§ã‚¹ã‚¿ãƒ³ãƒªã‚µãƒ¼ãƒãƒ©ãƒœãƒ©ãƒˆãƒª (DECWRL) ã®é–“å–ã‚ŠãŒæ›¸ã‹ã‚ŒãŸã‚­ãƒ£ãƒ³ãƒã‚¹ widget ãŒå…¥ã£ã¦ã„ã¾ã™ã€‚ã“れ㯠3階建ã¦ã§ã€å¸¸ã«ãã®ã†ã¡ã®1階分ãŒé¸æŠžã€ã¤ã¾ã‚Šãã®é–“å–りãŒè¡¨ç¤ºã•れるよã†ã«ãªã£ã¦ã„ã¾ã™ã€‚ã‚ã‚‹éšŽã‚’é¸æŠžã™ã‚‹ã«ã¯ã€ãã®ä¸Šã§ãƒžã‚¦ã‚¹ã®å·¦ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。マウスãŒé¸æŠžã•れã¦ã„る階ã®ä¸Šã‚’å‹•ãã¨ã€ãã®ä¸‹ã«ã‚る部屋ã®è‰²ãŒå¤‰ã‚りã€éƒ¨å±‹ç•ªå·ãŒã€Œéƒ¨å±‹ç•ªå·:ã€ã‚¨ãƒ³ãƒˆãƒªã«è¡¨ç¤ºã•れã¾ã™ã€‚ã¾ãŸã€ã‚¨ãƒ³ãƒˆãƒªã«éƒ¨å±‹ç•ªå·ã‚’書ãã¨ãã®éƒ¨å±‹ã®è‰²ãŒå¤‰ã‚りã¾ã™ã€‚"){
+ 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òư¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$floor_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $floor_demo
$floor_demo = nil
@@ -1608,17 +1608,17 @@ $floor_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'floor'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$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)
diff --git a/ext/tk/sample/demos-jp/floor2.rb b/ext/tk/sample/demos-jp/floor2.rb
index 7ca705c7bd..92ace6b51a 100644
--- a/ext/tk/sample/demos-jp/floor2.rb
+++ b/ext/tk/sample/demos-jp/floor2.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# floorDisplay widget demo 2 (called by 'widget')
#
@@ -50,7 +50,7 @@ def floorDisplay2(w,active)
# Create items for the room entry and its label.
w.create(TkcWindow, 600, 100, 'anchor'=>'w', 'window'=>$floor2_entry)
- w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"部屋番å·: ")
+ w.create(TkcText, 600, 100, 'anchor'=>'e', 'text'=>"Éô²°ÈÖ¹æ: ")
w['scrollregion'] = w.bbox('all')
end
@@ -1572,13 +1572,13 @@ end
# Below is the "main program" that creates the floorplan demonstration.
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($floor2_demo) && $floor2_demo
$floor2_demo.destroy
$floor2_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$floor2_demo = TkToplevel.new {|w|
title("Floorplan Canvas Demonstration 2")
iconname("Floorplan2")
@@ -1589,17 +1589,17 @@ $floor2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($floor2_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'8i', 'justify'=>'left',
- 'text'=>"ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ãƒ‡ã‚£ã‚¸ã‚¿ãƒ«ã‚¨ã‚¯ã‚¤ãƒƒãƒ—メント社ã®ã‚¦ã‚§ã‚¹ã‚¿ãƒ³ãƒªã‚µãƒ¼ãƒãƒ©ãƒœãƒ©ãƒˆãƒª (DECWRL) ã®é–“å–ã‚ŠãŒæ›¸ã‹ã‚ŒãŸã‚­ãƒ£ãƒ³ãƒã‚¹ widget ãŒå…¥ã£ã¦ã„ã¾ã™ã€‚ã“れ㯠3階建ã¦ã§ã€å¸¸ã«ãã®ã†ã¡ã®1階分ãŒé¸æŠžã€ã¤ã¾ã‚Šãã®é–“å–りãŒè¡¨ç¤ºã•れるよã†ã«ãªã£ã¦ã„ã¾ã™ã€‚ã‚ã‚‹éšŽã‚’é¸æŠžã™ã‚‹ã«ã¯ã€ãã®ä¸Šã§ãƒžã‚¦ã‚¹ã®å·¦ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。マウスãŒé¸æŠžã•れã¦ã„る階ã®ä¸Šã‚’å‹•ãã¨ã€ãã®ä¸‹ã«ã‚る部屋ã®è‰²ãŒå¤‰ã‚りã€éƒ¨å±‹ç•ªå·ãŒã€Œéƒ¨å±‹ç•ªå·:ã€ã‚¨ãƒ³ãƒˆãƒªã«è¡¨ç¤ºã•れã¾ã™ã€‚ã¾ãŸã€ã‚¨ãƒ³ãƒˆãƒªã«éƒ¨å±‹ç•ªå·ã‚’書ãã¨ãã®éƒ¨å±‹ã®è‰²ãŒå¤‰ã‚りã¾ã™ã€‚"){
+ 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Ç¥£¥¸¥¿¥ë¥¨¥¯¥¤¥Ã¥×¥á¥ó¥È¼Ò¤Î¥¦¥§¥¹¥¿¥ó¥ê¥µ¡¼¥Á¥é¥Ü¥é¥È¥ê (DECWRL) ¤Î´Ö¼è¤ê¤¬½ñ¤«¤ì¤¿¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï 3³¬·ú¤Æ¤Ç¡¢¾ï¤Ë¤½¤Î¤¦¤Á¤Î1³¬Ê¬¤¬ÁªÂò¡¢¤Ä¤Þ¤ê¤½¤Î´Ö¼è¤ê¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤¢¤ë³¬¤òÁªÂò¤¹¤ë¤Ë¤Ï¡¢¤½¤Î¾å¤Ç¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¦¥¹¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë³¬¤Î¾å¤òư¤¯¤È¡¢¤½¤Î²¼¤Ë¤¢¤ëÉô²°¤Î¿§¤¬ÊѤï¤ê¡¢Éô²°Èֹ椬¡ÖÉô²°ÈÖ¹æ:¡×¥¨¥ó¥È¥ê¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢¥¨¥ó¥È¥ê¤ËÉô²°ÈÖ¹æ¤ò½ñ¤¯¤È¤½¤ÎÉô²°¤Î¿§¤¬ÊѤï¤ê¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$floor2_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $floor2_demo
$floor2_demo = nil
@@ -1608,17 +1608,17 @@ $floor2_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'floor2'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$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)
diff --git a/ext/tk/sample/demos-jp/form.rb b/ext/tk/sample/demos-jp/form.rb
index 000fcb5091..84ed94de88 100644
--- a/ext/tk/sample/demos-jp/form.rb
+++ b/ext/tk/sample/demos-jp/form.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# form widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($form_demo) && $form_demo
$form_demo.destroy
$form_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$form_demo = TkToplevel.new {|w|
title("Form Demonstration")
iconname("form")
@@ -18,20 +18,20 @@ $form_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($form_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯ç°¡å˜ãªãƒ•ォーム入力用ã«ãªã£ã¦ã„ã¦ã€ã•ã¾ã–ã¾ãªã‚¨ãƒ³ãƒˆãƒªã«å…¥åŠ›ãŒã§ãã¾ã™ã€‚タブã§ã‚¨ãƒ³ãƒˆãƒªã®åˆ‡æ›¿ãˆãŒã§ãã¾ã™ã€‚"
+ text "¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï´Êñ¤Ê¥Õ¥©¡¼¥àÆþÎÏÍѤˤʤäƤ¤¤Æ¡¢¤µ¤Þ¤¶¤Þ¤Ê¥¨¥ó¥È¥ê¤ËÆþÎϤ¬¤Ç¤­¤Þ¤¹¡£¥¿¥Ö¤Ç¥¨¥ó¥È¥ê¤ÎÀÚÂØ¤¨¤¬¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top', 'fill'=>'x')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $form_demo
$form_demo = nil
@@ -40,12 +40,12 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'form'}
}.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)
@@ -56,10 +56,10 @@ form_data = []
form_data[i] = {'frame'=>f, 'entry'=>e, 'label'=>l}
}
-# 文字列設定
-form_data[1]['label'].text('åå‰:')
-form_data[2]['label'].text('使‰€:')
-form_data[5]['label'].text('電話:')
+# ʸ»úÎóÀßÄê
+form_data[1]['label'].text('̾Á°:')
+form_data[2]['label'].text('½»½ê:')
+form_data[5]['label'].text('ÅÅÏÃ:')
# pack
(1..5).each{|i| form_data[i]['frame'].pack('side'=>'top', 'fill'=>'x')}
diff --git a/ext/tk/sample/demos-jp/goldberg.rb b/ext/tk/sample/demos-jp/goldberg.rb
index fc38d877db..ea521b82ec 100644
--- a/ext/tk/sample/demos-jp/goldberg.rb
+++ b/ext/tk/sample/demos-jp/goldberg.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# Ruby/Tk Goldverg demo (called by 'widget')
#
@@ -63,7 +63,7 @@ msg = TkLabel.new($goldberg_demo) {
font 'Arial 10'
wraplength '4i'
justify 'left'
- text "ã“れã¯ã€ã‚ãªãŸãŒè‡ªåˆ†ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ã„ã‹ã«å…¥ã‚Šçµ„ã‚“ã ã‚‚ã®ã«ã§ãã‚‹ã‹ã‚’示ã™ã¨ã„ã†ã ã‘ã®ãŸã‚ã®ãƒ‡ãƒ¢ã§ã™ã€‚ボールをクリックã™ã‚Œã°ç‰©ãŒå‹•ãå§‹ã‚ã¾ã™ï¼\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
+ text "¤³¤ì¤Ï¡¢¤¢¤Ê¤¿¤¬¼«Ê¬¤Î¥¢¥Ë¥á¡¼¥·¥ç¥ó¤ò¤¤¤«¤ËÆþ¤êÁȤó¤À¤â¤Î¤Ë¤Ç¤­¤ë¤«¤ò¼¨¤¹¤È¤¤¤¦¤À¤±¤Î¤¿¤á¤Î¥Ç¥â¤Ç¤¹¡£¥Ü¡¼¥ë¤ò¥¯¥ê¥Ã¥¯¤¹¤ì¤Ðʪ¤¬Æ°¤­»Ï¤á¤Þ¤¹¡ª\n\n\"Man will always find a difficult means to perform a simple task\"\n - Rube Goldberg"
}
msg.pack('side'=>'top')
=end
@@ -72,7 +72,7 @@ msg.pack('side'=>'top')
# frame
TkFrame.new($goldberg_demo) {|frame|
TkButton.new(frame) {
- text 'é–‰ã˜ã‚‹'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $goldberg_demo
$goldberg_demo = nil
@@ -81,7 +81,7 @@ TkFrame.new($goldberg_demo) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'goldberg'}
}.pack('side'=>'left', 'expand'=>'yes')
@@ -99,7 +99,7 @@ class TkGoldberg_Demo
@S['speed'] = TkVariable.new(5)
@S['cnt'] = TkVariable.new(0)
# @S['message'] = TkVariable.new("\\nWelcome\\nto\\nRuby/Tk")
- @S['message'] = TkVariable.new("\\n よã†ã“ãï¼\\nRuby/Tk\\nã®\\n世界ã¸")
+ @S['message'] = TkVariable.new("\\n ¤è¤¦¤³¤½¡ª\\nRuby/Tk\\n¤Î\\nÀ¤³¦¤Ø")
@S['pause'] = TkVariable.new
@S['details'] = TkVariable.new(true)
@@ -184,7 +184,7 @@ class TkGoldberg_Demo
font 'Arial 10'
wraplength 600
justify 'left'
- text "ã“れã¯ã€ã‚ãªãŸãŒè‡ªåˆ†ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ã„ã‹ã«å…¥ã‚Šçµ„ã‚“ã ã‚‚ã®ã«ã§ãã‚‹ã‹ã‚’示ã™ã¨ã„ã†ã ã‘ã®ãŸã‚ã®ãƒ‡ãƒ¢ã§ã™ã€‚ボールをクリックã™ã‚Œã°ç‰©ãŒå‹•ãå§‹ã‚ã¾ã™ï¼\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
+ text "¤³¤ì¤Ï¡¢¤¢¤Ê¤¿¤¬¼«Ê¬¤Î¥¢¥Ë¥á¡¼¥·¥ç¥ó¤ò¤¤¤«¤ËÆþ¤êÁȤó¤À¤â¤Î¤Ë¤Ç¤­¤ë¤«¤ò¼¨¤¹¤È¤¤¤¦¤À¤±¤Î¤¿¤á¤Î¥Ç¥â¤Ç¤¹¡£¥Ü¡¼¥ë¤ò¥¯¥ê¥Ã¥¯¤¹¤ì¤Ðʪ¤¬Æ°¤­»Ï¤á¤Þ¤¹¡ª\n\"Man will always find a difficult means to perform a simple task\" - Rube Goldberg"
}
msg.place(:in=>@canvas, :relx=>0, :rely=>0, :anchor=>:nw)
@@ -192,7 +192,7 @@ class TkGoldberg_Demo
# TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
- text 'é–‰ã˜ã‚‹'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $goldberg_demo
$goldberg_demo = nil
@@ -202,7 +202,7 @@ class TkGoldberg_Demo
# TkButton.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
Tk::Button.new(frame, :bg=>@C['bg'], :activebackground=>@C['bg']) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'goldberg'}
}.pack('side'=>'left', 'padx'=>5)
@@ -420,7 +420,7 @@ class TkGoldberg_Demo
color = @C['0']
TkcText.new(@canvas,
# [579, 119], :text=>'START HERE!',
- [558, 119], :text=>'ã“ã“ã‹ã‚‰ã‚¹ã‚¿ãƒ¼ãƒˆï¼',
+ [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,
@@ -1792,7 +1792,7 @@ class TkGoldberg_Demo
@canvas.delete('I24', 'I26')
TkcText.new(@canvas, 430, 735, :anchor=>:s, :tag=>'I26',
#:text=>'click to continue',
- :text=>'クリックã§ãƒªã‚»ãƒƒãƒˆã—ã¾ã™',
+ :text=>'¥¯¥ê¥Ã¥¯¤Ç¥ê¥»¥Ã¥È¤·¤Þ¤¹',
:font=>['Times Roman', 20, :bold])
@canvas.bind('1', proc{reset})
return 4
diff --git a/ext/tk/sample/demos-jp/hello b/ext/tk/sample/demos-jp/hello
index e942f3d851..08f154d499 100644
--- a/ext/tk/sample/demos-jp/hello
+++ b/ext/tk/sample/demos-jp/hello
@@ -1,10 +1,10 @@
#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
require 'tk'
TkButton.new(nil,
- 'text'=>"ã“ã‚“ã«ã¡ã¯ã€ä¸–界",
- 'command'=>proc{print "ã“ã‚“ã«ã¡ã¯ã€ä¸–界\n"; exit}
+ 'text'=>"¤³¤ó¤Ë¤Á¤Ï¡¢À¤³¦",
+ 'command'=>proc{print "¤³¤ó¤Ë¤Á¤Ï¡¢À¤³¦\n"; exit}
).pack
Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/hscale.rb b/ext/tk/sample/demos-jp/hscale.rb
index 2dfbf38272..5615aa50bd 100644
--- a/ext/tk/sample/demos-jp/hscale.rb
+++ b/ext/tk/sample/demos-jp/hscale.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
require "tkcanvas"
if defined?($hscale_demo) && $hscale_deom
@@ -18,16 +18,16 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '3.5i'
justify 'left'
- text "下ã«ã¯çŸ¢å°ãŒ1ã¤ã¨æ°´å¹³ãªã‚¹ã‚±ãƒ¼ãƒ«ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚\
-スケール上ã§ãƒžã‚¦ã‚¹ãƒœã‚¿ãƒ³1をクリックã€ã¾ãŸã¯ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨\
-矢å°ã®é•·ã•を変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+ text "²¼¤Ë¤ÏÌð°õ¤¬1¤Ä¤È¿åÊ¿¤Ê¥¹¥±¡¼¥ë¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\
+¥¹¥±¡¼¥ë¾å¤Ç¥Þ¥¦¥¹¥Ü¥¿¥ó1¤ò¥¯¥ê¥Ã¥¯¡¢¤Þ¤¿¤Ï¥É¥é¥Ã¥°¤¹¤ë¤È\
+Ìð°õ¤ÎŤµ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc {
tmppath = $hscale_demo
$hscale_demo = nil
@@ -36,7 +36,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc { showCode 'hscale' }
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
diff --git a/ext/tk/sample/demos-jp/icon.rb b/ext/tk/sample/demos-jp/icon.rb
index 6b9e1a570a..935519435b 100644
--- a/ext/tk/sample/demos-jp/icon.rb
+++ b/ext/tk/sample/demos-jp/icon.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# iconic button widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($icon_demo) && $icon_demo
$icon_demo.destroy
$icon_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$icon_demo = TkToplevel.new {|w|
title("Iconic Button Demonstration")
iconname("icon")
@@ -18,20 +18,20 @@ $icon_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($icon_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
- text "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³ã¨ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ä¸Šã«ãƒ“ットマップや画åƒã‚’表示ã™ã‚‹ 3 ã¤ã®æ–¹æ³•を示ã—ã¦ã„ã¾ã™ã€‚å·¦ã«ã‚ã‚‹ã®ã¯2ã¤ã®ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³ã§ã€ãれãžã‚ŒãŒã€ãƒ“ットマップã¨é¸æŠžã‚’示ã™ã‚¤ãƒ³ã‚¸ã‚±ãƒ¼ã‚¿ã§ã§ãã¦ã„ã¾ã™ã€‚中央ã«ã‚ã‚‹ã®ã¯ã€é¸æŠžæ¸ˆã¿ã‹ã©ã†ã‹ã«ã‚ˆã£ã¦ç•°ãªã‚‹ç”»åƒã‚’表示ã™ã‚‹ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ã§ã™ã€‚å³å´ã«ã‚ã‚‹ã®ã¯é¸æŠžæ¸ˆã¿ã‹ã©ã†ã‹ã«ã‚ˆã£ã¦èƒŒæ™¯è‰²ãŒå¤‰ã‚るビットマップを表示ã™ã‚‹ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ã§ã™ã€‚"
+ text "¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥é¥¸¥ª¥Ü¥¿¥ó¤È¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¾å¤Ë¥Ó¥Ã¥È¥Þ¥Ã¥×¤ä²èÁü¤òɽ¼¨¤¹¤ë 3 ¤Ä¤ÎÊýË¡¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£º¸¤Ë¤¢¤ë¤Î¤Ï2¤Ä¤Î¥é¥¸¥ª¥Ü¥¿¥ó¤Ç¡¢¤½¤ì¤¾¤ì¤¬¡¢¥Ó¥Ã¥È¥Þ¥Ã¥×¤ÈÁªÂò¤ò¼¨¤¹¥¤¥ó¥¸¥±¡¼¥¿¤Ç¤Ç¤­¤Æ¤¤¤Þ¤¹¡£Ãæ±û¤Ë¤¢¤ë¤Î¤Ï¡¢ÁªÂòºÑ¤ß¤«¤É¤¦¤«¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë²èÁü¤òɽ¼¨¤¹¤ë¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤Ç¤¹¡£±¦Â¦¤Ë¤¢¤ë¤Î¤ÏÁªÂòºÑ¤ß¤«¤É¤¦¤«¤Ë¤è¤Ã¤ÆÇØ·Ê¿§¤¬ÊѤï¤ë¥Ó¥Ã¥È¥Þ¥Ã¥×¤òɽ¼¨¤¹¤ë¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤Ç¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $icon_demo
$icon_demo = nil
@@ -40,13 +40,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'icon'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# image 生æˆ
+# image À¸À®
flagup = \
TkBitmapImage.new('file'=>[$demo_dir,'..',
'images','flagup.xbm'].join(File::Separator),
@@ -59,10 +59,10 @@ TkBitmapImage.new('file'=>[$demo_dir,'..',
[$demo_dir,'..',
'images','flagdown.xbm'].join(File::Separator))
-# 変数生æˆ
+# ÊÑ¿ôÀ¸À®
letters = TkVariable.new
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame, 'borderwidth'=>10){|w|
TkFrame.new(w) {|f|
# TkRadioButton.new(f){
diff --git a/ext/tk/sample/demos-jp/image1.rb b/ext/tk/sample/demos-jp/image1.rb
index 0c69b2a45f..10078c6c22 100644
--- a/ext/tk/sample/demos-jp/image1.rb
+++ b/ext/tk/sample/demos-jp/image1.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# two image widgets demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($image1_demo) && $image1_demo
$image1_demo.destroy
$image1_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$image1_demo = TkToplevel.new {|w|
title('Image Demonstration #1')
iconname("Image1")
@@ -18,20 +18,20 @@ $image1_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($image1_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "ã“ã®ãƒ‡ãƒ¢ã§ã¯2ã¤ã®ãƒ©ãƒ™ãƒ«ä¸Šã«ç”»åƒã‚’ãれãžã‚Œè¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚"
+ text "¤³¤Î¥Ç¥â¤Ç¤Ï2¤Ä¤Î¥é¥Ù¥ë¾å¤Ë²èÁü¤ò¤½¤ì¤¾¤ìɽ¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $image1_demo
$image1_demo = nil
@@ -40,13 +40,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'image1'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# image 生æˆ
+# image À¸À®
image1a = \
TkPhotoImage.new('file'=>[$demo_dir,'..',
'images','earth.gif'].join(File::Separator))
@@ -54,7 +54,7 @@ image1b = \
TkPhotoImage.new('file'=>[$demo_dir,'..',
'images','earthris.gif'].join(File::Separator))
-# label 生æˆ
+# label À¸À®
#[ TkLabel.new(base_frame, 'image'=>image1a, 'bd'=>1, 'relief'=>'sunken'),
# TkLabel.new(base_frame, 'image'=>image1b, 'bd'=>1, 'relief'=>'sunken')
#].each{|w| w.pack('side'=>'top', 'padx'=>'.5m', 'pady'=>'.5m')}
diff --git a/ext/tk/sample/demos-jp/image2.rb b/ext/tk/sample/demos-jp/image2.rb
index aa507c5b9b..3e8b87461f 100644
--- a/ext/tk/sample/demos-jp/image2.rb
+++ b/ext/tk/sample/demos-jp/image2.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# widget demo 'load image' (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($image2_demo) && $image2_demo
$image2_demo.destroy
$image2_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$image2_demo = TkToplevel.new {|w|
title('Image Demonstration #2')
iconname("Image2")
@@ -18,20 +18,20 @@ $image2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($image2_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "ã“ã®ãƒ‡ãƒ¢ã§ã¯Tkã® photo image を使用ã—ã¦ç”»åƒã‚’見るã“ã¨ãŒã§ãã¾ã™ã€‚最åˆã«ã‚¨ãƒ³ãƒˆãƒªå†…ã«ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåを入れã¦ä¸‹ã•ã„。次ã«ä¸‹ã®ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã«ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ロードã™ã‚‹ãŸã‚ã€ãƒªã‚¿ãƒ¼ãƒ³ã‚’押ã—ã¦ãã ã•ã„。ãã®å¾Œã€ç”»åƒã‚’é¸æŠžã™ã‚‹ãŸã‚ã«ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã®ä¸­ã®ãƒ•ァイルåをダブルクリックã—ã¦ä¸‹ã•ã„。"
+ text "¤³¤Î¥Ç¥â¤Ç¤ÏTk¤Î photo image ¤ò»ÈÍѤ·¤Æ²èÁü¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ºÇ½é¤Ë¥¨¥ó¥È¥êÆâ¤Ë¤Ë¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£¼¡¤Ë²¼¤Î¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¡¼¥É¤¹¤ë¤¿¤á¡¢¥ê¥¿¡¼¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤Î¸å¡¢²èÁü¤òÁªÂò¤¹¤ë¤¿¤á¤Ë¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤ÎÃæ¤Î¥Õ¥¡¥¤¥ë̾¤ò¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $image2_demo
$image2_demo = nil
@@ -40,20 +40,20 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'image2'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# 変数生æˆ
+# ÊÑ¿ôÀ¸À®
$dirName = TkVariable.new([$demo_dir,'..','images'].join(File::Separator))
-# image 生æˆ
+# image À¸À®
$image2a = TkPhotoImage.new
-# ファイルå入力部
-TkLabel.new(base_frame, 'text'=>'ディレクトリ:')\
+# ¥Õ¥¡¥¤¥ë̾ÆþÎÏÉô
+TkLabel.new(base_frame, 'text'=>'¥Ç¥£¥ì¥¯¥È¥ê:')\
.pack('side'=>'top', 'anchor'=>'w')
image2_e = TkEntry.new(base_frame) {
@@ -64,7 +64,7 @@ image2_e = TkEntry.new(base_frame) {
TkFrame.new(base_frame, 'height'=>'3m', 'width'=>20)\
.pack('side'=>'top', 'anchor'=>'w')
-TkLabel.new(base_frame, 'text'=>'ファイル:')\
+TkLabel.new(base_frame, 'text'=>'¥Õ¥¡¥¤¥ë:')\
.pack('side'=>'top', 'anchor'=>'w')
TkFrame.new(base_frame){|w|
@@ -85,14 +85,14 @@ 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'=>'ç”»åƒ:'),
+ TkLabel.new(base_frame, 'text'=>'²èÁü:'),
# TkLabel.new(base_frame, 'image'=>$image2a)
Tk::Label.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-jp/image3.rb b/ext/tk/sample/demos-jp/image3.rb
index 5c1ceb2816..625e69a21d 100644
--- a/ext/tk/sample/demos-jp/image3.rb
+++ b/ext/tk/sample/demos-jp/image3.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
# image3.rb
#
# This demonstration script creates a simple collection of widgets
@@ -56,15 +56,15 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "ã“ã®ãƒ‡ãƒ¢ã§ã¯Tkã® photo image を使用ã—ã¦ç”»åƒã‚’ 見るã“ã¨ãŒã§ãã¾ã™ã€‚最åˆã«ã‚¨ãƒ³ãƒˆãƒªå†…ã«ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåを入れã¦ä¸‹ã•ã„。次ã«ä¸‹ã®ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã«ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ロードã™ã‚‹ãŸã‚ã€ãƒªã‚¿ãƒ¼ãƒ³ã‚’押ã—ã¦ãã ã•ã„。ãã®å¾Œã€ç”»åƒã‚’é¸æŠžã™ã‚‹ãŸã‚ã«ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã®ä¸­ã®ãƒ•ァイルåをダブルクリックã—ã¦ä¸‹ã•ã„。"
+ text "¤³¤Î¥Ç¥â¤Ç¤ÏTk¤Î photo image ¤ò»ÈÍѤ·¤Æ²èÁü¤ò ¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ºÇ½é¤Ë¥¨¥ó¥È¥êÆâ¤Ë¤Ë¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£¼¡¤Ë²¼¤Î¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¡¼¥É¤¹¤ë¤¿¤á¡¢¥ê¥¿¡¼¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤Î¸å¡¢²èÁü¤òÁªÂò¤¹¤ë¤¿¤á¤Ë¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤ÎÃæ¤Î¥Õ¥¡¥¤¥ë̾¤ò¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£"
}
msg.pack('side'=>'top')
# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $image3_demo
$image3_demo = nil
@@ -73,7 +73,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'image3'}
}.pack('side'=>'left', 'expand'=>'yes')
@@ -92,9 +92,9 @@ $image3a = TkPhotoImage.new
#
image3_f = TkFrame.new(base_frame).pack(:fill=>:both, :expand=>true)
-image3_df = TkLabelFrame.new(base_frame, :text=>'ディレクトリ:')
+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)
@@ -109,12 +109,12 @@ 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')
}
-image3_if = TkLabelFrame.new(base_frame, :text=>'イメージ:') {|f|
+image3_if = TkLabelFrame.new(base_frame, :text=>'¥¤¥á¡¼¥¸:') {|f|
# TkLabel.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
Tk::Label.new(f, :image=>$image3a).pack(:padx=>'2m', :pady=>'2m')
}
diff --git a/ext/tk/sample/demos-jp/items.rb b/ext/tk/sample/demos-jp/items.rb
index b1d66f367b..4440905db8 100644
--- a/ext/tk/sample/demos-jp/items.rb
+++ b/ext/tk/sample/demos-jp/items.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# canvas item types widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($items_demo) && $items_demo
$items_demo.destroy
$items_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$items_demo = TkToplevel.new {|w|
title("Canvas Item Demonstration")
iconname("Items")
@@ -18,19 +18,19 @@ $items_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($items_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
- text "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ã‚­ãƒ£ãƒ³ãƒã‚¹ widget ãŒå…¥ã£ã¦ãŠã‚Šã€ãã®ä¸­ã«ã¯ã‚­ãƒ£ãƒ³ãƒã‚¹ widget ãŒã‚µãƒãƒ¼ãƒˆã™ã‚‹æ§˜ã€…ãªã‚¿ã‚¤ãƒ—ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ä¾‹ãŒå…¥ã£ã¦ã„ã¾ã™ã€‚次ã®ã‚ˆã†ãªæ“作ãŒã§ãã¾ã™ã€‚\n ボタン-1 ドラッグ:\tアイテムを動ã‹ã™ã€‚\n ボタン-2 ドラッグ:\t見ãˆã¦ã„る部分をãšã‚‰ã™ã€‚\n ボタン-3 ドラッグ:\t領域を囲ã†ã€‚\n コントロール-F:\t領域ã®ä¸‹ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’表示ã™ã‚‹ã€‚"
+ text "¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥­¥ã¥ó¥Ð¥¹ widget ¤¬Æþ¤Ã¤Æ¤ª¤ê¡¢¤½¤ÎÃæ¤Ë¤Ï¥­¥ã¥ó¥Ð¥¹ widget ¤¬¥µ¥Ý¡¼¥È¤¹¤ëÍÍ¡¹¤Ê¥¿¥¤¥×¤Î¥¢¥¤¥Æ¥à¤ÎÎ㤬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¼¡¤Î¤è¤¦¤ÊÁàºî¤¬¤Ç¤­¤Þ¤¹¡£\n ¥Ü¥¿¥ó-1 ¥É¥é¥Ã¥°:\t¥¢¥¤¥Æ¥à¤òư¤«¤¹¡£\n ¥Ü¥¿¥ó-2 ¥É¥é¥Ã¥°:\t¸«¤¨¤Æ¤¤¤ëÉôʬ¤ò¤º¤é¤¹¡£\n ¥Ü¥¿¥ó-3 ¥É¥é¥Ã¥°:\tÎΰè¤ò°Ï¤¦¡£\n ¥³¥ó¥È¥í¡¼¥ë-F:\tÎΰè¤Î²¼¤Î¥¢¥¤¥Æ¥à¤òɽ¼¨¤¹¤ë¡£"
}.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $items_demo
$items_demo = nil
@@ -39,15 +39,15 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'items'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
cvs = nil
TkFrame.new(base_frame) {|cf|
- # canvas 生æˆ
+ # canvas À¸À®
cvs = TkCanvas.new(cf) {|c|
focus
scrollregion '0c 0c 30c 24c'
@@ -113,11 +113,11 @@ 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'=>'ライン', 'anchor'=>'n')
+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',
'join'=>'miter', 'tags'=>$tag_item )
@@ -136,7 +136,7 @@ TkcLine.new(cvs, '1c','7c','1.75c','5.8c','2.5c','7c','3.25c','5.8c','4c','7c',
'tags'=>$tag_item )
TkcText.new(cvs, '15c', '.2c',
- 'text'=>'曲線 (滑らã‹ã«ã¤ãªã„ã ç›´ç·š)', 'anchor'=>'n')
+ 'text'=>'¶ÊÀþ (³ê¤é¤«¤Ë¤Ä¤Ê¤¤¤ÀľÀþ)', 'anchor'=>'n')
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',
@@ -148,7 +148,7 @@ TkcLine.new(cvs, '12c','6c','13.5c','4.5c','16.5c','7.5c','18c','6c',
'images', 'gray25.xbm'].join(File::Separator),
'fill'=>red, 'tags'=>$tag_item )
-TkcText.new(cvs, '25c', '.2c', 'text'=>'多角形', 'anchor'=>'n')
+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,
@@ -163,7 +163,7 @@ TkcPolygon.new(cvs, '22c','4.5c','25c','4.5c','25c','6.75c','28c','6.75c',
'images', 'gray25.xbm'].join(File::Separator),
'outline'=>'black', 'tags'=>$tag_item )
-TkcText.new(cvs, '5c', '8.2c', 'text'=>'矩形', 'anchor'=>'n')
+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',
@@ -173,7 +173,7 @@ TkcRectangle.new(cvs, '6c','10c','9c','15c', 'outline'=>'',
'images','gray25.xbm'].join(File::Separator),
'fill'=>blue, 'tags'=>$tag_item )
-TkcText.new(cvs, '15c', '8.2c', 'text'=>'楕円', 'anchor'=>'n')
+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',
@@ -183,13 +183,13 @@ TkcOval.new(cvs, '16c','10c','19c','15c', 'outline'=>'',
'images','gray25.xbm'].join(File::Separator),
'fill'=>blue, 'tags'=>$tag_item )
-TkcText.new(cvs, '25c', '8.2c', 'text'=>'テキスト', 'anchor'=>'n')
+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',
- 'text'=>'短ã„テキスト。ワードラップã€å·¦æƒãˆã€ã‚¢ãƒ³ã‚«ãƒ¼ã¯åŒ—(上)。□ã¯å„テキストã®ã‚¢ãƒ³ã‚«ãƒ¼ãƒã‚¤ãƒ³ãƒˆã‚’示ã™ã€‚', 'tags'=>$tag_item )
+ '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,
- 'text'=>"ã„ãã¤ã‹ã®è¡Œã€‚\nãれãžã‚Œç‹¬ç«‹ã«\n行æƒãˆã€‚\nå…¨ã¦å·¦ç«¯ãŒã‚¢ãƒ³ã‚«ãƒ¼ã•れã¦ã„る。", 'justify'=>'center', 'tags'=>$tag_item )
+ '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,
@@ -202,7 +202,7 @@ else
'tags'=>$tag_item )
end
-TkcText.new(cvs, '5c', '16.2c', 'text'=>'å¼§', 'anchor'=>'n')
+TkcText.new(cvs, '5c', '16.2c', 'text'=>'¸Ì', 'anchor'=>'n')
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',
@@ -221,7 +221,7 @@ TkcArc.new(cvs, '5.5c','20.5c','9.5c','23.5c', 'width'=>'4m', 'style'=>'chord',
'fill'=>blue, 'outline'=>'', 'start'=>45, 'extent'=>270,
'tags'=>$tag_item)
-TkcText.new(cvs, '15c', '16.2c', 'text'=>'ビットマップ', 'anchor'=>'n')
+TkcText.new(cvs, '15c', '16.2c', 'text'=>'¥Ó¥Ã¥È¥Þ¥Ã¥×', 'anchor'=>'n')
#TkcBitmap.new(cvs, '13c','20c',
# 'bitmap'=>'@' + ['images', 'face'].join(File::Separator),
# 'tags'=>$tag_item)
@@ -239,7 +239,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
@@ -249,15 +249,15 @@ TkcBitmap.new(cvs, '17c','21.5c') {
# tags $tag_item
#}
-TkcText.new(cvs, '25c', '16.2c', 'text'=>'ウィンドウ', 'anchor'=>'n')
+TkcText.new(cvs, '25c', '16.2c', 'text'=>'¥¦¥£¥ó¥É¥¦', 'anchor'=>'n')
TkButton.new(cvs) {|b|
- text '押ã—ã¦ã­'
+ text '²¡¤·¤Æ¤Í'
command proc{butPress cvs, red}
TkcWindow.new(cvs, '21c','18c',
'window'=>b, 'anchor'=>'nw', 'tags'=>$tag_item)
}
TkEntry.new(cvs, 'width'=>20, 'relief'=>'sunken') {|e|
- insert 'end', '編集ã—ã¦ã­'
+ insert 'end', 'ÊÔ½¸¤·¤Æ¤Í'
TkcWindow.new(cvs, '21c','21c',
'window'=>e, 'anchor'=>'nw', 'tags'=>$tag_item)
}
@@ -266,9 +266,9 @@ TkScale.new(cvs, 'from'=>0, 'to'=>100, 'length'=>'6c', 'sliderlength'=>'.4c',
TkcWindow.new(cvs, '28.5c','17.5c',
'window'=>scl, 'anchor'=>'n', 'tags'=>$tag_item)
}
-TkcText.new(cvs, '21c', '17.9c', 'text'=>'ボタン:', 'anchor'=>'sw')
-TkcText.new(cvs, '21c', '20.9c', 'text'=>'エントリ:', 'anchor'=>'sw')
-TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'スケール:', 'anchor'=>'s')
+TkcText.new(cvs, '21c', '17.9c', 'text'=>'¥Ü¥¿¥ó:', 'anchor'=>'sw')
+TkcText.new(cvs, '21c', '20.9c', 'text'=>'¥¨¥ó¥È¥ê:', 'anchor'=>'sw')
+TkcText.new(cvs, '28.5c', '17.4c', 'text'=>'¥¹¥±¡¼¥ë:', 'anchor'=>'s')
# Set up event bindings for canvas:
cvs.itembind($tag_item, 'Any-Enter', proc{itemEnter cvs})
@@ -374,6 +374,6 @@ end
def butPress(w,color)
i = TkcText.new(w, '25c', '18.1c',
- 'text'=>'ã„ã¦ã¦!!', 'fill'=>color, 'anchor'=>'n')
+ 'text'=>'¤¤¤Æ¤Æ!!', 'fill'=>color, 'anchor'=>'n')
Tk.after(500, proc{w.delete i})
end
diff --git a/ext/tk/sample/demos-jp/ixset b/ext/tk/sample/demos-jp/ixset
index 40a77f487c..46c2378073 100644
--- a/ext/tk/sample/demos-jp/ixset
+++ b/ext/tk/sample/demos-jp/ixset
@@ -164,9 +164,9 @@ class Xsettings
#
bell = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
l = TkLabel.new(bell, 'text'=>'Bell Settings')
- @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
- 'label'=>"Volume (%)")
+ @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
+ 'label'=>"Volume (%)")
f = TkFrame.new(bell)
@w_bellpit = LabelEntry.new(f, "Pitch (Hz)", 6)
@@ -180,13 +180,13 @@ class Xsettings
#
# Keyboard settings
- #
+ #
kbdonoff = nil
kbdcli = nil
kbd = TkFrame.new(@root, 'relief'=>'raised', 'borderwidth'=>2)
l = TkLabel.new(kbd, 'text'=>'Keyboard Repeat Settings')
f = TkFrame.new(kbd)
- @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
+ @w_kbdonoff = TkCheckButton.new(f, 'text'=>'On', 'relief'=>'flat',
'onvalue'=>'on', 'offvalue'=>'off',
'variable'=>@w_kbdrep ) {
def self.set(value)
@@ -198,8 +198,8 @@ class Xsettings
end
pack('side'=>'left', 'expand'=>'yes', 'fill'=>'both')
}
- @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
+ @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
'label'=>'Click Volume (%)')
@w_kbdcli.pack('side'=>'left', 'expand'=>'yes')
l.pack('side'=>'top', 'expand'=>'yes')
@@ -225,9 +225,9 @@ class Xsettings
l = TkLabel.new(screen, 'text'=>'Screen-saver Settings')
f = TkFrame.new(screen)
ff1 = TkFrame.new(f)
- [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
- 'relief'=>'flat',
- 'variable'=>@w_screenbla,
+ [ @w_screenblank = TkRadioButton.new(ff1, 'text'=>'Blank',
+ 'relief'=>'flat',
+ 'variable'=>@w_screenbla,
'value'=>'blank') {
def self.set(value)
if value == 'blank'
@@ -236,10 +236,10 @@ class Xsettings
self.deselect
end
end
- },
- @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
- 'relief'=>'flat',
- 'variable'=>@w_screenbla,
+ },
+ @w_screenpat = TkRadioButton.new(ff1, 'text'=>'Pattern',
+ 'relief'=>'flat',
+ 'variable'=>@w_screenbla,
'value'=>'noblank') {
def self.set(value)
if value != 'blank'
@@ -252,7 +252,7 @@ class Xsettings
].each {|w| w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w') }
ff2 = TkFrame.new(f)
- [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
+ [ @w_screentim = LabelEntry.new(ff2, 'Timeout (s)', 5),
@w_screencyc = LabelEntry.new(ff2, 'Cycle (s)', 5) ].each{|w|
w.pack('side'=>'top', 'pady'=>2, 'anchor'=>'e')
}
diff --git a/ext/tk/sample/demos-jp/ixset2 b/ext/tk/sample/demos-jp/ixset2
index e11ce2ac8f..5b816e40b1 100644
--- a/ext/tk/sample/demos-jp/ixset2
+++ b/ext/tk/sample/demos-jp/ixset2
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ixset --
# A nice interface to "xset" to change X server settings
@@ -135,8 +135,8 @@ class Xsettings
def initialize(parent, text, length, range=[])
@frame = TkFrame.new(parent)
TkLabel.new(@frame, 'text'=>text).pack('side'=>'left')
- if range.size > 0
- @entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
+ if range.size > 0
+ @entry = TkSpinbox.new(@frame, 'width'=>length, 'relief'=>'sunken',
'from'=>range[0], 'to'=>range[1])
else
@entry = TkEntry.new(@frame, 'width'=>length, 'relief'=>'sunken')
@@ -165,17 +165,17 @@ class Xsettings
# Buttons
#
btn_frame = TkFrame.new(@root)
- buttons = [
- @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
- 'default'=>'active', 'text'=>'了解'),
- @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
- 'default'=>'normal', 'text'=>'é©ç”¨',
+ buttons = [
+ @btn_OK = TkButton.new(btn_frame, 'command'=>proc{win.ok},
+ 'default'=>'active', 'text'=>'λ²ò'),
+ @btn_APPLY = TkButton.new(btn_frame, 'command'=>proc{win.writesettings},
+ 'default'=>'normal', 'text'=>'ŬÍÑ',
'state'=>'disabled'),
- @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
- 'default'=>'normal', 'text'=>'å–æ¶ˆ',
+ @btn_CANCEL = TkButton.new(btn_frame, 'command'=>proc{win.cancel},
+ 'default'=>'normal', 'text'=>'¼è¾Ã',
'state'=>'disabled'),
- @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
- 'default'=>'normal', 'text'=>'中止')
+ @btn_QUIT = TkButton.new(btn_frame, 'command'=>proc{win.quit},
+ 'default'=>'normal', 'text'=>'̾ȧ')
]
buttons.each{|b| b.pack('side'=>'left', 'expand'=>'yes', 'pady'=>5) }
@@ -202,16 +202,16 @@ class Xsettings
#
# Bell settings
#
- bell = TkLabelframe.new(@root, 'text'=>'ベル設定',
+ bell = TkLabelframe.new(@root, 'text'=>'¥Ù¥ëÀßÄê',
'padx'=>'1.5m', 'pady'=>'1.5m')
- @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
- 'label'=>"éŸ³é‡ (%)")
+ @w_bellvol = TkScale.new(bell, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
+ 'label'=>"²»ÎÌ (%)")
f = TkFrame.new(bell)
- @w_bellpit = LabelEntry.new(f, "音程 (Hz)", 6, [25, 20000])
+ @w_bellpit = LabelEntry.new(f, "²»Äø (Hz)", 6, [25, 20000])
@w_bellpit.pack('side'=>'left', 'padx'=>5)
- @w_belldur = LabelEntry.new(f, "æŒç¶šæ™‚é–“ (ms)", 6, [1, 10000])
+ @w_belldur = LabelEntry.new(f, "»ý³»þ´Ö (ms)", 6, [1, 10000])
@w_belldur.pack('side'=>'right', 'padx'=>5)
@w_bellvol.pack('side'=>'top', 'expand'=>'yes')
@@ -219,14 +219,14 @@ class Xsettings
#
# Keyboard settings
- #
+ #
kbdonoff = nil
kbdcli = nil
- kbd = TkLabelframe.new(@root, 'text'=>'キーボードリピート設定',
+ kbd = TkLabelframe.new(@root, 'text'=>'¥­¡¼¥Ü¡¼¥É¥ê¥Ô¡¼¥ÈÀßÄê',
'padx'=>'1.5m', 'pady'=>'1.5m')
f = TkFrame.new(kbd)
- @w_kbdonoff = TkCheckButton.new(f, 'text'=>'クリック音ã‚り',
- 'relief'=>'flat',
+ @w_kbdonoff = TkCheckButton.new(f, 'text'=>'¥¯¥ê¥Ã¥¯²»¤¢¤ê',
+ 'relief'=>'flat',
'onvalue'=>'on', 'offvalue'=>'off',
'variable'=>@w_kbdrep ) {
def self.set(value)
@@ -238,33 +238,33 @@ class Xsettings
end
pack('side'=>'left', 'expand'=>'yes', 'fill'=>'x', 'padx'=>[0, '1m'])
}
- @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
- 'tickinterval'=>20, 'orient'=>'horizontal',
- 'label'=>'ã‚¯ãƒªãƒƒã‚¯éŸ³é‡ (%)')
- @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
+ @w_kbdcli = TkScale.new(f, 'from'=>0, 'to'=>100, 'length'=>200,
+ 'tickinterval'=>20, 'orient'=>'horizontal',
+ 'label'=>'¥¯¥ê¥Ã¥¯²»ÎÌ (%)')
+ @w_kbdcli.pack('side'=>'left', 'expand'=>'yes',
'fill'=>'x', 'padx'=>['1m', 0])
f.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'fill'=>'x')
#
# Mouse settings
#
- mouse = TkLabelframe.new(@root, 'text'=>'マウス設定',
+ mouse = TkLabelframe.new(@root, 'text'=>'¥Þ¥¦¥¹ÀßÄê',
'padx'=>'1.5m', 'pady'=>'1.5m')
f = TkFrame.new(mouse)
- @w_mouseacc = LabelEntry.new(f, '加速é‡', 5)
+ @w_mouseacc = LabelEntry.new(f, '²Ã®ÎÌ', 5)
@w_mouseacc.pack('side'=>'left', 'padx'=>[0, '1m'])
- @w_mousethr = LabelEntry.new(f, '閾値 (pixels)', 3, [1, 2000])
+ @w_mousethr = LabelEntry.new(f, 'ïçÃÍ (pixels)', 3, [1, 2000])
@w_mousethr.pack('side'=>'right', 'padx'=>['1m', 0])
f.pack('side'=>'top', 'expand'=>'yes')
#
# Screen Saver settings
#
- screen = TkLabelframe.new(@root, 'text'=>'スクリーンセーãƒè¨­å®š',
+ screen = TkLabelframe.new(@root, 'text'=>'¥¹¥¯¥ê¡¼¥ó¥»¡¼¥ÐÀßÄê',
'padx'=>'1.5m', 'pady'=>'1.5m')
- @w_screenblank = TkRadioButton.new(screen, 'text'=>'ブランク表示',
- 'relief'=>'flat', 'anchor'=>'w',
- 'variable'=>@w_screenbla,
+ @w_screenblank = TkRadioButton.new(screen, 'text'=>'¥Ö¥é¥ó¥¯É½¼¨',
+ 'relief'=>'flat', 'anchor'=>'w',
+ 'variable'=>@w_screenbla,
'value'=>'blank') {
def self.set(value)
if value == 'blank'
@@ -275,9 +275,9 @@ class Xsettings
end
}
- @w_screenpat = TkRadioButton.new(screen, 'text'=>'パターン表示',
- 'relief'=>'flat', 'anchor'=>'w',
- 'variable'=>@w_screenbla,
+ @w_screenpat = TkRadioButton.new(screen, 'text'=>'¥Ñ¥¿¡¼¥óɽ¼¨',
+ 'relief'=>'flat', 'anchor'=>'w',
+ 'variable'=>@w_screenbla,
'value'=>'noblank') {
def self.set(value)
if value != 'blank'
@@ -288,8 +288,8 @@ class Xsettings
end
}
- @w_screentim = LabelEntry.new(screen, 'タイムアウト (s)', 5, [1, 100000])
- @w_screencyc = LabelEntry.new(screen, '周期 (s)', 5, [1, 100000])
+ @w_screentim = LabelEntry.new(screen, '¥¿¥¤¥à¥¢¥¦¥È (s)', 5, [1, 100000])
+ @w_screencyc = LabelEntry.new(screen, '¼þ´ü (s)', 5, [1, 100000])
Tk.grid(@w_screenblank, @w_screentim, 'sticky'=>'e')
Tk.grid(@w_screenpat, @w_screencyc, 'sticky'=>'e')
@@ -299,7 +299,7 @@ class Xsettings
# Main window
#
param = {
- 'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
+ 'side'=>'top', 'fill'=>'both', 'expand'=>'yes',
'padx'=>'1m', 'pady'=>'1m'
}
btn_frame.pack('side'=>'top', 'fill'=>'both')
diff --git a/ext/tk/sample/demos-jp/knightstour.rb b/ext/tk/sample/demos-jp/knightstour.rb
index 835a24c392..ae0f13076e 100644
--- a/ext/tk/sample/demos-jp/knightstour.rb
+++ b/ext/tk/sample/demos-jp/knightstour.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# Based on the widget demo of Tcl/Tk8.5.2
# The following is the original copyright text.
@@ -94,13 +94,13 @@ class Knights_Tour
@start_btn.state :normal
if @visited.length == 64
if @initial == square
- @log.insert :end, '周éŠ(closed tour)æˆåŠŸï¼'
+ @log.insert :end, '¼þÍ·(closed tour)À®¸ù¡ª'
else
- @log.insert :end, "æˆåŠŸ\n", {}
+ @log.insert :end, "À®¸ù\n", {}
Tk.after(@delay.numeric * 2){tour(rand(64))} if @continuous.bool
end
else
- @log.insert :end, "失敗ï¼\n", {}
+ @log.insert :end, "¼ºÇÔ¡ª\n", {}
end
end
end
@@ -158,10 +158,10 @@ class Knights_Tour
sep = Ttk::Separator.new(frame)
Tk.grid(sep, :columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
TkGrid('x',
- Ttk::Button.new(frame, :text=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'knightstour'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$knightstour.destroy
@@ -187,14 +187,14 @@ class Knights_Tour
@continuous = TkVariable.new(false)
tool_f = Ttk::Frame.new($knightstour)
- label = Ttk::Label.new(tool_f, :text=>'実行速度')
+ label = Ttk::Label.new(tool_f, :text=>'¼Â¹Ô®ÅÙ')
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|
diff --git a/ext/tk/sample/demos-jp/label.rb b/ext/tk/sample/demos-jp/label.rb
index 700e6a61ce..19105e6f71 100644
--- a/ext/tk/sample/demos-jp/label.rb
+++ b/ext/tk/sample/demos-jp/label.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# label widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($label_demo) && $label_demo
$label_demo.destroy
$label_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$label_demo = TkToplevel.new {|w|
title("Label Demonstration")
iconname("label")
@@ -18,20 +18,20 @@ $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'
justify 'left'
- text "下ã«ã¯5ã¤ã®ãƒ©ãƒ™ãƒ«ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚å·¦å´ã«ã¯ãƒ†ã‚­ã‚¹ãƒˆãƒ©ãƒ™ãƒ«ãŒ3ã¤ã‚りã€å³å´ã«ã¯ãƒ“ットマップラベルã¨ãƒ†ã‚­ã‚¹ãƒˆãƒ©ãƒ™ãƒ«ãŒã‚りã¾ã™ã€‚ラベルã¨ã„ã†ã®ã¯ã‚ã¾ã‚Šé¢ç™½ã„ã‚‚ã®ã§ã¯ã‚りã¾ã›ã‚“。ãªãœãªã‚‰çœºã‚る以外何もã§ããªã„ã‹ã‚‰ã§ã™ã€‚"
+ text "²¼¤Ë¤Ï5¤Ä¤Î¥é¥Ù¥ë¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Ë¤Ï¥Æ¥­¥¹¥È¥é¥Ù¥ë¤¬3¤Ä¤¢¤ê¡¢±¦Â¦¤Ë¤Ï¥Ó¥Ã¥È¥Þ¥Ã¥×¥é¥Ù¥ë¤È¥Æ¥­¥¹¥È¥é¥Ù¥ë¤¬¤¢¤ê¤Þ¤¹¡£¥é¥Ù¥ë¤È¤¤¤¦¤Î¤Ï¤¢¤Þ¤êÌÌÇò¤¤¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤Ê¤¼¤Ê¤éį¤á¤ë°Ê³°²¿¤â¤Ç¤­¤Ê¤¤¤«¤é¤Ç¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $label_demo
$label_demo = nil
@@ -40,23 +40,23 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'label'}
}.pack('side'=>'left', 'expand'=>'yes')
}.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',
'padx'=>10, 'pady'=>10, 'fill'=>'both')}
-# label 生æˆ
-[ TkLabel.new(f_left, 'text'=>'最åˆã®ãƒ©ãƒ™ãƒ«'),
- TkLabel.new(f_left, 'text'=>'2 番目。ã¡ã‚‡ã£ã¨æµ®ã上ãŒã‚‰ã›ã¦ã¿ã¾ã—ãŸ',
+# label À¸À®
+[ TkLabel.new(f_left, 'text'=>'ºÇ½é¤Î¥é¥Ù¥ë'),
+ TkLabel.new(f_left, 'text'=>'2 ÈÖÌÜ¡£¤Á¤ç¤Ã¤ÈÉ⤭¾å¤¬¤é¤»¤Æ¤ß¤Þ¤·¤¿',
'relief'=>'raised'),
- TkLabel.new(f_left, 'text'=>'3 番目。沈んã§ã„ã¾ã™ ', 'relief'=>'sunken')
+ TkLabel.new(f_left, 'text'=>'3 ÈÖÌÜ¡£ÄÀ¤ó¤Ç¤¤¤Þ¤¹ ', 'relief'=>'sunken')
].each{|w| w.pack('side'=>'top', 'expand'=>'yes', 'pady'=>2, 'anchor'=>'w')}
# TkLabel.new(f_right) {
@@ -66,4 +66,4 @@ Tk::Label.new(f_right) {
relief 'sunken'
}.pack('side'=>'top')
-TkLabel.new(f_right) { text 'Tcl/Tk 所有者' }.pack('side'=>'top')
+TkLabel.new(f_right) { text 'Tcl/Tk ½êÍ­¼Ô' }.pack('side'=>'top')
diff --git a/ext/tk/sample/demos-jp/labelframe.rb b/ext/tk/sample/demos-jp/labelframe.rb
index 80e106c6e7..cee504f4b6 100644
--- a/ext/tk/sample/demos-jp/labelframe.rb
+++ b/ext/tk/sample/demos-jp/labelframe.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# labelframe.rb
#
@@ -25,28 +25,28 @@ base_frame = TkFrame.new($labelframe_demo).pack(:fill=>:both, :expand=>true)
TkLabel.new(base_frame,
:font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-TkLabelFrame ウィジェットã¯é–¢é€£ã™ã‚‹ widget
-群をã¾ã¨ã‚ã¦å–り扱ã†ãŸã‚ã«ç”¨ã„られã¾ã™ã€‚ラ
-ベルã¯é€šå¸¸ã®æ–‡å­—列ã§ã‚‚何らã‹ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆ
-ã§ã‚‚ã‹ã¾ã„ã¾ã›ã‚“。もã—ã‚ãªãŸãŒä½¿ã£ã¦ã„ã‚‹
-Ruby ã«ãƒªãƒ³ã‚¯ã•れã¦ã„ã‚‹ Tk ライブラリãŒ
-labelframe ウィジェットを実装ã—ã¦ã„ãªã„
-å ´åˆã€ã“ã®ãƒ‡ãƒ¢ã¯ã†ã¾ãå‹•ã‹ãªã„ã¯ãšã§ã™ã€‚
-ãã®å ´åˆã«ã¯ labelframe ウィジェットãŒå®Ÿè£…
-ã•れã¦ã„るよã†ãªã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Tk
-を組ã¿åˆã‚ã›ã¦è©¦ã™ã‚ˆã†ã«ã—ã¦ãã ã•ã„。
+TkLabelFrame ¥¦¥£¥¸¥§¥Ã¥È¤Ï´ØÏ¢¤¹¤ë widget
+·²¤ò¤Þ¤È¤á¤Æ¼è¤ê°·¤¦¤¿¤á¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£¥é
+¥Ù¥ë¤ÏÄ̾ï¤Îʸ»úÎó¤Ç¤â²¿¤é¤«¤Î¥¦¥£¥¸¥§¥Ã¥È
+¤Ç¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë
+Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬
+labelframe ¥¦¥£¥¸¥§¥Ã¥È¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
+¾ì¹ç¡¢¤³¤Î¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£
+¤½¤Î¾ì¹ç¤Ë¤Ï labelframe ¥¦¥£¥¸¥§¥Ã¥È¤¬¼ÂÁõ
+¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk
+¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
EOL
# The bottom buttons
TkFrame.new(base_frame){|f|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$labelframe_demo.destroy
$labelframe_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'labelframe'
}).pack(:side=>:left, :expand=>true)
}
@@ -56,7 +56,7 @@ 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')
@@ -86,13 +86,13 @@ end
TkLabelFrame.new(w, :pady=>2, :padx=>2){|f|
TkCheckButton.new(f, :widgetname=>'cb', :variable=>$lfdummy,
- :text=>"オプションを使用", :padx=>0) {|cb|
+ :text=>"¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ", :padx=>0) {|cb|
command proc{lfEnableButtons(f)}
f.labelwidget(cb)
}
grid(:row=>0, :column=>1, :pady=>'2m', :padx=>'2m')
- %w(オプション1 オプション2 オプション3).each{|str|
+ %w(¥ª¥×¥·¥ç¥ó1 ¥ª¥×¥·¥ç¥ó2 ¥ª¥×¥·¥ç¥ó3).each{|str|
TkCheckbutton.new(f, :text=>str).pack(:side=>:top, :fill=>:x, :pady=>2)
}
diff --git a/ext/tk/sample/demos-jp/mclist.rb b/ext/tk/sample/demos-jp/mclist.rb
index 67cec638eb..37f5dfa8eb 100644
--- a/ext/tk/sample/demos-jp/mclist.rb
+++ b/ext/tk/sample/demos-jp/mclist.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# mclist.rb --
#
@@ -24,16 +24,16 @@ base_frame = TkFrame.new($mclist_demo).pack(:fill=>:both, :expand=>true)
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ウィジェットã¯\
-Ttkウィジェットセットã«å«ã¾ã‚Œã‚‹ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ä¸€ã¤ã§ï¼Œ\
-ãれãŒä¿æŒã™ã‚‹æœ¨æ§‹é€ ã®ãƒ‡ãƒ¼ã‚¿ãã®ã‚‚ã®ã¾ã§ã¯è¡¨ç¤ºã™ã‚‹ã“ã¨ãªã,\
-示ã—ãŸã„情報をマルãƒã‚«ãƒ©ãƒ ã§è¡¨ç¤ºã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ž
-ã“ã®ã‚µãƒ³ãƒ—ルã¯ï¼Œè¤‡æ•°ã®ã‚«ãƒ©ãƒ ã‚’æŒã£ãŸãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã‚’作æˆã™ã‚‹ç°¡å˜ãªä¾‹ã§ã™ï¼Ž
-å„カラムã®ã‚¿ã‚¤ãƒˆãƒ«(heading)をクリックã™ã‚Œã°ï¼Œ\
-ãã®ã‚«ãƒ©ãƒ ã®æƒ…å ±ã«åŸºã¥ã„ã¦ãƒªã‚¹ãƒˆã®ä¸¦ã¹æ›¿ãˆãŒãªã•れるã¯ãšã§ã™ï¼Ž\
-ã¾ãŸï¼Œã‚«ãƒ©ãƒ ã®ã‚¿ã‚¤ãƒˆãƒ«é–“ã®åŒºåˆ‡ã‚Šéƒ¨åˆ†ã‚’ドラッグã™ã‚‹ã“ã¨ã§ï¼Œ\
-カラムã®å¹…を変更ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ï¼Ž
+Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
+Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤Ï\
+Ttk¥¦¥£¥¸¥§¥Ã¥È¥»¥Ã¥È¤Ë´Þ¤Þ¤ì¤ë¥¦¥£¥¸¥§¥Ã¥È¤Î°ì¤Ä¤Ç¡¤\
+¤½¤ì¤¬ÊÝ»ý¤¹¤ëÌÚ¹½Â¤¤Î¥Ç¡¼¥¿¤½¤Î¤â¤Î¤Þ¤Ç¤Ïɽ¼¨¤¹¤ë¤³¤È¤Ê¤¯¡¤\
+¼¨¤·¤¿¤¤¾ðÊó¤ò¥Þ¥ë¥Á¥«¥é¥à¤Çɽ¼¨¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
+¤³¤Î¥µ¥ó¥×¥ë¤Ï¡¤Ê£¿ô¤Î¥«¥é¥à¤ò»ý¤Ã¤¿¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤òºîÀ®¤¹¤ë´Êñ¤ÊÎã¤Ç¤¹¡¥
+³Æ¥«¥é¥à¤Î¥¿¥¤¥È¥ë(heading)¤ò¥¯¥ê¥Ã¥¯¤¹¤ì¤Ð¡¤\
+¤½¤Î¥«¥é¥à¤Î¾ðÊó¤Ë´ð¤Å¤¤¤Æ¥ê¥¹¥È¤ÎʤÙÂØ¤¨¤¬¤Ê¤µ¤ì¤ë¤Ï¤º¤Ç¤¹¡¥\
+¤Þ¤¿¡¤¥«¥é¥à¤Î¥¿¥¤¥È¥ë´Ö¤Î¶èÀÚ¤êÉôʬ¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¤\
+¥«¥é¥à¤ÎÉý¤òÊѹ¹¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥
EOL
## See Code / Dismiss
@@ -41,10 +41,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'mclist'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$mclist_demo.destroy
@@ -74,27 +74,27 @@ 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'],
- ['アメリカ', 'ワシントン D.C.', 'USD'],
+ ['¥¢¥ë¥¼¥ó¥Á¥ó', '¥Ö¥¨¥Î¥¹¥¢¥¤¥ì¥¹', 'ARS'],
+ ['¥ª¡¼¥¹¥È¥é¥ê¥¢', '¥­¥ã¥ó¥Ù¥é', 'AUD'],
+ ['¥Ö¥é¥¸¥ë', '¥Ö¥é¥¸¥ê¥¢', 'BRL'],
+ ['¥«¥Ê¥À', '¥ª¥¿¥ï', 'CAD'],
+ ['Ãæ¹ñ', 'Ë̵þ', 'CNY'],
+ ['¥Õ¥é¥ó¥¹', '¥Ñ¥ê', 'EUR'],
+ ['¥É¥¤¥Ä', '¥Ù¥ë¥ê¥ó', 'EUR'],
+ ['¥¤¥ó¥É', '¥Ë¥å¡¼¥Ç¥ê¡¼', 'INR'],
+ ['¥¤¥¿¥ê¥¢', '¥í¡¼¥Þ', 'EUR'],
+ ['ÆüËÜ', 'Åìµþ', 'JPY'],
+ ['¥á¥­¥·¥³', '¥á¥­¥·¥³¥·¥Æ¥£', 'MXN'],
+ ['¥í¥·¥¢', '¥â¥¹¥¯¥ï', 'RUB'],
+ ['Æî¥¢¥Õ¥ê¥«', '¥×¥ì¥È¥ê¥¢', 'ZAR'],
+ ['±Ñ¹ñ', '¥í¥ó¥É¥ó', 'GBP'],
+ ['¥¢¥á¥ê¥«', '¥ï¥·¥ó¥È¥ó D.C.', 'USD'],
]
## Code to insert the data nicely
font = Ttk::Style.lookup(tree[:style], :font)
cols = %w(country capital currency)
-cols.zip(%w(国å 首都 通貨)).each{|col, name|
+cols.zip(%w(¹ñ̾ ¼óÅÔ Ä̲ß)).each{|col, name|
tree.heading_configure(col, :text=>name,
:command=>proc{sort_by(tree, col, false)})
tree.column_configure(col, :width=>TkFont.measure(font, name))
diff --git a/ext/tk/sample/demos-jp/menu.rb b/ext/tk/sample/demos-jp/menu.rb
index 05ea7a9ec2..e38a467000 100644
--- a/ext/tk/sample/demos-jp/menu.rb
+++ b/ext/tk/sample/demos-jp/menu.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# menus widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($menu_demo) && $menu_demo
$menu_demo.destroy
$menu_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$menu_demo = TkToplevel.new {|w|
title("File Selection Dialogs")
iconname("menu")
@@ -18,7 +18,7 @@ $menu_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($menu_demo).pack(:fill=>:both, :expand=>true)
-# menu frame 生æˆ
+# menu frame À¸À®
$menu_frame = TkFrame.new(base_frame, 'relief'=>'raised', 'bd'=>2)
$menu_frame.pack('side'=>'top', 'fill'=>'x')
@@ -28,21 +28,21 @@ rescue
windowingsystem = ""
end
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
if $tk_platform['platform'] == 'macintosh' ||
windowingsystem == "classic" || windowingsystem == "aqua"
- text("ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯æ§˜ã€…ãªãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¨ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰æ§‹æˆã•れã¦ã„ã¾ã™ã€‚Command-X を入力ã™ã‚‹ã¨ã€XãŒã‚³ãƒžãƒ³ãƒ‰ã‚­ãƒ¼è¨˜å·ã«ç¶šã„ã¦è¡¨ç¤ºã•れã¦ã„る文字ãªã‚‰ã°ã€ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚’使ã£ãŸé …目起動を行ã†ã“ã¨ãŒã§ãã¾ã™ã€‚メニューè¦ç´ ä¸­ã€æœ€å¾Œã®ã‚‚ã®ã¯ã€ãã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®æœ€åˆã®é …ç›®ã‚’é¸æŠžã™ã‚‹ã“ã¨ã§ç‹¬ç«‹ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚")
+ text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Command-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥³¥Þ¥ó¥É¥­¡¼µ­¹æ¤Ë³¤¤¤ÆÉ½¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»È¤Ã¤¿¹àÌܵ¯Æ°¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
else
- text("ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯æ§˜ã€…ãªãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¨ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰æ§‹æˆã•れã¦ã„ã¾ã™ã€‚Alt-X を入力ã™ã‚‹ã¨ã€XãŒãƒ¡ãƒ‹ãƒ¥ãƒ¼ã«ã‚¢ãƒ³ãƒ€ãƒ¼ãƒ©ã‚¤ãƒ³ä»˜ãã§è¡¨ç¤ºã•れã¦ã„る文字ãªã‚‰ã°ã€ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã‹ã‚‰ã®æŒ‡å®šãŒã§ãã¾ã™ã€‚矢å°ã‚­ãƒ¼ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®ãƒˆãƒ©ãƒãƒ¼ã‚¹ã‚‚å¯èƒ½ã§ã™ã€‚ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒæŒ‡å®šã•れãŸéš›ã«ã¯ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚­ãƒ¼ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ã‚¢ãƒ³ãƒ€ãƒ¼ãƒ©ã‚¤ãƒ³ä»˜ãã®æ–‡å­—を入力ã™ã‚‹ã“ã¨ã§ã‚‚実行ã§ãã¾ã™ã€‚メニューã®ã‚¨ãƒ³ãƒˆãƒªãŒã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚’æŒã£ã¦ã„ã‚‹å ´åˆã¯ã€ãã®ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚’入力ã™ã‚‹ã“ã¨ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’指定ã™ã‚‹ã“ã¨ãªã—ã«å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚メニューè¦ç´ ä¸­ã€æœ€å¾Œã®ã‚‚ã®ã¯ã€ãã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®æœ€åˆã®é …ç›®ã‚’é¸æŠžã™ã‚‹ã“ã¨ã§ç‹¬ç«‹ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚")
+ text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Alt-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥á¥Ë¥å¡¼¤Ë¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥­¡¼¥Ü¡¼¥É¤«¤é¤Î»ØÄ꤬¤Ç¤­¤Þ¤¹¡£Ìð°õ¥­¡¼¤Ç¥á¥Ë¥å¡¼¤Î¥È¥é¥Ð¡¼¥¹¤â²Äǽ¤Ç¤¹¡£¥á¥Ë¥å¡¼¤¬»ØÄꤵ¤ì¤¿ºÝ¤Ë¤Ï¡¢¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¢¤ë¤¤¤Ï¡¢¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Îʸ»ú¤òÆþÎϤ¹¤ë¤³¤È¤Ç¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼¤Î¥¨¥ó¥È¥ê¤¬¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥¢¥¯¥»¥é¥ì¡¼¥¿¤òÆþÎϤ¹¤ë¤³¤È¤Ç¥á¥Ë¥å¡¼¤ò»ØÄꤹ¤ë¤³¤È¤Ê¤·¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
end
}.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $menu_demo
$menu_demo = nil
@@ -51,25 +51,25 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'menu'}
}.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|
m.configure('menu'=>file_menu)
- add('command', 'label'=>'é–‹ã ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"é–‹ã ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'æ–°è¦', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"æ–°è¦"ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'ä¿å­˜', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"ä¿å­˜"ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'ä¿å­˜(指定) ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"ä¿å­˜(指定) ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
+ add('command', 'label'=>'³«¤¯ ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"³«¤¯ ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'¿·µ¬', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"¿·µ¬"¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Êݸ', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"Êݸ"¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Êݸ(»ØÄê) ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"Êݸ(»ØÄê) ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
add('separator')
- add('command', 'label'=>'プリント設定 ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"プリント設定 ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'プリント ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"プリント ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
+ add('command', 'label'=>'¥×¥ê¥ó¥ÈÀßÄê ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"¥×¥ê¥ó¥ÈÀßÄê ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'¥×¥ê¥ó¥È ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"¥×¥ê¥ó¥È ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
add('separator')
- add('command', 'label'=>'終了', 'command'=>proc{$menu_demo.destroy})
+ add('command', 'label'=>'½ªÎ»', 'command'=>proc{$menu_demo.destroy})
}
}
@@ -86,10 +86,10 @@ TkMenubutton.new($menu_frame, 'text'=>'Basic', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
m.configure('menu'=>basic_menu)
- add('command', 'label'=>'何もã—ãªã„é•·ã„エントリ')
+ 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}\" ã‚’å°å­—)",
+ # 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,58 +101,58 @@ 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"},
+ $menu_demo.bind("#{modifier}-h", proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\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"})
+ $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)
+ add('check', 'label'=>'¥ª¥¤¥ëÅÀ¸¡', 'variable'=>oil)
trans = TkVariable.new(0)
- add('check', 'label'=>'トランスミッション点検', 'variable'=>trans)
+ add('check', 'label'=>'¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', 'variable'=>trans)
brakes = TkVariable.new(0)
- add('check', 'label'=>'ブレーキ点検', 'variable'=>brakes)
+ add('check', 'label'=>'¥Ö¥ì¡¼¥­ÅÀ¸¡', 'variable'=>brakes)
lights = TkVariable.new(0)
- add('check', 'label'=>'ライト点検', 'variable'=>lights)
+ add('check', 'label'=>'¥é¥¤¥ÈÅÀ¸¡', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'ç¾åœ¨ã®å€¤ã‚’表示',
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
'command'=>proc{showVars($menu_demo,
- ['オイル点検', oil],
- ['トランスミッション点検', trans],
- ['ブレーキ点検', brakes],
- ['ライト点検', lights])} )
+ ['¥ª¥¤¥ëÅÀ¸¡', oil],
+ ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', trans],
+ ['¥Ö¥ì¡¼¥­ÅÀ¸¡', brakes],
+ ['¥é¥¤¥ÈÅÀ¸¡', lights])} )
invoke 1
invoke 3
}
#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)
- add('radio', 'label'=>'14 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>14)
- add('radio', 'label'=>'18 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>18)
- add('radio', 'label'=>'24 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>24)
- add('radio', 'label'=>'32 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>32)
+ add('radio', 'label'=>'10 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>10)
+ add('radio', 'label'=>'14 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>14)
+ add('radio', 'label'=>'18 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>18)
+ add('radio', 'label'=>'24 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>24)
+ add('radio', 'label'=>'32 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>32)
add('separator')
style = TkVariable.new
- add('radio', 'label'=>'ローマン', 'variable'=>style, 'value'=>'roman')
- add('radio', 'label'=>'ボールド', 'variable'=>style, 'value'=>'bold')
- add('radio', 'label'=>'イタリック', 'variable'=>style, 'value'=>'italic')
+ add('radio', 'label'=>'¥í¡¼¥Þ¥ó', 'variable'=>style, 'value'=>'roman')
+ add('radio', 'label'=>'¥Ü¡¼¥ë¥É', 'variable'=>style, 'value'=>'bold')
+ add('radio', 'label'=>'¥¤¥¿¥ê¥Ã¥¯', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'ç¾åœ¨ã®å€¤ã‚’表示',
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
'command'=>proc{showVars($menu_demo,
- ['ãƒã‚¤ãƒ³ãƒˆã‚µã‚¤ã‚º', pointSize],
- ['スタイル', style])} )
+ ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize],
+ ['¥¹¥¿¥¤¥ë', style])} )
invoke 1
invoke 7
}
@@ -167,9 +167,9 @@ TkMenubutton.new($menu_frame, 'text'=>'Icons', 'underline'=>0) {|m|
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
- 'text'=>'今ã‚ãªãŸãŒé¸æŠžã—ãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®é …ç›®ã¯ãƒ†ã‚­ã‚¹ãƒˆã§ã¯ãªãビットマップを表示ã—ã¦ã„ã¾ã—ãŸã€‚ãれ以外ã®ç‚¹ã§ã¯ä»–ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®ã¨å¤‰ã‚りã¾ã›ã‚“。',
+ 'text'=>'º£¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¤Î¹àÌܤϥƥ­¥¹¥È¤Ç¤Ï¤Ê¤¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤òɽ¼¨¤·¤Æ¤¤¤Þ¤·¤¿¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¾¤Î¥á¥Ë¥å¡¼¹àÌܤÈÊѤï¤ê¤Þ¤»¤ó¡£',
'bitmap'=>'', 'default'=>0,
- 'buttons'=>'了解')} )
+ 'buttons'=>'λ²ò')} )
['info', 'questhead', 'error'].each{|icon|
add('command', 'bitmap'=>icon,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
@@ -181,8 +181,8 @@ TkMenubutton.new($menu_frame, 'text'=>'More', 'underline'=>0) {|m|
pack('side'=>'left')
TkMenu.new(m, 'tearoff'=>false) {|more_menu|
m.configure('menu'=>more_menu)
- [ 'エントリ','別ã®ã‚¨ãƒ³ãƒˆãƒª','何もã—ãªã„','ã»ã¨ã‚“ã©ä½•ã‚‚ã—ãªã„',
- '人生をæ„義ã‚ã‚‹ã‚‚ã®ã«' ].each{|i|
+ [ '¥¨¥ó¥È¥ê','Ê̤Υ¨¥ó¥È¥ê','²¿¤â¤·¤Ê¤¤','¤Û¤È¤ó¤É²¿¤â¤·¤Ê¤¤',
+ '¿ÍÀ¸¤ò°ÕµÁ¤¢¤ë¤â¤Î¤Ë' ].each{|i|
add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
diff --git a/ext/tk/sample/demos-jp/menu84.rb b/ext/tk/sample/demos-jp/menu84.rb
index 6a57279481..094853a728 100644
--- a/ext/tk/sample/demos-jp/menu84.rb
+++ b/ext/tk/sample/demos-jp/menu84.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# menus widget demo (called by 'widget')
#
@@ -28,9 +28,9 @@ end
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
if $tk_platform['platform'] == 'macintosh' ||
windowingsystem == "classic" || windowingsystem == "aqua"
- text("ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’æŒã¤ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ãŒä»˜ã‘られã¦ã„ã¾ã™ã€‚Command+x ('x'ã¯ã‚³ãƒžãƒ³ãƒ‰ã‚­ãƒ¼ã‚·ãƒ³ãƒœãƒ«ã«ç¶šã‘ã¦è¡¨ç¤ºã•れã¦ã„る文字ã§ã™) ã¨ã‚¿ã‚¤ãƒ—ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã‚‚é …ç›®ã®æ©Ÿèƒ½ã‚’呼ã³å‡ºã™ã“ã¨ãŒã§ãã¾ã™ã€‚最後ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¯ã€ãƒžã‚¦ã‚¹ã§ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å¤–ã«ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã€ç‹¬ç«‹ã—ãŸãƒ‘レットã¨ãªã‚‹ã‚ˆã†ã«åˆ‡ã‚Šæ”¾ã™ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚")
+ text("¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤ò»ý¤Ä¥á¥Ë¥å¡¼¥Ð¡¼¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£Command+x ('x'¤Ï¥³¥Þ¥ó¥É¥­¡¼¥·¥ó¥Ü¥ë¤Ë³¤±¤ÆÉ½¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ç¤¹) ¤È¥¿¥¤¥×¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¤â¹àÌܤε¡Ç½¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ºÇ¸å¤Î¥á¥Ë¥å¡¼¤Ï¡¢¥Þ¥¦¥¹¤Ç¥¦¥£¥ó¥É¥¦¤Î³°¤Ë¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢ÆÈΩ¤·¤¿¥Ñ¥ì¥Ã¥È¤È¤Ê¤ë¤è¤¦¤ËÀÚ¤êÊü¤¹¤³¤È¤¬²Äǽ¤Ç¤¹¡£")
else
- text("ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«ã¯ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’æŒã¤ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒãƒ¼ãŒä»˜ã‘られã¦ã„ã¾ã™ã€‚Alt+x ('x'ã¯ãƒ¡ãƒ‹ãƒ¥ãƒ¼ä¸Šã§ä¸‹ç·šãŒå¼•ã‹ã‚ŒãŸæ–‡å­—ã§ã™) ã¨ã‚¿ã‚¤ãƒ—ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã‚‚メニューを呼ã³å‡ºã™ã“ã¨ãŒã§ãã¾ã™ã€‚矢å°ã‚­ãƒ¼ã‚’使ã£ã¦ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼é–“を移動ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚メニューãŒè¡¨ç¤ºã•れã¦ã„る時ã«ã¯ã€ç¾åœ¨ä½ç½®ã®é …目をスペースキーã§é¸æŠžã—ãŸã‚Šã€ä¸‹ç·šãŒå¼•ã‹ã‚ŒãŸæ–‡å­—を入力ã™ã‚‹ã“ã¨ã§ãã®é …ç›®ã‚’é¸æŠžã—ãŸã‚Šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚‚ã—é …ç›®ã«ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã®æŒ‡å®šãŒãªã•れã¦ã„ãŸãªã‚‰ã°ã€ãã®æŒ‡å®šã•れãŸã‚­ãƒ¼å…¥åŠ›ã‚’è¡Œã†ã“ã¨ã§ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示ã•ã›ã‚‹ã“ã¨ãªã直接ãã®é …ç›®ã®æ©Ÿèƒ½ã‚’呼ã³å‡ºã›ã¾ã™ã€‚最後ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¯ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®æœ€åˆã®é …ç›®ã‚’é¸æŠžã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã€ç‹¬ç«‹ã—ãŸãƒ‘レットã¨ãªã‚‹ã‚ˆã†ã«åˆ‡ã‚Šæ”¾ã™ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚")
+ text("¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤ò»ý¤Ä¥á¥Ë¥å¡¼¥Ð¡¼¤¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£Alt+x ('x'¤Ï¥á¥Ë¥å¡¼¾å¤Ç²¼Àþ¤¬°ú¤«¤ì¤¿Ê¸»ú¤Ç¤¹) ¤È¥¿¥¤¥×¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¤â¥á¥Ë¥å¡¼¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Ìð°õ¥­¡¼¤ò»È¤Ã¤Æ¡¢¥á¥Ë¥å¡¼´Ö¤ò°Üư¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¥á¥Ë¥å¡¼¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë»þ¤Ë¤Ï¡¢¸½ºß°ÌÃ֤ιàÌܤò¥¹¥Ú¡¼¥¹¥­¡¼¤ÇÁªÂò¤·¤¿¤ê¡¢²¼Àþ¤¬°ú¤«¤ì¤¿Ê¸»ú¤òÆþÎϤ¹¤ë¤³¤È¤Ç¤½¤Î¹àÌܤòÁªÂò¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤â¤·¹àÌܤ˥¢¥¯¥»¥é¥ì¡¼¥¿¤Î»ØÄ꤬¤Ê¤µ¤ì¤Æ¤¤¤¿¤Ê¤é¤Ð¡¢¤½¤Î»ØÄꤵ¤ì¤¿¥­¡¼ÆþÎϤò¹Ô¤¦¤³¤È¤Ç¡¢¥á¥Ë¥å¡¼¤òɽ¼¨¤µ¤»¤ë¤³¤È¤Ê¤¯Ä¾Àܤ½¤Î¹àÌܤε¡Ç½¤ò¸Æ¤Ó½Ð¤»¤Þ¤¹¡£ºÇ¸å¤Î¥á¥Ë¥å¡¼¤Ï¡¢¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢ÆÈΩ¤·¤¿¥Ñ¥ì¥Ã¥È¤È¤Ê¤ë¤è¤¦¤ËÀÚ¤êÊü¤¹¤³¤È¤¬²Äǽ¤Ç¤¹¡£")
end
}.pack('side'=>'top')
@@ -48,8 +48,8 @@ TkFrame.new(base_frame) {|frame|
# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $menu84_demo
$menu84_demo = nil
@@ -58,7 +58,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'menu84'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
@@ -70,13 +70,13 @@ $menu84_frame = TkMenu.new($menu84_demo, 'tearoff'=>false)
# menu
TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
$menu84_frame.add('cascade', 'label'=>'File', 'menu'=>m, 'underline'=>0)
- add('command', 'label'=>'Open...', 'command'=>proc{fail 'ã“れã¯å˜ãªã‚‹ãƒ‡ãƒ¢ã§ã™ã‹ã‚‰ã€"Open..." é …ç›®ã®æ©Ÿèƒ½ã¯ç‰¹ã«å®šç¾©ã•れã¦ã¯ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'New', 'command'=>proc{fail 'ã“れã¯å˜ãªã‚‹ãƒ‡ãƒ¢ã§ã™ã‹ã‚‰ã€"New" é …ç›®ã®æ©Ÿèƒ½ã¯ç‰¹ã«å®šç¾©ã•れã¦ã¯ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'Save', 'command'=>proc{fail 'ã“れã¯å˜ãªã‚‹ãƒ‡ãƒ¢ã§ã™ã‹ã‚‰ã€"Save" é …ç›®ã®æ©Ÿèƒ½ã¯ç‰¹ã«å®šç¾©ã•れã¦ã¯ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'Save As...', 'command'=>proc{fail 'ã“れã¯å˜ãªã‚‹ãƒ‡ãƒ¢ã§ã™ã‹ã‚‰ã€"Save As..." é …ç›®ã®æ©Ÿèƒ½ã¯ç‰¹ã«å®šç¾©ã•れã¦ã¯ã„ã¾ã›ã‚“。'})
+ add('command', 'label'=>'Open...', 'command'=>proc{fail '¤³¤ì¤Ïñ¤Ê¤ë¥Ç¥â¤Ç¤¹¤«¤é¡¢"Open..." ¹àÌܤε¡Ç½¤ÏÆÃ¤ËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'New', 'command'=>proc{fail '¤³¤ì¤Ïñ¤Ê¤ë¥Ç¥â¤Ç¤¹¤«¤é¡¢"New" ¹àÌܤε¡Ç½¤ÏÆÃ¤ËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Save', 'command'=>proc{fail '¤³¤ì¤Ïñ¤Ê¤ë¥Ç¥â¤Ç¤¹¤«¤é¡¢"Save" ¹àÌܤε¡Ç½¤ÏÆÃ¤ËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Save As...', 'command'=>proc{fail '¤³¤ì¤Ïñ¤Ê¤ë¥Ç¥â¤Ç¤¹¤«¤é¡¢"Save As..." ¹àÌܤε¡Ç½¤ÏÆÃ¤ËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
add('separator')
- add('command', 'label'=>'Print Setup...', 'command'=>proc{fail 'ã“れã¯å˜ãªã‚‹ãƒ‡ãƒ¢ã§ã™ã‹ã‚‰ã€"Print Setup..." é …ç›®ã®æ©Ÿèƒ½ã¯ç‰¹ã«å®šç¾©ã•れã¦ã¯ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'Print...', 'command'=>proc{fail 'ã“れã¯å˜ãªã‚‹ãƒ‡ãƒ¢ã§ã™ã‹ã‚‰ã€"Print..." é …ç›®ã®æ©Ÿèƒ½ã¯ç‰¹ã«å®šç¾©ã•れã¦ã¯ã„ã¾ã›ã‚“。'})
+ add('command', 'label'=>'Print Setup...', 'command'=>proc{fail '¤³¤ì¤Ïñ¤Ê¤ë¥Ç¥â¤Ç¤¹¤«¤é¡¢"Print Setup..." ¹àÌܤε¡Ç½¤ÏÆÃ¤ËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Print...', 'command'=>proc{fail '¤³¤ì¤Ïñ¤Ê¤ë¥Ç¥â¤Ç¤¹¤«¤é¡¢"Print..." ¹àÌܤε¡Ç½¤ÏÆÃ¤ËÄêµÁ¤µ¤ì¤Æ¤Ï¤¤¤Þ¤»¤ó¡£'})
add('separator')
add('command', 'label'=>'Dismiss Menus Demo', 'command'=>proc{$menu84_demo.destroy})
}
@@ -116,20 +116,20 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
m.add('cascade', 'label'=>'Check button',
'menu'=>cascade_check, 'underline'=>0)
oil = TkVariable.new(0)
- add('check', 'label'=>'オイル検査', 'variable'=>oil)
+ add('check', 'label'=>'¥ª¥¤¥ë¸¡ºº', 'variable'=>oil)
trans = TkVariable.new(0)
- add('check', 'label'=>'トランスミッション検査', 'variable'=>trans)
+ add('check', 'label'=>'¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥ó¸¡ºº', 'variable'=>trans)
brakes = TkVariable.new(0)
- add('check', 'label'=>'ブレーキ検査', 'variable'=>brakes)
+ add('check', 'label'=>'¥Ö¥ì¡¼¥­¸¡ºº', 'variable'=>brakes)
lights = TkVariable.new(0)
- add('check', 'label'=>'ライト検査', 'variable'=>lights)
+ add('check', 'label'=>'¥é¥¤¥È¸¡ºº', 'variable'=>lights)
add('separator')
add('command', 'label'=>'Show current values',
'command'=>proc{showVars($menu84_demo,
- ['オイル', oil],
- ['トランスミッション', trans],
- ['ブレーキ', brakes],
- ['ライト', lights])} )
+ ['¥ª¥¤¥ë', oil],
+ ['¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥ó', trans],
+ ['¥Ö¥ì¡¼¥­', brakes],
+ ['¥é¥¤¥È', lights])} )
invoke 1
invoke 3
}
@@ -149,7 +149,7 @@ 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'=>'ç¾åœ¨å€¤ã®è¡¨ç¤º',
+ add('command', 'label'=>'¸½ºßÃͤÎɽ¼¨',
'command'=>proc{showVars($menu84_demo,
['pointSize', pointSize],
['style', style])} )
@@ -164,9 +164,9 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
'bitmap'=>'@'+[$demo_dir,'..',
'images','pattern.xbm'].join(File::Separator),
'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
- 'text'=>'ã‚ãªãŸãŒé¸æŠžã—ãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®ã¯ã€æ–‡å­—列ã®ä»£ã‚りã«ãƒ“ットマップイメージã§é …目を表示ã—ãŸã‚‚ã®ã§ã™ã€‚ãれ以外ã®ç‚¹ã§ã¯ã€ã»ã‹ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®ã¨ã®é–“ã§ç‰¹ã«é•ã„ãŒã‚ã‚‹ã‚ã‘ã§ã¯ã‚りã¾ã›ã‚“。',
+ 'text'=>'¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¹àÌܤϡ¢Ê¸»úÎó¤ÎÂå¤ï¤ê¤Ë¥Ó¥Ã¥È¥Þ¥Ã¥×¥¤¥á¡¼¥¸¤Ç¹àÌܤòɽ¼¨¤·¤¿¤â¤Î¤Ç¤¹¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¡¢¤Û¤«¤Î¥á¥Ë¥å¡¼¹àÌÜ¤È¤Î´Ö¤ÇÆÃ¤Ë°ã¤¤¤¬¤¢¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£',
'bitmap'=>'', 'default'=>0,
- 'buttons'=>'é–‰ã˜ã‚‹')} )
+ 'buttons'=>'ÊĤ¸¤ë')} )
['info', 'questhead', 'error'].each{|icon|
add('command', 'bitmap'=>icon, 'hidemargin'=>1,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
@@ -187,8 +187,8 @@ TkMenu.new($menu84_frame, 'tearoff'=>false) {|m|
'bitmap'=>'questhead', 'compound'=>'left',
'command'=>proc{
TkDialog.new('title'=>'Compound Menu Entry',
- 'message'=>'ã‚ãªãŸãŒé¸æŠžã—ãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®ã¯ã€ãƒ“ãƒƒãƒˆãƒžãƒƒãƒ—ã‚¤ãƒ¡ãƒ¼ã‚¸ã¨æ–‡å­—列ã¨ã‚’åŒæ™‚ã«ä¸€ã¤ã®é …ç›®ã«è¡¨ç¤ºã™ã‚‹ã‚ˆã†ã«ã—ãŸã‚‚ã®ã§ã™ã€‚ãれ以外ã®ç‚¹ã§ã¯ã€ã»ã‹ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®ã¨ã®é–“ã§ç‰¹ã«é•ã„ãŒã‚ã‚‹ã‚ã‘ã§ã¯ã‚りã¾ã›ã‚“。',
- 'buttons'=>['了解'], 'bitmap'=>'')
+ 'message'=>'¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¹àÌܤϡ¢¥Ó¥Ã¥È¥Þ¥Ã¥×¥¤¥á¡¼¥¸¤Èʸ»úÎó¤È¤òƱ»þ¤Ë°ì¤Ä¤Î¹àÌܤËɽ¼¨¤¹¤ë¤è¤¦¤Ë¤·¤¿¤â¤Î¤Ç¤¹¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¡¢¤Û¤«¤Î¥á¥Ë¥å¡¼¹àÌÜ¤È¤Î´Ö¤ÇÆÃ¤Ë°ã¤¤¤¬¤¢¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£',
+ 'buttons'=>['λ²ò'], 'bitmap'=>'')
})
}
diff --git a/ext/tk/sample/demos-jp/menu8x.rb b/ext/tk/sample/demos-jp/menu8x.rb
index 77ecb5bcf3..49aca6786d 100644
--- a/ext/tk/sample/demos-jp/menu8x.rb
+++ b/ext/tk/sample/demos-jp/menu8x.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# menus widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($menu8x_demo) && $menu8x_demo
$menu8x_demo.destroy
$menu8x_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$menu8x_demo = TkToplevel.new {|w|
title("Menu Demonstration (Tk8.x)")
iconname("menu")
@@ -21,16 +21,16 @@ base_frame = TkFrame.new($menu8x_demo).pack(:fill=>:both, :expand=>true)
# version check
if $tk_version.to_f < 8.0
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
- text("実行ã—よã†ã¨ã—ãŸã‚¹ã‚¯ãƒªãƒ—ト㯠Tk8.0 以上ã§åˆ©ç”¨ã§ãる機能を利用ã—ã¦ã„ã‚‹ãŸã‚ã€ã‚ãªãŸã® Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} ã§ã¯æ­£å¸¸ã«å®Ÿè¡Œã§ãã¾ã›ã‚“。よã£ã¦ãƒ‡ãƒ¢ã®å®Ÿè¡Œã‚’中止ã—ã¾ã—ãŸã€‚ãŸã ã—ã€ä¸‹ã®ã‚³ãƒ¼ãƒ‰å‚照ボタンを押ã™ã“ã¨ã§ã€å®Ÿè¡ŒãŒä¸­æ­¢ã•れãŸã‚¹ã‚¯ãƒªãƒ—トã®ã‚½ãƒ¼ã‚¹ã‚’å‚ç…§ã™ã‚‹ã“ã¨ã¯å¯èƒ½ã§ã™ã€‚")
+ text("¼Â¹Ô¤·¤è¤¦¤È¤·¤¿¥¹¥¯¥ê¥×¥È¤Ï Tk8.0 °Ê¾å¤ÇÍøÍѤǤ­¤ëµ¡Ç½¤òÍøÍѤ·¤Æ¤¤¤ë¤¿¤á¡¢¤¢¤Ê¤¿¤Î Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} ¤Ç¤ÏÀµ¾ï¤Ë¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£¤è¤Ã¤Æ¥Ç¥â¤Î¼Â¹Ô¤òÃæ»ß¤·¤Þ¤·¤¿¡£¤¿¤À¤·¡¢²¼¤Î¥³¡¼¥É»²¾È¥Ü¥¿¥ó¤ò²¡¤¹¤³¤È¤Ç¡¢¼Â¹Ô¤¬Ãæ»ß¤µ¤ì¤¿¥¹¥¯¥ê¥×¥È¤Î¥½¡¼¥¹¤ò»²¾È¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£")
}.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $menu8x_demo
$menu8x_demo = nil
@@ -39,7 +39,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'menu8x'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
@@ -52,17 +52,17 @@ rescue
windowingsystem = ""
end
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
if $tk_platform['platform'] == 'macintosh' ||
windowingsystem == "classic" || windowingsystem == "aqua"
- text("ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯æ§˜ã€…ãªãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¨ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰æ§‹æˆã•れã¦ã„ã¾ã™ã€‚Command-X を入力ã™ã‚‹ã¨ã€XãŒã‚³ãƒžãƒ³ãƒ‰ã‚­ãƒ¼è¨˜å·ã«ç¶šã„ã¦è¡¨ç¤ºã•れã¦ã„る文字ãªã‚‰ã°ã€ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚’使ã£ãŸé …目起動を行ã†ã“ã¨ãŒã§ãã¾ã™ã€‚メニューè¦ç´ ä¸­ã€æœ€å¾Œã®ã‚‚ã®ã¯ã€ãã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®æœ€åˆã®é …ç›®ã‚’é¸æŠžã™ã‚‹ã“ã¨ã§ç‹¬ç«‹ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚")
+ text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Command-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥³¥Þ¥ó¥É¥­¡¼µ­¹æ¤Ë³¤¤¤ÆÉ½¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»È¤Ã¤¿¹àÌܵ¯Æ°¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
else
- text("ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯æ§˜ã€…ãªãƒ¡ãƒ‹ãƒ¥ãƒ¼ã¨ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰æ§‹æˆã•れã¦ã„ã¾ã™ã€‚Alt-X を入力ã™ã‚‹ã¨ã€XãŒãƒ¡ãƒ‹ãƒ¥ãƒ¼ã«ã‚¢ãƒ³ãƒ€ãƒ¼ãƒ©ã‚¤ãƒ³ä»˜ãã§è¡¨ç¤ºã•れã¦ã„る文字ãªã‚‰ã°ã€ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰ã‹ã‚‰ã®æŒ‡å®šãŒã§ãã¾ã™ã€‚矢å°ã‚­ãƒ¼ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®ãƒˆãƒ©ãƒãƒ¼ã‚¹ã‚‚å¯èƒ½ã§ã™ã€‚ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒæŒ‡å®šã•れãŸéš›ã«ã¯ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚­ãƒ¼ã§å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚ã‚‹ã„ã¯ã€ã‚¢ãƒ³ãƒ€ãƒ¼ãƒ©ã‚¤ãƒ³ä»˜ãã®æ–‡å­—を入力ã™ã‚‹ã“ã¨ã§ã‚‚実行ã§ãã¾ã™ã€‚メニューã®ã‚¨ãƒ³ãƒˆãƒªãŒã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚’æŒã£ã¦ã„ã‚‹å ´åˆã¯ã€ãã®ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ã‚’入力ã™ã‚‹ã“ã¨ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’指定ã™ã‚‹ã“ã¨ãªã—ã«å®Ÿè¡Œã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚メニューè¦ç´ ä¸­ã€æœ€å¾Œã®ã‚‚ã®ã¯ã€ãã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®æœ€åˆã®é …ç›®ã‚’é¸æŠžã™ã‚‹ã“ã¨ã§ç‹¬ç«‹ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚")
+ text("¤³¤Î¥¦¥£¥ó¥É¥¦¤ÏÍÍ¡¹¤Ê¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¥á¥Ë¥å¡¼¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Alt-X ¤òÆþÎϤ¹¤ë¤È¡¢X¤¬¥á¥Ë¥å¡¼¤Ë¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ëʸ»ú¤Ê¤é¤Ð¡¢¥­¡¼¥Ü¡¼¥É¤«¤é¤Î»ØÄ꤬¤Ç¤­¤Þ¤¹¡£Ìð°õ¥­¡¼¤Ç¥á¥Ë¥å¡¼¤Î¥È¥é¥Ð¡¼¥¹¤â²Äǽ¤Ç¤¹¡£¥á¥Ë¥å¡¼¤¬»ØÄꤵ¤ì¤¿ºÝ¤Ë¤Ï¡¢¥¹¥Ú¡¼¥¹¥­¡¼¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¢¤ë¤¤¤Ï¡¢¥¢¥ó¥À¡¼¥é¥¤¥óÉÕ¤­¤Îʸ»ú¤òÆþÎϤ¹¤ë¤³¤È¤Ç¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼¤Î¥¨¥ó¥È¥ê¤¬¥¢¥¯¥»¥é¥ì¡¼¥¿¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥¢¥¯¥»¥é¥ì¡¼¥¿¤òÆþÎϤ¹¤ë¤³¤È¤Ç¥á¥Ë¥å¡¼¤ò»ØÄꤹ¤ë¤³¤È¤Ê¤·¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¥Ë¥å¡¼Í×ÁÇÃæ¡¢ºÇ¸å¤Î¤â¤Î¤Ï¡¢¤½¤Î¥á¥Ë¥å¡¼¤ÎºÇ½é¤Î¹àÌܤòÁªÂò¤¹¤ë¤³¤È¤ÇÆÈΩ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£")
end
}.pack('side'=>'top')
-# 状態表示ã®ç”Ÿæˆ
+# ¾õÂÖɽ¼¨¤ÎÀ¸À®
$menu8xstatus = TkVariable.new(" ")
TkFrame.new(base_frame) {|frame|
TkLabel.new(frame, 'textvariable'=>$menu8xstatus, 'relief'=>'sunken',
@@ -70,11 +70,11 @@ TkFrame.new(base_frame) {|frame|
.pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $menu8x_demo
$menu8x_demo = nil
@@ -83,24 +83,24 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'menu8x'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# menu 生æˆ
+# menu À¸À®
TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
TkMenu.new(m, 'tearoff'=>false) {|file_menu|
m.add('cascade', 'label'=>'File', 'menu'=>file_menu, 'underline'=>0)
- add('command', 'label'=>'é–‹ã ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"é–‹ã ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'æ–°è¦', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"æ–°è¦"ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'ä¿å­˜', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"ä¿å­˜"ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'ä¿å­˜(指定) ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"ä¿å­˜(指定) ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
+ add('command', 'label'=>'³«¤¯ ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"³«¤¯ ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'¿·µ¬', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"¿·µ¬"¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Êݸ', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"Êݸ"¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'Êݸ(»ØÄê) ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"Êݸ(»ØÄê) ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
add('separator')
- add('command', 'label'=>'プリント設定 ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"プリント設定 ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
- add('command', 'label'=>'プリント ...', 'command'=>proc{fail 'ã“れã¯ã€ãƒ‡ãƒ¢ã§ã™ã®ã§"プリント ..."ã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“。'})
+ add('command', 'label'=>'¥×¥ê¥ó¥ÈÀßÄê ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"¥×¥ê¥ó¥ÈÀßÄê ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
+ add('command', 'label'=>'¥×¥ê¥ó¥È ...', 'command'=>proc{fail '¤³¤ì¤Ï¡¢¥Ç¥â¤Ç¤¹¤Î¤Ç"¥×¥ê¥ó¥È ..."¤ËÂФ¹¤ë¥¢¥¯¥·¥ç¥ó¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£'})
add('separator')
- add('command', 'label'=>'終了', 'command'=>proc{$menu8x_demo.destroy})
+ add('command', 'label'=>'½ªÎ»', 'command'=>proc{$menu8x_demo.destroy})
}
if $tk_platform['platform'] == 'macintosh' ||
@@ -114,10 +114,10 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
TkMenu.new(m, 'tearoff'=>false) {|basic_menu|
m.add('cascade', 'label'=>'Basic', 'menu'=>basic_menu, 'underline'=>0)
- add('command', 'label'=>'何もã—ãªã„é•·ã„エントリ')
+ 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}\" ã‚’å°å­—)",
+ # 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,56 +126,56 @@ 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"},
+ $menu8x_demo.bind("#{modifier}-h", proc{print "Hello(¤³¤ó¤Ë¤Á¤Ï)\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"})
+ $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)
+ add('check', 'label'=>'¥ª¥¤¥ëÅÀ¸¡', 'variable'=>oil)
trans = TkVariable.new(0)
- add('check', 'label'=>'トランスミッション点検', 'variable'=>trans)
+ add('check', 'label'=>'¥È¥é¥ó¥¹¥ß¥Ã¥·¥ç¥óÅÀ¸¡', 'variable'=>trans)
brakes = TkVariable.new(0)
- add('check', 'label'=>'ブレーキ点検', 'variable'=>brakes)
+ add('check', 'label'=>'¥Ö¥ì¡¼¥­ÅÀ¸¡', 'variable'=>brakes)
lights = TkVariable.new(0)
- add('check', 'label'=>'ライト点検', 'variable'=>lights)
+ add('check', 'label'=>'¥é¥¤¥ÈÅÀ¸¡', 'variable'=>lights)
add('separator')
- add('command', 'label'=>'ç¾åœ¨ã®å€¤ã‚’表示',
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
'command'=>proc{showVars($menu8x_demo,
- ['オイル点検', oil],
- ['トランスミッション点検', trans],
- ['ブレーキ点検', brakes],
- ['ライト点検', lights])} )
+ ['¥ª¥¤¥ëÅÀ¸¡', 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)
- add('radio', 'label'=>'14 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>14)
- add('radio', 'label'=>'18 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>18)
- add('radio', 'label'=>'24 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>24)
- add('radio', 'label'=>'32 ãƒã‚¤ãƒ³ãƒˆ', 'variable'=>pointSize, 'value'=>32)
+ add('radio', 'label'=>'10 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>10)
+ add('radio', 'label'=>'14 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>14)
+ add('radio', 'label'=>'18 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>18)
+ add('radio', 'label'=>'24 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>24)
+ add('radio', 'label'=>'32 ¥Ý¥¤¥ó¥È', 'variable'=>pointSize, 'value'=>32)
add('separator')
style = TkVariable.new
- add('radio', 'label'=>'ローマン', 'variable'=>style, 'value'=>'roman')
- add('radio', 'label'=>'ボールド', 'variable'=>style, 'value'=>'bold')
- add('radio', 'label'=>'イタリック', 'variable'=>style, 'value'=>'italic')
+ add('radio', 'label'=>'¥í¡¼¥Þ¥ó', 'variable'=>style, 'value'=>'roman')
+ add('radio', 'label'=>'¥Ü¡¼¥ë¥É', 'variable'=>style, 'value'=>'bold')
+ add('radio', 'label'=>'¥¤¥¿¥ê¥Ã¥¯', 'variable'=>style, 'value'=>'italic')
add('separator')
- add('command', 'label'=>'ç¾åœ¨ã®å€¤ã‚’表示',
+ add('command', 'label'=>'¸½ºß¤ÎÃͤòɽ¼¨',
'command'=>proc{showVars($menu8x_demo,
- ['ãƒã‚¤ãƒ³ãƒˆã‚µã‚¤ã‚º', pointSize],
- ['スタイル', style])} )
+ ['¥Ý¥¤¥ó¥È¥µ¥¤¥º', pointSize],
+ ['¥¹¥¿¥¤¥ë', style])} )
invoke 1
invoke 7
}
@@ -188,9 +188,9 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
'images','pattern.xbm'].join(File::Separator),
'hidemargin'=>1,
'command'=>proc{TkDialog.new('title'=>'Bitmap Menu Entry',
- 'text'=>'今ã‚ãªãŸãŒé¸æŠžã—ãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®é …ç›®ã¯ãƒ†ã‚­ã‚¹ãƒˆã§ã¯ãªãビットマップを表示ã—ã¦ã„ã¾ã—ãŸã€‚ãれ以外ã®ç‚¹ã§ã¯ä»–ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼é …ç›®ã¨å¤‰ã‚りã¾ã›ã‚“。',
+ 'text'=>'º£¤¢¤Ê¤¿¤¬ÁªÂò¤·¤¿¥á¥Ë¥å¡¼¤Î¹àÌܤϥƥ­¥¹¥È¤Ç¤Ï¤Ê¤¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤òɽ¼¨¤·¤Æ¤¤¤Þ¤·¤¿¡£¤½¤ì°Ê³°¤ÎÅÀ¤Ç¤Ï¾¤Î¥á¥Ë¥å¡¼¹àÌܤÈÊѤï¤ê¤Þ¤»¤ó¡£',
'bitmap'=>'', 'default'=>0,
- 'buttons'=>'了解')} )
+ 'buttons'=>'λ²ò')} )
['info', 'questhead', 'error'].each{|icon|
add('command', 'bitmap'=>icon, 'hidemargin'=>1,
'command'=>proc{print "You invoked the #{icon} bitmap\n"})
@@ -201,8 +201,8 @@ TkMenu.new($menu8x_demo, 'tearoff'=>false) {|m|
TkMenu.new(m, 'tearoff'=>false) {|more_menu|
m.add('cascade', 'label'=>'More', 'menu'=>more_menu, 'underline'=>0)
- [ 'エントリ','別ã®ã‚¨ãƒ³ãƒˆãƒª','何もã—ãªã„','ã»ã¨ã‚“ã©ä½•ã‚‚ã—ãªã„',
- '人生をæ„義ã‚ã‚‹ã‚‚ã®ã«' ].each{|i|
+ [ '¥¨¥ó¥È¥ê','Ê̤Υ¨¥ó¥È¥ê','²¿¤â¤·¤Ê¤¤','¤Û¤È¤ó¤É²¿¤â¤·¤Ê¤¤',
+ '¿ÍÀ¸¤ò°ÕµÁ¤¢¤ë¤â¤Î¤Ë' ].each{|i|
add('command', 'label'=>i,
'command'=>proc{print "You invoked \"#{i}\"\n"})
}
diff --git a/ext/tk/sample/demos-jp/menubu.rb b/ext/tk/sample/demos-jp/menubu.rb
index 06f9eb875e..78418ce3ea 100644
--- a/ext/tk/sample/demos-jp/menubu.rb
+++ b/ext/tk/sample/demos-jp/menubu.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
require "tkcanvas"
def optionMenu(menubutton, varName, firstValue, *rest)
@@ -38,16 +38,16 @@ base_frame = TkFrame.new($menubu_demo).pack(:fill=>:both, :expand=>true)
# version check
if $tk_version.to_f < 8.0
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame,'font'=>$font,'wraplength'=>'4i','justify'=>'left') {
- text("実行ã—よã†ã¨ã—ãŸã‚¹ã‚¯ãƒªãƒ—ト㯠Tk8.0 以上ã§åˆ©ç”¨ã§ãる機能を利用ã—ã¦ã„ã‚‹ãŸã‚ã€ã‚ãªãŸã® Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} ã§ã¯æ­£å¸¸ã«å®Ÿè¡Œã§ãã¾ã›ã‚“。よã£ã¦ãƒ‡ãƒ¢ã®å®Ÿè¡Œã‚’中止ã—ã¾ã—ãŸã€‚ãŸã ã—ã€ä¸‹ã®ã‚³ãƒ¼ãƒ‰å‚照ボタンを押ã™ã“ã¨ã§ã€å®Ÿè¡ŒãŒä¸­æ­¢ã•れãŸã‚¹ã‚¯ãƒªãƒ—トã®ã‚½ãƒ¼ã‚¹ã‚’å‚ç…§ã™ã‚‹ã“ã¨ã¯å¯èƒ½ã§ã™ã€‚")
+ text("¼Â¹Ô¤·¤è¤¦¤È¤·¤¿¥¹¥¯¥ê¥×¥È¤Ï Tk8.0 °Ê¾å¤ÇÍøÍѤǤ­¤ëµ¡Ç½¤òÍøÍѤ·¤Æ¤¤¤ë¤¿¤á¡¢¤¢¤Ê¤¿¤Î Ruby#{VERSION}/Tk#{$tk_version}#{(Tk::JAPANIZED_TK)? 'jp': ''} ¤Ç¤ÏÀµ¾ï¤Ë¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£¤è¤Ã¤Æ¥Ç¥â¤Î¼Â¹Ô¤òÃæ»ß¤·¤Þ¤·¤¿¡£¤¿¤À¤·¡¢²¼¤Î¥³¡¼¥É»²¾È¥Ü¥¿¥ó¤ò²¡¤¹¤³¤È¤Ç¡¢¼Â¹Ô¤¬Ãæ»ß¤µ¤ì¤¿¥¹¥¯¥ê¥×¥È¤Î¥½¡¼¥¹¤ò»²¾È¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£")
}.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $menubu_demo
$menubu_demo = nil
@@ -56,7 +56,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'menubu'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
@@ -160,8 +160,8 @@ center = TkFrame.new(body) {
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc {
tmppath = $menubu_demo
$menubu_demo = nil
@@ -170,7 +170,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc { showCode 'menubu' }
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'expand'=>'yes', 'fill'=>'x', 'pady'=>'2m')
@@ -179,10 +179,10 @@ msg = TkLabel.new(center) {
# font $font
wraplength '4i'
justify 'left'
- text "ã“れã¯ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒœã‚¿ãƒ³ã®ãƒ‡ãƒ¢ã§ã™ã€‚\"Below\"ã®ãƒœã‚¿ãƒ³ã¯\
-下ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’出ã—ã€\"Right\"ã®ãƒœã‚¿ãƒ³ã¯å³ã«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’出ã—ã¦ã€\
-……ã¨ãªã‚Šã¾ã™ã€‚ã“ã®æ–‡ç« ã®ä¸‹ã«ã¯2ã¤ã®ã‚ªãƒ—ションメニューãŒã‚りã¾ã™ã€‚\
-1ã¤ã¯æ™®é€šã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã§ã€ã‚‚ã†1ã¤ã¯16色ã®ãƒ‘レットã§ã™ã€‚"
+ text "¤³¤ì¤Ï¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤Î¥Ç¥â¤Ç¤¹¡£\"Below\"¤Î¥Ü¥¿¥ó¤Ï\
+²¼¤Ë¥á¥Ë¥å¡¼¤ò½Ð¤·¡¢\"Right\"¤Î¥Ü¥¿¥ó¤Ï±¦¤Ë¥á¥Ë¥å¡¼¤ò½Ð¤·¤Æ¡¢\
+¡Ä¡Ä¤È¤Ê¤ê¤Þ¤¹¡£¤³¤Îʸ¾Ï¤Î²¼¤Ë¤Ï2¤Ä¤Î¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤¬¤¢¤ê¤Þ¤¹¡£\
+1¤Ä¤ÏÉáÄ̤Υá¥Ë¥å¡¼¤Ç¡¢¤â¤¦1¤Ä¤Ï16¿§¤Î¥Ñ¥ì¥Ã¥È¤Ç¤¹¡£"
}
msg.pack('side'=>'top', 'padx'=>25, 'pady'=>25)
diff --git a/ext/tk/sample/demos-jp/msgbox.rb b/ext/tk/sample/demos-jp/msgbox.rb
index ec7b4f2bbc..ed5d01252e 100644
--- a/ext/tk/sample/demos-jp/msgbox.rb
+++ b/ext/tk/sample/demos-jp/msgbox.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# message boxes widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($msgbox_demo) && $msgbox_demo
$msgbox_demo.destroy
$msgbox_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$msgbox_demo = TkToplevel.new {|w|
title("Message Box Demonstration")
iconname("messagebox")
@@ -18,15 +18,15 @@ $msgbox_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($msgbox_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
- 'text'=>"ã¾ãšè¡¨ç¤ºã™ã‚‹ã‚¢ã‚¤ã‚³ãƒ³ã¨ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ã®ç¨®é¡žã‚’é¸ã‚“ã§ä¸‹ã•ã„。ãã®å¾Œã«\"メッセージボックス\"ボタンを押ã™ã¨ã€æŒ‡å®šã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ãŒè¡¨ç¤ºã•れã¾ã™ã€‚").pack('side'=>'top')
+ 'text'=>"¤Þ¤ºÉ½¼¨¤¹¤ë¥¢¥¤¥³¥ó¤È¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Î¼ïÎà¤òÁª¤ó¤Ç²¼¤µ¤¤¡£¤½¤Î¸å¤Ë\"¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹\"¥Ü¥¿¥ó¤ò²¡¤¹¤È¡¢»ØÄꤷ¤¿¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£").pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $msgbox_demo
$msgbox_demo = nil
@@ -35,17 +35,17 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'msgbox'}
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'メッセージボックス'
+ text '¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹'
command proc{showMessageBox $msgbox_demo}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
$msgbox_leftframe = TkFrame.new(base_frame)
$msgbox_rightframe = TkFrame.new(base_frame)
$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
@@ -53,7 +53,7 @@ $msgbox_leftframe .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')
+TkLabel.new($msgbox_leftframe, 'text'=>'¥¢¥¤¥³¥ó').pack('side'=>'top')
TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
@@ -65,7 +65,7 @@ $msgboxIcon = TkVariable.new('info')
'anchor'=>'w', 'fill'=>'x')
}
-TkLabel.new($msgbox_rightframe, 'text'=>'種類').pack('side'=>'top')
+TkLabel.new($msgbox_rightframe, 'text'=>'¼ïÎà').pack('side'=>'top')
TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
@@ -81,9 +81,9 @@ $msgboxType = TkVariable.new('ok')
def showMessageBox(w)
button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
'title'=>'Message', 'parent'=>w,
- 'message'=>"ã“れã¯\"#{$msgboxType.value}\"ã¨ã„ã†ç¨®é¡žã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ã§ã€\"#{$msgboxIcon.value}\"ã®ã‚¢ã‚¤ã‚³ãƒ³ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚")
+ 'message'=>"¤³¤ì¤Ï\"#{$msgboxType.value}\"¤È¤¤¤¦¼ïÎà¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Ç¡¢\"#{$msgboxIcon.value}\"¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£")
Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
- 'message'=>"ã‚ãªãŸã¯ \"#{button}\" を押ã—ã¾ã—ãŸã­ã€‚")
+ 'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
end
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
index ad6d936036..8c80e08d70 100644
--- a/ext/tk/sample/demos-jp/msgbox2.rb
+++ b/ext/tk/sample/demos-jp/msgbox2.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# message boxes widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($msgbox2_demo) && $msgbox2_demo
$msgbox2_demo.destroy
$msgbox2_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$msgbox2_demo = TkToplevel.new {|w|
title("Message Box Demonstration")
iconname("messagebox")
@@ -18,15 +18,15 @@ $msgbox2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($msgbox2_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
- 'text'=>"ã¾ãšè¡¨ç¤ºã™ã‚‹ã‚¢ã‚¤ã‚³ãƒ³ã¨ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ã®ç¨®é¡žã‚’é¸ã‚“ã§ä¸‹ã•ã„。ãã®å¾Œã«\"メッセージボックス\"ボタンを押ã™ã¨ã€æŒ‡å®šã•れãŸå½¢å¼ã§ã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¨è©³ç´°ãƒ†ã‚­ã‚¹ãƒˆã¨ã‚’æŒã£ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ãŒè¡¨ç¤ºã•れã¾ã™ã€‚").pack('side'=>'top')
+ 'text'=>"¤Þ¤ºÉ½¼¨¤¹¤ë¥¢¥¤¥³¥ó¤È¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Î¼ïÎà¤òÁª¤ó¤Ç²¼¤µ¤¤¡£¤½¤Î¸å¤Ë\"¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹\"¥Ü¥¿¥ó¤ò²¡¤¹¤È¡¢»ØÄꤵ¤ì¤¿·Á¼°¤Ç¡¢¥á¥Ã¥»¡¼¥¸¤È¾ÜºÙ¥Æ¥­¥¹¥È¤È¤ò»ý¤Ã¤¿¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£").pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $msgbox2_demo
$msgbox2_demo = nil
@@ -35,17 +35,17 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'msgbox2'}
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'メッセージボックス'
+ text '¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹'
command proc{showMessageBox2 $msgbox2_demo}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
$msgbox_leftframe = TkFrame.new(base_frame)
$msgbox_rightframe = TkFrame.new(base_frame)
$msgbox_leftframe .pack('side'=>'left', 'expand'=>'yes', 'fill'=>'y',
@@ -53,7 +53,7 @@ $msgbox_leftframe .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')
+TkLabel.new($msgbox_leftframe, 'text'=>'¥¢¥¤¥³¥ó').pack('side'=>'top')
TkFrame.new($msgbox_leftframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
@@ -65,7 +65,7 @@ $msgboxIcon = TkVariable.new('info')
'anchor'=>'w', 'fill'=>'x')
}
-TkLabel.new($msgbox_rightframe, 'text'=>'種類').pack('side'=>'top')
+TkLabel.new($msgbox_rightframe, 'text'=>'¼ïÎà').pack('side'=>'top')
TkFrame.new($msgbox_rightframe, 'relief'=>'ridge', 'bd'=>1, 'height'=>2)\
.pack('side'=>'top', 'fill'=>'x', 'expand'=>'no')
@@ -81,10 +81,10 @@ $msgboxType = TkVariable.new('ok')
def showMessageBox2(w)
button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value,
'title'=>'Message', 'parent'=>w,
- 'message'=>"\"#{$msgboxType.value}\"タイプã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹",
- 'detail'=>"ã“れã¯\"#{$msgboxType.value}\"ã¨ã„ã†ç¨®é¡žã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ã§ã€\"#{$msgboxIcon.value}\"ã®ã‚¢ã‚¤ã‚³ãƒ³ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚下ã®ãƒœã‚¿ãƒ³ã®ã„ãšã‚Œã‹ã‚’é¸æŠžã—ã¦ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。")
+ 'message'=>"\"#{$msgboxType.value}\"¥¿¥¤¥×¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹",
+ 'detail'=>"¤³¤ì¤Ï\"#{$msgboxType.value}\"¤È¤¤¤¦¼ïÎà¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹¤Ç¡¢\"#{$msgboxIcon.value}\"¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£²¼¤Î¥Ü¥¿¥ó¤Î¤¤¤º¤ì¤«¤òÁªÂò¤·¤Æ¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£")
Tk.messageBox('icon'=>'info', 'type'=>'ok', 'parent'=>w,
- 'message'=>"ã‚ãªãŸã¯ \"#{button}\" を押ã—ã¾ã—ãŸã­ã€‚")
+ 'message'=>"¤¢¤Ê¤¿¤Ï \"#{button}\" ¤ò²¡¤·¤Þ¤·¤¿¤Í¡£")
end
diff --git a/ext/tk/sample/demos-jp/paned1.rb b/ext/tk/sample/demos-jp/paned1.rb
index 53d2e7162b..987a073086 100644
--- a/ext/tk/sample/demos-jp/paned1.rb
+++ b/ext/tk/sample/demos-jp/paned1.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# paned1.rb
#
@@ -23,23 +23,23 @@ base_frame = TkFrame.new($paned1_demo).pack(:fill=>:both, :expand=>true)
TkLabel.new(base_frame,
:font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-下ã®è‰²ä»˜ã‘ã•れãŸäºŒã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®é–“ã®ä»•切り枠ã¯ã€ä¸€ã¤ã®é ˜åŸŸã‚’ãれãžã‚Œã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ãŸã‚ã«åˆ†å‰²ã™ã‚‹ãŸã‚ã®ã‚‚ã®ã§ã™ã€‚左ボタンã§ä»•切りをæ“作ã™ã‚‹ã¨ã€åˆ†å‰²ã‚µã‚¤ã‚ºå¤‰æ›´ã®æ“作途中ã§ã¯å†è¡¨ç¤ºã¯ãªã•れãšã€ç¢ºå®šã•ã›ãŸã¨ãã«è¡¨ç¤ºãŒæ›´æ–°ã•れã¾ã™ã€‚マウスã«ã‚ˆã‚‹ä»•åˆ‡ã‚Šã®æ“作ã«è¿½éšã—ã¦ã‚µã‚¤ã‚ºã‚’変更ã—ãŸè¡¨ç¤ºãŒãªã‚れるよã†ã«ã—ãŸã„å ´åˆã¯ã€ãƒžã‚¦ã‚¹ã®ä¸­å¤®ãƒœã‚¿ãƒ³ã‚’使ã£ã¦ãã ã•ã„。
-ã‚‚ã—ã‚ãªãŸãŒä½¿ã£ã¦ã„ã‚‹ Ruby ã«ãƒªãƒ³ã‚¯ã•れã¦ã„ã‚‹ Tk ライブラリ㌠panedwindow を実装ã—ã¦ã„ãªã„
-å ´åˆã€ã“ã®ãƒ‡ãƒ¢ã¯ã†ã¾ãå‹•ã‹ãªã„ã¯ãšã§ã™ã€‚ãã®å ´åˆã«ã¯ panedwindow ãŒå®Ÿè£…ã•れã¦ã„るよã†ãª
-より新ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Tk を組ã¿åˆã‚ã›ã¦è©¦ã™
-よã†ã«ã—ã¦ãã ã•ã„。
+²¼¤Î¿§ÉÕ¤±¤µ¤ì¤¿Æó¤Ä¤Î¥¦¥£¥ó¥É¥¦¤Î´Ö¤Î»ÅÀÚ¤êÏȤϡ¢°ì¤Ä¤ÎÎΰè¤ò¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¤¿¤á¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£º¸¥Ü¥¿¥ó¤Ç»ÅÀÚ¤ê¤òÁàºî¤¹¤ë¤È¡¢Ê¬³ä¥µ¥¤¥ºÊѹ¹¤ÎÁàºîÅÓÃæ¤Ç¤ÏºÆÉ½¼¨¤Ï¤Ê¤µ¤ì¤º¡¢³ÎÄꤵ¤»¤¿¤È¤­¤Ëɽ¼¨¤¬¹¹¿·¤µ¤ì¤Þ¤¹¡£¥Þ¥¦¥¹¤Ë¤è¤ë»ÅÀÚ¤ê¤ÎÁàºî¤ËÄɿ路¤Æ¥µ¥¤¥º¤òÊѹ¹¤·¤¿É½¼¨¤¬¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¥Þ¥¦¥¹¤ÎÃæ±û¥Ü¥¿¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬ panedwindow ¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
+¾ì¹ç¡¢¤³¤Î¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï panedwindow ¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê
+¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk ¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹
+¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
EOL
# The bottom buttons
TkFrame.new(base_frame){|f|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$paned1_demo.destroy
$paned1_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'paned1'
}).pack(:side=>:left, :expand=>true)
}
diff --git a/ext/tk/sample/demos-jp/paned2.rb b/ext/tk/sample/demos-jp/paned2.rb
index 65bd41c757..a1aee81690 100644
--- a/ext/tk/sample/demos-jp/paned2.rb
+++ b/ext/tk/sample/demos-jp/paned2.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# paned2.rb --
#
@@ -23,30 +23,30 @@ base_frame = TkFrame.new($paned2_demo).pack(:fill=>:both, :expand=>true)
TkLabel.new(base_frame,
:font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-下ã®ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ä»˜ãã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãŒç½®ã‹ã‚ŒãŸäºŒã¤ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®é–“ã®ä»•切り枠ã¯ã€ä¸€ã¤ã®é ˜åŸŸã‚’ãれãžã‚Œã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ãŸã‚ã«åˆ†å‰²ã™ã‚‹ãŸã‚ã®ã‚‚ã®ã§ã™ã€‚左ボタンã§ä»•切りをæ“作ã™ã‚‹ã¨ã€åˆ†å‰²ã‚µã‚¤ã‚ºå¤‰æ›´ã®æ“作途中ã§ã¯å†è¡¨ç¤ºã¯ãªã•れãšã€ç¢ºå®šã•ã›ãŸã¨ãã«è¡¨ç¤ºãŒæ›´æ–°ã•れã¾ã™ã€‚マウスã«ã‚ˆã‚‹ä»•åˆ‡ã‚Šã®æ“作ã«è¿½éšã—ã¦ã‚µã‚¤ã‚ºã‚’変更ã—ãŸè¡¨ç¤ºãŒãªã‚れるよã†ã«ã—ãŸã„å ´åˆã¯ã€ãƒžã‚¦ã‚¹ã®ä¸­å¤®ãƒœã‚¿ãƒ³ã‚’使ã£ã¦ãã ã•ã„。
-ã‚‚ã—ã‚ãªãŸãŒä½¿ã£ã¦ã„ã‚‹ Ruby ã«ãƒªãƒ³ã‚¯ã•れã¦ã„ã‚‹ Tk ライブラリ㌠panedwindow を実装ã—ã¦ã„ãªã„
-å ´åˆã€ã“ã®ãƒ‡ãƒ¢ã¯ã†ã¾ãå‹•ã‹ãªã„ã¯ãšã§ã™ã€‚ãã®å ´åˆã«ã¯ panedwindow ãŒå®Ÿè£…ã•れã¦ã„るよã†ãª
-より新ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Tk を組ã¿åˆã‚ã›ã¦è©¦ã™
-よã†ã«ã—ã¦ãã ã•ã„。
+²¼¤Î¥¹¥¯¥í¡¼¥ë¥Ð¡¼ÉÕ¤­¤Î¥¦¥£¥¸¥§¥Ã¥È¤¬ÃÖ¤«¤ì¤¿Æó¤Ä¤Î¥¦¥£¥ó¥É¥¦¤Î´Ö¤Î»ÅÀÚ¤êÏȤϡ¢°ì¤Ä¤ÎÎΰè¤ò¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¤¿¤á¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£º¸¥Ü¥¿¥ó¤Ç»ÅÀÚ¤ê¤òÁàºî¤¹¤ë¤È¡¢Ê¬³ä¥µ¥¤¥ºÊѹ¹¤ÎÁàºîÅÓÃæ¤Ç¤ÏºÆÉ½¼¨¤Ï¤Ê¤µ¤ì¤º¡¢³ÎÄꤵ¤»¤¿¤È¤­¤Ëɽ¼¨¤¬¹¹¿·¤µ¤ì¤Þ¤¹¡£¥Þ¥¦¥¹¤Ë¤è¤ë»ÅÀÚ¤ê¤ÎÁàºî¤ËÄɿ路¤Æ¥µ¥¤¥º¤òÊѹ¹¤·¤¿É½¼¨¤¬¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¥Þ¥¦¥¹¤ÎÃæ±û¥Ü¥¿¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤¬ panedwindow ¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤
+¾ì¹ç¡¢¤³¤Î¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï panedwindow ¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê
+¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk ¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹
+¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
EOL
# The bottom buttons
TkFrame.new(base_frame){|f|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$paned2_demo.destroy
$paned2_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'paned2'
}).pack(:side=>:left, :expand=>true)
}
paneList = TkVariable.new # define as normal variable (not array)
paneList.value = [ # ruby's array --> tcl's list
- 'Ruby/Tk ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆä¸€è¦§',
+ 'Ruby/Tk ¤Î¥¦¥£¥¸¥§¥Ã¥È°ìÍ÷',
'TkButton',
'TkCanvas',
'TkCheckbutton',
@@ -87,8 +87,8 @@ TkPanedwindow.new(base_frame, :orient=>:vertical){|f|
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 60556fd70a..48839aa58a 100644
--- a/ext/tk/sample/demos-jp/pendulum.rb
+++ b/ext/tk/sample/demos-jp/pendulum.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# This demonstration illustrates how Tcl/Tk can be used to construct
# simulations of physical systems.
@@ -26,15 +26,15 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text 'ã“ã®ãƒ‡ãƒ¢ã¯ã€ç‰©ç†ç³»ã®ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã«é–¢ã‚るよã†ãªã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³å®Ÿè¡Œã™ã‚‹ãŸã‚ã« Ruby/Tk ã‚’ã©ã®ã‚ˆã†ã«ç”¨ã„ã‚‹ã“ã¨ãŒã§ãã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚å·¦å´ã®ã‚­ãƒ£ãƒ³ãƒã‚¹ã¯å˜ç´”ãªæŒ¯ã‚Šå­ã§ã‚る物ç†ç³»è‡ªä½“ã®ã‚°ãƒ©ãƒ•ィカル表ç¾ã§ã‚ã‚‹ã®ã«å¯¾ã—ã€å³å´ã®ã‚­ãƒ£ãƒ³ãƒã‚¹ã¯ç³»ã®ä½ç›¸ç©ºé–“ã®ã‚°ãƒ©ãƒ•(角速度ã¨è§’度ã¨ã‚’プロットã—ãŸã‚‚ã®ï¼‰ã«ãªã£ã¦ã„ã¾ã™ã€‚å·¦å´ã®ã‚­ãƒ£ãƒ³ãƒã‚¹ä¸Šã§ã‚¯ãƒªãƒƒã‚¯ãŠã‚ˆã³ãƒ‰ãƒ©ãƒƒã‚°ã‚’行ã£ã¦æŒ¯ã‚Šå­ã®é‡ã‚Šã®ä½ç½®ã‚’変ãˆã¦ã¿ã¦ãã ã•ã„。'
+ text '¤³¤Î¥Ç¥â¤Ï¡¢ÊªÍý·Ï¤Î¥·¥ß¥å¥ì¡¼¥·¥ç¥ó¤Ë´Ø¤ï¤ë¤è¤¦¤Ê¥¢¥Ë¥á¡¼¥·¥ç¥ó¼Â¹Ô¤¹¤ë¤¿¤á¤Ë Ruby/Tk ¤ò¤É¤Î¤è¤¦¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Î¥­¥ã¥ó¥Ð¥¹¤Ïñ½ã¤Ê¿¶¤ê»Ò¤Ç¤¢¤ëʪÍý·Ï¼«ÂΤΥ°¥é¥Õ¥£¥«¥ëɽ¸½¤Ç¤¢¤ë¤Î¤ËÂФ·¡¢±¦Â¦¤Î¥­¥ã¥ó¥Ð¥¹¤Ï·Ï¤Î°ÌÁê¶õ´Ö¤Î¥°¥é¥Õ¡Ê³Ñ®Å٤ȳÑÅ٤Ȥò¥×¥í¥Ã¥È¤·¤¿¤â¤Î¡Ë¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£º¸Â¦¤Î¥­¥ã¥ó¥Ð¥¹¾å¤Ç¥¯¥ê¥Ã¥¯¤ª¤è¤Ó¥É¥é¥Ã¥°¤ò¹Ô¤Ã¤Æ¿¶¤ê»Ò¤Î½Å¤ê¤Î°ÌÃÖ¤òÊѤ¨¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£'
}
msg.pack('side'=>'top')
# create frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $pendulum_demo
$pendulum_demo = nil
@@ -43,7 +43,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'pendulum'}
}.pack('side'=>'left', 'expand'=>'yes')
diff --git a/ext/tk/sample/demos-jp/plot.rb b/ext/tk/sample/demos-jp/plot.rb
index 4147b35399..a49ed00df8 100644
--- a/ext/tk/sample/demos-jp/plot.rb
+++ b/ext/tk/sample/demos-jp/plot.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# 2-D plot widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($plot_demo) && $plot_demo
$plot_demo.destroy
$plot_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$plot_demo = TkToplevel.new {|w|
title("Plot Demonstration")
iconname("Plot")
@@ -18,17 +18,17 @@ $plot_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($plot_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'4i', 'justify'=>'left',
- 'text'=>"ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯ç°¡å˜ãª2次元ã®ãƒ—ロットをå«ã‚“ã ã‚­ãƒ£ãƒ³ãƒã‚¹ widgetã§ã™ã€‚表示ã•れãŸç‚¹ã‚’マウスボタン1ã§ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ãƒ‡ãƒ¼ã‚¿ã‚’ã„ã˜ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"){
+ 'text'=>"¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï´Êñ¤Ê2¼¡¸µ¤Î¥×¥í¥Ã¥È¤ò´Þ¤ó¤À¥­¥ã¥ó¥Ð¥¹ widget¤Ç¤¹¡£É½¼¨¤µ¤ì¤¿ÅÀ¤ò¥Þ¥¦¥¹¥Ü¥¿¥ó1¤Ç¥É¥é¥Ã¥°¤·¤Æ¥Ç¡¼¥¿¤ò¤¤¤¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$plot_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $plot_demo
$plot_demo = nil
@@ -37,28 +37,28 @@ $plot_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'plot'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$plot_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# font 設定
+# font ÀßÄê
if $tk_version =~ /^4.*/
plotFont = '-*-Helvetica-Medium-R-Normal--*-180-*-*-*-*-*-*'
else
font = 'Helvetica 18'
end
-# 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,
- 'text'=>"ç°¡å˜ãªãƒ—ロット", 'font'=>plotFont, 'fill'=>'brown')
+ 'text'=>"´Êñ¤Ê¥×¥í¥Ã¥È", 'font'=>plotFont, 'fill'=>'brown')
(0..10).each {|i|
x = 100 + (i * 30)
diff --git a/ext/tk/sample/demos-jp/puzzle.rb b/ext/tk/sample/demos-jp/puzzle.rb
index dbcb423463..16d7ce497c 100644
--- a/ext/tk/sample/demos-jp/puzzle.rb
+++ b/ext/tk/sample/demos-jp/puzzle.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# widet demo 'puzzle' (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($puzzle_demo) && $puzzle_demo
$puzzle_demo.destroy
$puzzle_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$puzzle_demo = TkToplevel.new {|w|
title("15-Puzzle Demonstration")
iconname("15-Puzzle")
@@ -18,20 +18,20 @@ $puzzle_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($puzzle_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "下ã®15-パズルã¯ãƒœã‚¿ãƒ³ã‚’集ã‚ã¦ã§ãã¦ã„ã¾ã™ã€‚空ã„ã¦ã„る所ã®éš£ã®ãƒ”ースをクリックã™ã‚‹ã¨ã€ãã®ãƒ”ースãŒãã®ç©ºã„ã¦ã„る場所ã«ã‚¹ãƒ©ã‚¤ãƒ‰ã—ã¾ã™ã€‚ã“ã®æ“作を続ã‘ã€ãƒ”ースãŒãã®æ•°ã®é †ã«ä¸Šã‹ã‚‰ä¸‹ã€å·¦ã‹ã‚‰å³ã«ä¸¦ã¶ã‚ˆã†ã«ã—ã¦ãã ã•ã„。"
+ text "²¼¤Î15-¥Ñ¥º¥ë¤Ï¥Ü¥¿¥ó¤ò½¸¤á¤Æ¤Ç¤­¤Æ¤¤¤Þ¤¹¡£¶õ¤¤¤Æ¤¤¤ë½ê¤ÎÎ٤Υԡ¼¥¹¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥Ô¡¼¥¹¤¬¤½¤Î¶õ¤¤¤Æ¤¤¤ë¾ì½ê¤Ë¥¹¥é¥¤¥É¤·¤Þ¤¹¡£¤³¤ÎÁàºî¤ò³¤±¡¢¥Ô¡¼¥¹¤¬¤½¤Î¿ô¤Î½ç¤Ë¾å¤«¤é²¼¡¢º¸¤«¤é±¦¤Ëʤ֤褦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $puzzle_demo
$puzzle_demo = nil
@@ -40,16 +40,16 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'puzzle'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
#
-# Special trick: scrollbar widget を生æˆã—ã¦ãã® trough color を用ã„ã‚‹ã“ã¨ã§
-# 空白部分ã®ãŸã‚ã®æš—è‰²ã‚’é¸æŠžã—,設定ã™ã‚‹
+# Special trick: scrollbar widget ¤òÀ¸À®¤·¤Æ¤½¤Î trough color ¤òÍѤ¤¤ë¤³¤È¤Ç
+# ¶õÇòÉôʬ¤Î¤¿¤á¤Î°Å¿§¤òÁªÂò¤·¡¤ÀßÄꤹ¤ë
#
begin
if Tk.windowingsystem() == 'aqua'
@@ -81,9 +81,9 @@ base = TkFrame.new(base_frame) {
s.destroy
base.pack('side'=>'top', 'padx'=>'1c', 'pady'=>'1c')
-# proc ã®ã‚¹ã‚³ãƒ¼ãƒ—ã‚’é–‰ã˜ã‚‹ãŸã‚,proc 生æˆãƒ¡ã‚½ãƒƒãƒ‰ã‚’用æ„
-# ã“ã†ã—ã¦ãŠã‹ã­ã°ï¼Œãƒ«ãƒ¼ãƒ—中ã§å€¤ãŒå¤‰åŒ–ã™ã‚‹ num ã®å½±éŸ¿ã‚’å—ã‘ã¦
-# puzzleSwitch ã®ç¬¬ 2 引数ãŒå¤‰åŒ–ã—ã¦ã—ã¾ã„,期待通りã«ã¯ãªã‚‰ãªã„.
+# proc ¤Î¥¹¥³¡¼¥×¤òÊĤ¸¤ë¤¿¤á¡¤proc À¸À®¥á¥½¥Ã¥É¤òÍѰÕ
+# ¤³¤¦¤·¤Æ¤ª¤«¤Í¤Ð¡¤¥ë¡¼¥×Ãæ¤ÇÃͤ¬ÊѲ½¤¹¤ë num ¤Î±Æ¶Á¤ò¼õ¤±¤Æ
+# puzzleSwitch ¤ÎÂè 2 °ú¿ô¤¬ÊѲ½¤·¤Æ¤·¤Þ¤¤¡¤´üÂÔÄ̤ê¤Ë¤Ï¤Ê¤é¤Ê¤¤¡¥
def def_puzzleswitch_proc(w, num)
proc{puzzleSwitch w, num}
end
diff --git a/ext/tk/sample/demos-jp/radio.rb b/ext/tk/sample/demos-jp/radio.rb
index efb613593d..3355f25116 100644
--- a/ext/tk/sample/demos-jp/radio.rb
+++ b/ext/tk/sample/demos-jp/radio.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# radiobutton widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($radio_demo) && $radio_demo
$radio_demo.destroy
$radio_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$radio_demo = TkToplevel.new {|w|
title("Radiobutton Demonstration")
iconname("radio")
@@ -18,24 +18,24 @@ $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'
justify 'left'
- text "下ã«ã¯2ã¤ã®ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³ã‚°ãƒ«ãƒ¼ãƒ—ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚ボタンをクリックã™ã‚‹ã¨ã€ãã®ãƒœã‚¿ãƒ³ã ã‘ãŒãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸­ã§é¸æŠžã•れã¾ã™ã€‚å„グループã«å¯¾ã—ã¦ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸­ã®ã©ã®ãƒœã‚¿ãƒ³ãŒé¸æŠžã•れã¦ã„ã‚‹ã‹ã‚’示ã™å¤‰æ•°ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚ç¾åœ¨ã®å¤‰æ•°ã®å€¤ã‚’見るã«ã¯ã€Œå¤‰æ•°å‚ç…§ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
+ text "²¼¤Ë¤Ï2¤Ä¤Î¥é¥¸¥ª¥Ü¥¿¥ó¥°¥ë¡¼¥×¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥Ü¥¿¥ó¤À¤±¤¬¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤ÇÁªÂò¤µ¤ì¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×¤ËÂФ·¤Æ¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤Î¤É¤Î¥Ü¥¿¥ó¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤¹ÊÑ¿ô¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
}
msg.pack('side'=>'top')
-# 変数生æˆ
+# ÊÑ¿ôÀ¸À®
size = TkVariable.new
color = TkVariable.new
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $radio_demo
$radio_demo = nil
@@ -45,35 +45,35 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'radio'}
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text '変数å‚ç…§'
+ text 'ÊÑ¿ô»²¾È'
command proc{
showVars(base_frame, ['size', size], ['color', color])
}
}.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 "ãƒã‚¤ãƒ³ãƒˆã‚µã‚¤ã‚º #{sz}"
+ text "¥Ý¥¤¥ó¥È¥µ¥¤¥º #{sz}"
variable size
relief 'flat'
value sz
}.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w')
}
-['赤', 'ç·‘', 'é’', '黄', 'æ©™', 'ç´«'].each {|col|
+['ÀÖ', 'ÎÐ', 'ÀÄ', '²«', 'Üô', '»ç'].each {|col|
TkRadioButton.new(f_right) {
text col
variable color
diff --git a/ext/tk/sample/demos-jp/radio2.rb b/ext/tk/sample/demos-jp/radio2.rb
index 0633a8def1..91496beb6d 100644
--- a/ext/tk/sample/demos-jp/radio2.rb
+++ b/ext/tk/sample/demos-jp/radio2.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# radio2.rb
#
@@ -28,7 +28,7 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
- text "下ã«ã¯3ã¤ã®ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³ã‚°ãƒ«ãƒ¼ãƒ—ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚ボタンをクリックã™ã‚‹ã¨ã€ãã®ãƒœã‚¿ãƒ³ã ã‘ãŒãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸­ã§é¸æŠžã•れã¾ã™ã€‚å„グループã«å¯¾ã—ã¦ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸­ã®ã©ã®ãƒœã‚¿ãƒ³ãŒé¸æŠžã•れã¦ã„ã‚‹ã‹ã‚’示ã™å¤‰æ•°ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚ç¾åœ¨ã®å¤‰æ•°ã®å€¤ã‚’見るã«ã¯ã€Œå¤‰æ•°å‚ç…§ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
+ text "²¼¤Ë¤Ï3¤Ä¤Î¥é¥¸¥ª¥Ü¥¿¥ó¥°¥ë¡¼¥×¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥Ü¥¿¥ó¤À¤±¤¬¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤ÇÁªÂò¤µ¤ì¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×¤ËÂФ·¤Æ¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤Î¤É¤Î¥Ü¥¿¥ó¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤¹ÊÑ¿ô¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
}
msg.pack('side'=>'top')
@@ -40,8 +40,8 @@ align = TkVariable.new
# frame
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $radio2_demo
$radio2_demo = nil
@@ -51,12 +51,12 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'radio2'}
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text '変数å‚ç…§'
+ text 'ÊÑ¿ô»²¾È'
command proc{
showVars(base_frame,
['size', size], ['color', color], ['compound', align])
@@ -65,11 +65,11 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
# frame
-f_left = TkLabelFrame.new(base_frame, 'text'=>'文字サイズ',
+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')
@@ -78,14 +78,14 @@ f_right.pack('side'=>'left', 'expand'=>'yes', 'padx'=>'.5c', 'pady'=>'.5c')
# radiobutton
[10, 12, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
- text "ãƒã‚¤ãƒ³ãƒˆã‚µã‚¤ã‚º #{sz}"
+ text "¥Ý¥¤¥ó¥È¥µ¥¤¥º #{sz}"
variable size
relief 'flat'
value sz
}.pack('side'=>'top', 'pady'=>2, 'anchor'=>'w', 'fill'=>'x')
}
-['赤', 'ç·‘', 'é’', '黄', 'æ©™', 'ç´«'].each {|col|
+['ÀÖ', 'ÎÐ', 'ÀÄ', '²«', 'Üô', '»ç'].each {|col|
TkRadioButton.new(f_mid) {
text col
variable color
@@ -95,8 +95,8 @@ 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))
diff --git a/ext/tk/sample/demos-jp/radio3.rb b/ext/tk/sample/demos-jp/radio3.rb
index 3356b6945b..763c522448 100644
--- a/ext/tk/sample/demos-jp/radio3.rb
+++ b/ext/tk/sample/demos-jp/radio3.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# radio3.rb
#
@@ -28,7 +28,7 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '5i'
justify 'left'
- text '下ã«ã¯3ã¤ã®ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³ã‚°ãƒ«ãƒ¼ãƒ—ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚ボタンをクリックã™ã‚‹ã¨ã€ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å±žã™ã‚‹ã™ã¹ã¦ã®ãƒœã‚¿ãƒ³ã®ä¸­ã§ã‚¯ãƒªãƒƒã‚¯ã—ãŸãƒœã‚¿ãƒ³ã ã‘ãŒé¸æŠžã•れãŸçŠ¶æ…‹ã«ãªã‚Šã¾ã™ã€‚å„グループã«ã¯ã€ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸­ã®ã©ã®ãƒœã‚¿ãƒ³ãŒé¸æŠžã•れã¦ã„ã‚‹ã‹ã‚’示ã™å¤‰æ•°ãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚「トライステートã€ãƒœã‚¿ãƒ³ãŒæŠ¼ã•れãŸã¨ãã«ã¯ã€ãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³ã®è¡¨ç¤ºãŒãƒˆãƒ©ã‚¤ã‚¹ãƒ†ãƒ¼ãƒˆãƒ¢ãƒ¼ãƒ‰ã«ãªã‚Šã¾ã™ã€‚ã„ãšã‚Œã‹ã®ãƒœã‚¿ãƒ³ã‚’é¸æŠžã™ã‚Œã°ã€ãƒœã‚¿ãƒ³ã®çŠ¶æ…‹ã¯å…ƒã®ã‚ˆã†ã«å€‹ã€…ã®ãƒœã‚¿ãƒ³ã®on/off状態を示ã™ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ç¾åœ¨ã®å¤‰æ•°ã®å€¤ã‚’見るã«ã¯ã€Œå¤‰æ•°å‚ç…§ã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。'
+ text '²¼¤Ë¤Ï3¤Ä¤Î¥é¥¸¥ª¥Ü¥¿¥ó¥°¥ë¡¼¥×¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢¤½¤Î¥°¥ë¡¼¥×¤Ë°¤¹¤ë¤¹¤Ù¤Æ¤Î¥Ü¥¿¥ó¤ÎÃæ¤Ç¥¯¥ê¥Ã¥¯¤·¤¿¥Ü¥¿¥ó¤À¤±¤¬ÁªÂò¤µ¤ì¤¿¾õÂ֤ˤʤê¤Þ¤¹¡£³Æ¥°¥ë¡¼¥×¤Ë¤Ï¡¢¤½¤Î¥°¥ë¡¼¥×¤ÎÃæ¤Î¤É¤Î¥Ü¥¿¥ó¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤¹ÊÑ¿ô¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹¡£¡Ö¥È¥é¥¤¥¹¥Æ¡¼¥È¡×¥Ü¥¿¥ó¤¬²¡¤µ¤ì¤¿¤È¤­¤Ë¤Ï¡¢¥é¥¸¥ª¥Ü¥¿¥ó¤Îɽ¼¨¤¬¥È¥é¥¤¥¹¥Æ¡¼¥È¥â¡¼¥É¤Ë¤Ê¤ê¤Þ¤¹¡£¤¤¤º¤ì¤«¤Î¥Ü¥¿¥ó¤òÁªÂò¤¹¤ì¤Ð¡¢¥Ü¥¿¥ó¤Î¾õÂ֤ϸµ¤Î¤è¤¦¤Ë¸Ä¡¹¤Î¥Ü¥¿¥ó¤Îon/off¾õÂÖ¤ò¼¨¤¹¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¸½ºß¤ÎÊÑ¿ô¤ÎÃͤò¸«¤ë¤Ë¤Ï¡ÖÊÑ¿ô»²¾È¡×¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£'
}
msg.grid(:row=>0, :column=>0, :columnspan=>3, :sticky=>'nsew')
@@ -42,16 +42,16 @@ TkFrame.new(base_frame) {|frame|
TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
TkGrid('x',
- TkButton.new(frame, :text=>'変数å‚ç…§',
+ TkButton.new(frame, :text=>'ÊÑ¿ô»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{
showVars(base_frame, ['size', size],
['color', color], ['compound', align])
}),
- TkButton.new(frame, :text=>'コードå‚ç…§',
+ TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'radio3'}),
- TkButton.new(frame, :text=>'é–‰ã˜ã‚‹',
+ TkButton.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $radio3_demo
@@ -65,17 +65,17 @@ TkFrame.new(base_frame) {|frame|
}
# frame
-f_left = TkLabelFrame.new(base_frame, 'text'=>'文字サイズ',
+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')
}
@@ -83,7 +83,7 @@ TkButton.new(base_frame, 'text'=>'トライステート',
# radiobutton
[10, 12, 14, 18, 24].each {|sz|
TkRadioButton.new(f_left) {
- text "ãƒã‚¤ãƒ³ãƒˆã‚µã‚¤ã‚º #{sz}"
+ text "¥Ý¥¤¥ó¥È¥µ¥¤¥º #{sz}"
variable size
relief 'flat'
value sz
@@ -103,8 +103,8 @@ 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))
diff --git a/ext/tk/sample/demos-jp/rmt b/ext/tk/sample/demos-jp/rmt
index dcfb328fc8..73f631180a 100644
--- a/ext/tk/sample/demos-jp/rmt
+++ b/ext/tk/sample/demos-jp/rmt
@@ -1,9 +1,9 @@
#!/usr/bin/env ruby
-# rmt --
-# This script implements a simple remote-control mechanism for
-# Tk applications. It allows you to select an application and
-# then type commands to that application.
+# rmt --
+# This script implements a simple remote-control mechanism for
+# Tk applications. It allows you to select an application and
+# then type commands to that application.
require 'tk'
@@ -17,41 +17,41 @@ class Rmt
root = TkWinfo.toplevel(parent)
root.minsize(1,1)
- # The instance variable below keeps track of the remote application
- # that we're sending to. If it's an empty string then we execute
- # the commands locally.
+ # The instance variable below keeps track of the remote application
+ # that we're sending to. If it's an empty string then we execute
+ # the commands locally.
@app = 'local'
@mode = 'Ruby'
- # The instance variable below keeps track of whether we're in the
- # middle of executing a command entered via the text.
+ # The instance variable below keeps track of whether we're in the
+ # middle of executing a command entered via the text.
@executing = 0
- # The instance variable below keeps track of the last command executed,
- # so it can be re-executed in response to !! commands.
+ # The instance variable below keeps track of the last command executed,
+ # so it can be re-executed in response to !! commands.
@lastCommand = ""
- # Create menu bar. Arrange to recreate all the information in the
- # applications sub-menu whenever it is cascaded to.
+ # Create menu bar. Arrange to recreate all the information in the
+ # applications sub-menu whenever it is cascaded to.
TkFrame.new(root, 'relief'=>'raised', 'bd'=>2) {|f|
pack('side'=>'top', 'fill'=>'x')
TkMenubutton.new(f, 'text'=>'File', 'underline'=>0) {|mb|
TkMenu.new(mb) {|mf|
mb.menu(mf)
- TkMenu.new(mf) {|ma|
+ TkMenu.new(mf) {|ma|
postcommand proc{win.fillAppsMenu ma}
- mf.add('cascade', 'label'=>'Select Application',
+ mf.add('cascade', 'label'=>'Select Application',
'menu'=>ma, 'underline'=>0)
}
- add('command', 'label'=>'Quit',
+ add('command', 'label'=>'Quit',
'command'=>proc{root.destroy}, 'underline'=>0)
}
pack('side'=>'left')
}
}
- # Create text window and scrollbar.
+ # Create text window and scrollbar.
@txt = TkText.new(root, 'relief'=>'sunken', 'bd'=>2, 'setgrid'=>true) {
yscrollbar(TkScrollbar.new(root){pack('side'=>'right', 'fill'=>'y')})
@@ -60,9 +60,9 @@ class Rmt
@promptEnd = TkTextMark.new(@txt, 'insert')
- # Create a binding to forward commands to the target application,
- # plus modify many of the built-in bindings so that only information
- # in the current command can be deleted (can still set the cursor
+ # Create a binding to forward commands to the target application,
+ # plus modify many of the built-in bindings so that only information
+ # in the current command can be deleted (can still set the cursor
# earlier in the text and select and insert; just can't delete).
@txt.bindtags([@txt, TkText, root, 'all'])
@@ -151,8 +151,8 @@ class Rmt
w.see('insert')
end
- # The method below is used to print out a prompt at the
- # insertion point (which should be at the beginning of a line
+ # The method below is used to print out a prompt at the
+ # insertion point (which should be at the beginning of a line
# right now).
def prompt
@@ -162,8 +162,8 @@ class Rmt
@txt.tag_add('bold', "#{@promptEnd.path} linestart", @promptEnd)
end
- # The method below executes a command (it takes everything on the
- # current line after the prompt and either sends it to the remote
+ # The method below executes a command (it takes everything on the
+ # current line after the prompt and either sends it to the remote
# application or executes it locally, depending on "app".
def invoke
@@ -200,8 +200,8 @@ class Rmt
if complete
@lastCommand = cmd
begin
-# msg = Tk.appsend(@app, false,
-# 'ruby',
+# msg = Tk.appsend(@app, false,
+# 'ruby',
# '"(' + cmd.gsub(/[][$"]/, '\\\\\&') + ').to_s"')
msg = Tk.rb_appsend(@app, false, cmd)
rescue
@@ -218,10 +218,10 @@ class Rmt
end
# The following method is invoked to change the application that
- # we're talking to. It also updates the prompt for the current
- # command, unless we're in the middle of executing a command from
- # the text item (in which case a new prompt is about to be output
- # so there's no need to change the old one).
+ # we're talking to. It also updates the prompt for the current
+ # command, unless we're in the middle of executing a command from
+ # the text item (in which case a new prompt is about to be output
+ # so there's no need to change the old one).
def newApp(appName, mode)
@app = appName
@@ -236,7 +236,7 @@ class Rmt
end
# The method below will fill in the applications sub-menu with a list
- # of all the applications that currently exist.
+ # of all the applications that currently exist.
def fillAppsMenu(menu)
win = self
@@ -251,14 +251,14 @@ class Rmt
else
mode = 'Ruby'
end
- menu.add('command', 'label'=>format("%s (#{mode}/Tk)", ip),
+ menu.add('command', 'label'=>format("%s (#{mode}/Tk)", ip),
'command'=>proc{win.newApp ip, mode})
rescue
- menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
+ menu.add('command', 'label'=>format("%s (unknown Tk)", ip),
'command'=>proc{win.newApp ip, mode}, 'state'=>'disabled')
end
}
- menu.add('command', 'label'=>format("local (Ruby/Tk)"),
+ menu.add('command', 'label'=>format("local (Ruby/Tk)"),
'command'=>proc{win.newApp 'local', 'Ruby'})
end
end
diff --git a/ext/tk/sample/demos-jp/rolodex b/ext/tk/sample/demos-jp/rolodex
index 2cc73e128f..9f87ae2829 100644
--- a/ext/tk/sample/demos-jp/rolodex
+++ b/ext/tk/sample/demos-jp/rolodex
@@ -2,7 +2,7 @@
#
# rolodex --
# This script is a part of Tom LaStrange's rolodex
-#
+#
# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
# Time-stamp: "03/08/02 12:45:21 nagai"
#
@@ -17,7 +17,7 @@ def show_help(topic,x=0,y=0)
topic = w
end
end
-
+
if( $helpTopics.include?(topic) )
msg = $helpTopics[topic]
else
@@ -81,7 +81,7 @@ class RolodexFrame < TkFrame
def initialize(parent=nil,keys=nil)
super(parent,keys)
self["relief"] = "flat"
-
+
@i = []
@label = []
@entry = []
diff --git a/ext/tk/sample/demos-jp/rolodex-j b/ext/tk/sample/demos-jp/rolodex-j
index f6e3afdacd..6c3ea7a484 100644
--- a/ext/tk/sample/demos-jp/rolodex-j
+++ b/ext/tk/sample/demos-jp/rolodex-j
@@ -1,15 +1,15 @@
#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# rolodex --
-# ã“ã®ã‚¹ã‚¯ãƒªãƒ—ト㯠Tom LaStrange ã® rolodex ã®ä¸€éƒ¨ã§ã™ã€‚
-#
+# ¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï Tom LaStrange ¤Î rolodex ¤Î°ìÉô¤Ç¤¹¡£
+#
# Copyright (C) 1998 by Takaaki Tateishi <ttate@jaist.ac.jp>
# Time-stamp: "04/04/09 00:32:12 nagai"
#
require "tk"
-Tk.encoding = "utf-8"
+Tk.encoding = "euc-jp"
def show_help(topic,x=0,y=0)
if( topic.is_a?(TkWindow) )
@@ -20,24 +20,24 @@ def show_help(topic,x=0,y=0)
end
end
end
-
+
if( $helpTopics.include?(topic) )
msg = $helpTopics[topic]
else
- msg = "ã“ã®ãƒˆãƒ”ックã«ã¤ã„ã¦ã®ãƒ˜ãƒ«ãƒ—ã¯ã¾ã ä½¿ç”¨ã§ãã¾ã›ã‚“"
+ msg = "¤³¤Î¥È¥Ô¥Ã¥¯¤Ë¤Ä¤¤¤Æ¤Î¥Ø¥ë¥×¤Ï¤Þ¤À»ÈÍѤǤ­¤Þ¤»¤ó"
end
TkDialog.new("title"=>"Rolodex Help",
- "message"=>"「#{topic}ã€\n\n#{msg}",
+ "message"=>"¡Ö#{topic}¡×\n\n#{msg}",
"default_button"=>0,
"buttons"=>["OK"])
end
def fillCard
clearAction
- $root.frame.entry[1].insert(0, "立石 å­å½°")
- $root.frame.entry[2].insert(0, "923-1292 石å·çœŒ")
- $root.frame.entry[3].insert(0, "è¾°å£ç”º æ—­å° 1-1")
- $root.frame.entry[4].insert(0, "北陸先端科学技術大学院大学")
+ $root.frame.entry[1].insert(0, "ΩÀÐ ¹§¾´")
+ $root.frame.entry[2].insert(0, "923-1292 ÀÐÀ")
+ $root.frame.entry[3].insert(0, "ä¸ýÄ® °°Âæ 1-1")
+ $root.frame.entry[4].insert(0, "ËÌΦÀèü²Ê³Øµ»½ÑÂç³Ø±¡Âç³Ø")
$root.frame.entry[5].insert(0,"private")
$root.frame.entry[6].insert(0,"***-***-****")
$root.frame.entry[7].insert(0,"***-***-****")
@@ -59,7 +59,7 @@ end
def fileAction
TkDialog.new("title"=>"File Selection",
- "message"=>"ã“れã¯ãƒ•ã‚¡ã‚¤ãƒ«é¸æŠžãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã®ãƒ€ãƒŸãƒ¼ã§ã™ã€‚\n",
+ "message"=>"¤³¤ì¤Ï¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°¤Î¥À¥ß¡¼¤Ç¤¹¡£\n",
"default_button"=>0,
"buttons"=>["OK"])
STDERR.print "dummy file name\n"
@@ -67,9 +67,9 @@ end
def deleteAction
result = TkDialog.new("title"=>"Confirm Action",
- "message"=>"よã‚ã—ã„ã§ã™ã‹ï¼Ÿ",
+ "message"=>"¤è¤í¤·¤¤¤Ç¤¹¤«¡©",
"default_button"=>0,
- "buttons"=>["キャンセル"])
+ "buttons"=>["¥­¥ã¥ó¥»¥ë"])
if( result.value == 0 )
clearAction
end
@@ -79,7 +79,7 @@ end
class RolodexFrame < TkFrame
attr_reader :entry, :label
- LABEL = ["","åå‰:","使‰€","","","電話(自宅):","電話(会社):","Fax:"]
+ LABEL = ["","̾Á°:","½»½ê","","","ÅÅÏÃ(¼«Âð):","ÅÅÏÃ(²ñ¼Ò):","Fax:"]
def initialize(parent=nil,keys=nil)
super(parent,keys)
@@ -109,10 +109,10 @@ class RolodexButtons < TkFrame
def initialize(parent,keys=nil)
super(parent,keys)
- @clear = TkButton.new(self,"text" => "クリアー")
- @add = TkButton.new(self, "text" => "追加")
- @search = TkButton.new(self, "text" => "検索")
- @delete = TkButton.new(self, "text" => "消去")
+ @clear = TkButton.new(self,"text" => "¥¯¥ê¥¢¡¼")
+ @add = TkButton.new(self, "text" => "ÄɲÃ")
+ @search = TkButton.new(self, "text" => "¸¡º÷")
+ @delete = TkButton.new(self, "text" => "¾Ãµî")
for w in [@clear,@add,@search,@delete]
w.pack("side"=>"left", "padx"=>2)
end
@@ -128,43 +128,43 @@ class RolodexMenuFrame < TkFrame
"borderwidth"=>1)
@file = TkMenubutton.new(self,
- "text"=> "ファイル",
+ "text"=> "¥Õ¥¡¥¤¥ë",
"underline"=>0)
@file_menu = TkMenu.new(@file)
@file_menu.add("command",
- "label" => "読ã¿è¾¼ã¿ ...",
+ "label" => "ÆÉ¤ß¹þ¤ß ...",
"command" => proc{fileAction},
"underline" => 0)
@file_menu.add("command",
- "label" => "終了",
+ "label" => "½ªÎ»",
"command" => proc{$root.destroy},
"underline" => 0)
@file.menu(@file_menu)
@file.pack("side"=>"left")
@help = TkMenubutton.new(self,
- "text"=> "ヘルプ",
+ "text"=> "¥Ø¥ë¥×",
"underline"=>0)
@help_menu = TkMenu.new(@help)
@help_menu.add("command",
- "label"=> "コンテキストã«ã¤ã„ã¦",
- "command"=>proc{show_help("コンテキスト")},
+ "label"=> "¥³¥ó¥Æ¥­¥¹¥È¤Ë¤Ä¤¤¤Æ",
+ "command"=>proc{show_help("¥³¥ó¥Æ¥­¥¹¥È")},
"underline"=>3)
@help_menu.add("command",
- "label"=> "ヘルプã«ã¤ã„ã¦",
- "command"=>proc{show_help("ヘルプ")},
+ "label"=> "¥Ø¥ë¥×¤Ë¤Ä¤¤¤Æ",
+ "command"=>proc{show_help("¥Ø¥ë¥×")},
"underline"=>3)
@help_menu.add("command",
- "label"=> "ウィンドウã«ã¤ã„ã¦",
- "command"=>proc{show_help("ウィンドウ")},
+ "label"=> "¥¦¥£¥ó¥É¥¦¤Ë¤Ä¤¤¤Æ",
+ "command"=>proc{show_help("¥¦¥£¥ó¥É¥¦")},
"underline"=>3)
@help_menu.add("command",
- "label"=> "キーæ“作ã«ã¤ã„ã¦",
- "command"=>proc{show_help("キーæ“作")},
+ "label"=> "¥­¡¼Áàºî¤Ë¤Ä¤¤¤Æ",
+ "command"=>proc{show_help("¥­¡¼Áàºî")},
"underline"=>3)
@help_menu.add("command",
- "label"=> "ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±",
- "command"=>proc{show_help("ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±")},
+ "label"=> "¥Ð¡¼¥¸¥ç¥ó¾ðÊó",
+ "command"=>proc{show_help("¥Ð¡¼¥¸¥ç¥ó¾ðÊó")},
"underline"=>3)
@help.menu(@help_menu)
@help.pack("side"=>"right")
@@ -198,16 +198,16 @@ $root.buttons.add.configure("command"=>proc{addAction})
$root.buttons.clear.configure("command"=>proc{clearAction})
$root.buttons.search.configure("command"=>proc{addAction; fillCard})
-$root.buttons.clear.configure("text"=> "クリアー Ctrl+C")
+$root.buttons.clear.configure("text"=> "¥¯¥ê¥¢¡¼ Ctrl+C")
$root.bind("Control-c",proc{clearAction})
-$root.buttons.add.configure("text"=> "追加 Ctrl+A")
+$root.buttons.add.configure("text"=> "Äɲà Ctrl+A")
$root.bind("Control-a",proc{addAction})
-$root.buttons.search.configure("text"=> "検索 Ctrl+S")
+$root.buttons.search.configure("text"=> "¸¡º÷ Ctrl+S")
$root.bind("Control-s",proc{addAction; fillCard})
-$root.buttons.delete.configure("text"=> "消去 Ctrl+D")
+$root.buttons.delete.configure("text"=> "¾Ãµî Ctrl+D")
$root.bind("Control-d",proc{deleteAction})
$root.menu.file_menu.entryconfigure(1, "accel"=>"Ctrl+F")
@@ -227,74 +227,74 @@ $root.bind("Any-Help",
$helpTopics = {}
$helpTopics[$root.menu.file] = <<EOF
-ã“れã¯ã€Œãƒ•ァイルã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã§ã™ã€‚「読ã¿è¾¼ã¿ã€ã‚„「終了ã€ãªã©ã‚’
-行ãªã†ã“ã¨ãŒã§ãã¾ã™ã€‚
+¤³¤ì¤Ï¡Ö¥Õ¥¡¥¤¥ë¡×¥á¥Ë¥å¡¼¤Ç¤¹¡£¡ÖÆÉ¤ß¹þ¤ß¡×¤ä¡Ö½ªÎ»¡×¤Ê¤É¤ò
+¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
EOF
$helpTopics[$root.menu.file_menu.index(0)] = <<EOF
-ファイルã®èª­ã¿è¾¼ã¿ã‚’行ãªã†ã¨ãã«ä½¿ã„ã¾ã™ã€‚
+¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤ò¹Ô¤Ê¤¦¤È¤­¤Ë»È¤¤¤Þ¤¹¡£
EOF
$helpTopics[$root.menu.file_menu.index(1)] = <<EOF
-アプリケーションを終了ã™ã‚‹ã¨ãã«ä½¿ã„ã¾ã™ã€‚
+¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»¤¹¤ë¤È¤­¤Ë»È¤¤¤Þ¤¹¡£
EOF
$helpTopics[$root.frame.entry[1]] = <<EOF
-åå‰ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚
+̾Á°¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£
EOF
$helpTopics[$root.frame.entry[2]] = <<EOF
-使‰€ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚
+½»½ê¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£
EOF
$helpTopics[$root.frame.entry[3]] = <<EOF
-使‰€ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚
+½»½ê¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£
EOF
$helpTopics[$root.frame.entry[4]] = <<EOF
-使‰€ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚
+½»½ê¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£
EOF
$helpTopics[$root.frame.entry[5]] = <<EOF
-自宅ã®é›»è©±ç•ªå·ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚公開\
-ã—ãŸããªã„ã¨ã㯠private ã¨è¨˜å…¥ã—ã¾ã™ã€‚
+¼«Âð¤ÎÅÅÏÃÈÖ¹æ¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£¸ø³«\
+¤·¤¿¤¯¤Ê¤¤¤È¤­¤Ï private ¤Èµ­Æþ¤·¤Þ¤¹¡£
EOF
$helpTopics[$root.frame.entry[6]] = <<EOF
-会社ã®é›»è©±ç•ªå·ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚
+²ñ¼Ò¤ÎÅÅÏÃÈÖ¹æ¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£
EOF
$helpTopics[$root.frame.entry[7]] = <<EOF
-FAX番å·ã‚’記入ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªã§ã™ã€‚
+FAXÈÖ¹æ¤òµ­Æþ¤¹¤ë¥¨¥ó¥È¥ê¤Ç¤¹¡£
EOF
-$helpTopics["コンテキスト"] = <<EOF
-Ruby/Tkã§ã¯grabã®æ©Ÿæ§‹ãŒãªã„ãŸã‚ã“ã®ã‚¢ãƒ—リケーションã§ã¯\
-コンテキストヘルプã¯ã‚µãƒãƒ¼ãƒˆã•れã¦ã„ã¾ã›ã‚“。
-ã—ã‹ã—åŒã˜ã‚ˆã†ãªåŠ¹æžœã‚’bindã¨ãƒžã‚¦ã‚¹ã®ä½ç½®ã®Wedgetを知る\
-ã“ã¨ã§å¾—ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+$helpTopics["¥³¥ó¥Æ¥­¥¹¥È"] = <<EOF
+Ruby/Tk¤Ç¤Ïgrab¤Îµ¡¹½¤¬¤Ê¤¤¤¿¤á¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï\
+¥³¥ó¥Æ¥­¥¹¥È¥Ø¥ë¥×¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
+¤·¤«¤·Æ±¤¸¤è¤¦¤Ê¸ú²Ì¤òbind¤È¥Þ¥¦¥¹¤Î°ÌÃÖ¤ÎWedget¤òÃΤë\
+¤³¤È¤ÇÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
EOF
-$helpTopics["ヘルプ"] = <<EOF
-マウスをウィンドウã«ã‚ã‚ã›ã¦F1キーを押ã™ã“ã¨ã«ã‚ˆã£ã¦\
-ãã®ãƒ˜ãƒ«ãƒ—を見るã“ã¨ãŒã§ãã¾ã™ã€‚
+$helpTopics["¥Ø¥ë¥×"] = <<EOF
+¥Þ¥¦¥¹¤ò¥¦¥£¥ó¥É¥¦¤Ë¤¢¤ï¤»¤ÆF1¥­¡¼¤ò²¡¤¹¤³¤È¤Ë¤è¤Ã¤Æ\
+¤½¤Î¥Ø¥ë¥×¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
EOF
-$helpTopics["ウィンドウ"] = <<EOF
-ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯ãƒ€ãƒŸãƒ¼ã§ã™ã€‚
+$helpTopics["¥¦¥£¥ó¥É¥¦"] = <<EOF
+¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï¥À¥ß¡¼¤Ç¤¹¡£
EOF
-$helpTopics["キーæ“作"] = <<EOF
-Ctrl+A: 追加
-Ctrl+C: クリアー
-Ctrl+D: 消去
-Ctrl+F: ãƒ•ã‚¡ã‚¤ãƒ«é¸æŠž
-Ctrl+Q: 終了
-Ctrl+S: 検索
+$helpTopics["¥­¡¼Áàºî"] = <<EOF
+Ctrl+A: ÄɲÃ
+Ctrl+C: ¥¯¥ê¥¢¡¼
+Ctrl+D: ¾Ãµî
+Ctrl+F: ¥Õ¥¡¥¤¥ëÁªÂò
+Ctrl+Q: ½ªÎ»
+Ctrl+S: ¸¡º÷
EOF
-$helpTopics["ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±"] = <<EOF
-ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯ 1.0.1j ã§ã™ã€‚
+$helpTopics["¥Ð¡¼¥¸¥ç¥ó¾ðÊó"] = <<EOF
+¥Ð¡¼¥¸¥ç¥ó¤Ï 1.0.1j ¤Ç¤¹¡£
EOF
Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/ruler.rb b/ext/tk/sample/demos-jp/ruler.rb
index 5c34a5a5da..a721b95a6a 100644
--- a/ext/tk/sample/demos-jp/ruler.rb
+++ b/ext/tk/sample/demos-jp/ruler.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ruler widget demo (called by 'widget')
#
@@ -16,13 +16,13 @@ def rulerMkTab(c,x,y)
TkcPolygon.new(c, x, y, x+v.size, y+v.size, x-v.size, y+v.size)
end
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($ruler_demo) && $ruler_demo
$ruler_demo.destroy
$ruler_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$ruler_demo = TkToplevel.new {|w|
title("Ruler Demonstration")
iconname("ruler")
@@ -31,17 +31,17 @@ $ruler_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($ruler_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
TkLabel.new(base_frame, 'font'=>$font, 'wraplength'=>'5i', 'justify'=>'left',
- 'text'=>"ã“ã®ã‚­ãƒ£ãƒ³ãƒã‚¹widgetã¯ãƒ«ãƒ¼ãƒ©ãƒ¼ã®æ¨¡åž‹ã§ã™ã€‚ルーラーã®å³ã«ã‚ã‚‹ã®ã¯ã‚¿ãƒ–ストップã®äº•戸ã§ã€ã“ã“ã‹ã‚‰å¼•ã£å¼µã£ã¦ãã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã‚¿ãƒ–ストップを作るã“ã¨ãŒã§ãã¾ã™ã€‚ã¾ãŸã€ã™ã§ã«ã‚るタブストップを動ã‹ã™ã“ã¨ã‚‚ã§ãã¾ã™ã€‚タブストップを上方ã¾ãŸã¯ä¸‹æ–¹ã«ã‹ã™ã‚Œã¦è¡¨ç¤ºã•れるã¾ã§ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨ã€ãƒžã‚¦ã‚¹ãƒœã‚¿ãƒ³ã‚’離ã—ãŸæ™‚ã«ãã®ã‚¿ãƒ–ã‚¹ãƒˆãƒƒãƒ—ã¯æ¶ˆãˆã¾ã™ã€‚"){
+ 'text'=>"¤³¤Î¥­¥ã¥ó¥Ð¥¹widget¤Ï¥ë¡¼¥é¡¼¤ÎÌÏ·¿¤Ç¤¹¡£¥ë¡¼¥é¡¼¤Î±¦¤Ë¤¢¤ë¤Î¤Ï¥¿¥Ö¥¹¥È¥Ã¥×¤Î°æ¸Í¤Ç¡¢¤³¤³¤«¤é°ú¤ÃÄ¥¤Ã¤Æ¤¯¤ë¤³¤È¤Ë¤è¤Ã¤Æ¥¿¥Ö¥¹¥È¥Ã¥×¤òºî¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢¤¹¤Ç¤Ë¤¢¤ë¥¿¥Ö¥¹¥È¥Ã¥×¤òư¤«¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥¿¥Ö¥¹¥È¥Ã¥×¤ò¾åÊý¤Þ¤¿¤Ï²¼Êý¤Ë¤«¤¹¤ì¤ÆÉ½¼¨¤µ¤ì¤ë¤Þ¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¥Þ¥¦¥¹¥Ü¥¿¥ó¤òÎ¥¤·¤¿»þ¤Ë¤½¤Î¥¿¥Ö¥¹¥È¥Ã¥×¤Ï¾Ã¤¨¤Þ¤¹¡£"){
pack('side'=>'top')
}
-# frame 生æˆ
+# frame À¸À®
$ruler_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $ruler_demo
$ruler_demo = nil
@@ -50,17 +50,17 @@ $ruler_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'ruler'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$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,
diff --git a/ext/tk/sample/demos-jp/sayings.rb b/ext/tk/sample/demos-jp/sayings.rb
index cf4fe7b1b1..b3bdbe0bc5 100644
--- a/ext/tk/sample/demos-jp/sayings.rb
+++ b/ext/tk/sample/demos-jp/sayings.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# listbox widget demo 'sayings' (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($sayings_demo) && $sayings_demo
$sayings_demo.destroy
$sayings_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$sayings_demo = TkToplevel.new {|w|
title("Listbox Demonstration (well-known sayings)")
iconname("sayings")
@@ -18,20 +18,20 @@ $sayings_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($sayings_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "下ã®ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã«ã¯ã„ã‚ã„ã‚ãªæ ¼è¨€ãŒå…¥ã£ã¦ã„ã¾ã™ã€‚リストをスクロールã•ã›ã‚‹ã®ã¯ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ã§ã‚‚ã§ãã¾ã™ã—ã€ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã®ä¸­ã§ãƒžã‚¦ã‚¹ã®ãƒœã‚¿ãƒ³2(中ボタン)を押ã—ãŸã¾ã¾ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã‚‚ã§ãã¾ã™ã€‚"
+ text "²¼¤Î¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤Ë¤Ï¤¤¤í¤¤¤í¤Ê³Ê¸À¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹¡£¥ê¥¹¥È¤ò¥¹¥¯¥í¡¼¥ë¤µ¤»¤ë¤Î¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ç¤â¤Ç¤­¤Þ¤¹¤·¡¢¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤ÎÃæ¤Ç¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2(Ãæ¥Ü¥¿¥ó)¤ò²¡¤·¤¿¤Þ¤Þ¥É¥é¥Ã¥°¤·¤Æ¤â¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $sayings_demo
$sayings_demo = nil
@@ -40,13 +40,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'sayings'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
sayings_lbox = nil
TkFrame.new(base_frame, 'borderwidth'=>10) {|w|
sv = TkScrollbar.new(w)
diff --git a/ext/tk/sample/demos-jp/search.rb b/ext/tk/sample/demos-jp/search.rb
index 238450ae30..293ae83910 100644
--- a/ext/tk/sample/demos-jp/search.rb
+++ b/ext/tk/sample/demos-jp/search.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# Text Search widget demo (called by 'widget')
#
@@ -62,13 +62,13 @@ def textToggle(cmd1,sleep1,cmd2,sleep2)
-1, cmd1, cmd2).start(sleep1)
end
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($search_demo) && $search_demo
$search_demo.destroy
$search_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$search_demo = TkToplevel.new {|w|
title("Text Demonstration - Search and Highlight")
iconname("search")
@@ -77,11 +77,11 @@ $search_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($search_demo).pack(:fill=>:both, :expand=>true)
-# frame 生æˆ
+# frame À¸À®
$search_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $search_demo
$search_demo = nil
@@ -90,15 +90,15 @@ $search_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'search'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$search_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# 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,
@@ -108,14 +108,14 @@ TkFrame.new(base_frame) {|f|
$search_string_entry.focus})
focus
}
- TkButton.new(f, '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,
@@ -124,7 +124,7 @@ TkFrame.new(base_frame) {|f|
bind('Return', proc{textSearch($search_text, $search_searchString.value,
$search_Tag)})
}
- TkButton.new(f, 'text'=>'å転',
+ TkButton.new(f, 'text'=>'ȿž',
'command'=>proc{textSearch($search_text,
$search_searchString.value,
$search_Tag)}) {
@@ -165,15 +165,15 @@ else
200 )
end
$search_text.insert('1.0', "\
-ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯æ¤œç´¢æ©Ÿæ§‹ã‚’実ç¾ã™ã‚‹ã®ã«ãƒ†ã‚­ã‚¹ãƒˆ widget ã®ã‚¿ã‚°æ©Ÿèƒ½ãŒã©ã® \
-よã†ã«ä½¿ã‚れるã®ã‹ã‚’デモã™ã‚‹ã‚‚ã®ã§ã™ã€‚ã¾ãšä¸Šã®ã‚¨ãƒ³ãƒˆãƒªã«ãƒ•ァイルåã‚’å…¥ \
-れã€<リターン> を押ã™ã‹ã€Œãƒ­ãƒ¼ãƒ‰ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ãã ã•ã„。次ã«ãã®ä¸‹ã® \
-ã‚¨ãƒ³ãƒˆãƒªã«æ–‡å­—列を入力ã—ã€<リターン> を押ã™ã‹ã€Œå転ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã \
-ã ã•ã„。ã™ã‚‹ã¨ãƒ•ァイル中ã®ã€æ¤œç´¢æ–‡å­—列ã¨ä¸€è‡´ã™ã‚‹éƒ¨åˆ†ã«å…¨ã¦ \"search_Tag\" \
-ã¨ã„ã†ã‚¿ã‚°ãŒã¤ã‘られã€ã‚¿ã‚°ã®è¡¨ç¤ºå±žæ€§ã¨ã—ã¦ãã®æ–‡å­—列ãŒç‚¹æ»…ã™ã‚‹ã‚ˆã†ã« \
-設定ã•れã¾ã™ã€‚\n")
+¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï¸¡º÷µ¡¹½¤ò¼Â¸½¤¹¤ë¤Î¤Ë¥Æ¥­¥¹¥È widget ¤Î¥¿¥°µ¡Ç½¤¬¤É¤Î \
+¤è¤¦¤Ë»È¤ï¤ì¤ë¤Î¤«¤ò¥Ç¥â¤¹¤ë¤â¤Î¤Ç¤¹¡£¤Þ¤º¾å¤Î¥¨¥ó¥È¥ê¤Ë¥Õ¥¡¥¤¥ë̾¤òÆþ \
+¤ì¡¢<¥ê¥¿¡¼¥ó> ¤ò²¡¤¹¤«¡Ö¥í¡¼¥É¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£¼¡¤Ë¤½¤Î²¼¤Î \
+¥¨¥ó¥È¥ê¤Ëʸ»úÎó¤òÆþÎϤ·¡¢<¥ê¥¿¡¼¥ó> ¤ò²¡¤¹¤«¡Öȿž¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯ \
+¤À¤µ¤¤¡£¤¹¤ë¤È¥Õ¥¡¥¤¥ëÃæ¤Î¡¢¸¡º÷ʸ»úÎó¤È°ìÃפ¹¤ëÉôʬ¤ËÁ´¤Æ \"search_Tag\" \
+¤È¤¤¤¦¥¿¥°¤¬¤Ä¤±¤é¤ì¡¢¥¿¥°¤Îɽ¼¨Â°À­¤È¤·¤Æ¤½¤Îʸ»úÎó¤¬ÅÀÌǤ¹¤ë¤è¤¦¤Ë \
+ÀßÄꤵ¤ì¤Þ¤¹¡£\n")
$search_text.insert('end', "\
-ファイル読ã¿è¾¼ã¿ã®ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯ \"#{Dir.pwd}\" ã§ã™ã€‚\
+¥Õ¥¡¥¤¥ëÆÉ¤ß¹þ¤ß¤Î¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï \"#{Dir.pwd}\" ¤Ç¤¹¡£\
")
$search_text.set_insert '0.0'
diff --git a/ext/tk/sample/demos-jp/spin.rb b/ext/tk/sample/demos-jp/spin.rb
index fd51a3f457..2bcc3217e6 100644
--- a/ext/tk/sample/demos-jp/spin.rb
+++ b/ext/tk/sample/demos-jp/spin.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# spin.rb --
#
@@ -22,35 +22,35 @@ base_frame = TkFrame.new($spin_demo).pack(:fill=>:both, :expand=>true)
TkLabel.new(base_frame,
:font=>$font, :wraplength=>'5i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-下ã«ã¯ï¼“種類ã®ã‚¹ãƒ”ンボックスãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚
-ãれãžã‚Œã€ãƒžã‚¦ã‚¹ã§é¸æŠžã—ã¦æ–‡å­—を入力ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-編集æ“作ã¨ã—ã¦ã¯ã€Emacs å½¢å¼ã®å¤šãã«åŠ ãˆã¦ã€ä¸€èˆ¬çš„ãª
-Motif å½¢å¼ã®ã‚­ãƒ¼æ“作ãŒã‚µãƒãƒ¼ãƒˆã•れã¦ã„ã¾ã™ã€‚ãŸã¨ãˆã°ã€
-Backspace 㨠Control-h ã¨ã¯å…¥åŠ›ã‚«ãƒ¼ã‚½ãƒ«ã®å·¦å´ã®æ–‡å­—ã‚’
-削除ã—ã€Delete 㨠Control-d ã¨ã¯å³å´ã®æ–‡å­—を削除ã—ã¾ã™ã€‚
-入力枠ã®é•·ã•ã‚’è¶Šãˆã‚‹ã‚ˆã†ãªé•·ã„文字列を入力ã—ãŸå ´åˆã«ã¯ã€
-マウスã®ãƒœã‚¿ãƒ³ï¼’を押ã—ã¦ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã§ã€å…¥åŠ›æ–‡å­—åˆ—
-をスキャンã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚
-ãªãŠã€æœ€åˆã®ã‚¹ãƒ”ンボックスã¯ã€æ•´æ•°å€¤ã¨ã¿ãªã•れるよã†ãª
-文字列ã—ã‹å…¥åŠ›ãŒè¨±ã•れãªã„ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。ã¾ãŸã€
-3番目ã®ã‚¹ãƒ”ンボックスã§é¸æŠžå€™è£œã«ç¾ã‚Œã‚‹ã®ã¯ã‚ªãƒ¼ã‚¹ãƒˆãƒ©
-リアã®éƒ½å¸‚åã®ãƒªã‚¹ãƒˆã¨ãªã£ã¦ã„ã¾ã™ã€‚
-ã‚‚ã—ã‚ãªãŸãŒä½¿ã£ã¦ã„ã‚‹ Ruby ã«ãƒªãƒ³ã‚¯ã•れã¦ã„ã‚‹ Tk ライ
-ブラリ㌠spinbox ウィジェットを実装ã—ã¦ã„ãªã„å ´åˆã€ã“ã®
-デモã¯ã†ã¾ãå‹•ã‹ãªã„ã¯ãšã§ã™ã€‚ãã®å ´åˆã«ã¯ spinbox ウィ
-ジェットãŒå®Ÿè£…ã•れã¦ã„るよã†ãªã‚ˆã‚Šæ–°ã—ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Tk
-を組ã¿åˆã‚ã›ã¦è©¦ã™ã‚ˆã†ã«ã—ã¦ãã ã•ã„。
+²¼¤Ë¤Ï£³¼ïÎà¤Î¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+¤½¤ì¤¾¤ì¡¢¥Þ¥¦¥¹¤ÇÁªÂò¤·¤ÆÊ¸»ú¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+ÊÔ½¸Áàºî¤È¤·¤Æ¤Ï¡¢Emacs ·Á¼°¤Î¿¤¯¤Ë²Ã¤¨¤Æ¡¢°ìÈÌŪ¤Ê
+Motif ·Á¼°¤Î¥­¡¼Áàºî¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+Backspace ¤È Control-h ¤È¤ÏÆþÎÏ¥«¡¼¥½¥ë¤Îº¸Â¦¤Îʸ»ú¤ò
+ºï½ü¤·¡¢Delete ¤È Control-d ¤È¤Ï±¦Â¦¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£
+ÆþÎÏÏȤÎŤµ¤ò±Û¤¨¤ë¤è¤¦¤ÊŤ¤Ê¸»úÎó¤òÆþÎϤ·¤¿¾ì¹ç¤Ë¤Ï¡¢
+¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó£²¤ò²¡¤·¤Æ¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¢ÆþÎÏʸ»úÎó
+¤ò¥¹¥­¥ã¥ó¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£
+¤Ê¤ª¡¢ºÇ½é¤Î¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹¤Ï¡¢À°¿ôÃͤȤߤʤµ¤ì¤ë¤è¤¦¤Ê
+ʸ»úÎó¤·¤«ÆþÎϤ¬µö¤µ¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢
+£³ÈÖÌܤΥ¹¥Ô¥ó¥Ü¥Ã¥¯¥¹¤ÇÁªÂò¸õÊä¤Ë¸½¤ì¤ë¤Î¤Ï¥ª¡¼¥¹¥È¥é
+¥ê¥¢¤ÎÅÔ»Ô̾¤Î¥ê¥¹¥È¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+¤â¤·¤¢¤Ê¤¿¤¬»È¤Ã¤Æ¤¤¤ë Ruby ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë Tk ¥é¥¤
+¥Ö¥é¥ê¤¬ spinbox ¥¦¥£¥¸¥§¥Ã¥È¤ò¼ÂÁõ¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¤³¤Î
+¥Ç¥â¤Ï¤¦¤Þ¤¯Æ°¤«¤Ê¤¤¤Ï¤º¤Ç¤¹¡£¤½¤Î¾ì¹ç¤Ë¤Ï spinbox ¥¦¥£
+¥¸¥§¥Ã¥È¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Tk
+¤òÁȤ߹ç¤ï¤»¤Æ»î¤¹¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
EOL
TkFrame.new(base_frame){|f|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$spin_demo.destroy
$spin_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'spin'
}).pack(:side=>:left, :expand=>true)
}
diff --git a/ext/tk/sample/demos-jp/square b/ext/tk/sample/demos-jp/square
index bb66282154..00bfde59ff 100644
--- a/ext/tk/sample/demos-jp/square
+++ b/ext/tk/sample/demos-jp/square
@@ -1,10 +1,10 @@
#!/usr/bin/env ruby
# square --
-# This script generates a demo application containing only
-# a "square" widget. It's only usable if Tk has been compiled
-# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
-# This demo arranges the following bindings for the widget:
+# This script generates a demo application containing only
+# a "square" widget. It's only usable if Tk has been compiled
+# with tkSquare.c and with the -DSQUARE_DEMO compiler switch.
+# This demo arranges the following bindings for the widget:
#
# Button-1 press/drag: moves square to mouse
# "a": toggle size animation on/off
@@ -19,7 +19,7 @@ class TkSquare<TkWindow
tk_call 'square', path
rescue
STDERR.print "\nSorry. Your Tk interpreter does not contain " +
- 'a "square" demonstration widget.' +
+ 'a "square" demonstration widget.' +
"\n ( See documents included the Tcl/Tk source archive. )\n\n"
exit
end
@@ -53,7 +53,7 @@ def center(x,y)
end
# The procedures below provide a simple form of animation where
-# the box changes size in a pulsing pattern: larger, smaller, larger,
+# the box changes size in a pulsing pattern: larger, smaller, larger,
# and so on.
$inc = 0
diff --git a/ext/tk/sample/demos-jp/states.rb b/ext/tk/sample/demos-jp/states.rb
index 2966e6d834..f354d28d84 100644
--- a/ext/tk/sample/demos-jp/states.rb
+++ b/ext/tk/sample/demos-jp/states.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# listbox widget demo 'states' (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($states_demo) && $states_demo
$states_demo.destroy
$states_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$states_demo = TkToplevel.new {|w|
title("Listbox Demonstration (states)")
iconname("states")
@@ -18,20 +18,20 @@ $states_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($states_demo).pack(:fill=>:both, :expand=>true)
-# label 生æˆ
+# label À¸À®
msg = TkLabel.new(base_frame) {
font $font
wraplength '4i'
justify 'left'
- text "下ã«ã‚ã‚‹ã®ã¯éƒ½é“府県åãŒå…¥ã£ãŸã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ä»˜ã®ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã§ã™ã€‚リストをスクロールã•ã›ã‚‹ã®ã¯ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ã§ã‚‚ã§ãã¾ã™ã—ã€ãƒªã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã®ä¸­ã§ãƒžã‚¦ã‚¹ã®ãƒœã‚¿ãƒ³2(中ボタン)を押ã—ãŸã¾ã¾ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ã‚‚ã§ãã¾ã™ã€‚"
+ text "²¼¤Ë¤¢¤ë¤Î¤ÏÅÔÆ»Éܸ©Ì¾¤¬Æþ¤Ã¤¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼ÉդΥꥹ¥È¥Ü¥Ã¥¯¥¹¤Ç¤¹¡£¥ê¥¹¥È¤ò¥¹¥¯¥í¡¼¥ë¤µ¤»¤ë¤Î¤Ï¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ç¤â¤Ç¤­¤Þ¤¹¤·¡¢¥ê¥¹¥È¥Ü¥Ã¥¯¥¹¤ÎÃæ¤Ç¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó2(Ãæ¥Ü¥¿¥ó)¤ò²¡¤·¤¿¤Þ¤Þ¥É¥é¥Ã¥°¤·¤Æ¤â¤Ç¤­¤Þ¤¹¡£"
}
msg.pack('side'=>'top')
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $states_demo
$states_demo = nil
@@ -40,13 +40,13 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'states'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
states_lbox = nil
TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
s = TkScrollbar.new(w)
@@ -61,13 +61,13 @@ TkFrame.new(base_frame, 'borderwidth'=>'.5c') {|w|
}.pack('side'=>'top', 'expand'=>'yes', 'fill'=>'y')
ins_data = [
- '愛知','é’æ£®','ç§‹ç”°','石å·','茨城','岩手','愛媛',
- '大分','大阪','岡山','沖縄','香å·','鹿å…å³¶','神奈å·',
- 'å²é˜œ','京都','熊本','群馬','高知','埼玉','ä½è³€',
- '滋賀','é™å²¡','å³¶æ ¹','åƒè‘‰','æ±äº¬','徳島','栃木',
- 'é³¥å–','富山','é•·å´Ž','長野','奈良','新潟','兵庫',
- '広島','ç¦äº•','ç¦å²¡','ç¦å³¶','北海é“','三é‡','宮城',
- '宮崎','山形','å±±å£','山梨','和歌山'
+ '°¦ÃÎ','ÀÄ¿¹','½©ÅÄ','ÀÐÀî','°ñ¾ë','´ä¼ê','°¦É²',
+ 'Âçʬ','Âçºå','²¬»³','²­Æì','¹áÀî','¼¯»ùÅç','¿ÀÆàÀî',
+ '´ôÉì','µþÅÔ','·§ËÜ','·²ÇÏ','¹âÃÎ','ºë¶Ì','º´²ì',
+ '¼¢²ì','ÀŲ¬','Å纬','ÀéÍÕ','Åìµþ','ÆÁÅç','ÆÊÌÚ',
+ 'Ä»¼è','ÉÙ»³','Ĺºê','ĹÌî','ÆàÎÉ','¿·³ã','ʼ¸Ë',
+ '¹­Åç','Ê¡°æ','Ê¡²¬','Ê¡Åç','Ë̳¤Æ»','»°½Å','µÜ¾ë',
+ 'µÜºê','»³·Á','»³¸ý','»³Íü','ϲλ³'
]
states_lbox.insert(0, *ins_data)
diff --git a/ext/tk/sample/demos-jp/style.rb b/ext/tk/sample/demos-jp/style.rb
index 813fde7a78..3189e1f6d8 100644
--- a/ext/tk/sample/demos-jp/style.rb
+++ b/ext/tk/sample/demos-jp/style.rb
@@ -1,16 +1,16 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# text (display styles) widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($style_demo) && $style_demo
$style_demo.destroy
$style_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$style_demo = TkToplevel.new {|w|
title("Text Demonstration - Display Styles")
iconname("style")
@@ -19,11 +19,11 @@ $style_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($style_demo).pack(:fill=>:both, :expand=>true)
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $style_demo
$style_demo = nil
@@ -32,15 +32,15 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'style'}
}.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.*/
@@ -89,7 +89,7 @@ txt = TkText.new(base_frame){|t|
# 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')
@@ -106,7 +106,7 @@ txt = TkText.new(base_frame){|t|
'relief'=>'sunken', 'borderwidth'=>1)
end
- # テキストタグ設定 (ãã®ä»–)
+ # ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê (¤½¤Î¾)
if $tk_version =~ /^4\.[01]/
style_tag_bgstipple = TkTextTag.new(t, 'background'=>'black',
'borderwidth'=>0,
@@ -134,134 +134,134 @@ txt = TkText.new(base_frame){|t|
'lmargin1'=>'12m', 'lmargin2'=>'6m',
'rmargin'=>'10m')
- # テキスト挿入
- insert('end', 'ã“ã®ã‚ˆã†ã«ãƒ†ã‚­ã‚¹ãƒˆ widget ã¯æƒ…報を様々ãªã‚¹ã‚¿ã‚¤ãƒ«ã§è¡¨ç¤ºã™ã‚‹ã“ã¨
-ãŒã§ãã¾ã™ã€‚')
- insert('end', 'ã‚¿ã‚°', style_tag_big)
- insert('end', 'ã¨ã„ã†ãƒ¡ã‚«ãƒ‹ã‚ºãƒ ã§ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã•れã¾ã™ã€‚
-ã‚¿ã‚°ã¨ã¯ãƒ†ã‚­ã‚¹ãƒˆ widget 内ã®ã‚る文字 (ã®ç¯„囲)ã«å¯¾ã—ã¦é©ç”¨ã§ãã‚‹
-å˜ãªã‚‹åå‰ã®ã“ã¨ã§ã™ã€‚ã‚¿ã‚°ã¯æ§˜ã€…ãªè¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«ã«è¨­å®šã§ãã¾ã™ã€‚
-設定ã™ã‚‹ã¨ã€ãã®ã‚¿ã‚°ã®ã¤ã„ãŸæ–‡å­—ã¯æŒ‡å®šã—ãŸã‚¹ã‚¿ã‚¤ãƒ«ã§è¡¨ç¤ºã•れる
-よã†ã«ãªã‚Šã¾ã™ã€‚使用ã§ãã‚‹è¡¨ç¤ºã‚¹ã‚¿ã‚¤ãƒ«ã¯æ¬¡ã®é€šã‚Šã§ã™ã€‚
+ # ¥Æ¥­¥¹¥ÈÁÞÆþ
+ insert('end', '¤³¤Î¤è¤¦¤Ë¥Æ¥­¥¹¥È widget ¤Ï¾ðÊó¤òÍÍ¡¹¤Ê¥¹¥¿¥¤¥ë¤Çɽ¼¨¤¹¤ë¤³¤È
+¤¬¤Ç¤­¤Þ¤¹¡£')
+ insert('end', '¥¿¥°', style_tag_big)
+ insert('end', '¤È¤¤¤¦¥á¥«¥Ë¥º¥à¤Ç¥³¥ó¥È¥í¡¼¥ë¤µ¤ì¤Þ¤¹¡£
+¥¿¥°¤È¤Ï¥Æ¥­¥¹¥È widget Æâ¤Î¤¢¤ëʸ»ú (¤ÎÈϰÏ)¤ËÂФ·¤ÆÅ¬ÍѤǤ­¤ë
+ñ¤Ê¤ë̾Á°¤Î¤³¤È¤Ç¤¹¡£¥¿¥°¤ÏÍÍ¡¹¤Êɽ¼¨¥¹¥¿¥¤¥ë¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£
+ÀßÄꤹ¤ë¤È¡¢¤½¤Î¥¿¥°¤Î¤Ä¤¤¤¿Ê¸»ú¤Ï»ØÄꤷ¤¿¥¹¥¿¥¤¥ë¤Çɽ¼¨¤µ¤ì¤ë
+¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£»ÈÍѤǤ­¤ëɽ¼¨¥¹¥¿¥¤¥ë¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£
')
insert('end', '
-1. フォント', style_tag_big)
- insert('end', ' ã©ã‚“㪠X ã®ãƒ•ォントã§ã‚‚使ãˆã¾ã™ã€‚')
+1. ¥Õ¥©¥ó¥È', style_tag_big)
+ insert('end', ' ¤É¤ó¤Ê X ¤Î¥Õ¥©¥ó¥È¤Ç¤â»È¤¨¤Þ¤¹¡£')
insert('end', 'large', style_tag_verybig)
insert('end', '
-ã¨ã‹')
-# insert('end', 'å°ã•ã„', style_tag_small)
+¤È¤«')
+# insert('end', '¾®¤µ¤¤', style_tag_small)
insert('end', 'small', style_tag_small)
- insert('end', 'ã¨ã‹ã€‚
+ insert('end', '¤È¤«¡£
')
insert('end', '
-2. 色', style_tag_big)
+2. ¿§', style_tag_big)
insert('end', ' ')
- insert('end', '背景色', style_tag_color1)
- insert('end', 'ã‚‚')
- insert('end', '剿™¯è‰²', style_tag_color2)
- insert('end', 'ã‚‚')
- insert('end', '両方', style_tag_color1, style_tag_color2)
- insert('end', 'ã¨ã‚‚変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ insert('end', 'ÇØ·Ê¿§', style_tag_color1)
+ insert('end', '¤â')
+ insert('end', 'Á°·Ê¿§', style_tag_color2)
+ insert('end', '¤â')
+ insert('end', 'ξÊý', style_tag_color1, style_tag_color2)
+ insert('end', '¤È¤âÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
')
insert('end', '
-3. ç¶²ã‹ã‘', style_tag_big)
- insert('end', ' ã“ã®ã‚ˆã†ã«æç”»ã®éš›ã«')
- insert('end', '背景も', style_tag_bgstipple)
- insert('end', '文字も', style_tag_fgstipple)
- insert('end', 'å˜ãªã‚‹å¡—りã¤ã¶ã—
-ã§ãªãã€ç¶²ã‹ã‘を使ã†ã“ã¨ãŒã§ãã¾ã™ã€‚
+3. ÌÖ¤«¤±', style_tag_big)
+ insert('end', ' ¤³¤Î¤è¤¦¤ËÉÁ²è¤ÎºÝ¤Ë')
+ insert('end', 'ÇØ·Ê¤â', style_tag_bgstipple)
+ insert('end', 'ʸ»ú¤â', style_tag_fgstipple)
+ insert('end', 'ñ¤Ê¤ëÅɤê¤Ä¤Ö¤·
+¤Ç¤Ê¤¯¡¢ÌÖ¤«¤±¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
')
insert('end', '
-4. 下線', style_tag_big)
- insert('end', ' ã“ã®ã‚ˆã†ã«')
- insert('end', '文字ã«ä¸‹ç·šã‚’引ã', style_tag_underline)
- insert('end', 'ã“ã¨ãŒã§ãã¾ã™ã€‚
+4. ²¼Àþ', style_tag_big)
+ insert('end', ' ¤³¤Î¤è¤¦¤Ë')
+ insert('end', 'ʸ»ú¤Ë²¼Àþ¤ò°ú¤¯', style_tag_underline)
+ insert('end', '¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
')
insert('end', '
-5. æ‰“ã¡æ¶ˆã—ç·š', style_tag_big)
- insert('end', ' ã“ã®ã‚ˆã†ã«')
- insert('end', '文字ã«é‡ã­ã¦ç·šã‚’引ã', style_tag_overstrike)
- insert('end', 'ã“ã¨ãŒã§ãã¾ã™ã€‚
+5. ÂǤÁ¾Ã¤·Àþ', style_tag_big)
+ insert('end', ' ¤³¤Î¤è¤¦¤Ë')
+ insert('end', 'ʸ»ú¤Ë½Å¤Í¤ÆÀþ¤ò°ú¤¯', style_tag_overstrike)
+ insert('end', '¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
')
insert('end', '
-6. 3D 効果', style_tag_big)
- insert('end', ' èƒŒæ™¯ã«æž ã‚’ã¤ã‘ã¦ã€æ–‡å­—ã‚’')
- insert('end', '飛ã³å‡ºã™', style_tag_raised)
- insert('end', 'よã†ã«ã—ãŸã‚Š')
- insert('end', '沈む', style_tag_sunken)
+6. 3D ¸ú²Ì', style_tag_big)
+ insert('end', ' ÇØ·Ê¤ËÏȤò¤Ä¤±¤Æ¡¢Ê¸»ú¤ò')
+ insert('end', 'Èô¤Ó½Ð¤¹', style_tag_raised)
+ insert('end', '¤è¤¦¤Ë¤·¤¿¤ê')
+ insert('end', 'ÄÀ¤à', style_tag_sunken)
insert('end', '
-よã†ã«ã§ãã¾ã™ã€‚
+¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£
')
insert('end', '
-7. 行æƒãˆ', style_tag_big)
- insert('end', ' ã“ã®ã‚ˆã†ã«è¡Œã‚’
+7. ¹Ô·¤¨', style_tag_big)
+ insert('end', ' ¤³¤Î¤è¤¦¤Ë¹Ô¤ò
')
- insert('end', 'å·¦ã«æƒãˆãŸã‚Š
+ insert('end', 'º¸¤Ë·¤¨¤¿¤ê
')
- insert('end', 'å³ã«æƒãˆãŸã‚Š
+ insert('end', '±¦¤Ë·¤¨¤¿¤ê
', style_tag_right)
- insert('end', 'çœŸä¸­ã«æƒãˆãŸã‚Šã§ãã¾ã™ã€‚
+ insert('end', '¿¿Ãæ¤Ë·¤¨¤¿¤ê¤Ç¤­¤Þ¤¹¡£
', style_tag_center)
insert('end', '
-8. è‚©ä»˜ãæ–‡å­—ã¨æ·»å­—', style_tag_big)
+8. ¸ªÉÕ¤­Ê¸»ú¤Èź»ú', style_tag_big)
insert('end', ' 10')
insert('end', 'n', style_tag_super)
- insert('end', ' ã®ã‚ˆã†ã«è‚©ä»˜ã文字ã®åŠ¹æžœã‚„ã€')
+ insert('end', ' ¤Î¤è¤¦¤Ë¸ªÉÕ¤­Ê¸»ú¤Î¸ú²Ì¤ä¡¢')
insert('end', '
X')
insert('end', 'i', style_tag_sub)
- insert('end', 'ã®ã‚ˆã†ã«æ·»å­—ã®åŠ¹æžœã‚’å‡ºã™ã“ã¨ãŒã§ãã¾ã™ã€‚
+ insert('end', '¤Î¤è¤¦¤Ëź»ú¤Î¸ú²Ì¤ò½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
')
insert('end', '
-9. マージン', style_tag_big)
- insert('end', 'テキストã®å·¦å´ã«ä½™åˆ†ãªç©ºç™½ã‚’ç½®ãã“ã¨ãŒã§ãã¾ã™:
+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)
- insert('end', '2行目以é™ã®é€£ç¶šã—ãŸãƒžãƒ¼ã‚¸ãƒ³', style_tag_margins)
- insert('end', 'ã§ã™ã€‚ã¾ãŸå³å´ã«ã‚‚マージンãŒã‚りã¾ã™ã€‚', style_tag_margins)
- insert('end', 'è¡Œã®æŠ˜ã‚Šè¿”ã—ä½ç½®ã‚’決ã‚ã‚‹ãŸã‚ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+ insert('end', 'º¸Â¦¤Ë¤Ï2¼ïÎà¤Î¥Þ¡¼¥¸¥ó¤ò»ý¤Á¤Þ¤¹¡£', style_tag_margins)
+ insert('end', '1¹ÔÌܤËÂФ¹¤ë¤â¤Î¤È¡¢', style_tag_margins)
+ insert('end', '2¹ÔÌܰʹߤÎϢ³¤·¤¿¥Þ¡¼¥¸¥ó', style_tag_margins)
+ insert('end', '¤Ç¤¹¡£¤Þ¤¿±¦Â¦¤Ë¤â¥Þ¡¼¥¸¥ó¤¬¤¢¤ê¤Þ¤¹¡£', style_tag_margins)
+ insert('end', '¹Ô¤ÎÀÞ¤êÊÖ¤·°ÌÃÖ¤ò·è¤á¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
', style_tag_margins)
insert('end', '
-10. スペーシング', style_tag_big)
- insert('end', '3ã¤ã®ãƒ‘ラメータã§è¡Œã®ã‚¹ãƒšãƒ¼ã‚·ãƒ³ã‚°ã‚’')
- insert('end', '制御ã™
-ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚Spacing1ã§ã€è¡Œã®')
- insert('end', '上ã«ã©ã®ãらã„ã®ç©ºé–“ã‚’ç½®ãã‹ã€
+10. ¥¹¥Ú¡¼¥·¥ó¥°', style_tag_big)
+ insert('end', '3¤Ä¤Î¥Ñ¥é¥á¡¼¥¿¤Ç¹Ô¤Î¥¹¥Ú¡¼¥·¥ó¥°¤ò')
+ insert('end', 'À©¸æ¤¹
+¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Spacing1¤Ç¡¢¹Ô¤Î')
+ insert('end', '¾å¤Ë¤É¤Î¤¯¤é¤¤¤Î¶õ´Ö¤òÃÖ¤¯¤«¡¢
spacing3')
- insert('end', 'ã§è¡Œã®ä¸‹ã«ã©ã®ãらã„ã®ç©ºé–“ã‚’ç½®ãã‹ã€')
- insert('end', 'è¡ŒãŒæŠ˜ã‚Šè¿”ã•れã¦ã„ã‚‹ãªã‚‰
-ã°ã€spacing2ã§ã€')
- insert('end', 'テキスト行を生æˆã—ã¦ã„る行ã®é–“ã«ã©ã®ãらã„')
- insert('end', 'ã®ç©ºé–“ã‚’ç½®
-ãã‹ã‚’示ã—ã¾ã™ã€‚
+ insert('end', '¤Ç¹Ô¤Î²¼¤Ë¤É¤Î¤¯¤é¤¤¤Î¶õ´Ö¤òÃÖ¤¯¤«¡¢')
+ insert('end', '¹Ô¤¬ÀÞ¤êÊÖ¤µ¤ì¤Æ¤¤¤ë¤Ê¤é
+¤Ð¡¢spacing2¤Ç¡¢')
+ insert('end', '¥Æ¥­¥¹¥È¹Ô¤òÀ¸À®¤·¤Æ¤¤¤ë¹Ô¤Î´Ö¤Ë¤É¤Î¤¯¤é¤¤')
+ 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ã«ã‚ˆã£ã¦æŠ˜ã‚Šç•³ã¾ã‚Œã¦ã„ã¾ã™ã€‚
+ insert('end', '³ÆÃÊÍî¤Ï¼ÂºÝ¤Ï¥Æ¥­¥¹¥Èwidget', style_tag_spacing)
+ insert('end', '¤Î1¹Ô¤Ç¡¢widget¤Ë¤è¤Ã¤ÆÀÞ¤ê¾ö¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
', style_tag_spacing)
- insert('end', 'Spacing1ã¯ã“ã®ãƒ†ã‚­ã‚¹ãƒˆã§ã¯10pointã«', style_tag_spacing)
- insert('end', '設定ã•れã¦ã„ã¾ã™ã€‚', style_tag_spacing)
- insert('end', 'ã“れã«ã‚ˆã‚Šã€æ®µè½ã®é–“ã«å¤§ããªé–“éš”ãŒ', style_tag_spacing)
- insert('end', '存在ã—ã¦ã„ã¾ã™ã€‚', style_tag_spacing)
- insert('end', 'Spacing2ã¯2pointã«è¨­å®šã•れã¦ã„ã¾ã™ã€‚', style_tag_spacing)
- insert('end', 'ã“ã‚Œã§æ®µè½ã®ä¸­ã«ã»ã‚“ã®å°‘ã—é–“éš”ãŒå­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚',
+ insert('end', 'Spacing1¤Ï¤³¤Î¥Æ¥­¥¹¥È¤Ç¤Ï10point¤Ë', style_tag_spacing)
+ insert('end', 'ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
+ insert('end', '¤³¤ì¤Ë¤è¤ê¡¢ÃÊÍî¤Î´Ö¤ËÂ礭¤Ê´Ö³Ö¤¬', style_tag_spacing)
+ insert('end', '¸ºß¤·¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
+ insert('end', 'Spacing2¤Ï2point¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£', style_tag_spacing)
+ insert('end', '¤³¤ì¤ÇÃÊÍî¤ÎÃæ¤Ë¤Û¤ó¤Î¾¯¤·´Ö³Ö¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹¡£',
style_tag_spacing)
- insert('end', 'Spacing3ã¯ã“ã®ä¾‹ã§ã¯ä½¿ç”¨ã•れã¦ã„ã¾ã›ã‚“。
+ insert('end', 'Spacing3¤Ï¤³¤ÎÎã¤Ç¤Ï»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
', style_tag_spacing)
- insert('end', 'é–“éš”ãŒã©ã“ã«ã‚ã‚‹ã‹ã‚’見ãŸã‘れã°ã€ã“ã‚Œã‚‰ã®æ®µè½ã®',
+ insert('end', '´Ö³Ö¤¬¤É¤³¤Ë¤¢¤ë¤«¤ò¸«¤¿¤±¤ì¤Ð¡¢¤³¤ì¤é¤ÎÃÊÍî¤Î',
style_tag_spacing)
- insert('end', 'ãªã‹ã§ãƒ†ã‚­ã‚¹ãƒˆã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚é¸æŠžã®', style_tag_spacing)
- insert('end', 'å転ã—ãŸéƒ¨åˆ†ã«ã¯ä½™åˆ†ã«ã¨ã‚‰ã‚ŒãŸé–“éš”ãŒ', 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/tcolor b/ext/tk/sample/demos-jp/tcolor
index f2d5458db4..17f7e1347e 100644
--- a/ext/tk/sample/demos-jp/tcolor
+++ b/ext/tk/sample/demos-jp/tcolor
@@ -1,20 +1,20 @@
#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# tcolor --
-# ã“ã®ã‚¹ã‚¯ãƒªãƒ—トã¯RGB,HSB,CYMå½¢å¼ã‚’サãƒãƒ¼ãƒˆã™ã‚‹
-# 簡易カラーエディタã§ã™ã€‚
+# ¤³¤Î¥¹¥¯¥ê¥×¥È¤ÏRGB,HSB,CYM·Á¼°¤ò¥µ¥Ý¡¼¥È¤¹¤ë
+# ´Ê°×¥«¥é¡¼¥¨¥Ç¥£¥¿¤Ç¤¹¡£
#
# Copyright (C) 1998 Takaaki Tateishi(ttate@jaist.ac.jp)
# last update: Thu Jun 18 06:32:35 JST 1998
#
-# ã¾ãšã¯tk.rbを読ã¿è¾¼ã‚€ã€‚
+# ¤Þ¤º¤Ïtk.rb¤òÆÉ¤ß¹þ¤à¡£
require "tk"
-# Tkã«ã‚ˆã£ã¦å¤‰æ›´ã•れる変数ã¯TkVariableã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’使ã†ã€‚
+# Tk¤Ë¤è¤Ã¤ÆÊѹ¹¤µ¤ì¤ëÊÑ¿ô¤ÏTkVariable¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤ò»È¤¦¡£
$colorSpace = TkVariable.new(:rgb)
$master = nil
@@ -32,13 +32,13 @@ $label2 = TkVariable.new("label2")
$label3 = TkVariable.new("label3")
-# リソースデータベースã®è¨­å®š
+# ¥ê¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀßÄê
if (TkVarAccess.new('tcl_platform')['platform'] == 'unix')
TkOptionDB.add('*Entry.background', 'white')
end
-# å„イベント用ã®ãƒ¡ã‚½ãƒƒãƒ‰
+# ³Æ¥¤¥Ù¥ó¥ÈÍѤΥ᥽¥Ã¥É
def rgbToHsv(red,green,blue)
@@ -130,7 +130,7 @@ def _null_binding
end
private :_null_binding
-def doUpdate
+def doUpdate
newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
eval(newCmd, _null_binding)
end
@@ -138,7 +138,7 @@ end
def tc_scaleChanged
if( $updating.to_i == 1 )
- return
+ return
end
$master = :scale if $master == nil
@@ -155,7 +155,7 @@ def tc_scaleChanged
when :cmy
$red = (65535 - scale1.get * 65.535).to_i
$green = (65535 - scale2.get * 65.535).to_i
- $blue = (65535 - scale3.get * 65.535).to_i
+ $blue = (65535 - scale3.get * 65.535).to_i
when :hsb
list = hsbToRgb(scale1.get / 1000.0,
scale2.get / 1000.0,
@@ -183,7 +183,7 @@ def tc_setScales
scale1 = $root.middle.middle.scale1
scale2 = $root.middle.middle.scale2
scale3 = $root.middle.middle.scale3
-
+
case $colorSpace.value.intern
when :rgb
scale1.set($red / 65.535)
@@ -209,7 +209,7 @@ end
def tc_loadNamedColor(name)
$name.value = name
$master = :name if $master == nil
- if name[0,1] != "#"
+ if name[0,1] != "#"
list = TkWinfo.rgb($root.middle.right.swatch,name)
$red = list[0]
$green = list[1]
@@ -243,7 +243,7 @@ def tc_loadNamedColor(name)
$green = $green << shift
$blue = $blue << shift
end
-
+
tc_setScales
$color = format("#%04x%04x%04x",$red,$green,$blue)
$root.middle.right.set_color($color)
@@ -277,7 +277,7 @@ end
-# tcolor用ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼
+# tcolorÍѤΥá¥Ë¥å¡¼
class TkColorMenuFrame<TkFrame
def initialize(parent)
@@ -285,10 +285,10 @@ class TkColorMenuFrame<TkFrame
"relief"=>"raised",
"borderwidth"=>"2")
- # Fileメニューボタンã®ç”Ÿæˆ
+ # File¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤ÎÀ¸À®
@file = TkMenubutton.new(self){|button|
- # Fileメニューã®ä½œæˆ
+ # File¥á¥Ë¥å¡¼¤ÎºîÀ®
@file_menu = TkMenu.new(button){
add "radio",
"label" => "RGB color space",
@@ -325,8 +325,8 @@ class TkColorMenuFrame<TkFrame
"underline" => "0",
"command" => proc{exit}
}
-
- # Fileメニューã¨Fileボタンを関連付ã‘ã‚‹
+
+ # File¥á¥Ë¥å¡¼¤ÈFile¥Ü¥¿¥ó¤ò´ØÏ¢ÉÕ¤±¤ë
menu @file_menu
text "File"
@@ -338,7 +338,7 @@ class TkColorMenuFrame<TkFrame
end
-# 下部ã®ãƒ•レームã®ãŸã‚ã®ã‚¯ãƒ©ã‚¹
+# ²¼Éô¤Î¥Õ¥ì¡¼¥à¤Î¤¿¤á¤Î¥¯¥é¥¹
class TkColorBotFrame<TkFrame
def initialize(parent)
super(parent,
@@ -361,10 +361,10 @@ class TkColorBotFrame<TkFrame
self
end
-end
+end
-# 中段左ã®ãƒ•レーム
+# ÃæÃʺ¸¤Î¥Õ¥ì¡¼¥à
class TkColorMiddleLeftFrame<TkFrame
def initialize(parent)
super(parent)
@@ -408,9 +408,9 @@ class TkColorMiddleLeftFrame<TkFrame
end
-# 中段中央ã®ãƒ•レーム
+# ÃæÃÊÃæ±û¤Î¥Õ¥ì¡¼¥à
class TkColorMiddleMiddleFrame<TkFrame
- # @scale1,@scale2,@scale3を外部ã‹ã‚‰å‚ç…§ã®ã¿è¨±å¯ã™ã‚‹ã€‚(変更ä¸å¯)
+ # @scale1,@scale2,@scale3¤ò³°Éô¤«¤é»²¾È¤Î¤ßµö²Ä¤¹¤ë¡£(Êѹ¹ÉÔ²Ä)
attr_reader :scale1, :scale2, :scale3
def initialize(parent)
@@ -467,7 +467,7 @@ class TkColorMiddleRightFrame<TkFrame
super(parent)
@swatch = TkFrame.new(self, "width"=>"2c", "height"=>"5c",
"background"=>$color)
- @value = TkLabel.new(self,
+ @value = TkLabel.new(self,
"text"=>$color,
"width"=>"13",
"font"=>"-Adobe-Courier-Medium-R-Normal--*-120-*-*-*-*-*-*")
@@ -485,7 +485,7 @@ end
-# 中段ã®ãƒ•レーム
+# ÃæÃʤΥե졼¥à
class TkColorMiddleFrame<TkFrame
attr_reader :left, :middle, :right
@@ -529,6 +529,6 @@ end
$root = TkColor.new
-# イベントを待ã¤ç‚ºã«ãƒ«ãƒ¼ãƒ—ã«å…¥ã‚‹ã€‚
+# ¥¤¥Ù¥ó¥È¤òÂԤİ٤˥롼¥×¤ËÆþ¤ë¡£
changeColorSpace :rgb
Tk.mainloop
diff --git a/ext/tk/sample/demos-jp/text.rb b/ext/tk/sample/demos-jp/text.rb
index e698a79246..ea15064830 100644
--- a/ext/tk/sample/demos-jp/text.rb
+++ b/ext/tk/sample/demos-jp/text.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# text (basic facilities) widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($text_demo) && $text_demo
$text_demo.destroy
$text_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$text_demo = TkToplevel.new {|w|
title("Text Demonstration - Basic Facilities")
iconname("text")
@@ -25,11 +25,11 @@ else
undo_support = true
end
-# frame 生æˆ
+# frame À¸À®
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $text_demo
$text_demo = nil
@@ -38,14 +38,14 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'text'}
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# text 生æˆ
+# text À¸À®
TkText.new(base_frame){|t|
- # 生æˆ
+ # À¸À®
relief 'sunken'
bd 2
setgrid 1
@@ -57,62 +57,62 @@ TkText.new(base_frame){|t|
}
pack('expand'=>'yes', 'fill'=>'both')
- # テキスト挿入
+ # ¥Æ¥­¥¹¥ÈÁÞÆþ
insert('0.0', <<EOT)
-ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯ãƒ†ã‚­ã‚¹ãƒˆ widget ã§ã™ã€‚1行ã¾ãŸã¯ãれ以上ã®ãƒ†ã‚­ã‚¹ãƒˆã‚’表
-示・編集ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚以下ã¯ãƒ†ã‚­ã‚¹ãƒˆ widget ã§ã§ãã‚‹æ“作ã«ã¤ã„ã¦
-ã¾ã¨ã‚ãŸã‚‚ã®ã§ã™ã€‚
-
-1. スクロール。スクロールãƒãƒ¼ã§ãƒ†ã‚­ã‚¹ãƒˆã®è¡¨ç¤ºéƒ¨åˆ†ã‚’å‹•ã‹ã™ã“ã¨ãŒã§ãã¾ã™ã€‚
-
-2. スキャニング。テキストã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§ãƒžã‚¦ã‚¹ãƒœã‚¿ãƒ³2 (中ボタンを) を押
-ã—ã¦ä¸Šä¸‹ã«ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ãã ã•ã„。ãã†ã™ã‚‹ã¨ãƒ†ã‚­ã‚¹ãƒˆãŒé«˜é€Ÿã§ãƒ‰ãƒ©ãƒƒã‚°ã•れã€
-内容をã–ã£ã¨çœºã‚ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-
-3. ãƒ†ã‚­ã‚¹ãƒˆã®æŒ¿å…¥ã€‚マウスボタン1 (左ボタン) を押ã—ã€æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã‚’セッ
-トã—ã¦ã‹ã‚‰ãƒ†ã‚­ã‚¹ãƒˆã‚’入力ã—ã¦ãã ã•ã„。入力ã—ãŸã‚‚ã®ãŒ widget ã«å…¥ã‚Šã¾ã™ã€‚
-
-4. é¸æŠžã€‚ã‚ã‚‹ç¯„å›²ã®æ–‡å­—ã‚’é¸æŠžã™ã‚‹ã«ã¯ãƒžã‚¦ã‚¹ãƒœã‚¿ãƒ³1 を押ã—ã€ãƒ‰ãƒ©ãƒƒã‚°ã—
-ã¦ãã ã•ã„。一度ボタンを離ã—ãŸã‚‰ã€ã‚·ãƒ•トキーを押ã—ãªãŒã‚‰ãƒœã‚¿ãƒ³1 を押ã™
-ã“ã¨ã§é¸æŠžç¯„囲ã®èª¿æ•´ãŒã§ãã¾ã™ã€‚ã“れã¯é¸æŠžç¯„å›²ã®æœ€å¾Œã‚’マウスカーソルã«
-最も近ã„ä½ç½®ã«ãƒªã‚»ãƒƒãƒˆã—ã€ãƒœã‚¿ãƒ³ã‚’離ã™å‰ã«ãƒžã‚¦ã‚¹ã‚’ドラッグã™ã‚‹ã“ã¨ã§ã•
-らã«é¸æŠžç¯„囲を調整ã§ãã¾ã™ã€‚ダブルクリックã§ãƒ¯ãƒ¼ãƒ‰ã‚’ã€ã¾ãŸãƒˆãƒªãƒ—ルクリッ
-クã§è¡Œå…¨ä½“ã‚’é¸æŠžã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
-
-5. 消去ã¨ç½®æ›ã€‚テキストを消去ã™ã‚‹ã«ã¯ã€æ¶ˆåŽ»ã—ãŸã„æ–‡å­—ã‚’é¸æŠžã—ã¦ãƒãƒƒã‚¯
-スペースã‹ãƒ‡ãƒªãƒ¼ãƒˆã‚­ãƒ¼ã‚’入力ã—ã¦ãã ã•ã„。ã‚ã‚‹ã„ã¯ã€æ–°ã—ã„テキストを
-入力ã™ã‚‹ã¨é¸æŠžã•れãŸãƒ†ã‚­ã‚¹ãƒˆã¨ç½®æ›ã•れã¾ã™ã€‚
-
-6. é¸æŠžéƒ¨åˆ†ã®ã‚³ãƒ”ãƒ¼ã€‚é¸æŠžéƒ¨åˆ†ã‚’ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®ä¸­ã®ã©ã“ã‹ã«ã‚³ãƒ”ーã™ã‚‹
-ã«ã¯ã€ã¾ãšã‚³ãƒ”ーã—ãŸã„æ‰€ã‚’é¸æŠž(ã“ã“ã§ã€ã‚ã‚‹ã„ã¯åˆ¥ã®ã‚¢ãƒ—リケーションã§)
-ã—ã€ãƒœã‚¿ãƒ³ 2 をクリックã—ã¦ã€æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã®ä½ç½®ã«ã‚³ãƒ”ーã—ã¦ãã ã•ã„。
-
-7. 編集。テキスト widget 㯠Emacs ã®ã‚­ãƒ¼ãƒã‚¤ãƒ³ãƒ‰ã«åŠ ãˆã¦æ¨™æº–çš„ãªã® Motif
-ã®ç·¨é›†æ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™ã€‚ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã¨ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-H ã¯æŒ¿å…¥
-カーソルã®å·¦å´ã®æ–‡å­—を削除ã—ã¾ã™ã€‚デリートキーã¨ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«-D ã¯æŒ¿å…¥
-カーソルã®å³å´ã®æ–‡å­—を削除ã—ã¾ã™ã€‚Meta-ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹ã¯æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã®
-å³å´ã®å˜èªžã‚’削除ã—ã€Meta-D ã¯æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã®å·¦å´ã®å˜èªžã‚’削除ã—ã¾ã™ã€‚
-コントロール-K ã¯æŒ¿å…¥ã‚«ãƒ¼ã‚½ãƒ«ã‹ã‚‰è¡Œæœ«ã¾ã§ã‚’削除ã—ã€ãã®ä½ç½®ã«æ”¹è¡Œ
-ã—ã‹ãªã‹ã£ãŸå ´åˆã¯ã€æ”¹è¡Œã‚’削除ã—ã¾ã™ã€‚#{
+¤³¤Î¥¦¥£¥ó¥É¥¦¤Ï¥Æ¥­¥¹¥È widget ¤Ç¤¹¡£1¹Ô¤Þ¤¿¤Ï¤½¤ì°Ê¾å¤Î¥Æ¥­¥¹¥È¤òɽ
+¼¨¡¦ÊÔ½¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£°Ê²¼¤Ï¥Æ¥­¥¹¥È widget ¤Ç¤Ç¤­¤ëÁàºî¤Ë¤Ä¤¤¤Æ
+¤Þ¤È¤á¤¿¤â¤Î¤Ç¤¹¡£
+
+1. ¥¹¥¯¥í¡¼¥ë¡£¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ç¥Æ¥­¥¹¥È¤Îɽ¼¨Éôʬ¤òư¤«¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+2. ¥¹¥­¥ã¥Ë¥ó¥°¡£¥Æ¥­¥¹¥È¤Î¥¦¥£¥ó¥É¥¦¤Ç¥Þ¥¦¥¹¥Ü¥¿¥ó2 (Ãæ¥Ü¥¿¥ó¤ò) ¤ò²¡
+¤·¤Æ¾å²¼¤Ë¥É¥é¥Ã¥°¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤¦¤¹¤ë¤È¥Æ¥­¥¹¥È¤¬¹â®¤Ç¥É¥é¥Ã¥°¤µ¤ì¡¢
+ÆâÍÆ¤ò¤¶¤Ã¤Èį¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+3. ¥Æ¥­¥¹¥È¤ÎÁÞÆþ¡£¥Þ¥¦¥¹¥Ü¥¿¥ó1 (º¸¥Ü¥¿¥ó) ¤ò²¡¤·¡¢ÁÞÆþ¥«¡¼¥½¥ë¤ò¥»¥Ã
+¥È¤·¤Æ¤«¤é¥Æ¥­¥¹¥È¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ÆþÎϤ·¤¿¤â¤Î¤¬ widget ¤ËÆþ¤ê¤Þ¤¹¡£
+
+4. ÁªÂò¡£¤¢¤ëÈϰϤÎʸ»ú¤òÁªÂò¤¹¤ë¤Ë¤Ï¥Þ¥¦¥¹¥Ü¥¿¥ó1 ¤ò²¡¤·¡¢¥É¥é¥Ã¥°¤·
+¤Æ¤¯¤À¤µ¤¤¡£°ìÅ٥ܥ¿¥ó¤òÎ¥¤·¤¿¤é¡¢¥·¥Õ¥È¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Ü¥¿¥ó1 ¤ò²¡¤¹
+¤³¤È¤ÇÁªÂòÈϰϤÎÄ´À°¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤ÏÁªÂòÈϰϤκǸå¤ò¥Þ¥¦¥¹¥«¡¼¥½¥ë¤Ë
+ºÇ¤â¶á¤¤°ÌÃ֤˥ꥻ¥Ã¥È¤·¡¢¥Ü¥¿¥ó¤òÎ¥¤¹Á°¤Ë¥Þ¥¦¥¹¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¤µ
+¤é¤ËÁªÂòÈϰϤòÄ´À°¤Ç¤­¤Þ¤¹¡£¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤Ç¥ï¡¼¥É¤ò¡¢¤Þ¤¿¥È¥ê¥×¥ë¥¯¥ê¥Ã
+¥¯¤Ç¹ÔÁ´ÂΤòÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+5. ¾Ãµî¤ÈÃÖ´¹¡£¥Æ¥­¥¹¥È¤ò¾Ãµî¤¹¤ë¤Ë¤Ï¡¢¾Ãµî¤·¤¿¤¤Ê¸»ú¤òÁªÂò¤·¤Æ¥Ð¥Ã¥¯
+¥¹¥Ú¡¼¥¹¤«¥Ç¥ê¡¼¥È¥­¡¼¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¤¢¤ë¤¤¤Ï¡¢¿·¤·¤¤¥Æ¥­¥¹¥È¤ò
+ÆþÎϤ¹¤ë¤ÈÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¤ÈÃÖ´¹¤µ¤ì¤Þ¤¹¡£
+
+6. ÁªÂòÉôʬ¤Î¥³¥Ô¡¼¡£ÁªÂòÉôʬ¤ò¤³¤Î¥¦¥£¥ó¥É¥¦¤ÎÃæ¤Î¤É¤³¤«¤Ë¥³¥Ô¡¼¤¹¤ë
+¤Ë¤Ï¡¢¤Þ¤º¥³¥Ô¡¼¤·¤¿¤¤½ê¤òÁªÂò(¤³¤³¤Ç¡¢¤¢¤ë¤¤¤ÏÊ̤Υ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç)
+¤·¡¢¥Ü¥¿¥ó 2 ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¡¢ÁÞÆþ¥«¡¼¥½¥ë¤Î°ÌÃ֤˥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£
+
+7. ÊÔ½¸¡£¥Æ¥­¥¹¥È widget ¤Ï Emacs ¤Î¥­¡¼¥Ð¥¤¥ó¥É¤Ë²Ã¤¨¤ÆÉ¸½àŪ¤Ê¤Î Motif
+¤ÎÊÔ½¸µ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤È¥³¥ó¥È¥í¡¼¥ë-H ¤ÏÁÞÆþ
+¥«¡¼¥½¥ë¤Îº¸Â¦¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£¥Ç¥ê¡¼¥È¥­¡¼¤È¥³¥ó¥È¥í¡¼¥ë-D ¤ÏÁÞÆþ
+¥«¡¼¥½¥ë¤Î±¦Â¦¤Îʸ»ú¤òºï½ü¤·¤Þ¤¹¡£Meta-¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ÏÁÞÆþ¥«¡¼¥½¥ë¤Î
+±¦Â¦¤Îñ¸ì¤òºï½ü¤·¡¢Meta-D ¤ÏÁÞÆþ¥«¡¼¥½¥ë¤Îº¸Â¦¤Îñ¸ì¤òºï½ü¤·¤Þ¤¹¡£
+¥³¥ó¥È¥í¡¼¥ë-K ¤ÏÁÞÆþ¥«¡¼¥½¥ë¤«¤é¹ÔËö¤Þ¤Ç¤òºï½ü¤·¡¢¤½¤Î°ÌÃ֤˲þ¹Ô
+¤·¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢²þ¹Ô¤òºï½ü¤·¤Þ¤¹¡£#{
if undo_support
- undo_text = "Control-z ã¯æœ€å¾Œã«è¡Œã£ãŸå¤‰æ›´ã®å–り消ã—(undo)を行ã„ã€"
+ undo_text = "Control-z ¤ÏºÇ¸å¤Ë¹Ô¤Ã¤¿Êѹ¹¤Î¼è¤ê¾Ã¤·(undo)¤ò¹Ô¤¤¡¢"
case $tk_platform['platform']
when "unix", "macintosh"
undo_text << "Control-Shift-z"
else # 'windows'
undo_text << "Control-y"
end
- undo_text << "ã¯undoã—ãŸå¤‰æ›´ã®å†é©ç”¨(redo)を行ã„ã¾ã™ã€‚"
+ undo_text << "¤Ïundo¤·¤¿Êѹ¹¤ÎºÆÅ¬ÍÑ(redo)¤ò¹Ô¤¤¤Þ¤¹¡£"
else
""
end
}
-8. ウィンドウã®ãƒªã‚µã‚¤ã‚ºã€‚ã“ã® widget 㯠"setGrid" オプションをオンã«ã—
-ã¦ã‚りã¾ã™ã®ã§ã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’リサイズã™ã‚‹æ™‚ã«ã¯é«˜ã•ã¨å¹…ã¯å¸¸ã«æ–‡å­—é«˜ã¨æ–‡
-å­—å¹…ã®æ•´æ•°å€ã«ãªã‚Šã¾ã™ã€‚ã¾ãŸã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’ç‹­ãã—ãŸå ´åˆã«ã¯é•·ã„行ãŒè‡ªå‹•
-çš„ã«æŠ˜ã‚Šè¿”ã•れã€å¸¸ã«å…¨ã¦ã®å†…容ãŒè¦‹ãˆã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ã¾ã™ã€‚
+8. ¥¦¥£¥ó¥É¥¦¤Î¥ê¥µ¥¤¥º¡£¤³¤Î widget ¤Ï "setGrid" ¥ª¥×¥·¥ç¥ó¤ò¥ª¥ó¤Ë¤·
+¤Æ¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢¥¦¥£¥ó¥É¥¦¤ò¥ê¥µ¥¤¥º¤¹¤ë»þ¤Ë¤Ï¹â¤µ¤ÈÉý¤Ï¾ï¤Ëʸ»ú¹â¤Èʸ
+»úÉý¤ÎÀ°¿ôÇܤˤʤê¤Þ¤¹¡£¤Þ¤¿¡¢¥¦¥£¥ó¥É¥¦¤ò¶¹¤¯¤·¤¿¾ì¹ç¤Ë¤ÏŤ¤¹Ô¤¬¼«Æ°
+Ū¤ËÀÞ¤êÊÖ¤µ¤ì¡¢¾ï¤ËÁ´¤Æ¤ÎÆâÍÆ¤¬¸«¤¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
EOT
set_insert('0.0')
diff --git a/ext/tk/sample/demos-jp/textpeer.rb b/ext/tk/sample/demos-jp/textpeer.rb
index 4d896d2a12..de604f1940 100644
--- a/ext/tk/sample/demos-jp/textpeer.rb
+++ b/ext/tk/sample/demos-jp/textpeer.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# text widget peering demo (called by 'widget')
#
@@ -22,17 +22,17 @@ count = [0]
## Define a widget that we peer from; it won't ever actually be shown though
first = TkText.new(base_frame, :widgetname=>"text#{count[0] += 1}")
-first.insert :end,"ã“ã®ãƒ‡ãƒ¢ã¯ä¸€ã¤ã®çµ„ã‚’æˆã—ãŸãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’示ã—ã¾ã™ã€‚"
-first.insert :end,"ãれらã®ãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¯å¯¾ç­‰(ピア;peer)ã®é–¢ä¿‚ã«"
-first.insert :end,"ãªã£ã¦ã„ã¾ã™ã€‚"
-first.insert :end,"ãれらã¯ã€åŸºç›¤ã¨ãªã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ¢ãƒ‡ãƒ«ã¯å…±é€šã®ã‚‚ã®ã‚’æŒã¡ã¾ã™ãŒã€"
-first.insert :end,"ç”»é¢è¡¨ç¤ºä½ç½®ã€ç·¨é›†ä½ç½®ã€é¸æŠžç¯„囲(selection)ã«ã¤ã„ã¦ã¯"
-first.insert :end,"ç‹¬ç«‹ã«æŒã¤ã“ã¨ãŒã§ãã¾ã™ã€‚"
-first.insert :end,"å„テキストウィジェットã®è„‡ã«ã‚ã‚‹"
-first.insert :end,"「ピア(peer)ã®ä½œæˆã€ãƒœã‚¿ãƒ³ã‚’使ãˆã°ã€"
-first.insert :end,"æ–°ãŸãªãƒ”アを追加ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚"
-first.insert :end,"ã¾ãŸã€Œãƒ”ã‚¢(peer)ã®æ¶ˆåŽ»ã€ãƒœã‚¿ãƒ³ã‚’使ãˆã°ã€"
-first.insert :end,"特定ã®ãƒ”アウィジェットを消去ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚"
+first.insert :end,"¤³¤Î¥Ç¥â¤Ï°ì¤Ä¤ÎÁȤòÀ®¤·¤¿¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ò¼¨¤·¤Þ¤¹¡£"
+first.insert :end,"¤½¤ì¤é¤Î¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÏÂÐÅù(¥Ô¥¢;peer)¤Î´Ø·¸¤Ë"
+first.insert :end,"¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
+first.insert :end,"¤½¤ì¤é¤Ï¡¢´ðÈפȤʤë¥Ç¡¼¥¿¥â¥Ç¥ë¤Ï¶¦Ä̤Τâ¤Î¤ò»ý¤Á¤Þ¤¹¤¬¡¢"
+first.insert :end,"²èÌÌɽ¼¨°ÌÃÖ¡¢ÊÔ½¸°ÌÃÖ¡¢ÁªÂòÈϰÏ(selection)¤Ë¤Ä¤¤¤Æ¤Ï"
+first.insert :end,"ÆÈΩ¤Ë»ý¤Ä¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
+first.insert :end,"³Æ¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÎÏÆ¤Ë¤¢¤ë"
+first.insert :end,"¡Ö¥Ô¥¢(peer)¤ÎºîÀ®¡×¥Ü¥¿¥ó¤ò»È¤¨¤Ð¡¢"
+first.insert :end,"¿·¤¿¤Ê¥Ô¥¢¤òÄɲ乤뤳¤È¤¬²Äǽ¤Ç¤¹¡£"
+first.insert :end,"¤Þ¤¿¡Ö¥Ô¥¢(peer)¤Î¾Ãµî¡×¥Ü¥¿¥ó¤ò»È¤¨¤Ð¡¢"
+first.insert :end,"ÆÃÄê¤Î¥Ô¥¢¥¦¥£¥¸¥§¥Ã¥È¤ò¾Ãµî¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
Tk.update_idletasks ## for 'first' widget
@@ -44,10 +44,10 @@ def makeClone(count, win, txt)
sbar = TkScrollbar.new(win, :widgetname=>"sb#{cnt}")
peer.yscrollbar sbar
b1 = TkButton.new(win, :widgetname=>"clone#{cnt}",
- :text=>'ピア(peer)ã®ä½œæˆ',
+ :text=>'¥Ô¥¢(peer)¤ÎºîÀ®',
:command=>proc{makeClone(count, win, peer)})
b2 = TkButton.new(win, :widgetname=>"kill#{cnt}",
- :text=>'ピア(peer)ã®æ¶ˆåŽ»',
+ :text=>'¥Ô¥¢(peer)¤Î¾Ãµî',
:command=>proc{killClone(win, cnt)})
row = cnt * 2
TkGrid.configure(peer, sbar, b1, :sticky=>'nsew', :row=>row)
@@ -68,12 +68,12 @@ first.destroy
## See Code / Dismiss buttons
TkFrame.new(base_frame){|f|
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$textpeer_demo.destroy
$textpeer_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'textpeer'
}).pack(:side=>:left, :expand=>true)
diff --git a/ext/tk/sample/demos-jp/timer b/ext/tk/sample/demos-jp/timer
index 6cb7c87e09..58a41d00c0 100644
--- a/ext/tk/sample/demos-jp/timer
+++ b/ext/tk/sample/demos-jp/timer
@@ -69,7 +69,7 @@ class CountFrame < TkFrame
def initialize(parent=nil,keys=nil)
super(parent,keys)
@counter = TkLabel.new(self,
- 'text'=>$time,
+ 'text'=>$time,
'relief'=>'raised')
@counter.pack('fill'=>'both')
self
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
index 3ee7a5f9d8..570d52704f 100644
--- a/ext/tk/sample/demos-jp/toolbar.rb
+++ b/ext/tk/sample/demos-jp/toolbar.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# toolbar.rb --
#
@@ -21,32 +21,32 @@ base_frame = Ttk::Frame.new($toolbar_demo).pack(:fill=>:both, :expand=>true)
if Tk.windowingsystem != 'aqua'
msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-ã“ã®ãƒ‡ãƒ¢ã§ã¯ï¼Œãƒ„ールãƒãƒ¼ã‚’ã©ã®ã‚ˆã†ã«ã—ã¦é©åˆ‡ã«ãƒ†ãƒ¼ãƒžå¯¾å¿œã•ã›ã‚‹ã‹ï¼Œ\
-ã¾ãŸï¼Œã©ã®ã‚ˆã†ã«ã—ã¦åˆ‡ã‚Šé›¢ã—å¯èƒ½ã«ã™ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™\
-(ãŸã ã—,ツールãƒãƒ¼ã®åˆ‡ã‚Šé›¢ã—ã«ã¯Tcl/Tk8.5ä»¥ä¸Šã®æ©Ÿèƒ½ãŒå¿…è¦ã§ã™ï¼‰ï¼Ž\
-ツールãƒãƒ¼ã®ãƒœã‚¿ãƒ³ã¯ï¼Œ'Toolbutton'スタイルを使用ã™ã‚‹ã‚ˆã†ã«æ˜Žç¤ºã™ã‚‹ã“ã¨ã§ï¼Œ\
-"toolbar style"ボタンã¨ãªã‚‹ã‚ˆã†ã«å±žæ€§è¨­å®šã•れã¦ã„ã¾ã™ï¼Ž\
-ツールãƒãƒ¼ã®å·¦ç«¯ã«ã¯ç°¡å˜ãªãƒžãƒ¼ã‚«ãƒ¼ãŒç½®ã‹ã‚Œã¦ã„ã¾ã™ï¼Ž\
-マーカー上ã«ãƒžã‚¦ã‚¹ã‚«ãƒ¼ã‚½ãƒ«ãŒæ¥ã‚‹ã¨ç§»å‹•アイコンã«ã‚«ãƒ¼ã‚½ãƒ«ãŒå¤‰åŒ–ã—ã¾ã™ï¼Ž\
-ãã“ã§ãƒ„ールãƒãƒ¼ã‚’å‹•ã‹ã™ã‚ˆã†ã«ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨ï¼Œ\
-ツールãƒãƒ¼å…¨ä½“を切り離ã—ã¦ç‹¬ç«‹ã—ãŸãƒˆãƒƒãƒ—レベルウィジェットã«\
-ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ž\
-切り離ã—ãŸãƒ„ールãƒãƒ¼ãŒä¸è¦ã¨ãªã£ãŸæ™‚ã«ã¯ï¼Œ\
-一般的ãªãƒˆãƒƒãƒ—レベルウィジェットã¨åŒæ§˜ã«å˜ç´”ã«é–‰ã˜ã‚‹ã“ã¨ã§ï¼Œ
-å†ã³å…ƒã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«å¼µã‚Šä»˜ã‘られるã§ã—ょã†ï¼Ž
+¤³¤Î¥Ç¥â¤Ç¤Ï¡¤¥Ä¡¼¥ë¥Ð¡¼¤ò¤É¤Î¤è¤¦¤Ë¤·¤ÆÅ¬Àڤ˥ơ¼¥ÞÂбþ¤µ¤»¤ë¤«¡¤\
+¤Þ¤¿¡¤¤É¤Î¤è¤¦¤Ë¤·¤ÆÀÚ¤êÎ¥¤·²Äǽ¤Ë¤¹¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹\
+¡Ê¤¿¤À¤·¡¤¥Ä¡¼¥ë¥Ð¡¼¤ÎÀÚ¤êÎ¥¤·¤Ë¤ÏTcl/Tk8.5°Ê¾å¤Îµ¡Ç½¤¬É¬ÍפǤ¹¡Ë¡¥\
+¥Ä¡¼¥ë¥Ð¡¼¤Î¥Ü¥¿¥ó¤Ï¡¤'Toolbutton'¥¹¥¿¥¤¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤ËÌÀ¼¨¤¹¤ë¤³¤È¤Ç¡¤\
+"toolbar style"¥Ü¥¿¥ó¤È¤Ê¤ë¤è¤¦¤Ë°À­ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡¥\
+¥Ä¡¼¥ë¥Ð¡¼¤Îº¸Ã¼¤Ë¤Ï´Êñ¤Ê¥Þ¡¼¥«¡¼¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡¥\
+¥Þ¡¼¥«¡¼¾å¤Ë¥Þ¥¦¥¹¥«¡¼¥½¥ë¤¬Íè¤ë¤È°Üư¥¢¥¤¥³¥ó¤Ë¥«¡¼¥½¥ë¤¬ÊѲ½¤·¤Þ¤¹¡¥\
+¤½¤³¤Ç¥Ä¡¼¥ë¥Ð¡¼¤òư¤«¤¹¤è¤¦¤Ë¥É¥é¥Ã¥°¤¹¤ë¤È¡¤\
+¥Ä¡¼¥ë¥Ð¡¼Á´ÂΤòÀÚ¤êÎ¥¤·¤ÆÆÈΩ¤·¤¿¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤Ë\
+¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
+ÀÚ¤êÎ¥¤·¤¿¥Ä¡¼¥ë¥Ð¡¼¤¬ÉÔÍפȤʤä¿»þ¤Ë¤Ï¡¤\
+°ìÈÌŪ¤Ê¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤ÈƱÍͤËñ½ã¤ËÊĤ¸¤ë¤³¤È¤Ç¡¤
+ºÆ¤Ó¸µ¤Î¥¦¥£¥ó¥É¥¦¤ËÄ¥¤êÉÕ¤±¤é¤ì¤ë¤Ç¤·¤ç¤¦¡¥
EOL
else
msg = Ttk::Label.new(base_frame, :wraplength=>'4i', :text=><<EOL)
-ã“ã®ãƒ‡ãƒ¢ã§ã¯ï¼Œãƒ„ールãƒãƒ¼ã‚’ã©ã®ã‚ˆã†ã«ã—ã¦é©åˆ‡ã«ãƒ†ãƒ¼ãƒžå¯¾å¿œã•ã›ã‚‹ã‹ã‚’\
-示ã—ã¦ã„ã¾ã™ï¼Ž\
-ツールãƒãƒ¼ã®ãƒœã‚¿ãƒ³ã¯ï¼Œ'Toolbutton'スタイルを使用ã™ã‚‹ã‚ˆã†ã«æ˜Žç¤ºã™ã‚‹ã“ã¨ã§ï¼Œ\
-"toolbar style"ボタンã¨ãªã‚‹ã‚ˆã†ã«å±žæ€§è¨­å®šã•れã¦ã„ã¾ã™ï¼Ž
+¤³¤Î¥Ç¥â¤Ç¤Ï¡¤¥Ä¡¼¥ë¥Ð¡¼¤ò¤É¤Î¤è¤¦¤Ë¤·¤ÆÅ¬Àڤ˥ơ¼¥ÞÂбþ¤µ¤»¤ë¤«¤ò\
+¼¨¤·¤Æ¤¤¤Þ¤¹¡¥\
+¥Ä¡¼¥ë¥Ð¡¼¤Î¥Ü¥¿¥ó¤Ï¡¤'Toolbutton'¥¹¥¿¥¤¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤ËÌÀ¼¨¤¹¤ë¤³¤È¤Ç¡¤\
+"toolbar style"¥Ü¥¿¥ó¤È¤Ê¤ë¤è¤¦¤Ë°À­ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡¥
EOL
end
## Set up the toolbar hull
-tbar_base = Tk::Frame.new(base_frame, # Tk 標準㮠frame ã§ãªã‘れã°ãªã‚Šã¾ã›ã‚“.
- :widgetname=>'toolbar') # ウィンドウタイトル文字列ã¨ã™ã‚‹ãŸã‚ã«ï¼Œã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆåを明示ã—ã¦ã„ã¾ã™ï¼Ž
+tbar_base = Tk::Frame.new(base_frame, # Tk ɸ½à¤Î frame ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡¥
+ :widgetname=>'toolbar') # ¥¦¥£¥ó¥É¥¦¥¿¥¤¥È¥ëʸ»úÎó¤È¤¹¤ë¤¿¤á¤Ë¡¤¥¦¥£¥¸¥§¥Ã¥È̾¤òÌÀ¼¨¤·¤Æ¤¤¤Þ¤¹¡¥
sep = Ttk::Separator.new(base_frame)
to_base = Ttk::Frame.new(tbar_base, :cursor=>'fleur')
if Tk.windowingsystem != 'aqua'
@@ -72,7 +72,7 @@ if Tk.windowingsystem != 'aqua'
self.grid_remove
w.grid_remove
self.wm_manage
- # self.wm_title('Toolbar') # ã‚‚ã—ウィジェットåをウィンドウタイトルã«ã—ãŸããªã„ãªã‚‰ï¼Œã“ã“ã§è¨­å®šã—ã¦ãã ã•ã„
+ # self.wm_title('Toolbar') # ¤â¤·¥¦¥£¥¸¥§¥Ã¥È̾¤ò¥¦¥£¥ó¥É¥¦¥¿¥¤¥È¥ë¤Ë¤·¤¿¤¯¤Ê¤¤¤Ê¤é¡¤¤³¤³¤ÇÀßÄꤷ¤Æ¤¯¤À¤µ¤¤
self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
end
def tbar_base.untearoff(w)
@@ -86,17 +86,17 @@ 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")
+ text.insert(:end, "¥Ü¥¿¥ó¤¬²¡¤µ¤ì¤Þ¤·¤¿¡¥\n")
})
-tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³',
+tb_chk = Ttk::Checkbutton.new(tbar_base, :text=>'¥Á¥§¥Ã¥¯¥Ü¥¿¥ó',
:style=>'Toolbutton',
:variable=>(check = TkVariable.new),
:command=>proc{
- text.insert(:end, "ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ã®å€¤ã¯#{check.value}ã§ã™ï¼Ž\n")
+ text.insert(:end, "¥Á¥§¥Ã¥¯¥Ü¥¿¥ó¤ÎÃͤÏ#{check.value}¤Ç¤¹¡¥\n")
})
-tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'メニュー')
+tb_mbtn = Ttk::Menubutton.new(tbar_base, :text=>'¥á¥Ë¥å¡¼')
tb_combo = Ttk::Combobox.new(tbar_base, :value=>TkFont.families,
:state=>:readonly)
tb_mbtn.menu(menu = Tk::Menu.new(tb_mbtn))
@@ -121,10 +121,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'toolbar'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$toolbar_demo.destroy
diff --git a/ext/tk/sample/demos-jp/tree.rb b/ext/tk/sample/demos-jp/tree.rb
index 3f3b18b677..00d715282b 100644
--- a/ext/tk/sample/demos-jp/tree.rb
+++ b/ext/tk/sample/demos-jp/tree.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# tree.rb --
#
@@ -24,14 +24,14 @@ base_frame = TkFrame.new($tree_demo).pack(:fill=>:both, :expand=>true)
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ウィジェットをå«ã‚“ã§ã„ã¾ã™ï¼Ž\
-Ttk::Treeviewウィジェットã¯ï¼Œæœ¨æ§‹é€ è‡ªä½“ã®è¡¨ç¤ºã‚’å¯èƒ½ã«ã™ã‚‹ã ã‘ã§ãªã,\
-追加情報(ã“ã®ã‚µãƒ³ãƒ—ルã®å ´åˆã¯ãƒ•ァイルサイズ)を表示ã™ã‚‹ãŸã‚ã«\
-ä»»æ„ã®å€‹æ•°ã®è¿½åŠ ã‚«ãƒ©ãƒ ã‚‚æ‰±ã†ã“ã¨ã‚‚ã§ãã¾ã™ï¼Ž\
-ã¾ãŸï¼Œã‚«ãƒ©ãƒ ã®ã‚¿ã‚¤ãƒˆãƒ«é–“ã®åŒºåˆ‡ã‚Šéƒ¨åˆ†ã‚’ドラッグã™ã‚‹ã“ã¨ã§ï¼Œ\
-カラムã®å¹…を変更ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ï¼Ž
+Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
+¤³¤Î¥µ¥ó¥×¥ë¤Ï¡¤¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¤è¤¦¤Ê³¬ÁØÅª¤Ê¥Ç¡¼¥¿½¸¹ç¤ò\
+»²¾È¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡¥\
+Ttk::Treeview¥¦¥£¥¸¥§¥Ã¥È¤Ï¡¤ÌÚ¹½Â¤¼«ÂΤÎɽ¼¨¤ò²Äǽ¤Ë¤¹¤ë¤À¤±¤Ç¤Ê¤¯¡¤\
+ÄɲþðÊó(¤³¤Î¥µ¥ó¥×¥ë¤Î¾ì¹ç¤Ï¥Õ¥¡¥¤¥ë¥µ¥¤¥º)¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë\
+Ǥ°Õ¤Î¸Ä¿ô¤ÎÄɲå«¥é¥à¤â°·¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡¥\
+¤Þ¤¿¡¤¥«¥é¥à¤Î¥¿¥¤¥È¥ë´Ö¤Î¶èÀÚ¤êÉôʬ¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¤\
+¥«¥é¥à¤ÎÉý¤òÊѹ¹¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡¥
EOL
## See Code / Dismiss
@@ -39,10 +39,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'tree'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$tree_demo.destroy
@@ -68,7 +68,7 @@ def populate_tree(tree, node)
path = tree.get(node, :fullpath)
tree.delete(tree.children(node))
Dir.glob("#{path}/*").sort.each{|f|
- type = File.ftype(f) rescue nil
+ type = File.ftype(f)
id = tree.insert(node, :end,
:text=>File.basename(f), :values=>[f, type]).id
if type == 'directory'
diff --git a/ext/tk/sample/demos-jp/ttkbut.rb b/ext/tk/sample/demos-jp/ttkbut.rb
index ccde541019..90ec3fce5b 100644
--- a/ext/tk/sample/demos-jp/ttkbut.rb
+++ b/ext/tk/sample/demos-jp/ttkbut.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ttkbut.rb
#
@@ -23,22 +23,22 @@ base_frame = TkFrame.new($ttkbut_demo).pack(:fill=>:both, :expand=>true)
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttkã¨ã¯ï¼Œãƒ†ãƒ¼ãƒžæŒ‡å®šå¯èƒ½ãªæ–°ã—ã„ウィジェット集åˆã§ã™ï¼Ž\
-今,ã‚ãªãŸãŒç›®ã«ã—ã¦ã„ã‚‹ã®ã¯Ttkã®ãƒ†ãƒ¼ãƒžåŒ–ラベルã§ï¼Œ\
-下ã«ã¯Ttkã®ãƒ©ãƒ™ãƒ«ãƒ•レームã®ä¸­ã«ä¸‰ã¤ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®TtkウィジェットãŒ\
-表示ã•れã¦ã„ã¾ã™ï¼Ž
-最åˆã®ã‚°ãƒ«ãƒ¼ãƒ—ã¯å…¨ã¦ãƒœã‚¿ãƒ³ã§ã‚り,\
-ãれãžã‚Œã‚¯ãƒªãƒƒã‚¯ã™ã‚Œã°ç¾åœ¨ã®ã‚¢ãƒ—リケーションã®ãƒ†ãƒ¼ãƒžãŒè¨­å®šã•れã¾ã™ï¼Ž
-2番目ã®ã‚°ãƒ«ãƒ¼ãƒ—ã¯ä¸‰ã¤ã®ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³é›†åˆã§ã™ï¼Ž\
-å„集åˆã®é–“ã«ã¯ï¼Œã‚»ãƒ‘レータウィジェットãŒç½®ã‹ã‚Œã¦ã„ã¾ã™ï¼Ž\
-ãªãŠã€Œæœ‰åŠ¹åŒ–ã€ãƒœã‚¿ãƒ³ã¯ï¼Œã“ã®ãƒˆãƒƒãƒ—レベルウィジェット内ã®\
-ä»–ã®ã™ã¹ã¦ã®ãƒ†ãƒ¼ãƒžåŒ–ウィジェットã®çŠ¶æ…‹(state)ãŒ"disabled"ã‹ã©ã†ã‹ã‚’\
-コントロールã™ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„.
-3番目ã®ã‚°ãƒ«ãƒ¼ãƒ—ã¯é–¢é€£ä»˜ã‘られãŸãƒ©ã‚¸ã‚ªãƒœã‚¿ãƒ³é›†åˆã¨ãªã£ã¦ã„ã¾ã™ï¼Ž
+Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
+º£¡¤¤¢¤Ê¤¿¤¬Ìܤˤ·¤Æ¤¤¤ë¤Î¤ÏTtk¤Î¥Æ¡¼¥Þ²½¥é¥Ù¥ë¤Ç¡¤\
+²¼¤Ë¤ÏTtk¤Î¥é¥Ù¥ë¥Õ¥ì¡¼¥à¤ÎÃæ¤Ë»°¤Ä¤Î¥°¥ë¡¼¥×¤ÎTtk¥¦¥£¥¸¥§¥Ã¥È¤¬\
+ɽ¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
+ºÇ½é¤Î¥°¥ë¡¼¥×¤ÏÁ´¤Æ¥Ü¥¿¥ó¤Ç¤¢¤ê¡¤\
+¤½¤ì¤¾¤ì¥¯¥ê¥Ã¥¯¤¹¤ì¤Ð¸½ºß¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Æ¡¼¥Þ¤¬ÀßÄꤵ¤ì¤Þ¤¹¡¥
+£²ÈÖÌܤΥ°¥ë¡¼¥×¤Ï»°¤Ä¤Î¥Á¥§¥Ã¥¯¥Ü¥¿¥ó½¸¹ç¤Ç¤¹¡¥\
+³Æ½¸¹ç¤Î´Ö¤Ë¤Ï¡¤¥»¥Ñ¥ì¡¼¥¿¥¦¥£¥¸¥§¥Ã¥È¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡¥\
+¤Ê¤ª¡ÖÍ­¸ú²½¡×¥Ü¥¿¥ó¤Ï¡¤¤³¤Î¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥ÈÆâ¤Î\
+¾¤Î¤¹¤Ù¤Æ¤Î¥Æ¡¼¥Þ²½¥¦¥£¥¸¥§¥Ã¥È¤Î¾õÂÖ(state)¤¬"disabled"¤«¤É¤¦¤«¤ò\
+¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥
+£³ÈÖÌܤΥ°¥ë¡¼¥×¤Ï´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥é¥¸¥ª¥Ü¥¿¥ó½¸¹ç¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
EOL
## Add buttons for setting the theme
-buttons = Ttk::Labelframe.new(base_frame, :text=>'ボタン')
+buttons = Ttk::Labelframe.new(base_frame, :text=>'¥Ü¥¿¥ó')
# Ttk::Style.theme_names.each{|theme|
# Ttk::Button.new(buttons, :text=>theme,
# :command=>proc{Ttk::Style.theme_use theme}).pack(:pady=>2)
@@ -66,9 +66,9 @@ def setState(root, value, *excepts)
end
## Set up the checkbutton group
-checks = Ttk::Labelframe.new(base_frame, :text=>'ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³')
+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,
((enabled.bool)? "!disabled" : "disabled"),
@@ -84,15 +84,15 @@ tomato = TkVariable.new
basil = TkVariable.new
oregano = TkVariable.new
-c1 = Ttk::Checkbutton.new(checks, :text=>'ãƒãƒ¼ã‚º', :variable=>cheese)
-c2 = Ttk::Checkbutton.new(checks, :text=>'トマト', :variable=>tomato)
-c3 = Ttk::Checkbutton.new(checks, :text=>'ãƒã‚¸ãƒ«', :variable=>basil)
-c4 = Ttk::Checkbutton.new(checks, :text=>'オレガノ', :variable=>oregano)
+c1 = Ttk::Checkbutton.new(checks, :text=>'¥Á¡¼¥º', :variable=>cheese)
+c2 = Ttk::Checkbutton.new(checks, :text=>'¥È¥Þ¥È', :variable=>tomato)
+c3 = Ttk::Checkbutton.new(checks, :text=>'¥Ð¥¸¥ë', :variable=>basil)
+c4 = Ttk::Checkbutton.new(checks, :text=>'¥ª¥ì¥¬¥Î', :variable=>oregano)
Tk.pack(e, sep1, c1, c2, sep2, c3, c4, :fill=>:x, :pady=>2)
## Set up the radiobutton group
-radios = Ttk::Labelframe.new(base_frame, :text=>'ラジオボタン')
+radios = Ttk::Labelframe.new(base_frame, :text=>'¥é¥¸¥ª¥Ü¥¿¥ó')
happyness = TkVariable.new
@@ -114,18 +114,18 @@ 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=>'変数å‚ç…§',
+ Ttk::Button.new(frame, :text=>'ÊÑ¿ô»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{
- showVars(base_frame, ['有効化', enabled],
- ['ãƒãƒ¼ã‚º', cheese], ['トマト', tomato],
- ['ãƒã‚¸ãƒ«', basil], ['オレガノ', oregano],
- ['幸ç¦åº¦', happyness])
+ showVars(base_frame, ['Í­¸ú²½', enabled],
+ ['¥Á¡¼¥º', cheese], ['¥È¥Þ¥È', tomato],
+ ['¥Ð¥¸¥ë', basil], ['¥ª¥ì¥¬¥Î', oregano],
+ ['¹¬Ê¡ÅÙ', happyness])
}),
- Ttk::Button.new(frame, :text=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'ttkbut'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $ttkbut_demo
diff --git a/ext/tk/sample/demos-jp/ttkmenu.rb b/ext/tk/sample/demos-jp/ttkmenu.rb
index aa9db5019f..9e78678c8e 100644
--- a/ext/tk/sample/demos-jp/ttkmenu.rb
+++ b/ext/tk/sample/demos-jp/ttkmenu.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ttkmenu.rb --
#
@@ -22,21 +22,21 @@ base_frame = Ttk::Frame.new($ttkmenu_demo).pack(:fill=>:both, :expand=>true)
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
-Ttkã¨ã¯ï¼Œãƒ†ãƒ¼ãƒžæŒ‡å®šå¯èƒ½ãªæ–°ã—ã„ウィジェット集åˆã§ã™ï¼Ž\
-ã“れã«ã‚ˆã‚Šãƒ†ãƒ¼ãƒžã«å¯¾å¿œã™ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã£ãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ã²ã¨ã¤ã«\
-メニューボタンãŒã‚りã¾ã™ï¼Ž\
-以下ã§ã¯ï¼Œãƒ†ãƒ¼ãƒžã«å¯¾å¿œã—ãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒœã‚¿ãƒ³ãŒã„ãã¤ã‹è¡¨ç¤ºã•れã¦ã„ã¾ã™ï¼Ž\
-ãれらを使ã£ã¦ï¼Œç¾åœ¨ä½¿ç”¨ä¸­ã®ãƒ†ãƒ¼ãƒžã‚’変更ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ï¼Ž\
-テーマã®é¸æŠžãŒãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒœã‚¿ãƒ³è‡ªèº«ã®è¦‹æŽ›ã‘を変化ã•ã›ã‚‹æ§˜å­ã‚„,\
-中央ã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒœã‚¿ãƒ³ã ã‘ãŒç•°ãªã‚‹ã‚¹ã‚¿ã‚¤ãƒ«\
-(ツールãƒãƒ¼ã§ã®ä¸€èˆ¬çš„ãªè¡¨ç¤ºã«é©ã—ãŸã‚‚ã®)ã§è¡¨ç¤ºã•れã¦ã„る様å­ã«\
-注目ã—ã¦ãã ã•ã„.\
-ãªãŠï¼Œãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒœã‚¿ãƒ³ã«ã¤ã„ã¦ã¯ãƒ†ãƒ¼ãƒžã«å¯¾å¿œã—ãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãŒã‚りã¾ã™ãŒï¼Œ\
-メニューã«ã¤ã„ã¦ã¯ãƒ†ãƒ¼ãƒžã«å¯¾å¿œã—ãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¯å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“.\
-ãã®ç†ç”±ã¯ï¼Œæ¨™æº–ã®Tkã®ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãŒ\
-ã™ã¹ã¦ã®ãƒ—ラットホームã§å分ã«è‰¯å¥½ãªè¦‹æŽ›ã‘ã¨æ“作性をæŒã£ã¦ã„る,\
-特ã«ï¼Œå¤šãã®ç’°å¢ƒã§ãã®ç’°å¢ƒæœ¬æ¥ã®æ“作体系ã¨ãªã‚‹ã‚ˆã†ã«å®Ÿè£…ã•れã¦ã„ã‚‹ã¨\
-判断ã•れãŸã“ã¨ã«ã‚ˆã‚Šã¾ã™ï¼Ž
+Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
+¤³¤ì¤Ë¤è¤ê¥Æ¡¼¥Þ¤ËÂбþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¥¦¥£¥¸¥§¥Ã¥È¤Î¤Ò¤È¤Ä¤Ë\
+¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤¬¤¢¤ê¤Þ¤¹¡¥\
+°Ê²¼¤Ç¤Ï¡¤¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤¬¤¤¤¯¤Ä¤«É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥\
+¤½¤ì¤é¤ò»È¤Ã¤Æ¡¤¸½ºß»ÈÍÑÃæ¤Î¥Æ¡¼¥Þ¤òÊѹ¹¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡¥\
+¥Æ¡¼¥Þ¤ÎÁªÂò¤¬¥á¥Ë¥å¡¼¥Ü¥¿¥ó¼«¿È¤Î¸«³Ý¤±¤òÊѲ½¤µ¤»¤ëÍͻҤ䡤\
+Ãæ±û¤Î¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤À¤±¤¬°Û¤Ê¤ë¥¹¥¿¥¤¥ë\
+(¥Ä¡¼¥ë¥Ð¡¼¤Ç¤Î°ìÈÌŪ¤Êɽ¼¨¤ËŬ¤·¤¿¤â¤Î)¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ëÍͻҤË\
+ÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡¥\
+¤Ê¤ª¡¤¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤Ë¤Ä¤¤¤Æ¤Ï¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥¦¥£¥¸¥§¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¤¬¡¤\
+¥á¥Ë¥å¡¼¤Ë¤Ä¤¤¤Æ¤Ï¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥¦¥£¥¸¥§¥Ã¥È¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡¥\
+¤½¤ÎÍýͳ¤Ï¡¤É¸½à¤ÎTk¤Î¥á¥Ë¥å¡¼¥¦¥£¥¸¥§¥Ã¥È¤¬\
+¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç½½Ê¬¤ËÎɹ¥¤Ê¸«³Ý¤±¤ÈÁàºîÀ­¤ò»ý¤Ã¤Æ¤¤¤ë¡¤\
+ÆÃ¤Ë¡¤Â¿¤¯¤Î´Ä¶­¤Ç¤½¤Î´Ä¶­ËÜÍè¤ÎÁàºîÂηϤȤʤë¤è¤¦¤Ë¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¤È\
+ȽÃǤµ¤ì¤¿¤³¤È¤Ë¤è¤ê¤Þ¤¹¡¥
EOL
Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
@@ -46,10 +46,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'ttkmenu'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkmenu_demo.destroy
@@ -60,12 +60,12 @@ Ttk::Frame.new($ttkmenu_demo) {|frame|
pack(:side=>:bottom, :fill=>:x)
}
-b1 = Ttk::Menubutton.new(base_frame,:text=>'ãƒ†ãƒ¼ãƒžã‚’é¸æŠž',:direction=>:above)
-b2 = Ttk::Menubutton.new(base_frame,:text=>'ãƒ†ãƒ¼ãƒžã‚’é¸æŠž',:direction=>:left)
-b3 = Ttk::Menubutton.new(base_frame,:text=>'ãƒ†ãƒ¼ãƒžã‚’é¸æŠž',:direction=>:right)
-b4 = Ttk::Menubutton.new(base_frame,:text=>'ãƒ†ãƒ¼ãƒžã‚’é¸æŠž',:direction=>:flush,
+b1 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:above)
+b2 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:left)
+b3 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:right)
+b4 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:flush,
:style=>Ttk::Menubutton.style('Toolbutton'))
-b5 = Ttk::Menubutton.new(base_frame,:text=>'ãƒ†ãƒ¼ãƒžã‚’é¸æŠž',:direction=>:below)
+b5 = Ttk::Menubutton.new(base_frame,:text=>'¥Æ¡¼¥Þ¤òÁªÂò',:direction=>:below)
b1.menu(m1 = Tk::Menu.new(b1, :tearoff=>false))
b2.menu(m2 = Tk::Menu.new(b2, :tearoff=>false))
diff --git a/ext/tk/sample/demos-jp/ttknote.rb b/ext/tk/sample/demos-jp/ttknote.rb
index f3b2fa5881..f0cd258893 100644
--- a/ext/tk/sample/demos-jp/ttknote.rb
+++ b/ext/tk/sample/demos-jp/ttknote.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ttknote.rb --
#
@@ -23,10 +23,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'ttknote'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttknote_demo.destroy
@@ -48,31 +48,31 @@ notebook.enable_traversal
f_msg = Ttk::Frame.new(notebook)
msg_m = Ttk::Label.new(f_msg, :font=>$font, :wraplength=>'5i',
:justify=>:left, :anchor=>'n', :text=><<EOL)
-Ttkã¨ã¯ï¼Œãƒ†ãƒ¼ãƒžæŒ‡å®šå¯èƒ½ãªæ–°ã—ã„ウィジェット集åˆã§ã™ï¼Ž\
-ãã®ä¸­ã«å«ã¾ã‚Œã‚‹ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ã²ã¨ã¤ã«ãƒŽãƒ¼ãƒˆãƒ–ックウィジェットãŒã‚りã¾ã™ï¼Ž\
-ノートブックウィジェットã¯ï¼Œ\
-個別ã®å†…容をæŒã£ãŸãƒ‘ãƒãƒ«ã‹ã‚‰ã®é¸æŠžã‚’å¯èƒ½ã«ã™ã‚‹ã‚ˆã†ãª\
-タブã®é›†åˆï¼ˆã‚¿ãƒ–セット)を定ã‚ã¾ã™ï¼Ž\
-ã‚¿ãƒ–ã‚»ãƒƒãƒˆã¯æœ€è¿‘ã®å¤šãã®ãƒ¦ãƒ¼ã‚¶ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ェースã§è¦‹ã‚‰ã‚Œã‚‹æ©Ÿèƒ½ã§ã™ï¼Ž\
-タブã®é¸æŠžã¯ï¼Œãƒžã‚¦ã‚¹ã«ã‚ˆã‚‹ã ã‘ã§ãªã,\
-ノートブックウィジェットã®ãƒšãƒ¼ã‚¸ã®è¦‹å‡ºã—ãŒé¸æŠžã•れã¦ã„る時ã§ã‚れã°\
-Ctrl+Tabキーã®å…¥åŠ›ã«ã‚ˆã£ã¦ã‚‚行ã†ã“ã¨ãŒã§ãã¾ã™ï¼Ž\
-ã“ã®ãƒ‡ãƒ¢ã§ã¯ï¼Œè¦‹å‡ºã—ã§ä¸‹ç·šä»˜ãã®æ–‡å­—ã®ã‚­ãƒ¼ã¨Altキーã¨ã‚’組ã¿åˆã‚ã›ã‚‹ã“ã¨ã§\
-ãƒšãƒ¼ã‚¸ã‚’é¸æŠžã™ã‚‹ã“ã¨ãŒã§ãるよã†ã«ã‚‚設定ã—ã¦ã„ã¾ã™ï¼Ž\
-ãŸã ã—,2番目ã®ã‚¿ãƒ–ã¯ç„¡åŠ¹åŒ–ã•れã¦é¸æŠžã§ããªã„よã†ã«ãªã£ã¦ã„ã‚‹ã“ã¨ã«ã¯\
-注æ„ã—ã¦ãã ã•ã„.
+Ttk¤È¤Ï¡¤¥Æ¡¼¥Þ»ØÄê²Äǽ¤Ê¿·¤·¤¤¥¦¥£¥¸¥§¥Ã¥È½¸¹ç¤Ç¤¹¡¥\
+¤½¤ÎÃæ¤Ë´Þ¤Þ¤ì¤ë¥¦¥£¥¸¥§¥Ã¥È¤Î¤Ò¤È¤Ä¤Ë¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤¬¤¢¤ê¤Þ¤¹¡¥\
+¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤Ï¡¤\
+¸ÄÊÌ¤ÎÆâÍÆ¤ò»ý¤Ã¤¿¥Ñ¥Í¥ë¤«¤é¤ÎÁªÂò¤ò²Äǽ¤Ë¤¹¤ë¤è¤¦¤Ê\
+¥¿¥Ö¤Î½¸¹ç¡Ê¥¿¥Ö¥»¥Ã¥È¡Ë¤òÄê¤á¤Þ¤¹¡¥\
+¥¿¥Ö¥»¥Ã¥È¤ÏºÇ¶á¤Î¿¤¯¤Î¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Ç¸«¤é¤ì¤ëµ¡Ç½¤Ç¤¹¡¥\
+¥¿¥Ö¤ÎÁªÂò¤Ï¡¤¥Þ¥¦¥¹¤Ë¤è¤ë¤À¤±¤Ç¤Ê¤¯¡¤\
+¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È¤Î¥Ú¡¼¥¸¤Î¸«½Ð¤·¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë»þ¤Ç¤¢¤ì¤Ð\
+Ctrl+Tab¥­¡¼¤ÎÆþÎϤˤè¤Ã¤Æ¤â¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥\
+¤³¤Î¥Ç¥â¤Ç¤Ï¡¤¸«½Ð¤·¤Ç²¼ÀþÉÕ¤­¤Îʸ»ú¤Î¥­¡¼¤ÈAlt¥­¡¼¤È¤òÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç\
+¥Ú¡¼¥¸¤òÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤âÀßÄꤷ¤Æ¤¤¤Þ¤¹¡¥\
+¤¿¤À¤·¡¤£²ÈÖÌܤΥ¿¥Ö¤Ï̵¸ú²½¤µ¤ì¤ÆÁªÂò¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤Ë¤Ï\
+Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥
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 = 'ã‚ã,ãã®ã¨ãŠã‚Šã•...'
+ neat.value = '¤¢¤¡¡¤¤½¤Î¤È¤ª¤ê¤µ¡¥¡¥¡¥'
Tk.after_cancel(after_id) if after_id
after_id = Tk.after(500){neat.value = ''}
})
msg_b.winfo_toplevel.bind('Alt-n'){ msg_b.focus; msg_b.invoke }
msg_l = Ttk::Label.new(f_msg, :textvariable=>neat)
-notebook.add(f_msg, :text=>'説明(Description)', :underline=>3, :padding=>2)
+notebook.add(f_msg, :text=>'ÀâÌÀ(Description)', :underline=>3, :padding=>2)
Tk.grid(msg_m, '-', :sticky=>'new', :pady=>2)
Tk.grid(msg_b, msg_l, :pady=>[2, 4], :padx=>20)
msg_b.grid_configure(:sticky=>'e')
@@ -82,11 +82,11 @@ f_msg.grid_columnconfigure([0, 1], :weight=>1, :uniform=>1)
## Populate the second pane. Note that the content doesn't really matter
f_disabled = Ttk::Frame.new(notebook)
-notebook.add(f_disabled, :text=>'無効化ã•れãŸã‚¿ãƒ–', :state=>:disabled)
+notebook.add(f_disabled, :text=>'̵¸ú²½¤µ¤ì¤¿¥¿¥Ö', :state=>:disabled)
## Popuplate the third pane
f_editor = Ttk::Frame.new(notebook)
-notebook.add(f_editor, :text=>'テキストエディタ(Text Editor)', :underline=>9)
+notebook.add(f_editor, :text=>'¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿(Text Editor)', :underline=>9)
editor_t = Tk::Text.new(f_editor, :width=>40, :height=>10, :wrap=>:char)
if Tk.windowingsystem != 'aqua'
editor_s = editor_t.yscrollbar(Ttk::Scrollbar.new(f_editor))
diff --git a/ext/tk/sample/demos-jp/ttkpane.rb b/ext/tk/sample/demos-jp/ttkpane.rb
index a5c1a08ec9..a7b458a683 100644
--- a/ext/tk/sample/demos-jp/ttkpane.rb
+++ b/ext/tk/sample/demos-jp/ttkpane.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ttkpane.rb --
#
@@ -21,9 +21,9 @@ base_frame = TkFrame.new($ttkpane_demo).pack(:fill=>:both, :expand=>true)
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
-ã“ã®ãƒ‡ãƒ¢ã¯ï¼ŒåŸ‹ã‚è¾¼ã¿é–¢ä¿‚ã«ã‚るテーマ付ãペインドウィンドウを示ã—ã¦ã„ã¾ã™ï¼Ž\
-ãれãžã‚Œã®å¤§ãã•ã¯ï¼Œå«ã¾ã‚Œã¦ã„るペインã®é–“ã«ã‚るエリアをã¤ã‹ã‚“ã§\
-境界をドラッグã™ã‚‹ã“ã¨ã§å¤‰æ›´ã§ãã¾ã™ï¼Ž
+¤³¤Î¥Ç¥â¤Ï¡¤Ëä¤á¹þ¤ß´Ø·¸¤Ë¤¢¤ë¥Æ¡¼¥ÞÉÕ¤­¥Ú¥¤¥ó¥É¥¦¥£¥ó¥É¥¦¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡¥\
+¤½¤ì¤¾¤ì¤ÎÂ礭¤µ¤Ï¡¤´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ú¥¤¥ó¤Î´Ö¤Ë¤¢¤ë¥¨¥ê¥¢¤ò¤Ä¤«¤ó¤Ç\
+¶­³¦¤ò¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡¥
EOL
Ttk::Separator.new(base_frame).pack(:side=>:top, :fill=>:x)
@@ -33,10 +33,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'ttkpane'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkpane_demo.destroy
@@ -52,19 +52,19 @@ frame = Ttk::Frame.new(base_frame).pack(:fill=>:both, :expand=>true)
outer = Ttk::Panedwindow.new(frame, :orient=>:horizontal)
outer.add(in_left = Ttk::Panedwindow.new(outer, :orient=>:vertical))
outer.add(in_right = Ttk::Panedwindow.new(outer, :orient=>:vertical))
-in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'ボタン'))
-in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'時計'))
-in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'プログレス'))
-in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'テキスト'))
+in_left.add(left_top = Ttk::Labelframe.new(in_left, :text=>'¥Ü¥¿¥ó'))
+in_left.add(left_bot = Ttk::Labelframe.new(in_left, :text=>'»þ·×'))
+in_right.add(right_top = Ttk::Labelframe.new(in_right, :text=>'¥×¥í¥°¥ì¥¹'))
+in_right.add(right_bot = Ttk::Labelframe.new(in_right, :text=>'¥Æ¥­¥¹¥È'))
if Tk.windowingsystem == 'aqua'
[left_top, left_bot, right_top, right_bot].each{|w| w.padding(3) }
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=>'ã„ã¦ã¦ï¼',
+ :message=>'¤¤¤Æ¤Æ¡ª',
:detail=>'That hurt...', :parent=>base_frame,
:title=>'Button Pressed')
}).pack(:padx=>2, :pady=>5)
diff --git a/ext/tk/sample/demos-jp/ttkprogress.rb b/ext/tk/sample/demos-jp/ttkprogress.rb
index ec28253a9f..82898bf50e 100644
--- a/ext/tk/sample/demos-jp/ttkprogress.rb
+++ b/ext/tk/sample/demos-jp/ttkprogress.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# ttkprogress.rb --
#
@@ -21,16 +21,16 @@ base_frame = TkFrame.new($ttkprogress_demo).pack(:fill=>:both, :expand=>true)
Ttk::Label.new(base_frame, :font=>$font, :wraplength=>'4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top, :fill=>:x)
-下ã«ã‚ã‚‹ã®ã¯äºŒã¤ã®ãƒ—ログレスãƒãƒ¼ã§ã™ï¼Ž\
-上ã®ã‚‚ã®ã¯"determinate"タイプã®ãƒ—ログレスãƒãƒ¼ã§ï¼Œ\
-例ãˆã°ãƒ—ログラムãŒä¸Žãˆã‚‰ã‚ŒãŸã‚¿ã‚¹ã‚¯ã‚’終了ã™ã‚‹ã¾ã§ã«ã©ã®ãらã„ã‹ã‹ã‚‹ã‹ã‚’\
-示ã™ã¨ããªã©ã«ç”¨ã„られã¾ã™ï¼Ž\
-下ã®ã‚‚ã®ã¯"indeterminate"タイプã®ãƒ—ログレスãƒãƒ¼ã§ï¼Œ\
-例ãˆã°ãƒ—ログラムãŒå®Ÿè¡Œä¸­(busy)ã§ã‚ã‚‹ã‚‚ã®ã®\
-終了ã¾ã§ã«ã©ã‚Œãらã„ã‹ã‹ã‚‹ã‹ã¯åˆ†ã‹ã‚‰ãªã„ã¨ã„ã†çŠ¶æ…‹ã‚’\
-示ã™ã¨ããªã©ã«ç”¨ã„られã¾ã™ï¼Ž\
-ã„ãšã‚Œã®ãƒ—ログレスãƒãƒ¼ã‚‚,ã™ã下ã«ã‚るボタンを使ã†ã“ã¨ã§\
-自動アニメーションモードã®ON/OFFを切替ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ž
+²¼¤Ë¤¢¤ë¤Î¤ÏÆó¤Ä¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¤¹¡¥\
+¾å¤Î¤â¤Î¤Ï"determinate"¥¿¥¤¥×¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¡¤\
+Î㤨¤Ð¥×¥í¥°¥é¥à¤¬Í¿¤¨¤é¤ì¤¿¥¿¥¹¥¯¤ò½ªÎ»¤¹¤ë¤Þ¤Ç¤Ë¤É¤Î¤¯¤é¤¤¤«¤«¤ë¤«¤ò\
+¼¨¤¹¤È¤­¤Ê¤É¤ËÍѤ¤¤é¤ì¤Þ¤¹¡¥\
+²¼¤Î¤â¤Î¤Ï"indeterminate"¥¿¥¤¥×¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç¡¤\
+Î㤨¤Ð¥×¥í¥°¥é¥à¤¬¼Â¹ÔÃæ(busy)¤Ç¤¢¤ë¤â¤Î¤Î\
+½ªÎ»¤Þ¤Ç¤Ë¤É¤ì¤¯¤é¤¤¤«¤«¤ë¤«¤Ïʬ¤«¤é¤Ê¤¤¤È¤¤¤¦¾õÂÖ¤ò\
+¼¨¤¹¤È¤­¤Ê¤É¤ËÍѤ¤¤é¤ì¤Þ¤¹¡¥\
+¤¤¤º¤ì¤Î¥×¥í¥°¥ì¥¹¥Ð¡¼¤â¡¤¤¹¤°²¼¤Ë¤¢¤ë¥Ü¥¿¥ó¤ò»È¤¦¤³¤È¤Ç\
+¼«Æ°¥¢¥Ë¥á¡¼¥·¥ç¥ó¥â¡¼¥É¤ÎON/OFF¤òÀÚÂØ¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
EOL
## See Code / Dismiss buttons
@@ -38,10 +38,10 @@ 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=>'コードå‚ç…§',
+ Ttk::Button.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'ttkprogress'}),
- Ttk::Button.new(frame, :text=>'é–‰ã˜ã‚‹',
+ Ttk::Button.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
$ttkprogress_demo.destroy
diff --git a/ext/tk/sample/demos-jp/twind.rb b/ext/tk/sample/demos-jp/twind.rb
index f13a137cc3..bd0b060754 100644
--- a/ext/tk/sample/demos-jp/twind.rb
+++ b/ext/tk/sample/demos-jp/twind.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# text (embedded windows) widget demo (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($twind_demo) && $twind_demo
$twind_demo.destroy
$twind_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$twind_demo = TkToplevel.new {|w|
title("Text Demonstration - Embedded Windows")
iconname("Embedded Windows")
@@ -18,11 +18,11 @@ $twind_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($twind_demo).pack(:fill=>:both, :expand=>true)
-# frame 生æˆ
+# frame À¸À®
$twind_buttons = TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc{
tmppath = $twind_demo
$twind_demo = nil
@@ -31,13 +31,13 @@ $twind_buttons = TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc{showCode 'twind'}
}.pack('side'=>'left', 'expand'=>'yes')
}
$twind_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
$twind_text = nil
TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
'relief'=>'sunken') {|f|
@@ -51,7 +51,7 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
}.pack('expand'=>'yes', 'fill'=>'both')
}.pack('expand'=>'yes', 'fill'=>'both')
-# タグ生æˆ
+# ¥¿¥°À¸À®
$tag_center = TkTextTag.new($twind_text,
'justify' =>'center',
'spacing1'=>'5m',
@@ -64,70 +64,70 @@ $tag_buttons = TkTextTag.new($twind_text,
'spacing2'=>0,
'spacing3'=>0 )
-# テキストã®ç”Ÿæˆ
+# ¥Æ¥­¥¹¥È¤ÎÀ¸À®
$twind_text.insert('end',
- 'テキストwidget上ã«ä»–ã®widgetを組ã¿è¾¼ã‚€ã“ã¨ãŒã§ãã¾ã™ã€‚')
+ '¥Æ¥­¥¹¥Èwidget¾å¤Ë¾¤Îwidget¤òÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
$twind_text.insert('end',
- '組ã¿è¾¼ã¿ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¨å‘¼ã°ã‚Œã€ä»»æ„ã®widgetãŒå¯èƒ½ã§ã™ã€‚')
+ 'ÁȤ߹þ¤ß¥¦¥£¥ó¥É¥¦¤È¸Æ¤Ð¤ì¡¢Ç¤°Õ¤Îwidget¤¬²Äǽ¤Ç¤¹¡£')
$twind_text.insert('end',
- '例ãˆã°ã€ã“ã“ã«2ã¤ã®ãƒœã‚¿ãƒ³widgetãŒçµ„ã¿è¾¼ã¾ã‚Œã¦ã„ã¾ã™ã€‚')
-$twind_text.insert('end', '最åˆã®ãƒœã‚¿ãƒ³ã‚’クリックã™ã¨æ°´å¹³æ–¹å‘ã®ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã‚’')
+ 'Î㤨¤Ð¡¢¤³¤³¤Ë2¤Ä¤Î¥Ü¥¿¥ówidget¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£')
+$twind_text.insert('end', 'ºÇ½é¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤È¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò')
TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
#text 'ON'
- text 'オン'
+ text '¥ª¥ó'
command proc{textWindOn $twind_text,$twind_buttons}
cursor 'top_left_arrow'
})
-$twind_text.insert('end', "ã«ã—ã¾ã™ã€‚ã¾ãŸ2ã¤ã‚ã®ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã¨\n")
-$twind_text.insert('end', '水平方å‘ã®ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã‚’')
+$twind_text.insert('end', "¤Ë¤·¤Þ¤¹¡£¤Þ¤¿2¤Ä¤á¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È\n")
+$twind_text.insert('end', '¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò')
TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
#text 'OFF'
- text 'オフ'
+ text '¥ª¥Õ'
command proc{textWindOff $twind_text}
cursor 'top_left_arrow'
})
-$twind_text.insert('end', 'ã«ã—ã¾ã™ã€‚')
+$twind_text.insert('end', '¤Ë¤·¤Þ¤¹¡£')
-$twind_text.insert('end', 'ã‚‚ã†ã²ã¨ã¤ã®ä¾‹ã§ã™ã€‚')
+$twind_text.insert('end', '¤â¤¦¤Ò¤È¤Ä¤ÎÎã¤Ç¤¹¡£')
TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
- text 'ã“ã“をクリック'
+ text '¤³¤³¤ò¥¯¥ê¥Ã¥¯'
command proc{textWindPlot $twind_text}
cursor 'top_left_arrow'
})
-$twind_text.insert('end', 'ã™ã‚‹ã¨ã€x-yプロットãŒã“ã“ã«ç¾ã‚Œã¾ã™ã€‚')
+$twind_text.insert('end', '¤¹¤ë¤È¡¢x-y¥×¥í¥Ã¥È¤¬¤³¤³¤Ë¸½¤ì¤Þ¤¹¡£')
$mark_plot = TkTextMark.new($twind_text, 'insert')
$mark_plot.gravity='left'
-$twind_text.insert('end', 'マウスã§ãƒ‡ãƒ¼ã‚¿ã‚’æç”»ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚')
+$twind_text.insert('end', '¥Þ¥¦¥¹¤Ç¥Ç¡¼¥¿¤òÉÁ²è¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {
- text '消去'
+ text '¾Ãµî'
command proc{textWindDel $twind_text}
cursor 'top_left_arrow'
})
-$twind_text.insert('end', 'をクリックã™ã‚‹ã¨å…ƒã«æˆ»ã‚Šã¾ã™ã€‚
+$twind_text.insert('end', '¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¸µ¤ËÌá¤ê¤Þ¤¹¡£
')
-$twind_text.insert('end', '組ã¿è¾¼ã¿ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã ã‘をテキストwidget上ã«ã€å®Ÿéš›ã®')
-$twind_text.insert('end', 'テキストã¯ãªã—ã§çµ„ã¿è¾¼ã‚€ã“ã¨ã¯ä¾¿åˆ©ã§ã™ã€‚')
-$twind_text.insert('end', 'ã“ã®å ´åˆã¯ã€ãƒ†ã‚­ã‚¹ãƒˆwidgetã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£ã®')
-$twind_text.insert('end', 'よã†ã«å‹•作ã—ã¾ã™ã€‚例ãˆã°ã€ã“ã“ã«ã¯ãƒ†ã‚­ã‚¹ãƒˆwidgetã«')
-$twind_text.insert('end', 'よã£ã¦ãƒœã‚¿ãƒ³ãŒãれã„ã«ä¸¦ã¹ã‚‰ã‚Œã¦ã„ã¾ã™ã€‚')
-$twind_text.insert('end', 'ã“れらã®ãƒœã‚¿ãƒ³ã§èƒŒæ™¯è‰²ã‚’変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™')
-$twind_text.insert('end', '("Default"ã§å…ƒã®è‰²ã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã™)。')
-$twind_text.insert('end', '"Short"ã¨ã„ã†ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã¨æ–‡å­—列ã®é•·ã•ãŒ')
-$twind_text.insert('end', '変ã‚りã¾ã™ã€‚ã™ã‚‹ã¨è‡ªå‹•çš„ã«ãƒ†ã‚­ã‚¹ãƒˆwidgetãŒ')
-$twind_text.insert('end', 'レイアウトを整ãˆã¦ãれã¾ã™ã€‚')
-$twind_text.insert('end', 'ã‚‚ã†ä¸€åº¦åŒã˜ãƒœã‚¿ãƒ³ã‚’押ã™ã¨å…ƒã«æˆ»ã‚Šã¾ã™ã€‚
+$twind_text.insert('end', 'ÁȤ߹þ¤ß¥¦¥£¥ó¥É¥¦¤À¤±¤ò¥Æ¥­¥¹¥Èwidget¾å¤Ë¡¢¼ÂºÝ¤Î')
+$twind_text.insert('end', '¥Æ¥­¥¹¥È¤Ï¤Ê¤·¤ÇÁȤ߹þ¤à¤³¤È¤ÏÊØÍø¤Ç¤¹¡£')
+$twind_text.insert('end', '¤³¤Î¾ì¹ç¤Ï¡¢¥Æ¥­¥¹¥Èwidget¤Ï¥¦¥£¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Î')
+$twind_text.insert('end', '¤è¤¦¤Ëưºî¤·¤Þ¤¹¡£Î㤨¤Ð¡¢¤³¤³¤Ë¤Ï¥Æ¥­¥¹¥Èwidget¤Ë')
+$twind_text.insert('end', '¤è¤Ã¤Æ¥Ü¥¿¥ó¤¬¤­¤ì¤¤¤Ëʤ٤é¤ì¤Æ¤¤¤Þ¤¹¡£')
+$twind_text.insert('end', '¤³¤ì¤é¤Î¥Ü¥¿¥ó¤ÇÇØ·Ê¿§¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹')
+$twind_text.insert('end', '("Default"¤Ç¸µ¤Î¿§¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ¤¹)¡£')
+$twind_text.insert('end', '"Short"¤È¤¤¤¦¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤Èʸ»úÎó¤ÎŤµ¤¬')
+$twind_text.insert('end', 'ÊѤï¤ê¤Þ¤¹¡£¤¹¤ë¤È¼«Æ°Åª¤Ë¥Æ¥­¥¹¥Èwidget¤¬')
+$twind_text.insert('end', '¥ì¥¤¥¢¥¦¥È¤òÀ°¤¨¤Æ¤¯¤ì¤Þ¤¹¡£')
+$twind_text.insert('end', '¤â¤¦°ìÅÙÆ±¤¸¥Ü¥¿¥ó¤ò²¡¤¹¤È¸µ¤ËÌá¤ê¤Þ¤¹¡£
')
TkTextWindow.new($twind_text, 'end',
'window'=>TkButton.new($twind_text) {|b|
- text 'デフォルト'
+ text '¥Ç¥Õ¥©¥ë¥È'
command proc{embDefBg $twind_text}
cursor 'top_left_arrow'
$tag_buttons.add('end')
@@ -163,7 +163,7 @@ TkTextWindow.new($twind_text, 'end',
'pady'=>2 )
}
-# メソッド定義
+# ¥á¥½¥Ã¥ÉÄêµÁ
def textWindOn (w,f)
if defined? $twind_scroll
begin
diff --git a/ext/tk/sample/demos-jp/twind2.rb b/ext/tk/sample/demos-jp/twind2.rb
index a783ba4738..96000b0e14 100644
--- a/ext/tk/sample/demos-jp/twind2.rb
+++ b/ext/tk/sample/demos-jp/twind2.rb
@@ -1,15 +1,15 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# text (embedded windows) widget demo 2 (called by 'widget')
#
-# toplevel widget ãŒå­˜åœ¨ã™ã‚Œã°å‰Šé™¤ã™ã‚‹
+# toplevel widget ¤¬Â¸ºß¤¹¤ì¤Ðºï½ü¤¹¤ë
if defined?($twind2_demo) && $twind2_demo
$twind2_demo.destroy
$twind2_demo = nil
end
-# demo 用㮠toplevel widget を生æˆ
+# demo ÍѤΠtoplevel widget ¤òÀ¸À®
$twind2_demo = TkToplevel.new {|w|
title("Text Demonstration - Embedded Windows 2")
iconname("Embedded Windows")
@@ -18,15 +18,15 @@ $twind2_demo = TkToplevel.new {|w|
base_frame = TkFrame.new($twind2_demo).pack(:fill=>:both, :expand=>true)
-# frame 生æˆ
+# frame À¸À®
$twind2_buttons = TkFrame.new(base_frame) {|frame|
TkGrid(TkFrame.new(frame, :height=>2, :relief=>:sunken, :bd=>2),
:columnspan=>4, :row=>0, :sticky=>'ew', :pady=>2)
TkGrid('x',
- TkButton.new(frame, :text=>'コードå‚ç…§',
+ TkButton.new(frame, :text=>'¥³¡¼¥É»²¾È',
:image=>$image['view'], :compound=>:left,
:command=>proc{showCode 'twind2'}),
- TkButton.new(frame, :text=>'é–‰ã˜ã‚‹',
+ TkButton.new(frame, :text=>'ÊĤ¸¤ë',
:image=>$image['delete'], :compound=>:left,
:command=>proc{
tmppath = $twind2_demo
@@ -39,7 +39,7 @@ $twind2_buttons = TkFrame.new(base_frame) {|frame|
}
$twind2_buttons.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
-# frame 生æˆ
+# frame À¸À®
$twind2_text = nil
TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
'relief'=>'sunken') {|f|
@@ -54,7 +54,7 @@ TkFrame.new(base_frame, 'highlightthickness'=>2, 'borderwidth'=>2,
}.pack('expand'=>'yes', 'fill'=>'both')
}.pack('expand'=>'yes', 'fill'=>'both')
-# タグ生æˆ
+# ¥¿¥°À¸À®
$tag2_center = TkTextTag.new($twind2_text,
'justify' =>'center',
'spacing1'=>'5m',
@@ -67,82 +67,82 @@ $tag2_buttons = TkTextTag.new($twind2_text,
'spacing2'=>0,
'spacing3'=>0 )
-# テキストã®ç”Ÿæˆ
-$twind2_text.insert('end', 'テキストウィジェットã«ã¯è‰²ã€…ãªç¨®é¡žã®ã‚¢ã‚¤ãƒ†ãƒ ')
-$twind2_text.insert('end', '(動的ãªã‚‚ã®ã‚„é™çš„ãªã‚‚ã®ã®ä¸¡æ–¹ãŒã‚りã¾ã™ï¼‰ã‚’')
-$twind2_text.insert('end', '数多ãå«ã‚ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãã†ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã¯')
-$twind2_text.insert('end', '行替ãˆã€ã‚¿ãƒ–ã€ä¸­å¤®æƒãˆãªã©ã®æ§˜ã€…ãªæ–¹æ³•ã§')
-$twind2_text.insert('end', 'é…ç½®ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚')
-$twind2_text.insert('end', '加ãˆã¦ã€ãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®å†…容物ãŒ')
-$twind2_text.insert('end', 'ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚µã‚¤ã‚ºã«æ¯”ã¹ã¦å¤§ãã™ãŽã‚‹å ´åˆã§ã‚‚')
-$twind2_text.insert('end', 'ã™ã¹ã¦ã®æ–¹å‘ã«ã‚¹ãƒ ãƒ¼ã‚ºã«ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã•ã›ã¦')
-$twind2_text.insert('end', '確èªã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚')
+# ¥Æ¥­¥¹¥È¤ÎÀ¸À®
+$twind2_text.insert('end', '¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ë¤Ï¿§¡¹¤Ê¼ïÎà¤Î¥¢¥¤¥Æ¥à')
+$twind2_text.insert('end', '¡ÊưŪ¤Ê¤â¤Î¤äÀÅŪ¤Ê¤â¤Î¤ÎξÊý¤¬¤¢¤ê¤Þ¤¹¡Ë¤ò')
+$twind2_text.insert('end', '¿ô¿¤¯´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤¦¤·¤¿¥¢¥¤¥Æ¥à¤Ï')
+$twind2_text.insert('end', '¹ÔÂØ¤¨¡¢¥¿¥Ö¡¢Ãæ±û·¤¨¤Ê¤É¤ÎÍÍ¡¹¤ÊÊýË¡¤Ç')
+$twind2_text.insert('end', 'ÇÛÃÖ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
+$twind2_text.insert('end', '²Ã¤¨¤Æ¡¢¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÎÆâÍÆÊª¤¬')
+$twind2_text.insert('end', '¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤ËÈæ¤Ù¤ÆÂ礭¤¹¤®¤ë¾ì¹ç¤Ç¤â')
+$twind2_text.insert('end', '¤¹¤Ù¤Æ¤ÎÊý¸þ¤Ë¥¹¥à¡¼¥º¤Ë¥¹¥¯¥í¡¼¥ë¤µ¤»¤Æ')
+$twind2_text.insert('end', '³Îǧ¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£')
$twind2_text.insert('end', "\n\n")
-$twind2_text.insert('end', 'テキストウィジェット上ã«ã¯ä»–ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’')
-$twind2_text.insert('end', 'å«ã‚ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ã“ã†ã—ãŸã‚‚ã®ã¯')
-$twind2_text.insert('end', '「埋ã‚è¾¼ã¿ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã€ã¨å‘¼ã°ã‚Œã€ãã®ä¸­ã«')
-$twind2_text.insert('end', 'ã„ã‹ãªã‚‹ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã§ã‚‚è©°ã‚込むã“ã¨ãŒã§ãã¾ã™ã€‚')
-$twind2_text.insert('end', '例ãˆã°ï¼Œã“ã“ã«ã¯ï¼’ã¤ã®')
-$twind2_text.insert('end', 'ボタンウィジェットãŒåŸ‹ã‚è¾¼ã¾ã‚Œã¦ã„ã¾ã™ã€‚')
-$twind2_text.insert('end', '最åˆã®ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã¨ã€')
-$twind2_text.insert('end', '水平方å‘ã®ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã‚’ ')
+$twind2_text.insert('end', '¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¾å¤Ë¤Ï¾¤Î¥¦¥£¥¸¥§¥Ã¥È¤ò')
+$twind2_text.insert('end', '´Þ¤á¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤¦¤·¤¿¤â¤Î¤Ï')
+$twind2_text.insert('end', '¡ÖËä¤á¹þ¤ß¥¦¥£¥ó¥É¥¦¡×¤È¸Æ¤Ð¤ì¡¢¤½¤ÎÃæ¤Ë')
+$twind2_text.insert('end', '¤¤¤«¤Ê¤ë¥¦¥£¥¸¥§¥Ã¥È¤Ç¤âµÍ¤á¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
+$twind2_text.insert('end', 'Î㤨¤Ð¡¤¤³¤³¤Ë¤Ï£²¤Ä¤Î')
+$twind2_text.insert('end', '¥Ü¥¿¥ó¥¦¥£¥¸¥§¥Ã¥È¤¬Ëä¤á¹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£')
+$twind2_text.insert('end', 'ºÇ½é¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢')
+$twind2_text.insert('end', '¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò ')
TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
#text 'ON'
- text 'オン'
+ text '¥ª¥ó'
command proc{textWindOn2 $twind2_text,$twind2_buttons}
cursor 'top_left_arrow'
})
-$twind2_text.insert('end', "ã«ã—ã¾ã™ã€‚ã¾ãŸã€ï¼’ã¤ã‚ã®ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã¨\n")
-$twind2_text.insert('end', '水平方å‘ã®ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã‚’')
+$twind2_text.insert('end', "¤Ë¤·¤Þ¤¹¡£¤Þ¤¿¡¢£²¤Ä¤á¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È\n")
+$twind2_text.insert('end', '¿åÊ¿Êý¸þ¤Î¥¹¥¯¥í¡¼¥ë¤ò')
TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
#text 'OFF'
- text 'オフ'
+ text '¥ª¥Õ'
command proc{textWindOff2 $twind2_text}
cursor 'top_left_arrow'
})
-$twind2_text.insert('end', "ã«ã—ã¾ã™ã€‚\n\n")
+$twind2_text.insert('end', "¤Ë¤·¤Þ¤¹¡£\n\n")
-$twind2_text.insert('end', '次ã¯ã‚‚ã†ã²ã¨ã¤ã®ä¾‹ã§ã™ã€‚')
+$twind2_text.insert('end', '¼¡¤Ï¤â¤¦¤Ò¤È¤Ä¤ÎÎã¤Ç¤¹¡£')
TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
- text 'ã“ã“をクリック'
+ text '¤³¤³¤ò¥¯¥ê¥Ã¥¯'
command proc{textWindPlot2 $twind2_text}
cursor 'top_left_arrow'
})
-$twind2_text.insert('end', 'ã™ã‚‹ã¨ã€x-yプロットãŒã“ã“ã«ç¾ã‚Œã¾ã™ã€‚')
+$twind2_text.insert('end', '¤¹¤ë¤È¡¢x-y¥×¥í¥Ã¥È¤¬¤³¤³¤Ë¸½¤ì¤Þ¤¹¡£')
$mark2_plot = TkTextMark.new($twind2_text, 'insert')
$mark2_plot.gravity='left'
-$twind2_text.insert('end', 'マウスã§ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã§ã€')
-$twind2_text.insert('end', 'プロット上ã®ãƒ‡ãƒ¼ã‚¿ç‚¹ã‚’移動ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚')
+$twind2_text.insert('end', '¥Þ¥¦¥¹¤Ç¥É¥é¥Ã¥°¤¹¤ë¤³¤È¤Ç¡¢')
+$twind2_text.insert('end', '¥×¥í¥Ã¥È¾å¤Î¥Ç¡¼¥¿ÅÀ¤ò°Üư¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
TkTextWindow.new($twind2_text, 'end',
'window'=>TkButton.new($twind2_text) {
- text '消去'
+ text '¾Ãµî'
command proc{textWindDel2 $twind2_text}
cursor 'top_left_arrow'
})
-$twind2_text.insert('end', 'をクリックã™ã‚‹ã¨å…ƒã«æˆ»ã‚Šã¾ã™ã€‚')
+$twind2_text.insert('end', '¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¸µ¤ËÌá¤ê¤Þ¤¹¡£')
$twind2_text.insert('end', "\n\n")
-$twind2_text.insert('end', '表示ã™ã‚‹ãƒ†ã‚­ã‚¹ãƒˆãªã—ã«åŸ‹ã‚è¾¼ã¿ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã ã‘ã‚’')
-$twind2_text.insert('end', 'テキストウィジェットã«å«ã‚ã‚‹ã“ã¨ã‚‚有用ã§ã—ょã†ã€‚')
-$twind2_text.insert('end', 'ã“ã®å ´åˆã€ãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã¯')
-$twind2_text.insert('end', 'ジオメトリマãƒãƒ¼ã‚¸ãƒ£ã®ã‚ˆã†ã«åƒãã¾ã™ã€‚')
-$twind2_text.insert('end', '例ãˆã°ã€ã“ã“ã«ã¯ãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã«')
-$twind2_text.insert('end', 'よã£ã¦ãƒœã‚¿ãƒ³ãŒãれã„ã«æ•´åˆ—ã—ã¦é…ç½®ã•れã¦ã„ã¾ã™ã€‚')
-$twind2_text.insert('end', 'ã“れらã®ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã“ã¨ã§ã€')
-$twind2_text.insert('end', 'ã“ã®ãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®èƒŒæ™¯è‰²ã‚’')
-$twind2_text.insert('end', '変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™("デフォルト"ボタンã§')
-$twind2_text.insert('end', 'å…ƒã®è‰²ã«æˆ»ã™ã“ã¨ãŒã§ãã¾ã™)。')
-$twind2_text.insert('end', '"Short"ã¨ã„ã†ãƒœã‚¿ãƒ³ã‚’クリックã™ã‚‹ã¨æ–‡å­—列ã®é•·ã•ãŒ')
-$twind2_text.insert('end', '変ã‚りã€ãƒ†ã‚­ã‚¹ãƒˆã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆãŒè‡ªå‹•çš„ã«')
-$twind2_text.insert('end', 'レイアウトを整ãˆã‚‹æ§˜å­ã‚’見るã“ã¨ãŒã§ãã¾ã™ã€‚')
-$twind2_text.insert('end', 'ã‚‚ã†ä¸€åº¦åŒã˜ãƒœã‚¿ãƒ³ã‚’押ã™ã¨å…ƒã«æˆ»ã‚Šã¾ã™ã€‚')
+$twind2_text.insert('end', 'ɽ¼¨¤¹¤ë¥Æ¥­¥¹¥È¤Ê¤·¤ËËä¤á¹þ¤ß¥¦¥£¥ó¥É¥¦¤À¤±¤ò')
+$twind2_text.insert('end', '¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ë´Þ¤á¤ë¤³¤È¤âÍ­ÍѤǤ·¤ç¤¦¡£')
+$twind2_text.insert('end', '¤³¤Î¾ì¹ç¡¢¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ï')
+$twind2_text.insert('end', '¥¸¥ª¥á¥È¥ê¥Þ¥Í¡¼¥¸¥ã¤Î¤è¤¦¤ËƯ¤­¤Þ¤¹¡£')
+$twind2_text.insert('end', 'Î㤨¤Ð¡¢¤³¤³¤Ë¤Ï¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ë')
+$twind2_text.insert('end', '¤è¤Ã¤Æ¥Ü¥¿¥ó¤¬¤­¤ì¤¤¤ËÀ°Îó¤·¤ÆÇÛÃÖ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£')
+$twind2_text.insert('end', '¤³¤ì¤é¤Î¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤Ç¡¢')
+$twind2_text.insert('end', '¤³¤Î¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÎÇØ·Ê¿§¤ò')
+$twind2_text.insert('end', 'ÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹("¥Ç¥Õ¥©¥ë¥È"¥Ü¥¿¥ó¤Ç')
+$twind2_text.insert('end', '¸µ¤Î¿§¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ¤¹)¡£')
+$twind2_text.insert('end', '"Short"¤È¤¤¤¦¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤Èʸ»úÎó¤ÎŤµ¤¬')
+$twind2_text.insert('end', 'ÊѤï¤ê¡¢¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤¬¼«Æ°Åª¤Ë')
+$twind2_text.insert('end', '¥ì¥¤¥¢¥¦¥È¤òÀ°¤¨¤ëÍͻҤò¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£')
+$twind2_text.insert('end', '¤â¤¦°ìÅÙÆ±¤¸¥Ü¥¿¥ó¤ò²¡¤¹¤È¸µ¤ËÌá¤ê¤Þ¤¹¡£')
$twind2_text.insert('end', "\n")
btn_default = TkButton.new($twind2_text) {|b|
- text 'デフォルト'
+ text '¥Ç¥Õ¥©¥ë¥È'
command proc{embDefBg2 $twind2_text}
cursor 'top_left_arrow'
}
@@ -184,8 +184,8 @@ $text_normal2['border'] = $twind2_text.cget('borderwidth')
$text_normal2['highlight'] = $twind2_text.cget('highlightthickness')
$text_normal2['pad'] = $twind2_text.cget('padx')
-$twind2_text.insert('end', "\nborder width ã‚„ highlightthickness, ")
-$twind2_text.insert('end', "padding を通常ã®å€¤ã‹ã‚‰å¤‰æ›´ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n")
+$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",
@@ -229,8 +229,8 @@ TkTextWindow.new($twind2_text, 'end',
textWinSmallP2 $twind2_text
}))
-$twind2_text.insert('end', "\n\næ›´ã«ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚‚テキストウィジェットã«")
-$twind2_text.insert('end', "ã†ã¾ãé…ç½®ã§ãã¾ã™ï¼š")
+$twind2_text.insert('end', "\n\n¹¹¤Ë¥¤¥á¡¼¥¸¤â¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤Ë")
+$twind2_text.insert('end', "¤¦¤Þ¤¯ÇÛÃ֤Ǥ­¤Þ¤¹¡§")
TkTextImage.new($twind2_text, 'end',
'image'=>TkBitmapImage.new(:file=>[
@@ -238,7 +238,7 @@ TkTextImage.new($twind2_text, 'end',
'images', 'face.xbm'
].join(File::Separator)))
-# メソッド定義
+# ¥á¥½¥Ã¥ÉÄêµÁ
def textWinBigB2(w)
w.borderwidth 15
end
diff --git a/ext/tk/sample/demos-jp/unicodeout.rb b/ext/tk/sample/demos-jp/unicodeout.rb
index 31596cf8fd..4857cd131d 100644
--- a/ext/tk/sample/demos-jp/unicodeout.rb
+++ b/ext/tk/sample/demos-jp/unicodeout.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
#
# unicodeout.rb --
#
@@ -23,41 +23,41 @@ base_frame = TkFrame.new($unicodeout_demo).pack(:fill=>:both, :expand=>true)
TkLabel.new(base_frame,
:font=>$font, :wraplength=>'5.4i', :justify=>:left,
:text=><<EOL).pack(:side=>:top)
-ã“れã¯ï¼ŒTkã«ãŠã‘ã‚‹éžæ¬§ç±³æ–‡å­—集åˆã‚’用ã„る言語ã«å¯¾ã™ã‚‹ã‚µãƒãƒ¼ãƒˆã«ã¤ã„ã¦ã®\
-サンプルã§ã™ï¼ŽãŸã ã—,下ã®è¡¨ç¤ºã«ãŠã„ã¦ã‚ãªãŸãŒå®Ÿéš›ã«ã©ã®ã‚ˆã†ãªè¡¨ç¤ºã‚’\
-ç›®ã«ã™ã‚‹ã‹ã¯ï¼Œã‚ãªãŸã®ç’°å¢ƒã«ã©ã®ã‚ˆã†ãªæ–‡å­—集åˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•れã¦ã„ã‚‹ã‹ã«\
-大ããä¾å­˜ã—ã¾ã™ï¼Žã¾ãŸï¼Œå¯¾è±¡ã¨ãªã‚‹æ–‡å­—集åˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•れã¦ã„ãªã„å ´åˆã«\
-ã©ã®ã‚ˆã†ãªè¡¨ç¤ºãŒãªã•れるã‹ã‚‚ã‚ãªãŸã®ç’°å¢ƒæ¬¡ç¬¬ã§ã™ï¼Ž\
-「コードå‚ç…§ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ã‚½ãƒ¼ã‚¹ã‚’表示ã—,\
-Unicodeout_SampleFrameクラスã®@@fontã®å®šç¾©ã‚’æ›¸ãæ›ãˆã¦\
-(ファイルã®å†…容ã¯å¤‰æ›´ã•れã¾ã›ã‚“)\
-「å†å®Ÿè¡Œã€ãƒœã‚¿ãƒ³ã®ã‚¯ãƒªãƒƒã‚¯ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„.
-スクリプトãŒå¯æ¬æ€§ã‚’æŒã¤ã‚ˆã†ã«ï¼Œæ–‡å­—列ã¯\\uXXXXã¨ã„ã†\
-Tclã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—表ç¾ã‚’用ã„ãŸUNICODEæ–‡å­—åˆ—ã§æ›¸ã‹ã‚Œã¦ã„ã¾ã™ï¼Ž\
-文字列ã¯ï¼ŒTk::UTF8_Stringメソッドã«ã‚ˆã£ã¦ï¼Œ\
-「UTF8å½¢å¼ã®æ–‡å­—列ã§ã‚ã‚‹ã€ã¨ã„ã†\
-エンコード情報付ãã®æ–‡å­—列オブジェクト\
-(Tclã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—表ç¾ã®å¤‰æ›æ¸ˆã¿)ã«å¤‰æ›ã—ã¦\
-ãƒ©ãƒ™ãƒ«ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã«æ¸¡ã—ã¦ã„ã‚‹ç‚¹ã«æ³¨æ„ã—ã¦ãã ã•ã„.
+¤³¤ì¤Ï¡¤Tk¤Ë¤ª¤±¤ëÈó²¤ÊÆÊ¸»ú½¸¹ç¤òÍѤ¤¤ë¸À¸ì¤ËÂФ¹¤ë¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤Î\
+¥µ¥ó¥×¥ë¤Ç¤¹¡¥¤¿¤À¤·¡¤²¼¤Îɽ¼¨¤Ë¤ª¤¤¤Æ¤¢¤Ê¤¿¤¬¼ÂºÝ¤Ë¤É¤Î¤è¤¦¤Êɽ¼¨¤ò\
+Ìܤˤ¹¤ë¤«¤Ï¡¤¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¤É¤Î¤è¤¦¤Êʸ»ú½¸¹ç¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤Ë\
+Â礭¤¯°Í¸¤·¤Þ¤¹¡¥¤Þ¤¿¡¤ÂоݤȤʤëʸ»ú½¸¹ç¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë\
+¤É¤Î¤è¤¦¤Êɽ¼¨¤¬¤Ê¤µ¤ì¤ë¤«¤â¤¢¤Ê¤¿¤Î´Ä¶­¼¡Âè¤Ç¤¹¡¥\
+¡Ö¥³¡¼¥É»²¾È¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¥½¡¼¥¹¤òɽ¼¨¤·¡¤\
+Unicodeout_SampleFrame¥¯¥é¥¹¤Î@@font¤ÎÄêµÁ¤ò½ñ¤­´¹¤¨¤Æ\
+(¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤ÏÊѹ¹¤µ¤ì¤Þ¤»¤ó)\
+¡ÖºÆ¼Â¹Ô¡×¥Ü¥¿¥ó¤Î¥¯¥ê¥Ã¥¯¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡¥
+¥¹¥¯¥ê¥×¥È¤¬²ÄÈÂÀ­¤ò»ý¤Ä¤è¤¦¤Ë¡¤Ê¸»úÎó¤Ï\\uXXXX¤È¤¤¤¦\
+Tcl¤Î¥¨¥¹¥±¡¼¥×ɽ¸½¤òÍѤ¤¤¿UNICODEʸ»úÎó¤Ç½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡¥\
+ʸ»úÎó¤Ï¡¤Tk::UTF8_String¥á¥½¥Ã¥É¤Ë¤è¤Ã¤Æ¡¤\
+¡ÖUTF8·Á¼°¤Îʸ»úÎó¤Ç¤¢¤ë¡×¤È¤¤¤¦\
+¥¨¥ó¥³¡¼¥É¾ðÊóÉÕ¤­¤Îʸ»úÎ󥪥֥¸¥§¥¯¥È\
+(Tcl¤Î¥¨¥¹¥±¡¼¥×ɽ¸½¤ÎÊÑ´¹ºÑ¤ß)¤ËÊÑ´¹¤·¤Æ\
+¥é¥Ù¥ë¥¦¥£¥¸¥§¥Ã¥È¤ËÅϤ·¤Æ¤¤¤ëÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥
EOL
#'
TkFrame.new(base_frame){|f|
pack(:side=>:bottom, :fill=>:x, :pady=>'2m')
- TkButton.new(f, :text=>'é–‰ã˜ã‚‹', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'ÊĤ¸¤ë', :width=>15, :command=>proc{
$unicodeout_demo.destroy
$unicodeout_demo = nil
}).pack(:side=>:left, :expand=>true)
- TkButton.new(f, :text=>'コードå‚ç…§', :width=>15, :command=>proc{
+ TkButton.new(f, :text=>'¥³¡¼¥É»²¾È', :width=>15, :command=>proc{
showCode 'unicodeout'
}).pack(:side=>:left, :expand=>true)
}
wait_msg = TkLabel.new(base_frame,
- :text=>"フォント読ã¿è¾¼ã¿ã®å®Œäº†ã¾ã§" +
- "ã—ã°ã‚‰ããŠå¾…ã¡ä¸‹ã•ã„...",
+ :text=>"¥Õ¥©¥ó¥ÈÆÉ¤ß¹þ¤ß¤Î´°Î»¤Þ¤Ç" +
+ "¤·¤Ð¤é¤¯¤ªÂÔ¤Á²¼¤µ¤¤¡¥¡¥¡¥",
:font=>"Helvetica 12 italic").pack
class Unicodeout_SampleFrame < TkFrame
diff --git a/ext/tk/sample/demos-jp/vscale.rb b/ext/tk/sample/demos-jp/vscale.rb
index 6ae513bc33..a1097fd77f 100644
--- a/ext/tk/sample/demos-jp/vscale.rb
+++ b/ext/tk/sample/demos-jp/vscale.rb
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
require "tkcanvas"
if defined?($vscale_demo) && $vscale_demo
@@ -18,17 +18,17 @@ msg = TkLabel.new(base_frame) {
font $font
wraplength '3.5i'
justify 'left'
-# text "下ã«ã¯çŸ¢å°ãŒ1ã¤ã¨ä¹—ç›´ãªã‚¹ã‚±ãƒ¼ãƒ«ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚\
-#スケール上ã§ãƒžã‚¦ã‚¹ãƒœã‚¿ãƒ³1をクリックã€ã¾ãŸã¯ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã¨\
-#矢å°ã®é•·ã•を変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
- text "ã«ã¯ãƒãƒ¼ã¨ç¸¦åž‹ã®ã‚¹ã‚±ãƒ¼ãƒ«ãŒè¡¨ç¤ºã•れã¦ã„ã¾ã™ã€‚スケールã§ãƒžã‚¦ã‚¹ã®ãƒœã‚¿ãƒ³1 をクリックã™ã‚‹ã‹ãƒ‰ãƒ©ãƒƒã‚°ã—ã¦ãƒãƒ¼ã®é«˜ã•を変ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚終ã£ãŸã‚‰ã€Œäº†è§£ã€ãƒœã‚¿ãƒ³ã‚’押ã—ã¦ãã ã•ã„。"
+# text "²¼¤Ë¤ÏÌð°õ¤¬1¤Ä¤È¾èľ¤Ê¥¹¥±¡¼¥ë¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\
+#¥¹¥±¡¼¥ë¾å¤Ç¥Þ¥¦¥¹¥Ü¥¿¥ó1¤ò¥¯¥ê¥Ã¥¯¡¢¤Þ¤¿¤Ï¥É¥é¥Ã¥°¤¹¤ë¤È\
+#Ìð°õ¤ÎŤµ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
+ text "¤Ë¤Ï¥Ð¡¼¤È½Ä·¿¤Î¥¹¥±¡¼¥ë¤¬É½¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥¹¥±¡¼¥ë¤Ç¥Þ¥¦¥¹¤Î¥Ü¥¿¥ó1 ¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤«¥É¥é¥Ã¥°¤·¤Æ¥Ð¡¼¤Î¹â¤µ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£½ª¤Ã¤¿¤é¡Öλ²ò¡×¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£"
}
msg.pack('side'=>'top', 'padx'=>'.5c')
TkFrame.new(base_frame) {|frame|
TkButton.new(frame) {
- #text '了解'
- text 'é–‰ã˜ã‚‹'
+ #text 'λ²ò'
+ text 'ÊĤ¸¤ë'
command proc {
tmppath = $vscale_demo
$vscale_demo = nil
@@ -37,7 +37,7 @@ TkFrame.new(base_frame) {|frame|
}.pack('side'=>'left', 'expand'=>'yes')
TkButton.new(frame) {
- text 'コードå‚ç…§'
+ text '¥³¡¼¥É»²¾È'
command proc { showCode 'vscale' }
}.pack('side'=>'left', 'expand'=>'yes')
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index 5f5dfb9d70..dfaa9c004e 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# -*- coding: euc-jp -*-
-# 漢字コード設定 ( tk.rb ã®ãƒ­ãƒ¼ãƒ‰æ™‚ã® encoding 推定/設定ã«ä½¿ã‚れる )
+# ´Á»ú¥³¡¼¥ÉÀßÄê ( tk.rb ¤Î¥í¡¼¥É»þ¤Î encoding ¿äÄê/ÀßÄê¤Ë»È¤ï¤ì¤ë )
#if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
unless defined?(::Encoding.default_external)
$KCODE = 'euc'
@@ -9,28 +9,28 @@ else
DEFAULT_TK_ENCODING = 'EUC-JP'
end
-# tk 関係ライブラリã®èª­ã¿è¾¼ã¿
+# tk ´Ø·¸¥é¥¤¥Ö¥é¥ê¤ÎÆÉ¤ß¹þ¤ß
require 'tk'
# require 'tkafter'
$RubyTk_WidgetDemo = true
-# widget demo directory ä½ç½®ã®ç²å¾—
+# widget demo directory °ÌÃÖ¤Î³ÍÆÀ
# $demo_dir = File.dirname($0)
$demo_dir = File.dirname(__FILE__)
-# root ã®ç”Ÿæˆ
+# root ¤ÎÀ¸À®
$root = TkRoot.new{title "Ruby/Tk Widget Demonstration"}
-# tk ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®å–å¾—
+# tk ¥Ð¡¼¥¸¥ç¥ó¤Î¼èÆÀ
$tk_version = Tk::TK_VERSION
$tk_major_ver, $tk_minor_ver = $tk_version.split('.').map{|n| n.to_i}
$tk_patchlevel = Tk::TK_PATCHLEVEL
-# tcl_platform 情報ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚ªãƒ–ジェクト
+# tcl_platform ¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¥ª¥Ö¥¸¥§¥¯¥È
$tk_platform = TkVarAccess.new('tcl_platform')
-# フォント設定
+# ¥Õ¥©¥ó¥ÈÀßÄê
#######
case($tk_version)
when /^4.*/
@@ -64,7 +64,7 @@ else
end
#######
-# イメージ設定
+# ¥¤¥á¡¼¥¸ÀßÄê
$image = {}
if $tk_major_ver >= 8
@@ -123,18 +123,18 @@ $image['print'] = TkPhotoImage.new(:height=>19, :format=>'GIF', :data=><<EOD)
EOD
end
-# メニュー設定
+# ¥á¥Ë¥å¡¼ÀßÄê
if $tk_major_ver >= 8
- $root.add_menubar([[['File', 0],
+ $root.add_menubar([[['File', 0],
['About ... ', proc{aboutBox}, 0, '<F1>'],
- '---',
+ '---',
['Quit', proc{exit}, 0, 'Ctrl-Q']
]])
else
- TkMenubar.new($root,
- [[['File', 0],
+ TkMenubar.new($root,
+ [[['File', 0],
['About ... ', proc{aboutBox}, 0, '<F1>'],
- '---',
+ '---',
['Quit', proc{exit}, 0, 'Ctrl-Q']
]]).pack('side'=>'top', 'fill'=>'x')
end
@@ -154,7 +154,7 @@ TkFrame.new($root){|frame|
}.pack('side'=>'top', 'fill'=>'x')
=end
-# テキストボックスã®ç”Ÿæˆ
+# ¥Æ¥­¥¹¥È¥Ü¥Ã¥¯¥¹¤ÎÀ¸À®
if $tk_version =~ /^4\.[01]/
scr = TkScrollbar.new($root, 'orient'=>'vertical')
txt = TkText.new($root) {
@@ -171,7 +171,7 @@ if $tk_version =~ /^4\.[01]/
txt.pack('expand'=>'yes', 'fill'=>'both')
else
textFrame = TkFrame.new($root)
- scr = TkScrollbar.new($root, 'orient'=>'vertical',
+ scr = TkScrollbar.new($root, 'orient'=>'vertical',
'highlightthickness'=>0, 'takefocus'=>1) {
pack('in'=>textFrame, 'side'=>'right', 'fill'=>'y', 'padx'=>1)
}
@@ -206,16 +206,16 @@ else
statusfont = 'Helvetica 10'
end
$statusBarLabel = \
- TkLabel.new(f, 'text'=>" ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
+ TkLabel.new(f, 'text'=>" ", 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
'font'=>statusfont) \
.pack('side'=>'left', 'padx'=>2, 'expand'=>'yes', 'fill'=>'both')
- TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
+ TkLabel.new(f, 'width'=>8, 'relief'=>'sunken', 'bd'=>1, 'anchor'=>'w',
'font'=>statusfont) \
.pack('side'=>'left', 'padx'=>2)
}.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>2)
end
-# テキストタグ設定
+# ¥Æ¥­¥¹¥È¥¿¥°ÀßÄê
if $tk_version =~ /^4.*/
tag_title = TkTextTag.new(txt, 'font'=>'-*-Helvetica-Bold-R-Normal--*-180-*-*-*-*-*-*')
else
@@ -228,23 +228,23 @@ tag_middle = TkTextTag.new(txt, 'font'=>$kanji_font)
tag_demospace = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c')
if TkWinfo.depth($root) == 1
- tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'underline'=>1)
- $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'underline'=>1)
tag_hot = TkTextTag.new(txt, 'background'=>'black', 'foreground'=>'white')
else
- tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ tag_demo = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'foreground'=>'blue', 'underline'=>1)
- $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
+ $tag_visited = TkTextTag.new(txt, 'lmargin1'=>'1c', 'lmargin2'=>'1c',
'foreground'=>'#303080', 'underline'=>1)
-# tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
+# tag_hot = TkTextTag.new(txt, 'relief'=>'raised', 'borderwidth'=>1,
# 'background'=>'SeaGreen3')
tag_hot = TkTextTag.new(txt, 'borderwidth'=>1, 'foreground'=>'red')
end
#tag_demo.bind('Button-1', proc{invoke txt, txt.index('current')})
-tag_demo.bind('ButtonRelease-1',
+tag_demo.bind('ButtonRelease-1',
proc{|x,y|invoke txt, txt.index("@#{x},#{y}")}, '%x %y')
lastLine = TkVariable.new("")
@@ -255,7 +255,7 @@ tag_demo.bind('Enter', proc{|x,y|
showStatus txt, txt.index("@#{x},#{y}")
},
'%x %y')
-tag_demo.bind('Leave',
+tag_demo.bind('Leave',
proc{
tag_hot.remove('1.0','end')
txt.configure('cursor','xterm')
@@ -266,10 +266,10 @@ tag_demo.bind('Motion', proc{|x, y|
if newLine.value != lastLine.value
tag_hot.remove('1.0','end')
lastLine.value = newLine.value
- if ( txt.tag_names("@#{x},#{y}").find{|t|
+ if ( txt.tag_names("@#{x},#{y}").find{|t|
t.kind_of?(String) && t =~ /^demo-/
} )
- tag_hot.add(lastLine.value,
+ tag_hot.add(lastLine.value,
"#{lastLine.value} lineend -1 chars")
end
end
@@ -277,267 +277,267 @@ tag_demo.bind('Motion', proc{|x, y|
},
'%x %y')
-# テキスト生æˆ
+# ¥Æ¥­¥¹¥ÈÀ¸À®
txt.insert('end', 'Ruby/Tk : Widget', tag_title)
-#txt.insert('end', " デモンストレーション\n", tag_middle)
-txt.insert('end', " デモンストレーション\n", tag_kanji_title)
+#txt.insert('end', " ¥Ç¥â¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó\n", tag_middle)
+txt.insert('end', " ¥Ç¥â¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó\n", tag_kanji_title)
txt.insert('end', <<"EOT")
-ã“ã®ã‚¢ãƒ—リケーションã¯ã€Tk Widget を用ã„ã¦ã©ã®ã‚ˆã†ãªã“ã¨ãŒã§ãã‚‹ã‹\
-を示ã™ãŸã‚ã®ã€ã„ãã¤ã‹ã®å°ã•ãªã‚¹ã‚¯ãƒªãƒ—トã«å¯¾ã™ã‚‹ãƒ•ロントエンドをæ\
-ä¾›ã—ã¦ã„ã¾ã™ã€‚以下ã«é †ç•ªã«æŒ™ã’られã¦ã„るデモンストレーションを実行\
-ã™ã‚‹ã«ã¯ãƒžã‚¦ã‚¹ã§ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„。デモンストレーションã®ã‚¦ã‚£ãƒ³\
-ドウãŒç¾ã‚Œã‚‹ã¨ã€ãƒ‡ãƒ¢ãƒ³ã‚¹ãƒˆãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’生æˆã—㟠Ruby/Tk ã®ã‚³ãƒ¼ãƒ‰ã‚’見\
-ã‚‹ãŸã‚ã«ã€"コードå‚ç…§"ボタンをクリックã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚ãªãŸãŒ\
-望むãªã‚‰ã€ãã®ã‚³ãƒ¼ãƒ‰ã‚’修正ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚修正ã—ãŸã‚³ãƒ¼ãƒ‰ã§ãƒ‡ãƒ¢\
-ンストレーションをå†å®Ÿè¡Œã™ã‚‹ãŸã‚ã«ã¯ã€ã‚³ãƒ¼ãƒ‰ãŒæ›¸ã‹ã‚ŒãŸã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã«\
-ã‚ã‚‹"デモå†å®Ÿè¡Œ" ボタンをクリックã—ã¦ãã ã•ã„。\
-コードを修正ã—ã¦ã‚‚オリジナルã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒæ›¸ãæ›ãˆã‚‰ã‚Œã‚‹ã“ã¨ã¯\
-ã‚りã¾ã›ã‚“ã‹ã‚‰ã€å¿ƒé…ã›ãšã«è‰²ã€…ãªå¤‰æ›´ã‚’試ã—ã¦ã¿ã¦ãã ã•ã„。
-
-一部ã®ãƒ‡ãƒ¢ã§ã¯ã€æ¯”較的最近ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã® Tk ã§ãªã‘れã°ã‚µãƒãƒ¼ãƒˆã—ã¦\
-ã„ãªã„機能を使ã£ã¦å®Ÿè£…ã—ã¦ã„ã¾ã™(例ãˆã° Tk8.4 以上ãªã©)。ãã®ãŸã‚ã€\
-ãã†ã—ãŸæ©Ÿèƒ½ã‚’æŒãŸãªã„ Tk ライブラリを使ã£ã¦ã„ã‚‹å ´åˆã«ã¯ã€ãã†ã—ãŸ\
-ãƒ‡ãƒ¢ã¯æ­£ã—ãå‹•ãã¾ã›ã‚“。ãã®ã‚ˆã†ãªæ©Ÿèƒ½ãŒå¿…è¦ã§ã‚れã°ã€ãれをサãƒãƒ¼ãƒˆ\
-ã—ã¦ã„ã‚‹ Tk ライブラリを使ã†ã‚ˆã†ã« tcltklib をコンパイルã—ãªãŠã—ã¦\
-ãã ã•ã„。
-
-ã‚‚ã—ã‚ãªãŸã® Tk ㌠(最åˆã‹ã‚‰å«ã‚€ã‹ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ãŸã‹ã«ã‚ˆã‚Š) \
-Ttk (Tile) 拡張を利用ã§ãる状態ã§ã‚ã‚‹ãªã‚‰ã€\
-Ttk æ‹¡å¼µã®ãƒ‡ãƒ¢ (sample/tkextlib/tile/demo.rb) ã‚‚ãœã²è©¦ã—ã¦ã¿ã¦ãã ã•ã„。
-( 多分,ç¾åœ¨ã®ã‚ãªãŸã®ç’°å¢ƒã«ã¯ Ttk æ‹¡å¼µã¯\
+¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢Tk Widget ¤òÍѤ¤¤Æ¤É¤Î¤è¤¦¤Ê¤³¤È¤¬¤Ç¤­¤ë¤«\
+¤ò¼¨¤¹¤¿¤á¤Î¡¢¤¤¤¯¤Ä¤«¤Î¾®¤µ¤Ê¥¹¥¯¥ê¥×¥È¤ËÂФ¹¤ë¥Õ¥í¥ó¥È¥¨¥ó¥É¤òÄó\
+¶¡¤·¤Æ¤¤¤Þ¤¹¡£°Ê²¼¤Ë½çÈ֤˵󤲤é¤ì¤Æ¤¤¤ë¥Ç¥â¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó¤ò¼Â¹Ô\
+¤¹¤ë¤Ë¤Ï¥Þ¥¦¥¹¤Ç¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¥â¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó¤Î¥¦¥£¥ó\
+¥É¥¦¤¬¸½¤ì¤ë¤È¡¢¥Ç¥â¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó¤òÀ¸À®¤·¤¿ Ruby/Tk ¤Î¥³¡¼¥É¤ò¸«\
+¤ë¤¿¤á¤Ë¡¢"¥³¡¼¥É»²¾È"¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¢¤Ê¤¿¤¬\
+˾¤à¤Ê¤é¡¢¤½¤Î¥³¡¼¥É¤ò½¤Àµ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£½¤Àµ¤·¤¿¥³¡¼¥É¤Ç¥Ç¥â\
+¥ó¥¹¥È¥ì¡¼¥·¥ç¥ó¤òºÆ¼Â¹Ô¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¥³¡¼¥É¤¬½ñ¤«¤ì¤¿¥¦¥£¥ó¥É¥¦¤Ë\
+¤¢¤ë"¥Ç¥âºÆ¼Â¹Ô" ¥Ü¥¿¥ó¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£\
+¥³¡¼¥É¤ò½¤Àµ¤·¤Æ¤â¥ª¥ê¥¸¥Ê¥ë¤Î¥Õ¥¡¥¤¥ë¤¬½ñ¤­´¹¤¨¤é¤ì¤ë¤³¤È¤Ï\
+¤¢¤ê¤Þ¤»¤ó¤«¤é¡¢¿´ÇÛ¤»¤º¤Ë¿§¡¹¤ÊÊѹ¹¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
+
+°ìÉô¤Î¥Ç¥â¤Ç¤Ï¡¢Èæ³ÓŪºÇ¶á¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Tk ¤Ç¤Ê¤±¤ì¤Ð¥µ¥Ý¡¼¥È¤·¤Æ\
+¤¤¤Ê¤¤µ¡Ç½¤ò»È¤Ã¤Æ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹(Î㤨¤Ð Tk8.4 °Ê¾å¤Ê¤É)¡£¤½¤Î¤¿¤á¡¢\
+¤½¤¦¤·¤¿µ¡Ç½¤ò»ý¤¿¤Ê¤¤ Tk ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¤½¤¦¤·¤¿\
+¥Ç¥â¤ÏÀµ¤·¤¯Æ°¤­¤Þ¤»¤ó¡£¤½¤Î¤è¤¦¤Êµ¡Ç½¤¬É¬ÍפǤ¢¤ì¤Ð¡¢¤½¤ì¤ò¥µ¥Ý¡¼¥È\
+¤·¤Æ¤¤¤ë Tk ¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤è¤¦¤Ë tcltklib ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Ê¤ª¤·¤Æ\
+¤¯¤À¤µ¤¤¡£
+
+¤â¤·¤¢¤Ê¤¿¤Î Tk ¤¬ (ºÇ½é¤«¤é´Þ¤à¤«¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤«¤Ë¤è¤ê) \
+Ttk (Tile) ³ÈÄ¥¤òÍøÍѤǤ­¤ë¾õÂ֤Ǥ¢¤ë¤Ê¤é¡¢\
+Ttk ³ÈÄ¥¤Î¥Ç¥â (sample/tkextlib/tile/demo.rb) ¤â¤¼¤Ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
+( ¿ʬ¡¤¸½ºß¤Î¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¤Ï Ttk ³ÈÄ¥¤Ï\
#{
begin
require 'tkextlib/tile'
- "ã™ã§ã«å°Žå…¥ã•れã¦ã„ã¾ã™"
+ "¤¹¤Ç¤ËƳÆþ¤µ¤ì¤Æ¤¤¤Þ¤¹"
rescue
- "ã¾ã ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•れã¦ã„ã¾ã›ã‚“"
+ "¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
end
}\
-。)
-Ttk æ‹¡å¼µã¯ã€Tk8.5 以上ã§ã¯æ¨™æº–ã®æ©Ÿèƒ½ã¨ã—ã¦çµ„ã¿è¾¼ã¾ã‚Œã¦ã„ã¾ã™ã€‚
+¡£)
+Ttk ³ÈÄ¥¤Ï¡¢Tk8.5 °Ê¾å¤Ç¤Ïɸ½à¤Îµ¡Ç½¤È¤·¤ÆÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
EOT
-#txt.insert('end',"ラベル, ボタン, ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³, ラジオボタン\n",tag_middle)
-txt.insert('end', "ラベル, ボタン, ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³, ラジオボタン\n",
+#txt.insert('end',"¥é¥Ù¥ë, ¥Ü¥¿¥ó, ¥Á¥§¥Ã¥¯¥Ü¥¿¥ó, ¥é¥¸¥ª¥Ü¥¿¥ó\n",tag_middle)
+txt.insert('end', "¥é¥Ù¥ë, ¥Ü¥¿¥ó, ¥Á¥§¥Ã¥¯¥Ü¥¿¥ó, ¥é¥¸¥ª¥Ü¥¿¥ó\n",
tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. ラベル (テキスト, ビットマップ)\n",
+txt.insert('end', "1. ¥é¥Ù¥ë (¥Æ¥­¥¹¥È, ¥Ó¥Ã¥È¥Þ¥Ã¥×)\n",
tag_demo, "demo-label")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. ラベルã¨UNICODEテキスト (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-unicodeout")
+txt.insert('end', "2. ¥é¥Ù¥ë¤ÈUNICODE¥Æ¥­¥¹¥È (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-unicodeout")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ボタン \n", tag_demo, "demo-button")
+txt.insert('end', "3. ¥Ü¥¿¥ó \n", tag_demo, "demo-button")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ (è¤‡æ•°ã‚’é¸æŠžå¯èƒ½)\n",
+txt.insert('end', "4. ¥Á¥§¥Ã¥¯¥Ü¥¿¥ó (Ê£¿ô¤òÁªÂò²Äǽ)\n",
tag_demo, "demo-check")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. 3状態ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "5. £³¾õÂÖ¥Á¥§¥Ã¥¯¥Ü¥¿¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-check2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ラジオボタン (ä»»æ„ã®ä¸€ã¤ã‚’é¸æŠžå¯èƒ½)\n",
+txt.insert('end', "6. ¥é¥¸¥ª¥Ü¥¿¥ó (Ǥ°Õ¤Î°ì¤Ä¤òÁªÂò²Äǽ)\n",
tag_demo, "demo-radio")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. ラジオボタン (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "7. ¥é¥¸¥ª¥Ü¥¿¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-radio2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. 3状態ラジオボタン (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "8. £³¾õÂ֥饸¥ª¥Ü¥¿¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-radio3")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. ボタンã§ä½œã‚‰ã‚ŒãŸ15-パズルゲーム\n",
+txt.insert('end', "9. ¥Ü¥¿¥ó¤Çºî¤é¤ì¤¿15-¥Ñ¥º¥ë¥²¡¼¥à\n",
tag_demo, "demo-puzzle")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "10. ビットマップを使用ã—ãŸã‚¢ã‚¤ã‚³ãƒ³ãƒœã‚¿ãƒ³\n",
+txt.insert('end', "10. ¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò»ÈÍѤ·¤¿¥¢¥¤¥³¥ó¥Ü¥¿¥ó\n",
tag_demo, "demo-icon")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "11. ç”»åƒã‚’表示ã™ã‚‹äºŒã¤ã®ãƒ©ãƒ™ãƒ«\n",
+txt.insert('end', "11. ²èÁü¤òɽ¼¨¤¹¤ëÆó¤Ä¤Î¥é¥Ù¥ë\n",
tag_demo, "demo-image1")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "12. ç”»åƒã‚’見るãŸã‚ã®ç°¡å˜ãªãƒ¦ãƒ¼ã‚¶ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ェース\n",
+txt.insert('end', "12. ²èÁü¤ò¸«¤ë¤¿¤á¤Î´Êñ¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹\n",
tag_demo, "demo-image2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "13. ç”»åƒã‚’見るãŸã‚ã®ç°¡å˜ãªãƒ¦ãƒ¼ã‚¶ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ェース (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "13. ²èÁü¤ò¸«¤ë¤¿¤á¤Î´Êñ¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-image3")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "14. ラベル付ãフレーム (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "14. ¥é¥Ù¥ëÉÕ¤­¥Õ¥ì¡¼¥à (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-labelframe")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "15. テーマã«å¯¾å¿œã—ãŸã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ç°¡å˜ãªä¾‹ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "15. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥¦¥£¥¸¥§¥Ã¥È¤Î´Êñ¤ÊÎã (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo, "demo-ttkbut")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "リストボックス\n", tag_middle)
-txt.insert('end', "リストボックス\n", tag_kanji_title)
+#txt.insert('end', "¥ê¥¹¥È¥Ü¥Ã¥¯¥¹\n", tag_middle)
+txt.insert('end', "¥ê¥¹¥È¥Ü¥Ã¥¯¥¹\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 都é“府県.\n", tag_demo, "demo-states")
+txt.insert('end', "1. ÅÔÆ»Éܸ©.\n", tag_demo, "demo-states")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 色: アプリケーションã®ãŸã‚ã®é…色を変ãˆã‚‹\n",
+txt.insert('end', "2. ¿§: ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¤¿¤á¤ÎÇÛ¿§¤òÊѤ¨¤ë\n",
"#{tag_demo.id} demo-colors")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. 格言集\n", tag_demo, "demo-sayings")
+txt.insert('end', "3. ³Ê¸À½¸\n", tag_demo, "demo-sayings")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. 国ã«ã¤ã„ã¦ã®ãƒžãƒ«ãƒã‚«ãƒ©ãƒ ãƒªã‚¹ãƒˆ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "4. ¹ñ¤Ë¤Ä¤¤¤Æ¤Î¥Þ¥ë¥Á¥«¥é¥à¥ê¥¹¥È (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo, "demo-mclist")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ディレクトリブラウザ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "5. ¥Ç¥£¥ì¥¯¥È¥ê¥Ö¥é¥¦¥¶ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo, "demo-tree")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "エントリã¨ã‚¹ãƒ”ンボックス\n", tag_middle)
-txt.insert('end', "エントリ\n", tag_kanji_title)
+#txt.insert('end', "¥¨¥ó¥È¥ê¤È¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹\n", tag_middle)
+txt.insert('end', "¥¨¥ó¥È¥ê\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. スクロールãƒãƒ¼ãªã—\n", tag_demo, "demo-entry1")
+txt.insert('end', "1. ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ê¤·\n", tag_demo, "demo-entry1")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. スクロールãƒãƒ¼ã‚り\n", tag_demo, "demo-entry2")
+txt.insert('end', "2. ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤¢¤ê\n", tag_demo, "demo-entry2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. èªè¨¼å‡¦ç†ä»˜ãã®ã‚¨ãƒ³ãƒˆãƒªãƒœãƒƒã‚¯ã‚¹ã¨ãƒ‘スワードフィールド (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "3. ǧ¾Ú½èÍýÉÕ¤­¤Î¥¨¥ó¥È¥ê¥Ü¥Ã¥¯¥¹¤È¥Ñ¥¹¥ï¡¼¥É¥Õ¥£¡¼¥ë¥É (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-entry3")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. スピンボックス (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "4. ¥¹¥Ô¥ó¥Ü¥Ã¥¯¥¹ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-spin")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. コンボボックス (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "5. ¥³¥ó¥Ü¥Ü¥Ã¥¯¥¹ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo, "demo-combo")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. ç°¡å˜ãªãƒ•ォーム\n", tag_demo, "demo-form")
+txt.insert('end', "6. ´Êñ¤Ê¥Õ¥©¡¼¥à\n", tag_demo, "demo-form")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "テキスト\n", tag_middle)
-txt.insert('end', "テキスト\n", tag_kanji_title)
+#txt.insert('end', "¥Æ¥­¥¹¥È\n", tag_middle)
+txt.insert('end', "¥Æ¥­¥¹¥È\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 基本的ãªãƒ†ã‚­ã‚¹ãƒˆ\n", tag_demo, "demo-text")
+txt.insert('end', "1. ´ðËÜŪ¤Ê¥Æ¥­¥¹¥È\n", tag_demo, "demo-text")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 表示スタイル.\n", tag_demo, "demo-style")
+txt.insert('end', "2. ɽ¼¨¥¹¥¿¥¤¥ë.\n", tag_demo, "demo-style")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ãƒã‚¤ãƒ‘ーテキスト(ã‚¿ã‚°ãƒã‚¤ãƒ³ãƒ‰).\n",
+txt.insert('end', "3. ¥Ï¥¤¥Ñ¡¼¥Æ¥­¥¹¥È(¥¿¥°¥Ð¥¤¥ó¥É).\n",
tag_demo, "demo-bind")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ウィンドウを埋ã‚込んã ãƒ†ã‚­ã‚¹ãƒˆ\n",
+txt.insert('end', "4. ¥¦¥£¥ó¥É¥¦¤òËä¤á¹þ¤ó¤À¥Æ¥­¥¹¥È\n",
tag_demo, "demo-twind")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ウィンドウを埋ã‚込んã ãƒ†ã‚­ã‚¹ãƒˆ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "5. ¥¦¥£¥ó¥É¥¦¤òËä¤á¹þ¤ó¤À¥Æ¥­¥¹¥È (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-twind2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. 検索\n", tag_demo, "demo-search")
+txt.insert('end', "6. ¸¡º÷\n", tag_demo, "demo-search")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. テキストウィジェットã®å¯¾ç­‰åŒ–(peering) (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-textpeer")
+txt.insert('end', "7. ¥Æ¥­¥¹¥È¥¦¥£¥¸¥§¥Ã¥È¤ÎÂÐÅù²½(peering) (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-textpeer")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "キャンãƒã‚¹\n", tag_middle)
-txt.insert('end', "キャンãƒã‚¹\n", tag_kanji_title)
+#txt.insert('end', "¥­¥ã¥ó¥Ð¥¹\n", tag_middle)
+txt.insert('end', "¥­¥ã¥ó¥Ð¥¹\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. アイテムã®åž‹\n", tag_demo, "demo-items")
+txt.insert('end', "1. ¥¢¥¤¥Æ¥à¤Î·¿\n", tag_demo, "demo-items")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 2 次元ã®ãƒ—ロット\n", tag_demo, "demo-plot")
+txt.insert('end', "2. 2 ¼¡¸µ¤Î¥×¥í¥Ã¥È\n", tag_demo, "demo-plot")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. テキスト\n", tag_demo, "demo-ctext")
+txt.insert('end', "3. ¥Æ¥­¥¹¥È\n", tag_demo, "demo-ctext")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. 矢å°ã®å½¢\n", tag_demo, "demo-arrow")
+txt.insert('end', "4. Ìð°õ¤Î·Á\n", tag_demo, "demo-arrow")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. ルーラー\n", tag_demo, "demo-ruler")
+txt.insert('end', "5. ¥ë¡¼¥é¡¼\n", tag_demo, "demo-ruler")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. フロアプラン\n", tag_demo, "demo-floor")
+txt.insert('end', "6. ¥Õ¥í¥¢¥×¥é¥ó\n", tag_demo, "demo-floor")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "7. フロアプラン (ç•°ãªã‚‹ã‚­ãƒ£ãƒ³ãƒã‚¹ã‚¢ã‚¤ãƒ†ãƒ ä½œæˆæ–¹æ³•を使用)\n", tag_demo, "demo-floor2")
+txt.insert('end', "7. ¥Õ¥í¥¢¥×¥é¥ó (°Û¤Ê¤ë¥­¥ã¥ó¥Ð¥¹¥¢¥¤¥Æ¥àºîÀ®ÊýË¡¤ò»ÈÍÑ)\n", tag_demo, "demo-floor2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "8. スクロールå¯èƒ½ãªã‚­ãƒ£ãƒ³ãƒã‚¹\n",
+txt.insert('end', "8. ¥¹¥¯¥í¡¼¥ë²Äǽ¤Ê¥­¥ã¥ó¥Ð¥¹\n",
tag_demo, "demo-cscroll")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "9. ãƒã‚§ã‚¹ãƒœãƒ¼ãƒ‰ä¸Šã®é¨Žå£«ã®å·¡å›ž (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "9. ¥Á¥§¥¹¥Ü¡¼¥É¾å¤Îµ³»Î¤Î½ä²ó (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo, "demo-knightstour")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "スケールã¨ãƒ—ログレスãƒãƒ¼\n", tag_middle)
-txt.insert('end', "スケールã¨ãƒ—ログレスãƒãƒ¼\n", tag_kanji_title)
+#txt.insert('end', "¥¹¥±¡¼¥ë¤È¥×¥í¥°¥ì¥¹¥Ð¡¼\n", tag_middle)
+txt.insert('end', "¥¹¥±¡¼¥ë¤È¥×¥í¥°¥ì¥¹¥Ð¡¼\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 垂直スケール\n", tag_demo.id, "demo-vscale")
+txt.insert('end', "1. ¿âľ¥¹¥±¡¼¥ë\n", tag_demo.id, "demo-vscale")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 水平スケール\n", tag_demo.id, "demo-hscale")
+txt.insert('end', "2. ¿åÊ¿¥¹¥±¡¼¥ë\n", tag_demo.id, "demo-hscale")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. プログレスãƒãƒ¼ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n", tag_demo.id, "demo-ttkprogress")
+txt.insert('end', "3. ¥×¥í¥°¥ì¥¹¥Ð¡¼ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n", tag_demo.id, "demo-ttkprogress")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-txt.insert('end', "ペインドウィンドウã¨ãƒŽãƒ¼ãƒˆãƒ–ック\n", tag_kanji_title)
+txt.insert('end', "¥Ú¥¤¥ó¥É¥¦¥£¥ó¥É¥¦¤È¥Î¡¼¥È¥Ö¥Ã¥¯\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. æ°´å¹³æ–¹å‘ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "1. ¿åÊ¿Êý¸þ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo.id, "demo-paned1")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. åž‚ç›´æ–¹å‘ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "2. ¿âľÊý¸þ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo.id, "demo-paned2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. テーマã«å¯¾å¿œã—ãŸåŸ‹ã‚è¾¼ã¿ãƒšã‚¤ãƒ³ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "3. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿Ëä¤á¹þ¤ß¥Ú¥¤¥ó (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo.id, "demo-ttkpane")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. ノートブックウィジェット (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "4. ¥Î¡¼¥È¥Ö¥Ã¥¯¥¦¥£¥¸¥§¥Ã¥È (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo.id, "demo-ttknote")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "メニューã¨ãƒ„ールãƒãƒ¼\n", tag_middle)
-txt.insert('end', "メニューã¨ãƒ„ールãƒãƒ¼\n", tag_kanji_title)
+#txt.insert('end', "¥á¥Ë¥å¡¼¤È¥Ä¡¼¥ë¥Ð¡¼\n", tag_middle)
+txt.insert('end', "¥á¥Ë¥å¡¼¤È¥Ä¡¼¥ë¥Ð¡¼\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. メニューã¨ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ã‚’å«ã‚“ã ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦\n",
+txt.insert('end', "1. ¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¤ò´Þ¤ó¤À¥¦¥£¥ó¥É¥¦\n",
tag_demo, "demo-menu")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. メニューã¨ã‚«ã‚¹ã‚±ãƒ¼ãƒ‰ã‚’å«ã‚“ã ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ (Tk8.x 専用)\n",
+txt.insert('end', "2. ¥á¥Ë¥å¡¼¤È¥«¥¹¥±¡¼¥É¤ò´Þ¤ó¤À¥¦¥£¥ó¥É¥¦ (Tk8.x ÀìÍÑ)\n",
tag_demo, "demo-menu8x")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. 〃 (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n",
+txt.insert('end', "3. ¡· (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n",
tag_demo, "demo-menu84")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. メニューボタン (Tk8.x 専用)\n",
+txt.insert('end', "4. ¥á¥Ë¥å¡¼¥Ü¥¿¥ó (Tk8.x ÀìÍÑ)\n",
tag_demo, "demo-menubu")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "5. テーマã«å¯¾å¿œã—ãŸãƒ¡ãƒ‹ãƒ¥ãƒ¼ãƒœã‚¿ãƒ³ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "5. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥á¥Ë¥å¡¼¥Ü¥¿¥ó (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo.id, "demo-ttkmenu")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "6. テーマã«å¯¾å¿œã—ãŸãƒ„ールãƒãƒ¼ (Tile/Ttkæ‹¡å¼µã¸ã®å¯¾å¿œãŒå¿…è¦)\n",
+txt.insert('end', "6. ¥Æ¡¼¥Þ¤ËÂбþ¤·¤¿¥Ä¡¼¥ë¥Ð¡¼ (Tile/Ttk³ÈÄ¥¤Ø¤ÎÂбþ¤¬É¬Í×)\n",
tag_demo.id, "demo-toolbar")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "ダイアログウィンドウ\n", tag_middle)
-txt.insert('end', "ダイアログウィンドウ\n", tag_kanji_title)
+#txt.insert('end', "¥À¥¤¥¢¥í¥°¥¦¥£¥ó¥É¥¦\n", tag_middle)
+txt.insert('end', "¥À¥¤¥¢¥í¥°¥¦¥£¥ó¥É¥¦\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. メッセージボックス\n", tag_demo, "demo-msgbox")
+txt.insert('end', "1. ¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹\n", tag_demo, "demo-msgbox")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 詳細テキスト付ãã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-msgbox2")
+txt.insert('end', "2. ¾ÜºÙ¥Æ¥­¥¹¥ÈÉÕ¤­¤Î¥á¥Ã¥»¡¼¥¸¥Ü¥Ã¥¯¥¹ (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-msgbox2")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. ãƒ•ã‚¡ã‚¤ãƒ«é¸æŠžãƒ€ã‚¤ã‚¢ãƒ­ã‚°\n", tag_demo, "demo-filebox")
+txt.insert('end', "3. ¥Õ¥¡¥¤¥ëÁªÂò¥À¥¤¥¢¥í¥°\n", tag_demo, "demo-filebox")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. è‰²é¸æŠžãƒ€ã‚¤ã‚¢ãƒ­ã‚°\n", tag_demo, "demo-clrpick")
+txt.insert('end', "4. ¿§ÁªÂò¥À¥¤¥¢¥í¥°\n", tag_demo, "demo-clrpick")
txt.insert('end', " \n ", tag_demospace)
txt.insert('end', "\n")
-#txt.insert('end', "アニメーション\n", tag_middle)
-txt.insert('end', "アニメーション\n", tag_kanji_title)
+#txt.insert('end', "¥¢¥Ë¥á¡¼¥·¥ç¥ó\n", tag_middle)
+txt.insert('end', "¥¢¥Ë¥á¡¼¥·¥ç¥ó\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. アニメーションラベル (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-anilabel")
+txt.insert('end', "1. ¥¢¥Ë¥á¡¼¥·¥ç¥ó¥é¥Ù¥ë (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-anilabel")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. 波形ã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-aniwave")
+txt.insert('end', "2. ÇÈ·Á¤Î¥¢¥Ë¥á¡¼¥·¥ç¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-aniwave")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. 振りå­ã®ã‚·ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-pendulum")
+txt.insert('end', "3. ¿¶¤ê»Ò¤Î¥·¥ß¥å¥ì¡¼¥·¥ç¥ó (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-pendulum")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "4. A celebration of Rube Goldberg (機能ã«å¯¾å¿œã—ãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®TkãŒå¿…è¦)\n", tag_demo, "demo-goldberg")
+txt.insert('end', "4. A celebration of Rube Goldberg (µ¡Ç½¤ËÂбþ¤·¤¿¥Ð¡¼¥¸¥ç¥ó¤ÎTk¤¬É¬Í×)\n", tag_demo, "demo-goldberg")
txt.insert('end', "\n")
-#txt.insert('end', "ãã®ä»–\n", tag_middle)
-txt.insert('end', "ãã®ä»–\n", tag_kanji_title)
+#txt.insert('end', "¤½¤Î¾\n", tag_middle)
+txt.insert('end', "¤½¤Î¾\n", tag_kanji_title)
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "1. 組ã¿è¾¼ã¿ã®ãƒ“ットマップ\n", tag_demo, "demo-bitmap")
+txt.insert('end', "1. ÁȤ߹þ¤ß¤Î¥Ó¥Ã¥È¥Þ¥Ã¥×\n", tag_demo, "demo-bitmap")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "2. モーダルダイアログ(ローカルグラブ)\n",
+txt.insert('end', "2. ¥â¡¼¥À¥ë¥À¥¤¥¢¥í¥°(¥í¡¼¥«¥ë¥°¥é¥Ö)\n",
tag_demo, "demo-dialog1")
txt.insert('end', " \n ", tag_demospace)
-txt.insert('end', "3. モーダルダイアログ(グローãƒãƒ«ã‚°ãƒ©ãƒ–)\n",
+txt.insert('end', "3. ¥â¡¼¥À¥ë¥À¥¤¥¢¥í¥°(¥°¥í¡¼¥Ð¥ë¥°¥é¥Ö)\n",
tag_demo, "demo-dialog2")
txt.insert('end', " \n ", tag_demospace)
@@ -545,18 +545,18 @@ txt.state('disabled')
scr.focus
################################
-# method 定義
+# method ÄêµÁ
################################
def positionWindow(w)
w.geometry('+300+300')
end
-# 親ウィジェットã¨ï¼Œå¤‰æ•°å㨠TkVariable ã¨ã®çµ„(é…列)ã®ä¸¦ã³ã‚’渡ã™
+# ¿Æ¥¦¥£¥¸¥§¥Ã¥È¤È¡¤ÊÑ¿ô̾¤È TkVariable ¤È¤ÎÁÈ(ÇÛÎó)¤ÎʤӤòÅϤ¹
$showVarsWin = {}
def showVars1(parent, *args)
if $showVarsWin[parent.path]
begin
- $showVarsWin[parent.path].destroy
+ $showVarsWin[parent.path].destroy
rescue
end
end
@@ -564,7 +564,7 @@ def showVars1(parent, *args)
title "Variable values"
base = TkFrame.new(w).pack(:fill=>:both, :expand=>true)
TkLabel.new(base) {
- text "変数値:"
+ text "ÊÑ¿ôÃÍ:"
width 20
anchor 'center'
if $tk_version =~ /^4.*/
@@ -586,7 +586,7 @@ def showVars1(parent, *args)
}.pack('side'=>'top', 'anchor'=>'w', 'fill'=>'x')
}
TkButton.new(base) {
- text "了解"
+ text "λ²ò"
command proc{w.destroy}
}.pack('side'=>'bottom', 'pady'=>2)
}
@@ -596,7 +596,7 @@ end
def showVars2(parent, *args)
if $showVarsWin[parent.path]
begin
- $showVarsWin[parent.path].destroy
+ $showVarsWin[parent.path].destroy
rescue
end
end
@@ -605,11 +605,11 @@ def showVars2(parent, *args)
base = TkFrame.new(top).pack(:fill=>:both, :expand=>true)
- TkLabelFrame.new(base, :text=>"変数値:",
+ TkLabelFrame.new(base, :text=>"ÊÑ¿ôÃÍ:",
:font=>{:family=>'Helvetica', :size=>14}){|f|
args.each{|vnam,vbody|
- TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
- TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
+ TkGrid(TkLabel.new(f, :text=>"#{vnam}: ", :anchor=>'w'),
+ TkLabel.new(f, :textvariable=>vbody, :anchor=>'w'),
:padx=>2, :pady=>2, :sticky=>'w')
}
@@ -617,7 +617,7 @@ def showVars2(parent, *args)
f.grid_columnconfig(1, :weight=>1)
f.grid_rowconfig(100, :weight=>1)
}
- TkButton.new(base, :text=>"了解", :width=>8, :default=>:active,
+ TkButton.new(base, :text=>"λ²ò", :width=>8, :default=>:active,
:command=>proc{top.destroy}){|b|
top.bind('Return', proc{b.invoke})
top.bind('Escape', proc{b.invoke})
@@ -637,7 +637,7 @@ else # ver >= 8.4
alias showVars showVars2
end
-# 疑似トップレベルサãƒãƒ¼ãƒˆ
+# µ¿»÷¥È¥Ã¥×¥ì¥Ù¥ë¥µ¥Ý¡¼¥È
module PseudoToplevel_Evaluable
def pseudo_toplevel_eval(body = Proc.new)
Thread.current[:TOPLEVEL] = self
@@ -667,9 +667,9 @@ class Object
def method_missing(id, *args)
begin
- has_top = (top = Thread.current[:TOPLEVEL]) &&
- top.respond_to?(:pseudo_toplevel_evaluable?) &&
- top.pseudo_toplevel_evaluable? &&
+ has_top = (top = Thread.current[:TOPLEVEL]) &&
+ top.respond_to?(:pseudo_toplevel_evaluable?) &&
+ top.pseudo_toplevel_evaluable? &&
top.respond_to?(id)
rescue Exception => e
has_top = false
@@ -733,24 +733,24 @@ def eval_samplecode(code, file=nil)
end
rescue Exception=>e
#p e
- TkBgError.show(e.message + "\n" +
- "\n---< backtrace of Ruby side >-----\n" +
- e.backtrace.join("\n") +
+ TkBgError.show(e.message + "\n" +
+ "\n---< backtrace of Ruby side >-----\n" +
+ e.backtrace.join("\n") +
"\n---< backtrace of Tk side >-------")
end
}
}
- Tk.update rescue nil
+ Tk.update
end
-# テキスト上ã§ã® click ã«å¯¾ã™ã‚‹å‹•作
+# ¥Æ¥­¥¹¥È¾å¤Ç¤Î click ¤ËÂФ¹¤ëưºî
def invoke(txt, idx)
tag = txt.tag_names(idx).find{|t| t.kind_of?(String) && t =~ /^demo-/}
return unless tag
cursor = txt.cget('cursor')
txt.cursor('watch')
- Tk.update rescue nil
+ Tk.update
# eval(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, _null_binding)
# Tk.update
eval_samplecode(IO.readlines("#{[$demo_dir, tag[5..-1]].join(File::Separator)}.rb").join, tag[5..-1] + '.rb')
@@ -776,7 +776,7 @@ def invoke (txt, idx)
end
=end
-# 状態表示
+# ¾õÂÖɽ¼¨
def showStatus (txt, index)
tag = txt.tag_names(index).find{|t| t.kind_of?(String) && t =~ /^demo-/}
cursor = txt.cget('cursor')
@@ -785,14 +785,14 @@ def showStatus (txt, index)
newcursor = 'xterm'
else
demoname = tag[5..-1]
- $statusBarLabel.configure('text',
- "サンプルプログラム \"#{demoname}\" ã®å®Ÿè¡Œ ")
+ $statusBarLabel.configure('text',
+ "¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à \"#{demoname}\" ¤Î¼Â¹Ô ")
newcursor = 'hand2'
end
txt.configure('cursor'=>newcursor) if cursor != newcursor
end
-# ソースコードã®è¡¨ç¤º
+# ¥½¡¼¥¹¥³¡¼¥É¤Îɽ¼¨
def showCode1(demo)
file = "#{demo}.rb"
$code_window = nil unless defined? $code_window
@@ -801,15 +801,15 @@ def showCode1(demo)
f = TkFrame.new($code_window)
TkButton.new(f) {
- #text "了解"
- text "é–‰ã˜ã‚‹"
+ #text "λ²ò"
+ text "ÊĤ¸¤ë"
command proc{
$code_window.destroy
$code_window = nil
}
}.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
TkButton.new(f) {
- text "å†å®Ÿè¡Œ"
+ text "ºÆ¼Â¹Ô"
# command proc{eval($code_text.get('1.0','end'), _null_binding)}
command proc{eval_samplecode($code_text.get('1.0','end'), '<viewer>')}
}.pack('side'=>'right', 'expand'=>'false', 'pady'=>2)
@@ -841,9 +841,9 @@ def showCode1(demo)
TkFrame.new($code_window) {|f|
pack('expand'=>'yes', 'fill'=>'both', 'padx'=>1, 'pady'=>1)
- hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
+ hs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
'orient'=>'horizontal')
- vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
+ vs = TkScrollbar.new($code_window, 'highlightthickness'=>0,
'orient'=>'vertical')
$code_text = TkText.new($code_window) {|t|
height 40
@@ -859,11 +859,11 @@ def showCode1(demo)
vs.command(proc{|*args| $code_text.yview(*args)})
}
- $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
+ $code_text.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>0,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
- vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
+ vs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>0, 'column'=>1,
'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
-# xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
+# xs.grid('in'=>f, 'padx'=>1, 'pady'=>1, 'row'=>1, 'column'=>0,
# 'rowspan'=>1, 'columnspan'=>1, 'sticky'=>'news')
TkGrid.rowconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
TkGrid.columnconfigure(f, 0, 'weight'=>1, 'minsize'=>0)
@@ -900,8 +900,8 @@ def showCode2(demo)
if $code_window == nil || TkWinfo.exist?($code_window) == false
$code_window = TkToplevel.new(nil)
tf = TkFrame.new($code_window)
- $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
- :wrap=>'word', :bd=>1, :setgrid=>true,
+ $code_text = TkText.new(tf, :font=>'Courier 10', :height=>30,
+ :wrap=>'word', :bd=>1, :setgrid=>true,
:highlightthickness=>0, :pady=>2, :padx=>3)
xscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
yscr = TkScrollbar.new(tf, :bd=>1){assign($code_text)}
@@ -924,21 +924,21 @@ def showCode2(demo)
posnum.text = pos
}
- #b_dis = TkButton.new(bf, :text=>'了解', :default=>:active,
- b_dis = TkButton.new(bf, :text=>'é–‰ã˜ã‚‹', :default=>:active,
+ #b_dis = TkButton.new(bf, :text=>'λ²ò', :default=>:active,
+ b_dis = TkButton.new(bf, :text=>'ÊĤ¸¤ë', :default=>:active,
:command=>proc{
$code_window.destroy
$code_window = nil
- },
+ },
:image=>$image['delete'], :compound=>:left)
- b_prn = TkButton.new(bf, :text=>'å°åˆ·',
- :command=>proc{printCode($code_text, file)},
+ b_prn = TkButton.new(bf, :text=>'°õºþ',
+ :command=>proc{printCode($code_text, file)},
:image=>$image['print'], :compound=>:left)
- b_run = TkButton.new(bf, :text=>'å†å®Ÿè¡Œ',
+ b_run = TkButton.new(bf, :text=>'ºÆ¼Â¹Ô',
:command=>proc{
# eval($code_text.get('1.0','end'), _null_binding)
eval_samplecode($code_text.get('1.0','end'), '<viewer>')
- },
+ },
:image=>$image['refresh'], :compound=>:left)
TkGrid(lf, 'x', b_run, b_prn, b_dis, :padx=>4, :pady=>[6,4])
@@ -1011,28 +1011,28 @@ def printCode(txt, file)
when 'unix'
msg = `lp -c #{fname}`
unless $?.exitstatus == 0
- Tk.messageBox(:title=>'Print spooling failure',
- :message=>'エラーãŒç™ºç”Ÿã—ã¾ã—ãŸï¼Ž' +
- 'å°åˆ·ã«å¤±æ•—ã—ãŸã‚‚ã®ã¨æ€ã‚れã¾ã™ : ' + msg)
+ Tk.messageBox(:title=>'Print spooling failure',
+ :message=>'¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡¥' +
+ '°õºþ¤Ë¼ºÇÔ¤·¤¿¤â¤Î¤È»×¤ï¤ì¤Þ¤¹ : ' + msg)
end
when 'windows'
begin
printTextWin32(fname)
rescue => e
- Tk.messageBox(:title=>'Print spooling failure',
- :message=>'エラーãŒç™ºç”Ÿã—ã¾ã—ãŸï¼Ž' +
- 'å°åˆ·ã«å¤±æ•—ã—ãŸã‚‚ã®ã¨æ€ã‚れã¾ã™ : ' +
+ Tk.messageBox(:title=>'Print spooling failure',
+ :message=>'¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡¥' +
+ '°õºþ¤Ë¼ºÇÔ¤·¤¿¤â¤Î¤È»×¤ï¤ì¤Þ¤¹ : ' +
e.message)
- end
+ end
when 'macintosh'
- Tk.messageBox(:title=>'Operation not Implemented',
- :message=>'å°åˆ·æ©Ÿèƒ½ã¯ã¾ã å®Ÿè£…ã•れã¦ã„ã¾ã›ã‚“')
+ Tk.messageBox(:title=>'Operation not Implemented',
+ :message=>'°õºþµ¡Ç½¤Ï¤Þ¤À¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó')
else
- Tk.messageBox(:title=>'Operation not Implemented',
- :message=>'検出ã•れãŸç’°å¢ƒ ' +
- Tk::TCL_PLATFORM('platform') +
- ' ã¯æœªçŸ¥ã®ç’°å¢ƒã§ã‚ã‚‹ãŸã‚,' +
- 'å°åˆ·æ©Ÿèƒ½ã¯å®Ÿè£…ã•れã¦ã„ã¾ã›ã‚“: ')
+ Tk.messageBox(:title=>'Operation not Implemented',
+ :message=>'¸¡½Ð¤µ¤ì¤¿´Ä¶­ ' +
+ Tk::TCL_PLATFORM('platform') +
+ ' ¤Ï̤ÃΤδĶ­¤Ç¤¢¤ë¤¿¤á¡¤' +
+ '°õºþµ¡Ç½¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: ')
end
ensure
File.delete(fname)
@@ -1061,7 +1061,7 @@ def printTextWin32(fname)
pcmd.gsub!('%1', fname)
puts pcmd
cmd = Tk.tk_call('auto_execok', 'start') + ' /min ' + pcmd
-
+
msg = `#{cmd}`
unless $?.exitstatus == 0
fail RuntimeError, msg
@@ -1073,34 +1073,34 @@ end
# Pops up a message box with an "about" message
#
def aboutBox
- Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
- 'message'=>"Ruby/Tk ウィジェットデモ Ver.1.7.1-jp\n\n" +
- "based on demos of Tk8.1 -- 8.5 " +
- "( Copyright of Tcl/Tk demos:: " +
- "(c) 1996-1997 Sun Microsystems, Inc. / " +
- "(c) 1997-2000 Ajuba Solutions, Inc. / " +
- "(c) 2001-2007 Donal K. Fellows / " +
+ Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo',
+ 'message'=>"Ruby/Tk ¥¦¥£¥¸¥§¥Ã¥È¥Ç¥â Ver.1.7.1-jp\n\n" +
+ "based on demos of Tk8.1 -- 8.5 " +
+ "( Copyright of Tcl/Tk demos:: " +
+ "(c) 1996-1997 Sun Microsystems, Inc. / " +
+ "(c) 1997-2000 Ajuba Solutions, Inc. / " +
+ "(c) 2001-2007 Donal K. Fellows / " +
"(c) 2002-2007 Daniel A. Steffen )\n\n" +
- "Your Ruby & Tk Version ::\n" +
- "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
+ "Your Ruby & Tk Version ::\n" +
+ "Ruby#{RUBY_VERSION}(#{RUBY_RELEASE_DATE})[#{RUBY_PLATFORM}] / Tk#{$tk_patchlevel}#{(Tk::JAPANIZED_TK)? '-jp': ''}\n\n" +
"Ruby/Tk release date :: tcltklib #{TclTkLib::RELEASE_DATE}; tk #{Tk::RELEASE_DATE}")
end
####################################
-# å¼•æ•°ã§æŒ‡å®šã•れãŸãƒ‡ãƒ¢ã‚’èµ·å‹•ã™ã‚‹
+# °ú¿ô¤Ç»ØÄꤵ¤ì¤¿¥Ç¥â¤òµ¯Æ°¤¹¤ë
no_launcher = false
if ARGV[0] == '-n'
ARGV.shift
no_launcher = true if ARGV.size > 0
else
# show the root widget to make it lower then demo windows
- Tk.update rescue nil
+ Tk.update
end
-ARGV.each{|cmd|
+ARGV.each{|cmd|
if cmd =~ /(.*).rb/
cmd = $1
end
- #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
+ #eval(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join,
# _null_binding)
eval_samplecode(IO.readlines("#{[$demo_dir, cmd].join(File::Separator)}.rb").join, cmd + '.rb')
}
@@ -1118,5 +1118,5 @@ if no_launcher
end
################################
-# イベント待ã¡ã«å…¥ã‚‹
+# ¥¤¥Ù¥ó¥ÈÂÔ¤Á¤ËÆþ¤ë
Tk.mainloop
diff --git a/ext/tk/sample/editable_listbox.rb b/ext/tk/sample/editable_listbox.rb
index 890aec032e..7a9ad4450b 100644
--- a/ext/tk/sample/editable_listbox.rb
+++ b/ext/tk/sample/editable_listbox.rb
@@ -27,7 +27,7 @@ class Tk::RbWidget::Editable_Listbox < TkListbox
if idx = @ebox.pos
see(idx) if bbox(idx).empty?
@ebox.focus(true)
- end
+ end
}
}
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
index b75ebca48d..04de3a2022 100644
--- a/ext/tk/sample/irbtkw.rbw
+++ b/ext/tk/sample/irbtkw.rbw
@@ -41,12 +41,12 @@ else
fnt = ['courier', '-12']
end
-console = TkTextIO.new(top, :mode=>:console,
- :width=>80).pack(:side=>:left,
+console = TkTextIO.new(top, :mode=>:console,
+ :width=>80).pack(:side=>:left,
:expand=>true, :fill=>:both)
-console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console,
- :side=>:right,
- :expand=>false,
+console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console,
+ :side=>:right,
+ :expand=>false,
:fill=>:y))
# save original I/O
diff --git a/ext/tk/sample/menubar3.rb b/ext/tk/sample/menubar3.rb
index 4f42f81c88..129cfd779b 100644
--- a/ext/tk/sample/menubar3.rb
+++ b/ext/tk/sample/menubar3.rb
@@ -58,7 +58,7 @@ layout_proc = proc{|parent, mbtn|
=end
menubar = TkMenubar.new(nil, menu_spec,
- 'layout_proc'=>layout_proc,
+ 'layout_proc'=>layout_proc,
'tearoff'=>false,
'foreground'=>'grey40',
'activeforeground'=>'red',
diff --git a/ext/tk/sample/msgs_rb/README b/ext/tk/sample/msgs_rb/README
index 781dda93ef..d986e031fd 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.
+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 to '../msgs_tk/README'.
diff --git a/ext/tk/sample/msgs_rb/es.msg b/ext/tk/sample/msgs_rb/es.msg
index 38ca28fb8f..460dbe848c 100644
--- a/ext/tk/sample/msgs_rb/es.msg
+++ b/ext/tk/sample/msgs_rb/es.msg
@@ -69,7 +69,7 @@ TkMsgCatalog.new('::tk') {
es "Tcl Scripts", "Scripts Tcl"
es "Tcl for Windows", "Tcl para Windows"
es "Text Files", "Archivos de texto"
- es "&Yes", "&S\\u00ed"
+ es "&Yes", "&S\\u00ed"
es "abort", "abortar"
es "blue", "azul"
es "cancel", "cancelar"
diff --git a/ext/tk/sample/msgs_rb/ru.msg b/ext/tk/sample/msgs_rb/ru.msg
index 752cd42619..f389dff0b6 100644
--- a/ext/tk/sample/msgs_rb/ru.msg
+++ b/ext/tk/sample/msgs_rb/ru.msg
@@ -31,7 +31,7 @@ TkMsgCatalog.new('::tk') {
ru 'Details >>', '\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>'
ru 'Directory "%1\$s" does not exist.', '\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 "%1\$s" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.'
ru '&Directory:', '&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:'
- ru 'Error: %1\$s', '\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s'
+ ru 'Error: %1\$s', '\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s'
ru 'Exit', '\u0412\u044b\u0445\u043e\u0434'
ru 'File "%1\$s" already exists.' "\n" 'Do you want to overwrite it?' \
'\u0424\u0430\u0439\u043b "%1\$s" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.' "\n" '\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?'
@@ -47,7 +47,7 @@ TkMsgCatalog.new('::tk') {
ru 'Hi', '\u041f\u0440\u0438\u0432\u0435\u0442'
ru 'Hide Console', '\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c'
ru '&Ignore', '&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c'
- ru 'Invalid file name "%1\$s".', '\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 "%1\$s".'
+ ru 'Invalid file name "%1\$s".', '\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 "%1\$s".'
ru 'Log Files', '\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430'
ru '&No', '&\u041d\u0435\u0442'
ru '&OK', '&\u041e\u041a'
diff --git a/ext/tk/sample/msgs_rb2/README b/ext/tk/sample/msgs_rb2/README
index f6a904b3b6..b8aa114e1b 100644
--- a/ext/tk/sample/msgs_rb2/README
+++ b/ext/tk/sample/msgs_rb2/README
@@ -1,5 +1,5 @@
Message catalogs in this directory are written in encodings except
-UTF-8. As if you have a trouble to edit UTF-8 text, you can write
+UTF-8. As if you have a trouble to edit UTF-8 text, you can write
message catalogs in your familier encoding.
Please see '../msgs_rb/README' too.
diff --git a/ext/tk/sample/msgs_rb2/ja.msg b/ext/tk/sample/msgs_rb2/ja.msg
index 54a105b61f..84e89aa6ef 100644
--- a/ext/tk/sample/msgs_rb2/ja.msg
+++ b/ext/tk/sample/msgs_rb2/ja.msg
@@ -1,85 +1,85 @@
TkMsgCatalog.new('::tkmsgcat_demo') {
- ja 'Application Error', 'アプリケーションエラー', 'utf-8'
- ja 'Blue', 'é’', 'utf-8'
- ja 'Color', 'è‰²é¸æŠž', 'utf-8'
- ja 'Delete', '消去', 'utf-8'
- ja 'Error', 'エラー', 'utf-8'
- ja 'Exit', '終了', 'utf-8'
- ja 'Green', 'ç·‘', 'utf-8'
- ja 'Red', '赤', 'utf-8'
- ja 'blue', 'é’', 'utf-8'
- ja 'green', 'ç·‘', 'utf-8'
- ja 'red', '赤', 'utf-8'
+ ja 'Application Error', '¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¨¥é¡¼', 'euc-jp'
+ ja 'Blue', 'ÀÄ', 'euc-jp'
+ ja 'Color', '¿§ÁªÂò', 'euc-jp'
+ ja 'Delete', '¾Ãµî', 'euc-jp'
+ ja 'Error', '¥¨¥é¡¼', 'euc-jp'
+ ja 'Exit', '½ªÎ»', 'euc-jp'
+ ja 'Green', 'ÎÐ', 'euc-jp'
+ ja 'Red', 'ÀÖ', 'euc-jp'
+ ja 'blue', 'ÀÄ', 'euc-jp'
+ ja 'green', 'ÎÐ', 'euc-jp'
+ ja 'red', 'ÀÖ', 'euc-jp'
}
TkMsgCatalog.new('::tk') {
- ja "&Abort", '中止', 'utf-8'
+ ja "&Abort", '̾ȧ', 'euc-jp'
ja "About..."
- ja "All Files", 'ã™ã¹ã¦ã®ãƒ•ァイル', 'utf-8'
- ja "Application Error", 'アプリケーションエラー', 'utf-8'
- ja "&Blue", 'é’', 'utf-8'
- ja "&Cancel", 'å–り消ã—', 'utf-8'
- ja "Cannot change to the directory \"%1\$s\".\nPermission denied.", "ディレクトリ \"%1\$s\" ã«å¤‰æ›´ã§ãã¾ã›ã‚“.\n許å¯ãŒã‚りã¾ã›ã‚“.", 'utf-8'
- ja "Choose Directory", 'ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠž', 'utf-8'
- ja "Clear", '消去', 'utf-8'
- ja "Color", '色', 'utf-8'
- ja "Console", 'コンソール', 'utf-8'
- ja "Copy", 'コピー', 'utf-8'
- ja "Cut", '切りå–り', 'utf-8'
- ja "Delete", '消去', 'utf-8'
- ja "Details >>", '詳細 >>', 'utf-8'
- ja "Directory \"%1\$s\" does not exist.", '"%1$s" ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯å­˜åœ¨ã—ã¾ã›ã‚“.', 'utf-8'
- ja "&Directory:", 'ディレクトリ', 'utf-8'
+ ja "All Files", '¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë', 'euc-jp'
+ ja "Application Error", '¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥¨¥é¡¼', 'euc-jp'
+ ja "&Blue", 'ÀÄ', 'euc-jp'
+ ja "&Cancel", '¼è¤ê¾Ã¤·', 'euc-jp'
+ ja "Cannot change to the directory \"%1\$s\".\nPermission denied.", "¥Ç¥£¥ì¥¯¥È¥ê \"%1\$s\" ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó¡¥\nµö²Ä¤¬¤¢¤ê¤Þ¤»¤ó¡¥", 'euc-jp'
+ ja "Choose Directory", '¥Ç¥£¥ì¥¯¥È¥ê¤òÁªÂò', 'euc-jp'
+ ja "Clear", '¾Ãµî', 'euc-jp'
+ ja "Color", '¿§', 'euc-jp'
+ ja "Console", '¥³¥ó¥½¡¼¥ë', 'euc-jp'
+ ja "Copy", '¥³¥Ô¡¼', 'euc-jp'
+ ja "Cut", 'ÀÚ¤ê¼è¤ê', 'euc-jp'
+ ja "Delete", '¾Ãµî', 'euc-jp'
+ ja "Details >>", '¾ÜºÙ >>', 'euc-jp'
+ ja "Directory \"%1\$s\" does not exist.", '"%1$s" ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Ï¸ºß¤·¤Þ¤»¤ó¡¥', 'euc-jp'
+ ja "&Directory:", '¥Ç¥£¥ì¥¯¥È¥ê', 'euc-jp'
ja "Error: %1\$s"
- ja "Exit", '終了', 'utf-8'
- ja "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "\"%1\$s\" ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ï¼Ž\næ›¸ãæ›ãˆã¾ã™ã‹ï¼Ÿ", 'utf-8'
- ja "File \"%1\$s\" already exists.\n\n", "\"%1\$s\" ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¢ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ï¼Ž\n\n", 'utf-8'
- ja "File \"%1\$s\" does not exist.", '"%1$s" ã¨ã„ã†ãƒ•ァイルã¯å­˜åœ¨ã—ã¾ã›ã‚“.', 'utf-8'
- ja "File &name:", 'ファイルå', 'utf-8'
- ja "File &names:", 'ファイルå', 'utf-8'
- ja "Files of &type:", 'ファイル形å¼', 'utf-8'
- ja "Fi&les:", 'ファイル', 'utf-8'
- ja "&Filter", 'フィルター', 'utf-8'
- ja "Fil&ter:", 'フィルター', 'utf-8'
- ja "&Green", 'ç·‘', 'utf-8'
- ja "Hi", 'ã“ã‚“ã«ã¡ã¯', 'utf-8'
- ja "Hide Console", 'コンソールを隠ã™', 'utf-8'
- ja "&Ignore", '無視', 'utf-8'
- ja "Invalid file name \"%1\$s\".", '"%1$s" ã¯ä¸æ­£ãªãƒ•ァイルåã§ã™ï¼Ž', 'utf-8'
- ja "Log Files", 'ログファイル', 'utf-8'
- ja "&No", 'ã„ã„ãˆ', 'utf-8'
- ja "&OK", '了解', 'utf-8'
- ja "OK", '了解', 'utf-8'
- ja "Ok", '了解', 'utf-8'
- ja "Open", 'é–‹ã', 'utf-8'
- ja "&Open", 'é–‹ã', 'utf-8'
- ja "Open Multiple Files", '複数ã®ãƒ•ァイルを開ã', 'utf-8'
- ja "Paste", '貼り付ã‘', 'utf-8'
- ja "Quit", '終了', 'utf-8'
- ja "&Red", '赤', 'utf-8'
- ja "Replace existing file?", '既存ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç½®ãæ›ãˆã¾ã™ã‹ï¼Ÿ', 'utf-8'
- ja "&Retry", 'å†å®Ÿè¡Œ', 'utf-8'
- ja "&Save", 'ä¿å­˜', 'utf-8'
- ja "Save As", 'åå‰ã‚’付ã‘ã¦ä¿å­˜', 'utf-8'
- ja "Save To Log", 'ログをä¿å­˜', 'utf-8'
- ja "Select Log File", 'ãƒ­ã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž', 'utf-8'
- ja "Select a file to source", 'ã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž', 'utf-8'
- ja "&Selection:", 'é¸æŠž', 'utf-8'
- ja "Skip Messages", 'メッセージをã¨ã°ã™', 'utf-8'
- ja "Source...", 'ソース...', 'utf-8'
- ja "Tcl Scripts", 'Tcl スクリプト', 'utf-8'
+ ja "Exit", '½ªÎ»', 'euc-jp'
+ ja "File \"%1\$s\" already exists.\nDo you want to overwrite it?", "\"%1\$s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ï´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡¥\n½ñ¤­´¹¤¨¤Þ¤¹¤«¡©", 'euc-jp'
+ ja "File \"%1\$s\" already exists.\n\n", "\"%1\$s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ï´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡¥\n\n", 'euc-jp'
+ ja "File \"%1\$s\" does not exist.", '"%1$s" ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤Ï¸ºß¤·¤Þ¤»¤ó¡¥', 'euc-jp'
+ ja "File &name:", '¥Õ¥¡¥¤¥ë̾', 'euc-jp'
+ ja "File &names:", '¥Õ¥¡¥¤¥ë̾', 'euc-jp'
+ ja "Files of &type:", '¥Õ¥¡¥¤¥ë·Á¼°', 'euc-jp'
+ ja "Fi&les:", '¥Õ¥¡¥¤¥ë', 'euc-jp'
+ ja "&Filter", '¥Õ¥£¥ë¥¿¡¼', 'euc-jp'
+ ja "Fil&ter:", '¥Õ¥£¥ë¥¿¡¼', 'euc-jp'
+ ja "&Green", 'ÎÐ', 'euc-jp'
+ ja "Hi", '¤³¤ó¤Ë¤Á¤Ï', 'euc-jp'
+ ja "Hide Console", '¥³¥ó¥½¡¼¥ë¤ò±£¤¹', 'euc-jp'
+ ja "&Ignore", '̵»ë', 'euc-jp'
+ ja "Invalid file name \"%1\$s\".", '"%1$s" ¤ÏÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡¥', 'euc-jp'
+ ja "Log Files", '¥í¥°¥Õ¥¡¥¤¥ë', 'euc-jp'
+ ja "&No", '¤¤¤¤¤¨', 'euc-jp'
+ ja "&OK", 'λ²ò', 'euc-jp'
+ ja "OK", 'λ²ò', 'euc-jp'
+ ja "Ok", 'λ²ò', 'euc-jp'
+ ja "Open", '³«¤¯', 'euc-jp'
+ ja "&Open", '³«¤¯', 'euc-jp'
+ ja "Open Multiple Files", 'Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò³«¤¯', 'euc-jp'
+ ja "Paste", 'ޤêÉÕ¤±', 'euc-jp'
+ ja "Quit", '½ªÎ»', 'euc-jp'
+ ja "&Red", 'ÀÖ', 'euc-jp'
+ ja "Replace existing file?", '´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Þ¤¹¤«¡©', 'euc-jp'
+ ja "&Retry", 'ºÆ¼Â¹Ô', 'euc-jp'
+ ja "&Save", 'Êݸ', 'euc-jp'
+ ja "Save As", '̾Á°¤òÉÕ¤±¤ÆÊݸ', 'euc-jp'
+ ja "Save To Log", '¥í¥°¤òÊݸ', 'euc-jp'
+ ja "Select Log File", '¥í¥°¥Õ¥¡¥¤¥ë¤òÁªÂò', 'euc-jp'
+ ja "Select a file to source", '¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤òÁªÂò', 'euc-jp'
+ ja "&Selection:", 'ÁªÂò', 'euc-jp'
+ ja "Skip Messages", '¥á¥Ã¥»¡¼¥¸¤ò¤È¤Ð¤¹', 'euc-jp'
+ ja "Source...", '¥½¡¼¥¹...', 'euc-jp'
+ ja "Tcl Scripts", 'Tcl ¥¹¥¯¥ê¥×¥È', 'euc-jp'
ja "Tcl for Windows"
- ja "Text Files", 'テキストファイル', 'utf-8'
- ja "&Yes", 'ã¯ã„', 'utf-8'
- ja "abort", '中止', 'utf-8'
- ja "blue", 'é’', 'utf-8'
- ja "cancel", 'å–り消ã—', 'utf-8'
- ja "extension", 'æ‹¡å¼µå­', 'utf-8'
- ja "extensions", 'æ‹¡å¼µå­', 'utf-8'
- ja "green", 'ç·‘', 'utf-8'
- ja "ignore", '無視', 'utf-8'
- ja "ok", '了解', 'utf-8'
- ja "red", '赤', 'utf-8'
- ja "retry", 'å†å®Ÿè¡Œ', 'utf-8'
- ja "yes", 'ã¯ã„', 'utf-8'
+ ja "Text Files", '¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë', 'euc-jp'
+ ja "&Yes", '¤Ï¤¤', 'euc-jp'
+ ja "abort", '̾ȧ', 'euc-jp'
+ ja "blue", 'ÀÄ', 'euc-jp'
+ ja "cancel", '¼è¤ê¾Ã¤·', 'euc-jp'
+ ja "extension", '³ÈÄ¥»Ò', 'euc-jp'
+ ja "extensions", '³ÈÄ¥»Ò', 'euc-jp'
+ ja "green", 'ÎÐ', 'euc-jp'
+ ja "ignore", '̵»ë', 'euc-jp'
+ ja "ok", 'λ²ò', 'euc-jp'
+ ja "red", 'ÀÖ', 'euc-jp'
+ ja "retry", 'ºÆ¼Â¹Ô', 'euc-jp'
+ ja "yes", '¤Ï¤¤', 'euc-jp'
}
diff --git a/ext/tk/sample/msgs_tk/README b/ext/tk/sample/msgs_tk/README
index 062ec20cf8..c7422e3a9b 100644
--- a/ext/tk/sample/msgs_tk/README
+++ b/ext/tk/sample/msgs_tk/README
@@ -1,4 +1,4 @@
-Almost all of Message-Catalog files in this directory are quoted
+Almost all of Message-Catalog files in this directory are quoted
from Tcl/Tk8.5a1 source archive (only a little are modified for
'tkmsgcat-load_tk.rb'). Please read the file 'license.terms' in
this directry (That was included in demo directory of Tcl/Tk8.5a1).
diff --git a/ext/tk/sample/msgs_tk/el.msg b/ext/tk/sample/msgs_tk/el.msg
index ee75af3ced..1e3a539647 100644
--- a/ext/tk/sample/msgs_tk/el.msg
+++ b/ext/tk/sample/msgs_tk/el.msg
@@ -13,7 +13,7 @@ namespace eval ::tkmsgcat_demo {
}
-# followings are same to original file included into Tk8.5a1's widget demos.
+# followings are same to original file included into Tk8.5a1's widget demos.
## Messages for the Greek (Hellenic - "el") language.
## Please report any changes/suggestions to:
diff --git a/ext/tk/sample/msgs_tk/es.msg b/ext/tk/sample/msgs_tk/es.msg
index 62ce33d5cc..ba981236a3 100644
--- a/ext/tk/sample/msgs_tk/es.msg
+++ b/ext/tk/sample/msgs_tk/es.msg
@@ -69,7 +69,7 @@ namespace eval ::tk {
::msgcat::mcset es "Tcl Scripts" "Scripts Tcl"
::msgcat::mcset es "Tcl for Windows" "Tcl para Windows"
::msgcat::mcset es "Text Files" "Archivos de texto"
- ::msgcat::mcset es "&Yes" "&S\u00ed"
+ ::msgcat::mcset es "&Yes" "&S\u00ed"
::msgcat::mcset es "abort" "abortar"
::msgcat::mcset es "blue" "azul"
::msgcat::mcset es "cancel" "cancelar"
diff --git a/ext/tk/sample/msgs_tk/license.terms b/ext/tk/sample/msgs_tk/license.terms
index c0a44d3fc2..03ca6fcb31 100644
--- a/ext/tk/sample/msgs_tk/license.terms
+++ b/ext/tk/sample/msgs_tk/license.terms
@@ -28,7 +28,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
diff --git a/ext/tk/sample/msgs_tk/ru.msg b/ext/tk/sample/msgs_tk/ru.msg
index db009a4a52..a1192b7095 100644
--- a/ext/tk/sample/msgs_tk/ru.msg
+++ b/ext/tk/sample/msgs_tk/ru.msg
@@ -31,7 +31,7 @@ namespace eval ::tk {
::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>"
::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442."
::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:"
- ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s"
+ ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s"
::msgcat::mcset ru "Exit" "\u0412\u044b\u0445\u043e\u0434"
::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
"\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?"
@@ -47,7 +47,7 @@ namespace eval ::tk {
::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442"
::msgcat::mcset ru "Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c"
::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
- ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"."
+ ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"."
::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430"
::msgcat::mcset ru "&No" "&\u041d\u0435\u0442"
::msgcat::mcset ru "&OK" "&\u041e\u041a"
diff --git a/ext/tk/sample/safe-tk.rb b/ext/tk/sample/safe-tk.rb
index 38131c0155..2aeae235df 100644
--- a/ext/tk/sample/safe-tk.rb
+++ b/ext/tk/sample/safe-tk.rb
@@ -87,7 +87,7 @@ if false && Object.const_defined?(:RubyVM) && ::RubyVM.class == Class
Thread.new(l, &y).value
}).pack(:fill=>:x, :padx=>5)
else
- # KNOWN BUG::
+ # KNOWN BUG::
# Current multi-tk.rb cannot support long term threads on callbacks.
# Such a thread freezes the Ruby/Tk process.
end
diff --git a/ext/tk/sample/scrollframe.rb b/ext/tk/sample/scrollframe.rb
index e9d8af7ebf..6a9381d465 100644
--- a/ext/tk/sample/scrollframe.rb
+++ b/ext/tk/sample/scrollframe.rb
@@ -13,8 +13,6 @@
#
require 'tk'
-module Tk::RbWidget; end
-
class Tk::RbWidget::ScrollFrame < TkFrame
include TkComposite
@@ -211,7 +209,7 @@ end
# test
if __FILE__ == $0
- f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10,
+ f = Tk::RbWidget::ScrollFrame.new(:scrollbarwidth=>10,
:width=>300, :height=>200)
f.pack(:expand=>true, :fill=>:both)
@@ -236,13 +234,13 @@ if __FILE__ == $0
# 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.
+ # 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.
+ # add a horizontal scrollbar, and make the scrollframe scrollable.
Tk.after(15000){ f.hscroll(true) }
Tk.mainloop
diff --git a/ext/tk/sample/tcltklib/sample0.rb b/ext/tk/sample/tcltklib/sample0.rb
index 0ac303ae9e..cd4c8069b4 100644
--- a/ext/tk/sample/tcltklib/sample0.rb
+++ b/ext/tk/sample/tcltklib/sample0.rb
@@ -1,18 +1,18 @@
#! /usr/local/bin/ruby -vd
-# tcltklib ライブラリã®ãƒ†ã‚¹ãƒˆ
+# tcltklib ¥é¥¤¥Ö¥é¥ê¤Î¥Æ¥¹¥È
require "tcltklib"
def test
- # インタプリタを生æˆã™ã‚‹
+ # ¥¤¥ó¥¿¥×¥ê¥¿¤òÀ¸À®¤¹¤ë
ip1 = TclTkIp.new()
- # 評価ã—ã¦ã¿ã‚‹
+ # ɾ²Á¤·¤Æ¤ß¤ë
print ip1._return_value().inspect, "\n"
print ip1._eval("puts {abc}").inspect, "\n"
- # ボタンを作ã£ã¦ã¿ã‚‹
+ # ¥Ü¥¿¥ó¤òºî¤Ã¤Æ¤ß¤ë
print ip1._return_value().inspect, "\n"
print ip1._eval("button .lab -text exit -command \"destroy .\"").inspect,
"\n"
@@ -20,12 +20,12 @@ def test
print ip1._eval("pack .lab").inspect, "\n"
print ip1._return_value().inspect, "\n"
- # インタプリタã‹ã‚‰ ruby コマンドを評価ã—ã¦ã¿ã‚‹
+ # ¥¤¥ó¥¿¥×¥ê¥¿¤«¤é ruby ¥³¥Þ¥ó¥É¤òɾ²Á¤·¤Æ¤ß¤ë
# print ip1._eval(%q/ruby {print "print by ruby\n"}/).inspect, "\n"
print ip1._eval(%q+puts [ruby {print "print by ruby\n"; "puts by tcl/tk"}]+).inspect, "\n"
print ip1._return_value().inspect, "\n"
- # ã‚‚ã†ä¸€ã¤ã‚¤ãƒ³ã‚¿ãƒ—リタを生æˆã—ã¦ã¿ã‚‹
+ # ¤â¤¦°ì¤Ä¥¤¥ó¥¿¥×¥ê¥¿¤òÀ¸À®¤·¤Æ¤ß¤ë
ip2 = TclTkIp.new()
ip2._eval("button .lab -text test -command \"puts test ; destroy .\"")
ip2._eval("pack .lab")
diff --git a/ext/tk/sample/tcltklib/sample1.rb b/ext/tk/sample/tcltklib/sample1.rb
index 3235edfe0d..1965781533 100644
--- a/ext/tk/sample/tcltklib/sample1.rb
+++ b/ext/tk/sample/tcltklib/sample1.rb
@@ -1,131 +1,131 @@
#! /usr/local/bin/ruby -d
-# -*- encoding: utf-8 -*-
-# -d オプションを付ã‘ã‚‹ã¨, デãƒãƒƒã‚°æƒ…報を表示ã™ã‚‹.
+# -*- encoding: euc-jp -*-
+# -d ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤È, ¥Ç¥Ð¥Ã¥°¾ðÊó¤òɽ¼¨¤¹¤ë.
-# tcltk ライブラリã®ã‚µãƒ³ãƒ—ル
+# tcltk ¥é¥¤¥Ö¥é¥ê¤Î¥µ¥ó¥×¥ë
-# ã¾ãš, ライブラリを require ã™ã‚‹.
+# ¤Þ¤º, ¥é¥¤¥Ö¥é¥ê¤ò require ¤¹¤ë.
require "tcltk"
-# 以下ã¯, Test1 ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã® initialize() ã§,
-# tcl/tk ã«é–¢ã™ã‚‹å‡¦ç†ã‚’行ã†ä¾‹ã§ã‚ã‚‹.
-# å¿…ãšã—ã‚‚ãã®ã‚ˆã†ã«ã™ã‚‹å¿…è¦ã¯ç„¡ã,
-# (ã‚‚ã—, ãã†ã—ãŸã‘れã°) class ã®å¤–ã§ tcl/tk ã«é–¢ã™ã‚‹å‡¦ç†ã‚’行ã£ã¦ã‚‚良ã„.
+# °Ê²¼¤Ï, Test1 ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Î initialize() ¤Ç,
+# tcl/tk ¤Ë´Ø¤¹¤ë½èÍý¤ò¹Ô¤¦Îã¤Ç¤¢¤ë.
+# ɬ¤º¤·¤â¤½¤Î¤è¤¦¤Ë¤¹¤ëɬÍפÏ̵¤¯,
+# (¤â¤·, ¤½¤¦¤·¤¿¤±¤ì¤Ð) class ¤Î³°¤Ç tcl/tk ¤Ë´Ø¤¹¤ë½èÍý¤ò¹Ô¤Ã¤Æ¤âÎɤ¤.
class Test1
- # åˆæœŸåŒ–(インタプリタを生æˆã—ã¦ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’生æˆã™ã‚‹).
+ # ½é´ü²½(¥¤¥ó¥¿¥×¥ê¥¿¤òÀ¸À®¤·¤Æ¥¦¥£¥¸¥§¥Ã¥È¤òÀ¸À®¤¹¤ë).
def initialize()
- #### 使ã†å‰ã®ãŠã¾ã˜ãªã„
+ #### »È¤¦Á°¤Î¤ª¤Þ¤¸¤Ê¤¤
- # インタプリタã®ç”Ÿæˆ.
+ # ¥¤¥ó¥¿¥×¥ê¥¿¤ÎÀ¸À®.
ip = TclTkInterpreter.new()
- # コマンドã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトを c ã«è¨­å®šã—ã¦ãŠã.
+ # ¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ò c ¤ËÀßÄꤷ¤Æ¤ª¤¯.
c = ip.commands()
- # 使用ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトã¯å¤‰æ•°ã«å…¥ã‚Œã¦ãŠã.
+ # »ÈÍѤ¹¤ë¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ÏÊÑ¿ô¤ËÆþ¤ì¤Æ¤ª¤¯.
append, bind, button, destroy, incr, info, label, place, set, wm =
c.values_at(
"append", "bind", "button", "destroy", "incr", "info", "label", "place",
"set", "wm")
- #### tcl/tk ã®ã‚³ãƒžãƒ³ãƒ‰ã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクト(TclTkCommand)ã®æ“作
+ #### tcl/tk ¤Î¥³¥Þ¥ó¥É¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È(TclTkCommand)¤ÎÁàºî
- # 実行ã™ã‚‹æ™‚ã¯, e() メソッドを使ã†.
- # (以下ã¯, tcl/tk ã«ãŠã‘ã‚‹ info command r* を実行.)
+ # ¼Â¹Ô¤¹¤ë»þ¤Ï, e() ¥á¥½¥Ã¥É¤ò»È¤¦.
+ # (°Ê²¼¤Ï, tcl/tk ¤Ë¤ª¤±¤ë info command r* ¤ò¼Â¹Ô.)
print info.e("command", "r*"), "\n"
- # 引数ã¯, ã¾ã¨ã‚ãŸæ–‡å­—列ã«ã—ã¦ã‚‚åŒã˜.
+ # °ú¿ô¤Ï, ¤Þ¤È¤á¤¿Ê¸»úÎó¤Ë¤·¤Æ¤âƱ¤¸.
print info.e("command r*"), "\n"
- # 変数を用ã„ãªãã¨ã‚‚実行ã§ãã‚‹ãŒ, 見ãŸã‚ãŒæ‚ªã„.
+ # ÊÑ¿ô¤òÍѤ¤¤Ê¤¯¤È¤â¼Â¹Ô¤Ç¤­¤ë¤¬, ¸«¤¿¤á¤¬°­¤¤.
print c["info"].e("command", "r*"), "\n"
- # インタプリタã®ãƒ¡ã‚½ãƒƒãƒ‰ã¨ã—ã¦ã‚‚実行ã§ãã‚‹ãŒ, åŠ¹çŽ‡ãŒæ‚ªã„.
+ # ¥¤¥ó¥¿¥×¥ê¥¿¤Î¥á¥½¥Ã¥É¤È¤·¤Æ¤â¼Â¹Ô¤Ç¤­¤ë¤¬, ¸úΨ¤¬°­¤¤.
print ip.info("command", "r*"), "\n"
####
- # 以下, 生æˆã—ãŸã‚ªãƒ–ジェクトã¯å¤‰æ•°ã«ä»£å…¥ã—ã¦ãŠã‹ãªã„ã¨
- # GC ã®å¯¾è±¡ã«ãªã£ã¦ã—ã¾ã†.
+ # °Ê²¼, À¸À®¤·¤¿¥ª¥Ö¥¸¥§¥¯¥È¤ÏÊÑ¿ô¤ËÂåÆþ¤·¤Æ¤ª¤«¤Ê¤¤¤È
+ # GC ¤ÎÂоݤˤʤäƤ·¤Þ¤¦.
- #### tcl/tk ã®å¤‰æ•°ã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクト(TclTkVariable)ã®æ“作
+ #### tcl/tk ¤ÎÊÑ¿ô¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È(TclTkVariable)¤ÎÁàºî
- # 生æˆã¨åŒæ™‚ã«å€¤ã‚’設定ã™ã‚‹.
+ # À¸À®¤ÈƱ»þ¤ËÃͤòÀßÄꤹ¤ë.
v1 = TclTkVariable.new(ip, "20")
- # 読ã¿å‡ºã—㯠get メソッドを使ã†.
+ # ÆÉ¤ß½Ð¤·¤Ï get ¥á¥½¥Ã¥É¤ò»È¤¦.
print v1.get(), "\n"
- # 設定㯠set メソッドを使ã†.
+ # ÀßÄê¤Ï set ¥á¥½¥Ã¥É¤ò»È¤¦.
v1.set(40)
print v1.get(), "\n"
- # set コマンドを使ã£ã¦èª­ã¿å‡ºã—, 設定ã¯å¯èƒ½ã ãŒè¦‹ãŸã‚ãŒæ‚ªã„.
- # e() メソッド等ã®å¼•æ•°ã«ç›´æŽ¥ TclTkObject や数値を書ã„ã¦ã‚‚良ã„.
+ # set ¥³¥Þ¥ó¥É¤ò»È¤Ã¤ÆÆÉ¤ß½Ð¤·, ÀßÄê¤Ï²Äǽ¤À¤¬¸«¤¿¤á¤¬°­¤¤.
+ # e() ¥á¥½¥Ã¥ÉÅù¤Î°ú¿ô¤ËľÀÜ TclTkObject ¤ä¿ôÃͤò½ñ¤¤¤Æ¤âÎɤ¤.
set.e(v1, 30)
print set.e(v1), "\n"
- # tcl/tk ã®ã‚³ãƒžãƒ³ãƒ‰ã§å¤‰æ•°ã‚’æ“作ã§ãã‚‹.
+ # tcl/tk ¤Î¥³¥Þ¥ó¥É¤ÇÊÑ¿ô¤òÁàºî¤Ç¤­¤ë.
incr.e(v1)
print v1.get(), "\n"
append.e(v1, 10)
print v1.get(), "\n"
- #### tcl/tk ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクト(TclTkWidget)ã®æ“作
+ #### tcl/tk ¤Î¥¦¥£¥¸¥§¥Ã¥È¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È(TclTkWidget)¤ÎÁàºî
- # ルートウィジェットをå–り出ã™.
+ # ¥ë¡¼¥È¥¦¥£¥¸¥§¥Ã¥È¤ò¼è¤ê½Ð¤¹.
root = ip.rootwidget()
- # ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®æ“作.
+ # ¥¦¥£¥¸¥§¥Ã¥È¤ÎÁàºî.
root.e("configure -height 300 -width 300")
- # タイトルを付ã‘ã‚‹ã¨ã㯠wm を使ã†.
+ # ¥¿¥¤¥È¥ë¤òÉÕ¤±¤ë¤È¤­¤Ï wm ¤ò»È¤¦.
wm.e("title", root, $0)
- # 親ウィジェットã¨ã‚³ãƒžãƒ³ãƒ‰ã‚’指定ã—ã¦, ウィジェットを作る.
+ # ¿Æ¥¦¥£¥¸¥§¥Ã¥È¤È¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Æ, ¥¦¥£¥¸¥§¥Ã¥È¤òºî¤ë.
l1 = TclTkWidget.new(ip, root, label, "-text {type `x' to print}")
- # place ã™ã‚‹ã¨è¡¨ç¤ºã•れる.
+ # place ¤¹¤ë¤Èɽ¼¨¤µ¤ì¤ë.
place.e(l1, "-x 0 -rely 0.0 -relwidth 1 -relheight 0.1")
- # コマンドåã¯æ–‡å­—åˆ—ã§æŒ‡å®šã—ã¦ã‚‚良ã„ãŒ, 見ãŸã‚ãŒæ‚ªã„.
- # (コマンドåã¯ç‹¬ç«‹ã—ãŸå¼•æ•°ã§ãªã‘れã°ãªã‚‰ãªã„.)
+ # ¥³¥Þ¥ó¥É̾¤Ïʸ»úÎó¤Ç»ØÄꤷ¤Æ¤âÎɤ¤¤¬, ¸«¤¿¤á¤¬°­¤¤.
+ # (¥³¥Þ¥ó¥É̾¤ÏÆÈΩ¤·¤¿°ú¿ô¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.)
l2 = TclTkWidget.new(ip, root, "label")
- # ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®æ“作.
+ # ¥¦¥£¥¸¥§¥Ã¥È¤ÎÁàºî.
l2.e("configure -text {type `q' to exit}")
place.e(l2, "-x 0 -rely 0.1 -relwidth 1 -relheight 0.1")
- #### tcl/tk ã®ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクト(TclTkCallback)ã®æ“作
+ #### tcl/tk ¤Î¥³¡¼¥ë¥Ð¥Ã¥¯¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È(TclTkCallback)¤ÎÁàºî
- # コールãƒãƒƒã‚¯ã‚’生æˆã™ã‚‹.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯¤òÀ¸À®¤¹¤ë.
c1 = TclTkCallback.new(ip, proc{sample(ip, root)})
- # コールãƒãƒƒã‚¯ã‚’æŒã¤ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’生æˆã™ã‚‹.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯¤ò»ý¤Ä¥¦¥£¥¸¥§¥Ã¥È¤òÀ¸À®¤¹¤ë.
b1 = TclTkWidget.new(ip, root, button, "-text sample -command", c1)
place.e(b1, "-x 0 -rely 0.2 -relwidth 1 -relheight 0.1")
- # イベントループを抜ã‘ã‚‹ã«ã¯ destroy.e(root) ã™ã‚‹.
+ # ¥¤¥Ù¥ó¥È¥ë¡¼¥×¤òÈ´¤±¤ë¤Ë¤Ï destroy.e(root) ¤¹¤ë.
c2 = TclTkCallback.new(ip, proc{destroy.e(root)})
b2 = TclTkWidget.new(ip, root, button, "-text exit -command", c2)
place.e(b2, "-x 0 -rely 0.3 -relwidth 1 -relheight 0.1")
- #### イベントã®ãƒã‚¤ãƒ³ãƒ‰
- # script ã®è¿½åŠ  (bind tag sequence +script) ã¯ä»Šã®ã¨ã“ã‚ã§ããªã„.
- # (イテレータ変数ã®è¨­å®šãŒã†ã¾ãã„ã‹ãªã„.)
+ #### ¥¤¥Ù¥ó¥È¤Î¥Ð¥¤¥ó¥É
+ # script ¤ÎÄɲà (bind tag sequence +script) ¤Ïº£¤Î¤È¤³¤í¤Ç¤­¤Ê¤¤.
+ # (¥¤¥Æ¥ì¡¼¥¿ÊÑ¿ô¤ÎÀßÄ꤬¤¦¤Þ¤¯¤¤¤«¤Ê¤¤.)
- # 基本的ã«ã¯ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã«å¯¾ã™ã‚‹ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ã¨åŒã˜.
+ # ´ðËÜŪ¤Ë¤Ï¥¦¥£¥¸¥§¥Ã¥È¤ËÂФ¹¤ë¥³¡¼¥ë¥Ð¥Ã¥¯¤ÈƱ¤¸.
c3 = TclTkCallback.new(ip, proc{print("q pressed\n"); destroy.e(root)})
bind.e(root, "q", c3)
- # bind コマンド㧠% ç½®æ›ã«ã‚ˆã‚Šãƒ‘ラメータをå—ã‘å–りãŸã„ã¨ãã¯,
- # proc{} ã®å¾Œã‚ã«æ–‡å­—åˆ—ã§æŒ‡å®šã™ã‚‹ã¨,
- # ç½®æ›çµæžœã‚’イテレータ変数を通ã—ã¦å—ã‘å–ã‚‹ã“ã¨ãŒã§ãã‚‹.
- # ãŸã ã— proc{} ã®å¾Œã‚ã®æ–‡å­—列ã¯,
- # bind コマンドã«ä¸Žãˆã‚‹ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ä»¥å¤–ã§æŒ‡å®šã—ã¦ã¯ã„ã‘ãªã„.
+ # bind ¥³¥Þ¥ó¥É¤Ç % ÃÖ´¹¤Ë¤è¤ê¥Ñ¥é¥á¡¼¥¿¤ò¼õ¤±¼è¤ê¤¿¤¤¤È¤­¤Ï,
+ # proc{} ¤Î¸å¤í¤Ëʸ»úÎó¤Ç»ØÄꤹ¤ë¤È,
+ # ÃÖ´¹·ë²Ì¤ò¥¤¥Æ¥ì¡¼¥¿ÊÑ¿ô¤òÄ̤·¤Æ¼õ¤±¼è¤ë¤³¤È¤¬¤Ç¤­¤ë.
+ # ¤¿¤À¤· proc{} ¤Î¸å¤í¤Îʸ»úÎó¤Ï,
+ # bind ¥³¥Þ¥ó¥É¤ËÍ¿¤¨¤ë¥³¡¼¥ë¥Ð¥Ã¥¯°Ê³°¤Ç»ØÄꤷ¤Æ¤Ï¤¤¤±¤Ê¤¤.
c4 = TclTkCallback.new(ip, proc{|i| print("#{i} pressed\n")}, "%A")
bind.e(root, "x", c4)
- # TclTkCallback ã‚’ GC ã®å¯¾è±¡ã«ã—ãŸã‘れã°,
- # dcb() (ã¾ãŸã¯ deletecallbackkeys()) ã™ã‚‹å¿…è¦ãŒã‚ã‚‹.
+ # TclTkCallback ¤ò GC ¤ÎÂоݤˤ·¤¿¤±¤ì¤Ð,
+ # dcb() (¤Þ¤¿¤Ï deletecallbackkeys()) ¤¹¤ëɬÍפ¬¤¢¤ë.
cb = [c1, c2, c3, c4]
c5 = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, root, w)}, "%W")
bind.e(root, "<Destroy>", c5)
cb.push(c5)
- #### tcl/tk ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã«å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクト(TclTkImage)ã®æ“作
+ #### tcl/tk ¤Î¥¤¥á¡¼¥¸¤ËÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È(TclTkImage)¤ÎÁàºî
- # データを指定ã—ã¦ç”Ÿæˆã™ã‚‹.
+ # ¥Ç¡¼¥¿¤ò»ØÄꤷ¤ÆÀ¸À®¤¹¤ë.
i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
- # ラベルã«å¼µã‚Šä»˜ã‘ã¦ã¿ã‚‹.
+ # ¥é¥Ù¥ë¤ËÄ¥¤êÉÕ¤±¤Æ¤ß¤ë.
l3 = TclTkWidget.new(ip, root, label, "-relief raised -image", i1)
place.e(l3, "-x 0 -rely 0.4 -relwidth 0.2 -relheight 0.2")
- # 空ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’生æˆã—ã¦å¾Œã§æ“作ã™ã‚‹.
+ # ¶õ¤Î¥¤¥á¡¼¥¸¤òÀ¸À®¤·¤Æ¸å¤ÇÁàºî¤¹¤ë.
i2 = TclTkImage.new(ip, "photo")
- # イメージをæ“作ã™ã‚‹.
+ # ¥¤¥á¡¼¥¸¤òÁàºî¤¹¤ë.
i2.e("copy", i1)
i2.e("configure -gamma 0.5")
l4 = TclTkWidget.new(ip, root, label, "-relief raised -image", i2)
@@ -134,26 +134,26 @@ class Test1
####
end
- # サンプルã®ãŸã‚ã®ã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã‚’生æˆã™ã‚‹.
+ # ¥µ¥ó¥×¥ë¤Î¤¿¤á¤Î¥¦¥£¥¸¥§¥Ã¥È¤òÀ¸À®¤¹¤ë.
def sample(ip, parent)
bind, button, destroy, grid, toplevel, wm = ip.commands().values_at(
"bind", "button", "destroy", "grid", "toplevel", "wm")
## toplevel
- # æ–°ã—ã„ウインドウを開ãã«ã¯, toplevel を使ã†.
+ # ¿·¤·¤¤¥¦¥¤¥ó¥É¥¦¤ò³«¤¯¤Ë¤Ï, toplevel ¤ò»È¤¦.
t1 = TclTkWidget.new(ip, parent, toplevel)
- # タイトルを付ã‘ã¦ãŠã
+ # ¥¿¥¤¥È¥ë¤òÉÕ¤±¤Æ¤ª¤¯
wm.e("title", t1, "sample")
- # ウィジェットãŒç ´å£Šã•れãŸã¨ã, コールãƒãƒƒã‚¯ãŒ GC ã®å¯¾è±¡ã«ãªã‚‹ã‚ˆã†ã«ã™ã‚‹.
+ # ¥¦¥£¥¸¥§¥Ã¥È¤¬Ç˲õ¤µ¤ì¤¿¤È¤­, ¥³¡¼¥ë¥Ð¥Ã¥¯¤¬ GC ¤ÎÂоݤˤʤë¤è¤¦¤Ë¤¹¤ë.
cb = []
cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
bind.e(t1, "<Destroy>", c)
- # ボタンã®ç”Ÿæˆ.
+ # ¥Ü¥¿¥ó¤ÎÀ¸À®.
wid = []
- # toplevel ウィジェットを破壊ã™ã‚‹ã«ã¯ destroy ã™ã‚‹.
+ # toplevel ¥¦¥£¥¸¥§¥Ã¥È¤òÇ˲õ¤¹¤ë¤Ë¤Ï destroy ¤¹¤ë.
cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
wid.push(TclTkWidget.new(ip, t1, button, "-text close -command", c))
cb.push(c = TclTkCallback.new(ip, proc{test_label(ip, t1)}))
@@ -183,7 +183,7 @@ class Test1
cb.push(c = TclTkCallback.new(ip, proc{test_canvas(ip, t1)}))
wid.push(TclTkWidget.new(ip, t1, button, "-text canvas -command", c))
- # grid ã§è¡¨ç¤ºã™ã‚‹.
+ # grid ¤Çɽ¼¨¤¹¤ë.
ro = co = 0
wid.each{|w|
grid.e(w, "-row", ro, "-column", co, "-sticky news")
@@ -196,38 +196,38 @@ class Test1
end
# inittoplevel(ip, parent, title)
- # 以下ã®å‡¦ç†ã‚’ã¾ã¨ã‚ã¦è¡Œã†.
- # 1. toplevel ウィジェットを作æˆã™ã‚‹.
- # 2. コールãƒãƒƒã‚¯ã‚’登録ã™ã‚‹é…列を用æ„ã—, toplevel ウィジェットã®
- # <Destroy> イベントã«ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ã‚’削除ã™ã‚‹æ‰‹ç¶šãを登録ã™ã‚‹.
- # 3. クローズボタンを作る.
- # 作æˆã—㟠toplevel ウィジェット, クローズボタン, コールãƒãƒƒã‚¯ç™»éŒ²ç”¨å¤‰æ•°
- # ã‚’è¿”ã™.
- # ip: インタプリタ
- # parent: 親ウィジェット
- # title: toplevel ウィジェットã®ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã®ã‚¿ã‚¤ãƒˆãƒ«
+ # °Ê²¼¤Î½èÍý¤ò¤Þ¤È¤á¤Æ¹Ô¤¦.
+ # 1. toplevel ¥¦¥£¥¸¥§¥Ã¥È¤òºîÀ®¤¹¤ë.
+ # 2. ¥³¡¼¥ë¥Ð¥Ã¥¯¤òÅÐÏ¿¤¹¤ëÇÛÎó¤òÍѰդ·, toplevel ¥¦¥£¥¸¥§¥Ã¥È¤Î
+ # <Destroy> ¥¤¥Ù¥ó¥È¤Ë¥³¡¼¥ë¥Ð¥Ã¥¯¤òºï½ü¤¹¤ë¼ê³¤­¤òÅÐÏ¿¤¹¤ë.
+ # 3. ¥¯¥í¡¼¥º¥Ü¥¿¥ó¤òºî¤ë.
+ # ºîÀ®¤·¤¿ toplevel ¥¦¥£¥¸¥§¥Ã¥È, ¥¯¥í¡¼¥º¥Ü¥¿¥ó, ¥³¡¼¥ë¥Ð¥Ã¥¯ÅÐÏ¿ÍÑÊÑ¿ô
+ # ¤òÊÖ¤¹.
+ # ip: ¥¤¥ó¥¿¥×¥ê¥¿
+ # parent: ¿Æ¥¦¥£¥¸¥§¥Ã¥È
+ # title: toplevel ¥¦¥£¥¸¥§¥Ã¥È¤Î¥¦¥¤¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë
def inittoplevel(ip, parent, title)
bind, button, destroy, toplevel, wm = ip.commands().values_at(
"bind", "button", "destroy", "toplevel", "wm")
- # æ–°ã—ã„ウインドウを開ãã«ã¯, toplevel を使ã†.
+ # ¿·¤·¤¤¥¦¥¤¥ó¥É¥¦¤ò³«¤¯¤Ë¤Ï, toplevel ¤ò»È¤¦.
t1 = TclTkWidget.new(ip, parent, toplevel)
- # タイトルを付ã‘ã¦ãŠã
+ # ¥¿¥¤¥È¥ë¤òÉÕ¤±¤Æ¤ª¤¯
wm.e("title", t1, title)
- # ウィジェットãŒç ´å£Šã•れãŸã¨ã, コールãƒãƒƒã‚¯ãŒ GC ã®å¯¾è±¡ã«ãªã‚‹ã‚ˆã†ã«ã™ã‚‹.
+ # ¥¦¥£¥¸¥§¥Ã¥È¤¬Ç˲õ¤µ¤ì¤¿¤È¤­, ¥³¡¼¥ë¥Ð¥Ã¥¯¤¬ GC ¤ÎÂоݤˤʤë¤è¤¦¤Ë¤¹¤ë.
cb = []
cb.push(c = TclTkCallback.new(ip, proc{|w| TclTk.dcb(cb, t1, w)}, "%W"))
bind.e(t1, "<Destroy>", c)
- # close ボタンを作ã£ã¦ãŠã.
- # toplevel ウィジェットを破壊ã™ã‚‹ã«ã¯ destroy ã™ã‚‹.
+ # close ¥Ü¥¿¥ó¤òºî¤Ã¤Æ¤ª¤¯.
+ # toplevel ¥¦¥£¥¸¥§¥Ã¥È¤òÇ˲õ¤¹¤ë¤Ë¤Ï destroy ¤¹¤ë.
cb.push(c = TclTkCallback.new(ip, proc{destroy.e(t1)}))
b1 = TclTkWidget.new(ip, t1, button, "-text close -command", c)
return t1, b1, cb
end
- # label ã®ã‚µãƒ³ãƒ—ル.
+ # label ¤Î¥µ¥ó¥×¥ë.
def test_label(ip, parent)
button, global, label, pack = ip.commands().values_at(
"button", "global", "label", "pack")
@@ -235,7 +235,7 @@ class Test1
## label
- # ã„ã‚ã„ã‚ãªå½¢ã®ãƒ©ãƒ™ãƒ«.
+ # ¤¤¤í¤¤¤í¤Ê·Á¤Î¥é¥Ù¥ë.
l1 = TclTkWidget.new(ip, t1, label, "-text {default(flat)}")
l2 = TclTkWidget.new(ip, t1, label, "-text raised -relief raised")
l3 = TclTkWidget.new(ip, t1, label, "-text sunken -relief sunken")
@@ -244,23 +244,23 @@ class Test1
l6 = TclTkWidget.new(ip, t1, label, "-bitmap error")
l7 = TclTkWidget.new(ip, t1, label, "-bitmap questhead")
- # pack ã—ã¦ã‚‚表示ã•れる.
+ # pack ¤·¤Æ¤âɽ¼¨¤µ¤ì¤ë.
pack.e(b1, l1, l2, l3, l4, l5, l6, l7, "-pady 3")
## -textvariable
- # tcltk ライブラリã®å®Ÿè£…ã§ã¯, コールãƒãƒƒã‚¯ã¯ tcl/tk ã®``手続ã''を通ã—ã¦
- # 呼ã°ã‚Œã‚‹. ã—ãŸãŒã£ã¦, コールãƒãƒƒã‚¯ã®ä¸­ã§(大域)変数ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã¨ãã¯,
- # global ã™ã‚‹å¿…è¦ãŒã‚ã‚‹.
- # global ã™ã‚‹å‰ã«å¤‰æ•°ã«å€¤ã‚’設定ã—ã¦ã—ã¾ã†ã¨ã‚¨ãƒ©ãƒ¼ã«ãªã‚‹ã®ã§,
- # tcl/tk ã«ãŠã‘る表ç¾å½¢ã ã‘生æˆã—ã¦, 実際ã«å€¤ã‚’設定ã—ãªã„よã†ã«,
- # 2 番目ã®å¼•æ•°ã«ã¯ nil を与ãˆã‚‹.
+ # tcltk ¥é¥¤¥Ö¥é¥ê¤Î¼ÂÁõ¤Ç¤Ï, ¥³¡¼¥ë¥Ð¥Ã¥¯¤Ï tcl/tk ¤Î``¼ê³¤­''¤òÄ̤·¤Æ
+ # ¸Æ¤Ð¤ì¤ë. ¤·¤¿¤¬¤Ã¤Æ, ¥³¡¼¥ë¥Ð¥Ã¥¯¤ÎÃæ¤Ç(Âç°è)ÊÑ¿ô¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤­¤Ï,
+ # global ¤¹¤ëɬÍפ¬¤¢¤ë.
+ # global ¤¹¤ëÁ°¤ËÊÑ¿ô¤ËÃͤòÀßÄꤷ¤Æ¤·¤Þ¤¦¤È¥¨¥é¡¼¤Ë¤Ê¤ë¤Î¤Ç,
+ # tcl/tk ¤Ë¤ª¤±¤ëɽ¸½·Á¤À¤±À¸À®¤·¤Æ, ¼ÂºÝ¤ËÃͤòÀßÄꤷ¤Ê¤¤¤è¤¦¤Ë,
+ # 2 ÈÖÌܤΰú¿ô¤Ë¤Ï nil ¤òÍ¿¤¨¤ë.
v1 = TclTkVariable.new(ip, nil)
global.e(v1)
v1.set(100)
- # -textvariable ã§å¤‰æ•°ã‚’設定ã™ã‚‹.
+ # -textvariable ¤ÇÊÑ¿ô¤òÀßÄꤹ¤ë.
l6 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
- # コールãƒãƒƒã‚¯ã®ä¸­ã‹ã‚‰å¤‰æ•°ã‚’æ“作ã™ã‚‹.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯¤ÎÃæ¤«¤éÊÑ¿ô¤òÁàºî¤¹¤ë.
cb.push(c = TclTkCallback.new(ip, proc{
global.e(v1); v1.set(v1.get().to_i + 10)}))
b2 = TclTkWidget.new(ip, t1, button, "-text +10 -command", c)
@@ -270,14 +270,14 @@ class Test1
pack.e(l6, b2, b3)
end
- # button ã®ã‚µãƒ³ãƒ—ル.
+ # button ¤Î¥µ¥ó¥×¥ë.
def test_button(ip, parent)
button, pack = ip.commands().values_at("button", "pack")
t1, b1, cb = inittoplevel(ip, parent, "button")
## button
- # コールãƒãƒƒã‚¯å†…ã§å‚ç…§ã™ã‚‹å¤‰æ•°ã¯å…ˆã«å®£è¨€ã—ã¦ãŠã‹ãªã‘れã°ãªã‚‰ãªã„.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯Æâ¤Ç»²¾È¤¹¤ëÊÑ¿ô¤ÏÀè¤ËÀë¸À¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.
b3 = b4 = nil
cb.push(c = TclTkCallback.new(ip, proc{b3.e("flash"); b4.e("flash")}))
b2 = TclTkWidget.new(ip, t1, button, "-text flash -command", c)
@@ -288,7 +288,7 @@ class Test1
pack.e(b1, b2, b3, b4)
end
- # checkbutton ã®ã‚µãƒ³ãƒ—ル.
+ # checkbutton ¤Î¥µ¥ó¥×¥ë.
def test_checkbutton(ip, parent)
checkbutton, global, pack = ip.commands().values_at(
"checkbutton", "global", "pack")
@@ -298,13 +298,13 @@ class Test1
v1 = TclTkVariable.new(ip, nil)
global.e(v1)
- # -variable ã§å¤‰æ•°ã‚’設定ã™ã‚‹.
+ # -variable ¤ÇÊÑ¿ô¤òÀßÄꤹ¤ë.
ch1 = TclTkWidget.new(ip, t1, checkbutton, "-onvalue on -offvalue off",
"-textvariable", v1, "-variable", v1)
pack.e(b1, ch1)
end
- # radiobutton ã®ã‚µãƒ³ãƒ—ル.
+ # radiobutton ¤Î¥µ¥ó¥×¥ë.
def test_radiobutton(ip, parent)
global, label, pack, radiobutton = ip.commands().values_at(
"global", "label", "pack", "radiobutton")
@@ -314,10 +314,10 @@ class Test1
v1 = TclTkVariable.new(ip, nil)
global.e(v1)
- # ヌルストリング㯠"{}" ã§æŒ‡å®šã™ã‚‹.
+ # ¥Ì¥ë¥¹¥È¥ê¥ó¥°¤Ï "{}" ¤Ç»ØÄꤹ¤ë.
v1.set("{}")
l1 = TclTkWidget.new(ip, t1, label, "-textvariable", v1)
- # -variable ã§åŒã˜å¤‰æ•°ã‚’指定ã™ã‚‹ã¨åŒã˜ã‚°ãƒ«ãƒ¼ãƒ—ã«ãªã‚‹.
+ # -variable ¤ÇƱ¤¸ÊÑ¿ô¤ò»ØÄꤹ¤ë¤ÈƱ¤¸¥°¥ë¡¼¥×¤Ë¤Ê¤ë.
ra1 = TclTkWidget.new(ip, t1, radiobutton,
"-text radio1 -value r1 -variable", v1)
ra2 = TclTkWidget.new(ip, t1, radiobutton,
@@ -328,7 +328,7 @@ class Test1
pack.e(b1, l1, ra1, ra2, ra3)
end
- # scale ã®ã‚µãƒ³ãƒ—ル.
+ # scale ¤Î¥µ¥ó¥×¥ë.
def test_scale(ip, parent)
global, pack, scale = ip.commands().values_at(
"global", "pack", "scale")
@@ -339,7 +339,7 @@ class Test1
v1 = TclTkVariable.new(ip, nil)
global.e(v1)
v1.set(219)
- # コールãƒãƒƒã‚¯å†…ã§å‚ç…§ã™ã‚‹å¤‰æ•°ã¯å…ˆã«å®£è¨€ã—ã¦ãŠã‹ãªã‘れã°ãªã‚‰ãªã„.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯Æâ¤Ç»²¾È¤¹¤ëÊÑ¿ô¤ÏÀè¤ËÀë¸À¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.
sca1 = nil
cb.push(c = TclTkCallback.new(ip, proc{global.e(v1); v = v1.get();
sca1.e("configure -background", format("#%02x%02x%02x", v, v, v))}))
@@ -348,7 +348,7 @@ class Test1
pack.e(b1, sca1)
end
- # entry ã®ã‚µãƒ³ãƒ—ル.
+ # entry ¤Î¥µ¥ó¥×¥ë.
def test_entry(ip, parent)
button, entry, global, pack = ip.commands().values_at(
"button", "entry", "global", "pack")
@@ -358,7 +358,7 @@ class Test1
v1 = TclTkVariable.new(ip, nil)
global.e(v1)
- # ヌルストリング㯠"{}" ã§æŒ‡å®šã™ã‚‹.
+ # ¥Ì¥ë¥¹¥È¥ê¥ó¥°¤Ï "{}" ¤Ç»ØÄꤹ¤ë.
v1.set("{}")
en1 = TclTkWidget.new(ip, t1, entry, "-textvariable", v1)
cb.push(c = TclTkCallback.new(ip, proc{
@@ -367,7 +367,7 @@ class Test1
pack.e(b1, en1, b2)
end
- # text ã®ã‚µãƒ³ãƒ—ル.
+ # text ¤Î¥µ¥ó¥×¥ë.
def test_text(ip, parent)
button, pack, text = ip.commands().values_at(
"button", "pack", "text")
@@ -377,13 +377,13 @@ class Test1
te1 = TclTkWidget.new(ip, t1, text)
cb.push(c = TclTkCallback.new(ip, proc{
- # 1 行目㮠0 文字目ã‹ã‚‰æœ€å¾Œã¾ã§ã‚’表示ã—, 削除ã™ã‚‹.
+ # 1 ¹ÔÌܤΠ0 ʸ»úÌܤ«¤éºÇ¸å¤Þ¤Ç¤òɽ¼¨¤·, ºï½ü¤¹¤ë.
print(te1.e("get 1.0 end")); te1.e("delete 1.0 end")}))
b2 = TclTkWidget.new(ip, t1, button, "-text print -command", c)
pack.e(b1, te1, b2)
end
- # raise/lower ã®ã‚µãƒ³ãƒ—ル.
+ # raise/lower ¤Î¥µ¥ó¥×¥ë.
def test_raise(ip, parent)
button, frame, lower, pack, raise = ip.commands().values_at(
"button", "frame", "lower", "pack", "raise")
@@ -391,9 +391,9 @@ class Test1
## raise/lower
- # button ã‚’éš ã™ãƒ†ã‚¹ãƒˆã®ãŸã‚ã«, frame を使ã†.
+ # button ¤ò±£¤¹¥Æ¥¹¥È¤Î¤¿¤á¤Ë, frame ¤ò»È¤¦.
f1 = TclTkWidget.new(ip, t1, frame)
- # コールãƒãƒƒã‚¯å†…ã§å‚ç…§ã™ã‚‹å¤‰æ•°ã¯å…ˆã«å®£è¨€ã—ã¦ãŠã‹ãªã‘れã°ãªã‚‰ãªã„.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯Æâ¤Ç»²¾È¤¹¤ëÊÑ¿ô¤ÏÀè¤ËÀë¸À¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.
b2 = nil
cb.push(c = TclTkCallback.new(ip, proc{raise.e(f1, b2)}))
b2 = TclTkWidget.new(ip, t1, button, "-text raise -command", c)
@@ -405,21 +405,21 @@ class Test1
pack.e(b1, f1)
end
- # modal ãªã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ã‚µãƒ³ãƒ—ル.
+ # modal ¤Ê¥¦¥£¥¸¥§¥Ã¥È¤Î¥µ¥ó¥×¥ë.
def test_modal(ip, parent)
button, frame, message, pack, tk_chooseColor, tk_getOpenFile,
tk_messageBox = ip.commands().values_at(
"button", "frame", "message", "pack", "tk_chooseColor",
"tk_getOpenFile", "tk_messageBox")
- # 最åˆã« load ã•れã¦ã„ãªã„ライブラリ㯠ip.commands() ã«å­˜åœ¨ã—ãªã„ã®ã§,
- # TclTkLibCommand を生æˆã™ã‚‹å¿…è¦ãŒã‚ã‚‹.
+ # ºÇ½é¤Ë load ¤µ¤ì¤Æ¤¤¤Ê¤¤¥é¥¤¥Ö¥é¥ê¤Ï ip.commands() ¤Ë¸ºß¤·¤Ê¤¤¤Î¤Ç,
+ # TclTkLibCommand ¤òÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ë.
tk_dialog = TclTkLibCommand.new(ip, "tk_dialog")
t1, b1, cb = inittoplevel(ip, parent, "message/modal")
## message
- mes = "ã“れ㯠message ウィジェットã®ãƒ†ã‚¹ãƒˆã§ã™."
- mes += "以下㯠modal ãªã‚¦ã‚£ã‚¸ã‚§ãƒƒãƒˆã®ãƒ†ã‚¹ãƒˆã§ã™."
+ mes = "¤³¤ì¤Ï message ¥¦¥£¥¸¥§¥Ã¥È¤Î¥Æ¥¹¥È¤Ç¤¹."
+ mes += "°Ê²¼¤Ï modal ¤Ê¥¦¥£¥¸¥§¥Ã¥È¤Î¥Æ¥¹¥È¤Ç¤¹."
me1 = TclTkWidget.new(ip, t1, message, "-text {#{mes}}")
## modal
@@ -431,7 +431,7 @@ class Test1
b2 = TclTkWidget.new(ip, t1, button, "-text messageBox -command", c)
# tk_dialog
cb.push(c = TclTkCallback.new(ip, proc{
- # ウィジェットåを生æˆã™ã‚‹ãŸã‚ã«ãƒ€ãƒŸãƒ¼ã® frame を生æˆ.
+ # ¥¦¥£¥¸¥§¥Ã¥È̾¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¥À¥ß¡¼¤Î frame ¤òÀ¸À®.
print tk_dialog.e(TclTkWidget.new(ip, t1, frame),
"dialog dialog error 2 yes no cancel"), "\n"}))
b3 = TclTkWidget.new(ip, t1, button, "-text dialog -command", c)
@@ -449,7 +449,7 @@ class Test1
pack.e(b1, me1, b2, b3, b4, b5)
end
- # menu ã®ã‚µãƒ³ãƒ—ル.
+ # menu ¤Î¥µ¥ó¥×¥ë.
def test_menu(ip, parent)
global, menu, menubutton, pack = ip.commands().values_at(
"global", "menu", "menubutton", "pack")
@@ -458,29 +458,29 @@ class Test1
## menu
- # menubutton を生æˆã™ã‚‹.
+ # menubutton ¤òÀ¸À®¤¹¤ë.
mb1 = TclTkWidget.new(ip, t1, menubutton, "-text menu")
- # menu を生æˆã™ã‚‹.
+ # menu ¤òÀ¸À®¤¹¤ë.
me1 = TclTkWidget.new(ip, mb1, menu)
- # mb1 ã‹ã‚‰ me1 ãŒèµ·å‹•ã•れるよã†ã«ã™ã‚‹.
+ # mb1 ¤«¤é me1 ¤¬µ¯Æ°¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë.
mb1.e("configure -menu", me1)
- # cascade ã§èµ·å‹•ã•れる menu を生æˆã™ã‚‹.
+ # cascade ¤Çµ¯Æ°¤µ¤ì¤ë menu ¤òÀ¸À®¤¹¤ë.
me11 = TclTkWidget.new(ip, me1, menu)
- # radiobutton ã®ã‚µãƒ³ãƒ—ル.
+ # radiobutton ¤Î¥µ¥ó¥×¥ë.
v1 = TclTkVariable.new(ip, nil); global.e(v1); v1.set("r1")
me11.e("add radiobutton -label radio1 -value r1 -variable", v1)
me11.e("add radiobutton -label radio2 -value r2 -variable", v1)
me11.e("add radiobutton -label radio3 -value r3 -variable", v1)
- # cascade ã«ã‚ˆã‚Š mb11 ãŒèµ·å‹•ã•れるよã†ã«ã™ã‚‹.
+ # cascade ¤Ë¤è¤ê mb11 ¤¬µ¯Æ°¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë.
me1.e("add cascade -label cascade -menu", me11)
- # checkbutton ã®ã‚µãƒ³ãƒ—ル.
+ # checkbutton ¤Î¥µ¥ó¥×¥ë.
v2 = TclTkVariable.new(ip, nil); global.e(v2); v2.set("none")
me1.e("add checkbutton -label check -variable", v2)
- # separator ã®ã‚µãƒ³ãƒ—ル.
+ # separator ¤Î¥µ¥ó¥×¥ë.
me1.e("add separator")
- # command ã®ã‚µãƒ³ãƒ—ル.
+ # command ¤Î¥µ¥ó¥×¥ë.
v3 = nil
cb.push(c = TclTkCallback.new(ip, proc{
global.e(v1, v2, v3); print "v1: ", v1.get(), ", v2: ", v2.get(),
@@ -495,7 +495,7 @@ class Test1
pack.e(b1, mb1, om1, "-side left")
end
- # listbox ã®ã‚µãƒ³ãƒ—ル.
+ # listbox ¤Î¥µ¥ó¥×¥ë.
def test_listbox(ip, parent)
clipboard, frame, grid, listbox, lower, menu, menubutton, pack, scrollbar,
selection = ip.commands().values_at(
@@ -506,11 +506,11 @@ class Test1
## listbox/scrollbar
f1 = TclTkWidget.new(ip, t1, frame)
- # コールãƒãƒƒã‚¯å†…ã§å‚ç…§ã™ã‚‹å¤‰æ•°ã¯å…ˆã«å®£è¨€ã—ã¦ãŠã‹ãªã‘れã°ãªã‚‰ãªã„.
+ # ¥³¡¼¥ë¥Ð¥Ã¥¯Æâ¤Ç»²¾È¤¹¤ëÊÑ¿ô¤ÏÀè¤ËÀë¸À¤·¤Æ¤ª¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.
li1 = sc1 = sc2 = nil
- # 実行時ã«, 後ã‚ã«ãƒ‘ラメータãŒã¤ãコールãƒãƒƒã‚¯ã¯,
- # イテレータ変数ã§ãã®ãƒ‘ラメータをå—ã‘å–ã‚‹ã“ã¨ãŒã§ãã‚‹.
- # (複数ã®ãƒ‘ラメータã¯ã²ã¨ã¤ã®æ–‡å­—列ã«ã¾ã¨ã‚られる.)
+ # ¼Â¹Ô»þ¤Ë, ¸å¤í¤Ë¥Ñ¥é¥á¡¼¥¿¤¬¤Ä¤¯¥³¡¼¥ë¥Ð¥Ã¥¯¤Ï,
+ # ¥¤¥Æ¥ì¡¼¥¿ÊÑ¿ô¤Ç¤½¤Î¥Ñ¥é¥á¡¼¥¿¤ò¼õ¤±¼è¤ë¤³¤È¤¬¤Ç¤­¤ë.
+ # (Ê£¿ô¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¤Ò¤È¤Ä¤Îʸ»úÎó¤Ë¤Þ¤È¤á¤é¤ì¤ë.)
cb.push(c1 = TclTkCallback.new(ip, proc{|i| li1.e("xview", i)}))
cb.push(c2 = TclTkCallback.new(ip, proc{|i| li1.e("yview", i)}))
cb.push(c3 = TclTkCallback.new(ip, proc{|i| sc1.e("set", i)}))
@@ -532,17 +532,17 @@ class Test1
me1 = TclTkWidget.new(ip, mb1, menu)
mb1.e("configure -menu", me1)
cb.push(c = TclTkCallback.new(ip, proc{
- # clipboard をクリア.
+ # clipboard ¤ò¥¯¥ê¥¢.
clipboard.e("clear")
- # selection ã‹ã‚‰æ–‡å­—列を読ã¿è¾¼ã¿ clipboard ã«è¿½åŠ ã™ã‚‹.
+ # selection ¤«¤éʸ»úÎó¤òÆÉ¤ß¹þ¤ß clipboard ¤ËÄɲ乤ë.
clipboard.e("append {#{selection.e('get')}}")}))
me1.e("add command -label {selection -> clipboard} -command",c)
cb.push(c = TclTkCallback.new(ip, proc{
- # li1 をクリア.
+ # li1 ¤ò¥¯¥ê¥¢.
li1.e("delete 0 end")
- # clipboard ã‹ã‚‰æ–‡å­—列をå–り出ã—, 1 行ãšã¤
+ # clipboard ¤«¤éʸ»úÎó¤ò¼è¤ê½Ð¤·, 1 ¹Ô¤º¤Ä
selection.e("get -selection CLIPBOARD").split(/\n/).each{|line|
- # li1 ã«æŒ¿å…¥ã™ã‚‹.
+ # li1 ¤ËÁÞÆþ¤¹¤ë.
li1.e("insert end {#{line}}")}}))
me1.e("add command -label {clipboard -> listbox} -command",c)
@@ -557,7 +557,7 @@ class Test1
pack.e(f2, f1)
end
- # canvas ã®ã‚µãƒ³ãƒ—ル.
+ # canvas ¤Î¥µ¥ó¥×¥ë.
def test_canvas(ip, parent)
canvas, lower, pack = ip.commands().values_at("canvas", "lower", "pack")
t1, b1, cb = inittoplevel(ip, parent, "canvas")
@@ -566,36 +566,36 @@ class Test1
ca1 = TclTkWidget.new(ip, t1, canvas, "-width 400 -height 300")
lower.e(ca1, b1)
- # rectangle を作る.
+ # rectangle ¤òºî¤ë.
idr = ca1.e("create rectangle 10 10 20 20")
- # oval を作る.
+ # oval ¤òºî¤ë.
ca1.e("create oval 60 10 100 50")
- # polygon を作る.
+ # polygon ¤òºî¤ë.
ca1.e("create polygon 110 10 110 30 140 10")
- # line を作る.
+ # line ¤òºî¤ë.
ca1.e("create line 150 10 150 30 190 10")
- # arc を作る.
+ # arc ¤òºî¤ë.
ca1.e("create arc 200 10 250 50 -start 0 -extent 90 -style pieslice")
- # i1 ã¯æœ¬å½“ã¯, ã©ã“ã‹ã§ç ´å£Šã—ãªã‘れã°ãªã‚‰ãªã„ãŒ, é¢å€’ãªã®ã§æ”¾ã£ã¦ã‚ã‚‹.
+ # i1 ¤ÏËÜÅö¤Ï, ¤É¤³¤«¤ÇÇ˲õ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤¬, ÌÌÅݤʤΤÇÊü¤Ã¤Æ¤¢¤ë.
i1 = TclTkImage.new(ip, "photo", "-file maru.gif")
- # image を作る.
+ # image ¤òºî¤ë.
ca1.e("create image 100 100 -image", i1)
- # bitmap を作る.
+ # bitmap ¤òºî¤ë.
ca1.e("create bitmap 260 50 -bitmap questhead")
- # text を作る.
+ # text ¤òºî¤ë.
ca1.e("create text 320 50 -text {drag rectangle}")
- # window を作る(クローズボタン).
+ # window ¤òºî¤ë(¥¯¥í¡¼¥º¥Ü¥¿¥ó).
ca1.e("create window 200 200 -window", b1)
- # bind ã«ã‚ˆã‚Š rectangle ã‚’ drag ã§ãるよã†ã«ã™ã‚‹.
+ # bind ¤Ë¤è¤ê rectangle ¤ò drag ¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë.
cb.push(c = TclTkCallback.new(ip, proc{|i|
- # i ã« x 㨠y ã‚’å—ã‘å–ã‚‹ã®ã§, å–り出ã™.
+ # i ¤Ë x ¤È y ¤ò¼õ¤±¼è¤ë¤Î¤Ç, ¼è¤ê½Ð¤¹.
x, y = i.split(/ /); x = x.to_f; y = y.to_f
- # 座標を変更ã™ã‚‹.
+ # ºÂɸ¤òÊѹ¹¤¹¤ë.
ca1.e("coords current #{x - 5} #{y - 5} #{x + 5} #{y + 5}")},
- # x, y 座標を空白ã§åŒºåˆ‡ã£ãŸã‚‚ã®ã‚’ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿å¤‰æ•°ã¸æ¸¡ã™ã‚ˆã†ã«æŒ‡å®š.
+ # x, y ºÂɸ¤ò¶õÇò¤Ç¶èÀڤ俤â¤Î¤ò¥¤¥Æ¥ì¡¼¥¿ÊÑ¿ô¤ØÅϤ¹¤è¤¦¤Ë»ØÄê.
"%x %y"))
- # rectangle ã« bind ã™ã‚‹.
+ # rectangle ¤Ë bind ¤¹¤ë.
ca1.e("bind", idr, "<B1-Motion>", c)
pack.e(ca1)
@@ -605,7 +605,7 @@ end
# test driver
if ARGV.size == 0
- print "#{$0} n ã§, n 個ã®ã‚¤ãƒ³ã‚¿ãƒ—リタを起動ã—ã¾ã™.\n"
+ print "#{$0} n ¤Ç, n ¸Ä¤Î¥¤¥ó¥¿¥×¥ê¥¿¤òµ¯Æ°¤·¤Þ¤¹.\n"
n = 1
else
n = ARGV[0].to_i
@@ -614,16 +614,16 @@ end
print "start\n"
ip = []
-# インタプリタ, ウィジェット等ã®ç”Ÿæˆ.
+# ¥¤¥ó¥¿¥×¥ê¥¿, ¥¦¥£¥¸¥§¥Ã¥ÈÅù¤ÎÀ¸À®.
for i in 1 .. n
ip.push(Test1.new())
end
-# 用æ„ãŒã§ããŸã‚‰ã‚¤ãƒ™ãƒ³ãƒˆãƒ«ãƒ¼ãƒ—ã«å…¥ã‚‹.
+# ÍѰդ¬¤Ç¤­¤¿¤é¥¤¥Ù¥ó¥È¥ë¡¼¥×¤ËÆþ¤ë.
TclTk.mainloop()
print "exit from mainloop\n"
-# インタプリタ㌠GC ã•れるã‹ã®ãƒ†ã‚¹ãƒˆ.
+# ¥¤¥ó¥¿¥×¥ê¥¿¤¬ GC ¤µ¤ì¤ë¤«¤Î¥Æ¥¹¥È.
ip = []
print "GC.start\n" if $DEBUG
GC.start() if $DEBUG
diff --git a/ext/tk/sample/tcltklib/sample2.rb b/ext/tk/sample/tcltklib/sample2.rb
index 1acc180680..f187d6ce1d 100644
--- a/ext/tk/sample/tcltklib/sample2.rb
+++ b/ext/tk/sample/tcltklib/sample2.rb
@@ -7,12 +7,12 @@
#---------------------------------------------------------------------------
# Sep. 17, 1997 modified by Y. Shigehiro for tcltk library
-# maeda shugo (shugo@po.aianet.ne.jp) æ°ã«ã‚ˆã‚‹
-# (ruby/tk ã§æ›¸ã‹ã‚Œã¦ã„ãŸ) ruby ã®ã‚µãƒ³ãƒ—ルプログラム
+# maeda shugo (shugo@po.aianet.ne.jp) »á¤Ë¤è¤ë
+# (ruby/tk ¤Ç½ñ¤«¤ì¤Æ¤¤¤¿) ruby ¤Î¥µ¥ó¥×¥ë¥×¥í¥°¥é¥à
# http://www.aianet.or.jp/~shugo/ruby/othello.rb.gz
-# ã‚’ tcltk ライブラリを使ã†ã‚ˆã†ã«, 機械的ã«å¤‰æ›´ã—ã¦ã¿ã¾ã—ãŸ.
+# ¤ò tcltk ¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤è¤¦¤Ë, µ¡³£Åª¤ËÊѹ¹¤·¤Æ¤ß¤Þ¤·¤¿.
#
-# ãªã‚‹ã¹ãオリジナルã¨åŒã˜ã«ãªã‚‹ã‚ˆã†ã«ã—ã¦ã‚りã¾ã™.
+# ¤Ê¤ë¤Ù¤¯¥ª¥ê¥¸¥Ê¥ë¤ÈƱ¤¸¤Ë¤Ê¤ë¤è¤¦¤Ë¤·¤Æ¤¢¤ê¤Þ¤¹.
require "observer"
require "tcltk"
@@ -343,14 +343,14 @@ class Othello
@board = Board.new(self)
@board_view = BoardView.new(self, @board)
#### added by Y. Shigehiro
- ## board_view ã®å¤§ãã•を設定ã™ã‚‹.
+ ## board_view ¤ÎÂ礭¤µ¤òÀßÄꤹ¤ë.
x1, y1, x2, y2 = @board_view.e("bbox all").split(/ /).collect{|i| i.to_f}
@board_view.e("configure -width", x2 - x1)
@board_view.e("configure -height", y2 - y1)
- ## scrollregion を設定ã™ã‚‹.
+ ## scrollregion ¤òÀßÄꤹ¤ë.
@board_view.e("configure -scrollregion {", @board_view.e("bbox all"),
"}")
- #### ã“ã“ã¾ã§
+ #### ¤³¤³¤Þ¤Ç
$pack.e(@board_view, "-fill both -expand true")
panel = TclTkWidget.new($ip, $root, $frame)
diff --git a/ext/tk/sample/tkalignbox.rb b/ext/tk/sample/tkalignbox.rb
index f3d083c33d..fb1b58f458 100644
--- a/ext/tk/sample/tkalignbox.rb
+++ b/ext/tk/sample/tkalignbox.rb
@@ -201,20 +201,20 @@ if __FILE__ == $0
TkButton.new(f, :text=>'aaa'),
TkButton.new(f, :text=>'aaaa'))
- f = Tk::RbWidget::VBox.new(:borderwidth=>5,
+ f = Tk::RbWidget::VBox.new(:borderwidth=>5,
:relief=>'groove').pack(:fill=>:y, :expand=>true)
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,
+ f = Tk::RbWidget::HRBox.new(:borderwidth=>3,
:relief=>'raised').pack(:fill=>:x)
f.add(TkButton.new(f, :text=>'a'),
TkButton.new(f, :text=>'aa'),
TkButton.new(f, :text=>'aaa'))
- f = Tk::RbWidget::VBBox.new(:borderwidth=>3,
+ f = Tk::RbWidget::VBBox.new(:borderwidth=>3,
:relief=>'ridge').pack(:fill=>:x)
f.propagate = false
f.height 100
diff --git a/ext/tk/sample/tkballoonhelp.rb b/ext/tk/sample/tkballoonhelp.rb
index 2daa522601..a9c00d230d 100644
--- a/ext/tk/sample/tkballoonhelp.rb
+++ b/ext/tk/sample/tkballoonhelp.rb
@@ -64,8 +64,8 @@ class Tk::RbWidget::BalloonHelp<TkLabel
_balloon_binding(@interval)
# @label = TkLabel.new(@frame, 'background'=>'bisque').pack
- @label = TkLabel.new(@frame,
- 'foreground'=>DEFAULT_FOREGROUND,
+ @label = TkLabel.new(@frame,
+ 'foreground'=>DEFAULT_FOREGROUND,
'background'=>DEFAULT_BACKGROUND).pack
@label.configure(_symbolkey2str(keys)) unless keys.empty?
@path = @label
@@ -147,7 +147,7 @@ if __FILE__ == $0
}
TkButton.new('text'=>'This button has another balloon help') {|b|
pack('fill'=>'x')
- Tk::RbWidget::BalloonHelp.new(b,
+ Tk::RbWidget::BalloonHelp.new(b,
'text'=>"CONFIGURED MESSAGE\nchange colors, and so on",
'interval'=>200, 'font'=>'courier',
'background'=>'gray', 'foreground'=>'red')
diff --git a/ext/tk/sample/tkcombobox.rb b/ext/tk/sample/tkcombobox.rb
index c38bde10d4..59db565f06 100644
--- a/ext/tk/sample/tkcombobox.rb
+++ b/ext/tk/sample/tkcombobox.rb
@@ -370,7 +370,7 @@ EOD
startwait = keys.delete('startwait'){300}
interval = keys.delete('interval'){150}
- @lst = Tk::RbWidget::AutoScrollListbox.new(@top, :scrollbar=>true,
+ @lst = Tk::RbWidget::AutoScrollListbox.new(@top, :scrollbar=>true,
:startwait=>startwait,
:interval=>interval)
@lst.pack(:fill=>:both, :expand=>true)
@@ -464,7 +464,7 @@ if __FILE__ == $0
# 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,
+ e = Tk::RbWidget::Combobox.new(:height=>7, :scrollbar=>true,
:textvariable=>v,
:arrowrelief=>:flat, :arrowborderwidth=>0,
:startwait=>400, :interval=>200).pack
@@ -480,9 +480,9 @@ if __FILE__ == $0
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,
+ l = Tk::RbWidget::AutoScrollListbox.new(nil, :relief=>:groove,
+ :borderwidth=>4,:height=>7,
+ :width=>20).pack(:fill=>:both,
:expand=>true)
(0..20).each{|i| l.insert('end', "line #{i}")}
diff --git a/ext/tk/sample/tkextlib/blt/readme.txt b/ext/tk/sample/tkextlib/blt/readme.txt
index 4183c01ecb..fe12dd88a3 100644
--- a/ext/tk/sample/tkextlib/blt/readme.txt
+++ b/ext/tk/sample/tkextlib/blt/readme.txt
@@ -1,2 +1,2 @@
The scripts and image files in this directory are based on demo files
-of Tcl/Tk's BLT extention.
+of Tcl/Tk's BLT extention.
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
index 4d460e8802..055312ec96 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb
@@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two').pack
# Select the first page of the tabnotebook.
nb.select(0)
-# Create the scrollbar and associate the scrollbar
+# Create the scrollbar and associate teh scrollbar
# and the notebook together, then pack the scrollbar
nb.scrollbar(TkScrollbar.new).pack(:fill=>:y, :expand=>true, :pady=>10)
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
index 576a9c18d0..41e9ce1bfc 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb
@@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two').pack
# Select the first page of the tabnotebook.
nb.select(0)
-# Create the scrollbar and associate the scrollbar
+# Create the scrollbar and associate teh scrollbar
# and the notebook together, then pack the scrollbar
nb.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
diff --git a/ext/tk/sample/tkextlib/tile/readme.txt b/ext/tk/sample/tkextlib/tile/readme.txt
index 6c4a5cf543..a76b3338f7 100644
--- a/ext/tk/sample/tkextlib/tile/readme.txt
+++ b/ext/tk/sample/tkextlib/tile/readme.txt
@@ -1,2 +1,2 @@
-All of *.tcl and under themes/ directory (except kroc.rb) are
-quoted from Tcl/Tk's Tile extension. Please read Orig_LICENSE.txt.
+All of *.tcl and under themes/ directory (except kroc.rb) are
+quoted from Tcl/Tk's Tile extension. Please read Orig_LICENSE.txt.
diff --git a/ext/tk/sample/tkextlib/tile/repeater.tcl b/ext/tk/sample/tkextlib/tile/repeater.tcl
index 43beb9430a..652ba8ab17 100644
--- a/ext/tk/sample/tkextlib/tile/repeater.tcl
+++ b/ext/tk/sample/tkextlib/tile/repeater.tcl
@@ -17,7 +17,7 @@
# Notes:
# Repeater buttons work more like scrollbar arrows than
# Tk repeating buttons: they fire once immediately when
-# first pressed, and $State(delay) specifies the initial
+# first pressed, and $State(delay) specifies the initial
# interval before the button starts autorepeating.
#
@@ -49,8 +49,8 @@ bind Repeater <B1-Enter> \
### Binding procedures.
#
-## Activate -- Keyboard activation binding.
-# Simulate clicking the button, and invoke the command once.
+## Activate -- Keyboard activation binding.
+# Simulate clicking the button, and invoke the command once.
#
proc tile::Repeater::Activate {w} {
$w instate disabled { return }
@@ -61,7 +61,7 @@ proc tile::Repeater::Activate {w} {
}
## Press -- ButtonPress-1 binding.
-# Invoke the command once and start autorepeating after
+# Invoke the command once and start autorepeating after
# $State(delay) milliseconds.
#
proc tile::Repeater::Press {w} {
@@ -104,7 +104,7 @@ proc tile::Repeater::Resume {w} {
}
## Repeat -- Timer script
-# Invoke the command and reschedule another repetition
+# Invoke the command and reschedule another repetition
# after $State(interval) milliseconds.
#
proc tile::Repeater::Repeat {w} {
diff --git a/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl b/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
index 68733e8ad2..37e3d07ff7 100644
--- a/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl
@@ -68,12 +68,12 @@ namespace eval tile::theme::blue {
style default Toolbutton \
-width 0 -relief flat -borderwidth 2 -padding 4 \
-background $colors(-frame) -foreground #000000 ;
- style map Toolbutton -background [list active $colors(-selectbg)]
- style map Toolbutton -foreground [list active $colors(-selectfg)]
+ style map Toolbutton -background [list active $colors(-selectbg)]
+ style map Toolbutton -foreground [list active $colors(-selectfg)]
style map Toolbutton -relief {
disabled flat
- selected sunken
- pressed sunken
+ selected sunken
+ pressed sunken
active raised
}
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
index 60c59be0ca..79fcd7c04e 100644
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl
@@ -1,4 +1,4 @@
-# keramik.tcl -
+# keramik.tcl -
#
# A sample pixmap theme for the tile package.
#
@@ -48,12 +48,12 @@ namespace eval tile::theme::keramik {
;
style map . -foreground [list disabled $colors(-disabledfg)]
-
+
# -----------------------------------------------------------------
# Button elements
# - the button has a large rounded border and needs a bit of
# horizontal padding.
- # - the checkbutton and radiobutton have the focus drawn around
+ # - the checkbutton and radiobutton have the focus drawn around
# the whole widget - hence the new layouts.
#
style layout TButton {
@@ -125,7 +125,7 @@ namespace eval tile::theme::keramik {
# one at the top.
#
style layout Vertical.TScrollbar {
- Scrollbar.background
+ Scrollbar.background
Scrollbar.trough -children {
Scrollbar.uparrow -side top
Scrollbar.downarrow -side bottom
@@ -133,9 +133,9 @@ namespace eval tile::theme::keramik {
Vertical.Scrollbar.thumb -side top -expand true -sticky ns
}
}
-
+
style layout Horizontal.TScrollbar {
- Scrollbar.background
+ Scrollbar.background
Scrollbar.trough -children {
Scrollbar.leftarrow -side left
Scrollbar.rightarrow -side right
@@ -149,26 +149,26 @@ namespace eval tile::theme::keramik {
style element create Horizontal.Scrollbar.thumb image $I(hsb-n) \
-border {6 4} -width 15 -height 16 -sticky news \
-map [list {pressed !disabled} $I(hsb-p)]
-
+
style element create Vertical.Scrollbar.thumb image $I(vsb-n) \
-border {4 6} -width 16 -height 15 -sticky news \
-map [list {pressed !disabled} $I(vsb-p)]
-
+
style element create Scale.slider image $I(hslider-n) \
-border 3
-
+
style element create Vertical.Scale.slider image $I(vslider-n) \
-border 3
-
+
style element create Horizontal.Progress.bar image $I(hsb-n) \
-border {6 4}
-
+
style element create Vertical.Progress.bar image $I(vsb-n) \
-border {4 6}
-
+
style element create uparrow image $I(arrowup-n) \
-map [list {pressed !disabled} $I(arrowup-p)]
-
+
style element create downarrow image $I(arrowdown-n) \
-map [list {pressed !disabled} $I(arrowdown-p)]
@@ -177,7 +177,7 @@ namespace eval tile::theme::keramik {
style element create leftarrow image $I(arrowleft-n) \
-map [list {pressed !disabled} $I(arrowleft-p)]
-
+
# -----------------------------------------------------------------
# Notebook elements
#
diff --git a/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
index cedec328f8..4bb89aa8a5 100644
--- a/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl
@@ -4,7 +4,7 @@
# or we don't have the right version of Tcl/Tk
#
# To use this automatically within tile, the tile-using application should
-# use tile::availableThemes and tile::setTheme
+# use tile::availableThemes and tile::setTheme
#
# $Id$
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
index b2cd79679a..73548acef2 100644
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl
@@ -11,25 +11,25 @@ namespace eval tile {
}
namespace eval tile::kroc {
-
+
set imgdir [file join [file dirname [info script]] kroc]
array set Images [tile::LoadImages $imgdir *.gif]
-
+
if {[package vsatisfies [package provide tile] 0.5]} {
set TNoteBook_Tab TNotebook.Tab
} else {
set TNoteBook_Tab Tab.TNotebook
}
-
+
style theme create kroc -parent alt -settings {
-
+
style default . -background #FCB64F -troughcolor #F8C278 -borderwidth 1
style default . -font TkDefaultFont -borderwidth 1
style map . -background [list active #694418]
style map . -foreground [list disabled #B2B2B2 active #FFE7CB]
-
+
style default TButton -padding "10 4"
-
+
style default $TNoteBook_Tab -padding {10 3} -font TkDefaultFont
style map $TNoteBook_Tab \
-background [list selected #FCB64F {} #FFE6BA] \
@@ -41,7 +41,7 @@ namespace eval tile::kroc {
-arrowcolor { pressed #FFE7CB } \
-relief { pressed sunken } \
;
-
+
style layout Vertical.TScrollbar {
Scrollbar.trough -children {
Scrollbar.uparrow -side top
@@ -50,7 +50,7 @@ namespace eval tile::kroc {
Scrollbar.thumb -side top -expand true
}
}
-
+
style layout Horizontal.TScrollbar {
Scrollbar.trough -children {
Scrollbar.leftarrow -side left
@@ -59,18 +59,18 @@ namespace eval tile::kroc {
Scrollbar.thumb -side left -expand true
}
}
-
+
#
# Elements:
#
if {[package vsatisfies [package provide tile] 0.5]} {
-
+
style element create Button.button image $Images(button-n) \
-map [list \
pressed $Images(button-p) \
active $Images(button-h) \
] -border 3 -sticky ew
-
+
style element create Checkbutton.indicator image $Images(check-nu) \
-map [list \
{pressed selected} $Images(check-nc) \
@@ -79,7 +79,7 @@ namespace eval tile::kroc {
active $Images(check-hu) \
selected $Images(check-nc) \
] -sticky w
-
+
style element create Radiobutton.indicator image $Images(radio-nu) \
-map [list \
{pressed selected} $Images(radio-nc) \
@@ -88,15 +88,15 @@ namespace eval tile::kroc {
active $Images(radio-hu) \
selected $Images(radio-nc) \
] -sticky w
-
+
} else {
-
+
style element create Button.button pixmap -images [list \
pressed $Images(button-p) \
active $Images(button-h) \
{} $Images(button-n) \
] -border 3 -tiling tile
-
+
style element create Checkbutton.indicator pixmap -images [list \
{pressed selected} $Images(check-nc) \
pressed $Images(check-nu) \
@@ -105,7 +105,7 @@ namespace eval tile::kroc {
selected $Images(check-nc) \
{} $Images(check-nu) \
] -tiling fixed
-
+
style element create Radiobutton.indicator pixmap -images [list \
{pressed selected} $Images(radio-nc) \
pressed $Images(radio-nu) \
@@ -114,7 +114,7 @@ namespace eval tile::kroc {
selected $Images(radio-nc) \
{} $Images(radio-nu) \
] -tiling fixed
-
+
}
#
@@ -141,7 +141,7 @@ namespace eval tile::kroc {
}
}
}
-
+
style layout TRadiobutton {
Radiobutton.border -children {
Radiobutton.background
@@ -153,7 +153,7 @@ namespace eval tile::kroc {
}
}
}
-
+
} }
# -------------------------------------------------------------------------
diff --git a/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
index de4f3d4555..179077917c 100644
--- a/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl
@@ -4,7 +4,7 @@
# or we don't have the right version of Tcl/Tk
#
# To use this automatically within tile, the tile-using application should
-# use tile::availableThemes and tile::setTheme
+# use tile::availableThemes and tile::setTheme
#
# $Id$
diff --git a/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl b/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
index f402a73f10..e39aff6f44 100644
--- a/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
+++ b/ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl
@@ -4,7 +4,7 @@
# or we don't have the right version of Tcl/Tk
#
# To use this automatically within tile, the tile-using application should
-# use tile::availableThemes and tile::setTheme
+# use tile::availableThemes and tile::setTheme
#
# $Id$
diff --git a/ext/tk/sample/tkextlib/tile/toolbutton.tcl b/ext/tk/sample/tkextlib/tile/toolbutton.tcl
index 91e9ad18bb..4e08034e31 100644
--- a/ext/tk/sample/tkextlib/tile/toolbutton.tcl
+++ b/ext/tk/sample/tkextlib/tile/toolbutton.tcl
@@ -7,14 +7,14 @@
#
# ~ BACKGROUND
#
-# Checkbuttons in toolbars have a very different appearance
+# Checkbuttons in toolbars have a very different appearance
# than regular checkbuttons: there's no indicator, they
# "pop up" when the mouse is over them, and they appear sunken
# when selected.
-#
-# Tk added partial support for toolbar-style buttons in 8.4
+#
+# Tk added partial support for toolbar-style buttons in 8.4
# with the "-overrelief" option, and TIP #82 added further
-# support with the "-offrelief" option. So to get a toolbar-style
+# support with the "-offrelief" option. So to get a toolbar-style
# checkbutton, you can configure it with:
#
# checkbutton .cb \
@@ -34,11 +34,11 @@
#
# ~ DEMONSTRATION
#
-# The tile built-in themes (default, "alt", windows, and XP)
+# The tile built-in themes (default, "alt", windows, and XP)
# already include Toolbutton styles. This script will add
# them to the "step" and "blue" themes as a demonstration.
#
-# (Note: Pushbuttons and radiobuttons can also use the "Toolbutton"
+# (Note: Pushbuttons and radiobuttons can also use the "Toolbutton"
# style; see demo.tcl.)
#
@@ -48,7 +48,7 @@ style theme settings "step" {
# First, we use [style layout] to define what elements to
# use and how they're arranged. Toolbuttons are pretty
# simple, consisting of a border, some internal padding,
-# and a label. (See also the TScrollbar layout definition
+# and a label. (See also the TScrollbar layout definition
# in demos/blue.tcl for a more complicated layout spec.)
#
style layout Toolbutton {
@@ -60,8 +60,8 @@ style theme settings "step" {
}
}
-# (Actually the above isn't strictly necessary, since the same layout
-# is defined in the default theme; we could have inherited it
+# (Actually the above isn't strictly necessary, since the same layout
+# is defined in the default theme; we could have inherited it
# instead.)
#
# Next, specify default values for element options.
@@ -71,17 +71,17 @@ style theme settings "step" {
style default Toolbutton -width 0 -padding 1 -relief flat -borderwidth 2
#
-# Finally, use [style map] to specify state-specific
+# Finally, use [style map] to specify state-specific
# resource values. We want a flat relief if the widget is
-# disabled, sunken if it's selected (on) or pressed,
+# disabled, sunken if it's selected (on) or pressed,
# and raised when it's active (the mouse pointer is
# over the widget). Each state-value pair is checked
# in order, and the first matching state takes precedence.
#
style map Toolbutton -relief {
disabled flat
- selected sunken
- pressed sunken
+ selected sunken
+ pressed sunken
active raised
}
}
@@ -107,10 +107,10 @@ style theme settings "blue" {
#
style map Toolbutton -relief {
disabled flat
- selected sunken
- pressed sunken
+ selected sunken
+ pressed sunken
active raised
- }
+ }
#
# Adjust the -padding at the same time, to enhance
@@ -138,7 +138,7 @@ style theme settings "blue" {
}
#
-# ~ A final note:
+# ~ A final note:
#
# TIP #82 also says: "When -indicatoron is off and the button itself
# is on, the relief continues to be hard-coded to sunken. For symmetry,
diff --git a/ext/tk/sample/tkextlib/tkHTML/README b/ext/tk/sample/tkextlib/tkHTML/README
index 0b9f799cbd..1208e270b4 100644
--- a/ext/tk/sample/tkextlib/tkHTML/README
+++ b/ext/tk/sample/tkextlib/tkHTML/README
@@ -1,12 +1,12 @@
[ TkHtml widget example ]
-The directory page1 -- page4 are referd from "test" directory of
-original TkHtml extension's source archive.
+The directory page1 -- page4 are referd from "test" directory of
+original TkHtml extension's source archive.
( see http://www.hwaci.com/sw/tkhtml/index.html )
You can see the HTML documents on the 'hv.rb' or 'ss.rb' sample script.
- e.g.
+ e.g.
LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH /usr/local/bin/ruby ./hv.rb page1/index.html
diff --git a/ext/tk/sample/tkextlib/tkHTML/page1/index.html b/ext/tk/sample/tkextlib/tkHTML/page1/index.html
index af87289c28..9efac7f7af 100644
--- a/ext/tk/sample/tkextlib/tkHTML/page1/index.html
+++ b/ext/tk/sample/tkextlib/tkHTML/page1/index.html
@@ -90,7 +90,7 @@ everything and the Wirth of nothing?
All trademarks and copyrights on this
page are owned by their respective owners. Comments
are owned by the Poster.
- The Rest 1997-2000 <A href="http://Andover.Net">Andover.Net</A>.
+ The Rest © 1997-2000 <A href="http://Andover.Net">Andover.Net</A>.
</FONT></CENTER>
</TD>
</TR>
diff --git a/ext/tk/sample/tkextlib/tkHTML/page2/index.html b/ext/tk/sample/tkextlib/tkHTML/page2/index.html
index 1c67be6c0b..7eaf2d2cc9 100644
--- a/ext/tk/sample/tkextlib/tkHTML/page2/index.html
+++ b/ext/tk/sample/tkextlib/tkHTML/page2/index.html
@@ -10,7 +10,7 @@
<tr>
<td width="120" valign="TOP"><a href="/"><img src="image1" width="120" height="79" alt="Scriptics" border="0"></a></td>
<td valign="top" width="548">
-
+
<!-- Table to hold tabs -->
<table cellpadding="0" cellspacing="0" border="0" width="548">
<tr>
@@ -50,8 +50,8 @@
}
}
//-->
- </SCRIPT>
-
+ </SCRIPT>
+
<!-- MenuSubLevel Resource Software Extensions Tk -->
<table cellpadding="0" cellspacing="0" border="0">
@@ -186,13 +186,13 @@ or higher.
There are also an "<a href="#bltunoff">unofficial</a>" release for 8.0p2
and 8.1a2 that were not done by the author. <a href="/live/annotate?url=http%3a%2f%2fwww%2etcltk%2ecom%2fblt%2f">Edit</a>
<i><font size="-1">(October 26, 1999 09:43)</font></i><dt><b><a href="http://www.unifix-online.com/BWidget/index.html" ="">BWidget</a></b>
-<dd>A set of native Tk 8.x Widgets using Tcl8.x namespaces.
+<dd>A set of native Tk 8.x Widgets using Tcl8.x namespaces.
The ToolKit is available under Unix/X11 and Windows.
-The BWidget(s) have a professional look&feel as in other
-well known Toolkits (Tix or Incr Widget) but the concept is
-radically different because everything is native
+The BWidget(s) have a professional look&feel as in other
+well known Toolkits (Tix or Incr Widget) but the concept is
+radically different because everything is native
so no platform compilation, no compiled extension
-library are needed. The code is 100 Pure Tcl/Tk.
+library are needed. The code is 100 Pure Tcl/Tk.
More 30 components : Notebook, PageManager, Tree, PanedWindow, ButtonBox,
ScrollView, ComboBox, SpinBox, ListBox, SelectFont, SelectColor,
ProgressBare ... <a href="/live/annotate?url=http%3a%2f%2fwww%2eunifix%2donline%2ecom%2fBWidget%2findex%2ehtml">Edit</a>
@@ -220,10 +220,10 @@ Unix). The console itself provides many more features than the standard console.
<dd>This project seeks to integrate the Tk toolkit
with the Frontier scripting language. <a href="/live/annotate?url=http%3a%2f%2fwww%2escriptmeridian%2eorg%2fprojects%2ftk%2f">Edit</a>
<i><font size="-1">(August 19, 1999 15:36)</font></i><dt><b><a href="http://purl.oclc.org/net/nijtmans/img.html" ="">Img image format extension</a></b>
-<dd>This package enhances Tk, adding support for many other Image formats:
+<dd>This package enhances Tk, adding support for many other Image formats:
BMP, XBM, XPM, GIF (with transparency), PNG,
JPEG, TIFF and postscript.
-This is implemented as a shared library that can be dynamically loaded into
+This is implemented as a shared library that can be dynamically loaded into
Tcl/Tk.
<a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2fnijtmans%2fimg%2ehtml">Edit</a>
<i><font size="-1">(November 21, 1999 06:35)</font></i><dt><b><a href="http://purl.oclc.org/net/oakley/tcl/mclistbox/index.html" ="">mclistbox - a multi-column listbox widget</a></b>
@@ -234,7 +234,7 @@ requires no other extensions; it is completely
standalone. <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2foakley%2ftcl%2fmclistbox%2findex%2ehtml">Edit</a>
<i><font size="-1">(August 19, 1999 15:37)</font></i><dt><b><a href="http://home.t-online.de/home/dshepherd/tkview.htm" ="">MFC views C++ class for embedding Tk</a></b>
<dd>The idea of embedding Tk in MFC windows always seemed very enticing but information was sparse and contradictory - on a
- scale between "very easy" and "not yet possible". The only thing for it was to have a go and lo, it wasn't that hard after all.
+ scale between "very easy" and "not yet possible". The only thing for it was to have a go and lo, it wasn't that hard after all.
CTkView is a C++ class which can be used in MFC SDI or MDI applications. An instance of CTkView hosts an embedded Tk
toplevel widget and performs some management chores for the widget so that it can size, update and react correctly to Windows
events. <a href="/live/annotate?url=http%3a%2f%2fhome%2et%2donline%2ede%2fhome%2fdshepherd%2ftkview%2ehtm">Edit</a>
@@ -244,7 +244,7 @@ standalone. <a href="/live/annotate?url=http%3a%2f%2fpurl%2eoclc%2eorg%2fnet%2fo
Works with <b>8.0</b>
<br>Download: <a href="http://www.cs.umd.edu/hcil/pad++/download.html">download.html</a><br>Pad++ is a Tk widget that provides a Zoomable User Interface (ZUI) that supports real-time interactive zoomable graphics in a fashion similar to the Tk Canvas widget. Pad++ supports tens of thousands of objects which include text, images, graphics, portals, lenses, simple html (and more), including transparency and rotation. <a href="/live/annotate?url=http%3a%2f%2fwww%2ecs%2eumd%2eedu%2fhcil%2fpad%2b%2b">Edit</a>
<i><font size="-1">(August 19, 1999 15:39)</font></i><dt><b><a href="http://home.t-online.de/home/sesam.com/freeware.htm" ="">Progressbar</a></b>
-<dd>Progressbar is a megawidget written in pure tcl (ie: no compiling required - runs on all platforms Macintosh, Unix, Windows).
+<dd>Progressbar is a megawidget written in pure tcl (ie: no compiling required - runs on all platforms Macintosh, Unix, Windows).
Its primary purpose is to show the progress of any action in percent. <a href="/live/annotate?url=http%3a%2f%2fhome%2et%2donline%2ede%2fhome%2fsesam%2ecom%2ffreeware%2ehtm">Edit</a>
<i><font size="-1">(January 24, 2000 09:19)</font></i><dt><b><a href="http://jfontain.free.fr/" ="">scwoop (Simple Composite Widget Object Oriented Package)</a></b>
<dd>Scwoop is a composite widget (also known as mega widget) extension to the great Tk widget library. Scwoop is
@@ -287,7 +287,7 @@ pie charts on a Tk canvas. <a href="/live/annotate?url=http%3a%2f%2fjfontain%2ef
<dd>TkPrint is an extension that allows you to print from a
Tk widget. <a href="/live/annotate?url=http%3a%2f%2fwww%2ecygnus%2ecom%2f%7eirox%2ftkprint%2f">Edit</a>
<i><font size="-1">(October 11, 1999 09:58)</font></i><dt><b><a href="http://www.purl.org/net/hobbs/tcl/capp/" ="">TkTable Home Page</a></b>
-<dd>The TkTable widget. The <code>table</code> command creates a
+<dd>The TkTable widget. The <code>table</code> command creates a
2-dimensional grid of cells. The table can use a Tcl array variable or Tcl
command for data storage and retrieval. <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fcapp%2f">Edit</a>
@@ -303,14 +303,14 @@ command for data storage and retrieval. <a href="/live/annotate?url=http%3a%2f%2
distribution. <a href="/live/annotate?url=http%3a%2f%2fftp%2eaustintx%2enet%2fusers%2fjatucker%2fTkTextmatrix%2fdefault%2ehtm">Edit</a>
<i><font size="-1">(August 23, 1999 12:14)</font></i><dt><b><a href="http://www.cs.umd.edu/~bederson/Togl.html" ="">ToGL - a Tk Open GL widget</a></b>
<dd>Togl is a Tk widget for OpenGL rendering. Togl is based on OGLTK, originally written by Benjamin Bederson at the
-University of New Mexico (who has since moved to the University of Maryland). Togl adds the new features:
+University of New Mexico (who has since moved to the University of Maryland). Togl adds the new features:
<ul>
-<li> color-index mode support including color allocation functions
-<li> support for requesting stencil, accumulation, alpha buffers, etc
-<li> multiple OpenGL drawing widgets
-<li> OpenGL extension testing from Tcl
-<li> simple, portable font support
-<li> overlay plane support
+<li> color-index mode support including color allocation functions
+<li> support for requesting stencil, accumulation, alpha buffers, etc
+<li> multiple OpenGL drawing widgets
+<li> OpenGL extension testing from Tcl
+<li> simple, portable font support
+<li> overlay plane support
</ul>
Togl allows one to create and manage a special Tk/OpenGL widget with Tcl and render into it with a C program. That is,
a typical Togl program will have Tcl code for managing the user interface and a C program for computations and
@@ -383,7 +383,7 @@ tree. The tree can be displayed horizontally or vertically.
Works with <b>Tcl/Tk 8.0 or higher</b>
<br>Download: <a href="http://www.purl.org/net/hobbs/tcl/script/widget/widget-0.9.tar.gz">widget-0.9.tar.gz</a><br>This is a package of
megawidgets (i.e., compound widgets) that work almost exactly like Tk widgets.
- You can also build your own new megawidgets.
+ You can also build your own new megawidgets.
Includes: combobox, hierarchy, console, progressbar,
tabnotebook, validating entry, pane geometry manager, baloon help. <a href="/live/annotate?url=http%3a%2f%2fwww%2epurl%2eorg%2fnet%2fhobbs%2ftcl%2fscript%2fwidget%2f">Edit</a>
<i><font size="-1">(August 23, 1999 12:16)</font></i></dl>
@@ -419,15 +419,15 @@ tabnotebook, validating entry, pane geometry manager, baloon help. <a href="/liv
over[9].src = "http://images.scriptics.com/images/homeMainRollover3.gif"
}
-
+
function MakeImageArray(n) {
this.length = n
for (var i = 0; i<=n; i++)="i++)" {="{" this[i]="this[i]" ="" new="new" Image()="Image()" }="}" return="return" this="this" }="}" //="//" --="--">
</SCRIPT><br>
<font size="2">
&copy; 1998-2000 Scriptics Corporation. All rights reserved.
- <a href="/legal_notice.html">Legal Notice</a> | <A href="" /privacy.html="/privacy.html">
+ <a href="/legal_notice.html">Legal Notice</a> | <A href="" /privacy.html="/privacy.html">
Privacy Statement</a>
</td></tr></table></td></tr></table>
</Body>
-</Html>
+</Html> \ No newline at end of file
diff --git a/ext/tk/sample/tkextlib/tkHTML/page3/index.html b/ext/tk/sample/tkextlib/tkHTML/page3/index.html
index a04470e659..ce92e8a22e 100644
--- a/ext/tk/sample/tkextlib/tkHTML/page3/index.html
+++ b/ext/tk/sample/tkextlib/tkHTML/page3/index.html
@@ -218,7 +218,7 @@
<h2 align="center">How To Compile Under Unix Without Installing Tcl</h2>
<p><p>Specify the *.a file directly:</p>
<blockquote><pre>
- $ gcc -I../tcl8.2.2/generic hello.c \
+ $ gcc -I../tcl8.2.2/generic hello.c \
../tcl8.2.2/unix/libtcl8.2.a -lm -ldl
$ strip a.out
$ ./a.out
@@ -226,7 +226,7 @@
<p>Or, tell the C compiler where to look for *.a files:</p>
<blockquote><pre>
- $ gcc -I../tcl8.2.2/generic hello.c \
+ $ gcc -I../tcl8.2.2/generic hello.c \
-L../tcl8.2.2/unix -ltcl -lm -ldl
$ strip a.out
$ ./a.out
@@ -982,7 +982,7 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<br clear="both"><p><hr></p>
<h2 align="center">Linkage From Tcl To C</h2>
<p><p align="center"><img src="image4"></p></p><p><ul><li>3rd parameter of Tcl_CreateCommand() is a pointer to the C subroutine
- that implements the command.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to
+ that implements the command.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to
the C routine whenever the Tcl command is executed.</li></ul><ul><li>1st parameter to Tcl_CreateCommand() must be a valid Tcl interpreter.
The same pointer appears as the second parameter to the C routine
whenever the Tcl command is executed.</li></ul></p>
@@ -990,7 +990,7 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<br clear="both"><p><hr></p>
<h2 align="center">Linkage From Tcl To C</h2>
<p><p align="center"><img src="image5"></p></p><p><ul><li>5th parameter of Tcl_CreateCommand() is a pointer to the C subroutine
- that is called when the Tcl command is deleted.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to
+ that is called when the Tcl command is deleted.</li></ul><ul><li>4th parameter to Tcl_CreateCommand() becomes the 1st parameter to
the C routine.</li></ul></p>
<br clear="both"><p><hr></p>
@@ -1035,7 +1035,7 @@ pack&nbsp;.b</tt></small></td>
<br clear="both"><p><hr></p>
<h2 align="center">Linkage From Tcl To C</h2>
-<p>The <tt>argc</tt> and <tt>argv</tt> parameters work just like in
+<p>The <tt>argc</tt> and <tt>argv</tt> parameters work just like in
<tt>main()</tt></p><p>
<table cellspacing="0" cellpadding="0" border="0">
<tr><td valign="center">
@@ -1139,7 +1139,7 @@ pack&nbsp;.b</tt></small></td>
<td></td><td></td><td></td><td></td>
</tr>
</table>
-<p><ul><li>Result should be the text of an error message if you
+<p><ul><li>Result should be the text of an error message if you
return TCL_ERROR.</li></ul><ul><li>3rd argument to Tcl_SetResult() can be TCL_STATIC,
TCL_DYNAMIC, TCL_VOLATILE, or a function pointer.</li></ul><ul><li>Also consider using Tcl_AppendResult().</li></ul><ul><li>Direct access to <tt>interp->result</tt> is deprecated.</li></ul><ul><li>See the man pages for details.</li></ul></p>
@@ -1443,7 +1443,7 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<h2 align="center">Initialization Scripts</h2>
<p><ul><li>Run the mini TCLSH implemented above and execute the <tt>parray</tt> command</li></ul><ul><li>It doesn't work! What's wrong? </p></li></li></ul><ul><li><tt>parray</tt> is really a Tcl proc that is read in when the
interpreter is initialized. </p></li></li></ul><ul><li><tt>parray</tt> (and several other commands) are stored in a
- handful of &quot;Initialization Scripts&quot; </p></li></li></ul><ul><li>All the initialization scripts are stored in the
+ handful of &quot;Initialization Scripts&quot; </p></li></li></ul><ul><li>All the initialization scripts are stored in the
&quot;Tcl Library&quot; - a directory on the host
computer. </p></li></li></ul><table><tr><td valign="top"><img src="image3"></td>
<td valign="top"><b>Invoke the Tcl_Init() function to locate and read the
@@ -1668,8 +1668,8 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
</ul></li></ul><ul><li>Allows us to implement a virtual filesystem that overlays the
real filesystem.</li></ul><ul><li>The virtual filesystem contains all the initialization scripts
as compiled-in strings. The initialization scripts look like
- they are resident on disk even though they are built in.</li></ul><ul><li>These functions first appeared in Tcl8.0.3.
- Presumably to support TclPro Wrapper.</li></ul><ul><li>The only documentation is comments on the code.
+ they are resident on disk even though they are built in.</li></ul><ul><li>These functions first appeared in Tcl8.0.3.
+ Presumably to support TclPro Wrapper.</li></ul><ul><li>The only documentation is comments on the code.
See the Tcl source file <tt>generic/tclIOUtil.c</tt></li></ul></p>
<br clear="both"><p><hr></p>
<h2 align="center">The <tt>TclStatInsertProc()</tt> Function</h2>
@@ -1997,7 +1997,7 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<h2 align="center">Compiling "Hello, World!" For Tk</h2>
<p><p><b>Unix:</b></p>
<blockquote><pre>
- $ gcc hello.c -ltk -L/usr/X11R6/lib \
+ $ gcc hello.c -ltk -L/usr/X11R6/lib \
-lX11 -ltcl -lm -ldl
$ ./a.out</pre></blockquote>
@@ -2008,7 +2008,7 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<p><b>Windows using Mingw32:</b></p>
<blockquote><pre>
- C:> gcc -mno-cygwin hello.c -mwindows \
+ C:> gcc -mno-cygwin hello.c -mwindows \
-ltk82 -ltcl82 -lm
C:> a.exe</pre></blockquote></p>
<br clear="both"><p><hr></p>
@@ -2162,7 +2162,7 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<li> FreeWrap - http://www.albany.net/~dlabelle/freewrap/freewrap.html </li>
<li> Wrap - http://members1.chello.nl/~j.nijtmans/wrap.html </li>
</ul></li></ul><ul><li>No C compiler required!</li></ul><ul><li>TclPro will convert Tcl script into bytecode so that it cannot be
- easily read by the end user. FreeWrap encrypts the scripts.</li></ul><ul><li>FreeWrap uses compression on its executable.
+ easily read by the end user. FreeWrap encrypts the scripts.</li></ul><ul><li>FreeWrap uses compression on its executable.
Wrap uses compression on both the executable and on the bundled script files.</li></ul><ul><li>Usually include extensions like winico and/or BLT</li></ul></p></td></tr></table>
<br clear="both"><p><hr></p>
@@ -2170,8 +2170,8 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){<br>
<table><tr><td valign="top"><img src="image9"></td>
<td valign="top"><p><ul><li>Mix C/C++ with Tcl/Tk into a standalone binary</li></ul>
<ul><li><tt>mktclapp</tt> generates an application initialization file
- that contains Tcl scripts as strings and makes all necessary calls
- to <tt>Tcl_Init</tt>, <tt>Tcl_CreateCommand</tt>,
+ that contains Tcl scripts as strings and makes all necessary calls
+ to <tt>Tcl_Init</tt>, <tt>Tcl_CreateCommand</tt>,
<tt>Tcl</tt>*<tt>InsertProc</tt>, etc.</li></ul><ul><li>Features to make it easier to write new Tcl command in C</li></ul><ul><li><tt>xmktclapp.tcl</tt> provides a GUI interface to <tt>mktclapp</tt></li></ul><ul><li>http://www.hwaci.com/sw/mktclapp/</li></ul></p></td></tr></table>
<br clear="both"><p><hr></p>
@@ -2400,7 +2400,7 @@ int&nbsp;ET_OBJCOMMAND_add2(ET_OBJARGS){<br>
<h2 align="center">Locations Of Libraries</h2>
<table><tr><td valign="top"><img src="image13"></td>
<td valign="top"><p><ul><li>Tells mktclapp where to look for script libraries.</li></ul><ul><li>All Tcl scripts in the indicated directories are
- compiled into the <tt>appinit.c</tt> file.</li></ul><ul><li>Comments and extra white-space are removed.
+ compiled into the <tt>appinit.c</tt> file.</li></ul><ul><li>Comments and extra white-space are removed.
There is no way to turn this off.</li></ul></p></td></tr></table>
<br clear="both"><p><hr></p>
@@ -2607,10 +2607,10 @@ int&nbsp;main(int&nbsp;argc,&nbsp;char&nbsp;**argv){</tt></small></td>
<br clear="both"><p><hr></p>
<h2 align="center">Mktclapp Initialization Sequence</h2>
-<p><ul><li>Initialization starts when the <tt>Et_Init()</tt>
+<p><ul><li>Initialization starts when the <tt>Et_Init()</tt>
function is called either by client code or by
the <tt>main()</tt> that mktclapp generates</li></ul><ul><li>Create the main Tcl interpreter</li></ul><ul><li>Construct the virtual filesystem overlay by redefining
- the <tt>source</tt> command and by using the
+ the <tt>source</tt> command and by using the
<tt>Tcl</tt>*<tt>InsertProc()</tt> functions</li></ul><ul><li>Call <tt>Et_PreInit()</tt> if the client defines it</li></ul><ul><li>Call <tt>Tcl_Init()</tt> and <tt>Tk_Init()</tt></li></ul><ul><li>Call <tt>Tcl_CreateCommand()</tt> and <tt>Tcl_CreateObjCommand()</tt>
for every <tt>ET_COMMAND_</tt>* and <tt>ET_OBJCOMMAND_</tt>* function
in the client code</li></ul><ul><li>Call <tt>Et_AppInit()</tt> if the client defines it</li></ul><ul><li>Run the main Tcl script if there is one</li></ul><ul><li>Call <tt>Et_CustomMainLoop()</tt> if defined by client code or
@@ -2680,7 +2680,7 @@ void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
<ul><li>
The command that gets executed is:
<pre>
- tk_messageBox -icon error -msg \
+ tk_messageBox -icon error -msg \
{Syntax error near "}"} -type ok
</pre>
</li></ul>
@@ -2708,7 +2708,7 @@ void&nbsp;ErrMsg(char&nbsp;*zMsg){<br>
<p><ul><li>The <tt></tt> puts a backslash before all characters that
are special to Tcl</li></ul><ul><li>The Tcl command becomes:
<pre>
- tk_messageBox -icon error -msg \
+ tk_messageBox -icon error -msg \
"Syntax error near \"\}\"" -type ok
</pre></li></ul></p>
diff --git a/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension b/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
index 23238e9c66..7f515feee8 100644
--- a/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
+++ b/ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension
@@ -30,7 +30,7 @@ MODIFICATIONS.
GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal
+in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
@@ -38,4 +38,4 @@ Government shall have only "Restricted Rights" as defined in Clause
252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
-terms specified in this license.
+terms specified in this license.
diff --git a/ext/tk/sample/tkextlib/tkimg/readme.txt b/ext/tk/sample/tkextlib/tkimg/readme.txt
index 8e4b0163b1..4d9774492c 100644
--- a/ext/tk/sample/tkextlib/tkimg/readme.txt
+++ b/ext/tk/sample/tkextlib/tkimg/readme.txt
@@ -1,3 +1,3 @@
-The script 'demo.rb' is based on 'demo.tcl' of Tcl/Tk's 'Img' extention.
+The script 'demo.rb' is based on 'demo.tcl' of Tcl/Tk's 'Img' extention.
Image data in 'demo.rb' is those of 'demo.tcl'.
Please read 'license_terms_of_Img_extension' file.
diff --git a/ext/tk/sample/tkextlib/treectrl/readme.txt b/ext/tk/sample/tkextlib/treectrl/readme.txt
index bda4f63d88..9f26ac069c 100644
--- a/ext/tk/sample/tkextlib/treectrl/readme.txt
+++ b/ext/tk/sample/tkextlib/treectrl/readme.txt
@@ -1,2 +1,2 @@
The scripts and image files in this directory are based on demo files
-of Tcl/Tk's TreeCtrl extention.
+of Tcl/Tk's TreeCtrl extention.
diff --git a/ext/tk/sample/tkoptdb-safeTk.rb b/ext/tk/sample/tkoptdb-safeTk.rb
index 7502e30667..3972577b0f 100644
--- a/ext/tk/sample/tkoptdb-safeTk.rb
+++ b/ext/tk/sample/tkoptdb-safeTk.rb
@@ -20,7 +20,7 @@ if ENV['LANG'] =~ /^ja/
# read Japanese resource
ent = TkOptionDB.read_entries(File.expand_path('resource.ja',
File.dirname(__FILE__)),
- 'utf-8')
+ 'euc-jp')
else
# read English resource
ent = TkOptionDB.read_entries(File.expand_path('resource.en',
diff --git a/ext/tk/sample/tkoptdb.rb b/ext/tk/sample/tkoptdb.rb
index 0171e465b3..75c21e7e47 100644
--- a/ext/tk/sample/tkoptdb.rb
+++ b/ext/tk/sample/tkoptdb.rb
@@ -13,7 +13,7 @@ if __FILE__ == $0 || !TkCore::INTERP.safe?
# read Japanese resource
TkOptionDB.read_with_encoding(File.expand_path('resource.ja',
File.dirname(__FILE__)),
- 'utf-8')
+ 'euc-jp')
else
# read English resource
TkOptionDB.readfile(File.expand_path('resource.en',
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 6c82c7a7bb..4b02fdd728 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -83,8 +83,8 @@ _nativethread_consistency_check(ip)
# define DL_SYM GetProcAddress
# define TCL_INDEX 4
# define TK_INDEX 3
-# define TCL_NAME "tcl89"
-# define TK_NAME "tk89"
+# define TCL_NAME "tcl89%s"
+# define TK_NAME "tk89%s"
# undef DLEXT
# define DLEXT ".dll"
#elif defined HAVE_DLOPEN
@@ -94,9 +94,9 @@ _nativethread_consistency_check(ip)
# define DL_SYM dlsym
# define TCL_INDEX 8
# define TK_INDEX 7
-# define TCL_NAME "libtcl8.9"
-# define TK_NAME "libtk8.9"
-# ifdef __APPLE__
+# define TCL_NAME "libtcl8.9%s"
+# define TK_NAME "libtk8.9%s"
+# if defined(__APPLE__) && defined(__MACH__) /* Mac OS X */
# undef DLEXT
# define DLEXT ".dylib"
# endif
@@ -116,6 +116,7 @@ ruby_open_tcl_dll(appname)
void (*p_Tcl_FindExecutable)(const char *);
int n;
char *ruby_tcl_dll = 0;
+ char tcl_name[20];
if (tcl_dll) return TCLTK_STUBS_OK;
@@ -126,7 +127,7 @@ ruby_open_tcl_dll(appname)
if (ruby_tcl_dll) {
tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll);
} else {
- char tcl_name[] = TCL_NAME DLEXT;
+ snprintf(tcl_name, sizeof tcl_name, TCL_NAME, DLEXT);
/* examine from 8.9 to 8.1 */
for (n = '9'; n > '0'; n--) {
tcl_name[TCL_INDEX] = n;
@@ -161,6 +162,7 @@ ruby_open_tk_dll()
{
int n;
char *ruby_tk_dll = 0;
+ char tk_name[20];
if (!tcl_dll) {
/* int ret = ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
@@ -174,7 +176,7 @@ ruby_open_tk_dll()
if (ruby_tk_dll) {
tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll);
} else {
- char tk_name[] = TK_NAME DLEXT;
+ snprintf(tk_name, sizeof tk_name, TK_NAME, DLEXT);
/* examine from 8.9 to 8.1 */
for (n = '9'; n > '0'; n--) {
tk_name[TK_INDEX] = n;
@@ -327,12 +329,12 @@ ruby_tk_stubs_init(tcl_ip)
if (!p_Tk_Init)
return NO_Tk_Init;
-#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__)
+#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__) && defined(__MACH__)
/*
FIX ME : dirty hack for Mac OS X frameworks.
With stubs, fails to find Resource/Script directory of Tk.framework.
So, teach it to a Tcl interpreter by an environment variable.
- e.g. when $tcl_library ==
+ e.g. when $tcl_library ==
/Library/Frameworks/Tcl.framwwork/8.5/Resources/Scripts
==> /Library/Frameworks/Tk.framwwork/8.5/Resources/Scripts
*/
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index 6e9587e999..6165ec8620 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,8 +4,7 @@
* Oct. 24, 1997 Y. Matsumoto
*/
-#define TCLTKLIB_RELEASE_DATE "2010-08-25"
-/* #define CREATE_RUBYTK_KIT */
+#define TCLTKLIB_RELEASE_DATE "2010-03-26"
#include "ruby.h"
@@ -20,7 +19,7 @@
#endif
#ifdef RUBY_VM
-static int rb_thread_critical; /* dummy */
+static VALUE rb_thread_critical; /* dummy */
int rb_thread_check_trap_pending();
#else
/* use rb_thread_critical on Ruby 1.8.x */
@@ -31,9 +30,6 @@ int rb_thread_check_trap_pending();
#define RSTRING_PTR(s) (RSTRING(s)->ptr)
#define RSTRING_LEN(s) (RSTRING(s)->len)
#endif
-#if !defined(RSTRING_LENINT)
-#define RSTRING_LENINT(s) ((int)RSTRING_LEN(s))
-#endif
#if !defined(RARRAY_PTR)
#define RARRAY_PTR(s) (RARRAY(s)->ptr)
#define RARRAY_LEN(s) (RARRAY(s)->len)
@@ -44,7 +40,6 @@ int rb_thread_check_trap_pending();
#else
#define RbTk_OBJ_UNTRUST(x) OBJ_TAINT(x)
#endif
-#define RbTk_ALLOC_N(type, n) (type *)ckalloc((int)(sizeof(type) * (n)))
#if defined(HAVE_RB_PROC_NEW) && !defined(RUBY_VM)
/* Ruby 1.8 :: rb_proc_new() was hidden from intern.h at 2008/04/22 */
@@ -61,20 +56,6 @@ extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg]
#define va_init_list(a,b) va_start(a)
#endif
#include <string.h>
-
-#if !defined HAVE_VSNPRINTF && !defined vsnprintf
-# ifdef WIN32
- /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-# define vsnprintf _vsnprintf
-# else
-# ifdef HAVE_RUBY_RUBY_H
-# include "ruby/missing.h"
-# else
-# include "missing.h"
-# endif
-# endif
-#endif
-
#include <tcl.h>
#include <tk.h>
@@ -87,14 +68,9 @@ extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg]
#ifndef HAVE_RB_ERRINFO
#define rb_errinfo() (ruby_errinfo+0) /* cannot be l-value */
-#else
-VALUE rb_errinfo(void);
#endif
#ifndef HAVE_RB_SAFE_LEVEL
-#define rb_safe_level() (ruby_safe_level+0)
-#endif
-#ifndef HAVE_RB_SOURCEFILE
-#define rb_sourcefile() (ruby_sourcefile+0)
+#define rb_safe_level() (ruby_safe_level+0) /* cannot be l-value */
#endif
#include "stubs.h"
@@ -509,7 +485,7 @@ static int have_rb_thread_waiting_for_value = 0;
#ifdef RUBY_USE_NATIVE_THREAD
#define DEFAULT_EVENT_LOOP_MAX 800/*counts*/
#define DEFAULT_NO_EVENT_TICK 10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT 5/*milliseconds ( 1 -- 999 ) */
+#define DEFAULT_NO_EVENT_WAIT 1/*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 ) */
@@ -553,6 +529,7 @@ struct cmd_body_arg {
VALUE args;
};
+
/*----------------------------*/
/* use Tcl internal functions */
/*----------------------------*/
@@ -843,14 +820,15 @@ create_ip_exc(interp, exc, fmt, va_alist)
#endif
{
va_list args;
- VALUE msg;
+ char buf[BUFSIZ];
VALUE einfo;
struct tcltkip *ptr = get_ip(interp);
va_init_list(args,fmt);
- msg = rb_vsprintf(fmt, args);
+ vsnprintf(buf, BUFSIZ, fmt, args);
+ buf[BUFSIZ - 1] = '\0';
va_end(args);
- einfo = rb_exc_new3(exc, msg);
+ einfo = rb_exc_new2(exc, buf);
rb_ivar_set(einfo, ID_at_interp, interp);
if (ptr) {
Tcl_ResetResult(ptr->ip);
@@ -860,420 +838,6 @@ create_ip_exc(interp, exc, fmt, va_alist)
}
-/*####################################################################*/
-#if defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT
-
-/*--------------------------------------------------------*/
-
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 84
-#error Ruby/Tk-Kit requires Tcl/Tk8.4 or later.
-#endif
-
-/*--------------------------------------------------------*/
-
-/* Many part of code to support Ruby/Tk-Kit is quoted from Tclkit. */
-/* But, never ask Tclkit community about Ruby/Tk-Kit. */
-/* Please ask Ruby (Ruby/Tk) community (e.g. "ruby-dev" mailing list). */
-/*
-----<< license terms of TclKit (from kitgen's "README" file) >>---------------
-The Tclkit-specific sources are license free, they just have a copyright. Hold
-the author(s) harmless and any lawful use is permitted.
-
-This does *not* apply to any of the sources of the other major Open Source
-Software used in Tclkit, which each have very liberal BSD/MIT-like licenses:
-
- * Tcl/Tk, TclVFS, Thread, Vlerq, Zlib
-------------------------------------------------------------------------------
- */
-/* Tcl/Tk stubs may work, but probably it is meaningless. */
-#if defined USE_TCL_STUBS || defined USE_TK_STUBS
-# error Not support Tcl/Tk stubs with Ruby/Tk-Kit or Rubykit.
-#endif
-
-#ifndef KIT_INCLUDES_ZLIB
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
-#define KIT_INCLUDES_ZLIB 1
-#else
-#define KIT_INCLUDES_ZLIB 0
-#endif
-#endif
-
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
-EXTERN Tcl_Obj* TclGetStartupScriptPath();
-EXTERN void TclSetStartupScriptPath _((Tcl_Obj*));
-#define Tcl_GetStartupScript(encPtr) TclGetStartupScriptPath()
-#define Tcl_SetStartupScript(path,enc) TclSetStartupScriptPath(path)
-#endif
-#if !defined(TclSetPreInitScript) && !defined(TclSetPreInitScript_TCL_DECLARED)
-EXTERN char* TclSetPreInitScript _((char *));
-#endif
-
-#ifndef KIT_INCLUDES_TK
-# define KIT_INCLUDES_TK 1
-#endif
-/* #define KIT_INCLUDES_ITCL 1 */
-/* #define KIT_INCLUDES_THREAD 1 */
-
-Tcl_AppInitProc Vfs_Init, Rechan_Init;
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
-Tcl_AppInitProc Pwb_Init;
-#endif
-
-#ifdef KIT_LITE
-Tcl_AppInitProc Vlerq_Init, Vlerq_SafeInit;
-#else
-Tcl_AppInitProc Mk4tcl_Init;
-#endif
-
-#if defined TCL_THREADS && defined KIT_INCLUDES_THREAD
-Tcl_AppInitProc Thread_Init;
-#endif
-
-#if KIT_INCLUDES_ZLIB
-Tcl_AppInitProc Zlib_Init;
-#endif
-
-#ifdef KIT_INCLUDES_ITCL
-Tcl_AppInitProc Itcl_Init;
-#endif
-
-#ifdef _WIN32
-Tcl_AppInitProc Dde_Init, Dde_SafeInit, Registry_Init;
-#endif
-
-/*--------------------------------------------------------*/
-
-#define RUBYTK_KITPATH_CONST_NAME "RUBYTK_KITPATH"
-
-static char *rubytk_kitpath = NULL;
-
-static char rubytkkit_preInitCmd[] =
-"proc tclKitPreInit {} {\n"
- "rename tclKitPreInit {}\n"
- "load {} rubytk_kitpath\n"
-#if KIT_INCLUDES_ZLIB
- "catch {load {} zlib}\n"
-#endif
-#ifdef KIT_LITE
- "load {} vlerq\n"
- "namespace eval ::vlerq {}\n"
- "if {[catch { vlerq open $::tcl::kitpath } ::vlerq::starkit_root]} {\n"
- "set n -1\n"
- "} else {\n"
- "set files [vlerq get $::vlerq::starkit_root 0 dirs 0 files]\n"
- "set n [lsearch [vlerq get $files * name] boot.tcl]\n"
- "}\n"
- "if {$n >= 0} {\n"
- "array set a [vlerq get $files $n]\n"
-#else
- "load {} Mk4tcl\n"
-#if defined KIT_VFS_WRITABLE && !defined CREATE_RUBYKIT
- /* running command cannot open itself for writing */
- "mk::file open exe $::tcl::kitpath\n"
-#else
- "mk::file open exe $::tcl::kitpath -readonly\n"
-#endif
- "set n [mk::select exe.dirs!0.files name boot.tcl]\n"
- "if {[llength $n] == 1} {\n"
- "array set a [mk::get exe.dirs!0.files!$n]\n"
-#endif
- "if {![info exists a(contents)]} { error {no boot.tcl file} }\n"
- "if {$a(size) != [string length $a(contents)]} {\n"
- "set a(contents) [zlib decompress $a(contents)]\n"
- "}\n"
- "if {$a(contents) eq \"\"} { error {empty boot.tcl} }\n"
- "uplevel #0 $a(contents)\n"
-#if 0
- "} elseif {[lindex $::argv 0] eq \"-init-\"} {\n"
- "uplevel #0 { source [lindex $::argv 1] }\n"
- "exit\n"
-#endif
- "} else {\n"
- /* When cannot find VFS data, try to use a real directory */
- "set vfsdir \"[file rootname $::tcl::kitpath].vfs\"\n"
- "if {[file isdirectory $vfsdir]} {\n"
- "set ::tcl_library [file join $vfsdir lib tcl$::tcl_version]\n"
- "set ::tcl_libPath [list $::tcl_library [file join $vfsdir lib]]\n"
- "catch {uplevel #0 [list source [file join $vfsdir config.tcl]]}\n"
- "uplevel #0 [list source [file join $::tcl_library init.tcl]]\n"
- "set ::auto_path $::tcl_libPath\n"
- "} else {\n"
- "error \"\n $::tcl::kitpath has no VFS data to start up\"\n"
- "}\n"
- "}\n"
-"}\n"
-"tclKitPreInit"
-;
-
-#if 0
-/* Not use this script.
- It's a memo to support an initScript for Tcl interpreters in the future. */
-static const char initScript[] =
-"if {[file isfile [file join $::tcl::kitpath main.tcl]]} {\n"
- "if {[info commands console] != {}} { console hide }\n"
- "set tcl_interactive 0\n"
- "incr argc\n"
- "set argv [linsert $argv 0 $argv0]\n"
- "set argv0 [file join $::tcl::kitpath main.tcl]\n"
-"} else continue\n"
-;
-#endif
-
-/*--------------------------------------------------------*/
-
-static char*
-set_rubytk_kitpath(const char *kitpath)
-{
- if (kitpath) {
- int len = (int)strlen(kitpath);
- if (rubytk_kitpath) {
- ckfree(rubytk_kitpath);
- }
-
- rubytk_kitpath = (char *)ckalloc(len + 1);
- memcpy(rubytk_kitpath, kitpath, len);
- rubytk_kitpath[len] = '\0';
- }
- return rubytk_kitpath;
-}
-
-/*--------------------------------------------------------*/
-
-#ifdef WIN32
-#define DEV_NULL "NUL"
-#else
-#define DEV_NULL "/dev/null"
-#endif
-
-static void
-check_tclkit_std_channels()
-{
- Tcl_Channel chan;
-
- /*
- * We need to verify if we have the standard channels and create them if
- * not. Otherwise internals channels may get used as standard channels
- * (like for encodings) and panic.
- */
- chan = Tcl_GetStdChannel(TCL_STDIN);
- if (chan == NULL) {
- chan = Tcl_OpenFileChannel(NULL, DEV_NULL, "r", 0);
- if (chan != NULL) {
- Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
- }
- Tcl_SetStdChannel(chan, TCL_STDIN);
- }
- chan = Tcl_GetStdChannel(TCL_STDOUT);
- if (chan == NULL) {
- chan = Tcl_OpenFileChannel(NULL, DEV_NULL, "w", 0);
- if (chan != NULL) {
- Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
- }
- Tcl_SetStdChannel(chan, TCL_STDOUT);
- }
- chan = Tcl_GetStdChannel(TCL_STDERR);
- if (chan == NULL) {
- chan = Tcl_OpenFileChannel(NULL, DEV_NULL, "w", 0);
- if (chan != NULL) {
- Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
- }
- Tcl_SetStdChannel(chan, TCL_STDERR);
- }
-}
-
-/*--------------------------------------------------------*/
-
-static int
-rubytk_kitpathObjCmd(ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
-{
- const char* str;
- if (objc == 2) {
- set_rubytk_kitpath(Tcl_GetString(objv[1]));
- } else if (objc > 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "?path?");
- }
- str = rubytk_kitpath ? rubytk_kitpath : Tcl_GetNameOfExecutable();
- Tcl_SetObjResult(interp, Tcl_NewStringObj(str, -1));
- return TCL_OK;
-}
-
-/*
- * Public entry point for ::tcl::kitpath.
- * Creates both link variable name and Tcl command ::tcl::kitpath.
- */
-static int
-rubytk_kitpath_init(Tcl_Interp *interp)
-{
- Tcl_CreateObjCommand(interp, "::tcl::kitpath", rubytk_kitpathObjCmd, 0, 0);
- if (Tcl_LinkVar(interp, "::tcl::kitpath", (char *) &rubytk_kitpath,
- TCL_LINK_STRING | TCL_LINK_READ_ONLY) != TCL_OK) {
- Tcl_ResetResult(interp);
- }
-
- Tcl_CreateObjCommand(interp, "::tcl::rubytk_kitpath", rubytk_kitpathObjCmd, 0, 0);
- if (Tcl_LinkVar(interp, "::tcl::rubytk_kitpath", (char *) &rubytk_kitpath,
- TCL_LINK_STRING | TCL_LINK_READ_ONLY) != TCL_OK) {
- Tcl_ResetResult(interp);
- }
-
- if (rubytk_kitpath == NULL) {
- /*
- * XXX: We may want to avoid doing this to allow tcl::kitpath calls
- * XXX: to obtain changes in nameofexe, if they occur.
- */
- set_rubytk_kitpath(Tcl_GetNameOfExecutable());
- }
-
- return Tcl_PkgProvide(interp, "rubytk_kitpath", "1.0");
-}
-
-/*--------------------------------------------------------*/
-
-static void
-init_static_tcltk_packages()
-{
- /*
- * Ensure that std channels exist (creating them if necessary)
- */
- check_tclkit_std_channels();
-
-#ifdef KIT_INCLUDES_ITCL
- Tcl_StaticPackage(0, "Itcl", Itcl_Init, NULL);
-#endif
-#ifdef KIT_LITE
- Tcl_StaticPackage(0, "Vlerq", Vlerq_Init, Vlerq_SafeInit);
-#else
- Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL);
-#endif
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
- Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);
-#endif
- Tcl_StaticPackage(0, "rubytk_kitpath", rubytk_kitpath_init, NULL);
- Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL);
- Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL);
-#if KIT_INCLUDES_ZLIB
- Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL);
-#endif
-#if defined TCL_THREADS && defined KIT_INCLUDES_THREAD
- Tcl_StaticPackage(0, "Thread", Thread_Init, Thread_SafeInit);
-#endif
-#ifdef _WIN32
-#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION > 84
- Tcl_StaticPackage(0, "dde", Dde_Init, Dde_SafeInit);
-#else
- Tcl_StaticPackage(0, "dde", Dde_Init, NULL);
-#endif
- Tcl_StaticPackage(0, "registry", Registry_Init, NULL);
-#endif
-#ifdef KIT_INCLUDES_TK
- Tcl_StaticPackage(0, "Tk", Tk_Init, Tk_SafeInit);
-#endif
-}
-
-/*--------------------------------------------------------*/
-
-static int
-call_tclkit_init_script(Tcl_Interp *interp)
-{
-#if 0
- /* Currently, do nothing in this function.
- It's a memo (quoted from kitInit.c of Tclkit)
- to support an initScript for Tcl interpreters in the future. */
- if (Tcl_EvalEx(interp, initScript, -1, TCL_EVAL_GLOBAL) == TCL_OK) {
- const char *encoding = NULL;
- Tcl_Obj* path = Tcl_GetStartupScript(&encoding);
- Tcl_SetStartupScript(Tcl_GetObjResult(interp), encoding);
- if (path == NULL) {
- Tcl_Eval(interp, "incr argc -1; set argv [lrange $argv 1 end]");
- }
- }
-#endif
-
- return 1;
-}
-
-/*--------------------------------------------------------*/
-
-#ifdef __WIN32__
-/* #include <tkWinInt.h> *//* conflict definition of struct timezone */
-/* #include <tkIntPlatDecls.h> */
-/* #include <windows.h> */
-EXTERN void TkWinSetHINSTANCE(HINSTANCE hInstance);
-void rbtk_win32_SetHINSTANCE(const char *module_name)
-{
- /* TCHAR szBuf[256]; */
- HINSTANCE hInst;
-
- /* hInst = GetModuleHandle(NULL); */
- /* hInst = GetModuleHandle("tcltklib.so"); */
- hInst = GetModuleHandle(module_name);
- TkWinSetHINSTANCE(hInst);
-
- /* GetModuleFileName(hInst, szBuf, sizeof(szBuf) / sizeof(TCHAR)); */
- /* MessageBox(NULL, szBuf, TEXT("OK"), MB_OK); */
-}
-#endif
-
-/*--------------------------------------------------------*/
-
-static void
-setup_rubytkkit()
-{
- init_static_tcltk_packages();
-
- {
- ID const_id;
- const_id = rb_intern(RUBYTK_KITPATH_CONST_NAME);
-
- if (rb_const_defined(rb_cObject, const_id)) {
- volatile VALUE pathobj;
- pathobj = rb_const_get(rb_cObject, const_id);
-
- if (rb_obj_is_kind_of(pathobj, rb_cString)) {
-#ifdef HAVE_RUBY_ENCODING_H
- pathobj = rb_str_export_to_enc(pathobj, rb_utf8_encoding());
-#endif
- set_rubytk_kitpath(RSTRING_PTR(pathobj));
- }
- }
- }
-
-#ifdef CREATE_RUBYTK_KIT
- if (rubytk_kitpath == NULL) {
-#ifdef __WIN32__
- /* rbtk_win32_SetHINSTANCE("tcltklib.so"); */
- {
- volatile VALUE basename;
- basename = rb_funcall(rb_cFile, rb_intern("basename"), 1,
- rb_str_new2(rb_sourcefile()));
- rbtk_win32_SetHINSTANCE(RSTRING_PTR(basename));
- }
-#endif
- set_rubytk_kitpath(rb_sourcefile());
- }
-#endif
-
- if (rubytk_kitpath == NULL) {
- set_rubytk_kitpath(Tcl_GetNameOfExecutable());
- }
-
- TclSetPreInitScript(rubytkkit_preInitCmd);
-}
-
-/*--------------------------------------------------------*/
-
-#endif /* defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT */
-/*####################################################################*/
-
-
-/**********************************************************************/
-
/* stub status */
static void
tcl_stubs_check()
@@ -1406,8 +970,6 @@ pending_exception_check0()
} else {
return 0;
}
-
- UNREACHABLE;
}
static int
@@ -1449,8 +1011,6 @@ pending_exception_check1(thr_crit_bup, ptr)
} else {
return 0;
}
-
- UNREACHABLE;
}
@@ -1488,7 +1048,7 @@ call_original_exit(ptr, state)
#if USE_RUBY_ALLOC
argv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, 3);
#else /* not USE_RUBY_ALLOC */
- argv = RbTk_ALLOC_N(Tcl_Obj *, 3);
+ argv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * 3);
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
@@ -1528,12 +1088,12 @@ call_original_exit(ptr, state)
#if USE_RUBY_ALLOC
argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */
#else /* not USE_RUBY_ALLOC */
- argv = RbTk_ALLOC_N(CONST84 char *, 3);
+ argv = (CONST84 char **)ckalloc(sizeof(char *) * 3);
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
#endif
- argv[0] = (char *)"exit";
+ argv[0] = "exit";
/* argv[1] = Tcl_GetString(state_obj); */
argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL);
argv[2] = (char *)NULL;
@@ -1567,7 +1127,7 @@ call_original_exit(ptr, state)
#if USE_RUBY_ALLOC
argv = (char **)ALLOC_N(char *, 3);
#else /* not USE_RUBY_ALLOC */
- argv = RbTk_ALLOC_N(char *, 3);
+ argv = (char **)ckalloc(sizeof(char *) * 3);
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
@@ -1987,21 +1547,6 @@ lib_num_of_mainwindows(self)
#endif
}
-void
-rbtk_EventSetupProc(ClientData clientData, int flag)
-{
- Tcl_Time tcl_time;
- tcl_time.sec = 0;
- tcl_time.usec = 1000L * (long)no_event_tick;
- Tcl_SetMaxBlockTime(&tcl_time);
-}
-
-void
-rbtk_EventCheckProc(ClientData clientData, int flag)
-{
- rb_thread_schedule();
-}
-
#ifdef RUBY_USE_NATIVE_THREAD /* Ruby 1.9+ !!! */
static VALUE
@@ -2054,7 +1599,6 @@ call_DoOneEvent(flag_val)
#endif
-#if 0
static VALUE
#ifdef HAVE_PROTOTYPES
eventloop_sleep(VALUE dummy)
@@ -2070,7 +1614,7 @@ eventloop_sleep(dummy)
}
t.tv_sec = 0;
- t.tv_usec = (int)(no_event_wait*1000.0);
+ t.tv_usec = (long)(no_event_wait*1000.0);
#ifdef HAVE_NATIVETHREAD
#ifndef RUBY_USE_NATIVE_THREAD
@@ -2094,7 +1638,6 @@ eventloop_sleep(dummy)
return Qnil;
}
-#endif
#define USE_EVLOOP_THREAD_ALONE_CHECK_FLAG 0
@@ -2202,7 +1745,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (update_flag) DUMP1("update loop start!!");
t.tv_sec = 0;
- t.tv_usec = 1000 * no_event_wait;
+ t.tv_usec = (long)(no_event_wait*1000.0);
Tcl_DeleteTimerHandler(timer_token);
run_timer_flag = 0;
@@ -2233,8 +1776,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
event_loop_wait_event = 0;
if (update_flag) {
- event_flag = update_flag;
- /* event_flag = update_flag | TCL_DONT_WAIT; */ /* for safety */
+ event_flag = update_flag | TCL_DONT_WAIT; /* for safety */
} else {
event_flag = TCL_ALL_EVENTS;
/* event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT; */
@@ -2340,11 +1882,9 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
found_event = 1;
if (update_flag) {
- event_flag = update_flag; /* for safety */
- /* event_flag = update_flag | TCL_DONT_WAIT; */ /* for safety */
+ event_flag = update_flag | TCL_DONT_WAIT; /* for safety */
} else {
- event_flag = TCL_ALL_EVENTS;
- /* event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT; */
+ event_flag = TCL_ALL_EVENTS | TCL_DONT_WAIT;
}
timer_tick = req_timer_tick;
@@ -2364,7 +1904,6 @@ 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
if (update_flag) {
st = RTEST(rb_protect(call_DoOneEvent,
@@ -2458,8 +1997,8 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
tick_counter += no_event_tick;
-#if 0
/* rb_thread_wait_for(t); */
+
rb_protect(eventloop_sleep, Qnil, &status);
if (status) {
@@ -2493,7 +2032,6 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
}
}
}
-#endif
}
} else {
@@ -2535,9 +2073,9 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
rb_thread_schedule();
}
- DUMP1("check interrupts");
-#if defined(RUBY_USE_NATIVE_THREAD) || defined(RUBY_VM)
- if (update_flag == 0) rb_thread_check_ints();
+ DUMP1("trap check & thread scheduling");
+#ifdef RUBY_USE_NATIVE_THREAD
+ /* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX TODO !!!! */
#else
if (update_flag == 0) CHECK_INTS;
#endif
@@ -2563,8 +2101,6 @@ lib_eventloop_main_core(args)
check_rootwidget_flag = params->check_root;
- Tcl_CreateEventSource(rbtk_EventSetupProc, rbtk_EventCheckProc, (ClientData)args);
-
if (lib_eventloop_core(params->check_root,
params->update_flag,
params->check_var,
@@ -2617,8 +2153,6 @@ lib_eventloop_ensure(args)
struct evloop_params *ptr = (struct evloop_params *)args;
volatile VALUE current_evloop = rb_thread_current();
- Tcl_DeleteEventSource(rbtk_EventSetupProc, rbtk_EventCheckProc, (ClientData)args);
-
DUMP2("eventloop_ensure: current-thread : %lx", current_evloop);
DUMP2("eventloop_ensure: eventloop-thread : %lx", eventloop_thread);
if (eventloop_thread != current_evloop) {
@@ -2685,7 +2219,7 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
{
volatile VALUE parent_evloop = eventloop_thread;
struct evloop_params *args = ALLOC(struct evloop_params);
- /* struct evloop_params *args = RbTk_ALLOC_N(struct evloop_params, 1); */
+ /* struct evloop_params *args = (struct evloop_params *)ckalloc(sizeof(struct evloop_params)); */
tcl_stubs_check();
@@ -2965,10 +2499,10 @@ lib_thread_callback(argc, argv, self)
}
q = (struct thread_call_proc_arg *)ALLOC(struct thread_call_proc_arg);
- /* q = RbTk_ALLOC_N(struct thread_call_proc_arg, 1); */
+ /* q = (struct thread_call_proc_arg *)ckalloc(sizeof(struct thread_call_proc_arg)); */
q->proc = proc;
q->done = (int*)ALLOC(int);
- /* q->done = RbTk_ALLOC_N(int, 1); */
+ /* q->done = (int*)ckalloc(sizeof(int)); */
*(q->done) = 0;
/* create call-proc thread */
@@ -3130,14 +2664,14 @@ ip_set_exc_message(interp, exc)
/* buf = ALLOC_N(char, (RSTRING(msg)->len)+1);*/
/* memcpy(buf, RSTRING(msg)->ptr, RSTRING(msg)->len);*/
/* buf[RSTRING(msg)->len] = 0; */
- buf = ALLOC_N(char, RSTRING_LENINT(msg)+1);
- /* buf = ckalloc(RSTRING_LENINT(msg)+1); */
+ buf = ALLOC_N(char, RSTRING_LEN(msg)+1);
+ /* buf = ckalloc(sizeof(char)*((RSTRING_LEN(msg))+1)); */
memcpy(buf, RSTRING_PTR(msg), RSTRING_LEN(msg));
buf[RSTRING_LEN(msg)] = 0;
Tcl_DStringInit(&dstr);
Tcl_DStringFree(&dstr);
- Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LENINT(msg), &dstr);
+ Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LEN(msg), &dstr);
Tcl_AppendResult(interp, Tcl_DStringValue(&dstr), (char*)NULL);
DUMP2("error message:%s", Tcl_DStringValue(&dstr));
@@ -3564,7 +3098,7 @@ ip_ruby_cmd_receiver_get(str)
} else {
/* global variable omitted '$' */
char *buf;
- size_t len;
+ int len;
len = strlen(str);
buf = ALLOC_N(char, len + 2);
@@ -3686,7 +3220,7 @@ ip_ruby_cmd(clientData, interp, argc, argv)
/* allocate */
arg = ALLOC(struct cmd_body_arg);
- /* arg = RbTk_ALLOC_N(struct cmd_body_arg, 1); */
+ /* arg = (struct cmd_body_arg *)ckalloc(sizeof(struct cmd_body_arg)); */
arg->receiver = receiver;
arg->method = method;
@@ -4125,7 +3659,7 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
DUMP1("pass argument check");
/* param = (struct th_update_param *)Tcl_Alloc(sizeof(struct th_update_param)); */
- param = RbTk_ALLOC_N(struct th_update_param, 1);
+ param = (struct th_update_param *)ckalloc(sizeof(struct th_update_param));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)param);
#endif
@@ -4989,7 +4523,7 @@ ip_rb_threadVwaitCommand(clientData, interp, objc, objv)
rb_thread_critical = Qtrue;
/* param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param)); */
- param = RbTk_ALLOC_N(struct th_vwait_param, 1);
+ param = (struct th_vwait_param *)ckalloc(sizeof(struct th_vwait_param));
#if 1 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)param);
#endif
@@ -5205,7 +4739,7 @@ ip_rb_threadTkWaitCommand(clientData, interp, objc, objv)
#endif
/* param = (struct th_vwait_param *)Tcl_Alloc(sizeof(struct th_vwait_param)); */
- param = RbTk_ALLOC_N(struct th_vwait_param, 1);
+ param = (struct th_vwait_param *)ckalloc(sizeof(struct th_vwait_param));
#if 1 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)param);
#endif
@@ -6051,7 +5585,7 @@ ip_rbNamespaceObjCmd(clientData, interp, objc, objv)
char **argv;
/* argv = (char **)Tcl_Alloc(sizeof(char *) * (objc + 1)); */
- argv = RbTk_ALLOC_N(char *, (objc + 1));
+ argv = (char **)ckalloc(sizeof(char *) * (objc + 1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
@@ -6134,8 +5668,6 @@ ip_CallWhenDeleted(clientData, ip)
rb_thread_critical = thr_crit_bup;
}
-/*--------------------------------------------------------*/
-
/* initialize interpreter */
static VALUE
ip_init(argc, argv, self)
@@ -6160,7 +5692,7 @@ ip_init(argc, argv, self)
/* create object */
Data_Get_Struct(self, struct tcltkip, ptr);
ptr = ALLOC(struct tcltkip);
- /* ptr = RbTk_ALLOC_N(struct tcltkip, 1); */
+ /* ptr = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
DATA_PTR(self) = ptr;
#ifdef RUBY_USE_NATIVE_THREAD
ptr->tk_thread_id = 0;
@@ -6210,26 +5742,13 @@ ip_init(argc, argv, self)
ptr->has_orig_exit
= Tcl_GetCommandInfo(ptr->ip, "exit", &(ptr->orig_exit_info));
-#if defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT
- call_tclkit_init_script(current_interp);
-
-# if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION > 84
- {
- Tcl_DString encodingName;
- Tcl_GetEncodingNameFromEnvironment(&encodingName);
- if (strcmp(Tcl_DStringValue(&encodingName), Tcl_GetEncodingName(NULL))) {
- /* fails, so we set a variable and do it in the boot.tcl script */
- Tcl_SetSystemEncoding(NULL, Tcl_DStringValue(&encodingName));
- }
- Tcl_SetVar(current_interp, "tclkit_system_encoding", Tcl_DStringValue(&encodingName), 0);
- Tcl_DStringFree(&encodingName);
+ /* from Tcl_AppInit() */
+ DUMP1("Tcl_Init");
+ if (Tcl_Init(ptr->ip) == TCL_ERROR) {
+ rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(ptr->ip));
}
-# endif
-#endif
/* set variables */
- Tcl_Eval(ptr->ip, "set argc 0; set argv {}; set argv0 tcltklib.so");
-
cnt = rb_scan_args(argc, argv, "02", &argv0, &opts);
switch(cnt) {
case 2:
@@ -6240,7 +5759,6 @@ ip_init(argc, argv, self)
} else {
/* Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0); */
Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), TCL_GLOBAL_ONLY);
- Tcl_Eval(ptr->ip, "set argc [llength $argv]");
}
case 1:
/* argv0 */
@@ -6259,26 +5777,6 @@ ip_init(argc, argv, self)
;
}
- /* from Tcl_AppInit() */
- DUMP1("Tcl_Init");
-#if (defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT) && (!defined KIT_LITE) && (10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION == 85)
- /*************************************************************************/
- /* FIX ME (2010/06/28) */
- /* Don't use ::chan command for Mk4tcl + tclvfs-1.4 on Tcl8.5. */
- /* It fails to access VFS files because of vfs::zstream. */
- /* So, force to use ::rechan by temporaly hiding ::chan. */
- /*************************************************************************/
- Tcl_Eval(ptr->ip, "catch {rename ::chan ::_tmp_chan}");
- if (Tcl_Init(ptr->ip) == TCL_ERROR) {
- rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(ptr->ip));
- }
- Tcl_Eval(ptr->ip, "catch {rename ::_tmp_chan ::chan}");
-#else
- if (Tcl_Init(ptr->ip) == TCL_ERROR) {
- rb_raise(rb_eRuntimeError, "%s", Tcl_GetStringResult(ptr->ip));
- }
-#endif
-
st = ruby_tcl_stubs_init();
/* from Tcl_AppInit() */
if (with_tk) {
@@ -6397,7 +5895,7 @@ ip_create_slave_core(interp, argc, argv)
{
struct tcltkip *master = get_ip(interp);
struct tcltkip *slave = ALLOC(struct tcltkip);
- /* struct tcltkip *slave = RbTk_ALLOC_N(struct tcltkip, 1); */
+ /* struct tcltkip *slave = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
VALUE safemode;
VALUE name;
int safe;
@@ -6650,7 +6148,7 @@ ip_make_safe_core(interp, argc, argv)
if (Tcl_MakeSafe(ptr->ip) == TCL_ERROR) {
/* return rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */
- return create_ip_exc(interp, rb_eRuntimeError, "%s",
+ return create_ip_exc(interp, rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip));
}
@@ -6937,22 +6435,22 @@ get_obj_from_str(str)
StringValue(enc);
if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
/* binary string */
- return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LENINT(str));
+ return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
} else {
/* text string */
- return Tcl_NewStringObj(s, RSTRING_LENINT(str));
+ return Tcl_NewStringObj(s, RSTRING_LEN(str));
}
#ifdef HAVE_RUBY_ENCODING_H
} else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
/* binary string */
- return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LENINT(str));
+ return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
#endif
} else if (memchr(s, 0, RSTRING_LEN(str))) {
/* probably binary string */
- return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LENINT(str));
+ return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
} else {
/* probably text string */
- return Tcl_NewStringObj(s, RSTRING_LENINT(str));
+ return Tcl_NewStringObj(s, RSTRING_LEN(str));
}
#endif
}
@@ -7158,7 +6656,7 @@ tk_funcall(func, argc, argv, obj)
/* allocate memory (argv cross over thread : must be in heap) */
if (argv) {
/* VALUE *temp = ALLOC_N(VALUE, argc); */
- VALUE *temp = RbTk_ALLOC_N(VALUE, argc);
+ VALUE *temp = (VALUE*)ckalloc(sizeof(VALUE) * argc);
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)temp); /* XXXXXXXX */
#endif
@@ -7168,7 +6666,7 @@ tk_funcall(func, argc, argv, obj)
/* allocate memory (keep result) */
/* alloc_done = (int*)ALLOC(int); */
- alloc_done = RbTk_ALLOC_N(int, 1);
+ alloc_done = (int*)ckalloc(sizeof(int));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
#endif
@@ -7176,7 +6674,7 @@ tk_funcall(func, argc, argv, obj)
/* allocate memory (freed by Tcl_ServiceEvent) */
/* callq = (struct call_queue *)Tcl_Alloc(sizeof(struct call_queue)); */
- callq = RbTk_ALLOC_N(struct call_queue, 1);
+ callq = (struct call_queue *)ckalloc(sizeof(struct call_queue));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve(callq);
#endif
@@ -7641,7 +7139,7 @@ ip_eval(self, str)
} else {
DUMP2("eval from current eventloop %lx", current);
}
- result = ip_eval_real(self, RSTRING_PTR(str), RSTRING_LENINT(str));
+ result = ip_eval_real(self, RSTRING_PTR(str), RSTRING_LEN(str));
if (rb_obj_is_kind_of(result, rb_eException)) {
rb_exc_raise(result);
}
@@ -7655,14 +7153,14 @@ ip_eval(self, str)
/* allocate memory (keep result) */
/* alloc_done = (int*)ALLOC(int); */
- alloc_done = RbTk_ALLOC_N(int, 1);
+ alloc_done = (int*)ckalloc(sizeof(int));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
#endif
*alloc_done = 0;
/* eval_str = ALLOC_N(char, RSTRING_LEN(str) + 1); */
- eval_str = ckalloc(RSTRING_LENINT(str) + 1);
+ eval_str = ckalloc(sizeof(char) * (RSTRING_LEN(str) + 1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)eval_str); /* XXXXXXXX */
#endif
@@ -7671,7 +7169,7 @@ ip_eval(self, str)
/* allocate memory (freed by Tcl_ServiceEvent) */
/* evq = (struct eval_queue *)Tcl_Alloc(sizeof(struct eval_queue)); */
- evq = RbTk_ALLOC_N(struct eval_queue, 1);
+ evq = (struct eval_queue *)ckalloc(sizeof(struct eval_queue));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve(evq);
#endif
@@ -7682,7 +7180,7 @@ ip_eval(self, str)
/* construct event data */
evq->done = alloc_done;
evq->str = eval_str;
- evq->len = RSTRING_LENINT(str);
+ evq->len = RSTRING_LEN(str);
evq->interp = ip_obj;
evq->result = result;
evq->thread = current;
@@ -7784,8 +7282,6 @@ ip_cancel_eval_core(interp, msg, 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.");
-
- UNREACHABLE;
#else
Tcl_Obj *msg_obj;
@@ -8066,14 +7562,14 @@ lib_toUTF8_core(ip_obj, src, encodename)
return str;
}
buf = ALLOC_N(char, RSTRING_LEN(str)+1);
- /* buf = ckalloc(sizeof(char) * (RSTRING_LENINT(str)+1)); */
+ /* buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1)); */
memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
buf[RSTRING_LEN(str)] = 0;
Tcl_DStringInit(&dstr);
Tcl_DStringFree(&dstr);
/* Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr); */
- Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LENINT(str), &dstr);
+ Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LEN(str), &dstr);
/* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
/* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
@@ -8221,7 +7717,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
int len;
StringValue(str);
- tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LENINT(str));
+ tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str));
Tcl_IncrRefCount(tclstr);
s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len);
str = rb_tainted_str_new(s, len);
@@ -8257,14 +7753,14 @@ lib_fromUTF8_core(ip_obj, src, encodename)
}
buf = ALLOC_N(char, RSTRING_LEN(str)+1);
- /* buf = ckalloc(sizeof(char) * (RSTRING_LENINT(str)+1)); */
+ /* buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1)); */
memcpy(buf, RSTRING_PTR(str), RSTRING_LEN(str));
buf[RSTRING_LEN(str)] = 0;
Tcl_DStringInit(&dstr);
Tcl_DStringFree(&dstr);
/* Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr); */
- Tcl_UtfToExternalDString(encoding,buf,RSTRING_LENINT(str),&dstr);
+ Tcl_UtfToExternalDString(encoding,buf,RSTRING_LEN(str),&dstr);
/* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
/* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
@@ -8353,7 +7849,7 @@ lib_UTF_backslash_core(self, str, all_bs)
rb_thread_critical = Qtrue;
/* src_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
- src_buf = ckalloc(RSTRING_LENINT(str)+1);
+ src_buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)src_buf); /* XXXXXXXX */
#endif
@@ -8361,7 +7857,7 @@ lib_UTF_backslash_core(self, str, all_bs)
src_buf[RSTRING_LEN(str)] = 0;
/* dst_buf = ALLOC_N(char, RSTRING_LEN(str)+1); */
- dst_buf = ckalloc(RSTRING_LENINT(str)+1);
+ dst_buf = ckalloc(sizeof(char) * (RSTRING_LEN(str)+1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)dst_buf); /* XXXXXXXX */
#endif
@@ -8498,7 +7994,7 @@ invoke_tcl_proc(arg)
if (!inf->cmdinfo.isNativeObjectProc) {
/* string interface */
/* argv = (char **)ALLOC_N(char *, argc+1);*/ /* XXXXXXXXXX */
- argv = RbTk_ALLOC_N(char *, (argc+1));
+ argv = (char **)ckalloc(sizeof(char *)*(argc+1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
@@ -8644,7 +8140,7 @@ ip_invoke_core(interp, argc, argv)
#if TCL_MAJOR_VERSION >= 8
/* unknown_objv = (Tcl_Obj **)ALLOC_N(Tcl_Obj *, objc+2); */
- unknown_objv = RbTk_ALLOC_N(Tcl_Obj *, (objc+2));
+ unknown_objv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * (objc+2));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)unknown_objv); /* XXXXXXXX */
#endif
@@ -8655,7 +8151,7 @@ ip_invoke_core(interp, argc, argv)
objv = unknown_objv;
#else
/* unknown_argv = (char **)ALLOC_N(char *, argc+2); */
- unknown_argv = RbTk_ALLOC_N(char *, (argc+2));
+ unknown_argv = (char **)ckalloc(sizeof(char *) * (argc+2));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)unknown_argv); /* XXXXXXXX */
#endif
@@ -8712,7 +8208,7 @@ ip_invoke_core(interp, argc, argv)
/* string interface */
/* argv = (char **)ALLOC_N(char *, argc+1); */
- argv = RbTk_ALLOC_N(char *, (argc+1));
+ argv = (char **)ckalloc(sizeof(char *) * (argc+1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
#endif
@@ -8857,7 +8353,7 @@ alloc_invoke_arguments(argc, argv)
/* memory allocation */
#if TCL_MAJOR_VERSION >= 8
/* av = ALLOC_N(Tcl_Obj *, argc+1);*/ /* XXXXXXXXXX */
- av = RbTk_ALLOC_N(Tcl_Obj *, (argc+1));
+ av = (Tcl_Obj**)ckalloc(sizeof(Tcl_Obj *)*(argc+1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)av); /* XXXXXXXX */
#endif
@@ -8870,7 +8366,7 @@ alloc_invoke_arguments(argc, argv)
#else /* TCL_MAJOR_VERSION < 8 */
/* string interface */
/* av = ALLOC_N(char *, argc+1); */
- av = RbTk_ALLOC_N(char *, (argc+1));
+ av = (char**)ckalloc(sizeof(char *) * (argc+1));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)av); /* XXXXXXXX */
#endif
@@ -9150,7 +8646,7 @@ ip_invoke_with_position(argc, argv, obj, position)
/* allocate memory (keep result) */
/* alloc_done = (int*)ALLOC(int); */
- alloc_done = RbTk_ALLOC_N(int, 1);
+ alloc_done = (int*)ckalloc(sizeof(int));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)alloc_done); /* XXXXXXXX */
#endif
@@ -9158,7 +8654,7 @@ ip_invoke_with_position(argc, argv, obj, position)
/* allocate memory (freed by Tcl_ServiceEvent) */
/* ivq = (struct invoke_queue *)Tcl_Alloc(sizeof(struct invoke_queue)); */
- ivq = RbTk_ALLOC_N(struct invoke_queue, 1);
+ ivq = (struct invoke_queue *)ckalloc(sizeof(struct invoke_queue));
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)ivq); /* XXXXXXXX */
#endif
@@ -9342,7 +8838,7 @@ ip_get_variable2_core(interp, argc, argv)
volatile VALUE exc;
/* exc = rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */
- exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
+ exc = create_ip_exc(interp, rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip));
/* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr);
@@ -9481,7 +8977,7 @@ ip_set_variable2_core(interp, argc, argv)
volatile VALUE exc;
/* exc = rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */
- exc = create_ip_exc(interp, rb_eRuntimeError, "%s",
+ exc = create_ip_exc(interp, rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip));
/* Tcl_Release(ptr->ip); */
rbtk_release_ip(ptr);
@@ -9601,7 +9097,7 @@ ip_unset_variable2_core(interp, argc, argv)
if (FIX2INT(flag) & TCL_LEAVE_ERR_MSG) {
/* return rb_exc_new2(rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip)); */
- return create_ip_exc(interp, rb_eRuntimeError, "%s",
+ return create_ip_exc(interp, rb_eRuntimeError,
Tcl_GetStringResult(ptr->ip));
}
return Qfalse;
@@ -9880,7 +9376,7 @@ lib_merge_tklist(argc, argv, obj)
/* based on Tcl/Tk's Tcl_Merge() */
/* flagPtr = ALLOC_N(int, argc); */
- flagPtr = RbTk_ALLOC_N(int, argc);
+ flagPtr = (int *)ckalloc(sizeof(int) * argc);
#if 0 /* use Tcl_Preserve/Release */
Tcl_Preserve((ClientData)flagPtr); /* XXXXXXXXXX */
#endif
@@ -9891,7 +9387,7 @@ lib_merge_tklist(argc, argv, obj)
if (OBJ_TAINTED(argv[num])) taint_flag = 1;
dst = StringValuePtr(argv[num]);
#if TCL_MAJOR_VERSION >= 8
- len += Tcl_ScanCountedElement(dst, RSTRING_LENINT(argv[num]),
+ len += Tcl_ScanCountedElement(dst, RSTRING_LEN(argv[num]),
&flagPtr[num]) + 1;
#else /* TCL_MAJOR_VERSION < 8 */
len += Tcl_ScanElement(dst, &flagPtr[num]) + 1;
@@ -9908,7 +9404,7 @@ lib_merge_tklist(argc, argv, obj)
for(num = 0; num < argc; num++) {
#if TCL_MAJOR_VERSION >= 8
len = Tcl_ConvertCountedElement(RSTRING_PTR(argv[num]),
- RSTRING_LENINT(argv[num]),
+ RSTRING_LEN(argv[num]),
dst, flagPtr[num]);
#else /* TCL_MAJOR_VERSION < 8 */
len = Tcl_ConvertElement(RSTRING_PTR(argv[num]), dst, flagPtr[num]);
@@ -9972,10 +9468,10 @@ lib_conv_listelement(self, src)
StringValue(src);
#if TCL_MAJOR_VERSION >= 8
- len = Tcl_ScanCountedElement(RSTRING_PTR(src), RSTRING_LENINT(src),
+ len = Tcl_ScanCountedElement(RSTRING_PTR(src), RSTRING_LEN(src),
&scan_flag);
dst = rb_str_new(0, len + 1);
- len = Tcl_ConvertCountedElement(RSTRING_PTR(src), RSTRING_LENINT(src),
+ len = Tcl_ConvertCountedElement(RSTRING_PTR(src), RSTRING_LEN(src),
RSTRING_PTR(dst), scan_flag);
#else /* TCL_MAJOR_VERSION < 8 */
len = Tcl_ScanElement(RSTRING_PTR(src), &scan_flag);
@@ -10019,8 +9515,6 @@ lib_get_reltype_name(self)
default:
rb_raise(rb_eRuntimeError, "tcltklib has invalid release type number");
}
-
- UNREACHABLE;
}
@@ -10028,8 +9522,8 @@ static VALUE
tcltklib_compile_info()
{
volatile VALUE ret;
- size_t size;
- static CONST char form[]
+ int size;
+ char form[]
= "tcltklib %s :: Ruby%s (%s) %s pthread :: Tcl%s(%s)/Tk%s(%s) %s";
char *info;
@@ -10124,8 +9618,6 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
return Qnil;
}
}
-
- UNREACHABLE;
#else
return name;
#endif
@@ -10823,17 +10315,17 @@ 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
+#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)));
@@ -11089,12 +10581,6 @@ Init_tcltklib()
/* --------------------------------------------------------------- */
-#if defined CREATE_RUBYTK_KIT || defined CREATE_RUBYKIT
- setup_rubytkkit();
-#endif
-
- /* --------------------------------------------------------------- */
-
/* Tcl stub check */
tcl_stubs_check();
diff --git a/ext/tk/tkutil/.cvsignore b/ext/tk/tkutil/.cvsignore
new file mode 100644
index 0000000000..90c83ed9b1
--- /dev/null
+++ b/ext/tk/tkutil/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+*.log
+*.def
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 5e592fc266..2f92b334bb 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -12,7 +12,7 @@
#include "ruby.h"
#ifdef RUBY_VM
-static int rb_thread_critical; /* dummy */
+static VALUE rb_thread_critical; /* dummy */
#else
/* On Ruby 1.8.x, use rb_thread_critical (defined at rubysig.h) */
#include "rubysig.h"
@@ -202,8 +202,8 @@ tk_uninstall_cmd(self, cmd_id)
VALUE self;
VALUE cmd_id;
{
- size_t head_len = strlen(cmd_id_head);
- size_t prefix_len = strlen(cmd_id_prefix);
+ int head_len = strlen(cmd_id_head);
+ int prefix_len = strlen(cmd_id_prefix);
StringValue(cmd_id);
if (strncmp(cmd_id_head, RSTRING_PTR(cmd_id), head_len) != 0) {
@@ -266,6 +266,7 @@ to_strkey(key, value, hash)
VALUE value;
VALUE hash;
{
+ if (key == Qundef) return ST_CONTINUE;
rb_hash_aset(hash, rb_funcall(key, ID_to_s, 0, 0), value);
return ST_CHECK;
}
@@ -277,9 +278,9 @@ tk_symbolkey2str(self, keys)
{
volatile VALUE new_keys = rb_hash_new();
- if (NIL_P(keys)) return new_keys;
+ if NIL_P(keys) return new_keys;
keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash");
- st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys, Qundef);
+ st_foreach(RHASH_TBL(keys), to_strkey, new_keys);
return new_keys;
}
@@ -297,8 +298,7 @@ ary2list(ary, enc_flag, self)
VALUE enc_flag;
VALUE self;
{
- long idx, idx2, size, size2;
- int req_chk_flag;
+ int idx, idx2, size, size2, req_chk_flag;
volatile VALUE val, val2, str_val;
volatile VALUE dst;
volatile VALUE sys_enc, dst_enc, str_enc;
@@ -309,7 +309,7 @@ ary2list(ary, enc_flag, self)
sys_enc = rb_funcall(sys_enc, ID_to_s, 0, 0);
}
- if (NIL_P(enc_flag)) {
+ if NIL_P(enc_flag) {
dst_enc = sys_enc;
req_chk_flag = 1;
} else if (TYPE(enc_flag) == T_TRUE || TYPE(enc_flag) == T_FALSE) {
@@ -451,19 +451,18 @@ ary2list2(ary, enc_flag, self)
VALUE enc_flag;
VALUE self;
{
- long idx, size;
- int req_chk_flag;
+ int idx, size, req_chk_flag;
volatile VALUE val, str_val;
volatile VALUE dst;
volatile VALUE sys_enc, dst_enc, str_enc;
sys_enc = rb_funcall(cTclTkLib, ID_encoding, 0, 0);
- if (NIL_P(sys_enc)) {
+ if NIL_P(sys_enc) {
sys_enc = rb_funcall(cTclTkLib, ID_encoding_system, 0, 0);
sys_enc = rb_funcall(sys_enc, ID_to_s, 0, 0);
}
- if (NIL_P(enc_flag)) {
+ if NIL_P(enc_flag) {
dst_enc = sys_enc;
req_chk_flag = 1;
} else if (TYPE(enc_flag) == T_TRUE || TYPE(enc_flag) == T_FALSE) {
@@ -552,7 +551,7 @@ assoc2kv(assoc, ary, self)
VALUE ary;
VALUE self;
{
- long i, j, len;
+ int i, j, len;
volatile VALUE pair;
volatile VALUE val;
volatile VALUE dst = rb_ary_new2(2 * RARRAY_LEN(assoc));
@@ -600,7 +599,7 @@ assoc2kv_enc(assoc, ary, self)
VALUE ary;
VALUE self;
{
- long i, j, len;
+ int i, j, len;
volatile VALUE pair;
volatile VALUE val;
volatile VALUE dst = rb_ary_new2(2 * RARRAY_LEN(assoc));
@@ -652,6 +651,7 @@ push_kv(key, val, args)
ary = RARRAY_PTR(args)[0];
+ if (key == Qundef) return ST_CONTINUE;
#if 0
rb_ary_push(ary, key2keyname(key));
if (val != TK_None) rb_ary_push(ary, val);
@@ -674,7 +674,7 @@ hash2kv(hash, ary, self)
volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
volatile VALUE args = rb_ary_new3(2, dst, self);
- st_foreach_check(RHASH_TBL(hash), push_kv, args, Qundef);
+ st_foreach(RHASH_TBL(hash), push_kv, args);
if (NIL_P(ary)) {
return dst;
@@ -693,6 +693,7 @@ push_kv_enc(key, val, args)
ary = RARRAY_PTR(args)[0];
+ if (key == Qundef) return ST_CONTINUE;
#if 0
rb_ary_push(ary, key2keyname(key));
if (val != TK_None) {
@@ -718,7 +719,7 @@ hash2kv_enc(hash, ary, self)
volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
volatile VALUE args = rb_ary_new3(2, dst, self);
- st_foreach_check(RHASH_TBL(hash), push_kv_enc, args, Qundef);
+ st_foreach(RHASH_TBL(hash), push_kv_enc, args);
if (NIL_P(ary)) {
return dst;
@@ -800,8 +801,6 @@ tk_hash_kv(argc, argv, self)
}
rb_raise(rb_eArgError, "Hash is expected for 1st argument");
}
-
- UNREACHABLE;
}
static VALUE
@@ -897,7 +896,8 @@ get_eval_string_core(obj, enc_flag, self)
}
}
- rb_warning("fail to convert '%+"PRIsVALUE"' to string for Tk", obj);
+ rb_warning("fail to convert '%s' to string for Tk",
+ RSTRING_PTR(rb_funcall(obj, rb_intern("inspect"), 0, 0)));
return obj;
}
@@ -1079,7 +1079,7 @@ tkstr_to_str(value)
VALUE value;
{
char * ptr;
- long len;
+ int len;
ptr = RSTRING_PTR(value);
len = RSTRING_LEN(value);
@@ -1133,8 +1133,8 @@ tcl2rb_num_or_nil(self, value)
#define CBSUBST_TBL_MAX (256)
struct cbsubst_info {
- long full_subst_length;
- long keylen[CBSUBST_TBL_MAX];
+ int full_subst_length;
+ int keylen[CBSUBST_TBL_MAX];
char *key[CBSUBST_TBL_MAX];
char type[CBSUBST_TBL_MAX];
ID ivar[CBSUBST_TBL_MAX];
@@ -1246,7 +1246,7 @@ each_attr_def(key, value, klass)
switch(TYPE(key)) {
case T_STRING:
- key_id = rb_intern_str(key);
+ key_id = rb_intern(RSTRING_PTR(key));
break;
case T_SYMBOL:
key_id = SYM2ID(key);
@@ -1258,7 +1258,7 @@ each_attr_def(key, value, klass)
switch(TYPE(value)) {
case T_STRING:
- value_id = rb_intern_str(value);
+ value_id = rb_intern(RSTRING_PTR(value));
break;
case T_SYMBOL:
value_id = SYM2ID(value);
@@ -1298,10 +1298,9 @@ cbsubst_sym_to_subst(self, sym)
VALUE sym;
{
struct cbsubst_info *inf;
- VALUE str;
+ const char *str;
char *buf, *ptr;
- int idx;
- long len;
+ int idx, len;
ID id;
volatile VALUE ret;
@@ -1311,12 +1310,12 @@ cbsubst_sym_to_subst(self, sym)
struct cbsubst_info, inf);
if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) {
- str = rb_id2str(SYM2ID(ret));
+ str = rb_id2name(SYM2ID(ret));
} else {
- str = rb_id2str(SYM2ID(sym));
+ str = rb_id2name(SYM2ID(sym));
}
- id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
+ id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
if (inf->ivar[idx] == id) break;
@@ -1353,10 +1352,9 @@ cbsubst_get_subst_arg(argc, argv, self)
VALUE self;
{
struct cbsubst_info *inf;
- VALUE str;
+ const char *str;
char *buf, *ptr;
- int i, idx;
- long len;
+ int i, idx, len;
ID id;
volatile VALUE arg_sym, ret;
@@ -1368,28 +1366,28 @@ cbsubst_get_subst_arg(argc, argv, self)
for(i = 0; i < argc; i++) {
switch(TYPE(argv[i])) {
case T_STRING:
- str = argv[i];
- arg_sym = ID2SYM(rb_intern_str(argv[i]));
+ str = RSTRING_PTR(argv[i]);
+ arg_sym = ID2SYM(rb_intern(str));
break;
case T_SYMBOL:
arg_sym = argv[i];
- str = rb_id2str(SYM2ID(arg_sym));
+ str = rb_id2name(SYM2ID(arg_sym));
break;
default:
rb_raise(rb_eArgError, "arg #%d is not a String or a Symbol", i);
}
if (!NIL_P(ret = rb_hash_aref(inf->aliases, arg_sym))) {
- str = rb_id2str(SYM2ID(ret));
+ str = rb_id2name(SYM2ID(ret));
}
- id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
+ id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str)));
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
if (inf->ivar[idx] == id) break;
}
if (idx >= CBSUBST_TBL_MAX) {
- rb_raise(rb_eArgError, "cannot find attribute :%"PRIsVALUE, str);
+ rb_raise(rb_eArgError, "cannot find attribute :%s", str);
}
*(ptr++) = '%';
@@ -1424,8 +1422,7 @@ cbsubst_get_subst_key(self, str)
volatile VALUE list;
volatile VALUE ret;
VALUE keyval;
- long i, len, keylen;
- int idx;
+ int i, len, keylen, idx;
char *buf, *ptr, *key;
list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
@@ -1476,8 +1473,7 @@ cbsubst_get_all_subst_keys(self)
struct cbsubst_info *inf;
char *buf, *ptr;
char *keys_buf, *keys_ptr;
- int idx;
- long len;
+ int idx, len;
volatile VALUE ret;
Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO),
@@ -1529,7 +1525,7 @@ cbsubst_table_setup(argc, argv, self)
VALUE inf;
ID id;
struct cbsubst_info *subst_inf;
- long idx, len;
+ int idx, len;
unsigned char chr;
/* accept (key_inf, proc_inf) or (key_inf, longkey_inf, procinf) */
@@ -1571,7 +1567,7 @@ cbsubst_table_setup(argc, argv, self)
subst_inf->full_subst_length += 3;
id = SYM2ID(RARRAY_PTR(inf)[2]);
- subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
+ subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
rb_attr(self, id, 1, 0, Qtrue);
}
@@ -1610,7 +1606,7 @@ cbsubst_table_setup(argc, argv, self)
subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2);
id = SYM2ID(RARRAY_PTR(inf)[2]);
- subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
+ subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id))));
rb_attr(self, id, 1, 0, Qtrue);
}
@@ -1650,10 +1646,10 @@ cbsubst_scan_args(self, arg_key, val_ary)
VALUE val_ary;
{
struct cbsubst_info *inf;
- long idx;
+ int idx;
unsigned char *keyptr = (unsigned char*)RSTRING_PTR(arg_key);
- long keylen = RSTRING_LEN(arg_key);
- long vallen = RARRAY_LEN(val_ary);
+ int keylen = RSTRING_LEN(arg_key);
+ int vallen = RARRAY_LEN(val_ary);
unsigned char type_chr;
volatile VALUE dst = rb_ary_new2(vallen);
volatile VALUE proc;
diff --git a/ext/win32ole/.cvsignore b/ext/win32ole/.cvsignore
new file mode 100644
index 0000000000..4f6430def0
--- /dev/null
+++ b/ext/win32ole/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.log
+.document
diff --git a/ext/win32ole/depend b/ext/win32ole/depend
index 3b1d7e9a97..4bf5ab5b94 100644
--- a/ext/win32ole/depend
+++ b/ext/win32ole/depend
@@ -1 +1 @@
-win32ole.o : win32ole.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h
+win32ole.o : win32ole.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index 52c3d6bdfb..893793382b 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -4,18 +4,22 @@
#----------------------------------
require 'mkmf'
-case RUBY_PLATFORM
-when /cygwin/
- inc = nil
- lib = '/usr/lib/w32api'
-end
+dir_config("win32")
-dir_config("win32", inc, lib)
+SRCFILES=<<SRC
+win32ole.c
+SRC
+
+def create_docfile(src)
+ open(File.expand_path($srcdir) + "/.document", "w") {|ofs|
+ ofs.print src
+ }
+end
def create_win32ole_makefile
if have_library("ole32") and
have_library("oleaut32") and
- have_library("uuid", "&CLSID_CMultiLanguage", "mlang.h") and
+ have_library("uuid") and
have_library("user32") and
have_library("kernel32") and
have_library("advapi32") and
@@ -23,22 +27,16 @@ def create_win32ole_makefile
unless have_type("IMultiLanguage2", "mlang.h")
have_type("IMultiLanguage", "mlang.h")
end
- spec = nil
- checking_for('thread_specific', '%s') do
- spec = %w[__declspec(thread) __thread].find {|th|
- try_compile("#{th} int foo;", "", :werror => true)
- }
- spec or 'no'
- end
- $defs << "-DRB_THREAD_SPECIFIC=#{spec}" if spec
create_makefile("win32ole")
+ create_docfile(SRCFILES)
+ else
+ create_docfile("")
end
end
case RUBY_PLATFORM
when /mswin/
- $CFLAGS.sub!(/((?:\A|\s)[-\/])W\d(?=\z|\s)/, '\1W3') or
- $CFLAGS += ' -W3'
+ $CFLAGS += ' /W3'
end
create_win32ole_makefile
diff --git a/ext/win32ole/lib/win32ole.rb b/ext/win32ole/lib/win32ole.rb
new file mode 100644
index 0000000000..aaf7e7cdcf
--- /dev/null
+++ b/ext/win32ole/lib/win32ole.rb
@@ -0,0 +1,22 @@
+require 'win32ole.so'
+
+# re-define Thread#initialize
+# bug #2618(ruby-core:27634)
+
+class Thread
+ alias :org_initialize :initialize
+ def initialize(*arg, &block)
+ if block
+ org_initialize(*arg) {
+ WIN32OLE.ole_initialize
+ begin
+ block.call(*arg)
+ ensure
+ WIN32OLE.ole_uninitialize
+ end
+ }
+ else
+ org_initialize(*arg)
+ end
+ end
+end
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 3174815aef..99c2fdc877 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -24,7 +24,7 @@
((__GNUC__ <= 3) && (__GNUC_MINOR__ < 4)) || \
((__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)))
-#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
#ifndef NONAMELESSUNION
#define NONAMELESSUNION 1
#endif
@@ -56,13 +56,13 @@
#define DOUTI(x) fprintf(stderr, "[%ld]:" #x "=%d\n",__LINE__,x)
#define DOUTD(x) fprintf(stderr, "[%d]:" #x "=%f\n",__LINE__,x)
-#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
#define V_UNION1(X, Y) ((X)->u.Y)
#else
#define V_UNION1(X, Y) ((X)->Y)
#endif
-#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4)
#undef V_UNION
#define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
@@ -77,7 +77,7 @@
#define V_I1REF(X) V_UNION(X, pcVal)
#endif
-#ifndef V_UI2REF
+#ifndef U_UI2REF
#define V_UI2REF(X) V_UNION(X, puiVal)
#endif
@@ -143,7 +143,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-#define WIN32OLE_VERSION "1.5.4"
+#define WIN32OLE_VERSION "1.4.9"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -214,17 +214,7 @@ VALUE cWIN32OLE_PROPERTY;
static VALUE ary_ole_event;
static ID id_events;
-#if defined(RB_THREAD_SPECIFIC) && (defined(__CYGWIN__) || defined(__MINGW32__))
-static RB_THREAD_SPECIFIC BOOL g_ole_initialized;
-# define g_ole_initialized_init() ((void)0)
-# define g_ole_initialized_set(val) (g_ole_initialized = (val))
-#else
-static volatile DWORD g_ole_initialized_key = TLS_OUT_OF_INDEXES;
-# define g_ole_initialized (BOOL)TlsGetValue(g_ole_initialized_key)
-# define g_ole_initialized_init() (g_ole_initialized_key = TlsAlloc())
-# define g_ole_initialized_set(val) TlsSetValue(g_ole_initialized_key, (void*)(val))
-#endif
-static BOOL g_uninitialize_hooked = FALSE;
+static BOOL g_ole_initialized = FALSE;
static BOOL g_cp_installed = FALSE;
static BOOL g_lcid_installed = FALSE;
static HINSTANCE ghhctrl = NULL;
@@ -319,8 +309,8 @@ 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(void);
-static void ole_msg_loop(void);
+static void ole_initialize();
+static void ole_msg_loop();
static void ole_free(struct oledata *pole);
static void oletypelib_free(struct oletypelibdata *poletypelib);
static void oletype_free(struct oletypedata *poletype);
@@ -361,7 +351,7 @@ 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(VALUE self, VALUE ole, VALUE host, VALUE others);
+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);
@@ -380,7 +370,9 @@ 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 void ole_pure_initialize();
static VALUE fole_s_ole_initialize(VALUE self);
+static void ole_pure_uninitialize();
static VALUE fole_s_ole_uninitialize(VALUE self);
static VALUE fole_initialize(int argc, VALUE *argv, VALUE self);
static VALUE hash2named_arg(VALUE pair, struct oleparam* pOp);
@@ -580,7 +572,7 @@ 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(void);
+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);
@@ -594,8 +586,8 @@ 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(void);
-static void free_enc2cp(void);
+static void init_enc2cp();
+static void free_enc2cp();
static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
IMessageFilter __RPC_FAR * This,
@@ -1067,7 +1059,7 @@ static char *
ole_wc2mb(LPWSTR pw)
{
LPSTR pm;
- UINT size = 0;
+ int size = 0;
if (conv_51932(cWIN32OLE_cp)) {
#ifndef pIMultiLanguage
DWORD dw = 0;
@@ -1110,19 +1102,12 @@ ole_hresult2msg(HRESULT hr)
char strhr[100];
sprintf(strhr, " HRESULT error code:0x%08x\n ", (unsigned)hr);
msg = rb_str_new2(strhr);
+
dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, hr,
- MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+ NULL, hr, cWIN32OLE_lcid,
(LPTSTR)&p_msg, 0, NULL);
- if (dwCount == 0) {
- dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, hr, cWIN32OLE_lcid,
- (LPTSTR)&p_msg, 0, NULL);
- }
if (dwCount > 0) {
term = p_msg + strlen(p_msg);
while (p_msg < term) {
@@ -1193,51 +1178,45 @@ static void
ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
{
va_list args;
- VALUE msg;
+ char buf[BUFSIZ];
VALUE err_msg;
va_init_list(args, fmt);
- msg = rb_vsprintf(fmt, args);
+ vsnprintf(buf, BUFSIZ, fmt, args);
va_end(args);
err_msg = ole_hresult2msg(hr);
if(err_msg != Qnil) {
- rb_str_cat2(msg, "\n");
- rb_str_append(msg, err_msg);
+ rb_raise(ecs, "%s\n%s", buf, StringValuePtr(err_msg));
+ }
+ else {
+ rb_raise(ecs, "%s", buf);
}
- rb_exc_raise(rb_exc_new3(ecs, msg));
}
void
-ole_uninitialize(void)
+ole_uninitialize()
{
- if (!g_ole_initialized) return;
OleUninitialize();
- g_ole_initialized_set(FALSE);
-}
-
-static void
-ole_uninitialize_hook(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass)
-{
- ole_uninitialize();
+ g_ole_initialized = FALSE;
}
static void
-ole_initialize(void)
+ole_initialize()
{
HRESULT hr;
- if(!g_uninitialize_hooked) {
- rb_add_event_hook(ole_uninitialize_hook, RUBY_EVENT_THREAD_END, Qnil);
- g_uninitialize_hooked = TRUE;
- }
-
if(g_ole_initialized == FALSE) {
hr = OleInitialize(NULL);
if(FAILED(hr)) {
ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
}
- g_ole_initialized_set(TRUE);
-
+ g_ole_initialized = TRUE;
+ /*
+ * 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;
@@ -1304,7 +1283,7 @@ ole_vstr2wc(VALUE vstr)
{
rb_encoding *enc;
int cp;
- UINT size = 0;
+ int size = 0;
LPWSTR pw;
st_data_t data;
enc = rb_enc_get(vstr);
@@ -1330,7 +1309,7 @@ ole_vstr2wc(VALUE vstr)
if (conv_51932(cp)) {
#ifndef pIMultiLanguage
DWORD dw = 0;
- UINT len = RSTRING_LENINT(vstr);
+ int len = RSTRING_LEN(vstr);
HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
&dw, cp, RSTRING_PTR(vstr), &len, NULL, &size);
if (FAILED(hr)) {
@@ -1355,13 +1334,13 @@ ole_vstr2wc(VALUE vstr)
static LPWSTR
ole_mb2wc(char *pm, int len)
{
- UINT size = 0;
+ int size = 0;
LPWSTR pw;
if (conv_51932(cWIN32OLE_cp)) {
#ifndef pIMultiLanguage
DWORD dw = 0;
- UINT n = len;
+ int n = len;
HRESULT hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
&dw, cWIN32OLE_cp, pm, &n, NULL, &size);
if (FAILED(hr)) {
@@ -1830,18 +1809,14 @@ ole_set_byref(VARIANT *realvar, VARIANT *var, VARTYPE vt)
V_R8REF(var) = &V_R8(realvar);
break;
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-#ifdef V_I8REF
+#if (_MSC_VER >= 1300)
case VT_I8:
V_I8REF(var) = &V_I8(realvar);
break;
-#endif
-#ifdef V_UI8REF
case VT_UI8:
V_UI8REF(var) = &V_UI8(realvar);
break;
#endif
-#endif
case VT_INT:
V_INTREF(var) = &V_INT(realvar);
break;
@@ -2197,10 +2172,8 @@ ole_variant2val(VARIANT *pvar)
#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
case VT_I8:
if(V_ISBYREF(pvar))
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-#ifdef V_I8REF
+#if (_MSC_VER >= 1300)
obj = I8_2_NUM(*V_I8REF(pvar));
-#endif
#else
obj = Qnil;
#endif
@@ -2209,10 +2182,8 @@ ole_variant2val(VARIANT *pvar)
break;
case VT_UI8:
if(V_ISBYREF(pvar))
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-#ifdef V_UI8REF
+#if (_MSC_VER >= 1300)
obj = UI8_2_NUM(*V_UI8REF(pvar));
-#endif
#else
obj = Qnil;
#endif
@@ -2358,23 +2329,23 @@ reg_get_val(HKEY hkey, const char *subkey)
{
char *pbuf;
DWORD dwtype = 0;
- DWORD size = 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, (BYTE *)pbuf, &size);
+ err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, pbuf, &size);
if (err == ERROR_SUCCESS) {
pbuf[size] = '\0';
if (dwtype == REG_EXPAND_SZ) {
- char* pbuf2 = (char *)pbuf;
- DWORD len = ExpandEnvironmentStrings(pbuf2, NULL, 0);
- pbuf = ALLOC_N(char, len + 1);
- ExpandEnvironmentStrings(pbuf2, pbuf, len + 1);
- free(pbuf2);
+ char* pbuf2 = pbuf;
+ DWORD len = ExpandEnvironmentStrings(pbuf2, NULL, 0);
+ pbuf = ALLOC_N(char, len + 1);
+ ExpandEnvironmentStrings(pbuf2, pbuf, len + 1);
+ free(pbuf2);
}
- val = rb_str_new2((char *)pbuf);
+ val = rb_str_new2(pbuf);
}
free(pbuf);
}
@@ -2596,7 +2567,7 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
hr = HRESULT_FROM_WIN32(err);
else {
len = sizeof(clsid);
- err = RegQueryValueEx(hpid, "", NULL, &dwtype, (BYTE *)clsid, &len);
+ err = RegQueryValueEx(hpid, (LPBYTE)"", NULL, &dwtype, clsid, &len);
if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
pbuf = ole_mb2wc(clsid, -1);
hr = CLSIDFromString(pbuf, pclsid);
@@ -2612,8 +2583,9 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
}
static VALUE
-ole_create_dcom(VALUE self, VALUE ole, VALUE host, VALUE others)
+ole_create_dcom(int argc, VALUE *argv, VALUE self)
{
+ VALUE ole, host, others;
HRESULT hr;
CLSID clsid;
OLECHAR *pbuf;
@@ -2631,6 +2603,7 @@ ole_create_dcom(VALUE self, VALUE ole, VALUE host, VALUE others)
GetProcAddress(gole32, "CoCreateInstanceEx");
if (!gCoCreateInstanceEx)
rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
+ rb_scan_args(argc, argv, "2*", &ole, &host, &others);
pbuf = ole_vstr2wc(ole);
hr = CLSIDFromProgID(pbuf, &clsid);
@@ -3153,11 +3126,25 @@ fole_s_create_guid(VALUE self)
* You must not use thease method.
*/
+static void ole_pure_initialize()
+{
+ HRESULT hr;
+ hr = OleInitialize(NULL);
+ if(FAILED(hr)) {
+ ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
+ }
+}
+
+static void ole_pure_uninitialize()
+{
+ OleUninitialize();
+}
+
/* :nodoc */
static VALUE
fole_s_ole_initialize(VALUE self)
{
- ole_initialize();
+ ole_pure_initialize();
return Qnil;
}
@@ -3165,7 +3152,7 @@ fole_s_ole_initialize(VALUE self)
static VALUE
fole_s_ole_uninitialize(VALUE self)
{
- ole_uninitialize();
+ ole_pure_uninitialize();
return Qnil;
}
@@ -3248,7 +3235,7 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
StringValuePtr(svr_name));
}
- return ole_create_dcom(self, svr_name, host, others);
+ return ole_create_dcom(argc, argv, self);
}
/* get CLSID from OLE server name */
@@ -4166,6 +4153,7 @@ ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods,
HRESULT hr;
TYPEATTR *pTypeAttr;
BSTR bstr;
+ char *pstr;
FUNCDESC *pFuncDesc;
VALUE method;
WORD i;
@@ -4174,6 +4162,7 @@ ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods,
ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
}
for(i = 0; i < pTypeAttr->cFuncs; i++) {
+ pstr = NULL;
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
if (FAILED(hr))
continue;
@@ -6123,6 +6112,7 @@ ole_variables(ITypeInfo *pTypeInfo)
WORD i;
UINT len;
BSTR bstr;
+ char *pstr;
VARDESC *pVarDesc;
struct olevariabledata *pvar;
VALUE var;
@@ -6137,6 +6127,7 @@ ole_variables(ITypeInfo *pTypeInfo)
if(FAILED(hr))
continue;
len = 0;
+ pstr = NULL;
hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, pVarDesc->memid, &bstr,
1, &len);
if(FAILED(hr) || len == 0 || !bstr)
@@ -7655,9 +7646,11 @@ static long
ole_search_event_at(VALUE ary, VALUE ev)
{
VALUE event;
+ VALUE def_event;
VALUE event_name;
long i, len;
long ret = -1;
+ def_event = Qnil;
len = RARRAY_LEN(ary);
for(i = 0; i < len; i++) {
event = rb_ary_entry(ary, i);
@@ -8570,7 +8563,7 @@ evs_entry(long i)
}
static VALUE
-evs_length(void)
+evs_length()
{
return rb_funcall(ary_ole_event, rb_intern("length"), 0);
}
@@ -9062,21 +9055,20 @@ folevariant_set_value(VALUE self, VALUE val)
}
static void
-init_enc2cp(void)
+init_enc2cp()
{
enc2cp_table = st_init_numtable();
}
static void
-free_enc2cp(void)
+free_enc2cp()
{
st_free_table(enc2cp_table);
}
void
-Init_win32ole(void)
+Init_win32ole()
{
- g_ole_initialized_init();
ary_ole_event = rb_ary_new();
rb_gc_register_mark_object(ary_ole_event);
id_events = rb_intern("events");
diff --git a/ext/zlib/.cvsignore b/ext/zlib/.cvsignore
new file mode 100644
index 0000000000..814345ece8
--- /dev/null
+++ b/ext/zlib/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+mkmf.log
+*.def
+extconf.h
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index b4348ceca7..499f55a046 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -10,12 +10,12 @@ require 'rbconfig'
dir_config 'zlib'
-if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and
+if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
have_header('zlib.h') then
defines = []
- Logging::message 'checking for kind of operating system... '
+ message 'checking for kind of operating system... '
os_code = with_config('os-code') ||
case RUBY_PLATFORM.split('-',2)[1]
when 'amigaos' then
@@ -48,16 +48,16 @@ if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')
'OS_UNKNOWN' => 'Unknown',
}
unless OS_NAMES.key? os_code then
- raise "invalid OS_CODE `#{os_code}'"
+ puts "invalid OS_CODE `#{os_code}'"
+ exit
end
- Logging::message "#{OS_NAMES[os_code]}\n"
+ message "#{OS_NAMES[os_code]}\n"
defines << "OS_CODE=#{os_code}"
$defs.concat(defines.collect{|d|' -D'+d})
have_func('crc32_combine', 'zlib.h')
have_func('adler32_combine', 'zlib.h')
- have_type('z_crc_t', 'zlib.h')
create_makefile('zlib')
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 4b7ef3b9fe..1195e6630f 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -9,20 +9,19 @@
#include <ruby.h>
#include <zlib.h>
#include <time.h>
-#include <ruby/io.h>
-#include <ruby/thread.h>
+#include <ruby/encoding.h>
#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))
+# 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))
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
# endif
#else
-# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0
-# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
+# define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) /* empty */
#endif
#define RUBY_ZLIB_VERSION "0.6.0"
@@ -43,21 +42,6 @@
#endif
#endif
-#if SIZEOF_LONG > SIZEOF_INT
-static inline uInt
-max_uint(long n)
-{
- if (n > UINT_MAX) n = UINT_MAX;
- return (uInt)n;
-}
-#define MAX_UINT(n) max_uint(n)
-#else
-#define MAX_UINT(n) (uInt)(n)
-#endif
-
-#define sizeof(x) ((int)sizeof(x))
-
-static ID id_dictionaries;
/*--------- Prototypes --------*/
@@ -73,24 +57,23 @@ static void finalizer_warn(const char*);
struct zstream;
struct zstream_funcs;
-struct zstream_run_args;
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*, unsigned long);
-static void zstream_append_buffer(struct zstream*, const Bytef*, long);
+static void zstream_expand_buffer_into(struct zstream*, unsigned 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*, long);
-static void zstream_buffer_ungets(struct zstream*, const Bytef*, unsigned long);
+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*, long);
-static void zstream_discard_input(struct zstream*, long);
+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*, long, int);
-static VALUE zstream_sync(struct zstream*, Bytef*, long);
+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*);
@@ -146,7 +129,7 @@ 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*, long);
+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*);
@@ -155,12 +138,12 @@ 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*, long);
+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*, long);
+static VALUE gzfile_read(struct gzfile*, int);
static VALUE gzfile_read_all(struct gzfile*);
-static void gzfile_ungets(struct gzfile*, const Bytef*, long);
+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*);
@@ -172,8 +155,6 @@ 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*);
-NORETURN(static void gzfile_raise(struct gzfile *, VALUE, const char *));
-static VALUE gzfile_error_inspect(VALUE);
static VALUE rb_gzfile_to_io(VALUE);
static VALUE rb_gzfile_crc(VALUE);
@@ -223,80 +204,12 @@ static VALUE rb_gzreader_each(int, VALUE*, VALUE);
static VALUE rb_gzreader_readlines(int, VALUE*, VALUE);
#endif /* GZIP_SUPPORT */
-/*
- * Document-module: Zlib
- *
- * This module provides access to the {zlib library}[http://zlib.net]. Zlib is
- * designed to be a portable, free, general-purpose, legally unencumbered --
- * that is, not covered by any patents -- lossless data-compression library
- * for use on virtually any computer hardware and operating system.
- *
- * The zlib compression library provides in-memory compression and
- * decompression functions, including integrity checks of the uncompressed
- * data.
- *
- * The zlib compressed data format is described in RFC 1950, which is a
- * wrapper around a deflate stream which is described in RFC 1951.
- *
- * The library also supports reading and writing files in gzip (.gz) format
- * with an interface similar to that of IO. The gzip format is described in
- * RFC 1952 which is also a wrapper around a deflate stream.
- *
- * The zlib format was designed to be compact and fast for use in memory and on
- * communications channels. The gzip format was designed for single-file
- * compression on file systems, has a larger header than zlib to maintain
- * directory information, and uses a different, slower check method than zlib.
- *
- * See your system's zlib.h for further information about zlib
- *
- * == Sample usage
- *
- * Using the wrapper to compress strings with default parameters is quite
- * simple:
- *
- * require "zlib"
- *
- * data_to_compress = File.read("don_quixote.txt")
- *
- * puts "Input size: #{data_to_compress.size}"
- * #=> Input size: 2347740
- *
- * data_compressed = Zlib::Deflate.deflate(data_to_compress)
- *
- * puts "Compressed size: #{data_compressed.size}"
- * #=> Compressed size: 887238
- *
- * uncompressed_data = Zlib::Inflate.inflate(data_compressed)
- *
- * puts "Uncompressed data is: #{uncompressed_data}"
- * #=> Uncompressed data is: The Project Gutenberg EBook of Don Quixote...
- *
- * == Class tree
- *
- * - Zlib::Deflate
- * - Zlib::Inflate
- * - Zlib::ZStream
- * - Zlib::Error
- * - Zlib::StreamEnd
- * - Zlib::NeedDict
- * - Zlib::DataError
- * - Zlib::StreamError
- * - Zlib::MemError
- * - Zlib::BufError
- * - Zlib::VersionError
- *
- * (if you have GZIP_SUPPORT)
- * - Zlib::GzipReader
- * - Zlib::GzipWriter
- * - Zlib::GzipFile
- * - Zlib::GzipFile::Error
- * - Zlib::GzipFile::LengthError
- * - Zlib::GzipFile::CRCError
- * - Zlib::GzipFile::NoFooter
- *
- */
+
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 --------*/
static VALUE cZError, cStreamEnd, cNeedDict;
@@ -337,8 +250,11 @@ raise_zlib_error(int err, const char *msg)
rb_sys_fail(msg);
/* no return */
default:
- exc = rb_exc_new3(cZError,
- rb_sprintf("unknown zlib error %d: %s", err, msg));
+ {
+ char buf[BUFSIZ];
+ snprintf(buf, BUFSIZ, "unknown zlib error %d: %s", err, msg);
+ exc = rb_exc_new2(cZError, buf);
+ }
}
rb_exc_raise(exc);
@@ -357,8 +273,6 @@ finalizer_warn(const char *msg)
/*-------- module Zlib --------*/
/*
- * Document-method: Zlib.zlib_version
- *
* Returns the string which represents the version of zlib library.
*/
static VALUE
@@ -371,24 +285,6 @@ rb_zlib_version(VALUE klass)
return str;
}
-#if SIZEOF_LONG > SIZEOF_INT
-static uLong
-checksum_long(uLong (*func)(uLong, const Bytef*, uInt), uLong sum, const Bytef *ptr, long len)
-{
- if (len > UINT_MAX) {
- do {
- sum = func(sum, ptr, UINT_MAX);
- ptr += UINT_MAX;
- len -= UINT_MAX;
- } while (len >= UINT_MAX);
- }
- if (len > 0) sum = func(sum, ptr, (uInt)len);
- return sum;
-}
-#else
-#define checksum_long(func, sum, ptr, len) (func)((sum), (ptr), (len))
-#endif
-
static VALUE
do_checksum(argc, argv, func)
int argc;
@@ -415,14 +311,12 @@ do_checksum(argc, argv, func)
}
else {
StringValue(str);
- sum = checksum_long(func, sum, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
+ sum = func(sum, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
}
return rb_uint2inum(sum);
}
/*
- * Document-method: Zlib.adler32
- *
* call-seq: Zlib.adler32(string, adler)
*
* Calculates Adler-32 checksum for +string+, and returns updated value of
@@ -439,8 +333,6 @@ rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
#ifdef HAVE_ADLER32_COMBINE
/*
- * Document-method: Zlib.adler32_combine
- *
* call-seq: Zlib.adler32_combine(adler1, adler2, len2)
*
* Combine two Adler-32 check values in to one. +alder1+ is the first Adler-32
@@ -459,9 +351,7 @@ rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
#endif
/*
- * Document-method: Zlib.crc32
- *
- * call-seq: Zlib.crc32(string, crc)
+ * call-seq: Zlib.crc32(string, adler)
*
* Calculates CRC checksum for +string+, and returns updated value of +crc+. If
* +string+ is omitted, it returns the CRC initial value. If +crc+ is omitted, it
@@ -477,8 +367,6 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
#ifdef HAVE_CRC32_COMBINE
/*
- * Document-method: Zlib.crc32_combine
- *
* call-seq: Zlib.crc32_combine(crc1, crc2, len2)
*
* Combine two CRC-32 check values in to one. +crc1+ is the first CRC-32
@@ -497,18 +385,12 @@ rb_zlib_crc32_combine(VALUE klass, VALUE crc1, VALUE crc2, VALUE len2)
#endif
/*
- * Document-method: Zlib.crc_table
- *
* Returns the table for calculating CRC checksum as an array.
*/
static VALUE
rb_zlib_crc_table(VALUE obj)
{
-#if !defined(HAVE_TYPE_Z_CRC_T)
- /* z_crc_t is defined since zlib-1.2.7. */
- typedef unsigned long z_crc_t;
-#endif
- const z_crc_t *crctbl;
+ const unsigned long *crctbl;
VALUE dst;
int i;
@@ -542,22 +424,16 @@ struct zstream {
#define ZSTREAM_FLAG_IN_STREAM 0x2
#define ZSTREAM_FLAG_FINISHED 0x4
#define ZSTREAM_FLAG_CLOSING 0x8
-#define ZSTREAM_FLAG_GZFILE 0x10 /* disallows yield from expand_buffer for
- gzip*/
-#define ZSTREAM_FLAG_UNUSED 0x20
+#define ZSTREAM_FLAG_UNUSED 0x10
#define ZSTREAM_READY(z) ((z)->flags |= ZSTREAM_FLAG_READY)
#define ZSTREAM_IS_READY(z) ((z)->flags & ZSTREAM_FLAG_READY)
#define ZSTREAM_IS_FINISHED(z) ((z)->flags & ZSTREAM_FLAG_FINISHED)
#define ZSTREAM_IS_CLOSING(z) ((z)->flags & ZSTREAM_FLAG_CLOSING)
-#define ZSTREAM_IS_GZFILE(z) ((z)->flags & ZSTREAM_FLAG_GZFILE)
-
-#define ZSTREAM_EXPAND_BUFFER_OK 0
/* I think that more better value should be found,
but I gave up finding it. B) */
#define ZSTREAM_INITIAL_BUFSIZE 1024
-/* Allow a quick return when the thread is interrupted */
#define ZSTREAM_AVAIL_OUT_STEP_MAX 16384
#define ZSTREAM_AVAIL_OUT_STEP_MIN 2048
@@ -569,13 +445,6 @@ static const struct zstream_funcs inflate_funcs = {
inflateReset, inflateEnd, inflate,
};
-struct zstream_run_args {
- struct zstream * z;
- int flush; /* stream flush value for inflate() or deflate() */
- int interrupt; /* stop processing the stream and return to ruby */
- int jump_state; /* for buffer expansion block break or exception */
- int stream_output; /* for streaming zlib processing */
-};
static voidpf
zlib_mem_alloc(voidpf opaque, uInt items, uInt size)
@@ -585,7 +454,7 @@ zlib_mem_alloc(voidpf opaque, uInt items, uInt size)
deflate is performing a conditional jump that depends on an
uninitialized value. Isn't that a bug?
http://www.zlib.net/zlib_faq.html#faq36 */
- (void)VALGRIND_MAKE_MEM_DEFINED(p, items * size);
+ VALGRIND_MAKE_MEM_DEFINED(p, items * size);
return p;
}
@@ -619,54 +488,37 @@ zstream_init(struct zstream *z, const struct zstream_funcs *func)
static void
zstream_expand_buffer(struct zstream *z)
{
+ long inc;
+
if (NIL_P(z->buf)) {
- zstream_expand_buffer_into(z, ZSTREAM_INITIAL_BUFSIZE);
+ /* 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, ZSTREAM_INITIAL_BUFSIZE);
+ z->buf_filled = 0;
+ z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+ z->stream.avail_out = ZSTREAM_INITIAL_BUFSIZE;
+ RBASIC(z->buf)->klass = 0;
return;
}
- if (!ZSTREAM_IS_GZFILE(z) && rb_block_given_p()) {
- if (z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
- int state = 0;
- VALUE self = (VALUE)z->stream.opaque;
-
- rb_str_resize(z->buf, z->buf_filled);
- RBASIC(z->buf)->klass = rb_cString;
- OBJ_INFECT(z->buf, self);
-
- rb_protect(rb_yield, z->buf, &state);
-
- z->buf = Qnil;
- zstream_expand_buffer_into(z, ZSTREAM_AVAIL_OUT_STEP_MAX);
-
- if (state)
- rb_jump_tag(state);
-
- return;
- }
- else {
- zstream_expand_buffer_into(z,
- ZSTREAM_AVAIL_OUT_STEP_MAX - z->buf_filled);
- }
+ if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+ /* to keep other threads from freezing */
+ z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
}
else {
- if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
- z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
- }
- else {
- long inc = z->buf_filled / 2;
- if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
- inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
- }
- rb_str_resize(z->buf, z->buf_filled + inc);
- z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
- (int)inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
+ inc = z->buf_filled / 2;
+ if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
+ inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
}
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+ rb_str_resize(z->buf, z->buf_filled + inc);
+ 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;
}
static void
-zstream_expand_buffer_into(struct zstream *z, unsigned long size)
+zstream_expand_buffer_into(struct zstream *z, unsigned int size)
{
if (NIL_P(z->buf)) {
/* I uses rb_str_new here not rb_str_buf_new because
@@ -674,62 +526,18 @@ zstream_expand_buffer_into(struct zstream *z, unsigned long size)
z->buf = rb_str_new(0, size);
z->buf_filled = 0;
z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
- z->stream.avail_out = MAX_UINT(size);
+ 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.avail_out = MAX_UINT(size);
+ z->stream.avail_out = size;
}
}
-static void *
-zstream_expand_buffer_protect(void *ptr)
-{
- struct zstream *z = (struct zstream *)ptr;
- int state = 0;
-
- rb_protect((VALUE (*)(VALUE))zstream_expand_buffer, (VALUE)z, &state);
-
- return (void *)(VALUE)state;
-}
-
-static int
-zstream_expand_buffer_without_gvl(struct zstream *z)
-{
- char * new_str;
- long inc, len;
-
- if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
- z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
- }
- else {
- inc = z->buf_filled / 2;
- if (inc < ZSTREAM_AVAIL_OUT_STEP_MIN) {
- inc = ZSTREAM_AVAIL_OUT_STEP_MIN;
- }
-
- len = z->buf_filled + inc;
-
- new_str = ruby_xrealloc(RSTRING(z->buf)->as.heap.ptr, len + 1);
-
- /* from rb_str_resize */
- RSTRING(z->buf)->as.heap.ptr = new_str;
- RSTRING(z->buf)->as.heap.ptr[len] = '\0'; /* sentinel */
- RSTRING(z->buf)->as.heap.len =
- RSTRING(z->buf)->as.heap.aux.capa = len;
-
- z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
- (int)inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
- }
- z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
-
- return ZSTREAM_EXPAND_BUFFER_OK;
-}
-
static void
-zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
+zstream_append_buffer(struct zstream *z, const Bytef *src, int len)
{
if (NIL_P(z->buf)) {
z->buf = rb_str_buf_new(len);
@@ -747,7 +555,7 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
}
else {
if (z->stream.avail_out >= (uInt)len) {
- z->stream.avail_out -= (uInt)len;
+ z->stream.avail_out -= len;
}
else {
z->stream.avail_out = 0;
@@ -764,14 +572,7 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, long len)
static VALUE
zstream_detach_buffer(struct zstream *z)
{
- VALUE dst, self = (VALUE)z->stream.opaque;
-
- if (!ZSTREAM_IS_FINISHED(z) && !ZSTREAM_IS_GZFILE(z) &&
- rb_block_given_p()) {
- /* prevent tiny yields mid-stream, save for next
- * zstream_expand_buffer() or stream end */
- return Qnil;
- }
+ VALUE dst;
if (NIL_P(z->buf)) {
dst = rb_str_new(0, 0);
@@ -782,26 +583,17 @@ zstream_detach_buffer(struct zstream *z)
RBASIC(dst)->klass = rb_cString;
}
- OBJ_INFECT(dst, self);
-
z->buf = Qnil;
z->buf_filled = 0;
z->stream.next_out = 0;
z->stream.avail_out = 0;
-
- if (!ZSTREAM_IS_GZFILE(z) && rb_block_given_p()) {
- rb_yield(dst);
- dst = Qnil;
- }
-
return dst;
}
static VALUE
-zstream_shift_buffer(struct zstream *z, long len)
+zstream_shift_buffer(struct zstream *z, int len)
{
VALUE dst;
- long buflen;
if (z->buf_filled <= len) {
return zstream_detach_buffer(z);
@@ -813,17 +605,16 @@ zstream_shift_buffer(struct zstream *z, long len)
memmove(RSTRING_PTR(z->buf), RSTRING_PTR(z->buf) + len,
z->buf_filled);
z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
- buflen = RSTRING_LEN(z->buf) - z->buf_filled;
- if (buflen > ZSTREAM_AVAIL_OUT_STEP_MAX) {
- buflen = ZSTREAM_AVAIL_OUT_STEP_MAX;
+ z->stream.avail_out = RSTRING_LEN(z->buf) - z->buf_filled;
+ if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP_MAX) {
+ z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
}
- z->stream.avail_out = (uInt)buflen;
return dst;
}
static void
-zstream_buffer_ungets(struct zstream *z, const Bytef *b, unsigned long len)
+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);
@@ -833,9 +624,8 @@ zstream_buffer_ungets(struct zstream *z, const Bytef *b, unsigned long len)
memmove(RSTRING_PTR(z->buf), b, len);
z->buf_filled+=len;
if (z->stream.avail_out > 0) {
- if (len > z->stream.avail_out) len = z->stream.avail_out;
z->stream.next_out+=len;
- z->stream.avail_out-=(uInt)len;
+ z->stream.avail_out-=len;
}
}
@@ -856,7 +646,7 @@ zstream_buffer_ungetbyte(struct zstream *z, int c)
}
static void
-zstream_append_input(struct zstream *z, const Bytef *src, long len)
+zstream_append_input(struct zstream *z, const Bytef *src, unsigned int len)
{
if (len <= 0) return;
@@ -875,9 +665,9 @@ zstream_append_input(struct zstream *z, const Bytef *src, long len)
zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
static void
-zstream_discard_input(struct zstream *z, long len)
+zstream_discard_input(struct zstream *z, unsigned int len)
{
- if (NIL_P(z->input) || RSTRING_LEN(z->input) <= len) {
+ if (NIL_P(z->input) || (unsigned int)RSTRING_LEN(z->input) <= len) {
z->input = Qnil;
}
else {
@@ -959,83 +749,13 @@ zstream_end(struct zstream *z)
return Qnil;
}
-static void *
-zstream_run_func(void *ptr)
-{
- struct zstream_run_args *args = (struct zstream_run_args *)ptr;
- int err, state, flush = args->flush;
- struct zstream *z = args->z;
- uInt n;
-
- err = Z_OK;
- while (!args->interrupt) {
- n = z->stream.avail_out;
- err = z->func->run(&z->stream, flush);
- z->buf_filled += n - z->stream.avail_out;
-
- if (err == Z_STREAM_END) {
- z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
- z->flags |= ZSTREAM_FLAG_FINISHED;
- break;
- }
-
- if (err != Z_OK && err != Z_BUF_ERROR)
- break;
-
- if (z->stream.avail_out > 0) {
- z->flags |= ZSTREAM_FLAG_IN_STREAM;
- break;
- }
-
- if (z->stream.avail_in == 0 && z->func == &inflate_funcs) {
- /* break here because inflate() return Z_BUF_ERROR when avail_in == 0. */
- /* but deflate() could be called with avail_in == 0 (there's hidden buffer
- in zstream->state) */
- z->flags |= ZSTREAM_FLAG_IN_STREAM;
- break;
- }
-
- if (args->stream_output) {
- state = (int)(VALUE)rb_thread_call_with_gvl(zstream_expand_buffer_protect,
- (void *)z);
- } else {
- state = zstream_expand_buffer_without_gvl(z);
- }
-
- if (state) {
- err = Z_OK; /* buffer expanded but stream processing was stopped */
- args->jump_state = state;
- break;
- }
- }
-
- return (void *)(VALUE)err;
-}
-
-/*
- * There is no safe way to interrupt z->run->func().
- */
static void
-zstream_unblock_func(void *ptr)
+zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
{
- struct zstream_run_args *args = (struct zstream_run_args *)ptr;
-
- args->interrupt = 1;
-}
-
-static void
-zstream_run(struct zstream *z, Bytef *src, long len, int flush)
-{
- struct zstream_run_args args;
+ uInt n;
int err;
volatile VALUE guard = Qnil;
- args.z = z;
- args.flush = flush;
- args.interrupt = 0;
- args.jump_state = 0;
- args.stream_output = !ZSTREAM_IS_GZFILE(z) && rb_block_given_p();
-
if (NIL_P(z->input) && len == 0) {
z->stream.next_in = (Bytef*)"";
z->stream.avail_in = 0;
@@ -1043,7 +763,7 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush)
else {
zstream_append_input(z, src, len);
z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
- z->stream.avail_in = MAX_UINT(RSTRING_LEN(z->input));
+ z->stream.avail_in = RSTRING_LEN(z->input);
/* keep reference to `z->input' so as not to be garbage collected
after zstream_reset_input() and prevent `z->stream.next_in'
from dangling. */
@@ -1054,53 +774,55 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush)
zstream_expand_buffer(z);
}
-loop:
- err = (int)(VALUE)rb_thread_call_without_gvl(zstream_run_func, (void *)&args,
- zstream_unblock_func, (void *)&args);
-
- if (flush != Z_FINISH && err == Z_BUF_ERROR
- && z->stream.avail_out > 0) {
- z->flags |= ZSTREAM_FLAG_IN_STREAM;
- }
-
- zstream_reset_input(z);
+ 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;
+ rb_thread_schedule();
- if (err != Z_OK && err != Z_STREAM_END) {
- if (z->stream.avail_in > 0) {
- zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
+ if (err == Z_STREAM_END) {
+ z->flags &= ~ZSTREAM_FLAG_IN_STREAM;
+ z->flags |= ZSTREAM_FLAG_FINISHED;
+ break;
}
- if (err == Z_NEED_DICT) {
- VALUE self = (VALUE)z->stream.opaque;
- if (self) {
- VALUE dicts = rb_ivar_get(self, id_dictionaries);
- VALUE dict = rb_hash_aref(dicts, rb_uint2inum(z->stream.adler));
- if (!NIL_P(dict)) {
- rb_inflate_set_dictionary(self, dict);
- goto loop;
- }
+ if (err != Z_OK) {
+ if (flush != Z_FINISH && err == Z_BUF_ERROR
+ && z->stream.avail_out > 0) {
+ z->flags |= ZSTREAM_FLAG_IN_STREAM;
+ break;
}
+ zstream_reset_input(z);
+ if (z->stream.avail_in > 0) {
+ zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
+ }
+ raise_zlib_error(err, z->stream.msg);
}
- raise_zlib_error(err, z->stream.msg);
+ if (z->stream.avail_out > 0) {
+ z->flags |= ZSTREAM_FLAG_IN_STREAM;
+ break;
+ }
+ zstream_expand_buffer(z);
}
+ zstream_reset_input(z);
if (z->stream.avail_in > 0) {
zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
- RB_GC_GUARD(guard) = Qnil; /* prevent tail call to make guard effective */
+ guard = Qnil; /* prevent tail call to make guard effective */
}
-
- if (args.jump_state)
- rb_jump_tag(args.jump_state);
}
static VALUE
-zstream_sync(struct zstream *z, Bytef *src, long len)
+zstream_sync(struct zstream *z, Bytef *src, uInt len)
{
- /* VALUE rest; */
+ VALUE rest;
int err;
if (!NIL_P(z->input)) {
z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
- z->stream.avail_in = MAX_UINT(RSTRING_LEN(z->input));
+ z->stream.avail_in = RSTRING_LEN(z->input);
err = inflateSync(&z->stream);
if (err == Z_OK) {
zstream_discard_input(z,
@@ -1110,7 +832,7 @@ zstream_sync(struct zstream *z, Bytef *src, long len)
}
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((char*)z->stream.next_in, z->stream.avail_in);
raise_zlib_error(err, z->stream.msg);
}
}
@@ -1118,14 +840,14 @@ zstream_sync(struct zstream *z, Bytef *src, long len)
if (len <= 0) return Qfalse;
z->stream.next_in = src;
- z->stream.avail_in = MAX_UINT(len);
+ z->stream.avail_in = len;
err = inflateSync(&z->stream);
if (err == Z_OK) {
zstream_append_input(z, z->stream.next_in, z->stream.avail_in);
return Qtrue;
}
if (err != Z_DATA_ERROR) {
- /* rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in); */
+ rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
raise_zlib_error(err, z->stream.msg);
}
return Qfalse;
@@ -1166,7 +888,6 @@ zstream_new(VALUE klass, const struct zstream_funcs *funcs)
obj = Data_Make_Struct(klass, struct zstream,
zstream_mark, zstream_free, z);
zstream_init(z, funcs);
- z->stream.opaque = (voidpf)obj;
return obj;
}
@@ -1272,32 +993,24 @@ rb_zstream_reset(VALUE obj)
}
/*
- * call-seq:
- * finish -> String
- * finish { |chunk| ... } -> nil
- *
- * Finishes the stream and flushes output buffer. If a block is given each
- * chunk is yielded to the block until the input buffer has been flushed to
- * the output buffer.
+ * Finishes the stream and flushes output buffer. See Zlib::Deflate#finish and
+ * Zlib::Inflate#finish for details of this behavior.
*/
static VALUE
rb_zstream_finish(VALUE obj)
{
struct zstream *z = get_zstream(obj);
+ VALUE dst;
zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+ dst = zstream_detach_buffer(z);
- return zstream_detach_buffer(z);
+ OBJ_INFECT(dst, obj);
+ return dst;
}
/*
- * call-seq:
- * flush_next_out -> String
- * flush_next_out { |chunk| ... } -> nil
- *
- * Flushes output buffer and returns all data in that buffer. If a block is
- * given each chunk is yielded to the block until the current output buffer
- * has been flushed.
+ * Flushes input buffer and returns all data in that buffer.
*/
static VALUE
rb_zstream_flush_next_in(VALUE obj)
@@ -1318,10 +1031,12 @@ static VALUE
rb_zstream_flush_next_out(VALUE obj)
{
struct zstream *z;
+ VALUE dst;
Data_Get_Struct(obj, struct zstream, z);
-
- return zstream_detach_buffer(z);
+ dst = zstream_detach_buffer(z);
+ OBJ_INFECT(dst, obj);
+ return dst;
}
/*
@@ -1383,8 +1098,8 @@ rb_zstream_total_out(VALUE obj)
/*
* Guesses the type of the data which have been inputed into the stream. The
- * returned value is either <tt>BINARY</tt>, <tt>ASCII</tt>, or
- * <tt>UNKNOWN</tt>.
+ * returned value is either <tt>Zlib::BINARY</tt>, <tt>Zlib::ASCII</tt>, or
+ * <tt>Zlib::UNKNOWN</tt>.
*/
static VALUE
rb_zstream_data_type(VALUE obj)
@@ -1427,7 +1142,7 @@ rb_zstream_closed_p(VALUE obj)
/*
* Document-class: Zlib::Deflate
*
- * Zlib::Deflate is the class for compressing data. See Zlib::ZStream for more
+ * Zlib::Deflate is the class for compressing data. See Zlib::Stream for more
* information.
*/
@@ -1449,75 +1164,13 @@ rb_deflate_s_allocate(VALUE klass)
}
/*
- * Document-method: Zlib::Deflate.new
+ * call-seq: Zlib::Deflate.new(level=nil, windowBits=nil, memlevel=nil, strategy=nil)
*
- * call-seq:
- * Zlib::Deflate.new(level=DEFAULT_COMPRESSION, window_bits=MAX_WBITS, mem_level=DEF_MEM_LEVEL, strategy=DEFAULT_STRATEGY)
+ * Creates a new deflate stream for compression. See zlib.h for details of
+ * each argument. If an argument is nil, the default value of that argument is
+ * used.
*
- * Creates a new deflate stream for compression. If a given argument is nil,
- * the default value of that argument is used.
- *
- * The +level+ sets the compression level for the deflate stream between 0 (no
- * compression) and 9 (best compression. The following constants have been
- * defined to make code more readable:
- *
- * * Zlib::NO_COMPRESSION = 0
- * * Zlib::BEST_SPEED = 1
- * * Zlib::DEFAULT_COMPRESSION = 6
- * * Zlib::BEST_COMPRESSION = 9
- *
- * The +window_bits+ sets the size of the history buffer and should be between
- * 8 and 15. Larger values of this parameter result in better compression at
- * the expense of memory usage.
- *
- * The +mem_level+ specifies how much memory should be allocated for the
- * internal compression state. 1 uses minimum memory but is slow and reduces
- * compression ratio while 9 uses maximum memory for optimal speed. The
- * default value is 8. Two constants are defined:
- *
- * * Zlib::DEF_MEM_LEVEL
- * * Zlib::MAX_MEM_LEVEL
- *
- * The +strategy+ sets the deflate compression strategy. The following
- * strategies are available:
- *
- * Zlib::DEFAULT_STRATEGY:: For normal data
- * Zlib::FILTERED:: For data produced by a filter or predictor
- * Zlib::FIXED:: Prevents dynamic Huffman codes
- * Zlib::HUFFMAN_ONLY:: Prevents string matching
- * Zlib::RLE:: Designed for better compression of PNG image data
- *
- * See the constants for further description.
- *
- * == Examples
- *
- * === Basic
- *
- * open "compressed.file", "w+" do |io|
- * io << Zlib::Deflate.new.deflate(File.read("big.file"))
- * end
- *
- * === Custom compression
- *
- * open "compressed.file", "w+" do |compressed_io|
- * deflate = Zlib::Deflate.new(Zlib::BEST_COMPRESSION,
- * Zlib::MAX_WBITS,
- * Zlib::MAX_MEM_LEVEL,
- * Zlib::HUFFMAN_ONLY)
- *
- * begin
- * open "big.file" do |big_io|
- * until big_io.eof? do
- * compressed_io << zd.deflate(big_io.read(16384))
- * end
- * end
- * ensure
- * deflate.close
- * end
- * end
- *
- * While this example will work, for best optimization review the flags for
- * your specific time, memory usage and output space requirements.
+ * TODO: document better!
*/
static VALUE
rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
@@ -1541,8 +1194,6 @@ rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::Deflate#initialize_copy
- *
* Duplicates the deflate stream.
*/
static VALUE
@@ -1554,7 +1205,6 @@ rb_deflate_init_copy(VALUE self, VALUE orig)
Data_Get_Struct(self, struct zstream, z1);
z2 = get_zstream(orig);
- if (z1 == z2) return self;
err = deflateCopy(&z1->stream, &z2->stream);
if (err != Z_OK) {
raise_zlib_error(err, 0);
@@ -1578,15 +1228,12 @@ deflate_run(VALUE args)
}
/*
- * Document-method: Zlib::Deflate.deflate
- *
- * call-seq:
- * Zlib.deflate(string[, level])
- * Zlib::Deflate.deflate(string[, level])
+ * call-seq: Zlib::Deflate.deflate(string[, level])
*
* Compresses the given +string+. Valid values of level are
- * Zlib::NO_COMPRESSION, Zlib::BEST_SPEED, Zlib::BEST_COMPRESSION,
- * Zlib::DEFAULT_COMPRESSION, or an integer from 0 to 9 (the default is 6).
+ * <tt>Zlib::NO_COMPRESSION</tt>, <tt>Zlib::BEST_SPEED</tt>,
+ * <tt>Zlib::BEST_COMPRESSION</tt>, <tt>Zlib::DEFAULT_COMPRESSION</tt>, and an
+ * integer from 0 to 9.
*
* This method is almost equivalent to the following code:
*
@@ -1597,7 +1244,7 @@ deflate_run(VALUE args)
* dst
* end
*
- * See also Zlib.inflate
+ * TODO: what's default value of +level+?
*
*/
static VALUE
@@ -1640,47 +1287,35 @@ do_deflate(struct zstream *z, VALUE src, int flush)
}
/*
- * Document-method: Zlib::Deflate#deflate
- *
- * call-seq:
- * z.deflate(string, flush = Zlib::NO_FLUSH) -> String
- * z.deflate(string, flush = Zlib::NO_FLUSH) { |chunk| ... } -> nil
+ * call-seq: deflate(string[, flush])
*
* Inputs +string+ into the deflate stream and returns the output from the
* stream. On calling this method, both the input and the output buffers of
- * the stream are flushed. If +string+ is nil, this method finishes the
+ * the stream are flushed. If +string+ is nil, this method finishes the
* stream, just like Zlib::ZStream#finish.
*
- * If a block is given consecutive deflated chunks from the +string+ are
- * yielded to the block and +nil+ is returned.
- *
- * The +flush+ parameter specifies the flush mode. The following constants
- * may be used:
- *
- * Zlib::NO_FLUSH:: The default
- * Zlib::SYNC_FLUSH:: Flushes the output to a byte boundary
- * Zlib::FULL_FLUSH:: SYNC_FLUSH + resets the compression state
- * Zlib::FINISH:: Pending input is processed, pending output is flushed.
- *
- * See the constants for further description.
+ * The value of +flush+ should be either <tt>Zlib::NO_FLUSH</tt>,
+ * <tt>Zlib::SYNC_FLUSH</tt>, <tt>Zlib::FULL_FLUSH</tt>, or
+ * <tt>Zlib::FINISH</tt>. See zlib.h for details.
*
+ * TODO: document better!
*/
static VALUE
rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
{
struct zstream *z = get_zstream(obj);
- VALUE src, flush;
+ VALUE src, flush, dst;
rb_scan_args(argc, argv, "11", &src, &flush);
OBJ_INFECT(obj, src);
do_deflate(z, src, ARG_FLUSH(flush));
+ dst = zstream_detach_buffer(z);
- return zstream_detach_buffer(z);
+ OBJ_INFECT(dst, obj);
+ return dst;
}
/*
- * Document-method: Zlib::Deflate#<<
- *
* call-seq: << string
*
* Inputs +string+ into the deflate stream just like Zlib::Deflate#deflate, but
@@ -1696,25 +1331,19 @@ rb_deflate_addstr(VALUE obj, VALUE src)
}
/*
- * Document-method: Zlib::Deflate#flush
+ * call-seq: flush(flush)
*
- * call-seq:
- * flush(flush = Zlib::SYNC_FLUSH) -> String
- * flush(flush = Zlib::SYNC_FLUSH) { |chunk| ... } -> nil
+ * This method is equivalent to <tt>deflate('', flush)</tt>. If flush is omitted,
+ * <tt>Zlib::SYNC_FLUSH</tt> is used as flush. This method is just provided
+ * to improve the readability of your Ruby program.
*
- * This method is equivalent to <tt>deflate('', flush)</tt>. This method is
- * just provided to improve the readability of your Ruby program. If a block
- * is given chunks of deflate output are yielded to the block until the buffer
- * is flushed.
- *
- * See Zlib::Deflate#deflate for detail on the +flush+ constants NO_FLUSH,
- * SYNC_FLUSH, FULL_FLUSH and FINISH.
+ * TODO: document better!
*/
static VALUE
rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
{
struct zstream *z = get_zstream(obj);
- VALUE v_flush;
+ VALUE v_flush, dst;
int flush;
rb_scan_args(argc, argv, "01", &v_flush);
@@ -1722,21 +1351,20 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
if (flush != Z_NO_FLUSH) { /* prevent Z_BUF_ERROR */
zstream_run(z, (Bytef*)"", 0, flush);
}
+ dst = zstream_detach_buffer(z);
- return zstream_detach_buffer(z);
+ OBJ_INFECT(dst, obj);
+ return dst;
}
/*
- * Document-method: Zlib::Deflate.params
- *
* call-seq: params(level, strategy)
*
- * Changes the parameters of the deflate stream to allow changes between
- * different types of data that require different types of compression. Any
- * unprocessed data is flushed before changing the params.
- *
- * See Zlib::Deflate.new for a description of +level+ and +strategy+.
+ * Changes the parameters of the deflate stream. See zlib.h for details. The
+ * output from the stream by changing the params is preserved in output
+ * buffer.
*
+ * TODO: document better!
*/
static VALUE
rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
@@ -1767,18 +1395,13 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
}
/*
- * Document-method: Zlib::Deflate.set_dictionary
- *
* call-seq: set_dictionary(string)
*
* Sets the preset dictionary and returns +string+. This method is available
* just only after Zlib::Deflate.new or Zlib::ZStream#reset method was called.
* See zlib.h for details.
*
- * Can raise errors of Z_STREAM_ERROR if a parameter is invalid (such as
- * NULL dictionary) or the stream state is inconsistent, Z_DATA_ERROR if
- * the given dictionary doesn't match the expected one (incorrect adler32 value)
- *
+ * TODO: document better!
*/
static VALUE
rb_deflate_set_dictionary(VALUE obj, VALUE dic)
@@ -1790,7 +1413,7 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
OBJ_INFECT(obj, dic);
StringValue(src);
err = deflateSetDictionary(&z->stream,
- (Bytef*)RSTRING_PTR(src), RSTRING_LENINT(src));
+ (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
if (err != Z_OK) {
raise_zlib_error(err, z->stream.msg);
}
@@ -1809,58 +1432,21 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
* dup) itself.
*/
+
+
static VALUE
rb_inflate_s_allocate(VALUE klass)
{
- VALUE inflate = zstream_inflate_new(klass);
- rb_ivar_set(inflate, id_dictionaries, rb_hash_new());
- return inflate;
+ return zstream_inflate_new(klass);
}
/*
- * Document-method: Zlib::Inflate.new
- *
- * call-seq:
- * Zlib::Inflate.new(window_bits = Zlib::MAX_WBITS)
- *
- * Creates a new inflate stream for decompression. +window_bits+ sets the
- * size of the history buffer and can have the following values:
- *
- * 0::
- * Have inflate use the window size from the zlib header of the compressed
- * stream.
- *
- * (8..15)
- * Overrides the window size of the inflate header in the compressed stream.
- * The window size must be greater than or equal to the window size of the
- * compressed stream.
- *
- * Greater than 15::
- * Add 32 to window_bits to enable zlib and gzip decoding with automatic
- * header detection, or add 16 to decode only the gzip format (a
- * Zlib::DataError will be raised for a non-gzip stream).
- *
- * (-8..-15)::
- * Enables raw deflate mode which will not generate a check value, and will
- * not look for any check values for comparison at the end of the stream.
- *
- * This is for use with other formats that use the deflate compressed data
- * format such as zip which provide their own check values.
+ * call-seq: Zlib::Inflate.new(window_bits)
*
- * == Example
- *
- * open "compressed.file" do |compressed_io|
- * inflate = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
- *
- * begin
- * open "uncompressed.file", "w+" do |uncompressed_io|
- * uncompressed_io << zi.inflate(compressed_io.read)
- * }
- * ensure
- * zi.close
- * end
- * end
+ * Creates a new inflate stream for decompression. See zlib.h for details
+ * of the argument. If +window_bits+ is +nil+, the default value is used.
*
+ * TODO: document better!
*/
static VALUE
rb_inflate_initialize(int argc, VALUE *argv, VALUE obj)
@@ -1893,11 +1479,7 @@ inflate_run(VALUE args)
}
/*
- * Document-method: Zlib::inflate
- *
- * call-seq:
- * Zlib.inflate(string)
- * Zlib::Inflate.inflate(string)
+ * call-seq: Zlib::Inflate.inflate(string)
*
* Decompresses +string+. Raises a Zlib::NeedDict exception if a preset
* dictionary is needed for decompression.
@@ -1912,8 +1494,6 @@ inflate_run(VALUE args)
* buf
* end
*
- * See also Zlib.deflate
- *
*/
static VALUE
rb_inflate_s_inflate(VALUE obj, VALUE src)
@@ -1946,66 +1526,24 @@ do_inflate(struct zstream *z, VALUE src)
return;
}
StringValue(src);
- if (RSTRING_LEN(src) > 0 || z->stream.avail_in > 0) { /* prevent Z_BUF_ERROR */
+ if (RSTRING_LEN(src) > 0) { /* prevent Z_BUF_ERROR */
zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
}
}
-/* Document-method: Zlib::Inflate#add_dictionary
- *
- * call-seq: add_dictionary(string)
- *
- * Provide the inflate stream with a dictionary that may be required in the
- * future. Multiple dictionaries may be provided. The inflate stream will
- * automatically choose the correct user-provided dictionary based on the
- * stream's required dictionary.
- */
-static VALUE
-rb_inflate_add_dictionary(VALUE obj, VALUE dictionary) {
- VALUE dictionaries = rb_ivar_get(obj, id_dictionaries);
- VALUE checksum = do_checksum(1, &dictionary, adler32);
-
- rb_hash_aset(dictionaries, checksum, dictionary);
-
- return obj;
-}
-
/*
- * Document-method: Zlib::Inflate#inflate
+ * call-seq: inflate(string)
*
- * call-seq:
- * inflate(deflate_string) -> String
- * inflate(deflate_string) { |chunk| ... } -> nil
- *
- * Inputs +deflate_string+ into the inflate stream and returns the output from
- * the stream. Calling this method, both the input and the output buffer of
- * the stream are flushed. If string is +nil+, this method finishes the
- * stream, just like Zlib::ZStream#finish.
- *
- * If a block is given consecutive inflated chunks from the +deflate_string+
- * are yielded to the block and +nil+ is returned.
+ * Inputs +string+ into the inflate stream and returns the output from the
+ * stream. Calling this method, both the input and the output buffer of the
+ * stream are flushed. If string is +nil+, this method finishes the stream,
+ * just like Zlib::ZStream#finish.
*
* Raises a Zlib::NeedDict exception if a preset dictionary is needed to
* decompress. Set the dictionary by Zlib::Inflate#set_dictionary and then
- * call this method again with an empty string to flush the stream:
- *
- * inflater = Zlib::Inflate.new
- *
- * begin
- * out = inflater.inflate compressed
- * rescue Zlib::NeedDict
- * # ensure the dictionary matches the stream's required dictionary
- * raise unless inflater.adler == Zlib.adler32(dictionary)
- *
- * inflater.set_dictionary dictionary
- * inflater.inflate ''
- * end
- *
- * # ...
+ * call this method again with an empty string. (<i>???</i>)
*
- * inflater.close
- *
- * See also Zlib::Inflate.new
+ * TODO: document better!
*/
static VALUE
rb_inflate_inflate(VALUE obj, VALUE src)
@@ -2023,7 +1561,6 @@ rb_inflate_inflate(VALUE obj, VALUE src)
StringValue(src);
zstream_append_buffer2(z, src);
dst = rb_str_new(0, 0);
- OBJ_INFECT(dst, obj);
}
}
else {
@@ -2034,6 +1571,7 @@ rb_inflate_inflate(VALUE obj, VALUE src)
}
}
+ OBJ_INFECT(dst, obj);
return dst;
}
@@ -2109,11 +1647,10 @@ rb_inflate_sync_point_p(VALUE obj)
}
/*
- * Document-method: Zlib::Inflate#set_dictionary
- *
* Sets the preset dictionary and returns +string+. This method is available just
* only after a Zlib::NeedDict exception was raised. See zlib.h for details.
*
+ * TODO: document better!
*/
static VALUE
rb_inflate_set_dictionary(VALUE obj, VALUE dic)
@@ -2125,7 +1662,7 @@ rb_inflate_set_dictionary(VALUE obj, VALUE dic)
OBJ_INFECT(obj, dic);
StringValue(src);
err = inflateSetDictionary(&z->stream,
- (Bytef*)RSTRING_PTR(src), RSTRING_LENINT(src));
+ (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
if (err != Z_OK) {
raise_zlib_error(err, z->stream.msg);
}
@@ -2179,7 +1716,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, id_input;
+static ID id_write, id_read, id_readpartial, id_flush, id_seek, id_close, id_path;
static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
@@ -2196,7 +1733,7 @@ struct gzfile {
VALUE comment; /* for header; must be a String */
unsigned long crc;
int lineno;
- long ungetc;
+ int ungetc;
void (*end)(struct gzfile *);
rb_encoding *enc;
rb_encoding *enc2;
@@ -2213,7 +1750,7 @@ struct gzfile {
#define GZFILE_FLAG_FOOTER_FINISHED (ZSTREAM_FLAG_UNUSED << 2)
#define GZFILE_IS_FINISHED(gz) \
- (ZSTREAM_IS_FINISHED(&(gz)->z) && (gz)->z.buf_filled == 0)
+ (ZSTREAM_IS_FINISHED(&gz->z) && (gz)->z.buf_filled == 0)
#define GZFILE_READ_SIZE 2048
@@ -2257,7 +1794,6 @@ gzfile_new(klass, funcs, endfunc)
obj = Data_Make_Struct(klass, struct gzfile, gzfile_mark, gzfile_free, gz);
zstream_init(&gz->z, funcs);
- gz->z.flags |= ZSTREAM_FLAG_GZFILE;
gz->io = Qnil;
gz->level = 0;
gz->mtime = 0;
@@ -2286,7 +1822,6 @@ static void
gzfile_reset(struct gzfile *gz)
{
zstream_reset(&gz->z);
- gz->z.flags |= ZSTREAM_FLAG_GZFILE;
gz->crc = crc32(0, Z_NULL, 0);
gz->lineno = 0;
gz->ungetc = 0;
@@ -2360,16 +1895,16 @@ gzfile_read_raw(struct gzfile *gz)
}
static int
-gzfile_read_raw_ensure(struct gzfile *gz, long size)
+gzfile_read_raw_ensure(struct gzfile *gz, int size)
{
VALUE str;
while (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) {
str = gzfile_read_raw(gz);
- if (NIL_P(str)) return 0;
+ if (NIL_P(str)) return Qfalse;
zstream_append_input2(&gz->z, str);
}
- return 1;
+ return Qtrue;
}
static char *
@@ -2422,36 +1957,6 @@ gzfile_set32(unsigned long n, unsigned char *dst)
}
static void
-gzfile_raise(struct gzfile *gz, VALUE klass, const char *message)
-{
- VALUE exc = rb_exc_new2(klass, message);
- if (!NIL_P(gz->z.input)) {
- rb_ivar_set(exc, id_input, rb_str_resurrect(gz->z.input));
- }
- rb_exc_raise(exc);
-}
-
-/*
- * Document-method: Zlib::GzipFile::Error#inspect
- *
- * Constructs a String of the GzipFile Error
- */
-static VALUE
-gzfile_error_inspect(VALUE error)
-{
- VALUE str = rb_call_super(0, 0);
- VALUE input = rb_attr_get(error, id_input);
-
- if (!NIL_P(input)) {
- rb_str_resize(str, RSTRING_LEN(str)-1);
- rb_str_cat2(str, ", input=");
- rb_str_append(str, rb_str_inspect(input));
- rb_str_cat2(str, ">");
- }
- return str;
-}
-
-static void
gzfile_make_header(struct gzfile *gz)
{
Bytef buf[10]; /* the size of gzip header */
@@ -2514,13 +2019,13 @@ gzfile_read_header(struct gzfile *gz)
char flags, *p;
if (!gzfile_read_raw_ensure(gz, 10)) { /* 10 is the size of gzip header */
- gzfile_raise(gz, cGzError, "not in gzip format");
+ rb_raise(cGzError, "not in gzip format");
}
head = (unsigned char*)RSTRING_PTR(gz->z.input);
if (head[0] != GZ_MAGIC1 || head[1] != GZ_MAGIC2) {
- gzfile_raise(gz, cGzError, "not in gzip format");
+ rb_raise(cGzError, "not in gzip format");
}
if (head[2] != GZ_METHOD_DEFLATE) {
rb_raise(cGzError, "unsupported compression method %d", head[2]);
@@ -2562,9 +2067,6 @@ gzfile_read_header(struct gzfile *gz)
zstream_discard_input(&gz->z, 2 + len);
}
if (flags & GZ_FLAG_ORIG_NAME) {
- if (!gzfile_read_raw_ensure(gz, 1)) {
- rb_raise(cGzError, "unexpected end of file");
- }
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);
@@ -2572,9 +2074,6 @@ gzfile_read_header(struct gzfile *gz)
zstream_discard_input(&gz->z, len + 1);
}
if (flags & GZ_FLAG_COMMENT) {
- if (!gzfile_read_raw_ensure(gz, 1)) {
- rb_raise(cGzError, "unexpected end of file");
- }
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);
@@ -2595,7 +2094,7 @@ gzfile_check_footer(struct gzfile *gz)
gz->z.flags |= GZFILE_FLAG_FOOTER_FINISHED;
if (!gzfile_read_raw_ensure(gz, 8)) { /* 8 is the size of gzip footer */
- gzfile_raise(gz, cNoFooter, "footer is not found");
+ rb_raise(cNoFooter, "footer is not found");
}
crc = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input));
@@ -2613,14 +2112,14 @@ gzfile_check_footer(struct gzfile *gz)
}
static void
-gzfile_write(struct gzfile *gz, Bytef *str, long len)
+gzfile_write(struct gzfile *gz, Bytef *str, uInt len)
{
if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
gzfile_make_header(gz);
}
if (len > 0 || (gz->z.flags & GZFILE_FLAG_SYNC)) {
- gz->crc = checksum_long(crc32, gz->crc, str, len);
+ gz->crc = crc32(gz->crc, str, len);
zstream_run(&gz->z, str, len, (gz->z.flags & GZFILE_FLAG_SYNC)
? Z_SYNC_FLUSH : Z_NO_FLUSH);
}
@@ -2656,7 +2155,7 @@ gzfile_calc_crc(struct gzfile *gz, VALUE str)
gz->ungetc -= RSTRING_LEN(str);
}
else {
- gz->crc = checksum_long(crc32, gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
+ gz->crc = crc32(gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
RSTRING_LEN(str) - gz->ungetc);
gz->ungetc = 0;
}
@@ -2680,13 +2179,15 @@ gzfile_newstr(struct gzfile *gz, VALUE str)
gz->ecflags, gz->ecopts);
}
-static long
-gzfile_fill(struct gzfile *gz, long len)
+static VALUE
+gzfile_read(struct gzfile *gz, int len)
{
+ VALUE dst;
+
if (len < 0)
- rb_raise(rb_eArgError, "negative length %ld given", len);
+ rb_raise(rb_eArgError, "negative length %d given", len);
if (len == 0)
- return 0;
+ return rb_str_new(0, 0);
while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
gzfile_read_more(gz);
}
@@ -2694,34 +2195,24 @@ gzfile_fill(struct gzfile *gz, long len)
if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
gzfile_check_footer(gz);
}
- return -1;
+ return Qnil;
}
- return len < gz->z.buf_filled ? len : gz->z.buf_filled;
-}
-static VALUE
-gzfile_read(struct gzfile *gz, long len)
-{
- VALUE dst;
-
- len = gzfile_fill(gz, len);
- if (len == 0) return rb_str_new(0, 0);
- if (len < 0) return Qnil;
dst = zstream_shift_buffer(&gz->z, len);
- if (!NIL_P(dst)) gzfile_calc_crc(gz, dst);
+ gzfile_calc_crc(gz, dst);
return dst;
}
static VALUE
-gzfile_readpartial(struct gzfile *gz, long len, VALUE outbuf)
+gzfile_readpartial(struct gzfile *gz, int len, VALUE outbuf)
{
VALUE dst;
if (len < 0)
- rb_raise(rb_eArgError, "negative length %ld given", len);
+ rb_raise(rb_eArgError, "negative length %d given", len);
if (!NIL_P(outbuf))
- OBJ_TAINT(outbuf);
+ OBJ_TAINT(outbuf);
if (len == 0) {
if (NIL_P(outbuf))
@@ -2771,7 +2262,6 @@ gzfile_read_all(struct gzfile *gz)
}
dst = zstream_detach_buffer(&gz->z);
- if (NIL_P(dst)) return dst;
gzfile_calc_crc(gz, dst);
OBJ_TAINT(dst);
return gzfile_newstr(gz, dst);
@@ -2797,6 +2287,7 @@ gzfile_getc(struct gzfile *gz)
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);
@@ -2805,7 +2296,7 @@ gzfile_getc(struct gzfile *gz)
se = sp + gz->z.buf_filled;
ds = dp = (unsigned char *)gz->cbuf;
de = (unsigned char *)ds + GZFILE_CBUF_CAPA;
- (void)rb_econv_convert(gz->ec, &sp, se, &dp, de, ECONV_PARTIAL_INPUT|ECONV_AFTER_OUTPUT);
+ 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);
@@ -2818,13 +2309,12 @@ gzfile_getc(struct gzfile *gz)
buf = gz->z.buf;
len = rb_enc_mbclen(RSTRING_PTR(buf), RSTRING_END(buf), gz->enc);
dst = gzfile_read(gz, len);
- if (NIL_P(dst)) return dst;
return gzfile_newstr(gz, dst);
}
}
static void
-gzfile_ungets(struct gzfile *gz, const Bytef *b, long len)
+gzfile_ungets(struct gzfile *gz, const Bytef *b, int len)
{
zstream_buffer_ungets(&gz->z, b, len);
gz->ungetc+=len;
@@ -2898,6 +2388,8 @@ gzfile_reader_rewind(struct gzfile *gz)
gzfile_reset(gz);
}
+extern VALUE rb_str_resurrect(VALUE str);
+
static VALUE
gzfile_reader_get_unused(struct gzfile *gz)
{
@@ -2938,49 +2430,9 @@ get_gzfile(VALUE obj)
* Zlib::GzipReader for reading, and Zlib::GzipWriter for writing.
*
* GzipReader should be used by associating an IO, or IO-like, object.
- *
- * == Method Catalogue
- *
- * - ::wrap
- * - ::open (Zlib::GzipReader::open and Zlib::GzipWriter::open)
- * - #close
- * - #closed?
- * - #comment
- * - comment= (Zlib::GzipWriter#comment=)
- * - #crc
- * - eof? (Zlib::GzipReader#eof?)
- * - #finish
- * - #level
- * - lineno (Zlib::GzipReader#lineno)
- * - lineno= (Zlib::GzipReader#lineno=)
- * - #mtime
- * - mtime= (Zlib::GzipWriter#mtime=)
- * - #orig_name
- * - orig_name (Zlib::GzipWriter#orig_name=)
- * - #os_code
- * - path (when the underlying IO supports #path)
- * - #sync
- * - #sync=
- * - #to_io
- *
- * (due to internal structure, documentation may appear under Zlib::GzipReader
- * or Zlib::GzipWriter)
*/
-typedef struct {
- int argc;
- VALUE *argv;
- VALUE klass;
-} new_wrap_arg_t;
-
-static VALUE
-new_wrap(VALUE tmp)
-{
- new_wrap_arg_t *arg = (new_wrap_arg_t *)tmp;
- return rb_class_new_instance(arg->argc, arg->argv, arg->klass);
-}
-
static VALUE
gzfile_ensure_close(VALUE obj)
{
@@ -2993,26 +2445,20 @@ gzfile_ensure_close(VALUE obj)
return Qnil;
}
+/*
+ * call-seq: Zlib::GzipFile.wrap(io) { |gz| ... }
+ *
+ * Creates a GzipFile object associated with +io+, and
+ * executes the block with the newly created GzipFile object,
+ * just like File.open. The GzipFile object will be closed
+ * automatically after executing the block. If you want to keep
+ * the associated IO object opening, you may call
+ * +Zlib::GzipFile#finish+ method in the block.
+ */
static VALUE
-gzfile_wrap(int argc, VALUE *argv, VALUE klass, int close_io_on_error)
+rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
{
- VALUE obj;
-
- if (close_io_on_error) {
- int state = 0;
- new_wrap_arg_t arg;
- arg.argc = argc;
- arg.argv = argv;
- arg.klass = klass;
- obj = rb_protect(new_wrap, (VALUE)&arg, &state);
- if (state) {
- rb_io_close(argv[0]);
- rb_jump_tag(state);
- }
- }
- else {
- obj = rb_class_new_instance(argc, argv, klass);
- }
+ VALUE obj = rb_class_new_instance(argc, argv, klass);
if (rb_block_given_p()) {
return rb_ensure(rb_yield, obj, gzfile_ensure_close, obj);
@@ -3023,29 +2469,6 @@ gzfile_wrap(int argc, VALUE *argv, VALUE klass, int close_io_on_error)
}
/*
- * Document-method: Zlib::GzipFile.wrap
- *
- * call-seq:
- * Zlib::GzipReader.wrap(io, ...) { |gz| ... }
- * Zlib::GzipWriter.wrap(io, ...) { |gz| ... }
- *
- * Creates a GzipReader or GzipWriter associated with +io+, passing in any
- * necessary extra options, and executes the block with the newly created
- * object just like File.open.
- *
- * The GzipFile object will be closed automatically after executing the block.
- * If you want to keep the associated IO object open, you may call
- * Zlib::GzipFile#finish method in the block.
- */
-static VALUE
-rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
-{
- return gzfile_wrap(argc, argv, klass, 0);
-}
-
-/*
- * Document-method: Zlib::GzipFile.open
- *
* See Zlib::GzipReader#open and Zlib::GzipWriter#open.
*/
static VALUE
@@ -3059,12 +2482,10 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
filename = argv[0];
io = rb_file_open_str(filename, mode);
argv[0] = io;
- return gzfile_wrap(argc, argv, klass, 1);
+ return rb_gzfile_s_wrap(argc, argv, klass);
}
/*
- * Document-method: Zlib::GzipFile#to_io
- *
* Same as IO.
*/
static VALUE
@@ -3074,8 +2495,6 @@ rb_gzfile_to_io(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#crc
- *
* Returns CRC value of the uncompressed data.
*/
static VALUE
@@ -3085,8 +2504,6 @@ rb_gzfile_crc(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#mtime
- *
* Returns last modification time recorded in the gzip file header.
*/
static VALUE
@@ -3096,8 +2513,6 @@ rb_gzfile_mtime(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#level
- *
* Returns compression level.
*/
static VALUE
@@ -3107,8 +2522,6 @@ rb_gzfile_level(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#os_code
- *
* Returns OS code number recorded in the gzip file header.
*/
static VALUE
@@ -3118,8 +2531,6 @@ rb_gzfile_os_code(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#orig_name
- *
* Returns original filename recorded in the gzip file header, or +nil+ if
* original filename is not present.
*/
@@ -3135,8 +2546,6 @@ rb_gzfile_orig_name(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#comment
- *
* Returns comments recorded in the gzip file header, or nil if the comments
* is not present.
*/
@@ -3152,9 +2561,7 @@ rb_gzfile_comment(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#lineno
- *
- * The line number of the last row read from this file.
+ * ???
*/
static VALUE
rb_gzfile_lineno(VALUE obj)
@@ -3163,9 +2570,7 @@ rb_gzfile_lineno(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#lineno=
- *
- * Specify line number of the last row read from this file.
+ * ???
*/
static VALUE
rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
@@ -3176,10 +2581,7 @@ rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
}
/*
- * Document-method: Zlib::GzipWriter#mtime=
- *
- * Specify the modification time (+mtime+) in the gzip header.
- * Using a Fixnum or Integer
+ * ???
*/
static VALUE
rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
@@ -3202,9 +2604,7 @@ rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
}
/*
- * Document-method: Zlib::GzipFile#orig_name=
- *
- * Specify the original name (+str+) in the gzip header.
+ * ???
*/
static VALUE
rb_gzfile_set_orig_name(VALUE obj, VALUE str)
@@ -3226,9 +2626,7 @@ rb_gzfile_set_orig_name(VALUE obj, VALUE str)
}
/*
- * Document-method: Zlib::GzipFile#comment=
- *
- * Specify the comment (+str+) in the gzip header.
+ * ???
*/
static VALUE
rb_gzfile_set_comment(VALUE obj, VALUE str)
@@ -3250,8 +2648,6 @@ rb_gzfile_set_comment(VALUE obj, VALUE str)
}
/*
- * Document-method: Zlib::GzipFile#close
- *
* Closes the GzipFile object. This method calls close method of the
* associated IO object. Returns the associated IO object.
*/
@@ -3267,8 +2663,6 @@ rb_gzfile_close(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#finish
- *
* Closes the GzipFile object. Unlike Zlib::GzipFile#close, this method never
* calls the close method of the associated IO object. Returns the associated IO
* object.
@@ -3285,10 +2679,7 @@ rb_gzfile_finish(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#closed?
- *
- * Same as IO#closed?
- *
+ * Same as IO.
*/
static VALUE
rb_gzfile_closed_p(VALUE obj)
@@ -3299,9 +2690,7 @@ rb_gzfile_closed_p(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#eof?
- *
- * Returns +true+ or +false+ whether the stream has reached the end.
+ * ???
*/
static VALUE
rb_gzfile_eof_p(VALUE obj)
@@ -3311,10 +2700,7 @@ rb_gzfile_eof_p(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#sync
- *
- * Same as IO#sync
- *
+ * Same as IO.
*/
static VALUE
rb_gzfile_sync(VALUE obj)
@@ -3323,8 +2709,6 @@ rb_gzfile_sync(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#sync=
- *
* call-seq: sync = flag
*
* Same as IO. If flag is +true+, the associated IO object must respond to the
@@ -3346,9 +2730,7 @@ rb_gzfile_set_sync(VALUE obj, VALUE mode)
}
/*
- * Document-method: Zlib::GzipFile#total_in
- *
- * Total number of input bytes read so far.
+ * ???
*/
static VALUE
rb_gzfile_total_in(VALUE obj)
@@ -3357,9 +2739,7 @@ rb_gzfile_total_in(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#total_out
- *
- * Total number of output bytes output so far.
+ * ???
*/
static VALUE
rb_gzfile_total_out(VALUE obj)
@@ -3369,7 +2749,7 @@ rb_gzfile_total_out(VALUE obj)
}
/*
- * Document-method: Zlib::GzipFile#path
+ * Document-method: path
*
* call-seq: path
*
@@ -3388,7 +2768,7 @@ static void
rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
{
if (!NIL_P(opts)) {
- rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2, NULL);
+ rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2);
}
if (gz->enc2) {
gz->ecflags = rb_econv_prepare_opts(opts, &opts);
@@ -3406,7 +2786,7 @@ rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
* Zlib::GzipWriter is a class for writing gzipped files. GzipWriter should
* be used with an instance of IO, or IO-like, object.
*
- * Following two example generate the same result.
+ * For example:
*
* Zlib::GzipWriter.open('hoge.gz') do |gz|
* gz.write 'jugemu jugemu gokou no surikire...'
@@ -3418,14 +2798,8 @@ rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
* gz.close
* end
*
- * To make like gzip(1) does, run following:
- *
- * orig = 'hoge.txt'
- * Zlib::GzipWriter.open('hoge.gz') do |gz|
- * gz.mtime = File.mtime(orig)
- * gz.orig_name = orig
- * gz.write IO.binread(orig)
- * end
+ * # TODO: test these. Are they equivalent? Can GzipWriter.new take a
+ * # block?
*
* NOTE: Due to the limitation of Ruby's finalizer, you must explicitly close
* GzipWriter objects by Zlib::GzipWriter#close etc. Otherwise, GzipWriter
@@ -3453,17 +2827,12 @@ rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
}
/*
- * call-seq:
- * Zlib::GzipWriter.new(io, level = nil, strategy = nil, options = {})
+ * call-seq: Zlib::GzipWriter.new(io, level, strategy)
*
* Creates a GzipWriter object associated with +io+. +level+ and +strategy+
* should be the same as the arguments of Zlib::Deflate.new. The GzipWriter
- * object writes gzipped data to +io+. +io+ must respond to the
- * +write+ method that behaves the same as IO#write.
- *
- * The +options+ hash may be used to set the encoding of the data.
- * +:external_encoding+, +:internal_encoding+ and +:encoding+ may be set as in
- * IO::new.
+ * object writes gzipped data to +io+. At least, +io+ must respond to the
+ * +write+ method that behaves same as write method in IO class.
*/
static VALUE
rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
@@ -3535,7 +2904,7 @@ rb_gzwriter_write(VALUE obj, VALUE str)
{
struct gzfile *gz = get_gzfile(obj);
- if (!RB_TYPE_P(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);
@@ -3587,7 +2956,7 @@ rb_gzwriter_putc(VALUE obj, VALUE ch)
* Document-class: Zlib::GzipReader
*
* Zlib::GzipReader is the class for reading a gzipped file. GzipReader should
- * be used an IO, or -IO-like, object.
+ * be used an IO, or -IO-lie, object.
*
* Zlib::GzipReader.open('hoge.gz') {|gz|
* print gz.read
@@ -3599,6 +2968,9 @@ rb_gzwriter_putc(VALUE obj, VALUE ch)
* gz.close
* end
*
+ * # TODO: test these. Are they equivalent? Can GzipReader.new take a
+ * # block?
+ *
* == Method Catalogue
*
* The following methods in Zlib::GzipReader are just like their counterparts
@@ -3642,8 +3014,6 @@ rb_gzreader_s_allocate(VALUE klass)
}
/*
- * Document-method: Zlib::GzipReader.open
- *
* call-seq: Zlib::GzipReader.open(filename) {|gz| ... }
*
* Opens a file specified by +filename+ as a gzipped file, and returns a
@@ -3657,18 +3027,11 @@ rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
}
/*
- * Document-method: Zlib::GzipReader.new
- *
- * call-seq:
- * Zlib::GzipReader.new(io, options = {})
+ * call-seq: Zlib::GzipReader.new(io)
*
* Creates a GzipReader object associated with +io+. The GzipReader object reads
- * gzipped data from +io+, and parses/decompresses it. The +io+ must
- * have a +read+ method that behaves same as the IO#read.
- *
- * The +options+ hash may be used to set the encoding of the data.
- * +:external_encoding+, +:internal_encoding+ and +:encoding+ may be set as in
- * IO::new.
+ * gzipped data from +io+, and parses/decompresses them. At least, +io+ must have
+ * a +read+ method that behaves same as the +read+ method in IO class.
*
* If the gzip file header is incorrect, raises an Zlib::GzipFile::Error
* exception.
@@ -3681,7 +3044,11 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
int err;
Data_Get_Struct(obj, struct gzfile, gz);
- rb_scan_args(argc, argv, "1:", &io, &opt);
+ 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);
@@ -3702,8 +3069,6 @@ rb_gzreader_initialize(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#rewind
- *
* Resets the position of the file pointer to the point created the GzipReader
* object. The associated IO object needs to respond to the +seek+ method.
*/
@@ -3716,8 +3081,6 @@ rb_gzreader_rewind(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#unused
- *
* Returns the rest of the data which had read for parsing gzip format, or
* +nil+ if the whole gzip file is not parsed yet.
*/
@@ -3730,8 +3093,6 @@ rb_gzreader_unused(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#read
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3739,7 +3100,7 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
{
struct gzfile *gz = get_gzfile(obj);
VALUE vlen;
- long len;
+ int len;
rb_scan_args(argc, argv, "01", &vlen);
if (NIL_P(vlen)) {
@@ -3748,14 +3109,12 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
len = NUM2INT(vlen);
if (len < 0) {
- rb_raise(rb_eArgError, "negative length %ld given", len);
+ rb_raise(rb_eArgError, "negative length %d given", len);
}
return gzfile_read(gz, len);
}
/*
- * Document-method: Zlib::GzipReader#readpartial
- *
* call-seq:
* gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
*
@@ -3770,13 +3129,13 @@ rb_gzreader_readpartial(int argc, VALUE *argv, VALUE obj)
{
struct gzfile *gz = get_gzfile(obj);
VALUE vlen, outbuf;
- long len;
+ int len;
rb_scan_args(argc, argv, "11", &vlen, &outbuf);
len = NUM2INT(vlen);
if (len < 0) {
- rb_raise(rb_eArgError, "negative length %ld given", len);
+ rb_raise(rb_eArgError, "negative length %d given", len);
}
if (!NIL_P(outbuf))
Check_Type(outbuf, T_STRING);
@@ -3784,8 +3143,6 @@ rb_gzreader_readpartial(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#getc
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3797,8 +3154,6 @@ rb_gzreader_getc(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#readchar
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3813,8 +3168,6 @@ rb_gzreader_readchar(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#getbyte
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3831,8 +3184,6 @@ rb_gzreader_getbyte(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#readbyte
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3847,8 +3198,6 @@ rb_gzreader_readbyte(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#each_char
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3865,8 +3214,6 @@ rb_gzreader_each_char(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#each_byte
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3883,22 +3230,6 @@ rb_gzreader_each_byte(VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#bytes
- *
- * This is a deprecated alias for <code>each_byte</code>.
- */
-static VALUE
-rb_gzreader_bytes(VALUE obj)
-{
- rb_warn("Zlib::GzipReader#bytes is deprecated; use #each_byte instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(obj, ID2SYM(rb_intern("each_byte")), 0, 0);
- return rb_gzreader_each_byte(obj);
-}
-
-/*
- * Document-method: Zlib::GzipReader#ungetc
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3918,8 +3249,6 @@ rb_gzreader_ungetc(VALUE obj, VALUE s)
}
/*
- * Document-method: Zlib::GzipReader#ungetbyte
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -3968,27 +3297,6 @@ rscheck(const char *rsptr, long rslen, VALUE rs)
rb_raise(rb_eRuntimeError, "rs modified");
}
-static long
-gzreader_charboundary(struct gzfile *gz, long n)
-{
- char *s = RSTRING_PTR(gz->z.buf);
- char *e = s + gz->z.buf_filled;
- char *p = rb_enc_left_char_head(s, s + n, e, gz->enc);
- long l = p - s;
- if (l < n) {
- n = rb_enc_precise_mbclen(p, e, gz->enc);
- if (MBCLEN_NEEDMORE_P(n)) {
- if ((l = gzfile_fill(gz, l + MBCLEN_NEEDMORE_LEN(n))) > 0) {
- return l;
- }
- }
- else if (MBCLEN_CHARFOUND_P(n)) {
- return l + MBCLEN_CHARFOUND_LEN(n);
- }
- }
- return n;
-}
-
static VALUE
gzreader_gets(int argc, VALUE *argv, VALUE obj)
{
@@ -3997,58 +3305,24 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
VALUE dst;
const char *rsptr;
char *p, *res;
- long rslen, n, limit = -1;
+ long rslen, n;
int rspara;
- rb_encoding *enc = gz->enc;
- int maxlen = rb_enc_mbmaxlen(enc);
if (argc == 0) {
rs = rb_rs;
}
else {
- VALUE lim, tmp;
-
- rb_scan_args(argc, argv, "11", &rs, &lim);
- if (!NIL_P(lim)) {
- if (!NIL_P(rs)) StringValue(rs);
- }
- else if (!NIL_P(rs)) {
- tmp = rb_check_string_type(rs);
- if (NIL_P(tmp)) {
- lim = rs;
- rs = rb_rs;
- }
- else {
- rs = tmp;
- }
- }
- if (!NIL_P(lim)) {
- limit = NUM2LONG(lim);
- if (limit == 0) return rb_str_new(0,0);
+ rb_scan_args(argc, argv, "1", &rs);
+ if (!NIL_P(rs)) {
+ Check_Type(rs, T_STRING);
}
}
if (NIL_P(rs)) {
- if (limit < 0) {
- dst = gzfile_read_all(gz);
- if (RSTRING_LEN(dst) == 0) return Qnil;
- }
- else if ((n = gzfile_fill(gz, limit)) <= 0) {
+ dst = gzfile_read_all(gz);
+ if (RSTRING_LEN(dst) != 0) gz->lineno++;
+ else
return Qnil;
- }
- else {
- if (maxlen > 1 && n >= limit && !GZFILE_IS_FINISHED(gz)) {
- n = gzreader_charboundary(gz, n);
- }
- else {
- n = limit;
- }
- dst = zstream_shift_buffer(&gz->z, n);
- if (NIL_P(dst)) return dst;
- gzfile_calc_crc(gz, dst);
- dst = gzfile_newstr(gz, dst);
- }
- gz->lineno++;
return dst;
}
@@ -4077,22 +3351,15 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
p = RSTRING_PTR(gz->z.buf);
n = rslen;
for (;;) {
- long filled;
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;
}
if (!rspara) rscheck(rsptr, rslen, rs);
- filled = gz->z.buf_filled;
- if (limit > 0 && filled >= limit) {
- filled = limit;
- }
- res = memchr(p, rsptr[0], (filled - n + 1));
+ res = memchr(p, rsptr[0], (gz->z.buf_filled - n + 1));
if (!res) {
- n = filled;
- if (limit > 0 && filled >= limit) break;
- n++;
+ n = gz->z.buf_filled + 1;
} else {
n += (long)(res - p);
p = res;
@@ -4100,13 +3367,9 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
p++, n++;
}
}
- if (maxlen > 1 && n == limit && (gz->z.buf_filled > n || !ZSTREAM_IS_FINISHED(&gz->z))) {
- n = gzreader_charboundary(gz, n);
- }
gz->lineno++;
dst = gzfile_read(gz, n);
- if (NIL_P(dst)) return dst;
if (rspara) {
gzreader_skip_linebreaks(gz);
}
@@ -4115,8 +3378,6 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#gets
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -4131,8 +3392,6 @@ rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#readline
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -4147,8 +3406,6 @@ rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#each
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -4165,22 +3422,6 @@ rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
}
/*
- * Document-method: Zlib::GzipReader#lines
- *
- * This is a deprecated alias for <code>each_line</code>.
- */
-static VALUE
-rb_gzreader_lines(int argc, VALUE *argv, VALUE obj)
-{
- rb_warn("Zlib::GzipReader#lines is deprecated; use #each_line instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(obj, ID2SYM(rb_intern("each_line")), argc, argv);
- return rb_gzreader_each(argc, argv, obj);
-}
-
-/*
- * Document-method: Zlib::GzipReader#readlines
- *
* See Zlib::GzipReader documentation for a description.
*/
static VALUE
@@ -4196,6 +3437,87 @@ rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
#endif /* GZIP_SUPPORT */
+
+
+/*
+ * The Zlib module contains several classes for compressing and decompressing
+ * streams, and for working with "gzip" files.
+ *
+ * == Classes
+ *
+ * Following are the classes that are most likely to be of interest to the
+ * user:
+ * Zlib::Inflate
+ * Zlib::Deflate
+ * Zlib::GzipReader
+ * Zlib::GzipWriter
+ *
+ * There are two important base classes for the classes above: Zlib::ZStream
+ * and Zlib::GzipFile. Everything else is an error class.
+ *
+ * == Constants
+ *
+ * Here's a list.
+ *
+ * Zlib::VERSION
+ * The Ruby/zlib version string.
+ *
+ * Zlib::ZLIB_VERSION
+ * The string which represents the version of zlib.h.
+ *
+ * Zlib::BINARY
+ * Zlib::ASCII
+ * Zlib::UNKNOWN
+ * The integers representing data types which Zlib::ZStream#data_type
+ * method returns.
+ *
+ * Zlib::NO_COMPRESSION
+ * Zlib::BEST_SPEED
+ * Zlib::BEST_COMPRESSION
+ * Zlib::DEFAULT_COMPRESSION
+ * The integers representing compression levels which are an argument
+ * for Zlib::Deflate.new, Zlib::Deflate#deflate, and so on.
+ *
+ * Zlib::FILTERED
+ * Zlib::HUFFMAN_ONLY
+ * Zlib::DEFAULT_STRATEGY
+ * The integers representing compression methods which are an argument
+ * for Zlib::Deflate.new and Zlib::Deflate#params.
+ *
+ * Zlib::DEF_MEM_LEVEL
+ * Zlib::MAX_MEM_LEVEL
+ * The integers representing memory levels which are an argument for
+ * Zlib::Deflate.new, Zlib::Deflate#params, and so on.
+ *
+ * Zlib::MAX_WBITS
+ * The default value of windowBits which is an argument for
+ * Zlib::Deflate.new and Zlib::Inflate.new.
+ *
+ * Zlib::NO_FLUSH
+ * Zlib::SYNC_FLUSH
+ * Zlib::FULL_FLUSH
+ * Zlib::FINISH
+ * The integers to control the output of the deflate stream, which are
+ * an argument for Zlib::Deflate#deflate and so on.
+ *
+ * Zlib::OS_CODE
+ * Zlib::OS_MSDOS
+ * Zlib::OS_AMIGA
+ * Zlib::OS_VMS
+ * Zlib::OS_UNIX
+ * Zlib::OS_VMCMS
+ * Zlib::OS_ATARI
+ * Zlib::OS_OS2
+ * Zlib::OS_MACOS
+ * Zlib::OS_ZSYSTEM
+ * Zlib::OS_CPM
+ * Zlib::OS_TOPS20
+ * Zlib::OS_WIN32
+ * Zlib::OS_QDOS
+ * Zlib::OS_RISCOS
+ * Zlib::OS_UNKNOWN
+ * The return values of Zlib::GzipFile#os_code method.
+ */
void
Init_zlib()
{
@@ -4206,8 +3528,6 @@ Init_zlib()
mZlib = rb_define_module("Zlib");
- id_dictionaries = rb_intern("@dictionaries");
-
cZError = rb_define_class_under(mZlib, "Error", rb_eStandardError);
cStreamEnd = rb_define_class_under(mZlib, "StreamEnd", cZError);
cNeedDict = rb_define_class_under(mZlib, "NeedDict", cZError);
@@ -4224,9 +3544,7 @@ Init_zlib()
rb_define_module_function(mZlib, "crc32_combine", rb_zlib_crc32_combine, 3);
rb_define_module_function(mZlib, "crc_table", rb_zlib_crc_table, 0);
- /* The Ruby/zlib version string. */
rb_define_const(mZlib, "VERSION", rb_str_new2(RUBY_ZLIB_VERSION));
- /* The string which represents the version of zlib.h */
rb_define_const(mZlib, "ZLIB_VERSION", rb_str_new2(ZLIB_VERSION));
cZStream = rb_define_class_under(mZlib, "ZStream", rb_cObject);
@@ -4249,34 +3567,12 @@ Init_zlib()
rb_define_method(cZStream, "flush_next_in", rb_zstream_flush_next_in, 0);
rb_define_method(cZStream, "flush_next_out", rb_zstream_flush_next_out, 0);
- /* Represents binary data as guessed by deflate.
- *
- * See Zlib::Deflate#data_type. */
rb_define_const(mZlib, "BINARY", INT2FIX(Z_BINARY));
-
- /* Represents text data as guessed by deflate.
- *
- * NOTE: The underlying constant Z_ASCII was deprecated in favor of Z_TEXT
- * in zlib 1.2.2. New applications should not use this constant.
- *
- * See Zlib::Deflate#data_type. */
rb_define_const(mZlib, "ASCII", INT2FIX(Z_ASCII));
-
-#ifdef Z_TEXT
- /* Represents text data as guessed by deflate.
- *
- * See Zlib::Deflate#data_type. */
- rb_define_const(mZlib, "TEXT", INT2FIX(Z_TEXT));
-#endif
-
- /* Represents an unknown data type as guessed by deflate.
- *
- * See Zlib::Deflate#data_type. */
rb_define_const(mZlib, "UNKNOWN", INT2FIX(Z_UNKNOWN));
cDeflate = rb_define_class_under(mZlib, "Deflate", cZStream);
rb_define_singleton_method(cDeflate, "deflate", rb_deflate_s_deflate, -1);
- rb_define_singleton_method(mZlib, "deflate", rb_deflate_s_deflate, -1);
rb_define_alloc_func(cDeflate, rb_deflate_s_allocate);
rb_define_method(cDeflate, "initialize", rb_deflate_initialize, -1);
rb_define_method(cDeflate, "initialize_copy", rb_deflate_init_copy, 1);
@@ -4288,94 +3584,31 @@ Init_zlib()
cInflate = rb_define_class_under(mZlib, "Inflate", cZStream);
rb_define_singleton_method(cInflate, "inflate", rb_inflate_s_inflate, 1);
- rb_define_singleton_method(mZlib, "inflate", rb_inflate_s_inflate, 1);
rb_define_alloc_func(cInflate, rb_inflate_s_allocate);
rb_define_method(cInflate, "initialize", rb_inflate_initialize, -1);
- rb_define_method(cInflate, "add_dictionary", rb_inflate_add_dictionary, 1);
rb_define_method(cInflate, "inflate", rb_inflate_inflate, 1);
rb_define_method(cInflate, "<<", rb_inflate_addstr, 1);
rb_define_method(cInflate, "sync", rb_inflate_sync, 1);
rb_define_method(cInflate, "sync_point?", rb_inflate_sync_point_p, 0);
rb_define_method(cInflate, "set_dictionary", rb_inflate_set_dictionary, 1);
- /* No compression, passes through data untouched. Use this for appending
- * pre-compressed data to a deflate stream.
- */
rb_define_const(mZlib, "NO_COMPRESSION", INT2FIX(Z_NO_COMPRESSION));
- /* Fastest compression level, but with with lowest space savings. */
rb_define_const(mZlib, "BEST_SPEED", INT2FIX(Z_BEST_SPEED));
- /* Slowest compression level, but with the best space savings. */
rb_define_const(mZlib, "BEST_COMPRESSION", INT2FIX(Z_BEST_COMPRESSION));
- /* Default compression level which is a good trade-off between space and
- * time
- */
rb_define_const(mZlib, "DEFAULT_COMPRESSION",
INT2FIX(Z_DEFAULT_COMPRESSION));
- /* Deflate strategy for data produced by a filter (or predictor). The
- * effect of FILTERED is to force more Huffman codes and less string
- * matching; it is somewhat intermediate between DEFAULT_STRATEGY and
- * HUFFMAN_ONLY. Filtered data consists mostly of small values with a
- * somewhat random distribution.
- */
rb_define_const(mZlib, "FILTERED", INT2FIX(Z_FILTERED));
-
- /* Deflate strategy which uses Huffman codes only (no string matching). */
rb_define_const(mZlib, "HUFFMAN_ONLY", INT2FIX(Z_HUFFMAN_ONLY));
-
-#ifdef Z_RLE
- /* Deflate compression strategy designed to be almost as fast as
- * HUFFMAN_ONLY, but give better compression for PNG image data.
- */
- rb_define_const(mZlib, "RLE", INT2FIX(Z_RLE));
-#endif
-
-#ifdef Z_FIXED
- /* Deflate strategy which prevents the use of dynamic Huffman codes,
- * allowing for a simpler decoder for specialized applications.
- */
- rb_define_const(mZlib, "FIXED", INT2FIX(Z_FIXED));
-#endif
-
- /* Default deflate strategy which is used for normal data. */
rb_define_const(mZlib, "DEFAULT_STRATEGY", INT2FIX(Z_DEFAULT_STRATEGY));
- /* The maximum size of the zlib history buffer. Note that zlib allows
- * larger values to enable different inflate modes. See Zlib::Inflate.new
- * for details.
- */
rb_define_const(mZlib, "MAX_WBITS", INT2FIX(MAX_WBITS));
-
- /* The default memory level for allocating zlib deflate compression state.
- */
rb_define_const(mZlib, "DEF_MEM_LEVEL", INT2FIX(DEF_MEM_LEVEL));
-
- /* The maximum memory level for allocating zlib deflate compression state.
- */
rb_define_const(mZlib, "MAX_MEM_LEVEL", INT2FIX(MAX_MEM_LEVEL));
- /* NO_FLUSH is the default flush method and allows deflate to decide how
- * much data to accumulate before producing output in order to maximize
- * compression.
- */
rb_define_const(mZlib, "NO_FLUSH", INT2FIX(Z_NO_FLUSH));
-
- /* The SYNC_FLUSH method flushes all pending output to the output buffer
- * and the output is aligned on a byte boundary. Flushing may degrade
- * compression so it should be used only when necessary, such as at a
- * request or response boundary for a network stream.
- */
rb_define_const(mZlib, "SYNC_FLUSH", INT2FIX(Z_SYNC_FLUSH));
-
- /* Flushes all output as with SYNC_FLUSH, and the compression state is
- * reset so that decompression can restart from this point if previous
- * compressed data has been damaged or if random access is desired. Like
- * SYNC_FLUSH, using FULL_FLUSH too often can seriously degrade
- * compression.
- */
rb_define_const(mZlib, "FULL_FLUSH", INT2FIX(Z_FULL_FLUSH));
-
- /* Processes all pending input and flushes pending output. */
rb_define_const(mZlib, "FINISH", INT2FIX(Z_FINISH));
#if GZIP_SUPPORT
@@ -4386,15 +3619,10 @@ Init_zlib()
id_seek = rb_intern("seek");
id_close = rb_intern("close");
id_path = rb_intern("path");
- id_input = rb_intern("@input");
cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
cGzError = rb_define_class_under(cGzipFile, "Error", cZError);
- /* input gzipped string */
- rb_define_attr(cGzError, "input", 1, 0);
- rb_define_method(cGzError, "inspect", gzfile_error_inspect, 0);
-
cNoFooter = rb_define_class_under(cGzipFile, "NoFooter", cGzError);
cCRCError = rb_define_class_under(cGzipFile, "CRCError", cGzError);
cLengthError = rb_define_class_under(cGzipFile,"LengthError",cGzError);
@@ -4453,47 +3681,32 @@ Init_zlib()
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_bytes, 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_lines, -1);
+ rb_define_method(cGzipReader, "lines", rb_gzreader_each, -1);
rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
- /* The OS code of current host */
rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
- /* OS code for MSDOS hosts */
rb_define_const(mZlib, "OS_MSDOS", INT2FIX(OS_MSDOS));
- /* OS code for Amiga hosts */
rb_define_const(mZlib, "OS_AMIGA", INT2FIX(OS_AMIGA));
- /* OS code for VMS hosts */
rb_define_const(mZlib, "OS_VMS", INT2FIX(OS_VMS));
- /* OS code for UNIX hosts */
rb_define_const(mZlib, "OS_UNIX", INT2FIX(OS_UNIX));
- /* OS code for Atari hosts */
rb_define_const(mZlib, "OS_ATARI", INT2FIX(OS_ATARI));
- /* OS code for OS2 hosts */
rb_define_const(mZlib, "OS_OS2", INT2FIX(OS_OS2));
- /* OS code for Mac OS hosts */
rb_define_const(mZlib, "OS_MACOS", INT2FIX(OS_MACOS));
- /* OS code for TOPS-20 hosts */
rb_define_const(mZlib, "OS_TOPS20", INT2FIX(OS_TOPS20));
- /* OS code for Win32 hosts */
rb_define_const(mZlib, "OS_WIN32", INT2FIX(OS_WIN32));
- /* OS code for VM OS hosts */
+
rb_define_const(mZlib, "OS_VMCMS", INT2FIX(OS_VMCMS));
- /* OS code for Z-System hosts */
rb_define_const(mZlib, "OS_ZSYSTEM", INT2FIX(OS_ZSYSTEM));
- /* OS code for CP/M hosts */
rb_define_const(mZlib, "OS_CPM", INT2FIX(OS_CPM));
- /* OS code for QDOS hosts */
rb_define_const(mZlib, "OS_QDOS", INT2FIX(OS_QDOS));
- /* OS code for RISC OS hosts */
rb_define_const(mZlib, "OS_RISCOS", INT2FIX(OS_RISCOS));
- /* OS code for unknown hosts */
rb_define_const(mZlib, "OS_UNKNOWN", INT2FIX(OS_UNKNOWN));
#endif /* GZIP_SUPPORT */
@@ -4521,77 +3734,6 @@ Init_zlib()
*/
/*
- * Document-class: Zlib::StreamEnd
- *
- * Subclass of Zlib::Error
- *
- * When zlib returns a Z_STREAM_END
- * is return if the end of the compressed data has been reached
- * and all uncompressed out put has been produced.
- *
- */
-
-/*
- * Document-class: Zlib::NeedDict
- *
- * Subclass of Zlib::Error
- *
- * When zlib returns a Z_NEED_DICT
- * if a preset dictionary is needed at this point.
- *
- * Used by Zlib::Inflate.inflate and <tt>Zlib.inflate</tt>
- */
-
-/*
- * Document-class: Zlib::VersionError
- *
- * Subclass of Zlib::Error
- *
- * When zlib returns a Z_VERSION_ERROR,
- * usually if the zlib library version is incompatible with the
- * version assumed by the caller.
- *
- */
-
-/*
- * Document-class: Zlib::MemError
- *
- * Subclass of Zlib::Error
- *
- * When zlib returns a Z_MEM_ERROR,
- * usually if there was not enough memory.
- *
- */
-
-/*
- * Document-class: Zlib::StreamError
- *
- * Subclass of Zlib::Error
- *
- * When zlib returns a Z_STREAM_ERROR,
- * usually if the stream state was inconsistent.
- *
- */
-
-/*
- * Document-class: Zlib::BufError
- *
- * Subclass of Zlib::Error when zlib returns a Z_BUF_ERROR.
- *
- * Usually if no progress is possible.
- *
- */
-
-/*
- * Document-class: Zlib::DataError
- *
- * Subclass of Zlib::Error when zlib returns a Z_DATA_ERROR.
- *
- * Usually if a stream was prematurely freed.
- *
- */
-
-/*
* Document-class: Zlib::GzipFile::Error
*
* Base class of errors that occur when processing GZIP files.
diff --git a/file.c b/file.c
index 96544766a9..b4675ef6a4 100644
--- a/file.c
+++ b/file.c
@@ -17,14 +17,12 @@
#ifdef __CYGWIN__
#include <windows.h>
#include <sys/cygwin.h>
-#include <wchar.h>
#endif
#include "ruby/ruby.h"
#include "ruby/io.h"
#include "ruby/util.h"
#include "dln.h"
-#include "internal.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -60,13 +58,6 @@ int flock(int, int);
#include <sys/types.h>
#include <sys/stat.h>
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/utime.h"
-# include "nacl/stat.h"
-# include "nacl/unistd.h"
-#endif
-
-
#ifdef HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
@@ -75,39 +66,33 @@ int flock(int, int);
#include <fcntl.h>
#endif
-#if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
#if !defined HAVE_LSTAT && !defined lstat
#define lstat stat
#endif
/* define system APIs */
#ifdef _WIN32
-#define STAT(p, s) rb_w32_ustati64((p), (s))
+#define STAT(p, s) rb_w32_ustati64(p, s)
#undef lstat
-#define lstat(p, s) rb_w32_ustati64((p), (s))
+#define lstat(p, s) rb_w32_ustati64(p, s)
#undef access
-#define access(p, m) rb_w32_uaccess((p), (m))
+#define access(p, m) rb_w32_uaccess(p, m)
#undef chmod
-#define chmod(p, m) rb_w32_uchmod((p), (m))
+#define chmod(p, m) rb_w32_uchmod(p, m)
#undef chown
-#define chown(p, o, g) rb_w32_uchown((p), (o), (g))
+#define chown(p, o, g) rb_w32_uchown(p, o, g)
#undef utime
-#define utime(p, t) rb_w32_uutime((p), (t))
+#define utime(p, t) rb_w32_uutime(p, t)
#undef link
-#define link(f, t) rb_w32_ulink((f), (t))
+#define link(f, t) rb_w32_ulink(f, t)
#undef unlink
#define unlink(p) rb_w32_uunlink(p)
#undef rename
-#define rename(f, t) rb_w32_urename((f), (t))
+#define rename(f, t) rb_w32_urename(f, t)
#else
-#define STAT(p, s) stat((p), (s))
+#define STAT(p, s) stat(p, s)
#endif
-#define rb_sys_fail_path(path) rb_sys_fail_str(path)
-
#if defined(__BEOS__) || defined(__HAIKU__) /* should not change ID if -1 */
static int
be_chown(const char *path, uid_t owner, gid_t group)
@@ -139,7 +124,7 @@ VALUE rb_cFile;
VALUE rb_mFileTest;
VALUE rb_cStat;
-#define insecure_obj_p(obj, level) ((level) >= 4 || ((level) > 0 && OBJ_TAINTED(obj)))
+#define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj)))
static VALUE
file_path_convert(VALUE name)
@@ -150,29 +135,16 @@ file_path_convert(VALUE name)
if (rb_default_internal_encoding() != NULL
&& rb_usascii_encoding() != fname_encoding
&& rb_ascii8bit_encoding() != fname_encoding
- && (fs_encoding = rb_filesystem_encoding()) != fname_encoding
- && !rb_enc_str_asciionly_p(name)) {
+ && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) {
/* Don't call rb_filesystem_encoding() before US-ASCII and ASCII-8BIT */
- /* fs_encoding should be ascii compatible */
name = rb_str_conv_enc(name, fname_encoding, fs_encoding);
}
#endif
return name;
}
-static rb_encoding *
-check_path_encoding(VALUE str)
-{
- rb_encoding *enc = rb_enc_get(str);
- if (!rb_enc_asciicompat(enc)) {
- rb_raise(rb_eEncCompatError, "path name must be ASCII-compatible (%s): %"PRIsVALUE,
- rb_enc_name(enc), rb_str_inspect(str));
- }
- return enc;
-}
-
-VALUE
-rb_get_path_check_to_string(VALUE obj, int level)
+static VALUE
+rb_get_path_check(VALUE obj, int level)
{
VALUE tmp;
ID to_path;
@@ -181,39 +153,22 @@ rb_get_path_check_to_string(VALUE obj, int level)
rb_insecure_operation();
}
- if (RB_TYPE_P(obj, T_STRING)) {
- return obj;
- }
CONST_ID(to_path, "to_path");
tmp = rb_check_funcall(obj, to_path, 0, 0);
if (tmp == Qundef) {
tmp = obj;
}
StringValue(tmp);
- return tmp;
-}
-VALUE
-rb_get_path_check_convert(VALUE obj, VALUE tmp, int level)
-{
tmp = file_path_convert(tmp);
+ StringValueCStr(tmp);
if (obj != tmp && insecure_obj_p(tmp, level)) {
rb_insecure_operation();
}
-
- check_path_encoding(tmp);
- StringValueCStr(tmp);
-
+ rb_enc_check(tmp, rb_enc_from_encoding(rb_usascii_encoding()));
return rb_str_new4(tmp);
}
-static VALUE
-rb_get_path_check(VALUE obj, int level)
-{
- VALUE tmp = rb_get_path_check_to_string(obj, level);
- return rb_get_path_check_convert(obj, tmp, level);
-}
-
VALUE
rb_get_path_no_checksafe(VALUE obj)
{
@@ -246,18 +201,16 @@ rb_str_encode_ospath(VALUE path)
}
static long
-apply2files(void (*func)(const char *, VALUE, void *), VALUE vargs, void *arg)
+apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg)
{
long i;
volatile VALUE path;
rb_secure(4);
for (i=0; i<RARRAY_LEN(vargs); i++) {
- const char *s;
path = rb_get_path(RARRAY_PTR(vargs)[i]);
path = rb_str_encode_ospath(path);
- s = RSTRING_PTR(path);
- (*func)(s, path, arg);
+ (*func)(StringValueCStr(path), arg);
}
return RARRAY_LEN(vargs);
@@ -294,7 +247,7 @@ stat_memsize(const void *p)
static const rb_data_type_t stat_data_type = {
"stat",
- {NULL, RUBY_TYPED_DEFAULT_FREE, stat_memsize,},
+ NULL, RUBY_TYPED_DEFAULT_FREE, stat_memsize,
};
static VALUE
@@ -330,10 +283,8 @@ static struct timespec stat_mtimespec(struct stat *st);
* call-seq:
* stat <=> other_stat -> -1, 0, 1, nil
*
- * Compares File::Stat objects by comparing their respective modification
- * times.
- *
- * +nil+ is returned if the two values are incomparable.
+ * Compares <code>File::Stat</code> objects by comparing their
+ * respective modification times.
*
* f1 = File.new("f1", "w")
* sleep 1
@@ -533,7 +484,7 @@ static VALUE
rb_stat_rdev(VALUE self)
{
#ifdef HAVE_ST_RDEV
- return DEVT2NUM(get_stat(self)->st_rdev);
+ return ULONG2NUM(get_stat(self)->st_rdev);
#else
return Qnil;
#endif
@@ -554,7 +505,8 @@ static VALUE
rb_stat_rdev_major(VALUE self)
{
#if defined(HAVE_ST_RDEV) && defined(major)
- return DEVT2NUM(major(get_stat(self)->st_rdev));
+ long rdev = get_stat(self)->st_rdev;
+ return ULONG2NUM(major(rdev));
#else
return Qnil;
#endif
@@ -575,7 +527,8 @@ static VALUE
rb_stat_rdev_minor(VALUE self)
{
#if defined(HAVE_ST_RDEV) && defined(minor)
- return DEVT2NUM(minor(get_stat(self)->st_rdev));
+ long rdev = get_stat(self)->st_rdev;
+ return ULONG2NUM(minor(rdev));
#else
return Qnil;
#endif
@@ -755,8 +708,6 @@ rb_stat_mtime(VALUE self)
* directory information about the file was changed, not the file
* itself).
*
- * Note that on Windows (NTFS), returns creation time (birth time).
- *
* File.stat("testfile").ctime #=> Wed Apr 09 08:53:14 CDT 2003
*
*/
@@ -877,17 +828,15 @@ w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
VALUE tmp;
WCHAR *ptr;
int len;
- VALUE v;
-
FilePathValue(*file);
tmp = rb_str_encode_ospath(*file);
len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, NULL, 0);
- ptr = ALLOCV_N(WCHAR, v, len);
+ ptr = ALLOCA_N(WCHAR, len);
MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, ptr, len);
f = CreateFileW(ptr, 0,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
- FILE_FLAG_BACKUP_SEMANTICS, NULL);
- ALLOCV_END(v);
+ rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS,
+ NULL);
if (f == INVALID_HANDLE_VALUE) return f;
ret = f;
}
@@ -919,7 +868,7 @@ rb_file_s_stat(VALUE klass, VALUE fname)
rb_secure(4);
FilePathValue(fname);
if (rb_stat(fname, &st) < 0) {
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return stat_new(&st);
}
@@ -945,6 +894,7 @@ rb_io_stat(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);
@@ -976,7 +926,7 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
FilePathValue(fname);
fname = rb_str_encode_ospath(fname);
if (lstat(StringValueCStr(fname), &st) == -1) {
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return stat_new(&st);
#else
@@ -1022,48 +972,30 @@ rb_file_lstat(VALUE obj)
static int
rb_group_member(GETGROUPS_T gid)
{
-#ifdef _WIN32
- return FALSE;
-#else
- int rv = FALSE;
- int groups = 16;
- VALUE v = 0;
- GETGROUPS_T *gary;
- int anum;
-
+#ifndef _WIN32
if (getgid() == gid || getegid() == gid)
return TRUE;
- /*
- * On Mac OS X (Mountain Lion), NGROUPS is 16. But libc and kernel
- * accept more larger value.
- * So we don't trunk NGROUPS anymore.
- */
- while (groups <= RB_MAX_GROUPS) {
- gary = ALLOCV_N(GETGROUPS_T, v, groups);
- anum = getgroups(groups, gary);
- if (anum != -1 && anum != groups)
- break;
- groups *= 2;
- if (v) {
- ALLOCV_END(v);
- v = 0;
- }
- }
- if (anum == -1)
- return FALSE;
+# ifdef HAVE_GETGROUPS
+# ifndef NGROUPS
+# ifdef NGROUPS_MAX
+# define NGROUPS NGROUPS_MAX
+# else
+# define NGROUPS 32
+# endif
+# endif
+ {
+ GETGROUPS_T gary[NGROUPS];
+ int anum;
- while (--anum >= 0) {
- if (gary[anum] == gid) {
- rv = TRUE;
- break;
- }
+ anum = getgroups(NGROUPS, gary);
+ while (--anum >= 0)
+ if (gary[anum] == gid)
+ return TRUE;
}
- if (v)
- ALLOCV_END(v);
-
- return rv;
+# endif
#endif
+ return FALSE;
}
#ifndef S_IXUGO
@@ -1114,6 +1046,12 @@ eaccess(const char *path, int mode)
}
#endif
+static inline int
+access_internal(const char *path, int mode)
+{
+ return access(path, mode);
+}
+
/*
* Document-class: FileTest
@@ -1126,6 +1064,18 @@ eaccess(const char *path, int mode)
*/
/*
+ * 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:
@@ -1135,8 +1085,6 @@ eaccess(const char *path, int mode)
* or a symlink that points at a directory, and <code>false</code>
* otherwise.
*
- * _file_name_ can be an IO object.
- *
* File.directory?(".")
*/
@@ -1144,7 +1092,7 @@ VALUE
rb_file_directory_p(VALUE obj, VALUE fname)
{
#ifndef S_ISDIR
-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
struct stat st;
@@ -1159,8 +1107,6 @@ rb_file_directory_p(VALUE obj, VALUE fname)
* File.pipe?(file_name) -> true or false
*
* Returns <code>true</code> if the named file is a pipe.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1168,7 +1114,7 @@ rb_file_pipe_p(VALUE obj, VALUE fname)
{
#ifdef S_IFIFO
# ifndef S_ISFIFO
-# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+# define S_ISFIFO(m) ((m & S_IFMT) == S_IFIFO)
# endif
struct stat st;
@@ -1195,10 +1141,10 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
# define S_ISLNK(m) _S_ISLNK(m)
# else
# ifdef _S_IFLNK
-# define S_ISLNK(m) (((m) & S_IFMT) == _S_IFLNK)
+# define S_ISLNK(m) ((m & S_IFMT) == _S_IFLNK)
# else
# ifdef S_IFLNK
-# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK)
# endif
# endif
# endif
@@ -1222,8 +1168,6 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
* File.socket?(file_name) -> true or false
*
* Returns <code>true</code> if the named file is a socket.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1234,10 +1178,10 @@ rb_file_socket_p(VALUE obj, VALUE fname)
# define S_ISSOCK(m) _S_ISSOCK(m)
# else
# ifdef _S_IFSOCK
-# define S_ISSOCK(m) (((m) & S_IFMT) == _S_IFSOCK)
+# define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
# else
# ifdef S_IFSOCK
-# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+# define S_ISSOCK(m) ((m & S_IFMT) == S_IFSOCK)
# endif
# endif
# endif
@@ -1258,8 +1202,6 @@ rb_file_socket_p(VALUE obj, VALUE fname)
* File.blockdev?(file_name) -> true or false
*
* Returns <code>true</code> if the named file is a block device.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1267,7 +1209,7 @@ rb_file_blockdev_p(VALUE obj, VALUE fname)
{
#ifndef S_ISBLK
# ifdef S_IFBLK
-# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
+# define S_ISBLK(m) ((m & S_IFMT) == S_IFBLK)
# else
# define S_ISBLK(m) (0) /* anytime false */
# endif
@@ -1288,14 +1230,12 @@ rb_file_blockdev_p(VALUE obj, VALUE fname)
* File.chardev?(file_name) -> true or false
*
* Returns <code>true</code> if the named file is a character device.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
rb_file_chardev_p(VALUE obj, VALUE fname)
{
#ifndef S_ISCHR
-# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+# define S_ISCHR(m) ((m & S_IFMT) == S_IFCHR)
#endif
struct stat st;
@@ -1312,10 +1252,6 @@ rb_file_chardev_p(VALUE obj, VALUE fname)
* File.exists?(file_name) -> true or false
*
* Return <code>true</code> if the named file exists.
- *
- * _file_name_ can be an IO object.
- *
- * "file exists" means that stat() or fstat() system call is successful.
*/
static VALUE
@@ -1359,7 +1295,7 @@ rb_file_readable_real_p(VALUE obj, VALUE fname)
rb_secure(2);
FilePathValue(fname);
fname = rb_str_encode_ospath(fname);
- if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
+ if (access_internal(StringValueCStr(fname), R_OK) < 0) return Qfalse;
return Qtrue;
}
@@ -1380,8 +1316,6 @@ rb_file_readable_real_p(VALUE obj, VALUE fname)
* <code>nil</code> otherwise. The meaning of the bits is platform
* dependent; on Unix systems, see <code>stat(2)</code>.
*
- * _file_name_ can be an IO object.
- *
* File.world_readable?("/etc/passwd") #=> 420
* m = File.world_readable?("/etc/passwd")
* sprintf("%o", m) #=> "644"
@@ -1433,7 +1367,7 @@ rb_file_writable_real_p(VALUE obj, VALUE fname)
rb_secure(2);
FilePathValue(fname);
fname = rb_str_encode_ospath(fname);
- if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
+ if (access_internal(StringValueCStr(fname), W_OK) < 0) return Qfalse;
return Qtrue;
}
@@ -1446,8 +1380,6 @@ rb_file_writable_real_p(VALUE obj, VALUE fname)
* <code>nil</code> otherwise. The meaning of the bits is platform
* dependent; on Unix systems, see <code>stat(2)</code>.
*
- * _file_name_ can be an IO object.
- *
* File.world_writable?("/tmp") #=> 511
* m = File.world_writable?("/tmp")
* sprintf("%o", m) #=> "777"
@@ -1499,12 +1431,12 @@ rb_file_executable_real_p(VALUE obj, VALUE fname)
rb_secure(2);
FilePathValue(fname);
fname = rb_str_encode_ospath(fname);
- if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
+ if (access_internal(StringValueCStr(fname), X_OK) < 0) return Qfalse;
return Qtrue;
}
#ifndef S_ISREG
-# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+# define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
#endif
/*
@@ -1513,8 +1445,6 @@ rb_file_executable_real_p(VALUE obj, VALUE fname)
*
* Returns <code>true</code> if the named file exists and is a
* regular file.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1533,8 +1463,6 @@ rb_file_file_p(VALUE obj, VALUE fname)
*
* Returns <code>true</code> if the named file exists and has
* a zero size.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1553,8 +1481,6 @@ rb_file_zero_p(VALUE obj, VALUE fname)
*
* Returns +nil+ if +file_name+ doesn't exist or has zero size, the size of the
* file otherwise.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1574,8 +1500,6 @@ rb_file_size_p(VALUE obj, VALUE fname)
* Returns <code>true</code> if the named file exists and the
* effective used id of the calling process is the owner of
* the file.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1605,8 +1529,6 @@ rb_file_rowned_p(VALUE obj, VALUE fname)
* Returns <code>true</code> if the named file exists and the
* effective group id of the calling process is the owner of
* the file. Returns <code>false</code> on Windows.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1693,8 +1615,6 @@ rb_file_sticky_p(VALUE obj, VALUE fname)
*
* Returns <code>true</code> if the named files are identical.
*
- * _file_1_ and _file_2_ can be an IO object.
- *
* open("a", "w") {}
* p File.identical?("a", "a") #=> true
* p File.identical?("a", "./a") #=> true
@@ -1736,6 +1656,7 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
st1.nFileIndexLow == st2.nFileIndexLow)
return Qtrue;
if (!f1 || !f2) return Qfalse;
+ if (rb_w32_iswin95()) return Qfalse;
# else
FilePathValue(fname1);
fname1 = rb_str_new4(fname1);
@@ -1759,8 +1680,6 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
* File.size(file_name) -> integer
*
* Returns the size of <code>file_name</code>.
- *
- * _file_name_ can be an IO object.
*/
static VALUE
@@ -1770,7 +1689,7 @@ rb_file_s_size(VALUE klass, VALUE fname)
if (rb_stat(fname, &st) < 0) {
FilePathValue(fname);
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return OFFT2NUM(st.st_size);
}
@@ -1840,7 +1759,7 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
FilePathValue(fname);
fname = rb_str_encode_ospath(fname);
if (lstat(StringValueCStr(fname), &st) == -1) {
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return rb_file_ftype(&st);
@@ -1852,8 +1771,6 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
*
* Returns the last access time for the named file as a Time object).
*
- * _file_name_ can be an IO object.
- *
* File.atime("testfile") #=> Wed Apr 09 08:51:48 CDT 2003
*
*/
@@ -1865,7 +1782,7 @@ rb_file_s_atime(VALUE klass, VALUE fname)
if (rb_stat(fname, &st) < 0) {
FilePathValue(fname);
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return stat_atime(&st);
}
@@ -1900,8 +1817,6 @@ rb_file_atime(VALUE obj)
*
* Returns the modification time for the named file as a Time object.
*
- * _file_name_ can be an IO object.
- *
* File.mtime("testfile") #=> Tue Apr 08 12:58:04 CDT 2003
*
*/
@@ -1913,7 +1828,7 @@ rb_file_s_mtime(VALUE klass, VALUE fname)
if (rb_stat(fname, &st) < 0) {
FilePathValue(fname);
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return stat_mtime(&st);
}
@@ -1949,10 +1864,6 @@ rb_file_mtime(VALUE obj)
* directory information about the file was changed, not the file
* itself).
*
- * _file_name_ can be an IO object.
- *
- * Note that on Windows (NTFS), returns creation time (birth time).
- *
* File.ctime("testfile") #=> Wed Apr 09 08:53:13 CDT 2003
*
*/
@@ -1964,7 +1875,7 @@ rb_file_s_ctime(VALUE klass, VALUE fname)
if (rb_stat(fname, &st) < 0) {
FilePathValue(fname);
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
return stat_ctime(&st);
}
@@ -1976,8 +1887,6 @@ rb_file_s_ctime(VALUE klass, VALUE fname)
* Returns the change time for <i>file</i> (that is, the time directory
* information about the file was changed, not the file itself).
*
- * Note that on Windows (NTFS), returns creation time (birth time).
- *
* File.new("testfile").ctime #=> Wed Apr 09 08:53:14 CDT 2003
*
*/
@@ -2022,10 +1931,10 @@ rb_file_size(VALUE obj)
}
static void
-chmod_internal(const char *path, VALUE pathv, void *mode)
+chmod_internal(const char *path, void *mode)
{
if (chmod(path, *(int *)mode) < 0)
- rb_sys_fail_path(pathv);
+ rb_sys_fail(path);
}
/*
@@ -2098,10 +2007,10 @@ rb_file_chmod(VALUE obj, VALUE vmode)
#if defined(HAVE_LCHMOD)
static void
-lchmod_internal(const char *path, VALUE pathv, void *mode)
+lchmod_internal(const char *path, void *mode)
{
if (lchmod(path, (int)(VALUE)mode) < 0)
- rb_sys_fail_path(pathv);
+ rb_sys_fail(path);
}
/*
@@ -2138,11 +2047,11 @@ struct chown_args {
};
static void
-chown_internal(const char *path, VALUE pathv, void *arg)
+chown_internal(const char *path, void *arg)
{
struct chown_args *args = arg;
if (chown(path, args->owner, args->group) < 0)
- rb_sys_fail_path(pathv);
+ rb_sys_fail(path);
}
/*
@@ -2229,16 +2138,16 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
#if defined(HAVE_LCHOWN)
static void
-lchown_internal(const char *path, VALUE pathv, void *arg)
+lchown_internal(const char *path, void *arg)
{
struct chown_args *args = arg;
if (lchown(path, args->owner, args->group) < 0)
- rb_sys_fail_path(pathv);
+ rb_sys_fail(path);
}
/*
* call-seq:
- * File.lchown(owner_int, group_int, file_name,..) -> integer
+ * 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
@@ -2276,16 +2185,18 @@ rb_file_s_lchown(int argc, VALUE *argv)
#define rb_file_s_lchown rb_f_notimplement
#endif
+struct timespec rb_time_timespec(VALUE time);
+
struct utime_args {
const struct timespec* tsp;
VALUE atime, mtime;
};
#if defined DOSISH || defined __CYGWIN__
-NORETURN(static void utime_failed(VALUE, const struct timespec *, VALUE, VALUE));
+NORETURN(static void utime_failed(const char *, const struct timespec *, VALUE, VALUE));
static void
-utime_failed(VALUE path, const struct timespec *tsp, VALUE atime, VALUE mtime)
+utime_failed(const char *path, const struct timespec *tsp, VALUE atime, VALUE mtime)
{
if (tsp && errno == EINVAL) {
VALUE e[2], a = Qnil, m = Qnil;
@@ -2306,23 +2217,23 @@ utime_failed(VALUE path, const struct timespec *tsp, VALUE atime, VALUE mtime)
if (!NIL_P(e[0])) {
if (path) {
if (!d) e[0] = rb_str_dup(e[0]);
- rb_str_append(rb_str_cat2(e[0], " for "), path);
+ 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(path);
+ rb_sys_fail(path);
}
#else
-#define utime_failed(path, tsp, atime, mtime) rb_sys_fail_path(path)
+#define utime_failed(path, tsp, atime, mtime) rb_sys_fail(path)
#endif
#if defined(HAVE_UTIMES)
static void
-utime_internal(const char *path, VALUE pathv, void *arg)
+utime_internal(const char *path, void *arg)
{
struct utime_args *v = arg;
const struct timespec *tsp = v->tsp;
@@ -2337,7 +2248,7 @@ utime_internal(const char *path, VALUE pathv, void *arg)
try_utimensat = 0;
goto no_utimensat;
}
- utime_failed(pathv, tsp, v->atime, v->mtime);
+ utime_failed(path, tsp, v->atime, v->mtime);
}
return;
}
@@ -2352,7 +2263,7 @@ no_utimensat:
tvp = tvbuf;
}
if (utimes(path, tvp) < 0)
- utime_failed(pathv, tsp, v->atime, v->mtime);
+ utime_failed(path, tsp, v->atime, v->mtime);
}
#else
@@ -2365,7 +2276,7 @@ struct utimbuf {
#endif
static void
-utime_internal(const char *path, VALUE pathv, void *arg)
+utime_internal(const char *path, void *arg)
{
struct utime_args *v = arg;
const struct timespec *tsp = v->tsp;
@@ -2376,7 +2287,7 @@ utime_internal(const char *path, VALUE pathv, void *arg)
utp = &utbuf;
}
if (utime(path, utp) < 0)
- utime_failed(pathv, tsp, v->atime, v->mtime);
+ utime_failed(path, tsp, v->atime, v->mtime);
}
#endif
@@ -2416,19 +2327,33 @@ NORETURN(static void sys_fail2(VALUE,VALUE));
static void
sys_fail2(VALUE s1, VALUE s2)
{
- VALUE str;
+ 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);
- str = rb_str_new_cstr("(");
- rb_str_append(str, rb_str_ellipsize(s1, max_pathlen));
- rb_str_cat2(str, ", ");
- rb_str_append(str, rb_str_ellipsize(s2, max_pathlen));
- rb_str_cat2(str, ")");
- rb_sys_fail_path(str);
+ 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;
+ buf = ALLOCA_N(char, len);
+ snprintf(buf, len, "(%.*s%s, %.*s%s)",
+ (int)l1, RSTRING_PTR(s1), e1,
+ (int)l2, RSTRING_PTR(s2), e2);
+ rb_sys_fail(buf);
}
#ifdef HAVE_LINK
@@ -2494,8 +2419,6 @@ rb_file_s_symlink(VALUE klass, VALUE from, VALUE to)
#endif
#ifdef HAVE_READLINK
-static VALUE rb_readlink(VALUE path);
-
/*
* call-seq:
* File.readlink(link_name) -> file_name
@@ -2510,12 +2433,7 @@ static VALUE rb_readlink(VALUE path);
static VALUE
rb_file_s_readlink(VALUE klass, VALUE path)
{
- return rb_readlink(path);
-}
-
-static VALUE
-rb_readlink(VALUE path)
-{
+ char *buf;
int size = 100;
ssize_t rv;
VALUE v;
@@ -2523,21 +2441,21 @@ rb_readlink(VALUE path)
rb_secure(2);
FilePathValue(path);
path = rb_str_encode_ospath(path);
- v = rb_enc_str_new(0, size, rb_filesystem_encoding());
- while ((rv = readlink(RSTRING_PTR(path), RSTRING_PTR(v), size)) == size
+ buf = xmalloc(size);
+ while ((rv = readlink(RSTRING_PTR(path), buf, size)) == size
#ifdef _AIX
|| (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
#endif
) {
- rb_str_modify_expand(v, size);
size *= 2;
- rb_str_set_len(v, size);
+ buf = xrealloc(buf, size);
}
if (rv < 0) {
- rb_str_resize(v, 0);
+ xfree(buf);
rb_sys_fail_path(path);
}
- rb_str_resize(v, rv);
+ v = rb_filesystem_str_new(buf, rv);
+ xfree(buf);
return v;
}
@@ -2546,10 +2464,10 @@ rb_readlink(VALUE path)
#endif
static void
-unlink_internal(const char *path, VALUE pathv, void *arg)
+unlink_internal(const char *path, void *arg)
{
if (unlink(path) < 0)
- rb_sys_fail_path(pathv);
+ rb_sys_fail(path);
}
/*
@@ -2646,7 +2564,7 @@ rb_file_s_umask(int argc, VALUE *argv)
omask = umask(NUM2INT(argv[0]));
}
else {
- rb_check_arity(argc, 0, 1);
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
}
return INT2FIX(omask);
}
@@ -2680,8 +2598,9 @@ static const char file_alt_separator[] = {FILE_ALT_SEPARATOR, '\0'};
#define istrailinggarbage(x) 0
#endif
-#define Next(p, e, enc) ((p) + rb_enc_mbclen((p), (e), (enc)))
-#define Inc(p, e, enc) ((p) = Next((p), (e), (enc)))
+#ifndef CharNext /* defined as CharNext[AW] on Windows. */
+# define CharNext(p) ((p) + 1)
+#endif
#if defined(DOSISH_UNC)
#define has_unc(buf) (isdirsep((buf)[0]) && isdirsep((buf)[1]))
@@ -2701,7 +2620,6 @@ has_drive_letter(const char *buf)
}
}
-#ifndef _WIN32
static char*
getcwdofdrv(int drv)
{
@@ -2728,7 +2646,6 @@ getcwdofdrv(int drv)
}
return drvcwd;
}
-#endif
static inline int
not_same_drive(VALUE path, int drive)
@@ -2745,40 +2662,40 @@ not_same_drive(VALUE path, int drive)
#endif
static inline char *
-skiproot(const char *path, const char *end, rb_encoding *enc)
+skiproot(const char *path)
{
#ifdef DOSISH_DRIVE_LETTER
- if (path + 2 <= end && has_drive_letter(path)) path += 2;
+ if (has_drive_letter(path)) path += 2;
#endif
- while (path < end && isdirsep(*path)) path++;
+ while (isdirsep(*path)) path++;
return (char *)path;
}
-#define nextdirsep rb_enc_path_next
+#define nextdirsep rb_path_next
char *
-rb_enc_path_next(const char *s, const char *e, rb_encoding *enc)
+rb_path_next(const char *s)
{
- while (s < e && !isdirsep(*s)) {
- Inc(s, e, enc);
+ while (*s && !isdirsep(*s)) {
+ s = CharNext(s);
}
return (char *)s;
}
#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
-#define skipprefix rb_enc_path_skip_prefix
+#define skipprefix rb_path_skip_prefix
#else
-#define skipprefix(path, end, enc) (path)
+#define skipprefix(path) (path)
#endif
char *
-rb_enc_path_skip_prefix(const char *path, const char *end, rb_encoding *enc)
+rb_path_skip_prefix(const char *path)
{
#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
#ifdef DOSISH_UNC
- if (path + 2 <= end && isdirsep(path[0]) && isdirsep(path[1])) {
+ if (isdirsep(path[0]) && isdirsep(path[1])) {
path += 2;
- while (path < end && isdirsep(*path)) path++;
- if ((path = rb_enc_path_next(path, end, enc)) < end && path[0] && path[1] && !isdirsep(path[1]))
- path = rb_enc_path_next(path + 1, end, enc);
+ while (isdirsep(*path)) path++;
+ if (*(path = nextdirsep(path)) && path[1] && !isdirsep(path[1]))
+ path = nextdirsep(path + 1);
return (char *)path;
}
#endif
@@ -2791,78 +2708,78 @@ rb_enc_path_skip_prefix(const char *path, const char *end, rb_encoding *enc)
}
static inline char *
-skipprefixroot(const char *path, const char *end, rb_encoding *enc)
+skipprefixroot(const char *path)
{
#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
- char *p = skipprefix(path, end, enc);
+ char *p = skipprefix(path);
while (isdirsep(*p)) p++;
return p;
#else
- return skiproot(path, end, enc);
+ return skiproot(path);
#endif
}
-#define strrdirsep rb_enc_path_last_separator
+#define strrdirsep rb_path_last_separator
char *
-rb_enc_path_last_separator(const char *path, const char *end, rb_encoding *enc)
+rb_path_last_separator(const char *path)
{
char *last = NULL;
- while (path < end) {
+ while (*path) {
if (isdirsep(*path)) {
const char *tmp = path++;
- while (path < end && isdirsep(*path)) path++;
- if (path >= end) break;
+ while (isdirsep(*path)) path++;
+ if (!*path) break;
last = (char *)tmp;
}
else {
- Inc(path, end, enc);
+ path = CharNext(path);
}
}
return last;
}
static char *
-chompdirsep(const char *path, const char *end, rb_encoding *enc)
+chompdirsep(const char *path)
{
- while (path < end) {
+ while (*path) {
if (isdirsep(*path)) {
const char *last = path++;
- while (path < end && isdirsep(*path)) path++;
- if (path >= end) return (char *)last;
+ while (isdirsep(*path)) path++;
+ if (!*path) return (char *)last;
}
else {
- Inc(path, end, enc);
+ path = CharNext(path);
}
}
return (char *)path;
}
char *
-rb_enc_path_end(const char *path, const char *end, rb_encoding *enc)
+rb_path_end(const char *path)
{
- if (path < end && isdirsep(*path)) path++;
- return chompdirsep(path, end, enc);
+ if (isdirsep(*path)) path++;
+ return chompdirsep(path);
}
#if USE_NTFS
static char *
-ntfs_tail(const char *path, const char *end, rb_encoding *enc)
+ntfs_tail(const char *path)
{
- while (path < end && *path == '.') path++;
- while (path < end && *path != ':') {
+ while (*path == '.') path++;
+ while (*path && *path != ':') {
if (istrailinggarbage(*path)) {
const char *last = path++;
- while (path < end && istrailinggarbage(*path)) path++;
- if (path >= end || *path == ':') return (char *)last;
+ while (istrailinggarbage(*path)) path++;
+ if (!*path || *path == ':') return (char *)last;
}
else if (isdirsep(*path)) {
const char *last = path++;
- while (path < end && isdirsep(*path)) path++;
- if (path >= end) return (char *)last;
+ while (isdirsep(*path)) path++;
+ if (!*path) return (char *)last;
if (*path == ':') path++;
}
else {
- Inc(path, end, enc);
+ path = CharNext(path);
}
}
return (char *)path;
@@ -2891,10 +2808,9 @@ rb_home_dir(const char *user, VALUE result)
const char *dir;
char *buf;
#if defined DOSISH || defined __CYGWIN__
- char *p, *bend;
+ char *p;
#endif
long dirlen;
- rb_encoding *enc;
if (!user || !*user) {
if (!(dir = getenv("HOME"))) {
@@ -2913,62 +2829,32 @@ rb_home_dir(const char *user, VALUE result)
}
dirlen = strlen(pwPtr->pw_dir);
rb_str_resize(result, dirlen);
- memcpy(buf = RSTRING_PTR(result), pwPtr->pw_dir, dirlen + 1);
+ strcpy(buf = RSTRING_PTR(result), pwPtr->pw_dir);
endpwent();
#else
return Qnil;
#endif
}
- enc = rb_filesystem_encoding();
- rb_enc_associate(result, enc);
#if defined DOSISH || defined __CYGWIN__
- for (bend = (p = buf) + dirlen; p < bend; Inc(p, bend, enc)) {
+ for (p = buf; *p; p = CharNext(p)) {
if (*p == '\\') {
*p = '/';
}
}
#endif
+ rb_enc_associate_index(result, rb_filesystem_encindex());
return result;
}
-#ifndef _WIN32
-static char *
-append_fspath(VALUE result, VALUE fname, char *dir, rb_encoding **enc, rb_encoding *fsenc)
-{
- char *buf, *cwdp = dir;
- VALUE dirname = Qnil;
- size_t dirlen = strlen(dir), buflen = rb_str_capacity(result);
-
- if (*enc != fsenc) {
- rb_encoding *direnc = rb_enc_check(fname, dirname = rb_enc_str_new(dir, dirlen, fsenc));
- if (direnc != fsenc) {
- dirname = rb_str_conv_enc(dirname, fsenc, direnc);
- RSTRING_GETMEM(dirname, cwdp, dirlen);
- }
- *enc = direnc;
- }
- do {buflen *= 2;} while (dirlen > buflen);
- rb_str_resize(result, buflen);
- buf = RSTRING_PTR(result);
- memcpy(buf, cwdp, dirlen);
- xfree(dir);
- if (!NIL_P(dirname)) rb_str_resize(dirname, 0);
- rb_enc_associate(result, *enc);
- return buf + dirlen;
-}
-
-VALUE
-rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_name, VALUE result)
+static VALUE
+file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
{
- const char *s, *b, *fend;
+ const char *s, *b;
char *buf, *p, *pend, *root;
- size_t buflen, bdiff;
+ size_t buflen, dirlen, bdiff;
int tainted;
- rb_encoding *enc, *fsenc = rb_filesystem_encoding();
s = StringValuePtr(fname);
- fend = s + RSTRING_LEN(fname);
- enc = rb_enc_get(fname);
BUFINIT();
tainted = OBJ_TAINTED(fname);
@@ -2977,12 +2863,11 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
tainted = 1;
if (isdirsep(s[1]) || s[1] == '\0') {
buf = 0;
- b = 0;
rb_str_set_len(result, 0);
if (*++s) ++s;
}
else {
- s = nextdirsep(b = s, fend, enc);
+ s = nextdirsep(b = s);
userlen = s - b;
BUFCHECK(bdiff + userlen >= buflen);
memcpy(p, b, userlen);
@@ -3020,7 +2905,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
/* specified drive, but not full path */
int same = 0;
if (!NIL_P(dname) && !not_same_drive(dname, s[0])) {
- rb_file_expand_path_internal(dname, Qnil, abs_mode, long_name, result);
+ file_expand_path(dname, Qnil, abs_mode, result);
BUFINIT();
if (has_drive_letter(p) && TOLOWER(p[0]) == TOLOWER(s[0])) {
/* ok, same drive */
@@ -3028,42 +2913,47 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
}
}
if (!same) {
- char *e = append_fspath(result, fname, getcwdofdrv(*s), &enc, fsenc);
+ char *dir = getcwdofdrv(*s);
+
tainted = 1;
- BUFINIT();
- p = e;
- }
- else {
- rb_enc_associate(result, enc = rb_enc_check(result, fname));
- p = pend;
+ dirlen = strlen(dir);
+ BUFCHECK(dirlen > buflen);
+ strcpy(buf, dir);
+ xfree(dir);
+ rb_enc_associate_index(result, rb_filesystem_encindex());
}
- p = chompdirsep(skiproot(buf, p, enc), p, enc);
+ else
+ rb_enc_associate(result, rb_enc_check(result, fname));
+ p = chompdirsep(skiproot(buf));
s += 2;
}
}
#endif
else if (!rb_is_absolute_path(s)) {
if (!NIL_P(dname)) {
- rb_file_expand_path_internal(dname, Qnil, abs_mode, long_name, result);
- rb_enc_associate(result, rb_enc_check(result, fname));
+ file_expand_path(dname, Qnil, abs_mode, result);
BUFINIT();
- p = pend;
+ rb_enc_associate(result, rb_enc_check(result, fname));
}
else {
- char *e = append_fspath(result, fname, my_getcwd(), &enc, fsenc);
+ char *dir = my_getcwd();
+
tainted = 1;
- BUFINIT();
- p = e;
+ dirlen = strlen(dir);
+ BUFCHECK(dirlen > buflen);
+ strcpy(buf, dir);
+ xfree(dir);
+ rb_enc_associate_index(result, rb_filesystem_encindex());
}
#if defined DOSISH || defined __CYGWIN__
if (isdirsep(*s)) {
/* specified full path, but not drive letter nor UNC */
/* we need to get the drive letter or UNC share name */
- p = skipprefix(buf, p, enc);
+ p = skipprefix(buf);
}
else
#endif
- p = chompdirsep(skiproot(buf, p, enc), p, enc);
+ p = chompdirsep(skiproot(buf));
}
else {
size_t len;
@@ -3087,7 +2977,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
rb_str_set_len(result, p-buf+1);
BUFCHECK(bdiff + 1 >= buflen);
p[1] = 0;
- root = skipprefix(buf, p+1, enc);
+ root = skipprefix(buf);
b = s;
while (*s) {
@@ -3103,7 +2993,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
/* We must go back to the parent */
char *n;
*p = '\0';
- if (!(n = strrdirsep(root, p, enc))) {
+ if (!(n = strrdirsep(root))) {
*p = '/';
}
else {
@@ -3133,7 +3023,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
--s;
case ' ': {
const char *e = s;
- while (s < fend && istrailinggarbage(*s)) s++;
+ while (istrailinggarbage(*s)) s++;
if (!*s) {
s = e;
goto endpath;
@@ -3158,7 +3048,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
b = ++s;
break;
default:
- Inc(s, fend, enc);
+ s = CharNext(s);
break;
}
}
@@ -3183,104 +3073,52 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
BUFCHECK(bdiff + (s-b) >= buflen);
memcpy(++p, b, s-b);
p += s-b;
- rb_str_set_len(result, p-buf);
}
- if (p == skiproot(buf, p + !!*p, enc) - 1) p++;
+ if (p == skiproot(buf) - 1) p++;
#if USE_NTFS
*p = '\0';
- if ((s = strrdirsep(b = buf, p, enc)) != 0 && !strpbrk(s, "*?")) {
- VALUE tmp, v;
+ if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
size_t len;
- rb_encoding *enc;
- WCHAR *wstr;
- WIN32_FIND_DATAW wfd;
- HANDLE h;
+ WIN32_FIND_DATA wfd;
#ifdef __CYGWIN__
-#ifdef HAVE_CYGWIN_CONV_PATH
- char *w32buf = NULL;
- const int flags = CCP_POSIX_TO_WIN_A | CCP_RELATIVE;
-#else
- char w32buf[MAXPATHLEN];
-#endif
- const char *path;
- ssize_t bufsize;
int lnk_added = 0, is_symlink = 0;
struct stat st;
+ char w32buf[MAXPATHLEN];
p = (char *)s;
- len = strlen(p);
if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
is_symlink = 1;
- if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
- lnk_added = 1;
- }
- }
- path = *buf ? buf : "/";
-#ifdef HAVE_CYGWIN_CONV_PATH
- bufsize = cygwin_conv_path(flags, path, NULL, 0);
- if (bufsize > 0) {
- bufsize += len;
- if (lnk_added) bufsize += 4;
- w32buf = ALLOCA_N(char, bufsize);
- if (cygwin_conv_path(flags, path, w32buf, bufsize) == 0) {
- b = w32buf;
- }
+ *p = '\0';
}
-#else
- bufsize = MAXPATHLEN;
- if (cygwin_conv_to_win32_path(path, w32buf) == 0) {
+ if (cygwin_conv_to_win32_path((*buf ? buf : "/"), w32buf) == 0) {
b = w32buf;
}
-#endif
if (is_symlink && b == w32buf) {
*p = '\\';
- strlcat(w32buf, p, bufsize);
- if (lnk_added) {
- strlcat(w32buf, ".lnk", bufsize);
+ strlcat(w32buf, p, sizeof(w32buf));
+ len = strlen(p);
+ if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
+ lnk_added = 1;
+ strlcat(w32buf, ".lnk", sizeof(w32buf));
}
}
- else {
- lnk_added = 0;
- }
*p = '/';
#endif
- rb_str_set_len(result, p - buf + strlen(p));
- enc = rb_enc_get(result);
- tmp = result;
- if (enc != rb_utf8_encoding() && rb_enc_str_coderange(result) != ENC_CODERANGE_7BIT) {
- tmp = rb_str_encode_ospath(result);
- }
- len = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, NULL, 0);
- wstr = ALLOCV_N(WCHAR, v, len);
- MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(tmp), -1, wstr, len);
- if (tmp != result) rb_str_resize(tmp, 0);
- h = FindFirstFileW(wstr, &wfd);
- ALLOCV_END(v);
+ HANDLE h = FindFirstFile(b, &wfd);
if (h != INVALID_HANDLE_VALUE) {
- size_t wlen;
FindClose(h);
- len = lstrlenW(wfd.cFileName);
+ len = strlen(wfd.cFileName);
#ifdef __CYGWIN__
if (lnk_added && len > 4 &&
- wcscasecmp(wfd.cFileName + len - 4, L".lnk") == 0) {
- wfd.cFileName[len -= 4] = L'\0';
+ STRCASECMP(wfd.cFileName + len - 4, ".lnk") == 0) {
+ wfd.cFileName[len -= 4] = '\0';
}
#else
p = (char *)s;
#endif
++p;
- wlen = (int)len;
- len = WideCharToMultiByte(CP_UTF8, 0, wfd.cFileName, wlen, NULL, 0, NULL, NULL);
BUFCHECK(bdiff + len >= buflen);
- WideCharToMultiByte(CP_UTF8, 0, wfd.cFileName, wlen, p, len + 1, NULL, NULL);
- if (tmp != result) {
- rb_str_buf_cat(tmp, p, len);
- tmp = rb_str_encode(tmp, rb_enc_from_encoding(enc), 0, Qnil);
- len = RSTRING_LEN(tmp);
- BUFCHECK(bdiff + len >= buflen);
- memcpy(p, RSTRING_PTR(tmp), len);
- rb_str_resize(tmp, 0);
- }
+ memcpy(p, wfd.cFileName, len + 1);
p += len;
}
#ifdef __CYGWIN__
@@ -3294,44 +3132,26 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
if (tainted) OBJ_TAINT(result);
rb_str_set_len(result, p - buf);
rb_enc_check(fname, result);
- ENC_CODERANGE_CLEAR(result);
return result;
}
-#endif /* _WIN32 */
#define EXPAND_PATH_BUFFER() rb_usascii_str_new(0, MAXPATHLEN + 2)
-static VALUE
-str_shrink(VALUE str)
-{
- rb_str_resize(str, RSTRING_LEN(str));
- return str;
-}
-
-#define expand_path(fname, dname, abs_mode, long_name, result) \
- str_shrink(rb_file_expand_path_internal(fname, dname, abs_mode, long_name, result))
-
#define check_expand_path_args(fname, dname) \
- (((fname) = rb_get_path(fname)), \
- (void)(NIL_P(dname) ? (dname) : ((dname) = rb_get_path(dname))))
+ ((fname = rb_get_path(fname)), \
+ (NIL_P(dname) ? dname : (dname = rb_get_path(dname))))
static VALUE
file_expand_path_1(VALUE fname)
{
- return rb_file_expand_path_internal(fname, Qnil, 0, 0, EXPAND_PATH_BUFFER());
+ return file_expand_path(fname, Qnil, 0, EXPAND_PATH_BUFFER());
}
VALUE
rb_file_expand_path(VALUE fname, VALUE dname)
{
check_expand_path_args(fname, dname);
- return expand_path(fname, dname, 0, 1, EXPAND_PATH_BUFFER());
-}
-
-VALUE
-rb_file_expand_path_fast(VALUE fname, VALUE dname)
-{
- return expand_path(fname, dname, 0, 0, EXPAND_PATH_BUFFER());
+ return file_expand_path(fname, dname, 0, EXPAND_PATH_BUFFER());
}
/*
@@ -3368,7 +3188,7 @@ VALUE
rb_file_absolute_path(VALUE fname, VALUE dname)
{
check_expand_path_args(fname, dname);
- return expand_path(fname, dname, 1, 1, EXPAND_PATH_BUFFER());
+ return file_expand_path(fname, dname, 1, EXPAND_PATH_BUFFER());
}
/*
@@ -3398,27 +3218,23 @@ rb_file_s_absolute_path(int argc, VALUE *argv)
}
static void
-realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE loopcheck, int strict, int last)
+realpath_rec(long *prefixlenp, VALUE *resolvedp, char *unresolved, VALUE loopcheck, int strict, int last)
{
- const char *pend = unresolved + strlen(unresolved);
- rb_encoding *enc = rb_enc_get(*resolvedp);
ID resolving;
CONST_ID(resolving, "resolving");
- while (unresolved < pend) {
- const char *testname = unresolved;
- const char *unresolved_firstsep = rb_enc_path_next(unresolved, pend, enc);
- long testnamelen = unresolved_firstsep - unresolved;
- const char *unresolved_nextname = unresolved_firstsep;
- while (unresolved_nextname < pend && isdirsep(*unresolved_nextname))
- unresolved_nextname++;
+ while (*unresolved) {
+ char *testname = unresolved;
+ char *unresolved_firstsep = rb_path_next(unresolved);
+ long testnamelen = unresolved_firstsep - unresolved;
+ char *unresolved_nextname = unresolved_firstsep;
+ while (isdirsep(*unresolved_nextname)) unresolved_nextname++;
unresolved = unresolved_nextname;
if (testnamelen == 1 && testname[0] == '.') {
}
else if (testnamelen == 2 && testname[0] == '.' && testname[1] == '.') {
if (*prefixlenp < RSTRING_LEN(*resolvedp)) {
- const char *resolved_str = RSTRING_PTR(*resolvedp);
- const char *resolved_names = resolved_str + *prefixlenp;
- const char *lastsep = strrdirsep(resolved_names, resolved_str + RSTRING_LEN(*resolvedp), enc);
+ char *resolved_names = RSTRING_PTR(*resolvedp) + *prefixlenp;
+ char *lastsep = rb_path_last_separator(resolved_names);
long len = lastsep ? lastsep - resolved_names : 0;
rb_str_resize(*resolvedp, *prefixlenp + len);
}
@@ -3428,19 +3244,12 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
VALUE testpath = rb_str_dup(*resolvedp);
if (*prefixlenp < RSTRING_LEN(testpath))
rb_str_cat2(testpath, "/");
-#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
- if (*prefixlenp > 1 && *prefixlenp == RSTRING_LEN(testpath)) {
- const char *prefix = RSTRING_PTR(testpath);
- const char *last = rb_enc_left_char_head(prefix, prefix + *prefixlenp - 1, prefix + *prefixlenp, enc);
- if (!isdirsep(*last)) rb_str_cat2(testpath, "/");
- }
-#endif
rb_str_cat(testpath, testname, testnamelen);
checkval = rb_hash_aref(loopcheck, testpath);
if (!NIL_P(checkval)) {
if (checkval == ID2SYM(resolving)) {
errno = ELOOP;
- rb_sys_fail_path(testpath);
+ rb_sys_fail(RSTRING_PTR(testpath));
}
else {
*resolvedp = rb_str_dup(checkval);
@@ -3450,45 +3259,37 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
struct stat sbuf;
int ret;
VALUE testpath2 = rb_str_encode_ospath(testpath);
-#ifdef __native_client__
- ret = stat(RSTRING_PTR(testpath2), &sbuf);
-#else
ret = lstat(RSTRING_PTR(testpath2), &sbuf);
-#endif
if (ret == -1) {
if (errno == ENOENT) {
if (strict || !last || *unresolved_firstsep)
- rb_sys_fail_path(testpath);
+ rb_sys_fail(RSTRING_PTR(testpath));
*resolvedp = testpath;
break;
}
else {
- rb_sys_fail_path(testpath);
+ rb_sys_fail(RSTRING_PTR(testpath));
}
}
#ifdef HAVE_READLINK
if (S_ISLNK(sbuf.st_mode)) {
- VALUE link;
- volatile VALUE link_orig = Qnil;
- const char *link_prefix, *link_names;
+ volatile VALUE link;
+ char *link_prefix, *link_names;
long link_prefixlen;
rb_hash_aset(loopcheck, testpath, ID2SYM(resolving));
- link = rb_readlink(testpath);
+ link = rb_file_s_readlink(rb_cFile, testpath);
link_prefix = RSTRING_PTR(link);
- link_names = skipprefixroot(link_prefix, link_prefix + RSTRING_LEN(link), rb_enc_get(link));
- link_prefixlen = link_names - link_prefix;
- if (link_prefixlen > 0) {
- rb_encoding *enc, *linkenc = rb_enc_get(link);
- link_orig = link;
- link = rb_str_subseq(link, 0, link_prefixlen);
- enc = rb_enc_check(*resolvedp, link);
- if (enc != linkenc) link = rb_str_conv_enc(link, linkenc, enc);
- *resolvedp = link;
- *prefixlenp = link_prefixlen;
- }
- realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
- RB_GC_GUARD(link_orig);
- rb_hash_aset(loopcheck, testpath, rb_str_dup_frozen(*resolvedp));
+ link_names = skipprefixroot(link_prefix);
+ link_prefixlen = link_names - link_prefix;
+ if (link_prefixlen == 0) {
+ realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
+ }
+ else {
+ *resolvedp = rb_str_new(link_prefix, link_prefixlen);
+ *prefixlenp = link_prefixlen;
+ realpath_rec(prefixlenp, resolvedp, link_names, loopcheck, strict, *unresolved_firstsep == '\0');
+ }
+ rb_hash_aset(loopcheck, testpath, rb_str_dup_frozen(*resolvedp));
}
else
#endif
@@ -3502,13 +3303,6 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, const char *unresolved, VALUE l
}
}
-#ifdef __native_client__
-VALUE
-rb_realpath_internal(VALUE basedir, VALUE path, int strict)
-{
- return path;
-}
-#else
VALUE
rb_realpath_internal(VALUE basedir, VALUE path, int strict)
{
@@ -3518,10 +3312,8 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
VALUE loopcheck;
volatile VALUE curdir = Qnil;
- rb_encoding *enc;
char *path_names = NULL, *basedir_names = NULL, *curdir_names = NULL;
- char *ptr, *prefixptr = NULL, *pend;
- long len;
+ char *ptr, *prefixptr = NULL;
rb_secure(2);
@@ -3533,33 +3325,34 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
basedir = rb_str_dup_frozen(basedir);
}
- RSTRING_GETMEM(unresolved_path, ptr, len);
- path_names = skipprefixroot(ptr, ptr + len, rb_enc_get(unresolved_path));
+ ptr = RSTRING_PTR(unresolved_path);
+ path_names = skipprefixroot(ptr);
if (ptr != path_names) {
- resolved = rb_str_subseq(unresolved_path, 0, path_names - ptr);
+ resolved = rb_enc_str_new(ptr, path_names - ptr,
+ rb_enc_get(unresolved_path));
goto root_found;
}
if (!NIL_P(basedir)) {
- RSTRING_GETMEM(basedir, ptr, len);
- basedir_names = skipprefixroot(ptr, ptr + len, rb_enc_get(basedir));
+ ptr = RSTRING_PTR(basedir);
+ basedir_names = skipprefixroot(ptr);
if (ptr != basedir_names) {
- resolved = rb_str_subseq(basedir, 0, basedir_names - ptr);
- goto root_found;
+ resolved = rb_enc_str_new(ptr, basedir_names - ptr,
+ rb_enc_get(basedir));
+ goto root_found;
}
}
curdir = rb_dir_getwd();
- RSTRING_GETMEM(curdir, ptr, len);
- curdir_names = skipprefixroot(ptr, ptr + len, rb_enc_get(curdir));
- resolved = rb_str_subseq(curdir, 0, curdir_names - ptr);
+ ptr = RSTRING_PTR(curdir);
+ curdir_names = skipprefixroot(ptr);
+ resolved = rb_enc_str_new(ptr, curdir_names - ptr, rb_enc_get(curdir));
root_found:
- RSTRING_GETMEM(resolved, prefixptr, prefixlen);
- pend = prefixptr + prefixlen;
- enc = rb_enc_get(resolved);
- ptr = chompdirsep(prefixptr, pend, enc);
- if (ptr < pend) {
+ prefixptr = RSTRING_PTR(resolved);
+ prefixlen = RSTRING_LEN(resolved);
+ ptr = chompdirsep(prefixptr);
+ if (*ptr) {
prefixlen = ++ptr - prefixptr;
rb_str_set_len(resolved, prefixlen);
}
@@ -3568,7 +3361,7 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
if (*prefixptr == FILE_ALT_SEPARATOR) {
*prefixptr = '/';
}
- Inc(prefixptr, pend, enc);
+ prefixptr = CharNext(prefixptr);
}
#endif
@@ -3582,7 +3375,6 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
OBJ_TAINT(resolved);
return resolved;
}
-#endif
/*
* call-seq:
@@ -3626,52 +3418,47 @@ rb_file_s_realdirpath(int argc, VALUE *argv, VALUE klass)
}
static size_t
-rmext(const char *p, long l0, long l1, const char *e, long l2, rb_encoding *enc)
+rmext(const char *p, long l1, const char *e)
{
- int len1, len2;
- unsigned int c;
- const char *s, *last;
+ long l0, l2;
- if (!e || !l2) return 0;
+ if (!e) return 0;
- c = rb_enc_codepoint_len(e, e + l2, &len1, enc);
- if (rb_enc_ascget(e + len1, e + l2, &len2, enc) == '*' && len1 + len2 == l2) {
- if (c == '.') return l0;
- s = p;
+ 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;
- last = e;
- while (s < e) {
- if (rb_enc_codepoint_len(s, e, &len1, enc) == c) last = s;
- s += len1;
- }
- return last - p;
+ do {
+ if (e <= p + l0) return 0;
+ } while (*--e != c);
+ return e - p;
}
if (l1 < l2) return l1;
- s = p+l1-l2;
- if (rb_enc_left_char_head(p, s, p+l1, enc) != s) return 0;
#if CASEFOLD_FILESYSTEM
#define fncomp strncasecmp
#else
#define fncomp strncmp
#endif
- if (fncomp(s, e, l2) == 0) {
+ if (fncomp(p+l1-l2, e, l2) == 0) {
return l1-l2;
}
return 0;
}
const char *
-ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encoding *enc)
+ruby_find_basename(const char *name, long *len, long *ext)
{
- const char *p, *q, *e, *end;
+ const char *p;
#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
const char *root;
#endif
- long f = 0, n = -1;
+ long f, n = -1;
- end = name + (alllen ? (size_t)*alllen : strlen(name));
- name = skipprefix(name, end, enc);
+ name = skipprefix(name);
#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
root = name;
#endif
@@ -3698,29 +3485,23 @@ ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encodin
#endif
}
else {
- if (!(p = strrdirsep(name, end, enc))) {
+ if (!(p = strrdirsep(name))) {
p = name;
}
else {
while (isdirsep(*p)) p++; /* skip last / */
}
#if USE_NTFS
- n = ntfs_tail(p, end, enc) - p;
+ n = ntfs_tail(p) - p;
#else
- n = chompdirsep(p, end, enc) - p;
+ n = chompdirsep(p) - p;
#endif
- for (q = p; q - p < n && *q == '.'; q++);
- for (e = 0; q - p < n; Inc(q, end, enc)) {
- if (*q == '.') e = q;
- }
- if (e) f = e - p;
- else f = n;
}
- if (baselen)
- *baselen = f;
- if (alllen)
- *alllen = n;
+ if (len)
+ *len = f;
+ if (ext)
+ *ext = n;
return p;
}
@@ -3729,9 +3510,8 @@ ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encodin
* File.basename(file_name [, suffix] ) -> base_name
*
* Returns the last component of the filename given in <i>file_name</i>,
- * which can be formed using both <code>File::SEPARATOR</code> and
- * <code>File::ALT_SEPARETOR</code> as the separator when
- * <code>File::ALT_SEPARATOR</code> is not <code>nil</code>. If
+ * 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.
*
@@ -3745,33 +3525,25 @@ rb_file_s_basename(int argc, VALUE *argv)
VALUE fname, fext, basename;
const char *name, *p;
long f, n;
- rb_encoding *enc;
if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
+ rb_encoding *enc;
StringValue(fext);
- enc = check_path_encoding(fext);
+ if (!rb_enc_asciicompat(enc = rb_enc_get(fext))) {
+ rb_raise(rb_eEncCompatError, "ascii incompatible character encodings: %s",
+ rb_enc_name(enc));
+ }
}
FilePathStringValue(fname);
- if (NIL_P(fext) || !(enc = rb_enc_compatible(fname, fext))) {
- enc = rb_enc_get(fname);
- fext = Qnil;
- }
- if ((n = RSTRING_LEN(fname)) == 0 || !*(name = RSTRING_PTR(fname)))
+ if (!NIL_P(fext)) rb_enc_check(fname, fext);
+ if (RSTRING_LEN(fname) == 0 || !*(name = RSTRING_PTR(fname)))
return rb_str_new_shared(fname);
- p = ruby_enc_find_basename(name, &f, &n, enc);
+ p = ruby_find_basename(name, &f, &n);
if (n >= 0) {
- if (NIL_P(fext)) {
+ if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) {
f = n;
}
- else {
- const char *fp;
- fp = StringValueCStr(fext);
- if (!(f = rmext(p, f, n, fp, RSTRING_LEN(fext), enc))) {
- f = n;
- }
- RB_GC_GUARD(fext);
- }
if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname);
}
@@ -3783,12 +3555,12 @@ rb_file_s_basename(int argc, VALUE *argv)
/*
* call-seq:
- * File.dirname(file_name) -> dir_name
+ * File.dirname(file_name ) -> dir_name
*
* Returns all components of the filename given in <i>file_name</i>
- * except the last one. The filename can be formed using both
- * <code>File::SEPARATOR</code> and <code>File::ALT_SEPARETOR</code> as the
- * separator when <code>File::ALT_SEPARATOR</code> is not <code>nil</code>.
+ * 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"
*/
@@ -3802,23 +3574,20 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
VALUE
rb_file_dirname(VALUE fname)
{
- const char *name, *root, *p, *end;
+ const char *name, *root, *p;
VALUE dirname;
- rb_encoding *enc;
FilePathStringValue(fname);
name = StringValueCStr(fname);
- end = name + RSTRING_LEN(fname);
- enc = rb_enc_get(fname);
- root = skiproot(name, end, enc);
+ root = skiproot(name);
#ifdef DOSISH_UNC
if (root > name + 1 && isdirsep(*name))
- root = skipprefix(name = root - 2, end, enc);
+ root = skipprefix(name = root - 2);
#else
if (root > name + 1)
name = root - 1;
#endif
- p = strrdirsep(root, end, enc);
+ p = strrdirsep(root);
if (!p) {
p = root;
}
@@ -3826,7 +3595,7 @@ rb_file_dirname(VALUE fname)
return rb_usascii_str_new2(".");
#ifdef DOSISH_DRIVE_LETTER
if (has_drive_letter(name) && isdirsep(*(name + 2))) {
- const char *top = skiproot(name + 2, end, enc);
+ const char *top = skiproot(name + 2);
dirname = rb_str_new(name, 3);
rb_str_cat(dirname, top, p - top);
}
@@ -3855,11 +3624,11 @@ rb_file_dirname(VALUE fname)
*
*/
const char *
-ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
+ruby_find_extname(const char *name, long *len)
{
- const char *p, *e, *end = name + (len ? *len : (long)strlen(name));
+ const char *p, *e;
- p = strrdirsep(name, end, enc); /* get the last path component */
+ p = strrdirsep(name); /* get the last path component */
if (!p)
p = name;
else
@@ -3892,7 +3661,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
#endif
else if (isdirsep(*p))
break;
- Inc(p, end, enc);
+ p = CharNext(p);
}
if (len) {
@@ -3911,21 +3680,13 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
* call-seq:
* File.extname(path) -> string
*
- * Returns the extension (the portion of file name in +path+
- * starting from the last period).
- *
- * If +path+ is a dotfile, or starts with a period, then the starting
- * dot is not dealt with the start of the extension.
- *
- * An empty string will also be returned when the period is the last character
- * in +path+.
+ * 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("foo.") #=> ""
* File.extname("test") #=> ""
* File.extname(".profile") #=> ""
- * File.extname(".profile.sh") #=> ".sh"
*
*/
@@ -3938,11 +3699,11 @@ rb_file_s_extname(VALUE klass, VALUE fname)
FilePathStringValue(fname);
name = StringValueCStr(fname);
- len = RSTRING_LEN(fname);
- e = ruby_enc_find_extname(name, &len, rb_enc_get(fname));
+ e = ruby_find_extname(name, &len);
if (len <= 1)
return rb_str_new(0, 0);
- extname = rb_str_subseq(fname, e - name, len); /* keep the dot, too! */
+ extname = rb_str_new(e, len); /* keep the dot, too! */
+ rb_enc_copy(extname, fname);
OBJ_INFECT(extname, fname);
return extname;
}
@@ -4000,17 +3761,13 @@ rb_file_join(VALUE ary, VALUE sep)
long len, i;
VALUE result, tmp;
const char *name, *tail;
- int checked = TRUE;
- rb_encoding *enc;
if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
len = 1;
for (i=0; i<RARRAY_LEN(ary); i++) {
- tmp = RARRAY_PTR(ary)[i];
- if (RB_TYPE_P(tmp, T_STRING)) {
- check_path_encoding(tmp);
- len += RSTRING_LEN(tmp);
+ if (TYPE(RARRAY_PTR(ary)[i]) == T_STRING) {
+ len += RSTRING_LEN(RARRAY_PTR(ary)[i]);
}
else {
len += 10;
@@ -4018,17 +3775,14 @@ rb_file_join(VALUE ary, VALUE sep)
}
if (!NIL_P(sep)) {
StringValue(sep);
- len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
+ len += RSTRING_LEN(sep) * RARRAY_LEN(ary) - 1;
}
result = rb_str_buf_new(len);
- RBASIC(result)->klass = 0;
OBJ_INFECT(result, ary);
for (i=0; i<RARRAY_LEN(ary); i++) {
tmp = RARRAY_PTR(ary)[i];
switch (TYPE(tmp)) {
case T_STRING:
- if (!checked) check_path_encoding(tmp);
- StringValueCStr(tmp);
break;
case T_ARRAY:
if (ary == tmp) {
@@ -4044,28 +3798,19 @@ rb_file_join(VALUE ary, VALUE sep)
break;
default:
FilePathStringValue(tmp);
- checked = FALSE;
- }
- RSTRING_GETMEM(result, name, len);
- if (i == 0) {
- rb_enc_copy(result, tmp);
}
- else if (!NIL_P(sep)) {
- tail = chompdirsep(name, name + len, rb_enc_get(result));
+ 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);
}
else if (!*tail) {
- enc = rb_enc_check(result, sep);
rb_str_buf_append(result, sep);
- rb_enc_associate(result, enc);
}
}
- enc = rb_enc_check(result, tmp);
rb_str_buf_append(result, tmp);
- rb_enc_associate(result, enc);
}
- RBASIC(result)->klass = rb_cString;
return result;
}
@@ -4114,18 +3859,17 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
path = rb_str_encode_ospath(path);
#ifdef HAVE_TRUNCATE
if (truncate(StringValueCStr(path), pos) < 0)
- rb_sys_fail_path(path);
+ rb_sys_fail(RSTRING_PTR(path));
#else /* defined(HAVE_CHSIZE) */
{
int tmpfd;
- if ((tmpfd = rb_cloexec_open(StringValueCStr(path), 0, 0)) < 0) {
- rb_sys_fail_path(path);
+ if ((tmpfd = open(StringValueCStr(path), 0)) < 0) {
+ rb_sys_fail(RSTRING_PTR(path));
}
- rb_update_max_fd(tmpfd);
if (chsize(tmpfd, pos) < 0) {
close(tmpfd);
- rb_sys_fail_path(path);
+ rb_sys_fail(RSTRING_PTR(path));
}
close(tmpfd);
}
@@ -4192,6 +3936,7 @@ rb_file_truncate(VALUE obj, VALUE len)
#ifdef __CYGWIN__
#include <winerror.h>
+extern unsigned long __attribute__((stdcall)) GetLastError(void);
#endif
static VALUE
@@ -4213,7 +3958,7 @@ rb_thread_flock(void *data)
/*
* call-seq:
- * file.flock(locking_constant) -> 0 or false
+ * 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).
@@ -4260,7 +4005,6 @@ rb_file_flock(VALUE obj, VALUE operation)
{
rb_io_t *fptr;
int op[2], op1;
- struct timeval time;
rb_secure(2);
op[1] = op1 = NUM2INT(operation);
@@ -4270,7 +4014,7 @@ rb_file_flock(VALUE obj, VALUE operation)
if (fptr->mode & FMODE_WRITABLE) {
rb_io_flush(obj);
}
- while ((int)rb_thread_io_blocking_region(rb_thread_flock, op, fptr->fd) < 0) {
+ while ((int)rb_thread_blocking_region(rb_thread_flock, op, RUBY_UBF_IO, 0) < 0) {
switch (errno) {
case EAGAIN:
case EACCES:
@@ -4278,10 +4022,7 @@ rb_file_flock(VALUE obj, VALUE operation)
case EWOULDBLOCK:
#endif
if (op1 & LOCK_NB) return Qfalse;
-
- time.tv_sec = 0;
- time.tv_usec = 100 * 1000; /* 0.1 sec */
- rb_thread_wait_for(time);
+ rb_thread_polling();
rb_io_check_closed(fptr);
continue;
@@ -4306,10 +4047,15 @@ test_check(int n, int argc, VALUE *argv)
rb_secure(2);
n+=1;
- rb_check_arity(argc, n, n);
+ if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
for (i=1; i<n; i++) {
- if (!RB_TYPE_P(argv[i], T_FILE)) {
+ switch (TYPE(argv[i])) {
+ case T_STRING:
+ default:
FilePathValue(argv[i]);
+ break;
+ case T_FILE:
+ break;
}
}
}
@@ -4318,14 +4064,15 @@ test_check(int n, int argc, VALUE *argv)
/*
* call-seq:
- * test(cmd, file1 [, file2] ) -> obj
+ * test(int_cmd, file1 [, file2] ) -> obj
*
- * Uses the integer +cmd+ to perform various tests on +file1+ (first
- * table below) or on +file1+ and +file2+ (second table).
+ * 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:
*
- * Cmd Returns Meaning
+ * Test Returns Meaning
* "A" | Time | Last access time for file1
* "b" | boolean | True if file1 is a block device
* "c" | boolean | True if file1 is a character device
@@ -4363,7 +4110,7 @@ test_check(int n, int argc, VALUE *argv)
* | | the real uid/gid
* "z" | boolean | True if file1 exists and has a zero length
*
- * Tests that take two files:
+ * Tests that take two files:
*
* "-" | boolean | True if file1 and file2 are identical
* "=" | boolean | True if the modification times of file1
@@ -4379,18 +4126,9 @@ rb_f_test(int argc, VALUE *argv)
{
int cmd;
- if (argc == 0) rb_check_arity(argc, 2, 3);
+ if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments (0 for 2..3)");
cmd = NUM2CHR(argv[0]);
- if (cmd == 0) {
- unknown:
- /* unknown command */
- if (ISPRINT(cmd)) {
- rb_raise(rb_eArgError, "unknown command '%s%c'", cmd == '\'' || cmd == '\\' ? "\\" : "", cmd);
- }
- else {
- rb_raise(rb_eArgError, "unknown command \"\\x%02X\"", cmd);
- }
- }
+ if (cmd == 0) goto unknown;
if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
CHECK(1);
switch (cmd) {
@@ -4470,7 +4208,7 @@ rb_f_test(int argc, VALUE *argv)
CHECK(1);
if (rb_stat(fname, &st) == -1) {
FilePathValue(fname);
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
switch (cmd) {
@@ -4509,7 +4247,15 @@ rb_f_test(int argc, VALUE *argv)
return Qfalse;
}
}
- goto unknown;
+ unknown:
+ /* unknown command */
+ if (ISPRINT(cmd)) {
+ rb_raise(rb_eArgError, "unknown command '%s%c'", cmd == '\'' || cmd == '\\' ? "\\" : "", cmd);
+ }
+ else {
+ rb_raise(rb_eArgError, "unknown command \"\\x%02X\"", cmd);
+ }
+ return Qnil; /* not reached */
}
@@ -4551,7 +4297,7 @@ rb_stat_init(VALUE obj, VALUE fname)
FilePathValue(fname);
fname = rb_str_encode_ospath(fname);
if (STAT(StringValueCStr(fname), &st) == -1) {
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
if (DATA_PTR(obj)) {
xfree(DATA_PTR(obj));
@@ -4570,7 +4316,12 @@ rb_stat_init_copy(VALUE copy, VALUE orig)
{
struct stat *nst;
- if (!OBJ_INIT_COPY(copy, orig)) return copy;
+ if (copy == orig) return orig;
+ rb_check_frozen(copy);
+ /* need better argument type check */
+ if (!rb_obj_is_instance_of(orig, rb_obj_class(copy))) {
+ rb_raise(rb_eTypeError, "wrong argument class");
+ }
if (DATA_PTR(copy)) {
xfree(DATA_PTR(copy));
DATA_PTR(copy) = 0;
@@ -5185,8 +4936,6 @@ path_check_0(VALUE path, int execpath)
{
struct stat st;
const char *p0 = StringValueCStr(path);
- const char *e0;
- rb_encoding *enc;
char *p = 0, *s;
if (!rb_is_absolute_path(p0)) {
@@ -5201,8 +4950,6 @@ path_check_0(VALUE path, int execpath)
path = newpath;
p0 = RSTRING_PTR(path);
}
- e0 = p0 + RSTRING_LEN(path);
- enc = rb_enc_get(path);
for (;;) {
#ifndef S_IWOTH
# define S_IWOTH 002
@@ -5212,25 +4959,23 @@ path_check_0(VALUE path, int execpath)
&& !(p && execpath && (st.st_mode & S_ISVTX))
#endif
&& !access(p0, W_OK)) {
- rb_warn("Insecure world writable dir %s in %sPATH, mode 0%"
- PRI_MODET_PREFIX"o",
+ rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o",
p0, (execpath ? "" : "LOAD_"), st.st_mode);
if (p) *p = '/';
RB_GC_GUARD(path);
return 0;
}
- s = strrdirsep(p0, e0, enc);
+ s = strrdirsep(p0);
if (p) *p = '/';
if (!s || s == p0) return 1;
p = s;
- e0 = p;
*p = '\0';
}
}
#endif
#if ENABLE_PATH_CHECK
-#define fpath_check(path) path_check_0((path), FALSE)
+#define fpath_check(path) path_check_0(path, FALSE)
#else
#define fpath_check(path) 1
#endif
@@ -5262,17 +5007,12 @@ rb_path_check(const char *path)
return 1;
}
-#ifndef _WIN32
-#ifdef __native_client__
-__attribute__((noinline))
-#endif
-int
-rb_file_load_ok(const char *path)
+static int
+file_load_ok(const char *path)
{
int ret = 1;
- int fd = rb_cloexec_open(path, O_RDONLY, 0);
+ int fd = open(path, O_RDONLY);
if (fd == -1) return 0;
- rb_update_max_fd(fd);
#if !defined DOSISH
{
struct stat st;
@@ -5284,7 +5024,12 @@ rb_file_load_ok(const char *path)
(void)close(fd);
return ret;
}
-#endif
+
+int
+rb_file_load_ok(const char *path)
+{
+ return file_load_ok(path);
+}
static int
is_explicit_relative(const char *path)
@@ -5294,10 +5039,11 @@ is_explicit_relative(const char *path)
return isdirsep(*path);
}
+VALUE rb_get_load_path(void);
+
static VALUE
copy_path_class(VALUE path, VALUE orig)
{
- str_shrink(path);
RBASIC(path)->klass = rb_obj_class(orig);
OBJ_FREEZE(path);
return path;
@@ -5337,7 +5083,7 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
fnlen = RSTRING_LEN(fname);
for (i=0; ext[i]; i++) {
rb_str_cat2(fname, ext[i]);
- if (rb_file_load_ok(RSTRING_PTR(fname))) {
+ if (file_load_ok(RSTRING_PTR(fname))) {
*filep = copy_path_class(fname, *filep);
return (int)(i+1);
}
@@ -5350,14 +5096,13 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
}
- RB_GC_GUARD(load_path) = rb_get_expanded_load_path();
+ 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);
- rb_enc_associate_index(tmp, rb_usascii_encindex());
for (j=0; ext[j]; j++) {
rb_str_cat2(fname, ext[j]);
for (i = 0; i < RARRAY_LEN(load_path); i++) {
@@ -5365,8 +5110,8 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
if (RSTRING_LEN(str) == 0) continue;
- rb_file_expand_path_internal(fname, str, 0, 0, tmp);
- if (rb_file_load_ok(RSTRING_PTR(tmp))) {
+ file_expand_path(fname, str, 0, tmp);
+ if (file_load_ok(RSTRING_PTR(tmp))) {
*filep = copy_path_class(tmp, *filep);
return (int)(j+1);
}
@@ -5405,7 +5150,7 @@ rb_find_file_safe(VALUE path, int safe_level)
if (safe_level >= 1 && !fpath_check(path)) {
rb_raise(rb_eSecurityError, "loading from unsafe path %s", f);
}
- if (!rb_file_load_ok(f)) return 0;
+ if (!file_load_ok(f)) return 0;
if (!expanded)
path = copy_path_class(file_expand_path_1(path), path);
return path;
@@ -5415,19 +5160,18 @@ rb_find_file_safe(VALUE path, int safe_level)
rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
}
- RB_GC_GUARD(load_path) = rb_get_expanded_load_path();
+ RB_GC_GUARD(load_path) = rb_get_load_path();
if (load_path) {
long i;
tmp = rb_str_tmp_new(MAXPATHLEN + 2);
- rb_enc_associate_index(tmp, rb_usascii_encindex());
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) {
- rb_file_expand_path_internal(path, str, 0, 0, tmp);
+ file_expand_path(path, str, 0, tmp);
f = RSTRING_PTR(tmp);
- if (rb_file_load_ok(f)) goto found;
+ if (file_load_ok(f)) goto found;
}
}
return 0;
@@ -5451,17 +5195,6 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
rb_define_singleton_method(rb_cFile, name, func, argc);
}
-static const char null_device[] =
-#if defined DOSISH
- "NUL"
-#elif defined AMIGA || defined __amigaos__
- "NIL"
-#elif defined __VMS
- "NL:"
-#else
- "/dev/null"
-#endif
- ;
/*
* A <code>File</code> is an abstraction of any file object accessible
@@ -5591,88 +5324,12 @@ Init_File(void)
rb_define_method(rb_cFile, "flock", rb_file_flock, 1);
- /*
- * Document-module: File::Constants
- *
- * File::Constants provides file-related constants. All possible
- * file constants are listed in the documentation but they may not all
- * be present on your platform.
- *
- * If the underlying platform doesn't define a constant the corresponding
- * Ruby constant is not defined.
- *
- * Your platform documentations (e.g. man open(2)) may describe more
- * detailed information.
- */
rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
rb_include_module(rb_cIO, rb_mFConst);
-
- /* open for reading only */
- rb_define_const(rb_mFConst, "RDONLY", INT2FIX(O_RDONLY));
- /* open for writing only */
- rb_define_const(rb_mFConst, "WRONLY", INT2FIX(O_WRONLY));
- /* open for reading and writing */
- rb_define_const(rb_mFConst, "RDWR", INT2FIX(O_RDWR));
- /* append on each write */
- rb_define_const(rb_mFConst, "APPEND", INT2FIX(O_APPEND));
- /* create file if it does not exist */
- rb_define_const(rb_mFConst, "CREAT", INT2FIX(O_CREAT));
- /* error if CREAT and the file exists */
- rb_define_const(rb_mFConst, "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 */
- rb_define_const(rb_mFConst, "NONBLOCK", INT2FIX(O_NONBLOCK));
-#endif
- /* truncate size to 0 */
- rb_define_const(rb_mFConst, "TRUNC", INT2FIX(O_TRUNC));
-#ifdef O_NOCTTY
- /* not to make opened IO the controlling terminal device */
- rb_define_const(rb_mFConst, "NOCTTY", INT2FIX(O_NOCTTY));
-#endif
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
- /* disable line code conversion */
- rb_define_const(rb_mFConst, "BINARY", INT2FIX(O_BINARY));
-#ifdef O_SYNC
- /* any write operation perform synchronously */
- rb_define_const(rb_mFConst, "SYNC", INT2FIX(O_SYNC));
-#endif
-#ifdef O_DSYNC
- /* any write operation perform synchronously except some meta data */
- rb_define_const(rb_mFConst, "DSYNC", INT2FIX(O_DSYNC));
-#endif
-#ifdef O_RSYNC
- /* any read operation perform synchronously. used with SYNC or DSYNC. */
- rb_define_const(rb_mFConst, "RSYNC", INT2FIX(O_RSYNC));
-#endif
-#ifdef O_NOFOLLOW
- /* do not follow symlinks */
- rb_define_const(rb_mFConst, "NOFOLLOW", INT2FIX(O_NOFOLLOW)); /* FreeBSD, Linux */
-#endif
-#ifdef O_NOATIME
- /* do not change atime */
- rb_define_const(rb_mFConst, "NOATIME", INT2FIX(O_NOATIME)); /* Linux */
-#endif
-#ifdef O_DIRECT
- /* Try to minimize cache effects of the I/O to and from this file. */
- rb_define_const(rb_mFConst, "DIRECT", INT2FIX(O_DIRECT));
-#endif
-
- /* shared lock. see File#flock */
- rb_define_const(rb_mFConst, "LOCK_SH", INT2FIX(LOCK_SH));
- /* exclusive lock. see File#flock */
- rb_define_const(rb_mFConst, "LOCK_EX", INT2FIX(LOCK_EX));
- /* unlock. see File#flock */
- rb_define_const(rb_mFConst, "LOCK_UN", INT2FIX(LOCK_UN));
- /* non-blocking lock. used with LOCK_SH or LOCK_EX. see File#flock */
- rb_define_const(rb_mFConst, "LOCK_NB", INT2FIX(LOCK_NB));
-
- /* Name of the null device */
- rb_define_const(rb_mFConst, "NULL", rb_obj_freeze(rb_usascii_str_new2(null_device)));
+ rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
+ rb_file_const("LOCK_EX", INT2FIX(LOCK_EX));
+ rb_file_const("LOCK_UN", INT2FIX(LOCK_UN));
+ 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);
@@ -5734,8 +5391,4 @@ Init_File(void)
rb_define_method(rb_cStat, "setuid?", rb_stat_suid, 0);
rb_define_method(rb_cStat, "setgid?", rb_stat_sgid, 0);
rb_define_method(rb_cStat, "sticky?", rb_stat_sticky, 0);
-
-#ifdef _WIN32
- rb_w32_init_file();
-#endif
}
diff --git a/gc.c b/gc.c
index 71fd2ced8f..564d260266 100644
--- a/gc.c
+++ b/gc.c
@@ -15,19 +15,13 @@
#include "ruby/st.h"
#include "ruby/re.h"
#include "ruby/io.h"
-#include "ruby/thread.h"
#include "ruby/util.h"
#include "eval_intern.h"
#include "vm_core.h"
-#include "internal.h"
#include "gc.h"
-#include "constant.h"
-#include "ruby_atomic.h"
-#include "probes.h"
#include <stdio.h>
#include <setjmp.h>
#include <sys/types.h>
-#include <assert.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
@@ -36,91 +30,214 @@
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/resource.h"
-# undef HAVE_POSIX_MEMALIGN
-# undef HAVE_MEMALIGN
-
-#endif
#if defined _WIN32 || defined __CYGWIN__
#include <windows.h>
-#elif defined(HAVE_POSIX_MEMALIGN)
-#elif defined(HAVE_MEMALIGN)
-#include <malloc.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))
+# 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))
+# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
# endif
#else
-# define VALGRIND_MAKE_MEM_DEFINED(p, n) 0
-# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) 0
+# 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*);
+
#define rb_setjmp(env) RUBY_SETJMP(env)
#define rb_jmp_buf rb_jmpbuf_t
+/* 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 GC_MALLOC_LIMIT
#define GC_MALLOC_LIMIT 8000000
#endif
-#define HEAP_MIN_SLOTS 10000
-#define FREE_MIN 4096
-typedef struct {
- unsigned int initial_malloc_limit;
- unsigned int initial_heap_min_slots;
- unsigned int initial_free_min;
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
- int gc_stress;
-#endif
-} ruby_gc_params_t;
+#define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
-static ruby_gc_params_t initial_params = {
- GC_MALLOC_LIMIT,
- HEAP_MIN_SLOTS,
- FREE_MIN,
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
- FALSE,
-#endif
-};
+#define MARK_STACK_MAX 1024
-#define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
+int ruby_gc_debug_indent = 0;
-#ifndef GC_PROFILE_MORE_DETAIL
+/* for GC profile */
#define GC_PROFILE_MORE_DETAIL 0
-#endif
-
typedef struct gc_profile_record {
double gc_time;
- double gc_invoke_time;
-
- size_t heap_total_objects;
- size_t heap_use_size;
- size_t heap_total_size;
-
- int is_marked;
-
-#if GC_PROFILE_MORE_DETAIL
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;
-#endif
} 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)
+#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
@@ -160,50 +277,21 @@ typedef struct RVALUE {
#endif
struct heaps_slot {
- struct heaps_header *header;
- uintptr_t *bits;
- RVALUE *freelist;
- struct heaps_slot *next;
- struct heaps_slot *prev;
- struct heaps_slot *free_next;
-};
-
-struct heaps_header {
- struct heaps_slot *base;
- uintptr_t *bits;
- RVALUE *start;
- RVALUE *end;
+ void *membase;
+ RVALUE *slot;
size_t limit;
+ int finalize_flag;
};
-struct heaps_free_bitmap {
- struct heaps_free_bitmap *next;
-};
+#define HEAP_MIN_SLOTS 10000
+#define FREE_MIN 4096
struct gc_list {
VALUE *varptr;
struct gc_list *next;
};
-#define STACK_CHUNK_SIZE 500
-
-typedef struct stack_chunk {
- VALUE data[STACK_CHUNK_SIZE];
- struct stack_chunk *next;
-} stack_chunk_t;
-
-typedef struct mark_stack {
- stack_chunk_t *chunk;
- stack_chunk_t *cache;
- size_t index;
- size_t limit;
- size_t cache_size;
- size_t unused_cache_size;
-} mark_stack_t;
-
-#ifndef CALC_EXACT_MALLOC_SIZE
#define CALC_EXACT_MALLOC_SIZE 0
-#endif
typedef struct rb_objspace {
struct {
@@ -217,31 +305,25 @@ typedef struct rb_objspace {
struct {
size_t increment;
struct heaps_slot *ptr;
- struct heaps_slot *sweep_slots;
- struct heaps_slot *free_slots;
- struct heaps_header **sorted;
size_t length;
size_t used;
- struct heaps_free_bitmap *free_bitmap;
+ RVALUE *freelist;
RVALUE *range[2];
- struct heaps_header *freed;
- size_t marked_num;
- size_t free_num;
- size_t free_min;
- size_t final_num;
- size_t do_heap_free;
+ RVALUE *freed;
} heap;
struct {
int dont_gc;
- int dont_lazy_sweep;
int during_gc;
- rb_atomic_t finalizing;
} flags;
struct {
st_table *table;
RVALUE *deferred;
} final;
- mark_stack_t mark_stack;
+ struct {
+ VALUE buffer[MARK_STACK_MAX];
+ VALUE *ptr;
+ int overflow;
+ } markstack;
struct {
int run;
gc_profile_record *record;
@@ -250,124 +332,42 @@ typedef struct rb_objspace {
double invoke_time;
} profile;
struct gc_list *global_list;
- size_t count;
- size_t total_allocated_object_num;
- size_t total_freed_object_num;
+ unsigned int count;
int gc_stress;
-
- struct mark_func_data_struct {
- void *data;
- void (*mark_func)(VALUE v, void *data);
- } *mark_func_data;
} rb_objspace_t;
#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
#define rb_objspace (*GET_VM()->objspace)
-#define ruby_initial_gc_stress initial_params.gc_stress
+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}};
+static rb_objspace_t rb_objspace = {{GC_MALLOC_LIMIT}, {HEAP_MIN_SLOTS}};
int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
#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 finalizing objspace->flags.finalizing
#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 initial_malloc_limit initial_params.initial_malloc_limit
-#define initial_heap_min_slots initial_params.initial_heap_min_slots
-#define initial_free_min initial_params.initial_free_min
-
-#define is_lazy_sweeping(objspace) ((objspace)->heap.sweep_slots != 0)
-
-#if SIZEOF_LONG == SIZEOF_VOIDP
-# define nonspecial_obj_id(obj) (VALUE)((SIGNED_VALUE)(obj)|FIXNUM_FLAG)
-# define obj_id_to_ref(objid) ((objid) ^ FIXNUM_FLAG) /* unset FIXNUM_FLAG */
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-# define nonspecial_obj_id(obj) LL2NUM((SIGNED_VALUE)(obj) / 2)
-# define obj_id_to_ref(objid) (FIXNUM_P(objid) ? \
- ((objid) ^ FIXNUM_FLAG) : (NUM2PTR(objid) << 1))
-#else
-# error not supported
-#endif
-#define RANY(o) ((RVALUE*)(o))
-#define has_free_object (objspace->heap.free_slots && objspace->heap.free_slots->freelist)
-
-#define HEAP_HEADER(p) ((struct heaps_header *)(p))
-#define GET_HEAP_HEADER(x) (HEAP_HEADER((uintptr_t)(x) & ~(HEAP_ALIGN_MASK)))
-#define GET_HEAP_SLOT(x) (GET_HEAP_HEADER(x)->base)
-#define GET_HEAP_BITMAP(x) (GET_HEAP_HEADER(x)->bits)
-#define NUM_IN_SLOT(p) (((uintptr_t)(p) & HEAP_ALIGN_MASK)/sizeof(RVALUE))
-#define BITMAP_INDEX(p) (NUM_IN_SLOT(p) / (sizeof(uintptr_t) * CHAR_BIT))
-#define BITMAP_OFFSET(p) (NUM_IN_SLOT(p) & ((sizeof(uintptr_t) * CHAR_BIT)-1))
-#define MARKED_IN_BITMAP(bits, p) (bits[BITMAP_INDEX(p)] & ((uintptr_t)1 << BITMAP_OFFSET(p)))
-
-#ifndef HEAP_ALIGN_LOG
-/* default tiny heap size: 16KB */
-#define HEAP_ALIGN_LOG 14
-#endif
-
-#define CEILDIV(i, mod) (((i) + (mod) - 1)/(mod))
-
-enum {
- HEAP_ALIGN = (1UL << HEAP_ALIGN_LOG),
- HEAP_ALIGN_MASK = (~(~0UL << HEAP_ALIGN_LOG)),
- REQUIRED_SIZE_BY_MALLOC = (sizeof(size_t) * 5),
- HEAP_SIZE = (HEAP_ALIGN - REQUIRED_SIZE_BY_MALLOC),
- HEAP_OBJ_LIMIT = (unsigned int)((HEAP_SIZE - sizeof(struct heaps_header))/sizeof(struct RVALUE)),
- HEAP_BITMAP_LIMIT = CEILDIV(CEILDIV(HEAP_SIZE, sizeof(struct RVALUE)), sizeof(uintptr_t) * CHAR_BIT)
-};
-
-int ruby_gc_debug_indent = 0;
-VALUE rb_mGC;
-extern st_table *rb_class_tbl;
-int ruby_disable_gc_stress = 0;
+#define need_call_final (finalizer_table && finalizer_table->num_entries)
static void rb_objspace_call_finalizer(rb_objspace_t *objspace);
-static VALUE define_final0(VALUE obj, VALUE block);
-VALUE rb_define_final(VALUE obj, VALUE block);
-VALUE rb_undefine_final(VALUE obj);
-static void run_final(rb_objspace_t *objspace, VALUE obj);
-static void initial_expand_heap(rb_objspace_t *objspace);
-
-static void negative_size_allocation_error(const char *);
-static void *aligned_malloc(size_t, size_t);
-static void aligned_free(void *);
-
-static void init_mark_stack(mark_stack_t *stack);
-
-static VALUE lazy_sweep_enable(void);
-static int garbage_collect(rb_objspace_t *);
-static int gc_prepare_free_objects(rb_objspace_t *);
-static void mark_tbl(rb_objspace_t *, st_table *);
-static void rest_sweep(rb_objspace_t *);
-static void gc_mark_stacked_objects(rb_objspace_t *);
-
-static double getrusage_time(void);
-static inline void gc_prof_timer_start(rb_objspace_t *);
-static inline void gc_prof_timer_stop(rb_objspace_t *, int);
-static inline void gc_prof_mark_timer_start(rb_objspace_t *);
-static inline void gc_prof_mark_timer_stop(rb_objspace_t *);
-static inline void gc_prof_sweep_timer_start(rb_objspace_t *);
-static inline void gc_prof_sweep_timer_stop(rb_objspace_t *);
-static inline void gc_prof_set_malloc_info(rb_objspace_t *);
-
-
-/*
- --------------------------- ObjectSpace -----------------------------
-*/
#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
rb_objspace_t *
@@ -375,20 +375,16 @@ rb_objspace_alloc(void)
{
rb_objspace_t *objspace = malloc(sizeof(rb_objspace_t));
memset(objspace, 0, sizeof(*objspace));
- malloc_limit = initial_malloc_limit;
+ malloc_limit = GC_MALLOC_LIMIT;
ruby_gc_stress = ruby_initial_gc_stress;
return objspace;
}
-#endif
-
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-static void free_stack_chunks(mark_stack_t *);
void
rb_objspace_free(rb_objspace_t *objspace)
{
- rest_sweep(objspace);
+ rb_objspace_call_finalizer(objspace);
if (objspace->profile.record) {
free(objspace->profile.record);
objspace->profile.record = 0;
@@ -397,1854 +393,777 @@ rb_objspace_free(rb_objspace_t *objspace)
struct gc_list *list, *next;
for (list = global_List; list; list = next) {
next = list->next;
- xfree(list);
+ free(list);
}
}
- if (objspace->heap.free_bitmap) {
- struct heaps_free_bitmap *list, *next;
- for (list = objspace->heap.free_bitmap; list; list = next) {
- next = list->next;
- free(list);
- }
- }
- if (objspace->heap.sorted) {
+ if (heaps) {
size_t i;
for (i = 0; i < heaps_used; ++i) {
- free(objspace->heap.sorted[i]->bits);
- aligned_free(objspace->heap.sorted[i]);
+ free(heaps[i].membase);
}
- free(objspace->heap.sorted);
+ free(heaps);
heaps_used = 0;
heaps = 0;
}
- free_stack_chunks(&objspace->mark_stack);
free(objspace);
}
#endif
-void
-rb_global_variable(VALUE *var)
-{
- rb_gc_register_address(var);
-}
-
-static void
-allocate_sorted_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
-{
- struct heaps_header **p;
- struct heaps_free_bitmap *bits;
- size_t size, add, i;
-
- size = next_heaps_length*sizeof(struct heaps_header *);
- add = next_heaps_length - heaps_used;
-
- if (heaps_used > 0) {
- p = (struct heaps_header **)realloc(objspace->heap.sorted, size);
- if (p) objspace->heap.sorted = p;
- }
- else {
- p = objspace->heap.sorted = (struct heaps_header **)malloc(size);
- }
+/* 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;
- if (p == 0) {
- during_gc = 0;
- rb_memerror();
- }
+int ruby_disable_gc_stress = 0;
- for (i = 0; i < add; i++) {
- bits = (struct heaps_free_bitmap *)malloc(HEAP_BITMAP_LIMIT * sizeof(uintptr_t));
- if (bits == 0) {
- during_gc = 0;
- rb_memerror();
- return;
- }
- bits->next = objspace->heap.free_bitmap;
- objspace->heap.free_bitmap = bits;
- }
-}
+static void run_final(rb_objspace_t *objspace, VALUE obj);
+static int garbage_collect(rb_objspace_t *objspace);
-static void
-link_free_heap_slot(rb_objspace_t *objspace, struct heaps_slot *slot)
+void
+rb_global_variable(VALUE *var)
{
- slot->free_next = objspace->heap.free_slots;
- objspace->heap.free_slots = slot;
+ rb_gc_register_address(var);
}
-static void
-unlink_free_heap_slot(rb_objspace_t *objspace, struct heaps_slot *slot)
+static void *
+ruby_memerror_body(void *dummy)
{
- objspace->heap.free_slots = slot->free_next;
- slot->free_next = NULL;
+ rb_memerror();
+ return 0;
}
static void
-assign_heap_slot(rb_objspace_t *objspace)
+ruby_memerror(void)
{
- RVALUE *p, *pend, *membase;
- struct heaps_slot *slot;
- size_t hi, lo, mid;
- size_t objs;
-
- objs = HEAP_OBJ_LIMIT;
- p = (RVALUE*)aligned_malloc(HEAP_ALIGN, HEAP_SIZE);
- if (p == 0) {
- during_gc = 0;
+ if (ruby_thread_has_gvl_p()) {
rb_memerror();
}
- slot = (struct heaps_slot *)malloc(sizeof(struct heaps_slot));
- if (slot == 0) {
- aligned_free(p);
- during_gc = 0;
- rb_memerror();
- }
- MEMZERO((void*)slot, struct heaps_slot, 1);
-
- slot->next = heaps;
- if (heaps) heaps->prev = slot;
- heaps = slot;
-
- membase = p;
- p = (RVALUE*)((VALUE)p + sizeof(struct heaps_header));
- if ((VALUE)p % sizeof(RVALUE) != 0) {
- p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
- objs = (HEAP_SIZE - (size_t)((VALUE)p - (VALUE)membase))/sizeof(RVALUE);
- }
-
- lo = 0;
- hi = heaps_used;
- while (lo < hi) {
- register RVALUE *mid_membase;
- mid = (lo + hi) / 2;
- mid_membase = (RVALUE *)objspace->heap.sorted[mid];
- if (mid_membase < membase) {
- lo = mid + 1;
- }
- else if (mid_membase > membase) {
- hi = mid;
+ else {
+ if (ruby_native_thread_p()) {
+ rb_thread_call_with_gvl(ruby_memerror_body, 0);
}
else {
- rb_bug("same heap slot is allocated: %p at %"PRIuVALUE, (void *)membase, (VALUE)mid);
+ /* no ruby thread */
+ fprintf(stderr, "[FATAL] failed to allocate memory\n");
+ exit(EXIT_FAILURE);
}
}
- if (hi < heaps_used) {
- MEMMOVE(&objspace->heap.sorted[hi+1], &objspace->heap.sorted[hi], struct heaps_header*, heaps_used - hi);
- }
- heaps->header = (struct heaps_header *)membase;
- objspace->heap.sorted[hi] = heaps->header;
- objspace->heap.sorted[hi]->start = p;
- objspace->heap.sorted[hi]->end = (p + objs);
- objspace->heap.sorted[hi]->base = heaps;
- objspace->heap.sorted[hi]->limit = objs;
- assert(objspace->heap.free_bitmap != NULL);
- heaps->bits = (uintptr_t *)objspace->heap.free_bitmap;
- objspace->heap.sorted[hi]->bits = (uintptr_t *)objspace->heap.free_bitmap;
- objspace->heap.free_bitmap = objspace->heap.free_bitmap->next;
- memset(heaps->bits, 0, HEAP_BITMAP_LIMIT * sizeof(uintptr_t));
- pend = p + objs;
- if (lomem == 0 || lomem > p) lomem = p;
- if (himem < pend) himem = pend;
- heaps_used++;
-
- while (p < pend) {
- p->as.free.flags = 0;
- p->as.free.next = heaps->freelist;
- heaps->freelist = p;
- p++;
- }
- link_free_heap_slot(objspace, heaps);
}
-static void
-add_heap_slots(rb_objspace_t *objspace, size_t add)
+void
+rb_memerror(void)
{
- size_t i;
- size_t next_heaps_length;
-
- next_heaps_length = heaps_used + add;
-
- if (next_heaps_length > heaps_length) {
- allocate_sorted_heaps(objspace, next_heaps_length);
- heaps_length = next_heaps_length;
+ rb_thread_t *th = GET_THREAD();
+ if (!nomem_error ||
+ (rb_thread_raised_p(th, RAISED_NOMEMORY) && rb_safe_level() < 4)) {
+ fprintf(stderr, "[FATAL] failed to allocate memory\n");
+ exit(EXIT_FAILURE);
}
-
- for (i = 0; i < add; i++) {
- assign_heap_slot(objspace);
+ if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
+ rb_thread_raised_clear(th);
+ GET_THREAD()->errinfo = nomem_error;
+ JUMP_TAG(TAG_RAISE);
}
- heaps_inc = 0;
+ rb_thread_raised_set(th, RAISED_NOMEMORY);
+ rb_exc_raise(nomem_error);
}
-static void
-init_heap(rb_objspace_t *objspace)
-{
- add_heap_slots(objspace, HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT);
- init_mark_stack(&objspace->mark_stack);
-
-#ifdef USE_SIGALTSTACK
- {
- /* altstack of another threads are allocated in another place */
- rb_thread_t *th = GET_THREAD();
- void *tmp = th->altstack;
- th->altstack = malloc(rb_sigaltstack_size());
- free(tmp); /* free previously allocated area */
- }
-#endif
-
- objspace->profile.invoke_time = getrusage_time();
- finalizer_table = st_init_numtable();
-}
+/*
+ * call-seq:
+ * GC.stress -> true or false
+ *
+ * returns current status of GC stress mode.
+ */
-static void
-initial_expand_heap(rb_objspace_t *objspace)
+static VALUE
+gc_stress_get(VALUE self)
{
- size_t min_size = initial_heap_min_slots / HEAP_OBJ_LIMIT;
-
- if (min_size > heaps_used) {
- add_heap_slots(objspace, min_size - heaps_used);
- }
+ rb_objspace_t *objspace = &rb_objspace;
+ return ruby_gc_stress ? Qtrue : Qfalse;
}
-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_sorted_heaps(objspace, next_heaps_length);
- heaps_length = next_heaps_length;
- }
-}
+/*
+ * call-seq:
+ * GC.stress = bool -> bool
+ *
+ * updates GC stress mode.
+ *
+ * When GC.stress = true, GC is invoked for all GC opportunity:
+ * all memory and object allocation.
+ *
+ * Since it makes Ruby very slow, it is only for debugging.
+ */
-static int
-heaps_increment(rb_objspace_t *objspace)
+static VALUE
+gc_stress_set(VALUE self, VALUE flag)
{
- if (heaps_inc > 0) {
- assign_heap_slot(objspace);
- heaps_inc--;
- return TRUE;
- }
- return FALSE;
+ 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
-newobj(VALUE klass, VALUE flags)
+gc_profile_enable_get(VALUE self)
{
rb_objspace_t *objspace = &rb_objspace;
- VALUE obj;
-
- if (UNLIKELY(during_gc)) {
- dont_gc = 1;
- during_gc = 0;
- rb_bug("object allocation during garbage collection phase");
- }
-
- if (UNLIKELY(ruby_gc_stress && !ruby_disable_gc_stress)) {
- if (!garbage_collect(objspace)) {
- during_gc = 0;
- rb_memerror();
- }
- }
-
- if (UNLIKELY(!has_free_object)) {
- if (!gc_prepare_free_objects(objspace)) {
- during_gc = 0;
- rb_memerror();
- }
- }
-
- obj = (VALUE)objspace->heap.free_slots->freelist;
- objspace->heap.free_slots->freelist = RANY(obj)->as.free.next;
- if (objspace->heap.free_slots->freelist == NULL) {
- unlink_free_heap_slot(objspace, objspace->heap.free_slots);
- }
-
- MEMZERO((void*)obj, RVALUE, 1);
-#ifdef GC_DEBUG
- RANY(obj)->file = rb_sourcefile();
- RANY(obj)->line = rb_sourceline();
-#endif
- objspace->total_allocated_object_num++;
-
- return obj;
+ return objspace->profile.run;
}
-VALUE
-rb_newobj(void)
-{
- return newobj(0, T_NONE);
-}
+/*
+ * call-seq:
+ * GC::Profiler.enable -> nil
+ *
+ * updates GC profile mode.
+ * start profiler for GC.
+ *
+ */
-VALUE
-rb_newobj_of(VALUE klass, VALUE flags)
+static VALUE
+gc_profile_enable(void)
{
- VALUE obj;
-
- obj = newobj(klass, flags);
- OBJSETUP(obj, klass, flags);
+ rb_objspace_t *objspace = &rb_objspace;
- return obj;
+ objspace->profile.run = TRUE;
+ return Qnil;
}
-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;
-}
+/*
+ * call-seq:
+ * GC::Profiler.disable -> nil
+ *
+ * updates GC profile mode.
+ * stop profiler for GC.
+ *
+ */
-VALUE
-rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
+static VALUE
+gc_profile_disable(void)
{
- NEWOBJ(data, struct RData);
- if (klass) Check_Type(klass, T_CLASS);
- OBJSETUP(data, klass, T_DATA);
- data->data = datap;
- data->dfree = dfree;
- data->dmark = dmark;
+ rb_objspace_t *objspace = &rb_objspace;
- return (VALUE)data;
+ objspace->profile.run = FALSE;
+ return Qnil;
}
-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;
+/*
+ * call-seq:
+ * GC::Profiler.clear -> nil
+ *
+ * clear before profile data.
+ *
+ */
- return (VALUE)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;
}
-size_t
-rb_objspace_data_type_memsize(VALUE obj)
+static void *
+negative_size_allocation_error_with_gvl(void *ptr)
{
- if (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj)->function.dsize) {
- return RTYPEDDATA_TYPE(obj)->function.dsize(RTYPEDDATA_DATA(obj));
- }
- else {
- return 0;
- }
+ rb_raise(rb_eNoMemError, "%s", (const char *)ptr);
+ return 0; /* should not be reached */
}
-const char *
-rb_objspace_data_type_name(VALUE obj)
+static void
+negative_size_allocation_error(const char *msg)
{
- if (RTYPEDDATA_P(obj)) {
- return RTYPEDDATA_TYPE(obj)->wrap_struct_name;
+ if (ruby_thread_has_gvl_p()) {
+ rb_raise(rb_eNoMemError, "%s", msg);
}
else {
- return 0;
- }
-}
-
-static void gc_mark(rb_objspace_t *objspace, VALUE ptr);
-static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr);
-
-static inline int
-is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
-{
- register RVALUE *p = RANY(ptr);
- register struct heaps_header *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 = objspace->heap.sorted[mid];
- if (heap->start <= p) {
- if (p < heap->end)
- return TRUE;
- lo = mid + 1;
+ if (ruby_native_thread_p()) {
+ rb_thread_call_with_gvl(negative_size_allocation_error_with_gvl, (void *)msg);
}
else {
- hi = mid;
+ fprintf(stderr, "[FATAL] %s\n", msg);
+ exit(EXIT_FAILURE);
}
}
- return FALSE;
-}
-
-static int
-free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data)
-{
- if (!me->mark) {
- rb_free_method_entry(me);
- }
- return ST_CONTINUE;
}
-void
-rb_free_m_table(st_table *tbl)
+static void *
+gc_with_gvl(void *ptr)
{
- st_foreach(tbl, free_method_entry_i, 0);
- st_free_table(tbl);
+ return (void *)(VALUE)garbage_collect((rb_objspace_t *)ptr);
}
static int
-free_const_entry_i(ID key, rb_const_entry_t *ce, st_data_t data)
-{
- xfree(ce);
- return ST_CONTINUE;
-}
-
-void
-rb_free_const_table(st_table *tbl)
-{
- st_foreach(tbl, free_const_entry_i, 0);
- st_free_table(tbl);
-}
-
-static int obj_free(rb_objspace_t *, VALUE);
-
-static inline struct heaps_slot *
-add_slot_local_freelist(rb_objspace_t *objspace, RVALUE *p)
-{
- struct heaps_slot *slot;
-
- (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
- p->as.free.flags = 0;
- slot = GET_HEAP_SLOT(p);
- p->as.free.next = slot->freelist;
- slot->freelist = p;
-
- return slot;
-}
-
-static void
-unlink_heap_slot(rb_objspace_t *objspace, struct heaps_slot *slot)
-{
- if (slot->prev)
- slot->prev->next = slot->next;
- if (slot->next)
- slot->next->prev = slot->prev;
- if (heaps == slot)
- heaps = slot->next;
- if (objspace->heap.sweep_slots == slot)
- objspace->heap.sweep_slots = slot->next;
- slot->prev = NULL;
- slot->next = NULL;
-}
-
-static void
-free_unused_heaps(rb_objspace_t *objspace)
+garbage_collect_with_gvl(rb_objspace_t *objspace)
{
- size_t i, j;
- struct heaps_header *last = 0;
-
- for (i = j = 1; j < heaps_used; i++) {
- if (objspace->heap.sorted[i]->limit == 0) {
- struct heaps_header* h = objspace->heap.sorted[i];
- ((struct heaps_free_bitmap *)(h->bits))->next =
- objspace->heap.free_bitmap;
- objspace->heap.free_bitmap = (struct heaps_free_bitmap *)h->bits;
- if (!last) {
- last = objspace->heap.sorted[i];
- }
- else {
- aligned_free(objspace->heap.sorted[i]);
- }
- heaps_used--;
- }
- else {
- if (i != j) {
- objspace->heap.sorted[j] = objspace->heap.sorted[i];
- }
- j++;
- }
+ if (dont_gc) return TRUE;
+ if (ruby_thread_has_gvl_p()) {
+ return garbage_collect(objspace);
}
- if (last) {
- if (last < heaps_freed) {
- aligned_free(heaps_freed);
- heaps_freed = last;
+ else {
+ if (ruby_native_thread_p()) {
+ return (int)(VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)objspace);
}
else {
- aligned_free(last);
+ /* no ruby thread */
+ fprintf(stderr, "[FATAL] failed to allocate memory\n");
+ exit(EXIT_FAILURE);
}
}
}
-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_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;
-}
+static void vm_xfree(rb_objspace_t *objspace, void *ptr);
-static int
-obj_free(rb_objspace_t *objspace, VALUE obj)
+static void *
+vm_xmalloc(rb_objspace_t *objspace, size_t size)
{
- switch (BUILTIN_TYPE(obj)) {
- case T_NIL:
- case T_FIXNUM:
- case T_TRUE:
- case T_FALSE:
- rb_bug("obj_free() called for broken object");
- break;
- }
+ void *mem;
- if (FL_TEST(obj, FL_EXIVAR)) {
- rb_free_generic_ivar((VALUE)obj);
- FL_UNSET(obj, FL_EXIVAR);
+ if ((ssize_t)size < 0) {
+ negative_size_allocation_error("negative allocation size (or too big)");
}
+ if (size == 0) size = 1;
- switch (BUILTIN_TYPE(obj)) {
- 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);
- }
- break;
- case T_MODULE:
- case T_CLASS:
- rb_clear_cache_by_class((VALUE)obj);
- if (RCLASS_M_TBL(obj)) {
- rb_free_m_table(RCLASS_M_TBL(obj));
- }
- if (RCLASS_IV_TBL(obj)) {
- st_free_table(RCLASS_IV_TBL(obj));
- }
- if (RCLASS_CONST_TBL(obj)) {
- rb_free_const_table(RCLASS_CONST_TBL(obj));
- }
- if (RCLASS_IV_INDEX_TBL(obj)) {
- st_free_table(RCLASS_IV_INDEX_TBL(obj));
- }
- xfree(RANY(obj)->as.klass.ptr);
- break;
- case T_STRING:
- rb_str_free(obj);
- break;
- case T_ARRAY:
- rb_ary_free(obj);
- break;
- case T_HASH:
- if (RANY(obj)->as.hash.ntbl) {
- st_free_table(RANY(obj)->as.hash.ntbl);
- }
- break;
- case T_REGEXP:
- if (RANY(obj)->as.regexp.ptr) {
- onig_free(RANY(obj)->as.regexp.ptr);
- }
- break;
- case T_DATA:
- if (DATA_PTR(obj)) {
- if (RTYPEDDATA_P(obj)) {
- RDATA(obj)->dfree = RANY(obj)->as.typeddata.type->function.dfree;
- }
- if (RANY(obj)->as.data.dfree == (RUBY_DATA_FUNC)-1) {
- xfree(DATA_PTR(obj));
- }
- else if (RANY(obj)->as.data.dfree) {
- make_deferred(RANY(obj));
- return 1;
- }
- }
- 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);
- }
- break;
- case T_FILE:
- if (RANY(obj)->as.file.fptr) {
- make_io_deferred(RANY(obj));
- return 1;
- }
- break;
- case T_RATIONAL:
- case T_COMPLEX:
- break;
- case T_ICLASS:
- /* iClass shares table with the module */
- xfree(RANY(obj)->as.klass.ptr);
- break;
-
- case T_FLOAT:
- break;
+#if CALC_EXACT_MALLOC_SIZE
+ size += sizeof(size_t);
+#endif
- case T_BIGNUM:
- if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
- xfree(RBIGNUM_DIGITS(obj));
- }
- 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);
- }
- break;
- case NODE_ARGS:
- if (RANY(obj)->as.node.u3.args) {
- xfree(RANY(obj)->as.node.u3.args);
- }
- break;
- case NODE_ALLOCA:
- xfree(RANY(obj)->as.node.u1.node);
- break;
+ if ((ruby_gc_stress && !ruby_disable_gc_stress) ||
+ (malloc_increase+size) > malloc_limit) {
+ garbage_collect_with_gvl(objspace);
+ }
+ mem = malloc(size);
+ if (!mem) {
+ if (garbage_collect_with_gvl(objspace)) {
+ mem = malloc(size);
}
- break; /* no need to free iv_tbl */
-
- 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 (!mem) {
+ ruby_memerror();
}
- break;
-
- default:
- rb_bug("gc_sweep(): unknown data type 0x%x(%p) 0x%"PRIxVALUE,
- BUILTIN_TYPE(obj), (void*)obj, RBASIC(obj)->flags);
}
+ malloc_increase += size;
- return 0;
-}
+#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
-void
-Init_heap(void)
-{
- init_heap(&rb_objspace);
+ return mem;
}
-typedef int each_obj_callback(void *, void *, size_t, void *);
-
-struct each_obj_args {
- each_obj_callback *callback;
- void *data;
-};
-
-static VALUE
-objspace_each_objects(VALUE arg)
+static void *
+vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size)
{
- size_t i;
- RVALUE *membase = 0;
- RVALUE *pstart, *pend;
- rb_objspace_t *objspace = &rb_objspace;
- struct each_obj_args *args = (struct each_obj_args *)arg;
- volatile VALUE v;
+ void *mem;
- i = 0;
- while (i < heaps_used) {
- while (0 < i && (uintptr_t)membase < (uintptr_t)objspace->heap.sorted[i-1])
- i--;
- while (i < heaps_used && (uintptr_t)objspace->heap.sorted[i] <= (uintptr_t)membase)
- i++;
- if (heaps_used <= i)
- break;
- membase = (RVALUE *)objspace->heap.sorted[i];
+ if ((ssize_t)size < 0) {
+ negative_size_allocation_error("negative re-allocation size");
+ }
+ if (!ptr) return vm_xmalloc(objspace, size);
+ if (size == 0) {
+ vm_xfree(objspace, ptr);
+ return 0;
+ }
+ if (ruby_gc_stress && !ruby_disable_gc_stress)
+ garbage_collect_with_gvl(objspace);
- pstart = objspace->heap.sorted[i]->start;
- pend = pstart + objspace->heap.sorted[i]->limit;
+#if CALC_EXACT_MALLOC_SIZE
+ size += sizeof(size_t);
+ objspace->malloc_params.allocated_size -= size;
+ ptr = (size_t *)ptr - 1;
+#endif
- for (; pstart != pend; pstart++) {
- if (pstart->as.basic.flags) {
- v = (VALUE)pstart; /* acquire to save this object */
- break;
- }
- }
- if (pstart != pend) {
- if ((*args->callback)(pstart, pend, sizeof(RVALUE), args->data)) {
- break;
- }
+ mem = realloc(ptr, size);
+ if (!mem) {
+ if (garbage_collect_with_gvl(objspace)) {
+ mem = realloc(ptr, size);
}
+ if (!mem) {
+ ruby_memerror();
+ }
}
- RB_GC_GUARD(v);
+ malloc_increase += size;
- return Qnil;
+#if CALC_EXACT_MALLOC_SIZE
+ objspace->malloc_params.allocated_size += size;
+ ((size_t *)mem)[0] = size;
+ mem = (size_t *)mem + 1;
+#endif
+
+ return mem;
}
-/*
- * 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)->flags) { // 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(each_obj_callback *callback, void *data)
+static void
+vm_xfree(rb_objspace_t *objspace, void *ptr)
{
- struct each_obj_args args;
- rb_objspace_t *objspace = &rb_objspace;
-
- rest_sweep(objspace);
- objspace->flags.dont_lazy_sweep = TRUE;
+#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
- args.callback = callback;
- args.data = data;
- rb_ensure(objspace_each_objects, (VALUE)&args, lazy_sweep_enable, Qnil);
+ free(ptr);
}
-struct os_each_struct {
- size_t num;
- VALUE of;
-};
+void *
+ruby_xmalloc(size_t size)
+{
+ return vm_xmalloc(&rb_objspace, size);
+}
-static int
-internal_object_p(VALUE obj)
+void *
+ruby_xmalloc2(size_t n, size_t size)
{
- RVALUE *p = (RVALUE *)obj;
-
- if (p->as.basic.flags) {
- switch (BUILTIN_TYPE(p)) {
- case T_NONE:
- case T_ICLASS:
- case T_NODE:
- case T_ZOMBIE:
- break;
- case T_CLASS:
- if (FL_TEST(p, FL_SINGLETON))
- break;
- default:
- if (!p->as.basic.klass) break;
- return 0;
- }
+ size_t len = size * n;
+ if (n != 0 && size != len / n) {
+ rb_raise(rb_eArgError, "malloc: possible integer overflow");
}
- return 1;
+ return vm_xmalloc(&rb_objspace, len);
}
-int
-rb_objspace_internal_object_p(VALUE obj)
+void *
+ruby_xcalloc(size_t n, size_t size)
{
- return internal_object_p(obj);
+ void *mem = ruby_xmalloc2(n, size);
+ memset(mem, 0, n * size);
+
+ return mem;
}
-static int
-os_obj_of_i(void *vstart, void *vend, size_t stride, void *data)
+void *
+ruby_xrealloc(void *ptr, size_t size)
{
- struct os_each_struct *oes = (struct os_each_struct *)data;
- RVALUE *p = (RVALUE *)vstart, *pend = (RVALUE *)vend;
+ return vm_xrealloc(&rb_objspace, ptr, size);
+}
- for (; p != pend; p++) {
- volatile VALUE v = (VALUE)p;
- if (!internal_object_p(v)) {
- if (!oes->of || rb_obj_is_kind_of(v, oes->of)) {
- rb_yield(v);
- oes->num++;
- }
- }
+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 0;
+ return ruby_xrealloc(ptr, len);
}
-static VALUE
-os_obj_of(VALUE of)
+void
+ruby_xfree(void *x)
{
- struct os_each_struct oes;
-
- oes.num = 0;
- oes.of = of;
- rb_objspace_each_objects(os_obj_of_i, &oes);
- return SIZET2NUM(oes.num);
+ if (x)
+ vm_xfree(&rb_objspace, x);
}
+
/*
* call-seq:
- * ObjectSpace.each_object([module]) {|obj| ... } -> fixnum
- * ObjectSpace.each_object([module]) -> an_enumerator
- *
- * Calls the block once for each living, nonimmediate object in this
- * Ruby process. If <i>module</i> is specified, calls the block
- * for only those classes or modules that match (or are a subclass of)
- * <i>module</i>. Returns the number of objects found. Immediate
- * objects (<code>Fixnum</code>s, <code>Symbol</code>s
- * <code>true</code>, <code>false</code>, and <code>nil</code>) are
- * never returned. In the example below, <code>each_object</code>
- * returns both the numbers we defined and several constants defined in
- * the <code>Math</code> module.
- *
- * If no block is given, an enumerator is returned instead.
- *
- * a = 102.7
- * b = 95 # Won't be returned
- * c = 12345678987654321
- * count = ObjectSpace.each_object(Numeric) {|x| p x }
- * puts "Total count: #{count}"
+ * GC.enable -> true or false
*
- * <em>produces:</em>
+ * Enables garbage collection, returning <code>true</code> if garbage
+ * collection was previously disabled.
*
- * 12345678987654321
- * 102.7
- * 2.71828182845905
- * 3.14159265358979
- * 2.22044604925031e-16
- * 1.7976931348623157e+308
- * 2.2250738585072e-308
- * Total count: 7
+ * GC.disable #=> false
+ * GC.enable #=> true
+ * GC.enable #=> false
*
*/
-static VALUE
-os_each_obj(int argc, VALUE *argv, VALUE os)
+VALUE
+rb_gc_enable(void)
{
- VALUE of;
+ rb_objspace_t *objspace = &rb_objspace;
+ int old = dont_gc;
- rb_secure(4);
- if (argc == 0) {
- of = 0;
- }
- else {
- rb_scan_args(argc, argv, "01", &of);
- }
- RETURN_ENUMERATOR(os, 1, &of);
- return os_obj_of(of);
+ dont_gc = FALSE;
+ return old ? Qtrue : Qfalse;
}
/*
* call-seq:
- * ObjectSpace.undefine_finalizer(obj)
+ * GC.disable -> true or false
*
- * Removes all finalizers for <i>obj</i>.
+ * Disables garbage collection, returning <code>true</code> if garbage
+ * collection was already disabled.
+ *
+ * GC.disable #=> false
+ * GC.disable #=> true
*
*/
-static VALUE
-undefine_final(VALUE os, VALUE obj)
-{
- return rb_undefine_final(obj);
-}
-
VALUE
-rb_undefine_final(VALUE obj)
+rb_gc_disable(void)
{
rb_objspace_t *objspace = &rb_objspace;
- st_data_t data = obj;
- rb_check_frozen(obj);
- st_delete(finalizer_table, &data, 0);
- FL_UNSET(obj, FL_FINALIZE);
- return obj;
+ int old = dont_gc;
+
+ dont_gc = TRUE;
+ return old ? Qtrue : Qfalse;
}
-/*
- * call-seq:
- * ObjectSpace.define_finalizer(obj, aProc=proc())
- *
- * Adds <i>aProc</i> as a finalizer, to be called after <i>obj</i>
- * was destroyed.
- *
- */
+VALUE rb_mGC;
-static VALUE
-define_final(int argc, VALUE *argv, VALUE os)
+void
+rb_gc_register_mark_object(VALUE obj)
{
- VALUE obj, block;
-
- rb_scan_args(argc, argv, "11", &obj, &block);
- rb_check_frozen(obj);
- if (argc == 1) {
- block = rb_block_proc();
- }
- else if (!rb_respond_to(block, rb_intern("call"))) {
- rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
- rb_obj_classname(block));
- }
-
- return define_final0(obj, block);
+ VALUE ary = GET_THREAD()->vm->mark_object_ary;
+ rb_ary_push(ary, obj);
}
-static VALUE
-define_final0(VALUE obj, VALUE block)
+void
+rb_gc_register_address(VALUE *addr)
{
rb_objspace_t *objspace = &rb_objspace;
- VALUE table;
- st_data_t data;
-
- if (!FL_ABLE(obj)) {
- rb_raise(rb_eArgError, "cannot define finalizer for %s",
- rb_obj_classname(obj));
- }
- RBASIC(obj)->flags |= FL_FINALIZE;
-
- block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
- OBJ_FREEZE(block);
-
- if (st_lookup(finalizer_table, obj, &data)) {
- table = (VALUE)data;
- rb_ary_push(table, block);
- }
- else {
- table = rb_ary_new3(1, block);
- RBASIC(table)->klass = 0;
- st_add_direct(finalizer_table, obj, table);
- }
- return block;
-}
+ struct gc_list *tmp;
-VALUE
-rb_define_final(VALUE obj, VALUE block)
-{
- rb_check_frozen(obj);
- if (!rb_respond_to(block, rb_intern("call"))) {
- rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
- rb_obj_classname(block));
- }
- return define_final0(obj, block);
+ tmp = ALLOC(struct gc_list);
+ tmp->next = global_List;
+ tmp->varptr = addr;
+ global_List = tmp;
}
void
-rb_gc_copy_finalizer(VALUE dest, VALUE obj)
+rb_gc_unregister_address(VALUE *addr)
{
rb_objspace_t *objspace = &rb_objspace;
- VALUE table;
- st_data_t data;
+ struct gc_list *tmp = global_List;
- if (!FL_TEST(obj, FL_FINALIZE)) return;
- if (st_lookup(finalizer_table, obj, &data)) {
- table = (VALUE)data;
- st_insert(finalizer_table, dest, table);
+ if (tmp->varptr == addr) {
+ global_List = tmp->next;
+ xfree(tmp);
+ return;
}
- FL_SET(dest, FL_FINALIZE);
-}
+ while (tmp->next) {
+ if (tmp->next->varptr == addr) {
+ struct gc_list *t = tmp->next;
-static VALUE
-run_single_final(VALUE arg)
-{
- VALUE *args = (VALUE *)arg;
- rb_eval_cmd(args[0], args[1], (int)args[2]);
- return Qnil;
+ tmp->next = tmp->next->next;
+ xfree(t);
+ break;
+ }
+ tmp = tmp->next;
+ }
}
+
static void
-run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE table)
+allocate_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
{
- long i;
- int status;
- VALUE args[3];
- VALUE objid = nonspecial_obj_id(obj);
- VALUE saved_errinfo = rb_errinfo();
+ struct heaps_slot *p;
+ size_t size;
- if (RARRAY_LEN(table) > 0) {
- args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
+ size = next_heaps_length*sizeof(struct heaps_slot);
+
+ if (heaps_used > 0) {
+ p = (struct heaps_slot *)realloc(heaps, size);
+ if (p) heaps = p;
}
else {
- args[1] = 0;
+ p = heaps = (struct heaps_slot *)malloc(size);
}
- args[2] = (VALUE)rb_safe_level();
- rb_set_errinfo(Qnil);
- 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]);
- status = 0;
- rb_protect(run_single_final, (VALUE)args, &status);
- if (status)
- rb_set_errinfo(Qnil);
+ if (p == 0) {
+ during_gc = 0;
+ rb_memerror();
}
- GET_THREAD()->errinfo = saved_errinfo;
+ heaps_length = next_heaps_length;
}
static void
-run_final(rb_objspace_t *objspace, VALUE obj)
+assign_heap_slot(rb_objspace_t *objspace)
{
- RUBY_DATA_FUNC free_func = 0;
- st_data_t key, table;
-
- objspace->heap.final_num--;
+ RVALUE *p, *pend, *membase;
+ size_t hi, lo, mid;
+ size_t objs;
- RBASIC(obj)->klass = 0;
+ objs = HEAP_OBJ_LIMIT;
+ p = (RVALUE*)malloc(HEAP_SIZE);
- if (RTYPEDDATA_P(obj)) {
- free_func = RTYPEDDATA_TYPE(obj)->function.dfree;
- }
- else {
- free_func = RDATA(obj)->dfree;
- }
- if (free_func) {
- (*free_func)(DATA_PTR(obj));
+ if (p == 0) {
+ during_gc = 0;
+ rb_memerror();
}
- key = (st_data_t)obj;
- if (st_delete(finalizer_table, &key, &table)) {
- run_finalizer(objspace, obj, (VALUE)table);
+ 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 void
-finalize_list(rb_objspace_t *objspace, RVALUE *p)
-{
- while (p) {
- RVALUE *tmp = p->as.free.next;
- run_final(objspace, (VALUE)p);
- objspace->total_freed_object_num++;
- if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
- add_slot_local_freelist(objspace, p);
- objspace->heap.free_num++;
+ 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 {
- struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark;
- slot->header->limit--;
+ rb_bug("same heap slot is allocated: %p at %"PRIuVALUE, (void *)membase, (VALUE)mid);
}
- p = tmp;
}
-}
-
-static void
-finalize_deferred(rb_objspace_t *objspace)
-{
- RVALUE *p;
-
- while ((p = ATOMIC_PTR_EXCHANGE(deferred_final_list, 0)) != 0) {
- finalize_list(objspace, p);
+ if (hi < heaps_used) {
+ MEMMOVE(&heaps[hi+1], &heaps[hi], struct heaps_slot, heaps_used - hi);
}
-}
-
-void
-rb_gc_finalize_deferred(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- if (ATOMIC_EXCHANGE(finalizing, 1)) return;
- finalize_deferred(objspace);
- ATOMIC_SET(finalizing, 0);
-}
-
-struct force_finalize_list {
- VALUE obj;
- VALUE table;
- struct force_finalize_list *next;
-};
-
-static int
-force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
-{
- struct force_finalize_list **prev = (struct force_finalize_list **)arg;
- struct force_finalize_list *curr = ALLOC(struct force_finalize_list);
- curr->obj = key;
- curr->table = val;
- curr->next = *prev;
- *prev = curr;
- return ST_CONTINUE;
-}
+ heaps[hi].membase = membase;
+ heaps[hi].slot = p;
+ heaps[hi].limit = objs;
+ heaps[hi].finalize_flag = FALSE;
+ pend = p + objs;
+ if (lomem == 0 || lomem > p) lomem = p;
+ if (himem < pend) himem = pend;
+ heaps_used++;
-void
-rb_gc_call_finalizer_at_exit(void)
-{
- rb_objspace_call_finalizer(&rb_objspace);
+ while (p < pend) {
+ p->as.free.flags = 0;
+ p->as.free.next = freelist;
+ freelist = p;
+ p++;
+ }
}
static void
-rb_objspace_call_finalizer(rb_objspace_t *objspace)
+init_heap(rb_objspace_t *objspace)
{
- RVALUE *p, *pend;
- RVALUE *final_list = 0;
- size_t i;
-
- rest_sweep(objspace);
+ size_t add, i;
- if (ATOMIC_EXCHANGE(finalizing, 1)) return;
+ add = HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT;
- /* run finalizers */
- finalize_deferred(objspace);
- assert(deferred_final_list == 0);
-
- /* force to run finalizer */
- while (finalizer_table->num_entries) {
- struct force_finalize_list *list = 0;
- st_foreach(finalizer_table, force_chain_object, (st_data_t)&list);
- while (list) {
- struct force_finalize_list *curr = list;
- st_data_t obj = (st_data_t)curr->obj;
- run_finalizer(objspace, curr->obj, curr->table);
- st_delete(finalizer_table, &obj, 0);
- list = curr->next;
- xfree(curr);
- }
+ if (!add) {
+ add = 1;
}
- /* finalizers are part of garbage collection */
- during_gc++;
-
- /* run data object's finalizers */
- for (i = 0; i < heaps_used; i++) {
- p = objspace->heap.sorted[i]->start; pend = p + objspace->heap.sorted[i]->limit;
- while (p < pend) {
- if (BUILTIN_TYPE(p) == T_DATA &&
- DATA_PTR(p) && RANY(p)->as.data.dfree &&
- !rb_obj_is_thread((VALUE)p) && !rb_obj_is_mutex((VALUE)p) &&
- !rb_obj_is_fiber((VALUE)p)) {
- p->as.free.flags = 0;
- if (RTYPEDDATA_P(p)) {
- RDATA(p)->dfree = RANY(p)->as.typeddata.type->function.dfree;
- }
- if (RANY(p)->as.data.dfree == (RUBY_DATA_FUNC)-1) {
- xfree(DATA_PTR(p));
- }
- else if (RANY(p)->as.data.dfree) {
- make_deferred(RANY(p));
- RANY(p)->as.free.next = final_list;
- final_list = 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++;
- }
- }
- during_gc = 0;
- if (final_list) {
- finalize_list(objspace, final_list);
+ if ((heaps_used + add) > heaps_length) {
+ allocate_heaps(objspace, heaps_used + add);
}
- st_free_table(finalizer_table);
- finalizer_table = 0;
- ATOMIC_SET(finalizing, 0);
-}
-
-static inline int
-is_id_value(rb_objspace_t *objspace, VALUE ptr)
-{
- if (!is_pointer_to_heap(objspace, (void *)ptr)) return FALSE;
- if (BUILTIN_TYPE(ptr) > T_FIXNUM) return FALSE;
- if (BUILTIN_TYPE(ptr) == T_ICLASS) return FALSE;
- return TRUE;
-}
-
-static inline int
-is_swept_object(rb_objspace_t *objspace, VALUE ptr)
-{
- struct heaps_slot *slot = objspace->heap.sweep_slots;
-
- while (slot) {
- if ((VALUE)slot->header->start <= ptr && ptr < (VALUE)(slot->header->end))
- return FALSE;
- slot = slot->next;
+ for (i = 0; i < add; i++) {
+ assign_heap_slot(objspace);
}
- return TRUE;
-}
-
-static inline int
-is_dead_object(rb_objspace_t *objspace, VALUE ptr)
-{
- if (!is_lazy_sweeping(objspace) || MARKED_IN_BITMAP(GET_HEAP_BITMAP(ptr), ptr))
- return FALSE;
- if (!is_swept_object(objspace, ptr))
- return TRUE;
- return FALSE;
+ heaps_inc = 0;
+ objspace->profile.invoke_time = getrusage_time();
}
-static inline int
-is_live_object(rb_objspace_t *objspace, VALUE ptr)
-{
- if (BUILTIN_TYPE(ptr) == 0) return FALSE;
- if (RBASIC(ptr)->klass == 0) return FALSE;
- if (is_dead_object(objspace, ptr)) return FALSE;
- return TRUE;
-}
-/*
- * call-seq:
- * ObjectSpace._id2ref(object_id) -> an_object
- *
- * Converts an object id to a reference to the object. May not be
- * called on an object id passed as a parameter to a finalizer.
- *
- * s = "I am a string" #=> "I am a string"
- * r = ObjectSpace._id2ref(s.object_id) #=> "I am a string"
- * r == s #=> true
- *
- */
-
-static VALUE
-id2ref(VALUE obj, VALUE objid)
+static void
+set_heaps_increment(rb_objspace_t *objspace)
{
-#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;
-
- rb_secure(4);
- ptr = NUM2PTR(objid);
- p0 = (void *)ptr;
-
- if (ptr == Qtrue) return Qtrue;
- if (ptr == Qfalse) return Qfalse;
- if (ptr == Qnil) return Qnil;
- if (FIXNUM_P(ptr)) return (VALUE)ptr;
- if (FLONUM_P(ptr)) return (VALUE)ptr;
- ptr = obj_id_to_ref(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);
- }
+ size_t next_heaps_length = (size_t)(heaps_used * 1.8);
- if (!is_id_value(objspace, ptr)) {
- rb_raise(rb_eRangeError, "%p is not id value", p0);
- }
- if (!is_live_object(objspace, ptr)) {
- rb_raise(rb_eRangeError, "%p is recycled object", p0);
+ if (next_heaps_length == heaps_used) {
+ next_heaps_length++;
}
- return (VALUE)ptr;
-}
-
-/*
- * Document-method: __id__
- * Document-method: object_id
- *
- * call-seq:
- * obj.__id__ -> integer
- * obj.object_id -> integer
- *
- * Returns an integer identifier for +obj+.
- *
- * The same number will be returned on all calls to +id+ for a given object,
- * and no two active objects will share an id.
- *
- * Object#object_id is a different concept from the +:name+ notation, which
- * returns the symbol id of +name+.
- *
- * Replaces the deprecated Object#id.
- */
-/*
- * call-seq:
- * obj.hash -> fixnum
- *
- * Generates a Fixnum hash value for this object.
- *
- * This function must have the property that <code>a.eql?(b)</code> implies
- * <code>a.hash == b.hash</code>.
- *
- * The hash value is used by Hash class.
- *
- * Any hash value that exceeds the capacity of a Fixnum will be truncated
- * before being used.
- */
+ heaps_inc = next_heaps_length - heaps_used;
-VALUE
-rb_obj_id(VALUE obj)
-{
- /*
- * 32-bit VALUE space
- * MSB ------------------------ LSB
- * false 00000000000000000000000000000000
- * true 00000000000000000000000000000010
- * nil 00000000000000000000000000000100
- * undef 00000000000000000000000000000110
- * symbol ssssssssssssssssssssssss00001110
- * object oooooooooooooooooooooooooooooo00 = 0 (mod sizeof(RVALUE))
- * fixnum fffffffffffffffffffffffffffffff1
- *
- * object_id space
- * LSB
- * false 00000000000000000000000000000000
- * true 00000000000000000000000000000010
- * nil 00000000000000000000000000000100
- * undef 00000000000000000000000000000110
- * symbol 000SSSSSSSSSSSSSSSSSSSSSSSSSSS0 S...S % A = 4 (S...S = s...s * A + 4)
- * object oooooooooooooooooooooooooooooo0 o...o % A = 0
- * fixnum fffffffffffffffffffffffffffffff1 bignum if required
- *
- * where A = sizeof(RVALUE)/4
- *
- * sizeof(RVALUE) is
- * 20 if 32-bit, double is 4-byte aligned
- * 24 if 32-bit, double is 8-byte aligned
- * 40 if 64-bit
- */
- if (SYMBOL_P(obj)) {
- return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
- }
- else if (FLONUM_P(obj)) {
-#if SIZEOF_LONG == SIZEOF_VOIDP
- return LONG2NUM((SIGNED_VALUE)obj);
-#else
- return LL2NUM((SIGNED_VALUE)obj);
-#endif
- }
- else if (SPECIAL_CONST_P(obj)) {
- return LONG2NUM((SIGNED_VALUE)obj);
+ if (next_heaps_length > heaps_length) {
+ allocate_heaps(objspace, next_heaps_length);
}
- return nonspecial_obj_id(obj);
}
static int
-set_zero(st_data_t key, st_data_t val, st_data_t arg)
+heaps_increment(rb_objspace_t *objspace)
{
- VALUE k = (VALUE)key;
- VALUE hash = (VALUE)arg;
- rb_hash_aset(hash, k, INT2FIX(0));
- return ST_CONTINUE;
+ if (heaps_inc > 0) {
+ assign_heap_slot(objspace);
+ heaps_inc--;
+ return TRUE;
+ }
+ return FALSE;
}
-/*
- * call-seq:
- * ObjectSpace.count_objects([result_hash]) -> hash
- *
- * Counts objects for each type.
- *
- * It returns a hash, such as:
- * {
- * :TOTAL=>10000,
- * :FREE=>3011,
- * :T_OBJECT=>6,
- * :T_CLASS=>404,
- * # ...
- * }
- *
- * The contents of the returned hash are implementation specific.
- * It may be changed in future.
- *
- * If the optional argument +result_hash+ is given,
- * it is overwritten and returned. This is intended to avoid probe effect.
- *
- * This method is only expected to work on C Ruby.
- *
- */
+#define RANY(o) ((RVALUE*)(o))
static VALUE
-count_objects(int argc, VALUE *argv, VALUE os)
+rb_newobj_from_heap(rb_objspace_t *objspace)
{
- 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 (!RB_TYPE_P(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;
+ VALUE obj;
- p = objspace->heap.sorted[i]->start; pend = p + objspace->heap.sorted[i]->limit;
- for (;p < pend; p++) {
- if (p->as.basic.flags) {
- counts[BUILTIN_TYPE(p)]++;
- }
- else {
- freed++;
- }
- }
- total += objspace->heap.sorted[i]->limit;
+ if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) {
+ if (!heaps_increment(objspace) && !garbage_collect(objspace)) {
+ during_gc = 0;
+ rb_memerror();
+ }
}
- 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));
+ obj = (VALUE)freelist;
+ freelist = freelist->as.free.next;
- 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]));
- }
+ MEMZERO((void*)obj, RVALUE, 1);
+#ifdef GC_DEBUG
+ RANY(obj)->file = rb_sourcefile();
+ RANY(obj)->line = rb_sourceline();
+#endif
- return hash;
+ return obj;
}
-
-
-/*
- ------------------------ Garbage Collection ------------------------
-*/
-
-/* Sweeping */
-
+#if USE_VALUE_CACHE
static VALUE
-lazy_sweep_enable(void)
+rb_fill_value_cache(rb_thread_t *th)
{
rb_objspace_t *objspace = &rb_objspace;
+ int i;
+ VALUE rv;
- objspace->flags.dont_lazy_sweep = FALSE;
- return Qnil;
-}
-
-static void
-gc_clear_slot_bits(struct heaps_slot *slot)
-{
- memset(slot->bits, 0, HEAP_BITMAP_LIMIT * sizeof(uintptr_t));
-}
-
-static size_t
-objspace_live_num(rb_objspace_t *objspace)
-{
- return objspace->total_allocated_object_num - objspace->total_freed_object_num;
-}
-
-static void
-slot_sweep(rb_objspace_t *objspace, struct heaps_slot *sweep_slot)
-{
- size_t empty_num = 0, freed_num = 0, final_num = 0;
- RVALUE *p, *pend;
- RVALUE *final = deferred_final_list;
- int deferred;
- uintptr_t *bits;
-
- p = sweep_slot->header->start; pend = p + sweep_slot->header->limit;
- bits = GET_HEAP_BITMAP(p);
- while (p < pend) {
- if ((!(MARKED_IN_BITMAP(bits, p))) && BUILTIN_TYPE(p) != T_ZOMBIE) {
- if (p->as.basic.flags) {
- if ((deferred = obj_free(objspace, (VALUE)p)) ||
- (FL_TEST(p, FL_FINALIZE))) {
- if (!deferred) {
- p->as.free.flags = T_ZOMBIE;
- RDATA(p)->dfree = 0;
- }
- p->as.free.next = deferred_final_list;
- deferred_final_list = p;
- assert(BUILTIN_TYPE(p) == T_ZOMBIE);
- final_num++;
- }
- else {
- (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
- p->as.free.flags = 0;
- p->as.free.next = sweep_slot->freelist;
- sweep_slot->freelist = p;
- freed_num++;
- }
- }
- else {
- empty_num++;
- }
- }
- p++;
- }
- gc_clear_slot_bits(sweep_slot);
- if (final_num + freed_num + empty_num == sweep_slot->header->limit &&
- objspace->heap.free_num > objspace->heap.do_heap_free) {
- RVALUE *pp;
-
- for (pp = deferred_final_list; pp != final; pp = pp->as.free.next) {
- RDATA(pp)->dmark = (void (*)(void *))(VALUE)sweep_slot;
- pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */
- }
- sweep_slot->header->limit = final_num;
- unlink_heap_slot(objspace, sweep_slot);
- }
- else {
- if (freed_num + empty_num > 0) {
- link_free_heap_slot(objspace, sweep_slot);
- }
- else {
- sweep_slot->free_next = NULL;
- }
- objspace->heap.free_num += freed_num + empty_num;
- }
- objspace->total_freed_object_num += freed_num;
- objspace->heap.final_num += final_num;
-
- if (deferred_final_list && !finalizing) {
- rb_thread_t *th = GET_THREAD();
- if (th) {
- RUBY_VM_SET_FINALIZER_INTERRUPT(th);
- }
- }
-}
-
-static int
-ready_to_gc(rb_objspace_t *objspace)
-{
- if (dont_gc || during_gc) {
- if (!has_free_object) {
- if (!heaps_increment(objspace)) {
- set_heaps_increment(objspace);
- heaps_increment(objspace);
- }
- }
- return FALSE;
- }
- return TRUE;
-}
-
-static void
-before_gc_sweep(rb_objspace_t *objspace)
-{
- objspace->heap.do_heap_free = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.65);
- objspace->heap.free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.2);
- if (objspace->heap.free_min < initial_free_min) {
- objspace->heap.free_min = initial_free_min;
- if (objspace->heap.do_heap_free < initial_free_min)
- objspace->heap.do_heap_free = initial_free_min;
- }
- objspace->heap.sweep_slots = heaps;
- objspace->heap.free_num = 0;
- objspace->heap.free_slots = NULL;
+ /* LOCK */
+ for (i=0; i<RUBY_VM_VALUE_CACHE_SIZE; i++) {
+ VALUE v = rb_newobj_from_heap(objspace);
- /* sweep unlinked method entries */
- if (GET_VM()->unlinked_method_entry_list) {
- rb_sweep_method_entry(GET_VM());
+ 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
-static void
-after_gc_sweep(rb_objspace_t *objspace)
+int
+rb_during_gc(void)
{
- size_t inc;
-
- gc_prof_set_malloc_info(objspace);
- if (objspace->heap.free_num < objspace->heap.free_min) {
- set_heaps_increment(objspace);
- heaps_increment(objspace);
- }
-
- inc = ATOMIC_SIZE_EXCHANGE(malloc_increase, 0);
- if (inc > malloc_limit) {
- malloc_limit +=
- (size_t)((inc - malloc_limit) * (double)objspace->heap.marked_num / (heaps_used * HEAP_OBJ_LIMIT));
- if (malloc_limit < initial_malloc_limit) malloc_limit = initial_malloc_limit;
- }
-
- free_unused_heaps(objspace);
+ rb_objspace_t *objspace = &rb_objspace;
+ return during_gc;
}
-static int
-lazy_sweep(rb_objspace_t *objspace)
+VALUE
+rb_newobj(void)
{
- struct heaps_slot *next;
-
- heaps_increment(objspace);
- while (objspace->heap.sweep_slots) {
- next = objspace->heap.sweep_slots->next;
- slot_sweep(objspace, objspace->heap.sweep_slots);
- objspace->heap.sweep_slots = next;
- if (has_free_object) {
- during_gc = 0;
- return TRUE;
- }
- }
- return FALSE;
-}
+#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
-static void
-rest_sweep(rb_objspace_t *objspace)
-{
- if (objspace->heap.sweep_slots) {
- while (objspace->heap.sweep_slots) {
- lazy_sweep(objspace);
- }
- after_gc_sweep(objspace);
+ if (during_gc) {
+ dont_gc = 1;
+ during_gc = 0;
+ rb_bug("object allocation during garbage collection phase");
}
-}
-
-static void gc_marks(rb_objspace_t *objspace);
-
-static int
-gc_prepare_free_objects(rb_objspace_t *objspace)
-{
- int res;
- if (objspace->flags.dont_lazy_sweep)
- return garbage_collect(objspace);
-
-
- if (!ready_to_gc(objspace)) return TRUE;
-
- during_gc++;
- gc_prof_timer_start(objspace);
- gc_prof_sweep_timer_start(objspace);
-
- if (objspace->heap.sweep_slots) {
- res = lazy_sweep(objspace);
- if (res) {
- gc_prof_sweep_timer_stop(objspace);
- gc_prof_set_malloc_info(objspace);
- gc_prof_timer_stop(objspace, Qfalse);
- return res;
- }
- after_gc_sweep(objspace);
+#if USE_VALUE_CACHE
+ if (v) {
+ RBASIC(v)->flags = 0;
+ th->value_cache_ptr++;
}
else {
- if (heaps_increment(objspace)) {
- during_gc = 0;
- return TRUE;
- }
- }
-
- gc_marks(objspace);
-
- before_gc_sweep(objspace);
- if (objspace->heap.free_min > (heaps_used * HEAP_OBJ_LIMIT - objspace->heap.marked_num)) {
- set_heaps_increment(objspace);
- }
-
- gc_prof_sweep_timer_start(objspace);
- if (!(res = lazy_sweep(objspace))) {
- after_gc_sweep(objspace);
- if (has_free_object) {
- res = TRUE;
- during_gc = 0;
- }
+ v = rb_fill_value_cache(th);
}
- gc_prof_sweep_timer_stop(objspace);
- gc_prof_timer_stop(objspace, Qtrue);
- return res;
+#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
}
-static void
-gc_sweep(rb_objspace_t *objspace)
+NODE*
+rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
{
- struct heaps_slot *next;
-
- before_gc_sweep(objspace);
-
- while (objspace->heap.sweep_slots) {
- next = objspace->heap.sweep_slots->next;
- slot_sweep(objspace, objspace->heap.sweep_slots);
- objspace->heap.sweep_slots = next;
- }
-
- after_gc_sweep(objspace);
-
- during_gc = 0;
-}
-
-/* Marking stack */
-
-static void push_mark_stack(mark_stack_t *, VALUE);
-static int pop_mark_stack(mark_stack_t *, VALUE *);
-static void shrink_stack_chunk_cache(mark_stack_t *stack);
+ NODE *n = (NODE*)rb_newobj();
-static stack_chunk_t *
-stack_chunk_alloc(void)
-{
- stack_chunk_t *res;
+ n->flags |= T_NODE;
+ nd_set_type(n, type);
- res = malloc(sizeof(stack_chunk_t));
- if (!res)
- rb_memerror();
+ n->u1.value = a0;
+ n->u2.value = a1;
+ n->u3.value = a2;
- return res;
+ return n;
}
-static inline int
-is_mark_stask_empty(mark_stack_t *stack)
+VALUE
+rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
{
- return stack->chunk == NULL;
-}
+ NEWOBJ(data, struct RData);
+ if (klass) Check_Type(klass, T_CLASS);
+ OBJSETUP(data, klass, T_DATA);
+ data->data = datap;
+ data->dfree = dfree;
+ data->dmark = dmark;
-static void
-add_stack_chunk_cache(mark_stack_t *stack, stack_chunk_t *chunk)
-{
- chunk->next = stack->cache;
- stack->cache = chunk;
- stack->cache_size++;
+ return (VALUE)data;
}
-static void
-shrink_stack_chunk_cache(mark_stack_t *stack)
+VALUE
+rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type)
{
- stack_chunk_t *chunk;
+ NEWOBJ(data, struct RTypedData);
- if (stack->unused_cache_size > (stack->cache_size/2)) {
- chunk = stack->cache;
- stack->cache = stack->cache->next;
- stack->cache_size--;
- free(chunk);
- }
- stack->unused_cache_size = stack->cache_size;
-}
+ if (klass) Check_Type(klass, T_CLASS);
-static void
-push_mark_stack_chunk(mark_stack_t *stack)
-{
- stack_chunk_t *next;
-
- assert(stack->index == stack->limit);
- if (stack->cache_size > 0) {
- next = stack->cache;
- stack->cache = stack->cache->next;
- stack->cache_size--;
- if (stack->unused_cache_size > stack->cache_size)
- stack->unused_cache_size = stack->cache_size;
- }
- else {
- next = stack_chunk_alloc();
- }
- next->next = stack->chunk;
- stack->chunk = next;
- stack->index = 0;
-}
+ OBJSETUP(data, klass, T_DATA);
-static void
-pop_mark_stack_chunk(mark_stack_t *stack)
-{
- stack_chunk_t *prev;
+ data->data = datap;
+ data->typed_flag = 1;
+ data->type = type;
- prev = stack->chunk->next;
- assert(stack->index == 0);
- add_stack_chunk_cache(stack, stack->chunk);
- stack->chunk = prev;
- stack->index = stack->limit;
+ return (VALUE)data;
}
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-static void
-free_stack_chunks(mark_stack_t *stack)
+size_t
+rb_objspace_data_type_memsize(VALUE obj)
{
- stack_chunk_t *chunk = stack->chunk;
- stack_chunk_t *next = NULL;
-
- while (chunk != NULL) {
- next = chunk->next;
- free(chunk);
- chunk = next;
+ if (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj)->dsize) {
+ return RTYPEDDATA_TYPE(obj)->dsize(RTYPEDDATA_DATA(obj));
}
-}
-#endif
-
-static void
-push_mark_stack(mark_stack_t *stack, VALUE data)
-{
- if (stack->index == stack->limit) {
- push_mark_stack_chunk(stack);
+ else {
+ return 0;
}
- stack->chunk->data[stack->index++] = data;
}
-static int
-pop_mark_stack(mark_stack_t *stack, VALUE *data)
+const char *
+rb_objspace_data_type_name(VALUE obj)
{
- if (is_mark_stask_empty(stack)) {
- return FALSE;
- }
- if (stack->index == 1) {
- *data = stack->chunk->data[--stack->index];
- pop_mark_stack_chunk(stack);
- return TRUE;
+ if (RTYPEDDATA_P(obj)) {
+ return RTYPEDDATA_TYPE(obj)->wrap_struct_name;
}
- *data = stack->chunk->data[--stack->index];
- return TRUE;
-}
-
-static void
-init_mark_stack(mark_stack_t *stack)
-{
- int i;
-
- push_mark_stack_chunk(stack);
- stack->limit = STACK_CHUNK_SIZE;
-
- for (i=0; i < 4; i++) {
- add_stack_chunk_cache(stack, stack_chunk_alloc());
+ else {
+ return 0;
}
- stack->unused_cache_size = stack->cache_size;
}
-
-/* Marking */
-
-#define MARK_IN_BITMAP(bits, p) (bits[BITMAP_INDEX(p)] = bits[BITMAP_INDEX(p)] | ((uintptr_t)1 << BITMAP_OFFSET(p)))
-
-
#ifdef __ia64
#define SET_STACK_END (SET_MACHINE_STACK_END(&th->machine_stack_end), th->machine_register_stack_end = rb_ia64_bsp())
#else
@@ -2276,6 +1195,8 @@ ruby_get_stack_grow_direction(volatile VALUE *addr)
}
#endif
+#define GC_WATER_MARK 512
+
size_t
ruby_stack_length(VALUE **p)
{
@@ -2285,25 +1206,21 @@ ruby_stack_length(VALUE **p)
return STACK_LENGTH;
}
-#if !(defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK))
static int
-stack_check(int water_mark)
+stack_check(void)
{
int ret;
rb_thread_t *th = GET_THREAD();
SET_STACK_END;
- ret = STACK_LENGTH > STACK_LEVEL_MAX - water_mark;
+ 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) - water_mark;
+ th->machine_register_stack_maxsize/sizeof(VALUE) - GC_WATER_MARK;
}
#endif
return ret;
}
-#endif
-
-#define STACKFRAME_FOR_CALL_CFUNC 512
int
ruby_stack_check(void)
@@ -2311,19 +1228,94 @@ ruby_stack_check(void)
#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
return 0;
#else
- return stack_check(STACKFRAME_FOR_CALL_CFUNC);
+ return stack_check();
#endif
}
static void
+init_mark_stack(rb_objspace_t *objspace)
+{
+ mark_stack_overflow = 0;
+ mark_stack_ptr = mark_stack;
+}
+
+#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 void
+gc_mark_all(rb_objspace_t *objspace)
+{
+ RVALUE *p, *pend;
+ size_t i;
+
+ init_mark_stack(objspace);
+ 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);
+ }
+ p++;
+ }
+ }
+}
+
+static void
+gc_mark_rest(rb_objspace_t *objspace)
+{
+ 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);
+
+ init_mark_stack(objspace);
+ while (p != tmp_arry) {
+ p--;
+ gc_mark_children(objspace, *p, 0);
+ }
+}
+
+static inline int
+is_pointer_to_heap(rb_objspace_t *objspace, 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;
+ }
+ }
+ return FALSE;
+}
+
+static void
mark_locations_array(rb_objspace_t *objspace, register VALUE *x, register long n)
{
VALUE v;
while (n--) {
v = *x;
- (void)VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v));
+ VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v));
if (is_pointer_to_heap(objspace, (void *)v)) {
- gc_mark(objspace, v);
+ gc_mark(objspace, v, 0);
}
x++;
}
@@ -2345,100 +1337,97 @@ rb_gc_mark_locations(VALUE *start, VALUE *end)
gc_mark_locations(&rb_objspace, start, end);
}
-#define rb_gc_mark_locations(start, end) gc_mark_locations(objspace, (start), (end))
+#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(st_data_t key, st_data_t value, st_data_t data)
+mark_entry(ID key, VALUE value, st_data_t data)
{
struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, (VALUE)value);
+ gc_mark(arg->objspace, value, arg->lev);
return ST_CONTINUE;
}
static void
-mark_tbl(rb_objspace_t *objspace, st_table *tbl)
+mark_tbl(rb_objspace_t *objspace, st_table *tbl, int lev)
{
struct mark_tbl_arg arg;
- if (!tbl || tbl->num_entries == 0) return;
+ if (!tbl) return;
arg.objspace = objspace;
+ arg.lev = lev;
st_foreach(tbl, mark_entry, (st_data_t)&arg);
}
static int
-mark_key(st_data_t key, st_data_t value, st_data_t data)
+mark_key(VALUE key, VALUE value, st_data_t data)
{
struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, (VALUE)key);
+ gc_mark(arg->objspace, key, arg->lev);
return ST_CONTINUE;
}
static void
-mark_set(rb_objspace_t *objspace, st_table *tbl)
+mark_set(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_key, (st_data_t)&arg);
}
void
rb_mark_set(st_table *tbl)
{
- mark_set(&rb_objspace, tbl);
+ mark_set(&rb_objspace, tbl, 0);
}
static int
-mark_keyvalue(st_data_t key, st_data_t value, st_data_t data)
+mark_keyvalue(VALUE key, VALUE value, st_data_t data)
{
struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, (VALUE)key);
- gc_mark(arg->objspace, (VALUE)value);
+ 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)
+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);
+ mark_hash(&rb_objspace, tbl, 0);
}
static void
-mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me)
+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);
- again:
+ gc_mark(objspace, me->klass, lev);
if (!def) return;
switch (def->type) {
case VM_METHOD_TYPE_ISEQ:
- gc_mark(objspace, def->body.iseq->self);
+ gc_mark(objspace, def->body.iseq->self, lev);
break;
case VM_METHOD_TYPE_BMETHOD:
- gc_mark(objspace, def->body.proc);
+ gc_mark(objspace, def->body.proc, lev);
break;
case VM_METHOD_TYPE_ATTRSET:
case VM_METHOD_TYPE_IVAR:
- gc_mark(objspace, def->body.attr.location);
- break;
- case VM_METHOD_TYPE_REFINED:
- if (def->body.orig_me) {
- def = def->body.orig_me->def;
- goto again;
- }
+ gc_mark(objspace, def->body.attr.location, lev);
break;
default:
break; /* ignore */
@@ -2448,177 +1437,102 @@ mark_method_entry(rb_objspace_t *objspace, const rb_method_entry_t *me)
void
rb_mark_method_entry(const rb_method_entry_t *me)
{
- mark_method_entry(&rb_objspace, 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)
{
struct mark_tbl_arg *arg = (void*)data;
- mark_method_entry(arg->objspace, me);
+ mark_method_entry(arg->objspace, me, arg->lev);
return ST_CONTINUE;
}
static void
-mark_m_tbl(rb_objspace_t *objspace, st_table *tbl)
+mark_m_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_method_entry_i, (st_data_t)&arg);
}
static int
-mark_const_entry_i(ID key, const rb_const_entry_t *ce, st_data_t data)
+free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data)
{
- struct mark_tbl_arg *arg = (void*)data;
- gc_mark(arg->objspace, ce->value);
- gc_mark(arg->objspace, ce->file);
+ rb_free_method_entry(me);
return ST_CONTINUE;
}
-static void
-mark_const_tbl(rb_objspace_t *objspace, st_table *tbl)
-{
- struct mark_tbl_arg arg;
- if (!tbl) return;
- arg.objspace = objspace;
- st_foreach(tbl, mark_const_entry_i, (st_data_t)&arg);
-}
-
-#if STACK_GROW_DIRECTION < 0
-#define GET_STACK_BOUNDS(start, end, appendix) ((start) = STACK_END, (end) = STACK_START)
-#elif STACK_GROW_DIRECTION > 0
-#define GET_STACK_BOUNDS(start, end, appendix) ((start) = STACK_START, (end) = STACK_END+(appendix))
-#else
-#define GET_STACK_BOUNDS(start, end, appendix) \
- ((STACK_END < STACK_START) ? \
- ((start) = STACK_END, (end) = STACK_START) : ((start) = STACK_START, (end) = STACK_END+(appendix)))
-#endif
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
-static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
-{
- union {
- rb_jmp_buf j;
- VALUE v[sizeof(rb_jmp_buf) / sizeof(VALUE)];
- } save_regs_gc_mark;
- VALUE *stack_start, *stack_end;
-
- FLUSH_REGISTER_WINDOWS;
- /* This assumes that all registers are saved into the jmp_buf (and stack) */
- rb_setjmp(save_regs_gc_mark.j);
-
- SET_STACK_END;
- GET_STACK_BOUNDS(stack_start, stack_end, 1);
-
- mark_locations_array(objspace, save_regs_gc_mark.v, numberof(save_regs_gc_mark.v));
-
- rb_gc_mark_locations(stack_start, stack_end);
-#ifdef __ia64
- rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
-#endif
-#if defined(__mc68000__)
- mark_locations_array(objspace, (VALUE*)((char*)STACK_END + 2),
- (STACK_START - STACK_END));
-#endif
-}
-
void
-rb_gc_mark_machine_stack(rb_thread_t *th)
+rb_free_m_table(st_table *tbl)
{
- rb_objspace_t *objspace = &rb_objspace;
- VALUE *stack_start, *stack_end;
-
- GET_STACK_BOUNDS(stack_start, stack_end, 0);
- rb_gc_mark_locations(stack_start, stack_end);
-#ifdef __ia64
- rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
-#endif
+ st_foreach(tbl, free_method_entry_i, 0);
+ st_free_table(tbl);
}
void
rb_mark_tbl(st_table *tbl)
{
- mark_tbl(&rb_objspace, tbl);
+ mark_tbl(&rb_objspace, tbl, 0);
}
void
rb_gc_mark_maybe(VALUE obj)
{
if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
- gc_mark(&rb_objspace, obj);
+ gc_mark(&rb_objspace, obj, 0);
}
}
-static int
-gc_mark_ptr(rb_objspace_t *objspace, VALUE ptr)
-{
- register uintptr_t *bits = GET_HEAP_BITMAP(ptr);
- if (MARKED_IN_BITMAP(bits, ptr)) return 0;
- MARK_IN_BITMAP(bits, ptr);
- objspace->heap.marked_num++;
- return 1;
-}
+#define GC_LEVEL_MAX 250
-static int
-markable_object_p(rb_objspace_t *objspace, VALUE ptr)
+static void
+gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
{
- register RVALUE *obj = RANY(ptr);
-
- if (rb_special_const_p(ptr)) return 0; /* special const not marked */
- if (obj->as.basic.flags == 0) return 0 ; /* free cell */
-
- return 1;
-}
+ register RVALUE *obj;
-int
-rb_objspace_markable_object_p(VALUE obj)
-{
- return markable_object_p(/* now it doesn't use &rb_objspace */ 0, obj);
-}
+ obj = RANY(ptr);
+ if (rb_special_const_p(ptr)) return; /* special const not marked */
+ if (obj->as.basic.flags == 0) return; /* free cell */
+ if (obj->as.basic.flags & FL_MARK) return; /* already marked */
+ obj->as.basic.flags |= FL_MARK;
-static void
-gc_mark(rb_objspace_t *objspace, VALUE ptr)
-{
- if (!markable_object_p(objspace, ptr)) {
+ if (lev > GC_LEVEL_MAX || (lev == 0 && stack_check())) {
+ if (!mark_stack_overflow) {
+ if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
+ *mark_stack_ptr = ptr;
+ mark_stack_ptr++;
+ }
+ else {
+ mark_stack_overflow = 1;
+ }
+ }
return;
}
-
- if (LIKELY(objspace->mark_func_data == 0)) {
- if (!gc_mark_ptr(objspace, ptr)) return; /* already marked */
- push_mark_stack(&objspace->mark_stack, ptr);
- }
- else {
- objspace->mark_func_data->mark_func(ptr, objspace->mark_func_data->data);
- }
+ gc_mark_children(objspace, ptr, lev+1);
}
void
rb_gc_mark(VALUE ptr)
{
- gc_mark(&rb_objspace, ptr);
+ gc_mark(&rb_objspace, ptr, 0);
}
static void
-gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
+gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
{
register RVALUE *obj = RANY(ptr);
goto marking; /* skip */
again:
- if (LIKELY(objspace->mark_func_data == 0)) {
- obj = RANY(ptr);
- if (!markable_object_p(objspace, ptr)) return;
- if (!gc_mark_ptr(objspace, ptr)) return; /* already marked */
- }
- else {
- gc_mark(objspace, ptr);
- return;
- }
+ obj = RANY(ptr);
+ if (rb_special_const_p(ptr)) return; /* special const not marked */
+ if (obj->as.basic.flags == 0) return; /* free cell */
+ if (obj->as.basic.flags & FL_MARK) return; /* already marked */
+ obj->as.basic.flags |= FL_MARK;
marking:
if (FL_TEST(obj, FL_EXIVAR)) {
@@ -2642,9 +1556,10 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
case NODE_RESBODY:
case NODE_CLASS:
case NODE_BLOCK_PASS:
- gc_mark(objspace, (VALUE)obj->as.node.u2.node);
+ gc_mark(objspace, (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:
@@ -2654,7 +1569,8 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
case NODE_CALL:
case NODE_DEFS:
case NODE_OP_ASGN1:
- gc_mark(objspace, (VALUE)obj->as.node.u1.node);
+ case NODE_ARGS:
+ gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
/* fall through */
case NODE_SUPER: /* 3 */
case NODE_FCALL:
@@ -2681,7 +1597,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
case NODE_ALIAS:
case NODE_VALIAS:
case NODE_ARGSCAT:
- gc_mark(objspace, (VALUE)obj->as.node.u1.node);
+ gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
/* fall through */
case NODE_GASGN: /* 2 */
case NODE_LASGN:
@@ -2717,21 +1633,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
case NODE_SCOPE: /* 2,3 */
case NODE_CDECL:
case NODE_OPT_ARG:
- gc_mark(objspace, (VALUE)obj->as.node.u3.node);
- ptr = (VALUE)obj->as.node.u2.node;
- goto again;
-
- case NODE_ARGS: /* custom */
- {
- struct rb_args_info *args = obj->as.node.u3.args;
- if (args) {
- if (args->pre_init) gc_mark(objspace, (VALUE)args->pre_init);
- if (args->post_init) gc_mark(objspace, (VALUE)args->post_init);
- if (args->opt_args) gc_mark(objspace, (VALUE)args->opt_args);
- if (args->kw_args) gc_mark(objspace, (VALUE)args->kw_args);
- if (args->kw_rest_arg) gc_mark(objspace, (VALUE)args->kw_rest_arg);
- }
- }
+ gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
ptr = (VALUE)obj->as.node.u2.node;
goto again;
@@ -2758,38 +1660,30 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
mark_locations_array(objspace,
(VALUE*)obj->as.node.u1.value,
obj->as.node.u3.cnt);
- gc_mark(objspace, (VALUE)obj->as.node.u2.node);
- break;
-
- case NODE_CREF:
- gc_mark(objspace, obj->as.node.nd_refinements);
- gc_mark(objspace, (VALUE)obj->as.node.u1.node);
- ptr = (VALUE)obj->as.node.u3.node;
+ 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);
+ gc_mark(objspace, (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);
+ gc_mark(objspace, (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);
+ gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
}
}
return; /* no need to mark class. */
}
- gc_mark(objspace, obj->as.basic.klass);
+ gc_mark(objspace, obj->as.basic.klass, lev);
switch (BUILTIN_TYPE(obj)) {
case T_ICLASS:
case T_CLASS:
case T_MODULE:
- mark_m_tbl(objspace, RCLASS_M_TBL(obj));
- if (!RCLASS_EXT(obj)) break;
- mark_tbl(objspace, RCLASS_IV_TBL(obj));
- mark_const_tbl(objspace, RCLASS_CONST_TBL(obj));
+ mark_m_tbl(objspace, RCLASS_M_TBL(obj), lev);
+ mark_tbl(objspace, RCLASS_IV_TBL(obj), lev);
ptr = RCLASS_SUPER(obj);
goto again;
@@ -2802,13 +1696,13 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
long i, len = RARRAY_LEN(obj);
VALUE *ptr = RARRAY_PTR(obj);
for (i=0; i < len; i++) {
- gc_mark(objspace, *ptr++);
+ gc_mark(objspace, *ptr++, lev);
}
}
break;
case T_HASH:
- mark_hash(objspace, obj->as.hash.ntbl);
+ mark_hash(objspace, obj->as.hash.ntbl, lev);
ptr = obj->as.hash.ifnone;
goto again;
@@ -2822,8 +1716,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
case T_DATA:
if (RTYPEDDATA_P(obj)) {
- RUBY_DATA_FUNC mark_func = obj->as.typeddata.type->function.dmark;
- if (mark_func) (*mark_func)(DATA_PTR(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));
@@ -2835,25 +1728,25 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
long i, len = ROBJECT_NUMIV(obj);
VALUE *ptr = ROBJECT_IVPTR(obj);
for (i = 0; i < len; i++) {
- gc_mark(objspace, *ptr++);
+ gc_mark(objspace, *ptr++, lev);
}
}
break;
case T_FILE:
if (obj->as.file.fptr) {
- gc_mark(objspace, obj->as.file.fptr->pathv);
- gc_mark(objspace, obj->as.file.fptr->tied_io_for_writing);
- gc_mark(objspace, obj->as.file.fptr->writeconv_asciicompat);
- gc_mark(objspace, obj->as.file.fptr->writeconv_pre_ecopts);
- gc_mark(objspace, obj->as.file.fptr->encs.ecopts);
- gc_mark(objspace, obj->as.file.fptr->write_lock);
+ 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:
- ptr = obj->as.regexp.src;
- goto again;
+ gc_mark(objspace, obj->as.regexp.src, lev);
+ break;
case T_FLOAT:
case T_BIGNUM:
@@ -2861,7 +1754,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
break;
case T_MATCH:
- gc_mark(objspace, obj->as.match.regexp);
+ gc_mark(objspace, obj->as.match.regexp, lev);
if (obj->as.match.str) {
ptr = obj->as.match.str;
goto again;
@@ -2869,14 +1762,14 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
break;
case T_RATIONAL:
- gc_mark(objspace, obj->as.rational.num);
- ptr = obj->as.rational.den;
- goto again;
+ gc_mark(objspace, obj->as.rational.num, lev);
+ gc_mark(objspace, obj->as.rational.den, lev);
+ break;
case T_COMPLEX:
- gc_mark(objspace, obj->as.complex.real);
- ptr = obj->as.complex.imag;
- goto again;
+ gc_mark(objspace, obj->as.complex.real, lev);
+ gc_mark(objspace, obj->as.complex.imag, lev);
+ break;
case T_STRUCT:
{
@@ -2884,7 +1777,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
VALUE *ptr = RSTRUCT_PTR(obj);
while (len--) {
- gc_mark(objspace, *ptr++);
+ gc_mark(objspace, *ptr++, lev);
}
}
break;
@@ -2896,183 +1789,434 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr)
}
}
-static void
-gc_mark_stacked_objects(rb_objspace_t *objspace)
+static int obj_free(rb_objspace_t *, VALUE);
+
+static inline void
+add_freelist(rb_objspace_t *objspace, RVALUE *p)
{
- mark_stack_t *mstack = &objspace->mark_stack;
- VALUE obj = 0;
+ VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
+ p->as.free.flags = 0;
+ p->as.free.next = freelist;
+ freelist = p;
+}
- if (!mstack->index) return;
- while (pop_mark_stack(mstack, &obj)) {
- gc_mark_children(objspace, obj);
+static void
+finalize_list(rb_objspace_t *objspace, RVALUE *p)
+{
+ while (p) {
+ RVALUE *tmp = p->as.free.next;
+ run_final(objspace, (VALUE)p);
+ if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
+ add_freelist(objspace, p);
+ }
+ else {
+ struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark;
+ slot->limit--;
+ }
+ p = tmp;
}
- shrink_stack_chunk_cache(mstack);
}
static void
-gc_marks(rb_objspace_t *objspace)
+free_unused_heaps(rb_objspace_t *objspace)
{
- struct gc_list *list;
- rb_thread_t *th = GET_THREAD();
- struct mark_func_data_struct *prev_mark_func_data;
-
- prev_mark_func_data = objspace->mark_func_data;
- objspace->mark_func_data = 0;
-
- gc_prof_mark_timer_start(objspace);
- objspace->heap.marked_num = 0;
- objspace->count++;
-
- SET_STACK_END;
+ size_t i, j;
+ RVALUE *last = 0;
- th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
+ for (i = j = 1; j < heaps_used; i++) {
+ if (heaps[i].limit == 0) {
+ if (!last) {
+ last = heaps[i].membase;
+ }
+ else {
+ free(heaps[i].membase);
+ }
+ heaps_used--;
+ }
+ else {
+ if (i != j) {
+ heaps[j] = heaps[i];
+ }
+ j++;
+ }
+ }
+ if (last) {
+ if (last < heaps_freed) {
+ free(heaps_freed);
+ heaps_freed = last;
+ }
+ else {
+ free(last);
+ }
+ }
+}
- mark_tbl(objspace, finalizer_table);
- mark_current_machine_context(objspace, th);
+static void
+gc_sweep(rb_objspace_t *objspace)
+{
+ RVALUE *p, *pend, *final_list;
+ size_t freed = 0;
+ size_t i;
+ size_t live = 0, free_min = 0, do_heap_free = 0;
- rb_gc_mark_symbols();
- rb_gc_mark_encodings();
+ do_heap_free = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.65);
+ free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.2);
- /* mark protected global variables */
- for (list = global_List; list; list = list->next) {
- rb_gc_mark_maybe(*list->varptr);
+ if (free_min < FREE_MIN) {
+ do_heap_free = heaps_used * HEAP_OBJ_LIMIT;
+ free_min = FREE_MIN;
}
- rb_mark_end_proc();
- rb_gc_mark_global_tbl();
-
- mark_tbl(objspace, rb_class_tbl);
- /* mark generic instance variables for special constants */
- rb_mark_generic_ivar_tbl();
-
- rb_gc_mark_parser();
+ 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;
+ RVALUE *free = freelist;
+ RVALUE *final = final_list;
+ int deferred;
- rb_gc_mark_unlinked_live_method_entries(th->vm);
+ if(heaps[i].finalize_flag) continue;
- /* marking-loop */
- gc_mark_stacked_objects(objspace);
+ 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;
+ p->as.free.next = final_list;
+ final_list = p;
+ final_num++;
+ }
+ else {
+ add_freelist(objspace, p);
+ free_num++;
+ }
+ }
+ else if (BUILTIN_TYPE(p) == T_ZOMBIE) {
+ /* objects to be finalized */
+ /* do nothing remain marked */
+ }
+ else {
+ RBASIC(p)->flags &= ~FL_MARK;
+ live++;
+ }
+ p++;
+ }
+ if (final_num + free_num == heaps[i].limit && freed > do_heap_free) {
+ RVALUE *pp;
- gc_prof_mark_timer_stop(objspace);
+ for (pp = final_list; pp != final; pp = pp->as.free.next) {
+ RDATA(pp)->dmark = (void (*)())(VALUE)&heaps[i];
+ pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */
+ }
+ heaps[i].limit = final_num;
+ heaps[i].finalize_flag = TRUE;
+ freelist = free; /* cancel this page from freelist */
+ }
+ else {
+ freed += free_num;
+ }
+ }
+ GC_PROF_SET_MALLOC_INFO;
+ if (malloc_increase > malloc_limit) {
+ malloc_limit += (size_t)((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);
+ }
+ during_gc = 0;
- objspace->mark_func_data = prev_mark_func_data;
+ /* 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;
+ }
}
-/* GC */
-
void
rb_gc_force_recycle(VALUE p)
{
rb_objspace_t *objspace = &rb_objspace;
- struct heaps_slot *slot;
-
- objspace->total_freed_object_num++;
- if (MARKED_IN_BITMAP(GET_HEAP_BITMAP(p), p)) {
- add_slot_local_freelist(objspace, (RVALUE *)p);
- }
- else {
- objspace->heap.free_num++;
- slot = add_slot_local_freelist(objspace, (RVALUE *)p);
- if (slot->free_next == NULL) {
- link_free_heap_slot(objspace, slot);
- }
- }
+ add_freelist(objspace, (RVALUE *)p);
}
-void
-rb_gc_register_mark_object(VALUE obj)
+static inline void
+make_deferred(RVALUE *p)
{
- VALUE ary = GET_THREAD()->vm->mark_object_ary;
- rb_ary_push(ary, obj);
+ p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE;
}
-void
-rb_gc_register_address(VALUE *addr)
+static inline void
+make_io_deferred(RVALUE *p)
{
- rb_objspace_t *objspace = &rb_objspace;
- struct gc_list *tmp;
-
- tmp = ALLOC(struct gc_list);
- tmp->next = global_List;
- tmp->varptr = addr;
- global_List = tmp;
+ 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;
}
-void
-rb_gc_unregister_address(VALUE *addr)
+static int
+obj_free(rb_objspace_t *objspace, VALUE obj)
{
- rb_objspace_t *objspace = &rb_objspace;
- struct gc_list *tmp = global_List;
+ switch (BUILTIN_TYPE(obj)) {
+ case T_NIL:
+ case T_FIXNUM:
+ case T_TRUE:
+ case T_FALSE:
+ rb_bug("obj_free() called for broken object");
+ break;
+ }
- if (tmp->varptr == addr) {
- global_List = tmp->next;
- xfree(tmp);
- return;
+ if (FL_TEST(obj, FL_EXIVAR)) {
+ rb_free_generic_ivar((VALUE)obj);
+ FL_UNSET(obj, FL_EXIVAR);
}
- while (tmp->next) {
- if (tmp->next->varptr == addr) {
- struct gc_list *t = tmp->next;
- tmp->next = tmp->next->next;
- xfree(t);
+ switch (BUILTIN_TYPE(obj)) {
+ 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);
+ }
+ break;
+ case T_MODULE:
+ case T_CLASS:
+ rb_clear_cache_by_class((VALUE)obj);
+ rb_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));
+ }
+ xfree(RANY(obj)->as.klass.ptr);
+ break;
+ case T_STRING:
+ rb_str_free(obj);
+ break;
+ case T_ARRAY:
+ rb_ary_free(obj);
+ break;
+ case T_HASH:
+ if (RANY(obj)->as.hash.ntbl) {
+ st_free_table(RANY(obj)->as.hash.ntbl);
+ }
+ break;
+ case T_REGEXP:
+ if (RANY(obj)->as.regexp.ptr) {
+ onig_free(RANY(obj)->as.regexp.ptr);
+ }
+ 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));
+ }
+ else if (RANY(obj)->as.data.dfree) {
+ make_deferred(RANY(obj));
+ return 1;
+ }
+ }
+ 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);
+ }
+ break;
+ case T_FILE:
+ if (RANY(obj)->as.file.fptr) {
+ make_io_deferred(RANY(obj));
+ return 1;
+ }
+ break;
+ case T_RATIONAL:
+ case T_COMPLEX:
+ break;
+ case T_ICLASS:
+ /* iClass shares table with the module */
+ xfree(RANY(obj)->as.klass.ptr);
+ break;
+
+ case T_FLOAT:
+ break;
+
+ case T_BIGNUM:
+ if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
+ xfree(RBIGNUM_DIGITS(obj));
+ }
+ 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);
+ }
+ break;
+ case NODE_ALLOCA:
+ xfree(RANY(obj)->as.node.u1.node);
break;
}
- tmp = tmp->next;
+ break; /* no need to free iv_tbl */
+
+ 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);
+ }
+ break;
+
+ default:
+ rb_bug("gc_sweep(): unknown data type 0x%x(%p)",
+ BUILTIN_TYPE(obj), (void*)obj);
}
+
+ return 0;
}
#define GC_NOTIFY 0
+void rb_vm_mark(void *ptr);
+
+#if STACK_GROW_DIRECTION < 0
+#define GET_STACK_BOUNDS(start, end, appendix) (start = STACK_END, end = STACK_START)
+#elif STACK_GROW_DIRECTION > 0
+#define GET_STACK_BOUNDS(start, end, appendix) (start = STACK_START, end = STACK_END+appendix)
+#else
+#define GET_STACK_BOUNDS(start, end, appendix) \
+ ((STACK_END < STACK_START) ? \
+ (start = STACK_END, end = STACK_START) : (start = STACK_START, end = STACK_END+appendix))
+#endif
+
+static void
+mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
+{
+ rb_jmp_buf save_regs_gc_mark;
+ VALUE *stack_start, *stack_end;
+
+ FLUSH_REGISTER_WINDOWS;
+ /* This assumes that all registers are saved into the jmp_buf (and stack) */
+ rb_setjmp(save_regs_gc_mark);
+
+ SET_STACK_END;
+ GET_STACK_BOUNDS(stack_start, stack_end, 1);
+
+ 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);
+#endif
+#if defined(__mc68000__)
+ mark_locations_array((VALUE*)((char*)STACK_END + 2),
+ (STACK_START - STACK_END));
+#endif
+}
+
+void rb_gc_mark_encodings(void);
+
static int
garbage_collect(rb_objspace_t *objspace)
{
+ struct gc_list *list;
+ rb_thread_t *th = GET_THREAD();
+ INIT_GC_PROF_PARAMS;
+
if (GC_NOTIFY) printf("start garbage_collect()\n");
if (!heaps) {
return FALSE;
}
- if (!ready_to_gc(objspace)) {
- return TRUE;
+
+ if (dont_gc || during_gc) {
+ if (!freelist) {
+ if (!heaps_increment(objspace)) {
+ set_heaps_increment(objspace);
+ heaps_increment(objspace);
+ }
+ }
+ return TRUE;
}
+ during_gc++;
+ objspace->count++;
- gc_prof_timer_start(objspace);
+ GC_PROF_TIMER_START;
+ GC_PROF_MARK_TIMER_START;
+ SET_STACK_END;
- rest_sweep(objspace);
+ init_mark_stack(objspace);
- during_gc++;
- gc_marks(objspace);
+ th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
- gc_prof_sweep_timer_start(objspace);
- gc_sweep(objspace);
- gc_prof_sweep_timer_stop(objspace);
+ if (finalizer_table) {
+ mark_tbl(objspace, finalizer_table, 0);
+ }
- gc_prof_timer_stop(objspace, Qtrue);
- if (GC_NOTIFY) printf("end garbage_collect()\n");
- return TRUE;
-}
+ mark_current_machine_context(objspace, th);
-static void *
-gc_with_gvl(void *ptr)
-{
- return (void *)(VALUE)garbage_collect((rb_objspace_t *)ptr);
-}
+ rb_gc_mark_threads();
+ rb_gc_mark_symbols();
+ rb_gc_mark_encodings();
-static int
-garbage_collect_with_gvl(rb_objspace_t *objspace)
-{
- if (dont_gc) return TRUE;
- if (ruby_thread_has_gvl_p()) {
- return garbage_collect(objspace);
+ /* mark protected global variables */
+ for (list = global_List; list; list = list->next) {
+ rb_gc_mark_maybe(*list->varptr);
}
- else {
- if (ruby_native_thread_p()) {
- return (int)(VALUE)rb_thread_call_with_gvl(gc_with_gvl, (void *)objspace);
+ rb_mark_end_proc();
+ rb_gc_mark_global_tbl();
+
+ mark_tbl(objspace, rb_class_tbl, 0);
+
+ /* mark generic instance variables for special constants */
+ rb_mark_generic_ivar_tbl();
+
+ 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 {
- /* no ruby thread */
- fprintf(stderr, "[FATAL] failed to allocate memory\n");
- exit(EXIT_FAILURE);
+ gc_mark_rest(objspace);
}
}
+ GC_PROF_MARK_TIMER_STOP;
+
+ GC_PROF_SWEEP_TIMER_START;
+ gc_sweep(objspace);
+ GC_PROF_SWEEP_TIMER_STOP;
+
+ /* sweep unlinked method entries */
+ if (th->vm->unlinked_method_entry_list) {
+ rb_sweep_method_entry(th->vm);
+ }
+
+ GC_PROF_TIMER_STOP;
+ if (GC_NOTIFY) printf("end garbage_collect()\n");
+ return TRUE;
}
int
@@ -3081,14 +2225,20 @@ rb_garbage_collect(void)
return garbage_collect(&rb_objspace);
}
-#undef Init_stack
-
void
-Init_stack(volatile VALUE *addr)
+rb_gc_mark_machine_stack(rb_thread_t *th)
{
- ruby_init_stack(addr);
+ rb_objspace_t *objspace = &rb_objspace;
+ VALUE *stack_start, *stack_end;
+
+ GET_STACK_BOUNDS(stack_start, stack_end, 0);
+ rb_gc_mark_locations(stack_start, stack_end);
+#ifdef __ia64
+ rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
+#endif
}
+
/*
* call-seq:
* GC.start -> nil
@@ -3106,1092 +2256,781 @@ rb_gc_start(void)
return Qnil;
}
-void
-rb_gc(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
- garbage_collect(objspace);
- if (!finalizing) finalize_deferred(objspace);
- free_unused_heaps(objspace);
-}
+#undef Init_stack
-int
-rb_during_gc(void)
+void
+Init_stack(volatile VALUE *addr)
{
- rb_objspace_t *objspace = &rb_objspace;
- return during_gc;
+ ruby_init_stack(addr);
}
/*
- * call-seq:
- * GC.count -> Integer
+ * Document-class: ObjectSpace
*
- * The number of times GC occurred.
+ * The <code>ObjectSpace</code> module contains a number of routines
+ * that interact with the garbage collection facility and allow you to
+ * traverse all living objects with an iterator.
*
- * It returns the number of times GC occurred since the process started.
+ * <code>ObjectSpace</code> also provides support for object
+ * finalizers, procs that will be called when a specific object is
+ * about to be destroyed by garbage collection.
+ *
+ * include ObjectSpace
+ *
+ *
+ * a = "A"
+ * b = "B"
+ * c = "C"
+ *
+ *
+ * define_finalizer(a, proc {|id| puts "Finalizer one on #{id}" })
+ * define_finalizer(a, proc {|id| puts "Finalizer two on #{id}" })
+ * define_finalizer(b, proc {|id| puts "Finalizer three on #{id}" })
+ *
+ * <em>produces:</em>
+ *
+ * Finalizer three on 537763470
+ * Finalizer one on 537763480
+ * Finalizer two on 537763480
*
*/
-static VALUE
-gc_count(VALUE self)
+void
+Init_heap(void)
{
- return UINT2NUM(rb_objspace.count);
+ init_heap(&rb_objspace);
}
/*
- * call-seq:
- * GC.stat -> Hash
+ * 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.
*
- * Returns a Hash containing information about the GC.
+ * '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.
*
- * The hash includes information about internal statistics about GC such as:
+ * If callback() returns non-zero, the iteration will be stopped.
*
- * {
- * :count=>0,
- * :heap_used=>12,
- * :heap_length=>12,
- * :heap_increment=>0,
- * :heap_live_num=>7539,
- * :heap_free_num=>88,
- * :heap_final_num=>0,
- * :total_allocated_object=>7630,
- * :total_freed_object=>88
- * }
+ * This is a sample callback code to iterate liveness objects:
*
- * The contents of the hash are implementation specific and may be changed in
- * the future.
+ * int
+ * sample_callback(void *vstart, void *vend, int stride, void *data) {
+ * VALUE v = (VALUE)vstart;
+ * for (; v != (VALUE)vend; v += stride) {
+ * if (RBASIC(v)->flags) { // liveness check
+ * // do something with live object 'v'
+ * }
+ * return 0; // continue to iteration
+ * }
*
- * This method is only expected to work on C Ruby.
+ * 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.
*/
-
-static VALUE
-gc_stat(int argc, VALUE *argv, VALUE self)
+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;
- VALUE hash;
- static VALUE sym_count;
- static VALUE sym_heap_used, sym_heap_length, sym_heap_increment;
- static VALUE sym_heap_live_num, sym_heap_free_num, sym_heap_final_num;
- static VALUE sym_total_allocated_object, sym_total_freed_object;
- if (sym_count == 0) {
- sym_count = ID2SYM(rb_intern_const("count"));
- sym_heap_used = ID2SYM(rb_intern_const("heap_used"));
- sym_heap_length = ID2SYM(rb_intern_const("heap_length"));
- sym_heap_increment = ID2SYM(rb_intern_const("heap_increment"));
- sym_heap_live_num = ID2SYM(rb_intern_const("heap_live_num"));
- sym_heap_free_num = ID2SYM(rb_intern_const("heap_free_num"));
- sym_heap_final_num = ID2SYM(rb_intern_const("heap_final_num"));
- sym_total_allocated_object = ID2SYM(rb_intern_const("total_allocated_object"));
- sym_total_freed_object = ID2SYM(rb_intern_const("total_freed_object"));
- }
+ volatile VALUE v;
- if (rb_scan_args(argc, argv, "01", &hash) == 1) {
- if (!RB_TYPE_P(hash, T_HASH))
- rb_raise(rb_eTypeError, "non-hash given");
- }
+ 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;
- if (hash == Qnil) {
- hash = rb_hash_new();
+ 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;
+ }
+ }
}
- rest_sweep(objspace);
+ return;
+}
- rb_hash_aset(hash, sym_count, SIZET2NUM(objspace->count));
- /* implementation dependent counters */
- rb_hash_aset(hash, sym_heap_used, SIZET2NUM(objspace->heap.used));
- rb_hash_aset(hash, sym_heap_length, SIZET2NUM(objspace->heap.length));
- rb_hash_aset(hash, sym_heap_increment, SIZET2NUM(objspace->heap.increment));
- rb_hash_aset(hash, sym_heap_live_num, SIZET2NUM(objspace_live_num(objspace)));
- rb_hash_aset(hash, sym_heap_free_num, SIZET2NUM(objspace->heap.free_num));
- rb_hash_aset(hash, sym_heap_final_num, SIZET2NUM(objspace->heap.final_num));
- rb_hash_aset(hash, sym_total_allocated_object, SIZET2NUM(objspace->total_allocated_object_num));
- rb_hash_aset(hash, sym_total_freed_object, SIZET2NUM(objspace->total_freed_object_num));
+struct os_each_struct {
+ size_t num;
+ VALUE of;
+};
- return hash;
-}
+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;
+ volatile VALUE v;
-/*
- * call-seq:
- * GC.stress -> true or false
- *
- * Returns current status of GC stress mode.
- */
+ 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++;
+ }
+ }
+ }
+ }
+
+ return 0;
+}
static VALUE
-gc_stress_get(VALUE self)
+os_obj_of(VALUE of)
{
- rb_objspace_t *objspace = &rb_objspace;
- return ruby_gc_stress ? Qtrue : Qfalse;
+ struct os_each_struct oes;
+
+ oes.num = 0;
+ oes.of = of;
+ rb_objspace_each_objects(os_obj_of_i, &oes);
+ return SIZET2NUM(oes.num);
}
/*
* call-seq:
- * GC.stress = bool -> bool
+ * ObjectSpace.each_object([module]) {|obj| ... } -> fixnum
+ * ObjectSpace.each_object([module]) -> an_enumerator
*
- * Updates the GC stress mode.
+ * Calls the block once for each living, nonimmediate object in this
+ * Ruby process. If <i>module</i> is specified, calls the block
+ * for only those classes or modules that match (or are a subclass of)
+ * <i>module</i>. Returns the number of objects found. Immediate
+ * objects (<code>Fixnum</code>s, <code>Symbol</code>s
+ * <code>true</code>, <code>false</code>, and <code>nil</code>) are
+ * never returned. In the example below, <code>each_object</code>
+ * returns both the numbers we defined and several constants defined in
+ * the <code>Math</code> module.
+ *
+ * If no block is given, an enumerator is returned instead.
+ *
+ * a = 102.7
+ * b = 95 # Won't be returned
+ * c = 12345678987654321
+ * count = ObjectSpace.each_object(Numeric) {|x| p x }
+ * puts "Total count: #{count}"
*
- * When stress mode is enabled, the GC is invoked at every GC opportunity:
- * all memory and object allocations.
+ * <em>produces:</em>
+ *
+ * 12345678987654321
+ * 102.7
+ * 2.71828182845905
+ * 3.14159265358979
+ * 2.22044604925031e-16
+ * 1.7976931348623157e+308
+ * 2.2250738585072e-308
+ * Total count: 7
*
- * Enabling stress mode will degrade performance, it is only for debugging.
*/
static VALUE
-gc_stress_set(VALUE self, VALUE flag)
+os_each_obj(int argc, VALUE *argv, VALUE os)
{
- rb_objspace_t *objspace = &rb_objspace;
- rb_secure(2);
- ruby_gc_stress = RTEST(flag);
- return flag;
+ VALUE of;
+
+ rb_secure(4);
+ if (argc == 0) {
+ of = 0;
+ }
+ else {
+ rb_scan_args(argc, argv, "01", &of);
+ }
+ RETURN_ENUMERATOR(os, 1, &of);
+ return os_obj_of(of);
}
/*
* call-seq:
- * GC.enable -> true or false
- *
- * Enables garbage collection, returning +true+ if garbage
- * collection was previously disabled.
+ * ObjectSpace.undefine_finalizer(obj)
*
- * GC.disable #=> false
- * GC.enable #=> true
- * GC.enable #=> false
+ * Removes all finalizers for <i>obj</i>.
*
*/
-VALUE
-rb_gc_enable(void)
+static VALUE
+undefine_final(VALUE os, VALUE obj)
{
rb_objspace_t *objspace = &rb_objspace;
- int old = dont_gc;
-
- dont_gc = FALSE;
- return old ? Qtrue : Qfalse;
+ 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;
}
/*
* call-seq:
- * GC.disable -> true or false
- *
- * Disables garbage collection, returning +true+ if garbage
- * collection was already disabled.
+ * ObjectSpace.define_finalizer(obj, aProc=proc())
*
- * GC.disable #=> false
- * GC.disable #=> true
+ * Adds <i>aProc</i> as a finalizer, to be called after <i>obj</i>
+ * was destroyed.
*
*/
-VALUE
-rb_gc_disable(void)
+static VALUE
+define_final(int argc, VALUE *argv, VALUE os)
{
rb_objspace_t *objspace = &rb_objspace;
- int old = dont_gc;
+ VALUE obj, block, table;
- rest_sweep(objspace);
+ rb_scan_args(argc, argv, "11", &obj, &block);
+ if (OBJ_FROZEN(obj)) rb_error_frozen("object");
+ if (argc == 1) {
+ block = rb_block_proc();
+ }
+ else if (!rb_respond_to(block, rb_intern("call"))) {
+ 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;
- dont_gc = TRUE;
- return old ? Qtrue : Qfalse;
-}
+ block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
+ OBJ_FREEZE(block);
-void
-rb_gc_set_params(void)
-{
- char *malloc_limit_ptr, *heap_min_slots_ptr, *free_min_ptr;
-
- if (rb_safe_level() > 0) return;
-
- malloc_limit_ptr = getenv("RUBY_GC_MALLOC_LIMIT");
- if (malloc_limit_ptr != NULL) {
- int malloc_limit_i = atoi(malloc_limit_ptr);
- if (RTEST(ruby_verbose))
- fprintf(stderr, "malloc_limit=%d (%d)\n",
- malloc_limit_i, initial_malloc_limit);
- if (malloc_limit_i > 0) {
- initial_malloc_limit = malloc_limit_i;
- }
+ if (!finalizer_table) {
+ finalizer_table = st_init_numtable();
}
-
- heap_min_slots_ptr = getenv("RUBY_HEAP_MIN_SLOTS");
- if (heap_min_slots_ptr != NULL) {
- int heap_min_slots_i = atoi(heap_min_slots_ptr);
- if (RTEST(ruby_verbose))
- fprintf(stderr, "heap_min_slots=%d (%d)\n",
- heap_min_slots_i, initial_heap_min_slots);
- if (heap_min_slots_i > 0) {
- initial_heap_min_slots = heap_min_slots_i;
- initial_expand_heap(&rb_objspace);
- }
+ if (st_lookup(finalizer_table, obj, &table)) {
+ rb_ary_push(table, block);
}
-
- free_min_ptr = getenv("RUBY_FREE_MIN");
- if (free_min_ptr != NULL) {
- int free_min_i = atoi(free_min_ptr);
- if (RTEST(ruby_verbose))
- fprintf(stderr, "free_min=%d (%d)\n", free_min_i, initial_free_min);
- if (free_min_i > 0) {
- initial_free_min = free_min_i;
- }
+ else {
+ table = rb_ary_new3(1, block);
+ RBASIC(table)->klass = 0;
+ st_add_direct(finalizer_table, obj, table);
}
+ return block;
}
void
-rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data)
+rb_gc_copy_finalizer(VALUE dest, VALUE obj)
{
rb_objspace_t *objspace = &rb_objspace;
+ VALUE table;
- if (markable_object_p(objspace, obj)) {
- struct mark_func_data_struct mfd;
- mfd.mark_func = func;
- mfd.data = data;
- objspace->mark_func_data = &mfd;
- gc_mark_children(objspace, obj);
- objspace->mark_func_data = 0;
+ if (!finalizer_table) return;
+ if (!FL_TEST(obj, FL_FINALIZE)) return;
+ if (st_lookup(finalizer_table, obj, &table)) {
+ st_insert(finalizer_table, dest, table);
}
+ FL_SET(dest, FL_FINALIZE);
}
-/*
- ------------------------ Extended allocator ------------------------
-*/
-
-static void vm_xfree(rb_objspace_t *objspace, void *ptr);
-
-static void *
-negative_size_allocation_error_with_gvl(void *ptr)
+static VALUE
+run_single_final(VALUE arg)
{
- rb_raise(rb_eNoMemError, "%s", (const char *)ptr);
- return 0; /* should not be reached */
+ VALUE *args = (VALUE *)arg;
+ rb_eval_cmd(args[0], args[1], (int)args[2]);
+ return Qnil;
}
static void
-negative_size_allocation_error(const char *msg)
+run_finalizer(rb_objspace_t *objspace, VALUE obj, VALUE objid, VALUE table)
{
- if (ruby_thread_has_gvl_p()) {
- rb_raise(rb_eNoMemError, "%s", msg);
+ long i;
+ int status;
+ VALUE args[3];
+
+ 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));
}
- 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);
- }
+ 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);
}
}
-static void *
-ruby_memerror_body(void *dummy)
-{
- rb_memerror();
- return 0;
-}
-
static void
-ruby_memerror(void)
+run_final(rb_objspace_t *objspace, VALUE obj)
{
- 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);
- }
- }
-}
+ VALUE table, objid;
+ RUBY_DATA_FUNC free_func = 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)) {
- fprintf(stderr, "[FATAL] failed to allocate memory\n");
- exit(EXIT_FAILURE);
- }
- 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);
- rb_exc_raise(nomem_error);
-}
+ objid = rb_obj_id(obj); /* make obj into id */
+ RBASIC(obj)->klass = 0;
-static void *
-aligned_malloc(size_t alignment, size_t size)
-{
- void *res;
-
-#if defined __MINGW32__
- res = __mingw_aligned_malloc(size, alignment);
-#elif defined _WIN32 && !defined __CYGWIN__
- res = _aligned_malloc(size, alignment);
-#elif defined(HAVE_POSIX_MEMALIGN)
- if (posix_memalign(&res, alignment, size) == 0) {
- return res;
+ if (RTYPEDDATA_P(obj)) {
+ free_func = RTYPEDDATA_TYPE(obj)->dfree;
}
else {
- return NULL;
+ free_func = RDATA(obj)->dfree;
}
-#elif defined(HAVE_MEMALIGN)
- res = memalign(alignment, size);
-#else
- char* aligned;
- res = malloc(alignment + size + sizeof(void*));
- aligned = (char*)res + alignment + sizeof(void*);
- aligned -= ((VALUE)aligned & (alignment - 1));
- ((void**)aligned)[-1] = res;
- res = (void*)aligned;
-#endif
-
-#if defined(_DEBUG) || defined(GC_DEBUG)
- /* alignment must be a power of 2 */
- assert((alignment - 1) & alignment == 0);
- assert(alignment % sizeof(void*) == 0);
-#endif
- return res;
-}
-
-static void
-aligned_free(void *ptr)
-{
-#if defined __MINGW32__
- __mingw_aligned_free(ptr);
-#elif defined _WIN32 && !defined __CYGWIN__
- _aligned_free(ptr);
-#elif defined(HAVE_MEMALIGN) || defined(HAVE_POSIX_MEMALIGN)
- free(ptr);
-#else
- free(((void**)ptr)[-1]);
-#endif
-}
-
-static inline size_t
-vm_malloc_prepare(rb_objspace_t *objspace, size_t size)
-{
- if ((ssize_t)size < 0) {
- negative_size_allocation_error("negative allocation size (or too big)");
+ if (free_func) {
+ (*free_func)(DATA_PTR(obj));
}
- if (size == 0) size = 1;
-#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 (finalizer_table &&
+ st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
+ run_finalizer(objspace, obj, objid, table);
}
-
- return size;
-}
-
-static inline void *
-vm_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
-{
- ATOMIC_SIZE_ADD(malloc_increase, size);
-
-#if CALC_EXACT_MALLOC_SIZE
- ATOMIC_SIZE_ADD(objspace->malloc_params.allocated_size, size);
- ATOMIC_SIZE_INC(objspace->malloc_params.allocations);
- ((size_t *)mem)[0] = size;
- mem = (size_t *)mem + 1;
-#endif
-
- return mem;
-}
-
-#define TRY_WITH_GC(alloc) do { \
- if (!(alloc) && \
- (!garbage_collect_with_gvl(objspace) || \
- !(alloc))) { \
- ruby_memerror(); \
- } \
- } while (0)
-
-static void *
-vm_xmalloc(rb_objspace_t *objspace, size_t size)
-{
- void *mem;
-
- size = vm_malloc_prepare(objspace, size);
- TRY_WITH_GC(mem = malloc(size));
- return vm_malloc_fixup(objspace, mem, size);
}
-static void *
-vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size)
+static void
+finalize_deferred(rb_objspace_t *objspace)
{
- void *mem;
-#if CALC_EXACT_MALLOC_SIZE
- size_t oldsize;
-#endif
-
- if ((ssize_t)size < 0) {
- negative_size_allocation_error("negative re-allocation size");
- }
-
- if (!ptr) return vm_xmalloc(objspace, size);
-
- /*
- * The behavior of realloc(ptr, 0) is implementation defined.
- * Therefore we don't use realloc(ptr, 0) for portability reason.
- * see http://www.open-std.org/jtc1/sc22/wg14/www/docs/dr_400.htm
- */
- if (size == 0) {
- vm_xfree(objspace, ptr);
- return 0;
- }
- if (ruby_gc_stress && !ruby_disable_gc_stress)
- garbage_collect_with_gvl(objspace);
-
-#if CALC_EXACT_MALLOC_SIZE
- size += sizeof(size_t);
- ptr = (size_t *)ptr - 1;
- oldsize = ((size_t *)ptr)[0];
-#endif
+ RVALUE *p = deferred_final_list;
+ deferred_final_list = 0;
- mem = realloc(ptr, size);
- if (!mem) {
- if (garbage_collect_with_gvl(objspace)) {
- mem = realloc(ptr, size);
- }
- if (!mem) {
- ruby_memerror();
- }
+ if (p) {
+ finalize_list(objspace, p);
}
- ATOMIC_SIZE_ADD(malloc_increase, size);
-
-#if CALC_EXACT_MALLOC_SIZE
- ATOMIC_SIZE_ADD(objspace->malloc_params.allocated_size, size - oldsize);
- ((size_t *)mem)[0] = size;
- mem = (size_t *)mem + 1;
-#endif
-
- return mem;
}
static void
-vm_xfree(rb_objspace_t *objspace, void *ptr)
+gc_finalize_deferred(rb_objspace_t *objspace)
{
-#if CALC_EXACT_MALLOC_SIZE
- size_t size;
- ptr = ((size_t *)ptr) - 1;
- size = ((size_t*)ptr)[0];
- if (size) {
- ATOMIC_SIZE_SUB(objspace->malloc_params.allocated_size, size);
- ATOMIC_SIZE_DEC(objspace->malloc_params.allocations);
- }
-#endif
-
- free(ptr);
+ finalize_deferred(objspace);
+ free_unused_heaps(objspace);
}
-void *
-ruby_xmalloc(size_t size)
+void
+rb_gc_finalize_deferred(void)
{
- return vm_xmalloc(&rb_objspace, size);
+ gc_finalize_deferred(&rb_objspace);
}
-static inline size_t
-xmalloc2_size(size_t n, size_t size)
+static int
+chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
{
- size_t len = size * n;
- if (n != 0 && size != len / n) {
- rb_raise(rb_eArgError, "malloc: possible integer overflow");
+ RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg;
+ if ((p->as.basic.flags & (FL_FINALIZE|FL_MARK)) == 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 len;
+ return ST_CONTINUE;
}
-void *
-ruby_xmalloc2(size_t n, size_t size)
-{
- return vm_xmalloc(&rb_objspace, xmalloc2_size(n, size));
-}
+struct force_finalize_list {
+ VALUE obj;
+ VALUE table;
+ struct force_finalize_list *next;
+};
-static void *
-vm_xcalloc(rb_objspace_t *objspace, size_t count, size_t elsize)
+static int
+force_chain_object(st_data_t key, st_data_t val, st_data_t arg)
{
- void *mem;
- size_t size;
-
- size = xmalloc2_size(count, elsize);
- size = vm_malloc_prepare(objspace, size);
-
- TRY_WITH_GC(mem = calloc(1, size));
- return vm_malloc_fixup(objspace, mem, size);
+ struct force_finalize_list **prev = (struct force_finalize_list **)arg;
+ struct force_finalize_list *curr = ALLOC(struct force_finalize_list);
+ curr->obj = key;
+ curr->table = val;
+ curr->next = *prev;
+ *prev = curr;
+ return ST_CONTINUE;
}
-void *
-ruby_xcalloc(size_t n, size_t size)
+void
+rb_gc_call_finalizer_at_exit(void)
{
- return vm_xcalloc(&rb_objspace, n, size);
+ rb_objspace_call_finalizer(&rb_objspace);
}
-void *
-ruby_xrealloc(void *ptr, size_t size)
+void
+rb_objspace_call_finalizer(rb_objspace_t *objspace)
{
- return vm_xrealloc(&rb_objspace, ptr, size);
-}
+ RVALUE *p, *pend;
+ RVALUE *final_list = 0;
+ size_t i;
-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");
+ /* run finalizers */
+ if (finalizer_table) {
+ do {
+ /* XXX: this loop will make no sense */
+ /* because mark will not be removed */
+ finalize_deferred(objspace);
+ mark_tbl(objspace, finalizer_table, 0);
+ st_foreach(finalizer_table, chain_finalized_object,
+ (st_data_t)&deferred_final_list);
+ } while (deferred_final_list);
+ /* force to run finalizer */
+ while (finalizer_table->num_entries) {
+ struct force_finalize_list *list = 0;
+ st_foreach(finalizer_table, force_chain_object, (st_data_t)&list);
+ while (list) {
+ struct force_finalize_list *curr = list;
+ run_finalizer(objspace, curr->obj, rb_obj_id(curr->obj), curr->table);
+ st_delete(finalizer_table, (st_data_t*)&curr->obj, 0);
+ list = curr->next;
+ xfree(curr);
+ }
+ }
+ 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) {
+ 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));
+ }
+ else if (RANY(p)->as.data.dfree) {
+ make_deferred(RANY(p));
+ RANY(p)->as.free.next = final_list;
+ final_list = 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++;
+ }
+ }
+ during_gc = 0;
+ if (final_list) {
+ finalize_list(objspace, final_list);
}
- return ruby_xrealloc(ptr, len);
}
void
-ruby_xfree(void *x)
-{
- if (x)
- vm_xfree(&rb_objspace, x);
-}
-
-
-/* Mimic ruby_xmalloc, but need not rb_objspace.
- * should return pointer suitable for ruby_xfree
- */
-void *
-ruby_mimmalloc(size_t size)
+rb_gc(void)
{
- void *mem;
-#if CALC_EXACT_MALLOC_SIZE
- size += sizeof(size_t);
-#endif
- mem = malloc(size);
-#if CALC_EXACT_MALLOC_SIZE
- /* set 0 for consistency of allocated_size/allocations */
- ((size_t *)mem)[0] = 0;
- mem = (size_t *)mem + 1;
-#endif
- return mem;
+ rb_objspace_t *objspace = &rb_objspace;
+ garbage_collect(objspace);
+ gc_finalize_deferred(objspace);
}
-#if CALC_EXACT_MALLOC_SIZE
/*
* call-seq:
- * GC.malloc_allocated_size -> Integer
- *
- * Returns the size of memory allocated by malloc().
+ * ObjectSpace._id2ref(object_id) -> an_object
*
- * Only available if ruby was built with +CALC_EXACT_MALLOC_SIZE+.
- */
-
-static VALUE
-gc_malloc_allocated_size(VALUE self)
-{
- return UINT2NUM(rb_objspace.malloc_params.allocated_size);
-}
-
-/*
- * call-seq:
- * GC.malloc_allocations -> Integer
+ * Converts an object id to a reference to the object. May not be
+ * called on an object id passed as a parameter to a finalizer.
*
- * Returns the number of malloc() allocations.
+ * s = "I am a string" #=> "I am a string"
+ * r = ObjectSpace._id2ref(s.object_id) #=> "I am a string"
+ * r == s #=> true
*
- * Only available if ruby was built with +CALC_EXACT_MALLOC_SIZE+.
*/
static VALUE
-gc_malloc_allocations(VALUE self)
+id2ref(VALUE obj, VALUE objid)
{
- return UINT2NUM(rb_objspace.malloc_params.allocations);
-}
+#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;
-/*
- ------------------------------ WeakMap ------------------------------
-*/
-
-struct weakmap {
- st_table *obj2wmap; /* obj -> [ref,...] */
- st_table *wmap2obj; /* ref -> obj */
- VALUE final;
-};
-
-static int
-wmap_mark_map(st_data_t key, st_data_t val, st_data_t arg)
-{
- gc_mark_ptr((rb_objspace_t *)arg, (VALUE)val);
- return ST_CONTINUE;
-}
-
-static void
-wmap_mark(void *ptr)
-{
- struct weakmap *w = ptr;
- st_foreach(w->obj2wmap, wmap_mark_map, (st_data_t)&rb_objspace);
- rb_gc_mark(w->final);
-}
-
-static int
-wmap_free_map(st_data_t key, st_data_t val, st_data_t arg)
-{
- rb_ary_resize((VALUE)val, 0);
- return ST_CONTINUE;
-}
-
-static void
-wmap_free(void *ptr)
-{
- struct weakmap *w = ptr;
- st_foreach(w->obj2wmap, wmap_free_map, 0);
- st_free_table(w->obj2wmap);
- st_free_table(w->wmap2obj);
-}
-
-size_t rb_ary_memsize(VALUE ary);
-static int
-wmap_memsize_map(st_data_t key, st_data_t val, st_data_t arg)
-{
- *(size_t *)arg += rb_ary_memsize((VALUE)val);
- return ST_CONTINUE;
-}
-
-static size_t
-wmap_memsize(const void *ptr)
-{
- size_t size;
- const struct weakmap *w = ptr;
- if (!w) return 0;
- size = sizeof(*w);
- size += st_memsize(w->obj2wmap);
- size += st_memsize(w->wmap2obj);
- st_foreach(w->obj2wmap, wmap_memsize_map, (st_data_t)&size);
- return size;
-}
-
-static const rb_data_type_t weakmap_type = {
- "weakmap",
- {
- wmap_mark,
- wmap_free,
- wmap_memsize,
- }
-};
-
-static VALUE
-wmap_allocate(VALUE klass)
-{
- struct weakmap *w;
- VALUE obj = TypedData_Make_Struct(klass, struct weakmap, &weakmap_type, w);
- w->obj2wmap = st_init_numtable();
- w->wmap2obj = st_init_numtable();
- w->final = rb_obj_method(obj, ID2SYM(rb_intern("finalize")));
- return obj;
-}
-
-static int
-wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
-{
- VALUE wmap, ary;
- if (!existing) return ST_STOP;
- wmap = (VALUE)arg, ary = (VALUE)*value;
- rb_ary_delete_same(ary, wmap);
- if (!RARRAY_LEN(ary)) return ST_DELETE;
- return ST_CONTINUE;
-}
+ rb_secure(4);
+ ptr = NUM2PTR(objid);
+ p0 = (void *)ptr;
-static VALUE
-wmap_finalize(VALUE self, VALUE objid)
-{
- st_data_t orig, wmap, data;
- VALUE obj, rids;
- long i;
- struct weakmap *w;
-
- TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
- /* Get reference from object id. */
- obj = obj_id_to_ref(objid);
-
- /* obj is original referenced object and/or weak reference. */
- orig = (st_data_t)obj;
- if (st_delete(w->obj2wmap, &orig, &data)) {
- rids = (VALUE)data;
- for (i = 0; i < RARRAY_LEN(rids); ++i) {
- wmap = (st_data_t)RARRAY_PTR(rids)[i];
- st_delete(w->wmap2obj, &wmap, NULL);
- }
- }
+ if (ptr == Qtrue) return Qtrue;
+ if (ptr == Qfalse) return Qfalse;
+ if (ptr == Qnil) return Qnil;
+ if (FIXNUM_P(ptr)) return (VALUE)ptr;
+ ptr = objid ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
- wmap = (st_data_t)obj;
- if (st_delete(w->wmap2obj, &wmap, &orig)) {
- wmap = (st_data_t)obj;
- st_update(w->obj2wmap, orig, wmap_final_func, wmap);
+ 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);
}
- return self;
-}
-/* Creates a weak reference from the given key to the given value */
-static VALUE
-wmap_aset(VALUE self, VALUE wmap, VALUE orig)
-{
- st_data_t data;
- VALUE rids;
- struct weakmap *w;
-
- TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
- rb_define_final(orig, w->final);
- rb_define_final(wmap, w->final);
- if (st_lookup(w->obj2wmap, (st_data_t)orig, &data)) {
- rids = (VALUE)data;
+ 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);
}
- else {
- rids = rb_ary_tmp_new(1);
- st_insert(w->obj2wmap, (st_data_t)orig, (st_data_t)rids);
+ if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
+ rb_raise(rb_eRangeError, "%p is recycled object", p0);
}
- rb_ary_push(rids, wmap);
- st_insert(w->wmap2obj, (st_data_t)wmap, (st_data_t)orig);
- return nonspecial_obj_id(orig);
-}
-
-/* Retrieves a weakly referenced object with the given key */
-static VALUE
-wmap_aref(VALUE self, VALUE wmap)
-{
- st_data_t data;
- VALUE obj;
- struct weakmap *w;
- rb_objspace_t *objspace = &rb_objspace;
-
- TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
- if (!st_lookup(w->wmap2obj, (st_data_t)wmap, &data)) return Qnil;
- obj = (VALUE)data;
- if (!is_id_value(objspace, obj)) return Qnil;
- if (!is_live_object(objspace, obj)) return Qnil;
- return obj;
+ return (VALUE)ptr;
}
-
/*
- ------------------------------ GC profiler ------------------------------
-*/
+ * Document-method: __id__
+ * Document-method: object_id
+ *
+ * call-seq:
+ * obj.__id__ -> fixnum
+ * obj.object_id -> fixnum
+ *
+ * Returns an integer identifier for <i>obj</i>. The same number will
+ * be returned on all calls to <code>id</code> for a given object, and
+ * no two active objects will share an id.
+ * <code>Object#object_id</code> is a different concept from the
+ * <code>:name</code> notation, which returns the symbol id of
+ * <code>name</code>. Replaces the deprecated <code>Object#id</code>.
+ */
-static inline void gc_prof_set_heap_info(rb_objspace_t *, gc_profile_record *);
-#define GC_PROFILE_RECORD_DEFAULT_SIZE 100
+/*
+ * call-seq:
+ * obj.hash -> fixnum
+ *
+ * Generates a <code>Fixnum</code> hash value for this object. This
+ * function must have the property that <code>a.eql?(b)</code> implies
+ * <code>a.hash == b.hash</code>. The hash value is used by class
+ * <code>Hash</code>. Any hash value that exceeds the capacity of a
+ * <code>Fixnum</code> will be truncated before being used.
+ */
-static double
-getrusage_time(void)
+VALUE
+rb_obj_id(VALUE obj)
{
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)
- {
- static int try_clock_gettime = 1;
- struct timespec ts;
- if (try_clock_gettime && clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) == 0) {
- return ts.tv_sec + ts.tv_nsec * 1e-9;
- }
- else {
- try_clock_gettime = 0;
- }
- }
-#endif
-
-#ifdef RUSAGE_SELF
- {
- struct rusage usage;
- struct timeval time;
- if (getrusage(RUSAGE_SELF, &usage) == 0) {
- time = usage.ru_utime;
- return time.tv_sec + time.tv_usec * 1e-6;
- }
- }
-#endif
-
-#ifdef _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) {
- 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;
- }
+ /*
+ * 32-bit VALUE space
+ * MSB ------------------------ LSB
+ * false 00000000000000000000000000000000
+ * true 00000000000000000000000000000010
+ * nil 00000000000000000000000000000100
+ * undef 00000000000000000000000000000110
+ * symbol ssssssssssssssssssssssss00001110
+ * object oooooooooooooooooooooooooooooo00 = 0 (mod sizeof(RVALUE))
+ * fixnum fffffffffffffffffffffffffffffff1
+ *
+ * object_id space
+ * LSB
+ * false 00000000000000000000000000000000
+ * true 00000000000000000000000000000010
+ * nil 00000000000000000000000000000100
+ * undef 00000000000000000000000000000110
+ * symbol 000SSSSSSSSSSSSSSSSSSSSSSSSSSS0 S...S % A = 4 (S...S = s...s * A + 4)
+ * object oooooooooooooooooooooooooooooo0 o...o % A = 0
+ * fixnum fffffffffffffffffffffffffffffff1 bignum if required
+ *
+ * where A = sizeof(RVALUE)/4
+ *
+ * sizeof(RVALUE) is
+ * 20 if 32-bit, double is 4-byte aligned
+ * 24 if 32-bit, double is 8-byte aligned
+ * 40 if 64-bit
+ */
+ if (TYPE(obj) == T_SYMBOL) {
+ return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
}
-#endif
-
- return 0.0;
-}
-
-static inline void
-gc_prof_timer_start(rb_objspace_t *objspace)
-{
- if (objspace->profile.run) {
- size_t count = objspace->profile.count;
-
- if (!objspace->profile.record) {
- objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE;
- 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);
- objspace->profile.record[count].gc_time = getrusage_time();
- objspace->profile.record[objspace->profile.count].gc_invoke_time =
- objspace->profile.record[count].gc_time - objspace->profile.invoke_time;
+ if (SPECIAL_CONST_P(obj)) {
+ return LONG2NUM((SIGNED_VALUE)obj);
}
+ return (VALUE)((SIGNED_VALUE)obj|FIXNUM_FLAG);
}
-static inline void
-gc_prof_timer_stop(rb_objspace_t *objspace, int marked)
+static int
+set_zero(st_data_t key, st_data_t val, st_data_t arg)
{
- if (objspace->profile.run) {
- double gc_time = 0;
- size_t count = objspace->profile.count;
- gc_profile_record *record = &objspace->profile.record[count];
-
- gc_time = getrusage_time() - record->gc_time;
- if (gc_time < 0) gc_time = 0;
- record->gc_time = gc_time;
- record->is_marked = !!(marked);
- gc_prof_set_heap_info(objspace, record);
- objspace->profile.count++;
- }
+ VALUE k = (VALUE)key;
+ VALUE hash = (VALUE)arg;
+ rb_hash_aset(hash, k, INT2FIX(0));
+ return ST_CONTINUE;
}
-#if !GC_PROFILE_MORE_DETAIL
-
-static inline void
-gc_prof_mark_timer_start(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_MARK_BEGIN_ENABLED()) {
- RUBY_DTRACE_GC_MARK_BEGIN();
- }
-}
+/*
+ * 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 inline void
-gc_prof_mark_timer_stop(rb_objspace_t *objspace)
+static VALUE
+count_objects(int argc, VALUE *argv, VALUE os)
{
- if (RUBY_DTRACE_GC_MARK_END_ENABLED()) {
- RUBY_DTRACE_GC_MARK_END();
- }
-}
+ 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;
-static inline void
-gc_prof_sweep_timer_start(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_SWEEP_BEGIN_ENABLED()) {
- RUBY_DTRACE_GC_SWEEP_BEGIN();
+ if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+ if (TYPE(hash) != T_HASH)
+ rb_raise(rb_eTypeError, "non-hash given");
}
-}
-static inline void
-gc_prof_sweep_timer_stop(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_SWEEP_END_ENABLED()) {
- RUBY_DTRACE_GC_SWEEP_END();
+ for (i = 0; i <= T_MASK; i++) {
+ counts[i] = 0;
}
-}
-
-static inline void
-gc_prof_set_malloc_info(rb_objspace_t *objspace)
-{
-}
-
-static inline void
-gc_prof_set_heap_info(rb_objspace_t *objspace, gc_profile_record *record)
-{
- size_t live = objspace_live_num(objspace);
- size_t total = heaps_used * HEAP_OBJ_LIMIT;
-
- record->heap_total_objects = total;
- record->heap_use_size = live * sizeof(RVALUE);
- record->heap_total_size = total * sizeof(RVALUE);
-}
-#else
-
-static inline void
-gc_prof_mark_timer_start(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_MARK_BEGIN_ENABLED()) {
- RUBY_DTRACE_GC_MARK_BEGIN();
- }
- if (objspace->profile.run) {
- size_t count = objspace->profile.count;
+ for (i = 0; i < heaps_used; i++) {
+ RVALUE *p, *pend;
- objspace->profile.record[count].gc_mark_time = getrusage_time();
+ 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;
}
-}
-static inline void
-gc_prof_mark_timer_stop(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_MARK_END_ENABLED()) {
- RUBY_DTRACE_GC_MARK_END();
- }
- if (objspace->profile.run) {
- double mark_time = 0;
- size_t count = objspace->profile.count;
- gc_profile_record *record = &objspace->profile.record[count];
-
- mark_time = getrusage_time() - record->gc_mark_time;
- if (mark_time < 0) mark_time = 0;
- record->gc_mark_time = mark_time;
+ if (hash == Qnil) {
+ hash = rb_hash_new();
}
-}
-
-static inline void
-gc_prof_sweep_timer_start(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_SWEEP_BEGIN_ENABLED()) {
- RUBY_DTRACE_GC_SWEEP_BEGIN();
+ else if (!RHASH_EMPTY_P(hash)) {
+ st_foreach(RHASH_TBL(hash), set_zero, hash);
}
- if (objspace->profile.run) {
- size_t count = objspace->profile.count;
+ rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
+ rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(freed));
- objspace->profile.record[count].gc_sweep_time = getrusage_time();
+ 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]));
}
-}
-static inline void
-gc_prof_sweep_timer_stop(rb_objspace_t *objspace)
-{
- if (RUBY_DTRACE_GC_SWEEP_END_ENABLED()) {
- RUBY_DTRACE_GC_SWEEP_END();
- }
- if (objspace->profile.run) {
- double sweep_time = 0;
- size_t count = objspace->profile.count;
- gc_profile_record *record = &objspace->profile.record[count];
-
- sweep_time = getrusage_time() - record->gc_sweep_time;\
- if (sweep_time < 0) sweep_time = 0;\
- record->gc_sweep_time = sweep_time;
- }
+ return hash;
}
-static inline void
-gc_prof_set_malloc_info(rb_objspace_t *objspace)
-{
- if (objspace->profile.run) {
- gc_profile_record *record = &objspace->profile.record[objspace->profile.count];
- if (record) {
- record->allocate_increase = malloc_increase;
- record->allocate_limit = malloc_limit;
- }
- }
-}
+/*
+ * call-seq:
+ * GC.count -> Integer
+ *
+ * The number of times GC occurred.
+ *
+ * It returns the number of times GC occurred since the process started.
+ *
+ */
-static inline void
-gc_prof_set_heap_info(rb_objspace_t *objspace, gc_profile_record *record)
+static VALUE
+gc_count(VALUE self)
{
- size_t live = objspace_live_num(objspace);
- size_t total = heaps_used * HEAP_OBJ_LIMIT;
-
- record->heap_use_slots = heaps_used;
- record->heap_live_objects = live;
- record->heap_free_objects = total - live;
- record->heap_total_objects = total;
- record->have_finalize = deferred_final_list ? Qtrue : Qfalse;
- record->heap_use_size = live * sizeof(RVALUE);
- record->heap_total_size = total * sizeof(RVALUE);
+ return UINT2NUM((&rb_objspace)->count);
}
-#endif /* !GC_PROFILE_MORE_DETAIL */
-
-
+#if CALC_EXACT_MALLOC_SIZE
/*
* call-seq:
- * GC::Profiler.clear -> nil
+ * GC.malloc_allocated_size -> Integer
*
- * Clears the GC profiler data.
+ * The allocated size by malloc().
*
+ * It returns the allocated size by malloc().
*/
static VALUE
-gc_profile_clear(void)
+gc_malloc_allocated_size(VALUE self)
{
- rb_objspace_t *objspace = &rb_objspace;
-
- if (GC_PROFILE_RECORD_DEFAULT_SIZE * 2 < objspace->profile.size) {
- objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE * 2;
- objspace->profile.record = realloc(objspace->profile.record, sizeof(gc_profile_record) * objspace->profile.size);
- if (!objspace->profile.record) {
- rb_memerror();
- }
- }
- MEMZERO(objspace->profile.record, gc_profile_record, objspace->profile.size);
- objspace->profile.count = 0;
- return Qnil;
+ return UINT2NUM((&rb_objspace)->malloc_params.allocated_size);
}
/*
* call-seq:
- * GC::Profiler.raw_data -> [Hash, ...]
- *
- * Returns an Array of individual raw profile data Hashes ordered
- * from earliest to latest by +:GC_INVOKE_TIME+.
- *
- * For example:
- *
- * [
- * {
- * :GC_TIME=>1.3000000000000858e-05,
- * :GC_INVOKE_TIME=>0.010634999999999999,
- * :HEAP_USE_SIZE=>289640,
- * :HEAP_TOTAL_SIZE=>588960,
- * :HEAP_TOTAL_OBJECTS=>14724,
- * :GC_IS_MARKED=>false
- * },
- * # ...
- * ]
- *
- * The keys mean:
- *
- * +:GC_TIME+::
- * Time elapsed in seconds for this GC run
- * +:GC_INVOKE_TIME+::
- * Time elapsed in seconds from startup to when the GC was invoked
- * +:HEAP_USE_SIZE+::
- * Total bytes of heap used
- * +:HEAP_TOTAL_SIZE+::
- * Total size of heap in bytes
- * +:HEAP_TOTAL_OBJECTS+::
- * Total number of objects
- * +:GC_IS_MARKED+::
- * Returns +true+ if the GC is in mark phase
- *
- * If ruby was built with +GC_PROFILE_MORE_DETAIL+, you will also have access
- * to the following hash keys:
+ * GC.malloc_allocations -> Integer
*
- * +:GC_MARK_TIME+::
- * +:GC_SWEEP_TIME+::
- * +:ALLOCATE_INCREASE+::
- * +:ALLOCATE_LIMIT+::
- * +:HEAP_USE_SLOTS+::
- * +:HEAP_LIVE_OBJECTS+::
- * +:HEAP_FREE_OBJECTS+::
- * +:HAVE_FINALIZE+::
+ * 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;
@@ -4207,18 +3046,17 @@ gc_profile_record_get(void)
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")), SIZET2NUM(objspace->profile.record[i].heap_use_size));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_SIZE")), SIZET2NUM(objspace->profile.record[i].heap_total_size));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_TOTAL_OBJECTS")), SIZET2NUM(objspace->profile.record[i].heap_total_objects));
- rb_hash_aset(prof, ID2SYM(rb_intern("GC_IS_MARKED")), objspace->profile.record[i].is_marked);
+ 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")), SIZET2NUM(objspace->profile.record[i].allocate_increase));
- rb_hash_aset(prof, ID2SYM(rb_intern("ALLOCATE_LIMIT")), SIZET2NUM(objspace->profile.record[i].allocate_limit));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_USE_SLOTS")), SIZET2NUM(objspace->profile.record[i].heap_use_slots));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_LIVE_OBJECTS")), SIZET2NUM(objspace->profile.record[i].heap_live_objects));
- rb_hash_aset(prof, ID2SYM(rb_intern("HEAP_FREE_OBJECTS")), SIZET2NUM(objspace->profile.record[i].heap_free_objects));
+ 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);
@@ -4227,71 +3065,67 @@ gc_profile_record_get(void)
return gc_profile;
}
-static void
-gc_profile_dump_on(VALUE out, VALUE (*append)(VALUE, VALUE))
-{
- rb_objspace_t *objspace = &rb_objspace;
- size_t count = objspace->profile.count;
-
- if (objspace->profile.run && count) {
- int index = 1;
- size_t i;
- gc_profile_record r;
- append(out, rb_sprintf("GC %"PRIuSIZE" invokes.\n", objspace->count));
- append(out, rb_str_new_cstr("Index Invoke Time(sec) Use Size(byte) Total Size(byte) Total Object GC Time(ms)\n"));
- for (i = 0; i < count; i++) {
- r = objspace->profile.record[i];
-#if !GC_PROFILE_MORE_DETAIL
- if (r.is_marked) {
-#endif
- append(out, rb_sprintf("%5d %19.3f %20"PRIuSIZE" %20"PRIuSIZE" %20"PRIuSIZE" %30.20f\n",
- index++, r.gc_invoke_time, r.heap_use_size,
- r.heap_total_size, r.heap_total_objects, r.gc_time*1000));
-#if !GC_PROFILE_MORE_DETAIL
- }
-#endif
- }
-#if GC_PROFILE_MORE_DETAIL
- append(out, rb_str_new_cstr("\n\n" \
- "More detail.\n" \
- "Index Allocate Increase Allocate Limit Use Slot Have Finalize Mark Time(ms) Sweep Time(ms)\n"));
- index = 1;
- for (i = 0; i < count; i++) {
- r = objspace->profile.record[i];
- append(out, rb_sprintf("%5d %17"PRIuSIZE" %17"PRIuSIZE" %9"PRIuSIZE" %14s %25.20f %25.20f\n",
- index++, r.allocate_increase, r.allocate_limit,
- r.heap_use_slots, (r.have_finalize ? "true" : "false"),
- r.gc_mark_time*1000, r.gc_sweep_time*1000));
- }
-#endif
- }
-}
-
/*
* call-seq:
- * GC::Profiler.result -> String
+ * GC::Profiler.result -> string
*
- * Returns a profile data report such as:
+ * Report profile data to string.
*
- * 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
+ * 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)
{
- VALUE str = rb_str_buf_new(0);
- gc_profile_dump_on(str, rb_str_buf_append);
- return str;
+ 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.report(io)
*
- * Writes the GC::Profiler.result to <tt>$stdout</tt> or the given IO object.
+ * GC::Profiler.result display
*
*/
@@ -4306,16 +3140,16 @@ gc_profile_report(int argc, VALUE *argv, VALUE self)
else {
rb_scan_args(argc, argv, "01", &out);
}
- gc_profile_dump_on(out, rb_io_write);
+ rb_io_write(out, gc_profile_result());
return Qnil;
}
/*
* call-seq:
- * GC::Profiler.total_time -> float
+ * GC::Profiler.total_time -> float
*
- * The total time used for garbage collection in seconds
+ * return total time that GC used. (msec)
*/
static VALUE
@@ -4334,164 +3168,9 @@ gc_profile_total_time(VALUE self)
}
/*
- * call-seq:
- * GC::Profiler.enabled? -> true or false
- *
- * The current status of GC profile mode.
- */
-
-static VALUE
-gc_profile_enable_get(VALUE self)
-{
- rb_objspace_t *objspace = &rb_objspace;
- return objspace->profile.run ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- * GC::Profiler.enable -> nil
- *
- * Starts the GC profiler.
- *
- */
-
-static VALUE
-gc_profile_enable(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
-
- objspace->profile.run = TRUE;
- return Qnil;
-}
-
-/*
- * call-seq:
- * GC::Profiler.disable -> nil
- *
- * Stops the GC profiler.
- *
- */
-
-static VALUE
-gc_profile_disable(void)
-{
- rb_objspace_t *objspace = &rb_objspace;
-
- objspace->profile.run = FALSE;
- return Qnil;
-}
-
-#ifdef GC_DEBUG
-
-/*
- ------------------------------ DEBUG ------------------------------
-*/
-
-void
-rb_gcdebug_print_obj_condition(VALUE obj)
-{
- rb_objspace_t *objspace = &rb_objspace;
-
- if (is_pointer_to_heap(objspace, (void *)obj)) {
- fprintf(stderr, "pointer to heap?: true\n");
- }
- else {
- fprintf(stderr, "pointer to heap?: false\n");
- return;
- }
- fprintf(stderr, "marked?: %s\n",
- MARKED_IN_BITMAP(GET_HEAP_BITMAP(obj), obj) ? "true" : "false");
- if (is_lazy_sweeping(objspace)) {
- fprintf(stderr, "lazy sweeping?: true\n");
- fprintf(stderr, "swept?: %s\n",
- is_swept_object(objspace, obj) ? "done" : "not yet");
- }
- else {
- fprintf(stderr, "lazy sweeping?: false\n");
- }
-}
-
-static VALUE
-gcdebug_sential(VALUE obj, VALUE name)
-{
- fprintf(stderr, "WARNING: object %s(%p) is inadvertently collected\n", (char *)name, (void *)obj);
- return Qnil;
-}
-
-void
-rb_gcdebug_sentinel(VALUE obj, const char *name)
-{
- rb_define_final(obj, rb_proc_new(gcdebug_sential, (VALUE)name));
-}
-#endif /* GC_DEBUG */
-
-
-/*
- * Document-class: ObjectSpace
- *
- * The ObjectSpace module contains a number of routines
- * that interact with the garbage collection facility and allow you to
- * traverse all living objects with an iterator.
- *
- * ObjectSpace also provides support for object finalizers, procs that will be
- * called when a specific object is about to be destroyed by garbage
- * collection.
- *
- * include ObjectSpace
- *
- * a = "A"
- * b = "B"
- * c = "C"
- *
- * define_finalizer(a, proc {|id| puts "Finalizer one on #{id}" })
- * define_finalizer(a, proc {|id| puts "Finalizer two on #{id}" })
- * define_finalizer(b, proc {|id| puts "Finalizer three on #{id}" })
- *
- * _produces:_
- *
- * Finalizer three on 537763470
- * Finalizer one on 537763480
- * Finalizer two on 537763480
- *
- */
-
-/*
- * Document-class: ObjectSpace::WeakMap
- *
- * An ObjectSpace::WeakMap object holds references to
- * any objects, but those objects can get garbage collected.
- *
- * This class is mostly used internally by WeakRef, please use
- * +lib/weakref.rb+ for the public interface.
- */
-
-/* Document-class: GC::Profiler
- *
- * The GC profiler provides access to information on GC runs including time,
- * length and object space size.
- *
- * Example:
- *
- * GC::Profiler.enable
- *
- * require 'rdoc/rdoc'
- *
- * GC::Profiler.report
- *
- * GC::Profiler.disable
- *
- * See also GC.count, GC.malloc_allocated_size and GC.malloc_allocations
- */
-
-/*
- * The GC module provides an interface to Ruby's mark and
- * sweep garbage collection mechanism.
- *
- * Some of the underlying methods are also available via the ObjectSpace
- * module.
- *
- * You may obtain information about the operation of the GC through
- * GC::Profiler.
+ * The <code>GC</code> module provides an interface to Ruby's mark and
+ * sweep garbage collection mechanism. Some of the underlying methods
+ * are also available via the <code>ObjectSpace</code> module.
*/
void
@@ -4507,13 +3186,11 @@ Init_GC(void)
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_singleton_method(rb_mGC, "stat", gc_stat, -1);
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, "raw_data", gc_profile_record_get, 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);
@@ -4534,19 +3211,11 @@ Init_GC(void)
OBJ_TAINT(nomem_error);
OBJ_FREEZE(nomem_error);
- rb_define_method(rb_cBasicObject, "__id__", 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);
rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);
- {
- VALUE rb_cWeakMap = rb_define_class_under(rb_mObSpace, "WeakMap", rb_cObject);
- rb_define_alloc_func(rb_cWeakMap, wmap_allocate);
- rb_define_method(rb_cWeakMap, "[]=", wmap_aset, 2);
- rb_define_method(rb_cWeakMap, "[]", wmap_aref, 1);
- rb_define_private_method(rb_cWeakMap, "finalize", wmap_finalize, 1);
- }
-
#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);
diff --git a/gc.h b/gc.h
index 10f634e346..d77495aa1d 100644
--- a/gc.h
+++ b/gc.h
@@ -2,10 +2,10 @@
#ifndef RUBY_GC_H
#define RUBY_GC_H 1
-#if defined(__x86_64__) && defined(__GNUC__) && !defined(__native_client__)
-#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p)))
-#elif defined(__i386) && defined(__GNUC__) && !defined(__native_client__)
-#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movl\t%%esp, %0" : "=r" (*(p)))
+#if defined(__x86_64__) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("movq\t%%rsp, %0" : "=r" (*p))
+#elif defined(__i386) && defined(__GNUC__)
+#define SET_MACHINE_STACK_END(p) __asm__("movl\t%%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)
@@ -21,13 +21,13 @@ NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
#if RUBY_MARK_FREE_DEBUG
extern int ruby_gc_debug_indent;
-static inline void
+static void
rb_gc_debug_indent(void)
{
printf("%*s", ruby_gc_debug_indent, "");
}
-static inline void
+static void
rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
{
if (st == 0) {
@@ -43,10 +43,10 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
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_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
@@ -61,9 +61,9 @@ rb_gc_debug_body(const char *mode, const char *msg, int st, void *ptr)
#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);(ptr)=NULL;}
#if STACK_GROW_DIRECTION > 0
-# define STACK_UPPER(x, a, b) (a)
+# define STACK_UPPER(x, a, b) a
#elif STACK_GROW_DIRECTION < 0
-# define STACK_UPPER(x, a, b) (b)
+# define STACK_UPPER(x, a, b) b
#else
RUBY_EXTERN int ruby_stack_grow_direction;
int ruby_get_stack_grow_direction(volatile VALUE *addr);
@@ -71,34 +71,7 @@ int ruby_get_stack_grow_direction(volatile VALUE *addr);
(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
-
-#if STACK_GROW_DIRECTION
-#define STACK_GROW_DIR_DETECTION
-#define STACK_DIR_UPPER(a,b) STACK_UPPER(0, (a), (b))
-#else
-#define STACK_GROW_DIR_DETECTION VALUE stack_grow_dir_detection
-#define STACK_DIR_UPPER(a,b) STACK_UPPER(&stack_grow_dir_detection, (a), (b))
-#endif
-#define IS_STACK_DIR_UPPER() STACK_DIR_UPPER(1,0)
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-/* exports for objspace module */
-size_t rb_objspace_data_type_memsize(VALUE obj);
-void rb_objspace_reachable_objects_from(VALUE obj, void (func)(VALUE, void *), void *data);
-int rb_objspace_markable_object_p(VALUE obj);
-int rb_objspace_internal_object_p(VALUE obj);
-
-void rb_objspace_each_objects(
- int (*callback)(void *start, void *end, size_t stride, void *data),
- void *data);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
+# 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
index 3d4516f341..017adc2040 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -1 +1,235 @@
-require 'rubygems.rb' if defined?(Gem)
+# 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::QuickLoader.load_full_rubygems_library
+ gem gem_name, *version_requirements
+ end
+ private :gem
+ 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.dup.force_encoding(Encoding.find('filesystem'))
+ 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!
+ @gem_path.map!{|x|x.force_encoding(Encoding.find('filesystem'))}
+ end
+
+ def self.user_home
+ @user_home ||= File.expand_path("~").force_encoding(Encoding.find('filesystem'))
+ 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.remove
+ return if @loaded_full_rubygems_library
+
+ @loaded_full_rubygems_library = true
+
+ class << Gem
+ undef_method(*Gem::GEM_PRELUDE_METHODS)
+ end
+
+ remove_method :const_missing
+ remove_method :method_missing
+
+ Kernel.module_eval do
+ undef_method :gem if method_defined? :gem
+ end
+ end
+
+ def self.load_full_rubygems_library
+ return false if @loaded_full_rubygems_library
+
+ remove
+
+ $".delete path_to_full_rubygems_library
+ if $".any? {|path| path.end_with?('/rubygems.rb')}
+ raise LoadError, "another rubygems is already loaded from #{path}"
+ end
+
+ require 'rubygems'
+
+ return true
+ 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
+
+ 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
+
+ def self.try_activate(path)
+ # This method is only hit when the custom require is hit the first time.
+ # So we go off and dutifully load all of rubygems and retry the call
+ # to Gem.try_activate. We retry because full rubygems replaces this
+ # method with one that actually tries to find a gem for +path+ and load it.
+ #
+ # This is conditional because in the course of loading rubygems, the custom
+ # require will call back into here before all of rubygems is loaded. So
+ # we must not always retry the call. We only redo the call when
+ # load_full_rubygems_library returns true, which it only does the first
+ # time it's called.
+ #
+ if QuickLoader.load_full_rubygems_library
+ return Gem.try_activate(path)
+ end
+
+ return false
+ end
+
+ end
+
+ begin
+ require 'lib/rubygems/custom_require.rb'
+ 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
index b090503213..4363b496f0 100644
--- a/golf_prelude.rb
+++ b/golf_prelude.rb
@@ -112,11 +112,3 @@ class Enumerator
alias old_inspect inspect
alias inspect old_to_s
end
-
-class Symbol
- def call(*args, &block)
- proc do |recv|
- recv.__send__(self, *args, &block)
- end
- end
-end
diff --git a/goruby.c b/goruby.c
index 6095fc0894..17be654800 100644
--- a/goruby.c
+++ b/goruby.c
@@ -1,19 +1,8 @@
void Init_golf(void);
-#define ruby_options goruby_options
#define ruby_run_node goruby_run_node
#include "main.c"
-#undef ruby_options
#undef ruby_run_node
-#if defined _WIN32
-#include <io.h>
-#include <fcntl.h>
-#define pipe(p) _pipe(p, 32L, _O_NOINHERIT)
-#elif defined HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-RUBY_EXTERN void *ruby_options(int argc, char **argv);
RUBY_EXTERN int ruby_run_node(void*);
RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
@@ -24,29 +13,6 @@ init_golf(VALUE arg)
return arg;
}
-void *
-goruby_options(int argc, char **argv)
-{
- static const char cmd[] = "END{require 'irb';IRB.start}";
- int rw[2], infd;
- void *ret;
-
- if ((isatty(0) && isatty(1) && isatty(2)) && (pipe(rw) == 0)) {
- infd = dup(0);
- dup2(rw[0], 0);
- close(rw[0]);
- write(rw[1], cmd, sizeof(cmd) - 1);
- close(rw[1]);
- ret = ruby_options(argc, argv);
- dup2(infd, 0);
- close(infd);
- return ret;
- }
- else {
- return ruby_options(argc, argv);
- }
-}
-
int
goruby_run_node(void *arg)
{
diff --git a/hash.c b/hash.c
index 0cb3379236..0aa433d3cb 100644
--- a/hash.c
+++ b/hash.c
@@ -14,17 +14,10 @@
#include "ruby/ruby.h"
#include "ruby/st.h"
#include "ruby/util.h"
-#include "ruby/encoding.h"
-#include "internal.h"
#include <errno.h>
-#include "probes.h"
#ifdef __APPLE__
-# ifdef HAVE_CRT_EXTERNS_H
-# include <crt_externs.h>
-# else
-# include "missing/crt_externs.h"
-# endif
+#include <crt_externs.h>
#endif
static VALUE rb_hash_s_try_convert(VALUE, VALUE);
@@ -50,8 +43,8 @@ rb_any_cmp(VALUE a, VALUE b)
if (FIXNUM_P(a) && FIXNUM_P(b)) {
return a != b;
}
- if (RB_TYPE_P(a, T_STRING) && RBASIC(a)->klass == rb_cString &&
- RB_TYPE_P(b, T_STRING) && RBASIC(b)->klass == rb_cString) {
+ 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);
}
if (a == Qundef || b == Qundef) return -1;
@@ -86,14 +79,20 @@ rb_any_hash(VALUE a)
VALUE hval;
st_index_t hnum;
- if (SPECIAL_CONST_P(a)) {
- if (a == Qundef) return 0;
- hnum = rb_hash_end(rb_hash_start((st_index_t)a));
- }
- else if (BUILTIN_TYPE(a) == T_STRING) {
+ 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));
+ break;
+
+ case T_STRING:
hnum = rb_str_hash(a);
- }
- else {
+ break;
+
+ default:
hval = rb_hash(a);
hnum = FIX2LONG(hval);
}
@@ -106,8 +105,10 @@ static const struct st_hash_type objhash = {
rb_any_hash,
};
-extern const struct st_hash_type st_hashtype_num;
-#define identhash st_hashtype_num
+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);
@@ -122,6 +123,7 @@ foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
{
int status;
+ if (key == Qundef) return ST_CONTINUE;
status = (*arg->func)(key, value, arg->arg);
if (status == ST_CONTINUE) {
return ST_CHECK;
@@ -137,7 +139,7 @@ st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
arg.tbl = table;
arg.func = (st_foreach_func *)func;
arg.arg = a;
- if (st_foreach_check(table, foreach_safe_i, (st_data_t)&arg, 0)) {
+ if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
rb_raise(rb_eRuntimeError, "hash modified during iteration");
}
}
@@ -151,21 +153,21 @@ struct hash_foreach_arg {
};
static int
-hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp)
+hash_foreach_iter(st_data_t key, st_data_t value, struct hash_foreach_arg *arg)
{
- struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
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) {
rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
}
switch (status) {
case ST_DELETE:
+ st_delete_safe(tbl, &key, 0, Qundef);
FL_SET(arg->hash, HASH_DELETED);
- return ST_DELETE;
case ST_CONTINUE:
break;
case ST_STOP:
@@ -177,9 +179,11 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp)
static VALUE
hash_foreach_ensure(VALUE hash)
{
- if (--RHASH_ITER_LEV(hash) == 0) {
+ RHASH(hash)->iter_lev--;
+
+ if (RHASH(hash)->iter_lev == 0) {
if (FL_TEST(hash, HASH_DELETED)) {
- st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef);
+ st_cleanup_safe(RHASH(hash)->ntbl, Qundef);
FL_UNSET(hash, HASH_DELETED);
}
}
@@ -187,10 +191,9 @@ hash_foreach_ensure(VALUE hash)
}
static VALUE
-hash_foreach_call(VALUE arg)
+hash_foreach_call(struct hash_foreach_arg *arg)
{
- VALUE hash = ((struct hash_foreach_arg *)arg)->hash;
- if (st_foreach_check(RHASH(hash)->ntbl, hash_foreach_iter, (st_data_t)arg, (st_data_t)Qundef)) {
+ if (st_foreach(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg)) {
rb_raise(rb_eRuntimeError, "hash modified during iteration");
}
return Qnil;
@@ -203,7 +206,7 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
if (!RHASH(hash)->ntbl)
return;
- RHASH_ITER_LEV(hash)++;
+ RHASH(hash)->iter_lev++;
arg.hash = hash;
arg.func = (rb_foreach_func *)func;
arg.arg = farg;
@@ -213,23 +216,14 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
static VALUE
hash_alloc(VALUE klass)
{
- NEWOBJ_OF(hash, struct RHash, klass, T_HASH);
+ NEWOBJ(hash, struct RHash);
+ OBJSETUP(hash, klass, T_HASH);
RHASH_IFNONE(hash) = Qnil;
return (VALUE)hash;
}
-static VALUE
-empty_hash_alloc(VALUE klass)
-{
- if (RUBY_DTRACE_HASH_CREATE_ENABLED()) {
- RUBY_DTRACE_HASH_CREATE(0, rb_sourcefile(), rb_sourceline());
- }
-
- return hash_alloc(klass);
-}
-
VALUE
rb_hash_new(void)
{
@@ -239,11 +233,8 @@ rb_hash_new(void)
VALUE
rb_hash_dup(VALUE hash)
{
- NEWOBJ_OF(ret, struct RHash,
- rb_obj_class(hash),
- (RBASIC(hash)->flags)&(T_MASK|FL_EXIVAR|FL_TAINT|FL_UNTRUSTED));
- if (FL_TEST((hash), FL_EXIVAR))
- rb_copy_generic_ivar((VALUE)(ret),(VALUE)(hash));
+ NEWOBJ(ret, struct RHash);
+ DUPSETUP(ret, hash);
if (!RHASH_EMPTY_P(hash))
ret->ntbl = st_copy(RHASH(hash)->ntbl);
@@ -257,7 +248,7 @@ rb_hash_dup(VALUE hash)
static void
rb_hash_modify_check(VALUE hash)
{
- rb_check_frozen(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");
}
@@ -278,30 +269,14 @@ rb_hash_modify(VALUE hash)
rb_hash_tbl(hash);
}
-NORETURN(static void no_new_key(void));
static void
-no_new_key(void)
+hash_update(VALUE hash, VALUE key)
{
- rb_raise(rb_eRuntimeError, "can't add a new key into hash during iteration");
-}
-
-#define NOINSERT_UPDATE_CALLBACK(func) \
-int \
-func##_noinsert(st_data_t *key, st_data_t *val, st_data_t arg, int existing) \
-{ \
- if (!existing) no_new_key(); \
- return func(key, val, arg, existing); \
+ if (RHASH(hash)->iter_lev > 0 && !st_lookup(RHASH(hash)->ntbl, key, 0)) {
+ rb_raise(rb_eRuntimeError, "can't add a new key into hash during iteration");
+ }
}
-#define UPDATE_CALLBACK(iter_lev, func) ((iter_lev) > 0 ? func##_noinsert : func)
-
-#define RHASH_UPDATE_ITER(hash, iter_lev, key, func, arg) \
- st_update(RHASH(hash)->ntbl, (st_data_t)(key), \
- UPDATE_CALLBACK((iter_lev), func), \
- (st_data_t)(arg))
-#define RHASH_UPDATE(hash, key, func, arg) \
- RHASH_UPDATE_ITER(hash, RHASH_ITER_LEV(hash), key, func, arg)
-
static void
default_proc_arity_check(VALUE proc)
{
@@ -355,7 +330,9 @@ rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
rb_hash_modify(hash);
if (rb_block_given_p()) {
- rb_check_arity(argc, 0, 0);
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments");
+ }
ifnone = rb_block_proc();
default_proc_arity_check(ifnone);
RHASH_IFNONE(hash) = ifnone;
@@ -408,27 +385,11 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
hash = hash_alloc(klass);
for (i = 0; i < RARRAY_LEN(tmp); ++i) {
- VALUE e = RARRAY_PTR(tmp)[i];
- VALUE v = rb_check_array_type(e);
+ VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
VALUE key, val = Qnil;
- if (NIL_P(v)) {
-#if 0 /* refix in the next release */
- rb_raise(rb_eArgError, "wrong element type %s at %ld (expected array)",
- rb_builtin_class_name(e), i);
-
-#else
- rb_warn("wrong element type %s at %ld (expected array)",
- rb_builtin_class_name(e), i);
- rb_warn("ignoring wrong elements is deprecated, remove them explicitly");
- rb_warn("this causes ArgumentError in the next release");
- continue;
-#endif
- }
+ if (NIL_P(v)) continue;
switch (RARRAY_LEN(v)) {
- default:
- rb_raise(rb_eArgError, "invalid number of elements (%ld for 1..2)",
- RARRAY_LEN(v));
case 2:
val = RARRAY_PTR(v)[1];
case 1:
@@ -457,12 +418,6 @@ to_hash(VALUE hash)
return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
}
-VALUE
-rb_check_hash_type(VALUE hash)
-{
- return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
-}
-
/*
* call-seq:
* Hash.try_convert(obj) -> hash or nil
@@ -477,20 +432,15 @@ rb_check_hash_type(VALUE hash)
static VALUE
rb_hash_s_try_convert(VALUE dummy, VALUE hash)
{
- return rb_check_hash_type(hash);
+ return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
}
-struct rehash_arg {
- VALUE hash;
- st_table *tbl;
-};
-
static int
rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
{
st_table *tbl = (st_table *)arg;
- st_insert(tbl, (st_data_t)key, (st_data_t)value);
+ if (key != Qundef) st_insert(tbl, key, value);
return ST_CONTINUE;
}
@@ -517,41 +467,22 @@ rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
static VALUE
rb_hash_rehash(VALUE hash)
{
- VALUE tmp;
st_table *tbl;
- if (RHASH_ITER_LEV(hash) > 0) {
+ if (RHASH(hash)->iter_lev > 0) {
rb_raise(rb_eRuntimeError, "rehash during iteration");
}
rb_hash_modify_check(hash);
if (!RHASH(hash)->ntbl)
return hash;
- tmp = hash_alloc(0);
tbl = st_init_table_with_size(RHASH(hash)->ntbl->type, RHASH(hash)->ntbl->num_entries);
- RHASH(tmp)->ntbl = tbl;
-
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tbl);
st_free_table(RHASH(hash)->ntbl);
RHASH(hash)->ntbl = tbl;
- RHASH(tmp)->ntbl = 0;
return hash;
}
-static VALUE
-hash_default_value(VALUE hash, VALUE key)
-{
- if (rb_method_basic_definition_p(CLASS_OF(hash), id_default)) {
- VALUE ifnone = RHASH_IFNONE(hash);
- if (!FL_TEST(hash, HASH_PROC_DEFAULT)) return ifnone;
- if (key == Qundef) return Qnil;
- return rb_funcall(ifnone, id_yield, 2, hash, key);
- }
- else {
- return rb_funcall(hash, id_default, 1, key);
- }
-}
-
/*
* call-seq:
* hsh[key] -> value
@@ -569,23 +500,23 @@ hash_default_value(VALUE hash, VALUE key)
VALUE
rb_hash_aref(VALUE hash, VALUE key)
{
- st_data_t val;
+ VALUE val;
if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
- return hash_default_value(hash, key);
+ return rb_funcall(hash, id_default, 1, key);
}
- return (VALUE)val;
+ return val;
}
VALUE
rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
{
- st_data_t val;
+ VALUE val;
if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
return def; /* without Hash#default */
}
- return (VALUE)val;
+ return val;
}
VALUE
@@ -627,7 +558,7 @@ static VALUE
rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
{
VALUE key, if_none;
- st_data_t val;
+ VALUE val;
long block_given;
rb_scan_args(argc, argv, "11", &key, &if_none);
@@ -640,15 +571,14 @@ rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
if (block_given) return rb_yield(key);
if (argc == 1) {
volatile VALUE desc = rb_protect(rb_inspect, key, 0);
- if (NIL_P(desc)) {
+ if (NIL_P(desc) || RSTRING_LEN(desc) > 65) {
desc = rb_any_to_s(key);
}
- desc = rb_str_ellipsize(desc, 65);
rb_raise(rb_eKeyError, "key not found: %s", RSTRING_PTR(desc));
}
return if_none;
}
- return (VALUE)val;
+ return val;
}
VALUE
@@ -715,7 +645,7 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash)
static VALUE
rb_hash_set_default(VALUE hash, VALUE ifnone)
{
- rb_hash_modify_check(hash);
+ rb_hash_modify(hash);
RHASH_IFNONE(hash) = ifnone;
FL_UNSET(hash, HASH_PROC_DEFAULT);
return ifnone;
@@ -745,11 +675,13 @@ rb_hash_default_proc(VALUE hash)
return Qnil;
}
+VALUE rb_obj_is_proc(VALUE proc);
+
/*
* call-seq:
- * hsh.default_proc = proc_obj or nil
+ * hsh.default_proc = proc_obj -> proc_obj
*
- * Sets the default proc to be executed on each failed key lookup.
+ * Sets the default proc to be executed on each key lookup.
*
* h.default_proc = proc do |hash, key|
* hash[key] = key + key
@@ -763,12 +695,7 @@ rb_hash_set_default_proc(VALUE hash, VALUE proc)
{
VALUE b;
- rb_hash_modify_check(hash);
- if (NIL_P(proc)) {
- FL_UNSET(hash, HASH_PROC_DEFAULT);
- RHASH_IFNONE(hash) = proc;
- return proc;
- }
+ 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,
@@ -798,12 +725,10 @@ key_i(VALUE key, VALUE value, VALUE arg)
* call-seq:
* hsh.key(value) -> key
*
- * Returns the key of an occurrence of a given value. If the value is
- * not found, returns <code>nil</code>.
+ * Returns the key for a given value. If not found, returns <code>nil</code>.
*
- * h = { "a" => 100, "b" => 200, "c" => 300, "d" => 300 }
+ * h = { "a" => 100, "b" => 200 }
* h.key(200) #=> "b"
- * h.key(300) #=> "c"
* h.key(999) #=> nil
*
*/
@@ -836,8 +761,8 @@ rb_hash_delete_key(VALUE hash, VALUE key)
if (!RHASH(hash)->ntbl)
return Qundef;
- if (RHASH_ITER_LEV(hash) > 0) {
- if (st_delete_safe(RHASH(hash)->ntbl, &ktmp, &val, (st_data_t)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;
}
@@ -852,8 +777,8 @@ rb_hash_delete_key(VALUE hash, VALUE key)
* hsh.delete(key) -> value
* hsh.delete(key) {| key | block } -> value
*
- * Deletes the key-value pair and returns the value from <i>hsh</i> whose
- * key is equal to <i>key</i>. If the key is not found, returns the
+ * 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>.
@@ -870,7 +795,7 @@ rb_hash_delete(VALUE hash, VALUE key)
{
VALUE val;
- rb_hash_modify_check(hash);
+ rb_hash_modify(hash);
val = rb_hash_delete_key(hash, key);
if (val != Qundef) return val;
if (rb_block_given_p()) {
@@ -889,6 +814,7 @@ shift_i(VALUE key, VALUE value, VALUE arg)
{
struct shift_var *var = (struct shift_var *)arg;
+ if (key == Qundef) return ST_CONTINUE;
if (var->key != Qundef) return ST_STOP;
var->key = key;
var->val = value;
@@ -900,6 +826,7 @@ shift_i_safe(VALUE key, VALUE value, VALUE arg)
{
struct shift_var *var = (struct shift_var *)arg;
+ if (key == Qundef) return ST_CONTINUE;
var->key = key;
var->val = value;
return ST_STOP;
@@ -923,33 +850,35 @@ rb_hash_shift(VALUE hash)
{
struct shift_var var;
- rb_hash_modify_check(hash);
- if (RHASH(hash)->ntbl) {
- var.key = Qundef;
- rb_hash_foreach(hash, RHASH_ITER_LEV(hash) > 0 ? shift_i_safe : shift_i,
- (VALUE)&var);
-
- if (var.key != Qundef) {
- if (RHASH_ITER_LEV(hash) > 0) {
- rb_hash_delete_key(hash, var.key);
- }
- return rb_assoc_new(var.key, var.val);
+ rb_hash_modify(hash);
+ var.key = Qundef;
+ rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i,
+ (VALUE)&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_IFNONE(hash), id_yield, 2, hash, Qnil);
+ }
+ else {
+ return RHASH_IFNONE(hash);
}
- return hash_default_value(hash, Qnil);
}
static int
delete_if_i(VALUE key, VALUE value, VALUE hash)
{
+ if (key == Qundef) return ST_CONTINUE;
if (RTEST(rb_yield_values(2, key, value))) {
rb_hash_delete_key(hash, key);
}
return ST_CONTINUE;
}
-static VALUE rb_hash_size(VALUE hash);
-
/*
* call-seq:
* hsh.delete_if {| key, value | block } -> hsh
@@ -968,10 +897,9 @@ static VALUE rb_hash_size(VALUE hash);
VALUE
rb_hash_delete_if(VALUE hash)
{
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
- rb_hash_modify_check(hash);
- if (RHASH(hash)->ntbl)
- rb_hash_foreach(hash, delete_if_i, hash);
+ RETURN_ENUMERATOR(hash, 0, 0);
+ rb_hash_modify(hash);
+ rb_hash_foreach(hash, delete_if_i, hash);
return hash;
}
@@ -989,7 +917,7 @@ rb_hash_reject_bang(VALUE hash)
{
st_index_t n;
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
+ RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_modify(hash);
if (!RHASH(hash)->ntbl)
return Qnil;
@@ -1002,7 +930,6 @@ rb_hash_reject_bang(VALUE hash)
/*
* call-seq:
* hsh.reject {| key, value | block } -> a_hash
- * hsh.reject -> an_enumerator
*
* Same as <code>Hash#delete_if</code>, but works on (and returns) a
* copy of the <i>hsh</i>. Equivalent to
@@ -1042,6 +969,7 @@ rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
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;
@@ -1066,7 +994,7 @@ rb_hash_select(VALUE hash)
{
VALUE result;
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
+ RETURN_ENUMERATOR(hash, 0, 0);
result = rb_hash_new();
rb_hash_foreach(hash, select_i, result);
return result;
@@ -1075,6 +1003,7 @@ rb_hash_select(VALUE hash)
static int
keep_if_i(VALUE key, VALUE value, VALUE hash)
{
+ if (key == Qundef) return ST_CONTINUE;
if (!RTEST(rb_yield_values(2, key, value))) {
return ST_DELETE;
}
@@ -1095,8 +1024,8 @@ rb_hash_select_bang(VALUE hash)
{
st_index_t n;
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
- rb_hash_modify_check(hash);
+ RETURN_ENUMERATOR(hash, 0, 0);
+ rb_hash_modify(hash);
if (!RHASH(hash)->ntbl)
return Qnil;
n = RHASH(hash)->ntbl->num_entries;
@@ -1120,10 +1049,9 @@ rb_hash_select_bang(VALUE hash)
VALUE
rb_hash_keep_if(VALUE hash)
{
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
- rb_hash_modify_check(hash);
- if (RHASH(hash)->ntbl)
- rb_hash_foreach(hash, keep_if_i, hash);
+ RETURN_ENUMERATOR(hash, 0, 0);
+ rb_hash_modify(hash);
+ rb_hash_foreach(hash, keep_if_i, hash);
return hash;
}
@@ -1144,14 +1072,14 @@ clear_i(VALUE key, VALUE value, VALUE dummy)
*
*/
-VALUE
+static VALUE
rb_hash_clear(VALUE hash)
{
rb_hash_modify_check(hash);
if (!RHASH(hash)->ntbl)
return hash;
if (RHASH(hash)->ntbl->num_entries > 0) {
- if (RHASH_ITER_LEV(hash) > 0)
+ if (RHASH(hash)->iter_lev > 0)
rb_hash_foreach(hash, clear_i, 0);
else
st_clear(RHASH(hash)->ntbl);
@@ -1160,64 +1088,34 @@ rb_hash_clear(VALUE hash)
return hash;
}
-static int
-hash_aset(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
-{
- *val = arg;
- return ST_CONTINUE;
-}
-
-static int
-hash_aset_str(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
-{
- *key = (st_data_t)rb_str_new_frozen((VALUE)*key);
- return hash_aset(key, val, arg, existing);
-}
-
-static NOINSERT_UPDATE_CALLBACK(hash_aset)
-static NOINSERT_UPDATE_CALLBACK(hash_aset_str)
-
/*
* call-seq:
* hsh[key] = value -> value
* hsh.store(key, value) -> value
*
- * == Element Assignment
- *
- * Associates the value given by +value+ with the key given by +key+.
+ * Element Assignment---Associates the value given by
+ * <i>value</i> with the key given by <i>key</i>.
+ * <i>key</i> should not have its value changed while it is in
+ * use as a key (a <code>String</code> passed as a key will be
+ * duplicated and frozen).
*
* h = { "a" => 100, "b" => 200 }
* h["a"] = 9
* h["c"] = 4
* h #=> {"a"=>9, "b"=>200, "c"=>4}
*
- * +key+ should not have its value changed while it is in use as a key (an
- * <tt>unfrozen String</tt> passed as a key will be duplicated and frozen).
- *
- * a = "a"
- * b = "b".freeze
- * h = { a => 100, b => 200 }
- * h.key(100).equal? a #=> false
- * h.key(200).equal? b #=> true
- *
*/
VALUE
rb_hash_aset(VALUE hash, VALUE key, VALUE val)
{
- int iter_lev = RHASH_ITER_LEV(hash);
- st_table *tbl = RHASH(hash)->ntbl;
-
rb_hash_modify(hash);
- if (!tbl) {
- if (iter_lev > 0) no_new_key();
- tbl = RHASH_TBL(hash);
- }
- if (tbl->type == &identhash || rb_obj_class(key) != rb_cString) {
- RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset, val);
+ hash_update(hash, key);
+ if (RHASH(hash)->ntbl->type == &identhash || rb_obj_class(key) != rb_cString) {
+ st_insert(RHASH(hash)->ntbl, key, val);
}
else {
- RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset_str, val);
+ st_insert2(RHASH(hash)->ntbl, key, val, rb_str_new4);
}
return val;
}
@@ -1225,43 +1123,11 @@ rb_hash_aset(VALUE hash, VALUE key, VALUE val)
static int
replace_i(VALUE key, VALUE val, VALUE hash)
{
- rb_hash_aset(hash, key, val);
-
- return ST_CONTINUE;
-}
-
-static VALUE
-rb_hash_initialize_copy(VALUE hash, VALUE hash2)
-{
- st_table *ntbl;
-
- rb_hash_modify_check(hash);
- hash2 = to_hash(hash2);
-
- Check_Type(hash2, T_HASH);
-
- if (hash == hash2) return hash;
-
- ntbl = RHASH(hash)->ntbl;
- if (RHASH(hash2)->ntbl) {
- if (ntbl) st_free_table(ntbl);
- RHASH(hash)->ntbl = st_copy(RHASH(hash2)->ntbl);
- if (RHASH(hash)->ntbl->num_entries)
- rb_hash_rehash(hash);
- }
- else if (ntbl) {
- st_clear(ntbl);
- }
-
- if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
- FL_SET(hash, HASH_PROC_DEFAULT);
+ if (key != Qundef) {
+ rb_hash_aset(hash, key, val);
}
- else {
- FL_UNSET(hash, HASH_PROC_DEFAULT);
- }
- RHASH_IFNONE(hash) = RHASH_IFNONE(hash2);
- return hash;
+ return ST_CONTINUE;
}
/*
@@ -1340,6 +1206,7 @@ rb_hash_empty_p(VALUE hash)
static int
each_value_i(VALUE key, VALUE value)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_yield(value);
return ST_CONTINUE;
}
@@ -1366,7 +1233,7 @@ each_value_i(VALUE key, VALUE value)
static VALUE
rb_hash_each_value(VALUE hash)
{
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
+ RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_foreach(hash, each_value_i, 0);
return hash;
}
@@ -1374,6 +1241,7 @@ rb_hash_each_value(VALUE hash)
static int
each_key_i(VALUE key, VALUE value)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_yield(key);
return ST_CONTINUE;
}
@@ -1399,7 +1267,7 @@ each_key_i(VALUE key, VALUE value)
static VALUE
rb_hash_each_key(VALUE hash)
{
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
+ RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_foreach(hash, each_key_i, 0);
return hash;
}
@@ -1407,6 +1275,7 @@ rb_hash_each_key(VALUE hash)
static int
each_pair_i(VALUE key, VALUE value)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_yield(rb_assoc_new(key, value));
return ST_CONTINUE;
}
@@ -1436,7 +1305,7 @@ each_pair_i(VALUE key, VALUE value)
static VALUE
rb_hash_each_pair(VALUE hash)
{
- RETURN_SIZED_ENUMERATOR(hash, 0, 0, rb_hash_size);
+ RETURN_ENUMERATOR(hash, 0, 0);
rb_hash_foreach(hash, each_pair_i, 0);
return hash;
}
@@ -1444,6 +1313,7 @@ rb_hash_each_pair(VALUE hash)
static int
to_a_i(VALUE key, VALUE value, VALUE ary)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_ary_push(ary, rb_assoc_new(key, value));
return ST_CONTINUE;
}
@@ -1476,16 +1346,14 @@ inspect_i(VALUE key, VALUE value, VALUE str)
{
VALUE str2;
- str2 = rb_inspect(key);
+ if (key == Qundef) return ST_CONTINUE;
if (RSTRING_LEN(str) > 1) {
- rb_str_buf_cat_ascii(str, ", ");
- }
- else {
- rb_enc_copy(str, str2);
+ rb_str_cat2(str, ", ");
}
+ str2 = rb_inspect(key);
rb_str_buf_append(str, str2);
OBJ_INFECT(str, str2);
- rb_str_buf_cat_ascii(str, "=>");
+ rb_str_buf_cat2(str, "=>");
str2 = rb_inspect(value);
rb_str_buf_append(str, str2);
OBJ_INFECT(str, str2);
@@ -1539,33 +1407,10 @@ rb_hash_to_hash(VALUE hash)
return hash;
}
-/*
- * call-seq:
- * hsh.to_h -> hsh or new_hash
- *
- * Returns +self+. If called on a subclass of Hash, converts
- * the receiver to a Hash object.
- */
-
-static VALUE
-rb_hash_to_h(VALUE hash)
-{
- if (rb_obj_class(hash) != rb_cHash) {
- VALUE ret = rb_hash_new();
- if (!RHASH_EMPTY_P(hash))
- RHASH(ret)->ntbl = st_copy(RHASH(hash)->ntbl);
- if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
- FL_SET(ret, HASH_PROC_DEFAULT);
- }
- RHASH_IFNONE(ret) = RHASH_IFNONE(hash);
- return ret;
- }
- return hash;
-}
-
static int
keys_i(VALUE key, VALUE value, VALUE ary)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_ary_push(ary, key);
return ST_CONTINUE;
}
@@ -1596,6 +1441,7 @@ rb_hash_keys(VALUE hash)
static int
values_i(VALUE key, VALUE value, VALUE ary)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_ary_push(ary, value);
return ST_CONTINUE;
}
@@ -1654,6 +1500,7 @@ rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
{
VALUE *data = (VALUE *)arg;
+ if (key == Qundef) return ST_CONTINUE;
if (rb_equal(value, data[1])) {
data[0] = Qtrue;
return ST_STOP;
@@ -1695,13 +1542,14 @@ static int
eql_i(VALUE key, VALUE val1, VALUE arg)
{
struct equal_data *data = (struct equal_data *)arg;
- st_data_t val2;
+ VALUE val2;
+ if (key == Qundef) return ST_CONTINUE;
if (!st_lookup(data->tbl, key, &val2)) {
data->result = Qfalse;
return ST_STOP;
}
- if (!(data->eql ? rb_eql(val1, (VALUE)val2) : (int)rb_equal(val1, (VALUE)val2))) {
+ if (!(data->eql ? rb_eql(val1, val2) : (int)rb_equal(val1, val2))) {
data->result = Qfalse;
return ST_STOP;
}
@@ -1727,7 +1575,7 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
struct equal_data data;
if (hash1 == hash2) return Qtrue;
- if (!RB_TYPE_P(hash2, T_HASH)) {
+ if (TYPE(hash2) != T_HASH) {
if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
return Qfalse;
}
@@ -1796,11 +1644,9 @@ static int
hash_i(VALUE key, VALUE val, VALUE arg)
{
st_index_t *hval = (st_index_t *)arg;
- st_index_t hdata[2];
- hdata[0] = rb_hash(key);
- hdata[1] = rb_hash(val);
- *hval ^= st_hash(hdata, sizeof(hdata), 0);
+ if (key == Qundef) return ST_CONTINUE;
+ *hval ^= rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(key)), rb_hash(val)));
return ST_CONTINUE;
}
@@ -1812,12 +1658,10 @@ recursive_hash(VALUE hash, VALUE dummy, int recur)
if (!RHASH(hash)->ntbl)
return LONG2FIX(0);
hval = RHASH(hash)->ntbl->num_entries;
- if (!hval) return LONG2FIX(0);
if (recur)
- hval = rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval);
+ hval = rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval));
else
rb_hash_foreach(hash, hash_i, (VALUE)&hval);
- hval = rb_hash_end(hval);
return INT2FIX(hval);
}
@@ -1838,6 +1682,7 @@ rb_hash_hash(VALUE hash)
static int
rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
{
+ if (key == Qundef) return ST_CONTINUE;
rb_hash_aset(hash, value, key);
return ST_CONTINUE;
}
@@ -1864,38 +1709,23 @@ rb_hash_invert(VALUE hash)
}
static int
-rb_hash_update_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
-{
- *value = arg;
- return ST_CONTINUE;
-}
-
-static NOINSERT_UPDATE_CALLBACK(rb_hash_update_callback)
-
-static int
rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
{
- RHASH_UPDATE(hash, key, rb_hash_update_callback, value);
+ if (key == Qundef) return ST_CONTINUE;
+ hash_update(hash, key);
+ st_insert(RHASH(hash)->ntbl, key, value);
return ST_CONTINUE;
}
static int
-rb_hash_update_block_callback(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
-{
- VALUE newvalue = (VALUE)arg;
- if (existing) {
- newvalue = rb_yield_values(3, (VALUE)*key, (VALUE)*value, newvalue);
- }
- *value = (st_data_t)newvalue;
- return ST_CONTINUE;
-}
-
-static NOINSERT_UPDATE_CALLBACK(rb_hash_update_block_callback)
-
-static int
rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
{
- RHASH_UPDATE(hash, key, rb_hash_update_block_callback, value);
+ 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);
+ }
+ hash_update(hash, key);
+ st_insert(RHASH(hash)->ntbl, key, value);
return ST_CONTINUE;
}
@@ -1906,11 +1736,11 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
* hsh.merge!(other_hash){|key, oldval, newval| block} -> hsh
* hsh.update(other_hash){|key, oldval, newval| block} -> hsh
*
- * Adds the contents of _other_hash_ to _hsh_. If no block is specified,
- * entries with duplicate keys are overwritten with the values from
- * _other_hash_, otherwise the value of each duplicate key is determined by
- * calling the block with the key, its value in _hsh_ and its value in
- * _other_hash_.
+ * Adds the contents of <i>other_hash</i> to <i>hsh</i>. If no
+ * block is specified, entries with duplicate keys are overwritten
+ * with the values from <i>other_hash</i>, otherwise the value
+ * of each duplicate key is determined by calling the block with
+ * the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
*
* h1 = { "a" => 100, "b" => 200 }
* h2 = { "b" => 254, "c" => 300 }
@@ -1936,54 +1766,6 @@ rb_hash_update(VALUE hash1, VALUE hash2)
return hash1;
}
-struct update_arg {
- VALUE hash;
- VALUE value;
- rb_hash_update_func *func;
-};
-
-static int
-rb_hash_update_func_callback(st_data_t *key, st_data_t *value, st_data_t arg0, int existing)
-{
- struct update_arg *arg = (struct update_arg *)arg0;
- VALUE newvalue = arg->value;
- if (existing) {
- newvalue = (*arg->func)((VALUE)*key, (VALUE)*value, newvalue);
- }
- *value = (st_data_t)newvalue;
- return ST_CONTINUE;
-}
-
-static NOINSERT_UPDATE_CALLBACK(rb_hash_update_func_callback)
-
-static int
-rb_hash_update_func_i(VALUE key, VALUE value, VALUE arg0)
-{
- struct update_arg *arg = (struct update_arg *)arg0;
- VALUE hash = arg->hash;
-
- arg->value = value;
- RHASH_UPDATE(hash, key, rb_hash_update_func_callback, arg);
- return ST_CONTINUE;
-}
-
-VALUE
-rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func)
-{
- rb_hash_modify(hash1);
- hash2 = to_hash(hash2);
- if (func) {
- struct update_arg arg;
- arg.hash = hash1;
- arg.func = func;
- rb_hash_foreach(hash2, rb_hash_update_func_i, (VALUE)&arg);
- }
- else {
- rb_hash_foreach(hash2, rb_hash_update_i, hash1);
- }
- return hash1;
-}
-
/*
* call-seq:
* hsh.merge(other_hash) -> new_hash
@@ -2015,6 +1797,7 @@ 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;
@@ -2052,6 +1835,7 @@ 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;
@@ -2061,7 +1845,7 @@ rassoc_i(VALUE key, VALUE val, VALUE arg)
/*
* call-seq:
- * hash.rassoc(obj) -> an_array or nil
+ * 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-element array) that matches. See
@@ -2163,13 +1947,11 @@ static int path_tainted = -1;
static char **origenviron;
#ifdef _WIN32
-#define GET_ENVIRON(e) ((e) = rb_w32_get_environ())
+#define GET_ENVIRON(e) (e = rb_w32_get_environ())
#define FREE_ENVIRON(e) rb_w32_free_environ(e)
static char **my_environ;
#undef environ
#define environ my_environ
-#undef getenv
-#define getenv(n) rb_w32_ugetenv(n)
#elif defined(__APPLE__)
#undef environ
#define environ (*_NSGetEnviron())
@@ -2181,21 +1963,17 @@ extern char **environ;
#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)
+#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)
+#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)
{
-#ifdef _WIN32
- VALUE str = rb_str_conv_enc(rb_str_new(ptr, len), rb_utf8_encoding(), rb_locale_encoding());
-#else
VALUE str = rb_locale_str_new(ptr, len);
-#endif
rb_obj_freeze(str);
return str;
@@ -2232,15 +2010,6 @@ env_delete(VALUE obj, VALUE name)
return Qnil;
}
-/*
- * call-seq:
- * ENV.delete(name) -> value
- * ENV.delete(name) { |name| } -> value
- *
- * Deletes the environment variable with +name+ and returns the value of the
- * variable. If a block is given it will be called when the named environment
- * does not exist.
- */
static VALUE
env_delete_m(VALUE obj, VALUE name)
{
@@ -2253,13 +2022,6 @@ env_delete_m(VALUE obj, VALUE name)
static int env_path_tainted(const char *);
-/*
- * call-seq:
- * ENV[name] -> value
- *
- * Retrieves the +value+ for environment variable +name+ as a String. Returns
- * +nil+ if the named variable does not exist.
- */
static VALUE
rb_f_getenv(VALUE obj, VALUE name)
{
@@ -2274,11 +2036,7 @@ rb_f_getenv(VALUE obj, VALUE name)
env = getenv(nam);
if (env) {
if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) {
-#ifdef _WIN32
- VALUE str = rb_str_conv_enc(rb_str_new(env, strlen(env)), rb_utf8_encoding(), rb_filesystem_encoding());
-#else
VALUE str = rb_filesystem_str_new_cstr(env);
-#endif
rb_obj_freeze(str);
return str;
@@ -2288,20 +2046,6 @@ rb_f_getenv(VALUE obj, VALUE name)
return Qnil;
}
-/*
- * :yield: missing_name
- * call-seq:
- * ENV.fetch(name) -> value
- * ENV.fetch(name, default) -> value
- * ENV.fetch(name) { |missing_name| ... } -> value
- *
- * Retrieves the environment variable +name+.
- *
- * If the given name does not exist and neither +default+ nor a block a
- * provided an IndexError is raised. If a block is given it is called with
- * the missing name to provide a value. If a default value is given it will
- * be returned when no block is given.
- */
static VALUE
env_fetch(int argc, VALUE *argv)
{
@@ -2329,11 +2073,7 @@ env_fetch(int argc, VALUE *argv)
return if_none;
}
if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env))
-#ifdef _WIN32
- return rb_str_conv_enc(rb_str_new(env, strlen(env)), rb_utf8_encoding(), rb_filesystem_encoding());
-#else
return rb_filesystem_str_new_cstr(env);
-#endif
return env_str_new2(env);
}
@@ -2362,7 +2102,7 @@ rb_env_path_tainted(void)
}
#if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
-#elif defined __sun
+#elif defined __sun__
static int
in_origenv(const char *str)
{
@@ -2389,56 +2129,37 @@ envix(const char *nam)
}
#endif
-#if defined(_WIN32)
-static size_t
-getenvsize(const char* p)
-{
- const char* porg = p;
- while (*p++) p += strlen(p) + 1;
- return p - porg + 1;
-}
-static size_t
-getenvblocksize()
-{
- return (rb_w32_osver() >= 5) ? 32767 : 5120;
-}
-#endif
-
void
ruby_setenv(const char *name, const char *value)
{
#if defined(_WIN32)
- VALUE buf;
+ int len;
+ char *buf;
int failed = 0;
if (strchr(name, '=')) {
- fail:
errno = EINVAL;
rb_sys_fail("ruby_setenv");
}
if (value) {
- char* p = GetEnvironmentStringsA();
- size_t n;
- if (!p) goto fail; /* never happen */
- n = strlen(name) + 2 + strlen(value) + getenvsize(p);
- FreeEnvironmentStringsA(p);
- if (n >= getenvblocksize()) {
- goto fail; /* 2 for '=' & '\0' */
- }
- buf = rb_sprintf("%s=%s", name, value);
+ len = strlen(name) + 1 + strlen(value) + 1;
+ buf = ALLOCA_N(char, len);
+ snprintf(buf, len, "%s=%s", name, value);
+ failed = putenv(buf);
+
+ /* putenv() doesn't handle empty value */
+ if (!*value)
+ failed = !SetEnvironmentVariable(name,value);
}
else {
- buf = rb_sprintf("%s=", name);
+ len = strlen(name) + 1 + 1;
+ buf = ALLOCA_N(char, len);
+ snprintf(buf, len, "%s=", name);
+ putenv(buf);
+ failed = !SetEnvironmentVariable(name, 0);
}
- failed = putenv(RSTRING_PTR(buf));
- /* even if putenv() failed, clean up and try to delete the
- * variable from the system area. */
- rb_str_resize(buf, 0);
- if (!value || !*value) {
- /* putenv() doesn't handle empty value */
- if (!SetEnvironmentVariable(name, value) &&
- GetLastError() != ERROR_ENVVAR_NOT_FOUND) goto fail;
+ if (failed) {
+ rb_warn("failed to set environment variable. Ruby 1.9.3 will raise SystemCallError in this case.");
}
- if (failed) goto fail;
#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
#undef setenv
#undef unsetenv
@@ -2453,7 +2174,7 @@ ruby_setenv(const char *name, const char *value)
rb_sys_fail("unsetenv");
#endif
}
-#elif defined __sun
+#elif defined __sun__
size_t len;
char **env_ptr, *str;
if (strchr(name, '=')) {
@@ -2525,15 +2246,6 @@ ruby_unsetenv(const char *name)
ruby_setenv(name, 0);
}
-/*
- * call-seq:
- * ENV[name] = value
- * ENV.store(name, value) -> value
- *
- * Sets the environment variable +name+ to +value+. If the value given is
- * +nil+ the environment variable is deleted.
- *
- */
static VALUE
env_aset(VALUE obj, VALUE nm, VALUE val)
{
@@ -2547,8 +2259,8 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
env_delete(obj, nm);
return Qnil;
}
- SafeStringValue(nm);
- SafeStringValue(val);
+ StringValue(nm);
+ StringValue(val);
name = RSTRING_PTR(nm);
value = RSTRING_PTR(val);
if (memchr(name, '\0', RSTRING_LEN(nm)))
@@ -2570,12 +2282,6 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
return val;
}
-/*
- * call-seq:
- * ENV.keys -> Array
- *
- * Returns every environment variable name in an Array
- */
static VALUE
env_keys(void)
{
@@ -2597,39 +2303,12 @@ env_keys(void)
}
static VALUE
-rb_env_size(VALUE ehash)
-{
- char **env;
- long cnt = 0;
-
- rb_secure(4);
-
- env = GET_ENVIRON(environ);
- for (; *env ; ++env) {
- if (strchr(*env, '=')) {
- cnt++;
- }
- }
- FREE_ENVIRON(environ);
- return LONG2FIX(cnt);
-}
-
-/*
- * call-seq:
- * ENV.each_key { |name| } -> Hash
- * ENV.each_key -> Enumerator
- *
- * Yields each environment variable name.
- *
- * An Enumerator is returned if no block is given.
- */
-static VALUE
env_each_key(VALUE ehash)
{
VALUE keys;
long i;
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ 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]);
@@ -2637,12 +2316,6 @@ env_each_key(VALUE ehash)
return ehash;
}
-/*
- * call-seq:
- * ENV.values -> Array
- *
- * Returns every environment variable value as an Array
- */
static VALUE
env_values(void)
{
@@ -2663,22 +2336,13 @@ env_values(void)
return ary;
}
-/*
- * call-seq:
- * ENV.each_value { |value| } -> Hash
- * ENV.each_value -> Enumerator
- *
- * Yields each environment variable +value+.
- *
- * An Enumerator is returned if no block was given.
- */
static VALUE
env_each_value(VALUE ehash)
{
VALUE values;
long i;
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ 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]);
@@ -2686,17 +2350,6 @@ env_each_value(VALUE ehash)
return ehash;
}
-/*
- * call-seq:
- * ENV.each { |name, value| } -> Hash
- * ENV.each -> Enumerator
- * ENV.each_pair { |name, value| } -> Hash
- * ENV.each_pair -> Enumerator
- *
- * Yields each environment variable +name+ and +value+.
- *
- * If no block is given an Enumerator is returned.
- */
static VALUE
env_each_pair(VALUE ehash)
{
@@ -2704,7 +2357,7 @@ env_each_pair(VALUE ehash)
VALUE ary;
long i;
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ RETURN_ENUMERATOR(ehash, 0, 0);
rb_secure(4);
ary = rb_ary_new();
@@ -2725,15 +2378,6 @@ env_each_pair(VALUE ehash)
return ehash;
}
-/*
- * call-seq:
- * ENV.reject! { |name, value| } -> ENV or nil
- * ENV.reject! -> Enumerator
- *
- * Equivalent to ENV#delete_if but returns +nil+ if no changes were made.
- *
- * Returns an Enumerator if no block was given.
- */
static VALUE
env_reject_bang(VALUE ehash)
{
@@ -2741,9 +2385,8 @@ env_reject_bang(VALUE ehash)
long i;
int del = 0;
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ RETURN_ENUMERATOR(ehash, 0, 0);
keys = env_keys(); /* rb_secure(4); */
- RBASIC(keys)->klass = 0;
for (i=0; i<RARRAY_LEN(keys); i++) {
VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
if (!NIL_P(val)) {
@@ -2758,30 +2401,14 @@ env_reject_bang(VALUE ehash)
return envtbl;
}
-/*
- * call-seq:
- * ENV.delete_if { |name, value| } -> Hash
- * ENV.delete_if -> Enumerator
- *
- * Deletes every environment variable for which the block evaluates to +true+.
- *
- * If no block is given an enumerator is returned instead.
- */
static VALUE
env_delete_if(VALUE ehash)
{
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ RETURN_ENUMERATOR(ehash, 0, 0);
env_reject_bang(ehash);
return envtbl;
}
-/*
- * call-seq:
- * ENV.values_at(name, ...) -> Array
- *
- * Returns an array containing the environment variable values associated with
- * the given names. See also ENV.select.
- */
static VALUE
env_values_at(int argc, VALUE *argv)
{
@@ -2796,46 +2423,32 @@ env_values_at(int argc, VALUE *argv)
return result;
}
-/*
- * call-seq:
- * ENV.select { |name, value| } -> Hash
- * ENV.select -> Enumerator
- *
- * Returns a copy of the environment for entries where the block returns true.
- *
- * Returns an Enumerator if no block was given.
- */
static VALUE
env_select(VALUE ehash)
{
VALUE result;
- VALUE keys;
- long i;
+ char **env;
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ RETURN_ENUMERATOR(ehash, 0, 0);
rb_secure(4);
result = rb_hash_new();
- keys = env_keys();
- for (i = 0; i < RARRAY_LEN(keys); ++i) {
- VALUE key = RARRAY_PTR(keys)[i];
- VALUE val = rb_f_getenv(Qnil, key);
- if (!NIL_P(val)) {
- if (RTEST(rb_yield_values(2, key, val))) {
- rb_hash_aset(result, key, val);
+ env = GET_ENVIRON(environ);
+ while (*env) {
+ char *s = strchr(*env, '=');
+ if (s) {
+ 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);
}
}
+ env++;
}
+ FREE_ENVIRON(environ);
return result;
}
-/*
- * call-seq:
- * ENV.select! { |name, value| } -> ENV or nil
- * ENV.select! -> Enumerator
- *
- * Equivalent to ENV#keep_if but returns +nil+ if no changes were made.
- */
static VALUE
env_select_bang(VALUE ehash)
{
@@ -2843,9 +2456,8 @@ env_select_bang(VALUE ehash)
long i;
int del = 0;
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ RETURN_ENUMERATOR(ehash, 0, 0);
keys = env_keys(); /* rb_secure(4); */
- RBASIC(keys)->klass = 0;
for (i=0; i<RARRAY_LEN(keys); i++) {
VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
if (!NIL_P(val)) {
@@ -2860,29 +2472,14 @@ env_select_bang(VALUE ehash)
return envtbl;
}
-/*
- * call-seq:
- * ENV.keep_if { |name, value| } -> Hash
- * ENV.keep_if -> Enumerator
- *
- * Deletes every environment variable where the block evaluates to +false+.
- *
- * Returns an enumerator if no block was given.
- */
static VALUE
env_keep_if(VALUE ehash)
{
- RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
+ RETURN_ENUMERATOR(ehash, 0, 0);
env_select_bang(ehash);
return envtbl;
}
-/*
- * call-seq:
- * ENV.clear
- *
- * Removes every environment variable.
- */
VALUE
rb_env_clear(void)
{
@@ -2899,24 +2496,12 @@ rb_env_clear(void)
return envtbl;
}
-/*
- * call-seq:
- * ENV.to_s -> "ENV"
- *
- * Returns "ENV"
- */
static VALUE
env_to_s(void)
{
return rb_usascii_str_new2("ENV");
}
-/*
- * call-seq:
- * ENV.inspect -> string
- *
- * Returns the contents of the environment as a String.
- */
static VALUE
env_inspect(void)
{
@@ -2948,15 +2533,6 @@ env_inspect(void)
return str;
}
-/*
- * call-seq:
- * ENV.to_a -> Array
- *
- * Converts the environment variables into an array of names and value arrays.
- *
- * ENV.to_a # => [["TERM", "xterm-color"], ["SHELL", "/bin/bash"], ...]
- *
- */
static VALUE
env_to_a(void)
{
@@ -2978,26 +2554,12 @@ env_to_a(void)
return ary;
}
-/*
- * call-seq:
- * ENV.rehash
- *
- * Re-hashing the environment variables does nothing. It is provided for
- * compatibility with Hash.
- */
static VALUE
env_none(void)
{
return Qnil;
}
-/*
- * call-seq:
- * ENV.length
- * ENV.size
- *
- * Returns the number of environment variables.
- */
static VALUE
env_size(void)
{
@@ -3006,18 +2568,12 @@ env_size(void)
rb_secure(4);
env = GET_ENVIRON(environ);
- for (i=0; env[i]; i++)
+ for(i=0; env[i]; i++)
;
FREE_ENVIRON(environ);
return INT2FIX(i);
}
-/*
- * call-seq:
- * ENV.empty? -> true or false
- *
- * Returns true when there are no environment variables
- */
static VALUE
env_empty_p(void)
{
@@ -3033,44 +2589,26 @@ env_empty_p(void)
return Qfalse;
}
-/*
- * call-seq:
- * ENV.key?(name) -> true or false
- * ENV.include?(name) -> true or false
- * ENV.has_key?(name) -> true or false
- * ENV.member?(name) -> true or false
- *
- * Returns +true+ if there is an environment variable with the given +name+.
- */
static VALUE
env_has_key(VALUE env, VALUE key)
{
char *s;
rb_secure(4);
- SafeStringValue(key);
- s = RSTRING_PTR(key);
+ s = StringValuePtr(key);
if (memchr(s, '\0', RSTRING_LEN(key)))
rb_raise(rb_eArgError, "bad environment variable name");
if (getenv(s)) return Qtrue;
return Qfalse;
}
-/*
- * call-seq:
- * ENV.assoc(name) -> Array or nil
- *
- * Returns an Array of the name and value of the environment variable with
- * +name+ or +nil+ if the name cannot be found.
- */
static VALUE
env_assoc(VALUE env, VALUE key)
{
char *s, *e;
rb_secure(4);
- SafeStringValue(key);
- s = RSTRING_PTR(key);
+ s = StringValuePtr(key);
if (memchr(s, '\0', RSTRING_LEN(key)))
rb_raise(rb_eArgError, "bad environment variable name");
e = getenv(s);
@@ -3078,13 +2616,6 @@ env_assoc(VALUE env, VALUE key)
return Qnil;
}
-/*
- * call-seq:
- * ENV.value?(value) -> true or false
- * ENV.has_value?(value) -> true or false
- *
- * Returns +true+ if there is an environment variable with the given +value+.
- */
static VALUE
env_has_value(VALUE dmy, VALUE obj)
{
@@ -3093,7 +2624,6 @@ env_has_value(VALUE dmy, VALUE obj)
rb_secure(4);
obj = rb_check_string_type(obj);
if (NIL_P(obj)) return Qnil;
- rb_check_safe_obj(obj);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
@@ -3110,13 +2640,6 @@ env_has_value(VALUE dmy, VALUE obj)
return Qfalse;
}
-/*
- * call-seq:
- * ENV.rassoc(value)
- *
- * Returns an Array of the name and value of the environment variable with
- * +value+ or +nil+ if the value cannot be found.
- */
static VALUE
env_rassoc(VALUE dmy, VALUE obj)
{
@@ -3125,7 +2648,6 @@ env_rassoc(VALUE dmy, VALUE obj)
rb_secure(4);
obj = rb_check_string_type(obj);
if (NIL_P(obj)) return Qnil;
- rb_check_safe_obj(obj);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
@@ -3143,13 +2665,6 @@ env_rassoc(VALUE dmy, VALUE obj)
return Qnil;
}
-/*
- * call-seq:
- * ENV.key(value) -> name
- *
- * Returns the name of the environment variable with +value+. If the value is
- * not found +nil+ is returned.
- */
static VALUE
env_key(VALUE dmy, VALUE value)
{
@@ -3157,7 +2672,7 @@ env_key(VALUE dmy, VALUE value)
VALUE str;
rb_secure(4);
- SafeStringValue(value);
+ StringValue(value);
env = GET_ENVIRON(environ);
while (*env) {
char *s = strchr(*env, '=');
@@ -3175,12 +2690,6 @@ env_key(VALUE dmy, VALUE value)
return Qnil;
}
-/*
- * call-seq:
- * ENV.index(value) -> key
- *
- * Deprecated method that is equivalent to ENV.key
- */
static VALUE
env_index(VALUE dmy, VALUE value)
{
@@ -3188,14 +2697,6 @@ env_index(VALUE dmy, VALUE value)
return env_key(dmy, value);
}
-/*
- * call-seq:
- * ENV.to_hash -> hash
- * ENV.to_h -> hash
- *
- * Creates a hash with a copy of the environment variables.
- *
- */
static VALUE
env_to_hash(void)
{
@@ -3217,32 +2718,16 @@ env_to_hash(void)
return hash;
}
-/*
- * call-seq:
- * ENV.reject { |name, value| } -> Hash
- * ENV.reject -> Enumerator
- *
- * Same as ENV#delete_if, but works on (and returns) a copy of the
- * environment.
- */
static VALUE
env_reject(void)
{
return rb_hash_delete_if(env_to_hash());
}
-/*
- * call-seq:
- * ENV.shift -> Array or nil
- *
- * Removes an environment variable name-value pair from ENV and returns it as
- * an Array. Returns +nil+ if when the environment is empty.
- */
static VALUE
env_shift(void)
{
char **env;
- VALUE result = Qnil;
rb_secure(4);
env = GET_ENVIRON(environ);
@@ -3252,20 +2737,13 @@ env_shift(void)
VALUE key = env_str_new(*env, s-*env);
VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
env_delete(Qnil, key);
- result = rb_assoc_new(key, val);
+ return rb_assoc_new(key, val);
}
}
FREE_ENVIRON(environ);
- return result;
+ return Qnil;
}
-/*
- * call-seq:
- * ENV.invert -> Hash
- *
- * Returns a new hash created by using environment variable names as values
- * and values as names.
- */
static VALUE
env_invert(void)
{
@@ -3275,20 +2753,15 @@ env_invert(void)
static int
env_replace_i(VALUE key, VALUE val, VALUE keys)
{
- env_aset(Qnil, key, val);
- if (rb_ary_includes(keys, key)) {
- rb_ary_delete(keys, key);
+ if (key != Qundef) {
+ env_aset(Qnil, key, val);
+ if (rb_ary_includes(keys, key)) {
+ rb_ary_delete(keys, key);
+ }
}
return ST_CONTINUE;
}
-/*
- * call-seq:
- * ENV.replace(hash) -> env
- *
- * Replaces the contents of the environment variables with the contents of
- * +hash+.
- */
static VALUE
env_replace(VALUE env, VALUE hash)
{
@@ -3309,23 +2782,15 @@ env_replace(VALUE env, VALUE hash)
static int
env_update_i(VALUE key, VALUE val)
{
- if (rb_block_given_p()) {
- val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
+ if (key != Qundef) {
+ if (rb_block_given_p()) {
+ val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
+ }
+ env_aset(Qnil, key, val);
}
- env_aset(Qnil, key, val);
return ST_CONTINUE;
}
-/*
- * call-seq:
- * ENV.update(hash) -> Hash
- * ENV.update(hash) { |name, old_value, new_value| } -> Hash
- *
- * Adds the contents of +hash+ to the environment variables. If no block is
- * specified entries with duplicate keys are overwritten, otherwise the value
- * of each duplicate name is determined by calling the block with the key, its
- * value from the environment and its value from the hash.
- */
static VALUE
env_update(VALUE env, VALUE hash)
{
@@ -3337,116 +2802,15 @@ env_update(VALUE env, VALUE hash)
}
/*
- * A Hash is a dictionary-like collection of unique keys and their values.
- * Also called associative arrays, they are similar to Arrays, but where an
- * Array uses integers as its index, a Hash allows you to use any object
- * type.
- *
- * Hashes enumerate their values in the order that the corresponding keys
- * were inserted.
- *
- * A Hash can be easily created by using its implicit form:
- *
- * grades = { "Jane Doe" => 10, "Jim Doe" => 6 }
- *
- * Hashes allow an alternate syntax form when your keys are always symbols.
- * Instead of
- *
- * options = { :font_size => 10, :font_family => "Arial" }
- *
- * You could write it as:
- *
- * options = { font_size: 10, font_family: "Arial" }
- *
- * Each named key is a symbol you can access in hash:
- *
- * options[:font_size] # => 10
- *
- * A Hash can also be created through its ::new method:
- *
- * grades = Hash.new
- * grades["Dorothy Doe"] = 9
+ * A <code>Hash</code> is a collection of key-value pairs. It is
+ * similar to an <code>Array</code>, except that indexing is done via
+ * arbitrary keys of any object type, not an integer index. Hashes enumerate
+ * their values in the order that the corresponding keys were inserted.
*
* Hashes have a <em>default value</em> that is returned when accessing
- * keys that do not exist in the hash. If no default is set +nil+ is used.
- * You can set the default value by sending it as an argument to Hash.new:
+ * keys that do not exist in the hash. By default, that value is
+ * <code>nil</code>.
*
- * grades = Hash.new(0)
- *
- * Or by using the #default= method:
- *
- * grades = {"Timmy Doe" => 8}
- * grades.default = 0
- *
- * Accessing a value in a Hash requires using its key:
- *
- * puts grades["Jane Doe"] # => 10
- *
- * === Common Uses
- *
- * Hashes are an easy way to represent data structures, such as
- *
- * books = {}
- * books[:matz] = "The Ruby Language"
- * books[:black] = "The Well-Grounded Rubyist"
- *
- * Hashes are also commonly used as a way to have named parameters in
- * functions. Note that no brackets are used below. If a hash is the last
- * argument on a method call, no braces are needed, thus creating a really
- * clean interface:
- *
- * Person.create(name: "John Doe", age: 27)
- *
- * def self.create(params)
- * @name = params[:name]
- * @age = params[:age]
- * end
- *
- * === Hash Keys
- *
- * Two objects refer to the same hash key when their <code>hash</code> value
- * is identical and the two objects are <code>eql?</code> to each other.
- *
- * A user-defined class may be used as a hash key if the <code>hash</code>
- * and <code>eql?</code> methods are overridden to provide meaningful
- * behavior. By default, separate instances refer to separate hash keys.
- *
- * A typical implementation of <code>hash</code> is based on the
- * object's data while <code>eql?</code> is usually aliased to the overridden
- * <code>==</code> method:
- *
- * class Book
- * attr_reader :author, :title
- *
- * def initialize(author, title)
- * @author = author
- * @title = title
- * end
- *
- * def ==(other)
- * self.class === other and
- * other.author == @author and
- * other.title == @title
- * end
- *
- * alias eql? ==
- *
- * def hash
- * @author.hash ^ @title.hash # XOR
- * end
- * end
- *
- * book1 = Book.new 'matz', 'Ruby in a Nutshell'
- * book2 = Book.new 'matz', 'Ruby in a Nutshell'
- *
- * reviews = {}
- *
- * reviews[book1] = 'Great reference!'
- * reviews[book2] = 'Nice and compact!'
- *
- * reviews.length #=> 1
- *
- * See also Object#hash and Object#eql?
*/
void
@@ -3463,15 +2827,14 @@ Init_Hash(void)
rb_include_module(rb_cHash, rb_mEnumerable);
- rb_define_alloc_func(rb_cHash, empty_hash_alloc);
+ 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_initialize_copy, 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_h", rb_hash_to_h, 0);
rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
rb_define_alias(rb_cHash, "to_s", "inspect");
@@ -3530,15 +2893,6 @@ Init_Hash(void)
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);
- /* Document-class: ENV
- *
- * ENV is a hash-like accessor for environment variables.
- */
-
- /*
- * Hack to get RDoc to regard ENV as a class:
- * envtbl = rb_define_class("ENV", rb_cObject);
- */
origenviron = environ;
envtbl = rb_obj_alloc(rb_cObject);
rb_extend_object(envtbl, rb_mEnumerable);
@@ -3582,14 +2936,8 @@ 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,"to_h", env_to_hash, 0);
rb_define_singleton_method(envtbl,"assoc", env_assoc, 1);
rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1);
- /*
- * ENV is a Hash-like accessor for environment variables.
- *
- * See ENV (the class) for more details.
- */
rb_define_global_const("ENV", envtbl);
}
diff --git a/ia64.s b/ia64.s
index 1087105585..92415b4e97 100644
--- a/ia64.s
+++ b/ia64.s
@@ -5,11 +5,11 @@
//
// 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.
+// rb_ia64_bsp returns the address next to caller's register stack frame.
//
// See also
// Intel Itanium Architecture Software Developer's Manual
diff --git a/id.c b/id.c
new file mode 100644
index 0000000000..2111751a37
--- /dev/null
+++ b/id.c
@@ -0,0 +1,50 @@
+/**********************************************************************
+
+ 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
index 076b5ce258..862b1687d4 100644
--- a/include/ruby.h
+++ b/include/ruby.h
@@ -22,7 +22,6 @@
#define HAVE_RUBY_REGEX_H 1
#define HAVE_RUBY_RUBY_H 1
#define HAVE_RUBY_ST_H 1
-#define HAVE_RUBY_THREAD_H 1
#define HAVE_RUBY_UTIL_H 1
#define HAVE_RUBY_VERSION_H 1
#define HAVE_RUBY_VM_H 1
diff --git a/include/ruby/backward/classext.h b/include/ruby/backward/classext.h
deleted file mode 100644
index 615e6f6858..0000000000
--- a/include/ruby/backward/classext.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#if defined __GNUC__
-#warning use of RClass internals is deprecated
-#elif defined _MSC_VER || defined __BORLANDC__
-#pragma message("warning: use of RClass internals is deprecated")
-#endif
-
-#ifndef RUBY_BACKWARD_CLASSEXT_H
-#define RUBY_BACKWARD_CLASSEXT_H 1
-
-typedef struct rb_deprecated_classext_struct {
- VALUE super;
-} rb_deprecated_classext_t;
-
-#undef RCLASS_SUPER(c)
-#define RCLASS_EXT(c) ((rb_deprecated_classext_t *)RCLASS(c)->ptr)
-#define RCLASS_SUPER(c) (RCLASS_EXT(c)->super)
-
-#endif /* RUBY_BACKWARD_CLASSEXT_H */
diff --git a/include/ruby/backward/rubysig.h b/include/ruby/backward/rubysig.h
index f46679ae67..3952f7e85e 100644
--- a/include/ruby/backward/rubysig.h
+++ b/include/ruby/backward/rubysig.h
@@ -27,10 +27,6 @@ extern "C" {
#endif
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#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 *));
@@ -42,10 +38,6 @@ DEPRECATED(RUBY_EXTERN void rb_thread_blocking_region_end(struct rb_blocking_reg
#define ALLOW_INTS do {CHECK_INTS;} while (0)
#define CHECK_INTS rb_thread_check_ints()
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/debug.h b/include/ruby/debug.h
deleted file mode 100644
index 4ef45a8327..0000000000
--- a/include/ruby/debug.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**********************************************************************
-
- ruby/debug.h -
-
- $Author: ko1 $
- created at: Tue Nov 20 20:35:08 2012
-
- Copyright (C) 2012 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RB_DEBUG_H
-#define RB_DEBUG_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-/* Note: This file contains experimental APIs. */
-/* APIs can be replaced at Ruby 2.0.1 or later */
-
-/* debug inspector APIs */
-typedef struct rb_debug_inspector_struct rb_debug_inspector_t;
-typedef VALUE (*rb_debug_inspector_func_t)(const rb_debug_inspector_t *, void *);
-
-VALUE rb_debug_inspector_open(rb_debug_inspector_func_t func, void *data);
-VALUE rb_debug_inspector_frame_self_get(const rb_debug_inspector_t *dc, long index);
-VALUE rb_debug_inspector_frame_class_get(const rb_debug_inspector_t *dc, long index);
-VALUE rb_debug_inspector_frame_binding_get(const rb_debug_inspector_t *dc, long index);
-VALUE rb_debug_inspector_frame_iseq_get(const rb_debug_inspector_t *dc, long index);
-VALUE rb_debug_inspector_backtrace_locations(const rb_debug_inspector_t *dc);
-
-/* Old style set_trace_func APIs */
-
-/* duplicated def of include/ruby/ruby.h */
-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);
-
-int rb_remove_event_hook_with_data(rb_event_hook_func_t func, VALUE data);
-void rb_thread_add_event_hook(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data);
-int rb_thread_remove_event_hook(VALUE thval, rb_event_hook_func_t func);
-int rb_thread_remove_event_hook_with_data(VALUE thval, rb_event_hook_func_t func, VALUE data);
-
-/* TracePoint APIs */
-
-VALUE rb_tracepoint_new(VALUE target_thread_not_supported_yet, rb_event_flag_t events, void (*func)(VALUE, void *), void *data);
-VALUE rb_tracepoint_enable(VALUE tpval);
-VALUE rb_tracepoint_disable(VALUE tpval);
-VALUE rb_tracepoint_enabled_p(VALUE tpval);
-
-typedef struct rb_trace_arg_struct rb_trace_arg_t;
-rb_trace_arg_t *rb_tracearg_from_tracepoint(VALUE tpval);
-
-VALUE rb_tracearg_event(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_lineno(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_path(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_method_id(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_defined_class(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_binding(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_self(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_return_value(rb_trace_arg_t *trace_arg);
-VALUE rb_tracearg_raised_exception(rb_trace_arg_t *trace_arg);
-
-/* undocumented advanced tracing APIs */
-
-typedef enum {
- RUBY_EVENT_HOOK_FLAG_SAFE = 0x01,
- RUBY_EVENT_HOOK_FLAG_DELETED = 0x02,
- RUBY_EVENT_HOOK_FLAG_RAW_ARG = 0x04
-} rb_event_hook_flag_t;
-
-void rb_add_event_hook2(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flag);
-void rb_thread_add_event_hook2(VALUE thval, rb_event_hook_func_t func, rb_event_flag_t events, VALUE data, rb_event_hook_flag_t hook_flag);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_DEBUG_H */
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index de0883d2c9..7bb2788aaf 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -17,17 +17,9 @@ extern "C" {
#endif
#endif
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
#define RUBY
-# include <stddef.h>
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#ifdef __cplusplus
# ifndef HAVE_PROTOTYPES
# define HAVE_PROTOTYPES 1
@@ -57,10 +49,6 @@ extern "C" {
#define ANYARGS
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
#define xmalloc ruby_xmalloc
#define xmalloc2 ruby_xmalloc2
#define xcalloc ruby_xcalloc
@@ -94,44 +82,38 @@ void xfree(void*);
# define SIZEOF_BDIGITS SIZEOF_INT
# define BDIGIT_DBL unsigned LONG_LONG
# define BDIGIT_DBL_SIGNED LONG_LONG
-# define PRI_BDIGIT_PREFIX ""
-# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
#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
-# define PRI_BDIGIT_PREFIX ""
-# define PRI_BDIGIT_DBL_PREFIX "l"
#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
-# define PRI_BDIGIT_PREFIX "h"
-# define PRI_BDIGIT_DBL_PREFIX "l"
#else
# define BDIGIT unsigned short
# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
# define BDIGIT_DBL unsigned long
# define BDIGIT_DBL_SIGNED long
-# define PRI_BDIGIT_PREFIX "h"
-# define PRI_BDIGIT_DBL_PREFIX "l"
#endif
-#define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
-#define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
-#define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
-#define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
-#define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
-#define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
+#ifdef INFINITY
+# define HAVE_INFINITY
+#else
+/** @internal */
+extern const unsigned char rb_infinity[];
+# define INFINITY (*(float *)rb_infinity)
+#endif
-#define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
-#define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
-#define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
-#define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
-#define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
-#define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
+#ifdef NAN
+# define HAVE_NAN
+#else
+/** @internal */
+extern const unsigned char rb_nan[];
+# define NAN (*(float *)rb_nan)
+#endif
#ifdef __CYGWIN__
#undef _WIN32
@@ -149,6 +131,76 @@ void xfree(void*);
#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
@@ -180,10 +232,6 @@ void xfree(void*);
#endif
-#ifndef RUBY_FUNC_EXPORTED
-#define RUBY_FUNC_EXPORTED
-#endif
-
#ifndef RUBY_EXTERN
#define RUBY_EXTERN extern
#endif
@@ -197,9 +245,22 @@ void xfree(void*);
/* MB_CUR_MAX will not work well in C locale */
#endif
-#if defined(__sparc)
-void rb_sparc_flush_register_windows(void);
-# define FLUSH_REGISTER_WINDOWS rb_sparc_flush_register_windows()
+#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);
@@ -250,10 +311,6 @@ void rb_ia64_flushrs(void);
RUBY_ALIAS_FUNCTION_TYPE(VALUE, prot, name, args)
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 41640ec7e0..1573b5b200 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -22,10 +22,6 @@ extern "C" {
#include <stdarg.h>
#include "ruby/oniguruma.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
#define ENCODING_INLINE_MAX 1023
#define ENCODING_SHIFT (FL_USHIFT+10)
#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT)
@@ -62,12 +58,12 @@ extern "C" {
#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)
+#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)) : \
+ (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) \
@@ -79,8 +75,6 @@ extern "C" {
typedef OnigEncodingType rb_encoding;
-int rb_char_to_option_kcode(int c, int *option, int *kcode);
-
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)
@@ -89,7 +83,6 @@ 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_find_encoding(VALUE);
rb_encoding* rb_enc_get(VALUE);
rb_encoding* rb_enc_compatible(VALUE,VALUE);
rb_encoding* rb_enc_check(VALUE,VALUE);
@@ -112,8 +105,6 @@ VALUE rb_str_export_to_enc(VALUE, rb_encoding *);
VALUE rb_str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to);
VALUE rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags, VALUE ecopts);
-PRINTF_ARGS(NORETURN(void rb_enc_raise(rb_encoding *, VALUE, const char*, ...)), 3, 4);
-
/* index -> rb_encoding */
rb_encoding* rb_enc_from_index(int idx);
@@ -152,34 +143,33 @@ unsigned int rb_enc_codepoint_len(const char *p, const char *e, int *len, rb_enc
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))
+#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))
+#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)))
+#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)))
-#define rb_enc_step_back(s,p,e,n,enc) ((char *)onigenc_step_back((enc),(UChar*)(s),(UChar*)(p),(UChar*)(e),(int)(n)))
+#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_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_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_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))
@@ -214,13 +204,6 @@ 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*);
-char *rb_enc_path_next(const char *,const char *,rb_encoding*);
-char *rb_enc_path_skip_prefix(const char *,const char *,rb_encoding*);
-char *rb_enc_path_last_separator(const char *,const char *,rb_encoding*);
-char *rb_enc_path_end(const char *,const char *,rb_encoding*);
-const char *ruby_enc_find_basename(const char *name, long *baselen, long *alllen, rb_encoding *enc);
-const char *ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc);
-ID rb_check_id_cstr(const char *ptr, long len, rb_encoding *enc);
RUBY_EXTERN VALUE rb_cEncoding;
#define ENC_DUMMY_FLAG (1<<24)
@@ -254,7 +237,6 @@ 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_options(VALUE opthash, VALUE *ecopts, int ecflags);
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);
@@ -314,9 +296,6 @@ void rb_econv_binmode(rb_econv_t *ec);
#define ECONV_UNDEF_HEX_CHARREF 0x00000030
#define ECONV_DECORATOR_MASK 0x0000ff00
-#define ECONV_NEWLINE_DECORATOR_MASK 0x00003f00
-#define ECONV_NEWLINE_DECORATOR_READ_MASK 0x00000f00
-#define ECONV_NEWLINE_DECORATOR_WRITE_MASK 0x00003000
#define ECONV_UNIVERSAL_NEWLINE_DECORATOR 0x00000100
#define ECONV_CRLF_NEWLINE_DECORATOR 0x00001000
@@ -327,12 +306,6 @@ void rb_econv_binmode(rb_econv_t *ec);
#define ECONV_STATEFUL_DECORATOR_MASK 0x00f00000
#define ECONV_XML_ATTR_QUOTE_DECORATOR 0x00100000
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
-#define ECONV_DEFAULT_NEWLINE_DECORATOR ECONV_CRLF_NEWLINE_DECORATOR
-#else
-#define ECONV_DEFAULT_NEWLINE_DECORATOR 0
-#endif
-
/* end of flags for rb_econv_open */
/* flags for rb_econv_convert */
@@ -340,10 +313,6 @@ void rb_econv_binmode(rb_econv_t *ec);
#define ECONV_AFTER_OUTPUT 0x00020000
/* end of flags for rb_econv_convert */
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 838beb9e68..f0cff67928 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -21,37 +21,19 @@ extern "C" {
#endif
#endif
-#include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
#ifdef HAVE_STDARG_PROTOTYPES
# include <stdarg.h>
#else
# include <varargs.h>
#endif
-
-#if defined(HAVE_SYS_TYPES_H)
-#include <sys/types.h>
-#endif
-
-#if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
#include "ruby/st.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
/*
* Functions and variables that are used by more than one source file of
* the kernel.
*/
-#define UNLIMITED_ARGUMENTS (-1)
+#define ID_ALLOCATOR 1
/* array.c */
void rb_mem_clear(register VALUE*, register long);
@@ -63,14 +45,11 @@ VALUE rb_ary_new3(long,...);
VALUE rb_ary_new4(long, const VALUE *);
VALUE rb_ary_tmp_new(long);
void rb_ary_free(VALUE);
-void rb_ary_modify(VALUE);
VALUE rb_ary_freeze(VALUE);
-VALUE rb_ary_shared_with_p(VALUE, 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_resurrect(VALUE ary);
VALUE rb_ary_to_ary(VALUE);
VALUE rb_ary_to_s(VALUE);
VALUE rb_ary_push(VALUE, VALUE);
@@ -80,8 +59,8 @@ 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_rotate(VALUE, long);
VALUE rb_ary_sort(VALUE);
VALUE rb_ary_sort_bang(VALUE);
VALUE rb_ary_delete(VALUE, VALUE);
@@ -95,7 +74,6 @@ 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));
-VALUE rb_ary_resize(VALUE ary, long len);
/* bignum.c */
VALUE rb_big_new(long, int);
int rb_bigzero_p(VALUE x);
@@ -117,15 +95,14 @@ SIGNED_VALUE rb_big2long(VALUE);
#define rb_big2int(x) rb_big2long(x)
VALUE rb_big2ulong(VALUE);
#define rb_big2uint(x) rb_big2ulong(x)
-VALUE rb_big2ulong_pack(VALUE 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 */
-DEPRECATED(void rb_quad_pack(char*,VALUE));
-DEPRECATED(VALUE rb_quad_unpack(const char*,int));
+void rb_quad_pack(char*,VALUE);
+VALUE rb_quad_unpack(const char*,int);
void rb_big_pack(VALUE val, unsigned long *buf, long num_longs);
VALUE rb_big_unpack(unsigned long *buf, long num_longs);
int rb_uv_to_utf8(char[6],unsigned long);
@@ -133,7 +110,6 @@ VALUE rb_dbl2big(double);
double rb_big2dbl(VALUE);
VALUE rb_big_cmp(VALUE, VALUE);
VALUE rb_big_eq(VALUE, VALUE);
-VALUE rb_big_eql(VALUE, VALUE);
VALUE rb_big_plus(VALUE, VALUE);
VALUE rb_big_minus(VALUE, VALUE);
VALUE rb_big_mul(VALUE, VALUE);
@@ -149,29 +125,30 @@ 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))
+#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))
+#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))
+#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))
+#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))
+#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))
+#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);
@@ -182,7 +159,6 @@ 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_include_class_new(VALUE, VALUE);
VALUE rb_mod_included_modules(VALUE);
VALUE rb_mod_include_p(VALUE, VALUE);
VALUE rb_mod_ancestors(VALUE);
@@ -208,91 +184,43 @@ VALUE rb_fiber_yield(int argc, VALUE *args);
VALUE rb_fiber_current(void);
VALUE rb_fiber_alive_p(VALUE);
/* enum.c */
-VALUE rb_enum_values_pack(int, VALUE*);
/* enumerator.c */
VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *);
-VALUE rb_enumeratorize_with_size(VALUE, VALUE, int, VALUE *, VALUE (*)(ANYARGS));
-#define RETURN_SIZED_ENUMERATOR(obj, argc, argv, size_fn) do { \
+#define RETURN_ENUMERATOR(obj, argc, argv) do { \
if (!rb_block_given_p()) \
- return rb_enumeratorize_with_size((obj), ID2SYM(rb_frame_this_func()),\
- (argc), (argv), (size_fn)); \
+ return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()), \
+ argc, argv); \
} while (0)
-#define RETURN_ENUMERATOR(obj, argc, argv) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 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_loaderror_with_path(VALUE path, const char*, ...)), 2, 3);
PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
-PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, 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_with_enc(const char*, int, void *, const char*, ...), 4, 5);
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_error_untrusted(VALUE);
void rb_check_frozen(VALUE);
-void rb_check_trusted(VALUE);
-#define rb_check_frozen_internal(obj) do { \
- VALUE frozen_obj = (obj); \
- if (OBJ_FROZEN(frozen_obj)) { \
- rb_error_frozen(rb_obj_classname(frozen_obj)); \
- } \
- } while (0)
-#define rb_check_trusted_internal(obj) do { \
- VALUE untrusted_obj = (obj); \
- if (!OBJ_UNTRUSTED(untrusted_obj)) { \
- rb_error_untrusted(untrusted_obj); \
- } \
- } while (0)
-#ifdef __GNUC__
-#define rb_check_frozen(obj) __extension__({rb_check_frozen_internal(obj);})
-#define rb_check_trusted(obj) __extension__({rb_check_trusted_internal(obj);})
-#else
-static inline void
-rb_check_frozen_inline(VALUE obj)
-{
- rb_check_frozen_internal(obj);
-}
-#define rb_check_frozen(obj) rb_check_frozen_inline(obj)
-static inline void
-rb_check_trusted_inline(VALUE obj)
-{
- rb_check_trusted_internal(obj);
-}
-#define rb_check_trusted(obj) rb_check_trusted_inline(obj)
-#endif
-void rb_check_copyable(VALUE obj, VALUE orig);
-
-#define OBJ_INIT_COPY(obj, orig) \
- ((obj) != (orig) && (rb_obj_init_copy((obj), (orig)), 1))
-
/* eval.c */
int rb_sourceline(void);
const char *rb_sourcefile(void);
VALUE rb_check_funcall(VALUE, ID, int, VALUE*);
-NORETURN(void rb_error_arity(int, int, int));
-#define rb_check_arity(argc, min, max) do { \
- if (((argc) < (min)) || ((argc) > (max) && (max) != UNLIMITED_ARGUMENTS)) \
- rb_error_arity(argc, min, max); \
- } while(0)
-
#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
typedef struct {
int maxfd;
fd_set *fdset;
} rb_fdset_t;
-void rb_fd_init(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);
-void rb_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
int rb_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
#define rb_fd_ptr(f) ((f)->fdset)
@@ -305,18 +233,14 @@ typedef struct {
fd_set *fdset;
} rb_fdset_t;
-void rb_fd_init(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_copy(d, s, n) rb_w32_fd_copy((d), (s), (n))
-void rb_w32_fd_copy(rb_fdset_t *, const fd_set *, int);
-#define rb_fd_dup(d, s) rb_w32_fd_dup((d), (s))
-void rb_w32_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
-#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_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)
@@ -325,18 +249,16 @@ void rb_w32_fd_dup(rb_fdset_t *dst, const rb_fdset_t *src);
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_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_dup(d, s) (*(d) = *(s))
-#define rb_fd_resize(n, f) ((void)(f))
+#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_init_copy(d, s) (*(d) = *(s))
-#define rb_fd_term(f) ((void)(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))
+#define rb_fd_select(n, rfds, wfds, efds, timeout) select(n, rfds, wfds, efds, timeout)
#endif
@@ -382,8 +304,7 @@ 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);
-DEPRECATED(VALUE rb_f_lambda(void));
-VALUE rb_block_lambda(void);
+VALUE rb_f_lambda(void);
VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
VALUE rb_obj_is_proc(VALUE);
VALUE rb_proc_call(VALUE, VALUE);
@@ -392,29 +313,31 @@ int rb_proc_arity(VALUE);
VALUE rb_proc_lambda_p(VALUE);
VALUE rb_binding_new(void);
VALUE rb_obj_method(VALUE, VALUE);
-VALUE rb_obj_is_method(VALUE);
VALUE rb_method_call(int, VALUE*, VALUE);
-VALUE rb_method_call_with_block(int, VALUE *, 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 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);
-DEPRECATED(void rb_thread_polling(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_create(VALUE (*)(ANYARGS), void*);
-DEPRECATED(int rb_thread_select(int, fd_set *, fd_set *, fd_set *, struct timeval *));
+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);
@@ -426,7 +349,6 @@ 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);
VALUE rb_exec_recursive_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
-VALUE rb_exec_recursive_paired_outer(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE,VALUE);
/* dir.c */
VALUE rb_dir_getwd(void);
/* file.c */
@@ -435,15 +357,24 @@ VALUE rb_file_expand_path(VALUE, VALUE);
VALUE rb_file_s_absolute_path(int, VALUE *);
VALUE rb_file_absolute_path(VALUE, VALUE);
VALUE rb_file_dirname(VALUE fname);
+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);
VALUE rb_str_encode_ospath(VALUE);
int rb_is_absolute_path(const char *);
/* 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*);
@@ -459,10 +390,9 @@ void rb_gc_call_finalizer_at_exit(void);
VALUE rb_gc_enable(void);
VALUE rb_gc_disable(void);
VALUE rb_gc_start(void);
-void rb_gc_set_params(void);
+#define Init_stack(addr) ruby_init_stack(addr)
/* hash.c */
void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
-VALUE rb_check_hash_type(VALUE);
void rb_hash_foreach(VALUE, int (*)(ANYARGS), VALUE);
VALUE rb_hash(VALUE);
VALUE rb_hash_new(void);
@@ -473,11 +403,8 @@ 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_clear(VALUE);
VALUE rb_hash_delete_if(VALUE);
VALUE rb_hash_delete(VALUE,VALUE);
-typedef VALUE rb_hash_update_func(VALUE newkey, VALUE oldkey, VALUE value);
-VALUE rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func);
struct st_table *rb_hash_tbl(VALUE);
int rb_path_check(const char*);
int rb_env_path_tainted(void);
@@ -512,26 +439,17 @@ 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);
-int rb_reserved_fd_p(int fd);
-int rb_cloexec_open(const char *pathname, int flags, mode_t mode);
-int rb_cloexec_dup(int oldfd);
-int rb_cloexec_dup2(int oldfd, int newfd);
-int rb_cloexec_pipe(int fildes[2]);
-int rb_cloexec_fcntl_dupfd(int fd, int minfd);
-#define RB_RESERVED_FD_P(fd) rb_reserved_fd_p(fd)
-void rb_update_max_fd(int fd);
-void rb_fd_fix_cloexec(int fd);
/* 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 */
-NORETURN(void rb_num_zerodiv(void));
+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_num_coerce_bit(VALUE, VALUE, ID);
+VALUE rb_float_new(double);
VALUE rb_num2fix(VALUE);
VALUE rb_fix2str(VALUE, int);
VALUE rb_dbl_cmp(double, double);
@@ -557,35 +475,31 @@ VALUE rb_obj_id(VALUE);
VALUE rb_obj_class(VALUE);
VALUE rb_class_real(VALUE);
VALUE rb_class_inherited_p(VALUE, VALUE);
-VALUE rb_class_superclass(VALUE);
-VALUE rb_class_get_superclass(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_check_to_int(VALUE);
VALUE rb_Integer(VALUE);
VALUE rb_to_float(VALUE);
VALUE rb_Float(VALUE);
VALUE rb_String(VALUE);
VALUE rb_Array(VALUE);
-VALUE rb_Hash(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_global_id(ID);
int rb_is_instance_id(ID);
-int rb_is_attrset_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);
@@ -595,19 +509,23 @@ VALUE rb_sym_all_symbols(void);
void rb_last_status_set(int status, rb_pid_t pid);
VALUE rb_last_status_get(void);
struct rb_exec_arg {
- VALUE execarg_obj;
+ int argc;
+ VALUE *argv;
+ const char *prog;
+ VALUE options;
+ VALUE redirect_fds;
};
-DEPRECATED(int rb_proc_exec_n(int, VALUE*, const char*));
+int rb_proc_exec_n(int, VALUE*, const char*);
int rb_proc_exec(const char*);
-DEPRECATED(VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e));
-DEPRECATED(int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val));
-DEPRECATED(void rb_exec_arg_fixup(struct rb_exec_arg *e));
-DEPRECATED(int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s));
-DEPRECATED(int rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char*, size_t));
-DEPRECATED(int rb_exec(const struct rb_exec_arg*));
-DEPRECATED(int rb_exec_err(const struct rb_exec_arg*, char*, size_t));
-DEPRECATED(rb_pid_t rb_fork(int*, int (*)(void*), void*, VALUE));
-DEPRECATED(rb_pid_t rb_fork_err(int*, int (*)(void*, char*, size_t), void*, VALUE, char*, size_t));
+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);
@@ -627,8 +545,6 @@ 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);
-unsigned long rb_random_ulong_limited(VALUE rnd, unsigned long limit);
-unsigned long rb_genrand_ulong_limited(unsigned long i);
/* re.c */
#define rb_memcmp memcmp
int rb_memcicmp(const void*,const void*,long);
@@ -653,12 +569,20 @@ int rb_reg_options(VALUE);
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);
@@ -704,9 +628,7 @@ 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);
-void rb_must_asciicompat(VALUE);
VALUE rb_str_dup(VALUE);
-VALUE rb_str_resurrect(VALUE str);
VALUE rb_str_locktmp(VALUE);
VALUE rb_str_unlocktmp(VALUE);
VALUE rb_str_dup_frozen(VALUE);
@@ -717,7 +639,6 @@ 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);
-void rb_str_modify_expand(VALUE, long);
VALUE rb_str_freeze(VALUE);
void rb_str_set_len(VALUE, long);
VALUE rb_str_resize(VALUE, long);
@@ -730,8 +651,8 @@ st_index_t rb_hash_start(st_index_t);
st_index_t rb_hash_uint32(st_index_t, uint32_t);
st_index_t rb_hash_uint(st_index_t, st_index_t);
st_index_t rb_hash_end(st_index_t);
-#define rb_hash_uint32(h, i) st_hash_uint32((h), (i))
-#define rb_hash_uint(h, i) st_hash_uint((h), (i))
+#define rb_hash_uint32(h, i) st_hash_uint32(h, i)
+#define rb_hash_uint(h, i) st_hash_uint(h, i)
#define rb_hash_end(h) st_hash_end(h)
st_index_t rb_str_hash(VALUE);
int rb_str_hash_cmp(VALUE,VALUE);
@@ -753,62 +674,61 @@ long rb_str_strlen(VALUE);
VALUE rb_str_length(VALUE);
long rb_str_offset(VALUE, long);
size_t rb_str_capacity(VALUE);
-VALUE rb_str_ellipsize(VALUE, long);
-#if defined(__GNUC__) && !defined(__PCC__)
+#if defined __GNUC__
#define rb_str_new_cstr(str) __extension__ ( \
{ \
(__builtin_constant_p(str)) ? \
- rb_str_new((str), (long)strlen(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(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(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(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(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)) : \
+ 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)); \
+ 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)); \
+ 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)); \
+ rb_exc_new(klass, ptr, (long)strlen(ptr)) : \
+ rb_exc_new2(klass, ptr); \
})
#endif
#define rb_str_new2 rb_str_new_cstr
@@ -836,10 +756,8 @@ 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);
-
-/* Use rb_thread_call_without_gvl family instead. */
-DEPRECATED(VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1,
- rb_unblock_function_t *ubf, void *data2));
+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);
@@ -849,13 +767,14 @@ 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);
-struct timeval rb_time_interval(VALUE num);
-struct timeval rb_time_timeval(VALUE time);
-struct timespec rb_time_timespec(VALUE time);
/* variable.c */
VALUE rb_mod_name(VALUE);
VALUE rb_class_path(VALUE);
@@ -868,12 +787,15 @@ 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);
@@ -905,23 +827,17 @@ 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(int, VALUE*, 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);
-VALUE rb_make_backtrace(void);
-VALUE rb_make_exception(int, VALUE*);
-
-/* deprecated */
-DEPRECATED(void rb_frame_pop(void));
-
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
#if defined(__cplusplus)
#if 0
diff --git a/include/ruby/io.h b/include/ruby/io.h
index b5ea2e9c95..f0f83fc329 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -27,39 +27,6 @@ extern "C" {
#include <stdio_ext.h>
#endif
-#include "ruby/config.h"
-#if defined(HAVE_POLL)
-# ifdef _AIX
-# define reqevents events
-# define rtnevents revents
-# endif
-# include <poll.h>
-# ifdef _AIX
-# undef reqevents
-# undef rtnevents
-# undef events
-# undef revents
-# endif
-# define RB_WAITFD_IN POLLIN
-# define RB_WAITFD_PRI POLLPRI
-# define RB_WAITFD_OUT POLLOUT
-#else
-# define RB_WAITFD_IN 0x001
-# define RB_WAITFD_PRI 0x002
-# define RB_WAITFD_OUT 0x004
-#endif
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-typedef struct {
- char *ptr; /* off + len <= capa */
- int off;
- int len;
- int capa;
-} rb_io_buffer_t;
-
typedef struct rb_io_t {
int fd; /* file descriptor */
FILE *stdio_file; /* stdio ptr for read/write if available */
@@ -69,7 +36,15 @@ typedef struct rb_io_t {
VALUE pathv; /* pathname for file */
void (*finalize)(struct rb_io_t*,int); /* finalize proc */
- rb_io_buffer_t wbuf, rbuf;
+ 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;
@@ -87,7 +62,10 @@ typedef struct rb_io_t {
} encs;
rb_econv_t *readconv;
- rb_io_buffer_t cbuf;
+ char *cbuf; /* cbuf_off + cbuf_len <= cbuf_capa */
+ int cbuf_off;
+ int cbuf_len;
+ int cbuf_capa;
rb_econv_t *writeconv;
VALUE writeconv_asciicompat;
@@ -119,48 +97,45 @@ typedef struct rb_io_t {
#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
-#define RB_IO_BUFFER_INIT(buf) do {\
- (buf).ptr = NULL;\
- (buf).off = 0;\
- (buf).len = 0;\
- (buf).capa = 0;\
-} while (0)
-
#define MakeOpenFile(obj, fp) do {\
if (RFILE(obj)->fptr) {\
rb_io_close(obj);\
rb_io_fptr_finalize(RFILE(obj)->fptr);\
RFILE(obj)->fptr = 0;\
}\
- (fp) = 0;\
- RB_IO_FPTR_NEW(fp);\
- RFILE(obj)->fptr = (fp);\
-} while (0)
-
-#define RB_IO_FPTR_NEW(fp) do {\
- (fp) = 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;\
- RB_IO_BUFFER_INIT((fp)->wbuf);\
- RB_IO_BUFFER_INIT((fp)->rbuf);\
- RB_IO_BUFFER_INIT((fp)->cbuf);\
- (fp)->readconv = NULL;\
- (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;\
+ 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);
@@ -171,22 +146,13 @@ 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*);
-void rb_io_check_char_readable(rb_io_t *fptr);
-void rb_io_check_byte_readable(rb_io_t *fptr);
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*);
-VALUE rb_io_get_io(VALUE io);
-VALUE rb_io_check_io(VALUE io);
-VALUE rb_io_get_write_io(VALUE io);
-VALUE rb_io_set_write_io(VALUE io, VALUE w);
int rb_io_wait_readable(int);
int rb_io_wait_writable(int);
-int rb_wait_for_single_fd(int fd, int events, struct timeval *tv);
void rb_io_set_nonblock(rb_io_t *fptr);
-int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p);
-ssize_t rb_io_bufwrite(VALUE io, const void *buf, size_t size);
/* compatibility for ruby 1.8 and older */
#define rb_io_mode_flags(modestr) rb_io_modestr_fmode(modestr)
@@ -199,10 +165,6 @@ void rb_io_read_check(rb_io_t*);
int rb_io_read_pending(rb_io_t*);
DEPRECATED(void rb_read_check(FILE*));
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 9b502cd3d8..62d65b0aff 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -18,28 +18,18 @@ extern "C" {
#endif
#endif
-#include "ruby/config.h"
-#include <stddef.h>
-#include <math.h> /* for INFINITY and NAN */
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-#if !defined(HAVE_STRUCT_TIMEVAL) || !defined(HAVE_STRUCT_TIMESPEC)
-#if defined(HAVE_TIME_H)
-# include <time.h>
-#endif
#if defined(HAVE_SYS_TIME_H)
-# include <sys/time.h>
-#endif
-#endif
-
-#if !defined(HAVE_STRUCT_TIMEVAL)
+# include <sys/time.h>
+#elif !defined(_WIN32)
+# define time_t long
struct timeval {
time_t tv_sec; /* seconds */
long tv_usec; /* microseconds */
};
-#endif /* HAVE_STRUCT_TIMEVAL */
+#endif
+#if defined(HAVE_SYS_TYPES_H)
+# include <sys/types.h>
+#endif
#if !defined(HAVE_STRUCT_TIMESPEC)
struct timespec {
@@ -55,17 +45,10 @@ struct timezone {
};
#endif
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
#ifndef RUBY_EXTERN
#define RUBY_EXTERN extern
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
#ifndef HAVE_ACOSH
RUBY_EXTERN double acosh(double);
RUBY_EXTERN double asinh(double);
@@ -84,10 +67,6 @@ RUBY_EXTERN int dup2(int, int);
RUBY_EXTERN int eaccess(const char*, int);
#endif
-#ifndef HAVE_ROUND
-RUBY_EXTERN double round(double); /* numeric.c */
-#endif
-
#ifndef HAVE_FINITE
RUBY_EXTERN int finite(double);
#endif
@@ -123,35 +102,9 @@ RUBY_EXTERN double lgamma_r(double, int *);
RUBY_EXTERN double cbrt(double);
#endif
-#if !defined(INFINITY) || !defined(NAN)
-union bytesequence4_or_float {
- unsigned char bytesequence[4];
- float float_value;
-};
-#endif
-
-#ifdef INFINITY
-# define HAVE_INFINITY
-#else
-/** @internal */
-RUBY_EXTERN const union bytesequence4_or_float rb_infinity;
-# define INFINITY (rb_infinity.float_value)
-#endif
-
-#ifdef NAN
-# define HAVE_NAN
-#else
-/** @internal */
-RUBY_EXTERN const union bytesequence4_or_float rb_nan;
-# define NAN (rb_nan.float_value)
-#endif
-
#ifndef isinf
# ifndef HAVE_ISINF
# if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
-# ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-# endif
# define isinf(x) (!finite(x) && !isnan(x))
# else
RUBY_EXTERN int isinf(double);
@@ -225,14 +178,6 @@ RUBY_EXTERN int ruby_shutdown(int, int);
RUBY_EXTERN int ruby_close(int);
#endif
-#ifndef HAVE_SETPROCTITLE
-RUBY_EXTERN void setproctitle(const char *fmt, ...);
-#endif
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
index cdc4382596..41628ed4af 100644
--- a/include/ruby/oniguruma.h
+++ b/include/ruby/oniguruma.h
@@ -1,11 +1,10 @@
#ifndef ONIGURUMA_H
#define ONIGURUMA_H
/**********************************************************************
- oniguruma.h - Onigmo (Oniguruma-mod) (regular expression library)
+ oniguruma.h - Oniguruma (regular expression library)
**********************************************************************/
/*-
- * Copyright (c) 2002-2009 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2013 K.Takata <kentkt AT csc DOT jp>
+ * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,8 +38,8 @@ extern "C" {
#define ONIGURUMA
#define ONIGURUMA_VERSION_MAJOR 5
-#define ONIGURUMA_VERSION_MINOR 13
-#define ONIGURUMA_VERSION_TEENY 5
+#define ONIGURUMA_VERSION_MINOR 9
+#define ONIGURUMA_VERSION_TEENY 2
#ifdef __cplusplus
# ifndef HAVE_PROTOTYPES
@@ -98,12 +97,6 @@ extern "C" {
#define ONIG_EXTERN extern
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-#include <stddef.h> /* for size_t */
-
/* PART: character encoding */
#ifndef ONIG_ESCAPE_UCHAR_COLLISION
@@ -111,10 +104,9 @@ extern "C" {
#endif
typedef unsigned char OnigUChar;
-typedef unsigned int OnigCodePoint;
+typedef unsigned int OnigCodePoint;
typedef unsigned int OnigCtype;
typedef size_t OnigDistance;
-typedef ptrdiff_t OnigPosition;
#define ONIG_INFINITE_DISTANCE ~((OnigDistance )0)
@@ -175,7 +167,6 @@ typedef struct OnigEncodingTypeST {
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;
- unsigned int flags;
} OnigEncodingType;
typedef OnigEncodingType* OnigEncoding;
@@ -209,12 +200,17 @@ ONIG_EXTERN OnigEncodingType OnigEncodingASCII;
#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)
-/* flags */
-#define ONIGENC_FLAG_NONE 0U
-#define ONIGENC_FLAG_UNICODE 1U
-#define onig_enc_len(enc,p,e) ONIGENC_MBC_ENC_LEN(enc, p, e)
+#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)
@@ -223,10 +219,6 @@ ONIG_EXTERN OnigEncodingType OnigEncodingASCII;
#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_IS_MBC_ASCII_WORD(enc,s,end) \
- onigenc_ascii_is_code_ctype( \
- ONIGENC_MBC_TO_CODE(enc,s,end),ONIGENC_CTYPE_WORD,enc)
-#define ONIGENC_IS_UNICODE(enc) ((enc)->flags & ONIGENC_FLAG_UNICODE)
#define ONIGENC_NAME(enc) ((enc)->name)
@@ -340,7 +332,6 @@ int onigenc_str_bytelen_null P_((OnigEncoding enc, const OnigUChar* p));
/* config parameters */
#define ONIG_NREGION 10
#define ONIG_MAX_BACKREF_NUM 1000
-#define ONIG_MAX_CAPTURE_GROUP_NUM 32767
#define ONIG_MAX_REPEAT_NUM 100000
#define ONIG_MAX_MULTI_BYTE_RANGES_NUM 10000
/* constants */
@@ -355,7 +346,6 @@ typedef unsigned int OnigOptionType;
#define ONIG_OPTION_IGNORECASE 1U
#define ONIG_OPTION_EXTEND (ONIG_OPTION_IGNORECASE << 1)
#define ONIG_OPTION_MULTILINE (ONIG_OPTION_EXTEND << 1)
-#define ONIG_OPTION_DOTALL ONIG_OPTION_MULTILINE
#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)
@@ -366,13 +356,7 @@ typedef unsigned int OnigOptionType;
#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)
-/* options (ctype range) */
-#define ONIG_OPTION_ASCII_RANGE (ONIG_OPTION_POSIX_REGION << 1)
-#define ONIG_OPTION_POSIX_BRACKET_ALL_RANGE (ONIG_OPTION_ASCII_RANGE << 1)
-#define ONIG_OPTION_WORD_BOUND_ALL_RANGE (ONIG_OPTION_POSIX_BRACKET_ALL_RANGE << 1)
-/* options (newline) */
-#define ONIG_OPTION_NEWLINE_CRLF (ONIG_OPTION_WORD_BOUND_ALL_RANGE << 1)
-#define ONIG_OPTION_MAXBIT ONIG_OPTION_NEWLINE_CRLF /* limit */
+#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))
@@ -394,11 +378,9 @@ ONIG_EXTERN const OnigSyntaxType OnigSyntaxEmacs;
ONIG_EXTERN const OnigSyntaxType OnigSyntaxGrep;
ONIG_EXTERN const OnigSyntaxType OnigSyntaxGnuRegex;
ONIG_EXTERN const OnigSyntaxType OnigSyntaxJava;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl58;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl58_NG;
ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl_NG;
ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPython;
/* predefined syntaxes (see regsyntax.c) */
#define ONIG_SYNTAX_ASIS (&OnigSyntaxASIS)
@@ -408,11 +390,9 @@ ONIG_EXTERN const OnigSyntaxType OnigSyntaxPython;
#define ONIG_SYNTAX_GREP (&OnigSyntaxGrep)
#define ONIG_SYNTAX_GNU_REGEX (&OnigSyntaxGnuRegex)
#define ONIG_SYNTAX_JAVA (&OnigSyntaxJava)
-#define ONIG_SYNTAX_PERL58 (&OnigSyntaxPerl58)
-#define ONIG_SYNTAX_PERL58_NG (&OnigSyntaxPerl58_NG)
#define ONIG_SYNTAX_PERL (&OnigSyntaxPerl)
+#define ONIG_SYNTAX_PERL_NG (&OnigSyntaxPerl_NG)
#define ONIG_SYNTAX_RUBY (&OnigSyntaxRuby)
-#define ONIG_SYNTAX_PYTHON (&OnigSyntaxPython)
/* default syntax */
ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
@@ -450,12 +430,11 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#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_OP_ESC_O_BRACE_OCTAL (1U<<31) /* \o{OOO} */ /* NOTIMPL */
#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) /* (?imsxadlu), (?-imsx), (?^imsxalu) */
-#define ONIG_SYN_OP2_OPTION_RUBY (1U<<3) /* (?imxadu), (?-imx) */
+#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) /* [...&&..[..]..] */
@@ -473,17 +452,6 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
/* #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) /* \ */
-#define ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK (1U<<21) /* \R as (?>\x0D\x0A|[\x0A-\x0D\x{85}\x{2028}\x{2029}]) */
-#define ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER (1U<<22) /* \X as (?>\P{M}\p{M}*) */
-#define ONIG_SYN_OP2_ESC_V_VERTICAL_WHITESPACE (1U<<23) /* \v, \V -- Perl */ /* NOTIMPL */
-#define ONIG_SYN_OP2_ESC_H_HORIZONTAL_WHITESPACE (1U<<24) /* \h, \H -- Perl */ /* NOTIMPL */
-#define ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP (1U<<25) /* \K */
-#define ONIG_SYN_OP2_ESC_G_BRACE_BACKREF (1U<<26) /* \g{name}, \g{n} */
-#define ONIG_SYN_OP2_QMARK_SUBEXP_CALL (1U<<27) /* (?&name), (?n), (?R), (?0) */
-#define ONIG_SYN_OP2_QMARK_VBAR_BRANCH_RESET (1U<<28) /* (?|...) */ /* NOTIMPL */
-#define ONIG_SYN_OP2_QMARK_LPAREN_CONDITION (1U<<29) /* (?(cond)yes...|no...) */
-#define ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP (1U<<30) /* (?P<name>...), (?P=name), (?P>name) -- Python/PCRE */
-#define ONIG_SYN_OP2_OPTION_JAVA (1U<<31) /* (?idmsux), (?-idmsux) */ /* NOTIMPL */
/* syntax (behavior) */
#define ONIG_SYN_CONTEXT_INDEP_ANCHORS (1U<<31) /* not implemented */
@@ -497,7 +465,6 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#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})? */
-#define ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL (1U<<10) /* (?<x>)(?<x>)(?&x) */
/* syntax (behavior) in char class [...] */
#define ONIG_SYN_NOT_NEWLINE_IN_NEGATIVE_CC (1U<<20) /* [^...] */
@@ -534,7 +501,7 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#define ONIGERR_UNDEFINED_BYTECODE -13
#define ONIGERR_UNEXPECTED_BYTECODE -14
#define ONIGERR_MATCH_STACK_LIMIT_OVER -15
-#define ONIGERR_DEFAULT_ENCODING_IS_NOT_SET -21
+#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
@@ -561,7 +528,6 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#define ONIGERR_INVALID_POSIX_BRACKET_TYPE -121
#define ONIGERR_INVALID_LOOK_BEHIND_PATTERN -122
#define ONIGERR_INVALID_REPEAT_RANGE_PATTERN -123
-#define ONIGERR_INVALID_CONDITION_PATTERN -124
/* values error (syntax error) */
#define ONIGERR_TOO_BIG_NUMBER -200
#define ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE -201
@@ -573,7 +539,6 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#define ONIGERR_TOO_BIG_BACKREF_NUMBER -207
#define ONIGERR_INVALID_BACKREF -208
#define ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED -209
-#define ONIGERR_TOO_SHORT_DIGITS -210
#define ONIGERR_TOO_LONG_WIDE_CHAR_VALUE -212
#define ONIGERR_EMPTY_GROUP_NAME -214
#define ONIGERR_INVALID_GROUP_NAME -215
@@ -585,7 +550,6 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
#define ONIGERR_NEVER_ENDING_RECURSION -221
#define ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY -222
#define ONIGERR_INVALID_CHAR_PROPERTY_NAME -223
-#define ONIGERR_TOO_MANY_CAPTURE_GROUPS -224
#define ONIGERR_INVALID_CODE_POINT_VALUE -400
#define ONIGERR_INVALID_WIDE_CHAR_VALUE -400
#define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE -401
@@ -603,8 +567,8 @@ ONIG_EXTERN const OnigSyntaxType* OnigDefaultSyntax;
typedef struct OnigCaptureTreeNodeStruct {
int group; /* group number */
- OnigPosition beg;
- OnigPosition end;
+ int beg;
+ int end;
int allocated;
int num_childs;
struct OnigCaptureTreeNodeStruct** childs;
@@ -614,8 +578,8 @@ typedef struct OnigCaptureTreeNodeStruct {
struct re_registers {
int allocated;
int num_regs;
- OnigPosition* beg;
- OnigPosition* end;
+ int* beg;
+ int* end;
/* extended */
OnigCaptureTreeNode* history_root; /* capture history tree root */
};
@@ -721,7 +685,7 @@ typedef struct {
ONIG_EXTERN
int onig_init P_((void));
ONIG_EXTERN
-int onig_error_code_to_str PV_((OnigUChar* s, OnigPosition err_code, ...));
+int onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));
ONIG_EXTERN
void onig_set_warn_func P_((OnigWarnFunc f));
ONIG_EXTERN
@@ -729,7 +693,7 @@ 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_reg_init P_((OnigRegex reg, OnigOptionType option, OnigCaseFoldType case_fold_flag, OnigEncoding enc, const OnigSyntaxType* syntax));
+int onig_reg_init P_((regex_t* reg, OnigOptionType option, OnigCaseFoldType case_fold_flag, OnigEncoding enc, const OnigSyntaxType* syntax));
ONIG_EXTERN
int onig_new_without_alloc P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax, OnigErrorInfo* einfo));
ONIG_EXTERN
@@ -743,11 +707,9 @@ int onig_recompile P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pat
ONIG_EXTERN
int onig_recompile_deluxe P_((OnigRegex reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
ONIG_EXTERN
-OnigPosition onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
+long onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
ONIG_EXTERN
-OnigPosition onig_search_gpos P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* global_pos, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-OnigPosition onig_match P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option));
+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
@@ -777,7 +739,7 @@ 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,OnigPosition,OnigPosition,int,int,void*), void* arg));
+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
@@ -827,10 +789,6 @@ const char* onig_version P_((void));
ONIG_EXTERN
const char* onig_copyright P_((void));
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#ifdef __cplusplus
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/re.h b/include/ruby/re.h
index 4039ba1800..c60ab96016 100644
--- a/include/ruby/re.h
+++ b/include/ruby/re.h
@@ -24,10 +24,6 @@ extern "C" {
#include "ruby/regex.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
typedef struct re_pattern_buffer Regexp;
struct rmatch_offset {
@@ -59,11 +55,6 @@ 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);
-regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
#if defined(__cplusplus)
#if 0
diff --git a/include/ruby/regex.h b/include/ruby/regex.h
index aeb6418d0a..a63e2f6a4c 100644
--- a/include/ruby/regex.h
+++ b/include/ruby/regex.h
@@ -24,10 +24,6 @@ extern "C" {
#include "oniguruma.h"
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
#ifndef ONIG_RUBY_M17N
ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
@@ -36,10 +32,6 @@ ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
#endif /* ifndef ONIG_RUBY_M17N */
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 833bd2d8de..0294b08363 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -21,10 +21,12 @@ extern "C" {
#endif
#endif
+#ifndef RUBY_LIB_PREFIX
#include "ruby/config.h"
#ifdef RUBY_EXTCONF_H
#include RUBY_EXTCONF_H
#endif
+#endif
#define NORETURN_STYLE_NEW 1
#ifndef NORETURN
@@ -36,9 +38,6 @@ extern "C" {
#ifndef NOINLINE
# define NOINLINE(x) x
#endif
-#ifndef UNREACHABLE
-# define UNREACHABLE /* unreachable */
-#endif
#ifdef __GNUC__
#define PRINTF_ARGS(decl, string_index, first_to_check) \
@@ -47,6 +46,10 @@ extern "C" {
#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
@@ -65,34 +68,18 @@ extern "C" {
#endif
#include <stdarg.h>
+#include <stddef.h>
#include <stdio.h>
#include "defines.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-/* Make alloca work the best possible way. */
-#ifdef __GNUC__
-# ifndef atarist
-# ifndef alloca
-# define alloca __builtin_alloca
-# endif
-# endif /* atarist */
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
#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__ */
+# endif
+#endif
#if defined HAVE_UINTPTR_T && 0
typedef uintptr_t VALUE;
@@ -112,9 +99,9 @@ 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 PRI_LL_PREFIX
+# define PRI_VALUE_PREFIX "ll"
#else
-# error ---->> ruby requires sizeof(void*) == sizeof(long) or sizeof(LONG_LONG) to be compiled. <<----
+# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
#endif
typedef char ruby_check_sizeof_int[SIZEOF_INT == sizeof(int) ? 1 : -1];
@@ -124,27 +111,20 @@ typedef char ruby_check_sizeof_long_long[SIZEOF_LONG_LONG == sizeof(LONG_LONG) ?
#endif
typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
-#ifndef PRI_INT_PREFIX
-#define PRI_INT_PREFIX ""
-#endif
-#ifndef PRI_LONG_PREFIX
-#define PRI_LONG_PREFIX "l"
-#endif
-
#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
-#define PRIsVALUE PRIiPTR
#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"
-#define PRIsVALUE PRI_VALUE_PREFIX"i"
#endif
#ifndef PRI_VALUE_PREFIX
# define PRI_VALUE_PREFIX ""
@@ -156,17 +136,18 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
# elif SIZEOF_TIME_T == SIZEOF_LONG
# define PRI_TIMET_PREFIX "l"
# elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
-# define PRI_TIMET_PREFIX PRI_LL_PREFIX
+# define PRI_TIMET_PREFIX "ll"
# endif
#endif
-#if defined PRI_PTRDIFF_PREFIX
+#if defined PRIdPTR
+# define PRI_PTRDIFF_PREFIX "t"
#elif SIZEOF_PTRDIFF_T == SIZEOF_INT
-# define PRI_PTRDIFF_PREFIX ""
+# 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 PRI_LL_PREFIX
+# define PRI_PTRDIFF_PREFIX "ll"
#endif
#define PRIdPTRDIFF PRI_PTRDIFF_PREFIX"d"
#define PRIiPTRDIFF PRI_PTRDIFF_PREFIX"i"
@@ -175,13 +156,14 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
#define PRIxPTRDIFF PRI_PTRDIFF_PREFIX"x"
#define PRIXPTRDIFF PRI_PTRDIFF_PREFIX"X"
-#if defined PRI_SIZE_PREFIX
+#if defined PRIdPTR
+# define PRI_SIZE_PREFIX "z"
#elif SIZEOF_SIZE_T == SIZEOF_INT
-# define PRI_SIZE_PREFIX ""
+# 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 PRI_LL_PREFIX
+# define PRI_SIZE_PREFIX "ll"
#endif
#define PRIdSIZE PRI_SIZE_PREFIX"d"
#define PRIiSIZE PRI_SIZE_PREFIX"i"
@@ -311,16 +293,15 @@ 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(n) __extension__ ({long i2l_n = (n); rb_long2int_internal(i2l_n, i2l_i); i2l_i;})
+#else
static inline int
-rb_long2int_inline(long n)
-{
- int i = (int)n;
- if ((long)i != n)
- rb_out_of_int(n);
-
- return i;
-}
-#define rb_long2int(n) rb_long2int_inline(n)
+rb_long2int(long n) {rb_long2int_internal(n, i); return i;}
+#endif
#else
#define rb_long2int(n) ((int)(n))
#endif
@@ -343,16 +324,10 @@ rb_long2int_inline(long n)
#ifndef NUM2GIDT
#define NUM2GIDT(v) NUM2LONG(v)
#endif
-#ifndef NUM2MODET
-#define NUM2MODET(v) NUM2INT(v)
-#endif
-#ifndef MODET2NUM
-#define MODET2NUM(v) INT2NUM(v)
-#endif
-#define FIX2LONG(x) (long)RSHIFT((SIGNED_VALUE)(x),1)
+#define FIX2LONG(x) RSHIFT((SIGNED_VALUE)x,1)
#define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
-#define FIXNUM_P(f) (((int)(SIGNED_VALUE)(f))&FIXNUM_FLAG)
+#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))
@@ -363,59 +338,11 @@ rb_long2int_inline(long n)
#define ID2SYM(x) (((VALUE)(x)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
#define SYM2ID(x) RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT)
-#ifndef USE_FLONUM
-#if SIZEOF_VALUE >= SIZEOF_DOUBLE
-#define USE_FLONUM 1
-#else
-#define USE_FLONUM 0
-#endif
-#endif
-
-#if USE_FLONUM
-#define FLONUM_P(x) ((((int)(SIGNED_VALUE)(x))&FLONUM_MASK) == FLONUM_FLAG)
-#else
-#define FLONUM_P(x) 0
-#endif
-
/* Module#methods, #singleton_methods and so on return Symbols */
#define USE_SYMBOL_AS_METHOD_NAME 1
-/*
-!USE_FLONUM
--------------------------
-...xxxx xxx1 Fixnum
-...0000 1110 Symbol
-...0000 0000 Qfalse
-...0000 0010 Qtrue
-...0000 0100 Qnil
-...0000 0110 Qundef
-
-USE_FLONUM
--------------------------
-...xxxx xxx1 Fixnum
-...xxxx xx10 Flonum
-...0000 1100 Symbol
-...0000 0000 Qfalse 0x00 = 0
-...0000 1000 Qnil 0x08 = 8
-...0001 0100 Qtrue 0x14 = 20
-...0011 0100 Qundef 0x34 = 52
- */
-
/* special constants - i.e. non-zero and non-fixnum constants */
enum ruby_special_consts {
-#if USE_FLONUM
- RUBY_Qfalse = 0x00,
- RUBY_Qtrue = 0x14,
- RUBY_Qnil = 0x08,
- RUBY_Qundef = 0x34,
-
- RUBY_IMMEDIATE_MASK = 0x07,
- RUBY_FIXNUM_FLAG = 0x01,
- RUBY_FLONUM_MASK = 0x03,
- RUBY_FLONUM_FLAG = 0x02,
- RUBY_SYMBOL_FLAG = 0x0c,
- RUBY_SPECIAL_SHIFT = 8
-#else
RUBY_Qfalse = 0,
RUBY_Qtrue = 2,
RUBY_Qnil = 4,
@@ -423,11 +350,8 @@ enum ruby_special_consts {
RUBY_IMMEDIATE_MASK = 0x03,
RUBY_FIXNUM_FLAG = 0x01,
- RUBY_FLONUM_MASK = 0x00, /* any values ANDed with FLONUM_MASK cannot be FLONUM_FLAG */
- RUBY_FLONUM_FLAG = 0x02,
RUBY_SYMBOL_FLAG = 0x0e,
RUBY_SPECIAL_SHIFT = 8
-#endif
};
#define Qfalse ((VALUE)RUBY_Qfalse)
@@ -436,14 +360,10 @@ enum ruby_special_consts {
#define Qundef ((VALUE)RUBY_Qundef) /* undefined value for placeholder */
#define IMMEDIATE_MASK RUBY_IMMEDIATE_MASK
#define FIXNUM_FLAG RUBY_FIXNUM_FLAG
-#if USE_FLONUM
-#define FLONUM_MASK RUBY_FLONUM_MASK
-#define FLONUM_FLAG RUBY_FLONUM_FLAG
-#endif
#define SYMBOL_FLAG RUBY_SYMBOL_FLAG
-#define RTEST(v) !(((VALUE)(v) & ~Qnil) == 0)
-#define NIL_P(v) !((VALUE)(v) != Qnil)
+#define RTEST(v) (((VALUE)(v) & ~Qnil) != 0)
+#define NIL_P(v) ((VALUE)(v) == Qnil)
#define CLASS_OF(v) rb_class_of((VALUE)(v))
@@ -512,8 +432,6 @@ enum ruby_value_type {
static inline int rb_type(VALUE obj);
#define TYPE(x) rb_type((VALUE)(x))
-/* RB_GC_GUARD_PTR() is an intermediate macro, and has no effect by
- * itself. don't use it directly */
#ifdef __GNUC__
#define RB_GC_GUARD_PTR(ptr) \
__extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;})
@@ -529,14 +447,8 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
#endif
#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v)))
-#ifdef __GNUC__
-#define RB_UNUSED_VAR(x) x __attribute__ ((unused))
-#else
-#define RB_UNUSED_VAR(x) x
-#endif
-
void rb_check_type(VALUE,int);
-#define Check_Type(v,t) rb_check_type((VALUE)(v),(t))
+#define Check_Type(v,t) rb_check_type((VALUE)(v),t)
VALUE rb_str_to_str(VALUE);
VALUE rb_string_value(volatile VALUE*);
@@ -581,80 +493,59 @@ 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
-rb_num2long_inline(VALUE x)
-{
- if (FIXNUM_P(x))
- return FIX2LONG(x);
- else
- return (long)rb_num2long(x);
-}
-#define NUM2LONG(x) rb_num2long_inline(x)
-static inline unsigned long
-rb_num2ulong_inline(VALUE x)
+NUM2LONG(VALUE x)
{
- if (FIXNUM_P(x))
- return (unsigned long)FIX2LONG(x);
- else
- return (unsigned long)rb_num2ulong(x);
+ return NUM2LONG_internal(x);
}
-#define NUM2ULONG(x) rb_num2ulong_inline(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)))
-
+#define FIX2INT(x) ((int)rb_fix2int((VALUE)x))
+#define NUM2INT_internal(x) (FIXNUM_P(x) ? FIX2INT(x) : (int)rb_num2int(x))
+#ifdef __GNUC__
+#define NUM2INT(x) \
+ __extension__ ({VALUE num2int_x = (x); NUM2INT_internal(num2int_x);})
+#else
static inline int
-rb_num2int_inline(VALUE x)
+NUM2INT(VALUE x)
{
- if (FIXNUM_P(x))
- return FIX2INT(x);
- else
- return (int)rb_num2int(x);
+ return NUM2INT_internal(x);
}
-#define NUM2INT(x) rb_num2int_inline(x)
-
+#endif
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 /* SIZEOF_INT < SIZEOF_LONG */
+#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 /* SIZEOF_INT < SIZEOF_LONG */
-
-short rb_num2short(VALUE);
-unsigned short rb_num2ushort(VALUE);
-short rb_fix2short(VALUE);
-unsigned short rb_fix2ushort(VALUE);
-#define FIX2SHORT(x) (rb_fix2short((VALUE)(x)))
-static inline short
-rb_num2short_inline(VALUE x)
-{
- if (FIXNUM_P(x))
- return FIX2SHORT(x);
- else
- return rb_num2short(x);
-}
-
-#define NUM2SHORT(x) rb_num2short_inline(x)
-#define NUM2USHORT(x) rb_num2ushort(x)
+#endif
#ifdef HAVE_LONG_LONG
LONG_LONG rb_num2ll(VALUE);
unsigned LONG_LONG rb_num2ull(VALUE);
+# define NUM2LL_internal(x) (FIXNUM_P(x) ? FIX2LONG(x) : rb_num2ll(x))
+# ifdef __GNUC__
+# define NUM2LL(x) \
+ __extension__ ({VALUE num2ll_x = (x); NUM2LL_internal(num2ll_x);})
+# else
static inline LONG_LONG
-rb_num2ll_inline(VALUE x)
+NUM2LL(VALUE x)
{
- if (FIXNUM_P(x))
- return FIX2LONG(x);
- else
- return rb_num2ll(x);
+ return NUM2LL_internal(x);
}
-# define NUM2LL(x) rb_num2ll_inline(x)
-# define NUM2ULL(x) rb_num2ull(x)
+# endif
+# define NUM2ULL(x) rb_num2ull((VALUE)x)
#endif
#if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
@@ -665,7 +556,7 @@ rb_num2ll_inline(VALUE x)
#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
-# define NUM2SSIZET(x) ((ssize_t)NUM2LL(x))
+# define NUM2SSIZET(x) ((size_t)NUM2LL(x))
#else
# define NUM2SIZET(x) NUM2ULONG(x)
# define NUM2SSIZET(x) NUM2LONG(x)
@@ -678,32 +569,26 @@ VALUE rb_uint2big(VALUE);
VALUE rb_int2big(SIGNED_VALUE);
VALUE rb_newobj(void);
-VALUE rb_newobj_of(VALUE, VALUE);
-#define NEWOBJ(obj,type) type *(obj) = (type*)rb_newobj()
-#define NEWOBJ_OF(obj,type,klass,flags) type *(obj) = (type*)rb_newobj_of(klass, flags)
+#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);\
+ 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));\
+ 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));\
+ 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;
-}
-#ifdef __GNUC__
- __attribute__((aligned(sizeof(VALUE))))
-#endif
-;
+};
#define ROBJECT_EMBED_LEN_MAX 3
struct RObject {
@@ -732,7 +617,10 @@ struct RObject {
ROBJECT(o)->as.heap.iv_index_tbl)
/** @internal */
-typedef struct rb_classext_struct rb_classext_t;
+typedef struct {
+ VALUE super;
+ struct st_table *iv_tbl;
+} rb_classext_t;
struct RClass {
struct RBasic basic;
@@ -740,100 +628,19 @@ struct RClass {
struct st_table *m_tbl;
struct st_table *iv_index_tbl;
};
-#define RCLASS_SUPER(c) rb_class_get_superclass(c)
+#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_CONST_TBL(m) RCLASS_CONST_TBL(m)
#define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
#define RMODULE_SUPER(m) RCLASS_SUPER(m)
-#define RMODULE_IS_OVERLAID FL_USER2
-#define RMODULE_IS_REFINEMENT FL_USER3
-#define RMODULE_INCLUDED_INTO_REFINEMENT FL_USER4
struct RFloat {
struct RBasic basic;
double float_value;
};
-
-VALUE rb_float_new_in_heap(double);
-
-#if USE_FLONUM
-#define RUBY_BIT_ROTL(v, n) (((v) << (n)) | ((v) >> ((sizeof(v) * 8) - n)))
-#define RUBY_BIT_ROTR(v, n) (((v) >> (n)) | ((v) << ((sizeof(v) * 8) - n)))
-
-static inline double
-rb_float_value(VALUE v)
-{
- if (FLONUM_P(v)) {
- if (v != (VALUE)0x8000000000000002) { /* LIKELY */
- union {
- double d;
- VALUE v;
- } t;
-
- VALUE b63 = (v >> 63);
- /* e: xx1... -> 011... */
- /* xx0... -> 100... */
- /* ^b63 */
- t.v = RUBY_BIT_ROTR((2 - b63) | (v & ~0x03), 3);
- return t.d;
- }
- else {
- return 0.0;
- }
- }
- else {
- return ((struct RFloat *)v)->float_value;
- }
-}
-
-static inline VALUE
-rb_float_new(double d)
-{
- union {
- double d;
- VALUE v;
- } t;
- int bits;
-
- t.d = d;
- bits = (int)((VALUE)(t.v >> 60) & 0x7);
- /* bits contains 3 bits of b62..b60. */
- /* bits - 3 = */
- /* b011 -> b000 */
- /* b100 -> b001 */
-
- if (t.v != 0x3000000000000000 /* 1.72723e-77 */ &&
- !((bits-3) & ~0x01)) {
- return (RUBY_BIT_ROTL(t.v, 3) & ~(VALUE)0x01) | 0x02;
- }
- else {
- if (t.v == (VALUE)0) {
- /* +0.0 */
- return 0x8000000000000002;
- }
- else {
- /* out of range */
- return rb_float_new_in_heap(d);
- }
- }
-}
-
-#else /* USE_FLONUM */
-
-static inline double
-rb_float_value(VALUE v)
-{
- return ((struct RFloat *)v)->float_value;
-}
-
-static inline VALUE
-rb_float_new(double d)
-{
- return rb_float_new_in_heap(d);
-}
-#endif
-
-#define RFLOAT_VALUE(v) rb_float_value(v)
+#define RFLOAT_VALUE(v) (RFLOAT(v)->float_value)
#define DBL2NUM(dbl) rb_float_new(dbl)
#define ELTS_SHARED FL_USER2
@@ -856,12 +663,10 @@ struct RString {
#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_EMBED_LEN(str) \
- (long)((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
- (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT))
#define RSTRING_LEN(str) \
(!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
- RSTRING_EMBED_LEN(str) : \
+ (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) ? \
@@ -869,13 +674,11 @@ struct RString {
RSTRING(str)->as.heap.ptr)
#define RSTRING_END(str) \
(!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
- (RSTRING(str)->as.ary + RSTRING_EMBED_LEN(str)) : \
+ (RSTRING(str)->as.ary + \
+ ((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
+ (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT))) : \
(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len))
#define RSTRING_LENINT(str) rb_long2int(RSTRING_LEN(str))
-#define RSTRING_GETMEM(str, ptrvar, lenvar) \
- (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
- ((ptrvar) = RSTRING(str)->as.ary, (lenvar) = RSTRING_EMBED_LEN(str)) : \
- ((ptrvar) = RSTRING(str)->as.heap.ptr, (lenvar) = RSTRING(str)->as.heap.len))
#define RARRAY_EMBED_LEN_MAX 3
struct RArray {
@@ -955,25 +758,16 @@ struct RData {
void *data;
};
-typedef struct rb_data_type_struct rb_data_type_t;
-
-struct rb_data_type_struct {
+typedef struct rb_data_type_struct {
const char *wrap_struct_name;
- struct {
- void (*dmark)(void*);
- void (*dfree)(void*);
- size_t (*dsize)(const void *);
- void *reserved[2]; /* For future extension.
- This array *must* be filled with ZERO. */
- } function;
- const rb_data_type_t *parent;
+ void (*dmark)(void*);
+ void (*dfree)(void*);
+ size_t (*dsize)(const void *);
+ void *reserved[3]; /* For future extension.
+ This array *must* be filled with ZERO. */
void *data; /* This area can be used for any purpose
by a programmer who define the type. */
-};
-
-#define HAVE_TYPE_RB_DATA_TYPE_T 1
-#define HAVE_RB_DATA_TYPE_T_FUNCTION 1
-#define HAVE_RB_DATA_TYPE_T_PARENT 1
+} rb_data_type_t;
struct RTypedData {
struct RBasic basic;
@@ -989,46 +783,45 @@ struct RTypedData {
#define RTYPEDDATA_DATA(v) (RTYPEDDATA(v)->data)
/*
-#define RUBY_DATA_FUNC(func) ((void (*)(void*))(func))
+#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_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent);
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 Check_TypedStruct(v,t) rb_check_typeddata((VALUE)(v),t)
#define RUBY_DEFAULT_FREE ((RUBY_DATA_FUNC)-1)
#define RUBY_NEVER_FREE ((RUBY_DATA_FUNC)0)
#define RUBY_TYPED_DEFAULT_FREE RUBY_DEFAULT_FREE
#define RUBY_TYPED_NEVER_FREE RUBY_NEVER_FREE
#define Data_Wrap_Struct(klass,mark,free,sval)\
- rb_data_object_alloc((klass),(sval),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free))
+ 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))\
+ 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))
+ 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))\
+ 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);\
+ 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)); \
+ sval = (type*)rb_check_typeddata(obj, data_type); \
} while (0)
#define RSTRUCT_EMBED_LEN_MAX 3
@@ -1109,8 +902,8 @@ struct RBignum {
#define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
#define FL_SINGLETON FL_USER0
-#define FL_RESERVED1 (((VALUE)1)<<5)
-#define FL_RESERVED2 (((VALUE)1)<<6) /* will be used in the future GC */
+#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)
@@ -1144,8 +937,8 @@ struct RBignum {
#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_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)
@@ -1154,89 +947,78 @@ struct RBignum {
#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_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_ABLE(x)?(RBASIC(x)->flags&(FL_FREEZE)):(FIXNUM_P(x)||FLONUM_P(x))))
+#define OBJ_FROZEN(x) (!!FL_TEST((x), FL_FREEZE))
#define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
#if SIZEOF_INT < SIZEOF_LONG
# define INT2NUM(v) INT2FIX((int)(v))
# define UINT2NUM(v) LONG2FIX((unsigned int)(v))
#else
+# define INT2NUM_internal(v) (FIXABLE(v) ? INT2FIX(v) : rb_int2big(v))
+# ifdef __GNUC__
+# define INT2NUM(v) __extension__ ({int int2num_v = (v); INT2NUM_internal(int2num_v);})
+# else
static inline VALUE
-rb_int2num_inline(int v)
+INT2NUM(int v)
{
- if (FIXABLE(v))
- return INT2FIX(v);
- else
- return rb_int2big(v);
+ return INT2NUM_internal(v);
}
-#define INT2NUM(x) rb_int2num_inline(x)
+# endif
+# define UINT2NUM_internal(v) (POSFIXABLE(v) ? LONG2FIX(v) : rb_uint2big(v))
+# ifdef __GNUC__
+# define UINT2NUM(v) __extension__ ({unsigned int uint2num_v = (v); UINT2NUM_internal(uint2num_v);})
+# else
static inline VALUE
-rb_uint2num_inline(unsigned int v)
+UINT2NUM(unsigned int v)
{
- if (POSFIXABLE(v))
- return LONG2FIX(v);
- else
- return rb_uint2big(v);
+ return UINT2NUM_internal(v);
}
-#define UINT2NUM(x) rb_uint2num_inline(x)
+# endif
#endif
+#define LONG2NUM_internal(v) (FIXABLE(v) ? LONG2FIX(v) : rb_int2big(v))
+#ifdef __GNUC__
+# define LONG2NUM(v) __extension__ ({long long2num_v = (v); LONG2NUM_internal(long2num_v);})
+#else
static inline VALUE
-rb_long2num_inline(long v)
+LONG2NUM(long v)
{
- if (FIXABLE(v))
- return LONG2FIX(v);
- else
- return rb_int2big(v);
+ return LONG2NUM_internal(v);
}
-#define LONG2NUM(x) rb_long2num_inline(x)
+#endif
+#define ULONG2NUM_internal(v) (POSFIXABLE(v) ? LONG2FIX(v) : rb_uint2big(v))
+#ifdef __GNUC__
+# define ULONG2NUM(v) __extension__ ({unsigned long ulong2num_v = (v); ULONG2NUM_internal(ulong2num_v);})
+#else
static inline VALUE
-rb_ulong2num_inline(unsigned long v)
+ULONG2NUM(unsigned long v)
{
- if (POSFIXABLE(v))
- return LONG2FIX(v);
- else
- return rb_uint2big(v);
+ return ULONG2NUM_internal(v);
}
-#define ULONG2NUM(x) rb_ulong2num_inline(x)
+#endif
+#define NUM2CHR_internal(x) (((TYPE(x) == T_STRING)&&(RSTRING_LEN(x)>=1))?\
+ RSTRING_PTR(x)[0]:(char)(NUM2INT(x)&0xff))
+#ifdef __GNUC__
+# define NUM2CHR(x) __extension__ ({VALUE num2chr_x = (x); NUM2CHR_internal(num2chr_x);})
+#else
static inline char
-rb_num2char_inline(VALUE x)
+NUM2CHR(VALUE x)
{
- if ((TYPE(x) == T_STRING) && (RSTRING_LEN(x)>=1))
- return RSTRING_PTR(x)[0];
- else
- return (char)(NUM2INT(x) & 0xff);
+ return NUM2CHR_internal(x);
}
-#define NUM2CHR(x) rb_num2char_inline(x)
-
+#endif
#define CHR2FIX(x) INT2FIX((long)((x)&0xff))
-#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 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)))
-
-void *rb_alloc_tmp_buffer(volatile VALUE *store, long len);
-void rb_free_tmp_buffer(volatile VALUE *store);
-/* allocates _n_ bytes temporary buffer and stores VALUE including it
- * in _v_. _n_ may be evaluated twice. */
-#ifdef C_ALLOCA
-# define ALLOCV(v, n) rb_alloc_tmp_buffer(&(v), (n))
-#else
-# define ALLOCV(v, n) ((n) < 1024 ? (RB_GC_GUARD(v) = 0, alloca(n)) : rb_alloc_tmp_buffer(&(v), (n)))
-#endif
-#define ALLOCV_N(type, v, n) ((type*)ALLOCV((v), sizeof(type)*(n)))
-#define ALLOCV_END(v) rb_free_tmp_buffer(&(v))
+#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))
@@ -1257,7 +1039,6 @@ VALUE rb_define_module_under(VALUE, const char*);
void rb_include_module(VALUE,VALUE);
void rb_extend_object(VALUE,VALUE);
-void rb_prepend_module(VALUE,VALUE);
struct rb_global_variable;
@@ -1286,7 +1067,7 @@ 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))
+#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);
@@ -1304,7 +1085,6 @@ ID rb_intern(const char*);
ID rb_intern2(const char*, long);
ID rb_intern_str(VALUE str);
const char *rb_id2name(ID);
-ID rb_check_id(volatile VALUE *);
ID rb_to_id(VALUE);
VALUE rb_id2str(ID);
@@ -1312,24 +1092,24 @@ VALUE rb_id2str(ID);
{ \
static ID rb_intern_id_cache; \
if (!rb_intern_id_cache) \
- rb_intern_id_cache = rb_intern2((str), (long)strlen(str)); \
+ rb_intern_id_cache = rb_intern2(str, (long)strlen(str)); \
result rb_intern_id_cache; \
}
#define CONST_ID(var, str) \
- do CONST_ID_CACHE((var) =, (str)) while (0)
+ 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((ID), (str))) : \
+ __extension__ (CONST_ID_CACHE((ID), str)) : \
rb_intern(str))
#define rb_intern_const(str) \
(__builtin_constant_p(str) ? \
- __extension__ (rb_intern2((str), (long)strlen(str))) : \
+ __extension__ (rb_intern2(str, (long)strlen(str))) : \
(rb_intern)(str))
#else
-#define rb_intern_const(str) rb_intern2((str), (long)strlen(str))
+#define rb_intern_const(str) rb_intern2(str, (long)strlen(str))
#endif
const char *rb_class2name(VALUE);
@@ -1343,14 +1123,9 @@ 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*);
-VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
-VALUE rb_funcall_with_block(VALUE, ID, int, const VALUE*, VALUE);
int rb_scan_args(int, const VALUE*, const char*, ...);
VALUE rb_call_super(int, const VALUE*);
-/* rb_scan_args() format allows ':' for optional hash */
-#define HAVE_RB_SCAN_ARGS_OPTIONAL_HASH 1
-
VALUE rb_gv_set(const char*, VALUE);
VALUE rb_gv_get(const char*);
VALUE rb_iv_get(VALUE, const char*);
@@ -1368,19 +1143,10 @@ PRINTF_ARGS(NORETURN(void rb_fatal(const char*, ...)), 1, 2);
PRINTF_ARGS(NORETURN(void rb_bug(const char*, ...)), 1, 2);
NORETURN(void rb_bug_errno(const char*, int));
NORETURN(void rb_sys_fail(const char*));
-NORETURN(void rb_sys_fail_str(VALUE));
NORETURN(void rb_mod_sys_fail(VALUE, const char*));
-NORETURN(void rb_mod_sys_fail_str(VALUE, VALUE));
NORETURN(void rb_iter_break(void));
-NORETURN(void rb_iter_break_value(VALUE));
NORETURN(void rb_exit(int));
NORETURN(void rb_notimplement(void));
-VALUE rb_syserr_new(int, const char *);
-VALUE rb_syserr_new_str(int n, VALUE arg);
-NORETURN(void rb_syserr_fail(int, const char*));
-NORETURN(void rb_syserr_fail_str(int, VALUE));
-NORETURN(void rb_mod_syserr_fail(VALUE, int, const char*));
-NORETURN(void rb_mod_syserr_fail_str(VALUE, int, VALUE));
/* reports if `-W' specified */
PRINTF_ARGS(void rb_warning(const char*, ...), 1, 2);
@@ -1411,6 +1177,20 @@ 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 *);
+int ruby_exec_node(void *);
+
RUBY_EXTERN VALUE rb_mKernel;
RUBY_EXTERN VALUE rb_mComparable;
RUBY_EXTERN VALUE rb_mEnumerable;
@@ -1504,7 +1284,6 @@ rb_class_of(VALUE obj)
{
if (IMMEDIATE_P(obj)) {
if (FIXNUM_P(obj)) return rb_cFixnum;
- if (FLONUM_P(obj)) return rb_cFloat;
if (obj == Qtrue) return rb_cTrueClass;
if (SYMBOL_P(obj)) return rb_cSymbol;
}
@@ -1520,20 +1299,17 @@ rb_type(VALUE obj)
{
if (IMMEDIATE_P(obj)) {
if (FIXNUM_P(obj)) return T_FIXNUM;
- if (FLONUM_P(obj)) return T_FLOAT;
- if (obj == Qtrue) return T_TRUE;
+ 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 == Qnil) return T_NIL;
if (obj == Qfalse) return T_FALSE;
}
return BUILTIN_TYPE(obj);
}
-#define RB_FLOAT_TYPE_P(obj) (FLONUM_P(obj) || (!SPECIAL_CONST_P(obj) && BUILTIN_TYPE(obj) == T_FLOAT))
-
#define RB_TYPE_P(obj, type) ( \
((type) == T_FIXNUM) ? FIXNUM_P(obj) : \
((type) == T_TRUE) ? ((obj) == Qtrue) : \
@@ -1541,12 +1317,11 @@ rb_type(VALUE obj)
((type) == T_NIL) ? ((obj) == Qnil) : \
((type) == T_UNDEF) ? ((obj) == Qundef) : \
((type) == T_SYMBOL) ? SYMBOL_P(obj) : \
- ((type) == T_FLOAT) ? RB_FLOAT_TYPE_P(obj) : \
(!SPECIAL_CONST_P(obj) && BUILTIN_TYPE(obj) == (type)))
#ifdef __GNUC__
#define rb_type_p(obj, type) \
- __extension__ (__builtin_constant_p(type) ? RB_TYPE_P((obj), (type)) : \
+ __extension__ (__builtin_constant_p(type) ? RB_TYPE_P(obj, type) : \
rb_type(obj) == (type))
#else
#define rb_type_p(obj, type) (rb_type(obj) == (type))
@@ -1572,11 +1347,18 @@ rb_special_const_p(VALUE obj)
static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
#endif
+#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
+#define RUBY_GLOBAL_SETUP /* use linker option to link startup code with ObjC support */
+#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);
-/* traditional set_trace_func events */
#define RUBY_EVENT_NONE 0x0000
#define RUBY_EVENT_LINE 0x0001
#define RUBY_EVENT_CLASS 0x0002
@@ -1586,25 +1368,24 @@ int ruby_native_thread_p(void);
#define RUBY_EVENT_C_CALL 0x0020
#define RUBY_EVENT_C_RETURN 0x0040
#define RUBY_EVENT_RAISE 0x0080
-#define RUBY_EVENT_ALL 0x00ff
-
-/* for TracePoint extended events */
-#define RUBY_EVENT_B_CALL 0x0100
-#define RUBY_EVENT_B_RETURN 0x0200
-#define RUBY_EVENT_THREAD_BEGIN 0x0400
-#define RUBY_EVENT_THREAD_END 0x0800
-#define RUBY_EVENT_TRACEPOINT_ALL 0xFFFF
+#define RUBY_EVENT_ALL 0xffff
+#define RUBY_EVENT_VM 0x10000
+#define RUBY_EVENT_SWITCH 0x20000
+#define RUBY_EVENT_COVERAGE 0x40000
-/* special events */
-#define RUBY_EVENT_SPECIFIED_LINE 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 unsigned long rb_event_flag_t;
-typedef void (*rb_event_hook_func_t)(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, 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);
+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 */
@@ -1642,89 +1423,30 @@ int rb_toupper(int 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)))
+#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)))
+#define STRTOUL(str, endptr, base) (ruby_strtoul(str, endptr, base))
#define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();}
-PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4);
+int ruby_snprintf(char *str, size_t n, char const *fmt, ...);
int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-
-#ifndef RUBY_DONT_SUBST
-#include "ruby/subst.h"
-#endif
-
-/**
- * @defgroup embed CRuby Embedding APIs
- * CRuby interpreter APIs. These are APIs to embed MRI interpreter into your
- * program.
- * These functions are not a part of Ruby extention library API.
- * Extension libraries of Ruby should not depend on these functions.
- * @{
- */
-
-/** @defgroup ruby1 ruby(1) implementation
- * A part of the implementation of ruby(1) command.
- * Other programs that embed Ruby interpreter do not always need to use these
- * functions.
- * @{
- */
-
-void ruby_sysinit(int *argc, char ***argv);
-void ruby_init(void);
-void* ruby_options(int argc, char** argv);
-int ruby_executable_node(void *n, int *status);
-int ruby_run_node(void *n);
-
-/* version.c */
-void ruby_show_version(void);
-void ruby_show_copyright(void);
-
-
-/*! A convenience macro to call ruby_init_stack(). Must be placed just after
- * variable declarations */
-#define RUBY_INIT_STACK \
- VALUE variable_in_this_stack_frame; \
- ruby_init_stack(&variable_in_this_stack_frame);
-/*! @} */
-
-#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 Init_stack(addr) ruby_init_stack(addr)
-
-int ruby_setup(void);
-int ruby_cleanup(volatile int);
-
-void ruby_finalize(void);
-NORETURN(void ruby_stop(int));
-
-void ruby_set_stack_size(size_t);
-int ruby_stack_check(void);
-size_t ruby_stack_length(VALUE**);
-
-int ruby_exec_node(void *n);
-
-void ruby_script(const char* name);
-void ruby_set_script_name(VALUE name);
-
-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*);
-void ruby_sig_finalize(void);
-
-/*! @} */
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
+#undef snprintf
+#undef vsnprintf
+#define snprintf ruby_snprintf
+#define vsnprintf ruby_vsnprintf
+
+#ifdef BROKEN_CLOSE
+#undef getpeername
+#define getpeername ruby_getpeername
+#undef getsockname
+#define getsockname ruby_getsockname
+#undef shutdown
+#define shutdown ruby_shutdown
+#undef close
+#define close ruby_close
#endif
#if defined(__cplusplus)
diff --git a/include/ruby/st.h b/include/ruby/st.h
index c2294a92c1..27e47b816c 100644
--- a/include/ruby/st.h
+++ b/include/ruby/st.h
@@ -12,7 +12,13 @@ extern "C" {
#endif
#endif
+#ifndef RUBY_LIB_PREFIX
+#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>
@@ -27,16 +33,12 @@ extern "C" {
# include <inttypes.h>
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#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) or sizeof(LONG_LONG) to be compiled. <<----
+# error ---->> st.c requires sizeof(void*) == sizeof(long) to be compiled. <<----
#endif
#define ST_DATA_T_DEFINED
@@ -79,31 +81,14 @@ struct st_table {
st_index_t num_bins;
unsigned int entries_packed : 1;
#ifdef __GNUC__
- /*
- * C spec says,
- * A bit-field shall have a type that is a qualified or unqualified
- * version of _Bool, signed int, unsigned int, or some other
- * implementation-defined type. It is implementation-defined whether
- * atomic types are permitted.
- * In short, long and long long bit-field are implementation-defined
- * feature. Therefore we want to supress a warning explicitly.
- */
__extension__
#endif
st_index_t num_entries : ST_INDEX_BITS - 1;
- union {
- struct {
- struct st_table_entry **bins;
- struct st_table_entry *head, *tail;
- } big;
- struct {
- struct st_packed_entry *entries;
- st_index_t real_entries;
- } packed;
- } as;
+ 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)
+#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};
@@ -121,10 +106,7 @@ 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 *);
-typedef int st_update_callback_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing);
-int st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg);
int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-int st_foreach_check(st_table *, int (*)(ANYARGS), st_data_t, 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 *);
@@ -143,10 +125,6 @@ st_index_t st_hash_end(st_index_t h);
st_index_t st_hash_start(st_index_t h);
#define st_hash_start(h) ((st_index_t)(h))
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/subst.h b/include/ruby/subst.h
deleted file mode 100644
index 1f0e6db5a4..0000000000
--- a/include/ruby/subst.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef RUBY_SUBST_H
-#define RUBY_SUBST_H 1
-
-#undef snprintf
-#undef vsnprintf
-#define snprintf ruby_snprintf
-#define vsnprintf ruby_vsnprintf
-
-#ifdef BROKEN_CLOSE
-#undef getpeername
-#define getpeername ruby_getpeername
-#undef getsockname
-#define getsockname ruby_getsockname
-#undef shutdown
-#define shutdown ruby_shutdown
-#undef close
-#define close ruby_close
-#endif
-#endif
diff --git a/include/ruby/thread.h b/include/ruby/thread.h
deleted file mode 100644
index fb9057c70f..0000000000
--- a/include/ruby/thread.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**********************************************************************
-
- thread.h -
-
- $Author: matz $
- created at: Tue Jul 10 17:35:43 JST 2012
-
- Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_THREAD_H
-#define RUBY_THREAD_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include "ruby/intern.h"
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
-
-void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
- rb_unblock_function_t *ubf, void *data2);
-void *rb_thread_call_without_gvl2(void *(*func)(void *), void *data1,
- rb_unblock_function_t *ubf, void *data2);
-
-#define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_AFTER 0x01
-#define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_THREAD_H */
diff --git a/include/ruby/util.h b/include/ruby/util.h
index 02aa643916..0c1e1c4ebc 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -19,11 +19,6 @@ extern "C" {
#endif
#endif
-#include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
#ifndef _
#ifdef __cplusplus
# ifndef HAVE_PROTOTYPES
@@ -45,15 +40,15 @@ extern "C" {
#endif
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
-#define scan_oct(s,l,e) ((int)ruby_scan_oct((s),(l),(e)))
+#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)))
+#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 *);
@@ -61,8 +56,8 @@ 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)
+#define setenv(name,val) ruby_setenv(name,val)
+#define unsetenv(name,val) ruby_unsetenv(name);
char *ruby_strdup(const char *);
#undef strdup
@@ -73,7 +68,7 @@ char *ruby_getcwd(void);
double ruby_strtod(const char *, char **);
#undef strtod
-#define strtod(s,e) ruby_strtod((s),(e))
+#define strtod(s,e) ruby_strtod(s,e)
#if defined _MSC_VER && _MSC_VER >= 1300
#pragma warning(push)
@@ -85,10 +80,6 @@ double ruby_strtod(const char *, char **);
void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/version.h b/include/ruby/version.h
index b41b64fe66..32b09b3f52 100644
--- a/include/ruby/version.h
+++ b/include/ruby/version.h
@@ -29,12 +29,6 @@
#define RUBY_BIRTH_MONTH 2
#define RUBY_BIRTH_DAY 24
-/* API version */
-#define RUBY_API_VERSION_MAJOR 2
-#define RUBY_API_VERSION_MINOR 0
-#define RUBY_API_VERSION_TEENY 0
-#define RUBY_API_VERSION_CODE (RUBY_API_VERSION_MAJOR*10000+RUBY_API_VERSION_MINOR*100+RUBY_API_VERSION_TEENY)
-
#ifdef RUBY_EXTERN
#if defined(__cplusplus)
extern "C" {
@@ -42,11 +36,6 @@ extern "C" {
} /* satisfy cc-mode */
#endif
#endif
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
/*
* Interfaces from extension libraries.
*
@@ -54,7 +43,6 @@ extern "C" {
* necessary or not, and if the answer was yes, think twice a week
* later again.
*/
-RUBY_EXTERN const int ruby_api_version[3];
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];
RUBY_EXTERN const char ruby_platform[];
@@ -62,11 +50,6 @@ 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 __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/vm.h b/include/ruby/vm.h
index 1146bf5426..ac8e599e90 100644
--- a/include/ruby/vm.h
+++ b/include/ruby/vm.h
@@ -19,10 +19,6 @@ extern "C" {
#endif
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
/* Place holder.
*
* We will prepare VM creation/control APIs on 1.9.2 or later.
@@ -36,28 +32,6 @@ typedef struct rb_vm_struct ruby_vm_t;
/* core API */
int ruby_vm_destruct(ruby_vm_t *vm);
-/**
- * ruby_vm_at_exit registers a function _func_ to be invoked when a VM
- * passed away. Functions registered this way runs in reverse order
- * of registration, just like END {} block does. The difference is
- * its timing to be triggered. ruby_vm_at_exit functions runs when a
- * VM _passed_ _away_, while END {} blocks runs just _before_ a VM
- * _is_ _passing_ _away_.
- *
- * You cannot register a function to another VM than where you are in.
- * So where to register is intuitive, omitted. OTOH the argument
- * _func_ cannot know which VM it is in because at the time of
- * invocation, the VM has already died and there is no execution
- * context. The VM itself is passed as the first argument to it.
- *
- * @param[in] func the function to register.
- */
-void ruby_vm_at_exit(void(*func)(ruby_vm_t *));
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#if defined(__cplusplus)
#if 0
{ /* satisfy cc-mode */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index a190355a9c..79eb6a19df 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -8,10 +8,6 @@ extern "C" {
#endif
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
/*
* Copyright (c) 1993, Intergraph Corporation
*
@@ -20,23 +16,20 @@ extern "C" {
*
*/
-/*
- * Definitions for NT port of Perl
- */
+//
+// Definitions for NT port of Perl
+//
-/*
- * Ok now we can include the normal include files.
- */
+//
+// Ok now we can include the normal include files.
+//
-/* #include <stdarg.h> conflict with varargs.h? */
+// #include <stdarg.h> conflict with varargs.h?
#if !defined(WSAAPI)
#if defined(__cplusplus) && defined(_MSC_VER)
extern "C++" { /* template without extern "C++" */
#endif
-#if !defined(_WIN64) && !defined(WIN32)
-#define WIN32
-#endif
#include <winsock2.h>
#include <ws2tcpip.h>
#if defined(__cplusplus) && defined(_MSC_VER)
@@ -44,10 +37,12 @@ extern "C++" { /* template without extern "C++" */
#endif
#endif
-/*
- * We're not using Microsoft's "extensions" to C for
- * Structured Exception Handling (SEH) so we can nuke these
- */
+#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
@@ -103,8 +98,14 @@ typedef unsigned int uintptr_t;
# include <unistd.h>
#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
@@ -118,7 +119,6 @@ typedef unsigned int uintptr_t;
#undef fputchar
#undef utime
#undef lseek
-#undef stat
#undef fstat
#define getc(_stream) rb_w32_getc(_stream)
#define getchar() rb_w32_getc(stdin)
@@ -142,7 +142,6 @@ typedef unsigned int uintptr_t;
#define getppid() rb_w32_getppid()
#define sleep(x) rb_w32_Sleep((x)*1000)
#define Sleep(msec) (void)rb_w32_Sleep(msec)
-#define fstati64(fd,st) rb_w32_fstati64(fd,st)
#ifdef __BORLANDC__
#define creat(p, m) _creat(p, m)
#define eof() _eof()
@@ -151,6 +150,7 @@ typedef unsigned int uintptr_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
@@ -177,17 +177,16 @@ typedef unsigned int uintptr_t;
#if SIZEOF_OFF_T == 8
#define off_t __int64
#define stat stati64
-#define fstat(fd,st) fstati64(fd,st)
+#define fstat(fd,st) _fstati64(fd,st)
#if defined(__BORLANDC__)
#define stati64(path, st) rb_w32_stati64(path, st)
#elif !defined(_MSC_VER) || RT_VER < 80
#define stati64 _stati64
-#ifndef _stati64
#define _stati64(path, st) rb_w32_stati64(path, st)
-#endif
#else
#define stati64 _stat64
#define _stat64(path, st) rb_w32_stati64(path, st)
+#define _fstati64 _fstat64
#endif
#else
#define stat(path,st) rb_w32_stat(path,st)
@@ -222,11 +221,11 @@ struct msghdr {
int msg_flags;
};
-extern DWORD rb_w32_osid(void);
+#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_io_cancelable_p(int);
+extern int rb_w32_has_cancel_io(void);
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);
@@ -259,15 +258,12 @@ 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_ugetenv(const char *);
extern char * rb_w32_getenv(const char *);
extern int rb_w32_rename(const char *, const char *);
extern int rb_w32_urename(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 const char *WSAAPI rb_w32_inet_ntop(int,const void *,char *,size_t);
-extern DWORD rb_w32_osver(void);
extern int chown(const char *, int, int);
extern int rb_w32_uchown(const char *, int, int);
@@ -277,7 +273,6 @@ 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 rb_pid_t rb_w32_aspawn_flags(int, const char *, char *const *, DWORD);
extern int kill(int, int);
extern int fcntl(int, int, ...);
extern rb_pid_t rb_w32_getpid(void);
@@ -297,10 +292,9 @@ extern int rb_w32_stati64(const char *, struct stati64 *);
extern int rb_w32_ustati64(const char *, struct stati64 *);
extern int rb_w32_access(const char *, int);
extern int rb_w32_uaccess(const char *, int);
-extern char rb_w32_fd_is_text(int);
-extern int rb_w32_fstati64(int, 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 *);
@@ -308,20 +302,6 @@ extern FILE *rb_w32_fsopen(const char *, const char *, int);
#endif
#include <float.h>
-
-#if defined _MSC_VER && _MSC_VER >= 1800 && defined INFINITY
-#pragma warning(push)
-#pragma warning(disable:4756)
-static inline float
-rb_infinity_float(void)
-{
- return INFINITY;
-}
-#pragma warning(pop)
-#undef INFINITY
-#define INFINITY rb_infinity_float()
-#endif
-
#if !defined __MINGW32__ || defined __NO_ISOCEXT
#ifndef isnan
#define isnan(x) _isnan(x)
@@ -388,9 +368,9 @@ scalb(double a, long b)
#define S_IXOTH 0001
#endif
-/*
- * define this so we can do inplace editing
- */
+//
+// define this so we can do inplace editing
+//
#define SUFFIX
@@ -431,9 +411,9 @@ extern int rb_w32_fseeko(FILE *stream, off_t offset, int whence);
#define ftello rb_w32_ftello
#endif
-/*
- * stubs
- */
+//
+// stubs
+//
extern int ioctl (int, int, ...);
extern rb_uid_t getuid (void);
extern rb_uid_t geteuid (void);
@@ -578,35 +558,11 @@ extern char *rb_w32_strerror(int);
# define EREMOTE WSAEREMOTE
#endif
-#define F_DUPFD 0
-#if 0
-#define F_GETFD 1
-#define F_SETFD 2
-#define F_GETFL 3
-#endif
-#define F_SETFL 4
-#if 0
-#define FD_CLOEXEC 1 /* F_GETFD, F_SETFD */
-#endif
+#define F_SETFL 1
#define O_NONBLOCK 1
#undef FD_SET
-#define FD_SET(fd, set) do {\
- unsigned int i;\
- SOCKET s = _get_osfhandle(fd);\
-\
- for (i = 0; i < (set)->fd_count; i++) {\
- if ((set)->fd_array[i] == s) {\
- break;\
- }\
- }\
- if (i == (set)->fd_count) {\
- if ((set)->fd_count < FD_SETSIZE) {\
- (set)->fd_array[i] = s;\
- (set)->fd_count++;\
- }\
- }\
-} while(0)
+#define FD_SET(f, s) rb_w32_fdset(f, s)
#undef FD_CLR
#define FD_CLR(f, s) rb_w32_fdclr(f, s)
@@ -615,9 +571,6 @@ extern char *rb_w32_strerror(int);
#define FD_ISSET(f, s) rb_w32_fdisset(f, s)
#ifdef RUBY_EXPORT
-#undef inet_ntop
-#define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l)
-
#undef accept
#define accept(s, a, l) rb_w32_accept(s, a, l)
@@ -715,10 +668,8 @@ struct tms {
int rb_w32_times(struct tms *);
-struct tm *gmtime_r(const time_t *, struct tm *);
-struct tm *localtime_r(const time_t *, struct tm *);
-
/* thread stuff */
+HANDLE GetCurrentThreadHandle(void);
int rb_w32_sleep(unsigned long msec);
int rb_w32_putc(int, FILE*);
int rb_w32_getc(FILE*);
@@ -728,16 +679,13 @@ int rb_w32_wopen(const WCHAR *, int, ...);
int rb_w32_close(int);
int rb_w32_fclose(FILE*);
int rb_w32_pipe(int[2]);
-ssize_t rb_w32_read(int, void *, size_t);
-ssize_t rb_w32_write(int, const void *, size_t);
+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 rb_w32_uutime(const char *, const struct utimbuf *);
-long rb_w32_write_console(uintptr_t, int); /* use uintptr_t instead of VALUE because it's not defined yet here */
+long rb_w32_write_console(unsigned long, int);
int WINAPI rb_w32_Sleep(unsigned long msec);
int rb_w32_wait_events_blocking(HANDLE *events, int num, DWORD timeout);
-int rb_w32_time_subtract(struct timeval *rest, const struct timeval *wait);
-int rb_w32_wrap_io_handle(HANDLE, int);
-int rb_w32_unwrap_io_handle(int);
/*
== ***CAUTION***
@@ -749,25 +697,17 @@ 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 __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#ifdef __MINGW_ATTRIB_PURE
-/* License: Ruby's */
/* get rid of bugs in math.h of mingw */
#define frexp(_X, _Y) __extension__ ({\
- int intpart_frexp_bug = intpart_frexp_bug;\
- double result_frexp_bug = frexp((_X), &intpart_frexp_bug);\
- *(_Y) = intpart_frexp_bug;\
- result_frexp_bug;\
+ int *intptr_frexp_bug = (_Y);\
+ *intptr_frexp_bug = *intptr_frexp_bug;\
+ frexp((_X), intptr_frexp_bug);\
})
-/* License: Ruby's */
#define modf(_X, _Y) __extension__ ({\
- double intpart_modf_bug = intpart_modf_bug;\
- double result_modf_bug = modf((_X), &intpart_modf_bug);\
- *(_Y) = intpart_modf_bug;\
- result_modf_bug;\
+ double *intptr_modf_bug = (_Y);\
+ *intptr_modf_bug = *intptr_modf_bug;\
+ modf((_X), intptr_modf_bug);\
})
#endif
@@ -778,36 +718,4 @@ uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc
} /* extern "C" { */
#endif
-#if defined(__MINGW64__)
-/*
- * Use powl() instead of broken pow() of x86_64-w64-mingw32.
- * This workaround will fix test failures in test_bignum.rb,
- * test_fixnum.rb and test_float.rb etc.
- */
-static inline double
-rb_w32_pow(double x, double y)
-{
- return powl(x, y);
-}
-#elif defined(__MINGW64_VERSION_MAJOR)
-/*
- * Set floating point precision for pow() of mingw-w64 x86.
- * With default precision the result is not proper on WinXP.
- */
-static inline double
-rb_w32_pow(double x, double y)
-{
- double r;
- unsigned int default_control = _controlfp(0, 0);
- _controlfp(_PC_64, _MCW_PC);
- r = pow(x, y);
- /* Restore setting */
- _controlfp(default_control, _MCW_PC);
- return r;
-}
-#endif
-#if defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__)
-#define pow rb_w32_pow
-#endif
-
#endif /* RUBY_WIN32_H */
diff --git a/inits.c b/inits.c
index fe0aade090..6fb7463c57 100644
--- a/inits.c
+++ b/inits.c
@@ -10,7 +10,6 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "internal.h"
#define CALL(n) {void Init_##n(void); Init_##n();}
@@ -60,6 +59,5 @@ rb_call_inits(void)
CALL(Rational);
CALL(Complex);
CALL(version);
- CALL(vm_trace);
}
#undef CALL
diff --git a/insns.def b/insns.def
index 02465ad4af..d1158e6056 100644
--- a/insns.def
+++ b/insns.def
@@ -1,4 +1,4 @@
-/** ##skip -*- mode:c; style:ruby; coding: utf-8 -*-
+/** ##skip -*- mode:c; style:ruby -*-
insns.def - YARV instruction definitions
$Author: $
@@ -15,7 +15,7 @@
instruction form:
DEFINE_INSN
- instruction_name
+ instrunction_name
(instruction_operands, ..)
(pop_values, ..)
(return value)
@@ -46,81 +46,107 @@ nop
/**
@c variable
- @e Get local variable (pointed by `idx' and `level').
- 'level' indicates the nesting depth from the current block.
- @j level, idx ã§æŒ‡å®šã•れãŸãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã®å€¤ã‚’スタックã«ç½®ã。
- level ã¯ãƒ–ロックã®ãƒã‚¹ãƒˆãƒ¬ãƒ™ãƒ«ã§ã€ä½•段上ã‹ã‚’示ã™ã€‚
+ @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, rb_num_t level)
+(lindex_t idx)
()
(VALUE val)
{
- int i, lev = (int)level;
- VALUE *ep = GET_EP();
-
- for (i = 0; i < lev; i++) {
- ep = GET_PREV_EP(ep);
- }
- val = *(ep - idx);
+ val = *(GET_LFP() - idx);
}
/**
@c variable
- @e Set a local variable (pointed to by 'idx') as val.
- 'level' indicates the nesting depth from the current block.
- @j level, idx ã§æŒ‡å®šã•れãŸãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã®å€¤ã‚’ val ã«ã™ã‚‹ã€‚
- level ã¯ãƒ–ロックã®ãƒã‚¹ãƒˆãƒ¬ãƒ™ãƒ«ã§ã€ä½•段上ã‹ã‚’示ã™ã€‚
+ @e set local variable value (which is pointed by idx) as val.
+ @j idx ‚ÅŽw’肳‚ꂽƒ[ƒJƒ‹•Ï”‚ð val ‚ÉÝ’è‚·‚éB
*/
DEFINE_INSN
setlocal
-(lindex_t idx, rb_num_t level)
+(lindex_t idx)
(VALUE val)
()
{
- int i, lev = (int)level;
- VALUE *ep = GET_EP();
-
- for (i = 0; i < lev; i++) {
- ep = GET_PREV_EP(ep);
- }
- *(ep - idx) = val;
+ (*(GET_LFP() - idx)) = val;
}
/**
@c variable
- @e Get value of special local variable ($~, $_, ..).
- @j 特殊ãªãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ï¼ˆ$~, $_, ...)ã®å€¤ã‚’得る。
+ @e get special local variable ($~, $_, ..) value.
+ @j “ÁŽê‚ȃ[ƒJƒ‹•Ï”i$~, $_, ...j‚Ì’l‚𓾂éB
*/
DEFINE_INSN
getspecial
-(rb_num_t key, rb_num_t type)
+(VALUE key, rb_num_t type)
()
(VALUE val)
{
- val = vm_getspecial(th, GET_LEP(), key, type);
+ val = vm_getspecial(th, GET_LFP(), key, type);
}
/**
@c variable
- @e Set value of special local variable ($~, $_, ...) to obj.
- @j 特別ãªãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ï¼ˆ$~, $_, ...)ã®å€¤ã‚’設定ã™ã‚‹ã€‚
+ @e set special local variable ($~, $_, ...) value as obj.
+ @j “Á•ʂȃ[ƒJƒ‹•Ï”i$~, $_, ...j‚Ì’l‚ðÝ’è‚·‚éB
*/
DEFINE_INSN
setspecial
-(rb_num_t key)
+(VALUE key)
(VALUE obj)
()
{
- lep_svar_set(th, GET_LEP(), key, 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 Get value of instance variable id of self.
- If is_local is not 0, get value of class local variable.
- @j self ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•° id ã®å€¤ã‚’得る。
+ @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
@@ -128,14 +154,14 @@ getinstancevariable
()
(VALUE val)
{
- val = vm_getinstancevariable(GET_SELF(), id, ic);
+ val = vm_getivar(GET_SELF(), id, ic);
}
/**
@c variable
- @e Set value of instance variable id of self to val.
- If is_local is not 0, set value of class local variable.
- @j self ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•° id ã‚’ val ã«ã™ã‚‹ã€‚
+ @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
@@ -143,13 +169,13 @@ setinstancevariable
(VALUE val)
()
{
- vm_setinstancevariable(GET_SELF(), id, val, ic);
+ vm_setivar(GET_SELF(), id, val, ic);
}
/**
@c variable
- @e Get value of class variable id of klass as val.
- @j ç¾åœ¨ã®ã‚¹ã‚³ãƒ¼ãƒ—ã®ã‚¯ãƒ©ã‚¹å¤‰æ•° id ã®å€¤ã‚’得る。
+ @e get class variable id of klass as val.
+ @j Œ»Ý‚̃XƒR[ƒv‚̃Nƒ‰ƒX•Ï” id ‚Ì’l‚𓾂éB
*/
DEFINE_INSN
getclassvariable
@@ -157,14 +183,14 @@ getclassvariable
()
(VALUE val)
{
- NODE *cref = rb_vm_get_cref(GET_ISEQ(), GET_EP());
- val = rb_cvar_get(vm_get_cvar_base(cref, GET_CFP()), id);
+ 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 value of class variable id of klass as val.
- @j klass ã®ã‚¯ãƒ©ã‚¹å¤‰æ•° id ã‚’ val ã«ã™ã‚‹ã€‚
+ @e set class variable id of klass as val.
+ @j klass ‚̃Nƒ‰ƒX•Ï” id ‚ð val ‚É‚·‚éB
*/
DEFINE_INSN
setclassvariable
@@ -172,21 +198,21 @@ setclassvariable
(VALUE val)
()
{
- NODE *cref = rb_vm_get_cref(GET_ISEQ(), GET_EP());
- rb_cvar_set(vm_get_cvar_base(cref, GET_CFP()), id, 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, constants
- are searched in the current scope. If klass is Qfalse, constants
- are searched as top level constants. Otherwise, get constant under klass
+ 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 ã®å€¤ã‚’得る。
- klass ㌠Qnil ãªã‚‰ã€ãã®ã‚¹ã‚³ãƒ¼ãƒ—ã§å¾—られる定数ã®å€¤ã‚’得る。
- Qfalse ãªã‚‰ã€ãƒˆãƒƒãƒ—レベルスコープを得る。
- ãれ以外ãªã‚‰ã€klass クラスã®ä¸‹ã®å®šæ•°ã‚’得る。
+ @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
@@ -200,15 +226,15 @@ getconstant
/**
@c variable
@e
- Set constant variable id. If klass is Qfalse, constant
+ 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 ã®å€¤ã‚’ val ã«ã™ã‚‹ã€‚
- klass ㌠Qfalse ãªã‚‰ã€ãã®ã‚¹ã‚³ãƒ¼ãƒ—ã§å¾—られる定数 id ã®å€¤ã‚’設定ã™ã‚‹ã€‚
- Qnil ãªã‚‰ã€ãƒˆãƒƒãƒ—レベルスコープã®å€¤ã‚’設定ã™ã‚‹ã€‚
- ãれ以外ãªã‚‰ã€klass クラスã®ä¸‹ã®å®šæ•°ã‚’設定ã™ã‚‹ã€‚
+ @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
@@ -224,7 +250,7 @@ setconstant
/**
@c variable
@e get global variable id.
- @j グローãƒãƒ«å¤‰æ•° id ã®å€¤ã‚’得る。
+ @j ƒOƒ[ƒoƒ‹•Ï” id ‚Ì’l‚𓾂éB
*/
DEFINE_INSN
getglobal
@@ -232,13 +258,13 @@ getglobal
()
(VALUE val)
{
- val = GET_GLOBAL((VALUE)entry);
+ val = GET_GLOBAL(entry);
}
/**
@c variable
@e set global variable id as val.
- @j グローãƒãƒ«å¤‰æ•° id ã®å€¤ã‚’設定ã™ã‚‹ã€‚
+ @j ƒOƒ[ƒoƒ‹•Ï” id ‚Ì’l‚ðÝ’è‚·‚éB
*/
DEFINE_INSN
setglobal
@@ -246,7 +272,7 @@ setglobal
(VALUE val)
()
{
- SET_GLOBAL((VALUE)entry, val);
+ SET_GLOBAL(entry, val);
}
@@ -257,7 +283,7 @@ setglobal
/**
@c put
@e put nil to stack.
- @j スタック㫠nil をプッシュã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒN‚É nil ‚ðƒvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
putnil
@@ -271,7 +297,7 @@ putnil
/**
@c put
@e put self.
- @j スタック㫠self をプッシュã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒN‚É self ‚ðƒvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
putself
@@ -286,7 +312,7 @@ putself
@c put
@e put some object.
i.e. Fixnum, true, false, nil, and so on.
- @j オブジェクト val をスタックã«ãƒ—ッシュã™ã‚‹ã€‚
+ @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
@@ -301,8 +327,8 @@ putobject
/**
@c put
@e put special object. "value_type" is for expansion.
- @j 特別ãªã‚ªãƒ–ジェクト val をスタックã«ãƒ—ッシュã™ã‚‹ã€‚
- オブジェクトã®ç¨®é¡žã¯ value_type ã«ã‚ˆã‚‹ï¼Ž
+ @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
@@ -310,17 +336,15 @@ putspecialobject
()
(VALUE val)
{
- enum vm_special_object_type type = (enum vm_special_object_type)value_type;
-
- switch (type) {
+ switch (value_type) {
case VM_SPECIAL_OBJECT_VMCORE:
val = rb_mRubyVMFrozenCore;
break;
case VM_SPECIAL_OBJECT_CBASE:
- val = vm_get_cbase(GET_ISEQ(), GET_EP());
+ val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
break;
case VM_SPECIAL_OBJECT_CONST_BASE:
- val = vm_get_const_base(GET_ISEQ(), GET_EP());
+ val = vm_get_const_base(GET_ISEQ(), GET_LFP(), GET_DFP());
break;
default:
rb_bug("putspecialobject insn: unknown value_type");
@@ -344,7 +368,7 @@ putiseq
/**
@c put
@e put string val. string will be copied.
- @j 文字列をコピーã—ã¦ã‚¹ã‚¿ãƒƒã‚¯ã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j •¶Žš—ñ‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
putstring
@@ -358,7 +382,7 @@ putstring
/**
@c put
@e put concatenate strings
- @j ã‚¹ã‚¿ãƒƒã‚¯ãƒˆãƒƒãƒ—ã®æ–‡å­—列を n 個連çµã—ï¼Œçµæžœã‚’スタックã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì•¶Žš—ñ‚ð n ŒÂ˜AŒ‹‚µCŒ‹‰Ê‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
concatstrings
@@ -366,9 +390,9 @@ concatstrings
(...)
(VALUE val) // inc += 1 - num;
{
- rb_num_t i = num - 1;
+ rb_num_t i = num;
- val = rb_str_resurrect(TOPN(i));
+ val = rb_str_new(0, 0);
while (i-- > 0) {
const VALUE v = TOPN(i);
rb_str_append(val, v);
@@ -379,7 +403,7 @@ concatstrings
/**
@c put
@e to_str
- @j to_str ã®çµæžœã‚’スタックã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j to_str ‚ÌŒ‹‰Ê‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
tostring
@@ -393,8 +417,8 @@ tostring
/**
@c put
@e to Regexp
- @j 文字列 str ã‚’æ­£è¦è¡¨ç¾ã«ã‚³ãƒ³ãƒ‘イルã—ã¦ã‚¹ã‚¿ãƒƒã‚¯ã«ãƒ—ッシュã™ã‚‹ã€‚
- コンパイル時,opt ã‚’æ­£è¦è¡¨ç¾ã®ã‚ªãƒ—ションã¨ã™ã‚‹ã€‚
+ @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
@@ -416,7 +440,7 @@ toregexp
/**
@c put
@e put new array.
- @j æ–°ã—ã„é…列をスタック上㮠num 個ã®å€¤ã§åˆæœŸåŒ–ã—ã¦ç”Ÿæˆã—プッシュã™ã‚‹ã€‚
+ @j V‚µ‚¢”z—ñ‚ðƒXƒ^ƒbƒNã‚Ì num ŒÂ‚Ì’l‚ʼnŠú‰»‚µ‚ͬ‚µƒvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
newarray
@@ -431,7 +455,7 @@ newarray
/**
@c put
@e dup array
- @j é…列 ary ã‚’ dup ã—ã¦ã‚¹ã‚¿ãƒƒã‚¯ã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j ”z—ñ ary ‚ð dup ‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
duparray
@@ -445,13 +469,13 @@ duparray
/**
@c put
@e expand array to num objects.
- @j スタックトップã®ã‚ªãƒ–ジェクトãŒé…列ã§ã‚れã°ã€ãれを展開ã™ã‚‹ã€‚
- é…列オブジェクトã®è¦ç´ æ•°ãŒ num以下ãªã‚‰ã°ã€ä»£ã‚り㫠nil ã‚’ç©ã‚€ã€‚num以上ãªã‚‰ã€
- num以上ã®è¦ç´ ã¯åˆ‡ã‚Šæ¨ã¦ã‚‹ã€‚
- é…列オブジェクトã§ãªã‘れã°ã€num - 1 個㮠nil ã‚’ç©ã‚€ã€‚
- ã‚‚ã— flag ãŒçœŸãªã‚‰ã€æ®‹ã‚Šè¦ç´ ã®é…列をç©ã‚€
- flag: 0x01 - 最後をé…列ã«
- flag: 0x02 - postarg 用
+ @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
@@ -466,7 +490,7 @@ expandarray
/**
@c put
@e concat two arrays
- @j 二ã¤ã®é…列 ary1, ary2 を連çµã—スタックã¸ãƒ—ッシュã™ã‚‹ã€‚
+ @j “ñ‚‚̔z—ñ ary1, ary2 ‚ð˜AŒ‹‚µƒXƒ^ƒbƒN‚ÖƒvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
concatarray
@@ -495,7 +519,7 @@ concatarray
/**
@c put
@e splat array
- @j é…列 ary ã«å¯¾ã—㦠to_a を呼ã³å‡ºã™ã€‚
+ @j ”z—ñ ary ‚ɑ΂µ‚Ä to_a ‚ðŒÄ‚Ño‚·B
*/
DEFINE_INSN
splatarray
@@ -507,17 +531,54 @@ splatarray
if (NIL_P(tmp)) {
tmp = rb_ary_new3(1, ary);
}
- else if (RTEST(flag)) {
- tmp = rb_ary_dup(tmp);
- }
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 æ–°ã—ã„ãƒãƒƒã‚·ãƒ¥ã‚’スタックトップ㮠n å€‹ã‚’åˆæœŸå€¤ã¨ã—ã¦ç”Ÿæˆã™ã‚‹ã€‚
- n ã¯ã‚­ãƒ¼ã¨å€¤ã®ãƒšã‚¢ãªã®ã§ 2 ã®å€æ•°ã§ãªã‘れã°ãªã‚‰ãªã„。
+ @j V‚µ‚¢ƒnƒbƒVƒ…‚ðƒXƒ^ƒbƒNƒgƒbƒv‚Ì n ŒÂ‚ð‰Šú’l‚Æ‚µ‚ͬ‚·‚éB
+ n ‚̓L[‚Æ’l‚̃yƒA‚Ȃ̂Š2 ‚Ì”{”‚łȂ¯‚ê‚΂Ȃç‚È‚¢B
*/
DEFINE_INSN
newhash
@@ -526,11 +587,6 @@ newhash
(VALUE val) // inc += 1 - num;
{
rb_num_t i;
-
- if(RUBY_DTRACE_HASH_CREATE_ENABLED()) {
- RUBY_DTRACE_HASH_CREATE(num, rb_sourcefile(), rb_sourceline());
- }
-
val = rb_hash_new();
for (i = num; i > 0; i -= 2) {
@@ -544,7 +600,7 @@ newhash
/**
@c put
@e put new Range object.(Range.new(low, high, flag))
- @j 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
@@ -562,7 +618,7 @@ newrange
/**
@c stack
@e pop from stack.
- @j スタックã‹ã‚‰ä¸€ã¤ãƒãƒƒãƒ—ã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒN‚©‚çˆê‚ƒ|ƒbƒv‚·‚éB
*/
DEFINE_INSN
pop
@@ -570,14 +626,14 @@ pop
(VALUE val)
()
{
- (void)val;
+ val = val;
/* none */
}
/**
@c stack
@e duplicate stack top.
- @j スタックトップをコピーã—ã¦ã‚¹ã‚¿ãƒƒã‚¯ã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
dup
@@ -591,7 +647,7 @@ dup
/**
@c stack
@e duplicate stack top n elements
- @j スタックトップ㮠n 個をコピーã—ã¦ã‚¹ã‚¿ãƒƒã‚¯ã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì n ŒÂ‚ðƒRƒs[‚µ‚ăXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
dupn
@@ -611,7 +667,7 @@ dupn
/**
@c stack
@e swap top 2 vals
- @j スタックトップ㮠2 ã¤ã®å€¤ã‚’交æ›ã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì 2 ‚‚̒l‚ðŒðŠ·‚·‚éB
*/
DEFINE_INSN
swap
@@ -625,7 +681,7 @@ swap
/**
@c stack
@e for stack caching.
- @j スタックキャッシングã®çŠ¶æ…‹ã‚’èª¿æ•´ã™ã‚‹ãŸã‚ã«å¿…è¦ãªå‘½ä»¤ã€‚
+ @j ƒXƒ^ƒbƒNƒLƒƒƒbƒVƒ“ƒO‚Ìó‘Ô‚ð’²®‚·‚邽‚߂ɕK—v‚È–½—ßB
*/
DEFINE_INSN
reput
@@ -639,7 +695,7 @@ reput
/**
@c stack
@e get nth stack value from stack top
- @j スタックトップã‹ã‚‰ n 個目をスタックã«ãƒ—ッシュã™ã‚‹ã€‚
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚©‚ç n ŒÂ–Ú‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚éB
*/
DEFINE_INSN
topn
@@ -653,7 +709,7 @@ topn
/**
@c stack
@e set Nth stack entry to stack top
- @j スタックトップã®å€¤ã‚’ n 個目ã®ã‚¹ã‚¿ãƒƒã‚¯ã«ã‚³ãƒ”ー
+ @j ƒXƒ^ƒbƒNƒgƒbƒv‚Ì’l‚ð n ŒÂ–ڂ̃Xƒ^ƒbƒN‚ɃRƒs[
*/
DEFINE_INSN
setn
@@ -667,7 +723,7 @@ setn
/**
@c stack
@e empt current stack
- @j current stack を空ã«ã™ã‚‹ã€‚
+ @j current stack ‚ð‹ó‚É‚·‚éB
*/
DEFINE_INSN
adjuststack
@@ -686,64 +742,60 @@ adjuststack
/**
@c setting
@e defined?
- @j defined? を行ã†ã€‚
+ @j defined? ‚ðs‚¤B
*/
DEFINE_INSN
defined
-(rb_num_t op_type, VALUE obj, VALUE needstr)
+(rb_num_t type, VALUE obj, VALUE needstr)
(VALUE v)
(VALUE val)
{
VALUE klass;
- enum defined_type expr_type = 0;
- enum defined_type type = (enum defined_type)op_type;
-
+ const char *expr_type = 0;
val = Qnil;
switch (type) {
case DEFINED_IVAR:
if (rb_ivar_defined(GET_SELF(), SYM2ID(obj))) {
- expr_type = DEFINED_IVAR;
+ expr_type = "instance-variable";
}
break;
case DEFINED_IVAR2:
- klass = vm_get_cbase(GET_ISEQ(), GET_EP());
+ klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
break;
case DEFINED_GVAR:
if (rb_gvar_defined(rb_global_entry(SYM2ID(obj)))) {
- expr_type = DEFINED_GVAR;
+ expr_type = "global-variable";
}
break;
- case DEFINED_CVAR: {
- NODE *cref = rb_vm_get_cref(GET_ISEQ(), GET_EP());
- klass = vm_get_cvar_base(cref, GET_CFP());
+ case DEFINED_CVAR:
+ klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
if (rb_cvar_defined(klass, SYM2ID(obj))) {
- expr_type = DEFINED_CVAR;
+ expr_type = "class variable";
}
break;
- }
case DEFINED_CONST:
klass = v;
if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) {
- expr_type = DEFINED_CONST;
+ expr_type = "constant";
}
break;
case DEFINED_FUNC:
klass = CLASS_OF(v);
if (rb_method_boundp(klass, SYM2ID(obj), 0)) {
- expr_type = DEFINED_METHOD;
+ expr_type = "method";
}
break;
case DEFINED_METHOD:{
VALUE klass = CLASS_OF(v);
- const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj), 0);
+ 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 = DEFINED_METHOD;
+ expr_type = "method";
}
}
}
@@ -752,32 +804,37 @@ defined
VALUE r;
args[0] = obj; args[1] = Qfalse;
- r = rb_check_funcall(v, idRespond_to_missing, 2, args);
- if (r != Qundef && RTEST(r))
- expr_type = DEFINED_METHOD;
+ r = rb_check_funcall(v, rb_intern("respond_to_missing?"), 2, args);
+ if (r != Qundef && RTEST(r))
+ expr_type = "method";
}
break;
}
case DEFINED_YIELD:
if (GET_BLOCK_PTR()) {
- expr_type = DEFINED_YIELD;
+ expr_type = "yield";
}
break;
case DEFINED_ZSUPER:{
- rb_call_info_t cit;
- if (vm_search_superclass(GET_CFP(), GET_ISEQ(), Qnil, &cit) == 0) {
- VALUE klass = cit.klass;
- ID id = cit.mid;
- if (rb_method_boundp(klass, id, 0)) {
- expr_type = 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_LEP(), Qfalse, FIX2INT(obj));
+ val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
if (val != Qnil) {
- expr_type = DEFINED_GVAR;
+ expr_type = "global-variable";
}
break;
}
@@ -787,7 +844,7 @@ defined
}
if (expr_type != 0) {
if (needstr != Qfalse) {
- val = rb_iseq_defined_string(expr_type);
+ val = rb_str_new2(expr_type);
}
else {
val = Qtrue;
@@ -797,44 +854,8 @@ defined
/**
@c setting
- @e check `target' matches `pattern'.
- `flag & VM_CHECKMATCH_TYPE_MASK' describe how to check pattern.
- VM_CHECKMATCH_TYPE_WHEN: ignore target and check pattern is truthy.
- VM_CHECKMATCH_TYPE_CASE: check `patten === target'.
- VM_CHECKMATCH_TYPE_RESCUE: check `pattern.kind_op?(Module) && pattern == target'.
- if `flag & VM_CHECKMATCH_ARRAY' is not 0, then `patten' is array of patterns.
- @j see above comments.
- */
-DEFINE_INSN
-checkmatch
-(rb_num_t flag)
-(VALUE target, VALUE pattern)
-(VALUE result)
-{
- enum vm_check_match_type checkmatch_type =
- (enum vm_check_match_type)(flag & VM_CHECKMATCH_TYPE_MASK);
- result = Qfalse;
-
- if (flag & VM_CHECKMATCH_ARRAY) {
- int i;
- for (i = 0; i < RARRAY_LEN(pattern); i++) {
- if (RTEST(check_match(RARRAY_PTR(pattern)[i], target, checkmatch_type))) {
- result = Qtrue;
- break;
- }
- }
- }
- else {
- if (RTEST(check_match(pattern, target, checkmatch_type))) {
- result = Qtrue;
- }
- }
-}
-
-/**
- @c setting
@e trace
- @j trace 用ã®å‘½ä»¤ã€‚
+ @j trace —p‚Ì–½—ßB
*/
DEFINE_INSN
trace
@@ -844,29 +865,7 @@ trace
{
rb_event_flag_t flag = (rb_event_flag_t)nf;
- if (RUBY_DTRACE_METHOD_ENTRY_ENABLED() ||
- RUBY_DTRACE_METHOD_RETURN_ENABLED() ||
- RUBY_DTRACE_CMETHOD_ENTRY_ENABLED() ||
- RUBY_DTRACE_CMETHOD_RETURN_ENABLED()) {
-
- switch(flag) {
- case RUBY_EVENT_CALL:
- RUBY_DTRACE_METHOD_ENTRY_HOOK(th, 0, 0);
- break;
- case RUBY_EVENT_C_CALL:
- RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, 0, 0);
- break;
- case RUBY_EVENT_RETURN:
- RUBY_DTRACE_METHOD_RETURN_HOOK(th, 0, 0);
- break;
- case RUBY_EVENT_C_RETURN:
- RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, 0, 0);
- break;
- }
- }
-
- EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* id and klass are resolved at callee */,
- (flag & (RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN)) ? TOPN(0) : Qundef);
+ EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
}
/**********************************************************/
@@ -878,29 +877,22 @@ trace
@e
enter class definition scope. if super is Qfalse, and clsas
"klass" is defined, it's redefine. otherwise, define "klass" class.
- @j クラス定義スコープã¸ç§»è¡Œã™ã‚‹ã€‚
- ã‚‚ã— super ㌠Qfalse ã§ klassクラスãŒå®šç¾©ã•れã¦ã„れã°å†å®šç¾©ã§ã‚る。
- ãã†ã§ãªã‘れã°ã€klass クラスを定義ã™ã‚‹ã€‚
+ @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 flags)
+(ID id, ISEQ class_iseq, rb_num_t define_type)
(VALUE cbase, VALUE super)
(VALUE val)
{
VALUE klass;
- rb_vm_defineclass_type_t type = VM_DEFINECLASS_TYPE(flags);
- switch (type) {
- case VM_DEFINECLASS_TYPE_CLASS:
+ switch ((int)define_type) {
+ case 0:
/* val is dummy. classdef returns class scope value */
- if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags) &&
- !RB_TYPE_P(super, T_CLASS)) {
- rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
- rb_obj_classname(super));
- }
-
if (super == Qnil) {
super = rb_cObject;
}
@@ -909,11 +901,10 @@ defineclass
/* find klass */
rb_autoload_load(cbase, id);
- if ((klass = vm_search_const_defined_class(cbase, id)) != 0) {
+ if (rb_const_defined_at(cbase, id)) {
/* already exist */
- klass = VM_DEFINECLASS_SCOPED_P(flags) ?
- rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
- if (!RB_TYPE_P(klass, T_CLASS)) {
+ klass = rb_const_get_at(cbase, id);
+ if (TYPE(klass) != T_CLASS) {
rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
}
@@ -935,23 +926,22 @@ defineclass
rb_class_inherited(super, klass);
}
break;
- case VM_DEFINECLASS_TYPE_SINGLETON_CLASS:
+ case 1:
/* val is dummy. classdef returns class scope value */
/* super is dummy */
klass = rb_singleton_class(cbase);
break;
- case VM_DEFINECLASS_TYPE_MODULE:
+ case 2:
/* val is dummy. classdef returns class scope value */
/* super is dummy */
vm_check_if_namespace(cbase);
/* find klass */
- if ((klass = vm_search_const_defined_class(cbase, id)) != 0) {
- klass = VM_DEFINECLASS_SCOPED_P(flags) ?
- rb_public_const_get_at(klass, id) : rb_const_get_at(klass, id);
+ if (rb_const_defined_at(cbase, id)) {
+ klass = rb_const_get_at(cbase, id);
/* already exist */
- if (!RB_TYPE_P(klass, T_MODULE)) {
+ if (TYPE(klass) != T_MODULE) {
rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
}
}
@@ -963,16 +953,16 @@ defineclass
}
break;
default:
- rb_bug("unknown defineclass type: %d", (int)type);
+ rb_bug("unknown defineclass type: %d", (int)define_type);
}
COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC, NULL));
/* enter scope */
- vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS,
- klass, 0, VM_ENVVAL_BLOCK_PTR(GET_BLOCK_PTR()),
- class_iseq->iseq_encoded, GET_SP(),
- class_iseq->local_size, 0);
+ vm_push_frame(th, class_iseq,
+ VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_BLOCK_PTR(),
+ class_iseq->iseq_encoded, GET_SP(), 0,
+ class_iseq->local_size);
RESTORE_REGS();
INC_VM_STATE_VERSION();
@@ -986,74 +976,83 @@ defineclass
/**
@c method/iterator
- @e invoke method.
- @j メソッド呼ã³å‡ºã—を行ã†ã€‚ci ã«å¿…è¦ãªæƒ…å ±ãŒæ ¼ç´ã•れã¦ã„る。
+ @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
-(CALL_INFO ci)
+(ID op_id, rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag, IC ic)
(...)
-(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
+(VALUE val) // inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
{
- ci->argc = ci->orig_argc;
- ci->blockptr = 0;
- vm_caller_setup_args(th, reg_cfp, ci);
- vm_search_method(ci, ci->recv = TOPN(ci->argc));
- CALL_METHOD(ci);
-}
+ const rb_method_entry_t *me;
+ VALUE recv, klass;
+ rb_block_t *blockptr = 0;
+ int 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;
-/**
- @c optimize
- @e Invoke method without block, splat
- @j Invoke method without block, splat
- */
-DEFINE_INSN
-opt_send_simple
-(CALL_INFO ci)
-(...)
-(VALUE val) // inc += -ci->orig_argc;
-{
- vm_search_method(ci, ci->recv = TOPN(ci->argc));
- CALL_METHOD(ci);
+ /* 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 を実行ã™ã‚‹ã€‚ci ã«å¿…è¦ãªæƒ…å ±ãŒæ ¼ç´ã•れã¦ã„る。
+ @j super ‚ðŽÀs‚·‚éB
+ super(args) # args.size => num
+ flag “™ƒIƒyƒ‰ƒ“ƒh‚̈Ӗ¡‚Í send ‚Æ“¯‚¶B
*/
DEFINE_INSN
invokesuper
-(CALL_INFO ci)
+(rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag)
(...)
-(VALUE val) // inc += - (int)(ci->orig_argc + ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0));
+(VALUE val) // inc += - (int)(op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
{
- ci->argc = ci->orig_argc;
- ci->blockptr = !(ci->flag & VM_CALL_ARGS_BLOCKARG) ? GET_BLOCK_PTR() : 0;
+ rb_block_t *blockptr = !(op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? GET_BLOCK_PTR() : 0;
+ int 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;
- if (UNLIKELY(!(ci->flag & VM_CALL_ARGS_SKIP_SETUP))) {
- vm_caller_setup_args(th, reg_cfp, ci);
+ recv = GET_SELF();
+ vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
+
+ /* temporary measure for [Bug #2402] [Bug #2502] [Bug #3136] */
+ if (!rb_obj_is_kind_of(recv, klass)) {
+ rb_raise(rb_eNotImpError, "super from singleton method that is defined to multiple classes is not supported; this will be fixed in 1.9.3 or later");
}
- ci->recv = GET_SELF();
- vm_search_super_method(th, GET_CFP(), ci);
- CALL_METHOD(ci);
+
+ me = rb_method_entry(klass, id);
+
+ CALL_METHOD(num, blockptr, flag, id, me, recv);
}
/**
@c method/iterator
- @e yield(args)
- @j yield を実行ã™ã‚‹ã€‚
+ @e yield(args) # args.size => num, flag shows expand argument or not
+ @j yield ‚ðŽÀs‚·‚éB
+ yield(args) # args.size => num
*/
DEFINE_INSN
invokeblock
-(CALL_INFO ci)
+(rb_num_t num, rb_num_t flag)
(...)
-(VALUE val) // inc += 1 - ci->orig_argc;
+(VALUE val) // inc += 1 - num;
{
- ci->argc = ci->orig_argc;
- ci->blockptr = 0;
- ci->recv = GET_SELF();
- val = vm_invoke_block(th, GET_CFP(), ci);
+ val = vm_invoke_block(th, GET_CFP(), num, flag);
if (val == Qundef) {
RESTORE_REGS();
NEXT_INSN();
@@ -1063,7 +1062,7 @@ invokeblock
/**
@c method/iterator
@e return from this scope.
- @j ã“ã®ã‚¹ã‚³ãƒ¼ãƒ—ã‹ã‚‰æŠœã‘る。
+ @j ‚±‚̃XƒR[ƒv‚©‚甲‚¯‚éB
*/
DEFINE_INSN
leave
@@ -1072,28 +1071,34 @@ leave
(VALUE val)
{
if (OPT_CHECKED_RUN) {
- if (reg_cfp->sp != vm_base_ptr(reg_cfp)) {
+ 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, vm_base_ptr(reg_cfp)));
+ VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, reg_cfp->bp));
}
}
- RUBY_VM_CHECK_INTS(th);
-
- if (UNLIKELY(VM_FRAME_TYPE_FINISH_P(GET_CFP()))) {
- vm_pop_frame(th);
+ 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
- th->retval = val;
- return 0;
+ rb_bug("unused instruction on OPT_CALL_THREADED_CODE");
#else
- return val;
+ th->cfp++;
+ return val;
#endif
- }
- else {
- vm_pop_frame(th);
- RESTORE_REGS();
- }
}
/**********************************************************/
@@ -1103,7 +1108,7 @@ leave
/**
@c exception
@e longjump
- @j 大域ジャンプを行ã†ã€‚
+ @j ‘åˆæƒWƒƒƒ“ƒv‚ðs‚¤B
*/
DEFINE_INSN
throw
@@ -1111,7 +1116,7 @@ throw
(VALUE throwobj)
(VALUE val)
{
- RUBY_VM_CHECK_INTS(th);
+ RUBY_VM_CHECK_INTS();
val = vm_throw(th, GET_CFP(), throw_state, throwobj);
THROW_EXCEPTION(val);
/* unreachable */
@@ -1124,7 +1129,7 @@ throw
/**
@c jump
@e set PC to (PC + dst).
- @j PC ã‚’ (PC + dst) ã«ã™ã‚‹ã€‚
+ @j PC ‚ð (PC + dst) ‚É‚·‚éB
*/
DEFINE_INSN
jump
@@ -1132,14 +1137,14 @@ jump
()
()
{
- RUBY_VM_CHECK_INTS(th);
+ 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 ã§ãªã‘れã°ã€PC ã‚’ (PC + dst) ã«ã™ã‚‹ã€‚
+ @j ‚à‚µ val ‚ª false ‚© nil ‚łȂ¯‚ê‚ÎAPC ‚ð (PC + dst) ‚É‚·‚éB
*/
DEFINE_INSN
branchif
@@ -1148,7 +1153,7 @@ branchif
()
{
if (RTEST(val)) {
- RUBY_VM_CHECK_INTS(th);
+ RUBY_VM_CHECK_INTS();
JUMP(dst);
}
}
@@ -1156,7 +1161,7 @@ branchif
/**
@c jump
@e if val is false or nil, set PC to (PC + dst).
- @j ã‚‚ã— val ㌠false ã‹ nil ãªã‚‰ã°ã€PC ã‚’ (PC + dst) ã«ã™ã‚‹ã€‚
+ @j ‚à‚µ val ‚ª false ‚© nil ‚È‚ç‚ÎAPC ‚ð (PC + dst) ‚É‚·‚éB
*/
DEFINE_INSN
branchunless
@@ -1165,7 +1170,7 @@ branchunless
()
{
if (!RTEST(val)) {
- RUBY_VM_CHECK_INTS(th);
+ RUBY_VM_CHECK_INTS();
JUMP(dst);
}
}
@@ -1178,7 +1183,7 @@ branchunless
/**
@c optimize
@e inline cache
- @j ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã‚­ãƒ£ãƒƒã‚·ãƒ¥ãŒæœ‰åйãªã‚‰ã€å€¤ã‚’スタックã«ãƒ—ッシュã—㦠dst ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹ã€‚
+ @j ƒCƒ“ƒ‰ƒCƒ“ƒLƒƒƒbƒVƒ…‚ª—LŒø‚È‚çA’l‚ðƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚µ‚Ä dst ‚ÖƒWƒƒƒ“ƒv‚·‚éB
*/
DEFINE_INSN
getinlinecache
@@ -1199,7 +1204,7 @@ getinlinecache
/**
@c optimize
@e inline cache (once)
- @j once を実ç¾ã™ã‚‹ã€‚
+ @j once ‚ðŽÀŒ»‚·‚éB
*/
DEFINE_INSN
onceinlinecache
@@ -1214,8 +1219,8 @@ onceinlinecache
}
else if (ic->ic_value.value == Qundef)
{
- RUBY_VM_CHECK_INTS(th);
- rb_thread_schedule();
+ RUBY_VM_CHECK_INTS();
+ rb_thread_schedule();
goto retry;
}
else {
@@ -1228,7 +1233,7 @@ onceinlinecache
/**
@c optimize
@e set inline cache
- @j インラインキャッシュã®å€¤ã‚’設定ã™ã‚‹ã€‚
+ @j ƒCƒ“ƒ‰ƒCƒ“ƒLƒƒƒbƒVƒ…‚Ì’l‚ðÝ’è‚·‚éB
*/
DEFINE_INSN
setinlinecache
@@ -1237,7 +1242,7 @@ setinlinecache
(VALUE val)
{
if (ic->ic_value.value == Qundef) {
- rb_iseq_add_mark_object(GET_ISEQ(), val);
+ rb_ary_push(GET_ISEQ()->mark_ary, val);
}
ic->ic_value.value = val;
ic->ic_vmstat = GET_VM_STATE_VERSION() - ruby_vm_const_missing_count;
@@ -1247,7 +1252,7 @@ setinlinecache
/**
@c optimize
@e case dispatcher
- @j case æ–‡ã§ã€å¯èƒ½ãªã‚‰è¡¨å¼•ãã§ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹ã€‚
+ @j case •¶‚ÅA‰Â”\‚È‚ç•\ˆø‚«‚ŃWƒƒƒ“ƒv‚·‚éB
*/
DEFINE_INSN
opt_case_dispatch
@@ -1255,51 +1260,70 @@ opt_case_dispatch
(..., VALUE key)
() // inc += -1;
{
- switch(TYPE(key)) {
- case T_FLOAT: {
- double ival;
- if (modf(RFLOAT_VALUE(key), &ival) == 0.0) {
- key = FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
+ if (BASIC_OP_UNREDEFINED_P(BOP_EQQ)) {
+ VALUE val;
+ if (st_lookup(RHASH_TBL(hash), key, &val)) {
+ JUMP(FIX2INT(val));
}
- }
- case T_SYMBOL: /* fall through */
- case T_FIXNUM:
- case T_BIGNUM:
- case T_STRING:
- if (BASIC_OP_UNREDEFINED_P(BOP_EQQ,
- SYMBOL_REDEFINED_OP_FLAG |
- FIXNUM_REDEFINED_OP_FLAG |
- BIGNUM_REDEFINED_OP_FLAG |
- STRING_REDEFINED_OP_FLAG)) {
- st_data_t val;
- if (st_lookup(RHASH_TBL(hash), key, &val)) {
- JUMP(FIX2INT((VALUE)val));
- }
- else {
- JUMP(else_offset);
- }
- break;
+ else {
+ JUMP(else_offset);
+ }
+ }
+ else {
+ struct opt_case_dispatch_i_arg arg;
+
+ arg.obj = key;
+ arg.label = -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);
}
- default:
- break;
}
}
+/**
+ @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 最é©åŒ–ã•れ㟠X+Y。
+ @j Å“K‰»‚³‚ꂽ X+YB
*/
DEFINE_INSN
opt_plus
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
- if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS,FIXNUM_REDEFINED_OP_FLAG)) {
+ 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)));
@@ -1321,48 +1345,57 @@ opt_plus
}
#endif
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS, FLOAT_REDEFINED_OP_FLAG)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) + RFLOAT_VALUE(obj));
- }
+#endif
+
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS, FLOAT_REDEFINED_OP_FLAG)) {
+ 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));
}
- else if (HEAP_CLASS_OF(recv) == rb_cString && HEAP_CLASS_OF(obj) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_PLUS, STRING_REDEFINED_OP_FLAG)) {
+#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, ARRAY_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
val = rb_ary_plus(recv, obj);
}
+#endif
else {
goto INSN_LABEL(normal_dispatch);
}
}
else {
- INSN_LABEL(normal_dispatch):
+ INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idPLUS, recv);
}
}
/**
@c optimize
@e optimized X-Y.
- @j 最é©åŒ–ã•れ㟠X-Y。
+ @j Å“K‰»‚³‚ꂽ X-YB
*/
DEFINE_INSN
opt_minus
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MINUS, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
long a, b, c;
a = FIX2LONG(recv);
@@ -1376,15 +1409,16 @@ opt_minus
val = rb_big_minus(rb_int2big(a), rb_int2big(b));
}
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MINUS, FLOAT_REDEFINED_OP_FLAG)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) - RFLOAT_VALUE(obj));
- }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_MINUS, FLOAT_REDEFINED_OP_FLAG)) {
+ 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);
}
@@ -1394,23 +1428,23 @@ opt_minus
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idMINUS, recv);
}
}
/**
@c optimize
@e optimized X*Y.
- @j 最é©åŒ–ã•れ㟠X*Y。
+ @j Å“K‰»‚³‚ꂽ X*YB
*/
DEFINE_INSN
opt_mult
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MULT, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
long a, b;
a = FIX2LONG(recv);
@@ -1418,24 +1452,28 @@ opt_mult
val = recv;
}
else {
+ volatile long c;
b = FIX2LONG(obj);
- if (MUL_OVERFLOW_FIXNUM_P(a, b)) {
+ c = a * b;
+
+ if (FIXABLE(c) && c / a == b) {
+ val = LONG2FIX(c);
+ }
+ else {
val = rb_big_mul(rb_int2big(a), rb_int2big(b));
- }
- else {
- val = LONG2FIX(a * b);
- }
+ }
}
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MULT, FLOAT_REDEFINED_OP_FLAG)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) * RFLOAT_VALUE(obj));
- }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_MULT, FLOAT_REDEFINED_OP_FLAG)) {
+ 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);
}
@@ -1444,23 +1482,23 @@ opt_mult
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idMULT, recv);
}
}
/**
@c optimize
@e optimized X/Y.
- @j 最é©åŒ–ã•れ㟠X/Y。
+ @j Å“K‰»‚³‚ꂽ X/YB
*/
DEFINE_INSN
opt_div
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_DIV, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
long x, y, div;
x = FIX2LONG(recv);
@@ -1490,15 +1528,16 @@ opt_div
}
val = LONG2NUM(div);
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
- val = DBL2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
- }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_DIV, FLOAT_REDEFINED_OP_FLAG)) {
+ 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);
}
@@ -1507,23 +1546,23 @@ opt_div
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idDIV, recv);
}
}
/**
@c optimize
@e optimized X%Y.
- @j 最é©åŒ–ã•れ㟠X%Y。
+ @j Å“K‰»‚³‚ꂽ X%YB
*/
DEFINE_INSN
opt_mod
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MOD, FIXNUM_REDEFINED_OP_FLAG )) {
+ BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
long x, y, mod;
x = FIX2LONG(recv);
@@ -1554,14 +1593,29 @@ opt_mod
}
val = LONG2FIX(mod);
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_MOD, FLOAT_REDEFINED_OP_FLAG)) {
- val = DBL2NUM(ruby_float_mod(RFLOAT_VALUE(recv), RFLOAT_VALUE(obj)));
- }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_MOD, FLOAT_REDEFINED_OP_FLAG)) {
- val = DBL2NUM(ruby_float_mod(RFLOAT_VALUE(recv), RFLOAT_VALUE(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);
@@ -1571,48 +1625,48 @@ opt_mod
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idMOD, recv);
}
}
/**
@c optimize
@e optimized X==Y.
- @j 最é©åŒ–ã•れ㟠X==Y。
+ @j Å“K‰»‚³‚ꂽ X==YB
*/
DEFINE_INSN
opt_eq
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
- val = opt_eq_func(recv, obj, ci);
+ val = opt_eq_func(recv, obj, ic);
if (val == Qundef) {
/* other */
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idEq, recv);
}
}
/**
@c optimize
@e optimized X!=Y.
- @j 最é©åŒ–ã•れ㟠X!=Y。
+ @j Å“K‰»‚³‚ꂽ X!=YB
*/
DEFINE_INSN
opt_neq
-(CALL_INFO ci, CALL_INFO ci_eq)
+(IC ic, IC ic_eq)
(VALUE recv, VALUE obj)
(VALUE val)
{
extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
- vm_search_method(ci, recv);
+ const rb_method_entry_t *me = vm_method_search(idNeq, CLASS_OF(recv), ic);
val = Qundef;
- if (check_cfunc(ci->me, rb_obj_not_equal)) {
- val = opt_eq_func(recv, obj, ci_eq);
+ if (check_cfunc(me, rb_obj_not_equal)) {
+ val = opt_eq_func(recv, obj, ic_eq);
if (val != Qundef) {
val = RTEST(val) ? Qfalse : Qtrue;
@@ -1623,23 +1677,23 @@ opt_neq
/* other */
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idNeq, recv);
}
}
/**
@c optimize
@e optimized X<Y.
- @j 最é©åŒ–ã•れ㟠X<Y。
+ @j Å“K‰»‚³‚ꂽ X<YB
*/
DEFINE_INSN
opt_lt
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_LT, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_LT)) {
SIGNED_VALUE a = recv, b = obj;
if (a < b) {
@@ -1649,16 +1703,22 @@ opt_lt
val = Qfalse;
}
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
- /* flonum is not NaN */
- val = RFLOAT_VALUE(recv) < RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
- }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_LT, FLOAT_REDEFINED_OP_FLAG)) {
- val = double_cmp_lt(RFLOAT_VALUE(recv), RFLOAT_VALUE(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);
}
@@ -1667,23 +1727,23 @@ opt_lt
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idLT, recv);
}
}
/**
@c optimize
@e optimized X<=Y.
- @j 最é©åŒ–ã•れ㟠X<=Y。
+ @j Å“K‰»‚³‚ꂽ X<=YB
*/
DEFINE_INSN
opt_le
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_LE, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_LE)) {
SIGNED_VALUE a = recv, b = obj;
if (a <= b) {
@@ -1693,32 +1753,27 @@ opt_le
val = Qfalse;
}
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_LE, FLOAT_REDEFINED_OP_FLAG)) {
- /* flonum is not NaN */
- val = RFLOAT_VALUE(recv) <= RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
- }
else {
/* other */
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idLE, recv);
}
}
/**
@c optimize
@e optimized X>Y.
- @j 最é©åŒ–ã•れ㟠X>Y。
+ @j Å“K‰»‚³‚ꂽ X>YB
*/
DEFINE_INSN
opt_gt
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_GT, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_GT)) {
SIGNED_VALUE a = recv, b = obj;
if (a > b) {
@@ -1728,16 +1783,22 @@ opt_gt
val = Qfalse;
}
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) {
- /* flonum is not NaN */
- val = RFLOAT_VALUE(recv) > RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
- }
else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
- if (HEAP_CLASS_OF(recv) == rb_cFloat && HEAP_CLASS_OF(obj) == rb_cFloat &&
- BASIC_OP_UNREDEFINED_P(BOP_GT, FLOAT_REDEFINED_OP_FLAG)) {
- val = double_cmp_gt(RFLOAT_VALUE(recv), RFLOAT_VALUE(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);
}
@@ -1746,23 +1807,23 @@ opt_gt
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idGT, recv);
}
}
/**
@c optimize
@e optimized X>=Y.
- @j 最é©åŒ–ã•れ㟠X>=Y。
+ @j Å“K‰»‚³‚ꂽ X>=YB
*/
DEFINE_INSN
opt_ge
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (FIXNUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_GE, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_GE)) {
SIGNED_VALUE a = recv, b = obj;
if (a >= b) {
@@ -1772,36 +1833,33 @@ opt_ge
val = Qfalse;
}
}
- else if (FLONUM_2_P(recv, obj) &&
- BASIC_OP_UNREDEFINED_P(BOP_GE, FLOAT_REDEFINED_OP_FLAG)) {
- /* flonum is not NaN */
- val = RFLOAT_VALUE(recv) >= RFLOAT_VALUE(obj) ? Qtrue : Qfalse;
- }
else {
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idGE, recv);
}
}
/**
@c optimize
@e <<
- @j 最é©åŒ–ã•れ㟠X<<Y。
+ @j Å“K‰»‚³‚ꂽ X<<YB
*/
DEFINE_INSN
opt_ltlt
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
if (!SPECIAL_CONST_P(recv)) {
- if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_LTLT, STRING_REDEFINED_OP_FLAG)) {
+ 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, ARRAY_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
val = rb_ary_push(recv, obj);
}
else {
@@ -1812,26 +1870,26 @@ opt_ltlt
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idLTLT, recv);
}
}
/**
@c optimize
@e []
- @j 最é©åŒ–ã•れ㟠recv[obj]。
+ @j Å“K‰»‚³‚ꂽ recv[obj]B
*/
DEFINE_INSN
opt_aref
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj)
(VALUE val)
{
- if (!SPECIAL_CONST_P(recv)) {
- if (HEAP_CLASS_OF(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_AREF, ARRAY_REDEFINED_OP_FLAG) && FIXNUM_P(obj)) {
+ 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 && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) {
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
val = rb_hash_aref(recv, obj);
}
else {
@@ -1842,27 +1900,28 @@ opt_aref
INSN_LABEL(normal_dispatch):
PUSH(recv);
PUSH(obj);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(1, idAREF, recv);
}
}
/**
@c optimize
@e recv[obj] = set
- @j 最é©åŒ–ã•れ㟠recv[obj] = set。
+ @j Å“K‰»‚³‚ꂽ recv[obj] = setB
*/
DEFINE_INSN
opt_aset
-(CALL_INFO ci)
+(IC ic)
(VALUE recv, VALUE obj, VALUE set)
(VALUE val)
{
- if (!SPECIAL_CONST_P(recv)) {
- if (HEAP_CLASS_OF(recv) == rb_cArray && BASIC_OP_UNREDEFINED_P(BOP_ASET, ARRAY_REDEFINED_OP_FLAG) && FIXNUM_P(obj)) {
+ 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 && BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG)) {
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
rb_hash_aset(recv, obj, set);
val = set;
}
@@ -1875,32 +1934,30 @@ opt_aset
PUSH(recv);
PUSH(obj);
PUSH(set);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(2, idASET, recv);
}
}
/**
@c optimize
@e optimized length
- @j 最é©åŒ–ã•れ㟠recv.length()。
+ @j Å“K‰»‚³‚ꂽ recv.length()B
*/
DEFINE_INSN
opt_length
-(CALL_INFO ci)
+(IC ic)
(VALUE recv)
(VALUE val)
{
- if (!SPECIAL_CONST_P(recv)) {
- if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_LENGTH, STRING_REDEFINED_OP_FLAG)) {
+ 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 &&
- BASIC_OP_UNREDEFINED_P(BOP_LENGTH, ARRAY_REDEFINED_OP_FLAG)) {
+ else if (HEAP_CLASS_OF(recv) == rb_cArray) {
val = LONG2NUM(RARRAY_LEN(recv));
}
- else if (HEAP_CLASS_OF(recv) == rb_cHash &&
- BASIC_OP_UNREDEFINED_P(BOP_LENGTH, HASH_REDEFINED_OP_FLAG)) {
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
val = INT2FIX(RHASH_SIZE(recv));
}
else {
@@ -1910,32 +1967,30 @@ opt_length
else {
INSN_LABEL(normal_dispatch):
PUSH(recv);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(0, idLength, recv);
}
}
/**
@c optimize
@e optimized size
- @j 最é©åŒ–ã•れ㟠recv.size()。
+ @j Å“K‰»‚³‚ꂽ recv.size()B
*/
DEFINE_INSN
opt_size
-(CALL_INFO ci)
+(IC ic)
(VALUE recv)
(VALUE val)
{
- if (!SPECIAL_CONST_P(recv)) {
- if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_SIZE, STRING_REDEFINED_OP_FLAG)) {
+ 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 &&
- BASIC_OP_UNREDEFINED_P(BOP_SIZE, ARRAY_REDEFINED_OP_FLAG)) {
+ else if (HEAP_CLASS_OF(recv) == rb_cArray) {
val = LONG2NUM(RARRAY_LEN(recv));
}
- else if (HEAP_CLASS_OF(recv) == rb_cHash &&
- BASIC_OP_UNREDEFINED_P(BOP_SIZE, HASH_REDEFINED_OP_FLAG)) {
+ else if (HEAP_CLASS_OF(recv) == rb_cHash) {
val = INT2FIX(RHASH_SIZE(recv));
}
else {
@@ -1945,62 +2000,24 @@ opt_size
else {
INSN_LABEL(normal_dispatch):
PUSH(recv);
- CALL_SIMPLE_METHOD(recv);
- }
-}
-
-/**
- @c optimize
- @e optimized empty?
- @j 最é©åŒ–ã•れ㟠recv.empty?()。
- */
-DEFINE_INSN
-opt_empty_p
-(CALL_INFO ci)
-(VALUE recv)
-(VALUE val)
-{
- if (!SPECIAL_CONST_P(recv)) {
- if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, STRING_REDEFINED_OP_FLAG)) {
- if (RSTRING_LEN(recv) == 0) val = Qtrue;
- else val = Qfalse;
- }
- else if (HEAP_CLASS_OF(recv) == rb_cArray &&
- BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, ARRAY_REDEFINED_OP_FLAG)) {
- if (RARRAY_LEN(recv) == 0) val = Qtrue;
- else val = Qfalse;
- }
- else if (HEAP_CLASS_OF(recv) == rb_cHash &&
- BASIC_OP_UNREDEFINED_P(BOP_EMPTY_P, HASH_REDEFINED_OP_FLAG)) {
- if (RHASH_EMPTY_P(recv)) val = Qtrue;
- else val = Qfalse;
- }
- else {
- goto INSN_LABEL(normal_dispatch);
- }
- }
- else {
- INSN_LABEL(normal_dispatch):
- PUSH(recv);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(0, idSize, recv);
}
}
/**
@c optimize
@e optimized succ
- @j 最é©åŒ–ã•れ㟠recv.succ()。
+ @j Å“K‰»‚³‚ꂽ recv.succ()B
*/
DEFINE_INSN
opt_succ
-(CALL_INFO ci)
+(IC ic)
(VALUE recv)
(VALUE val)
{
if (SPECIAL_CONST_P(recv)) {
if (FIXNUM_P(recv) &&
- BASIC_OP_UNREDEFINED_P(BOP_SUCC, FIXNUM_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
const VALUE obj = INT2FIX(1);
/* fixnum + INT2FIX(1) */
val = (recv + (obj & (~1)));
@@ -2015,11 +2032,11 @@ opt_succ
}
else {
if (HEAP_CLASS_OF(recv) == rb_cString &&
- BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) {
+ 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, TIME_REDEFINED_OP_FLAG)) {
+ BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
val = rb_time_succ(recv);
}
else
@@ -2030,30 +2047,30 @@ opt_succ
if (0) {
INSN_LABEL(normal_dispatch):
PUSH(recv);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(0, idSucc, recv);
}
}
/**
@c optimize
@e optimized not
- @j 最é©åŒ–ã•れ㟠recv.!()。
+ @j Å“K‰»‚³‚ꂽ recv.!()B
*/
DEFINE_INSN
opt_not
-(CALL_INFO ci)
+(IC ic)
(VALUE recv)
(VALUE val)
{
extern VALUE rb_obj_not(VALUE obj);
- vm_search_method(ci, recv);
+ const rb_method_entry_t *me = vm_method_search(idNot, CLASS_OF(recv), ic);
- if (check_cfunc(ci->me, rb_obj_not)) {
+ if (check_cfunc(me, rb_obj_not)) {
val = RTEST(recv) ? Qfalse : Qtrue;
}
else {
PUSH(recv);
- CALL_SIMPLE_METHOD(recv);
+ CALL_SIMPLE_METHOD(0, idNot, recv);
}
}
@@ -2061,7 +2078,7 @@ opt_not
/**
@c optimize
@e optimized regexp match
- @j 最é©åŒ–ã•ã‚ŒãŸæ­£è¦è¡¨ç¾ãƒžãƒƒãƒã€‚
+ @j Å“K‰»‚³‚ꂽ³‹K•\Œ»ƒ}ƒbƒ`B
*/
DEFINE_INSN
opt_regexpmatch1
@@ -2075,7 +2092,7 @@ opt_regexpmatch1
/**
@c optimize
@e optimized regexp match 2
- @j 最é©åŒ–ã•ã‚ŒãŸæ­£è¦è¡¨ç¾ãƒžãƒƒãƒ 2
+ @j Å“K‰»‚³‚ꂽ³‹K•\Œ»ƒ}ƒbƒ` 2
*/
DEFINE_INSN
opt_regexpmatch2
@@ -2083,7 +2100,7 @@ opt_regexpmatch2
(VALUE obj2, VALUE obj1)
(VALUE val)
{
- if (RB_TYPE_P(obj2, T_STRING)) {
+ if (TYPE(obj2) == T_STRING) {
val = rb_reg_match(obj1, obj2);
}
else {
@@ -2094,7 +2111,7 @@ opt_regexpmatch2
/**
@c optimize
@e call native compiled method
- @j ãƒã‚¤ãƒ†ã‚£ãƒ–コンパイルã—ãŸãƒ¡ã‚½ãƒƒãƒ‰ã‚’起動。
+ @j ƒlƒCƒeƒBƒuƒRƒ“ƒpƒCƒ‹‚µ‚½ƒƒ\ƒbƒh‚ð‹N“®B
*/
DEFINE_INSN
opt_call_c_function
@@ -2131,7 +2148,7 @@ bitblt
/**
@c joke
@e The Answer to Life, the Universe, and Everything
- @j 人生ã€å®‡å®™ã€ã™ã¹ã¦ã®ç­”ãˆã€‚
+ @j l¶A‰F’ˆA‚·‚ׂĂ̓š‚¦B
*/
DEFINE_INSN
answer
diff --git a/internal.h b/internal.h
deleted file mode 100644
index 62b178e473..0000000000
--- a/internal.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/**********************************************************************
-
- internal.h -
-
- $Author$
- created at: Tue May 17 11:42:20 JST 2011
-
- Copyright (C) 2011 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_INTERNAL_H
-#define RUBY_INTERNAL_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \
- (a) == 0 ? 0 : \
- (a) == -1 ? (b) < -(max) : \
- (a) > 0 ? \
- ((b) > 0 ? (max) / (a) < (b) : (min) / (a) > (b)) : \
- ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b)))
-#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
-#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX)
-
-struct rb_deprecated_classext_struct {
- char conflict[sizeof(VALUE) * 3];
-};
-
-struct rb_classext_struct {
- VALUE super;
- struct st_table *iv_tbl;
- struct st_table *const_tbl;
- VALUE origin;
- VALUE refined_class;
- rb_alloc_func_t allocator;
-};
-
-#undef RCLASS_SUPER
-#define RCLASS_EXT(c) (RCLASS(c)->ptr)
-#define RCLASS_SUPER(c) (RCLASS_EXT(c)->super)
-#define RCLASS_IV_TBL(c) (RCLASS_EXT(c)->iv_tbl)
-#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl)
-#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
-#define RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
-#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin)
-#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class)
-
-struct vtm; /* defined by timev.h */
-
-/* array.c */
-VALUE rb_ary_last(int, VALUE *, VALUE);
-void rb_ary_set_len(VALUE, long);
-VALUE rb_ary_cat(VALUE, const VALUE *, long);
-void rb_ary_delete_same(VALUE, VALUE);
-
-/* bignum.c */
-VALUE rb_big_fdiv(VALUE x, VALUE y);
-VALUE rb_big_uminus(VALUE x);
-VALUE rb_integer_float_cmp(VALUE x, VALUE y);
-VALUE rb_integer_float_eq(VALUE x, VALUE y);
-
-/* class.c */
-VALUE rb_obj_methods(int argc, VALUE *argv, VALUE obj);
-VALUE rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj);
-VALUE rb_obj_private_methods(int argc, VALUE *argv, VALUE obj);
-VALUE rb_obj_public_methods(int argc, VALUE *argv, VALUE obj);
-int rb_obj_basic_to_s_p(VALUE);
-VALUE rb_special_singleton_class(VALUE);
-VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach);
-void Init_class_hierarchy(void);
-
-/* compar.c */
-VALUE rb_invcmp(VALUE, VALUE);
-
-/* compile.c */
-int rb_dvar_defined(ID);
-int rb_local_defined(ID);
-int rb_parse_in_eval(void);
-int rb_parse_in_main(void);
-const char * rb_insns_name(int i);
-VALUE rb_insns_name_array(void);
-
-/* cont.c */
-VALUE rb_obj_is_fiber(VALUE);
-void rb_fiber_reset_root_local_storage(VALUE);
-
-/* debug.c */
-PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
-
-/* dmyext.c */
-void Init_ext(void);
-
-/* encoding.c */
-ID rb_id_encoding(void);
-
-/* encoding.c */
-void rb_gc_mark_encodings(void);
-
-/* error.c */
-NORETURN(PRINTF_ARGS(void rb_compile_bug(const char*, int, const char*, ...), 3, 4));
-VALUE rb_check_backtrace(VALUE);
-NORETURN(void rb_async_bug_errno(const char *,int));
-const char *rb_builtin_type_name(int t);
-const char *rb_builtin_class_name(VALUE x);
-
-/* eval.c */
-VALUE rb_refinement_module_get_refined_class(VALUE module);
-
-/* eval_error.c */
-void ruby_error_print(void);
-VALUE rb_get_backtrace(VALUE info);
-
-/* eval_jump.c */
-void rb_call_end_proc(VALUE data);
-void rb_mark_end_proc(void);
-
-/* file.c */
-VALUE rb_home_dir(const char *user, VALUE result);
-VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
-void rb_file_const(const char*, VALUE);
-int rb_file_load_ok(const char *);
-VALUE rb_file_expand_path_fast(VALUE, VALUE);
-VALUE rb_file_expand_path_internal(VALUE, VALUE, int, int, VALUE);
-VALUE rb_get_path_check_to_string(VALUE, int);
-VALUE rb_get_path_check_convert(VALUE, VALUE, int);
-void Init_File(void);
-
-#ifdef _WIN32
-/* file.c, win32/file.c */
-void rb_w32_init_file(void);
-#endif
-
-/* gc.c */
-void Init_heap(void);
-void *ruby_mimmalloc(size_t size);
-
-/* inits.c */
-void rb_call_inits(void);
-
-/* io.c */
-const char *ruby_get_inplace_mode(void);
-void ruby_set_inplace_mode(const char *);
-ssize_t rb_io_bufread(VALUE io, void *buf, size_t size);
-void rb_stdio_set_default_encoding(void);
-void rb_write_error_str(VALUE mesg);
-
-/* iseq.c */
-VALUE rb_iseq_clone(VALUE iseqval, VALUE newcbase);
-
-/* load.c */
-VALUE rb_get_load_path(void);
-VALUE rb_get_expanded_load_path(void);
-NORETURN(void rb_load_fail(VALUE, const char*));
-
-/* math.c */
-VALUE rb_math_atan2(VALUE, VALUE);
-VALUE rb_math_cos(VALUE);
-VALUE rb_math_cosh(VALUE);
-VALUE rb_math_exp(VALUE);
-VALUE rb_math_hypot(VALUE, VALUE);
-VALUE rb_math_log(int argc, VALUE *argv);
-VALUE rb_math_sin(VALUE);
-VALUE rb_math_sinh(VALUE);
-VALUE rb_math_sqrt(VALUE);
-
-/* newline.c */
-void Init_newline(void);
-
-/* numeric.c */
-int rb_num_to_uint(VALUE val, unsigned int *ret);
-VALUE num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl);
-int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl);
-double ruby_float_mod(double x, double y);
-int rb_num_negative_p(VALUE);
-VALUE rb_int_succ(VALUE num);
-VALUE rb_int_pred(VALUE num);
-
-/* object.c */
-void rb_obj_copy_ivar(VALUE dest, VALUE obj);
-VALUE rb_obj_equal(VALUE obj1, VALUE obj2);
-VALUE rb_class_search_ancestor(VALUE klass, VALUE super);
-
-/* parse.y */
-VALUE rb_parser_get_yydebug(VALUE);
-VALUE rb_parser_set_yydebug(VALUE, VALUE);
-int rb_is_const_name(VALUE name);
-int rb_is_class_name(VALUE name);
-int rb_is_global_name(VALUE name);
-int rb_is_instance_name(VALUE name);
-int rb_is_attrset_name(VALUE name);
-int rb_is_local_name(VALUE name);
-int rb_is_method_name(VALUE name);
-int rb_is_junk_name(VALUE name);
-void rb_gc_mark_parser(void);
-void rb_gc_mark_symbols(void);
-
-/* proc.c */
-VALUE rb_proc_location(VALUE self);
-st_index_t rb_hash_proc(st_index_t hash, VALUE proc);
-
-/* process.c */
-#define RB_MAX_GROUPS (65536)
-
-struct rb_execarg {
- int use_shell;
- union {
- struct {
- VALUE shell_script;
- } sh;
- struct {
- VALUE command_name;
- VALUE command_abspath; /* full path string or nil */
- VALUE argv_str;
- VALUE argv_buf;
- } cmd;
- } invoke;
- VALUE redirect_fds;
- VALUE envp_str;
- VALUE envp_buf;
- VALUE dup2_tmpbuf;
- unsigned pgroup_given : 1;
- unsigned umask_given : 1;
- unsigned unsetenv_others_given : 1;
- unsigned unsetenv_others_do : 1;
- unsigned close_others_given : 1;
- unsigned close_others_do : 1;
- unsigned chdir_given : 1;
- unsigned new_pgroup_given : 1;
- unsigned new_pgroup_flag : 1;
- unsigned uid_given : 1;
- unsigned gid_given : 1;
- rb_pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0<V). */
- VALUE rlimit_limits; /* Qfalse or [[rtype, softlim, hardlim], ...] */
- mode_t umask_mask;
- rb_uid_t uid;
- rb_gid_t gid;
- VALUE fd_dup2;
- VALUE fd_close;
- VALUE fd_open;
- VALUE fd_dup2_child;
- int close_others_maxhint;
- VALUE env_modification; /* Qfalse or [[k1,v1], ...] */
- VALUE chdir_dir;
-};
-
-/* argv_str contains extra two elements.
- * The beginning one is for /bin/sh used by exec_with_sh.
- * The last one for terminating NULL used by execve.
- * See rb_exec_fillarg() in process.c. */
-#define ARGVSTR2ARGC(argv_str) (RSTRING_LEN(argv_str) / sizeof(char *) - 2)
-#define ARGVSTR2ARGV(argv_str) ((char **)RSTRING_PTR(argv_str) + 1)
-
-rb_pid_t rb_fork_ruby(int *status);
-void rb_last_status_clear(void);
-
-/* rational.c */
-VALUE rb_lcm(VALUE x, VALUE y);
-VALUE rb_rational_reciprocal(VALUE x);
-
-/* re.c */
-VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline);
-VALUE rb_reg_check_preprocess(VALUE);
-
-/* signal.c */
-int rb_get_next_signal(void);
-int rb_sigaltstack_size(void);
-
-/* strftime.c */
-#ifdef RUBY_ENCODING_H
-size_t rb_strftime_timespec(char *s, size_t maxsize, const char *format, rb_encoding *enc,
- const struct vtm *vtm, struct timespec *ts, int gmt);
-size_t rb_strftime(char *s, size_t maxsize, const char *format, rb_encoding *enc,
- const struct vtm *vtm, VALUE timev, int gmt);
-#endif
-
-/* string.c */
-int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p);
-int rb_str_symname_p(VALUE);
-VALUE rb_str_quote_unprintable(VALUE);
-VALUE rb_id_quote_unprintable(ID);
-#define QUOTE(str) rb_str_quote_unprintable(str)
-#define QUOTE_ID(id) rb_id_quote_unprintable(id)
-VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg);
-
-/* struct.c */
-VALUE rb_struct_init_copy(VALUE copy, VALUE s);
-
-/* time.c */
-struct timeval rb_time_timeval(VALUE);
-
-/* thread.c */
-VALUE rb_obj_is_mutex(VALUE obj);
-VALUE rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg);
-void rb_thread_execute_interrupts(VALUE th);
-void rb_clear_trace_func(void);
-VALUE rb_get_coverages(void);
-VALUE rb_thread_shield_new(void);
-VALUE rb_thread_shield_wait(VALUE self);
-VALUE rb_thread_shield_release(VALUE self);
-VALUE rb_thread_shield_destroy(VALUE self);
-void rb_mutex_allow_trap(VALUE self, int val);
-VALUE rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data);
-VALUE rb_mutex_owned_p(VALUE self);
-
-/* thread_pthread.c, thread_win32.c */
-void Init_native_thread(void);
-
-/* vm.c */
-VALUE rb_obj_is_thread(VALUE obj);
-void rb_vm_mark(void *ptr);
-void Init_BareVM(void);
-VALUE rb_vm_top_self(void);
-void rb_thread_recycle_stack_release(VALUE *);
-void rb_vm_change_state(void);
-void rb_vm_inc_const_missing_count(void);
-void rb_thread_mark(void *th);
-const void **rb_vm_get_insns_address_table(void);
-VALUE rb_sourcefilename(void);
-void rb_vm_pop_cfunc_frame(void);
-
-/* vm_dump.c */
-void rb_vm_bugreport(void);
-
-/* vm_eval.c */
-void Init_vm_eval(void);
-VALUE rb_current_realfilepath(void);
-VALUE rb_check_block_call(VALUE, ID, int, VALUE *, VALUE (*)(ANYARGS), VALUE);
-typedef void rb_check_funcall_hook(int, VALUE, ID, int, VALUE *, VALUE);
-VALUE rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, VALUE *argv,
- rb_check_funcall_hook *hook, VALUE arg);
-
-/* vm_method.c */
-void Init_eval_method(void);
-int rb_method_defined_by(VALUE obj, ID mid, VALUE (*cfunc)(ANYARGS));
-
-/* miniprelude.c, prelude.c */
-void Init_prelude(void);
-
-/* vm_backtrace.c */
-void Init_vm_backtrace(void);
-VALUE vm_thread_backtrace(int argc, VALUE *argv, VALUE thval);
-VALUE vm_thread_backtrace_locations(int argc, VALUE *argv, VALUE thval);
-
-VALUE rb_make_backtrace(void);
-void rb_backtrace_print_as_bugreport(void);
-int rb_backtrace_p(VALUE obj);
-VALUE rb_backtrace_to_str_ary(VALUE obj);
-VALUE rb_vm_backtrace_object();
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-const char *rb_objspace_data_type_name(VALUE obj);
-
-/* Temporary. This API will be removed (renamed). */
-VALUE rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd);
-
-/* io.c */
-void rb_maygvl_fd_fix_cloexec(int fd);
-
-/* process.c */
-int rb_exec_async_signal_safe(const struct rb_execarg *e, char *errmsg, size_t errmsg_buflen);
-rb_pid_t rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds, char *errmsg, size_t errmsg_buflen);
-VALUE rb_execarg_new(int argc, VALUE *argv, int accept_shell);
-struct rb_execarg *rb_execarg_get(VALUE execarg_obj); /* dangerous. needs GC guard. */
-VALUE rb_execarg_init(int argc, VALUE *argv, int accept_shell, VALUE execarg_obj);
-int rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val);
-void rb_execarg_fixup(VALUE execarg_obj);
-int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, char* errmsg, size_t errmsg_buflen);
-VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash);
-void rb_execarg_setenv(VALUE execarg_obj, VALUE env);
-
-/* variable.c */
-void rb_gc_mark_global_tbl(void);
-void rb_mark_generic_ivar(VALUE);
-void rb_mark_generic_ivar_tbl(void);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-} /* extern "C" { */
-#endif
-
-#endif /* RUBY_INTERNAL_H */
diff --git a/io.c b/io.c
index 786b8883a8..065b165906 100644
--- a/io.c
+++ b/io.c
@@ -13,13 +13,9 @@
#include "ruby/ruby.h"
#include "ruby/io.h"
-#include "ruby/thread.h"
#include "dln.h"
-#include "internal.h"
-#include "id.h"
#include <ctype.h>
#include <errno.h>
-#include "ruby_atomic.h"
#define free(x) xfree(x)
@@ -31,16 +27,18 @@
#if defined HAVE_NET_SOCKET_H
# include <net/socket.h>
#elif defined HAVE_SYS_SOCKET_H
-# ifndef __native_client__
-# include <sys/socket.h>
-# endif
+# include <sys/socket.h>
#endif
#if defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__EMX__) || defined(__BEOS__) || defined(__HAIKU__)
# define NO_SAFE_RENAME
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun) || defined(_nec_ews)
+#if defined(__CYGWIN__) || defined(_WIN32)
+# define NO_LONG_FNAME
+#endif
+
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) || defined(_nec_ews)
# define USE_SETVBUF
#endif
@@ -52,9 +50,6 @@
#if defined(HAVE_SYS_IOCTL_H) && !defined(_WIN32)
#include <sys/ioctl.h>
#endif
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/ioctl.h"
-#endif
#if defined(HAVE_FCNTL_H) || defined(_WIN32)
#include <fcntl.h>
#elif defined(HAVE_SYS_FCNTL_H)
@@ -86,6 +81,8 @@
#include <sys/syscall.h>
#endif
+extern void Init_File(void);
+
#if defined(__BEOS__) || defined(__HAIKU__)
# ifndef NOFILE
# define NOFILE (OPEN_MAX)
@@ -110,11 +107,6 @@
# endif
#endif
-#if defined(HAVE___SYSCALL) && (defined(__APPLE__) || defined(__OpenBSD__))
-/* Mac OS X and OpenBSD have __syscall but don't define it in headers */
-off_t __syscall(quad_t number, ...);
-#endif
-
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
#define IO_RBUF_CAPA_MIN 8192
@@ -149,203 +141,24 @@ static ID id_write, id_read, id_getc, id_flush, id_readpartial, id_set_encoding;
static VALUE sym_mode, sym_perm, sym_extenc, sym_intenc, sym_encoding, sym_open_args;
static VALUE sym_textmode, sym_binmode, sym_autoclose;
+struct timeval rb_time_interval(VALUE);
+
struct argf {
VALUE filename, current_file;
- long last_lineno; /* $. */
- long lineno;
+ int last_lineno; /* $. */
+ int lineno;
+ int init_p, next_p;
VALUE argv;
char *inplace;
+ int binmode;
struct rb_io_enc_t encs;
- int8_t init_p, next_p, binmode;
};
-static rb_atomic_t max_file_descriptor = NOFILE;
-void
-rb_update_max_fd(int fd)
-{
- struct stat buf;
- rb_atomic_t afd = (rb_atomic_t)fd;
-
- if (fstat(fd, &buf) != 0 && errno == EBADF) {
- rb_bug("rb_update_max_fd: invalid fd (%d) given.", fd);
- }
-
- while (max_file_descriptor < afd) {
- ATOMIC_CAS(max_file_descriptor, max_file_descriptor, afd);
- }
-}
-
-void
-rb_maygvl_fd_fix_cloexec(int fd)
-{
- /* MinGW don't have F_GETFD and FD_CLOEXEC. [ruby-core:40281] */
-#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
- int flags, flags2, ret;
- flags = fcntl(fd, F_GETFD); /* should not fail except EBADF. */
- if (flags == -1) {
- rb_bug("rb_maygvl_fd_fix_cloexec: fcntl(%d, F_GETFD) failed: %s", fd, strerror(errno));
- }
- if (fd <= 2)
- flags2 = flags & ~FD_CLOEXEC; /* Clear CLOEXEC for standard file descriptors: 0, 1, 2. */
- else
- flags2 = flags | FD_CLOEXEC; /* Set CLOEXEC for non-standard file descriptors: 3, 4, 5, ... */
- if (flags != flags2) {
- ret = fcntl(fd, F_SETFD, flags2);
- if (ret == -1) {
- rb_bug("rb_maygvl_fd_fix_cloexec: fcntl(%d, F_SETFD, %d) failed: %s", fd, flags2, strerror(errno));
- }
- }
-#endif
-}
-
-void
-rb_fd_fix_cloexec(int fd)
-{
- rb_maygvl_fd_fix_cloexec(fd);
- rb_update_max_fd(fd);
-}
-
-int
-rb_cloexec_open(const char *pathname, int flags, mode_t mode)
-{
- int ret;
-#ifdef O_CLOEXEC
- /* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */
- flags |= O_CLOEXEC;
-#elif defined O_NOINHERIT
- flags |= O_NOINHERIT;
-#endif
- ret = open(pathname, flags, mode);
- if (ret == -1) return -1;
- rb_maygvl_fd_fix_cloexec(ret);
- return ret;
-}
-
-int
-rb_cloexec_dup(int oldfd)
-{
- /* Don't allocate standard file descriptors: 0, 1, 2 */
- return rb_cloexec_fcntl_dupfd(oldfd, 3);
-}
-
-int
-rb_cloexec_dup2(int oldfd, int newfd)
-{
- int ret;
-
- /* When oldfd == newfd, dup2 succeeds but dup3 fails with EINVAL.
- * rb_cloexec_dup2 succeeds as dup2. */
- if (oldfd == newfd) {
- ret = newfd;
- }
- else {
-#if defined(HAVE_DUP3) && defined(O_CLOEXEC)
- static int try_dup3 = 1;
- if (2 < newfd && try_dup3) {
- ret = dup3(oldfd, newfd, O_CLOEXEC);
- if (ret != -1)
- return ret;
- /* dup3 is available since Linux 2.6.27, glibc 2.9. */
- if (errno == ENOSYS) {
- try_dup3 = 0;
- ret = dup2(oldfd, newfd);
- }
- }
- else {
- ret = dup2(oldfd, newfd);
- }
-#else
- ret = dup2(oldfd, newfd);
-# ifdef _WIN32
- if (newfd >= 0 && newfd <= 2)
- SetStdHandle(newfd == 0 ? STD_INPUT_HANDLE : newfd == 1 ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE, (HANDLE)rb_w32_get_osfhandle(newfd));
-# endif
-#endif
- if (ret == -1) return -1;
- }
- rb_maygvl_fd_fix_cloexec(ret);
- return ret;
-}
-
-int
-rb_cloexec_pipe(int fildes[2])
-{
- int ret;
-
-#if defined(HAVE_PIPE2)
- static int try_pipe2 = 1;
- if (try_pipe2) {
- ret = pipe2(fildes, O_CLOEXEC);
- if (ret != -1)
- return ret;
- /* pipe2 is available since Linux 2.6.27, glibc 2.9. */
- if (errno == ENOSYS) {
- try_pipe2 = 0;
- ret = pipe(fildes);
- }
- }
- else {
- ret = pipe(fildes);
- }
-#else
- ret = pipe(fildes);
-#endif
- if (ret == -1) return -1;
-#ifdef __CYGWIN__
- if (ret == 0 && fildes[1] == -1) {
- close(fildes[0]);
- fildes[0] = -1;
- errno = ENFILE;
- return -1;
- }
-#endif
- rb_maygvl_fd_fix_cloexec(fildes[0]);
- rb_maygvl_fd_fix_cloexec(fildes[1]);
- return ret;
-}
-
-int
-rb_cloexec_fcntl_dupfd(int fd, int minfd)
-{
- int ret;
-
-#if defined(HAVE_FCNTL) && defined(F_DUPFD_CLOEXEC) && defined(F_DUPFD)
- static int try_dupfd_cloexec = 1;
- if (try_dupfd_cloexec) {
- ret = fcntl(fd, F_DUPFD_CLOEXEC, minfd);
- if (ret != -1) {
- if (ret <= 2)
- rb_maygvl_fd_fix_cloexec(ret);
- return ret;
- }
- /* F_DUPFD_CLOEXEC is available since Linux 2.6.24. Linux 2.6.18 fails with EINVAL */
- if (errno == EINVAL) {
- ret = fcntl(fd, F_DUPFD, minfd);
- if (ret != -1) {
- try_dupfd_cloexec = 0;
- }
- }
- }
- else {
- ret = fcntl(fd, F_DUPFD, minfd);
- }
-#elif defined(HAVE_FCNTL) && defined(F_DUPFD)
- ret = fcntl(fd, F_DUPFD, minfd);
-#elif defined(HAVE_DUP)
- ret = dup(fd);
- if (ret != -1 && ret < minfd) {
- const int prev_fd = ret;
- ret = rb_cloexec_fcntl_dupfd(fd, minfd);
- close(prev_fd);
- }
- return ret;
-#else
-# error "dup() or fcntl(F_DUPFD) must be supported."
-#endif
- if (ret == -1) return -1;
- rb_maygvl_fd_fix_cloexec(ret);
- return ret;
-}
+static int max_file_descriptor = NOFILE;
+#define UPDATE_MAXFD(fd) \
+ do { \
+ if (max_file_descriptor < (fd)) max_file_descriptor = (fd); \
+ } while (0)
#define argf_of(obj) (*(struct argf *)DATA_PTR(obj))
#define ARGF argf_of(argf)
@@ -361,25 +174,25 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
#elif defined(FILE_READEND)
# define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
#elif defined(__BEOS__) || defined(__HAIKU__)
-# define STDIO_READ_DATA_PENDING(fp) ((fp)->_state._eof == 0)
+# define STDIO_READ_DATA_PENDING(fp) (fp->_state._eof == 0)
#else
# define STDIO_READ_DATA_PENDING(fp) (!feof(fp))
#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.ptr+(fptr)->rbuf.off)
+#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_CHAR_PENDING(fptr) ((fptr)->cbuf.len)
-#define READ_CHAR_PENDING_COUNT(fptr) ((fptr)->cbuf.len)
-#define READ_CHAR_PENDING_PTR(fptr) ((fptr)->cbuf.ptr+(fptr)->cbuf.off)
+#define READ_CHAR_PENDING(fptr) ((fptr)->cbuf_len)
+#define READ_CHAR_PENDING_COUNT(fptr) ((fptr)->cbuf_len)
+#define READ_CHAR_PENDING_PTR(fptr) ((fptr)->cbuf+(fptr)->cbuf_off)
#if defined(_WIN32)
#define WAIT_FD_IN_WIN32(fptr) \
- (rb_w32_io_cancelable_p((fptr)->fd) ? 0 : rb_thread_wait_fd((fptr)->fd))
+ (rb_w32_has_cancel_io() ? 0 : rb_thread_wait_fd((fptr)->fd))
#else
#define WAIT_FD_IN_WIN32(fptr)
#endif
@@ -396,172 +209,34 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
# define S_ISSOCK(m) _S_ISSOCK(m)
# else
# ifdef _S_IFSOCK
-# define S_ISSOCK(m) (((m) & S_IFMT) == _S_IFSOCK)
+# define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
# else
# ifdef S_IFSOCK
-# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+# define S_ISSOCK(m) ((m & S_IFMT) == S_IFSOCK)
# endif
# endif
# endif
#endif
-#define rb_sys_fail_path(path) rb_sys_fail_str(path)
-
-static int io_fflush(rb_io_t *);
-static rb_io_t *flush_before_seek(rb_io_t *fptr);
-
-#define NEED_NEWLINE_DECORATOR_ON_READ(fptr) ((fptr)->mode & FMODE_TEXTMODE)
-#define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) ((fptr)->mode & FMODE_TEXTMODE)
#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
/* Windows */
-# define DEFAULT_TEXTMODE FMODE_TEXTMODE
+# 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
-/*
- * CRLF newline is set as default newline decorator.
- * If only CRLF newline conversion is needed, we use binary IO process
- * with OS's text mode for IO performance improvement.
- * If encoding conversion is needed or a user sets text mode, we use encoding
- * conversion IO process and universal newline decorator by default.
- */
-#define NEED_READCONV(fptr) ((fptr)->encs.enc2 != NULL || (fptr)->encs.ecflags & ~ECONV_CRLF_NEWLINE_DECORATOR)
-#define NEED_WRITECONV(fptr) (((fptr)->encs.enc != NULL && (fptr)->encs.enc != rb_ascii8bit_encoding()) || ((fptr)->encs.ecflags & ((ECONV_DECORATOR_MASK & ~ECONV_CRLF_NEWLINE_DECORATOR)|ECONV_STATEFUL_DECORATOR_MASK)))
-#define SET_BINARY_MODE(fptr) setmode((fptr)->fd, O_BINARY)
-
-#define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) do {\
- if (NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {\
- if (((fptr)->mode & FMODE_READABLE) &&\
- !((fptr)->encs.ecflags & ECONV_NEWLINE_DECORATOR_MASK)) {\
- setmode((fptr)->fd, O_BINARY);\
- }\
- else {\
- setmode((fptr)->fd, O_TEXT);\
- }\
- }\
-} while(0)
-
-#define SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags) do {\
- if ((enc2) && ((ecflags) & ECONV_DEFAULT_NEWLINE_DECORATOR)) {\
- (ecflags) |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;\
- }\
-} while(0)
-
-/*
- * IO unread with taking care of removed '\r' in text mode.
- */
-static void
-io_unread(rb_io_t *fptr)
-{
- off_t r, pos;
- ssize_t read_size;
- long i;
- long newlines = 0;
- long extra_max;
- char *p;
- char *buf;
-
- rb_io_check_closed(fptr);
- if (fptr->rbuf.len == 0 || fptr->mode & FMODE_DUPLEX) {
- return;
- }
-
- errno = 0;
- if (!rb_w32_fd_is_text(fptr->fd)) {
- r = lseek(fptr->fd, -fptr->rbuf.len, SEEK_CUR);
- if (r < 0 && errno) {
- if (errno == ESPIPE)
- fptr->mode |= FMODE_DUPLEX;
- return;
- }
-
- fptr->rbuf.off = 0;
- fptr->rbuf.len = 0;
- return;
- }
-
- pos = lseek(fptr->fd, 0, SEEK_CUR);
- if (pos < 0 && errno) {
- if (errno == ESPIPE)
- fptr->mode |= FMODE_DUPLEX;
- return;
- }
-
- /* add extra offset for removed '\r' in rbuf */
- extra_max = (long)(pos - fptr->rbuf.len);
- p = fptr->rbuf.ptr + fptr->rbuf.off;
-
- /* if the end of rbuf is '\r', rbuf doesn't have '\r' within rbuf.len */
- if (*(fptr->rbuf.ptr + fptr->rbuf.capa - 1) == '\r') {
- newlines++;
- }
-
- for (i = 0; i < fptr->rbuf.len; i++) {
- if (*p == '\n') newlines++;
- if (extra_max == newlines) break;
- p++;
- }
-
- buf = ALLOC_N(char, fptr->rbuf.len + newlines);
- while (newlines >= 0) {
- r = lseek(fptr->fd, pos - fptr->rbuf.len - newlines, SEEK_SET);
- if (newlines == 0) break;
- if (r < 0) {
- newlines--;
- continue;
- }
- read_size = _read(fptr->fd, buf, fptr->rbuf.len + newlines);
- if (read_size < 0) {
- free(buf);
- rb_sys_fail_path(fptr->pathv);
- }
- if (read_size == fptr->rbuf.len) {
- lseek(fptr->fd, r, SEEK_SET);
- break;
- }
- else {
- newlines--;
- }
- }
- free(buf);
- fptr->rbuf.off = 0;
- fptr->rbuf.len = 0;
- return;
-}
-
-/*
- * We use io_seek to back cursor position when changing mode from text to binary,
- * but stdin and pipe cannot seek back. Stdin and pipe read should use encoding
- * conversion for working properly with mode change.
- *
- * Return previous translation mode.
- */
-static inline int
-set_binary_mode_with_seek_cur(rb_io_t *fptr)
-{
- if (!rb_w32_fd_is_text(fptr->fd)) return O_BINARY;
-
- if (fptr->rbuf.len == 0 || fptr->mode & FMODE_DUPLEX) {
- return setmode(fptr->fd, O_BINARY);
- }
- flush_before_seek(fptr);
- return setmode(fptr->fd, O_BINARY);
-}
-#define SET_BINARY_MODE_WITH_SEEK_CUR(fptr) set_binary_mode_with_seek_cur(fptr)
-
#else
/* Unix */
-# define DEFAULT_TEXTMODE 0
-#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)))
-#define SET_BINARY_MODE(fptr) (void)(fptr)
-#define NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr) (void)(fptr)
-#define SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags) ((void)(enc2), (void)(ecflags))
-#define SET_BINARY_MODE_WITH_SEEK_CUR(fptr) (void)(fptr)
+# define NEED_NEWLINE_DECORATOR_ON_READ(fptr) (fptr->mode & FMODE_TEXTMODE)
+# define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) 0
#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)))
#if !defined HAVE_SHUTDOWN && !defined shutdown
#define shutdown(a,b) 0
#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)
@@ -577,26 +252,18 @@ is_socket(int fd, VALUE path)
}
#endif
-static const char closed_stream[] = "closed stream";
-
void
rb_eof_error(void)
{
rb_raise(rb_eEOFError, "end of file reached");
}
-static VALUE
-taint_check(VALUE io)
-{
- if (!OBJ_UNTRUSTED(io) && rb_safe_level() >= 4)
- rb_raise(rb_eSecurityError, "Insecure: operation on trusted IO");
- return io;
-}
-
VALUE
rb_io_taint_check(VALUE io)
{
- rb_check_frozen(taint_check(io));
+ if (!OBJ_UNTRUSTED(io) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: operation on trusted IO");
+ rb_check_frozen(io);
return io;
}
@@ -613,10 +280,11 @@ rb_io_check_closed(rb_io_t *fptr)
{
rb_io_check_initialized(fptr);
if (fptr->fd < 0) {
- rb_raise(rb_eIOError, closed_stream);
+ rb_raise(rb_eIOError, "closed stream");
}
}
+static int io_fflush(rb_io_t *);
VALUE
rb_io_get_io(VALUE io)
@@ -624,7 +292,7 @@ rb_io_get_io(VALUE io)
return rb_convert_type(io, T_FILE, "IO", "to_io");
}
-VALUE
+static VALUE
rb_io_check_io(VALUE io)
{
return rb_check_convert_type(io, T_FILE, "IO", "to_io");
@@ -642,22 +310,6 @@ rb_io_get_write_io(VALUE io)
return io;
}
-VALUE
-rb_io_set_write_io(VALUE io, VALUE w)
-{
- VALUE write_io;
- rb_io_check_initialized(RFILE(io)->fptr);
- if (!RTEST(w)) {
- w = 0;
- }
- else {
- GetWriteIO(w);
- }
- write_io = RFILE(io)->fptr->tied_io_for_writing;
- RFILE(io)->fptr->tied_io_for_writing = w;
- return write_io ? write_io : Qnil;
-}
-
/*
* call-seq:
* IO.try_convert(obj) -> io or nil
@@ -681,27 +333,25 @@ rb_io_s_try_convert(VALUE dummy, VALUE io)
return rb_io_check_io(io);
}
-#if !(defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32))
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)
+ if (fptr->rbuf_len == 0 || fptr->mode & FMODE_DUPLEX)
return;
/* xxx: target position may be negative if buffer is filled by ungetc */
errno = 0;
- r = lseek(fptr->fd, -fptr->rbuf.len, SEEK_CUR);
+ r = lseek(fptr->fd, -fptr->rbuf_len, SEEK_CUR);
if (r < 0 && errno) {
if (errno == ESPIPE)
fptr->mode |= FMODE_DUPLEX;
return;
}
- fptr->rbuf.off = 0;
- fptr->rbuf.len = 0;
+ fptr->rbuf_off = 0;
+ fptr->rbuf_len = 0;
return;
}
-#endif
static rb_encoding *io_input_encoding(rb_io_t *fptr);
@@ -710,32 +360,32 @@ io_ungetbyte(VALUE str, rb_io_t *fptr)
{
long len = RSTRING_LEN(str);
- if (fptr->rbuf.ptr == NULL) {
+ if (fptr->rbuf == NULL) {
const int min_capa = IO_RBUF_CAPA_FOR(fptr);
- fptr->rbuf.off = 0;
- fptr->rbuf.len = 0;
+ 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 > min_capa)
- fptr->rbuf.capa = (int)len;
+ fptr->rbuf_capa = (int)len;
else
- fptr->rbuf.capa = min_capa;
- fptr->rbuf.ptr = ALLOC_N(char, fptr->rbuf.capa);
+ fptr->rbuf_capa = min_capa;
+ fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
}
- if (fptr->rbuf.capa < len + fptr->rbuf.len) {
+ if (fptr->rbuf_capa < len + fptr->rbuf_len) {
rb_raise(rb_eIOError, "ungetbyte failed");
}
- if (fptr->rbuf.off < len) {
- MEMMOVE(fptr->rbuf.ptr+fptr->rbuf.capa-fptr->rbuf.len,
- fptr->rbuf.ptr+fptr->rbuf.off,
- char, fptr->rbuf.len);
- fptr->rbuf.off = fptr->rbuf.capa-fptr->rbuf.len;
+ 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.ptr+fptr->rbuf.off, RSTRING_PTR(str), char, len);
+ fptr->rbuf_off-=(int)len;
+ fptr->rbuf_len+=(int)len;
+ MEMMOVE(fptr->rbuf+fptr->rbuf_off, RSTRING_PTR(str), char, len);
}
static rb_io_t *
@@ -748,7 +398,7 @@ flush_before_seek(rb_io_t *fptr)
return fptr;
}
-#define io_seek(fptr, ofs, whence) (errno = 0, lseek(flush_before_seek(fptr)->fd, (ofs), (whence)))
+#define io_seek(fptr, ofs, whence) (errno = 0, lseek(flush_before_seek(fptr)->fd, ofs, whence))
#define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
#ifndef SEEK_CUR
@@ -757,6 +407,8 @@ flush_before_seek(rb_io_t *fptr)
# define SEEK_END 2
#endif
+#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
+
void
rb_io_check_char_readable(rb_io_t *fptr)
{
@@ -764,7 +416,7 @@ rb_io_check_char_readable(rb_io_t *fptr)
if (!(fptr->mode & FMODE_READABLE)) {
rb_raise(rb_eIOError, "not opened for reading");
}
- if (fptr->wbuf.len) {
+ if (fptr->wbuf_len) {
if (io_fflush(fptr) < 0)
rb_sys_fail(0);
}
@@ -816,7 +468,7 @@ rb_io_check_writable(rb_io_t *fptr)
if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing");
}
- if (fptr->rbuf.len) {
+ if (fptr->rbuf_len) {
io_unread(fptr);
}
}
@@ -852,24 +504,25 @@ ruby_dup(int orig)
{
int fd;
- fd = rb_cloexec_dup(orig);
+ fd = dup(orig);
if (fd < 0) {
if (errno == EMFILE || errno == ENFILE || errno == ENOMEM) {
rb_gc();
- fd = rb_cloexec_dup(orig);
+ fd = dup(orig);
}
if (fd < 0) {
rb_sys_fail(0);
}
}
- rb_update_max_fd(fd);
+ UPDATE_MAXFD(fd);
return fd;
}
static VALUE
io_alloc(VALUE klass)
{
- NEWOBJ_OF(io, struct RFile, klass, T_FILE);
+ NEWOBJ(io, struct RFile);
+ OBJSETUP(io, klass, T_FILE);
io->fptr = 0;
@@ -877,7 +530,7 @@ io_alloc(VALUE klass)
}
#ifndef S_ISREG
-# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+# define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
#endif
static int
@@ -903,71 +556,46 @@ wsplit_p(rb_io_t *fptr)
return fptr->mode & FMODE_WSPLIT;
}
-struct io_internal_read_struct {
+struct io_internal_struct {
int fd;
void *buf;
size_t capa;
};
-struct io_internal_write_struct {
- int fd;
- const void *buf;
- size_t capa;
-};
-
static VALUE
internal_read_func(void *ptr)
{
- struct io_internal_read_struct *iis = 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_write_struct *iis = ptr;
+ struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
return write(iis->fd, iis->buf, iis->capa);
}
-static void*
-internal_write_func2(void *ptr)
-{
- struct io_internal_write_struct *iis = ptr;
- return (void*)(intptr_t)write(iis->fd, iis->buf, iis->capa);
-}
-
static ssize_t
rb_read_internal(int fd, void *buf, size_t count)
{
- struct io_internal_read_struct iis;
- iis.fd = fd;
- iis.buf = buf;
- iis.capa = count;
-
- return (ssize_t)rb_thread_io_blocking_region(internal_read_func, &iis, fd);
-}
-
-static ssize_t
-rb_write_internal(int fd, const void *buf, size_t count)
-{
- struct io_internal_write_struct iis;
+ struct io_internal_struct iis;
iis.fd = fd;
iis.buf = buf;
iis.capa = count;
- return (ssize_t)rb_thread_io_blocking_region(internal_write_func, &iis, fd);
+ return (ssize_t)rb_thread_blocking_region(internal_read_func, &iis, RUBY_UBF_IO, 0);
}
static ssize_t
-rb_write_internal2(int fd, const void *buf, size_t count)
+rb_write_internal(int fd, void *buf, size_t count)
{
- struct io_internal_write_struct iis;
+ struct io_internal_struct iis;
iis.fd = fd;
iis.buf = buf;
iis.capa = count;
- return (ssize_t)rb_thread_call_without_gvl2(internal_write_func2, &iis,
- RUBY_UBF_IO, NULL);
+ return (ssize_t)rb_thread_blocking_region(internal_write_func, &iis, RUBY_UBF_IO, 0);
}
static long
@@ -985,68 +613,33 @@ static VALUE
io_flush_buffer_sync(void *arg)
{
rb_io_t *fptr = arg;
- long l = io_writable_length(fptr, fptr->wbuf.len);
- ssize_t r = write(fptr->fd, fptr->wbuf.ptr+fptr->wbuf.off, (size_t)l);
+ long l = io_writable_length(fptr, fptr->wbuf_len);
+ ssize_t r = write(fptr->fd, fptr->wbuf+fptr->wbuf_off, (size_t)l);
- if (fptr->wbuf.len <= r) {
- fptr->wbuf.off = 0;
- fptr->wbuf.len = 0;
+ 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;
+ fptr->wbuf_off += (int)r;
+ fptr->wbuf_len -= (int)r;
errno = EAGAIN;
}
return (VALUE)-1;
}
-static void*
-io_flush_buffer_sync2(void *arg)
-{
- VALUE result = io_flush_buffer_sync(arg);
-
- /*
- * rb_thread_call_without_gvl2 uses 0 as interrupted.
- * So, we need to avoid to use 0.
- */
- return !result ? (void*)1 : (void*)result;
-}
-
static VALUE
io_flush_buffer_async(VALUE arg)
{
- rb_io_t *fptr = (rb_io_t *)arg;
- return rb_thread_io_blocking_region(io_flush_buffer_sync, fptr, fptr->fd);
-}
-
-static VALUE
-io_flush_buffer_async2(VALUE arg)
-{
- rb_io_t *fptr = (rb_io_t *)arg;
- VALUE ret;
-
- ret = (VALUE)rb_thread_call_without_gvl2(io_flush_buffer_sync2, fptr,
- RUBY_UBF_IO, NULL);
-
- if (!ret) {
- /* pending async interrupt is there. */
- errno = EAGAIN;
- return -1;
- } else if (ret == 1) {
- return 0;
- } else
- return ret;
+ return rb_thread_blocking_region(io_flush_buffer_sync, (void *)arg, RUBY_UBF_IO, 0);
}
static inline int
io_flush_buffer(rb_io_t *fptr)
{
if (fptr->write_lock) {
- if (rb_mutex_owned_p(fptr->write_lock))
- return (int)io_flush_buffer_async2((VALUE)fptr);
- else
- return (int)rb_mutex_synchronize(fptr->write_lock, io_flush_buffer_async2, (VALUE)fptr);
+ return (int)rb_mutex_synchronize(fptr->write_lock, io_flush_buffer_async, (VALUE)fptr);
}
else {
return (int)io_flush_buffer_async((VALUE)fptr);
@@ -1057,10 +650,12 @@ static int
io_fflush(rb_io_t *fptr)
{
rb_io_check_closed(fptr);
- if (fptr->wbuf.len == 0)
+ if (fptr->wbuf_len == 0)
return 0;
- rb_io_check_closed(fptr);
- while (fptr->wbuf.len > 0 && io_flush_buffer(fptr) != 0) {
+ if (!rb_thread_fd_writable(fptr->fd)) {
+ rb_io_check_closed(fptr);
+ }
+ while (fptr->wbuf_len > 0 && io_flush_buffer(fptr) != 0) {
if (!rb_io_wait_writable(fptr->fd))
return -1;
rb_io_check_closed(fptr);
@@ -1068,25 +663,44 @@ io_fflush(rb_io_t *fptr)
return 0;
}
+#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);
+}
+#endif
+
int
rb_io_wait_readable(int f)
{
+ rb_fdset_t rfds;
+
if (f < 0) {
- rb_raise(rb_eIOError, closed_stream);
+ rb_raise(rb_eIOError, "closed stream");
}
switch (errno) {
case EINTR:
#if defined(ERESTART)
case ERESTART:
#endif
- rb_thread_check_ints();
+ rb_thread_wait_fd(f);
return TRUE;
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- rb_thread_wait_fd(f);
+ 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;
default:
@@ -1094,34 +708,44 @@ rb_io_wait_readable(int f)
}
}
+#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_fdset_t wfds;
+
if (f < 0) {
- rb_raise(rb_eIOError, closed_stream);
+ rb_raise(rb_eIOError, "closed stream");
}
switch (errno) {
case EINTR:
#if defined(ERESTART)
case ERESTART:
#endif
- /*
- * In old Linux, several special files under /proc and /sys don't handle
- * select properly. Thus we need avoid to call if don't use O_NONBLOCK.
- * Otherwise, we face nasty hang up. Sigh.
- * e.g. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
- * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31b07093c44a7a442394d44423e21d783f5523b8
- * In EINTR case, we only need to call RUBY_VM_CHECK_INTS_BLOCKING().
- * Then rb_thread_check_ints() is enough.
- */
- rb_thread_check_ints();
+ rb_thread_fd_writable(f);
return TRUE;
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- rb_thread_fd_writable(f);
+ 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;
default:
@@ -1140,8 +764,12 @@ make_writeconv(rb_io_t *fptr)
fptr->writeconv_initialized = 1;
- ecflags = fptr->encs.ecflags & ~ECONV_NEWLINE_DECORATOR_READ_MASK;
+ 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;
+#endif
if (!fptr->encs.enc || (fptr->encs.enc == rb_ascii8bit_encoding() && !fptr->encs.enc2)) {
/* no encoding conversion */
@@ -1188,77 +816,66 @@ make_writeconv(rb_io_t *fptr)
struct binwrite_arg {
rb_io_t *fptr;
VALUE str;
- const char *ptr;
+ long offset;
long length;
};
-struct write_arg {
- VALUE io;
- VALUE str;
- int nosync;
-};
-
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_internal2(p->fptr->fd, p->ptr, l);
+ return rb_write_internal(p->fptr->fd, RSTRING_PTR(p->str)+p->offset, l);
}
static long
-io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
+io_binwrite(VALUE str, rb_io_t *fptr, int nosync)
{
- long n, r, offset = 0;
-
- /* don't write anything if current thread has a pending interrupt. */
- rb_thread_check_ints();
+ long len, n, r, offset = 0;
+ len = RSTRING_LEN(str);
if ((n = len) <= 0) return n;
- if (fptr->wbuf.ptr == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
- fptr->wbuf.off = 0;
- fptr->wbuf.len = 0;
- fptr->wbuf.capa = IO_WBUF_CAPA_MIN;
- fptr->wbuf.ptr = ALLOC_N(char, fptr->wbuf.capa);
+ if (fptr->wbuf == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
+ fptr->wbuf_off = 0;
+ fptr->wbuf_len = 0;
+ fptr->wbuf_capa = IO_WBUF_CAPA_MIN;
+ fptr->wbuf = ALLOC_N(char, fptr->wbuf_capa);
fptr->write_lock = rb_mutex_new();
- rb_mutex_allow_trap(fptr->write_lock, 1);
}
if ((!nosync && (fptr->mode & (FMODE_SYNC|FMODE_TTY))) ||
- (fptr->wbuf.ptr && fptr->wbuf.capa <= fptr->wbuf.len + len)) {
+ (fptr->wbuf && fptr->wbuf_capa <= fptr->wbuf_len + len)) {
struct binwrite_arg arg;
- /*
- * xxx: use writev to avoid double write if available
- * writev may help avoid context switch between "a" and "\n" in
- * STDERR.puts "a" [ruby-dev:25080] (rebroken since native threads
- * introduced in 1.9)
- */
- 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.ptr, fptr->wbuf.ptr+fptr->wbuf.off, char, fptr->wbuf.len);
- fptr->wbuf.off = 0;
+ /* 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.ptr+fptr->wbuf.off+fptr->wbuf.len, ptr+offset, char, len);
- fptr->wbuf.len += (int)len;
+ 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;
-
- rb_io_check_closed(fptr);
+ /* 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)) {
+ rb_io_check_closed(fptr);
+ }
arg.fptr = fptr;
arg.str = str;
retry:
- arg.ptr = ptr + offset;
+ 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, ptr+offset, l);
+ r = rb_write_internal(fptr->fd, RSTRING_PTR(str)+offset, l);
}
/* xxx: other threads may modify given string. */
if (r == n) return len;
@@ -1269,42 +886,37 @@ io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
}
if (rb_io_wait_writable(fptr->fd)) {
rb_io_check_closed(fptr);
- if (offset < len)
+ if (offset < RSTRING_LEN(str))
goto retry;
}
return -1L;
}
- if (fptr->wbuf.off) {
- if (fptr->wbuf.len)
- MEMMOVE(fptr->wbuf.ptr, fptr->wbuf.ptr+fptr->wbuf.off, char, fptr->wbuf.len);
- fptr->wbuf.off = 0;
+ 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.ptr+fptr->wbuf.off+fptr->wbuf.len, ptr+offset, char, len);
- fptr->wbuf.len += (int)len;
+ MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
+ fptr->wbuf_len += (int)len;
return len;
}
-# define MODE_BTMODE(a,b,c) ((fmode & FMODE_BINMODE) ? (b) : \
- (fmode & FMODE_TEXTMODE) ? (c) : (a))
static VALUE
do_writeconv(VALUE str, rb_io_t *fptr)
{
if (NEED_WRITECONV(fptr)) {
VALUE common_encoding = Qnil;
- SET_BINARY_MODE(fptr);
make_writeconv(fptr);
if (fptr->writeconv) {
-#define fmode (fptr->mode)
if (!NIL_P(fptr->writeconv_asciicompat))
common_encoding = fptr->writeconv_asciicompat;
- else if (MODE_BTMODE(DEFAULT_TEXTMODE,0,1) && !rb_enc_asciicompat(rb_enc_get(str))) {
+ 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)));
}
-#undef fmode
}
else {
if (fptr->encs.enc2)
@@ -1322,48 +934,14 @@ do_writeconv(VALUE str, rb_io_t *fptr)
str = rb_econv_str_convert(fptr->writeconv, str, ECONV_PARTIAL_INPUT);
}
}
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
-#define fmode (fptr->mode)
- else if (MODE_BTMODE(DEFAULT_TEXTMODE,0,1)) {
- if ((fptr->mode & FMODE_READABLE) &&
- !(fptr->encs.ecflags & ECONV_NEWLINE_DECORATOR_MASK)) {
- setmode(fptr->fd, O_BINARY);
- }
- else {
- setmode(fptr->fd, O_TEXT);
- }
- 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)));
- }
- }
-#undef fmode
-#endif
return str;
}
static long
io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
{
-#ifdef _WIN32
- if (fptr->mode & FMODE_TTY) {
- long len = rb_w32_write_console(str, fptr->fd);
- if (len > 0) return len;
- }
-#endif
str = do_writeconv(str, fptr);
- return io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str),
- fptr, nosync);
-}
-
-ssize_t
-rb_io_bufwrite(VALUE io, const void *buf, size_t size)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- rb_io_check_writable(fptr);
- return (ssize_t)io_binwrite(0, buf, (long)size, fptr, 0);
+ return io_binwrite(str, fptr, nosync);
}
static VALUE
@@ -1384,8 +962,6 @@ io_write(VALUE io, VALUE str, int nosync)
io = tmp;
if (RSTRING_LEN(str) == 0) return INT2FIX(0);
- str = rb_str_new_frozen(str);
-
GetOpenFile(io, fptr);
rb_io_check_writable(fptr);
@@ -1404,7 +980,7 @@ io_write(VALUE io, VALUE str, int nosync)
* to a string using <code>to_s</code>. Returns the number of bytes
* written.
*
- * count = $stdout.write("This is a test\n")
+ * count = $stdout.write( "This is a test\n" )
* puts "That was #{count} bytes of data"
*
* <em>produces:</em>
@@ -1448,16 +1024,6 @@ rb_io_addstr(VALUE io, VALUE str)
return io;
}
-#ifdef HAVE_FSYNC
-static VALUE
-nogvl_fsync(void *ptr)
-{
- rb_io_t *fptr = ptr;
-
- return (VALUE)fsync(fptr->fd);
-}
-#endif
-
/*
* call-seq:
* ios.flush -> ios
@@ -1479,7 +1045,7 @@ rb_io_flush(VALUE io)
{
rb_io_t *fptr;
- if (!RB_TYPE_P(io, T_FILE)) {
+ if (TYPE(io) != T_FILE) {
return rb_funcall(io, id_flush, 0);
}
@@ -1490,9 +1056,7 @@ rb_io_flush(VALUE io)
if (io_fflush(fptr) < 0)
rb_sys_fail(0);
#ifdef _WIN32
- if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
- rb_thread_io_blocking_region(nogvl_fsync, fptr, fptr->fd);
- }
+ fsync(fptr->fd);
#endif
}
if (fptr->mode & FMODE_READABLE) {
@@ -1524,7 +1088,7 @@ rb_io_tell(VALUE io)
GetOpenFile(io, fptr);
pos = io_tell(fptr);
if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
- pos -= fptr->rbuf.len;
+ pos -= fptr->rbuf_len;
return OFFT2NUM(pos);
}
@@ -1581,8 +1145,6 @@ rb_io_seek_m(int argc, VALUE *argv, VALUE io)
* ios.pos = integer -> integer
*
* Seeks to the given position (in bytes) in <em>ios</em>.
- * It is not guranteed that seeking to the right position when <em>ios</em>
- * is textmode.
*
* f = File.new("testfile")
* f.pos = 17
@@ -1628,11 +1190,6 @@ rb_io_rewind(VALUE io)
GetOpenFile(io, fptr);
if (io_seek(fptr, 0L, 0) < 0 && errno) rb_sys_fail_path(fptr->pathv);
-#ifdef _WIN32
- if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
- fsync(fptr->fd);
- }
-#endif
if (io == ARGF.current_file) {
ARGF.lineno -= fptr->lineno;
}
@@ -1649,27 +1206,27 @@ io_fillbuf(rb_io_t *fptr)
{
ssize_t r;
- if (fptr->rbuf.ptr == NULL) {
- fptr->rbuf.off = 0;
- fptr->rbuf.len = 0;
- fptr->rbuf.capa = IO_RBUF_CAPA_FOR(fptr);
- fptr->rbuf.ptr = ALLOC_N(char, fptr->rbuf.capa);
+ if (fptr->rbuf == NULL) {
+ fptr->rbuf_off = 0;
+ fptr->rbuf_len = 0;
+ fptr->rbuf_capa = IO_RBUF_CAPA_FOR(fptr);
+ fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
#ifdef _WIN32
- fptr->rbuf.capa--;
+ fptr->rbuf_capa--;
#endif
}
- if (fptr->rbuf.len == 0) {
+ if (fptr->rbuf_len == 0) {
retry:
{
- r = rb_read_internal(fptr->fd, fptr->rbuf.ptr, fptr->rbuf.capa);
+ 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 */
+ fptr->rbuf_off = 0;
+ fptr->rbuf_len = (int)r; /* r should be <= rbuf_capa */
if (r == 0)
return -1; /* EOF */
}
@@ -1721,11 +1278,6 @@ rb_io_eof(VALUE io)
if (READ_CHAR_PENDING(fptr)) return Qfalse;
if (READ_DATA_PENDING(fptr)) return Qfalse;
READ_CHECK(fptr);
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
- if (!NEED_READCONV(fptr) && NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {
- return eof(fptr->fd) ? Qtrue : Qfalse;
- }
-#endif
if (io_fillbuf(fptr) < 0) {
return Qtrue;
}
@@ -1755,8 +1307,6 @@ rb_io_sync(VALUE io)
return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse;
}
-#ifdef HAVE_FSYNC
-
/*
* call-seq:
* ios.sync = boolean -> boolean
@@ -1788,6 +1338,7 @@ rb_io_set_sync(VALUE io, VALUE sync)
return sync;
}
+#ifdef HAVE_FSYNC
/*
* call-seq:
* ios.fsync -> 0 or nil
@@ -1795,7 +1346,7 @@ rb_io_set_sync(VALUE io, VALUE sync)
* Immediately writes all buffered data in <em>ios</em> to disk.
* Note that <code>fsync</code> differs from
* using <code>IO#sync=</code>. The latter ensures that data is flushed
- * from Ruby's buffers, but does not guarantee that the underlying
+ * from Ruby's buffers, but doesn't not guarantee that the underlying
* operating system actually writes it to disk.
*
* <code>NotImplementedError</code> is raised
@@ -1812,41 +1363,23 @@ rb_io_fsync(VALUE io)
if (io_fflush(fptr) < 0)
rb_sys_fail(0);
-# ifndef _WIN32 /* already called in io_fflush() */
- if ((int)rb_thread_io_blocking_region(nogvl_fsync, fptr, fptr->fd) < 0)
+ if (fsync(fptr->fd) < 0)
rb_sys_fail_path(fptr->pathv);
-# endif
return INT2FIX(0);
}
#else
-# define rb_io_fsync rb_f_notimplement
-# define rb_io_sync rb_f_notimplement
-static VALUE
-rb_io_set_sync(VALUE io, VALUE sync)
-{
- rb_notimplement();
- UNREACHABLE;
-}
+#define rb_io_fsync rb_f_notimplement
#endif
#ifdef HAVE_FDATASYNC
-static VALUE
-nogvl_fdatasync(void *ptr)
-{
- rb_io_t *fptr = ptr;
-
- return (VALUE)fdatasync(fptr->fd);
-}
-
/*
* call-seq:
* ios.fdatasync -> 0 or nil
*
* Immediately writes all buffered data in <em>ios</em> to disk.
*
- * If the underlying operating system does not support <em>fdatasync(2)</em>,
- * <code>IO#fsync</code> is called instead (which might raise a
- * <code>NotImplementedError</code>).
+ * <code>NotImplementedError</code> is raised
+ * if the underlying operating system does not support <em>fdatasync(2)</em>.
*/
static VALUE
@@ -1859,15 +1392,12 @@ rb_io_fdatasync(VALUE io)
if (io_fflush(fptr) < 0)
rb_sys_fail(0);
-
- if ((int)rb_thread_io_blocking_region(nogvl_fdatasync, fptr, fptr->fd) == 0)
- return INT2FIX(0);
-
- /* fall back */
- return rb_io_fsync(io);
+ if (fdatasync(fptr->fd) < 0)
+ rb_sys_fail_path(fptr->pathv);
+ return INT2FIX(0);
}
#else
-#define rb_io_fdatasync rb_io_fsync
+#define rb_io_fdatasync rb_f_notimplement
#endif
/*
@@ -1885,10 +1415,10 @@ rb_io_fdatasync(VALUE io)
static VALUE
rb_io_fileno(VALUE io)
{
- rb_io_t *fptr = RFILE(io)->fptr;
+ rb_io_t *fptr;
int fd;
- rb_io_check_closed(fptr);
+ GetOpenFile(io, fptr);
fd = fptr->fd;
return INT2FIX(fd);
}
@@ -1937,29 +1467,31 @@ static VALUE
rb_io_inspect(VALUE obj)
{
rb_io_t *fptr;
- VALUE result;
- static const char closed[] = " (closed)";
+ const char *cname;
+ char fd_desc[4+sizeof(int)*3];
+ const char *path;
+ const char *st = "";
- fptr = RFILE(taint_check(obj))->fptr;
+ fptr = RFILE(rb_io_taint_check(obj))->fptr;
if (!fptr) return rb_any_to_s(obj);
- result = rb_str_new_cstr("#<");
- rb_str_append(result, rb_class_name(CLASS_OF(obj)));
- rb_str_cat2(result, ":");
+ cname = rb_obj_classname(obj);
if (NIL_P(fptr->pathv)) {
if (fptr->fd < 0) {
- rb_str_cat(result, closed+1, strlen(closed)-1);
+ path = "";
+ st = "(closed)";
}
else {
- rb_str_catf(result, "fd %d", fptr->fd);
+ snprintf(fd_desc, sizeof(fd_desc), "fd %d", fptr->fd);
+ path = fd_desc;
}
}
else {
- rb_str_append(result, fptr->pathv);
+ path = RSTRING_PTR(fptr->pathv);
if (fptr->fd < 0) {
- rb_str_cat(result, closed, strlen(closed));
+ st = " (closed)";
}
}
- return rb_str_cat2(result, ">");
+ return rb_sprintf("#<%s:%s%s>", cname, path, st);
}
/*
@@ -1984,91 +1516,54 @@ read_buffered_data(char *ptr, long len, rb_io_t *fptr)
n = READ_DATA_PENDING_COUNT(fptr);
if (n <= 0) return 0;
if (n > len) n = (int)len;
- MEMMOVE(ptr, fptr->rbuf.ptr+fptr->rbuf.off, char, n);
- fptr->rbuf.off += n;
- fptr->rbuf.len -= n;
+ MEMMOVE(ptr, fptr->rbuf+fptr->rbuf_off, char, n);
+ fptr->rbuf_off += n;
+ fptr->rbuf_len -= n;
return n;
}
static long
-io_bufread(char *ptr, long len, rb_io_t *fptr)
+io_fread(VALUE str, long offset, rb_io_t *fptr)
{
- long offset = 0;
+ long len = RSTRING_LEN(str) - offset;
long n = len;
long c;
+ rb_str_locktmp(str);
if (READ_DATA_PENDING(fptr) == 0) {
while (n > 0) {
again:
- c = rb_read_internal(fptr->fd, ptr+offset, n);
+ c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n);
if (c == 0) break;
if (c < 0) {
if (rb_io_wait_readable(fptr->fd))
goto again;
- return -1;
+ rb_sys_fail_path(fptr->pathv);
}
offset += c;
if ((n -= c) <= 0) break;
+ rb_thread_wait_fd(fptr->fd);
}
+ rb_str_unlocktmp(str);
return len - n;
}
while (n > 0) {
- c = read_buffered_data(ptr+offset, n, fptr);
+ 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) {
break;
}
}
+ rb_str_unlocktmp(str);
return len - n;
}
-static void io_setstrbuf(VALUE *str, long len);
-
-struct bufread_arg {
- char *str_ptr;
- long len;
- rb_io_t *fptr;
-};
-
-static VALUE
-bufread_call(VALUE arg)
-{
- struct bufread_arg *p = (struct bufread_arg *)arg;
- p->len = io_bufread(p->str_ptr, p->len, p->fptr);
- return Qundef;
-}
-
-static long
-io_fread(VALUE str, long offset, long size, rb_io_t *fptr)
-{
- long len;
- struct bufread_arg arg;
-
- io_setstrbuf(&str, offset + size);
- arg.str_ptr = RSTRING_PTR(str) + offset;
- arg.len = size;
- arg.fptr = fptr;
- rb_str_locktmp_ensure(str, bufread_call, (VALUE)&arg);
- len = arg.len;
- if (len < 0) rb_sys_fail_path(fptr->pathv);
- return len;
-}
-
-ssize_t
-rb_io_bufread(VALUE io, void *buf, size_t size)
-{
- rb_io_t *fptr;
-
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- return (ssize_t)io_bufread(buf, (long)size, fptr);
-}
-
#define SMALLBUF 100
static long
@@ -2115,8 +1610,10 @@ make_readconv(rb_io_t *fptr, int size)
int ecflags;
VALUE ecopts;
const char *sname, *dname;
- ecflags = fptr->encs.ecflags & ~ECONV_NEWLINE_DECORATOR_WRITE_MASK;
+ 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);
@@ -2127,11 +1624,11 @@ make_readconv(rb_io_t *fptr, int size)
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_off = 0;
+ fptr->cbuf_len = 0;
if (size < IO_CBUF_CAPA_MIN) size = IO_CBUF_CAPA_MIN;
- fptr->cbuf.capa = size;
- fptr->cbuf.ptr = ALLOC_N(char, fptr->cbuf.capa);
+ fptr->cbuf_capa = size;
+ fptr->cbuf = ALLOC_N(char, fptr->cbuf_capa);
}
}
@@ -2149,39 +1646,39 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
ec_flags |= ECONV_PARTIAL_INPUT;
- if (fptr->cbuf.len == fptr->cbuf.capa)
+ if (fptr->cbuf_len == fptr->cbuf_capa)
return MORE_CHAR_SUSPENDED; /* 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.ptr, fptr->cbuf.ptr+fptr->cbuf.off, fptr->cbuf.len);
- fptr->cbuf.off = 0;
+ 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;
+ cbuf_len0 = fptr->cbuf_len;
while (1) {
- ss = sp = (const unsigned char *)fptr->rbuf.ptr + fptr->rbuf.off;
- se = sp + fptr->rbuf.len;
- ds = dp = (unsigned char *)fptr->cbuf.ptr + fptr->cbuf.off + fptr->cbuf.len;
- de = (unsigned char *)fptr->cbuf.ptr + fptr->cbuf.capa;
+ 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, ec_flags);
- fptr->rbuf.off += (int)(sp - ss);
- fptr->rbuf.len -= (int)(sp - ss);
- fptr->cbuf.len += (int)(dp - ds);
+ 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.ptr + fptr->rbuf.off - putbackable, putbackable);
- fptr->rbuf.off -= putbackable;
- fptr->rbuf.len += putbackable;
+ rb_econv_putback(fptr->readconv, (unsigned char *)fptr->rbuf + fptr->rbuf_off - putbackable, putbackable);
+ fptr->rbuf_off -= putbackable;
+ fptr->rbuf_len += putbackable;
}
exc = rb_econv_make_exception(fptr->readconv);
if (!NIL_P(exc))
return exc;
- if (cbuf_len0 != fptr->cbuf.len)
+ if (cbuf_len0 != fptr->cbuf_len)
return MORE_CHAR_SUSPENDED;
if (res == econv_finished) {
@@ -2189,23 +1686,20 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
}
if (res == econv_source_buffer_empty) {
- if (fptr->rbuf.len == 0) {
+ if (fptr->rbuf_len == 0) {
READ_CHECK(fptr);
if (io_fillbuf(fptr) == -1) {
- if (!fptr->readconv) {
- return MORE_CHAR_FINISHED;
- }
- ds = dp = (unsigned char *)fptr->cbuf.ptr + fptr->cbuf.off + fptr->cbuf.len;
- de = (unsigned char *)fptr->cbuf.ptr + fptr->cbuf.capa;
+ 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);
+ fptr->cbuf_len += (int)(dp - ds);
rb_econv_check_error(fptr->readconv);
- break;
+ break;
}
}
}
}
- if (cbuf_len0 != fptr->cbuf.len)
+ if (cbuf_len0 != fptr->cbuf_len)
return MORE_CHAR_SUSPENDED;
return MORE_CHAR_FINISHED;
@@ -2228,54 +1722,50 @@ io_shift_cbuf(rb_io_t *fptr, int len, VALUE *strp)
if (strp) {
str = *strp;
if (NIL_P(str)) {
- *strp = str = rb_str_new(fptr->cbuf.ptr+fptr->cbuf.off, len);
+ *strp = str = rb_str_new(fptr->cbuf+fptr->cbuf_off, len);
}
else {
- rb_str_cat(str, fptr->cbuf.ptr+fptr->cbuf.off, len);
+ rb_str_cat(str, fptr->cbuf+fptr->cbuf_off, len);
}
OBJ_TAINT(str);
rb_enc_associate(str, fptr->encs.enc);
}
- fptr->cbuf.off += len;
- fptr->cbuf.len -= len;
+ fptr->cbuf_off += len;
+ fptr->cbuf_len -= len;
/* xxx: set coderange */
- if (fptr->cbuf.len == 0)
- fptr->cbuf.off = 0;
- else if (fptr->cbuf.capa/2 < fptr->cbuf.off) {
- memmove(fptr->cbuf.ptr, fptr->cbuf.ptr+fptr->cbuf.off, fptr->cbuf.len);
- fptr->cbuf.off = 0;
+ if (fptr->cbuf_len == 0)
+ fptr->cbuf_off = 0;
+ else if (fptr->cbuf_capa/2 < fptr->cbuf_off) {
+ memmove(fptr->cbuf, fptr->cbuf+fptr->cbuf_off, fptr->cbuf_len);
+ fptr->cbuf_off = 0;
}
return str;
}
static void
-io_setstrbuf(VALUE *str, long len)
+io_setstrbuf(VALUE *str,long len)
{
#ifdef _WIN32
- len = (len + 1) & ~1L; /* round up for wide char */
-#endif
if (NIL_P(*str)) {
- *str = rb_str_new(0, 0);
+ *str = rb_str_new(0, len+1);
+ rb_str_set_len(*str,len);
}
else {
- VALUE s = StringValue(*str);
- long clen = RSTRING_LEN(s);
- if (clen >= len) {
- rb_str_modify(s);
- return;
- }
- len -= clen;
+ StringValue(*str);
+ rb_str_modify(*str);
+ rb_str_resize(*str, len+1);
+ rb_str_set_len(*str,len);
}
- rb_str_modify_expand(*str, len);
-}
-
-static void
-io_set_read_length(VALUE str, long n)
-{
- if (RSTRING_LEN(str) != n) {
- rb_str_modify(str);
- rb_str_set_len(str, n);
+#else
+ if (NIL_P(*str)) {
+ *str = rb_str_new(0, len);
}
+ else {
+ StringValue(*str);
+ rb_str_modify(*str);
+ rb_str_resize(*str, len);
+ }
+#endif
}
static VALUE
@@ -2288,33 +1778,27 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
int cr;
if (NEED_READCONV(fptr)) {
- int first = !NIL_P(str);
- SET_BINARY_MODE(fptr);
io_setstrbuf(&str,0);
make_readconv(fptr, 0);
while (1) {
VALUE v;
- if (fptr->cbuf.len) {
- if (first) rb_str_set_len(str, first = 0);
- io_shift_cbuf(fptr, fptr->cbuf.len, &str);
+ if (fptr->cbuf_len) {
+ io_shift_cbuf(fptr, fptr->cbuf_len, &str);
}
v = fill_cbuf(fptr, 0);
if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED) {
- if (fptr->cbuf.len) {
- if (first) rb_str_set_len(str, first = 0);
- io_shift_cbuf(fptr, fptr->cbuf.len, &str);
+ if (fptr->cbuf_len) {
+ io_shift_cbuf(fptr, fptr->cbuf_len, &str);
}
rb_exc_raise(v);
}
if (v == MORE_CHAR_FINISHED) {
clear_readconv(fptr);
- if (first) rb_str_set_len(str, first = 0);
return io_enc_str(str, fptr);
}
}
}
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
bytes = 0;
pos = 0;
@@ -2325,19 +1809,18 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
io_setstrbuf(&str,siz);
for (;;) {
READ_CHECK(fptr);
- n = io_fread(str, bytes, siz - bytes, fptr);
+ n = io_fread(str, bytes, fptr);
if (n == 0 && bytes == 0) {
- rb_str_set_len(str, 0);
break;
}
bytes += n;
- rb_str_set_len(str, bytes);
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_modify_expand(str, 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);
return str;
@@ -2363,27 +1846,12 @@ rb_io_set_nonblock(rb_io_t *fptr)
}
}
-struct read_internal_arg {
- int fd;
- char *str_ptr;
- long len;
-};
-
-static VALUE
-read_internal_call(VALUE arg)
-{
- struct read_internal_arg *p = (struct read_internal_arg *)arg;
- p->len = rb_read_internal(p->fd, p->str_ptr, p->len);
- return Qundef;
-}
-
static VALUE
io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
{
rb_io_t *fptr;
VALUE length, str;
long n, len;
- struct read_internal_arg arg;
rb_scan_args(argc, argv, "11", &length, &str);
@@ -2408,12 +1876,9 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
if (nonblock) {
rb_io_set_nonblock(fptr);
}
- io_setstrbuf(&str, len);
- arg.fd = fptr->fd;
- arg.str_ptr = RSTRING_PTR(str);
- arg.len = len;
- rb_str_locktmp_ensure(str, read_internal_call, (VALUE)&arg);
- n = arg.len;
+ rb_str_locktmp(str);
+ n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
+ rb_str_unlocktmp(str);
if (n < 0) {
if (!nonblock && rb_io_wait_readable(fptr->fd))
goto again;
@@ -2422,7 +1887,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
rb_sys_fail_path(fptr->pathv);
}
}
- io_set_read_length(str, n);
+ rb_str_resize(str, n);
if (n == 0)
return Qnil;
@@ -2440,8 +1905,6 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
* It doesn't block if some data available.
* If the optional <i>outbuf</i> argument is present,
* it must reference a String, which will receive the data.
- * The <i>outbuf</i> will contain only the received data after the method call
- * even if it is not empty at the beginning.
* It raises <code>EOFError</code> on end of file.
*
* readpartial is designed for streams such as pipe, socket, tty, etc.
@@ -2497,7 +1960,8 @@ io_readpartial(int argc, VALUE *argv, VALUE io)
ret = io_getpartial(argc, argv, io, 0);
if (NIL_P(ret))
rb_eof_error();
- return ret;
+ else
+ return ret;
}
/*
@@ -2511,8 +1975,6 @@ io_readpartial(int argc, VALUE *argv, VALUE io)
*
* If the optional <i>outbuf</i> argument is present,
* it must reference a String, which will receive the data.
- * The <i>outbuf</i> will contain only the received data after the method call
- * even if it is not empty at the beginning.
*
* read_nonblock just calls the read(2) system call.
* It causes all errors the read(2) system call causes: Errno::EWOULDBLOCK, Errno::EINTR, etc.
@@ -2559,7 +2021,8 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io)
ret = io_getpartial(argc, argv, io, 1);
if (NIL_P(ret))
rb_eof_error();
- return ret;
+ else
+ return ret;
}
/*
@@ -2622,7 +2085,7 @@ rb_io_write_nonblock(VALUE io, VALUE str)
long n;
rb_secure(4);
- if (!RB_TYPE_P(str, T_STRING))
+ if (TYPE(str) != T_STRING)
str = rb_obj_as_string(str);
io = GetWriteIO(io);
@@ -2646,7 +2109,7 @@ rb_io_write_nonblock(VALUE io, VALUE str)
/*
* call-seq:
- * ios.read([length [, outbuf]]) -> string, outbuf, or nil
+ * ios.read([length [, buffer]]) -> string, buffer, or nil
*
* Reads <i>length</i> bytes from the I/O stream.
*
@@ -2666,10 +2129,8 @@ rb_io_write_nonblock(VALUE io, VALUE str)
*
* If <i>length</i> is zero, it returns <code>""</code>.
*
- * If the optional <i>outbuf</i> argument is present, it must reference
+ * If the optional <i>buffer</i> argument is present, it must reference
* a String, which will receive the data.
- * The <i>outbuf</i> will contain only the received data after the method call
- * even if it is not empty at the beginning.
*
* At end of file, it returns <code>nil</code> or <code>""</code>
* depend on <i>length</i>.
@@ -2703,10 +2164,7 @@ rb_io_write_nonblock(VALUE io, VALUE str)
* }
*
* Note that this method behaves like fread() function in C.
- * This means it retry to invoke read(2) system call to read data with the specified length (or until EOF).
- * This behavior is preserved even if <i>ios</i> is non-blocking mode.
- * (This method is non-blocking flag insensitive as other methods.)
- * If you need the behavior like single read(2) system call,
+ * If you need the behavior like read(2) system call,
* consider readpartial, read_nonblock and sysread.
*/
@@ -2716,9 +2174,6 @@ io_read(int argc, VALUE *argv, VALUE io)
rb_io_t *fptr;
long n, len;
VALUE length, str;
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
- int previous_mode;
-#endif
rb_scan_args(argc, argv, "02", &length, &str);
@@ -2736,23 +2191,16 @@ io_read(int argc, VALUE *argv, VALUE io)
GetOpenFile(io, fptr);
rb_io_check_byte_readable(fptr);
- if (len == 0) {
- io_set_read_length(str, 0);
- return str;
- }
+ if (len == 0) return str;
READ_CHECK(fptr);
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
- previous_mode = set_binary_mode_with_seek_cur(fptr);
-#endif
- n = io_fread(str, 0, len, fptr);
- io_set_read_length(str, n);
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
- if (previous_mode == O_TEXT) {
- setmode(fptr->fd, O_TEXT);
+ n = io_fread(str, 0, fptr);
+ if (n == 0) {
+ if (fptr->fd < 0) return Qnil;
+ rb_str_resize(str, 0);
+ return Qnil;
}
-#endif
- if (n == 0) return Qnil;
+ rb_str_resize(str, n);
OBJ_TAINT(str);
return str;
@@ -2773,14 +2221,13 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
long limit = *lp;
if (NEED_READCONV(fptr)) {
- SET_BINARY_MODE(fptr);
make_readconv(fptr, 0);
do {
const char *p, *e;
int searchlen;
- if (fptr->cbuf.len) {
- p = fptr->cbuf.ptr+fptr->cbuf.off;
- searchlen = fptr->cbuf.len;
+ 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);
@@ -2790,8 +2237,8 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
*strp = str = rb_str_new(p, len);
else
rb_str_buf_cat(str, p, len);
- fptr->cbuf.off += len;
- fptr->cbuf.len -= len;
+ fptr->cbuf_off += len;
+ fptr->cbuf_len -= len;
limit -= len;
*lp = limit;
return delim;
@@ -2801,8 +2248,8 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
*strp = str = rb_str_new(p, searchlen);
else
rb_str_buf_cat(str, p, searchlen);
- fptr->cbuf.off += searchlen;
- fptr->cbuf.len -= searchlen;
+ fptr->cbuf_off += searchlen;
+ fptr->cbuf_len -= searchlen;
limit -= searchlen;
if (limit == 0) {
@@ -2816,7 +2263,6 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
return EOF;
}
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
do {
long pending = READ_DATA_PENDING_COUNT(fptr);
if (pending > 0) {
@@ -2855,7 +2301,6 @@ swallow(rb_io_t *fptr, int term)
if (NEED_READCONV(fptr)) {
rb_encoding *enc = io_read_encoding(fptr);
int needconv = rb_enc_mbminlen(enc) != 1;
- SET_BINARY_MODE(fptr);
make_readconv(fptr, 0);
do {
size_t cnt;
@@ -2879,7 +2324,6 @@ swallow(rb_io_t *fptr, int term)
return FALSE;
}
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
do {
size_t cnt;
while ((cnt = READ_DATA_PENDING_COUNT(fptr)) > 0) {
@@ -2919,8 +2363,8 @@ rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc, VALUE io)
}
if (NIL_P(str)) {
str = rb_str_new(p, pending);
- fptr->rbuf.off += pending;
- fptr->rbuf.len -= pending;
+ fptr->rbuf_off += pending;
+ fptr->rbuf_len -= pending;
}
else {
rb_str_resize(str, len + pending);
@@ -3016,7 +2460,6 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
}
else if (rs == rb_default_rs && limit < 0 && !NEED_READCONV(fptr) &&
rb_enc_asciicompat(enc = io_read_encoding(fptr))) {
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
return rb_io_getline_fast(fptr, enc, io);
}
else {
@@ -3026,7 +2469,6 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
int rspara = 0;
int extra_limit = 16;
- SET_BINARY_MODE(fptr);
enc = io_read_encoding(fptr);
if (!NIL_P(rs)) {
@@ -3160,15 +2602,12 @@ 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
+ * Returns the current line number in <em>ios</em>. The stream must be
* opened for reading. <code>lineno</code> counts the number of times
- * #gets is called rather than the number of newlines encountered. The two
- * values will differ if #gets is called with a separator other than newline.
- *
- * Methods that use <code>$/</code> like #each, #lines and #readline will
- * also increment <code>lineno</code>.
- *
- * See also the <code>$.</code> variable.
+ * <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
@@ -3262,8 +2701,6 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
long limit;
prepare_getline_args(argc, argv, &rs, &limit, io);
- if (limit == 0)
- rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
ary = rb_ary_new();
while (!NIL_P(line = rb_io_getline_1(rs, limit, io))) {
rb_ary_push(ary, line);
@@ -3283,6 +2720,11 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
* ios.each_line(sep,limit) {|line| block } -> ios
* ios.each_line(...) -> an_enumerator
*
+ * ios.lines(sep=$/) {|line| block } -> ios
+ * ios.lines(limit) {|line| block } -> ios
+ * ios.lines(sep,limit) {|line| block } -> ios
+ * ios.lines(...) -> an_enumerator
+ *
* 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
* reading or an <code>IOError</code> will be raised.
@@ -3308,8 +2750,6 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io)
RETURN_ENUMERATOR(io, argc, argv);
prepare_getline_args(argc, argv, &rs, &limit, io);
- if (limit == 0)
- rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
while (!NIL_P(str = rb_io_getline_1(rs, limit, io))) {
rb_yield(str);
}
@@ -3317,20 +2757,10 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io)
}
/*
- * This is a deprecated alias for <code>each_line</code>.
- */
-
-static VALUE
-rb_io_lines(int argc, VALUE *argv, VALUE io)
-{
- rb_warn("IO#lines is deprecated; use #each_line instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv);
- return rb_io_each_line(argc, argv, io);
-}
-
-/*
* call-seq:
+ * ios.bytes {|byte| block } -> ios
+ * ios.bytes -> an_enumerator
+ *
* ios.each_byte {|byte| block } -> ios
* ios.each_byte -> an_enumerator
*
@@ -3350,15 +2780,19 @@ static VALUE
rb_io_each_byte(VALUE io)
{
rb_io_t *fptr;
+ char *p, *e;
RETURN_ENUMERATOR(io, 0, 0);
GetOpenFile(io, fptr);
for (;;) {
- while (fptr->rbuf.len > 0) {
- char *p = fptr->rbuf.ptr + fptr->rbuf.off++;
- fptr->rbuf.len--;
+ 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_byte_readable(fptr);
@@ -3370,19 +2804,6 @@ rb_io_each_byte(VALUE io)
return io;
}
-/*
- * This is a deprecated alias for <code>each_byte</code>.
- */
-
-static VALUE
-rb_io_bytes(VALUE io)
-{
- rb_warn("IO#bytes is deprecated; use #each_byte instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0);
- return rb_io_each_byte(io);
-}
-
static VALUE
io_getc(rb_io_t *fptr, rb_encoding *enc)
{
@@ -3393,82 +2814,76 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
VALUE str = Qnil;
rb_encoding *read_enc = io_read_encoding(fptr);
- SET_BINARY_MODE(fptr);
make_readconv(fptr, 0);
while (1) {
- if (fptr->cbuf.len) {
- r = rb_enc_precise_mbclen(fptr->cbuf.ptr+fptr->cbuf.off,
- fptr->cbuf.ptr+fptr->cbuf.off+fptr->cbuf.len,
+ if (fptr->cbuf_len) {
+ r = rb_enc_precise_mbclen(fptr->cbuf+fptr->cbuf_off,
+ fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
read_enc);
if (!MBCLEN_NEEDMORE_P(r))
break;
- if (fptr->cbuf.len == fptr->cbuf.capa) {
+ if (fptr->cbuf_len == fptr->cbuf_capa) {
rb_raise(rb_eIOError, "too long character");
}
}
if (more_char(fptr) == MORE_CHAR_FINISHED) {
- if (fptr->cbuf.len == 0) {
+ if (fptr->cbuf_len == 0) {
clear_readconv(fptr);
return Qnil;
}
/* return an unit of an incomplete character just before EOF */
- str = rb_enc_str_new(fptr->cbuf.ptr+fptr->cbuf.off, 1, read_enc);
- fptr->cbuf.off += 1;
- fptr->cbuf.len -= 1;
- if (fptr->cbuf.len == 0) clear_readconv(fptr);
+ str = rb_enc_str_new(fptr->cbuf+fptr->cbuf_off, 1, read_enc);
+ fptr->cbuf_off += 1;
+ fptr->cbuf_len -= 1;
+ if (fptr->cbuf_len == 0) clear_readconv(fptr);
ENC_CODERANGE_SET(str, ENC_CODERANGE_BROKEN);
return str;
}
}
if (MBCLEN_INVALID_P(r)) {
- r = rb_enc_mbclen(fptr->cbuf.ptr+fptr->cbuf.off,
- fptr->cbuf.ptr+fptr->cbuf.off+fptr->cbuf.len,
+ r = rb_enc_mbclen(fptr->cbuf+fptr->cbuf_off,
+ fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
read_enc);
io_shift_cbuf(fptr, r, &str);
cr = ENC_CODERANGE_BROKEN;
}
else {
io_shift_cbuf(fptr, MBCLEN_CHARFOUND_LEN(r), &str);
- cr = ENC_CODERANGE_VALID;
- if (MBCLEN_CHARFOUND_LEN(r) == 1 && rb_enc_asciicompat(read_enc) &&
- ISASCII(RSTRING_PTR(str)[0])) {
- cr = ENC_CODERANGE_7BIT;
- }
+ cr = ISASCII(r) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
}
str = io_enc_str(str, fptr);
ENC_CODERANGE_SET(str, cr);
return str;
}
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
if (io_fillbuf(fptr) < 0) {
return Qnil;
}
- if (rb_enc_asciicompat(enc) && ISASCII(fptr->rbuf.ptr[fptr->rbuf.off])) {
- str = rb_str_new(fptr->rbuf.ptr+fptr->rbuf.off, 1);
- fptr->rbuf.off += 1;
- fptr->rbuf.len -= 1;
+ 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.ptr+fptr->rbuf.off, fptr->rbuf.ptr+fptr->rbuf.off+fptr->rbuf.len, enc);
+ 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.ptr+fptr->rbuf.off, n);
- fptr->rbuf.off += n;
- fptr->rbuf.len -= n;
+ (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.ptr+fptr->rbuf.off, fptr->rbuf.len);
- fptr->rbuf.len = 0;
+ 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.ptr+fptr->rbuf.off, 1);
- fptr->rbuf.off++;
- fptr->rbuf.len--;
+ 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;
@@ -3479,9 +2894,9 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
}
}
else {
- str = rb_str_new(fptr->rbuf.ptr+fptr->rbuf.off, 1);
- fptr->rbuf.off++;
- fptr->rbuf.len--;
+ str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
+ fptr->rbuf_off++;
+ fptr->rbuf_len--;
}
}
if (!cr) cr = ENC_CODERANGE_BROKEN;
@@ -3492,6 +2907,9 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
/*
* call-seq:
+ * ios.chars {|c| block } -> ios
+ * ios.chars -> an_enumerator
+ *
* ios.each_char {|c| block } -> ios
* ios.each_char -> an_enumerator
*
@@ -3524,19 +2942,6 @@ rb_io_each_char(VALUE io)
return io;
}
-/*
- * This is a deprecated alias for <code>each_char</code>.
- */
-
-static VALUE
-rb_io_chars(VALUE io)
-{
- rb_warn("IO#chars is deprecated; use #each_char instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(io, ID2SYM(rb_intern("each_char")), 0, 0);
- return rb_io_each_char(io);
-}
-
/*
* call-seq:
@@ -3567,20 +2972,19 @@ rb_io_each_codepoint(VALUE io)
READ_CHECK(fptr);
if (NEED_READCONV(fptr)) {
- SET_BINARY_MODE(fptr);
for (;;) {
make_readconv(fptr, 0);
for (;;) {
- if (fptr->cbuf.len) {
+ if (fptr->cbuf_len) {
if (fptr->encs.enc)
- r = rb_enc_precise_mbclen(fptr->cbuf.ptr+fptr->cbuf.off,
- fptr->cbuf.ptr+fptr->cbuf.off+fptr->cbuf.len,
+ 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) {
+ if (fptr->cbuf_len == fptr->cbuf_capa) {
rb_raise(rb_eIOError, "too long character");
}
}
@@ -3596,32 +3000,31 @@ rb_io_each_codepoint(VALUE io)
}
n = MBCLEN_CHARFOUND_LEN(r);
if (fptr->encs.enc) {
- c = rb_enc_codepoint(fptr->cbuf.ptr+fptr->cbuf.off,
- fptr->cbuf.ptr+fptr->cbuf.off+fptr->cbuf.len,
+ c = rb_enc_codepoint(fptr->cbuf+fptr->cbuf_off,
+ fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len,
fptr->encs.enc);
}
else {
- c = (unsigned char)fptr->cbuf.ptr[fptr->cbuf.off];
+ c = (unsigned char)fptr->cbuf[fptr->cbuf_off];
}
- fptr->cbuf.off += n;
- fptr->cbuf.len -= n;
+ fptr->cbuf_off += n;
+ fptr->cbuf_len -= n;
rb_yield(UINT2NUM(c));
}
}
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
enc = io_input_encoding(fptr);
for (;;) {
if (io_fillbuf(fptr) < 0) {
return io;
}
- r = rb_enc_precise_mbclen(fptr->rbuf.ptr+fptr->rbuf.off,
- fptr->rbuf.ptr+fptr->rbuf.off+fptr->rbuf.len, enc);
+ 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.ptr+fptr->rbuf.off,
- fptr->rbuf.ptr+fptr->rbuf.off+fptr->rbuf.len, enc);
- fptr->rbuf.off += n;
- fptr->rbuf.len -= n;
+ (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)) {
@@ -3634,18 +3037,6 @@ rb_io_each_codepoint(VALUE io)
return io;
}
-/*
- * This is a deprecated alias for <code>each_codepoint</code>.
- */
-
-static VALUE
-rb_io_codepoints(VALUE io)
-{
- rb_warn("IO#codepoints is deprecated; use #each_codepoint instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(io, ID2SYM(rb_intern("each_codepoint")), 0, 0);
- return rb_io_each_codepoint(io);
-}
/*
@@ -3718,7 +3109,7 @@ rb_io_getbyte(VALUE io)
GetOpenFile(io, fptr);
rb_io_check_byte_readable(fptr);
READ_CHECK(fptr);
- if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && RB_TYPE_P(rb_stdout, T_FILE)) {
+ 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) {
@@ -3728,9 +3119,9 @@ rb_io_getbyte(VALUE io)
if (io_fillbuf(fptr) < 0) {
return Qnil;
}
- fptr->rbuf.off++;
- fptr->rbuf.len--;
- c = (unsigned char)fptr->rbuf.ptr[fptr->rbuf.off-1];
+ fptr->rbuf_off++;
+ fptr->rbuf_len--;
+ c = (unsigned char)fptr->rbuf[fptr->rbuf_off-1];
return INT2FIX(c & 0xff);
}
@@ -3817,34 +3208,32 @@ rb_io_ungetc(VALUE io, VALUE c)
if (FIXNUM_P(c)) {
c = rb_enc_uint_chr(FIX2UINT(c), io_read_encoding(fptr));
}
- else if (RB_TYPE_P(c, T_BIGNUM)) {
+ else if (TYPE(c) == T_BIGNUM) {
c = rb_enc_uint_chr(NUM2UINT(c), io_read_encoding(fptr));
}
else {
SafeStringValue(c);
}
if (NEED_READCONV(fptr)) {
- SET_BINARY_MODE(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)
+ if (fptr->cbuf_capa - fptr->cbuf_len < len)
rb_raise(rb_eIOError, "ungetc failed");
- if (fptr->cbuf.off < len) {
- MEMMOVE(fptr->cbuf.ptr+fptr->cbuf.capa-fptr->cbuf.len,
- fptr->cbuf.ptr+fptr->cbuf.off,
- char, fptr->cbuf.len);
- fptr->cbuf.off = fptr->cbuf.capa-fptr->cbuf.len;
+ 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.ptr+fptr->cbuf.off, RSTRING_PTR(c), char, len);
+ fptr->cbuf_off -= (int)len;
+ fptr->cbuf_len += (int)len;
+ MEMMOVE(fptr->cbuf+fptr->cbuf_off, RSTRING_PTR(c), char, len);
}
else {
- NEED_NEWLINE_DECORATOR_ON_READ_CHECK(fptr);
io_ungetbyte(c, fptr);
}
return Qnil;
@@ -3926,14 +3315,6 @@ rb_io_close_on_exec_p(VALUE io)
* 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
- *
- * Ruby sets close-on-exec flags of all file descriptors by default
- * since Ruby 2.0.0.
- * So you don't need to set by yourself.
- * Also, unsetting a close-on-exec flag can cause file descriptor leak
- * if another thread use fork() and exec() (via system() method for example).
- * If you really needs file descriptor inheritance to child process,
- * use spawn()'s argument such as fd=>fd.
*/
static VALUE
@@ -3983,7 +3364,7 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
unsigned char *ds, *dp, *de;
rb_econv_result_t res;
- if (!fptr->wbuf.ptr) {
+ if (!fptr->wbuf) {
unsigned char buf[1024];
long r;
@@ -3994,10 +3375,7 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
res = rb_econv_convert(fptr->writeconv, NULL, NULL, &dp, de, 0);
while (dp-ds) {
retry:
- if (fptr->write_lock && rb_mutex_owned_p(fptr->write_lock))
- r = rb_write_internal2(fptr->fd, ds, dp-ds);
- else
- r = rb_write_internal(fptr->fd, ds, dp-ds);
+ r = rb_write_internal(fptr->fd, ds, dp-ds);
if (r == dp-ds)
break;
if (0 <= r) {
@@ -4005,7 +3383,7 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
}
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));
+ return noalloc ? Qtrue : rb_exc_new3(rb_eIOError, rb_str_new_cstr("closed stream"));
goto retry;
}
return noalloc ? Qtrue : INT2NUM(errno);
@@ -4022,15 +3400,15 @@ finish_writeconv(rb_io_t *fptr, int noalloc)
res = econv_destination_buffer_full;
while (res == econv_destination_buffer_full) {
- if (fptr->wbuf.len == fptr->wbuf.capa) {
+ if (fptr->wbuf_len == fptr->wbuf_capa) {
if (io_fflush(fptr) < 0)
return noalloc ? Qtrue : INT2NUM(errno);
}
- ds = dp = (unsigned char *)fptr->wbuf.ptr + fptr->wbuf.off + fptr->wbuf.len;
- de = (unsigned char *)fptr->wbuf.ptr + fptr->wbuf.capa;
+ 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);
+ fptr->wbuf_len += (int)(dp - ds);
if (res == econv_invalid_byte_sequence ||
res == econv_incomplete_input ||
res == econv_undefined_conversion) {
@@ -4052,51 +3430,10 @@ finish_writeconv_sync(VALUE arg)
return finish_writeconv(p->fptr, p->noalloc);
}
-static void*
-nogvl_close(void *ptr)
-{
- int *fd = ptr;
-
- return (void*)(intptr_t)close(*fd);
-}
-
-static int
-maygvl_close(int fd, int keepgvl)
-{
- if (keepgvl)
- return close(fd);
-
- /*
- * close() may block for certain file types (NFS, SO_LINGER sockets,
- * inotify), so let other threads run.
- */
- return (int)(intptr_t)rb_thread_call_without_gvl(nogvl_close, &fd, RUBY_UBF_IO, 0);
-}
-
-static void*
-nogvl_fclose(void *ptr)
-{
- FILE *file = ptr;
-
- return (void*)(intptr_t)fclose(file);
-}
-
-static int
-maygvl_fclose(FILE *file, int keepgvl)
-{
- if (keepgvl)
- return fclose(file);
-
- return (int)(intptr_t)rb_thread_call_without_gvl(nogvl_fclose, file, RUBY_UBF_IO, 0);
-}
-
static void
fptr_finalize(rb_io_t *fptr, int noraise)
{
VALUE err = Qnil;
- int fd = fptr->fd;
- FILE *stdio_file = fptr->stdio_file;
-
if (fptr->writeconv) {
if (fptr->write_lock && !noraise) {
struct finish_writeconv_arg arg;
@@ -4108,7 +3445,7 @@ fptr_finalize(rb_io_t *fptr, int noraise)
err = finish_writeconv(fptr, noraise);
}
}
- if (fptr->wbuf.len) {
+ if (fptr->wbuf_len) {
if (noraise) {
if ((int)io_flush_buffer_sync(fptr) < 0 && NIL_P(err))
err = Qtrue;
@@ -4118,30 +3455,29 @@ fptr_finalize(rb_io_t *fptr, int noraise)
err = INT2NUM(errno);
}
}
-
- fptr->fd = -1;
- fptr->stdio_file = 0;
- fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
-
- if (IS_PREP_STDIO(fptr) || fd <= 2) {
- /* need to keep FILE objects of stdin, stdout and stderr */
+ if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
+ goto skip_fd_close;
}
- else if (stdio_file) {
- /* stdio_file is deallocated anyway
+ if (fptr->stdio_file) {
+ /* fptr->stdio_file is deallocated anyway
* even if fclose failed. */
- if ((maygvl_fclose(stdio_file, noraise) < 0) && NIL_P(err))
- err = noraise ? Qtrue : INT2NUM(errno);
+ if (fclose(fptr->stdio_file) < 0 && NIL_P(err))
+ err = noraise ? Qtrue : INT2NUM(errno);
}
- else if (0 <= fd) {
- /* fptr->fd may be closed even if close fails.
+ 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 ((maygvl_close(fd, noraise) < 0) && NIL_P(err))
- err = noraise ? Qtrue : INT2NUM(errno);
+ 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)) {
+ switch(TYPE(err)) {
case T_FIXNUM:
case T_BIGNUM:
errno = NUM2INT(err);
@@ -4171,9 +3507,9 @@ clear_readconv(rb_io_t *fptr)
rb_econv_close(fptr->readconv);
fptr->readconv = NULL;
}
- if (fptr->cbuf.ptr) {
- free(fptr->cbuf.ptr);
- fptr->cbuf.ptr = NULL;
+ if (fptr->cbuf) {
+ free(fptr->cbuf);
+ fptr->cbuf = NULL;
}
}
@@ -4202,13 +3538,13 @@ rb_io_fptr_finalize(rb_io_t *fptr)
if (0 <= fptr->fd)
rb_io_fptr_cleanup(fptr, TRUE);
fptr->write_lock = 0;
- if (fptr->rbuf.ptr) {
- free(fptr->rbuf.ptr);
- fptr->rbuf.ptr = 0;
+ if (fptr->rbuf) {
+ free(fptr->rbuf);
+ fptr->rbuf = 0;
}
- if (fptr->wbuf.ptr) {
- free(fptr->wbuf.ptr);
- fptr->wbuf.ptr = 0;
+ if (fptr->wbuf) {
+ free(fptr->wbuf);
+ fptr->wbuf = 0;
}
clear_codeconv(fptr);
free(fptr);
@@ -4217,13 +3553,13 @@ rb_io_fptr_finalize(rb_io_t *fptr)
size_t rb_econv_memsize(rb_econv_t *);
-RUBY_FUNC_EXPORTED size_t
-rb_io_memsize(const rb_io_t *fptr)
+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;
+ 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;
@@ -4250,11 +3586,10 @@ rb_io_close(VALUE io)
if (fptr->fd < 0) return Qnil;
fd = fptr->fd;
- rb_thread_fd_close(fd);
rb_io_fptr_cleanup(fptr, FALSE);
+ rb_thread_fd_close(fd);
if (fptr->pid) {
- rb_last_status_clear();
rb_syswait(fptr->pid);
fptr->pid = 0;
}
@@ -4290,31 +3625,13 @@ rb_io_close_m(VALUE io)
static VALUE
io_call_close(VALUE io)
{
- rb_check_funcall(io, rb_intern("close"), 0, 0);
- return io;
-}
-
-static VALUE
-ignore_closed_stream(VALUE io, VALUE exc)
-{
- enum {mesg_len = sizeof(closed_stream)-1};
- VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
- if (!RB_TYPE_P(mesg, T_STRING) ||
- RSTRING_LEN(mesg) != mesg_len ||
- memcmp(RSTRING_PTR(mesg), closed_stream, mesg_len)) {
- rb_exc_raise(exc);
- }
- return io;
+ return rb_funcall(io, rb_intern("close"), 0, 0);
}
static VALUE
io_close(VALUE io)
{
- VALUE closed = rb_check_funcall(io, rb_intern("closed?"), 0, 0);
- if (closed != Qundef && RTEST(closed)) return io;
- rb_rescue2(io_call_close, io, ignore_closed_stream, io,
- rb_eIOError, (VALUE)0);
- return io;
+ return rb_rescue(io_call_close, io, 0, 0);
}
/*
@@ -4399,16 +3716,11 @@ rb_io_close_read(VALUE io)
write_io = GetWriteIO(io);
if (io != write_io) {
rb_io_t *wfptr;
+ rb_io_fptr_cleanup(fptr, FALSE);
GetOpenFile(write_io, wfptr);
- wfptr->pid = fptr->pid;
- fptr->pid = 0;
RFILE(io)->fptr = wfptr;
- /* bind to write_io temporarily to get rid of memory/fd leak */
- fptr->tied_io_for_writing = 0;
- fptr->mode &= ~FMODE_DUPLEX;
- RFILE(write_io)->fptr = fptr;
- rb_io_fptr_cleanup(fptr, FALSE);
- /* should not finalize fptr because another thread may be reading it */
+ RFILE(write_io)->fptr = NULL;
+ rb_io_fptr_finalize(fptr);
return Qnil;
}
@@ -4464,12 +3776,12 @@ rb_io_close_write(VALUE io)
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;
}
- rb_io_close(write_io);
return Qnil;
}
@@ -4503,7 +3815,7 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
(READ_DATA_BUFFERED(fptr) || READ_CHAR_PENDING(fptr))) {
rb_raise(rb_eIOError, "sysseek for buffered IO");
}
- if ((fptr->mode & FMODE_WRITABLE) && fptr->wbuf.len) {
+ if ((fptr->mode & FMODE_WRITABLE) && fptr->wbuf_len) {
rb_warn("sysseek for buffered IO");
}
errno = 0;
@@ -4533,21 +3845,21 @@ rb_io_syswrite(VALUE io, VALUE str)
long n;
rb_secure(4);
- if (!RB_TYPE_P(str, T_STRING))
+ if (TYPE(str) != T_STRING)
str = rb_obj_as_string(str);
io = GetWriteIO(io);
GetOpenFile(io, fptr);
rb_io_check_writable(fptr);
- str = rb_str_new_frozen(str);
-
- if (fptr->wbuf.len) {
+ if (fptr->wbuf_len) {
rb_warn("syswrite for buffered IO");
}
+ if (!rb_thread_fd_writable(fptr->fd)) {
+ rb_io_check_closed(fptr);
+ }
n = rb_write_internal(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
- RB_GC_GUARD(str);
if (n == -1) rb_sys_fail_path(fptr->pathv);
@@ -4556,15 +3868,13 @@ rb_io_syswrite(VALUE io, VALUE str)
/*
* call-seq:
- * ios.sysread(maxlen[, outbuf]) -> string
+ * ios.sysread(integer[, outbuf]) -> string
*
- * Reads <i>maxlen</i> bytes from <em>ios</em> using a low-level
- * read and returns them as a string. Do not mix with other methods
+ * 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.
- * The <i>outbuf</i> will contain only the received data after the method call
- * even if it is not empty at the beginning.
* Raises <code>SystemCallError</code> on error and
* <code>EOFError</code> at end of file.
*
@@ -4578,7 +3888,6 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
VALUE len, str;
rb_io_t *fptr;
long n, ilen;
- struct read_internal_arg arg;
rb_scan_args(argc, argv, "11", &len, &str);
ilen = NUM2LONG(len);
@@ -4594,33 +3903,21 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
}
n = fptr->fd;
-
- /*
- * FIXME: removing rb_thread_wait_fd() here changes sysread semantics
- * on non-blocking IOs. However, it's still currently possible
- * for sysread to raise Errno::EAGAIN if another thread read()s
- * the IO after we return from rb_thread_wait_fd() but before
- * we call read()
- */
rb_thread_wait_fd(fptr->fd);
-
rb_io_check_closed(fptr);
- io_setstrbuf(&str, ilen);
rb_str_locktmp(str);
- arg.fd = fptr->fd;
- arg.str_ptr = RSTRING_PTR(str);
- arg.len = ilen;
- rb_ensure(read_internal_call, (VALUE)&arg, rb_str_unlocktmp, str);
- n = arg.len;
+ n = rb_read_internal(fptr->fd, RSTRING_PTR(str), ilen);
+ rb_str_unlocktmp(str);
if (n == -1) {
rb_sys_fail_path(fptr->pathv);
}
- io_set_read_length(str, n);
+ rb_str_set_len(str, n);
if (n == 0 && ilen > 0) {
rb_eof_error();
}
+ rb_str_resize(str, n);
OBJ_TAINT(str);
return str;
@@ -4638,15 +3935,7 @@ rb_io_binmode(VALUE io)
rb_econv_binmode(fptr->writeconv);
fptr->mode |= FMODE_BINMODE;
fptr->mode &= ~FMODE_TEXTMODE;
- fptr->writeconv_pre_ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK;
-#ifdef O_BINARY
- if (!fptr->readconv) {
- SET_BINARY_MODE_WITH_SEEK_CUR(fptr);
- }
- else {
- setmode(fptr->fd, O_BINARY);
- }
-#endif
+ fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECORATOR|ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR);
return io;
}
@@ -4666,7 +3955,6 @@ rb_io_ascii8bit_binmode(VALUE io)
}
fptr->mode |= FMODE_BINMODE;
fptr->mode &= ~FMODE_TEXTMODE;
- SET_BINARY_MODE_WITH_SEEK_CUR(fptr);
fptr->encs.enc = rb_ascii8bit_encoding();
fptr->encs.enc2 = NULL;
@@ -4720,6 +4008,8 @@ rb_io_binmode_p(VALUE io)
static const char*
rb_io_fmode_modestr(int fmode)
{
+# 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+");
@@ -4727,8 +4017,6 @@ rb_io_fmode_modestr(int fmode)
return MODE_BTMODE("a", "ab", "at");
}
switch (fmode & FMODE_READWRITE) {
- default:
- rb_raise(rb_eArgError, "invalid access fmode 0x%x", fmode);
case FMODE_READABLE:
return MODE_BTMODE("r", "rb", "rt");
case FMODE_WRITABLE:
@@ -4739,6 +4027,8 @@ rb_io_fmode_modestr(int fmode)
}
return MODE_BTMODE("r+", "rb+", "rt+");
}
+ rb_raise(rb_eArgError, "invalid access fmode 0x%x", fmode);
+ return NULL; /* not reached */
}
static int
@@ -4896,8 +4186,6 @@ rb_io_oflags_modestr(int oflags)
}
}
switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
- default:
- rb_raise(rb_eArgError, "invalid access oflags 0x%x", oflags);
case O_RDONLY:
return MODE_BINARY("r", "rb");
case O_WRONLY:
@@ -4905,6 +4193,8 @@ rb_io_oflags_modestr(int oflags)
case O_RDWR:
return MODE_BINARY("r+", "rb+");
}
+ rb_raise(rb_eArgError, "invalid access oflags 0x%x", oflags);
+ return NULL; /* not reached */
}
/*
@@ -4913,7 +4203,7 @@ rb_io_oflags_modestr(int oflags)
* 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 fmode)
+rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc, rb_encoding **enc2)
{
int default_ext = 0;
@@ -4924,8 +4214,7 @@ rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc,
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 ||
- (!(fmode & FMODE_SETENC_BY_BOM) && (intern == ext))) {
+ 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;
@@ -4937,18 +4226,11 @@ rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc,
}
static void
-unsupported_encoding(const char *name)
-{
- rb_warn("Unsupported encoding %s ignored", name);
-}
-
-static void
parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p)
{
const char *p;
char encname[ENCODING_MAXNAMELEN+1];
int idx, idx2;
- int fmode = fmode_p ? *fmode_p : 0;
rb_encoding *ext_enc, *int_enc;
/* parse estr as "enc" or "enc2:enc" or "enc:-" */
@@ -4960,7 +4242,7 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int
idx = -1;
else {
if (io_encname_bom_p(estr, len)) {
- fmode |= FMODE_SETENC_BY_BOM;
+ if (fmode_p) *fmode_p |= FMODE_SETENC_BY_BOM;
estr += 4;
len -= 4;
}
@@ -4973,7 +4255,7 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int
else {
long len = strlen(estr);
if (io_encname_bom_p(estr, len)) {
- fmode |= FMODE_SETENC_BY_BOM;
+ if (fmode_p) *fmode_p |= FMODE_SETENC_BY_BOM;
estr += 4;
len -= 4;
memcpy(encname, estr, len);
@@ -4982,13 +4264,12 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int
}
idx = rb_enc_find_index(estr);
}
- if (fmode_p) *fmode_p = fmode;
if (idx >= 0)
ext_enc = rb_enc_from_index(idx);
else {
if (idx != -2)
- unsupported_encoding(estr);
+ rb_warn("Unsupported encoding %s ignored", estr);
ext_enc = NULL;
}
@@ -5001,8 +4282,9 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int
else {
idx2 = rb_enc_find_index(p);
if (idx2 < 0)
- unsupported_encoding(p);
- else if (!(fmode & FMODE_SETENC_BY_BOM) && (idx2 == idx)) {
+ 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
@@ -5010,7 +4292,24 @@ parse_mode_enc(const char *estr, rb_encoding **enc_p, rb_encoding **enc2_p, int
}
}
- rb_io_ext_int_to_encs(ext_enc, int_enc, enc_p, enc2_p, fmode);
+ 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, NULL);
+}
+
+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
@@ -5071,12 +4370,12 @@ rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2
parse_mode_enc(StringValueCStr(tmp), enc_p, enc2_p, fmode_p);
}
else {
- rb_io_ext_int_to_encs(rb_to_encoding(encoding), NULL, enc_p, enc2_p, 0);
+ rb_io_ext_int_to_encs(rb_to_encoding(encoding), NULL, enc_p, enc2_p);
}
}
else if (extenc != Qundef || intenc != Qundef) {
extracted = 1;
- rb_io_ext_int_to_encs(extencoding, intencoding, enc_p, enc2_p, 0);
+ rb_io_ext_int_to_encs(extencoding, intencoding, enc_p, enc2_p);
}
return extracted;
}
@@ -5084,27 +4383,13 @@ rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2
typedef struct rb_io_enc_t convconfig_t;
static void
-validate_enc_binmode(int *fmode_p, int ecflags, rb_encoding *enc, rb_encoding *enc2)
+validate_enc_binmode(int fmode, rb_encoding *enc, rb_encoding *enc2)
{
- int fmode = *fmode_p;
-
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");
-
- if (!(fmode & FMODE_BINMODE) &&
- (DEFAULT_TEXTMODE || (ecflags & ECONV_NEWLINE_DECORATOR_MASK))) {
- fmode |= DEFAULT_TEXTMODE;
- *fmode_p = fmode;
- }
-#if !DEFAULT_TEXTMODE
- else if (!(ecflags & ECONV_NEWLINE_DECORATOR_MASK)) {
- fmode &= ~FMODE_TEXTMODE;
- *fmode_p = fmode;
- }
-#endif
}
static void
@@ -5113,19 +4398,11 @@ extract_binmode(VALUE opthash, int *fmode)
if (!NIL_P(opthash)) {
VALUE v;
v = rb_hash_aref(opthash, sym_textmode);
- if (!NIL_P(v)) {
- if (*fmode & FMODE_TEXTMODE)
- rb_raise(rb_eArgError, "textmode specified twice");
- if (RTEST(v))
- *fmode |= FMODE_TEXTMODE;
- }
+ if (!NIL_P(v) && RTEST(v))
+ *fmode |= FMODE_TEXTMODE;
v = rb_hash_aref(opthash, sym_binmode);
- if (!NIL_P(v)) {
- if (*fmode & FMODE_BINMODE)
- rb_raise(rb_eArgError, "binmode specified twice");
- if (RTEST(v))
- *fmode |= FMODE_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");
@@ -5147,9 +4424,8 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
vmode = *vmode_p;
/* Set to defaults */
- rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2, 0);
+ rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2);
- vmode_handle:
if (NIL_P(vmode)) {
fmode = FMODE_READABLE;
oflags = O_RDONLY;
@@ -5162,6 +4438,7 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
else {
const char *p;
+ vmode_handle:
SafeStringValue(vmode);
p = StringValueCStr(vmode);
fmode = rb_io_modestr_fmode(p);
@@ -5175,37 +4452,21 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
rb_encoding *e;
e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
- rb_io_ext_int_to_encs(e, NULL, &enc, &enc2, fmode);
+ rb_io_ext_int_to_encs(e, NULL, &enc, &enc2);
}
}
if (NIL_P(opthash)) {
- ecflags = (fmode & FMODE_READABLE) ?
- MODE_BTMODE(ECONV_DEFAULT_NEWLINE_DECORATOR,
- 0, ECONV_UNIVERSAL_NEWLINE_DECORATOR) : 0;
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
- ecflags |= (fmode & FMODE_WRITABLE) ?
- MODE_BTMODE(TEXTMODE_NEWLINE_DECORATOR_ON_WRITE,
- 0, TEXTMODE_NEWLINE_DECORATOR_ON_WRITE) : 0;
-#endif
- SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
+ ecflags = 0;
ecopts = Qnil;
}
else {
VALUE v;
extract_binmode(opthash, &fmode);
- if (fmode & FMODE_BINMODE) {
#ifdef O_BINARY
+ if (fmode & FMODE_BINMODE)
oflags |= O_BINARY;
#endif
- if (!has_enc)
- rb_io_ext_int_to_encs(rb_ascii8bit_encoding(), NULL, &enc, &enc2, fmode);
- }
-#if DEFAULT_TEXTMODE
- else if (NIL_P(vmode)) {
- fmode |= DEFAULT_TEXTMODE;
- }
-#endif
if (!has_vmode) {
v = rb_hash_aref(opthash, sym_mode);
if (!NIL_P(v)) {
@@ -5229,25 +4490,16 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
/* perm no use, just ignore */
}
}
- ecflags = (fmode & FMODE_READABLE) ?
- MODE_BTMODE(ECONV_DEFAULT_NEWLINE_DECORATOR,
- 0, ECONV_UNIVERSAL_NEWLINE_DECORATOR) : 0;
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
- ecflags |= (fmode & FMODE_WRITABLE) ?
- MODE_BTMODE(TEXTMODE_NEWLINE_DECORATOR_ON_WRITE,
- 0, TEXTMODE_NEWLINE_DECORATOR_ON_WRITE) : 0;
-#endif
+ ecflags = rb_econv_prepare_opts(opthash, &ecopts);
if (rb_io_extract_encoding_option(opthash, &enc, &enc2, &fmode)) {
if (has_enc) {
rb_raise(rb_eArgError, "encoding specified twice");
}
}
- SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
- ecflags = rb_econv_prepare_options(opthash, &ecopts, ecflags);
}
- validate_enc_binmode(&fmode, ecflags, enc, enc2);
+ validate_enc_binmode(fmode, enc, enc2);
*vmode_p = vmode;
@@ -5265,22 +4517,18 @@ struct sysopen_struct {
mode_t perm;
};
-static void *
+static VALUE
sysopen_func(void *ptr)
{
const struct sysopen_struct *data = ptr;
const char *fname = RSTRING_PTR(data->fname);
- return (void *)(VALUE)rb_cloexec_open(fname, data->oflags, data->perm);
+ return (VALUE)open(fname, data->oflags, data->perm);
}
static inline int
rb_sysopen_internal(struct sysopen_struct *data)
{
- int fd;
- fd = (int)(VALUE)rb_thread_call_without_gvl(sysopen_func, data, RUBY_UBF_IO, 0);
- if (0 <= fd)
- rb_update_max_fd(fd);
- return fd;
+ return (int)rb_thread_blocking_region(sysopen_func, data, RUBY_UBF_IO, 0);
}
static int
@@ -5289,6 +4537,9 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm)
int fd;
struct sysopen_struct data;
+#ifdef O_BINARY
+ oflags |= O_BINARY;
+#endif
data.fname = rb_str_encode_ospath(fname);
data.oflags = oflags;
data.perm = perm;
@@ -5300,9 +4551,10 @@ rb_sysopen(VALUE fname, int oflags, mode_t perm)
fd = rb_sysopen_internal(&data);
}
if (fd < 0) {
- rb_sys_fail_path(fname);
+ rb_sys_fail(RSTRING_PTR(fname));
}
}
+ UPDATE_MAXFD(fd);
return fd;
}
@@ -5311,18 +4563,18 @@ rb_fdopen(int fd, const char *modestr)
{
FILE *file;
-#if defined(__sun)
+#if defined(sun)
errno = 0;
#endif
file = fdopen(fd, modestr);
if (!file) {
if (
-#if defined(__sun)
+#if defined(sun)
errno == 0 ||
#endif
errno == EMFILE || errno == ENFILE) {
rb_gc();
-#if defined(__sun)
+#if defined(sun)
errno = 0;
#endif
file = fdopen(fd, modestr);
@@ -5330,7 +4582,7 @@ rb_fdopen(int fd, const char *modestr)
if (!file) {
#ifdef _WIN32
if (errno == 0) errno = EINVAL;
-#elif defined(__sun)
+#elif defined(sun)
if (errno == 0) errno = EMFILE;
#endif
rb_sys_fail(0);
@@ -5358,63 +4610,65 @@ static void io_encoding_set(rb_io_t *, VALUE, VALUE, VALUE);
static int
io_strip_bom(VALUE io)
{
- VALUE b1, b2, b3, b4;
-
- if (NIL_P(b1 = rb_io_getbyte(io))) return 0;
- switch (b1) {
- case INT2FIX(0xEF):
- if (NIL_P(b2 = rb_io_getbyte(io))) break;
- if (b2 == INT2FIX(0xBB) && !NIL_P(b3 = rb_io_getbyte(io))) {
- if (b3 == INT2FIX(0xBF)) {
+ 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, b3);
+ rb_io_ungetbyte(io, INT2FIX(b3));
}
- rb_io_ungetbyte(io, b2);
+ rb_io_ungetbyte(io, INT2FIX(b2));
break;
- case INT2FIX(0xFE):
- if (NIL_P(b2 = rb_io_getbyte(io))) break;
- if (b2 == INT2FIX(0xFF)) {
+ case 0xFE:
+ b2 = FIX2INT(rb_io_getbyte(io));
+ if (b2 == 0xFF) {
return rb_enc_find_index("UTF-16BE");
}
- rb_io_ungetbyte(io, b2);
+ rb_io_ungetbyte(io, INT2FIX(b2));
break;
- case INT2FIX(0xFF):
- if (NIL_P(b2 = rb_io_getbyte(io))) break;
- if (b2 == INT2FIX(0xFE)) {
- b3 = rb_io_getbyte(io);
- if (b3 == INT2FIX(0) && !NIL_P(b4 = rb_io_getbyte(io))) {
- if (b4 == INT2FIX(0)) {
+ 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, b4);
- rb_io_ungetbyte(io, b3);
+ rb_io_ungetbyte(io, INT2FIX(b4));
}
else {
- rb_io_ungetbyte(io, b3);
+ rb_io_ungetbyte(io, INT2FIX(b3));
return rb_enc_find_index("UTF-16LE");
}
+ rb_io_ungetbyte(io, INT2FIX(b3));
}
- rb_io_ungetbyte(io, b2);
+ rb_io_ungetbyte(io, INT2FIX(b2));
break;
- case INT2FIX(0):
- if (NIL_P(b2 = rb_io_getbyte(io))) break;
- if (b2 == INT2FIX(0) && !NIL_P(b3 = rb_io_getbyte(io))) {
- if (b3 == INT2FIX(0xFE) && !NIL_P(b4 = rb_io_getbyte(io))) {
- if (b4 == INT2FIX(0xFF)) {
+ 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, b4);
+ rb_io_ungetbyte(io, INT2FIX(b4));
}
- rb_io_ungetbyte(io, b3);
+ rb_io_ungetbyte(io, INT2FIX(b3));
}
- rb_io_ungetbyte(io, b2);
+ rb_io_ungetbyte(io, INT2FIX(b2));
break;
}
- rb_io_ungetbyte(io, b1);
+ rb_io_ungetbyte(io, INT2FIX(b1));
return 0;
}
@@ -5422,16 +4676,13 @@ static void
io_set_encoding_by_bom(VALUE io)
{
int idx = io_strip_bom(io);
- rb_io_t *fptr;
- GetOpenFile(io, fptr);
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);
}
- else {
- fptr->encs.enc2 = NULL;
- }
}
static VALUE
@@ -5441,13 +4692,12 @@ rb_file_open_generic(VALUE io, VALUE filename, int oflags, int fmode, convconfig
convconfig_t cc;
if (!convconfig) {
/* Set to default encodings */
- rb_io_ext_int_to_encs(NULL, NULL, &cc.enc, &cc.enc2, fmode);
+ 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->ecflags,
- convconfig->enc, convconfig->enc2);
+ validate_enc_binmode(fmode, convconfig->enc, convconfig->enc2);
MakeOpenFile(io, fptr);
fptr->mode = fmode;
@@ -5475,7 +4725,7 @@ rb_file_open_internal(VALUE io, VALUE filename, const char *modestr)
/* Set to default encodings */
e = (fmode & FMODE_BINMODE) ? rb_ascii8bit_encoding() : NULL;
- rb_io_ext_int_to_encs(e, NULL, &convconfig.enc, &convconfig.enc2, fmode);
+ rb_io_ext_int_to_encs(e, NULL, &convconfig.enc, &convconfig.enc2);
convconfig.ecflags = 0;
convconfig.ecopts = Qnil;
}
@@ -5588,37 +4838,28 @@ int
rb_pipe(int *pipes)
{
int ret;
- ret = rb_cloexec_pipe(pipes);
+ ret = pipe(pipes);
if (ret == -1) {
if (errno == EMFILE || errno == ENFILE) {
rb_gc();
- ret = rb_cloexec_pipe(pipes);
+ ret = pipe(pipes);
}
}
if (ret == 0) {
- rb_update_max_fd(pipes[0]);
- rb_update_max_fd(pipes[1]);
+ UPDATE_MAXFD(pipes[0]);
+ UPDATE_MAXFD(pipes[1]);
}
return ret;
}
-#ifdef _WIN32
-#define HAVE_SPAWNV 1
-#define spawnv(mode, cmd, args) rb_w32_aspawn((mode), (cmd), (args))
-#define spawn(mode, cmd) rb_w32_spawn((mode), (cmd), 0)
-#endif
-
-#if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
+#ifdef HAVE_FORK
struct popen_arg {
- VALUE execarg_obj;
- struct rb_execarg *eargp;
+ struct rb_exec_arg *execp;
int modef;
int pair[2];
int write_pair[2];
};
-#endif
-#ifdef HAVE_FORK
static void
popen_redirect(struct popen_arg *p)
{
@@ -5650,75 +4891,25 @@ popen_redirect(struct popen_arg *p)
}
}
-#if defined(__linux__)
-/* Linux /proc/self/status contains a line: "FDSize:\t<nnn>\n"
- * Since /proc may not be available, linux_get_maxfd is just a hint.
- * This function, linux_get_maxfd, must be async-signal-safe.
- * I.e. opendir() is not usable.
- *
- * Note that memchr() and memcmp is *not* async-signal-safe in POSIX.
- * However they are easy to re-implement in async-signal-safe manner.
- * (Also note that there is missing/memcmp.c.)
- */
-static int
-linux_get_maxfd(void)
-{
- int fd;
- char buf[4096], *p, *np, *e;
- ssize_t ss;
- fd = rb_cloexec_open("/proc/self/status", O_RDONLY|O_NOCTTY, 0);
- if (fd == -1) return -1;
- ss = read(fd, buf, sizeof(buf));
- if (ss == -1) goto err;
- p = buf;
- e = buf + ss;
- while ((int)sizeof("FDSize:\t0\n")-1 <= e-p &&
- (np = memchr(p, '\n', e-p)) != NULL) {
- if (memcmp(p, "FDSize:", sizeof("FDSize:")-1) == 0) {
- int fdsize;
- p += sizeof("FDSize:")-1;
- *np = '\0';
- fdsize = (int)ruby_strtoul(p, (char **)NULL, 10);
- close(fd);
- return fdsize;
- }
- p = np+1;
- }
- /* fall through */
-
- err:
- close(fd);
- return -1;
-}
-#endif
-
-/* This function should be async-signal-safe. */
void
rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
{
int fd, ret;
- int max = (int)max_file_descriptor;
-#ifdef F_MAXFD
- /* F_MAXFD is available since NetBSD 2.0. */
- ret = fcntl(0, F_MAXFD); /* async-signal-safe */
- if (ret != -1)
- maxhint = max = ret;
-#elif defined(__linux__)
- ret = linux_get_maxfd();
- if (maxhint < ret)
- maxhint = ret;
- /* maxhint = max = ret; if (ret == -1) abort(); // test */
-#endif
+ 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)))) /* async-signal-safe */
+ RTEST(rb_hash_lookup(noclose_fds, INT2FIX(fd))))
continue;
- ret = fcntl(fd, F_GETFD); /* async-signal-safe */
+#ifdef FD_CLOEXEC
+ ret = fcntl(fd, F_GETFD);
if (ret != -1 && !(ret & FD_CLOEXEC)) {
- fcntl(fd, F_SETFD, ret|FD_CLOEXEC); /* async-signal-safe */
+ 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)
@@ -5732,15 +4923,14 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len)
{
struct popen_arg *p = (struct popen_arg*)pp;
- return rb_exec_async_signal_safe(p->eargp, errmsg, errmsg_len);
+ rb_thread_atfork_before_exec();
+ return rb_exec_err(p->execp, errmsg, errmsg_len);
}
#endif
static VALUE
-pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convconfig)
+pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig)
{
- struct rb_execarg *eargp = NIL_P(execarg_obj) ? NULL : rb_execarg_get(execarg_obj);
- VALUE prog = eargp ? (eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name) : Qfalse ;
rb_pid_t pid = 0;
rb_io_t *fptr;
VALUE port;
@@ -5748,116 +4938,85 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
VALUE write_port;
#if defined(HAVE_FORK)
int status;
- char errmsg[80] = { '\0' };
-#endif
-#if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
struct popen_arg arg;
- int e = 0;
-#endif
-#if defined(HAVE_SPAWNV)
-# if defined(HAVE_SPAWNVE)
-# define DO_SPAWN(cmd, args, envp) ((args) ? \
- spawnve(P_NOWAIT, (cmd), (args), (envp)) : \
- spawne(P_NOWAIT, (cmd), (envp)))
-# else
-# define DO_SPAWN(cmd, args, envp) ((args) ? \
- spawnv(P_NOWAIT, (cmd), (args)) : \
- spawn(P_NOWAIT, (cmd)))
-# endif
-# if !defined(HAVE_FORK)
+ char errmsg[80] = { '\0' };
+#elif defined(_WIN32)
+ volatile VALUE argbuf;
char **args = NULL;
-# if defined(HAVE_SPAWNVE)
- char **envp = NULL;
-# endif
-# endif
+ int pair[2], write_pair[2];
#endif
#if !defined(HAVE_FORK)
- struct rb_execarg sarg, *sargp = &sarg;
+ struct rb_exec_arg sarg;
#endif
FILE *fp = 0;
int fd = -1;
int write_fd = -1;
-#if !defined(HAVE_FORK)
const char *cmd = 0;
-#if !defined(HAVE_SPAWNV)
int argc;
VALUE *argv;
-#endif
if (prog)
cmd = StringValueCStr(prog);
-#endif
-#if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
- arg.execarg_obj = execarg_obj;
- arg.eargp = eargp;
+ 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;
+ }
+ 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;
-# if !defined(HAVE_FORK)
- if (eargp && !eargp->use_shell) {
- args = ARGVSTR2ARGV(eargp->invoke.cmd.argv_str);
- }
-# endif
switch (fmode & (FMODE_READABLE|FMODE_WRITABLE)) {
case FMODE_READABLE|FMODE_WRITABLE:
if (rb_pipe(arg.write_pair) < 0)
- rb_sys_fail_str(prog);
+ 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_str(prog);
+ rb_sys_fail(cmd);
}
if (eargp) {
- rb_execarg_addopt(execarg_obj, INT2FIX(0), INT2FIX(arg.write_pair[0]));
- rb_execarg_addopt(execarg_obj, INT2FIX(1), INT2FIX(arg.pair[1]));
+ 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_str(prog);
+ rb_sys_fail(cmd);
if (eargp)
- rb_execarg_addopt(execarg_obj, INT2FIX(1), INT2FIX(arg.pair[1]));
+ rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
break;
case FMODE_WRITABLE:
if (rb_pipe(arg.pair) < 0)
- rb_sys_fail_str(prog);
+ rb_sys_fail(cmd);
if (eargp)
- rb_execarg_addopt(execarg_obj, INT2FIX(0), INT2FIX(arg.pair[0]));
+ rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.pair[0]));
break;
default:
- rb_sys_fail_str(prog);
+ rb_sys_fail(cmd);
}
- if (!NIL_P(execarg_obj)) {
- rb_execarg_fixup(execarg_obj);
-# if defined(HAVE_FORK)
- pid = rb_fork_async_signal_safe(&status, popen_exec, &arg, arg.eargp->redirect_fds, errmsg, sizeof(errmsg));
-# else
- rb_execarg_run_options(eargp, sargp, NULL, 0);
-# if defined(HAVE_SPAWNVE)
- if (eargp->envp_str) envp = (char **)RSTRING_PTR(eargp->envp_str);
-# endif
- while ((pid = DO_SPAWN(cmd, args, envp)) == -1) {
- /* exec failed */
- switch (e = errno) {
- case EAGAIN:
-# if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- case EWOULDBLOCK:
-# endif
- rb_thread_sleep(1);
- continue;
- }
- break;
- }
- if (eargp)
- rb_execarg_run_options(sargp, NULL, NULL, 0);
-# endif
+ if (eargp) {
+ rb_exec_arg_fixup(arg.execp);
+ pid = rb_fork_err(&status, popen_exec, &arg, arg.execp->redirect_fds, errmsg, sizeof(errmsg));
}
else {
-# if defined(HAVE_FORK)
- pid = rb_fork_ruby(&status);
+ fflush(stdin); /* is it really needed? */
+ pid = rb_fork(&status, 0, 0, Qnil);
if (pid == 0) { /* child */
rb_thread_atfork();
popen_redirect(&arg);
@@ -5865,16 +5024,11 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
rb_io_synchronized(RFILE(orig_stderr)->fptr);
return Qnil;
}
-# else
- rb_notimplement();
-# endif
}
/* parent */
if (pid == -1) {
-# if defined(HAVE_FORK)
- e = errno;
-# endif
+ int e = errno;
close(arg.pair[0]);
close(arg.pair[1]);
if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
@@ -5882,11 +5036,9 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
close(arg.write_pair[1]);
}
errno = e;
-# if defined(HAVE_FORK)
if (errmsg[0])
rb_sys_fail(errmsg);
-# endif
- rb_sys_fail_str(prog);
+ rb_sys_fail(cmd);
}
if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
close(arg.pair[1]);
@@ -5902,19 +5054,115 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
close(arg.pair[0]);
fd = arg.pair[1];
}
+#elif defined(_WIN32)
+ if (argc) {
+ int i;
+
+ if (argc >= (int)(FIXNUM_MAX / sizeof(char *))) {
+ rb_raise(rb_eArgError, "too many arguments");
+ }
+ 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]);
+ }
+ 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
+ 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);
+ }
+ break;
+ }
+ }
+
+ RB_GC_GUARD(argbuf);
+
+ 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 (!NIL_P(execarg_obj)) {
- rb_execarg_fixup(execarg_obj);
- rb_execarg_run_options(eargp, sargp, NULL, 0);
+ if (eargp) {
+ rb_exec_arg_fixup(eargp);
+ rb_run_exec_options(eargp, &sarg);
}
fp = popen(cmd, modestr);
if (eargp)
- rb_execarg_run_options(sargp, NULL, NULL, 0);
- if (!fp) rb_sys_fail_path(prog);
+ rb_run_exec_options(&sarg, NULL);
+ if (!fp) rb_sys_fail(RSTRING_PTR(prog));
fd = fileno(fp);
#endif
@@ -5925,21 +5173,6 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
fptr->mode = fmode | FMODE_SYNC|FMODE_DUPLEX;
if (convconfig) {
fptr->encs = *convconfig;
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
- if (fptr->encs.ecflags & ECONV_DEFAULT_NEWLINE_DECORATOR) {
- fptr->encs.ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;
- }
-#endif
- }
- else {
- if (NEED_NEWLINE_DECORATOR_ON_READ(fptr)) {
- fptr->encs.ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;
- }
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
- if (NEED_NEWLINE_DECORATOR_ON_WRITE(fptr)) {
- fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
- }
-#endif
}
fptr->pid = pid;
@@ -5960,36 +5193,54 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
return port;
}
-static int
-is_popen_fork(VALUE prog)
+static VALUE
+pipe_open_v(int argc, VALUE *argv, const char *modestr, int fmode, convconfig_t *convconfig)
{
- if (RSTRING_LEN(prog) == 1 && RSTRING_PTR(prog)[0] == '-') {
+ VALUE prog;
+ struct rb_exec_arg earg;
+ prog = rb_exec_arg_init(argc, argv, FALSE, &earg);
+ return pipe_open(&earg, prog, modestr, fmode, convconfig);
+}
+
+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 (RSTRING_LEN(prog) == 1 && cmd[0] == '-') {
#if !defined(HAVE_FORK)
rb_raise(rb_eNotImpError,
"fork() function is unimplemented on this machine");
-#else
- return TRUE;
#endif
+ return pipe_open(0, 0, modestr, fmode, convconfig);
}
- return FALSE;
+
+ rb_exec_arg_init(argc, argv, TRUE, &earg);
+ return pipe_open(&earg, prog, modestr, fmode, convconfig);
}
static VALUE
-pipe_open_s(VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig)
+pop_last_hash(int *argc_p, VALUE *argv)
{
- int argc = 1;
- VALUE *argv = &prog;
- VALUE execarg_obj = Qnil;
-
- if (!is_popen_fork(prog))
- execarg_obj = rb_execarg_new(argc, argv, TRUE);
- return pipe_open(execarg_obj, modestr, fmode, convconfig);
+ VALUE last, tmp;
+ if (*argc_p == 0)
+ return Qnil;
+ last = argv[*argc_p-1];
+ if (NIL_P(last)) return Qnil;
+ tmp = rb_check_convert_type(last, T_HASH, "Hash", "to_hash");
+ if (NIL_P(tmp))
+ return Qnil;
+ (*argc_p)--;
+ return tmp;
}
/*
* call-seq:
- * IO.popen([env,] cmd, mode="r" [, opt]) -> io
- * IO.popen([env,] cmd, mode="r" [, opt]) {|io| block } -> obj
+ * 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
* standard input and output will be connected to the returned
@@ -6029,11 +5280,6 @@ pipe_open_s(VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig
* ls_result_with_error = ls_io.read
* }
*
- * # spawn options can be mixed with IO options
- * 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.
*
@@ -6078,24 +5324,15 @@ static VALUE
rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
{
const char *modestr;
- VALUE pname, pmode = Qnil, port, tmp, opt = Qnil, env = Qnil, execarg_obj = Qnil;
+ VALUE pname, pmode, port, tmp, opt;
int oflags, fmode;
convconfig_t convconfig;
- if (argc > 1 && !NIL_P(opt = rb_check_hash_type(argv[argc-1]))) --argc;
- if (argc > 1 && !NIL_P(env = rb_check_hash_type(argv[0]))) --argc, ++argv;
- switch (argc) {
- case 2:
- pmode = argv[1];
- case 1:
- pname = argv[0];
- break;
- default:
- {
- int ex = !NIL_P(opt);
- rb_error_arity(argc + ex, 1 + ex, 2 + ex);
- }
- }
+ 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)) {
@@ -6107,25 +5344,13 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
#endif
tmp = rb_ary_dup(tmp);
RBASIC(tmp)->klass = 0;
- execarg_obj = rb_execarg_new((int)len, RARRAY_PTR(tmp), FALSE);
+ port = pipe_open_v((int)len, RARRAY_PTR(tmp), modestr, fmode, &convconfig);
rb_ary_clear(tmp);
}
else {
SafeStringValue(pname);
- execarg_obj = Qnil;
- if (!is_popen_fork(pname))
- execarg_obj = rb_execarg_new(1, &pname, TRUE);
+ port = pipe_open_s(pname, modestr, fmode, &convconfig);
}
- if (!NIL_P(execarg_obj)) {
- if (!NIL_P(opt))
- opt = rb_execarg_extract_options(execarg_obj, opt);
- if (!NIL_P(env))
- rb_execarg_setenv(execarg_obj, env);
- }
- rb_io_extract_modeenc(&pmode, 0, opt, &oflags, &fmode, &convconfig);
- modestr = rb_io_oflags_modestr(oflags);
-
- port = pipe_open(execarg_obj, modestr, fmode, &convconfig);
if (NIL_P(port)) {
/* child */
if (rb_block_given_p()) {
@@ -6148,16 +5373,17 @@ 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, fname, vmode, vperm;
+ VALUE opt=Qnil, fname, vmode, vperm;
int oflags, fmode;
mode_t perm;
- argc = rb_scan_args(argc, argv, "12:", &fname, &vmode, &vperm, &opt);
+ opt = pop_last_hash(&argc, argv);
+ rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm);
FilePathValue(fname);
rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, convconfig_p);
- perm = NIL_P(vperm) ? 0666 : NUM2MODET(vperm);
+ perm = NIL_P(vperm) ? 0666 : NUM2UINT(vperm);
*fname_p = fname;
*oflags_p = oflags;
@@ -6189,31 +5415,26 @@ rb_open_file(int argc, VALUE *argv, VALUE io)
* File.open(filename, mode="r" [, opt]) {|file| block } -> obj
* File.open(filename [, mode [, perm]] [, opt]) {|file| block } -> obj
*
- * With no associated block, <code>File.open</code> is a synonym for
- * File.new. If the optional code block is given, it will
- * be passed the opened +file+ as an argument and the File object will
- * automatically be closed when the block terminates. The value of the block
- * will be returned from <code>File.open</code>.
- *
- * If a file is being created, its initial permissions may be set using the
- * +perm+ parameter. See File.new for further discussion.
- *
- * See IO.new for a description of the +mode+ and +opt+ parameters.
+ * 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="r" [, opt]) -> io
- * IO.open(fd, mode="r" [, opt]) { |io| block } -> obj
+ * IO.open(fd, mode_string="r" [, opt] ) -> io
+ * IO.open(fd, mode_string="r" [, opt] ) {|io| block } -> obj
*
- * With no associated block, <code>IO.open</code> is a synonym for IO.new. If
- * the optional code block is given, it will be passed +io+ as an argument,
- * and the IO object will automatically be closed when the block terminates.
- * In this instance, IO.open returns the value of the block.
+ * With no associated block, <code>open</code> is a synonym for
+ * <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.
*
- * See IO.new for a description of the +fd+, +mode+ and +opt+ parameters.
*/
static VALUE
@@ -6236,6 +5457,7 @@ rb_io_s_open(int argc, VALUE *argv, VALUE klass)
* <code>Fixnum</code>.
*
* IO.sysopen("testfile") #=> 3
+ *
*/
static VALUE
@@ -6258,7 +5480,7 @@ rb_io_s_sysopen(int argc, VALUE *argv)
oflags = rb_io_modestr_oflags(StringValueCStr(vmode));
}
if (NIL_P(vperm)) perm = 0666;
- else perm = NUM2MODET(vperm);
+ else perm = NUM2UINT(vperm);
RB_GC_GUARD(fname) = rb_str_new4(fname);
fd = rb_sysopen(fname, oflags, perm);
@@ -6283,58 +5505,72 @@ check_pipe_command(VALUE filename_or_command)
/*
* call-seq:
- * open(path [, mode [, perm]] [, opt]) -> io or nil
- * open(path [, mode [, perm]] [, opt]) {|io| block } -> obj
- *
- * Creates an IO object connected to the given stream, file, or subprocess.
- *
- * If +path+ 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
- * "r").
- *
- * The +mode+ 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 "fmode", "fmode:ext_enc", or
- * "fmode:ext_enc:int_enc".
- *
- * See the documentation of IO.new for full documentation of the +mode+ string
- * directives.
- *
- * If a file is being created, its initial permissions may be set using the
- * +perm+ parameter. See File.new and the open(2) and chmod(2) man pages for
- * a description of permissions.
- *
- * If a block is specified, it will be invoked with the IO object as a
- * parameter, and the IO will be automatically closed when the block
- * terminates. The call returns the value of the block.
- *
- * If +path+ starts with a pipe character (<code>"|"</code>), a subprocess is
- * created, connected to the caller by a pair of pipes. The returned IO
- * object may be used to write to the standard input and read from the
- * standard output of this subprocess.
- *
- * If the command following the pipe is a single minus sign
- * (<code>"|-"</code>), Ruby forks, and this subprocess is connected to the
- * parent. If the command is not <code>"-"</code>, the subprocess runs the
- * command.
- *
- * When the subprocess is ruby (opened via <code>"|-"</code>), the +open+
- * call returns +nil+. If a block is associated with the open call, that
- * block will run twice --- once in the parent and once in the child.
- *
- * The block parameter will be an IO object in the parent and +nil+ in the
- * child. The parent's +IO+ object will be connected to the child's $stdin
- * and $stdout. The subprocess will be terminated at the end of the block.
- *
- * === Examples
+ * open(path [, mode_enc [, perm]] [, opt] ) -> io or nil
+ * open(path [, mode_enc [, perm]] [, opt] ) {|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.
+ *
+ * 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.
*
- * Reading from "testfile":
+ * 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
+ * and read from the standard output of this subprocess. If the command
+ * following the ``<code>|</code>'' is a single minus sign, Ruby forks,
+ * and this subprocess is connected to the parent. In the subprocess,
+ * the <code>open</code> call returns <code>nil</code>. If the command
+ * is not ``<code>-</code>'', the subprocess runs the command. If a
+ * block is associated with an <code>open("|-")</code> call, that block
+ * will be run twice---once in the parent and once in the child. The
+ * block parameter will be an <code>IO</code> object in the parent and
+ * <code>nil</code> in the child. The parent's <code>IO</code> object
+ * 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
*
- * Produces:
+ * <em>produces:</em>
*
* This is line one
*
@@ -6344,7 +5580,7 @@ check_pipe_command(VALUE filename_or_command)
* print cmd.gets
* cmd.close
*
- * Produces:
+ * <em>produces:</em>
*
* Wed Apr 9 08:56:31 CDT 2003
*
@@ -6358,23 +5594,21 @@ check_pipe_command(VALUE filename_or_command)
* puts "Got: #{f.gets}"
* end
*
- * Produces:
+ * <em>produces:</em>
*
* Got: in Child
*
- * Open a subprocess using a block to receive the IO object:
+ * Open a subprocess using a block to receive the I/O object:
*
- * open "|-" do |f|
- * if f then
- * # parent process
- * puts "Got: #{f.gets}"
- * else
- * # child process
+ * open("|-") do |f|
+ * if f == nil
* puts "in Child"
+ * else
+ * puts "Got: #{f.gets}"
* end
* end
*
- * Produces:
+ * <em>produces:</em>
*
* Got: in Child
*/
@@ -6425,7 +5659,7 @@ rb_io_open(VALUE filename, VALUE vmode, VALUE vperm, VALUE opt)
mode_t perm;
rb_io_extract_modeenc(&vmode, &vperm, opt, &oflags, &fmode, &convconfig);
- perm = NIL_P(vperm) ? 0666 : NUM2MODET(vperm);
+ 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);
@@ -6504,17 +5738,15 @@ io_reopen(VALUE io, VALUE nfile)
if (fd != fd2) {
if (IS_PREP_STDIO(fptr) || fd <= 2 || !fptr->stdio_file) {
/* need to keep FILE objects of stdin, stdout and stderr */
- if (rb_cloexec_dup2(fd2, fd) < 0)
+ if (dup2(fd2, fd) < 0)
rb_sys_fail_path(orig->pathv);
- rb_update_max_fd(fd);
}
else {
fclose(fptr->stdio_file);
fptr->stdio_file = 0;
fptr->fd = -1;
- if (rb_cloexec_dup2(fd2, fd) < 0)
+ if (dup2(fd2, fd) < 0)
rb_sys_fail_path(orig->pathv);
- rb_update_max_fd(fd);
fptr->fd = fd;
}
rb_thread_fd_close(fd);
@@ -6555,12 +5787,12 @@ io_reopen(VALUE io, VALUE nfile)
static VALUE
rb_io_reopen(int argc, VALUE *argv, VALUE file)
{
- VALUE fname, nmode, opt;
+ VALUE fname, nmode;
int oflags;
rb_io_t *fptr;
rb_secure(4);
- if (rb_scan_args(argc, argv, "11:", &fname, &nmode, &opt) == 1) {
+ if (rb_scan_args(argc, argv, "11", &fname, &nmode) == 1) {
VALUE tmp = rb_io_check_io(fname);
if (!NIL_P(tmp)) {
return io_reopen(file, tmp);
@@ -6575,11 +5807,8 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
MEMZERO(fptr, rb_io_t, 1);
}
- if (!NIL_P(nmode) || !NIL_P(opt)) {
- int fmode;
- convconfig_t convconfig;
-
- rb_io_extract_modeenc(&nmode, 0, opt, &oflags, &fmode, &convconfig);
+ 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)) {
@@ -6589,13 +5818,13 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
rb_io_fmode_modestr(fmode));
}
fptr->mode = fmode;
- fptr->encs = convconfig;
- }
- else {
- oflags = rb_io_fmode_oflags(fptr->mode);
+ rb_io_mode_enc(fptr, StringValueCStr(nmode));
+ fptr->encs.ecflags = 0;
+ fptr->encs.ecopts = Qnil;
}
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;
@@ -6606,36 +5835,23 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
if (io_fflush(fptr) < 0)
rb_sys_fail(0);
}
- fptr->rbuf.off = fptr->rbuf.len = 0;
+ 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);
- rb_fd_fix_cloexec(fptr->fd);
#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));
#endif
- if (fptr->stdio_file == stderr) {
- if (setvbuf(fptr->stdio_file, NULL, _IONBF, BUFSIZ) != 0)
- rb_warn("setvbuf() can't be honoured for %s", RSTRING_PTR(fptr->pathv));
- }
- else if (fptr->stdio_file == stdout && isatty(fptr->fd)) {
- if (setvbuf(fptr->stdio_file, NULL, _IOLBF, BUFSIZ) != 0)
- rb_warn("setvbuf() can't be honoured for %s", RSTRING_PTR(fptr->pathv));
- }
}
else {
- int tmpfd = rb_sysopen(fptr->pathv, oflags, 0666);
- int err = 0;
- if (rb_cloexec_dup2(tmpfd, fptr->fd) < 0)
- err = errno;
- (void)close(tmpfd);
- if (err) {
- rb_sys_fail_path(fptr->pathv);
- }
+ if (close(fptr->fd) < 0)
+ rb_sys_fail_path(fptr->pathv);
+ fptr->fd = -1;
+ fptr->fd = rb_sysopen(fptr->pathv, oflags, 0666);
}
return file;
@@ -6651,7 +5867,7 @@ rb_io_init_copy(VALUE dest, VALUE io)
off_t pos;
io = rb_io_get_io(io);
- if (!OBJ_INIT_COPY(dest, io)) return dest;
+ if (dest == io) return dest;
GetOpenFile(io, orig);
MakeOpenFile(dest, fptr);
@@ -6690,7 +5906,7 @@ rb_io_init_copy(VALUE dest, VALUE io)
/*
* call-seq:
- * ios.printf(format_string [, obj, ...]) -> nil
+ * 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>
@@ -6706,8 +5922,8 @@ rb_io_printf(int argc, VALUE *argv, VALUE out)
/*
* call-seq:
- * printf(io, string [, obj ... ]) -> nil
- * printf(string [, obj ... ]) -> nil
+ * printf(io, string [, obj ... ] ) -> nil
+ * printf(string [, obj ... ] ) -> nil
*
* Equivalent to:
* io.write(sprintf(string, obj, ...)
@@ -6721,7 +5937,7 @@ rb_f_printf(int argc, VALUE *argv)
VALUE out;
if (argc == 0) return Qnil;
- if (RB_TYPE_P(argv[0], T_STRING)) {
+ if (TYPE(argv[0]) == T_STRING) {
out = rb_stdout;
}
else {
@@ -6832,15 +6048,9 @@ rb_f_print(int argc, VALUE *argv)
static VALUE
rb_io_putc(VALUE io, VALUE ch)
{
- VALUE str;
- if (RB_TYPE_P(ch, T_STRING)) {
- str = rb_str_substr(ch, 0, 1);
- }
- else {
- char c = NUM2CHR(ch);
- str = rb_str_new(&c, 1);
- }
- rb_io_write(io, str);
+ char c = NUM2CHR(ch);
+
+ rb_io_write(io, rb_str_new(&c, 1));
return ch;
}
@@ -6851,7 +6061,7 @@ rb_io_putc(VALUE io, VALUE ch)
* Equivalent to:
*
* $stdout.putc(int)
- *
+ *
* Refer to the documentation for IO#putc for important information regarding
* multi-byte characters.
*/
@@ -6890,15 +6100,13 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
if (recur) {
tmp = rb_str_new2("[...]");
rb_io_puts(1, &tmp, out);
- return Qtrue;
+ return Qnil;
}
- ary = rb_check_array_type(ary);
- if (NIL_P(ary)) return Qfalse;
for (i=0; i<RARRAY_LEN(ary); i++) {
tmp = RARRAY_PTR(ary)[i];
rb_io_puts(1, &tmp, out);
}
- return Qtrue;
+ return Qnil;
}
/*
@@ -6933,11 +6141,13 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
return Qnil;
}
for (i=0; i<argc; i++) {
- if (RB_TYPE_P(argv[i], T_STRING)) {
+ if (TYPE(argv[i]) == T_STRING) {
line = argv[i];
goto string;
}
- if (rb_exec_recursive(io_puts_ary, argv[i], out)) {
+ line = rb_check_array_type(argv[i]);
+ if (!NIL_P(line)) {
+ rb_exec_recursive(io_puts_ary, line, out);
continue;
}
line = rb_obj_as_string(argv[i]);
@@ -6974,7 +6184,7 @@ void
rb_p(VALUE obj) /* for debug print within C code */
{
VALUE str = rb_obj_as_string(rb_inspect(obj));
- if (RB_TYPE_P(rb_stdout, T_FILE) &&
+ 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);
@@ -6985,43 +6195,15 @@ rb_p(VALUE obj) /* for debug print within C code */
}
}
-struct rb_f_p_arg {
- int argc;
- VALUE *argv;
-};
-
-static VALUE
-rb_f_p_internal(VALUE arg)
-{
- struct rb_f_p_arg *arg1 = (struct rb_f_p_arg*)arg;
- int argc = arg1->argc;
- VALUE *argv = arg1->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 (RB_TYPE_P(rb_stdout, T_FILE)) {
- rb_io_flush(rb_stdout);
- }
- return ret;
-}
-
/*
* call-seq:
* p(obj) -> obj
* p(obj1, obj2, ...) -> [obj, ...]
* p() -> nil
*
- * For each object, directly writes _obj_.+inspect+ followed by a
- * newline to the program's standard output.
+ * 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']
@@ -7035,11 +6217,22 @@ rb_f_p_internal(VALUE arg)
static VALUE
rb_f_p(int argc, VALUE *argv, VALUE self)
{
- struct rb_f_p_arg arg;
- arg.argc = argc;
- arg.argv = argv;
+ int i;
+ VALUE ret = Qnil;
- return rb_uninterruptible(rb_f_p_internal, (VALUE)&arg);
+ 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;
}
/*
@@ -7085,10 +6278,7 @@ void
rb_write_error2(const char *mesg, long len)
{
if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
- if (fwrite(mesg, sizeof(char), (size_t)len, stderr) < (size_t)len) {
- /* failed to write to stderr, what can we do? */
- return;
- }
+ (void)fwrite(mesg, sizeof(char), len, stderr);
}
else {
rb_io_write(rb_stderr, rb_str_new(mesg, len));
@@ -7101,23 +6291,6 @@ rb_write_error(const char *mesg)
rb_write_error2(mesg, strlen(mesg));
}
-void
-rb_write_error_str(VALUE mesg)
-{
- /* a stopgap measure for the time being */
- if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
- size_t len = (size_t)RSTRING_LEN(mesg);
- if (fwrite(RSTRING_PTR(mesg), sizeof(char), len, stderr) < len) {
- RB_GC_GUARD(mesg);
- return;
- }
- }
- else {
- /* may unlock GVL, and */
- rb_io_write(rb_stderr, mesg);
- }
-}
-
static void
must_respond_to(ID mid, VALUE val, ID id)
{
@@ -7152,7 +6325,6 @@ prep_io(int fd, int fmode, VALUE klass, const char *path)
fp->mode = fmode;
io_check_tty(fp);
if (path) fp->pathv = rb_obj_freeze(rb_str_new_cstr(path));
- rb_update_max_fd(fd);
return io;
}
@@ -7170,16 +6342,9 @@ static VALUE
prep_stdio(FILE *f, int fmode, VALUE klass, const char *path)
{
rb_io_t *fptr;
- VALUE io = prep_io(fileno(f), fmode|FMODE_PREP|DEFAULT_TEXTMODE, klass, path);
+ VALUE io = prep_io(fileno(f), fmode|FMODE_PREP, klass, path);
GetOpenFile(io, fptr);
- fptr->encs.ecflags |= ECONV_DEFAULT_NEWLINE_DECORATOR;
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
- fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
- if (fmode & FMODE_READABLE) {
- fptr->encs.ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;
- }
-#endif
fptr->stdio_file = f;
return io;
@@ -7199,146 +6364,86 @@ rb_io_stdio_file(rb_io_t *fptr)
* call-seq:
* IO.new(fd [, mode] [, opt]) -> io
*
- * Returns a new IO object (a stream) for the given integer file descriptor
- * +fd+ and +mode+ string. +opt+ may be used to specify parts of +mode+ in a
- * more readable fashion. See also IO.sysopen and IO.for_fd.
- *
- * IO.new is called by various File and IO opening methods such as IO::open,
- * Kernel#open, and File::open.
- *
- * === Open Mode
- *
- * When +mode+ is an integer it must be combination of the modes defined in
- * File::Constants (+File::RDONLY+, +File::WRONLY | File::CREAT+). See the
- * open(2) man page for more information.
- *
- * When +mode+ is a string it must be in one of the following forms:
- *
- * fmode
- * fmode ":" ext_enc
- * fmode ":" ext_enc ":" int_enc
- * fmode ":" "BOM|UTF-*"
- *
- * +fmode+ is an IO open mode string, +ext_enc+ is the external encoding for
- * the IO and +int_enc+ is the internal encoding.
- *
- * ==== IO Open Mode
- *
- * Ruby allows the following open modes:
- *
- * "r" Read-only, starts at beginning of file (default mode).
- *
- * "r+" Read-write, starts at beginning of 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
- * or creates a new file for reading and writing.
- *
- * "a" Write-only, each write call appends data at end of file.
- * Creates a new file for writing if file does not exist.
- *
- * "a+" Read-write, each write call appends data at end of file.
- * Creates a new file for reading and writing if file does
- * not exist.
- *
- * The following modes must be used separately, and along with one or more of
- * the modes seen above.
- *
- * "b" Binary file mode
- * Suppresses EOL <-> CRLF conversion on Windows. And
- * sets external encoding to ASCII-8BIT unless explicitly
- * specified.
- *
- * "t" Text file mode
- *
- * When the open mode of original IO is read only, the mode cannot be
- * changed to be writable. Similarly, the open mode cannot be changed from
- * write only to readable.
- *
- * When such a change is attempted the error is raised in different locations
- * according to the platform.
- *
- * === IO Encoding
- *
- * When +ext_enc+ is specified, strings read will be tagged by the encoding
- * when reading, and strings output will be converted to the specified
- * encoding when writing.
- *
- * When +ext_enc+ and +int_enc+ are specified read strings will be converted
- * from +ext_enc+ to +int_enc+ upon input, and written strings will be
- * converted from +int_enc+ to +ext_enc+ upon output. See Encoding for
- * further details of transcoding on input and output.
- *
- * If "BOM|UTF-8", "BOM|UTF-16LE" or "BOM|UTF16-BE" are used, ruby checks for
- * a Unicode BOM in the input document to help determine the encoding. For
- * UTF-16 encodings the file open mode must be binary. When present, the BOM
- * is stripped and the external encoding from the BOM is used. When the BOM
- * is missing the given Unicode encoding is used as +ext_enc+. (The BOM-set
- * encoding option is case insensitive, so "bom|utf-8" is also valid.)
- *
- * === Options
- *
- * +opt+ can be used instead of +mode+ for improved readability. The
- * following keys are supported:
+ * 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.sysopen</code> and
+ * <code>IO.for_fd</code>.
*
+ * === Parameters
+ * fd:: numeric file descriptor
+ * mode:: file mode. a string or an integer
+ * opt:: hash for specifying 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.
+ *
+ * When the mode of original IO is read only, the mode cannot be changed to
+ * be writable. Similarly, the mode cannot be changed from write only to
+ * readable.
+ * If such a wrong change is directed, timing where the error actually occurs
+ * is different according to the platform.
+ *
+ * ==== Options
+ * <code>opt</code> can have the following keys
* :mode ::
- * Same as +mode+ 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.
- *
+ * 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".
- *
+ * specifies external and internal encodings as "extern:intern".
* :textmode ::
- * If the value is truth value, same as "t" in argument +mode+.
- *
+ * If the value is truth value, same as "t" in argument <code>mode</code>.
* :binmode ::
- * If the value is truth value, same as "b" in argument +mode+.
- *
+ * If the value is truth value, same as "b" in argument <code>mode</code>.
* :autoclose ::
- * If the value is +false+, the +fd+ will be kept open after this IO
- * instance gets finalized.
+ * If the value is +false+, the _fd_ will be kept open after this
+ * +IO+ instance gets finalized.
*
- * Also, +opt+ can have same keys in String#encode for controlling conversion
- * between the external encoding and the internal encoding.
+ * Also <code>opt</code> can have same keys in <code>String#encode</code> for
+ * controlling conversion between the external encoding and the internal encoding.
*
- * === Example 1
+ * === Example1
*
- * fd = IO.sysopen("/dev/tty", "w")
- * a = IO.new(fd,"w")
- * $stderr.puts "Hello"
- * a.puts "World"
+ * fd = IO.sysopen("/dev/tty", "w")
+ * a = IO.new(fd,"w")
+ * $stderr.puts "Hello"
+ * a.puts "World"
*
- * Produces:
+ * <em>produces:</em>
*
- * Hello
- * World
+ * Hello
+ * World
*
- * === Example 2
+ * === Example2
*
- * require 'fcntl'
+ * require 'fcntl'
*
- * fd = STDERR.fcntl(Fcntl::F_DUPFD)
- * io = IO.new(fd, mode: 'w:UTF-16LE', cr_newline: true)
- * io.puts "Hello, World!"
+ * fd = STDERR.fcntl(Fcntl::F_DUPFD)
+ * io = IO.new(fd, mode: 'w:UTF-16LE', cr_newline: true)
+ * io.puts "Hello, World!"
*
- * fd = STDERR.fcntl(Fcntl::F_DUPFD)
- * io = IO.new(fd, mode: 'w', cr_newline: true,
- * external_encoding: Encoding::UTF_16LE)
- * io.puts "Hello, World!"
+ * fd = STDERR.fcntl(Fcntl::F_DUPFD)
+ * io = IO.new(fd, mode: 'w', cr_newline: true, external_encoding: Encoding::UTF_16LE)
+ * io.puts "Hello, World!"
*
- * Both of above print "Hello, World!" in UTF-16LE to standard error output
- * with converting EOL generated by <code>puts</code> to CR.
+ * both of above print "Hello, World!" in UTF-16LE to standard error output with
+ * converting EOL generated by <code>puts</code> to CR.
*/
static VALUE
@@ -7357,20 +6462,18 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
rb_secure(4);
- argc = rb_scan_args(argc, argv, "11:", &fnum, &vmode, &opt);
+ opt = pop_last_hash(&argc, argv);
+ rb_scan_args(argc, argv, "11", &fnum, &vmode);
rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &fmode, &convconfig);
fd = NUM2INT(fnum);
- if (rb_reserved_fd_p(fd)) {
- rb_raise(rb_eArgError, "The given fd is not accessible because RubyVM reserves it");
- }
#if defined(HAVE_FCNTL) && defined(F_GETFL)
oflags = fcntl(fd, F_GETFL);
if (oflags == -1) rb_sys_fail(0);
#else
if (fstat(fd, &st) == -1) rb_sys_fail(0);
#endif
- rb_update_max_fd(fd);
+ UPDATE_MAXFD(fd);
#if defined(HAVE_FCNTL) && defined(F_GETFL)
ofmode = rb_io_oflags_fmode(oflags);
if (NIL_P(vmode)) {
@@ -7406,20 +6509,27 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
* File.new(filename, mode="r" [, opt]) -> file
* File.new(filename [, mode [, perm]] [, opt]) -> file
*
- * Opens the file named by +filename+ according to the given +mode+ and
- * returns a new File object.
+ * Opens the file named by _filename_ according to
+ * _mode_ (default is ``r'') and returns a new
+ * <code>File</code> object.
*
- * See IO.new for a description of +mode+ and +opt+.
+ * === 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.
*
- * If a file is being created, permission bits may be given in +perm+. These
- * mode and permission bits are platform dependent; on Unix systems, see
- * open(2) and chmod(2) man pages for details.
+ * Optional _opt_ parameter is same as in <code.IO.open</code>.
*
* === Examples
*
- * f = File.new("testfile", "r")
- * f = File.new("newfile", "w+")
- * f = File.new("newfile", File::CREAT|File::TRUNC|File::RDWR, 0644)
+ * f = File.new("testfile", "r")
+ * f = File.new("newfile", "w+")
+ * f = File.new("newfile", File::CREAT|File::TRUNC|File::RDWR, 0644)
*/
static VALUE
@@ -7482,9 +6592,9 @@ rb_io_s_for_fd(int argc, VALUE *argv, VALUE klass)
static VALUE
rb_io_autoclose_p(VALUE io)
{
- rb_io_t *fptr = RFILE(io)->fptr;
+ rb_io_t *fptr;
rb_secure(4);
- rb_io_check_closed(fptr);
+ GetOpenFile(io, fptr);
return (fptr->mode & FMODE_PREP) ? Qfalse : Qtrue;
}
@@ -7536,21 +6646,6 @@ argf_free(void *ptr)
xfree(p);
}
-static size_t
-argf_memsize(const void *ptr)
-{
- const struct argf *p = ptr;
- size_t size = sizeof(*p);
- if (!ptr) return 0;
- if (p->inplace) size += strlen(p->inplace) + 1;
- return size;
-}
-
-static const rb_data_type_t argf_type = {
- "ARGF",
- {argf_mark, argf_free, argf_memsize},
-};
-
static inline void
argf_init(struct argf *p, VALUE v)
{
@@ -7564,7 +6659,7 @@ static VALUE
argf_alloc(VALUE klass)
{
struct argf *p;
- VALUE argf = TypedData_Make_Struct(klass, struct argf, &argf_type, p);
+ VALUE argf = Data_Make_Struct(klass, struct argf, argf_mark, argf_free, p);
argf_init(p, Qnil);
return argf;
@@ -7586,7 +6681,6 @@ argf_initialize(VALUE argf, VALUE argv)
static VALUE
argf_initialize_copy(VALUE argf, VALUE orig)
{
- if (!OBJ_INIT_COPY(argf, orig)) return argf;
ARGF = argf_of(orig);
ARGF.argv = rb_obj_dup(ARGF.argv);
if (ARGF.inplace) {
@@ -7599,7 +6693,7 @@ argf_initialize_copy(VALUE argf, VALUE orig)
/*
* call-seq:
- * ARGF.lineno = integer -> integer
+ * ARGF.lineno = number -> nil
*
* Sets the line number of +ARGF+ as a whole to the given +Integer+.
*
@@ -7612,7 +6706,7 @@ argf_initialize_copy(VALUE argf, VALUE orig)
* ARGF.lineno #=> 0
* ARGF.readline #=> "This is line 1\n"
* ARGF.lineno #=> 1
- * ARGF.lineno = 0 #=> 0
+ * ARGF.lineno = 0 #=> nil
* ARGF.lineno #=> 0
*/
static VALUE
@@ -7650,23 +6744,19 @@ argf_forward(int argc, VALUE *argv, VALUE argf)
#define next_argv() argf_next_argv(argf)
#define ARGF_GENERIC_INPUT_P() \
- (ARGF.current_file == rb_stdin && !RB_TYPE_P(ARGF.current_file, T_FILE))
+ (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);\
+ return argf_forward(argc, argv, argf);\
} while (0)
#define NEXT_ARGF_FORWARD(argc, argv) do {\
if (!next_argv()) return Qnil;\
- ARGF_FORWARD((argc), (argv));\
+ ARGF_FORWARD(argc, argv);\
} while (0)
static void
argf_close(VALUE file)
{
- if (file == rb_stdin) return;
- if (RB_TYPE_P(file, T_FILE)) {
- rb_io_set_write_io(file, Qnil);
- }
rb_funcall3(file, rb_intern("close"), 0, 0);
}
@@ -7676,9 +6766,8 @@ argf_next_argv(VALUE argf)
char *fn;
rb_io_t *fptr;
int stdout_binmode = 0;
- int fmode;
- if (RB_TYPE_P(rb_stdout, T_FILE)) {
+ if (TYPE(rb_stdout) == T_FILE) {
GetOpenFile(rb_stdout, fptr);
if (fptr->mode & FMODE_BINMODE)
stdout_binmode = 1;
@@ -7693,14 +6782,6 @@ argf_next_argv(VALUE argf)
}
ARGF.init_p = 1;
}
- else {
- if (NIL_P(ARGF.argv)) {
- ARGF.next_p = -1;
- }
- else if (ARGF.next_p == -1 && RARRAY_LEN(ARGF.argv) > 0) {
- ARGF.next_p = 1;
- }
- }
if (ARGF.next_p == 1) {
retry:
@@ -7715,7 +6796,6 @@ argf_next_argv(VALUE argf)
}
}
else {
- VALUE write_io = Qnil;
int fr = rb_sysopen(ARGF.filename, O_RDONLY, 0);
if (ARGF.inplace) {
@@ -7726,21 +6806,21 @@ argf_next_argv(VALUE argf)
VALUE str;
int fw;
- if (RB_TYPE_P(rb_stdout, T_FILE) && rb_stdout != orig_stdout) {
+ if (TYPE(rb_stdout) == T_FILE && rb_stdout != orig_stdout) {
rb_io_close(rb_stdout);
}
fstat(fr, &st);
if (*ARGF.inplace) {
str = rb_str_new2(fn);
+#ifdef NO_LONG_FNAME
+ ruby_add_suffix(str, ARGF.inplace);
+#else
rb_str_cat2(str, ARGF.inplace);
+#endif
#ifdef NO_SAFE_RENAME
(void)close(fr);
(void)unlink(RSTRING_PTR(str));
- if (rename(fn, RSTRING_PTR(str)) < 0) {
- rb_warn("Can't rename %s to %s: %s, skipping file",
- fn, RSTRING_PTR(str), strerror(errno));
- goto retry;
- }
+ (void)rename(fn, RSTRING_PTR(str));
fr = rb_sysopen(str, O_RDONLY, 0);
#else
if (rename(fn, RSTRING_PTR(str)) < 0) {
@@ -7772,51 +6852,26 @@ argf_next_argv(VALUE argf)
chmod(fn, st.st_mode);
#endif
if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) {
- int err;
#ifdef HAVE_FCHOWN
- err = fchown(fw, st.st_uid, st.st_gid);
+ (void)fchown(fw, st.st_uid, st.st_gid);
#else
- err = chown(fn, st.st_uid, st.st_gid);
+ (void)chown(fn, st.st_uid, st.st_gid);
#endif
- if (err && getuid() == 0 && st2.st_uid == 0) {
- const char *wkfn = RSTRING_PTR(ARGF.filename);
- rb_warn("Can't set owner/group of %s to same as %s: %s, skipping file",
- wkfn, fn, strerror(errno));
- (void)close(fr);
- (void)close(fw);
- (void)unlink(wkfn);
- goto retry;
- }
}
#endif
- write_io = prep_io(fw, FMODE_WRITABLE, rb_cFile, fn);
- rb_stdout = write_io;
+ rb_stdout = prep_io(fw, FMODE_WRITABLE, rb_cFile, fn);
if (stdout_binmode) rb_io_binmode(rb_stdout);
}
- fmode = FMODE_READABLE;
- if (!ARGF.binmode) {
- fmode |= DEFAULT_TEXTMODE;
- }
- ARGF.current_file = prep_io(fr, fmode, rb_cFile, fn);
- if (!NIL_P(write_io)) {
- rb_io_set_write_io(ARGF.current_file, write_io);
- }
+ ARGF.current_file = prep_io(fr, FMODE_READABLE, rb_cFile, fn);
}
if (ARGF.binmode) rb_io_ascii8bit_binmode(ARGF.current_file);
- GetOpenFile(ARGF.current_file, fptr);
if (ARGF.encs.enc) {
+ rb_io_t *fptr;
+
+ GetOpenFile(ARGF.current_file, fptr);
fptr->encs = ARGF.encs;
clear_codeconv(fptr);
}
- else {
- fptr->encs.ecflags &= ~ECONV_NEWLINE_DECORATOR_MASK;
- if (!ARGF.binmode) {
- fptr->encs.ecflags |= ECONV_DEFAULT_NEWLINE_DECORATOR;
-#ifdef TEXTMODE_NEWLINE_DECORATOR_ON_WRITE
- fptr->encs.ecflags |= TEXTMODE_NEWLINE_DECORATOR_ON_WRITE;
-#endif
- }
- }
ARGF.next_p = 0;
}
else {
@@ -7839,12 +6894,12 @@ static VALUE
argf_getline(int argc, VALUE *argv, VALUE argf)
{
VALUE line;
- long lineno = ARGF.lineno;
+ int lineno = ARGF.lineno;
retry:
if (!next_argv()) return Qnil;
if (ARGF_GENERIC_INPUT_P()) {
- line = rb_funcall3(ARGF.current_file, idGets, argc, argv);
+ line = rb_funcall3(ARGF.current_file, rb_intern("gets"), argc, argv);
}
else {
if (argc == 0 && rb_rs == rb_default_rs) {
@@ -7922,7 +6977,7 @@ rb_f_gets(int argc, VALUE *argv, VALUE recv)
if (recv == argf) {
return argf_gets(argc, argv, argf);
}
- return rb_funcall2(argf, idGets, argc, argv);
+ return rb_funcall2(argf, rb_intern("gets"), argc, argv);
}
/*
@@ -8070,24 +7125,13 @@ rb_f_readlines(int argc, VALUE *argv, VALUE recv)
static VALUE
argf_readlines(int argc, VALUE *argv, VALUE argf)
{
- long lineno = ARGF.lineno;
- VALUE lines, ary;
+ VALUE line, ary;
ary = rb_ary_new();
- while (next_argv()) {
- if (ARGF_GENERIC_INPUT_P()) {
- lines = rb_funcall3(ARGF.current_file, rb_intern("readlines"), argc, argv);
- }
- else {
- lines = rb_io_readlines(argc, argv, ARGF.current_file);
- argf_close(ARGF.current_file);
- }
- ARGF.next_p = 1;
- rb_ary_concat(ary, lines);
- ARGF.lineno = lineno + RARRAY_LEN(ary);
- ARGF.last_lineno = ARGF.lineno;
+ while (!NIL_P(line = argf_getline(argc, argv, argf))) {
+ rb_ary_push(ary, line);
}
- ARGF.init_p = 0;
+
return ary;
}
@@ -8113,8 +7157,7 @@ rb_f_backquote(VALUE obj, VALUE str)
rb_io_t *fptr;
SafeStringValue(str);
- rb_last_status_clear();
- port = pipe_open_s(str, "r", FMODE_READABLE|DEFAULT_TEXTMODE, NULL);
+ port = pipe_open_s(str, "r", FMODE_READABLE, NULL);
if (NIL_P(port)) return rb_str_new(0,0);
GetOpenFile(port, fptr);
@@ -8136,6 +7179,7 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
rb_io_t *fptr;
long i;
int max = 0, n;
+ int interrupt_flag = 0;
int pending = 0;
struct timeval timerec;
@@ -8205,47 +7249,49 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
rb_ary_push(res, wp?rb_ary_new():rb_ary_new2(0));
rb_ary_push(res, ep?rb_ary_new():rb_ary_new2(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);
+ 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);
+ }
}
}
- }
- 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);
+ 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);
+ }
}
}
- }
- 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);
- }
- else if (io != write_io) {
- GetOpenFile(write_io, fptr);
+ 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);
}
+ else if (io != write_io) {
+ GetOpenFile(write_io, fptr);
+ if (rb_fd_isset(fptr->fd, &fds[2])) {
+ rb_ary_push(list, obj);
+ }
+ }
}
}
}
@@ -8259,6 +7305,7 @@ struct select_args {
rb_fdset_t fdsets[4];
};
+#ifdef HAVE_RB_FD_INIT
static VALUE
select_call(VALUE arg)
{
@@ -8277,226 +7324,16 @@ select_end(VALUE arg)
rb_fd_term(&p->fdsets[i]);
return Qnil;
}
-
-static VALUE sym_normal, sym_sequential, sym_random,
- sym_willneed, sym_dontneed, sym_noreuse;
-
-#ifdef HAVE_POSIX_FADVISE
-struct io_advise_struct {
- int fd;
- off_t offset;
- off_t len;
- int advice;
-};
-
-static VALUE
-io_advise_internal(void *arg)
-{
- struct io_advise_struct *ptr = arg;
- return posix_fadvise(ptr->fd, ptr->offset, ptr->len, ptr->advice);
-}
-
-static VALUE
-io_advise_sym_to_const(VALUE sym)
-{
-#ifdef POSIX_FADV_NORMAL
- if (sym == sym_normal)
- return INT2NUM(POSIX_FADV_NORMAL);
-#endif
-
-#ifdef POSIX_FADV_RANDOM
- if (sym == sym_random)
- return INT2NUM(POSIX_FADV_RANDOM);
-#endif
-
-#ifdef POSIX_FADV_SEQUENTIAL
- if (sym == sym_sequential)
- return INT2NUM(POSIX_FADV_SEQUENTIAL);
-#endif
-
-#ifdef POSIX_FADV_WILLNEED
- if (sym == sym_willneed)
- return INT2NUM(POSIX_FADV_WILLNEED);
-#endif
-
-#ifdef POSIX_FADV_DONTNEED
- if (sym == sym_dontneed)
- return INT2NUM(POSIX_FADV_DONTNEED);
-#endif
-
-#ifdef POSIX_FADV_NOREUSE
- if (sym == sym_noreuse)
- return INT2NUM(POSIX_FADV_NOREUSE);
-#endif
-
- return Qnil;
-}
-
-static VALUE
-do_io_advise(rb_io_t *fptr, VALUE advice, off_t offset, off_t len)
-{
- int rv;
- struct io_advise_struct ias;
- VALUE num_adv;
-
- num_adv = io_advise_sym_to_const(advice);
-
- /*
- * The platform doesn't support this hint. We don't raise exception, instead
- * silently ignore it. Because IO::advise is only hint.
- */
- if (NIL_P(num_adv))
- return Qnil;
-
- ias.fd = fptr->fd;
- ias.advice = NUM2INT(num_adv);
- ias.offset = offset;
- ias.len = len;
-
- rv = (int)rb_thread_io_blocking_region(io_advise_internal, &ias, fptr->fd);
- if (rv) {
- /* posix_fadvise(2) doesn't set errno. On success it returns 0; otherwise
- it returns the error code. */
- rb_syserr_fail_str(rv, fptr->pathv);
- }
-
- return Qnil;
-}
-
-#endif /* HAVE_POSIX_FADVISE */
-
-static void
-advice_arg_check(VALUE advice)
-{
- if (!SYMBOL_P(advice))
- rb_raise(rb_eTypeError, "advice must be a Symbol");
-
- if (advice != sym_normal &&
- advice != sym_sequential &&
- advice != sym_random &&
- advice != sym_willneed &&
- advice != sym_dontneed &&
- advice != sym_noreuse) {
- VALUE symname = rb_inspect(advice);
- rb_raise(rb_eNotImpError, "Unsupported advice: %s",
- StringValuePtr(symname));
- }
-}
-
-/*
- * call-seq:
- * ios.advise(advice, offset=0, len=0) -> nil
- *
- * Announce an intention to access data from the current file in a
- * specific pattern. On platforms that do not support the
- * <em>posix_fadvise(2)</em> system call, this method is a no-op.
- *
- * _advice_ is one of the following symbols:
- *
- * * :normal - No advice to give; the default assumption for an open file.
- * * :sequential - The data will be accessed sequentially:
- * with lower offsets read before higher ones.
- * * :random - The data will be accessed in random order.
- * * :willneed - The data will be accessed in the near future.
- * * :dontneed - The data will not be accessed in the near future.
- * * :noreuse - The data will only be accessed once.
- *
- * The semantics of a piece of advice are platform-dependent. See
- * <em>man 2 posix_fadvise</em> for details.
- *
- * "data" means the region of the current file that begins at
- * _offset_ and extends for _len_ bytes. If _len_ is 0, the region
- * ends at the last byte of the file. By default, both _offset_ and
- * _len_ are 0, meaning that the advice applies to the entire file.
- *
- * If an error occurs, one of the following exceptions will be raised:
- *
- * * <code>IOError</code> - The <code>IO</code> stream is closed.
- * * <code>Errno::EBADF</code> - The file descriptor of the current file is
- invalid.
- * * <code>Errno::EINVAL</code> - An invalid value for _advice_ was given.
- * * <code>Errno::ESPIPE</code> - The file descriptor of the current
- * * file refers to a FIFO or pipe. (Linux raises <code>Errno::EINVAL</code>
- * * in this case).
- * * <code>TypeError</code> - Either _advice_ was not a Symbol, or one of the
- other arguments was not an <code>Integer</code>.
- * * <code>RangeError</code> - One of the arguments given was too big/small.
- *
- * This list is not exhaustive; other Errno:: exceptions are also possible.
- */
-static VALUE
-rb_io_advise(int argc, VALUE *argv, VALUE io)
-{
- VALUE advice, offset, len;
- off_t off, l;
- rb_io_t *fptr;
-
- rb_scan_args(argc, argv, "12", &advice, &offset, &len);
- advice_arg_check(advice);
-
- io = GetWriteIO(io);
- GetOpenFile(io, fptr);
-
- off = NIL_P(offset) ? 0 : NUM2OFFT(offset);
- l = NIL_P(len) ? 0 : NUM2OFFT(len);
-
-#ifdef HAVE_POSIX_FADVISE
- return do_io_advise(fptr, advice, off, l);
-#else
- ((void)off, (void)l); /* Ignore all hint */
- return Qnil;
#endif
-}
/*
* call-seq:
* IO.select(read_array
* [, write_array
* [, error_array
- * [, timeout]]]) -> array or nil
- *
- * Calls select(2) system call.
- * It monitors given arrays of <code>IO</code> objects, waits one or more
- * of <code>IO</code> objects ready for reading, are ready for writing,
- * and have pending exceptions respectably, and returns an array that
- * contains arrays of those IO objects. It will return <code>nil</code>
- * if optional <i>timeout</i> value is given and no <code>IO</code> object
- * is ready in <i>timeout</i> seconds.
- *
- * === Parameters
- * read_array:: an array of <code>IO</code> objects that wait until ready for read
- * write_array:: an array of <code>IO</code> objects that wait until ready for write
- * error_array:: an array of <code>IO</code> objects that wait for exceptions
- * timeout:: a numeric value in second
- *
- * === Example
- *
- * rp, wp = IO.pipe
- * mesg = "ping "
- * 100.times {
- * rs, ws, = IO.select([rp], [wp])
- * if r = rs[0]
- * ret = r.read(5)
- * print ret
- * case ret
- * when /ping/
- * mesg = "pong\n"
- * when /pong/
- * mesg = "ping "
- * end
- * end
- * if w = ws[0]
- * w.write(mesg)
- * end
- * }
- *
- * <em>produces:</em>
+ * [, timeout]]] )-> array or nil
*
- * ping pong
- * ping pong
- * ping pong
- * (snipped)
- * ping
+ * See <code>Kernel#select</code>.
*/
static VALUE
@@ -8519,231 +7356,50 @@ rb_f_select(int argc, VALUE *argv, VALUE obj)
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);
-}
-
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
- typedef unsigned long ioctl_req_t;
-# define NUM2IOCTLREQ(num) NUM2ULONG(num)
#else
- typedef int ioctl_req_t;
-# define NUM2IOCTLREQ(num) NUM2INT(num)
+ return select_internal(args.read, args.write, args.except,
+ args.timeout, args.fdsets);
#endif
-struct ioctl_arg {
- int fd;
- ioctl_req_t cmd;
- long narg;
-};
-
-static VALUE
-nogvl_ioctl(void *ptr)
-{
- struct ioctl_arg *arg = ptr;
-
- return (VALUE)ioctl(arg->fd, arg->cmd, arg->narg);
}
static int
-do_ioctl(int fd, ioctl_req_t cmd, long narg)
+io_cntl(int fd, unsigned long cmd, long narg, int io_p)
{
int retval;
- struct ioctl_arg arg;
-
- arg.fd = fd;
- arg.cmd = cmd;
- arg.narg = narg;
-
- retval = (int)rb_thread_io_blocking_region(nogvl_ioctl, &arg, fd);
-
- return retval;
-}
-
-#define DEFULT_IOCTL_NARG_LEN (256)
-
-#ifdef __linux__
-static long
-linux_iocparm_len(ioctl_req_t cmd)
-{
- long len;
-
- if ((cmd & 0xFFFF0000) == 0) {
- /* legacy and unstructured ioctl number. */
- return DEFULT_IOCTL_NARG_LEN;
- }
-
- len = _IOC_SIZE(cmd);
-
- /* paranoia check for silly drivers which don't keep ioctl convention */
- if (len < DEFULT_IOCTL_NARG_LEN)
- len = DEFULT_IOCTL_NARG_LEN;
-
- return len;
-}
-#endif
-
-static long
-ioctl_narg_len(ioctl_req_t cmd)
-{
- long len;
-
-#ifdef IOCPARM_MASK
-#ifndef IOCPARM_LEN
-#define IOCPARM_LEN(x) (((x) >> 16) & IOCPARM_MASK)
-#endif
-#endif
-#ifdef IOCPARM_LEN
- len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */
-#elif defined(__linux__)
- len = linux_iocparm_len(cmd);
-#else
- /* otherwise guess at what's safe */
- len = DEFULT_IOCTL_NARG_LEN;
-#endif
-
- return len;
-}
#ifdef HAVE_FCNTL
-#ifdef __linux__
-typedef long fcntl_arg_t;
+# 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);
+# endif
+# if defined(F_DUPFD)
+ if (!io_p && retval != -1 && cmd == F_DUPFD) {
+ UPDATE_MAXFD(retval);
+ }
+# endif
#else
-/* posix */
-typedef int fcntl_arg_t;
-#endif
-
-static long
-fcntl_narg_len(int cmd)
-{
- long len;
-
- switch (cmd) {
-#ifdef F_DUPFD
- case F_DUPFD:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_DUP2FD /* bsd specific */
- case F_DUP2FD:
- len = sizeof(int);
- break;
-#endif
-#ifdef F_DUPFD_CLOEXEC /* linux specific */
- case F_DUPFD_CLOEXEC:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_GETFD
- case F_GETFD:
- len = 1;
- break;
-#endif
-#ifdef F_SETFD
- case F_SETFD:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_GETFL
- case F_GETFL:
- len = 1;
- break;
-#endif
-#ifdef F_SETFL
- case F_SETFL:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_GETOWN
- case F_GETOWN:
- len = 1;
- break;
-#endif
-#ifdef F_SETOWN
- case F_SETOWN:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_GETOWN_EX /* linux specific */
- case F_GETOWN_EX:
- len = sizeof(struct f_owner_ex);
- break;
-#endif
-#ifdef F_SETOWN_EX /* linux specific */
- case F_SETOWN_EX:
- len = sizeof(struct f_owner_ex);
- break;
-#endif
-#ifdef F_GETLK
- case F_GETLK:
- len = sizeof(struct flock);
- break;
-#endif
-#ifdef F_SETLK
- case F_SETLK:
- len = sizeof(struct flock);
- break;
-#endif
-#ifdef F_SETLKW
- case F_SETLKW:
- len = sizeof(struct flock);
- break;
-#endif
-#ifdef F_READAHEAD /* bsd specific */
- case F_READAHEAD:
- len = sizeof(int);
- break;
-#endif
-#ifdef F_RDAHEAD /* Darwin specific */
- case F_RDAHEAD:
- len = sizeof(int);
- break;
-#endif
-#ifdef F_GETSIG /* linux specific */
- case F_GETSIG:
- len = 1;
- break;
-#endif
-#ifdef F_SETSIG /* linux specific */
- case F_SETSIG:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_GETLEASE /* linux specific */
- case F_GETLEASE:
- len = 1;
- break;
-#endif
-#ifdef F_SETLEASE /* linux specific */
- case F_SETLEASE:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-#ifdef F_NOTIFY /* linux specific */
- case F_NOTIFY:
- len = sizeof(fcntl_arg_t);
- break;
-#endif
-
- default:
- len = 256;
- break;
+ if (!io_p) {
+ rb_notimplement();
}
-
- return len;
-}
-#else /* HAVE_FCNTL */
-static long
-fcntl_narg_len(int cmd)
-{
- return 0;
+ retval = ioctl(fd, cmd, narg);
+#endif
+ return retval;
}
-#endif /* HAVE_FCNTL */
-static long
-setup_narg(ioctl_req_t cmd, VALUE *argp, int io_p)
+static VALUE
+rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
{
+ unsigned long cmd = NUM2ULONG(req);
+ rb_io_t *fptr;
+ long len = 0;
long narg = 0;
- VALUE arg = *argp;
+ int retval;
+
+ rb_secure(2);
if (NIL_P(arg) || arg == Qfalse) {
narg = 0;
@@ -8761,51 +7417,50 @@ setup_narg(ioctl_req_t cmd, VALUE *argp, int io_p)
narg = NUM2LONG(arg);
}
else {
- long len;
-
- *argp = arg = tmp;
- if (io_p)
- len = ioctl_narg_len(cmd);
- else
- len = fcntl_narg_len((int)cmd);
+ arg = tmp;
+#ifdef IOCPARM_MASK
+#ifndef IOCPARM_LEN
+#define IOCPARM_LEN(x) (((x) >> 16) & IOCPARM_MASK)
+#endif
+#endif
+#ifdef IOCPARM_LEN
+ len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */
+#else
+ len = 256; /* otherwise guess at what's safe */
+#endif
rb_str_modify(arg);
- /* expand for data + sentinel. */
- if (RSTRING_LEN(arg) < len+1) {
+ if (len <= RSTRING_LEN(arg)) {
+ len = RSTRING_LEN(arg);
+ }
+ if (RSTRING_LEN(arg) < len) {
rb_str_resize(arg, len+1);
}
- /* a little sanity check here */
- RSTRING_PTR(arg)[RSTRING_LEN(arg) - 1] = 17;
- narg = (long)(SIGNED_VALUE)RSTRING_PTR(arg);
+ RSTRING_PTR(arg)[len] = 17; /* a little sanity check here */
+ narg = (long)RSTRING_PTR(arg);
}
}
-
- return narg;
-}
-
-static VALUE
-rb_ioctl(VALUE io, VALUE req, VALUE arg)
-{
- ioctl_req_t cmd = NUM2IOCTLREQ(req);
- rb_io_t *fptr;
- long narg;
- int retval;
-
- rb_secure(2);
-
- narg = setup_narg(cmd, &arg, 1);
GetOpenFile(io, fptr);
- retval = do_ioctl(fptr->fd, cmd, narg);
+ retval = io_cntl(fptr->fd, cmd, narg, io_p);
if (retval < 0) rb_sys_fail_path(fptr->pathv);
- if (RB_TYPE_P(arg, T_STRING)) {
- if (RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] != 17)
- rb_raise(rb_eArgError, "return value overflowed string");
- RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] = '\0';
+ if (TYPE(arg) == T_STRING && RSTRING_PTR(arg)[len] != 17) {
+ rb_raise(rb_eArgError, "return value overflowed string");
+ }
+
+ 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);
+ }
}
return INT2NUM(retval);
}
+
/*
* call-seq:
* ios.ioctl(integer_cmd, arg) -> integer
@@ -8824,81 +7479,10 @@ rb_io_ioctl(int argc, VALUE *argv, VALUE io)
VALUE req, arg;
rb_scan_args(argc, argv, "11", &req, &arg);
- return rb_ioctl(io, req, arg);
+ return rb_io_ctl(io, req, arg, 1);
}
#ifdef HAVE_FCNTL
-struct fcntl_arg {
- int fd;
- int cmd;
- long narg;
-};
-
-static VALUE
-nogvl_fcntl(void *ptr)
-{
- struct fcntl_arg *arg = ptr;
-
-#if defined(F_DUPFD)
- if (arg->cmd == F_DUPFD)
- return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, (int)arg->narg);
-#endif
- return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg);
-}
-
-static int
-do_fcntl(int fd, int cmd, long narg)
-{
- int retval;
- struct fcntl_arg arg;
-
- arg.fd = fd;
- arg.cmd = cmd;
- arg.narg = narg;
-
- retval = (int)rb_thread_io_blocking_region(nogvl_fcntl, &arg, fd);
-#if defined(F_DUPFD)
- if (retval != -1 && cmd == F_DUPFD) {
- rb_update_max_fd(retval);
- }
-#endif
-
- return retval;
-}
-
-static VALUE
-rb_fcntl(VALUE io, VALUE req, VALUE arg)
-{
- int cmd = NUM2INT(req);
- rb_io_t *fptr;
- long narg;
- int retval;
-
- rb_secure(2);
-
- narg = setup_narg(cmd, &arg, 0);
- GetOpenFile(io, fptr);
- retval = do_fcntl(fptr->fd, cmd, narg);
- if (retval < 0) rb_sys_fail_path(fptr->pathv);
- if (RB_TYPE_P(arg, T_STRING)) {
- if (RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] != 17)
- rb_raise(rb_eArgError, "return value overflowed string");
- RSTRING_PTR(arg)[RSTRING_LEN(arg)-1] = '\0';
- }
-
- if (cmd == F_SETFL) {
- if (narg & O_NONBLOCK) {
- fptr->mode |= FMODE_WSPLIT_INITIALIZED;
- fptr->mode &= ~FMODE_WSPLIT;
- }
- else {
- fptr->mode &= ~(FMODE_WSPLIT_INITIALIZED|FMODE_WSPLIT);
- }
- }
-
- return INT2NUM(retval);
-}
-
/*
* call-seq:
* ios.fcntl(integer_cmd, arg) -> integer
@@ -8918,7 +7502,7 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
VALUE req, arg;
rb_scan_args(argc, argv, "11", &req, &arg);
- return rb_fcntl(io, req, arg);
+ return rb_io_ctl(io, req, arg, 0);
}
#else
#define rb_io_fcntl rb_f_notimplement
@@ -8937,7 +7521,7 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
* +String+ objects or +Integer+ objects. A +String+ object is passed
* as a pointer to the byte sequence. An +Integer+ object is passed
* as an integer whose bit size is same as a pointer.
- * Up to nine parameters may be passed (14 on the Atari-ST).
+ * Up to nine parameters may be passed (14 on the Atari-ST).
*
* The function identified by _num_ is system
* dependent. On some Unix systems, the numbers may be obtained from a
@@ -8977,7 +7561,7 @@ rb_f_syscall(int argc, VALUE *argv)
# else
# error ---->> it is asserted that __syscall takes the first argument and returns retval in 64bit signed integer. <<----
# endif
-#elif defined(__linux__)
+#elif defined linux
# define SYSCALL syscall
# define NUM2SYSCALLID(x) NUM2LONG(x)
# define RETVAL2NUM(x) LONG2NUM(x)
@@ -8996,7 +7580,7 @@ rb_f_syscall(int argc, VALUE *argv)
int num, retval = -1;
#endif
int i;
-
+
if (RTEST(ruby_verbose)) {
rb_warning("We plan to remove a syscall function at future release. DL(Fiddle) provides safer alternative.");
}
@@ -9011,7 +7595,7 @@ rb_f_syscall(int argc, VALUE *argv)
VALUE v = rb_check_string_type(argv[i]);
if (!NIL_P(v)) {
- SafeStringValue(v);
+ StringValue(v);
rb_str_modify(v);
arg[i] = (VALUE)StringValueCStr(v);
}
@@ -9090,23 +7674,15 @@ io_new_instance(VALUE args)
return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
}
-static rb_encoding *
-find_encoding(VALUE v)
-{
- rb_encoding *enc = rb_find_encoding(v);
- if (!enc) unsupported_encoding(StringValueCStr(v));
- return enc;
-}
-
static void
io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt)
{
rb_encoding *enc, *enc2;
- int ecflags = fptr->encs.ecflags;
+ int ecflags;
VALUE ecopts, tmp;
if (!NIL_P(v2)) {
- enc2 = find_encoding(v1);
+ enc2 = rb_to_encoding(v1);
tmp = rb_check_string_type(v2);
if (!NIL_P(tmp)) {
if (RSTRING_LEN(tmp) == 1 && RSTRING_PTR(tmp)[0] == '-') {
@@ -9115,44 +7691,37 @@ io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt)
enc2 = NULL;
}
else
- enc = find_encoding(v2);
+ enc = rb_to_encoding(v2);
if (enc == enc2) {
/* Special case - "-" => no transcoding */
enc2 = NULL;
}
}
- else {
- enc = find_encoding(v2);
- if (enc == enc2) {
- /* Special case - "-" => no transcoding */
- enc2 = NULL;
- }
- }
- SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
- ecflags = rb_econv_prepare_options(opt, &ecopts, ecflags);
+ 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, 0);
- SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
+ 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) && rb_enc_asciicompat(rb_enc_get(tmp))) {
parse_mode_enc(RSTRING_PTR(tmp), &enc, &enc2, NULL);
- SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
- ecflags = rb_econv_prepare_options(opt, &ecopts, ecflags);
+ ecflags = rb_econv_prepare_opts(opt, &ecopts);
}
else {
- rb_io_ext_int_to_encs(find_encoding(v1), NULL, &enc, &enc2, 0);
- SET_UNIVERSAL_NEWLINE_DECORATOR_IF_ENC2(enc2, ecflags);
+ rb_io_ext_int_to_encs(rb_to_encoding(v1), NULL, &enc, &enc2);
+ ecflags = 0;
ecopts = Qnil;
}
}
}
- validate_enc_binmode(&fptr->mode, ecflags, enc, enc2);
+ validate_enc_binmode(fptr->mode, enc, enc2);
fptr->encs.enc = enc;
fptr->encs.enc2 = enc2;
fptr->encs.ecflags = ecflags;
@@ -9238,7 +7807,8 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
int fmode = 0;
VALUE ret;
- argc = rb_scan_args(argc, argv, "02:", &v1, &v2, &opt);
+ opt = pop_last_hash(&argc, argv);
+ rb_scan_args(argc, argv, "02", &v1, &v2);
if (rb_pipe(pipes) == -1)
rb_sys_fail(0);
@@ -9265,24 +7835,7 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
rb_io_synchronized(fptr2);
extract_binmode(opt, &fmode);
-#if DEFAULT_TEXTMODE
- if ((fptr->mode & FMODE_TEXTMODE) && (fmode & FMODE_BINMODE)) {
- fptr->mode &= ~FMODE_TEXTMODE;
- setmode(fptr->fd, O_BINARY);
- }
-#if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
- if (fptr->encs.ecflags & ECONV_DEFAULT_NEWLINE_DECORATOR) {
- fptr->encs.ecflags |= ECONV_UNIVERSAL_NEWLINE_DECORATOR;
- }
-#endif
-#endif
fptr->mode |= fmode;
-#if DEFAULT_TEXTMODE
- if ((fptr2->mode & FMODE_TEXTMODE) && (fmode & FMODE_BINMODE)) {
- fptr2->mode &= ~FMODE_TEXTMODE;
- setmode(fptr2->fd, O_BINARY);
- }
-#endif
fptr2->mode |= fmode;
ret = rb_assoc_new(r, w);
@@ -9302,20 +7855,22 @@ struct foreach_arg {
};
static void
-open_key_args(int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
+open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
{
- VALUE path, v;
+ VALUE opt, v;
- path = *argv++;
- argc--;
- FilePathValue(path);
+ FilePathValue(argv[0]);
arg->io = 0;
- arg->argc = argc;
- arg->argv = argv;
- if (NIL_P(opt)) {
- arg->io = rb_io_open(path, INT2NUM(O_RDONLY), INT2FIX(0666), Qnil);
+ 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;
@@ -9329,13 +7884,13 @@ open_key_args(int argc, VALUE *argv, VALUE opt, struct foreach_arg *arg)
}
#endif
args = rb_ary_tmp_new(n);
- rb_ary_push(args, path);
+ 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(path, Qnil, Qnil, opt);
+ arg->io = rb_io_open(argv[0], Qnil, Qnil, opt);
}
static VALUE
@@ -9378,13 +7933,11 @@ io_s_foreach(struct foreach_arg *arg)
static VALUE
rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
{
- VALUE opt;
- int orig_argc = argc;
struct foreach_arg arg;
- argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
- RETURN_ENUMERATOR(self, orig_argc, argv);
- open_key_args(argc, argv, opt, &arg);
+ rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
+ RETURN_ENUMERATOR(self, argc, argv);
+ open_key_args(argc, argv, &arg);
if (NIL_P(arg.io)) return Qnil;
return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
}
@@ -9416,11 +7969,10 @@ io_s_readlines(struct foreach_arg *arg)
static VALUE
rb_io_s_readlines(int argc, VALUE *argv, VALUE io)
{
- VALUE opt;
struct foreach_arg arg;
- argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
- open_key_args(argc, argv, opt, &arg);
+ rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
+ open_key_args(argc, argv, &arg);
if (NIL_P(arg.io)) return Qnil;
return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
}
@@ -9450,45 +8002,41 @@ seek_before_access(VALUE argp)
* 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
- * +length+ bytes (defaulting to the rest of the file). <code>read</code>
- * ensures the file is closed before returning.
+ * Opens the file, optionally seeks to the given <i>offset</i>, 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
+ * encoding: string or encoding
*
- * specifies encoding of the read string. +encoding+ will be ignored
+ * specifies encoding of the read string. encoding will be ignored
* if length is specified.
*
- * mode::
- * string
+ * mode: string
*
- * specifies mode argument for open(). It should start with "r"
- * otherwise it will cause an error.
+ * specifies mode argument for open(). it should start with "r"
+ * otherwise it would cause error.
*
- * open_args:: array of strings
+ * open_args: array of strings
*
* specifies arguments for open() as an array.
*
- * Examples:
- *
- * 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 "
+ * 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)
{
- VALUE opt, offset;
+ VALUE offset;
struct foreach_arg arg;
- argc = rb_scan_args(argc, argv, "13:", NULL, NULL, &offset, NULL, &opt);
- open_key_args(argc, argv, opt, &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)) {
struct seek_arg sarg;
@@ -9538,121 +8086,6 @@ rb_io_s_binread(int argc, VALUE *argv, VALUE io)
return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
}
-static VALUE
-io_s_write0(struct write_arg *arg)
-{
- return io_write(arg->io,arg->str,arg->nosync);
-}
-
-static VALUE
-io_s_write(int argc, VALUE *argv, int binary)
-{
- VALUE string, offset, opt;
- struct foreach_arg arg;
- struct write_arg warg;
-
- rb_scan_args(argc, argv, "21:", NULL, &string, &offset, &opt);
-
- if (NIL_P(opt)) opt = rb_hash_new();
- else opt = rb_hash_dup(opt);
-
-
- if (NIL_P(rb_hash_aref(opt,sym_mode))) {
- int mode = O_WRONLY|O_CREAT;
-#ifdef O_BINARY
- if (binary) mode |= O_BINARY;
-#endif
- if (NIL_P(offset)) mode |= O_TRUNC;
- rb_hash_aset(opt,sym_mode,INT2NUM(mode));
- }
- open_key_args(argc,argv,opt,&arg);
-
-#ifndef O_BINARY
- if (binary) rb_io_binmode_m(arg.io);
-#endif
-
- if (NIL_P(arg.io)) return Qnil;
- if (!NIL_P(offset)) {
- struct seek_arg sarg;
- int state = 0;
- sarg.io = arg.io;
- sarg.offset = offset;
- sarg.mode = SEEK_SET;
- rb_protect(seek_before_access, (VALUE)&sarg, &state);
- if (state) {
- rb_io_close(arg.io);
- rb_jump_tag(state);
- }
- }
-
- warg.io = arg.io;
- warg.str = string;
- warg.nosync = 0;
-
- return rb_ensure(io_s_write0, (VALUE)&warg, rb_io_close, arg.io);
-}
-
-/*
- * call-seq:
- * IO.write(name, string, [offset] ) => fixnum
- * IO.write(name, string, [offset], open_args ) => fixnum
- *
- * Opens the file, optionally seeks to the given <i>offset</i>, writes
- * <i>string</i>, then returns the length written.
- * <code>write</code> ensures the file is closed before returning.
- * If <i>offset</i> is not given, the file is truncated. Otherwise,
- * it is not truncated.
- *
- * 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 "w" or "a" or "r+"
- * otherwise it would cause error.
- *
- * perm: fixnum
- *
- * specifies perm argument for open().
- *
- * open_args: array
- *
- * specifies arguments for open() as an array.
- *
- * IO.write("testfile", "0123456789", 20) # => 10
- * # File could contain: "This is line one\nThi0123456789two\nThis is line three\nAnd so on...\n"
- * IO.write("testfile", "0123456789") #=> 10
- * # File would now read: "0123456789"
- */
-
-static VALUE
-rb_io_s_write(int argc, VALUE *argv, VALUE io)
-{
- return io_s_write(argc, argv, 0);
-}
-
-/*
- * call-seq:
- * IO.binwrite(name, string, [offset] ) => fixnum
- * IO.binwrite(name, string, [offset], open_args ) => fixnum
- *
- * Same as <code>IO.write</code> except opening the file in binary mode
- * and ASCII-8BIT encoding ("wb:ASCII-8BIT").
- *
- */
-
-static VALUE
-rb_io_s_binwrite(int argc, VALUE *argv, VALUE io)
-{
- return io_s_write(argc, argv, 1);
-}
-
struct copy_stream_struct {
VALUE src;
VALUE dst;
@@ -9671,58 +8104,13 @@ struct copy_stream_struct {
VALUE th;
};
-static void *
-exec_interrupts(void *arg)
-{
- VALUE th = (VALUE)arg;
- rb_thread_execute_interrupts(th);
- return NULL;
-}
-
-/*
- * returns TRUE if the preceding system call was interrupted
- * so we can continue. If the thread was interrupted, we
- * reacquire the GVL to execute interrupts before continuing.
- */
-static int
-maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
-{
- switch (errno) {
- case EINTR:
-#if defined(ERESTART)
- case ERESTART:
-#endif
- if (rb_thread_interrupted(stp->th)) {
- if (has_gvl)
- rb_thread_execute_interrupts(stp->th);
- else
- rb_thread_call_with_gvl(exec_interrupts, (void *)stp->th);
- }
- return TRUE;
- }
- return FALSE;
-}
-
static int
-maygvl_select(int has_gvl, int n, rb_fdset_t *rfds, rb_fdset_t *wfds, rb_fdset_t *efds, struct timeval *timeout)
-{
- if (has_gvl)
- return rb_thread_fd_select(n, rfds, wfds, efds, timeout);
- else
- return rb_fd_select(n, rfds, wfds, efds, timeout);
-}
-
-static int
-maygvl_copy_stream_wait_read(int has_gvl, struct copy_stream_struct *stp)
+maygvl_copy_stream_wait_read(struct copy_stream_struct *stp)
{
int ret;
-
- do {
- rb_fd_zero(&stp->fds);
- rb_fd_set(stp->src_fd, &stp->fds);
- ret = maygvl_select(has_gvl, rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
- } while (ret == -1 && maygvl_copy_stream_continue_p(has_gvl, stp));
-
+ 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;
@@ -9735,13 +8123,9 @@ static int
nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
{
int ret;
-
- do {
- 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);
- } while (ret == -1 && maygvl_copy_stream_continue_p(0, stp));
-
+ 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;
@@ -9752,52 +8136,25 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
#ifdef HAVE_SENDFILE
-# ifdef __linux__
-# define USE_SENDFILE
+#ifdef __linux__
+#define USE_SENDFILE
-# ifdef HAVE_SYS_SENDFILE_H
-# include <sys/sendfile.h>
-# endif
+#ifdef HAVE_SYS_SENDFILE_H
+#include <sys/sendfile.h>
+#endif
static ssize_t
simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
{
+#if SIZEOF_OFF_T > SIZEOF_SIZE_T
+ /* we are limited by the 32-bit ssize_t return value on 32-bit */
+ if (count > (off_t)SSIZE_MAX)
+ count = SSIZE_MAX;
+#endif
return sendfile(out_fd, in_fd, offset, (size_t)count);
}
-# elif 0 /* defined(__FreeBSD__) || defined(__DragonFly__) */ || defined(__APPLE__)
-/* This runs on FreeBSD8.1 r30210, but sendfiles blocks its execution
- * without cpuset -l 0.
- */
-# define USE_SENDFILE
-
-# ifdef HAVE_SYS_UIO_H
-# include <sys/uio.h>
-# endif
-
-static ssize_t
-simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
-{
- int r;
- off_t pos = offset ? *offset : lseek(in_fd, 0, SEEK_CUR);
- off_t sbytes;
-# ifdef __APPLE__
- r = sendfile(in_fd, out_fd, pos, &count, NULL, 0);
- sbytes = count;
-# else
- r = sendfile(in_fd, out_fd, pos, (size_t)count, NULL, &sbytes, 0);
-# endif
- if (r != 0 && sbytes == 0) return -1;
- if (offset) {
- *offset += sbytes;
- }
- else {
- lseek(in_fd, sbytes, SEEK_CUR);
- }
- return (ssize_t)sbytes;
-}
-
-# endif
+#endif
#endif
@@ -9839,8 +8196,8 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
if (use_pread)
copy_length = src_stat.st_size - src_offset;
else {
- off_t cur;
- errno = 0;
+ off_t cur;
+ errno = 0;
cur = lseek(stp->src_fd, 0, SEEK_CUR);
if (cur == (off_t)-1 && errno) {
stp->syserr = "lseek";
@@ -9852,17 +8209,11 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
}
retry_sendfile:
-# if SIZEOF_OFF_T > SIZEOF_SIZE_T
- /* we are limited by the 32-bit ssize_t return value on 32-bit */
- ss = (copy_length > (off_t)SSIZE_MAX) ? SSIZE_MAX : (ssize_t)copy_length;
-# else
- ss = (ssize_t)copy_length;
-# endif
if (use_pread) {
- ss = simple_sendfile(stp->dst_fd, stp->src_fd, &src_offset, ss);
+ ss = simple_sendfile(stp->dst_fd, stp->src_fd, &src_offset, copy_length);
}
else {
- ss = simple_sendfile(stp->dst_fd, stp->src_fd, NULL, ss);
+ ss = simple_sendfile(stp->dst_fd, stp->src_fd, NULL, copy_length);
}
if (0 < ss) {
stp->total += ss;
@@ -9872,8 +8223,6 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
}
}
if (ss == -1) {
- if (maygvl_copy_stream_continue_p(0, stp))
- goto retry_sendfile;
switch (errno) {
case EINVAL:
#ifdef ENOSYS
@@ -9884,19 +8233,10 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
-#ifndef __linux__
- /*
- * Linux requires stp->src_fd to be a mmap-able (regular) file,
- * select() reports regular files to always be "ready", so
- * there is no need to select() on it.
- * Other OSes may have the same limitation for sendfile() which
- * allow us to bypass maygvl_copy_stream_wait_read()...
- */
- if (maygvl_copy_stream_wait_read(0, stp) == -1)
- return -1;
-#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";
@@ -9908,22 +8248,12 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
#endif
static ssize_t
-maygvl_read(int has_gvl, int fd, void *buf, size_t count)
-{
- if (has_gvl)
- return rb_read_internal(fd, buf, count);
- else
- return read(fd, buf, count);
-}
-
-static ssize_t
-maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf, size_t len, off_t offset)
+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 = maygvl_read(has_gvl, stp->src_fd, buf, len);
- }
+ if (offset == (off_t)-1)
+ ss = read(stp->src_fd, buf, len);
else {
#ifdef HAVE_PREAD
ss = pread(stp->src_fd, buf, len, offset);
@@ -9936,14 +8266,12 @@ maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf,
return 0;
}
if (ss == -1) {
- if (maygvl_copy_stream_continue_p(has_gvl, stp))
- goto retry_read;
switch (errno) {
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- if (maygvl_copy_stream_wait_read(has_gvl, stp) == -1)
+ if (maygvl_copy_stream_wait_read(stp) == -1)
return -1;
goto retry_read;
#ifdef ENOSYS
@@ -9967,8 +8295,6 @@ nogvl_copy_stream_write(struct copy_stream_struct *stp, char *buf, size_t len)
while (len) {
ss = write(stp->dst_fd, buf+off, len);
if (ss == -1) {
- if (maygvl_copy_stream_continue_p(0, stp))
- continue;
if (errno == EAGAIN || errno == EWOULDBLOCK) {
if (nogvl_copy_stream_wait_write(stp) == -1)
return -1;
@@ -10023,12 +8349,12 @@ nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
len = sizeof(buf);
}
if (use_pread) {
- ss = maygvl_copy_stream_read(0, stp, buf, len, src_offset);
+ ss = maygvl_copy_stream_read(stp, buf, len, src_offset);
if (0 < ss)
src_offset += ss;
}
else {
- ss = maygvl_copy_stream_read(0, stp, buf, len, (off_t)-1);
+ ss = maygvl_copy_stream_read(stp, buf, len, (off_t)-1);
}
if (ss <= 0) /* EOF or error */
return;
@@ -10039,10 +8365,13 @@ nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
if (!use_eof)
copy_length -= ss;
+
+ if (rb_thread_interrupted(stp->th))
+ return;
}
}
-static void *
+static VALUE
nogvl_copy_stream_func(void *arg)
{
struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
@@ -10061,7 +8390,7 @@ nogvl_copy_stream_func(void *arg)
#ifdef USE_SENDFILE
finish:
#endif
- return 0;
+ return Qnil;
}
static VALUE
@@ -10093,15 +8422,13 @@ copy_stream_fallback_body(VALUE arg)
l = buflen < rest ? buflen : (long)rest;
}
if (stp->src_fd == -1) {
- VALUE rc = rb_funcall(stp->src, read_method, 2, INT2FIX(l), buf);
-
- if (read_method == id_read && NIL_P(rc))
- break;
+ 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(1, stp, RSTRING_PTR(buf), l, off);
+ ss = maygvl_copy_stream_read(stp, RSTRING_PTR(buf), l, off);
if (ss == -1)
return Qnil;
if (ss == 0)
@@ -10147,13 +8474,13 @@ copy_stream_body(VALUE arg)
stp->total = 0;
if (stp->src == argf ||
- !(RB_TYPE_P(stp->src, T_FILE) ||
- RB_TYPE_P(stp->src, T_STRING) ||
+ !(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 = RB_TYPE_P(stp->src, T_FILE) ? stp->src : Qnil;
+ src_io = TYPE(stp->src) == T_FILE ? stp->src : Qnil;
if (NIL_P(src_io)) {
VALUE args[2];
int oflags = O_RDONLY;
@@ -10174,13 +8501,13 @@ copy_stream_body(VALUE arg)
stp->src_fd = src_fd;
if (stp->dst == argf ||
- !(RB_TYPE_P(stp->dst, T_FILE) ||
- RB_TYPE_P(stp->dst, T_STRING) ||
+ !(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 = RB_TYPE_P(stp->dst, T_FILE) ? stp->dst : Qnil;
+ 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;
@@ -10190,7 +8517,7 @@ copy_stream_body(VALUE arg)
FilePathValue(stp->dst);
args[0] = stp->dst;
args[1] = INT2NUM(oflags);
- args[2] = INT2FIX(0666);
+ args[2] = INT2FIX(0600);
dst_io = rb_class_new_instance(3, args, rb_cFile);
stp->dst = dst_io;
stp->close_dst = 1;
@@ -10205,15 +8532,8 @@ copy_stream_body(VALUE arg)
}
stp->dst_fd = dst_fd;
-#ifdef O_BINARY
- if (src_fptr)
- SET_BINARY_MODE_WITH_SEEK_CUR(src_fptr);
-#endif
- if (dst_fptr)
- rb_io_ascii8bit_binmode(dst_io);
-
- if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf.len) {
- size_t len = src_fptr->rbuf.len;
+ 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;
@@ -10222,7 +8542,7 @@ copy_stream_body(VALUE arg)
rb_str_resize(str,len);
read_buffered_data(RSTRING_PTR(str), len, src_fptr);
if (dst_fptr) { /* IO or filename */
- if (io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str), dst_fptr, 0) < 0)
+ if (io_binwrite(str, dst_fptr, 0) < 0)
rb_sys_fail(0);
}
else /* others such as StringIO */
@@ -10243,11 +8563,11 @@ copy_stream_body(VALUE arg)
return copy_stream_fallback(stp);
}
+ rb_fd_init(&stp->fds);
rb_fd_set(src_fd, &stp->fds);
rb_fd_set(dst_fd, &stp->fds);
- rb_thread_call_without_gvl(nogvl_copy_stream_func, (void*)stp, RUBY_UBF_IO, 0);
- return Qnil;
+ return rb_thread_blocking_region(nogvl_copy_stream_func, (void*)stp, RUBY_UBF_IO, 0);
}
static VALUE
@@ -10322,7 +8642,6 @@ rb_io_s_copy_stream(int argc, VALUE *argv, VALUE io)
else
st.src_offset = NUM2OFFT(src_offset);
- rb_fd_init(&st.fds);
rb_ensure(copy_stream_body, (VALUE)&st, copy_stream_finalize, (VALUE)&st);
return OFFT2NUM(st.total);
@@ -10396,11 +8715,12 @@ rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
rb_io_t *fptr;
VALUE v1, v2, opt;
- if (!RB_TYPE_P(io, T_FILE)) {
+ if (TYPE(io) != T_FILE) {
return rb_funcall2(io, id_set_encoding, argc, argv);
}
- argc = rb_scan_args(argc, argv, "11:", &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;
@@ -10666,7 +8986,7 @@ argf_eof(VALUE argf)
/*
* call-seq:
- * ARGF.read([length [, outbuf]]) -> string, outbuf, or nil
+ * 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
@@ -10683,10 +9003,8 @@ argf_eof(VALUE argf)
*
* If _length_ is zero, it returns _""_.
*
- * If the optional _outbuf_ argument is present, it must reference a String,
+ * If the optional _buffer_ argument is present, it must reference a String,
* which will receive the data.
- * The <i>outbuf</i> will contain only the received data after the method call
- * even if it is not empty at the beginning.
*
* For example:
*
@@ -10762,8 +9080,6 @@ argf_forward_call(VALUE arg)
return Qnil;
}
-static VALUE argf_getpartial(int argc, VALUE *argv, VALUE argf, int nonblock);
-
/*
* call-seq:
* ARGF.readpartial(maxlen) -> string
@@ -10772,10 +9088,7 @@ static VALUE argf_getpartial(int argc, VALUE *argv, VALUE argf, int nonblock);
* 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.
- * The <i>outbuf</i> will contain only the received data after the method call
- * even if it is not empty at the beginning.
- * It raises <code>EOFError</code> on end of file.
+ * 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
@@ -10798,26 +9111,6 @@ static VALUE argf_getpartial(int argc, VALUE *argv, VALUE argf, int nonblock);
static VALUE
argf_readpartial(int argc, VALUE *argv, VALUE argf)
{
- return argf_getpartial(argc, argv, argf, 0);
-}
-
-/*
- * call-seq:
- * ARGF.read_nonblock(maxlen) -> string
- * ARGF.read_nonblock(maxlen, outbuf) -> outbuf
- *
- * Reads at most _maxlen_ bytes from the ARGF stream in non-blocking mode.
- */
-
-static VALUE
-argf_read_nonblock(int argc, VALUE *argv, VALUE argf)
-{
- return argf_getpartial(argc, argv, argf, 1);
-}
-
-static VALUE
-argf_getpartial(int argc, VALUE *argv, VALUE argf, int nonblock)
-{
VALUE tmp, str, length;
rb_scan_args(argc, argv, "11", &length, &str);
@@ -10839,7 +9132,7 @@ argf_getpartial(int argc, VALUE *argv, VALUE argf, int nonblock)
RUBY_METHOD_FUNC(0), Qnil, rb_eEOFError, (VALUE)0);
}
else {
- tmp = io_getpartial(argc, argv, ARGF.current_file, nonblock);
+ tmp = io_getpartial(argc, argv, ARGF.current_file, 0);
}
if (NIL_P(tmp)) {
if (ARGF.next_p == -1) {
@@ -10926,7 +9219,7 @@ argf_getbyte(VALUE argf)
retry:
if (!next_argv()) return Qnil;
- if (!RB_TYPE_P(ARGF.current_file, T_FILE)) {
+ if (TYPE(ARGF.current_file) != T_FILE) {
ch = rb_funcall3(ARGF.current_file, rb_intern("getbyte"), 0, 0);
}
else {
@@ -10966,7 +9259,7 @@ argf_readchar(VALUE argf)
retry:
if (!next_argv()) rb_eof_error();
- if (!RB_TYPE_P(ARGF.current_file, T_FILE)) {
+ if (TYPE(ARGF.current_file) != T_FILE) {
ch = rb_funcall3(ARGF.current_file, rb_intern("getc"), 0, 0);
}
else {
@@ -11022,6 +9315,10 @@ argf_readbyte(VALUE argf)
* ARGF.each_line(sep=$/,limit) {|line| block } -> ARGF
* ARGF.each_line(...) -> an_enumerator
*
+ * ARGF.lines(sep=$/) {|line| block } -> ARGF
+ * ARGF.lines(sep=$/,limit) {|line| block } -> ARGF
+ * ARGF.lines(...) -> an_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
@@ -11056,19 +9353,6 @@ argf_each_line(int argc, VALUE *argv, VALUE argf)
}
/*
- * This is a deprecated alias for <code>each_line</code>.
- */
-
-static VALUE
-argf_lines(int argc, VALUE *argv, VALUE argf)
-{
- rb_warn("ARGF#lines is deprecated; use #each_line instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(argf, ID2SYM(rb_intern("each_line")), argc, argv);
- return argf_each_line(argc, argv, argf);
-}
-
-/*
* call-seq:
* ARGF.bytes {|byte| block } -> ARGF
* ARGF.bytes -> an_enumerator
@@ -11104,20 +9388,10 @@ argf_each_byte(VALUE argf)
}
/*
- * This is a deprecated alias for <code>each_byte</code>.
- */
-
-static VALUE
-argf_bytes(VALUE argf)
-{
- rb_warn("ARGF#bytes is deprecated; use #each_byte instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(argf, ID2SYM(rb_intern("each_byte")), 0, 0);
- return argf_each_byte(argf);
-}
-
-/*
* call-seq:
+ * ARGF.chars {|char| block } -> ARGF
+ * ARGF.chars -> an_enumerator
+ *
* ARGF.each_char {|char| block } -> ARGF
* ARGF.each_char -> an_enumerator
*
@@ -11144,59 +9418,6 @@ argf_each_char(VALUE argf)
}
/*
- * This is a deprecated alias for <code>each_char</code>.
- */
-
-static VALUE
-argf_chars(VALUE argf)
-{
- rb_warn("ARGF#chars is deprecated; use #each_char instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(argf, ID2SYM(rb_intern("each_char")), 0, 0);
- return argf_each_char(argf);
-}
-
-/*
- * call-seq:
- * ARGF.each_codepoint {|codepoint| block } -> ARGF
- * ARGF.each_codepoint -> an_enumerator
- *
- * Iterates over each codepoint of each file in +ARGF+.
- *
- * 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 codepoint of the first file has been returned, the first
- * codepoint of the second file is returned. The +ARGF.filename+ method can
- * be used to determine the name of the file in which the current codepoint
- * appears.
- *
- * If no block is given, an enumerator is returned instead.
- */
-static VALUE
-argf_each_codepoint(VALUE argf)
-{
- RETURN_ENUMERATOR(argf, 0, 0);
- for (;;) {
- if (!next_argv()) return argf;
- rb_block_call(ARGF.current_file, rb_intern("each_codepoint"), 0, 0, 0, 0);
- ARGF.next_p = 1;
- }
-}
-
-/*
- * This is a deprecated alias for <code>each_codepoint</code>.
- */
-
-static VALUE
-argf_codepoints(VALUE argf)
-{
- rb_warn("ARGF#codepoints is deprecated; use #each_codepoint instead");
- if (!rb_block_given_p())
- return rb_enumeratorize(argf, ID2SYM(rb_intern("each_codepoint")), 0, 0);
- return argf_each_codepoint(argf);
-}
-
-/*
* call-seq:
* ARGF.filename -> String
* ARGF.path -> String
@@ -11490,34 +9711,6 @@ rb_get_argv(void)
}
/*
- * call-seq:
- * ARGF.to_write_io -> io
- *
- * Returns IO instance tied to _ARGF_ for writing if inplace mode is
- * enabled.
- */
-static VALUE
-argf_write_io(VALUE argf)
-{
- if (!RTEST(ARGF.current_file)) {
- rb_raise(rb_eIOError, "not opened for writing");
- }
- return GetWriteIO(ARGF.current_file);
-}
-
-/*
- * call-seq:
- * ARGF.write(string) -> integer
- *
- * Writes _string_ if inplace mode.
- */
-static VALUE
-argf_write(VALUE argf, VALUE str)
-{
- return rb_io_write(argf_write_io(argf), str);
-}
-
-/*
* Document-class: IOError
*
* Raised when an IO operation fails.
@@ -11536,8 +9729,8 @@ argf_write(VALUE argf, VALUE str)
*/
/*
- * Document-class: EOFError
- *
+* Document-class: EOFError
+*
* Raised by some IO operations when reaching the end of file. Many IO
* methods exist in two forms,
*
@@ -11556,7 +9749,7 @@ argf_write(VALUE argf, VALUE str)
* 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.
+ * 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
@@ -11572,7 +9765,7 @@ argf_write(VALUE argf, VALUE str)
* 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.
+ * 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
@@ -11594,82 +9787,85 @@ argf_write(VALUE argf, VALUE str)
*/
/*
- * The IO class is the basis for all input and output in Ruby.
+ * 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 the File class, the only standard
- * subclass of IO. The two classes are closely associated. Like the File
- * class, the Socket library subclasses from IO (such as TCPSocket or
- * UDPSocket).
+ * 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.
*
- * The Kernel#open method can create an IO (or File) object for these types
- * of arguments:
+ * 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
+ * * 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
+ * * A string equal to ``<code>|-</code>'' will create another Ruby
* instance as a subprocess.
*
- * The IO may be opened with different file modes (read-only, write-only) and
- * encodings for proper conversion. See IO.new for these options. See
- * Kernel#open for details of the various command formats described above.
- *
- * IO.popen, the Open3 library, or Process#spawn may also be used to
- * communicate with subprocesses through an IO.
- *
* 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:
+ * 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"
+ * "c:\\gumby\\ruby\\test.rb"
*
* Our examples here will use the Unix-style forward slashes;
- * File::ALT_SEPARATOR can be used to get the platform-specific separator
- * character.
+ * <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
+ * one of the operating system specific constants (O_RDONLY,
+ * O_WRONLY, O_RDWR, O_APPEND and so on). See man open(2) for
+ * more information.
+ *
+ * If the mode is given as a String, it must be one of the
+ * values listed in the following table.
+ *
+ * Mode | Meaning
+ * -----+--------------------------------------------------------
+ * "r" | Read-only, starts at beginning of file (default mode).
+ * -----+--------------------------------------------------------
+ * "r+" | Read-write, starts at beginning of 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
+ * | or creates a new file for reading and writing.
+ * -----+--------------------------------------------------------
+ * "a" | Write-only, starts at end of file if file exists,
+ * | 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
+ * | writing.
+ * -----+--------------------------------------------------------
+ * "b" | 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
* IO-like stream which allows access to all files mentioned on the
- * command line (or STDIN if no files are mentioned). ARGF#path and its alias
- * ARGF#filename are provided to access the name of the file currently being
- * read.
- *
- * == io/console
- *
- * The io/console extension provides methods for interacting with the
- * console. The console can be accessed from IO.console or the standard
- * input/output/error IO objects.
- *
- * Requiring io/console adds the following methods:
- *
- * * IO::console
- * * IO#raw
- * * IO#raw!
- * * IO#cooked
- * * IO#cooked!
- * * IO#getch
- * * IO#echo=
- * * IO#echo?
- * * IO#noecho
- * * IO#winsize
- * * IO#winsize=
- * * IO#iflush
- * * IO#ioflush
- * * IO#oflush
- *
- * Example:
- *
- * require 'io/console'
- * rows, columns = $stdin.winsize
- * puts "Your screen is #{columns} wide and #{rows} tall"
+ * command line (or STDIN if no files are mentioned). ARGF provides
+ * the methods <code>#path</code> and <code>#filename</code> to access
+ * the name of the file currently being read.
*/
void
@@ -11741,8 +9937,6 @@ Init_IO(void)
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, "write", rb_io_s_write, -1);
- rb_define_singleton_method(rb_cIO, "binwrite", rb_io_s_binwrite, -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);
@@ -11776,10 +9970,10 @@ Init_IO(void)
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, "lines", rb_io_each_line, -1);
+ rb_define_method(rb_cIO, "bytes", rb_io_each_byte, 0);
+ rb_define_method(rb_cIO, "chars", rb_io_each_char, 0);
+ rb_define_method(rb_cIO, "codepoints", rb_io_each_codepoint, 0);
rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
rb_define_method(rb_cIO, "sysread", rb_io_sysread, -1);
@@ -11837,7 +10031,6 @@ Init_IO(void)
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, "sysseek", rb_io_sysseek, -1);
- rb_define_method(rb_cIO, "advise", rb_io_advise, -1);
rb_define_method(rb_cIO, "ioctl", rb_io_ioctl, -1);
rb_define_method(rb_cIO, "fcntl", rb_io_fcntl, -1);
@@ -11861,18 +10054,15 @@ Init_IO(void)
orig_stdout = rb_stdout;
rb_deferr = orig_stderr = rb_stderr;
- /* Holds the original stdin */
+ /* constants to hold original stdin/stdout/stderr */
rb_define_global_const("STDIN", rb_stdin);
- /* Holds the original stdout */
rb_define_global_const("STDOUT", rb_stdout);
- /* Holds the original stderr */
rb_define_global_const("STDERR", rb_stderr);
-#if 0
- /* Hack to get rdoc to regard ARGF as a class: */
- rb_cARGF = rb_define_class("ARGF", rb_cObject);
-#endif
-
+ /*
+ * 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);
@@ -11882,26 +10072,21 @@ Init_IO(void)
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_alias(rb_cARGF, "inspect", "to_s");
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, "to_write_io", argf_write_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, "each_codepoint", argf_each_codepoint, 0);
- rb_define_method(rb_cARGF, "lines", argf_lines, -1);
- rb_define_method(rb_cARGF, "bytes", argf_bytes, 0);
- rb_define_method(rb_cARGF, "chars", argf_chars, 0);
- rb_define_method(rb_cARGF, "codepoints", argf_codepoints, 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, "read_nonblock", argf_read_nonblock, -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);
@@ -11920,12 +10105,6 @@ Init_IO(void)
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, "write", argf_write, 1);
- rb_define_method(rb_cARGF, "print", rb_io_print, -1);
- rb_define_method(rb_cARGF, "putc", rb_io_putc, 1);
- rb_define_method(rb_cARGF, "puts", rb_io_puts, -1);
- rb_define_method(rb_cARGF, "printf", rb_io_printf, -1);
-
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);
@@ -11946,12 +10125,6 @@ Init_IO(void)
argf = rb_class_new_instance(0, 0, rb_cARGF);
rb_define_readonly_variable("$<", &argf);
- /*
- * ARGF is a stream designed for use in scripts that process files given
- * as command-line arguments or passed in via STDIN.
- *
- * See ARGF (the class) for more details.
- */
rb_define_global_const("ARGF", argf);
rb_define_hooked_variable("$.", &argf, argf_lineno_getter, argf_lineno_setter);
@@ -11969,6 +10142,54 @@ 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 */
+ rb_file_const("NONBLOCK", INT2FIX(O_NONBLOCK));
+#endif
+ /* truncate size to 0 */
+ rb_file_const("TRUNC", INT2FIX(O_TRUNC));
+#ifdef O_NOCTTY
+ /* not to make opened IO the controlling 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 */
+ rb_file_const("BINARY", INT2FIX(O_BINARY));
+#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"));
@@ -11978,10 +10199,4 @@ Init_IO(void)
sym_textmode = ID2SYM(rb_intern("textmode"));
sym_binmode = ID2SYM(rb_intern("binmode"));
sym_autoclose = ID2SYM(rb_intern("autoclose"));
- sym_normal = ID2SYM(rb_intern("normal"));
- sym_sequential = ID2SYM(rb_intern("sequential"));
- sym_random = ID2SYM(rb_intern("random"));
- sym_willneed = ID2SYM(rb_intern("willneed"));
- sym_dontneed = ID2SYM(rb_intern("dontneed"));
- sym_noreuse = ID2SYM(rb_intern("noreuse"));
}
diff --git a/iseq.c b/iseq.c
index 43e4c8273e..372a773742 100644
--- a/iseq.c
+++ b/iseq.c
@@ -10,22 +10,15 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "internal.h"
-#include "eval_intern.h"
/* #define RUBY_MARK_FREE_DEBUG 1 */
#include "gc.h"
#include "vm_core.h"
#include "iseq.h"
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
#include "insns.inc"
#include "insns_info.inc"
-#define ISEQ_MAJOR_VERSION 2
-#define ISEQ_MINOR_VERSION 0
-
VALUE rb_cISeq;
#define hidden_obj_p(obj) (!SPECIAL_CONST_P(obj) && !RBASIC(obj)->klass)
@@ -72,8 +65,8 @@ iseq_free(void *ptr)
if (!iseq->orig) {
/* It's possible that strings are freed */
if (0) {
- RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->location.label),
- RSTRING_PTR(iseq->location.path));
+ RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name),
+ RSTRING_PTR(iseq->filename));
}
if (iseq->iseq != iseq->iseq_encoded) {
@@ -81,13 +74,11 @@ iseq_free(void *ptr)
}
RUBY_FREE_UNLESS_NULL(iseq->iseq);
- RUBY_FREE_UNLESS_NULL(iseq->line_info_table);
+ 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->callinfo_entries);
RUBY_FREE_UNLESS_NULL(iseq->catch_table);
RUBY_FREE_UNLESS_NULL(iseq->arg_opt_table);
- RUBY_FREE_UNLESS_NULL(iseq->arg_keyword_table);
compile_data_free(iseq->compile_data);
}
ruby_xfree(ptr);
@@ -103,14 +94,11 @@ iseq_mark(void *ptr)
if (ptr) {
rb_iseq_t *iseq = ptr;
- RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->location.label), RSTRING_PTR(iseq->location.path));
+ 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->location.label);
- RUBY_MARK_UNLESS_NULL(iseq->location.base_label);
- RUBY_MARK_UNLESS_NULL(iseq->location.path);
- RUBY_MARK_UNLESS_NULL(iseq->location.absolute_path);
-
+ RUBY_MARK_UNLESS_NULL(iseq->name);
+ RUBY_MARK_UNLESS_NULL(iseq->filename);
+ RUBY_MARK_UNLESS_NULL(iseq->filepath);
RUBY_MARK_UNLESS_NULL((VALUE)iseq->cref_stack);
RUBY_MARK_UNLESS_NULL(iseq->klass);
RUBY_MARK_UNLESS_NULL(iseq->coverage);
@@ -144,12 +132,11 @@ iseq_memsize(const void *ptr)
}
size += iseq->iseq_size * sizeof(VALUE);
- size += iseq->line_info_size * sizeof(struct iseq_line_info_entry);
+ 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);
- size += iseq->callinfo_size * sizeof(rb_call_info_t);
if (iseq->compile_data) {
struct iseq_compile_data_storage *cur;
@@ -169,11 +156,9 @@ iseq_memsize(const void *ptr)
static const rb_data_type_t iseq_data_type = {
"iseq",
- {
- iseq_mark,
- iseq_free,
- iseq_memsize,
- },
+ iseq_mark,
+ iseq_free,
+ iseq_memsize,
};
static VALUE
@@ -183,98 +168,77 @@ iseq_alloc(VALUE klass)
return TypedData_Make_Struct(klass, rb_iseq_t, &iseq_data_type, iseq);
}
-static rb_iseq_location_t *
-iseq_location_setup(rb_iseq_t *iseq, VALUE path, VALUE absolute_path, VALUE name, size_t first_lineno)
-{
- rb_iseq_location_t *loc = &iseq->location;
- loc->path = path;
- if (RTEST(absolute_path) && rb_str_cmp(path, absolute_path) == 0)
- loc->absolute_path = path;
- else
- loc->absolute_path = absolute_path;
- loc->label = loc->base_label = name;
- loc->first_lineno = first_lineno;
- return loc;
-}
-
static void
set_relation(rb_iseq_t *iseq, const VALUE parent)
{
const VALUE type = iseq->type;
rb_thread_t *th = GET_THREAD();
- rb_iseq_t *piseq;
/* set class nest stack */
if (type == ISEQ_TYPE_TOP) {
/* toplevel is private */
- iseq->cref_stack = NEW_CREF(rb_cObject);
- iseq->cref_stack->nd_refinements = Qnil;
+ iseq->cref_stack = NEW_BLOCK(rb_cObject);
+ iseq->cref_stack->nd_file = 0;
iseq->cref_stack->nd_visi = NOEX_PRIVATE;
if (th->top_wrapper) {
- NODE *cref = NEW_CREF(th->top_wrapper);
- cref->nd_refinements = Qnil;
+ NODE *cref = NEW_BLOCK(th->top_wrapper);
+ cref->nd_file = 0;
cref->nd_visi = NOEX_PRIVATE;
cref->nd_next = iseq->cref_stack;
iseq->cref_stack = cref;
}
- iseq->local_iseq = iseq;
}
else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
- iseq->cref_stack = NEW_CREF(0); /* place holder */
- iseq->cref_stack->nd_refinements = Qnil;
- iseq->local_iseq = iseq;
+ 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;
}
-
- if (type == ISEQ_TYPE_MAIN) {
- iseq->local_iseq = iseq;
- }
}
-void
-rb_iseq_add_mark_object(rb_iseq_t *iseq, VALUE obj)
-{
- if (!RTEST(iseq->mark_ary)) {
- iseq->mark_ary = rb_ary_tmp_new(3);
- OBJ_UNTRUST(iseq->mark_ary);
- RBASIC(iseq->mark_ary)->klass = 0;
- }
- rb_ary_push(iseq->mark_ary, obj);
-}
+VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
static VALUE
prepare_iseq_build(rb_iseq_t *iseq,
- VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type, VALUE block_opt,
+ VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+ VALUE parent, VALUE type, VALUE block_opt,
const rb_compile_option_t *option)
{
- iseq->type = type;
- iseq->arg_rest = -1;
- iseq->arg_block = -1;
- iseq->arg_keyword = -1;
- iseq->klass = 0;
- set_relation(iseq, parent);
-
OBJ_FREEZE(name);
- OBJ_FREEZE(path);
-
- iseq_location_setup(iseq, path, absolute_path, name, first_lineno);
- if (iseq != iseq->local_iseq) {
- iseq->location.base_label = iseq->local_iseq->location.label;
- }
+ OBJ_FREEZE(filename);
+ iseq->name = name;
+ iseq->filename = filename;
+ iseq->filepath = filepath == Qnil ? Qnil : rb_realpath_internal(Qnil, filepath, 1);
+ iseq->line_no = line_no;
iseq->defined_method_id = 0;
- iseq->mark_ary = 0;
+ iseq->mark_ary = rb_ary_tmp_new(3);
+ OBJ_UNTRUST(iseq->mark_ary);
+ 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);
@@ -284,7 +248,6 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->compile_data = ALLOC(struct iseq_compile_data);
MEMZERO(iseq->compile_data, struct iseq_compile_data, 1);
- iseq->compile_data->err_info = Qnil;
iseq->compile_data->mark_ary = rb_ary_tmp_new(3);
iseq->compile_data->storage_head = iseq->compile_data->storage_current =
@@ -302,11 +265,14 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->compile_data->option = option;
iseq->compile_data->last_coverable_line = -1;
+ 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, path);
+ iseq->coverage = rb_hash_lookup(coverages, filename);
if (NIL_P(iseq->coverage)) iseq->coverage = Qfalse;
}
}
@@ -323,7 +289,7 @@ cleanup_iseq_build(rb_iseq_t *iseq)
compile_data_free(data);
if (RTEST(err)) {
- rb_funcall2(err, rb_intern("set_backtrace"), 1, &iseq->location.path);
+ rb_funcall2(err, rb_intern("set_backtrace"), 1, &iseq->filename);
rb_exc_raise(err);
}
return Qtrue;
@@ -357,13 +323,13 @@ make_compile_option(rb_compile_option_t *option, VALUE opt)
*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; } \
+ { 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); \
+ if (!NIL_P(num)) o->mem = NUM2INT(num); \
}
SET_COMPILE_OPTION(option, opt, inline_const_cache);
SET_COMPILE_OPTION(option, opt, peephole_optimization);
@@ -387,9 +353,9 @@ 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)
+ 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))
+ 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);
@@ -398,7 +364,6 @@ make_compile_option_value(rb_compile_option_t *option)
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
@@ -407,32 +372,32 @@ make_compile_option_value(rb_compile_option_t *option)
}
VALUE
-rb_iseq_new(NODE *node, VALUE name, VALUE path, VALUE absolute_path,
- VALUE parent, enum iseq_type type)
+rb_iseq_new(NODE *node, VALUE name, VALUE filename, VALUE filepath,
+ VALUE parent, VALUE type)
{
- return rb_iseq_new_with_opt(node, name, path, absolute_path, INT2FIX(0), parent, type,
+ return rb_iseq_new_with_opt(node, name, filename, filepath, INT2FIX(0), parent, type,
&COMPILE_OPTION_DEFAULT);
}
VALUE
-rb_iseq_new_top(NODE *node, VALUE name, VALUE path, VALUE absolute_path, VALUE parent)
+rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE parent)
{
- return rb_iseq_new_with_opt(node, name, path, absolute_path, INT2FIX(0), parent, ISEQ_TYPE_TOP,
+ return rb_iseq_new_with_opt(node, name, filename, filepath, INT2FIX(0), parent, ISEQ_TYPE_TOP,
&COMPILE_OPTION_DEFAULT);
}
VALUE
-rb_iseq_new_main(NODE *node, VALUE path, VALUE absolute_path)
+rb_iseq_new_main(NODE *node, VALUE filename, VALUE filepath)
{
rb_thread_t *th = GET_THREAD();
VALUE parent = th->base_block->iseq->self;
- return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), path, absolute_path, INT2FIX(0),
+ return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), filename, filepath, INT2FIX(0),
parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
}
static VALUE
-rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type, VALUE bopt,
+rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+ VALUE parent, VALUE type, VALUE bopt,
const rb_compile_option_t *option)
{
rb_iseq_t *iseq;
@@ -441,53 +406,52 @@ rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE path, VALUE absolute
GetISeqPtr(self, iseq);
iseq->self = self;
- prepare_iseq_build(iseq, name, path, absolute_path, first_lineno, parent, type, bopt, option);
+ prepare_iseq_build(iseq, name, filename, filepath, 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 path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type,
+rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename, VALUE filepath, 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, path, absolute_path, first_lineno, parent, type,
+ return rb_iseq_new_with_bopt_and_opt(node, name, filename, filepath, line_no, parent, type,
Qfalse, option);
}
VALUE
-rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE path, VALUE absolute_path, VALUE first_lineno,
- VALUE parent, enum iseq_type type, VALUE bopt)
+rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
+ VALUE parent, VALUE type, VALUE bopt)
{
/* TODO: argument check */
- return rb_iseq_new_with_bopt_and_opt(node, name, path, absolute_path, first_lineno, parent, type,
+ return rb_iseq_new_with_bopt_and_opt(node, name, filename, filepath, 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) {(void)NUM2LONG(v); return v;}
+#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, path, absolute_path, first_lineno;
+ VALUE name, filename, filepath, line_no;
VALUE type, body, locals, args, exception;
- st_data_t iseq_type;
- static struct st_table *type_map_cache = 0;
+ 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,
- * label, path, first_lineno,
+ * name, filename, line_no,
* type, locals, args, exception_table, body]
*/
@@ -498,13 +462,12 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
version2 = CHECK_INTEGER(rb_ary_entry(data, i++));
format_type = CHECK_INTEGER(rb_ary_entry(data, i++));
misc = rb_ary_entry(data, i++); /* TODO */
- ((void)magic, (void)version1, (void)version2, (void)format_type, (void)misc);
name = CHECK_STRING(rb_ary_entry(data, i++));
- path = CHECK_STRING(rb_ary_entry(data, i++));
- absolute_path = rb_ary_entry(data, i++);
- absolute_path = NIL_P(absolute_path) ? Qnil : CHECK_STRING(absolute_path);
- first_lineno = CHECK_INTEGER(rb_ary_entry(data, i++));
+ filename = CHECK_STRING(rb_ary_entry(data, i++));
+ filepath = rb_ary_entry(data, i++);
+ filepath = NIL_P(filepath) ? Qnil : CHECK_STRING(filepath);
+ 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++));
@@ -520,9 +483,7 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
GetISeqPtr(iseqval, iseq);
iseq->self = iseqval;
- type_map = type_map_cache;
if (type_map == 0) {
- struct st_table *cached_map;
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);
@@ -533,20 +494,14 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
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);
- cached_map = ATOMIC_PTR_CAS(type_map_cache, (struct st_table *)0, type_map);
- if (cached_map) {
- st_free_table(type_map);
- type_map = cached_map;
- }
}
if (st_lookup(type_map, type, &iseq_type) == 0) {
- ID typeid = SYM2ID(type);
- VALUE typename = rb_id2str(typeid);
+ const char *typename = rb_id2name(type);
if (typename)
- rb_raise(rb_eTypeError, "unsupport type: :%"PRIsVALUE, typename);
+ rb_raise(rb_eTypeError, "unsupport type: :%s", typename);
else
- rb_raise(rb_eTypeError, "unsupport type: %p", (void *)typeid);
+ rb_raise(rb_eTypeError, "unsupport type: %p", (void *)type);
}
if (parent == Qnil) {
@@ -554,8 +509,8 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
}
make_compile_option(&option, opt);
- prepare_iseq_build(iseq, name, path, absolute_path, first_lineno,
- parent, (enum iseq_type)iseq_type, 0, &option);
+ prepare_iseq_build(iseq, name, filename, filepath, line_no,
+ parent, iseq_type, 0, &option);
rb_iseq_build_from_ary(iseq, locals, args, exception, body);
@@ -563,9 +518,6 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
return iseqval;
}
-/*
- * :nodoc:
- */
static VALUE
iseq_s_load(int argc, VALUE *argv, VALUE self)
{
@@ -581,92 +533,45 @@ rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
return iseq_load(rb_cISeq, data, parent, opt);
}
-VALUE
-rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE absolute_path, VALUE line, rb_block_t *base_block, VALUE opt)
+static NODE *
+parse_string(VALUE str, const char *file, int line)
{
- int state;
- rb_thread_t *th = GET_THREAD();
- rb_block_t *prev_base_block = th->base_block;
- VALUE iseqval = Qundef;
-
- th->base_block = base_block;
+ VALUE parser = rb_parser_new();
+ NODE *node = rb_parser_compile_string(parser, file, str, line);
- TH_PUSH_TAG(th);
- if ((state = EXEC_TAG()) == 0) {
- VALUE parser;
- int ln = NUM2INT(line);
- NODE *node;
- rb_compile_option_t option;
-
- StringValueCStr(file);
- make_compile_option(&option, opt);
-
- parser = rb_parser_new();
-
- if (RB_TYPE_P((src), T_FILE))
- node = rb_parser_compile_file_path(parser, file, src, ln);
- else {
- node = rb_parser_compile_string_path(parser, file, src, ln);
-
- if (!node) {
- rb_exc_raise(GET_THREAD()->errinfo); /* TODO: check err */
- }
- }
-
- if (base_block && base_block->iseq) {
- iseqval = rb_iseq_new_with_opt(node, base_block->iseq->location.label,
- file, absolute_path, line, base_block->iseq->self,
- ISEQ_TYPE_EVAL, &option);
- }
- else {
- iseqval = rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, absolute_path, line, Qfalse,
- ISEQ_TYPE_TOP, &option);
- }
+ if (!node) {
+ rb_exc_raise(GET_THREAD()->errinfo); /* TODO: check err */
}
- TH_POP_TAG();
-
- th->base_block = prev_base_block;
-
- if (state) {
- JUMP_TAG(state);
- }
-
- return iseqval;
+ return node;
}
VALUE
-rb_iseq_compile(VALUE src, VALUE file, VALUE line)
+rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE filepath, VALUE line, VALUE opt)
{
- return rb_iseq_compile_with_option(src, file, Qnil, line, 0, Qnil);
+ rb_compile_option_t option;
+ const char *fn = StringValueCStr(file);
+ int ln = NUM2INT(line);
+ NODE *node = parse_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, filepath, line, th->base_block->iseq->self,
+ ISEQ_TYPE_EVAL, &option);
+ }
+ else {
+ return rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, filepath, line, Qfalse,
+ ISEQ_TYPE_TOP, &option);
+ }
}
VALUE
-rb_iseq_compile_on_base(VALUE src, VALUE file, VALUE line, rb_block_t *base_block)
+rb_iseq_compile(VALUE src, VALUE file, VALUE line)
{
- return rb_iseq_compile_with_option(src, file, Qnil, line, base_block, Qnil);
+ return rb_iseq_compile_with_option(src, file, Qnil, line, Qnil);
}
-/*
- * call-seq:
- * InstructionSequence.compile(source[, file[, path[, line[, options]]]]) -> iseq
- * InstructionSequence.new(source[, file[, path[, line[, options]]]]) -> iseq
- *
- * Takes +source+, a String of Ruby code and compiles it to an
- * InstructionSequence.
- *
- * Optionally takes +file+, +path+, and +line+ which describe the filename,
- * absolute path and first line number of the ruby code in +source+ which are
- * metadata attached to the returned +iseq+.
- *
- * +options+, which can be +true+, +false+ or a +Hash+, is used to
- * modify the default behavior of the Ruby iseq compiler.
- *
- * For details regarding valid compile options see ::compile_option=.
- *
- * RubyVM::InstructionSequence.compile("a = 1 + 2")
- * #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
- *
- */
static VALUE
iseq_s_compile(int argc, VALUE *argv, VALUE self)
{
@@ -678,29 +583,9 @@ iseq_s_compile(int argc, VALUE *argv, VALUE self)
if (NIL_P(file)) file = rb_str_new2("<compiled>");
if (NIL_P(line)) line = INT2FIX(1);
- return rb_iseq_compile_with_option(src, file, path, line, 0, opt);
+ return rb_iseq_compile_with_option(src, file, path, line, opt);
}
-/*
- * call-seq:
- * InstructionSequence.compile_file(file[, options]) -> iseq
- *
- * Takes +file+, a String with the location of a Ruby source file, reads,
- * parses and compiles the file, and returns +iseq+, the compiled
- * InstructionSequence with source location metadata set.
- *
- * Optionally takes +options+, which can be +true+, +false+ or a +Hash+, to
- * modify the default behavior of the Ruby iseq compiler.
- *
- * For details regarding valid compile options see ::compile_option=.
- *
- * # /tmp/hello.rb
- * puts "Hello, world!"
- *
- * # elsewhere
- * RubyVM::InstructionSequence.compile_file("/tmp/hello.rb")
- * #=> <RubyVM::InstructionSequence:<main>@/tmp/hello.rb>
- */
static VALUE
iseq_s_compile_file(int argc, VALUE *argv, VALUE self)
{
@@ -721,43 +606,10 @@ iseq_s_compile_file(int argc, VALUE *argv, VALUE self)
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,
- rb_realpath_internal(Qnil, file, 1), line, Qfalse,
+ return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), file, file, line, Qfalse,
ISEQ_TYPE_TOP, &option);
}
-/*
- * call-seq:
- * InstructionSequence.compile_option = options
- *
- * Sets the default values for various optimizations in the Ruby iseq
- * compiler.
- *
- * Possible values for +options+ include +true+, which enables all options,
- * +false+ which disables all options, and +nil+ which leaves all options
- * unchanged.
- *
- * You can also pass a +Hash+ of +options+ that you want to change, any
- * options not present in the hash will be left unchanged.
- *
- * Possible option names (which are keys in +options+) which can be set to
- * +true+ or +false+ include:
- *
- * * +:inline_const_cache+
- * * +:instructions_unification+
- * * +:operands_unification+
- * * +:peephole_optimization+
- * * +:specialized_instruction+
- * * +:stack_caching+
- * * +:tailcall_optimization+
- * * +:trace_instruction+
- *
- * Additionally, +:debug_level+ can be set to an integer.
- *
- * These default options can be overwritten for a single run of the iseq
- * compiler by passing any of the above values as the +options+ parameter to
- * ::new, ::compile and ::compile_file.
- */
static VALUE
iseq_s_compile_option_set(VALUE self, VALUE opt)
{
@@ -768,14 +620,6 @@ iseq_s_compile_option_set(VALUE self, VALUE opt)
return opt;
}
-/*
- * call-seq:
- * InstructionSequence.compile_option -> options
- *
- * Returns a hash of default options used by the Ruby iseq compiler.
- *
- * For details, see InstructionSequence.compile_option=.
- */
static VALUE
iseq_s_compile_option_get(VALUE self)
{
@@ -787,20 +631,12 @@ iseq_check(VALUE val)
{
rb_iseq_t *iseq;
GetISeqPtr(val, iseq);
- if (!iseq->location.label) {
+ if (!iseq->name) {
rb_raise(rb_eTypeError, "uninitialized InstructionSequence");
}
return iseq;
}
-/*
- * call-seq:
- * iseq.eval -> obj
- *
- * Evaluates the instruction sequence and returns the result.
- *
- * RubyVM::InstructionSequence.compile("1 + 2").eval #=> 3
- */
static VALUE
iseq_eval(VALUE self)
{
@@ -808,244 +644,23 @@ iseq_eval(VALUE self)
return rb_iseq_eval(self);
}
-/*
- * Returns a human-readable string representation of this instruction
- * sequence, including the #label and #path.
- */
static VALUE
iseq_inspect(VALUE self)
{
rb_iseq_t *iseq;
GetISeqPtr(self, iseq);
- if (!iseq->location.label) {
+ 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->location.label), RSTRING_PTR(iseq->location.path));
-}
-
-/*
- * Returns the path of this instruction sequence.
- *
- * <code><compiled></code> if the iseq was evaluated from a string.
- *
- * For example, using irb:
- *
- * iseq = RubyVM::InstructionSequence.compile('num = 1 + 2')
- * #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
- * iseq.path
- * #=> "<compiled>"
- *
- * Using ::compile_file:
- *
- * # /tmp/method.rb
- * def hello
- * puts "hello, world"
- * end
- *
- * # in irb
- * > iseq = RubyVM::InstructionSequence.compile_file('/tmp/method.rb')
- * > iseq.path #=> /tmp/method.rb
- */
-static VALUE
-iseq_path(VALUE self)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(self, iseq);
- return iseq->location.path;
-}
-
-/*
- * Returns the absolute path of this instruction sequence.
- *
- * +nil+ if the iseq was evaluated from a string.
- *
- * For example, using ::compile_file:
- *
- * # /tmp/method.rb
- * def hello
- * puts "hello, world"
- * end
- *
- * # in irb
- * > iseq = RubyVM::InstructionSequence.compile_file('/tmp/method.rb')
- * > iseq.absolute_path #=> /tmp/method.rb
- */
-static VALUE
-iseq_absolute_path(VALUE self)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(self, iseq);
- return iseq->location.absolute_path;
-}
-
-/* Returns the label of this instruction sequence.
- *
- * <code><main></code> if it's at the top level, <code><compiled></code> if it
- * was evaluated from a string.
- *
- * For example, using irb:
- *
- * iseq = RubyVM::InstructionSequence.compile('num = 1 + 2')
- * #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
- * iseq.label
- * #=> "<compiled>"
- *
- * Using ::compile_file:
- *
- * # /tmp/method.rb
- * def hello
- * puts "hello, world"
- * end
- *
- * # in irb
- * > iseq = RubyVM::InstructionSequence.compile_file('/tmp/method.rb')
- * > iseq.label #=> <main>
- */
-static VALUE
-iseq_label(VALUE self)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(self, iseq);
- return iseq->location.label;
-}
-
-/* Returns the base label of this instruction sequence.
- *
- * For example, using irb:
- *
- * iseq = RubyVM::InstructionSequence.compile('num = 1 + 2')
- * #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
- * iseq.base_label
- * #=> "<compiled>"
- *
- * Using ::compile_file:
- *
- * # /tmp/method.rb
- * def hello
- * puts "hello, world"
- * end
- *
- * # in irb
- * > iseq = RubyVM::InstructionSequence.compile_file('/tmp/method.rb')
- * > iseq.base_label #=> <main>
- */
-static VALUE
-iseq_base_label(VALUE self)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(self, iseq);
- return iseq->location.base_label;
-}
-
-/* Returns the number of the first source line where the instruction sequence
- * was loaded from.
- *
- * For example, using irb:
- *
- * iseq = RubyVM::InstructionSequence.compile('num = 1 + 2')
- * #=> <RubyVM::InstructionSequence:<compiled>@<compiled>>
- * iseq.first_lineno
- * #=> 1
- */
-static VALUE
-iseq_first_lineno(VALUE self)
-{
- rb_iseq_t *iseq;
- GetISeqPtr(self, iseq);
- return iseq->location.first_lineno;
+ RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
}
static
VALUE iseq_data_to_ary(rb_iseq_t *iseq);
-/*
- * call-seq:
- * iseq.to_a -> ary
- *
- * Returns an Array with 14 elements representing the instruction sequence
- * with the following data:
- *
- * [magic]
- * A string identifying the data format. <b>Always
- * +YARVInstructionSequence/SimpleDataFormat+.</b>
- *
- * [major_version]
- * The major version of the instruction sequence.
- *
- * [minor_version]
- * The minor version of the instruction sequence.
- *
- * [format_type]
- * A number identifying the data format. <b>Always 1</b>.
- *
- * [misc]
- * A hash containing:
- *
- * [+:arg_size+]
- * the total number of arguments taken by the method or the block (0 if
- * _iseq_ doesn't represent a method or block)
- * [+:local_size+]
- * the number of local variables + 1
- * [+:stack_max+]
- * used in calculating the stack depth at which a SystemStackError is
- * thrown.
- *
- * [#label]
- * The name of the context (block, method, class, module, etc.) that this
- * instruction sequence belongs to.
- *
- * <code><main></code> if it's at the top level, <code><compiled></code> if
- * it was evaluated from a string.
- *
- * [#path]
- * The relative path to the Ruby file where the instruction sequence was
- * loaded from.
- *
- * <code><compiled></code> if the iseq was evaluated from a string.
- *
- * [#absolute_path]
- * The absolute path to the Ruby file where the instruction sequence was
- * loaded from.
- *
- * +nil+ if the iseq was evaluated from a string.
- *
- * [#first_lineno]
- * The number of the first source line where the instruction sequence was
- * loaded from.
- *
- * [type]
- * The type of the instruction sequence.
- *
- * Valid values are +:top+, +:method+, +:block+, +:class+, +:rescue+,
- * +:ensure+, +:eval+, +:main+, and +:defined_guard+.
- *
- * [locals]
- * An array containing the names of all arguments and local variables as
- * symbols.
- *
- * [args]
- * The arity if the method or block only has required arguments.
- *
- * Otherwise an array of:
- *
- * [required_argc, [optional_arg_labels, ...],
- * splat_index, post_splat_argc, post_splat_index,
- * block_index, simple]
- *
- * More info about these values can be found in +vm_core.h+.
- *
- * [catch_table]
- * A list of exceptions and control flow operators (rescue, next, redo,
- * break, etc.).
- *
- * [bytecode]
- * An array of arrays containing the instruction names and operands that
- * make up the body of the instruction sequence.
- *
- */
static VALUE
iseq_to_a(VALUE self)
{
@@ -1055,53 +670,33 @@ iseq_to_a(VALUE self)
}
int
-rb_iseq_first_lineno(const rb_iseq_t *iseq)
+rb_iseq_first_lineno(rb_iseq_t *iseq)
{
- return FIX2INT(iseq->location.first_lineno);
+ return FIX2INT(iseq->line_no);
}
/* TODO: search algorithm is brute force.
this should be binary search or so. */
-static struct iseq_line_info_entry *
-get_line_info(const rb_iseq_t *iseq, size_t pos)
+static struct iseq_insn_info_entry *
+get_insn_info(const rb_iseq_t *iseq, const unsigned long pos)
{
- size_t i = 0, size = iseq->line_info_size;
- struct iseq_line_info_entry *table = iseq->line_info_table;
- const int debug = 0;
-
- if (debug) {
- printf("size: %"PRIdSIZE"\n", size);
- printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
- i, table[i].position, table[i].line_no, pos);
- }
-
- if (size == 0) {
- return 0;
- }
- else if (size == 1) {
- return &table[0];
- }
- else {
- for (i=1; i<size; i++) {
- if (debug) printf("table[%"PRIdSIZE"]: position: %d, line: %d, pos: %"PRIdSIZE"\n",
- i, table[i].position, table[i].line_no, pos);
+ unsigned long i, size = iseq->insn_info_size;
+ struct iseq_insn_info_entry *table = iseq->insn_info_table;
- if (table[i].position == pos) {
- return &table[i];
- }
- if (table[i].position > pos) {
- return &table[i-1];
- }
+ for (i = 0; i < size; i++) {
+ if (table[i].position == pos) {
+ return &table[i];
}
}
- return &table[i-1];
+
+ return 0;
}
-static unsigned int
-find_line_no(const rb_iseq_t *iseq, size_t pos)
+static unsigned short
+find_line_no(rb_iseq_t *iseq, unsigned long pos)
{
- struct iseq_line_info_entry *entry = get_line_info(iseq, pos);
+ struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
if (entry) {
return entry->line_no;
}
@@ -1110,31 +705,27 @@ find_line_no(const rb_iseq_t *iseq, size_t pos)
}
}
-unsigned int
-rb_iseq_line_no(const rb_iseq_t *iseq, size_t pos)
+static unsigned short
+find_prev_line_no(rb_iseq_t *iseqdat, unsigned long pos)
{
- if (pos == 0) {
- return find_line_no(iseq, pos);
- }
- else {
- return find_line_no(iseq, pos - 1);
- }
-}
+ unsigned long i, size = iseqdat->insn_info_size;
+ struct iseq_insn_info_entry *iiary = iseqdat->insn_info_table;
-static VALUE
-id_to_name(ID id, VALUE default_value)
-{
- VALUE str = rb_id2str(id);
- if (!str) {
- str = default_value;
- }
- else if (!rb_str_symname_p(str)) {
- str = rb_str_inspect(str);
+ for (i = 0; i < size; i++) {
+ if (iiary[i].position == pos) {
+ if (i > 0) {
+ return iiary[i - 1].line_no;
+ }
+ else {
+ return 0;
+ }
+ }
}
- return str;
+
+ return 0;
}
-VALUE
+static VALUE
insn_operand_intern(rb_iseq_t *iseq,
VALUE insn, int op_no, VALUE op,
int len, size_t pos, VALUE *pnop, VALUE child)
@@ -1145,27 +736,41 @@ insn_operand_intern(rb_iseq_t *iseq,
switch (type) {
case TS_OFFSET: /* LONG */
- ret = rb_sprintf("%"PRIdVALUE, (VALUE)(pos + len + op));
+ ret = rb_sprintf("%ld", pos + len + op);
break;
case TS_NUM: /* ULONG */
- ret = rb_sprintf("%"PRIuVALUE, op);
+ ret = rb_sprintf("%lu", op);
break;
- case TS_LINDEX:{
- if (insn == BIN(getlocal) || insn == BIN(setlocal)) {
- if (pnop) {
- rb_iseq_t *diseq = iseq;
- VALUE level = *pnop, i;
+ case TS_LINDEX:
+ {
+ rb_iseq_t *ip = iseq->local_iseq;
+ int lidx = ip->local_size - (int)op;
+ const char *name = rb_id2name(ip->local_table[lidx]);
- for (i = 0; i < level; i++) {
- diseq = diseq->parent_iseq;
- }
- ret = id_to_name(diseq->local_table[diseq->local_size - op], INT2FIX('*'));
+ if (name) {
+ ret = rb_str_new2(name);
}
else {
- ret = rb_sprintf("%"PRIuVALUE, op);
+ ret = rb_str_new2("*");
}
+ break;
+ }
+ case TS_DINDEX:{
+ if (insn == BIN(getdynamic) || insn == BIN(setdynamic)) {
+ rb_iseq_t *ip = iseq;
+ VALUE 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));
@@ -1179,9 +784,7 @@ insn_operand_intern(rb_iseq_t *iseq,
op = obj_resurrect(op);
ret = rb_inspect(op);
if (CLASS_OF(op) == rb_cISeq) {
- if (child) {
- rb_ary_push(child, op);
- }
+ rb_ary_push(child, op);
}
break;
@@ -1189,7 +792,7 @@ insn_operand_intern(rb_iseq_t *iseq,
{
rb_iseq_t *iseq = (rb_iseq_t *)op;
if (iseq) {
- ret = iseq->location.label;
+ ret = iseq->name;
if (child) {
rb_ary_push(child, iseq->self);
}
@@ -1210,40 +813,6 @@ insn_operand_intern(rb_iseq_t *iseq,
ret = rb_sprintf("<ic:%"PRIdPTRDIFF">", (struct iseq_inline_cache_entry *)op - iseq->ic_entries);
break;
- case TS_CALLINFO:
- {
- rb_call_info_t *ci = (rb_call_info_t *)op;
- VALUE ary = rb_ary_new();
-
- if (ci->mid) {
- rb_ary_push(ary, rb_sprintf("mid:%s", rb_id2name(ci->mid)));
- }
-
- rb_ary_push(ary, rb_sprintf("argc:%d", ci->orig_argc));
-
- if (ci->blockiseq) {
- if (child) {
- rb_ary_push(child, ci->blockiseq->self);
- }
- rb_ary_push(ary, rb_sprintf("block:%"PRIsVALUE, ci->blockiseq->location.label));
- }
-
- if (ci->flag) {
- VALUE flags = rb_ary_new();
- if (ci->flag & VM_CALL_ARGS_SPLAT) rb_ary_push(flags, rb_str_new2("ARGS_SPLAT"));
- if (ci->flag & VM_CALL_ARGS_BLOCKARG) rb_ary_push(flags, rb_str_new2("ARGS_BLOCKARG"));
- if (ci->flag & VM_CALL_FCALL) rb_ary_push(flags, rb_str_new2("FCALL"));
- if (ci->flag & VM_CALL_VCALL) rb_ary_push(flags, rb_str_new2("VCALL"));
- if (ci->flag & VM_CALL_TAILCALL) rb_ary_push(flags, rb_str_new2("TAILCALL"));
- if (ci->flag & VM_CALL_SUPER) rb_ary_push(flags, rb_str_new2("SUPER"));
- if (ci->flag & VM_CALL_OPT_SEND) rb_ary_push(flags, rb_str_new2("SNED")); /* maybe not reachable */
- if (ci->flag & VM_CALL_ARGS_SKIP_SETUP) rb_ary_push(flags, rb_str_new2("ARGS_SKIP")); /* maybe not reachable */
- rb_ary_push(ary, rb_ary_join(flags, rb_str_new2("|")));
- }
- ret = rb_sprintf("<callinfo!%"PRIsVALUE">", rb_ary_join(ary, rb_str_new2(", ")));
- }
- break;
-
case TS_CDHASH:
ret = rb_str_new2("<cdhash>");
break;
@@ -1253,7 +822,7 @@ insn_operand_intern(rb_iseq_t *iseq,
break;
default:
- rb_bug("insn_operand_intern: unknown operand type: %c", type);
+ rb_bug("rb_iseq_disasm: unknown operand type: %c", type);
}
return ret;
}
@@ -1294,15 +863,23 @@ rb_iseq_disasm_insn(VALUE ret, VALUE *iseq, size_t pos,
}
}
- {
- unsigned int line_no = find_line_no(iseqdat, pos);
- unsigned int prev = pos == 0 ? 0 : find_line_no(iseqdat, pos - 1);
+ 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");
@@ -1336,24 +913,6 @@ catch_type(int type)
}
}
-/*
- * call-seq:
- * iseq.disasm -> str
- * iseq.disassemble -> str
- *
- * Returns the instruction sequence as a +String+ in human readable form.
- *
- * puts RubyVM::InstructionSequence.compile('1 + 2').disasm
- *
- * Produces:
- *
- * == disasm: <RubyVM::InstructionSequence:<compiled>@<compiled>>==========
- * 0000 trace 1 ( 1)
- * 0002 putobject 1
- * 0004 putobject 2
- * 0006 opt_plus <ic:1>
- * 0008 leave
- */
VALUE
rb_iseq_disasm(VALUE self)
{
@@ -1414,8 +973,8 @@ rb_iseq_disasm(VALUE self)
iseqdat->arg_simple);
for (i = 0; i < iseqdat->local_table_size; i++) {
- long width;
- VALUE name = id_to_name(tbl[i], 0);
+ const char *name = rb_id2name(tbl[i]);
+ char info[0x100];
char argi[0x100] = "";
char opti[0x100] = "";
@@ -1423,7 +982,7 @@ rb_iseq_disasm(VALUE self)
int argc = iseqdat->argc;
int opts = iseqdat->arg_opts;
if (i >= argc && i < argc + opts - 1) {
- snprintf(opti, sizeof(opti), "Opt=%"PRIdVALUE,
+ snprintf(opti, sizeof(opti), "Opt=%ld",
iseqdat->arg_opt_table[i - argc]);
}
}
@@ -1436,14 +995,10 @@ rb_iseq_disasm(VALUE self)
i < iseqdat->arg_post_start + iseqdat->arg_post_len) ? "Post" : "",
iseqdat->arg_block == i ? "Block" : "");
- rb_str_catf(str, "[%2d] ", iseqdat->local_size - i);
- width = RSTRING_LEN(str) + 11;
- if (name)
- rb_str_append(str, name);
- else
- rb_str_cat2(str, "?");
- if (*argi) rb_str_catf(str, "<%s>", argi);
- if ((width -= RSTRING_LEN(str)) > 0) rb_str_catf(str, "%*s", (int)width, "");
+ 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");
}
@@ -1461,121 +1016,29 @@ rb_iseq_disasm(VALUE self)
return str;
}
-/*
- * Returns the instruction sequence containing the given proc or method.
- *
- * For example, using irb:
- *
- * # a proc
- * > p = proc { num = 1 + 2 }
- * > RubyVM::InstructionSequence.of(p)
- * > #=> <RubyVM::InstructionSequence:block in irb_binding@(irb)>
- *
- * # for a method
- * > def foo(bar); puts bar; end
- * > RubyVM::InstructionSequence.of(method(:foo))
- * > #=> <RubyVM::InstructionSequence:foo@(irb)>
- *
- * Using ::compile_file:
- *
- * # /tmp/iseq_of.rb
- * def hello
- * puts "hello, world"
- * end
- *
- * $a_global_proc = proc { str = 'a' + 'b' }
- *
- * # in irb
- * > require '/tmp/iseq_of.rb'
- *
- * # first the method hello
- * > RubyVM::InstructionSequence.of(method(:hello))
- * > #=> #<RubyVM::InstructionSequence:0x007fb73d7cb1d0>
- *
- * # then the global proc
- * > RubyVM::InstructionSequence.of($a_global_proc)
- * > #=> #<RubyVM::InstructionSequence:0x007fb73d7caf78>
- */
static VALUE
-iseq_s_of(VALUE klass, VALUE body)
+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 (rb_obj_is_proc(body)) {
rb_proc_t *proc;
+ VALUE iseqval;
GetProcPtr(body, proc);
- iseq = proc->block.iseq;
- if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
- ret = iseq->self;
+ iseqval = proc->block.iseq->self;
+ if (RUBY_VM_NORMAL_ISEQ_P(iseqval)) {
+ ret = rb_iseq_disasm(iseqval);
}
}
else if ((iseq = rb_method_get_iseq(body)) != 0) {
- ret = iseq->self;
+ ret = rb_iseq_disasm(iseq->self);
}
- return ret;
-}
-
-/*
- * call-seq:
- * InstructionSequence.disasm(body) -> str
- * InstructionSequence.disassemble(body) -> str
- *
- * Takes +body+, a Method or Proc object, and returns a String with the
- * human readable instructions for +body+.
- *
- * For a Method object:
- *
- * # /tmp/method.rb
- * def hello
- * puts "hello, world"
- * end
- *
- * puts RubyVM::InstructionSequence.disasm(method(:hello))
- *
- * Produces:
- *
- * == disasm: <RubyVM::InstructionSequence:hello@/tmp/method.rb>============
- * 0000 trace 8 ( 1)
- * 0002 trace 1 ( 2)
- * 0004 putself
- * 0005 putstring "hello, world"
- * 0007 send :puts, 1, nil, 8, <ic:0>
- * 0013 trace 16 ( 3)
- * 0015 leave ( 2)
- *
- * For a Proc:
- *
- * # /tmp/proc.rb
- * p = proc { num = 1 + 2 }
- * puts RubyVM::InstructionSequence.disasm(p)
- *
- * Produces:
- *
- * == disasm: <RubyVM::InstructionSequence:block in <main>@/tmp/proc.rb>===
- * == catch table
- * | catch type: redo st: 0000 ed: 0012 sp: 0000 cont: 0000
- * | catch type: next st: 0000 ed: 0012 sp: 0000 cont: 0012
- * |------------------------------------------------------------------------
- * local table (size: 2, argc: 0 [opts: 0, rest: -1, post: 0, block: -1] s1)
- * [ 2] num
- * 0000 trace 1 ( 1)
- * 0002 putobject 1
- * 0004 putobject 2
- * 0006 opt_plus <ic:1>
- * 0008 dup
- * 0009 setlocal num, 0
- * 0012 leave
- *
- */
-static VALUE
-iseq_s_disasm(VALUE klass, VALUE body)
-{
- VALUE iseqval = iseq_s_of(klass, body);
- return NIL_P(iseqval) ? Qnil : rb_iseq_disasm(iseqval);
+ return ret;
}
const char *
@@ -1611,7 +1074,7 @@ static VALUE
exception_type2symbol(VALUE type)
{
ID id;
- switch (type) {
+ 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;
@@ -1635,10 +1098,8 @@ cdhash_each(VALUE key, VALUE value, VALUE ary)
static VALUE
iseq_data_to_ary(rb_iseq_t *iseq)
{
- long i;
- size_t ti;
- unsigned int pos;
- unsigned int line = 0;
+ long i, pos;
+ int line = 0;
VALUE *seq;
VALUE val = rb_ary_new();
@@ -1680,7 +1141,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
}
/* type */
- switch (iseq->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;
@@ -1755,6 +1216,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
break;
}
case TS_LINDEX:
+ case TS_DINDEX:
case TS_NUM:
rb_ary_push(ary, INT2FIX(*seq));
break;
@@ -1784,17 +1246,6 @@ iseq_data_to_ary(rb_iseq_t *iseq)
rb_ary_push(ary, INT2FIX(ic - iseq->ic_entries));
}
break;
- case TS_CALLINFO:
- {
- rb_call_info_t *ci = (rb_call_info_t *)*seq;
- VALUE e = rb_hash_new();
- rb_hash_aset(e, ID2SYM(rb_intern("mid")), ci->mid ? ID2SYM(ci->mid) : Qnil);
- rb_hash_aset(e, ID2SYM(rb_intern("flag")), ULONG2NUM(ci->flag));
- rb_hash_aset(e, ID2SYM(rb_intern("orig_argc")), INT2FIX(ci->orig_argc));
- rb_hash_aset(e, ID2SYM(rb_intern("blockptr")), ci->blockiseq ? iseq_data_to_ary(ci->blockiseq) : Qnil);
- rb_ary_push(ary, e);
- }
- break;
case TS_ID:
rb_ary_push(ary, ID2SYM(*seq));
break;
@@ -1847,24 +1298,22 @@ iseq_data_to_ary(rb_iseq_t *iseq)
/* make body with labels and insert line number */
body = rb_ary_new();
- ti = 0;
for (i=0, pos=0; i<RARRAY_LEN(nbody); i++) {
VALUE ary = RARRAY_PTR(nbody)[i];
- st_data_t label;
+ VALUE label;
if (st_lookup(labels_table, pos, &label)) {
- rb_ary_push(body, (VALUE)label);
+ rb_ary_push(body, label);
}
- if (ti < iseq->line_info_size && iseq->line_info_table[ti].position == pos) {
- line = iseq->line_info_table[ti].line_no;
+ if (iseq->insn_info_table[i].line_no != line) {
+ line = iseq->insn_info_table[i].line_no;
rb_ary_push(body, INT2FIX(line));
- ti++;
}
rb_ary_push(body, ary);
- pos += RARRAY_LENINT(ary); /* reject too huge data */
+ pos += RARRAY_LEN(ary);
}
st_free_table(labels_table);
@@ -1873,21 +1322,20 @@ iseq_data_to_ary(rb_iseq_t *iseq)
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));
- /* TODO: compatibility issue */
/*
* [:magic, :major_version, :minor_version, :format_type, :misc,
- * :name, :path, :absolute_path, :start_lineno, :type, :locals, :args,
+ * :name, :filename, :filepath, :line_no, :type, :locals, :args,
* :catch_table, :bytecode]
*/
rb_ary_push(val, rb_str_new2("YARVInstructionSequence/SimpleDataFormat"));
- rb_ary_push(val, INT2FIX(ISEQ_MAJOR_VERSION)); /* major */
- rb_ary_push(val, INT2FIX(ISEQ_MINOR_VERSION)); /* minor */
+ 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->location.label);
- rb_ary_push(val, iseq->location.path);
- rb_ary_push(val, iseq->location.absolute_path);
- rb_ary_push(val, iseq->location.first_lineno);
+ rb_ary_push(val, iseq->name);
+ rb_ary_push(val, iseq->filename);
+ rb_ary_push(val, iseq->filepath);
+ rb_ary_push(val, iseq->line_no);
rb_ary_push(val, type);
rb_ary_push(val, locals);
rb_ary_push(val, args);
@@ -1914,9 +1362,7 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
iseq1->local_iseq = iseq1;
}
if (newcbase) {
- iseq1->cref_stack = NEW_CREF(newcbase);
- iseq1->cref_stack->nd_refinements = iseq0->cref_stack->nd_refinements;
- iseq1->cref_stack->nd_visi = iseq0->cref_stack->nd_visi;
+ iseq1->cref_stack = NEW_BLOCK(newcbase);
if (iseq0->cref_stack->nd_next) {
iseq1->cref_stack->nd_next = iseq0->cref_stack->nd_next;
}
@@ -1929,14 +1375,14 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
VALUE
rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
{
- int i, r;
+ int i, r, s;
VALUE a, args = rb_ary_new2(iseq->arg_size);
- ID req, opt, rest, block, key, keyrest;
+ 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_ID(i) iseq->local_table[i]
#define PARAM(i, type) ( \
PARAM_TYPE(type), \
- rb_id2str(PARAM_ID(i)) ? \
+ rb_id2name(PARAM_ID(i)) ? \
rb_ary_push(a, ID2SYM(PARAM_ID(i))) : \
a)
@@ -1945,7 +1391,7 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
if (is_proc) {
for (i = 0; i < iseq->argc; i++) {
PARAM_TYPE(opt);
- rb_ary_push(a, rb_id2str(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
+ rb_ary_push(a, rb_id2name(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
rb_ary_push(args, a);
}
}
@@ -1954,10 +1400,13 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
rb_ary_push(args, PARAM(i, req));
}
}
- r = iseq->argc + iseq->arg_opts - 1;
- for (; i < r; i++) {
+ 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_id2str(PARAM_ID(i))) {
+ if (rb_id2name(PARAM_ID(i))) {
rb_ary_push(a, ID2SYM(PARAM_ID(i)));
}
rb_ary_push(args, a);
@@ -1970,7 +1419,7 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
if (is_proc) {
for (i = iseq->arg_post_start; i < r; i++) {
PARAM_TYPE(opt);
- rb_ary_push(a, rb_id2str(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
+ rb_ary_push(a, rb_id2name(PARAM_ID(i)) ? ID2SYM(PARAM_ID(i)) : Qnil);
rb_ary_push(args, a);
}
}
@@ -1979,20 +1428,6 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
rb_ary_push(args, PARAM(i, req));
}
}
- if (iseq->arg_keyword != -1) {
- CONST_ID(key, "key");
- for (i = 0; i < iseq->arg_keywords; i++) {
- PARAM_TYPE(key);
- if (rb_id2str(iseq->arg_keyword_table[i])) {
- rb_ary_push(a, ID2SYM(iseq->arg_keyword_table[i]));
- }
- rb_ary_push(args, a);
- }
- if (rb_id2str(iseq->local_table[iseq->arg_keyword])) {
- CONST_ID(keyrest, "keyrest");
- rb_ary_push(args, PARAM(iseq->arg_keyword, keyrest));
- }
- }
if (iseq->arg_block != -1) {
CONST_ID(block, "block");
rb_ary_push(args, PARAM(iseq->arg_block, block));
@@ -2000,58 +1435,19 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
return args;
}
-VALUE
-rb_iseq_defined_string(enum defined_type type)
-{
- static const char expr_names[][18] = {
- "nil",
- "instance-variable",
- "local-variable",
- "global-variable",
- "class variable",
- "constant",
- "method",
- "yield",
- "super",
- "self",
- "true",
- "false",
- "assignment",
- "expression",
- };
- const char *estr;
- VALUE *defs, str;
-
- if ((unsigned)(type - 1) >= (unsigned)numberof(expr_names)) return 0;
- estr = expr_names[type - 1];
- if (!estr[0]) return 0;
- defs = GET_VM()->defined_strings;
- if (!defs) {
- defs = ruby_xcalloc(numberof(expr_names), sizeof(VALUE));
- GET_VM()->defined_strings = defs;
- }
- str = defs[type-1];
- if (!str) {
- str = rb_str_new_cstr(estr);;
- OBJ_FREEZE(str);
- defs[type-1] = str;
- }
- return str;
-}
-
/* ruby2cext */
VALUE
rb_iseq_build_for_ruby2cext(
const rb_iseq_t *iseq_template,
const rb_insn_func_t *func,
- const struct iseq_line_info_entry *line_info_table,
+ 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 *path,
- const unsigned short first_lineno)
+ const char *filename,
+ const unsigned short line_no)
{
unsigned long i;
VALUE iseqval = iseq_alloc(rb_cISeq);
@@ -2060,10 +1456,11 @@ rb_iseq_build_for_ruby2cext(
/* copy iseq */
*iseq = *iseq_template;
- iseq->location.label = rb_str_new2(name);
- iseq->location.path = rb_str_new2(path);
- iseq->location.first_lineno = first_lineno;
- iseq->mark_ary = 0;
+ 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);
+ OBJ_UNTRUST(iseq->mark_ary);
iseq->self = iseqval;
iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
@@ -2082,8 +1479,8 @@ rb_iseq_build_for_ruby2cext(
} \
} while (0)
- ALLOC_AND_COPY(iseq->line_info_table, line_info_table,
- struct iseq_line_info_entry, iseq->line_info_size);
+ 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);
@@ -2096,152 +1493,10 @@ rb_iseq_build_for_ruby2cext(
return iseqval;
}
-/* Experimental tracing support: trace(line) -> trace(specified_line)
- * MRI Specific.
- */
-
-int
-rb_iseq_line_trace_each(VALUE iseqval, int (*func)(int line, rb_event_flag_t *events_ptr, void *d), void *data)
-{
- int trace_num = 0;
- size_t pos, insn;
- rb_iseq_t *iseq;
- int cont = 1;
- GetISeqPtr(iseqval, iseq);
-
- for (pos = 0; cont && pos < iseq->iseq_size; pos += insn_len(insn)) {
- insn = iseq->iseq[pos];
-
- if (insn == BIN(trace)) {
- rb_event_flag_t current_events = (VALUE)iseq->iseq[pos+1];
-
- if (current_events & RUBY_EVENT_LINE) {
- rb_event_flag_t events = current_events & RUBY_EVENT_SPECIFIED_LINE;
- trace_num++;
-
- if (func) {
- int line = find_line_no(iseq, pos);
- /* printf("line: %d\n", line); */
- cont = (*func)(line, &events, data);
- if (current_events != events) {
- iseq->iseq[pos+1] = iseq->iseq_encoded[pos+1] =
- (VALUE)(current_events | (events & RUBY_EVENT_SPECIFIED_LINE));
- }
- }
- }
- }
- }
- return trace_num;
-}
-
-static int
-collect_trace(int line, rb_event_flag_t *events_ptr, void *ptr)
-{
- VALUE result = (VALUE)ptr;
- rb_ary_push(result, INT2NUM(line));
- return 1;
-}
-
-/*
- * <b>Experimental MRI specific feature, only available as C level api.</b>
- *
- * Returns all +specified_line+ events.
- */
-VALUE
-rb_iseq_line_trace_all(VALUE iseqval)
-{
- VALUE result = rb_ary_new();
- rb_iseq_line_trace_each(iseqval, collect_trace, (void *)result);
- return result;
-}
-
-struct set_specifc_data {
- int pos;
- int set;
- int prev; /* 1: set, 2: unset, 0: not found */
-};
-
-static int
-line_trace_specify(int line, rb_event_flag_t *events_ptr, void *ptr)
-{
- struct set_specifc_data *data = (struct set_specifc_data *)ptr;
-
- if (data->pos == 0) {
- data->prev = *events_ptr & RUBY_EVENT_SPECIFIED_LINE ? 1 : 2;
- if (data->set) {
- *events_ptr = *events_ptr | RUBY_EVENT_SPECIFIED_LINE;
- }
- else {
- *events_ptr = *events_ptr & ~RUBY_EVENT_SPECIFIED_LINE;
- }
- return 0; /* found */
- }
- else {
- data->pos--;
- return 1;
- }
-}
-
-/*
- * <b>Experimental MRI specific feature, only available as C level api.</b>
- *
- * Set a +specified_line+ event at the given line position, if the +set+
- * parameter is +true+.
- *
- * This method is useful for building a debugger breakpoint at a specific line.
- *
- * A TypeError is raised if +set+ is not boolean.
- *
- * If +pos+ is a negative integer a TypeError exception is raised.
- */
-VALUE
-rb_iseq_line_trace_specify(VALUE iseqval, VALUE pos, VALUE set)
-{
- struct set_specifc_data data;
-
- data.prev = 0;
- data.pos = NUM2INT(pos);
- if (data.pos < 0) rb_raise(rb_eTypeError, "`pos' is negative");
-
- switch (set) {
- case Qtrue: data.set = 1; break;
- case Qfalse: data.set = 0; break;
- default:
- rb_raise(rb_eTypeError, "`set' should be true/false");
- }
-
- rb_iseq_line_trace_each(iseqval, line_trace_specify, (void *)&data);
-
- if (data.prev == 0) {
- rb_raise(rb_eTypeError, "`pos' is out of range.");
- }
- return data.prev == 1 ? Qtrue : Qfalse;
-}
-
-/*
- * Document-class: RubyVM::InstructionSequence
- *
- * The InstructionSequence class represents a compiled sequence of
- * instructions for the Ruby Virtual Machine.
- *
- * With it, you can get a handle to the instructions that make up a method or
- * a proc, compile strings of Ruby code down to VM instructions, and
- * disassemble instruction sequences to strings for easy inspection. It is
- * mostly useful if you want to learn how the Ruby VM works, but it also lets
- * you control various settings for the Ruby iseq compiler.
- *
- * You can find the source for the VM instructions in +insns.def+ in the Ruby
- * source.
- *
- * The instruction sequence results will almost certainly change as Ruby
- * changes, so example output in this documentation may be different from what
- * you see.
- */
-
void
Init_ISeq(void)
{
- /* declare ::RubyVM::InstructionSequence */
+ /* 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);
@@ -2250,28 +1505,6 @@ Init_ISeq(void)
rb_define_method(rb_cISeq, "to_a", iseq_to_a, 0);
rb_define_method(rb_cISeq, "eval", iseq_eval, 0);
- /* location APIs */
- rb_define_method(rb_cISeq, "path", iseq_path, 0);
- rb_define_method(rb_cISeq, "absolute_path", iseq_absolute_path, 0);
- rb_define_method(rb_cISeq, "label", iseq_label, 0);
- rb_define_method(rb_cISeq, "base_label", iseq_base_label, 0);
- rb_define_method(rb_cISeq, "first_lineno", iseq_first_lineno, 0);
-
-#if 0
- /* Now, it is experimental. No discussions, no tests. */
- /* They can be used from C level. Please give us feedback. */
- rb_define_method(rb_cISeq, "line_trace_all", rb_iseq_line_trace_all, 0);
- rb_define_method(rb_cISeq, "line_trace_specify", rb_iseq_line_trace_specify, 2);
-#else
- (void)rb_iseq_line_trace_all;
- (void)rb_iseq_line_trace_specify;
-#endif
-
-#if 0 /* TBD */
- rb_define_private_method(rb_cISeq, "marshal_dump", iseq_marshal_dump, 0);
- rb_define_private_method(rb_cISeq, "marshal_load", iseq_marshal_load, 1);
-#endif
-
/* disable this feature because there is no verifier. */
/* rb_define_singleton_method(rb_cISeq, "load", iseq_s_load, -1); */
(void)iseq_s_load;
@@ -2283,5 +1516,5 @@ Init_ISeq(void)
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);
- rb_define_singleton_method(rb_cISeq, "of", iseq_s_of, 1);
}
+
diff --git a/iseq.h b/iseq.h
index 4de08169d8..d09cdd5414 100644
--- a/iseq.h
+++ b/iseq.h
@@ -12,10 +12,6 @@
#ifndef RUBY_COMPILE_H
#define RUBY_COMPILE_H
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
/* compile.c */
VALUE rb_iseq_compile_node(VALUE self, NODE *node);
int rb_iseq_translate_threaded_code(rb_iseq_t *iseq);
@@ -23,46 +19,34 @@ VALUE rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
VALUE exception, VALUE body);
/* iseq.c */
-void rb_iseq_add_mark_object(rb_iseq_t *iseq, VALUE obj);
VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
-VALUE rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc);
struct st_table *ruby_insn_make_insn_table(void);
-unsigned int rb_iseq_line_no(const rb_iseq_t *iseq, size_t pos);
-
-int rb_iseq_line_trace_each(VALUE iseqval, int (*func)(int line, rb_event_flag_t *events_ptr, void *d), void *data);
-VALUE rb_iseq_line_trace_all(VALUE iseqval);
-VALUE rb_iseq_line_trace_specify(VALUE iseqval, VALUE pos, VALUE set);
-
-/* proc.c */
-rb_iseq_t *rb_method_get_iseq(VALUE body);
-rb_iseq_t *rb_proc_get_iseq(VALUE proc, int *is_proc);
-
-struct rb_compile_option_struct {
- int inline_const_cache;
- int peephole_optimization;
- int tailcall_optimization;
- int specialized_instruction;
- int operands_unification;
- int instructions_unification;
- int stack_caching;
- int trace_instruction;
- int debug_level;
-};
-struct iseq_line_info_entry {
- unsigned int position;
- unsigned int line_no;
+#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 ((int)INT2FIX(1))
+#define CATCH_TYPE_ENSURE ((int)INT2FIX(2))
+#define CATCH_TYPE_RETRY ((int)INT2FIX(3))
+#define CATCH_TYPE_BREAK ((int)INT2FIX(4))
+#define CATCH_TYPE_REDO ((int)INT2FIX(5))
+#define CATCH_TYPE_NEXT ((int)INT2FIX(6))
+
+struct iseq_insn_info_entry {
+ unsigned short position;
+ unsigned short line_no;
+ unsigned short sp;
};
struct iseq_catch_table_entry {
- enum catch_type {
- CATCH_TYPE_RESCUE = INT2FIX(1),
- CATCH_TYPE_ENSURE = INT2FIX(2),
- CATCH_TYPE_RETRY = INT2FIX(3),
- CATCH_TYPE_BREAK = INT2FIX(4),
- CATCH_TYPE_REDO = INT2FIX(5),
- CATCH_TYPE_NEXT = INT2FIX(6)
- } type;
+ VALUE type;
VALUE iseq;
unsigned long start;
unsigned long end;
@@ -99,42 +83,22 @@ struct iseq_compile_data {
struct iseq_compile_data_storage *storage_current;
int last_line;
int last_coverable_line;
+ int flip_cnt;
int label_no;
int node_level;
const rb_compile_option_t *option;
-#if SUPPORT_JOKE
- st_table *labels_table;
-#endif
};
/* defined? */
-
-enum defined_type {
- DEFINED_NIL = 1,
- DEFINED_IVAR,
- DEFINED_LVAR,
- DEFINED_GVAR,
- DEFINED_CVAR,
- DEFINED_CONST,
- DEFINED_METHOD,
- DEFINED_YIELD,
- DEFINED_ZSUPER,
- DEFINED_SELF,
- DEFINED_TRUE,
- DEFINED_FALSE,
- DEFINED_ASGN,
- DEFINED_EXPR,
- DEFINED_IVAR2,
- DEFINED_REF,
- DEFINED_FUNC
-};
-
-VALUE rb_iseq_defined_string(enum defined_type type);
-
-#define DEFAULT_SPECIAL_VAR_COUNT 2
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
+#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/lib/.document b/lib/.document
new file mode 100644
index 0000000000..d3c4a1369b
--- /dev/null
+++ b/lib/.document
@@ -0,0 +1,107 @@
+# We only run RDoc on the top-level files in here: we skip
+# all the helper stuff in sub-directories
+
+# Eventually, we hope to see...
+# *.rb
+
+# But for now
+
+English.rb
+Env.rb
+README
+abbrev.rb
+base64.rb
+benchmark.rb
+cgi
+cgi.rb
+complex.rb
+csv.rb
+date
+date.rb
+date2.rb
+debug.rb
+delegate.rb
+drb
+drb.rb
+erb.rb
+eregex.rb
+fileutils.rb
+finalize.rb
+find.rb
+forwardable.rb
+ftools.rb
+generator.rb
+getoptlong.rb
+getopts.rb
+gserver.rb
+importenv.rb
+ipaddr.rb
+irb
+irb.rb
+jcode.rb
+logger.rb
+mailread.rb
+mathn.rb
+matrix.rb
+mkmf.rb
+monitor.rb
+mutex_m.rb
+net
+observer.rb
+open-uri.rb
+open3.rb
+optparse
+optparse.rb
+ostruct.rb
+parsearg.rb
+parsedate.rb
+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
+resolv.rb
+rexml
+rinda
+rss
+rss.rb
+rubyunit.rb
+runit
+scanf.rb
+set.rb
+shell
+shell.rb
+shellwords.rb
+# TODO: YARV cause error. why ...?
+# singleton.rb
+soap
+sync.rb
+tempfile.rb
+test
+thread.rb
+thwait.rb
+time.rb
+timeout.rb
+tmpdir.rb
+tracer.rb
+tsort.rb
+un.rb
+uri
+uri.rb
+weakref.rb
+webrick
+webrick.rb
+wsdl
+xmlrpc
+xsd
+yaml
+yaml.rb
diff --git a/lib/English.rb b/lib/English.rb
index 32769fb18b..4fd53c5ec6 100644
--- a/lib/English.rb
+++ b/lib/English.rb
@@ -15,37 +15,7 @@
# $OUTPUT_FIELD_SEPARATOR = ' -- '
# "waterbuffalo" =~ /buff/
# print $LOADED_FEATURES, $POSTMATCH, $PID, "\n"
-#
-# Below is a full list of descriptive aliases and their associated global
-# variable:
-#
-# $ERROR_INFO:: $!
-# $ERROR_POSITION:: $@
-# $FS:: $;
-# $FIELD_SEPARATOR:: $;
-# $OFS:: $,
-# $OUTPUT_FIELD_SEPARATOR:: $,
-# $RS:: $/
-# $INPUT_RECORD_SEPARATOR:: $/
-# $ORS:: $\
-# $OUTPUT_RECORD_SEPARATOR:: $\
-# $INPUT_LINE_NUMBER:: $.
-# $NR:: $.
-# $LAST_READ_LINE:: $_
-# $DEFAULT_OUTPUT:: $>
-# $DEFAULT_INPUT:: $<
-# $PID:: $$
-# $PROCESS_ID:: $$
-# $CHILD_STATUS:: $?
-# $LAST_MATCH_INFO:: $~
-# $IGNORECASE:: $=
-# $ARGV:: $*
-# $MATCH:: $&
-# $PREMATCH:: $`
-# $POSTMATCH:: $'
-# $LAST_PAREN_MATCH:: $+
-#
-module English end if false
+
# The exception object passed to +raise+.
alias $ERROR_INFO $!
@@ -149,7 +119,7 @@ alias $CHILD_STATUS $?
# and <tt>$1</tt> to <tt>$9</tt> are all derived from
# <tt>$~</tt>. Assigning to <tt>$~</tt> changes the values of these
# derived variables. This variable is local to the current
-# scope.
+# scope. Thread local.
alias $LAST_MATCH_INFO $~
# If set to any value apart from +nil+ or +false+, all pattern matches
@@ -165,21 +135,21 @@ alias $ARGV $*
# The string matched by the last successful pattern
# match. This variable is local to the current
-# scope. Read only.
+# scope. Read only. Thread local.
alias $MATCH $&
# The string preceding the match in the last
# successful pattern match. This variable is local to
-# the current scope. Read only.
+# 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
-# the current scope. Read only.
+# the current scope. Read only. Thread local.
alias $POSTMATCH $'
# The contents of the highest-numbered group matched in the last
# successful pattern match. Thus, in <tt>"cat" =~ /(c|a)(t|z)/</tt>,
# <tt>$+</tt> will be set to "t". This variable is local to the
-# current scope. Read only.
+# current scope. Read only. Thread local.
alias $LAST_PAREN_MATCH $+
diff --git a/lib/README b/lib/README
new file mode 100644
index 0000000000..a8bb9c8d3d
--- /dev/null
+++ b/lib/README
@@ -0,0 +1,93 @@
+English.rb lets Perl'ish global variables have English names
+README this file
+abbrev.rb abbreviation calculator
+base64.rb Base64 de- and encoder
+benchmark.rb a benchmark utility
+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)
+csv.rb CSV parser/generator
+date.rb date object
+date/format.rb date parsing and formatting
+debug.rb ruby debugger
+delegate.rb delegates messages to other object
+drb.rb distributed Ruby
+e2mmap.rb exception utilities
+erb.rb tiny eRuby library
+fileutils.rb file utilities
+find.rb traverses directory tree
+forwardable.rb explicit delegation library
+gauntlet_rubygems.rb Gem package validator
+getoptlong.rb GNU getoptlong compatible
+gserver.rb general TCP server
+ipaddr.rb defines the IPAddr class
+irb.rb interactive ruby
+logger.rb simple logging utility
+mathn.rb extended math operation (obsolete)
+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)
+net/smtp.rb SMTP access
+net/telnet.rb telnet library
+observer.rb observer desing pattern library (provides Observable)
+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
+pathname.rb Object-Oriented Pathname Class
+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
+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
+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
+sync.rb 2 phase lock
+tempfile.rb temporary file with automatic removal
+test/unit Ruby Unit Testing Framework
+thread.rb thread support
+thwait.rb thread syncronization class
+time.rb RFC2822, RFC2616, ISO8601 style time formatting/parsing
+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
+xmlrpc XML-RPC implementation
+yaml.rb YAML implementation
diff --git a/lib/abbrev.rb b/lib/abbrev.rb
index 841f6d980e..6530679681 100755..100644
--- a/lib/abbrev.rb
+++ b/lib/abbrev.rb
@@ -1,5 +1,6 @@
#!/usr/bin/env ruby
-#--
+=begin
+#
# Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
#
# All rights reserved. You can redistribute and/or modify it under
@@ -8,86 +9,62 @@
# $Idaemons: /home/cvs/rb/abbrev.rb,v 1.2 2001/05/30 09:37:45 knu Exp $
# $RoughId: abbrev.rb,v 1.4 2003/10/14 19:45:42 knu Exp $
# $Id$
-#++
+=end
-##
-# Calculates the set of unique abbreviations for a given set of strings.
+# Calculate the set of unique abbreviations for a given set of strings.
#
# require 'abbrev'
# require 'pp'
#
-# pp Abbrev.abbrev(['ruby', 'rules'])
-#
-# Generates:
+# pp Abbrev::abbrev(['ruby', 'rules']).sort
#
-# { "rub" => "ruby",
-# "ruby" => "ruby",
-# "rul" => "rules",
-# "rule" => "rules",
-# "rules" => "rules" }
+# <i>Generates:</i>
#
-# It also provides an array core extension, Array#abbrev.
+# [["rub", "ruby"],
+# ["ruby", "ruby"],
+# ["rul", "rules"],
+# ["rule", "rules"],
+# ["rules", "rules"]]
#
-# pp %w{summer winter}.abbrev
-# #=> {"summe"=>"summer",
-# "summ"=>"summer",
-# "sum"=>"summer",
-# "su"=>"summer",
-# "s"=>"summer",
-# "winte"=>"winter",
-# "wint"=>"winter",
-# "win"=>"winter",
-# "wi"=>"winter",
-# "w"=>"winter",
-# "summer"=>"summer",
-# "winter"=>"winter"}
+# Also adds an +abbrev+ method to class +Array+.
module Abbrev
# Given a set of strings, calculate the set of unambiguous
# abbreviations for those strings, and return a hash where the keys
# are all the possible abbreviations and the values are the full
- # strings.
- #
- # Thus, given +words+ is "car" and "cone", the keys pointing to "car" would
- # be "ca" and "car", while those pointing to "cone" would be "co", "con", and
- # "cone".
- #
- # require 'abbrev'
- #
- # Abbrev.abbrev(['car', 'cone'])
- # #=> {"ca"=>"car", "con"=>"cone", "co"=>"cone", "car"=>"car", "cone"=>"cone"}
+ # strings. Thus, given input of "car" and "cone", the keys pointing
+ # to "car" would be "ca" and "car", while those pointing to "cone"
+ # would be "co", "con", and "cone".
#
# The optional +pattern+ parameter is a pattern or a string. Only
- # input strings that match the pattern or start with the string
- # are included in the output hash.
- #
- # Abbrev.abbrev(%w{car box cone}, /b/)
- # #=> {"bo"=>"box", "b"=>"box", "box"=>"box"}
+ # those input strings matching the pattern, or begging the string,
+ # are considered for inclusion in the output hash
+
def abbrev(words, pattern = nil)
table = {}
seen = Hash.new(0)
if pattern.is_a?(String)
- pattern = /\A#{Regexp.quote(pattern)}/ # regard as a prefix
+ pattern = /^#{Regexp.quote(pattern)}/ # regard as a prefix
end
words.each do |word|
- next if word.empty?
- word.size.downto(1) { |len|
- abbrev = word[0...len]
+ next if (abbrev = word).empty?
+ while (len = abbrev.rindex(/[\w\W]\z/)) > 0
+ abbrev = word[0,len]
- next if pattern && pattern !~ abbrev
+ next if pattern && pattern !~ abbrev
- case seen[abbrev] += 1
- when 1
- table[abbrev] = word
- when 2
- table.delete(abbrev)
- else
- break
- end
- }
+ case seen[abbrev] += 1
+ when 1
+ table[abbrev] = word
+ when 2
+ table.delete(abbrev)
+ else
+ break
+ end
+ end
end
words.each do |word|
@@ -104,22 +81,12 @@ end
class Array
# Calculates the set of unambiguous abbreviations for the strings in
- # +self+.
- #
- # require 'abbrev'
- # %w{ car cone }.abbrev
- # #=> {"ca" => "car", "con"=>"cone", "co" => "cone",
- # "car"=>"car", "cone" => "cone"}
- #
- # The optional +pattern+ parameter is a pattern or a string. Only
- # input strings that match the pattern or start with the string
- # are included in the output hash.
- #
- # %w{ fast boat day }.abbrev(/^.a/)
- # #=> {"fas"=>"fast", "fa"=>"fast", "da"=>"day",
- # "fast"=>"fast", "day"=>"day"}
+ # +self+. If passed a pattern or a string, only the strings matching
+ # the pattern or starting with the string are considered.
#
- # See also Abbrev.abbrev
+ # %w{ car cone }.abbrev #=> { "ca" => "car", "car" => "car",
+ # "co" => "cone", "con" => cone",
+ # "cone" => "cone" }
def abbrev(pattern = nil)
Abbrev::abbrev(self, pattern)
end
diff --git a/lib/benchmark.rb b/lib/benchmark.rb
index f52ba7df34..d06b434c65 100644
--- a/lib/benchmark.rb
+++ b/lib/benchmark.rb
@@ -1,4 +1,5 @@
-#--
+=begin
+#
# benchmark.rb - a performance benchmarking library
#
# $Id$
@@ -7,8 +8,9 @@
#
# Documentation by Gotoken (original RD), Lyle Johnson (RDoc conversion), and
# Gavin Sinclair (editing).
-#++
#
+=end
+
# == Overview
#
# The Benchmark module provides methods for benchmarking Ruby code, giving
@@ -19,7 +21,7 @@
# used to execute Ruby code.
#
# * Measure the time to construct the string given by the expression
-# <code>"a"*1_000_000</code>:
+# <tt>"a"*1_000_000</tt>:
#
# require 'benchmark'
#
@@ -101,10 +103,10 @@
# using the #benchmark method:
#
# require 'benchmark'
-# include Benchmark # we need the CAPTION and FORMAT constants
+# include Benchmark # we need the CAPTION and FMTSTR constants
#
# n = 50000
-# Benchmark.benchmark(CAPTION, 7, FORMAT, ">total:", ">avg:") do |x|
+# Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
# tf = x.report("for:") { for i in 1..n; a = "1"; end }
# tt = x.report("times:") { n.times do ; a = "1"; end }
# tu = x.report("upto:") { 1.upto(n) do ; a = "1"; end }
@@ -122,18 +124,21 @@
module Benchmark
- BENCHMARK_VERSION = "2002-04-25" # :nodoc:
+ BENCHMARK_VERSION = "2002-04-25" #:nodoc"
+
+ def Benchmark::times() # :nodoc:
+ Process::times()
+ end
- # Invokes the block with a Benchmark::Report object, which
+
+ # Invokes the block with a <tt>Benchmark::Report</tt> object, which
# may be used to collect and report on the results of individual
- # benchmark tests. Reserves +label_width+ leading spaces for
- # labels on each line. Prints +caption+ at the top of the
- # report, and uses +format+ to format each line.
- # Returns an array of Benchmark::Tms objects.
- #
+ # benchmark tests. Reserves <i>label_width</i> leading spaces for
+ # labels on each line. Prints _caption_ at the top of the
+ # report, and uses _fmt_ to format each line.
# If the block returns an array of
- # Benchmark::Tms objects, these will be used to format
- # additional lines of output. If +label+ parameters are
+ # <tt>Benchmark::Tms</tt> objects, these will be used to format
+ # additional lines of output. If _label_ parameters are
# given, these are used to label these extra lines.
#
# _Note_: Other methods provide a simpler interface to this one, and are
@@ -143,17 +148,17 @@ module Benchmark
# Example:
#
# require 'benchmark'
- # include Benchmark # we need the CAPTION and FORMAT constants
+ # include Benchmark # we need the CAPTION and FMTSTR constants
#
# n = 50000
- # Benchmark.benchmark(CAPTION, 7, FORMAT, ">total:", ">avg:") do |x|
+ # Benchmark.benchmark(" "*7 + CAPTION, 7, FMTSTR, ">total:", ">avg:") do |x|
# tf = x.report("for:") { for i in 1..n; a = "1"; end }
# tt = x.report("times:") { n.times do ; a = "1"; end }
# tu = x.report("upto:") { 1.upto(n) do ; a = "1"; end }
# [tf+tt+tu, (tf+tt+tu)/3]
# end
#
- # Generates:
+ # <i>Generates:</i>
#
# user system total real
# for: 1.016667 0.016667 1.033333 ( 0.485749)
@@ -163,27 +168,24 @@ module Benchmark
# >avg: 1.333333 0.011111 1.344444 ( 0.629761)
#
- def benchmark(caption = "", label_width = nil, format = nil, *labels) # :yield: report
+ def benchmark(caption = "", label_width = nil, fmtstr = nil, *labels) # :yield: report
sync = STDOUT.sync
STDOUT.sync = true
label_width ||= 0
- label_width += 1
- format ||= FORMAT
- print ' '*label_width + caption unless caption.empty?
- report = Report.new(label_width, format)
- results = yield(report)
+ fmtstr ||= FMTSTR
+ raise ArgumentError, "no block" unless iterator?
+ 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), t.format(format))
+ print((labels.shift || t.label || "").ljust(label_width),
+ t.format(fmtstr))
}
- report.list
- ensure
- STDOUT.sync = sync unless sync.nil?
+ STDOUT.sync = sync
end
- # A simple interface to the #benchmark method, #bm is generates sequential
- # reports with labels. The parameters have the same meaning as for
- # #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'
#
@@ -194,7 +196,7 @@ module Benchmark
# x.report("upto:") { 1.upto(n) do ; a = "1"; end }
# end
#
- # Generates:
+ # <i>Generates:</i>
#
# user system total real
# for: 1.050000 0.000000 1.050000 ( 0.503462)
@@ -203,7 +205,7 @@ module Benchmark
#
def bm(label_width = 0, *labels, &blk) # :yield: report
- benchmark(CAPTION, label_width, FORMAT, *labels, &blk)
+ benchmark(" "*label_width + CAPTION, label_width, FMTSTR, *labels, &blk)
end
@@ -212,7 +214,7 @@ module Benchmark
# that run later. #bmbm attempts to minimize this effect by running
# the tests twice, the first time as a rehearsal in order to get the
# runtime environment stable, the second time for
- # real. GC.start is executed before the start of each of
+ # real. <tt>GC.start</tt> is executed before the start of each of
# the real timings; the cost of this is not included in the
# timings. In reality, though, there's only so much that #bmbm can
# do, and the results are not guaranteed to be isolated from garbage
@@ -230,7 +232,7 @@ module Benchmark
# x.report("sort") { array.dup.sort }
# end
#
- # Generates:
+ # <i>Generates:</i>
#
# Rehearsal -----------------------------------------
# sort! 11.928000 0.010000 11.938000 ( 12.756000)
@@ -244,30 +246,42 @@ module Benchmark
# #bmbm yields a Benchmark::Job object and returns an array of
# Benchmark::Tms objects.
#
- def bmbm(width = 0) # :yield: job
+ def bmbm(width = 0, &blk) # :yield: job
job = Job.new(width)
yield(job)
- width = job.width + 1
+ width = job.width
sync = STDOUT.sync
STDOUT.sync = true
# rehearsal
- puts 'Rehearsal '.ljust(width+CAPTION.length,'-')
- ets = job.list.inject(Tms.new) { |sum,(label,item)|
- print label.ljust(width)
- res = Benchmark.measure(&item)
- print res.format
- sum + res
- }.format("total: %tsec")
- print " #{ets}\n\n".rjust(width+CAPTION.length+2,'-')
+ print "Rehearsal "
+ puts '-'*(width+CAPTION.length - "Rehearsal ".length)
+ list = []
+ job.list.each{|label,item|
+ print(label.ljust(width))
+ res = Benchmark::measure(&item)
+ print res.format()
+ list.push res
+ }
+ sum = Tms.new; list.each{|i| sum += i}
+ ets = sum.format("total: %tsec")
+ printf("%s %s\n\n",
+ "-"*(width+CAPTION.length-ets.length-1), ets)
# take
- print ' '*width + CAPTION
- job.list.map { |label,item|
- GC.start
+ print ' '*width, CAPTION
+ list = []
+ ary = []
+ job.list.each{|label,item|
+ GC::start
print label.ljust(width)
- Benchmark.measure(label, &item).tap { |res| print res }
+ res = Benchmark::measure(&item)
+ print res.format()
+ ary.push res
+ list.push [label, res]
}
+
+ ary
ensure
STDOUT.sync = sync unless sync.nil?
end
@@ -277,27 +291,28 @@ module Benchmark
# Benchmark::Tms object.
#
def measure(label = "") # :yield:
- t0, r0 = Process.times, Time.now
+ t0, r0 = Benchmark.times, Time.now
yield
- t1, r1 = Process.times, Time.now
+ 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,
- r1 - r0,
+ r1.to_f - r0.to_f,
label)
end
#
# Returns the elapsed real time used to execute the given block.
#
- def realtime # :yield:
+ def realtime(&blk) # :yield:
r0 = Time.now
yield
- Time.now - r0
+ r1 = Time.now
+ r1.to_f - r0.to_f
end
- module_function :benchmark, :measure, :realtime, :bm, :bmbm
+
#
# A Job is a sequence of labelled blocks to be processed by the
@@ -308,8 +323,8 @@ module Benchmark
# Returns an initialized Job instance.
# 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.
+ # _width_ is a initial value for the label offset used in formatting;
+ # the #bmbm method passes its _width_ argument to this constructor.
#
def initialize(width)
@width = width
@@ -321,10 +336,10 @@ module Benchmark
#
def item(label = "", &blk) # :yield:
raise ArgumentError, "no block" unless block_given?
- label = label.to_s
+ label += ' '
w = label.length
@width = w if @width < w
- @list << [label, blk]
+ @list.push [label, blk]
self
end
@@ -333,10 +348,14 @@ module Benchmark
# An array of 2-element arrays, consisting of label and block pairs.
attr_reader :list
- # Length of the widest label in the #list.
+ # Length of the widest label in the #list, plus one.
attr_reader :width
end
+ module_function :benchmark, :measure, :realtime, :bm, :bmbm
+
+
+
#
# This class is used by the Benchmark.benchmark and Benchmark.bm methods.
# It is of little direct interest to the user.
@@ -346,29 +365,26 @@ 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 +format+ are the label offset and
+ # _width_ and _fmtstr_ are the label offset and
# format string used by Tms#format.
#
- def initialize(width = 0, format = nil)
- @width, @format, @list = width, format, []
+ def initialize(width = 0, fmtstr = nil)
+ @width, @fmtstr = width, fmtstr
end
#
- # Prints the +label+ and measured time for the block,
- # formatted by +format+. See Tms#format for the
+ # Prints the _label_ and measured time for the block,
+ # formatted by _fmt_. See Tms#format for the
# formatting rules.
#
- def item(label = "", *format, &blk) # :yield:
- print label.to_s.ljust(@width)
- @list << res = Benchmark.measure(label, &blk)
- print res.format(@format, *format)
+ def item(label = "", *fmt, &blk) # :yield:
+ print label.ljust(@width)
+ res = Benchmark::measure(&blk)
+ print res.format(@fmtstr, *fmt)
res
end
alias report item
-
- # An array of Benchmark::Tms objects representing each item.
- attr_reader :list
end
@@ -378,12 +394,8 @@ module Benchmark
# measurement.
#
class Tms
-
- # Default caption, see also Benchmark::CAPTION
CAPTION = " user system total real\n"
-
- # Default format string, see also Benchmark::FORMAT
- FORMAT = "%10.6u %10.6y %10.6t %10.6r\n"
+ FMTSTR = "%10.6u %10.6y %10.6t %10.6r\n"
# User CPU time
attr_reader :utime
@@ -400,7 +412,7 @@ module Benchmark
# 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
@@ -408,28 +420,29 @@ module Benchmark
#
# Returns an initialized Tms object which has
- # +utime+ as the user CPU time, +stime+ as the system CPU time,
- # +cutime+ as the children's user CPU time, +cstime+ as the children's
- # system CPU time, +real+ as the elapsed real time and +label+ as the label.
+ # _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.
#
- def initialize(utime = 0.0, stime = 0.0, cutime = 0.0, cstime = 0.0, real = 0.0, label = nil)
- @utime, @stime, @cutime, @cstime, @real, @label = utime, stime, cutime, cstime, real, label.to_s
+ 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+).
+ # 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!(&blk)
- t = Benchmark.measure(&blk)
+ t = Benchmark::measure(&blk)
@utime = utime + t.utime
@stime = stime + t.stime
@cutime = cutime + t.cutime
@@ -480,19 +493,19 @@ module Benchmark
# <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 _format_ is not given, FORMAT is used as default value, detailing the
+ # If _fmtstr_ is not given, FMTSTR is used as default value, detailing the
# user, system and real elapsed time.
#
- def format(format = nil, *args)
- str = (format || FORMAT).dup
- str.gsub!(/(%[-+.\d]*)n/) { "#{$1}s" % label }
- str.gsub!(/(%[-+.\d]*)u/) { "#{$1}f" % utime }
- str.gsub!(/(%[-+.\d]*)y/) { "#{$1}f" % stime }
- str.gsub!(/(%[-+.\d]*)U/) { "#{$1}f" % cutime }
- str.gsub!(/(%[-+.\d]*)Y/) { "#{$1}f" % cstime }
- str.gsub!(/(%[-+.\d]*)t/) { "#{$1}f" % total }
- str.gsub!(/(%[-+.\d]*)r/) { "(#{$1}f)" % real }
- format ? str % args : str
+ def format(arg0 = nil, *args)
+ fmtstr = (arg0 || FMTSTR).dup
+ fmtstr.gsub!(/(%[-+\.\d]*)n/){"#{$1}s" % label}
+ fmtstr.gsub!(/(%[-+\.\d]*)u/){"#{$1}f" % utime}
+ fmtstr.gsub!(/(%[-+\.\d]*)y/){"#{$1}f" % stime}
+ fmtstr.gsub!(/(%[-+\.\d]*)U/){"#{$1}f" % cutime}
+ fmtstr.gsub!(/(%[-+\.\d]*)Y/){"#{$1}f" % cstime}
+ fmtstr.gsub!(/(%[-+\.\d]*)t/){"#{$1}f" % total}
+ fmtstr.gsub!(/(%[-+\.\d]*)r/){"(#{$1}f)" % real}
+ arg0 ? Kernel::format(fmtstr, *args) : fmtstr
end
#
@@ -513,15 +526,6 @@ module Benchmark
end
protected
-
- #
- # Returns a new Tms object obtained by memberwise operation +op+
- # of the individual times for this Tms object with those of the other
- # Tms object.
- #
- # +op+ can be a mathematical operation such as <tt>+</tt>, <tt>-</tt>,
- # <tt>*</tt>, <tt>/</tt>
- #
def memberwise(op, x)
case x
when Benchmark::Tms
@@ -546,7 +550,7 @@ module Benchmark
CAPTION = Benchmark::Tms::CAPTION
# The default format string used to display times. See also Benchmark::Tms#format.
- FORMAT = Benchmark::Tms::FORMAT
+ FMTSTR = Benchmark::Tms::FMTSTR
end
if __FILE__ == $0
@@ -554,17 +558,17 @@ if __FILE__ == $0
n = ARGV[0].to_i.nonzero? || 50000
puts %Q([#{n} times iterations of `a = "1"'])
- benchmark(CAPTION, 7, FORMAT) do |x|
- x.report("for:") {for _ in 1..n; _ = "1"; end} # Benchmark.measure
- x.report("times:") {n.times do ; _ = "1"; end}
- x.report("upto:") {1.upto(n) do ; _ = "1"; end}
+ benchmark(" " + CAPTION, 7, FMTSTR) do |x|
+ x.report("for:") {for i in 1..n; a = "1"; end} # Benchmark::measure
+ x.report("times:") {n.times do ; a = "1"; end}
+ x.report("upto:") {1.upto(n) do ; a = "1"; end}
end
benchmark do
[
- measure{for _ in 1..n; _ = "1"; end}, # Benchmark.measure
- measure{n.times do ; _ = "1"; end},
- measure{1.upto(n) do ; _ = "1"; end}
+ measure{for i in 1..n; a = "1"; end}, # Benchmark::measure
+ measure{n.times do ; a = "1"; end},
+ measure{1.upto(n) do ; a = "1"; end}
]
end
end
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 1c5ccd369f..3af271523b 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -9,25 +9,31 @@
#
# Documentation: Wakou Aoyama (RDoc'd and embellished by William Webber)
#
-
-raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
-
# == Overview
#
-# The Common Gateway Interface (CGI) is a simple protocol for passing an HTTP
-# request from a web server to a standalone program, and returning the output
-# to the web browser. Basically, a CGI program is called with the 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.
+# The Common Gateway Interface (CGI) is a simple protocol
+# for passing an HTTP request from a web server to a
+# standalone program, and returning the output to the web
+# browser. Basically, a CGI program is called with the
+# 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.
+# This file holds the +CGI+ class. This class provides
+# functionality for retrieving HTTP request parameters,
+# managing cookies, and generating HTML output. See the
+# class documentation for more details and examples of use.
#
-# The file CGI::Session provides session management functionality; see that
-# class for more details.
+# The file cgi/session.rb provides session management
+# functionality; see that file for more details.
#
-# See http://www.w3.org/CGI/ for more information on the CGI protocol.
+# 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"
+
+# CGI class. See documentation for the file cgi.rb for an overview
+# of the CGI protocol.
#
# == Introduction
#
@@ -122,7 +128,7 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
#
# The simplest way to send output to the HTTP client is using the #out() method.
# This takes the HTTP headers as a hash parameter, and the body content
-# via a block. The headers can be generated as a string using the #http_header()
+# via a block. The headers can be generated as a string using the #header()
# method. The output stream can be written directly to using the #print()
# method.
#
@@ -234,26 +240,22 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
# === Print http header and html string to $DEFAULT_OUTPUT ($>)
#
# require "cgi"
-# cgi = CGI.new("html4") # add HTML generation methods
-# cgi.out do
-# cgi.html do
-# cgi.head do
-# cgi.title { "TITLE" }
-# end +
-# cgi.body do
-# cgi.form("ACTION" => "uri") do
-# cgi.p do
-# cgi.textarea("get_text") +
-# cgi.br +
-# cgi.submit
-# end
+# cgi = CGI.new("html3") # add HTML generation methods
+# cgi.out() do
+# cgi.html() do
+# cgi.head{ cgi.title{"TITLE"} } +
+# cgi.body() do
+# cgi.form() do
+# cgi.textarea("get_text") +
+# cgi.br +
+# cgi.submit
# end +
-# cgi.pre do
+# cgi.pre() do
# CGI::escapeHTML(
-# "params: #{cgi.params.inspect}\n" +
-# "cookies: #{cgi.cookies.inspect}\n" +
-# ENV.collect do |key, value|
-# "#{key} --> #{value}\n"
+# "params: " + cgi.params.inspect + "\n" +
+# "cookies: " + cgi.cookies.inspect + "\n" +
+# ENV.collect() do |key, value|
+# key + " --> " + value + "\n"
# end.join("")
# )
# end
@@ -266,12 +268,7 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
# CGI.new("html4") # html4.01 (Strict)
# CGI.new("html4Tr") # html4.01 Transitional
# CGI.new("html4Fr") # html4.01 Frameset
-# CGI.new("html5") # html5
#
-
-class CGI
-end
-
require 'cgi/core'
require 'cgi/cookie'
require 'cgi/util'
diff --git a/lib/cgi/.document b/lib/cgi/.document
new file mode 100644
index 0000000000..4153f97aa5
--- /dev/null
+++ b/lib/cgi/.document
@@ -0,0 +1 @@
+session.rb \ No newline at end of file
diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
index a26bd16c32..97a92efc3a 100644
--- a/lib/cgi/cookie.rb
+++ b/lib/cgi/cookie.rb
@@ -1,67 +1,58 @@
-require 'cgi/util'
+# 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
@@accept_charset="UTF-8" unless defined?(@@accept_charset)
- # 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 < Array
# Create a new CGI::Cookie object.
#
- # :call-seq:
- # Cookie.new(name_string,*value)
- # Cookie.new(options_hash)
+ # 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_string+::
- # The name of the cookie; in this form, there is no #domain or
- # #expiration. The #path is gleaned from the +SCRIPT_NAME+ environment
- # variable, and #secure is false.
- # <tt>*value</tt>::
- # value or list of values of the cookie
- # +options_hash+::
- # A Hash of options to initialize this Cookie. Possible options are:
+ # 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.
#
- # 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
- # the value of the +SCRIPT_NAME+ environment variable.
- # 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.
+ # These keywords correspond to attributes of the cookie object.
def initialize(name = "", *value)
@domain = nil
@expires = nil
@@ -94,23 +85,13 @@ class CGI
super(value)
end
- # Name of this cookie, as a +String+
- attr_accessor :name
- # Path for which this cookie applies, as a +String+
- attr_accessor :path
- # Domain for which this cookie applies, as a +String+
- attr_accessor :domain
- # Time at which this cookie expires, as a +Time+
- attr_accessor :expires
- # True if this cookie is secure; false otherwise
+ attr_accessor("name", "path", "domain", "expires")
attr_reader("secure")
- # Returns the value or list of values for this cookie.
def value
self
end
- # Replaces the value of this cookie with a new value or list of values.
def value=(val)
replace(Array(val))
end
@@ -136,6 +117,7 @@ class CGI
end # class Cookie
+
# Parse a raw cookie string into a hash of cookie-name=>Cookie
# pairs.
#
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 1ab8e8c7d9..41efea9c72 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -1,7 +1,3 @@
-#--
-# Methods for generating HTML, parsing CGI-related parameters, and
-# generating HTTP responses.
-#++
class CGI
$CGI_ENV = ENV # for FCGI support
@@ -17,7 +13,6 @@ class CGI
REVISION = '$Id$' #:nodoc:
- # Whether processing will be required in binary vs text
NEEDS_BINMODE = File::BINARY != 0
# Path separators in different environments.
@@ -47,109 +42,98 @@ class CGI
# :startdoc:
- # Synonym for ENV.
def env_table
ENV
end
- # Synonym for $stdin.
def stdinput
$stdin
end
- # Synonym for $stdout.
def stdoutput
$stdout
end
private :env_table, :stdinput, :stdoutput
+
# Create an HTTP header block as a string.
#
- # :call-seq:
- # http_header(content_type_string="text/html")
- # http_header(headers_hash)
- #
# Includes the empty line that ends the header block.
#
- # +content_type_string+::
- # If this form is used, this string is the <tt>Content-Type</tt>
- # +headers_hash+::
- # A Hash of header values. 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 as a String, returned as the Status header. The
- # values 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
- #
- # 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 headers can also be set; they are appended as key: value.
- #
- # Examples:
- #
- # http_header
+ # +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
#
- # http_header("text/plain")
+ # header("text/plain")
# # Content-Type: text/plain
#
- # http_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")
+ # 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 http_header(options='text/html')
+ def header(options='text/html')
if options.is_a?(String)
content_type = options
buf = _header_for_string(content_type)
@@ -170,15 +154,7 @@ class CGI
buf << EOL # empty line of separator
return buf
end
- end # http_header()
-
- # This method is an alias for #http_header, when HTML5 tag maker is inactive.
- #
- # NOTE: use #http_header to create HTTP header blocks, this alias is only
- # provided for backwards compatibility.
- #
- # Using #header with the HTML5 tag maker will create a <header> element.
- alias :header :http_header
+ end # header()
def _header_for_string(content_type) #:nodoc:
buf = ''
@@ -281,30 +257,13 @@ class CGI
return ''
end
private :_header_for_modruby
+ #
# Print an HTTP header and body to $DEFAULT_OUTPUT ($>)
#
- # :call-seq:
- # cgi.out(content_type_string='text/html')
- # cgi.out(headers_hash)
- #
- # +content_type_string+::
- # If a string is passed, it is assumed to be the content type.
- # +headers_hash+::
- # This is a Hash of headers, similar to that used by #http_header.
- # +block+::
- # A block is required and should evaluate to the body of the response.
- #
- # <tt>Content-Length</tt> is automatically calculated from the size of
- # the String returned by the content block.
- #
- # If <tt>ENV['REQUEST_METHOD'] == "HEAD"</tt>, then only the header
- # is output (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".
- #
- # Example:
+ # 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" }
@@ -331,20 +290,17 @@ class CGI
# "cookie" => [cookie1, cookie2],
# "my_header1" => "my_value",
# "my_header2" => "my_value") { "string" }
- # # HTTP/1.1 200 OK
- # # Date: Sun, 15 May 2011 17:35:54 GMT
- # # Server: Apache 2.2.0
- # # Connection: close
- # # Content-Type: text/html; charset=iso-2022-jp
- # # Content-Length: 6
- # # Content-Language: ja
- # # Expires: Tue, 14 Jun 2011 17:35:54 GMT
- # # Set-Cookie: foo
- # # Set-Cookie: bar
- # # 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)
@@ -352,7 +308,7 @@ class CGI
options["length"] = content.bytesize.to_s
output = stdoutput
output.binmode if defined? output.binmode
- output.print http_header(options)
+ output.print header(options)
output.print content unless "HEAD" == env_table['REQUEST_METHOD']
end
@@ -375,13 +331,12 @@ class CGI
params = {}
query.split(/[&;]/).each do |pairs|
key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
-
- next unless key
-
- params[key] ||= []
- params[key].push(value) if value
+ 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
@@ -395,21 +350,17 @@ class CGI
# Maximum number of request parameters when multipart
MAX_MULTIPART_COUNT = 128
- # Mixin module that provides the following:
+ # Mixin module. It provides the follow functionality groups:
#
- # 1. Access to the CGI environment variables as methods. See
- # documentation to the CGI class for a list of these variables. The
- # methods are exposed by removing the leading +HTTP_+ (if it exists) and
- # downcasing the name. For example, +auth_type+ will return the
- # environment variable +AUTH_TYPE+, and +accept+ will return the value
- # for +HTTP_ACCEPT+.
+ # 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.
+ # [] to perform parameter value lookup by key.
#
- # 4. The initialize_query method, for initializing the above
+ # 4. The initialize_query method, for initialising the above
# mechanisms, handling multipart forms, and allowing the
# class to be used in "offline" mode.
#
@@ -460,18 +411,9 @@ class CGI
@params.update(hash)
end
- ##
- # Parses multipart form elements according to
- # http://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.2
- #
- # Returns a hash of multipart form parameters with bodies of type StringIO or
- # Tempfile depending on whether the multipart form element exceeds 10 KB
- #
- # params[name => body]
- #
def read_multipart(boundary, content_length)
## read first boundary
- stdin = stdinput
+ stdin = $stdin
first_line = "--#{boundary}#{EOL}"
content_length -= first_line.bytesize
status = stdin.read(first_line.bytesize)
@@ -487,12 +429,10 @@ class CGI
bufsize = 10 * 1024
max_count = MAX_MULTIPART_COUNT
n = 0
- tempfiles = []
while true
(n += 1) < max_count or raise StandardError.new("too many parameters.")
## create body (StringIO or Tempfile)
body = create_body(bufsize < content_length)
- tempfiles << body if defined?(Tempfile) && body.kind_of?(Tempfile)
class << body
if method_defined?(:path)
alias local_path path
@@ -540,17 +480,16 @@ class CGI
/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)
+ 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)
+ 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)
- body.unlink if defined?(Tempfile) && body.kind_of?(Tempfile)
(params[name] ||= []) << value
unless value.valid_encoding?
if @accept_charset_error_block
@@ -569,20 +508,12 @@ class CGI
@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
- rescue Exception
- if tempfiles
- tempfiles.each {|t|
- if t.path
- t.unlink
- end
- }
- end
- raise
end # read_multipart
private :read_multipart
def create_body(is_large) #:nodoc:
@@ -685,7 +616,6 @@ class CGI
end
private :initialize_query
- # Returns whether the form contained multipart/form-data
def multipart?
@multipart
end
@@ -693,7 +623,7 @@ class CGI
# 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.
+ # retrieved; use #params() to get the array of values.
def [](key)
params = @params[key]
return '' unless params
@@ -712,12 +642,12 @@ class CGI
end
end
- # Return all query parameter names as an array of String.
+ # Return all parameter keys as an array.
def keys(*args)
@params.keys(*args)
end
- # Returns true if a given query string parameter exists.
+ # Returns true if a given parameter key exists in the query.
def has_key?(*args)
@params.has_key?(*args)
end
@@ -726,7 +656,7 @@ class CGI
end # QueryExtension
- # Exception raised when there is an invalid encoding detected
+ # InvalidEncoding Exception class
class InvalidEncoding < Exception; end
# @@accept_charset is default accept character set.
@@ -736,80 +666,81 @@ class CGI
#
# CGI.accept_charset = "EUC-JP"
#
+
@@accept_charset="UTF-8"
- # Return the accept character set for all new CGI instances.
def self.accept_charset
@@accept_charset
end
- # Set the accept character set for all new CGI instances.
def self.accept_charset=(accept_charset)
@@accept_charset=accept_charset
end
- # Return the accept character set for this CGI instance.
- attr_reader :accept_charset
-
# Create a new CGI instance.
#
- # :call-seq:
- # CGI.new(tag_maker) { block }
- # CGI.new(options_hash = {}) { block }
+ # 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
#
- # <tt>tag_maker</tt>::
- # This is the same as using the +options_hash+ form with the value <tt>{
- # :tag_maker => tag_maker }</tt> Note that it is recommended to use the
- # +options_hash+ form, since it also allows you specify the charset you
- # will accept.
- # <tt>options_hash</tt>::
- # A Hash that recognizes two options:
+ # :accept_charset specifies encoding of received query string.
+ # ( Default value is @@accept_charset. )
+ # If not valid, raise CGI::InvalidEncoding
#
- # <tt>:accept_charset</tt>::
- # specifies encoding of received query string. If omitted,
- # <tt>@@accept_charset</tt> is used. If the encoding is not valid, a
- # CGI::InvalidEncoding will be raised.
+ # Example. Suppose @@accept_charset # => "UTF-8"
#
- # Example. Suppose <tt>@@accept_charset</tt> is "UTF-8"
+ # when not specified:
#
- # when not specified:
+ # cgi=CGI.new # @accept_charset # => "UTF-8"
#
- # cgi=CGI.new # @accept_charset # => "UTF-8"
+ # when specified "EUC-JP":
#
- # when specified as "EUC-JP":
+ # cgi=CGI.new(:accept_charset => "EUC-JP") # => "EUC-JP"
#
- # cgi=CGI.new(:accept_charset => "EUC-JP") # => "EUC-JP"
+ # == block
#
- # <tt>:tag_maker</tt>::
- # String that specifies which version of the HTML generation methods to
- # use. If not specified, no HTML generation methods will be loaded.
+ # When you use a block, you can write a process
+ # that query encoding is invalid. Example:
#
- # The following values are supported:
+ # encoding_error={}
+ # cgi=CGI.new(:accept_charset=>"EUC-JP") do |name,value|
+ # encoding_error[key] = value
+ # end
#
- # "html3":: HTML 3.x
- # "html4":: HTML 4.0
- # "html4Tr":: HTML 4.0 Transitional
- # "html4Fr":: HTML 4.0 with Framesets
- # "html5":: HTML 5
+ # == tag_maker
#
- # <tt>block</tt>::
- # If provided, the block is called when an invalid encoding is
- # encountered. For example:
+ # :tag_maker specifies which version of HTML to load the HTML generation
+ # methods for. The following versions of HTML are supported:
#
- # encoding_errors={}
- # cgi=CGI.new(:accept_charset=>"EUC-JP") do |name,value|
- # encoding_errors[name] = value
- # end
+ # html3:: HTML 3.x
+ # html4:: HTML 4.0
+ # html4Tr:: HTML 4.0 Transitional
+ # html4Fr:: HTML 4.0 with Framesets
#
- # Finally, 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
+ # 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(options = {}, &block) # :yields: name, value
- @accept_charset_error_block = block_given? ? block : nil
+ # 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
@@ -852,11 +783,6 @@ class CGI
extend Html4Fr
element_init()
extend HtmlExtension
- when "html5"
- require 'cgi/html'
- extend Html5
- element_init()
- extend HtmlExtension
end
end
diff --git a/lib/cgi/html.rb b/lib/cgi/html.rb
index ba19e3d603..28642198fd 100644
--- a/lib/cgi/html.rb
+++ b/lib/cgi/html.rb
@@ -1,8 +1,8 @@
-class CGI
# 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.
@@ -63,8 +63,8 @@ class CGI
# cgi.a("http://www.example.com") { "Example" }
# # => "<A HREF=\"http://www.example.com\">Example</A>"
#
- # Modules Html3, Html4, etc., contain more basic HTML-generation methods
- # (+#title+, +#h1+, etc.).
+ # Modules Http3, Http4, etc., contain more basic HTML-generation methods
+ # (:title, :center, etc.).
#
# See class CGI for a detailed example.
#
@@ -334,7 +334,7 @@ class CGI
body = ""
end
if @output_hidden
- body << @output_hidden.collect{|k,v|
+ body += @output_hidden.collect{|k,v|
"<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
}.join
end
@@ -420,18 +420,18 @@ class CGI
if attributes.has_key?("DOCTYPE")
if attributes["DOCTYPE"]
- buf << attributes.delete("DOCTYPE")
+ buf += attributes.delete("DOCTYPE")
else
attributes.delete("DOCTYPE")
end
else
- buf << doctype
+ buf += doctype
end
if block_given?
- buf << super(attributes){ yield }
+ buf += super(attributes){ yield }
else
- buf << super(attributes)
+ buf += super(attributes)
end
if pretty
@@ -845,15 +845,14 @@ class CGI
# Initialise the HTML generation methods for this version.
def element_init
extend TagMaker
- return if defined?(html)
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
+ 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
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -863,7 +862,7 @@ class CGI
# - O EMPTY
for element in %w[ IMG BASE BASEFONT BR AREA LINK PARAM HR INPUT
ISINDEX META ]
- methods << <<-BEGIN + nOE_element_def(element) + <<-END
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -871,9 +870,9 @@ class CGI
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
+ 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
@@ -896,7 +895,6 @@ class CGI
# Initialise the HTML generation methods for this version.
def element_init
extend TagMaker
- return if defined?(html)
methods = ""
# - -
for element in %w[ TT I B BIG SMALL EM STRONG DFN CODE SAMP KBD
@@ -904,7 +902,7 @@ class CGI
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
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -913,7 +911,7 @@ class CGI
# - O EMPTY
for element in %w[ IMG BASE BR AREA LINK PARAM HR INPUT COL META ]
- methods << <<-BEGIN + nOE_element_def(element) + <<-END
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -922,8 +920,8 @@ class CGI
# 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
+ COLGROUP TR TH TD HEAD]
+ methods += <<-BEGIN + nO_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -946,7 +944,6 @@ class CGI
# Initialise the HTML generation methods for this version.
def element_init
extend TagMaker
- return if defined?(html)
methods = ""
# - -
for element in %w[ TT I B U S STRIKE BIG SMALL EM STRONG DFN
@@ -955,7 +952,7 @@ class CGI
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
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -965,7 +962,7 @@ class CGI
# - 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
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -975,7 +972,7 @@ class CGI
# 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
+ methods += <<-BEGIN + nO_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -997,11 +994,10 @@ class CGI
# Initialise the HTML generation methods for this version.
def element_init
- return if defined?(frameset)
methods = ""
# - -
for element in %w[ FRAMESET ]
- methods << <<-BEGIN + nn_element_def(element) + <<-END
+ methods += <<-BEGIN + nn_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -1010,7 +1006,7 @@ class CGI
# - O EMPTY
for element in %w[ FRAME ]
- methods << <<-BEGIN + nOE_element_def(element) + <<-END
+ methods += <<-BEGIN + nOE_element_def(element) + <<-END
def #{element.downcase}(attributes = {})
BEGIN
end
@@ -1020,58 +1016,6 @@ class CGI
end
end # Html4Fr
+end
- # Mixin module for HTML version 5 generation methods.
- module Html5 # :nodoc:
-
- # The DOCTYPE declaration for this version of HTML
- def doctype
- %|<!DOCTYPE HTML>|
- end
-
- # Initialise the HTML generation methods for this version.
- def element_init
- extend TagMaker
- return if defined?(html)
- methods = ""
- # - -
- for element in %w[ SECTION NAV ARTICLE ASIDE HGROUP HEADER
- FOOTER FIGURE FIGCAPTION S TIME U MARK RUBY BDI IFRAME
- VIDEO AUDIO CANVAS DATALIST OUTPUT PROGRESS METER DETAILS
- SUMMARY MENU DIALOG I B SMALL EM STRONG DFN CODE SAMP KBD
- VAR CITE ABBR SUB SUP SPAN BDO ADDRESS DIV MAP OBJECT
- H1 H2 H3 H4 H5 H6 PRE Q INS DEL DL OL UL LABEL SELECT
- 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
- COMMAND EMBED KEYGEN SOURCE TRACK WBR ]
- 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 DT DD LI OPTION THEAD TFOOT TBODY
- OPTGROUP COLGROUP RT RP TR TH TD ]
- methods += <<-BEGIN + nO_element_def(element) + <<-END
- def #{element.downcase}(attributes = {})
- BEGIN
- end
- END
- end
- eval(methods)
- end
-
- end # Html5
-end
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 2bdc94606d..65d6442b37 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -8,22 +8,28 @@
# Author: Yukihiro "Matz" Matsumoto
#
# Documentation: William Webber (william@williamwebber.com)
+#
+# == Overview
+#
+# 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.
+# 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
+# to the user. This adds state information to the otherwise stateless
+# HTTP request/response protocol.
+#
+# See the documentation to the +CGI::Session+ class for more details
+# and examples of usage. See cgi.rb for the +CGI+ class itself.
require 'cgi'
require 'tmpdir'
class CGI
- # == Overview
- #
- # 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.
- # 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
- # to the user. This adds state information to the otherwise stateless
- # HTTP request/response protocol.
+ # Class representing an HTTP session. See documentation for the file
+ # cgi/session.rb for an introduction to HTTP sessions.
#
# == Lifecycle
#
@@ -308,7 +314,7 @@ class CGI
@data[key]
end
- # Set the session data for key +key+.
+ # Set the session date for key +key+.
def []=(key, val)
@write_lock ||= true
@data ||= @dbman.restore
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb
index 0959f0f094..9f8a63ac92 100644
--- a/lib/cgi/util.rb
+++ b/lib/cgi/util.rb
@@ -4,12 +4,12 @@ class CGI
# url_encoded_string = CGI::escape("'Stop!' said Fred")
# # => "%27Stop%21%27+said+Fred"
def CGI::escape(string)
- encoding = string.encoding
- string.dup.force_encoding('ASCII-8BIT').gsub(/([^ a-zA-Z0-9_.-]+)/) do
+ string.gsub(/([^ a-zA-Z0-9_.-]+)/) do
'%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
- end.tr(' ', '+').force_encoding(encoding)
+ end.tr(' ', '+')
end
+
# URL-decode a string with encoding(optional).
# string = CGI::unescape("%27Stop%21%27+said+Fred")
# # => "'Stop!' said Fred"
@@ -20,9 +20,7 @@ class CGI
str.valid_encoding? ? str : str.force_encoding(string.encoding)
end
- # The set of special characters and their escaped values
TABLE_FOR_ESCAPE_HTML__ = {
- "'" => '&#39;',
'&' => '&amp;',
'"' => '&quot;',
'<' => '&lt;',
@@ -33,18 +31,18 @@ class CGI
# CGI::escapeHTML('Usage: foo "bar" <baz>')
# # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
def CGI::escapeHTML(string)
- string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+ 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('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do
+ 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 'apos' then "'".encode(enc)
when 'amp' then '&'.encode(enc)
when 'quot' then '"'.encode(enc)
when 'gt' then '>'.encode(enc)
@@ -55,10 +53,9 @@ class CGI
end
end
asciicompat = Encoding.compatible?(string, "a")
- string.gsub(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
+ string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/) do
match = $1.dup
case match
- when 'apos' then "'"
when 'amp' then '&'
when 'quot' then '"'
when 'gt' then '>'
@@ -86,13 +83,9 @@ class CGI
end
end
end
-
- # Synonym for CGI::escapeHTML(str)
def CGI::escape_html(str)
escapeHTML(str)
end
-
- # Synonym for CGI::unescapeHTML(str)
def CGI::unescape_html(str)
unescapeHTML(str)
end
@@ -121,6 +114,7 @@ class CGI
end
end
+
# Undo escaping such as that done by CGI::escapeElement()
#
# print CGI::unescapeElement(
@@ -140,13 +134,9 @@ class CGI
string
end
end
-
- # Synonym for CGI::escapeElement(str)
def CGI::escape_element(str)
escapeElement(str)
end
-
- # Synonym for CGI::unescapeElement(str)
def CGI::unescape_element(str)
unescapeElement(str)
end
diff --git a/lib/cmath.rb b/lib/cmath.rb
index d613a3f6f9..976f269299 100644
--- a/lib/cmath.rb
+++ b/lib/cmath.rb
@@ -1,20 +1,3 @@
-##
-# = CMath
-#
-# CMath is a library that provides trigonometric and transcendental
-# functions for complex numbers.
-#
-# == Usage
-#
-# To start using this library, simply:
-#
-# require "cmath"
-#
-# Square root of a negative number is a complex number.
-#
-# CMath.sqrt(-9) #=> 0+3.0i
-#
-
module CMath
include Math
@@ -43,297 +26,177 @@ module CMath
alias acosh! acosh
alias atanh! atanh
- ##
- # Math::E raised to the +z+ power
- #
- # exp(Complex(0,0)) #=> 1.0+0.0i
- # exp(Complex(0,PI)) #=> -1.0+1.2246467991473532e-16i
- # exp(Complex(0,PI/2.0)) #=> 6.123233995736766e-17+1.0i
def exp(z)
- begin
- if z.real?
- exp!(z)
- else
- ere = exp!(z.real)
- Complex(ere * cos!(z.imag),
- ere * sin!(z.imag))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ exp!(z)
+ else
+ ere = exp!(z.real)
+ Complex(ere * cos!(z.imag),
+ ere * sin!(z.imag))
end
end
- ##
- # Returns the natural logarithm of Complex. If a second argument is given,
- # it will be the base of logarithm.
- #
- # log(Complex(0,0)) #=> -Infinity+0.0i
def log(*args)
- begin
- z, b = args
- unless b.nil? || b.kind_of?(Numeric)
- raise TypeError, "Numeric Number required"
- end
- 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
+ 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
- rescue NoMethodError
- handle_no_method_error
+ a
end
end
- ##
- # returns the base 2 logarithm of +z+
def log2(z)
- begin
- if z.real? and z >= 0
- log2!(z)
- else
- log(z) / log!(2)
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real? and z >= 0
+ log2!(z)
+ else
+ log(z) / log!(2)
end
end
- ##
- # returns the base 10 logarithm of +z+
def log10(z)
- begin
- if z.real? and z >= 0
- log10!(z)
- else
- log(z) / log!(10)
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real? and z >= 0
+ log10!(z)
+ else
+ log(z) / log!(10)
end
end
- ##
- # Returns the non-negative square root of Complex.
- # sqrt(-1) #=> 0+1.0i
- # sqrt(Complex(-1,0)) #=> 0.0+1.0i
- # sqrt(Complex(0,8)) #=> 2.0+2.0i
def sqrt(z)
- begin
- if z.real?
- if z < 0
- Complex(0, sqrt!(-z))
- else
- sqrt!(z)
- end
+ 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
- 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.0), sqrt!((r - x) / 2.0))
- end
+ r = z.abs
+ x = z.real
+ Complex(sqrt!((r + x) / 2), sqrt!((r - x) / 2))
end
- rescue NoMethodError
- handle_no_method_error
end
end
- ##
- # returns the principal value of the cube root of +z+
def cbrt(z)
- z ** (1.0/3)
+ if z.real?
+ cbrt!(z)
+ else
+ Complex(z) ** (1.0/3)
+ end
end
- ##
- # returns the sine of +z+, where +z+ is given in radians
def sin(z)
- begin
- if z.real?
- sin!(z)
- else
- Complex(sin!(z.real) * cosh!(z.imag),
- cos!(z.real) * sinh!(z.imag))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ sin!(z)
+ else
+ Complex(sin!(z.real) * cosh!(z.imag),
+ cos!(z.real) * sinh!(z.imag))
end
end
- ##
- # returns the cosine of +z+, where +z+ is given in radians
def cos(z)
- begin
- if z.real?
- cos!(z)
- else
- Complex(cos!(z.real) * cosh!(z.imag),
- -sin!(z.real) * sinh!(z.imag))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ cos!(z)
+ else
+ Complex(cos!(z.real) * cosh!(z.imag),
+ -sin!(z.real) * sinh!(z.imag))
end
end
- ##
- # returns the tangent of +z+, where +z+ is given in radians
def tan(z)
- begin
- if z.real?
- tan!(z)
- else
- sin(z) / cos(z)
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ tan!(z)
+ else
+ sin(z) / cos(z)
end
end
- ##
- # returns the hyperbolic sine of +z+, where +z+ is given in radians
def sinh(z)
- begin
- if z.real?
- sinh!(z)
- else
- Complex(sinh!(z.real) * cos!(z.imag),
- cosh!(z.real) * sin!(z.imag))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ sinh!(z)
+ else
+ Complex(sinh!(z.real) * cos!(z.imag),
+ cosh!(z.real) * sin!(z.imag))
end
end
- ##
- # returns the hyperbolic cosine of +z+, where +z+ is given in radians
def cosh(z)
- begin
- if z.real?
- cosh!(z)
- else
- Complex(cosh!(z.real) * cos!(z.imag),
- sinh!(z.real) * sin!(z.imag))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ cosh!(z)
+ else
+ Complex(cosh!(z.real) * cos!(z.imag),
+ sinh!(z.real) * sin!(z.imag))
end
end
- ##
- # returns the hyperbolic tangent of +z+, where +z+ is given in radians
def tanh(z)
- begin
- if z.real?
- tanh!(z)
- else
- sinh(z) / cosh(z)
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ tanh!(z)
+ else
+ sinh(z) / cosh(z)
end
end
- ##
- # returns the arc sine of +z+
def asin(z)
- begin
- 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
- rescue NoMethodError
- handle_no_method_error
+ 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
- ##
- # returns the arc cosine of +z+
def acos(z)
- begin
- 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
- rescue NoMethodError
- handle_no_method_error
+ 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
- ##
- # returns the arc tangent of +z+
def atan(z)
- begin
- if z.real?
- atan!(z)
- else
- 1.0.i * log((1.0.i + z) / (1.0.i - z)) / 2.0
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ atan!(z)
+ else
+ 1.0.i * log((1.0.i + z) / (1.0.i - z)) / 2.0
end
end
- ##
- # returns the arc tangent of +y+ divided by +x+ using the signs of +y+ and
- # +x+ to determine the quadrant
def atan2(y,x)
- begin
- 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
- rescue NoMethodError
- handle_no_method_error
+ 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
- ##
- # returns the inverse hyperbolic sine of +z+
def asinh(z)
- begin
- if z.real?
- asinh!(z)
- else
- log(z + sqrt(1.0 + z * z))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real?
+ asinh!(z)
+ else
+ log(z + sqrt(1.0 + z * z))
end
end
- ##
- # returns the inverse hyperbolic cosine of +z+
def acosh(z)
- begin
- if z.real? and z >= 1
- acosh!(z)
- else
- log(z + sqrt(z * z - 1.0))
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real? and z >= 1
+ acosh!(z)
+ else
+ log(z + sqrt(z * z - 1.0))
end
end
- ##
- # returns the inverse hyperbolic tangent of +z+
def atanh(z)
- begin
- if z.real? and z >= -1 and z <= 1
- atanh!(z)
- else
- log((1.0 + z) / (1.0 - z)) / 2.0
- end
- rescue NoMethodError
- handle_no_method_error
+ if z.real? and z >= -1 and z <= 1
+ atanh!(z)
+ else
+ log((1.0 + z) / (1.0 - z)) / 2.0
end
end
@@ -388,15 +251,4 @@ module CMath
module_function :gamma
module_function :lgamma
- private
- def handle_no_method_error # :nodoc:
- if $!.name == :real?
- raise TypeError, "Numeric Number required"
- else
- raise
- end
- end
- module_function :handle_no_method_error
-
end
-
diff --git a/lib/csv.rb b/lib/csv.rb
index ba690dd3e0..9942802c3e 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -27,8 +27,7 @@
# 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 as of Ruby 1.9. If you are migrating code from 1.8 or
-# earlier, you may have to change your code to comply with the new interface.
+# the original library.
#
# == What's Different From the Old CSV?
#
@@ -154,14 +153,6 @@ require "stringio"
# 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($stdin) { |csv_in| csv_in.each { |row| p row } } # from $stdin
-#
-# == Advanced Usage
-#
-# === Wrap an IO Object
-#
-# csv = CSV.new(io, options)
-# # ... read (with gets() or each()) from and write (with <<) to csv here ...
#
# == CSV and Character Encodings (M17n or Multilingualization)
#
@@ -207,7 +198,7 @@ require "stringio"
#
class CSV
# The version of the installed library.
- VERSION = "2.4.8".freeze
+ VERSION = "2.4.7".freeze
#
# A CSV::Row is part Array and part Hash. It retains an order for the fields
@@ -274,7 +265,7 @@ class CSV
# field( header, offset )
# field( index )
#
- # This method will return the field value by +header+ or +index+. If a field
+ # 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
@@ -293,42 +284,6 @@ class CSV
#
# :call-seq:
- # fetch( header )
- # fetch( header ) { |row| ... }
- # fetch( header, default )
- #
- # This method will fetch the field value by +header+. It has the same
- # behavior as Hash#fetch: if there is a field with the given +header+, its
- # value is returned. Otherwise, if a block is given, it is yielded the
- # +header+ and its result is returned; if a +default+ is given as the
- # second argument, it is returned; otherwise a KeyError is raised.
- #
- def fetch(header, *varargs)
- raise ArgumentError, "Too many arguments" if varargs.length > 1
- pair = @row.assoc(header)
- if pair
- pair.last
- else
- if block_given?
- yield header
- elsif varargs.empty?
- raise KeyError, "key not found: #{header}"
- else
- varargs.first
- end
- end
- end
-
- # Returns +true+ if there is a field with the given +header+.
- def has_key?(header)
- !!@row.assoc(header)
- end
- alias_method :include?, :has_key?
- alias_method :key?, :has_key?
- alias_method :member?, :has_key?
-
- #
- # :call-seq:
# []=( header, value )
# []=( header, offset, value )
# []=( index, value )
@@ -511,8 +466,7 @@ class CSV
# same order as +other+.
#
def ==(other)
- return @row == other.row if other.is_a? CSV::Row
- @row == other
+ @row == other.row
end
#
@@ -543,12 +497,12 @@ class CSV
end
str << ">"
begin
- str.join('')
+ 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.join
end
end
end
@@ -874,7 +828,7 @@ class CSV
#
# This method assumes you want the Table.headers(), unless you explicitly
# pass <tt>:write_headers => false</tt>.
- #
+ #
def to_csv(options = Hash.new)
wh = options.fetch(:write_headers, true)
@table.inject(wh ? [headers.to_csv(options)] : [ ]) do |rows, row|
@@ -883,7 +837,7 @@ class CSV
else
rows + [row.fields.to_csv(options)]
end
- end.join('')
+ end.join
end
alias_method :to_s, :to_csv
@@ -1010,7 +964,6 @@ class CSV
# <b><tt>:header_converters</tt></b>:: +nil+
# <b><tt>:skip_blanks</tt></b>:: +false+
# <b><tt>:force_quotes</tt></b>:: +false+
- # <b><tt>:skip_lines</tt></b>:: +nil+
#
DEFAULT_OPTIONS = { col_sep: ",",
row_sep: :auto,
@@ -1022,8 +975,7 @@ class CSV
return_headers: false,
header_converters: nil,
skip_blanks: false,
- force_quotes: false,
- skip_lines: nil }.freeze
+ force_quotes: false }.freeze
#
# This method will return a CSV instance, just like CSV::new(), but the
@@ -1051,6 +1003,133 @@ class CSV
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.
+ #
+ # 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.
+ #
+ # 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.
+ #
+ # 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)
+
+ # write meta information
+ begin
+ csv << obj_template.class.csv_meta
+ rescue NoMethodError
+ csv << [:class, obj_template.class]
+ 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
+ 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
+ end
+ end
+ end
+
+ if io.is_a? String
+ csv.string
+ else
+ csv.close
+ 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)
+ end
+
+ # load headers
+ headers = csv.shift
+
+ # 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
+ 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| ... }
@@ -1116,7 +1195,10 @@ class CSV
# but transcode it to UTF-8 before CSV parses it.
#
def self.foreach(path, options = Hash.new, &block)
- open(path, options) do |csv|
+ encoding = options.delete(:encoding)
+ mode = "rb"
+ mode << ":#{encoding}" if encoding
+ open(path, mode, options) do |csv|
csv.each(&block)
end
end
@@ -1146,9 +1228,9 @@ class CSV
io.seek(0, IO::SEEK_END)
args.unshift(io)
else
- encoding = args[-1][:encoding] if args.last.is_a?(Hash)
+ encoding = args.last.is_a?(Hash) ? args.last.delete(:encoding) : nil
str = ""
- str.force_encoding(encoding) if encoding
+ str.encode!(encoding) if encoding
args.unshift(str)
end
csv = new(*args) # wrap
@@ -1247,18 +1329,10 @@ class CSV
def self.open(*args)
# find the +options+ Hash
options = if args.last.is_a? Hash then args.pop else Hash.new end
- # wrap a File opened with the remaining +args+ with no newline
- # decorator
- file_opts = {universal_newline: false}.merge(options)
- begin
- f = File.open(*args, file_opts)
- rescue ArgumentError => e
- raise unless /needs binmode/ =~ e.message and args.size == 1
- args << "rb"
- file_opts = {encoding: Encoding.default_external}.merge(file_opts)
- retry
- end
- csv = new(f, options)
+ # 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?
@@ -1319,8 +1393,11 @@ class CSV
# <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)
- open(path, *options) { |csv| csv.read }
+ 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().
@@ -1466,18 +1543,10 @@ class CSV
# 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.
- # <b><tt>:skip_lines</tt></b>:: When set to an object responding to
- # <tt>match</tt>, every line matching
- # it is considered a comment and ignored
- # during parsing. When set to +nil+
- # no line is considered a comment.
- # If the passed object does not respond
- # to <tt>match</tt>, <tt>ArgumentError</tt>
- # is thrown.
#
# See CSV::DEFAULT_OPTIONS for the default settings.
#
- # Options cannot be overridden in the instance methods for performance reasons,
+ # 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)
@@ -1485,36 +1554,24 @@ class CSV
options = DEFAULT_OPTIONS.merge(options)
# create the IO object we will read from
- @io = data.is_a?(String) ? StringIO.new(data) : data
+ @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 = raw_encoding(nil) ||
- ( if encoding = options.delete(:internal_encoding)
- case encoding
- when Encoding; encoding
- else Encoding.find(encoding)
- end
- end ) ||
- ( case encoding = options.delete(:encoding)
- when Encoding; encoding
- when /\A[^:]+/; Encoding.find($&)
- end ) ||
- Encoding.default_internal || Encoding.default_external
+ @encoding = raw_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 = /#{%"[-\\]\\[\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/
+ @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)
- init_comments(options)
- @force_encoding = !!(encoding || options.delete(:encoding))
- options.delete(:internal_encoding)
- options.delete(:external_encoding)
unless options.empty?
raise ArgumentError, "Unknown options: #{options.keys.join(', ')}."
end
@@ -1540,10 +1597,6 @@ class CSV
attr_reader :quote_char
# The limit for field size, if any. See CSV::new for details.
attr_reader :field_size_limit
-
- # The regex marking a line as a comment. See CSV::new for details
- attr_reader :skip_lines
-
#
# 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
@@ -1652,13 +1705,10 @@ class CSV
output = row.map(&@quote).join(@col_sep) + @row_sep # quote and separate
if @io.is_a?(StringIO) and
- output.encoding != (encoding = raw_encoding)
- if @force_encoding
- output = output.encode(encoding)
- elsif (compatible_encoding = Encoding.compatible?(@io.string, output))
- @io.set_encoding(compatible_encoding)
- @io.seek(0, IO::SEEK_END)
- end
+ output.encoding != raw_encoding and
+ (compatible_encoding = Encoding.compatible?(@io.string, output))
+ @io = StringIO.new(@io.string.force_encoding(compatible_encoding))
+ @io.seek(0, IO::SEEK_END)
end
@io << output
@@ -1714,12 +1764,8 @@ class CSV
# The data source must be open for reading.
#
def each
- if block_given?
- while row = shift
- yield row
- end
- else
- to_enum
+ while row = shift
+ yield row
end
end
@@ -1766,6 +1812,9 @@ class CSV
end
end
+ # begin with a blank line, so we can always add to it
+ line = ""
+
#
# 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
@@ -1800,8 +1849,6 @@ class CSV
end
end
- next if @skip_lines and @skip_lines.match parse
-
parts = parse.split(@col_sep, -1)
if parts.empty?
if in_extended_col
@@ -1819,10 +1866,7 @@ class CSV
if part[-1] == @quote_char && part.count(@quote_char) % 2 != 0
# extended column ends
csv.last << part[0..-2]
- if csv.last =~ @parsers[:stray_quote]
- raise MalformedCSVError,
- "Missing or stray quote in line #{lineno + 1}"
- end
+ raise MalformedCSVError if csv.last =~ @parsers[:stray_quote]
csv.last.gsub!(@quote_char * 2, @quote_char)
in_extended_col = false
else
@@ -1839,10 +1883,7 @@ class CSV
else
# regular quoted column
csv << part[1..-2]
- if csv.last =~ @parsers[:stray_quote]
- raise MalformedCSVError,
- "Missing or stray quote in line #{lineno + 1}"
- end
+ raise MalformedCSVError if csv.last =~ @parsers[:stray_quote]
csv.last.gsub!(@quote_char * 2, @quote_char)
end
elsif part =~ @parsers[:quote_or_nl]
@@ -1851,7 +1892,7 @@ class CSV
raise MalformedCSVError, "Unquoted fields do not allow " +
"\\r or \\n (line #{lineno + 1})."
else
- raise MalformedCSVError, "Illegal quoting in line #{lineno + 1}."
+ raise MalformedCSVError, "Illegal quoting on line #{lineno + 1}."
end
else
# Regular ole unquoted field.
@@ -1926,12 +1967,12 @@ class CSV
end
str << ">"
begin
- str.join('')
+ 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.join
end
end
@@ -1967,29 +2008,27 @@ class CSV
@row_sep = $INPUT_RECORD_SEPARATOR
else
begin
- #
- # remember where we were (pos() will raise an axception if @io is pipe
- # or not opened for reading)
- #
- saved_pos = @io.pos
+ saved_pos = @io.pos # remember where we were
while @row_sep == :auto
#
# if we run out of data, it's probably a single line
- # (ensure will set default value)
+ # (use a sensible default)
#
- break unless sample = @io.gets(nil, 1024)
- # extend sample if we're unsure of the line ending
- if sample.end_with? encode_str("\r")
- sample << (@io.gets(nil, 1) || "")
+ 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
@@ -1998,18 +2037,8 @@ class CSV
saved_pos -= 1024
end
@io.read(saved_pos) if saved_pos.nonzero?
- rescue IOError # not opened for reading
- # do nothing: ensure will set default
- rescue NoMethodError # Zlib::GzipWriter doesn't have some IO methods
- # do nothing: ensure will set default
- rescue SystemCallError # pipe
- # do nothing: ensure will set default
- ensure
- #
- # set default if we failed to detect
- # (stream not opened for reading, a pipe, or a single line of data)
- #
- @row_sep = $INPUT_RECORD_SEPARATOR if @row_sep == :auto
+ rescue IOError # stream not opened for reading
+ @row_sep = $INPUT_RECORD_SEPARATOR
end
end
end
@@ -2052,6 +2081,7 @@ class CSV
@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 = {
@@ -2118,17 +2148,6 @@ class CSV
init_converters(options, :header_converters)
end
- # Stores the pattern of comments to skip from the provided options.
- #
- # The pattern must respond to +.match+, else ArgumentError is raised.
- #
- # See also CSV.new
- def init_comments(options)
- @skip_lines = options.delete(:skip_lines)
- if @skip_lines and not @skip_lines.respond_to?(:match)
- raise ArgumentError, ":skip_lines has to respond to matches"
- end
- end
#
# The actual work method for adding converters, used by both CSV.convert() and
# CSV.header_convert().
@@ -2179,7 +2198,7 @@ class CSV
end
#
- # This method is used to turn a finished +row+ into a CSV::Row. Header rows
+ # 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
@@ -2218,8 +2237,8 @@ class CSV
end
#
- # This method injects an instance variable <tt>unconverted_fields</tt> into
- # +row+ and an accessor method for +row+ called unconverted_fields(). The
+ # 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+.
#
def add_unconverted_fields(row, fields)
@@ -2238,7 +2257,7 @@ class CSV
# a backslash cannot be transcoded.
#
def escape_re(str)
- str.gsub(@re_chars) {|c| @re_esc + c}
+ str.chars.map { |c| @re_chars.include?(c) ? @re_esc + c : c }.join
end
#
@@ -2254,16 +2273,36 @@ class CSV
# that encoding.
#
def encode_str(*chunks)
- chunks.map { |chunk| chunk.encode(@encoding.name) }.join('')
+ chunks.map { |chunk| chunk.encode(@encoding.name) }.join
end
- private
-
#
- # Returns the encoding of the internal IO object or the +default+ if the
- # encoding cannot be determined.
+ # 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 raw_encoding(default = Encoding::ASCII_8BIT)
+ def read_to_char(bytes)
+ return "" if @io.eof?
+ data = read_io(bytes)
+ begin
+ raise unless data.valid_encoding?
+ 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 += read_io(1)
+ retry
+ end
+ end
+ end
+
+ private
+ def raw_encoding
if @io.respond_to? :internal_encoding
@io.internal_encoding || @io.external_encoding
elsif @io.is_a? StringIO
@@ -2271,46 +2310,29 @@ class CSV
elsif @io.respond_to? :encoding
@io.encoding
else
- default
+ Encoding::ASCII_8BIT
end
end
+
+ def read_io(bytes)
+ @io.read(bytes).force_encoding(raw_encoding)
+ end
end
-# Passes +args+ to CSV::instance.
-#
-# CSV("CSV,data").read
-# #=> [["CSV", "data"]]
-#
-# If a block is given, the instance is passed the block and the return value
-# becomes the return value of the block.
-#
-# CSV("CSV,data") { |c|
-# c.read.any? { |a| a.include?("data") }
-# } #=> true
-#
-# CSV("CSV,data") { |c|
-# c.read.any? { |a| a.include?("zombies") }
-# } #=> false
-#
+# Another name for CSV::instance().
def CSV(*args, &block)
CSV.instance(*args, &block)
end
-class Array # :nodoc:
- # Equivalent to CSV::generate_line(self, options)
- #
- # ["CSV", "data"].to_csv
- # #=> "CSV,data\n"
+class Array
+ # Equivalent to <tt>CSV::generate_line(self, options)</tt>.
def to_csv(options = Hash.new)
CSV.generate_line(self, options)
end
end
-class String # :nodoc:
- # Equivalent to CSV::parse_line(self, options)
- #
- # "CSV,data".parse_csv
- # #=> ["CSV", "data"]
+class String
+ # Equivalent to <tt>CSV::parse_line(self, options)</tt>.
def parse_csv(options = Hash.new)
CSV.parse_line(self, options)
end
diff --git a/lib/date.rb b/lib/date.rb
new file mode 100644
index 0000000000..ebbc8b581e
--- /dev/null
+++ b/lib/date.rb
@@ -0,0 +1,1849 @@
+#
+# date.rb - date and time library
+#
+# Author: Tadayoshi Funaba 1998-2011
+#
+# Documentation: William Webber <william@williamwebber.com>
+#
+#--
+# $Id: date.rb,v 2.37 2008-01-17 20:16:31+09 tadf Exp $
+#++
+#
+# == Overview
+#
+# This file provides two classes for working with
+# dates and times.
+#
+# The first class, Date, represents dates.
+# It works with years, months, weeks, and days.
+# See the Date class documentation for more details.
+#
+# The second, DateTime, extends Date to include hours,
+# minutes, seconds, and fractions of a second. It
+# provides basic support for time zones. See the
+# DateTime class documentation for more details.
+#
+# === Ways of calculating the date.
+#
+# In common usage, the date is reckoned in years since or
+# before the Common Era (CE/BCE, also known as AD/BC), then
+# as a month and day-of-the-month within the current year.
+# This is known as the *Civil* *Date*, and abbreviated
+# as +civil+ in the Date class.
+#
+# Instead of year, month-of-the-year, and day-of-the-month,
+# the date can also be reckoned in terms of year and
+# day-of-the-year. This is known as the *Ordinal* *Date*,
+# and is abbreviated as +ordinal+ in the Date class. (Note
+# that referring to this as the Julian date is incorrect.)
+#
+# The date can also be reckoned in terms of year, week-of-the-year,
+# and day-of-the-week. This is known as the *Commercial*
+# *Date*, and is abbreviated as +commercial+ in the
+# Date class. The commercial week runs Monday (day-of-the-week
+# 1) to Sunday (day-of-the-week 7), in contrast to the civil
+# week which runs Sunday (day-of-the-week 0) to Saturday
+# (day-of-the-week 6). The first week of the commercial year
+# starts on the Monday on or before January 1, and the commercial
+# year itself starts on this Monday, not January 1.
+#
+# For scientific purposes, it is convenient to refer to a date
+# simply as a day count, counting from an arbitrary initial
+# day. The date first chosen for this was January 1, 4713 BCE.
+# A count of days from this date is the *Julian* *Day* *Number*
+# or *Julian* *Date*, which is abbreviated as +jd+ in the
+# Date class. This is in local time, and counts from midnight
+# on the initial day. The stricter usage is in UTC, and counts
+# from midday on the initial day. This is referred to in the
+# Date class as the *Astronomical* *Julian* *Day* *Number*, and
+# abbreviated as +ajd+. In the Date class, the Astronomical
+# Julian Day Number includes fractional days.
+#
+# Another absolute day count is the *Modified* *Julian* *Day*
+# *Number*, which takes November 17, 1858 as its initial day.
+# This is abbreviated as +mjd+ in the Date class. There
+# is also an *Astronomical* *Modified* *Julian* *Day* *Number*,
+# which is in UTC and includes fractional days. This is
+# abbreviated as +amjd+ in the Date class. Like the Modified
+# Julian Day Number (and unlike the Astronomical Julian
+# Day Number), it counts from midnight.
+#
+# Alternative calendars such as the Chinese Lunar Calendar,
+# the Islamic Calendar, or the French Revolutionary Calendar
+# are not supported by the Date class; nor are calendars that
+# are based on an Era different from the Common Era, such as
+# the Japanese Imperial Calendar or the Republic of China
+# Calendar.
+#
+# === Calendar Reform
+#
+# The standard civil year is 365 days long. However, the
+# solar year is fractionally longer than this. To account
+# for this, a *leap* *year* is occasionally inserted. This
+# is a year with 366 days, the extra day falling on February 29.
+# In the early days of the civil calendar, every fourth
+# year without exception was a leap year. This way of
+# reckoning leap years is the *Julian* *Calendar*.
+#
+# However, the solar year is marginally shorter than 365 1/4
+# days, and so the *Julian* *Calendar* gradually ran slow
+# over the centuries. To correct this, every 100th year
+# (but not every 400th year) was excluded as a leap year.
+# This way of reckoning leap years, which we use today, is
+# the *Gregorian* *Calendar*.
+#
+# The Gregorian Calendar was introduced at different times
+# in different regions. The day on which it was introduced
+# for a particular region is the *Day* *of* *Calendar*
+# *Reform* for that region. This is abbreviated as +sg+
+# (for Start of Gregorian calendar) in the Date class.
+#
+# Two such days are of particular
+# significance. The first is October 15, 1582, which was
+# the Day of Calendar Reform for Italy and most Catholic
+# countries. The second is September 14, 1752, which was
+# the Day of Calendar Reform for England and its colonies
+# (including what is now the United States). These two
+# dates are available as the constants Date::ITALY and
+# Date::ENGLAND, respectively. (By comparison, Germany and
+# Holland, less Catholic than Italy but less stubborn than
+# England, changed over in 1698; Sweden in 1753; Russia not
+# till 1918, after the Revolution; and Greece in 1923. Many
+# Orthodox churches still use the Julian Calendar. A complete
+# list of Days of Calendar Reform can be found at
+# http://www.polysyllabic.com/GregConv.html.)
+#
+# Switching from the Julian to the Gregorian calendar
+# involved skipping a number of days to make up for the
+# accumulated lag, and the later the switch was (or is)
+# done, the more days need to be skipped. So in 1582 in Italy,
+# 4th October was followed by 15th October, skipping 10 days; in 1752
+# in England, 2nd September was followed by 14th September, skipping
+# 11 days; and if I decided to switch from Julian to Gregorian
+# Calendar this midnight, I would go from 27th July 2003 (Julian)
+# today to 10th August 2003 (Gregorian) tomorrow, skipping
+# 13 days. The Date class is aware of this gap, and a supposed
+# date that would fall in the middle of it is regarded as invalid.
+#
+# The Day of Calendar Reform is relevant to all date representations
+# involving years. It is not relevant to the Julian Day Numbers,
+# except for converting between them and year-based representations.
+#
+# In the Date and DateTime classes, the Day of Calendar Reform or
+# +sg+ can be specified a number of ways. First, it can be as
+# the Julian Day Number of the Day of Calendar Reform. Second,
+# it can be using the constants Date::ITALY or Date::ENGLAND; these
+# are in fact the Julian Day Numbers of the Day of Calendar Reform
+# of the respective regions. Third, it can be as the constant
+# Date::JULIAN, which means to always use the Julian Calendar.
+# Finally, it can be as the constant Date::GREGORIAN, which means
+# to always use the Gregorian Calendar.
+#
+# Note: in the Julian Calendar, New Years Day was March 25. The
+# Date class does not follow this convention.
+#
+# === Time Zones
+#
+# DateTime objects support a simple representation
+# of time zones. Time zones are represented as an offset
+# from UTC, as a fraction of a day. This offset is the
+# how much local time is later (or earlier) than UTC.
+# UTC offset 0 is centred on England (also known as GMT).
+# As you travel east, the offset increases until you
+# reach the dateline in the middle of the Pacific Ocean;
+# as you travel west, the offset decreases. This offset
+# is abbreviated as +of+ in the Date class.
+#
+# This simple representation of time zones does not take
+# into account the common practice of Daylight Savings
+# Time or Summer Time.
+#
+# Most DateTime methods return the date and the
+# time in local time. The two exceptions are
+# #ajd() and #amjd(), which return the date and time
+# in UTC time, including fractional days.
+#
+# The Date class does not support time zone offsets, in that
+# there is no way to create a Date object with a time zone.
+# However, methods of the Date class when used by a
+# DateTime instance will use the time zone offset of this
+# instance.
+#
+# == Examples of use
+#
+# === Print out the date of every Sunday between two dates.
+#
+# def print_sundays(d1, d2)
+# d1 +=1 while (d1.wday != 0)
+# d1.step(d2, 7) do |date|
+# puts "#{Date::MONTHNAMES[date.mon]} #{date.day}"
+# end
+# end
+#
+# print_sundays(Date::civil(2003, 4, 8), Date::civil(2003, 5, 23))
+#
+# === Calculate how many seconds to go till midnight on New Year's Day.
+#
+# def secs_to_new_year(now = DateTime::now())
+# new_year = DateTime.new(now.year + 1, 1, 1)
+# dif = new_year - now
+# hours, mins, secs, ignore_fractions = Date::day_fraction_to_time(dif)
+# return hours * 60 * 60 + mins * 60 + secs
+# end
+#
+# puts secs_to_new_year()
+
+require 'date/format'
+
+# Class representing a date.
+#
+# See the documentation to the file date.rb for an overview.
+#
+# Internally, the date is represented as an Astronomical
+# Julian Day Number, +ajd+. The Day of Calendar Reform, +sg+, is
+# also stored, for conversions to other date formats. (There
+# is also an +of+ field for a time zone offset, but this
+# is only for the use of the DateTime subclass.)
+#
+# A new Date object is created using one of the object creation
+# class methods named after the corresponding date format, and the
+# arguments appropriate to that date format; for instance,
+# Date::civil() (aliased to Date::new()) with year, month,
+# and day-of-month, or Date::ordinal() with year and day-of-year.
+# All of these object creation class methods also take the
+# Day of Calendar Reform as an optional argument.
+#
+# Date objects are immutable once created.
+#
+# Once a Date has been created, date values
+# can be retrieved for the different date formats supported
+# using instance methods. For instance, #mon() gives the
+# Civil month, #cwday() gives the Commercial day of the week,
+# and #yday() gives the Ordinal day of the year. Date values
+# can be retrieved in any format, regardless of what format
+# was used to create the Date instance.
+#
+# The Date class includes the Comparable module, allowing
+# date objects to be compared and sorted, ranges of dates
+# to be created, and so forth.
+class Date
+
+ include Comparable
+
+ # Full month names, in English. Months count from 1 to 12; a
+ # month's numerical representation indexed into this array
+ # gives the name of that month (hence the first element is nil).
+ MONTHNAMES = [nil] + %w(January February March April May June July
+ August September October November December)
+
+ # Full names of days of the week, in English. Days of the week
+ # count from 0 to 6 (except in the commercial week); a day's numerical
+ # representation indexed into this array gives the name of that day.
+ DAYNAMES = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
+
+ # Abbreviated month names, in English.
+ ABBR_MONTHNAMES = [nil] + %w(Jan Feb Mar Apr May Jun
+ Jul Aug Sep Oct Nov Dec)
+
+ # Abbreviated day names, in English.
+ ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat)
+
+ [MONTHNAMES, DAYNAMES, ABBR_MONTHNAMES, ABBR_DAYNAMES].each do |xs|
+ xs.each{|x| x.freeze unless x.nil?}.freeze
+ end
+
+ class Infinity < Numeric # :nodoc:
+
+ include Comparable
+
+ def initialize(d=1) @d = d <=> 0 end
+
+ def d() @d end
+
+ protected :d
+
+ def zero? () false end
+ def finite? () false end
+ def infinite? () d.nonzero? end
+ def nan? () d.zero? end
+
+ def abs() self.class.new end
+
+ def -@ () self.class.new(-d) end
+ def +@ () self.class.new(+d) end
+
+ def <=> (other)
+ case other
+ when Infinity; return d <=> other.d
+ when Numeric; return d
+ else
+ begin
+ l, r = other.coerce(self)
+ return l <=> r
+ rescue NoMethodError
+ end
+ end
+ nil
+ end
+
+ def coerce(other)
+ case other
+ when Numeric; return -d, d
+ else
+ super
+ end
+ end
+
+ end
+
+ # The Julian Day Number of the Day of Calendar Reform for Italy
+ # and the Catholic countries.
+ ITALY = 2299161 # 1582-10-15
+
+ # The Julian Day Number of the Day of Calendar Reform for England
+ # and her Colonies.
+ ENGLAND = 2361222 # 1752-09-14
+
+ # A constant used to indicate that a Date should always use the
+ # Julian calendar.
+ JULIAN = Infinity.new
+
+ # A constant used to indicate that a Date should always use the
+ # Gregorian calendar.
+ GREGORIAN = -Infinity.new
+
+ HALF_DAYS_IN_DAY = Rational(1, 2) # :nodoc:
+ HOURS_IN_DAY = Rational(1, 24) # :nodoc:
+ MINUTES_IN_DAY = Rational(1, 1440) # :nodoc:
+ SECONDS_IN_DAY = Rational(1, 86400) # :nodoc:
+ MILLISECONDS_IN_DAY = Rational(1, 86400*10**3) # :nodoc:
+ NANOSECONDS_IN_DAY = Rational(1, 86400*10**9) # :nodoc:
+ MILLISECONDS_IN_SECOND = Rational(1, 10**3) # :nodoc:
+ NANOSECONDS_IN_SECOND = Rational(1, 10**9) # :nodoc:
+
+ MJD_EPOCH_IN_AJD = Rational(4800001, 2) # 1858-11-17 # :nodoc:
+ UNIX_EPOCH_IN_AJD = Rational(4881175, 2) # 1970-01-01 # :nodoc:
+ MJD_EPOCH_IN_CJD = 2400001 # :nodoc:
+ 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)
+ end
+ j
+ 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
+
+ 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 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
+
+ # 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 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 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
+ 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
+ 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)
+ 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
+ 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
+
+ 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
+
+ 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 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
+
+ # 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
+
+ # Convert an +h+ hour, +min+ minutes, +s+ seconds period
+ # to a fractional day.
+ begin
+ Rational(Rational(1, 2), 2) # a challenge
+
+ 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)
+ 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
+
+ # 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
+ return unless 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
+
+ # 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
+ return unless 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
+
+ # 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
+
+ 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
+
+ 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
+
+ # 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
+
+ end
+
+ extend t
+ include t
+
+ # Is a year a leap year in the Julian calendar?
+ #
+ # All years divisible by 4 are leap years in the Julian calendar.
+ def self.julian_leap? (y) y % 4 == 0 end
+
+ # Is a year a leap year in the Gregorian calendar?
+ #
+ # All years divisible by 4 are leap years in the Gregorian calendar,
+ # except for years divisible by 100 and not by 400.
+ def self.gregorian_leap? (y) y % 4 == 0 && y % 100 != 0 || y % 400 == 0 end
+
+ 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
+
+ def self.valid_ordinal? (y, d, sg=ITALY)
+ !!_valid_ordinal?(y, d, sg)
+ end
+
+ def self.valid_civil? (y, m, d, sg=ITALY)
+ !!_valid_civil?(y, m, d, sg)
+ end
+
+ class << self; alias_method :valid_date?, :valid_civil? end
+
+ def self.valid_commercial? (y, w, d, sg=ITALY)
+ !!_valid_commercial?(y, w, d, sg)
+ end
+
+ def self.valid_weeknum? (y, w, d, f, sg=ITALY) # :nodoc:
+ !!_valid_weeknum?(y, w, d, f, sg)
+ 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)
+ 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)
+ new!(jd_to_ajd(jd, 0, 0), 0, sg)
+ end
+
+ # Create a new Date object from an Ordinal Date, specified
+ # by year +y+ and day-of-year +d+. +d+ can be negative,
+ # in which it counts backwards from the end of the year.
+ # No year wraparound is performed, however. An invalid
+ # value for +d+ results in an ArgumentError being raised.
+ #
+ # +y+ defaults to -4712, and +d+ to 1; this is Julian Day
+ # Number day 0.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
+ def self.ordinal(y=-4712, d=1, sg=ITALY)
+ unless jd = _valid_ordinal?(y, d, sg)
+ raise ArgumentError, 'invalid date'
+ end
+ new!(jd_to_ajd(jd, 0, 0), 0, sg)
+ end
+
+ # Create a new Date object for the Civil Date specified by
+ # year +y+, month +m+, and day-of-month +d+.
+ #
+ # +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.
+ # can be negative
+ #
+ # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is
+ # Julian Day Number day 0.
+ #
+ # +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)
+ raise ArgumentError, 'invalid date'
+ end
+ new!(jd_to_ajd(jd, 0, 0), 0, sg)
+ end
+
+ class << self; alias_method :new, :civil end
+
+ # Create a new Date object for the Commercial Date specified by
+ # year +y+, week-of-year +w+, and day-of-week +d+.
+ #
+ # 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.
+ #
+ # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
+ # Julian Day Number day 0.
+ #
+ # +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)
+ 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)
+ raise ArgumentError, 'invalid date'
+ end
+ new!(jd_to_ajd(jd, 0, 0), 0, sg)
+ end
+
+ 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]
+ d, fr = seconds.divmod(86400)
+ h, fr = fr.divmod(3600)
+ min, fr = fr.divmod(60)
+ s, fr = fr.divmod(1)
+ elem[:jd] = UNIX_EPOCH_IN_CJD + d
+ elem[:hour] = h
+ elem[:min] = min
+ elem[:sec] = s
+ elem[:sec_fraction] = fr
+ elem.delete(:seconds)
+ elem.delete(:offset)
+ end
+ elem
+ end
+
+ private_class_method :rewrite_frags
+
+ def self.complete_frags(elem) # :nodoc:
+ i = 0
+ g = [[:time, [:hour, :min, :sec]],
+ [nil, [:jd]],
+ [:ordinal, [:year, :yday, :hour, :min, :sec]],
+ [:civil, [:year, :mon, :mday, :hour, :min, :sec]],
+ [:commercial, [:cwyear, :cweek, :cwday, :hour, :min, :sec]],
+ [:wday, [:wday, :hour, :min, :sec]],
+ [:wnum0, [:year, :wnum0, :wday, :hour, :min, :sec]],
+ [:wnum1, [:year, :wnum1, :wday, :hour, :min, :sec]],
+ [nil, [:cwyear, :cweek, :wday, :hour, :min, :sec]],
+ [nil, [:year, :wnum0, :cwday, :hour, :min, :sec]],
+ [nil, [:year, :wnum1, :cwday, :hour, :min, :sec]]].
+ collect{|k, a| e = elem.values_at(*a).compact; [k, a, e]}.
+ select{|k, a, e| e.size > 0}.
+ sort_by{|k, a, e| [e.size, i -= 1]}.last
+
+ d = nil
+
+ if g && g[0] && (g[1].size - g[2].size) != 0
+ d ||= Date.today
+
+ case g[0]
+ when :ordinal
+ elem[:year] ||= d.year
+ elem[:yday] ||= 1
+ when :civil
+ g[1].each do |e|
+ break if elem[e]
+ elem[e] = d.__send__(e)
+ end
+ elem[:mon] ||= 1
+ elem[:mday] ||= 1
+ when :commercial
+ g[1].each do |e|
+ break if elem[e]
+ elem[e] = d.__send__(e)
+ end
+ elem[:cweek] ||= 1
+ elem[:cwday] ||= 1
+ when :wday
+ elem[:jd] ||= (d - d.wday + elem[:wday]).jd
+ when :wnum0
+ g[1].each do |e|
+ break if elem[e]
+ elem[e] = d.__send__(e)
+ end
+ elem[:wnum0] ||= 0
+ elem[:wday] ||= 0
+ when :wnum1
+ g[1].each do |e|
+ break if elem[e]
+ elem[e] = d.__send__(e)
+ end
+ elem[:wnum1] ||= 0
+ elem[:wday] ||= 1
+ end
+ end
+
+ if g && g[0] == :time
+ if self <= DateTime
+ d ||= Date.today
+ elem[:jd] ||= d.jd
+ end
+ end
+
+ elem[:hour] ||= 0
+ elem[:min] ||= 0
+ elem[:sec] ||= 0
+ elem[:sec] = [elem[:sec], 59].min
+
+ elem
+ end
+
+ private_class_method :complete_frags
+
+ def self.valid_date_frags?(elem, sg) # :nodoc:
+ catch :jd do
+ a = elem.values_at(:jd)
+ if a.all?
+ 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))
+ throw :jd, jd
+ end
+ end
+
+ a = elem.values_at(:year, :mon, :mday)
+ if a.all?
+ if jd = _valid_civil?(*(a << sg))
+ throw :jd, jd
+ end
+ end
+
+ a = elem.values_at(:cwyear, :cweek, :cwday)
+ if a[2].nil? && elem[:wday]
+ a[2] = elem[:wday].nonzero? || 7
+ end
+ if a.all?
+ if jd = _valid_commercial?(*(a << sg))
+ throw :jd, jd
+ end
+ end
+
+ a = elem.values_at(:year, :wnum0, :wday)
+ if a[2].nil? && elem[:cwday]
+ a[2] = elem[:cwday] % 7
+ end
+ if a.all?
+ if jd = _valid_weeknum?(*(a << 0 << sg))
+ throw :jd, jd
+ end
+ end
+
+ a = elem.values_at(:year, :wnum1, :wday)
+ if a[2]
+ a[2] = (a[2] - 1) % 7
+ end
+ if a[2].nil? && elem[:cwday]
+ a[2] = (elem[:cwday] - 1) % 7
+ end
+ if a.all?
+ if jd = _valid_weeknum?(*(a << 1 << sg))
+ throw :jd, jd
+ end
+ end
+ end
+ end
+
+ private_class_method :valid_date_frags?
+
+ def self.valid_time_frags? (elem) # :nodoc:
+ h, min, s = elem.values_at(:hour, :min, :sec)
+ _valid_time?(h, min, s)
+ end
+
+ private_class_method :valid_time_frags?
+
+ def self.new_by_frags(elem, sg) # :nodoc:
+ elem = rewrite_frags(elem)
+ elem = complete_frags(elem)
+ unless jd = valid_date_frags?(elem, sg)
+ raise ArgumentError, 'invalid date'
+ end
+ new!(jd_to_ajd(jd, 0, 0), 0, sg)
+ end
+
+ private_class_method :new_by_frags
+
+ # Create a new Date object by parsing from a String
+ # according to a specified format.
+ #
+ # +str+ is a String holding a date representation.
+ # +fmt+ is the format that the date is in. See
+ # date/format.rb for details on supported formats.
+ #
+ # The default +str+ is '-4712-01-01', and the default
+ # +fmt+ is '%F', which means Year-Month-Day_of_Month.
+ # This gives Julian Day Number day 0.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
+ #
+ # An ArgumentError will be raised if +str+ cannot be
+ # parsed.
+ def self.strptime(str='-4712-01-01', fmt='%F', sg=ITALY)
+ elem = _strptime(str, fmt)
+ new_by_frags(elem, sg)
+ end
+
+ # Create a new Date object by parsing from a String,
+ # without specifying the format.
+ #
+ # +str+ is a String holding a date representation.
+ # +comp+ specifies whether to interpret 2-digit years
+ # as 19XX (>= 69) or 20XX (< 69); the default is not to.
+ # The method will attempt to parse a date from the String
+ # using various heuristics; see #_parse in date/format.rb
+ # for more details. If parsing fails, an ArgumentError
+ # will be raised.
+ #
+ # The default +str+ is '-4712-01-01'; this is Julian
+ # Day Number day 0.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
+ def self.parse(str='-4712-01-01', comp=true, 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
+ 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 # <<dummy
+
+ private :once
+
+ end
+
+ # *NOTE* this is the documentation for the method new!(). If
+ # you are reading this as the documentation for new(), that is
+ # because rdoc doesn't fully support the aliasing of the
+ # initialize() method.
+ # new() is in
+ # fact an alias for #civil(): read the documentation for that
+ # method instead.
+ #
+ # Create a new Date object.
+ #
+ # +ajd+ is the Astronomical Julian Day Number.
+ # +of+ is the offset from UTC as a fraction of a day.
+ # Both default to 0.
+ #
+ # +sg+ specifies the Day of Calendar Reform to use for this
+ # Date object.
+ #
+ # 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
+
+ # 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
+
+ once :amjd
+
+ # Get the date as a Julian Day Number.
+ def jd() 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
+
+ # Get the date as a Modified Julian Day Number.
+ def mjd() 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
+
+ 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:
+
+ # Get the date as an Ordinal Date, [year, day_of_year]
+ def ordinal() 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 weeknum0() jd_to_weeknum(jd, 0, @sg) end # :nodoc:
+ def weeknum1() jd_to_weeknum(jd, 1, @sg) end # :nodoc:
+
+ once :civil, :ordinal, :commercial, :weeknum0, :weeknum1
+ private :civil, :ordinal, :commercial, :weeknum0, :weeknum1
+
+ # Get the year of this date.
+ def year() civil[0] end
+
+ # Get the day-of-the-year of this date.
+ #
+ # January 1 is day-of-the-year 1
+ def yday() ordinal[1] end
+
+ # Get the month of this date.
+ #
+ # January is month 1.
+ def mon() civil[1] end
+
+ # Get the day-of-the-month of this date.
+ def mday() civil[2] end
+
+ alias_method :month, :mon
+ alias_method :day, :mday
+
+ def wnum0() weeknum0[1] end # :nodoc:
+ def wnum1() weeknum1[1] end # :nodoc:
+
+ private :wnum0, :wnum1
+
+ # Get the time of this date as [hours, minutes, seconds,
+ # fraction_of_a_second]
+ def time() day_fraction_to_time(day_fraction) end # :nodoc:
+
+ once :time
+ private :time
+
+ # Get the hour of this date.
+ def hour() time[0] end
+
+ # Get the minute of this date.
+ def min() time[1] end
+
+ # Get the second of this date.
+ def sec() time[2] end
+
+ # Get the fraction-of-a-second of this date.
+ def sec_fraction() time[3] end
+
+ alias_method :minute, :min
+ alias_method :second, :sec
+ alias_method :second_fraction, :sec_fraction
+
+ private :hour, :min, :sec, :sec_fraction,
+ :minute, :second, :second_fraction
+
+ def zone() strftime('%:z') end
+
+ private :zone
+
+ # Get the commercial year of this date. See *Commercial* *Date*
+ # in the introduction for how this differs from the normal year.
+ def cwyear() commercial[0] end
+
+ # Get the commercial week of the year of this date.
+ def cweek() commercial[1] end
+
+ # Get the commercial day of the week of this date. Monday is
+ # commercial day-of-week 1; Sunday is commercial day-of-week 7.
+ def cwday() commercial[2] end
+
+ # 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
+
+ once :wday
+
+=begin
+ MONTHNAMES.each_with_index do |n, i|
+ if n
+ 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?
+
+ # Is the current date old-style (Julian Calendar)?
+ def julian? () jd < @sg end
+
+ # Is the current date new-style (Gregorian Calendar)?
+ def gregorian? () !julian? end
+
+ once :julian?, :gregorian?
+
+ def fix_style # :nodoc:
+ if julian?
+ then self.class::JULIAN
+ else self.class::GREGORIAN end
+ end
+
+ private :fix_style
+
+ # Is this a leap year?
+ def leap?
+ jd_to_civil(civil_to_jd(year, 3, 1, fix_style) - 1,
+ fix_style)[-1] == 29
+ end
+
+ once :leap?
+
+ # When is the Day of Calendar Reform for this Date object?
+ def start() @sg end
+
+ # Create a copy of this Date object using a new Day of Calendar Reform.
+ def new_start(sg=self.class::ITALY) self.class.new!(@ajd, @of, sg) end
+
+ # Create a copy of this Date object that uses the Italian/Catholic
+ # Day of Calendar Reform.
+ def italy() new_start(self.class::ITALY) end
+
+ # Create a copy of this Date object that uses the English/Colonial
+ # Day of Calendar Reform.
+ def england() new_start(self.class::ENGLAND) end
+
+ # Create a copy of this Date object that always uses the Julian
+ # Calendar.
+ def julian() new_start(self.class::JULIAN) end
+
+ # Create a copy of this Date object that always uses the Gregorian
+ # Calendar.
+ def gregorian() new_start(self.class::GREGORIAN) end
+
+ def offset() @of end
+
+ def new_offset(of=0)
+ if String === of
+ of = Rational(zone_to_diff(of) || 0, 86400)
+ end
+ self.class.new!(@ajd, of, @sg)
+ end
+
+ private :offset, :new_offset
+
+ # Return a new Date object that is +n+ days later than the
+ # current one.
+ #
+ # +n+ may be a negative value, in which case the new Date
+ # is earlier than the current one; however, #-() might be
+ # more intuitive.
+ #
+ # If +n+ is not a Numeric, a TypeError will be thrown. In
+ # particular, two Dates cannot be added to each other.
+ def + (n)
+ case n
+ when Numeric; return self.class.new!(@ajd + n, @of, @sg)
+ end
+ raise TypeError, 'expected numeric'
+ end
+
+ # If +x+ is a Numeric value, create a new Date object that is
+ # +x+ days earlier than the current one.
+ #
+ # If +x+ is a Date, return the number of days between the
+ # two dates; or, more precisely, how many days later the current
+ # date is than +x+.
+ #
+ # If +x+ is neither Numeric nor a Date, a TypeError is raised.
+ def - (x)
+ case x
+ when Numeric; return self.class.new!(@ajd - x, @of, @sg)
+ when Date; return @ajd - x.ajd
+ end
+ raise TypeError, 'expected numeric or date'
+ end
+
+ # Compare this date with another date.
+ #
+ # +other+ can also be a Numeric value, in which case it is
+ # interpreted as an Astronomical Julian Day Number.
+ #
+ # Comparison is by Astronomical Julian Day Number, including
+ # fractional days. This means that both the time and the
+ # timezone offset are taken into account when comparing
+ # two DateTime instances. When comparing a DateTime instance
+ # with a Date instance, the time of the latter will be
+ # considered as falling on midnight UTC.
+ def <=> (other)
+ 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
+
+ # The relationship operator for Date.
+ #
+ # Compares dates by Julian Day Number. When comparing
+ # two DateTime instances, or a DateTime with a Date,
+ # the instances will be regarded as equivalent if they
+ # fall on the same date in local time.
+ def === (other)
+ case other
+ when Numeric; return jd == other
+ when Date; return jd == other.jd
+ else
+ begin
+ l, r = other.coerce(self)
+ return l === r
+ rescue NoMethodError
+ end
+ end
+ false
+ end
+
+ def next_day(n=1) self + n end
+ def prev_day(n=1) self - n end
+
+ # Return a new Date one day after this one.
+ def next() next_day end
+
+ alias_method :succ, :next
+
+ # Return a new Date object that is +n+ months later than
+ # the current one.
+ #
+ # If the day-of-the-month of the current Date is greater
+ # than the last day of the target month, the day-of-the-month
+ # of the returned Date will be the last day of the target month.
+ def >> (n)
+ y, m = (year * 12 + (mon - 1) + n).divmod(12)
+ m, = (m + 1) .divmod(1)
+ d = mday
+ until jd2 = _valid_civil?(y, m, d, @sg)
+ d -= 1
+ raise ArgumentError, 'invalid date' unless d > 0
+ end
+ self + (jd2 - jd)
+ end
+
+ # Return a new Date object that is +n+ months earlier than
+ # the current one.
+ #
+ # If the day-of-the-month of the current Date is greater
+ # than the last day of the target month, the day-of-the-month
+ # of the returned Date will be the last day of the target month.
+ def << (n) self >> -n end
+
+ 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
+
+ require 'enumerator'
+
+ # Step the current date forward +step+ days at a
+ # time (or backward, if +step+ is negative) until
+ # we reach +limit+ (inclusive), yielding the resultant
+ # date at each step.
+ def step(limit, step=1) # :yield: date
+=begin
+ if step.zero?
+ raise ArgumentError, "step can't be 0"
+ end
+=end
+ unless block_given?
+ return to_enum(:step, limit, step)
+ end
+ da = self
+ op = %w(- <= >=)[step <=> 0]
+ while da.__send__(op, limit)
+ yield da
+ da += step
+ end
+ self
+ end
+
+ # Step forward one day at a time until we reach +max+
+ # (inclusive), yielding each date as we go.
+ def upto(max, &block) # :yield: date
+ step(max, +1, &block)
+ end
+
+ # Step backward one day at a time until we reach +min+
+ # (inclusive), yielding each date as we go.
+ def downto(min, &block) # :yield: date
+ step(min, -1, &block)
+ end
+
+ # Is this Date equal to +other+?
+ #
+ # +other+ must both be a Date object, and represent the same date.
+ def eql? (other) Date === other && self == other end
+
+ # Calculate a hash value for this 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
+
+ # Return the date as a human-readable string.
+ #
+ # The format used is YYYY-MM-DD.
+ def to_s() format('%.4d-%02d-%02d', year, mon, mday) end # 4p
+
+ # Dump to Marshal format.
+ def marshal_dump() [@ajd, @of, @sg] end
+
+ # Load from Marshal format.
+ def marshal_load(a)
+ @ajd, @of, @sg, = a
+ @__ca__ = {}
+ end
+
+end
+
+# Class representing a date and time.
+#
+# See the documentation to the file date.rb for an overview.
+#
+# DateTime objects are immutable once created.
+#
+# == Other methods.
+#
+# The following methods are defined in Date, but declared private
+# there. They are made public in DateTime. They are documented
+# here.
+#
+# === hour()
+#
+# Get the hour-of-the-day of the time. This is given
+# using the 24-hour clock, counting from midnight. The first
+# hour after midnight is hour 0; the last hour of the day is
+# hour 23.
+#
+# === min()
+#
+# Get the minute-of-the-hour of the time.
+#
+# === sec()
+#
+# Get the second-of-the-minute of the time.
+#
+# === sec_fraction()
+#
+# Get the fraction of a second of the time. This is returned as
+# a +Rational+.
+#
+# === zone()
+#
+# Get the time zone as a String. This is representation of the
+# time offset such as "+1000", not the true time-zone name.
+#
+# === offset()
+#
+# Get the time zone offset as a fraction of a day. This is returned
+# as a +Rational+.
+#
+# === new_offset(of=0)
+#
+# Create a new DateTime object, identical to the current one, except
+# with a new time zone offset of +of+. +of+ is the new offset from
+# UTC as a fraction of a day.
+#
+class DateTime < Date
+
+ # Create a new DateTime object corresponding to the specified
+ # Julian Day Number +jd+ and hour +h+, minute +min+, second +s+.
+ #
+ # 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. If an invalid time portion is specified,
+ # an ArgumentError is raised.
+ #
+ # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+ # +sg+ specifies the Day of Calendar Reform.
+ #
+ # 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))
+ 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
+
+ # Create a new DateTime object corresponding to the specified
+ # Ordinal Date and hour +h+, minute +min+, second +s+.
+ #
+ # 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. If an invalid time portion is specified,
+ # an ArgumentError is raised.
+ #
+ # +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, 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))
+ 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
+
+ # Create a new DateTime object corresponding to the specified
+ # Civil Date and hour +h+, minute +min+, second +s+.
+ #
+ # 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. If an invalid time portion is specified,
+ # an ArgumentError is raised.
+ #
+ # +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, +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))
+ 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
+
+ class << self; alias_method :new, :civil end
+
+ # Create a new DateTime object corresponding to the specified
+ # Commercial Date and hour +h+, minute +min+, second +s+.
+ #
+ # 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. If an invalid time portion is specified,
+ # an ArgumentError is raised.
+ #
+ # +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.
+ # 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))
+ 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
+
+ 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))
+ 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 :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)
+ unless (jd = valid_date_frags?(elem, sg)) &&
+ (fr = valid_time_frags?(elem))
+ raise ArgumentError, 'invalid date'
+ end
+ fr += (elem[:sec_fraction] || 0) / 86400
+ of = Rational(elem[:offset] || 0, 86400)
+ new!(jd_to_ajd(jd, fr, of), of, sg)
+ end
+
+ private_class_method :new_by_frags
+
+ # Create a new DateTime object by parsing from a String
+ # according to a specified format.
+ #
+ # +str+ is a String holding a date-time representation.
+ # +fmt+ is the format that the date-time is in. See
+ # date/format.rb for details on supported formats.
+ #
+ # The default +str+ is '-4712-01-01T00:00:00+00:00', and the default
+ # +fmt+ is '%FT%T%z'. This gives midnight on Julian Day Number day 0.
+ #
+ # +sg+ specifies the Day of Calendar Reform.
+ #
+ # An ArgumentError will be raised if +str+ cannot be
+ # parsed.
+ def self.strptime(str='-4712-01-01T00:00:00+00:00', fmt='%FT%T%z', sg=ITALY)
+ elem = _strptime(str, fmt)
+ new_by_frags(elem, sg)
+ end
+
+ # Create a new DateTime object by parsing from a String,
+ # without specifying the format.
+ #
+ # +str+ is a String holding a date-time representation.
+ # +comp+ specifies whether to interpret 2-digit years
+ # as 19XX (>= 69) or 20XX (< 69); the default is not to.
+ # The method will attempt to parse a date-time from the String
+ # using various heuristics; see #_parse in date/format.rb
+ # for more details. If parsing fails, an ArgumentError
+ # will be raised.
+ #
+ # The default +str+ is '-4712-01-01T00:00:00+00:00'; this is Julian
+ # 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)
+ 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
+
+ def to_s # 4p
+ format('%.4d-%02d-%02dT%02d:%02d:%02d%s',
+ year, mon, mday, hour, min, sec, zone)
+ end
+
+end
+
+class Time
+
+ 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)
+ 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)
+ of = Rational(utc_offset, 86400)
+ DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),
+ of, DateTime::ITALY)
+ end
+
+end
+
+class Date
+
+ 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
+
+ # 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
+
+ # 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
+
+ private_class_method :now
+
+end
+
+class DateTime < Date
+
+ def to_time
+ d = new_offset(0)
+ d.instance_eval do
+ Time.utc(year, mon, mday, hour, min, sec +
+ sec_fraction)
+ end.
+ getlocal
+ end
+
+ def to_date() Date.new!(jd_to_ajd(jd, 0, 0), 0, @sg) end
+ def to_datetime() self end
+
+ private_class_method :today
+ public_class_method :now
+
+end
diff --git a/lib/date/delta.rb b/lib/date/delta.rb
new file mode 100644
index 0000000000..d2ed5e86d3
--- /dev/null
+++ b/lib/date/delta.rb
@@ -0,0 +1,431 @@
+# delta.rb: Written by Tadayoshi Funaba 2004-2009
+
+require 'date'
+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 # <<dummy
+
+ 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
+
+vsave = $VERBOSE
+$VERBOSE = false
+
+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
+
+ def - (x)
+ 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'
+ end
+
+end
+
+$VERBOSE = vsave
diff --git a/lib/date/delta/parser.rb b/lib/date/delta/parser.rb
new file mode 100644
index 0000000000..7efe29f4c2
--- /dev/null
+++ b/lib/date/delta/parser.rb
@@ -0,0 +1,301 @@
+#
+# 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
new file mode 100644
index 0000000000..84d4c22c3c
--- /dev/null
+++ b/lib/date/delta/parser.ry
@@ -0,0 +1,84 @@
+# 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
new file mode 100644
index 0000000000..b30cf3a41e
--- /dev/null
+++ b/lib/date/format.rb
@@ -0,0 +1,1313 @@
+# format.rb: Written by Tadayoshi Funaba 1999-2009
+# $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
+
+class Date
+
+ module Format # :nodoc:
+
+ MONTHS = {
+ 'january' => 1, 'february' => 2, 'march' => 3, 'april' => 4,
+ 'may' => 5, 'june' => 6, 'july' => 7, 'august' => 8,
+ 'september'=> 9, 'october' =>10, 'november' =>11, 'december' =>12
+ }
+
+ DAYS = {
+ 'sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday'=> 3,
+ 'thursday' => 4, 'friday' => 5, 'saturday' => 6
+ }
+
+ ABBR_MONTHS = {
+ 'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4,
+ 'may' => 5, 'jun' => 6, 'jul' => 7, 'aug' => 8,
+ 'sep' => 9, 'oct' =>10, 'nov' =>11, 'dec' =>12
+ }
+
+ ABBR_DAYS = {
+ 'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3,
+ 'thu' => 4, 'fri' => 5, 'sat' => 6
+ }
+
+ ZONES = {
+ 'ut' => 0*3600, 'gmt' => 0*3600, 'est' => -5*3600, 'edt' => -4*3600,
+ 'cst' => -6*3600, 'cdt' => -5*3600, 'mst' => -7*3600, 'mdt' => -6*3600,
+ 'pst' => -8*3600, 'pdt' => -7*3600,
+ 'a' => 1*3600, 'b' => 2*3600, 'c' => 3*3600, 'd' => 4*3600,
+ 'e' => 5*3600, 'f' => 6*3600, 'g' => 7*3600, 'h' => 8*3600,
+ 'i' => 9*3600, 'k' => 10*3600, 'l' => 11*3600, 'm' => 12*3600,
+ 'n' => -1*3600, 'o' => -2*3600, 'p' => -3*3600, 'q' => -4*3600,
+ 'r' => -5*3600, 's' => -6*3600, 't' => -7*3600, 'u' => -8*3600,
+ 'v' => -9*3600, 'w' =>-10*3600, 'x' =>-11*3600, 'y' =>-12*3600,
+ 'z' => 0*3600,
+
+ 'utc' => 0*3600, 'wet' => 0*3600,
+ 'at' => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
+ 'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
+ 'nst' => -(3*3600+1800),
+ 'ast' => -4*3600, 'clt' => -4*3600,
+ 'akdt'=> -8*3600, 'ydt' => -8*3600,
+ 'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
+ 'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
+ 'nt' =>-11*3600,
+ 'idlw'=>-12*3600,
+ 'bst' => 1*3600, 'cet' => 1*3600, 'fwt' => 1*3600, 'met' => 1*3600,
+ 'mewt'=> 1*3600, 'mez' => 1*3600, 'swt' => 1*3600, 'wat' => 1*3600,
+ 'west'=> 1*3600,
+ 'cest'=> 2*3600, 'eet' => 2*3600, 'fst' => 2*3600, 'mest'=> 2*3600,
+ 'mesz'=> 2*3600, 'sast'=> 2*3600, 'sst' => 2*3600,
+ 'bt' => 3*3600, 'eat' => 3*3600, 'eest'=> 3*3600, 'msk' => 3*3600,
+ 'msd' => 4*3600, 'zp4' => 4*3600,
+ 'zp5' => 5*3600, 'ist' => (5*3600+1800),
+ 'zp6' => 6*3600,
+ 'wast'=> 7*3600,
+ 'cct' => 8*3600, 'sgt' => 8*3600, 'wadt'=> 8*3600,
+ 'jst' => 9*3600, 'kst' => 9*3600,
+ 'east'=> 10*3600, 'gst' => 10*3600,
+ 'eadt'=> 11*3600,
+ 'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
+ 'nzdt'=> 13*3600,
+
+ 'afghanistan' => 16200, 'alaskan' => -32400,
+ 'arab' => 10800, 'arabian' => 14400,
+ 'arabic' => 10800, 'atlantic' => -14400,
+ 'aus central' => 34200, 'aus eastern' => 36000,
+ 'azores' => -3600, 'canada central' => -21600,
+ 'cape verde' => -3600, 'caucasus' => 14400,
+ 'cen. australia' => 34200, 'central america' => -21600,
+ 'central asia' => 21600, 'central europe' => 3600,
+ 'central european' => 3600, 'central pacific' => 39600,
+ 'central' => -21600, 'china' => 28800,
+ 'dateline' => -43200, 'e. africa' => 10800,
+ 'e. australia' => 36000, 'e. europe' => 7200,
+ 'e. south america' => -10800, 'eastern' => -18000,
+ 'egypt' => 7200, 'ekaterinburg' => 18000,
+ 'fiji' => 43200, 'fle' => 7200,
+ 'greenland' => -10800, 'greenwich' => 0,
+ 'gtb' => 7200, 'hawaiian' => -36000,
+ 'india' => 19800, 'iran' => 12600,
+ 'jerusalem' => 7200, 'korea' => 32400,
+ 'mexico' => -21600, 'mid-atlantic' => -7200,
+ 'mountain' => -25200, 'myanmar' => 23400,
+ 'n. central asia' => 21600, 'nepal' => 20700,
+ 'new zealand' => 43200, 'newfoundland' => -12600,
+ 'north asia east' => 28800, 'north asia' => 25200,
+ 'pacific sa' => -14400, 'pacific' => -28800,
+ 'romance' => 3600, 'russian' => 10800,
+ 'sa eastern' => -10800, 'sa pacific' => -18000,
+ 'sa western' => -14400, 'samoa' => -39600,
+ 'se asia' => 25200, 'malay peninsula' => 28800,
+ 'south africa' => 7200, 'sri lanka' => 21600,
+ 'taipei' => 28800, 'tasmania' => 36000,
+ 'tokyo' => 32400, 'tonga' => 46800,
+ 'us eastern' => -18000, 'us mountain' => -25200,
+ 'vladivostok' => 36000, 'w. australia' => 28800,
+ 'w. central africa' => 3600, 'w. europe' => 3600,
+ 'west asia' => 18000, 'west pacific' => 36000,
+ 'yakutsk' => 32400
+ }
+
+ [MONTHS, DAYS, ABBR_MONTHS, ABBR_DAYS, ZONES].each do |x|
+ x.freeze
+ end
+
+ class Bag # :nodoc:
+
+ def initialize
+ @elem = {}
+ end
+
+ def method_missing(t, *args, &block)
+ t = t.to_s
+ set = t.chomp!('=')
+ t = t.intern
+ if set
+ @elem[t] = args[0]
+ else
+ @elem[t]
+ end
+ end
+
+ def to_hash
+ @elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
+ end
+
+ end
+
+ end
+
+ def emit(e, f) # :nodoc:
+ case e
+ when Numeric
+ sign = %w(+ + -)[e <=> 0]
+ e = e.abs
+ end
+
+ s = e.to_s
+
+ if f[:s] && f[:p] == '0'
+ f[:w] -= 1
+ end
+
+ if f[:s] && f[:p] == "\s"
+ s[0,0] = sign
+ end
+
+ if f[:p] != '-'
+ s = s.rjust(f[:w], f[:p])
+ end
+
+ if f[:s] && f[:p] != "\s"
+ s[0,0] = sign
+ end
+
+ s = s.upcase if f[:u]
+ s = s.downcase if f[:d]
+ s
+ end
+
+ def emit_w(e, w, f) # :nodoc:
+ f[:w] = [f[:w], w].compact.max
+ emit(e, f)
+ end
+
+ def emit_n(e, w, f) # :nodoc:
+ f[:p] ||= '0'
+ emit_w(e, w, f)
+ end
+
+ def emit_sn(e, w, f) # :nodoc:
+ if e < 0
+ w += 1
+ f[:s] = true
+ end
+ emit_n(e, w, f)
+ end
+
+ def emit_z(e, w, f) # :nodoc:
+ w += 1
+ f[:s] = true
+ emit_n(e, w, f)
+ end
+
+ def emit_a(e, w, f) # :nodoc:
+ f[:p] ||= "\s"
+ emit_w(e, w, f)
+ end
+
+ def emit_ad(e, w, f) # :nodoc:
+ if f[:x]
+ f[:u] = true
+ f[:d] = false
+ end
+ emit_a(e, w, f)
+ end
+
+ def emit_au(e, w, f) # :nodoc:
+ if f[:x]
+ f[:u] = false
+ f[:d] = true
+ end
+ emit_a(e, w, f)
+ end
+
+ private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
+ :emit_a, :emit_ad, :emit_au
+
+ def strftime(fmt='%F')
+ fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
+ f = {}
+ m = $&
+ s, w, c = $1, $2, $3
+ if s
+ s.scan(/./) do |k|
+ case k
+ when '-'; f[:p] = '-'
+ when '_'; f[:p] = "\s"
+ when '0'; f[:p] = '0'
+ when '^'; f[:u] = true
+ when '#'; f[:x] = true
+ end
+ end
+ end
+ if w
+ f[:w] = w.to_i
+ end
+ case c
+ when 'A'; emit_ad(DAYNAMES[wday], 0, f)
+ when 'a'; emit_ad(ABBR_DAYNAMES[wday], 0, f)
+ when 'B'; emit_ad(MONTHNAMES[mon], 0, f)
+ when 'b'; emit_ad(ABBR_MONTHNAMES[mon], 0, f)
+ when 'C', 'EC'; emit_sn((year / 100).floor, 2, f)
+ when 'c', 'Ec'; emit_a(strftime('%a %b %e %H:%M:%S %Y'), 0, f)
+ when 'D'; emit_a(strftime('%m/%d/%y'), 0, f)
+ when 'd', 'Od'; emit_n(mday, 2, f)
+ when 'e', 'Oe'; emit_a(mday, 2, f)
+ when 'F'
+ if m == '%F'
+ format('%.4d-%02d-%02d', year, mon, mday) # 4p
+ else
+ emit_a(strftime('%Y-%m-%d'), 0, f)
+ end
+ when 'G'; emit_sn(cwyear, 4, f)
+ when 'g'; emit_n(cwyear % 100, 2, f)
+ when 'H', 'OH'; emit_n(hour, 2, f)
+ when 'h'; emit_ad(strftime('%b'), 0, f)
+ when 'I', 'OI'; emit_n((hour % 12).nonzero? || 12, 2, f)
+ 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)
+ 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)
+ 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'
+ s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
+ emit_sn(s, 1, f)
+ when 'R'; emit_a(strftime('%H:%M'), 0, f)
+ when 'r'; emit_a(strftime('%I:%M:%S %p'), 0, f)
+ when 'S', 'OS'; emit_n(sec, 2, f)
+ when 's'
+ s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
+ emit_sn(s, 1, f)
+ when 'T'
+ if m == '%T'
+ format('%02d:%02d:%02d', hour, min, sec) # 4p
+ else
+ emit_a(strftime('%H:%M:%S'), 0, f)
+ end
+ when 't'; emit_a("\t", 0, f)
+ 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)
+ when 'V', 'OV'; emit_n(cweek, 2, f)
+ when 'v'; emit_a(strftime('%e-%b-%Y'), 0, f)
+ when 'w', 'Ow'; emit_n(wday, 1, f)
+ when 'X', 'EX'; emit_a(strftime('%H:%M:%S'), 0, f)
+ when 'x', 'Ex'; emit_a(strftime('%m/%d/%y'), 0, f)
+ when 'Y', 'EY'; emit_sn(year, 4, f)
+ when 'y', 'Ey', 'Oy'; emit_n(year % 100, 2, f)
+ when 'Z'; emit_au(strftime('%:z'), 0, f)
+ when /\A(:{0,3})z/
+ t = $1.size
+ sign = if offset < 0 then -1 else +1 end
+ fr = offset.abs
+ ss = fr.div(SECONDS_IN_DAY) # 4p
+ hh, ss = ss.divmod(3600)
+ mm, ss = ss.divmod(60)
+ if t == 3
+ if ss.nonzero? then t = 2
+ elsif mm.nonzero? then t = 1
+ else t = -1
+ end
+ end
+ case t
+ when -1
+ tail = []
+ sep = ''
+ when 0
+ f[:w] -= 2 if f[:w]
+ tail = ['%02d' % mm]
+ sep = ''
+ when 1
+ f[:w] -= 3 if f[:w]
+ tail = ['%02d' % mm]
+ sep = ':'
+ when 2
+ f[:w] -= 6 if f[:w]
+ tail = ['%02d' % mm, '%02d' % ss]
+ sep = ':'
+ end
+ ([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)
+ else
+ m
+ end
+ end
+ end
+
+# alias_method :format, :strftime
+
+ def asctime() strftime('%c') end
+
+ alias_method :ctime, :asctime
+
+ 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
+ else
+ case jd
+ when 2405160...2419614
+ g = 'M%02d' % (year - 1867)
+ when 2419614...2424875
+ g = 'T%02d' % (year - 1911)
+ when 2424875...2447535
+ g = 'S%02d' % (year - 1925)
+ else
+ g = 'H%02d' % (year - 1988)
+ end
+ g + strftime('.%m.%d')
+ end
+ end
+
+=begin
+ def beat(n=0)
+ i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
+ ('@%03d' % i) +
+ if n < 1
+ ''
+ else
+ '.%0*d' % [n, (f / Rational(1, 10**n)).round]
+ end
+ end
+=end
+
+ def self.num_pattern? (s) # :nodoc:
+ /\A%[EO]?[CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy\d]/ =~ s || /\A\d/ =~ s
+ end
+
+ private_class_method :num_pattern?
+
+ def self._strptime_i(str, fmt, e) # :nodoc:
+ fmt.scan(/%([EO]?(?::{1,3}z|.))|(.)/m) do |s, c|
+ a = $&
+ if s
+ case s
+ when 'A', 'a'
+ return unless str.sub!(/\A(#{Format::DAYS.keys.join('|')})/io, '') ||
+ str.sub!(/\A(#{Format::ABBR_DAYS.keys.join('|')})/io, '')
+ val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
+ return unless val
+ e.wday = val
+ when 'B', 'b', 'h'
+ return unless str.sub!(/\A(#{Format::MONTHS.keys.join('|')})/io, '') ||
+ str.sub!(/\A(#{Format::ABBR_MONTHS.keys.join('|')})/io, '')
+ val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
+ return unless val
+ e.mon = val
+ when 'C', 'EC'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,2})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ val = $1.to_i
+ e._cent = val
+ when 'c', 'Ec'
+ return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
+ when 'D'
+ return unless _strptime_i(str, '%m/%d/%y', e)
+ when 'd', 'e', 'Od', 'Oe'
+ return unless str.sub!(/\A( \d|\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..31) === val
+ e.mday = val
+ when 'F'
+ return unless _strptime_i(str, '%Y-%m-%d', e)
+ when 'G'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,4})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ val = $1.to_i
+ e.cwyear = val
+ when 'g'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..99) === val
+ e.cwyear = val
+ e._cent ||= if val >= 69 then 19 else 20 end
+ when 'H', 'k', 'OH'
+ return unless str.sub!(/\A( \d|\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..24) === val
+ e.hour = val
+ when 'I', 'l', 'OI'
+ return unless str.sub!(/\A( \d|\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..12) === val
+ e.hour = val
+ when 'j'
+ return unless str.sub!(/\A(\d{1,3})/, '')
+ val = $1.to_i
+ return unless (1..366) === val
+ e.yday = val
+ when 'L'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,3})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+# val = Rational($1.to_i, 10**3)
+ val = Rational($1.to_i, 10**$1.size)
+ e.sec_fraction = val
+ when 'M', 'OM'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..59) === val
+ e.min = val
+ when 'm', 'Om'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..12) === val
+ e.mon = val
+ when 'N'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,9})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+# val = Rational($1.to_i, 10**9)
+ val = Rational($1.to_i, 10**$1.size)
+ e.sec_fraction = val
+ when 'n', 't'
+ return unless _strptime_i(str, "\s", e)
+ when 'P', 'p'
+ return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
+ e._merid = if $1.downcase == 'a' then 0 else 12 end
+ when 'Q'
+ return unless str.sub!(/\A(-?\d{1,})/, '')
+ val = Rational($1.to_i, 10**3)
+ e.seconds = val
+ when 'R'
+ return unless _strptime_i(str, '%H:%M', e)
+ when 'r'
+ return unless _strptime_i(str, '%I:%M:%S %p', e)
+ when 'S', 'OS'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..60) === val
+ e.sec = val
+ when 's'
+ return unless str.sub!(/\A(-?\d{1,})/, '')
+ val = $1.to_i
+ e.seconds = val
+ when 'T'
+ return unless _strptime_i(str, '%H:%M:%S', e)
+ when 'U', 'W', 'OU', 'OW'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..53) === val
+ e.__send__(if s[-1,1] == 'U' then :wnum0= else :wnum1= end, val)
+ when 'u', 'Ou'
+ return unless str.sub!(/\A(\d{1})/, '')
+ val = $1.to_i
+ return unless (1..7) === val
+ e.cwday = val
+ when 'V', 'OV'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..53) === val
+ e.cweek = val
+ when 'v'
+ return unless _strptime_i(str, '%e-%b-%Y', e)
+ when 'w'
+ return unless str.sub!(/\A(\d{1})/, '')
+ val = $1.to_i
+ return unless (0..6) === val
+ e.wday = val
+ when 'X', 'EX'
+ return unless _strptime_i(str, '%H:%M:%S', e)
+ when 'x', 'Ex'
+ return unless _strptime_i(str, '%m/%d/%y', e)
+ when 'Y', 'EY'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,4})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ val = $1.to_i
+ e.year = val
+ when 'y', 'Ey', 'Oy'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..99) === val
+ e.year = val
+ e._cent ||= if val >= 69 then 19 else 20 end
+ when 'Z', /\A:{0,3}z/
+ return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+ |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
+ |[[:alpha:]]+(?:\s+dst)?\b
+ )/ix, '')
+ val = $1
+ e.zone = val
+ offset = zone_to_diff(val)
+ e.offset = offset
+ when '%'
+ return unless str.sub!(/\A%/, '')
+ when '+'
+ return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+ else
+ return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+ end
+ else
+ case c
+ when /\A\s/
+ str.sub!(/\A\s+/, '')
+ else
+ return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+ end
+ end
+ end
+ end
+
+ private_class_method :_strptime_i
+
+ def self._strptime(str, fmt='%F')
+ str = str.dup
+ e = Format::Bag.new
+ return unless _strptime_i(str, fmt, e)
+
+ if e._cent
+ if e.cwyear
+ e.cwyear += e._cent * 100
+ end
+ if e.year
+ e. year += e._cent * 100
+ end
+ end
+
+ if e._merid
+ if e.hour
+ e.hour %= 12
+ e.hour += e._merid
+ end
+ end
+
+ unless str.empty?
+ e.leftover = str
+ end
+
+ e.to_hash
+ end
+
+ def self.s3e(e, y, m, d, bc=false)
+ unless String === m
+ m = m.to_s
+ end
+
+ if y && m && !d
+ y, m, d = d, y, m
+ end
+
+ if y == nil
+ if d && d.size > 2
+ y = d
+ d = nil
+ end
+ if d && d[0,1] == "'"
+ y = d
+ d = nil
+ end
+ end
+
+ if y
+ y.scan(/(\d+)(.+)?/)
+ if $2
+ y, d = d, $1
+ end
+ end
+
+ if m
+ if m[0,1] == "'" || m.size > 2
+ y, m, d = m, d, y # us -> be
+ end
+ end
+
+ if d
+ if d[0,1] == "'" || d.size > 2
+ y, d = d, y
+ end
+ end
+
+ if y
+ y =~ /([-+])?(\d+)/
+ if $1 || $2.size > 2
+ c = false
+ end
+ iy = $&.to_i
+ if bc
+ iy = -iy + 1
+ end
+ e.year = iy
+ end
+
+ if m
+ m =~ /\d+/
+ e.mon = $&.to_i
+ end
+
+ if d
+ d =~ /\d+/
+ e.mday = $&.to_i
+ end
+
+ if c != nil
+ e._comp = c
+ end
+
+ end
+
+ private_class_method :s3e
+
+ def self._parse_day(str, e) # :nodoc:
+ if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
+ e.wday = Format::ABBR_DAYS[$1.downcase]
+ true
+=begin
+ elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
+ e.wday = %w(su mo tu we th fr sa).index($1.downcase)
+ true
+=end
+ end
+ end
+
+ def self._parse_time(str, e) # :nodoc:
+ if str.sub!(
+ /(
+ (?:
+ \d+\s*:\s*\d+
+ (?:
+ \s*:\s*\d+(?:[,.]\d*)?
+ )?
+ |
+ \d+\s*h(?:\s*\d+m?(?:\s*\d+s?)?)?
+ )
+ (?:
+ \s*
+ [ap](?:m\b|\.m\.)
+ )?
+ |
+ \d+\s*[ap](?:m\b|\.m\.)
+ )
+ (?:
+ \s*
+ (
+ (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+ |
+ [[:alpha:].\s]+(?:standard|daylight)\stime\b
+ |
+ [[:alpha:]]+(?:\sdst)?\b
+ )
+ )?
+ /ix,
+ ' ')
+
+ t = $1
+ e.zone = $2 if $2
+
+ t =~ /\A(\d+)h?
+ (?:\s*:?\s*(\d+)m?
+ (?:
+ \s*:?\s*(\d+)(?:[,.](\d+))?s?
+ )?
+ )?
+ (?:\s*([ap])(?:m\b|\.m\.))?/ix
+
+ e.hour = $1.to_i
+ 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.hour %= 12
+ if $5.downcase == 'p'
+ e.hour += 12
+ end
+ end
+ true
+ end
+ end
+
+=begin
+ def self._parse_beat(str, e) # :nodoc:
+ if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
+ beat = Rational($1.to_i)
+ beat += Rational($2.to_i, 10**$2.size) if $2
+ secs = Rational(beat, 1000)
+ h, min, s, fr = self.day_fraction_to_time(secs)
+ e.hour = h
+ e.min = min
+ e.sec = s
+ e.sec_fraction = fr * 86400
+ e.zone = '+01:00'
+ true
+ end
+ end
+=end
+
+ def self._parse_eu(str, e) # :nodoc:
+ if str.sub!(
+ /'?(\d+)[^-\d\s]*
+ \s*
+ (#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+ (?:
+ \s*
+ (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+ \s*
+ ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
+ )?
+ /iox,
+ ' ') # '
+ s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
+ $3 && $3[0,1].downcase == 'b')
+ true
+ end
+ end
+
+ def self._parse_us(str, e) # :nodoc:
+ if str.sub!(
+ /\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+ \s*
+ ('?\d+)[^-\d\s']*
+ (?:
+ \s*
+ (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+ \s*
+ ('?-?\d+)
+ )?
+ /iox,
+ ' ') # '
+ s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
+ $3 && $3[0,1].downcase == 'b')
+ true
+ end
+ end
+
+ def self._parse_iso(str, e) # :nodoc:
+ if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
+ 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, ' ')
+ 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, ' ')
+ e.cwday = $1.to_i
+ true
+ elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
+ e.mon = $1.to_i if $1
+ e.mday = $2.to_i
+ true
+ elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
+ 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/, ' ')
+ e.year = $1.to_i
+ e.yday = $2.to_i
+ true
+ elsif /\d-\d{3}\b/ !~ str &&
+ str.sub!(/\b-(\d{3})\b/, ' ')
+ e.yday = $1.to_i
+ true
+ end
+ end
+
+ def self._parse_jis(str, e) # :nodoc:
+ if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
+ era = { 'm'=>1867,
+ 't'=>1911,
+ 's'=>1925,
+ 'h'=>1988
+ }[$1.downcase]
+ e.year = $2.to_i + era
+ e.mon = $3.to_i
+ e.mday = $4.to_i
+ true
+ end
+ end
+
+ def self._parse_vms(str, e) # :nodoc:
+ if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
+ -('?-?\d+)/iox, ' ')
+ s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
+ true
+ elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
+ -('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
+ 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)
+ true
+ end
+ end
+
+ def self._parse_dot(str, e) # :nodoc:
+ if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
+ s3e(e, $1, $2, $3)
+ true
+ end
+ end
+
+ def self._parse_year(str, e) # :nodoc:
+ if str.sub!(/'(\d+)\b/, ' ')
+ 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, ' ')
+ 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, ' ')
+ e.mday = $1.to_i
+ true
+ end
+ end
+
+ def self._parse_ddd(str, e) # :nodoc:
+ if str.sub!(
+ /([-+]?)(\d{2,14})
+ (?:
+ \s*
+ t?
+ \s*
+ (\d{2,6})?(?:[,.](\d*))?
+ )?
+ (?:
+ \s*
+ (
+ z\b
+ |
+ [-+]\d{1,4}\b
+ |
+ \[[-+]?\d[^\]]*\]
+ )
+ )?
+ /ix,
+ ' ')
+ case $2.size
+ when 2
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ else
+ e.mday = $2[ 0, 2].to_i
+ end
+ when 4
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ else
+ e.mon = $2[ 0, 2].to_i
+ e.mday = $2[ 2, 2].to_i
+ end
+ when 6
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-6, 2].to_i
+ else
+ e.year = ($1 + $2[ 0, 2]).to_i
+ e.mon = $2[ 2, 2].to_i
+ e.mday = $2[ 4, 2].to_i
+ end
+ when 8, 10, 12, 14
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-6, 2].to_i
+ e.mday = $2[-8, 2].to_i
+ if $2.size >= 10
+ e.mon = $2[-10, 2].to_i
+ end
+ if $2.size == 12
+ e.year = ($1 + $2[-12, 2]).to_i
+ end
+ if $2.size == 14
+ e.year = ($1 + $2[-14, 4]).to_i
+ e._comp = false
+ end
+ else
+ e.year = ($1 + $2[ 0, 4]).to_i
+ e.mon = $2[ 4, 2].to_i
+ e.mday = $2[ 6, 2].to_i
+ e.hour = $2[ 8, 2].to_i if $2.size >= 10
+ e.min = $2[10, 2].to_i if $2.size >= 12
+ e.sec = $2[12, 2].to_i if $2.size >= 14
+ e._comp = false
+ end
+ when 3
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-3, 1].to_i
+ else
+ e.yday = $2[ 0, 3].to_i
+ end
+ when 5
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-5, 1].to_i
+ else
+ e.year = ($1 + $2[ 0, 2]).to_i
+ e.yday = $2[ 2, 3].to_i
+ end
+ when 7
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-6, 2].to_i
+ e.mday = $2[-7, 1].to_i
+ else
+ e.year = ($1 + $2[ 0, 4]).to_i
+ e.yday = $2[ 4, 3].to_i
+ end
+ end
+ if $3
+ if $4
+ case $3.size
+ when 2, 4, 6
+ e.sec = $3[-2, 2].to_i
+ e.min = $3[-4, 2].to_i if $3.size >= 4
+ e.hour = $3[-6, 2].to_i if $3.size >= 6
+ end
+ else
+ case $3.size
+ when 2, 4, 6
+ e.hour = $3[ 0, 2].to_i
+ e.min = $3[ 2, 2].to_i if $3.size >= 4
+ e.sec = $3[ 4, 2].to_i if $3.size >= 6
+ end
+ end
+ end
+ if $4
+ e.sec_fraction = Rational($4.to_i, 10**$4.size)
+ end
+ if $5
+ e.zone = $5
+ if e.zone[0,1] == '['
+ o, n, = e.zone[1..-2].split(':')
+ e.zone = n || o
+ if /\A\d/ =~ o
+ o = format('+%s', o)
+ end
+ e.offset = zone_to_diff(o)
+ end
+ end
+ true
+ end
+ end
+
+ private_class_method :_parse_day, :_parse_time, # :_parse_beat,
+ :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
+ :_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
+ :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
+
+ def self._parse(str, comp=true)
+ str = str.dup
+
+ e = Format::Bag.new
+
+ e._comp = comp
+
+ str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
+
+ _parse_time(str, e) # || _parse_beat(str, e)
+ _parse_day(str, e)
+
+ _parse_eu(str, e) ||
+ _parse_us(str, e) ||
+ _parse_iso(str, e) ||
+ _parse_jis(str, e) ||
+ _parse_vms(str, e) ||
+ _parse_sla(str, e) ||
+ _parse_dot(str, e) ||
+ _parse_iso2(str, e) ||
+ _parse_year(str, e) ||
+ _parse_mon(str, e) ||
+ _parse_mday(str, e) ||
+ _parse_ddd(str, e)
+
+ if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
+ if e.year
+ e.year = -e.year + 1
+ end
+ end
+
+ if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
+ if e.hour && !e.mday
+ v = $1.to_i
+ if (1..31) === v
+ e.mday = v
+ end
+ end
+ if e.mday && !e.hour
+ v = $1.to_i
+ if (0..24) === v
+ e.hour = v
+ end
+ end
+ end
+
+ if e._comp
+ if e.cwyear
+ if e.cwyear >= 0 && e.cwyear <= 99
+ e.cwyear += if e.cwyear >= 69
+ then 1900 else 2000 end
+ end
+ end
+ if e.year
+ if e.year >= 0 && e.year <= 99
+ e.year += if e.year >= 69
+ then 1900 else 2000 end
+ end
+ end
+ end
+
+ e.offset ||= zone_to_diff(e.zone) if e.zone
+
+ 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
+ else
+ _iso8601(str)
+ 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'
+ 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
+ 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
+ end
+ offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+ offset *= -1 if sign == '-'
+ end
+ offset
+ end
+
+ end
+
+ extend t
+ include t
+
+end
+
+class DateTime < Date
+
+ def strftime(fmt='%FT%T%:z')
+ super(fmt)
+ end
+
+ def self._strptime(str, fmt='%FT%T%z')
+ super(str, fmt)
+ end
+
+ def iso8601_timediv(n) # :nodoc:
+ strftime('T%T' +
+ if n < 1
+ ''
+ else
+ '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
+ end +
+ '%:z')
+ end
+
+ private :iso8601_timediv
+
+ def iso8601(n=0)
+ super() + iso8601_timediv(n)
+ end
+
+ 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
diff --git a/lib/debug.rb b/lib/debug.rb
index 40886b14a6..5cbd7f7aab 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -12,663 +12,503 @@ end
require 'tracer'
require 'pp'
-class Tracer # :nodoc:
+class Tracer
def Tracer.trace_func(*vars)
Single.trace_func(*vars)
end
end
-SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__ # :nodoc:
-
-##
-# This library provides debugging functionality to Ruby.
-#
-# To add a debugger to your code, start by requiring +debug+ in your
-# program:
-#
-# def say(word)
-# require 'debug'
-# puts word
-# end
-#
-# This will cause Ruby to interrupt execution and show a prompt when the +say+
-# method is run.
-#
-# Once you're inside the prompt, you can start debugging your program.
-#
-# (rdb:1) p word
-# "hello"
-#
-# == Getting help
-#
-# You can get help at any time by pressing +h+.
-#
-# (rdb:1) h
-# Debugger help v.-0.002b
-# Commands
-# b[reak] [file:|class:]<line|method>
-# b[reak] [class.]<line|method>
-# set breakpoint to some position
-# wat[ch] <expression> set watchpoint to some expression
-# cat[ch] (<exception>|off) set catchpoint to an exception
-# b[reak] list breakpoints
-# cat[ch] show catchpoint
-# del[ete][ nnn] delete some or all breakpoints
-# disp[lay] <expression> add expression into display expression list
-# undisp[lay][ nnn] delete one particular or all display expressions
-# c[ont] run until program ends or hit breakpoint
-# s[tep][ nnn] step (into methods) one line or till line nnn
-# n[ext][ nnn] go over one line or till line nnn
-# w[here] display frames
-# f[rame] alias for where
-# l[ist][ (-|nn-mm)] list program, - lists backwards
-# nn-mm lists given lines
-# up[ nn] move to higher frame
-# down[ nn] move to lower frame
-# fin[ish] return to outer frame
-# tr[ace] (on|off) set trace mode of current thread
-# tr[ace] (on|off) all set trace mode of all threads
-# q[uit] exit from debugger
-# v[ar] g[lobal] show global variables
-# v[ar] l[ocal] show local variables
-# v[ar] i[nstance] <object> show instance variables of object
-# v[ar] c[onst] <object> show constants of object
-# m[ethod] i[nstance] <obj> show methods of object
-# m[ethod] <class|module> show instance methods of class or module
-# th[read] l[ist] list all threads
-# th[read] c[ur[rent]] show current thread
-# th[read] [sw[itch]] <nnn> switch thread context to nnn
-# th[read] stop <nnn> stop thread nnn
-# th[read] resume <nnn> resume thread nnn
-# p expression evaluate expression and print its value
-# h[elp] print this help
-# <everything else> evaluate
-#
-# == Usage
-#
-# The following is a list of common functionalities that the debugger
-# provides.
-#
-# === Navigating through your code
-#
-# In general, a debugger is used to find bugs in your program, which
-# often means pausing execution and inspecting variables at some point
-# in time.
-#
-# Let's look at an example:
-#
-# def my_method(foo)
-# require 'debug'
-# foo = get_foo if foo.nil?
-# raise if foo.nil?
-# end
-#
-# When you run this program, the debugger will kick in just before the
-# +foo+ assignment.
-#
-# (rdb:1) p foo
-# nil
-#
-# In this example, it'd be interesting to move to the next line and
-# inspect the value of +foo+ again. You can do that by pressing +n+:
-#
-# (rdb:1) n # goes to next line
-# (rdb:1) p foo
-# nil
-#
-# You now know that the original value of +foo+ was nil, and that it
-# still was nil after calling +get_foo+.
-#
-# Other useful commands for navigating through your code are:
-#
-# +c+::
-# Runs the program until it either exists or encounters another breakpoint.
-# You usually press +c+ when you are finished debugging your program and
-# want to resume its execution.
-# +s+::
-# Steps into method definition. In the previous example, +s+ would take you
-# inside the method definition of +get_foo+.
-# +r+::
-# Restart the program.
-# +q+::
-# Quit the program.
-#
-# === Inspecting variables
-#
-# You can use the debugger to easily inspect both local and global variables.
-# We've seen how to inspect local variables before:
-#
-# (rdb:1) p my_arg
-# 42
-#
-# You can also pretty print the result of variables or expressions:
-#
-# (rdb:1) pp %w{a very long long array containing many words}
-# ["a",
-# "very",
-# "long",
-# ...
-# ]
-#
-# You can list all local variables with +v l+:
-#
-# (rdb:1) v l
-# foo => "hello"
-#
-# Similarly, you can show all global variables with +v g+:
-#
-# (rdb:1) v g
-# all global variables
-#
-# Finally, you can omit +p+ if you simply want to evaluate a variable or
-# expression
-#
-# (rdb:1) 5**2
-# 25
-#
-# === Going beyond basics
-#
-# Ruby Debug provides more advanced functionalities like switching
-# between threads, setting breakpoints and watch expressions, and more.
-# The full list of commands is available at any time by pressing +h+.
-#
-# == Staying out of trouble
-#
-# Make sure you remove every instance of +require 'debug'+ before
-# shipping your code. Failing to do so may result in your program
-# hanging unpredictably.
-#
-# Debug is not available in safe mode.
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
class DEBUGGER__
- MUTEX = Mutex.new # :nodoc:
+MUTEX = Mutex.new
+
+class Context
+ DEBUG_LAST_CMD = []
+
+ begin
+ require 'readline'
+ def readline(prompt, hist)
+ Readline::readline(prompt, hist)
+ end
+ rescue LoadError
+ def readline(prompt, hist)
+ STDOUT.print prompt
+ STDOUT.flush
+ line = STDIN.gets
+ exit unless line
+ line.chomp!
+ line
+ end
+ USE_READLINE = false
+ end
- class Context # :nodoc:
- DEBUG_LAST_CMD = []
+ def initialize
+ if Thread.current == Thread.main
+ @stop_next = 1
+ else
+ @stop_next = 0
+ end
+ @last_file = nil
+ @file = nil
+ @line = nil
+ @no_step = nil
+ @frames = []
+ @finish_pos = 0
+ @trace = false
+ @catch = "StandardError"
+ @suspend_next = false
+ end
- begin
- require 'readline'
- def readline(prompt, hist)
- Readline::readline(prompt, hist)
- end
- rescue LoadError
- def readline(prompt, hist)
- STDOUT.print prompt
- STDOUT.flush
- line = STDIN.gets
- exit unless line
- line.chomp!
- line
- end
- USE_READLINE = false
- end
+ def stop_next(n=1)
+ @stop_next = n
+ end
- def initialize
- if Thread.current == Thread.main
- @stop_next = 1
- else
- @stop_next = 0
- end
- @last_file = nil
- @file = nil
- @line = nil
- @no_step = nil
- @frames = []
- @finish_pos = 0
- @trace = false
- @catch = "StandardError"
- @suspend_next = false
- end
+ def set_suspend
+ @suspend_next = true
+ end
- def stop_next(n=1)
- @stop_next = n
- end
+ def clear_suspend
+ @suspend_next = false
+ end
- def set_suspend
- @suspend_next = true
- end
+ def suspend_all
+ DEBUGGER__.suspend
+ end
- def clear_suspend
- @suspend_next = false
- end
+ def resume_all
+ DEBUGGER__.resume
+ end
- def suspend_all
- DEBUGGER__.suspend
+ def check_suspend
+ while MUTEX.synchronize {
+ if @suspend_next
+ DEBUGGER__.waiting.push Thread.current
+ @suspend_next = false
+ true
+ end
+ }
end
+ end
- def resume_all
- DEBUGGER__.resume
- end
+ def trace?
+ @trace
+ end
- def check_suspend
- while MUTEX.synchronize {
- if @suspend_next
- DEBUGGER__.waiting.push Thread.current
- @suspend_next = false
- true
- end
- }
- end
- end
+ def set_trace(arg)
+ @trace = arg
+ end
- def trace?
- @trace
- end
+ def stdout
+ DEBUGGER__.stdout
+ end
- def set_trace(arg)
- @trace = arg
- end
+ def break_points
+ DEBUGGER__.break_points
+ end
- def stdout
- DEBUGGER__.stdout
- end
+ def display
+ DEBUGGER__.display
+ end
- def break_points
- DEBUGGER__.break_points
- end
+ def context(th)
+ DEBUGGER__.context(th)
+ end
- def display
- DEBUGGER__.display
- end
+ def set_trace_all(arg)
+ DEBUGGER__.set_trace(arg)
+ end
- def context(th)
- DEBUGGER__.context(th)
- end
+ def set_last_thread(th)
+ DEBUGGER__.set_last_thread(th)
+ end
- def set_trace_all(arg)
- DEBUGGER__.set_trace(arg)
+ def debug_eval(str, binding)
+ begin
+ val = eval(str, binding)
+ rescue StandardError, ScriptError => e
+ at = eval("caller(1)", binding)
+ stdout.printf "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
+ for i in at
+ stdout.printf "\tfrom %s\n", i
+ end
+ throw :debug_error
end
+ end
- def set_last_thread(th)
- DEBUGGER__.set_last_thread(th)
+ def debug_silent_eval(str, binding)
+ begin
+ eval(str, binding)
+ rescue StandardError, ScriptError
+ nil
end
+ end
- def debug_eval(str, binding)
- begin
- eval(str, binding)
- rescue StandardError, ScriptError => e
- at = eval("caller(1)", binding)
- stdout.printf "%s:%s\n", at.shift, e.to_s.sub(/\(eval\):1:(in `.*?':)?/, '')
- for i in at
- stdout.printf "\tfrom %s\n", i
- end
- throw :debug_error
- end
+ def var_list(ary, binding)
+ ary.sort!
+ for v in ary
+ stdout.printf " %s => %s\n", v, eval(v.to_s, binding).inspect
end
+ end
- def debug_silent_eval(str, binding)
- begin
- eval(str, binding)
- rescue StandardError, ScriptError
- nil
- end
- end
+ def debug_variable_info(input, binding)
+ case input
+ when /^\s*g(?:lobal)?\s*$/
+ var_list(global_variables, binding)
- def var_list(ary, binding)
- ary.sort!
- for v in ary
- stdout.printf " %s => %s\n", v, eval(v.to_s, binding).inspect
- end
- end
+ when /^\s*l(?:ocal)?\s*$/
+ var_list(eval("local_variables", binding), binding)
+
+ when /^\s*i(?:nstance)?\s+/
+ obj = debug_eval($', binding)
+ var_list(obj.instance_variables, obj.instance_eval{binding()})
- def debug_variable_info(input, binding)
- case input
- when /^\s*g(?:lobal)?\s*$/
- var_list(global_variables, binding)
-
- when /^\s*l(?:ocal)?\s*$/
- var_list(eval("local_variables", binding), binding)
-
- when /^\s*i(?:nstance)?\s+/
- obj = debug_eval($', binding)
- var_list(obj.instance_variables, obj.instance_eval{binding()})
-
- when /^\s*c(?:onst(?:ant)?)?\s+/
- obj = debug_eval($', binding)
- unless obj.kind_of? Module
- stdout.print "Should be Class/Module: ", $', "\n"
- else
- var_list(obj.constants, obj.module_eval{binding()})
- end
+ when /^\s*c(?:onst(?:ant)?)?\s+/
+ obj = debug_eval($', binding)
+ unless obj.kind_of? Module
+ stdout.print "Should be Class/Module: ", $', "\n"
+ else
+ var_list(obj.constants, obj.module_eval{binding()})
end
end
+ end
- def debug_method_info(input, binding)
- case input
- when /^i(:?nstance)?\s+/
- obj = debug_eval($', binding)
-
- len = 0
- for v in obj.methods.sort
- len += v.size + 1
- if len > 70
- len = v.size + 1
- stdout.print "\n"
- end
- stdout.print v, " "
- end
- stdout.print "\n"
-
+ def debug_method_info(input, binding)
+ case input
+ when /^i(:?nstance)?\s+/
+ obj = debug_eval($', binding)
+
+ len = 0
+ for v in obj.methods.sort
+ len += v.size + 1
+ if len > 70
+ len = v.size + 1
+ stdout.print "\n"
+ end
+ stdout.print v, " "
+ end
+ stdout.print "\n"
+
+ else
+ obj = debug_eval(input, binding)
+ unless obj.kind_of? Module
+ stdout.print "Should be Class/Module: ", input, "\n"
else
- obj = debug_eval(input, binding)
- unless obj.kind_of? Module
- stdout.print "Should be Class/Module: ", input, "\n"
- else
- len = 0
- for v in obj.instance_methods(false).sort
- len += v.size + 1
- if len > 70
- len = v.size + 1
- stdout.print "\n"
- end
- stdout.print v, " "
- end
- stdout.print "\n"
- end
+ len = 0
+ for v in obj.instance_methods(false).sort
+ len += v.size + 1
+ if len > 70
+ len = v.size + 1
+ stdout.print "\n"
+ end
+ stdout.print v, " "
+ end
+ stdout.print "\n"
end
end
+ end
- def thnum
+ def thnum
+ num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
+ unless num
+ DEBUGGER__.make_thread_list
num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
- unless num
- DEBUGGER__.make_thread_list
- num = DEBUGGER__.instance_eval{@thread_list[Thread.current]}
- end
- num
end
+ num
+ end
- def debug_command(file, line, id, binding)
- MUTEX.lock
- unless defined?($debugger_restart) and $debugger_restart
- callcc{|c| $debugger_restart = c}
- end
- set_last_thread(Thread.current)
- frame_pos = 0
- binding_file = file
- binding_line = line
- previous_line = nil
- if ENV['EMACS']
- stdout.printf "\032\032%s:%d:\n", binding_file, binding_line
- else
- stdout.printf "%s:%d:%s", binding_file, binding_line,
- line_at(binding_file, binding_line)
- end
- @frames[0] = [binding, file, line, id]
- display_expressions(binding)
- prompt = true
- while prompt and input = readline("(rdb:%d) "%thnum(), true)
- catch(:debug_error) do
- if input == ""
- next unless DEBUG_LAST_CMD[0]
- input = DEBUG_LAST_CMD[0]
- stdout.print input, "\n"
- else
- DEBUG_LAST_CMD[0] = input
- end
-
- case input
- when /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
- if defined?( $2 )
- if $1 == 'on'
- set_trace_all true
- else
- set_trace_all false
- end
- elsif defined?( $1 )
- if $1 == 'on'
- set_trace true
- else
- set_trace false
- end
- end
- if trace?
- stdout.print "Trace on.\n"
- else
- stdout.print "Trace off.\n"
- end
-
- when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
- pos = $2
- if $1
- klass = debug_silent_eval($1, binding)
- file = $1
- end
- if pos =~ /^\d+$/
- pname = pos
- pos = pos.to_i
- else
- pname = pos = pos.intern.id2name
- end
- break_points.push [true, 0, klass || file, pos]
- stdout.printf "Set breakpoint %d at %s:%s\n", break_points.size, klass || file, pname
-
- when /^\s*b(?:reak)?\s+(.+)[#.]([^.:]+)$/
- pos = $2.intern.id2name
- klass = debug_eval($1, binding)
- break_points.push [true, 0, klass, pos]
- stdout.printf "Set breakpoint %d at %s.%s\n", break_points.size, klass, pos
-
- when /^\s*wat(?:ch)?\s+(.+)$/
- exp = $1
- break_points.push [true, 1, exp]
- stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
-
- when /^\s*b(?:reak)?$/
- if break_points.find{|b| b[1] == 0}
- n = 1
- stdout.print "Breakpoints:\n"
- break_points.each do |b|
- if b[0] and b[1] == 0
- stdout.printf " %d %s:%s\n", n, b[2], b[3]
- end
- n += 1
- end
- end
- if break_points.find{|b| b[1] == 1}
- n = 1
- stdout.print "\n"
- stdout.print "Watchpoints:\n"
- for b in break_points
- if b[0] and b[1] == 1
- stdout.printf " %d %s\n", n, b[2]
- end
- n += 1
- end
- end
- if break_points.size == 0
- stdout.print "No breakpoints\n"
- else
- stdout.print "\n"
- end
-
- when /^\s*del(?:ete)?(?:\s+(\d+))?$/
- pos = $1
- unless pos
- input = readline("Clear all breakpoints? (y/n) ", false)
- if input == "y"
- for b in break_points
- b[0] = false
- end
- end
- else
- pos = pos.to_i
- if break_points[pos-1]
- break_points[pos-1][0] = false
- else
- stdout.printf "Breakpoint %d is not defined\n", pos
- end
- end
-
- when /^\s*disp(?:lay)?\s+(.+)$/
- exp = $1
- display.push [true, exp]
- stdout.printf "%d: ", display.size
- display_expression(exp, binding)
-
- when /^\s*disp(?:lay)?$/
- display_expressions(binding)
-
- when /^\s*undisp(?:lay)?(?:\s+(\d+))?$/
- pos = $1
- unless pos
- input = readline("Clear all expressions? (y/n) ", false)
- if input == "y"
- for d in display
- d[0] = false
- end
- end
- else
- pos = pos.to_i
- if display[pos-1]
- display[pos-1][0] = false
- else
- stdout.printf "Display expression %d is not defined\n", pos
- end
- end
-
- when /^\s*c(?:ont)?$/
- prompt = false
-
- when /^\s*s(?:tep)?(?:\s+(\d+))?$/
- if $1
- lev = $1.to_i
- else
- lev = 1
- end
- @stop_next = lev
- prompt = false
-
- when /^\s*n(?:ext)?(?:\s+(\d+))?$/
- if $1
- lev = $1.to_i
- else
- lev = 1
- end
- @stop_next = lev
- @no_step = @frames.size - frame_pos
- prompt = false
-
- when /^\s*w(?:here)?$/, /^\s*f(?:rame)?$/
- display_frames(frame_pos)
-
- when /^\s*l(?:ist)?(?:\s+(.+))?$/
- if not $1
- b = previous_line ? previous_line + 10 : binding_line - 5
- e = b + 9
- elsif $1 == '-'
- b = previous_line ? previous_line - 10 : binding_line - 5
- e = b + 9
- else
- b, e = $1.split(/[-,]/)
- if e
- b = b.to_i
- e = e.to_i
- else
- b = b.to_i - 5
- e = b + 9
- end
- end
- previous_line = b
- display_list(b, e, binding_file, binding_line)
-
- when /^\s*up(?:\s+(\d+))?$/
- previous_line = nil
- if $1
- lev = $1.to_i
- else
- lev = 1
- end
- frame_pos += lev
- if frame_pos >= @frames.size
- frame_pos = @frames.size - 1
- stdout.print "At toplevel\n"
- end
- binding, binding_file, binding_line = @frames[frame_pos]
- stdout.print format_frame(frame_pos)
-
- when /^\s*down(?:\s+(\d+))?$/
- previous_line = nil
- if $1
- lev = $1.to_i
- else
- lev = 1
- end
- frame_pos -= lev
- if frame_pos < 0
- frame_pos = 0
- stdout.print "At stack bottom\n"
- end
- binding, binding_file, binding_line = @frames[frame_pos]
- stdout.print format_frame(frame_pos)
-
- when /^\s*fin(?:ish)?$/
- if frame_pos == @frames.size
- stdout.print "\"finish\" not meaningful in the outermost frame.\n"
+ def debug_command(file, line, id, binding)
+ MUTEX.lock
+ unless defined?($debugger_restart) and $debugger_restart
+ callcc{|c| $debugger_restart = c}
+ end
+ set_last_thread(Thread.current)
+ frame_pos = 0
+ binding_file = file
+ binding_line = line
+ previous_line = nil
+ if ENV['EMACS']
+ stdout.printf "\032\032%s:%d:\n", binding_file, binding_line
+ else
+ stdout.printf "%s:%d:%s", binding_file, binding_line,
+ line_at(binding_file, binding_line)
+ end
+ @frames[0] = [binding, file, line, id]
+ display_expressions(binding)
+ prompt = true
+ while prompt and input = readline("(rdb:%d) "%thnum(), true)
+ catch(:debug_error) do
+ if input == ""
+ next unless DEBUG_LAST_CMD[0]
+ input = DEBUG_LAST_CMD[0]
+ stdout.print input, "\n"
+ else
+ DEBUG_LAST_CMD[0] = input
+ end
+
+ case input
+ when /^\s*tr(?:ace)?(?:\s+(on|off))?(?:\s+(all))?$/
+ if defined?( $2 )
+ if $1 == 'on'
+ set_trace_all true
else
- @finish_pos = @frames.size - frame_pos
- frame_pos = 0
- prompt = false
+ set_trace_all false
end
-
- when /^\s*cat(?:ch)?(?:\s+(.+))?$/
- if $1
- excn = $1
- if excn == 'off'
- @catch = nil
- stdout.print "Clear catchpoint.\n"
- else
- @catch = excn
- stdout.printf "Set catchpoint %s.\n", @catch
- end
+ elsif defined?( $1 )
+ if $1 == 'on'
+ set_trace true
else
- if @catch
- stdout.printf "Catchpoint %s.\n", @catch
- else
- stdout.print "No catchpoint.\n"
- end
- end
-
- when /^\s*q(?:uit)?$/
- input = readline("Really quit? (y/n) ", false)
- if input == "y"
- exit! # exit -> exit!: No graceful way to stop threads...
- end
-
- when /^\s*v(?:ar)?\s+/
- debug_variable_info($', binding)
-
- when /^\s*m(?:ethod)?\s+/
- debug_method_info($', binding)
-
- when /^\s*th(?:read)?\s+/
- if DEBUGGER__.debug_thread_info($', binding) == :cont
- prompt = false
+ set_trace false
end
-
- when /^\s*pp\s+/
- PP.pp(debug_eval($', binding), stdout)
-
- when /^\s*p\s+/
- stdout.printf "%s\n", debug_eval($', binding).inspect
-
- when /^\s*r(?:estart)?$/
- $debugger_restart.call
-
- when /^\s*h(?:elp)?$/
- debug_print_help()
-
+ end
+ if trace?
+ stdout.print "Trace on.\n"
else
- v = debug_eval(input, binding)
- stdout.printf "%s\n", v.inspect
+ stdout.print "Trace off.\n"
end
- end
- end
- MUTEX.unlock
- resume_all
- end
- def debug_print_help
- stdout.print <<EOHELP
+ when /^\s*b(?:reak)?\s+(?:(.+):)?([^.:]+)$/
+ pos = $2
+ if $1
+ klass = debug_silent_eval($1, binding)
+ file = $1
+ end
+ if pos =~ /^\d+$/
+ pname = pos
+ pos = pos.to_i
+ else
+ pname = pos = pos.intern.id2name
+ end
+ break_points.push [true, 0, klass || file, pos]
+ stdout.printf "Set breakpoint %d at %s:%s\n", break_points.size, klass || file, pname
+
+ when /^\s*b(?:reak)?\s+(.+)[#.]([^.:]+)$/
+ pos = $2.intern.id2name
+ klass = debug_eval($1, binding)
+ break_points.push [true, 0, klass, pos]
+ stdout.printf "Set breakpoint %d at %s.%s\n", break_points.size, klass, pos
+
+ when /^\s*wat(?:ch)?\s+(.+)$/
+ exp = $1
+ break_points.push [true, 1, exp]
+ stdout.printf "Set watchpoint %d:%s\n", break_points.size, exp
+
+ when /^\s*b(?:reak)?$/
+ if break_points.find{|b| b[1] == 0}
+ n = 1
+ stdout.print "Breakpoints:\n"
+ break_points.each do |b|
+ if b[0] and b[1] == 0
+ stdout.printf " %d %s:%s\n", n, b[2], b[3]
+ end
+ n += 1
+ end
+ end
+ if break_points.find{|b| b[1] == 1}
+ n = 1
+ stdout.print "\n"
+ stdout.print "Watchpoints:\n"
+ for b in break_points
+ if b[0] and b[1] == 1
+ stdout.printf " %d %s\n", n, b[2]
+ end
+ n += 1
+ end
+ end
+ if break_points.size == 0
+ stdout.print "No breakpoints\n"
+ else
+ stdout.print "\n"
+ end
+
+ when /^\s*del(?:ete)?(?:\s+(\d+))?$/
+ pos = $1
+ unless pos
+ input = readline("Clear all breakpoints? (y/n) ", false)
+ if input == "y"
+ for b in break_points
+ b[0] = false
+ end
+ end
+ else
+ pos = pos.to_i
+ if break_points[pos-1]
+ break_points[pos-1][0] = false
+ else
+ stdout.printf "Breakpoint %d is not defined\n", pos
+ end
+ end
+
+ when /^\s*disp(?:lay)?\s+(.+)$/
+ exp = $1
+ display.push [true, exp]
+ stdout.printf "%d: ", display.size
+ display_expression(exp, binding)
+
+ when /^\s*disp(?:lay)?$/
+ display_expressions(binding)
+
+ when /^\s*undisp(?:lay)?(?:\s+(\d+))?$/
+ pos = $1
+ unless pos
+ input = readline("Clear all expressions? (y/n) ", false)
+ if input == "y"
+ for d in display
+ d[0] = false
+ end
+ end
+ else
+ pos = pos.to_i
+ if display[pos-1]
+ display[pos-1][0] = false
+ else
+ stdout.printf "Display expression %d is not defined\n", pos
+ end
+ end
+
+ when /^\s*c(?:ont)?$/
+ prompt = false
+
+ when /^\s*s(?:tep)?(?:\s+(\d+))?$/
+ if $1
+ lev = $1.to_i
+ else
+ lev = 1
+ end
+ @stop_next = lev
+ prompt = false
+
+ when /^\s*n(?:ext)?(?:\s+(\d+))?$/
+ if $1
+ lev = $1.to_i
+ else
+ lev = 1
+ end
+ @stop_next = lev
+ @no_step = @frames.size - frame_pos
+ prompt = false
+
+ when /^\s*w(?:here)?$/, /^\s*f(?:rame)?$/
+ display_frames(frame_pos)
+
+ when /^\s*l(?:ist)?(?:\s+(.+))?$/
+ if not $1
+ b = previous_line ? previous_line + 10 : binding_line - 5
+ e = b + 9
+ elsif $1 == '-'
+ b = previous_line ? previous_line - 10 : binding_line - 5
+ e = b + 9
+ else
+ b, e = $1.split(/[-,]/)
+ if e
+ b = b.to_i
+ e = e.to_i
+ else
+ b = b.to_i - 5
+ e = b + 9
+ end
+ end
+ previous_line = b
+ display_list(b, e, binding_file, binding_line)
+
+ when /^\s*up(?:\s+(\d+))?$/
+ previous_line = nil
+ if $1
+ lev = $1.to_i
+ else
+ lev = 1
+ end
+ frame_pos += lev
+ if frame_pos >= @frames.size
+ frame_pos = @frames.size - 1
+ stdout.print "At toplevel\n"
+ end
+ binding, binding_file, binding_line = @frames[frame_pos]
+ stdout.print format_frame(frame_pos)
+
+ when /^\s*down(?:\s+(\d+))?$/
+ previous_line = nil
+ if $1
+ lev = $1.to_i
+ else
+ lev = 1
+ end
+ frame_pos -= lev
+ if frame_pos < 0
+ frame_pos = 0
+ stdout.print "At stack bottom\n"
+ end
+ binding, binding_file, binding_line = @frames[frame_pos]
+ stdout.print format_frame(frame_pos)
+
+ when /^\s*fin(?:ish)?$/
+ if frame_pos == @frames.size
+ stdout.print "\"finish\" not meaningful in the outermost frame.\n"
+ else
+ @finish_pos = @frames.size - frame_pos
+ frame_pos = 0
+ prompt = false
+ end
+
+ when /^\s*cat(?:ch)?(?:\s+(.+))?$/
+ if $1
+ excn = $1
+ if excn == 'off'
+ @catch = nil
+ stdout.print "Clear catchpoint.\n"
+ else
+ @catch = excn
+ stdout.printf "Set catchpoint %s.\n", @catch
+ end
+ else
+ if @catch
+ stdout.printf "Catchpoint %s.\n", @catch
+ else
+ stdout.print "No catchpoint.\n"
+ end
+ end
+
+ when /^\s*q(?:uit)?$/
+ input = readline("Really quit? (y/n) ", false)
+ if input == "y"
+ exit! # exit -> exit!: No graceful way to stop threads...
+ end
+
+ when /^\s*v(?:ar)?\s+/
+ debug_variable_info($', binding)
+
+ when /^\s*m(?:ethod)?\s+/
+ debug_method_info($', binding)
+
+ when /^\s*th(?:read)?\s+/
+ if DEBUGGER__.debug_thread_info($', binding) == :cont
+ prompt = false
+ end
+
+ when /^\s*pp\s+/
+ PP.pp(debug_eval($', binding), stdout)
+
+ when /^\s*p\s+/
+ stdout.printf "%s\n", debug_eval($', binding).inspect
+
+ when /^\s*r(?:estart)?$/
+ $debugger_restart.call
+
+ when /^\s*h(?:elp)?$/
+ debug_print_help()
+
+ else
+ v = debug_eval(input, binding)
+ stdout.printf "%s\n", v.inspect
+ end
+ end
+ end
+ MUTEX.unlock
+ resume_all
+ end
+
+ def debug_print_help
+ stdout.print <<EOHELP
Debugger help v.-0.002b
Commands
b[reak] [file:|class:]<line|method>
@@ -705,377 +545,363 @@ Commands
th[read] [sw[itch]] <nnn> switch thread context to nnn
th[read] stop <nnn> stop thread nnn
th[read] resume <nnn> resume thread nnn
- pp expression evaluate expression and pretty_print its value
p expression evaluate expression and print its value
- r[estart] restart program
h[elp] print this help
<everything else> evaluate
EOHELP
- end
+ end
- def display_expressions(binding)
- n = 1
- for d in display
- if d[0]
- stdout.printf "%d: ", n
- display_expression(d[1], binding)
- end
- n += 1
+ def display_expressions(binding)
+ n = 1
+ for d in display
+ if d[0]
+ stdout.printf "%d: ", n
+ display_expression(d[1], binding)
end
+ n += 1
end
+ end
- def display_expression(exp, binding)
- stdout.printf "%s = %s\n", exp, debug_silent_eval(exp, binding).to_s
- end
+ def display_expression(exp, binding)
+ stdout.printf "%s = %s\n", exp, debug_silent_eval(exp, binding).to_s
+ end
- def frame_set_pos(file, line)
- if @frames[0]
- @frames[0][1] = file
- @frames[0][2] = line
- end
+ def frame_set_pos(file, line)
+ if @frames[0]
+ @frames[0][1] = file
+ @frames[0][2] = line
end
+ end
- def display_frames(pos)
- 0.upto(@frames.size - 1) do |n|
- if n == pos
- stdout.print "--> "
- else
- stdout.print " "
- end
- stdout.print format_frame(n)
+ def display_frames(pos)
+ 0.upto(@frames.size - 1) do |n|
+ if n == pos
+ stdout.print "--> "
+ else
+ stdout.print " "
end
+ stdout.print format_frame(n)
end
+ end
+
+ def format_frame(pos)
+ bind, file, line, id = @frames[pos]
+ sprintf "#%d %s:%s%s\n", pos + 1, file, line,
+ (id ? ":in `#{id.id2name}'" : "")
+ end
- def format_frame(pos)
- _, file, line, id = @frames[pos]
- sprintf "#%d %s:%s%s\n", pos + 1, file, line,
- (id ? ":in `#{id.id2name}'" : "")
+ 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
+ b.upto(e) do |n|
+ if n > 0 && lines[n-1]
+ if n == line
+ stdout.printf "=> %d %s\n", n, lines[n-1].chomp
+ else
+ stdout.printf " %d %s\n", n, lines[n-1].chomp
+ end
+ end
+ end
+ else
+ stdout.printf "No sourcefile available for %s\n", file
end
+ end
- 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
- b.upto(e) do |n|
- if n > 0 && lines[n-1]
- if n == line
- stdout.printf "=> %d %s\n", n, lines[n-1].chomp
- else
- stdout.printf " %d %s\n", n, lines[n-1].chomp
- end
- end
- end
- else
- stdout.printf "No sourcefile available for %s\n", file
- end
+ def line_at(file, line)
+ lines = SCRIPT_LINES__[file]
+ if lines
+ return "\n" if lines == true
+ line = lines[line-1]
+ return "\n" unless line
+ return line
end
+ return "\n"
+ end
- def line_at(file, line)
- lines = SCRIPT_LINES__[file]
- if lines
- return "\n" if lines == true
- line = lines[line-1]
- return "\n" unless line
- return line
- end
- return "\n"
+ def debug_funcname(id)
+ if id.nil?
+ "toplevel"
+ else
+ id.id2name
end
+ end
- def debug_funcname(id)
- if id.nil?
- "toplevel"
- else
- id.id2name
- end
+ def check_break_points(file, klass, pos, binding, id)
+ return false if break_points.empty?
+ n = 1
+ for b in break_points
+ if b[0] # valid
+ if b[1] == 0 # breakpoint
+ if (b[2] == file and b[3] == pos) or
+ (klass and b[2] == klass and b[3] == pos)
+ stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+ return true
+ end
+ elsif b[1] == 1 # watchpoint
+ if debug_silent_eval(b[2], binding)
+ stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
+ return true
+ end
+ end
+ end
+ n += 1
+ end
+ return false
+ end
+
+ def excn_handle(file, line, id, binding)
+ if $!.class <= SystemExit
+ set_trace_func nil
+ exit
end
- def check_break_points(file, klass, pos, binding, id)
- return false if break_points.empty?
- n = 1
- for b in break_points
- if b[0] # valid
- if b[1] == 0 # breakpoint
- if (b[2] == file and b[3] == pos) or
- (klass and b[2] == klass and b[3] == pos)
- stdout.printf "Breakpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
- return true
- end
- elsif b[1] == 1 # watchpoint
- if debug_silent_eval(b[2], binding)
- stdout.printf "Watchpoint %d, %s at %s:%s\n", n, debug_funcname(id), file, pos
- return true
- end
- end
- end
- n += 1
+ if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch })
+ stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class
+ fs = @frames.size
+ tb = caller(0)[-fs..-1]
+ if tb
+ for i in tb
+ stdout.printf "\tfrom %s\n", i
+ end
end
- return false
+ suspend_all
+ debug_command(file, line, id, binding)
end
+ end
- def excn_handle(file, line, id, binding)
- if $!.class <= SystemExit
- set_trace_func nil
- exit
+ def trace_func(event, file, line, id, binding, klass)
+ Tracer.trace_func(event, file, line, id, binding, klass) if trace?
+ context(Thread.current).check_suspend
+ @file = file
+ @line = line
+ case event
+ when 'line'
+ frame_set_pos(file, line)
+ if !@no_step or @frames.size == @no_step
+ @stop_next -= 1
+ @stop_next = -1 if @stop_next < 0
+ elsif @frames.size < @no_step
+ @stop_next = 0 # break here before leaving...
+ else
+ # nothing to do. skipped.
+ end
+ if @stop_next == 0 or check_break_points(file, nil, line, binding, id)
+ @no_step = nil
+ suspend_all
+ debug_command(file, line, id, binding)
end
- if @catch and ($!.class.ancestors.find { |e| e.to_s == @catch })
- stdout.printf "%s:%d: `%s' (%s)\n", file, line, $!, $!.class
- fs = @frames.size
- tb = caller(0)[-fs..-1]
- if tb
- for i in tb
- stdout.printf "\tfrom %s\n", i
- end
- end
- suspend_all
- debug_command(file, line, id, binding)
+ when 'call'
+ @frames.unshift [binding, file, line, id]
+ if check_break_points(file, klass, id.id2name, binding, id)
+ suspend_all
+ debug_command(file, line, id, binding)
end
- end
- def trace_func(event, file, line, id, binding, klass)
- Tracer.trace_func(event, file, line, id, binding, klass) if trace?
- context(Thread.current).check_suspend
- @file = file
- @line = line
- case event
- when 'line'
- frame_set_pos(file, line)
- if !@no_step or @frames.size == @no_step
- @stop_next -= 1
- @stop_next = -1 if @stop_next < 0
- elsif @frames.size < @no_step
- @stop_next = 0 # break here before leaving...
- else
- # nothing to do. skipped.
- end
- if @stop_next == 0 or check_break_points(file, nil, line, binding, id)
- @no_step = nil
- suspend_all
- debug_command(file, line, id, binding)
- end
-
- when 'call'
- @frames.unshift [binding, file, line, id]
- if check_break_points(file, klass, id.id2name, binding, id)
- suspend_all
- debug_command(file, line, id, binding)
- end
-
- when 'c-call'
- frame_set_pos(file, line)
-
- when 'class'
- @frames.unshift [binding, file, line, id]
-
- when 'return', 'end'
- if @frames.size == @finish_pos
- @stop_next = 1
- @finish_pos = 0
- end
- @frames.shift
-
- when 'raise'
- excn_handle(file, line, id, binding)
+ when 'c-call'
+ frame_set_pos(file, line)
+ when 'class'
+ @frames.unshift [binding, file, line, id]
+
+ when 'return', 'end'
+ if @frames.size == @finish_pos
+ @stop_next = 1
+ @finish_pos = 0
end
- @last_file = file
+ @frames.shift
+
+ when 'raise'
+ excn_handle(file, line, id, binding)
+
end
+ @last_file = file
end
+end
- trap("INT") { DEBUGGER__.interrupt }
- @last_thread = Thread::main
- @max_thread = 1
- @thread_list = {Thread::main => 1}
- @break_points = []
- @display = []
- @waiting = []
- @stdout = STDOUT
-
- class << DEBUGGER__
- # Returns the IO used as stdout. Defaults to STDOUT
- def stdout
- @stdout
- end
+trap("INT") { DEBUGGER__.interrupt }
+@last_thread = Thread::main
+@max_thread = 1
+@thread_list = {Thread::main => 1}
+@break_points = []
+@display = []
+@waiting = []
+@stdout = STDOUT
+
+class << DEBUGGER__
+ def stdout
+ @stdout
+ end
- # Sets the IO used as stdout. Defaults to STDOUT
- def stdout=(s)
- @stdout = s
- end
+ def stdout=(s)
+ @stdout = s
+ end
- # Returns the display expression list
- #
- # See DEBUGGER__ for more usage
- def display
- @display
- end
+ def display
+ @display
+ end
- # Returns the list of break points where execution will be stopped.
- #
- # See DEBUGGER__ for more useage
- def break_points
- @break_points
- end
+ def break_points
+ @break_points
+ end
- # Returns the list of waiting threads.
- #
- # When stepping through the traces of a function, thread gets suspended, to
- # be resumed later.
- def waiting
- @waiting
- end
+ def waiting
+ @waiting
+ end
- def set_trace( arg )
- MUTEX.synchronize do
- make_thread_list
- for th, in @thread_list
- context(th).set_trace arg
- end
+ def set_trace( arg )
+ MUTEX.synchronize do
+ make_thread_list
+ for th, in @thread_list
+ context(th).set_trace arg
end
- arg
end
+ arg
+ end
- def set_last_thread(th)
- @last_thread = th
- end
+ def set_last_thread(th)
+ @last_thread = th
+ end
- def suspend
- MUTEX.synchronize do
- make_thread_list
- for th, in @thread_list
- next if th == Thread.current
- context(th).set_suspend
- end
+ def suspend
+ MUTEX.synchronize do
+ make_thread_list
+ for th, in @thread_list
+ next if th == Thread.current
+ context(th).set_suspend
end
- # Schedule other threads to suspend as soon as possible.
- Thread.pass
end
+ # Schedule other threads to suspend as soon as possible.
+ Thread.pass
+ 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
+ def resume
+ MUTEX.synchronize do
+ make_thread_list
+ @thread_list.each do |th,|
+ next if th == Thread.current
+ context(th).clear_suspend
end
- # Schedule other threads to restart as soon as possible.
- Thread.pass
+ waiting.each do |th|
+ th.run
+ end
+ waiting.clear
end
+ # Schedule other threads to restart as soon as possible.
+ Thread.pass
+ end
- def context(thread=Thread.current)
- c = thread[:__debugger_data__]
- unless c
- thread[:__debugger_data__] = c = Context.new
- end
- c
+ def context(thread=Thread.current)
+ c = thread[:__debugger_data__]
+ unless c
+ thread[:__debugger_data__] = c = Context.new
end
+ c
+ end
+
+ def interrupt
+ context(@last_thread).stop_next
+ end
- def interrupt
- context(@last_thread).stop_next
+ def get_thread(num)
+ th = @thread_list.key(num)
+ unless th
+ @stdout.print "No thread ##{num}\n"
+ throw :debug_error
end
+ th
+ end
- def get_thread(num)
- th = @thread_list.key(num)
- unless th
- @stdout.print "No thread ##{num}\n"
- throw :debug_error
- end
- th
+ def thread_list(num)
+ th = get_thread(num)
+ if th == Thread.current
+ @stdout.print "+"
+ else
+ @stdout.print " "
+ end
+ @stdout.printf "%d ", num
+ @stdout.print th.inspect, "\t"
+ file = context(th).instance_eval{@file}
+ if file
+ @stdout.print file,":",context(th).instance_eval{@line}
end
+ @stdout.print "\n"
+ end
- def thread_list(num)
- th = get_thread(num)
- if th == Thread.current
- @stdout.print "+"
+ def thread_list_all
+ for th in @thread_list.values.sort
+ thread_list(th)
+ end
+ end
+
+ def make_thread_list
+ hash = {}
+ for th in Thread::list
+ if @thread_list.key? th
+ hash[th] = @thread_list[th]
else
- @stdout.print " "
- end
- @stdout.printf "%d ", num
- @stdout.print th.inspect, "\t"
- file = context(th).instance_eval{@file}
- if file
- @stdout.print file,":",context(th).instance_eval{@line}
+ @max_thread += 1
+ hash[th] = @max_thread
end
- @stdout.print "\n"
end
+ @thread_list = hash
+ end
+
+ def debug_thread_info(input, binding)
+ case input
+ when /^l(?:ist)?/
+ make_thread_list
+ thread_list_all
+
+ when /^c(?:ur(?:rent)?)?$/
+ make_thread_list
+ thread_list(@thread_list[Thread.current])
- def thread_list_all
- for th in @thread_list.values.sort
- thread_list(th)
+ when /^(?:sw(?:itch)?\s+)?(\d+)/
+ make_thread_list
+ th = get_thread($1.to_i)
+ if th == Thread.current
+ @stdout.print "It's the current thread.\n"
+ else
+ thread_list(@thread_list[th])
+ context(th).stop_next
+ th.run
+ return :cont
end
- end
- def make_thread_list
- hash = {}
- for th in Thread::list
- if @thread_list.key? th
- hash[th] = @thread_list[th]
- else
- @max_thread += 1
- hash[th] = @max_thread
- end
+ when /^stop\s+(\d+)/
+ make_thread_list
+ th = get_thread($1.to_i)
+ if th == Thread.current
+ @stdout.print "It's the current thread.\n"
+ elsif th.stop?
+ @stdout.print "Already stopped.\n"
+ else
+ thread_list(@thread_list[th])
+ context(th).suspend
end
- @thread_list = hash
- end
- def debug_thread_info(input, binding)
- case input
- when /^l(?:ist)?/
- make_thread_list
- thread_list_all
-
- when /^c(?:ur(?:rent)?)?$/
- make_thread_list
- thread_list(@thread_list[Thread.current])
-
- when /^(?:sw(?:itch)?\s+)?(\d+)/
- make_thread_list
- th = get_thread($1.to_i)
- if th == Thread.current
- @stdout.print "It's the current thread.\n"
- else
- thread_list(@thread_list[th])
- context(th).stop_next
- th.run
- return :cont
- end
-
- when /^stop\s+(\d+)/
- make_thread_list
- th = get_thread($1.to_i)
- if th == Thread.current
- @stdout.print "It's the current thread.\n"
- elsif th.stop?
- @stdout.print "Already stopped.\n"
- else
- thread_list(@thread_list[th])
- context(th).suspend
- end
-
- when /^resume\s+(\d+)/
- make_thread_list
- th = get_thread($1.to_i)
- if th == Thread.current
- @stdout.print "It's the current thread.\n"
- elsif !th.stop?
- @stdout.print "Already running."
- else
- thread_list(@thread_list[th])
- th.run
- end
+ when /^resume\s+(\d+)/
+ make_thread_list
+ th = get_thread($1.to_i)
+ if th == Thread.current
+ @stdout.print "It's the current thread.\n"
+ elsif !th.stop?
+ @stdout.print "Already running."
+ else
+ thread_list(@thread_list[th])
+ th.run
end
end
end
+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
- }
+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
+}
end
diff --git a/lib/delegate.rb b/lib/delegate.rb
index e46e4f8c23..973b0a4b95 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -1,8 +1,9 @@
# = delegate -- Support for the Delegation Pattern
#
# Documentation by James Edward Gray II and Gavin Sinclair
-
-##
+#
+# == Introduction
+#
# This library provides three different ways to delegate method calls to an
# object. The easiest to use is SimpleDelegator. Pass an object to the
# constructor and all methods supported by the object will be delegated. This
@@ -14,31 +15,104 @@
#
# Finally, if you need full control over the delegation scheme, you can inherit
# from the abstract class Delegator and customize as needed. (If you find
-# yourself needing this control, have a look at Forwardable which is also in
-# the standard library. It may suit your needs better.)
+# yourself needing this control, have a look at _forwardable_, also in the
+# standard library. It may suit your needs better.)
+#
+# == Notes
+#
+# Be advised, RDoc will not detect delegated methods.
+#
+# <b>delegate.rb provides full-class delegation via the
+# DelegateClass() method. For single-method delegation via
+# def_delegator(), see forwardable.rb.</b>
#
-# SimpleDelegator's implementation serves as a nice example if the use of
-# Delegator:
+# == Examples
#
-# class SimpleDelegator < Delegator
-# def initialize(obj)
-# super # pass obj to Delegator constructor, required
-# @delegate_sd_obj = obj # store obj for future use
+# === SimpleDelegator
+#
+# Here's a simple example that takes advantage of the fact that
+# SimpleDelegator's delegation object can be changed at any time.
+#
+# class Stats
+# def initialize
+# @source = SimpleDelegator.new([])
# end
#
-# def __getobj__
-# @delegate_sd_obj # return object we are delegating to, required
+# 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
+# puts s.stats([1, 2, 3, nil, 4, 5, 1, 2])
+#
+# <i>Prints:</i>
+#
+# Elements: 4
+# Non-Nil: 4
+# Unique: 4
+#
+# Elements: 8
+# Non-Nil: 7
+# Unique: 6
+#
+# === DelegateClass()
+#
+# Here's a sample of use from <i>tempfile.rb</i>.
+#
+# A _Tempfile_ object is really just a _File_ object with a few special rules
+# about storage location and/or when the File should be deleted. That makes for
+# an almost textbook perfect example of how to use delegation.
+#
+# 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)
#
-# def __setobj__(obj)
-# @delegate_sd_obj = obj # change delegation object,
-# # a feature we're providing
+# # below this point, all methods of File are supported...
# end
+#
+# # ...
# end
#
-# == Notes
+# === Delegator
#
-# Be advised, RDoc will not detect delegated methods.
+# SimpleDelegator's implementation serves as a nice example here.
+#
+# class SimpleDelegator < Delegator
+# def initialize(obj)
+# super # pass obj to Delegator constructor, required
+# @delegate_sd_obj = obj # store obj for future use
+# end
+#
+# def __getobj__
+# @delegate_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
+# end
+#
+# # ...
+# end
+
+#
+# Delegator is an abstract class used to build delegator pattern objects from
+# subclasses. Subclasses should redefine \_\_getobj\_\_. For a concrete
+# implementation, see SimpleDelegator.
#
class Delegator < BasicObject
kernel = ::Kernel.dup
@@ -92,8 +166,8 @@ class Delegator < BasicObject
# Returns the methods available to this delegate object as the union
# of this object's and \_\_getobj\_\_ methods.
#
- def methods(all=true)
- __getobj__.methods(all) | super
+ def methods
+ __getobj__.methods | super
end
#
@@ -130,9 +204,6 @@ class Delegator < BasicObject
__getobj__ != obj
end
- #
- # Delegates ! to the \_\_getobj\_\_
- #
def !
!__getobj__
end
@@ -206,61 +277,32 @@ class Delegator < BasicObject
# Untaint both the object returned by \_\_getobj\_\_ and self.
#
- ##
- # :method: freeze
- # Freeze both the object returned by \_\_getobj\_\_ and self.
- #
-
- [:trust, :untrust, :taint, :untaint, :freeze].each do |method|
+ [:trust, :untrust, :taint, :untaint].each do |method|
define_method method do
__getobj__.send(method)
super()
end
end
+ #
+ # Freeze self and target at once.
+ #
+ def freeze
+ __getobj__.freeze
+ super
+ end
+
@delegator_api = self.public_instance_methods
def self.public_api # :nodoc:
@delegator_api
end
end
-##
+#
# A concrete implementation of Delegator, this class provides the means to
# delegate all supported method calls to the object passed into the constructor
# and even to change the object being delegated to at a later time with
-# #__setobj__.
-#
-# Here's a simple example that takes advantage of the fact that
-# SimpleDelegator's delegation object can be changed at any time.
-#
-# class Stats
-# 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
-# puts s.stats([1, 2, 3, nil, 4, 5, 1, 2])
-#
-# Prints:
-#
-# Elements: 4
-# Non-Nil: 4
-# Unique: 4
-#
-# Elements: 8
-# Non-Nil: 7
-# Unique: 6
+# \_\_setobj\_\_ .
#
class SimpleDelegator<Delegator
# Returns the current object method calls are being delegated to.
@@ -288,7 +330,8 @@ class SimpleDelegator<Delegator
end
end
-def Delegator.delegating_block(mid) # :nodoc:
+# :stopdoc:
+def Delegator.delegating_block(mid)
lambda do |*args, &block|
target = self.__getobj__
begin
@@ -298,38 +341,16 @@ def Delegator.delegating_block(mid) # :nodoc:
end
end
end
+# :startdoc:
#
# The primary interface to this library. Use to setup delegation when defining
# your class.
#
-# class MyClass < DelegateClass(ClassToDelegateTo) # Step 1
+# class MyClass < DelegateClass( ClassToDelegateTo ) # Step 1
# def initialize
-# super(obj_of_ClassToDelegateTo) # Step 2
-# end
-# end
-#
-# Here's a sample of use from Tempfile which is really a File object with a
-# few special rules about storage location and when the File should be
-# deleted. That makes for an almost textbook perfect example of how to use
-# delegation.
-#
-# 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...
+# super(obj_of_ClassToDelegateTo) # Step 2
# end
-#
-# # ...
# end
#
def DelegateClass(superclass)
@@ -387,7 +408,7 @@ if __FILE__ == $0
foo2 = SimpleDelegator.new(foo)
p foo2
foo2.instance_eval{print "foo\n"}
- p foo.test == foo2.test # => true
+ p foo.test == foo2.test # => true
p foo2.iter{[55,true]} # => true
- foo2.error # raise error!
+ foo2.error # raise error!
end
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
index 29a378199f..861c8a514d 100644
--- a/lib/drb/acl.rb
+++ b/lib/drb/acl.rb
@@ -1,3 +1,5 @@
+# acl-2.0 - simple Access Control List
+#
# Copyright (c) 2000,2002,2003 Masatoshi SEKI
#
# acl.rb is copyrighted free software by Masatoshi SEKI.
@@ -5,170 +7,80 @@
require 'ipaddr'
-##
-# Simple Access Control Lists.
-#
-# Access control lists are composed of "allow" and "deny" halves to control
-# access. Use "all" or "*" to match any address. To match a specific address
-# use any address or address mask that IPAddr can understand.
-#
-# Example:
-#
-# list = %w[
-# deny all
-# allow 192.168.1.1
-# allow ::ffff:192.168.1.2
-# allow 192.168.1.3
-# ]
-#
-# # From Socket#peeraddr, see also ACL#allow_socket?
-# addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
-#
-# acl = ACL.new
-# p acl.allow_addr?(addr) # => true
-#
-# acl = ACL.new(list, ACL::DENY_ALLOW)
-# p acl.allow_addr?(addr) # => true
-
class ACL
-
- ##
- # The current version of ACL
-
VERSION=["2.0.0"]
-
- ##
- # An entry in an ACL
-
class ACLEntry
-
- ##
- # Creates a new entry using +str+.
- #
- # +str+ may be "*" or "all" to match any address, an IP address string
- # to match a specific address, an IP address mask per IPAddr, or one
- # containing "*" to match part of an IPv4 address.
-
def initialize(str)
if str == '*' or str == 'all'
- @pat = [:all]
+ @pat = [:all]
elsif str.include?('*')
@pat = [:name, dot_pat(str)]
else
- begin
- @pat = [:ip, IPAddr.new(str)]
- rescue ArgumentError
- @pat = [:name, dot_pat(str)]
- end
+ begin
+ @pat = [:ip, IPAddr.new(str)]
+ rescue ArgumentError
+ @pat = [:name, dot_pat(str)]
+ end
end
end
private
-
- ##
- # Creates a regular expression to match IPv4 addresses
-
def dot_pat_str(str)
list = str.split('.').collect { |s|
- (s == '*') ? '.+' : s
+ (s == '*') ? '.+' : s
}
list.join("\\.")
end
private
-
- ##
- # Creates a Regexp to match an address.
-
def dot_pat(str)
exp = "^" + dot_pat_str(str) + "$"
Regexp.new(exp)
end
public
-
- ##
- # Matches +addr+ against this entry.
-
def match(addr)
case @pat[0]
when :all
- true
+ true
when :ip
- begin
- ipaddr = IPAddr.new(addr[3])
- ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
- rescue ArgumentError
- return false
- end
- (@pat[1].include?(ipaddr)) ? true : false
+ begin
+ ipaddr = IPAddr.new(addr[3])
+ ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
+ rescue ArgumentError
+ return false
+ end
+ (@pat[1].include?(ipaddr)) ? true : false
when :name
- (@pat[1] =~ addr[2]) ? true : false
+ (@pat[1] =~ addr[2]) ? true : false
else
- false
+ false
end
end
end
- ##
- # A list of ACLEntry objects. Used to implement the allow and deny halves
- # of an ACL
-
class ACLList
-
- ##
- # Creates an empty ACLList
-
def initialize
@list = []
end
public
-
- ##
- # Matches +addr+ against each ACLEntry in this list.
-
def match(addr)
@list.each do |e|
- return true if e.match(addr)
+ return true if e.match(addr)
end
false
end
public
-
- ##
- # Adds +str+ as an ACLEntry in this list
-
def add(str)
@list.push(ACLEntry.new(str))
end
-
end
- ##
- # Default to deny
-
DENY_ALLOW = 0
-
- ##
- # Default to allow
-
ALLOW_DENY = 1
- ##
- # Creates a new ACL from +list+ with an evaluation +order+ of DENY_ALLOW or
- # ALLOW_DENY.
- #
- # An ACL +list+ is an Array of "allow" or "deny" and an address or address
- # mask or "all" or "*" to match any address:
- #
- # %w[
- # deny all
- # allow 192.0.2.2
- # allow 192.0.2.128/26
- # ]
-
def initialize(list=nil, order = DENY_ALLOW)
@order = order
@deny = ACLList.new
@@ -177,22 +89,11 @@ class ACL
end
public
-
- ##
- # Allow connections from Socket +soc+?
-
def allow_socket?(soc)
allow_addr?(soc.peeraddr)
end
public
-
- ##
- # Allow connections from addrinfo +addr+? It must be formatted like
- # Socket#peeraddr:
- #
- # ["AF_INET", 10, "lc630", "192.0.2.1"]
-
def allow_addr?(addr)
case @order
when DENY_ALLOW
@@ -209,32 +110,27 @@ class ACL
end
public
-
- ##
- # Adds +list+ of ACL entries to this ACL.
-
def install_list(list)
i = 0
while i < list.size
permission, domain = list.slice(i,2)
case permission.downcase
when 'allow'
- @allow.add(domain)
+ @allow.add(domain)
when 'deny'
- @deny.add(domain)
+ @deny.add(domain)
else
- raise "Invalid ACL entry #{list.to_s}"
+ raise "Invalid ACL entry #{list.to_s}"
end
i += 2
end
end
-
end
if __FILE__ == $0
# example
list = %w(deny all
- allow 192.168.1.1
+ allow 192.168.1.1
allow ::ffff:192.168.1.2
allow 192.168.1.3
)
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 8e03cdcde1..8970f35648 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -34,11 +34,17 @@
# [http://www2a.biglobe.ne.jp/~seki/ruby/druby.en.html]
# The English version of the dRuby home page.
#
-# [http://pragprog.com/book/sidruby/the-druby-book]
-# The dRuby Book: Distributed and Parallel Computing with Ruby
-# by Masatoshi Seki and Makoto Inoue
+# [http://www.chadfowler.com/ruby/drb.html]
+# A quick tutorial introduction to using dRuby by Chad Fowler.
#
-# [http://www.ruby-doc.org/docs/ProgrammingRuby/html/ospace.html]
+# [http://www.linux-mag.com/2002-09/ruby_05.html]
+# A tutorial introduction to dRuby in Linux Magazine by Dave Thomas.
+# Includes a discussion of Rinda.
+#
+# [http://www.eng.cse.dmu.ac.uk/~hgs/ruby/dRuby/]
+# Links to English-language Ruby material collected by Hugh Sasse.
+#
+# [http://www.rubycentral.com/book/ospace.html]
# The chapter from *Programming* *Ruby* by Dave Thomas and Andy Hunt
# which discusses dRuby.
#
@@ -426,8 +432,6 @@ module DRb
# An exception wrapping an error object
class DRbRemoteError < DRbError
-
- # Creates a new remote error that wraps the Exception +error+
def initialize(error)
@reason = error.class.to_s
super("#{error.message} (#{error.class})")
@@ -462,11 +466,11 @@ module DRb
def initialize(err, buf)
case err.to_s
when /uninitialized constant (\S+)/
- @name = $1
+ @name = $1
when /undefined class\/module (\S+)/
- @name = $1
+ @name = $1
else
- @name = nil
+ @name = nil
end
@buf = buf
end
@@ -482,9 +486,9 @@ module DRb
def self._load(s) # :nodoc:
begin
- Marshal::load(s)
+ Marshal::load(s)
rescue NameError, ArgumentError
- DRbUnknown.new($!, s)
+ DRbUnknown.new($!, s)
end
end
@@ -507,36 +511,27 @@ module DRb
end
end
- # An Array wrapper that can be sent to another server via DRb.
- #
- # All entries in the array will be dumped or be references that point to
- # the local server.
-
class DRbArray
-
- # Creates a new DRbArray that either dumps or wraps all the items in the
- # Array +ary+ so they can be loaded by a remote DRb server.
-
def initialize(ary)
@ary = ary.collect { |obj|
- if obj.kind_of? DRbUndumped
- DRbObject.new(obj)
- else
- begin
- Marshal.dump(obj)
- obj
- rescue
- DRbObject.new(obj)
- end
- end
+ if obj.kind_of? DRbUndumped
+ DRbObject.new(obj)
+ else
+ begin
+ Marshal.dump(obj)
+ obj
+ rescue
+ DRbObject.new(obj)
+ end
+ end
}
end
- def self._load(s) # :nodoc:
+ def self._load(s)
Marshal::load(s)
end
- def _dump(lv) # :nodoc:
+ def _dump(lv)
Marshal.dump(@ary)
end
end
@@ -559,16 +554,16 @@ module DRb
def dump(obj, error=false) # :nodoc:
obj = make_proxy(obj, error) if obj.kind_of? DRbUndumped
begin
- str = Marshal::dump(obj)
+ str = Marshal::dump(obj)
rescue
- str = Marshal::dump(make_proxy(obj, error))
+ str = Marshal::dump(make_proxy(obj, error))
end
[str.size].pack('N') + str
end
def load(soc) # :nodoc:
begin
- sz = soc.read(4) # sizeof (N)
+ sz = soc.read(4) # sizeof (N)
rescue
raise(DRbConnError, $!.message, $!.backtrace)
end
@@ -605,7 +600,7 @@ module DRb
ary.push(dump(msg_id.id2name))
ary.push(dump(arg.length))
arg.each do |e|
- ary.push(dump(e))
+ ary.push(dump(e))
end
ary.push(dump(b))
stream.write(ary.join(''))
@@ -621,7 +616,7 @@ module DRb
raise(DRbConnError, "too many arguments") if @argc_limit < argc
argv = Array.new(argc, nil)
argc.times do |n|
- argv[n] = load(stream)
+ argv[n] = load(stream)
end
block = load(stream)
return ro, msg, argv, block
@@ -640,7 +635,7 @@ module DRb
end
private
- def make_proxy(obj, error=false) # :nodoc:
+ def make_proxy(obj, error=false)
if error
DRbRemoteError.new(obj)
else
@@ -732,18 +727,18 @@ module DRb
# URI, but an error occurs in opening it, a DRbConnError is raised.
def open(uri, config, first=true)
@protocol.each do |prot|
- begin
- return prot.open(uri, config)
- rescue DRbBadScheme
- rescue DRbConnError
- raise($!)
- rescue
- raise(DRbConnError, "#{uri} - #{$!.inspect}")
- end
+ begin
+ return prot.open(uri, config)
+ rescue DRbBadScheme
+ rescue DRbConnError
+ raise($!)
+ rescue
+ raise(DRbConnError, "#{uri} - #{$!.inspect}")
+ end
end
if first && (config[:auto_load] != false)
- auto_load(uri, config)
- return open(uri, config, false)
+ auto_load(uri, config)
+ return open(uri, config, false)
end
raise DRbBadURI, 'can\'t parse uri:' + uri
end
@@ -760,14 +755,14 @@ module DRb
# error is passed on to the caller.
def open_server(uri, config, first=true)
@protocol.each do |prot|
- begin
- return prot.open_server(uri, config)
- rescue DRbBadScheme
- end
+ begin
+ return prot.open_server(uri, config)
+ rescue DRbBadScheme
+ end
end
if first && (config[:auto_load] != false)
- auto_load(uri, config)
- return open_server(uri, config, false)
+ auto_load(uri, config)
+ return open_server(uri, config, false)
end
raise DRbBadURI, 'can\'t parse uri:' + uri
end
@@ -781,15 +776,15 @@ module DRb
# URI, then a DRbBadURI error is raised.
def uri_option(uri, config, first=true)
@protocol.each do |prot|
- begin
- uri, opt = prot.uri_option(uri, config)
- # opt = nil if opt == ''
- return uri, opt
- rescue DRbBadScheme
- end
+ begin
+ uri, opt = prot.uri_option(uri, config)
+ # opt = nil if opt == ''
+ return uri, opt
+ rescue DRbBadScheme
+ end
end
if first && (config[:auto_load] != false)
- auto_load(uri, config)
+ auto_load(uri, config)
return uri_option(uri, config, false)
end
raise DRbBadURI, 'can\'t parse uri:' + uri
@@ -798,49 +793,40 @@ module DRb
def auto_load(uri, config) # :nodoc:
if uri =~ /^drb([a-z0-9]+):/
- require("drb/#{$1}") rescue nil
+ require("drb/#{$1}") rescue nil
end
end
module_function :auto_load
end
- # The default drb protocol which communicates over a TCP socket.
+ # The default drb protocol.
#
- # The DRb TCP protocol URI looks like:
- # <code>druby://<host>:<port>?<option></code>. The option is optional.
-
+ # Communicates over a TCP socket.
class DRbTCPSocket
- # :stopdoc:
private
def self.parse_uri(uri)
if uri =~ /^druby:\/\/(.*?):(\d+)(\?(.*))?$/
- host = $1
- port = $2.to_i
- option = $4
- [host, port, option]
+ host = $1
+ port = $2.to_i
+ option = $4
+ [host, port, option]
else
- raise(DRbBadScheme, uri) unless uri =~ /^druby:/
- raise(DRbBadURI, 'can\'t parse uri:' + uri)
+ raise(DRbBadScheme, uri) unless uri =~ /^druby:/
+ raise(DRbBadURI, 'can\'t parse uri:' + uri)
end
end
public
- # Open a client connection to +uri+ (DRb URI string) using configuration
- # +config+.
- #
- # This can raise DRb::DRbBadScheme or DRb::DRbBadURI if +uri+ is not for a
- # recognized protocol. See DRb::DRbServer.new for information on built-in
- # URI protocols.
+ # Open a client connection to +uri+ using configuration +config+.
def self.open(uri, config)
- host, port, = parse_uri(uri)
+ host, port, option = parse_uri(uri)
host.untaint
port.untaint
soc = TCPSocket.open(host, port)
self.new(uri, soc, config)
end
- # Returns the hostname of this server
def self.getservername
host = Socket::gethostname
begin
@@ -850,9 +836,6 @@ module DRb
end
end
- # For the families available for +host+, returns a TCPServer on +port+.
- # If +port+ is 0 the first available port is used. IPv4 servers are
- # preferred over IPv6 servers.
def self.open_server_inaddr_any(host, port)
infos = Socket::getaddrinfo(host, nil,
Socket::AF_UNSPEC,
@@ -863,20 +846,19 @@ module DRb
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)
- # :stopdoc:
end
# Open a server listening for connections at +uri+ using
# configuration +config+.
def self.open_server(uri, config)
uri = 'druby://:0' unless uri
- host, port, _ = parse_uri(uri)
+ host, port, opt = parse_uri(uri)
config = {:tcp_original_host => host}.update(config)
if host.size == 0
host = getservername
soc = open_server_inaddr_any(host, port)
else
- soc = TCPServer.open(host, port)
+ soc = TCPServer.open(host, port)
end
port = soc.addr[1] if port == 0
config[:tcp_port] = port
@@ -946,8 +928,8 @@ module DRb
# client-server session.
def close
if @socket
- @socket.close
- @socket = nil
+ @socket.close
+ @socket = nil
end
end
@@ -956,9 +938,9 @@ module DRb
# the server's side of this client-server session.
def accept
while true
- s = @socket.accept
- break if (@acl ? @acl.allow_socket?(s) : true)
- s.close
+ s = @socket.accept
+ break if (@acl ? @acl.allow_socket?(s) : true)
+ s.close
end
if @config[:tcp_original_host].to_s.size == 0
uri = "druby://#{s.addr[3]}:#{@config[:tcp_port]}"
@@ -972,8 +954,8 @@ module DRb
def alive?
return false unless @socket
if IO.select([@socket], nil, nil, 0)
- close
- return false
+ close
+ return false
end
true
end
@@ -1022,7 +1004,7 @@ module DRb
uri, ref = Marshal.load(s)
if DRb.here?(uri)
- obj = DRb.to_obj(ref)
+ obj = DRb.to_obj(ref)
if ((! obj.tainted?) && Thread.current[:drb_untaint])
Thread.current[:drb_untaint].push(obj)
end
@@ -1032,13 +1014,10 @@ module DRb
self.new_with(uri, ref)
end
- # Creates a DRb::DRbObject given the reference information to the remote
- # host +uri+ and object +ref+.
-
def self.new_with(uri, ref)
it = self.allocate
- it.instance_variable_set(:@uri, uri)
- it.instance_variable_set(:@ref, ref)
+ it.instance_variable_set('@uri', uri)
+ it.instance_variable_set('@ref', ref)
it
end
@@ -1063,12 +1042,12 @@ module DRb
@uri = nil
@ref = nil
if obj.nil?
- return if uri.nil?
- @uri, option = DRbProtocol.uri_option(uri, DRb.config)
- @ref = DRbURIOption.new(option) unless option.nil?
+ return if uri.nil?
+ @uri, option = DRbProtocol.uri_option(uri, DRb.config)
+ @ref = DRbURIOption.new(option) unless option.nil?
else
- @uri = uri ? uri : (DRb.uri rescue nil)
- @ref = obj ? DRb.to_id(obj) : nil
+ @uri = uri ? uri : (DRb.uri rescue nil)
+ @ref = obj ? DRb.to_id(obj) : nil
end
end
@@ -1085,7 +1064,6 @@ module DRb
undef :to_s
undef :to_a if respond_to?(:to_a)
- # Routes respond_to? to the referenced remote object.
def respond_to?(msg_id, priv=false)
case msg_id
when :_dump
@@ -1097,12 +1075,12 @@ module DRb
end
end
- # Routes method calls to the referenced remote object.
+ # Routes method calls to the referenced object.
def method_missing(msg_id, *a, &b)
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)
+ obj = DRb.to_obj(@ref)
+ DRb.current_server.check_insecure_method(obj, msg_id)
+ return obj.__send__(msg_id, *a, &b)
end
succ, result = self.class.with_friend(@uri) do
@@ -1117,13 +1095,12 @@ module DRb
raise result
else
bt = self.class.prepare_backtrace(@uri, result)
- result.set_backtrace(bt + caller)
+ result.set_backtrace(bt + caller)
raise result
end
end
- # Given the +uri+ of another host executes the block provided.
- def self.with_friend(uri) # :nodoc:
+ def self.with_friend(uri)
friend = DRb.fetch_server(uri)
return yield() unless friend
@@ -1134,9 +1111,7 @@ module DRb
Thread.current['DRb'] = save if friend
end
- # Returns a modified backtrace from +result+ with the +uri+ where each call
- # in the backtrace came from.
- def self.prepare_backtrace(uri, result) # :nodoc:
+ def self.prepare_backtrace(uri, result)
prefix = "(#{uri}) "
bt = []
result.backtrace.each do |x|
@@ -1178,36 +1153,36 @@ module DRb
def self.open(remote_uri) # :nodoc:
begin
- conn = nil
-
- @mutex.synchronize do
- #FIXME
- new_pool = []
- @pool.each do |c|
- if conn.nil? and c.uri == remote_uri
- conn = c if c.alive?
- else
- new_pool.push c
- end
- end
- @pool = new_pool
- end
-
- conn = self.new(remote_uri) unless conn
- succ, result = yield(conn)
- return succ, result
+ conn = nil
+
+ @mutex.synchronize do
+ #FIXME
+ new_pool = []
+ @pool.each do |c|
+ if conn.nil? and c.uri == remote_uri
+ conn = c if c.alive?
+ else
+ new_pool.push c
+ end
+ end
+ @pool = new_pool
+ end
+
+ conn = self.new(remote_uri) unless conn
+ succ, result = yield(conn)
+ return succ, result
ensure
- if conn
- if succ
- @mutex.synchronize do
- @pool.unshift(conn)
- @pool.pop.close while @pool.size > POOL_SIZE
- end
- else
- conn.close
- end
- end
+ if conn
+ if succ
+ @mutex.synchronize do
+ @pool.unshift(conn)
+ @pool.pop.close while @pool.size > POOL_SIZE
+ end
+ else
+ conn.close
+ end
+ end
end
end
@@ -1267,9 +1242,9 @@ module DRb
@@load_limit = sz
end
- # Set the default access control list to +acl+. The default ACL is +nil+.
+ # Set the default value for the :acl option.
#
- # See also DRb::ACL and #new()
+ # See #new(). The initial default value is nil.
def self.default_acl(acl)
@@acl = acl
end
@@ -1281,9 +1256,6 @@ module DRb
@@idconv = idconv
end
- # Set the default safe level to +level+. The default safe level is 0
- #
- # See #new for more information.
def self.default_safe_level(level)
@@safe_level = level
end
@@ -1302,11 +1274,11 @@ module DRb
def self.make_config(hash={}) # :nodoc:
default_config = {
- :idconv => @@idconv,
- :verbose => @@verbose,
- :tcp_acl => @@acl,
- :load_limit => @@load_limit,
- :argc_limit => @@argc_limit,
+ :idconv => @@idconv,
+ :verbose => @@verbose,
+ :tcp_acl => @@acl,
+ :load_limit => @@load_limit,
+ :argc_limit => @@argc_limit,
:safe_level => @@safe_level
}
default_config.update(hash)
@@ -1341,9 +1313,6 @@ module DRb
# :argc_limit :: the maximum number of arguments to a remote
# method accepted by the server. Defaults to
# 256.
- # :safe_level :: The safe level of the DRbServer. The attribute
- # sets $SAFE for methods performed in the main_loop.
- # Defaults to 0.
#
# The default values of these options can be modified on
# a class-wide basis by the class methods #default_argc_limit,
@@ -1360,12 +1329,12 @@ module DRb
# The server will immediately start running in its own thread.
def initialize(uri=nil, front=nil, config_or_acl=nil)
if Hash === config_or_acl
- config = config_or_acl.dup
+ config = config_or_acl.dup
else
- acl = config_or_acl || @@acl
- config = {
- :tcp_acl => acl
- }
+ acl = config_or_acl || @@acl
+ config = {
+ :tcp_acl => acl
+ }
end
@config = self.class.make_config(config)
@@ -1403,10 +1372,6 @@ module DRb
# The configuration of this DRbServer
attr_reader :config
- # The safe level for this server. This is a number corresponding to
- # $SAFE.
- #
- # The default safe_level is 0
attr_reader :safe_level
# Set whether to operate in verbose mode.
@@ -1423,8 +1388,7 @@ module DRb
def alive?
@thread.alive?
end
-
- # Is +uri+ the URI for this server?
+
def here?(uri)
@exported_uri.include?(uri)
end
@@ -1453,19 +1417,30 @@ module DRb
end
private
-
- ##
- # Starts the DRb main loop in a new thread.
+ def kill_sub_thread
+ Thread.new do
+ grp = ThreadGroup.new
+ grp.add(Thread.current)
+ list = @grp.list
+ while list.size > 0
+ list.each do |th|
+ th.kill if th.alive?
+ end
+ list = @grp.list
+ end
+ end
+ end
def run
Thread.start do
- begin
- while true
- main_loop
- end
- ensure
- @protocol.close if @protocol
- end
+ begin
+ while true
+ main_loop
+ end
+ ensure
+ @protocol.close if @protocol
+ kill_sub_thread
+ end
end
end
@@ -1503,10 +1478,10 @@ module DRb
raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
if obj.private_methods.include?(msg_id)
- desc = any_to_s(obj)
+ desc = any_to_s(obj)
raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
elsif obj.protected_methods.include?(msg_id)
- desc = any_to_s(obj)
+ desc = any_to_s(obj)
raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
else
true
@@ -1516,15 +1491,15 @@ module DRb
class InvokeMethod # :nodoc:
def initialize(drb_server, client)
- @drb_server = drb_server
+ @drb_server = drb_server
@safe_level = drb_server.safe_level
- @client = client
+ @client = client
end
def perform
- @result = nil
- @succ = false
- setup_message
+ @result = nil
+ @succ = false
+ setup_message
if $SAFE < @safe_level
info = Thread.current['DRb']
@@ -1548,19 +1523,19 @@ module DRb
@result = perform_without_block
end
end
- @succ = true
- if @msg_id == :to_ary && @result.class == Array
- @result = DRbArray.new(@result)
- end
- return @succ, @result
+ @succ = true
+ if @msg_id == :to_ary && @result.class == Array
+ @result = DRbArray.new(@result)
+ end
+ return @succ, @result
rescue StandardError, ScriptError, Interrupt
- @result = $!
- return @succ, @result
+ @result = $!
+ return @succ, @result
end
private
def init_with_client
- obj, msg, argv, block = @client.recv_request
+ obj, msg, argv, block = @client.recv_request
@obj = obj
@msg_id = msg.intern
@argv = argv
@@ -1572,21 +1547,21 @@ module DRb
end
def setup_message
- init_with_client
- check_insecure_method
+ init_with_client
+ check_insecure_method
end
def perform_without_block
- if Proc === @obj && @msg_id == :__drb_yield
+ if Proc === @obj && @msg_id == :__drb_yield
if @argv.size == 1
- ary = @argv
- else
- ary = [@argv]
- end
- ary.collect(&@obj)[0]
- else
- @obj.__send__(@msg_id, *@argv)
- end
+ ary = @argv
+ else
+ ary = [@argv]
+ end
+ ary.collect(&@obj)[0]
+ else
+ @obj.__send__(@msg_id, *@argv)
+ end
end
end
@@ -1612,33 +1587,33 @@ module DRb
# or a local method call fails.
def main_loop
Thread.start(@protocol.accept) do |client|
- @grp.add Thread.current
- Thread.current['DRb'] = { 'client' => client ,
- 'server' => self }
+ @grp.add Thread.current
+ Thread.current['DRb'] = { 'client' => client ,
+ 'server' => self }
DRb.mutex.synchronize do
client_uri = client.uri
@exported_uri << client_uri unless @exported_uri.include?(client_uri)
end
- loop do
- begin
- succ = false
- invoke_method = InvokeMethod.new(self, client)
- succ, result = invoke_method.perform
- if !succ && verbose
- p result
- result.backtrace.each do |x|
- puts x
- end
- end
- client.send_reply(succ, result) rescue nil
- ensure
+ loop do
+ begin
+ succ = false
+ invoke_method = InvokeMethod.new(self, client)
+ succ, result = invoke_method.perform
+ if !succ && verbose
+ p result
+ result.backtrace.each do |x|
+ puts x
+ end
+ end
+ client.send_reply(succ, result) rescue nil
+ ensure
client.close unless succ
if Thread.current['DRb']['stop_service']
Thread.new { stop_service }
end
break unless succ
- end
- end
+ end
+ end
end
end
end
@@ -1766,10 +1741,7 @@ module DRb
end
module_function :thread
- # Set the default id conversion object.
- #
- # This is expected to be an instance such as DRb::DRbIdConv that responds to
- # #to_id and #to_obj that can convert objects to and from DRb references.
+ # Set the default id conv object.
#
# See DRbServer#default_id_conv.
def install_id_conv(idconv)
@@ -1777,7 +1749,7 @@ module DRb
end
module_function :install_id_conv
- # Set the default ACL to +acl+.
+ # Set the default acl.
#
# See DRb::DRbServer.default_acl.
def install_acl(acl)
@@ -1786,24 +1758,12 @@ module DRb
module_function :install_acl
@mutex = Mutex.new
- def mutex # :nodoc:
+ def mutex
@mutex
end
module_function :mutex
@server = {}
- # Registers +server+ with DRb.
- #
- # This is called when a new DRb::DRbServer is created.
- #
- # If there is no primary server then +server+ becomes the primary server.
- #
- # Example:
- #
- # require 'drb'
- #
- # s = DRb::DRbServer.new # automatically calls regist_server
- # DRb.fetch_server s.uri #=> #<DRb::DRbServer:0x...>
def regist_server(server)
@server[server.uri] = server
mutex.synchronize do
@@ -1812,22 +1772,17 @@ module DRb
end
module_function :regist_server
- # Removes +server+ from the list of registered servers.
def remove_server(server)
@server.delete(server.uri)
end
module_function :remove_server
- # Retrieves the server with the given +uri+.
- #
- # See also regist_server and remove_server.
def fetch_server(uri)
@server[uri]
end
module_function :fetch_server
end
-# :stopdoc:
DRbObject = DRb::DRbObject
DRbUndumped = DRb::DRbUndumped
DRbIdConv = DRb::DRbIdConv
diff --git a/lib/drb/eq.rb b/lib/drb/eq.rb
index 553f30c598..6328c81202 100644
--- a/lib/drb/eq.rb
+++ b/lib/drb/eq.rb
@@ -1,5 +1,5 @@
module DRb
- class DRbObject # :nodoc:
+ class DRbObject
def ==(other)
return false unless DRbObject === other
(@ref == other.__drbref) && (@uri == other.__drburi)
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index c70ced877c..5996626492 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -1,6 +1,6 @@
=begin
external service
- Copyright (c) 2000,2002 Masatoshi SEKI
+ Copyright (c) 2000,2002 Masatoshi SEKI
=end
require 'drb/drb'
@@ -42,8 +42,6 @@ module DRb
end
end
-# :stopdoc:
-
if __FILE__ == $0
class Foo
include DRbUndumped
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 8a7fc316af..5937cb0c50 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'
@@ -54,17 +54,17 @@ module DRb
def unregist(name)
synchronize do
- @servers.delete(name)
+ @servers.delete(name)
end
end
private
def invoke_thread
Thread.new do
- while true
- name = @queue.pop
- invoke_service_command(name, @@command[name])
- end
+ while true
+ name = @queue.pop
+ invoke_service_command(name, @@command[name])
+ end
end
end
@@ -75,19 +75,11 @@ module DRb
def invoke_service_command(name, command)
raise "invalid command. name: #{name}" unless command
synchronize do
- return if @servers.include?(name)
- @servers[name] = false
+ return if @servers.include?(name)
+ @servers[name] = false
end
uri = @uri || DRb.uri
- if command.respond_to? :to_ary
- command = command.to_ary + [uri, name]
- pid = spawn(*command)
- else
- pid = spawn("#{command} #{uri} #{name}")
- end
- th = Process.detach(pid)
- th[:drb_service] = name
- th
+ Process.detach spawn("#{command} #{uri} #{name}")
end
end
end
diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb
index b3568ab08d..b7a5f5383f 100644
--- a/lib/drb/gw.rb
+++ b/lib/drb/gw.rb
@@ -2,36 +2,8 @@ require 'drb/drb'
require 'monitor'
module DRb
-
- # Gateway id conversion forms a gateway between different DRb protocols or
- # networks.
- #
- # The gateway needs to install this id conversion and create servers for
- # each of the protocols or networks it will be a gateway between. It then
- # needs to create a server that attaches to each of these networks. For
- # example:
- #
- # require 'drb/drb'
- # require 'drb/unix'
- # require 'drb/gw'
- #
- # DRb.install_id_conv DRb::GWIdConv.new
- # gw = DRb::GW.new
- # s1 = DRb::DRbServer.new 'drbunix:/path/to/gateway', gw
- # s2 = DRb::DRbServer.new 'druby://example:10000', gw
- #
- # s1.thread.join
- # s2.thread.join
- #
- # Each client must register services with the gateway, for example:
- #
- # DRb.start_service 'drbunix:', nil # an anonymous server
- # gw = DRbObject.new nil, 'drbunix:/path/to/gateway'
- # gw[:unix] = some_service
- # DRb.thread.join
-
class GWIdConv < DRbIdConv
- def to_obj(ref) # :nodoc:
+ def to_obj(ref)
if Array === ref && ref[0] == :DRbObject
return DRbObject.new_with(ref[1], ref[2])
end
@@ -39,29 +11,19 @@ module DRb
end
end
- # The GW provides a synchronized store for participants in the gateway to
- # communicate.
-
class GW
include MonitorMixin
-
- # Creates a new GW
-
def initialize
super()
@hash = {}
end
- # Retrieves +key+ from the GW
-
def [](key)
synchronize do
@hash[key]
end
end
- # Stores value +v+ at +key+ in the GW
-
def []=(key, v)
synchronize do
@hash[key] = v
@@ -69,7 +31,7 @@ module DRb
end
end
- class DRbObject # :nodoc:
+ class DRbObject
def self._load(s)
uri, ref = Marshal.load(s)
if DRb.uri == uri
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
index d11feabcb8..220d0ad68d 100644
--- a/lib/drb/invokemethod.rb
+++ b/lib/drb/invokemethod.rb
@@ -2,12 +2,12 @@
module DRb
class DRbServer
- module InvokeMethod18Mixin # :nodoc: all
+ module InvokeMethod18Mixin
def block_yield(x)
- if x.size == 1 && x[0].class == Array
- x[0] = DRbArray.new(x[0])
- end
- @block.call(*x)
+ if x.size == 1 && x[0].class == Array
+ x[0] = DRbArray.new(x[0])
+ end
+ block_value = @block.call(*x)
end
def perform_with_block
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
index cab9ebc60b..149426db7b 100644
--- a/lib/drb/observer.rb
+++ b/lib/drb/observer.rb
@@ -1,12 +1,9 @@
require 'observer'
module DRb
- # The Observable module extended to DRb. See Observable for details.
module DRbObservable
include Observable
- # Notifies observers of a change in state. See also
- # Observable#notify_observers
def notify_observers(*arg)
if defined? @observer_state and @observer_state
if defined? @observer_peers
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index e7d9569eb6..08f97f4bc6 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -5,248 +5,124 @@ require 'singleton'
module DRb
- # The protocol for DRb over an SSL socket
- #
- # The URI for a DRb socket over SSL is:
- # <code>drbssl://<host>:<port>?<option></code>. The option is optional
class DRbSSLSocket < DRbTCPSocket
- # SSLConfig handles the needed SSL information for establishing a
- # DRbSSLSocket connection, including generating the X509 / RSA pair.
- #
- # An instance of this config can be passed to DRbSSLSocket.new,
- # DRbSSLSocket.open and DRbSSLSocket.open_server
- #
- # See DRb::DRbSSLSocket::SSLConfig.new for more details
class SSLConfig
- # Default values for a SSLConfig instance.
- #
- # See DRb::DRbSSLSocket::SSLConfig.new for more details
DEFAULT = {
- :SSLCertificate => nil,
- :SSLPrivateKey => nil,
- :SSLClientCA => nil,
- :SSLCACertificatePath => nil,
- :SSLCACertificateFile => nil,
- :SSLTmpDhCallback => nil,
- :SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE,
- :SSLVerifyDepth => nil,
- :SSLVerifyCallback => nil, # custom verification
+ :SSLCertificate => nil,
+ :SSLPrivateKey => nil,
+ :SSLClientCA => nil,
+ :SSLCACertificatePath => nil,
+ :SSLCACertificateFile => nil,
+ :SSLVerifyMode => ::OpenSSL::SSL::VERIFY_NONE,
+ :SSLVerifyDepth => nil,
+ :SSLVerifyCallback => nil, # custom verification
:SSLCertificateStore => nil,
- # Must specify if you use auto generated certificate.
- :SSLCertName => nil, # e.g. [["CN","fqdn.example.com"]]
- :SSLCertComment => "Generated by Ruby/OpenSSL"
+ # Must specify if you use auto generated certificate.
+ :SSLCertName => nil, # e.g. [["CN","fqdn.example.com"]]
+ :SSLCertComment => "Generated by Ruby/OpenSSL"
}
- # Create a new DRb::DRbSSLSocket::SSLConfig instance
- #
- # The DRb::DRbSSLSocket will take either a +config+ Hash or an instance
- # of SSLConfg, and will setup the certificate for its session for the
- # configuration. If want it to generate a generic certificate, the bare
- # minimum is to provide the :SSLCertName
- #
- # === Config options
- #
- # From +config+ Hash:
- #
- # :SSLCertificate ::
- # An instance of OpenSSL::X509::Certificate. If this is not provided,
- # then a generic X509 is generated, with a correspond :SSLPrivateKey
- #
- # :SSLPrivateKey ::
- # A private key instance, like OpenSSL::PKey::RSA. This key must be
- # the key that signed the :SSLCertificate
- #
- # :SSLClientCA ::
- # An OpenSSL::X509::Certificate, or Array of certificates that will
- # used as ClientCAs in the SSL Context
- #
- # :SSLCACertificatePath ::
- # A path to the directory of CA certificates. The certificates must
- # be in PEM format.
- #
- # :SSLCACertificateFile ::
- # A path to a CA certificate file, in PEM format.
- #
- # :SSLTmpDhCallback ::
- # A DH callback. See OpenSSL::SSL::SSLContext.tmp_dh_callback
- #
- # :SSLVerifyMode ::
- # This is the SSL verification mode. See OpenSSL::SSL::VERIFY_* for
- # available modes. The default is OpenSSL::SSL::VERIFY_NONE
- #
- # :SSLVerifyDepth ::
- # Number of CA certificates to walk, when verifying a certificate
- # chain.
- #
- # :SSLVerifyCallback ::
- # A callback to be used for additional verification. See
- # OpenSSL::SSL::SSLContext.verify_callback
- #
- # :SSLCertificateStore ::
- # A OpenSSL::X509::Store used for verification of certificates
- #
- # :SSLCertName ::
- # Issuer name for the certificate. This is required when generating
- # the certificate (if :SSLCertificate and :SSLPrivateKey were not
- # given). The value of this is to be an Array of pairs:
- #
- # [["C", "Raleigh"], ["ST","North Carolina"],
- # ["CN","fqdn.example.com"]]
- #
- # See also OpenSSL::X509::Name
- #
- # :SSLCertComment ::
- # A comment to be used for generating the certificate. The default is
- # "Generated by Ruby/OpenSSL"
- #
- #
- # === Example
- #
- # These values can be added after the fact, like a Hash.
- #
- # require 'drb/ssl'
- # c = DRb::DRbSSLSocket::SSLConfig.new {}
- # c[:SSLCertificate] =
- # OpenSSL::X509::Certificate.new(File.read('mycert.crt'))
- # c[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(File.read('mycert.key'))
- # c[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
- # c[:SSLCACertificatePath] = "/etc/ssl/certs/"
- # c.setup_certificate
- #
- # or
- #
- # require 'drb/ssl'
- # c = DRb::DRbSSLSocket::SSLConfig.new({
- # :SSLCertName => [["CN" => DRb::DRbSSLSocket.getservername]]
- # })
- # c.setup_certificate
- #
def initialize(config)
- @config = config
+ @config = config
@cert = config[:SSLCertificate]
@pkey = config[:SSLPrivateKey]
@ssl_ctx = nil
end
- # A convenience method to access the values like a Hash
def [](key);
- @config[key] || DEFAULT[key]
+ @config[key] || DEFAULT[key]
end
- # Connect to IO +tcp+, with context of the current certificate
- # configuration
def connect(tcp)
- ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
- ssl.sync = true
- ssl.connect
- ssl
+ ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
+ ssl.sync = true
+ ssl.connect
+ ssl
end
- # Accept connection to IO +tcp+, with context of the current certificate
- # configuration
def accept(tcp)
- ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
- ssl.sync = true
- ssl.accept
- ssl
+ ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
+ ssl.sync = true
+ ssl.accept
+ ssl
end
- # Ensures that :SSLCertificate and :SSLPrivateKey have been provided
- # or that a new certificate is generated with the other parameters
- # provided.
def setup_certificate
if @cert && @pkey
return
end
- rsa = OpenSSL::PKey::RSA.new(1024){|p, n|
- next unless self[:verbose]
- case p
- when 0; $stderr.putc "." # BN_generate_prime
- when 1; $stderr.putc "+" # BN_generate_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,
- # but also data from BN_generate_prime
- else; $stderr.putc "*" # BN_generate_prime
- end
- }
-
- cert = OpenSSL::X509::Certificate.new
- cert.version = 3
- cert.serial = 0
- name = OpenSSL::X509::Name.new(self[:SSLCertName])
- cert.subject = name
- cert.issuer = name
- 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"),
- ef.create_extension("subjectKeyIdentifier", "hash") ]
- ef.issuer_certificate = cert
- cert.add_extension(ef.create_extension("authorityKeyIdentifier",
- "keyid:always,issuer:always"))
- if comment = self[:SSLCertComment]
- cert.add_extension(ef.create_extension("nsComment", comment))
- end
- cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-
- @cert = cert
+ rsa = OpenSSL::PKey::RSA.new(512){|p, n|
+ next unless self[:verbose]
+ case p
+ when 0; $stderr.putc "." # BN_generate_prime
+ when 1; $stderr.putc "+" # BN_generate_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,
+ # but also data from BN_generate_prime
+ else; $stderr.putc "*" # BN_generate_prime
+ end
+ }
+
+ cert = OpenSSL::X509::Certificate.new
+ cert.version = 3
+ cert.serial = 0
+ name = OpenSSL::X509::Name.new(self[:SSLCertName])
+ cert.subject = name
+ cert.issuer = name
+ 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"),
+ ef.create_extension("subjectKeyIdentifier", "hash") ]
+ ef.issuer_certificate = cert
+ cert.add_extension(ef.create_extension("authorityKeyIdentifier",
+ "keyid:always,issuer:always"))
+ if comment = self[:SSLCertComment]
+ cert.add_extension(ef.create_extension("nsComment", comment))
+ end
+ cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+
+ @cert = cert
@pkey = rsa
end
- # Establish the OpenSSL::SSL::SSLContext with the configuration
- # parameters provided.
def setup_ssl_context
ctx = ::OpenSSL::SSL::SSLContext.new
ctx.cert = @cert
ctx.key = @pkey
- ctx.client_ca = self[:SSLClientCA]
- ctx.ca_path = self[:SSLCACertificatePath]
- ctx.ca_file = self[:SSLCACertificateFile]
- ctx.tmp_dh_callback = self[:SSLTmpDhCallback]
- ctx.verify_mode = self[:SSLVerifyMode]
- ctx.verify_depth = self[:SSLVerifyDepth]
- ctx.verify_callback = self[:SSLVerifyCallback]
+ ctx.client_ca = self[:SSLClientCA]
+ ctx.ca_path = self[:SSLCACertificatePath]
+ ctx.ca_file = self[:SSLCACertificateFile]
+ ctx.verify_mode = self[:SSLVerifyMode]
+ ctx.verify_depth = self[:SSLVerifyDepth]
+ ctx.verify_callback = self[:SSLVerifyCallback]
ctx.cert_store = self[:SSLCertificateStore]
@ssl_ctx = ctx
end
end
- # Parse the dRuby +uri+ for an SSL connection.
- #
- # Expects drbssl://...
- #
- # Raises DRbBadScheme or DRbBadURI if +uri+ is not matching or malformed
- def self.parse_uri(uri) # :nodoc:
+ def self.parse_uri(uri)
if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
- host = $1
- port = $2.to_i
- option = $4
- [host, port, option]
+ host = $1
+ port = $2.to_i
+ option = $4
+ [host, port, option]
else
- raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
- raise(DRbBadURI, 'can\'t parse uri:' + uri)
+ raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
+ raise(DRbBadURI, 'can\'t parse uri:' + uri)
end
end
- # Return an DRb::DRbSSLSocket instance as a client-side connection,
- # with the SSL connected. This is called from DRb::start_service or while
- # connecting to a remote object:
- #
- # DRb.start_service 'drbssl://localhost:0', front, config
- #
- # +uri+ is the URI we are connected to,
- # <code>'drbssl://localhost:0'</code> above, +config+ is our
- # configuration. Either a Hash or DRb::DRbSSLSocket::SSLConfig
def self.open(uri, config)
- host, port, = parse_uri(uri)
+ host, port, option = parse_uri(uri)
host.untaint
port.untaint
soc = TCPSocket.open(host, port)
@@ -256,23 +132,14 @@ module DRb
self.new(uri, ssl, ssl_conf, true)
end
- # Returns a DRb::DRbSSLSocket instance as a server-side connection, with
- # the SSL connected. This is called from DRb::start_service or while
- # connecting to a remote object:
- #
- # DRb.start_service 'drbssl://localhost:0', front, config
- #
- # +uri+ is the URI we are connected to,
- # <code>'drbssl://localhost:0'</code> above, +config+ is our
- # configuration. Either a Hash or DRb::DRbSSLSocket::SSLConfig
def self.open_server(uri, config)
uri = 'drbssl://:0' unless uri
- host, port, = parse_uri(uri)
+ host, port, opt = parse_uri(uri)
if host.size == 0
host = getservername
soc = open_server_inaddr_any(host, port)
else
- soc = TCPServer.open(host, port)
+ soc = TCPServer.open(host, port)
end
port = soc.addr[1] if port == 0
@uri = "drbssl://#{host}:#{port}"
@@ -283,59 +150,38 @@ module DRb
self.new(@uri, soc, ssl_conf, false)
end
- # This is a convenience method to parse +uri+ and separate out any
- # additional options appended in the +uri+.
- #
- # Returns an option-less uri and the option => [uri,option]
- #
- # The +config+ is completely unused, so passing nil is sufficient.
- def self.uri_option(uri, config) # :nodoc:
+ def self.uri_option(uri, config)
host, port, option = parse_uri(uri)
return "drbssl://#{host}:#{port}", option
end
- # Create a DRb::DRbSSLSocket instance.
- #
- # +uri+ is the URI we are connected to.
- # +soc+ is the tcp socket we are bound to.
- # +config+ is our configuration. Either a Hash or SSLConfig
- # +is_established+ is a boolean of whether +soc+ is currenly established
- #
- # This is called automatically based on the DRb protocol.
def initialize(uri, soc, config, is_established)
@ssl = is_established ? soc : nil
super(uri, soc.to_io, config)
end
- # Returns the SSL stream
- def stream; @ssl; end # :nodoc:
+ def stream; @ssl; end
- # Closes the SSL stream before closing the dRuby connection.
- def close # :nodoc:
+ def close
if @ssl
- @ssl.close
- @ssl = nil
+ @ssl.close
+ @ssl = nil
end
super
end
- def accept # :nodoc:
+ def accept
begin
while true
- soc = @socket.accept
- break if (@acl ? @acl.allow_socket?(soc) : true)
- soc.close
- end
- begin
- ssl = @config.accept(soc)
- rescue Exception
- soc.close
- raise
+ soc = @socket.accept
+ break if (@acl ? @acl.allow_socket?(soc) : true)
+ soc.close
end
+ ssl = @config.accept(soc)
self.class.new(uri, ssl, @config, true)
rescue OpenSSL::SSL::SSLError
- warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
- retry
+ warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
+ retry
end
end
end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index 4ea3035f39..6d8935b1ef 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -2,97 +2,87 @@ require 'drb/drb'
require 'monitor'
module DRb
-
- # Timer id conversion keeps objects alive for a certain amount of time after
- # their last access. The default time period is 600 seconds and can be
- # changed upon initialization.
- #
- # To use TimerIdConv:
- #
- # DRb.install_id_conv TimerIdConv.new 60 # one minute
-
class TimerIdConv < DRbIdConv
- class TimerHolder2 # :nodoc:
+ class TimerHolder2
include MonitorMixin
class InvalidIndexError < RuntimeError; end
def initialize(timeout=600)
- super()
- @sentinel = Object.new
- @gc = {}
- @curr = {}
- @renew = {}
- @timeout = timeout
- @keeper = keeper
+ super()
+ @sentinel = Object.new
+ @gc = {}
+ @curr = {}
+ @renew = {}
+ @timeout = timeout
+ @keeper = keeper
end
def add(obj)
- synchronize do
- key = obj.__id__
- @curr[key] = obj
- return key
- end
+ synchronize do
+ key = obj.__id__
+ @curr[key] = obj
+ return key
+ end
end
def fetch(key, dv=@sentinel)
- synchronize do
- obj = peek(key)
- if obj == @sentinel
- return dv unless dv == @sentinel
- raise InvalidIndexError
- end
- @renew[key] = obj # KeepIt
- return obj
- end
+ synchronize do
+ obj = peek(key)
+ if obj == @sentinel
+ return dv unless dv == @sentinel
+ raise InvalidIndexError
+ end
+ @renew[key] = obj # KeepIt
+ return obj
+ end
end
def include?(key)
- synchronize do
- obj = peek(key)
- return false if obj == @sentinel
- true
- end
+ synchronize do
+ obj = peek(key)
+ return false if obj == @sentinel
+ true
+ end
end
def peek(key)
- synchronize do
- return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
- end
+ synchronize do
+ return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
+ end
end
private
def alternate
- synchronize do
- @gc = @curr # GCed
- @curr = @renew
- @renew = {}
- end
+ synchronize do
+ @gc = @curr # GCed
+ @curr = @renew
+ @renew = {}
+ end
end
def keeper
- Thread.new do
- loop do
- alternate
- sleep(@timeout)
- end
- end
+ Thread.new do
+ loop do
+ size = alternate
+ sleep(@timeout)
+ end
+ end
end
end
- # Creates a new TimerIdConv which will hold objects for +timeout+ seconds.
def initialize(timeout=600)
@holder = TimerHolder2.new(timeout)
end
- def to_obj(ref) # :nodoc:
+ def to_obj(ref)
return super if ref.nil?
@holder.fetch(ref)
rescue TimerHolder2::InvalidIndexError
raise "invalid reference"
end
- def to_id(obj) # :nodoc:
+ def to_id(obj)
return @holder.add(obj)
end
end
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 4d245780a5..ebecc22901 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -6,39 +6,33 @@ raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer)
module DRb
- # Implements DRb over a UNIX socket
- #
- # DRb UNIX socket URIs look like <code>drbunix:<path>?<option></code>. The
- # option is optional.
-
class DRbUNIXSocket < DRbTCPSocket
- # :stopdoc:
def self.parse_uri(uri)
if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
- filename = $1
- option = $3
- [filename, option]
+ filename = $1
+ option = $3
+ [filename, option]
else
- raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
- raise(DRbBadURI, 'can\'t parse uri:' + uri)
+ raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
+ raise(DRbBadURI, 'can\'t parse uri:' + uri)
end
end
def self.open(uri, config)
- filename, = parse_uri(uri)
+ filename, option = parse_uri(uri)
filename.untaint
soc = UNIXSocket.open(filename)
self.new(uri, soc, config)
end
def self.open_server(uri, config)
- filename, = parse_uri(uri)
+ filename, option = parse_uri(uri)
if filename.size == 0
- soc = temp_server
+ soc = temp_server
filename = soc.path
- uri = 'drbunix:' + soc.path
+ uri = 'drbunix:' + soc.path
else
- soc = UNIXServer.open(filename)
+ soc = UNIXServer.open(filename)
end
owner = config[:UNIXFileOwner]
group = config[:UNIXFileGroup]
@@ -73,18 +67,18 @@ module DRb
tmpdir = Dir::tmpdir
n = 0
while true
- begin
- tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
- lock = tmpname + '.lock'
- unless File.exist?(tmpname) or File.exist?(lock)
- Dir.mkdir(lock)
- break
- end
- rescue
- raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
- #sleep(1)
- end
- n += 1
+ begin
+ tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
+ lock = tmpname + '.lock'
+ unless File.exist?(tmpname) or File.exist?(lock)
+ Dir.mkdir(lock)
+ break
+ end
+ rescue
+ raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
+ #sleep(1)
+ end
+ n += 1
end
soc = UNIXServer.new(tmpname)
Dir.rmdir(lock)
@@ -106,10 +100,9 @@ module DRb
end
def set_sockopt(soc)
- soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+ soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
end
end
DRbProtocol.add_protocol(DRbUNIXSocket)
- # :startdoc:
end
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index 18a7ca003d..74e0f36577 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -1,8 +1,8 @@
#
# e2mmap.rb - for ruby 1.1
-# $Release Version: 2.0$
-# $Revision: 1.10 $
-# by Keiju ISHITSUKA
+# $Release Version: 2.0$
+# $Revision: 1.10 $
+# by Keiju ISHITSUKA
#
# --
# Usage:
@@ -60,19 +60,19 @@ module Exception2MessageMapper
def bind(cl)
self.module_eval %[
def Raise(err = nil, *rest)
- Exception2MessageMapper.Raise(self.class, err, *rest)
+ Exception2MessageMapper.Raise(self.class, err, *rest)
end
alias Fail Raise
def self.included(mod)
- mod.extend Exception2MessageMapper
+ mod.extend Exception2MessageMapper
end
]
end
# Fail(err, *rest)
- # err: exception
- # rest: message arguments
+ # err: exception
+ # rest: message arguments
#
def Raise(err = nil, *rest)
E2MM.Raise(self, err, *rest)
@@ -81,19 +81,19 @@ module Exception2MessageMapper
alias fail Raise
# def_e2message(c, m)
- # c: exception
- # m: message_form
- # define exception c with message m.
+ # c: exception
+ # m: message_form
+ # define exception c with message m.
#
def def_e2message(c, m)
E2MM.def_e2message(self, c, m)
end
# def_exception(n, m, s)
- # n: exception_name
- # m: message_form
- # s: superclass(default: StandardError)
- # define exception named ``c'' with message m.
+ # n: exception_name
+ # m: message_form
+ # s: superclass(default: StandardError)
+ # define exception named ``c'' with message m.
#
def def_exception(n, m, s = StandardError)
E2MM.def_exception(self, n, m, s)
@@ -106,10 +106,10 @@ module Exception2MessageMapper
@MessageMap = {}
# E2MM.def_e2message(k, e, m)
- # k: class to define exception under.
- # e: exception
- # m: message_form
- # define exception c with message m.
+ # k: class to define exception under.
+ # e: exception
+ # m: message_form
+ # define exception c with message m.
#
def E2MM.def_e2message(k, c, m)
E2MM.instance_eval{@MessageMap[[k, c]] = m}
@@ -117,11 +117,11 @@ module Exception2MessageMapper
end
# E2MM.def_exception(k, n, m, s)
- # k: class to define exception under.
- # n: exception_name
- # m: message_form
- # s: superclass(default: StandardError)
- # define exception named ``c'' with message m.
+ # k: class to define exception under.
+ # n: exception_name
+ # m: message_form
+ # s: superclass(default: StandardError)
+ # define exception named ``c'' with message m.
#
def E2MM.def_exception(k, n, m, s = StandardError)
n = n.id2name if n.kind_of?(Fixnum)
@@ -131,9 +131,9 @@ module Exception2MessageMapper
end
# Fail(klass, err, *rest)
- # klass: class to define exception under.
- # err: exception
- # rest: message arguments
+ # klass: class to define exception under.
+ # err: exception
+ # rest: message arguments
#
def E2MM.Raise(klass = E2MM, err = nil, *rest)
if form = e2mm_message(klass, err)
@@ -153,9 +153,9 @@ module Exception2MessageMapper
def E2MM.e2mm_message(klass, exp)
for c in klass.ancestors
if mes = @MessageMap[[c,exp]]
- #p mes
- m = klass.instance_eval('"' + mes + '"')
- return m
+ #p mes
+ m = klass.instance_eval('"' + mes + '"')
+ return m
end
end
nil
@@ -165,8 +165,8 @@ module Exception2MessageMapper
end
E2MM.def_exception(E2MM,
- :ErrNotRegisteredException,
- "not registerd exception(%s)")
+ :ErrNotRegisteredException,
+ "not registerd exception(%s)")
end
diff --git a/lib/erb.rb b/lib/erb.rb
index eb7461bca5..5e9feb9ba5 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -1,8 +1,7 @@
-# -*- coding: us-ascii -*-
# = ERB -- Ruby Templating
#
# Author:: Masatoshi SEKI
-# Documentation:: James Edward Gray II, Gavin Sinclair, and Simon Chiang
+# Documentation:: James Edward Gray II and Gavin Sinclair
#
# See ERB for primary documentation and ERB::Util for a couple of utility
# routines.
@@ -11,8 +10,6 @@
#
# You can redistribute it and/or modify it under the same terms as Ruby.
-require "cgi/util"
-
#
# = ERB -- Ruby Templating
#
@@ -257,7 +254,7 @@ require "cgi/util"
# Rails, the web application framework, uses ERB to create views.
#
class ERB
- Revision = '$Date:: $' # :nodoc: #'
+ Revision = '$Date:: $' #'
# Returns revision information for the erb.rb module.
def self.version
@@ -268,76 +265,6 @@ end
#--
# ERB::Compiler
class ERB
- # = ERB::Compiler
- #
- # Compiles ERB templates into Ruby code; the compiled code produces the
- # template result when evaluated. ERB::Compiler provides hooks to define how
- # generated output is handled.
- #
- # Internally ERB does something like this to generate the code returned by
- # ERB#src:
- #
- # compiler = ERB::Compiler.new('<>')
- # compiler.pre_cmd = ["_erbout=''"]
- # compiler.put_cmd = "_erbout.concat"
- # compiler.insert_cmd = "_erbout.concat"
- # compiler.post_cmd = ["_erbout"]
- #
- # code, enc = compiler.compile("Got <%= obj %>!\n")
- # puts code
- #
- # <i>Generates</i>:
- #
- # #coding:UTF-8
- # _erbout=''; _erbout.concat "Got "; _erbout.concat(( obj ).to_s); _erbout.concat "!\n"; _erbout
- #
- # By default the output is sent to the print method. For example:
- #
- # compiler = ERB::Compiler.new('<>')
- # code, enc = compiler.compile("Got <%= obj %>!\n")
- # puts code
- #
- # <i>Generates</i>:
- #
- # #coding:UTF-8
- # print "Got "; print(( obj ).to_s); print "!\n"
- #
- # == Evaluation
- #
- # The compiled code can be used in any context where the names in the code
- # correctly resolve. Using the last example, each of these print 'Got It!'
- #
- # Evaluate using a variable:
- #
- # obj = 'It'
- # eval code
- #
- # Evaluate using an input:
- #
- # mod = Module.new
- # mod.module_eval %{
- # def get(obj)
- # #{code}
- # end
- # }
- # extend mod
- # get('It')
- #
- # Evaluate using an accessor:
- #
- # klass = Class.new Object
- # klass.class_eval %{
- # attr_accessor :obj
- # def initialize(obj)
- # @obj = obj
- # end
- # def get_it
- # #{code}
- # end
- # }
- # klass.new('It').get_it
- #
- # Good! See also ERB#def_method, ERB#def_module, and ERB#def_class.
class Compiler # :nodoc:
class PercentLine # :nodoc:
def initialize(str)
@@ -354,21 +281,21 @@ class ERB
class Scanner # :nodoc:
@scanner_map = {}
def self.regist_scanner(klass, trim_mode, percent)
- @scanner_map[[trim_mode, percent]] = klass
+ @scanner_map[[trim_mode, percent]] = klass
end
def self.default_scanner=(klass)
- @default_scanner = klass
+ @default_scanner = klass
end
def self.make_scanner(src, trim_mode, percent)
- klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
- klass.new(src, trim_mode, percent)
+ klass = @scanner_map.fetch([trim_mode, percent], @default_scanner)
+ klass.new(src, trim_mode, percent)
end
def initialize(src, trim_mode, percent)
- @src = src
- @stag = nil
+ @src = src
+ @stag = nil
end
attr_accessor :stag
@@ -377,44 +304,44 @@ class ERB
class TrimScanner < Scanner # :nodoc:
def initialize(src, trim_mode, percent)
- super
- @trim_mode = trim_mode
- @percent = percent
- if @trim_mode == '>'
- @scan_line = self.method(:trim_line1)
- elsif @trim_mode == '<>'
- @scan_line = self.method(:trim_line2)
- elsif @trim_mode == '-'
- @scan_line = self.method(:explicit_trim_line)
- else
- @scan_line = self.method(:scan_line)
- end
+ super
+ @trim_mode = trim_mode
+ @percent = percent
+ if @trim_mode == '>'
+ @scan_line = self.method(:trim_line1)
+ elsif @trim_mode == '<>'
+ @scan_line = self.method(:trim_line2)
+ elsif @trim_mode == '-'
+ @scan_line = self.method(:explicit_trim_line)
+ else
+ @scan_line = self.method(:scan_line)
+ end
end
attr_accessor :stag
def scan(&block)
- @stag = nil
- if @percent
- @src.each_line do |line|
- percent_line(line, &block)
- end
- else
+ @stag = nil
+ if @percent
+ @src.each_line do |line|
+ percent_line(line, &block)
+ end
+ else
@scan_line.call(@src, &block)
- end
- nil
+ end
+ nil
end
def percent_line(line, &block)
- if @stag || line[0] != ?%
- return @scan_line.call(line, &block)
- end
-
- line[0] = ''
- if line[0] == ?%
- @scan_line.call(line, &block)
- else
+ if @stag || line[0] != ?%
+ return @scan_line.call(line, &block)
+ end
+
+ line[0] = ''
+ if line[0] == ?%
+ @scan_line.call(line, &block)
+ else
yield(PercentLine.new(line.chomp))
- end
+ end
end
def scan_line(line)
@@ -423,7 +350,7 @@ class ERB
next if token.empty?
yield(token)
end
- end
+ end
end
def trim_line1(line)
@@ -437,11 +364,11 @@ class ERB
yield(token)
end
end
- end
+ end
end
def trim_line2(line)
- head = nil
+ head = nil
line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
tokens.each do |token|
next if token.empty?
@@ -459,7 +386,7 @@ class ERB
head = nil if token == "\n"
end
end
- end
+ end
end
def explicit_trim_line(line)
@@ -482,7 +409,7 @@ class ERB
ERB_STAG = %w(<%= <%# <%)
def is_erb_stag?(s)
- ERB_STAG.member?(s)
+ ERB_STAG.member?(s)
end
end
@@ -495,7 +422,7 @@ class ERB
next if token.empty?
yield(token)
end
- end
+ end
end
end
@@ -518,23 +445,23 @@ class ERB
Scanner.regist_scanner(SimpleScanner2, nil, false)
class ExplicitScanner < Scanner # :nodoc:
- def scan
+ def scan
stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
etag_reg = /(.*?)(%%>|-%>|%>|\z)/m
scanner = StringScanner.new(@src)
while ! scanner.eos?
- scanner.scan(@stag ? etag_reg : stag_reg)
+ scanner.scan(@stag ? etag_reg : stag_reg)
yield(scanner[1])
elem = scanner[2]
if /[ \t]*<%-/ =~ elem
yield('<%')
elsif elem == '-%>'
- yield('%>')
- yield(:cr) if scanner.scan(/(\n|\z)/)
- else
- yield(elem)
- end
+ yield('%>')
+ yield(:cr) if scanner.scan(/(\n|\z)/)
+ else
+ yield(elem)
+ end
end
end
end
@@ -545,36 +472,36 @@ class ERB
class Buffer # :nodoc:
def initialize(compiler, enc=nil)
- @compiler = compiler
- @line = []
+ @compiler = compiler
+ @line = []
@script = enc ? "#coding:#{enc.to_s}\n" : ""
- @compiler.pre_cmd.each do |x|
- push(x)
- end
+ @compiler.pre_cmd.each do |x|
+ push(x)
+ end
end
attr_reader :script
def push(cmd)
- @line << cmd
+ @line << cmd
end
def cr
- @script << (@line.join('; '))
- @line = []
- @script << "\n"
+ @script << (@line.join('; '))
+ @line = []
+ @script << "\n"
end
def close
- return unless @line
- @compiler.post_cmd.each do |x|
- push(x)
- end
- @script << (@line.join('; '))
- @line = nil
+ return unless @line
+ @compiler.post_cmd.each do |x|
+ push(x)
+ end
+ @script << (@line.join('; '))
+ @line = nil
end
end
- def content_dump(s) # :nodoc:
+ def content_dump(s)
n = s.count("\n")
if n > 0
s.dump + "\n" * n
@@ -583,16 +510,6 @@ class ERB
end
end
- def add_put_cmd(out, content)
- out.push("#{@put_cmd} #{content_dump(content)}")
- end
-
- def add_insert_cmd(out, content)
- out.push("#{@insert_cmd}((#{content}).to_s)")
- end
-
- # Compiles an ERB template into Ruby code. Returns an array of the code
- # and encoding like ["code", Encoding].
def compile(s)
enc = s.encoding
raise ArgumentError, "#{enc} is not ASCII compatible" if enc.dummy?
@@ -605,89 +522,87 @@ class ERB
scanner.scan do |token|
next if token.nil?
next if token == ''
- if scanner.stag.nil?
- case token
+ if scanner.stag.nil?
+ case token
when PercentLine
- add_put_cmd(out, content) if content.size > 0
- content = ''
+ out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
+ content = ''
out.push(token.to_s)
out.cr
- when :cr
- out.cr
- when '<%', '<%=', '<%#'
- scanner.stag = token
- add_put_cmd(out, content) if content.size > 0
- content = ''
- when "\n"
- content << "\n"
- add_put_cmd(out, content)
- content = ''
- when '<%%'
- content << '<%'
- else
- content << token
- end
- else
- case token
- when '%>'
- case scanner.stag
- when '<%'
- if content[-1] == ?\n
- content.chop!
- out.push(content)
- out.cr
- else
- out.push(content)
- end
- when '<%='
- add_insert_cmd(out, content)
- when '<%#'
- # out.push("# #{content_dump(content)}")
- end
- scanner.stag = nil
- content = ''
- when '%%>'
- content << '%>'
- else
- content << token
- end
- end
+ when :cr
+ out.cr
+ when '<%', '<%=', '<%#'
+ scanner.stag = token
+ out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
+ content = ''
+ when "\n"
+ content << "\n"
+ out.push("#{@put_cmd} #{content_dump(content)}")
+ content = ''
+ when '<%%'
+ content << '<%'
+ else
+ content << token
+ end
+ else
+ case token
+ when '%>'
+ case scanner.stag
+ when '<%'
+ if content[-1] == ?\n
+ content.chop!
+ out.push(content)
+ out.cr
+ else
+ out.push(content)
+ end
+ when '<%='
+ out.push("#{@insert_cmd}((#{content}).to_s)")
+ when '<%#'
+ # out.push("# #{content_dump(content)}")
+ end
+ scanner.stag = nil
+ content = ''
+ when '%%>'
+ content << '%>'
+ else
+ content << token
+ end
+ end
end
- add_put_cmd(out, content) if content.size > 0
+ out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
out.close
return out.script, enc
end
- def prepare_trim_mode(mode) # :nodoc:
+ def prepare_trim_mode(mode)
case mode
when 1
- return [false, '>']
+ return [false, '>']
when 2
- return [false, '<>']
+ return [false, '<>']
when 0
- return [false, nil]
+ return [false, nil]
when String
- perc = mode.include?('%')
- if mode.include?('-')
- return [perc, '-']
- elsif mode.include?('<>')
- return [perc, '<>']
- elsif mode.include?('>')
- return [perc, '>']
- else
- [perc, nil]
- end
+ perc = mode.include?('%')
+ if mode.include?('-')
+ return [perc, '-']
+ elsif mode.include?('<>')
+ return [perc, '<>']
+ elsif mode.include?('>')
+ return [perc, '>']
+ else
+ [perc, nil]
+ end
else
- return [false, nil]
+ return [false, nil]
end
end
- def make_scanner(src) # :nodoc:
+ def make_scanner(src)
Scanner.make_scanner(src, @trim_mode, @percent)
end
- # Construct a new compiler using the trim_mode. See ERB::new for available
- # trim modes.
def initialize(trim_mode)
@percent, @trim_mode = prepare_trim_mode(trim_mode)
@put_cmd = 'print'
@@ -696,28 +611,17 @@ class ERB
@post_cmd = []
end
attr_reader :percent, :trim_mode
-
- # The command to handle text that ends with a newline
- attr_accessor :put_cmd
-
- # The command to handle text that is inserted prior to a newline
- attr_accessor :insert_cmd
-
- # An array of commands prepended to compiled code
- attr_accessor :pre_cmd
-
- # An array of commands appended to compiled code
- attr_accessor :post_cmd
+ 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
+ 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
@@ -737,10 +641,9 @@ class ERB
# 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 %>
- # - omit blank lines ending in -%>
+ # % 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
@@ -794,19 +697,12 @@ class ERB
#
def initialize(str, safe_level=nil, trim_mode=nil, eoutvar='_erbout')
@safe_level = safe_level
- compiler = make_compiler(trim_mode)
+ compiler = ERB::Compiler.new(trim_mode)
set_eoutvar(compiler, eoutvar)
@src, @enc = *compiler.compile(str)
@filename = nil
end
- ##
- # Creates a new compiler for ERB. See ERB::Compiler.new for details
-
- def make_compiler(trim_mode)
- ERB::Compiler.new(trim_mode)
- end
-
# The Ruby code generated by ERB
attr_reader :src
@@ -815,50 +711,49 @@ class ERB
attr_accessor :filename
#
- # Can be used to set _eoutvar_ as described in ERB::new. It's probably
- # easier to just use the constructor though, since calling this method
- # requires the setup of an ERB _compiler_ object.
+ # Can be used to set _eoutvar_ as described in ERB#new. It's probably easier
+ # to just use the constructor though, since calling this method requires the
+ # setup of an ERB _compiler_ object.
#
def set_eoutvar(compiler, eoutvar = '_erbout')
compiler.put_cmd = "#{eoutvar}.concat"
compiler.insert_cmd = "#{eoutvar}.concat"
- compiler.pre_cmd = ["#{eoutvar} = ''"]
- compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"]
+
+ cmd = []
+ cmd.push "#{eoutvar} = ''"
+
+ compiler.pre_cmd = cmd
+
+ cmd = []
+ cmd.push("#{eoutvar}.force_encoding(__ENCODING__)")
+
+ compiler.post_cmd = cmd
end
# Generate results and print them. (see ERB#result)
- def run(b=new_toplevel)
+ def run(b=TOPLEVEL_BINDING)
print self.result(b)
end
#
# 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_.)
+ # the results of that code. (See ERB#new for details on how this process can
+ # be affected by _safe_level_.)
#
- # _b_ accepts a Binding object which is used to set the context of
+ # _b_ accepts a Binding or Proc object which is used to set the context of
# code evaluation.
#
- def result(b=new_toplevel)
+ def result(b=TOPLEVEL_BINDING)
if @safe_level
proc {
- $SAFE = @safe_level
- eval(@src, b, (@filename || '(erb)'), 0)
+ $SAFE = @safe_level
+ eval(@src, b, (@filename || '(erb)'), 0)
}.call
else
eval(@src, b, (@filename || '(erb)'), 0)
end
end
- ##
- # Returns a new binding each time *near* TOPLEVEL_BINDING for runs that do
- # not specify a binding.
-
- def new_toplevel
- TOPLEVEL_BINDING.dup
- end
- private :new_toplevel
-
# Define _methodname_ as instance method of _mod_ from compiled ruby source.
#
# example:
@@ -919,17 +814,17 @@ class ERB
#
# A utility method for escaping HTML tag characters in _s_.
#
- # require "erb"
- # include ERB::Util
+ # require "erb"
+ # include ERB::Util
#
- # puts html_escape("is a > 0 & a < 10?")
+ # puts html_escape("is a > 0 & a < 10?")
#
# _Generates_
#
- # is a &gt; 0 &amp; a &lt; 10?
+ # is a &gt; 0 &amp; a &lt; 10?
#
def html_escape(s)
- CGI.escapeHTML(s.to_s)
+ s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
end
alias h html_escape
module_function :h
@@ -938,14 +833,14 @@ class ERB
#
# A utility method for encoding the String _s_ as a URL.
#
- # require "erb"
- # include ERB::Util
+ # require "erb"
+ # include ERB::Util
#
- # puts url_encode("Programming Ruby: The Pragmatic Programmer's Guide")
+ # puts url_encode("Programming Ruby: The Pragmatic Programmer's Guide")
#
# _Generates_
#
- # Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide
+ # 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) {
@@ -991,8 +886,7 @@ class ERB
#
module DefMethod
public
- # define _methodname_ as instance method of current module, using ERB
- # object or eRuby file
+ # define _methodname_ as instance method of current module, using ERB object or eRuby file
def def_erb_method(methodname, erb_or_fname)
if erb_or_fname.kind_of? String
fname = erb_or_fname
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 43b3e1ce49..5218b57d5b 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -115,10 +115,6 @@ module FileUtils
#
# FileUtils.cd('/', :verbose => true) # chdir and report it
#
- # FileUtils.cd('/') do # chdir
- # [...] # do something
- # end # return to original directory
- #
def cd(dir, options = {}, &block) # :yield: dir
fu_check_options options, OPT_TABLE['cd']
fu_output_message "cd #{dir}" if options[:verbose]
@@ -142,7 +138,9 @@ module FileUtils
# FileUtils.uptodate?('hello.o', %w(hello.c hello.h)) or \
# system 'make hello.o'
#
- def uptodate?(new, old_list)
+ def uptodate?(new, old_list, options = nil)
+ raise ArgumentError, 'uptodate? does not accept any option' if options
+
return false unless File.exist?(new)
new_time = File.mtime(new)
old_list.each do |old|
@@ -200,7 +198,7 @@ module FileUtils
fu_output_message "mkdir -p #{options[:mode] ? ('-m %03o ' % options[:mode]) : ''}#{list.join ' '}" if options[:verbose]
return *list if options[:noop]
- list.map {|path| path.chomp(?/) }.each do |path|
+ list.map {|path| path.sub(%r</\z>, '') }.each do |path|
# optimize for the most common case
begin
fu_mkdir path, options[:mode]
@@ -237,7 +235,7 @@ module FileUtils
OPT_TABLE['makedirs'] = [:mode, :noop, :verbose]
def fu_mkdir(path, mode) #:nodoc:
- path = path.chomp(?/)
+ path = path.sub(%r</\z>, '')
if mode
Dir.mkdir path, mode
File.chmod mode, path
@@ -265,13 +263,13 @@ module FileUtils
return if options[:noop]
list.each do |dir|
begin
- Dir.rmdir(dir = dir.chomp(?/))
+ 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::EEXIST, Errno::ENOENT
+ rescue Errno::ENOTEMPTY, Errno::ENOENT
end
end
end
@@ -361,7 +359,7 @@ module FileUtils
# Options: noop verbose
#
# Same as
- # #ln_s(src, dest, :force => true)
+ # #ln_s(src, dest, :force)
#
def ln_sf(src, dest, options = {})
fu_check_options options, OPT_TABLE['ln_sf']
@@ -422,7 +420,7 @@ module FileUtils
# # If you want to copy all contents of a directory instead of the
# # directory itself, c.f. src/x -> dest/x, src/y -> dest/y,
# # use following code.
- # FileUtils.cp_r 'src/.', 'dest' # cp_r('src', 'dest') makes dest/src,
+ # FileUtils.cp_r 'src/.', 'dest' # cp_r('src', 'dest') makes src/dest,
# # but this doesn't.
#
def cp_r(src, dest, options = {})
@@ -449,22 +447,20 @@ module FileUtils
# Both of +src+ and +dest+ must be a path name.
# +src+ must exist, +dest+ must not exist.
#
- # If +preserve+ is true, this method preserves owner, group, and
- # modified time. Permissions are copied regardless +preserve+.
+ # If +preserve+ is true, this method preserves owner, group, permissions
+ # and modified time.
#
# If +dereference_root+ is true, this method dereference tree root.
#
# If +remove_destination+ is true, this method removes each destination file before copy.
#
def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
- Entry_.new(src, nil, dereference_root).wrap_traverse(proc do |ent|
+ Entry_.new(src, nil, dereference_root).traverse do |ent|
destent = Entry_.new(dest, ent.rel, false)
File.unlink destent.path if remove_destination && File.file?(destent.path)
ent.copy destent.path
- end, proc do |ent|
- destent = Entry_.new(dest, ent.rel, false)
ent.copy_metadata destent.path if preserve
- end)
+ end
end
module_function :copy_entry
@@ -743,11 +739,11 @@ module FileUtils
end
module_function :remove_entry_secure
- def fu_have_symlink? #:nodoc:
+ def fu_have_symlink? #:nodoc
File.symlink nil, nil
rescue NotImplementedError
return false
- rescue TypeError
+ rescue
return true
end
private_module_function :fu_have_symlink?
@@ -823,13 +819,16 @@ module FileUtils
#
def compare_stream(a, b)
bsize = fu_stream_blksize(a, b)
- sa = ""
- sb = ""
- begin
- a.read(bsize, sa)
- b.read(bsize, sb)
- return true if sa.empty? && sb.empty?
- end while sa == sb
+ sa = sb = nil
+ while sa == sb
+ sa = a.read(bsize)
+ sb = b.read(bsize)
+ unless sa and sb
+ if sa.nil? and sb.nil?
+ return true
+ end
+ end
+ end
false
end
module_function :compare_stream
@@ -848,8 +847,7 @@ module FileUtils
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]
return if options[:noop]
- fu_each_src_dest(src, dest) do |s, d|
- st = File.stat(s)
+ fu_each_src_dest(src, dest) do |s, d, st|
unless File.exist?(d) and compare_file(s, d)
remove_file d, true
copy_file s, d
@@ -862,117 +860,23 @@ module FileUtils
OPT_TABLE['install'] = [:mode, :preserve, :noop, :verbose]
- def user_mask(target) #:nodoc:
- mask = 0
- target.each_byte do |byte_chr|
- case byte_chr.chr
- when "u"
- mask |= 04700
- when "g"
- mask |= 02070
- when "o"
- mask |= 01007
- when "a"
- mask |= 07777
- end
- end
- mask
- end
- private_module_function :user_mask
-
- def mode_mask(mode, path) #:nodoc:
- mask = 0
- mode.each_byte do |byte_chr|
- case byte_chr.chr
- when "r"
- mask |= 0444
- when "w"
- mask |= 0222
- when "x"
- mask |= 0111
- when "X"
- mask |= 0111 if FileTest::directory? path
- when "s"
- mask |= 06000
- when "t"
- mask |= 01000
- end
- end
- mask
- end
- private_module_function :mode_mask
-
- def symbolic_modes_to_i(modes, path) #:nodoc:
- current_mode = (File.stat(path).mode & 07777)
- modes.split(/,/).inject(0) do |mode, mode_sym|
- mode_sym = "a#{mode_sym}" if mode_sym =~ %r!^[=+-]!
- target, mode = mode_sym.split %r![=+-]!
- user_mask = user_mask(target)
- mode_mask = mode_mask(mode ? mode : "", path)
-
- case mode_sym
- when /=/
- current_mode &= ~(user_mask)
- current_mode |= user_mask & mode_mask
- when /\+/
- current_mode |= user_mask & mode_mask
- when /-/
- current_mode &= ~(user_mask & mode_mask)
- end
- end
- end
- private_module_function :symbolic_modes_to_i
-
- def fu_mode(mode, path) #:nodoc:
- mode.is_a?(String) ? symbolic_modes_to_i(mode, path) : mode
- end
- private_module_function :fu_mode
-
- def mode_to_s(mode) #:nodoc:
- mode.is_a?(String) ? mode : "%o" % mode
- end
- private_module_function :mode_to_s
-
#
# Options: noop verbose
#
# Changes permission bits on the named files (in +list+) to the bit pattern
# represented by +mode+.
#
- # +mode+ is the symbolic and absolute mode can be used.
- #
- # Absolute mode is
# FileUtils.chmod 0755, 'somecommand'
# FileUtils.chmod 0644, %w(my.rb your.rb his.rb her.rb)
# FileUtils.chmod 0755, '/usr/bin/ruby', :verbose => true
#
- # Symbolic mode is
- # FileUtils.chmod "u=wrx,go=rx", 'somecommand'
- # FileUtils.chmod "u=wr,go=rr", %w(my.rb your.rb his.rb her.rb)
- # FileUtils.chmod "u=wrx,go=rx", '/usr/bin/ruby', :verbose => true
- #
- # "a" :: is user, group, other mask.
- # "u" :: is user's mask.
- # "g" :: is group's mask.
- # "o" :: is other's mask.
- # "w" :: is write permission.
- # "r" :: is read permission.
- # "x" :: is execute permission.
- # "X" ::
- # is execute permission for directories only, must be used in conjunction with "+"
- # "s" :: is uid, gid.
- # "t" :: is sticky bit.
- # "+" :: is added to a class given the specified mode.
- # "-" :: Is removed from a given class given mode.
- # "=" :: Is the exact nature of the class will be given a specified mode.
-
def chmod(mode, list, options = {})
fu_check_options options, OPT_TABLE['chmod']
list = fu_list(list)
- fu_output_message sprintf('chmod %s %s', mode_to_s(mode), list.join(' ')) if options[:verbose]
+ fu_output_message sprintf('chmod %o %s', mode, list.join(' ')) if options[:verbose]
return if options[:noop]
list.each do |path|
- Entry_.new(path).chmod(fu_mode(mode, path))
+ Entry_.new(path).chmod mode
end
end
module_function :chmod
@@ -986,19 +890,18 @@ module FileUtils
# to the bit pattern represented by +mode+.
#
# FileUtils.chmod_R 0700, "/tmp/app.#{$$}"
- # FileUtils.chmod_R "u=wrx", "/tmp/app.#{$$}"
#
def chmod_R(mode, list, options = {})
fu_check_options options, OPT_TABLE['chmod_R']
list = fu_list(list)
- fu_output_message sprintf('chmod -R%s %s %s',
+ fu_output_message sprintf('chmod -R%s %o %s',
(options[:force] ? 'f' : ''),
- mode_to_s(mode), list.join(' ')) if options[:verbose]
+ mode, list.join(' ')) if options[:verbose]
return if options[:noop]
list.each do |root|
Entry_.new(root).traverse do |ent|
begin
- ent.chmod(fu_mode(mode, ent.path))
+ ent.chmod mode
rescue
raise unless options[:force]
end
@@ -1024,8 +927,8 @@ module FileUtils
def chown(user, group, list, options = {})
fu_check_options options, OPT_TABLE['chown']
list = fu_list(list)
- fu_output_message sprintf('chown %s %s',
- (group ? "#{user}:#{group}" : user || ':'),
+ fu_output_message sprintf('chown %s%s',
+ [user,group].compact.join(':') + ' ',
list.join(' ')) if options[:verbose]
return if options[:noop]
uid = fu_get_uid(user)
@@ -1053,9 +956,9 @@ module FileUtils
def chown_R(user, group, list, options = {})
fu_check_options options, OPT_TABLE['chown_R']
list = fu_list(list)
- fu_output_message sprintf('chown -R%s %s %s',
+ fu_output_message sprintf('chown -R%s %s%s',
(options[:force] ? 'f' : ''),
- (group ? "#{user}:#{group}" : user || ':'),
+ [user,group].compact.join(':') + ' ',
list.join(' ')) if options[:verbose]
return if options[:noop]
uid = fu_get_uid(user)
@@ -1133,7 +1036,7 @@ module FileUtils
created = nocreate = options[:nocreate]
t = options[:mtime]
if options[:verbose]
- fu_output_message "touch #{nocreate ? '-c ' : ''}#{t ? t.strftime('-t %Y%m%d%H%M.%S ') : ''}#{list.join ' '}"
+ fu_output_message "touch #{nocreate ? ' -c' : ''}#{t ? t.strftime(' -t %Y%m%d%H%M.%S') : ''}#{list.join ' '}"
end
return if options[:noop]
list.each do |path|
@@ -1232,12 +1135,7 @@ module FileUtils
end
def exist?
- begin
- lstat
- true
- rescue Errno::ENOENT
- false
- end
+ lstat! ? true : false
end
def file?
@@ -1378,7 +1276,7 @@ module FileUtils
def copy_file(dest)
File.open(path()) do |s|
- File.open(dest, 'wb', s.stat.mode) do |f|
+ File.open(dest, 'wb') do |f|
IO.copy_stream(s, f)
end
end
@@ -1386,37 +1284,14 @@ module FileUtils
def copy_metadata(path)
st = lstat()
- if !st.symlink?
- File.utime st.atime, st.mtime, path
- end
+ File.utime st.atime, st.mtime, path
begin
- if st.symlink?
- begin
- File.lchown st.uid, st.gid, path
- rescue NotImplementedError
- end
- else
- File.chown st.uid, st.gid, path
- end
+ File.chown st.uid, st.gid, path
rescue Errno::EPERM
# clear setuid/setgid
- if st.symlink?
- begin
- File.lchmod st.mode & 01777, path
- rescue NotImplementedError
- end
- else
- File.chmod st.mode & 01777, path
- end
+ File.chmod st.mode & 01777, path
else
- if st.symlink?
- begin
- File.lchmod st.mode, path
- rescue NotImplementedError
- end
- else
- File.chmod st.mode, path
- end
+ File.chmod st.mode, path
end
end
@@ -1430,7 +1305,7 @@ module FileUtils
def remove_dir1
platform_support {
- Dir.rmdir path().chomp(?/)
+ Dir.rmdir path().sub(%r</\z>, '')
}
end
@@ -1481,16 +1356,6 @@ module FileUtils
yield self
end
- def wrap_traverse(pre, post)
- pre.call self
- if directory?
- entries.each do |ent|
- ent.wrap_traverse pre, post
- end
- end
- post.call self
- end
-
private
$fileutils_rb_have_lchmod = nil
@@ -1555,7 +1420,7 @@ module FileUtils
def fu_each_src_dest(src, dest) #:nodoc:
fu_each_src_dest0(src, dest) do |s, d|
raise ArgumentError, "same file: #{s} and #{d}" if fu_same?(s, d)
- yield s, d
+ yield s, d, File.stat(s)
end
end
private_module_function :fu_each_src_dest
diff --git a/lib/find.rb b/lib/find.rb
index 571609cdef..591020ea04 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -30,8 +30,6 @@ module Find
# Calls the associated block with the name of every file and directory listed
# as arguments, then recursively on their subdirectories, and so on.
#
- # Returns an enumerator if no block is given.
- #
# See the +Find+ module documentation for an example.
#
def find(*paths) # :yield: path
@@ -40,7 +38,7 @@ module Find
paths.collect!{|d| raise Errno::ENOENT unless File.exist?(d); d.dup}
while file = paths.shift
catch(:prune) do
- yield file.dup.taint
+ yield file.dup.taint
begin
s = File.lstat(file)
rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
diff --git a/lib/forwardable.rb b/lib/forwardable.rb
index d7116ed1bc..a29dd71589 100644
--- a/lib/forwardable.rb
+++ b/lib/forwardable.rb
@@ -1,55 +1,35 @@
#
# forwardable.rb -
-# $Release Version: 1.1$
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ishitsuka.com)
-# original definition by delegator.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.
#
# Documentation by James Edward Gray II and Gavin Sinclair
-
-
-
-# The Forwardable module provides delegation of specified
-# methods to a designated object, using the methods #def_delegator
-# and #def_delegators.
#
-# For example, say you have a class RecordCollection which
-# contains an array <tt>@records</tt>. You could provide the lookup method
-# #record_number(), which simply calls #[] on the <tt>@records</tt>
-# array, like this:
+# == Introduction
#
-# class RecordCollection
-# extend Forwardable
-# def_delegator :@records, :[], :record_number
-# end
+# This library allows you delegate method calls to an object, on a method by
+# method basis.
#
-# Further, if you wish to provide the methods #size, #<<, and #map,
-# all of which delegate to @records, this is how you can do it:
+# == Notes
#
-# class RecordCollection
-# # extend Forwardable, but we did that above
-# def_delegators :@records, :size, :<<, :map
-# end
-# f = Foo.new
-# f.printf ...
-# f.gets
-# f.content_at(1)
+# Be advised, RDoc will not detect delegated methods.
#
-# If the object isn't a Module and Class, You can too extend Forwardable
-# module.
+# <b>forwardable.rb provides single-method delegation via the
+# def_delegator() and def_delegators() methods. For full-class
+# delegation via DelegateClass(), see delegate.rb.</b>
#
-# printer = String.new
-# printer.extend Forwardable # prepare object for delegation
-# printer.def_delegator "STDOUT", "puts" # add delegation for STDOUT.puts()
-# printer.puts "Howdy!"
+# == Examples
#
-# == Another example
+# === Forwardable
#
-# We want to rely on what has come before obviously, but with delegation we can
-# take just the methods we need and even rename them as appropriate. In many
-# cases this is preferable to inheritance, which gives us the entire old
-# interface, even if much of it isn't needed.
+# Forwardable makes building a new class based on existing work, with a proper
+# interface, almost trivial. We want to rely on what has come before obviously,
+# but with delegation we can take just the methods we need and even rename them
+# as appropriate. In many cases this is preferable to inheritance, which gives
+# us the entire old interface, even if much of it isn't needed.
#
# class Queue
# extend Forwardable
@@ -80,7 +60,7 @@
# q.clear
# puts q.first
#
-# This should output:
+# <i>Prints:</i>
#
# 2
# 3
@@ -90,22 +70,72 @@
# Ruby
# nil
#
-# == Notes
+# SingleForwardable can be used to setup delegation at the object level as well.
#
-# Be advised, RDoc will not detect delegated methods.
+# 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
#
-# +forwardable.rb+ provides single-method delegation via the def_delegator and
-# def_delegators methods. For full-class delegation via DelegateClass, see
-# +delegate.rb+.
+# 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!
+
+#
+# The Forwardable module provides delegation of specified
+# methods to a designated object, using the methods #def_delegator
+# and #def_delegators.
+#
+# For example, say you have a class RecordCollection which
+# contains an array <tt>@records</tt>. You could provide the lookup method
+# #record_number(), which simply calls #[] on the <tt>@records</tt>
+# array, like this:
+#
+# class RecordCollection
+# extend Forwardable
+# def_delegator :@records, :[], :record_number
+# end
+#
+# Further, if you wish to provide the methods #size, #<<, and #map,
+# all of which delegate to @records, this is how you can do it:
+#
+# class RecordCollection
+# # 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
- # Version of +forwardable.rb+
FORWARDABLE_VERSION = "1.1.0"
@debug = nil
class << self
- # If true, <tt>__FILE__</tt> will remain in the backtrace in the event an
- # Exception is raised.
attr_accessor :debug
end
@@ -145,34 +175,15 @@ module Forwardable
end
end
- # Define +method+ as delegator instance method with an optional
- # alias name +ali+. Method calls to +ali+ will be delegated to
- # +accessor.method+.
- #
- # class MyQueue
- # extend Forwardable
- # attr_reader :queue
- # def initialize
- # @queue = []
- # end
- #
- # def_delegator :@queue, :push, :mypush
- # end
- #
- # q = MyQueue.new
- # q.mypush 42
- # q.queue #=> [42]
- # q.push 23 #=> NoMethodError
- #
def def_instance_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
+ begin
+ #{accessor}.__send__(:#{method}, *args, &block)
+ rescue Exception
+ $@.delete_if{|s| %r"#{Regexp.quote(__FILE__)}"o =~ s} unless Forwardable::debug
+ ::Kernel::raise
+ end
end
}
# If it's not a class or module, it's an instance
@@ -189,30 +200,9 @@ module Forwardable
alias def_delegator def_instance_delegator
end
-# SingleForwardable can be used to setup delegation at the object level as well.
-#
-# 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 used to set up delegation for a Class or Module.
+# Usage of The SingleForwardable is like Fowadable module.
#
-# class Implementation
-# def self.service
-# puts "serviced!"
-# end
-# end
-#
-# module Facade
-# extend SingleForwardable
-# def_delegator :Implementation, :service
-# end
-#
-# Facade.service #=> serviced!
-#
-# If you want to use both Forwardable and SingleForwardable, you can
-# use methods def_instance_delegator and def_single_delegator, etc.
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
@@ -250,21 +240,20 @@ module SingleForwardable
end
end
- # :call-seq:
- # def_single_delegator(accessor, method, new_name=method)
#
- # Defines a method _method_ which delegates to _accessor_ (i.e. it calls
- # the method of the same name in _accessor_). If _new_name_ is
+ # 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.
+ #
def def_single_delegator(accessor, method, ali = method)
- str = %{
+ 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
+ begin
+ #{accessor}.__send__(:#{method}, *args, &block)
+ rescue Exception
+ $@.delete_if{|s| %r"#{Regexp.quote(__FILE__)}"o =~ s} unless Forwardable::debug
+ ::Kernel::raise
+ end
end
}
@@ -275,3 +264,7 @@ module SingleForwardable
alias def_delegators def_single_delegators
alias def_delegator def_single_delegator
end
+
+
+
+
diff --git a/lib/getoptlong.rb b/lib/getoptlong.rb
index cf635f0438..7bd9ee55cc 100644
--- a/lib/getoptlong.rb
+++ b/lib/getoptlong.rb
@@ -241,7 +241,7 @@ class GetoptLong
if @status != STATUS_YET
set_error(ArgumentError, "argument error")
raise RuntimeError,
- "invoke ordering=, but option processing has already started"
+ "invoke ordering=, but option processing has already started"
end
#
@@ -273,7 +273,7 @@ class GetoptLong
#
if @status != STATUS_YET
raise RuntimeError,
- "invoke set_options, but option processing has already started"
+ "invoke set_options, but option processing has already started"
end
#
@@ -292,44 +292,44 @@ class GetoptLong
#
argument_flag = nil
arg.each do |i|
- if ARGUMENT_FLAGS.include?(i)
- if argument_flag != nil
- raise ArgumentError, "too many argument-flags"
- end
- argument_flag = i
- end
+ if ARGUMENT_FLAGS.include?(i)
+ if argument_flag != nil
+ raise ArgumentError, "too many argument-flags"
+ end
+ argument_flag = i
+ end
end
raise ArgumentError, "no argument-flag" if argument_flag == nil
canonical_name = nil
arg.each do |i|
- #
- # Check an option name.
- #
- next if i == argument_flag
- begin
- if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
- raise ArgumentError, "an invalid option `#{i}'"
- end
- if (@canonical_names.include?(i))
- raise ArgumentError, "option redefined `#{i}'"
- end
- rescue
- @canonical_names.clear
- @argument_flags.clear
- raise
- end
-
- #
- # Register the option (`i') to the `@canonical_names' and
- # `@canonical_names' Hashes.
- #
- if canonical_name == nil
- canonical_name = i
- end
- @canonical_names[i] = canonical_name
- @argument_flags[i] = argument_flag
+ #
+ # Check an option name.
+ #
+ next if i == argument_flag
+ begin
+ if !i.is_a?(String) || i !~ /^-([^-]|-.+)$/
+ raise ArgumentError, "an invalid option `#{i}'"
+ end
+ if (@canonical_names.include?(i))
+ raise ArgumentError, "option redefined `#{i}'"
+ end
+ rescue
+ @canonical_names.clear
+ @argument_flags.clear
+ raise
+ end
+
+ #
+ # Register the option (`i') to the `@canonical_names' and
+ # `@canonical_names' Hashes.
+ #
+ if canonical_name == nil
+ canonical_name = i
+ end
+ @canonical_names[i] = canonical_name
+ @argument_flags[i] = argument_flag
end
raise ArgumentError, "no option name" if canonical_name == nil
end
@@ -356,7 +356,7 @@ class GetoptLong
#
def terminate
return nil if @status == STATUS_TERMINATED
- raise RuntimeError, "an error has occurred" if @error != nil
+ raise RuntimeError, "an error has occured" if @error != nil
@status = STATUS_TERMINATED
@non_option_arguments.reverse_each do |argument|
@@ -447,17 +447,17 @@ class GetoptLong
return nil
elsif @ordering == PERMUTE
while 0 < ARGV.length && ARGV[0] !~ /^-./
- @non_option_arguments.push(ARGV.shift)
+ @non_option_arguments.push(ARGV.shift)
end
if ARGV.length == 0
- terminate
- return nil
+ terminate
+ return nil
end
argument = ARGV.shift
elsif @ordering == REQUIRE_ORDER
if (ARGV[0] !~ /^-./)
- terminate
- return nil
+ terminate
+ return nil
end
argument = ARGV.shift
else
@@ -482,49 +482,49 @@ class GetoptLong
#
pattern = $1
if @canonical_names.include?(pattern)
- option_name = pattern
+ option_name = pattern
else
- #
- # The option `option_name' is not registered in `@canonical_names'.
- # It may be an abbreviated.
- #
- matches = []
- @canonical_names.each_key do |key|
- if key.index(pattern) == 0
- option_name = key
- matches << key
- end
- end
- if 2 <= matches.length
- set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
- elsif matches.length == 0
- set_error(InvalidOption, "unrecognized option `#{argument}'")
- end
+ #
+ # The option `option_name' is not registered in `@canonical_names'.
+ # It may be an abbreviated.
+ #
+ matches = []
+ @canonical_names.each_key do |key|
+ if key.index(pattern) == 0
+ option_name = key
+ matches << key
+ end
+ end
+ if 2 <= matches.length
+ set_error(AmbiguousOption, "option `#{argument}' is ambiguous between #{matches.join(', ')}")
+ elsif matches.length == 0
+ set_error(InvalidOption, "unrecognized option `#{argument}'")
+ end
end
#
# Check an argument to the option.
#
if @argument_flags[option_name] == REQUIRED_ARGUMENT
- if argument =~ /=(.*)$/
- option_argument = $1
- elsif 0 < ARGV.length
- option_argument = ARGV.shift
- else
- set_error(MissingArgument,
- "option `#{argument}' requires an argument")
- end
+ if argument =~ /=(.*)$/
+ option_argument = $1
+ elsif 0 < ARGV.length
+ option_argument = ARGV.shift
+ else
+ set_error(MissingArgument,
+ "option `#{argument}' requires an argument")
+ end
elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
- if argument =~ /=(.*)$/
- option_argument = $1
- elsif 0 < ARGV.length && ARGV[0] !~ /^-./
- option_argument = ARGV.shift
- else
- option_argument = ''
- end
+ if argument =~ /=(.*)$/
+ option_argument = $1
+ elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+ option_argument = ARGV.shift
+ else
+ option_argument = ''
+ end
elsif argument =~ /=(.*)$/
- set_error(NeedlessArgument,
- "option `#{option_name}' doesn't allow an argument")
+ set_error(NeedlessArgument,
+ "option `#{option_name}' doesn't allow an argument")
end
elsif argument =~ /^(-(.))(.*)/
@@ -536,40 +536,40 @@ class GetoptLong
option_name, ch, @rest_singles = $1, $2, $3
if @canonical_names.include?(option_name)
- #
- # The option `option_name' is found in `@canonical_names'.
- # Check its argument.
- #
- if @argument_flags[option_name] == REQUIRED_ARGUMENT
- if 0 < @rest_singles.length
- option_argument = @rest_singles
- @rest_singles = ''
- elsif 0 < ARGV.length
- option_argument = ARGV.shift
- else
- # 1003.2 specifies the format of this message.
- set_error(MissingArgument, "option requires an argument -- #{ch}")
- end
- elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
- if 0 < @rest_singles.length
- option_argument = @rest_singles
- @rest_singles = ''
- elsif 0 < ARGV.length && ARGV[0] !~ /^-./
- option_argument = ARGV.shift
- else
- option_argument = ''
- end
- end
+ #
+ # The option `option_name' is found in `@canonical_names'.
+ # Check its argument.
+ #
+ if @argument_flags[option_name] == REQUIRED_ARGUMENT
+ if 0 < @rest_singles.length
+ option_argument = @rest_singles
+ @rest_singles = ''
+ elsif 0 < ARGV.length
+ option_argument = ARGV.shift
+ else
+ # 1003.2 specifies the format of this message.
+ set_error(MissingArgument, "option requires an argument -- #{ch}")
+ end
+ elsif @argument_flags[option_name] == OPTIONAL_ARGUMENT
+ if 0 < @rest_singles.length
+ option_argument = @rest_singles
+ @rest_singles = ''
+ elsif 0 < ARGV.length && ARGV[0] !~ /^-./
+ option_argument = ARGV.shift
+ else
+ option_argument = ''
+ end
+ end
else
- #
- # This is an invalid option.
- # 1003.2 specifies the format of this message.
- #
- if ENV.include?('POSIXLY_CORRECT')
- set_error(InvalidOption, "invalid option -- #{ch}")
- else
- set_error(InvalidOption, "invalid option -- #{ch}")
- end
+ #
+ # This is an invalid option.
+ # 1003.2 specifies the format of this message.
+ #
+ if ENV.include?('POSIXLY_CORRECT')
+ set_error(InvalidOption, "invalid option -- #{ch}")
+ else
+ set_error(InvalidOption, "invalid option -- #{ch}")
+ end
end
else
#
diff --git a/lib/gserver.rb b/lib/gserver.rb
index 9877417fa0..2ab6e42bce 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -3,7 +3,10 @@
#
# Author:: John W. Small
# Documentation:: Gavin Sinclair
-# Licence:: Ruby License
+# Licence:: Freeware.
+#
+# See the class GServer for documentation.
+#
require "socket"
require "thread"
@@ -22,7 +25,7 @@ require "thread"
# you the effort. All events are optionally logged, but you can provide your
# own event handlers if you wish.
#
-# == Example
+# === Example
#
# Using GServer is simple. Below we implement a simple time server, run it,
# query it, and shut it down. Try this code in +irb+:
@@ -37,7 +40,7 @@ require "thread"
# super(port, *args)
# end
# def serve(io)
-# io.puts(Time.now.to_i)
+# io.puts(Time.now.to_s)
# end
# end
#
@@ -70,14 +73,14 @@ require "thread"
# other methods as well if you wish, perhaps to collect statistics, or emit
# more detailed logging.
#
-# * #connecting
-# * #disconnecting
-# * #starting
-# * #stopping
+# connecting
+# disconnecting
+# starting
+# stopping
#
-# The above methods are only called if auditing is enabled, via #audit=.
+# The above methods are only called if auditing is enabled.
#
-# You can also override #log and #error if, for example, you wish to use a
+# You can also override +log+ and +error+ if, for example, you wish to use a
# more sophisticated logging system.
#
class GServer
@@ -90,28 +93,17 @@ class GServer
@@services = {} # Hash of opened ports, i.e. services
@@servicesMutex = Mutex.new
- # Stop the server running on the given port, bound to the given host
- #
- # +port+:: port, as a FixNum, of the server to stop
- # +host+:: host on which to find the server to stop
def GServer.stop(port, host = DEFAULT_HOST)
@@servicesMutex.synchronize {
@@services[host][port].stop
}
end
- # Check if a server is running on the given port and host
- #
- # +port+:: port, as a FixNum, of the server to check
- # +host+:: host on which to find the server to check
- #
- # Returns true if a server is running on that port and host.
def GServer.in_service?(port, host = DEFAULT_HOST)
@@services.has_key?(host) and
@@services[host].has_key?(port)
end
- # Stop the server
def stop
@connectionsMutex.synchronize {
if @tcpServerThread
@@ -120,45 +112,25 @@ class GServer
}
end
- # Returns true if the server has stopped.
def stopped?
@tcpServerThread == nil
end
- # Schedule a shutdown for the server
def shutdown
@shutdown = true
end
- # Return the current number of connected clients
def connections
@connections.size
end
- # Join with the server thread
def join
@tcpServerThread.join if @tcpServerThread
end
- # Port on which to listen, as a FixNum
- attr_reader :port
- # Host on which to bind, as a String
- attr_reader :host
- # Maximum number of connections to accept at a time, as a FixNum
- attr_reader :maxConnections
- # IO Device on which log messages should be written
- attr_accessor :stdlog
- # Set to true to cause the callbacks #connecting, #disconnecting, #starting,
- # and #stopping to be called during the server's lifecycle
- attr_accessor :audit
- # Set to true to show more detailed logging
- attr_accessor :debug
+ attr_reader :port, :host, :maxConnections
+ attr_accessor :stdlog, :audit, :debug
- # Called when a client connects, if auditing is enabled.
- #
- # +client+:: a TCPSocket instance representing the client that connected
- #
- # Return true to allow this client to connect, false to prevent it.
def connecting(client)
addr = client.peeraddr
log("#{self.class.to_s} #{@host}:#{@port} client:#{addr[1]} " +
@@ -166,10 +138,6 @@ class GServer
true
end
-
- # Called when a client disconnects, if audition is enabled.
- #
- # +clientPort+:: the port of the client that is connecting
def disconnecting(clientPort)
log("#{self.class.to_s} #{@host}:#{@port} " +
"client:#{clientPort} disconnect")
@@ -177,30 +145,20 @@ class GServer
protected :connecting, :disconnecting
- # Called when the server is starting up, if auditing is enabled.
def starting()
log("#{self.class.to_s} #{@host}:#{@port} start")
end
- # Called when the server is shutting down, if auditing is enabled.
def stopping()
log("#{self.class.to_s} #{@host}:#{@port} stop")
end
protected :starting, :stopping
- # Called if #debug is true whenever an unhandled exception is raised.
- # This implementation simply logs the backtrace.
- #
- # +detail+:: the Exception that was caught
def error(detail)
log(detail.backtrace.join("\n"))
end
- # Log a message to #stdlog, if it's defined. This implementation
- # outputs the timestamp and message to the log.
- #
- # +msg+:: the message to log
def log(msg)
if @stdlog
@stdlog.puts("[#{Time.new.ctime}] %s" % msg)
@@ -210,15 +168,6 @@ class GServer
protected :error, :log
- # Create a new server
- #
- # +port+:: the port, as a FixNum, on which to listen
- # +host+:: the host to bind to
- # +maxConnections+:: the maximum number of simultaneous connections to
- # accept
- # +stdlog+:: IO device on which to log messages
- # +audit+:: if true, lifecycle callbacks will be called. See #audit
- # +debug+:: if true, error messages are logged. See #debug
def initialize(port, host = DEFAULT_HOST, maxConnections = 4,
stdlog = $stderr, audit = false, debug = false)
@tcpServerThread = nil
@@ -233,13 +182,8 @@ class GServer
@debug = debug
end
- # Start the server if it isn't already running
- #
- # +maxConnections+::
- # override +maxConnections+ given to the constructor. A negative
- # value indicates that the value from the constructor should be used.
def start(maxConnections = -1)
- raise "server is already running" if !stopped?
+ raise "running" if !stopped?
@shutdown = false
@maxConnections = maxConnections if maxConnections > 0
@@servicesMutex.synchronize {
@@ -261,8 +205,7 @@ class GServer
end
}
client = @tcpServer.accept
- Thread.new(client) { |myClient|
- @connections << Thread.current
+ @connections << Thread.new(client) { |myClient|
begin
myPort = myClient.peeraddr[1]
serve(myClient) if !@audit or connecting(myClient)
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 13016fcbba..226a996021 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -2,7 +2,7 @@
# ipaddr.rb - A class to manipulate an IP address
#
# Copyright (c) 2002 Hajimu UMEMOTO <ume@mahoroba.org>.
-# Copyright (c) 2007, 2009, 2012 Akinori MUSHA <knu@iDaemons.org>.
+# Copyright (c) 2007 Akinori MUSHA <knu@iDaemons.org>.
# All rights reserved.
#
# You can redistribute and/or modify it under the same terms as Ruby.
@@ -17,6 +17,49 @@
#
require 'socket'
+unless Socket.const_defined? "AF_INET6"
+ class Socket < BasicSocket
+ AF_INET6 = Object.new
+ end
+
+ class << IPSocket
+ def valid_v4?(addr)
+ if /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ addr
+ return $~.captures.all? {|i| i.to_i < 256}
+ end
+ return false
+ end
+
+ def valid_v6?(addr)
+ # IPv6 (normal)
+ return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*\Z/ =~ addr
+ return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
+ return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*)?\Z/ =~ addr
+ # IPv6 (IPv4 compat)
+ return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:/ =~ addr && valid_v4?($')
+ return true if /\A[\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_v4?($')
+ return true if /\A::([\dA-Fa-f]{1,4}(:[\dA-Fa-f]{1,4})*:)?/ =~ addr && valid_v4?($')
+
+ false
+ end
+
+ def valid?(addr)
+ valid_v4?(addr) || valid_v6?(addr)
+ end
+
+ alias getaddress_orig getaddress
+ def getaddress(s)
+ if valid?(s)
+ s
+ elsif /\A[-A-Za-z\d.]+\Z/ =~ s
+ getaddress_orig(s)
+ else
+ raise ArgumentError, "invalid address"
+ end
+ end
+ end
+end
+
# IPAddr provides a set of methods to manipulate an IP address. Both IPv4 and
# IPv6 are supported.
#
@@ -26,77 +69,24 @@ require 'socket'
#
# 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 #=> #<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"
+# 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>
+# 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::"
+# 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>
+# p ipaddr3 #=> #<IPAddr: IPv4:192.168.2.0/255.255.255.0>
class IPAddr
- # 32 bit mask for IPv4
IN4MASK = 0xffffffff
- # 128 bit mask for IPv4
IN6MASK = 0xffffffffffffffffffffffffffffffff
- # Format string for IPv6
IN6FORMAT = (["%.4x"] * 8).join(':')
- # Regexp _internally_ used for parsing IPv4 address.
- RE_IPV4ADDRLIKE = %r{
- \A
- (\d+) \. (\d+) \. (\d+) \. (\d+)
- \z
- }x
-
- # Regexp _internally_ used for parsing IPv6 address.
- RE_IPV6ADDRLIKE_FULL = %r{
- \A
- (?:
- (?: [\da-f]{1,4} : ){7} [\da-f]{1,4}
- |
- ( (?: [\da-f]{1,4} : ){6} )
- (\d+) \. (\d+) \. (\d+) \. (\d+)
- )
- \z
- }xi
-
- # Regexp _internally_ used for parsing IPv6 address.
- RE_IPV6ADDRLIKE_COMPRESSED = %r{
- \A
- ( (?: (?: [\da-f]{1,4} : )* [\da-f]{1,4} )? )
- ::
- ( (?:
- ( (?: [\da-f]{1,4} : )* )
- (?:
- [\da-f]{1,4}
- |
- (\d+) \. (\d+) \. (\d+) \. (\d+)
- )
- )? )
- \z
- }xi
-
- # Generic IPAddr related error. Exceptions raised in this class should
- # inherit from Error.
- class Error < ArgumentError; end
-
- # Raised when the provided IP address is an invalid address.
- class InvalidAddressError < Error; end
-
- # Raised when the address family is invalid such as an address with an
- # unsupported family, an address with an inconsistent family, or an address
- # who's family cannot be determined.
- class AddressFamilyError < Error; end
-
- # Raised when the address is an invalid length.
- class InvalidPrefixError < InvalidAddressError; end
-
# Returns the address family of this IP address.
attr_reader :family
@@ -115,7 +105,7 @@ class IPAddr
when 16
s = IN6FORMAT % addr.unpack('n8')
else
- raise AddressFamilyError, "unsupported address family"
+ raise ArgumentError, "unsupported address family"
end
return s
end
@@ -164,13 +154,13 @@ class IPAddr
# net1 = IPAddr.new("192.168.2.0/24")
# net2 = IPAddr.new("192.168.2.100")
# net3 = IPAddr.new("192.168.3.0")
- # p net1.include?(net2) #=> true
- # p net1.include?(net3) #=> false
+ # p net1.include?(net2) #=> true
+ # p net1.include?(net3) #=> false
def include?(other)
other = coerce_other(other)
if ipv4_mapped?
if (@mask_addr >> 32) != 0xffffffffffffffffffffffff
- return false
+ return false
end
mask_addr = (@mask_addr & IN4MASK)
addr = (@addr & IN4MASK)
@@ -207,7 +197,7 @@ class IPAddr
str.gsub!(/\b0{1,3}([\da-f]+)\b/i, '\1')
loop do
- break if str.sub!(/\A0:0:0:0:0:0:0:0\z/, '::')
+ break if str.sub!(/\A0:0:0:0:0:0:0:0\Z/, '::')
break if str.sub!(/\b0:0:0:0:0:0:0\b/, ':')
break if str.sub!(/\b0:0:0:0:0:0\b/, ':')
break if str.sub!(/\b0:0:0:0:0\b/, ':')
@@ -218,7 +208,7 @@ class IPAddr
end
str.sub!(/:{3,}/, '::')
- if /\A::(ffff:)?([\da-f]{1,4}):([\da-f]{1,4})\z/i =~ str
+ if /\A::(ffff:)?([\da-f]{1,4}):([\da-f]{1,4})\Z/i =~ str
str = sprintf('::%s%d.%d.%d.%d', $1, $2.hex / 256, $2.hex % 256, $3.hex / 256, $3.hex % 256)
end
@@ -238,10 +228,10 @@ class IPAddr
return [@addr].pack('N')
when Socket::AF_INET6
return (0..7).map { |i|
- (@addr >> (112 - 16 * i)) & 0xffff
+ (@addr >> (112 - 16 * i)) & 0xffff
}.pack('n8')
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
end
@@ -273,7 +263,7 @@ class IPAddr
# into an IPv4-mapped IPv6 address.
def ipv4_mapped
if !ipv4?
- raise InvalidAddressError, "not an IPv4 address"
+ raise ArgumentError, "not an IPv4 address"
end
return self.clone.set(@addr | 0xffff00000000, Socket::AF_INET6)
end
@@ -282,7 +272,7 @@ class IPAddr
# into an IPv4-compatible IPv6 address.
def ipv4_compat
if !ipv4?
- raise InvalidAddressError, "not an IPv4 address"
+ raise ArgumentError, "not an IPv4 address"
end
return self.clone.set(@addr, Socket::AF_INET6)
end
@@ -306,14 +296,14 @@ class IPAddr
when Socket::AF_INET6
return ip6_arpa
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
end
# Returns a string for DNS reverse lookup compatible with RFC3172.
def ip6_arpa
if !ipv6?
- raise InvalidAddressError, "not an IPv6 address"
+ raise ArgumentError, "not an IPv6 address"
end
return _reverse + ".ip6.arpa"
end
@@ -321,7 +311,7 @@ class IPAddr
# Returns a string for DNS reverse lookup compatible with RFC1886.
def ip6_int
if !ipv6?
- raise InvalidAddressError, "not an IPv6 address"
+ raise ArgumentError, "not an IPv6 address"
end
return _reverse + ".ip6.int"
end
@@ -361,7 +351,7 @@ class IPAddr
when Socket::AF_INET6
end_addr = (@addr | (IN6MASK ^ @mask_addr))
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
return clone.set(begin_addr, @family)..clone.set(end_addr, @family)
@@ -376,29 +366,26 @@ class IPAddr
when Socket::AF_INET6
af = "IPv6"
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
return sprintf("#<%s: %s:%s/%s>", self.class.name,
- af, _to_string(@addr), _to_string(@mask_addr))
+ af, _to_string(@addr), _to_string(@mask_addr))
end
protected
- # Set +@addr+, the internal stored ip address, to given +addr+. The
- # parameter +addr+ is validated using the first +family+ member,
- # which is +Socket::AF_INET+ or +Socket::AF_INET6+.
def set(addr, *family)
case family[0] ? family[0] : @family
when Socket::AF_INET
if addr < 0 || addr > IN4MASK
- raise InvalidAddressError, "invalid address"
+ raise ArgumentError, "invalid address"
end
when Socket::AF_INET6
if addr < 0 || addr > IN6MASK
- raise InvalidAddressError, "invalid address"
+ raise ArgumentError, "invalid address"
end
else
- raise AddressFamilyError, "unsupported address family"
+ raise ArgumentError, "unsupported address family"
end
@addr = addr
if family[0]
@@ -407,19 +394,18 @@ class IPAddr
return self
end
- # Set current netmask to given mask.
def mask!(mask)
if mask.kind_of?(String)
if mask =~ /^\d+$/
- prefixlen = mask.to_i
+ prefixlen = mask.to_i
else
- m = IPAddr.new(mask)
- if m.family != @family
- raise InvalidPrefixError, "address family is not same"
- end
- @mask_addr = m.to_i
- @addr &= @mask_addr
- return self
+ m = IPAddr.new(mask)
+ if m.family != @family
+ raise ArgumentError, "address family is not same"
+ end
+ @mask_addr = m.to_i
+ @addr &= @mask_addr
+ return self
end
else
prefixlen = mask
@@ -427,18 +413,18 @@ class IPAddr
case @family
when Socket::AF_INET
if prefixlen < 0 || prefixlen > 32
- raise InvalidPrefixError, "invalid length"
+ raise ArgumentError, "invalid length"
end
masklen = 32 - prefixlen
@mask_addr = ((IN4MASK >> masklen) << masklen)
when Socket::AF_INET6
if prefixlen < 0 || prefixlen > 128
- raise InvalidPrefixError, "invalid length"
+ raise ArgumentError, "invalid length"
end
masklen = 128 - prefixlen
@mask_addr = ((IN6MASK >> masklen) << masklen)
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
@addr = ((@addr >> masklen) << masklen)
return self
@@ -472,9 +458,9 @@ class IPAddr
@mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
return
when Socket::AF_UNSPEC
- raise AddressFamilyError, "address family must be specified"
+ raise ArgumentError, "address family must be specified"
else
- raise AddressFamilyError, "unsupported address family: #{family}"
+ raise ArgumentError, "unsupported address family: #{family}"
end
end
prefix, prefixlen = addr.split('/')
@@ -484,12 +470,17 @@ class IPAddr
end
# It seems AI_NUMERICHOST doesn't do the job.
#Socket.getaddrinfo(left, nil, Socket::AF_INET6, Socket::SOCK_STREAM, nil,
- # Socket::AI_NUMERICHOST)
+ # Socket::AI_NUMERICHOST)
+ begin
+ IPSocket.getaddress(prefix) # test if address is valid
+ rescue
+ raise ArgumentError, "invalid address"
+ end
@addr = @family = nil
if family == Socket::AF_UNSPEC || family == Socket::AF_INET
@addr = in_addr(prefix)
if @addr
- @family = Socket::AF_INET
+ @family = Socket::AF_INET
end
end
if !@addr && (family == Socket::AF_UNSPEC || family == Socket::AF_INET6)
@@ -497,7 +488,7 @@ class IPAddr
@family = Socket::AF_INET6
end
if family != Socket::AF_UNSPEC && @family != family
- raise AddressFamilyError, "address family mismatch"
+ raise ArgumentError, "address family mismatch"
end
if prefixlen
mask!(prefixlen)
@@ -518,45 +509,26 @@ class IPAddr
end
def in_addr(addr)
- case addr
- when Array
- octets = addr
- else
- m = RE_IPV4ADDRLIKE.match(addr) or return nil
- octets = m.captures
+ if addr =~ /^\d+\.\d+\.\d+\.\d+$/
+ return addr.split('.').inject(0) { |i, s|
+ i << 8 | s.to_i
+ }
end
- octets.inject(0) { |i, s|
- (n = s.to_i) < 256 or raise InvalidAddressError, "invalid address"
- s.match(/\A0./) and raise InvalidAddressError, "zero-filled number in IPv4 address is ambiguous"
- i << 8 | n
- }
+ return nil
end
def in6_addr(left)
case left
- when RE_IPV6ADDRLIKE_FULL
- if $2
- addr = in_addr($~[2,4])
- left = $1 + ':'
- else
- addr = 0
- end
- right = ''
- when RE_IPV6ADDRLIKE_COMPRESSED
- if $4
- left.count(':') <= 6 or raise InvalidAddressError, "invalid address"
- addr = in_addr($~[4,4])
- left = $1
- right = $3 + '0:0'
- else
- left.count(':') <= ($1.empty? || $2.empty? ? 8 : 7) or
- raise InvalidAddressError, "invalid address"
- left = $1
- right = $2
- addr = 0
- end
+ when /^::ffff:(\d+\.\d+\.\d+\.\d+)$/i
+ return in_addr($1) + 0xffff00000000
+ when /^::(\d+\.\d+\.\d+\.\d+)$/i
+ return in_addr($1)
+ when /[^0-9a-f:]/i
+ raise ArgumentError, "invalid address"
+ when /^(.*)::(.*)$/
+ left, right = $1, $2
else
- raise InvalidAddressError, "invalid address"
+ right = ''
end
l = left.split(':')
r = right.split(':')
@@ -564,9 +536,9 @@ class IPAddr
if rest < 0
return nil
end
- (l + Array.new(rest, '0') + r).inject(0) { |i, s|
+ return (l + Array.new(rest, '0') + r).inject(0) { |i, s|
i << 16 | s.hex
- } | addr
+ }
end
def addr_mask(addr)
@@ -576,7 +548,7 @@ class IPAddr
when Socket::AF_INET6
return addr & IN6MASK
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
end
@@ -584,12 +556,12 @@ class IPAddr
case @family
when Socket::AF_INET
return (0..3).map { |i|
- (@addr >> (8 * i)) & 0xff
+ (@addr >> (8 * i)) & 0xff
}.join('.')
when Socket::AF_INET6
return ("%.32x" % @addr).reverse!.gsub!(/.(?!$)/, '\&.')
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
end
@@ -597,66 +569,17 @@ class IPAddr
case @family
when Socket::AF_INET
return (0..3).map { |i|
- (addr >> (24 - 8 * i)) & 0xff
+ (addr >> (24 - 8 * i)) & 0xff
}.join('.')
when Socket::AF_INET6
return (("%.32x" % addr).gsub!(/.{4}(?!$)/, '\&:'))
else
- raise AddressFamilyError, "unsupported address family"
+ raise "unsupported address family"
end
end
end
-unless Socket.const_defined? :AF_INET6
- class Socket < BasicSocket
- # IPv6 protocol family
- AF_INET6 = Object.new
- end
-
- class << IPSocket
- private
-
- def valid_v6?(addr)
- case addr
- when IPAddr::RE_IPV6ADDRLIKE_FULL
- if $2
- $~[2,4].all? {|i| i.to_i < 256 }
- else
- true
- end
- when IPAddr::RE_IPV6ADDRLIKE_COMPRESSED
- if $4
- addr.count(':') <= 6 && $~[4,4].all? {|i| i.to_i < 256}
- else
- addr.count(':') <= 7
- end
- else
- false
- end
- end
-
- alias getaddress_orig getaddress
-
- public
-
- # Returns a +String+ based representation of a valid DNS hostname,
- # IPv4 or IPv6 address.
- #
- # IPSocket.getaddress 'localhost' #=> "::1"
- # IPSocket.getaddress 'broadcasthost' #=> "255.255.255.255"
- # IPSocket.getaddress 'www.ruby-lang.org' #=> "221.186.184.68"
- # IPSocket.getaddress 'www.ccc.de' #=> "2a00:1328:e102:ccc0::122"
- def getaddress(s)
- if valid_v6?(s)
- s
- else
- getaddress_orig(s)
- end
- end
- end
-end
-
if $0 == __FILE__
eval DATA.read, nil, $0, __LINE__+4
end
@@ -667,17 +590,10 @@ require 'test/unit'
class TC_IPAddr < Test::Unit::TestCase
def test_s_new
- [
- ["3FFE:505:ffff::/48"],
- ["0:0:0:1::"],
- ["2001:200:300::/48"],
- ["2001:200:300::192.168.1.2/48"],
- ["1:2:3:4:5:6:7::"],
- ["::2:3:4:5:6:7:8"],
- ].each { |args|
- assert_nothing_raised {
- IPAddr.new(*args)
- }
+ assert_nothing_raised {
+ IPAddr.new("3FFE:505:ffff::/48")
+ IPAddr.new("0:0:0:1::")
+ IPAddr.new("2001:200:300::/48")
}
a = IPAddr.new
@@ -730,18 +646,19 @@ class TC_IPAddr < Test::Unit::TestCase
assert_equal("2001:200:300::", IPAddr.new("2001:200:300::/48").to_s)
assert_equal("2001:200:300::", IPAddr.new("[2001:200:300::]/48").to_s)
- assert_equal("1:2:3:4:5:6:7:0", IPAddr.new("1:2:3:4:5:6:7::").to_s)
- assert_equal("0:2:3:4:5:6:7:8", IPAddr.new("::2:3:4:5:6:7:8").to_s)
- assert_raises(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.256") }
- assert_raises(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.011") }
- assert_raises(IPAddr::InvalidAddressError) { IPAddr.new("fe80::1%fxp0") }
- assert_raises(IPAddr::InvalidAddressError) { IPAddr.new("[192.168.1.2]/120") }
- assert_raises(IPAddr::InvalidPrefixError) { IPAddr.new("::1/255.255.255.0") }
- assert_raises(IPAddr::InvalidPrefixError) { IPAddr.new("::1/129") }
- assert_raises(IPAddr::InvalidPrefixError) { IPAddr.new("192.168.0.1/33") }
- assert_raises(IPAddr::AddressFamilyError) { IPAddr.new(1) }
- assert_raises(IPAddr::AddressFamilyError) { IPAddr.new("::ffff:192.168.1.2/120", Socket::AF_INET) }
+ [
+ ["fe80::1%fxp0"],
+ ["::1/255.255.255.0"],
+ ["::1:192.168.1.2/120"],
+ [IPAddr.new("::1").to_i],
+ ["::ffff:192.168.1.2/120", Socket::AF_INET],
+ ["[192.168.1.2]/120"],
+ ].each { |args|
+ assert_raises(ArgumentError) {
+ IPAddr.new(*args)
+ }
+ }
end
def test_s_new_ntoh
@@ -802,14 +719,14 @@ class TC_IPAddr < Test::Unit::TestCase
def test_ip6_arpa
assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.arpa", IPAddr.new("3ffe:505:2::f").ip6_arpa)
- assert_raises(IPAddr::InvalidAddressError) {
+ assert_raises(ArgumentError) {
IPAddr.new("192.168.2.1").ip6_arpa
}
end
def test_ip6_int
assert_equal("f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.0.5.0.5.0.e.f.f.3.ip6.int", IPAddr.new("3ffe:505:2::f").ip6_int)
- assert_raises(IPAddr::InvalidAddressError) {
+ assert_raises(ArgumentError) {
IPAddr.new("192.168.2.1").ip6_int
}
end
@@ -840,7 +757,7 @@ class TC_Operator < Test::Unit::TestCase
assert_equal("3ffe:505:2:1::", a.to_s)
assert_equal("3ffe:505:2::", @a.to_s)
assert_equal("3ffe:505:2:1::",
- (@a | 0x00000000000000010000000000000000).to_s)
+ (@a | 0x00000000000000010000000000000000).to_s)
end
def test_and
@@ -875,9 +792,7 @@ class TC_Operator < Test::Unit::TestCase
end
def test_equal
- assert_equal(true, @a == IPAddr.new("3FFE:505:2::"))
- assert_equal(true, @a == IPAddr.new("3ffe:0505:0002::"))
- assert_equal(true, @a == IPAddr.new("3ffe:0505:0002:0:0:0:0:0"))
+ assert_equal(true, @a == IPAddr.new("3ffe:505:2::"))
assert_equal(false, @a == IPAddr.new("3ffe:505:3::"))
assert_equal(true, @a != IPAddr.new("3ffe:505:3::"))
assert_equal(false, @a != IPAddr.new("3ffe:505:2::"))
diff --git a/lib/irb.rb b/lib/irb.rb
index 72ebe1bd35..7a9d438b5b 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -1,8 +1,8 @@
#
# irb.rb - irb main module
-# $Release Version: 0.9.6 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.9.6 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
@@ -21,341 +21,19 @@ require "irb/locale"
STDOUT.sync = true
-# IRB stands for "interactive ruby" and is a tool to interactively execute ruby
-# expressions read from the standard input.
-#
-# The +irb+ command from your shell will start the interpreter.
-#
-# == Usage
-#
-# Use of irb is easy if you know ruby.
-#
-# When executing irb, prompts are displayed as follows. Then, enter the ruby
-# expression. An input is executed when it is syntactically complete.
-#
-# $ irb
-# irb(main):001:0> 1+2
-# #=> 3
-# irb(main):002:0> class Foo
-# irb(main):003:1> def foo
-# irb(main):004:2> print 1
-# irb(main):005:2> end
-# irb(main):006:1> end
-# #=> nil
-#
-# The Readline extension module can be used with irb. Use of Readline is
-# default if it's installed.
-#
-# == Command line options
-#
-# Usage: irb.rb [options] [programfile] [arguments]
-# -f Suppress read of ~/.irbrc
-# -m Bc mode (load mathn, fraction or matrix are available)
-# -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`
-# -w Same as `ruby -w`
-# -W[level=2] Same as `ruby -W`
-# --inspect Use `inspect' for output (default except for bc mode)
-# --noinspect Don't use inspect for output
-# --readline Use Readline extension module
-# --noreadline Don't use Readline extension module
-# --prompt prompt-mode
-# --prompt-mode prompt-mode
-# Switch prompt mode. Pre-defined prompt modes are
-# `default', `simple', `xmp' and `inf-ruby'
-# --inf-ruby-mode Use prompt appropriate for inf-ruby-mode on emacs.
-# Suppresses --readline.
-# --simple-prompt Simple prompt mode
-# --noprompt No prompt mode
-# --tracer Display trace for each execution of commands.
-# --back-trace-limit n
-# Display backtrace top n and tail n. The default
-# value is 16.
-# --irb_debug n Set internal debug level to n (not for popular use)
-# -v, --version Print the version of irb
-#
-# == Configuration
-#
-# IRB reads from <code>~/.irbrc</code> when it's invoked.
-#
-# If <code>~/.irbrc</code> doesn't exist, +irb+ will try to read in the following order:
-#
-# * +.irbrc+
-# * +irb.rc+
-# * +_irbrc+
-# * <code>$irbrc</code>
-#
-# The following are alternatives to the command line options. To use them type
-# as follows in an +irb+ session:
-#
-# IRB.conf[:IRB_NAME]="irb"
-# IRB.conf[:MATH_MODE]=false
-# IRB.conf[:INSPECT_MODE]=nil
-# IRB.conf[:IRB_RC] = nil
-# IRB.conf[:BACK_TRACE_LIMIT]=16
-# IRB.conf[:USE_LOADER] = false
-# IRB.conf[:USE_READLINE] = nil
-# IRB.conf[:USE_TRACER] = false
-# IRB.conf[:IGNORE_SIGINT] = true
-# IRB.conf[:IGNORE_EOF] = false
-# IRB.conf[:PROMPT_MODE] = :DEFALUT
-# IRB.conf[:PROMPT] = {...}
-# IRB.conf[:DEBUG_LEVEL]=0
-#
-# === Auto indentation
-#
-# To enable auto-indent mode in irb, add the following to your +.irbrc+:
-#
-# IRB.conf[:AUTO_INDENT] = true
-#
-# === Autocompletion
-#
-# To enable autocompletion for irb, add the following to your +.irbrc+:
-#
-# require 'irb/completion'
-#
-# === History
-#
-# By default, irb disables history and will not store any commands you used.
-#
-# If you want to enable history, add the following to your +.irbrc+:
-#
-# IRB.conf[:SAVE_HISTORY] = 1000
-#
-# This will now store the last 1000 commands in <code>~/.irb_history</code>.
-#
-# See IRB::Context#save_history= for more information.
-#
-# == Customizing the IRB Prompt
-#
-# In order to customize the prompt, you can change the following Hash:
-#
-# IRB.conf[:PROMPT]
-#
-# This example can be used in your +.irbrc+
-#
-# IRB.conf[:PROMPT][:MY_PROMPT] = { # name of prompt mode
-# :AUTO_INDENT => true # enables auto-indent mode
-# :PROMPT_I => nil, # normal prompt
-# :PROMPT_S => nil, # prompt for continuated strings
-# :PROMPT_C => nil, # prompt for continuated statement
-# :RETURN => " ==>%s\n" # format to return value
-# }
-#
-# IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-#
-# Or, invoke irb with the above prompt mode by:
-#
-# irb --prompt my-prompt
-#
-# Constants +PROMPT_I+, +PROMPT_S+ and +PROMPT_C+ specify the format. In the
-# prompt specification, some special strings are available:
-#
-# %N # command name which is running
-# %m # to_s of main object (self)
-# %M # inspect of main object (self)
-# %l # type of string(", ', /, ]), `]' is inner %w[...]
-# %NNi # indent level. NN is degits and means as same as printf("%NNd").
-# # It can be ommited
-# %NNn # line number.
-# %% # %
-#
-# For instance, the default prompt mode is defined as follows:
-#
-# IRB.conf[:PROMPT_MODE][:DEFAULT] = {
-# :PROMPT_I => "%N(%m):%03n:%i> ",
-# :PROMPT_S => "%N(%m):%03n:%i%l ",
-# :PROMPT_C => "%N(%m):%03n:%i* ",
-# :RETURN => "%s\n" # used to printf
-# }
-#
-# irb comes with a number of available modes:
-#
-# # :NULL:
-# # :PROMPT_I:
-# # :PROMPT_N:
-# # :PROMPT_S:
-# # :PROMPT_C:
-# # :RETURN: |
-# # %s
-# # :DEFAULT:
-# # :PROMPT_I: ! '%N(%m):%03n:%i> '
-# # :PROMPT_N: ! '%N(%m):%03n:%i> '
-# # :PROMPT_S: ! '%N(%m):%03n:%i%l '
-# # :PROMPT_C: ! '%N(%m):%03n:%i* '
-# # :RETURN: |
-# # => %s
-# # :CLASSIC:
-# # :PROMPT_I: ! '%N(%m):%03n:%i> '
-# # :PROMPT_N: ! '%N(%m):%03n:%i> '
-# # :PROMPT_S: ! '%N(%m):%03n:%i%l '
-# # :PROMPT_C: ! '%N(%m):%03n:%i* '
-# # :RETURN: |
-# # %s
-# # :SIMPLE:
-# # :PROMPT_I: ! '>> '
-# # :PROMPT_N: ! '>> '
-# # :PROMPT_S:
-# # :PROMPT_C: ! '?> '
-# # :RETURN: |
-# # => %s
-# # :INF_RUBY:
-# # :PROMPT_I: ! '%N(%m):%03n:%i> '
-# # :PROMPT_N:
-# # :PROMPT_S:
-# # :PROMPT_C:
-# # :RETURN: |
-# # %s
-# # :AUTO_INDENT: true
-# # :XMP:
-# # :PROMPT_I:
-# # :PROMPT_N:
-# # :PROMPT_S:
-# # :PROMPT_C:
-# # :RETURN: |2
-# # ==>%s
-#
-# == Restrictions
-#
-# Because irb evaluates input immediately after it is syntactically complete,
-# the results may be slightly different than directly using ruby.
-#
-# == IRB Sessions
-#
-# IRB has a special feature, that allows you to manage many sessions at once.
-#
-# You can create new sessions with Irb.irb, and get a list of current sessions
-# with the +jobs+ command in the prompt.
-#
-# === Commands
-#
-# JobManager provides commands to handle the current sessions:
-#
-# jobs # List of current sessions
-# fg # Switches to the session of the given number
-# kill # Kills the session with the given number
-#
-# The +exit+ command, or ::irb_exit, will quit the current session and call any
-# exit hooks with IRB.irb_at_exit.
-#
-# A few commands for loading files within the session are also available:
-#
-# +source+::
-# Loads a given file in the current session and displays the source lines,
-# see IrbLoader#source_file
-# +irb_load+::
-# Loads the given file similarly to Kernel#load, see IrbLoader#irb_load
-# +irb_require+::
-# Loads the given file similarly to Kernel#require
-#
-# === Configuration
-#
-# The command line options, or IRB.conf, specify the default behavior of
-# Irb.irb.
-#
-# On the other hand, each conf in IRB@Command+line+options is used to
-# individually configure IRB.irb.
-#
-# If a proc is set for IRB.conf[:IRB_RC], its will be invoked after execution
-# of that proc with the context of the current session as its argument. Each
-# session can be configured using this mechanism.
-#
-# === Session variables
-#
-# There are a few variables in every Irb session that can come in handy:
-#
-# <code>_</code>::
-# The value command executed, as a local variable
-# <code>__</code>::
-# The history of evaluated commands
-# <code>__[line_no]</code>::
-# Returns the evaluation value at the given line number, +line_no+.
-# If +line_no+ is a negative, the return value +line_no+ many lines before
-# the most recent return value.
-#
-# === Example using IRB Sessions
-#
-# # invoke a new session
-# irb(main):001:0> irb
-# # list open sessions
-# irb.1(main):001:0> jobs
-# #0->irb on main (#<Thread:0x400fb7e4> : stop)
-# #1->irb#1 on main (#<Thread:0x40125d64> : running)
-#
-# # change the active session
-# irb.1(main):002:0> fg 0
-# # define class Foo in top-level session
-# irb(main):002:0> class Foo;end
-# # invoke a new session with the context of Foo
-# irb(main):003:0> irb Foo
-# # define Foo#foo
-# irb.2(Foo):001:0> def foo
-# irb.2(Foo):002:1> print 1
-# irb.2(Foo):003:1> end
-#
-# # change the active session
-# irb.2(Foo):004:0> fg 0
-# # list open sessions
-# irb(main):004:0> jobs
-# #0->irb on main (#<Thread:0x400fb7e4> : running)
-# #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-# #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-# # check if Foo#foo is available
-# irb(main):005:0> Foo.instance_methods #=> [:foo, ...]
-#
-# # change the active sesssion
-# irb(main):006:0> fg 2
-# # define Foo#bar in the context of Foo
-# irb.2(Foo):005:0> def bar
-# irb.2(Foo):006:1> print "bar"
-# irb.2(Foo):007:1> end
-# irb.2(Foo):010:0> Foo.instance_methods #=> [:bar, :foo, ...]
-#
-# # change the active session
-# irb.2(Foo):011:0> fg 0
-# irb(main):007:0> f = Foo.new #=> #<Foo:0x4010af3c>
-# # invoke a new session with the context of f (instance of Foo)
-# irb(main):008:0> irb f
-# # list open sessions
-# irb.3(<Foo:0x4010af3c>):001:0> jobs
-# #0->irb on main (#<Thread:0x400fb7e4> : stop)
-# #1->irb#1 on main (#<Thread:0x40125d64> : stop)
-# #2->irb#2 on Foo (#<Thread:0x4011d54c> : stop)
-# #3->irb#3 on #<Foo:0x4010af3c> (#<Thread:0x4010a1e0> : running)
-# # evaluate f.foo
-# irb.3(<Foo:0x4010af3c>):002:0> foo #=> 1 => nil
-# # evaluate f.bar
-# irb.3(<Foo:0x4010af3c>):003:0> bar #=> bar => nil
-# # kill jobs 1, 2, and 3
-# irb.3(<Foo:0x4010af3c>):004:0> kill 1, 2, 3
-# # list open sesssions, should only include main session
-# irb(main):009:0> jobs
-# #0->irb on main (#<Thread:0x400fb7e4> : running)
-# # quit irb
-# irb(main):010:0> exit
module IRB
@RCS_ID='-$Id$-'
- # An exception raised by IRB.irb_abort
class Abort < Exception;end
+ #
@CONF = {}
-
- # Displays current configuration.
- #
- # Modifing the configuration is achieved by sending a message to IRB.conf.
- #
- # See IRB@Configuration for more information.
def IRB.conf
@CONF
end
- # Returns the current version of IRB, including release version and last
- # updated date.
+ # IRB version method
def IRB.version
if v = @CONF[:VERSION] then return v end
@@ -364,16 +42,11 @@ module IRB
@CONF[:VERSION] = format("irb %s(%s)", rv, @LAST_UPDATE_DATE)
end
- # The current IRB::Context of the session, see IRB.conf
- #
- # irb
- # irb(main):001:0> IRB.CurrentContext.irb_name = "foo"
- # foo(main):002:0> IRB.conf[:MAIN_CONTEXT].irb_name #=> "foo"
def IRB.CurrentContext
IRB.conf[:MAIN_CONTEXT]
end
- # Initializes IRB and creates a new Irb.irb object at the +TOPLEVEL_BINDING+
+ # initialize IRB and start TOP_LEVEL irb
def IRB.start(ap_path = nil)
$0 = File::basename(ap_path, ".rb") if ap_path
@@ -394,7 +67,7 @@ module IRB
begin
catch(:IRB_EXIT) do
- irb.eval_input
+ irb.eval_input
end
ensure
irb_at_exit
@@ -402,29 +75,26 @@ module IRB
# print "\n"
end
- # Calls each event hook of IRB.conf[:AT_EXIT] when the current session quits.
def IRB.irb_at_exit
@CONF[:AT_EXIT].each{|hook| hook.call}
end
- # Quits irb
def IRB.irb_exit(irb, ret)
throw :IRB_EXIT, ret
end
- # Aborts then interrupts irb.
- #
- # Will raise an Abort exception, or the given +exception+.
def IRB.irb_abort(irb, exception = Abort)
if defined? Thread
- irb.context.thread.raise exception, "abort then interrupt!"
+ irb.context.thread.raise exception, "abort then interrupt!!"
else
- raise exception, "abort then interrupt!"
+ raise exception, "abort then interrupt!!"
end
end
+ #
+ # irb interpreter main routine
+ #
class Irb
- # Creates a new irb session
def initialize(workspace = nil, input_method = nil, output_method = nil)
@context = Context.new(self, workspace, input_method, output_method)
@context.main.extend ExtendCommandBundle
@@ -433,253 +103,231 @@ module IRB
@scanner = RubyLex.new
@scanner.exception_on_syntax_error = false
end
- # Returns the current context of this irb session
attr_reader :context
- # The lexer used by this irb session
attr_accessor :scanner
- # Evaluates input for this session.
def eval_input
@scanner.set_prompt do
- |ltype, indent, continue, line_no|
- if ltype
- f = @context.prompt_s
- elsif continue
- f = @context.prompt_c
- elsif indent > 0
- f = @context.prompt_n
- else
- f = @context.prompt_i
- end
- f = "" unless f
- if @context.prompting?
- @context.io.prompt = p = prompt(f, ltype, indent, line_no)
- else
- @context.io.prompt = p = ""
- end
- if @context.auto_indent_mode
- unless ltype
+ |ltype, indent, continue, line_no|
+ if ltype
+ f = @context.prompt_s
+ elsif continue
+ f = @context.prompt_c
+ elsif indent > 0
+ f = @context.prompt_n
+ else
+ f = @context.prompt_i
+ end
+ f = "" unless f
+ if @context.prompting?
+ @context.io.prompt = p = prompt(f, ltype, indent, line_no)
+ else
+ @context.io.prompt = p = ""
+ end
+ if @context.auto_indent_mode
+ unless ltype
ind = prompt(@context.prompt_i, ltype, indent, line_no)[/.*\z/].size +
- indent * 2 - p.size
- ind += 2 if continue
- @context.io.prompt = p + " " * ind if ind > 0
- end
- end
+ indent * 2 - p.size
+ ind += 2 if continue
+ @context.io.prompt = p + " " * ind if ind > 0
+ end
+ end
end
@scanner.set_input(@context.io) do
- signal_status(:IN_INPUT) do
- if l = @context.io.gets
- print l if @context.verbose?
- else
- if @context.ignore_eof? and @context.io.readable_after_eof?
- l = "\n"
- if @context.verbose?
- printf "Use \"exit\" to leave %s\n", @context.ap_name
- end
- else
- print "\n"
- end
- end
- l
- end
+ signal_status(:IN_INPUT) do
+ if l = @context.io.gets
+ print l if @context.verbose?
+ else
+ if @context.ignore_eof? and @context.io.readable_atfer_eof?
+ l = "\n"
+ if @context.verbose?
+ printf "Use \"exit\" to leave %s\n", @context.ap_name
+ end
+ else
+ print "\n"
+ end
+ end
+ l
+ end
end
@scanner.each_top_level_statement do |line, line_no|
- signal_status(:IN_EVAL) do
- begin
+ signal_status(:IN_EVAL) do
+ begin
line.untaint
- @context.evaluate(line, line_no)
- output_value if @context.echo?
- exc = nil
- rescue Interrupt => exc
- rescue SystemExit, SignalException
- raise
- rescue Exception => exc
- end
- if exc
- print exc.class, ": ", exc, "\n"
- if exc.backtrace[0] =~ /irb(2)?(\/.*|-.*|\.rb)?:/ && exc.class.to_s !~ /^IRB/ &&
+ @context.evaluate(line, line_no)
+ output_value if @context.echo?
+ exc = nil
+ rescue Interrupt => exc
+ rescue SystemExit, SignalException
+ raise
+ rescue Exception => exc
+ 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
- else
- irb_bug = false
- end
-
- messages = []
- lasts = []
- levels = 0
- for m in exc.backtrace
- m = @context.workspace.filter_backtrace(m) unless irb_bug
- if m
- if messages.size < @context.back_trace_limit
- messages.push "\tfrom "+m
- else
- lasts.push "\tfrom "+m
- if lasts.size > @context.back_trace_limit
- lasts.shift
- levels += 1
- end
- end
- end
- end
- print messages.join("\n"), "\n"
- unless lasts.empty?
- printf "... %d levels...\n", levels if levels > 0
- print lasts.join("\n")
- end
- print "Maybe IRB bug!\n" if irb_bug
- end
+ irb_bug = true
+ else
+ irb_bug = false
+ end
+
+ messages = []
+ lasts = []
+ levels = 0
+ for m in exc.backtrace
+ m = @context.workspace.filter_backtrace(m) unless irb_bug
+ if m
+ if messages.size < @context.back_trace_limit
+ messages.push "\tfrom "+m
+ else
+ lasts.push "\tfrom "+m
+ if lasts.size > @context.back_trace_limit
+ lasts.shift
+ levels += 1
+ end
+ end
+ end
+ end
+ print messages.join("\n"), "\n"
+ unless lasts.empty?
+ printf "... %d levels...\n", levels if levels > 0
+ print lasts.join("\n")
+ end
+ print "Maybe IRB bug!!\n" if irb_bug
+ end
if $SAFE > 2
abort "Error: irb does not work for $SAFE level higher than 2"
end
- end
+ end
end
end
- # Evaluates the given block using the given +path+ as the Context#irb_path
- # and +name+ as the Context#irb_name.
- #
- # Used by the irb command +source+, see IRB@IRB+Sessions for more
- # information.
def suspend_name(path = nil, name = nil)
@context.irb_path, back_path = path, @context.irb_path if path
@context.irb_name, back_name = name, @context.irb_name if name
begin
- yield back_path, back_name
+ yield back_path, back_name
ensure
- @context.irb_path = back_path if path
- @context.irb_name = back_name if name
+ @context.irb_path = back_path if path
+ @context.irb_name = back_name if name
end
end
- # Evaluates the given block using the given +workspace+ as the
- # Context#workspace.
- #
- # Used by the irb command +irb_load+, see IRB@IRB+Sessions for more
- # information.
def suspend_workspace(workspace)
@context.workspace, back_workspace = workspace, @context.workspace
begin
- yield back_workspace
+ yield back_workspace
ensure
- @context.workspace = back_workspace
+ @context.workspace = back_workspace
end
end
- # Evaluates the given block using the given +input_method+ as the
- # Context#io.
- #
- # Used by the irb commands +source+ and +irb_load+, see IRB@IRB+Sessions
- # for more information.
def suspend_input_method(input_method)
back_io = @context.io
@context.instance_eval{@io = input_method}
begin
- yield back_io
+ yield back_io
ensure
- @context.instance_eval{@io = back_io}
+ @context.instance_eval{@io = back_io}
end
end
- # Evaluates the given block using the given +context+ as the Context.
def suspend_context(context)
@context, back_context = context, @context
begin
- yield back_context
+ yield back_context
ensure
- @context = back_context
+ @context = back_context
end
end
- # Handler for the signal SIGINT, see Kernel#trap for more information.
def signal_handle
unless @context.ignore_sigint?
- print "\nabort!\n" if @context.verbose?
- exit
+ print "\nabort!!\n" if @context.verbose?
+ exit
end
case @signal_status
when :IN_INPUT
- print "^C\n"
- raise RubyLex::TerminateLineInput
+ print "^C\n"
+ raise RubyLex::TerminateLineInput
when :IN_EVAL
- IRB.irb_abort(self)
+ IRB.irb_abort(self)
when :IN_LOAD
- IRB.irb_abort(self, LoadAbort)
+ IRB.irb_abort(self, LoadAbort)
when :IN_IRB
- # ignore
+ # ignore
else
- # ignore other cases as well
+ # ignore other cases as well
end
end
- # Evaluates the given block using the given +status+.
def signal_status(status)
return yield if @signal_status == :IN_LOAD
signal_status_back = @signal_status
@signal_status = status
begin
- yield
+ yield
ensure
- @signal_status = signal_status_back
+ @signal_status = signal_status_back
end
end
- def prompt(prompt, ltype, indent, line_no) # :nodoc:
+ def prompt(prompt, ltype, indent, line_no)
p = prompt.dup
p.gsub!(/%([0-9]+)?([a-zA-Z])/) do
- case $2
- when "N"
- @context.irb_name
- when "m"
- @context.main.to_s
- when "M"
- @context.main.inspect
- when "l"
- ltype
- when "i"
- if $1
- format("%" + $1 + "d", indent)
- else
- indent.to_s
- end
- when "n"
- if $1
- format("%" + $1 + "d", line_no)
- else
- line_no.to_s
- end
- when "%"
- "%"
- end
+ case $2
+ when "N"
+ @context.irb_name
+ when "m"
+ @context.main.to_s
+ when "M"
+ @context.main.inspect
+ when "l"
+ ltype
+ when "i"
+ if $1
+ format("%" + $1 + "d", indent)
+ else
+ indent.to_s
+ end
+ when "n"
+ if $1
+ format("%" + $1 + "d", line_no)
+ else
+ line_no.to_s
+ end
+ when "%"
+ "%"
+ end
end
p
end
- def output_value # :nodoc:
+ def output_value
printf @context.return_format, @context.inspect_last_value
end
- # Outputs the local variables to this current session, including
- # #signal_status and #context, using IRB::Locale.
def inspect
ary = []
for iv in instance_variables
- case (iv = iv.to_s)
- when "@signal_status"
- ary.push format("%s=:%s", iv, @signal_status.id2name)
- when "@context"
- ary.push format("%s=%s", iv, eval(iv).__to_s__)
- else
- ary.push format("%s=%s", iv, eval(iv))
- end
+ case (iv = iv.to_s)
+ when "@signal_status"
+ ary.push format("%s=:%s", iv, @signal_status.id2name)
+ when "@context"
+ ary.push format("%s=%s", iv, eval(iv).__to_s__)
+ else
+ ary.push format("%s=%s", iv, eval(iv))
+ end
end
format("#<%s: %s>", self.class, ary.join(", "))
end
end
+ # Singleton method
def @CONF.inspect
IRB.version unless self[:VERSION]
@@ -687,16 +335,16 @@ module IRB
for k, v in sort{|a1, a2| a1[0].id2name <=> a2[0].id2name}
case k
when :MAIN_CONTEXT, :__TMP__EHV__
- array.push format("CONF[:%s]=...myself...", k.id2name)
+ array.push format("CONF[:%s]=...myself...", k.id2name)
when :PROMPT
- s = v.collect{
- |kk, vv|
- ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"}
- format(":%s=>{%s}", kk.id2name, ss.join(", "))
- }
- array.push format("CONF[:%s]={%s}", k.id2name, s.join(", "))
+ s = v.collect{
+ |kk, vv|
+ ss = vv.collect{|kkk, vvv| ":#{kkk.id2name}=>#{vvv.inspect}"}
+ format(":%s=>{%s}", kk.id2name, ss.join(", "))
+ }
+ array.push format("CONF[:%s]={%s}", k.id2name, s.join(", "))
else
- array.push format("CONF[:%s]=%s", k.id2name, v.inspect)
+ array.push format("CONF[:%s]=%s", k.id2name, v.inspect)
end
end
array.join("\n")
diff --git a/lib/irb/cmd/chws.rb b/lib/irb/cmd/chws.rb
index 1889e75d5e..65c977016b 100644
--- a/lib/irb/cmd/chws.rb
+++ b/lib/irb/cmd/chws.rb
@@ -12,7 +12,6 @@
require "irb/cmd/nop.rb"
require "irb/ext/change-ws.rb"
-# :stopdoc:
module IRB
module ExtendCommand
@@ -30,4 +29,4 @@ module IRB
end
end
end
-# :startdoc:
+
diff --git a/lib/irb/cmd/fork.rb b/lib/irb/cmd/fork.rb
index fbe5126c85..c2664626ae 100644
--- a/lib/irb/cmd/fork.rb
+++ b/lib/irb/cmd/fork.rb
@@ -11,11 +11,11 @@
@RCS_ID='-$Id$-'
-# :stopdoc:
+
module IRB
module ExtendCommand
class Fork<Nop
- def execute
+ def execute(&block)
pid = send ExtendCommand.irb_original_method_name("fork")
unless pid
class << self
@@ -34,6 +34,5 @@ module IRB
end
end
end
-# :startdoc:
diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index 76e299fc20..b946ec01fc 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -12,7 +12,6 @@ require 'rdoc/ri/driver'
require "irb/cmd/nop.rb"
-# :stopdoc:
module IRB
module ExtendCommand
class Help<Nop
@@ -27,7 +26,7 @@ module IRB
end
names.each do |name|
begin
- Ri.display_name(name.to_s)
+ Ri.get_info_for(name.to_s)
rescue RDoc::RI::Error
puts $!.message
end
@@ -38,4 +37,3 @@ module IRB
end
end
end
-# :startdoc:
diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb
index 6c9e9f67ce..2a6de21ed7 100644
--- a/lib/irb/cmd/load.rb
+++ b/lib/irb/cmd/load.rb
@@ -12,7 +12,6 @@
require "irb/cmd/nop.rb"
require "irb/ext/loader"
-# :stopdoc:
module IRB
module ExtendCommand
class Load<Nop
@@ -65,4 +64,3 @@ module IRB
end
end
-# :startdoc:
diff --git a/lib/irb/cmd/nop.rb b/lib/irb/cmd/nop.rb
index 7bd443121e..2b028975c8 100644
--- a/lib/irb/cmd/nop.rb
+++ b/lib/irb/cmd/nop.rb
@@ -8,7 +8,6 @@
#
#
#
-# :stopdoc:
module IRB
module ExtendCommand
class Nop
@@ -36,4 +35,4 @@ module IRB
end
end
end
-# :startdoc:
+
diff --git a/lib/irb/cmd/pushws.rb b/lib/irb/cmd/pushws.rb
index cee8538e3e..5fd567731c 100644
--- a/lib/irb/cmd/pushws.rb
+++ b/lib/irb/cmd/pushws.rb
@@ -12,7 +12,6 @@
require "irb/cmd/nop.rb"
require "irb/ext/workspaces.rb"
-# :stopdoc:
module IRB
module ExtendCommand
class Workspaces<Nop
@@ -36,5 +35,4 @@ module IRB
end
end
end
-# :startdoc:
diff --git a/lib/irb/cmd/subirb.rb b/lib/irb/cmd/subirb.rb
index 7363d64769..4d54a72b6f 100644
--- a/lib/irb/cmd/subirb.rb
+++ b/lib/irb/cmd/subirb.rb
@@ -11,7 +11,6 @@
require "irb/cmd/nop.rb"
require "irb/ext/multi-irb"
-# :stopdoc:
module IRB
module ExtendCommand
class IrbCommand<Nop
@@ -39,4 +38,3 @@ module IRB
end
end
end
-# :startdoc:
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb
index 3be0610c6e..adc41ecea5 100644
--- a/lib/irb/completion.rb
+++ b/lib/irb/completion.rb
@@ -9,12 +9,10 @@
require "readline"
module IRB
- module InputCompletor # :nodoc:
+ module InputCompletor
@RCS_ID='-$Id$-'
- # Set of reserved words used by Ruby, you should not use these for
- # constants or variables
ReservedWords = [
"BEGIN", "END",
"alias", "and",
@@ -44,7 +42,7 @@ module IRB
when /^((["'`]).*\2)\.([^.]*)$/
# String
receiver = $1
- message = Regexp.quote($3)
+ message = $3
candidates = String.instance_methods.collect{|m| m.to_s}
select_message(receiver, message, candidates)
@@ -79,7 +77,7 @@ module IRB
if Symbol.respond_to?(:all_symbols)
sym = $1
candidates = Symbol.all_symbols.collect{|s| ":" + s.id2name}
- candidates.grep(/^#{Regexp.quote(sym)}/)
+ candidates.grep(/^#{sym}/)
else
[]
end
@@ -101,74 +99,60 @@ module IRB
rescue Exception
candidates = []
end
- select_message(receiver, message, candidates, "::")
+ candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
- when /^(:[^:.]+)(\.|::)([^.]*)$/
+ when /^(:[^:.]+)\.([^.]*)$/
# Symbol
receiver = $1
- sep = $2
- message = Regexp.quote($3)
+ message = Regexp.quote($2)
candidates = Symbol.instance_methods.collect{|m| m.to_s}
- select_message(receiver, message, candidates, sep)
+ select_message(receiver, message, candidates)
- when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)(\.|::)([^.]*)$/
+ when /^(-?(0[dbo])?[0-9_]+(\.[0-9_]+)?([eE]-?[0-9]+)?)\.([^.]*)$/
# Numeric
receiver = $1
- sep = $5
- message = Regexp.quote($6)
+ message = Regexp.quote($5)
begin
candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
rescue Exception
candidates = []
end
- select_message(receiver, message, candidates, sep)
+ select_message(receiver, message, candidates)
- when /^(-?0x[0-9a-fA-F_]+)(\.|::)([^.]*)$/
+ when /^(-?0x[0-9a-fA-F_]+)\.([^.]*)$/
# Numeric(0xFFFF)
receiver = $1
- sep = $2
- message = Regexp.quote($3)
+ message = Regexp.quote($2)
begin
candidates = eval(receiver, bind).methods.collect{|m| m.to_s}
rescue Exception
candidates = []
end
- select_message(receiver, message, candidates, sep)
+ select_message(receiver, message, candidates)
when /^(\$[^.]*)$/
- # global var
regmessage = Regexp.new(Regexp.quote($1))
candidates = global_variables.collect{|m| m.to_s}.grep(regmessage)
# when /^(\$?(\.?[^.]+)+)\.([^.]*)$/
# when /^((\.?[^.]+)+)\.([^.]*)$/
-# when /^([^."].*)\.([^.]*)$/
- when /^([^."].*)(\.|::)([^.]*)$/
- # variable.func or func.func
+ when /^([^."].*)\.([^.]*)$/
+ # variable
receiver = $1
- sep = $2
- message = Regexp.quote($3)
+ message = Regexp.quote($2)
gv = eval("global_variables", bind).collect{|m| m.to_s}
lv = eval("local_variables", bind).collect{|m| m.to_s}
- iv = eval("instance_variables", bind).collect{|m| m.to_s}
cv = eval("self.class.constants", bind).collect{|m| m.to_s}
- if (gv | lv | iv | cv).include?(receiver) or /^[A-Z]/ =~ receiver && /\./ !~ receiver
- # foo.func and foo is var. OR
- # foo::func and foo is var. OR
- # foo::Const and foo is var. OR
+ if (gv | lv | cv).include?(receiver) or /^[A-Z]/ =~ receiver && /\./ !~ receiver
+ # foo.func and foo is local var. OR
# Foo::Bar.func
begin
- candidates = []
- rec = eval(receiver, bind)
- if sep == "::" and rec.kind_of?(Module)
- candidates = rec.constants.collect{|m| m.to_s}
- end
- candidates |= rec.methods.collect{|m| m.to_s}
+ candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
rescue Exception
candidates = []
end
@@ -181,18 +165,14 @@ module IRB
rescue Exception
name = ""
end
- begin
- next if name != "IRB::Context" and
- /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
- rescue Exception
- next
- end
+ next if name != "IRB::Context" and
+ /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
candidates.concat m.instance_methods(false).collect{|x| x.to_s}
}
candidates.sort!
candidates.uniq!
end
- select_message(receiver, message, candidates, sep)
+ select_message(receiver, message, candidates)
when /^\.([^.]*)$/
# unknown(maybe String)
@@ -204,22 +184,21 @@ module IRB
select_message(receiver, message, candidates)
else
- candidates = eval("methods | private_methods | local_variables | instance_variables | self.class.constants", bind).collect{|m| m.to_s}
+ candidates = eval("methods | private_methods | local_variables | self.class.constants", bind).collect{|m| m.to_s}
(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
end
}
- # Set of available operators in Ruby
Operators = ["%", "&", "*", "**", "+", "-", "/",
"<", "<<", "<=", "<=>", "==", "===", "=~", ">", ">=", ">>",
"[]", "[]=", "^", "!", "!=", "!~"]
- def self.select_message(receiver, message, candidates, sep = ".")
+ def self.select_message(receiver, message, candidates)
candidates.grep(/^#{message}/).collect do |e|
case e
when /^[a-zA-Z_]/
- receiver + sep + e
+ receiver + "." + e
when /^[0-9]/
when *Operators
#receiver + " " + e
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 72b36307d5..61b519170d 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -12,16 +12,13 @@ require "irb/workspace"
require "irb/inspector"
module IRB
- # A class that wraps the current state of the irb session, including the
- # configuration of IRB.conf.
class Context
- # Creates a new IRB context.
#
- # The optional +input_method+ argument:
+ # Arguments:
+ # input_method: nil -- stdin or readline
+ # String -- File
+ # other -- using this as InputMethod
#
- # +nil+:: uses stdin or Readline
- # +String+:: uses a File
- # +other+:: uses this as InputMethod
def initialize(irb, workspace = nil, input_method = nil, output_method = nil)
@irb = irb
if workspace
@@ -54,10 +51,10 @@ module IRB
self.prompt_mode = IRB.conf[:PROMPT_MODE]
- if IRB.conf[:SINGLE_IRB] or !defined?(IRB::JobManager)
+ if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
@irb_name = IRB.conf[:IRB_NAME]
else
- @irb_name = IRB.conf[:IRB_NAME]+"#"+IRB.JobManager.n_jobs.to_s
+ @irb_name = "irb#"+IRB.JobManager.n_jobs.to_s
end
@irb_path = "(" + @irb_name + ")"
@@ -100,139 +97,50 @@ module IRB
if @echo.nil?
@echo = true
end
- self.debug_level = IRB.conf[:DEBUG_LEVEL]
+ @debug_level = IRB.conf[:DEBUG_LEVEL]
end
- # The top-level workspace, see WorkSpace#main
def main
@workspace.main
end
- # The toplevel workspace, see #home_workspace
attr_reader :workspace_home
- # WorkSpace in the current context
attr_accessor :workspace
- # The current thread in this context
attr_reader :thread
- # The current input method
- #
- # Can be either StdioInputMethod, ReadlineInputMethod, FileInputMethod or
- # other specified when the context is created. See ::new for more
- # information on +input_method+.
attr_accessor :io
- # Current irb session
attr_accessor :irb
- # A copy of the default <code>IRB.conf[:AP_NAME]</code>
attr_accessor :ap_name
- # A copy of the default <code>IRB.conf[:RC]</code>
attr_accessor :rc
- # A copy of the default <code>IRB.conf[:LOAD_MODULES]</code>
attr_accessor :load_modules
- # Can be either name from <code>IRB.conf[:IRB_NAME]</code>, or the number of
- # the current job set by JobManager, such as <code>irb#2</code>
attr_accessor :irb_name
- # Can be either the #irb_name surrounded by parenthesis, or the
- # +input_method+ passed to Context.new
attr_accessor :irb_path
- # Whether +Readline+ is enabled or not.
- #
- # A copy of the default <code>IRB.conf[:USE_READLINE]</code>
- #
- # See #use_readline= for more information.
attr_reader :use_readline
- # A copy of the default <code>IRB.conf[:INSPECT_MODE]</code>
attr_reader :inspect_mode
- # A copy of the default <code>IRB.conf[:PROMPT_MODE]</code>
attr_reader :prompt_mode
- # Standard IRB prompt
- #
- # See IRB@Customizing+the+IRB+Prompt for more information.
attr_accessor :prompt_i
- # IRB prompt for continuated strings
- #
- # See IRB@Customizing+the+IRB+Prompt for more information.
attr_accessor :prompt_s
- # IRB prompt for continuated statement (e.g. immediately after an +if+)
- #
- # See IRB@Customizing+the+IRB+Prompt for more information.
attr_accessor :prompt_c
- # See IRB@Customizing+the+IRB+Prompt for more information.
attr_accessor :prompt_n
- # Can be either the default <code>IRB.conf[:AUTO_INDENT]</code>, or the
- # mode set by #prompt_mode=
- #
- # To enable auto-indentation in irb:
- #
- # IRB.conf[:AUTO_INDENT] = true
- #
- # or
- #
- # irb_context.auto_indent_mode = true
- #
- # or
- #
- # IRB.CurrentContext.auto_indent_mode = true
- #
- # See IRB@Configuration for more information.
attr_accessor :auto_indent_mode
- # The format of the return statement, set by #prompt_mode= using the
- # +:RETURN+ of the +mode+ passed to set the current #prompt_mode.
attr_accessor :return_format
- # Whether <code>^C</code> (+control-c+) will be ignored or not.
- #
- # If set to +false+, <code>^C</code> will quit irb.
- #
- # If set to +true+,
- #
- # * during input: cancel input then return to top level.
- # * during execute: abandon current execution.
attr_accessor :ignore_sigint
- # Whether <code>^D</code> (+control-d+) will be ignored or not.
- #
- # If set to +false+, <code>^D</code> will quit irb.
attr_accessor :ignore_eof
- # Whether to echo the return value to output or not.
- #
- # Uses IRB.conf[:ECHO] if available, or defaults to +true+.
- #
- # puts "hello"
- # # hello
- # #=> nil
- # IRB.CurrentContext.echo = false
- # puts "omg"
- # # omg
attr_accessor :echo
- # Whether verbose messages are displayed or not.
- #
- # A copy of the default <code>IRB.conf[:VERBOSE]</code>
attr_accessor :verbose
- # The debug level of irb
- #
- # See #debug_level= for more information.
attr_reader :debug_level
- # The limit of backtrace lines displayed as top +n+ and tail +n+.
- #
- # The default value is 16.
- #
- # Can also be set using the +--back-trace-limit+ command line option.
- #
- # See IRB@Command+line+options for more command line options.
attr_accessor :back_trace_limit
- # Alias for #use_readline
alias use_readline? use_readline
- # Alias for #rc
alias rc? rc
alias ignore_sigint? ignore_sigint
alias ignore_eof? ignore_eof
alias echo? echo
- # Returns whether messages are displayed or not.
def verbose?
if @verbose.nil?
if defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)
@@ -247,26 +155,18 @@ module IRB
end
end
- # Whether #verbose? is +true+, and +input_method+ is either
- # StdioInputMethod or ReadlineInputMethod, see #io for more information.
def prompting?
verbose? || (STDIN.tty? && @io.kind_of?(StdioInputMethod) ||
(defined?(ReadlineInputMethod) && @io.kind_of?(ReadlineInputMethod)))
end
- # The return value of the last statement evaluated.
attr_reader :last_value
- # Sets the return value from the last statement evaluated in this context
- # to #last_value.
def set_last_value(value)
@last_value = value
@workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
end
- # Sets the +mode+ of the prompt in this context.
- #
- # See IRB@Customizing+the+IRB+Prompt for more information.
def prompt_mode=(mode)
@prompt_mode = mode
pconf = IRB.conf[:PROMPT][mode]
@@ -282,42 +182,26 @@ module IRB
end
end
- # Whether #inspect_mode is set or not, see #inspect_mode= for more detail.
def inspect?
@inspect_mode.nil? or @inspect_mode
end
- # Whether #io uses a File for the +input_method+ passed when creating the
- # current context, see ::new
def file_input?
@io.class == FileInputMethod
end
- # Specifies the inspect mode with +opt+:
- #
- # +true+:: display +inspect+
- # +false+:: display +to_s+
- # +nil+:: inspect mode in non-math mode,
- # non-inspect mode in math mode
- #
- # See IRB::Inspector for more information.
- #
- # Can also be set using the +--inspect+ and +--noinspect+ command line
- # options.
- #
- # See IRB@Command+line+options for more command line options.
def inspect_mode=(opt)
- if i = Inspector::INSPECTORS[opt]
+ if i = INSPECTORS[opt]
@inspect_mode = opt
@inspect_method = i
i.init
else
case opt
when nil
- if Inspector.keys_with_inspector(Inspector::INSPECTORS[true]).include?(@inspect_mode)
+ if INSPECTORS.keys_with_inspector(INSPECTORS[true]).include?(@inspect_mode)
self.inspect_mode = false
- elsif Inspector.keys_with_inspector(Inspector::INSPECTORS[false]).include?(@inspect_mode)
+ elsif INSPECTORS.keys_with_inspector(INSPECTORS[false]).include?(@inspect_mode)
self.inspect_mode = true
else
puts "Can't switch inspect mode."
@@ -336,10 +220,10 @@ module IRB
when Inspector
prefix = "usr%d"
i = 1
- while Inspector::INSPECTORS[format(prefix, i)]; i += 1; end
+ while INSPECTORS[format(prefix, i)]; i += 1; end
@inspect_mode = format(prefix, i)
@inspect_method = opt
- Inspector.def_inspector(format(prefix, i), @inspect_method)
+ INSPECTORS.def_inspector(format(prefix, i), @inspect_method)
else
puts "Can't switch inspect mode(#{opt})."
return
@@ -349,55 +233,44 @@ module IRB
@inspect_mode
end
- # Obsolete method.
- #
- # Can be set using the +--noreadline+ and +--readline+ command line
- # options.
- #
- # See IRB@Command+line+options for more command line options.
+
def use_readline=(opt)
- print "This method is obsolete."
- print "Do nothing."
+ @use_readline = opt
+ print "use readline module\n" if @use_readline
end
- # Sets the debug level of irb
- #
- # Can also be set using the +--irb_debug+ command line option.
- #
- # See IRB@Command+line+options for more command line options.
def debug_level=(value)
@debug_level = value
RubyLex.debug_level = value
+ SLex.debug_level = value
end
- # Whether or not debug mode is enabled, see #debug_level=.
def debug?
@debug_level > 0
end
- def evaluate(line, line_no) # :nodoc:
+ def evaluate(line, line_no)
@line_no = line_no
set_last_value(@workspace.evaluate(self, line, irb_path, line_no))
# @workspace.evaluate("_ = IRB.conf[:MAIN_CONTEXT]._")
# @_ = @workspace.evaluate(line, irb_path, line_no)
end
- def inspect_last_value # :nodoc:
+ def inspect_last_value
@inspect_method.inspect_value(@last_value)
end
alias __exit__ exit
- # Exits the current session, see IRB.irb_exit
def exit(ret = 0)
IRB.irb_exit(@irb, ret)
end
- NOPRINTING_IVARS = ["@last_value"] # :nodoc:
- NO_INSPECTING_IVARS = ["@irb", "@io"] # :nodoc:
- IDNAME_IVARS = ["@prompt_mode"] # :nodoc:
+ NOPRINTING_IVARS = ["@last_value"]
+ NO_INSPECTING_IVARS = ["@irb", "@io"]
+ IDNAME_IVARS = ["@prompt_mode"]
alias __inspect__ inspect
- def inspect # :nodoc:
+ def inspect
array = []
for ivar in instance_variables.sort{|e1, e2| e1 <=> e2}
ivar = ivar.to_s
diff --git a/lib/irb/ext/change-ws.rb b/lib/irb/ext/change-ws.rb
index ce921eb5e3..dea969d384 100644
--- a/lib/irb/ext/change-ws.rb
+++ b/lib/irb/ext/change-ws.rb
@@ -9,10 +9,9 @@
#
#
-module IRB # :nodoc:
+module IRB
class Context
- # Inherited from +TOPLEVEL_BINDING+.
def home_workspace
if defined? @home_workspace
@home_workspace
@@ -21,13 +20,6 @@ module IRB # :nodoc:
end
end
- # Changes the current workspace to given object or binding.
- #
- # If the optional argument is omitted, the workspace will be
- # #home_workspace which is inherited from +TOPLEVEL_BINDING+ or the main
- # object, <code>IRB.conf[:MAIN_CONTEXT]</code> when irb was initialized.
- #
- # See IRB::WorkSpace.new for more information.
def change_workspace(*_main)
if _main.empty?
@workspace = home_workspace
diff --git a/lib/irb/ext/history.rb b/lib/irb/ext/history.rb
index 3239c57a6c..1495f9eb14 100644
--- a/lib/irb/ext/history.rb
+++ b/lib/irb/ext/history.rb
@@ -9,13 +9,12 @@
#
#
-module IRB # :nodoc:
+module IRB
class Context
NOPRINTING_IVARS.push "@eval_history_values"
- # See #set_last_value
alias _set_last_value set_last_value
def set_last_value(value)
@@ -30,17 +29,7 @@ module IRB # :nodoc:
@last_value
end
- # The command result history limit.
attr_reader :eval_history
- # Sets command result history limit.
- #
- # +no+ is an Integer or +nil+.
- #
- # Returns +no+ of history items if greater than 0.
- #
- # If +no+ is 0, the number of history items is unlimited.
- #
- # If +no+ is +nil+, execution result history isn't used (default).
def eval_history=(no)
if no
if defined?(@eval_history) && @eval_history
@@ -58,7 +47,7 @@ module IRB # :nodoc:
end
end
- class History # :nodoc:
+ class History
@RCS_ID='-$Id$-'
def initialize(size = 16)
diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb
index 6cdc8ec898..26a3203676 100644
--- a/lib/irb/ext/loader.rb
+++ b/lib/irb/ext/loader.rb
@@ -10,20 +10,15 @@
#
-module IRB # :nodoc:
- # Raised in the event of an exception in a file loaded from an Irb session
+module IRB
class LoadAbort < Exception;end
- # Provides a few commands for loading files within an irb session.
- #
- # See ExtendCommandBundle for more information.
module IrbLoader
@RCS_ID='-$Id$-'
alias ruby_load load
alias ruby_require require
- # Loads the given file similarly to Kernel#load
def irb_load(fn, priv = nil)
path = search_file_from_ruby_path(fn)
raise LoadError, "No such file to load -- #{fn}" unless path
@@ -31,7 +26,7 @@ module IRB # :nodoc:
load_file(path, priv)
end
- def search_file_from_ruby_path(fn) # :nodoc:
+ def search_file_from_ruby_path(fn)
if /^#{Regexp.quote(File::Separator)}/ =~ fn
return fn if File.exist?(fn)
return nil
@@ -45,9 +40,6 @@ module IRB # :nodoc:
return nil
end
- # Loads a given file in the current session and displays the source lines
- #
- # See Irb#suspend_input_method for more information.
def source_file(path)
irb.suspend_name(path, File.basename(path)) do
irb.suspend_input_method(FileInputMethod.new(path)) do
@@ -67,9 +59,6 @@ module IRB # :nodoc:
end
end
- # Loads the given file in the current session's context and evaluates it.
- #
- # See Irb#suspend_input_method for more information.
def load_file(path, priv = nil)
irb.suspend_name(path, File.basename(path)) do
@@ -98,7 +87,7 @@ module IRB # :nodoc:
end
end
- def old # :nodoc:
+ def old
back_io = @io
back_path = @irb_path
back_name = @irb_name
diff --git a/lib/irb/ext/math-mode.rb b/lib/irb/ext/math-mode.rb
index 067eb1e7fa..41be79841c 100644
--- a/lib/irb/ext/math-mode.rb
+++ b/lib/irb/ext/math-mode.rb
@@ -12,22 +12,11 @@ require "mathn"
module IRB
class Context
- # Returns whether bc mode is enabled.
- #
- # See #math_mode=
attr_reader :math_mode
- # Alias for #math_mode
alias math? math_mode
- # Sets bc mode, which loads +lib/mathn.rb+ so fractions or matrix are
- # available.
- #
- # Also available as the +-m+ command line option.
- #
- # See IRB@Command+line+options and the unix manpage <code>bc(1)</code> for
- # more information.
def math_mode=(opt)
- if @math_mode == true && !opt
+ if @math_mode == true && opt == false
IRB.fail CantReturnToNormalMode
return
end
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
index e49a158fa3..0152d38ffd 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -12,61 +12,44 @@ IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
require "thread"
module IRB
+ # job management class
class JobManager
@RCS_ID='-$Id$-'
- # Creates a new JobManager object
def initialize
# @jobs = [[thread, irb],...]
@jobs = []
@current_job = nil
end
- # The active irb session
attr_accessor :current_job
- # The total number of irb sessions, used to set +irb_name+ of the current
- # Context.
def n_jobs
@jobs.size
end
- # Returns the thread for the given +key+ object, see #search for more
- # information.
def thread(key)
- th, = search(key)
+ th, irb = search(key)
th
end
- # Returns the irb session for the given +key+ object, see #search for more
- # information.
def irb(key)
- _, irb = search(key)
+ th, irb = search(key)
irb
end
- # Returns the top level thread.
def main_thread
@jobs[0][0]
end
- # Returns the top level irb session.
def main_irb
@jobs[0][1]
end
- # Add the given +irb+ session to the jobs Array.
def insert(irb)
@jobs.push [Thread.current, irb]
end
- # Changes the current active irb session to the given +key+ in the jobs
- # Array.
- #
- # Raises an IrbAlreadyDead exception if the given +key+ is no longer alive.
- #
- # If the given irb session is already active, an IrbSwitchedToCurrentThread
- # exception is raised.
def switch(key)
th, irb = search(key)
IRB.fail IrbAlreadyDead unless th.alive?
@@ -77,34 +60,14 @@ module IRB
@current_job = irb(Thread.current)
end
- # Terminates the irb sessions specified by the given +keys+.
- #
- # Raises an IrbAlreadyDead exception if one of the given +keys+ is already
- # terminated.
- #
- # See Thread#exit for more information.
def kill(*keys)
for key in keys
- th, _ = search(key)
+ th, irb = search(key)
IRB.fail IrbAlreadyDead unless th.alive?
th.exit
end
end
- # Returns the associated job for the given +key+.
- #
- # If given an Integer, it will return the +key+ index for the jobs Array.
- #
- # When an instance of Irb is given, it will return the irb session
- # associated with +key+.
- #
- # If given an instance of Thread, it will return the associated thread
- # +key+ using Object#=== on the jobs Array.
- #
- # Otherwise returns the irb session with the same top-level binding as the
- # given +key+.
- #
- # Raises a NoSuchJob exception if no job can be found with the given +key+.
def search(key)
job = case key
when Integer
@@ -120,7 +83,6 @@ module IRB
job
end
- # Deletes the job at the given +key+.
def delete(key)
case key
when Integer
@@ -144,7 +106,6 @@ module IRB
@jobs.push assoc
end
- # Outputs a list of jobs, see the irb command +irb_jobs+, or +jobs+.
def inspect
ary = []
@jobs.each_index do
@@ -174,20 +135,15 @@ module IRB
@JobManager = JobManager.new
- # The current JobManager in the session
def IRB.JobManager
@JobManager
end
- # The current Context in this session
def IRB.CurrentContext
IRB.JobManager.irb(Thread.current).context
end
- # Creates a new IRB session, see Irb.new.
- #
- # The optional +file+ argument is given to Context.new, along with the
- # workspace created with the remaining arguments, see WorkSpace.new
+ # invoke multi-irb
def IRB.irb(file = nil, *main)
workspace = WorkSpace.new(*main)
parent_thread = Thread.current
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
index 7b3fcbbeec..f9c983ac11 100644
--- a/lib/irb/ext/save-history.rb
+++ b/lib/irb/ext/save-history.rb
@@ -11,31 +11,21 @@
require "readline"
module IRB
- module HistorySavingAbility # :nodoc:
+ module HistorySavingAbility
@RCS_ID='-$Id$-'
end
class Context
- def init_save_history# :nodoc:
+ def init_save_history
unless (class<<@io;self;end).include?(HistorySavingAbility)
@io.extend(HistorySavingAbility)
end
end
- # A copy of the default <code>IRB.conf[:SAVE_HISTORY]</code>
def save_history
IRB.conf[:SAVE_HISTORY]
end
- # Sets <code>IRB.conf[:SAVE_HISTORY]</code> to the given +val+ and calls
- # #init_save_history with this context.
- #
- # Will store the number of +val+ entries of history in the #history_file
- #
- # Add the following to your +.irbrc+ to change the number of history
- # entries stored to 1000:
- #
- # IRB.conf[:SAVE_HISTORY] = 1000
def save_history=(val)
IRB.conf[:SAVE_HISTORY] = val
if val
@@ -45,18 +35,16 @@ module IRB
end
end
- # A copy of the default <code>IRB.conf[:HISTORY_FILE]</code>
def history_file
IRB.conf[:HISTORY_FILE]
end
- # Set <code>IRB.conf[:HISTORY_FILE]</code> to the given +hist+.
def history_file=(hist)
IRB.conf[:HISTORY_FILE] = hist
end
end
- module HistorySavingAbility # :nodoc:
+ module HistorySavingAbility
include Readline
# def HistorySavingAbility.create_finalizer
@@ -99,18 +87,7 @@ module IRB
history_file = File.expand_path(history_file)
end
history_file = IRB.rc_file("_history") unless history_file
-
- # Change the permission of a file that already exists[BUG #7694]
- begin
- if File.stat(history_file).mode & 066 != 0
- File.chmod(0600, history_file)
- end
- rescue Errno::ENOENT
- rescue
- raise
- end
-
- open(history_file, 'w', 0600 ) do |f|
+ open(history_file, 'w' ) do |f|
hist = HISTORY.to_a
f.puts(hist[-num..-1] || hist)
end
diff --git a/lib/irb/ext/tracer.rb b/lib/irb/ext/tracer.rb
index 8c9083dbad..46a9d53a2e 100644
--- a/lib/irb/ext/tracer.rb
+++ b/lib/irb/ext/tracer.rb
@@ -23,16 +23,9 @@ module IRB
end
class Context
- # Whether Tracer is used when evaluating statements in this context.
- #
- # See +lib/tracer.rb+ for more information.
attr_reader :use_tracer
alias use_tracer? use_tracer
- # Sets whether or not to use the Tracer library when evaluating statements
- # in this context.
- #
- # See +lib/tracer.rb+ for more information.
def use_tracer=(opt)
if opt
Tracer.set_get_line_procs(@irb_path) {
@@ -48,10 +41,6 @@ module IRB
class WorkSpace
alias __evaluate__ evaluate
- # Evaluate the context of this workspace and use the Tracer library to
- # output the exact lines of code are being executed in chronological order.
- #
- # See +lib/tracer.rb+ for more information.
def evaluate(context, statements, file = nil, line = nil)
if context.use_tracer? && file != nil && line != nil
Tracer.on
diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb
index 4e98f5b7a2..64283b8989 100644
--- a/lib/irb/ext/use-loader.rb
+++ b/lib/irb/ext/use-loader.rb
@@ -19,11 +19,9 @@ end
module IRB
module ExtendCommandBundle
- # Loads the given file similarly to Kernel#load, see IrbLoader#irb_load
def irb_load(*opts, &b)
ExtendCommand::Load.execute(irb_context, *opts, &b)
end
- # Loads the given file similarly to Kernel#require
def irb_require(*opts, &b)
ExtendCommand::Require.execute(irb_context, *opts, &b)
end
@@ -33,19 +31,12 @@ module IRB
IRB.conf[:USE_LOADER] = false
- # Returns whether +irb+'s own file reader method is used by
- # +load+/+require+ or not.
- #
- # This mode is globally affected (irb-wide).
def use_loader
IRB.conf[:USE_LOADER]
end
alias use_loader? use_loader
- # Sets IRB.conf[:USE_LOADER]
- #
- # See #use_loader for more information.
def use_loader=(opt)
if IRB.conf[:USE_LOADER] != opt
diff --git a/lib/irb/ext/workspaces.rb b/lib/irb/ext/workspaces.rb
index 641befbdf3..118ea598c0 100644
--- a/lib/irb/ext/workspaces.rb
+++ b/lib/irb/ext/workspaces.rb
@@ -9,15 +9,13 @@
#
#
-module IRB # :nodoc:
+module IRB
class Context
- # Size of the current WorkSpace stack
def irb_level
workspace_stack.size
end
- # WorkSpaces in the current stack
def workspaces
if defined? @workspaces
@workspaces
@@ -26,11 +24,6 @@ module IRB # :nodoc:
end
end
- # Creates a new workspace with the given object or binding, and appends it
- # onto the current #workspaces stack.
- #
- # See IRB::Context#change_workspace and IRB::WorkSpace.new for more
- # information.
def push_workspace(*_main)
if _main.empty?
if workspaces.empty?
@@ -50,10 +43,6 @@ module IRB # :nodoc:
end
end
- # Removes the last element from the current #workspaces stack and returns
- # it, or +nil+ if the current workspace stack is empty.
- #
- # Also, see #push_workspace.
def pop_workspace
if workspaces.empty?
print "workspace stack empty\n"
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 487c0bbeff..190c49ae78 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -8,30 +8,21 @@
#
#
#
-module IRB # :nodoc:
- # Installs the default irb extensions command bundle.
+module IRB
+ #
+ # IRB extended command
+ #
module ExtendCommandBundle
- EXCB = ExtendCommandBundle # :nodoc:
+ EXCB = ExtendCommandBundle
- # See #install_alias_method.
NO_OVERRIDE = 0
- # See #install_alias_method.
OVERRIDE_PRIVATE_ONLY = 0x01
- # See #install_alias_method.
OVERRIDE_ALL = 0x02
- # Quits the current irb context
- #
- # +ret+ is the optional signal or message to send to Context#exit
- #
- # Same as <code>IRB.CurrentContext.exit</code>.
def irb_exit(ret = 0)
irb_context.exit(ret)
end
- # Displays current configuration.
- #
- # Modifing the configuration is achieved by sending a message to IRB.conf.
def irb_context
IRB.CurrentContext
end
@@ -114,33 +105,13 @@ module IRB # :nodoc:
]
- # Installs the default irb commands:
- #
- # +irb_current_working_workspace+:: Context#main
- # +irb_change_workspace+:: Context#change_workspace
- # +irb_workspaces+:: Context#workspaces
- # +irb_push_workspace+:: Context#push_workspace
- # +irb_pop_workspace+:: Context#pop_workspace
- # +irb_load+:: #irb_load
- # +irb_require+:: #irb_require
- # +irb_source+:: IrbLoader#source_file
- # +irb+:: IRB.irb
- # +irb_jobs+:: JobManager
- # +irb_fg+:: JobManager#switch
- # +irb_kill+:: JobManager#kill
- # +irb_help+:: IRB@Command+line+options
def self.install_extend_commands
for args in @EXTEND_COMMANDS
def_extend_command(*args)
end
end
- # Evaluate the given +cmd_name+ on the given +cmd_class+ Class.
- #
- # Will also define any given +aliases+ for the method.
- #
- # The optional +load_file+ parameter will be required within the method
- # definition.
+ # aliases = [commands_alias, flag], ...
def self.def_extend_command(cmd_name, cmd_class, load_file = nil, *aliases)
case cmd_class
when Symbol
@@ -180,8 +151,7 @@ module IRB # :nodoc:
end
end
- # Installs alias methods for the default irb commands, see
- # ::install_extend_commands.
+ # override = {NO_OVERRIDE, OVERRIDE_PRIVATE_ONLY, OVERRIDE_ALL}
def install_alias_method(to, from, override = NO_OVERRIDE)
to = to.id2name unless to.kind_of?(String)
from = from.id2name unless from.kind_of?(String)
@@ -202,12 +172,10 @@ module IRB # :nodoc:
end
end
- def self.irb_original_method_name(method_name) # :nodoc:
+ def self.irb_original_method_name(method_name)
"irb_" + method_name + "_org"
end
- # Installs alias methods for the default irb commands on the given object
- # using #install_alias_method.
def self.extend_object(obj)
unless (class << obj; ancestors; end).include?(EXCB)
super
@@ -220,9 +188,9 @@ module IRB # :nodoc:
install_extend_commands
end
- # Extends methods for the Context module
+ # extension support for Context
module ContextExtender
- CE = ContextExtender # :nodoc:
+ CE = ContextExtender
@EXTEND_COMMANDS = [
[:eval_history=, "irb/ext/history.rb"],
@@ -232,23 +200,12 @@ module IRB # :nodoc:
[:save_history=, "irb/ext/save-history.rb"],
]
- # Installs the default context extensions as irb commands:
- #
- # Context#eval_history=:: +irb/ext/history.rb+
- # Context#use_tracer=:: +irb/ext/tracer.rb+
- # Context#math_mode=:: +irb/ext/math-mode.rb+
- # Context#use_loader=:: +irb/ext/use-loader.rb+
- # Context#save_history=:: +irb/ext/save-history.rb+
def self.install_extend_commands
for args in @EXTEND_COMMANDS
def_extend_command(*args)
end
end
- # Evaluate the given +command+ from the given +load_file+ on the Context
- # module.
- #
- # Will also define any given +aliases+ for the method.
def self.def_extend_command(cmd_name, load_file, *aliases)
line = __LINE__; Context.module_eval %[
def #{cmd_name}(*opts, &b)
@@ -265,10 +222,7 @@ module IRB # :nodoc:
CE.install_extend_commands
end
- # A convenience module for extending Ruby methods.
module MethodExtender
- # Extends the given +base_method+ with a prefix call to the given
- # +extend_method+.
def def_pre_proc(base_method, extend_method)
base_method = base_method.to_s
extend_method = extend_method.to_s
@@ -283,8 +237,6 @@ module IRB # :nodoc:
]
end
- # Extends the given +base_method+ with a postfix call to the given
- # +extend_method+.
def def_post_proc(base_method, extend_method)
base_method = base_method.to_s
extend_method = extend_method.to_s
@@ -299,13 +251,7 @@ module IRB # :nodoc:
]
end
- # Returns a unique method name to use as an alias for the given +name+.
- #
- # Usually returns <code>#{prefix}#{name}#{postfix}<num></code>, example:
- #
- # new_alias_name('foo') #=> __alias_of__foo__
- # def bar; end
- # new_alias_name('bar') #=> __alias_of__bar__2
+ # return #{prefix}#{name}#{postfix}<num>
def new_alias_name(name, prefix = "__alias_of__", postfix = "__")
base_name = "#{prefix}#{name}#{postfix}"
all_methods = instance_methods(true) + private_instance_methods(true)
diff --git a/lib/irb/frame.rb b/lib/irb/frame.rb
index bcfa3a3140..8814b47a9d 100644
--- a/lib/irb/frame.rb
+++ b/lib/irb/frame.rb
@@ -17,17 +17,13 @@ module IRB
def_exception :FrameOverflow, "frame overflow"
def_exception :FrameUnderflow, "frame underflow"
- # Default number of stack frames
INIT_STACK_TIMES = 3
- # Default number of frames offset
CALL_STACK_OFFSET = 3
- # Creates a new stack frame
def initialize
@frames = [TOPLEVEL_BINDING] * INIT_STACK_TIMES
end
- # Used by Kernel#set_trace_func to register each event in the call stack
def trace_func(event, file, line, id, binding)
case event
when 'call', 'class'
@@ -37,37 +33,27 @@ module IRB
end
end
- # Returns the +n+ number of frames on the call stack from the last frame
- # initialized.
- #
- # Raises FrameUnderflow if there are no frames in the given stack range.
def top(n = 0)
bind = @frames[-(n + CALL_STACK_OFFSET)]
Fail FrameUnderflow unless bind
bind
end
- # Returns the +n+ number of frames on the call stack from the first frame
- # initialized.
- #
- # Raises FrameOverflow if there are no frames in the given stack range.
def bottom(n = 0)
bind = @frames[n]
Fail FrameOverflow unless bind
bind
end
- # Convenience method for Frame#bottom
+ # singleton functions
def Frame.bottom(n = 0)
@backtrace.bottom(n)
end
- # Convenience method for Frame#top
def Frame.top(n = 0)
@backtrace.top(n)
end
- # Returns the binding context of the caller from the last frame initialized
def Frame.sender
eval "self", @backtrace.top
end
diff --git a/lib/irb/help.rb b/lib/irb/help.rb
index 9fd734038f..4a308b6e46 100644
--- a/lib/irb/help.rb
+++ b/lib/irb/help.rb
@@ -12,7 +12,6 @@
require 'irb/magic-file'
module IRB
- # Outputs the irb help message, see IRB@Command+line+options.
def IRB.print_usage
lc = IRB.conf[:LC_MESSAGES]
path = lc.find("irb/help-message")
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 826bcaf3ac..2d7ff3146e 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -9,7 +9,7 @@
#
#
-module IRB # :nodoc:
+module IRB
# initialize config
def IRB.setup(ap_path)
@@ -112,10 +112,10 @@ module IRB # :nodoc:
# @CONF[:LC_MESSAGES] = "en"
@CONF[:LC_MESSAGES] = Locale.new
-
+
@CONF[:AT_EXIT] = []
-
- @CONF[:DEBUG_LEVEL] = 0
+
+ @CONF[:DEBUG_LEVEL] = 1
end
def IRB.init_error
@@ -160,7 +160,7 @@ module IRB # :nodoc:
opt = $1 || ARGV.shift
set_encoding(*opt.split(':', 2))
when "--inspect"
- if /^-/ !~ ARGV.first
+ if /^-/ !~ ARGV.first
@CONF[:INSPECT_MODE] = ARGV.shift
else
@CONF[:INSPECT_MODE] = true
@@ -197,7 +197,7 @@ module IRB # :nodoc:
@CONF[:CONTEXT_MODE] = ($1 || ARGV.shift).to_i
when "--single-irb"
@CONF[:SINGLE_IRB] = true
- when /^--irb_debug(?:=(.+))?/
+ when /^--irb_debug=(?:=(.+))?/
@CONF[:DEBUG_LEVEL] = ($1 || ARGV.shift).to_i
when "-v", "--version"
print IRB.version, "\n"
@@ -256,12 +256,7 @@ module IRB # :nodoc:
end
end
end
- case rc_file = @CONF[:RC_NAME_GENERATOR].call(ext)
- when String
- return rc_file
- else
- IRB.fail IllegalRCNameGenerator
- end
+ @CONF[:RC_NAME_GENERATOR].call ext
end
# enumerate possible rc-file base name generators
diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb
index 55363fe0c4..7227df4ca0 100644
--- a/lib/irb/input-method.rb
+++ b/lib/irb/input-method.rb
@@ -12,39 +12,34 @@ require 'irb/src_encoding'
require 'irb/magic-file'
module IRB
- STDIN_FILE_NAME = "(line)" # :nodoc:
+ #
+ # InputMethod
+ # StdioInputMethod
+ # FileInputMethod
+ # (ReadlineInputMethod)
+ #
+ STDIN_FILE_NAME = "(line)"
class InputMethod
@RCS_ID='-$Id$-'
- # Creates a new input method object
def initialize(file = STDIN_FILE_NAME)
@file_name = file
end
- # The file name of this input method, usually given during initialization.
attr_reader :file_name
- # The irb prompt associated with this input method
attr_accessor :prompt
- # Reads the next line from this input method.
- #
- # See IO#gets for more information.
def gets
IRB.fail NotImplementedError, "gets"
end
public :gets
- # Whether this input method is still readable when there is no more data to
- # read.
- #
- # See IO#eof for more information.
- def readable_after_eof?
+ def readable_atfer_eof?
false
end
end
class StdioInputMethod < InputMethod
- # Creates a new input method object
def initialize
super
@line_no = 0
@@ -53,67 +48,40 @@ module IRB
@stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
end
- # Reads the next line from this input method.
- #
- # See IO#gets for more information.
def gets
print @prompt
line = @stdin.gets
@line[@line_no += 1] = line
end
- # Whether the end of this input method has been reached, returns +true+ if
- # there is no more data to read.
- #
- # See IO#eof? for more information.
def eof?
@stdin.eof?
end
- # Whether this input method is still readable when there is no more data to
- # read.
- #
- # See IO#eof for more information.
- def readable_after_eof?
+ def readable_atfer_eof?
true
end
- # Returns the current line number for #io.
- #
- # #line counts the number of times #gets is called.
- #
- # See IO#lineno for more information.
def line(line_no)
@line[line_no]
end
- # The external encoding for standard input.
def encoding
@stdin.external_encoding
end
end
- # Use a File for IO with irb, see InputMethod
class FileInputMethod < InputMethod
- # Creates a new input method object
def initialize(file)
super
@io = IRB::MagicFile.open(file)
end
- # The file name of this input method, usually given during initialization.
attr_reader :file_name
- # Whether the end of this input method has been reached, returns +true+ if
- # there is no more data to read.
- #
- # See IO#eof? for more information.
def eof?
@io.eof?
end
- # Reads the next line from this input method.
- #
- # See IO#gets for more information.
def gets
print @prompt
l = @io.gets
@@ -121,7 +89,6 @@ module IRB
l
end
- # The external encoding for standard input.
def encoding
@io.external_encoding
end
@@ -131,7 +98,6 @@ module IRB
require "readline"
class ReadlineInputMethod < InputMethod
include Readline
- # Creates a new input method object using Readline
def initialize
super
@@ -143,9 +109,6 @@ module IRB
@stdout = IO.open(STDOUT.to_i, 'w', :external_encoding => IRB.conf[:LC_MESSAGES].encoding, :internal_encoding => "-")
end
- # Reads the next line from this input method.
- #
- # See IO#gets for more information.
def gets
Readline.input = @stdin
Readline.output = @stdout
@@ -158,32 +121,18 @@ module IRB
end
end
- # Whether the end of this input method has been reached, returns +true+
- # if there is no more data to read.
- #
- # See IO#eof? for more information.
def eof?
@eof
end
- # Whether this input method is still readable when there is no more data to
- # read.
- #
- # See IO#eof for more information.
- def readable_after_eof?
+ def readable_atfer_eof?
true
end
- # Returns the current line number for #io.
- #
- # #line counts the number of times #gets is called.
- #
- # See IO#lineno for more information.
def line(line_no)
@line[line_no]
end
- # The external encoding for standard input.
def encoding
@stdin.external_encoding
end
diff --git a/lib/irb/inspector.rb b/lib/irb/inspector.rb
index eaff44fc0b..ab5128399e 100644
--- a/lib/irb/inspector.rb
+++ b/lib/irb/inspector.rb
@@ -7,125 +7,89 @@
#
# --
#
+#
#
-#
-
-module IRB # :nodoc:
+module IRB
- # Convenience method to create a new Inspector, using the given +inspect+
- # proc, and optional +init+ proc and passes them to Inspector.new
- #
- # irb(main):001:0> ins = IRB::Inspector(proc{ |v| "omg! #{v}" })
- # irb(main):001:0> IRB.CurrentContext.inspect_mode = ins # => omg! #<IRB::Inspector:0x007f46f7ba7d28>
- # irb(main):001:0> "what?" #=> omg! what?
- #
def IRB::Inspector(inspect, init = nil)
Inspector.new(inspect, init)
end
- # An irb inspector
- #
- # In order to create your own custom inspector there are two things you
- # should be aware of:
- #
- # Inspector uses #inspect_value, or +inspect_proc+, for output of return values.
- #
- # This also allows for an optional #init+, or +init_proc+, which is called
- # when the inspector is activated.
- #
- # Knowing this, you can create a rudimentary inspector as follows:
- #
- # irb(main):001:0> ins = IRB::Inspector.new(proc{ |v| "omg! #{v}" })
- # irb(main):001:0> IRB.CurrentContext.inspect_mode = ins # => omg! #<IRB::Inspector:0x007f46f7ba7d28>
- # irb(main):001:0> "what?" #=> omg! what?
- #
class Inspector
- # Default inspectors available to irb, this includes:
- #
- # +:pp+:: Using Kernel#pretty_inspect
- # +:yaml+:: Using YAML.dump
- # +:marshal+:: Using Marshal.dump
- INSPECTORS = {}
-
- # Determines the inspector to use where +inspector+ is one of the keys passed
- # during inspector definition.
- def self.keys_with_inspector(inspector)
- INSPECTORS.select{|k,v| v == inspector}.collect{|k, v| k}
- end
-
- # Example
- #
- # Inspector.def_inspector(key, init_p=nil){|v| v.inspect}
- # Inspector.def_inspector([key1,..], init_p=nil){|v| v.inspect}
- # Inspector.def_inspector(key, inspector)
- # Inspector.def_inspector([key1,...], inspector)
- def self.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
- INSPECTORS[key] = inspector
- INSPECTORS[key.to_s] = inspector
- when String
- INSPECTORS[key] = inspector
- INSPECTORS[key.intern] = inspector
- else
- INSPECTORS[key] = inspector
- end
- end
-
- # Creates a new inspector object, using the given +inspect_proc+ when
- # output return values in irb.
def initialize(inspect_proc, init_proc = nil)
@init = init_proc
@inspect = inspect_proc
end
- # Proc to call when the inspector is activated, good for requiring
- # dependant libraries.
def init
@init.call if @init
end
- # Proc to call when the input is evaluated and output in irb.
def inspect_value(v)
@inspect.call(v)
end
end
- Inspector.def_inspector([false, :to_s, :raw]){|v| v.to_s}
- Inspector.def_inspector([true, :p, :inspect]){|v|
+ 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
}
- Inspector.def_inspector([:pp, :pretty_inspect], proc{require "pp"}){|v| v.pretty_inspect.chomp}
- Inspector.def_inspector([:yaml, :YAML], proc{require "yaml"}){|v|
+ 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
@@ -134,12 +98,12 @@ module IRB # :nodoc:
end
}
- Inspector.def_inspector([:marshal, :Marshal, :MARSHAL, Marshal]){|v|
+ INSPECTORS.def_inspector([:marshal, :Marshal, :MARSHAL, Marshal]){|v|
Marshal.dump(v)
}
end
-
-
+
+
diff --git a/lib/irb/lc/.document b/lib/irb/lc/.document
deleted file mode 100644
index 524bb9430b..0000000000
--- a/lib/irb/lc/.document
+++ /dev/null
@@ -1,4 +0,0 @@
-# hide help-message files which contain usage information
-error.rb
-ja/encoding_aliases.rb
-ja/error.rb
diff --git a/lib/irb/lc/error.rb b/lib/irb/lc/error.rb
index c0c6c30d79..742821e3af 100644
--- a/lib/irb/lc/error.rb
+++ b/lib/irb/lc/error.rb
@@ -10,7 +10,6 @@
#
require "e2mmap"
-# :stopdoc:
module IRB
# exceptions
@@ -25,7 +24,6 @@ module IRB
def_exception :CantShiftToMultiIrbMode, "Can't shift to multi irb mode."
def_exception :CantChangeBinding, "Can't change binding to (%s)."
def_exception :UndefinedPromptMode, "Undefined prompt mode(%s)."
- def_exception :IllegalRCGenerator, 'Define illegal RC_NAME_GENERATOR.'
end
-# :startdoc:
+
diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message
index c01cdaab93..18aea149bc 100644
--- a/lib/irb/lc/help-message
+++ b/lib/irb/lc/help-message
@@ -1,16 +1,16 @@
# -*- coding: US-ASCII -*-
#
-# irb/lc/help-message.rb -
+# irb/lc/help-message.rb -
# $Release Version: 0.9.6$
# $Revision$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
Usage: irb.rb [options] [programfile] [arguments]
- -f Suppress read of ~/.irbrc
+ -f Suppress read of ~/.irbrc
-m Bc mode (load mathn, fraction or matrix are available)
-d Set $DEBUG to true (same as `ruby -d')
-r load-module Same as `ruby -r'
@@ -27,14 +27,14 @@ Usage: irb.rb [options] [programfile] [arguments]
--prompt-mode prompt-mode
Switch prompt mode. Pre-defined prompt modes are
`default', `simple', `xmp' and `inf-ruby'
- --inf-ruby-mode Use prompt appropriate for inf-ruby-mode on emacs.
- Suppresses --readline.
+ --inf-ruby-mode Use prompt appropriate for inf-ruby-mode on emacs.
+ Suppresses --readline.
--simple-prompt Simple prompt mode
--noprompt No prompt mode
--tracer Display trace for each execution of commands.
--back-trace-limit n
Display backtrace top n and tail n. The default
- value is 16.
+ 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
index 5bef32e20e..a713dff4be 100644
--- a/lib/irb/lc/ja/encoding_aliases.rb
+++ b/lib/irb/lc/ja/encoding_aliases.rb
@@ -1,4 +1,3 @@
-# :stopdoc:
module IRB
class Locale
@@legacy_encoding_alias_map = {
@@ -7,4 +6,3 @@ module IRB
}.freeze
end
end
-# :startdoc:
diff --git a/lib/irb/lc/ja/error.rb b/lib/irb/lc/ja/error.rb
index 4f09d781cb..9a7670f459 100644
--- a/lib/irb/lc/ja/error.rb
+++ b/lib/irb/lc/ja/error.rb
@@ -10,7 +10,6 @@
#
require "e2mmap"
-# :stopdoc:
module IRB
# exceptions
extend Exception2MessageMapper
@@ -24,7 +23,5 @@ module IRB
def_exception :CantShiftToMultiIrbMode, 'multi-irb modeã«ç§»ã‚Œã¾ã›ã‚“.'
def_exception :CantChangeBinding, 'ãƒã‚¤ãƒ³ãƒ‡ã‚£ãƒ³ã‚°(%s)ã«å¤‰æ›´ã§ãã¾ã›ã‚“.'
def_exception :UndefinedPromptMode, 'プロンプトモード(%s)ã¯å®šç¾©ã•れã¦ã„ã¾ã›ã‚“.'
- def_exception :IllegalRCNameGenerator, 'RC_NAME_GENERATORãŒæ­£ã—ã定義ã•れã¦ã„ã¾ã›ã‚“.'
end
-# :startdoc:
# vim:fileencoding=utf-8
diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message
index 57e8f23edf..78ba72ed35 100644
--- a/lib/irb/lc/ja/help-message
+++ b/lib/irb/lc/ja/help-message
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
-# irb/lc/ja/help-message.rb -
+# irb/lc/ja/help-message.rb -
# $Release Version: 0.9.6$
# $Revision$
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
-#
+#
#
Usage: irb.rb [options] [programfile] [arguments]
-f ~/.irbrc を読ã¿è¾¼ã¾ãªã„.
@@ -18,14 +18,14 @@ Usage: irb.rb [options] [programfile] [arguments]
-E enc ruby -E ã¨åŒã˜.
-w ruby -w ã¨åŒã˜.
-W[level=2] ruby -W ã¨åŒã˜.
- --inspect çµæžœå‡ºåŠ›ã«inspectを用ã„ã‚‹(bcモード以外ã¯ãƒ‡ãƒ•ォルト).
+ --inspect çµæžœå‡ºåŠ›ã«inspectを用ã„ã‚‹(bcモード以外ã¯ãƒ‡ãƒ•ォルト).
--noinspect çµæžœå‡ºåŠ›ã«inspectを用ã„ãªã„.
--readline readlineライブラリを利用ã™ã‚‹.
- --noreadline readlineライブラリを利用ã—ãªã„.
+ --noreadline readlineライブラリを利用ã—ãªã„.
--prompt prompt-mode/--prompt-mode prompt-mode
プロンプトモードを切替ãˆã¾ã™. ç¾åœ¨å®šç¾©ã•れã¦ã„るプ
ロンプトモードã¯, default, simple, xmp, inf-rubyãŒ
- 用æ„ã•れã¦ã„ã¾ã™.
+ 用æ„ã•れã¦ã„ã¾ã™.
--inf-ruby-mode emacsã®inf-ruby-mode用ã®ãƒ—ロンプト表示を行ãªã†. 特
ã«æŒ‡å®šãŒãªã„é™ã‚Š, readlineライブラリã¯ä½¿ã‚ãªããªã‚‹.
--simple-prompt éžå¸¸ã«ã‚·ãƒ³ãƒ—ルãªãƒ—ロンプトを用ã„るモードã§ã™.
@@ -33,7 +33,7 @@ Usage: irb.rb [options] [programfile] [arguments]
--tracer コマンド実行時ã«ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’行ãªã†.
--back-trace-limit n
ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹è¡¨ç¤ºã‚’ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã®é ­ã‹ã‚‰ n, 後ã‚
- ã‹ã‚‰nã ã‘行ãªã†. デフォルトã¯16
+ ã‹ã‚‰nã ã‘行ãªã†. デフォルトã¯16
--irb_debug n irbã®ãƒ‡ãƒãƒƒã‚°ãƒ‡ãƒãƒƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’nã«è¨­å®šã™ã‚‹(利用ã—ãª
ã„æ–¹ãŒç„¡é›£ã§ã—ょã†).
-v, --version irbã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’表示ã™ã‚‹
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index accce9e13f..77cc06ed30 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -8,7 +8,7 @@
#
#
#
-module IRB # :nodoc:
+module IRB
class Locale
@RCS_ID='-$Id$-'
@@ -136,7 +136,7 @@ module IRB # :nodoc:
end
# @param paths load paths in which IRB find a localized file.
- # @param dir directory
+ # @param dir directory
# @param file basename to be localized
#
# typically, for the parameters and a <path> in paths, it searches
diff --git a/lib/irb/magic-file.rb b/lib/irb/magic-file.rb
index 339ed60b6b..861262050e 100644
--- a/lib/irb/magic-file.rb
+++ b/lib/irb/magic-file.rb
@@ -8,10 +8,9 @@ module IRB
line = io.gets
line = io.gets if line[0,2] == "#!"
encoding = detect_encoding(line)
- internal_encoding = encoding
encoding ||= default_src_encoding
io.rewind
- io.set_encoding(encoding, internal_encoding)
+ io.set_encoding(encoding, nil)
if block_given?
begin
diff --git a/lib/irb/notifier.rb b/lib/irb/notifier.rb
index effb12c30d..d20679da4a 100644
--- a/lib/irb/notifier.rb
+++ b/lib/irb/notifier.rb
@@ -13,7 +13,6 @@ require "e2mmap"
require "irb/output-method"
module IRB
- # An output formatter used internally by the lexer.
module Notifier
extend Exception2MessageMapper
def_exception :ErrUndefinedNotifier,
@@ -21,100 +20,59 @@ module IRB
def_exception :ErrUnrecognizedLevel,
"unrecognized notifier level: %s is specified"
- # Define a new Notifier output source, returning a new CompositeNotifier
- # with the given +prefix+ and +output_method+.
- #
- # The optional +prefix+ will be appended to all objects being inspected
- # during output, using the given +output_method+ as the output source. If
- # no +output_method+ is given, StdioOuputMethod will be used, and all
- # expressions will be sent directly to STDOUT without any additional
- # formatting.
def def_notifier(prefix = "", output_method = StdioOutputMethod.new)
CompositeNotifier.new(prefix, output_method)
end
module_function :def_notifier
- # An abstract class, or superclass, for CompositeNotifier and
- # LeveledNotifier to inherit. It provides several wrapper methods for the
- # OutputMethod object used by the Notifier.
class AbstractNotifier
- # Creates a new Notifier object
def initialize(prefix, base_notifier)
@prefix = prefix
@base_notifier = base_notifier
end
- # The +prefix+ for this Notifier, which is appended to all objects being
- # inspected during output.
attr_reader :prefix
- # A wrapper method used to determine whether notifications are enabled.
- #
- # Defaults to +true+.
def notify?
true
end
- # See OutputMethod#print for more detail.
def print(*opts)
@base_notifier.print prefix, *opts if notify?
end
- # See OutputMethod#printn for more detail.
def printn(*opts)
@base_notifier.printn prefix, *opts if notify?
end
- # See OutputMethod#printf for more detail.
def printf(format, *opts)
@base_notifier.printf(prefix + format, *opts) if notify?
end
- # See OutputMethod#puts for more detail.
def puts(*objs)
if notify?
@base_notifier.puts(*objs.collect{|obj| prefix + obj.to_s})
end
end
- # Same as #ppx, except it uses the #prefix given during object
- # initialization.
- # See OutputMethod#ppx for more detail.
def pp(*objs)
if notify?
@base_notifier.ppx @prefix, *objs
end
end
- # Same as #pp, except it concatenates the given +prefix+ with the #prefix
- # given during object initialization.
- #
- # See OutputMethod#ppx for more detail.
def ppx(prefix, *objs)
if notify?
@base_notifier.ppx @prefix+prefix, *objs
end
end
- # Execute the given block if notifications are enabled.
def exec_if
yield(@base_notifier) if notify?
end
end
- # A class that can be used to create a group of notifier objects with the
- # intent of representing a leveled notification system for irb.
- #
- # This class will allow you to generate other notifiers, and assign them
- # the appropriate level for output.
- #
- # The Notifier class provides a class-method Notifier.def_notifier to
- # create a new composite notifier. Using the first composite notifier
- # object you create, sibling notifiers can be initialized with
- # #def_notifier.
class CompositeNotifier<AbstractNotifier
- # Create a new composite notifier object with the given +prefix+, and
- # +base_notifier+ to use for output.
def initialize(prefix, base_notifier)
super
@@ -122,39 +80,17 @@ module IRB
@level_notifier = D_NOMSG
end
- # List of notifiers in the group
attr_reader :notifiers
- # Creates a new LeveledNotifier in the composite #notifiers group.
- #
- # The given +prefix+ will be assigned to the notifier, and +level+ will
- # be used as the index of the #notifiers Array.
- #
- # This method returns the newly created instance.
def def_notifier(level, prefix = "")
notifier = LeveledNotifier.new(self, level, prefix)
@notifiers[level] = notifier
notifier
end
- # Returns the leveled notifier for this object
attr_reader :level_notifier
alias level level_notifier
- # Sets the leveled notifier for this object.
- #
- # When the given +value+ is an instance of AbstractNotifier,
- # #level_notifier is set to the given object.
- #
- # When an Integer is given, #level_notifier is set to the notifier at the
- # index +value+ in the #notifiers Array.
- #
- # If no notifier exists at the index +value+ in the #notifiers Array, an
- # ErrUndefinedNotifier exception is raised.
- #
- # An ErrUnrecognizedLevel exception is raised if the given +value+ is not
- # found in the existing #notifiers Array, or an instance of
- # AbstractNotifier
def level_notifier=(value)
case value
when AbstractNotifier
@@ -171,61 +107,38 @@ module IRB
alias level= level_notifier=
end
- # A leveled notifier is comparable to the composite group from
- # CompositeNotifier#notifiers.
class LeveledNotifier<AbstractNotifier
include Comparable
- # Create a new leveled notifier with the given +base+, and +prefix+ to
- # send to AbstractNotifier.new
- #
- # The given +level+ is used to compare other leveled notifiers in the
- # CompositeNotifier group to determine whether or not to output
- # notifications.
def initialize(base, level, prefix)
super(prefix, base)
@level = level
end
- # The current level of this notifier object
attr_reader :level
- # Compares the level of this notifier object with the given +other+
- # notifier.
- #
- # See the Comparable module for more information.
def <=>(other)
@level <=> other.level
end
- # Whether to output messages to the output method, depending on the level
- # of this notifier object.
def notify?
@base_notifier.level >= self
end
end
- # NoMsgNotifier is a LeveledNotifier that's used as the default notifier
- # when creating a new CompositeNotifier.
- #
- # This notifier is used as the +zero+ index, or level +0+, for
- # CompositeNotifier#notifiers, and will not output messages of any sort.
class NoMsgNotifier<LeveledNotifier
- # Creates a new notifier that should not be used to output messages.
def initialize
@base_notifier = nil
@level = 0
@prefix = ""
end
- # Ensures notifications are ignored, see AbstractNotifier#notify? for
- # more information.
def notify?
false
end
end
- D_NOMSG = NoMsgNotifier.new # :nodoc:
+ D_NOMSG = NoMsgNotifier.new
end
end
diff --git a/lib/irb/output-method.rb b/lib/irb/output-method.rb
index aae9e2294d..9cccda1c6a 100644
--- a/lib/irb/output-method.rb
+++ b/lib/irb/output-method.rb
@@ -12,27 +12,21 @@
require "e2mmap"
module IRB
- # An abstract output class for IO in irb. This is mainly used internally by
- # IRB::Notifier. You can define your own output method to use with Irb.new,
- # or Context.new
- class OutputMethod
- extend Exception2MessageMapper
- def_exception :NotImplementedError, "Need to define `%s'"
+ # OutputMethod
+ # StdioOutputMethod
+ class OutputMethod
+ @RCS_ID='-$Id$-'
- # Open this method to implement your own output method, raises a
- # NotImplementedError if you don't define #print in your own class.
def print(*opts)
- OutputMethod.Raise NotImplementedError, "print"
+ IRB.fail NotImplementError, "print"
end
- # Prints the given +opts+, with a newline delimiter.
def printn(*opts)
print opts.join(" "), "\n"
end
- # Extends IO#printf to format the given +opts+ for Kernel#sprintf using
- # #parse_printf_format
+ # extend printf
def printf(format, *opts)
if /(%*)%I/ =~ format
format, opts = parse_printf_format(format, opts)
@@ -40,22 +34,16 @@ module IRB
print sprintf(format, *opts)
end
- # Returns an array of the given +format+ and +opts+ to be used by
- # Kernel#sprintf, if there was a successful Regexp match in the given
- # +format+ from #printf
- #
- # %
- # <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%]
+ # %
+ # <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%]
def parse_printf_format(format, opts)
return format, opts if $1.size % 2 == 1
end
- # Calls #print on each element in the given +objs+, followed by a newline
- # character.
def puts(*objs)
for obj in objs
print(*obj)
@@ -63,27 +51,17 @@ module IRB
end
end
- # Prints the given +objs+ calling Object#inspect on each.
- #
- # See #puts for more detail.
def pp(*objs)
puts(*objs.collect{|obj| obj.inspect})
end
- # Prints the given +objs+ calling Object#inspect on each and appending the
- # given +prefix+.
- #
- # See #puts for more detail.
def ppx(prefix, *objs)
puts(*objs.collect{|obj| prefix+obj.inspect})
end
end
- # A standard output printer
class StdioOutputMethod<OutputMethod
- # Prints the given +opts+ to standard output, see IO#print for more
- # information.
def print(*opts)
STDOUT.print(*opts)
end
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 4a700b3324..6a5859111d 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -13,7 +13,6 @@ require "e2mmap"
require "irb/slex"
require "irb/ruby-token"
-# :stopdoc:
class RubyLex
@RCS_ID='-$Id$-'
@@ -54,7 +53,6 @@ class RubyLex
@lex_state = EXPR_BEG
@space_seen = false
@here_header = false
- @post_symbeg = false
@continue = false
@line = ""
@@ -88,8 +86,8 @@ class RubyLex
end
def get_readed
- if idx = @readed.rindex("\n")
- @base_char_no = @readed.size - (idx + 1)
+ if idx = @readed.reverse.index("\n")
+ @base_char_no = idx
else
@base_char_no += @readed.size
end
@@ -150,11 +148,11 @@ class RubyLex
end
c = c2 unless c
@rests.unshift c #c =
- @seek -= 1
+ @seek -= 1
if c == "\n"
@line_no -= 1
- if idx = @readed.rindex("\n")
- @char_no = idx + 1
+ if idx = @readed.reverse.index("\n")
+ @char_no = @readed.size - idx
else
@char_no = @base_char_no + @readed.size
end
@@ -219,8 +217,6 @@ class RubyLex
@here_header = false
@continue = false
- @post_symbeg = false
-
prompt
@line = ""
@@ -243,7 +239,7 @@ class RubyLex
end
end
if @line != "\n"
- @line.force_encoding(@io.encoding)
+ @line.force_encoding(@io.encoding)
yield @line, @exp_line_no
end
break unless l
@@ -289,8 +285,6 @@ class RubyLex
begin
tk = @OP.match(self)
@space_seen = tk.kind_of?(TkSPACE)
- @lex_state = EXPR_END if @post_symbeg && tk.kind_of?(TkOp)
- @post_symbeg = tk.kind_of?(TkSYMBEG)
rescue SyntaxError
raise if @exception_on_syntax_error
tk = TkError.new(@seek, @line_no, @char_no)
@@ -317,8 +311,6 @@ class RubyLex
"r" => "/",
"w" => "]",
"W" => "]",
- "i" => "]",
- "I" => "]",
"s" => ":"
}
@@ -547,7 +539,7 @@ class RubyLex
@lex_state = EXPR_BEG
Token(TkCOLON)
else
- @lex_state = EXPR_FNAME
+ @lex_state = EXPR_FNAME;
Token(TkSYMBEG)
end
end
@@ -631,7 +623,7 @@ class RubyLex
tk_c = TkLPAREN
end
@indent_stack.push tk_c
- Token(tk_c)
+ tk = Token(tk_c)
end
@OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
@@ -912,25 +904,10 @@ class RubyLex
end
@here_header = false
-# while l = gets
-# l = l.sub(/(:?\r)?\n\z/, '')
-# if (indent ? l.strip : l) == quoted
-# break
-# end
-# end
-
- line = ""
- while ch = getc
- if ch == "\n"
- if line == quoted
- break
- end
- line = ""
- else
- line.concat ch unless indent && line == "" && /\s/ =~ ch
- if @ltype != "'" && ch == "#" && peek(0) == "{"
- identify_string_dvar
- end
+ while l = gets
+ l = l.sub(/(:?\r)?\n\z/, '')
+ if (indent ? l.strip : l) == quoted
+ break
end
end
@@ -1091,7 +1068,7 @@ class RubyLex
end
end
if @ltype == "/"
- while /[imxoesun]/ =~ peek(0)
+ while peek(0) =~ /i|m|x|o|e|s|u|n/
getc
end
end
@@ -1123,7 +1100,7 @@ class RubyLex
@indent = 0
@indent_stack = []
@lex_state = EXPR_BEG
-
+
loop do
@continue = false
prompt
@@ -1142,7 +1119,7 @@ class RubyLex
@quoted = reserve_quoted
end
end
-
+
def identify_comment
@ltype = "#"
@@ -1208,4 +1185,3 @@ class RubyLex
end
end
end
-# :startdoc:
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 2c7565dbfc..9b06eab21b 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -8,7 +8,6 @@
#
#
#
-# :stopdoc:
module RubyToken
EXPR_BEG = :EXPR_BEG
EXPR_MID = :EXPR_MID
@@ -18,6 +17,11 @@ module RubyToken
EXPR_DOT = :EXPR_DOT
EXPR_CLASS = :EXPR_CLASS
+ # for ruby 1.4X
+ if !defined?(Symbol)
+ Symbol = Integer
+ end
+
class Token
def initialize(seek, line_no, char_no)
@seek = seek
@@ -264,4 +268,3 @@ module RubyToken
def_token(*defs)
end
end
-# :startdoc:
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
index 09c1c02ebc..fac62bfd93 100644
--- a/lib/irb/slex.rb
+++ b/lib/irb/slex.rb
@@ -12,7 +12,6 @@
require "e2mmap"
require "irb/notifier"
-# :stopdoc:
module IRB
class SLex
@RCS_ID='-$Id$-'
@@ -36,7 +35,7 @@ module IRB
D_DETAIL.pp token
postproc = block if block_given?
- create(token, preproc, postproc)
+ node = create(token, preproc, postproc)
end
def def_rules(*tokens, &block)
@@ -76,7 +75,7 @@ module IRB
return @head.match_io(token)
end
ret = @head.match(token)
- D_DETAIL.exec_if{D_DETAIL.printf "match end: %s:%s\n", ret, token.inspect}
+ D_DETAIL.exec_if{D_DEATIL.printf "match end: %s:%s\n", ret, token.inspect}
ret
end
@@ -244,7 +243,6 @@ module IRB
end
end
end
-# :startdoc:
if $0 == __FILE__
# Tracer.on
diff --git a/lib/irb/version.rb b/lib/irb/version.rb
index bb998db3dd..621a127ebd 100644
--- a/lib/irb/version.rb
+++ b/lib/irb/version.rb
@@ -9,7 +9,7 @@
#
#
-module IRB # :nodoc:
+module IRB
@RELEASE_VERSION = "0.9.6"
@LAST_UPDATE_DATE = "09/06/30"
end
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
index 65214a2217..edc0d3b147 100644
--- a/lib/irb/workspace.rb
+++ b/lib/irb/workspace.rb
@@ -8,11 +8,9 @@
#
#
#
-module IRB # :nodoc:
+module IRB
class WorkSpace
- # Creates a new workspace.
- #
- # set self to main if specified, otherwise
+ # create new workspace. set self to main if specified, otherwise
# inherit main from TOPLEVEL_BINDING.
def initialize(*main)
if main[0].kind_of?(Binding)
@@ -40,7 +38,7 @@ EOF
unless defined? BINDING_QUEUE
require "thread"
- IRB.const_set(:BINDING_QUEUE, SizedQueue.new(1))
+ IRB.const_set("BINDING_QUEUE", SizedQueue.new(1))
Thread.abort_on_exception = true
Thread.start do
eval "require \"irb/ws-for-case-2\"", TOPLEVEL_BINDING, __FILE__, __LINE__
@@ -50,7 +48,7 @@ EOF
@binding = BINDING_QUEUE.pop
when 3 # binging in function on TOPLEVEL_BINDING(default)
- @binding = eval("def irb_binding; private; binding; end; irb_binding",
+ @binding = eval("def irb_binding; binding; end; irb_binding",
TOPLEVEL_BINDING,
__FILE__,
__LINE__ - 3)
@@ -75,13 +73,9 @@ EOF
eval("_=nil", @binding)
end
- # The Binding of this workspace
attr_reader :binding
- # The top-level workspace of this context, also available as
- # <code>IRB.conf[:__MAIN__]</code>
attr_reader :main
- # Evaluate the given +statements+ within the context of this workspace.
def evaluate(context, statements, file = __FILE__, line = __LINE__)
eval(statements, @binding, file, line)
end
diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb
index 9f3af49f30..bb3932ad62 100644
--- a/lib/irb/ws-for-case-2.rb
+++ b/lib/irb/ws-for-case-2.rb
@@ -10,5 +10,5 @@
#
while true
- IRB::BINDING_QUEUE.push _ = binding
+ IRB::BINDING_QUEUE.push b = binding
end
diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb
index 947d2cf5a2..bcef964020 100644
--- a/lib/irb/xmp.rb
+++ b/lib/irb/xmp.rb
@@ -12,46 +12,9 @@
require "irb"
require "irb/frame"
-# An example printer for irb.
-#
-# It's much like the standard library PrettyPrint, that shows the value of each
-# expression as it runs.
-#
-# In order to use this library, you must first require it:
-#
-# require 'irb/xmp'
-#
-# Now, you can take advantage of the Object#xmp convenience method.
-#
-# xmp <<END
-# foo = "bar"
-# baz = 42
-# END
-# #=> foo = "bar"
-# #==>"bar"
-# #=> baz = 42
-# #==>42
-#
-# You can also create an XMP object, with an optional binding to print
-# expressions in the given binding:
-#
-# ctx = binding
-# x = XMP.new ctx
-# x.puts
-# #=> today = "a good day"
-# #==>"a good day"
-# ctx.eval 'today # is what?'
-# #=> "a good day"
class XMP
@RCS_ID='-$Id$-'
- # Creates a new XMP object.
- #
- # The top-level binding or, optional +bind+ parameter will be used when
- # creating the workspace. See WorkSpace.new for more information.
- #
- # This uses the +:XMP+ prompt mode, see IRB@Customizing+the+IRB+Prompt for
- # full detail.
def initialize(bind = nil)
IRB.init_config(nil)
#IRB.parse_opts
@@ -69,17 +32,6 @@ class XMP
IRB.conf[:MAIN_CONTEXT] = @irb.context
end
- # Evaluates the given +exps+, for example:
- #
- # require 'irb/xmp'
- # x = XMP.new
- #
- # x.puts '{:a => 1, :b => 2, :c => 3}'
- # #=> {:a => 1, :b => 2, :c => 3}
- # # ==>{:a=>1, :b=>2, :c=>3}
- # x.puts 'foo = "bar"'
- # # => foo = "bar"
- # # ==>"bar"
def puts(exps)
@io.puts exps
@@ -99,22 +51,16 @@ class XMP
end
end
- # A custom InputMethod class used by XMP for evaluating string io.
class StringInputMethod < IRB::InputMethod
- # Creates a new StringInputMethod object
def initialize
super
@exps = []
end
- # Whether there are any expressions left in this printer.
def eof?
@exps.empty?
end
- # Reads the next expression from this printer.
- #
- # See IO#gets for more information.
def gets
while l = @exps.shift
next if /^\s+$/ =~ l
@@ -125,10 +71,6 @@ class XMP
l
end
- # Concatenates all expressions in this printer, separated by newlines.
- #
- # An Encoding::CompatibilityError is raised of the given +exps+'s encoding
- # doesn't match the previous expression evaluated.
def puts(exps)
if @encoding and exps.encoding != @encoding
enc = Encoding.compatible?(@exps.join("\n"), exps)
@@ -143,28 +85,10 @@ class XMP
@exps.concat exps.split(/\n/)
end
- # Returns the encoding of last expression printed by #puts.
attr_reader :encoding
end
end
-# A convenience method that's only available when the you require the IRB::XMP standard library.
-#
-# Creates a new XMP object, using the given expressions as the +exps+
-# parameter, and optional binding as +bind+ or uses the top-level binding. Then
-# evaluates the given expressions using the +:XMP+ prompt mode.
-#
-# For example:
-#
-# require 'irb/xmp'
-# ctx = binding
-# xmp 'foo = "bar"', ctx
-# #=> foo = "bar"
-# #==>"bar"
-# ctx.eval 'foo'
-# #=> "bar"
-#
-# See XMP.new for more information.
def xmp(exps, bind = nil)
bind = IRB::Frame.top(1) unless bind
xmp = XMP.new(bind)
diff --git a/lib/logger.rb b/lib/logger.rb
index c0a64c0dda..6c33f7b3be 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -1,80 +1,66 @@
# logger.rb - simple logging utility
-# Copyright (C) 2000-2003, 2005, 2008, 2011 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2000-2003, 2005, 2008 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
#
+# Author:: NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
# Documentation:: NAKAMURA, Hiroshi and Gavin Sinclair
# License::
# 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.
# Revision:: $Id$
#
-# A simple system for logging messages. See Logger for more documentation.
+# See Logger for documentation.
+
require 'monitor'
+
# == Description
#
# The Logger class provides a simple but sophisticated logging utility that
-# you can use to output messages.
-#
-# The messages have associated levels, such as +INFO+ or +ERROR+ that indicate
-# their importance. You can then give the Logger a level, and only messages
-# at that level or higher will be printed.
-#
-# The levels are:
-#
-# +UNKNOWN+:: An unknown message that should always be logged.
-# +FATAL+:: An unhandleable error that results in a program crash.
-# +ERROR+:: A handleable error condition.
-# +WARN+:: A warning.
-# +INFO+:: Generic (useful) information about system operation.
-# +DEBUG+:: Low-level information for developers.
-#
-# For instance, in a production system, you may have your Logger set to
-# +INFO+ or even +WARN+.
-# When you are developing the system, however, you probably
-# want to know about the program's internal state, and would set the Logger to
+# anyone can use because it's included in the Ruby 1.8.x standard library.
+#
+# The HOWTOs below give a code-based overview of Logger's usage, but the basic
+# concept is as follows. You create a Logger object (output to a file or
+# elsewhere), and use it to log messages. The messages will have varying
+# levels (+info+, +error+, etc), reflecting their varying importance. The
+# levels, and their meanings, are:
+#
+# +FATAL+:: an unhandleable error that results in a program crash
+# +ERROR+:: a handleable error condition
+# +WARN+:: a warning
+# +INFO+:: generic (useful) information about system operation
+# +DEBUG+:: low-level information for developers
+#
+# So each message has a level, and the Logger itself has a level, which acts
+# as a filter, so you can control the amount of information emitted from the
+# logger without having to remove actual messages.
+#
+# For instance, in a production system, you may have your logger(s) set to
+# +INFO+ (or +WARN+ if you don't want the log files growing large with
+# repetitive information). When you are developing it, though, you probably
+# want to know about the program's internal state, and would set them to
# +DEBUG+.
#
-# *Note*: Logger does not escape or sanitize any messages passed to it.
-# Developers should be aware of when potentially malicious data (user-input)
-# is passed to Logger, and manually escape the untrusted data:
-#
-# logger.info("User-input: #{input.dump}")
-# logger.info("User-input: %p" % input)
-#
-# You can use #formatter= for escaping all data.
-#
-# original_formatter = Logger::Formatter.new
-# logger.formatter = proc { |severity, datetime, progname, msg|
-# original_formatter.call(severity, datetime, progname, msg.dump)
-# }
-# logger.info(input)
-#
# === Example
#
-# This creates a Logger that outputs to the standard output stream, with a
-# level of +WARN+:
-#
-# require 'logger'
-#
-# logger = Logger.new(STDOUT)
-# logger.level = Logger::WARN
+# A simple example demonstrates the above explanation:
#
-# logger.debug("Created logger")
-# logger.info("Program started")
-# logger.warn("Nothing to do!")
+# log = Logger.new(STDOUT)
+# log.level = Logger::WARN
#
-# path = "a_non_existent_file"
+# log.debug("Created logger")
+# log.info("Program started")
+# log.warn("Nothing to do!")
#
# begin
-# File.foreach(path) do |line|
+# File.each_line(path) do |line|
# unless line =~ /^(\w+) = (.*)$/
-# logger.error("Line in wrong format: #{line.chomp}")
+# log.error("Line in wrong format: #{line}")
# end
# end
# rescue => err
-# logger.fatal("Caught exception; exiting")
-# logger.fatal(err)
+# log.fatal("Caught exception; exiting")
+# log.fatal(err)
# end
#
# Because the Logger's level is set to +WARN+, only the warning, error, and
@@ -108,16 +94,16 @@ require 'monitor'
# 3. Create a logger for the specified file.
#
# file = File.open('foo.log', File::WRONLY | File::APPEND)
-# # To create new (and to remove old) logfile, add File::CREAT like:
-# # file = File.open('foo.log', File::WRONLY | File::APPEND | File::CREAT)
+# # To create new (and to remove old) logfile, add File::CREAT like;
+# # file = open('foo.log', File::WRONLY | File::APPEND | File::CREAT)
# logger = Logger.new(file)
#
-# 4. Create a logger which ages the logfile once it reaches a certain size.
-# Leave 10 "old" log files where each file is about 1,024,000 bytes.
+# 4. Create a logger which ages logfile once it reaches a certain size. Leave
+# 10 "old log files" and each file is about 1,024,000 bytes.
#
# logger = Logger.new('foo.log', 10, 1024000)
#
-# 5. Create a logger which ages the logfile daily/weekly/monthly.
+# 5. Create a logger which ages logfile daily/weekly/monthly.
#
# logger = Logger.new('foo.log', 'daily')
# logger = Logger.new('foo.log', 'weekly')
@@ -126,17 +112,17 @@ require 'monitor'
# === How to log a message
#
# Notice the different methods (+fatal+, +error+, +info+) being used to log
-# messages of various levels? Other methods in this family are +warn+ and
+# messages of various levels. Other methods in this family are +warn+ and
# +debug+. +add+ is used below to log a message of an arbitrary (perhaps
# dynamic) level.
#
-# 1. Message in a block.
+# 1. Message in block.
#
# logger.fatal { "Argument 'foo' not given." }
#
# 2. Message as a string.
#
-# logger.error "Argument #{@foo} mismatch."
+# logger.error "Argument #{ @foo } mismatch."
#
# 3. With progname.
#
@@ -146,20 +132,6 @@ require 'monitor'
#
# logger.add(Logger::FATAL) { 'Fatal error!' }
#
-# The block form allows you to create potentially complex log messages,
-# but to delay their evaluation until and unless the message is
-# logged. For example, if we have the following:
-#
-# logger.debug { "This is a " + potentially + " expensive operation" }
-#
-# If the logger's level is +INFO+ or higher, no debug messages will be logged,
-# and the entire block will not even be evaluated. Compare to this:
-#
-# logger.debug("This is a " + potentially + " expensive operation")
-#
-# Here, the string concatenation is done every time, even if the log
-# level is not set to show the debug message.
-#
# === How to close a logger
#
# logger.close
@@ -174,7 +146,8 @@ require 'monitor'
#
# logger.level = Logger::INFO
#
-# # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+# DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
+#
#
# == Format
#
@@ -182,26 +155,28 @@ require 'monitor'
# default. The default format and a sample are shown below:
#
# Log format:
-# SeverityID, [DateTime #pid] SeverityLabel -- ProgName: message
+# SeverityID, [Date Time mSec #pid] SeverityLabel -- ProgName: message
#
# Log sample:
-# I, [1999-03-03T02:34:24.895701 #19074] INFO -- Main: info.
+# I, [Wed Mar 03 02:34:24 JST 1999 895701 #19074] INFO -- Main: info.
#
-# You may change the date and time format via #datetime_format=.
+# You may change the date and time format in this manner:
#
-# logger.datetime_format = '%Y-%m-%d %H:%M:%S'
+# logger.datetime_format = "%Y-%m-%d %H:%M:%S"
# # e.g. "2004-01-03 00:54:26"
#
-# Or, you may change the overall format via the #formatter= method.
+# You may change the overall format with Logger#formatter= method.
#
-# logger.formatter = proc do |severity, datetime, progname, msg|
+# logger.formatter = proc { |severity, datetime, progname, msg|
# "#{datetime}: #{msg}\n"
-# end
-# # e.g. "2005-09-22 08:51:08 +0900: hello world"
+# }
+# # e.g. "Thu Sep 22 08:51:08 GMT+9:00 2005: hello world"
#
+
+
class Logger
VERSION = "1.2.7"
- _, name, rev = %w$Id$
+ id, name, rev = %w$Id$
if name
name = name.chomp(",v")
else
@@ -210,25 +185,16 @@ class Logger
rev ||= "v#{VERSION}"
ProgName = "#{name}/#{rev}"
- class Error < RuntimeError # :nodoc:
- end
- # not used after 1.2.7. just for compat.
- class ShiftingError < Error # :nodoc:
- end
+ class Error < RuntimeError; end
+ class ShiftingError < Error; end # not used after 1.2.7. just for compat.
# Logging severity.
module Severity
- # Low-level information, mostly for developers.
DEBUG = 0
- # Generic (useful) information about system operation.
INFO = 1
- # A warning.
WARN = 2
- # A handleable error condition.
ERROR = 3
- # An unhandleable error that results in a program crash.
FATAL = 4
- # An unknown message that should always be logged.
UNKNOWN = 5
end
include Severity
@@ -236,33 +202,23 @@ class Logger
# Logging severity threshold (e.g. <tt>Logger::INFO</tt>).
attr_accessor :level
- # Program name to include in log messages.
+ # Logging program name.
attr_accessor :progname
- # Set date-time format.
- #
- # +datetime_format+:: A string suitable for passing to +strftime+.
+ # Logging date-time format (string passed to +strftime+).
def datetime_format=(datetime_format)
@default_formatter.datetime_format = datetime_format
end
- # Returns the date format being used. See #datetime_format=
def datetime_format
@default_formatter.datetime_format
end
- # Logging formatter, as a +Proc+ that will take four arguments and
- # return the formatted message. The arguments are:
- #
- # +severity+:: The Severity of the log message.
- # +time+:: A Time instance representing when the message was logged.
- # +progname+:: The #progname configured, or passed to the logger method.
- # +msg+:: The _Object_ the user passed to the log message; not necessarily a
- # String.
- #
- # The block should return an Object that can be written to the logging
- # device via +write+. The default formatter is used when no formatter is
- # set.
+ # Logging formatter. formatter#call is invoked with 4 arguments; severity,
+ # time, progname and msg for each log. Bear in mind that time is a Time and
+ # msg is an Object that user passed and it could not be a String. It is
+ # expected to return a logdev#write-able Object. Default formatter is used
+ # when no formatter is set.
attr_accessor :formatter
alias sev_threshold level
@@ -289,7 +245,8 @@ class Logger
def fatal?; @level <= FATAL; end
#
- # :call-seq:
+ # === Synopsis
+ #
# Logger.new(name, shift_age = 7, shift_size = 1048576)
# Logger.new(name, shift_age = 'weekly')
#
@@ -321,7 +278,8 @@ class Logger
end
#
- # :call-seq:
+ # === Synopsis
+ #
# Logger#add(severity, message = nil, progname = nil) { ... }
#
# === Args
@@ -332,8 +290,8 @@ class Logger
# +message+::
# The log message. A String or Exception.
# +progname+::
- # Program name string. Can be omitted. Treated as a message if no
- # +message+ and +block+ are given.
+ # Program name string. Can be omitted. Treated as a message if no +message+ and
+ # +block+ are given.
# +block+::
# Can be omitted. Called to get a message string if +message+ is nil.
#
@@ -341,8 +299,8 @@ class Logger
#
# +true+ if successful, +false+ otherwise.
#
- # When the given severity is not high enough (for this particular logger),
- # log no message, and return +true+.
+ # When the given severity is not high enough (for this particular logger), log
+ # no message, and return +true+.
#
# === Description
#
@@ -361,7 +319,7 @@ class Logger
#
# * Logfile is not locked.
# * Append open does not need to lock file.
- # * If the OS supports multi I/O, records possibly may be mixed.
+ # * But on the OS which supports multi I/O, records possibly be mixed.
#
def add(severity, message = nil, progname = nil, &block)
severity ||= UNKNOWN
@@ -403,19 +361,11 @@ class Logger
end
#
- # :call-seq:
- # info(message)
- # info(progname, &block)
- #
# Log an +INFO+ message.
#
- # +message+:: The message to log; does not need to be a String.
- # +progname+:: In the block form, this is the #progname to use in the
- # log message. The default can be set with #progname=.
- # +block+:: Evaluates to the message to log. This is not evaluated unless
- # the logger's level is sufficient to log the message. This
- # allows you to create potentially expensive logging messages that
- # are only called when the logger is configured to show them.
+ # The message can come either from the +progname+ argument or the +block+. If
+ # both are provided, then the +block+ is used as the message, and +progname+
+ # is used as the program name.
#
# === Examples
#
@@ -426,7 +376,7 @@ class Logger
# logger.info { "User typed #{input}" }
#
# You'll probably stick to the second form above, unless you want to provide a
- # program name (which you can do with #progname= as well).
+ # program name (which you can do with <tt>Logger#progname=</tt> as well).
#
# === Return
#
@@ -464,8 +414,8 @@ class Logger
end
#
- # Log an +UNKNOWN+ message. This will be printed no matter what the logger's
- # level is.
+ # Log an +UNKNOWN+ message. This will be printed no matter what the logger
+ # level.
#
# See #info for more information.
#
@@ -482,7 +432,7 @@ class Logger
private
- # Severity label for logging (max 5 chars).
+ # Severity label for logging. (max 5 char)
SEV_LABEL = %w(DEBUG INFO WARN ERROR FATAL ANY)
def format_severity(severity)
@@ -494,7 +444,6 @@ private
end
- # Default formatter for log messages.
class Formatter
Format = "%s, [%s#%d] %5s -- %s: %s\n"
@@ -533,7 +482,6 @@ private
end
- # Device used for logging messages.
class LogDevice
attr_reader :dev
attr_reader :filename
@@ -582,7 +530,7 @@ private
@mutex.synchronize do
@dev.close rescue nil
end
- rescue Exception
+ rescue Exception => ignored
@dev.close rescue nil
end
end
@@ -645,7 +593,7 @@ private
if FileTest.exist?(age_file)
# try to avoid filename crash caused by Timestamp change.
idx = 0
- # .99 can be overridden; avoid too much file search with 'loop do'
+ # .99 can be overriden; avoid too much file search with 'loop do'
while idx < 100
idx += 1
age_file = "#{@filename}.#{postfix}.#{idx}"
@@ -680,13 +628,13 @@ private
#
# == Description
#
- # Application --- Add logging support to your application.
+ # Application -- Add logging support to your application.
#
# == Usage
#
# 1. Define your application class as a sub-class of this class.
- # 2. Override the +run+ method in your class to do many things.
- # 3. Instantiate it and invoke #start.
+ # 2. Override 'run' method in your class to do many things.
+ # 3. Instantiate it and invoke 'start'.
#
# == Example
#
@@ -713,7 +661,8 @@ private
attr_reader :appname
#
- # :call-seq:
+ # == Synopsis
+ #
# Application.new(appname = '')
#
# == Args
@@ -754,8 +703,7 @@ private
end
#
- # Sets the logger for this application. See the class Logger for an
- # explanation.
+ # Sets the logger for this application. See the class Logger for an explanation.
#
def logger=(logger)
@log = logger
@@ -764,8 +712,8 @@ private
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 <tt>Logger.new</tt> 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/mathn.rb b/lib/mathn.rb
index aae4620c3f..716b48602d 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -1,44 +1,13 @@
-#--
-# $Release Version: 0.5 $
-# $Revision: 1.1.1.1.4.1 $
-
-##
-# = mathn
-#
-# mathn is a library for changing the way Ruby does math. If you need
-# more precise rounding with multiple division or exponentiation
-# operations, then mathn is the right tool.
-#
-# Without mathn:
-#
-# 3 / 2 => 1 # Integer
-#
-# With mathn:
-#
-# 3 / 2 => 3/2 # Rational
-#
-# mathn features late rounding and lacks truncation of intermediate results:
-#
-# Without mathn:
-#
-# 20 / 9 * 3 * 14 / 7 * 3 / 2 # => 18
-#
-# With mathn:
#
-# 20 / 9 * 3 * 14 / 7 * 3 / 2 # => 20
+# mathn.rb -
+# $Release Version: 0.5 $
+# $Revision: 1.1.1.1.4.1 $
+# by Keiju ISHITSUKA(SHL Japan Inc.)
#
+# --
#
-# When you require 'mathn', the libraries for Prime, CMath, Matrix and Vector
-# are also loaded.
#
-# == Copyright
#
-# Author: Keiju ISHITSUKA (SHL Japan Inc.)
-#--
-# class Numeric follows to make this documentation findable in a reasonable
-# location
-
-class Numeric; end
require "cmath.rb"
require "matrix.rb"
@@ -49,32 +18,15 @@ require "mathn/complex"
unless defined?(Math.exp!)
Object.instance_eval{remove_const :Math}
- Math = CMath # :nodoc:
+ Math = CMath
end
-##
-# When mathn is required, Fixnum's division and exponentiation are enhanced to
-# return more precise values from mathematical expressions.
-#
-# 2/3*3 # => 0
-# require 'mathn'
-# 2/3*3 # => 2
-
class Fixnum
remove_method :/
-
- ##
- # +/+ defines the Rational division for Fixnum.
- #
- # 1/3 # => (1/3)
-
alias / quo
alias power! ** unless method_defined? :power!
- ##
- # Exponentiate by +other+
-
def ** (other)
if self < 0 && other.round != other
Complex(self, 0.0) ** other
@@ -85,25 +37,12 @@ class Fixnum
end
-##
-# When mathn is required Bignum's division and exponentiation are enhanced to
-# return more precise values from mathematical expressions.
-
class Bignum
remove_method :/
-
- ##
- # +/+ defines the Rational division for Bignum.
- #
- # (2**72) / ((2**70) * 3) # => 4/3
-
alias / quo
alias power! ** unless method_defined? :power!
- ##
- # Exponentiate by +other+
-
def ** (other)
if self < 0 && other.round != other
Complex(self, 0.0) ** other
@@ -114,61 +53,42 @@ class Bignum
end
-##
-# When mathn is required Rational is changed to simplify the use of Rational
-# operations.
-#
-# Normal behaviour:
-#
-# Rational.new!(1,3) ** 2 # => Rational(1, 9)
-# (1 / 3) ** 2 # => 0
-#
-# require 'mathn' behaviour:
-#
-# (1 / 3) ** 2 # => 1/9
-
class Rational
remove_method :**
-
- ##
- # Exponentiate by +other+
- #
- # (1/3) ** 2 # => 1/9
-
def ** (other)
if other.kind_of?(Rational)
other2 = other
if self < 0
- return Complex(self, 0.0) ** other
+ return Complex(self, 0.0) ** other
elsif other == 0
- return Rational(1,1)
+ return Rational(1,1)
elsif self == 0
- return Rational(0,1)
+ return Rational(0,1)
elsif self == 1
- return Rational(1,1)
+ return Rational(1,1)
end
npd = numerator.prime_division
dpd = denominator.prime_division
if other < 0
- other = -other
- npd, dpd = dpd, npd
+ 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
- return Float(self) ** other2
- end
- elm[1] = elm[1].to_i
+ elm[1] = elm[1] * other
+ if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
+ return Float(self) ** other2
+ 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
- return Float(self) ** other2
- end
- elm[1] = elm[1].to_i
+ elm[1] = elm[1] * other
+ if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
+ return Float(self) ** other2
+ end
+ elm[1] = elm[1].to_i
end
num = Integer.from_prime_division(npd)
@@ -178,14 +98,14 @@ class Rational
elsif other.kind_of?(Integer)
if other > 0
- num = numerator ** other
- den = denominator ** other
+ num = numerator ** other
+ den = denominator ** other
elsif other < 0
- num = denominator ** -other
- den = numerator ** -other
+ num = denominator ** -other
+ den = numerator ** -other
elsif other == 0
- num = 1
- den = 1
+ num = 1
+ den = 1
end
Rational(num, den)
elsif other.kind_of?(Float)
@@ -197,47 +117,23 @@ class Rational
end
end
-##
-# When mathn is required, the Math module changes as follows:
-#
-# Standard Math module behaviour:
-# Math.sqrt(4/9) # => 0.0
-# Math.sqrt(4.0/9.0) # => 0.666666666666667
-# Math.sqrt(- 4/9) # => Errno::EDOM: Numerical argument out of domain - sqrt
-#
-# After require 'mathn', this is changed to:
-#
-# require 'mathn'
-# Math.sqrt(4/9) # => 2/3
-# Math.sqrt(4.0/9.0) # => 0.666666666666667
-# Math.sqrt(- 4/9) # => Complex(0, 2/3)
-
module Math
remove_method(:sqrt)
-
- ##
- # Computes the square root of +a+. It makes use of Complex and
- # Rational to have no rounding errors if possible.
- #
- # Math.sqrt(4/9) # => 2/3
- # Math.sqrt(- 4/9) # => Complex(0, 2/3)
- # Math.sqrt(4.0/9.0) # => 0.666666666666667
-
def sqrt(a)
if a.kind_of?(Complex)
abs = sqrt(a.real*a.real + a.imag*a.imag)
# if not abs.kind_of?(Rational)
-# return a**Rational(1,2)
+# return a**Rational(1,2)
# end
x = sqrt((a.real + abs)/Rational(2))
y = sqrt((-a.real + abs)/Rational(2))
# if !(x.kind_of?(Rational) and y.kind_of?(Rational))
-# return a**Rational(1,2)
+# return a**Rational(1,2)
# end
if a.imag >= 0
- Complex(x, y)
+ Complex(x, y)
else
- Complex(x, -y)
+ Complex(x, -y)
end
elsif a.respond_to?(:nan?) and a.nan?
a
@@ -248,10 +144,6 @@ module Math
end
end
- ##
- # Compute square root of a non negative number. This method is
- # internally used by +Math.sqrt+.
-
def rsqrt(a)
if a.kind_of?(Float)
sqrt!(a)
@@ -263,36 +155,36 @@ module Math
byte_a = [src & 0xffffffff]
# ruby's bug
while (src >= max) and (src >>= 32)
- byte_a.unshift src & 0xffffffff
+ byte_a.unshift src & 0xffffffff
end
answer = 0
main = 0
side = 0
for elm in byte_a
- main = (main << 32) + elm
- side <<= 16
- if answer != 0
- if main * 4 < side * side
- applo = main.div(side)
- 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
- main -= x
- answer = (answer << 16) + applo
- side += applo * 2
+ main = (main << 32) + elm
+ side <<= 16
+ if answer != 0
+ if main * 4 < side * side
+ applo = main.div(side)
+ 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
+ main -= x
+ answer = (answer << 16) + applo
+ side += applo * 2
end
if main == 0
- answer
+ answer
else
- sqrt!(a)
+ sqrt!(a)
end
end
end
@@ -304,15 +196,9 @@ module Math
module_function :rsqrt
end
-##
-# When mathn is required, Float is changed to handle Complex numbers.
-
class Float
alias power! **
- ##
- # Exponentiate by +other+
-
def ** (other)
if self < 0 && other.round != other
Complex(self, 0.0) ** other
diff --git a/lib/matrix.rb b/lib/matrix.rb
index b1d1a5c2bd..8e6b08c3c6 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -32,99 +32,79 @@ end
# == Method Catalogue
#
# To create a matrix:
-# * Matrix[*rows]
-# * Matrix.[](*rows)
-# * Matrix.rows(rows, copy = true)
-# * Matrix.columns(columns)
-# * Matrix.build(row_count, column_count, &block)
-# * Matrix.diagonal(*values)
-# * Matrix.scalar(n, value)
-# * Matrix.identity(n)
-# * Matrix.unit(n)
-# * Matrix.I(n)
-# * Matrix.zero(n)
-# * Matrix.row_vector(row)
-# * Matrix.column_vector(column)
+# * <tt> Matrix[*rows] </tt>
+# * <tt> Matrix.[](*rows) </tt>
+# * <tt> Matrix.rows(rows, copy = true) </tt>
+# * <tt> Matrix.columns(columns) </tt>
+# * <tt> Matrix.build(row_size, column_size, &block) </tt>
+# * <tt> Matrix.diagonal(*values) </tt>
+# * <tt> Matrix.scalar(n, value) </tt>
+# * <tt> Matrix.identity(n) </tt>
+# * <tt> Matrix.unit(n) </tt>
+# * <tt> Matrix.I(n) </tt>
+# * <tt> Matrix.zero(n) </tt>
+# * <tt> Matrix.row_vector(row) </tt>
+# * <tt> Matrix.column_vector(column) </tt>
#
# To access Matrix elements/columns/rows/submatrices/properties:
-# * #[](i, j)
-# * #row_count (row_size)
-# * #column_count (column_size)
-# * #row(i)
-# * #column(j)
-# * #collect
-# * #map
-# * #each
-# * #each_with_index
-# * #find_index
-# * #minor(*param)
+# * <tt> [](i, j) </tt>
+# * <tt> #row_size </tt>
+# * <tt> #column_size </tt>
+# * <tt> #row(i) </tt>
+# * <tt> #column(j) </tt>
+# * <tt> #collect </tt>
+# * <tt> #map </tt>
+# * <tt> #each </tt>
+# * <tt> #each_with_index </tt>
+# * <tt> #minor(*param) </tt>
#
# Properties of a matrix:
-# * #diagonal?
-# * #empty?
-# * #hermitian?
-# * #lower_triangular?
-# * #normal?
-# * #orthogonal?
-# * #permutation?
-# * #real?
-# * #regular?
-# * #singular?
-# * #square?
-# * #symmetric?
-# * #unitary?
-# * #upper_triangular?
-# * #zero?
+# * <tt> #empty? </tt>
+# * <tt> #real? </tt>
+# * <tt> #regular? </tt>
+# * <tt> #singular? </tt>
+# * <tt> #square? </tt>
#
# Matrix arithmetic:
-# * #*(m)
-# * #+(m)
-# * #-(m)
-# * #/(m)
-# * #inverse
-# * #inv
-# * #**
+# * <tt> *(m) </tt>
+# * <tt> +(m) </tt>
+# * <tt> -(m) </tt>
+# * <tt> #/(m) </tt>
+# * <tt> #inverse </tt>
+# * <tt> #inv </tt>
+# * <tt> ** </tt>
#
# Matrix functions:
-# * #determinant
-# * #det
-# * #rank
-# * #round
-# * #trace
-# * #tr
-# * #transpose
-# * #t
-#
-# Matrix decompositions:
-# * #eigen
-# * #eigensystem
-# * #lup
-# * #lup_decomposition
+# * <tt> #determinant </tt>
+# * <tt> #det </tt>
+# * <tt> #rank </tt>
+# * <tt> #trace </tt>
+# * <tt> #tr </tt>
+# * <tt> #transpose </tt>
+# * <tt> #t </tt>
#
# Complex arithmetic:
-# * conj
-# * conjugate
-# * imag
-# * imaginary
-# * real
-# * rect
-# * rectangular
+# * <tt> conj </tt>
+# * <tt> conjugate </tt>
+# * <tt> imag </tt>
+# * <tt> imaginary </tt>
+# * <tt> real </tt>
+# * <tt> rect </tt>
+# * <tt> rectangular </tt>
#
# Conversion to other data types:
-# * #coerce(other)
-# * #row_vectors
-# * #column_vectors
-# * #to_a
+# * <tt> #coerce(other) </tt>
+# * <tt> #row_vectors </tt>
+# * <tt> #column_vectors </tt>
+# * <tt> #to_a </tt>
#
# String representations:
-# * #to_s
-# * #inspect
+# * <tt> #to_s </tt>
+# * <tt> #inspect </tt>
#
class Matrix
include Enumerable
include ExceptionForMatrix
- autoload :EigenvalueDecomposition, "matrix/eigenvalue_decomposition"
- autoload :LUPDecomposition, "matrix/lup_decomposition"
# instance creations
private_class_method :new
@@ -138,7 +118,7 @@ class Matrix
# -1 66
#
def Matrix.[](*rows)
- rows(rows, false)
+ Matrix.rows(rows, false)
end
#
@@ -156,7 +136,7 @@ class Matrix
end
size = (rows[0] || []).size
rows.each do |row|
- raise ErrDimensionMismatch, "row size differs (#{row.size} should be #{size})" unless row.size == size
+ Matrix.Raise ErrDimensionMismatch, "row size differs (#{row.size} should be #{size})" unless row.size == size
end
new rows, size
end
@@ -168,11 +148,11 @@ class Matrix
# 93 66
#
def Matrix.columns(columns)
- rows(columns, false).transpose
+ Matrix.rows(columns, false).transpose
end
#
- # Creates a matrix of size +row_count+ x +column_count+.
+ # Creates a matrix of size +row_size+ x +column_size+.
# It fills the values by calling the given block,
# passing the current row and column.
# Returns an enumerator if no block is given.
@@ -182,17 +162,17 @@ class Matrix
# m = Matrix.build(3) { rand }
# => a 3x3 matrix with random elements
#
- def Matrix.build(row_count, column_count = row_count)
- row_count = CoercionHelper.coerce_to_int(row_count)
- column_count = CoercionHelper.coerce_to_int(column_count)
- raise ArgumentError if row_count < 0 || column_count < 0
- return to_enum :build, row_count, column_count unless block_given?
- rows = Array.new(row_count) do |i|
- Array.new(column_count) do |j|
+ def Matrix.build(row_size, column_size = row_size)
+ row_size = CoercionHelper.coerce_to_int(row_size)
+ column_size = CoercionHelper.coerce_to_int(column_size)
+ raise ArgumentError if row_size < 0 || column_size < 0
+ return to_enum :build, row_size, column_size unless block_given?
+ rows = Array.new(row_size) do |i|
+ Array.new(column_size) do |j|
yield i, j
end
end
- new rows, column_count
+ new rows, column_size
end
#
@@ -220,7 +200,7 @@ class Matrix
# 0 5
#
def Matrix.scalar(n, value)
- diagonal(*Array.new(n, value))
+ Matrix.diagonal(*Array.new(n, value))
end
#
@@ -230,7 +210,7 @@ class Matrix
# 0 1
#
def Matrix.identity(n)
- scalar(n, 1)
+ Matrix.scalar(n, 1)
end
class << Matrix
alias unit identity
@@ -238,14 +218,13 @@ class Matrix
end
#
- # Creates a zero matrix.
+ # Creates an +n+ by +n+ zero matrix.
# Matrix.zero(2)
# => 0 0
# 0 0
#
- def Matrix.zero(row_count, column_count = row_count)
- rows = Array.new(row_count){Array.new(column_count, 0)}
- new rows, column_count
+ def Matrix.zero(n)
+ Matrix.scalar(n, 0)
end
#
@@ -273,8 +252,8 @@ class Matrix
end
#
- # Creates a empty matrix of +row_count+ x +column_count+.
- # At least one of +row_count+ or +column_count+ must be 0.
+ # Creates a empty matrix of +row_size+ x +column_size+.
+ # At least one of +row_size+ or +column_size+ must be 0.
#
# m = Matrix.empty(2, 0)
# m == Matrix[ [], [] ]
@@ -285,26 +264,26 @@ class Matrix
# m * n
# => Matrix[[0, 0, 0], [0, 0, 0]]
#
- def Matrix.empty(row_count = 0, column_count = 0)
- raise ArgumentError, "One size must be 0" if column_count != 0 && row_count != 0
- raise ArgumentError, "Negative size" if column_count < 0 || row_count < 0
+ def Matrix.empty(row_size = 0, column_size = 0)
+ Matrix.Raise ArgumentError, "One size must be 0" if column_size != 0 && row_size != 0
+ Matrix.Raise ArgumentError, "Negative size" if column_size < 0 || row_size < 0
- new([[]]*row_count, column_count)
+ new([[]]*row_size, column_size)
end
#
# Matrix.new is private; use Matrix.rows, columns, [], etc... to create.
#
- def initialize(rows, column_count = rows[0].size)
+ def initialize(rows, column_size = rows[0].size)
# No checking is done at this point. rows must be an Array of Arrays.
- # column_count must be the size of the first row, if there is one,
+ # column_size must be the size of the first row, if there is one,
# otherwise it *must* be specified and can be any integer >= 0
@rows = rows
- @column_count = column_count
+ @column_size = column_size
end
- def new_matrix(rows, column_count = rows[0].size) # :nodoc:
- self.class.send(:new, rows, column_count) # bypass privacy of Matrix.new
+ def new_matrix(rows, column_size = rows[0].size) # :nodoc:
+ Matrix.send(:new, rows, column_size) # bypass privacy of Matrix.new
end
private :new_matrix
@@ -327,16 +306,14 @@ class Matrix
#
# Returns the number of rows.
#
- def row_count
+ def row_size
@rows.size
end
- alias_method :row_size, :row_count
#
# Returns the number of columns.
#
- attr_reader :column_count
- alias_method :column_size, :column_count
+ attr_reader :column_size
#
# Returns row vector number +i+ of the matrix as a Vector (starting at 0 like
@@ -358,14 +335,14 @@ class Matrix
#
def column(j) # :yield: e
if block_given?
- return self if j >= column_count || j < -column_count
- row_count.times do |i|
+ return self if j >= column_size || j < -column_size
+ row_size.times do |i|
yield @rows[i][j]
end
self
else
- return nil if j >= column_count || j < -column_count
- col = Array.new(row_count) {|i|
+ return nil if j >= column_size || j < -column_size
+ col = Array.new(row_size) {|i|
@rows[i][j]
}
Vector.elements(col, false)
@@ -382,167 +359,46 @@ class Matrix
def collect(&block) # :yield: e
return to_enum(:collect) unless block_given?
rows = @rows.collect{|row| row.collect(&block)}
- new_matrix rows, column_count
+ new_matrix rows, column_size
end
alias map collect
#
# Yields all elements of the matrix, starting with those of the first row,
- # or returns an Enumerator is no block given.
- # Elements can be restricted by passing an argument:
- # * :all (default): yields all elements
- # * :diagonal: yields only elements on the diagonal
- # * :off_diagonal: yields all elements except on the diagonal
- # * :lower: yields only elements on or below the diagonal
- # * :strict_lower: yields only elements below the diagonal
- # * :strict_upper: yields only elements above the diagonal
- # * :upper: yields only elements on or above the diagonal
- #
+ # or returns an Enumerator is no block given
# Matrix[ [1,2], [3,4] ].each { |e| puts e }
# # => prints the numbers 1 to 4
- # Matrix[ [1,2], [3,4] ].each(:strict_lower).to_a # => [3]
- #
- def each(which = :all) # :yield: e
- return to_enum :each, which unless block_given?
- last = column_count - 1
- case which
- when :all
- block = Proc.new
- @rows.each do |row|
- row.each(&block)
- end
- when :diagonal
- @rows.each_with_index do |row, row_index|
- yield row.fetch(row_index){return self}
- end
- when :off_diagonal
- @rows.each_with_index do |row, row_index|
- column_count.times do |col_index|
- yield row[col_index] unless row_index == col_index
- end
- end
- when :lower
- @rows.each_with_index do |row, row_index|
- 0.upto([row_index, last].min) do |col_index|
- yield row[col_index]
- end
- end
- when :strict_lower
- @rows.each_with_index do |row, row_index|
- [row_index, column_count].min.times do |col_index|
- yield row[col_index]
- end
- end
- when :strict_upper
- @rows.each_with_index do |row, row_index|
- (row_index+1).upto(last) do |col_index|
- yield row[col_index]
- end
- end
- when :upper
- @rows.each_with_index do |row, row_index|
- row_index.upto(last) do |col_index|
- yield row[col_index]
- end
- end
- else
- raise ArgumentError, "expected #{which.inspect} to be one of :all, :diagonal, :off_diagonal, :lower, :strict_lower, :strict_upper or :upper"
+ #
+ def each(&block) # :yield: e
+ return to_enum(:each) unless block_given?
+ @rows.each do |row|
+ row.each(&block)
end
self
end
#
- # Same as #each, but the row index and column index in addition to the element
- #
+ # Yields all elements of the matrix, starting with those of the first row,
+ # along with the row index and column index,
+ # or returns an Enumerator is no block given
# Matrix[ [1,2], [3,4] ].each_with_index do |e, row, col|
# puts "#{e} at #{row}, #{col}"
# end
- # # => Prints:
- # # 1 at 0, 0
- # # 2 at 0, 1
- # # 3 at 1, 0
- # # 4 at 1, 1
- #
- def each_with_index(which = :all) # :yield: e, row, column
- return to_enum :each_with_index, which unless block_given?
- last = column_count - 1
- case which
- when :all
- @rows.each_with_index do |row, row_index|
- row.each_with_index do |e, col_index|
- yield e, row_index, col_index
- end
- end
- when :diagonal
- @rows.each_with_index do |row, row_index|
- yield row.fetch(row_index){return self}, row_index, row_index
- end
- when :off_diagonal
- @rows.each_with_index do |row, row_index|
- column_count.times do |col_index|
- yield row[col_index], row_index, col_index unless row_index == col_index
- end
- end
- when :lower
- @rows.each_with_index do |row, row_index|
- 0.upto([row_index, last].min) do |col_index|
- yield row[col_index], row_index, col_index
- end
- end
- when :strict_lower
- @rows.each_with_index do |row, row_index|
- [row_index, column_count].min.times do |col_index|
- yield row[col_index], row_index, col_index
- end
- end
- when :strict_upper
- @rows.each_with_index do |row, row_index|
- (row_index+1).upto(last) do |col_index|
- yield row[col_index], row_index, col_index
- end
- end
- when :upper
- @rows.each_with_index do |row, row_index|
- row_index.upto(last) do |col_index|
- yield row[col_index], row_index, col_index
- end
+ # # => 1 at 0, 0
+ # # => 2 at 0, 1
+ # # => 3 at 1, 0
+ # # => 4 at 1, 1
+ #
+ def each_with_index(&block) # :yield: e, row, column
+ return to_enum(:each_with_index) unless block_given?
+ @rows.each_with_index do |row, row_index|
+ row.each_with_index do |e, col_index|
+ yield e, row_index, col_index
end
- else
- raise ArgumentError, "expected #{which.inspect} to be one of :all, :diagonal, :off_diagonal, :lower, :strict_lower, :strict_upper or :upper"
end
self
end
- SELECTORS = {all: true, diagonal: true, off_diagonal: true, lower: true, strict_lower: true, strict_upper: true, upper: true}.freeze
- #
- # :call-seq:
- # index(value, selector = :all) -> [row, column]
- # index(selector = :all){ block } -> [row, column]
- # index(selector = :all) -> an_enumerator
- #
- # The index method is specialized to return the index as [row, column]
- # It also accepts an optional +selector+ argument, see #each for details.
- #
- # Matrix[ [1,2], [3,4] ].index(&:even?) # => [0, 1]
- # Matrix[ [1,1], [1,1] ].index(1, :strict_lower) # => [1, 0]
- #
- def index(*args)
- raise ArgumentError, "wrong number of arguments(#{args.size} for 0-2)" if args.size > 2
- which = (args.size == 2 || SELECTORS.include?(args.last)) ? args.pop : :all
- return to_enum :find_index, which, *args unless block_given? || args.size == 1
- if args.size == 1
- value = args.first
- each_with_index(which) do |e, row_index, col_index|
- return row_index, col_index if e == value
- end
- else
- each_with_index(which) do |e, row_index, col_index|
- return row_index, col_index if yield e
- end
- end
- nil
- end
- alias_method :find_index, :index
#
# Returns a section of the matrix. The parameters are either:
# * start_row, nrows, start_col, ncols; OR
@@ -554,39 +410,39 @@ class Matrix
#
# Like Array#[], negative indices count backward from the end of the
# row or column (-1 is the last element). Returns nil if the starting
- # row or column is greater than row_count or column_count respectively.
+ # row or column is greater than row_size or column_size respectively.
#
def minor(*param)
case param.size
when 2
row_range, col_range = param
from_row = row_range.first
- from_row += row_count if from_row < 0
+ from_row += row_size if from_row < 0
to_row = row_range.end
- to_row += row_count if to_row < 0
+ to_row += row_size if to_row < 0
to_row += 1 unless row_range.exclude_end?
size_row = to_row - from_row
from_col = col_range.first
- from_col += column_count if from_col < 0
+ from_col += column_size if from_col < 0
to_col = col_range.end
- to_col += column_count if to_col < 0
+ to_col += column_size if to_col < 0
to_col += 1 unless col_range.exclude_end?
size_col = to_col - from_col
when 4
from_row, size_row, from_col, size_col = param
return nil if size_row < 0 || size_col < 0
- from_row += row_count if from_row < 0
- from_col += column_count if from_col < 0
+ from_row += row_size if from_row < 0
+ from_col += column_size if from_col < 0
else
- raise ArgumentError, param.inspect
+ Matrix.Raise ArgumentError, param.inspect
end
- return nil if from_row > row_count || from_col > column_count || from_row < 0 || from_col < 0
+ return nil if from_row > row_size || from_col > column_size || from_row < 0 || from_col < 0
rows = @rows[from_row, size_row].collect{|row|
row[from_col, size_col]
}
- new_matrix rows, [column_count - from_col, size_col].min
+ new_matrix rows, [column_size - from_col, size_col].min
end
#--
@@ -594,96 +450,11 @@ class Matrix
#++
#
- # Returns +true+ is this is a diagonal matrix.
- # Raises an error if matrix is not square.
- #
- def diagonal?
- Matrix.Raise ErrDimensionMismatch unless square?
- each(:off_diagonal).all?(&:zero?)
- end
-
- #
# Returns +true+ if this is an empty matrix, i.e. if the number of rows
# or the number of columns is 0.
#
def empty?
- column_count == 0 || row_count == 0
- end
-
- #
- # Returns +true+ is this is an hermitian matrix.
- # Raises an error if matrix is not square.
- #
- def hermitian?
- Matrix.Raise ErrDimensionMismatch unless square?
- each_with_index(:upper).all? do |e, row, col|
- e == rows[col][row].conj
- end
- end
-
- #
- # Returns +true+ is this is a lower triangular matrix.
- #
- def lower_triangular?
- each(:strict_upper).all?(&:zero?)
- end
-
- #
- # Returns +true+ is this is a normal matrix.
- # Raises an error if matrix is not square.
- #
- def normal?
- Matrix.Raise ErrDimensionMismatch unless square?
- rows.each_with_index do |row_i, i|
- rows.each_with_index do |row_j, j|
- s = 0
- rows.each_with_index do |row_k, k|
- s += row_i[k] * row_j[k].conj - row_k[i].conj * row_k[j]
- end
- return false unless s == 0
- end
- end
- true
- end
-
- #
- # Returns +true+ is this is an orthogonal matrix
- # Raises an error if matrix is not square.
- #
- def orthogonal?
- Matrix.Raise ErrDimensionMismatch unless square?
- rows.each_with_index do |row, i|
- column_count.times do |j|
- s = 0
- row_count.times do |k|
- s += row[k] * rows[k][j]
- end
- return false unless s == (i == j ? 1 : 0)
- end
- end
- true
- end
-
- #
- # Returns +true+ is this is a permutation matrix
- # Raises an error if matrix is not square.
- #
- def permutation?
- Matrix.Raise ErrDimensionMismatch unless square?
- cols = Array.new(column_count)
- rows.each_with_index do |row, i|
- found = false
- row.each_with_index do |e, j|
- if e == 1
- return false if found || cols[j]
- found = cols[j] = true
- elsif e != 0
- return false
- end
- end
- return false unless found
- end
- true
+ column_size == 0 || row_size == 0
end
#
@@ -711,51 +482,7 @@ class Matrix
# Returns +true+ is this is a square matrix.
#
def square?
- column_count == row_count
- end
-
- #
- # Returns +true+ is this is a symmetric matrix.
- # Raises an error if matrix is not square.
- #
- def symmetric?
- Matrix.Raise ErrDimensionMismatch unless square?
- each_with_index(:strict_upper) do |e, row, col|
- return false if e != rows[col][row]
- end
- true
- end
-
- #
- # Returns +true+ is this is a unitary matrix
- # Raises an error if matrix is not square.
- #
- def unitary?
- Matrix.Raise ErrDimensionMismatch unless square?
- rows.each_with_index do |row, i|
- column_count.times do |j|
- s = 0
- row_count.times do |k|
- s += row[k].conj * rows[k][j]
- end
- return false unless s == (i == j ? 1 : 0)
- end
- end
- true
- end
-
- #
- # Returns +true+ is this is an upper triangular matrix.
- #
- def upper_triangular?
- each(:strict_lower).all?(&:zero?)
- end
-
- #
- # Returns +true+ is this is a matrix with only zero elements
- #
- def zero?
- all?(&:zero?)
+ column_size == row_size
end
#--
@@ -767,13 +494,13 @@ class Matrix
#
def ==(other)
return false unless Matrix === other &&
- column_count == other.column_count # necessary for empty matrices
+ column_size == other.column_size # necessary for empty matrices
rows == other.rows
end
def eql?(other)
return false unless Matrix === other &&
- column_count == other.column_count # necessary for empty matrices
+ column_size == other.column_size # necessary for empty matrices
rows.eql? other.rows
end
@@ -783,7 +510,7 @@ class Matrix
# There should be no good reason to do this since Matrices are immutable.
#
def clone
- new_matrix @rows.map(&:dup), column_count
+ new_matrix @rows.map(&:dup), column_size
end
#
@@ -809,22 +536,22 @@ class Matrix
rows = @rows.collect {|row|
row.collect {|e| e * m }
}
- return new_matrix rows, column_count
+ return new_matrix rows, column_size
when Vector
- m = self.class.column_vector(m)
+ m = Matrix.column_vector(m)
r = self * m
return r.column(0)
when Matrix
- Matrix.Raise ErrDimensionMismatch if column_count != m.row_count
+ Matrix.Raise ErrDimensionMismatch if column_size != m.row_size
- rows = Array.new(row_count) {|i|
- Array.new(m.column_count) {|j|
- (0 ... column_count).inject(0) do |vij, k|
+ rows = Array.new(row_size) {|i|
+ Array.new(m.column_size) {|j|
+ (0 ... column_size).inject(0) do |vij, k|
vij + self[i, k] * m[k, j]
end
}
}
- return new_matrix rows, m.column_count
+ return new_matrix rows, m.column_size
else
return apply_through_coercion(m, __method__)
end
@@ -841,20 +568,20 @@ class Matrix
when Numeric
Matrix.Raise ErrOperationNotDefined, "+", self.class, m.class
when Vector
- m = self.class.column_vector(m)
+ m = Matrix.column_vector(m)
when Matrix
else
return apply_through_coercion(m, __method__)
end
- Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count and column_count == m.column_count
+ Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
- rows = Array.new(row_count) {|i|
- Array.new(column_count) {|j|
+ rows = Array.new(row_size) {|i|
+ Array.new(column_size) {|j|
self[i, j] + m[i, j]
}
}
- new_matrix rows, column_count
+ new_matrix rows, column_size
end
#
@@ -868,20 +595,20 @@ class Matrix
when Numeric
Matrix.Raise ErrOperationNotDefined, "-", self.class, m.class
when Vector
- m = self.class.column_vector(m)
+ m = Matrix.column_vector(m)
when Matrix
else
return apply_through_coercion(m, __method__)
end
- Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count and column_count == m.column_count
+ Matrix.Raise ErrDimensionMismatch unless row_size == m.row_size and column_size == m.column_size
- rows = Array.new(row_count) {|i|
- Array.new(column_count) {|j|
+ rows = Array.new(row_size) {|i|
+ Array.new(column_size) {|j|
self[i, j] - m[i, j]
}
}
- new_matrix rows, column_count
+ new_matrix rows, column_size
end
#
@@ -896,7 +623,7 @@ class Matrix
rows = @rows.collect {|row|
row.collect {|e| e / other }
}
- return new_matrix rows, column_count
+ return new_matrix rows, column_size
when Matrix
return self * other.inverse
else
@@ -912,12 +639,12 @@ class Matrix
#
def inverse
Matrix.Raise ErrDimensionMismatch unless square?
- self.class.I(row_count).send(:inverse_from, self)
+ Matrix.I(row_size).send(:inverse_from, self)
end
alias inv inverse
def inverse_from(src) # :nodoc:
- last = row_count - 1
+ last = row_size - 1
a = src.to_a
0.upto(last) do |k|
@@ -962,10 +689,8 @@ class Matrix
private :inverse_from
#
- # Matrix exponentiation.
+ # Matrix exponentiation. Currently implemented for integer powers only.
# Equivalent to multiplying the matrix by itself N times.
- # Non integer exponents will be handled by diagonalizing the matrix.
- #
# Matrix[[7,6], [3,9]] ** 2
# => 67 96
# 48 99
@@ -976,7 +701,7 @@ class Matrix
x = self
if other <= 0
x = self.inverse
- return self.class.identity(self.column_count) if other == 0
+ return Matrix.identity(self.column_size) if other == 0
other = -other
end
z = nil
@@ -985,9 +710,8 @@ class Matrix
return z if (other >>= 1).zero?
x *= x
end
- when Numeric
- v, d, v_inv = eigensystem
- v * self.class.diagonal(*d.each(:diagonal).map{|e| e ** other}) * v_inv
+ when Float, Rational
+ Matrix.Raise ErrOperationNotImplemented, "**", self.class, other.class
else
Matrix.Raise ErrOperationNotDefined, "**", self.class, other.class
end
@@ -1010,7 +734,7 @@ class Matrix
def determinant
Matrix.Raise ErrDimensionMismatch unless square?
m = @rows
- case row_count
+ case row_size
# Up to 4x4, give result using Laplacian expansion by minors.
# This will typically be faster, as well as giving good results
# in case of Floats
@@ -1059,7 +783,7 @@ class Matrix
# intermediate results with better precision.
#
def determinant_bareiss
- size = row_count
+ size = row_size
last = size - 1
a = to_a
no_pivot = Proc.new{ return 0 }
@@ -1091,7 +815,7 @@ class Matrix
#
def determinant_e
warn "#{caller(1)[0]}: warning: Matrix#determinant_e is deprecated; use #determinant"
- determinant
+ rank
end
alias det_e determinant_e
@@ -1108,8 +832,9 @@ class Matrix
# We currently use Bareiss' multistep integer-preserving gaussian elimination
# (see comments on determinant)
a = to_a
- last_column = column_count - 1
- last_row = row_count - 1
+ last_column = column_size - 1
+ last_row = row_size - 1
+ rank = 0
pivot_row = 0
previous_pivot = 1
0.upto(last_column) do |k|
@@ -1140,12 +865,6 @@ class Matrix
rank
end
- # Returns a matrix with entries rounded to the given precision
- # (see Float#round)
- #
- def round(ndigits=0)
- map{|e| e.round(ndigits)}
- end
#
# Returns the trace (sum of diagonal elements) of the matrix.
@@ -1154,7 +873,7 @@ class Matrix
#
def trace
Matrix.Raise ErrDimensionMismatch unless square?
- (0...column_count).inject(0) do |tr, i|
+ (0...column_size).inject(0) do |tr, i|
tr + @rows[i][i]
end
end
@@ -1171,44 +890,12 @@ class Matrix
# 2 4 6
#
def transpose
- return self.class.empty(column_count, 0) if row_count.zero?
- new_matrix @rows.transpose, row_count
+ return Matrix.empty(column_size, 0) if row_size.zero?
+ new_matrix @rows.transpose, row_size
end
alias t transpose
#--
- # DECOMPOSITIONS -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
- #++
-
- #
- # Returns the Eigensystem of the matrix; see +EigenvalueDecomposition+.
- # m = Matrix[[1, 2], [3, 4]]
- # v, d, v_inv = m.eigensystem
- # d.diagonal? # => true
- # v.inv == v_inv # => true
- # (v * d * v_inv).round(5) == m # => true
- #
- def eigensystem
- EigenvalueDecomposition.new(self)
- end
- alias eigen eigensystem
-
- #
- # Returns the LUP decomposition of the matrix; see +LUPDecomposition+.
- # a = Matrix[[1, 2], [3, 4]]
- # l, u, p = a.lup
- # l.lower_triangular? # => true
- # u.upper_triangular? # => true
- # p.permutation? # => true
- # l * u == p * a # => true
- # a.lup.solve([2, 5]) # => Vector[(1/1), (1/2)]
- #
- def lup
- LUPDecomposition.new(self)
- end
- alias lup_decomposition lup
-
- #--
# COMPLEX ARITHMETIC -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#++
@@ -1288,7 +975,7 @@ class Matrix
# Returns an array of the row vectors of the matrix. See Vector.
#
def row_vectors
- Array.new(row_count) {|i|
+ Array.new(row_size) {|i|
row(i)
}
end
@@ -1297,7 +984,7 @@ class Matrix
# Returns an array of the column vectors of the matrix. See Vector.
#
def column_vectors
- Array.new(column_count) {|i|
+ Array.new(column_size) {|i|
column(i)
}
end
@@ -1333,9 +1020,9 @@ class Matrix
#
def to_s
if empty?
- "#{self.class}.empty(#{row_count}, #{column_count})"
+ "Matrix.empty(#{row_size}, #{column_size})"
else
- "#{self.class}[" + @rows.collect{|row|
+ "Matrix[" + @rows.collect{|row|
"[" + row.collect{|e| e.to_s}.join(", ") + "]"
}.join(", ")+"]"
end
@@ -1346,9 +1033,9 @@ class Matrix
#
def inspect
if empty?
- "#{self.class}.empty(#{row_count}, #{column_count})"
+ "Matrix.empty(#{row_size}, #{column_size})"
else
- "#{self.class}#{@rows.inspect}"
+ "Matrix#{@rows.inspect}"
end
end
@@ -1502,40 +1189,37 @@ end
# == Method Catalogue
#
# To create a Vector:
-# * Vector.[](*array)
-# * Vector.elements(array, copy = true)
+# * <tt> Vector.[](*array) </tt>
+# * <tt> Vector.elements(array, copy = true) </tt>
#
# To access elements:
-# * #[](i)
+# * <tt> [](i) </tt>
#
# To enumerate the elements:
-# * #each2(v)
-# * #collect2(v)
+# * <tt> #each2(v) </tt>
+# * <tt> #collect2(v) </tt>
#
# Vector arithmetic:
-# * #*(x) "is matrix or number"
-# * #+(v)
-# * #-(v)
+# * <tt> *(x) "is matrix or number" </tt>
+# * <tt> +(v) </tt>
+# * <tt> -(v) </tt>
#
# Vector functions:
-# * #inner_product(v)
-# * #collect
-# * #magnitude
-# * #map
-# * #map2(v)
-# * #norm
-# * #normalize
-# * #r
-# * #size
+# * <tt> #inner_product(v) </tt>
+# * <tt> #collect </tt>
+# * <tt> #map </tt>
+# * <tt> #map2(v) </tt>
+# * <tt> #r </tt>
+# * <tt> #size </tt>
#
# Conversion to other data types:
-# * #covector
-# * #to_a
-# * #coerce(other)
+# * <tt> #covector </tt>
+# * <tt> #to_a </tt>
+# * <tt> #coerce(other) </tt>
#
# String representations:
-# * #to_s
-# * #inspect
+# * <tt> #to_s </tt>
+# * <tt> #inspect </tt>
#
class Vector
include ExceptionForMatrix
@@ -1553,7 +1237,7 @@ class Vector
# Vector[7, 4, ...]
#
def Vector.[](*array)
- new convert_to_array(array, false)
+ new convert_to_array(array, copy = false)
end
#
@@ -1657,7 +1341,7 @@ class Vector
# Return a copy of the vector.
#
def clone
- self.class.elements(@elements)
+ Vector.elements(@elements)
end
#
@@ -1678,7 +1362,7 @@ class Vector
case x
when Numeric
els = @elements.collect{|e| e * x}
- self.class.elements(els, false)
+ Vector.elements(els, false)
when Matrix
Matrix.column_vector(self) * x
when Vector
@@ -1698,7 +1382,7 @@ class Vector
els = collect2(v) {|v1, v2|
v1 + v2
}
- self.class.elements(els, false)
+ Vector.elements(els, false)
when Matrix
Matrix.column_vector(self) + v
else
@@ -1716,7 +1400,7 @@ class Vector
els = collect2(v) {|v1, v2|
v1 - v2
}
- self.class.elements(els, false)
+ Vector.elements(els, false)
when Matrix
Matrix.column_vector(self) - v
else
@@ -1731,7 +1415,7 @@ class Vector
case x
when Numeric
els = @elements.collect{|e| e / x}
- self.class.elements(els, false)
+ Vector.elements(els, false)
when Matrix, Vector
Vector.Raise ErrOperationNotDefined, "/", self.class, x.class
else
@@ -1752,7 +1436,7 @@ class Vector
p = 0
each2(v) {|v1, v2|
- p += v1 * v2.conj
+ p += v1 * v2
}
p
end
@@ -1763,41 +1447,25 @@ class Vector
def collect(&block) # :yield: e
return to_enum(:collect) unless block_given?
els = @elements.collect(&block)
- self.class.elements(els, false)
+ Vector.elements(els, false)
end
alias map collect
#
- # Returns the modulus (Pythagorean distance) of the vector.
- # Vector[5,8,2].r => 9.643650761
- #
- def magnitude
- Math.sqrt(@elements.inject(0) {|v, e| v + e.abs2})
- end
- alias r magnitude
- alias norm magnitude
-
- #
# Like Vector#collect2, but returns a Vector instead of an Array.
#
def map2(v, &block) # :yield: e1, e2
return to_enum(:map2, v) unless block_given?
els = collect2(v, &block)
- self.class.elements(els, false)
+ Vector.elements(els, false)
end
- class ZeroVectorError < StandardError
- end
#
- # Returns a new vector with the same direction but with norm 1.
- # v = Vector[5,8,2].normalize
- # # => Vector[0.5184758473652127, 0.8295613557843402, 0.20739033894608505]
- # v.norm => 1.0
+ # Returns the modulus (Pythagorean distance) of the vector.
+ # Vector[5,8,2].r => 9.643650761
#
- def normalize
- n = magnitude
- raise ZeroVectorError, "Zero vectors can not be normalized" if n == 0
- self / n
+ def r
+ Math.sqrt(@elements.inject(0) {|v, e| v + e*e})
end
#--
@@ -1864,6 +1532,6 @@ class Vector
# Overrides Object#inspect
#
def inspect
- "Vector" + @elements.inspect
+ str = "Vector"+@elements.inspect
end
end
diff --git a/lib/matrix/eigenvalue_decomposition.rb b/lib/matrix/eigenvalue_decomposition.rb
deleted file mode 100644
index 0dd9d42f29..0000000000
--- a/lib/matrix/eigenvalue_decomposition.rb
+++ /dev/null
@@ -1,882 +0,0 @@
-class Matrix
- # Adapted from JAMA: http://math.nist.gov/javanumerics/jama/
-
- # Eigenvalues and eigenvectors of a real matrix.
- #
- # Computes the eigenvalues and eigenvectors of a matrix A.
- #
- # If A is diagonalizable, this provides matrices V and D
- # such that A = V*D*V.inv, where D is the diagonal matrix with entries
- # equal to the eigenvalues and V is formed by the eigenvectors.
- #
- # If A is symmetric, then V is orthogonal and thus A = V*D*V.t
-
- class EigenvalueDecomposition
-
- # Constructs the eigenvalue decomposition for a square matrix +A+
- #
- def initialize(a)
- # @d, @e: Arrays for internal storage of eigenvalues.
- # @v: Array for internal storage of eigenvectors.
- # @h: Array for internal storage of nonsymmetric Hessenberg form.
- raise TypeError, "Expected Matrix but got #{a.class}" unless a.is_a?(Matrix)
- @size = a.row_count
- @d = Array.new(@size, 0)
- @e = Array.new(@size, 0)
-
- if (@symmetric = a.symmetric?)
- @v = a.to_a
- tridiagonalize
- diagonalize
- else
- @v = Array.new(@size) { Array.new(@size, 0) }
- @h = a.to_a
- @ort = Array.new(@size, 0)
- reduce_to_hessenberg
- hessenberg_to_real_schur
- end
- end
-
- # Returns the eigenvector matrix +V+
- #
- def eigenvector_matrix
- Matrix.send :new, build_eigenvectors.transpose
- end
- alias v eigenvector_matrix
-
- # Returns the inverse of the eigenvector matrix +V+
- #
- def eigenvector_matrix_inv
- r = Matrix.send :new, build_eigenvectors
- r = r.transpose.inverse unless @symmetric
- r
- end
- alias v_inv eigenvector_matrix_inv
-
- # Returns the eigenvalues in an array
- #
- def eigenvalues
- values = @d.dup
- @e.each_with_index{|imag, i| values[i] = Complex(values[i], imag) unless imag == 0}
- values
- end
-
- # Returns an array of the eigenvectors
- #
- def eigenvectors
- build_eigenvectors.map{|ev| Vector.send :new, ev}
- end
-
- # Returns the block diagonal eigenvalue matrix +D+
- #
- def eigenvalue_matrix
- Matrix.diagonal(*eigenvalues)
- end
- alias d eigenvalue_matrix
-
- # Returns [eigenvector_matrix, eigenvalue_matrix, eigenvector_matrix_inv]
- #
- def to_ary
- [v, d, v_inv]
- end
- alias_method :to_a, :to_ary
-
- private
- def build_eigenvectors
- # JAMA stores complex eigenvectors in a strange way
- # See http://web.archive.org/web/20111016032731/http://cio.nist.gov/esd/emaildir/lists/jama/msg01021.html
- @e.each_with_index.map do |imag, i|
- if imag == 0
- Array.new(@size){|j| @v[j][i]}
- elsif imag > 0
- Array.new(@size){|j| Complex(@v[j][i], @v[j][i+1])}
- else
- Array.new(@size){|j| Complex(@v[j][i-1], -@v[j][i])}
- end
- end
- end
- # Complex scalar division.
-
- def cdiv(xr, xi, yr, yi)
- if (yr.abs > yi.abs)
- r = yi/yr
- d = yr + r*yi
- [(xr + r*xi)/d, (xi - r*xr)/d]
- else
- r = yr/yi
- d = yi + r*yr
- [(r*xr + xi)/d, (r*xi - xr)/d]
- end
- end
-
-
- # Symmetric Householder reduction to tridiagonal form.
-
- def tridiagonalize
-
- # This is derived from the Algol procedures tred2 by
- # Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
- # Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
- # Fortran subroutine in EISPACK.
-
- @size.times do |j|
- @d[j] = @v[@size-1][j]
- end
-
- # Householder reduction to tridiagonal form.
-
- (@size-1).downto(0+1) do |i|
-
- # Scale to avoid under/overflow.
-
- scale = 0.0
- h = 0.0
- i.times do |k|
- scale = scale + @d[k].abs
- end
- if (scale == 0.0)
- @e[i] = @d[i-1]
- i.times do |j|
- @d[j] = @v[i-1][j]
- @v[i][j] = 0.0
- @v[j][i] = 0.0
- end
- else
-
- # Generate Householder vector.
-
- i.times do |k|
- @d[k] /= scale
- h += @d[k] * @d[k]
- end
- f = @d[i-1]
- g = Math.sqrt(h)
- if (f > 0)
- g = -g
- end
- @e[i] = scale * g
- h -= f * g
- @d[i-1] = f - g
- i.times do |j|
- @e[j] = 0.0
- end
-
- # Apply similarity transformation to remaining columns.
-
- i.times do |j|
- f = @d[j]
- @v[j][i] = f
- g = @e[j] + @v[j][j] * f
- (j+1).upto(i-1) do |k|
- g += @v[k][j] * @d[k]
- @e[k] += @v[k][j] * f
- end
- @e[j] = g
- end
- f = 0.0
- i.times do |j|
- @e[j] /= h
- f += @e[j] * @d[j]
- end
- hh = f / (h + h)
- i.times do |j|
- @e[j] -= hh * @d[j]
- end
- i.times do |j|
- f = @d[j]
- g = @e[j]
- j.upto(i-1) do |k|
- @v[k][j] -= (f * @e[k] + g * @d[k])
- end
- @d[j] = @v[i-1][j]
- @v[i][j] = 0.0
- end
- end
- @d[i] = h
- end
-
- # Accumulate transformations.
-
- 0.upto(@size-1-1) do |i|
- @v[@size-1][i] = @v[i][i]
- @v[i][i] = 1.0
- h = @d[i+1]
- if (h != 0.0)
- 0.upto(i) do |k|
- @d[k] = @v[k][i+1] / h
- end
- 0.upto(i) do |j|
- g = 0.0
- 0.upto(i) do |k|
- g += @v[k][i+1] * @v[k][j]
- end
- 0.upto(i) do |k|
- @v[k][j] -= g * @d[k]
- end
- end
- end
- 0.upto(i) do |k|
- @v[k][i+1] = 0.0
- end
- end
- @size.times do |j|
- @d[j] = @v[@size-1][j]
- @v[@size-1][j] = 0.0
- end
- @v[@size-1][@size-1] = 1.0
- @e[0] = 0.0
- end
-
-
- # Symmetric tridiagonal QL algorithm.
-
- def diagonalize
- # This is derived from the Algol procedures tql2, by
- # Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
- # Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
- # Fortran subroutine in EISPACK.
-
- 1.upto(@size-1) do |i|
- @e[i-1] = @e[i]
- end
- @e[@size-1] = 0.0
-
- f = 0.0
- tst1 = 0.0
- eps = Float::EPSILON
- @size.times do |l|
-
- # Find small subdiagonal element
-
- tst1 = [tst1, @d[l].abs + @e[l].abs].max
- m = l
- while (m < @size) do
- if (@e[m].abs <= eps*tst1)
- break
- end
- m+=1
- end
-
- # If m == l, @d[l] is an eigenvalue,
- # otherwise, iterate.
-
- if (m > l)
- iter = 0
- begin
- iter = iter + 1 # (Could check iteration count here.)
-
- # Compute implicit shift
-
- g = @d[l]
- p = (@d[l+1] - g) / (2.0 * @e[l])
- r = Math.hypot(p, 1.0)
- if (p < 0)
- r = -r
- end
- @d[l] = @e[l] / (p + r)
- @d[l+1] = @e[l] * (p + r)
- dl1 = @d[l+1]
- h = g - @d[l]
- (l+2).upto(@size-1) do |i|
- @d[i] -= h
- end
- f += h
-
- # Implicit QL transformation.
-
- p = @d[m]
- c = 1.0
- c2 = c
- c3 = c
- el1 = @e[l+1]
- s = 0.0
- s2 = 0.0
- (m-1).downto(l) do |i|
- c3 = c2
- c2 = c
- s2 = s
- g = c * @e[i]
- h = c * p
- r = Math.hypot(p, @e[i])
- @e[i+1] = s * r
- s = @e[i] / r
- c = p / r
- p = c * @d[i] - s * g
- @d[i+1] = h + s * (c * g + s * @d[i])
-
- # Accumulate transformation.
-
- @size.times do |k|
- h = @v[k][i+1]
- @v[k][i+1] = s * @v[k][i] + c * h
- @v[k][i] = c * @v[k][i] - s * h
- end
- end
- p = -s * s2 * c3 * el1 * @e[l] / dl1
- @e[l] = s * p
- @d[l] = c * p
-
- # Check for convergence.
-
- end while (@e[l].abs > eps*tst1)
- end
- @d[l] = @d[l] + f
- @e[l] = 0.0
- end
-
- # Sort eigenvalues and corresponding vectors.
-
- 0.upto(@size-2) do |i|
- k = i
- p = @d[i]
- (i+1).upto(@size-1) do |j|
- if (@d[j] < p)
- k = j
- p = @d[j]
- end
- end
- if (k != i)
- @d[k] = @d[i]
- @d[i] = p
- @size.times do |j|
- p = @v[j][i]
- @v[j][i] = @v[j][k]
- @v[j][k] = p
- end
- end
- end
- end
-
- # Nonsymmetric reduction to Hessenberg form.
-
- def reduce_to_hessenberg
- # This is derived from the Algol procedures orthes and ortran,
- # by Martin and Wilkinson, Handbook for Auto. Comp.,
- # Vol.ii-Linear Algebra, and the corresponding
- # Fortran subroutines in EISPACK.
-
- low = 0
- high = @size-1
-
- (low+1).upto(high-1) do |m|
-
- # Scale column.
-
- scale = 0.0
- m.upto(high) do |i|
- scale = scale + @h[i][m-1].abs
- end
- if (scale != 0.0)
-
- # Compute Householder transformation.
-
- h = 0.0
- high.downto(m) do |i|
- @ort[i] = @h[i][m-1]/scale
- h += @ort[i] * @ort[i]
- end
- g = Math.sqrt(h)
- if (@ort[m] > 0)
- g = -g
- end
- h -= @ort[m] * g
- @ort[m] = @ort[m] - g
-
- # Apply Householder similarity transformation
- # @h = (I-u*u'/h)*@h*(I-u*u')/h)
-
- m.upto(@size-1) do |j|
- f = 0.0
- high.downto(m) do |i|
- f += @ort[i]*@h[i][j]
- end
- f = f/h
- m.upto(high) do |i|
- @h[i][j] -= f*@ort[i]
- end
- end
-
- 0.upto(high) do |i|
- f = 0.0
- high.downto(m) do |j|
- f += @ort[j]*@h[i][j]
- end
- f = f/h
- m.upto(high) do |j|
- @h[i][j] -= f*@ort[j]
- end
- end
- @ort[m] = scale*@ort[m]
- @h[m][m-1] = scale*g
- end
- end
-
- # Accumulate transformations (Algol's ortran).
-
- @size.times do |i|
- @size.times do |j|
- @v[i][j] = (i == j ? 1.0 : 0.0)
- end
- end
-
- (high-1).downto(low+1) do |m|
- if (@h[m][m-1] != 0.0)
- (m+1).upto(high) do |i|
- @ort[i] = @h[i][m-1]
- end
- m.upto(high) do |j|
- g = 0.0
- m.upto(high) do |i|
- g += @ort[i] * @v[i][j]
- end
- # Double division avoids possible underflow
- g = (g / @ort[m]) / @h[m][m-1]
- m.upto(high) do |i|
- @v[i][j] += g * @ort[i]
- end
- end
- end
- end
- end
-
-
-
- # Nonsymmetric reduction from Hessenberg to real Schur form.
-
- def hessenberg_to_real_schur
-
- # This is derived from the Algol procedure hqr2,
- # by Martin and Wilkinson, Handbook for Auto. Comp.,
- # Vol.ii-Linear Algebra, and the corresponding
- # Fortran subroutine in EISPACK.
-
- # Initialize
-
- nn = @size
- n = nn-1
- low = 0
- high = nn-1
- eps = Float::EPSILON
- exshift = 0.0
- p=q=r=s=z=0
-
- # Store roots isolated by balanc and compute matrix norm
-
- norm = 0.0
- nn.times do |i|
- if (i < low || i > high)
- @d[i] = @h[i][i]
- @e[i] = 0.0
- end
- ([i-1, 0].max).upto(nn-1) do |j|
- norm = norm + @h[i][j].abs
- end
- end
-
- # Outer loop over eigenvalue index
-
- iter = 0
- while (n >= low) do
-
- # Look for single small sub-diagonal element
-
- l = n
- while (l > low) do
- s = @h[l-1][l-1].abs + @h[l][l].abs
- if (s == 0.0)
- s = norm
- end
- if (@h[l][l-1].abs < eps * s)
- break
- end
- l-=1
- end
-
- # Check for convergence
- # One root found
-
- if (l == n)
- @h[n][n] = @h[n][n] + exshift
- @d[n] = @h[n][n]
- @e[n] = 0.0
- n-=1
- iter = 0
-
- # Two roots found
-
- elsif (l == n-1)
- w = @h[n][n-1] * @h[n-1][n]
- p = (@h[n-1][n-1] - @h[n][n]) / 2.0
- q = p * p + w
- z = Math.sqrt(q.abs)
- @h[n][n] = @h[n][n] + exshift
- @h[n-1][n-1] = @h[n-1][n-1] + exshift
- x = @h[n][n]
-
- # Real pair
-
- if (q >= 0)
- if (p >= 0)
- z = p + z
- else
- z = p - z
- end
- @d[n-1] = x + z
- @d[n] = @d[n-1]
- if (z != 0.0)
- @d[n] = x - w / z
- end
- @e[n-1] = 0.0
- @e[n] = 0.0
- x = @h[n][n-1]
- s = x.abs + z.abs
- p = x / s
- q = z / s
- r = Math.sqrt(p * p+q * q)
- p /= r
- q /= r
-
- # Row modification
-
- (n-1).upto(nn-1) do |j|
- z = @h[n-1][j]
- @h[n-1][j] = q * z + p * @h[n][j]
- @h[n][j] = q * @h[n][j] - p * z
- end
-
- # Column modification
-
- 0.upto(n) do |i|
- z = @h[i][n-1]
- @h[i][n-1] = q * z + p * @h[i][n]
- @h[i][n] = q * @h[i][n] - p * z
- end
-
- # Accumulate transformations
-
- low.upto(high) do |i|
- z = @v[i][n-1]
- @v[i][n-1] = q * z + p * @v[i][n]
- @v[i][n] = q * @v[i][n] - p * z
- end
-
- # Complex pair
-
- else
- @d[n-1] = x + p
- @d[n] = x + p
- @e[n-1] = z
- @e[n] = -z
- end
- n -= 2
- iter = 0
-
- # No convergence yet
-
- else
-
- # Form shift
-
- x = @h[n][n]
- y = 0.0
- w = 0.0
- if (l < n)
- y = @h[n-1][n-1]
- w = @h[n][n-1] * @h[n-1][n]
- end
-
- # Wilkinson's original ad hoc shift
-
- if (iter == 10)
- exshift += x
- low.upto(n) do |i|
- @h[i][i] -= x
- end
- s = @h[n][n-1].abs + @h[n-1][n-2].abs
- x = y = 0.75 * s
- w = -0.4375 * s * s
- end
-
- # MATLAB's new ad hoc shift
-
- if (iter == 30)
- s = (y - x) / 2.0
- s *= s + w
- if (s > 0)
- s = Math.sqrt(s)
- if (y < x)
- s = -s
- end
- s = x - w / ((y - x) / 2.0 + s)
- low.upto(n) do |i|
- @h[i][i] -= s
- end
- exshift += s
- x = y = w = 0.964
- end
- end
-
- iter = iter + 1 # (Could check iteration count here.)
-
- # Look for two consecutive small sub-diagonal elements
-
- m = n-2
- while (m >= l) do
- z = @h[m][m]
- r = x - z
- s = y - z
- p = (r * s - w) / @h[m+1][m] + @h[m][m+1]
- q = @h[m+1][m+1] - z - r - s
- r = @h[m+2][m+1]
- s = p.abs + q.abs + r.abs
- p /= s
- q /= s
- r /= s
- if (m == l)
- break
- end
- if (@h[m][m-1].abs * (q.abs + r.abs) <
- eps * (p.abs * (@h[m-1][m-1].abs + z.abs +
- @h[m+1][m+1].abs)))
- break
- end
- m-=1
- end
-
- (m+2).upto(n) do |i|
- @h[i][i-2] = 0.0
- if (i > m+2)
- @h[i][i-3] = 0.0
- end
- end
-
- # Double QR step involving rows l:n and columns m:n
-
- m.upto(n-1) do |k|
- notlast = (k != n-1)
- if (k != m)
- p = @h[k][k-1]
- q = @h[k+1][k-1]
- r = (notlast ? @h[k+2][k-1] : 0.0)
- x = p.abs + q.abs + r.abs
- next if x == 0
- p /= x
- q /= x
- r /= x
- end
- s = Math.sqrt(p * p + q * q + r * r)
- if (p < 0)
- s = -s
- end
- if (s != 0)
- if (k != m)
- @h[k][k-1] = -s * x
- elsif (l != m)
- @h[k][k-1] = -@h[k][k-1]
- end
- p += s
- x = p / s
- y = q / s
- z = r / s
- q /= p
- r /= p
-
- # Row modification
-
- k.upto(nn-1) do |j|
- p = @h[k][j] + q * @h[k+1][j]
- if (notlast)
- p += r * @h[k+2][j]
- @h[k+2][j] = @h[k+2][j] - p * z
- end
- @h[k][j] = @h[k][j] - p * x
- @h[k+1][j] = @h[k+1][j] - p * y
- end
-
- # Column modification
-
- 0.upto([n, k+3].min) do |i|
- p = x * @h[i][k] + y * @h[i][k+1]
- if (notlast)
- p += z * @h[i][k+2]
- @h[i][k+2] = @h[i][k+2] - p * r
- end
- @h[i][k] = @h[i][k] - p
- @h[i][k+1] = @h[i][k+1] - p * q
- end
-
- # Accumulate transformations
-
- low.upto(high) do |i|
- p = x * @v[i][k] + y * @v[i][k+1]
- if (notlast)
- p += z * @v[i][k+2]
- @v[i][k+2] = @v[i][k+2] - p * r
- end
- @v[i][k] = @v[i][k] - p
- @v[i][k+1] = @v[i][k+1] - p * q
- end
- end # (s != 0)
- end # k loop
- end # check convergence
- end # while (n >= low)
-
- # Backsubstitute to find vectors of upper triangular form
-
- if (norm == 0.0)
- return
- end
-
- (nn-1).downto(0) do |n|
- p = @d[n]
- q = @e[n]
-
- # Real vector
-
- if (q == 0)
- l = n
- @h[n][n] = 1.0
- (n-1).downto(0) do |i|
- w = @h[i][i] - p
- r = 0.0
- l.upto(n) do |j|
- r += @h[i][j] * @h[j][n]
- end
- if (@e[i] < 0.0)
- z = w
- s = r
- else
- l = i
- if (@e[i] == 0.0)
- if (w != 0.0)
- @h[i][n] = -r / w
- else
- @h[i][n] = -r / (eps * norm)
- end
-
- # Solve real equations
-
- else
- x = @h[i][i+1]
- y = @h[i+1][i]
- q = (@d[i] - p) * (@d[i] - p) + @e[i] * @e[i]
- t = (x * s - z * r) / q
- @h[i][n] = t
- if (x.abs > z.abs)
- @h[i+1][n] = (-r - w * t) / x
- else
- @h[i+1][n] = (-s - y * t) / z
- end
- end
-
- # Overflow control
-
- t = @h[i][n].abs
- if ((eps * t) * t > 1)
- i.upto(n) do |j|
- @h[j][n] = @h[j][n] / t
- end
- end
- end
- end
-
- # Complex vector
-
- elsif (q < 0)
- l = n-1
-
- # Last vector component imaginary so matrix is triangular
-
- if (@h[n][n-1].abs > @h[n-1][n].abs)
- @h[n-1][n-1] = q / @h[n][n-1]
- @h[n-1][n] = -(@h[n][n] - p) / @h[n][n-1]
- else
- cdivr, cdivi = cdiv(0.0, -@h[n-1][n], @h[n-1][n-1]-p, q)
- @h[n-1][n-1] = cdivr
- @h[n-1][n] = cdivi
- end
- @h[n][n-1] = 0.0
- @h[n][n] = 1.0
- (n-2).downto(0) do |i|
- ra = 0.0
- sa = 0.0
- l.upto(n) do |j|
- ra = ra + @h[i][j] * @h[j][n-1]
- sa = sa + @h[i][j] * @h[j][n]
- end
- w = @h[i][i] - p
-
- if (@e[i] < 0.0)
- z = w
- r = ra
- s = sa
- else
- l = i
- if (@e[i] == 0)
- cdivr, cdivi = cdiv(-ra, -sa, w, q)
- @h[i][n-1] = cdivr
- @h[i][n] = cdivi
- else
-
- # Solve complex equations
-
- x = @h[i][i+1]
- y = @h[i+1][i]
- vr = (@d[i] - p) * (@d[i] - p) + @e[i] * @e[i] - q * q
- vi = (@d[i] - p) * 2.0 * q
- if (vr == 0.0 && vi == 0.0)
- vr = eps * norm * (w.abs + q.abs +
- x.abs + y.abs + z.abs)
- end
- cdivr, cdivi = cdiv(x*r-z*ra+q*sa, x*s-z*sa-q*ra, vr, vi)
- @h[i][n-1] = cdivr
- @h[i][n] = cdivi
- if (x.abs > (z.abs + q.abs))
- @h[i+1][n-1] = (-ra - w * @h[i][n-1] + q * @h[i][n]) / x
- @h[i+1][n] = (-sa - w * @h[i][n] - q * @h[i][n-1]) / x
- else
- cdivr, cdivi = cdiv(-r-y*@h[i][n-1], -s-y*@h[i][n], z, q)
- @h[i+1][n-1] = cdivr
- @h[i+1][n] = cdivi
- end
- end
-
- # Overflow control
-
- t = [@h[i][n-1].abs, @h[i][n].abs].max
- if ((eps * t) * t > 1)
- i.upto(n) do |j|
- @h[j][n-1] = @h[j][n-1] / t
- @h[j][n] = @h[j][n] / t
- end
- end
- end
- end
- end
- end
-
- # Vectors of isolated roots
-
- nn.times do |i|
- if (i < low || i > high)
- i.upto(nn-1) do |j|
- @v[i][j] = @h[i][j]
- end
- end
- end
-
- # Back transformation to get eigenvectors of original matrix
-
- (nn-1).downto(low) do |j|
- low.upto(high) do |i|
- z = 0.0
- low.upto([j, high].min) do |k|
- z += @v[i][k] * @h[k][j]
- end
- @v[i][j] = z
- end
- end
- end
-
- end
-end
diff --git a/lib/matrix/lup_decomposition.rb b/lib/matrix/lup_decomposition.rb
deleted file mode 100644
index 30f3276253..0000000000
--- a/lib/matrix/lup_decomposition.rb
+++ /dev/null
@@ -1,218 +0,0 @@
-class Matrix
- # Adapted from JAMA: http://math.nist.gov/javanumerics/jama/
-
- #
- # For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
- # unit lower triangular matrix L, an n-by-n upper triangular matrix U,
- # and a m-by-m permutation matrix P so that L*U = P*A.
- # If m < n, then L is m-by-m and U is m-by-n.
- #
- # The LUP decomposition with pivoting always exists, even if the matrix is
- # singular, so the constructor will never fail. The primary use of the
- # LU decomposition is in the solution of square systems of simultaneous
- # linear equations. This will fail if singular? returns true.
- #
-
- class LUPDecomposition
- # Returns the lower triangular factor +L+
-
- include Matrix::ConversionHelper
-
- def l
- Matrix.build(@row_count, [@column_count, @row_count].min) do |i, j|
- if (i > j)
- @lu[i][j]
- elsif (i == j)
- 1
- else
- 0
- end
- end
- end
-
- # Returns the upper triangular factor +U+
-
- def u
- Matrix.build([@column_count, @row_count].min, @column_count) do |i, j|
- if (i <= j)
- @lu[i][j]
- else
- 0
- end
- end
- end
-
- # Returns the permutation matrix +P+
-
- def p
- rows = Array.new(@row_count){Array.new(@row_count, 0)}
- @pivots.each_with_index{|p, i| rows[i][p] = 1}
- Matrix.send :new, rows, @row_count
- end
-
- # Returns +L+, +U+, +P+ in an array
-
- def to_ary
- [l, u, p]
- end
- alias_method :to_a, :to_ary
-
- # Returns the pivoting indices
-
- attr_reader :pivots
-
- # Returns +true+ if +U+, and hence +A+, is singular.
-
- def singular? ()
- @column_count.times do |j|
- if (@lu[j][j] == 0)
- return true
- end
- end
- false
- end
-
- # Returns the determinant of +A+, calculated efficiently
- # from the factorization.
-
- def det
- if (@row_count != @column_count)
- Matrix.Raise Matrix::ErrDimensionMismatch
- end
- d = @pivot_sign
- @column_count.times do |j|
- d *= @lu[j][j]
- end
- d
- end
- alias_method :determinant, :det
-
- # Returns +m+ so that <tt>A*m = b</tt>,
- # or equivalently so that <tt>L*U*m = P*b</tt>
- # +b+ can be a Matrix or a Vector
-
- def solve b
- if (singular?)
- Matrix.Raise Matrix::ErrNotRegular, "Matrix is singular."
- end
- if b.is_a? Matrix
- if (b.row_count != @row_count)
- Matrix.Raise Matrix::ErrDimensionMismatch
- end
-
- # Copy right hand side with pivoting
- nx = b.column_count
- m = @pivots.map{|row| b.row(row).to_a}
-
- # Solve L*Y = P*b
- @column_count.times do |k|
- (k+1).upto(@column_count-1) do |i|
- nx.times do |j|
- m[i][j] -= m[k][j]*@lu[i][k]
- end
- end
- end
- # Solve U*m = Y
- (@column_count-1).downto(0) do |k|
- nx.times do |j|
- m[k][j] = m[k][j].quo(@lu[k][k])
- end
- k.times do |i|
- nx.times do |j|
- m[i][j] -= m[k][j]*@lu[i][k]
- end
- end
- end
- Matrix.send :new, m, nx
- else # same algorithm, specialized for simpler case of a vector
- b = convert_to_array(b)
- if (b.size != @row_count)
- Matrix.Raise Matrix::ErrDimensionMismatch
- end
-
- # Copy right hand side with pivoting
- m = b.values_at(*@pivots)
-
- # Solve L*Y = P*b
- @column_count.times do |k|
- (k+1).upto(@column_count-1) do |i|
- m[i] -= m[k]*@lu[i][k]
- end
- end
- # Solve U*m = Y
- (@column_count-1).downto(0) do |k|
- m[k] = m[k].quo(@lu[k][k])
- k.times do |i|
- m[i] -= m[k]*@lu[i][k]
- end
- end
- Vector.elements(m, false)
- end
- end
-
- def initialize a
- raise TypeError, "Expected Matrix but got #{a.class}" unless a.is_a?(Matrix)
- # Use a "left-looking", dot-product, Crout/Doolittle algorithm.
- @lu = a.to_a
- @row_count = a.row_count
- @column_count = a.column_count
- @pivots = Array.new(@row_count)
- @row_count.times do |i|
- @pivots[i] = i
- end
- @pivot_sign = 1
- lu_col_j = Array.new(@row_count)
-
- # Outer loop.
-
- @column_count.times do |j|
-
- # Make a copy of the j-th column to localize references.
-
- @row_count.times do |i|
- lu_col_j[i] = @lu[i][j]
- end
-
- # Apply previous transformations.
-
- @row_count.times do |i|
- lu_row_i = @lu[i]
-
- # Most of the time is spent in the following dot product.
-
- kmax = [i, j].min
- s = 0
- kmax.times do |k|
- s += lu_row_i[k]*lu_col_j[k]
- end
-
- lu_row_i[j] = lu_col_j[i] -= s
- end
-
- # Find pivot and exchange if necessary.
-
- p = j
- (j+1).upto(@row_count-1) do |i|
- if (lu_col_j[i].abs > lu_col_j[p].abs)
- p = i
- end
- end
- if (p != j)
- @column_count.times do |k|
- t = @lu[p][k]; @lu[p][k] = @lu[j][k]; @lu[j][k] = t
- end
- k = @pivots[p]; @pivots[p] = @pivots[j]; @pivots[j] = k
- @pivot_sign = -@pivot_sign
- end
-
- # Compute multipliers.
-
- if (j < @row_count && @lu[j][j] != 0)
- (j+1).upto(@row_count-1) do |i|
- @lu[i][j] = @lu[i][j].quo(@lu[j][j])
- end
- end
- end
- end
- end
-end
diff --git a/lib/minitest/.document b/lib/minitest/.document
deleted file mode 100644
index 6850e5befb..0000000000
--- a/lib/minitest/.document
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore README.txt, it is included in the minitest documentation.
-*.rb
diff --git a/lib/minitest/README.txt b/lib/minitest/README.txt
deleted file mode 100644
index 6430c1b442..0000000000
--- a/lib/minitest/README.txt
+++ /dev/null
@@ -1,394 +0,0 @@
-= minitest/{unit,spec,mock,benchmark}
-
-home :: https://github.com/seattlerb/minitest
-rdoc :: http://docs.seattlerb.org/minitest
-vim :: https://github.com/sunaku/vim-ruby-minitest
-
-== DESCRIPTION:
-
-minitest provides a complete suite of testing facilities supporting
-TDD, BDD, mocking, and benchmarking.
-
- "I had a class with Jim Weirich on testing last week and we were
- allowed to choose our testing frameworks. Kirk Haines and I were
- paired up and we cracked open the code for a few test
- frameworks...
-
- I MUST say that minitest is *very* readable / understandable
- compared to the 'other two' options we looked at. Nicely done and
- thank you for helping us keep our mental sanity."
-
- -- Wayne E. Seguin
-
-minitest/unit is a small and incredibly fast unit testing framework.
-It provides a rich set of assertions to make your tests clean and
-readable.
-
-minitest/spec is a functionally complete spec engine. It hooks onto
-minitest/unit and seamlessly bridges test assertions over to spec
-expectations.
-
-minitest/benchmark is an awesome way to assert the performance of your
-algorithms in a repeatable manner. Now you can assert that your newb
-co-worker doesn't replace your linear algorithm with an exponential
-one!
-
-minitest/mock by Steven Baker, is a beautifully tiny mock (and stub)
-object framework.
-
-minitest/pride shows pride in testing and adds coloring to your test
-output. I guess it is an example of how to write IO pipes too. :P
-
-minitest/unit is meant to have a clean implementation for language
-implementors that need a minimal set of methods to bootstrap a working
-test suite. For example, there is no magic involved for test-case
-discovery.
-
- "Again, I can't praise enough the idea of a testing/specing
- framework that I can actually read in full in one sitting!"
-
- -- Piotr Szotkowski
-
-Comparing to rspec:
-
- rspec is a testing DSL. minitest is ruby.
-
- -- Adam Hawkins, "Bow Before MiniTest"
-
-minitest doesn't reinvent anything that ruby already provides, like:
-classes, modules, inheritance, methods. This means you only have to
-learn ruby to use minitest and all of your regular OO practices like
-extract-method refactorings still apply.
-
-== FEATURES/PROBLEMS:
-
-* minitest/autorun - the easy and explicit way to run all your tests.
-* minitest/unit - a very fast, simple, and clean test system.
-* minitest/spec - a very fast, simple, and clean spec system.
-* minitest/mock - a simple and clean mock/stub system.
-* minitest/benchmark - an awesome way to assert your algorithm's performance.
-* minitest/pride - show your pride in testing!
-* Incredibly small and fast runner, but no bells and whistles.
-
-== RATIONALE:
-
-See design_rationale.rb to see how specs and tests work in minitest.
-
-== SYNOPSIS:
-
-Given that you'd like to test the following class:
-
- class Meme
- def i_can_has_cheezburger?
- "OHAI!"
- end
-
- def will_it_blend?
- "YES!"
- end
- end
-
-=== Unit tests
-
- require 'minitest/autorun'
-
- class TestMeme < MiniTest::Unit::TestCase
- def setup
- @meme = Meme.new
- end
-
- def test_that_kitty_can_eat
- assert_equal "OHAI!", @meme.i_can_has_cheezburger?
- end
-
- def test_that_it_will_not_blend
- refute_match /^no/i, @meme.will_it_blend?
- end
-
- def test_that_will_be_skipped
- skip "test this later"
- end
- end
-
-=== Specs
-
- require 'minitest/autorun'
-
- describe Meme do
- before do
- @meme = Meme.new
- end
-
- describe "when asked about cheeseburgers" do
- it "must respond positively" do
- @meme.i_can_has_cheezburger?.must_equal "OHAI!"
- end
- end
-
- describe "when asked about blending possibilities" do
- it "won't say no" do
- @meme.will_it_blend?.wont_match /^no/i
- end
- end
- end
-
-For matchers support check out:
-
-https://github.com/zenspider/minitest-matchers
-
-=== Benchmarks
-
-Add benchmarks to your regular unit tests. If the unit tests fail, the
-benchmarks won't run.
-
- # optionally run benchmarks, good for CI-only work!
- require 'minitest/benchmark' if ENV["BENCH"]
-
- class TestMeme < MiniTest::Unit::TestCase
- # Override self.bench_range or default range is [1, 10, 100, 1_000, 10_000]
- def bench_my_algorithm
- assert_performance_linear 0.9999 do |n| # n is a range value
- @obj.my_algorithm(n)
- end
- end
- end
-
-Or add them to your specs. If you make benchmarks optional, you'll
-need to wrap your benchmarks in a conditional since the methods won't
-be defined.
-
- describe Meme do
- if ENV["BENCH"] then
- bench_performance_linear "my_algorithm", 0.9999 do |n|
- 100.times do
- @obj.my_algorithm(n)
- end
- end
- end
- end
-
-outputs something like:
-
- # Running benchmarks:
-
- TestBlah 100 1000 10000
- bench_my_algorithm 0.006167 0.079279 0.786993
- bench_other_algorithm 0.061679 0.792797 7.869932
-
-Output is tab-delimited to make it easy to paste into a spreadsheet.
-
-=== Mocks
-
- class MemeAsker
- def initialize(meme)
- @meme = meme
- end
-
- def ask(question)
- method = question.tr(" ","_") + "?"
- @meme.__send__(method)
- end
- end
-
- require 'minitest/autorun'
-
- describe MemeAsker do
- before do
- @meme = MiniTest::Mock.new
- @meme_asker = MemeAsker.new @meme
- end
-
- describe "#ask" do
- describe "when passed an unpunctuated question" do
- it "should invoke the appropriate predicate method on the meme" do
- @meme.expect :will_it_blend?, :return_value
- @meme_asker.ask "will it blend"
- @meme.verify
- end
- end
- end
- end
-
-=== Stubs
-
- def test_stale_eh
- obj_under_test = Something.new
-
- refute obj_under_test.stale?
-
- Time.stub :now, Time.at(0) do # stub goes away once the block is done
- assert obj_under_test.stale?
- end
- end
-
-=== Customizable Test Runner Types:
-
-MiniTest::Unit.runner=(runner) provides an easy way of creating custom
-test runners for specialized needs. Justin Weiss provides the
-following real-world example to create an alternative to regular
-fixture loading:
-
- class MiniTestWithHooks::Unit < MiniTest::Unit
- def before_suites
- end
-
- def after_suites
- end
-
- def _run_suites(suites, type)
- begin
- before_suites
- super(suites, type)
- ensure
- after_suites
- end
- end
-
- def _run_suite(suite, type)
- begin
- suite.before_suite
- super(suite, type)
- ensure
- suite.after_suite
- end
- end
- end
-
- module MiniTestWithTransactions
- class Unit < MiniTestWithHooks::Unit
- include TestSetupHelper
-
- def before_suites
- super
- setup_nested_transactions
- # load any data we want available for all tests
- end
-
- def after_suites
- teardown_nested_transactions
- super
- end
- end
- end
-
- MiniTest::Unit.runner = MiniTestWithTransactions::Unit.new
-
-== Known Extensions:
-
-minitest-capistrano :: Assertions and expectations for testing Capistrano recipes
-minitest-capybara :: Capybara matchers support for minitest unit and spec
-minitest-chef-handler :: Run Minitest suites as Chef report handlers
-minitest-ci :: CI reporter plugin for MiniTest.
-minitest-colorize :: Colorize MiniTest output and show failing tests instantly.
-minitest-context :: Defines contexts for code reuse in MiniTest
- specs that share common expectations.
-minitest-debugger :: Wraps assert so failed assertions drop into
- the ruby debugger.
-minitest-display :: Patches MiniTest to allow for an easily configurable output.
-minitest-emoji :: Print out emoji for your test passes, fails, and skips.
-minitest-excludes :: Clean API for excluding certain tests you
- don't want to run under certain conditions.
-minitest-firemock :: Makes your MiniTest mocks more resilient.
-minitest-growl :: Test notifier for minitest via growl.
-minitest-instrument :: Instrument ActiveSupport::Notifications when
- test method is executed
-minitest-instrument-db :: Store information about speed of test
- execution provided by minitest-instrument in database
-minitest-libnotify :: Test notifier for minitest via libnotify.
-minitest-macruby :: Provides extensions to minitest for macruby UI testing.
-minitest-matchers :: Adds support for RSpec-style matchers to minitest.
-minitest-metadata :: Annotate tests with metadata (key-value).
-minitest-mongoid :: Mongoid assertion matchers for MiniTest
-minitest-must_not :: Provides must_not as an alias for wont in MiniTest
-minitest-predicates :: Adds support for .predicate? methods
-minitest-rails :: MiniTest integration for Rails 3.x
-minitest-rails-capybara :: Capybara integration for MiniTest::Rails
-minitest-reporters :: Create customizable MiniTest output formats
-minitest-rg :: redgreen minitest
-minitest-shouldify :: Adding all manner of shoulds to MiniTest (bad idea)
-minitest-spec-magic :: Minitest::Spec extensions for Rails and beyond
-minitest-tags :: add tags for minitest
-minitest-wscolor :: Yet another test colorizer.
-minitest_owrapper :: Get tests results as a TestResult object.
-minitest_should :: Shoulda style syntax for minitest test::unit.
-minitest_tu_shim :: minitest_tu_shim bridges between test/unit and minitest.
-mongoid-minitest :: MiniTest matchers for Mongoid.
-pry-rescue :: A pry plugin w/ minitest support. See pry-rescue/minitest.rb.
-
-== Unknown Extensions:
-
-Authors... Please send me a pull request with a description of your minitest extension.
-
-* assay-minitest
-* capybara_minitest_spec
-* detroit-minitest
-* em-minitest-spec
-* flexmock-minitest
-* guard-minitest
-* guard-minitest-decisiv
-* minitest-activemodel
-* minitest-ar-assertions
-* minitest-around
-* minitest-capybara-unit
-* minitest-colorer
-* minitest-deluxe
-* minitest-extra-assertions
-* minitest-nc
-* minitest-rails-shoulda
-* minitest-spec
-* minitest-spec-context
-* minitest-spec-rails
-* minitest-spec-should
-* minitest-sugar
-* minitest_should
-* mongoid-minitest
-* spork-minitest
-
-== REQUIREMENTS:
-
-* Ruby 1.8, maybe even 1.6 or lower. No magic is involved.
-
-== INSTALL:
-
- sudo gem install minitest
-
-On 1.9, you already have it. To get newer candy you can still install
-the gem, but you'll need to activate the gem explicitly to use it:
-
- require 'rubygems'
- gem 'minitest' # ensures you're using the gem, and not the built in MT
- require 'minitest/autorun'
-
- # ... usual testing stuffs ...
-
-DO NOTE: There is a serious problem with the way that ruby 1.9/2.0
-packages their own gems. They install a gem specification file, but
-don't install the gem contents in the gem path. This messes up
-Gem.find_files and many other things (gem which, gem contents, etc).
-
-Just install minitest as a gem for real and you'll be happier.
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) Ryan Davis, seattle.rb
-
-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.
diff --git a/lib/minitest/autorun.rb b/lib/minitest/autorun.rb
index cb4a3a0e5d..5bf35f6ab8 100644
--- a/lib/minitest/autorun.rb
+++ b/lib/minitest/autorun.rb
@@ -1,16 +1,8 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-begin
- require 'rubygems'
- gem 'minitest'
-rescue Gem::LoadError
- # do nothing
-end
+############################################################
+# 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'
diff --git a/lib/minitest/benchmark.rb b/lib/minitest/benchmark.rb
deleted file mode 100644
index 02121db340..0000000000
--- a/lib/minitest/benchmark.rb
+++ /dev/null
@@ -1,380 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-require 'minitest/unit'
-require 'minitest/spec'
-
-class MiniTest::Unit # :nodoc:
- def run_benchmarks # :nodoc:
- _run_anything :benchmark
- end
-
- def benchmark_suite_header suite # :nodoc:
- "\n#{suite}\t#{suite.bench_range.join("\t")}"
- end
-
- class TestCase
- ##
- # Returns a set of ranges stepped exponentially from +min+ to
- # +max+ by powers of +base+. Eg:
- #
- # bench_exp(2, 16, 2) # => [2, 4, 8, 16]
-
- def self.bench_exp min, max, base = 10
- min = (Math.log10(min) / Math.log10(base)).to_i
- max = (Math.log10(max) / Math.log10(base)).to_i
-
- (min..max).map { |m| base ** m }.to_a
- end
-
- ##
- # Returns a set of ranges stepped linearly from +min+ to +max+ by
- # +step+. Eg:
- #
- # bench_linear(20, 40, 10) # => [20, 30, 40]
-
- def self.bench_linear min, max, step = 10
- (min..max).step(step).to_a
- rescue LocalJumpError # 1.8.6
- r = []; (min..max).step(step) { |n| r << n }; r
- end
-
- ##
- # Returns the benchmark methods (methods that start with bench_)
- # for that class.
-
- def self.benchmark_methods # :nodoc:
- public_instance_methods(true).grep(/^bench_/).map { |m| m.to_s }.sort
- end
-
- ##
- # Returns all test suites that have benchmark methods.
-
- def self.benchmark_suites
- TestCase.test_suites.reject { |s| s.benchmark_methods.empty? }
- end
-
- ##
- # Specifies the ranges used for benchmarking for that class.
- # Defaults to exponential growth from 1 to 10k by powers of 10.
- # Override if you need different ranges for your benchmarks.
- #
- # See also: ::bench_exp and ::bench_linear.
-
- def self.bench_range
- bench_exp 1, 10_000
- end
-
- ##
- # Runs the given +work+, gathering the times of each run. Range
- # and times are then passed to a given +validation+ proc. Outputs
- # the benchmark name and times in tab-separated format, making it
- # easy to paste into a spreadsheet for graphing or further
- # analysis.
- #
- # Ranges are specified by ::bench_range.
- #
- # Eg:
- #
- # def bench_algorithm
- # validation = proc { |x, y| ... }
- # assert_performance validation do |n|
- # @obj.algorithm(n)
- # end
- # end
-
- def assert_performance validation, &work
- range = self.class.bench_range
-
- io.print "#{__name__}"
-
- times = []
-
- range.each do |x|
- GC.start
- t0 = Time.now
- instance_exec(x, &work)
- t = Time.now - t0
-
- io.print "\t%9.6f" % t
- times << t
- end
- io.puts
-
- validation[range, times]
- end
-
- ##
- # Runs the given +work+ and asserts that the times gathered fit to
- # match a constant rate (eg, linear slope == 0) within a given
- # +threshold+. Note: because we're testing for a slope of 0, R^2
- # is not a good determining factor for the fit, so the threshold
- # is applied against the slope itself. As such, you probably want
- # to tighten it from the default.
- #
- # See http://www.graphpad.com/curvefit/goodness_of_fit.htm for
- # more details.
- #
- # Fit is calculated by #fit_linear.
- #
- # Ranges are specified by ::bench_range.
- #
- # Eg:
- #
- # def bench_algorithm
- # assert_performance_constant 0.9999 do |n|
- # @obj.algorithm(n)
- # end
- # end
-
- def assert_performance_constant threshold = 0.99, &work
- validation = proc do |range, times|
- a, b, rr = fit_linear range, times
- assert_in_delta 0, b, 1 - threshold
- [a, b, rr]
- end
-
- assert_performance validation, &work
- end
-
- ##
- # Runs the given +work+ and asserts that the times gathered fit to
- # match a exponential curve within a given error +threshold+.
- #
- # Fit is calculated by #fit_exponential.
- #
- # Ranges are specified by ::bench_range.
- #
- # Eg:
- #
- # def bench_algorithm
- # assert_performance_exponential 0.9999 do |n|
- # @obj.algorithm(n)
- # end
- # end
-
- def assert_performance_exponential threshold = 0.99, &work
- assert_performance validation_for_fit(:exponential, threshold), &work
- end
-
- ##
- # Runs the given +work+ and asserts that the times gathered fit to
- # match a straight line within a given error +threshold+.
- #
- # Fit is calculated by #fit_linear.
- #
- # Ranges are specified by ::bench_range.
- #
- # Eg:
- #
- # def bench_algorithm
- # assert_performance_linear 0.9999 do |n|
- # @obj.algorithm(n)
- # end
- # end
-
- def assert_performance_linear threshold = 0.99, &work
- assert_performance validation_for_fit(:linear, threshold), &work
- end
-
- ##
- # Runs the given +work+ and asserts that the times gathered curve
- # fit to match a power curve within a given error +threshold+.
- #
- # Fit is calculated by #fit_power.
- #
- # Ranges are specified by ::bench_range.
- #
- # Eg:
- #
- # def bench_algorithm
- # assert_performance_power 0.9999 do |x|
- # @obj.algorithm
- # end
- # end
-
- def assert_performance_power threshold = 0.99, &work
- assert_performance validation_for_fit(:power, threshold), &work
- end
-
- ##
- # Takes an array of x/y pairs and calculates the general R^2 value.
- #
- # See: http://en.wikipedia.org/wiki/Coefficient_of_determination
-
- def fit_error xys
- y_bar = sigma(xys) { |x, y| y } / xys.size.to_f
- ss_tot = sigma(xys) { |x, y| (y - y_bar) ** 2 }
- ss_err = sigma(xys) { |x, y| (yield(x) - y) ** 2 }
-
- 1 - (ss_err / ss_tot)
- end
-
- ##
- # To fit a functional form: y = ae^(bx).
- #
- # Takes x and y values and returns [a, b, r^2].
- #
- # See: http://mathworld.wolfram.com/LeastSquaresFittingExponential.html
-
- def fit_exponential xs, ys
- n = xs.size
- xys = xs.zip(ys)
- sxlny = sigma(xys) { |x,y| x * Math.log(y) }
- slny = sigma(xys) { |x,y| Math.log(y) }
- sx2 = sigma(xys) { |x,y| x * x }
- sx = sigma xs
-
- c = n * sx2 - sx ** 2
- a = (slny * sx2 - sx * sxlny) / c
- b = ( n * sxlny - sx * slny ) / c
-
- return Math.exp(a), b, fit_error(xys) { |x| Math.exp(a + b * x) }
- end
-
- ##
- # Fits the functional form: a + bx.
- #
- # Takes x and y values and returns [a, b, r^2].
- #
- # See: http://mathworld.wolfram.com/LeastSquaresFitting.html
-
- def fit_linear xs, ys
- n = xs.size
- xys = xs.zip(ys)
- sx = sigma xs
- sy = sigma ys
- sx2 = sigma(xs) { |x| x ** 2 }
- sxy = sigma(xys) { |x,y| x * y }
-
- c = n * sx2 - sx**2
- a = (sy * sx2 - sx * sxy) / c
- b = ( n * sxy - sx * sy ) / c
-
- return a, b, fit_error(xys) { |x| a + b * x }
- end
-
- ##
- # To fit a functional form: y = ax^b.
- #
- # Takes x and y values and returns [a, b, r^2].
- #
- # See: http://mathworld.wolfram.com/LeastSquaresFittingPowerLaw.html
-
- def fit_power xs, ys
- n = xs.size
- xys = xs.zip(ys)
- slnxlny = sigma(xys) { |x, y| Math.log(x) * Math.log(y) }
- slnx = sigma(xs) { |x | Math.log(x) }
- slny = sigma(ys) { | y| Math.log(y) }
- slnx2 = sigma(xs) { |x | Math.log(x) ** 2 }
-
- b = (n * slnxlny - slnx * slny) / (n * slnx2 - slnx ** 2);
- a = (slny - b * slnx) / n
-
- return Math.exp(a), b, fit_error(xys) { |x| (Math.exp(a) * (x ** b)) }
- end
-
- ##
- # Enumerates over +enum+ mapping +block+ if given, returning the
- # sum of the result. Eg:
- #
- # sigma([1, 2, 3]) # => 1 + 2 + 3 => 7
- # sigma([1, 2, 3]) { |n| n ** 2 } # => 1 + 4 + 9 => 14
-
- def sigma enum, &block
- enum = enum.map(&block) if block
- enum.inject { |sum, n| sum + n }
- end
-
- ##
- # Returns a proc that calls the specified fit method and asserts
- # that the error is within a tolerable threshold.
-
- def validation_for_fit msg, threshold
- proc do |range, times|
- a, b, rr = send "fit_#{msg}", range, times
- assert_operator rr, :>=, threshold
- [a, b, rr]
- end
- end
- end
-end
-
-class MiniTest::Spec
- ##
- # This is used to define a new benchmark method. You usually don't
- # use this directly and is intended for those needing to write new
- # performance curve fits (eg: you need a specific polynomial fit).
- #
- # See ::bench_performance_linear for an example of how to use this.
-
- def self.bench name, &block
- define_method "bench_#{name.gsub(/\W+/, '_')}", &block
- end
-
- ##
- # Specifies the ranges used for benchmarking for that class.
- #
- # bench_range do
- # bench_exp(2, 16, 2)
- # end
- #
- # See Unit::TestCase.bench_range for more details.
-
- def self.bench_range &block
- return super unless block
-
- meta = (class << self; self; end)
- meta.send :define_method, "bench_range", &block
- end
-
- ##
- # Create a benchmark that verifies that the performance is linear.
- #
- # describe "my class" do
- # bench_performance_linear "fast_algorithm", 0.9999 do |n|
- # @obj.fast_algorithm(n)
- # end
- # end
-
- def self.bench_performance_linear name, threshold = 0.99, &work
- bench name do
- assert_performance_linear threshold, &work
- end
- end
-
- ##
- # Create a benchmark that verifies that the performance is constant.
- #
- # describe "my class" do
- # bench_performance_constant "zoom_algorithm!" do |n|
- # @obj.zoom_algorithm!(n)
- # end
- # end
-
- def self.bench_performance_constant name, threshold = 0.99, &work
- bench name do
- assert_performance_constant threshold, &work
- end
- end
-
- ##
- # Create a benchmark that verifies that the performance is exponential.
- #
- # describe "my class" do
- # bench_performance_exponential "algorithm" do |n|
- # @obj.algorithm(n)
- # end
- # end
-
- def self.bench_performance_exponential name, threshold = 0.99, &work
- bench name do
- assert_performance_exponential threshold, &work
- end
- end
-end
diff --git a/lib/minitest/hell.rb b/lib/minitest/hell.rb
deleted file mode 100644
index 0e4101f3f8..0000000000
--- a/lib/minitest/hell.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-class Minitest::Unit::TestCase # :nodoc:
- class << self
- alias :old_test_order :test_order
-
- def test_order # :nodoc:
- :parallel
- end
- end
-end
diff --git a/lib/minitest/mock.rb b/lib/minitest/mock.rb
index c636b9e901..ed44164448 100644
--- a/lib/minitest/mock.rb
+++ b/lib/minitest/mock.rb
@@ -1,200 +1,38 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
+############################################################
+# 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 # :nodoc:
-end # omg... worst bug ever. rdoc doesn't allow 1-liners
-
-##
-# A simple and clean mock object framework.
-
-module MiniTest # :nodoc:
-
- ##
- # All mock objects are an instance of Mock
+class MockExpectationError < StandardError; end
+module MiniTest
class Mock
- alias :__respond_to? :respond_to?
-
- skip_methods = %w(object_id respond_to_missing? inspect === to_s)
-
- instance_methods.each do |m|
- undef_method m unless skip_methods.include?(m.to_s) || m =~ /^__/
- end
-
- def initialize # :nodoc:
- @expected_calls = Hash.new { |calls, name| calls[name] = [] }
- @actual_calls = Hash.new { |calls, name| calls[name] = [] }
- end
-
- ##
- # Expect that method +name+ is called, optionally with +args+ or a
- # +blk+, and returns +retval+.
- #
- # @mock.expect(:meaning_of_life, 42)
- # @mock.meaning_of_life # => 42
- #
- # @mock.expect(:do_something_with, true, [some_obj, true])
- # @mock.do_something_with(some_obj, true) # => true
- #
- # @mock.expect(:do_something_else, true) do |a1, a2|
- # a1 == "buggs" && a2 == :bunny
- # end
- #
- # +args+ is compared to the expected args using case equality (ie, the
- # '===' operator), allowing for less specific expectations.
- #
- # @mock.expect(:uses_any_string, true, [String])
- # @mock.uses_any_string("foo") # => true
- # @mock.verify # => true
- #
- # @mock.expect(:uses_one_string, true, ["foo"]
- # @mock.uses_one_string("bar") # => true
- # @mock.verify # => raises MockExpectationError
-
- def expect(name, retval, args=[], &blk)
- if block_given?
- raise ArgumentError, "args ignored when block given" unless args.empty?
- @expected_calls[name] << { :retval => retval, :block => blk }
- else
- raise ArgumentError, "args must be an array" unless Array === args
- @expected_calls[name] << { :retval => retval, :args => args }
- end
+ 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__ :remove_method, name if respond_to? name
+ 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 __call name, data # :nodoc:
- case data
- when Hash then
- "#{name}(#{data[:args].inspect[1..-2]}) => #{data[:retval].inspect}"
- else
- data.map { |d| __call name, d }.join ", "
- end
- end
-
- ##
- # Verify that all methods were called as expected. Raises
- # +MockExpectationError+ if the mock object was not called as
- # expected.
-
def verify
- @expected_calls.each do |name, calls|
- calls.each do |expected|
- msg1 = "expected #{__call name, expected}"
- msg2 = "#{msg1}, got [#{__call name, @actual_calls[name]}]"
-
- raise MockExpectationError, msg2 if
- @actual_calls.has_key?(name) and
- not @actual_calls[name].include?(expected)
-
- raise MockExpectationError, msg1 unless
- @actual_calls.has_key?(name) and
- @actual_calls[name].include?(expected)
- end
+ @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
-
- def method_missing(sym, *args) # :nodoc:
- unless @expected_calls.has_key?(sym) then
- raise NoMethodError, "unmocked method %p, expected one of %p" %
- [sym, @expected_calls.keys.sort_by(&:to_s)]
- end
-
- index = @actual_calls[sym].length
- expected_call = @expected_calls[sym][index]
-
- unless expected_call then
- raise MockExpectationError, "No more expects available for %p: %p" %
- [sym, args]
- end
-
- expected_args, retval, val_block =
- expected_call.values_at(:args, :retval, :block)
-
- if val_block then
- raise MockExpectationError, "mocked method %p failed block w/ %p" %
- [sym, args] unless val_block.call(args)
-
- # keep "verify" happy
- @actual_calls[sym] << expected_call
- return retval
- end
-
- if expected_args.size != args.size then
- raise ArgumentError, "mocked method %p expects %d arguments, got %d" %
- [sym, expected_args.size, args.size]
- end
-
- fully_matched = expected_args.zip(args).all? { |mod, a|
- mod === a or mod == a
- }
-
- unless fully_matched then
- raise MockExpectationError, "mocked method %p called with unexpected arguments %p" %
- [sym, args]
- end
-
- @actual_calls[sym] << {
- :retval => retval,
- :args => expected_args.zip(args).map { |mod, a| mod === a ? mod : a }
- }
-
- retval
- end
-
- def respond_to?(sym, include_private = false) # :nodoc:
- return true if @expected_calls.has_key?(sym.to_sym)
- return __respond_to?(sym, include_private)
- end
- end
-end
-
-class Object # :nodoc:
-
- ##
- # Add a temporary stubbed method replacing +name+ for the duration
- # of the +block+. If +val_or_callable+ responds to #call, then it
- # returns the result of calling it, otherwise returns the value
- # as-is. Cleans up the stub at the end of the +block+.
- #
- # def test_stale_eh
- # obj_under_test = Something.new
- # refute obj_under_test.stale?
- #
- # Time.stub :now, Time.at(0) do
- # assert obj_under_test.stale?
- # end
- # end
-
- def stub name, val_or_callable, &block
- new_name = "__minitest_stub__#{name}"
-
- metaclass = class << self; self; end
-
- if respond_to? name and not methods.map(&:to_s).include? name.to_s then
- metaclass.send :define_method, name do |*args|
- super(*args)
- end
- end
-
- metaclass.send :alias_method, new_name, name
-
- metaclass.send :define_method, name do |*args|
- if val_or_callable.respond_to? :call then
- val_or_callable.call(*args)
- else
- val_or_callable
- end
- end
-
- yield self
- ensure
- metaclass.send :undef_method, name
- metaclass.send :alias_method, name, new_name
- metaclass.send :undef_method, new_name
end
end
diff --git a/lib/minitest/parallel_each.rb b/lib/minitest/parallel_each.rb
deleted file mode 100644
index d501aa34ef..0000000000
--- a/lib/minitest/parallel_each.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-class ParallelEach
- require 'thread'
- include Enumerable
-
- N = (ENV['N'] || 2).to_i
-
- def initialize list
- @queue = Queue.new # *sigh*... the Queue api sucks sooo much...
-
- list.each { |i| @queue << i }
- N.times { @queue << nil }
- end
-
- def grep pattern
- self.class.new super
- end
-
- def each
- threads = N.times.map {
- Thread.new do
- Thread.current.abort_on_exception = true
- while job = @queue.pop
- yield job
- end
- end
- }
- threads.map(&:join)
- end
-end
diff --git a/lib/minitest/pride.rb b/lib/minitest/pride.rb
deleted file mode 100644
index 40c35394fa..0000000000
--- a/lib/minitest/pride.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-require "minitest/unit"
-
-##
-# Show your testing pride!
-
-class PrideIO
-
- # Start an escape sequence
- ESC = "\e["
-
- # End the escape sequence
- NND = "#{ESC}0m"
-
- # The IO we're going to pipe through.
- attr_reader :io
-
- def initialize io # :nodoc:
- @io = io
- # stolen from /System/Library/Perl/5.10.0/Term/ANSIColor.pm
- # also reference http://en.wikipedia.org/wiki/ANSI_escape_code
- @colors ||= (31..36).to_a
- @size = @colors.size
- @index = 0
- # io.sync = true
- end
-
- ##
- # Wrap print to colorize the output.
-
- def print o
- case o
- when "." then
- io.print pride o
- when "E", "F" then
- io.print "#{ESC}41m#{ESC}37m#{o}#{NND}"
- else
- io.print o
- end
- end
-
- def puts(*o) # :nodoc:
- o.map! { |s|
- s.to_s.sub(/Finished tests/) {
- @index = 0
- 'Fabulous tests'.split(//).map { |c|
- pride(c)
- }.join
- }
- }
-
- super
- end
-
- ##
- # Color a string.
-
- def pride string
- string = "*" if string == "."
- c = @colors[@index % @size]
- @index += 1
- "#{ESC}#{c}m#{string}#{NND}"
- end
-
- def method_missing msg, *args # :nodoc:
- io.send(msg, *args)
- end
-end
-
-##
-# If you thought the PrideIO was colorful...
-#
-# (Inspired by lolcat, but with clean math)
-
-class PrideLOL < PrideIO
- PI_3 = Math::PI / 3 # :nodoc:
-
- def initialize io # :nodoc:
- # walk red, green, and blue around a circle separated by equal thirds.
- #
- # To visualize, type this into wolfram-alpha:
- #
- # plot (3*sin(x)+3), (3*sin(x+2*pi/3)+3), (3*sin(x+4*pi/3)+3)
-
- # 6 has wide pretty gradients. 3 == lolcat, about half the width
- @colors = (0...(6 * 7)).map { |n|
- n *= 1.0 / 6
- r = (3 * Math.sin(n ) + 3).to_i
- g = (3 * Math.sin(n + 2 * PI_3) + 3).to_i
- b = (3 * Math.sin(n + 4 * PI_3) + 3).to_i
-
- # Then we take rgb and encode them in a single number using base 6.
- # For some mysterious reason, we add 16... to clear the bottom 4 bits?
- # Yes... they're ugly.
-
- 36 * r + 6 * g + b + 16
- }
-
- super
- end
-
- ##
- # Make the string even more colorful. Damnit.
-
- def pride string
- c = @colors[@index % @size]
- @index += 1
- "#{ESC}38;5;#{c}m#{string}#{NND}"
- end
-end
-
-klass = ENV['TERM'] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
-MiniTest::Unit.output = klass.new(MiniTest::Unit.output)
diff --git a/lib/minitest/spec.rb b/lib/minitest/spec.rb
index 7588982038..59b4c6536c 100644
--- a/lib/minitest/spec.rb
+++ b/lib/minitest/spec.rb
@@ -1,152 +1,114 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
+############################################################
+# 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 # :nodoc:
- def infect_an_assertion meth, new_name, dont_flip = false # :nodoc:
+class Module
+ def infect_an_assertion meth, new_name, dont_flip = false
# warn "%-22p -> %p %p" % [meth, new_name, dont_flip]
self.class_eval <<-EOM
- def #{new_name} *args
- case
- when Proc === self then
- MiniTest::Spec.current.#{meth}(*args, &self)
- when #{!!dont_flip} then
- MiniTest::Spec.current.#{meth}(self, *args)
- else
- MiniTest::Spec.current.#{meth}(args.first, self, *args[1..-1])
- end
+ 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 unless #{!!dont_flip}
+ return MiniTest::Spec.current.#{meth}(self, *args)
end
EOM
end
- ##
- # infect_with_assertions has been removed due to excessive clever.
- # Use infect_an_assertion directly instead.
-
def infect_with_assertions(pos_prefix, neg_prefix,
skip_re,
dont_flip_re = /\c0/,
map = {})
- abort "infect_with_assertions is dead. Use infect_an_assertion directly"
+ 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
+
+ infect_an_assertion meth, new_name, new_name =~ dont_flip_re
+ end
end
end
-module Kernel # :nodoc:
+Object.infect_with_assertions(:must, :wont,
+ /^(must|wont)$|wont_(throw)|
+ must_(block|not?_|nothing|raise$)/x,
+ /(must|wont)_(include|respond_to)/,
+ /(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
##
# Describe a series of expectations for a given target +desc+.
#
# TODO: find good tutorial url.
#
- # Defines a test class subclassing from either MiniTest::Spec or
- # from the surrounding describe's class. The surrounding class may
- # subclass MiniTest::Spec manually in order to easily share code:
- #
- # class MySpec < MiniTest::Spec
- # # ... shared code ...
- # end
- #
- # class TestStuff < MySpec
- # it "does stuff" do
- # # shared code available here
- # end
- # describe "inner stuff" do
- # it "still does stuff" do
- # # ...and here
- # end
- # end
- # end
-
- def describe desc, additional_desc = nil, &block # :doc:
+ # Defines a test class subclassing from either
+ # MiniTest::Unit::TestCase or from the surrounding describe's class.
+
+ def describe desc, &block
stack = MiniTest::Spec.describe_stack
- name = [stack.last, desc, additional_desc].compact.join("::")
- sclas = stack.last || if Class === self && self < MiniTest::Spec then
- self
- else
- MiniTest::Spec.spec_type desc
- end
+ name = desc.to_s.split(/\W+/).map { |s| s.capitalize }.join + "Spec"
+ prev = stack.last
+ name = "#{prev == MiniTest::Spec ? nil : prev}::#{name}"
+ cls = Object.class_eval "class #{name} < #{prev}; end; #{name}"
- cls = sclas.create name, desc
+ cls.nuke_test_methods!
stack.push cls
cls.class_eval(&block)
stack.pop
- cls
end
private :describe
end
-##
-# MiniTest::Spec -- The faster, better, less-magical spec framework!
-#
-# For a list of expectations, see MiniTest::Expectations.
-
-class MiniTest::Spec < MiniTest::Unit::TestCase
- ##
- # Contains pairs of matchers and Spec classes to be used to
- # calculate the superclass of a top-level describe. This allows for
- # automatically customizable spec types.
- #
- # See: register_spec_type and spec_type
-
- TYPES = [[//, MiniTest::Spec]]
-
- ##
- # Register a new type of spec that matches the spec's description.
- # This method can take either a Regexp and a spec class or a spec
- # class and a block that takes the description and returns true if
- # it matches.
- #
- # Eg:
- #
- # register_spec_type(/Controller$/, MiniTest::Spec::Rails)
- #
- # or:
- #
- # register_spec_type(MiniTest::Spec::RailsModel) do |desc|
- # desc.superclass == ActiveRecord::Base
- # end
-
- def self.register_spec_type(*args, &block)
- if block then
- matcher, klass = block, args.first
- else
- matcher, klass = *args
- end
- TYPES.unshift [matcher, klass]
- end
-
- ##
- # Figure out the spec class to use based on a spec's description. Eg:
- #
- # spec_type("BlahController") # => MiniTest::Spec::Rails
-
- def self.spec_type desc
- TYPES.find { |matcher, klass|
- if matcher.respond_to? :call then
- matcher.call desc
- else
- matcher === desc.to_s
- end
- }.last
+class Module
+ def classes type = Object # :nodoc:
+ constants.map { |n| const_get n }.find_all { |c|
+ c.class == Class and type > c
+ } - [self]
end
+end
- @@describe_stack = []
+class MiniTest::Spec < MiniTest::Unit::TestCase
+ @@describe_stack = [MiniTest::Spec]
def self.describe_stack # :nodoc:
@@describe_stack
end
- ##
- # Returns the children of this spec.
+ def self.current # :nodoc:
+ @@current_spec
+ end
- def self.children
- @children ||= []
+ def initialize name # :nodoc:
+ super
+ @@current_spec = self
end
def self.nuke_test_methods! # :nodoc:
@@ -155,6 +117,15 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
end
end
+ def self.define_inheritable_method name, &block # :nodoc:
+ 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
+
##
# Define a 'before' action. Inherits the way normal methods should.
#
@@ -162,11 +133,9 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
#
# Equivalent to MiniTest::Unit::TestCase#setup.
- def self.before type = nil, &block
- define_method :setup do
- super()
- self.instance_eval(&block)
- end
+ def self.before type = :each, &block
+ raise "unsupported before type: #{type}" unless type == :each
+ define_inheritable_method :setup, &block
end
##
@@ -176,11 +145,9 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
#
# Equivalent to MiniTest::Unit::TestCase#teardown.
- def self.after type = nil, &block
- define_method :teardown do
- self.instance_eval(&block)
- super()
- end
+ def self.after type = :each, &block
+ raise "unsupported after type: #{type}" unless type == :each
+ define_inheritable_method :teardown, &block
end
##
@@ -189,353 +156,137 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
# write specs don't like class inheritence, so this goes way out of
# its way to make sure that expectations aren't inherited.
#
- # This is also aliased to #specify and doesn't require a +desc+ arg.
- #
# Hint: If you _do_ want inheritence, use minitest/unit. You can mix
# and match between assertions and expectations as much as you want.
- def self.it desc = "anonymous", &block
+ def self.it desc, &block
block ||= proc { skip "(no tests defined)" }
@specs ||= 0
@specs += 1
- name = "test_%04d_%s" % [ @specs, desc ]
+ name = "test_%04d_%s" % [ @specs, desc.gsub(/\W+/, '_').downcase ]
define_method name, &block
- self.children.each do |mod|
- mod.send :undef_method, name if mod.public_method_defined? name
+ classes(MiniTest::Spec).each do |mod|
+ mod.send :undef_method, name if mod.respond_to? name
end
-
- name
end
##
- # Essentially, define an accessor for +name+ with +block+.
- #
- # Why use let instead of def? I honestly don't know.
-
- def self.let name, &block
- define_method name do
- @_memoized ||= {}
- @_memoized.fetch(name) { |k| @_memoized[k] = instance_eval(&block) }
- end
- end
+ # :method: must_be
+ # See MiniTest::Assertions#assert
##
- # Another lazy man's accessor generator. Made even more lazy by
- # setting the name for you to +subject+.
-
- def self.subject &block
- let :subject, &block
- end
-
- def self.create name, desc # :nodoc:
- cls = Class.new(self) do
- @name = name
- @desc = desc
-
- nuke_test_methods!
- end
-
- children << cls
-
- cls
- end
-
- def self.to_s # :nodoc:
- defined?(@name) ? @name : super
- end
-
- # :stopdoc:
- class << self
- attr_reader :desc
- alias :specify :it
- alias :name :to_s
- end
- # :startdoc:
-end
-
-##
-# It's where you hide your "assertions".
+ # :method: must_be_close_to
+ # See MiniTest::Assertions#assert_in_delta
-module MiniTest::Expectations
##
- # See MiniTest::Assertions#assert_empty.
- #
- # collection.must_be_empty
- #
# :method: must_be_empty
-
- infect_an_assertion :assert_empty, :must_be_empty, :unary
-
- ##
- # See MiniTest::Assertions#assert_equal
- #
- # a.must_equal b
- #
- # :method: must_equal
-
- infect_an_assertion :assert_equal, :must_equal
+ # See MiniTest::Assertions#assert_empty
##
- # See MiniTest::Assertions#assert_in_delta
- #
- # n.must_be_close_to m [, delta]
- #
- # :method: must_be_close_to
-
- infect_an_assertion :assert_in_delta, :must_be_close_to
-
- alias :must_be_within_delta :must_be_close_to # :nodoc:
+ # :method: must_be_instance_of
+ # See MiniTest::Assertions#assert_instance_of
##
- # See MiniTest::Assertions#assert_in_epsilon
- #
- # n.must_be_within_epsilon m [, epsilon]
- #
- # :method: must_be_within_epsilon
-
- infect_an_assertion :assert_in_epsilon, :must_be_within_epsilon
+ # :method: must_be_kind_of
+ # See MiniTest::Assertions#assert_kind_of
##
- # See MiniTest::Assertions#assert_includes
- #
- # collection.must_include obj
- #
- # :method: must_include
-
- infect_an_assertion :assert_includes, :must_include, :reverse
+ # :method: must_be_nil
+ # See MiniTest::Assertions#assert_nil
##
- # See MiniTest::Assertions#assert_instance_of
- #
- # obj.must_be_instance_of klass
- #
- # :method: must_be_instance_of
-
- infect_an_assertion :assert_instance_of, :must_be_instance_of
+ # :method: must_be_same_as
+ # See MiniTest::Assertions#assert_same
##
- # See MiniTest::Assertions#assert_kind_of
- #
- # obj.must_be_kind_of mod
- #
- # :method: must_be_kind_of
-
- infect_an_assertion :assert_kind_of, :must_be_kind_of
+ # :method: must_be_within_delta
+ # See MiniTest::Assertions#assert_in_delta
##
- # See MiniTest::Assertions#assert_match
- #
- # a.must_match b
- #
- # :method: must_match
-
- infect_an_assertion :assert_match, :must_match
+ # :method: must_be_within_epsilon
+ # See MiniTest::Assertions#assert_in_epsilon
##
- # See MiniTest::Assertions#assert_nil
- #
- # obj.must_be_nil
- #
- # :method: must_be_nil
-
- infect_an_assertion :assert_nil, :must_be_nil, :unary
+ # :method: must_equal
+ # See MiniTest::Assertions#assert_equal
##
- # See MiniTest::Assertions#assert_operator
- #
- # n.must_be :<=, 42
- #
- # This can also do predicates:
- #
- # str.must_be :empty?
- #
- # :method: must_be
-
- infect_an_assertion :assert_operator, :must_be, :reverse
+ # :method: must_include
+ # See MiniTest::Assertions#assert_includes
##
- # See MiniTest::Assertions#assert_output
- #
- # proc { ... }.must_output out_or_nil [, err]
- #
- # :method: must_output
-
- infect_an_assertion :assert_output, :must_output
+ # :method: must_match
+ # See MiniTest::Assertions#assert_match
##
- # See MiniTest::Assertions#assert_raises
- #
- # proc { ... }.must_raise exception
- #
# :method: must_raise
-
- infect_an_assertion :assert_raises, :must_raise
+ # See MiniTest::Assertions#assert_raises
##
- # See MiniTest::Assertions#assert_respond_to
- #
- # obj.must_respond_to msg
- #
# :method: must_respond_to
-
- infect_an_assertion :assert_respond_to, :must_respond_to, :reverse
-
- ##
- # See MiniTest::Assertions#assert_same
- #
- # a.must_be_same_as b
- #
- # :method: must_be_same_as
-
- infect_an_assertion :assert_same, :must_be_same_as
+ # See MiniTest::Assertions#assert_respond_to
##
- # See MiniTest::Assertions#assert_send
- # TODO: remove me
- #
- # a.must_send
- #
# :method: must_send
-
- infect_an_assertion :assert_send, :must_send
-
- ##
- # See MiniTest::Assertions#assert_silent
- #
- # proc { ... }.must_be_silent
- #
- # :method: must_be_silent
-
- infect_an_assertion :assert_silent, :must_be_silent
+ # See MiniTest::Assertions#assert_send
##
- # See MiniTest::Assertions#assert_throws
- #
- # proc { ... }.must_throw sym
- #
# :method: must_throw
-
- infect_an_assertion :assert_throws, :must_throw
-
- ##
- # See MiniTest::Assertions#refute_empty
- #
- # collection.wont_be_empty
- #
- # :method: wont_be_empty
-
- infect_an_assertion :refute_empty, :wont_be_empty, :unary
+ # See MiniTest::Assertions#assert_throw
##
- # See MiniTest::Assertions#refute_equal
- #
- # a.wont_equal b
- #
- # :method: wont_equal
-
- infect_an_assertion :refute_equal, :wont_equal
+ # :method: wont_be
+ # See MiniTest::Assertions#refute
##
- # See MiniTest::Assertions#refute_in_delta
- #
- # n.wont_be_close_to m [, delta]
- #
# :method: wont_be_close_to
-
- infect_an_assertion :refute_in_delta, :wont_be_close_to
-
- alias :wont_be_within_delta :wont_be_close_to # :nodoc:
-
- ##
- # See MiniTest::Assertions#refute_in_epsilon
- #
- # n.wont_be_within_epsilon m [, epsilon]
- #
- # :method: wont_be_within_epsilon
-
- infect_an_assertion :refute_in_epsilon, :wont_be_within_epsilon
+ # See MiniTest::Assertions#refute_in_delta
##
- # See MiniTest::Assertions#refute_includes
- #
- # collection.wont_include obj
- #
- # :method: wont_include
-
- infect_an_assertion :refute_includes, :wont_include, :reverse
+ # :method: wont_be_empty
+ # See MiniTest::Assertions#refute_empty
##
- # See MiniTest::Assertions#refute_instance_of
- #
- # obj.wont_be_instance_of klass
- #
# :method: wont_be_instance_of
-
- infect_an_assertion :refute_instance_of, :wont_be_instance_of
+ # See MiniTest::Assertions#refute_instance_of
##
- # See MiniTest::Assertions#refute_kind_of
- #
- # obj.wont_be_kind_of mod
- #
# :method: wont_be_kind_of
-
- infect_an_assertion :refute_kind_of, :wont_be_kind_of
-
- ##
- # See MiniTest::Assertions#refute_match
- #
- # a.wont_match b
- #
- # :method: wont_match
-
- infect_an_assertion :refute_match, :wont_match
+ # See MiniTest::Assertions#refute_kind_of
##
- # See MiniTest::Assertions#refute_nil
- #
- # obj.wont_be_nil
- #
# :method: wont_be_nil
-
- infect_an_assertion :refute_nil, :wont_be_nil, :unary
+ # See MiniTest::Assertions#refute_nil
##
- # See MiniTest::Assertions#refute_operator
- #
- # n.wont_be :<=, 42
- #
- # This can also do predicates:
- #
- # str.wont_be :empty?
- #
- # :method: wont_be
+ # :method: wont_be_same_as
+ # See MiniTest::Assertions#refute_same
- infect_an_assertion :refute_operator, :wont_be, :reverse
+ ##
+ # :method: wont_be_within_delta
+ # See MiniTest::Assertions#refute_in_delta
##
- # See MiniTest::Assertions#refute_respond_to
- #
- # obj.wont_respond_to msg
- #
- # :method: wont_respond_to
+ # :method: wont_be_within_epsilon
+ # See MiniTest::Assertions#refute_in_epsilon
- infect_an_assertion :refute_respond_to, :wont_respond_to, :reverse
+ ##
+ # :method: wont_equal
+ # See MiniTest::Assertions#refute_equal
##
- # See MiniTest::Assertions#refute_same
- #
- # a.wont_be_same_as b
- #
- # :method: wont_be_same_as
+ # :method: wont_include
+ # See MiniTest::Assertions#refute_includes
- infect_an_assertion :refute_same, :wont_be_same_as
-end
+ ##
+ # :method: wont_match
+ # See MiniTest::Assertions#refute_match
-class Object # :nodoc:
- include MiniTest::Expectations unless ENV["MT_NO_EXPECTATIONS"]
+ ##
+ # :method: wont_respond_to
+ # See MiniTest::Assertions#refute_respond_to
end
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
index a221dda4b4..0a45932079 100644
--- a/lib/minitest/unit.rb
+++ b/lib/minitest/unit.rb
@@ -1,34 +1,16 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
+############################################################
+# 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 'optparse'
-require 'rbconfig'
-require 'thread' # required for 1.8
-require 'minitest/parallel_each'
##
# Minimal (mostly drop-in) replacement for test-unit.
-#
-# :include: README.txt
module MiniTest
- def self.const_missing name # :nodoc:
- case name
- when :MINI_DIR then
- msg = "MiniTest::MINI_DIR was removed. Don't violate other's internals."
- warn "WAR\NING: #{msg}"
- warn "WAR\NING: Used by #{caller.first}."
- const_set :MINI_DIR, "bad value"
- else
- super
- end
- end
-
##
# Assertion base class
@@ -39,36 +21,33 @@ module MiniTest
class Skip < Assertion; end
- class << self
- attr_accessor :backtrace_filter
- end
-
- class BacktraceFilter # :nodoc:
- def filter bt
- return ["No backtrace"] unless bt
+ 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)) # :nodoc:
- new_bt = []
-
- unless $DEBUG then
- bt.each do |line|
- break if line =~ /lib\/minitest/
- new_bt << line
- end
-
- new_bt = bt.reject { |line| line =~ /lib\/minitest/ } if new_bt.empty?
- new_bt = bt.dup if new_bt.empty?
- else
- new_bt = bt.dup
- end
+ def self.filter_backtrace bt # :nodoc:
+ return ["No backtrace"] unless bt
- new_bt
+ new_bt = []
+ bt.each do |line|
+ break if line.rindex(MINI_DIR, 0)
+ new_bt << line
end
- end
-
- self.backtrace_filter = BacktraceFilter.new
- def self.filter_backtrace bt # :nodoc:
- backtrace_filter.filter bt
+ 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
##
@@ -76,111 +55,17 @@ module MiniTest
# printed if the assertion fails.
module Assertions
- UNDEFINED = Object.new # :nodoc:
-
- def UNDEFINED.inspect # :nodoc:
- "UNDEFINED" # again with the rdoc bugs... :(
- end
##
- # Returns the diff command to use in #diff. Tries to intelligently
- # figure out what diff to use.
-
- def self.diff
- @diff = if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ then
- "diff.exe -u"
- else
- if system("gdiff", __FILE__, __FILE__)
- "gdiff -u" # solaris and kin suck
- elsif system("diff", __FILE__, __FILE__)
- "diff -u"
- else
- nil
- end
- end unless defined? @diff
-
- @diff
- end
-
- ##
- # Set the diff command to use in #diff.
-
- def self.diff= o
- @diff = o
- end
-
- ##
- # Returns a diff between +exp+ and +act+. If there is no known
- # diff command or if it doesn't make sense to diff the output
- # (single line, short output), then it simply returns a basic
- # comparison between the two.
-
- def diff exp, act
- require "tempfile"
-
- expect = mu_pp_for_diff exp
- butwas = mu_pp_for_diff act
- result = nil
-
- need_to_diff =
- MiniTest::Assertions.diff &&
- (expect.include?("\n") ||
- butwas.include?("\n") ||
- expect.size > 30 ||
- butwas.size > 30 ||
- expect == butwas)
-
- return "Expected: #{mu_pp exp}\n Actual: #{mu_pp act}" unless
- need_to_diff
-
- Tempfile.open("expect") do |a|
- a.puts expect
- a.flush
-
- Tempfile.open("butwas") do |b|
- b.puts butwas
- b.flush
-
- result = `#{MiniTest::Assertions.diff} #{a.path} #{b.path}`
- result.sub!(/^\-\-\- .+/, "--- expected")
- result.sub!(/^\+\+\+ .+/, "+++ actual")
-
- if result.empty? then
- klass = exp.class
- result = [
- "No visible difference in the #{klass}#inspect output.\n",
- "You should look at the implementation of #== on ",
- "#{klass} or its members.\n",
- expect,
- ].join
- end
- end
- end
-
- result
- end
-
- ##
- # This returns a human-readable version of +obj+. By default
- # #inspect is called. You can override this to use #pretty_print
- # if you want.
+ # mu_pp gives a human-readable version of +obj+. By default #inspect is
+ # called. You can override this to use #pretty_print if you want.
def mu_pp obj
s = obj.inspect
- s = s.encode Encoding.default_external if defined? Encoding
+ s = s.force_encoding(Encoding.default_external) if defined? Encoding
s
end
- ##
- # This returns a diff-able human-readable version of +obj+. This
- # differs from the regular mu_pp because it expands escaped
- # newlines and makes hex-values generic (like object_ids). This
- # uses mu_pp to do the first pass and then cleans it up.
-
- def mu_pp_for_diff obj # TODO: possibly rename
- mu_pp(obj).gsub(/\\n/, "\n").gsub(/0x[a-f0-9]+/m, '0xXXXXXX')
- end
-
def _assertions= n # :nodoc:
@_assertions = n
end
@@ -204,14 +89,9 @@ module MiniTest
##
# Fails unless the block returns a true value.
- #
- # NOTE: This method is deprecated, use assert. It will be removed
- # on 2013-01-01."
def assert_block msg = nil
- warn "NOTE: MiniTest::Unit::TestCase#assert_block is deprecated, use assert. It will be removed on 2013-01-01. Called from #{caller.first}"
- msg = message(msg) { "Expected block to return true value" }
- assert yield, msg
+ assert yield, "Expected block to return true value."
end
##
@@ -224,19 +104,12 @@ module MiniTest
end
##
- # Fails unless <tt>exp == act</tt> printing the difference between
- # the two, if possible.
- #
- # If there is no visible difference but the assertion fails, you
- # should suspect that your #== is buggy, or your inspect output is
- # missing crucial details.
+ # Fails unless <tt>exp == act</tt>.
#
- # For floats use assert_in_delta.
- #
- # See also: MiniTest::Assertions.diff
+ # For floats use assert_in_delta
def assert_equal exp, act, msg = nil
- msg = message(msg, "") { diff exp, act }
+ msg = message(msg) { "Expected #{mu_pp(exp)}, not #{mu_pp(act)}" }
assert(exp == act, msg)
end
@@ -248,7 +121,7 @@ module MiniTest
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}"}
+ msg = message(msg) { "Expected #{exp} - #{act} (#{n}) to be < #{delta}" }
assert delta >= n, msg
end
@@ -257,7 +130,7 @@ module MiniTest
# error less than +epsilon+.
def assert_in_epsilon a, b, epsilon = 0.001, msg = nil
- assert_in_delta a, b, [a.abs, b.abs].min * epsilon, msg
+ assert_in_delta a, b, [a, b].min * epsilon, msg
end
##
@@ -272,7 +145,7 @@ module MiniTest
end
##
- # Fails unless +obj+ is an instance of +cls+.
+ # Fails unless +obj+ is an instace of +cls+.
def assert_instance_of cls, obj, msg = nil
msg = message(msg) {
@@ -293,13 +166,13 @@ module MiniTest
end
##
- # Fails unless +matcher+ <tt>=~</tt> +obj+.
+ # Fails unless +exp+ is <tt>=~</tt> +act+.
- def assert_match matcher, obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp matcher} to match #{mu_pp obj}" }
- assert_respond_to matcher, :"=~"
- matcher = Regexp.new Regexp.escape matcher if String === matcher
- assert matcher =~ obj, msg
+ 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
##
@@ -311,85 +184,45 @@ module MiniTest
end
##
- # For testing with binary operators.
+ # For testing equality operators and so-forth.
#
# assert_operator 5, :<=, 4
- def assert_operator o1, op, o2 = UNDEFINED, msg = nil
- return assert_predicate o1, op, msg if UNDEFINED == o2
+ 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
##
- # Fails if stdout or stderr do not output the expected results.
- # Pass in nil if you don't care about that streams output. Pass in
- # "" if you require it to be silent. Pass in a regexp if you want
- # to pattern match.
- #
- # NOTE: this uses #capture_io, not #capture_subprocess_io.
- #
- # See also: #assert_silent
-
- def assert_output stdout = nil, stderr = nil
- out, err = capture_io do
- yield
- end
-
- err_msg = Regexp === stderr ? :assert_match : :assert_equal if stderr
- out_msg = Regexp === stdout ? :assert_match : :assert_equal if stdout
-
- y = send err_msg, stderr, err, "In stderr" if err_msg
- x = send out_msg, stdout, out, "In stdout" if out_msg
-
- (!stdout || x) && (!stderr || y)
- end
-
- ##
- # For testing with predicates.
- #
- # assert_predicate str, :empty?
- #
- # This is really meant for specs and is front-ended by assert_operator:
- #
- # str.must_be :empty?
-
- def assert_predicate o1, op, msg = nil
- msg = message(msg) { "Expected #{mu_pp(o1)} to be #{op}" }
- assert o1.__send__(op), msg
- end
-
- ##
- # Fails unless the block raises one of +exp+. Returns the
- # exception matched so you can check the message, attributes, etc.
+ # Fails unless the block raises one of +exp+
def assert_raises *exp
- msg = "#{exp.pop}.\n" if String === exp.last
-
+ msg = String === exp.last ? exp.pop : nil
+ msg = msg.to_s + "\n" if msg
+ should_raise = false
begin
yield
+ should_raise = true
rescue MiniTest::Skip => e
- return e if exp.include? MiniTest::Skip
- raise e
- rescue Exception => e
- expected = exp.any? { |ex|
- if ex.instance_of? Module then
- e.kind_of? ex
- else
- e.instance_of? ex
- end
- }
+ details = "#{msg}#{mu_pp(exp)} exception expected, not"
- assert expected, proc {
- exception_details(e, "#{msg}#{mu_pp(exp)} exception expected, not")
- }
+ if exp.include? MiniTest::Skip then
+ return e
+ else
+ raise e
+ end
+ rescue Exception => e
+ details = "#{msg}#{mu_pp(exp)} exception expected, not"
+ assert(exp.any? { |ex|
+ ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class
+ }, exception_details(e, details))
return e
end
exp = exp.first if exp.size == 1
-
- flunk "#{msg}#{mu_pp(exp)} expected but nothing was raised."
+ flunk "#{msg}#{mu_pp(exp)} expected but nothing was raised." if
+ should_raise
end
##
@@ -397,8 +230,8 @@ module MiniTest
def assert_respond_to obj, meth, msg = nil
msg = message(msg) {
- "Expected #{mu_pp(obj)} (#{obj.class}) to respond to ##{meth}"
- }
+ "Expected #{mu_pp(obj)} (#{obj.class}) to respond to ##{meth}"
+ }
assert obj.respond_to?(meth), msg
end
@@ -427,17 +260,6 @@ module MiniTest
end
##
- # Fails if the block outputs anything to stderr or stdout.
- #
- # See also: #assert_output
-
- def assert_silent
- assert_output "", "" do
- yield
- end
- end
-
- ##
# Fails unless the block throws +sym+
def assert_throws sym, msg = nil
@@ -446,8 +268,6 @@ module MiniTest
catch(sym) do
begin
yield
- rescue ThreadError => e # wtf?!? 1.8 + threads == suck
- default += ", not \:#{e.message[/uncaught throw \`(\w+?)\'/, 1]}"
rescue ArgumentError => e # 1.9 exception
default += ", not #{e.message.split(/ /).last}"
rescue NameError => e # 1.8 exception
@@ -463,90 +283,31 @@ module MiniTest
# Captures $stdout and $stderr into strings:
#
# out, err = capture_io do
- # puts "Some info"
# warn "You did a bad thing"
# end
#
- # assert_match %r%info%, out
# assert_match %r%bad%, err
- #
- # NOTE: For efficiency, this method uses StringIO and does not
- # capture IO for subprocesses. Use #capture_subprocess_io for
- # that.
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
- synchronize do
- orig_stdout, orig_stderr = $stdout, $stderr
- $stdout, $stderr = captured_stdout, captured_stderr
-
- begin
- yield
- ensure
- $stdout = orig_stdout
- $stderr = orig_stderr
- end
- end
+ yield
return captured_stdout.string, captured_stderr.string
- end
-
- ##
- # Captures $stdout and $stderr into strings, using Tempfile to
- # ensure that subprocess IO is captured as well.
- #
- # out, err = capture_subprocess_io do
- # system "echo Some info"
- # system "echo You did a bad thing 1>&2"
- # end
- #
- # assert_match %r%info%, out
- # assert_match %r%bad%, err
- #
- # NOTE: This method is approximately 10x slower than #capture_io so
- # only use it when you need to test the output of a subprocess.
-
- def capture_subprocess_io
- require 'tempfile'
-
- captured_stdout, captured_stderr = Tempfile.new("out"), Tempfile.new("err")
-
- synchronize do
- orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
- $stdout.reopen captured_stdout
- $stderr.reopen captured_stderr
-
- begin
- yield
-
- $stdout.rewind
- $stderr.rewind
-
- [captured_stdout.read, captured_stderr.read]
- ensure
- captured_stdout.unlink
- captured_stderr.unlink
- $stdout.reopen orig_stdout
- $stderr.reopen orig_stderr
- end
- end
+ ensure
+ $stdout = orig_stdout
+ $stderr = orig_stderr
end
##
# Returns details for exception +e+
def exception_details e, msg
- [
- "#{msg}",
- "Class: <#{e.class}>",
- "Message: <#{e.message.inspect}>",
- "---Backtrace---",
- "#{MiniTest::filter_backtrace(e.backtrace).join("\n")}",
- "---------------",
- ].join "\n"
+ "#{msg}\nClass: <#{e.class}>\nMessage: <#{e.message.inspect}>\n---Backtrace---\n#{MiniTest::filter_backtrace(e.backtrace).join("\n")}\n---------------"
end
##
@@ -560,10 +321,16 @@ module MiniTest
##
# Returns a proc that will output +msg+ along with the default message.
- def message msg = nil, ending = ".", &default
+ def message msg = nil, &default
proc {
- custom_message = "#{msg}.\n" unless msg.nil? or msg.to_s.empty?
- "#{custom_message}#{default.call}#{ending}"
+ 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
@@ -586,7 +353,7 @@ module MiniTest
# Fails if +obj+ is empty.
def refute_empty obj, msg = nil
- msg = message(msg) { "Expected #{mu_pp(obj)} to not be empty" }
+ msg = message(msg) { "Expected #{obj.inspect} to not be empty" }
assert_respond_to obj, :empty?
refute obj.empty?, msg
end
@@ -604,14 +371,14 @@ module MiniTest
end
##
- # For comparing Floats. Fails if +exp+ is within +delta+ of +act+.
+ # For comparing Floats. Fails if +exp+ is within +delta+ of +act+
#
# refute_in_delta Math::PI, (22.0 / 7.0)
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}"
+ "Expected #{exp} - #{act} (#{n}) to not be < #{delta}"
}
refute delta > n, msg
end
@@ -625,7 +392,7 @@ module MiniTest
end
##
- # Fails if +collection+ includes +obj+.
+ # Fails if +collection+ includes +obj+
def refute_includes collection, obj, msg = nil
msg = message(msg) {
@@ -636,7 +403,7 @@ module MiniTest
end
##
- # Fails if +obj+ is an instance of +cls+.
+ # Fails if +obj+ is an instance of +cls+
def refute_instance_of cls, obj, msg = nil
msg = message(msg) {
@@ -646,7 +413,7 @@ module MiniTest
end
##
- # Fails if +obj+ is a kind of +cls+.
+ # Fails if +obj+ is a kind of +cls+
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}" }
@@ -654,13 +421,13 @@ module MiniTest
end
##
- # Fails if +matcher+ <tt>=~</tt> +obj+.
+ # Fails if +exp+ <tt>=~</tt> +act+
- def refute_match matcher, obj, msg = nil
- msg = message(msg) {"Expected #{mu_pp matcher} to not match #{mu_pp obj}"}
- assert_respond_to matcher, :"=~"
- matcher = Regexp.new Regexp.escape matcher if String === matcher
- refute matcher =~ obj, msg
+ 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 and String === act
+ refute exp =~ act, msg
end
##
@@ -672,32 +439,19 @@ module MiniTest
end
##
- # Fails if +o1+ is not +op+ +o2+. Eg:
+ # Fails if +o1+ is not +op+ +o2+ nil. eg:
#
# refute_operator 1, :>, 2 #=> pass
# refute_operator 1, :<, 2 #=> fail
- def refute_operator o1, op, o2 = UNDEFINED, msg = nil
- return refute_predicate o1, op, msg if UNDEFINED == o2
- msg = message(msg) { "Expected #{mu_pp(o1)} to not be #{op} #{mu_pp(o2)}"}
+ 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
##
- # For testing with predicates.
- #
- # refute_predicate str, :empty?
- #
- # This is really meant for specs and is front-ended by refute_operator:
- #
- # str.wont_be :empty?
-
- def refute_predicate o1, op, msg = nil
- msg = message(msg) { "Expected #{mu_pp(o1)} to not be #{op}" }
- refute o1.__send__(op), msg
- end
-
- ##
# Fails if +obj+ responds to the message +meth+.
def refute_respond_to obj, meth, msg = nil
@@ -725,55 +479,24 @@ module MiniTest
msg ||= "Skipped, no message given"
raise MiniTest::Skip, msg, bt
end
-
- ##
- # Takes a block and wraps it with the runner's shared mutex.
-
- def synchronize
- Minitest::Unit.runner.synchronize do
- yield
- end
- end
end
- class Unit # :nodoc:
- VERSION = "4.3.2" # :nodoc:
+ class Unit
+ VERSION = "1.6.0" # :nodoc:
attr_accessor :report, :failures, :errors, :skips # :nodoc:
attr_accessor :test_count, :assertion_count # :nodoc:
attr_accessor :start_time # :nodoc:
- attr_accessor :help # :nodoc:
- attr_accessor :verbose # :nodoc:
- attr_writer :options # :nodoc:
-
- ##
- # Lazy accessor for options.
-
- def options
- @options ||= {}
- end
@@installed_at_exit ||= false
@@out = $stdout
- @@after_tests = []
-
- ##
- # A simple hook allowing you to run a block of code after _all_ of
- # the tests are done. Eg:
- #
- # MiniTest::Unit.after_tests { p $debugging_info }
-
- def self.after_tests &block
- @@after_tests << block
- end
##
# Registers MiniTest::Unit to run tests at process exit
def self.autorun
at_exit {
- # don't run if there was a non-exit exception
- next if $! and not $!.kind_of? SystemExit
+ next if $! # don't run if there was an exception
# the order here is important. The at_exit handler must be
# installed before anyone else gets a chance to install their
@@ -781,24 +504,13 @@ module MiniTest
# to run (at_exit stacks).
exit_code = nil
- at_exit {
- @@after_tests.reverse_each(&:call)
- exit false if exit_code && exit_code != 0
- }
-
- exit_code = MiniTest::Unit.new.run ARGV
+ at_exit { exit false if exit_code && exit_code != 0 }
+ exit_code = MiniTest::Unit.new.run(ARGV)
} unless @@installed_at_exit
@@installed_at_exit = true
end
##
- # Returns the stream to use for output.
-
- def self.output
- @@out
- end
-
- ##
# Sets MiniTest::Unit to write output to +stream+. $stdout is the default
# output
@@ -806,143 +518,6 @@ module MiniTest
@@out = stream
end
- ##
- # Tells MiniTest::Unit to delegate to +runner+, an instance of a
- # MiniTest::Unit subclass, when MiniTest::Unit#run is called.
-
- def self.runner= runner
- @@runner = runner
- end
-
- ##
- # Returns the MiniTest::Unit subclass instance that will be used
- # to run the tests. A MiniTest::Unit instance is the default
- # runner.
-
- def self.runner
- @@runner ||= self.new
- end
-
- ##
- # Return all plugins' run methods (methods that start with "run_").
-
- def self.plugins
- @@plugins ||= (["run_tests"] +
- public_instance_methods(false).
- grep(/^run_/).map { |s| s.to_s }).uniq
- end
-
- ##
- # Return the IO for output.
-
- def output
- self.class.output
- end
-
- def puts *a # :nodoc:
- output.puts(*a)
- end
-
- def print *a # :nodoc:
- output.print(*a)
- end
-
- ##
- # Runner for a given +type+ (eg, test vs bench).
-
- def _run_anything type
- suites = TestCase.send "#{type}_suites"
- return if suites.empty?
-
- start = Time.now
-
- puts
- puts "# Running #{type}s:"
- puts
-
- @test_count, @assertion_count = 0, 0
- sync = output.respond_to? :"sync=" # stupid emacs
- old_sync, output.sync = output.sync, true if sync
-
- results = _run_suites suites, type
-
- @test_count = results.inject(0) { |sum, (tc, _)| sum + tc }
- @assertion_count = results.inject(0) { |sum, (_, ac)| sum + ac }
-
- output.sync = old_sync if sync
-
- t = Time.now - start
-
- puts
- puts
- puts "Finished #{type}s in %.6fs, %.4f tests/s, %.4f assertions/s." %
- [t, test_count / t, assertion_count / t]
-
- report.each_with_index do |msg, i|
- puts "\n%3d) %s" % [i + 1, msg]
- end
-
- puts
-
- status
- end
-
- ##
- # Runs all the +suites+ for a given +type+. Runs suites declaring
- # a test_order of +:parallel+ in parallel, and everything else
- # serial.
-
- def _run_suites suites, type
- parallel, serial = suites.partition { |s| s.test_order == :parallel }
-
- ParallelEach.new(parallel).map { |suite| _run_suite suite, type } +
- serial.map { |suite| _run_suite suite, type }
- end
-
- ##
- # Run a single +suite+ for a given +type+.
-
- def _run_suite suite, type
- header = "#{type}_suite_header"
- puts send(header, suite) if respond_to? header
-
- filter = options[:filter] || '/./'
- filter = Regexp.new $1 if filter =~ /\/(.*)\//
-
- assertions = suite.send("#{type}_methods").grep(filter).map { |method|
- inst = suite.new method
- inst._assertions = 0
-
- print "#{suite}##{method} = " if @verbose
-
- start_time = Time.now if @verbose
- result = inst.run self
-
- print "%.2f s = " % (Time.now - start_time) if @verbose
- print result
- puts if @verbose
-
- inst._assertions
- }
-
- return assertions.size, assertions.inject(0) { |sum, n| sum + n }
- end
-
- ##
- # Record the result of a single run. Makes it very easy to gather
- # information. Eg:
- #
- # class StatisticsRecorder < MiniTest::Unit
- # def record suite, method, assertions, time, error
- # # ... record the results somewhere ...
- # end
- # end
- #
- # MiniTest::Unit.runner = StatisticsRecorder.new
-
- def record suite, method, assertions, time, error
- end
-
def location e # :nodoc:
last_before_assertion = ""
e.backtrace.reverse_each do |s|
@@ -960,14 +535,13 @@ module MiniTest
e = case e
when MiniTest::Skip then
@skips += 1
- return "S" unless @verbose
"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 "
+ bt = MiniTest::filter_backtrace(e.backtrace).join("\n ")
"Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n #{bt}\n"
end
@report << e
@@ -978,16 +552,10 @@ module MiniTest
@report = []
@errors = @failures = @skips = 0
@verbose = false
- @mutex = Mutex.new
end
- def synchronize # :nodoc:
- @mutex.synchronize { yield }
- end
-
- def process_args args = [] # :nodoc:
+ def process_args args = []
options = {}
- orig_args = args.dup
OptionParser.new do |opts|
opts.banner = 'minitest options:'
@@ -1006,269 +574,103 @@ module MiniTest
options[:verbose] = true
end
- opts.on '-n', '--name PATTERN', "Filter test names on pattern (e.g. /foo/)" do |a|
+ opts.on '-n', '--name PATTERN', "Filter test names on pattern." do |a|
options[:filter] = a
end
- opts.parse! args
- orig_args -= args
- end
-
- unless options[:seed] then
- srand
- options[:seed] = srand % 0xFFFF
- orig_args << "--seed" << options[:seed].to_s
+ opts.parse args
end
- srand options[:seed]
-
- self.verbose = options[:verbose]
- @help = orig_args.map { |s| s =~ /[\s|&<>$()]/ ? s.inspect : s }.join " "
-
options
end
##
- # Begins the full test run. Delegates to +runner+'s #_run method.
+ # Top level driver, controls all output and filtering.
def run args = []
- self.class.runner._run(args)
- end
-
- ##
- # Top level driver, controls all output and filtering.
+ options = process_args args
- def _run args = []
- self.options = process_args args
+ @verbose = options[:verbose]
- puts "Run options: #{help}"
+ filter = options[:filter] || '/./'
+ filter = Regexp.new $1 if filter and filter =~ /\/(.*)\//
- self.class.plugins.each do |plugin|
- send plugin
- break unless report.empty?
+ seed = options[:seed]
+ unless seed then
+ srand
+ seed = srand % 0xFFFF
end
- return failures + errors if @test_count > 0 # or return nil...
- rescue Interrupt
- abort 'Interrupted'
- end
+ srand seed
- ##
- # Runs test suites matching +filter+.
+ @@out.puts "Loaded suite #{$0.sub(/\.rb$/, '')}\nStarted"
- def run_tests
- _run_anything :test
- end
-
- ##
- # Writes status to +io+
-
- def status io = self.output
- format = "%d tests, %d assertions, %d failures, %d errors, %d skips"
- io.puts format % [test_count, assertion_count, failures, errors, skips]
- end
-
- ##
- # Provides a simple set of guards that you can use in your tests
- # to skip execution if it is not applicable. These methods are
- # mixed into TestCase as both instance and class methods so you
- # can use them inside or outside of the test methods.
- #
- # def test_something_for_mri
- # skip "bug 1234" if jruby?
- # # ...
- # end
- #
- # if windows? then
- # # ... lots of test methods ...
- # end
+ start = Time.now
+ run_test_suites filter
- module Guard
+ @@out.puts
+ @@out.puts "Finished in #{'%.6f' % (Time.now - start)} seconds."
- ##
- # Is this running on jruby?
-
- def jruby? platform = RUBY_PLATFORM
- "java" == platform
+ @report.each_with_index do |msg, i|
+ @@out.puts "\n%3d) %s" % [i + 1, msg]
end
- ##
- # Is this running on mri?
+ @@out.puts
- def mri? platform = RUBY_DESCRIPTION
- /^ruby/ =~ platform
- end
+ status
- ##
- # Is this running on rubinius?
+ @@out.puts
- def rubinius? platform = defined?(RUBY_ENGINE) && RUBY_ENGINE
- "rbx" == platform
- end
+ help = ["--seed", seed]
+ help.push "--verbose" if @verbose
+ help.push("--name", options[:filter].inspect) if options[:filter]
- ##
- # Is this running on windows?
+ @@out.puts "Test run options: #{help.join(" ")}"
- def windows? platform = RUBY_PLATFORM
- /mswin|mingw/ =~ platform
- end
+ return failures + errors if @test_count > 0 # or return nil...
+ rescue Interrupt
+ abort 'Interrupted'
end
##
- # Provides before/after hooks for setup and teardown. These are
- # meant for library writers, NOT for regular test authors. See
- # #before_setup for an example.
-
- module LifecycleHooks
- ##
- # Runs before every test, after setup. This hook is meant for
- # libraries to extend minitest. It is not meant to be used by
- # test developers.
- #
- # See #before_setup for an example.
-
- def after_setup; end
-
- ##
- # Runs before every test, before setup. This hook is meant for
- # libraries to extend minitest. It is not meant to be used by
- # test developers.
- #
- # As a simplistic example:
- #
- # module MyMinitestPlugin
- # def before_setup
- # super
- # # ... stuff to do before setup is run
- # end
- #
- # def after_setup
- # # ... stuff to do after setup is run
- # super
- # end
- #
- # def before_teardown
- # super
- # # ... stuff to do before teardown is run
- # end
- #
- # def after_teardown
- # # ... stuff to do after teardown is run
- # super
- # end
- # end
- #
- # class MiniTest::Unit::TestCase
- # include MyMinitestPlugin
- # end
-
- def before_setup; end
-
- ##
- # Runs after every test, before teardown. This hook is meant for
- # libraries to extend minitest. It is not meant to be used by
- # test developers.
- #
- # See #before_setup for an example.
-
- def before_teardown; end
-
- ##
- # Runs after every test, after teardown. This hook is meant for
- # libraries to extend minitest. It is not meant to be used by
- # test developers.
- #
- # See #before_setup for an example.
+ # Writes status to +io+
- def after_teardown; 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
- module Deprecated # :nodoc:
-
- ##
- # This entire module is deprecated and slated for removal on 2013-01-01.
-
- module Hooks
- def run_setup_hooks # :nodoc:
- _run_hooks self.class.setup_hooks
- end
-
- def _run_hooks hooks # :nodoc:
- hooks.each do |hook|
- if hook.respond_to?(:arity) && hook.arity == 1
- hook.call(self)
- else
- hook.call
- end
- end
- end
-
- def run_teardown_hooks # :nodoc:
- _run_hooks self.class.teardown_hooks.reverse
- end
- end
-
- ##
- # This entire module is deprecated and slated for removal on 2013-01-01.
-
- module HooksCM
- ##
- # Adds a block of code that will be executed before every
- # TestCase is run.
- #
- # NOTE: This method is deprecated, use before/after_setup. It
- # will be removed on 2013-01-01.
-
- def add_setup_hook arg=nil, &block
- warn "NOTE: MiniTest::Unit::TestCase.add_setup_hook is deprecated, use before/after_setup via a module (and call super!). It will be removed on 2013-01-01. Called from #{caller.first}"
- hook = arg || block
- @setup_hooks << hook
- end
-
- def setup_hooks # :nodoc:
- if superclass.respond_to? :setup_hooks then
- superclass.setup_hooks
- else
- []
- end + @setup_hooks
- end
-
- ##
- # Adds a block of code that will be executed after every
- # TestCase is run.
- #
- # NOTE: This method is deprecated, use before/after_teardown. It
- # will be removed on 2013-01-01.
-
- def add_teardown_hook arg=nil, &block
- warn "NOTE: MiniTest::Unit::TestCase#add_teardown_hook is deprecated, use before/after_teardown. It will be removed on 2013-01-01. Called from #{caller.first}"
- hook = arg || block
- @teardown_hooks << hook
- end
+ ##
+ # Runs test suites matching +filter+
- def teardown_hooks # :nodoc:
- if superclass.respond_to? :teardown_hooks then
- superclass.teardown_hooks
- else
- []
- end + @teardown_hooks
+ 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
##
- # Subclass TestCase to create your own tests. Typically you'll want a
+ # Subclass TestCase to create your own tests. Typically you'll want a
# TestCase subclass per implementation class.
- #
- # See MiniTest::Assertions
class TestCase
- include LifecycleHooks
- include Deprecated::Hooks
- extend Deprecated::HooksCM # UGH... I can't wait 'til 2013!
- include Guard
- extend Guard
-
attr_reader :__name__ # :nodoc:
PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException,
@@ -1280,78 +682,39 @@ module MiniTest
# Runs the tests reporting the status to +runner+
def run runner
- trap "INFO" do
- runner.report.each_with_index do |msg, i|
- warn "\n%3d) %s" % [i + 1, msg]
- end
- warn ''
- time = runner.start_time ? Time.now - runner.start_time : 0
- warn "Current Test: %s#%s %.2fs" % [self.class, self.__name__, time]
+ trap 'INFO' do
+ warn '%s#%s %.2fs' % [self.class, self.__name__,
+ (Time.now - runner.start_time)]
runner.status $stderr
end if SUPPORTS_INFO_SIGNAL
- start_time = Time.now
-
- result = ""
+ result = '.'
begin
@passed = nil
- self.before_setup
self.setup
- self.after_setup
- self.run_test self.__name__
- result = "." unless io?
- time = Time.now - start_time
- runner.record self.class, self.__name__, self._assertions, time, nil
+ self.__send__ self.__name__
@passed = true
rescue *PASSTHROUGH_EXCEPTIONS
raise
rescue Exception => e
@passed = false
- time = Time.now - start_time
- runner.record self.class, self.__name__, self._assertions, time, e
- result = runner.puke self.class, self.__name__, e
+ result = runner.puke(self.class, self.__name__, e)
ensure
- %w{ before_teardown teardown after_teardown }.each do |hook|
- begin
- self.send hook
- rescue *PASSTHROUGH_EXCEPTIONS
- raise
- rescue Exception => e
- @passed = false
- result = runner.puke self.class, self.__name__, e
- end
+ 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
- alias :run_test :__send__
-
def initialize name # :nodoc:
@__name__ = name
- @__io__ = nil
@passed = nil
- @@current = self
- end
-
- def self.current # :nodoc:
- @@current
- end
-
- ##
- # Return the output IO object
-
- def io
- @__io__ = true
- MiniTest::Unit.output
- end
-
- ##
- # Have we hooked up the IO yet?
-
- def io?
- @__io__
end
def self.reset # :nodoc:
@@ -1360,68 +723,30 @@ module MiniTest
reset
- ##
- # Call this at the top of your tests when you absolutely
- # positively need to have ordered tests. In doing so, you're
- # admitting that you suck and your tests are weak.
-
- def self.i_suck_and_my_tests_are_order_dependent!
- class << self
- undef_method :test_order if method_defined? :test_order
- define_method :test_order do :alpha end
- end
- end
-
- ##
- # Make diffs for this TestCase use #pretty_inspect so that diff
- # in assert_equal can be more details. NOTE: this is much slower
- # than the regular inspect but much more usable for complex
- # objects.
-
- def self.make_my_diffs_pretty!
- require 'pp'
-
- define_method :mu_pp do |o|
- o.pretty_inspect
- end
- end
-
- ##
- # Call this at the top of your tests when you want to run your
- # tests in parallel. In doing so, you're admitting that you rule
- # and your tests are awesome.
-
- def self.parallelize_me!
- class << self
- undef_method :test_order if method_defined? :test_order
- define_method :test_order do :parallel end
- end
- end
-
def self.inherited klass # :nodoc:
@@test_suites[klass] = true
- klass.reset_setup_teardown_hooks
- super
end
- def self.test_order # :nodoc:
+ ##
+ # Defines test order and is subclassable. Defaults to :random
+ # but can be overridden to return :alpha if your tests are order
+ # dependent (read: weak).
+
+ def self.test_order
:random
end
def self.test_suites # :nodoc:
- @@test_suites.keys.sort_by { |ts| ts.name.to_s }
+ @@test_suites.keys.sort_by { |ts| ts.name }
end
def self.test_methods # :nodoc:
methods = public_instance_methods(true).grep(/^test/).map { |m| m.to_s }
case self.test_order
- when :parallel
- max = methods.size
- ParallelEach.new methods.sort.sort_by { rand max }
when :random then
max = methods.size
- methods.sort.sort_by { rand max }
+ methods.sort.sort_by { rand(max) }
when :alpha, :sorted then
methods.sort
else
@@ -1437,32 +762,20 @@ module MiniTest
end
##
- # Runs before every test. Use this to set up before each test
- # run.
+ # Runs before every test. Use this to refactor test initialization.
def setup; end
##
- # Runs after every test. Use this to clean up after each test
- # run.
+ # Runs after every test. Use this to refactor test cleanup.
def teardown; end
- def self.reset_setup_teardown_hooks # :nodoc:
- # also deprecated... believe it.
- @setup_hooks = []
- @teardown_hooks = []
- end
-
- reset_setup_teardown_hooks
-
include MiniTest::Assertions
end # class TestCase
end # class Unit
end # module MiniTest
-Minitest = MiniTest # :nodoc: because ugh... I typo this all the time
-
if $DEBUG then
module Test # :nodoc:
module Unit # :nodoc:
@@ -1475,3 +788,4 @@ if $DEBUG then
end
end
end
+
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f04ab1ed26..1019a5d92e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1,4 +1,4 @@
-# -*- coding: us-ascii -*-
+# -*- indent-tabs-mode: t -*-
# module to create Makefile for extension modules
# invoke like: ruby -r mkmf extconf.rb
@@ -6,1833 +6,1485 @@ require 'rbconfig'
require 'fileutils'
require 'shellwords'
-# :stopdoc:
-class String
- # Wraps a string in escaped quotes if it contains whitespace.
- def quote
- /\s/ =~ self ? "\"#{self}\"" : "#{self}"
- end
-
- # Escape whitespaces for Makefile.
- def unspace
- gsub(/\s/, '\\\\\\&')
- end
+CONFIG = RbConfig::MAKEFILE_CONFIG
+ORIG_LIBPATH = ENV['LIB']
- # Generates a string used as cpp macro name.
- def tr_cpp
- strip.upcase.tr_s("^A-Z0-9_*", "_").tr_s("*", "P")
- end
-
- def funcall_style
- /\)\z/ =~ self ? dup : "#{self}()"
- end
-
- def sans_arguments
- self[/\A[^()]+/]
- end
+CXX_EXT = %w[cc cxx cpp]
+if File::FNM_SYSCASE.zero?
+ CXX_EXT.concat(%w[C])
end
-
-class Array
- # Wraps all strings in escaped quotes if they contain whitespace.
- def quote
- map {|s| s.quote}
+SRC_EXT = %w[c m].concat(CXX_EXT)
+$static = nil
+$config_h = '$(arch_hdrdir)/ruby/config.h'
+$default_static = $static
+
+unless defined? $configure_args
+ $configure_args = {}
+ args = CONFIG["configure_args"]
+ if ENV["CONFIGURE_ARGS"]
+ args << " " << ENV["CONFIGURE_ARGS"]
+ end
+ for arg in Shellwords::shellwords(args)
+ arg, val = arg.split('=', 2)
+ next unless arg
+ arg.tr!('_', '-')
+ if arg.sub!(/^(?!--)/, '--')
+ val or next
+ arg.downcase!
+ end
+ next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg
+ $configure_args[arg] = val || true
+ end
+ for arg in ARGV
+ arg, val = arg.split('=', 2)
+ next unless arg
+ arg.tr!('_', '-')
+ if arg.sub!(/^(?!--)/, '--')
+ val or next
+ arg.downcase!
+ end
+ $configure_args[arg] = val || true
end
end
-# :startdoc:
-
-##
-# mkmf.rb is used by ruby C extensions to generate a Makefile which will
-# correctly compile and link the C extension to ruby and a third-party
-# library.
-module MakeMakefile
-
- ##
- # The makefile configuration using the defaults from when ruby was built.
-
- CONFIG = RbConfig::MAKEFILE_CONFIG
- ORIG_LIBPATH = ENV['LIB']
-
- ##
- # Extensions for files compiled with a C compiler
-
- C_EXT = %w[c m]
-
- ##
- # Extensions for files complied with a C++ compiler
-
- CXX_EXT = %w[cc mm cxx cpp]
- if File::FNM_SYSCASE.zero?
- CXX_EXT.concat(%w[C])
- end
- ##
- # Extensions for source files
+$libdir = CONFIG["libdir"]
+$rubylibdir = CONFIG["rubylibdir"]
+$archdir = CONFIG["archdir"]
+$sitedir = CONFIG["sitedir"]
+$sitelibdir = CONFIG["sitelibdir"]
+$sitearchdir = CONFIG["sitearchdir"]
+$vendordir = CONFIG["vendordir"]
+$vendorlibdir = CONFIG["vendorlibdir"]
+$vendorarchdir = CONFIG["vendorarchdir"]
+
+$mswin = /mswin/ =~ RUBY_PLATFORM
+$bccwin = /bccwin/ =~ RUBY_PLATFORM
+$mingw = /mingw/ =~ RUBY_PLATFORM
+$cygwin = /cygwin/ =~ 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/)
- SRC_EXT = C_EXT + CXX_EXT
+# :stopdoc:
- ##
- # Extensions for header files
+def config_string(key, config = CONFIG)
+ s = config[key] and !s.empty? and block_given? ? yield(s) : s
+end
- HDR_EXT = %w[h hpp]
- $static = nil
- $config_h = '$(arch_hdrdir)/ruby/config.h'
- $default_static = $static
+def dir_re(dir)
+ Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
+end
- unless defined? $configure_args
- $configure_args = {}
- args = CONFIG["configure_args"]
- if ENV["CONFIGURE_ARGS"]
- args << " " << ENV["CONFIGURE_ARGS"]
- end
- for arg in Shellwords::shellwords(args)
- arg, val = arg.split('=', 2)
- next unless arg
- arg.tr!('_', '-')
- if arg.sub!(/^(?!--)/, '--')
- val or next
- arg.downcase!
- end
- next if /^--(?:top|topsrc|src|cur)dir$/ =~ arg
- $configure_args[arg] = val || true
- end
- for arg in ARGV
- arg, val = arg.split('=', 2)
- next unless arg
- arg.tr!('_', '-')
- if arg.sub!(/^(?!--)/, '--')
- val or next
- arg.downcase!
- end
- $configure_args[arg] = val || true
- 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
- $libdir = CONFIG["libdir"]
- $rubylibdir = CONFIG["rubylibdir"]
- $archdir = CONFIG["archdir"]
- $sitedir = CONFIG["sitedir"]
- $sitelibdir = CONFIG["sitelibdir"]
- $sitearchdir = CONFIG["sitearchdir"]
- $vendordir = CONFIG["vendordir"]
- $vendorlibdir = CONFIG["vendorlibdir"]
- $vendorarchdir = CONFIG["vendorarchdir"]
+INSTALL_DIRS = [
+ [dir_re('commondir'), "$(RUBYCOMMONDIR)"],
+ [dir_re('sitedir'), "$(RUBYCOMMONDIR)"],
+ [dir_re('vendordir'), "$(RUBYCOMMONDIR)"],
+ [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
+ [dir_re('archdir'), "$(RUBYARCHDIR)"],
+ [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)"],
+]
+
+def install_dirs(target_prefix = nil)
+ if $extout
+ dirs = [
+ ['BINDIR', '$(extout)/bin'],
+ ['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"],
+ ]
+ elsif $extmk
+ dirs = [
+ ['BINDIR', '$(bindir)'],
+ ['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 = [
+ ['BINDIR', '$(bindir)'],
+ ['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 = [
+ ['BINDIR', '$(bindir)'],
+ ['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}" : "")]
+ dirs
+end
- $mswin = /mswin/ =~ RUBY_PLATFORM
- $bccwin = /bccwin/ =~ RUBY_PLATFORM
- $mingw = /mingw/ =~ RUBY_PLATFORM
- $cygwin = /cygwin/ =~ 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/)
+def map_dir(dir, map = nil)
+ map ||= INSTALL_DIRS
+ map.inject(dir) {|d, (orig, new)| d.gsub(orig, new)}
+end
- # :stopdoc:
+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")
+ $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)"
+else
+ abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
+end
- def config_string(key, config = CONFIG)
- s = config[key] and !s.empty? and block_given? ? yield(s) : s
- end
- module_function :config_string
+OUTFLAG = CONFIG['OUTFLAG']
+COUTFLAG = CONFIG['COUTFLAG']
+CPPOUTFILE = CONFIG['CPPOUTFILE']
- def dir_re(dir)
- Regexp.new('\$(?:\('+dir+'\)|\{'+dir+'\})(?:\$(?:\(target_prefix\)|\{target_prefix\}))?')
- end
- module_function :dir_re
+CONFTEST_C = "conftest.c".freeze
- 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)"],
- [dir_re('vendordir'), "$(RUBYCOMMONDIR)"],
- [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
- [dir_re('archdir'), "$(RUBYARCHDIR)"],
- [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)"],
- ]
-
- def install_dirs(target_prefix = nil)
- if $extout
- dirs = [
- ['BINDIR', '$(extout)/bin'],
- ['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"],
- ]
- elsif $extmk
- dirs = [
- ['BINDIR', '$(bindir)'],
- ['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 = [
- ['BINDIR', '$(bindir)'],
- ['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 = [
- ['BINDIR', '$(bindir)'],
- ['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}" : "")]
- dirs
+class String
+ # Wraps a string in escaped quotes if it contains whitespace.
+ def quote
+ /\s/ =~ self ? "\"#{self}\"" : "#{self}"
end
- def map_dir(dir, map = nil)
- map ||= INSTALL_DIRS
- map.inject(dir) {|d, (orig, new)| d.gsub(orig, new)}
+ # Generates a string used as cpp macro name.
+ def tr_cpp
+ strip.upcase.tr_s("^A-Z0-9_", "_")
end
-
- topdir = File.dirname(File.dirname(__FILE__))
- path = File.expand_path($0)
- until (dir = File.dirname(path)) == path
- if File.identical?(dir, topdir)
- $extmk = true if %r"\A(?:ext|enc|tool|test)\z" =~ File.basename(path)
- break
- end
- path = dir
- end
- $extmk ||= false
- if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
- $topdir = $hdrdir
- $top_srcdir = $hdrdir
- $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
- elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
- $topdir ||= RbConfig::CONFIG["topdir"]
- $arch_hdrdir = "$(extout)/include/$(arch)"
- else
- abort "mkmf.rb can't find header files for ruby at #{$hdrdir}/ruby.h"
+end
+class Array
+ # Wraps all strings in escaped quotes if they contain whitespace.
+ def quote
+ map {|s| s.quote}
end
+end
- OUTFLAG = CONFIG['OUTFLAG']
- COUTFLAG = CONFIG['COUTFLAG']
- CPPOUTFILE = CONFIG['CPPOUTFILE']
+def rm_f(*files)
+ opt = (Hash === files.last ? [files.pop] : [])
+ FileUtils.rm_f(Dir[*files.flatten], *opt)
+end
- CONFTEST_C = "conftest.c".freeze
+def rm_rf(*files)
+ opt = (Hash === files.last ? [files.pop] : [])
+ FileUtils.rm_rf(Dir[*files.flatten], *opt)
+end
- def rm_f(*files)
- opt = (Hash === files.last ? [files.pop] : [])
- FileUtils.rm_f(Dir[*files.flatten], *opt)
- end
- module_function :rm_f
+# Returns time stamp of the +target+ file if it exists and is newer
+# than or equal to all of +times+.
+def modified?(target, times)
+ (t = File.mtime(target)) rescue return nil
+ Array === times or times = [times]
+ t if times.all? {|n| n <= t}
+end
- def rm_rf(*files)
- opt = (Hash === files.last ? [files.pop] : [])
- FileUtils.rm_rf(Dir[*files.flatten], *opt)
+def merge_libs(*libs)
+ libs.inject([]) do |x, y|
+ xy = x & y
+ xn = yn = 0
+ y = y.inject([]) {|ary, e| ary.last == e ? ary : ary << e}
+ y.each_with_index do |v, yi|
+ if xy.include?(v)
+ xi = [x.index(v), xn].max()
+ x[xi, 1] = y[yn..yi]
+ xn, yn = xi + (yi - yn + 1), yi + 1
+ end
+ end
+ x.concat(y[yn..-1] || [])
end
- module_function :rm_rf
+end
- # Returns time stamp of the +target+ file if it exists and is newer than or
- # equal to all of +times+.
- def modified?(target, times)
- (t = File.mtime(target)) rescue return nil
- Array === times or times = [times]
- t if times.all? {|n| n <= t}
+# This is a custom logging module. It generates an mkmf.log file when you
+# run your extconf.rb script. This can be useful for debugging unexpected
+# failures.
+#
+# This module and its associated methods are meant for internal use only.
+#
+module Logging
+ @log = nil
+ @logfile = 'mkmf.log'
+ @orgerr = $stderr.dup
+ @orgout = $stdout.dup
+ @postpone = 0
+ @quiet = $extmk
+
+ def self::log_open
+ @log ||= File::open(@logfile, 'wb')
+ @log.sync = true
+ end
+
+ def self::open
+ log_open
+ $stderr.reopen(@log)
+ $stdout.reopen(@log)
+ yield
+ ensure
+ $stderr.reopen(@orgerr)
+ $stdout.reopen(@orgout)
end
- def split_libs(*strs)
- strs.map {|s| s.split(/\s+(?=-|\z)/)}.flatten
+ def self::message(*s)
+ log_open
+ @log.printf(*s)
end
- def merge_libs(*libs)
- libs.inject([]) do |x, y|
- y = y.inject([]) {|ary, e| ary.last == e ? ary : ary << e}
- y.each_with_index do |v, yi|
- if xi = x.rindex(v)
- x[(xi+1)..-1] = merge_libs(y[(yi+1)..-1], x[(xi+1)..-1])
- x[xi, 0] = y[0...yi]
- break
- end
- end and x.concat(y)
- x
+ def self::logfile file
+ @logfile = file
+ if @log and not @log.closed?
+ @log.flush
+ @log.close
+ @log = nil
end
end
- # This is a custom logging module. It generates an mkmf.log file when you
- # run your extconf.rb script. This can be useful for debugging unexpected
- # failures.
- #
- # This module and its associated methods are meant for internal use only.
- #
- module Logging
- @log = nil
- @logfile = 'mkmf.log'
- @orgerr = $stderr.dup
- @orgout = $stdout.dup
- @postpone = 0
- @quiet = $extmk
-
- def self::log_open
- @log ||= File::open(@logfile, 'wb')
- @log.sync = true
- end
-
- def self::log_opened?
- @log and not @log.closed?
- end
-
- def self::open
- log_open
- $stderr.reopen(@log)
- $stdout.reopen(@log)
- yield
- ensure
- $stderr.reopen(@orgerr)
- $stdout.reopen(@orgout)
- end
-
- def self::message(*s)
- log_open
- @log.printf(*s)
- end
-
- def self::logfile file
- @logfile = file
- log_close
- end
-
- def self::log_close
- if @log and not @log.closed?
- @log.flush
+ def self::postpone
+ tmplog = "mkmftmp#{@postpone += 1}.log"
+ open do
+ log, *save = @log, @logfile, @orgout, @orgerr
+ @log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
+ begin
+ log.print(open {yield})
+ ensure
@log.close
- @log = nil
- end
- end
-
- def self::postpone
- tmplog = "mkmftmp#{@postpone += 1}.log"
- open do
- log, *save = @log, @logfile, @orgout, @orgerr
- @log, @logfile, @orgout, @orgerr = nil, tmplog, log, log
- begin
- log.print(open {yield @log})
- ensure
- @log.close if @log and not @log.closed?
- File::open(tmplog) {|t| FileUtils.copy_stream(t, log)} if File.exist?(tmplog)
- @log, @logfile, @orgout, @orgerr = log, *save
- @postpone -= 1
- MakeMakefile.rm_f tmplog
- end
+ File::open(tmplog) {|t| FileUtils.copy_stream(t, log)}
+ @log, @logfile, @orgout, @orgerr = log, *save
+ @postpone -= 1
+ rm_f tmplog
end
end
+ end
- class << self
- attr_accessor :quiet
- end
+ class << self
+ attr_accessor :quiet
end
+end
- def xsystem command, opts = nil
- varpat = /\$\((\w+)\)|\$\{(\w+)\}/
- if varpat =~ command
- vars = Hash.new {|h, k| h[k] = ENV[k]}
- command = command.dup
- nil while command.gsub!(varpat) {vars[$1||$2]}
- end
- Logging::open do
- puts command.quote
- if opts and opts[:werror]
- result = nil
- Logging.postpone do |log|
- result = (system(command) and File.zero?(log.path))
- ""
- end
- result
- else
- system(command)
- end
- end
+def xsystem command
+ varpat = /\$\((\w+)\)|\$\{(\w+)\}/
+ if varpat =~ command
+ vars = Hash.new {|h, k| h[k] = ''; ENV[k]}
+ command = command.dup
+ nil while command.gsub!(varpat) {vars[$1||$2]}
+ end
+ Logging::open do
+ puts command.quote
+ system(command)
end
+end
- def xpopen command, *mode, &block
- Logging::open do
- case mode[0]
- when nil, /^r/
- puts "#{command} |"
- else
- puts "| #{command}"
- end
- IO.popen(command, *mode, &block)
+def xpopen command, *mode, &block
+ Logging::open do
+ case mode[0]
+ when nil, /^r/
+ puts "#{command} |"
+ else
+ puts "| #{command}"
end
+ IO.popen(command, *mode, &block)
end
+end
- def log_src(src, heading="checked program was")
- src = src.split(/^/)
- fmt = "%#{src.size.to_s.size}d: %s"
- Logging::message <<"EOM"
-#{heading}:
+def log_src(src)
+ src = src.split(/^/)
+ fmt = "%#{src.size.to_s.size}d: %s"
+ Logging::message <<"EOM"
+checked program was:
/* begin */
EOM
- src.each_with_index {|line, no| Logging::message fmt, no+1, line}
- Logging::message <<"EOM"
+ src.each_with_index {|line, no| Logging::message fmt, no+1, line}
+ Logging::message <<"EOM"
/* end */
EOM
- end
+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
+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
end
+ src
+end
- def have_devel?
- unless defined? $have_devel
- $have_devel = true
- $have_devel = try_link(MAIN_DOES_NOTHING)
- end
- $have_devel
+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, *opts, &b)
- unless have_devel?
- raise <<MSG
-The compiler failed to generate an executable file.
+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
- begin
- src = create_tmpsrc(src, &b)
- xsystem(command, *opts)
- ensure
- log_src(src)
- MakeMakefile.rm_rf 'conftest.dSYM'
- end
end
-
- def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
- librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
- conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
- 'src' => "#{CONFTEST_C}",
- 'arch_hdrdir' => $arch_hdrdir.quote,
- 'top_srcdir' => $top_srcdir.quote,
- 'INCFLAGS' => "#$INCFLAGS",
- 'CPPFLAGS' => "#$CPPFLAGS",
- 'CFLAGS' => "#$CFLAGS",
- 'ARCH_FLAG' => "#$ARCH_FLAG",
- 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
- 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
- 'LIBS' => "#{librubyarg} #{opt} #$LIBS")
- conf['LIBPATH'] = libpathflag(libpath.map {|s| RbConfig::expand(s.dup, conf)})
- RbConfig::expand(TRY_LINK.dup, conf)
- end
-
- def cc_command(opt="")
- conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
- 'arch_hdrdir' => $arch_hdrdir.quote,
- 'top_srcdir' => $top_srcdir.quote)
- RbConfig::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.quote,
- 'top_srcdir' => $top_srcdir.quote)
- if $universal and (arch_flag = conf['ARCH_FLAG']) and !arch_flag.empty?
- conf['ARCH_FLAG'] = arch_flag.gsub(/(?:\G|\s)-arch\s+\S+/, '')
- end
- RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
- conf)
+ begin
+ src = create_tmpsrc(src, &b)
+ xsystem(command)
+ ensure
+ log_src(src)
+ rm_rf 'conftest.dSYM'
end
+end
- def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
- libpath.map{|x|
- case x
- when "$(topdir)", /\A\./
- LIBPATHFLAG
- else
- LIBPATHFLAG+RPATHFLAG
- end % x.quote
- }.join
- 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)
+end
- def with_werror(opt, opts = nil)
- if opts
- if opts[:werror] and config_string("WERRORFLAG") {|flag| opt = opt ? "#{opt} #{flag}" : flag}
- (opts = opts.dup).delete(:werror)
- end
- yield(opt, opts)
+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)
+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)
+end
+
+def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
+ libpath.map{|x|
+ case x
+ when "$(topdir)", /\A\./
+ LIBPATHFLAG
else
- yield(opt)
- end
- end
+ LIBPATHFLAG+RPATHFLAG
+ end % x.quote
+ }.join
+end
- def try_link0(src, opt="", *opts, &b) # :nodoc:
- cmd = link_command("", opt)
- if $universal
- require 'tmpdir'
- Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
- begin
- ENV["TMPDIR"] = tmpdir
- try_do(src, cmd, *opts, &b)
- ensure
- ENV["TMPDIR"] = oldtmpdir
- 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
- else
- try_do(src, cmd, *opts, &b)
- end and File.executable?("conftest#{$EXEEXT}")
- end
-
- # Returns whether or not the +src+ can be compiled as a C source and linked
- # with its depending libraries successfully. +opt+ is passed to the linker
- # as options. Note that +$CFLAGS+ and +$LDFLAGS+ are also passed to the
- # linker.
- #
- # If a block given, it is called with the source before compilation. You can
- # modify the source in the block.
- #
- # [+src+] a String which contains a C source
- # [+opt+] a String which contains linker options
- def try_link(src, opt="", *opts, &b)
- try_link0(src, opt, *opts, &b)
- ensure
- MakeMakefile.rm_f "conftest*", "c0x32*"
- end
-
- # Returns whether or not the +src+ can be compiled as a C source. +opt+ is
- # passed to the C compiler as options. Note that +$CFLAGS+ is also passed to
- # the compiler.
- #
- # If a block given, it is called with the source before compilation. You can
- # modify the source in the block.
- #
- # [+src+] a String which contains a C source
- # [+opt+] a String which contains compiler options
- def try_compile(src, opt="", *opts, &b)
- with_werror(opt, *opts) {|_opt, *_opts| try_do(src, cc_command(_opt), *_opts, &b)} and
- File.file?("conftest.#{$OBJEXT}")
- ensure
- MakeMakefile.rm_f "conftest*"
- end
-
- # Returns whether or not the +src+ can be preprocessed with the C
- # preprocessor. +opt+ is passed to the preprocessor as options. Note that
- # +$CFLAGS+ is also passed to the preprocessor.
- #
- # If a block given, it is called with the source before preprocessing. You
- # can modify the source in the block.
- #
- # [+src+] a String which contains a C source
- # [+opt+] a String which contains preprocessor options
- def try_cpp(src, opt="", *opts, &b)
- try_do(src, cpp_command(CPPOUTFILE, opt), *opts, &b) and
- File.file?("conftest.i")
- ensure
- MakeMakefile.rm_f "conftest*"
+ end
+ else
+ try_do(src, cmd, &b)
end
+end
- alias_method :try_header, (config_string('try_header') || :try_cpp)
+def try_link(src, opt="", &b)
+ try_link0(src, opt, &b)
+ensure
+ rm_f "conftest*", "c0x32*"
+end
- def cpp_include(header)
- if header
- header = [header] unless header.kind_of? Array
- header.map {|h| String === h ? "#include <#{h}>\n" : h}.join
- else
- ""
- end
- end
+def try_compile(src, opt="", &b)
+ try_do(src, cc_command(opt), &b)
+ensure
+ rm_f "conftest*"
+end
- def with_cppflags(flags)
- cppflags = $CPPFLAGS
- $CPPFLAGS = flags
- ret = yield
- ensure
- $CPPFLAGS = cppflags unless ret
- end
+def try_cpp(src, opt="", &b)
+ try_do(src, cpp_command(CPPOUTFILE, opt), &b)
+ensure
+ rm_f "conftest*"
+end
- def try_cppflags(flags)
- try_header(MAIN_DOES_NOTHING, flags)
- end
+class Object
+ alias_method :try_header, (config_string('try_header') || :try_cpp)
+end
- def with_cflags(flags)
- cflags = $CFLAGS
- $CFLAGS = flags
- ret = yield
- ensure
- $CFLAGS = cflags unless ret
+def cpp_include(header)
+ if header
+ header = [header] unless header.kind_of? Array
+ header.map {|h| String === h ? "#include <#{h}>\n" : h}.join
+ else
+ ""
end
+end
- def try_cflags(flags)
- try_compile(MAIN_DOES_NOTHING, flags)
- end
+def with_cppflags(flags)
+ cppflags = $CPPFLAGS
+ $CPPFLAGS = flags
+ ret = yield
+ensure
+ $CPPFLAGS = cppflags unless ret
+end
- def with_ldflags(flags)
- ldflags = $LDFLAGS
- $LDFLAGS = flags
- ret = yield
- ensure
- $LDFLAGS = ldflags unless ret
- end
+def with_cflags(flags)
+ cflags = $CFLAGS
+ $CFLAGS = flags
+ ret = yield
+ensure
+ $CFLAGS = cflags unless ret
+end
- def try_ldflags(flags)
- try_link(MAIN_DOES_NOTHING, flags)
- end
+def with_ldflags(flags)
+ ldflags = $LDFLAGS
+ $LDFLAGS = flags
+ ret = yield
+ensure
+ $LDFLAGS = ldflags unless ret
+end
- def try_static_assert(expr, headers = nil, opt = "", &b)
- headers = cpp_include(headers)
- try_compile(<<SRC, opt, &b)
+def try_static_assert(expr, headers = nil, opt = "", &b)
+ headers = cpp_include(headers)
+ try_compile(<<SRC, opt, &b)
#{headers}
/*top*/
int conftest_const[(#{expr}) ? 1 : -1];
SRC
- end
+end
- def try_constant(const, headers = nil, opt = "", &b)
- includes = cpp_include(headers)
- neg = try_static_assert("#{const} < 0", headers, opt)
- if CROSS_COMPILING
- if neg
- const = "-(#{const})"
- elsif try_static_assert("#{const} > 0", headers, opt)
- # positive constant
- elsif try_static_assert("#{const} == 0", headers, opt)
- return 0
+def try_constant(const, headers = nil, opt = "", &b)
+ includes = cpp_include(headers)
+ if CROSS_COMPILING
+ if try_static_assert("#{const} > 0", headers, opt)
+ # positive constant
+ elsif try_static_assert("#{const} < 0", headers, opt)
+ neg = true
+ const = "-(#{const})"
+ elsif try_static_assert("#{const} == 0", headers, opt)
+ return 0
+ else
+ # not a constant
+ return nil
+ end
+ upper = 1
+ lower = 0
+ until try_static_assert("#{const} <= #{upper}", headers, opt)
+ lower = upper
+ upper <<= 1
+ end
+ return nil unless lower
+ while upper > lower + 1
+ mid = (upper + lower) / 2
+ if try_static_assert("#{const} > #{mid}", headers, opt)
+ lower = mid
else
- # not a constant
- return nil
+ upper = mid
end
- upper = 1
- lower = 0
- until try_static_assert("#{const} <= #{upper}", headers, opt)
- lower = upper
- upper <<= 1
- end
- return nil unless lower
- while upper > lower + 1
- mid = (upper + lower) / 2
- if try_static_assert("#{const} > #{mid}", headers, opt)
- lower = mid
- else
- upper = mid
- end
- end
- upper = -upper if neg
- return upper
- else
- src = %{#{includes}
+ end
+ upper = -upper if neg
+ return upper
+ else
+ src = %{#{includes}
#include <stdio.h>
/*top*/
-typedef#{neg ? '' : ' unsigned'}
-#ifdef PRI_LL_PREFIX
-#define PRI_CONFTEST_PREFIX PRI_LL_PREFIX
-LONG_LONG
-#else
-#define PRI_CONFTEST_PREFIX "l"
-long
-#endif
-conftest_type;
-conftest_type conftest_const = (conftest_type)(#{const});
-int main() {printf("%"PRI_CONFTEST_PREFIX"#{neg ? 'd' : 'u'}\\n", conftest_const); return 0;}
+int conftest_const = (int)(#{const});
+int main() {printf("%d\\n", conftest_const); return 0;}
}
- begin
- if try_link0(src, opt, &b)
- xpopen("./conftest") do |f|
- return Integer(f.gets)
- end
- end
- ensure
- MakeMakefile.rm_f "conftest*"
+ if try_link0(src, opt, &b)
+ xpopen("./conftest") do |f|
+ return Integer(f.gets)
end
end
- nil
end
+ nil
+end
- # You should use +have_func+ rather than +try_func+.
- #
- # [+func+] a String which contains a symbol name
- # [+libs+] a String which contains library names.
- # [+headers+] a String or an Array of strings which contains names of header
- # files.
- def try_func(func, libs, headers = nil, opt = "", &b)
- headers = cpp_include(headers)
- case func
- when /^&/
- decltype = proc {|x|"const volatile void *#{x}"}
- when /\)$/
- call = func
- else
- call = "#{func}()"
- decltype = proc {|x| "void ((*#{x})())"}
- end
- if opt and !opt.empty?
- [[:to_str], [:join, " "], [:to_s]].each do |meth, *args|
- if opt.respond_to?(meth)
- break opt = opt.send(meth, *args)
- end
- end
- opt = "#{opt} #{libs}"
- else
- opt = libs
- end
- decltype && try_link(<<"SRC", opt, &b) or
+def try_func(func, libs, headers = nil, &b)
+ headers = cpp_include(headers)
+ try_link(<<"SRC", libs, &b) or
#{headers}
/*top*/
-extern int t(void);
-int t(void) { #{decltype["volatile p"]}; p = (#{decltype[]})#{func}; return 0; }
-#{MAIN_DOES_NOTHING "t"}
+#{MAIN_DOES_NOTHING}
+int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
SRC
- call && try_link(<<"SRC", opt, &b)
+ try_link(<<"SRC", libs, &b)
#{headers}
/*top*/
-extern int t(void);
-int t(void) { #{call}; return 0; }
-#{MAIN_DOES_NOTHING "t"}
+#{MAIN_DOES_NOTHING}
+int t() { #{func}(); return 0; }
SRC
- end
+end
- # You should use +have_var+ rather than +try_var+.
- def try_var(var, headers = nil, opt = "", &b)
- headers = cpp_include(headers)
- try_compile(<<"SRC", opt, &b)
+def try_var(var, headers = nil, &b)
+ headers = cpp_include(headers)
+ try_compile(<<"SRC", &b)
#{headers}
/*top*/
-extern int t(void);
-int t(void) { const volatile void *volatile p; p = &(&#{var})[0]; return 0; }
-#{MAIN_DOES_NOTHING "t"}
+#{MAIN_DOES_NOTHING}
+int t() { const volatile void *volatile p; p = &(&#{var})[0]; return 0; }
SRC
- end
+end
- # Returns whether or not the +src+ can be preprocessed with the C
- # preprocessor and matches with +pat+.
- #
- # If a block given, it is called with the source before compilation. You can
- # modify the source in the block.
- #
- # [+pat+] a Regexp or a String
- # [+src+] a String which contains a C source
- # [+opt+] a String which contains preprocessor options
- #
- # NOTE: When pat is a Regexp the matching will be checked in process,
- # otherwise egrep(1) will be invoked to check it.
- def egrep_cpp(pat, src, opt = "", &b)
- src = create_tmpsrc(src, &b)
- xpopen(cpp_command('', opt)) do |f|
- if Regexp === pat
- puts(" ruby -ne 'print if #{pat.inspect}'")
- f.grep(pat) {|l|
- puts "#{f.lineno}: #{l}"
- return true
- }
- false
- else
- puts(" egrep '#{pat}'")
- begin
- stdin = $stdin.dup
- $stdin.reopen(f)
- system("egrep", pat)
- ensure
- $stdin.reopen(stdin)
- end
+def egrep_cpp(pat, src, opt = "", &b)
+ src = create_tmpsrc(src, &b)
+ xpopen(cpp_command('', opt)) do |f|
+ if Regexp === pat
+ puts(" ruby -ne 'print if #{pat.inspect}'")
+ f.grep(pat) {|l|
+ puts "#{f.lineno}: #{l}"
+ return true
+ }
+ false
+ else
+ puts(" egrep '#{pat}'")
+ begin
+ stdin = $stdin.dup
+ $stdin.reopen(f)
+ system("egrep", pat)
+ ensure
+ $stdin.reopen(stdin)
end
end
- ensure
- MakeMakefile.rm_f "conftest*"
- log_src(src)
end
+ensure
+ rm_f "conftest*"
+ log_src(src)
+end
- # This is used internally by the have_macro? method.
- def macro_defined?(macro, src, opt = "", &b)
- src = src.sub(/[^\n]\z/, "\\&\n")
- try_compile(src + <<"SRC", opt, &b)
+# This is used internally by the have_macro? method.
+def macro_defined?(macro, src, opt = "", &b)
+ src = src.sub(/[^\n]\z/, "\\&\n")
+ try_compile(src + <<"SRC", opt, &b)
/*top*/
#ifndef #{macro}
# error
-|:/ === #{macro} undefined === /:|
+>>>>>> #{macro} undefined <<<<<<
#endif
SRC
+end
+
+def try_run(src, opt = "", &b)
+ if try_link0(src, opt, &b)
+ xsystem("./conftest")
+ else
+ nil
end
+ensure
+ rm_f "conftest*"
+end
- # Returns whether or not:
- # * the +src+ can be compiled as a C source,
- # * the result object can be linked with its depending libraries
- # successfully,
- # * the linked file can be invoked as an executable
- # * and the executable exits successfully
- #
- # +opt+ is passed to the linker as options. Note that +$CFLAGS+ and
- # +$LDFLAGS+ are also passed to the linker.
- #
- # If a block given, it is called with the source before compilation. You can
- # modify the source in the block.
- #
- # [+src+] a String which contains a C source
- # [+opt+] a String which contains linker options
- #
- # Returns true when the executable exits successfully, false when it fails,
- # or nil when preprocessing, compilation or link fails.
- def try_run(src, opt = "", &b)
- if try_link0(src, opt, &b)
- xsystem("./conftest")
+def install_files(mfile, ifiles, map = nil, srcprefix = nil)
+ ifiles or return
+ ifiles.empty? and return
+ srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
+ RbConfig::expand(srcdir = srcprefix.dup)
+ dirs = []
+ path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
+ ifiles.each do |files, dir, prefix|
+ dir = map_dir(dir, map)
+ prefix &&= %r|\A#{Regexp.quote(prefix)}/?|
+ if /\A\.\// =~ files
+ # install files which are in current working directory.
+ files = files[2..-1]
+ len = nil
else
- nil
- end
- ensure
- MakeMakefile.rm_f "conftest*"
- end
-
- def install_files(mfile, ifiles, map = nil, srcprefix = nil)
- ifiles or return
- ifiles.empty? and return
- srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
- RbConfig::expand(srcdir = srcprefix.dup)
- dirs = []
- path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
- ifiles.each do |files, dir, prefix|
- dir = map_dir(dir, map)
- prefix &&= %r|\A#{Regexp.quote(prefix)}/?|
- if /\A\.\// =~ files
- # install files which are in current working directory.
- files = files[2..-1]
- len = nil
- else
- # install files which are under the $(srcdir).
- files = File.join(srcdir, files)
- len = srcdir.size
- end
- f = nil
- Dir.glob(files) do |fx|
- f = fx
- f[0..len] = "" if len
- case File.basename(f)
- when *$NONINSTALLFILES
- next
- end
- d = File.dirname(f)
- d.sub!(prefix, "") if prefix
- d = (d.empty? || d == ".") ? dir : File.join(dir, d)
- f = File.join(srcprefix, f) if len
- path[d] << f
- end
- unless len or f
- d = File.dirname(files)
- d.sub!(prefix, "") if prefix
- d = (d.empty? || d == ".") ? dir : File.join(dir, d)
- path[d] << files
+ # install files which are under the $(srcdir).
+ files = File.join(srcdir, files)
+ len = srcdir.size
+ end
+ f = nil
+ Dir.glob(files) do |fx|
+ f = fx
+ f[0..len] = "" if len
+ case File.basename(f)
+ when *$NONINSTALLFILES
+ next
end
+ d = File.dirname(f)
+ d.sub!(prefix, "") if prefix
+ d = (d.empty? || d == ".") ? dir : File.join(dir, d)
+ f = File.join(srcprefix, f) if len
+ path[d] << f
+ end
+ unless len or f
+ d = File.dirname(files)
+ d.sub!(prefix, "") if prefix
+ d = (d.empty? || d == ".") ? dir : File.join(dir, d)
+ path[d] << files
end
- dirs
end
+ dirs
+end
- def install_rb(mfile, dest, srcdir = nil)
- install_files(mfile, [["lib/**/*.rb", dest, "lib"]], nil, srcdir)
- end
+def install_rb(mfile, dest, srcdir = nil)
+ install_files(mfile, [["lib/**/*.rb", dest, "lib"]], nil, srcdir)
+end
- def append_library(libs, lib) # :no-doc:
- format(LIBARG, lib) + " " + libs
- end
+def append_library(libs, lib) # :no-doc:
+ format(LIBARG, lib) + " " + libs
+end
- def message(*s)
- unless Logging.quiet and not $VERBOSE
- printf(*s)
- $stdout.flush
- end
+def message(*s)
+ unless Logging.quiet and not $VERBOSE
+ printf(*s)
+ $stdout.flush
end
+end
- # This emits a string to stdout that allows users to see the results of the
- # various have* and find* methods as they are tested.
- #
- # Internal use only.
- #
- def checking_for(m, fmt = nil)
- f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
- m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
- message "%s", m
- a = r = nil
- Logging::postpone do
- r = yield
- a = (fmt ? "#{fmt % r}" : r ? "yes" : "no") << "\n"
- "#{f}#{m}-------------------- #{a}\n"
- end
- message(a)
- Logging::message "--------------------\n\n"
- r
- end
+# This emits a string to stdout that allows users to see the results of the
+# various have* and find* methods as they are tested.
+#
+# Internal use only.
+#
+def checking_for(m, fmt = nil)
+ f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
+ m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
+ message "%s", m
+ a = r = nil
+ Logging::postpone do
+ r = yield
+ a = (fmt ? fmt % r : r ? "yes" : "no") << "\n"
+ "#{f}#{m}-------------------- #{a}\n"
+ end
+ message(a)
+ Logging::message "--------------------\n\n"
+ r
+end
- def checking_message(target, place = nil, opt = nil)
- [["in", place], ["with", opt]].inject("#{target}") do |msg, (pre, noun)|
- if noun
- [[:to_str], [:join, ","], [:to_s]].each do |meth, *args|
- if noun.respond_to?(meth)
- break noun = noun.send(meth, *args)
- end
+def checking_message(target, place = nil, opt = nil)
+ [["in", place], ["with", opt]].inject("#{target}") do |msg, (pre, noun)|
+ if noun
+ [[:to_str], [:join, ","], [:to_s]].each do |meth, *args|
+ if noun.respond_to?(meth)
+ break noun = noun.send(meth, *args)
end
- msg << " #{pre} #{noun}" unless noun.empty?
end
- msg
+ msg << " #{pre} #{noun}" unless noun.empty?
end
+ msg
end
+end
- # :startdoc:
+# :startdoc:
- # Returns whether or not +macro+ is defined either in the common header
- # files or within any +headers+ you provide.
- #
- # Any options you pass to +opt+ are passed along to the compiler.
- #
- def have_macro(macro, headers = nil, opt = "", &b)
- checking_for checking_message(macro, headers, opt) do
- macro_defined?(macro, cpp_include(headers), opt, &b)
- end
+# Returns whether or not +macro+ is defined either in the common header
+# files or within any +headers+ you provide.
+#
+# Any options you pass to +opt+ are passed along to the compiler.
+#
+def have_macro(macro, headers = nil, opt = "", &b)
+ checking_for checking_message(macro, headers, opt) do
+ macro_defined?(macro, cpp_include(headers), opt, &b)
end
+end
- # Returns whether or not the given entry point +func+ can be found within
- # +lib+. If +func+ is +nil+, the <code>main()</code> entry point is used by
- # default. If found, it adds the library to list of libraries to be used
- # when linking your extension.
- #
- # If +headers+ are provided, it will include those header files as the
- # header files it looks in when searching for +func+.
- #
- # The real name of the library to be linked can be altered by
- # <code>--with-FOOlib</code> configuration option.
- #
- def have_library(lib, func = nil, headers = nil, opt = "", &b)
- func = "main" if !func or func.empty?
- lib = with_config(lib+'lib', lib)
- checking_for checking_message(func.funcall_style, LIBARG%lib, opt) do
- if COMMON_LIBS.include?(lib)
+# Returns whether or not the given entry point +func+ can be found within
+# +lib+. If +func+ is nil, the 'main()' entry point is used by default.
+# If found, it adds the library to list of libraries to be used when linking
+# your extension.
+#
+# If +headers+ are provided, it will include those header files as the
+# header files it looks in when searching for +func+.
+#
+# The real name of the library to be linked can be altered by
+# '--with-FOOlib' configuration option.
+#
+def have_library(lib, func = nil, headers = nil, &b)
+ func = "main" if !func or func.empty?
+ lib = with_config(lib+'lib', lib)
+ checking_for checking_message("#{func}()", LIBARG%lib) do
+ if COMMON_LIBS.include?(lib)
+ true
+ else
+ libs = append_library($libs, lib)
+ if try_func(func, libs, headers, &b)
+ $libs = libs
true
else
- libs = append_library($libs, lib)
- if try_func(func, libs, headers, opt, &b)
- $libs = libs
- true
- else
- false
- end
+ false
end
end
end
+end
- # Returns whether or not the entry point +func+ can be found within the
- # library +lib+ in one of the +paths+ specified, where +paths+ is an array
- # of strings. If +func+ is +nil+ , then the <code>main()</code> function is
- # used as the entry point.
- #
- # If +lib+ is found, then the path it was found on is added to the list of
- # library paths searched and linked against.
- #
- def find_library(lib, func, *paths, &b)
- func = "main" if !func or func.empty?
- lib = with_config(lib+'lib', lib)
- paths = paths.collect {|path| path.split(File::PATH_SEPARATOR)}.flatten
- checking_for checking_message(func.funcall_style, LIBARG%lib) do
- libpath = $LIBPATH
- libs = append_library($libs, lib)
- begin
- until r = try_func(func, libs, &b) or paths.empty?
- $LIBPATH = libpath | [paths.shift]
- end
- if r
- $libs = libs
- libpath = nil
- end
- ensure
- $LIBPATH = libpath if libpath
+# Returns whether or not the entry point +func+ can be found within the library
+# +lib+ in one of the +paths+ specified, where +paths+ is an array of strings.
+# If +func+ is nil , then the main() function is used as the entry point.
+#
+# If +lib+ is found, then the path it was found on is added to the list of
+# library paths searched and linked against.
+#
+def find_library(lib, func, *paths, &b)
+ func = "main" if !func or func.empty?
+ lib = with_config(lib+'lib', lib)
+ paths = paths.collect {|path| path.split(File::PATH_SEPARATOR)}.flatten
+ checking_for "#{func}() in #{LIBARG%lib}" do
+ libpath = $LIBPATH
+ libs = append_library($libs, lib)
+ begin
+ until r = try_func(func, libs, &b) or paths.empty?
+ $LIBPATH = libpath | [paths.shift]
end
- r
- end
- end
-
- # Returns whether or not the function +func+ can be found in the common
- # header files, or within any +headers+ that you provide. If found, a macro
- # is passed as a preprocessor constant to the compiler using the function
- # name, in uppercase, prepended with +HAVE_+.
- #
- # To check functions in an additional library, you need to check that
- # library first using <code>have_library()</code>. The +func+ shall be
- # either mere function name or function name with arguments.
- #
- # For example, if <code>have_func('foo')</code> returned +true+, then the
- # +HAVE_FOO+ preprocessor macro would be passed to the compiler.
- #
- def have_func(func, headers = nil, opt = "", &b)
- checking_for checking_message(func.funcall_style, headers, opt) do
- if try_func(func, $libs, headers, opt, &b)
- $defs << "-DHAVE_#{func.sans_arguments.tr_cpp}"
- true
- else
- false
+ if r
+ $libs = libs
+ libpath = nil
end
+ ensure
+ $LIBPATH = libpath if libpath
end
+ r
end
+end
- # Returns whether or not the variable +var+ can be found in the common
- # header files, or within any +headers+ that you provide. If found, a macro
- # is passed as a preprocessor constant to the compiler using the variable
- # name, in uppercase, prepended with +HAVE_+.
- #
- # To check variables in an additional library, you need to check that
- # library first using <code>have_library()</code>.
- #
- # For example, if <code>have_var('foo')</code> returned true, then the
- # +HAVE_FOO+ preprocessor macro would be passed to the compiler.
- #
- def have_var(var, headers = nil, opt = "", &b)
- checking_for checking_message(var, headers, opt) do
- if try_var(var, headers, opt, &b)
- $defs.push(format("-DHAVE_%s", var.tr_cpp))
- true
- else
- false
- end
+# Returns whether or not the function +func+ can be found in the common
+# header files, or within any +headers+ that you provide. If found, a
+# macro is passed as a preprocessor constant to the compiler using the
+# function name, in uppercase, prepended with 'HAVE_'.
+#
+# For example, if have_func('foo') returned true, then the HAVE_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_func(func, headers = nil, &b)
+ checking_for checking_message("#{func}()", headers) do
+ if try_func(func, $libs, headers, &b)
+ $defs.push(format("-DHAVE_%s", func.tr_cpp))
+ true
+ else
+ false
end
end
+end
- # Returns whether or not the given +header+ file can be found on your system.
- # If found, a macro is passed as a preprocessor constant to the compiler
- # using the header file name, in uppercase, prepended with +HAVE_+.
- #
- # For example, if <code>have_header('foo.h')</code> returned true, then the
- # +HAVE_FOO_H+ preprocessor macro would be passed to the compiler.
- #
- def have_header(header, preheaders = nil, opt = "", &b)
- checking_for header do
- if try_header(cpp_include(preheaders)+cpp_include(header), opt, &b)
- $defs.push(format("-DHAVE_%s", header.tr_cpp))
- true
- else
- false
- end
+# Returns whether or not the variable +var+ can be found in the common
+# header files, or within any +headers+ that you provide. If found, a
+# macro is passed as a preprocessor constant to the compiler using the
+# variable name, in uppercase, prepended with 'HAVE_'.
+#
+# For example, if have_var('foo') returned true, then the HAVE_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_var(var, headers = nil, &b)
+ checking_for checking_message(var, headers) do
+ if try_var(var, headers, &b)
+ $defs.push(format("-DHAVE_%s", var.tr_cpp))
+ true
+ else
+ false
end
end
+end
- # Returns whether or not the given +framework+ can be found on your system.
- # If found, a macro is passed as a preprocessor constant to the compiler
- # using the framework name, in uppercase, prepended with +HAVE_FRAMEWORK_+.
- #
- # For example, if <code>have_framework('Ruby')</code> returned true, then
- # the +HAVE_FRAMEWORK_RUBY+ preprocessor macro would be passed to the
- # compiler.
- #
- # If +fw+ is a pair of the framework name and its header file name
- # that header file is checked, instead of the normally used header
- # file which is named same as the framework.
- def have_framework(fw, &b)
- if Array === fw
- fw, header = *fw
+# Returns whether or not the given +header+ file can be found on your system.
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the header file name, in uppercase, prepended with 'HAVE_'.
+#
+# 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)
+ checking_for header do
+ if try_header(cpp_include(preheaders)+cpp_include(header), &b)
+ $defs.push(format("-DHAVE_%s", header.tr_cpp))
+ true
else
- header = "#{fw}.h"
- end
- checking_for fw do
- src = cpp_include("#{fw}/#{header}") << "\n" "int main(void){return 0;}"
- opt = " -framework #{fw}"
- if try_link(src, "-ObjC#{opt}", &b)
- $defs.push(format("-DHAVE_FRAMEWORK_%s", fw.tr_cpp))
- # TODO: non-worse way than this hack, to get rid of separating
- # option and its argument.
- $LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS
- $LDFLAGS << opt
- true
- else
- false
- end
+ false
end
end
+end
- # Instructs mkmf to search for the given +header+ in any of the +paths+
- # provided, and returns whether or not it was found in those paths.
- #
- # If the header is found then the path it was found on is added to the list
- # of included directories that are sent to the compiler (via the
- # <code>-I</code> switch).
- #
- def find_header(header, *paths)
- message = checking_message(header, paths)
- header = cpp_include(header)
- checking_for message do
- if try_header(header)
- true
- else
- found = false
- paths.each do |dir|
- opt = "-I#{dir}".quote
- if try_header(header, opt)
- $INCFLAGS << " " << opt
- found = true
- break
- end
+# Instructs mkmf to search for the given +header+ in any of the +paths+
+# provided, and returns whether or not it was found in those paths.
+#
+# If the header is found then the path it was found on is added to the list
+# of included directories that are sent to the compiler (via the -I switch).
+#
+def find_header(header, *paths)
+ message = checking_message(header, paths)
+ header = cpp_include(header)
+ checking_for message do
+ if try_header(header)
+ true
+ else
+ found = false
+ paths.each do |dir|
+ opt = "-I#{dir}".quote
+ if try_header(header, opt)
+ $INCFLAGS << " " << opt
+ found = true
+ break
end
- found
end
+ found
end
end
+end
- # Returns whether or not the struct of type +type+ contains +member+. If
- # it does not, or the struct type can't be found, then false is returned.
- # You may optionally specify additional +headers+ in which to look for the
- # struct (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_+.
- #
- # For example, if <code>have_struct_member('struct foo', 'bar')</code>
- # 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.
- #
- def have_struct_member(type, member, headers = nil, opt = "", &b)
- checking_for checking_message("#{type}.#{member}", headers) do
- if try_compile(<<"SRC", opt, &b)
+# Returns whether or not the struct of type +type+ contains +member+. If
+# it does not, or the struct type can't be found, then false is returned. You
+# may optionally specify additional +headers+ in which to look for the struct
+# (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_'.
+#
+# 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.
+#
+def have_struct_member(type, member, headers = nil, &b)
+ checking_for checking_message("#{type}.#{member}", headers) do
+ if try_compile(<<"SRC", &b)
#{cpp_include(headers)}
/*top*/
+#{MAIN_DOES_NOTHING}
int s = (char *)&((#{type}*)0)->#{member} - (char *)0;
-#{MAIN_DOES_NOTHING "s"}
SRC
- $defs.push(format("-DHAVE_%s_%s", type.tr_cpp, member.tr_cpp))
- $defs.push(format("-DHAVE_ST_%s", member.tr_cpp)) # backward compatibility
- true
- else
- false
- end
+ $defs.push(format("-DHAVE_%s_%s", type.tr_cpp, member.tr_cpp))
+ $defs.push(format("-DHAVE_ST_%s", member.tr_cpp)) # backward compatibility
+ true
+ else
+ false
end
end
+end
- # Returns whether or not the static type +type+ is defined.
- #
- # See also +have_type+
- #
- def try_type(type, headers = nil, opt = "", &b)
- if try_compile(<<"SRC", opt, &b)
+def try_type(type, headers = nil, opt = "", &b)
+ if try_compile(<<"SRC", opt, &b)
#{cpp_include(headers)}
/*top*/
typedef #{type} conftest_type;
int conftestval[sizeof(conftest_type)?1:-1];
SRC
- $defs.push(format("-DHAVE_TYPE_%s", type.tr_cpp))
- true
- else
- false
- end
+ $defs.push(format("-DHAVE_TYPE_%s", type.tr_cpp))
+ true
+ else
+ false
end
+end
- # Returns whether or not the static type +type+ is defined. You may
- # optionally pass additional +headers+ to check against in addition to the
- # common header files.
- #
- # You may also pass additional flags to +opt+ which are then passed along to
- # the compiler.
- #
- # If found, a macro is passed as a preprocessor constant to the compiler
- # using the type name, in uppercase, prepended with +HAVE_TYPE_+.
- #
- # For example, if <code>have_type('foo')</code> returned true, then the
- # +HAVE_TYPE_FOO+ preprocessor macro would be passed to the compiler.
- #
- def have_type(type, headers = nil, opt = "", &b)
- checking_for checking_message(type, headers, opt) do
- try_type(type, headers, opt, &b)
- end
+# Returns whether or not the static type +type+ is defined. You may
+# optionally pass additional +headers+ to check against in addition to the
+# common header files.
+#
+# You may also pass additional flags to +opt+ which are then passed along to
+# the compiler.
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the type name, in uppercase, prepended with 'HAVE_TYPE_'.
+#
+# For example, if have_type('foo') returned true, then the HAVE_TYPE_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_type(type, headers = nil, opt = "", &b)
+ checking_for checking_message(type, headers, opt) do
+ try_type(type, headers, opt, &b)
end
+end
- # Returns where the static type +type+ is defined.
- #
- # You may also pass additional flags to +opt+ which are then passed along to
- # the compiler.
- #
- # See also +have_type+.
- #
- def find_type(type, opt, *headers, &b)
- opt ||= ""
- fmt = "not found"
- def fmt.%(x)
- x ? x.respond_to?(:join) ? x.join(",") : x : self
- end
- checking_for checking_message(type, nil, opt), fmt do
- headers.find do |h|
- try_type(type, h, opt, &b)
- end
+# Returns where the static type +type+ is defined.
+#
+# You may also pass additional flags to +opt+ which are then passed along to
+# the compiler.
+#
+# See also +have_type+.
+#
+def find_type(type, opt, *headers, &b)
+ opt ||= ""
+ fmt = "not found"
+ def fmt.%(x)
+ x ? x.respond_to?(:join) ? x.join(",") : x : self
+ end
+ checking_for checking_message(type, nil, opt), fmt do
+ headers.find do |h|
+ try_type(type, h, opt, &b)
end
end
+end
- # Returns whether or not the constant +const+ is defined.
- #
- # See also +have_const+
- #
- def try_const(const, headers = nil, opt = "", &b)
- const, type = *const
- if try_compile(<<"SRC", opt, &b)
+def try_const(const, headers = nil, opt = "", &b)
+ const, type = *const
+ if try_compile(<<"SRC", opt, &b)
#{cpp_include(headers)}
/*top*/
typedef #{type || 'int'} conftest_type;
conftest_type conftestval = #{type ? '' : '(int)'}#{const};
SRC
- $defs.push(format("-DHAVE_CONST_%s", const.tr_cpp))
- true
- else
- false
- end
- end
-
- # Returns whether or not the constant +const+ is defined. You may
- # optionally pass the +type+ of +const+ as <code>[const, type]</code>,
- # such as:
- #
- # have_const(%w[PTHREAD_MUTEX_INITIALIZER pthread_mutex_t], "pthread.h")
- #
- # You may also pass additional +headers+ to check against in addition to the
- # common header files, and additional flags to +opt+ which are then passed
- # along to the compiler.
- #
- # If found, a macro is passed as a preprocessor constant to the compiler
- # using the type name, in uppercase, prepended with +HAVE_CONST_+.
- #
- # For example, if <code>have_const('foo')</code> returned true, then the
- # +HAVE_CONST_FOO+ preprocessor macro would be passed to the compiler.
- #
- def have_const(const, headers = nil, opt = "", &b)
- checking_for checking_message([*const].compact.join(' '), headers, opt) do
- try_const(const, headers, opt, &b)
- end
+ $defs.push(format("-DHAVE_CONST_%s", const.tr_cpp))
+ true
+ else
+ false
end
+end
- # :stopdoc:
- STRING_OR_FAILED_FORMAT = "%s"
- def STRING_OR_FAILED_FORMAT.%(x) # :nodoc:
- x ? super : "failed"
+# Returns whether or not the constant +const+ is defined. You may
+# optionally pass the +type+ of +const+ as <code>[const, type]</code>,
+# like as:
+#
+# have_const(%w[PTHREAD_MUTEX_INITIALIZER pthread_mutex_t], "pthread.h")
+#
+# You may also pass additional +headers+ to check against in addition
+# to the common header files, and additional flags to +opt+ which are
+# then passed along to the compiler.
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the type name, in uppercase, prepended with 'HAVE_CONST_'.
+#
+# For example, if have_const('foo') returned true, then the HAVE_CONST_FOO
+# preprocessor macro would be passed to the compiler.
+#
+def have_const(const, headers = nil, opt = "", &b)
+ checking_for checking_message([*const].compact.join(' '), headers, opt) do
+ try_const(const, headers, opt, &b)
end
+end
- def typedef_expr(type, headers)
- typename, member = type.split('.', 2)
- prelude = cpp_include(headers).split(/$/)
- prelude << "typedef #{typename} rbcv_typedef_;\n"
- return "rbcv_typedef_", member, prelude
- end
+STRING_OR_FAILED_FORMAT = "%s"
+# :stopdoc:
+def STRING_OR_FAILED_FORMAT.%(x)
+ x ? super : "failed"
+end
+# :startdoc:
- def try_signedness(type, member, headers = nil, opts = nil)
- raise ArgumentError, "don't know how to tell signedness of members" if member
- if try_static_assert("(#{type})-1 < 0", headers, opts)
- return -1
- elsif try_static_assert("(#{type})-1 > 0", headers, opts)
- return +1
+# Returns the size of the given +type+. You may optionally specify additional
+# +headers+ to search in for the +type+.
+#
+# If found, a macro is passed as a preprocessor constant to the compiler using
+# the type name, in uppercase, prepended with 'SIZEOF_', followed by the type
+# name, followed by '=X' where 'X' is the actual size.
+#
+# 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 = STRING_OR_FAILED_FORMAT
+ 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))
+ size
end
end
+end
- # :startdoc:
-
- # Returns the size of the given +type+. You may optionally specify
- # additional +headers+ to search in for the +type+.
- #
- # If found, a macro is passed as a preprocessor constant to the compiler
- # using the type name, in uppercase, prepended with +SIZEOF_+, followed by
- # the type name, followed by <code>=X</code> where "X" is the actual size.
- #
- # For example, if <code>check_sizeof('mystruct')</code> returned 12, then
- # the <code>SIZEOF_MYSTRUCT=12</code> preprocessor macro would be passed to
- # the compiler.
- #
- def check_sizeof(type, headers = nil, opts = "", &b)
- typedef, member, prelude = typedef_expr(type, headers)
- prelude << "static #{typedef} *rbcv_ptr_;\n"
- prelude = [prelude]
- expr = "sizeof((*rbcv_ptr_)#{"." << member if member})"
- fmt = STRING_OR_FAILED_FORMAT
- checking_for checking_message("size of #{type}", headers), fmt do
- if size = try_constant(expr, prelude, opts, &b)
- $defs.push(format("-DSIZEOF_%s=%s", type.tr_cpp, size))
- size
- end
+# Returns the signedness of the given +type+. You may optionally
+# specify additional +headers+ to search in for the +type+.
+#
+# If the +type+ is found and is a numeric type, a macro is passed as a
+# preprocessor constant to the compiler using the +type+ name, in
+# uppercase, prepended with 'SIGNEDNESS_OF_', followed by the +type+
+# name, followed by '=X' where 'X' is positive integer if the +type+ is
+# unsigned, or negative integer if the +type+ is signed.
+#
+# For example, if size_t is defined as unsigned, then
+# check_signedness('size_t') would returned +1 and the
+# SIGNEDNESS_OF_SIZE_T=+1 preprocessor macro would be passed to the
+# compiler, and SIGNEDNESS_OF_INT=-1 if check_signedness('int') is
+# done.
+#
+def check_signedness(type, headers = nil)
+ signed = nil
+ checking_for("signedness of #{type}", STRING_OR_FAILED_FORMAT) do
+ if try_static_assert("(#{type})-1 < 0")
+ signed = -1
+ elsif try_static_assert("(#{type})-1 > 0")
+ signed = +1
+ else
+ next nil
end
+ $defs.push("-DSIGNEDNESS_OF_%s=%+d" % [type.tr_cpp, signed])
+ signed < 0 ? "signed" : "unsigned"
end
+ signed
+end
- # Returns the signedness of the given +type+. You may optionally specify
- # additional +headers+ to search in for the +type+.
- #
- # If the +type+ is found and is a numeric type, a macro is passed as a
- # preprocessor constant to the compiler using the +type+ name, in uppercase,
- # prepended with +SIGNEDNESS_OF_+, followed by the +type+ name, followed by
- # <code>=X</code> where "X" is positive integer if the +type+ is unsigned
- # and a negative integer if the +type+ is signed.
- #
- # For example, if +size_t+ is defined as unsigned, then
- # <code>check_signedness('size_t')</code> would return +1 and the
- # <code>SIGNEDNESS_OF_SIZE_T=+1</code> preprocessor macro would be passed to
- # the compiler. The <code>SIGNEDNESS_OF_INT=-1</code> macro would be set
- # for <code>check_signedness('int')</code>
- #
- def check_signedness(type, headers = nil, opts = nil, &b)
- typedef, member, prelude = typedef_expr(type, headers)
- signed = nil
- checking_for("signedness of #{type}", STRING_OR_FAILED_FORMAT) do
- signed = try_signedness(typedef, member, [prelude], opts, &b) or next nil
- $defs.push("-DSIGNEDNESS_OF_%s=%+d" % [type.tr_cpp, signed])
- signed < 0 ? "signed" : "unsigned"
- end
- signed
- end
-
- # Returns the convertible integer type of the given +type+. You may
- # optionally specify additional +headers+ to search in for the +type+.
- # _convertible_ means actually the same type, or typedef'd from the same
- # type.
- #
- # If the +type+ is a integer type and the _convertible_ type is found,
- # the following macros are passed as preprocessor constants to the compiler
- # using the +type+ name, in uppercase.
- #
- # * +TYPEOF_+, followed by the +type+ name, followed by <code>=X</code>
- # where "X" is the found _convertible_ type name.
- # * +TYP2NUM+ and +NUM2TYP+,
- # where +TYP+ is the +type+ name in uppercase with replacing an +_t+
- # suffix with "T", followed by <code>=X</code> where "X" is the macro name
- # to convert +type+ to an Integer object, and vice versa.
- #
- # For example, if +foobar_t+ is defined as unsigned long, then
- # <code>convertible_int("foobar_t")</code> would return "unsigned long", and
- # define these macros:
- #
- # #define TYPEOF_FOOBAR_T unsigned long
- # #define FOOBART2NUM ULONG2NUM
- # #define NUM2FOOBART NUM2ULONG
- #
- def convertible_int(type, headers = nil, opts = nil, &b)
- type, macname = *type
- checking_for("convertible type of #{type}", STRING_OR_FAILED_FORMAT) do
- if UNIVERSAL_INTS.include?(type)
- type
- else
- typedef, member, prelude = typedef_expr(type, headers, &b)
- if member
- prelude << "static rbcv_typedef_ rbcv_var;"
- compat = UNIVERSAL_INTS.find {|t|
- try_static_assert("sizeof(rbcv_var.#{member}) == sizeof(#{t})", [prelude], opts, &b)
- }
- else
- next unless signed = try_signedness(typedef, member, [prelude])
- u = "unsigned " if signed > 0
- prelude << "extern rbcv_typedef_ foo();"
- compat = UNIVERSAL_INTS.find {|t|
- try_compile([prelude, "extern #{u}#{t} foo();"].join("\n"), opts, :werror=>true, &b)
- }
- end
- if compat
- macname ||= type.sub(/_(?=t\z)/, '').tr_cpp
- conv = (compat == "long long" ? "LL" : compat.upcase)
- compat = "#{u}#{compat}"
- typename = type.tr_cpp
- $defs.push(format("-DSIZEOF_%s=SIZEOF_%s", typename, compat.tr_cpp))
- $defs.push(format("-DTYPEOF_%s=%s", typename, compat.quote))
- $defs.push(format("-DPRI_%s_PREFIX=PRI_%s_PREFIX", macname, conv))
- conv = (u ? "U" : "") + conv
- $defs.push(format("-D%s2NUM=%s2NUM", macname, conv))
- $defs.push(format("-DNUM2%s=NUM2%s", macname, conv))
- compat
- end
- end
- end
- end
- # :stopdoc:
+# :stopdoc:
- # Used internally by the what_type? method to determine if +type+ is a scalar
- # pointer.
- def scalar_ptr_type?(type, member = nil, headers = nil, &b)
- try_compile(<<"SRC", &b) # pointer
+# Used internally by the what_type? method to determine if +type+ is a scalar
+# pointer.
+def scalar_ptr_type?(type, member = nil, headers = nil, &b)
+ try_compile(<<"SRC", &b) # pointer
#{cpp_include(headers)}
/*top*/
volatile #{type} conftestval;
-extern int t(void);
-int t(void) {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
-#{MAIN_DOES_NOTHING "t"}
+#{MAIN_DOES_NOTHING}
+int t() {return (int)(1-*(conftestval#{member ? ".#{member}" : ""}));}
SRC
- end
+end
- # Used internally by the what_type? method to determine if +type+ is a scalar
- # pointer.
- def scalar_type?(type, member = nil, headers = nil, &b)
- try_compile(<<"SRC", &b) # pointer
+# Used internally by the what_type? method to determine if +type+ is a scalar
+# pointer.
+def scalar_type?(type, member = nil, headers = nil, &b)
+ try_compile(<<"SRC", &b) # pointer
#{cpp_include(headers)}
/*top*/
volatile #{type} conftestval;
-extern int t(void);
-int t(void) {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
-#{MAIN_DOES_NOTHING "t"}
+#{MAIN_DOES_NOTHING}
+int t() {return (int)(1-(conftestval#{member ? ".#{member}" : ""}));}
SRC
- end
+end
- # Used internally by the what_type? method to check if the _typeof_ GCC
- # extension is available.
- def have_typeof?
- return $typeof if defined?($typeof)
- $typeof = %w[__typeof__ typeof].find do |t|
- try_compile(<<SRC)
+# 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)"
- 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
- end
- 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"
- 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"]]
- end
- try_static_assert("sizeof(#{ptr}#{val}) == sizeof(#{unsigned} #{t})", pre)
- end
- type or next
- [unsigned, type, ptr].join(" ").strip
- end
end
+end
- # This method is used internally by the find_executable method.
- #
- # Internal use only.
- #
- def find_executable0(bin, path = nil)
- executable_file = proc do |name|
- begin
- stat = File.stat(name)
- rescue SystemCallError
- else
- next name if stat.file? and stat.executable?
+def what_type?(type, member = nil, headers = nil, &b)
+ m = "#{type}"
+ var = val = "*rbcv_var_"
+ func = "rbcv_func_(void)"
+ 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
+ end
+ 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"
end
- end
-
- exts = config_string('EXECUTABLE_EXTS') {|s| s.split} || config_string('EXEEXT') {|s| [s]}
- if File.expand_path(bin) == bin
- return bin if executable_file.call(bin)
- if exts
- exts.each {|ext| executable_file.call(file = bin + ext) and return file}
+ ptr = "*"
+ elsif scalar_type?(type, member, prelude, &b)
+ unless member and !typeof or try_static_assert("(#{type})-1 < 0", prelude)
+ unsigned = "unsigned"
end
- return nil
- end
- if path ||= ENV['PATH']
- path = path.split(File::PATH_SEPARATOR)
+ ptr = ""
else
- path = %w[/usr/local/bin /usr/ucb /usr/bin /bin]
+ next
end
- file = nil
- path.each do |dir|
- return file if executable_file.call(file = File.join(dir, bin))
- if exts
- exts.each {|ext| executable_file.call(ext = file + ext) and return ext}
+ type = UNIVERSAL_INTS.find do |t|
+ pre = prelude
+ unless member
+ pre += [["static #{unsigned} #{t} #{ptr}#{var};\n",
+ "extern #{unsigned} #{t} #{ptr}*#{func};\n"]]
end
+ try_static_assert("sizeof(#{ptr}#{val}) == sizeof(#{unsigned} #{t})", pre)
end
- nil
+ type or next
+ [unsigned, type, ptr].join(" ").strip
end
+end
- # :startdoc:
-
- # Searches for the executable +bin+ on +path+. The default path is your
- # +PATH+ environment variable. If that isn't defined, it will resort to
- # searching /usr/local/bin, /usr/ucb, /usr/bin and /bin.
- #
- # If found, it will return the full path, including the executable name, of
- # where it was found.
- #
- # Note that this method does not actually affect the generated Makefile.
- #
- def find_executable(bin, path = nil)
- checking_for checking_message(bin, path) do
- find_executable0(bin, path)
+# This method is used internally by the find_executable method.
+#
+# Internal use only.
+#
+def find_executable0(bin, path = nil)
+ exts = config_string('EXECUTABLE_EXTS') {|s| s.split} || config_string('EXEEXT') {|s| [s]}
+ if File.expand_path(bin) == bin
+ return bin if File.executable?(bin)
+ if exts
+ exts.each {|ext| File.executable?(file = bin + ext) and return file}
+ end
+ return nil
+ end
+ if path ||= ENV['PATH']
+ path = path.split(File::PATH_SEPARATOR)
+ else
+ path = %w[/usr/local/bin /usr/ucb /usr/bin /bin]
+ end
+ file = nil
+ path.each do |dir|
+ return file if File.executable?(file = File.join(dir, bin))
+ if exts
+ exts.each {|ext| File.executable?(ext = file + ext) and return ext}
end
end
+ nil
+end
- # :stopdoc:
+# :startdoc:
- def arg_config(config, default=nil, &block)
- $arg_config << [config, default]
- defaults = []
- if default
- defaults << default
- elsif !block
- defaults << nil
- end
- $configure_args.fetch(config.tr('_', '-'), *defaults, &block)
- end
-
- # :startdoc:
-
- # Tests for the presence of a <tt>--with-</tt>_config_ or
- # <tt>--without-</tt>_config_ option. Returns +true+ if the with option is
- # given, +false+ if the without option is given, and the default value
- # otherwise.
- #
- # This can be useful for adding custom definitions, such as debug
- # information.
- #
- # Example:
- #
- # if with_config("debug")
- # $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
- # end
- #
- def with_config(config, default=nil)
- config = config.sub(/^--with[-_]/, '')
- val = arg_config("--with-"+config) do
- if arg_config("--without-"+config)
- false
- elsif block_given?
- yield(config, default)
- else
- break default
- end
- end
- case val
- when "yes"
- true
- when "no"
- false
- else
- val
- end
+# Searches for the executable +bin+ on +path+. The default path is your
+# PATH environment variable. If that isn't defined, it will resort to
+# searching /usr/local/bin, /usr/ucb, /usr/bin and /bin.
+#
+# If found, it will return the full path, including the executable name,
+# of where it was found.
+#
+# Note that this method does not actually affect the generated Makefile.
+#
+def find_executable(bin, path = nil)
+ checking_for checking_message(bin, path) do
+ find_executable0(bin, path)
end
+end
- # Tests for the presence of an <tt>--enable-</tt>_config_ or
- # <tt>--disable-</tt>_config_ option. Returns +true+ if the enable option is
- # given, +false+ if the disable option is given, and the default value
- # otherwise.
- #
- # This can be useful for adding custom definitions, such as debug
- # information.
- #
- # Example:
- #
- # if enable_config("debug")
- # $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
- # end
- #
- def enable_config(config, default=nil)
- if arg_config("--enable-"+config)
- true
- elsif arg_config("--disable-"+config)
+# :stopdoc:
+
+def arg_config(config, default=nil, &block)
+ $arg_config << [config, default]
+ defaults = []
+ if default
+ defaults << default
+ elsif !block
+ defaults << nil
+ end
+ $configure_args.fetch(config.tr('_', '-'), *defaults, &block)
+end
+
+# :startdoc:
+
+# Tests for the presence of a --with-<tt>config</tt> or --without-<tt>config</tt>
+# option. Returns true if the with option is given, false if the without
+# option is given, and the default value otherwise.
+#
+# This can be useful for adding custom definitions, such as debug information.
+#
+# Example:
+#
+# if with_config("debug")
+# $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+# end
+#
+def with_config(config, default=nil)
+ config = config.sub(/^--with[-_]/, '')
+ val = arg_config("--with-"+config) do
+ if arg_config("--without-"+config)
false
elsif block_given?
yield(config, default)
else
- return default
+ break default
end
end
+ case val
+ when "yes"
+ true
+ when "no"
+ false
+ else
+ val
+ end
+end
- # Generates a header file consisting of the various macro definitions
- # generated by other methods such as have_func and have_header. These are
- # then wrapped in a custom <code>#ifndef</code> based on the +header+ file
- # name, which defaults to "extconf.h".
- #
- # For example:
- #
- # # extconf.rb
- # require 'mkmf'
- # have_func('realpath')
- # have_header('sys/utime.h')
- # create_header
- # create_makefile('foo')
- #
- # The above script would generate the following extconf.h file:
- #
- # #ifndef EXTCONF_H
- # #define EXTCONF_H
- # #define HAVE_REALPATH 1
- # #define HAVE_SYS_UTIME_H 1
- # #endif
- #
- # Given that the create_header method generates a file based on definitions
- # set earlier in your extconf.rb file, you will probably want to make this
- # one of the last methods you call in your script.
- #
- def create_header(header = "extconf.h")
- message "creating %s\n", header
- sym = header.tr_cpp
- hdr = ["#ifndef #{sym}\n#define #{sym}\n"]
- for line in $defs
- case line
- when /^-D([^=]+)(?:=(.*))?/
- hdr << "#define #$1 #{$2 ? Shellwords.shellwords($2)[0].gsub(/(?=\t+)/, "\\\n") : 1}\n"
- when /^-U(.*)/
- hdr << "#undef #$1\n"
- end
- end
- hdr << "#endif\n"
- hdr = hdr.join("")
- log_src(hdr, "#{header} is")
- unless (IO.read(header) == hdr rescue false)
- open(header, "wb") do |hfile|
- hfile.write(hdr)
- end
- end
- $extconf_h = header
- end
-
- # Sets a +target+ name that the user can then use to configure various
- # "with" options with on the command line by using that name. For example,
- # if the target is set to "foo", then the user could use the
- # <code>--with-foo-dir</code> command line option.
- #
- # You may pass along additional "include" or "lib" defaults via the
- # +idefault+ and +ldefault+ parameters, respectively.
- #
- # Note that dir_config only adds to the list of places to search for
- # libraries and include files. It does not link the libraries into your
- # application.
- #
- def dir_config(target, idefault=nil, ldefault=nil)
- if dir = with_config(target + "-dir", (idefault unless ldefault))
- defaults = Array === dir ? dir : dir.split(File::PATH_SEPARATOR)
- idefault = ldefault = nil
- end
+# Tests for the presence of an --enable-<tt>config</tt> or
+# --disable-<tt>config</tt> option. Returns true if the enable option is given,
+# false if the disable option is given, and the default value otherwise.
+#
+# This can be useful for adding custom definitions, such as debug information.
+#
+# Example:
+#
+# if enable_config("debug")
+# $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+# end
+#
+def enable_config(config, default=nil)
+ if arg_config("--enable-"+config)
+ true
+ elsif arg_config("--disable-"+config)
+ false
+ elsif block_given?
+ yield(config, default)
+ else
+ return default
+ end
+end
- idir = with_config(target + "-include", idefault)
- $arg_config.last[1] ||= "${#{target}-dir}/include"
- ldir = with_config(target + "-lib", ldefault)
- $arg_config.last[1] ||= "${#{target}-dir}/#{@libdir_basename}"
+# Generates a header file consisting of the various macro definitions generated
+# by other methods such as have_func and have_header. These are then wrapped in
+# a custom #ifndef based on the +header+ file name, which defaults to
+# 'extconf.h'.
+#
+# For example:
+#
+# # extconf.rb
+# require 'mkmf'
+# have_func('realpath')
+# have_header('sys/utime.h')
+# create_header
+# create_makefile('foo')
+#
+# The above script would generate the following extconf.h file:
+#
+# #ifndef EXTCONF_H
+# #define EXTCONF_H
+# #define HAVE_REALPATH 1
+# #define HAVE_SYS_UTIME_H 1
+# #endif
+#
+# Given that the create_header method generates a file based on definitions
+# set earlier in your extconf.rb file, you will probably want to make this
+# one of the last methods you call in your script.
+#
+def create_header(header = "extconf.h")
+ message "creating %s\n", header
+ sym = header.tr_cpp
+ hdr = ["#ifndef #{sym}\n#define #{sym}\n"]
+ for line in $defs
+ case line
+ when /^-D([^=]+)(?:=(.*))?/
+ hdr << "#define #$1 #{$2 ? Shellwords.shellwords($2)[0].gsub(/(?=\t+)/, "\\\n") : 1}\n"
+ when /^-U(.*)/
+ hdr << "#undef #$1\n"
+ end
+ end
+ hdr << "#endif\n"
+ hdr = hdr.join
+ unless (IO.read(header) == hdr rescue false)
+ open(header, "wb") do |hfile|
+ hfile.write(hdr)
+ end
+ end
+ $extconf_h = header
+end
- idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
- if defaults
- idirs.concat(defaults.collect {|d| d + "/include"})
- idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
- end
+# Sets a +target+ name that the user can then use to configure various 'with'
+# options with on the command line by using that name. For example, if the
+# target is set to "foo", then the user could use the --with-foo-dir command
+# line option.
+#
+# You may pass along additional 'include' or 'lib' defaults via the +idefault+
+# and +ldefault+ parameters, respectively.
+#
+# Note that dir_config only adds to the list of places to search for libraries
+# and include files. It does not link the libraries into your application.
+#
+def dir_config(target, idefault=nil, ldefault=nil)
+ if dir = with_config(target + "-dir", (idefault unless ldefault))
+ defaults = Array === dir ? dir : dir.split(File::PATH_SEPARATOR)
+ idefault = ldefault = nil
+ end
+
+ idir = with_config(target + "-include", idefault)
+ $arg_config.last[1] ||= "${#{target}-dir}/include"
+ ldir = with_config(target + "-lib", ldefault)
+ $arg_config.last[1] ||= "${#{target}-dir}/lib"
+
+ idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
+ if defaults
+ idirs.concat(defaults.collect {|d| d + "/include"})
+ idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
+ end
+ unless idirs.empty?
+ idirs.collect! {|d| "-I" + d}
+ idirs -= Shellwords.shellwords($CPPFLAGS)
unless idirs.empty?
- idirs.collect! {|d| "-I" + d}
- idirs -= Shellwords.shellwords($CPPFLAGS)
- unless idirs.empty?
- $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
- end
+ $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
end
+ end
- ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
- if defaults
- ldirs.concat(defaults.collect {|d| "#{d}/#{@libdir_basename}"})
- ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
- end
- $LIBPATH = ldirs | $LIBPATH
-
- [idir, ldir]
- end
-
- # :stopdoc:
-
- # Handles meta information about installed libraries. Uses your platform's
- # pkg-config program if it has one.
- #
- # The actual command name can be overridden by
- # <code>--with-pkg-config</code> command line option.
- 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}`.strip}
- elsif ($PKGCONFIG ||=
- (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
- find_executable0(pkgconfig) && pkgconfig) and
- system("#{$PKGCONFIG} --exists #{pkg}")
- # default to pkg-config command
- get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.strip}
- elsif find_executable0(pkgconfig = "#{pkg}-config")
- # default to package specific config command, as a last resort.
- get = proc {|opt| `#{pkgconfig} --#{opt}`.strip}
- end
- orig_ldflags = $LDFLAGS
- if get and try_ldflags(ldflags = get['libs'])
- cflags = get['cflags']
- libs = get['libs-only-l']
- ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
- $CFLAGS += " " << cflags
- $CXXFLAGS += " " << cflags
- $LDFLAGS = [orig_ldflags, ldflags].join(' ')
- $libs += " " << libs
- Logging::message "package configuration for %s\n", pkg
- Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
- cflags, ldflags, libs
- [cflags, ldflags, libs]
- else
- Logging::message "package configuration for %s is not found\n", pkg
- nil
- end
+ ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
+ if defaults
+ ldirs.concat(defaults.collect {|d| d + "/lib"})
+ ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
end
+ $LIBPATH = ldirs | $LIBPATH
+
+ [idir, ldir]
+end
- def with_destdir(dir)
- dir = dir.sub($dest_prefix_pattern, '')
- /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
+# :stopdoc:
+
+# Handles meta information about installed libraries. Uses your platform's
+# pkg-config program if it has one.
+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 ||=
+ (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
+ find_executable0(pkgconfig) && pkgconfig) and
+ system("#{$PKGCONFIG} --exists #{pkg}")
+ # default to pkg-config command
+ get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.chomp}
+ elsif find_executable0(pkgconfig = "#{pkg}-config")
+ # default to package specific config command, as a last resort.
+ get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
+ end
+ if get
+ cflags = get['cflags']
+ ldflags = get['libs']
+ libs = get['libs-only-l']
+ ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
+ $CFLAGS += " " << cflags
+ $LDFLAGS += " " << ldflags
+ $libs += " " << libs
+ Logging::message "package configuration for %s\n", pkg
+ Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
+ cflags, ldflags, libs
+ [cflags, ldflags, libs]
+ else
+ Logging::message "package configuration for %s is not found\n", pkg
+ nil
end
+end
- # Converts forward slashes to backslashes. Aimed at MS Windows.
- #
- # Internal use only.
- #
- def winsep(s)
- s.tr('/', '\\')
+def with_destdir(dir)
+ dir = dir.sub($dest_prefix_pattern, '')
+ /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
+end
+
+# Converts forward slashes to backslashes. Aimed at MS Windows.
+#
+# Internal use only.
+#
+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
- # Converts native path to format acceptable in Makefile
- #
- # Internal use only.
- #
+def configuration(srcdir)
+ mk = []
+ vpath = $VPATH.dup
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
when 'cygwin'
if CONFIG['target_os'] != 'cygwin'
- def mkintpath(path)
- IO.popen(["cygpath", "-u", path], &:read).chomp
- end
+ vpath = vpath.map {|p| p.sub(/.*/, '$(shell cygpath -u \&)')}
end
end
end
- unless method_defined?(:mkintpath)
- def mkintpath(path)
- path
- end
- end
-
- def configuration(srcdir)
- mk = []
- vpath = $VPATH.dup
- CONFIG["hdrdir"] ||= $hdrdir
- mk << %{
+ CONFIG["hdrdir"] ||= $hdrdir
+ mk << %{
SHELL = /bin/sh
-# V=0 quiet, V=1 verbose. other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@#{CONFIG['NULLCMD']})
-ECHO = $(ECHO1:0=@echo)
-
#### 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]).unspace}}
-topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}
-hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}
-arch_hdrdir = #{$arch_hdrdir.quote}
-PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
+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}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
}
- if $extmk
- mk << "RUBYLIB =\n""RUBYOPT = -\n"
- end
- prefix = mkintpath(CONFIG["prefix"])
- if destdir = prefix[$dest_prefix_pattern, 1]
- mk << "\nDESTDIR = #{destdir}\n"
- prefix = prefix[destdir.size..-1]
- end
- mk << "prefix = #{with_destdir(prefix).unspace}\n"
- CONFIG.each do |key, var|
- mk << "#{key} = #{with_destdir(mkintpath(var)).unspace}\n" if /.prefix$/ =~ key
- end
- CONFIG.each do |key, var|
- next if /^abs_/ =~ key
- next if /^(?:src|top|hdr)dir$/ =~ key
- next unless /dir$/ =~ key
- mk << "#{key} = #{with_destdir(var)}\n"
- end
- if !$extmk and !$configure_args.has_key?('--ruby') and
- sep = config_string('BUILD_FILE_SEPARATOR')
- sep = ":/=#{sep}"
- 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(" ") << " "
- headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
- if RULE_SUBST
- headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
- end
- headers << $config_h
- headers << '$(RUBY_EXTCONF_H)' if $extconf_h
- mk << %{
-
+ if $extmk
+ mk << "RUBYLIB = -\nRUBYOPT = -r$(top_srcdir)/ext/purelib.rb\n"
+ end
+ if destdir = CONFIG["prefix"][$dest_prefix_pattern, 1]
+ mk << "\nDESTDIR = #{destdir}\n"
+ end
+ CONFIG.each do |key, var|
+ next unless /prefix$/ =~ key
+ mk << "#{key} = #{with_destdir(var)}\n"
+ end
+ CONFIG.each do |key, var|
+ next if /^abs_/ =~ key
+ next if /^(?:src|top|hdr)dir$/ =~ key
+ next unless /dir$/ =~ key
+ mk << "#{key} = #{with_destdir(var)}\n"
+ end
+ if !$extmk and !$configure_args.has_key?('--ruby') and
+ sep = config_string('BUILD_FILE_SEPARATOR')
+ sep = ":/=#{sep}"
+ 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(" ") << " "
+ mk << %{
CC = #{CONFIG['CC']}
CXX = #{CONFIG['CXX']}
LIBRUBY = #{CONFIG['LIBRUBY']}
@@ -1847,34 +1499,29 @@ RUBY_EXTCONF_H = #{$extconf_h}
cflags = #{CONFIG['cflags']}
optflags = #{CONFIG['optflags']}
debugflags = #{CONFIG['debugflags']}
-warnflags = #{$warnflags}
-CCDLFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']}
-CFLAGS = $(CCDLFLAGS) #$CFLAGS $(ARCH_FLAG)
+warnflags = #{CONFIG['warnflags']}
+CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
INCFLAGS = -I. #$INCFLAGS
DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
-CXXFLAGS = $(CCDLFLAGS) #$CXXFLAGS $(ARCH_FLAG)
+CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
ldflags = #{$LDFLAGS}
-dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
+dldflags = #{$DLDFLAGS}
ARCH_FLAG = #{$ARCH_FLAG}
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
+DLDFLAGS = $(ldflags) $(dldflags)
LDSHARED = #{CONFIG['LDSHARED']}
LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
AR = #{CONFIG['AR']}
EXEEXT = #{CONFIG['EXEEXT']}
-}
- CONFIG.each do |key, val|
- mk << "#{key} = #{val}\n" if /^RUBY.*NAME/ =~ key
- end
- mk << %{
+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 = #{$ruby.sub(%r[\A#{Regexp.quote(RbConfig::CONFIG['bindir'])}(?=/|\z)]) {'$(bindir)'}}
+ruby = #{$ruby}
RUBY = $(ruby#{sep})
-ruby_headers = #{headers.join(' ')}
-
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'}
@@ -1883,250 +1530,220 @@ INSTALL = #{config_string('INSTALL', &possible_command) || '@$(RUBY) -run -e ins
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'}
-TOUCH = exit >
#### End of system configuration section. ####
preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
}
- if $nmake == ?b
- mk.each do |x|
- x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do
- "!ifndef " + $1 + "\n" +
- $& +
- "!endif\n"
- end
+ if $nmake == ?b
+ mk.each do |x|
+ x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do
+ "!ifndef " + $1 + "\n" +
+ $& +
+ "!endif\n"
end
end
- mk
end
+ mk
+end
+# :startdoc:
- def timestamp_file(name)
- name = name.gsub(/(\$[({]|[})])|(\/+)|[^-.\w]+/) {$1 ? "" : $2 ? ".-." : "_"}
- "./.#{name}.time"
- end
- # :startdoc:
-
- # creates a stub Makefile.
- #
- def dummy_makefile(srcdir)
- configuration(srcdir) << <<RULES << CLEANINGS
+def dummy_makefile(srcdir)
+ configuration(srcdir) << <<RULES << CLEANINGS
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-static clean-rb
+.PHONY: clean clean-so clean-rb
RULES
- end
+end
- def each_compile_rules # :nodoc:
- vpath_splat = /\$\(\*VPATH\*\)/
- COMPILE_RULES.each do |rule|
- if vpath_splat =~ rule
- $VPATH.each do |path|
- yield rule.sub(vpath_splat) {path}
- 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
- yield rule
+ 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
+
+# Generates the Makefile for your extension, passing along any options and
+# preprocessor constants that you may have generated through other methods.
+#
+# The +target+ name should correspond the name of the global function name
+# defined within your C extension, minus the 'Init_'. For example, if your
+# C extension is defined as 'Init_foo', then your target would simply be 'foo'.
+#
+# If any '/' characters are present in the target name, only the last name
+# is interpreted as the target name, and the rest are considered toplevel
+# directory names, and the generated Makefile will be altered accordingly to
+# follow that directory structure.
+#
+# For example, if you pass 'test/foo' as a target name, your extension will
+# be installed under the 'test' directory. This means that in order to
+# load the file within a Ruby program later, that directory structure will
+# have to be followed, e.g. "require 'test/foo'".
+#
+# The +srcprefix+ should be used when your source files are not in the same
+# directory as your build script. This will not only eliminate the need for
+# you to manually copy the source files into the same directory as your build
+# script, but it also sets the proper +target_prefix+ in the generated
+# Makefile.
+#
+# Setting the +target_prefix+ will, in turn, install the generated binary in
+# a directory under your RbConfig::CONFIG['sitearchdir'] that mimics your local
+# filesystem when you run 'make install'.
+#
+# For example, given the following file tree:
+#
+# ext/
+# extconf.rb
+# test/
+# foo.c
+#
+# And given the following code:
+#
+# create_makefile('test/foo', 'test')
+#
+# That will set the +target_prefix+ in the generated Makefile to 'test'. That,
+# in turn, will create the following file tree when installed via the
+# 'make install' command:
+#
+# /path/to/ruby/sitearchdir/test/foo.so
+#
+# It is recommended that you use this approach to generate your makefiles,
+# instead of copying files around manually, because some third party
+# libraries may depend on the +target_prefix+ being set properly.
+#
+# The +srcprefix+ argument can be used to override the default source
+# directory, i.e. the current directory . It is included as part of the VPATH
+# and added to the list of INCFLAGS.
+#
+def create_makefile(target, srcprefix = nil)
+ $target = target
+ libpath = $DEFLIBPATH|$LIBPATH
+ message "creating Makefile\n"
+ rm_f "conftest*"
+ if CONFIG["DLEXT"] == $OBJEXT
+ for lib in libs = $libs.split
+ lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
+ end
+ $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
+ end
+
+ if target.include?('/')
+ target_prefix, target = File.split(target)
+ target_prefix[0,0] = '/'
+ else
+ target_prefix = ""
end
- # Processes the data contents of the "depend" file. Each line of this file
- # is expected to be a file name.
- #
- # Returns the output of findings, in Makefile format.
- #
- def depend_rules(depend)
- suffixes = []
- depout = []
- cont = implicit = nil
- impconv = proc do
- each_compile_rules {|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
-
- # Generates the Makefile for your extension, passing along any options and
- # preprocessor constants that you may have generated through other methods.
- #
- # The +target+ name should correspond the name of the global function name
- # defined within your C extension, minus the +Init_+. For example, if your
- # C extension is defined as +Init_foo+, then your target would simply be
- # "foo".
- #
- # If any "/" characters are present in the target name, only the last name
- # is interpreted as the target name, and the rest are considered toplevel
- # directory names, and the generated Makefile will be altered accordingly to
- # follow that directory structure.
- #
- # For example, if you pass "test/foo" as a target name, your extension will
- # be installed under the "test" directory. This means that in order to
- # load the file within a Ruby program later, that directory structure will
- # have to be followed, e.g. <code>require 'test/foo'</code>.
- #
- # The +srcprefix+ should be used when your source files are not in the same
- # directory as your build script. This will not only eliminate the need for
- # you to manually copy the source files into the same directory as your
- # build script, but it also sets the proper +target_prefix+ in the generated
- # Makefile.
- #
- # Setting the +target_prefix+ will, in turn, install the generated binary in
- # a directory under your <code>RbConfig::CONFIG['sitearchdir']</code> that
- # mimics your local filesystem when you run <code>make install</code>.
- #
- # For example, given the following file tree:
- #
- # ext/
- # extconf.rb
- # test/
- # foo.c
- #
- # And given the following code:
- #
- # create_makefile('test/foo', 'test')
- #
- # That will set the +target_prefix+ in the generated Makefile to "test".
- # That, in turn, will create the following file tree when installed via the
- # <code>make install</code> command:
- #
- # /path/to/ruby/sitearchdir/test/foo.so
- #
- # It is recommended that you use this approach to generate your makefiles,
- # instead of copying files around manually, because some third party
- # libraries may depend on the +target_prefix+ being set properly.
- #
- # The +srcprefix+ argument can be used to override the default source
- # directory, i.e. the current directory. It is included as part of the
- # +VPATH+ and added to the list of +INCFLAGS+.
- #
- def create_makefile(target, srcprefix = nil)
- $target = target
- libpath = $DEFLIBPATH|$LIBPATH
- message "creating Makefile\n"
- MakeMakefile.rm_f "conftest*"
- if CONFIG["DLEXT"] == $OBJEXT
- for lib in libs = $libs.split
- lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
- end
- $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
- end
+ srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
+ RbConfig.expand(srcdir = srcprefix.dup)
- if target.include?('/')
- target_prefix, target = File.split(target)
- target_prefix[0,0] = '/'
- else
- target_prefix = ""
+ 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(", ")}"
end
+ else
+ $objs.collect! {|o| File.basename(o, ".*") << ext} unless $OBJEXT == "o"
+ srcs = $srcs || $objs.collect {|o| o.chomp(ext) << ".c"}
+ end
+ $srcs = srcs
- srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/')
- RbConfig.expand(srcdir = srcprefix.dup)
-
- ext = ".#{$OBJEXT}"
- orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
- if not $objs
- srcs = $srcs || orig_srcs
- 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(", ")}"
+ target = nil if $objs.empty?
+
+ 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"}
end
else
- $objs.collect! {|o| File.basename(o, ".*") << ext} unless $OBJEXT == "o"
- srcs = $srcs || $objs.collect {|o| o.chomp(ext) << ".c"}
+ makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET)'"}
end
- $srcs = srcs
-
- hdrs = Dir[File.join(srcdir, "*.{#{HDR_EXT.join(%q{,})}}")]
-
- target = nil if $objs.empty?
-
- 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"}
- end
- else
- makedef = %{-e "puts 'EXPORTS', '$(TARGET_ENTRY)'"}
- end
- if makedef
- $cleanfiles << '$(DEFFILE)'
- origdef = deffile
- deffile = "$(TARGET)-$(arch).def"
- end
+ if makedef
+ $cleanfiles << '$(DEFFILE)'
+ origdef = deffile
+ deffile = "$(TARGET)-$(arch).def"
end
- origdef ||= ''
+ 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 $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
+ if $extmk and not $extconf_h
+ create_header
+ end
- libpath = libpathflag(libpath)
+ libpath = libpathflag(libpath)
- dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
- staticlib = target ? "$(TARGET).#$LIBEXT" : ""
- mfile = open("Makefile", "wb")
- conf = configuration(srcprefix)
- conf = yield(conf) if block_given?
- mfile.puts(conf)
- mfile.print "
+ dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : ""
+ staticlib = target ? "$(TARGET).#$LIBEXT" : ""
+ mfile = open("Makefile", "wb")
+ conf = configuration(srcprefix)
+ conf = yield(conf) if block_given?
+ mfile.puts(conf)
+ mfile.print "
libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
LIBPATH = #{libpath}
DEFFILE = #{deffile}
@@ -2140,22 +1757,18 @@ extout_prefix = #{$extout_prefix}
target_prefix = #{target_prefix}
LOCAL_LIBS = #{$LOCAL_LIBS}
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
-ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
-SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
+SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
OBJS = #{$objs.join(" ")}
-HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')}
TARGET = #{target}
-TARGET_NAME = #{target && target[/\A\w+/]}
-TARGET_ENTRY = #{EXPORT_PREFIX || ''}Init_$(TARGET_NAME)
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)'
- mfile.print "
+ # TODO: fixme
+ install_dirs.each {|d| mfile.print("%-14s= %s\n" % d) if /^[[:upper:]]/ =~ d[0]}
+ 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
@@ -2163,392 +1776,304 @@ CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$
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-static clean-rb
+.PHONY: clean clean-so clean-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}
- }
- rsep = ":#{fsep}=/"
+ 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
+ mfile.print("install-so: ")
+ if target
+ 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
- fseprepl = proc {|s| s}
- sep = ""
- rsep = ""
- end
- dirs = []
- mfile.print "install: install-so install-rb\n\n"
- sodir = (dir = "$(RUBYARCHDIR)").dup
- mfile.print("install-so: ")
- if target
- f = "$(DLLIB)"
- dest = "#{dir}/#{f}"
- if $extout
- mfile.puts dest
- mfile.print "clean-so::\n"
- mfile.print "\t-$(Q)$(RM) #{fseprepl[dest]}\n"
- mfile.print "\t-$(Q)$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n"
- else
- mfile.print "#{f} #{timestamp_file(dir)}\n"
- mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} #{dir}\n"
- if defined?($installed_list)
- mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
- end
+ mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
+ mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
+ if defined?($installed_list)
+ mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
end
- mfile.print "clean-static::\n"
- mfile.print "\t-$(Q)$(RM) $(STATIC_LIB)\n"
- else
- mfile.puts "Makefile"
end
- mfile.print("install-rb: pre-install-rb install-rb-default\n")
- mfile.print("install-rb-default: pre-install-rb-default\n")
- mfile.print("pre-install-rb: Makefile\n")
- mfile.print("pre-install-rb-default: Makefile\n")
- for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
- files = install_files(mfile, i, nil, srcprefix) or next
- for dir, *files in files
- unless dirs.include?(dir)
- dirs << dir
- mfile.print "pre-install-rb#{sfx}: #{timestamp_file(dir)}\n"
- end
- for f in files
- dest = "#{dir}/#{File.basename(f)}"
- mfile.print("install-rb#{sfx}: #{dest}\n")
- mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n")
- mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{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-$(Q)$(RM) #{fseprepl[dest]}\n")
- end
- end
+ else
+ mfile.puts "Makefile"
+ end
+ mfile.print("install-rb: pre-install-rb install-rb-default\n")
+ mfile.print("install-rb-default: pre-install-rb-default\n")
+ mfile.print("pre-install-rb: Makefile\n")
+ mfile.print("pre-install-rb-default: Makefile\n")
+ for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
+ files = install_files(mfile, i, nil, srcprefix) or next
+ for dir, *files in files
+ unless dirs.include?(dir)
+ dirs << dir
+ mfile.print "pre-install-rb#{sfx}: #{dir}\n"
end
- mfile.print "pre-install-rb#{sfx}:\n"
- mfile.print("\t$(ECHO) installing#{sfx.sub(/^-/, " ")} #{target} libraries\n")
- if $extout
- dirs.uniq!
- unless dirs.empty?
+ for f in files
+ dest = "#{dir}/#{File.basename(f)}"
+ mfile.print("install-rb#{sfx}: #{dest}\n")
+ mfile.print("#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n")
+ mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{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")
- for dir in dirs.sort_by {|d| -d.count('/')}
- mfile.print("\t-$(Q)$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n")
- end
+ mfile.print("\t@-$(RM) #{fseprepl[dest]}\n")
end
end
end
- dirs.unshift(sodir) if target and !dirs.include?(sodir)
- dirs.each do |d|
- t = timestamp_file(d)
- mfile.print "#{t}:\n\t$(Q) $(MAKEDIRS) #{d}\n\t$(Q) $(TOUCH) $@\n"
+ 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"}
- mfile.print <<-SITEINSTALL
+ mfile.print <<-SITEINSTALL
site-install: site-install-so site-install-rb
site-install-so: install-so
site-install-rb: install-rb
- SITEINSTALL
+ SITEINSTALL
- return unless target
+ return unless target
- mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b
- mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
- mfile.print "\n"
+ mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b
+ mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
+ mfile.print "\n"
- compile_command = "\n\t$(ECHO) compiling $(<#{rsep})\n\t$(Q) %s\n\n"
- CXX_EXT.each do |e|
- each_compile_rules do |rule|
- mfile.printf(rule, e, $OBJEXT)
- mfile.printf(compile_command, COMPILE_CXX)
- end
- end
- C_EXT.each do |e|
- each_compile_rules do |rule|
- mfile.printf(rule, e, $OBJEXT)
- mfile.printf(compile_command, COMPILE_C)
- end
- end
-
- mfile.print "$(RUBYARCHDIR)/" if $extout
- mfile.print "$(DLLIB): "
- mfile.print "$(DEFFILE) " if makedef
- mfile.print "$(OBJS) Makefile"
- mfile.print " #{timestamp_file('$(RUBYARCHDIR)')}" if $extout
- mfile.print "\n"
- mfile.print "\t$(ECHO) linking shared-object #{target_prefix.sub(/\A\/(.*)/, '\1/')}$(DLLIB)\n"
- mfile.print "\t-$(Q)$(RM) $(@#{sep})\n"
- link_so = LINK_SO.gsub(/^/, "\t$(Q) ")
- 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-$(Q)$(RM) $(@#{sep})\n\t"
- mfile.print "$(ECHO) linking static-library $(@#{rsep})\n\t$(Q) "
- mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
- config_string('RANLIB') do |ranlib|
- mfile.print "\n\t-$(Q)#{ranlib} $(DLLIB) 2> /dev/null || true"
- end
- end
- mfile.print "\n\n"
- if makedef
- mfile.print "$(DEFFILE): #{origdef}\n"
- mfile.print "\t$(ECHO) generating $(@#{rsep})\n"
- mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n"
- end
-
- depend = File.join(srcdir, "depend")
- if File.exist?(depend)
- mfile.print("###\n", *depend_rules(File.read(depend)))
- else
- mfile.print "$(OBJS): $(HDRS) $(ruby_headers)\n"
- end
-
- $makefile_created = true
- ensure
- mfile.close if mfile
- end
-
- # :stopdoc:
-
- def init_mkmf(config = CONFIG, rbconfig = RbConfig::CONFIG)
- $makefile_created = false
- $arg_config = []
- $enable_shared = config['ENABLE_SHARED'] == 'yes'
- $defs = []
- $extconf_h = nil
- if $warnflags = CONFIG['warnflags'] and CONFIG['GCC'] == 'yes'
- # turn warnings into errors only for bundled extensions.
- config['warnflags'] = $warnflags.gsub(/(\A|\s)-Werror[-=]/, '\1-W')
- RbConfig.expand(rbconfig['warnflags'] = config['warnflags'].dup)
- config.each do |key, val|
- RbConfig.expand(rbconfig[key] = val.dup) if /warnflags/ =~ val
- end
- $warnflags = config['warnflags'] unless $extmk
- end
- $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
- $CXXFLAGS = (with_config("cxxflags", arg_config("CXXFLAGS", config["CXXFLAGS"]))||'').dup
- $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)"
- $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
- $LIBEXT = config['LIBEXT'].dup
- $OBJEXT = config["OBJEXT"].dup
- $EXEEXT = config["EXEEXT"].dup
- $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
- $LIBRUBYARG = ""
- $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
- $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
- $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(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)
- $LIBRUBYARG = config['LIBRUBYARG']
+ CXX_EXT.each do |e|
+ COMPILE_RULES.each do |rule|
+ mfile.printf(rule, e, $OBJEXT)
+ mfile.printf("\n\t%s\n\n", COMPILE_CXX)
end
-
- $LOCAL_LIBS = ""
-
- $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
-
- @libdir_basename = config["libdir"] && config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] or "lib"
-
- $arg_config.clear
- dir_config("opt")
end
-
- FailedMessage = <<MESSAGE
-Could not create Makefile due to some reason, probably lack of necessary
-libraries and/or headers. Check the mkmf.log file for more details. You may
-need configuration options.
-
-Provided configuration options:
-MESSAGE
-
- # Returns whether or not the Makefile was successfully generated. If not,
- # the script will abort with an error message.
- #
- # Internal use only.
- #
- def mkmf_failed(path)
- unless $makefile_created or File.exist?("Makefile")
- opts = $arg_config.collect {|t, n| "\t#{t}#{n ? "=#{n}" : ""}\n"}
- abort "*** #{path} failed ***\n" + FailedMessage + opts.join
+ %w[c].each do |e|
+ COMPILE_RULES.each do |rule|
+ mfile.printf(rule, e, $OBJEXT)
+ mfile.printf("\n\t%s\n\n", COMPILE_C)
end
end
- def MAIN_DOES_NOTHING(*refs)
- src = MAIN_DOES_NOTHING
- unless refs.empty?
- src = src.sub(/\{/) do
- $& +
- "\n if (argc > 1000000) {\n" +
- refs.map {|n|" printf(\"%p\", &#{n});\n"}.join("") +
- " }\n"
- 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 "\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 "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
+ config_string('RANLIB') do |ranlib|
+ mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
end
- src
end
-
- extend self
- init_mkmf
-
- $make = with_config("make-prog", ENV["MAKE"] || "make")
- make, = Shellwords.shellwords($make)
- $nmake = nil
- case
- when $mswin
- $nmake = ?m if /nmake/i =~ make
- when $bccwin
- $nmake = ?b if /Borland/i =~ `#{make} -h`
+ mfile.print "\n\n"
+ if makedef
+ mfile.print "$(DEFFILE): #{origdef}\n"
+ mfile.print "\t$(RUBY) #{makedef} #{origdef} > $@\n\n"
end
- $ignore_error = $nmake ? '' : ' 2> /dev/null || true'
- RbConfig::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)
+ depend = File.join(srcdir, "depend")
+ if File.exist?(depend)
+ mfile.print("###\n", *depend_rules(File.read(depend)))
else
- curdir = $curdir = "."
- end
- unless File.expand_path(RbConfig::CONFIG["topdir"]) == File.expand_path(curdir)
- CONFIG["topdir"] = $curdir
- RbConfig::CONFIG["topdir"] = curdir
- end
- $configure_args["--topdir"] ||= $curdir
- $ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
-
- # :startdoc:
-
- split = Shellwords.method(:shellwords).to_proc
-
- EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
-
- hdr = ['#include "ruby.h"' "\n"]
- config_string('COMMON_MACROS') do |s|
- Shellwords.shellwords(s).each do |w|
- w, v = w.split(/=/, 2)
- hdr << "#ifndef #{w}"
- hdr << "#define #{[w, v].compact.join(" ")}"
- hdr << "#endif /* #{w} */"
+ headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
+ if RULE_SUBST
+ headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
end
+ headers << $config_h
+ headers << '$(RUBY_EXTCONF_H)' if $extconf_h
+ mfile.print "$(OBJS): ", headers.join(' '), "\n"
end
- config_string('COMMON_HEADERS') do |s|
- Shellwords.shellwords(s).each {|w| hdr << "#include <#{w}>"}
- end
-
- ##
- # Common headers for ruby C extensions
- COMMON_HEADERS = hdr.join("\n")
-
- ##
- # Common libraries for ruby C extensions
-
- COMMON_LIBS = config_string('COMMON_LIBS', &split) || []
-
- ##
- # make compile rules
-
- COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:]
- RULE_SUBST = config_string('RULE_SUBST')
-
- ##
- # Command which will compile C files in the generated Makefile
-
- COMPILE_C = config_string('COMPILE_C') || '$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<'
-
- ##
- # Command which will compile C++ files in the generated Makefile
+ $makefile_created = true
+ensure
+ mfile.close if mfile
+end
- COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<'
+# :stopdoc:
- ##
- # Command which will compile a program in order to test linking a library
+def init_mkmf(config = CONFIG)
+ $makefile_created = false
+ $arg_config = []
+ $enable_shared = config['ENABLE_SHARED'] == 'yes'
+ $defs = []
+ $extconf_h = nil
+ $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
+ $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)"
+ $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
+ $LIBEXT = config['LIBEXT'].dup
+ $OBJEXT = config["OBJEXT"].dup
+ $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}"
+ $LIBRUBYARG = ""
+ $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
+ $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
+ $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(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)
+ $LIBRUBYARG = config['LIBRUBYARG']
+ end
+
+ $LOCAL_LIBS = ""
+
+ $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
+
+ $arg_config.clear
+ dir_config("opt")
+end
- TRY_LINK = config_string('TRY_LINK') ||
- "$(CC) #{OUTFLAG}conftest#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \
- "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+FailedMessage = <<MESSAGE
+Could not create Makefile due to some reason, probably lack of
+necessary libraries and/or headers. Check the mkmf.log file for more
+details. You may need configuration options.
- ##
- # Command which will link a shared library
+Provided configuration options:
+MESSAGE
- LINK_SO = (config_string('LINK_SO') || "").sub(/^$/) do
- if CONFIG["DLEXT"] == $OBJEXT
- "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
- else
- "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
- "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
- end
+# Returns whether or not the Makefile was successfully generated. If not,
+# the script will abort with an error message.
+#
+# Internal use only.
+#
+def mkmf_failed(path)
+ unless $makefile_created or File.exist?("Makefile")
+ opts = $arg_config.collect {|t, n| "\t#{t}#{n ? "=#{n}" : ""}\n"}
+ abort "*** #{path} failed ***\n" + FailedMessage + opts.join
end
+end
- ##
- # Argument which will add a library path to the linker
-
- LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s'
- RPATHFLAG = config_string('RPATHFLAG') || ''
-
- ##
- # Argument which will add a library to the linker
+# :startdoc:
- LIBARG = config_string('LIBARG') || '-l%s'
+init_mkmf
- ##
- # A C main function which does no work
+$make = with_config("make-prog", ENV["MAKE"] || "make")
+make, = Shellwords.shellwords($make)
+$nmake = nil
+case
+when $mswin
+ $nmake = ?m if /nmake/i =~ make
+when $bccwin
+ $nmake = ?b if /Borland/i =~ `#{make} -h`
+end
- MAIN_DOES_NOTHING = config_string('MAIN_DOES_NOTHING') || "int main(int argc, char **argv)\n{\n return 0;\n}"
- UNIVERSAL_INTS = config_string('UNIVERSAL_INTS') {|s| Shellwords.shellwords(s)} ||
- %w[int short long long\ long]
+RbConfig::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)
+else
+ curdir = $curdir = "."
+end
+unless File.expand_path(RbConfig::CONFIG["topdir"]) == File.expand_path(curdir)
+ CONFIG["topdir"] = $curdir
+ RbConfig::CONFIG["topdir"] = curdir
+end
+$configure_args["--topdir"] ||= $curdir
+$ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
- sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
+split = Shellwords.method(:shellwords).to_proc
- ##
- # Makefile rules that will clean the extension build directory
+EXPORT_PREFIX = config_string('EXPORT_PREFIX') {|s| s.strip}
- CLEANINGS = "
-clean-static::
+hdr = ['#include "ruby.h"' "\n"]
+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}>"}
+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 $<'
+TRY_LINK = config_string('TRY_LINK') ||
+ "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \
+ "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+LINK_SO = config_string('LINK_SO') ||
+ if CONFIG["DLEXT"] == $OBJEXT
+ "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
+ else
+ "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
+ "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
+ end
+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 != "/"} || ""
+CLEANINGS = "
clean-rb-default::
clean-rb::
clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-\t\t-$(Q)$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep}) .*.time
+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-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-\t\t-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-\t\t-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-\t\t-$(Q)$(RMDIRS) $(DISTCLEANDIRS#{sep})#{$ignore_error}
+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
"
-end
-
-include MakeMakefile
if not $extmk and /\A(extconf|makefile).rb\z/ =~ File.basename($0)
END {mkmf_failed($0)}
diff --git a/lib/monitor.rb b/lib/monitor.rb
index 07394b5900..d4bfb670b2 100644
--- a/lib/monitor.rb
+++ b/lib/monitor.rb
@@ -1,91 +1,81 @@
-# = monitor.rb
-#
-# Copyright (C) 2001 Shugo Maeda <shugo@ruby-lang.org>
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
+=begin
+
+= monitor.rb
+
+Copyright (C) 2001 Shugo Maeda <shugo@ruby-lang.org>
+
+This library is distributed under the terms of the Ruby license.
+You can freely distribute/modify this library.
+
+== example
+
+This is a simple example.
+
+ require 'monitor.rb'
+
+ buf = []
+ buf.extend(MonitorMixin)
+ empty_cond = buf.new_cond
+
+ # consumer
+ Thread.start do
+ loop do
+ buf.synchronize do
+ empty_cond.wait_while { buf.empty? }
+ print buf.shift
+ end
+ end
+ end
+
+ # producer
+ while line = ARGF.gets
+ buf.synchronize do
+ buf.push(line)
+ 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
+empty_cond.signal.
+
+=end
require 'thread'
#
-# In concurrent programming, a monitor is an object or module intended to be
-# used safely by more than one thread. The defining characteristic of a
-# monitor is that its methods are executed with mutual exclusion. That is, at
-# each point in time, at most one thread may be executing any of its methods.
-# This mutual exclusion greatly simplifies reasoning about the implementation
-# of monitors compared to reasoning about parallel code that updates a data
-# structure.
-#
-# You can read more about the general principles on the Wikipedia page for
-# Monitors[http://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
-#
-# == Examples
-#
-# === Simple object.extend
-#
-# require 'monitor.rb'
-#
-# buf = []
-# buf.extend(MonitorMixin)
-# empty_cond = buf.new_cond
-#
-# # consumer
-# Thread.start do
-# loop do
-# buf.synchronize do
-# empty_cond.wait_while { buf.empty? }
-# print buf.shift
-# end
-# end
-# end
-#
-# # producer
-# while line = ARGF.gets
-# buf.synchronize do
-# buf.push(line)
-# empty_cond.signal
-# end
-# end
-#
-# The consumer thread waits for the producer thread to push a line to buf
-# while <tt>buf.empty?</tt>. The producer thread (main thread) reads a
-# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
-# to notify the consumer thread of new data.
+# Adds monitor functionality to an arbitrary object by mixing the module with
+# +include+. For example:
#
-# === Simple Class include
+# require 'monitor'
#
-# require 'monitor'
+# buf = []
+# buf.extend(MonitorMixin)
+# empty_cond = buf.new_cond
#
-# class SynchronizedArray < Array
+# # consumer
+# Thread.start do
+# loop do
+# buf.synchronize do
+# empty_cond.wait_while { buf.empty? }
+# print buf.shift
+# end
+# end
+# end
#
-# include MonitorMixin
+# # producer
+# while line = ARGF.gets
+# buf.synchronize do
+# buf.push(line)
+# empty_cond.signal
+# end
+# end
#
-# def initialize(*args)
-# super(*args)
-# end
-#
-# alias :old_shift :shift
-# alias :old_unshift :unshift
-#
-# def shift(n=1)
-# self.synchronize do
-# self.old_shift(n)
-# end
-# end
-#
-# def unshift(item)
-# self.synchronize do
-# self.old_unshift(item)
-# end
-# end
-#
-# # other methods ...
-# end
-#
-# +SynchronizedArray+ implements an Array with synchronized access to items.
-# This Class is implemented as subclass of Array which includes the
-# MonitorMixin module.
+# 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
+# empty_cond.signal.
#
module MonitorMixin
#
@@ -107,7 +97,7 @@ module MonitorMixin
@monitor.__send__(:mon_check_owner)
count = @monitor.__send__(:mon_exit_for_cond)
begin
- @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
+ @cond.wait(@monitor.instance_variable_get("@mon_mutex"), timeout)
return true
ensure
@monitor.__send__(:mon_enter_for_cond, count)
@@ -119,7 +109,7 @@ module MonitorMixin
#
def wait_while
while yield
- wait
+ wait
end
end
@@ -128,7 +118,7 @@ module MonitorMixin
#
def wait_until
until yield
- wait
+ wait
end
end
@@ -225,16 +215,11 @@ module MonitorMixin
private
- # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
- # of this constructor. Have look at the examples above to understand how to
- # use this module.
def initialize(*args)
super
mon_initialize
end
- # Initializes the MonitorMixin after being included in a class or when an
- # object has been extended with the MonitorMixin
def mon_initialize
@mon_owner = nil
@mon_count = 0
@@ -260,16 +245,6 @@ module MonitorMixin
end
end
-# Use the Monitor class when you want to have a lock object for blocks with
-# mutual exclusion.
-#
-# require 'monitor'
-#
-# lock = Monitor.new
-# lock.synchronize do
-# # exclusive access
-# end
-#
class Monitor
include MonitorMixin
alias try_enter try_mon_enter
@@ -285,6 +260,8 @@ end
# - All the internals (internal modules Accessible and Initializable, class
# ConditionVariable) appear in RDoc. It might be good to hide them, by
# making them private, or marking them :nodoc:, etc.
+# - The entire example from the RD section at the top is replicated in the RDoc
+# comment for MonitorMixin. Does the RD section need to remain?
# - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
# not synchronize.
# - mon_owner is in Nutshell, but appears as an accessor in a separate module
diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
index 6698cb5ac6..081bb788e4 100644
--- a/lib/mutex_m.rb
+++ b/lib/mutex_m.rb
@@ -1,43 +1,32 @@
#
# mutex_m.rb -
-# $Release Version: 3.0$
-# $Revision: 1.7 $
+# $Release Version: 3.0$
+# $Revision: 1.7 $
# Original from mutex.rb
-# by Keiju ISHITSUKA(keiju@ishitsuka.com)
+# 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
+#
require 'thread'
-# = mutex_m.rb
-#
-# When 'mutex_m' is required, any object that extends or includes Mutex_m will
-# be treated like a Mutex.
-#
-# Start by requiring the standard library Mutex_m:
-#
-# require "mutex_m.rb"
-#
-# From here you can extend an object with Mutex instance methods:
-#
-# obj = Object.new
-# obj.extend Mutex_m
-#
-# Or mixin Mutex_m into your module to your class inherit Mutex instance
-# methods.
-#
-# class Foo
-# include Mutex_m
-# # ...
-# end
-# obj = Foo.new
-# # this obj can be handled like Mutex
-#
module Mutex_m
- def Mutex_m.define_aliases(cl) # :nodoc:
+ def Mutex_m.define_aliases(cl)
cl.module_eval %q{
alias locked? mu_locked?
alias lock mu_lock
@@ -47,64 +36,55 @@ module Mutex_m
}
end
- def Mutex_m.append_features(cl) # :nodoc:
+ def Mutex_m.append_features(cl)
super
define_aliases(cl) unless cl.instance_of?(Module)
end
- def Mutex_m.extend_object(obj) # :nodoc:
+ def Mutex_m.extend_object(obj)
super
obj.mu_extended
end
- def mu_extended # :nodoc:
+ def mu_extended
unless (defined? locked? and
- defined? lock and
- defined? unlock and
- defined? try_lock and
- defined? synchronize)
+ defined? lock and
+ defined? unlock and
+ defined? try_lock and
+ defined? synchronize)
Mutex_m.define_aliases(singleton_class)
end
mu_initialize
end
- # See Mutex#synchronize
+ # locking
def mu_synchronize(&block)
@_mutex.synchronize(&block)
end
- # See Mutex#locked?
def mu_locked?
@_mutex.locked?
end
- # See Mutex#try_lock
def mu_try_lock
@_mutex.try_lock
end
- # See Mutex#lock
def mu_lock
@_mutex.lock
end
- # See Mutex#unlock
def mu_unlock
@_mutex.unlock
end
- # See Mutex#sleep
- def sleep(timeout = nil)
- @_mutex.sleep(timeout)
- end
-
private
- def mu_initialize # :nodoc:
+ def mu_initialize
@_mutex = Mutex.new
end
- def initialize(*args) # :nodoc:
+ def initialize(*args)
mu_initialize
super
end
diff --git a/lib/net/.document b/lib/net/.document
new file mode 100644
index 0000000000..6332bb9e7e
--- /dev/null
+++ b/lib/net/.document
@@ -0,0 +1,8 @@
+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 20b8faa134..f393a15bff 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -16,7 +16,6 @@
require "socket"
require "monitor"
-require "net/protocol"
module Net
@@ -41,7 +40,7 @@ module Net
#
# === Example 1
#
- # ftp = Net::FTP.new('example.com')
+ # ftp = Net::FTP.new('ftp.netlab.co.jp')
# ftp.login
# files = ftp.chdir('pub/lang/ruby/contrib')
# files = ftp.list('n*')
@@ -50,7 +49,7 @@ module Net
#
# === Example 2
#
- # Net::FTP.open('example.com') do |ftp|
+ # Net::FTP.open('ftp.netlab.co.jp') do |ftp|
# ftp.login
# files = ftp.chdir('pub/lang/ruby/contrib')
# files = ftp.list('n*')
@@ -77,7 +76,7 @@ module Net
# :stopdoc:
FTP_PORT = 21
CRLF = "\r\n"
- DEFAULT_BLOCKSIZE = BufferedIO::BUFSIZE
+ DEFAULT_BLOCKSIZE = 4096
# :startdoc:
# When +true+, transfers are performed in binary mode. Default: +true+.
@@ -94,24 +93,6 @@ module Net
# transfers are resumed or restarted. Default: +false+.
attr_accessor :resume
- # Number of seconds to wait for the connection to open. Any number
- # may be used, including Floats for fractional seconds. If the FTP
- # object cannot open a connection in this many seconds, it raises a
- # Net::OpenTimeout exception. The default value is +nil+.
- attr_accessor :open_timeout
-
- # Number of seconds to wait for one block to be read (via one read(2)
- # call). Any number may be used, including Floats for fractional
- # seconds. If the FTP object cannot read data in this many seconds,
- # it raises a TimeoutError exception. The default value is 60 seconds.
- attr_reader :read_timeout
-
- # Setter for the read_timeout attribute.
- def read_timeout=(sec)
- @sock.read_timeout = sec
- @read_timeout = sec
- end
-
# The server's welcome message.
attr_reader :welcome
@@ -154,18 +135,14 @@ module Net
@resume = false
@sock = NullSocket.new
@logged_in = false
- @open_timeout = nil
- @read_timeout = 60
if host
- connect(host)
- if user
- login(user, passwd, acct)
- end
+ connect(host)
+ if user
+ login(user, passwd, acct)
+ end
end
end
- # A setter to toggle transfers in binary mode.
- # +newmode+ is either +true+ or +false+
def binary=(newmode)
if newmode != @binary
@binary = newmode
@@ -173,12 +150,7 @@ module Net
end
end
- # Sends a command to destination host, with the current binary sendmode
- # type.
- #
- # If binary mode is +true+, then "TYPE I" (image) is sent, otherwise "TYPE
- # A" (ascii) is sent.
- def send_type_command # :nodoc:
+ def send_type_command
if @binary
voidcmd("TYPE I")
else
@@ -187,12 +159,7 @@ module Net
end
private :send_type_command
- # Toggles transfers in binary mode and yields to a block.
- # This preserves your current binary send mode, but allows a temporary
- # transaction with binary sendmode of +newmode+.
- #
- # +newmode+ is either +true+ or +false+
- def with_binary(newmode) # :nodoc:
+ def with_binary(newmode)
oldmode = binary
self.binary = newmode
begin
@@ -204,33 +171,23 @@ module Net
private :with_binary
# Obsolete
- def return_code # :nodoc:
+ def return_code
$stderr.puts("warning: Net::FTP#return_code is obsolete and do nothing")
return "\n"
end
# Obsolete
- def return_code=(s) # :nodoc:
+ def return_code=(s)
$stderr.puts("warning: Net::FTP#return_code= is obsolete and do nothing")
end
- # Contructs a socket with +host+ and +port+.
- #
- # If SOCKSSocket is defined and the environment (ENV) defines
- # SOCKS_SERVER, then a SOCKSSocket is returned, else a TCPSocket is
- # returned.
- def open_socket(host, port) # :nodoc:
- return Timeout.timeout(@open_timeout, Net::OpenTimeout) {
- if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
- @passive = true
- sock = SOCKSSocket.open(host, port)
- else
- sock = TCPSocket.open(host, port)
- end
- io = BufferedSocket.new(sock)
- io.read_timeout = @read_timeout
- io
- }
+ def open_socket(host, port)
+ if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
+ @passive = true
+ return SOCKSSocket.open(host, port)
+ else
+ return TCPSocket.open(host, port)
+ end
end
private :open_socket
@@ -242,11 +199,11 @@ module Net
#
def connect(host, port = FTP_PORT)
if @debug_mode
- print "connect: ", host, ", ", port, "\n"
+ print "connect: ", host, ", ", port, "\n"
end
synchronize do
- @sock = open_socket(host, port)
- voidresp
+ @sock = open_socket(host, port)
+ voidresp
end
end
@@ -255,89 +212,75 @@ module Net
#
def set_socket(sock, get_greeting = true)
synchronize do
- @sock = sock
- if get_greeting
- voidresp
- end
+ @sock = sock
+ if get_greeting
+ voidresp
+ end
end
end
- # If string +s+ includes the PASS command (password), then the contents of
- # the password are cleaned from the string using "*"
- def sanitize(s) # :nodoc:
+ def sanitize(s)
if s =~ /^PASS /i
- return s[0, 5] + "*" * (s.length - 5)
+ return s[0, 5] + "*" * (s.length - 5)
else
- return s
+ return s
end
end
private :sanitize
- # Ensures that +line+ has a control return / line feed (CRLF) and writes
- # it to the socket.
- def putline(line) # :nodoc:
+ def putline(line)
if @debug_mode
- print "put: ", sanitize(line), "\n"
+ print "put: ", sanitize(line), "\n"
end
line = line + CRLF
@sock.write(line)
end
private :putline
- # Reads a line from the sock. If EOF, then it will raise EOFError
- def getline # :nodoc:
+ def getline
line = @sock.readline # if get EOF, raise EOFError
line.sub!(/(\r\n|\n|\r)\z/n, "")
if @debug_mode
- print "get: ", sanitize(line), "\n"
+ print "get: ", sanitize(line), "\n"
end
return line
end
private :getline
- # Receive a section of lines until the response code's match.
- def getmultiline # :nodoc:
+ def getmultiline
line = getline
buff = line
if line[3] == ?-
- code = line[0, 3]
- begin
- line = getline
- buff << "\n" << line
- end until line[0, 3] == code and line[3] != ?-
+ code = line[0, 3]
+ begin
+ line = getline
+ buff << "\n" << line
+ end until line[0, 3] == code and line[3] != ?-
end
return buff << "\n"
end
private :getmultiline
- # Recieves a response from the destination host.
- #
- # Returns the response code or raises FTPTempError, FTPPermError, or
- # FTPProtoError
- def getresp # :nodoc:
+ def getresp
@last_response = getmultiline
@last_response_code = @last_response[0, 3]
case @last_response_code
when /\A[123]/
- return @last_response
+ return @last_response
when /\A4/
- raise FTPTempError, @last_response
+ raise FTPTempError, @last_response
when /\A5/
- raise FTPPermError, @last_response
+ raise FTPPermError, @last_response
else
- raise FTPProtoError, @last_response
+ raise FTPProtoError, @last_response
end
end
private :getresp
- # Recieves a response.
- #
- # Raises FTPReplyError if the first position of the response code is not
- # equal 2.
- def voidresp # :nodoc:
+ def voidresp
resp = getresp
if resp[0] != ?2
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
end
private :voidresp
@@ -347,8 +290,8 @@ module Net
#
def sendcmd(cmd)
synchronize do
- putline(cmd)
- return getresp
+ putline(cmd)
+ return getresp
end
end
@@ -357,88 +300,76 @@ module Net
#
def voidcmd(cmd)
synchronize do
- putline(cmd)
- voidresp
+ putline(cmd)
+ voidresp
end
end
- # Constructs and send the appropriate PORT (or EPRT) command
- def sendport(host, port) # :nodoc:
+ def sendport(host, port)
af = (@sock.peeraddr)[0]
if af == "AF_INET"
- cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
+ cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",")
elsif af == "AF_INET6"
- cmd = sprintf("EPRT |2|%s|%d|", host, port)
+ cmd = sprintf("EPRT |2|%s|%d|", host, port)
else
- raise FTPProtoError, host
+ raise FTPProtoError, host
end
voidcmd(cmd)
end
private :sendport
- # Constructs a TCPServer socket, and sends it the PORT command
- #
- # Returns the constructed TCPServer socket
- def makeport # :nodoc:
+ def makeport
sock = TCPServer.open(@sock.addr[3], 0)
port = sock.addr[1]
host = sock.addr[3]
- sendport(host, port)
+ resp = sendport(host, port)
return sock
end
private :makeport
- # sends the appropriate command to enable a passive connection
- def makepasv # :nodoc:
+ def makepasv
if @sock.peeraddr[0] == "AF_INET"
- host, port = parse227(sendcmd("PASV"))
+ host, port = parse227(sendcmd("PASV"))
else
- host, port = parse229(sendcmd("EPSV"))
- # host, port = parse228(sendcmd("LPSV"))
+ host, port = parse229(sendcmd("EPSV"))
+ # host, port = parse228(sendcmd("LPSV"))
end
return host, port
end
private :makepasv
- # Constructs a connection for transferring data
- def transfercmd(cmd, rest_offset = nil) # :nodoc:
+ 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)
- if resp[0] != ?3
- raise FTPReplyError, resp
- end
- end
- resp = sendcmd(cmd)
+ host, port = makepasv
+ conn = open_socket(host, port)
+ if @resume and rest_offset
+ resp = sendcmd("REST " + rest_offset.to_s)
+ if resp[0] != ?3
+ raise FTPReplyError, resp
+ end
+ end
+ resp = sendcmd(cmd)
# skip 2XX for some ftp servers
resp = getresp if resp[0] == ?2
- if resp[0] != ?1
- raise FTPReplyError, resp
- end
+ if resp[0] != ?1
+ raise FTPReplyError, resp
+ end
else
- sock = makeport
- begin
- if @resume and rest_offset
- resp = sendcmd("REST " + rest_offset.to_s)
- if resp[0] != ?3
- raise FTPReplyError, resp
- end
- end
- resp = sendcmd(cmd)
- # skip 2XX for some ftp servers
- resp = getresp if resp[0] == ?2
- if resp[0] != ?1
- raise FTPReplyError, resp
- end
- conn = BufferedSocket.new(sock.accept)
- conn.read_timeout = @read_timeout
- sock.shutdown(Socket::SHUT_WR) rescue nil
- sock.read rescue nil
- ensure
- sock.close
- end
+ sock = makeport
+ if @resume and rest_offset
+ resp = sendcmd("REST " + rest_offset.to_s)
+ if resp[0] != ?3
+ raise FTPReplyError, resp
+ end
+ end
+ resp = sendcmd(cmd)
+ # skip 2XX for some ftp servers
+ resp = getresp if resp[0] == ?2
+ if resp[0] != ?1
+ raise FTPReplyError, resp
+ end
+ conn = sock.accept
+ sock.close
end
return conn
end
@@ -454,23 +385,23 @@ module Net
#
def login(user = "anonymous", passwd = nil, acct = nil)
if user == "anonymous" and passwd == nil
- passwd = "anonymous@"
+ passwd = "anonymous@"
end
resp = ""
synchronize do
- resp = sendcmd('USER ' + user)
- if resp[0] == ?3
+ resp = sendcmd('USER ' + user)
+ if resp[0] == ?3
raise FTPReplyError, resp if passwd.nil?
- resp = sendcmd('PASS ' + passwd)
- end
- if resp[0] == ?3
+ resp = sendcmd('PASS ' + passwd)
+ end
+ if resp[0] == ?3
raise FTPReplyError, resp if acct.nil?
- resp = sendcmd('ACCT ' + acct)
- end
+ resp = sendcmd('ACCT ' + acct)
+ end
end
if resp[0] != ?2
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
@welcome = resp
send_type_command
@@ -485,20 +416,14 @@ module Net
#
def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data
synchronize do
- with_binary(true) do
- begin
- conn = transfercmd(cmd, rest_offset)
- loop do
- data = conn.read(blocksize)
- break if data == nil
- yield(data)
- end
- conn.shutdown(Socket::SHUT_WR)
- conn.read_timeout = 1
- conn.read
- ensure
- conn.close if conn
+ 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
end
@@ -512,20 +437,14 @@ module Net
#
def retrlines(cmd) # :yield: line
synchronize do
- with_binary(false) do
- begin
- conn = transfercmd(cmd)
- loop do
- line = conn.gets
- break if line == nil
- yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?)
- end
- conn.shutdown(Socket::SHUT_WR)
- conn.read_timeout = 1
- conn.read
- ensure
- conn.close if conn
+ with_binary(false) do
+ conn = transfercmd(cmd)
+ loop do
+ line = conn.gets
+ break if line == nil
+ yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?)
end
+ conn.close
voidresp
end
end
@@ -537,18 +456,18 @@ module Net
# +file+ to the server. If the optional block is given, it also passes it
# the data, in chunks of +blocksize+ characters.
#
- def storbinary(cmd, file, blocksize, rest_offset = nil) # :yield: data
+ def storbinary(cmd, file, blocksize, rest_offset = nil, &block) # :yield: data
if rest_offset
file.seek(rest_offset, IO::SEEK_SET)
end
synchronize do
- with_binary(true) do
+ with_binary(true) do
conn = transfercmd(cmd)
loop do
buf = file.read(blocksize)
break if buf == nil
conn.write(buf)
- yield(buf) if block_given?
+ yield(buf) if block
end
conn.close
voidresp
@@ -569,9 +488,9 @@ module Net
# named +file+ to the server, one line at a time. If the optional block is
# given, it also passes it the lines.
#
- def storlines(cmd, file) # :yield: line
+ def storlines(cmd, file, &block) # :yield: line
synchronize do
- with_binary(false) do
+ with_binary(false) do
conn = transfercmd(cmd)
loop do
buf = file.gets
@@ -580,7 +499,7 @@ module Net
buf = buf.chomp + CRLF
end
conn.write(buf)
- yield(buf) if block_given?
+ yield(buf) if block
end
conn.close
voidresp
@@ -602,7 +521,7 @@ module Net
# chunks.
#
def getbinaryfile(remotefile, localfile = File.basename(remotefile),
- blocksize = DEFAULT_BLOCKSIZE) # :yield: data
+ blocksize = DEFAULT_BLOCKSIZE) # :yield: data
result = nil
if localfile
if @resume
@@ -616,15 +535,15 @@ module Net
result = ""
end
begin
- f.binmode if localfile
- retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
- f.write(data) if localfile
- yield(data) if block_given?
+ f.binmode if localfile
+ retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
+ f.write(data) if localfile
+ yield(data) if block_given?
result.concat(data) if result
- end
+ end
return result
ensure
- f.close if localfile
+ f.close if localfile
end
end
@@ -643,15 +562,15 @@ module Net
result = ""
end
begin
- retrlines("RETR " + remotefile) do |line, newline|
+ retrlines("RETR " + remotefile) do |line, newline|
l = newline ? line + "\n" : line
- f.print(l) if localfile
- yield(line, newline) if block_given?
+ f.print(l) if localfile
+ yield(line, newline) if block_given?
result.concat(l) if result
- end
+ end
return result
ensure
- f.close if localfile
+ f.close if localfile
end
end
@@ -660,11 +579,11 @@ module Net
# binary). See #gettextfile and #getbinaryfile.
#
def get(remotefile, localfile = File.basename(remotefile),
- blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+ blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
if @binary
- getbinaryfile(remotefile, localfile, blocksize, &block)
+ getbinaryfile(remotefile, localfile, blocksize, &block)
else
- gettextfile(remotefile, localfile, &block)
+ gettextfile(remotefile, localfile, &block)
end
end
@@ -674,7 +593,7 @@ module Net
# data in +blocksize+ chunks.
#
def putbinaryfile(localfile, remotefile = File.basename(localfile),
- blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
+ blocksize = DEFAULT_BLOCKSIZE, &block) # :yield: data
if @resume
begin
rest_offset = size(remotefile)
@@ -682,18 +601,18 @@ module Net
rest_offset = nil
end
else
- rest_offset = nil
+ rest_offset = nil
end
f = open(localfile)
begin
- f.binmode
+ f.binmode
if rest_offset
storbinary("APPE " + remotefile, f, blocksize, rest_offset, &block)
else
storbinary("STOR " + remotefile, f, blocksize, rest_offset, &block)
end
ensure
- f.close
+ f.close
end
end
@@ -705,9 +624,9 @@ module Net
def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
f = open(localfile)
begin
- storlines("STOR " + remotefile, f, &block)
+ storlines("STOR " + remotefile, f, &block)
ensure
- f.close
+ f.close
end
end
@@ -716,19 +635,16 @@ module Net
# (text or binary). See #puttextfile and #putbinaryfile.
#
def put(localfile, remotefile = File.basename(localfile),
- blocksize = DEFAULT_BLOCKSIZE, &block)
+ blocksize = DEFAULT_BLOCKSIZE, &block)
if @binary
- putbinaryfile(localfile, remotefile, blocksize, &block)
+ putbinaryfile(localfile, remotefile, blocksize, &block)
else
- puttextfile(localfile, remotefile, &block)
+ puttextfile(localfile, remotefile, &block)
end
end
#
- # Sends the ACCT command.
- #
- # This is a less common FTP command, to send account
- # information if the destination host requires it.
+ # Sends the ACCT command. TODO: more info.
#
def acct(account)
cmd = "ACCT " + account
@@ -741,11 +657,11 @@ module Net
def nlst(dir = nil)
cmd = "NLST"
if dir
- cmd = cmd + " " + dir
+ cmd = cmd + " " + dir
end
files = []
retrlines(cmd) do |line|
- files.push(line)
+ files.push(line)
end
return files
end
@@ -757,16 +673,16 @@ module Net
def list(*args, &block) # :yield: line
cmd = "LIST"
args.each do |arg|
- cmd = cmd + " " + arg.to_s
+ cmd = cmd + " " + arg.to_s
end
if block
- retrlines(cmd, &block)
+ retrlines(cmd, &block)
else
- lines = []
- retrlines(cmd) do |line|
- lines << line
- end
- return lines
+ lines = []
+ retrlines(cmd) do |line|
+ lines << line
+ end
+ return lines
end
end
alias ls list
@@ -778,7 +694,7 @@ module Net
def rename(fromname, toname)
resp = sendcmd("RNFR " + fromname)
if resp[0] != ?3
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
voidcmd("RNTO " + toname)
end
@@ -789,11 +705,11 @@ module Net
def delete(filename)
resp = sendcmd("DELE " + filename)
if resp[0, 3] == "250"
- return
+ return
elsif resp[0] == ?5
- raise FTPPermError, resp
+ raise FTPPermError, resp
else
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
end
@@ -802,14 +718,14 @@ module Net
#
def chdir(dirname)
if dirname == ".."
- begin
- voidcmd("CDUP")
- return
- rescue FTPPermError => e
- if e.message[0, 3] != "500"
- raise e
- end
- end
+ begin
+ voidcmd("CDUP")
+ return
+ rescue FTPPermError => e
+ if e.message[0, 3] != "500"
+ raise e
+ end
+ end
end
cmd = "CWD " + dirname
voidcmd(cmd)
@@ -870,7 +786,7 @@ module Net
def system
resp = sendcmd("SYST")
if resp[0, 3] != "215"
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
return resp[4 .. -1]
end
@@ -884,7 +800,7 @@ module Net
@sock.send(line, Socket::MSG_OOB)
resp = getmultiline
unless ["426", "226", "225"].include?(resp[0, 3])
- raise FTPProtoError, resp
+ raise FTPProtoError, resp
end
return resp
end
@@ -905,7 +821,7 @@ module Net
def mdtm(filename)
resp = sendcmd("MDTM " + filename)
if resp[0, 3] == "213"
- return resp[3 .. -1].strip
+ return resp[3 .. -1].strip
end
end
@@ -915,7 +831,7 @@ module Net
def help(arg = nil)
cmd = "HELP"
if arg
- cmd = cmd + " " + arg
+ cmd = cmd + " " + arg
end
sendcmd(cmd)
end
@@ -930,8 +846,6 @@ module Net
#
# Issues a NOOP command.
#
- # Does nothing except return a response.
- #
def noop
voidcmd("NOOP")
end
@@ -949,16 +863,7 @@ module Net
# a new connection with #connect.
#
def close
- if @sock and not @sock.closed?
- begin
- @sock.shutdown(Socket::SHUT_WR) rescue nil
- orig, self.read_timeout = self.read_timeout, 3
- @sock.read rescue nil
- ensure
- @sock.close
- self.read_timeout = orig
- end
- end
+ @sock.close if @sock and not @sock.closed?
end
#
@@ -968,100 +873,96 @@ module Net
@sock == nil or @sock.closed?
end
- # handler for response code 227
- # (Entering Passive Mode (h1,h2,h3,h4,p1,p2))
- #
- # Returns host and port.
- def parse227(resp) # :nodoc:
+ def parse227(resp)
if resp[0, 3] != "227"
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
- if m = /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
- return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
- else
- raise FTPProtoError, resp
+ left = resp.index("(")
+ right = resp.index(")")
+ if left == nil or right == nil
+ raise FTPProtoError, resp
+ end
+ numbers = resp[left + 1 .. right - 1].split(",")
+ if numbers.length != 6
+ raise FTPProtoError, resp
end
+ host = numbers[0, 4].join(".")
+ port = (numbers[4].to_i << 8) + numbers[5].to_i
+ return host, port
end
private :parse227
- # handler for response code 228
- # (Entering Long Passive Mode)
- #
- # Returns host and port.
- def parse228(resp) # :nodoc:
+ def parse228(resp)
if resp[0, 3] != "228"
- raise FTPReplyError, resp
- end
- if m = /\(4,4,(?<host>\d+(,\d+){3}),2,(?<port>\d+,\d+)\)/.match(resp)
- return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
- elsif m = /\(6,16,(?<host>\d+(,(\d+)){15}),2,(?<port>\d+,\d+)\)/.match(resp)
- return parse_pasv_ipv6_host(m["host"]), parse_pasv_port(m["port"])
- else
- raise FTPProtoError, resp
+ raise FTPReplyError, resp
+ end
+ left = resp.index("(")
+ right = resp.index(")")
+ if left == nil or right == nil
+ raise FTPProtoError, resp
+ end
+ numbers = resp[left + 1 .. right - 1].split(",")
+ if numbers[0] == "4"
+ if numbers.length != 9 || numbers[1] != "4" || numbers[2 + 4] != "2"
+ raise FTPProtoError, resp
+ end
+ host = numbers[2, 4].join(".")
+ port = (numbers[7].to_i << 8) + numbers[8].to_i
+ elsif numbers[0] == "6"
+ if numbers.length != 21 || numbers[1] != "16" || numbers[2 + 16] != "2"
+ raise FTPProtoError, resp
+ end
+ v6 = ["", "", "", "", "", "", "", ""]
+ for i in 0 .. 7
+ v6[i] = sprintf("%02x%02x", numbers[(i * 2) + 2].to_i,
+ numbers[(i * 2) + 3].to_i)
+ end
+ host = v6[0, 8].join(":")
+ port = (numbers[19].to_i << 8) + numbers[20].to_i
end
return host, port
end
private :parse228
- def parse_pasv_ipv4_host(s)
- return s.tr(",", ".")
- end
- private :parse_pasv_ipv4_host
-
- def parse_pasv_ipv6_host(s)
- return s.split(/,/).map { |i|
- "%02x" % i.to_i
- }.each_slice(2).map(&:join).join(":")
- end
- private :parse_pasv_ipv6_host
-
- def parse_pasv_port(s)
- return s.split(/,/).map(&:to_i).inject { |x, y|
- (x << 8) + y
- }
- end
- private :parse_pasv_port
-
- # handler for response code 229
- # (Extended Passive Mode Entered)
- #
- # Returns host and port.
- def parse229(resp) # :nodoc:
+ def parse229(resp)
if resp[0, 3] != "229"
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
- if m = /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/.match(resp)
- return @sock.peeraddr[3], m["port"].to_i
- else
- raise FTPProtoError, resp
+ left = resp.index("(")
+ right = resp.index(")")
+ if left == nil or right == nil
+ raise FTPProtoError, resp
+ end
+ numbers = resp[left + 1 .. right - 1].split(resp[left + 1, 1])
+ if numbers.length != 4
+ raise FTPProtoError, resp
end
+ port = numbers[3].to_i
+ host = (@sock.peeraddr())[3]
+ return host, port
end
private :parse229
- # handler for response code 257
- # ("PATHNAME" created)
- #
- # Returns host and port.
- def parse257(resp) # :nodoc:
+ def parse257(resp)
if resp[0, 3] != "257"
- raise FTPReplyError, resp
+ raise FTPReplyError, resp
end
if resp[3, 2] != ' "'
- return ""
+ return ""
end
dirname = ""
i = 5
n = resp.length
while i < n
- c = resp[i, 1]
- i = i + 1
- if c == '"'
- if i > n or resp[i, 1] != '"'
- break
- end
- i = i + 1
- end
- dirname = dirname + c
+ c = resp[i, 1]
+ i = i + 1
+ if c == '"'
+ if i > n or resp[i, 1] != '"'
+ break
+ end
+ i = i + 1
+ end
+ dirname = dirname + c
end
return dirname
end
@@ -1069,51 +970,10 @@ module Net
# :stopdoc:
class NullSocket
- def read_timeout=(sec)
- end
-
- def close
- end
-
def method_missing(mid, *args)
raise FTPConnectionError, "not connected"
end
end
-
- class BufferedSocket < BufferedIO
- [:addr, :peeraddr, :send, :shutdown].each do |method|
- define_method(method) { |*args|
- @io.__send__(method, *args)
- }
- end
-
- def read(len = nil)
- if len
- s = super(len, "", true)
- return s.empty? ? nil : s
- else
- result = ""
- while s = super(DEFAULT_BLOCKSIZE, "", true)
- break if s.empty?
- result << s
- end
- return result
- end
- end
-
- def gets
- line = readuntil("\n", true)
- return line.empty? ? nil : line
- end
-
- def readline
- line = gets
- if line.nil?
- raise EOFError, "end of file reached"
- end
- return line
- end
- end
# :startdoc:
end
end
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 5c827c3869..ea5e449fcd 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -18,374 +18,276 @@
#
# 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
+#
+#--
+# $Id$
+#++
require 'net/protocol'
+autoload :OpenSSL, 'openssl'
require 'uri'
module Net #:nodoc:
- autoload :OpenSSL, 'openssl'
# :stopdoc:
class HTTPBadResponse < StandardError; end
class HTTPHeaderSyntaxError < StandardError; end
# :startdoc:
- # == An HTTP client API for Ruby.
- #
- # Net::HTTP provides a rich library which can be used to build HTTP
- # user-agents. For more details about HTTP see
- # [RFC2616](http://www.ietf.org/rfc/rfc2616.txt)
- #
- # Net::HTTP is designed to work closely with URI. URI::HTTP#host,
- # URI::HTTP#port and URI::HTTP#request_uri are designed to work with
- # Net::HTTP.
+ # == What Is This Library?
#
- # If you are only performing a few GET requests you should try OpenURI.
+ # 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]
+ # (http://www.ietf.org/rfc/rfc2616.txt).
#
- # == Simple Examples
+ # == Examples
#
- # All examples assume you have loaded Net::HTTP with:
+ # === Getting Document From WWW Server
#
- # require 'net/http'
+ # Example #1: Simple GET+print
#
- # This will also require 'uri' so you don't need to require it separately.
+ # require 'net/http'
+ # Net::HTTP.get_print 'www.example.com', '/index.html'
#
- # The Net::HTTP methods in the following section do not persist
- # connections. They are not recommended if you are performing many HTTP
- # requests.
+ # Example #2: Simple GET+print by URL
#
- # === GET
+ # require 'net/http'
+ # require 'uri'
+ # Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
#
- # Net::HTTP.get('example.com', '/index.html') # => String
+ # Example #3: More generic GET+print
#
- # === GET by URI
+ # require 'net/http'
+ # require 'uri'
#
- # uri = URI('http://example.com/index.html?count=10')
- # Net::HTTP.get(uri) # => String
+ # url = URI.parse('http://www.example.com/index.html')
+ # res = Net::HTTP.start(url.host, url.port) {|http|
+ # http.get('/index.html')
+ # }
+ # puts res.body
#
- # === GET with Dynamic Parameters
+ # Example #4: More generic GET+print
#
- # uri = URI('http://example.com/index.html')
- # params = { :limit => 10, :page => 3 }
- # uri.query = URI.encode_www_form(params)
+ # require 'net/http'
#
- # res = Net::HTTP.get_response(uri)
- # puts res.body if res.is_a?(Net::HTTPSuccess)
+ # url = URI.parse('http://www.example.com/index.html')
+ # req = Net::HTTP::Get.new(url.path)
+ # res = Net::HTTP.start(url.host, url.port) {|http|
+ # http.request(req)
+ # }
+ # puts res.body
#
- # === POST
+ # === Posting Form Data
#
- # uri = URI('http://www.example.com/search.cgi')
- # res = Net::HTTP.post_form(uri, 'q' => 'ruby', 'max' => '50')
- # puts res.body
+ # require 'net/http'
+ # require 'uri'
#
- # === POST with Multiple Values
+ # #1: Simple POST
+ # res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
+ # {'q' => 'ruby', 'max' => '50'})
+ # puts res.body
#
- # uri = URI('http://www.example.com/search.cgi')
- # res = Net::HTTP.post_form(uri, 'q' => ['ruby', 'perl'], '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'})
+ # puts res.body
#
- # == How to use Net::HTTP
- #
- # The following example code can be used as the basis of a HTTP user-agent
- # which can perform a variety of request types using persistent
- # connections.
+ # #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'}, ';')
+ # res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+ # case res
+ # when Net::HTTPSuccess, Net::HTTPRedirection
+ # # OK
+ # else
+ # res.error!
+ # end
#
- # uri = URI('http://example.com/some_path?query=string')
+ # #4: Multiple values
+ # res = Net::HTTP.post_form(URI.parse('http://www.example.com/search.cgi'),
+ # {'q' => ['ruby', 'perl'], 'max' => '50'})
+ # puts res.body
#
- # Net::HTTP.start(uri.host, uri.port) do |http|
- # request = Net::HTTP::Get.new uri
+ # === Accessing via Proxy
#
- # response = http.request request # Net::HTTPResponse object
- # end
+ # 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.
#
- # Net::HTTP::start immediately creates a connection to an HTTP server which
- # is kept open for the duration of the block. The connection will remain
- # open for multiple requests in the block if the server indicates it
- # supports persistent connections.
+ # require 'net/http'
#
- # The request types Net::HTTP supports are listed below in the section "HTTP
- # Request Classes".
+ # proxy_addr = 'your.proxy.host'
+ # proxy_port = 8080
+ # :
+ # Net::HTTP::Proxy(proxy_addr, proxy_port).start('www.example.com') {|http|
+ # # always connect to your.proxy.addr:8080
+ # :
+ # }
#
- # If you wish to re-use a connection across multiple HTTP requests without
- # automatically closing it you can use ::new instead of ::start. #request
- # will automatically open a connection to the server if one is not currently
- # open. You can manually close the connection with #finish.
+ # 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.
#
- # For all the Net::HTTP request objects and shortcut request methods you may
- # supply either a String for the request path or a URI from which Net::HTTP
- # will extract the request path.
+ # There are two additional parameters in Net::HTTP.Proxy which allow to
+ # specify proxy user name and password:
#
- # === Response Data
+ # Net::HTTP::Proxy(proxy_addr, proxy_port, proxy_user = nil, proxy_pass = nil)
#
- # uri = URI('http://example.com/index.html')
- # res = Net::HTTP.get_response(uri)
+ # You may use them to work with authorization-enabled proxies:
#
- # # Headers
- # res['Set-Cookie'] # => String
- # res.get_fields('set-cookie') # => Array
- # res.to_hash['set-cookie'] # => Array
- # puts "Headers: #{res.to_hash.inspect}"
+ # require 'net/http'
+ # require 'uri'
#
- # # Status
- # puts res.code # => '200'
- # puts res.message # => 'OK'
- # puts res.class.name # => 'HTTPOK'
+ # proxy_host = 'your.proxy.host'
+ # proxy_port = 8080
+ # uri = URI.parse(ENV['http_proxy'])
+ # proxy_user, proxy_pass = uri.userinfo.split(/:/) if uri.userinfo
+ # Net::HTTP::Proxy(proxy_host, proxy_port,
+ # proxy_user, proxy_pass).start('www.example.com') {|http|
+ # # always connect to your.proxy.addr:8080 using specified username and password
+ # :
+ # }
#
- # # Body
- # puts res.body if res.response_body_permitted?
+ # Note that net/http never rely on HTTP_PROXY environment variable.
+ # If you want to use proxy, set it explicitly.
#
# === Following Redirection
#
- # Each Net::HTTPResponse object belongs to a class for its response code.
- #
- # For example, all 2XX responses are instances of a Net::HTTPSuccess
- # subclass, a 3XX response is an instance of a Net::HTTPRedirection
- # subclass and a 200 response is an instance of the Net::HTTPOK class. For
- # details of response classes, see the section "HTTP Response Classes"
- # below.
- #
- # Using a case statement you can handle various types of responses properly:
- #
- # def fetch(uri_str, limit = 10)
- # # You should choose a better exception.
- # raise ArgumentError, 'too many HTTP redirects' if limit == 0
+ # require 'net/http'
+ # require 'uri'
#
- # response = Net::HTTP.get_response(URI(uri_str))
+ # def fetch(uri_str, limit = 10)
+ # # You should choose better exception.
+ # raise ArgumentError, 'HTTP redirect too deep' if limit == 0
#
- # case response
- # when Net::HTTPSuccess then
- # response
- # when Net::HTTPRedirection then
- # location = response['location']
- # warn "redirected to #{location}"
- # fetch(location, limit - 1)
- # else
- # response.value
+ # response = Net::HTTP.get_response(URI.parse(uri_str))
+ # case response
+ # when Net::HTTPSuccess then response
+ # when Net::HTTPRedirection then fetch(response['location'], limit - 1)
+ # else
+ # response.error!
+ # end
# end
- # end
- #
- # print fetch('http://www.ruby-lang.org')
- #
- # === POST
- #
- # A POST can be made using the Net::HTTP::Post request class. This example
- # creates a urlencoded POST body:
- #
- # uri = URI('http://www.example.com/todo.cgi')
- # req = Net::HTTP::Post.new(uri)
- # req.set_form_data('from' => '2005-01-01', 'to' => '2005-03-31')
- #
- # res = Net::HTTP.start(uri.hostname, uri.port) do |http|
- # http.request(req)
- # end
- #
- # case res
- # when Net::HTTPSuccess, Net::HTTPRedirection
- # # OK
- # else
- # res.value
- # end
#
- # At this time Net::HTTP does not support multipart/form-data. To send
- # multipart/form-data use Net::HTTPRequest#body= and
- # Net::HTTPRequest#content_type=:
+ # print fetch('http://www.ruby-lang.org')
#
- # req = Net::HTTP::Post.new(uri)
- # req.body = multipart_data
- # req.content_type = 'multipart/form-data'
- #
- # Other requests that can contain a body such as PUT can be created in the
- # same way using the corresponding request class (Net::HTTP::Put).
- #
- # === Setting Headers
- #
- # The following example performs a conditional GET using the
- # If-Modified-Since header. If the files has not been modified since the
- # time in the header a Not Modified response will be returned. See RFC 2616
- # section 9.3 for further details.
- #
- # uri = URI('http://example.com/cached_response')
- # file = File.stat 'cached_response'
- #
- # req = Net::HTTP::Get.new(uri)
- # req['If-Modified-Since'] = file.mtime.rfc2822
- #
- # res = Net::HTTP.start(uri.hostname, uri.port) {|http|
- # http.request(req)
- # }
- #
- # open 'cached_response', 'w' do |io|
- # io.write res.body
- # end if res.is_a?(Net::HTTPSuccess)
+ # 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
#
- # Basic authentication is performed according to
- # [RFC2617](http://www.ietf.org/rfc/rfc2617.txt)
- #
- # uri = URI('http://example.com/index.html?key=value')
- #
- # req = Net::HTTP::Get.new(uri)
- # req.basic_auth 'user', 'pass'
- #
- # res = Net::HTTP.start(uri.hostname, uri.port) {|http|
- # http.request(req)
- # }
- # puts res.body
- #
- # === Streaming Response Bodies
- #
- # By default Net::HTTP reads an entire response into memory. If you are
- # handling large files or wish to implement a progress bar you can instead
- # stream the body directly to an IO.
- #
- # uri = URI('http://example.com/large_file')
- #
- # Net::HTTP.start(uri.host, uri.port) do |http|
- # request = Net::HTTP::Get.new uri
- #
- # http.request request do |response|
- # open 'large_file', 'w' do |io|
- # response.read_body do |chunk|
- # io.write chunk
- # end
- # end
- # end
- # end
- #
- # === HTTPS
- #
- # HTTPS is enabled for an HTTP connection by Net::HTTP#use_ssl=.
- #
- # uri = URI('https://secure.example.com/some_path?query=string')
- #
- # Net::HTTP.start(uri.host, uri.port,
- # :use_ssl => uri.scheme == 'https') do |http|
- # request = Net::HTTP::Get.new uri
- #
- # response = http.request request # Net::HTTPResponse object
- # end
- #
- # In previous versions of ruby you would need to require 'net/https' to use
- # HTTPS. This is no longer true.
- #
- # === Proxies
- #
- # Net::HTTP will automatically create a proxy from the +http_proxy+
- # environment variable if it is present. To disable use of +http_proxy+,
- # pass +nil+ for the proxy address.
- #
- # You may also create a custom proxy:
- #
- # proxy_addr = 'your.proxy.host'
- # proxy_port = 8080
- #
- # Net::HTTP.new('example.com', nil, proxy_addr, proxy_port).start { |http|
- # # always proxy via your.proxy.addr:8080
- # }
- #
- # See Net::HTTP.new for further details and examples such as proxies that
- # require a username and password.
- #
- # === Compression
- #
- # Net::HTTP automatically adds Accept-Encoding for compression of response
- # bodies and automatically decompresses gzip and deflate responses unless a
- # Range header was sent.
- #
- # Compression can be disabled through the Accept-Encoding: identity header.
- #
- # == HTTP Request Classes
- #
- # Here is the HTTP request class hierarchy.
- #
- # * Net::HTTPRequest
- # * Net::HTTP::Get
- # * Net::HTTP::Head
- # * Net::HTTP::Post
- # * Net::HTTP::Patch
- # * Net::HTTP::Put
- # * Net::HTTP::Proppatch
- # * Net::HTTP::Lock
- # * Net::HTTP::Unlock
- # * Net::HTTP::Options
- # * Net::HTTP::Propfind
- # * Net::HTTP::Delete
- # * Net::HTTP::Move
- # * Net::HTTP::Copy
- # * Net::HTTP::Mkcol
- # * Net::HTTP::Trace
- #
- # == HTTP Response Classes
- #
- # Here is HTTP response class hierarchy. All classes are defined in Net
- # module and are subclasses of Net::HTTPResponse.
- #
- # HTTPUnknownResponse:: For unhandled HTTP extensions
- # HTTPInformation:: 1xx
- # HTTPContinue:: 100
- # HTTPSwitchProtocol:: 101
- # HTTPSuccess:: 2xx
- # HTTPOK:: 200
- # HTTPCreated:: 201
- # HTTPAccepted:: 202
- # HTTPNonAuthoritativeInformation:: 203
- # HTTPNoContent:: 204
- # HTTPResetContent:: 205
- # HTTPPartialContent:: 206
- # HTTPMultiStatus:: 207
- # HTTPRedirection:: 3xx
- # HTTPMultipleChoices:: 300
- # HTTPMovedPermanently:: 301
- # HTTPFound:: 302
- # HTTPSeeOther:: 303
- # HTTPNotModified:: 304
- # HTTPUseProxy:: 305
- # HTTPTemporaryRedirect:: 307
- # HTTPClientError:: 4xx
- # HTTPBadRequest:: 400
- # HTTPUnauthorized:: 401
- # HTTPPaymentRequired:: 402
- # HTTPForbidden:: 403
- # HTTPNotFound:: 404
- # HTTPMethodNotAllowed:: 405
- # HTTPNotAcceptable:: 406
- # HTTPProxyAuthenticationRequired:: 407
- # HTTPRequestTimeOut:: 408
- # HTTPConflict:: 409
- # HTTPGone:: 410
- # HTTPLengthRequired:: 411
- # HTTPPreconditionFailed:: 412
- # HTTPRequestEntityTooLarge:: 413
- # HTTPRequestURITooLong:: 414
- # HTTPUnsupportedMediaType:: 415
- # HTTPRequestedRangeNotSatisfiable:: 416
- # HTTPExpectationFailed:: 417
- # HTTPUnprocessableEntity:: 422
- # HTTPLocked:: 423
- # HTTPFailedDependency:: 424
- # HTTPUpgradeRequired:: 426
- # HTTPPreconditionRequired:: 428
- # HTTPTooManyRequests:: 429
- # HTTPRequestHeaderFieldsTooLarge:: 431
- # HTTPServerError:: 5xx
- # HTTPInternalServerError:: 500
- # HTTPNotImplemented:: 501
- # HTTPBadGateway:: 502
- # HTTPServiceUnavailable:: 503
- # HTTPGatewayTimeOut:: 504
- # HTTPVersionNotSupported:: 505
- # HTTPInsufficientStorage:: 507
- # HTTPNetworkAuthenticationRequired:: 511
- #
- # There is also the Net::HTTPBadResponse exception which is raised when
- # there is a protocol error.
+ # 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.
+ #
+ # Net::HTTPRequest
+ # Net::HTTP::Get
+ # Net::HTTP::Head
+ # Net::HTTP::Post
+ # Net::HTTP::Put
+ # Net::HTTP::Proppatch
+ # Net::HTTP::Lock
+ # Net::HTTP::Unlock
+ # Net::HTTP::Options
+ # Net::HTTP::Propfind
+ # Net::HTTP::Delete
+ # Net::HTTP::Move
+ # Net::HTTP::Copy
+ # Net::HTTP::Mkcol
+ # Net::HTTP::Trace
+ #
+ # === HTTP Response Classes
+ #
+ # Here is HTTP response class hierarchy.
+ # All classes are defined in Net module.
+ #
+ # HTTPResponse
+ # HTTPUnknownResponse
+ # HTTPInformation # 1xx
+ # HTTPContinue # 100
+ # HTTPSwitchProtocol # 101
+ # HTTPSuccess # 2xx
+ # HTTPOK # 200
+ # HTTPCreated # 201
+ # HTTPAccepted # 202
+ # HTTPNonAuthoritativeInformation # 203
+ # HTTPNoContent # 204
+ # HTTPResetContent # 205
+ # HTTPPartialContent # 206
+ # HTTPRedirection # 3xx
+ # HTTPMultipleChoice # 300
+ # HTTPMovedPermanently # 301
+ # HTTPFound # 302
+ # HTTPSeeOther # 303
+ # HTTPNotModified # 304
+ # HTTPUseProxy # 305
+ # HTTPTemporaryRedirect # 307
+ # HTTPClientError # 4xx
+ # HTTPBadRequest # 400
+ # HTTPUnauthorized # 401
+ # HTTPPaymentRequired # 402
+ # HTTPForbidden # 403
+ # HTTPNotFound # 404
+ # HTTPMethodNotAllowed # 405
+ # HTTPNotAcceptable # 406
+ # HTTPProxyAuthenticationRequired # 407
+ # HTTPRequestTimeOut # 408
+ # HTTPConflict # 409
+ # HTTPGone # 410
+ # HTTPLengthRequired # 411
+ # HTTPPreconditionFailed # 412
+ # HTTPRequestEntityTooLarge # 413
+ # HTTPRequestURITooLong # 414
+ # HTTPUnsupportedMediaType # 415
+ # HTTPRequestedRangeNotSatisfiable # 416
+ # HTTPExpectationFailed # 417
+ # HTTPServerError # 5xx
+ # HTTPInternalServerError # 500
+ # HTTPNotImplemented # 501
+ # HTTPBadGateway # 502
+ # 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
# :stopdoc:
Revision = %q$Revision$.split[1]
HTTPVersion = '1.1'
+ @newimpl = true
begin
require 'zlib'
require 'stringio' #for our purposes (unpacking gzip) lump these together
@@ -396,19 +298,33 @@ module Net #:nodoc:
# :startdoc:
# Turns on net/http 1.2 (ruby 1.8) features.
- # Defaults to ON in ruby 1.8 or later.
+ # Defaults to ON in ruby 1.8.
+ #
+ # I strongly recommend to call this method always.
+ #
+ # require 'net/http'
+ # Net::HTTP.version_1_2
+ #
def HTTP.version_1_2
- true
+ @newimpl = true
+ end
+
+ # Turns on net/http 1.1 (ruby 1.6) features.
+ # Defaults to OFF in ruby 1.8.
+ def HTTP.version_1_1
+ @newimpl = false
end
- # Returns true if net/http is in version 1.2 mode.
+ # true if net/http is in version 1.2 mode.
# Defaults to true.
def HTTP.version_1_2?
- true
+ @newimpl
end
- def HTTP.version_1_1? #:nodoc:
- false
+ # true if net/http is in version 1.1 compatible mode.
+ # Defaults to true.
+ def HTTP.version_1_1?
+ not @newimpl
end
class << HTTP
@@ -421,11 +337,11 @@ module Net #:nodoc:
#
#
- # Gets the body text from the target and outputs it to $stdout. The
- # target can either be specified as
- # (+uri+), or as (+host+, +path+, +port+ = 80); so:
+ # Get body from target and output it to +$stdout+. The
+ # target can either be specified as (+uri+), or as
+ # (+host+, +path+, +port+ = 80); so:
#
- # Net::HTTP.get_print URI('http://www.example.com/index.html')
+ # Net::HTTP.get_print URI.parse('http://www.example.com/index.html')
#
# or:
#
@@ -440,11 +356,11 @@ module Net #:nodoc:
nil
end
- # Sends a GET request to the target and returns the HTTP response
+ # 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('http://www.example.com/index.html'))
+ # print Net::HTTP.get(URI.parse('http://www.example.com/index.html'))
#
# or:
#
@@ -454,11 +370,11 @@ module Net #:nodoc:
get_response(uri_or_host, path, port).body
end
- # Sends a GET request to the target and returns the HTTP response
+ # 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('http://www.example.com/index.html'))
+ # res = Net::HTTP.get_response(URI.parse('http://www.example.com/index.html'))
# print res.body
#
# or:
@@ -474,37 +390,32 @@ module Net #:nodoc:
}
else
uri = uri_or_host
- start(uri.hostname, uri.port,
- :use_ssl => uri.scheme == 'https') {|http|
- return http.request_get(uri, &block)
+ new(uri.host, uri.port).start {|http|
+ return http.request_get(uri.request_uri, &block)
}
end
end
- # Posts HTML form data to the specified URI object.
- # The form data must be provided as a Hash mapping from String to String.
- # Example:
+ # Posts HTML form data to the +URL+.
+ # Form data must be represented as a Hash of String to String, e.g:
#
# { "cmd" => "search", "q" => "ruby", "max" => "50" }
#
- # This method also does Basic Authentication iff +url+.user exists.
- # But userinfo for authentication is deprecated (RFC3986).
- # So this feature will be removed.
+ # This method also does Basic Authentication iff +URL+.user exists.
#
# Example:
#
# require 'net/http'
# require 'uri'
#
- # Net::HTTP.post_form URI('http://www.example.com/search.cgi'),
- # { "q" => "ruby", "max" => "50" }
+ # HTTP.post_form URI.parse('http://www.example.com/search.cgi'),
+ # { "q" => "ruby", "max" => "50" }
#
def HTTP.post_form(url, params)
- req = Post.new(url)
+ req = Post.new(url.path)
req.form_data = params
req.basic_auth url.user, url.password if url.user
- start(url.hostname, url.port,
- :use_ssl => url.scheme == 'https' ) {|http|
+ new(url.host, url.port).start {|http|
http.request(req)
}
end
@@ -532,14 +443,14 @@ module Net #:nodoc:
BufferedIO
end
- # :call-seq:
+ # call-seq:
# HTTP.start(address, port, p_addr, p_port, p_user, p_pass, &block)
# HTTP.start(address, port=nil, p_addr=nil, p_port=nil, p_user=nil, p_pass=nil, opt, &block)
#
- # Creates a new Net::HTTP object, then additionally opens the TCP
- # connection and HTTP session.
+ # creates a new Net::HTTP object and opens its TCP connection and
+ # HTTP session.
#
- # Arguments are the following:
+ # Argments are following:
# _address_ :: hostname or IP address of the server
# _port_ :: port of the server
# _p_addr_ :: address of proxy
@@ -560,8 +471,7 @@ module Net #:nodoc:
# 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
- # itself, and the caller is responsible for closing it upon completion
- # using the finish() method.
+ # itself, and the caller is responsible for closing it upon completion.
def HTTP.start(address, *arg, &block) # :yield: +http+
arg.pop if opt = Hash.try_convert(arg[-1])
port, p_addr, p_port, p_user, p_pass = *arg
@@ -569,9 +479,7 @@ module Net #:nodoc:
http = new(address, port, p_addr, p_port, p_user, p_pass)
if opt
- if opt[:use_ssl]
- opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt)
- end
+ opt = {verify_mode: OpenSSL::SSL::VERIFY_PEER}.update(opt) if opt[:use_ssl]
http.methods.grep(/\A(\w+)=\z/) do |meth|
key = $1.to_sym
opt.key?(key) or next
@@ -583,82 +491,42 @@ module Net #:nodoc:
end
class << HTTP
- alias newobj new # :nodoc:
+ alias newobj new
end
- # Creates a new Net::HTTP object without opening a TCP connection or
- # HTTP session.
- #
- # The +address+ should be a DNS hostname or IP address, the +port+ is the
- # port the server operates on. If no +port+ is given the default port for
- # HTTP or HTTPS is used.
- #
- # If none of the +p_+ arguments are given, the proxy host and port are
- # taken from the +http_proxy+ environment variable (or its uppercase
- # equivalent) if present. If the proxy requires authentication you must
- # supply it by hand. See URI::Generic#find_proxy for details of proxy
- # detection from the environment. To disable proxy detection set +p_addr+
- # to nil.
- #
- # If you are connecting to a custom proxy, +p_addr+ the DNS name or IP
- # address of the proxy host, +p_port+ the port to use to access the proxy,
- # and +p_user+ and +p_pass+ the username and password if authorization is
- # required to use the proxy.
- #
- def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
- http = super address, port
-
- if proxy_class? then # from Net::HTTP::Proxy()
- http.proxy_from_env = @proxy_from_env
- http.proxy_address = @proxy_address
- http.proxy_port = @proxy_port
- http.proxy_user = @proxy_user
- http.proxy_pass = @proxy_pass
- elsif p_addr == :ENV then
- http.proxy_from_env = true
- else
- http.proxy_address = p_addr
- http.proxy_port = p_port || default_port
- http.proxy_user = p_user
- http.proxy_pass = p_pass
- end
-
- http
+ # Creates a new Net::HTTP object.
+ # If +proxy_addr+ is given, creates an Net::HTTP object with proxy support.
+ # This method does not open the TCP connection.
+ def HTTP.new(address, port = nil, p_addr = nil, p_port = nil, p_user = nil, p_pass = nil)
+ h = Proxy(p_addr, p_port, p_user, p_pass).newobj(address, port)
+ h.instance_eval {
+ @newimpl = ::Net::HTTP.version_1_2?
+ }
+ h
end
- # Creates a new Net::HTTP object for the specified server address,
- # without opening the TCP connection or initializing the HTTP session.
- # The +address+ should be a DNS hostname or IP address.
+ # Creates a new Net::HTTP object for the specified +address+.
+ # This method does not open the TCP connection.
def initialize(address, port = nil)
@address = address
@port = (port || HTTP.default_port)
- @local_host = nil
- @local_port = nil
@curr_http_version = HTTPVersion
- @keep_alive_timeout = 2
- @last_communicated = nil
+ @no_keepalive_server = false
@close_on_empty_response = false
@socket = nil
@started = false
@open_timeout = nil
@read_timeout = 60
- @continue_timeout = nil
@debug_output = nil
-
- @proxy_from_env = false
- @proxy_uri = nil
- @proxy_address = nil
- @proxy_port = nil
- @proxy_user = nil
- @proxy_pass = nil
-
@use_ssl = false
@ssl_context = nil
- @ssl_session = nil
@enable_post_connection_check = true
+ @compression = nil
@sspi_enabled = false
- SSL_IVNAMES.each do |ivname|
- instance_variable_set ivname, nil
+ if defined?(SSL_ATTRIBUTES)
+ SSL_ATTRIBUTES.each do |name|
+ instance_variable_set "@#{name}", nil
+ end
end
end
@@ -666,10 +534,10 @@ module Net #:nodoc:
"#<#{self.class} #{@address}:#{@port} open=#{started?}>"
end
- # *WARNING* This method opens a serious security hole.
+ # *WARNING* This method causes serious security hole.
# Never use this method in production code.
#
- # Sets an output stream for debugging.
+ # Set an output stream for debugging.
#
# http = Net::HTTP.new
# http.set_debug_output $stderr
@@ -680,34 +548,20 @@ module Net #:nodoc:
@debug_output = output
end
- # The DNS host name or IP address to connect to.
+ # The host name to connect to.
attr_reader :address
# The port number to connect to.
attr_reader :port
- # The local host used to estabilish the connection.
- attr_accessor :local_host
-
- # The local port used to estabilish the connection.
- attr_accessor :local_port
-
- attr_writer :proxy_from_env
- attr_writer :proxy_address
- attr_writer :proxy_port
- attr_writer :proxy_user
- attr_writer :proxy_pass
-
- # Number of seconds to wait for the connection to open. Any number
- # may be used, including Floats for fractional seconds. If the HTTP
- # object cannot open a connection in this many seconds, it raises a
- # Net::OpenTimeout exception. The default value is +nil+.
+ # Seconds to wait until connection is opened.
+ # If the HTTP object cannot open a connection in this many seconds,
+ # it raises a TimeoutError exception.
attr_accessor :open_timeout
- # Number of seconds to wait for one block to be read (via one read(2)
- # call). Any number may be used, including Floats for fractional
- # seconds. If the HTTP object cannot read data in this many seconds,
- # it raises a Net::ReadTimeout exception. The default value is 60 seconds.
+ # Seconds to wait until reading one block (by one read(2) call).
+ # If the HTTP object cannot open a connection in this many seconds,
+ # it raises a TimeoutError exception.
attr_reader :read_timeout
# Setter for the read_timeout attribute.
@@ -716,24 +570,7 @@ module Net #:nodoc:
@read_timeout = sec
end
- # Seconds to wait for 100 Continue response. If the HTTP object does not
- # receive a response in this many seconds it sends the request body. The
- # default value is +nil+.
- attr_reader :continue_timeout
-
- # Setter for the continue_timeout attribute.
- def continue_timeout=(sec)
- @socket.continue_timeout = sec if @socket
- @continue_timeout = sec
- end
-
- # Seconds to reuse the connection of the previous request.
- # If the idle time is less than this Keep-Alive Timeout,
- # Net::HTTP reuses the TCP/IP socket used by the previous communication.
- # The default value is 2 seconds.
- attr_accessor :keep_alive_timeout
-
- # Returns true if the HTTP session has been started.
+ # returns true if the HTTP session is started.
def started?
@started
end
@@ -742,7 +579,7 @@ module Net #:nodoc:
attr_accessor :close_on_empty_response
- # Returns true if SSL/TLS is being used with HTTP.
+ # returns true if use SSL/TLS with HTTP.
def use_ssl?
@use_ssl
end
@@ -752,82 +589,20 @@ module Net #:nodoc:
# If you change use_ssl value after session started,
# a Net::HTTP object raises IOError.
def use_ssl=(flag)
- flag = flag ? true : false
+ flag = (flag ? true : false)
if started? and @use_ssl != flag
raise IOError, "use_ssl value changed, but session already started"
end
@use_ssl = flag
end
- SSL_IVNAMES = [
- :@ca_file,
- :@ca_path,
- :@cert,
- :@cert_store,
- :@ciphers,
- :@key,
- :@ssl_timeout,
- :@ssl_version,
- :@verify_callback,
- :@verify_depth,
- :@verify_mode,
- ]
- SSL_ATTRIBUTES = [
- :ca_file,
- :ca_path,
- :cert,
- :cert_store,
- :ciphers,
- :key,
- :ssl_timeout,
- :ssl_version,
- :verify_callback,
- :verify_depth,
- :verify_mode,
- ]
-
- # Sets path of a CA certification file in PEM format.
- #
- # The file can contain several CA certificates.
- attr_accessor :ca_file
-
- # Sets path of a CA certification directory containing certifications in
- # PEM format.
- attr_accessor :ca_path
-
- # Sets an OpenSSL::X509::Certificate object as client certificate.
- # (This method is appeared in Michal Rokos's OpenSSL extension).
- attr_accessor :cert
-
- # Sets the X509::Store to verify peer certificate.
- attr_accessor :cert_store
-
- # Sets the available ciphers. See OpenSSL::SSL::SSLContext#ciphers=
- attr_accessor :ciphers
-
- # Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
- # (This method is appeared in Michal Rokos's OpenSSL extension.)
- attr_accessor :key
-
- # Sets the SSL timeout seconds.
- attr_accessor :ssl_timeout
-
- # Sets the SSL version. See OpenSSL::SSL::SSLContext#ssl_version=
- attr_accessor :ssl_version
-
- # Sets the verify callback for the server certification verification.
- attr_accessor :verify_callback
-
- # Sets the maximum depth for the certificate chain verification.
- attr_accessor :verify_depth
-
- # Sets the flags for server the certification verification at beginning of
- # SSL/TLS session.
- #
- # OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER are acceptable.
- attr_accessor :verify_mode
-
- # Returns the X.509 certificates the server presented.
+ 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)
+
+ # return the X.509 certificates the server presented.
def peer_cert
if not use_ssl? or not @socket
return nil
@@ -835,14 +610,14 @@ module Net #:nodoc:
@socket.io.peer_cert
end
- # Opens a TCP connection and HTTP session.
+ # Opens TCP connection and HTTP session.
#
- # When this method is called with a block, it passes the Net::HTTP
- # object to the block, and closes the TCP connection and HTTP session
- # after the block has been executed.
+ # 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.
#
- # When called with a block, it returns the return value of the
- # block; otherwise, it returns self.
+ # When called with a block, returns the return value of the
+ # block; otherwise, returns self.
#
def start # :yield: http
raise IOError, 'HTTP session already opened' if @started
@@ -865,64 +640,45 @@ module Net #:nodoc:
private :do_start
def connect
- if proxy? then
- conn_address = proxy_address
- conn_port = proxy_port
- else
- conn_address = address
- conn_port = port
- end
-
- D "opening connection to #{conn_address}:#{conn_port}..."
- s = Timeout.timeout(@open_timeout, Net::OpenTimeout) {
- TCPSocket.open(conn_address, conn_port, @local_host, @local_port)
- }
+ D "opening connection to #{conn_address()}..."
+ s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
D "opened"
if use_ssl?
ssl_parameters = Hash.new
iv_list = instance_variables
- SSL_IVNAMES.each_with_index do |ivname, i|
+ SSL_ATTRIBUTES.each do |name|
+ ivname = "@#{name}".intern
if iv_list.include?(ivname) and
- value = instance_variable_get(ivname)
- ssl_parameters[SSL_ATTRIBUTES[i]] = value if value
+ value = instance_variable_get(ivname)
+ ssl_parameters[name] = value
end
end
@ssl_context = OpenSSL::SSL::SSLContext.new
@ssl_context.set_params(ssl_parameters)
- D "starting SSL for #{conn_address}:#{conn_port}..."
s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
s.sync_close = true
- D "SSL established"
end
@socket = BufferedIO.new(s)
@socket.read_timeout = @read_timeout
- @socket.continue_timeout = @continue_timeout
@socket.debug_output = @debug_output
if use_ssl?
begin
if proxy?
- buf = "CONNECT #{@address}:#{@port} HTTP/#{HTTPVersion}\r\n"
- buf << "Host: #{@address}:#{@port}\r\n"
+ @socket.writeline sprintf('CONNECT %s:%s HTTP/%s',
+ @address, @port, HTTPVersion)
+ @socket.writeline "Host: #{@address}:#{@port}"
if proxy_user
credential = ["#{proxy_user}:#{proxy_pass}"].pack('m')
credential.delete!("\r\n")
- buf << "Proxy-Authorization: Basic #{credential}\r\n"
+ @socket.writeline "Proxy-Authorization: Basic #{credential}"
end
- buf << "\r\n"
- @socket.write(buf)
+ @socket.writeline ''
HTTPResponse.read_new(@socket).value
end
- if @ssl_session and
- Time.now < @ssl_session.time + @ssl_session.timeout
- s.session = @ssl_session if @ssl_session
- end
- # Server Name Indication (SNI) RFC 3546
- s.hostname = @address if s.respond_to? :hostname=
- Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect }
+ timeout(@open_timeout) { s.connect }
if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
s.post_connection_check(@address)
end
- @ssl_session = s.session
rescue => exception
D "Conn close because of connect error #{exception}"
@socket.close if @socket and not @socket.closed?
@@ -937,8 +693,8 @@ module Net #:nodoc:
end
private :on_connect
- # Finishes the HTTP session and closes the TCP connection.
- # Raises IOError if the session has not been started.
+ # Finishes HTTP session and closes TCP connection.
+ # Raises IOError if not started.
def finish
raise IOError, 'HTTP session not yet started' unless started?
do_finish
@@ -959,105 +715,77 @@ module Net #:nodoc:
# no proxy
@is_proxy_class = false
- @proxy_from_env = false
@proxy_addr = nil
@proxy_port = nil
@proxy_user = nil
@proxy_pass = nil
- # Creates an HTTP proxy class which behaves like Net::HTTP, but
- # performs all access via the specified proxy.
+ # Creates an HTTP proxy class.
+ # 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)
+ # :
+ # proxy_class.start('www.ruby-lang.org') {|http|
+ # # connecting proxy.foo.org:8080
+ # :
+ # }
#
- # This class is obsolete. You may pass these same parameters directly to
- # Net::HTTP.new. See Net::HTTP.new for details of the arguments.
- def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
+ def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
return self unless p_addr
-
- Class.new(self) {
+ delta = ProxyDelta
+ proxyclass = Class.new(self)
+ proxyclass.module_eval {
+ include delta
+ # with proxy
@is_proxy_class = true
-
- if p_addr == :ENV then
- @proxy_from_env = true
- @proxy_address = nil
- @proxy_port = nil
- else
- @proxy_from_env = false
- @proxy_address = p_addr
- @proxy_port = p_port || default_port
- end
-
- @proxy_user = p_user
- @proxy_pass = p_pass
+ @proxy_address = p_addr
+ @proxy_port = p_port || default_port()
+ @proxy_user = p_user
+ @proxy_pass = p_pass
}
+ proxyclass
end
class << HTTP
# returns true if self is a class which was created by HTTP::Proxy.
def proxy_class?
- defined?(@is_proxy_class) ? @is_proxy_class : false
+ @is_proxy_class
end
- # Address of proxy host. If Net::HTTP does not use a proxy, nil.
attr_reader :proxy_address
-
- # Port number of proxy host. If Net::HTTP does not use a proxy, nil.
attr_reader :proxy_port
-
- # User name for accessing proxy. If Net::HTTP does not use a proxy, nil.
attr_reader :proxy_user
-
- # User password for accessing proxy. If Net::HTTP does not use a proxy,
- # nil.
attr_reader :proxy_pass
end
- # True if requests for this connection will be proxied
+ # True if self is a HTTP proxy class.
def proxy?
- !!if @proxy_from_env then
- proxy_uri
- else
- @proxy_address
- end
- end
-
- # True if the proxy for this connection is determined from the environment
- def proxy_from_env?
- @proxy_from_env
- end
-
- # The proxy URI determined from the environment for this connection.
- def proxy_uri # :nodoc:
- @proxy_uri ||= URI::HTTP.new(
- "http".freeze, nil, address, port, nil, nil, nil, nil, nil
- ).find_proxy
+ self.class.proxy_class?
end
- # The address of the proxy server, if one is configured.
+ # Address of proxy host. If self does not use a proxy, nil.
def proxy_address
- if @proxy_from_env then
- proxy_uri && proxy_uri.hostname
- else
- @proxy_address
- end
+ self.class.proxy_address
end
- # The port of the proxy server, if one is configured.
+ # Port number of proxy host. If self does not use a proxy, nil.
def proxy_port
- if @proxy_from_env then
- proxy_uri && proxy_uri.port
- else
- @proxy_port
- end
+ self.class.proxy_port
end
- # The proxy username, if one is configured
+ # User name for accessing proxy. If self does not use a proxy, nil.
def proxy_user
- @proxy_user
+ self.class.proxy_user
end
- # The proxy password, if one is configured
+ # User password for accessing proxy. If self does not use a proxy, nil.
def proxy_pass
- @proxy_pass
+ self.class.proxy_pass
end
alias proxyaddr proxy_address #:nodoc: obsolete
@@ -1065,21 +793,33 @@ module Net #:nodoc:
private
- # without proxy, obsolete
+ # without proxy
- def conn_address # :nodoc:
+ def conn_address
address()
end
- def conn_port # :nodoc:
+ def conn_port
port()
end
def edit_path(path)
- if proxy? and not use_ssl? then
- "http://#{addr_port}#{path}"
- else
- path
+ path
+ end
+
+ module ProxyDelta #:nodoc: internal use only
+ private
+
+ def conn_address
+ proxy_address()
+ end
+
+ def conn_port
+ proxy_port()
+ end
+
+ def edit_path(path)
+ use_ssl? ? path : "http://#{addr_port()}#{path}"
end
end
@@ -1089,9 +829,7 @@ module Net #:nodoc:
public
- # Retrieves data from +path+ on the connected-to host which may be an
- # absolute path String or a URI to extract the path from.
- #
+ # 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
@@ -1105,7 +843,10 @@ module Net #:nodoc:
# the header as well to prevent confusion. Otherwise
# it leaves the body as it found it.
#
- # This method returns a Net::HTTPResponse object.
+ # In version 1.1 (ruby 1.6), this method returns a pair of objects,
+ # a Net::HTTPResponse object and the 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 is read from
@@ -1115,8 +856,16 @@ module Net #:nodoc:
# +dest+ argument is obsolete.
# It still works but you must not use it.
#
- # This method never raises an exception.
+ # 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".
+ #
+ # In version 1.2, this method never raises exception.
#
+ # # version 1.1 (bundled with Ruby 1.6)
+ # response, body = http.get('/index.html')
+ #
+ # # version 1.2 (bundled with Ruby 1.8 or later)
# response = http.get('/index.html')
#
# # using block
@@ -1128,10 +877,40 @@ module Net #:nodoc:
#
def get(path, initheader = {}, dest = nil, &block) # :yield: +body_segment+
res = nil
+ if HAVE_ZLIB
+ unless initheader.keys.any?{|k| k.downcase == "accept-encoding"}
+ initheader = initheader.merge({
+ "accept-encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+ })
+ @compression = true
+ end
+ end
request(Get.new(path, initheader)) {|r|
- r.read_body dest, &block
+ 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), encoding: "ASCII-8BIT").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
res = r
}
+ unless @newimpl
+ res.value
+ return res, res.body
+ end
+
res
end
@@ -1140,7 +919,10 @@ module Net #:nodoc:
#
# This method returns a Net::HTTPResponse object.
#
- # This method never raises an exception.
+ # 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|
@@ -1149,24 +931,35 @@ module Net #:nodoc:
# p response['content-type']
#
def head(path, initheader = nil)
- request(Head.new(path, initheader))
+ res = request(Head.new(path, initheader))
+ res.value unless @newimpl
+ res
end
# Posts +data+ (must be a String) to +path+. +header+ must be a Hash
# like { 'Accept' => '*/*', ... }.
#
- # This method returns a Net::HTTPResponse object.
+ # 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 is read from
+ # entity body in turn as a string as it are read from
# the socket. Note that in this case, the returned response
# object will *not* contain a (meaningful) body.
#
# +dest+ argument is obsolete.
# It still works but you must not use it.
#
- # This method never raises exception.
+ # 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
@@ -1181,17 +974,22 @@ module Net #:nodoc:
# "application/x-www-form-urlencoded" by default.
#
def post(path, data, initheader = nil, dest = nil, &block) # :yield: +body_segment+
- send_entity(path, data, initheader, dest, Post, &block)
- end
-
- # Sends a PATCH request to the +path+ and gets a response,
- # as an HTTPResponse object.
- def patch(path, data, initheader = nil, dest = nil, &block) # :yield: +body_segment+
- send_entity(path, data, initheader, dest, Patch, &block)
+ res = nil
+ request(Post.new(path, initheader), data) {|r|
+ r.read_body dest, &block
+ res = r
+ }
+ unless @newimpl
+ res.value
+ return res, res.body
+ end
+ res
end
def put(path, data, initheader = nil) #:nodoc:
- request(Put.new(path, initheader), data)
+ res = request(Put.new(path, initheader), data)
+ res.value unless @newimpl
+ res
end
# Sends a PROPPATCH request to the +path+ and gets a response,
@@ -1254,12 +1052,12 @@ module Net #:nodoc:
request(Trace.new(path, initheader))
end
- # Sends a GET request to the +path+.
- # Returns the response as a Net::HTTPResponse object.
+ # Sends a GET request to the +path+ and gets a response,
+ # as an HTTPResponse object.
#
- # When called with a block, passes an HTTPResponse object to the block.
- # The body of the response will not have been read yet;
- # the block can process it using HTTPResponse#read_body,
+ # 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.
@@ -1267,11 +1065,11 @@ module Net #:nodoc:
# This method never raises Net::* exceptions.
#
# response = http.request_get('/index.html')
- # # The entity body is already read in this case.
+ # # The entity body is already read here.
# p response['content-type']
# puts response.body
#
- # # Using a block
+ # # using block
# http.request_get('/index.html') {|response|
# p response['content-type']
# response.read_body do |str| # read body now
@@ -1283,8 +1081,8 @@ module Net #:nodoc:
request(Get.new(path, initheader), &block)
end
- # Sends a HEAD request to the +path+ and returns the response
- # as a Net::HTTPResponse object.
+ # Sends a HEAD request to the +path+ and gets a response,
+ # as an HTTPResponse object.
#
# Returns the response.
#
@@ -1297,13 +1095,13 @@ module Net #:nodoc:
request(Head.new(path, initheader), &block)
end
- # Sends a POST request to the +path+.
- #
- # Returns the response as a Net::HTTPResponse object.
+ # Sends a POST request to the +path+ and gets a response,
+ # as an HTTPResponse object.
#
- # When called with a block, the block is passed an HTTPResponse
- # object. The body of that response will not have been read yet;
- # the block can process it using HTTPResponse#read_body, if desired.
+ # 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.
#
@@ -1312,7 +1110,7 @@ module Net #:nodoc:
# # example
# response = http.request_post('/cgi-bin/nice.rb', 'datadatadata...')
# p response.status
- # puts response.body # body is already read in this case
+ # puts response.body # body is already read
#
# # using block
# http.request_post('/cgi-bin/nice.rb', 'datadatadata...') {|response|
@@ -1338,9 +1136,9 @@ module Net #:nodoc:
# Sends an HTTP request to the HTTP server.
- # Also sends a DATA string if +data+ is given.
+ # This method also sends DATA string if DATA is given.
#
- # Returns a Net::HTTPResponse object.
+ # Returns a HTTPResponse object.
#
# This method never raises Net::* exceptions.
#
@@ -1348,24 +1146,21 @@ module Net #:nodoc:
# puts response.body
#
def send_request(name, path, data = nil, header = nil)
- has_response_body = name != 'HEAD'
- r = HTTPGenericRequest.new(name,(data ? true : false),has_response_body,path,header)
+ r = HTTPGenericRequest.new(name,(data ? true : false),true,path,header)
request r, data
end
- # Sends an HTTPRequest object +req+ to the HTTP server.
- #
- # If +req+ is a Net::HTTP::Post or Net::HTTP::Put request containing
- # data, the data is also sent. Providing data for a Net::HTTP::Head or
- # Net::HTTP::Get request results in an ArgumentError.
+ # 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.
#
- # Returns an HTTPResponse object.
- #
- # When called with a block, passes an HTTPResponse object to the block.
- # The body of the response will not have been read yet;
- # the block can process it using HTTPResponse#read_body,
+ # 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+
@@ -1389,55 +1184,15 @@ module Net #:nodoc:
private
- # Executes a request which uses a representation
- # and returns its body.
- def send_entity(path, data, initheader, dest, type, &block)
- res = nil
- request(type.new(path, initheader), data) {|r|
- r.read_body dest, &block
- res = r
- }
- res
- end
-
- IDEMPOTENT_METHODS_ = %w/GET HEAD PUT DELETE OPTIONS TRACE/ # :nodoc:
-
def transport_request(req)
- count = 0
+ begin_transport req
+ req.exec @socket, @curr_http_version, edit_path(req.path)
begin
- begin_transport req
- res = catch(:response) {
- req.exec @socket, @curr_http_version, edit_path(req.path)
- begin
- res = HTTPResponse.read_new(@socket)
- res.decode_content = req.decode_content
- end while res.kind_of?(HTTPContinue)
-
- res.uri = req.uri
-
- res.reading_body(@socket, req.response_body_permitted?) {
- yield res if block_given?
- }
- res
- }
- rescue Net::OpenTimeout
- raise
- rescue Net::ReadTimeout, IOError, EOFError,
- Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE,
- # avoid a dependency on OpenSSL
- defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : IOError,
- Timeout::Error => exception
- if count == 0 && IDEMPOTENT_METHODS_.include?(req.method)
- count += 1
- @socket.close if @socket and not @socket.closed?
- D "Conn close because of error #{exception}, and retry"
- retry
- end
- D "Conn close because of error #{exception}"
- @socket.close if @socket and not @socket.closed?
- raise
- end
-
+ 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
rescue => exception
@@ -1447,28 +1202,15 @@ module Net #:nodoc:
end
def begin_transport(req)
- if @socket.closed?
- connect
- elsif @last_communicated && @last_communicated + @keep_alive_timeout < Time.now
- D 'Conn close because of keep_alive_timeout'
- @socket.close
- connect
- end
-
+ connect if @socket.closed?
if not req.response_body_permitted? and @close_on_empty_response
req['connection'] ||= 'close'
end
-
- host = req['host'] || address
- host = $1 if host =~ /(.*):\d+$/
- req.update_uri host, port, use_ssl?
-
req['host'] ||= addr_port()
end
def end_transport(req, res)
@curr_http_version = res.http_version
- @last_communicated = nil
if @socket.closed?
D 'Conn socket closed'
elsif not res.body and @close_on_empty_response
@@ -1476,7 +1218,6 @@ module Net #:nodoc:
@socket.close
elsif keep_alive?(req, res)
D 'Conn keep-alive'
- @last_communicated = Time.now
else
D 'Conn close'
@socket.close
@@ -1539,22 +1280,1214 @@ module Net #:nodoc:
@debug_output << msg
@debug_output << "\n"
end
+
+ end
+
+ HTTPSession = HTTP
+
+
+ #
+ # Header module.
+ #
+ # Provides access to @header in the mixed-into class as a hash-like
+ # object, except with case-insensitive keys. Also provides
+ # methods for accessing commonly-used header values in a more
+ # convenient format.
+ #
+ module HTTPHeader
+
+ def initialize_http_header(initheader)
+ @header = {}
+ return unless initheader
+ initheader.each do |key, value|
+ warn "net/http: warning: duplicated HTTP header: #{key}" if key?(key) and $VERBOSE
+ @header[key.downcase] = [value.strip]
+ end
+ end
+
+ def size #:nodoc: obsolete
+ @header.size
+ end
+
+ alias length size #:nodoc: obsolete
+
+ # Returns the header field corresponding to the case-insensitive key.
+ # For example, a key of "Content-Type" might return "text/html"
+ def [](key)
+ a = @header[key.downcase] or return nil
+ a.join(', ')
+ end
+
+ # Sets the header field corresponding to the case-insensitive key.
+ def []=(key, val)
+ unless val
+ @header.delete key.downcase
+ return val
+ end
+ @header[key.downcase] = [val]
+ end
+
+ # [Ruby 1.8.3]
+ # Adds header field instead of replace.
+ # Second argument +val+ must be a String.
+ # See also #[]=, #[] and #get_fields.
+ #
+ # request.add_field 'X-My-Header', 'a'
+ # p request['X-My-Header'] #=> "a"
+ # p request.get_fields('X-My-Header') #=> ["a"]
+ # request.add_field 'X-My-Header', 'b'
+ # p request['X-My-Header'] #=> "a, b"
+ # p request.get_fields('X-My-Header') #=> ["a", "b"]
+ # request.add_field 'X-My-Header', 'c'
+ # p request['X-My-Header'] #=> "a, b, c"
+ # p request.get_fields('X-My-Header') #=> ["a", "b", "c"]
+ #
+ def add_field(key, val)
+ if @header.key?(key.downcase)
+ @header[key.downcase].push val
+ else
+ @header[key.downcase] = [val]
+ end
+ end
+
+ # [Ruby 1.8.3]
+ # Returns an array of header field strings corresponding to the
+ # case-insensitive +key+. This method allows you to get duplicated
+ # header fields without any processing. See also #[].
+ #
+ # p response.get_fields('Set-Cookie')
+ # #=> ["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23",
+ # "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"]
+ # p response['Set-Cookie']
+ # #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"
+ #
+ def get_fields(key)
+ return nil unless @header[key.downcase]
+ @header[key.downcase].dup
+ end
+
+ # Returns the header field corresponding to the case-insensitive key.
+ # Returns the default value +args+, or the result of the block, or
+ # raises an IndexErrror if there's no header field named +key+
+ # See Hash#fetch
+ def fetch(key, *args, &block) #:yield: +key+
+ a = @header.fetch(key.downcase, *args, &block)
+ a.kind_of?(Array) ? a.join(', ') : a
+ end
+
+ # Iterates for each header names and values.
+ def each_header #:yield: +key+, +value+
+ block_given? or return enum_for(__method__)
+ @header.each do |k,va|
+ yield k, va.join(', ')
+ end
+ end
+
+ alias each each_header
+
+ # Iterates for each header names.
+ def each_name(&block) #:yield: +key+
+ block_given? or return enum_for(__method__)
+ @header.each_key(&block)
+ end
+
+ alias each_key each_name
+
+ # Iterates for each capitalized header names.
+ def each_capitalized_name #:yield: +key+
+ block_given? or return enum_for(__method__)
+ @header.each_key do |k|
+ yield capitalize(k)
+ end
+ end
+
+ # Iterates for each header values.
+ def each_value #:yield: +value+
+ block_given? or return enum_for(__method__)
+ @header.each_value do |va|
+ yield va.join(', ')
+ end
+ end
+
+ # Removes a header field.
+ def delete(key)
+ @header.delete(key.downcase)
+ end
+
+ # true if +key+ header exists.
+ def key?(key)
+ @header.key?(key.downcase)
+ end
+
+ # Returns a Hash consist of header names and values.
+ def to_hash
+ @header.dup
+ end
+
+ # As for #each_header, except the keys are provided in capitalized form.
+ def each_capitalized
+ block_given? or return enum_for(__method__)
+ @header.each do |k,v|
+ yield capitalize(k), v.join(', ')
+ end
+ end
+
+ alias canonical_each each_capitalized
+
+ def capitalize(name)
+ name.split(/-/).map {|s| s.capitalize }.join('-')
+ end
+ private :capitalize
+
+ # Returns an Array of Range objects which represents Range: header field,
+ # or +nil+ if there is no such header.
+ def range
+ return nil unless @header['range']
+ self['Range'].split(/,/).map {|spec|
+ m = /bytes\s*=\s*(\d+)?\s*-\s*(\d+)?/i.match(spec) or
+ raise HTTPHeaderSyntaxError, "wrong Range: #{spec}"
+ d1 = m[1].to_i
+ d2 = m[2].to_i
+ if m[1] and m[2] then d1..d2
+ elsif m[1] then d1..-1
+ elsif m[2] then -d2..-1
+ else
+ raise HTTPHeaderSyntaxError, 'range is not specified'
+ end
+ }
+ end
+
+ # Set Range: header from Range (arg r) or beginning index and
+ # length from it (arg idx&len).
+ #
+ # req.range = (0..1023)
+ # req.set_range 0, 1023
+ #
+ def set_range(r, e = nil)
+ unless r
+ @header.delete 'range'
+ return r
+ end
+ r = (r...r+e) if e
+ case r
+ when Numeric
+ n = r.to_i
+ rangestr = (n > 0 ? "0-#{n-1}" : "-#{-n}")
+ when Range
+ first = r.first
+ last = r.last
+ last -= 1 if r.exclude_end?
+ if last == -1
+ rangestr = (first > 0 ? "#{first}-" : "-#{-first}")
+ else
+ raise HTTPHeaderSyntaxError, 'range.first is negative' if first < 0
+ raise HTTPHeaderSyntaxError, 'range.last is negative' if last < 0
+ raise HTTPHeaderSyntaxError, 'must be .first < .last' if first > last
+ rangestr = "#{first}-#{last}"
+ end
+ else
+ raise TypeError, 'Range/Integer is required'
+ end
+ @header['range'] = ["bytes=#{rangestr}"]
+ r
+ end
+
+ alias range= set_range
+
+ # Returns an Integer object which represents the Content-Length: header field
+ # or +nil+ if that field is not provided.
+ def content_length
+ return nil unless key?('Content-Length')
+ len = self['Content-Length'].slice(/\d+/) or
+ raise HTTPHeaderSyntaxError, 'wrong Content-Length format'
+ len.to_i
+ end
+
+ def content_length=(len)
+ unless len
+ @header.delete 'content-length'
+ return nil
+ end
+ @header['content-length'] = [len.to_i.to_s]
+ end
+
+ # Returns "true" if the "transfer-encoding" header is present and
+ # 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?
+ return false unless @header['transfer-encoding']
+ field = self['Transfer-Encoding']
+ (/(?:\A|[^\-\w])chunked(?![\-\w])/i =~ field) ? true : false
+ end
+
+ # Returns a Range object which represents Content-Range: header field.
+ # This indicates, for a partial entity body, where this fragment
+ # fits inside the full entity body, as range of byte offsets.
+ def content_range
+ return nil unless @header['content-range']
+ m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
+ raise HTTPHeaderSyntaxError, 'wrong Content-Range format'
+ m[1].to_i .. m[2].to_i
+ end
+
+ # The length of the range represented in Content-Range: header.
+ def range_length
+ r = content_range() or return nil
+ r.end - r.begin + 1
+ end
+
+ # Returns a content type string such as "text/html".
+ # This method returns nil if Content-Type: header field does not exist.
+ def content_type
+ return nil unless main_type()
+ if sub_type()
+ then "#{main_type()}/#{sub_type()}"
+ else main_type()
+ end
+ end
+
+ # Returns a content type string such as "text".
+ # This method returns nil if Content-Type: header field does not exist.
+ def main_type
+ 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").
+ def sub_type
+ return nil unless @header['content-type']
+ main, sub = *self['Content-Type'].split(';').first.to_s.split('/')
+ return nil unless sub
+ sub.strip
+ end
+
+ # Returns content type parameters as a Hash as like
+ # {"charset" => "iso-2022-jp"}.
+ def type_params
+ result = {}
+ list = self['Content-Type'].to_s.split(';')
+ list.shift
+ list.each do |param|
+ k, v = *param.split('=', 2)
+ result[k.strip] = v.strip
+ end
+ result
+ end
+
+ # Set Content-Type: header field by +type+ and +params+.
+ # +type+ must be a String, +params+ must be a Hash.
+ def set_content_type(type, params = {})
+ @header['content-type'] = [type + params.map{|k,v|"; #{k}=#{v}"}.join('')]
+ end
+
+ alias content_type= set_content_type
+
+ # Set header fields and a body from HTML form data.
+ # +params+ should be a Hash containing HTML form data.
+ # Optional argument +sep+ means data record separator.
+ #
+ # 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.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.to_s)}=#{urlencode(v.to_s)}" }
+ end
+ private :encode_kvpair
+
+ def urlencode(str)
+ str.dup.force_encoding('ASCII-8BIT').gsub(/[^a-zA-Z0-9_\.\-]/){'%%%02x' % $&.ord}
+ end
+ private :urlencode
+
+ # Set the Authorization: header for "Basic" authorization.
+ def basic_auth(account, password)
+ @header['authorization'] = [basic_encode(account, password)]
+ end
+
+ # Set Proxy-Authorization: header for "Basic" authorization.
+ def proxy_basic_auth(account, password)
+ @header['proxy-authorization'] = [basic_encode(account, password)]
+ end
+
+ def basic_encode(account, password)
+ 'Basic ' + ["#{account}:#{password}"].pack('m').delete("\r\n")
+ 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
+
+
+ #
+ # Parent of HTTPRequest class. Do not use this directly; use
+ # a subclass of HTTPRequest.
+ #
+ # Mixes in the HTTPHeader module.
+ #
+ class HTTPGenericRequest
+
+ include HTTPHeader
+
+ def initialize(m, reqbody, resbody, path, initheader = nil)
+ @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
+
+ attr_reader :method
+ attr_reader :path
+
+ def inspect
+ "\#<#{self.class} #{@method}>"
+ end
+
+ def request_body_permitted?
+ @request_has_body
+ end
+
+ def response_body_permitted?
+ @response_has_body
+ end
+
+ def body_exist?
+ warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?" if $VERBOSE
+ response_body_permitted?
+ end
+
+ attr_reader :body
+
+ def body=(str)
+ @body = str
+ @body_stream = nil
+ str
+ end
+
+ attr_reader :body_stream
+
+ def body_stream=(input)
+ @body = nil
+ @body_stream = input
+ input
+ end
+
+ def set_body_internal(str) #:nodoc: internal use only
+ raise ArgumentError, "both of body argument and HTTPRequest#body set" if str and (@body or @body_stream)
+ self.body = str if str
+ end
+
+ #
+ # write
+ #
+
+ def exec(sock, ver, path) #:nodoc: internal use only
+ if @body
+ send_request_with_body sock, ver, path, @body
+ elsif @body_stream
+ send_request_with_body_stream sock, ver, path, @body_stream
+ else
+ write_header sock, ver, path
+ end
+ end
+
+ private
+
+ def send_request_with_body(sock, ver, path, body)
+ self.content_length = body.bytesize
+ delete 'Transfer-Encoding'
+ supply_default_content_type
+ write_header sock, ver, path
+ sock.write body
+ end
+
+ def send_request_with_body_stream(sock, ver, path, f)
+ unless content_length() or chunked?
+ raise ArgumentError,
+ "Content-Length not given and Transfer-Encoding is not `chunked'"
+ end
+ supply_default_content_type
+ write_header sock, ver, path
+ if chunked?
+ while s = f.read(1024)
+ sock.write(sprintf("%x\r\n", s.length) << s << "\r\n")
+ end
+ sock.write "0\r\n\r\n"
+ else
+ while s = f.read(1024)
+ sock.write s
+ end
+ end
+ end
+
+ def supply_default_content_type
+ return if content_type()
+ warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
+ set_content_type 'application/x-www-form-urlencoded'
+ end
+
+ def write_header(sock, ver, path)
+ buf = "#{@method} #{path} HTTP/#{ver}\r\n"
+ each_capitalized do |k,v|
+ buf << "#{k}: #{v}\r\n"
+ end
+ buf << "\r\n"
+ sock.write buf
+ end
+
end
-end
-require 'net/http/exceptions'
+ #
+ # 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.
+ def initialize(path, initheader = nil)
+ super self.class::METHOD,
+ self.class::REQUEST_HAS_BODY,
+ self.class::RESPONSE_HAS_BODY,
+ path, initheader
+ end
+ end
+
+
+ class HTTP # reopen
+ #
+ # HTTP 1.1 methods --- RFC2616
+ #
+
+ class Get < HTTPRequest
+ METHOD = 'GET'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Head < HTTPRequest
+ METHOD = 'HEAD'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = false
+ end
-require 'net/http/header'
+ class Post < HTTPRequest
+ METHOD = 'POST'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
-require 'net/http/generic_request'
-require 'net/http/request'
-require 'net/http/requests'
+ class Put < HTTPRequest
+ METHOD = 'PUT'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
-require 'net/http/response'
-require 'net/http/responses'
+ class Delete < HTTPRequest
+ METHOD = 'DELETE'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = true
+ end
-require 'net/http/proxy_delta'
+ class Options < HTTPRequest
+ METHOD = 'OPTIONS'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = false
+ end
+
+ class Trace < HTTPRequest
+ METHOD = 'TRACE'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = true
+ end
+
+ #
+ # WebDAV methods --- RFC2518
+ #
+
+ class Propfind < HTTPRequest
+ METHOD = 'PROPFIND'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Proppatch < HTTPRequest
+ METHOD = 'PROPPATCH'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Mkcol < HTTPRequest
+ METHOD = 'MKCOL'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Copy < HTTPRequest
+ METHOD = 'COPY'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Move < HTTPRequest
+ METHOD = 'MOVE'
+ REQUEST_HAS_BODY = false
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Lock < HTTPRequest
+ METHOD = 'LOCK'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
+
+ class Unlock < HTTPRequest
+ METHOD = 'UNLOCK'
+ REQUEST_HAS_BODY = true
+ RESPONSE_HAS_BODY = true
+ end
+ end
+
+
+ ###
+ ### Response
+ ###
+
+ # HTTP exception class.
+ # You must use its subclasses.
+ module HTTPExceptions
+ def initialize(msg, res) #:nodoc:
+ super msg
+ @response = res
+ end
+ attr_reader :response
+ alias data response #:nodoc: obsolete
+ end
+ class HTTPError < ProtocolError
+ include HTTPExceptions
+ end
+ class HTTPRetriableError < ProtoRetriableError
+ include HTTPExceptions
+ end
+ class HTTPServerException < ProtoServerError
+ # We cannot use the name "HTTPServerError", it is the name of the response.
+ include HTTPExceptions
+ end
+ class HTTPFatalError < ProtoFatalError
+ include HTTPExceptions
+ end
+
+
+ # 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
+ # HTTPResponse subclass. These are listed below.
+ # All classes are
+ # defined under the Net module. Indentation indicates inheritance.
+ #
+ # xxx HTTPResponse
+ #
+ # 1xx HTTPInformation
+ # 100 HTTPContinue
+ # 101 HTTPSwitchProtocol
+ #
+ # 2xx HTTPSuccess
+ # 200 HTTPOK
+ # 201 HTTPCreated
+ # 202 HTTPAccepted
+ # 203 HTTPNonAuthoritativeInformation
+ # 204 HTTPNoContent
+ # 205 HTTPResetContent
+ # 206 HTTPPartialContent
+ #
+ # 3xx HTTPRedirection
+ # 300 HTTPMultipleChoice
+ # 301 HTTPMovedPermanently
+ # 302 HTTPFound
+ # 303 HTTPSeeOther
+ # 304 HTTPNotModified
+ # 305 HTTPUseProxy
+ # 307 HTTPTemporaryRedirect
+ #
+ # 4xx HTTPClientError
+ # 400 HTTPBadRequest
+ # 401 HTTPUnauthorized
+ # 402 HTTPPaymentRequired
+ # 403 HTTPForbidden
+ # 404 HTTPNotFound
+ # 405 HTTPMethodNotAllowed
+ # 406 HTTPNotAcceptable
+ # 407 HTTPProxyAuthenticationRequired
+ # 408 HTTPRequestTimeOut
+ # 409 HTTPConflict
+ # 410 HTTPGone
+ # 411 HTTPLengthRequired
+ # 412 HTTPPreconditionFailed
+ # 413 HTTPRequestEntityTooLarge
+ # 414 HTTPRequestURITooLong
+ # 415 HTTPUnsupportedMediaType
+ # 416 HTTPRequestedRangeNotSatisfiable
+ # 417 HTTPExpectationFailed
+ #
+ # 5xx HTTPServerError
+ # 500 HTTPInternalServerError
+ # 501 HTTPNotImplemented
+ # 502 HTTPBadGateway
+ # 503 HTTPServiceUnavailable
+ # 504 HTTPGatewayTimeOut
+ # 505 HTTPVersionNotSupported
+ #
+ # xxx HTTPUnknownResponse
+ #
+ class HTTPResponse
+ # true if the response has body.
+ def HTTPResponse.body_permitted?
+ self::HAS_BODY
+ end
+
+ def HTTPResponse.exception_type # :nodoc: internal use only
+ self::EXCEPTION_TYPE
+ end
+ end # reopened after
+
+ # :stopdoc:
+
+ class HTTPUnknownResponse < HTTPResponse
+ HAS_BODY = true
+ EXCEPTION_TYPE = HTTPError
+ end
+ class HTTPInformation < HTTPResponse # 1xx
+ HAS_BODY = false
+ EXCEPTION_TYPE = HTTPError
+ end
+ class HTTPSuccess < HTTPResponse # 2xx
+ HAS_BODY = true
+ EXCEPTION_TYPE = HTTPError
+ end
+ class HTTPRedirection < HTTPResponse # 3xx
+ HAS_BODY = true
+ EXCEPTION_TYPE = HTTPRetriableError
+ end
+ class HTTPClientError < HTTPResponse # 4xx
+ HAS_BODY = true
+ EXCEPTION_TYPE = HTTPServerException # for backward compatibility
+ end
+ class HTTPServerError < HTTPResponse # 5xx
+ HAS_BODY = true
+ EXCEPTION_TYPE = HTTPFatalError # for backward compatibility
+ end
+
+ class HTTPContinue < HTTPInformation # 100
+ HAS_BODY = false
+ end
+ class HTTPSwitchProtocol < HTTPInformation # 101
+ HAS_BODY = false
+ end
+
+ class HTTPOK < HTTPSuccess # 200
+ HAS_BODY = true
+ end
+ class HTTPCreated < HTTPSuccess # 201
+ HAS_BODY = true
+ end
+ class HTTPAccepted < HTTPSuccess # 202
+ HAS_BODY = true
+ end
+ class HTTPNonAuthoritativeInformation < HTTPSuccess # 203
+ HAS_BODY = true
+ end
+ class HTTPNoContent < HTTPSuccess # 204
+ HAS_BODY = false
+ end
+ class HTTPResetContent < HTTPSuccess # 205
+ HAS_BODY = false
+ end
+ class HTTPPartialContent < HTTPSuccess # 206
+ HAS_BODY = true
+ end
+
+ class HTTPMultipleChoice < HTTPRedirection # 300
+ HAS_BODY = true
+ end
+ class HTTPMovedPermanently < HTTPRedirection # 301
+ HAS_BODY = true
+ end
+ class HTTPFound < HTTPRedirection # 302
+ HAS_BODY = true
+ end
+ HTTPMovedTemporarily = HTTPFound
+ class HTTPSeeOther < HTTPRedirection # 303
+ HAS_BODY = true
+ end
+ class HTTPNotModified < HTTPRedirection # 304
+ HAS_BODY = false
+ end
+ class HTTPUseProxy < HTTPRedirection # 305
+ HAS_BODY = false
+ end
+ # 306 unused
+ class HTTPTemporaryRedirect < HTTPRedirection # 307
+ HAS_BODY = true
+ end
+
+ class HTTPBadRequest < HTTPClientError # 400
+ HAS_BODY = true
+ end
+ class HTTPUnauthorized < HTTPClientError # 401
+ HAS_BODY = true
+ end
+ class HTTPPaymentRequired < HTTPClientError # 402
+ HAS_BODY = true
+ end
+ class HTTPForbidden < HTTPClientError # 403
+ HAS_BODY = true
+ end
+ class HTTPNotFound < HTTPClientError # 404
+ HAS_BODY = true
+ end
+ class HTTPMethodNotAllowed < HTTPClientError # 405
+ HAS_BODY = true
+ end
+ class HTTPNotAcceptable < HTTPClientError # 406
+ HAS_BODY = true
+ end
+ class HTTPProxyAuthenticationRequired < HTTPClientError # 407
+ HAS_BODY = true
+ end
+ class HTTPRequestTimeOut < HTTPClientError # 408
+ HAS_BODY = true
+ end
+ class HTTPConflict < HTTPClientError # 409
+ HAS_BODY = true
+ end
+ class HTTPGone < HTTPClientError # 410
+ HAS_BODY = true
+ end
+ class HTTPLengthRequired < HTTPClientError # 411
+ HAS_BODY = true
+ end
+ class HTTPPreconditionFailed < HTTPClientError # 412
+ HAS_BODY = true
+ end
+ class HTTPRequestEntityTooLarge < HTTPClientError # 413
+ HAS_BODY = true
+ end
+ class HTTPRequestURITooLong < HTTPClientError # 414
+ HAS_BODY = true
+ end
+ HTTPRequestURITooLarge = HTTPRequestURITooLong
+ class HTTPUnsupportedMediaType < HTTPClientError # 415
+ HAS_BODY = true
+ end
+ class HTTPRequestedRangeNotSatisfiable < HTTPClientError # 416
+ HAS_BODY = true
+ end
+ class HTTPExpectationFailed < HTTPClientError # 417
+ HAS_BODY = true
+ end
+
+ class HTTPInternalServerError < HTTPServerError # 500
+ HAS_BODY = true
+ end
+ class HTTPNotImplemented < HTTPServerError # 501
+ HAS_BODY = true
+ end
+ class HTTPBadGateway < HTTPServerError # 502
+ HAS_BODY = true
+ end
+ class HTTPServiceUnavailable < HTTPServerError # 503
+ HAS_BODY = true
+ end
+ class HTTPGatewayTimeOut < HTTPServerError # 504
+ HAS_BODY = true
+ end
+ class HTTPVersionNotSupported < HTTPServerError # 505
+ HAS_BODY = true
+ end
+
+ # :startdoc:
+
+
+ class HTTPResponse # reopen
+
+ CODE_CLASS_TO_OBJ = {
+ '1' => HTTPInformation,
+ '2' => HTTPSuccess,
+ '3' => HTTPRedirection,
+ '4' => HTTPClientError,
+ '5' => HTTPServerError
+ }
+ CODE_TO_OBJ = {
+ '100' => HTTPContinue,
+ '101' => HTTPSwitchProtocol,
+
+ '200' => HTTPOK,
+ '201' => HTTPCreated,
+ '202' => HTTPAccepted,
+ '203' => HTTPNonAuthoritativeInformation,
+ '204' => HTTPNoContent,
+ '205' => HTTPResetContent,
+ '206' => HTTPPartialContent,
+
+ '300' => HTTPMultipleChoice,
+ '301' => HTTPMovedPermanently,
+ '302' => HTTPFound,
+ '303' => HTTPSeeOther,
+ '304' => HTTPNotModified,
+ '305' => HTTPUseProxy,
+ '307' => HTTPTemporaryRedirect,
+
+ '400' => HTTPBadRequest,
+ '401' => HTTPUnauthorized,
+ '402' => HTTPPaymentRequired,
+ '403' => HTTPForbidden,
+ '404' => HTTPNotFound,
+ '405' => HTTPMethodNotAllowed,
+ '406' => HTTPNotAcceptable,
+ '407' => HTTPProxyAuthenticationRequired,
+ '408' => HTTPRequestTimeOut,
+ '409' => HTTPConflict,
+ '410' => HTTPGone,
+ '411' => HTTPLengthRequired,
+ '412' => HTTPPreconditionFailed,
+ '413' => HTTPRequestEntityTooLarge,
+ '414' => HTTPRequestURITooLong,
+ '415' => HTTPUnsupportedMediaType,
+ '416' => HTTPRequestedRangeNotSatisfiable,
+ '417' => HTTPExpectationFailed,
+
+ '500' => HTTPInternalServerError,
+ '501' => HTTPNotImplemented,
+ '502' => HTTPBadGateway,
+ '503' => HTTPServiceUnavailable,
+ '504' => HTTPGatewayTimeOut,
+ '505' => HTTPVersionNotSupported
+ }
+
+ class << HTTPResponse
+ def read_new(sock) #:nodoc: internal use only
+ httpv, code, msg = read_status_line(sock)
+ res = response_class(code).new(httpv, code, msg)
+ each_response_header(sock) do |k,v|
+ res.add_field k, v
+ end
+ res
+ end
+
+ private
+
+ def read_status_line(sock)
+ str = sock.readline
+ m = /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in.match(str) or
+ raise HTTPBadResponse, "wrong status line: #{str.dump}"
+ m.captures
+ end
+
+ def response_class(code)
+ CODE_TO_OBJ[code] or
+ CODE_CLASS_TO_OBJ[code[0,1]] or
+ HTTPUnknownResponse
+ end
+
+ def each_response_header(sock)
+ key = value = nil
+ while true
+ line = sock.readuntil("\n", true).sub(/\s+\z/, '')
+ break if line.empty?
+ if line[0] == ?\s or line[0] == ?\t and value
+ value << ' ' unless value.empty?
+ value << line.strip
+ else
+ yield key, value if key
+ key, value = line.strip.split(/\s*:\s*/, 2)
+ raise HTTPBadResponse, 'wrong header line format' if value.nil?
+ end
+ end
+ yield key, value if key
+ end
+ end
+
+ # next is to fix bug in RDoc, where the private inside class << self
+ # spills out.
+ public
+
+ include HTTPHeader
+
+ def initialize(httpv, code, msg) #:nodoc: internal use only
+ @http_version = httpv
+ @code = code
+ @message = msg
+ initialize_http_header nil
+ @body = nil
+ @read = false
+ end
+
+ # The HTTP version supported by the server.
+ attr_reader :http_version
+
+ # HTTP result code string. For example, '302'. You can also
+ # determine the response type by which response subclass the
+ # response object is an instance of.
+ attr_reader :code
+
+ # HTTP result message. For example, 'Not Found'.
+ attr_reader :message
+ alias msg message # :nodoc: obsolete
+
+ def inspect
+ "#<#{self.class} #{@code} #{@message} readbody=#{@read}>"
+ end
+
+ # For backward compatibility.
+ # 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
+ class << res
+ undef to_ary
+ end
+ [res, res.body]
+ end
+
+ #
+ # response <-> exception relationship
+ #
+
+ def code_type #:nodoc:
+ self.class
+ end
+
+ def error! #:nodoc:
+ raise error_type().new(@code + ' ' + @message.dump, self)
+ end
+
+ def error_type #:nodoc:
+ self.class::EXCEPTION_TYPE
+ end
+
+ # Raises HTTP error if the response is not 2xx.
+ def value
+ error! unless self.kind_of?(HTTPSuccess)
+ end
+
+ #
+ # header (for backward compatibility only; DO NOT USE)
+ #
+
+ def response #:nodoc:
+ warn "#{caller(1)[0]}: warning: HTTPResponse#response is obsolete" if $VERBOSE
+ self
+ end
+
+ def header #:nodoc:
+ warn "#{caller(1)[0]}: warning: HTTPResponse#header is obsolete" if $VERBOSE
+ self
+ end
+
+ def read_header #:nodoc:
+ warn "#{caller(1)[0]}: warning: HTTPResponse#read_header is obsolete" if $VERBOSE
+ self
+ end
+
+ #
+ # body
+ #
+
+ def reading_body(sock, reqmethodallowbody) #:nodoc: internal use only
+ @socket = sock
+ @body_exist = reqmethodallowbody && self.class.body_permitted?
+ begin
+ yield
+ self.body # ensure to read body
+ ensure
+ @socket = nil
+ end
+ end
+
+ # Gets entity body. If the block given, yields it to +block+.
+ # The body is provided in fragments, as it is read in from the socket.
+ #
+ # Calling this method a second or subsequent time will return the
+ # already read string.
+ #
+ # http.request_get('/index.html') {|res|
+ # puts res.read_body
+ # }
+ #
+ # http.request_get('/index.html') {|res|
+ # p res.read_body.object_id # 538149362
+ # p res.read_body.object_id # 538149362
+ # }
+ #
+ # # using iterator
+ # http.request_get('/index.html') {|res|
+ # res.read_body do |segment|
+ # print segment
+ # end
+ # }
+ #
+ def read_body(dest = nil, &block)
+ if @read
+ raise IOError, "#{self.class}\#read_body called twice" if dest or block
+ return @body
+ end
+ to = procdest(dest, block)
+ stream_check
+ if @body_exist
+ read_body_0 to
+ @body = to
+ else
+ @body = nil
+ end
+ @read = true
+
+ @body
+ end
+
+ # Returns the entity body.
+ #
+ # Calling this method a second or subsequent time will return the
+ # already read string.
+ #
+ # http.request_get('/index.html') {|res|
+ # puts res.body
+ # }
+ #
+ # http.request_get('/index.html') {|res|
+ # p res.body.object_id # 538149362
+ # p res.body.object_id # 538149362
+ # }
+ #
+ def body
+ 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
+
+ def read_body_0(dest)
+ if chunked?
+ read_chunked dest
+ return
+ end
+ clen = content_length()
+ if clen
+ @socket.read clen, dest, true # ignore EOF
+ return
+ end
+ clen = range_length()
+ if clen
+ @socket.read clen, dest
+ return
+ end
+ @socket.read_all dest
+ end
+
+ def read_chunked(dest)
+ len = nil
+ total = 0
+ while true
+ line = @socket.readline
+ hexlen = line.slice(/[0-9a-fA-F]+/) or
+ raise HTTPBadResponse, "wrong chunk size line: #{line}"
+ len = hexlen.hex
+ break if len == 0
+ begin
+ @socket.read len, dest
+ ensure
+ total += len
+ @socket.read 2 # \r\n
+ end
+ end
+ until @socket.readline.empty?
+ # none
+ end
+ end
+
+ def stream_check
+ raise IOError, 'attempt to read body out of block' if @socket.closed?
+ end
+
+ def procdest(dest, block)
+ raise ArgumentError, 'both arg and block given for HTTP method' \
+ if dest and block
+ if block
+ ReadAdapter.new(block)
+ else
+ dest || ''
+ end
+ end
+
+ end
+
+
+ # :enddoc:
+
+ #--
+ # for backward compatibility
+ class HTTP
+ ProxyMod = ProxyDelta
+ end
+ module NetPrivate
+ HTTPRequest = ::Net::HTTPRequest
+ end
-require 'net/http/backward'
+ HTTPInformationCode = HTTPInformation
+ HTTPSuccessCode = HTTPSuccess
+ HTTPRedirectionCode = HTTPRedirection
+ HTTPRetriableCode = HTTPRedirection
+ HTTPClientErrorCode = HTTPClientError
+ HTTPFatalErrorCode = HTTPClientError
+ HTTPServerErrorCode = HTTPServerError
+ HTTPResponceReceiver = HTTPResponse
+end # module Net
diff --git a/lib/net/http/backward.rb b/lib/net/http/backward.rb
deleted file mode 100644
index faf47b8489..0000000000
--- a/lib/net/http/backward.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# for backward compatibility
-
-# :enddoc:
-
-class Net::HTTP
- ProxyMod = ProxyDelta
-end
-
-module Net
- HTTPSession = Net::HTTP
-end
-
-module Net::NetPrivate
- HTTPRequest = ::Net::HTTPRequest
-end
-
-Net::HTTPInformationCode = Net::HTTPInformation
-Net::HTTPSuccessCode = Net::HTTPSuccess
-Net::HTTPRedirectionCode = Net::HTTPRedirection
-Net::HTTPRetriableCode = Net::HTTPRedirection
-Net::HTTPClientErrorCode = Net::HTTPClientError
-Net::HTTPFatalErrorCode = Net::HTTPClientError
-Net::HTTPServerErrorCode = Net::HTTPServerError
-Net::HTTPResponceReceiver = Net::HTTPResponse
-
diff --git a/lib/net/http/exceptions.rb b/lib/net/http/exceptions.rb
deleted file mode 100644
index 6c5d81cb04..0000000000
--- a/lib/net/http/exceptions.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Net::HTTP exception class.
-# You cannot use Net::HTTPExceptions directly; instead, you must use
-# its subclasses.
-module Net::HTTPExceptions
- def initialize(msg, res) #:nodoc:
- super msg
- @response = res
- end
- attr_reader :response
- alias data response #:nodoc: obsolete
-end
-class Net::HTTPError < Net::ProtocolError
- include Net::HTTPExceptions
-end
-class Net::HTTPRetriableError < Net::ProtoRetriableError
- include Net::HTTPExceptions
-end
-class Net::HTTPServerException < Net::ProtoServerError
- # We cannot use the name "HTTPServerError", it is the name of the response.
- include Net::HTTPExceptions
-end
-class Net::HTTPFatalError < Net::ProtoFatalError
- include Net::HTTPExceptions
-end
-
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
deleted file mode 100644
index 6e79bb9c2e..0000000000
--- a/lib/net/http/generic_request.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-# HTTPGenericRequest is the parent of the HTTPRequest class.
-# Do not use this directly; use a subclass of HTTPRequest.
-#
-# Mixes in the HTTPHeader module to provide easier access to HTTP headers.
-#
-class Net::HTTPGenericRequest
-
- include Net::HTTPHeader
-
- def initialize(m, reqbody, resbody, uri_or_path, initheader = nil)
- @method = m
- @request_has_body = reqbody
- @response_has_body = resbody
-
- if URI === uri_or_path then
- @uri = uri_or_path.dup
- host = @uri.hostname
- host += ":#{@uri.port}" if @uri.port != @uri.class::DEFAULT_PORT
- path = uri_or_path.request_uri
- else
- @uri = nil
- host = nil
- path = uri_or_path
- end
-
- raise ArgumentError, "no HTTP request path given" unless path
- raise ArgumentError, "HTTP request path is empty" if path.empty?
- @path = path
-
- @decode_content = false
-
- if @response_has_body and Net::HTTP::HAVE_ZLIB then
- if !initheader ||
- !initheader.keys.any? { |k|
- %w[accept-encoding range].include? k.downcase
- } then
- @decode_content = true
- initheader = initheader ? initheader.dup : {}
- initheader["accept-encoding"] =
- "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
- end
- end
-
- initialize_http_header initheader
- self['Accept'] ||= '*/*'
- self['User-Agent'] ||= 'Ruby'
- self['Host'] ||= host
- @body = nil
- @body_stream = nil
- @body_data = nil
- end
-
- attr_reader :method
- attr_reader :path
- attr_reader :uri
-
- # Automatically set to false if the user sets the Accept-Encoding header.
- # This indicates they wish to handle Content-encoding in responses
- # themselves.
- attr_reader :decode_content
-
- def inspect
- "\#<#{self.class} #{@method}>"
- end
-
- ##
- # Don't automatically decode response content-encoding if the user indicates
- # they want to handle it.
-
- def []=(key, val) # :nodoc:
- @decode_content = false if key.downcase == 'accept-encoding'
-
- super key, val
- end
-
- def request_body_permitted?
- @request_has_body
- end
-
- def response_body_permitted?
- @response_has_body
- end
-
- def body_exist?
- warn "Net::HTTPRequest#body_exist? is obsolete; use response_body_permitted?" if $VERBOSE
- response_body_permitted?
- end
-
- attr_reader :body
-
- def body=(str)
- @body = str
- @body_stream = nil
- @body_data = nil
- str
- end
-
- attr_reader :body_stream
-
- def body_stream=(input)
- @body = nil
- @body_stream = input
- @body_data = nil
- input
- end
-
- def set_body_internal(str) #:nodoc: internal use only
- raise ArgumentError, "both of body argument and HTTPRequest#body set" if str and (@body or @body_stream)
- self.body = str if str
- if @body.nil? && @body_stream.nil? && @body_data.nil? && request_body_permitted?
- self.body = ''
- end
- end
-
- #
- # write
- #
-
- def exec(sock, ver, path) #:nodoc: internal use only
- if @uri
- if @uri.port == @uri.default_port
- # [Bug #7650] Amazon ECS API and GFE/1.3 disallow extra default port number
- self['host'] = @uri.host
- else
- self['host'] = "#{@uri.host}:#{@uri.port}"
- end
- end
-
- if @body
- send_request_with_body sock, ver, path, @body
- elsif @body_stream
- send_request_with_body_stream sock, ver, path, @body_stream
- elsif @body_data
- send_request_with_body_data sock, ver, path, @body_data
- else
- write_header sock, ver, path
- end
- end
-
- def update_uri(host, port, ssl) # :nodoc: internal use only
- return unless @uri
-
- @uri.host ||= host
- @uri.port = port
-
- scheme = ssl ? 'https' : 'http'
-
- # convert the class of the URI
- unless scheme == @uri.scheme then
- new_uri = @uri.to_s.sub(/^https?/, scheme)
- @uri = URI new_uri
- end
-
- @uri
- end
-
- private
-
- class Chunker #:nodoc:
- def initialize(sock)
- @sock = sock
- @prev = nil
- end
-
- def write(buf)
- # avoid memcpy() of buf, buf can huge and eat memory bandwidth
- @sock.write("#{buf.bytesize.to_s(16)}\r\n")
- rv = @sock.write(buf)
- @sock.write("\r\n")
- rv
- end
-
- def finish
- @sock.write("0\r\n\r\n")
- end
- end
-
- def send_request_with_body(sock, ver, path, body)
- self.content_length = body.bytesize
- delete 'Transfer-Encoding'
- supply_default_content_type
- write_header sock, ver, path
- wait_for_continue sock, ver if sock.continue_timeout
- sock.write body
- end
-
- def send_request_with_body_stream(sock, ver, path, f)
- unless content_length() or chunked?
- raise ArgumentError,
- "Content-Length not given and Transfer-Encoding is not `chunked'"
- end
- supply_default_content_type
- write_header sock, ver, path
- wait_for_continue sock, ver if sock.continue_timeout
- if chunked?
- chunker = Chunker.new(sock)
- IO.copy_stream(f, chunker)
- chunker.finish
- else
- # copy_stream can sendfile() to sock.io unless we use SSL.
- # If sock.io is an SSLSocket, copy_stream will hit SSL_write()
- IO.copy_stream(f, sock.io)
- end
- end
-
- def send_request_with_body_data(sock, ver, path, params)
- if /\Amultipart\/form-data\z/i !~ self.content_type
- self.content_type = 'application/x-www-form-urlencoded'
- return send_request_with_body(sock, ver, path, URI.encode_www_form(params))
- end
-
- opt = @form_option.dup
- require 'securerandom' unless defined?(SecureRandom)
- opt[:boundary] ||= SecureRandom.urlsafe_base64(40)
- self.set_content_type(self.content_type, boundary: opt[:boundary])
- if chunked?
- write_header sock, ver, path
- encode_multipart_form_data(sock, params, opt)
- else
- require 'tempfile'
- file = Tempfile.new('multipart')
- file.binmode
- encode_multipart_form_data(file, params, opt)
- file.rewind
- self.content_length = file.size
- write_header sock, ver, path
- IO.copy_stream(file, sock)
- file.close(true)
- end
- end
-
- def encode_multipart_form_data(out, params, opt)
- charset = opt[:charset]
- boundary = opt[:boundary]
- require 'securerandom' unless defined?(SecureRandom)
- boundary ||= SecureRandom.urlsafe_base64(40)
- chunked_p = chunked?
-
- buf = ''
- params.each do |key, value, h={}|
- key = quote_string(key, charset)
- filename =
- h.key?(:filename) ? h[:filename] :
- value.respond_to?(:to_path) ? File.basename(value.to_path) :
- nil
-
- buf << "--#{boundary}\r\n"
- if filename
- filename = quote_string(filename, charset)
- type = h[:content_type] || 'application/octet-stream'
- buf << "Content-Disposition: form-data; " \
- "name=\"#{key}\"; filename=\"#{filename}\"\r\n" \
- "Content-Type: #{type}\r\n\r\n"
- if !out.respond_to?(:write) || !value.respond_to?(:read)
- # if +out+ is not an IO or +value+ is not an IO
- buf << (value.respond_to?(:read) ? value.read : value)
- elsif value.respond_to?(:size) && chunked_p
- # if +out+ is an IO and +value+ is a File, use IO.copy_stream
- flush_buffer(out, buf, chunked_p)
- out << "%x\r\n" % value.size if chunked_p
- IO.copy_stream(value, out)
- out << "\r\n" if chunked_p
- else
- # +out+ is an IO, and +value+ is not a File but an IO
- flush_buffer(out, buf, chunked_p)
- 1 while flush_buffer(out, value.read(4096), chunked_p)
- end
- else
- # non-file field:
- # HTML5 says, "The parts of the generated multipart/form-data
- # resource that correspond to non-file fields must not have a
- # Content-Type header specified."
- buf << "Content-Disposition: form-data; name=\"#{key}\"\r\n\r\n"
- buf << (value.respond_to?(:read) ? value.read : value)
- end
- buf << "\r\n"
- end
- buf << "--#{boundary}--\r\n"
- flush_buffer(out, buf, chunked_p)
- out << "0\r\n\r\n" if chunked_p
- end
-
- def quote_string(str, charset)
- str = str.encode(charset, fallback:->(c){'&#%d;'%c.encode("UTF-8").ord}) if charset
- str = str.gsub(/[\\"]/, '\\\\\&')
- end
-
- def flush_buffer(out, buf, chunked_p)
- return unless buf
- out << "%x\r\n"%buf.bytesize if chunked_p
- out << buf
- out << "\r\n" if chunked_p
- buf.clear
- end
-
- def supply_default_content_type
- return if content_type()
- warn 'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded' if $VERBOSE
- set_content_type 'application/x-www-form-urlencoded'
- end
-
- ##
- # Waits up to the continue timeout for a response from the server provided
- # we're speaking HTTP 1.1 and are expecting a 100-continue response.
-
- def wait_for_continue(sock, ver)
- if ver >= '1.1' and @header['expect'] and
- @header['expect'].include?('100-continue')
- if IO.select([sock.io], nil, nil, sock.continue_timeout)
- res = Net::HTTPResponse.read_new(sock)
- unless res.kind_of?(Net::HTTPContinue)
- res.decode_content = @decode_content
- throw :response, res
- end
- end
- end
- end
-
- def write_header(sock, ver, path)
- buf = "#{@method} #{path} HTTP/#{ver}\r\n"
- each_capitalized do |k,v|
- buf << "#{k}: #{v}\r\n"
- end
- buf << "\r\n"
- sock.write buf
- end
-
-end
-
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb
deleted file mode 100644
index 7e46e04395..0000000000
--- a/lib/net/http/header.rb
+++ /dev/null
@@ -1,452 +0,0 @@
-# The HTTPHeader module defines methods for reading and writing
-# HTTP headers.
-#
-# It is used as a mixin by other classes, to provide hash-like
-# access to HTTP header values. Unlike raw hash access, HTTPHeader
-# provides access via case-insensitive keys. It also provides
-# methods for accessing commonly-used HTTP header values in more
-# convenient formats.
-#
-module Net::HTTPHeader
-
- def initialize_http_header(initheader)
- @header = {}
- return unless initheader
- initheader.each do |key, value|
- warn "net/http: warning: duplicated HTTP header: #{key}" if key?(key) and $VERBOSE
- @header[key.downcase] = [value.strip]
- end
- end
-
- def size #:nodoc: obsolete
- @header.size
- end
-
- alias length size #:nodoc: obsolete
-
- # Returns the header field corresponding to the case-insensitive key.
- # For example, a key of "Content-Type" might return "text/html"
- def [](key)
- a = @header[key.downcase] or return nil
- a.join(', ')
- end
-
- # Sets the header field corresponding to the case-insensitive key.
- def []=(key, val)
- unless val
- @header.delete key.downcase
- return val
- end
- @header[key.downcase] = [val]
- end
-
- # [Ruby 1.8.3]
- # Adds a value to a named header field, instead of replacing its value.
- # Second argument +val+ must be a String.
- # See also #[]=, #[] and #get_fields.
- #
- # request.add_field 'X-My-Header', 'a'
- # p request['X-My-Header'] #=> "a"
- # p request.get_fields('X-My-Header') #=> ["a"]
- # request.add_field 'X-My-Header', 'b'
- # p request['X-My-Header'] #=> "a, b"
- # p request.get_fields('X-My-Header') #=> ["a", "b"]
- # request.add_field 'X-My-Header', 'c'
- # p request['X-My-Header'] #=> "a, b, c"
- # p request.get_fields('X-My-Header') #=> ["a", "b", "c"]
- #
- def add_field(key, val)
- if @header.key?(key.downcase)
- @header[key.downcase].push val
- else
- @header[key.downcase] = [val]
- end
- end
-
- # [Ruby 1.8.3]
- # Returns an array of header field strings corresponding to the
- # case-insensitive +key+. This method allows you to get duplicated
- # header fields without any processing. See also #[].
- #
- # p response.get_fields('Set-Cookie')
- # #=> ["session=al98axx; expires=Fri, 31-Dec-1999 23:58:23",
- # "query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"]
- # p response['Set-Cookie']
- # #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"
- #
- def get_fields(key)
- return nil unless @header[key.downcase]
- @header[key.downcase].dup
- end
-
- # Returns the header field corresponding to the case-insensitive key.
- # Returns the default value +args+, or the result of the block, or
- # raises an IndexError if there's no header field named +key+
- # See Hash#fetch
- def fetch(key, *args, &block) #:yield: +key+
- a = @header.fetch(key.downcase, *args, &block)
- a.kind_of?(Array) ? a.join(', ') : a
- end
-
- # Iterates through the header names and values, passing in the name
- # and value to the code block supplied.
- #
- # Example:
- #
- # response.header.each_header {|key,value| puts "#{key} = #{value}" }
- #
- def each_header #:yield: +key+, +value+
- block_given? or return enum_for(__method__)
- @header.each do |k,va|
- yield k, va.join(', ')
- end
- end
-
- alias each each_header
-
- # Iterates through the header names in the header, passing
- # each header name to the code block.
- def each_name(&block) #:yield: +key+
- block_given? or return enum_for(__method__)
- @header.each_key(&block)
- end
-
- alias each_key each_name
-
- # Iterates through the header names in the header, passing
- # capitalized header names to the code block.
- #
- # Note that header names are capitalized systematically;
- # capitalization may not match that used by the remote HTTP
- # server in its response.
- def each_capitalized_name #:yield: +key+
- block_given? or return enum_for(__method__)
- @header.each_key do |k|
- yield capitalize(k)
- end
- end
-
- # Iterates through header values, passing each value to the
- # code block.
- def each_value #:yield: +value+
- block_given? or return enum_for(__method__)
- @header.each_value do |va|
- yield va.join(', ')
- end
- end
-
- # Removes a header field, specified by case-insensitive key.
- def delete(key)
- @header.delete(key.downcase)
- end
-
- # true if +key+ header exists.
- def key?(key)
- @header.key?(key.downcase)
- end
-
- # Returns a Hash consisting of header names and values.
- # e.g.
- # {"cache-control" => "private",
- # "content-type" => "text/html",
- # "date" => "Wed, 22 Jun 2005 22:11:50 GMT"}
- def to_hash
- @header.dup
- end
-
- # As for #each_header, except the keys are provided in capitalized form.
- #
- # Note that header names are capitalized systematically;
- # capitalization may not match that used by the remote HTTP
- # server in its response.
- def each_capitalized
- block_given? or return enum_for(__method__)
- @header.each do |k,v|
- yield capitalize(k), v.join(', ')
- end
- end
-
- alias canonical_each each_capitalized
-
- def capitalize(name)
- name.split(/-/).map {|s| s.capitalize }.join('-')
- end
- private :capitalize
-
- # Returns an Array of Range objects which represent the Range:
- # HTTP header field, or +nil+ if there is no such header.
- def range
- return nil unless @header['range']
-
- value = self['Range']
- # byte-range-set = *( "," OWS ) ( byte-range-spec / suffix-byte-range-spec )
- # *( OWS "," [ OWS ( byte-range-spec / suffix-byte-range-spec ) ] )
- # corrected collected ABNF
- # http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-19#section-5.4.1
- # http://tools.ietf.org/html/draft-ietf-httpbis-p5-range-19#appendix-C
- # http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-19#section-3.2.5
- unless /\Abytes=((?:,[ \t]*)*(?:\d+-\d*|-\d+)(?:[ \t]*,(?:[ \t]*\d+-\d*|-\d+)?)*)\z/ =~ value
- raise Net::HTTPHeaderSyntaxError, "invalid syntax for byte-ranges-specifier: '#{value}'"
- end
-
- byte_range_set = $1
- result = byte_range_set.split(/,/).map {|spec|
- m = /(\d+)?\s*-\s*(\d+)?/i.match(spec) or
- raise Net::HTTPHeaderSyntaxError, "invalid byte-range-spec: '#{spec}'"
- d1 = m[1].to_i
- d2 = m[2].to_i
- if m[1] and m[2]
- if d1 > d2
- raise Net::HTTPHeaderSyntaxError, "last-byte-pos MUST greater than or equal to first-byte-pos but '#{spec}'"
- end
- d1..d2
- elsif m[1]
- d1..-1
- elsif m[2]
- -d2..-1
- else
- raise Net::HTTPHeaderSyntaxError, 'range is not specified'
- end
- }
- # if result.empty?
- # byte-range-set must include at least one byte-range-spec or suffix-byte-range-spec
- # but above regexp already denies it.
- if result.size == 1 && result[0].begin == 0 && result[0].end == -1
- raise Net::HTTPHeaderSyntaxError, 'only one suffix-byte-range-spec with zero suffix-length'
- end
- result
- end
-
- # Sets the HTTP Range: header.
- # Accepts either a Range object as a single argument,
- # or a beginning index and a length from that index.
- # Example:
- #
- # req.range = (0..1023)
- # req.set_range 0, 1023
- #
- def set_range(r, e = nil)
- unless r
- @header.delete 'range'
- return r
- end
- r = (r...r+e) if e
- case r
- when Numeric
- n = r.to_i
- rangestr = (n > 0 ? "0-#{n-1}" : "-#{-n}")
- when Range
- first = r.first
- last = r.last
- last -= 1 if r.exclude_end?
- if last == -1
- rangestr = (first > 0 ? "#{first}-" : "-#{-first}")
- else
- raise Net::HTTPHeaderSyntaxError, 'range.first is negative' if first < 0
- raise Net::HTTPHeaderSyntaxError, 'range.last is negative' if last < 0
- raise Net::HTTPHeaderSyntaxError, 'must be .first < .last' if first > last
- rangestr = "#{first}-#{last}"
- end
- else
- raise TypeError, 'Range/Integer is required'
- end
- @header['range'] = ["bytes=#{rangestr}"]
- r
- end
-
- alias range= set_range
-
- # Returns an Integer object which represents the HTTP Content-Length:
- # header field, or +nil+ if that field was not provided.
- def content_length
- return nil unless key?('Content-Length')
- len = self['Content-Length'].slice(/\d+/) or
- raise Net::HTTPHeaderSyntaxError, 'wrong Content-Length format'
- len.to_i
- end
-
- def content_length=(len)
- unless len
- @header.delete 'content-length'
- return nil
- end
- @header['content-length'] = [len.to_i.to_s]
- end
-
- # Returns "true" if the "transfer-encoding" header is present and
- # 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?
- return false unless @header['transfer-encoding']
- field = self['Transfer-Encoding']
- (/(?:\A|[^\-\w])chunked(?![\-\w])/i =~ field) ? true : false
- end
-
- # Returns a Range object which represents the value of the Content-Range:
- # header field.
- # For a partial entity body, this indicates where this fragment
- # fits inside the full entity body, as range of byte offsets.
- def content_range
- return nil unless @header['content-range']
- m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or
- raise Net::HTTPHeaderSyntaxError, 'wrong Content-Range format'
- m[1].to_i .. m[2].to_i
- end
-
- # The length of the range represented in Content-Range: header.
- def range_length
- r = content_range() or return nil
- r.end - r.begin + 1
- end
-
- # Returns a content type string such as "text/html".
- # This method returns nil if Content-Type: header field does not exist.
- def content_type
- return nil unless main_type()
- if sub_type()
- then "#{main_type()}/#{sub_type()}"
- else main_type()
- end
- end
-
- # Returns a content type string such as "text".
- # This method returns nil if Content-Type: header field does not exist.
- def main_type
- 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").
- def sub_type
- return nil unless @header['content-type']
- _, sub = *self['Content-Type'].split(';').first.to_s.split('/')
- return nil unless sub
- sub.strip
- end
-
- # Any parameters specified for the content type, returned as a Hash.
- # For example, a header of Content-Type: text/html; charset=EUC-JP
- # would result in type_params returning {'charset' => 'EUC-JP'}
- def type_params
- result = {}
- list = self['Content-Type'].to_s.split(';')
- list.shift
- list.each do |param|
- k, v = *param.split('=', 2)
- result[k.strip] = v.strip
- end
- result
- end
-
- # Sets the content type in an HTTP header.
- # The +type+ should be a full HTTP content type, e.g. "text/html".
- # The +params+ are an optional Hash of parameters to add after the
- # content type, e.g. {'charset' => 'iso-8859-1'}
- def set_content_type(type, params = {})
- @header['content-type'] = [type + params.map{|k,v|"; #{k}=#{v}"}.join('')]
- end
-
- alias content_type= set_content_type
-
- # Set header fields and a body from HTML form data.
- # +params+ should be an Array of Arrays or
- # a Hash containing HTML form data.
- # Optional argument +sep+ means data record separator.
- #
- # Values are URL encoded as necessary and the content-type is set 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 = '&')
- query = URI.encode_www_form(params)
- query.gsub!(/&/, sep) if sep != '&'
- self.body = query
- self.content_type = 'application/x-www-form-urlencoded'
- end
-
- alias form_data= set_form_data
-
- # Set a HTML form data set.
- # +params+ is the form data set; it is an Array of Arrays or a Hash
- # +enctype is the type to encode the form data set.
- # It is application/x-www-form-urlencoded or multipart/form-data.
- # +formpot+ is an optional hash to specify the detail.
- #
- # boundary:: the boundary of the multipart message
- # charset:: the charset of the message. All names and the values of
- # non-file fields are encoded as the charset.
- #
- # Each item of params is an array and contains following items:
- # +name+:: the name of the field
- # +value+:: the value of the field, it should be a String or a File
- # +opt+:: an optional hash to specify additional information
- #
- # Each item is a file field or a normal field.
- # If +value+ is a File object or the +opt+ have a filename key,
- # the item is treated as a file field.
- #
- # If Transfer-Encoding is set as chunked, this send the request in
- # chunked encoding. Because chunked encoding is HTTP/1.1 feature,
- # you must confirm the server to support HTTP/1.1 before sending it.
- #
- # Example:
- # http.set_form([["q", "ruby"], ["lang", "en"]])
- #
- # See also RFC 2388, RFC 2616, HTML 4.01, and HTML5
- #
- def set_form(params, enctype='application/x-www-form-urlencoded', formopt={})
- @body_data = params
- @body = nil
- @body_stream = nil
- @form_option = formopt
- case enctype
- when /\Aapplication\/x-www-form-urlencoded\z/i,
- /\Amultipart\/form-data\z/i
- self.content_type = enctype
- else
- raise ArgumentError, "invalid enctype: #{enctype}"
- end
- end
-
- # Set the Authorization: header for "Basic" authorization.
- def basic_auth(account, password)
- @header['authorization'] = [basic_encode(account, password)]
- end
-
- # Set Proxy-Authorization: header for "Basic" authorization.
- def proxy_basic_auth(account, password)
- @header['proxy-authorization'] = [basic_encode(account, password)]
- end
-
- def basic_encode(account, password)
- 'Basic ' + ["#{account}:#{password}"].pack('m').delete("\r\n")
- 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
-
diff --git a/lib/net/http/proxy_delta.rb b/lib/net/http/proxy_delta.rb
deleted file mode 100644
index b16c9f1ed8..0000000000
--- a/lib/net/http/proxy_delta.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Net::HTTP::ProxyDelta #:nodoc: internal use only
- private
-
- def conn_address
- proxy_address()
- end
-
- def conn_port
- proxy_port()
- end
-
- def edit_path(path)
- use_ssl? ? path : "http://#{addr_port()}#{path}"
- end
-end
-
diff --git a/lib/net/http/request.rb b/lib/net/http/request.rb
deleted file mode 100644
index e8b0f48fcc..0000000000
--- a/lib/net/http/request.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# HTTP request class.
-# This class wraps together the request header and the request path.
-# You cannot use this class directly. Instead, you should use one of its
-# subclasses: Net::HTTP::Get, Net::HTTP::Post, Net::HTTP::Head.
-#
-class Net::HTTPRequest < Net::HTTPGenericRequest
- # Creates an HTTP request object for +path+.
- #
- # +initheader+ are the default headers to use. Net::HTTP adds
- # Accept-Encoding to enable compression of the response body unless
- # Accept-Encoding or Range are supplied in +initheader+.
-
- def initialize(path, initheader = nil)
- super self.class::METHOD,
- self.class::REQUEST_HAS_BODY,
- self.class::RESPONSE_HAS_BODY,
- path, initheader
- end
-end
-
diff --git a/lib/net/http/requests.rb b/lib/net/http/requests.rb
deleted file mode 100644
index ef719ea6e7..0000000000
--- a/lib/net/http/requests.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# HTTP/1.1 methods --- RFC2616
-#
-
-# See Net::HTTPGenericRequest for attributes and methods.
-# See Net::HTTP for usage examples.
-class Net::HTTP::Get < Net::HTTPRequest
- METHOD = 'GET'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-# See Net::HTTP for usage examples.
-class Net::HTTP::Head < Net::HTTPRequest
- METHOD = 'HEAD'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = false
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-# See Net::HTTP for usage examples.
-class Net::HTTP::Post < Net::HTTPRequest
- METHOD = 'POST'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-# See Net::HTTP for usage examples.
-class Net::HTTP::Put < Net::HTTPRequest
- METHOD = 'PUT'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-# See Net::HTTP for usage examples.
-class Net::HTTP::Delete < Net::HTTPRequest
- METHOD = 'DELETE'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Options < Net::HTTPRequest
- METHOD = 'OPTIONS'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = false
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Trace < Net::HTTPRequest
- METHOD = 'TRACE'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = true
-end
-
-#
-# PATCH method --- RFC5789
-#
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Patch < Net::HTTPRequest
- METHOD = 'PATCH'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-#
-# WebDAV methods --- RFC2518
-#
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Propfind < Net::HTTPRequest
- METHOD = 'PROPFIND'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Proppatch < Net::HTTPRequest
- METHOD = 'PROPPATCH'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Mkcol < Net::HTTPRequest
- METHOD = 'MKCOL'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Copy < Net::HTTPRequest
- METHOD = 'COPY'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Move < Net::HTTPRequest
- METHOD = 'MOVE'
- REQUEST_HAS_BODY = false
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Lock < Net::HTTPRequest
- METHOD = 'LOCK'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
-# See Net::HTTPGenericRequest for attributes and methods.
-class Net::HTTP::Unlock < Net::HTTPRequest
- METHOD = 'UNLOCK'
- REQUEST_HAS_BODY = true
- RESPONSE_HAS_BODY = true
-end
-
diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb
deleted file mode 100644
index 9aaa0b3208..0000000000
--- a/lib/net/http/response.rb
+++ /dev/null
@@ -1,405 +0,0 @@
-# HTTP response class.
-#
-# This class wraps together the response header and the response body (the
-# entity requested).
-#
-# It mixes in the HTTPHeader module, which provides access to response
-# header values both via hash-like methods and via individual readers.
-#
-# 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. For a list of the classes see Net::HTTP.
-#
-#
-class Net::HTTPResponse
- class << self
- # true if the response has a body.
- def body_permitted?
- self::HAS_BODY
- end
-
- def exception_type # :nodoc: internal use only
- self::EXCEPTION_TYPE
- end
-
- def read_new(sock) #:nodoc: internal use only
- httpv, code, msg = read_status_line(sock)
- res = response_class(code).new(httpv, code, msg)
- each_response_header(sock) do |k,v|
- res.add_field k, v
- end
- res
- end
-
- private
-
- def read_status_line(sock)
- str = sock.readline
- m = /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)(?:\s+(.*))?\z/in.match(str) or
- raise Net::HTTPBadResponse, "wrong status line: #{str.dump}"
- m.captures
- end
-
- def response_class(code)
- CODE_TO_OBJ[code] or
- CODE_CLASS_TO_OBJ[code[0,1]] or
- Net::HTTPUnknownResponse
- end
-
- def each_response_header(sock)
- key = value = nil
- while true
- line = sock.readuntil("\n", true).sub(/\s+\z/, '')
- break if line.empty?
- if line[0] == ?\s or line[0] == ?\t and value
- value << ' ' unless value.empty?
- value << line.strip
- else
- yield key, value if key
- key, value = line.strip.split(/\s*:\s*/, 2)
- raise Net::HTTPBadResponse, 'wrong header line format' if value.nil?
- end
- end
- yield key, value if key
- end
- end
-
- # next is to fix bug in RDoc, where the private inside class << self
- # spills out.
- public
-
- include Net::HTTPHeader
-
- def initialize(httpv, code, msg) #:nodoc: internal use only
- @http_version = httpv
- @code = code
- @message = msg
- initialize_http_header nil
- @body = nil
- @read = false
- @uri = nil
- @decode_content = false
- end
-
- # The HTTP version supported by the server.
- attr_reader :http_version
-
- # The HTTP result code string. For example, '302'. You can also
- # determine the response type by examining which response subclass
- # the response object is an instance of.
- attr_reader :code
-
- # The HTTP result message sent by the server. For example, 'Not Found'.
- attr_reader :message
- alias msg message # :nodoc: obsolete
-
- # The URI used to fetch this response. The response URI is only available
- # if a URI was used to create the request.
- attr_reader :uri
-
- # Set to true automatically when the request did not contain an
- # Accept-Encoding header from the user.
- attr_accessor :decode_content
-
- def inspect
- "#<#{self.class} #{@code} #{@message} readbody=#{@read}>"
- end
-
- #
- # response <-> exception relationship
- #
-
- def code_type #:nodoc:
- self.class
- end
-
- def error! #:nodoc:
- raise error_type().new(@code + ' ' + @message.dump, self)
- end
-
- def error_type #:nodoc:
- self.class::EXCEPTION_TYPE
- end
-
- # Raises an HTTP error if the response is not 2xx (success).
- def value
- error! unless self.kind_of?(Net::HTTPSuccess)
- end
-
- def uri= uri # :nodoc:
- @uri = uri.dup if uri
- end
-
- #
- # header (for backward compatibility only; DO NOT USE)
- #
-
- def response #:nodoc:
- warn "#{caller(1)[0]}: warning: Net::HTTPResponse#response is obsolete" if $VERBOSE
- self
- end
-
- def header #:nodoc:
- warn "#{caller(1)[0]}: warning: Net::HTTPResponse#header is obsolete" if $VERBOSE
- self
- end
-
- def read_header #:nodoc:
- warn "#{caller(1)[0]}: warning: Net::HTTPResponse#read_header is obsolete" if $VERBOSE
- self
- end
-
- #
- # body
- #
-
- def reading_body(sock, reqmethodallowbody) #:nodoc: internal use only
- @socket = sock
- @body_exist = reqmethodallowbody && self.class.body_permitted?
- begin
- yield
- self.body # ensure to read body
- ensure
- @socket = nil
- end
- end
-
- # Gets the entity body returned by the remote HTTP server.
- #
- # If a block is given, the body is passed to the block, and
- # the body is provided in fragments, as it is read in from the socket.
- #
- # Calling this method a second or subsequent time for the same
- # HTTPResponse object will return the value already read.
- #
- # http.request_get('/index.html') {|res|
- # puts res.read_body
- # }
- #
- # http.request_get('/index.html') {|res|
- # p res.read_body.object_id # 538149362
- # p res.read_body.object_id # 538149362
- # }
- #
- # # using iterator
- # http.request_get('/index.html') {|res|
- # res.read_body do |segment|
- # print segment
- # end
- # }
- #
- def read_body(dest = nil, &block)
- if @read
- raise IOError, "#{self.class}\#read_body called twice" if dest or block
- return @body
- end
- to = procdest(dest, block)
- stream_check
- if @body_exist
- read_body_0 to
- @body = to
- else
- @body = nil
- end
- @read = true
-
- @body
- end
-
- # Returns the full entity body.
- #
- # Calling this method a second or subsequent time will return the
- # string already read.
- #
- # http.request_get('/index.html') {|res|
- # puts res.body
- # }
- #
- # http.request_get('/index.html') {|res|
- # p res.body.object_id # 538149362
- # p res.body.object_id # 538149362
- # }
- #
- def body
- 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
-
- ##
- # Checks for a supported Content-Encoding header and yields an Inflate
- # wrapper for this response's socket when zlib is present. If the
- # Content-Encoding is unsupported or zlib is missing the plain socket is
- # yielded.
- #
- # If a Content-Range header is present a plain socket is yielded as the
- # bytes in the range may not be a complete deflate block.
-
- def inflater # :nodoc:
- return yield @socket unless Net::HTTP::HAVE_ZLIB
- return yield @socket unless @decode_content
- return yield @socket if self['content-range']
-
- case self['content-encoding']
- when 'deflate', 'gzip', 'x-gzip' then
- self.delete 'content-encoding'
-
- inflate_body_io = Inflater.new(@socket)
-
- begin
- yield inflate_body_io
- ensure
- inflate_body_io.finish
- end
- when 'none', 'identity' then
- self.delete 'content-encoding'
-
- yield @socket
- else
- yield @socket
- end
- end
-
- def read_body_0(dest)
- inflater do |inflate_body_io|
- if chunked?
- read_chunked dest, inflate_body_io
- return
- end
-
- @socket = inflate_body_io
-
- clen = content_length()
- if clen
- @socket.read clen, dest, true # ignore EOF
- return
- end
- clen = range_length()
- if clen
- @socket.read clen, dest
- return
- end
- @socket.read_all dest
- end
- end
-
- ##
- # read_chunked reads from +@socket+ for chunk-size, chunk-extension, CRLF,
- # etc. and +chunk_data_io+ for chunk-data which may be deflate or gzip
- # encoded.
- #
- # See RFC 2616 section 3.6.1 for definitions
-
- def read_chunked(dest, chunk_data_io) # :nodoc:
- len = nil
- total = 0
- while true
- line = @socket.readline
- hexlen = line.slice(/[0-9a-fA-F]+/) or
- raise Net::HTTPBadResponse, "wrong chunk size line: #{line}"
- len = hexlen.hex
- break if len == 0
- begin
- chunk_data_io.read len, dest
- ensure
- total += len
- @socket.read 2 # \r\n
- end
- end
- until @socket.readline.empty?
- # none
- end
- end
-
- def stream_check
- raise IOError, 'attempt to read body out of block' if @socket.closed?
- end
-
- def procdest(dest, block)
- raise ArgumentError, 'both arg and block given for HTTP method' if
- dest and block
- if block
- Net::ReadAdapter.new(block)
- else
- dest || ''
- end
- end
-
- ##
- # Inflater is a wrapper around Net::BufferedIO that transparently inflates
- # zlib and gzip streams.
-
- class Inflater # :nodoc:
-
- ##
- # Creates a new Inflater wrapping +socket+
-
- def initialize socket
- @socket = socket
- # zlib with automatic gzip detection
- @inflate = Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
- end
-
- ##
- # Finishes the inflate stream.
-
- def finish
- @inflate.finish
- end
-
- ##
- # Returns a Net::ReadAdapter that inflates each read chunk into +dest+.
- #
- # This allows a large response body to be inflated without storing the
- # entire body in memory.
-
- def inflate_adapter(dest)
- block = proc do |compressed_chunk|
- @inflate.inflate(compressed_chunk) do |chunk|
- dest << chunk
- end
- end
-
- Net::ReadAdapter.new(block)
- end
-
- ##
- # Reads +clen+ bytes from the socket, inflates them, then writes them to
- # +dest+. +ignore_eof+ is passed down to Net::BufferedIO#read
- #
- # Unlike Net::BufferedIO#read, this method returns more than +clen+ bytes.
- # At this time there is no way for a user of Net::HTTPResponse to read a
- # specific number of bytes from the HTTP response body, so this internal
- # API does not return the same number of bytes as were requested.
- #
- # See https://bugs.ruby-lang.org/issues/6492 for further discussion.
-
- def read clen, dest, ignore_eof = false
- temp_dest = inflate_adapter(dest)
-
- @socket.read clen, temp_dest, ignore_eof
- end
-
- ##
- # Reads the rest of the socket, inflates it, then writes it to +dest+.
-
- def read_all dest
- temp_dest = inflate_adapter(dest)
-
- @socket.read_all temp_dest
- end
-
- end
-
-end
-
diff --git a/lib/net/http/responses.rb b/lib/net/http/responses.rb
deleted file mode 100644
index 38a5da2443..0000000000
--- a/lib/net/http/responses.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-# :stopdoc:
-class Net::HTTPUnknownResponse < Net::HTTPResponse
- HAS_BODY = true
- EXCEPTION_TYPE = Net::HTTPError
-end
-class Net::HTTPInformation < Net::HTTPResponse # 1xx
- HAS_BODY = false
- EXCEPTION_TYPE = Net::HTTPError
-end
-class Net::HTTPSuccess < Net::HTTPResponse # 2xx
- HAS_BODY = true
- EXCEPTION_TYPE = Net::HTTPError
-end
-class Net::HTTPRedirection < Net::HTTPResponse # 3xx
- HAS_BODY = true
- EXCEPTION_TYPE = Net::HTTPRetriableError
-end
-class Net::HTTPClientError < Net::HTTPResponse # 4xx
- HAS_BODY = true
- EXCEPTION_TYPE = Net::HTTPServerException # for backward compatibility
-end
-class Net::HTTPServerError < Net::HTTPResponse # 5xx
- HAS_BODY = true
- EXCEPTION_TYPE = Net::HTTPFatalError # for backward compatibility
-end
-
-class Net::HTTPContinue < Net::HTTPInformation # 100
- HAS_BODY = false
-end
-class Net::HTTPSwitchProtocol < Net::HTTPInformation # 101
- HAS_BODY = false
-end
-# 102 - RFC 2518; removed in RFC 4918
-
-class Net::HTTPOK < Net::HTTPSuccess # 200
- HAS_BODY = true
-end
-class Net::HTTPCreated < Net::HTTPSuccess # 201
- HAS_BODY = true
-end
-class Net::HTTPAccepted < Net::HTTPSuccess # 202
- HAS_BODY = true
-end
-class Net::HTTPNonAuthoritativeInformation < Net::HTTPSuccess # 203
- HAS_BODY = true
-end
-class Net::HTTPNoContent < Net::HTTPSuccess # 204
- HAS_BODY = false
-end
-class Net::HTTPResetContent < Net::HTTPSuccess # 205
- HAS_BODY = false
-end
-class Net::HTTPPartialContent < Net::HTTPSuccess # 206
- HAS_BODY = true
-end
-class Net::HTTPMultiStatus < Net::HTTPSuccess # 207 - RFC 4918
- HAS_BODY = true
-end
-# 208 Already Reported - RFC 5842; experimental
-# 226 IM Used - RFC 3229; no famous implementation known
-
-class Net::HTTPMultipleChoices < Net::HTTPRedirection # 300
- HAS_BODY = true
-end
-Net::HTTPMultipleChoice = Net::HTTPMultipleChoices
-class Net::HTTPMovedPermanently < Net::HTTPRedirection # 301
- HAS_BODY = true
-end
-class Net::HTTPFound < Net::HTTPRedirection # 302
- HAS_BODY = true
-end
-Net::HTTPMovedTemporarily = Net::HTTPFound
-class Net::HTTPSeeOther < Net::HTTPRedirection # 303
- HAS_BODY = true
-end
-class Net::HTTPNotModified < Net::HTTPRedirection # 304
- HAS_BODY = false
-end
-class Net::HTTPUseProxy < Net::HTTPRedirection # 305
- HAS_BODY = false
-end
-# 306 Switch Proxy - no longer unused
-class Net::HTTPTemporaryRedirect < Net::HTTPRedirection # 307
- HAS_BODY = true
-end
-# 308 Permanent Redirect - in draft
-
-class Net::HTTPBadRequest < Net::HTTPClientError # 400
- HAS_BODY = true
-end
-class Net::HTTPUnauthorized < Net::HTTPClientError # 401
- HAS_BODY = true
-end
-class Net::HTTPPaymentRequired < Net::HTTPClientError # 402
- HAS_BODY = true
-end
-class Net::HTTPForbidden < Net::HTTPClientError # 403
- HAS_BODY = true
-end
-class Net::HTTPNotFound < Net::HTTPClientError # 404
- HAS_BODY = true
-end
-class Net::HTTPMethodNotAllowed < Net::HTTPClientError # 405
- HAS_BODY = true
-end
-class Net::HTTPNotAcceptable < Net::HTTPClientError # 406
- HAS_BODY = true
-end
-class Net::HTTPProxyAuthenticationRequired < Net::HTTPClientError # 407
- HAS_BODY = true
-end
-class Net::HTTPRequestTimeOut < Net::HTTPClientError # 408
- HAS_BODY = true
-end
-class Net::HTTPConflict < Net::HTTPClientError # 409
- HAS_BODY = true
-end
-class Net::HTTPGone < Net::HTTPClientError # 410
- HAS_BODY = true
-end
-class Net::HTTPLengthRequired < Net::HTTPClientError # 411
- HAS_BODY = true
-end
-class Net::HTTPPreconditionFailed < Net::HTTPClientError # 412
- HAS_BODY = true
-end
-class Net::HTTPRequestEntityTooLarge < Net::HTTPClientError # 413
- HAS_BODY = true
-end
-class Net::HTTPRequestURITooLong < Net::HTTPClientError # 414
- HAS_BODY = true
-end
-Net::HTTPRequestURITooLarge = Net::HTTPRequestURITooLong
-class Net::HTTPUnsupportedMediaType < Net::HTTPClientError # 415
- HAS_BODY = true
-end
-class Net::HTTPRequestedRangeNotSatisfiable < Net::HTTPClientError # 416
- HAS_BODY = true
-end
-class Net::HTTPExpectationFailed < Net::HTTPClientError # 417
- HAS_BODY = true
-end
-# 418 I'm a teapot - RFC 2324; a joke RFC
-# 420 Enhance Your Calm - Twitter
-class Net::HTTPUnprocessableEntity < Net::HTTPClientError # 422 - RFC 4918
- HAS_BODY = true
-end
-class Net::HTTPLocked < Net::HTTPClientError # 423 - RFC 4918
- HAS_BODY = true
-end
-class Net::HTTPFailedDependency < Net::HTTPClientError # 424 - RFC 4918
- HAS_BODY = true
-end
-# 425 Unordered Collection - existed only in draft
-class Net::HTTPUpgradeRequired < Net::HTTPClientError # 426 - RFC 2817
- HAS_BODY = true
-end
-class Net::HTTPPreconditionRequired < Net::HTTPClientError # 428 - RFC 6585
- HAS_BODY = true
-end
-class Net::HTTPTooManyRequests < Net::HTTPClientError # 429 - RFC 6585
- HAS_BODY = true
-end
-class Net::HTTPRequestHeaderFieldsTooLarge < Net::HTTPClientError # 431 - RFC 6585
- HAS_BODY = true
-end
-# 444 No Response - Nginx
-# 449 Retry With - Microsoft
-# 450 Blocked by Windows Parental Controls - Microsoft
-# 499 Client Closed Request - Nginx
-
-class Net::HTTPInternalServerError < Net::HTTPServerError # 500
- HAS_BODY = true
-end
-class Net::HTTPNotImplemented < Net::HTTPServerError # 501
- HAS_BODY = true
-end
-class Net::HTTPBadGateway < Net::HTTPServerError # 502
- HAS_BODY = true
-end
-class Net::HTTPServiceUnavailable < Net::HTTPServerError # 503
- HAS_BODY = true
-end
-class Net::HTTPGatewayTimeOut < Net::HTTPServerError # 504
- HAS_BODY = true
-end
-class Net::HTTPVersionNotSupported < Net::HTTPServerError # 505
- HAS_BODY = true
-end
-# 506 Variant Also Negotiates - RFC 2295; experimental
-class Net::HTTPInsufficientStorage < Net::HTTPServerError # 507 - RFC 4918
- HAS_BODY = true
-end
-# 508 Loop Detected - RFC 5842; experimental
-# 509 Bandwidth Limit Exceeded - Apache bw/limited extension
-# 510 Not Extended - RFC 2774; experimental
-class Net::HTTPNetworkAuthenticationRequired < Net::HTTPServerError # 511 - RFC 6585
- HAS_BODY = true
-end
-
-class Net::HTTPResponse
- CODE_CLASS_TO_OBJ = {
- '1' => Net::HTTPInformation,
- '2' => Net::HTTPSuccess,
- '3' => Net::HTTPRedirection,
- '4' => Net::HTTPClientError,
- '5' => Net::HTTPServerError
- }
- CODE_TO_OBJ = {
- '100' => Net::HTTPContinue,
- '101' => Net::HTTPSwitchProtocol,
-
- '200' => Net::HTTPOK,
- '201' => Net::HTTPCreated,
- '202' => Net::HTTPAccepted,
- '203' => Net::HTTPNonAuthoritativeInformation,
- '204' => Net::HTTPNoContent,
- '205' => Net::HTTPResetContent,
- '206' => Net::HTTPPartialContent,
- '207' => Net::HTTPMultiStatus,
-
- '300' => Net::HTTPMultipleChoices,
- '301' => Net::HTTPMovedPermanently,
- '302' => Net::HTTPFound,
- '303' => Net::HTTPSeeOther,
- '304' => Net::HTTPNotModified,
- '305' => Net::HTTPUseProxy,
- '307' => Net::HTTPTemporaryRedirect,
-
- '400' => Net::HTTPBadRequest,
- '401' => Net::HTTPUnauthorized,
- '402' => Net::HTTPPaymentRequired,
- '403' => Net::HTTPForbidden,
- '404' => Net::HTTPNotFound,
- '405' => Net::HTTPMethodNotAllowed,
- '406' => Net::HTTPNotAcceptable,
- '407' => Net::HTTPProxyAuthenticationRequired,
- '408' => Net::HTTPRequestTimeOut,
- '409' => Net::HTTPConflict,
- '410' => Net::HTTPGone,
- '411' => Net::HTTPLengthRequired,
- '412' => Net::HTTPPreconditionFailed,
- '413' => Net::HTTPRequestEntityTooLarge,
- '414' => Net::HTTPRequestURITooLong,
- '415' => Net::HTTPUnsupportedMediaType,
- '416' => Net::HTTPRequestedRangeNotSatisfiable,
- '417' => Net::HTTPExpectationFailed,
- '422' => Net::HTTPUnprocessableEntity,
- '423' => Net::HTTPLocked,
- '424' => Net::HTTPFailedDependency,
- '426' => Net::HTTPUpgradeRequired,
- '428' => Net::HTTPPreconditionRequired,
- '429' => Net::HTTPTooManyRequests,
- '431' => Net::HTTPRequestHeaderFieldsTooLarge,
-
- '500' => Net::HTTPInternalServerError,
- '501' => Net::HTTPNotImplemented,
- '502' => Net::HTTPBadGateway,
- '503' => Net::HTTPServiceUnavailable,
- '504' => Net::HTTPGatewayTimeOut,
- '505' => Net::HTTPVersionNotSupported,
- '507' => Net::HTTPInsufficientStorage,
- '511' => Net::HTTPNetworkAuthenticationRequired,
- }
-end
-
-# :startdoc:
-
diff --git a/lib/net/https.rb b/lib/net/https.rb
index d36f82002d..7454279508 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -2,11 +2,6 @@
= net/https -- SSL/TLS enhancement for Net::HTTP.
- This file has been merged with net/http. There is no longer any need to
- require 'net/https' to use HTTPS.
-
- See Net::HTTP for details on how to make HTTPS connections.
-
== Info
'OpenSSL for Ruby 2' project
Copyright (C) 2001 GOTOU Yuuzou <gotoyuzo@notwork.org>
@@ -16,6 +11,81 @@
This program is licenced under the same licence as Ruby.
(See the file 'LICENCE'.)
+== Example
+
+Here is a simple HTTP client:
+
+ require 'net/http'
+ require 'uri'
+
+ uri = URI.parse(ARGV[0] || 'http://localhost/')
+ http = Net::HTTP.new(uri.host, uri.port)
+ http.start {
+ http.request_get(uri.path) {|res|
+ print res.body
+ }
+ }
+
+It can be replaced by the following code:
+
+ require 'net/https'
+ require 'uri'
+
+ uri = URI.parse(ARGV[0] || 'https://localhost/')
+ http = Net::HTTP.new(uri.host, uri.port)
+ http.use_ssl = true if uri.scheme == "https" # enable SSL/TLS
+ http.start {
+ http.request_get(uri.path) {|res|
+ print res.body
+ }
+ }
+
+== class Net::HTTP
+
+=== Instance Methods
+
+: use_ssl?
+ returns true if use SSL/TLS with HTTP.
+
+: use_ssl=((|true_or_false|))
+ sets use_ssl.
+
+: peer_cert
+ return the X.509 certificates the server presented.
+
+: key, key=((|key|))
+ Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
+ (This method is appeared in Michal Rokos's OpenSSL extension.)
+
+: cert, cert=((|cert|))
+ Sets an OpenSSL::X509::Certificate object as client certificate
+ (This method is appeared in Michal Rokos's OpenSSL extension).
+
+: ca_file, ca_file=((|path|))
+ Sets path of a CA certification file in PEM format.
+ The file can contrain several CA certificates.
+
+: ca_path, ca_path=((|path|))
+ Sets path of a CA certification directory containing certifications
+ in PEM format.
+
+: verify_mode, verify_mode=((|mode|))
+ Sets the flags for server the certification verification at
+ beginning of SSL/TLS session.
+ OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable.
+
+: verify_callback, verify_callback=((|proc|))
+ Sets the verify callback for the server certification verification.
+
+: verify_depth, verify_depth=((|num|))
+ Sets the maximum depth for the certificate chain verification.
+
+: cert_store, cert_store=((|store|))
+ Sets the X509::Store to verify peer certificate.
+
+: ssl_timeout, ssl_timeout=((|sec|))
+ Sets the SSL timeout seconds.
+
=end
require 'net/http'
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 1bb0b81eec..f28c99e679 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -200,7 +200,7 @@ module Net
#
class IMAP
include MonitorMixin
- if defined?(OpenSSL::SSL)
+ if defined?(OpenSSL)
include OpenSSL
include SSL
end
@@ -295,22 +295,6 @@ module Net
@@authenticators[auth_type] = authenticator
end
- # The default port for IMAP connections, port 143
- def self.default_port
- return PORT
- end
-
- # The default port for IMAPS connections, port 993
- def self.default_tls_port
- return SSL_PORT
- end
-
- class << self
- alias default_imap_port default_port
- alias default_imaps_port default_tls_port
- alias default_ssl_port default_tls_port
- end
-
# Disconnects from the server.
def disconnect
begin
@@ -329,7 +313,7 @@ module Net
@receiver_thread.join
synchronize do
unless @sock.closed?
- @sock.close
+ @sock.close
end
end
raise e if e
@@ -544,38 +528,6 @@ module Net
end
end
- # Sends a XLIST command, and returns a subset of names from
- # the complete set of all names available to the client.
- # +refname+ provides a context (for instance, a base directory
- # in a directory-based mailbox hierarchy). +mailbox+ specifies
- # a mailbox or (via wildcards) mailboxes under that context.
- # Two wildcards may be used in +mailbox+: '*', which matches
- # all characters *including* the hierarchy delimiter (for instance,
- # '/' on a UNIX-hosted directory-based mailbox hierarchy); and '%',
- # which matches all characters *except* the hierarchy delimiter.
- #
- # If +refname+ is empty, +mailbox+ is used directly to determine
- # which mailboxes to match. If +mailbox+ is empty, the root
- # name of +refname+ and the hierarchy delimiter are returned.
- #
- # The XLIST command is like the LIST command except that the flags
- # returned refer to the function of the folder/mailbox, e.g. :Sent
- #
- # The return value is an array of +Net::IMAP::MailboxList+. For example:
- #
- # imap.create("foo/bar")
- # imap.create("foo/baz")
- # p imap.xlist("", "foo/%")
- # #=> [#<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 xlist(refname, mailbox)
- synchronize do
- send_command("XLIST", refname, mailbox)
- return @responses.delete("XLIST")
- end
- end
-
# Sends the GETQUOTAROOT command along with specified +mailbox+.
# This command is generally available to both admin and user.
# If mailbox exists, returns an array containing objects of
@@ -921,15 +873,10 @@ module Net
@idle_done_cond = new_cond
@idle_done_cond.wait
@idle_done_cond = nil
- if @receiver_thread_terminating
- raise Net::IMAP::Error, "connection closed"
- end
ensure
- unless @receiver_thread_terminating
- remove_response_handler(response_handler)
- put_string("DONE#{CRLF}")
- response = get_tagged_response(tag, "IDLE")
- end
+ remove_response_handler(response_handler)
+ put_string("DONE#{CRLF}")
+ response = get_tagged_response(tag, "IDLE")
end
end
@@ -955,22 +902,27 @@ module Net
# Net::IMAP does _not_ automatically encode and decode
# mailbox names to and from utf7.
def self.decode_utf7(s)
- return s.gsub(/&([^-]+)?-/n) {
- if $1
- ($1.tr(",", "/") + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
- else
+ return s.gsub(/&(.*?)-/n) {
+ if $1.empty?
"&"
+ else
+ base64 = $1.tr(",", "/")
+ x = base64.length % 4
+ if x > 0
+ base64.concat("=" * (4 - x))
+ end
+ base64.unpack("m")[0].unpack("n*").pack("U*")
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-\x7e]+/) {
+ return s.gsub(/(&)|([^\x20-\x7e]+)/u) {
if $1
"&-"
else
- base64 = [$&.encode(Encoding::UTF_16BE)].pack("m")
+ base64 = [$&.unpack("U*").pack("n*")].pack("m")
"&" + base64.delete("=\n").tr("/", ",") + "-"
end
}.force_encoding("ASCII-8BIT")
@@ -996,7 +948,7 @@ module Net
@@authenticators = {}
@@max_flag_count = 10000
- # :call-seq:
+ # call-seq:
# Net::IMAP.new(host, options = {})
#
# Creates a new Net::IMAP object and connects it to the specified
@@ -1060,10 +1012,6 @@ module Net
@exception = nil
@greeting = get_response
- if @greeting.nil?
- @sock.close
- raise Error, "connection closed"
- end
if @greeting.name == "BYE"
@sock.close
raise ByeResponseError, @greeting
@@ -1076,7 +1024,6 @@ module Net
rescue Exception
end
}
- @receiver_thread_terminating = false
end
def receive_responses
@@ -1136,12 +1083,8 @@ module Net
end
end
synchronize do
- @receiver_thread_terminating = true
@tagged_response_arrival.broadcast
@continuation_request_arrival.broadcast
- if @idle_done_cond
- @idle_done_cond.signal
- end
end
end
@@ -1433,7 +1376,7 @@ module Net
end
def start_tls_session(params = {})
- unless defined?(OpenSSL::SSL)
+ unless defined?(OpenSSL)
raise "SSL extension not installed"
end
if @sock.kind_of?(OpenSSL::SSL::SSLSocket)
@@ -1740,7 +1683,7 @@ module Net
# rights:: The access rights the indicated user has to the
# mailbox.
#
- MailboxACLItem = Struct.new(:user, :rights, :mailbox)
+ MailboxACLItem = Struct.new(:user, :rights)
# Net::IMAP::StatusData represents contents of the STATUS response.
#
@@ -1972,26 +1915,6 @@ module Net
end
end
- # Net::IMAP::BodyTypeAttachment represents attachment body structures
- # of messages.
- #
- # ==== Fields:
- #
- # media_type:: Returns the content media type name.
- #
- # subtype:: Returns +nil+.
- #
- # param:: Returns a hash that represents parameters.
- #
- # multipart?:: Returns false.
- #
- class BodyTypeAttachment < Struct.new(:media_type, :subtype,
- :param)
- def multipart?
- return false
- end
- end
-
# Net::IMAP::BodyTypeMultipart represents multipart body structures
# of messages.
#
@@ -2033,14 +1956,6 @@ module Net
end
end
- class BodyTypeExtension < Struct.new(:media_type, :subtype,
- :params, :content_id,
- :description, :encoding, :size)
- def multipart?
- return false
- end
- end
-
class ResponseParser # :nodoc:
def initialize
@str = nil
@@ -2086,9 +2001,9 @@ module Net
BEG_REGEXP = /\G(?:\
(?# 1: SPACE )( +)|\
-(?# 2: NIL )(NIL)(?=[\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+])|\
-(?# 3: NUMBER )(\d+)(?=[\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+])|\
-(?# 4: ATOM )([^\x80-\xff(){ \x00-\x1f\x7f%*#{'"'}\\\[\]+]+)|\
+(?# 2: NIL )(NIL)(?=[\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+])|\
+(?# 3: NUMBER )(\d+)(?=[\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+])|\
+(?# 4: ATOM )([^\x80-\xff(){ \x00-\x1f\x7f%*"\\\[\]+]+)|\
(?# 5: QUOTED )"((?:[^\x00\r\n"\\]|\\["\\])*)"|\
(?# 6: LPAR )(\()|\
(?# 7: RPAR )(\))|\
@@ -2156,7 +2071,7 @@ module Net
return response_cond
when /\A(?:FLAGS)\z/ni
return flags_response
- when /\A(?:LIST|LSUB|XLIST)\z/ni
+ when /\A(?:LIST|LSUB)\z/ni
return list_response
when /\A(?:QUOTA)\z/ni
return getquota_response
@@ -2207,12 +2122,12 @@ module Net
when "FETCH"
shift_token
match(T_SPACE)
- data = FetchData.new(n, msg_att(n))
+ data = FetchData.new(n, msg_att)
return UntaggedResponse.new(name, data, @str)
end
end
- def msg_att(n)
+ def msg_att
match(T_LPAR)
attr = {}
while true
@@ -2223,7 +2138,7 @@ module Net
break
when T_SPACE
shift_token
- next
+ token = lookahead
end
case token.value
when /\A(?:ENVELOPE)\z/ni
@@ -2241,7 +2156,7 @@ module Net
when /\A(?:UID)\z/ni
name, val = uid_data
else
- parse_error("unknown attribute `%s' for {%d}", token.value, n)
+ parse_error("unknown attribute `%s'", token.value)
end
attr[name] = val
end
@@ -2308,11 +2223,6 @@ module Net
def rfc822_text
token = match(T_ATOM)
name = token.value.upcase
- token = lookahead
- if token.symbol == T_LBRA
- shift_token
- match(T_RBRA)
- end
match(T_SPACE)
return name, nstring
end
@@ -2370,10 +2280,6 @@ module Net
return body_type_text
when /\A(?:MESSAGE)\z/ni
return body_type_msg
- when /\A(?:ATTACHMENT)\z/ni
- return body_type_attachment
- when /\A(?:MIXED)\z/ni
- return body_type_mixed
else
return body_type_basic
end
@@ -2412,29 +2318,6 @@ module Net
mtype, msubtype = media_type
match(T_SPACE)
param, content_id, desc, enc, size = body_fields
-
- token = lookahead
- if token.symbol == T_RPAR
- # If this is not message/rfc822, we shouldn't apply the RFC822
- # spec to it. We should handle anything other than
- # message/rfc822 using multipart extension data [rfc3501] (i.e.
- # the data itself won't be returned, we would have to retrieve it
- # with BODYSTRUCTURE instead of with BODY
-
- # Also, sometimes a message/rfc822 is included as a large
- # attachment instead of having all of the other details
- # (e.g. attaching a .eml file to an email)
- if msubtype == "RFC822"
- return BodyTypeMessage.new(mtype, msubtype, param, content_id,
- desc, enc, size, nil, nil, nil, nil,
- nil, nil, nil)
- else
- return BodyTypeExtension.new(mtype, msubtype,
- param, content_id,
- desc, enc, size)
- end
- end
-
match(T_SPACE)
env = envelope
match(T_SPACE)
@@ -2449,20 +2332,6 @@ module Net
md5, disposition, language, extension)
end
- def body_type_attachment
- mtype = case_insensitive_string
- match(T_SPACE)
- param = body_fld_param
- return BodyTypeAttachment.new(mtype, nil, param)
- end
-
- def body_type_mixed
- mtype = "MULTIPART"
- msubtype = case_insensitive_string
- param, disposition, language, extension = body_ext_mpart
- return BodyTypeBasic.new(mtype, msubtype, param, nil, nil, nil, nil, nil, disposition, language, extension)
- end
-
def body_type_mpart
parts = []
while true
@@ -2483,10 +2352,6 @@ module Net
def media_type
mtype = case_insensitive_string
- token = lookahead
- if token.symbol != T_SPACE
- return mtype, nil
- end
match(T_SPACE)
msubtype = case_insensitive_string
return mtype, msubtype
@@ -2831,7 +2696,8 @@ module Net
user = astring
match(T_SPACE)
rights = astring
- data.push(MailboxACLItem.new(user, rights, mailbox))
+ ##XXX data.push([user, rights])
+ data.push(MailboxACLItem.new(user, rights))
end
end
return UntaggedResponse.new(name, data, @str)
@@ -2851,9 +2717,8 @@ module Net
break
when T_SPACE
shift_token
- else
- data.push(number)
end
+ data.push(number)
end
else
data = []
@@ -2962,7 +2827,6 @@ module Net
break
when T_SPACE
shift_token
- next
end
data.push(atom.upcase)
end
@@ -3452,73 +3316,73 @@ module Net
# #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
+ 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
+ @user, @password, @authname = user, password, authname
+ @nc, @stage = {}, STAGE_ONE
end
private
@@ -3527,23 +3391,23 @@ module Net
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]
+ 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
+ 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
@@ -3607,44 +3471,27 @@ if __FILE__ == $0
$user = ENV["USER"] || ENV["LOGNAME"]
$auth = "login"
$ssl = false
- $starttls = false
def usage
- <<EOF
+ $stderr.print <<EOF
usage: #{$0} [options] <host>
--help print this message
--port=PORT specifies port
--user=USER specifies user
--auth=AUTH specifies auth type
- --starttls use starttls
--ssl use ssl
EOF
end
- begin
- require 'io/console'
- rescue LoadError
- def _noecho(&block)
- system("stty", "-echo")
- begin
- yield STDIN
- ensure
- system("stty", "echo")
- end
- end
- else
- def _noecho(&block)
- STDIN.noecho(&block)
- end
- end
-
def get_password
print "password: "
+ system("stty", "-echo")
begin
- return _noecho(&:gets).chomp
+ return gets.chop
ensure
- puts
+ system("stty", "echo")
+ print "\n"
end
end
@@ -3663,7 +3510,6 @@ EOF
['--port', GetoptLong::REQUIRED_ARGUMENT],
['--user', GetoptLong::REQUIRED_ARGUMENT],
['--auth', GetoptLong::REQUIRED_ARGUMENT],
- ['--starttls', GetoptLong::NO_ARGUMENT],
['--ssl', GetoptLong::NO_ARGUMENT])
begin
parser.each_option do |name, arg|
@@ -3676,30 +3522,27 @@ EOF
$auth = arg
when "--ssl"
$ssl = true
- when "--starttls"
- $starttls = true
when "--debug"
Net::IMAP.debug = true
when "--help"
usage
- exit
+ exit(1)
end
end
rescue
- abort usage
+ usage
+ exit(1)
end
$host = ARGV.shift
unless $host
- abort usage
+ usage
+ exit(1)
end
imap = Net::IMAP.new($host, :port => $port, :ssl => $ssl)
begin
- imap.starttls if $starttls
- class << password = method(:get_password)
- alias to_str call
- end
+ password = get_password
imap.authenticate($auth, $user, password)
while true
cmd, *args = get_command
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index ebf1085d55..6a45e3b5f0 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -42,6 +42,8 @@ module Net
class POPBadResponse < POPError; end
#
+ # = Net::POP3
+ #
# == What is This Library?
#
# This library provides functionality for retrieving
@@ -194,14 +196,12 @@ module Net
#
class POP3 < Protocol
- # svn revision of this library
Revision = %q$Revision$.split[1]
#
# Class Parameters
#
- # returns the port for POP3
def POP3.default_port
default_pop3_port()
end
@@ -324,7 +324,7 @@ module Net
@ssl_params = nil
- # :call-seq:
+ # call-seq:
# Net::POP.enable_ssl(params = {})
#
# Enable SSL for all new instances.
@@ -333,7 +333,6 @@ module Net
@ssl_params = create_ssl_params(*args)
end
- # Constructs proper parameters from arguments
def POP3.create_ssl_params(verify_or_params = {}, certs = nil)
begin
params = verify_or_params.to_hash
@@ -356,24 +355,18 @@ module Net
@ssl_params = nil
end
- # returns the SSL Parameters
- #
- # see also POP3.enable_ssl
def POP3.ssl_params
return @ssl_params
end
- # returns +true+ if POP3.ssl_params is set
def POP3.use_ssl?
return !@ssl_params.nil?
end
- # returns whether verify_mode is enable from POP3.ssl_params
def POP3.verify
return @ssl_params[:verify_mode]
end
- # returns the :ca_file or :ca_path from POP3.ssl_params
def POP3.certs
return @ssl_params[:ca_file] || @ssl_params[:ca_path]
end
@@ -442,7 +435,7 @@ module Net
return !@ssl_params.nil?
end
- # :call-seq:
+ # call-seq:
# Net::POP#enable_ssl(params = {})
#
# Enables SSL for this instance. Must be called before the connection is
@@ -459,7 +452,6 @@ module Net
end
end
- # Disable SSL for all new instances.
def disable_ssl
@ssl_params = nil
end
@@ -496,12 +488,12 @@ module Net
# Seconds to wait until a connection is opened.
# If the POP3 object cannot open a connection within this time,
- # it raises a Net::OpenTimeout exception. The default value is 30 seconds.
+ # it raises a TimeoutError exception.
attr_accessor :open_timeout
# Seconds to wait until reading one block (by one read(1) call).
# If the POP3 object cannot complete a read() within this time,
- # it raises a Net::ReadTimeout exception. The default value is 60 seconds.
+ # it raises a TimeoutError exception.
attr_reader :read_timeout
# Set the read timeout.
@@ -538,11 +530,8 @@ module Net
end
end
- # internal method for Net::POP3.start
- def do_start(account, password) # :nodoc:
- s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
- TCPSocket.open(@address, port)
- end
+ def do_start(account, password)
+ s = timeout(@open_timeout) { TCPSocket.open(@address, port) }
if use_ssl?
raise 'openssl library not installed' unless defined?(OpenSSL)
context = OpenSSL::SSL::SSLContext.new
@@ -576,8 +565,7 @@ module Net
end
private :do_start
- # Does nothing
- def on_connect # :nodoc:
+ def on_connect
end
private :on_connect
@@ -587,12 +575,7 @@ module Net
do_finish
end
- # nil's out the:
- # - mails
- # - number counter for mails
- # - number counter for bytes
- # - quits the current command, if any
- def do_finish # :nodoc:
+ def do_finish
@mails = nil
@n_mails = nil
@n_bytes = nil
@@ -605,10 +588,7 @@ module Net
end
private :do_finish
- # Returns the current command.
- #
- # Raises IOError if there is no active socket
- def command # :nodoc:
+ def command
raise IOError, 'POP session not opened yet' \
if not @socket or @socket.closed?
@command
@@ -707,7 +687,6 @@ module Net
@mails.each {|m| m.uid = uidl[m.number] }
end
- # deguging output for +msg+
def logging(msg)
@debug_output << msg + "\n" if @debug_output
end
@@ -715,9 +694,9 @@ module Net
end # class POP3
# class aliases
- POP = POP3 # :nodoc:
- POPSession = POP3 # :nodoc:
- POP3Session = POP3 # :nodoc:
+ POP = POP3
+ POPSession = POP3
+ POP3Session = POP3
#
# This class is equivalent to POP3, except that it uses APOP authentication.
@@ -889,7 +868,7 @@ module Net
def initialize(sock)
@socket = sock
- @error_occurred = false
+ @error_occured = false
res = check_response(critical { recv_response() })
@apop_stamp = res.slice(/<[!-~]+@[!-~]+>/)
end
@@ -1007,11 +986,11 @@ module Net
end
def critical
- return '+OK dummy ok response' if @error_occurred
+ return '+OK dummy ok response' if @error_occured
begin
return yield()
rescue Exception
- @error_occurred = true
+ @error_occured = true
raise
end
end
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 25477014fb..2a6cfb4f61 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -45,41 +45,23 @@ module Net # :nodoc:
class ProtoRetriableError < ProtocolError; end
ProtocRetryError = ProtoRetriableError
- ##
- # OpenTimeout, a subclass of Timeout::Error, is raised if a connection cannot
- # be created within the open_timeout.
-
- class OpenTimeout < Timeout::Error; end
-
- ##
- # ReadTimeout, a subclass of Timeout::Error, is raised if a chunk of the
- # response cannot be read within the read_timeout.
-
- class ReadTimeout < Timeout::Error; end
-
class BufferedIO #:nodoc: internal use only
def initialize(io)
@io = io
@read_timeout = 60
- @continue_timeout = nil
@debug_output = nil
@rbuf = ''
end
attr_reader :io
attr_accessor :read_timeout
- attr_accessor :continue_timeout
attr_accessor :debug_output
def inspect
"#<#{self.class} io=#{@io}>"
end
- def eof?
- @io.eof?
- end
-
def closed?
@io.closed?
end
@@ -155,7 +137,7 @@ module Net # :nodoc:
if IO.select([@io], nil, nil, @read_timeout)
retry
else
- raise Net::ReadTimeout
+ raise Timeout::Error
end
rescue IO::WaitWritable
# OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
@@ -163,7 +145,7 @@ module Net # :nodoc:
if IO.select(nil, [@io], nil, @read_timeout)
retry
else
- raise Net::ReadTimeout
+ raise Timeout::Error
end
end
end
@@ -186,8 +168,6 @@ module Net # :nodoc:
}
end
- alias << write
-
def writeline(str)
writing {
write0 str + "\r\n"
@@ -267,7 +247,7 @@ module Net # :nodoc:
def write_message_0(src)
prev = @written_bytes
each_crlf_line(src) do |line|
- write0 dot_stuff(line)
+ write0 line.sub(/\A\./, '..')
end
@written_bytes - prev
end
@@ -308,15 +288,11 @@ module Net # :nodoc:
private
- def dot_stuff(s)
- s.sub(/\A\./, '..')
- end
-
def using_each_crlf_line
@wbuf = ''
yield
if not @wbuf.empty? # unterminated last line
- write0 dot_stuff(@wbuf.chomp) + "\r\n"
+ write0 @wbuf.chomp + "\r\n"
elsif @written_bytes == 0 # empty src
write0 "\r\n"
end
@@ -326,7 +302,7 @@ module Net # :nodoc:
def each_crlf_line(src)
buffer_filling(@wbuf, src) do
- while line = @wbuf.slice!(/\A[^\r\n]*(?:\n|\r(?:\n|(?!\z)))/)
+ while line = @wbuf.slice!(/\A.*(?:\n|\r\n|\r(?!\z))/n)
yield line.chomp("\n") + "\r\n"
end
end
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index bbab05a5df..79211d1aee 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -66,6 +66,8 @@ module Net
end
#
+ # = Net::SMTP
+ #
# == What is This Library?
#
# This library provides functionality to send internet
@@ -76,9 +78,8 @@ module Net
#
# 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 or search for alternatives in
- # {RubyGems.org}[https://rubygems.org/] or {The Ruby
- # Toolbox}[https://www.ruby-toolbox.com/].
+ # 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).
#
@@ -216,7 +217,7 @@ module Net
@started = false
@open_timeout = 30
@read_timeout = 60
- @error_occurred = false
+ @error_occured = false
@debug_output = nil
@tls = false
@starttls = false
@@ -228,6 +229,11 @@ module Net
"#<#{self.class} #{@address}:#{@port} started=#{@started}>"
end
+ # +true+ if the SMTP object uses ESMTP (which it does by default).
+ def esmtp?
+ @esmtp
+ end
+
#
# Set whether to use ESMTP or not. This should be done before
# calling #start. Note that if #start is called in ESMTP mode,
@@ -235,10 +241,11 @@ module Net
# object will automatically switch to plain SMTP mode and
# retry (but not vice versa).
#
- attr_accessor :esmtp
+ def esmtp=(bool)
+ @esmtp = bool
+ end
- # +true+ if the SMTP object uses ESMTP (which it does by default).
- alias :esmtp? :esmtp
+ alias esmtp esmtp?
# true if server advertises STARTTLS.
# You cannot get valid value before opening SMTP session.
@@ -363,12 +370,12 @@ module Net
# Seconds to wait while attempting to open a connection.
# If the connection cannot be opened within this time, a
- # Net::OpenTimeout is raised. The default value is 30 seconds.
+ # TimeoutError is raised.
attr_accessor :open_timeout
# Seconds to wait while reading one block (by one read(2) call).
# If the read(2) call does not complete within this time, a
- # Net::ReadTimeout is raised. The default value is 60 seconds.
+ # TimeoutError is raised.
attr_reader :read_timeout
# Set the number of seconds to wait until timing-out a read(2)
@@ -447,9 +454,8 @@ module Net
# * Net::SMTPSyntaxError
# * Net::SMTPFatalError
# * Net::SMTPUnknownError
- # * Net::OpenTimeout
- # * Net::ReadTimeout
# * IOError
+ # * TimeoutError
#
def SMTP.start(address, port = nil, helo = 'localhost',
user = nil, secret = nil, authtype = nil,
@@ -509,9 +515,8 @@ module Net
# * Net::SMTPSyntaxError
# * Net::SMTPFatalError
# * Net::SMTPUnknownError
- # * Net::OpenTimeout
- # * Net::ReadTimeout
# * IOError
+ # * TimeoutError
#
def start(helo = 'localhost',
user = nil, secret = nil, authtype = nil) # :yield: smtp
@@ -547,9 +552,7 @@ module Net
check_auth_method(authtype || DEFAULT_AUTH_TYPE)
check_auth_args user, secret
end
- s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do
- tcp_socket(@address, @port)
- end
+ s = timeout(@open_timeout) { tcp_socket(@address, @port) }
logging "Connection opened: #{@address}:#{@port}"
@socket = new_internet_message_io(tls? ? tlsconnect(s) : s)
check_response critical { recv_response() }
@@ -606,17 +609,17 @@ module Net
rescue SMTPError
if @esmtp
@esmtp = false
- @error_occurred = false
+ @error_occured = false
retry
end
raise
end
def do_finish
- quit if @socket and not @socket.closed? and not @error_occurred
+ quit if @socket and not @socket.closed? and not @error_occured
ensure
@started = false
- @error_occurred = false
+ @error_occured = false
@socket.close if @socket and not @socket.closed?
@socket = nil
end
@@ -654,8 +657,8 @@ module Net
# * Net::SMTPSyntaxError
# * Net::SMTPFatalError
# * Net::SMTPUnknownError
- # * Net::ReadTimeout
# * IOError
+ # * TimeoutError
#
def send_message(msgstr, from_addr, *to_addrs)
raise IOError, 'closed session' unless @socket
@@ -707,8 +710,8 @@ module Net
# * Net::SMTPSyntaxError
# * Net::SMTPFatalError
# * Net::SMTPUnknownError
- # * Net::ReadTimeout
# * IOError
+ # * TimeoutError
#
def open_message_stream(from_addr, *to_addrs, &block) # :yield: stream
raise IOError, 'closed session' unless @socket
@@ -936,12 +939,12 @@ module Net
Response.parse(buf)
end
- def critical
- return Response.parse('200 dummy reply code') if @error_occurred
+ def critical(&block)
+ return '200 dummy reply code' if @error_occured
begin
return yield()
rescue Exception
- @error_occurred = true
+ @error_occured = true
raise
end
end
@@ -954,7 +957,7 @@ module Net
def check_continue(res)
unless res.continue?
- raise SMTPUnknownError, "could not get 3xx (#{res.status}: #{res.string})"
+ raise SMTPUnknownError, "could not get 3xx (#{res.status})"
end
end
@@ -970,74 +973,49 @@ module Net
end
end
- # This class represents a response received by the SMTP server. Instances
- # of this class are created by the SMTP class; they should not be directly
- # created by the user. For more information on SMTP responses, view
- # {Section 4.2 of RFC 5321}[http://tools.ietf.org/html/rfc5321#section-4.2]
class Response
- # Parses the received response and separates the reply code and the human
- # readable reply text
def self.parse(str)
new(str[0,3], str)
end
- # Creates a new instance of the Response class and sets the status and
- # string attributes
def initialize(status, string)
@status = status
@string = string
end
- # The three digit reply code of the SMTP response
attr_reader :status
-
- # The human readable reply text of the SMTP response
attr_reader :string
- # Takes the first digit of the reply code to determine the status type
def status_type_char
@status[0, 1]
end
- # Determines whether the response received was a Positive Completion
- # reply (2xx reply code)
def success?
status_type_char() == '2'
end
- # Determines whether the response received was a Positive Intermediate
- # reply (3xx reply code)
def continue?
status_type_char() == '3'
end
- # The first line of the human readable reply text
def message
@string.lines.first
end
- # Creates a CRAM-MD5 challenge. You can view more information on CRAM-MD5
- # on Wikipedia: http://en.wikipedia.org/wiki/CRAM-MD5
def cram_md5_challenge
@string.split(/ /)[1].unpack('m')[0]
end
- # Returns a hash of the human readable reply text in the response if it
- # is multiple lines. It does not return the first line. The key of the
- # hash is the first word the value of the hash is an array with each word
- # thereafter being a value in the array
def capabilities
return {} unless @string[3, 1] == '-'
h = {}
@string.lines.drop(1).each do |line|
- k, *v = line[4..-1].chomp.split
+ k, *v = line[4..-1].chomp.split(nil)
h[k] = v
end
h
end
- # Determines whether there was an error and raies the appropriate error
- # based on the reply code of the response
def exception_class
case @status
when /\A4/ then SMTPServerBusy
@@ -1055,6 +1033,6 @@ module Net
end # class SMTP
- SMTPSession = SMTP # :nodoc:
+ SMTPSession = SMTP
end
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 3c5d6e8e73..a8ded93b9d 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -9,7 +9,8 @@
# For documentation, see Net::Telnet.
#
-require "net/protocol"
+require "socket"
+require "timeout"
require "English"
module Net
@@ -243,15 +244,15 @@ module Net
#
# Timeout:: the number of seconds to wait before timing out both the
# initial attempt to connect to host (in this constructor),
- # which raises a Net::OpenTimeout, and all attempts to read data
- # from the host, which raises a Net::ReadTimeout (in #waitfor(),
- # #cmd(), and #login()). The default value is 10 seconds.
+ # and all attempts to read data from the host (in #waitfor(),
+ # #cmd(), and #login()). Exceeding this timeout causes a
+ # TimeoutError to be raised. The default value is 10 seconds.
# You can disable the timeout by setting this value to false.
# In this case, the connect attempt will eventually timeout
# on the underlying connect(2) socket call with an
# Errno::ETIMEDOUT error (but generally only after a few
# minutes), but other attempts to read data from the host
- # will hang indefinitely if no data is forthcoming.
+ # will hand indefinitely if no data is forthcoming.
#
# Waittime:: the amount of time to wait after seeing what looks like a
# prompt (that is, received data that matches the Prompt
@@ -346,12 +347,12 @@ module Net
if @options["Timeout"] == false
@sock = TCPSocket.open(@options["Host"], @options["Port"])
else
- Timeout.timeout(@options["Timeout"], Net::OpenTimeout) do
+ timeout(@options["Timeout"]) do
@sock = TCPSocket.open(@options["Host"], @options["Port"])
end
end
- rescue Net::OpenTimeout
- raise Net::OpenTimeout, "timed out while opening a connection to the host"
+ rescue TimeoutError
+ raise TimeoutError, "timed out while opening a connection to the host"
rescue
@log.write($ERROR_INFO.to_s + "\n") if @options.has_key?("Output_log")
@dumplog.log_dump('#', $ERROR_INFO.to_s + "\n") if @options.has_key?("Dump_log")
@@ -507,7 +508,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 Timeout::Error. 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
@@ -554,7 +555,7 @@ module Net
rest = ''
until(prompt === line and not IO::select([@sock], nil, nil, waittime))
unless IO::select([@sock], nil, nil, time_out)
- raise Net::ReadTimeout, "timed out while waiting for more data"
+ raise TimeoutError, "timed out while waiting for more data"
end
begin
c = @sock.readpartial(1024 * 1024)
@@ -725,8 +726,8 @@ module Net
if options.kind_of?(Hash)
username = options["Name"]
password = options["Password"]
- login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
- password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
+ login_prompt = options["LoginPrompt"] if options["LoginPrompt"]
+ password_prompt = options["PasswordPrompt"] if options["PasswordPrompt"]
else
username = options
end
@@ -753,7 +754,6 @@ module Net
line
end
- # Closes the connection
def close
@sock.close
end
diff --git a/lib/observer.rb b/lib/observer.rb
index 208d8ed6ed..ee3f01b793 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -1,34 +1,33 @@
#
-# Implementation of the _Observer_ object-oriented design pattern. The
+# observer.rb implements the _Observer_ object-oriented design pattern. The
# following documentation is copied, with modifications, from "Programming
-# Ruby", by Hunt and Thomas; http://www.ruby-doc.org/docs/ProgrammingRuby/html/lib_patterns.html.
+# Ruby", by Hunt and Thomas; http://www.rubycentral.com/book/lib_patterns.html.
#
-# See Observable for more info.
-
-# The Observer pattern (also known as publish/subscribe) provides a simple
+# == About
+#
+# 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.
#
# == Mechanism
#
-# The notifying class mixes in the +Observable+
+# In the Ruby implementation, the notifying class mixes in the +Observable+
# module, which provides the methods for managing the associated observer
# objects.
#
-# The observers must implement a method called +update+ to receive
-# notifications.
+# The observers must implement the +update+ method to receive notifications.
#
# The observable object must:
-# * assert that it has +#changed+
-# * call +#notify_observers+
+# * assert that it has +changed+
+# * call +notify_observers+
#
-# === Example
+# == Example
#
# The following example demonstrates this nicely. A +Ticker+, when run,
-# continually receives the stock +Price+ for its <tt>@symbol</tt>. A +Warner+
-# is a general observer of the price, and two warners are demonstrated, a
-# +WarnLow+ and a +WarnHigh+, which print a warning if the price is below or
-# above their set limits, respectively.
+# continually receives the stock +Price+ for its +@symbol+. A +Warner+ is a
+# general observer of the price, and two warners are demonstrated, a +WarnLow+
+# and a +WarnHigh+, which print a warning if the price is below or above their
+# set limits, respectively.
#
# The +update+ callback allows the warners to run without being explicitly
# called. The system is set up with the +Ticker+ and several observers, and the
@@ -109,20 +108,19 @@
# Current price: 112
# Current price: 79
# --- Sun Jun 09 00:10:25 CDT 2002: Price below 80: 79
+
+
+#
+# Implements the Observable design pattern as a mixin so that other objects can
+# be notified of changes in state. See observer.rb for details and an example.
+#
module Observable
#
- # Add +observer+ as an observer on this object. so that it will receive
- # notifications.
- #
- # +observer+:: the object that will be notified of changes.
- # +func+:: Symbol naming the method that will be called when this Observable
- # has changes.
+ # 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+.
#
- # This method must return true for +observer.respond_to?+ and will
- # receive <tt>*arg</tt> when #notify_observers is called, where
- # <tt>*arg</tt> is the value passed to #notify_observers by this
- # Observable
def add_observer(observer, func=:update)
@observer_peers = {} unless defined? @observer_peers
unless observer.respond_to? func
@@ -132,16 +130,15 @@ module Observable
end
#
- # Remove +observer+ as an observer on this object so that it will no longer
- # receive notifications.
+ # Delete +observer+ as an observer on this object. It will no longer receive
+ # notifications.
#
- # +observer+:: An observer of this Observable
def delete_observer(observer)
@observer_peers.delete observer if defined? @observer_peers
end
#
- # Remove all observers associated with this object.
+ # Delete all observers associated with this object.
#
def delete_observers
@observer_peers.clear if defined? @observer_peers
@@ -162,15 +159,12 @@ module Observable
# Set the changed state of this object. Notifications will be sent only if
# the changed +state+ is +true+.
#
- # +state+:: Boolean indicating the changed state of this Observable.
- #
def changed(state=true)
@observer_state = state
end
#
- # Returns true if this object's state has been changed since the last
- # #notify_observers call.
+ # Query the changed state of this object.
#
def changed?
if defined? @observer_state and @observer_state
@@ -181,19 +175,16 @@ module Observable
end
#
- # Notify observers of a change in state *if* this object's changed state is
- # +true+.
- #
- # This will invoke the method named in #add_observer, passing <tt>*arg</tt>.
- # The changed state is then set to +false+.
+ # If this object's changed state is +true+, invoke the update method in each
+ # currently associated observer in turn, passing it the given arguments. The
+ # changed state is then set to +false+.
#
- # <tt>*arg</tt>:: Any arguments to pass to the observers.
def notify_observers(*arg)
if defined? @observer_state and @observer_state
if defined? @observer_peers
- @observer_peers.each do |k, v|
- k.send v, *arg
- end
+ @observer_peers.each { |k, v|
+ k.send v, *arg
+ }
end
@observer_state = false
end
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index 6f04d056e3..bb45d63ae6 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -9,22 +9,21 @@ module Kernel
alias open_uri_original_open open # :nodoc:
end
- # Allows the opening of various resources including URIs.
+ # makes possible to open various resources including URIs.
+ # If the first argument respond to `open' method,
+ # the method is called with the rest arguments.
#
- # If the first argument responds to the 'open' method, 'open' is called on
- # it with the rest of the arguments.
+ # If the first argument is a string which begins with xxx://,
+ # it is parsed by URI.parse. If the parsed object respond to `open' method,
+ # the method is called with the rest arguments.
#
- # If the first argument is a string that begins with xxx://, it is parsed by
- # URI.parse. If the parsed object responds to the 'open' method,
- # 'open' is called on it with the rest of the arguments.
+ # Otherwise original open is called.
#
- # Otherwise, the original Kernel#open is called.
- #
- # OpenURI::OpenRead#open provides URI::HTTP#open, URI::HTTPS#open and
- # URI::FTP#open, Kernel#open.
- #
- # We can accept URIs and strings that begin with http://, https:// and
- # ftp://. In these cases, the opened file object is extended by OpenURI::Meta.
+ # Since open-uri.rb provides URI::HTTP#open, URI::HTTPS#open and
+ # URI::FTP#open,
+ # Kernel[#.]open can accepts such URIs and strings which begins with
+ # http://, https:// and ftp://.
+ # In these case, the opened file object is extended by OpenURI::Meta.
def open(name, *rest, &block) # :doc:
if name.respond_to?(:open)
name.open(*rest, &block)
@@ -39,18 +38,18 @@ module Kernel
module_function :open
end
-# OpenURI is an easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP.
+# OpenURI is an easy-to-use wrapper for net/http, net/https and net/ftp.
#
-# == Example
+#== Example
#
-# It is possible to open an http, https or ftp URL as though it were a file:
+# It is possible to open http/https/ftp URL as usual like opening a file:
#
# open("http://www.ruby-lang.org/") {|f|
# f.each_line {|line| p line}
# }
#
-# The opened file has several getter methods for its meta-information, as
-# follows, since it is extended by OpenURI::Meta.
+# The opened file has several methods for meta information as follows since
+# it is extended by OpenURI::Meta.
#
# open("http://www.ruby-lang.org/en") {|f|
# f.each_line {|line| p line}
@@ -71,14 +70,12 @@ end
# }
#
# The environment variables such as http_proxy, https_proxy and ftp_proxy
-# are in effect by default. Here we disable proxy:
+# are in effect by default. :proxy => nil disables proxy.
#
-# open("http://www.ruby-lang.org/en/", :proxy => nil) {|f|
+# open("http://www.ruby-lang.org/en/raa.html", :proxy => nil) {|f|
# # ...
# }
#
-# See OpenURI::OpenRead.open and Kernel#open for more on available options.
-#
# URI objects can be opened in a similar way.
#
# uri = URI.parse("http://www.ruby-lang.org/en/")
@@ -129,7 +126,7 @@ module OpenURI
def OpenURI.open_uri(name, *rest) # :nodoc:
uri = URI::Generic === name ? name : URI.parse(name)
- mode, _, rest = OpenURI.scan_open_optional_arguments(*rest)
+ mode, perm, rest = OpenURI.scan_open_optional_arguments(*rest)
options = rest.shift if !rest.empty? && Hash === rest.first
raise ArgumentError.new("extra arguments") if !rest.empty?
options ||= {}
@@ -152,11 +149,7 @@ module OpenURI
begin
yield io
ensure
- if io.respond_to? :close!
- io.close! # Tempfile
- else
- io.close
- end
+ io.close
end
else
io
@@ -241,7 +234,7 @@ module OpenURI
def OpenURI.redirectable?(uri1, uri2) # :nodoc:
# This test is intended to forbid a redirection from http://... to
- # file:///etc/passwd, file:///dev/zero, etc. CVE-2011-1521
+ # 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)
@@ -270,17 +263,17 @@ module OpenURI
# HTTP or HTTPS
if proxy
if proxy_user && proxy_pass
- klass = Net::HTTP::Proxy(proxy_uri.hostname, proxy_uri.port, 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.hostname, proxy_uri.port)
+ klass = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port)
end
end
- target_host = target.hostname
+ target_host = target.host
target_port = target.port
request_uri = target.request_uri
else
# FTP over HTTP proxy
- target_host = proxy_uri.hostname
+ target_host = proxy_uri.host
target_port = proxy_uri.port
request_uri = target.to_s
if proxy_user && proxy_pass
@@ -288,7 +281,7 @@ module OpenURI
end
end
- http = proxy ? klass.new(target_host, target_port) : klass.new(target_host, target_port, nil)
+ http = klass.new(target_host, target_port)
if target.class == URI::HTTPS
require 'net/https'
http.use_ssl = true
@@ -362,8 +355,6 @@ module OpenURI
attr_reader :io
end
- # Raised on redirection,
- # only occurs when +redirect+ option for HTTP is +false+.
class HTTPRedirect < HTTPError
def initialize(message, io, uri)
super(message, io)
@@ -372,7 +363,7 @@ module OpenURI
attr_reader :uri
end
- class Buffer # :nodoc: all
+ class Buffer # :nodoc:
def initialize
@io = StringIO.new
@size = 0
@@ -416,14 +407,14 @@ module OpenURI
end
end
- # returns an Array that consists of status code and message.
+ # returns an Array which consists status code and message.
attr_accessor :status
- # returns a URI that is the base of relative URIs in the data.
- # It may differ from the URI supplied by a user due to redirection.
+ # returns a URI which is base of relative URIs in the data.
+ # It may differ from the URI supplied by a user because redirection.
attr_accessor :base_uri
- # returns a Hash that represents header fields.
+ # returns a Hash which represents header fields.
# The Hash keys are downcased for canonicalization.
attr_reader :meta
@@ -452,7 +443,7 @@ module OpenURI
meta_setup_encoding if name == 'content-type'
end
- # returns a Time that represents the Last-Modified field.
+ # returns a Time which represents Last-Modified field.
def last_modified
if v = @meta['last-modified']
Time.httpdate(v)
@@ -461,12 +452,10 @@ module OpenURI
end
end
- # :stopdoc:
RE_LWS = /[\r\n\t ]+/n
RE_TOKEN = %r{[^\x00- ()<>@,;:\\"/\[\]?={}\x7f]+}n
RE_QUOTED_STRING = %r{"(?:[\r\n\t !#-\[\]-~\x80-\xff]|\\[\x00-\x7f])*"}n
RE_PARAMETERS = %r{(?:;#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?=#{RE_LWS}?(?:#{RE_TOKEN}|#{RE_QUOTED_STRING})#{RE_LWS}?)*}n
- # :startdoc:
def content_type_parse # :nodoc:
v = @meta['content-type']
@@ -491,7 +480,7 @@ module OpenURI
# It is downcased for canonicalization.
# Content-Type parameters are stripped.
def content_type
- type, *_ = content_type_parse
+ type, *parameters = content_type_parse
type || 'application/octet-stream'
end
@@ -519,9 +508,8 @@ module OpenURI
end
end
- # Returns a list of encodings in Content-Encoding field as an array of
- # strings.
- #
+ # returns a list of encodings in Content-Encoding field
+ # as an Array of String.
# The encodings are downcased for canonicalization.
def content_encoding
v = @meta['content-encoding']
@@ -538,25 +526,22 @@ module OpenURI
# OpenURI::OpenRead#open provides `open' for URI::HTTP and URI::FTP.
#
# OpenURI::OpenRead#open takes optional 3 arguments as:
+ # OpenURI::OpenRead#open([mode [, perm]] [, options]) [{|io| ... }]
#
- # OpenURI::OpenRead#open([mode [, perm]] [, options]) [{|io| ... }]
- #
- # 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.
+ # `mode', `perm' is same as Kernel#open.
#
- # +mode+ and +perm+ are the same as Kernel#open.
- #
- # However, +mode+ must be read mode because OpenURI::OpenRead#open doesn't
+ # However, `mode' must be read mode because OpenURI::OpenRead#open doesn't
# support write mode (yet).
- # Also +perm+ is ignored because it is meaningful only for file creation.
+ # Also `perm' is just ignored because it is meaningful only for file
+ # creation.
#
- # +options+ must be a hash.
+ # `options' must be a hash.
#
- # Each option with a string key specifies an extra header field for HTTP.
- # I.e., it is ignored for FTP without HTTP proxy.
+ # Each pairs which key is a string in the hash specify a extra header
+ # field for HTTP.
+ # I.e. it is ignored for FTP without HTTP proxy.
#
- # The hash may include other options, where keys are symbols:
+ # The hash may include other options which key is a symbol:
#
# [:proxy]
# Synopsis:
@@ -568,28 +553,22 @@ module OpenURI
#
# 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.
- #
# When true is given or the option itself is not specified,
# environment variable `scheme_proxy' is examined.
# `scheme' is replaced by `http', `https' or `ftp'.
- #
# 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"]
+ # :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 :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.
#
@@ -611,13 +590,14 @@ module OpenURI
#
# 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.
+ # 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. This happens when the HTTP response has no Content-Length header.
+ # nil.
+ # It is happen when HTTP response has no Content-Length header.
#
# [:progress_proc]
# Synopsis:
@@ -625,7 +605,7 @@ module OpenURI
#
# If :progress_proc option is specified, the proc is called with one
# argument each time when `open' gets content fragment from network.
- # The argument +size+ is the accumulated transferred size in bytes.
+ # The argument `size' `size' is a accumulated transferred size in bytes.
#
# If two or more transfer is done by HTTP redirection, the procedure
# is called only one for a last transfer.
@@ -666,24 +646,26 @@ module OpenURI
#
# :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
#
- # <tt>:ftp_active_mode => true</tt> is used to make ftp active mode.
- # Ruby 1.9 uses passive mode by default.
- # Note that the active mode is default in Ruby 1.8 or prior.
+ # :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+ is true by default. <tt>:redirect => false</tt> is used to
- # disable all HTTP redirects.
- #
- # OpenURI::HTTPRedirect exception raised on redirection.
- # Using +true+ also means that redirections between http and ftp are
- # permitted.
+ # :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)
@@ -692,7 +674,7 @@ module OpenURI
# OpenURI::OpenRead#read([options]) reads a content referenced by self and
# returns the content as string.
# The string is extended with OpenURI::Meta.
- # The argument +options+ is same as OpenURI::OpenRead#open.
+ # The argument `options' is same as OpenURI::OpenRead#open.
def read(options={})
self.open(options) {|f|
str = f.read
@@ -704,6 +686,84 @@ module OpenURI
end
module URI
+ class Generic
+ # returns a proxy URI.
+ # The proxy URI is obtained from environment variables such as http_proxy,
+ # ftp_proxy, no_proxy, etc.
+ # If there is no proper proxy, nil is returned.
+ #
+ # Note that capitalized variables (HTTP_PROXY, FTP_PROXY, NO_PROXY, etc.)
+ # are examined too.
+ #
+ # But http_proxy and HTTP_PROXY is treated specially under CGI environment.
+ # It's because HTTP_PROXY may be set by Proxy: header.
+ # So HTTP_PROXY is not used.
+ # http_proxy is not used too if the variable is case insensitive.
+ # CGI_HTTP_PROXY can be used instead.
+ def find_proxy
+ name = self.scheme.downcase + '_proxy'
+ proxy_uri = nil
+ if name == 'http_proxy' && ENV.include?('REQUEST_METHOD') # CGI?
+ # HTTP_PROXY conflicts with *_proxy for proxy settings and
+ # HTTP_* for header information in CGI.
+ # So it should be careful to use it.
+ pairs = ENV.reject {|k, v| /\Ahttp_proxy\z/i !~ k }
+ case pairs.length
+ when 0 # no proxy setting anyway.
+ proxy_uri = nil
+ when 1
+ k, v = pairs.shift
+ if k == 'http_proxy' && ENV[k.upcase] == nil
+ # http_proxy is safe to use because ENV is case sensitive.
+ proxy_uri = ENV[name]
+ else
+ proxy_uri = nil
+ end
+ else # http_proxy is safe to use because ENV is case sensitive.
+ proxy_uri = ENV.to_hash[name]
+ end
+ if !proxy_uri
+ # Use CGI_HTTP_PROXY. cf. libwww-perl.
+ proxy_uri = ENV["CGI_#{name.upcase}"]
+ end
+ elsif name == 'http_proxy'
+ unless proxy_uri = ENV[name]
+ if proxy_uri = ENV[name.upcase]
+ warn 'The environment variable HTTP_PROXY is discouraged. Use http_proxy.'
+ end
+ end
+ else
+ proxy_uri = ENV[name] || ENV[name.upcase]
+ end
+
+ if proxy_uri && self.host
+ require 'socket'
+ begin
+ addr = IPSocket.getaddress(self.host)
+ proxy_uri = nil if /\A127\.|\A::1\z/ =~ addr
+ rescue SocketError
+ end
+ end
+
+ if proxy_uri
+ proxy_uri = URI.parse(proxy_uri)
+ name = 'no_proxy'
+ if no_proxy = ENV[name] || ENV[name.upcase]
+ no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port|
+ if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
+ (!port || self.port == port.to_i)
+ proxy_uri = nil
+ break
+ end
+ }
+ end
+ proxy_uri
+ else
+ nil
+ end
+ end
+ end
+
class HTTP
def buffer_open(buf, proxy, options) # :nodoc:
OpenURI.open_http(buf, self, proxy, options)
@@ -744,7 +804,7 @@ module URI
# The access sequence is defined by RFC 1738
ftp = Net::FTP.new
- ftp.connect(self.hostname, self.port)
+ ftp.connect(self.host, self.port)
ftp.passive = true if !options[:ftp_active_mode]
# todo: extract user/passwd from .netrc.
user = 'anonymous'
diff --git a/lib/open3.rb b/lib/open3.rb
index 1ee014d8a9..9e435f83f8 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -23,8 +23,8 @@
# - 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 : run a pipeline and don't wait
-# - Open3.pipeline : run a pipeline and wait
+# - Open3.pipeline_start : a pipeline
+# - Open3.pipeline : run a pipline and wait
#
module Open3
@@ -55,9 +55,9 @@ module Open3
# 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 abc") {|i, o, e, t| ... }
- # Open3.popen3("echo", "abc") {|i, o, e, t| ... }
- # Open3.popen3(["echo", "argv0"], "abc") {|i, o, e, t| ... }
+ # 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.
#
@@ -70,15 +70,6 @@ module Open3
#
# Closing stdin, stdout and stderr does not wait the process.
#
- # You should be careful to avoid deadlocks.
- # Since pipes are fixed length buffer,
- # Open3.popen3("prog") {|i, o, e, t| o.read } deadlocks if
- # the program generates many output on stderr.
- # You should be read stdout and stderr simultaneously (using thread or IO.select).
- # However if you don't need stderr output, Open3.popen2 can be used.
- # If merged stdout and stderr output is not a problem, you can use Open3.popen2e.
- # If you really needs stdout and stderr output as separate strings, you can consider Open3.capture3.
- #
def popen3(*cmd, &block)
if Hash === cmd.last
opts = cmd.pop.dup
@@ -214,9 +205,9 @@ module Open3
result = [*parent_io, wait_thr]
if defined? yield
begin
- return yield(*result)
+ return yield(*result)
ensure
- parent_io.each{|io| io.close unless io.closed?}
+ parent_io.each{|io| io.close unless io.closed?}
wait_thr.join
end
end
@@ -232,7 +223,7 @@ module Open3
# 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[:binmode]. See Process.spawn.
+ # 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.
#
@@ -248,8 +239,8 @@ module Open3
# End
# layouted_graph, dot_log = Open3.capture3("dot -v", :stdin_data=>graph)
#
- # o, e, s = Open3.capture3("echo abc; sort >&2", :stdin_data=>"foo\nbar\nbaz\n")
- # p o #=> "abc\n"
+ # 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>
#
@@ -266,7 +257,7 @@ module Open3
# STDOUT.binmode; print thumnail
# end
#
- def capture3(*cmd)
+ def capture3(*cmd, &block)
if Hash === cmd.last
opts = cmd.pop.dup
else
@@ -296,7 +287,7 @@ module Open3
# 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[:binmode]. See Process.spawn.
+ # 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.
#
@@ -320,7 +311,7 @@ module Open3
# End
# image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true)
#
- def capture2(*cmd)
+ def capture2(*cmd, &block)
if Hash === cmd.last
opts = cmd.pop.dup
else
@@ -348,7 +339,7 @@ module Open3
# 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[:binmode]. See Process.spawn.
+ # 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.
#
@@ -359,7 +350,7 @@ module Open3
# # capture make log
# make_log, s = Open3.capture2e("make")
#
- def capture2e(*cmd)
+ def capture2e(*cmd, &block)
if Hash === cmd.last
opts = cmd.pop.dup
else
@@ -662,7 +653,7 @@ module Open3
end
module_function :pipeline
- def pipeline_run(cmds, pipeline_opts, child_io, parent_io) # :nodoc:
+ def pipeline_run(cmds, pipeline_opts, child_io, parent_io, &block) # :nodoc:
if cmds.empty?
raise ArgumentError, "no commands"
end
@@ -709,9 +700,9 @@ module Open3
child_io.each {|io| io.close }
if defined? yield
begin
- return yield(*result)
+ return yield(*result)
ensure
- parent_io.each{|io| io.close unless io.closed?}
+ parent_io.each{|io| io.close unless io.closed?}
wait_thrs.each {|t| t.join }
end
end
diff --git a/lib/optparse.rb b/lib/optparse.rb
index fb8b0278e8..1751aa0a5f 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -8,7 +8,6 @@
#
-#--
# == Developer Documentation (not for RDoc output)
#
# === Class tree
@@ -43,8 +42,6 @@
# | all instances)|
# +---------------+
#
-#++
-#
# == OptionParser
#
# === Introduction
@@ -63,8 +60,7 @@
# 4. Arguments can be automatically converted to a specified class.
# 5. Arguments can be restricted to a certain set.
#
-# All of these features are demonstrated in the examples below. See
-# #make_switch for full documentation.
+# All of these features are demonstrated in the examples below.
#
# === Minimal example
#
@@ -111,7 +107,7 @@
# options.transfer_type = :auto
# options.verbose = false
#
-# opt_parser = OptionParser.new do |opts|
+# opts = OptionParser.new do |opts|
# opts.banner = "Usage: example.rb [options]"
#
# opts.separator ""
@@ -190,7 +186,7 @@
# end
# end
#
-# opt_parser.parse!(args)
+# opts.parse!(args)
# options
# end # parse()
#
@@ -198,17 +194,12 @@
#
# options = OptparseExample.parse(ARGV)
# pp options
-# pp ARGV
-#
-# === Shell Completion
-#
-# For modern shells (e.g. bash, zsh, etc.), you can use shell
-# completion for command line options.
#
# === Further documentation
#
# The above examples should be enough to learn how to use this class. If you
-# have any questions, file a ticket at http://bugs.ruby-lang.org.
+# have any questions, email me (gsinclair@soyabean.com.au) and I will update
+# this document.
#
class OptionParser
# :stopdoc:
@@ -227,14 +218,12 @@ class OptionParser
# and resolved against a list of acceptable values.
#
module Completion
- def self.regexp(key, icase)
- Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'), icase)
- end
-
- def self.candidate(key, icase = false, pat = nil, &block)
- pat ||= Completion.regexp(key, icase)
+ def complete(key, icase = false, pat = nil)
+ pat ||= Regexp.new('\A' + Regexp.quote(key).gsub(/\w+\b/, '\&\w*'),
+ icase)
+ canon, sw, cn = nil
candidates = []
- block.call do |k, *v|
+ each do |k, *v|
(if Regexp === k
kn = nil
k === key
@@ -245,16 +234,7 @@ class OptionParser
v << k if v.empty?
candidates << [k, v, kn]
end
- candidates
- end
-
- def candidate(key, icase = false, pat = nil)
- Completion.candidate(key, icase, pat, &method(:each))
- end
-
- public
- def complete(key, icase = false, pat = nil)
- candidates = candidate(key, icase, pat, &method(:each)).sort_by {|k, v, kn| kn.size}
+ candidates = candidates.sort_by {|k, v, kn| kn.size}
if candidates.size == 1
canon, sw, * = candidates[0]
elsif candidates.size > 1
@@ -444,24 +424,6 @@ class OptionParser
(long.first || short.first).sub(/\A-+(?:\[no-\])?/, '')
end
- def compsys(sdone, ldone) # :nodoc:
- sopts, lopts = [], []
- @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
-
- (sopts+lopts).each do |opt|
- # "(-x -c -r)-l[left justify]" \
- if opt =~ /^--\[no-\](.+)$/
- o = $1
- yield("--#{o}", desc.join(""))
- yield("--no-#{o}", desc.join(""))
- else
- yield("#{opt}", desc.join(""))
- end
- end
- end
-
#
# Switch that takes no arguments.
#
@@ -700,14 +662,6 @@ class OptionParser
end
to
end
-
- def compsys(*args, &block) # :nodoc:
- list.each do |opt|
- if opt.respond_to?(:compsys)
- opt.compsys(*args, &block)
- end
- end
- end
end
#
@@ -754,24 +708,6 @@ class OptionParser
DefaultList.short['-'] = Switch::NoArgument.new {}
DefaultList.long[''] = Switch::NoArgument.new {throw :terminate}
-
- COMPSYS_HEADER = <<'XXX' # :nodoc:
-
-typeset -A opt_args
-local context state line
-
-_arguments -s -S \
-XXX
-
- def compsys(to, name = File.basename($0)) # :nodoc:
- to << "#compdef #{name}\n"
- to << COMPSYS_HEADER
- visit(:compsys, {}, {}) {|o, d|
- to << %Q[ "#{o}[#{d.gsub(/[\"\[\]]/, '\\\\\&')}]" \\\n]
- }
- to << " '*:file:_files' && return 0\n"
- end
-
#
# Default options for ARGV, which never appear in option summary.
#
@@ -782,35 +718,13 @@ XXX
# Shows option summary.
#
Officious['help'] = proc do |parser|
- Switch::NoArgument.new do |arg|
+ Switch::NoArgument.new do
puts parser.help
exit
end
end
#
- # --*-completion-bash=WORD
- # Shows candidates for command line completion.
- #
- Officious['*-completion-bash'] = proc do |parser|
- Switch::RequiredArgument.new do |arg|
- puts parser.candidate(arg)
- exit
- end
- end
-
- #
- # --*-completion-zsh[=NAME:FILE]
- # Creates zsh completion file.
- #
- Officious['*-completion-zsh'] = proc do |parser|
- Switch::OptionalArgument.new do |arg|
- parser.compsys(STDOUT, arg)
- exit
- end
- end
-
- #
# --version
# Shows version string if Version is defined.
#
@@ -1068,13 +982,13 @@ XXX
#
# Returns option summary string.
#
- def help; summarize("#{banner}".sub(/\n?\z/, "\n")) end
+ def help; summarize(banner.to_s.sub(/\n?\z/, "\n")) end
alias to_s help
#
# Returns option summary list.
#
- def to_a; summarize("#{banner}".split(/^/)) end
+ def to_a; summarize(banner.to_a.dup) end
#
# Checks if an argument is given twice, in which case an ArgumentError is
@@ -1158,7 +1072,7 @@ XXX
default_style = Switch::NoArgument
default_pattern = nil
klass = nil
- q, a = nil
+ n, q, a = nil
opts.each do |o|
# argument class
@@ -1339,7 +1253,6 @@ XXX
#
# Same as #order, but removes switches destructively.
- # Non-option arguments remain in +argv+.
#
def order!(argv = default_argv, &nonopt)
parse_in_order(argv, &nonopt)
@@ -1430,7 +1343,6 @@ XXX
#
# Same as #permute, but removes switches destructively.
- # Non-option arguments remain in +argv+.
#
def permute!(argv = default_argv)
nonopts = []
@@ -1450,7 +1362,6 @@ XXX
#
# Same as #parse, but removes switches destructively.
- # Non-option arguments remain in +argv+.
#
def parse!(argv = default_argv)
if ENV.include?('POSIXLY_CORRECT')
@@ -1550,36 +1461,6 @@ XXX
end
private :complete
- def candidate(word)
- list = []
- case word
- when /\A--/
- word, arg = word.split(/=/, 2)
- argpat = Completion.regexp(arg, false) if arg and !arg.empty?
- long = true
- when /\A-(!-)/
- short = true
- when /\A-/
- long = short = true
- end
- pat = Completion.regexp(word, true)
- visit(:each_option) do |opt|
- next unless Switch === opt
- opts = (long ? opt.long : []) + (short ? opt.short : [])
- opts = Completion.candidate(word, true, pat, &opts.method(:each)).map(&:first) if pat
- if /\A=/ =~ opt.arg
- opts.map! {|sw| sw + "="}
- if arg and CompletingHash === opt.pattern
- if opts = opt.pattern.candidate(arg, false, argpat)
- opts.map!(&:last)
- end
- end
- end
- list.concat(opts)
- end
- list
- end
-
#
# Loads options from file names as +filename+. Does nothing when the file
# is not present. Returns whether successfully loaded.
@@ -1637,22 +1518,15 @@ XXX
decimal = '\d+(?:_\d+)*'
binary = 'b[01]+(?:_[01]+)*'
hex = 'x[\da-f]+(?:_[\da-f]+)*'
- octal = "0(?:[0-7]+(?:_[0-7]+)*|#{binary}|#{hex})?"
+ octal = "0(?:[0-7]*(?:_[0-7]+)*|#{binary}|#{hex})"
integer = "#{octal}|#{decimal}"
-
- accept(Integer, %r"\A[-+]?(?:#{integer})\z"io) {|s,|
- begin
- Integer(s)
- rescue ArgumentError
- raise OptionParser::InvalidArgument, s
- end if s
- }
+ accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s,| Integer(s) if s}
#
# Float number format, and converts to Float.
#
float = "(?:#{decimal}(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?"
- floatpat = %r"\A[-+]?#{float}\z"io
+ floatpat = %r"\A[-+]?#{float}"io
accept(Float, floatpat) {|s,| s.to_f if s}
#
@@ -1660,7 +1534,7 @@ XXX
# for float format, and Rational for rational format.
#
real = "[-+]?(?:#{octal}|#{float})"
- accept(Numeric, /\A(#{real})(?:\/(#{real}))?\z/io) {|s, d, n|
+ accept(Numeric, /\A(#{real})(?:\/(#{real}))?/io) {|s, d, n|
if n
Rational(d, n)
elsif s
@@ -1671,40 +1545,22 @@ XXX
#
# Decimal integer format, to be converted to Integer.
#
- DecimalInteger = /\A[-+]?#{decimal}\z/io
- accept(DecimalInteger, DecimalInteger) {|s,|
- begin
- Integer(s)
- rescue ArgumentError
- raise OptionParser::InvalidArgument, s
- end if s
- }
+ DecimalInteger = /\A[-+]?#{decimal}/io
+ accept(DecimalInteger) {|s,| s.to_i if s}
#
# Ruby/C like octal/hexadecimal/binary integer format, to be converted to
# Integer.
#
- OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))\z/io
- accept(OctalInteger, OctalInteger) {|s,|
- begin
- Integer(s, 8)
- rescue ArgumentError
- raise OptionParser::InvalidArgument, s
- end if s
- }
+ OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))/io
+ accept(OctalInteger) {|s,| s.oct if s}
#
# Decimal integer/float number format, to be converted to Integer for
# integer format, Float for float format.
#
DecimalNumeric = floatpat # decimal integer is allowed as float also.
- accept(DecimalNumeric, floatpat) {|s,|
- begin
- eval(s)
- rescue SyntaxError
- raise OptionParser::InvalidArgument, s
- end if s
- }
+ accept(DecimalNumeric) {|s,| eval(s) if s}
#
# Boolean switch, which means whether it is present or not, whether it is
@@ -1963,6 +1819,6 @@ ARGV.extend(OptionParser::Arguable)
if $0 == __FILE__
Version = OptionParser::Version
ARGV.options {|q|
- q.parse!.empty? or print "what's #{ARGV.join(' ')}?\n"
+ q.parse!.empty? or puts "what's #{ARGV.join(' ')}?"
} or abort(ARGV.options.to_s)
end
diff --git a/lib/optparse/ac.rb b/lib/optparse/ac.rb
deleted file mode 100644
index 6a8626094d..0000000000
--- a/lib/optparse/ac.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'optparse'
-
-class OptionParser::AC < OptionParser
- private
-
- def _check_ac_args(name, block)
- unless /\A\w[-\w]*\z/ =~ name
- raise ArgumentError, name
- end
- unless block
- raise ArgumentError, "no block given", ParseError.filter_backtrace(caller)
- end
- end
-
- def _ac_arg_enable(prefix, name, help_string, block)
- _check_ac_args(name, block)
-
- sdesc = []
- ldesc = ["--#{prefix}-#{name}"]
- desc = [help_string]
- q = name.downcase
- enable = Switch::NoArgument.new(nil, proc {true}, sdesc, ldesc, nil, desc, block)
- disable = Switch::NoArgument.new(nil, proc {false}, sdesc, ldesc, nil, desc, block)
- top.append(enable, [], ["enable-" + q], disable, ['disable-' + q])
- enable
- end
-
- public
-
- def ac_arg_enable(name, help_string, &block)
- _ac_arg_enable("enable", name, help_string, block)
- end
-
- def ac_arg_disable(name, help_string, &block)
- _ac_arg_enable("disable", name, help_string, block)
- end
-
- def ac_arg_with(name, help_string, &block)
- _check_ac_args(name, block)
-
- sdesc = []
- ldesc = ["--with-#{name}"]
- desc = [help_string]
- q = name.downcase
- with = Switch::PlacedArgument.new(*search(:atype, String), sdesc, ldesc, nil, desc, block)
- without = Switch::NoArgument.new(nil, proc {}, sdesc, ldesc, nil, desc, block)
- top.append(with, [], ["with-" + q], without, ['without-' + q])
- with
- end
-end
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index b291f08308..aea0c8e124 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -9,74 +9,31 @@
#
#
-# An OpenStruct is a data structure, similar to a Hash, that allows the
-# definition of arbitrary attributes with their accompanying values. This is
-# accomplished by using Ruby's metaprogramming to define methods on the class
-# itself.
-#
-# == Examples:
+# OpenStruct allows you to create data objects and set arbitrary attributes.
+# For example:
#
# require 'ostruct'
#
-# person = OpenStruct.new
-# person.name = "John Smith"
-# person.age = 70
-# person.pension = 300
-#
-# puts person.name # -> "John Smith"
-# puts person.age # -> 70
-# puts person.address # -> nil
-#
-# An OpenStruct employs a Hash internally to store the methods and values and
-# can even be initialized with one:
-#
-# australia = OpenStruct.new(:country => "Australia", :population => 20_000_000)
-# p australia # -> <OpenStruct country="Australia" population=20000000>
-#
-# Hash keys with spaces or characters that would normally not be able to use for
-# method calls (e.g. ()[]*) will not be immediately available on the
-# OpenStruct object as a method for retrieval or assignment, but can be still be
-# reached through the Object#send method.
-#
-# measurements = OpenStruct.new("length (in inches)" => 24)
-# measurements.send("length (in inches)") # -> 24
-#
-# data_point = OpenStruct.new(:queued? => true)
-# data_point.queued? # -> true
-# data_point.send("queued?=",false)
-# data_point.queued? # -> false
+# record = OpenStruct.new
+# record.name = "John Smith"
+# record.age = 70
+# record.pension = 300
#
-# Removing the presence of a method requires the execution the delete_field
-# method as setting the property value to +nil+ will not remove the method.
+# puts record.name # -> "John Smith"
+# puts record.address # -> nil
#
-# first_pet = OpenStruct.new(:name => 'Rowdy', :owner => 'John Smith')
-# first_pet.owner = nil
-# second_pet = OpenStruct.new(:name => 'Rowdy')
+# It is like a hash with a different way to access the data. In fact, it is
+# implemented with a hash, and you can initialize it with one.
#
-# first_pet == second_pet # -> false
+# hash = { "country" => "Australia", :population => 20_000_000 }
+# data = OpenStruct.new(hash)
#
-# first_pet.delete_field(:owner)
-# first_pet == second_pet # -> true
-#
-#
-# == Implementation:
-#
-# An OpenStruct utilizes Ruby's method lookup structure to and find and define
-# the necessary methods for properties. This is accomplished through the method
-# method_missing and define_method.
-#
-# This should be a consideration if there is a concern about the performance of
-# the objects that are created, as there is much more overhead in the setting
-# of these properties compared to using a Hash or a Struct.
+# p data # -> <OpenStruct country="Australia" population=20000000>
#
class OpenStruct
#
- # Creates a new OpenStruct object. By default, the resulting OpenStruct
- # object will have no attributes.
- #
- # The optional +hash+, if given, will generate attributes and values
- # (can be a Hash, an OpenStruct or a Struct).
- # For example:
+ # Create a new OpenStruct object. The optional +hash+, if given, will
+ # generate attributes and values. For example.
#
# require 'ostruct'
# hash = { "country" => "Australia", :population => 20_000_000 }
@@ -84,12 +41,13 @@ class OpenStruct
#
# p data # -> <OpenStruct country="Australia" population=20000000>
#
+ # By default, the resulting OpenStruct object will have no attributes.
+ #
def initialize(hash=nil)
@table = {}
if hash
- hash.each_pair do |k, v|
- k = k.to_sym
- @table[k] = v
+ for k,v in hash
+ @table[k.to_sym] = v
new_ostruct_member(k)
end
end
@@ -99,55 +57,16 @@ class OpenStruct
def initialize_copy(orig)
super
@table = @table.dup
- @table.each_key{|key| new_ostruct_member(key)}
end
- #
- # Converts the OpenStruct to a hash with keys representing
- # each attribute (as symbols) and their corresponding values
- # Example:
- #
- # require 'ostruct'
- # data = OpenStruct.new("country" => "Australia", :population => 20_000_000)
- # data.to_h # => {:country => "Australia", :population => 20000000 }
- #
- def to_h
- @table.dup
- end
-
- #
- # Yields all attributes (as a symbol) along with the corresponding values
- # or returns an enumerator if not block is given.
- # Example:
- #
- # require 'ostruct'
- # data = OpenStruct.new("country" => "Australia", :population => 20_000_000)
- # data.each_pair.to_a # => [[:country, "Australia"], [:population, 20000000]]
- #
- def each_pair
- return to_enum __method__ unless block_given?
- @table.each_pair{|p| yield p}
- end
-
- #
- # Provides marshalling support for use by the Marshal library.
- #
def marshal_dump
@table
end
-
- #
- # Provides marshalling support for use by the Marshal library.
- #
def marshal_load(x)
@table = x
@table.each_key{|key| new_ostruct_member(key)}
end
- #
- # Used internally to check if the OpenStruct is able to be
- # modified before granting access to the internal Hash table to be modified.
- #
def modifiable
begin
@modifiable = true
@@ -158,20 +77,16 @@ class OpenStruct
end
protected :modifiable
- #
- # Used internally to defined properties on the
- # OpenStruct. It does this by using the metaprogramming function
- # define_singleton_method for both the getter method and the setter method.
- #
def new_ostruct_member(name)
name = name.to_sym
- unless respond_to?(name)
- define_singleton_method(name) { @table[name] }
- define_singleton_method("#{name}=") { |x| modifiable[name] = x }
+ 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
end
name
end
- protected :new_ostruct_member
def method_missing(mid, *args) # :nodoc:
mname = mid.id2name
@@ -184,44 +99,15 @@ class OpenStruct
elsif len == 0
@table[mid]
else
- raise NoMethodError, "undefined method `#{mid}' for #{self}", caller(1)
+ raise NoMethodError, "undefined method `#{mname}' for #{self}", caller(1)
end
end
- # Returns the value of a member.
- #
- # person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
- # person[:age] # => 70, same as ostruct.age
#
- def [](name)
- @table[name.to_sym]
- end
-
- #
- # Sets the value of a member.
- #
- # person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
- # person[:age] = 42 # => equivalent to ostruct.age = 42
- # person.age # => 42
- #
- def []=(name, value)
- modifiable[new_ostruct_member(name)] = value
- end
-
- #
- # Remove the named field from the object. Returns the value that the field
- # contained if it was defined.
- #
- # require 'ostruct'
- #
- # person = OpenStruct.new('name' => 'John Smith', 'age' => 70)
- #
- # person.delete_field('name') # => 'John Smith'
+ # Remove the named field from the object.
#
def delete_field(name)
- sym = name.to_sym
- singleton_class.__send__(:remove_method, sym, "#{name}=")
- @table.delete sym
+ @table.delete name.to_sym
end
InspectKey = :__inspect_key__ # :nodoc:
@@ -256,29 +142,10 @@ class OpenStruct
protected :table
#
- # Compares this object and +other+ for equality. An OpenStruct is equal to
- # +other+ when +other+ is an OpenStruct and the two objects' Hash tables are
- # equal.
+ # Compare this object and +other+ for equality.
#
def ==(other)
- return false unless other.kind_of?(OpenStruct)
- @table == other.table
- end
-
- #
- # Compares this object and +other+ for equality. An OpenStruct is eql? to
- # +other+ when +other+ is an OpenStruct and the two objects' Hash tables are
- # eql?.
- #
- def eql?(other)
- return false unless other.kind_of?(OpenStruct)
- @table.eql?(other.table)
- end
-
- # Compute a hash-code for this OpenStruct.
- # Two hashes with the same content will have the same hash code
- # (and will be eql?).
- def hash
- @table.hash
+ return false unless(other.kind_of?(OpenStruct))
+ return @table == other.table
end
end
diff --git a/lib/pathname.rb b/lib/pathname.rb
new file mode 100644
index 0000000000..cede33d273
--- /dev/null
+++ b/lib/pathname.rb
@@ -0,0 +1,1053 @@
+#
+# = pathname.rb
+#
+# Object-Oriented Pathname Class
+#
+# Author:: Tanaka Akira <akr@m17n.org>
+# Documentation:: Author and Gavin Sinclair
+#
+# For documentation, see class Pathname.
+#
+# <tt>pathname.rb</tt> is distributed with Ruby since 1.8.0.
+#
+
+#
+# == Pathname
+#
+# Pathname represents a pathname which locates a file in a filesystem.
+# The pathname depends on OS: Unix, Windows, etc.
+# Pathname library works with pathnames of local OS.
+# However non-Unix pathnames are supported experimentally.
+#
+# It does not represent the file itself.
+# A Pathname can be relative or absolute. It's not until you try to
+# reference the file that it even matters whether the file exists or not.
+#
+# Pathname is immutable. It has no method for destructive update.
+#
+# The value of this class is to manipulate file path information in a neater
+# way than standard Ruby provides. The examples below demonstrate the
+# difference. *All* functionality from File, FileTest, and some from Dir and
+# FileUtils is included, in an unsurprising way. It is essentially a facade for
+# all of these, and more.
+#
+# == Examples
+#
+# === 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| _ }
+#
+# === 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| _ }
+#
+# === Example 3: Special features
+#
+# p1 = Pathname.new("/usr/lib") # Pathname:/usr/lib
+# p2 = p1 + "ruby/1.8" # Pathname:/usr/lib/ruby/1.8
+# p3 = p1.parent # Pathname:/usr
+# p4 = p2.relative_path_from(p3) # Pathname:lib/ruby/1.8
+# pwd = Pathname.pwd # Pathname:/home/gavin
+# pwd.absolute? # true
+# p5 = Pathname.new "." # Pathname:.
+# p5 = p5 + "music/../articles" # Pathname:music/../articles
+# 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.
+#
+# - +
+# - #join
+# - #parent
+# - #root?
+# - #absolute?
+# - #relative?
+# - #relative_path_from
+# - #each_filename
+# - #cleanpath
+# - #realpath
+# - #realdirpath
+# - #children
+# - #each_child
+# - #mountpoint?
+#
+# === File status predicate methods
+#
+# These methods are a facade for FileTest:
+# - #blockdev?
+# - #chardev?
+# - #directory?
+# - #executable?
+# - #executable_real?
+# - #exist?
+# - #file?
+# - #grpowned?
+# - #owned?
+# - #pipe?
+# - #readable?
+# - #world_readable?
+# - #readable_real?
+# - #setgid?
+# - #setuid?
+# - #size
+# - #size?
+# - #socket?
+# - #sticky?
+# - #symlink?
+# - #writable?
+# - #world_writable?
+# - #writable_real?
+# - #zero?
+#
+# === File property and manipulation methods
+#
+# These methods are a facade for File:
+# - #atime
+# - #ctime
+# - #mtime
+# - #chmod(mode)
+# - #lchmod(mode)
+# - #chown(owner, group)
+# - #lchown(owner, group)
+# - #fnmatch(pattern, *args)
+# - #fnmatch?(pattern, *args)
+# - #ftype
+# - #make_link(old)
+# - #open(*args, &block)
+# - #readlink
+# - #rename(to)
+# - #stat
+# - #lstat
+# - #make_symlink(old)
+# - #truncate(length)
+# - #utime(atime, mtime)
+# - #basename(*args)
+# - #dirname
+# - #extname
+# - #expand_path(*args)
+# - #split
+#
+# === Directory methods
+#
+# These methods are a facade for Dir:
+# - Pathname.glob(*args)
+# - Pathname.getwd / Pathname.pwd
+# - #rmdir
+# - #entries
+# - #each_entry(&block)
+# - #mkdir(*args)
+# - #opendir(*args)
+#
+# === IO
+#
+# These methods are a facade for IO:
+# - #each_line(*args, &block)
+# - #read(*args)
+# - #binread(*args)
+# - #readlines(*args)
+# - #sysopen(*args)
+#
+# === Utilities
+#
+# These methods are a mixture of Find, FileUtils, and others:
+# - #find(&block)
+# - #mkpath
+# - #rmtree
+# - #unlink / #delete
+#
+#
+# == Method documentation
+#
+# As the above section shows, most of the methods in Pathname are facades. The
+# documentation for these methods generally just says, for instance, "See
+# FileTest.writable?", as you should be familiar with the original method
+# anyway, and its documentation (e.g. through +ri+) will contain more
+# information. In some cases, a brief description will follow.
+#
+class Pathname
+
+ # :stopdoc:
+ if RUBY_VERSION < "1.9"
+ TO_PATH = :to_str
+ else
+ # to_path is implemented so Pathname objects are usable with File.open, etc.
+ TO_PATH = :to_path
+ end
+
+ SAME_PATHS = if File::FNM_SYSCASE.nonzero?
+ proc {|a, b| a.casecmp(b).zero?}
+ else
+ proc {|a, b| a == b}
+ end
+
+ # :startdoc:
+
+ #
+ # Create a Pathname object from the given String (or String-like object).
+ # If +path+ contains a NUL character (<tt>\0</tt>), an ArgumentError is raised.
+ #
+ def initialize(path)
+ path = path.__send__(TO_PATH) if path.respond_to? TO_PATH
+ @path = path.dup
+
+ if /\0/ =~ @path
+ raise ArgumentError, "pathname contains \\0: #{@path.inspect}"
+ end
+
+ self.taint if @path.tainted?
+ end
+
+ def freeze() super; @path.freeze; self end
+ def taint() super; @path.taint; self end
+ def untaint() super; @path.untaint; self end
+
+ #
+ # Compare this pathname with +other+. The comparison is string-based.
+ # Be aware that two different paths (<tt>foo.txt</tt> and <tt>./foo.txt</tt>)
+ # can refer to the same file.
+ #
+ def ==(other)
+ return false unless Pathname === other
+ other.to_s == @path
+ end
+ alias === ==
+ alias eql? ==
+
+ # Provides for comparing pathnames, case-sensitively.
+ def <=>(other)
+ return nil unless Pathname === other
+ @path.tr('/', "\0") <=> other.to_s.tr('/', "\0")
+ end
+
+ def hash # :nodoc:
+ @path.hash
+ end
+
+ # Return the path as a String.
+ def to_s
+ @path.dup
+ end
+
+ # to_path is implemented so Pathname objects are usable with File.open, etc.
+ alias_method TO_PATH, :to_s
+
+ def inspect # :nodoc:
+ "#<#{self.class}:#{@path}>"
+ end
+
+ # 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)
+ end
+
+ if File::ALT_SEPARATOR
+ SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
+ SEPARATOR_PAT = /[#{SEPARATOR_LIST}]/
+ 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
+ return nil
+ else
+ return path[0, path.rindex(base)], base
+ end
+ end
+ private :chop_basename
+
+ # split_names(path) -> prefix, [name, ...]
+ def split_names(path)
+ names = []
+ while r = chop_basename(path)
+ path, basename = r
+ names.unshift basename
+ end
+ return path, names
+ end
+ private :split_names
+
+ def prepend_prefix(prefix, relpath)
+ if relpath.empty?
+ File.dirname(prefix)
+ elsif /#{SEPARATOR_PAT}/o =~ prefix
+ prefix = File.dirname(prefix)
+ prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
+ prefix + relpath
+ else
+ prefix + relpath
+ end
+ end
+ private :prepend_prefix
+
+ # Returns clean pathname of +self+ with consecutive slashes and useless dots
+ # removed. The filesystem is not accessed.
+ #
+ # If +consider_symlink+ is +true+, then a more conservative algorithm is used
+ # to avoid breaking symbolic linkages. This may retain more <tt>..</tt>
+ # entries than absolutely necessary, but without accessing the filesystem,
+ # this can't be avoided. See #realpath.
+ #
+ def cleanpath(consider_symlink=false)
+ if consider_symlink
+ cleanpath_conservative
+ else
+ cleanpath_aggressive
+ end
+ end
+
+ #
+ # Clean the path simply by resolving and removing excess "." and ".." entries.
+ # Nothing more, nothing less.
+ #
+ def cleanpath_aggressive
+ path = @path
+ names = []
+ pre = path
+ while r = chop_basename(pre)
+ pre, base = r
+ case base
+ when '.'
+ when '..'
+ names.unshift base
+ else
+ if names[0] == '..'
+ names.shift
+ else
+ names.unshift base
+ end
+ end
+ end
+ if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+ names.shift while names[0] == '..'
+ end
+ self.class.new(prepend_prefix(pre, File.join(*names)))
+ end
+ private :cleanpath_aggressive
+
+ # has_trailing_separator?(path) -> bool
+ def has_trailing_separator?(path)
+ if r = chop_basename(path)
+ pre, basename = r
+ pre.length + basename.length < path.length
+ else
+ false
+ end
+ end
+ private :has_trailing_separator?
+
+ # add_trailing_separator(path) -> path
+ def add_trailing_separator(path)
+ if File.basename(path + 'a') == 'a'
+ path
+ else
+ File.join(path, "") # xxx: Is File.join is appropriate to add separator?
+ end
+ end
+ private :add_trailing_separator
+
+ def del_trailing_separator(path)
+ if r = chop_basename(path)
+ pre, basename = r
+ pre + basename
+ elsif /#{SEPARATOR_PAT}+\z/o =~ path
+ $` + File.dirname(path)[/#{SEPARATOR_PAT}*\z/o]
+ else
+ path
+ end
+ end
+ private :del_trailing_separator
+
+ def cleanpath_conservative
+ path = @path
+ names = []
+ pre = path
+ while r = chop_basename(pre)
+ pre, base = r
+ names.unshift base if base != '.'
+ end
+ if /#{SEPARATOR_PAT}/o =~ File.basename(pre)
+ names.shift while names[0] == '..'
+ end
+ if names.empty?
+ self.class.new(File.dirname(pre))
+ else
+ if names.last != '..' && File.basename(path) == '.'
+ names << '.'
+ end
+ result = prepend_prefix(pre, File.join(*names))
+ if /\A(?:\.|\.\.)\z/ !~ names.last && has_trailing_separator?(path)
+ self.class.new(add_trailing_separator(result))
+ else
+ self.class.new(result)
+ end
+ end
+ end
+ private :cleanpath_conservative
+
+ #
+ # 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(basedir=nil)
+ self.class.new(File.realpath(@path, basedir))
+ 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(basedir=nil)
+ self.class.new(File.realdirpath(@path, basedir))
+ end
+
+ # #parent returns the parent directory.
+ #
+ # This is same as <tt>self + '..'</tt>.
+ def parent
+ self + '..'
+ end
+
+ # #mountpoint? returns +true+ if <tt>self</tt> points to a mountpoint.
+ def mountpoint?
+ begin
+ stat1 = self.lstat
+ stat2 = self.parent.lstat
+ stat1.dev == stat2.dev && stat1.ino == stat2.ino ||
+ stat1.dev != stat2.dev
+ rescue Errno::ENOENT
+ false
+ end
+ end
+
+ #
+ # #root? is a predicate for root directories. I.e. it returns +true+ if the
+ # pathname consists of consecutive slashes.
+ #
+ # It doesn't access actual filesystem. So it may return +false+ for some
+ # pathnames which points to roots such as <tt>/usr/..</tt>.
+ #
+ def root?
+ !!(chop_basename(@path) == nil && /#{SEPARATOR_PAT}/o =~ @path)
+ end
+
+ # Predicate method for testing whether a path is absolute.
+ # It returns +true+ if the pathname begins with a slash.
+ def absolute?
+ !relative?
+ end
+
+ # The opposite of #absolute?
+ def relative?
+ path = @path
+ while r = chop_basename(path)
+ path, basename = r
+ end
+ path == ''
+ end
+
+ #
+ # Iterates over each component of the path.
+ #
+ # Pathname.new("/usr/bin/ruby").each_filename {|filename| ... }
+ # # 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
+ end
+
+ # Iterates over and yields a new Pathname object
+ # for each element in the given path in descending order.
+ #
+ # Pathname.new('/path/to/some/file.rb').descend {|v| p v}
+ # #<Pathname:/>
+ # #<Pathname:/path>
+ # #<Pathname:/path/to>
+ # #<Pathname:/path/to/some>
+ # #<Pathname:/path/to/some/file.rb>
+ #
+ # Pathname.new('path/to/some/file.rb').descend {|v| p v}
+ # #<Pathname:path>
+ # #<Pathname:path/to>
+ # #<Pathname:path/to/some>
+ # #<Pathname:path/to/some/file.rb>
+ #
+ # It doesn't access actual filesystem.
+ #
+ # This method is available since 1.8.5.
+ #
+ def descend
+ vs = []
+ ascend {|v| vs << v }
+ vs.reverse_each {|v| yield v }
+ nil
+ end
+
+ # Iterates over and yields a new Pathname object
+ # for each element in the given path in ascending order.
+ #
+ # Pathname.new('/path/to/some/file.rb').ascend {|v| p v}
+ # #<Pathname:/path/to/some/file.rb>
+ # #<Pathname:/path/to/some>
+ # #<Pathname:/path/to>
+ # #<Pathname:/path>
+ # #<Pathname:/>
+ #
+ # Pathname.new('path/to/some/file.rb').ascend {|v| p v}
+ # #<Pathname:path/to/some/file.rb>
+ # #<Pathname:path/to/some>
+ # #<Pathname:path/to>
+ # #<Pathname:path>
+ #
+ # It doesn't access actual filesystem.
+ #
+ # This method is available since 1.8.5.
+ #
+ def ascend
+ path = @path
+ yield self
+ while r = chop_basename(path)
+ path, name = r
+ break if path.empty?
+ yield self.class.new(del_trailing_separator(path))
+ end
+ end
+
+ #
+ # Pathname#+ appends a pathname fragment to this one to produce a new Pathname
+ # object.
+ #
+ # p1 = Pathname.new("/usr") # Pathname:/usr
+ # 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.
+ #
+ def +(other)
+ other = Pathname.new(other) unless Pathname === other
+ Pathname.new(plus(@path, other.to_s))
+ end
+
+ def plus(path1, path2) # -> path
+ prefix2 = path2
+ index_list2 = []
+ basename_list2 = []
+ while r2 = chop_basename(prefix2)
+ prefix2, basename2 = r2
+ index_list2.unshift prefix2.length
+ basename_list2.unshift basename2
+ end
+ return path2 if prefix2 != ''
+ prefix1 = path1
+ while true
+ while !basename_list2.empty? && basename_list2.first == '.'
+ index_list2.shift
+ basename_list2.shift
+ end
+ break unless r1 = chop_basename(prefix1)
+ prefix1, basename1 = r1
+ next if basename1 == '.'
+ if basename1 == '..' || basename_list2.empty? || basename_list2.first != '..'
+ prefix1 = prefix1 + basename1
+ break
+ end
+ index_list2.shift
+ basename_list2.shift
+ end
+ r1 = chop_basename(prefix1)
+ if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+ while !basename_list2.empty? && basename_list2.first == '..'
+ index_list2.shift
+ basename_list2.shift
+ end
+ end
+ if !basename_list2.empty?
+ suffix2 = path2[index_list2.first..-1]
+ r1 ? File.join(prefix1, suffix2) : prefix1 + suffix2
+ else
+ r1 ? prefix1 : File.dirname(prefix1)
+ end
+ end
+ private :plus
+
+ #
+ # Pathname#join joins pathnames.
+ #
+ # <tt>path0.join(path1, ..., pathN)</tt> is the same as
+ # <tt>path0 + path1 + ... + pathN</tt>.
+ #
+ def join(*args)
+ args.unshift self
+ result = args.pop
+ result = Pathname.new(result) unless Pathname === result
+ return result if result.absolute?
+ args.reverse_each {|arg|
+ arg = Pathname.new(arg) unless Pathname === arg
+ result = arg + result
+ return result if result.absolute?
+ }
+ result
+ end
+
+ #
+ # Returns the children of the directory (files and subdirectories, not
+ # recursive) as an array of Pathname objects. By default, the returned
+ # 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.
+ #
+ # For example:
+ # pn = Pathname("/usr/lib/ruby/1.8")
+ # pn.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)
+ # # -> [ Pathname:English.rb, Pathname:Env.rb, Pathname:abbrev.rb, ... ]
+ #
+ # Note that the result never contain the entries <tt>.</tt> and <tt>..</tt> in
+ # the directory because they are not children.
+ #
+ # This method has existed since 1.8.1.
+ #
+ def children(with_directory=true)
+ with_directory = false if @path == '.'
+ result = []
+ Dir.foreach(@path) {|e|
+ next if e == '.' || e == '..'
+ if with_directory
+ result << self.class.new(File.join(@path, e))
+ else
+ result << self.class.new(e)
+ end
+ }
+ 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
+ # +self+ is relative, the argument must be relative too.
+ #
+ # #relative_path_from doesn't access the filesystem. It assumes no symlinks.
+ #
+ # ArgumentError is raised when it cannot find a relative path.
+ #
+ # This method has existed since 1.8.1.
+ #
+ def relative_path_from(base_directory)
+ dest_directory = self.cleanpath.to_s
+ base_directory = base_directory.cleanpath.to_s
+ dest_prefix = dest_directory
+ dest_names = []
+ while r = chop_basename(dest_prefix)
+ dest_prefix, basename = r
+ dest_names.unshift basename if basename != '.'
+ end
+ base_prefix = base_directory
+ base_names = []
+ while r = chop_basename(base_prefix)
+ base_prefix, basename = r
+ base_names.unshift basename if basename != '.'
+ end
+ unless SAME_PATHS[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.shift
+ base_names.shift
+ end
+ if base_names.include? '..'
+ raise ArgumentError, "base_directory has ..: #{base_directory.inspect}"
+ end
+ base_names.fill('..')
+ relpath_names = base_names + dest_names
+ if relpath_names.empty?
+ Pathname.new('.')
+ else
+ Pathname.new(File.join(*relpath_names))
+ end
+ end
+end
+
+class Pathname # * IO *
+ #
+ # #each_line iterates over the line in the file. It yields a String object
+ # for each line.
+ #
+ # This method has existed since 1.8.1.
+ #
+ def each_line(*args, &block) # :yield: line
+ 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
+
+ # See <tt>IO.binread</tt>. Returns all the bytes from the file, or the first +N+
+ # if specified.
+ def binread(*args) IO.binread(@path, *args) end
+
+ # See <tt>IO.readlines</tt>. Returns all the lines from the file.
+ def readlines(*args) IO.readlines(@path, *args) end
+
+ # See <tt>IO.sysopen</tt>.
+ def sysopen(*args) IO.sysopen(@path, *args) end
+end
+
+
+class Pathname # * File *
+
+ # See <tt>File.atime</tt>. Returns last access time.
+ def atime() File.atime(@path) end
+
+ # See <tt>File.ctime</tt>. Returns last (directory entry, not file) change time.
+ def ctime() File.ctime(@path) end
+
+ # See <tt>File.mtime</tt>. Returns last modification time.
+ def mtime() File.mtime(@path) end
+
+ # See <tt>File.chmod</tt>. Changes permissions.
+ def chmod(mode) File.chmod(mode, @path) end
+
+ # See <tt>File.lchmod</tt>.
+ def lchmod(mode) File.lchmod(mode, @path) end
+
+ # See <tt>File.chown</tt>. Change owner and group of file.
+ def chown(owner, group) File.chown(owner, group, @path) end
+
+ # See <tt>File.lchown</tt>.
+ def lchown(owner, group) File.lchown(owner, group, @path) end
+
+ # See <tt>File.fnmatch</tt>. Return +true+ if the receiver matches the given
+ # pattern.
+ def fnmatch(pattern, *args) File.fnmatch(pattern, @path, *args) end
+
+ # See <tt>File.fnmatch?</tt> (same as #fnmatch).
+ def fnmatch?(pattern, *args) File.fnmatch?(pattern, @path, *args) end
+
+ # See <tt>File.ftype</tt>. Returns "type" of file ("file", "directory",
+ # etc).
+ def ftype() File.ftype(@path) end
+
+ # See <tt>File.link</tt>. Creates a hard link.
+ def make_link(old) File.link(old, @path) end
+
+ # See <tt>File.open</tt>. Opens the file for reading or writing.
+ def open(*args, &block) # :yield: file
+ File.open(@path, *args, &block)
+ end
+
+ # See <tt>File.readlink</tt>. Read symbolic link.
+ def readlink() self.class.new(File.readlink(@path)) end
+
+ # See <tt>File.rename</tt>. Rename the file.
+ def rename(to) File.rename(@path, to) end
+
+ # See <tt>File.stat</tt>. Returns a <tt>File::Stat</tt> object.
+ def stat() File.stat(@path) end
+
+ # See <tt>File.lstat</tt>.
+ def lstat() File.lstat(@path) end
+
+ # See <tt>File.symlink</tt>. Creates a symbolic link.
+ def make_symlink(old) File.symlink(old, @path) end
+
+ # See <tt>File.truncate</tt>. Truncate the file to +length+ bytes.
+ def truncate(length) File.truncate(@path, length) end
+
+ # See <tt>File.utime</tt>. Update the access and modification times.
+ def utime(atime, mtime) File.utime(atime, mtime, @path) end
+
+ # See <tt>File.basename</tt>. Returns the last component of the path.
+ def basename(*args) self.class.new(File.basename(@path, *args)) end
+
+ # See <tt>File.dirname</tt>. Returns all but the last component of the path.
+ def dirname() self.class.new(File.dirname(@path)) end
+
+ # See <tt>File.extname</tt>. Returns the file's extension.
+ def extname() File.extname(@path) end
+
+ # See <tt>File.expand_path</tt>.
+ def expand_path(*args) self.class.new(File.expand_path(@path, *args)) end
+
+ # 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
+end
+
+
+class Pathname # * FileTest *
+
+ # See <tt>FileTest.blockdev?</tt>.
+ def blockdev?() FileTest.blockdev?(@path) end
+
+ # See <tt>FileTest.chardev?</tt>.
+ def chardev?() FileTest.chardev?(@path) end
+
+ # See <tt>FileTest.executable?</tt>.
+ def executable?() FileTest.executable?(@path) end
+
+ # See <tt>FileTest.executable_real?</tt>.
+ def executable_real?() FileTest.executable_real?(@path) end
+
+ # See <tt>FileTest.exist?</tt>.
+ def exist?() FileTest.exist?(@path) end
+
+ # See <tt>FileTest.grpowned?</tt>.
+ def grpowned?() FileTest.grpowned?(@path) end
+
+ # See <tt>FileTest.directory?</tt>.
+ def directory?() FileTest.directory?(@path) end
+
+ # See <tt>FileTest.file?</tt>.
+ def file?() FileTest.file?(@path) end
+
+ # See <tt>FileTest.pipe?</tt>.
+ def pipe?() FileTest.pipe?(@path) end
+
+ # See <tt>FileTest.socket?</tt>.
+ def socket?() FileTest.socket?(@path) end
+
+ # See <tt>FileTest.owned?</tt>.
+ def owned?() FileTest.owned?(@path) end
+
+ # See <tt>FileTest.readable?</tt>.
+ def readable?() FileTest.readable?(@path) end
+
+ # See <tt>FileTest.world_readable?</tt>.
+ def world_readable?() FileTest.world_readable?(@path) end
+
+ # See <tt>FileTest.readable_real?</tt>.
+ def readable_real?() FileTest.readable_real?(@path) end
+
+ # See <tt>FileTest.setuid?</tt>.
+ def setuid?() FileTest.setuid?(@path) end
+
+ # See <tt>FileTest.setgid?</tt>.
+ def setgid?() FileTest.setgid?(@path) end
+
+ # See <tt>FileTest.size</tt>.
+ def size() FileTest.size(@path) end
+
+ # See <tt>FileTest.size?</tt>.
+ def size?() FileTest.size?(@path) end
+
+ # See <tt>FileTest.sticky?</tt>.
+ def sticky?() FileTest.sticky?(@path) end
+
+ # See <tt>FileTest.symlink?</tt>.
+ def symlink?() FileTest.symlink?(@path) end
+
+ # See <tt>FileTest.writable?</tt>.
+ def writable?() FileTest.writable?(@path) end
+
+ # See <tt>FileTest.world_writable?</tt>.
+ def world_writable?() FileTest.world_writable?(@path) end
+
+ # See <tt>FileTest.writable_real?</tt>.
+ def writable_real?() FileTest.writable_real?(@path) end
+
+ # See <tt>FileTest.zero?</tt>.
+ def zero?() FileTest.zero?(@path) end
+end
+
+
+class Pathname # * Dir *
+ # See <tt>Dir.glob</tt>. Returns or yields Pathname objects.
+ def Pathname.glob(*args) # :yield: pathname
+ if block_given?
+ Dir.glob(*args) {|f| yield self.new(f) }
+ else
+ Dir.glob(*args).map {|f| self.new(f) }
+ end
+ end
+
+ # See <tt>Dir.getwd</tt>. Returns the current working directory as a Pathname.
+ def Pathname.getwd() self.new(Dir.getwd) end
+ class << self; alias pwd getwd 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
+
+ # Iterates over the entries (files and subdirectories) in the directory. It
+ # yields a Pathname object for each entry.
+ #
+ # This method has existed since 1.8.1.
+ def each_entry(&block) # :yield: pathname
+ Dir.foreach(@path) {|f| yield self.class.new(f) }
+ end
+
+ # See <tt>Dir.mkdir</tt>. Create the referenced directory.
+ def mkdir(*args) Dir.mkdir(@path, *args) end
+
+ # See <tt>Dir.rmdir</tt>. Remove the referenced directory.
+ def rmdir() Dir.rmdir(@path) end
+
+ # See <tt>Dir.open</tt>.
+ def opendir(&block) # :yield: dir
+ Dir.open(@path, &block)
+ end
+end
+
+
+class Pathname # * Find *
+ #
+ # Pathname#find is an iterator to traverse a directory tree in a depth first
+ # manner. It yields a Pathname for each file under "this" directory.
+ #
+ # Since it is implemented by <tt>find.rb</tt>, <tt>Find.prune</tt> can be used
+ # to control the traverse.
+ #
+ # If +self+ is <tt>.</tt>, yielded pathnames begin with a filename in the
+ # current directory, not <tt>./</tt>.
+ #
+ def find(&block) # :yield: pathname
+ require 'find'
+ if @path == '.'
+ Find.find(@path) {|f| yield self.class.new(f.sub(%r{\A\./}, '')) }
+ else
+ Find.find(@path) {|f| yield self.class.new(f) }
+ end
+ end
+end
+
+
+class Pathname # * FileUtils *
+ # See <tt>FileUtils.mkpath</tt>. Creates a full path, including any
+ # intermediate directories that don't yet exist.
+ def mkpath
+ require 'fileutils'
+ FileUtils.mkpath(@path)
+ nil
+ end
+
+ # See <tt>FileUtils.rm_r</tt>. Deletes a directory and all beneath it.
+ def rmtree
+ # The name "rmtree" is borrowed from File::Path of Perl.
+ # File::Path provides "mkpath" and "rmtree".
+ require 'fileutils'
+ FileUtils.rm_r(@path)
+ nil
+ end
+end
+
+
+class Pathname # * mixed *
+ # Removes a file or directory, using <tt>File.unlink</tt> or
+ # <tt>Dir.unlink</tt> as necessary.
+ def unlink()
+ begin
+ Dir.unlink @path
+ rescue Errno::ENOTDIR
+ File.unlink @path
+ end
+ end
+ alias delete unlink
+end
+
+class Pathname
+ undef =~
+end
+
+module Kernel
+ # create a pathname object.
+ #
+ # This method is available since 1.8.5.
+ def Pathname(path) # :doc:
+ Pathname.new(path)
+ end
+ private :Pathname
+end
diff --git a/lib/pp.rb b/lib/pp.rb
index 6e0c797d2e..cda282448b 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -1,24 +1,3 @@
-require 'prettyprint'
-
-module Kernel
- # returns a pretty printed object as a string.
- def pretty_inspect
- PP.pp(self, '')
- end
-
- private
- # prints arguments in pretty form.
- #
- # pp returns argument(s).
- def pp(*objs) # :doc:
- objs.each {|obj|
- PP.pp(obj)
- }
- objs.size <= 1 ? objs.first : objs
- end
- module_function :pp
-end
-
# == Pretty-printer for Ruby objects.
#
# = Which seems better?
@@ -48,13 +27,11 @@ end
#
# = Usage
#
-# pp(obj) #=> obj
-# pp(obj1, obj2, ...) #=> [obj1, obj2, ...]
-# pp() #=> nil
+# pp(obj)
#
-# output +obj(s)+ to +$>+ in pretty printed format.
+# output +obj+ to +$>+ in pretty printed format.
#
-# It returns +obj(s)+.
+# It returns +nil+.
#
# = Output Customization
# To define your customized pretty printing function for your classes,
@@ -65,6 +42,28 @@ end
#
# = Author
# Tanaka Akira <akr@m17n.org>
+
+require 'prettyprint'
+
+module Kernel
+ # returns a pretty printed object as a string.
+ def pretty_inspect
+ PP.pp(self, '')
+ end
+
+ private
+ # prints arguments in pretty form.
+ #
+ # pp returns argument(s).
+ def pp(*objs) # :doc:
+ objs.each {|obj|
+ PP.pp(obj)
+ }
+ objs.size <= 1 ? objs.first : objs
+ end
+ module_function :pp
+end
+
class PP < PrettyPrint
# Outputs +obj+ to +out+ in pretty printed format of
# +width+ columns in width.
@@ -265,7 +264,8 @@ class PP < PrettyPrint
module ObjectMixin
# 1. specific pretty_print
# 2. specific inspect
- # 3. generic pretty_print
+ # 3. specific to_s
+ # 4. generic pretty_print
# A default pretty printing method for general objects.
# It calls #pretty_print_instance_variables to list instance variables.
@@ -282,10 +282,18 @@ class PP < PrettyPrint
inspect_method = method_method.call(:inspect)
rescue NameError
end
+ begin
+ to_s_method = method_method.call(:to_s)
+ rescue NameError
+ end
if inspect_method && /\(Kernel\)#/ !~ inspect_method.inspect
q.text self.inspect
elsif !inspect_method && self.respond_to?(:inspect)
q.text self.inspect
+ elsif to_s_method && /\(Kernel\)#/ !~ to_s_method.inspect
+ q.text self.to_s
+ elsif !to_s_method && self.respond_to?(:to_s)
+ q.text self.to_s
else
q.pp_object(self)
end
@@ -388,7 +396,7 @@ class Range
end
end
-class File < IO
+class File
class Stat
def pretty_print(q)
require 'etc.so'
@@ -495,7 +503,7 @@ class MatchData
end
end
-class Object < BasicObject
+class Object
include PP::ObjectMixin
end
diff --git a/lib/prettyprint.rb b/lib/prettyprint.rb
index 9a90713a4d..2c1fff3258 100644
--- a/lib/prettyprint.rb
+++ b/lib/prettyprint.rb
@@ -93,7 +93,6 @@ class PrettyPrint
attr_reader :output, :maxwidth, :newline, :genspace
attr_reader :indent, :group_queue
- # Returns the group most recently added to the stack.
def current_group
@group_stack.last
end
@@ -120,7 +119,6 @@ class PrettyPrint
current_group.first?
end
- # Breaks the buffer into lines that are shorter than #maxwidth
def break_outmost_groups
while @maxwidth < @output_width + @buffer_width
return unless group = @group_queue.deq
@@ -157,27 +155,11 @@ class PrettyPrint
end
end
- # This is similar to #breakable except
- # the decision to break or not is determined individually.
- #
- # Two #fill_breakable under a group may cause 4 results:
- # (break,break), (break,non-break), (non-break,break), (non-break,non-break).
- # This is different to #breakable because two #breakable under a group
- # may cause 2 results:
- # (break,break), (non-break,non-break).
- #
- # The text sep+ is inserted if a line is not broken at this point.
- #
- # If +sep+ is not specified, " " is used.
- #
- # If +width+ is not specified, +sep.length+ is used. You will have to
- # specify this when +sep+ is a multibyte character, for example.
- #
def fill_breakable(sep=' ', width=sep.length)
group { breakable sep, width }
end
- # This says "you can break a line here if necessary", and a +width+\-column
+ # This tells "you can break a line here if necessary", and a +width+\-column
# text +sep+ is inserted if a line is not broken at the point.
#
# If +sep+ is not specified, " " is used.
diff --git a/lib/prime.rb b/lib/prime.rb
index 7abcbebb0f..a40d90e3d7 100644
--- a/lib/prime.rb
+++ b/lib/prime.rb
@@ -46,17 +46,11 @@ end
# The set of all prime numbers.
#
# == Example
-#
-# Prime.each(100) do |prime|
-# p prime #=> 2, 3, 5, 7, 11, ...., 97
-# end
-#
-# Prime is Enumerable:
-#
-# Prime.first 5 # => [2, 3, 5, 7, 11]
+# 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.
#
@@ -64,14 +58,13 @@ end
# as a class method of +Prime+.
#
# e.g.
-# Prime.instance.prime?(2) #=> true
-# Prime.prime?(2) #=> true
+# 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.
-# Furthermore, it is a external iterator of prime enumeration which is
+# Futhermore, it is a external iterator of prime enumeration which is
# compatible to an Enumerator.
#
# +Prime+::+PseudoPrimeGenerator+ is the base class for generators.
@@ -87,7 +80,6 @@ end
# 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
@@ -113,7 +105,6 @@ class Prime
# Iterates the given block over all prime numbers.
#
# == Parameters
- #
# +ubound+::
# Optional. An arbitrary positive number.
# The upper bound of enumeration. The method enumerates
@@ -122,13 +113,11 @@ class Prime
# 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.
#
@@ -137,7 +126,6 @@ class Prime
# 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+.
@@ -153,7 +141,6 @@ class Prime
# 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)
@@ -174,11 +161,10 @@ class Prime
# and a natural number -- an exponent.
#
# == Example
- # For <tt>[[p_1, e_1], [p_2, e_2], ...., [p_n, e_n]]</tt>, it returns:
- #
- # p_1**e_1 * p_2**e_2 * .... * p_n**e_n.
+ # 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
+ # 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
@@ -199,15 +185,12 @@ class Prime
# +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:
+ # 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]].
#
- # [[p_1, e_1], [p_2, e_2], ...., [p_n, e_n]].
- #
- # Prime.prime_division(12) #=> [[2,2], [3,1]]
+ # Prime.prime_division(12) #=> [[2,2], [3,1]]
#
def prime_division(value, generator= Prime::Generator23.new)
raise ZeroDivisionError if value == 0
@@ -220,12 +203,12 @@ class Prime
for prime in generator
count = 0
while (value1, mod = value.divmod(prime)
- mod) == 0
- value = value1
- count += 1
+ mod) == 0
+ value = value1
+ count += 1
end
if count != 0
- pv.push [prime, count]
+ pv.push [prime, count]
end
break if value1 <= prime
end
@@ -276,16 +259,16 @@ class Prime
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
+ 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
+ loop do
+ block.call(succ)
+ end
end
end
@@ -296,7 +279,7 @@ class Prime
def with_object(obj)
return enum_for(:with_object) unless block_given?
each do |prime|
- yield prime, obj
+ yield prime, obj
end
end
end
@@ -351,17 +334,17 @@ class Prime
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
+ 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
@@ -370,6 +353,9 @@ class Prime
end
end
+
+
+
# Internal use. An implementation of prime table by trial division method.
class TrialDivision
include Singleton
@@ -399,20 +385,20 @@ class Prime
# +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
+ # 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
@@ -442,16 +428,16 @@ class Prime
n = (n-1).div(2)*2+3 # the next odd number to given n
table_index, integer_index, bit_index = indices(n)
loop do
- extend_table until @tables.length > table_index
- for j in integer_index...ENTRIES_PER_TABLE
- if !@tables[table_index][j].zero?
- for k in bit_index...BITS_PER_ENTRY
- return NUMS_PER_TABLE*table_index + NUMS_PER_ENTRY*j + 2*k+1 if !@tables[table_index][j][k].zero?
- end
- end
- bit_index = 0
- end
- table_index += 1; integer_index = 0
+ extend_table until @tables.length > table_index
+ for j in integer_index...ENTRIES_PER_TABLE
+ if !@tables[table_index][j].zero?
+ for k in bit_index...BITS_PER_ENTRY
+ return NUMS_PER_TABLE*table_index + NUMS_PER_ENTRY*j + 2*k+1 if !@tables[table_index][j][k].zero?
+ end
+ end
+ bit_index = 0
+ end
+ table_index += 1; integer_index = 0
end
end
@@ -473,15 +459,15 @@ class Prime
ubound = lbound + NUMS_PER_TABLE
new_table = [FILLED_ENTRY] * ENTRIES_PER_TABLE # which represents primarity in lbound...ubound
(3..Integer(Math.sqrt(ubound))).step(2) do |p|
- i, j, k = indices(p)
- next if @tables[i][j][k].zero?
-
- start = (lbound.div(p)+1)*p # least multiple of p which is >= lbound
- start += p if start.even?
- (start...ubound).step(2*p) do |n|
- _, j, k = indices(n)
- new_table[j] &= FILLED_ENTRY^(1<<k)
- end
+ i, j, k = indices(p)
+ next if @tables[i][j][k].zero?
+
+ start = (lbound.div(p)+1)*p # least multiple of p which is >= lbound
+ start += p if start.even?
+ (start...ubound).step(2*p) do |n|
+ _, j, k = indices(n)
+ new_table[j] &= FILLED_ENTRY^(1<<k)
+ end
end
@tables << new_table.freeze
end
@@ -497,12 +483,12 @@ class Prime
# Overwrites Prime#each.
#
- # Iterates the given block over all prime numbers. Note that enumeration
- # starts from the current position of internal pointer, not rewound.
+ # 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
+ yield succ
end
end
end
diff --git a/lib/profiler.rb b/lib/profiler.rb
index be33daf662..a4b8889093 100644
--- a/lib/profiler.rb
+++ b/lib/profiler.rb
@@ -1,129 +1,39 @@
-# Profile provides a way to Profile your Ruby application.
-#
-# Profiling your program is a way of determining which methods are called and
-# how long each method takes to complete. This way you can detect which
-# methods are possible bottlenecks.
-#
-# Profiling your program will slow down your execution time considerably,
-# so activate it only when you need it. Don't confuse benchmarking with
-# profiling.
-#
-# There are two ways to activate Profiling:
-#
-# == Command line
-#
-# Run your Ruby script with <code>-rprofile</code>:
-#
-# ruby -rprofile example.rb
-#
-# If you're profiling an executable in your <code>$PATH</code> you can use
-# <code>ruby -S</code>:
-#
-# ruby -rprofile -S some_executable
-#
-# == From code
-#
-# Just require 'profile':
-#
-# require 'profile'
-#
-# def slow_method
-# 5000.times do
-# 9999999999999999*999999999
-# end
-# end
-#
-# def fast_method
-# 5000.times do
-# 9999999999999999+999999999
-# end
-# end
-#
-# slow_method
-# fast_method
-#
-# The output in both cases is a report when the execution is over:
-#
-# ruby -rprofile example.rb
-#
-# % cumulative self self total
-# time seconds seconds calls ms/call ms/call name
-# 68.42 0.13 0.13 2 65.00 95.00 Integer#times
-# 15.79 0.16 0.03 5000 0.01 0.01 Fixnum#*
-# 15.79 0.19 0.03 5000 0.01 0.01 Fixnum#+
-# 0.00 0.19 0.00 2 0.00 0.00 IO#set_encoding
-# 0.00 0.19 0.00 1 0.00 100.00 Object#slow_method
-# 0.00 0.19 0.00 2 0.00 0.00 Module#method_added
-# 0.00 0.19 0.00 1 0.00 90.00 Object#fast_method
-# 0.00 0.19 0.00 1 0.00 190.00 #toplevel
-
module Profiler__
- class Wrapper < Struct.new(:defined_class, :method_id, :hash) # :nodoc:
- private :defined_class=, :method_id=, :hash=
-
- def initialize(klass, mid)
- super(klass, mid, nil)
- self.hash = Struct.instance_method(:hash).bind(self).call
- end
-
- def to_s
- "#{defined_class.inspect}#".sub(/\A\#<Class:(.*)>#\z/, '\1.') << method_id.to_s
- end
- alias inspect to_s
- end
-
# internal values
- @@start = nil # the start time that profiling began
- @@stacks = nil # the map of stacks keyed by thread
- @@maps = nil # the map of call data keyed by thread, class and id. Call data contains the call count, total time,
- PROFILE_CALL_PROC = TracePoint.new(*%i[call c_call b_call]) {|tp| # :nodoc:
- now = Process.times[0]
- stack = (@@stacks[Thread.current] ||= [])
- stack.push [now, 0.0]
- }
- PROFILE_RETURN_PROC = TracePoint.new(*%i[return c_return b_return]) {|tp| # :nodoc:
- now = Process.times[0]
- key = Wrapper.new(tp.defined_class, tp.method_id)
- stack = (@@stacks[Thread.current] ||= [])
- if tick = stack.pop
- threadmap = (@@maps[Thread.current] ||= {})
- data = (threadmap[key] ||= [0, 0.0, 0.0, key])
- data[0] += 1
- cost = now - tick[0]
- data[1] += cost
- data[2] += cost - tick[1]
- stack[-1][1] += cost if stack[-1]
+ @@start = @@stack = @@map = nil
+ PROFILE_PROC = proc{|event, file, line, id, binding, klass|
+ case event
+ when "call", "c-call"
+ now = Process.times[0]
+ @@stack.push [now, 0.0]
+ when "return", "c-return"
+ now = Process.times[0]
+ key = [klass, id]
+ if tick = @@stack.pop
+ data = (@@map[key] ||= [0, 0.0, 0.0, key])
+ data[0] += 1
+ cost = now - tick[0]
+ data[1] += cost
+ data[2] += cost - tick[1]
+ @@stack[-1][1] += cost if @@stack[-1]
+ end
end
}
module_function
def start_profile
@@start = Process.times[0]
- @@stacks = {}
- @@maps = {}
- PROFILE_CALL_PROC.enable
- PROFILE_RETURN_PROC.enable
+ @@stack = []
+ @@map = {}
+ set_trace_func PROFILE_PROC
end
def stop_profile
- PROFILE_CALL_PROC.disable
- PROFILE_RETURN_PROC.disable
+ set_trace_func nil
end
def print_profile(f)
stop_profile
total = Process.times[0] - @@start
if total == 0 then total = 0.01 end
- totals = {}
- @@maps.values.each do |threadmap|
- threadmap.each do |key, data|
- total_data = (totals[key] ||= [0, 0.0, 0.0, key])
- total_data[0] += data[0]
- total_data[1] += data[1]
- total_data[2] += data[2]
- end
- end
-
- # Maybe we should show a per thread output and a totals view?
-
- data = totals.values
+ data = @@map.values
data = data.sort_by{|x| -x[2]}
sum = 0
f.printf " %% cumulative self self total\n"
@@ -131,9 +41,19 @@ module_function
for d in data
sum += d[2]
f.printf "%6.2f %8.2f %8.2f %8d ", d[2]/total*100, sum, d[2], d[0]
- f.printf "%8.2f %8.2f %s\n", d[2]*1000/d[0], d[1]*1000/d[0], d[3]
+ f.printf "%8.2f %8.2f %s\n", d[2]*1000/d[0], d[1]*1000/d[0], get_name(*d[3])
end
f.printf "%6.2f %8.2f %8.2f %8d ", 0.0, total, 0.0, 1 # ???
f.printf "%8.2f %8.2f %s\n", 0.0, total*1000, "#toplevel" # ???
end
+ def get_name(klass, id)
+ name = klass.to_s || ""
+ if klass.kind_of? Class
+ name += "#"
+ else
+ name += "."
+ end
+ name + id.id2name
+ end
+ private :get_name
end
diff --git a/lib/pstore.rb b/lib/pstore.rb
index a2813a8e20..9fb0249f3c 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -7,7 +7,10 @@
#
# See PStore for documentation.
+
+require "fileutils"
require "digest/md5"
+require "thread"
#
# PStore implements a file based persistence mechanism based on a Hash. User
@@ -91,9 +94,10 @@ require "digest/md5"
# Needless to say, if you're storing valuable data with PStore, then you should
# backup the PStore files from time to time.
class PStore
- RDWR_ACCESS = {mode: IO::RDWR | IO::CREAT | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
- RD_ACCESS = {mode: IO::RDONLY | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
- WR_ACCESS = {mode: IO::WRONLY | IO::CREAT | IO::TRUNC | IO::BINARY, encoding: Encoding::ASCII_8BIT}.freeze
+ binmode = defined?(File::BINARY) ? File::BINARY : 0
+ RDWR_ACCESS = File::RDWR | File::CREAT | binmode
+ RD_ACCESS = File::RDONLY | binmode
+ WR_ACCESS = File::WRONLY | File::CREAT | File::TRUNC | binmode
# The error type thrown by all PStore methods.
class Error < StandardError
@@ -138,8 +142,8 @@ class PStore
# 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
+ def in_transaction_wr()
+ in_transaction()
raise PStore::Error, "in read-only transaction" if @rdonly
end
private :in_transaction, :in_transaction_wr
@@ -197,7 +201,7 @@ class PStore
# be read-only. It will raise PStore::Error if called at any other time.
#
def []=(name, value)
- in_transaction_wr
+ in_transaction_wr()
@table[name] = value
end
#
@@ -207,7 +211,7 @@ class PStore
# be read-only. It will raise PStore::Error if called at any other time.
#
def delete(name)
- in_transaction_wr
+ in_transaction_wr()
@table.delete name
end
@@ -307,18 +311,10 @@ class PStore
#
# Note that PStore does not support nested transactions.
#
- def transaction(read_only = false) # :yields: pstore
+ def transaction(read_only = false, &block) # :yields: pstore
value = nil
- if !@thread_safe
- raise PStore::Error, "nested transaction" unless @lock.try_lock
- else
- begin
- @lock.lock
- rescue ThreadError
- raise PStore::Error, "nested transaction"
- end
- end
- begin
+ raise PStore::Error, "nested transaction" if !@thread_safe && @lock.locked?
+ @lock.synchronize do
@rdonly = read_only
@abort = false
file = open_and_lock_file(@filename, read_only)
@@ -343,10 +339,10 @@ class PStore
value = yield(self)
end
end
- ensure
- @lock.unlock
end
value
+ rescue ThreadError
+ raise PStore::Error, "nested transaction"
end
private
@@ -393,7 +389,9 @@ class PStore
if read_only
begin
table = load(file)
- raise Error, "PStore file seems to be corrupted." unless table.is_a?(Hash)
+ if !table.is_a?(Hash)
+ raise Error, "PStore file seems to be corrupted."
+ end
rescue EOFError
# This seems to be a newly-created file.
table = {}
@@ -405,12 +403,14 @@ class PStore
# This seems to be a newly-created file.
table = {}
checksum = empty_marshal_checksum
- size = empty_marshal_data.bytesize
+ size = empty_marshal_data.size
else
table = load(data)
checksum = Digest::MD5.digest(data)
- size = data.bytesize
- raise Error, "PStore file seems to be corrupted." unless table.is_a?(Hash)
+ size = data.size
+ if !table.is_a?(Hash)
+ raise Error, "PStore file seems to be corrupted."
+ end
end
data.replace(EMPTY_STRING)
[table, checksum, size]
@@ -418,17 +418,43 @@ class PStore
end
def on_windows?
- is_windows = RUBY_PLATFORM =~ /mswin|mingw|bccwin|wince/
+ 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)
- new_data = dump(@table)
+ # 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.bytesize != original_file_size || Digest::MD5.digest(new_data) != original_checksum
+ 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)
@@ -458,8 +484,8 @@ class PStore
def save_data_with_fast_strategy(data, file)
file.rewind
+ file.truncate(0)
file.write(data)
- file.truncate(data.bytesize)
end
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index 1866d73efb..9b7a76bc58 100644
--- a/lib/racc/parser.rb
+++ b/lib/racc/parser.rb
@@ -1,4 +1,4 @@
-#--
+#
# $originalId: parser.rb,v 1.8 2006/07/06 11:42:07 aamine Exp $
#
# Copyright (c) 1999-2006 Minero Aoki
@@ -9,7 +9,11 @@
# As a special exception, when this code is copied by Racc
# into a Racc output file, you may use that output file
# without restriction.
-#++
+#
+
+unless defined?(NotImplementedError)
+ NotImplementedError = NotImplementError
+end
module Racc
class ParseError < StandardError; end
@@ -18,172 +22,18 @@ unless defined?(::ParseError)
ParseError = Racc::ParseError
end
-# Racc is a LALR(1) parser generator.
-# It is written in Ruby itself, and generates Ruby programs.
-#
-# == Command-line Reference
-#
-# racc [-o<var>filename</var>] [--output-file=<var>filename</var>]
-# [-e<var>rubypath</var>] [--embedded=<var>rubypath</var>]
-# [-v] [--verbose]
-# [-O<var>filename</var>] [--log-file=<var>filename</var>]
-# [-g] [--debug]
-# [-E] [--embedded]
-# [-l] [--no-line-convert]
-# [-c] [--line-convert-all]
-# [-a] [--no-omit-actions]
-# [-C] [--check-only]
-# [-S] [--output-status]
-# [--version] [--copyright] [--help] <var>grammarfile</var>
-#
-# [+filename+]
-# Racc grammar file. Any extention is permitted.
-# [-o+outfile+, --output-file=+outfile+]
-# A filename for output. default is <+filename+>.tab.rb
-# [-O+filename+, --log-file=+filename+]
-# Place logging output in file +filename+.
-# Default log file name is <+filename+>.output.
-# [-e+rubypath+, --executable=+rubypath+]
-# output executable file(mode 755). where +path+ is the ruby interpreter.
-# [-v, --verbose]
-# verbose mode. create +filename+.output file, like yacc's y.output file.
-# [-g, --debug]
-# add debug code to parser class. To display debuggin information,
-# use this '-g' option and set @yydebug true in parser class.
-# [-E, --embedded]
-# Output parser which doesn't need runtime files (racc/parser.rb).
-# [-C, --check-only]
-# Check syntax of racc grammer file and quit.
-# [-S, --output-status]
-# Print messages time to time while compiling.
-# [-l, --no-line-convert]
-# turns off line number converting.
-# [-c, --line-convert-all]
-# Convert line number of actions, inner, header and footer.
-# [-a, --no-omit-actions]
-# Call all actions, even if an action is empty.
-# [--version]
-# print Racc version and quit.
-# [--copyright]
-# Print copyright and quit.
-# [--help]
-# Print usage and quit.
-#
-# == Generating Parser Using Racc
-#
-# To compile Racc grammar file, simply type:
-#
-# $ racc parse.y
-#
-# This creates ruby script file "parse.tab.y". The -o option can change the output filename.
-#
-# == Writing A Racc Grammar File
-#
-# If you want your own parser, you have to write a grammar file.
-# A grammar file contains the name of your parser class, grammar for the parser,
-# user code, and anything else.
-# When writing a grammar file, yacc's knowledge is helpful.
-# If you have not used yacc before, Racc is not too difficult.
-#
-# Here's an example Racc grammar file.
-#
-# class Calcparser
-# rule
-# target: exp { print val[0] }
-#
-# exp: exp '+' exp
-# | exp '*' exp
-# | '(' exp ')'
-# | NUMBER
-# end
-#
-# Racc grammar files resemble yacc files.
-# But (of course), this is Ruby code.
-# yacc's $$ is the 'result', $0, $1... is
-# an array called 'val', and $-1, $-2... is an array called '_values'.
-#
-# See the {Grammar File Reference}[rdoc-ref:lib/racc/rdoc/grammar.en.rdoc] for
-# more information on grammar files.
-#
-# == Parser
-#
-# Then you must prepare the parse entry method. There are two types of
-# parse methods in Racc, Racc::Parser#do_parse and Racc::Parser#yyparse
-#
-# Racc::Parser#do_parse is simple.
-#
-# It's yyparse() of yacc, and Racc::Parser#next_token is yylex().
-# This method must returns an array like [TOKENSYMBOL, ITS_VALUE].
-# EOF is [false, false].
-# (TOKENSYMBOL is a Ruby symbol (taken from String#intern) by default.
-# If you want to change this, see the grammar reference.
-#
-# Racc::Parser#yyparse is little complicated, but useful.
-# It does not use Racc::Parser#next_token, instead it gets tokens from any iterator.
-#
-# For example, <code>yyparse(obj, :scan)</code> causes
-# calling +obj#scan+, and you can return tokens by yielding them from +obj#scan+.
-#
-# == Debugging
-#
-# When debugging, "-v" or/and the "-g" option is helpful.
-#
-# "-v" creates verbose log file (.output).
-# "-g" creates a "Verbose Parser".
-# Verbose Parser prints the internal status when parsing.
-# But it's _not_ automatic.
-# You must use -g option and set +@yydebug+ to +true+ in order to get output.
-# -g option only creates the verbose parser.
-#
-# === Racc reported syntax error.
-#
-# Isn't there too many "end"?
-# grammar of racc file is changed in v0.10.
-#
-# Racc does not use '%' mark, while yacc uses huge number of '%' marks..
-#
-# === Racc reported "XXXX conflicts".
-#
-# Try "racc -v xxxx.y".
-# It causes producing racc's internal log file, xxxx.output.
-#
-# === Generated parsers does not work correctly
-#
-# Try "racc -g xxxx.y".
-# This command let racc generate "debugging parser".
-# Then set @yydebug=true in your parser.
-# It produces a working log of your parser.
-#
-# == Re-distributing Racc runtime
-#
-# A parser, which is created by Racc, requires the Racc runtime module;
-# racc/parser.rb.
-#
-# Ruby 1.8.x comes with Racc runtime module,
-# you need NOT distribute Racc runtime files.
-#
-# If you want to include the Racc runtime module with your parser.
-# This can be done by using '-E' option:
-#
-# $ racc -E -omyparser.rb myparser.y
-#
-# This command creates myparser.rb which `includes' Racc runtime.
-# Only you must do is to distribute your parser file (myparser.rb).
-#
-# Note: parser.rb is LGPL, but your parser is not.
-# Your own parser is completely yours.
module Racc
unless defined?(Racc_No_Extentions)
- Racc_No_Extentions = false # :nodoc:
+ Racc_No_Extentions = false
end
class Parser
- Racc_Runtime_Version = '1.4.6'
+ Racc_Runtime_Version = '1.4.5'
Racc_Runtime_Revision = %w$originalRevision: 1.8 $[1]
- Racc_Runtime_Core_Version_R = '1.4.6'
+ Racc_Runtime_Core_Version_R = '1.4.5'
Racc_Runtime_Core_Revision_R = %w$originalRevision: 1.8 $[1]
begin
require 'racc/cparse'
@@ -196,11 +46,11 @@ module Racc
raise LoadError, 'selecting ruby version of racc runtime core'
end
- Racc_Main_Parsing_Routine = :_racc_do_parse_c # :nodoc:
- Racc_YY_Parse_Method = :_racc_yyparse_c # :nodoc:
- Racc_Runtime_Core_Version = Racc_Runtime_Core_Version_C # :nodoc:
- Racc_Runtime_Core_Revision = Racc_Runtime_Core_Revision_C # :nodoc:
- Racc_Runtime_Type = 'c' # :nodoc:
+ Racc_Main_Parsing_Routine = :_racc_do_parse_c
+ Racc_YY_Parse_Method = :_racc_yyparse_c
+ Racc_Runtime_Core_Version = Racc_Runtime_Core_Version_C
+ Racc_Runtime_Core_Revision = Racc_Runtime_Core_Revision_C
+ Racc_Runtime_Type = 'c'
rescue LoadError
Racc_Main_Parsing_Routine = :_racc_do_parse_rb
Racc_YY_Parse_Method = :_racc_yyparse_rb
@@ -209,10 +59,12 @@ module Racc
Racc_Runtime_Type = 'ruby'
end
- def Parser.racc_runtime_type # :nodoc:
+ def Parser.racc_runtime_type
Racc_Runtime_Type
end
+ private
+
def _racc_setup
@yydebug = false unless self.class::Racc_debug_parser
@yydebug = false unless defined?(@yydebug)
@@ -239,45 +91,27 @@ module Racc
@racc_error_status = 0
end
- # The entry point of the parser. This method is used with #next_token.
- # If Racc wants to get token (and its value), calls next_token.
- #
- # Example:
- # def parse
- # @q = [[1,1],
- # [2,2],
- # [3,3],
- # [false, '$']]
- # do_parse
- # end
- #
- # def next_token
- # @q.shift
- # end
+ ###
+ ### do_parse
+ ###
+
def do_parse
__send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
end
- # The method to fetch next token.
- # If you use #do_parse method, you must implement #next_token.
- #
- # The format of return value is [TOKEN_SYMBOL, VALUE].
- # +token-symbol+ is represented by Ruby's symbol by default, e.g. :IDENT
- # for 'IDENT'. ";" (String) for ';'.
- #
- # The final symbol (End of file) must be false.
def next_token
raise NotImplementedError, "#{self.class}\#next_token is not defined"
end
def _racc_do_parse_rb(arg, in_debug)
action_table, action_check, action_default, action_pointer,
- _, _, _, _,
- _, _, token_table, _,
- _, _, * = arg
+ goto_table, goto_check, goto_default, goto_pointer,
+ nt_base, reduce_table, token_table, shift_n,
+ reduce_n, use_result, * = arg
_racc_init_sysvars
tok = act = i = nil
+ nerr = 0
catch(:racc_end_parse) {
while true
@@ -310,24 +144,24 @@ module Racc
}
end
- # Another entry point for the parser.
- # If you use this method, you must implement RECEIVER#METHOD_ID method.
- #
- # RECEIVER#METHOD_ID is a method to get next token.
- # It must 'yield' the token, which format is [TOKEN-SYMBOL, VALUE].
+ ###
+ ### yyparse
+ ###
+
def yyparse(recv, mid)
__send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
end
def _racc_yyparse_rb(recv, mid, arg, c_debug)
action_table, action_check, action_default, action_pointer,
- _, _, _, _,
- _, _, token_table, _,
- _, _, * = arg
+ goto_table, goto_check, goto_default, goto_pointer,
+ nt_base, reduce_table, token_table, shift_n,
+ reduce_n, use_result, * = arg
_racc_init_sysvars
act = nil
i = nil
+ nerr = 0
catch(:racc_end_parse) {
until i = action_pointer[@racc_state[-1]]
@@ -376,10 +210,10 @@ module Racc
###
def _racc_evalact(act, arg)
- action_table, action_check, _, action_pointer,
- _, _, _, _,
- _, _, _, shift_n, reduce_n,
- _, _, * = arg
+ action_table, action_check, action_default, action_pointer,
+ goto_table, goto_check, goto_default, goto_pointer,
+ nt_base, reduce_table, token_table, shift_n,
+ reduce_n, use_result, * = arg
nerr = 0 # tmp
if act > 0 and act < shift_n
@@ -471,10 +305,10 @@ module Racc
end
def _racc_do_reduce(arg, act)
- _, _, _, _,
+ action_table, action_check, action_default, action_pointer,
goto_table, goto_check, goto_default, goto_pointer,
- nt_base, reduce_table, _, _,
- _, use_result, * = arg
+ nt_base, reduce_table, token_table, shift_n,
+ reduce_n, use_result, * = arg
state = @racc_state
vstack = @racc_vstack
tstack = @racc_tstack
@@ -511,43 +345,27 @@ module Racc
goto_default[k1]
end
- # This method is called when a parse error is found.
- #
- # ERROR_TOKEN_ID is an internal ID of token which caused error.
- # You can get string representation of this ID by calling
- # #token_to_str.
- #
- # ERROR_VALUE is a value of error token.
- #
- # value_stack is a stack of symbol values.
- # DO NOT MODIFY this object.
- #
- # This method raises ParseError by default.
- #
- # If this method returns, parsers enter "error recovering mode".
def on_error(t, val, vstack)
raise ParseError, sprintf("\nparse error on value %s (%s)",
val.inspect, token_to_str(t) || '?')
end
- # Enter error recovering mode.
- # This method does not call #on_error.
def yyerror
throw :racc_jump, 1
end
- # Exit parser.
- # Return value is Symbol_Value_Stack[0].
def yyaccept
throw :racc_jump, 2
end
- # Leave error recovering mode.
def yyerrok
@racc_error_status = 0
end
- # For debugging output
+ #
+ # for debugging output
+ #
+
def racc_read_token(t, tok, val)
@racc_debug_out.print 'read '
@racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
@@ -614,7 +432,6 @@ module Racc
raise "[Racc Bug] can't convert token #{tok} to string"
end
- # Convert internal ID of token symbol to the string.
def token_to_str(t)
self.class::Racc_token_to_s_table[t]
end
diff --git a/lib/racc/rdoc/grammar.en.rdoc b/lib/racc/rdoc/grammar.en.rdoc
deleted file mode 100644
index 7645152248..0000000000
--- a/lib/racc/rdoc/grammar.en.rdoc
+++ /dev/null
@@ -1,219 +0,0 @@
-= Racc Grammar File Reference
-
-== Global Structure
-
-== Class Block and User Code Block
-
-There are two blocks on toplevel. One is 'class' block, another is 'user code'
-block. 'user code' block MUST be placed after 'class' block.
-
-== Comments
-
-You can insert comments about all places. Two style comments can be used, Ruby style '#.....' and C style '/\*......*\/'.
-
-== Class Block
-
-The class block is formed like this:
-
- class CLASS_NAME
- [precedance table]
- [token declarations]
- [expected number of S/R conflicts]
- [options]
- [semantic value convertion]
- [start rule]
- rule
- GRAMMARS
-
-CLASS_NAME is a name of parser class. This is the name of generating parser
-class.
-
-If CLASS_NAME includes '::', Racc outputs module clause. For example, writing
-"class M::C" causes creating the code bellow:
-
- module M
- class C
- :
- :
- end
- end
-
-== Grammar Block
-
-The grammar block describes grammar which is able to be understood by parser.
-Syntax is:
-
- (token): (token) (token) (token).... (action)
-
- (token): (token) (token) (token).... (action)
- | (token) (token) (token).... (action)
- | (token) (token) (token).... (action)
-
-(action) is an action which is executed when its (token)s are found.
-(action) is a ruby code block, which is surrounded by braces:
-
- { print val[0]
- puts val[1] }
-
-Note that you cannot use '%' string, here document, '%r' regexp in action.
-
-Actions can be omitted. When it is omitted, '' (empty string) is used.
-
-A return value of action is a value of left side value ($$). It is value of
-result, or returned value by `return` statement.
-
-Here is an example of whole grammar block.
-
- rule
- goal: definition rules source { result = val }
-
- definition: /* none */ { result = [] }
- | definition startdesig { result[0] = val[1] }
- | definition
- precrule # this line continues from upper line
- {
- result[1] = val[1]
- }
-
- startdesig: START TOKEN
-
-You can use the following special local variables in action:
-
-* result ($$)
-
-The value of left-hand side (lhs). A default value is val[0].
-
-* val ($1,$2,$3...)
-
-An array of value of right-hand side (rhs).
-
-* _values (...$-2,$-1,$0)
-
-A stack of values. DO NOT MODIFY this stack unless you know what you are doing.
-
-== Operator Precedance
-
-This function is equal to '%prec' in yacc.
-To designate this block:
-
- prechigh
- nonassoc '++'
- left '*' '/'
- left '+' '-'
- right '='
- preclow
-
-`right` is yacc's %right, `left` is yacc's %left.
-
-`=` + (symbol) means yacc's %prec:
-
- prechigh
- nonassoc UMINUS
- left '*' '/'
- left '+' '-'
- preclow
-
- rule
- exp: exp '*' exp
- | exp '-' exp
- | '-' exp =UMINUS # equals to "%prec UMINUS"
- :
- :
-
-== expect
-
-Racc has bison's "expect" directive.
-
- # Example
-
- class MyParser
- rule
- expect 3
- :
- :
-
-This directive declares "expected" number of shift/reduce conflicts. If
-"expected" number is equal to real number of conflicts, Racc does not print
-conflict warning message.
-
-== Declaring Tokens
-
-By declaring tokens, you can avoid many meaningless bugs. If declared token
-does not exist or existing token does not decleared, Racc output warnings.
-Declaration syntax is:
-
- token TOKEN_NAME AND_IS_THIS
- ALSO_THIS_IS AGAIN_AND_AGAIN THIS_IS_LAST
-
-== Options
-
-You can write options for Racc command in your Racc file.
-
- options OPTION OPTION ...
-
-Options are:
-
-* omit_action_call
-
-omits empty action call or not.
-
-* result_var
-
-uses local variable "result" or not.
-
-You can use 'no_' prefix to invert their meanings.
-
-== Converting Token Symbol
-
-Token symbols are, as default,
-
- * naked token string in Racc file (TOK, XFILE, this_is_token, ...)
- --> symbol (:TOK, :XFILE, :this_is_token, ...)
- * quoted string (':', '.', '(', ...)
- --> same string (':', '.', '(', ...)
-
-You can change this default by "convert" block.
-Here is an example:
-
- convert
- PLUS 'PlusClass' # We use PlusClass for symbol of `PLUS'
- MIN 'MinusClass' # We use MinusClass for symbol of `MIN'
- end
-
-We can use almost all ruby value can be used by token symbol,
-except 'false' and 'nil'. These cause unexpected parse error.
-
-If you want to use String as token symbol, special care is required.
-For example:
-
- convert
- class '"cls"' # in code, "cls"
- PLUS '"plus\n"' # in code, "plus\n"
- MIN "\"minus#{val}\"" # in code, \"minus#{val}\"
- end
-
-== Start Rule
-
-'%start' in yacc. This changes start rule.
-
- start real_target
-
-== User Code Block
-
-"User Code Block" is a Ruby source code which is copied to output. There are
-three user code blocks, "header" "inner" and "footer".
-
-Format of user code is like this:
-
- ---- header
- ruby statement
- ruby statement
- ruby statement
-
- ---- inner
- ruby statement
- :
- :
-
-If four '-' exist on line head, Racc treat it as beginning of user code block.
-The name of user code block must be one word.
diff --git a/lib/rake.rb b/lib/rake.rb
index fff13fe460..b46b196878 100644
--- a/lib/rake.rb
+++ b/lib/rake.rb
@@ -1,6 +1,6 @@
#--
-# Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
+# 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
@@ -20,12 +20,14 @@
# 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.
-require 'rake/version'
-
-# :stopdoc:
-RAKEVERSION = Rake::VERSION
-# :startdoc:
+RAKEVERSION = '0.8.7'
require 'rbconfig'
require 'fileutils'
@@ -34,38 +36,2450 @@ require 'monitor'
require 'optparse'
require 'ostruct'
-require 'rake/ext/module'
-require 'rake/ext/string'
-require 'rake/ext/time'
-
require 'rake/win32'
-require 'rake/task_argument_error'
-require 'rake/rule_recursion_overflow_error'
-require 'rake/rake_module'
-require 'rake/trace_output'
-require 'rake/pseudo_status'
-require 'rake/task_arguments'
-require 'rake/invocation_chain'
-require 'rake/task'
-require 'rake/file_task'
-require 'rake/file_creation_task'
-require 'rake/multi_task'
-require 'rake/dsl_definition'
-require 'rake/file_utils_ext'
-require 'rake/file_list'
-require 'rake/default_loader'
-require 'rake/early_time'
-require 'rake/name_space'
-require 'rake/task_manager'
-require 'rake/application'
-require 'rake/backtrace'
-
$trace = false
-# :stopdoc:
+######################################################################
+# 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).ext
+ 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
+
+ ####################################################################
+ # Exit status class for times the system just gives us a nil.
+ class PseudoStatus
+ attr_reader :exitstatus
+ def initialize(code=0)
+ @exitstatus = code
+ end
+ def to_i
+ @exitstatus << 8
+ end
+ def >>(n)
+ to_i >> n
+ end
+ def stopped?
+ false
+ end
+ def exited?
+ true
+ 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_EXT = ((RbConfig::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ?
+ "" :
+ RbConfig::CONFIG['EXEEXT'])
+
+ RUBY = File.join(
+ RbConfig::CONFIG['bindir'],
+ RbConfig::CONFIG['ruby_install_name'] + RUBY_EXT).
+ 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] + "..." unless $trace
+ # 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)
+ status = $?
+ status = PseudoStatus.new(1) if !res && status.nil?
+ block.call(res, status)
+ 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.
#
-# Some top level Constants.
+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)
+ define_method(sym) do |*args, &block|
+ resolve
+ result = @items.send(sym, *args, &block)
+ FileList.new.import(result)
+ end
+ else
+ define_method(sym) do |*args, &block|
+ resolve
+ result = @items.send(sym, *args, &block)
+ result.object_id == @items.object_id ? self : result
+ 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 FileList 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, *options)
+ each do |fn|
+ open(fn, "rb", *options) 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
-RakeFileUtils = Rake::FileUtilsExt
+
+#############################################################################
+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
+ init
+ load_rakefile
+ top_level
+ 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 or true
+ $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 ||= ENV['RAKE_SYSTEM'] || standard_system_dir
+ end
+
+ # The standard directory containing system wide rake files.
+ unless method_defined?(:standard_system_dir)
+ 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/alt_system.rb b/lib/rake/alt_system.rb
deleted file mode 100644
index 05af19863a..0000000000
--- a/lib/rake/alt_system.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2008 James M. Lawrence
-#
-# 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 'rbconfig'
-
-#
-# Alternate implementations of system() and backticks `` on Windows
-# for ruby-1.8 and earlier.
-#
-module Rake::AltSystem
- WINDOWS = RbConfig::CONFIG["host_os"] =~
- %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
-
- class << self
- def define_module_function(name, &block)
- define_method(name, &block)
- module_function(name)
- end
- end
-
- if WINDOWS and RUBY_VERSION < "1.9.0"
- RUNNABLE_EXTS = %w[com exe bat cmd]
- RUNNABLE_PATTERN = %r!\.(#{RUNNABLE_EXTS.join('|')})\Z!i
-
- define_module_function :kernel_system, &Kernel.method(:system)
- define_module_function :kernel_backticks, &Kernel.method(:'`')
-
- module_function
-
- def repair_command(cmd)
- "call " + (
- if cmd =~ %r!\A\s*\".*?\"!
- # already quoted
- cmd
- elsif match = cmd.match(%r!\A\s*(\S+)!)
- if match[1] =~ %r!/!
- # avoid x/y.bat interpretation as x with option /y
- %Q!"#{match[1]}"! + match.post_match
- else
- # a shell command will fail if quoted
- cmd
- end
- else
- # empty or whitespace
- cmd
- end
- )
- end
-
- def find_runnable(file)
- if file =~ RUNNABLE_PATTERN
- file
- else
- RUNNABLE_EXTS.each { |ext|
- if File.exist?(test = "#{file}.#{ext}")
- return test
- end
- }
- nil
- end
- end
-
- def system(cmd, *args)
- repaired = (
- if args.empty?
- [repair_command(cmd)]
- elsif runnable = find_runnable(cmd)
- [File.expand_path(runnable), *args]
- else
- # non-existent file
- [cmd, *args]
- end
- )
- kernel_system(*repaired)
- end
-
- def backticks(cmd)
- kernel_backticks(repair_command(cmd))
- end
-
- define_module_function :'`', &method(:backticks)
- else
- # Non-Windows or ruby-1.9+: same as Kernel versions
- define_module_function :system, &Kernel.method(:system)
- define_module_function :backticks, &Kernel.method(:'`')
- define_module_function :'`', &Kernel.method(:'`')
- end
-end
diff --git a/lib/rake/application.rb b/lib/rake/application.rb
deleted file mode 100644
index 734e20ac31..0000000000
--- a/lib/rake/application.rb
+++ /dev/null
@@ -1,702 +0,0 @@
-require 'shellwords'
-require 'optparse'
-
-require 'rake/task_manager'
-require 'rake/file_list'
-require 'rake/thread_pool'
-require 'rake/thread_history_display'
-require 'rake/trace_output'
-require 'rake/win32'
-
-module Rake
-
- CommandLineOptionError = Class.new(StandardError)
-
- ######################################################################
- # Rake main application object. When invoking +rake+ from the
- # command line, a Rake::Application object is created and run.
- #
- class Application
- include TaskManager
- include TraceOutput
-
- # 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
-
- # Number of columns on the terminal
- attr_accessor :terminal_columns
-
- # 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?
- @terminal_columns = ENV['RAKE_COLUMNS'].to_i
- 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 (+top_level+).
- #
- # If you wish to build a custom rake command, you should call
- # +init+ on your application. Then 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
- run_with_threads 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
-
- # Run the given block with the thread startup and shutdown.
- def run_with_threads
- thread_pool.gather_history if options.job_stats == :history
-
- yield
-
- thread_pool.join
- if options.job_stats
- stats = thread_pool.statistics
- puts "Maximum active threads: #{stats[:max_active_threads]}"
- puts "Total threads in play: #{stats[:total_threads_in_play]}"
- end
- ThreadHistoryDisplay.new(thread_pool.history).show if options.job_stats == :history
- 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
-
- # Return the thread pool used for multithreaded processing.
- def thread_pool # :nodoc:
- @thread_pool ||= ThreadPool.new(options.thread_pool_size||FIXNUM_MAX)
- 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 exception handling for the given block.
- def standard_exception_handling
- begin
- yield
- rescue SystemExit => ex
- # Exit silently with current status
- raise
- rescue OptionParser::InvalidOption => ex
- $stderr.puts ex.message
- exit(false)
- rescue Exception => ex
- # Exit with error message
- display_error_message(ex)
- exit(false)
- end
- end
-
- # Display the error message that caused the exception.
- def display_error_message(ex)
- trace "#{name} aborted!"
- trace ex.message
- if options.backtrace
- trace ex.backtrace.join("\n")
- else
- trace Backtrace.collapse(ex.backtrace).join("\n")
- end
- trace "Tasks: #{ex.chain}" if has_chain?(ex)
- trace "(See full trace by running task with --trace)" unless options.backtrace
- end
-
- # Warn about deprecated usage.
- #
- # Example:
- # Rake.application.deprecate("import", "Rake.import", caller.first)
- #
- def deprecate(old_usage, new_usage, call_site)
- return if options.ignore_deprecate
- $stderr.puts "WARNING: '#{old_usage}' is deprecated. " +
- "Please use '#{new_usage}' instead.\n" +
- " at #{call_site}"
- end
-
- # Does the exception have a task invocation chain?
- def has_chain?(exception)
- exception.respond_to?(:chain) && exception.chain
- end
- private :has_chain?
-
- # 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 = FileList.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? || @terminal_columns.nonzero?
- end
-
- # Display the tasks and comments.
- def display_tasks_and_comments
- displayable_tasks = tasks.select { |t|
- (options.show_all_tasks || t.comment) && t.name =~ options.show_task_pattern
- }
- case options.show_tasks
- when :tasks
- 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
- when :describe
- displayable_tasks.each do |t|
- puts "#{name} #{t.name_with_args}"
- comment = t.full_comment || ""
- comment.split("\n").each do |line|
- puts " #{line}"
- end
- puts
- end
- when :lines
- displayable_tasks.each do |t|
- t.locations.each do |loc|
- printf "#{name} %-30s %s\n",t.name_with_args, loc
- end
- end
- else
- fail "Unknown show task mode: '#{options.show_tasks}'"
- end
- end
-
- def terminal_width
- if @terminal_columns.nonzero?
- result = @terminal_columns
- 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?
- RbConfig::CONFIG['host_os'] =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
- end
-
- def windows?
- Win32.windows?
- end
-
- def truncate(string, width)
- if string.nil?
- ""
- elsif 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
-
- def trace(*strings)
- options.trace_output ||= $stderr
- trace_on(options.trace_output, *strings)
- end
-
- def sort_options(options)
- options.sort_by { |opt|
- opt.select { |o| o =~ /^-/ }.map { |o| o.downcase }.sort.reverse
- }
- end
- private :sort_options
-
- # A list of all the standard options used in rake, suitable for
- # passing to OptionParser.
- def standard_rake_options
- sort_options(
- [
- ['--all', '-A', "Show all tasks, even uncommented ones",
- lambda { |value|
- options.show_all_tasks = value
- }
- ],
- ['--backtrace=[OUT]', "Enable full backtrace. OUT can be stderr (default) or stdout.",
- lambda { |value|
- options.backtrace = true
- select_trace_output(options, 'backtrace', value)
- }
- ],
- ['--classic-namespace', '-C', "Put Task and FileTask in the top level namespace",
- lambda { |value|
- require 'rake/classic_namespace'
- options.classic_namespace = true
- }
- ],
- ['--comments', "Show commented tasks only",
- lambda { |value|
- options.show_all_tasks = !value
- }
- ],
- ['--describe', '-D [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
- lambda { |value|
- select_tasks_to_show(options, :describe, value)
- }
- ],
- ['--dry-run', '-n', "Do a dry run without executing actions.",
- lambda { |value|
- Rake.verbose(true)
- Rake.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) }
- ],
- ['--jobs', '-j [NUMBER]',
- "Specifies the maximum number of tasks to execute in parallel. (default:2)",
- lambda { |value| options.thread_pool_size = [(value || 2).to_i,2].max }
- ],
- ['--job-stats [LEVEL]',
- "Display job statistics. LEVEL=history displays a complete job list",
- lambda { |value|
- if value =~ /^history/i
- options.job_stats = :history
- else
- options.job_stats = true
- end
- }
- ],
- ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
- lambda { |value| $:.push(value) }
- ],
- ['--multitask', '-m', "Treat all tasks as multitasks.",
- lambda { |value| options.always_multitask = true }
- ],
- ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
- lambda { |value| options.nosearch = true }
- ],
- ['--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| Rake.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(File::PATH_SEPARATOR) }
- ],
- ['--reduce-compat', "Remove DSL in Object; remove Module#const_missing which defines ::Task etc.",
- # Load-time option.
- # Handled in bin/rake where Rake::REDUCE_COMPAT is defined (or not).
- lambda { |_| }
- ],
- ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
- lambda { |value|
- begin
- require value
- rescue LoadError => ex
- begin
- rake_require value
- rescue LoadError
- raise ex
- end
- end
- }
- ],
- ['--rules', "Trace the rules resolution.",
- lambda { |value| options.trace_rules = true }
- ],
- ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
- lambda { |value|
- Rake.verbose(false)
- options.silent = true
- }
- ],
- ['--suppress-backtrace PATTERN', "Suppress backtrace lines matching regexp PATTERN. Ignored if --trace is on.",
- lambda { |value|
- options.suppress_backtrace_pattern = Regexp.new(value)
- }
- ],
- ['--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|
- select_tasks_to_show(options, :tasks, value)
- }
- ],
- ['--trace=[OUT]', '-t', "Turn on invoke/execute tracing, enable full backtrace. OUT can be stderr (default) or stdout.",
- lambda { |value|
- options.trace = true
- options.backtrace = true
- select_trace_output(options, 'trace', value)
- Rake.verbose(true)
- }
- ],
- ['--verbose', '-v', "Log message to standard output.",
- lambda { |value| Rake.verbose(true) }
- ],
- ['--version', '-V', "Display the program version.",
- lambda { |value|
- puts "rake, version #{RAKEVERSION}"
- exit
- }
- ],
- ['--where', '-W [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
- lambda { |value|
- select_tasks_to_show(options, :lines, value)
- options.show_all_tasks = true
- }
- ],
- ['--no-deprecation-warnings', '-X', "Disable the deprecation warnings.",
- lambda { |value|
- options.ignore_deprecate = true
- }
- ],
- ])
- end
-
- def select_tasks_to_show(options, show_tasks, value)
- options.show_tasks = show_tasks
- options.show_task_pattern = Regexp.new(value || '')
- Rake::TaskManager.record_task_metadata = true
- end
- private :select_tasks_to_show
-
- def select_trace_output(options, trace_option, value)
- value = value.strip unless value.nil?
- case value
- when 'stdout'
- options.trace_output = $stdout
- when 'stderr', nil
- options.trace_output = $stderr
- else
- fail CommandLineOptionError, "Unrecognized --#{trace_option} option '#{value}'"
- end
- end
- private :select_trace_output
-
- # Read and handle the command line options.
- def handle_options
- options.rakelib = ['rakelib']
- options.trace_output = $stderr
-
- 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) }
- opts.environment('RAKEOPT')
- 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=$")
- fn = file_name + ".rake"
- return false if loaded.include?(fn)
- paths.each do |path|
- full_path = File.join(path, fn)
- if File.exist?(full_path)
- Rake.load_rakefile(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 print_rakefile_directory(location)
- $stderr.puts "(in #{Dir.pwd})" unless
- options.silent or original_dir == location
- 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)
- print_rakefile_directory(location)
- 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)
- print_rakefile_directory(location)
- $rakefile = @rakefile if options.classic_namespace
- Rake.load_rakefile(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)
- FileList.glob(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.join(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(backtrace=caller)
- backtrace.map { |t| t[/([^:]+):/,1] }
-
- re = /^#{@rakefile}$/
- re = /#{re.source}/i if windows?
-
- backtrace.find { |str| str =~ re } || ''
- end
-
- private
- FIXNUM_MAX = (2**(0.size * 8 - 2) - 1) # :nodoc:
-
- end
-end
diff --git a/lib/rake/backtrace.rb b/lib/rake/backtrace.rb
deleted file mode 100644
index e67132f67a..0000000000
--- a/lib/rake/backtrace.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Rake
- module Backtrace
- SUPPRESSED_PATHS =
- RbConfig::CONFIG.values_at(*RbConfig::CONFIG.
- keys.grep(/(prefix|libdir)/)).uniq + [
- File.join(File.dirname(__FILE__), ".."),
- ].map { |f| Regexp.quote(File.expand_path(f)) }
- SUPPRESSED_PATHS.reject! { |s| s.nil? || s =~ /^ *$/ }
-
- SUPPRESS_PATTERN = %r!(\A#{SUPPRESSED_PATHS.join('|')}|bin/rake:\d+)!i
-
- def self.collapse(backtrace)
- pattern = Rake.application.options.suppress_backtrace_pattern ||
- SUPPRESS_PATTERN
- backtrace.reject { |elem| elem =~ pattern }
- end
- end
-end
diff --git a/lib/rake/classic_namespace.rb b/lib/rake/classic_namespace.rb
index 6e71012da4..feb7569966 100644
--- a/lib/rake/classic_namespace.rb
+++ b/lib/rake/classic_namespace.rb
@@ -2,10 +2,7 @@
# Loading this file enables compatibility with older Rakefile that
# referenced Task from the top level.
-warn "WARNING: Classic namespaces are deprecated and will be removed from future versions of Rake."
-# :stopdoc:
Task = Rake::Task
FileTask = Rake::FileTask
FileCreationTask = Rake::FileCreationTask
RakeApp = Rake::Application
-# :startdoc:
diff --git a/lib/rake/clean.rb b/lib/rake/clean.rb
index 32846d4a6d..62f27d5751 100644
--- a/lib/rake/clean.rb
+++ b/lib/rake/clean.rb
@@ -13,10 +13,9 @@
require 'rake'
-# :stopdoc:
CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
CLEAN.clear_exclude.exclude { |fn|
- fn.pathmap("%f").downcase == 'core' && File.directory?(fn)
+ fn.pathmap("%f") == 'core' && File.directory?(fn)
}
desc "Remove any temporary products."
diff --git a/lib/rake/cloneable.rb b/lib/rake/cloneable.rb
deleted file mode 100644
index ac67471232..0000000000
--- a/lib/rake/cloneable.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Rake
- # ##########################################################################
- # Mixin for creating easily cloned objects.
- #
- module Cloneable
- # The hook that invoked by 'clone' and 'dup' methods.
- def initialize_copy(source)
- super
- source.instance_variables.each do |var|
- src_value = source.instance_variable_get(var)
- value = src_value.clone rescue src_value
- instance_variable_set(var, value)
- end
- end
- end
-end
diff --git a/lib/rake/contrib/compositepublisher.rb b/lib/rake/contrib/compositepublisher.rb
index 69952a0808..31ef080dd7 100644
--- a/lib/rake/contrib/compositepublisher.rb
+++ b/lib/rake/contrib/compositepublisher.rb
@@ -18,4 +18,3 @@ module Rake
end
end
-
diff --git a/lib/rake/contrib/ftptools.rb b/lib/rake/contrib/ftptools.rb
index d39cde8ed9..4c6897f02e 100644
--- a/lib/rake/contrib/ftptools.rb
+++ b/lib/rake/contrib/ftptools.rb
@@ -5,7 +5,6 @@
require 'date'
require 'net/ftp'
-require 'rake/file_list'
module Rake # :nodoc:
@@ -24,7 +23,7 @@ module Rake # :nodoc:
def initialize(path, entry)
@path = path
- @mode, _, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
+ @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
@size = size.to_i
@time = determine_time(d1, d2, d3)
end
@@ -58,6 +57,7 @@ module Rake # :nodoc:
def determine_time(d1, d2, d3)
now = self.class.time.now
if /:/ =~ d3
+ h, m = d3.split(':')
result = Time.parse("#{d1} #{d2} #{now.year} #{d3}")
if result > now
result = Time.parse("#{d1} #{d2} #{now.year-1} #{d3}")
@@ -100,7 +100,7 @@ module Rake # :nodoc:
end
end
- # Create an FTP uploader targeting the directory +path+ on +host+
+ # Create an FTP uploader targetting the directory +path+ on +host+
# using the given account and password. +path+ will be the root
# path of the uploader.
def initialize(path, host, account, password)
@@ -119,7 +119,7 @@ module Rake # :nodoc:
current_dir = File.join(route)
if @created[current_dir].nil?
@created[current_dir] = true
- $stderr.puts "Creating Directory #{current_dir}" if @verbose
+ puts "Creating Directory #{current_dir}" if @verbose
@ftp.mkdir(current_dir) rescue nil
end
end
@@ -128,7 +128,7 @@ module Rake # :nodoc:
# Upload all files matching +wildcard+ to the uploader's root
# path.
def upload_files(wildcard)
- FileList.glob(wildcard).each do |fn|
+ Dir[wildcard].each do |fn|
upload(fn)
end
end
@@ -142,7 +142,7 @@ module Rake # :nodoc:
# Upload a single file to the uploader's root path.
def upload(file)
- $stderr.puts "Uploading #{file}" if @verbose
+ puts "Uploading #{file}" if @verbose
dir = File.dirname(file)
makedirs(dir)
@ftp.putbinaryfile(file, file) unless File.directory?(file)
diff --git a/lib/rake/contrib/publisher.rb b/lib/rake/contrib/publisher.rb
index 8b11edb59c..7f69d3a654 100644
--- a/lib/rake/contrib/publisher.rb
+++ b/lib/rake/contrib/publisher.rb
@@ -1,19 +1,19 @@
-# Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
# All rights reserved.
-# :stopdoc:
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
# Configuration information about an upload host system.
-# name :: Name of host system.
-# webdir :: Base directory for the web information for the
-# application. The application name (APP) is appended to
-# this directory before using.
-# pkgdir :: Directory on the host system where packages can be
-# placed.
+# * name :: Name of host system.
+# * webdir :: Base directory for the web information for the
+# application. The application name (APP) is appended to
+# this directory before using.
+# * pkgdir :: Directory on the host system where packages can be
+# placed.
HostInfo = Struct.new(:name, :webdir, :pkgdir)
-# :startdoc:
-
# Manage several publishers as a single entity.
class CompositePublisher
def initialize
diff --git a/lib/rake/contrib/sshpublisher.rb b/lib/rake/contrib/sshpublisher.rb
index bd6adc127e..e679716c7b 100644
--- a/lib/rake/contrib/sshpublisher.rb
+++ b/lib/rake/contrib/sshpublisher.rb
@@ -1,4 +1,3 @@
-require 'rake/dsl_definition'
require 'rake/contrib/compositepublisher'
module Rake
@@ -6,8 +5,6 @@ module Rake
# Publish an entire directory to an existing remote directory using
# SSH.
class SshDirPublisher
- include Rake::DSL
-
def initialize(host, remote_dir, local_dir)
@host = host
@remote_dir = remote_dir
@@ -30,8 +27,6 @@ module Rake
# Publish a list of files to an existing remote directory.
class SshFilePublisher
- include Rake::DSL
-
# Create a publisher using the give host information.
def initialize(host, remote_dir, local_dir, *files)
@host = host
diff --git a/lib/rake/contrib/sys.rb b/lib/rake/contrib/sys.rb
deleted file mode 100644
index 5e31ea81b4..0000000000
--- a/lib/rake/contrib/sys.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-warn 'Sys has been deprecated in favor of FileUtils'
-
-#--
-# Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
-# All rights reserved.
-#++
-#
-begin
- require 'ftools'
-rescue LoadError
-end
-require 'rbconfig'
-require 'rake/file_list'
-
-######################################################################
-# Sys provides a number of file manipulation tools for the convenience
-# of writing Rakefiles. All commands in this module will announce
-# their activity on standard output if the $verbose flag is set
-# ($verbose = true is the default). You can control this by globally
-# setting $verbose or by using the +verbose+ and +quiet+ methods.
-#
-# Sys has been deprecated in favor of the FileUtils module available
-# in Ruby 1.8.
-#
-module Sys
- RUBY = RbConfig::CONFIG['ruby_install_name']
-
- # Install all the files matching +wildcard+ into the +dest_dir+
- # directory. The permission mode is set to +mode+.
- def install(wildcard, dest_dir, mode)
- FileList.glob(wildcard).each do |fn|
- File.install(fn, dest_dir, mode, $verbose)
- end
- end
-
- # Run the system command +cmd+.
- def run(cmd)
- log cmd
- system(cmd) or fail "Command Failed: [#{cmd}]"
- end
-
- # Run a Ruby interpreter with the given arguments.
- def ruby(*args)
- run "#{RUBY} #{args.join(' ')}"
- end
-
- # Copy a single file from +file_name+ to +dest_file+.
- def copy(file_name, dest_file)
- log "Copying file #{file_name} to #{dest_file}"
- File.copy(file_name, dest_file)
- end
-
- # Copy all files matching +wildcard+ into the directory +dest_dir+.
- def copy_files(wildcard, dest_dir)
- for_matching_files(wildcard, dest_dir) { |from, to| copy(from, to) }
- end
-
- # Link +file_name+ to +dest_file+.
- def link(file_name, dest_file)
- log "Linking file #{file_name} to #{dest_file}"
- File.link(file_name, dest_file)
- end
-
- # Link all files matching +wildcard+ into the directory +dest_dir+.
- def link_files(wildcard, dest_dir)
- for_matching_files(wildcard, dest_dir) { |from, to| link(from, to) }
- end
-
- # Symlink +file_name+ to +dest_file+.
- def symlink(file_name, dest_file)
- log "Symlinking file #{file_name} to #{dest_file}"
- File.symlink(file_name, dest_file)
- end
-
- # Symlink all files matching +wildcard+ into the directory +dest_dir+.
- def symlink_files(wildcard, dest_dir)
- for_matching_files(wildcard, dest_dir) { |from, to| link(from, to) }
- end
-
- # Remove all files matching +wildcard+. If a matching file is a
- # directory, it must be empty to be removed. used +delete_all+ to
- # recursively delete directories.
- def delete(*wildcards)
- wildcards.each do |wildcard|
- FileList.glob(wildcard).each do |fn|
- if File.directory?(fn)
- log "Deleting directory #{fn}"
- Dir.delete(fn)
- else
- log "Deleting file #{fn}"
- File.delete(fn)
- end
- end
- end
- end
-
- # Recursively delete all files and directories matching +wildcard+.
- def delete_all(*wildcards)
- wildcards.each do |wildcard|
- FileList.glob(wildcard).each do |fn|
- next if ! File.exist?(fn)
- if File.directory?(fn)
- FileList.glob("#{fn}/*").each do |subfn|
- next if subfn=='.' || subfn=='..'
- delete_all(subfn)
- end
- log "Deleting directory #{fn}"
- Dir.delete(fn)
- else
- log "Deleting file #{fn}"
- File.delete(fn)
- end
- end
- end
- end
-
- # Make the directories given in +dirs+.
- def makedirs(*dirs)
- dirs.each do |fn|
- log "Making directory #{fn}"
- File.makedirs(fn)
- end
- end
-
- # Make +dir+ the current working directory for the duration of
- # executing the given block.
- def indir(dir)
- olddir = Dir.pwd
- Dir.chdir(dir)
- yield
- ensure
- Dir.chdir(olddir)
- end
-
- # Split a file path into individual directory names.
- #
- # For 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
-
- # Write a message to standard error if $verbose is enabled.
- def log(msg)
- print " " if $trace && $verbose
- $stderr.puts msg if $verbose
- end
-
- # Perform a block with $verbose disabled.
- def quiet(&block)
- with_verbose(false, &block)
- end
-
- # Perform a block with $verbose enabled.
- def verbose(&block)
- with_verbose(true, &block)
- end
-
- # Perform a block with each file matching a set of wildcards.
- def for_files(*wildcards)
- wildcards.each do |wildcard|
- FileList.glob(wildcard).each do |fn|
- yield(fn)
- end
- end
- end
-
- extend(self)
-
- private # ----------------------------------------------------------
-
- def for_matching_files(wildcard, dest_dir)
- FileList.glob(wildcard).each do |fn|
- dest_file = File.join(dest_dir, fn)
- parent = File.dirname(dest_file)
- makedirs(parent) if ! File.directory?(parent)
- yield(fn, dest_file)
- end
- end
-
- def with_verbose(v)
- oldverbose = $verbose
- $verbose = v
- yield
- ensure
- $verbose = oldverbose
- end
-
-end
diff --git a/lib/rake/default_loader.rb b/lib/rake/default_loader.rb
deleted file mode 100644
index 5dd3c05617..0000000000
--- a/lib/rake/default_loader.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Rake
-
- # Default Rakefile loader used by +import+.
- class DefaultLoader
- def load(fn)
- Rake.load_rakefile(File.expand_path(fn))
- end
- end
-
-end
diff --git a/lib/rake/dsl_definition.rb b/lib/rake/dsl_definition.rb
deleted file mode 100644
index 143b0bcf7a..0000000000
--- a/lib/rake/dsl_definition.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-# Rake DSL functions.
-require 'rake/file_utils_ext'
-
-module Rake
-
- ##
- # DSL is a module that provides #task, #desc, #namespace, etc. Use this
- # when you'd like to use rake outside the top level scope.
-
- module DSL
-
- #--
- # 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 FileUtilsExt
- private(*FileUtils.instance_methods(false))
- private(*FileUtilsExt.instance_methods(false))
-
- private
-
- # 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(*args, &block)
- result = file_create(*args, &block)
- dir, _ = *Rake.application.resolve_args(args)
- Rake.each_dir_parent(dir) do |d|
- file_create d do |t|
- mkdir_p t.name if ! File.exist?(t.name)
- end
- end
- result
- 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)
- name = name.to_s if name.kind_of?(Symbol)
- name = name.to_str if name.respond_to?(:to_str)
- unless name.kind_of?(String) || name.nil?
- raise ArgumentError, "Expected a String or Symbol for a namespace name"
- end
- 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
-
- end
-
- DeprecatedCommands = Object.new.extend(DSL)
-
- module DeprecatedObjectDSL # :nodoc:
- DSL.private_instance_methods(false).each do |name|
- line = __LINE__+1
- class_eval %{
- def #{name}(*args, &block)
- unless Rake.application.options.ignore_deprecate
- unless @rake_dsl_warning
- $stderr.puts "WARNING: Global access to Rake DSL methods is deprecated. Please include"
- $stderr.puts " ... Rake::DSL into classes and modules which use the Rake DSL methods."
- @rake_dsl_warning = true
- end
- $stderr.puts "WARNING: DSL method \#{self.class}##{name} called at \#{caller.first}"
- end
- Rake::DeprecatedCommands.send(:#{name}, *args, &block)
- end
- private :#{name}
- }, __FILE__, line
- end
- end unless defined? Rake::REDUCE_COMPAT
-
- extend FileUtilsExt
-end
-
-# Extend the main object with the DSL commands. This allows top-level
-# calls to task, etc. to work from a Rakefile without polluting the
-# object inheritance tree.
-self.extend Rake::DSL
-include Rake::DeprecatedObjectDSL unless defined? Rake::REDUCE_COMPAT
diff --git a/lib/rake/early_time.rb b/lib/rake/early_time.rb
deleted file mode 100644
index 8c0e7d3339..0000000000
--- a/lib/rake/early_time.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Rake
-
- # 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
diff --git a/lib/rake/ext/core.rb b/lib/rake/ext/core.rb
deleted file mode 100644
index 1f3a738906..0000000000
--- a/lib/rake/ext/core.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-######################################################################
-# Core extension library
-#
-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
diff --git a/lib/rake/ext/module.rb b/lib/rake/ext/module.rb
deleted file mode 100644
index fc61bea555..0000000000
--- a/lib/rake/ext/module.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'rake/ext/core'
-require 'rake/task'
-require 'rake/file_task'
-require 'rake/file_creation_task'
-require 'rake/application'
-require 'rake/task_manager'
-
-######################################################################
-# Rake extensions to Module.
-#
-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 unless defined? Rake::REDUCE_COMPAT
diff --git a/lib/rake/ext/string.rb b/lib/rake/ext/string.rb
deleted file mode 100644
index be8b463e1a..0000000000
--- a/lib/rake/ext/string.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-require 'rake/ext/core'
-
-######################################################################
-# Rake extension methods for 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 separator 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 substitutions on a
- # particular part of the path. The pattern and replacement are separated
- # 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"). Multiple 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).ext
- 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
diff --git a/lib/rake/ext/time.rb b/lib/rake/ext/time.rb
deleted file mode 100644
index ea8b037e39..0000000000
--- a/lib/rake/ext/time.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#--
-# Extensions to time to allow comparisons with an early time class.
-
-require 'rake/early_time'
-
-class Time
- alias rake_original_time_compare :<=>
- def <=>(other)
- if Rake::EarlyTime === other
- - other.<=>(self)
- else
- rake_original_time_compare(other)
- end
- end
-end
diff --git a/lib/rake/file_creation_task.rb b/lib/rake/file_creation_task.rb
deleted file mode 100644
index c87e2192bb..0000000000
--- a/lib/rake/file_creation_task.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'rake/file_task'
-require 'rake/early_time'
-
-module Rake
-
- # 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
-
-end
diff --git a/lib/rake/file_list.rb b/lib/rake/file_list.rb
deleted file mode 100644
index 3eae5fb0d7..0000000000
--- a/lib/rake/file_list.rb
+++ /dev/null
@@ -1,410 +0,0 @@
-require 'rake/cloneable'
-require 'rake/file_utils_ext'
-require 'rake/pathmap'
-
-######################################################################
-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)
- ln = __LINE__+1
- class_eval %{
- def #{sym}(*args, &block)
- resolve
- result = @items.send(:#{sym}, *args, &block)
- FileList.new.import(result)
- end
- }, __FILE__, ln
- else
- ln = __LINE__+1
- class_eval %{
- def #{sym}(*args, &block)
- resolve
- result = @items.send(:#{sym}, *args, &block)
- result.object_id == @items.object_id ? self : result
- end
- }, __FILE__, ln
- 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
- @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 = []
- 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 resolve_add(fn)
- case fn
- when %r{[*?\[\{]}
- add_matching(fn)
- else
- self << fn
- end
- end
- private :resolve_add
-
- def resolve_exclude
- reject! { |fn| exclude?(fn) }
- self
- end
- private :resolve_exclude
-
- # Return a new FileList with the results of running +sub+ against each
- # element of the original 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 original 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 FileList 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 emacs style file:linenumber:line message will be printed to
- # standard out. Returns the number of matched items.
- def egrep(pattern, *options)
- matched = 0
- each do |fn|
- begin
- open(fn, "r", *options) do |inf|
- count = 0
- inf.each do |line|
- count += 1
- if pattern.match(line)
- matched += 1
- if block_given?
- yield fn, count, line
- else
- puts "#{fn}:#{count}:#{line}"
- end
- end
- end
- end
- rescue StandardError => ex
- $stderr.puts "Error while processing '#{fn}': #{ex}"
- end
- end
- matched
- 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)
- FileList.glob(pattern).each do |fn|
- self << fn unless exclude?(fn)
- end
- end
- private :add_matching
-
- # Should the given file name be excluded?
- def exclude?(fn)
- return true if @exclude_patterns.any? do |pat|
- case pat
- when Regexp
- fn =~ pat
- when /[*?]/
- File.fnmatch?(pat, fn, File::FNM_PATHNAME)
- else
- fn == pat
- end
- end
- @exclude_procs.any? { |p| p.call(fn) }
- end
-
- DEFAULT_IGNORE_PATTERNS = [
- /(^|[\/\\])CVS([\/\\]|$)/,
- /(^|[\/\\])\.svn([\/\\]|$)/,
- /\.bak$/,
- /~$/
- ]
- DEFAULT_IGNORE_PROCS = [
- proc { |fn| fn =~ /(^|[\/\\])core$/ && ! File.directory?(fn) }
- ]
-
- 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
-
- # Get a sorted list of files matching the pattern. This method
- # should be prefered to Dir[pattern] and Dir.glob(pattern) because
- # the files returned are guaranteed to be sorted.
- def glob(pattern, *args)
- Dir.glob(pattern, *args).sort
- end
- end
- end
-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
diff --git a/lib/rake/file_task.rb b/lib/rake/file_task.rb
deleted file mode 100644
index 78902a86fd..0000000000
--- a/lib/rake/file_task.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'rake/task.rb'
-require 'rake/early_time'
-
-module Rake
- # #########################################################################
- # 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, @scope].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
-end
-
diff --git a/lib/rake/file_utils.rb b/lib/rake/file_utils.rb
deleted file mode 100644
index 606bfb65b5..0000000000
--- a/lib/rake/file_utils.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'rbconfig'
-require 'fileutils'
-
-#--
-# This a FileUtils extension that defines several additional commands to be
-# added to the FileUtils utility functions.
-module FileUtils
- # Path to the currently running Ruby program
- RUBY = ENV['RUBY'] || File.join(
- RbConfig::CONFIG['bindir'],
- RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']).
- 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 : {}
- shell_runner = block_given? ? block : create_shell_runner(cmd)
- set_verbose_option(options)
- options[:noop] ||= Rake::FileUtilsExt.nowrite_flag
- Rake.rake_check_options options, :noop, :verbose
- Rake.rake_output_message cmd.join(" ") if options[:verbose]
-
- unless options[:noop]
- res = rake_system(*cmd)
- status = $?
- status = PseudoStatus.new(1) if !res && status.nil?
- shell_runner.call(res, status)
- end
- end
-
- def create_shell_runner(cmd) # :nodoc:
- show_command = cmd.join(" ")
- show_command = show_command[0,42] + "..." unless $trace
- lambda { |ok, status|
- ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
- }
- end
- private :create_shell_runner
-
- def set_verbose_option(options) # :nodoc:
- unless options.key? :verbose
- options[:verbose] =
- Rake::FileUtilsExt.verbose_flag == Rake::FileUtilsExt::DEFAULT ||
- Rake::FileUtilsExt.verbose_flag
- end
- end
- private :set_verbose_option
-
- def rake_system(*cmd) # :nodoc:
- Rake::AltSystem.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
- 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
diff --git a/lib/rake/file_utils_ext.rb b/lib/rake/file_utils_ext.rb
deleted file mode 100644
index 386af441d8..0000000000
--- a/lib/rake/file_utils_ext.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-require 'rake/file_utils'
-
-module Rake
- #
- # FileUtilsExt provides a custom version of the FileUtils methods
- # that respond to the <tt>verbose</tt> and <tt>nowrite</tt>
- # commands.
- #
- module FileUtilsExt
- include FileUtils
-
- class << self
- attr_accessor :verbose_flag, :nowrite_flag
- end
-
- DEFAULT = Object.new
-
- FileUtilsExt.verbose_flag = DEFAULT
- FileUtilsExt.nowrite_flag = false
-
- $fileutils_verbose = true
- $fileutils_nowrite = false
-
- FileUtils.commands.each do |name|
- opts = FileUtils.options_of name
- default_options = []
- if opts.include?("verbose")
- default_options << ':verbose => FileUtilsExt.verbose_flag'
- end
- if opts.include?("noop")
- default_options << ':noop => FileUtilsExt.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 = FileUtilsExt.verbose_flag
- FileUtilsExt.verbose_flag = value unless value.nil?
- if block_given?
- begin
- yield
- ensure
- FileUtilsExt.verbose_flag = oldvalue
- end
- end
- FileUtilsExt.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 = FileUtilsExt.nowrite_flag
- FileUtilsExt.nowrite_flag = value unless value.nil?
- if block_given?
- begin
- yield
- ensure
- FileUtilsExt.nowrite_flag = oldvalue
- end
- end
- oldvalue
- end
-
- # Use this function to prevent potentially 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 FileUtilsExt.nowrite_flag
- $stderr.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
-
- # Send the message to the default rake output (which is $stderr).
- def rake_output_message(message)
- $stderr.puts(message)
- end
-
- # 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
-
- extend self
- end
-end
diff --git a/lib/rake/gempackagetask.rb b/lib/rake/gempackagetask.rb
index 5f1fc4def8..3a99ff2b87 100644
--- a/lib/rake/gempackagetask.rb
+++ b/lib/rake/gempackagetask.rb
@@ -1,15 +1,95 @@
-# rake/gempackagetask is deprecated in favor of rubygems/package_task
-
-warn 'rake/gempackagetask is deprecated. Use rubygems/package_task instead'
+# Define a package task library to aid in the definition of GEM
+# packages.
require 'rubygems'
-require 'rubygems/package_task'
-
require 'rake'
-
-# :stopdoc:
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
module Rake
- GemPackageTask = Gem::PackageTask
-end
+ # 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/invocation_chain.rb b/lib/rake/invocation_chain.rb
deleted file mode 100644
index 8a01ab4c29..0000000000
--- a/lib/rake/invocation_chain.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-module Rake
-
- ####################################################################
- # 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
-end
diff --git a/lib/rake/invocation_exception_mixin.rb b/lib/rake/invocation_exception_mixin.rb
deleted file mode 100644
index 84ff3353ba..0000000000
--- a/lib/rake/invocation_exception_mixin.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Rake
- module InvocationExceptionMixin
- # Return the invocation chain (list of Rake tasks) that were in
- # effect when this exception was detected by rake. May be null if
- # no tasks were active.
- def chain
- @rake_invocation_chain ||= nil
- end
-
- # Set the invocation chain in effect when this exception was
- # detected.
- def chain=(value)
- @rake_invocation_chain = value
- end
- end
-end
diff --git a/lib/rake/lib/.document b/lib/rake/lib/.document
deleted file mode 100644
index 098e64716e..0000000000
--- a/lib/rake/lib/.document
+++ /dev/null
@@ -1 +0,0 @@
-# Ignore project.rake
diff --git a/lib/rake/lib/project.rake b/lib/rake/lib/project.rake
deleted file mode 100644
index a5497328a7..0000000000
--- a/lib/rake/lib/project.rake
+++ /dev/null
@@ -1,21 +0,0 @@
-task "create:project" => ["lib", "test", "Rakefile"]
-
-directory "lib"
-directory "test"
-
-file "Rakefile" do
- File.open("Rakefile", "w") do |out|
- out.puts %{# -*- ruby -*-
-
-require 'rake/clean'
-require 'rake/testtask'
-
-task :default => :test
-
-Rake::TestTask.new do |t|
- t.verbose = false
- t.test_files = FileList['test/test_*.rb']
-end
-}
- end
-end
diff --git a/lib/rake/loaders/makefile.rb b/lib/rake/loaders/makefile.rb
index 4ece4323af..9a2ac8090e 100644
--- a/lib/rake/loaders/makefile.rb
+++ b/lib/rake/loaders/makefile.rb
@@ -2,13 +2,11 @@ module Rake
# Makefile loader to be used with the import file loader.
class MakefileLoader
- include Rake::DSL
-
SPACE_MARK = "\0"
# Load the makefile dependencies in +fn+.
def load(fn)
- lines = File.read fn
+ lines = open(fn) {|mf| mf.read}
lines.gsub!(/\\ /, SPACE_MARK)
lines.gsub!(/#[^\n]*\n/m, "")
lines.gsub!(/\\\n/, ' ')
@@ -23,7 +21,7 @@ module Rake
def process_line(line)
file_tasks, args = line.split(':', 2)
return if args.nil?
- dependents = args.split.map { |d| respace(d) }
+ dependents = args.split.map {|arg| respace(arg)}
file_tasks.scan(/\S+/) do |file_task|
file_task = respace(file_task)
file file_task => dependents
@@ -31,7 +29,7 @@ module Rake
end
def respace(str)
- str.tr SPACE_MARK, ' '
+ str.tr(SPACE_MARK, ' ')
end
end
diff --git a/lib/rake/multi_task.rb b/lib/rake/multi_task.rb
deleted file mode 100644
index 5418a7a7b0..0000000000
--- a/lib/rake/multi_task.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Rake
-
- # Same as a regular task, but the immediate prerequisites are done in
- # parallel using Ruby threads.
- #
- class MultiTask < Task
- private
- def invoke_prerequisites(task_args, invocation_chain) # :nodoc:
- invoke_prerequisites_concurrently(task_args, invocation_chain)
- end
- end
-
-end
diff --git a/lib/rake/name_space.rb b/lib/rake/name_space.rb
deleted file mode 100644
index e1cc0940b8..0000000000
--- a/lib/rake/name_space.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-end
diff --git a/lib/rake/packagetask.rb b/lib/rake/packagetask.rb
index 08c1a8c025..e77345c198 100644
--- a/lib/rake/packagetask.rb
+++ b/lib/rake/packagetask.rb
@@ -72,10 +72,7 @@ module Rake
# Zip command for zipped archives. The default is 'zip'.
attr_accessor :zip_command
- # Create a Package Task with the given name and version. Use +:noversion+
- # as the version to build a package without a version or to provide a
- # fully-versioned package name.
-
+ # Create a Package Task with the given name and version.
def initialize(name=nil, version=nil)
init(name, version)
yield self if block_given?
diff --git a/lib/rake/pathmap.rb b/lib/rake/pathmap.rb
deleted file mode 100644
index 2275724341..0000000000
--- a/lib/rake/pathmap.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'rake/ext/string'
diff --git a/lib/rake/phony.rb b/lib/rake/phony.rb
deleted file mode 100644
index 29633ae066..0000000000
--- a/lib/rake/phony.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Defines a :phony task that you can use as a dependency. This allows
-# file-based tasks to use non-file-based tasks as prerequisites
-# without forcing them to rebuild.
-#
-# See FileTask#out_of_date? and Task#timestamp for more info.
-
-require 'rake'
-
-task :phony
-
-Rake::Task[:phony].tap do |task|
- def task.timestamp # :nodoc:
- Time.at 0
- end
-end
diff --git a/lib/rake/private_reader.rb b/lib/rake/private_reader.rb
deleted file mode 100644
index 1620978576..0000000000
--- a/lib/rake/private_reader.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-module Rake
-
- # Include PrivateReader to use +private_reader+.
- module PrivateReader # :nodoc: all
-
- def self.included(base)
- base.extend(ClassMethods)
- end
-
- module ClassMethods
-
- # Declare a list of private accessors
- def private_reader(*names)
- attr_reader(*names)
- private(*names)
- end
- end
-
- end
-end
diff --git a/lib/rake/promise.rb b/lib/rake/promise.rb
deleted file mode 100644
index 3258b91139..0000000000
--- a/lib/rake/promise.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-module Rake
-
- # A Promise object represents a promise to do work (a chore) in the
- # future. The promise is created with a block and a list of
- # arguments for the block. Calling value will return the value of
- # the promised chore.
- #
- # Used by ThreadPool.
- #
- class Promise # :nodoc: all
- NOT_SET = Object.new.freeze # :nodoc:
-
- attr_accessor :recorder
-
- # Create a promise to do the chore specified by the block.
- def initialize(args, &block)
- @mutex = Mutex.new
- @result = NOT_SET
- @error = NOT_SET
- @args = args.collect { |a| begin; a.dup; rescue; a; end }
- @block = block
- end
-
- # Return the value of this promise.
- #
- # If the promised chore is not yet complete, then do the work
- # synchronously. We will wait.
- def value
- unless complete?
- stat :sleeping_on, :item_id => object_id
- @mutex.synchronize do
- stat :has_lock_on, :item_id => object_id
- chore
- stat :releasing_lock_on, :item_id => object_id
- end
- end
- error? ? raise(@error) : @result
- end
-
- # If no one else is working this promise, go ahead and do the chore.
- def work
- stat :attempting_lock_on, :item_id => object_id
- if @mutex.try_lock
- stat :has_lock_on, :item_id => object_id
- chore
- stat :releasing_lock_on, :item_id => object_id
- @mutex.unlock
- else
- stat :bailed_on, :item_id => object_id
- end
- end
-
- private
-
- # Perform the chore promised
- def chore
- if complete?
- stat :found_completed, :item_id => object_id
- return
- end
- stat :will_execute, :item_id => object_id
- begin
- @result = @block.call(*@args)
- rescue Exception => e
- @error = e
- end
- stat :did_execute, :item_id => object_id
- discard
- end
-
- # Do we have a result for the promise
- def result?
- ! @result.equal?(NOT_SET)
- end
-
- # Did the promise throw an error
- def error?
- ! @error.equal?(NOT_SET)
- end
-
- # Are we done with the promise
- def complete?
- result? || error?
- end
-
- # free up these items for the GC
- def discard
- @args = nil
- @block = nil
- end
-
- # Record execution statistics if there is a recorder
- def stat(*args)
- @recorder.call(*args) if @recorder
- end
-
- end
-
-end
diff --git a/lib/rake/pseudo_status.rb b/lib/rake/pseudo_status.rb
deleted file mode 100644
index b58df3da18..0000000000
--- a/lib/rake/pseudo_status.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Rake
-
- ####################################################################
- # Exit status class for times the system just gives us a nil.
- class PseudoStatus
- attr_reader :exitstatus
- def initialize(code=0)
- @exitstatus = code
- end
- def to_i
- @exitstatus << 8
- end
- def >>(n)
- to_i >> n
- end
- def stopped?
- false
- end
- def exited?
- true
- end
- end
-
-end
diff --git a/lib/rake/rake_module.rb b/lib/rake/rake_module.rb
deleted file mode 100644
index fcf5800064..0000000000
--- a/lib/rake/rake_module.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'rake/application'
-
-module Rake
-
- # 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
-
- # Load a rakefile.
- def load_rakefile(path)
- load(path)
- end
-
- # Add files to the rakelib list
- def add_rakelib(*files)
- application.options.rakelib ||= []
- files.each do |file|
- application.options.rakelib << file
- end
- end
- end
-
-end
diff --git a/lib/rake/rake_test_loader.rb b/lib/rake/rake_test_loader.rb
index 7e3a6b3f35..8d7dad3c94 100644
--- a/lib/rake/rake_test_loader.rb
+++ b/lib/rake/rake_test_loader.rb
@@ -1,22 +1,5 @@
-require 'rake'
+#!/usr/bin/env ruby
# Load the test files from the command line.
-argv = ARGV.select do |argument|
- case argument
- when /^-/ then
- argument
- when /\*/ then
- FileList[argument].to_a.each do |file|
- require File.expand_path file
- end
-
- false
- else
- require File.expand_path argument
-
- false
- end
-end
-
-ARGV.replace argv
+ARGV.each { |f| load f unless f =~ /^-/ }
diff --git a/lib/rake/rdoctask.rb b/lib/rake/rdoctask.rb
index 261fa69b4d..983a260dc5 100644
--- a/lib/rake/rdoctask.rb
+++ b/lib/rake/rdoctask.rb
@@ -1,234 +1,208 @@
-# rake/rdoctask is deprecated in favor of rdoc/task
-
-if Rake.application
- Rake.application.deprecate('require \'rake/rdoctask\'', 'require \'rdoc/task\' (in RDoc 2.4.2+)', caller.first)
-end
-
-require 'rubygems'
-
-begin
- gem 'rdoc'
- require 'rdoc'
- require 'rdoc/task'
-rescue LoadError, Gem::LoadError
-end
-
-# :stopdoc:
-
-if defined?(RDoc::Task) then
- module Rake
- RDocTask = RDoc::Task unless const_defined? :RDocTask
- end
-else
- require 'rake'
- require 'rake/tasklib'
-
- module Rake
-
- # NOTE: Rake::RDocTask is deprecated in favor of RDoc:Task which is included
- # in RDoc 2.4.2+. Use require 'rdoc/task' to require it.
- #
- # 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
+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
-
- @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
+ @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
- desc "Force a rebuild of the RDOC files"
- task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
+ # 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 "Remove rdoc products"
- task clobber_task_name do
- rm_r rdoc_dir rescue nil
- end
+ desc "Force a rebuild of the RDOC files"
+ task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
- 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 vendor/rd #{argstring}}
- else
- require 'rdoc/rdoc'
- RDoc::RDoc.new.document(args)
- end
- end
- self
+ desc "Remove rdoc products"
+ task clobber_task_name do
+ rm_r rdoc_dir rescue nil
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
+ task :clobber => [clobber_task_name]
- def quote(str)
+ 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
- "'#{str}'"
+ argstring = args.join(' ')
+ sh %{ruby -Ivendor vendor/rd #{argstring}}
else
- str
+ require 'rdoc/rdoc'
+ RDoc::RDoc.new.document(args)
end
end
+ self
+ end
- def option_string
- option_list.join(' ')
- end
+ # List of options that will be supplied to RDoc
+ 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
- # 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
+ def quote(str)
+ if @external
+ "'#{str}'"
+ else
+ str
end
+ end
- private
+ def option_string
+ option_list.join(' ')
+ end
- def rdoc_target
- "#{rdoc_dir}/index.html"
- 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
- def rdoc_task_name
- case name
- when Hash
- (name[:rdoc] || "rdoc").to_s
- else
- name.to_s
- end
- end
+ private
- def clobber_task_name
- case name
- when Hash
- (name[:clobber_rdoc] || "clobber_rdoc").to_s
- else
- "clobber_#{name}"
- end
+ 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 rerdoc_task_name
- case name
- when Hash
- (name[:rerdoc] || "rerdoc").to_s
- else
- "re#{name}"
- 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/ruby182_test_unit_fix.rb b/lib/rake/ruby182_test_unit_fix.rb
deleted file mode 100644
index 9e411ed51a..0000000000
--- a/lib/rake/ruby182_test_unit_fix.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Local Rake override to fix bug in Ruby 0.8.2
-module Test # :nodoc:
- # Local Rake override to fix bug in Ruby 0.8.2
- module Unit # :nodoc:
- # Local Rake override to fix bug in Ruby 0.8.2
- module Collector # :nodoc:
- # Local Rake override to fix bug in Ruby 0.8.2
- class Dir # :nodoc:
- undef collect_file
- def collect_file(name, suites, already_gathered) # :nodoc:
- dir = File.dirname(File.expand_path(name))
- $:.unshift(dir) unless $:.first == 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)
- end
- end
- end
- end
-end
diff --git a/lib/rake/rule_recursion_overflow_error.rb b/lib/rake/rule_recursion_overflow_error.rb
deleted file mode 100644
index da4318da9d..0000000000
--- a/lib/rake/rule_recursion_overflow_error.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-
-module Rake
-
- # 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
-
-end
diff --git a/lib/rake/runtest.rb b/lib/rake/runtest.rb
index bd816ccfde..f6928d57b8 100644
--- a/lib/rake/runtest.rb
+++ b/lib/rake/runtest.rb
@@ -1,18 +1,17 @@
require 'test/unit'
require 'test/unit/assertions'
-require 'rake/file_list'
module Rake
include Test::Unit::Assertions
def run_tests(pattern='test/test*.rb', log_enabled=false)
- FileList.glob(pattern).each { |fn|
- $stderr.puts fn if log_enabled
+ Dir["#{pattern}"].each { |fn|
+ puts fn if log_enabled
begin
- require fn
+ load fn
rescue Exception => ex
- $stderr.puts "Error in #{fn}: #{ex.message}"
- $stderr.puts ex.backtrace
+ puts "Error in #{fn}: #{ex.message}"
+ puts ex.backtrace
assert false
end
}
diff --git a/lib/rake/task.rb b/lib/rake/task.rb
deleted file mode 100644
index ac0ce68c60..0000000000
--- a/lib/rake/task.rb
+++ /dev/null
@@ -1,350 +0,0 @@
-require 'rake/invocation_exception_mixin'
-
-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
-
- # File/Line locations of each of the task definitions for this
- # task (only valid if the task was defined with the detect
- # location option set).
- attr_reader :locations
-
- # 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
-
- # List of prerequisite tasks
- def prerequisite_tasks
- prerequisites.collect { |pre| lookup_prerequisite(pre) }
- end
-
- def lookup_prerequisite(prerequisite_name)
- application[prerequisite_name, @scope]
- end
- private :lookup_prerequisite
-
- # 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
- @locations = []
- 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
- clear_comments
- 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
-
- # Clear the existing comments on a rake task.
- def clear_comments
- @full_comment = nil
- @comment = nil
- self
- end
-
- # Invoke the task if it is needed. Prerequisites 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
- application.trace "** 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
- rescue Exception => ex
- add_chain_to(ex, new_chain)
- raise ex
- end
- protected :invoke_with_call_chain
-
- def add_chain_to(exception, new_chain)
- exception.extend(InvocationExceptionMixin) unless exception.respond_to?(:chain)
- exception.chain = new_chain if exception.chain.nil?
- end
- private :add_chain_to
-
- # Invoke all the prerequisites of a task.
- def invoke_prerequisites(task_args, invocation_chain) # :nodoc:
- if application.options.always_multitask
- invoke_prerequisites_concurrently(task_args, invocation_chain)
- else
- prerequisite_tasks.each { |p|
- prereq_args = task_args.new_scope(p.arg_names)
- p.invoke_with_call_chain(prereq_args, invocation_chain)
- }
- end
- end
-
- # Invoke all the prerequisites of a task in parallel.
- def invoke_prerequisites_concurrently(task_args, invocation_chain) # :nodoc:
- futures = prerequisite_tasks.collect do |p|
- prereq_args = task_args.new_scope(p.arg_names)
- application.thread_pool.future(p) do |r|
- r.invoke_with_call_chain(prereq_args, invocation_chain)
- end
- end
- futures.each { |f| f.value }
- 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
- application.trace "** Execute (dry run) #{name}"
- return
- end
- if application.options.trace
- application.trace "** 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
- prerequisite_tasks.collect { |pre| pre.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 already 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 = prerequisite_tasks
- prereqs.sort! {|a,b| a.timestamp <=> b.timestamp}
- prereqs.each do |p|
- result << "--#{p.name} (#{p.timestamp})\n"
- end
- latest_prereq = prerequisite_tasks.collect { |pre| pre.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
-end
diff --git a/lib/rake/task_argument_error.rb b/lib/rake/task_argument_error.rb
deleted file mode 100644
index 3e1dda64db..0000000000
--- a/lib/rake/task_argument_error.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Rake
-
- # Error indicating an ill-formed task declaration.
- class TaskArgumentError < ArgumentError
- end
-
-end
diff --git a/lib/rake/task_arguments.rb b/lib/rake/task_arguments.rb
deleted file mode 100644
index 4417af2f8e..0000000000
--- a/lib/rake/task_arguments.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-module Rake
-
- ####################################################################
- # TaskArguments 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 values_at(*keys)
- keys.map { |k| lookup(k) }
- end
-
- def method_missing(sym, *args)
- 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 @parent
- @parent.lookup(name)
- end
- end
- end
-
- EMPTY_TASK_ARGS = TaskArguments.new([], [])
-end
diff --git a/lib/rake/task_manager.rb b/lib/rake/task_manager.rb
deleted file mode 100644
index 5a9419d536..0000000000
--- a/lib/rake/task_manager.rb
+++ /dev/null
@@ -1,307 +0,0 @@
-module Rake
-
- # 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, _, 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?
- if Rake::TaskManager.record_task_metadata
- add_location(task)
- task.add_description(get_description(task))
- end
- task.enhance(deps, &block)
- 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
- Rake.application.deprecate(
- "task :t, arg, :needs => [deps]",
- "task :t, [args] => [deps]",
- caller.detect { |c| c !~ /\blib\/rake\b/ })
- 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 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
-
- # Add a location to the locations field of the given task.
- def add_location(task)
- loc = find_location
- task.locations << loc if loc
- task
- end
-
- # Find the location that called into the dsl layer.
- def find_location
- locations = caller
- i = 0
- while locations[i]
- return locations[i+1] if locations[i] =~ /rake\/dsl_definition.rb/
- i += 1
- end
- nil
- end
-
- # Generate an anonymous namespace name.
- def generate_name
- @seed ||= 0
- @seed += 1
- "_anon_#{@seed}"
- end
-
- def trace_rule(level, message)
- options.trace_output.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)
- result = 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
- }
- result.flatten
- end
-
-
- private
-
- # Return the current description, clearing it in the process.
- def get_description(task)
- desc = @last_description
- @last_description = nil
- desc
- end
-
- class << self
- attr_accessor :record_task_metadata
- TaskManager.record_task_metadata = false
- end
- end
-
-end
diff --git a/lib/rake/tasklib.rb b/lib/rake/tasklib.rb
index f1e17dad31..a5a4494369 100644
--- a/lib/rake/tasklib.rb
+++ b/lib/rake/tasklib.rb
@@ -5,7 +5,6 @@ module Rake
# Base class for Task Libraries.
class TaskLib
include Cloneable
- include Rake::DSL
# Make a symbol by pasting two strings together.
#
diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
index 19592d80c8..c400205ff3 100644
--- a/lib/rake/testtask.rb
+++ b/lib/rake/testtask.rb
@@ -93,44 +93,33 @@ module Rake
# Create the tasks defined by this task lib.
def define
+ lib_path = @libs.join(File::PATH_SEPARATOR)
desc "Run tests" + (@name==:test ? "" : " for #{@name}")
task @name do
- FileUtilsExt.verbose(@verbose) do
- args = "#{ruby_opts_string} #{run_code} #{file_list_string} #{option_list}"
- ruby args do |ok, status|
- if !ok && status.respond_to?(:signaled?) && status.signaled?
- raise SignalException.new(status.termsig)
- elsif !ok
- fail "Command failed with status (#{status.exitstatus}): [ruby #{args}]"
+ run_code = ''
+ RakeFileUtils.verbose(@verbose) do
+ run_code =
+ case @loader
+ when :direct
+ "-e 'ARGV.each{|f| load f}'"
+ when :testrb
+ "-S testrb"
+ when :rake
+ rake_loader
end
- end
+ @ruby_opts.unshift( "-I\"#{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'] ||
- ENV['TESTOPT'] ||
- ENV['TEST_OPTS'] ||
- ENV['TEST_OPT'] ||
- @options ||
- "")
- end
-
- def ruby_opts_string
- opts = @ruby_opts.dup
- opts.unshift( "-I\"#{lib_path}\"" ) unless @libs.empty?
- opts.unshift( "-w" ) if @warning
- opts.join(" ")
- end
-
- def lib_path
- @libs.join(File::PATH_SEPARATOR)
- end
-
- def file_list_string
- file_list.collect { |fn| "\"#{fn}\"" }.join(' ')
+ ENV['TESTOPTS'] || @options || ""
end
def file_list # :nodoc:
@@ -139,32 +128,8 @@ module Rake
else
result = []
result += @test_files.to_a if @test_files
- result << @pattern if @pattern
- 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 ruby_version
- RUBY_VERSION
- end
-
- def run_code
- case @loader
- when :direct
- "-e \"ARGV.each{|f| require f}\""
- when :testrb
- "-S testrb #{fix}"
- when :rake
- "-I\"#{rake_lib_dir}\" \"#{rake_loader}\""
+ result += FileList[ @pattern ].to_a if @pattern
+ FileList[result]
end
end
@@ -181,18 +146,5 @@ module Rake
nil
end
- def rake_lib_dir # :nodoc:
- find_dir('rake') or
- fail "unable to find rake lib"
- end
-
- def find_dir(fn) # :nodoc:
- $LOAD_PATH.each do |path|
- file_path = File.join(path, "#{fn}.rb")
- return path if File.exist? file_path
- end
- nil
- end
-
end
end
diff --git a/lib/rake/thread_history_display.rb b/lib/rake/thread_history_display.rb
deleted file mode 100644
index 917e951064..0000000000
--- a/lib/rake/thread_history_display.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'rake/private_reader'
-
-module Rake
-
- class ThreadHistoryDisplay # :nodoc: all
- include Rake::PrivateReader
-
- private_reader :stats, :items, :threads
-
- def initialize(stats)
- @stats = stats
- @items = { :_seq_ => 1 }
- @threads = { :_seq_ => "A" }
- end
-
- def show
- puts "Job History:"
- stats.each do |stat|
- stat[:data] ||= {}
- rename(stat, :thread, threads)
- rename(stat[:data], :item_id, items)
- rename(stat[:data], :new_thread, threads)
- rename(stat[:data], :deleted_thread, threads)
- printf("%8d %2s %-20s %s\n",
- (stat[:time] * 1_000_000).round,
- stat[:thread],
- stat[:event],
- stat[:data].map { |k,v| "#{k}:#{v}" }.join(" "))
- end
- end
-
- private
-
- def rename(hash, key, renames)
- if hash && hash[key]
- original = hash[key]
- value = renames[original]
- unless value
- value = renames[:_seq_]
- renames[:_seq_] = renames[:_seq_].succ
- renames[original] = value
- end
- hash[key] = value
- end
- end
- end
-
-end
diff --git a/lib/rake/thread_pool.rb b/lib/rake/thread_pool.rb
deleted file mode 100644
index 983a67a514..0000000000
--- a/lib/rake/thread_pool.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-require 'thread'
-require 'set'
-
-require 'rake/promise'
-
-module Rake
-
- class ThreadPool # :nodoc: all
-
- # Creates a ThreadPool object.
- # The parameter is the size of the pool.
- def initialize(thread_count)
- @max_active_threads = [thread_count, 0].max
- @threads = Set.new
- @threads_mon = Monitor.new
- @queue = Queue.new
- @join_cond = @threads_mon.new_cond
-
- @history_start_time = nil
- @history = []
- @history_mon = Monitor.new
- @total_threads_in_play = 0
- end
-
- # Creates a future executed by the +ThreadPool+.
- #
- # The args are passed to the block when executing (similarly to
- # <tt>Thread#new</tt>) The return value is an object representing
- # a future which has been created and added to the queue in the
- # pool. Sending <tt>#value</tt> to the object will sleep the
- # current thread until the future is finished and will return the
- # result (or raise an exception thrown from the future)
- def future(*args, &block)
- promise = Promise.new(args, &block)
- promise.recorder = lambda { |*stats| stat(*stats) }
-
- @queue.enq promise
- stat :queued, :item_id => promise.object_id
- start_thread
- promise
- end
-
- # Waits until the queue of futures is empty and all threads have exited.
- def join
- @threads_mon.synchronize do
- begin
- stat :joining
- @join_cond.wait unless @threads.empty?
- stat :joined
- rescue Exception => e
- stat :joined
- $stderr.puts e
- $stderr.print "Queue contains #{@queue.size} items. Thread pool contains #{@threads.count} threads\n"
- $stderr.print "Current Thread #{Thread.current} status = #{Thread.current.status}\n"
- $stderr.puts e.backtrace.join("\n")
- @threads.each do |t|
- $stderr.print "Thread #{t} status = #{t.status}\n"
- # 1.8 doesn't support Thread#backtrace
- $stderr.puts t.backtrace.join("\n") if t.respond_to? :backtrace
- end
- raise e
- end
- end
- end
-
- # Enable the gathering of history events.
- def gather_history #:nodoc:
- @history_start_time = Time.now if @history_start_time.nil?
- end
-
- # Return a array of history events for the thread pool.
- #
- # History gathering must be enabled to be able to see the events
- # (see #gather_history). Best to call this when the job is
- # complete (i.e. after ThreadPool#join is called).
- def history # :nodoc:
- @history_mon.synchronize { @history.dup }.
- sort_by { |i| i[:time] }.
- each { |i| i[:time] -= @history_start_time }
- end
-
- # Return a hash of always collected statistics for the thread pool.
- def statistics # :nodoc:
- {
- :total_threads_in_play => @total_threads_in_play,
- :max_active_threads => @max_active_threads,
- }
- end
-
- private
-
- # processes one item on the queue. Returns true if there was an
- # item to process, false if there was no item
- def process_queue_item #:nodoc:
- return false if @queue.empty?
-
- # Even though we just asked if the queue was empty, it
- # still could have had an item which by this statement
- # is now gone. For this reason we pass true to Queue#deq
- # because we will sleep indefinitely if it is empty.
- promise = @queue.deq(true)
- stat :dequeued, :item_id => promise.object_id
- promise.work
- return true
-
- rescue ThreadError # this means the queue is empty
- false
- end
-
- def start_thread # :nodoc:
- @threads_mon.synchronize do
- next unless @threads.count < @max_active_threads
-
- t = Thread.new do
- begin
- while @threads.count <= @max_active_threads
- break unless process_queue_item
- end
- ensure
- @threads_mon.synchronize do
- @threads.delete Thread.current
- stat :ended, :thread_count => @threads.count
- @join_cond.broadcast if @threads.empty?
- end
- end
- end
- @threads << t
- stat :spawned, :new_thread => t.object_id, :thread_count => @threads.count
- @total_threads_in_play = @threads.count if @threads.count > @total_threads_in_play
- end
- end
-
- def stat(event, data=nil) # :nodoc:
- return if @history_start_time.nil?
- info = {
- :event => event,
- :data => data,
- :time => Time.now,
- :thread => Thread.current.object_id,
- }
- @history_mon.synchronize { @history << info }
- end
-
- # for testing only
-
- def __queue__ # :nodoc:
- @queue
- end
-
- def __threads__ # :nodoc:
- @threads.dup
- end
- end
-
-end
diff --git a/lib/rake/trace_output.rb b/lib/rake/trace_output.rb
deleted file mode 100644
index e4d61cfb93..0000000000
--- a/lib/rake/trace_output.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Rake
- module TraceOutput
-
- # Write trace output to output stream +out+.
- #
- # The write is done as a single IO call (to print) to lessen the
- # chance that the trace output is interrupted by other tasks also
- # producing output.
- def trace_on(out, *strings)
- sep = $\ || "\n"
- if strings.empty?
- output = sep
- else
- output = strings.map { |s| s.end_with?(sep) ? s : s + sep }.join
- end
- out.print(output)
- end
- end
-end
diff --git a/lib/rake/version.rb b/lib/rake/version.rb
deleted file mode 100644
index 11f2f15493..0000000000
--- a/lib/rake/version.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Rake
- VERSION = '0.9.6'
-
- module Version # :nodoc: all
- MAJOR, MINOR, BUILD, = Rake::VERSION.split '.'
-
- NUMBERS = [
- MAJOR,
- MINOR,
- BUILD,
- ]
- end
-end
diff --git a/lib/rake/win32.rb b/lib/rake/win32.rb
index 98289a10b4..0ab31c2822 100644
--- a/lib/rake/win32.rb
+++ b/lib/rake/win32.rb
@@ -1,55 +1,46 @@
-
module Rake
- require 'rake/alt_system'
# Win 32 interface methods for Rake. Windows specific functionality
# will be placed here to collect that knowledge in one spot.
module Win32
-
- # Error indicating a problem in locating the home directory on a
- # Win32 system.
- class Win32HomeError < RuntimeError
- end
-
class << self
# True if running on a windows system.
- def windows?
- AltSystem::WINDOWS
- end
-
- # Run a command line on windows.
- def rake_system(*cmd)
- AltSystem.system(*cmd)
+ if File::ALT_SEPARATOR == '\\' # assume other DOSish systems are extinct.
+ def windows?; true end
+ else
+ def windows?; false end
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
- # * APPDATA
# * USERPROFILE
#
- # If the above are not defined, the return nil.
+ # If the above are not defined, retruns the personal folder.
def win32_system_dir #:nodoc:
- win32_shared_path = ENV['HOME']
- if win32_shared_path.nil? && ENV['HOMEDRIVE'] && ENV['HOMEPATH']
- win32_shared_path = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
+ win32_shared_path = ENV['APPDATA']
+ if !win32_shared_path or win32_shared_path.empty?
+ win32_shared_path = '~'
end
-
- win32_shared_path ||= ENV['APPDATA']
- win32_shared_path ||= ENV['USERPROFILE']
- raise Win32HomeError, "Unable to determine home path environment variable." if
- win32_shared_path.nil? or win32_shared_path.empty?
- normalize(File.join(win32_shared_path, 'Rake'))
+ File.expand_path('Rake', win32_shared_path)
end
# Normalize a win32 path so that the slashes are all forward slashes.
def normalize(path)
- path.gsub(/\\/, '/')
+ path.tr('\\', '/')
end
+ end if windows?
+ end
+ if Win32.windows?
+ def standard_system_dir
+ Win32.win32_system_dir
end
end
end
diff --git a/lib/rbconfig/.document b/lib/rbconfig/.document
deleted file mode 100644
index 4cea83cd0e..0000000000
--- a/lib/rbconfig/.document
+++ /dev/null
@@ -1 +0,0 @@
-# these files are obsolete
diff --git a/lib/rbconfig/datadir.rb b/lib/rbconfig/datadir.rb
index 9b7eabb473..554b7fead7 100644
--- a/lib/rbconfig/datadir.rb
+++ b/lib/rbconfig/datadir.rb
@@ -4,10 +4,17 @@
# See LICENSE.txt for permissions.
#++
-# N.B. This file is used by Config.datadir in rubygems.rb, and must not be
-# removed before that require is removed. I require to avoid warning more than
-# once.
+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
-warn 'rbconfig/datadir.rb and {Rb}Config.datadir is being deprecated from '\
- 'RubyGems. It will be removed completely on or after June 2011. If you '\
- 'wish to rely on a datadir, please use Gem.datadir.'
diff --git a/lib/rbconfig/obsolete.rb b/lib/rbconfig/obsolete.rb
deleted file mode 100644
index 7025fb43fb..0000000000
--- a/lib/rbconfig/obsolete.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-module ::RbConfig
- module Obsolete
- end
- class << Obsolete
- def _warn_
- loc, = caller_locations(2, 1)
- loc = "#{loc.to_s}: " if loc
- warn "#{loc}Use RbConfig instead of obsolete and deprecated Config."
- self
- end
-
- def const_missing(name)
- _warn_
- ::RbConfig.const_get(name)
- end
-
- def method_missing(*args, &block)
- _warn_
- rbconfig = ::RbConfig
- result = rbconfig.__send__(*args, &block)
- result = rbconfig if rbconfig.equal?(result)
- result
- end
-
- def respond_to_missing?(*args, &block)
- _warn_
- ::RbConfig.send(:respond_to_missing?, *args, &block)
- end
- end
-end
-
-::Config = ::RbConfig::Obsolete._warn_
-=begin
-def Object.const_missing(name)
- return super unless name == :Config
- ::RbConfig::Obsolete._warn_
-end
-=end
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index 32a3658e41..7ce7b53a35 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -1,58 +1,368 @@
$DEBUG_RDOC = nil
-# :main: README.rdoc
+# :main: README.txt
##
-# RDoc produces documentation for Ruby source files by parsing the source and
-# extracting the definition for classes, modules, methods, includes and
-# requires. It associates these with optional documentation contained in an
-# immediately preceding comment block then renders the result using an output
-# formatter.
+# = \RDoc - Ruby Documentation System
#
-# For a simple introduction to writing or generating documentation using RDoc
-# see the README.
+# 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 think you found a bug in RDoc see DEVELOPERS@Bugs
+# * If you want to use RDoc to create documentation for your Ruby source files,
+# read on.
+# * If you want to generate documentation for 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
#
-# If you want to use RDoc to create documentation for your Ruby source files,
-# see RDoc::Markup and refer to <tt>rdoc --help</tt> for command line usage.
+# == Summary
#
-# If you want to set the default markup format see
-# RDoc::Markup@Supported+Formats
+# Once installed, you can create documentation using the +rdoc+ command
#
-# If you want to store rdoc configuration in your gem (such as the default
-# markup format) see RDoc::Options@Saved+Options
+# % rdoc [options] [names...]
#
-# If you want to write documentation for Ruby files see RDoc::Parser::Ruby
+# For an up-to-date option summary, type
#
-# If you want to write documentation for extensions written in C see
-# RDoc::Parser::C
+# % rdoc --help
#
-# If you want to generate documentation using <tt>rake</tt> see RDoc::Task.
+# A typical use might be to generate documentation for a package of Ruby
+# source (such as RDoc itself).
#
-# If you want to drive RDoc programmatically, see RDoc::RDoc.
+# % rdoc
#
-# If you want to use the library to format text blocks into HTML or other
-# formats, look at RDoc::Markup.
+# 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+.
#
-# If you want to make an RDoc plugin such as a generator or directive handler
-# see RDoc::RDoc.
+# 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
#
-# If you want to write your own output generator see RDoc::Generator.
+# % rdoc --main rdoc.rb
#
-# If you want an overview of how RDoc works see DEVELOPERS
+# You'll find information on the various formatting tricks you can use
+# in comment blocks in the documentation this generates.
#
-# == Credits
+# 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.
+#
+# == Documenting Source Code
+#
+# Comment blocks can be written fairly naturally, either using <tt>#</tt> 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.
+#
+# RDoc automatically cross-references words with underscores or camel-case.
+# To suppress cross-references, prefix the word with a \\ character. To
+# include special characters like "\\n", you'll need to use two \\
+# characters like "\\\\\\n".
+#
+# == \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:
#
-# RDoc is currently being maintained by Eric Hodel <drbrain@segment7.net>.
+# [<tt>\*word*</tt>] displays word in a *bold* font
+# [<tt>\_word_</tt>] displays word in an _emphasized_ font
+# [<tt>\+word+</tt>] 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.
+#
+# [<tt>\<b>text...</b></tt>] displays word in a *bold* font
+# [<tt>\<em>text...</em></tt>] displays word in an _emphasized_ font
+# [<tt>\<i>text...</i></tt>] displays word in an <i>italicized</i> font
+# [<tt>\<tt>text...\</tt></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>.
+#
+# Example hyperlinks:
+#
+# link:RDoc.html
+# http://rdoc.rubyforge.org
+# mailto:user@example.com
+# {RDoc Documentation}[http://rdoc.rubyforge.org]
+# {RDoc Markup}[link:RDoc/Markup.html]
+#
+# == 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.
+#
+# Further directives can be found in RDoc::Parser::Ruby and RDoc::Parser::C
+#
+# == 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.
+#
+# * 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
@@ -61,15 +371,19 @@ module RDoc
class Error < RuntimeError; end
- ##
- # RDoc version you are using
+ def self.const_missing const_name # :nodoc:
+ if const_name.to_s == 'RDocError' then
+ warn "RDoc::RDocError is deprecated"
+ return Error
+ end
- VERSION = '4.0.0'
+ super
+ end
##
- # Method visibilities
+ # RDoc version you are using
- VISIBILITIES = [:public, :protected, :private]
+ VERSION = '2.5.8'
##
# Name of the dotfile that contains the description of files to be processed
@@ -103,80 +417,5 @@ module RDoc
METHOD_MODIFIERS = GENERAL_MODIFIERS +
%w[arg args yield yields notnew not-new not_new doc]
- ##
- # Loads the best available YAML library.
-
- def self.load_yaml
- begin
- gem 'psych'
- rescue Gem::LoadError
- end
-
- begin
- require 'psych'
- rescue ::LoadError
- ensure
- require 'yaml'
- end
- end
-
- autoload :RDoc, 'rdoc/rdoc'
-
- autoload :TestCase, 'rdoc/test_case'
-
- autoload :CrossReference, 'rdoc/cross_reference'
- autoload :ERBIO, 'rdoc/erbio'
- autoload :ERBPartial, 'rdoc/erb_partial'
- autoload :Encoding, 'rdoc/encoding'
- autoload :Generator, 'rdoc/generator'
- autoload :Options, 'rdoc/options'
- autoload :Parser, 'rdoc/parser'
- autoload :Servlet, 'rdoc/servlet'
- autoload :RI, 'rdoc/ri'
- autoload :Stats, 'rdoc/stats'
- autoload :Store, 'rdoc/store'
- autoload :Task, 'rdoc/task'
- autoload :Text, 'rdoc/text'
-
- autoload :Markdown, 'rdoc/markdown'
- autoload :Markup, 'rdoc/markup'
- autoload :RD, 'rdoc/rd'
- autoload :TomDoc, 'rdoc/tom_doc'
-
- autoload :KNOWN_CLASSES, 'rdoc/known_classes'
-
- autoload :RubyLex, 'rdoc/ruby_lex'
- autoload :RubyToken, 'rdoc/ruby_token'
- autoload :TokenStream, 'rdoc/token_stream'
-
- autoload :Comment, 'rdoc/comment'
-
- # code objects
- #
- # We represent the various high-level code constructs that appear in Ruby
- # programs: classes, modules, methods, and so on.
- autoload :CodeObject, 'rdoc/code_object'
-
- autoload :Context, 'rdoc/context'
- autoload :TopLevel, 'rdoc/top_level'
-
- autoload :AnonClass, 'rdoc/anon_class'
- autoload :ClassModule, 'rdoc/class_module'
- autoload :NormalClass, 'rdoc/normal_class'
- autoload :NormalModule, 'rdoc/normal_module'
- autoload :SingleClass, 'rdoc/single_class'
-
- autoload :Alias, 'rdoc/alias'
- autoload :AnyMethod, 'rdoc/any_method'
- autoload :MethodAttr, 'rdoc/method_attr'
- autoload :GhostMethod, 'rdoc/ghost_method'
- autoload :MetaMethod, 'rdoc/meta_method'
- autoload :Attr, 'rdoc/attr'
-
- autoload :Constant, 'rdoc/constant'
- autoload :Include, 'rdoc/include'
- autoload :Extend, 'rdoc/extend'
- autoload :Require, 'rdoc/require'
-
end
diff --git a/lib/rdoc/alias.rb b/lib/rdoc/alias.rb
index 39d2694817..6cd9af09d4 100644
--- a/lib/rdoc/alias.rb
+++ b/lib/rdoc/alias.rb
@@ -1,77 +1,43 @@
+require 'rdoc/code_object'
+
##
# Represent an alias, which is an old_name/new_name pair associated with a
# particular context
-#--
-# TODO implement Alias as a proxy to a method/attribute, inheriting from
-# MethodAttr
class RDoc::Alias < RDoc::CodeObject
##
- # Aliased method's name
-
- attr_reader :new_name
+ # Allow comments to be overridden
- alias name new_name
+ attr_writer :comment
##
- # Aliasee method's name
+ # Aliased name
- attr_reader :old_name
+ attr_accessor :new_name
##
- # Is this an alias declared in a singleton context?
+ # Aliasee's name
- attr_accessor :singleton
+ attr_accessor :old_name
##
# Source file token stream
- attr_reader :text
+ attr_accessor :text
##
# Creates a new Alias with a token stream of +text+ that aliases +old_name+
- # to +new_name+, has +comment+ and is a +singleton+ context.
+ # to +new_name+ and has +comment+
- def initialize(text, old_name, new_name, comment, singleton = false)
+ def initialize(text, old_name, new_name, comment)
super()
-
@text = text
- @singleton = singleton
@old_name = old_name
@new_name = new_name
self.comment = comment
end
- ##
- # Order by #singleton then #new_name
-
- def <=>(other)
- [@singleton ? 0 : 1, new_name] <=> [other.singleton ? 0 : 1, other.new_name]
- end
-
- ##
- # HTML fragment reference for this alias
-
- def aref
- type = singleton ? 'c' : 'i'
- "#alias-#{type}-#{html_name}"
- end
-
- ##
- # Full old name including namespace
-
- def full_old_name
- @full_name || "#{parent.name}#{pretty_old_name}"
- end
-
- ##
- # HTML id-friendly version of +#new_name+.
-
- def html_name
- CGI.escape(@new_name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '')
- end
-
def inspect # :nodoc:
parent_name = parent ? parent.name : '(unknown)'
"#<%s:0x%x %s.alias_method %s, %s>" % [
@@ -80,31 +46,8 @@ class RDoc::Alias < RDoc::CodeObject
]
end
- ##
- # '::' for the alias of a singleton method/attribute, '#' for instance-level.
-
- def name_prefix
- singleton ? '::' : '#'
- end
-
- ##
- # Old name with prefix '::' or '#'.
-
- def pretty_old_name
- "#{singleton ? '::' : '#'}#{@old_name}"
- end
-
- ##
- # New name with prefix '::' or '#'.
-
- def pretty_new_name
- "#{singleton ? '::' : '#'}#{@new_name}"
- end
-
- alias pretty_name pretty_new_name
-
def to_s # :nodoc:
- "alias: #{self.new_name} -> #{self.pretty_old_name} in: #{parent}"
+ "alias: #{self.old_name} -> #{self.new_name}\n#{self.comment}"
end
end
diff --git a/lib/rdoc/anon_class.rb b/lib/rdoc/anon_class.rb
index c23d8e5d96..0a684f2dfb 100644
--- a/lib/rdoc/anon_class.rb
+++ b/lib/rdoc/anon_class.rb
@@ -1,9 +1,9 @@
+require 'rdoc/class_module'
+
##
# An anonymous class like:
#
# c = Class.new do end
-#
-# AnonClass is currently not used.
class RDoc::AnonClass < RDoc::ClassModule
end
diff --git a/lib/rdoc/any_method.rb b/lib/rdoc/any_method.rb
index 23110dcb2a..d742daa7b8 100644
--- a/lib/rdoc/any_method.rb
+++ b/lib/rdoc/any_method.rb
@@ -1,16 +1,29 @@
+require 'rdoc/code_object'
+require 'rdoc/tokenstream'
+
##
# AnyMethod is the base class for objects representing methods
-class RDoc::AnyMethod < RDoc::MethodAttr
+class RDoc::AnyMethod < RDoc::CodeObject
+
+ MARSHAL_VERSION = 1 # :nodoc:
+
+ include Comparable
+
+ ##
+ # Method name
+
+ attr_writer :name
+
+ ##
+ # public, protected, private
+
+ attr_accessor :visibility
##
- # 2::
- # RDoc 4
- # Added calls_super
- # Added parent name and class
- # Added section title
+ # Parameters yielded by the called block
- MARSHAL_VERSION = 2 # :nodoc:
+ attr_accessor :block_params
##
# Don't rename \#initialize to \::new
@@ -18,14 +31,24 @@ class RDoc::AnyMethod < RDoc::MethodAttr
attr_accessor :dont_rename_initialize
##
- # The C function that implements this method (if it was defined in a C file)
+ # Is this a singleton method?
- attr_accessor :c_function
+ attr_accessor :singleton
##
- # Different ways to call this method
+ # Source file token stream
- attr_accessor :call_seq
+ attr_reader :text
+
+ ##
+ # Array of other names for this method
+
+ attr_reader :aliases
+
+ ##
+ # The method we're aliasing
+
+ attr_accessor :is_alias_for
##
# Parameters for this method
@@ -33,47 +56,51 @@ class RDoc::AnyMethod < RDoc::MethodAttr
attr_accessor :params
##
- # If true this method uses +super+ to call a superclass version
+ # Different ways to call this method
- attr_accessor :calls_super
+ attr_accessor :call_seq
include RDoc::TokenStream
- ##
- # Creates a new AnyMethod with a token stream +text+ and +name+
+ def initialize(text, name)
+ super()
- def initialize text, name
- super
+ @text = text
+ @name = name
- @c_function = nil
+ @aliases = []
+ @block_params = nil
+ @call_seq = nil
@dont_rename_initialize = false
- @token_stream = nil
- @calls_super = false
- @superclass_method = nil
+ @is_alias_for = nil
+ @params = nil
+ @parent_name = nil
+ @singleton = nil
+ @token_stream = nil
+ @visibility = :public
end
##
- # Adds +an_alias+ as an alias for this method in +context+.
+ # Order by #singleton then #name
+
+ def <=>(other)
+ [@singleton ? 0 : 1, @name] <=> [other.singleton ? 0 : 1, other.name]
+ end
- def add_alias an_alias, context = nil
- method = self.class.new an_alias.text, an_alias.new_name
+ ##
+ # Adds +method+ as an alias for this method
- method.record_location an_alias.file
- method.singleton = self.singleton
- method.params = self.params
- method.visibility = self.visibility
- method.comment = an_alias.comment
- method.is_alias_for = self
+ def add_alias(method)
@aliases << method
- context.add_method method if context
- method
end
##
- # Prefix for +aref+ is 'method'.
+ # HTML fragment reference for this method
- def aref_prefix
- 'method'
+ def aref
+ type = singleton ? 'c' : 'i'
+
+ "method-#{type}-#{CGI.escape name}"
end
##
@@ -90,11 +117,35 @@ class RDoc::AnyMethod < RDoc::MethodAttr
end
##
+ # HTML id-friendly method name
+
+ def html_name
+ @name.gsub(/[^a-z]+/, '-')
+ end
+
+ def inspect # :nodoc:
+ alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
+ "#<%s:0x%x %s (%s)%s>" % [
+ self.class, object_id,
+ full_name,
+ visibility,
+ alias_for,
+ ]
+ end
+
+ ##
+ # Full method name including namespace
+
+ def full_name
+ @full_name ||= "#{@parent ? @parent.full_name : '(unknown)'}#{pretty_name}"
+ end
+
+ ##
# Dumps this AnyMethod for use by ri. See also #marshal_load
def marshal_dump
aliases = @aliases.map do |a|
- [a.name, parse(a.comment)]
+ [a.full_name, parse(a.comment)]
end
[ MARSHAL_VERSION,
@@ -107,11 +158,6 @@ class RDoc::AnyMethod < RDoc::MethodAttr
@block_params,
aliases,
@params,
- @file.relative_name,
- @calls_super,
- @parent.name,
- @parent.class,
- @section.title,
]
end
@@ -122,54 +168,36 @@ class RDoc::AnyMethod < RDoc::MethodAttr
# * #full_name
# * #parent_name
- def marshal_load array
- initialize_visibility
-
+ def marshal_load(array)
@dont_rename_initialize = nil
@is_alias_for = nil
@token_stream = nil
@aliases = []
- @parent = nil
- @parent_name = nil
- @parent_class = nil
- @section = nil
- @file = nil
-
- version = array[0]
- @name = array[1]
- @full_name = array[2]
- @singleton = array[3]
- @visibility = array[4]
- @comment = array[5]
- @call_seq = array[6]
- @block_params = array[7]
- # 8 handled below
- @params = array[9]
- # 10 handled below
- @calls_super = array[11]
- @parent_name = array[12]
- @parent_title = array[13]
- @section_title = array[14]
+
+ @name = array[1]
+ @full_name = array[2]
+ @singleton = array[3]
+ @visibility = array[4]
+ @comment = array[5]
+ @call_seq = array[6]
+ @block_params = array[7]
+ @params = array[9]
+
+ @parent_name = if @full_name =~ /#/ then
+ $`
+ else
+ name = @full_name.split('::')
+ name.pop
+ name.join '::'
+ end
array[8].each do |new_name, comment|
- add_alias RDoc::Alias.new(nil, @name, new_name, comment, @singleton)
+ add_alias RDoc::Alias.new(nil, @name, new_name, comment)
end
-
- @parent_name ||= if @full_name =~ /#/ then
- $`
- else
- name = @full_name.split('::')
- name.pop
- name.join '::'
- end
-
- @file = RDoc::TopLevel.new array[10] if version > 0
end
##
# Method name
- #
- # If the method has no assigned name, it extracts it from #call_seq.
def name
return @name if @name
@@ -178,45 +206,12 @@ class RDoc::AnyMethod < RDoc::MethodAttr
end
##
- # A list of this method's method and yield parameters. +call-seq+ params
- # are preferred over parsed method and block params.
-
- def param_list
- if @call_seq then
- params = @call_seq.split("\n").last
- params = params.sub(/.*?\((.*)\)/, '\1')
- params = params.sub(/(\{|do)\s*\|([^|]*)\|.*/, ',\2')
- elsif @params then
- params = @params.sub(/\((.*)\)/, '\1')
-
- params << ",#{@block_params}" if @block_params
- elsif @block_params then
- params = @block_params
- else
- return []
- end
-
- params = params.gsub(/\s+/, '').split ','
-
- params.map { |param| param.sub(/=.*/, '') }
- end
-
- ##
- # Pretty parameter list for this method. If the method's parameters were
- # given by +call-seq+ it is preferred over the parsed values.
+ # Pretty parameter list for this method
def param_seq
- if @call_seq then
- params = @call_seq.split("\n").last
- params = params.sub(/[^( ]+/, '')
- params = params.sub(/(\|[^|]+\|)\s*\.\.\.\s*(end|\})/, '\1 \2')
- elsif @params then
- params = @params.gsub(/\s*\#.*/, '')
- params = params.tr("\n", " ").squeeze(" ")
- params = "(#{params})" unless params[0] == ?(
- else
- params = ''
- end
+ params = @params.gsub(/\s*\#.*/, '')
+ params = params.tr("\n", " ").squeeze(" ")
+ params = "(#{params})" unless params[0] == ?(
if @block_params then
# If this method has explicit block parameters, remove any explicit
@@ -235,29 +230,60 @@ class RDoc::AnyMethod < RDoc::MethodAttr
end
##
- # Sets the store for this method and its referenced code objects.
+ # Name of our parent with special handling for un-marshaled methods
- def store= store
- super
+ def parent_name
+ @parent_name || super
+ end
- @file = @store.add_file @file.full_name if @file
+ ##
+ # Path to this method
+
+ def path
+ "#{@parent.path}##{aref}"
end
##
- # For methods that +super+, find the superclass method that would be called.
+ # Method name with class/instance indicator
+
+ def pretty_name
+ "#{singleton ? '::' : '#'}#{@name}"
+ end
- def superclass_method
- return unless @calls_super
- return @superclass_method if @superclass_method
+ def pretty_print q # :nodoc:
+ alias_for = @is_alias_for ? "alias for #{@is_alias_for.name}" : nil
- parent.each_ancestor do |ancestor|
- if method = ancestor.method_list.find { |m| m.name == @name } then
- @superclass_method = method
- break
+ q.group 2, "[#{self.class.name} #{full_name} #{visibility}", "]" do
+ if alias_for then
+ q.breakable
+ q.text alias_for
+ end
+
+ if text then
+ q.breakable
+ q.text "text:"
+ q.breakable
+ q.pp @text
+ end
+
+ unless comment.empty? then
+ q.breakable
+ q.text "comment:"
+ q.breakable
+ q.pp @comment
end
end
+ end
+
+ def to_s # :nodoc:
+ "#{self.class.name}: #{full_name} (#{@text})\n#{@comment}"
+ end
+
+ ##
+ # Type of method (class or instance)
- @superclass_method
+ def type
+ singleton ? 'class' : 'instance'
end
end
diff --git a/lib/rdoc/attr.rb b/lib/rdoc/attr.rb
index 960e1d1107..9b8c4562c2 100644
--- a/lib/rdoc/attr.rb
+++ b/lib/rdoc/attr.rb
@@ -1,98 +1,104 @@
+require 'rdoc/code_object'
+
##
# An attribute created by \#attr, \#attr_reader, \#attr_writer or
# \#attr_accessor
-class RDoc::Attr < RDoc::MethodAttr
+class RDoc::Attr < RDoc::CodeObject
+
+ MARSHAL_VERSION = 0 # :nodoc:
##
- # 3::
- # RDoc 4
- # Added parent name and class
- # Added section title
+ # Name of the attribute
- MARSHAL_VERSION = 3 # :nodoc:
+ attr_accessor :name
##
- # Is the attribute readable ('R'), writable ('W') or both ('RW')?
+ # Is the attribute readable, writable or both?
attr_accessor :rw
##
- # Creates a new Attr with body +text+, +name+, read/write status +rw+ and
- # +comment+. +singleton+ marks this as a class attribute.
+ # Source file token stream
+
+ attr_accessor :text
+
+ ##
+ # public, protected, private
- def initialize(text, name, rw, comment, singleton = false)
- super text, name
+ attr_accessor :visibility
+ def initialize(text, name, rw, comment)
+ super()
+ @text = text
+ @name = name
@rw = rw
- @singleton = singleton
+ @visibility = :public
self.comment = comment
end
##
- # Attributes are equal when their names, singleton and rw are identical
+ # Attributes are ordered by name
+
+ def <=>(other)
+ self.name <=> other.name
+ end
+
+ ##
+ # Attributes are equal when their names and rw is identical
def == other
self.class == other.class and
self.name == other.name and
- self.rw == other.rw and
- self.singleton == other.singleton
+ self.rw == other.rw
end
##
- # Add +an_alias+ as an attribute in +context+.
+ # Returns nil, for duck typing with RDoc::AnyMethod
- def add_alias(an_alias, context)
- new_attr = self.class.new(self.text, an_alias.new_name, self.rw,
- self.comment, self.singleton)
+ def arglists
+ end
+
+ ##
+ # Returns nil, for duck typing with RDoc::AnyMethod
- new_attr.record_location an_alias.file
- new_attr.visibility = self.visibility
- new_attr.is_alias_for = self
- @aliases << new_attr
- context.add_attribute new_attr
- new_attr
+ def block_params
end
##
- # The #aref prefix for attributes
+ # Returns nil, for duck typing with RDoc::AnyMethod
- def aref_prefix
- 'attribute'
+ def call_seq
end
##
- # Attributes never call super. See RDoc::AnyMethod#calls_super
- #
- # An RDoc::Attr can show up in the method list in some situations (see
- # Gem::ConfigFile)
+ # Partially bogus as Attr has no parent. For duck typing with
+ # RDoc::AnyMethod.
- def calls_super # :nodoc:
- false
+ def full_name
+ @full_name ||= "#{@parent ? @parent.full_name : '(unknown)'}##{name}"
end
##
- # Returns attr_reader, attr_writer or attr_accessor as appropriate.
+ # An HTML id-friendly representation of #name
- def definition
- case @rw
- when 'RW' then 'attr_accessor'
- when 'R' then 'attr_reader'
- when 'W' then 'attr_writer'
- end
+ def html_name
+ @name.gsub(/[^a-z]+/, '-')
end
def inspect # :nodoc:
- alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
- visibility = self.visibility
- visibility = "forced #{visibility}" if force_documentation
- "#<%s:0x%x %s %s (%s)%s>" % [
- self.class, object_id,
- full_name,
- rw,
- visibility,
- alias_for,
- ]
+ 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
##
@@ -105,70 +111,67 @@ class RDoc::Attr < RDoc::MethodAttr
@rw,
@visibility,
parse(@comment),
- singleton,
- @file.relative_name,
- @parent.full_name,
- @parent.class,
- @section.title
]
end
##
- # Loads this Attr from +array+. For a loaded Attr the following
+ # Loads this AnyMethod from +array+. For a loaded AnyMethod the following
# methods will return cached values:
#
# * #full_name
# * #parent_name
def marshal_load array
- initialize_visibility
-
- @aliases = []
- @parent = nil
- @parent_name = nil
- @parent_class = nil
- @section = nil
- @file = nil
-
- version = array[0]
- @name = array[1]
- @full_name = array[2]
- @rw = array[3]
- @visibility = array[4]
- @comment = array[5]
- @singleton = array[6] || false # MARSHAL_VERSION == 0
- # 7 handled below
- @parent_name = array[8]
- @parent_class = array[9]
- @section_title = array[10]
-
- @file = RDoc::TopLevel.new array[7] if version > 1
-
- @parent_name ||= @full_name.split('#', 2).first
- end
-
- def pretty_print q # :nodoc:
- q.group 2, "[#{self.class.name} #{full_name} #{rw} #{visibility}", "]" do
- unless comment.empty? then
- q.breakable
- q.text "comment:"
- q.breakable
- q.pp @comment
- end
- end
+ @name = array[1]
+ @full_name = array[2]
+ @rw = array[3]
+ @visibility = array[4]
+ @comment = array[5]
+
+ @parent_name = @full_name
+ end
+
+ ##
+ # Name of our parent with special handling for un-marshaled methods
+
+ def parent_name
+ @parent_name || super
+ end
+
+ ##
+ # For duck typing with RDoc::AnyMethod, returns nil
+
+ def params
+ nil
+ end
+
+ ##
+ # URL path for this attribute
+
+ def path
+ "#{@parent.path}##{@name}"
+ end
+
+ ##
+ # For duck typing with RDoc::AnyMethod
+
+ def singleton
+ false
end
def to_s # :nodoc:
- "#{definition} #{name} in: #{parent}"
+ "#{type} #{name}\n#{comment}"
end
##
- # Attributes do not have token streams.
- #
- # An RDoc::Attr can show up in the method list in some situations (see
- # Gem::ConfigFile)
+ # Returns attr_reader, attr_writer or attr_accessor as appropriate
- def token_stream # :nodoc:
+ def type
+ case @rw
+ when 'RW' then 'attr_accessor'
+ when 'R' then 'attr_reader'
+ when 'W' then 'attr_writer'
+ end
end
end
diff --git a/lib/rdoc/class_module.rb b/lib/rdoc/class_module.rb
index 5a279b516d..16b85d7918 100644
--- a/lib/rdoc/class_module.rb
+++ b/lib/rdoc/class_module.rb
@@ -1,262 +1,50 @@
+require 'rdoc/context'
+
##
# ClassModule is the base class for objects representing either a class or a
# module.
class RDoc::ClassModule < RDoc::Context
- ##
- # 1::
- # RDoc 3.7
- # * Added visibility, singleton and file to attributes
- # * Added file to constants
- # * Added file to includes
- # * Added file to methods
- # 2::
- # RDoc 3.13
- # * Added extends
- # 3::
- # RDoc 4.0
- # * Added sections
- # * Added in_files
- # * Added parent name
- # * Complete Constant dump
-
- MARSHAL_VERSION = 3 # :nodoc:
-
- ##
- # Constants that are aliases for this class or module
+ MARSHAL_VERSION = 0 # :nodoc:
- attr_accessor :constant_aliases
-
- ##
- # Comment and the location it came from. Use #add_comment to add comments
-
- attr_accessor :comment_location
-
- attr_accessor :diagram # :nodoc:
-
- ##
- # Class or module this constant is an alias for
-
- attr_accessor :is_alias_for
-
- ##
- # Return a RDoc::ClassModule of class +class_type+ that is a copy
- # of module +module+. Used to promote modules to classes.
- #--
- # TODO move to RDoc::NormalClass (I think)
-
- def self.from_module class_type, mod
- klass = class_type.new mod.name
-
- mod.comment_location.each do |comment, location|
- klass.add_comment comment, location
- end
-
- klass.parent = mod.parent
- klass.section = mod.section
- klass.viewer = mod.viewer
-
- klass.attributes.concat mod.attributes
- klass.method_list.concat mod.method_list
- klass.aliases.concat mod.aliases
- klass.external_aliases.concat mod.external_aliases
- klass.constants.concat mod.constants
- klass.includes.concat mod.includes
- klass.extends.concat mod.extends
-
- klass.methods_hash.update mod.methods_hash
- klass.constants_hash.update mod.constants_hash
-
- klass.current_section = mod.current_section
- klass.in_files.concat mod.in_files
- klass.sections.concat mod.sections
- klass.unmatched_alias_lists = mod.unmatched_alias_lists
- klass.current_section = mod.current_section
- klass.visibility = mod.visibility
-
- klass.classes_hash.update mod.classes_hash
- klass.modules_hash.update mod.modules_hash
- klass.metadata.update mod.metadata
-
- klass.document_self = mod.received_nodoc ? nil : mod.document_self
- klass.document_children = mod.document_children
- klass.force_documentation = mod.force_documentation
- klass.done_documenting = mod.done_documenting
-
- # update the parent of all children
-
- (klass.attributes +
- klass.method_list +
- klass.aliases +
- klass.external_aliases +
- klass.constants +
- klass.includes +
- klass.extends +
- klass.classes +
- klass.modules).each do |obj|
- obj.parent = klass
- obj.full_name = nil
- end
-
- klass
- end
+ attr_accessor :diagram
##
# Creates a new ClassModule with +name+ with optional +superclass+
- #
- # This is a constructor for subclasses, and must never be called directly.
-
- def initialize(name, superclass = nil)
- @constant_aliases = []
- @diagram = nil
- @is_alias_for = nil
- @name = name
- @superclass = superclass
- @comment_location = [] # [[comment, location]]
+ def initialize(name, superclass = 'Object')
+ @diagram = nil
+ @full_name = nil
+ @name = name
+ @superclass = superclass
super()
end
##
- # Adds +comment+ to this ClassModule's list of comments at +location+. This
- # method is preferred over #comment= since it allows ri data to be updated
- # across multiple runs.
-
- def add_comment comment, location
- return unless document_self
-
- original = comment
-
- comment = case comment
- when RDoc::Comment then
- comment.normalize
- else
- normalize_comment comment
- end
-
- @comment_location.delete_if { |(_, l)| l == location }
-
- @comment_location << [comment, location]
-
- self.comment = original
- end
-
- def add_things my_things, other_things # :nodoc:
- other_things.each do |group, things|
- my_things[group].each { |thing| yield false, thing } if
- my_things.include? group
-
- things.each do |thing|
- yield true, thing
- end
- end
- end
-
- ##
- # Ancestors list for this ClassModule: the list of included modules
- # (classes will add their superclass if any).
- #
- # Returns the included classes or modules, not the includes
- # themselves. The returned values are either String or
- # RDoc::NormalModule instances (see RDoc::Include#module).
- #
- # The values are returned in reverse order of their inclusion,
- # which is the order suitable for searching methods/attributes
- # in the ancestors. The superclass, if any, comes last.
+ # Ancestors list for this ClassModule (abstract)
def ancestors
- includes.map { |i| i.module }.reverse
+ raise NotImplementedError
end
##
- # Ancestors of this class or module only
-
- alias direct_ancestors ancestors
-
- ##
- # Clears the comment. Used by the ruby parser.
-
- def clear_comment
- @comment = ''
- end
-
- ##
- # This method is deprecated, use #add_comment instead.
- #
# Appends +comment+ to the current comment, but separated by a rule. Works
# more like <tt>+=</tt>.
- def comment= comment # :nodoc:
- comment = case comment
- when RDoc::Comment then
- comment.normalize
- else
- normalize_comment comment
- end
-
- comment = "#{@comment}\n---\n#{comment}" unless @comment.empty?
-
- super comment
- end
-
- ##
- # Prepares this ClassModule for use by a generator.
- #
- # See RDoc::Store#complete
-
- def complete min_visibility
- update_aliases
- remove_nodoc_children
- update_includes
- remove_invisible min_visibility
- end
-
- ##
- # Does this ClassModule or any of its methods have document_self set?
-
- def document_self_or_methods
- document_self || method_list.any?{ |m| m.document_self }
- end
+ def comment=(comment)
+ return if comment.empty?
- ##
- # Does this class or module have a comment with content or is
- # #received_nodoc true?
+ comment = "#{@comment}\n---\n#{normalize_comment comment}" unless
+ @comment.empty?
- def documented?
- super or !@comment_location.empty?
- end
-
- ##
- # Iterates the ancestors of this class or module for which an
- # RDoc::ClassModule exists.
-
- def each_ancestor # :yields: module
- return enum_for __method__ unless block_given?
-
- ancestors.each do |mod|
- next if String === mod
- next if self == mod
- yield mod
- end
- end
-
- ##
- # Looks for a symbol in the #ancestors. See Context#find_local_symbol.
-
- def find_ancestor_local_symbol symbol
- each_ancestor do |m|
- res = m.find_local_symbol(symbol)
- return res if res
- end
-
- nil
+ super
end
##
- # Finds a class or module with +name+ in this namespace or its descendants
+ # Finds a class or module with +name+ in this namespace or its descendents
- def find_class_named name
+ def find_class_named(name)
return self if full_name == name
return self if @name == name
@@ -270,27 +58,29 @@ class RDoc::ClassModule < RDoc::Context
# Return the fully qualified name of this class or module
def full_name
- @full_name ||= if RDoc::ClassModule === parent then
- "#{parent.full_name}::#{@name}"
+ @full_name ||= if RDoc::ClassModule === @parent then
+ "#{@parent.full_name}::#{@name}"
else
@name
end
end
##
- # TODO: filter included items by #display?
+ # 'module' or 'class'
+
+ def type
+ module? ? 'module' : 'class'
+ end
def marshal_dump # :nodoc:
attrs = attributes.sort.map do |attr|
- [ attr.name, attr.rw,
- attr.visibility, attr.singleton, attr.file_name,
- ]
+ [attr.name, attr.rw]
end
method_types = methods_by_type.map do |type, visibilities|
visibilities = visibilities.map do |visibility, methods|
method_names = methods.map do |method|
- [method.name, method.file_name]
+ method.name
end
[visibility, method_names.uniq]
@@ -303,243 +93,86 @@ class RDoc::ClassModule < RDoc::Context
@name,
full_name,
@superclass,
- parse(@comment_location),
+ parse(@comment),
attrs,
- constants,
+ constants.map do |const|
+ [const.name, parse(const.comment)]
+ end,
includes.map do |incl|
- [incl.name, parse(incl.comment), incl.file_name]
+ [incl.name, parse(incl.comment)]
end,
method_types,
- extends.map do |ext|
- [ext.name, parse(ext.comment), ext.file_name]
- end,
- @sections.values,
- @in_files.map do |tl|
- tl.relative_name
- end,
- parent.full_name,
- parent.class,
]
end
def marshal_load array # :nodoc:
- initialize_visibility
initialize_methods_etc
- @current_section = nil
- @document_self = true
- @done_documenting = false
- @parent = nil
- @temporary_section = nil
- @visibility = nil
- @classes = {}
- @modules = {}
+ @document_self = true
+ @done_documenting = false
+ @current_section = nil
@name = array[1]
@full_name = array[2]
@superclass = array[3]
@comment = array[4]
- @comment_location = if RDoc::Markup::Document === @comment.parts.first then
- @comment
- else
- RDoc::Markup::Document.new @comment
- end
-
- array[5].each do |name, rw, visibility, singleton, file|
- singleton ||= false
- visibility ||= :public
-
- attr = RDoc::Attr.new nil, name, rw, nil, singleton
-
- add_attribute attr
- attr.visibility = visibility
- attr.record_location RDoc::TopLevel.new file
+ array[5].each do |name, rw|
+ add_attribute RDoc::Attr.new(nil, name, rw, nil)
end
- array[6].each do |constant, comment, file|
- case constant
- when RDoc::Constant then
- add_constant constant
- else
- constant = add_constant RDoc::Constant.new(constant, nil, comment)
- constant.record_location RDoc::TopLevel.new file
- end
+ array[6].each do |name, comment|
+ add_constant RDoc::Constant.new(name, nil, comment)
end
- array[7].each do |name, comment, file|
- incl = add_include RDoc::Include.new(name, comment)
- incl.record_location RDoc::TopLevel.new file
+ array[7].each do |name, comment|
+ add_include RDoc::Include.new(name, comment)
end
array[8].each do |type, visibilities|
visibilities.each do |visibility, methods|
@visibility = visibility
- methods.each do |name, file|
+ methods.each do |name|
method = RDoc::AnyMethod.new nil, name
method.singleton = true if type == 'class'
- method.record_location RDoc::TopLevel.new file
add_method method
end
end
end
-
- array[9].each do |name, comment, file|
- ext = add_extend RDoc::Extend.new(name, comment)
- ext.record_location RDoc::TopLevel.new file
- end if array[9] # Support Marshal version 1
-
- sections = (array[10] || []).map do |section|
- [section.title, section]
- end
-
- @sections = Hash[*sections.flatten]
- @current_section = add_section nil
-
- @in_files = []
-
- (array[11] || []).each do |filename|
- record_location RDoc::TopLevel.new filename
- end
-
- @parent_name = array[12]
- @parent_class = array[13]
end
##
- # Merges +class_module+ into this ClassModule.
- #
- # The data in +class_module+ is preferred over the receiver.
+ # Merges +class_module+ into this ClassModule
def merge class_module
- @parent = class_module.parent
- @parent_name = class_module.parent_name
+ comment = class_module.comment
- other_document = parse class_module.comment_location
+ if comment then
+ document = parse @comment
- if other_document then
- document = parse @comment_location
-
- document = document.merge other_document
-
- @comment = @comment_location = document
- end
-
- cm = class_module
- other_files = cm.in_files
-
- merge_collections attributes, cm.attributes, other_files do |add, attr|
- if add then
- add_attribute attr
- else
- @attributes.delete attr
- @methods_hash.delete attr.pretty_name
- end
- end
-
- merge_collections constants, cm.constants, other_files do |add, const|
- if add then
- add_constant const
- else
- @constants.delete const
- @constants_hash.delete const.name
- end
- end
+ comment.parts.concat document.parts
- merge_collections includes, cm.includes, other_files do |add, incl|
- if add then
- add_include incl
- else
- @includes.delete incl
- end
+ @comment = comment
end
- @includes.uniq! # clean up
-
- merge_collections extends, cm.extends, other_files do |add, ext|
- if add then
- add_extend ext
+ class_module.each_attribute do |attr|
+ if match = attributes.find { |a| a.name == attr.name } then
+ match.rw = [match.rw, attr.rw].compact.join
else
- @extends.delete ext
+ add_attribute attr
end
end
- @extends.uniq! # clean up
-
- merge_collections method_list, cm.method_list, other_files do |add, meth|
- if add then
- add_method meth
- else
- @method_list.delete meth
- @methods_hash.delete meth.pretty_name
- end
+ class_module.each_constant do |const|
+ add_constant const
end
- merge_sections cm
-
- self
- end
-
- ##
- # Merges collection +mine+ with +other+ preferring other. +other_files+ is
- # used to help determine which items should be deleted.
- #
- # Yields whether the item should be added or removed (true or false) and the
- # item to be added or removed.
- #
- # merge_collections things, other.things, other.in_files do |add, thing|
- # if add then
- # # add the thing
- # else
- # # remove the thing
- # end
- # end
-
- def merge_collections mine, other, other_files, &block # :nodoc:
- my_things = mine. group_by { |thing| thing.file }
- other_things = other.group_by { |thing| thing.file }
-
- remove_things my_things, other_files, &block
- add_things my_things, other_things, &block
- end
-
- ##
- # Merges the comments in this ClassModule with the comments in the other
- # ClassModule +cm+.
-
- def merge_sections cm # :nodoc:
- my_sections = sections.group_by { |section| section.title }
- other_sections = cm.sections.group_by { |section| section.title }
-
- other_files = cm.in_files
-
- remove_things my_sections, other_files do |_, section|
- @sections.delete section.title
+ class_module.each_include do |incl|
+ add_include incl
end
- other_sections.each do |group, sections|
- if my_sections.include? group
- my_sections[group].each do |my_section|
- other_section = cm.sections_hash[group]
-
- my_comments = my_section.comments
- other_comments = other_section.comments
-
- other_files = other_section.in_files
-
- merge_collections my_comments, other_comments, other_files do |add, comment|
- if add then
- my_section.add_comment comment
- else
- my_section.remove_comment comment
- end
- end
- end
- else
- sections.each do |section|
- add_section group, section.comments
- end
- end
+ class_module.each_method do |meth|
+ add_method meth
end
end
@@ -551,126 +184,10 @@ class RDoc::ClassModule < RDoc::Context
end
##
- # Allows overriding the initial name.
- #
- # Used for modules and classes that are constant aliases.
-
- def name= new_name
- @name = new_name
- end
-
- ##
- # Parses +comment_location+ into an RDoc::Markup::Document composed of
- # multiple RDoc::Markup::Documents with their file set.
-
- def parse comment_location
- case comment_location
- when String then
- super
- when Array then
- docs = comment_location.map do |comment, location|
- doc = super comment
- doc.file = location
- doc
- end
-
- RDoc::Markup::Document.new(*docs)
- when RDoc::Comment then
- doc = super comment_location.text, comment_location.format
- doc.file = comment_location.location
- doc
- when RDoc::Markup::Document then
- return comment_location
- else
- raise ArgumentError, "unknown comment class #{comment_location.class}"
- end
- end
-
- ##
- # Path to this class or module for use with HTML generator output.
+ # Path to this class or module
def path
- http_url @store.rdoc.generator.class_dir
- end
-
- ##
- # Name to use to generate the url:
- # modules and classes that are aliases for another
- # module or class return the name of the latter.
-
- def name_for_path
- is_alias_for ? is_alias_for.full_name : full_name
- end
-
- ##
- # Returns the classes and modules that are not constants
- # aliasing another class or module. For use by formatters
- # only (caches its result).
-
- def non_aliases
- @non_aliases ||= classes_and_modules.reject { |cm| cm.is_alias_for }
- end
-
- ##
- # Updates the child modules or classes of class/module +parent+ by
- # deleting the ones that have been removed from the documentation.
- #
- # +parent_hash+ is either <tt>parent.modules_hash</tt> or
- # <tt>parent.classes_hash</tt> and +all_hash+ is ::all_modules_hash or
- # ::all_classes_hash.
-
- def remove_nodoc_children
- prefix = self.full_name + '::'
-
- modules_hash.each_key do |name|
- full_name = prefix + name
- modules_hash.delete name unless @store.modules_hash[full_name]
- end
-
- classes_hash.each_key do |name|
- full_name = prefix + name
- classes_hash.delete name unless @store.classes_hash[full_name]
- end
- end
-
- def remove_things my_things, other_files # :nodoc:
- my_things.delete_if do |file, things|
- next false unless other_files.include? file
-
- things.each do |thing|
- yield false, thing
- end
-
- true
- end
- end
-
- ##
- # Search record used by RDoc::Generator::JsonIndex
-
- def search_record
- [
- name,
- full_name,
- full_name,
- '',
- path,
- '',
- snippet(@comment_location),
- ]
- end
-
- ##
- # Sets the store for this class or module and its contained code objects.
-
- def store= store
- super
-
- @attributes .each do |attr| attr.store = store end
- @constants .each do |const| const.store = store end
- @includes .each do |incl| incl.store = store end
- @extends .each do |ext| ext.store = store end
- @method_list.each do |meth| meth.store = store end
+ http_url RDoc::RDoc.current.generator.class_dir
end
##
@@ -678,7 +195,7 @@ class RDoc::ClassModule < RDoc::Context
# object, returns the name if it is not known.
def superclass
- @store.find_class_named(@superclass) || @superclass
+ RDoc::TopLevel.find_class_named_from(@superclass, parent) || @superclass
end
##
@@ -686,95 +203,12 @@ class RDoc::ClassModule < RDoc::Context
def superclass=(superclass)
raise NoMethodError, "#{full_name} is a module" if module?
- @superclass = superclass
- end
-
- def to_s # :nodoc:
- if is_alias_for then
- "#{self.class.name} #{self.full_name} -> #{is_alias_for}"
- else
- super
- end
- end
-
- ##
- # 'module' or 'class'
- def type
- module? ? 'module' : 'class'
+ @superclass = superclass if @superclass.nil? or @superclass == 'Object'
end
- ##
- # Updates the child modules & classes by replacing the ones that are
- # aliases through a constant.
- #
- # The aliased module/class is replaced in the children and in
- # RDoc::Store#modules_hash or RDoc::Store#classes_hash
- # by a copy that has <tt>RDoc::ClassModule#is_alias_for</tt> set to
- # the aliased module/class, and this copy is added to <tt>#aliases</tt>
- # of the aliased module/class.
- #
- # Formatters can use the #non_aliases method to retrieve children that
- # are not aliases, for instance to list the namespace content, since
- # the aliased modules are included in the constants of the class/module,
- # that are listed separately.
-
- def update_aliases
- constants.each do |const|
- next unless cm = const.is_alias_for
- cm_alias = cm.dup
- cm_alias.name = const.name
-
- # Don't move top-level aliases under Object, they look ugly there
- unless RDoc::TopLevel === cm_alias.parent then
- cm_alias.parent = self
- cm_alias.full_name = nil # force update for new parent
- end
-
- cm_alias.aliases.clear
- cm_alias.is_alias_for = cm
-
- if cm.module? then
- @store.modules_hash[cm_alias.full_name] = cm_alias
- modules_hash[const.name] = cm_alias
- else
- @store.classes_hash[cm_alias.full_name] = cm_alias
- classes_hash[const.name] = cm_alias
- end
-
- cm.aliases << cm_alias
- end
- end
-
- ##
- # Deletes from #includes those whose module has been removed from the
- # documentation.
- #--
- # FIXME: includes are not reliably removed, see _possible_bug test case
-
- def update_includes
- includes.reject! do |include|
- mod = include.module
- !(String === mod) && @store.modules_hash[mod.full_name].nil?
- end
-
- includes.uniq!
- end
-
- ##
- # Deletes from #extends those whose module has been removed from the
- # documentation.
- #--
- # FIXME: like update_includes, extends are not reliably removed
-
- def update_extends
- extends.reject! do |ext|
- mod = ext.module
-
- !(String === mod) && @store.modules_hash[mod.full_name].nil?
- end
-
- extends.uniq!
+ def to_s # :nodoc:
+ "#{self.class}: #{full_name} #{@comment} #{super}"
end
end
diff --git a/lib/rdoc/code_object.rb b/lib/rdoc/code_object.rb
index 83732e3d3b..f8c4e33f7e 100644
--- a/lib/rdoc/code_object.rb
+++ b/lib/rdoc/code_object.rb
@@ -1,3 +1,6 @@
+require 'rdoc'
+require 'rdoc/text'
+
##
# Base class for the RDoc code tree.
#
@@ -9,16 +12,15 @@
# * RDoc::Context
# * RDoc::TopLevel
# * RDoc::ClassModule
-# * RDoc::AnonClass (never used so far)
+# * RDoc::AnonClass
# * RDoc::NormalClass
# * RDoc::NormalModule
# * RDoc::SingleClass
-# * RDoc::MethodAttr
-# * RDoc::Attr
-# * RDoc::AnyMethod
-# * RDoc::GhostMethod
-# * RDoc::MetaMethod
+# * RDoc::AnyMethod
+# * RDoc::GhostMethod
+# * RDoc::MetaMethod
# * RDoc::Alias
+# * RDoc::Attr
# * RDoc::Constant
# * RDoc::Require
# * RDoc::Include
@@ -45,22 +47,12 @@ class RDoc::CodeObject
##
# Are we done documenting (ie, did we come across a :enddoc:)?
- attr_reader :done_documenting
-
- ##
- # Which file this code object was defined in
-
- attr_reader :file
+ attr_accessor :done_documenting
##
# Force documentation of this CodeObject
- attr_reader :force_documentation
-
- ##
- # Line in #file where this CodeObject was defined
-
- attr_accessor :line
+ attr_accessor :force_documentation
##
# Hash of arbitrary metadata for this CodeObject
@@ -68,31 +60,14 @@ class RDoc::CodeObject
attr_reader :metadata
##
- # Offset in #file where this CodeObject was defined
- #--
- # TODO character or byte?
-
- attr_accessor :offset
-
- ##
- # Sets the parent CodeObject
-
- attr_writer :parent
-
- ##
- # Did we ever receive a +:nodoc:+ directive?
-
- attr_reader :received_nodoc
-
- ##
- # Set the section this CodeObject is in
+ # Our parent CodeObject
- attr_writer :section
+ attr_accessor :parent
##
- # The RDoc::Store for this object.
+ # Which section are we in
- attr_accessor :store
+ attr_accessor :section
##
# We are the model of the code, but we know that at some point we will be
@@ -105,30 +80,15 @@ class RDoc::CodeObject
# Creates a new CodeObject that will document itself and its children
def initialize
- @metadata = {}
- @comment = ''
- @parent = nil
- @parent_name = nil # for loading
- @parent_class = nil # for loading
- @section = nil
- @section_title = nil # for loading
- @file = nil
- @full_name = nil
- @store = nil
-
- initialize_visibility
- end
-
- ##
- # Initializes state for visibility of this CodeObject and its children.
+ @metadata = {}
+ @comment = ''
- def initialize_visibility # :nodoc:
@document_children = true
@document_self = true
@done_documenting = false
@force_documentation = false
- @received_nodoc = false
- @ignored = false
+
+ @parent = nil
end
##
@@ -138,164 +98,38 @@ class RDoc::CodeObject
@comment = case comment
when NilClass then ''
when RDoc::Markup::Document then comment
- when RDoc::Comment then comment.normalize
else
if comment and not comment.empty? then
normalize_comment comment
else
- # HACK correct fix is to have #initialize create @comment
- # with the correct encoding
- if String === @comment and
- Object.const_defined? :Encoding and @comment.empty? then
- @comment.force_encoding comment.encoding
- end
@comment
end
end
end
##
- # Should this CodeObject be shown in documentation?
-
- def display?
- @document_self and not @ignored
- end
-
- ##
- # Enables or disables documentation of this CodeObject's children unless it
- # has been turned off by :enddoc:
+ # Enables or disables documentation of this CodeObject's children. Calls
+ # remove_classes_and_modules when disabling.
def document_children=(document_children)
- @document_children = document_children unless @done_documenting
+ @document_children = document_children
+ remove_classes_and_modules unless document_children
end
##
- # Enables or disables documentation of this CodeObject unless it has been
- # turned off by :enddoc:. If the argument is +nil+ it means the
- # documentation is turned off by +:nodoc:+.
+ # Enables or disables documentation of this CodeObject. Calls
+ # remove_methods_etc when disabling.
def document_self=(document_self)
- return if @done_documenting
-
@document_self = document_self
- @received_nodoc = true if document_self.nil?
+ remove_methods_etc unless document_self
end
##
- # Does this object have a comment with content or is #received_nodoc true?
+ # Does this class have a comment with content or is document_self false.
def documented?
- @received_nodoc or !@comment.empty?
- end
-
- ##
- # Turns documentation on/off, and turns on/off #document_self
- # and #document_children.
- #
- # Once documentation has been turned off (by +:enddoc:+),
- # the object will refuse to turn #document_self or
- # #document_children on, so +:doc:+ and +:start_doc:+ directives
- # will have no effect in the current file.
-
- def done_documenting=(value)
- @done_documenting = value
- @document_self = !value
- @document_children = @document_self
- end
-
- ##
- # Yields each parent of this CodeObject. See also
- # RDoc::ClassModule#each_ancestor
-
- def each_parent
- code_object = self
-
- while code_object = code_object.parent do
- yield code_object
- end
-
- self
- end
-
- ##
- # File name where this CodeObject was found.
- #
- # See also RDoc::Context#in_files
-
- def file_name
- return unless @file
-
- @file.absolute_name
- end
-
- ##
- # Force the documentation of this object unless documentation
- # has been turned off by :enddoc:
- #--
- # HACK untested, was assigning to an ivar
-
- def force_documentation=(value)
- @force_documentation = value unless @done_documenting
- end
-
- ##
- # Sets the full_name overriding any computed full name.
- #
- # Set to +nil+ to clear RDoc's cached value
-
- def full_name= full_name
- @full_name = full_name
- end
-
- ##
- # Use this to ignore a CodeObject and all its children until found again
- # (#record_location is called). An ignored item will not be shown in
- # documentation.
- #
- # See github issue #55
- #
- # The ignored status is temporary in order to allow implementation details
- # to be hidden. At the end of processing a file RDoc allows all classes
- # and modules to add new documentation to previously created classes.
- #
- # If a class was ignored (via stopdoc) then reopened later with additional
- # documentation it should be shown. If a class was ignored and never
- # reopened it should not be shown. The ignore flag allows this to occur.
-
- def ignore
- @ignored = true
-
- stop_doc
- end
-
- ##
- # Has this class been ignored?
-
- def ignored?
- @ignored
- end
-
- ##
- # Our parent CodeObject. The parent may be missing for classes loaded from
- # legacy RI data stores.
-
- def parent
- return @parent if @parent
- return nil unless @parent_name
-
- if @parent_class == RDoc::TopLevel then
- @parent = @store.add_file @parent_name
- else
- @parent = @store.find_class_or_module @parent_name
-
- return @parent if @parent
-
- begin
- @parent = @store.load_class @parent_name
- rescue RDoc::Store::MissingFileError
- nil
- end
- end
+ !(@document_self and @comment.empty?)
end
##
@@ -313,33 +147,25 @@ class RDoc::CodeObject
end
##
- # Records the RDoc::TopLevel (file) where this code object was defined
+ # Callback called upon disabling documentation of children. See
+ # #document_children=
- def record_location top_level
- @ignored = false
- @file = top_level
+ def remove_classes_and_modules
end
##
- # The section this CodeObject is in. Sections allow grouping of constants,
- # attributes and methods inside a class or module.
-
- def section
- return @section if @section
+ # Callback called upon disabling documentation of ourself. See
+ # #document_self=
- @section = parent.add_section @section_title if parent
+ def remove_methods_etc
end
##
- # Enable capture of documentation unless documentation has been
- # turned off by :enddoc:
+ # Enable capture of documentation
def start_doc
- return if @done_documenting
-
@document_self = true
@document_children = true
- @ignored = false
end
##
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index f1a626cd2e..c60dad92df 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -1,5 +1,23 @@
-# This file was used to load all the RDoc::CodeObject subclasses at once. Now
-# autoload handles this.
+# We represent the various high-level code constructs that appear in Ruby
+# programs: classes, modules, methods, and so on.
-require 'rdoc'
+require 'rdoc/code_object'
+require 'rdoc/context'
+require 'rdoc/top_level'
+
+require 'rdoc/class_module'
+require 'rdoc/normal_class'
+require 'rdoc/normal_module'
+require 'rdoc/anon_class'
+require 'rdoc/single_class'
+
+require 'rdoc/any_method'
+require 'rdoc/alias'
+require 'rdoc/ghost_method'
+require 'rdoc/meta_method'
+
+require 'rdoc/attr'
+require 'rdoc/constant'
+require 'rdoc/require'
+require 'rdoc/include'
diff --git a/lib/rdoc/comment.rb b/lib/rdoc/comment.rb
deleted file mode 100644
index 2b5be44ee5..0000000000
--- a/lib/rdoc/comment.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-##
-# A comment holds the text comment for a RDoc::CodeObject and provides a
-# unified way of cleaning it up and parsing it into an RDoc::Markup::Document.
-#
-# Each comment may have a different markup format set by #format=. By default
-# 'rdoc' is used. The :markup: directive tells RDoc which format to use.
-#
-# See RDoc::Markup@Other+directives for instructions on adding an alternate
-# format.
-
-class RDoc::Comment
-
- include RDoc::Text
-
- ##
- # The format of this comment. Defaults to RDoc::Markup
-
- attr_reader :format
-
- ##
- # The RDoc::TopLevel this comment was found in
-
- attr_accessor :location
-
- ##
- # For duck-typing when merging classes at load time
-
- alias file location # :nodoc:
-
- ##
- # The text for this comment
-
- attr_reader :text
-
- ##
- # Overrides the content returned by #parse. Use when there is no #text
- # source for this comment
-
- attr_writer :document
-
- ##
- # Creates a new comment with +text+ that is found in the RDoc::TopLevel
- # +location+.
-
- def initialize text = nil, location = nil
- @location = location
- @text = text
-
- @document = nil
- @format = 'rdoc'
- @normalized = false
- end
-
- ##
- #--
- # TODO deep copy @document
-
- def initialize_copy copy # :nodoc:
- @text = copy.text.dup
- end
-
- def == other # :nodoc:
- self.class === other and
- other.text == @text and other.location == @location
- end
-
- ##
- # Look for a 'call-seq' in the comment to override the normal parameter
- # handling. The :call-seq: is indented from the baseline. All lines of the
- # same indentation level and prefix are consumed.
- #
- # For example, all of the following will be used as the :call-seq:
- #
- # # :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
-
- def extract_call_seq method
- # we must handle situations like the above followed by an unindented first
- # comment. The difficulty is to make sure not to match lines starting
- # with ARGF at the same indent, but that are after the first description
- # paragraph.
- if @text =~ /^\s*:?call-seq:(.*?(?:\S).*?)^\s*$/m then
- all_start, all_stop = $~.offset(0)
- seq_start, seq_stop = $~.offset(1)
-
- # we get the following lines that start with the leading word at the
- # same indent, even if they have blank lines before
- if $1 =~ /(^\s*\n)+^(\s*\w+)/m then
- leading = $2 # ' * ARGF' in the example above
- re = %r%
- \A(
- (^\s*\n)+
- (^#{Regexp.escape leading}.*?\n)+
- )+
- ^\s*$
- %xm
-
- if @text[seq_stop..-1] =~ re then
- all_stop = seq_stop + $~.offset(0).last
- seq_stop = seq_stop + $~.offset(1).last
- end
- end
-
- seq = @text[seq_start..seq_stop]
- seq.gsub!(/^\s*(\S|\n)/m, '\1')
- @text.slice! all_start...all_stop
-
- method.call_seq = seq.chomp
-
- elsif @text.sub!(/^\s*:?call-seq:(.*?)(^\s*$|\z)/m, '') then
- seq = $1
- seq.gsub!(/^\s*/, '')
- method.call_seq = seq
- end
- #elsif @text.sub!(/\A\/\*\s*call-seq:(.*?)\*\/\Z/, '') then
- # method.call_seq = $1.strip
- #end
-
- method
- end
-
- ##
- # A comment is empty if its text String is empty.
-
- def empty?
- @text.empty?
- end
-
- ##
- # HACK dubious
-
- def force_encoding encoding
- @text.force_encoding encoding
- end
-
- ##
- # Sets the format of this comment and resets any parsed document
-
- def format= format
- @format = format
- @document = nil
- end
-
- def inspect # :nodoc:
- location = @location ? @location.relative_name : '(unknown)'
-
- "#<%s:%x %s %p>" % [self.class, object_id, location, @text]
- end
-
- ##
- # Normalizes the text. See RDoc::Text#normalize_comment for details
-
- def normalize
- return self unless @text
- return self if @normalized # TODO eliminate duplicate normalization
-
- @text = normalize_comment @text
-
- @normalized = true
-
- self
- end
-
- ##
- # Was this text normalized?
-
- def normalized? # :nodoc:
- @normalized
- end
-
- ##
- # Parses the comment into an RDoc::Markup::Document. The parsed document is
- # cached until the text is changed.
-
- def parse
- return @document if @document
-
- @document = super @text, @format
- @document.file = @location
- @document
- end
-
- ##
- # Removes private sections from this comment. Private sections are flush to
- # the comment marker and start with <tt>--</tt> and end with <tt>++</tt>.
- # For C-style comments, a private marker may not start at the opening of the
- # comment.
- #
- # /*
- # *--
- # * private
- # *++
- # * public
- # */
-
- def remove_private
- # Workaround for gsub encoding for Ruby 1.9.2 and earlier
- empty = ''
- empty.force_encoding @text.encoding if Object.const_defined? :Encoding
-
- @text = @text.gsub(%r%^\s*([#*]?)--.*?^\s*(\1)\+\+\n?%m, empty)
- @text = @text.sub(%r%^\s*[#*]?--.*%m, '')
- end
-
- ##
- # Replaces this comment's text with +text+ and resets the parsed document.
- #
- # An error is raised if the comment contains a document but no text.
-
- def text= text
- raise RDoc::Error, 'replacing document-only comment is not allowed' if
- @text.nil? and @document
-
- @document = nil
- @text = text
- end
-
- ##
- # Returns true if this comment is in TomDoc format.
-
- def tomdoc?
- @format == 'tomdoc'
- end
-
-end
-
diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb
index 48b32aaf98..908990855d 100644
--- a/lib/rdoc/constant.rb
+++ b/lib/rdoc/constant.rb
@@ -1,15 +1,10 @@
+require 'rdoc/code_object'
+
##
# A constant
class RDoc::Constant < RDoc::CodeObject
- MARSHAL_VERSION = 0 # :nodoc:
-
- ##
- # Sets the module or class this is constant is an alias for.
-
- attr_writer :is_alias_for
-
##
# The constant's name
@@ -21,22 +16,12 @@ class RDoc::Constant < RDoc::CodeObject
attr_accessor :value
##
- # The constant's visibility
-
- attr_accessor :visibility
-
- ##
# Creates a new constant with +name+, +value+ and +comment+
def initialize(name, value, comment)
super()
-
- @name = name
+ @name = name
@value = value
-
- @is_alias_for = nil
- @visibility = nil
-
self.comment = comment
end
@@ -49,130 +34,25 @@ class RDoc::Constant < RDoc::CodeObject
[parent_name, name] <=> [other.parent_name, other.name]
end
- ##
- # Constants are equal when their #parent and #name is the same
-
def == other
self.class == other.class and
@parent == other.parent and
@name == other.name
end
- ##
- # A constant is documented if it has a comment, or is an alias
- # for a documented class or module.
-
- def documented?
- super or is_alias_for && is_alias_for.documented?
- end
-
- ##
- # Full constant name including namespace
-
- def full_name
- @full_name ||= "#{parent_name}::#{@name}"
- end
-
- ##
- # The module or class this constant is an alias for
-
- def is_alias_for
- case @is_alias_for
- when String then
- found = @store.find_class_or_module @is_alias_for
- @is_alias_for = found if found
- @is_alias_for
- else
- @is_alias_for
- end
- end
-
def inspect # :nodoc:
- "#<%s:0x%x %s::%s>" % [
- self.class, object_id,
- parent_name, @name,
- ]
- end
-
- ##
- # Dumps this Constant for use by ri. See also #marshal_load
-
- def marshal_dump
- alias_name = case found = is_alias_for
- when RDoc::CodeObject then found.full_name
- else found
- end
-
- [ MARSHAL_VERSION,
- @name,
- full_name,
- @visibility,
- alias_name,
- parse(@comment),
- @file.relative_name,
- parent.name,
- parent.class,
- section.title,
- ]
- end
-
- ##
- # Loads this Constant from +array+. For a loaded Constant the following
- # methods will return cached values:
- #
- # * #full_name
- # * #parent_name
-
- def marshal_load array
- initialize array[1], nil, array[5]
-
- @full_name = array[2]
- @visibility = array[3]
- @is_alias_for = array[4]
- # 5 handled above
- # 6 handled below
- @parent_name = array[7]
- @parent_class = array[8]
- @section_title = array[9]
-
- @file = RDoc::TopLevel.new array[6]
+ "#<%s:0x%x %s::%s>" % [
+ self.class, object_id,
+ parent_name, @name,
+ ]
end
##
- # Path to this constant for use with HTML generator output.
+ # Path to this constant
def path
"#{@parent.path}##{@name}"
end
- def pretty_print q # :nodoc:
- q.group 2, "[#{self.class.name} #{full_name}", "]" do
- unless comment.empty? then
- q.breakable
- q.text "comment:"
- q.breakable
- q.pp @comment
- end
- end
- end
-
- ##
- # Sets the store for this class or module and its contained code objects.
-
- def store= store
- super
-
- @file = @store.add_file @file.full_name if @file
- end
-
- def to_s # :nodoc:
- parent_name = parent ? parent.full_name : '(unknown)'
- if is_alias_for
- "constant #{parent_name}::#@name -> #{is_alias_for}"
- else
- "constant #{parent_name}::#@name"
- end
- end
-
end
diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb
index 22339bf1c7..d55c5a9164 100644
--- a/lib/rdoc/context.rb
+++ b/lib/rdoc/context.rb
@@ -1,4 +1,4 @@
-require 'cgi'
+require 'rdoc/code_object'
##
# A Context is something that can hold modules, classes, methods, attributes,
@@ -15,35 +15,29 @@ class RDoc::Context < RDoc::CodeObject
TYPES = %w[class instance]
##
- # If a context has these titles it will be sorted in this order.
+ # Method visibilities
- TOMDOC_TITLES = [nil, 'Public', 'Internal', 'Deprecated'] # :nodoc:
- TOMDOC_TITLES_SORT = TOMDOC_TITLES.sort_by { |title| title.to_s } # :nodoc:
+ VISIBILITIES = [:public, :protected, :private]
##
- # Class/module aliases
+ # Aliased methods
attr_reader :aliases
##
- # All attr* methods
+ # attr* methods
attr_reader :attributes
##
- # Block params to be used in the next MethodAttr parsed under this context
-
- attr_accessor :block_params
-
- ##
# Constants defined
attr_reader :constants
##
- # Sets the current documentation section of documentation
+ # Current section of documentation
- attr_writer :current_section
+ attr_reader :current_section
##
# Files this context is found in
@@ -56,11 +50,6 @@ class RDoc::Context < RDoc::CodeObject
attr_reader :includes
##
- # Modules this context is extended with
-
- attr_reader :extends
-
- ##
# Methods defined in this context
attr_reader :method_list
@@ -76,45 +65,111 @@ class RDoc::Context < RDoc::CodeObject
attr_reader :requires
##
- # Use this section for the next method, attribute or constant added.
+ # Sections in this context
- attr_accessor :temporary_section
+ attr_reader :sections
##
- # Hash <tt>old_name => [aliases]</tt>, for aliases
- # that haven't (yet) been resolved to a method/attribute.
- # (Not to be confused with the aliases of the context.)
+ # Aliases that haven't been resolved to a method
attr_accessor :unmatched_alias_lists
##
- # Aliases that could not be resolved.
+ # Current visibility of this context
- attr_reader :external_aliases
+ attr_reader :visibility
##
- # Current visibility of this context
+ # A per-comment section of documentation like:
+ #
+ # # :SECTION: The title
+ # # The body
- attr_accessor :visibility
+ class Section
- ##
- # Hash of registered methods. Attributes are also registered here,
- # twice if they are RW.
+ ##
+ # Section comment
- attr_reader :methods_hash
+ attr_reader :comment
- ##
- # Params to be used in the next MethodAttr parsed under this context
+ ##
+ # Context this Section lives in
- attr_accessor :params
+ attr_reader :parent
- ##
- # Hash of registered constants.
+ ##
+ # Section sequence number (for linking)
+
+ attr_reader :sequence
+
+ ##
+ # Section title
+
+ attr_reader :title
+
+ @@sequence = "SEC00000"
+
+ ##
+ # Creates a new section with +title+ and +comment+
- attr_reader :constants_hash
+ def initialize(parent, title, comment)
+ @parent = parent
+ @title = title
+
+ @@sequence.succ!
+ @sequence = @@sequence.dup
+
+ set_comment comment
+ end
+
+ ##
+ # Sections are equal when they have the same #sequence
+
+ def ==(other)
+ self.class === other and @sequence == other.sequence
+ end
+
+ def inspect # :nodoc:
+ "#<%s:0x%x %s %p>" % [
+ self.class, object_id,
+ @sequence, title
+ ]
+ end
+
+ ##
+ # 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
+ #
+ # # blah blah blah
+ # #
+ # # :SECTION: The title
+ # # The body
+
+ def set_comment(comment)
+ return unless comment
+
+ if comment =~ /^#[ \t]*:section:.*\n/ then
+ start = $`
+ rest = $'
+
+ if start.empty?
+ @comment = rest
+ else
+ @comment = rest.sub(/#{start.chomp}\Z/, '')
+ end
+ else
+ @comment = comment
+ end
+
+ @comment = nil if @comment.empty?
+ end
+
+ end
##
- # Creates an unnamed empty context with public current visibility
+ # Creates an unnamed empty context with public visibility
def initialize
super
@@ -122,17 +177,23 @@ class RDoc::Context < RDoc::CodeObject
@in_files = []
@name ||= "unknown"
+ @comment ||= ""
@parent = nil
@visibility = :public
@current_section = Section.new self, nil, nil
- @sections = { nil => @current_section }
- @temporary_section = nil
+ @sections = [@current_section]
+ initialize_methods_etc
+ initialize_classes_and_modules
+ end
+
+ ##
+ # Sets the defaults for classes and modules
+
+ def initialize_classes_and_modules
@classes = {}
@modules = {}
-
- initialize_methods_etc
end
##
@@ -144,20 +205,11 @@ class RDoc::Context < RDoc::CodeObject
@aliases = []
@requires = []
@includes = []
- @extends = []
@constants = []
- @external_aliases = []
# This Hash maps a method name to a list of unmatched aliases (aliases of
# a method not yet encountered).
@unmatched_alias_lists = {}
-
- @methods_hash = {}
- @constants_hash = {}
-
- @params = nil
-
- @store ||= nil
end
##
@@ -170,18 +222,14 @@ class RDoc::Context < RDoc::CodeObject
##
# Adds +an_alias+ that is automatically resolved
- def add_alias an_alias
- return an_alias unless @document_self
-
- method_attr = find_method(an_alias.old_name, an_alias.singleton) ||
- find_attribute(an_alias.old_name, an_alias.singleton)
+ def add_alias(an_alias)
+ meth = find_instance_method_named(an_alias.old_name)
- if method_attr then
- method_attr.add_alias an_alias, self
+ if meth then
+ add_alias_impl an_alias, meth
else
- add_to @external_aliases, an_alias
- unmatched_alias_list =
- @unmatched_alias_lists[an_alias.pretty_old_name] ||= []
+ add_to @aliases, an_alias
+ unmatched_alias_list = @unmatched_alias_lists[an_alias.old_name] ||= []
unmatched_alias_list.push an_alias
end
@@ -189,338 +237,182 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Adds +attribute+ if not already there. If it is (as method(s) or attribute),
- # updates the comment if it was empty.
- #
- # The attribute is registered only if it defines a new method.
- # For instance, <tt>attr_reader :foo</tt> will not be registered
- # if method +foo+ exists, but <tt>attr_accessor :foo</tt> will be registered
- # if method +foo+ exists, but <tt>foo=</tt> does not.
+ # Turns +an_alias+ into an AnyMethod that points to +meth+
- def add_attribute attribute
- return attribute unless @document_self
+ def add_alias_impl(an_alias, meth)
+ new_meth = RDoc::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
- # mainly to check for redefinition of an attribute as a method
- # TODO find a policy for 'attr_reader :foo' + 'def foo=()'
- register = false
+ new_meth.comment = an_alias.comment
- key = nil
+ meth.add_alias new_meth
- if attribute.rw.index 'R' then
- key = attribute.pretty_name
- known = @methods_hash[key]
+ add_method new_meth
- if known then
- known.comment = attribute.comment if known.comment.empty?
- elsif registered = @methods_hash[attribute.pretty_name << '='] and
- RDoc::Attr === registered then
- registered.rw = 'RW'
- else
- @methods_hash[key] = attribute
- register = true
- end
- end
+ # aliases don't use ongoing visibility
+ new_meth.visibility = meth.visibility
- if attribute.rw.index 'W' then
- key = attribute.pretty_name << '='
- known = @methods_hash[key]
-
- if known then
- known.comment = attribute.comment if known.comment.empty?
- elsif registered = @methods_hash[attribute.pretty_name] and
- RDoc::Attr === registered then
- registered.rw = 'RW'
- else
- @methods_hash[key] = attribute
- register = true
- end
- end
+ new_meth
+ end
- if register then
- attribute.visibility = @visibility
- add_to @attributes, attribute
- resolve_aliases attribute
- end
+ ##
+ # Adds +attribute+
- attribute
+ def add_attribute(attribute)
+ add_to @attributes, attribute
end
##
- # Adds a class named +given_name+ with +superclass+.
- #
- # Both +given_name+ and +superclass+ may contain '::', and are
- # interpreted relative to the +self+ context. This allows handling correctly
- # examples like these:
- # class RDoc::Gauntlet < Gauntlet
- # module Mod
- # class Object # implies < ::Object
- # class SubObject < Object # this is _not_ ::Object
+ # Adds a class named +name+ with +superclass+.
#
# Given <tt>class Container::Item</tt> RDoc assumes +Container+ is a module
- # unless it later sees <tt>class Container</tt>. +add_class+ automatically
- # upgrades +given_name+ to a class in this case.
-
- def add_class class_type, given_name, superclass = '::Object'
- # superclass +nil+ is passed by the C parser in the following cases:
- # - registering Object in 1.8 (correct)
- # - registering BasicObject in 1.9 (correct)
- # - registering RubyVM in 1.9 in iseq.c (incorrect: < Object in vm.c)
- #
- # If we later find a superclass for a registered class with a nil
- # superclass, we must honor it.
-
- # find the name & enclosing context
- if given_name =~ /^:+(\w+)$/ then
- full_name = $1
- enclosing = top_level
- name = full_name.split(/:+/).last
- else
- full_name = child_name given_name
-
- if full_name =~ /^(.+)::(\w+)$/ then
- name = $2
- ename = $1
- enclosing = @store.classes_hash[ename] || @store.modules_hash[ename]
- # HACK: crashes in actionpack/lib/action_view/helpers/form_helper.rb (metaprogramming)
- unless enclosing then
- # try the given name at top level (will work for the above example)
- enclosing = @store.classes_hash[given_name] ||
- @store.modules_hash[given_name]
- return enclosing if enclosing
- # not found: create the parent(s)
- names = ename.split('::')
- enclosing = self
- names.each do |n|
- enclosing = enclosing.classes_hash[n] ||
- enclosing.modules_hash[n] ||
- enclosing.add_module(RDoc::NormalModule, n)
- end
- end
- else
- name = full_name
- enclosing = self
- end
- end
-
- # fix up superclass
- superclass = nil if full_name == 'BasicObject'
- superclass = nil if full_name == 'Object' and defined?(::BasicObject)
- superclass = '::BasicObject' if
- defined?(::BasicObject) and full_name == 'Object'
-
- # find the superclass full name
- if superclass then
- if superclass =~ /^:+/ then
- superclass = $' #'
- else
- if superclass =~ /^(\w+):+(.+)$/ then
- suffix = $2
- mod = find_module_named($1)
- superclass = mod.full_name + '::' + suffix if mod
- else
- mod = find_module_named(superclass)
- superclass = mod.full_name if mod
- end
- end
+ # unless it later sees <tt>class Container</tt>. add_class automatically
+ # upgrades +name+ to a class in this case.
- # did we believe it was a module?
- mod = @store.modules_hash.delete superclass
+ def add_class(class_type, name, superclass = 'Object')
+ klass = add_class_or_module @classes, class_type, name, superclass
- upgrade_to_class mod, RDoc::NormalClass, mod.parent if mod
+ existing = klass.superclass
+ existing = existing.name if existing and not String === existing
- # e.g., Object < Object
- superclass = nil if superclass == full_name
+ if superclass != existing and superclass != 'Object' then
+ klass.superclass = superclass
end
- klass = @store.classes_hash[full_name]
-
- if klass then
- # if TopLevel, it may not be registered in the classes:
- enclosing.classes_hash[name] = klass
-
- # update the superclass if needed
- if superclass then
- existing = klass.superclass
- existing = existing.full_name unless existing.is_a?(String) if existing
- if existing.nil? ||
- (existing == 'Object' && superclass != 'Object') then
- klass.superclass = superclass
- end
- end
- else
- # this is a new class
- mod = @store.modules_hash.delete full_name
+ # 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.
- if mod then
- klass = upgrade_to_class mod, RDoc::NormalClass, enclosing
+ mod = RDoc::TopLevel.modules_hash.delete klass.full_name
- klass.superclass = superclass unless superclass.nil?
- else
- klass = class_type.new name, superclass
+ if mod then
+ klass.classes_hash.update mod.classes_hash
+ klass.modules_hash.update mod.modules_hash
+ klass.method_list.concat mod.method_list
- enclosing.add_class_or_module(klass, enclosing.classes_hash,
- @store.classes_hash)
- end
+ @modules.delete klass.name
end
- klass.parent = self
+ RDoc::TopLevel.classes_hash[klass.full_name] = klass
klass
end
##
- # Adds the class or module +mod+ to the modules or
- # classes Hash +self_hash+, and to +all_hash+ (either
- # <tt>TopLevel::modules_hash</tt> or <tt>TopLevel::classes_hash</tt>),
- # unless #done_documenting is +true+. Sets the #parent of +mod+
- # to +self+, and its #section to #current_section. Returns +mod+.
-
- def add_class_or_module mod, self_hash, all_hash
- mod.section = current_section # TODO declaring context? something is
- # wrong here...
- mod.parent = self
- mod.store = @store
+ # Instantiates a +class_type+ named +name+ and adds it the modules or
+ # classes Hash +collection+.
- unless @done_documenting then
- self_hash[mod.name] = mod
- # this must be done AFTER adding mod to its parent, so that the full
- # name is correct:
- all_hash[mod.full_name] = mod
- end
-
- mod
- end
+ def add_class_or_module(collection, class_type, name, superclass = nil)
+ full_name = child_name name
- ##
- # Adds +constant+ if not already there. If it is, updates the comment,
- # value and/or is_alias_for of the known constant if they were empty/nil.
+ mod = collection[name]
- def add_constant constant
- return constant unless @document_self
+ if mod then
+ mod.superclass = superclass unless mod.module?
+ else
+ all = if class_type == RDoc::NormalModule then
+ RDoc::TopLevel.modules_hash
+ else
+ RDoc::TopLevel.classes_hash
+ end
- # HACK: avoid duplicate 'PI' & 'E' in math.c (1.8.7 source code)
- # (this is a #ifdef: should be handled by the C parser)
- known = @constants_hash[constant.name]
+ mod = all[full_name]
- if known then
- known.comment = constant.comment if known.comment.empty?
+ unless mod then
+ mod = class_type.new name, superclass
+ 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 == RDoc::NormalClass then
+ mod.superclass = superclass unless mod.superclass
+ end
+ end
- known.value = constant.value if
- known.value.nil? or known.value.strip.empty?
+ unless @done_documenting then
+ all[full_name] = mod
+ collection[name] = mod
+ end
- known.is_alias_for ||= constant.is_alias_for
- else
- @constants_hash[constant.name] = constant
- add_to @constants, constant
+ mod.section = @current_section
+ mod.parent = self
end
- constant
+ mod
end
##
- # Adds included module +include+ which should be an RDoc::Include
-
- def add_include include
- add_to @includes, include
+ # Adds +constant+
- include
+ def add_constant(constant)
+ add_to @constants, constant
end
##
- # Adds extension module +ext+ which should be an RDoc::Extend
-
- def add_extend ext
- add_to @extends, ext
+ # Adds included module +include+
- ext
+ def add_include(include)
+ add_to @includes, include
end
##
- # Adds +method+ if not already there. If it is (as method or attribute),
- # updates the comment if it was empty.
+ # Adds +method+
- def add_method method
- return method unless @document_self
+ def add_method(method)
+ method.visibility = @visibility
+ add_to @method_list, method
- # HACK: avoid duplicate 'new' in io.c & struct.c (1.8.7 source code)
- key = method.pretty_name
- known = @methods_hash[key]
-
- if known then
- if @store then # otherwise we are loading
- known.comment = method.comment if known.comment.empty?
- previously = ", previously in #{known.file}" unless
- method.file == known.file
- @store.rdoc.options.warn \
- "Duplicate method #{known.full_name} in #{method.file}#{previously}"
+ unmatched_alias_list = @unmatched_alias_lists[method.name]
+ if unmatched_alias_list then
+ unmatched_alias_list.each do |unmatched_alias|
+ add_alias_impl unmatched_alias, method
+ @aliases.delete unmatched_alias
end
- else
- @methods_hash[key] = method
- method.visibility = @visibility
- add_to @method_list, method
- resolve_aliases method
- end
- method
+ @unmatched_alias_lists.delete method.name
+ end
end
##
# Adds a module named +name+. If RDoc already knows +name+ is a class then
- # that class is returned instead. See also #add_class.
+ # that class is returned instead. See also #add_class
def add_module(class_type, name)
- mod = @classes[name] || @modules[name]
- return mod if mod
-
- full_name = child_name name
- mod = @store.modules_hash[full_name] || class_type.new(name)
+ return @classes[name] if @classes.key? name
- add_class_or_module mod, @modules, @store.modules_hash
+ add_class_or_module @modules, class_type, name, nil
end
##
- # Adds an alias from +from+ (a class or module) to +name+ which was defined
- # in +file+.
-
- def add_module_alias from, name, file
- return from if @done_documenting
+ # Adds an alias from +from+ to +name+
+ def add_module_alias from, name
to_name = child_name name
- # if we already know this name, don't register an alias:
- # see the metaprogramming in lib/active_support/basic_object.rb,
- # where we already know BasicObject is a class when we find
- # BasicObject = BlankSlate
- return from if @store.find_class_or_module to_name
-
- to = from.dup
- to.name = name
- to.full_name = nil
+ unless @done_documenting then
+ if from.module? then
+ RDoc::TopLevel.modules_hash
+ else
+ RDoc::TopLevel.classes_hash
+ end[to_name] = from
- if to.module? then
- @store.modules_hash[to_name] = to
- @modules[name] = to
- else
- @store.classes_hash[to_name] = to
- @classes[name] = to
+ if from.module? then
+ @modules
+ else
+ @classes
+ end[name] = from
end
- # Registers a constant for this alias. The constant value and comment
- # will be updated later, when the Ruby parser adds the constant
- const = RDoc::Constant.new name, nil, to.comment
- const.record_location file
- const.is_alias_for = from
- add_constant const
-
- to
+ from
end
##
# Adds +require+ to this context's top level
def add_require(require)
- return require unless @document_self
-
if RDoc::TopLevel === self then
add_to @requires, require
else
@@ -529,63 +421,19 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Returns a section with +title+, creating it if it doesn't already exist.
- # +comment+ will be appended to the section's comment.
- #
- # A section with a +title+ of +nil+ will return the default section.
- #
- # See also RDoc::Context::Section
-
- def add_section title, comment = nil
- if section = @sections[title] then
- section.add_comment comment if comment
- else
- section = Section.new self, title, comment
- @sections[title] = section
- end
-
- section
- end
-
- ##
# Adds +thing+ to the collection +array+
- def add_to array, thing
- array << thing if @document_self
-
- thing.parent = self
- thing.store = @store if @store
- thing.section = current_section
- end
-
- ##
- # Is there any content?
- #
- # This means any of: comment, aliases, methods, attributes, external
- # aliases, require, constant.
- #
- # Includes and extends are also checked unless <tt>includes == false</tt>.
-
- def any_content(includes = true)
- @any_content ||= !(
- @comment.empty? &&
- @method_list.empty? &&
- @attributes.empty? &&
- @aliases.empty? &&
- @external_aliases.empty? &&
- @requires.empty? &&
- @constants.empty?
- )
- @any_content || (includes && !(@includes + @extends).empty? )
+ def add_to(array, thing)
+ array << thing if @document_self and not @done_documenting
+ thing.parent = self
+ thing.section = @current_section
end
##
# Creates the full name for a child with +name+
def child_name name
- if name =~ /^:+/
- $' #'
- elsif RDoc::TopLevel === self then
+ if RDoc::TopLevel === self then
name
else
"#{self.full_name}::#{name}"
@@ -593,20 +441,6 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Class attributes
-
- def class_attributes
- @class_attributes ||= attributes.select { |a| a.singleton }
- end
-
- ##
- # Class methods
-
- def class_method_list
- @class_method_list ||= method_list.select { |a| a.singleton }
- end
-
- ##
# Array of classes in this context
def classes
@@ -628,44 +462,12 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # The current documentation section that new items will be added to. If
- # temporary_section is available it will be used.
-
- def current_section
- if section = @temporary_section then
- @temporary_section = nil
- else
- section = @current_section
- end
-
- section
- end
-
- ##
# Is part of this thing was defined in +file+?
def defined_in?(file)
@in_files.include?(file)
end
- def display(method_attr) # :nodoc:
- if method_attr.is_a? RDoc::Attr
- "#{method_attr.definition} #{method_attr.pretty_name}"
- else
- "method #{method_attr.pretty_name}"
- end
- end
-
- ##
- # Iterator for ancestors for duck-typing. Does nothing. See
- # RDoc::ClassModule#each_ancestor.
- #
- # This method exists to make it easy to work with Context subclasses that
- # aren't part of RDoc.
-
- def each_ancestor # :nodoc:
- end
-
##
# Iterator for attributes
@@ -695,65 +497,17 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Iterator for extension modules
-
- def each_extend # :yields: extend
- @extends.each do |e| yield e end
- end
-
- ##
# Iterator for methods
def each_method # :yields: method
- return enum_for __method__ unless block_given?
-
- @method_list.sort.each { |m| yield m }
- end
-
- ##
- # Iterator for each section's contents sorted by title. The +section+, the
- # section's +constants+ and the sections +attributes+ are yielded. The
- # +constants+ and +attributes+ collections are sorted.
- #
- # To retrieve methods in a section use #methods_by_type with the optional
- # +section+ parameter.
- #
- # NOTE: Do not edit collections yielded by this method
-
- def each_section # :yields: section, constants, attributes
- return enum_for __method__ unless block_given?
-
- constants = @constants.group_by do |constant| constant.section end
- attributes = @attributes.group_by do |attribute| attribute.section end
-
- constants.default = []
- attributes.default = []
-
- sort_sections.each do |section|
- yield section, constants[section].sort, attributes[section].sort
- end
- end
-
- ##
- # Finds an attribute +name+ with singleton value +singleton+.
-
- def find_attribute(name, singleton)
- name = $1 if name =~ /^(.*)=$/
- @attributes.find { |a| a.name == name && a.singleton == singleton }
+ @method_list.sort.each {|m| yield m}
end
##
# Finds an attribute with +name+ in this context
def find_attribute_named(name)
- case name
- when /\A#/ then
- find_attribute name[1..-1], false
- when /\A::/ then
- find_attribute name[2..-1], true
- else
- @attributes.find { |a| a.name == name }
- end
+ @attributes.find { |m| m.name == name }
end
##
@@ -778,31 +532,10 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Finds an external alias +name+ with singleton value +singleton+.
-
- def find_external_alias(name, singleton)
- @external_aliases.find { |m| m.name == name && m.singleton == singleton }
- end
-
- ##
- # Finds an external alias with +name+ in this context
-
- def find_external_alias_named(name)
- case name
- when /\A#/ then
- find_external_alias name[1..-1], false
- when /\A::/ then
- find_external_alias name[2..-1], true
- else
- @external_aliases.find { |a| a.name == name }
- end
- end
-
- ##
# Finds a file with +name+ in this context
- def find_file_named name
- @store.find_file_named name
+ def find_file_named(name)
+ top_level.class.find_file_named(name)
end
##
@@ -813,34 +546,26 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Finds a method, constant, attribute, external alias, module or file
- # named +symbol+ in this context.
+ # Finds a method, constant, attribute, module or files named +symbol+ in
+ # this context
def find_local_symbol(symbol)
find_method_named(symbol) or
find_constant_named(symbol) or
find_attribute_named(symbol) or
- find_external_alias_named(symbol) or
find_module_named(symbol) or
find_file_named(symbol)
end
##
- # Finds a method named +name+ with singleton value +singleton+.
-
- def find_method(name, singleton)
- @method_list.find { |m| m.name == name && m.singleton == singleton }
- end
-
- ##
# Finds a instance or module method with +name+ in this context
def find_method_named(name)
case name
when /\A#/ then
- find_method name[1..-1], false
+ find_instance_method_named name[1..-1]
when /\A::/ then
- find_method name[2..-1], true
+ find_class_method_named name[2..-1]
else
@method_list.find { |meth| meth.name == name }
end
@@ -857,42 +582,51 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Look up +symbol+, first as a module, then as a local symbol.
+ # Look up +symbol+. If +method+ is non-nil, then we assume the symbol
+ # references a module that contains that method.
- def find_symbol(symbol)
- find_symbol_module(symbol) || find_local_symbol(symbol)
- end
-
- ##
- # Look up a module named +symbol+.
-
- def find_symbol_module(symbol)
+ def find_symbol(symbol, method = nil)
result = nil
- # look for a class or module 'symbol'
case symbol
- when /^::/ then
- result = @store.find_class_or_module symbol
- when /^(\w+):+(.+)$/
- suffix = $2
- top = $1
- searched = self
- while searched do
- mod = searched.find_module_named(top)
- break unless mod
- result = @store.find_class_or_module "#{mod.full_name}::#{suffix}"
- break if result || searched.is_a?(RDoc::TopLevel)
- searched = searched.parent
+ when /^::([A-Z].*)/ then
+ result = top_level.find_symbol($1)
+ when /::/ then
+ modules = symbol.split(/::/)
+
+ unless modules.empty? then
+ module_name = modules.shift
+ result = find_module_named(module_name)
+
+ if result then
+ modules.each do |name|
+ result = result.find_module_named name
+ break unless result
+ end
+ end
end
- else
- searched = self
- while searched do
- result = searched.find_module_named(symbol)
- break if result || searched.is_a?(RDoc::TopLevel)
- searched = searched.parent
+ end
+
+ unless result then
+ # if a method is specified, then we're definitely looking for
+ # a module, otherwise it could be any symbol
+ if method then
+ result = find_module_named symbol
+ else
+ result = find_local_symbol symbol
+ if result.nil? then
+ if symbol =~ /^[A-Z]/ then
+ result = parent
+ while result && result.name != symbol do
+ result = result.parent
+ end
+ end
+ end
end
end
+ result = result.find_local_symbol method if result and method
+
result
end
@@ -904,22 +638,10 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Does this context and its methods and constants all have documentation?
- #
- # (Yes, fully documented doesn't mean everything.)
-
- def fully_documented?
- documented? and
- attributes.all? { |a| a.documented? } and
- method_list.all? { |m| m.documented? } and
- constants.all? { |c| c.documented? }
- end
-
- ##
# URL for this with a +prefix+
def http_url(prefix)
- path = name_for_path
+ path = full_name
path = path.gsub(/<<\s*(\w*)/, 'from-\1') if path =~ /<</
path = [prefix] + path.split('::')
@@ -927,34 +649,15 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Instance attributes
-
- def instance_attributes
- @instance_attributes ||= attributes.reject { |a| a.singleton }
- end
-
- ##
- # Instance methods
- #--
- # TODO rename to instance_methods
-
- def instance_method_list
- @instance_method_list ||= method_list.reject { |a| a.singleton }
- end
-
- ##
- # Breaks method_list into a nested hash by type (<tt>'class'</tt> or
- # <tt>'instance'</tt>) and visibility (+:public+, +:protected+, +:private+).
- #
- # If +section+ is provided only methods in that RDoc::Context::Section will
- # be returned.
+ # Breaks method_list into a nested hash by type (class or instance) and
+ # visibility (public, protected private)
- def methods_by_type section = nil
+ def methods_by_type
methods = {}
TYPES.each do |type|
visibilities = {}
- RDoc::VISIBILITIES.each do |vis|
+ VISIBILITIES.each do |vis|
visibilities[vis] = []
end
@@ -962,7 +665,6 @@ class RDoc::Context < RDoc::CodeObject
end
each_method do |method|
- next if section and not method.section == section
methods[method.type][method.visibility] << method
end
@@ -970,15 +672,23 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Yields AnyMethod and Attr entries matching the list of names in +methods+.
+ # Yields Method and Attr entries matching the list of names in +methods+.
+ # Attributes are only returned when +singleton+ is false.
+
+ def methods_matching(methods, singleton = false)
+ count = 0
- def methods_matching(methods, singleton = false, &block)
- (@method_list + @attributes).each do |m|
- yield m if methods.include?(m.name) and m.singleton == singleton
+ @method_list.each do |m|
+ if methods.include? m.name and m.singleton == singleton then
+ yield m
+ count += 1
+ end
end
- each_ancestor do |parent|
- parent.methods_matching(methods, singleton, &block)
+ return if count == methods.size || singleton
+
+ @attributes.each do |a|
+ yield a if methods.include? a.name
end
end
@@ -997,14 +707,6 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Name to use to generate the url.
- # <tt>#full_name</tt> by default.
-
- def name_for_path
- full_name
- end
-
- ##
# Changes the visibility for new methods to +visibility+
def ongoing_visibility=(visibility)
@@ -1012,113 +714,18 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Record +top_level+ as a file +self+ is in.
+ # Record which file +top_level+ is in
def record_location(top_level)
@in_files << top_level unless @in_files.include?(top_level)
end
##
- # Should we remove this context from the documentation?
- #
- # The answer is yes if:
- # * #received_nodoc is +true+
- # * #any_content is +false+ (not counting includes)
- # * All #includes are modules (not a string), and their module has
- # <tt>#remove_from_documentation? == true</tt>
- # * All classes and modules have <tt>#remove_from_documentation? == true</tt>
-
- def remove_from_documentation?
- @remove_from_documentation ||=
- @received_nodoc &&
- !any_content(false) &&
- @includes.all? { |i| !i.module.is_a?(String) && i.module.remove_from_documentation? } &&
- classes_and_modules.all? { |cm| cm.remove_from_documentation? }
- end
-
- ##
- # Removes methods and attributes with a visibility less than +min_visibility+.
- #--
- # TODO mark the visibility of attributes in the template (if not public?)
-
- def remove_invisible(min_visibility)
- return if min_visibility == :private
- remove_invisible_in @method_list, min_visibility
- remove_invisible_in @attributes, min_visibility
- end
-
- ##
- # Only called when min_visibility == :public or :private
-
- def remove_invisible_in array, min_visibility # :nodoc:
- if min_visibility == :public then
- array.reject! { |e|
- e.visibility != :public and not e.force_documentation
- }
- else
- array.reject! { |e|
- e.visibility == :private and not e.force_documentation
- }
- end
- end
-
- ##
- # Tries to resolve unmatched aliases when a method or attribute has just
- # been added.
-
- def resolve_aliases added
- # resolve any pending unmatched aliases
- key = added.pretty_name
- unmatched_alias_list = @unmatched_alias_lists[key]
- return unless unmatched_alias_list
- unmatched_alias_list.each do |unmatched_alias|
- added.add_alias unmatched_alias, self
- @external_aliases.delete unmatched_alias
- end
- @unmatched_alias_lists.delete key
- end
-
- ##
- # Returns RDoc::Context::Section objects referenced in this context for use
- # in a table of contents.
-
- def section_contents
- used_sections = {}
-
- each_method do |method|
- next unless method.display?
-
- used_sections[method.section] = true
- end
-
- # order found sections
- sections = sort_sections.select do |section|
- used_sections[section]
- end
-
- # only the default section is used
- return [] if
- sections.length == 1 and not sections.first.title
-
- sections
- end
-
- ##
- # Sections in this context
-
- def sections
- @sections.values
- end
-
- def sections_hash # :nodoc:
- @sections
- end
+ # If a class's documentation is turned off after we've started collecting
+ # methods etc., we need to remove the ones we have
- ##
- # Sets the current section to a section with +title+. See also #add_section
-
- def set_current_section title, comment
- @current_section = add_section title, comment
+ def remove_methods_etc
+ initialize_methods_etc
end
##
@@ -1132,34 +739,22 @@ class RDoc::Context < RDoc::CodeObject
end
##
- # Sorts sections alphabetically (default) or in TomDoc fashion (none,
- # Public, Internal, Deprecated)
+ # Removes classes and modules when we see a :nodoc: all
- def sort_sections
- titles = @sections.map { |title, _| title }
-
- if titles.length > 1 and
- TOMDOC_TITLES_SORT ==
- (titles | TOMDOC_TITLES).sort_by { |title| title.to_s } then
- @sections.values_at(*TOMDOC_TITLES).compact
- else
- @sections.sort_by { |title, _|
- title.to_s
- }.map { |_, section|
- section
- }
- end
+ def remove_classes_and_modules
+ initialize_classes_and_modules
end
- def to_s # :nodoc:
- "#{self.class.name} #{self.full_name}"
+ ##
+ # Creates a new section with +title+ and +comment+
+
+ def set_current_section(title, comment)
+ @current_section = Section.new self, title, comment
+ @sections << @current_section
end
##
# Return the TopLevel that owns us
- #--
- # FIXME we can be 'owned' by several TopLevel (see #record_location &
- # #in_files)
def top_level
return @top_level if defined? @top_level
@@ -1168,23 +763,5 @@ class RDoc::Context < RDoc::CodeObject
@top_level
end
- ##
- # Upgrades NormalModule +mod+ in +enclosing+ to a +class_type+
-
- def upgrade_to_class mod, class_type, enclosing
- enclosing.modules_hash.delete mod.name
-
- klass = RDoc::ClassModule.from_module class_type, mod
- klass.store = @store
-
- # if it was there, then we keep it even if done_documenting
- @store.classes_hash[mod.full_name] = klass
- enclosing.classes_hash[mod.name] = klass
-
- klass
- end
-
- autoload :Section, 'rdoc/context/section'
-
end
diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb
deleted file mode 100644
index 580f07deff..0000000000
--- a/lib/rdoc/context/section.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-##
-# A section of documentation like:
-#
-# # :section: The title
-# # The body
-#
-# Sections can be referenced multiple times and will be collapsed into a
-# single section.
-
-class RDoc::Context::Section
-
- include RDoc::Text
-
- MARSHAL_VERSION = 0 # :nodoc:
-
- ##
- # Section comment
-
- attr_reader :comment
-
- ##
- # Section comments
-
- attr_reader :comments
-
- ##
- # Context this Section lives in
-
- attr_reader :parent
-
- ##
- # Section title
-
- attr_reader :title
-
- @@sequence = "SEC00000"
-
- ##
- # Creates a new section with +title+ and +comment+
-
- def initialize parent, title, comment
- @parent = parent
- @title = title ? title.strip : title
-
- @@sequence.succ!
- @sequence = @@sequence.dup
-
- @comments = []
-
- add_comment comment
- end
-
- ##
- # Sections are equal when they have the same #title
-
- def == other
- self.class === other and @title == other.title
- end
-
- ##
- # Adds +comment+ to this section
-
- def add_comment comment
- comment = extract_comment comment
-
- return if comment.empty?
-
- case comment
- when RDoc::Comment then
- @comments << comment
- when RDoc::Markup::Document then
- @comments.concat comment.parts
- when Array then
- @comments.concat comment
- else
- raise TypeError, "unknown comment type: #{comment.inspect}"
- end
- end
-
- ##
- # Anchor reference for linking to this section
-
- def aref
- title = @title || '[untitled]'
-
- CGI.escape(title).gsub('%', '-').sub(/^-/, '')
- end
-
- ##
- # Extracts 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
- # # The body
-
- def extract_comment comment
- case comment
- when Array then
- comment.map do |c|
- extract_comment c
- end
- when nil
- RDoc::Comment.new ''
- when RDoc::Comment then
- if comment.text =~ /^#[ \t]*:section:.*\n/ then
- start = $`
- rest = $'
-
- comment.text = if start.empty? then
- rest
- else
- rest.sub(/#{start.chomp}\Z/, '')
- end
- end
-
- comment
- when RDoc::Markup::Document then
- comment
- else
- raise TypeError, "unknown comment #{comment.inspect}"
- end
- end
-
- def inspect # :nodoc:
- "#<%s:0x%x %p>" % [self.class, object_id, title]
- end
-
- ##
- # The files comments in this section come from
-
- def in_files
- return [] if @comments.empty?
-
- case @comments
- when Array then
- @comments.map do |comment|
- comment.file
- end
- when RDoc::Markup::Document then
- @comment.parts.map do |document|
- document.file
- end
- else
- raise RDoc::Error, "BUG: unknown comment class #{@comments.class}"
- end
- end
-
- ##
- # Serializes this Section. The title and parsed comment are saved, but not
- # the section parent which must be restored manually.
-
- def marshal_dump
- [
- MARSHAL_VERSION,
- @title,
- parse,
- ]
- end
-
- ##
- # De-serializes this Section. The section parent must be restored manually.
-
- def marshal_load array
- @parent = nil
-
- @title = array[1]
- @comments = array[2]
- end
-
- ##
- # Parses +comment_location+ into an RDoc::Markup::Document composed of
- # multiple RDoc::Markup::Documents with their file set.
-
- def parse
- case @comments
- when String then
- super
- when Array then
- docs = @comments.map do |comment, location|
- doc = super comment
- doc.file = location if location
- doc
- end
-
- RDoc::Markup::Document.new(*docs)
- when RDoc::Comment then
- doc = super @comments.text, comments.format
- doc.file = @comments.location
- doc
- when RDoc::Markup::Document then
- return @comments
- else
- raise ArgumentError, "unknown comment class #{comments.class}"
- end
- end
-
- ##
- # The section's title, or 'Top Section' if the title is nil.
- #
- # This is used by the table of contents template so the name is silly.
-
- def plain_html
- @title || 'Top Section'
- end
-
- ##
- # Removes a comment from this section if it is from the same file as
- # +comment+
-
- def remove_comment comment
- return if @comments.empty?
-
- case @comments
- when Array then
- @comments.delete_if do |my_comment|
- my_comment.file == comment.file
- end
- when RDoc::Markup::Document then
- @comments.parts.delete_if do |document|
- document.file == comment.file.name
- end
- else
- raise RDoc::Error, "BUG: unknown comment class #{@comments.class}"
- end
- end
-
- ##
- # Section sequence number (deprecated)
-
- def sequence
- warn "RDoc::Context::Section#sequence is deprecated, use #aref"
- @sequence
- end
-
-end
-
diff --git a/lib/rdoc/cross_reference.rb b/lib/rdoc/cross_reference.rb
deleted file mode 100644
index 2cb0571732..0000000000
--- a/lib/rdoc/cross_reference.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-##
-# RDoc::CrossReference is a reusable way to create cross references for names.
-
-class RDoc::CrossReference
-
- ##
- # Regular expression to match class references
- #
- # 1. There can be a '\\' in front of text to suppress the cross-reference
- # 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 (not recommended)
-
- CLASS_REGEXP_STR = '\\\\?((?:\:{2})?[A-Z]\w*(?:\:\:\w+)*)'
-
- ##
- # Regular expression to match method references.
- #
- # See CLASS_REGEXP_STR
-
- METHOD_REGEXP_STR = '([a-z]\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 = /(?:^|\s)
- (
- (?:
- # A::B::C.meth
- #{CLASS_REGEXP_STR}(?:[.#]|::)#{METHOD_REGEXP_STR}
-
- # Stand-alone method (preceded by a #)
- | \\?\##{METHOD_REGEXP_STR}
-
- # Stand-alone method (preceded by ::)
- | ::#{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-reference is a space, sentence
- # punctuation, tag start character, or attribute
- # marker.
- | #{CLASS_REGEXP_STR}(?=[@\s).?!,;<\000]|\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
- # Don't process things like '\<' in \<tt>, though.
- # TODO: including < is a hack, not very satisfying.
- | \\[^\s<]
- )
-
- # labels for headings
- (?:@[\w+%-]+(?:\.[\w|%-]+)?)?
- )/x
-
- ##
- # Version of CROSSREF_REGEXP used when <tt>--hyperlink-all</tt> is specified.
-
- ALL_CROSSREF_REGEXP = /
- (?:^|\s)
- (
- (?:
- # A::B::C.meth
- #{CLASS_REGEXP_STR}(?:[.#]|::)#{METHOD_REGEXP_STR}
-
- # Stand-alone method
- | \\?#{METHOD_REGEXP_STR}
-
- # A::B::C
- | #{CLASS_REGEXP_STR}(?=[@\s).?!,;<\000]|\z)
-
- # Things that look like filenames
- | (?:\.\.\/)*[-\/\w]+[_\/.][-\w\/.]+
-
- # Things that have markup suppressed
- | \\[^\s<]
- )
-
- # labels for headings
- (?:@[\w+%-]+)?
- )/x
-
- ##
- # Hash of references that have been looked-up to their replacements
-
- attr_accessor :seen
-
- ##
- # Allows cross-references to be created based on the given +context+
- # (RDoc::Context).
-
- def initialize context
- @context = context
- @store = context.store
-
- @seen = {}
- end
-
- ##
- # Returns a reference to +name+.
- #
- # If the reference is found and +name+ is not documented +text+ will be
- # returned. If +name+ is escaped +name+ is returned. If +name+ is not
- # found +text+ is returned.
-
- def resolve name, text
- return @seen[name] if @seen.include? name
-
- if /#{CLASS_REGEXP_STR}([.#]|::)#{METHOD_REGEXP_STR}/o =~ name then
- type = $2
- type = '' if type == '.' # will find either #method or ::method
- method = "#{type}#{$3}"
- container = @context.find_symbol_module($1)
- elsif /^([.#]|::)#{METHOD_REGEXP_STR}/o =~ name then
- type = $1
- type = '' if type == '.'
- method = "#{type}#{$2}"
- container = @context
- else
- container = nil
- end
-
- if container then
- ref = container.find_local_symbol method
-
- unless ref || RDoc::TopLevel === container then
- ref = container.find_ancestor_local_symbol method
- end
- end
-
- ref = case name
- when /^\\(#{CLASS_REGEXP_STR})$/o then
- @context.find_symbol $1
- else
- @context.find_symbol name
- end unless ref
-
- # Try a page name
- ref = @store.page name if not ref and name =~ /^\w+$/
-
- ref = nil if RDoc::Alias === ref # external alias, can't link to it
-
- out = if name == '\\' then
- name
- elsif name =~ /^\\/ then
- # we remove the \ only in front of what we know:
- # other backslashes are treated later, only outside of <tt>
- ref ? $' : name
- elsif ref then
- if ref.display? then
- ref
- else
- text
- end
- else
- text
- end
-
- @seen[name] = out
-
- out
- end
-
-end
-
diff --git a/lib/rdoc/encoding.rb b/lib/rdoc/encoding.rb
deleted file mode 100644
index 9fe3539412..0000000000
--- a/lib/rdoc/encoding.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# coding: US-ASCII
-
-##
-# This class is a wrapper around File IO and Encoding that helps RDoc load
-# files and convert them to the correct encoding.
-
-module RDoc::Encoding
-
- ##
- # Reads the contents of +filename+ and handles any encoding directives in
- # the file.
- #
- # The content will be converted to the +encoding+. If the file cannot be
- # converted a warning will be printed and nil will be returned.
- #
- # If +force_transcode+ is true the document will be transcoded and any
- # unknown character in the target encoding will be replaced with '?'
-
- def self.read_file filename, encoding, force_transcode = false
- content = open filename, "rb" do |f| f.read end
- content.gsub!("\r\n", "\n") if RUBY_PLATFORM =~ /mswin|mingw/
-
- utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
-
- RDoc::Encoding.set_encoding content
-
- if Object.const_defined? :Encoding then
- begin
- encoding ||= Encoding.default_external
- orig_encoding = content.encoding
-
- if utf8 then
- content.force_encoding Encoding::UTF_8
- content.encode! encoding
- else
- # assume the content is in our output encoding
- content.force_encoding encoding
- end
-
- unless content.valid_encoding? then
- # revert and try to transcode
- content.force_encoding orig_encoding
- content.encode! encoding
- end
-
- unless content.valid_encoding? then
- warn "unable to convert #{filename} to #{encoding}, skipping"
- content = nil
- end
- rescue Encoding::InvalidByteSequenceError,
- Encoding::UndefinedConversionError => e
- if force_transcode then
- content.force_encoding orig_encoding
- content.encode!(encoding,
- :invalid => :replace, :undef => :replace,
- :replace => '?')
- return content
- else
- warn "unable to convert #{e.message} for #{filename}, skipping"
- return nil
- end
- end
- end
-
- content
- rescue ArgumentError => e
- raise unless e.message =~ /unknown encoding name - (.*)/
- warn "unknown encoding name \"#{$1}\" for #{filename}, skipping"
- nil
- rescue Errno::EISDIR, Errno::ENOENT
- nil
- end
-
- ##
- # Sets the encoding of +string+ based on the magic comment
-
- def self.set_encoding string
- string =~ /\A(?:#!.*\n)?(.*\n)/
-
- first_line = $1
-
- name = case first_line
- when /^<\?xml[^?]*encoding=(["'])(.*?)\1/ then $2
- when /\b(?:en)?coding[=:]\s*([^\s;]+)/i then $1
- else return
- end
-
- string.sub! first_line, ''
-
- return unless Object.const_defined? :Encoding
-
- enc = Encoding.find name
- string.force_encoding enc if enc
- end
-
-end
-
diff --git a/lib/rdoc/erb_partial.rb b/lib/rdoc/erb_partial.rb
deleted file mode 100644
index 910d1e0351..0000000000
--- a/lib/rdoc/erb_partial.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-##
-# Allows an ERB template to be rendered in the context (binding) of an
-# existing ERB template evaluation.
-
-class RDoc::ERBPartial < ERB
-
- ##
- # Overrides +compiler+ startup to set the +eoutvar+ to an empty string only
- # if it isn't already set.
-
- def set_eoutvar compiler, eoutvar = '_erbout'
- super
-
- compiler.pre_cmd = ["#{eoutvar} ||= ''"]
- end
-
-end
-
diff --git a/lib/rdoc/erbio.rb b/lib/rdoc/erbio.rb
deleted file mode 100644
index 04a89fbd34..0000000000
--- a/lib/rdoc/erbio.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'erb'
-
-##
-# A subclass of ERB that writes directly to an IO. Credit to Aaron Patterson
-# and Masatoshi SEKI.
-#
-# To use:
-#
-# erbio = RDoc::ERBIO.new '<%= "hello world" %>', nil, nil
-#
-# open 'hello.txt', 'w' do |io|
-# erbio.result binding
-# end
-#
-# Note that binding must enclose the io you wish to output on.
-
-class RDoc::ERBIO < ERB
-
- ##
- # Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
-
- def initialize str, safe_level = nil, trim_mode = nil, eoutvar = 'io'
- super
- end
-
- ##
- # Instructs +compiler+ how to write to +io_variable+
-
- def set_eoutvar compiler, io_variable
- compiler.put_cmd = "#{io_variable}.write"
- compiler.insert_cmd = "#{io_variable}.write"
- compiler.pre_cmd = []
- compiler.post_cmd = []
- end
-
-end
-
diff --git a/lib/rdoc/extend.rb b/lib/rdoc/extend.rb
deleted file mode 100644
index 2bccfba084..0000000000
--- a/lib/rdoc/extend.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-##
-# A Module extension in a class with \#extend
-
-class RDoc::Extend < RDoc::CodeObject
-
- ##
- # Name of extension module
-
- attr_accessor :name
-
- ##
- # Creates a new Extend for +name+ with +comment+
-
- def initialize(name, comment)
- super()
- @name = name
- self.comment = comment
- @module = nil # cache for module if found
- end
-
- ##
- # Extends are sorted by name
-
- def <=> other
- return unless self.class === other
-
- name <=> other.name
- end
-
- def == other # :nodoc:
- self.class === other and @name == other.name
- end
-
- alias eql? ==
-
- ##
- # Full name based on #module
-
- def full_name
- m = self.module
- RDoc::ClassModule === m ? m.full_name : @name
- end
-
- def hash # :nodoc:
- [@name, self.module].hash
- end
-
- def inspect # :nodoc:
- "#<%s:0x%x %s.extend %s>" % [
- self.class,
- object_id,
- parent_name, @name,
- ]
- end
-
- ##
- # Attempts to locate the extend module object. Returns the name if not
- # known.
- #
- # The scoping rules of Ruby to resolve the name of an extension module are:
- # - first look into the children of the current context;
- # - if not found, look into the children of extension modules,
- # in reverse extend order;
- # - if still not found, go up the hierarchy of names.
- #
- # This method has <code>O(n!)</code> behavior when the module calling
- # extend is referencing nonexistent modules. Avoid calling #module until
- # after all the files are parsed. This behavior is due to ruby's constant
- # lookup behavior.
-
- def module
- return @module if @module
-
- # search the current context
- return @name unless parent
- full_name = parent.child_name(@name)
- @module = @store.modules_hash[full_name]
- return @module if @module
- return @name if @name =~ /^::/
-
- # search the includes before this one, in reverse order
- searched = parent.extends.take_while { |i| i != self }.reverse
- searched.each do |i|
- ext = i.module
- next if String === ext
- full_name = ext.child_name(@name)
- @module = @store.modules_hash[full_name]
- return @module if @module
- end
-
- # go up the hierarchy of names
- up = parent.parent
- while up
- full_name = up.child_name(@name)
- @module = @store.modules_hash[full_name]
- return @module if @module
- up = up.parent
- end
-
- @name
- end
-
- ##
- # Sets the store for this class or module and its contained code objects.
-
- def store= store
- super
-
- @file = @store.add_file @file.full_name if @file
- end
-
- def to_s # :nodoc:
- "extend #@name in: #{parent}"
- end
-
-end
-
diff --git a/lib/rdoc/generator.rb b/lib/rdoc/generator.rb
index 9051f8a658..b65002977a 100644
--- a/lib/rdoc/generator.rb
+++ b/lib/rdoc/generator.rb
@@ -1,50 +1,8 @@
+require 'rdoc'
+
##
-# RDoc uses generators to turn parsed source code in the form of an
-# RDoc::CodeObject tree into some form of output. RDoc comes with the HTML
-# generator RDoc::Generator::Darkfish and an ri data generator
-# RDoc::Generator::RI.
-#
-# == Registering a Generator
-#
-# Generators are registered by calling RDoc::RDoc.add_generator with the class
-# of the generator:
-#
-# class My::Awesome::Generator
-# RDoc::RDoc.add_generator self
-# end
-#
-# == Adding Options to +rdoc+
-#
-# Before option processing in +rdoc+, RDoc::Options will call ::setup_options
-# on the generator class with an RDoc::Options instance. The generator can
-# use RDoc::Options#option_parser to add command-line options to the +rdoc+
-# tool. See RDoc::Options@Custom+Options for an example and see OptionParser
-# for details on how to add options.
-#
-# You can extend the RDoc::Options instance with additional accessors for your
-# generator.
-#
-# == Generator Instantiation
-#
-# After parsing, RDoc::RDoc will instantiate a generator by calling
-# #initialize with an RDoc::Store instance and an RDoc::Options instance.
-#
-# The RDoc::Store instance holds documentation for parsed source code. In
-# RDoc 3 and earlier the RDoc::TopLevel class held this data. When upgrading
-# a generator from RDoc 3 and earlier you should only need to replace
-# RDoc::TopLevel with the store instance.
-#
-# RDoc will then call #generate on the generator instance. You can use the
-# various methods on RDoc::Store and in the RDoc::CodeObject tree to create
-# your desired output format.
+# Namespace for generators
module RDoc::Generator
-
- autoload :Markup, 'rdoc/generator/markup'
-
- autoload :Darkfish, 'rdoc/generator/darkfish'
- autoload :JsonIndex, 'rdoc/generator/json_index'
- autoload :RI, 'rdoc/generator/ri'
-
end
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index 26f545b14b..497be0eb8b 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -1,11 +1,15 @@
# -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
+# vim: noet ts=2 sts=8 sw=2
-require 'erb'
-require 'fileutils'
require 'pathname'
+require 'fileutils'
+require 'erb'
+
require 'rdoc/generator/markup'
-##
+$DARKFISH_DRYRUN = false # TODO make me non-global
+
+#
# Darkfish RDoc HTML Generator
#
# $Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $
@@ -46,675 +50,404 @@ require 'rdoc/generator/markup'
# 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.
#
-# == Attributions
-#
-# Darkfish uses the {Silk Icons}[http://www.famfamfam.com/lab/icons/silk/] set
-# by Mark James.
-
class RDoc::Generator::Darkfish
- RDoc::RDoc.add_generator self
-
- include ERB::Util
-
- ##
- # Path to this file's parent directory. Used to find templates and other
- # resources.
-
- GENERATOR_DIR = File.join 'rdoc', 'generator'
-
- ##
- # Release Version
-
- VERSION = '3'
-
- ##
- # Description of this generator
-
- DESCRIPTION = 'HTML generator, written by Michael Granger'
-
- ##
- # The relative path to style sheets and javascript. By default this is set
- # the same as the rel_prefix.
-
- attr_accessor :asset_rel_path
-
- ##
- # The path to generate files into, combined with <tt>--op</tt> from the
- # options for a full path.
-
- attr_reader :base_dir
-
- ##
- # Classes and modules to be used by this generator, not necessarily
- # displayed. See also #modsort
-
- attr_reader :classes
-
- ##
- # No files will be written when dry_run is true.
-
- attr_accessor :dry_run
-
- ##
- # When false the generate methods return a String instead of writing to a
- # file. The default is true.
-
- attr_accessor :file_output
-
- ##
- # Files to be displayed by this generator
-
- attr_reader :files
-
- ##
- # The JSON index generator for this Darkfish generator
-
- attr_reader :json_index
-
- ##
- # Methods to be displayed by this generator
-
- attr_reader :methods
-
- ##
- # Sorted list of classes and modules to be displayed by this generator
-
- attr_reader :modsort
-
- ##
- # The RDoc::Store that is the source of the generated content
-
- attr_reader :store
-
- ##
- # The output directory
-
- attr_reader :outputdir
-
- ##
- # Initialize a few instance variables before we start
-
- def initialize store, options
- @store = store
- @options = options
-
- @asset_rel_path = ''
- @base_dir = Pathname.pwd.expand_path
- @dry_run = @options.dry_run
- @file_output = true
- @template_dir = Pathname.new options.template_dir
- @template_cache = {}
-
- @classes = nil
- @context = nil
- @files = nil
- @methods = nil
- @modsort = nil
-
- @json_index = RDoc::Generator::JsonIndex.new self, options
- end
-
- ##
- # Output progress information if debugging is enabled
-
- def debug_msg *msg
- return unless $DEBUG_RDOC
- $stderr.puts(*msg)
- end
-
- ##
- # Directory where generated class HTML files live relative to the output
- # dir.
-
- def class_dir
- nil
- end
-
- ##
- # Directory where generated class HTML files live relative to the output
- # dir.
-
- def file_dir
- nil
- end
-
- ##
- # Create the directories the generated docs will live in if they don't
- # already exist.
-
- def gen_sub_directories
- @outputdir.mkpath
- end
-
- ##
- # Copy over the stylesheet into the appropriate place in the output
- # directory.
-
- def write_style_sheet
- debug_msg "Copying static files"
- options = { :verbose => $DEBUG_RDOC, :noop => @dry_run }
-
- FileUtils.cp @template_dir + 'rdoc.css', '.', options
-
- Dir[(@template_dir + "{js,images}/**/*").to_s].each do |path|
- next if File.directory? path
- next if File.basename(path) =~ /^\./
-
- dst = Pathname.new(path).relative_path_from @template_dir
-
- # I suck at glob
- dst_dir = dst.dirname
- FileUtils.mkdir_p dst_dir, options unless File.exist? dst_dir
-
- FileUtils.cp @template_dir + path, dst, options
- end
- end
-
- ##
- # Build the initial indices and output objects based on an array of TopLevel
- # objects containing the extracted information.
-
- def generate
- setup
-
- write_style_sheet
- generate_index
- generate_class_files
- generate_file_files
- generate_table_of_contents
- @json_index.generate
-
- copy_static
-
- rescue => e
- debug_msg "%s: %s\n %s" % [
- e.class.name, e.message, e.backtrace.join("\n ")
- ]
-
- raise
- end
-
- ##
- # Copies static files from the static_path into the output directory
-
- def copy_static
- return if @options.static_path.empty?
-
- fu_options = { :verbose => $DEBUG_RDOC, :noop => @dry_run }
-
- @options.static_path.each do |path|
- unless File.directory? path then
- FileUtils.install path, @outputdir, fu_options.merge(:mode => 0644)
- next
- end
-
- Dir.chdir path do
- Dir[File.join('**', '*')].each do |entry|
- dest_file = @outputdir + entry
-
- if File.directory? entry then
- FileUtils.mkdir_p entry, fu_options
- else
- FileUtils.install entry, dest_file, fu_options.merge(:mode => 0644)
- end
- end
- end
- end
- end
-
- ##
- # Return a list of the documented modules sorted by salience first, then
- # by name.
-
- def get_sorted_module_list classes
- classes.select do |klass|
- klass.display?
- end.sort
- end
-
- ##
- # Generate an index page which lists all the classes which are documented.
-
- def generate_index
- setup
-
- template_file = @template_dir + 'index.rhtml'
- return unless template_file.exist?
-
- debug_msg "Rendering the index page..."
-
- out_file = @base_dir + @options.op_dir + 'index.html'
- rel_prefix = @outputdir.relative_path_from out_file.dirname
- search_index_rel_prefix = rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- # suppress 1.9.3 warning
- asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
-
- @title = @options.title
-
- render_template template_file, out_file do |io| binding end
- rescue => e
- error = RDoc::Error.new \
- "error generating index.html: #{e.message} (#{e.class})"
- error.set_backtrace e.backtrace
-
- raise error
- end
-
- ##
- # Generates a class file for +klass+
-
- def generate_class klass, template_file = nil
- setup
-
- current = klass
-
- template_file ||= @template_dir + 'class.rhtml'
-
- debug_msg " working on %s (%s)" % [klass.full_name, klass.path]
- out_file = @outputdir + klass.path
- rel_prefix = @outputdir.relative_path_from out_file.dirname
- search_index_rel_prefix = rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- # suppress 1.9.3 warning
- asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
- svninfo = svninfo = get_svninfo(current)
-
- @title = "#{klass.type} #{klass.full_name} - #{@options.title}"
-
- debug_msg " rendering #{out_file}"
- render_template template_file, out_file do |io| binding end
- end
-
- ##
- # Generate a documentation file for each class and module
-
- def generate_class_files
- setup
-
- template_file = @template_dir + 'class.rhtml'
- template_file = @template_dir + 'classpage.rhtml' unless
- template_file.exist?
- return unless template_file.exist?
- debug_msg "Generating class documentation in #{@outputdir}"
-
- current = nil
-
- @classes.each do |klass|
- current = klass
-
- generate_class klass, template_file
- end
- rescue => e
- error = RDoc::Error.new \
- "error generating #{current.path}: #{e.message} (#{e.class})"
- error.set_backtrace e.backtrace
-
- raise error
- end
-
- ##
- # Generate a documentation file for each file
-
- def generate_file_files
- setup
-
- page_file = @template_dir + 'page.rhtml'
- fileinfo_file = @template_dir + 'fileinfo.rhtml'
-
- # for legacy templates
- filepage_file = @template_dir + 'filepage.rhtml' unless
- page_file.exist? or fileinfo_file.exist?
-
- return unless
- page_file.exist? or fileinfo_file.exist? or filepage_file.exist?
-
- debug_msg "Generating file documentation in #{@outputdir}"
-
- out_file = nil
- current = nil
-
- @files.each do |file|
- current = file
-
- if file.text? and page_file.exist? then
- generate_page file
- next
- end
-
- template_file = nil
- out_file = @outputdir + file.path
- debug_msg " working on %s (%s)" % [file.full_name, out_file]
- rel_prefix = @outputdir.relative_path_from out_file.dirname
- search_index_rel_prefix = rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- # suppress 1.9.3 warning
- asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
-
- unless filepage_file then
- if file.text? then
- next unless page_file.exist?
- template_file = page_file
- @title = file.page_name
- else
- next unless fileinfo_file.exist?
- template_file = fileinfo_file
- @title = "File: #{file.base_name}"
- end
- end
-
- @title += " - #{@options.title}"
- template_file ||= filepage_file
-
- render_template template_file, out_file do |io| binding end
- end
- rescue => e
- error =
- RDoc::Error.new "error generating #{out_file}: #{e.message} (#{e.class})"
- error.set_backtrace e.backtrace
-
- raise error
- end
-
- ##
- # Generate a page file for +file+
-
- def generate_page file
- setup
-
- template_file = @template_dir + 'page.rhtml'
-
- out_file = @outputdir + file.path
- debug_msg " working on %s (%s)" % [file.full_name, out_file]
- rel_prefix = @outputdir.relative_path_from out_file.dirname
- search_index_rel_prefix = rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- # suppress 1.9.3 warning
- current = current = file
- asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
-
- @title = "#{file.page_name} - #{@options.title}"
-
- debug_msg " rendering #{out_file}"
- render_template template_file, out_file do |io| binding end
- end
-
- ##
- # Generates the 404 page for the RDoc servlet
-
- def generate_servlet_not_found path
- setup
-
- template_file = @template_dir + 'servlet_not_found.rhtml'
- return unless template_file.exist?
-
- debug_msg "Rendering the servlet 404 Not Found page..."
-
- rel_prefix = rel_prefix = ''
- search_index_rel_prefix = rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- # suppress 1.9.3 warning
- asset_rel_prefix = asset_rel_prefix = ''
-
- @title = 'Not Found'
-
- render_template template_file do |io| binding end
- rescue => e
- error = RDoc::Error.new \
- "error generating servlet_not_found: #{e.message} (#{e.class})"
- error.set_backtrace e.backtrace
-
- raise error
- end
-
- ##
- # Generates the servlet root page for the RDoc servlet
-
- def generate_servlet_root installed
- setup
-
- template_file = @template_dir + 'servlet_root.rhtml'
- return unless template_file.exist?
-
- debug_msg 'Rendering the servlet root page...'
-
- rel_prefix = '.'
- asset_rel_prefix = rel_prefix
- search_index_rel_prefix = asset_rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- @title = 'Local RDoc Documentation'
-
- render_template template_file do |io| binding end
- rescue => e
- error = RDoc::Error.new \
- "error generating servlet_root: #{e.message} (#{e.class})"
- error.set_backtrace e.backtrace
-
- raise error
- end
-
- ##
- # Generate an index page which lists all the classes which are documented.
-
- def generate_table_of_contents
- setup
-
- template_file = @template_dir + 'table_of_contents.rhtml'
- return unless template_file.exist?
-
- debug_msg "Rendering the Table of Contents..."
-
- out_file = @outputdir + 'table_of_contents.html'
- rel_prefix = @outputdir.relative_path_from out_file.dirname
- search_index_rel_prefix = rel_prefix
- search_index_rel_prefix += @asset_rel_path if @file_output
-
- # suppress 1.9.3 warning
- asset_rel_prefix = asset_rel_prefix = rel_prefix + @asset_rel_path
-
- @title = "Table of Contents - #{@options.title}"
+ RDoc::RDoc.add_generator( self )
- render_template template_file, out_file do |io| binding end
- rescue => e
- error = RDoc::Error.new \
- "error generating table_of_contents.html: #{e.message} (#{e.class})"
- error.set_backtrace e.backtrace
+ include ERB::Util
- raise error
- end
+ # Subversion rev
+ SVNRev = %$Rev: 52 $
- ##
- # Prepares for generation of output from the current directory
+ # Subversion ID
+ SVNId = %$Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $
- def setup
- return if instance_variable_defined? :@outputdir
+ # Path to this file's parent directory. Used to find templates and other
+ # resources.
+ GENERATOR_DIR = File.join 'rdoc', 'generator'
- @outputdir = Pathname.new(@options.op_dir).expand_path @base_dir
+ # Release Version
+ VERSION = '1.1.6'
- return unless @store
+ # Directory where generated classes live relative to the root
+ CLASS_DIR = nil
- @classes = @store.all_classes_and_modules.sort
- @files = @store.all_files.sort
- @methods = @classes.map { |m| m.method_list }.flatten.sort
- @modsort = get_sorted_module_list @classes
- end
+ # Directory where generated files live relative to the root
+ FILE_DIR = nil
- ##
- # Return a string describing the amount of time in the given number of
- # seconds in terms a human can understand easily.
- def time_delta_string seconds
- return 'less than a minute' if seconds < 60
- return "#{seconds / 60} minute#{seconds / 60 == 1 ? '' : 's'}" if
- seconds < 3000 # 50 minutes
- return 'about one hour' if seconds < 5400 # 90 minutes
- return "#{seconds / 3600} hours" if seconds < 64800 # 18 hours
- return 'one day' if seconds < 86400 # 1 day
- return 'about one day' if seconds < 172800 # 2 days
- return "#{seconds / 86400} days" if seconds < 604800 # 1 week
- return 'about one week' if seconds < 1209600 # 2 week
- return "#{seconds / 604800} weeks" if seconds < 7257600 # 3 months
- return "#{seconds / 2419200} months" if seconds < 31536000 # 1 year
- return "#{seconds / 31536000} years"
- end
+ #################################################################
+ ### C L A S S M E T H O D S
+ #################################################################
- # %q$Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $"
- SVNID_PATTERN = /
- \$Id:\s
- (\S+)\s # filename
- (\d+)\s # rev
- (\d{4}-\d{2}-\d{2})\s # Date (YYYY-MM-DD)
- (\d{2}:\d{2}:\d{2}Z)\s # Time (HH:MM:SSZ)
- (\w+)\s # committer
- \$$
- /x
+ ### Standard generator factory method
+ def self::for( options )
+ new( options )
+ end
- ##
- # Try to extract Subversion information out of the first constant whose
- # value looks like a subversion Id tag. If no matching constant is found,
- # and empty hash is returned.
- def get_svninfo klass
- constants = klass.constants or return {}
+ #################################################################
+ ### I N S T A N C E M E T H O D S
+ #################################################################
- constants.find { |c| c.value =~ SVNID_PATTERN } or return {}
-
- filename, rev, date, time, committer = $~.captures
- commitdate = Time.parse "#{date} #{time}"
-
- return {
- :filename => filename,
- :rev => Integer(rev),
- :commitdate => commitdate,
- :commitdelta => time_delta_string(Time.now - commitdate),
- :committer => committer,
- }
- end
+ ### Initialize a few instance variables before we start
+ def initialize( options )
+ @options = options
- ##
- # Creates a template from its components and the +body_file+.
- #
- # For backwards compatibility, if +body_file+ contains "<html" the body is
- # used directly.
-
- def assemble_template body_file
- body = body_file.read
- return body if body =~ /<html/
-
- head_file = @template_dir + '_head.rhtml'
- footer_file = @template_dir + '_footer.rhtml'
-
- <<-TEMPLATE
-<!DOCTYPE html>
-
-<html>
-<head>
-#{head_file.read}
-
-#{body}
-
-#{footer_file.read}
- TEMPLATE
- end
-
- ##
- # Renders the ERb contained in +file_name+ relative to the template
- # directory and returns the result based on the current context.
-
- def render file_name
- template_file = @template_dir + file_name
-
- template = template_for template_file, false, RDoc::ERBPartial
-
- template.filename = template_file.to_s
-
- template.result @context
- end
-
- ##
- # Load and render the erb template in the given +template_file+ and write
- # it out to +out_file+.
- #
- # Both +template_file+ and +out_file+ should be Pathname-like objects.
- #
- # An io will be yielded which must be captured by binding in the caller.
-
- def render_template template_file, out_file = nil # :yield: io
- io_output = out_file && !@dry_run && @file_output
- erb_klass = io_output ? RDoc::ERBIO : ERB
-
- template = template_for template_file, true, erb_klass
-
- if io_output then
- debug_msg "Outputting to %s" % [out_file.expand_path]
-
- out_file.dirname.mkpath
- out_file.open 'w', 0644 do |io|
- io.set_encoding @options.encoding if Object.const_defined? :Encoding
-
- @context = yield io
-
- template_result template, @context, template_file
- end
- else
- @context = yield nil
+ template = @options.template || 'darkfish'
- output = template_result template, @context, template_file
+ template_dir = $LOAD_PATH.map do |path|
+ File.join File.expand_path(path), GENERATOR_DIR, 'template', template
+ end.find do |dir|
+ File.directory? dir
+ end
- debug_msg " would have written %d characters to %s" % [
- output.length, out_file.expand_path
- ] if @dry_run
+ raise RDoc::Error, "could not find template #{template.inspect}" unless
+ template_dir
- output
- end
- end
+ @template_dir = Pathname.new File.expand_path(template_dir)
- ##
- # Creates the result for +template+ with +context+. If an error is raised a
- # Pathname +template_file+ will indicate the file where the error occurred.
+ @files = nil
+ @classes = nil
- def template_result template, context, template_file
- template.filename = template_file.to_s
- template.result context
- rescue NoMethodError => e
- raise RDoc::Error, "Error while evaluating %s: %s" % [
- template_file.expand_path,
- e.message,
- ], e.backtrace
- end
+ @basedir = Pathname.pwd.expand_path
+ end
- ##
- # Retrieves a cache template for +file+, if present, or fills the cache.
+ ######
+ public
+ ######
- def template_for file, page = true, klass = ERB
- template = @template_cache[file]
+ # The output directory
+ attr_reader :outputdir
- return template if template
- if page then
- template = assemble_template file
- erbout = 'io'
- else
- template = file.read
- template = template.encode @options.encoding if
- Object.const_defined? :Encoding
+ ### Output progress information if debugging is enabled
+ def debug_msg( *msg )
+ return unless $DEBUG_RDOC
+ $stderr.puts( *msg )
+ end
- file_var = File.basename(file).sub(/\..*/, '')
+ def class_dir
+ CLASS_DIR
+ end
- erbout = "_erbout_#{file_var}"
- end
+ def file_dir
+ FILE_DIR
+ end
- template = klass.new template, nil, '<>', erbout
- @template_cache[file] = template
- template
- end
+ ### Create the directories the generated docs will live in if
+ ### they don't already exist.
+ def gen_sub_directories
+ @outputdir.mkpath
+ end
+ ### Copy over the stylesheet into the appropriate place in the output
+ ### directory.
+ def write_style_sheet
+ debug_msg "Copying static files"
+ options = { :verbose => $DEBUG_RDOC, :noop => $DARKFISH_DRYRUN }
+
+ FileUtils.cp @template_dir + 'rdoc.css', '.', options
+
+ Dir[(@template_dir + "{js,images}/**/*").to_s].each do |path|
+ next if File.directory? path
+ next if path =~ /#{File::SEPARATOR}\./
+
+ dst = Pathname.new(path).relative_path_from @template_dir
+
+ # I suck at glob
+ dst_dir = dst.dirname
+ FileUtils.mkdir_p dst_dir, options unless File.exist? dst_dir
+
+ FileUtils.cp @template_dir + path, dst, options
+ end
+ end
+
+ ### Build the initial indices and output objects
+ ### based on an array of TopLevel objects containing
+ ### the extracted information.
+ def generate( top_levels )
+ @outputdir = Pathname.new( @options.op_dir ).expand_path( @basedir )
+
+ @files = top_levels.sort
+ @classes = RDoc::TopLevel.all_classes_and_modules.sort
+ @methods = @classes.map { |m| m.method_list }.flatten.sort
+ @modsort = get_sorted_module_list( @classes )
+
+ # Now actually write the output
+ write_style_sheet
+ generate_index
+ generate_class_files
+ generate_file_files
+
+ rescue StandardError => err
+ debug_msg "%s: %s\n %s" % [ err.class.name, err.message, err.backtrace.join("\n ") ]
+ raise
+ end
+
+ #########
+ protected
+ #########
+
+ ### Return a list of the documented modules sorted by salience first, then
+ ### by name.
+ def get_sorted_module_list( classes )
+ nscounts = classes.inject({}) do |counthash, klass|
+ top_level = klass.full_name.gsub( /::.*/, '' )
+ counthash[top_level] ||= 0
+ counthash[top_level] += 1
+
+ counthash
+ end
+
+ # Sort based on how often the top level namespace occurs, and then on the
+ # name of the module -- this works for projects that put their stuff into
+ # a namespace, of course, but doesn't hurt if they don't.
+ classes.sort_by do |klass|
+ top_level = klass.full_name.gsub( /::.*/, '' )
+ [
+ nscounts[ top_level ] * -1,
+ klass.full_name
+ ]
+ end.select do |klass|
+ klass.document_self
+ end
+ end
+
+ ### Generate an index page which lists all the classes which
+ ### are documented.
+ def generate_index
+ template_file = @template_dir + 'index.rhtml'
+ return unless template_file.exist?
+
+ debug_msg "Rendering the index page..."
+
+ template_src = template_file.read
+ template = ERB.new( template_src, nil, '<>' )
+ template.filename = template_file.to_s
+ context = binding()
+
+ output = nil
+
+ begin
+ output = template.result( context )
+ rescue NoMethodError => err
+ raise RDoc::Error, "Error while evaluating %s: %s (at %p)" % [
+ template_file,
+ err.message,
+ eval( "_erbout[-50,50]", context )
+ ], err.backtrace
+ end
+
+ outfile = @basedir + @options.op_dir + 'index.html'
+ unless $DARKFISH_DRYRUN
+ debug_msg "Outputting to %s" % [outfile.expand_path]
+ outfile.open( 'w', 0644 ) do |fh|
+ fh.print( output )
+ end
+ else
+ debug_msg "Would have output to %s" % [outfile.expand_path]
+ end
+ end
+
+ ### Generate a documentation file for each class
+ def generate_class_files
+ template_file = @template_dir + 'classpage.rhtml'
+ return unless template_file.exist?
+ debug_msg "Generating class documentation in #@outputdir"
+
+ @classes.each do |klass|
+ debug_msg " working on %s (%s)" % [ klass.full_name, klass.path ]
+ outfile = @outputdir + klass.path
+ rel_prefix = @outputdir.relative_path_from( outfile.dirname )
+ svninfo = self.get_svninfo( klass )
+
+ debug_msg " rendering #{outfile}"
+ self.render_template( template_file, binding(), outfile )
+ end
+ end
+
+ ### Generate a documentation file for each file
+ def generate_file_files
+ template_file = @template_dir + 'filepage.rhtml'
+ return unless template_file.exist?
+ debug_msg "Generating file documentation in #@outputdir"
+
+ @files.each do |file|
+ outfile = @outputdir + file.path
+ debug_msg " working on %s (%s)" % [ file.full_name, outfile ]
+ rel_prefix = @outputdir.relative_path_from( outfile.dirname )
+ context = binding()
+
+ debug_msg " rendering #{outfile}"
+ self.render_template( template_file, binding(), outfile )
+ end
+ end
+
+
+ ### Return a string describing the amount of time in the given number of
+ ### seconds in terms a human can understand easily.
+ def time_delta_string( seconds )
+ return 'less than a minute' if seconds < 1.minute
+ return (seconds / 1.minute).to_s + ' minute' + (seconds/60 == 1 ? '' : 's') if seconds < 50.minutes
+ return 'about one hour' if seconds < 90.minutes
+ return (seconds / 1.hour).to_s + ' hours' if seconds < 18.hours
+ return 'one day' if seconds < 1.day
+ return 'about one day' if seconds < 2.days
+ return (seconds / 1.day).to_s + ' days' if seconds < 1.week
+ return 'about one week' if seconds < 2.week
+ return (seconds / 1.week).to_s + ' weeks' if seconds < 3.months
+ return (seconds / 1.month).to_s + ' months' if seconds < 1.year
+ return (seconds / 1.year).to_s + ' years'
+ end
+
+
+ # %q$Id: darkfish.rb 52 2009-01-07 02:08:11Z deveiant $"
+ SVNID_PATTERN = /
+ \$Id:\s
+ (\S+)\s # filename
+ (\d+)\s # rev
+ (\d{4}-\d{2}-\d{2})\s # Date (YYYY-MM-DD)
+ (\d{2}:\d{2}:\d{2}Z)\s # Time (HH:MM:SSZ)
+ (\w+)\s # committer
+ \$$
+ /x
+
+ ### Try to extract Subversion information out of the first constant whose value looks like
+ ### a subversion Id tag. If no matching constant is found, and empty hash is returned.
+ def get_svninfo( klass )
+ constants = klass.constants or return {}
+
+ constants.find {|c| c.value =~ SVNID_PATTERN } or return {}
+
+ filename, rev, date, time, committer = $~.captures
+ commitdate = Time.parse( date + ' ' + time )
+
+ return {
+ :filename => filename,
+ :rev => Integer( rev ),
+ :commitdate => commitdate,
+ :commitdelta => time_delta_string( Time.now.to_i - commitdate.to_i ),
+ :committer => committer,
+ }
+ end
+
+
+ ### Load and render the erb template in the given +template_file+ within the
+ ### specified +context+ (a Binding object) and write it out to +outfile+.
+ ### Both +template_file+ and +outfile+ should be Pathname-like objects.
+
+ def render_template( template_file, context, outfile )
+ template_src = template_file.read
+ template = ERB.new( template_src, nil, '<>' )
+ template.filename = template_file.to_s
+
+ output = begin
+ template.result( context )
+ rescue NoMethodError => err
+ raise RDoc::Error, "Error while evaluating %s: %s (at %p)" % [
+ template_file.to_s,
+ err.message,
+ eval( "_erbout[-50,50]", context )
+ ], err.backtrace
+ end
+
+ unless $DARKFISH_DRYRUN
+ outfile.dirname.mkpath
+ outfile.open( 'w', 0644 ) do |ofh|
+ ofh.print( output )
+ end
+ else
+ debug_msg " would have written %d bytes to %s" %
+ [ output.length, outfile ]
+ end
+ end
+
+end # Roc::Generator::Darkfish
+
+# :stopdoc:
+
+### Time constants
+module TimeConstantMethods # :nodoc:
+
+ ### Number of seconds (returns receiver unmodified)
+ def seconds
+ return self
+ end
+ alias_method :second, :seconds
+
+ ### Returns number of seconds in <receiver> minutes
+ def minutes
+ return self * 60
+ end
+ alias_method :minute, :minutes
+
+ ### Returns the number of seconds in <receiver> hours
+ def hours
+ return self * 60.minutes
+ end
+ alias_method :hour, :hours
+
+ ### Returns the number of seconds in <receiver> days
+ def days
+ return self * 24.hours
+ end
+ alias_method :day, :days
+
+ ### Return the number of seconds in <receiver> weeks
+ def weeks
+ return self * 7.days
+ end
+ alias_method :week, :weeks
+
+ ### Returns the number of seconds in <receiver> fortnights
+ def fortnights
+ return self * 2.weeks
+ end
+ alias_method :fortnight, :fortnights
+
+ ### Returns the number of seconds in <receiver> months (approximate)
+ def months
+ return self * 30.days
+ end
+ alias_method :month, :months
+
+ ### Returns the number of seconds in <receiver> years (approximate)
+ def years
+ return (self * 365.25.days).to_i
+ end
+ alias_method :year, :years
+
+
+ ### Returns the Time <receiver> number of seconds before the
+ ### specified +time+. E.g., 2.hours.before( header.expiration )
+ def before( time )
+ return time - self
+ end
+
+
+ ### Returns the Time <receiver> number of seconds ago. (e.g.,
+ ### expiration > 2.hours.ago )
+ def ago
+ return self.before( ::Time.now )
+ end
+
+
+ ### Returns the Time <receiver> number of seconds after the given +time+.
+ ### E.g., 10.minutes.after( header.expiration )
+ def after( time )
+ return time + self
+ end
+
+ # Reads best without arguments: 10.minutes.from_now
+ def from_now
+ return self.after( ::Time.now )
+ end
+end # module TimeConstantMethods
+
+
+# Extend Numeric with time constants
+class Numeric # :nodoc:
+ include TimeConstantMethods
end
diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
deleted file mode 100644
index c303b2effb..0000000000
--- a/lib/rdoc/generator/json_index.rb
+++ /dev/null
@@ -1,248 +0,0 @@
-require 'json'
-
-##
-# The JsonIndex generator is designed to complement an HTML generator and
-# produces a JSON search index. This generator is derived from sdoc by
-# Vladimir Kolesnikov and contains verbatim code written by him.
-#
-# This generator is designed to be used with a regular HTML generator:
-#
-# class RDoc::Generator::Darkfish
-# def initialize options
-# # ...
-# @base_dir = Pathname.pwd.expand_path
-#
-# @json_index = RDoc::Generator::JsonIndex.new self, options
-# end
-#
-# def generate
-# # ...
-# @json_index.generate
-# end
-# end
-#
-# == Index Format
-#
-# The index is output as a JSON file assigned to the global variable
-# +search_data+. The structure is:
-#
-# var search_data = {
-# "index": {
-# "searchIndex":
-# ["a", "b", ...],
-# "longSearchIndex":
-# ["a", "a::b", ...],
-# "info": [
-# ["A", "A", "A.html", "", ""],
-# ["B", "A::B", "A::B.html", "", ""],
-# ...
-# ]
-# }
-# }
-#
-# The same item is described across the +searchIndex+, +longSearchIndex+ and
-# +info+ fields. The +searchIndex+ field contains the item's short name, the
-# +longSearchIndex+ field contains the full_name (when appropriate) and the
-# +info+ field contains the item's name, full_name, path, parameters and a
-# snippet of the item's comment.
-#
-# == LICENSE
-#
-# Copyright (c) 2009 Vladimir Kolesnikov
-#
-# 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.
-
-class RDoc::Generator::JsonIndex
-
- include RDoc::Text
-
- ##
- # Where the search index lives in the generated output
-
- SEARCH_INDEX_FILE = File.join 'js', 'search_index.js'
-
- attr_reader :index # :nodoc:
-
- ##
- # Creates a new generator. +parent_generator+ is used to determine the
- # class_dir and file_dir of links in the output index.
- #
- # +options+ are the same options passed to the parent generator.
-
- def initialize parent_generator, options
- @parent_generator = parent_generator
- @store = parent_generator.store
- @options = options
-
- @template_dir = File.expand_path '../template/json_index', __FILE__
- @base_dir = @parent_generator.base_dir
-
- @classes = nil
- @files = nil
- @index = nil
- end
-
- ##
- # Builds the JSON index as a Hash.
-
- def build_index
- reset @store.all_files.sort, @store.all_classes_and_modules.sort
-
- index_classes
- index_methods
- index_pages
-
- { :index => @index }
- end
-
- ##
- # Output progress information if debugging is enabled
-
- def debug_msg *msg
- return unless $DEBUG_RDOC
- $stderr.puts(*msg)
- end
-
- ##
- # Writes the JSON index to disk
-
- def generate
- debug_msg "Generating JSON index"
-
- debug_msg " writing search index to %s" % SEARCH_INDEX_FILE
- data = build_index
-
- return if @options.dry_run
-
- out_dir = @base_dir + @options.op_dir
- index_file = out_dir + SEARCH_INDEX_FILE
-
- FileUtils.mkdir_p index_file.dirname, :verbose => $DEBUG_RDOC
-
- index_file.open 'w', 0644 do |io|
- io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
- io.write 'var search_data = '
-
- JSON.dump data, io, 0
- end
-
- Dir.chdir @template_dir do
- Dir['**/*.js'].each do |source|
- dest = File.join out_dir, source
-
- FileUtils.install source, dest, :mode => 0644, :verbose => $DEBUG_RDOC
- end
- end
- end
-
- ##
- # Adds classes and modules to the index
-
- def index_classes
- debug_msg " generating class search index"
-
- documented = @classes.uniq.select do |klass|
- klass.document_self_or_methods
- end
-
- documented.each do |klass|
- debug_msg " #{klass.full_name}"
- record = klass.search_record
- @index[:searchIndex] << search_string(record.shift)
- @index[:longSearchIndex] << search_string(record.shift)
- @index[:info] << record
- end
- end
-
- ##
- # Adds methods to the index
-
- def index_methods
- debug_msg " generating method search index"
-
- list = @classes.uniq.map do |klass|
- klass.method_list
- end.flatten.sort_by do |method|
- [method.name, method.parent.full_name]
- end
-
- list.each do |method|
- debug_msg " #{method.full_name}"
- record = method.search_record
- @index[:searchIndex] << "#{search_string record.shift}()"
- @index[:longSearchIndex] << "#{search_string record.shift}()"
- @index[:info] << record
- end
- end
-
- ##
- # Adds pages to the index
-
- def index_pages
- debug_msg " generating pages search index"
-
- pages = @files.select do |file|
- file.text?
- end
-
- pages.each do |page|
- debug_msg " #{page.page_name}"
- record = page.search_record
- @index[:searchIndex] << search_string(record.shift)
- @index[:longSearchIndex] << ''
- record.shift
- @index[:info] << record
- end
- end
-
- ##
- # The directory classes are written to
-
- def class_dir
- @parent_generator.class_dir
- end
-
- ##
- # The directory files are written to
-
- def file_dir
- @parent_generator.file_dir
- end
-
- def reset files, classes # :nodoc:
- @files = files
- @classes = classes
-
- @index = {
- :searchIndex => [],
- :longSearchIndex => [],
- :info => []
- }
- end
-
- ##
- # Removes whitespace and downcases +string+
-
- def search_string string
- string.downcase.gsub(/\s/, '')
- end
-
-end
-
diff --git a/lib/rdoc/generator/markup.rb b/lib/rdoc/generator/markup.rb
index 788e5a485d..a90b15a1e7 100644
--- a/lib/rdoc/generator/markup.rb
+++ b/lib/rdoc/generator/markup.rb
@@ -1,8 +1,10 @@
+require 'rdoc/text'
+require 'rdoc/code_objects'
+require 'rdoc/generator'
+require 'rdoc/markup/to_html_crossref'
+
##
# Handle common RDoc::Markup tasks for various CodeObjects
-#
-# This module is loaded by generators. It allows RDoc's CodeObject tree to
-# avoid loading generator code to improve startup time for +ri+.
module RDoc::Generator::Markup
@@ -33,18 +35,15 @@ module RDoc::Generator::Markup
def formatter
return @formatter if defined? @formatter
- options = @store.rdoc.options
+ show_hash = RDoc::RDoc.current.options.show_hash
this = RDoc::Context === self ? self : @parent
-
- @formatter = RDoc::Markup::ToHtmlCrossref.new options, this.path, this
- @formatter.code_object = self
- @formatter
+ @formatter = RDoc::Markup::ToHtmlCrossref.new this.path, this, show_hash
end
##
# Build a webcvs URL starting for the given +url+ with +full_path+ appended
# as the destination path. If +url+ contains '%s' +full_path+ will be
- # will replace the %s using sprintf on the +url+.
+ # sprintf'd into +url+ instead.
def cvs_url(url, full_path)
if /%s/ =~ url then
@@ -56,90 +55,93 @@ module RDoc::Generator::Markup
end
-class RDoc::CodeObject
+class RDoc::AnyMethod
include RDoc::Generator::Markup
-end
-
-class RDoc::MethodAttr
-
- @add_line_numbers = false
-
- class << self
- ##
- # Allows controlling whether <tt>#markup_code</tt> adds line numbers to
- # the source code.
-
- attr_accessor :add_line_numbers
- end
-
##
# Prepend +src+ with line numbers. Relies on the first line of a source
# code listing having:
#
- # # File xxxxx, line dddd
- #
- # If it has this comment then line numbers are added to +src+ and the <tt>,
- # line dddd</tt> portion of the comment is removed.
+ # # File xxxxx, line dddd
def add_line_numbers(src)
- return unless src.sub!(/\A(.*)(, line (\d+))/, '\1')
- first = $3.to_i - 1
- last = first + src.count("\n")
- size = last.to_s.length
-
- line = first
- src.gsub!(/^/) do
- res = if line == first then
- " " * (size + 1)
- else
- "<span class=\"line-num\">%2$*1$d</span> " % [size, line]
- end
-
- line += 1
- res
+ if src =~ /\A.*, line (\d+)/ then
+ first = $1.to_i - 1
+ last = first + src.count("\n")
+ size = last.to_s.length
+
+ line = first
+ src.gsub!(/^/) do
+ res = if line == first then
+ " " * (size + 2)
+ else
+ "%2$*1$d: " % [size, line]
+ end
+
+ line += 1
+ res
+ end
end
end
##
- # Turns the method's token stream into HTML.
- #
- # Prepends line numbers if +add_line_numbers+ is true.
+ # Turns the method's token stream into HTML
def markup_code
return '' unless @token_stream
- src = RDoc::TokenStream.to_html @token_stream
-
- # dedent the source
- indent = src.length
- lines = src.lines.to_a
- lines.shift if src =~ /\A.*#\ *File/i # remove '# File' comment
- lines.each do |line|
- if line =~ /^ *(?=\S)/
- n = $&.length
- indent = n if n < indent
- break if n == 0
+ src = ""
+
+ @token_stream.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
- src.gsub!(/^#{' ' * indent}/, '') if indent > 0
- add_line_numbers(src) if RDoc::MethodAttr.add_line_numbers
+ add_line_numbers src
src
end
end
-class RDoc::ClassModule
+class RDoc::Attr
- ##
- # Handy wrapper for marking up this class or module's comment
+ include RDoc::Generator::Markup
- def description
- markup @comment_location
- end
+end
+
+class RDoc::Constant
+
+ include RDoc::Generator::Markup
+
+end
+
+class RDoc::Context
+
+ include RDoc::Generator::Markup
end
@@ -156,12 +158,12 @@ class RDoc::TopLevel
# command line option to set.
def cvs_url
- url = @store.rdoc.options.webcvs
+ url = RDoc::RDoc.current.options.webcvs
if /%s/ =~ url then
- url % @relative_name
+ url % @absolute_name
else
- url + @relative_name
+ url + @absolute_name
end
end
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
index b9c4141a5e..819eb52d40 100644
--- a/lib/rdoc/generator/ri.rb
+++ b/lib/rdoc/generator/ri.rb
@@ -1,3 +1,6 @@
+require 'rdoc/generator'
+require 'rdoc/ri'
+
##
# Generates ri data files
@@ -5,25 +8,74 @@ class RDoc::Generator::RI
RDoc::RDoc.add_generator self
+ def self.for options
+ new options
+ end
+
##
- # Description of this generator
+ # Set up a new ri generator
- DESCRIPTION = 'creates ri data files'
+ def initialize options #:not-new:
+ @options = options
+ @store = RDoc::RI::Store.new '.'
+ @old_siginfo = nil
+ @current = nil
+ end
##
- # Set up a new ri generator
+ # Build the initial indices and output objects based on an array of TopLevel
+ # objects containing the extracted information.
+
+ def generate top_levels
+ install_siginfo_handler
+
+ @store.load_cache
+
+ RDoc::TopLevel.all_classes_and_modules.each do |klass|
+ @current = "#{klass.class}: #{klass.full_name}"
+
+ @store.save_class klass
+
+ klass.each_method do |method|
+ @current = "#{method.class}: #{method.full_name}"
+ @store.save_method klass, method
+ end
- def initialize store, options #:not-new:
- @options = options
- @store = store
- @store.path = '.'
+ klass.each_attribute do |attribute|
+ @store.save_method klass, attribute
+ end
+ end
+
+ @current = 'saving cache'
+
+ @store.save_cache
+
+ ensure
+ @current = nil
+
+ remove_siginfo_handler
end
##
- # Writes the parsed data store to disk for use by ri.
+ # Installs a siginfo handler that prints the current filename.
+
+ def install_siginfo_handler
+ return unless Signal.list.key? 'INFO'
+
+ @old_siginfo = trap 'INFO' do
+ puts @current if @current
+ end
+ end
+
+ ##
+ # Removes a siginfo handler and replaces the previous
+
+ def remove_siginfo_handler
+ return unless Signal.list.key? 'INFO'
+
+ handler = @old_siginfo || 'DEFAULT'
- def generate
- @store.save
+ trap 'INFO', handler
end
end
diff --git a/lib/rdoc/generator/template/darkfish/_footer.rhtml b/lib/rdoc/generator/template/darkfish/_footer.rhtml
deleted file mode 100644
index 0736c335ba..0000000000
--- a/lib/rdoc/generator/template/darkfish/_footer.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<footer id="validator-badges">
- <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
- <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> <%= RDoc::VERSION %>.
- <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %>.
-</footer>
diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
deleted file mode 100644
index f3d82a37f6..0000000000
--- a/lib/rdoc/generator/template/darkfish/_head.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type">
-
-<title><%= h @title %></title>
-
-<link type="text/css" media="screen" href="<%= asset_rel_prefix %>/rdoc.css" rel="stylesheet">
-
-<script type="text/javascript">
- var rdoc_rel_prefix = "<%= rel_prefix %>/";
-</script>
-
-<script type="text/javascript" charset="utf-8" src="<%= asset_rel_prefix %>/js/jquery.js"></script>
-<script type="text/javascript" charset="utf-8" src="<%= asset_rel_prefix %>/js/navigation.js"></script>
-<script type="text/javascript" charset="utf-8" src="<%= search_index_rel_prefix %>/js/search_index.js"></script>
-<script type="text/javascript" charset="utf-8" src="<%= asset_rel_prefix %>/js/search.js"></script>
-<script type="text/javascript" charset="utf-8" src="<%= asset_rel_prefix %>/js/searcher.js"></script>
-<script type="text/javascript" charset="utf-8" src="<%= asset_rel_prefix %>/js/darkfish.js"></script>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
deleted file mode 100644
index 93d57f39f6..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<% if !svninfo.empty? then %>
-<nav id="file-svninfo-section" class="section">
- <h3 class="section-header">VCS Info</h3>
- <div class="section-body">
- <dl class="svninfo">
- <dt>Rev
- <dd><%= svninfo[:rev] %>
-
- <dt>Last Checked In
- <dd><%= svninfo[:commitdate].strftime('%Y-%m-%d %H:%M:%S') %>
- (<%= svninfo[:commitdelta] %> ago)
-
- <dt>Checked in by
- <dd><%= svninfo[:committer] %>
- </dl>
- </div>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml
deleted file mode 100644
index efa202fa18..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<nav id="classindex-section" class="section project-section">
- <h3 class="section-header">Class and Module Index</h3>
-
- <ul class="link-list">
- <% @modsort.each do |index_klass| %>
- <li><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.full_name %></a>
- <% end %>
- </ul>
-</nav>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
deleted file mode 100644
index 19273829a0..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<% unless klass.extends.empty? then %>
-<!-- Extension Modules -->
-<nav id="extends-section" class="section">
- <h3 class="section-header">Extended With Modules</h3>
-
- <ul class="link-list">
- <% klass.each_extend do |ext| %>
- <% unless String === ext.module then %>
- <li><a class="extend" href="<%= klass.aref_to ext.module.path %>"><%= ext.module.full_name %></a>
- <% else %>
- <li><span class="extend"><%= ext.name %></span>
- <% end %>
- <% end %>
- </ul>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml
deleted file mode 100644
index 22be0c9b65..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<nav id="file-list-section" class="section">
- <h3 class="section-header">Defined In</h3>
- <ul>
-<% klass.in_files.each do |tl| %>
- <li><%= h tl.relative_name %>
-<% end %>
- </ul>
-</nav>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
deleted file mode 100644
index 5494f1f5f8..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<% unless klass.includes.empty? then %>
-<!-- Included Modules -->
-<nav id="includes-section" class="section">
- <h3 class="section-header">Included Modules</h3>
-
- <ul class="link-list">
- <% klass.each_include do |inc| %>
- <% unless String === inc.module then %>
- <li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a>
- <% else %>
- <li><span class="include"><%= inc.name %></span>
- <% end %>
- <% end %>
- </ul>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml
deleted file mode 100644
index 45a3048e84..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nav id="home-section" class="section">
- <h3 class="section-header">Documentation</h3>
-
- <ul>
- <% installed.each do |name, href, exists| %>
- <li class="folder">
- <% if exists then %>
- <a href="<%= href %>"><%= h name %></a>
- <% else %>
- <%= h name %>
- <% end %>
- <% end %>
- </ul>
-</nav>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
deleted file mode 100644
index 88e2734819..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% unless klass.method_list.empty? then %>
-<!-- Method Quickref -->
-<nav id="method-list-section" class="section">
- <h3 class="section-header">Methods</h3>
-
- <ul class="link-list">
- <% klass.each_method do |meth| %>
- <li <% if meth.calls_super %>class="calls-super" <% end %>><a href="#<%= meth.aref %>"><%= meth.singleton ? '::' : '#' %><%= h meth.name %></a>
- <% end %>
- </ul>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml
deleted file mode 100644
index fdeb6aed9f..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<nav id="home-section" class="section">
- <h3 class="section-header">
- <a href="<%= rel_prefix %>/index.html">Home</a>
- <a href="<%= rel_prefix %>/table_of_contents.html#classes">Classes</a>
- <a href="<%= rel_prefix %>/table_of_contents.html#methods">Methods</a>
- </h3>
-</nav>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
deleted file mode 100644
index 2089387c51..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<% simple_files = @files.select { |f| f.text? } %>
-<% unless simple_files.empty? then %>
-<nav id="fileindex-section" class="section project-section">
- <h3 class="section-header">Pages</h3>
-
- <ul>
- <% simple_files.each do |f| %>
- <li class="file"><a href="<%= rel_prefix %>/<%= f.path %>"><%= h f.page_name %></a>
- <% end %>
- </ul>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
deleted file mode 100644
index 463f05a8d9..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if klass.type == 'class' then %>
-<nav id="parent-class-section" class="section">
- <h3 class="section-header">Parent</h3>
- <% if klass.superclass and not String === klass.superclass then %>
- <p class="link"><a href="<%= klass.aref_to klass.superclass.path %>"><%= klass.superclass.full_name %></a>
- <% else %>
- <p class="link"><%= klass.superclass %>
- <% end %>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml
deleted file mode 100644
index f3275783d0..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<nav id="search-section" class="section project-section" class="initially-hidden">
- <form action="#" method="get" accept-charset="utf-8">
- <h3 class="section-header">
- <input type="text" name="search" placeholder="Search" id="search-field"
- title="Type to search, Up and Down to navigate, Enter to load">
- </h3>
- </form>
-
- <ul id="search-results" class="initially-hidden"></ul>
-</nav>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
deleted file mode 100644
index 726423a341..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% unless klass.sections.length == 1 then %>
-<nav id="sections-section" class="section">
- <h3 class="section-header">Sections</h3>
- <ul class="link-list">
- <% klass.sort_sections.each do |section| %>
- <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
- <% end %>
- </ul>
-</nav>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
deleted file mode 100644
index 7842625840..0000000000
--- a/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
+++ /dev/null
@@ -1,19 +0,0 @@
-<% comment = if current.respond_to? :comment_location then
- current.comment_location
- else
- current.comment
- end
- table = current.parse(comment).table_of_contents
-
- if table.length > 1 then %>
-<div id="table-of-contents">
- <nav class="section">
- <h3 class="section-header">Table of Contents</h3>
- <ul>
-<% table.each do |heading| %>
- <li><a href="#<%= heading.aref %>"><%= heading.plain_html %></a>
-<% end %>
- </ul>
- </nav>
-</div>
-<% end %>
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml
deleted file mode 100644
index c7e52e6808..0000000000
--- a/lib/rdoc/generator/template/darkfish/class.rhtml
+++ /dev/null
@@ -1,179 +0,0 @@
-<body id="top" class="<%= klass.type %>">
-<nav id="metadata">
- <%= render '_sidebar_navigation.rhtml' %>
-
- <%= render '_sidebar_search.rhtml' %>
-
- <%= render '_sidebar_table_of_contents.rhtml' %>
-
- <div id="file-metadata">
- <%= render '_sidebar_in_files.rhtml' %>
- <%= render '_sidebar_VCS_info.rhtml' %>
- </div>
-
- <div id="class-metadata">
- <%= render '_sidebar_sections.rhtml' %>
- <%= render '_sidebar_parent.rhtml' %>
- <%= render '_sidebar_includes.rhtml' %>
- <%= render '_sidebar_extends.rhtml' %>
- <%= render '_sidebar_methods.rhtml' %>
- </div>
-
- <div id="project-metadata">
- <%= render '_sidebar_pages.rhtml' %>
- <%= render '_sidebar_classes.rhtml' %>
- </div>
-</nav>
-
-<div id="documentation">
- <h1 class="<%= klass.type %>"><%= klass.type %> <%= klass.full_name %></h1>
-
- <div id="description" class="description">
- <%= klass.description %>
- </div><!-- description -->
-
- <% klass.each_section do |section, constants, attributes| %>
- <% constants = constants.select { |const| const.display? } %>
- <% attributes = attributes.select { |attr| attr.display? } %>
- <section id="<%= section.aref %>" class="documentation-section">
- <% if section.title then %>
- <div class="documentation-section-title">
- <h2 class="section-header">
- <%= section.title %>
- </h2>
- <span class="section-click-top">
- <a href="#top">&uarr; top</a>
- </span>
- </div>
- <% end %>
-
- <% if section.comment then %>
- <div class="description">
- <%= section.description %>
- </div>
- <% end %>
-
- <% unless constants.empty? then %>
- <!-- Constants -->
- <section id="constants-list" class="section">
- <h3 class="section-header">Constants</h3>
- <dl>
- <% constants.each do |const| %>
- <dt id="<%= const.name %>"><%= const.name %>
- <% if const.comment then %>
- <dd class="description"><%= const.description.strip %>
- <% else %>
- <dd class="description missing-docs">(Not documented)
- <% end %>
- <% end %>
- </dl>
- </section>
- <% end %>
-
- <% unless attributes.empty? then %>
- <!-- Attributes -->
- <section id="attribute-method-details" class="method-section section">
- <h3 class="section-header">Attributes</h3>
-
- <% attributes.each do |attrib| %>
- <div id="<%= attrib.aref %>" class="method-detail">
- <div class="method-heading attribute-method-heading">
- <span class="method-name"><%= h attrib.name %></span><span
- class="attribute-access-type">[<%= attrib.rw %>]</span>
- </div>
-
- <div class="method-description">
- <% if attrib.comment then %>
- <%= attrib.description.strip %>
- <% else %>
- <p class="missing-docs">(Not documented)
- <% end %>
- </div>
- </div>
- <% end %>
- </section><!-- attribute-method-details -->
- <% end %>
-
- <!-- Methods -->
- <% klass.methods_by_type(section).each do |type, visibilities|
- next if visibilities.empty?
- visibilities.each do |visibility, methods|
- next if methods.empty? %>
- <section id="<%= visibility %>-<%= type %>-<%= section.aref %>-method-details" class="method-section section">
- <h3 class="section-header"><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</h3>
-
- <% methods.each do |method| %>
- <div id="<%= method.aref %>" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
- <% if method.call_seq then %>
- <% method.call_seq.strip.split("\n").each_with_index do |call_seq, i| %>
- <div class="method-heading">
- <span class="method-callseq">
- <%= h(call_seq.strip.
- gsub( /^\w+\./m, '')).
- gsub(/(.*)[-=]&gt;/, '\1&rarr;') %>
- </span>
- <% if i == 0 and method.token_stream then %>
- <span class="method-click-advice">click to toggle source</span>
- <% end %>
- </div>
- <% end %>
- <% else %>
- <div class="method-heading">
- <span class="method-name"><%= h method.name %></span><span
- class="method-args"><%= method.param_seq %></span>
- <% if method.token_stream then %>
- <span class="method-click-advice">click to toggle source</span>
- <% end %>
- </div>
- <% end %>
-
- <div class="method-description">
- <% if method.comment then %>
- <%= method.description.strip %>
- <% else %>
- <p class="missing-docs">(Not documented)
- <% end %>
- <% if method.calls_super then %>
- <div class="method-calls-super">
- Calls superclass method
- <%=
- method.superclass_method ?
- method.formatter.link(method.superclass_method.full_name, method.superclass_method.full_name) : nil
- %>
- </div>
- <% end %>
-
- <% if method.token_stream then %>
- <div class="method-source-code" id="<%= method.html_name %>-source">
- <pre><%= method.markup_code %></pre>
- </div><!-- <%= method.html_name %>-source -->
- <% end %>
- </div>
-
- <% unless method.aliases.empty? then %>
- <div class="aliases">
- Also aliased as: <%= method.aliases.map do |aka|
- if aka.parent then # HACK lib/rexml/encodings
- %{<a href="#{klass.aref_to aka.path}">#{h aka.name}</a>}
- else
- h aka.name
- end
- end.join ", " %>
- </div>
- <% end %>
-
- <% if method.is_alias_for then %>
- <div class="aliases">
- Alias for: <a href="<%= klass.aref_to method.is_alias_for.path %>"><%= h method.is_alias_for.name %></a>
- </div>
- <% end %>
- </div><!-- <%= method.html_name %>-method -->
-
- <% end %>
- </section><!-- <%= visibility %>-<%= type %>-method-details -->
- <% end
- end %>
- </section><!-- <%= section.aref %> -->
-<% end %>
-
-</div><!-- documentation -->
diff --git a/lib/rdoc/generator/template/darkfish/classpage.rhtml b/lib/rdoc/generator/template/darkfish/classpage.rhtml
new file mode 100644
index 0000000000..7151087988
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/classpage.rhtml
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="<%= @options.charset %>"?>
+<!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>
+ <meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type" />
+
+ <title><%= klass.type.capitalize %>: <%= klass.full_name %></title>
+
+ <link rel="stylesheet" href="<%= rel_prefix %>/rdoc.css" type="text/css" media="screen" />
+
+ <script src="<%= rel_prefix %>/js/jquery.js" type="text/javascript"
+ charset="utf-8"></script>
+ <script src="<%= rel_prefix %>/js/thickbox-compressed.js" type="text/javascript"
+ charset="utf-8"></script>
+ <script src="<%= rel_prefix %>/js/quicksearch.js" type="text/javascript"
+ charset="utf-8"></script>
+ <script src="<%= rel_prefix %>/js/darkfish.js" type="text/javascript"
+ charset="utf-8"></script>
+
+</head>
+<body class="<%= klass.type %>">
+
+ <div id="metadata">
+ <div id="home-metadata">
+ <div id="home-section" class="section">
+ <h3 class="section-header">
+ <a href="<%= rel_prefix %>/index.html">Home</a>
+ <a href="<%= rel_prefix %>/index.html#classes">Classes</a>
+ <a href="<%= rel_prefix %>/index.html#methods">Methods</a>
+ </h3>
+ </div>
+ </div>
+
+ <div id="file-metadata">
+ <div id="file-list-section" class="section">
+ <h3 class="section-header">In Files</h3>
+ <div class="section-body">
+ <ul>
+ <% klass.in_files.each do |tl| %>
+ <li><a href="<%= rel_prefix %>/<%= h tl.path %>?TB_iframe=true&amp;height=550&amp;width=785"
+ class="thickbox" title="<%= h tl.absolute_name %>"><%= h tl.absolute_name %></a></li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+
+ <% if !svninfo.empty? %>
+ <div id="file-svninfo-section" class="section">
+ <h3 class="section-header">Subversion Info</h3>
+ <div class="section-body">
+ <dl class="svninfo">
+ <dt>Rev</dt>
+ <dd><%= svninfo[:rev] %></dd>
+
+ <dt>Last Checked In</dt>
+ <dd><%= svninfo[:commitdate].strftime('%Y-%m-%d %H:%M:%S') %>
+ (<%= svninfo[:commitdelta] %> ago)</dd>
+
+ <dt>Checked in by</dt>
+ <dd><%= svninfo[:committer] %></dd>
+ </dl>
+ </div>
+ </div>
+ <% end %>
+ </div>
+
+ <div id="class-metadata">
+
+ <!-- Parent Class -->
+ <% if klass.type == 'class' %>
+ <div id="parent-class-section" class="section">
+ <h3 class="section-header">Parent</h3>
+ <% unless String === klass.superclass %>
+ <p class="link"><a href="<%= klass.aref_to klass.superclass.path %>"><%= klass.superclass.full_name %></a></p>
+ <% else %>
+ <p class="link"><%= klass.superclass %></p>
+ <% end %>
+ </div>
+ <% end %>
+
+ <!-- Namespace Contents -->
+ <% unless klass.classes_and_modules.empty? %>
+ <div id="namespace-list-section" class="section">
+ <h3 class="section-header">Namespace</h3>
+ <ul class="link-list">
+ <% (klass.modules.sort + klass.classes.sort).each do |mod| %>
+ <li><span class="type"><%= mod.type.upcase %></span> <a href="<%= klass.aref_to mod.path %>"><%= mod.full_name %></a></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+
+ <!-- Method Quickref -->
+ <% unless klass.method_list.empty? %>
+ <div id="method-list-section" class="section">
+ <h3 class="section-header">Methods</h3>
+ <ul class="link-list">
+ <% klass.each_method do |meth| %>
+ <li><a href="#<%= meth.aref %>"><%= meth.singleton ? '::' : '#' %><%= meth.name %></a></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+
+ <!-- Included Modules -->
+ <% unless klass.includes.empty? %>
+ <div id="includes-section" class="section">
+ <h3 class="section-header">Included Modules</h3>
+ <ul class="link-list">
+ <% klass.each_include do |inc| %>
+ <% unless String === inc.module %>
+ <li><a class="include" href="<%= klass.aref_to inc.module.path %>"><%= inc.module.full_name %></a></li>
+ <% else %>
+ <li><span class="include"><%= inc.name %></span></li>
+ <% end %>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+ </div>
+
+ <div id="project-metadata">
+ <% simple_files = @files.select {|tl| tl.parser == RDoc::Parser::Simple } %>
+ <% unless simple_files.empty? then %>
+ <div id="fileindex-section" class="section project-section">
+ <h3 class="section-header">Files</h3>
+ <ul>
+ <% simple_files.each do |file| %>
+ <li class="file"><a href="<%= rel_prefix %>/<%= file.path %>"><%= h file.base_name %></a></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+
+ <div id="classindex-section" class="section project-section">
+ <h3 class="section-header">Class Index
+ <span class="search-toggle"><img src="<%= rel_prefix %>/images/find.png"
+ height="16" width="16" alt="[+]"
+ title="show/hide quicksearch" /></span></h3>
+ <form action="#" method="get" accept-charset="utf-8" class="initially-hidden">
+ <fieldset>
+ <legend>Quicksearch</legend>
+ <input type="text" name="quicksearch" value=""
+ class="quicksearch-field" />
+ </fieldset>
+ </form>
+
+ <ul class="link-list">
+ <% @modsort.each do |index_klass| %>
+ <li><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.full_name %></a></li>
+ <% end %>
+ </ul>
+ <div id="no-class-search-results" style="display: none;">No matching classes.</div>
+ </div>
+
+ <% if $DEBUG_RDOC %>
+ <div id="debugging-toggle"><img src="<%= rel_prefix %>/images/bug.png"
+ alt="toggle debugging" height="16" width="16" /></div>
+ <% end %>
+ </div>
+ </div>
+
+ <div id="documentation">
+ <h1 class="<%= klass.type %>"><%= klass.full_name %></h1>
+
+ <div id="description">
+ <%= klass.description %>
+ </div>
+
+ <!-- Constants -->
+ <% unless klass.constants.empty? %>
+ <div id="constants-list" class="section">
+ <h3 class="section-header">Constants</h3>
+ <dl>
+ <% klass.each_constant do |const| %>
+ <dt><a name="<%= const.name %>"><%= const.name %></a></dt>
+ <% if const.comment %>
+ <dd class="description"><%= const.description.strip %></dd>
+ <% else %>
+ <dd class="description missing-docs">(Not documented)</dd>
+ <% end %>
+ <% end %>
+ </dl>
+ </div>
+ <% end %>
+
+ <!-- Attributes -->
+ <% unless klass.attributes.empty? %>
+ <div id="attribute-method-details" class="method-section section">
+ <h3 class="section-header">Attributes</h3>
+
+ <% klass.each_attribute do |attrib| %>
+ <div id="<%= attrib.html_name %>-attribute-method" class="method-detail">
+ <a name="<%= h attrib.name %>"></a>
+ <% if attrib.rw =~ /w/i %>
+ <a name="<%= h attrib.name %>="></a>
+ <% end %>
+ <div class="method-heading attribute-method-heading">
+ <span class="method-name"><%= h attrib.name %></span><span
+ class="attribute-access-type">[<%= attrib.rw %>]</span>
+ </div>
+
+ <div class="method-description">
+ <% if attrib.comment %>
+ <%= attrib.description.strip %>
+ <% else %>
+ <p class="missing-docs">(Not documented)</p>
+ <% end %>
+ </div>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
+
+ <!-- Methods -->
+ <% klass.methods_by_type.each do |type, visibilities|
+ next if visibilities.empty?
+ visibilities.each do |visibility, methods|
+ next if methods.empty? %>
+ <div id="<%= visibility %>-<%= type %>-method-details" class="method-section section">
+ <h3 class="section-header"><%= visibility.to_s.capitalize %> <%= type.capitalize %> Methods</h3>
+
+ <% methods.each do |method| %>
+ <div id="<%= method.html_name %>-method" class="method-detail <%= method.is_alias_for ? "method-alias" : '' %>">
+ <a name="<%= h method.aref %>"></a>
+
+ <div class="method-heading">
+ <% if method.call_seq %>
+ <span class="method-callseq"><%= method.call_seq.strip.gsub(/->/, '&rarr;').gsub( /^\w.+\./m, '') %></span>
+ <span class="method-click-advice">click to toggle source</span>
+ <% else %>
+ <span class="method-name"><%= h method.name %></span><span
+ class="method-args"><%= method.params %></span>
+ <span class="method-click-advice">click to toggle source</span>
+ <% end %>
+ </div>
+
+ <div class="method-description">
+ <% if method.comment %>
+ <%= method.description.strip %>
+ <% else %>
+ <p class="missing-docs">(Not documented)</p>
+ <% end %>
+
+ <% if method.token_stream %>
+ <div class="method-source-code"
+ id="<%= method.html_name %>-source">
+<pre>
+<%= method.markup_code %>
+</pre>
+ </div>
+ <% end %>
+ </div>
+
+ <% unless method.aliases.empty? %>
+ <div class="aliases">
+ Also aliased as: <%= method.aliases.map do |aka|
+ %{<a href="#{ klass.aref_to aka.path}">#{h aka.name}</a>}
+ end.join(", ") %>
+ </div>
+ <% end %>
+
+ <% if method.is_alias_for then %>
+ <div class="aliases">
+ Alias for: <a href="<%= klass.aref_to method.is_alias_for.path %>"><%= h method.is_alias_for.name %></a>
+ </div>
+ <% end %>
+ </div>
+
+ <% end %>
+ </div>
+ <% end
+ end %>
+
+ </div>
+
+
+ <div id="rdoc-debugging-section-dump" class="debugging-section">
+ <% if $DEBUG_RDOC
+ require 'pp' %>
+<pre><%= h PP.pp(klass, _erbout) %></pre>
+ </div>
+ <% else %>
+ <p>Disabled; run with --debug to generate this.</p>
+ <% end %>
+ </div>
+
+ <div id="validator-badges">
+ <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+ <p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+ Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %></small>.</p>
+ </div>
+
+</body>
+</html>
+
diff --git a/lib/rdoc/generator/template/darkfish/filepage.rhtml b/lib/rdoc/generator/template/darkfish/filepage.rhtml
new file mode 100644
index 0000000000..33216dc8f1
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/filepage.rhtml
@@ -0,0 +1,124 @@
+<?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>
+ <meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type" />
+
+ <title>File: <%= file.base_name %> [<%= @options.title %>]</title>
+
+ <link type="text/css" media="screen" href="<%= rel_prefix %>/rdoc.css" rel="stylesheet" />
+
+ <script src="<%= rel_prefix %>/js/jquery.js" type="text/javascript"
+ charset="utf-8"></script>
+ <script src="<%= rel_prefix %>/js/thickbox-compressed.js" type="text/javascript"
+ charset="utf-8"></script>
+ <script src="<%= rel_prefix %>/js/quicksearch.js" type="text/javascript"
+ charset="utf-8"></script>
+ <script src="<%= rel_prefix %>/js/darkfish.js" type="text/javascript"
+ charset="utf-8"></script>
+</head>
+
+<% if file.parser == RDoc::Parser::Simple %>
+<body class="file">
+ <div id="metadata">
+ <div id="home-metadata">
+ <div id="home-section" class="section">
+ <h3 class="section-header">
+ <a href="<%= rel_prefix %>/index.html">Home</a>
+ <a href="<%= rel_prefix %>/index.html#classes">Classes</a>
+ <a href="<%= rel_prefix %>/index.html#methods">Methods</a>
+ </h3>
+ </div>
+ </div>
+
+ <div id="project-metadata">
+ <% simple_files = @files.select { |f| f.parser == RDoc::Parser::Simple } %>
+ <% unless simple_files.empty? then %>
+ <div id="fileindex-section" class="section project-section">
+ <h3 class="section-header">Files</h3>
+ <ul>
+ <% simple_files.each do |f| %>
+ <li class="file"><a href="<%= rel_prefix %>/<%= f.path %>"><%= h f.base_name %></a></li>
+ <% end %>
+ </ul>
+ </div>
+ <% end %>
+
+ <div id="classindex-section" class="section project-section">
+ <h3 class="section-header">Class Index
+ <span class="search-toggle"><img src="<%= rel_prefix %>/images/find.png"
+ height="16" width="16" alt="[+]"
+ title="show/hide quicksearch" /></span></h3>
+ <form action="#" method="get" accept-charset="utf-8" class="initially-hidden">
+ <fieldset>
+ <legend>Quicksearch</legend>
+ <input type="text" name="quicksearch" value=""
+ class="quicksearch-field" />
+ </fieldset>
+ </form>
+
+ <ul class="link-list">
+ <% @modsort.each do |index_klass| %>
+ <li><a href="<%= rel_prefix %>/<%= index_klass.path %>"><%= index_klass.full_name %></a></li>
+ <% end %>
+ </ul>
+ <div id="no-class-search-results" style="display: none;">No matching classes.</div>
+ </div>
+
+ <% if $DEBUG_RDOC %>
+ <div id="debugging-toggle"><img src="<%= rel_prefix %>/images/bug.png"
+ alt="toggle debugging" height="16" width="16" /></div>
+ <% end %>
+ </div>
+ </div>
+
+ <div id="documentation">
+ <%= file.description %>
+ </div>
+
+ <div id="validator-badges">
+ <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+ <p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+ Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %></small>.</p>
+ </div>
+</body>
+<% else %>
+<body class="file file-popup">
+ <div id="metadata">
+ <dl>
+ <dt class="modified-date">Last Modified</dt>
+ <dd class="modified-date"><%= file.last_modified %></dd>
+
+ <% if file.requires %>
+ <dt class="requires">Requires</dt>
+ <dd class="requires">
+ <ul>
+ <% file.requires.each do |require| %>
+ <li><%= require.name %></li>
+ <% end %>
+ </ul>
+ </dd>
+ <% end %>
+
+ <% if @options.webcvs %>
+ <dt class="scs-url">Trac URL</dt>
+ <dd class="scs-url"><a target="_top"
+ href="<%= file.cvs_url %>"><%= file.cvs_url %></a></dd>
+ <% end %>
+ </dl>
+ </div>
+
+ <div id="documentation">
+ <% if file.comment %>
+ <div class="description">
+ <h2>Description</h2>
+ <%= file.description %>
+ </div>
+ <% end %>
+ </div>
+</body>
+<% end %>
+</html>
+
diff --git a/lib/rdoc/generator/template/darkfish/images/add.png b/lib/rdoc/generator/template/darkfish/images/add.png
deleted file mode 100755
index 6332fefea4..0000000000
--- a/lib/rdoc/generator/template/darkfish/images/add.png
+++ /dev/null
Binary files differ
diff --git a/lib/rdoc/generator/template/darkfish/images/arrow_up.png b/lib/rdoc/generator/template/darkfish/images/arrow_up.png
deleted file mode 100755
index 1ebb193243..0000000000
--- a/lib/rdoc/generator/template/darkfish/images/arrow_up.png
+++ /dev/null
Binary files differ
diff --git a/lib/rdoc/generator/template/darkfish/images/delete.png b/lib/rdoc/generator/template/darkfish/images/delete.png
deleted file mode 100755
index 08f249365a..0000000000
--- a/lib/rdoc/generator/template/darkfish/images/delete.png
+++ /dev/null
Binary files differ
diff --git a/lib/rdoc/generator/template/darkfish/images/tag_blue.png b/lib/rdoc/generator/template/darkfish/images/tag_blue.png
deleted file mode 100755
index 3f02b5f8f8..0000000000
--- a/lib/rdoc/generator/template/darkfish/images/tag_blue.png
+++ /dev/null
Binary files differ
diff --git a/lib/rdoc/generator/template/darkfish/images/transparent.png b/lib/rdoc/generator/template/darkfish/images/transparent.png
deleted file mode 100644
index d665e179ef..0000000000
--- a/lib/rdoc/generator/template/darkfish/images/transparent.png
+++ /dev/null
Binary files differ
diff --git a/lib/rdoc/generator/template/darkfish/index.rhtml b/lib/rdoc/generator/template/darkfish/index.rhtml
index d076c2a252..e853235ddb 100644
--- a/lib/rdoc/generator/template/darkfish/index.rhtml
+++ b/lib/rdoc/generator/template/darkfish/index.rhtml
@@ -1,19 +1,64 @@
-<body>
-<nav id="metadata">
- <%= render '_sidebar_navigation.rhtml' %>
-
- <%= render '_sidebar_search.rhtml' %>
-
- <div id="project-metadata">
- <%= render '_sidebar_pages.rhtml' %>
- <%= render '_sidebar_classes.rhtml' %>
- </div>
-</nav>
-
-<div id="documentation" class="description">
-<% if @options.main_page && main_page = @files.find { |f| f.full_name == @options.main_page } then %>
-<%= main_page.description %>
-<% else %>
-<p>This is the API documentation for <%= @title %>.
-<% end %>
-</div>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+ <meta content="text/html; charset=<%= @options.charset %>" http-equiv="Content-Type" />
+
+ <title><%= h @options.title %></title>
+
+ <link type="text/css" media="screen" href="rdoc.css" rel="stylesheet" />
+
+ <script src="js/jquery.js" type="text/javascript" charset="utf-8"></script>
+ <script src="js/thickbox-compressed.js" type="text/javascript" charset="utf-8"></script>
+ <script src="js/quicksearch.js" type="text/javascript" charset="utf-8"></script>
+ <script src="js/darkfish.js" type="text/javascript" charset="utf-8"></script>
+
+</head>
+<body class="indexpage">
+
+ <% $stderr.sync = true %>
+ <h1><%= h @options.title %></h1>
+
+ <% if @options.main_page && main_page = @files.find { |f| f.full_name == @options.main_page } %>
+ <div id="main">
+ <%= main_page.description.sub(%r{^\s*<h1.*?/h1>}i, '') %>
+ </div>
+ <% else %>
+ <p>This is the API documentation for '<%= @options.title %>'.</p>
+ <% end %>
+
+ <% simple_files = @files.select {|tl| tl.parser == RDoc::Parser::Simple } %>
+ <% unless simple_files.empty? then %>
+ <h2>Files</h2>
+ <ul>
+ <% simple_files.sort.each do |file| %>
+ <li class="file"><a href="<%= file.path %>"><%= h file.base_name %></a></li>
+ <% end %>
+ </ul>
+ <% end %>
+
+ <h2 id="classes">Classes/Modules</h2>
+ <ul>
+ <% @modsort.each do |klass| %>
+ <li class="<%= klass.type %>"><a href="<%= klass.path %>"><%= klass.full_name %></a></li>
+ <% end %>
+ </ul>
+
+ <h2 id="methods">Methods</h2>
+ <ul>
+ <% RDoc::TopLevel.all_classes_and_modules.map do |mod|
+ mod.method_list
+ end.flatten.sort.each do |method| %>
+ <li><a href="<%= method.path %>"><%= method.pretty_name %> &mdash; <%= method.parent.full_name %></a></li>
+ <% end %>
+ </ul>
+
+ <div id="validator-badges">
+ <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+ <p><small>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish
+ Rdoc Generator</a> <%= RDoc::Generator::Darkfish::VERSION %></small>.</p>
+ </div>
+</body>
+</html>
diff --git a/lib/rdoc/generator/template/darkfish/js/darkfish.js b/lib/rdoc/generator/template/darkfish/js/darkfish.js
index f26fd45d3a..84565c1e2d 100644
--- a/lib/rdoc/generator/template/darkfish/js/darkfish.js
+++ b/lib/rdoc/generator/template/darkfish/js/darkfish.js
@@ -9,12 +9,12 @@
/* Provide console simulation for firebug-less environments */
if (!("console" in window) || !("firebug" in console)) {
- var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
+ var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
"group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
- window.console = {};
- for (var i = 0; i < names.length; ++i)
- window.console[names[i]] = function() {};
+ window.console = {};
+ for (var i = 0; i < names.length; ++i)
+ window.console[names[i]] = function() {};
};
@@ -23,133 +23,94 @@ if (!("console" in window) || !("firebug" in console)) {
*/
$.fn.unwrap = function( expr ) {
return this.each( function() {
- $(this).parents( expr ).eq( 0 ).after( this ).remove();
+ $(this).parents( expr ).eq( 0 ).after( this ).remove();
});
};
function showSource( e ) {
- var target = e.target;
- var codeSections = $(target).
- parents('.method-detail').
- find('.method-source-code');
-
- $(target).
- parents('.method-detail').
- find('.method-source-code').
- slideToggle();
+ var target = e.target;
+ var codeSections = $(target).
+ parents('.method-detail').
+ find('.method-source-code');
+
+ $(target).
+ parents('.method-detail').
+ find('.method-source-code').
+ slideToggle();
};
function hookSourceViews() {
- $('.method-heading').click( showSource );
+ $('.method-description,.method-heading').click( showSource );
};
function toggleDebuggingSection() {
- $('.debugging-section').slideToggle();
+ $('.debugging-section').slideToggle();
};
function hookDebuggingToggle() {
- $('#debugging-toggle img').click( toggleDebuggingSection );
+ $('#debugging-toggle img').click( toggleDebuggingSection );
};
-function hookTableOfContentsToggle() {
- $('.indexpage li .toc-toggle').each( function() {
- $(this).click( function() {
- $(this).toggleClass('open');
- });
-
- var section = $(this).next();
-
- $(this).click( function() {
- section.slideToggle();
- });
- });
-}
-
-function hookSearch() {
- var input = $('#search-field').eq(0);
- var result = $('#search-results').eq(0);
- $(result).show();
-
- var search_section = $('#search-section').get(0);
- $(search_section).show();
-
- var search = new Search(search_data, input, result);
-
- search.renderItem = function(result) {
- var li = document.createElement('li');
- var html = '';
-
- // TODO add relative path to <script> per-page
- html += '<p class="search-match"><a href="' + rdoc_rel_prefix + result.path + '">' + this.hlt(result.title);
- if (result.params)
- html += '<span class="params">' + result.params + '</span>';
- html += '</a>';
-
-
- if (result.namespace)
- html += '<p class="search-namespace">' + this.hlt(result.namespace);
-
- if (result.snippet)
- html += '<div class="search-snippet">' + result.snippet + '</div>';
-
- li.innerHTML = html;
-
- return li;
- }
-
- search.select = function(result) {
- var result_element = result.get(0);
- window.location.href = result_element.firstChild.firstChild.href;
- }
-
- search.scrollIntoView = search.scrollInWindow;
+function hookQuickSearch() {
+ $('.quicksearch-field').each( function() {
+ var searchElems = $(this).parents('.section').find( 'li' );
+ var toggle = $(this).parents('.section').find('h3 .search-toggle');
+ // console.debug( "Toggle is: %o", toggle );
+ var qsbox = $(this).parents('form').get( 0 );
+
+ $(this).quicksearch( this, searchElems, {
+ noSearchResultsIndicator: 'no-class-search-results',
+ focusOnLoad: false
+ });
+ $(toggle).click( function() {
+ // console.debug( "Toggling qsbox: %o", qsbox );
+ $(qsbox).toggle();
+ });
+ });
};
function highlightTarget( anchor ) {
- console.debug( "Highlighting target '%s'.", anchor );
-
- $("a[name]").each( function() {
- if ( $(this).attr("name") == anchor ) {
- if ( !$(this).parent().parent().hasClass('target-section') ) {
- console.debug( "Wrapping the target-section" );
- $('div.method-detail').unwrap( 'div.target-section' );
- $(this).parent().wrap( '<div class="target-section"></div>' );
- } else {
- console.debug( "Already wrapped." );
- }
- }
- });
+ console.debug( "Highlighting target '%s'.", anchor );
+
+ $("a[name=" + anchor + "]").each( function() {
+ if ( !$(this).parent().parent().hasClass('target-section') ) {
+ console.debug( "Wrapping the target-section" );
+ $('div.method-detail').unwrap( 'div.target-section' );
+ $(this).parent().wrap( '<div class="target-section"></div>' );
+ } else {
+ console.debug( "Already wrapped." );
+ }
+ });
};
function highlightLocationTarget() {
- console.debug( "Location hash: %s", window.location.hash );
- if ( ! window.location.hash || window.location.hash.length == 0 ) return;
+ console.debug( "Location hash: %s", window.location.hash );
+ if ( ! window.location.hash || window.location.hash.length == 0 ) return;
- var anchor = window.location.hash.substring(1);
- console.debug( "Found anchor: %s; matching %s", anchor, "a[name=" + anchor + "]" );
+ var anchor = window.location.hash.substring(1);
+ console.debug( "Found anchor: %s; matching %s", anchor, "a[name=" + anchor + "]" );
- highlightTarget( anchor );
+ highlightTarget( anchor );
};
function highlightClickTarget( event ) {
- console.debug( "Highlighting click target for event %o", event.target );
- try {
- var anchor = $(event.target).attr( 'href' ).substring(1);
- console.debug( "Found target anchor: %s", anchor );
- highlightTarget( anchor );
- } catch ( err ) {
- console.error( "Exception while highlighting: %o", err );
- };
+ console.debug( "Highlighting click target for event %o", event.target );
+ try {
+ var anchor = $(event.target).attr( 'href' ).substring(1);
+ console.debug( "Found target anchor: %s", anchor );
+ highlightTarget( anchor );
+ } catch ( err ) {
+ console.error( "Exception while highlighting: %o", err );
+ };
};
$(document).ready( function() {
- hookSourceViews();
- hookDebuggingToggle();
- hookSearch();
- highlightLocationTarget();
- hookTableOfContentsToggle();
+ hookSourceViews();
+ hookDebuggingToggle();
+ hookQuickSearch();
+ highlightLocationTarget();
- $('ul.link-list a').bind( "click", highlightClickTarget );
+ $('ul.link-list a').bind( "click", highlightClickTarget );
});
diff --git a/lib/rdoc/generator/template/darkfish/js/jquery.js b/lib/rdoc/generator/template/darkfish/js/jquery.js
index 628ed9b316..afe9e74c90 100644
--- a/lib/rdoc/generator/template/darkfish/js/jquery.js
+++ b/lib/rdoc/generator/template/darkfish/js/jquery.js
@@ -1,4 +1,32 @@
-/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */
-(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bA.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bW(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bP,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bW(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bW(a,c,d,e,"*",g));return l}function bV(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bL),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function by(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bt:bu;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bf(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function V(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(Q.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(w,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:H?function(a){return a==null?"":H.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?F.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(!b)return-1;if(I)return I.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=G.call(arguments,2),g=function(){return a.apply(c,f.concat(G.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){J["[object "+b+"]"]=b.toLowerCase()}),A=e.uaMatch(z),A.browser&&(e.browser[A.browser]=!0,e.browser.version=A.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?C=function(){c.removeEventListener("DOMContentLoaded",C,!1),e.ready()}:c.attachEvent&&(C=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",C),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g+"With"](this===b?d:this,[h])}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML=" <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u,v;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete
-t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,M(a.origType,a.selector),f.extend({},a,{handler:L,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,M(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?D:C):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=D;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=D;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=D,this.stopPropagation()},isDefaultPrevented:C,isPropagationStopped:C,isImmediatePropagationStopped:C};var E=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},F=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?F:E,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?F:E)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")||f.nodeName(b,"button")?b.type:"";(c==="submit"||c==="image")&&f(b).closest("form").length&&J("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")||f.nodeName(b,"button")?b.type:"";(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&J("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var G,H=function(a){var b=f.nodeName(a,"input")?a.type:"",c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var K={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||C,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=w.exec(h),k="",j&&(k=j[0],h=h.replace(w,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,K[h]?(a.push(K[h]+k),h=h+k):h=(K[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+M(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+M(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var N=/Until$/,O=/^(?:parents|prevUntil|prevAll)/,P=/,/,Q=/^.[^:#\[\.,]*$/,R=Array.prototype.slice,S=f.expr.match.POS,T={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(V(this,a,!1),"not",a)},filter:function(a){return this.pushStack(V(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=S.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|object|embed|option|style)/i,bb=/checked\s*(?:[^=]|=\s*.checked.)/i,bc=/\/(java|ecma)script/i,bd=/^\s*<!(?:\[CDATA\[|\-\-)/,be={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bb.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bf(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bl)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!ba.test(a[0])&&(f.support.checkClone||!bb.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean
-(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bk(k[i]);else bk(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bc.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bm=/alpha\([^)]*\)/i,bn=/opacity=([^)]*)/,bo=/([A-Z]|^ms)/g,bp=/^-?\d+(?:px)?$/i,bq=/^-?\d/,br=/^([\-+])=([\-+.\de]+)/,bs={position:"absolute",visibility:"hidden",display:"block"},bt=["Left","Right"],bu=["Top","Bottom"],bv,bw,bx;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bv(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=br.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bv)return bv(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return by(a,b,d);f.swap(a,bs,function(){e=by(a,b,d)});return e}},set:function(a,b){if(!bp.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cr(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cq("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cq("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cr(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cq("show",1),slideUp:cq("hide",1),slideToggle:cq("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return d.step(a)}var d=this,e=f.fx;this.startTime=cn||co(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&f.timers.push(g)&&!cl&&(cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||co(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cs=/^t(?:able|d|h)$/i,ct=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cu(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cs.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file
+/*
+ * jQuery 1.2.6 - New Wave Javascript
+ *
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2008-09-25 09:50:52 -0700 (Thu, 25 Sep 2008) $
+ * $Rev: 38 $
+ */
+(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
+return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
+return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
+selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
+return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
+this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
+return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
+jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
+script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
+for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
+for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
+jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
+ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
+while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
+while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
+for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
+jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
+xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
+jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
+for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
+s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
+e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); \ No newline at end of file
diff --git a/lib/rdoc/generator/template/darkfish/js/quicksearch.js b/lib/rdoc/generator/template/darkfish/js/quicksearch.js
new file mode 100644
index 0000000000..70dbd33cd9
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/quicksearch.js
@@ -0,0 +1,114 @@
+/**
+ *
+ * JQuery QuickSearch - Hook up a form field to hide non-matching elements.
+ * $Id: quicksearch.js 53 2009-01-07 02:52:03Z deveiant $
+ *
+ * Author: Michael Granger <mgranger@laika.com>
+ *
+ */
+jQuery.fn.quicksearch = function( target, searchElems, options ) {
+ // console.debug( "Quicksearch fn" );
+
+ var settings = {
+ delay: 250,
+ clearButton: false,
+ highlightMatches: false,
+ focusOnLoad: false,
+ noSearchResultsIndicator: null
+ };
+ if ( options ) $.extend( settings, options );
+
+ return jQuery(this).each( function() {
+ // console.debug( "Creating a new quicksearch on %o for %o", this, searchElems );
+ new jQuery.quicksearch( this, searchElems, settings );
+ });
+};
+
+
+jQuery.quicksearch = function( searchBox, searchElems, settings ) {
+ var timeout;
+ var boxdiv = $(searchBox).parents('div').eq(0);
+
+ function init() {
+ setupKeyEventHandlers();
+ focusOnLoad();
+ };
+
+ function setupKeyEventHandlers() {
+ // console.debug( "Hooking up the 'keypress' event to %o", searchBox );
+ $(searchBox).
+ unbind( 'keyup' ).
+ keyup( function(e) { return onSearchKey( e.keyCode ); });
+ $(searchBox).
+ unbind( 'keypress' ).
+ keypress( function(e) {
+ switch( e.which ) {
+ // Execute the search on Enter, Tab, or Newline
+ case 9:
+ case 13:
+ case 10:
+ clearTimeout( timeout );
+ e.preventDefault();
+ doQuickSearch();
+ break;
+
+ // Allow backspace
+ case 8:
+ return true;
+ break;
+
+ // Only allow valid search characters
+ default:
+ return validQSChar( e.charCode );
+ }
+ });
+ };
+
+ function focusOnLoad() {
+ if ( !settings.focusOnLoad ) return false;
+ $(searchBox).focus();
+ };
+
+ function onSearchKey ( code ) {
+ clearTimeout( timeout );
+ // console.debug( "...scheduling search." );
+ timeout = setTimeout( doQuickSearch, settings.delay );
+ };
+
+ function validQSChar( code ) {
+ var c = String.fromCharCode( code );
+ return (
+ (c == ':') ||
+ (c >= 'a' && c <= 'z') ||
+ (c >= 'A' && c <= 'Z')
+ );
+ };
+
+ function doQuickSearch() {
+ var searchText = searchBox.value;
+ var pat = new RegExp( searchText, "im" );
+ var shownCount = 0;
+
+ if ( settings.noSearchResultsIndicator ) {
+ $('#' + settings.noSearchResultsIndicator).hide();
+ }
+
+ // All elements start out hidden
+ $(searchElems).each( function(index) {
+ var str = $(this).text();
+
+ if ( pat.test(str) ) {
+ shownCount += 1;
+ $(this).fadeIn();
+ } else {
+ $(this).hide();
+ }
+ });
+
+ if ( shownCount == 0 && settings.noSearchResultsIndicator ) {
+ $('#' + settings.noSearchResultsIndicator).slideDown();
+ }
+ };
+
+ init();
+};
diff --git a/lib/rdoc/generator/template/darkfish/js/search.js b/lib/rdoc/generator/template/darkfish/js/search.js
deleted file mode 100644
index dbdfdcbc4c..0000000000
--- a/lib/rdoc/generator/template/darkfish/js/search.js
+++ /dev/null
@@ -1,94 +0,0 @@
-Search = function(data, input, result) {
- this.data = data;
- this.$input = $(input);
- this.$result = $(result);
-
- this.$current = null;
- this.$view = this.$result.parent();
- this.searcher = new Searcher(data.index);
- this.init();
-}
-
-Search.prototype = $.extend({}, Navigation, new function() {
- var suid = 1;
-
- this.init = function() {
- var _this = this;
- var observer = function() {
- _this.search(_this.$input[0].value);
- };
- this.$input.keyup(observer);
- this.$input.click(observer); // mac's clear field
-
- this.searcher.ready(function(results, isLast) {
- _this.addResults(results, isLast);
- })
-
- this.initNavigation();
- this.setNavigationActive(false);
- }
-
- this.search = function(value, selectFirstMatch) {
- value = jQuery.trim(value).toLowerCase();
- if (value) {
- this.setNavigationActive(true);
- } else {
- this.setNavigationActive(false);
- }
-
- if (value == '') {
- this.lastQuery = value;
- this.$result.empty();
- this.setNavigationActive(false);
- } else if (value != this.lastQuery) {
- this.lastQuery = value;
- this.firstRun = true;
- this.searcher.find(value);
- }
- }
-
- this.addResults = function(results, isLast) {
- var target = this.$result.get(0);
- if (this.firstRun && (results.length > 0 || isLast)) {
- this.$current = null;
- this.$result.empty();
- }
-
- for (var i=0, l = results.length; i < l; i++) {
- target.appendChild(this.renderItem.call(this, results[i]));
- };
-
- if (this.firstRun && results.length > 0) {
- this.firstRun = false;
- this.$current = $(target.firstChild);
- this.$current.addClass('current');
- }
- if (jQuery.browser.msie) this.$element[0].className += '';
- }
-
- this.move = function(isDown) {
- if (!this.$current) return;
- var $next = this.$current[isDown ? 'next' : 'prev']();
- if ($next.length) {
- this.$current.removeClass('current');
- $next.addClass('current');
- this.scrollIntoView($next[0], this.$view[0]);
- this.$current = $next;
- }
- return true;
- }
-
- this.hlt = function(html) {
- return this.escapeHTML(html).
- replace(/\u0001/g, '<em>').
- replace(/\u0002/g, '</em>');
- }
-
- this.escapeHTML = function(html) {
- return html.replace(/[&<>]/g, function(c) {
- return '&#' + c.charCodeAt(0) + ';';
- });
- }
-
-});
-
diff --git a/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js b/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js
new file mode 100644
index 0000000000..3a3fdae1fb
--- /dev/null
+++ b/lib/rdoc/generator/template/darkfish/js/thickbox-compressed.js
@@ -0,0 +1,10 @@
+/*
+ * Thickbox 3 - One Box To Rule Them All.
+ * By Cody Lindley (http://www.codylindley.com)
+ * Copyright (c) 2007 cody lindley
+ * Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+var tb_pathToImage = "../images/loadingAnimation.gif";
+
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('$(o).2S(9(){1u(\'a.18, 3n.18, 3i.18\');1w=1p 1t();1w.L=2H});9 1u(b){$(b).s(9(){6 t=X.Q||X.1v||M;6 a=X.u||X.23;6 g=X.1N||P;19(t,a,g);X.2E();H P})}9 19(d,f,g){3m{3(2t o.v.J.2i==="2g"){$("v","11").r({A:"28%",z:"28%"});$("11").r("22","2Z");3(o.1Y("1F")===M){$("v").q("<U 5=\'1F\'></U><4 5=\'B\'></4><4 5=\'8\'></4>");$("#B").s(G)}}n{3(o.1Y("B")===M){$("v").q("<4 5=\'B\'></4><4 5=\'8\'></4>");$("#B").s(G)}}3(1K()){$("#B").1J("2B")}n{$("#B").1J("2z")}3(d===M){d=""}$("v").q("<4 5=\'K\'><1I L=\'"+1w.L+"\' /></4>");$(\'#K\').2y();6 h;3(f.O("?")!==-1){h=f.3l(0,f.O("?"))}n{h=f}6 i=/\\.2s$|\\.2q$|\\.2m$|\\.2l$|\\.2k$/;6 j=h.1C().2h(i);3(j==\'.2s\'||j==\'.2q\'||j==\'.2m\'||j==\'.2l\'||j==\'.2k\'){1D="";1G="";14="";1z="";1x="";R="";1n="";1r=P;3(g){E=$("a[@1N="+g+"]").36();25(D=0;((D<E.1c)&&(R===""));D++){6 k=E[D].u.1C().2h(i);3(!(E[D].u==f)){3(1r){1z=E[D].Q;1x=E[D].u;R="<1e 5=\'1X\'>&1d;&1d;<a u=\'#\'>2T &2R;</a></1e>"}n{1D=E[D].Q;1G=E[D].u;14="<1e 5=\'1U\'>&1d;&1d;<a u=\'#\'>&2O; 2N</a></1e>"}}n{1r=1b;1n="1t "+(D+1)+" 2L "+(E.1c)}}}S=1p 1t();S.1g=9(){S.1g=M;6 a=2x();6 x=a[0]-1M;6 y=a[1]-1M;6 b=S.z;6 c=S.A;3(b>x){c=c*(x/b);b=x;3(c>y){b=b*(y/c);c=y}}n 3(c>y){b=b*(y/c);c=y;3(b>x){c=c*(x/b);b=x}}13=b+30;1a=c+2G;$("#8").q("<a u=\'\' 5=\'1L\' Q=\'1o\'><1I 5=\'2F\' L=\'"+f+"\' z=\'"+b+"\' A=\'"+c+"\' 23=\'"+d+"\'/></a>"+"<4 5=\'2D\'>"+d+"<4 5=\'2C\'>"+1n+14+R+"</4></4><4 5=\'2A\'><a u=\'#\' 5=\'Z\' Q=\'1o\'>1l</a> 1k 1j 1s</4>");$("#Z").s(G);3(!(14==="")){9 12(){3($(o).N("s",12)){$(o).N("s",12)}$("#8").C();$("v").q("<4 5=\'8\'></4>");19(1D,1G,g);H P}$("#1U").s(12)}3(!(R==="")){9 1i(){$("#8").C();$("v").q("<4 5=\'8\'></4>");19(1z,1x,g);H P}$("#1X").s(1i)}o.1h=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}n 3(I==3k){3(!(R=="")){o.1h="";1i()}}n 3(I==3j){3(!(14=="")){o.1h="";12()}}};16();$("#K").C();$("#1L").s(G);$("#8").r({Y:"T"})};S.L=f}n{6 l=f.2r(/^[^\\?]+\\??/,\'\');6 m=2p(l);13=(m[\'z\']*1)+30||3h;1a=(m[\'A\']*1)+3g||3f;W=13-30;V=1a-3e;3(f.O(\'2j\')!=-1){1E=f.1B(\'3d\');$("#15").C();3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"</4><4 5=\'2e\'><a u=\'#\' 5=\'Z\' Q=\'1o\'>1l</a> 1k 1j 1s</4></4><U 1W=\'0\' 2d=\'0\' L=\'"+1E[0]+"\' 5=\'15\' 1v=\'15"+1f.2c(1f.1y()*2b)+"\' 1g=\'1m()\' J=\'z:"+(W+29)+"p;A:"+(V+17)+"p;\' > </U>")}n{$("#B").N();$("#8").q("<U 1W=\'0\' 2d=\'0\' L=\'"+1E[0]+"\' 5=\'15\' 1v=\'15"+1f.2c(1f.1y()*2b)+"\' 1g=\'1m()\' J=\'z:"+(W+29)+"p;A:"+(V+17)+"p;\'> </U>")}}n{3($("#8").r("Y")!="T"){3(m[\'1A\']!="1b"){$("#8").q("<4 5=\'2f\'><4 5=\'1H\'>"+d+"</4><4 5=\'2e\'><a u=\'#\' 5=\'Z\'>1l</a> 1k 1j 1s</4></4><4 5=\'F\' J=\'z:"+W+"p;A:"+V+"p\'></4>")}n{$("#B").N();$("#8").q("<4 5=\'F\' 3c=\'3b\' J=\'z:"+W+"p;A:"+V+"p;\'></4>")}}n{$("#F")[0].J.z=W+"p";$("#F")[0].J.A=V+"p";$("#F")[0].3a=0;$("#1H").11(d)}}$("#Z").s(G);3(f.O(\'37\')!=-1){$("#F").q($(\'#\'+m[\'26\']).1T());$("#8").24(9(){$(\'#\'+m[\'26\']).q($("#F").1T())});16();$("#K").C();$("#8").r({Y:"T"})}n 3(f.O(\'2j\')!=-1){16();3($.1q.35){$("#K").C();$("#8").r({Y:"T"})}}n{$("#F").34(f+="&1y="+(1p 33().32()),9(){16();$("#K").C();1u("#F a.18");$("#8").r({Y:"T"})})}}3(!m[\'1A\']){o.21=9(e){3(e==M){I=2w.2v}n{I=e.2u}3(I==27){G()}}}}31(e){}}9 1m(){$("#K").C();$("#8").r({Y:"T"})}9 G(){$("#2Y").N("s");$("#Z").N("s");$("#8").2X("2W",9(){$(\'#8,#B,#1F\').2V("24").N().C()});$("#K").C();3(2t o.v.J.2i=="2g"){$("v","11").r({A:"1Z",z:"1Z"});$("11").r("22","")}o.1h="";o.21="";H P}9 16(){$("#8").r({2U:\'-\'+20((13/2),10)+\'p\',z:13+\'p\'});3(!(1V.1q.2Q&&1V.1q.2P<7)){$("#8").r({38:\'-\'+20((1a/2),10)+\'p\'})}}9 2p(a){6 b={};3(!a){H b}6 c=a.1B(/[;&]/);25(6 i=0;i<c.1c;i++){6 d=c[i].1B(\'=\');3(!d||d.1c!=2){39}6 e=2a(d[0]);6 f=2a(d[1]);f=f.2r(/\\+/g,\' \');b[e]=f}H b}9 2x(){6 a=o.2M;6 w=1S.2o||1R.2o||(a&&a.1Q)||o.v.1Q;6 h=1S.1P||1R.1P||(a&&a.2n)||o.v.2n;1O=[w,h];H 1O}9 1K(){6 a=2K.2J.1C();3(a.O(\'2I\')!=-1&&a.O(\'3o\')!=-1){H 1b}}',62,211,'|||if|div|id|var||TB_window|function||||||||||||||else|document|px|append|css|click||href|body||||width|height|TB_overlay|remove|TB_Counter|TB_TempArray|TB_ajaxContent|tb_remove|return|keycode|style|TB_load|src|null|unbind|indexOf|false|title|TB_NextHTML|imgPreloader|block|iframe|ajaxContentH|ajaxContentW|this|display|TB_closeWindowButton||html|goPrev|TB_WIDTH|TB_PrevHTML|TB_iframeContent|tb_position||thickbox|tb_show|TB_HEIGHT|true|length|nbsp|span|Math|onload|onkeydown|goNext|Esc|or|close|tb_showIframe|TB_imageCount|Close|new|browser|TB_FoundURL|Key|Image|tb_init|name|imgLoader|TB_NextURL|random|TB_NextCaption|modal|split|toLowerCase|TB_PrevCaption|urlNoQuery|TB_HideSelect|TB_PrevURL|TB_ajaxWindowTitle|img|addClass|tb_detectMacXFF|TB_ImageOff|150|rel|arrayPageSize|innerHeight|clientWidth|self|window|children|TB_prev|jQuery|frameborder|TB_next|getElementById|auto|parseInt|onkeyup|overflow|alt|unload|for|inlineId||100||unescape|1000|round|hspace|TB_closeAjaxWindow|TB_title|undefined|match|maxHeight|TB_iframe|bmp|gif|png|clientHeight|innerWidth|tb_parseQuery|jpeg|replace|jpg|typeof|which|keyCode|event|tb_getPageSize|show|TB_overlayBG|TB_closeWindow|TB_overlayMacFFBGHack|TB_secondLine|TB_caption|blur|TB_Image|60|tb_pathToImage|mac|userAgent|navigator|of|documentElement|Prev|lt|version|msie|gt|ready|Next|marginLeft|trigger|fast|fadeOut|TB_imageOff|hidden||catch|getTime|Date|load|safari|get|TB_inline|marginTop|continue|scrollTop|TB_modal|class|TB_|45|440|40|630|input|188|190|substr|try|area|firefox'.split('|'),0,{})) \ No newline at end of file
diff --git a/lib/rdoc/generator/template/darkfish/page.rhtml b/lib/rdoc/generator/template/darkfish/page.rhtml
deleted file mode 100644
index 942172919b..0000000000
--- a/lib/rdoc/generator/template/darkfish/page.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<body class="file">
-<nav id="metadata">
- <%= render '_sidebar_navigation.rhtml' %>
-
- <%= render '_sidebar_search.rhtml' %>
-
- <%= render '_sidebar_table_of_contents.rhtml' %>
-
- <div id="project-metadata">
- <%= render '_sidebar_pages.rhtml' %>
- <%= render '_sidebar_classes.rhtml' %>
- </div>
-</nav>
-
-<div id="documentation" class="description">
- <%= file.description %>
-</div>
-
diff --git a/lib/rdoc/generator/template/darkfish/rdoc.css b/lib/rdoc/generator/template/darkfish/rdoc.css
index 35207033de..ffe996001a 100644
--- a/lib/rdoc/generator/template/darkfish/rdoc.css
+++ b/lib/rdoc/generator/template/darkfish/rdoc.css
@@ -6,204 +6,175 @@
*
*/
-/* vim: ft=css et sw=2 ts=2 sts=2 */
/* Base Green is: #6C8C22 */
-* { padding: 0; margin: 0; }
+*{ padding: 0; margin: 0; }
body {
background: #efefef;
- font: 14px "Helvetica Neue", Helvetica, Tahoma, sans-serif;
- margin-left: 40px;
+ font: 14px "Helvetica Neue", Helvetica, Tahoma, sans-serif;
+}
+body.class, body.module, body.file {
+ margin-left: 40px;
}
body.file-popup {
- font-size: 90%;
- margin-left: 0;
+ font-size: 90%;
+ margin-left: 0;
}
h1 {
- font-size: 300%;
- text-shadow: rgba(135,145,135,0.65) 2px 2px 3px;
- color: #6C8C22;
+ font-size: 300%;
+ text-shadow: rgba(135,145,135,0.65) 2px 2px 3px;
+ color: #6C8C22;
}
h2,h3,h4 { margin-top: 1.5em; }
-h1 span,
-h2 span,
-h3 span,
-h4 span,
-h5 span,
-h6 span {
- display: none;
- padding-left: 1em;
- font-size: 50%;
- vertical-align: super;
-}
-
-h1:hover span,
-h2:hover span,
-h3:hover span,
-h4:hover span,
-h5:hover span,
-h6:hover span {
- display: inline;
-}
-
:link,
:visited {
- color: #6C8C22;
- text-decoration: none;
+ color: #6C8C22;
+ text-decoration: none;
}
:link:hover,
:visited:hover {
- border-bottom: 1px dotted #6C8C22;
+ border-bottom: 1px dotted #6C8C22;
}
pre {
- background: #ddd;
- padding: 0.5em 0;
+ background: #ddd;
+ padding: 0.5em 0;
}
-blockquote {
- background: #ddd;
- margin: 1em;
- padding: 0.25em;
-}
-
-blockquote > :first-child {
- margin-top: 0 !important;
-}
/* @group Generic Classes */
.initially-hidden {
- display: none;
+ display: none;
}
-#search-field {
- width: 98%;
- background: #eee;
- border: none;
- height: 1.5em;
- -webkit-border-radius: 4px;
-}
-#search-field:focus {
- background: #f1edba;
+.quicksearch-field {
+ width: 98%;
+ background: #ddd;
+ border: 1px solid #aaa;
+ height: 1.5em;
+ -webkit-border-radius: 4px;
}
-#search-field:-moz-placeholder,
-#search-field::-webkit-input-placeholder {
- font-weight: bold;
- color: #666;
+.quicksearch-field:focus {
+ background: #f1edba;
}
.missing-docs {
- font-size: 120%;
- background: white url(images/wrench_orange.png) no-repeat 4px center;
- color: #ccc;
- line-height: 2em;
- border: 1px solid #d00;
- opacity: 1;
- padding-left: 20px;
- text-indent: 24px;
- letter-spacing: 3px;
- font-weight: bold;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
+ font-size: 120%;
+ background: white url(images/wrench_orange.png) no-repeat 4px center;
+ color: #ccc;
+ line-height: 2em;
+ border: 1px solid #d00;
+ opacity: 1;
+ padding-left: 20px;
+ text-indent: 24px;
+ letter-spacing: 3px;
+ font-weight: bold;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
}
.target-section {
- border: 2px solid #dcce90;
- border-left-width: 8px;
- padding: 0 1em;
- background: #fff3c2;
+ border: 2px solid #dcce90;
+ border-left-width: 8px;
+ padding: 0 1em;
+ background: #fff3c2;
}
/* @end */
+
/* @group Index Page, Standalone file pages */
-.indexpage ul {
- line-height: 160%;
- list-style: none;
+body.indexpage {
+ margin: 1em 3em;
}
-.indexpage ul :link,
-.indexpage ul :visited {
- font-size: 16px;
+body.indexpage p,
+body.indexpage div,
+body.file p {
+ margin: 1em 0;
}
-.indexpage li {
- padding-left: 20px;
+.indexpage ul,
+.file #documentation ul {
+ line-height: 160%;
+ list-style: none;
}
-
-.indexpage ul > li {
- background: url(images/bullet_black.png) no-repeat left 4px;
+.indexpage ul :link,
+.indexpage ul :visited {
+ font-size: 16px;
}
-.indexpage li.method {
- background: url(images/plugin.png) no-repeat left 4px;
+
+.indexpage li,
+.file #documentation li {
+ padding-left: 20px;
+ background: url(images/bullet_black.png) no-repeat left 4px;
}
.indexpage li.module {
- background: url(images/package.png) no-repeat left 4px;
+ background: url(images/package.png) no-repeat left 4px;
}
.indexpage li.class {
- background: url(images/ruby.png) no-repeat left 4px;
+ background: url(images/ruby.png) no-repeat left 4px;
}
.indexpage li.file {
- background: url(images/page_white_text.png) no-repeat left 4px;
-}
-.indexpage li li {
- background: url(images/tag_blue.png) no-repeat left 4px;
+ background: url(images/page_white_text.png) no-repeat left 4px;
}
-.indexpage li .toc-toggle {
- width: 16px;
- height: 16px;
- background: url(images/add.png) no-repeat;
-}
-
-.indexpage li .toc-toggle.open {
- background: url(images/delete.png) no-repeat;
+.file li p,
+.indexpage li p {
+ margin: 0 0;
}
/* @end */
/* @group Top-Level Structure */
-#metadata {
- float: left;
- width: 260px;
+.class #metadata,
+.file #metadata,
+.module #metadata {
+ float: left;
+ width: 260px;
}
-#documentation {
- margin: 2em 1em 5em 300px;
- min-width: 340px;
+.class #documentation,
+.file #documentation,
+.module #documentation {
+ margin: 2em 1em 5em 300px;
+ min-width: 340px;
+}
+
+.file #metadata {
+ margin: 0.8em;
}
#validator-badges {
- clear: both;
- margin: 1em 1em 2em;
- font-size: smaller;
+ clear: both;
+ margin: 1em 1em 2em;
}
/* @end */
/* @group Metadata Section */
#metadata .section {
- background-color: #dedede;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border: 1px solid #aaa;
- margin: 0 8px 8px;
- font-size: 90%;
- overflow: hidden;
+ background-color: #dedede;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border: 1px solid #aaa;
+ margin: 0 8px 16px;
+ font-size: 90%;
+ overflow: hidden;
}
#metadata h3.section-header {
- margin: 0;
- padding: 2px 8px;
- background: #ccc;
- color: #666;
- -moz-border-radius-topleft: 4px;
- -moz-border-radius-topright: 4px;
- -webkit-border-top-left-radius: 4px;
- -webkit-border-top-right-radius: 4px;
- border-bottom: 1px solid #aaa;
+ margin: 0;
+ padding: 2px 8px;
+ background: #ccc;
+ color: #666;
+ -moz-border-radius-topleft: 4px;
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-left-radius: 4px;
+ -webkit-border-top-right-radius: 4px;
+ border-bottom: 1px solid #aaa;
}
#metadata #home-section h3.section-header {
border-bottom: 0;
@@ -212,384 +183,524 @@ blockquote > :first-child {
#metadata ul,
#metadata dl,
#metadata p {
- padding: 8px;
- list-style: none;
-}
-
-#file-metadata {
- margin-top: 2em;
+ padding: 8px;
+ list-style: none;
}
#file-metadata ul {
- padding-left: 28px;
- list-style-image: url(images/page_green.png);
-}
-
-#table-of-contents {
- margin-top: 2em;
-}
-
-#table-of-contents ul {
- padding-left: 28px;
- list-style-image: url(images/tag_blue.png);
+ padding-left: 28px;
+ list-style-image: url(images/page_green.png);
}
dl.svninfo {
- color: #666;
- margin: 0;
+ color: #666;
+ margin: 0;
}
dl.svninfo dt {
- font-weight: bold;
+ font-weight: bold;
}
ul.link-list li {
- white-space: nowrap;
- line-height: 20px;
+ white-space: nowrap;
}
-
ul.link-list .type {
- font-size: 8px;
- text-transform: uppercase;
- color: white;
- background: #969696;
- padding: 2px 4px;
- -webkit-border-radius: 5px;
-}
-
-.calls-super {
- background: url(images/arrow_up.png) no-repeat right center;
+ font-size: 8px;
+ text-transform: uppercase;
+ color: white;
+ background: #969696;
+ padding: 2px 4px;
+ -webkit-border-radius: 5px;
}
/* @end */
-/* @group Class Metadata Section */
-#class-metadata {
- margin-top: 2em;
-}
-/* @end */
/* @group Project Metadata Section */
#project-metadata {
- margin-top: 2em;
+ margin-top: 3em;
+}
+
+.file #project-metadata {
+ margin-top: 0em;
}
#project-metadata .section {
- border: 1px solid #aaa;
+ border: 1px solid #aaa;
}
#project-metadata h3.section-header {
- border-bottom: 1px solid #aaa;
- position: relative;
+ border-bottom: 1px solid #aaa;
+ position: relative;
+}
+#project-metadata h3.section-header .search-toggle {
+ position: absolute;
+ right: 5px;
}
+
#project-metadata form {
- color: #777;
- background: #ccc;
+ color: #777;
+ background: #ccc;
+ padding: 8px 8px 16px;
+ border-bottom: 1px solid #bbb;
+}
+#project-metadata fieldset {
+ border: 0;
+}
+
+#no-class-search-results {
+ margin: 0 auto 1em;
+ text-align: center;
+ font-size: 14px;
+ font-weight: bold;
+ color: #aaa;
}
/* @end */
+
/* @group Documentation Section */
-.description {
- font-size: 100%;
- color: #333;
+#description {
+ font-size: 100%;
+ color: #333;
}
-.description p {
- margin: 1em 0.4em;
+#description p {
+ margin: 1em 0.4em;
}
-.description li p {
+#description li p {
margin: 0;
}
-.description ol,
-.description ul {
- margin-left: 1.5em;
+#description ul {
+ margin-left: 1.5em;
}
-.description ol li,
-.description ul li {
- line-height: 1.4em;
+#description ul li {
+ line-height: 1.4em;
}
-.note-list {
- margin: 8px 0;
+#description dl,
+#documentation dl {
+ margin: 8px 1.5em;
+ border: 1px solid #ccc;
}
-
-.label-list {
- margin: 8px 1.5em;
- border: 1px solid #ccc;
-}
-.description .label-list {
- font-size: 14px;
-}
-
-.note-list dt {
- font-weight: bold;
-}
-.note-list dd {
- padding: 0 12px;
+#description dl {
+ font-size: 14px;
}
-.label-list dt {
- padding: 2px 4px;
- font-weight: bold;
- background: #ddd;
+#description dt,
+#documentation dt {
+ padding: 2px 4px;
+ font-weight: bold;
+ background: #ddd;
}
-.label-list dd {
- padding: 2px 12px;
+#description dd,
+#documentation dd {
+ padding: 2px 12px;
}
-.label-list dd + dt,
-.note-list dd + dt {
- margin-top: 0.7em;
+#description dd + dt,
+#documentation dd + dt {
+ margin-top: 0.7em;
}
#documentation .section {
- font-size: 90%;
-}
-
-#documentation h2.section-header {
- margin-top: 1em;
- padding: 0.25em 0.5em;
- background: #ccc;
- color: #333;
- font-size: 175%;
- border: 1px solid #bbb;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
+ font-size: 90%;
}
-
-.documentation-section-title {
- position: relative;
-}
-.documentation-section-title .section-click-top {
- position: absolute;
- top: 6px;
- right: 12px;
- font-size: 10px;
- color: #9b9877;
- visibility: hidden;
- padding-right: 0.5px;
-}
-
-.documentation-section-title:hover .section-click-top {
- visibility: visible;
-}
-
#documentation h3.section-header {
- margin-top: 1em;
- padding: 0.25em 0.5em;
- background-color: #dedede;
- color: #333;
- font-size: 150%;
- border: 1px solid #bbb;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
+ margin-top: 2em;
+ padding: 0.75em 0.5em;
+ background-color: #dedede;
+ color: #333;
+ font-size: 150%;
+ border: 1px solid #bbb;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
}
#constants-list > dl,
#attributes-list > dl {
- margin: 1em 0 2em;
- border: 0;
+ margin: 1em 0 2em;
+ border: 0;
}
#constants-list > dl dt,
#attributes-list > dl dt {
- padding-left: 0;
- font-weight: bold;
- font-family: Monaco, "Andale Mono";
- background: inherit;
+ padding-left: 0;
+ font-weight: bold;
+ font-family: Monaco, "Andale Mono";
+ background: inherit;
}
#constants-list > dl dt a,
#attributes-list > dl dt a {
- color: inherit;
+ color: inherit;
}
#constants-list > dl dd,
#attributes-list > dl dd {
- margin: 0 0 1em 0;
- padding: 0;
- color: #666;
-}
-
-.documentation-section h2 {
- position: relative;
-}
-
-.documentation-section h2 a {
- position: absolute;
- top: 8px;
- right: 10px;
- font-size: 12px;
- color: #9b9877;
- visibility: hidden;
-}
-
-.documentation-section h2:hover a {
- visibility: visible;
+ margin: 0 0 1em 0;
+ padding: 0;
+ color: #666;
}
/* @group Method Details */
#documentation .method-source-code {
- display: none;
-}
-
-#documentation .method-description .method-calls-super {
- color: #333;
- font-weight: bolder;
+ display: none;
}
#documentation .method-detail {
- margin: 0.5em 0;
- padding: 0.5em 0;
- cursor: pointer;
+ margin: 0.5em 0;
+ padding: 0.5em 0;
+ cursor: pointer;
}
#documentation .method-detail:hover {
- background-color: #f1edba;
+ background-color: #f1edba;
}
#documentation .method-heading {
- position: relative;
- padding: 2px 4px 0 20px;
- font-size: 125%;
- font-weight: bold;
- color: #333;
- background: url(images/brick.png) no-repeat left bottom;
+ position: relative;
+ padding: 2px 4px 0 20px;
+ font-size: 125%;
+ font-weight: bold;
+ color: #333;
+ background: url(images/brick.png) no-repeat left bottom;
}
#documentation .method-heading :link,
#documentation .method-heading :visited {
- color: inherit;
+ color: inherit;
}
#documentation .method-click-advice {
- position: absolute;
- top: 2px;
- right: 5px;
- font-size: 10px;
- color: #9b9877;
- visibility: hidden;
- padding-right: 20px;
- line-height: 20px;
- background: url(images/zoom.png) no-repeat right top;
+ position: absolute;
+ top: 2px;
+ right: 5px;
+ font-size: 10px;
+ color: #9b9877;
+ visibility: hidden;
+ padding-right: 20px;
+ line-height: 20px;
+ background: url(images/zoom.png) no-repeat right top;
}
-#documentation .method-heading:hover .method-click-advice {
- visibility: visible;
+#documentation .method-detail:hover .method-click-advice {
+ visibility: visible;
}
#documentation .method-alias .method-heading {
- color: #666;
- background: url(images/brick_link.png) no-repeat left bottom;
+ color: #666;
+ background: url(images/brick_link.png) no-repeat left bottom;
}
#documentation .method-description,
#documentation .aliases {
- margin: 0 20px;
- color: #666;
-}
-
-#documentation .method-description p,
-#documentation .aliases p {
- line-height: 1.2em;
+ margin: 0 20px;
+ line-height: 1.2em;
+ color: #666;
}
-
#documentation .aliases {
- padding-top: 4px;
- font-style: italic;
- cursor: default;
+ padding-top: 4px;
+ font-style: italic;
+ cursor: default;
}
#documentation .method-description p {
- margin-bottom: 0.5em;
+ padding: 0;
+}
+#documentation .method-description p + p {
+ margin-bottom: 0.5em;
}
#documentation .method-description ul {
margin-left: 1.5em;
}
-pre {
- margin: 0.5em 0;
-}
#documentation .attribute-method-heading {
- background: url(images/tag_green.png) no-repeat left bottom;
+ background: url(images/tag_green.png) no-repeat left bottom;
}
#documentation #attribute-method-details .method-detail:hover {
- background-color: transparent;
- cursor: default;
+ background-color: transparent;
+ cursor: default;
}
#documentation .attribute-access-type {
- font-size: 60%;
- text-transform: uppercase;
- vertical-align: super;
- padding: 0 2px;
+ font-size: 60%;
+ text-transform: uppercase;
+ vertical-align: super;
+ padding: 0 2px;
}
/* @end */
/* @end */
+
+
/* @group Source Code */
-pre {
- overflow: auto;
- background: #262626;
- color: white;
- border: 1px dashed #999;
- padding: 0.5em;
+div.method-source-code {
+ background: #262626;
+ color: #efefef;
+ margin: 1em;
+ padding: 0.5em;
+ border: 1px dashed #999;
+ overflow: hidden;
}
-.description pre {
- margin: 0 0.4em;
+div.method-source-code pre {
+ background: inherit;
+ padding: 0;
+ color: white;
+ overflow: auto;
}
+/* @group Ruby keyword styles */
+
.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: #dc0000; font-weight: bold; background: transparent; }
+.ruby-comment { color: #b22222; font-weight: bold; background: transparent; }
.ruby-regexp { color: #ffa07a; background: transparent; }
.ruby-value { color: #7fffd4; background: transparent; }
/* @end */
+/* @end */
+
+
+/* @group File Popup Contents */
+
+.file #metadata,
+.file-popup #metadata {
+}
+
+.file-popup dl {
+ font-size: 80%;
+ padding: 0.75em;
+ background-color: #dedede;
+ color: #333;
+ border: 1px solid #bbb;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+}
+.file dt {
+ font-weight: bold;
+ padding-left: 22px;
+ line-height: 20px;
+ background: url(images/page_white_width.png) no-repeat left top;
+}
+.file dt.modified-date {
+ background: url(images/date.png) no-repeat left top;
+}
+.file dt.requires {
+ background: url(images/plugin.png) no-repeat left top;
+}
+.file dt.scs-url {
+ background: url(images/wrench.png) no-repeat left top;
+}
+
+.file dl dd {
+ margin: 0 0 1em 0;
+}
+.file #metadata dl dd ul {
+ list-style: circle;
+ margin-left: 20px;
+ padding-top: 0;
+}
+.file #metadata dl dd ul li {
+}
+
+
+.file h2 {
+ margin-top: 2em;
+ padding: 0.75em 0.5em;
+ background-color: #dedede;
+ color: #333;
+ font-size: 120%;
+ border: 1px solid #bbb;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+}
+
+/* @end */
+
+
+
+
+/* @group ThickBox Styles */
+#TB_window {
+ font: 12px Arial, Helvetica, sans-serif;
+ color: #333333;
+}
+
+#TB_secondLine {
+ font: 10px Arial, Helvetica, sans-serif;
+ color:#666666;
+}
+
+#TB_window :link,
+#TB_window :visited { color: #666666; }
+#TB_window :link:hover,
+#TB_window :visited:hover { color: #000; }
+#TB_window :link:active,
+#TB_window :visited:active { color: #666666; }
+#TB_window :link:focus,
+#TB_window :visited:focus { color: #666666; }
+#TB_overlay {
+ position: fixed;
+ z-index:100;
+ top: 0px;
+ left: 0px;
+ height:100%;
+ width:100%;
+}
+
+.TB_overlayMacFFBGHack {background: url(images/macFFBgHack.png) repeat;}
+.TB_overlayBG {
+ background-color:#000;
+ filter:alpha(opacity=75);
+ -moz-opacity: 0.75;
+ opacity: 0.75;
+}
-/* @group search results */
-#search-results h1 {
- font-size: 1em;
- font-weight: normal;
- text-shadow: none;
+* html #TB_overlay { /* ie6 hack */
+ position: absolute;
+ height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
}
-#search-results .current {
- background: #ccc;
- border-bottom: 1px solid transparent;
+#TB_window {
+ position: fixed;
+ background: #ffffff;
+ z-index: 102;
+ color:#000000;
+ display:none;
+ border: 4px solid #525252;
+ text-align:left;
+ top:50%;
+ left:50%;
}
-#search-results li {
- list-style: none;
- border-bottom: 1px solid #aaa;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius: 4px;
- margin-bottom: 0.5em;
+* html #TB_window { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
}
-#search-results li:last-child {
- border-bottom: none;
- margin-bottom: 0;
+#TB_window img#TB_Image {
+ display:block;
+ margin: 15px 0 0 15px;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ border-top: 1px solid #666;
+ border-left: 1px solid #666;
}
-#search-results li p {
- padding: 0;
- margin: 0.5em;
+#TB_caption{
+ height:25px;
+ padding:7px 30px 10px 25px;
+ float:left;
}
-#search-results .search-namespace {
- font-weight: bold;
+#TB_closeWindow{
+ height:25px;
+ padding:11px 25px 10px 0;
+ float:right;
}
-#search-results li em {
- background: yellow;
- font-style: normal;
+#TB_closeAjaxWindow{
+ padding:7px 10px 5px 0;
+ margin-bottom:1px;
+ text-align:right;
+ float:right;
}
-#search-results pre {
- margin: 0.5em;
+#TB_ajaxWindowTitle{
+ float:left;
+ padding:7px 0 5px 10px;
+ margin-bottom:1px;
+ font-size: 22px;
+}
+
+#TB_title{
+ background-color: #6C8C22;
+ color: #dedede;
+ height:40px;
+}
+#TB_title :link,
+#TB_title :visited {
+ color: white !important;
+ border-bottom: 1px dotted #dedede;
+}
+
+#TB_ajaxContent{
+ clear:both;
+ padding:2px 15px 15px 15px;
+ overflow:auto;
+ text-align:left;
+ line-height:1.4em;
+}
+
+#TB_ajaxContent.TB_modal{
+ padding:15px;
+}
+
+#TB_ajaxContent p{
+ padding:5px 0px 5px 0px;
+}
+
+#TB_load{
+ position: fixed;
+ display:none;
+ height:13px;
+ width:208px;
+ z-index:103;
+ top: 50%;
+ left: 50%;
+ margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
+}
+
+* html #TB_load { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_HideSelect{
+ z-index:99;
+ position:fixed;
+ top: 0;
+ left: 0;
+ background-color:#fff;
+ border:none;
+ filter:alpha(opacity=0);
+ -moz-opacity: 0;
+ opacity: 0;
+ height:100%;
+ width:100%;
+}
+
+* html #TB_HideSelect { /* ie6 hack */
+ position: absolute;
+ height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_iframeContent{
+ clear:both;
+ border:none;
+ margin-bottom:-1px;
+ margin-top:1px;
+ _margin-bottom:1px;
}
/* @end */
+/* @group Debugging Section */
+
+#debugging-toggle {
+ text-align: center;
+}
+#debugging-toggle img {
+ cursor: pointer;
+}
+
+#rdoc-debugging-section-dump {
+ display: none;
+ margin: 0 2em 2em;
+ background: #ccc;
+ border: 1px solid #999;
+}
+
+
+
+/* @end */
diff --git a/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml b/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml
deleted file mode 100644
index 24c9ba8eaa..0000000000
--- a/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<body>
-<nav id="metadata">
- <%= render '_sidebar_navigation.rhtml' %>
-
- <%= render '_sidebar_search.rhtml' %>
-
- <div id="project-metadata">
- <%= render '_sidebar_pages.rhtml' %>
- <%= render '_sidebar_classes.rhtml' %>
- </div>
-</nav>
-
-<div id="documentation" class="description">
- <h1>Not Found</h1>
-
- <p>The page <kbd><%=h path %></kbd> was not found
-</div>
-
diff --git a/lib/rdoc/generator/template/darkfish/servlet_root.rhtml b/lib/rdoc/generator/template/darkfish/servlet_root.rhtml
deleted file mode 100644
index 63b4ee8ff7..0000000000
--- a/lib/rdoc/generator/template/darkfish/servlet_root.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<body>
-<nav id="metadata">
-<%= render '_sidebar_search.rhtml' %>
-
-<%= render '_sidebar_installed.rhtml' %>
-</nav>
-
-<div id="documentation" class="description">
- <h1>Local RDoc Documentation</h1>
-
- <p>Here you can browse local documentation from the ruby standard library and
- your installed gems.
-
-<% gems = installed.select { |_, _, _, type,| type == :gem } %>
-<% missing = gems.reject { |_, _, exists,| exists } %>
-<% unless missing.empty? then %>
- <h2>Missing Gem Documentation</h2>
-
- <p>You are missing documentation for some of your installed gems.
- You can install missing documentation for gems by running
- <kbd>gem rdoc --all</kbd>. After installing the missing documentation you
- only need to reload this page. The newly created documentation will
- automatically appear.
-
- <p>You can also install documentation for a specific gem by running one of
- the following commands.
-
- <ul>
- <% names = missing.map { |name,| name.sub(/-([^-]*)$/, '') }.uniq %>
- <% names.each do |name| %>
- <li><kbd>gem rdoc <%=h name %></kbd>
- <% end %>
- </ul>
-<% end %>
-
-</div>
-
diff --git a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
deleted file mode 100644
index bebff40f6a..0000000000
--- a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<body class="indexpage">
-<h1><%= h @title %></h1>
-
-<% simple_files = @files.select { |f| f.text? } %>
-<% unless simple_files.empty? then %>
-<h2>Pages</h2>
-<ul>
-<% simple_files.sort.each do |file| %>
- <li class="file">
- <a href="<%= file.path %>"><%= h file.page_name %></a>
-<%
- # HACK table_of_contents should not exist on Document
- table = file.parse(file.comment).table_of_contents
- unless table.empty? then %>
- <img class="toc-toggle" src="images/transparent.png" alt="" title="toggle headings">
- <ul class="initially-hidden">
-<% table.each do |heading| %>
- <li><a href="<%= file.path %>#<%= heading.aref %>"><%= heading.plain_html %></a>
-<% end %>
- </ul>
-<% end %>
- </li>
- <% end %>
-</ul>
-<% end %>
-
-<h2 id="classes">Classes/Modules</h2>
-<ul>
-<% @modsort.each do |klass| %>
- <li class="<%= klass.type %>">
- <a href="<%= klass.path %>"><%= klass.full_name %></a>
-<% table = []
- table.concat klass.parse(klass.comment_location).table_of_contents
- table.concat klass.section_contents
-
- unless table.empty? then %>
- <img class="toc-toggle" src="images/transparent.png" alt="" title="toggle headings">
- <ul class="initially-hidden">
-<% table.each do |item| %>
- <li><a href="<%= klass.path %>#<%= item.aref %>"><%= item.plain_html %></a>
-<% end %>
- </ul>
-<% end %>
- </li>
- <% end %>
-</ul>
-
-<h2 id="methods">Methods</h2>
-<ul>
- <% @store.all_classes_and_modules.map do |mod|
- mod.method_list
- end.flatten.sort.each do |method| %>
- <li class="method"><a href="<%= method.path %>"><%= method.pretty_name %> &mdash; <%= method.parent.full_name %></a>
- <% end %>
-</ul>
diff --git a/lib/rdoc/generator/template/json_index/.document b/lib/rdoc/generator/template/json_index/.document
deleted file mode 100644
index 1713b67654..0000000000
--- a/lib/rdoc/generator/template/json_index/.document
+++ /dev/null
@@ -1 +0,0 @@
-# ignore all files in this directory
diff --git a/lib/rdoc/generator/template/json_index/js/navigation.js b/lib/rdoc/generator/template/json_index/js/navigation.js
deleted file mode 100644
index e41268123e..0000000000
--- a/lib/rdoc/generator/template/json_index/js/navigation.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Navigation allows movement using the arrow keys through the search results.
- *
- * When using this library you will need to set scrollIntoView to the
- * appropriate function for your layout. Use scrollInWindow if the container
- * is not scrollable and scrollInElement if the container is a separate
- * scrolling region.
- */
-Navigation = new function() {
- this.initNavigation = function() {
- var _this = this;
-
- $(document).keydown(function(e) {
- _this.onkeydown(e);
- }).keyup(function(e) {
- _this.onkeyup(e);
- });
-
- this.navigationActive = true;
- }
-
- this.setNavigationActive = function(state) {
- this.navigationActive = state;
- this.clearMoveTimeout();
- }
-
- this.onkeyup = function(e) {
- if (!this.navigationActive) return;
-
- switch(e.keyCode) {
- case 37: //Event.KEY_LEFT:
- case 38: //Event.KEY_UP:
- case 39: //Event.KEY_RIGHT:
- case 40: //Event.KEY_DOWN:
- this.clearMoveTimeout();
- break;
- }
- }
-
- this.onkeydown = function(e) {
- if (!this.navigationActive) return;
- switch(e.keyCode) {
- case 37: //Event.KEY_LEFT:
- if (this.moveLeft()) e.preventDefault();
- break;
- case 38: //Event.KEY_UP:
- if (e.keyCode == 38 || e.ctrlKey) {
- if (this.moveUp()) e.preventDefault();
- this.startMoveTimeout(false);
- }
- break;
- case 39: //Event.KEY_RIGHT:
- if (this.moveRight()) e.preventDefault();
- break;
- case 40: //Event.KEY_DOWN:
- if (e.keyCode == 40 || e.ctrlKey) {
- if (this.moveDown()) e.preventDefault();
- this.startMoveTimeout(true);
- }
- break;
- case 13: //Event.KEY_RETURN:
- if (this.$current)
- e.preventDefault();
- this.select(this.$current);
- break;
- }
- if (e.ctrlKey && e.shiftKey) this.select(this.$current);
- }
-
- this.clearMoveTimeout = function() {
- clearTimeout(this.moveTimeout);
- this.moveTimeout = null;
- }
-
- this.startMoveTimeout = function(isDown) {
- if (!$.browser.mozilla && !$.browser.opera) return;
- if (this.moveTimeout) this.clearMoveTimeout();
- var _this = this;
-
- var go = function() {
- if (!_this.moveTimeout) return;
- _this[isDown ? 'moveDown' : 'moveUp']();
- _this.moveTimout = setTimeout(go, 100);
- }
- this.moveTimeout = setTimeout(go, 200);
- }
-
- this.moveRight = function() {
- }
-
- this.moveLeft = function() {
- }
-
- this.move = function(isDown) {
- }
-
- this.moveUp = function() {
- return this.move(false);
- }
-
- this.moveDown = function() {
- return this.move(true);
- }
-
- /*
- * Scrolls to the given element in the scrollable element view.
- */
- this.scrollInElement = function(element, view) {
- var offset, viewHeight, viewScroll, height;
- offset = element.offsetTop;
- height = element.offsetHeight;
- viewHeight = view.offsetHeight;
- viewScroll = view.scrollTop;
-
- if (offset - viewScroll + height > viewHeight) {
- view.scrollTop = offset - viewHeight + height;
- }
- if (offset < viewScroll) {
- view.scrollTop = offset;
- }
- }
-
- /*
- * Scrolls to the given element in the window. The second argument is
- * ignored
- */
- this.scrollInWindow = function(element, ignored) {
- var offset, viewHeight, viewScroll, height;
- offset = element.offsetTop;
- height = element.offsetHeight;
- viewHeight = window.innerHeight;
- viewScroll = window.scrollY;
-
- if (offset - viewScroll + height > viewHeight) {
- window.scrollTo(window.scrollX, offset - viewHeight + height);
- }
- if (offset < viewScroll) {
- window.scrollTo(window.scrollX, offset);
- }
- }
-}
-
diff --git a/lib/rdoc/generator/template/json_index/js/searcher.js b/lib/rdoc/generator/template/json_index/js/searcher.js
deleted file mode 100644
index f854b541d0..0000000000
--- a/lib/rdoc/generator/template/json_index/js/searcher.js
+++ /dev/null
@@ -1,228 +0,0 @@
-Searcher = function(data) {
- this.data = data;
- this.handlers = [];
-}
-
-Searcher.prototype = new function() {
- // search is performed in chunks of 1000 for non-blocking user input
- var CHUNK_SIZE = 1000;
- // do not try to find more than 100 results
- var MAX_RESULTS = 100;
- var huid = 1;
- var suid = 1;
- var runs = 0;
-
- this.find = function(query) {
- var queries = splitQuery(query);
- var regexps = buildRegexps(queries);
- var highlighters = buildHilighters(queries);
- var state = { from: 0, pass: 0, limit: MAX_RESULTS, n: suid++};
- var _this = this;
-
- this.currentSuid = state.n;
-
- if (!query) return;
-
- var run = function() {
- // stop current search thread if new search started
- if (state.n != _this.currentSuid) return;
-
- var results =
- performSearch(_this.data, regexps, queries, highlighters, state);
- var hasMore = (state.limit > 0 && state.pass < 4);
-
- triggerResults.call(_this, results, !hasMore);
- if (hasMore) {
- setTimeout(run, 2);
- }
- runs++;
- };
- runs = 0;
-
- // start search thread
- run();
- }
-
- /* ----- Events ------ */
- this.ready = function(fn) {
- fn.huid = huid;
- this.handlers.push(fn);
- }
-
- /* ----- Utilities ------ */
- function splitQuery(query) {
- return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) {
- return string.match(/\S/)
- });
- }
-
- function buildRegexps(queries) {
- return jQuery.map(queries, function(query) {
- return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i')
- });
- }
-
- function buildHilighters(queries) {
- return jQuery.map(queries, function(query) {
- return jQuery.map(query.split(''), function(l, i) {
- return '\u0001$' + (i*2+1) + '\u0002$' + (i*2+2);
- }).join('');
- });
- }
-
- // function longMatchRegexp(index, longIndex, regexps) {
- // for (var i = regexps.length - 1; i >= 0; i--){
- // if (!index.match(regexps[i]) && !longIndex.match(regexps[i])) return false;
- // };
- // return true;
- // }
-
-
- /* ----- Mathchers ------ */
-
- /*
- * This record matches if the index starts with queries[0] and the record
- * matches all of the regexps
- */
- function matchPassBeginning(index, longIndex, queries, regexps) {
- if (index.indexOf(queries[0]) != 0) return false;
- for (var i=1, l = regexps.length; i < l; i++) {
- if (!index.match(regexps[i]) && !longIndex.match(regexps[i]))
- return false;
- };
- return true;
- }
-
- /*
- * This record matches if the longIndex starts with queries[0] and the
- * longIndex matches all of the regexps
- */
- function matchPassLongIndex(index, longIndex, queries, regexps) {
- if (longIndex.indexOf(queries[0]) != 0) return false;
- for (var i=1, l = regexps.length; i < l; i++) {
- if (!longIndex.match(regexps[i]))
- return false;
- };
- return true;
- }
-
- /*
- * This record matches if the index contains queries[0] and the record
- * matches all of the regexps
- */
- function matchPassContains(index, longIndex, queries, regexps) {
- if (index.indexOf(queries[0]) == -1) return false;
- for (var i=1, l = regexps.length; i < l; i++) {
- if (!index.match(regexps[i]) && !longIndex.match(regexps[i]))
- return false;
- };
- return true;
- }
-
- /*
- * This record matches if regexps[0] matches the index and the record
- * matches all of the regexps
- */
- function matchPassRegexp(index, longIndex, queries, regexps) {
- if (!index.match(regexps[0])) return false;
- for (var i=1, l = regexps.length; i < l; i++) {
- if (!index.match(regexps[i]) && !longIndex.match(regexps[i]))
- return false;
- };
- return true;
- }
-
-
- /* ----- Highlighters ------ */
- function highlightRegexp(info, queries, regexps, highlighters) {
- var result = createResult(info);
- for (var i=0, l = regexps.length; i < l; i++) {
- result.title = result.title.replace(regexps[i], highlighters[i]);
- result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
- };
- return result;
- }
-
- function hltSubstring(string, pos, length) {
- return string.substring(0, pos) + '\u0001' + string.substring(pos, pos + length) + '\u0002' + string.substring(pos + length);
- }
-
- function highlightQuery(info, queries, regexps, highlighters) {
- var result = createResult(info);
- var pos = 0;
- var lcTitle = result.title.toLowerCase();
-
- pos = lcTitle.indexOf(queries[0]);
- if (pos != -1) {
- result.title = hltSubstring(result.title, pos, queries[0].length);
- }
-
- result.namespace = result.namespace.replace(regexps[0], highlighters[0]);
- for (var i=1, l = regexps.length; i < l; i++) {
- result.title = result.title.replace(regexps[i], highlighters[i]);
- result.namespace = result.namespace.replace(regexps[i], highlighters[i]);
- };
- return result;
- }
-
- function createResult(info) {
- var result = {};
- result.title = info[0];
- result.namespace = info[1];
- result.path = info[2];
- result.params = info[3];
- result.snippet = info[4];
- return result;
- }
-
- /* ----- Searching ------ */
- function performSearch(data, regexps, queries, highlighters, state) {
- var searchIndex = data.searchIndex;
- var longSearchIndex = data.longSearchIndex;
- var info = data.info;
- var result = [];
- var i = state.from;
- var l = searchIndex.length;
- var togo = CHUNK_SIZE;
- var matchFunc, hltFunc;
-
- while (state.pass < 4 && state.limit > 0 && togo > 0) {
- if (state.pass == 0) {
- matchFunc = matchPassBeginning;
- hltFunc = highlightQuery;
- } else if (state.pass == 1) {
- matchFunc = matchPassLongIndex;
- hltFunc = highlightQuery;
- } else if (state.pass == 2) {
- matchFunc = matchPassContains;
- hltFunc = highlightQuery;
- } else if (state.pass == 3) {
- matchFunc = matchPassRegexp;
- hltFunc = highlightRegexp;
- }
-
- for (; togo > 0 && i < l && state.limit > 0; i++, togo--) {
- if (info[i].n == state.n) continue;
- if (matchFunc(searchIndex[i], longSearchIndex[i], queries, regexps)) {
- info[i].n = state.n;
- result.push(hltFunc(info[i], queries, regexps, highlighters));
- state.limit--;
- }
- };
- if (searchIndex.length <= i) {
- state.pass++;
- i = state.from = 0;
- } else {
- state.from = i;
- }
- }
- return result;
- }
-
- function triggerResults(results, isLast) {
- jQuery.each(this.handlers, function(i, fn) {
- fn.call(this, results, isLast)
- })
- }
-}
-
diff --git a/lib/rdoc/ghost_method.rb b/lib/rdoc/ghost_method.rb
index 7eb2d93167..192b46f51f 100644
--- a/lib/rdoc/ghost_method.rb
+++ b/lib/rdoc/ghost_method.rb
@@ -1,3 +1,5 @@
+require 'rdoc/any_method'
+
##
# GhostMethod represents a method referenced only by a comment
diff --git a/lib/rdoc/include.rb b/lib/rdoc/include.rb
index 1e9ff5a464..11a9bdc7ef 100644
--- a/lib/rdoc/include.rb
+++ b/lib/rdoc/include.rb
@@ -1,3 +1,5 @@
+require 'rdoc/code_object'
+
##
# A Module include in a class with \#include
@@ -15,7 +17,6 @@ class RDoc::Include < RDoc::CodeObject
super()
@name = name
self.comment = comment
- @module = nil # cache for module if found
end
##
@@ -28,11 +29,10 @@ class RDoc::Include < RDoc::CodeObject
end
def == other # :nodoc:
- self.class === other and @name == other.name
+ self.class == other.class and
+ self.name == other.name
end
- alias eql? ==
-
##
# Full name based on #module
@@ -41,10 +41,6 @@ class RDoc::Include < RDoc::CodeObject
RDoc::ClassModule === m ? m.full_name : @name
end
- def hash # :nodoc:
- [@name, self.module].hash
- end
-
def inspect # :nodoc:
"#<%s:0x%x %s.include %s>" % [
self.class,
@@ -56,63 +52,9 @@ class RDoc::Include < RDoc::CodeObject
##
# Attempts to locate the included module object. Returns the name if not
# known.
- #
- # The scoping rules of Ruby to resolve the name of an included module are:
- # - first look into the children of the current context;
- # - if not found, look into the children of included modules,
- # in reverse inclusion order;
- # - if still not found, go up the hierarchy of names.
- #
- # This method has <code>O(n!)</code> behavior when the module calling
- # include is referencing nonexistent modules. Avoid calling #module until
- # after all the files are parsed. This behavior is due to ruby's constant
- # lookup behavior.
- #
- # As of the beginning of October, 2011, no gem includes nonexistent modules.
def module
- return @module if @module
-
- # search the current context
- return @name unless parent
- full_name = parent.child_name(@name)
- @module = @store.modules_hash[full_name]
- return @module if @module
- return @name if @name =~ /^::/
-
- # search the includes before this one, in reverse order
- searched = parent.includes.take_while { |i| i != self }.reverse
- searched.each do |i|
- inc = i.module
- next if String === inc
- full_name = inc.child_name(@name)
- @module = @store.modules_hash[full_name]
- return @module if @module
- end
-
- # go up the hierarchy of names
- up = parent.parent
- while up
- full_name = up.child_name(@name)
- @module = @store.modules_hash[full_name]
- return @module if @module
- up = up.parent
- end
-
- @name
- end
-
- ##
- # Sets the store for this class or module and its contained code objects.
-
- def store= store
- super
-
- @file = @store.add_file @file.full_name if @file
- end
-
- def to_s # :nodoc:
- "include #@name in: #{parent}"
+ RDoc::TopLevel.find_module_named(@name) || @name
end
end
diff --git a/lib/rdoc/known_classes.rb b/lib/rdoc/known_classes.rb
index 863be4bd5c..720a35f497 100644
--- a/lib/rdoc/known_classes.rb
+++ b/lib/rdoc/known_classes.rb
@@ -10,7 +10,6 @@ module RDoc
"rb_cClass" => "Class",
"rb_cData" => "Data",
"rb_cDir" => "Dir",
- "rb_cEncoding" => "Encoding",
"rb_cFalseClass" => "FalseClass",
"rb_cFile" => "File",
"rb_cFixnum" => "Fixnum",
@@ -26,7 +25,6 @@ module RDoc
"rb_cRange" => "Range",
"rb_cRegexp" => "Regexp",
"rb_cRubyVM" => "RubyVM",
- "rb_cSocket" => "Socket",
"rb_cString" => "String",
"rb_cStruct" => "Struct",
"rb_cSymbol" => "Symbol",
@@ -37,7 +35,7 @@ module RDoc
"rb_eArgError" => "ArgError",
"rb_eEOFError" => "EOFError",
"rb_eException" => "Exception",
- "rb_eFatal" => "fatal",
+ "rb_eFatal" => "Fatal",
"rb_eFloatDomainError" => "FloatDomainError",
"rb_eIOError" => "IOError",
"rb_eIndexError" => "IndexError",
@@ -50,7 +48,7 @@ module RDoc
"rb_eRuntimeError" => "RuntimeError",
"rb_eScriptError" => "ScriptError",
"rb_eSecurityError" => "SecurityError",
- "rb_eSignal" => "SignalException",
+ "rb_eSignal" => "Signal",
"rb_eStandardError" => "StandardError",
"rb_eSyntaxError" => "SyntaxError",
"rb_eSystemCallError" => "SystemCallError",
@@ -59,7 +57,6 @@ module RDoc
"rb_eZeroDivError" => "ZeroDivError",
"rb_mComparable" => "Comparable",
- "rb_mDL" => "DL",
"rb_mEnumerable" => "Enumerable",
"rb_mErrno" => "Errno",
"rb_mFileTest" => "FileTest",
diff --git a/lib/rdoc/markdown.rb b/lib/rdoc/markdown.rb
deleted file mode 100644
index 5133c7b0c8..0000000000
--- a/lib/rdoc/markdown.rb
+++ /dev/null
@@ -1,16336 +0,0 @@
-# coding: UTF-8
-# :markup: markdown
-
-##
-# RDoc::Markdown as described by the [markdown syntax][syntax].
-#
-# To choose Markdown as your only default format see
-# RDoc::Options@Saved+Options for instructions on setting up a `.doc_options`
-# file to store your project default.
-#
-# ## Extensions
-#
-# The following markdown extensions are supported by the parser, but not all
-# are used in RDoc output by default.
-#
-# ### RDoc
-#
-# The RDoc Markdown parser has the following built-in behaviors that cannot be
-# disabled.
-#
-# Underscores embedded in words are never interpreted as emphasis. (While the
-# [markdown dingus][dingus] emphasizes in-word underscores, neither the
-# Markdown syntax nor MarkdownTest mention this behavior.)
-#
-# For HTML output, RDoc always auto-links bare URLs.
-#
-# ### Break on Newline
-#
-# The break_on_newline extension converts all newlines into hard line breaks
-# as in [Github Flavored Markdown][GFM]. This extension is disabled by
-# default.
-#
-# ### CSS
-#
-# The #css extension enables CSS blocks to be included in the output, but they
-# are not used for any built-in RDoc output format. This extension is disabled
-# by default.
-#
-# Example:
-#
-# <style type="text/css">
-# h1 { font-size: 3em }
-# </style>
-#
-# ### Definition Lists
-#
-# The definition_lists extension allows definition lists using the [PHP
-# Markdown Extra syntax][PHPE], but only one label and definition are supported
-# at this time. This extension is enabled by default.
-#
-# Example:
-#
-# ```
-# cat
-# : A small furry mammal
-# that seems to sleep a lot
-#
-# ant
-# : A little insect that is known
-# to enjoy picnics
-#
-# ```
-#
-# Produces:
-#
-# cat
-# : A small furry mammal
-# that seems to sleep a lot
-#
-# ant
-# : A little insect that is known
-# to enjoy picnics
-#
-# ### Github
-#
-# The #github extension enables a partial set of [Github Flavored Markdown]
-# [GFM]. This extension is enabled by default.
-#
-# Supported github extensions include:
-#
-# #### Fenced code blocks
-#
-# Use ` ``` ` around a block of code instead of indenting it four spaces.
-#
-# #### Syntax highlighting
-#
-# Use ` ``` ruby ` as the start of a code fence to add syntax highlighting.
-# (Currently only `ruby` syntax is supported).
-#
-# ### HTML
-#
-# Enables raw HTML to be included in the output. This extension is enabled by
-# default.
-#
-# Example:
-#
-# <table>
-# ...
-# </table>
-#
-# ### Notes
-#
-# The #notes extension enables footnote support. This extension is enabled by
-# default.
-#
-# Example:
-#
-# Here is some text[^1] including an inline footnote ^[for short footnotes]
-#
-# ...
-#
-# [^1]: With the footnote text down at the bottom
-#
-# Produces:
-#
-# Here is some text[^1] including an inline footnote ^[for short footnotes]
-#
-# [^1]: With the footnote text down at the bottom
-#
-# ## Limitations
-#
-# * Link titles are not used
-# * Image links are not generated correctly
-# * Footnotes are collapsed into a single paragraph
-#
-# ## Author
-#
-# This markdown parser is a port to kpeg from [peg-markdown][pegmarkdown] by
-# John MacFarlane.
-#
-# It is used under the MIT license:
-#
-# 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.
-#
-# The port to kpeg was performed by Eric Hodel and Evan Phoenix
-#
-# [dingus]: http://daringfireball.net/projects/markdown/dingus
-# [GFM]: http://github.github.com/github-flavored-markdown/
-# [pegmarkdown]: https://github.com/jgm/peg-markdown
-# [PHPE]: http://michelf.com/projects/php-markdown/extra/#def-list
-# [syntax]: http://daringfireball.net/projects/markdown/syntax
-#--
-# Last updated to jgm/peg-markdown commit 8f8fc22ef0
-class RDoc::Markdown
- # :stopdoc:
-
- # This is distinct from setup_parser so that a standalone parser
- # can redefine #initialize and still have access to the proper
- # parser setup code.
- def initialize(str, debug=false)
- setup_parser(str, debug)
- end
-
-
-
- # Prepares for parsing +str+. If you define a custom initialize you must
- # call this method before #parse
- def setup_parser(str, debug=false)
- @string = str
- @pos = 0
- @memoizations = Hash.new { |h,k| h[k] = {} }
- @result = nil
- @failed_rule = nil
- @failing_rule_offset = -1
-
- setup_foreign_grammar
- end
-
- attr_reader :string
- attr_reader :failing_rule_offset
- attr_accessor :result, :pos
-
-
- def current_column(target=pos)
- if c = string.rindex("\n", target-1)
- return target - c - 1
- end
-
- target + 1
- end
-
- def current_line(target=pos)
- cur_offset = 0
- cur_line = 0
-
- string.each_line do |line|
- cur_line += 1
- cur_offset += line.size
- return cur_line if cur_offset >= target
- end
-
- -1
- end
-
- def lines
- lines = []
- string.each_line { |l| lines << l }
- lines
- end
-
-
-
- def get_text(start)
- @string[start..@pos-1]
- end
-
- def show_pos
- width = 10
- if @pos < width
- "#{@pos} (\"#{@string[0,@pos]}\" @ \"#{@string[@pos,width]}\")"
- else
- "#{@pos} (\"... #{@string[@pos - width, width]}\" @ \"#{@string[@pos,width]}\")"
- end
- end
-
- def failure_info
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
-
- if @failed_rule.kind_of? Symbol
- info = self.class::Rules[@failed_rule]
- "line #{l}, column #{c}: failed rule '#{info.name}' = '#{info.rendered}'"
- else
- "line #{l}, column #{c}: failed rule '#{@failed_rule}'"
- end
- end
-
- def failure_caret
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
-
- line = lines[l-1]
- "#{line}\n#{' ' * (c - 1)}^"
- end
-
- def failure_character
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
- lines[l-1][c-1, 1]
- end
-
- def failure_oneline
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
-
- char = lines[l-1][c-1, 1]
-
- if @failed_rule.kind_of? Symbol
- info = self.class::Rules[@failed_rule]
- "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
- else
- "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
- end
- end
-
- class ParseError < RuntimeError
- end
-
- def raise_error
- raise ParseError, failure_oneline
- end
-
- def show_error(io=STDOUT)
- error_pos = @failing_rule_offset
- line_no = current_line(error_pos)
- col_no = current_column(error_pos)
-
- io.puts "On line #{line_no}, column #{col_no}:"
-
- if @failed_rule.kind_of? Symbol
- info = self.class::Rules[@failed_rule]
- io.puts "Failed to match '#{info.rendered}' (rule '#{info.name}')"
- else
- io.puts "Failed to match rule '#{@failed_rule}'"
- end
-
- io.puts "Got: #{string[error_pos,1].inspect}"
- line = lines[line_no-1]
- io.puts "=> #{line}"
- io.print(" " * (col_no + 3))
- io.puts "^"
- end
-
- def set_failed_rule(name)
- if @pos > @failing_rule_offset
- @failed_rule = name
- @failing_rule_offset = @pos
- end
- end
-
- attr_reader :failed_rule
-
- def match_string(str)
- len = str.size
- if @string[pos,len] == str
- @pos += len
- return str
- end
-
- return nil
- end
-
- def scan(reg)
- if m = reg.match(@string[@pos..-1])
- width = m.end(0)
- @pos += width
- return true
- end
-
- return nil
- end
-
- if "".respond_to? :getbyte
- def get_byte
- if @pos >= @string.size
- return nil
- end
-
- s = @string.getbyte @pos
- @pos += 1
- s
- end
- else
- def get_byte
- if @pos >= @string.size
- return nil
- end
-
- s = @string[@pos]
- @pos += 1
- s
- end
- end
-
- def parse(rule=nil)
- # We invoke the rules indirectly via apply
- # instead of by just calling them as methods because
- # if the rules use left recursion, apply needs to
- # manage that.
-
- if !rule
- apply(:_root)
- else
- method = rule.gsub("-","_hyphen_")
- apply :"_#{method}"
- end
- end
-
- class MemoEntry
- def initialize(ans, pos)
- @ans = ans
- @pos = pos
- @result = nil
- @set = false
- @left_rec = false
- end
-
- attr_reader :ans, :pos, :result, :set
- attr_accessor :left_rec
-
- def move!(ans, pos, result)
- @ans = ans
- @pos = pos
- @result = result
- @set = true
- @left_rec = false
- end
- end
-
- def external_invoke(other, rule, *args)
- old_pos = @pos
- old_string = @string
-
- @pos = other.pos
- @string = other.string
-
- begin
- if val = __send__(rule, *args)
- other.pos = @pos
- other.result = @result
- else
- other.set_failed_rule "#{self.class}##{rule}"
- end
- val
- ensure
- @pos = old_pos
- @string = old_string
- end
- end
-
- def apply_with_args(rule, *args)
- memo_key = [rule, args]
- if m = @memoizations[memo_key][@pos]
- @pos = m.pos
- if !m.set
- m.left_rec = true
- return nil
- end
-
- @result = m.result
-
- return m.ans
- else
- m = MemoEntry.new(nil, @pos)
- @memoizations[memo_key][@pos] = m
- start_pos = @pos
-
- ans = __send__ rule, *args
-
- lr = m.left_rec
-
- m.move! ans, @pos, @result
-
- # Don't bother trying to grow the left recursion
- # if it's failing straight away (thus there is no seed)
- if ans and lr
- return grow_lr(rule, args, start_pos, m)
- else
- return ans
- end
-
- return ans
- end
- end
-
- def apply(rule)
- if m = @memoizations[rule][@pos]
- @pos = m.pos
- if !m.set
- m.left_rec = true
- return nil
- end
-
- @result = m.result
-
- return m.ans
- else
- m = MemoEntry.new(nil, @pos)
- @memoizations[rule][@pos] = m
- start_pos = @pos
-
- ans = __send__ rule
-
- lr = m.left_rec
-
- m.move! ans, @pos, @result
-
- # Don't bother trying to grow the left recursion
- # if it's failing straight away (thus there is no seed)
- if ans and lr
- return grow_lr(rule, nil, start_pos, m)
- else
- return ans
- end
-
- return ans
- end
- end
-
- def grow_lr(rule, args, start_pos, m)
- while true
- @pos = start_pos
- @result = m.result
-
- if args
- ans = __send__ rule, *args
- else
- ans = __send__ rule
- end
- return nil unless ans
-
- break if @pos <= m.pos
-
- m.move! ans, @pos, @result
- end
-
- @result = m.result
- @pos = m.pos
- return m.ans
- end
-
- class RuleInfo
- def initialize(name, rendered)
- @name = name
- @rendered = rendered
- end
-
- attr_reader :name, :rendered
- end
-
- def self.rule_info(name, rendered)
- RuleInfo.new(name, rendered)
- end
-
-
- # :startdoc:
-
-
-
- require 'rubygems'
- require 'rdoc'
- require 'rdoc/markup/to_joined_paragraph'
- require 'rdoc/markdown/entities'
-
- if RUBY_VERSION > '1.9' then
- require 'rdoc/markdown/literals_1_9'
- else
- require 'rdoc/markdown/literals_1_8'
- end
-
- ##
- # Supported extensions
-
- EXTENSIONS = []
-
- ##
- # Extensions enabled by default
-
- DEFAULT_EXTENSIONS = [
- :definition_lists,
- :github,
- :html,
- :notes,
- ]
-
- # :section: Extensions
-
- ##
- # Creates extension methods for the `name` extension to enable and disable
- # the extension and to query if they are active.
-
- def self.extension name
- EXTENSIONS << name
-
- eval <<-RUBY
- def #{name}?
- extension? __method__
- end
-
- def #{name}= enable
- extension __method__, enable
- end
- RUBY
- end
-
- ##
- # Converts all newlines into hard breaks
-
- extension :break_on_newline
-
- ##
- # Allow style blocks
-
- extension :css
-
- ##
- # Allow PHP Markdown Extras style definition lists
-
- extension :definition_lists
-
- ##
- # Allow Github Flavored Markdown
-
- extension :github
-
- ##
- # Allow HTML
-
- extension :html
-
- ##
- # Enables the notes extension
-
- extension :notes
-
- # :section:
-
- ##
- # Parses the `markdown` document into an RDoc::Document using the default
- # extensions.
-
- def self.parse markdown
- parser = new
-
- parser.parse markdown
- end
-
- # TODO remove when kpeg 0.10 is released
- alias orig_initialize initialize # :nodoc:
-
- ##
- # Creates a new markdown parser that enables the given +extensions+.
-
- def initialize extensions = DEFAULT_EXTENSIONS, debug = false
- @debug = debug
- @formatter = RDoc::Markup::ToJoinedParagraph.new
- @extensions = extensions
-
- @references = nil
- @unlinked_references = nil
-
- @footnotes = nil
- @note_order = nil
- end
-
- ##
- # Wraps `text` in emphasis for rdoc inline formatting
-
- def emphasis text
- if text =~ /\A[a-z\d.\/]+\z/i then
- "_#{text}_"
- else
- "<em>#{text}</em>"
- end
- end
-
- ##
- # :category: Extensions
- #
- # Is the extension `name` enabled?
-
- def extension? name
- name = name.to_s.delete('?').intern
-
- @extensions.include? name
- end
-
- ##
- # :category: Extensions
- #
- # Enables or disables the extension with `name`
-
- def extension name, enable
- name = name.to_s.delete('=').intern
-
- if enable then
- @extensions |= [name]
- else
- @extensions -= [name]
- end
- end
-
- ##
- # Parses `text` in a clone of this parser. This is used for handling nested
- # lists the same way as markdown_parser.
-
- def inner_parse text # :nodoc:
- parser = clone
-
- parser.setup_parser text, @debug
-
- parser.peg_parse
-
- doc = parser.result
-
- doc.accept @formatter
-
- doc.parts
- end
-
- ##
- # Finds a link reference for `label` and creates a new link to it with
- # `content` as the link text. If `label` was not encountered in the
- # reference-gathering parser pass the label and content are reconstructed
- # with the linking `text` (usually whitespace).
-
- def link_to content, label = content, text = nil
- raise 'enable notes extension' if
- content.start_with? '^' and label.equal? content
-
- if ref = @references[label] then
- "{#{content}}[#{ref}]"
- elsif label.equal? content then
- "[#{content}]#{text}"
- else
- "[#{content}]#{text}[#{label}]"
- end
- end
-
- ##
- # Creates an RDoc::Markup::ListItem by parsing the `unparsed` content from
- # the first parsing pass.
-
- def list_item_from unparsed
- parsed = inner_parse unparsed.join
- RDoc::Markup::ListItem.new nil, *parsed
- end
-
- ##
- # Stores `label` as a note and fills in previously unknown note references.
-
- def note label
- #foottext = "rdoc-label:foottext-#{label}:footmark-#{label}"
-
- #ref.replace foottext if ref = @unlinked_notes.delete(label)
-
- @notes[label] = foottext
-
- #"{^1}[rdoc-label:footmark-#{label}:foottext-#{label}] "
- end
-
- ##
- # Creates a new link for the footnote `reference` and adds the reference to
- # the note order list for proper display at the end of the document.
-
- def note_for ref
- @note_order << ref
-
- label = @note_order.length
-
- "{*#{label}}[rdoc-label:foottext-#{label}:footmark-#{label}]"
- end
-
- ##
- # The internal kpeg parse method
-
- alias peg_parse parse # :nodoc:
-
- ##
- # Creates an RDoc::Markup::Paragraph from `parts` and including
- # extension-specific behavior
-
- def paragraph parts
- parts = parts.map do |part|
- if "\n" == part then
- RDoc::Markup::HardBreak.new
- else
- part
- end
- end if break_on_newline?
-
- RDoc::Markup::Paragraph.new(*parts)
- end
-
- ##
- # Parses `markdown` into an RDoc::Document
-
- def parse markdown
- @references = {}
- @unlinked_references = {}
-
- markdown += "\n\n"
-
- setup_parser markdown, @debug
- peg_parse 'References'
-
- if notes? then
- @footnotes = {}
-
- setup_parser markdown, @debug
- peg_parse 'Notes'
-
- # using note_order on the first pass would be a bug
- @note_order = []
- end
-
- setup_parser markdown, @debug
- peg_parse
-
- doc = result
-
- if notes? and not @footnotes.empty? then
- doc << RDoc::Markup::Rule.new(1)
-
- @note_order.each_with_index do |ref, index|
- label = index + 1
- note = @footnotes[ref]
-
- link = "{^#{label}}[rdoc-label:footmark-#{label}:foottext-#{label}] "
- note.parts.unshift link
-
- doc << note
- end
- end
-
- doc.accept @formatter
-
- doc
- end
-
- ##
- # Stores `label` as a reference to `link` and fills in previously unknown
- # link references.
-
- def reference label, link
- if ref = @unlinked_references.delete(label) then
- ref.replace link
- end
-
- @references[label] = link
- end
-
- ##
- # Wraps `text` in strong markup for rdoc inline formatting
-
- def strong text
- if text =~ /\A[a-z\d.\/-]+\z/i then
- "*#{text}*"
- else
- "<b>#{text}</b>"
- end
- end
-
-
- # :stopdoc:
- def setup_foreign_grammar
- @_grammar_literals = RDoc::Markdown::Literals.new(nil)
- end
-
- # root = Doc
- def _root
- _tmp = apply(:_Doc)
- set_failed_rule :_root unless _tmp
- return _tmp
- end
-
- # Doc = BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }
- def _Doc
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_BOM)
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _ary = []
- while true
- _tmp = apply(:_Block)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::Document.new(*a.compact) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Doc unless _tmp
- return _tmp
- end
-
- # Block = BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
- def _Block
-
- _save = self.pos
- while true # sequence
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_BlockQuote)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Verbatim)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_CodeFence)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Note)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Reference)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_HorizontalRule)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Heading)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_OrderedList)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_BulletList)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_DefinitionList)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_HtmlBlock)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_StyleBlock)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Para)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Plain)
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Block unless _tmp
- return _tmp
- end
-
- # Para = NonindentSpace Inlines:a BlankLine+ { paragraph a }
- def _Para
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inlines)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = apply(:_BlankLine)
- if _tmp
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; paragraph a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Para unless _tmp
- return _tmp
- end
-
- # Plain = Inlines:a { paragraph a }
- def _Plain
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Inlines)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; paragraph a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Plain unless _tmp
- return _tmp
- end
-
- # AtxInline = !Newline !(Sp? "#"* Sp Newline) Inline
- def _AtxInline
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_Sp)
- unless _tmp
- _tmp = true
- self.pos = _save4
- end
- unless _tmp
- self.pos = _save3
- break
- end
- while true
- _tmp = match_string("#")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inline)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_AtxInline unless _tmp
- return _tmp
- end
-
- # AtxStart = < ("######" | "#####" | "####" | "###" | "##" | "#") > { text.length }
- def _AtxStart
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("######")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("#####")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("####")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("###")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("##")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("#")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text.length ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_AtxStart unless _tmp
- return _tmp
- end
-
- # AtxHeading = AtxStart:s Sp? AtxInline+:a (Sp? "#"* Sp)? Newline { RDoc::Markup::Heading.new(s, a.join) }
- def _AtxHeading
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_AtxStart)
- s = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = apply(:_Sp)
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _ary = []
- _tmp = apply(:_AtxInline)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_AtxInline)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save2
- end
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = apply(:_Sp)
- unless _tmp
- _tmp = true
- self.pos = _save5
- end
- unless _tmp
- self.pos = _save4
- break
- end
- while true
- _tmp = match_string("#")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- unless _tmp
- _tmp = true
- self.pos = _save3
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::Heading.new(s, a.join) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_AtxHeading unless _tmp
- return _tmp
- end
-
- # SetextHeading = (SetextHeading1 | SetextHeading2)
- def _SetextHeading
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_SetextHeading1)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_SetextHeading2)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_SetextHeading unless _tmp
- return _tmp
- end
-
- # SetextBottom1 = "===" "="* Newline
- def _SetextBottom1
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("===")
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = match_string("=")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_SetextBottom1 unless _tmp
- return _tmp
- end
-
- # SetextBottom2 = "---" "-"* Newline
- def _SetextBottom2
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("---")
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = match_string("-")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_SetextBottom2 unless _tmp
- return _tmp
- end
-
- # SetextHeading1 = &(RawLine SetextBottom1) StartList:a (!Endline Inline:b { a << b })+ Sp? Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }
- def _SetextHeading1
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = apply(:_RawLine)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_SetextBottom1)
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = apply(:_Endline)
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_Inline)
- b = @result
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save6 = self.pos
- while true # sequence
- _save7 = self.pos
- _tmp = apply(:_Endline)
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save6
- break
- end
- _tmp = apply(:_Inline)
- b = @result
- unless _tmp
- self.pos = _save6
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save6
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save3
- end
- unless _tmp
- self.pos = _save
- break
- end
- _save8 = self.pos
- _tmp = apply(:_Sp)
- unless _tmp
- _tmp = true
- self.pos = _save8
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_SetextBottom1)
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::Heading.new(1, a.join) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_SetextHeading1 unless _tmp
- return _tmp
- end
-
- # SetextHeading2 = &(RawLine SetextBottom2) StartList:a (!Endline Inline:b { a << b })+ Sp? Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }
- def _SetextHeading2
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = apply(:_RawLine)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_SetextBottom2)
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = apply(:_Endline)
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_Inline)
- b = @result
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save6 = self.pos
- while true # sequence
- _save7 = self.pos
- _tmp = apply(:_Endline)
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save6
- break
- end
- _tmp = apply(:_Inline)
- b = @result
- unless _tmp
- self.pos = _save6
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save6
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save3
- end
- unless _tmp
- self.pos = _save
- break
- end
- _save8 = self.pos
- _tmp = apply(:_Sp)
- unless _tmp
- _tmp = true
- self.pos = _save8
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_SetextBottom2)
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::Heading.new(2, a.join) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_SetextHeading2 unless _tmp
- return _tmp
- end
-
- # Heading = (SetextHeading | AtxHeading)
- def _Heading
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_SetextHeading)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_AtxHeading)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Heading unless _tmp
- return _tmp
- end
-
- # BlockQuote = BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }
- def _BlockQuote
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_BlockQuoteRaw)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::BlockQuote.new(*a) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_BlockQuote unless _tmp
- return _tmp
- end
-
- # BlockQuoteRaw = StartList:a (">" " "? Line:l { a << l } (!">" !BlankLine Line:c { a << c })* (BlankLine:n { a << n })*)+ { inner_parse a.join }
- def _BlockQuoteRaw
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save2
- break
- end
- _save3 = self.pos
- _tmp = match_string(" ")
- unless _tmp
- _tmp = true
- self.pos = _save3
- end
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Line)
- l = @result
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- break
- end
- while true
-
- _save5 = self.pos
- while true # sequence
- _save6 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save5
- break
- end
- _save7 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Line)
- c = @result
- unless _tmp
- self.pos = _save5
- break
- end
- @result = begin; a << c ; end
- _tmp = true
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- break
- end
- while true
-
- _save9 = self.pos
- while true # sequence
- _tmp = apply(:_BlankLine)
- n = @result
- unless _tmp
- self.pos = _save9
- break
- end
- @result = begin; a << n ; end
- _tmp = true
- unless _tmp
- self.pos = _save9
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save10 = self.pos
- while true # sequence
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save10
- break
- end
- _save11 = self.pos
- _tmp = match_string(" ")
- unless _tmp
- _tmp = true
- self.pos = _save11
- end
- unless _tmp
- self.pos = _save10
- break
- end
- _tmp = apply(:_Line)
- l = @result
- unless _tmp
- self.pos = _save10
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save10
- break
- end
- while true
-
- _save13 = self.pos
- while true # sequence
- _save14 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save14
- unless _tmp
- self.pos = _save13
- break
- end
- _save15 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save15
- unless _tmp
- self.pos = _save13
- break
- end
- _tmp = apply(:_Line)
- c = @result
- unless _tmp
- self.pos = _save13
- break
- end
- @result = begin; a << c ; end
- _tmp = true
- unless _tmp
- self.pos = _save13
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save10
- break
- end
- while true
-
- _save17 = self.pos
- while true # sequence
- _tmp = apply(:_BlankLine)
- n = @result
- unless _tmp
- self.pos = _save17
- break
- end
- @result = begin; a << n ; end
- _tmp = true
- unless _tmp
- self.pos = _save17
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save10
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; inner_parse a.join ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_BlockQuoteRaw unless _tmp
- return _tmp
- end
-
- # NonblankIndentedLine = !BlankLine IndentedLine
- def _NonblankIndentedLine
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_IndentedLine)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_NonblankIndentedLine unless _tmp
- return _tmp
- end
-
- # VerbatimChunk = BlankLine*:a NonblankIndentedLine+:b { a.concat b }
- def _VerbatimChunk
-
- _save = self.pos
- while true # sequence
- _ary = []
- while true
- _tmp = apply(:_BlankLine)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _ary = []
- _tmp = apply(:_NonblankIndentedLine)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_NonblankIndentedLine)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save2
- end
- b = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a.concat b ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_VerbatimChunk unless _tmp
- return _tmp
- end
-
- # Verbatim = VerbatimChunk+:a { RDoc::Markup::Verbatim.new(*a.flatten) }
- def _Verbatim
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _ary = []
- _tmp = apply(:_VerbatimChunk)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_VerbatimChunk)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save1
- end
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::Verbatim.new(*a.flatten) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Verbatim unless _tmp
- return _tmp
- end
-
- # HorizontalRule = NonindentSpace ("*" Sp "*" Sp "*" (Sp "*")* | "-" Sp "-" Sp "-" (Sp "-")* | "_" Sp "_" Sp "_" (Sp "_")*) Sp Newline BlankLine+ { RDoc::Markup::Rule.new 1 }
- def _HorizontalRule
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
-
- _save2 = self.pos
- while true # sequence
- _tmp = match_string("*")
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = match_string("*")
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = match_string("*")
- unless _tmp
- self.pos = _save2
- break
- end
- while true
-
- _save4 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = match_string("*")
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save5 = self.pos
- while true # sequence
- _tmp = match_string("-")
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = match_string("-")
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = match_string("-")
- unless _tmp
- self.pos = _save5
- break
- end
- while true
-
- _save7 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save7
- break
- end
- _tmp = match_string("-")
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save8 = self.pos
- while true # sequence
- _tmp = match_string("_")
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = match_string("_")
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = match_string("_")
- unless _tmp
- self.pos = _save8
- break
- end
- while true
-
- _save10 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save10
- break
- end
- _tmp = match_string("_")
- unless _tmp
- self.pos = _save10
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save8
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- _save11 = self.pos
- _tmp = apply(:_BlankLine)
- if _tmp
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save11
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::Rule.new 1 ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HorizontalRule unless _tmp
- return _tmp
- end
-
- # Bullet = !HorizontalRule NonindentSpace ("+" | "*" | "-") Spacechar+
- def _Bullet
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_HorizontalRule)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save2 = self.pos
- while true # choice
- _tmp = match_string("+")
- break if _tmp
- self.pos = _save2
- _tmp = match_string("*")
- break if _tmp
- self.pos = _save2
- _tmp = match_string("-")
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
- _tmp = apply(:_Spacechar)
- if _tmp
- while true
- _tmp = apply(:_Spacechar)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save3
- end
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Bullet unless _tmp
- return _tmp
- end
-
- # BulletList = &Bullet (ListTight | ListLoose):a { RDoc::Markup::List.new(:BULLET, *a) }
- def _BulletList
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Bullet)
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_ListTight)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_ListLoose)
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::List.new(:BULLET, *a) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_BulletList unless _tmp
- return _tmp
- end
-
- # ListTight = ListItemTight+:a BlankLine* !(Bullet | Enumerator) { a }
- def _ListTight
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _ary = []
- _tmp = apply(:_ListItemTight)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_ListItemTight)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save1
- end
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
-
- _save4 = self.pos
- while true # choice
- _tmp = apply(:_Bullet)
- break if _tmp
- self.pos = _save4
- _tmp = apply(:_Enumerator)
- break if _tmp
- self.pos = _save4
- break
- end # end choice
-
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListTight unless _tmp
- return _tmp
- end
-
- # ListLoose = StartList:a (ListItem:b BlankLine* { a << b })+ { a }
- def _ListLoose
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = apply(:_ListItem)
- b = @result
- unless _tmp
- self.pos = _save2
- break
- end
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save4 = self.pos
- while true # sequence
- _tmp = apply(:_ListItem)
- b = @result
- unless _tmp
- self.pos = _save4
- break
- end
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListLoose unless _tmp
- return _tmp
- end
-
- # ListItem = (Bullet | Enumerator) StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }
- def _ListItem
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_Bullet)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_Enumerator)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_ListBlock)
- b = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << b ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save3 = self.pos
- while true # sequence
- _tmp = apply(:_ListContinuationBlock)
- c = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; a.push(*c) ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; list_item_from a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListItem unless _tmp
- return _tmp
- end
-
- # ListItemTight = (Bullet | Enumerator) ListBlock:a (!BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }
- def _ListItemTight
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_Bullet)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_Enumerator)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_ListBlock)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_ListContinuationBlock)
- b = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; a.push(*b) ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _save5 = self.pos
- _tmp = apply(:_ListContinuationBlock)
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; list_item_from a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListItemTight unless _tmp
- return _tmp
- end
-
- # ListBlock = !BlankLine Line:a ListBlockLine*:c { [a, *c] }
- def _ListBlock
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Line)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _ary = []
- while true
- _tmp = apply(:_ListBlockLine)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- c = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; [a, *c] ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListBlock unless _tmp
- return _tmp
- end
-
- # ListContinuationBlock = StartList:a BlankLine* { a << "\n" } (Indent ListBlock:b { a.concat b })+ { a }
- def _ListContinuationBlock
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << "\n" ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _tmp = apply(:_Indent)
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_ListBlock)
- b = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; a.concat b ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save4 = self.pos
- while true # sequence
- _tmp = apply(:_Indent)
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_ListBlock)
- b = @result
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; a.concat b ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListContinuationBlock unless _tmp
- return _tmp
- end
-
- # Enumerator = NonindentSpace [0-9]+ "." Spacechar+
- def _Enumerator
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _save2 = self.pos
- _tmp = get_byte
- if _tmp
- unless _tmp >= 48 and _tmp <= 57
- self.pos = _save2
- _tmp = nil
- end
- end
- if _tmp
- while true
- _save3 = self.pos
- _tmp = get_byte
- if _tmp
- unless _tmp >= 48 and _tmp <= 57
- self.pos = _save3
- _tmp = nil
- end
- end
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(".")
- unless _tmp
- self.pos = _save
- break
- end
- _save4 = self.pos
- _tmp = apply(:_Spacechar)
- if _tmp
- while true
- _tmp = apply(:_Spacechar)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save4
- end
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Enumerator unless _tmp
- return _tmp
- end
-
- # OrderedList = &Enumerator (ListTight | ListLoose):a { RDoc::Markup::List.new(:NUMBER, *a) }
- def _OrderedList
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Enumerator)
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_ListTight)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_ListLoose)
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::List.new(:NUMBER, *a) ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_OrderedList unless _tmp
- return _tmp
- end
-
- # ListBlockLine = !BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine
- def _ListBlockLine
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_Indent)
- unless _tmp
- _tmp = true
- self.pos = _save4
- end
- unless _tmp
- self.pos = _save3
- break
- end
-
- _save5 = self.pos
- while true # choice
- _tmp = apply(:_Bullet)
- break if _tmp
- self.pos = _save5
- _tmp = apply(:_Enumerator)
- break if _tmp
- self.pos = _save5
- break
- end # end choice
-
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _save6 = self.pos
- _tmp = apply(:_HorizontalRule)
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_OptionallyIndentedLine)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ListBlockLine unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenAddress = "<" Spnl ("address" | "ADDRESS") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenAddress
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("address")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("ADDRESS")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenAddress unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseAddress = "<" Spnl "/" ("address" | "ADDRESS") Spnl ">"
- def _HtmlBlockCloseAddress
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("address")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("ADDRESS")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseAddress unless _tmp
- return _tmp
- end
-
- # HtmlBlockAddress = HtmlBlockOpenAddress (HtmlBlockAddress | !HtmlBlockCloseAddress .)* HtmlBlockCloseAddress
- def _HtmlBlockAddress
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenAddress)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockAddress)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseAddress)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseAddress)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockAddress unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenBlockquote = "<" Spnl ("blockquote" | "BLOCKQUOTE") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenBlockquote
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("blockquote")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("BLOCKQUOTE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenBlockquote unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseBlockquote = "<" Spnl "/" ("blockquote" | "BLOCKQUOTE") Spnl ">"
- def _HtmlBlockCloseBlockquote
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("blockquote")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("BLOCKQUOTE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseBlockquote unless _tmp
- return _tmp
- end
-
- # HtmlBlockBlockquote = HtmlBlockOpenBlockquote (HtmlBlockBlockquote | !HtmlBlockCloseBlockquote .)* HtmlBlockCloseBlockquote
- def _HtmlBlockBlockquote
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenBlockquote)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockBlockquote)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseBlockquote)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseBlockquote)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockBlockquote unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenCenter = "<" Spnl ("center" | "CENTER") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenCenter
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("center")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("CENTER")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenCenter unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseCenter = "<" Spnl "/" ("center" | "CENTER") Spnl ">"
- def _HtmlBlockCloseCenter
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("center")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("CENTER")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseCenter unless _tmp
- return _tmp
- end
-
- # HtmlBlockCenter = HtmlBlockOpenCenter (HtmlBlockCenter | !HtmlBlockCloseCenter .)* HtmlBlockCloseCenter
- def _HtmlBlockCenter
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenCenter)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockCenter)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseCenter)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseCenter)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCenter unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenDir = "<" Spnl ("dir" | "DIR") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenDir
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dir")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DIR")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenDir unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseDir = "<" Spnl "/" ("dir" | "DIR") Spnl ">"
- def _HtmlBlockCloseDir
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dir")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DIR")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseDir unless _tmp
- return _tmp
- end
-
- # HtmlBlockDir = HtmlBlockOpenDir (HtmlBlockDir | !HtmlBlockCloseDir .)* HtmlBlockCloseDir
- def _HtmlBlockDir
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenDir)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockDir)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseDir)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseDir)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockDir unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenDiv = "<" Spnl ("div" | "DIV") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenDiv
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("div")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DIV")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenDiv unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseDiv = "<" Spnl "/" ("div" | "DIV") Spnl ">"
- def _HtmlBlockCloseDiv
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("div")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DIV")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseDiv unless _tmp
- return _tmp
- end
-
- # HtmlBlockDiv = HtmlBlockOpenDiv (HtmlBlockDiv | !HtmlBlockCloseDiv .)* HtmlBlockCloseDiv
- def _HtmlBlockDiv
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenDiv)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockDiv)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseDiv)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseDiv)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockDiv unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenDl = "<" Spnl ("dl" | "DL") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenDl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dl")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DL")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenDl unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseDl = "<" Spnl "/" ("dl" | "DL") Spnl ">"
- def _HtmlBlockCloseDl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dl")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DL")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseDl unless _tmp
- return _tmp
- end
-
- # HtmlBlockDl = HtmlBlockOpenDl (HtmlBlockDl | !HtmlBlockCloseDl .)* HtmlBlockCloseDl
- def _HtmlBlockDl
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenDl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockDl)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseDl)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseDl)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockDl unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenFieldset = "<" Spnl ("fieldset" | "FIELDSET") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenFieldset
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("fieldset")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("FIELDSET")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenFieldset unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseFieldset = "<" Spnl "/" ("fieldset" | "FIELDSET") Spnl ">"
- def _HtmlBlockCloseFieldset
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("fieldset")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("FIELDSET")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseFieldset unless _tmp
- return _tmp
- end
-
- # HtmlBlockFieldset = HtmlBlockOpenFieldset (HtmlBlockFieldset | !HtmlBlockCloseFieldset .)* HtmlBlockCloseFieldset
- def _HtmlBlockFieldset
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenFieldset)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockFieldset)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseFieldset)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseFieldset)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockFieldset unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenForm = "<" Spnl ("form" | "FORM") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenForm
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("form")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("FORM")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenForm unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseForm = "<" Spnl "/" ("form" | "FORM") Spnl ">"
- def _HtmlBlockCloseForm
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("form")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("FORM")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseForm unless _tmp
- return _tmp
- end
-
- # HtmlBlockForm = HtmlBlockOpenForm (HtmlBlockForm | !HtmlBlockCloseForm .)* HtmlBlockCloseForm
- def _HtmlBlockForm
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenForm)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockForm)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseForm)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseForm)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockForm unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenH1 = "<" Spnl ("h1" | "H1") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenH1
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h1")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H1")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenH1 unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseH1 = "<" Spnl "/" ("h1" | "H1") Spnl ">"
- def _HtmlBlockCloseH1
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h1")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H1")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseH1 unless _tmp
- return _tmp
- end
-
- # HtmlBlockH1 = HtmlBlockOpenH1 (HtmlBlockH1 | !HtmlBlockCloseH1 .)* HtmlBlockCloseH1
- def _HtmlBlockH1
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenH1)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockH1)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseH1)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseH1)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockH1 unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenH2 = "<" Spnl ("h2" | "H2") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenH2
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h2")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H2")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenH2 unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseH2 = "<" Spnl "/" ("h2" | "H2") Spnl ">"
- def _HtmlBlockCloseH2
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h2")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H2")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseH2 unless _tmp
- return _tmp
- end
-
- # HtmlBlockH2 = HtmlBlockOpenH2 (HtmlBlockH2 | !HtmlBlockCloseH2 .)* HtmlBlockCloseH2
- def _HtmlBlockH2
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenH2)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockH2)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseH2)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseH2)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockH2 unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenH3 = "<" Spnl ("h3" | "H3") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenH3
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h3")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H3")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenH3 unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseH3 = "<" Spnl "/" ("h3" | "H3") Spnl ">"
- def _HtmlBlockCloseH3
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h3")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H3")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseH3 unless _tmp
- return _tmp
- end
-
- # HtmlBlockH3 = HtmlBlockOpenH3 (HtmlBlockH3 | !HtmlBlockCloseH3 .)* HtmlBlockCloseH3
- def _HtmlBlockH3
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenH3)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockH3)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseH3)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseH3)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockH3 unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenH4 = "<" Spnl ("h4" | "H4") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenH4
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h4")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H4")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenH4 unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseH4 = "<" Spnl "/" ("h4" | "H4") Spnl ">"
- def _HtmlBlockCloseH4
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h4")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H4")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseH4 unless _tmp
- return _tmp
- end
-
- # HtmlBlockH4 = HtmlBlockOpenH4 (HtmlBlockH4 | !HtmlBlockCloseH4 .)* HtmlBlockCloseH4
- def _HtmlBlockH4
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenH4)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockH4)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseH4)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseH4)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockH4 unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenH5 = "<" Spnl ("h5" | "H5") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenH5
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h5")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H5")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenH5 unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseH5 = "<" Spnl "/" ("h5" | "H5") Spnl ">"
- def _HtmlBlockCloseH5
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h5")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H5")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseH5 unless _tmp
- return _tmp
- end
-
- # HtmlBlockH5 = HtmlBlockOpenH5 (HtmlBlockH5 | !HtmlBlockCloseH5 .)* HtmlBlockCloseH5
- def _HtmlBlockH5
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenH5)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockH5)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseH5)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseH5)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockH5 unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenH6 = "<" Spnl ("h6" | "H6") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenH6
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h6")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H6")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenH6 unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseH6 = "<" Spnl "/" ("h6" | "H6") Spnl ">"
- def _HtmlBlockCloseH6
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("h6")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("H6")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseH6 unless _tmp
- return _tmp
- end
-
- # HtmlBlockH6 = HtmlBlockOpenH6 (HtmlBlockH6 | !HtmlBlockCloseH6 .)* HtmlBlockCloseH6
- def _HtmlBlockH6
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenH6)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockH6)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseH6)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseH6)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockH6 unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenMenu = "<" Spnl ("menu" | "MENU") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenMenu
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("menu")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("MENU")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenMenu unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseMenu = "<" Spnl "/" ("menu" | "MENU") Spnl ">"
- def _HtmlBlockCloseMenu
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("menu")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("MENU")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseMenu unless _tmp
- return _tmp
- end
-
- # HtmlBlockMenu = HtmlBlockOpenMenu (HtmlBlockMenu | !HtmlBlockCloseMenu .)* HtmlBlockCloseMenu
- def _HtmlBlockMenu
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenMenu)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockMenu)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseMenu)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseMenu)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockMenu unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenNoframes = "<" Spnl ("noframes" | "NOFRAMES") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenNoframes
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("noframes")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("NOFRAMES")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenNoframes unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseNoframes = "<" Spnl "/" ("noframes" | "NOFRAMES") Spnl ">"
- def _HtmlBlockCloseNoframes
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("noframes")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("NOFRAMES")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseNoframes unless _tmp
- return _tmp
- end
-
- # HtmlBlockNoframes = HtmlBlockOpenNoframes (HtmlBlockNoframes | !HtmlBlockCloseNoframes .)* HtmlBlockCloseNoframes
- def _HtmlBlockNoframes
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenNoframes)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockNoframes)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseNoframes)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseNoframes)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockNoframes unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenNoscript = "<" Spnl ("noscript" | "NOSCRIPT") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenNoscript
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("noscript")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("NOSCRIPT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenNoscript unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseNoscript = "<" Spnl "/" ("noscript" | "NOSCRIPT") Spnl ">"
- def _HtmlBlockCloseNoscript
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("noscript")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("NOSCRIPT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseNoscript unless _tmp
- return _tmp
- end
-
- # HtmlBlockNoscript = HtmlBlockOpenNoscript (HtmlBlockNoscript | !HtmlBlockCloseNoscript .)* HtmlBlockCloseNoscript
- def _HtmlBlockNoscript
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenNoscript)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockNoscript)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseNoscript)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseNoscript)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockNoscript unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenOl = "<" Spnl ("ol" | "OL") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenOl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("ol")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("OL")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenOl unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseOl = "<" Spnl "/" ("ol" | "OL") Spnl ">"
- def _HtmlBlockCloseOl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("ol")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("OL")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseOl unless _tmp
- return _tmp
- end
-
- # HtmlBlockOl = HtmlBlockOpenOl (HtmlBlockOl | !HtmlBlockCloseOl .)* HtmlBlockCloseOl
- def _HtmlBlockOl
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenOl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockOl)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseOl)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseOl)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOl unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenP = "<" Spnl ("p" | "P") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenP
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("p")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("P")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenP unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseP = "<" Spnl "/" ("p" | "P") Spnl ">"
- def _HtmlBlockCloseP
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("p")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("P")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseP unless _tmp
- return _tmp
- end
-
- # HtmlBlockP = HtmlBlockOpenP (HtmlBlockP | !HtmlBlockCloseP .)* HtmlBlockCloseP
- def _HtmlBlockP
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenP)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockP)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseP)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseP)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockP unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenPre = "<" Spnl ("pre" | "PRE") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenPre
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("pre")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("PRE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenPre unless _tmp
- return _tmp
- end
-
- # HtmlBlockClosePre = "<" Spnl "/" ("pre" | "PRE") Spnl ">"
- def _HtmlBlockClosePre
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("pre")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("PRE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockClosePre unless _tmp
- return _tmp
- end
-
- # HtmlBlockPre = HtmlBlockOpenPre (HtmlBlockPre | !HtmlBlockClosePre .)* HtmlBlockClosePre
- def _HtmlBlockPre
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenPre)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockPre)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockClosePre)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockClosePre)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockPre unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenTable = "<" Spnl ("table" | "TABLE") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenTable
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("table")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TABLE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenTable unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseTable = "<" Spnl "/" ("table" | "TABLE") Spnl ">"
- def _HtmlBlockCloseTable
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("table")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TABLE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseTable unless _tmp
- return _tmp
- end
-
- # HtmlBlockTable = HtmlBlockOpenTable (HtmlBlockTable | !HtmlBlockCloseTable .)* HtmlBlockCloseTable
- def _HtmlBlockTable
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenTable)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockTable)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseTable)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseTable)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockTable unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenUl = "<" Spnl ("ul" | "UL") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenUl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("ul")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("UL")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenUl unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseUl = "<" Spnl "/" ("ul" | "UL") Spnl ">"
- def _HtmlBlockCloseUl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("ul")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("UL")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseUl unless _tmp
- return _tmp
- end
-
- # HtmlBlockUl = HtmlBlockOpenUl (HtmlBlockUl | !HtmlBlockCloseUl .)* HtmlBlockCloseUl
- def _HtmlBlockUl
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenUl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockUl)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseUl)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseUl)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockUl unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenDd = "<" Spnl ("dd" | "DD") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenDd
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dd")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DD")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenDd unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseDd = "<" Spnl "/" ("dd" | "DD") Spnl ">"
- def _HtmlBlockCloseDd
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dd")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DD")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseDd unless _tmp
- return _tmp
- end
-
- # HtmlBlockDd = HtmlBlockOpenDd (HtmlBlockDd | !HtmlBlockCloseDd .)* HtmlBlockCloseDd
- def _HtmlBlockDd
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenDd)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockDd)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseDd)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseDd)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockDd unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenDt = "<" Spnl ("dt" | "DT") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenDt
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dt")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenDt unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseDt = "<" Spnl "/" ("dt" | "DT") Spnl ">"
- def _HtmlBlockCloseDt
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("dt")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("DT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseDt unless _tmp
- return _tmp
- end
-
- # HtmlBlockDt = HtmlBlockOpenDt (HtmlBlockDt | !HtmlBlockCloseDt .)* HtmlBlockCloseDt
- def _HtmlBlockDt
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenDt)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockDt)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseDt)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseDt)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockDt unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenFrameset = "<" Spnl ("frameset" | "FRAMESET") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenFrameset
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("frameset")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("FRAMESET")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenFrameset unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseFrameset = "<" Spnl "/" ("frameset" | "FRAMESET") Spnl ">"
- def _HtmlBlockCloseFrameset
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("frameset")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("FRAMESET")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseFrameset unless _tmp
- return _tmp
- end
-
- # HtmlBlockFrameset = HtmlBlockOpenFrameset (HtmlBlockFrameset | !HtmlBlockCloseFrameset .)* HtmlBlockCloseFrameset
- def _HtmlBlockFrameset
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenFrameset)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockFrameset)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseFrameset)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseFrameset)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockFrameset unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenLi = "<" Spnl ("li" | "LI") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenLi
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("li")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("LI")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenLi unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseLi = "<" Spnl "/" ("li" | "LI") Spnl ">"
- def _HtmlBlockCloseLi
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("li")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("LI")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseLi unless _tmp
- return _tmp
- end
-
- # HtmlBlockLi = HtmlBlockOpenLi (HtmlBlockLi | !HtmlBlockCloseLi .)* HtmlBlockCloseLi
- def _HtmlBlockLi
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenLi)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockLi)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseLi)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseLi)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockLi unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenTbody = "<" Spnl ("tbody" | "TBODY") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenTbody
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("tbody")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TBODY")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenTbody unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseTbody = "<" Spnl "/" ("tbody" | "TBODY") Spnl ">"
- def _HtmlBlockCloseTbody
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("tbody")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TBODY")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseTbody unless _tmp
- return _tmp
- end
-
- # HtmlBlockTbody = HtmlBlockOpenTbody (HtmlBlockTbody | !HtmlBlockCloseTbody .)* HtmlBlockCloseTbody
- def _HtmlBlockTbody
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenTbody)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockTbody)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseTbody)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseTbody)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockTbody unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenTd = "<" Spnl ("td" | "TD") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenTd
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("td")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TD")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenTd unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseTd = "<" Spnl "/" ("td" | "TD") Spnl ">"
- def _HtmlBlockCloseTd
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("td")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TD")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseTd unless _tmp
- return _tmp
- end
-
- # HtmlBlockTd = HtmlBlockOpenTd (HtmlBlockTd | !HtmlBlockCloseTd .)* HtmlBlockCloseTd
- def _HtmlBlockTd
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenTd)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockTd)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseTd)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseTd)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockTd unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenTfoot = "<" Spnl ("tfoot" | "TFOOT") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenTfoot
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("tfoot")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TFOOT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenTfoot unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseTfoot = "<" Spnl "/" ("tfoot" | "TFOOT") Spnl ">"
- def _HtmlBlockCloseTfoot
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("tfoot")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TFOOT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseTfoot unless _tmp
- return _tmp
- end
-
- # HtmlBlockTfoot = HtmlBlockOpenTfoot (HtmlBlockTfoot | !HtmlBlockCloseTfoot .)* HtmlBlockCloseTfoot
- def _HtmlBlockTfoot
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenTfoot)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockTfoot)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseTfoot)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseTfoot)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockTfoot unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenTh = "<" Spnl ("th" | "TH") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenTh
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("th")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TH")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenTh unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseTh = "<" Spnl "/" ("th" | "TH") Spnl ">"
- def _HtmlBlockCloseTh
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("th")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TH")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseTh unless _tmp
- return _tmp
- end
-
- # HtmlBlockTh = HtmlBlockOpenTh (HtmlBlockTh | !HtmlBlockCloseTh .)* HtmlBlockCloseTh
- def _HtmlBlockTh
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenTh)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockTh)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseTh)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseTh)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockTh unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenThead = "<" Spnl ("thead" | "THEAD") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenThead
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("thead")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("THEAD")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenThead unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseThead = "<" Spnl "/" ("thead" | "THEAD") Spnl ">"
- def _HtmlBlockCloseThead
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("thead")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("THEAD")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseThead unless _tmp
- return _tmp
- end
-
- # HtmlBlockThead = HtmlBlockOpenThead (HtmlBlockThead | !HtmlBlockCloseThead .)* HtmlBlockCloseThead
- def _HtmlBlockThead
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenThead)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockThead)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseThead)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseThead)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockThead unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenTr = "<" Spnl ("tr" | "TR") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenTr
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("tr")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TR")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenTr unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseTr = "<" Spnl "/" ("tr" | "TR") Spnl ">"
- def _HtmlBlockCloseTr
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("tr")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("TR")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseTr unless _tmp
- return _tmp
- end
-
- # HtmlBlockTr = HtmlBlockOpenTr (HtmlBlockTr | !HtmlBlockCloseTr .)* HtmlBlockCloseTr
- def _HtmlBlockTr
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenTr)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockTr)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_HtmlBlockCloseTr)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseTr)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockTr unless _tmp
- return _tmp
- end
-
- # HtmlBlockOpenScript = "<" Spnl ("script" | "SCRIPT") Spnl HtmlAttribute* ">"
- def _HtmlBlockOpenScript
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("script")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("SCRIPT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockOpenScript unless _tmp
- return _tmp
- end
-
- # HtmlBlockCloseScript = "<" Spnl "/" ("script" | "SCRIPT") Spnl ">"
- def _HtmlBlockCloseScript
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("script")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("SCRIPT")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockCloseScript unless _tmp
- return _tmp
- end
-
- # HtmlBlockScript = HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript
- def _HtmlBlockScript
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_HtmlBlockOpenScript)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_HtmlBlockCloseScript)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockCloseScript)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockScript unless _tmp
- return _tmp
- end
-
- # HtmlBlockInTags = (HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript)
- def _HtmlBlockInTags
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockAddress)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockBlockquote)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockCenter)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockDir)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockDiv)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockDl)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockFieldset)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockForm)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockH1)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockH2)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockH3)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockH4)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockH5)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockH6)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockMenu)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockNoframes)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockNoscript)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockOl)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockP)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockPre)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockTable)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockUl)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockDd)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockDt)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockFrameset)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockLi)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockTbody)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockTd)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockTfoot)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockTh)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockThead)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockTr)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_HtmlBlockScript)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_HtmlBlockInTags unless _tmp
- return _tmp
- end
-
- # HtmlBlock = < (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > BlankLine+ { if html? then RDoc::Markup::Raw.new text end }
- def _HtmlBlock
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlockInTags)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_HtmlComment)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_HtmlBlockSelfClosing)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_HtmlUnclosed)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_BlankLine)
- if _tmp
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; if html? then
- RDoc::Markup::Raw.new text
- end ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlock unless _tmp
- return _tmp
- end
-
- # HtmlUnclosed = "<" Spnl HtmlUnclosedType Spnl HtmlAttribute* Spnl ">"
- def _HtmlUnclosed
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlUnclosedType)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlUnclosed unless _tmp
- return _tmp
- end
-
- # HtmlUnclosedType = ("HR" | "hr")
- def _HtmlUnclosedType
-
- _save = self.pos
- while true # choice
- _tmp = match_string("HR")
- break if _tmp
- self.pos = _save
- _tmp = match_string("hr")
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_HtmlUnclosedType unless _tmp
- return _tmp
- end
-
- # HtmlBlockSelfClosing = "<" Spnl HtmlBlockType Spnl HtmlAttribute* "/" Spnl ">"
- def _HtmlBlockSelfClosing
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_HtmlBlockType)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlBlockSelfClosing unless _tmp
- return _tmp
- end
-
- # HtmlBlockType = ("ADDRESS" | "BLOCKQUOTE" | "CENTER" | "DD" | "DIR" | "DIV" | "DL" | "DT" | "FIELDSET" | "FORM" | "FRAMESET" | "H1" | "H2" | "H3" | "H4" | "H5" | "H6" | "HR" | "ISINDEX" | "LI" | "MENU" | "NOFRAMES" | "NOSCRIPT" | "OL" | "P" | "PRE" | "SCRIPT" | "TABLE" | "TBODY" | "TD" | "TFOOT" | "TH" | "THEAD" | "TR" | "UL" | "address" | "blockquote" | "center" | "dd" | "dir" | "div" | "dl" | "dt" | "fieldset" | "form" | "frameset" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "hr" | "isindex" | "li" | "menu" | "noframes" | "noscript" | "ol" | "p" | "pre" | "script" | "table" | "tbody" | "td" | "tfoot" | "th" | "thead" | "tr" | "ul")
- def _HtmlBlockType
-
- _save = self.pos
- while true # choice
- _tmp = match_string("ADDRESS")
- break if _tmp
- self.pos = _save
- _tmp = match_string("BLOCKQUOTE")
- break if _tmp
- self.pos = _save
- _tmp = match_string("CENTER")
- break if _tmp
- self.pos = _save
- _tmp = match_string("DD")
- break if _tmp
- self.pos = _save
- _tmp = match_string("DIR")
- break if _tmp
- self.pos = _save
- _tmp = match_string("DIV")
- break if _tmp
- self.pos = _save
- _tmp = match_string("DL")
- break if _tmp
- self.pos = _save
- _tmp = match_string("DT")
- break if _tmp
- self.pos = _save
- _tmp = match_string("FIELDSET")
- break if _tmp
- self.pos = _save
- _tmp = match_string("FORM")
- break if _tmp
- self.pos = _save
- _tmp = match_string("FRAMESET")
- break if _tmp
- self.pos = _save
- _tmp = match_string("H1")
- break if _tmp
- self.pos = _save
- _tmp = match_string("H2")
- break if _tmp
- self.pos = _save
- _tmp = match_string("H3")
- break if _tmp
- self.pos = _save
- _tmp = match_string("H4")
- break if _tmp
- self.pos = _save
- _tmp = match_string("H5")
- break if _tmp
- self.pos = _save
- _tmp = match_string("H6")
- break if _tmp
- self.pos = _save
- _tmp = match_string("HR")
- break if _tmp
- self.pos = _save
- _tmp = match_string("ISINDEX")
- break if _tmp
- self.pos = _save
- _tmp = match_string("LI")
- break if _tmp
- self.pos = _save
- _tmp = match_string("MENU")
- break if _tmp
- self.pos = _save
- _tmp = match_string("NOFRAMES")
- break if _tmp
- self.pos = _save
- _tmp = match_string("NOSCRIPT")
- break if _tmp
- self.pos = _save
- _tmp = match_string("OL")
- break if _tmp
- self.pos = _save
- _tmp = match_string("P")
- break if _tmp
- self.pos = _save
- _tmp = match_string("PRE")
- break if _tmp
- self.pos = _save
- _tmp = match_string("SCRIPT")
- break if _tmp
- self.pos = _save
- _tmp = match_string("TABLE")
- break if _tmp
- self.pos = _save
- _tmp = match_string("TBODY")
- break if _tmp
- self.pos = _save
- _tmp = match_string("TD")
- break if _tmp
- self.pos = _save
- _tmp = match_string("TFOOT")
- break if _tmp
- self.pos = _save
- _tmp = match_string("TH")
- break if _tmp
- self.pos = _save
- _tmp = match_string("THEAD")
- break if _tmp
- self.pos = _save
- _tmp = match_string("TR")
- break if _tmp
- self.pos = _save
- _tmp = match_string("UL")
- break if _tmp
- self.pos = _save
- _tmp = match_string("address")
- break if _tmp
- self.pos = _save
- _tmp = match_string("blockquote")
- break if _tmp
- self.pos = _save
- _tmp = match_string("center")
- break if _tmp
- self.pos = _save
- _tmp = match_string("dd")
- break if _tmp
- self.pos = _save
- _tmp = match_string("dir")
- break if _tmp
- self.pos = _save
- _tmp = match_string("div")
- break if _tmp
- self.pos = _save
- _tmp = match_string("dl")
- break if _tmp
- self.pos = _save
- _tmp = match_string("dt")
- break if _tmp
- self.pos = _save
- _tmp = match_string("fieldset")
- break if _tmp
- self.pos = _save
- _tmp = match_string("form")
- break if _tmp
- self.pos = _save
- _tmp = match_string("frameset")
- break if _tmp
- self.pos = _save
- _tmp = match_string("h1")
- break if _tmp
- self.pos = _save
- _tmp = match_string("h2")
- break if _tmp
- self.pos = _save
- _tmp = match_string("h3")
- break if _tmp
- self.pos = _save
- _tmp = match_string("h4")
- break if _tmp
- self.pos = _save
- _tmp = match_string("h5")
- break if _tmp
- self.pos = _save
- _tmp = match_string("h6")
- break if _tmp
- self.pos = _save
- _tmp = match_string("hr")
- break if _tmp
- self.pos = _save
- _tmp = match_string("isindex")
- break if _tmp
- self.pos = _save
- _tmp = match_string("li")
- break if _tmp
- self.pos = _save
- _tmp = match_string("menu")
- break if _tmp
- self.pos = _save
- _tmp = match_string("noframes")
- break if _tmp
- self.pos = _save
- _tmp = match_string("noscript")
- break if _tmp
- self.pos = _save
- _tmp = match_string("ol")
- break if _tmp
- self.pos = _save
- _tmp = match_string("p")
- break if _tmp
- self.pos = _save
- _tmp = match_string("pre")
- break if _tmp
- self.pos = _save
- _tmp = match_string("script")
- break if _tmp
- self.pos = _save
- _tmp = match_string("table")
- break if _tmp
- self.pos = _save
- _tmp = match_string("tbody")
- break if _tmp
- self.pos = _save
- _tmp = match_string("td")
- break if _tmp
- self.pos = _save
- _tmp = match_string("tfoot")
- break if _tmp
- self.pos = _save
- _tmp = match_string("th")
- break if _tmp
- self.pos = _save
- _tmp = match_string("thead")
- break if _tmp
- self.pos = _save
- _tmp = match_string("tr")
- break if _tmp
- self.pos = _save
- _tmp = match_string("ul")
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_HtmlBlockType unless _tmp
- return _tmp
- end
-
- # StyleOpen = "<" Spnl ("style" | "STYLE") Spnl HtmlAttribute* ">"
- def _StyleOpen
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("style")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("STYLE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StyleOpen unless _tmp
- return _tmp
- end
-
- # StyleClose = "<" Spnl "/" ("style" | "STYLE") Spnl ">"
- def _StyleClose
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("/")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = match_string("style")
- break if _tmp
- self.pos = _save1
- _tmp = match_string("STYLE")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StyleClose unless _tmp
- return _tmp
- end
-
- # InStyleTags = StyleOpen (!StyleClose .)* StyleClose
- def _InStyleTags
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StyleOpen)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_StyleClose)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StyleClose)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_InStyleTags unless _tmp
- return _tmp
- end
-
- # StyleBlock = < InStyleTags > BlankLine* { if css? then RDoc::Markup::Raw.new text end }
- def _StyleBlock
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
- _tmp = apply(:_InStyleTags)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; if css? then
- RDoc::Markup::Raw.new text
- end ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StyleBlock unless _tmp
- return _tmp
- end
-
- # Inlines = (!Endline Inline:i { i } | Endline:c &Inline { c })+:chunks Endline? { chunks }
- def _Inlines
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _ary = []
-
- _save2 = self.pos
- while true # choice
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_Endline)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_Inline)
- i = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; i ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
-
- _save5 = self.pos
- while true # sequence
- _tmp = apply(:_Endline)
- c = @result
- unless _tmp
- self.pos = _save5
- break
- end
- _save6 = self.pos
- _tmp = apply(:_Inline)
- self.pos = _save6
- unless _tmp
- self.pos = _save5
- break
- end
- @result = begin; c ; end
- _tmp = true
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- if _tmp
- _ary << @result
- while true
-
- _save7 = self.pos
- while true # choice
-
- _save8 = self.pos
- while true # sequence
- _save9 = self.pos
- _tmp = apply(:_Endline)
- _tmp = _tmp ? nil : true
- self.pos = _save9
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_Inline)
- i = @result
- unless _tmp
- self.pos = _save8
- break
- end
- @result = begin; i ; end
- _tmp = true
- unless _tmp
- self.pos = _save8
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save7
-
- _save10 = self.pos
- while true # sequence
- _tmp = apply(:_Endline)
- c = @result
- unless _tmp
- self.pos = _save10
- break
- end
- _save11 = self.pos
- _tmp = apply(:_Inline)
- self.pos = _save11
- unless _tmp
- self.pos = _save10
- break
- end
- @result = begin; c ; end
- _tmp = true
- unless _tmp
- self.pos = _save10
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save7
- break
- end # end choice
-
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save1
- end
- chunks = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save12 = self.pos
- _tmp = apply(:_Endline)
- unless _tmp
- _tmp = true
- self.pos = _save12
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; chunks ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Inlines unless _tmp
- return _tmp
- end
-
- # Inline = (Str | Endline | UlOrStarLine | Space | Strong | Emph | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
- def _Inline
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_Str)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Endline)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_UlOrStarLine)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Space)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Strong)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Emph)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Image)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Link)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_NoteReference)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_InlineNote)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Code)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_RawHtml)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Entity)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_EscapedChar)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_Symbol)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Inline unless _tmp
- return _tmp
- end
-
- # Space = Spacechar+ { " " }
- def _Space
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Spacechar)
- if _tmp
- while true
- _tmp = apply(:_Spacechar)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; " " ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Space unless _tmp
- return _tmp
- end
-
- # Str = StartList:a < NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }
- def _Str
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _save1 = self.pos
- _tmp = apply(:_NormalChar)
- if _tmp
- while true
- _tmp = apply(:_NormalChar)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a = text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save3 = self.pos
- while true # sequence
- _tmp = apply(:_StrChunk)
- c = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; a << c ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Str unless _tmp
- return _tmp
- end
-
- # StrChunk = < (NormalChar | "_"+ &Alphanumeric)+ > { text }
- def _StrChunk
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
- _save1 = self.pos
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_NormalChar)
- break if _tmp
- self.pos = _save2
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = match_string("_")
- if _tmp
- while true
- _tmp = match_string("_")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save4
- end
- unless _tmp
- self.pos = _save3
- break
- end
- _save5 = self.pos
- _tmp = apply(:_Alphanumeric)
- self.pos = _save5
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- if _tmp
- while true
-
- _save6 = self.pos
- while true # choice
- _tmp = apply(:_NormalChar)
- break if _tmp
- self.pos = _save6
-
- _save7 = self.pos
- while true # sequence
- _save8 = self.pos
- _tmp = match_string("_")
- if _tmp
- while true
- _tmp = match_string("_")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save8
- end
- unless _tmp
- self.pos = _save7
- break
- end
- _save9 = self.pos
- _tmp = apply(:_Alphanumeric)
- self.pos = _save9
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save6
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StrChunk unless _tmp
- return _tmp
- end
-
- # EscapedChar = "\\" !Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { text }
- def _EscapedChar
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("\\")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _tmp = scan(/\A(?-mix:[:\\`|*_{}\[\]()#+.!><-])/)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_EscapedChar unless _tmp
- return _tmp
- end
-
- # Entity = (HexEntity | DecEntity | CharEntity):a { a }
- def _Entity
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_HexEntity)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_DecEntity)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_CharEntity)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Entity unless _tmp
- return _tmp
- end
-
- # Endline = (LineBreak | TerminalEndline | NormalEndline)
- def _Endline
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_LineBreak)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_TerminalEndline)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_NormalEndline)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Endline unless _tmp
- return _tmp
- end
-
- # NormalEndline = Sp Newline !BlankLine !">" !AtxStart !(Line ("===" "="* | "---" "-"*) Newline) { "\n" }
- def _NormalEndline
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
- _tmp = apply(:_AtxStart)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save
- break
- end
- _save4 = self.pos
-
- _save5 = self.pos
- while true # sequence
- _tmp = apply(:_Line)
- unless _tmp
- self.pos = _save5
- break
- end
-
- _save6 = self.pos
- while true # choice
-
- _save7 = self.pos
- while true # sequence
- _tmp = match_string("===")
- unless _tmp
- self.pos = _save7
- break
- end
- while true
- _tmp = match_string("=")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save6
-
- _save9 = self.pos
- while true # sequence
- _tmp = match_string("---")
- unless _tmp
- self.pos = _save9
- break
- end
- while true
- _tmp = match_string("-")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save9
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save6
- break
- end # end choice
-
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; "\n" ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_NormalEndline unless _tmp
- return _tmp
- end
-
- # TerminalEndline = Sp Newline Eof
- def _TerminalEndline
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Eof)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TerminalEndline unless _tmp
- return _tmp
- end
-
- # LineBreak = " " NormalEndline { RDoc::Markup::HardBreak.new }
- def _LineBreak
-
- _save = self.pos
- while true # sequence
- _tmp = match_string(" ")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_NormalEndline)
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::HardBreak.new ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_LineBreak unless _tmp
- return _tmp
- end
-
- # Symbol = < SpecialChar > { text }
- def _Symbol
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
- _tmp = apply(:_SpecialChar)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Symbol unless _tmp
- return _tmp
- end
-
- # UlOrStarLine = (UlLine | StarLine):a { a }
- def _UlOrStarLine
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_UlLine)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_StarLine)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_UlOrStarLine unless _tmp
- return _tmp
- end
-
- # StarLine = (< "****" "*"* > { text } | < Spacechar "*"+ &Spacechar > { text })
- def _StarLine
-
- _save = self.pos
- while true # choice
-
- _save1 = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = match_string("****")
- unless _tmp
- self.pos = _save2
- break
- end
- while true
- _tmp = match_string("*")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save1
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save1
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
-
- _save4 = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save5 = self.pos
- while true # sequence
- _tmp = apply(:_Spacechar)
- unless _tmp
- self.pos = _save5
- break
- end
- _save6 = self.pos
- _tmp = match_string("*")
- if _tmp
- while true
- _tmp = match_string("*")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save6
- end
- unless _tmp
- self.pos = _save5
- break
- end
- _save7 = self.pos
- _tmp = apply(:_Spacechar)
- self.pos = _save7
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_StarLine unless _tmp
- return _tmp
- end
-
- # UlLine = (< "____" "_"* > { text } | < Spacechar "_"+ &Spacechar > { text })
- def _UlLine
-
- _save = self.pos
- while true # choice
-
- _save1 = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = match_string("____")
- unless _tmp
- self.pos = _save2
- break
- end
- while true
- _tmp = match_string("_")
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save1
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save1
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
-
- _save4 = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save5 = self.pos
- while true # sequence
- _tmp = apply(:_Spacechar)
- unless _tmp
- self.pos = _save5
- break
- end
- _save6 = self.pos
- _tmp = match_string("_")
- if _tmp
- while true
- _tmp = match_string("_")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save6
- end
- unless _tmp
- self.pos = _save5
- break
- end
- _save7 = self.pos
- _tmp = apply(:_Spacechar)
- self.pos = _save7
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_UlLine unless _tmp
- return _tmp
- end
-
- # Emph = (EmphStar | EmphUl)
- def _Emph
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_EmphStar)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_EmphUl)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Emph unless _tmp
- return _tmp
- end
-
- # OneStarOpen = !StarLine "*" !Spacechar !Newline
- def _OneStarOpen
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_StarLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("*")
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_OneStarOpen unless _tmp
- return _tmp
- end
-
- # OneStarClose = !Spacechar !Newline Inline:a "*" { a }
- def _OneStarClose
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inline)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("*")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_OneStarClose unless _tmp
- return _tmp
- end
-
- # EmphStar = OneStarOpen StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }
- def _EmphStar
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_OneStarOpen)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_OneStarClose)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Inline)
- l = @result
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_OneStarClose)
- l = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; emphasis a.join ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_EmphStar unless _tmp
- return _tmp
- end
-
- # OneUlOpen = !UlLine "_" !Spacechar !Newline
- def _OneUlOpen
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_UlLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("_")
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_OneUlOpen unless _tmp
- return _tmp
- end
-
- # OneUlClose = !Spacechar !Newline Inline:a "_" { a }
- def _OneUlClose
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inline)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("_")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_OneUlClose unless _tmp
- return _tmp
- end
-
- # EmphUl = OneUlOpen StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }
- def _EmphUl
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_OneUlOpen)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_OneUlClose)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Inline)
- l = @result
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_OneUlClose)
- l = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; emphasis a.join ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_EmphUl unless _tmp
- return _tmp
- end
-
- # Strong = (StrongStar | StrongUl)
- def _Strong
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_StrongStar)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_StrongUl)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Strong unless _tmp
- return _tmp
- end
-
- # TwoStarOpen = !StarLine "**" !Spacechar !Newline
- def _TwoStarOpen
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_StarLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("**")
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TwoStarOpen unless _tmp
- return _tmp
- end
-
- # TwoStarClose = !Spacechar !Newline Inline:a "**" { a }
- def _TwoStarClose
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inline)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("**")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TwoStarClose unless _tmp
- return _tmp
- end
-
- # StrongStar = TwoStarOpen StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }
- def _StrongStar
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_TwoStarOpen)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_TwoStarClose)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Inline)
- l = @result
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_TwoStarClose)
- l = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; strong a.join ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StrongStar unless _tmp
- return _tmp
- end
-
- # TwoUlOpen = !UlLine "__" !Spacechar !Newline
- def _TwoUlOpen
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_UlLine)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("__")
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _save3 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TwoUlOpen unless _tmp
- return _tmp
- end
-
- # TwoUlClose = !Spacechar !Newline Inline:a "__" { a }
- def _TwoUlClose
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inline)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("__")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TwoUlClose unless _tmp
- return _tmp
- end
-
- # StrongUl = TwoUlOpen StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }
- def _StrongUl
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_TwoUlOpen)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_TwoUlClose)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Inline)
- i = @result
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << i ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_TwoUlClose)
- l = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; strong a.join ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StrongUl unless _tmp
- return _tmp
- end
-
- # Image = "!" (ExplicitLink | ReferenceLink):a { a }
- def _Image
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("!")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_ExplicitLink)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_ReferenceLink)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Image unless _tmp
- return _tmp
- end
-
- # Link = (ExplicitLink | ReferenceLink | AutoLink)
- def _Link
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_ExplicitLink)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_ReferenceLink)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_AutoLink)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Link unless _tmp
- return _tmp
- end
-
- # ReferenceLink = (ReferenceLinkDouble | ReferenceLinkSingle)
- def _ReferenceLink
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_ReferenceLinkDouble)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_ReferenceLinkSingle)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_ReferenceLink unless _tmp
- return _tmp
- end
-
- # ReferenceLinkDouble = Label:content < Spnl > !"[]" Label:label { link_to content, label, text }
- def _ReferenceLinkDouble
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Label)
- content = @result
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _tmp = apply(:_Spnl)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("[]")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Label)
- label = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; link_to content, label, text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ReferenceLinkDouble unless _tmp
- return _tmp
- end
-
- # ReferenceLinkSingle = Label:content < (Spnl "[]")? > { link_to content, content, text }
- def _ReferenceLinkSingle
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Label)
- content = @result
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = match_string("[]")
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; link_to content, content, text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ReferenceLinkSingle unless _tmp
- return _tmp
- end
-
- # ExplicitLink = Label:l Spnl "(" Sp Source:s Spnl Title Sp ")" { "{#{l}}[#{s}]" }
- def _ExplicitLink
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Label)
- l = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("(")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Source)
- s = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Title)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(")")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; "{#{l}}[#{s}]" ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ExplicitLink unless _tmp
- return _tmp
- end
-
- # Source = ("<" < SourceContents > ">" | < SourceContents >) { text }
- def _Source
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
-
- _save2 = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save2
- break
- end
- _text_start = self.pos
- _tmp = apply(:_SourceContents)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
- _text_start = self.pos
- _tmp = apply(:_SourceContents)
- if _tmp
- text = get_text(_text_start)
- end
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Source unless _tmp
- return _tmp
- end
-
- # SourceContents = (((!"(" !")" !">" Nonspacechar)+ | "(" SourceContents ")")* | "")
- def _SourceContents
-
- _save = self.pos
- while true # choice
- while true
-
- _save2 = self.pos
- while true # choice
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = match_string("(")
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save4
- break
- end
- _save6 = self.pos
- _tmp = match_string(")")
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save4
- break
- end
- _save7 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save8 = self.pos
- while true # sequence
- _save9 = self.pos
- _tmp = match_string("(")
- _tmp = _tmp ? nil : true
- self.pos = _save9
- unless _tmp
- self.pos = _save8
- break
- end
- _save10 = self.pos
- _tmp = match_string(")")
- _tmp = _tmp ? nil : true
- self.pos = _save10
- unless _tmp
- self.pos = _save8
- break
- end
- _save11 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save11
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save8
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save3
- end
- break if _tmp
- self.pos = _save2
-
- _save12 = self.pos
- while true # sequence
- _tmp = match_string("(")
- unless _tmp
- self.pos = _save12
- break
- end
- _tmp = apply(:_SourceContents)
- unless _tmp
- self.pos = _save12
- break
- end
- _tmp = match_string(")")
- unless _tmp
- self.pos = _save12
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- break if _tmp
- self.pos = _save
- _tmp = match_string("")
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_SourceContents unless _tmp
- return _tmp
- end
-
- # Title = (TitleSingle | TitleDouble | ""):a { a }
- def _Title
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_TitleSingle)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_TitleDouble)
- break if _tmp
- self.pos = _save1
- _tmp = match_string("")
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Title unless _tmp
- return _tmp
- end
-
- # TitleSingle = "'" (!("'" Sp (")" | Newline)) .)* "'"
- def _TitleSingle
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save4
- break
- end
-
- _save5 = self.pos
- while true # choice
- _tmp = match_string(")")
- break if _tmp
- self.pos = _save5
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save5
- break
- end # end choice
-
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TitleSingle unless _tmp
- return _tmp
- end
-
- # TitleDouble = "\"" (!("\"" Sp (")" | Newline)) .)* "\""
- def _TitleDouble
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save4
- break
- end
-
- _save5 = self.pos
- while true # choice
- _tmp = match_string(")")
- break if _tmp
- self.pos = _save5
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save5
- break
- end # end choice
-
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_TitleDouble unless _tmp
- return _tmp
- end
-
- # AutoLink = (AutoLinkUrl | AutoLinkEmail)
- def _AutoLink
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_AutoLinkUrl)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_AutoLinkEmail)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_AutoLink unless _tmp
- return _tmp
- end
-
- # AutoLinkUrl = "<" < /[A-Za-z]+/ "://" (!Newline !">" .)+ > ">" { text }
- def _AutoLinkUrl
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
-
- _save1 = self.pos
- while true # sequence
- _tmp = scan(/\A(?-mix:[A-Za-z]+)/)
- unless _tmp
- self.pos = _save1
- break
- end
- _tmp = match_string("://")
- unless _tmp
- self.pos = _save1
- break
- end
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _save5 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save6 = self.pos
- while true # sequence
- _save7 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save6
- break
- end
- _save8 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save8
- unless _tmp
- self.pos = _save6
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save6
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save1
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_AutoLinkUrl unless _tmp
- return _tmp
- end
-
- # AutoLinkEmail = "<" "mailto:"? < /[\w+.\/!%~$-]+/i "@" (!Newline !">" .)+ > ">" { "mailto:#{text}" }
- def _AutoLinkEmail
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("mailto:")
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = scan(/\A(?i-mx:[\w+.\/!%~$-]+)/)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = match_string("@")
- unless _tmp
- self.pos = _save2
- break
- end
- _save3 = self.pos
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save4
- break
- end
- _save6 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save7 = self.pos
- while true # sequence
- _save8 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save8
- unless _tmp
- self.pos = _save7
- break
- end
- _save9 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save9
- unless _tmp
- self.pos = _save7
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save3
- end
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; "mailto:#{text}" ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_AutoLinkEmail unless _tmp
- return _tmp
- end
-
- # Reference = NonindentSpace !"[]" Label:label ":" Spnl RefSrc:link RefTitle BlankLine+ { # TODO use title reference label, link nil }
- def _Reference
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("[]")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Label)
- label = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(":")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_RefSrc)
- link = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_RefTitle)
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_BlankLine)
- if _tmp
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; # TODO use title
- reference label, link
- nil
- ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Reference unless _tmp
- return _tmp
- end
-
- # Label = "[" (!"^" &{ notes? } | &. &{ !notes? }) StartList:a (!"]" Inline:l { a << l })* "]" { a.join.gsub(/\s+/, ' ') }
- def _Label
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("[")
- unless _tmp
- self.pos = _save
- break
- end
-
- _save1 = self.pos
- while true # choice
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = match_string("^")
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _save4 = self.pos
- _tmp = begin; notes? ; end
- self.pos = _save4
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save5 = self.pos
- while true # sequence
- _save6 = self.pos
- _tmp = get_byte
- self.pos = _save6
- unless _tmp
- self.pos = _save5
- break
- end
- _save7 = self.pos
- _tmp = begin; !notes? ; end
- self.pos = _save7
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save9 = self.pos
- while true # sequence
- _save10 = self.pos
- _tmp = match_string("]")
- _tmp = _tmp ? nil : true
- self.pos = _save10
- unless _tmp
- self.pos = _save9
- break
- end
- _tmp = apply(:_Inline)
- l = @result
- unless _tmp
- self.pos = _save9
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save9
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("]")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a.join.gsub(/\s+/, ' ') ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Label unless _tmp
- return _tmp
- end
-
- # RefSrc = < Nonspacechar+ > { text }
- def _RefSrc
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
- _save1 = self.pos
- _tmp = apply(:_Nonspacechar)
- if _tmp
- while true
- _tmp = apply(:_Nonspacechar)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RefSrc unless _tmp
- return _tmp
- end
-
- # RefTitle = (RefTitleSingle | RefTitleDouble | RefTitleParens | EmptyTitle)
- def _RefTitle
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_RefTitleSingle)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_RefTitleDouble)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_RefTitleParens)
- break if _tmp
- self.pos = _save
- _tmp = apply(:_EmptyTitle)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_RefTitle unless _tmp
- return _tmp
- end
-
- # EmptyTitle = ""
- def _EmptyTitle
- _tmp = match_string("")
- set_failed_rule :_EmptyTitle unless _tmp
- return _tmp
- end
-
- # RefTitleSingle = Spnl "'" < (!("'" Sp Newline | Newline) .)* > "'" { text }
- def _RefTitleSingle
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
-
- _save4 = self.pos
- while true # choice
-
- _save5 = self.pos
- while true # sequence
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save4
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save4
- break
- end # end choice
-
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RefTitleSingle unless _tmp
- return _tmp
- end
-
- # RefTitleDouble = Spnl "\"" < (!("\"" Sp Newline | Newline) .)* > "\"" { text }
- def _RefTitleDouble
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
-
- _save4 = self.pos
- while true # choice
-
- _save5 = self.pos
- while true # sequence
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save4
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save4
- break
- end # end choice
-
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RefTitleDouble unless _tmp
- return _tmp
- end
-
- # RefTitleParens = Spnl "(" < (!(")" Sp Newline | Newline) .)* > ")" { text }
- def _RefTitleParens
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("(")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
-
- _save4 = self.pos
- while true # choice
-
- _save5 = self.pos
- while true # sequence
- _tmp = match_string(")")
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save4
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save4
- break
- end # end choice
-
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(")")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RefTitleParens unless _tmp
- return _tmp
- end
-
- # References = (Reference | SkipBlock)*
- def _References
- while true
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_Reference)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_SkipBlock)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- set_failed_rule :_References unless _tmp
- return _tmp
- end
-
- # Ticks1 = "`" !"`"
- def _Ticks1
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("`")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Ticks1 unless _tmp
- return _tmp
- end
-
- # Ticks2 = "``" !"`"
- def _Ticks2
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("``")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Ticks2 unless _tmp
- return _tmp
- end
-
- # Ticks3 = "```" !"`"
- def _Ticks3
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("```")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Ticks3 unless _tmp
- return _tmp
- end
-
- # Ticks4 = "````" !"`"
- def _Ticks4
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("````")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Ticks4 unless _tmp
- return _tmp
- end
-
- # Ticks5 = "`````" !"`"
- def _Ticks5
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("`````")
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Ticks5 unless _tmp
- return _tmp
- end
-
- # Code = (Ticks1 Sp < ((!"`" Nonspacechar)+ | !Ticks1 "`"+ | !(Sp Ticks1) (Spacechar | Newline !BlankLine))+ > Sp Ticks1 | Ticks2 Sp < ((!"`" Nonspacechar)+ | !Ticks2 "`"+ | !(Sp Ticks2) (Spacechar | Newline !BlankLine))+ > Sp Ticks2 | Ticks3 Sp < ((!"`" Nonspacechar)+ | !Ticks3 "`"+ | !(Sp Ticks3) (Spacechar | Newline !BlankLine))+ > Sp Ticks3 | Ticks4 Sp < ((!"`" Nonspacechar)+ | !Ticks4 "`"+ | !(Sp Ticks4) (Spacechar | Newline !BlankLine))+ > Sp Ticks4 | Ticks5 Sp < ((!"`" Nonspacechar)+ | !Ticks5 "`"+ | !(Sp Ticks5) (Spacechar | Newline !BlankLine))+ > Sp Ticks5) { "<code>#{text}</code>" }
- def _Code
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
-
- _save2 = self.pos
- while true # sequence
- _tmp = apply(:_Ticks1)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save2
- break
- end
- _text_start = self.pos
- _save3 = self.pos
-
- _save4 = self.pos
- while true # choice
- _save5 = self.pos
-
- _save6 = self.pos
- while true # sequence
- _save7 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save6
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save6
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save8 = self.pos
- while true # sequence
- _save9 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save9
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save8
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save5
- end
- break if _tmp
- self.pos = _save4
-
- _save10 = self.pos
- while true # sequence
- _save11 = self.pos
- _tmp = apply(:_Ticks1)
- _tmp = _tmp ? nil : true
- self.pos = _save11
- unless _tmp
- self.pos = _save10
- break
- end
- _save12 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save12
- end
- unless _tmp
- self.pos = _save10
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save4
-
- _save13 = self.pos
- while true # sequence
- _save14 = self.pos
-
- _save15 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save15
- break
- end
- _tmp = apply(:_Ticks1)
- unless _tmp
- self.pos = _save15
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save14
- unless _tmp
- self.pos = _save13
- break
- end
-
- _save16 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save16
-
- _save17 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save17
- break
- end
- _save18 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save18
- unless _tmp
- self.pos = _save17
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save16
- break
- end # end choice
-
- unless _tmp
- self.pos = _save13
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save4
- break
- end # end choice
-
- if _tmp
- while true
-
- _save19 = self.pos
- while true # choice
- _save20 = self.pos
-
- _save21 = self.pos
- while true # sequence
- _save22 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save22
- unless _tmp
- self.pos = _save21
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save21
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save23 = self.pos
- while true # sequence
- _save24 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save24
- unless _tmp
- self.pos = _save23
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save23
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save20
- end
- break if _tmp
- self.pos = _save19
-
- _save25 = self.pos
- while true # sequence
- _save26 = self.pos
- _tmp = apply(:_Ticks1)
- _tmp = _tmp ? nil : true
- self.pos = _save26
- unless _tmp
- self.pos = _save25
- break
- end
- _save27 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save27
- end
- unless _tmp
- self.pos = _save25
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save19
-
- _save28 = self.pos
- while true # sequence
- _save29 = self.pos
-
- _save30 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save30
- break
- end
- _tmp = apply(:_Ticks1)
- unless _tmp
- self.pos = _save30
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save29
- unless _tmp
- self.pos = _save28
- break
- end
-
- _save31 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save31
-
- _save32 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save32
- break
- end
- _save33 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save33
- unless _tmp
- self.pos = _save32
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save31
- break
- end # end choice
-
- unless _tmp
- self.pos = _save28
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save19
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save3
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Ticks1)
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save34 = self.pos
- while true # sequence
- _tmp = apply(:_Ticks2)
- unless _tmp
- self.pos = _save34
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save34
- break
- end
- _text_start = self.pos
- _save35 = self.pos
-
- _save36 = self.pos
- while true # choice
- _save37 = self.pos
-
- _save38 = self.pos
- while true # sequence
- _save39 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save39
- unless _tmp
- self.pos = _save38
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save38
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save40 = self.pos
- while true # sequence
- _save41 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save41
- unless _tmp
- self.pos = _save40
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save40
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save37
- end
- break if _tmp
- self.pos = _save36
-
- _save42 = self.pos
- while true # sequence
- _save43 = self.pos
- _tmp = apply(:_Ticks2)
- _tmp = _tmp ? nil : true
- self.pos = _save43
- unless _tmp
- self.pos = _save42
- break
- end
- _save44 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save44
- end
- unless _tmp
- self.pos = _save42
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save36
-
- _save45 = self.pos
- while true # sequence
- _save46 = self.pos
-
- _save47 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save47
- break
- end
- _tmp = apply(:_Ticks2)
- unless _tmp
- self.pos = _save47
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save46
- unless _tmp
- self.pos = _save45
- break
- end
-
- _save48 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save48
-
- _save49 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save49
- break
- end
- _save50 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save50
- unless _tmp
- self.pos = _save49
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save48
- break
- end # end choice
-
- unless _tmp
- self.pos = _save45
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save36
- break
- end # end choice
-
- if _tmp
- while true
-
- _save51 = self.pos
- while true # choice
- _save52 = self.pos
-
- _save53 = self.pos
- while true # sequence
- _save54 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save54
- unless _tmp
- self.pos = _save53
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save53
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save55 = self.pos
- while true # sequence
- _save56 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save56
- unless _tmp
- self.pos = _save55
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save55
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save52
- end
- break if _tmp
- self.pos = _save51
-
- _save57 = self.pos
- while true # sequence
- _save58 = self.pos
- _tmp = apply(:_Ticks2)
- _tmp = _tmp ? nil : true
- self.pos = _save58
- unless _tmp
- self.pos = _save57
- break
- end
- _save59 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save59
- end
- unless _tmp
- self.pos = _save57
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save51
-
- _save60 = self.pos
- while true # sequence
- _save61 = self.pos
-
- _save62 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save62
- break
- end
- _tmp = apply(:_Ticks2)
- unless _tmp
- self.pos = _save62
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save61
- unless _tmp
- self.pos = _save60
- break
- end
-
- _save63 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save63
-
- _save64 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save64
- break
- end
- _save65 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save65
- unless _tmp
- self.pos = _save64
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save63
- break
- end # end choice
-
- unless _tmp
- self.pos = _save60
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save51
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save35
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save34
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save34
- break
- end
- _tmp = apply(:_Ticks2)
- unless _tmp
- self.pos = _save34
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save66 = self.pos
- while true # sequence
- _tmp = apply(:_Ticks3)
- unless _tmp
- self.pos = _save66
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save66
- break
- end
- _text_start = self.pos
- _save67 = self.pos
-
- _save68 = self.pos
- while true # choice
- _save69 = self.pos
-
- _save70 = self.pos
- while true # sequence
- _save71 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save71
- unless _tmp
- self.pos = _save70
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save70
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save72 = self.pos
- while true # sequence
- _save73 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save73
- unless _tmp
- self.pos = _save72
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save72
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save69
- end
- break if _tmp
- self.pos = _save68
-
- _save74 = self.pos
- while true # sequence
- _save75 = self.pos
- _tmp = apply(:_Ticks3)
- _tmp = _tmp ? nil : true
- self.pos = _save75
- unless _tmp
- self.pos = _save74
- break
- end
- _save76 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save76
- end
- unless _tmp
- self.pos = _save74
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save68
-
- _save77 = self.pos
- while true # sequence
- _save78 = self.pos
-
- _save79 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save79
- break
- end
- _tmp = apply(:_Ticks3)
- unless _tmp
- self.pos = _save79
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save78
- unless _tmp
- self.pos = _save77
- break
- end
-
- _save80 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save80
-
- _save81 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save81
- break
- end
- _save82 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save82
- unless _tmp
- self.pos = _save81
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save80
- break
- end # end choice
-
- unless _tmp
- self.pos = _save77
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save68
- break
- end # end choice
-
- if _tmp
- while true
-
- _save83 = self.pos
- while true # choice
- _save84 = self.pos
-
- _save85 = self.pos
- while true # sequence
- _save86 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save86
- unless _tmp
- self.pos = _save85
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save85
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save87 = self.pos
- while true # sequence
- _save88 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save88
- unless _tmp
- self.pos = _save87
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save87
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save84
- end
- break if _tmp
- self.pos = _save83
-
- _save89 = self.pos
- while true # sequence
- _save90 = self.pos
- _tmp = apply(:_Ticks3)
- _tmp = _tmp ? nil : true
- self.pos = _save90
- unless _tmp
- self.pos = _save89
- break
- end
- _save91 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save91
- end
- unless _tmp
- self.pos = _save89
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save83
-
- _save92 = self.pos
- while true # sequence
- _save93 = self.pos
-
- _save94 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save94
- break
- end
- _tmp = apply(:_Ticks3)
- unless _tmp
- self.pos = _save94
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save93
- unless _tmp
- self.pos = _save92
- break
- end
-
- _save95 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save95
-
- _save96 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save96
- break
- end
- _save97 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save97
- unless _tmp
- self.pos = _save96
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save95
- break
- end # end choice
-
- unless _tmp
- self.pos = _save92
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save83
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save67
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save66
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save66
- break
- end
- _tmp = apply(:_Ticks3)
- unless _tmp
- self.pos = _save66
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save98 = self.pos
- while true # sequence
- _tmp = apply(:_Ticks4)
- unless _tmp
- self.pos = _save98
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save98
- break
- end
- _text_start = self.pos
- _save99 = self.pos
-
- _save100 = self.pos
- while true # choice
- _save101 = self.pos
-
- _save102 = self.pos
- while true # sequence
- _save103 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save103
- unless _tmp
- self.pos = _save102
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save102
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save104 = self.pos
- while true # sequence
- _save105 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save105
- unless _tmp
- self.pos = _save104
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save104
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save101
- end
- break if _tmp
- self.pos = _save100
-
- _save106 = self.pos
- while true # sequence
- _save107 = self.pos
- _tmp = apply(:_Ticks4)
- _tmp = _tmp ? nil : true
- self.pos = _save107
- unless _tmp
- self.pos = _save106
- break
- end
- _save108 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save108
- end
- unless _tmp
- self.pos = _save106
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save100
-
- _save109 = self.pos
- while true # sequence
- _save110 = self.pos
-
- _save111 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save111
- break
- end
- _tmp = apply(:_Ticks4)
- unless _tmp
- self.pos = _save111
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save110
- unless _tmp
- self.pos = _save109
- break
- end
-
- _save112 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save112
-
- _save113 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save113
- break
- end
- _save114 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save114
- unless _tmp
- self.pos = _save113
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save112
- break
- end # end choice
-
- unless _tmp
- self.pos = _save109
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save100
- break
- end # end choice
-
- if _tmp
- while true
-
- _save115 = self.pos
- while true # choice
- _save116 = self.pos
-
- _save117 = self.pos
- while true # sequence
- _save118 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save118
- unless _tmp
- self.pos = _save117
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save117
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save119 = self.pos
- while true # sequence
- _save120 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save120
- unless _tmp
- self.pos = _save119
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save119
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save116
- end
- break if _tmp
- self.pos = _save115
-
- _save121 = self.pos
- while true # sequence
- _save122 = self.pos
- _tmp = apply(:_Ticks4)
- _tmp = _tmp ? nil : true
- self.pos = _save122
- unless _tmp
- self.pos = _save121
- break
- end
- _save123 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save123
- end
- unless _tmp
- self.pos = _save121
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save115
-
- _save124 = self.pos
- while true # sequence
- _save125 = self.pos
-
- _save126 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save126
- break
- end
- _tmp = apply(:_Ticks4)
- unless _tmp
- self.pos = _save126
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save125
- unless _tmp
- self.pos = _save124
- break
- end
-
- _save127 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save127
-
- _save128 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save128
- break
- end
- _save129 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save129
- unless _tmp
- self.pos = _save128
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save127
- break
- end # end choice
-
- unless _tmp
- self.pos = _save124
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save115
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save99
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save98
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save98
- break
- end
- _tmp = apply(:_Ticks4)
- unless _tmp
- self.pos = _save98
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
-
- _save130 = self.pos
- while true # sequence
- _tmp = apply(:_Ticks5)
- unless _tmp
- self.pos = _save130
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save130
- break
- end
- _text_start = self.pos
- _save131 = self.pos
-
- _save132 = self.pos
- while true # choice
- _save133 = self.pos
-
- _save134 = self.pos
- while true # sequence
- _save135 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save135
- unless _tmp
- self.pos = _save134
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save134
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save136 = self.pos
- while true # sequence
- _save137 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save137
- unless _tmp
- self.pos = _save136
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save136
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save133
- end
- break if _tmp
- self.pos = _save132
-
- _save138 = self.pos
- while true # sequence
- _save139 = self.pos
- _tmp = apply(:_Ticks5)
- _tmp = _tmp ? nil : true
- self.pos = _save139
- unless _tmp
- self.pos = _save138
- break
- end
- _save140 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save140
- end
- unless _tmp
- self.pos = _save138
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save132
-
- _save141 = self.pos
- while true # sequence
- _save142 = self.pos
-
- _save143 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save143
- break
- end
- _tmp = apply(:_Ticks5)
- unless _tmp
- self.pos = _save143
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save142
- unless _tmp
- self.pos = _save141
- break
- end
-
- _save144 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save144
-
- _save145 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save145
- break
- end
- _save146 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save146
- unless _tmp
- self.pos = _save145
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save144
- break
- end # end choice
-
- unless _tmp
- self.pos = _save141
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save132
- break
- end # end choice
-
- if _tmp
- while true
-
- _save147 = self.pos
- while true # choice
- _save148 = self.pos
-
- _save149 = self.pos
- while true # sequence
- _save150 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save150
- unless _tmp
- self.pos = _save149
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save149
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save151 = self.pos
- while true # sequence
- _save152 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save152
- unless _tmp
- self.pos = _save151
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save151
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save148
- end
- break if _tmp
- self.pos = _save147
-
- _save153 = self.pos
- while true # sequence
- _save154 = self.pos
- _tmp = apply(:_Ticks5)
- _tmp = _tmp ? nil : true
- self.pos = _save154
- unless _tmp
- self.pos = _save153
- break
- end
- _save155 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save155
- end
- unless _tmp
- self.pos = _save153
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save147
-
- _save156 = self.pos
- while true # sequence
- _save157 = self.pos
-
- _save158 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save158
- break
- end
- _tmp = apply(:_Ticks5)
- unless _tmp
- self.pos = _save158
- end
- break
- end # end sequence
-
- _tmp = _tmp ? nil : true
- self.pos = _save157
- unless _tmp
- self.pos = _save156
- break
- end
-
- _save159 = self.pos
- while true # choice
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save159
-
- _save160 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save160
- break
- end
- _save161 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save161
- unless _tmp
- self.pos = _save160
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save159
- break
- end # end choice
-
- unless _tmp
- self.pos = _save156
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save147
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save131
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save130
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save130
- break
- end
- _tmp = apply(:_Ticks5)
- unless _tmp
- self.pos = _save130
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; "<code>#{text}</code>" ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Code unless _tmp
- return _tmp
- end
-
- # RawHtml = < (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }
- def _RawHtml
-
- _save = self.pos
- while true # sequence
- _text_start = self.pos
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_HtmlComment)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_HtmlBlockScript)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_HtmlTag)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; if html? then text else '' end ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RawHtml unless _tmp
- return _tmp
- end
-
- # BlankLine = Sp Newline { "\n" }
- def _BlankLine
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; "\n" ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_BlankLine unless _tmp
- return _tmp
- end
-
- # Quoted = ("\"" (!"\"" .)* "\"" | "'" (!"'" .)* "'")
- def _Quoted
-
- _save = self.pos
- while true # choice
-
- _save1 = self.pos
- while true # sequence
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save1
- break
- end
- while true
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = match_string("\"")
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save1
- break
- end
- _tmp = match_string("\"")
- unless _tmp
- self.pos = _save1
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
-
- _save5 = self.pos
- while true # sequence
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save5
- break
- end
- while true
-
- _save7 = self.pos
- while true # sequence
- _save8 = self.pos
- _tmp = match_string("'")
- _tmp = _tmp ? nil : true
- self.pos = _save8
- unless _tmp
- self.pos = _save7
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = match_string("'")
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Quoted unless _tmp
- return _tmp
- end
-
- # HtmlAttribute = (AlphanumericAscii | "-")+ Spnl ("=" Spnl (Quoted | (!">" Nonspacechar)+))? Spnl
- def _HtmlAttribute
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_AlphanumericAscii)
- break if _tmp
- self.pos = _save2
- _tmp = match_string("-")
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- if _tmp
- while true
-
- _save3 = self.pos
- while true # choice
- _tmp = apply(:_AlphanumericAscii)
- break if _tmp
- self.pos = _save3
- _tmp = match_string("-")
- break if _tmp
- self.pos = _save3
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _save4 = self.pos
-
- _save5 = self.pos
- while true # sequence
- _tmp = match_string("=")
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save5
- break
- end
-
- _save6 = self.pos
- while true # choice
- _tmp = apply(:_Quoted)
- break if _tmp
- self.pos = _save6
- _save7 = self.pos
-
- _save8 = self.pos
- while true # sequence
- _save9 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save9
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save8
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save10 = self.pos
- while true # sequence
- _save11 = self.pos
- _tmp = match_string(">")
- _tmp = _tmp ? nil : true
- self.pos = _save11
- unless _tmp
- self.pos = _save10
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save10
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save7
- end
- break if _tmp
- self.pos = _save6
- break
- end # end choice
-
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- unless _tmp
- _tmp = true
- self.pos = _save4
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlAttribute unless _tmp
- return _tmp
- end
-
- # HtmlComment = "<!--" (!"-->" .)* "-->"
- def _HtmlComment
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<!--")
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = match_string("-->")
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("-->")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlComment unless _tmp
- return _tmp
- end
-
- # HtmlTag = "<" Spnl "/"? AlphanumericAscii+ Spnl HtmlAttribute* "/"? Spnl ">"
- def _HtmlTag
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("<")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = match_string("/")
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_AlphanumericAscii)
- if _tmp
- while true
- _tmp = apply(:_AlphanumericAscii)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_HtmlAttribute)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- _save4 = self.pos
- _tmp = match_string("/")
- unless _tmp
- _tmp = true
- self.pos = _save4
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(">")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HtmlTag unless _tmp
- return _tmp
- end
-
- # Eof = !.
- def _Eof
- _save = self.pos
- _tmp = get_byte
- _tmp = _tmp ? nil : true
- self.pos = _save
- set_failed_rule :_Eof unless _tmp
- return _tmp
- end
-
- # Nonspacechar = !Spacechar !Newline .
- def _Nonspacechar
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Spacechar)
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save2
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Nonspacechar unless _tmp
- return _tmp
- end
-
- # Sp = Spacechar*
- def _Sp
- while true
- _tmp = apply(:_Spacechar)
- break unless _tmp
- end
- _tmp = true
- set_failed_rule :_Sp unless _tmp
- return _tmp
- end
-
- # Spnl = Sp (Newline Sp)?
- def _Spnl
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Spnl unless _tmp
- return _tmp
- end
-
- # SpecialChar = ("*" | "_" | "`" | "&" | "[" | "]" | "(" | ")" | "<" | "!" | "#" | "\\" | "'" | "\"" | ExtendedSpecialChar)
- def _SpecialChar
-
- _save = self.pos
- while true # choice
- _tmp = match_string("*")
- break if _tmp
- self.pos = _save
- _tmp = match_string("_")
- break if _tmp
- self.pos = _save
- _tmp = match_string("`")
- break if _tmp
- self.pos = _save
- _tmp = match_string("&")
- break if _tmp
- self.pos = _save
- _tmp = match_string("[")
- break if _tmp
- self.pos = _save
- _tmp = match_string("]")
- break if _tmp
- self.pos = _save
- _tmp = match_string("(")
- break if _tmp
- self.pos = _save
- _tmp = match_string(")")
- break if _tmp
- self.pos = _save
- _tmp = match_string("<")
- break if _tmp
- self.pos = _save
- _tmp = match_string("!")
- break if _tmp
- self.pos = _save
- _tmp = match_string("#")
- break if _tmp
- self.pos = _save
- _tmp = match_string("\\")
- break if _tmp
- self.pos = _save
- _tmp = match_string("'")
- break if _tmp
- self.pos = _save
- _tmp = match_string("\"")
- break if _tmp
- self.pos = _save
- _tmp = apply(:_ExtendedSpecialChar)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_SpecialChar unless _tmp
- return _tmp
- end
-
- # NormalChar = !(SpecialChar | Spacechar | Newline) .
- def _NormalChar
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
-
- _save2 = self.pos
- while true # choice
- _tmp = apply(:_SpecialChar)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save2
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save2
- break
- end # end choice
-
- _tmp = _tmp ? nil : true
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_NormalChar unless _tmp
- return _tmp
- end
-
- # Digit = [0-9]
- def _Digit
- _save = self.pos
- _tmp = get_byte
- if _tmp
- unless _tmp >= 48 and _tmp <= 57
- self.pos = _save
- _tmp = nil
- end
- end
- set_failed_rule :_Digit unless _tmp
- return _tmp
- end
-
- # Alphanumeric = %literals.Alphanumeric
- def _Alphanumeric
- _tmp = @_grammar_literals.external_invoke(self, :_Alphanumeric)
- set_failed_rule :_Alphanumeric unless _tmp
- return _tmp
- end
-
- # AlphanumericAscii = %literals.AlphanumericAscii
- def _AlphanumericAscii
- _tmp = @_grammar_literals.external_invoke(self, :_AlphanumericAscii)
- set_failed_rule :_AlphanumericAscii unless _tmp
- return _tmp
- end
-
- # BOM = %literals.BOM
- def _BOM
- _tmp = @_grammar_literals.external_invoke(self, :_BOM)
- set_failed_rule :_BOM unless _tmp
- return _tmp
- end
-
- # Newline = %literals.Newline
- def _Newline
- _tmp = @_grammar_literals.external_invoke(self, :_Newline)
- set_failed_rule :_Newline unless _tmp
- return _tmp
- end
-
- # NonAlphanumeric = %literals.NonAlphanumeric
- def _NonAlphanumeric
- _tmp = @_grammar_literals.external_invoke(self, :_NonAlphanumeric)
- set_failed_rule :_NonAlphanumeric unless _tmp
- return _tmp
- end
-
- # Spacechar = %literals.Spacechar
- def _Spacechar
- _tmp = @_grammar_literals.external_invoke(self, :_Spacechar)
- set_failed_rule :_Spacechar unless _tmp
- return _tmp
- end
-
- # HexEntity = "&" "#" /[Xx]/ < /[0-9a-fA-F]+/ > ";" { [text.to_i(16)].pack 'U' }
- def _HexEntity
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("&")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("#")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = scan(/\A(?-mix:[Xx])/)
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _tmp = scan(/\A(?-mix:[0-9a-fA-F]+)/)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(";")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; [text.to_i(16)].pack 'U' ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_HexEntity unless _tmp
- return _tmp
- end
-
- # DecEntity = "&" "#" < /[0-9]+/ > ";" { [text.to_i].pack 'U' }
- def _DecEntity
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("&")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("#")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _tmp = scan(/\A(?-mix:[0-9]+)/)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(";")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; [text.to_i].pack 'U' ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_DecEntity unless _tmp
- return _tmp
- end
-
- # CharEntity = "&" < /[A-Za-z0-9]+/ > ";" { if entity = HTML_ENTITIES[text] then entity.pack 'U*' else "&#{text};" end }
- def _CharEntity
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("&")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _tmp = scan(/\A(?-mix:[A-Za-z0-9]+)/)
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(";")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; if entity = HTML_ENTITIES[text] then
- entity.pack 'U*'
- else
- "&#{text};"
- end
- ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_CharEntity unless _tmp
- return _tmp
- end
-
- # NonindentSpace = (" " | " " | " " | "")
- def _NonindentSpace
-
- _save = self.pos
- while true # choice
- _tmp = match_string(" ")
- break if _tmp
- self.pos = _save
- _tmp = match_string(" ")
- break if _tmp
- self.pos = _save
- _tmp = match_string(" ")
- break if _tmp
- self.pos = _save
- _tmp = match_string("")
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_NonindentSpace unless _tmp
- return _tmp
- end
-
- # Indent = ("\t" | " ")
- def _Indent
-
- _save = self.pos
- while true # choice
- _tmp = match_string("\t")
- break if _tmp
- self.pos = _save
- _tmp = match_string(" ")
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_Indent unless _tmp
- return _tmp
- end
-
- # IndentedLine = Indent Line
- def _IndentedLine
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_Indent)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Line)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_IndentedLine unless _tmp
- return _tmp
- end
-
- # OptionallyIndentedLine = Indent? Line
- def _OptionallyIndentedLine
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = apply(:_Indent)
- unless _tmp
- _tmp = true
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Line)
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_OptionallyIndentedLine unless _tmp
- return _tmp
- end
-
- # StartList = &. { [] }
- def _StartList
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = get_byte
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; [] ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_StartList unless _tmp
- return _tmp
- end
-
- # Line = RawLine:a { a }
- def _Line
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_RawLine)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Line unless _tmp
- return _tmp
- end
-
- # RawLine = (< (!"\r" !"\n" .)* Newline > | < .+ > Eof) { text }
- def _RawLine
-
- _save = self.pos
- while true # sequence
-
- _save1 = self.pos
- while true # choice
- _text_start = self.pos
-
- _save2 = self.pos
- while true # sequence
- while true
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = match_string("\r")
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save4
- break
- end
- _save6 = self.pos
- _tmp = match_string("\n")
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- text = get_text(_text_start)
- end
- break if _tmp
- self.pos = _save1
-
- _save7 = self.pos
- while true # sequence
- _text_start = self.pos
- _save8 = self.pos
- _tmp = get_byte
- if _tmp
- while true
- _tmp = get_byte
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save8
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save7
- break
- end
- _tmp = apply(:_Eof)
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RawLine unless _tmp
- return _tmp
- end
-
- # SkipBlock = (HtmlBlock | (!"#" !SetextBottom1 !SetextBottom2 !BlankLine RawLine)+ BlankLine* | BlankLine+ | RawLine)
- def _SkipBlock
-
- _save = self.pos
- while true # choice
- _tmp = apply(:_HtmlBlock)
- break if _tmp
- self.pos = _save
-
- _save1 = self.pos
- while true # sequence
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = match_string("#")
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _save5 = self.pos
- _tmp = apply(:_SetextBottom1)
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save3
- break
- end
- _save6 = self.pos
- _tmp = apply(:_SetextBottom2)
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save3
- break
- end
- _save7 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_RawLine)
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save8 = self.pos
- while true # sequence
- _save9 = self.pos
- _tmp = match_string("#")
- _tmp = _tmp ? nil : true
- self.pos = _save9
- unless _tmp
- self.pos = _save8
- break
- end
- _save10 = self.pos
- _tmp = apply(:_SetextBottom1)
- _tmp = _tmp ? nil : true
- self.pos = _save10
- unless _tmp
- self.pos = _save8
- break
- end
- _save11 = self.pos
- _tmp = apply(:_SetextBottom2)
- _tmp = _tmp ? nil : true
- self.pos = _save11
- unless _tmp
- self.pos = _save8
- break
- end
- _save12 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save12
- unless _tmp
- self.pos = _save8
- break
- end
- _tmp = apply(:_RawLine)
- unless _tmp
- self.pos = _save8
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save1
- break
- end
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save1
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save
- _save14 = self.pos
- _tmp = apply(:_BlankLine)
- if _tmp
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save14
- end
- break if _tmp
- self.pos = _save
- _tmp = apply(:_RawLine)
- break if _tmp
- self.pos = _save
- break
- end # end choice
-
- set_failed_rule :_SkipBlock unless _tmp
- return _tmp
- end
-
- # ExtendedSpecialChar = &{ notes? } "^"
- def _ExtendedSpecialChar
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = begin; notes? ; end
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("^")
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_ExtendedSpecialChar unless _tmp
- return _tmp
- end
-
- # NoteReference = &{ notes? } RawNoteReference:ref { note_for ref }
- def _NoteReference
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = begin; notes? ; end
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_RawNoteReference)
- ref = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; note_for ref ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_NoteReference unless _tmp
- return _tmp
- end
-
- # RawNoteReference = "[^" < (!Newline !"]" .)+ > "]" { text }
- def _RawNoteReference
-
- _save = self.pos
- while true # sequence
- _tmp = match_string("[^")
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _save4 = self.pos
- _tmp = match_string("]")
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save5 = self.pos
- while true # sequence
- _save6 = self.pos
- _tmp = apply(:_Newline)
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save5
- break
- end
- _save7 = self.pos
- _tmp = match_string("]")
- _tmp = _tmp ? nil : true
- self.pos = _save7
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = get_byte
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("]")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RawNoteReference unless _tmp
- return _tmp
- end
-
- # Note = &{ notes? } NonindentSpace RawNoteReference:ref ":" Sp StartList:a RawNoteBlock (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a nil }
- def _Note
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = begin; notes? ; end
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_RawNoteReference)
- ref = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(":")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_RawNoteBlock)
- unless _tmp
- self.pos = _save
- break
- end
- while true
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = apply(:_Indent)
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_RawNoteBlock)
- i = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; a.concat i ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; @footnotes[ref] = paragraph a
-
- nil
- ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_Note unless _tmp
- return _tmp
- end
-
- # InlineNote = &{ notes? } "^[" StartList:a (!"]" Inline:l { a << l })+ "]" { ref = [:inline, @note_order.length] @footnotes[ref] = paragraph a note_for ref }
- def _InlineNote
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = begin; notes? ; end
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("^[")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _save4 = self.pos
- _tmp = match_string("]")
- _tmp = _tmp ? nil : true
- self.pos = _save4
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_Inline)
- l = @result
- unless _tmp
- self.pos = _save3
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save5 = self.pos
- while true # sequence
- _save6 = self.pos
- _tmp = match_string("]")
- _tmp = _tmp ? nil : true
- self.pos = _save6
- unless _tmp
- self.pos = _save5
- break
- end
- _tmp = apply(:_Inline)
- l = @result
- unless _tmp
- self.pos = _save5
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save5
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string("]")
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin;
- ref = [:inline, @note_order.length]
- @footnotes[ref] = paragraph a
-
- note_for ref
- ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_InlineNote unless _tmp
- return _tmp
- end
-
- # Notes = (Note | SkipBlock)*
- def _Notes
- while true
-
- _save1 = self.pos
- while true # choice
- _tmp = apply(:_Note)
- break if _tmp
- self.pos = _save1
- _tmp = apply(:_SkipBlock)
- break if _tmp
- self.pos = _save1
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- set_failed_rule :_Notes unless _tmp
- return _tmp
- end
-
- # RawNoteBlock = StartList:a (!BlankLine OptionallyIndentedLine:l { a << l })+ < BlankLine* > { a << text } { a }
- def _RawNoteBlock
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StartList)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
-
- _save2 = self.pos
- while true # sequence
- _save3 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save3
- unless _tmp
- self.pos = _save2
- break
- end
- _tmp = apply(:_OptionallyIndentedLine)
- l = @result
- unless _tmp
- self.pos = _save2
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save2
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save4 = self.pos
- while true # sequence
- _save5 = self.pos
- _tmp = apply(:_BlankLine)
- _tmp = _tmp ? nil : true
- self.pos = _save5
- unless _tmp
- self.pos = _save4
- break
- end
- _tmp = apply(:_OptionallyIndentedLine)
- l = @result
- unless _tmp
- self.pos = _save4
- break
- end
- @result = begin; a << l ; end
- _tmp = true
- unless _tmp
- self.pos = _save4
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a << text ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_RawNoteBlock unless _tmp
- return _tmp
- end
-
- # CodeFence = &{ github? } Ticks3 (Sp StrChunk:format)? Spnl < ((!"`" Nonspacechar)+ | !Ticks3 "`"+ | Spacechar | Newline)+ > Ticks3 Sp Newline* { verbatim = RDoc::Markup::Verbatim.new text verbatim.format = format.intern if format verbatim }
- def _CodeFence
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = begin; github? ; end
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Ticks3)
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
-
- _save3 = self.pos
- while true # sequence
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save3
- break
- end
- _tmp = apply(:_StrChunk)
- format = @result
- unless _tmp
- self.pos = _save3
- end
- break
- end # end sequence
-
- unless _tmp
- _tmp = true
- self.pos = _save2
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Spnl)
- unless _tmp
- self.pos = _save
- break
- end
- _text_start = self.pos
- _save4 = self.pos
-
- _save5 = self.pos
- while true # choice
- _save6 = self.pos
-
- _save7 = self.pos
- while true # sequence
- _save8 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save8
- unless _tmp
- self.pos = _save7
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save7
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save9 = self.pos
- while true # sequence
- _save10 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save10
- unless _tmp
- self.pos = _save9
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save9
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save6
- end
- break if _tmp
- self.pos = _save5
-
- _save11 = self.pos
- while true # sequence
- _save12 = self.pos
- _tmp = apply(:_Ticks3)
- _tmp = _tmp ? nil : true
- self.pos = _save12
- unless _tmp
- self.pos = _save11
- break
- end
- _save13 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save13
- end
- unless _tmp
- self.pos = _save11
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save5
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save5
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save5
- break
- end # end choice
-
- if _tmp
- while true
-
- _save14 = self.pos
- while true # choice
- _save15 = self.pos
-
- _save16 = self.pos
- while true # sequence
- _save17 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save17
- unless _tmp
- self.pos = _save16
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save16
- end
- break
- end # end sequence
-
- if _tmp
- while true
-
- _save18 = self.pos
- while true # sequence
- _save19 = self.pos
- _tmp = match_string("`")
- _tmp = _tmp ? nil : true
- self.pos = _save19
- unless _tmp
- self.pos = _save18
- break
- end
- _tmp = apply(:_Nonspacechar)
- unless _tmp
- self.pos = _save18
- end
- break
- end # end sequence
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save15
- end
- break if _tmp
- self.pos = _save14
-
- _save20 = self.pos
- while true # sequence
- _save21 = self.pos
- _tmp = apply(:_Ticks3)
- _tmp = _tmp ? nil : true
- self.pos = _save21
- unless _tmp
- self.pos = _save20
- break
- end
- _save22 = self.pos
- _tmp = match_string("`")
- if _tmp
- while true
- _tmp = match_string("`")
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save22
- end
- unless _tmp
- self.pos = _save20
- end
- break
- end # end sequence
-
- break if _tmp
- self.pos = _save14
- _tmp = apply(:_Spacechar)
- break if _tmp
- self.pos = _save14
- _tmp = apply(:_Newline)
- break if _tmp
- self.pos = _save14
- break
- end # end choice
-
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save4
- end
- if _tmp
- text = get_text(_text_start)
- end
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Ticks3)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- while true
- _tmp = apply(:_Newline)
- break unless _tmp
- end
- _tmp = true
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; verbatim = RDoc::Markup::Verbatim.new text
- verbatim.format = format.intern if format
- verbatim
- ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_CodeFence unless _tmp
- return _tmp
- end
-
- # DefinitionList = &{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }
- def _DefinitionList
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _tmp = begin; definition_lists? ; end
- self.pos = _save1
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _ary = []
- _tmp = apply(:_DefinitionListItem)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_DefinitionListItem)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save2
- end
- list = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; RDoc::Markup::List.new :NOTE, *list.flatten ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_DefinitionList unless _tmp
- return _tmp
- end
-
- # DefinitionListItem = DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = [] list_items << RDoc::Markup::ListItem.new(label, defns.shift) list_items.concat defns.map { |defn| RDoc::Markup::ListItem.new nil, defn } unless list_items.empty? list_items }
- def _DefinitionListItem
-
- _save = self.pos
- while true # sequence
- _save1 = self.pos
- _ary = []
- _tmp = apply(:_DefinitionListLabel)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_DefinitionListLabel)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save1
- end
- label = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save2 = self.pos
- _ary = []
- _tmp = apply(:_DefinitionListDefinition)
- if _tmp
- _ary << @result
- while true
- _tmp = apply(:_DefinitionListDefinition)
- _ary << @result if _tmp
- break unless _tmp
- end
- _tmp = true
- @result = _ary
- else
- self.pos = _save2
- end
- defns = @result
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; list_items = []
- list_items <<
- RDoc::Markup::ListItem.new(label, defns.shift)
-
- list_items.concat defns.map { |defn|
- RDoc::Markup::ListItem.new nil, defn
- } unless list_items.empty?
-
- list_items
- ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_DefinitionListItem unless _tmp
- return _tmp
- end
-
- # DefinitionListLabel = StrChunk:label Sp Newline { label }
- def _DefinitionListLabel
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_StrChunk)
- label = @result
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Sp)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Newline)
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; label ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_DefinitionListLabel unless _tmp
- return _tmp
- end
-
- # DefinitionListDefinition = NonindentSpace ":" Space Inlines:a BlankLine+ { paragraph a }
- def _DefinitionListDefinition
-
- _save = self.pos
- while true # sequence
- _tmp = apply(:_NonindentSpace)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = match_string(":")
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Space)
- unless _tmp
- self.pos = _save
- break
- end
- _tmp = apply(:_Inlines)
- a = @result
- unless _tmp
- self.pos = _save
- break
- end
- _save1 = self.pos
- _tmp = apply(:_BlankLine)
- if _tmp
- while true
- _tmp = apply(:_BlankLine)
- break unless _tmp
- end
- _tmp = true
- else
- self.pos = _save1
- end
- unless _tmp
- self.pos = _save
- break
- end
- @result = begin; paragraph a ; end
- _tmp = true
- unless _tmp
- self.pos = _save
- end
- break
- end # end sequence
-
- set_failed_rule :_DefinitionListDefinition unless _tmp
- return _tmp
- end
-
- Rules = {}
- Rules[:_root] = rule_info("root", "Doc")
- Rules[:_Doc] = rule_info("Doc", "BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }")
- Rules[:_Block] = rule_info("Block", "BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
- Rules[:_Para] = rule_info("Para", "NonindentSpace Inlines:a BlankLine+ { paragraph a }")
- Rules[:_Plain] = rule_info("Plain", "Inlines:a { paragraph a }")
- Rules[:_AtxInline] = rule_info("AtxInline", "!Newline !(Sp? \"\#\"* Sp Newline) Inline")
- Rules[:_AtxStart] = rule_info("AtxStart", "< (\"\#\#\#\#\#\#\" | \"\#\#\#\#\#\" | \"\#\#\#\#\" | \"\#\#\#\" | \"\#\#\" | \"\#\") > { text.length }")
- Rules[:_AtxHeading] = rule_info("AtxHeading", "AtxStart:s Sp? AtxInline+:a (Sp? \"\#\"* Sp)? Newline { RDoc::Markup::Heading.new(s, a.join) }")
- Rules[:_SetextHeading] = rule_info("SetextHeading", "(SetextHeading1 | SetextHeading2)")
- Rules[:_SetextBottom1] = rule_info("SetextBottom1", "\"===\" \"=\"* Newline")
- Rules[:_SetextBottom2] = rule_info("SetextBottom2", "\"---\" \"-\"* Newline")
- Rules[:_SetextHeading1] = rule_info("SetextHeading1", "&(RawLine SetextBottom1) StartList:a (!Endline Inline:b { a << b })+ Sp? Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }")
- Rules[:_SetextHeading2] = rule_info("SetextHeading2", "&(RawLine SetextBottom2) StartList:a (!Endline Inline:b { a << b })+ Sp? Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }")
- Rules[:_Heading] = rule_info("Heading", "(SetextHeading | AtxHeading)")
- Rules[:_BlockQuote] = rule_info("BlockQuote", "BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }")
- Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !BlankLine Line:c { a << c })* (BlankLine:n { a << n })*)+ { inner_parse a.join }")
- Rules[:_NonblankIndentedLine] = rule_info("NonblankIndentedLine", "!BlankLine IndentedLine")
- Rules[:_VerbatimChunk] = rule_info("VerbatimChunk", "BlankLine*:a NonblankIndentedLine+:b { a.concat b }")
- Rules[:_Verbatim] = rule_info("Verbatim", "VerbatimChunk+:a { RDoc::Markup::Verbatim.new(*a.flatten) }")
- Rules[:_HorizontalRule] = rule_info("HorizontalRule", "NonindentSpace (\"*\" Sp \"*\" Sp \"*\" (Sp \"*\")* | \"-\" Sp \"-\" Sp \"-\" (Sp \"-\")* | \"_\" Sp \"_\" Sp \"_\" (Sp \"_\")*) Sp Newline BlankLine+ { RDoc::Markup::Rule.new 1 }")
- Rules[:_Bullet] = rule_info("Bullet", "!HorizontalRule NonindentSpace (\"+\" | \"*\" | \"-\") Spacechar+")
- Rules[:_BulletList] = rule_info("BulletList", "&Bullet (ListTight | ListLoose):a { RDoc::Markup::List.new(:BULLET, *a) }")
- Rules[:_ListTight] = rule_info("ListTight", "ListItemTight+:a BlankLine* !(Bullet | Enumerator) { a }")
- Rules[:_ListLoose] = rule_info("ListLoose", "StartList:a (ListItem:b BlankLine* { a << b })+ { a }")
- Rules[:_ListItem] = rule_info("ListItem", "(Bullet | Enumerator) StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }")
- Rules[:_ListItemTight] = rule_info("ListItemTight", "(Bullet | Enumerator) ListBlock:a (!BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }")
- Rules[:_ListBlock] = rule_info("ListBlock", "!BlankLine Line:a ListBlockLine*:c { [a, *c] }")
- Rules[:_ListContinuationBlock] = rule_info("ListContinuationBlock", "StartList:a BlankLine* { a << \"\\n\" } (Indent ListBlock:b { a.concat b })+ { a }")
- Rules[:_Enumerator] = rule_info("Enumerator", "NonindentSpace [0-9]+ \".\" Spacechar+")
- Rules[:_OrderedList] = rule_info("OrderedList", "&Enumerator (ListTight | ListLoose):a { RDoc::Markup::List.new(:NUMBER, *a) }")
- Rules[:_ListBlockLine] = rule_info("ListBlockLine", "!BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine")
- Rules[:_HtmlBlockOpenAddress] = rule_info("HtmlBlockOpenAddress", "\"<\" Spnl (\"address\" | \"ADDRESS\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseAddress] = rule_info("HtmlBlockCloseAddress", "\"<\" Spnl \"/\" (\"address\" | \"ADDRESS\") Spnl \">\"")
- Rules[:_HtmlBlockAddress] = rule_info("HtmlBlockAddress", "HtmlBlockOpenAddress (HtmlBlockAddress | !HtmlBlockCloseAddress .)* HtmlBlockCloseAddress")
- Rules[:_HtmlBlockOpenBlockquote] = rule_info("HtmlBlockOpenBlockquote", "\"<\" Spnl (\"blockquote\" | \"BLOCKQUOTE\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseBlockquote] = rule_info("HtmlBlockCloseBlockquote", "\"<\" Spnl \"/\" (\"blockquote\" | \"BLOCKQUOTE\") Spnl \">\"")
- Rules[:_HtmlBlockBlockquote] = rule_info("HtmlBlockBlockquote", "HtmlBlockOpenBlockquote (HtmlBlockBlockquote | !HtmlBlockCloseBlockquote .)* HtmlBlockCloseBlockquote")
- Rules[:_HtmlBlockOpenCenter] = rule_info("HtmlBlockOpenCenter", "\"<\" Spnl (\"center\" | \"CENTER\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseCenter] = rule_info("HtmlBlockCloseCenter", "\"<\" Spnl \"/\" (\"center\" | \"CENTER\") Spnl \">\"")
- Rules[:_HtmlBlockCenter] = rule_info("HtmlBlockCenter", "HtmlBlockOpenCenter (HtmlBlockCenter | !HtmlBlockCloseCenter .)* HtmlBlockCloseCenter")
- Rules[:_HtmlBlockOpenDir] = rule_info("HtmlBlockOpenDir", "\"<\" Spnl (\"dir\" | \"DIR\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseDir] = rule_info("HtmlBlockCloseDir", "\"<\" Spnl \"/\" (\"dir\" | \"DIR\") Spnl \">\"")
- Rules[:_HtmlBlockDir] = rule_info("HtmlBlockDir", "HtmlBlockOpenDir (HtmlBlockDir | !HtmlBlockCloseDir .)* HtmlBlockCloseDir")
- Rules[:_HtmlBlockOpenDiv] = rule_info("HtmlBlockOpenDiv", "\"<\" Spnl (\"div\" | \"DIV\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseDiv] = rule_info("HtmlBlockCloseDiv", "\"<\" Spnl \"/\" (\"div\" | \"DIV\") Spnl \">\"")
- Rules[:_HtmlBlockDiv] = rule_info("HtmlBlockDiv", "HtmlBlockOpenDiv (HtmlBlockDiv | !HtmlBlockCloseDiv .)* HtmlBlockCloseDiv")
- Rules[:_HtmlBlockOpenDl] = rule_info("HtmlBlockOpenDl", "\"<\" Spnl (\"dl\" | \"DL\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseDl] = rule_info("HtmlBlockCloseDl", "\"<\" Spnl \"/\" (\"dl\" | \"DL\") Spnl \">\"")
- Rules[:_HtmlBlockDl] = rule_info("HtmlBlockDl", "HtmlBlockOpenDl (HtmlBlockDl | !HtmlBlockCloseDl .)* HtmlBlockCloseDl")
- Rules[:_HtmlBlockOpenFieldset] = rule_info("HtmlBlockOpenFieldset", "\"<\" Spnl (\"fieldset\" | \"FIELDSET\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseFieldset] = rule_info("HtmlBlockCloseFieldset", "\"<\" Spnl \"/\" (\"fieldset\" | \"FIELDSET\") Spnl \">\"")
- Rules[:_HtmlBlockFieldset] = rule_info("HtmlBlockFieldset", "HtmlBlockOpenFieldset (HtmlBlockFieldset | !HtmlBlockCloseFieldset .)* HtmlBlockCloseFieldset")
- Rules[:_HtmlBlockOpenForm] = rule_info("HtmlBlockOpenForm", "\"<\" Spnl (\"form\" | \"FORM\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseForm] = rule_info("HtmlBlockCloseForm", "\"<\" Spnl \"/\" (\"form\" | \"FORM\") Spnl \">\"")
- Rules[:_HtmlBlockForm] = rule_info("HtmlBlockForm", "HtmlBlockOpenForm (HtmlBlockForm | !HtmlBlockCloseForm .)* HtmlBlockCloseForm")
- Rules[:_HtmlBlockOpenH1] = rule_info("HtmlBlockOpenH1", "\"<\" Spnl (\"h1\" | \"H1\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseH1] = rule_info("HtmlBlockCloseH1", "\"<\" Spnl \"/\" (\"h1\" | \"H1\") Spnl \">\"")
- Rules[:_HtmlBlockH1] = rule_info("HtmlBlockH1", "HtmlBlockOpenH1 (HtmlBlockH1 | !HtmlBlockCloseH1 .)* HtmlBlockCloseH1")
- Rules[:_HtmlBlockOpenH2] = rule_info("HtmlBlockOpenH2", "\"<\" Spnl (\"h2\" | \"H2\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseH2] = rule_info("HtmlBlockCloseH2", "\"<\" Spnl \"/\" (\"h2\" | \"H2\") Spnl \">\"")
- Rules[:_HtmlBlockH2] = rule_info("HtmlBlockH2", "HtmlBlockOpenH2 (HtmlBlockH2 | !HtmlBlockCloseH2 .)* HtmlBlockCloseH2")
- Rules[:_HtmlBlockOpenH3] = rule_info("HtmlBlockOpenH3", "\"<\" Spnl (\"h3\" | \"H3\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseH3] = rule_info("HtmlBlockCloseH3", "\"<\" Spnl \"/\" (\"h3\" | \"H3\") Spnl \">\"")
- Rules[:_HtmlBlockH3] = rule_info("HtmlBlockH3", "HtmlBlockOpenH3 (HtmlBlockH3 | !HtmlBlockCloseH3 .)* HtmlBlockCloseH3")
- Rules[:_HtmlBlockOpenH4] = rule_info("HtmlBlockOpenH4", "\"<\" Spnl (\"h4\" | \"H4\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseH4] = rule_info("HtmlBlockCloseH4", "\"<\" Spnl \"/\" (\"h4\" | \"H4\") Spnl \">\"")
- Rules[:_HtmlBlockH4] = rule_info("HtmlBlockH4", "HtmlBlockOpenH4 (HtmlBlockH4 | !HtmlBlockCloseH4 .)* HtmlBlockCloseH4")
- Rules[:_HtmlBlockOpenH5] = rule_info("HtmlBlockOpenH5", "\"<\" Spnl (\"h5\" | \"H5\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseH5] = rule_info("HtmlBlockCloseH5", "\"<\" Spnl \"/\" (\"h5\" | \"H5\") Spnl \">\"")
- Rules[:_HtmlBlockH5] = rule_info("HtmlBlockH5", "HtmlBlockOpenH5 (HtmlBlockH5 | !HtmlBlockCloseH5 .)* HtmlBlockCloseH5")
- Rules[:_HtmlBlockOpenH6] = rule_info("HtmlBlockOpenH6", "\"<\" Spnl (\"h6\" | \"H6\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseH6] = rule_info("HtmlBlockCloseH6", "\"<\" Spnl \"/\" (\"h6\" | \"H6\") Spnl \">\"")
- Rules[:_HtmlBlockH6] = rule_info("HtmlBlockH6", "HtmlBlockOpenH6 (HtmlBlockH6 | !HtmlBlockCloseH6 .)* HtmlBlockCloseH6")
- Rules[:_HtmlBlockOpenMenu] = rule_info("HtmlBlockOpenMenu", "\"<\" Spnl (\"menu\" | \"MENU\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseMenu] = rule_info("HtmlBlockCloseMenu", "\"<\" Spnl \"/\" (\"menu\" | \"MENU\") Spnl \">\"")
- Rules[:_HtmlBlockMenu] = rule_info("HtmlBlockMenu", "HtmlBlockOpenMenu (HtmlBlockMenu | !HtmlBlockCloseMenu .)* HtmlBlockCloseMenu")
- Rules[:_HtmlBlockOpenNoframes] = rule_info("HtmlBlockOpenNoframes", "\"<\" Spnl (\"noframes\" | \"NOFRAMES\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseNoframes] = rule_info("HtmlBlockCloseNoframes", "\"<\" Spnl \"/\" (\"noframes\" | \"NOFRAMES\") Spnl \">\"")
- Rules[:_HtmlBlockNoframes] = rule_info("HtmlBlockNoframes", "HtmlBlockOpenNoframes (HtmlBlockNoframes | !HtmlBlockCloseNoframes .)* HtmlBlockCloseNoframes")
- Rules[:_HtmlBlockOpenNoscript] = rule_info("HtmlBlockOpenNoscript", "\"<\" Spnl (\"noscript\" | \"NOSCRIPT\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseNoscript] = rule_info("HtmlBlockCloseNoscript", "\"<\" Spnl \"/\" (\"noscript\" | \"NOSCRIPT\") Spnl \">\"")
- Rules[:_HtmlBlockNoscript] = rule_info("HtmlBlockNoscript", "HtmlBlockOpenNoscript (HtmlBlockNoscript | !HtmlBlockCloseNoscript .)* HtmlBlockCloseNoscript")
- Rules[:_HtmlBlockOpenOl] = rule_info("HtmlBlockOpenOl", "\"<\" Spnl (\"ol\" | \"OL\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseOl] = rule_info("HtmlBlockCloseOl", "\"<\" Spnl \"/\" (\"ol\" | \"OL\") Spnl \">\"")
- Rules[:_HtmlBlockOl] = rule_info("HtmlBlockOl", "HtmlBlockOpenOl (HtmlBlockOl | !HtmlBlockCloseOl .)* HtmlBlockCloseOl")
- Rules[:_HtmlBlockOpenP] = rule_info("HtmlBlockOpenP", "\"<\" Spnl (\"p\" | \"P\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseP] = rule_info("HtmlBlockCloseP", "\"<\" Spnl \"/\" (\"p\" | \"P\") Spnl \">\"")
- Rules[:_HtmlBlockP] = rule_info("HtmlBlockP", "HtmlBlockOpenP (HtmlBlockP | !HtmlBlockCloseP .)* HtmlBlockCloseP")
- Rules[:_HtmlBlockOpenPre] = rule_info("HtmlBlockOpenPre", "\"<\" Spnl (\"pre\" | \"PRE\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockClosePre] = rule_info("HtmlBlockClosePre", "\"<\" Spnl \"/\" (\"pre\" | \"PRE\") Spnl \">\"")
- Rules[:_HtmlBlockPre] = rule_info("HtmlBlockPre", "HtmlBlockOpenPre (HtmlBlockPre | !HtmlBlockClosePre .)* HtmlBlockClosePre")
- Rules[:_HtmlBlockOpenTable] = rule_info("HtmlBlockOpenTable", "\"<\" Spnl (\"table\" | \"TABLE\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseTable] = rule_info("HtmlBlockCloseTable", "\"<\" Spnl \"/\" (\"table\" | \"TABLE\") Spnl \">\"")
- Rules[:_HtmlBlockTable] = rule_info("HtmlBlockTable", "HtmlBlockOpenTable (HtmlBlockTable | !HtmlBlockCloseTable .)* HtmlBlockCloseTable")
- Rules[:_HtmlBlockOpenUl] = rule_info("HtmlBlockOpenUl", "\"<\" Spnl (\"ul\" | \"UL\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseUl] = rule_info("HtmlBlockCloseUl", "\"<\" Spnl \"/\" (\"ul\" | \"UL\") Spnl \">\"")
- Rules[:_HtmlBlockUl] = rule_info("HtmlBlockUl", "HtmlBlockOpenUl (HtmlBlockUl | !HtmlBlockCloseUl .)* HtmlBlockCloseUl")
- Rules[:_HtmlBlockOpenDd] = rule_info("HtmlBlockOpenDd", "\"<\" Spnl (\"dd\" | \"DD\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseDd] = rule_info("HtmlBlockCloseDd", "\"<\" Spnl \"/\" (\"dd\" | \"DD\") Spnl \">\"")
- Rules[:_HtmlBlockDd] = rule_info("HtmlBlockDd", "HtmlBlockOpenDd (HtmlBlockDd | !HtmlBlockCloseDd .)* HtmlBlockCloseDd")
- Rules[:_HtmlBlockOpenDt] = rule_info("HtmlBlockOpenDt", "\"<\" Spnl (\"dt\" | \"DT\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseDt] = rule_info("HtmlBlockCloseDt", "\"<\" Spnl \"/\" (\"dt\" | \"DT\") Spnl \">\"")
- Rules[:_HtmlBlockDt] = rule_info("HtmlBlockDt", "HtmlBlockOpenDt (HtmlBlockDt | !HtmlBlockCloseDt .)* HtmlBlockCloseDt")
- Rules[:_HtmlBlockOpenFrameset] = rule_info("HtmlBlockOpenFrameset", "\"<\" Spnl (\"frameset\" | \"FRAMESET\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseFrameset] = rule_info("HtmlBlockCloseFrameset", "\"<\" Spnl \"/\" (\"frameset\" | \"FRAMESET\") Spnl \">\"")
- Rules[:_HtmlBlockFrameset] = rule_info("HtmlBlockFrameset", "HtmlBlockOpenFrameset (HtmlBlockFrameset | !HtmlBlockCloseFrameset .)* HtmlBlockCloseFrameset")
- Rules[:_HtmlBlockOpenLi] = rule_info("HtmlBlockOpenLi", "\"<\" Spnl (\"li\" | \"LI\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseLi] = rule_info("HtmlBlockCloseLi", "\"<\" Spnl \"/\" (\"li\" | \"LI\") Spnl \">\"")
- Rules[:_HtmlBlockLi] = rule_info("HtmlBlockLi", "HtmlBlockOpenLi (HtmlBlockLi | !HtmlBlockCloseLi .)* HtmlBlockCloseLi")
- Rules[:_HtmlBlockOpenTbody] = rule_info("HtmlBlockOpenTbody", "\"<\" Spnl (\"tbody\" | \"TBODY\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseTbody] = rule_info("HtmlBlockCloseTbody", "\"<\" Spnl \"/\" (\"tbody\" | \"TBODY\") Spnl \">\"")
- Rules[:_HtmlBlockTbody] = rule_info("HtmlBlockTbody", "HtmlBlockOpenTbody (HtmlBlockTbody | !HtmlBlockCloseTbody .)* HtmlBlockCloseTbody")
- Rules[:_HtmlBlockOpenTd] = rule_info("HtmlBlockOpenTd", "\"<\" Spnl (\"td\" | \"TD\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseTd] = rule_info("HtmlBlockCloseTd", "\"<\" Spnl \"/\" (\"td\" | \"TD\") Spnl \">\"")
- Rules[:_HtmlBlockTd] = rule_info("HtmlBlockTd", "HtmlBlockOpenTd (HtmlBlockTd | !HtmlBlockCloseTd .)* HtmlBlockCloseTd")
- Rules[:_HtmlBlockOpenTfoot] = rule_info("HtmlBlockOpenTfoot", "\"<\" Spnl (\"tfoot\" | \"TFOOT\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseTfoot] = rule_info("HtmlBlockCloseTfoot", "\"<\" Spnl \"/\" (\"tfoot\" | \"TFOOT\") Spnl \">\"")
- Rules[:_HtmlBlockTfoot] = rule_info("HtmlBlockTfoot", "HtmlBlockOpenTfoot (HtmlBlockTfoot | !HtmlBlockCloseTfoot .)* HtmlBlockCloseTfoot")
- Rules[:_HtmlBlockOpenTh] = rule_info("HtmlBlockOpenTh", "\"<\" Spnl (\"th\" | \"TH\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseTh] = rule_info("HtmlBlockCloseTh", "\"<\" Spnl \"/\" (\"th\" | \"TH\") Spnl \">\"")
- Rules[:_HtmlBlockTh] = rule_info("HtmlBlockTh", "HtmlBlockOpenTh (HtmlBlockTh | !HtmlBlockCloseTh .)* HtmlBlockCloseTh")
- Rules[:_HtmlBlockOpenThead] = rule_info("HtmlBlockOpenThead", "\"<\" Spnl (\"thead\" | \"THEAD\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseThead] = rule_info("HtmlBlockCloseThead", "\"<\" Spnl \"/\" (\"thead\" | \"THEAD\") Spnl \">\"")
- Rules[:_HtmlBlockThead] = rule_info("HtmlBlockThead", "HtmlBlockOpenThead (HtmlBlockThead | !HtmlBlockCloseThead .)* HtmlBlockCloseThead")
- Rules[:_HtmlBlockOpenTr] = rule_info("HtmlBlockOpenTr", "\"<\" Spnl (\"tr\" | \"TR\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseTr] = rule_info("HtmlBlockCloseTr", "\"<\" Spnl \"/\" (\"tr\" | \"TR\") Spnl \">\"")
- Rules[:_HtmlBlockTr] = rule_info("HtmlBlockTr", "HtmlBlockOpenTr (HtmlBlockTr | !HtmlBlockCloseTr .)* HtmlBlockCloseTr")
- Rules[:_HtmlBlockOpenScript] = rule_info("HtmlBlockOpenScript", "\"<\" Spnl (\"script\" | \"SCRIPT\") Spnl HtmlAttribute* \">\"")
- Rules[:_HtmlBlockCloseScript] = rule_info("HtmlBlockCloseScript", "\"<\" Spnl \"/\" (\"script\" | \"SCRIPT\") Spnl \">\"")
- Rules[:_HtmlBlockScript] = rule_info("HtmlBlockScript", "HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript")
- Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript)")
- Rules[:_HtmlBlock] = rule_info("HtmlBlock", "< (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > BlankLine+ { if html? then RDoc::Markup::Raw.new text end }")
- Rules[:_HtmlUnclosed] = rule_info("HtmlUnclosed", "\"<\" Spnl HtmlUnclosedType Spnl HtmlAttribute* Spnl \">\"")
- Rules[:_HtmlUnclosedType] = rule_info("HtmlUnclosedType", "(\"HR\" | \"hr\")")
- Rules[:_HtmlBlockSelfClosing] = rule_info("HtmlBlockSelfClosing", "\"<\" Spnl HtmlBlockType Spnl HtmlAttribute* \"/\" Spnl \">\"")
- Rules[:_HtmlBlockType] = rule_info("HtmlBlockType", "(\"ADDRESS\" | \"BLOCKQUOTE\" | \"CENTER\" | \"DD\" | \"DIR\" | \"DIV\" | \"DL\" | \"DT\" | \"FIELDSET\" | \"FORM\" | \"FRAMESET\" | \"H1\" | \"H2\" | \"H3\" | \"H4\" | \"H5\" | \"H6\" | \"HR\" | \"ISINDEX\" | \"LI\" | \"MENU\" | \"NOFRAMES\" | \"NOSCRIPT\" | \"OL\" | \"P\" | \"PRE\" | \"SCRIPT\" | \"TABLE\" | \"TBODY\" | \"TD\" | \"TFOOT\" | \"TH\" | \"THEAD\" | \"TR\" | \"UL\" | \"address\" | \"blockquote\" | \"center\" | \"dd\" | \"dir\" | \"div\" | \"dl\" | \"dt\" | \"fieldset\" | \"form\" | \"frameset\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"hr\" | \"isindex\" | \"li\" | \"menu\" | \"noframes\" | \"noscript\" | \"ol\" | \"p\" | \"pre\" | \"script\" | \"table\" | \"tbody\" | \"td\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"ul\")")
- Rules[:_StyleOpen] = rule_info("StyleOpen", "\"<\" Spnl (\"style\" | \"STYLE\") Spnl HtmlAttribute* \">\"")
- Rules[:_StyleClose] = rule_info("StyleClose", "\"<\" Spnl \"/\" (\"style\" | \"STYLE\") Spnl \">\"")
- Rules[:_InStyleTags] = rule_info("InStyleTags", "StyleOpen (!StyleClose .)* StyleClose")
- Rules[:_StyleBlock] = rule_info("StyleBlock", "< InStyleTags > BlankLine* { if css? then RDoc::Markup::Raw.new text end }")
- Rules[:_Inlines] = rule_info("Inlines", "(!Endline Inline:i { i } | Endline:c &Inline { c })+:chunks Endline? { chunks }")
- Rules[:_Inline] = rule_info("Inline", "(Str | Endline | UlOrStarLine | Space | Strong | Emph | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
- Rules[:_Space] = rule_info("Space", "Spacechar+ { \" \" }")
- Rules[:_Str] = rule_info("Str", "StartList:a < NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }")
- Rules[:_StrChunk] = rule_info("StrChunk", "< (NormalChar | \"_\"+ &Alphanumeric)+ > { text }")
- Rules[:_EscapedChar] = rule_info("EscapedChar", "\"\\\\\" !Newline < /[:\\\\`|*_{}\\[\\]()\#+.!><-]/ > { text }")
- Rules[:_Entity] = rule_info("Entity", "(HexEntity | DecEntity | CharEntity):a { a }")
- Rules[:_Endline] = rule_info("Endline", "(LineBreak | TerminalEndline | NormalEndline)")
- Rules[:_NormalEndline] = rule_info("NormalEndline", "Sp Newline !BlankLine !\">\" !AtxStart !(Line (\"===\" \"=\"* | \"---\" \"-\"*) Newline) { \"\\n\" }")
- Rules[:_TerminalEndline] = rule_info("TerminalEndline", "Sp Newline Eof")
- Rules[:_LineBreak] = rule_info("LineBreak", "\" \" NormalEndline { RDoc::Markup::HardBreak.new }")
- Rules[:_Symbol] = rule_info("Symbol", "< SpecialChar > { text }")
- Rules[:_UlOrStarLine] = rule_info("UlOrStarLine", "(UlLine | StarLine):a { a }")
- Rules[:_StarLine] = rule_info("StarLine", "(< \"****\" \"*\"* > { text } | < Spacechar \"*\"+ &Spacechar > { text })")
- Rules[:_UlLine] = rule_info("UlLine", "(< \"____\" \"_\"* > { text } | < Spacechar \"_\"+ &Spacechar > { text })")
- Rules[:_Emph] = rule_info("Emph", "(EmphStar | EmphUl)")
- Rules[:_OneStarOpen] = rule_info("OneStarOpen", "!StarLine \"*\" !Spacechar !Newline")
- Rules[:_OneStarClose] = rule_info("OneStarClose", "!Spacechar !Newline Inline:a \"*\" { a }")
- Rules[:_EmphStar] = rule_info("EmphStar", "OneStarOpen StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }")
- Rules[:_OneUlOpen] = rule_info("OneUlOpen", "!UlLine \"_\" !Spacechar !Newline")
- Rules[:_OneUlClose] = rule_info("OneUlClose", "!Spacechar !Newline Inline:a \"_\" { a }")
- Rules[:_EmphUl] = rule_info("EmphUl", "OneUlOpen StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }")
- Rules[:_Strong] = rule_info("Strong", "(StrongStar | StrongUl)")
- Rules[:_TwoStarOpen] = rule_info("TwoStarOpen", "!StarLine \"**\" !Spacechar !Newline")
- Rules[:_TwoStarClose] = rule_info("TwoStarClose", "!Spacechar !Newline Inline:a \"**\" { a }")
- Rules[:_StrongStar] = rule_info("StrongStar", "TwoStarOpen StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }")
- Rules[:_TwoUlOpen] = rule_info("TwoUlOpen", "!UlLine \"__\" !Spacechar !Newline")
- Rules[:_TwoUlClose] = rule_info("TwoUlClose", "!Spacechar !Newline Inline:a \"__\" { a }")
- Rules[:_StrongUl] = rule_info("StrongUl", "TwoUlOpen StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }")
- Rules[:_Image] = rule_info("Image", "\"!\" (ExplicitLink | ReferenceLink):a { a }")
- Rules[:_Link] = rule_info("Link", "(ExplicitLink | ReferenceLink | AutoLink)")
- Rules[:_ReferenceLink] = rule_info("ReferenceLink", "(ReferenceLinkDouble | ReferenceLinkSingle)")
- Rules[:_ReferenceLinkDouble] = rule_info("ReferenceLinkDouble", "Label:content < Spnl > !\"[]\" Label:label { link_to content, label, text }")
- Rules[:_ReferenceLinkSingle] = rule_info("ReferenceLinkSingle", "Label:content < (Spnl \"[]\")? > { link_to content, content, text }")
- Rules[:_ExplicitLink] = rule_info("ExplicitLink", "Label:l Spnl \"(\" Sp Source:s Spnl Title Sp \")\" { \"{\#{l}}[\#{s}]\" }")
- Rules[:_Source] = rule_info("Source", "(\"<\" < SourceContents > \">\" | < SourceContents >) { text }")
- Rules[:_SourceContents] = rule_info("SourceContents", "(((!\"(\" !\")\" !\">\" Nonspacechar)+ | \"(\" SourceContents \")\")* | \"\")")
- Rules[:_Title] = rule_info("Title", "(TitleSingle | TitleDouble | \"\"):a { a }")
- Rules[:_TitleSingle] = rule_info("TitleSingle", "\"'\" (!(\"'\" Sp (\")\" | Newline)) .)* \"'\"")
- Rules[:_TitleDouble] = rule_info("TitleDouble", "\"\\\"\" (!(\"\\\"\" Sp (\")\" | Newline)) .)* \"\\\"\"")
- Rules[:_AutoLink] = rule_info("AutoLink", "(AutoLinkUrl | AutoLinkEmail)")
- Rules[:_AutoLinkUrl] = rule_info("AutoLinkUrl", "\"<\" < /[A-Za-z]+/ \"://\" (!Newline !\">\" .)+ > \">\" { text }")
- Rules[:_AutoLinkEmail] = rule_info("AutoLinkEmail", "\"<\" \"mailto:\"? < /[\\w+.\\/!%~$-]+/i \"@\" (!Newline !\">\" .)+ > \">\" { \"mailto:\#{text}\" }")
- Rules[:_Reference] = rule_info("Reference", "NonindentSpace !\"[]\" Label:label \":\" Spnl RefSrc:link RefTitle BlankLine+ { \# TODO use title reference label, link nil }")
- Rules[:_Label] = rule_info("Label", "\"[\" (!\"^\" &{ notes? } | &. &{ !notes? }) StartList:a (!\"]\" Inline:l { a << l })* \"]\" { a.join.gsub(/\\s+/, ' ') }")
- Rules[:_RefSrc] = rule_info("RefSrc", "< Nonspacechar+ > { text }")
- Rules[:_RefTitle] = rule_info("RefTitle", "(RefTitleSingle | RefTitleDouble | RefTitleParens | EmptyTitle)")
- Rules[:_EmptyTitle] = rule_info("EmptyTitle", "\"\"")
- Rules[:_RefTitleSingle] = rule_info("RefTitleSingle", "Spnl \"'\" < (!(\"'\" Sp Newline | Newline) .)* > \"'\" { text }")
- Rules[:_RefTitleDouble] = rule_info("RefTitleDouble", "Spnl \"\\\"\" < (!(\"\\\"\" Sp Newline | Newline) .)* > \"\\\"\" { text }")
- Rules[:_RefTitleParens] = rule_info("RefTitleParens", "Spnl \"(\" < (!(\")\" Sp Newline | Newline) .)* > \")\" { text }")
- Rules[:_References] = rule_info("References", "(Reference | SkipBlock)*")
- Rules[:_Ticks1] = rule_info("Ticks1", "\"`\" !\"`\"")
- Rules[:_Ticks2] = rule_info("Ticks2", "\"``\" !\"`\"")
- Rules[:_Ticks3] = rule_info("Ticks3", "\"```\" !\"`\"")
- Rules[:_Ticks4] = rule_info("Ticks4", "\"````\" !\"`\"")
- Rules[:_Ticks5] = rule_info("Ticks5", "\"`````\" !\"`\"")
- Rules[:_Code] = rule_info("Code", "(Ticks1 Sp < ((!\"`\" Nonspacechar)+ | !Ticks1 \"`\"+ | !(Sp Ticks1) (Spacechar | Newline !BlankLine))+ > Sp Ticks1 | Ticks2 Sp < ((!\"`\" Nonspacechar)+ | !Ticks2 \"`\"+ | !(Sp Ticks2) (Spacechar | Newline !BlankLine))+ > Sp Ticks2 | Ticks3 Sp < ((!\"`\" Nonspacechar)+ | !Ticks3 \"`\"+ | !(Sp Ticks3) (Spacechar | Newline !BlankLine))+ > Sp Ticks3 | Ticks4 Sp < ((!\"`\" Nonspacechar)+ | !Ticks4 \"`\"+ | !(Sp Ticks4) (Spacechar | Newline !BlankLine))+ > Sp Ticks4 | Ticks5 Sp < ((!\"`\" Nonspacechar)+ | !Ticks5 \"`\"+ | !(Sp Ticks5) (Spacechar | Newline !BlankLine))+ > Sp Ticks5) { \"<code>\#{text}</code>\" }")
- Rules[:_RawHtml] = rule_info("RawHtml", "< (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }")
- Rules[:_BlankLine] = rule_info("BlankLine", "Sp Newline { \"\\n\" }")
- Rules[:_Quoted] = rule_info("Quoted", "(\"\\\"\" (!\"\\\"\" .)* \"\\\"\" | \"'\" (!\"'\" .)* \"'\")")
- Rules[:_HtmlAttribute] = rule_info("HtmlAttribute", "(AlphanumericAscii | \"-\")+ Spnl (\"=\" Spnl (Quoted | (!\">\" Nonspacechar)+))? Spnl")
- Rules[:_HtmlComment] = rule_info("HtmlComment", "\"<!--\" (!\"-->\" .)* \"-->\"")
- Rules[:_HtmlTag] = rule_info("HtmlTag", "\"<\" Spnl \"/\"? AlphanumericAscii+ Spnl HtmlAttribute* \"/\"? Spnl \">\"")
- Rules[:_Eof] = rule_info("Eof", "!.")
- Rules[:_Nonspacechar] = rule_info("Nonspacechar", "!Spacechar !Newline .")
- Rules[:_Sp] = rule_info("Sp", "Spacechar*")
- Rules[:_Spnl] = rule_info("Spnl", "Sp (Newline Sp)?")
- Rules[:_SpecialChar] = rule_info("SpecialChar", "(\"*\" | \"_\" | \"`\" | \"&\" | \"[\" | \"]\" | \"(\" | \")\" | \"<\" | \"!\" | \"\#\" | \"\\\\\" | \"'\" | \"\\\"\" | ExtendedSpecialChar)")
- Rules[:_NormalChar] = rule_info("NormalChar", "!(SpecialChar | Spacechar | Newline) .")
- Rules[:_Digit] = rule_info("Digit", "[0-9]")
- Rules[:_Alphanumeric] = rule_info("Alphanumeric", "%literals.Alphanumeric")
- Rules[:_AlphanumericAscii] = rule_info("AlphanumericAscii", "%literals.AlphanumericAscii")
- Rules[:_BOM] = rule_info("BOM", "%literals.BOM")
- Rules[:_Newline] = rule_info("Newline", "%literals.Newline")
- Rules[:_NonAlphanumeric] = rule_info("NonAlphanumeric", "%literals.NonAlphanumeric")
- Rules[:_Spacechar] = rule_info("Spacechar", "%literals.Spacechar")
- Rules[:_HexEntity] = rule_info("HexEntity", "\"&\" \"\#\" /[Xx]/ < /[0-9a-fA-F]+/ > \";\" { [text.to_i(16)].pack 'U' }")
- Rules[:_DecEntity] = rule_info("DecEntity", "\"&\" \"\#\" < /[0-9]+/ > \";\" { [text.to_i].pack 'U' }")
- Rules[:_CharEntity] = rule_info("CharEntity", "\"&\" < /[A-Za-z0-9]+/ > \";\" { if entity = HTML_ENTITIES[text] then entity.pack 'U*' else \"&\#{text};\" end }")
- Rules[:_NonindentSpace] = rule_info("NonindentSpace", "(\" \" | \" \" | \" \" | \"\")")
- Rules[:_Indent] = rule_info("Indent", "(\"\\t\" | \" \")")
- Rules[:_IndentedLine] = rule_info("IndentedLine", "Indent Line")
- Rules[:_OptionallyIndentedLine] = rule_info("OptionallyIndentedLine", "Indent? Line")
- Rules[:_StartList] = rule_info("StartList", "&. { [] }")
- Rules[:_Line] = rule_info("Line", "RawLine:a { a }")
- Rules[:_RawLine] = rule_info("RawLine", "(< (!\"\r\" !\"\\n\" .)* Newline > | < .+ > Eof) { text }")
- Rules[:_SkipBlock] = rule_info("SkipBlock", "(HtmlBlock | (!\"\#\" !SetextBottom1 !SetextBottom2 !BlankLine RawLine)+ BlankLine* | BlankLine+ | RawLine)")
- Rules[:_ExtendedSpecialChar] = rule_info("ExtendedSpecialChar", "&{ notes? } \"^\"")
- Rules[:_NoteReference] = rule_info("NoteReference", "&{ notes? } RawNoteReference:ref { note_for ref }")
- Rules[:_RawNoteReference] = rule_info("RawNoteReference", "\"[^\" < (!Newline !\"]\" .)+ > \"]\" { text }")
- Rules[:_Note] = rule_info("Note", "&{ notes? } NonindentSpace RawNoteReference:ref \":\" Sp StartList:a RawNoteBlock (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a nil }")
- Rules[:_InlineNote] = rule_info("InlineNote", "&{ notes? } \"^[\" StartList:a (!\"]\" Inline:l { a << l })+ \"]\" { ref = [:inline, @note_order.length] @footnotes[ref] = paragraph a note_for ref }")
- Rules[:_Notes] = rule_info("Notes", "(Note | SkipBlock)*")
- Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "StartList:a (!BlankLine OptionallyIndentedLine:l { a << l })+ < BlankLine* > { a << text } { a }")
- Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 \"`\"+ | Spacechar | Newline)+ > Ticks3 Sp Newline* { verbatim = RDoc::Markup::Verbatim.new text verbatim.format = format.intern if format verbatim }")
- Rules[:_DefinitionList] = rule_info("DefinitionList", "&{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }")
- Rules[:_DefinitionListItem] = rule_info("DefinitionListItem", "DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = [] list_items << RDoc::Markup::ListItem.new(label, defns.shift) list_items.concat defns.map { |defn| RDoc::Markup::ListItem.new nil, defn } unless list_items.empty? list_items }")
- Rules[:_DefinitionListLabel] = rule_info("DefinitionListLabel", "StrChunk:label Sp Newline { label }")
- Rules[:_DefinitionListDefinition] = rule_info("DefinitionListDefinition", "NonindentSpace \":\" Space Inlines:a BlankLine+ { paragraph a }")
- # :startdoc:
-end
diff --git a/lib/rdoc/markdown/entities.rb b/lib/rdoc/markdown/entities.rb
deleted file mode 100644
index 0661abab78..0000000000
--- a/lib/rdoc/markdown/entities.rb
+++ /dev/null
@@ -1,2131 +0,0 @@
-##
-# HTML entity name map for RDoc::Markdown
-
-RDoc::Markdown::HTML_ENTITIES = {
- "AElig" => [0x000C6],
- "AMP" => [0x00026],
- "Aacute" => [0x000C1],
- "Abreve" => [0x00102],
- "Acirc" => [0x000C2],
- "Acy" => [0x00410],
- "Afr" => [0x1D504],
- "Agrave" => [0x000C0],
- "Alpha" => [0x00391],
- "Amacr" => [0x00100],
- "And" => [0x02A53],
- "Aogon" => [0x00104],
- "Aopf" => [0x1D538],
- "ApplyFunction" => [0x02061],
- "Aring" => [0x000C5],
- "Ascr" => [0x1D49C],
- "Assign" => [0x02254],
- "Atilde" => [0x000C3],
- "Auml" => [0x000C4],
- "Backslash" => [0x02216],
- "Barv" => [0x02AE7],
- "Barwed" => [0x02306],
- "Bcy" => [0x00411],
- "Because" => [0x02235],
- "Bernoullis" => [0x0212C],
- "Beta" => [0x00392],
- "Bfr" => [0x1D505],
- "Bopf" => [0x1D539],
- "Breve" => [0x002D8],
- "Bscr" => [0x0212C],
- "Bumpeq" => [0x0224E],
- "CHcy" => [0x00427],
- "COPY" => [0x000A9],
- "Cacute" => [0x00106],
- "Cap" => [0x022D2],
- "CapitalDifferentialD" => [0x02145],
- "Cayleys" => [0x0212D],
- "Ccaron" => [0x0010C],
- "Ccedil" => [0x000C7],
- "Ccirc" => [0x00108],
- "Cconint" => [0x02230],
- "Cdot" => [0x0010A],
- "Cedilla" => [0x000B8],
- "CenterDot" => [0x000B7],
- "Cfr" => [0x0212D],
- "Chi" => [0x003A7],
- "CircleDot" => [0x02299],
- "CircleMinus" => [0x02296],
- "CirclePlus" => [0x02295],
- "CircleTimes" => [0x02297],
- "ClockwiseContourIntegral" => [0x02232],
- "CloseCurlyDoubleQuote" => [0x0201D],
- "CloseCurlyQuote" => [0x02019],
- "Colon" => [0x02237],
- "Colone" => [0x02A74],
- "Congruent" => [0x02261],
- "Conint" => [0x0222F],
- "ContourIntegral" => [0x0222E],
- "Copf" => [0x02102],
- "Coproduct" => [0x02210],
- "CounterClockwiseContourIntegral" => [0x02233],
- "Cross" => [0x02A2F],
- "Cscr" => [0x1D49E],
- "Cup" => [0x022D3],
- "CupCap" => [0x0224D],
- "DD" => [0x02145],
- "DDotrahd" => [0x02911],
- "DJcy" => [0x00402],
- "DScy" => [0x00405],
- "DZcy" => [0x0040F],
- "Dagger" => [0x02021],
- "Darr" => [0x021A1],
- "Dashv" => [0x02AE4],
- "Dcaron" => [0x0010E],
- "Dcy" => [0x00414],
- "Del" => [0x02207],
- "Delta" => [0x00394],
- "Dfr" => [0x1D507],
- "DiacriticalAcute" => [0x000B4],
- "DiacriticalDot" => [0x002D9],
- "DiacriticalDoubleAcute" => [0x002DD],
- "DiacriticalGrave" => [0x00060],
- "DiacriticalTilde" => [0x002DC],
- "Diamond" => [0x022C4],
- "DifferentialD" => [0x02146],
- "Dopf" => [0x1D53B],
- "Dot" => [0x000A8],
- "DotDot" => [0x020DC],
- "DotEqual" => [0x02250],
- "DoubleContourIntegral" => [0x0222F],
- "DoubleDot" => [0x000A8],
- "DoubleDownArrow" => [0x021D3],
- "DoubleLeftArrow" => [0x021D0],
- "DoubleLeftRightArrow" => [0x021D4],
- "DoubleLeftTee" => [0x02AE4],
- "DoubleLongLeftArrow" => [0x027F8],
- "DoubleLongLeftRightArrow" => [0x027FA],
- "DoubleLongRightArrow" => [0x027F9],
- "DoubleRightArrow" => [0x021D2],
- "DoubleRightTee" => [0x022A8],
- "DoubleUpArrow" => [0x021D1],
- "DoubleUpDownArrow" => [0x021D5],
- "DoubleVerticalBar" => [0x02225],
- "DownArrow" => [0x02193],
- "DownArrowBar" => [0x02913],
- "DownArrowUpArrow" => [0x021F5],
- "DownBreve" => [0x00311],
- "DownLeftRightVector" => [0x02950],
- "DownLeftTeeVector" => [0x0295E],
- "DownLeftVector" => [0x021BD],
- "DownLeftVectorBar" => [0x02956],
- "DownRightTeeVector" => [0x0295F],
- "DownRightVector" => [0x021C1],
- "DownRightVectorBar" => [0x02957],
- "DownTee" => [0x022A4],
- "DownTeeArrow" => [0x021A7],
- "Downarrow" => [0x021D3],
- "Dscr" => [0x1D49F],
- "Dstrok" => [0x00110],
- "ENG" => [0x0014A],
- "ETH" => [0x000D0],
- "Eacute" => [0x000C9],
- "Ecaron" => [0x0011A],
- "Ecirc" => [0x000CA],
- "Ecy" => [0x0042D],
- "Edot" => [0x00116],
- "Efr" => [0x1D508],
- "Egrave" => [0x000C8],
- "Element" => [0x02208],
- "Emacr" => [0x00112],
- "EmptySmallSquare" => [0x025FB],
- "EmptyVerySmallSquare" => [0x025AB],
- "Eogon" => [0x00118],
- "Eopf" => [0x1D53C],
- "Epsilon" => [0x00395],
- "Equal" => [0x02A75],
- "EqualTilde" => [0x02242],
- "Equilibrium" => [0x021CC],
- "Escr" => [0x02130],
- "Esim" => [0x02A73],
- "Eta" => [0x00397],
- "Euml" => [0x000CB],
- "Exists" => [0x02203],
- "ExponentialE" => [0x02147],
- "Fcy" => [0x00424],
- "Ffr" => [0x1D509],
- "FilledSmallSquare" => [0x025FC],
- "FilledVerySmallSquare" => [0x025AA],
- "Fopf" => [0x1D53D],
- "ForAll" => [0x02200],
- "Fouriertrf" => [0x02131],
- "Fscr" => [0x02131],
- "GJcy" => [0x00403],
- "GT" => [0x0003E],
- "Gamma" => [0x00393],
- "Gammad" => [0x003DC],
- "Gbreve" => [0x0011E],
- "Gcedil" => [0x00122],
- "Gcirc" => [0x0011C],
- "Gcy" => [0x00413],
- "Gdot" => [0x00120],
- "Gfr" => [0x1D50A],
- "Gg" => [0x022D9],
- "Gopf" => [0x1D53E],
- "GreaterEqual" => [0x02265],
- "GreaterEqualLess" => [0x022DB],
- "GreaterFullEqual" => [0x02267],
- "GreaterGreater" => [0x02AA2],
- "GreaterLess" => [0x02277],
- "GreaterSlantEqual" => [0x02A7E],
- "GreaterTilde" => [0x02273],
- "Gscr" => [0x1D4A2],
- "Gt" => [0x0226B],
- "HARDcy" => [0x0042A],
- "Hacek" => [0x002C7],
- "Hat" => [0x0005E],
- "Hcirc" => [0x00124],
- "Hfr" => [0x0210C],
- "HilbertSpace" => [0x0210B],
- "Hopf" => [0x0210D],
- "HorizontalLine" => [0x02500],
- "Hscr" => [0x0210B],
- "Hstrok" => [0x00126],
- "HumpDownHump" => [0x0224E],
- "HumpEqual" => [0x0224F],
- "IEcy" => [0x00415],
- "IJlig" => [0x00132],
- "IOcy" => [0x00401],
- "Iacute" => [0x000CD],
- "Icirc" => [0x000CE],
- "Icy" => [0x00418],
- "Idot" => [0x00130],
- "Ifr" => [0x02111],
- "Igrave" => [0x000CC],
- "Im" => [0x02111],
- "Imacr" => [0x0012A],
- "ImaginaryI" => [0x02148],
- "Implies" => [0x021D2],
- "Int" => [0x0222C],
- "Integral" => [0x0222B],
- "Intersection" => [0x022C2],
- "InvisibleComma" => [0x02063],
- "InvisibleTimes" => [0x02062],
- "Iogon" => [0x0012E],
- "Iopf" => [0x1D540],
- "Iota" => [0x00399],
- "Iscr" => [0x02110],
- "Itilde" => [0x00128],
- "Iukcy" => [0x00406],
- "Iuml" => [0x000CF],
- "Jcirc" => [0x00134],
- "Jcy" => [0x00419],
- "Jfr" => [0x1D50D],
- "Jopf" => [0x1D541],
- "Jscr" => [0x1D4A5],
- "Jsercy" => [0x00408],
- "Jukcy" => [0x00404],
- "KHcy" => [0x00425],
- "KJcy" => [0x0040C],
- "Kappa" => [0x0039A],
- "Kcedil" => [0x00136],
- "Kcy" => [0x0041A],
- "Kfr" => [0x1D50E],
- "Kopf" => [0x1D542],
- "Kscr" => [0x1D4A6],
- "LJcy" => [0x00409],
- "LT" => [0x0003C],
- "Lacute" => [0x00139],
- "Lambda" => [0x0039B],
- "Lang" => [0x027EA],
- "Laplacetrf" => [0x02112],
- "Larr" => [0x0219E],
- "Lcaron" => [0x0013D],
- "Lcedil" => [0x0013B],
- "Lcy" => [0x0041B],
- "LeftAngleBracket" => [0x027E8],
- "LeftArrow" => [0x02190],
- "LeftArrowBar" => [0x021E4],
- "LeftArrowRightArrow" => [0x021C6],
- "LeftCeiling" => [0x02308],
- "LeftDoubleBracket" => [0x027E6],
- "LeftDownTeeVector" => [0x02961],
- "LeftDownVector" => [0x021C3],
- "LeftDownVectorBar" => [0x02959],
- "LeftFloor" => [0x0230A],
- "LeftRightArrow" => [0x02194],
- "LeftRightVector" => [0x0294E],
- "LeftTee" => [0x022A3],
- "LeftTeeArrow" => [0x021A4],
- "LeftTeeVector" => [0x0295A],
- "LeftTriangle" => [0x022B2],
- "LeftTriangleBar" => [0x029CF],
- "LeftTriangleEqual" => [0x022B4],
- "LeftUpDownVector" => [0x02951],
- "LeftUpTeeVector" => [0x02960],
- "LeftUpVector" => [0x021BF],
- "LeftUpVectorBar" => [0x02958],
- "LeftVector" => [0x021BC],
- "LeftVectorBar" => [0x02952],
- "Leftarrow" => [0x021D0],
- "Leftrightarrow" => [0x021D4],
- "LessEqualGreater" => [0x022DA],
- "LessFullEqual" => [0x02266],
- "LessGreater" => [0x02276],
- "LessLess" => [0x02AA1],
- "LessSlantEqual" => [0x02A7D],
- "LessTilde" => [0x02272],
- "Lfr" => [0x1D50F],
- "Ll" => [0x022D8],
- "Lleftarrow" => [0x021DA],
- "Lmidot" => [0x0013F],
- "LongLeftArrow" => [0x027F5],
- "LongLeftRightArrow" => [0x027F7],
- "LongRightArrow" => [0x027F6],
- "Longleftarrow" => [0x027F8],
- "Longleftrightarrow" => [0x027FA],
- "Longrightarrow" => [0x027F9],
- "Lopf" => [0x1D543],
- "LowerLeftArrow" => [0x02199],
- "LowerRightArrow" => [0x02198],
- "Lscr" => [0x02112],
- "Lsh" => [0x021B0],
- "Lstrok" => [0x00141],
- "Lt" => [0x0226A],
- "Map" => [0x02905],
- "Mcy" => [0x0041C],
- "MediumSpace" => [0x0205F],
- "Mellintrf" => [0x02133],
- "Mfr" => [0x1D510],
- "MinusPlus" => [0x02213],
- "Mopf" => [0x1D544],
- "Mscr" => [0x02133],
- "Mu" => [0x0039C],
- "NJcy" => [0x0040A],
- "Nacute" => [0x00143],
- "Ncaron" => [0x00147],
- "Ncedil" => [0x00145],
- "Ncy" => [0x0041D],
- "NegativeMediumSpace" => [0x0200B],
- "NegativeThickSpace" => [0x0200B],
- "NegativeThinSpace" => [0x0200B],
- "NegativeVeryThinSpace" => [0x0200B],
- "NestedGreaterGreater" => [0x0226B],
- "NestedLessLess" => [0x0226A],
- "NewLine" => [0x0000A],
- "Nfr" => [0x1D511],
- "NoBreak" => [0x02060],
- "NonBreakingSpace" => [0x000A0],
- "Nopf" => [0x02115],
- "Not" => [0x02AEC],
- "NotCongruent" => [0x02262],
- "NotCupCap" => [0x0226D],
- "NotDoubleVerticalBar" => [0x02226],
- "NotElement" => [0x02209],
- "NotEqual" => [0x02260],
- "NotEqualTilde" => [0x02242, 0x00338],
- "NotExists" => [0x02204],
- "NotGreater" => [0x0226F],
- "NotGreaterEqual" => [0x02271],
- "NotGreaterFullEqual" => [0x02267, 0x00338],
- "NotGreaterGreater" => [0x0226B, 0x00338],
- "NotGreaterLess" => [0x02279],
- "NotGreaterSlantEqual" => [0x02A7E, 0x00338],
- "NotGreaterTilde" => [0x02275],
- "NotHumpDownHump" => [0x0224E, 0x00338],
- "NotHumpEqual" => [0x0224F, 0x00338],
- "NotLeftTriangle" => [0x022EA],
- "NotLeftTriangleBar" => [0x029CF, 0x00338],
- "NotLeftTriangleEqual" => [0x022EC],
- "NotLess" => [0x0226E],
- "NotLessEqual" => [0x02270],
- "NotLessGreater" => [0x02278],
- "NotLessLess" => [0x0226A, 0x00338],
- "NotLessSlantEqual" => [0x02A7D, 0x00338],
- "NotLessTilde" => [0x02274],
- "NotNestedGreaterGreater" => [0x02AA2, 0x00338],
- "NotNestedLessLess" => [0x02AA1, 0x00338],
- "NotPrecedes" => [0x02280],
- "NotPrecedesEqual" => [0x02AAF, 0x00338],
- "NotPrecedesSlantEqual" => [0x022E0],
- "NotReverseElement" => [0x0220C],
- "NotRightTriangle" => [0x022EB],
- "NotRightTriangleBar" => [0x029D0, 0x00338],
- "NotRightTriangleEqual" => [0x022ED],
- "NotSquareSubset" => [0x0228F, 0x00338],
- "NotSquareSubsetEqual" => [0x022E2],
- "NotSquareSuperset" => [0x02290, 0x00338],
- "NotSquareSupersetEqual" => [0x022E3],
- "NotSubset" => [0x02282, 0x020D2],
- "NotSubsetEqual" => [0x02288],
- "NotSucceeds" => [0x02281],
- "NotSucceedsEqual" => [0x02AB0, 0x00338],
- "NotSucceedsSlantEqual" => [0x022E1],
- "NotSucceedsTilde" => [0x0227F, 0x00338],
- "NotSuperset" => [0x02283, 0x020D2],
- "NotSupersetEqual" => [0x02289],
- "NotTilde" => [0x02241],
- "NotTildeEqual" => [0x02244],
- "NotTildeFullEqual" => [0x02247],
- "NotTildeTilde" => [0x02249],
- "NotVerticalBar" => [0x02224],
- "Nscr" => [0x1D4A9],
- "Ntilde" => [0x000D1],
- "Nu" => [0x0039D],
- "OElig" => [0x00152],
- "Oacute" => [0x000D3],
- "Ocirc" => [0x000D4],
- "Ocy" => [0x0041E],
- "Odblac" => [0x00150],
- "Ofr" => [0x1D512],
- "Ograve" => [0x000D2],
- "Omacr" => [0x0014C],
- "Omega" => [0x003A9],
- "Omicron" => [0x0039F],
- "Oopf" => [0x1D546],
- "OpenCurlyDoubleQuote" => [0x0201C],
- "OpenCurlyQuote" => [0x02018],
- "Or" => [0x02A54],
- "Oscr" => [0x1D4AA],
- "Oslash" => [0x000D8],
- "Otilde" => [0x000D5],
- "Otimes" => [0x02A37],
- "Ouml" => [0x000D6],
- "OverBar" => [0x0203E],
- "OverBrace" => [0x023DE],
- "OverBracket" => [0x023B4],
- "OverParenthesis" => [0x023DC],
- "PartialD" => [0x02202],
- "Pcy" => [0x0041F],
- "Pfr" => [0x1D513],
- "Phi" => [0x003A6],
- "Pi" => [0x003A0],
- "PlusMinus" => [0x000B1],
- "Poincareplane" => [0x0210C],
- "Popf" => [0x02119],
- "Pr" => [0x02ABB],
- "Precedes" => [0x0227A],
- "PrecedesEqual" => [0x02AAF],
- "PrecedesSlantEqual" => [0x0227C],
- "PrecedesTilde" => [0x0227E],
- "Prime" => [0x02033],
- "Product" => [0x0220F],
- "Proportion" => [0x02237],
- "Proportional" => [0x0221D],
- "Pscr" => [0x1D4AB],
- "Psi" => [0x003A8],
- "QUOT" => [0x00022],
- "Qfr" => [0x1D514],
- "Qopf" => [0x0211A],
- "Qscr" => [0x1D4AC],
- "RBarr" => [0x02910],
- "REG" => [0x000AE],
- "Racute" => [0x00154],
- "Rang" => [0x027EB],
- "Rarr" => [0x021A0],
- "Rarrtl" => [0x02916],
- "Rcaron" => [0x00158],
- "Rcedil" => [0x00156],
- "Rcy" => [0x00420],
- "Re" => [0x0211C],
- "ReverseElement" => [0x0220B],
- "ReverseEquilibrium" => [0x021CB],
- "ReverseUpEquilibrium" => [0x0296F],
- "Rfr" => [0x0211C],
- "Rho" => [0x003A1],
- "RightAngleBracket" => [0x027E9],
- "RightArrow" => [0x02192],
- "RightArrowBar" => [0x021E5],
- "RightArrowLeftArrow" => [0x021C4],
- "RightCeiling" => [0x02309],
- "RightDoubleBracket" => [0x027E7],
- "RightDownTeeVector" => [0x0295D],
- "RightDownVector" => [0x021C2],
- "RightDownVectorBar" => [0x02955],
- "RightFloor" => [0x0230B],
- "RightTee" => [0x022A2],
- "RightTeeArrow" => [0x021A6],
- "RightTeeVector" => [0x0295B],
- "RightTriangle" => [0x022B3],
- "RightTriangleBar" => [0x029D0],
- "RightTriangleEqual" => [0x022B5],
- "RightUpDownVector" => [0x0294F],
- "RightUpTeeVector" => [0x0295C],
- "RightUpVector" => [0x021BE],
- "RightUpVectorBar" => [0x02954],
- "RightVector" => [0x021C0],
- "RightVectorBar" => [0x02953],
- "Rightarrow" => [0x021D2],
- "Ropf" => [0x0211D],
- "RoundImplies" => [0x02970],
- "Rrightarrow" => [0x021DB],
- "Rscr" => [0x0211B],
- "Rsh" => [0x021B1],
- "RuleDelayed" => [0x029F4],
- "SHCHcy" => [0x00429],
- "SHcy" => [0x00428],
- "SOFTcy" => [0x0042C],
- "Sacute" => [0x0015A],
- "Sc" => [0x02ABC],
- "Scaron" => [0x00160],
- "Scedil" => [0x0015E],
- "Scirc" => [0x0015C],
- "Scy" => [0x00421],
- "Sfr" => [0x1D516],
- "ShortDownArrow" => [0x02193],
- "ShortLeftArrow" => [0x02190],
- "ShortRightArrow" => [0x02192],
- "ShortUpArrow" => [0x02191],
- "Sigma" => [0x003A3],
- "SmallCircle" => [0x02218],
- "Sopf" => [0x1D54A],
- "Sqrt" => [0x0221A],
- "Square" => [0x025A1],
- "SquareIntersection" => [0x02293],
- "SquareSubset" => [0x0228F],
- "SquareSubsetEqual" => [0x02291],
- "SquareSuperset" => [0x02290],
- "SquareSupersetEqual" => [0x02292],
- "SquareUnion" => [0x02294],
- "Sscr" => [0x1D4AE],
- "Star" => [0x022C6],
- "Sub" => [0x022D0],
- "Subset" => [0x022D0],
- "SubsetEqual" => [0x02286],
- "Succeeds" => [0x0227B],
- "SucceedsEqual" => [0x02AB0],
- "SucceedsSlantEqual" => [0x0227D],
- "SucceedsTilde" => [0x0227F],
- "SuchThat" => [0x0220B],
- "Sum" => [0x02211],
- "Sup" => [0x022D1],
- "Superset" => [0x02283],
- "SupersetEqual" => [0x02287],
- "Supset" => [0x022D1],
- "THORN" => [0x000DE],
- "TRADE" => [0x02122],
- "TSHcy" => [0x0040B],
- "TScy" => [0x00426],
- "Tab" => [0x00009],
- "Tau" => [0x003A4],
- "Tcaron" => [0x00164],
- "Tcedil" => [0x00162],
- "Tcy" => [0x00422],
- "Tfr" => [0x1D517],
- "Therefore" => [0x02234],
- "Theta" => [0x00398],
- "ThickSpace" => [0x0205F, 0x0200A],
- "ThinSpace" => [0x02009],
- "Tilde" => [0x0223C],
- "TildeEqual" => [0x02243],
- "TildeFullEqual" => [0x02245],
- "TildeTilde" => [0x02248],
- "Topf" => [0x1D54B],
- "TripleDot" => [0x020DB],
- "Tscr" => [0x1D4AF],
- "Tstrok" => [0x00166],
- "Uacute" => [0x000DA],
- "Uarr" => [0x0219F],
- "Uarrocir" => [0x02949],
- "Ubrcy" => [0x0040E],
- "Ubreve" => [0x0016C],
- "Ucirc" => [0x000DB],
- "Ucy" => [0x00423],
- "Udblac" => [0x00170],
- "Ufr" => [0x1D518],
- "Ugrave" => [0x000D9],
- "Umacr" => [0x0016A],
- "UnderBar" => [0x0005F],
- "UnderBrace" => [0x023DF],
- "UnderBracket" => [0x023B5],
- "UnderParenthesis" => [0x023DD],
- "Union" => [0x022C3],
- "UnionPlus" => [0x0228E],
- "Uogon" => [0x00172],
- "Uopf" => [0x1D54C],
- "UpArrow" => [0x02191],
- "UpArrowBar" => [0x02912],
- "UpArrowDownArrow" => [0x021C5],
- "UpDownArrow" => [0x02195],
- "UpEquilibrium" => [0x0296E],
- "UpTee" => [0x022A5],
- "UpTeeArrow" => [0x021A5],
- "Uparrow" => [0x021D1],
- "Updownarrow" => [0x021D5],
- "UpperLeftArrow" => [0x02196],
- "UpperRightArrow" => [0x02197],
- "Upsi" => [0x003D2],
- "Upsilon" => [0x003A5],
- "Uring" => [0x0016E],
- "Uscr" => [0x1D4B0],
- "Utilde" => [0x00168],
- "Uuml" => [0x000DC],
- "VDash" => [0x022AB],
- "Vbar" => [0x02AEB],
- "Vcy" => [0x00412],
- "Vdash" => [0x022A9],
- "Vdashl" => [0x02AE6],
- "Vee" => [0x022C1],
- "Verbar" => [0x02016],
- "Vert" => [0x02016],
- "VerticalBar" => [0x02223],
- "VerticalLine" => [0x0007C],
- "VerticalSeparator" => [0x02758],
- "VerticalTilde" => [0x02240],
- "VeryThinSpace" => [0x0200A],
- "Vfr" => [0x1D519],
- "Vopf" => [0x1D54D],
- "Vscr" => [0x1D4B1],
- "Vvdash" => [0x022AA],
- "Wcirc" => [0x00174],
- "Wedge" => [0x022C0],
- "Wfr" => [0x1D51A],
- "Wopf" => [0x1D54E],
- "Wscr" => [0x1D4B2],
- "Xfr" => [0x1D51B],
- "Xi" => [0x0039E],
- "Xopf" => [0x1D54F],
- "Xscr" => [0x1D4B3],
- "YAcy" => [0x0042F],
- "YIcy" => [0x00407],
- "YUcy" => [0x0042E],
- "Yacute" => [0x000DD],
- "Ycirc" => [0x00176],
- "Ycy" => [0x0042B],
- "Yfr" => [0x1D51C],
- "Yopf" => [0x1D550],
- "Yscr" => [0x1D4B4],
- "Yuml" => [0x00178],
- "ZHcy" => [0x00416],
- "Zacute" => [0x00179],
- "Zcaron" => [0x0017D],
- "Zcy" => [0x00417],
- "Zdot" => [0x0017B],
- "ZeroWidthSpace" => [0x0200B],
- "Zeta" => [0x00396],
- "Zfr" => [0x02128],
- "Zopf" => [0x02124],
- "Zscr" => [0x1D4B5],
- "aacute" => [0x000E1],
- "abreve" => [0x00103],
- "ac" => [0x0223E],
- "acE" => [0x0223E, 0x00333],
- "acd" => [0x0223F],
- "acirc" => [0x000E2],
- "acute" => [0x000B4],
- "acy" => [0x00430],
- "aelig" => [0x000E6],
- "af" => [0x02061],
- "afr" => [0x1D51E],
- "agrave" => [0x000E0],
- "alefsym" => [0x02135],
- "aleph" => [0x02135],
- "alpha" => [0x003B1],
- "amacr" => [0x00101],
- "amalg" => [0x02A3F],
- "amp" => [0x00026],
- "and" => [0x02227],
- "andand" => [0x02A55],
- "andd" => [0x02A5C],
- "andslope" => [0x02A58],
- "andv" => [0x02A5A],
- "ang" => [0x02220],
- "ange" => [0x029A4],
- "angle" => [0x02220],
- "angmsd" => [0x02221],
- "angmsdaa" => [0x029A8],
- "angmsdab" => [0x029A9],
- "angmsdac" => [0x029AA],
- "angmsdad" => [0x029AB],
- "angmsdae" => [0x029AC],
- "angmsdaf" => [0x029AD],
- "angmsdag" => [0x029AE],
- "angmsdah" => [0x029AF],
- "angrt" => [0x0221F],
- "angrtvb" => [0x022BE],
- "angrtvbd" => [0x0299D],
- "angsph" => [0x02222],
- "angst" => [0x000C5],
- "angzarr" => [0x0237C],
- "aogon" => [0x00105],
- "aopf" => [0x1D552],
- "ap" => [0x02248],
- "apE" => [0x02A70],
- "apacir" => [0x02A6F],
- "ape" => [0x0224A],
- "apid" => [0x0224B],
- "apos" => [0x00027],
- "approx" => [0x02248],
- "approxeq" => [0x0224A],
- "aring" => [0x000E5],
- "ascr" => [0x1D4B6],
- "ast" => [0x0002A],
- "asymp" => [0x02248],
- "asympeq" => [0x0224D],
- "atilde" => [0x000E3],
- "auml" => [0x000E4],
- "awconint" => [0x02233],
- "awint" => [0x02A11],
- "bNot" => [0x02AED],
- "backcong" => [0x0224C],
- "backepsilon" => [0x003F6],
- "backprime" => [0x02035],
- "backsim" => [0x0223D],
- "backsimeq" => [0x022CD],
- "barvee" => [0x022BD],
- "barwed" => [0x02305],
- "barwedge" => [0x02305],
- "bbrk" => [0x023B5],
- "bbrktbrk" => [0x023B6],
- "bcong" => [0x0224C],
- "bcy" => [0x00431],
- "bdquo" => [0x0201E],
- "becaus" => [0x02235],
- "because" => [0x02235],
- "bemptyv" => [0x029B0],
- "bepsi" => [0x003F6],
- "bernou" => [0x0212C],
- "beta" => [0x003B2],
- "beth" => [0x02136],
- "between" => [0x0226C],
- "bfr" => [0x1D51F],
- "bigcap" => [0x022C2],
- "bigcirc" => [0x025EF],
- "bigcup" => [0x022C3],
- "bigodot" => [0x02A00],
- "bigoplus" => [0x02A01],
- "bigotimes" => [0x02A02],
- "bigsqcup" => [0x02A06],
- "bigstar" => [0x02605],
- "bigtriangledown" => [0x025BD],
- "bigtriangleup" => [0x025B3],
- "biguplus" => [0x02A04],
- "bigvee" => [0x022C1],
- "bigwedge" => [0x022C0],
- "bkarow" => [0x0290D],
- "blacklozenge" => [0x029EB],
- "blacksquare" => [0x025AA],
- "blacktriangle" => [0x025B4],
- "blacktriangledown" => [0x025BE],
- "blacktriangleleft" => [0x025C2],
- "blacktriangleright" => [0x025B8],
- "blank" => [0x02423],
- "blk12" => [0x02592],
- "blk14" => [0x02591],
- "blk34" => [0x02593],
- "block" => [0x02588],
- "bne" => [0x0003D, 0x020E5],
- "bnequiv" => [0x02261, 0x020E5],
- "bnot" => [0x02310],
- "bopf" => [0x1D553],
- "bot" => [0x022A5],
- "bottom" => [0x022A5],
- "bowtie" => [0x022C8],
- "boxDL" => [0x02557],
- "boxDR" => [0x02554],
- "boxDl" => [0x02556],
- "boxDr" => [0x02553],
- "boxH" => [0x02550],
- "boxHD" => [0x02566],
- "boxHU" => [0x02569],
- "boxHd" => [0x02564],
- "boxHu" => [0x02567],
- "boxUL" => [0x0255D],
- "boxUR" => [0x0255A],
- "boxUl" => [0x0255C],
- "boxUr" => [0x02559],
- "boxV" => [0x02551],
- "boxVH" => [0x0256C],
- "boxVL" => [0x02563],
- "boxVR" => [0x02560],
- "boxVh" => [0x0256B],
- "boxVl" => [0x02562],
- "boxVr" => [0x0255F],
- "boxbox" => [0x029C9],
- "boxdL" => [0x02555],
- "boxdR" => [0x02552],
- "boxdl" => [0x02510],
- "boxdr" => [0x0250C],
- "boxh" => [0x02500],
- "boxhD" => [0x02565],
- "boxhU" => [0x02568],
- "boxhd" => [0x0252C],
- "boxhu" => [0x02534],
- "boxminus" => [0x0229F],
- "boxplus" => [0x0229E],
- "boxtimes" => [0x022A0],
- "boxuL" => [0x0255B],
- "boxuR" => [0x02558],
- "boxul" => [0x02518],
- "boxur" => [0x02514],
- "boxv" => [0x02502],
- "boxvH" => [0x0256A],
- "boxvL" => [0x02561],
- "boxvR" => [0x0255E],
- "boxvh" => [0x0253C],
- "boxvl" => [0x02524],
- "boxvr" => [0x0251C],
- "bprime" => [0x02035],
- "breve" => [0x002D8],
- "brvbar" => [0x000A6],
- "bscr" => [0x1D4B7],
- "bsemi" => [0x0204F],
- "bsim" => [0x0223D],
- "bsime" => [0x022CD],
- "bsol" => [0x0005C],
- "bsolb" => [0x029C5],
- "bsolhsub" => [0x027C8],
- "bull" => [0x02022],
- "bullet" => [0x02022],
- "bump" => [0x0224E],
- "bumpE" => [0x02AAE],
- "bumpe" => [0x0224F],
- "bumpeq" => [0x0224F],
- "cacute" => [0x00107],
- "cap" => [0x02229],
- "capand" => [0x02A44],
- "capbrcup" => [0x02A49],
- "capcap" => [0x02A4B],
- "capcup" => [0x02A47],
- "capdot" => [0x02A40],
- "caps" => [0x02229, 0x0FE00],
- "caret" => [0x02041],
- "caron" => [0x002C7],
- "ccaps" => [0x02A4D],
- "ccaron" => [0x0010D],
- "ccedil" => [0x000E7],
- "ccirc" => [0x00109],
- "ccups" => [0x02A4C],
- "ccupssm" => [0x02A50],
- "cdot" => [0x0010B],
- "cedil" => [0x000B8],
- "cemptyv" => [0x029B2],
- "cent" => [0x000A2],
- "centerdot" => [0x000B7],
- "cfr" => [0x1D520],
- "chcy" => [0x00447],
- "check" => [0x02713],
- "checkmark" => [0x02713],
- "chi" => [0x003C7],
- "cir" => [0x025CB],
- "cirE" => [0x029C3],
- "circ" => [0x002C6],
- "circeq" => [0x02257],
- "circlearrowleft" => [0x021BA],
- "circlearrowright" => [0x021BB],
- "circledR" => [0x000AE],
- "circledS" => [0x024C8],
- "circledast" => [0x0229B],
- "circledcirc" => [0x0229A],
- "circleddash" => [0x0229D],
- "cire" => [0x02257],
- "cirfnint" => [0x02A10],
- "cirmid" => [0x02AEF],
- "cirscir" => [0x029C2],
- "clubs" => [0x02663],
- "clubsuit" => [0x02663],
- "colon" => [0x0003A],
- "colone" => [0x02254],
- "coloneq" => [0x02254],
- "comma" => [0x0002C],
- "commat" => [0x00040],
- "comp" => [0x02201],
- "compfn" => [0x02218],
- "complement" => [0x02201],
- "complexes" => [0x02102],
- "cong" => [0x02245],
- "congdot" => [0x02A6D],
- "conint" => [0x0222E],
- "copf" => [0x1D554],
- "coprod" => [0x02210],
- "copy" => [0x000A9],
- "copysr" => [0x02117],
- "crarr" => [0x021B5],
- "cross" => [0x02717],
- "cscr" => [0x1D4B8],
- "csub" => [0x02ACF],
- "csube" => [0x02AD1],
- "csup" => [0x02AD0],
- "csupe" => [0x02AD2],
- "ctdot" => [0x022EF],
- "cudarrl" => [0x02938],
- "cudarrr" => [0x02935],
- "cuepr" => [0x022DE],
- "cuesc" => [0x022DF],
- "cularr" => [0x021B6],
- "cularrp" => [0x0293D],
- "cup" => [0x0222A],
- "cupbrcap" => [0x02A48],
- "cupcap" => [0x02A46],
- "cupcup" => [0x02A4A],
- "cupdot" => [0x0228D],
- "cupor" => [0x02A45],
- "cups" => [0x0222A, 0x0FE00],
- "curarr" => [0x021B7],
- "curarrm" => [0x0293C],
- "curlyeqprec" => [0x022DE],
- "curlyeqsucc" => [0x022DF],
- "curlyvee" => [0x022CE],
- "curlywedge" => [0x022CF],
- "curren" => [0x000A4],
- "curvearrowleft" => [0x021B6],
- "curvearrowright" => [0x021B7],
- "cuvee" => [0x022CE],
- "cuwed" => [0x022CF],
- "cwconint" => [0x02232],
- "cwint" => [0x02231],
- "cylcty" => [0x0232D],
- "dArr" => [0x021D3],
- "dHar" => [0x02965],
- "dagger" => [0x02020],
- "daleth" => [0x02138],
- "darr" => [0x02193],
- "dash" => [0x02010],
- "dashv" => [0x022A3],
- "dbkarow" => [0x0290F],
- "dblac" => [0x002DD],
- "dcaron" => [0x0010F],
- "dcy" => [0x00434],
- "dd" => [0x02146],
- "ddagger" => [0x02021],
- "ddarr" => [0x021CA],
- "ddotseq" => [0x02A77],
- "deg" => [0x000B0],
- "delta" => [0x003B4],
- "demptyv" => [0x029B1],
- "dfisht" => [0x0297F],
- "dfr" => [0x1D521],
- "dharl" => [0x021C3],
- "dharr" => [0x021C2],
- "diam" => [0x022C4],
- "diamond" => [0x022C4],
- "diamondsuit" => [0x02666],
- "diams" => [0x02666],
- "die" => [0x000A8],
- "digamma" => [0x003DD],
- "disin" => [0x022F2],
- "div" => [0x000F7],
- "divide" => [0x000F7],
- "divideontimes" => [0x022C7],
- "divonx" => [0x022C7],
- "djcy" => [0x00452],
- "dlcorn" => [0x0231E],
- "dlcrop" => [0x0230D],
- "dollar" => [0x00024],
- "dopf" => [0x1D555],
- "dot" => [0x002D9],
- "doteq" => [0x02250],
- "doteqdot" => [0x02251],
- "dotminus" => [0x02238],
- "dotplus" => [0x02214],
- "dotsquare" => [0x022A1],
- "doublebarwedge" => [0x02306],
- "downarrow" => [0x02193],
- "downdownarrows" => [0x021CA],
- "downharpoonleft" => [0x021C3],
- "downharpoonright" => [0x021C2],
- "drbkarow" => [0x02910],
- "drcorn" => [0x0231F],
- "drcrop" => [0x0230C],
- "dscr" => [0x1D4B9],
- "dscy" => [0x00455],
- "dsol" => [0x029F6],
- "dstrok" => [0x00111],
- "dtdot" => [0x022F1],
- "dtri" => [0x025BF],
- "dtrif" => [0x025BE],
- "duarr" => [0x021F5],
- "duhar" => [0x0296F],
- "dwangle" => [0x029A6],
- "dzcy" => [0x0045F],
- "dzigrarr" => [0x027FF],
- "eDDot" => [0x02A77],
- "eDot" => [0x02251],
- "eacute" => [0x000E9],
- "easter" => [0x02A6E],
- "ecaron" => [0x0011B],
- "ecir" => [0x02256],
- "ecirc" => [0x000EA],
- "ecolon" => [0x02255],
- "ecy" => [0x0044D],
- "edot" => [0x00117],
- "ee" => [0x02147],
- "efDot" => [0x02252],
- "efr" => [0x1D522],
- "eg" => [0x02A9A],
- "egrave" => [0x000E8],
- "egs" => [0x02A96],
- "egsdot" => [0x02A98],
- "el" => [0x02A99],
- "elinters" => [0x023E7],
- "ell" => [0x02113],
- "els" => [0x02A95],
- "elsdot" => [0x02A97],
- "emacr" => [0x00113],
- "empty" => [0x02205],
- "emptyset" => [0x02205],
- "emptyv" => [0x02205],
- "emsp" => [0x02003],
- "emsp13" => [0x02004],
- "emsp14" => [0x02005],
- "eng" => [0x0014B],
- "ensp" => [0x02002],
- "eogon" => [0x00119],
- "eopf" => [0x1D556],
- "epar" => [0x022D5],
- "eparsl" => [0x029E3],
- "eplus" => [0x02A71],
- "epsi" => [0x003B5],
- "epsilon" => [0x003B5],
- "epsiv" => [0x003F5],
- "eqcirc" => [0x02256],
- "eqcolon" => [0x02255],
- "eqsim" => [0x02242],
- "eqslantgtr" => [0x02A96],
- "eqslantless" => [0x02A95],
- "equals" => [0x0003D],
- "equest" => [0x0225F],
- "equiv" => [0x02261],
- "equivDD" => [0x02A78],
- "eqvparsl" => [0x029E5],
- "erDot" => [0x02253],
- "erarr" => [0x02971],
- "escr" => [0x0212F],
- "esdot" => [0x02250],
- "esim" => [0x02242],
- "eta" => [0x003B7],
- "eth" => [0x000F0],
- "euml" => [0x000EB],
- "euro" => [0x020AC],
- "excl" => [0x00021],
- "exist" => [0x02203],
- "expectation" => [0x02130],
- "exponentiale" => [0x02147],
- "fallingdotseq" => [0x02252],
- "fcy" => [0x00444],
- "female" => [0x02640],
- "ffilig" => [0x0FB03],
- "fflig" => [0x0FB00],
- "ffllig" => [0x0FB04],
- "ffr" => [0x1D523],
- "filig" => [0x0FB01],
- "fjlig" => [0x00066, 0x0006A],
- "flat" => [0x0266D],
- "fllig" => [0x0FB02],
- "fltns" => [0x025B1],
- "fnof" => [0x00192],
- "fopf" => [0x1D557],
- "forall" => [0x02200],
- "fork" => [0x022D4],
- "forkv" => [0x02AD9],
- "fpartint" => [0x02A0D],
- "frac12" => [0x000BD],
- "frac13" => [0x02153],
- "frac14" => [0x000BC],
- "frac15" => [0x02155],
- "frac16" => [0x02159],
- "frac18" => [0x0215B],
- "frac23" => [0x02154],
- "frac25" => [0x02156],
- "frac34" => [0x000BE],
- "frac35" => [0x02157],
- "frac38" => [0x0215C],
- "frac45" => [0x02158],
- "frac56" => [0x0215A],
- "frac58" => [0x0215D],
- "frac78" => [0x0215E],
- "frasl" => [0x02044],
- "frown" => [0x02322],
- "fscr" => [0x1D4BB],
- "gE" => [0x02267],
- "gEl" => [0x02A8C],
- "gacute" => [0x001F5],
- "gamma" => [0x003B3],
- "gammad" => [0x003DD],
- "gap" => [0x02A86],
- "gbreve" => [0x0011F],
- "gcirc" => [0x0011D],
- "gcy" => [0x00433],
- "gdot" => [0x00121],
- "ge" => [0x02265],
- "gel" => [0x022DB],
- "geq" => [0x02265],
- "geqq" => [0x02267],
- "geqslant" => [0x02A7E],
- "ges" => [0x02A7E],
- "gescc" => [0x02AA9],
- "gesdot" => [0x02A80],
- "gesdoto" => [0x02A82],
- "gesdotol" => [0x02A84],
- "gesl" => [0x022DB, 0x0FE00],
- "gesles" => [0x02A94],
- "gfr" => [0x1D524],
- "gg" => [0x0226B],
- "ggg" => [0x022D9],
- "gimel" => [0x02137],
- "gjcy" => [0x00453],
- "gl" => [0x02277],
- "glE" => [0x02A92],
- "gla" => [0x02AA5],
- "glj" => [0x02AA4],
- "gnE" => [0x02269],
- "gnap" => [0x02A8A],
- "gnapprox" => [0x02A8A],
- "gne" => [0x02A88],
- "gneq" => [0x02A88],
- "gneqq" => [0x02269],
- "gnsim" => [0x022E7],
- "gopf" => [0x1D558],
- "grave" => [0x00060],
- "gscr" => [0x0210A],
- "gsim" => [0x02273],
- "gsime" => [0x02A8E],
- "gsiml" => [0x02A90],
- "gt" => [0x0003E],
- "gtcc" => [0x02AA7],
- "gtcir" => [0x02A7A],
- "gtdot" => [0x022D7],
- "gtlPar" => [0x02995],
- "gtquest" => [0x02A7C],
- "gtrapprox" => [0x02A86],
- "gtrarr" => [0x02978],
- "gtrdot" => [0x022D7],
- "gtreqless" => [0x022DB],
- "gtreqqless" => [0x02A8C],
- "gtrless" => [0x02277],
- "gtrsim" => [0x02273],
- "gvertneqq" => [0x02269, 0x0FE00],
- "gvnE" => [0x02269, 0x0FE00],
- "hArr" => [0x021D4],
- "hairsp" => [0x0200A],
- "half" => [0x000BD],
- "hamilt" => [0x0210B],
- "hardcy" => [0x0044A],
- "harr" => [0x02194],
- "harrcir" => [0x02948],
- "harrw" => [0x021AD],
- "hbar" => [0x0210F],
- "hcirc" => [0x00125],
- "hearts" => [0x02665],
- "heartsuit" => [0x02665],
- "hellip" => [0x02026],
- "hercon" => [0x022B9],
- "hfr" => [0x1D525],
- "hksearow" => [0x02925],
- "hkswarow" => [0x02926],
- "hoarr" => [0x021FF],
- "homtht" => [0x0223B],
- "hookleftarrow" => [0x021A9],
- "hookrightarrow" => [0x021AA],
- "hopf" => [0x1D559],
- "horbar" => [0x02015],
- "hscr" => [0x1D4BD],
- "hslash" => [0x0210F],
- "hstrok" => [0x00127],
- "hybull" => [0x02043],
- "hyphen" => [0x02010],
- "iacute" => [0x000ED],
- "ic" => [0x02063],
- "icirc" => [0x000EE],
- "icy" => [0x00438],
- "iecy" => [0x00435],
- "iexcl" => [0x000A1],
- "iff" => [0x021D4],
- "ifr" => [0x1D526],
- "igrave" => [0x000EC],
- "ii" => [0x02148],
- "iiiint" => [0x02A0C],
- "iiint" => [0x0222D],
- "iinfin" => [0x029DC],
- "iiota" => [0x02129],
- "ijlig" => [0x00133],
- "imacr" => [0x0012B],
- "image" => [0x02111],
- "imagline" => [0x02110],
- "imagpart" => [0x02111],
- "imath" => [0x00131],
- "imof" => [0x022B7],
- "imped" => [0x001B5],
- "in" => [0x02208],
- "incare" => [0x02105],
- "infin" => [0x0221E],
- "infintie" => [0x029DD],
- "inodot" => [0x00131],
- "int" => [0x0222B],
- "intcal" => [0x022BA],
- "integers" => [0x02124],
- "intercal" => [0x022BA],
- "intlarhk" => [0x02A17],
- "intprod" => [0x02A3C],
- "iocy" => [0x00451],
- "iogon" => [0x0012F],
- "iopf" => [0x1D55A],
- "iota" => [0x003B9],
- "iprod" => [0x02A3C],
- "iquest" => [0x000BF],
- "iscr" => [0x1D4BE],
- "isin" => [0x02208],
- "isinE" => [0x022F9],
- "isindot" => [0x022F5],
- "isins" => [0x022F4],
- "isinsv" => [0x022F3],
- "isinv" => [0x02208],
- "it" => [0x02062],
- "itilde" => [0x00129],
- "iukcy" => [0x00456],
- "iuml" => [0x000EF],
- "jcirc" => [0x00135],
- "jcy" => [0x00439],
- "jfr" => [0x1D527],
- "jmath" => [0x00237],
- "jopf" => [0x1D55B],
- "jscr" => [0x1D4BF],
- "jsercy" => [0x00458],
- "jukcy" => [0x00454],
- "kappa" => [0x003BA],
- "kappav" => [0x003F0],
- "kcedil" => [0x00137],
- "kcy" => [0x0043A],
- "kfr" => [0x1D528],
- "kgreen" => [0x00138],
- "khcy" => [0x00445],
- "kjcy" => [0x0045C],
- "kopf" => [0x1D55C],
- "kscr" => [0x1D4C0],
- "lAarr" => [0x021DA],
- "lArr" => [0x021D0],
- "lAtail" => [0x0291B],
- "lBarr" => [0x0290E],
- "lE" => [0x02266],
- "lEg" => [0x02A8B],
- "lHar" => [0x02962],
- "lacute" => [0x0013A],
- "laemptyv" => [0x029B4],
- "lagran" => [0x02112],
- "lambda" => [0x003BB],
- "lang" => [0x027E8],
- "langd" => [0x02991],
- "langle" => [0x027E8],
- "lap" => [0x02A85],
- "laquo" => [0x000AB],
- "larr" => [0x02190],
- "larrb" => [0x021E4],
- "larrbfs" => [0x0291F],
- "larrfs" => [0x0291D],
- "larrhk" => [0x021A9],
- "larrlp" => [0x021AB],
- "larrpl" => [0x02939],
- "larrsim" => [0x02973],
- "larrtl" => [0x021A2],
- "lat" => [0x02AAB],
- "latail" => [0x02919],
- "late" => [0x02AAD],
- "lates" => [0x02AAD, 0x0FE00],
- "lbarr" => [0x0290C],
- "lbbrk" => [0x02772],
- "lbrace" => [0x0007B],
- "lbrack" => [0x0005B],
- "lbrke" => [0x0298B],
- "lbrksld" => [0x0298F],
- "lbrkslu" => [0x0298D],
- "lcaron" => [0x0013E],
- "lcedil" => [0x0013C],
- "lceil" => [0x02308],
- "lcub" => [0x0007B],
- "lcy" => [0x0043B],
- "ldca" => [0x02936],
- "ldquo" => [0x0201C],
- "ldquor" => [0x0201E],
- "ldrdhar" => [0x02967],
- "ldrushar" => [0x0294B],
- "ldsh" => [0x021B2],
- "le" => [0x02264],
- "leftarrow" => [0x02190],
- "leftarrowtail" => [0x021A2],
- "leftharpoondown" => [0x021BD],
- "leftharpoonup" => [0x021BC],
- "leftleftarrows" => [0x021C7],
- "leftrightarrow" => [0x02194],
- "leftrightarrows" => [0x021C6],
- "leftrightharpoons" => [0x021CB],
- "leftrightsquigarrow" => [0x021AD],
- "leftthreetimes" => [0x022CB],
- "leg" => [0x022DA],
- "leq" => [0x02264],
- "leqq" => [0x02266],
- "leqslant" => [0x02A7D],
- "les" => [0x02A7D],
- "lescc" => [0x02AA8],
- "lesdot" => [0x02A7F],
- "lesdoto" => [0x02A81],
- "lesdotor" => [0x02A83],
- "lesg" => [0x022DA, 0x0FE00],
- "lesges" => [0x02A93],
- "lessapprox" => [0x02A85],
- "lessdot" => [0x022D6],
- "lesseqgtr" => [0x022DA],
- "lesseqqgtr" => [0x02A8B],
- "lessgtr" => [0x02276],
- "lesssim" => [0x02272],
- "lfisht" => [0x0297C],
- "lfloor" => [0x0230A],
- "lfr" => [0x1D529],
- "lg" => [0x02276],
- "lgE" => [0x02A91],
- "lhard" => [0x021BD],
- "lharu" => [0x021BC],
- "lharul" => [0x0296A],
- "lhblk" => [0x02584],
- "ljcy" => [0x00459],
- "ll" => [0x0226A],
- "llarr" => [0x021C7],
- "llcorner" => [0x0231E],
- "llhard" => [0x0296B],
- "lltri" => [0x025FA],
- "lmidot" => [0x00140],
- "lmoust" => [0x023B0],
- "lmoustache" => [0x023B0],
- "lnE" => [0x02268],
- "lnap" => [0x02A89],
- "lnapprox" => [0x02A89],
- "lne" => [0x02A87],
- "lneq" => [0x02A87],
- "lneqq" => [0x02268],
- "lnsim" => [0x022E6],
- "loang" => [0x027EC],
- "loarr" => [0x021FD],
- "lobrk" => [0x027E6],
- "longleftarrow" => [0x027F5],
- "longleftrightarrow" => [0x027F7],
- "longmapsto" => [0x027FC],
- "longrightarrow" => [0x027F6],
- "looparrowleft" => [0x021AB],
- "looparrowright" => [0x021AC],
- "lopar" => [0x02985],
- "lopf" => [0x1D55D],
- "loplus" => [0x02A2D],
- "lotimes" => [0x02A34],
- "lowast" => [0x02217],
- "lowbar" => [0x0005F],
- "loz" => [0x025CA],
- "lozenge" => [0x025CA],
- "lozf" => [0x029EB],
- "lpar" => [0x00028],
- "lparlt" => [0x02993],
- "lrarr" => [0x021C6],
- "lrcorner" => [0x0231F],
- "lrhar" => [0x021CB],
- "lrhard" => [0x0296D],
- "lrm" => [0x0200E],
- "lrtri" => [0x022BF],
- "lsaquo" => [0x02039],
- "lscr" => [0x1D4C1],
- "lsh" => [0x021B0],
- "lsim" => [0x02272],
- "lsime" => [0x02A8D],
- "lsimg" => [0x02A8F],
- "lsqb" => [0x0005B],
- "lsquo" => [0x02018],
- "lsquor" => [0x0201A],
- "lstrok" => [0x00142],
- "lt" => [0x0003C],
- "ltcc" => [0x02AA6],
- "ltcir" => [0x02A79],
- "ltdot" => [0x022D6],
- "lthree" => [0x022CB],
- "ltimes" => [0x022C9],
- "ltlarr" => [0x02976],
- "ltquest" => [0x02A7B],
- "ltrPar" => [0x02996],
- "ltri" => [0x025C3],
- "ltrie" => [0x022B4],
- "ltrif" => [0x025C2],
- "lurdshar" => [0x0294A],
- "luruhar" => [0x02966],
- "lvertneqq" => [0x02268, 0x0FE00],
- "lvnE" => [0x02268, 0x0FE00],
- "mDDot" => [0x0223A],
- "macr" => [0x000AF],
- "male" => [0x02642],
- "malt" => [0x02720],
- "maltese" => [0x02720],
- "map" => [0x021A6],
- "mapsto" => [0x021A6],
- "mapstodown" => [0x021A7],
- "mapstoleft" => [0x021A4],
- "mapstoup" => [0x021A5],
- "marker" => [0x025AE],
- "mcomma" => [0x02A29],
- "mcy" => [0x0043C],
- "mdash" => [0x02014],
- "measuredangle" => [0x02221],
- "mfr" => [0x1D52A],
- "mho" => [0x02127],
- "micro" => [0x000B5],
- "mid" => [0x02223],
- "midast" => [0x0002A],
- "midcir" => [0x02AF0],
- "middot" => [0x000B7],
- "minus" => [0x02212],
- "minusb" => [0x0229F],
- "minusd" => [0x02238],
- "minusdu" => [0x02A2A],
- "mlcp" => [0x02ADB],
- "mldr" => [0x02026],
- "mnplus" => [0x02213],
- "models" => [0x022A7],
- "mopf" => [0x1D55E],
- "mp" => [0x02213],
- "mscr" => [0x1D4C2],
- "mstpos" => [0x0223E],
- "mu" => [0x003BC],
- "multimap" => [0x022B8],
- "mumap" => [0x022B8],
- "nGg" => [0x022D9, 0x00338],
- "nGt" => [0x0226B, 0x020D2],
- "nGtv" => [0x0226B, 0x00338],
- "nLeftarrow" => [0x021CD],
- "nLeftrightarrow" => [0x021CE],
- "nLl" => [0x022D8, 0x00338],
- "nLt" => [0x0226A, 0x020D2],
- "nLtv" => [0x0226A, 0x00338],
- "nRightarrow" => [0x021CF],
- "nVDash" => [0x022AF],
- "nVdash" => [0x022AE],
- "nabla" => [0x02207],
- "nacute" => [0x00144],
- "nang" => [0x02220, 0x020D2],
- "nap" => [0x02249],
- "napE" => [0x02A70, 0x00338],
- "napid" => [0x0224B, 0x00338],
- "napos" => [0x00149],
- "napprox" => [0x02249],
- "natur" => [0x0266E],
- "natural" => [0x0266E],
- "naturals" => [0x02115],
- "nbsp" => [0x000A0],
- "nbump" => [0x0224E, 0x00338],
- "nbumpe" => [0x0224F, 0x00338],
- "ncap" => [0x02A43],
- "ncaron" => [0x00148],
- "ncedil" => [0x00146],
- "ncong" => [0x02247],
- "ncongdot" => [0x02A6D, 0x00338],
- "ncup" => [0x02A42],
- "ncy" => [0x0043D],
- "ndash" => [0x02013],
- "ne" => [0x02260],
- "neArr" => [0x021D7],
- "nearhk" => [0x02924],
- "nearr" => [0x02197],
- "nearrow" => [0x02197],
- "nedot" => [0x02250, 0x00338],
- "nequiv" => [0x02262],
- "nesear" => [0x02928],
- "nesim" => [0x02242, 0x00338],
- "nexist" => [0x02204],
- "nexists" => [0x02204],
- "nfr" => [0x1D52B],
- "ngE" => [0x02267, 0x00338],
- "nge" => [0x02271],
- "ngeq" => [0x02271],
- "ngeqq" => [0x02267, 0x00338],
- "ngeqslant" => [0x02A7E, 0x00338],
- "nges" => [0x02A7E, 0x00338],
- "ngsim" => [0x02275],
- "ngt" => [0x0226F],
- "ngtr" => [0x0226F],
- "nhArr" => [0x021CE],
- "nharr" => [0x021AE],
- "nhpar" => [0x02AF2],
- "ni" => [0x0220B],
- "nis" => [0x022FC],
- "nisd" => [0x022FA],
- "niv" => [0x0220B],
- "njcy" => [0x0045A],
- "nlArr" => [0x021CD],
- "nlE" => [0x02266, 0x00338],
- "nlarr" => [0x0219A],
- "nldr" => [0x02025],
- "nle" => [0x02270],
- "nleftarrow" => [0x0219A],
- "nleftrightarrow" => [0x021AE],
- "nleq" => [0x02270],
- "nleqq" => [0x02266, 0x00338],
- "nleqslant" => [0x02A7D, 0x00338],
- "nles" => [0x02A7D, 0x00338],
- "nless" => [0x0226E],
- "nlsim" => [0x02274],
- "nlt" => [0x0226E],
- "nltri" => [0x022EA],
- "nltrie" => [0x022EC],
- "nmid" => [0x02224],
- "nopf" => [0x1D55F],
- "not" => [0x000AC],
- "notin" => [0x02209],
- "notinE" => [0x022F9, 0x00338],
- "notindot" => [0x022F5, 0x00338],
- "notinva" => [0x02209],
- "notinvb" => [0x022F7],
- "notinvc" => [0x022F6],
- "notni" => [0x0220C],
- "notniva" => [0x0220C],
- "notnivb" => [0x022FE],
- "notnivc" => [0x022FD],
- "npar" => [0x02226],
- "nparallel" => [0x02226],
- "nparsl" => [0x02AFD, 0x020E5],
- "npart" => [0x02202, 0x00338],
- "npolint" => [0x02A14],
- "npr" => [0x02280],
- "nprcue" => [0x022E0],
- "npre" => [0x02AAF, 0x00338],
- "nprec" => [0x02280],
- "npreceq" => [0x02AAF, 0x00338],
- "nrArr" => [0x021CF],
- "nrarr" => [0x0219B],
- "nrarrc" => [0x02933, 0x00338],
- "nrarrw" => [0x0219D, 0x00338],
- "nrightarrow" => [0x0219B],
- "nrtri" => [0x022EB],
- "nrtrie" => [0x022ED],
- "nsc" => [0x02281],
- "nsccue" => [0x022E1],
- "nsce" => [0x02AB0, 0x00338],
- "nscr" => [0x1D4C3],
- "nshortmid" => [0x02224],
- "nshortparallel" => [0x02226],
- "nsim" => [0x02241],
- "nsime" => [0x02244],
- "nsimeq" => [0x02244],
- "nsmid" => [0x02224],
- "nspar" => [0x02226],
- "nsqsube" => [0x022E2],
- "nsqsupe" => [0x022E3],
- "nsub" => [0x02284],
- "nsubE" => [0x02AC5, 0x00338],
- "nsube" => [0x02288],
- "nsubset" => [0x02282, 0x020D2],
- "nsubseteq" => [0x02288],
- "nsubseteqq" => [0x02AC5, 0x00338],
- "nsucc" => [0x02281],
- "nsucceq" => [0x02AB0, 0x00338],
- "nsup" => [0x02285],
- "nsupE" => [0x02AC6, 0x00338],
- "nsupe" => [0x02289],
- "nsupset" => [0x02283, 0x020D2],
- "nsupseteq" => [0x02289],
- "nsupseteqq" => [0x02AC6, 0x00338],
- "ntgl" => [0x02279],
- "ntilde" => [0x000F1],
- "ntlg" => [0x02278],
- "ntriangleleft" => [0x022EA],
- "ntrianglelefteq" => [0x022EC],
- "ntriangleright" => [0x022EB],
- "ntrianglerighteq" => [0x022ED],
- "nu" => [0x003BD],
- "num" => [0x00023],
- "numero" => [0x02116],
- "numsp" => [0x02007],
- "nvDash" => [0x022AD],
- "nvHarr" => [0x02904],
- "nvap" => [0x0224D, 0x020D2],
- "nvdash" => [0x022AC],
- "nvge" => [0x02265, 0x020D2],
- "nvgt" => [0x0003E, 0x020D2],
- "nvinfin" => [0x029DE],
- "nvlArr" => [0x02902],
- "nvle" => [0x02264, 0x020D2],
- "nvlt" => [0x0003C, 0x020D2],
- "nvltrie" => [0x022B4, 0x020D2],
- "nvrArr" => [0x02903],
- "nvrtrie" => [0x022B5, 0x020D2],
- "nvsim" => [0x0223C, 0x020D2],
- "nwArr" => [0x021D6],
- "nwarhk" => [0x02923],
- "nwarr" => [0x02196],
- "nwarrow" => [0x02196],
- "nwnear" => [0x02927],
- "oS" => [0x024C8],
- "oacute" => [0x000F3],
- "oast" => [0x0229B],
- "ocir" => [0x0229A],
- "ocirc" => [0x000F4],
- "ocy" => [0x0043E],
- "odash" => [0x0229D],
- "odblac" => [0x00151],
- "odiv" => [0x02A38],
- "odot" => [0x02299],
- "odsold" => [0x029BC],
- "oelig" => [0x00153],
- "ofcir" => [0x029BF],
- "ofr" => [0x1D52C],
- "ogon" => [0x002DB],
- "ograve" => [0x000F2],
- "ogt" => [0x029C1],
- "ohbar" => [0x029B5],
- "ohm" => [0x003A9],
- "oint" => [0x0222E],
- "olarr" => [0x021BA],
- "olcir" => [0x029BE],
- "olcross" => [0x029BB],
- "oline" => [0x0203E],
- "olt" => [0x029C0],
- "omacr" => [0x0014D],
- "omega" => [0x003C9],
- "omicron" => [0x003BF],
- "omid" => [0x029B6],
- "ominus" => [0x02296],
- "oopf" => [0x1D560],
- "opar" => [0x029B7],
- "operp" => [0x029B9],
- "oplus" => [0x02295],
- "or" => [0x02228],
- "orarr" => [0x021BB],
- "ord" => [0x02A5D],
- "order" => [0x02134],
- "orderof" => [0x02134],
- "ordf" => [0x000AA],
- "ordm" => [0x000BA],
- "origof" => [0x022B6],
- "oror" => [0x02A56],
- "orslope" => [0x02A57],
- "orv" => [0x02A5B],
- "oscr" => [0x02134],
- "oslash" => [0x000F8],
- "osol" => [0x02298],
- "otilde" => [0x000F5],
- "otimes" => [0x02297],
- "otimesas" => [0x02A36],
- "ouml" => [0x000F6],
- "ovbar" => [0x0233D],
- "par" => [0x02225],
- "para" => [0x000B6],
- "parallel" => [0x02225],
- "parsim" => [0x02AF3],
- "parsl" => [0x02AFD],
- "part" => [0x02202],
- "pcy" => [0x0043F],
- "percnt" => [0x00025],
- "period" => [0x0002E],
- "permil" => [0x02030],
- "perp" => [0x022A5],
- "pertenk" => [0x02031],
- "pfr" => [0x1D52D],
- "phi" => [0x003C6],
- "phiv" => [0x003D5],
- "phmmat" => [0x02133],
- "phone" => [0x0260E],
- "pi" => [0x003C0],
- "pitchfork" => [0x022D4],
- "piv" => [0x003D6],
- "planck" => [0x0210F],
- "planckh" => [0x0210E],
- "plankv" => [0x0210F],
- "plus" => [0x0002B],
- "plusacir" => [0x02A23],
- "plusb" => [0x0229E],
- "pluscir" => [0x02A22],
- "plusdo" => [0x02214],
- "plusdu" => [0x02A25],
- "pluse" => [0x02A72],
- "plusmn" => [0x000B1],
- "plussim" => [0x02A26],
- "plustwo" => [0x02A27],
- "pm" => [0x000B1],
- "pointint" => [0x02A15],
- "popf" => [0x1D561],
- "pound" => [0x000A3],
- "pr" => [0x0227A],
- "prE" => [0x02AB3],
- "prap" => [0x02AB7],
- "prcue" => [0x0227C],
- "pre" => [0x02AAF],
- "prec" => [0x0227A],
- "precapprox" => [0x02AB7],
- "preccurlyeq" => [0x0227C],
- "preceq" => [0x02AAF],
- "precnapprox" => [0x02AB9],
- "precneqq" => [0x02AB5],
- "precnsim" => [0x022E8],
- "precsim" => [0x0227E],
- "prime" => [0x02032],
- "primes" => [0x02119],
- "prnE" => [0x02AB5],
- "prnap" => [0x02AB9],
- "prnsim" => [0x022E8],
- "prod" => [0x0220F],
- "profalar" => [0x0232E],
- "profline" => [0x02312],
- "profsurf" => [0x02313],
- "prop" => [0x0221D],
- "propto" => [0x0221D],
- "prsim" => [0x0227E],
- "prurel" => [0x022B0],
- "pscr" => [0x1D4C5],
- "psi" => [0x003C8],
- "puncsp" => [0x02008],
- "qfr" => [0x1D52E],
- "qint" => [0x02A0C],
- "qopf" => [0x1D562],
- "qprime" => [0x02057],
- "qscr" => [0x1D4C6],
- "quaternions" => [0x0210D],
- "quatint" => [0x02A16],
- "quest" => [0x0003F],
- "questeq" => [0x0225F],
- "quot" => [0x00022],
- "rAarr" => [0x021DB],
- "rArr" => [0x021D2],
- "rAtail" => [0x0291C],
- "rBarr" => [0x0290F],
- "rHar" => [0x02964],
- "race" => [0x0223D, 0x00331],
- "racute" => [0x00155],
- "radic" => [0x0221A],
- "raemptyv" => [0x029B3],
- "rang" => [0x027E9],
- "rangd" => [0x02992],
- "range" => [0x029A5],
- "rangle" => [0x027E9],
- "raquo" => [0x000BB],
- "rarr" => [0x02192],
- "rarrap" => [0x02975],
- "rarrb" => [0x021E5],
- "rarrbfs" => [0x02920],
- "rarrc" => [0x02933],
- "rarrfs" => [0x0291E],
- "rarrhk" => [0x021AA],
- "rarrlp" => [0x021AC],
- "rarrpl" => [0x02945],
- "rarrsim" => [0x02974],
- "rarrtl" => [0x021A3],
- "rarrw" => [0x0219D],
- "ratail" => [0x0291A],
- "ratio" => [0x02236],
- "rationals" => [0x0211A],
- "rbarr" => [0x0290D],
- "rbbrk" => [0x02773],
- "rbrace" => [0x0007D],
- "rbrack" => [0x0005D],
- "rbrke" => [0x0298C],
- "rbrksld" => [0x0298E],
- "rbrkslu" => [0x02990],
- "rcaron" => [0x00159],
- "rcedil" => [0x00157],
- "rceil" => [0x02309],
- "rcub" => [0x0007D],
- "rcy" => [0x00440],
- "rdca" => [0x02937],
- "rdldhar" => [0x02969],
- "rdquo" => [0x0201D],
- "rdquor" => [0x0201D],
- "rdsh" => [0x021B3],
- "real" => [0x0211C],
- "realine" => [0x0211B],
- "realpart" => [0x0211C],
- "reals" => [0x0211D],
- "rect" => [0x025AD],
- "reg" => [0x000AE],
- "rfisht" => [0x0297D],
- "rfloor" => [0x0230B],
- "rfr" => [0x1D52F],
- "rhard" => [0x021C1],
- "rharu" => [0x021C0],
- "rharul" => [0x0296C],
- "rho" => [0x003C1],
- "rhov" => [0x003F1],
- "rightarrow" => [0x02192],
- "rightarrowtail" => [0x021A3],
- "rightharpoondown" => [0x021C1],
- "rightharpoonup" => [0x021C0],
- "rightleftarrows" => [0x021C4],
- "rightleftharpoons" => [0x021CC],
- "rightrightarrows" => [0x021C9],
- "rightsquigarrow" => [0x0219D],
- "rightthreetimes" => [0x022CC],
- "ring" => [0x002DA],
- "risingdotseq" => [0x02253],
- "rlarr" => [0x021C4],
- "rlhar" => [0x021CC],
- "rlm" => [0x0200F],
- "rmoust" => [0x023B1],
- "rmoustache" => [0x023B1],
- "rnmid" => [0x02AEE],
- "roang" => [0x027ED],
- "roarr" => [0x021FE],
- "robrk" => [0x027E7],
- "ropar" => [0x02986],
- "ropf" => [0x1D563],
- "roplus" => [0x02A2E],
- "rotimes" => [0x02A35],
- "rpar" => [0x00029],
- "rpargt" => [0x02994],
- "rppolint" => [0x02A12],
- "rrarr" => [0x021C9],
- "rsaquo" => [0x0203A],
- "rscr" => [0x1D4C7],
- "rsh" => [0x021B1],
- "rsqb" => [0x0005D],
- "rsquo" => [0x02019],
- "rsquor" => [0x02019],
- "rthree" => [0x022CC],
- "rtimes" => [0x022CA],
- "rtri" => [0x025B9],
- "rtrie" => [0x022B5],
- "rtrif" => [0x025B8],
- "rtriltri" => [0x029CE],
- "ruluhar" => [0x02968],
- "rx" => [0x0211E],
- "sacute" => [0x0015B],
- "sbquo" => [0x0201A],
- "sc" => [0x0227B],
- "scE" => [0x02AB4],
- "scap" => [0x02AB8],
- "scaron" => [0x00161],
- "sccue" => [0x0227D],
- "sce" => [0x02AB0],
- "scedil" => [0x0015F],
- "scirc" => [0x0015D],
- "scnE" => [0x02AB6],
- "scnap" => [0x02ABA],
- "scnsim" => [0x022E9],
- "scpolint" => [0x02A13],
- "scsim" => [0x0227F],
- "scy" => [0x00441],
- "sdot" => [0x022C5],
- "sdotb" => [0x022A1],
- "sdote" => [0x02A66],
- "seArr" => [0x021D8],
- "searhk" => [0x02925],
- "searr" => [0x02198],
- "searrow" => [0x02198],
- "sect" => [0x000A7],
- "semi" => [0x0003B],
- "seswar" => [0x02929],
- "setminus" => [0x02216],
- "setmn" => [0x02216],
- "sext" => [0x02736],
- "sfr" => [0x1D530],
- "sfrown" => [0x02322],
- "sharp" => [0x0266F],
- "shchcy" => [0x00449],
- "shcy" => [0x00448],
- "shortmid" => [0x02223],
- "shortparallel" => [0x02225],
- "shy" => [0x000AD],
- "sigma" => [0x003C3],
- "sigmaf" => [0x003C2],
- "sigmav" => [0x003C2],
- "sim" => [0x0223C],
- "simdot" => [0x02A6A],
- "sime" => [0x02243],
- "simeq" => [0x02243],
- "simg" => [0x02A9E],
- "simgE" => [0x02AA0],
- "siml" => [0x02A9D],
- "simlE" => [0x02A9F],
- "simne" => [0x02246],
- "simplus" => [0x02A24],
- "simrarr" => [0x02972],
- "slarr" => [0x02190],
- "smallsetminus" => [0x02216],
- "smashp" => [0x02A33],
- "smeparsl" => [0x029E4],
- "smid" => [0x02223],
- "smile" => [0x02323],
- "smt" => [0x02AAA],
- "smte" => [0x02AAC],
- "smtes" => [0x02AAC, 0x0FE00],
- "softcy" => [0x0044C],
- "sol" => [0x0002F],
- "solb" => [0x029C4],
- "solbar" => [0x0233F],
- "sopf" => [0x1D564],
- "spades" => [0x02660],
- "spadesuit" => [0x02660],
- "spar" => [0x02225],
- "sqcap" => [0x02293],
- "sqcaps" => [0x02293, 0x0FE00],
- "sqcup" => [0x02294],
- "sqcups" => [0x02294, 0x0FE00],
- "sqsub" => [0x0228F],
- "sqsube" => [0x02291],
- "sqsubset" => [0x0228F],
- "sqsubseteq" => [0x02291],
- "sqsup" => [0x02290],
- "sqsupe" => [0x02292],
- "sqsupset" => [0x02290],
- "sqsupseteq" => [0x02292],
- "squ" => [0x025A1],
- "square" => [0x025A1],
- "squarf" => [0x025AA],
- "squf" => [0x025AA],
- "srarr" => [0x02192],
- "sscr" => [0x1D4C8],
- "ssetmn" => [0x02216],
- "ssmile" => [0x02323],
- "sstarf" => [0x022C6],
- "star" => [0x02606],
- "starf" => [0x02605],
- "straightepsilon" => [0x003F5],
- "straightphi" => [0x003D5],
- "strns" => [0x000AF],
- "sub" => [0x02282],
- "subE" => [0x02AC5],
- "subdot" => [0x02ABD],
- "sube" => [0x02286],
- "subedot" => [0x02AC3],
- "submult" => [0x02AC1],
- "subnE" => [0x02ACB],
- "subne" => [0x0228A],
- "subplus" => [0x02ABF],
- "subrarr" => [0x02979],
- "subset" => [0x02282],
- "subseteq" => [0x02286],
- "subseteqq" => [0x02AC5],
- "subsetneq" => [0x0228A],
- "subsetneqq" => [0x02ACB],
- "subsim" => [0x02AC7],
- "subsub" => [0x02AD5],
- "subsup" => [0x02AD3],
- "succ" => [0x0227B],
- "succapprox" => [0x02AB8],
- "succcurlyeq" => [0x0227D],
- "succeq" => [0x02AB0],
- "succnapprox" => [0x02ABA],
- "succneqq" => [0x02AB6],
- "succnsim" => [0x022E9],
- "succsim" => [0x0227F],
- "sum" => [0x02211],
- "sung" => [0x0266A],
- "sup" => [0x02283],
- "sup1" => [0x000B9],
- "sup2" => [0x000B2],
- "sup3" => [0x000B3],
- "supE" => [0x02AC6],
- "supdot" => [0x02ABE],
- "supdsub" => [0x02AD8],
- "supe" => [0x02287],
- "supedot" => [0x02AC4],
- "suphsol" => [0x027C9],
- "suphsub" => [0x02AD7],
- "suplarr" => [0x0297B],
- "supmult" => [0x02AC2],
- "supnE" => [0x02ACC],
- "supne" => [0x0228B],
- "supplus" => [0x02AC0],
- "supset" => [0x02283],
- "supseteq" => [0x02287],
- "supseteqq" => [0x02AC6],
- "supsetneq" => [0x0228B],
- "supsetneqq" => [0x02ACC],
- "supsim" => [0x02AC8],
- "supsub" => [0x02AD4],
- "supsup" => [0x02AD6],
- "swArr" => [0x021D9],
- "swarhk" => [0x02926],
- "swarr" => [0x02199],
- "swarrow" => [0x02199],
- "swnwar" => [0x0292A],
- "szlig" => [0x000DF],
- "target" => [0x02316],
- "tau" => [0x003C4],
- "tbrk" => [0x023B4],
- "tcaron" => [0x00165],
- "tcedil" => [0x00163],
- "tcy" => [0x00442],
- "tdot" => [0x020DB],
- "telrec" => [0x02315],
- "tfr" => [0x1D531],
- "there4" => [0x02234],
- "therefore" => [0x02234],
- "theta" => [0x003B8],
- "thetasym" => [0x003D1],
- "thetav" => [0x003D1],
- "thickapprox" => [0x02248],
- "thicksim" => [0x0223C],
- "thinsp" => [0x02009],
- "thkap" => [0x02248],
- "thksim" => [0x0223C],
- "thorn" => [0x000FE],
- "tilde" => [0x002DC],
- "times" => [0x000D7],
- "timesb" => [0x022A0],
- "timesbar" => [0x02A31],
- "timesd" => [0x02A30],
- "tint" => [0x0222D],
- "toea" => [0x02928],
- "top" => [0x022A4],
- "topbot" => [0x02336],
- "topcir" => [0x02AF1],
- "topf" => [0x1D565],
- "topfork" => [0x02ADA],
- "tosa" => [0x02929],
- "tprime" => [0x02034],
- "trade" => [0x02122],
- "triangle" => [0x025B5],
- "triangledown" => [0x025BF],
- "triangleleft" => [0x025C3],
- "trianglelefteq" => [0x022B4],
- "triangleq" => [0x0225C],
- "triangleright" => [0x025B9],
- "trianglerighteq" => [0x022B5],
- "tridot" => [0x025EC],
- "trie" => [0x0225C],
- "triminus" => [0x02A3A],
- "triplus" => [0x02A39],
- "trisb" => [0x029CD],
- "tritime" => [0x02A3B],
- "trpezium" => [0x023E2],
- "tscr" => [0x1D4C9],
- "tscy" => [0x00446],
- "tshcy" => [0x0045B],
- "tstrok" => [0x00167],
- "twixt" => [0x0226C],
- "twoheadleftarrow" => [0x0219E],
- "twoheadrightarrow" => [0x021A0],
- "uArr" => [0x021D1],
- "uHar" => [0x02963],
- "uacute" => [0x000FA],
- "uarr" => [0x02191],
- "ubrcy" => [0x0045E],
- "ubreve" => [0x0016D],
- "ucirc" => [0x000FB],
- "ucy" => [0x00443],
- "udarr" => [0x021C5],
- "udblac" => [0x00171],
- "udhar" => [0x0296E],
- "ufisht" => [0x0297E],
- "ufr" => [0x1D532],
- "ugrave" => [0x000F9],
- "uharl" => [0x021BF],
- "uharr" => [0x021BE],
- "uhblk" => [0x02580],
- "ulcorn" => [0x0231C],
- "ulcorner" => [0x0231C],
- "ulcrop" => [0x0230F],
- "ultri" => [0x025F8],
- "umacr" => [0x0016B],
- "uml" => [0x000A8],
- "uogon" => [0x00173],
- "uopf" => [0x1D566],
- "uparrow" => [0x02191],
- "updownarrow" => [0x02195],
- "upharpoonleft" => [0x021BF],
- "upharpoonright" => [0x021BE],
- "uplus" => [0x0228E],
- "upsi" => [0x003C5],
- "upsih" => [0x003D2],
- "upsilon" => [0x003C5],
- "upuparrows" => [0x021C8],
- "urcorn" => [0x0231D],
- "urcorner" => [0x0231D],
- "urcrop" => [0x0230E],
- "uring" => [0x0016F],
- "urtri" => [0x025F9],
- "uscr" => [0x1D4CA],
- "utdot" => [0x022F0],
- "utilde" => [0x00169],
- "utri" => [0x025B5],
- "utrif" => [0x025B4],
- "uuarr" => [0x021C8],
- "uuml" => [0x000FC],
- "uwangle" => [0x029A7],
- "vArr" => [0x021D5],
- "vBar" => [0x02AE8],
- "vBarv" => [0x02AE9],
- "vDash" => [0x022A8],
- "vangrt" => [0x0299C],
- "varepsilon" => [0x003F5],
- "varkappa" => [0x003F0],
- "varnothing" => [0x02205],
- "varphi" => [0x003D5],
- "varpi" => [0x003D6],
- "varpropto" => [0x0221D],
- "varr" => [0x02195],
- "varrho" => [0x003F1],
- "varsigma" => [0x003C2],
- "varsubsetneq" => [0x0228A, 0x0FE00],
- "varsubsetneqq" => [0x02ACB, 0x0FE00],
- "varsupsetneq" => [0x0228B, 0x0FE00],
- "varsupsetneqq" => [0x02ACC, 0x0FE00],
- "vartheta" => [0x003D1],
- "vartriangleleft" => [0x022B2],
- "vartriangleright" => [0x022B3],
- "vcy" => [0x00432],
- "vdash" => [0x022A2],
- "vee" => [0x02228],
- "veebar" => [0x022BB],
- "veeeq" => [0x0225A],
- "vellip" => [0x022EE],
- "verbar" => [0x0007C],
- "vert" => [0x0007C],
- "vfr" => [0x1D533],
- "vltri" => [0x022B2],
- "vnsub" => [0x02282, 0x020D2],
- "vnsup" => [0x02283, 0x020D2],
- "vopf" => [0x1D567],
- "vprop" => [0x0221D],
- "vrtri" => [0x022B3],
- "vscr" => [0x1D4CB],
- "vsubnE" => [0x02ACB, 0x0FE00],
- "vsubne" => [0x0228A, 0x0FE00],
- "vsupnE" => [0x02ACC, 0x0FE00],
- "vsupne" => [0x0228B, 0x0FE00],
- "vzigzag" => [0x0299A],
- "wcirc" => [0x00175],
- "wedbar" => [0x02A5F],
- "wedge" => [0x02227],
- "wedgeq" => [0x02259],
- "weierp" => [0x02118],
- "wfr" => [0x1D534],
- "wopf" => [0x1D568],
- "wp" => [0x02118],
- "wr" => [0x02240],
- "wreath" => [0x02240],
- "wscr" => [0x1D4CC],
- "xcap" => [0x022C2],
- "xcirc" => [0x025EF],
- "xcup" => [0x022C3],
- "xdtri" => [0x025BD],
- "xfr" => [0x1D535],
- "xhArr" => [0x027FA],
- "xharr" => [0x027F7],
- "xi" => [0x003BE],
- "xlArr" => [0x027F8],
- "xlarr" => [0x027F5],
- "xmap" => [0x027FC],
- "xnis" => [0x022FB],
- "xodot" => [0x02A00],
- "xopf" => [0x1D569],
- "xoplus" => [0x02A01],
- "xotime" => [0x02A02],
- "xrArr" => [0x027F9],
- "xrarr" => [0x027F6],
- "xscr" => [0x1D4CD],
- "xsqcup" => [0x02A06],
- "xuplus" => [0x02A04],
- "xutri" => [0x025B3],
- "xvee" => [0x022C1],
- "xwedge" => [0x022C0],
- "yacute" => [0x000FD],
- "yacy" => [0x0044F],
- "ycirc" => [0x00177],
- "ycy" => [0x0044B],
- "yen" => [0x000A5],
- "yfr" => [0x1D536],
- "yicy" => [0x00457],
- "yopf" => [0x1D56A],
- "yscr" => [0x1D4CE],
- "yucy" => [0x0044E],
- "yuml" => [0x000FF],
- "zacute" => [0x0017A],
- "zcaron" => [0x0017E],
- "zcy" => [0x00437],
- "zdot" => [0x0017C],
- "zeetrf" => [0x02128],
- "zeta" => [0x003B6],
- "zfr" => [0x1D537],
- "zhcy" => [0x00436],
- "zigrarr" => [0x021DD],
- "zopf" => [0x1D56B],
- "zscr" => [0x1D4CF],
- "zwj" => [0x0200D],
- "zwnj" => [0x0200C],
-}
-
diff --git a/lib/rdoc/markdown/literals_1_9.rb b/lib/rdoc/markdown/literals_1_9.rb
deleted file mode 100644
index 5aa90c65a2..0000000000
--- a/lib/rdoc/markdown/literals_1_9.rb
+++ /dev/null
@@ -1,417 +0,0 @@
-# coding: UTF-8
-# :markup: markdown
-
-##
-#--
-# This set of literals is for ruby 1.9 regular expressions and gives full
-# unicode support.
-#
-# Unlike peg-markdown, this set of literals recognizes Unicode alphanumeric
-# characters, newlines and spaces.
-class RDoc::Markdown::Literals
- # :stopdoc:
-
- # This is distinct from setup_parser so that a standalone parser
- # can redefine #initialize and still have access to the proper
- # parser setup code.
- def initialize(str, debug=false)
- setup_parser(str, debug)
- end
-
-
-
- # Prepares for parsing +str+. If you define a custom initialize you must
- # call this method before #parse
- def setup_parser(str, debug=false)
- @string = str
- @pos = 0
- @memoizations = Hash.new { |h,k| h[k] = {} }
- @result = nil
- @failed_rule = nil
- @failing_rule_offset = -1
-
- setup_foreign_grammar
- end
-
- attr_reader :string
- attr_reader :failing_rule_offset
- attr_accessor :result, :pos
-
-
- def current_column(target=pos)
- if c = string.rindex("\n", target-1)
- return target - c - 1
- end
-
- target + 1
- end
-
- def current_line(target=pos)
- cur_offset = 0
- cur_line = 0
-
- string.each_line do |line|
- cur_line += 1
- cur_offset += line.size
- return cur_line if cur_offset >= target
- end
-
- -1
- end
-
- def lines
- lines = []
- string.each_line { |l| lines << l }
- lines
- end
-
-
-
- def get_text(start)
- @string[start..@pos-1]
- end
-
- def show_pos
- width = 10
- if @pos < width
- "#{@pos} (\"#{@string[0,@pos]}\" @ \"#{@string[@pos,width]}\")"
- else
- "#{@pos} (\"... #{@string[@pos - width, width]}\" @ \"#{@string[@pos,width]}\")"
- end
- end
-
- def failure_info
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
-
- if @failed_rule.kind_of? Symbol
- info = self.class::Rules[@failed_rule]
- "line #{l}, column #{c}: failed rule '#{info.name}' = '#{info.rendered}'"
- else
- "line #{l}, column #{c}: failed rule '#{@failed_rule}'"
- end
- end
-
- def failure_caret
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
-
- line = lines[l-1]
- "#{line}\n#{' ' * (c - 1)}^"
- end
-
- def failure_character
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
- lines[l-1][c-1, 1]
- end
-
- def failure_oneline
- l = current_line @failing_rule_offset
- c = current_column @failing_rule_offset
-
- char = lines[l-1][c-1, 1]
-
- if @failed_rule.kind_of? Symbol
- info = self.class::Rules[@failed_rule]
- "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
- else
- "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
- end
- end
-
- class ParseError < RuntimeError
- end
-
- def raise_error
- raise ParseError, failure_oneline
- end
-
- def show_error(io=STDOUT)
- error_pos = @failing_rule_offset
- line_no = current_line(error_pos)
- col_no = current_column(error_pos)
-
- io.puts "On line #{line_no}, column #{col_no}:"
-
- if @failed_rule.kind_of? Symbol
- info = self.class::Rules[@failed_rule]
- io.puts "Failed to match '#{info.rendered}' (rule '#{info.name}')"
- else
- io.puts "Failed to match rule '#{@failed_rule}'"
- end
-
- io.puts "Got: #{string[error_pos,1].inspect}"
- line = lines[line_no-1]
- io.puts "=> #{line}"
- io.print(" " * (col_no + 3))
- io.puts "^"
- end
-
- def set_failed_rule(name)
- if @pos > @failing_rule_offset
- @failed_rule = name
- @failing_rule_offset = @pos
- end
- end
-
- attr_reader :failed_rule
-
- def match_string(str)
- len = str.size
- if @string[pos,len] == str
- @pos += len
- return str
- end
-
- return nil
- end
-
- def scan(reg)
- if m = reg.match(@string[@pos..-1])
- width = m.end(0)
- @pos += width
- return true
- end
-
- return nil
- end
-
- if "".respond_to? :getbyte
- def get_byte
- if @pos >= @string.size
- return nil
- end
-
- s = @string.getbyte @pos
- @pos += 1
- s
- end
- else
- def get_byte
- if @pos >= @string.size
- return nil
- end
-
- s = @string[@pos]
- @pos += 1
- s
- end
- end
-
- def parse(rule=nil)
- # We invoke the rules indirectly via apply
- # instead of by just calling them as methods because
- # if the rules use left recursion, apply needs to
- # manage that.
-
- if !rule
- apply(:_root)
- else
- method = rule.gsub("-","_hyphen_")
- apply :"_#{method}"
- end
- end
-
- class MemoEntry
- def initialize(ans, pos)
- @ans = ans
- @pos = pos
- @result = nil
- @set = false
- @left_rec = false
- end
-
- attr_reader :ans, :pos, :result, :set
- attr_accessor :left_rec
-
- def move!(ans, pos, result)
- @ans = ans
- @pos = pos
- @result = result
- @set = true
- @left_rec = false
- end
- end
-
- def external_invoke(other, rule, *args)
- old_pos = @pos
- old_string = @string
-
- @pos = other.pos
- @string = other.string
-
- begin
- if val = __send__(rule, *args)
- other.pos = @pos
- other.result = @result
- else
- other.set_failed_rule "#{self.class}##{rule}"
- end
- val
- ensure
- @pos = old_pos
- @string = old_string
- end
- end
-
- def apply_with_args(rule, *args)
- memo_key = [rule, args]
- if m = @memoizations[memo_key][@pos]
- @pos = m.pos
- if !m.set
- m.left_rec = true
- return nil
- end
-
- @result = m.result
-
- return m.ans
- else
- m = MemoEntry.new(nil, @pos)
- @memoizations[memo_key][@pos] = m
- start_pos = @pos
-
- ans = __send__ rule, *args
-
- lr = m.left_rec
-
- m.move! ans, @pos, @result
-
- # Don't bother trying to grow the left recursion
- # if it's failing straight away (thus there is no seed)
- if ans and lr
- return grow_lr(rule, args, start_pos, m)
- else
- return ans
- end
-
- return ans
- end
- end
-
- def apply(rule)
- if m = @memoizations[rule][@pos]
- @pos = m.pos
- if !m.set
- m.left_rec = true
- return nil
- end
-
- @result = m.result
-
- return m.ans
- else
- m = MemoEntry.new(nil, @pos)
- @memoizations[rule][@pos] = m
- start_pos = @pos
-
- ans = __send__ rule
-
- lr = m.left_rec
-
- m.move! ans, @pos, @result
-
- # Don't bother trying to grow the left recursion
- # if it's failing straight away (thus there is no seed)
- if ans and lr
- return grow_lr(rule, nil, start_pos, m)
- else
- return ans
- end
-
- return ans
- end
- end
-
- def grow_lr(rule, args, start_pos, m)
- while true
- @pos = start_pos
- @result = m.result
-
- if args
- ans = __send__ rule, *args
- else
- ans = __send__ rule
- end
- return nil unless ans
-
- break if @pos <= m.pos
-
- m.move! ans, @pos, @result
- end
-
- @result = m.result
- @pos = m.pos
- return m.ans
- end
-
- class RuleInfo
- def initialize(name, rendered)
- @name = name
- @rendered = rendered
- end
-
- attr_reader :name, :rendered
- end
-
- def self.rule_info(name, rendered)
- RuleInfo.new(name, rendered)
- end
-
-
- # :startdoc:
- # :stopdoc:
- def setup_foreign_grammar; end
-
- # Alphanumeric = /\p{Word}/
- def _Alphanumeric
- _tmp = scan(/\A(?-mix:\p{Word})/)
- set_failed_rule :_Alphanumeric unless _tmp
- return _tmp
- end
-
- # AlphanumericAscii = /[A-Za-z0-9]/
- def _AlphanumericAscii
- _tmp = scan(/\A(?-mix:[A-Za-z0-9])/)
- set_failed_rule :_AlphanumericAscii unless _tmp
- return _tmp
- end
-
- # BOM = "uFEFF"
- def _BOM
- _tmp = match_string("uFEFF")
- set_failed_rule :_BOM unless _tmp
- return _tmp
- end
-
- # Newline = /\n|\r\n?|\p{Zl}|\p{Zp}/
- def _Newline
- _tmp = scan(/\A(?-mix:\n|\r\n?|\p{Zl}|\p{Zp})/)
- set_failed_rule :_Newline unless _tmp
- return _tmp
- end
-
- # NonAlphanumeric = /\p{^Word}/
- def _NonAlphanumeric
- _tmp = scan(/\A(?-mix:\p{^Word})/)
- set_failed_rule :_NonAlphanumeric unless _tmp
- return _tmp
- end
-
- # Spacechar = /\t|\p{Zs}/
- def _Spacechar
- _tmp = scan(/\A(?-mix:\t|\p{Zs})/)
- set_failed_rule :_Spacechar unless _tmp
- return _tmp
- end
-
- Rules = {}
- Rules[:_Alphanumeric] = rule_info("Alphanumeric", "/\\p{Word}/")
- Rules[:_AlphanumericAscii] = rule_info("AlphanumericAscii", "/[A-Za-z0-9]/")
- Rules[:_BOM] = rule_info("BOM", "\"uFEFF\"")
- Rules[:_Newline] = rule_info("Newline", "/\\n|\\r\\n?|\\p{Zl}|\\p{Zp}/")
- Rules[:_NonAlphanumeric] = rule_info("NonAlphanumeric", "/\\p{^Word}/")
- Rules[:_Spacechar] = rule_info("Spacechar", "/\\t|\\p{Zs}/")
- # :startdoc:
-end
diff --git a/lib/rdoc/markup.rb b/lib/rdoc/markup.rb
index bdd2064d6f..32c8179e0d 100644
--- a/lib/rdoc/markup.rb
+++ b/lib/rdoc/markup.rb
@@ -1,3 +1,5 @@
+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,
@@ -6,44 +8,11 @@
# is similar in spirit to that used on WikiWiki webs, where folks create web
# pages using a simple set of formatting rules.
#
-# RDoc::Markup and other markup formats do no output formatting, this is
-# handled by the RDoc::Markup::Formatter subclasses.
-#
-# = Supported Formats
-#
-# Besides the RDoc::Markup format, the following formats are built in to RDoc:
-#
-# markdown::
-# The markdown format as described by
-# http://daringfireball.net/projects/markdown/. See RDoc::Markdown for
-# details on the parser and supported extensions.
-# rd::
-# The rdtool format. See RDoc::RD for details on the parser and format.
-# tomdoc::
-# The TomDoc format as described by http://tomdoc.org/. See RDoc::TomDoc
-# for details on the parser and supported extensions.
-#
-# You can choose a markup format using the following methods:
-#
-# per project::
-# If you build your documentation with rake use RDoc::Task#markup.
-#
-# If you build your documentation by hand run:
-#
-# rdoc --markup your_favorite_format --write-options
+# RDoc::Markup itself does no output formatting: this is left to a different
+# set of classes.
#
-# and commit <tt>.rdoc_options</tt> and ship it with your packaged gem.
-# per file::
-# At the top of the file use the <tt>:markup:</tt> directive to set the
-# default format for the rest of the file.
-# per comment::
-# Use the <tt>:markup:</tt> directive at the top of a comment you want
-# to write in a different format.
-#
-# = RDoc::Markup
-#
-# RDoc::Markup is extensible at runtime: you can add \new markup elements to
-# be recognized in the documents that RDoc::Markup parses.
+# 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
@@ -57,20 +26,21 @@
# the +convert+ method, so you can use the same RDoc::Markup converter to
# convert multiple input strings.
#
-# require 'rdoc'
+# require 'rdoc/markup/to_html'
#
# h = RDoc::Markup::ToHtml.new
#
# puts h.convert(input_string)
#
-# You can extend the RDoc::Markup parser to recognize new markup
+# 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. We then subclass the HTML output class to deal
+# strike-through text. When then subclass the HTML output class to deal
# with these:
#
-# require 'rdoc'
+# require 'rdoc/markup'
+# require 'rdoc/markup/to_html'
#
# class WikiHtml < RDoc::Markup::ToHtml
# def handle_special_WIKIWORD(special)
@@ -78,707 +48,32 @@
# end
# end
#
-# markup = RDoc::Markup.new
-# markup.add_word_pair("{", "}", :STRIKE)
-# markup.add_html("no", :STRIKE)
+# m = RDoc::Markup.new
+# m.add_word_pair("{", "}", :STRIKE)
+# m.add_html("no", :STRIKE)
#
-# markup.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
+# m.add_special(/\b([A-Z][a-z]+[A-Z]\w+)/, :WIKIWORD)
#
-# wh = WikiHtml.new markup
+# wh = WikiHtml.new
# wh.add_tag(:STRIKE, "<strike>", "</strike>")
#
# puts "<body>#{wh.convert ARGF.read}</body>"
#
-# == Encoding
-#
-# Where Encoding support is available, RDoc will automatically convert all
-# documents to the same output encoding. The output encoding can be set via
-# RDoc::Options#encoding and defaults to Encoding.default_external.
-#
-# = \RDoc Markup Reference
-#
-# == Block Markup
-#
-# === Paragraphs and Verbatim
-#
-# 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. Empty lines separate paragraphs.
-#
-# Any line that starts to the right of the current margin is treated
-# as verbatim text. This is useful for code listings:
-#
-# 3.times { puts "Ruby" }
-#
-# In verbatim text, two or more blank lines are collapsed into one,
-# and trailing blank lines are removed:
-#
-# This is the first line
-#
-#
-# This is the second non-blank line,
-# after 2 blank lines in the source markup.
-#
-#
-# There were two trailing blank lines right above this paragraph, that
-# have been removed. In addition, the verbatim text has been shifted
-# left, so the amount of indentation of verbatim text is unimportant.
-#
-# For HTML output RDoc makes a small effort to determine if a verbatim section
-# contains ruby source code. If so, the verbatim block will be marked up as
-# HTML. Triggers include "def", "class", "module", "require", the "hash
-# rocket"# (=>) or a block call with a parameter.
-#
-# === Headers
-#
-# A line starting with an equal sign (=) is treated as a
-# heading. Level one headings have one equals sign, level two headings
-# have two, and so on until level six, which is the maximum
-# (seven hyphens or more result in a level six heading).
-#
-# For example, the above header was obtained with:
-#
-# === Headers
-#
-# In HTML output headers have an id matching their name. The above example's
-# HTML is:
-#
-# <h3 id="label-Headers">Headers</h3>
-#
-# If a heading is inside a method body the id will be prefixed with the
-# method's id. If the above header where in the documentation for a method
-# such as:
-#
-# ##
-# # This method does fun things
-# #
-# # = Example
-# #
-# # Example of fun things goes here ...
-#
-# def do_fun_things
-# end
-#
-# The header's id would be:
-#
-# <h1 id="method-i-do_fun_things-label-Example">Example</h3>
-#
-# The label can be linked-to using <tt>SomeClass@Headers</tt>. See
-# {Links}[RDoc::Markup@Links] for further details.
-#
-# === Rules
-#
-# 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).
-#
-# In the case of HTML output, three dashes generate a 1-pixel high rule,
-# four dashes result in 2 pixels, and so on. The actual height is limited
-# to 10 pixels:
-#
-# ---
-# -----
-# -----------------------------------------------------
-#
-# produces:
-#
-# ---
-# -----
-# -----------------------------------------------------
-#
-# === Simple Lists
-#
-# If a paragraph starts with a "*", "-", "<digit>." or "<letter>.",
-# then it is taken to be the start of a list. The margin is 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
-#
-# produces:
-#
-# * 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
-#
-# === Labeled Lists
-#
-# 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
-#
-# produces:
-#
-# [cat] a small furry mammal
-# that seems to sleep a lot
-#
-# [ant] a little insect that is known
-# to enjoy picnics
-#
-# If you want the list bodies to line up to the left of the labels,
-# use two colons:
-#
-# cat:: a small furry mammal
-# that seems to sleep a lot
-#
-# ant:: a little insect that is known
-# to enjoy picnics
-#
-# produces:
-#
-# cat:: a small furry mammal
-# that seems to sleep a lot
-#
-# ant:: a little insect that is known
-# to enjoy picnics
-#
-# Notice that blank lines right after the label are ignored in labeled lists:
-#
-# [one]
-#
-# definition 1
-#
-# [two]
-#
-# definition 2
-#
-# produces the same output as
-#
-# [one] definition 1
-# [two] definition 2
-#
-#
-# === Lists and Verbatim
-#
-# If you want to introduce a verbatim section right after a list, it has to be
-# less indented than the list item bodies, but more indented than the list
-# label, letter, digit or bullet. For instance:
-#
-# * point 1
-#
-# * point 2, first paragraph
-#
-# point 2, second paragraph
-# verbatim text inside point 2
-# point 2, third paragraph
-# verbatim text outside of the list (the list is therefore closed)
-# regular paragraph after the list
-#
-# produces:
-#
-# * point 1
-#
-# * point 2, first paragraph
-#
-# point 2, second paragraph
-# verbatim text inside point 2
-# point 2, third paragraph
-# verbatim text outside of the list (the list is therefore closed)
-# regular paragraph after the list
-#
-# == Text Markup
-#
-# === Bold, Italic, Typewriter Text
-#
-# 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:
-#
-# <tt>\*_word_\*</tt>:: displays _word_ in a *bold* font
-# <tt>\__word_\_</tt>:: displays _word_ in an _emphasized_ font
-# <tt>\+_word_\+</tt>:: displays _word_ in a +code+ font
-#
-# General markup affects text between a start delimiter and an end
-# delimiter. Not surprisingly, these delimiters look like HTML markup.
-#
-# <tt>\<b>_text_</b></tt>:: displays _text_ in a *bold* font
-# <tt>\<em>_text_</em></tt>:: displays _text_ in an _emphasized_ font
-# (alternate tag: <tt>\<i></tt>)
-# <tt>\<tt>_text_\</tt></tt>:: displays _text_ in a +code+ font
-# (alternate tag: <tt>\<code></tt>)
-#
-# 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 (see <i>Escaping
-# Text Markup</i>, below).
-#
-# === Links
-#
-# Links to starting with +http:+, +https:+, +mailto:+, +ftp:+ or +www.+
-# are recognized. An HTTP url that references an external image is converted
-# into an inline image element.
-#
-# Classes and methods will be automatically linked to their definition. For
-# example, <tt>RDoc::Markup</tt> will link to this documentation. By default
-# methods will only be automatically linked if they contain an <tt>_</tt> (all
-# methods can be automatically linked through the <tt>--hyperlink-all</tt>
-# command line option).
-#
-# Single-word methods can be linked by using the <tt>#</tt> character for
-# instance methods or <tt>::</tt> for class methods. For example,
-# <tt>#convert</tt> links to #convert. A class or method may be combined like
-# <tt>RDoc::Markup#convert</tt>.
-#
-# A heading inside the documentation can be linked by following the class
-# or method by an <tt>@</tt> then the heading name.
-# <tt>RDoc::Markup@Links</tt> will link to this section like this:
-# RDoc::Markup@Links. Spaces in headings with multiple words must be escaped
-# with <tt>+</tt> like <tt>RDoc::Markup@Escaping+Text+Markup</tt>.
-# Punctuation and other special characters must be escaped like CGI.escape.
-#
-# Links can also be of the form <tt>label[url]</tt>, in which case +label+ is
-# used in the displayed text, and +url+ is used as the target. If +label+
-# contains multiple words, put it in braces: <tt>{multi word label}[url]</tt>.
-# The +url+ may be an +http:+-type link or a cross-reference to a class,
-# module or method with a label.
-#
-# Links with the <tt>rdoc-ref:</tt> scheme will link to the referenced class,
-# module, method, file, etc. If the referenced item is does not exist
-# no link will be generated and <tt>rdoc-ref:</tt> will be removed from the
-# resulting text.
-#
-# Links starting with <tt>rdoc-label:label_name</tt> will link to the
-# +label_name+. You can create a label for the current link (for
-# bidirectional links) by supplying a name for the current link like
-# <tt>rdoc-label:label-other:label-mine</tt>.
-#
-# Links starting with +link:+ refer to local files whose path is relative to
-# the <tt>--op</tt> directory. Use <tt>rdoc-ref:</tt> instead of
-# <tt>link:</tt> to link to files generated by RDoc as the link target may
-# be different across RDoc generators.
-#
-# Example links:
-#
-# https://github.com/rdoc/rdoc
-# mailto:user@example.com
-# {RDoc Documentation}[http://rdoc.rubyforge.org]
-# {RDoc Markup}[rdoc-ref:RDoc::Markup]
-#
-# === Escaping Text Markup
-#
-# Text markup can be escaped with a backslash, as in \<tt>, which was obtained
-# with <tt>\\<tt></tt>. Except in verbatim sections and between \<tt> tags,
-# to produce a backslash you have to double it unless it is followed by a
-# space, tab or newline. Otherwise, the HTML formatter will discard it, as it
-# is used to escape potential links:
-#
-# * The \ must be doubled if not followed by white space: \\.
-# * But not in \<tt> tags: in a Regexp, <tt>\S</tt> matches non-space.
-# * This is a link to {ruby-lang}[www.ruby-lang.org].
-# * This is not a link, however: \{ruby-lang.org}[www.ruby-lang.org].
-# * This will not be linked to \RDoc::RDoc#document
-#
-# generates:
-#
-# * The \ must be doubled if not followed by white space: \\.
-# * But not in \<tt> tags: in a Regexp, <tt>\S</tt> matches non-space.
-# * This is a link to {ruby-lang}[www.ruby-lang.org]
-# * This is not a link, however: \{ruby-lang.org}[www.ruby-lang.org]
-# * This will not be linked to \RDoc::RDoc#document
-#
-# Inside \<tt> tags, more precisely, leading backslashes are removed only if
-# followed by a markup character (<tt><*_+</tt>), a backslash, or a known link
-# reference (a known class or method). So in the example above, the backslash
-# of <tt>\S</tt> would be removed if there was a class or module named +S+ in
-# the current context.
-#
-# This behavior is inherited from RDoc version 1, and has been kept for
-# compatibility with existing RDoc documentation.
-#
-# === Conversion of characters
-#
-# HTML will convert two/three dashes to an em-dash. Other common characters are
-# converted as well:
-#
-# em-dash:: -- or ---
-# ellipsis:: ...
-#
-# single quotes:: 'text' or `text'
-# double quotes:: "text" or ``text''
-#
-# copyright:: (c)
-# registered trademark:: (r)
-#
-# produces:
-#
-# em-dash:: -- or ---
-# ellipsis:: ...
-#
-# single quotes:: 'text' or `text'
-# double quotes:: "text" or ``text''
-#
-# copyright:: (c)
-# registered trademark:: (r)
-#
-#
-# == Documenting Source Code
-#
-# Comment blocks can be written fairly naturally, either using <tt>#</tt> on
-# successive lines of the comment, or by including the comment in
-# a <tt>=begin</tt>/<tt>=end</tt> block. If you use the latter form,
-# the <tt>=begin</tt> 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 starting
-# with <tt>--</tt> right after the <tt>#</tt> character (otherwise,
-# it will be treated as a rule if it has three dashes or more).
-# 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 <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 linked from comment text to
-# their description. This linking works inside the current class or module,
-# and with ancestor methods (in included modules or in the superclass).
-#
-# 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.
-#
-# RDoc automatically cross-references words with underscores or camel-case.
-# To suppress cross-references, prefix the word with a \ character. To
-# include special characters like "<tt>\n</tt>", you'll need to use
-# two \ characters in normal text, but only one in \<tt> text:
-#
-# "\\n" or "<tt>\n</tt>"
-#
-# produces:
-#
-# "\\n" or "<tt>\n</tt>"
-#
-# == Directives
-#
-# Directives are keywords surrounded by ":" characters.
-#
-# === Controlling what is documented
-#
-# [+:nodoc:+ / <tt>:nodoc: all</tt>]
-# This directive prevents documentation for the element from
-# being generated. For classes and modules, 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 or 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, like +:enddoc:+, +:stopdoc:+ and +:startdoc:+
-# presented below, is local to the current file: if you do not want to
-# document a module that appears in several files, specify +:nodoc:+ on each
-# appearance, at least once per file.
-#
-# [+: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 rest of the current file.
-#
-# [+: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.
-#
-# [+:enddoc:+]
-# Document nothing further at the current level: directives +:startdoc:+ and
-# +:doc:+ that appear after this will not be honored for the current container
-# (file, class or module), in the current file.
-#
-# [+:notnew:+ / +:not_new:+ / +:not-new:+ ]
-# 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:+ directive stops this. Remember that +initialize+ is private,
-# so you won't see the documentation unless you use the +-a+ command line
-# option.
-#
-# === Method arguments
-#
-# [+:arg:+ or +:args:+ _parameters_]
-# Overrides the default argument handling with exactly these parameters.
-#
-# ##
-# # :args: a, b
-#
-# def some_method(*a)
-# end
-#
-# [+:yield:+ or +:yields:+ _parameters_]
-# Overrides the default yield discovery with these parameters.
-#
-# ##
-# # :yields: key, value
-#
-# def each_thing &block
-# @things.each(&block)
-# end
-#
-# [+:call-seq:+]
-# Lines up to the next blank line or lines with a common prefix in the
-# comment are treated as the method's calling sequence, overriding the
-# default parsing of method parameters and yield arguments.
-#
-# Multiple lines may be used.
-#
-# # :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
-# #
-# # The remaining lines are documentation ...
-#
-# === Sections
-#
-# Sections allow you to group methods in a class into sensible containers. If
-# you use the sections 'Public', 'Internal' and 'Deprecated' (the three
-# allowed method statuses from TomDoc) the sections will be displayed in that
-# order placing the most useful methods at the top. Otherwise, sections will
-# be displayed in alphabetical order.
-#
-# [+:category:+ _section_]
-# Adds this item to the named +section+ overriding the current section. Use
-# this to group methods by section in RDoc output while maintaining a
-# sensible ordering (like alphabetical).
-#
-# # :category: Utility Methods
-# #
-# # CGI escapes +text+
-#
-# def convert_string text
-# CGI.escapeHTML text
-# end
-#
-# An empty category will place the item in the default category:
-#
-# # :category:
-# #
-# # This method is in the default category
-#
-# def some_method
-# # ...
-# end
-#
-# Unlike the :section: directive, :category: is not sticky. The category
-# only applies to the item immediately following the comment.
-#
-# Use the :section: directive to provide introductory text for a section of
-# documentation.
-#
-# [+:section:+ _title_]
-# Provides section introductory text in RDoc output. The title following
-# +:section:+ is used as the section name and the remainder of the comment
-# containing the section is used as introductory text. A section's comment
-# block must be separated from following comment blocks. Use an empty title
-# to switch to the default section.
-#
-# The :section: directive is sticky, so subsequent methods, aliases,
-# attributes, and classes will be contained in this section until the
-# section is changed. The :category: directive will override the :section:
-# directive.
-#
-# 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 to the
-# section.
-#
-# Example:
-#
-# # ----------------------------------------
-# # :section: My Section
-# # This is the section that I wrote.
-# # See it glisten in the noon-day sun.
-# # ----------------------------------------
-#
-# ##
-# # Comment for some_method
-#
-# def some_method
-# # ...
-# end
-#
-# === Other directives
-#
-# [+:markup:+ _type_]
-# Overrides the default markup type for this comment with the specified
-# markup type. For ruby files, if the first comment contains this directive
-# it is applied automatically to all comments in the file.
-#
-# Unless you are converting between markup formats you should use a
-# <code>.rdoc_options</code> file to specify the default documentation
-# format for your entire project. See RDoc::Options@Saved+Options for
-# instructions.
-#
-# At the top of a file the +:markup:+ directive applies to the entire file:
-#
-# # coding: UTF-8
-# # :markup: TomDoc
-#
-# # TomDoc comment here ...
-#
-# class MyClass
-# # ...
-#
-# For just one comment:
-#
-# # ...
-# end
-#
-# # :markup: RDoc
-# #
-# # This is a comment in RDoc markup format ...
-#
-# def some_method
-# # ...
-#
-# See Markup@DEVELOPERS for instructions on adding a new markup format.
-#
-# [+:include:+ _filename_]
-# Include the contents of the named file at this point. This directive
-# must appear alone on one line, possibly preceded by spaces. In this
-# position, it can be escaped with a \ in front of the first colon.
-#
-# 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).
-#
-# [+:main:+ _name_]
-# Equivalent to the <tt>--main</tt> command line parameter.
-#
#--
-# Original Author:: Dave Thomas, dave@pragmaticprogrammer.com
-# License:: Ruby license
+# Author:: Dave Thomas, dave@pragmaticprogrammer.com
+# License:: Ruby license
class RDoc::Markup
- ##
- # An AttributeManager which handles inline markup.
-
attr_reader :attribute_manager
##
- # Parses +str+ into an RDoc::Markup::Document.
-
- def self.parse str
- RDoc::Markup::Parser.parse str
- rescue RDoc::Markup::Parser::Error => e
- $stderr.puts <<-EOF
-While parsing markup, RDoc encountered a #{e.class}:
-
-#{e}
-\tfrom #{e.backtrace.join "\n\tfrom "}
-
----8<---
-#{text}
----8<---
-
-RDoc #{RDoc::VERSION}
-
-Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_RELEASE_DATE}
-
-Please file a bug report with the above information at:
-
-https://github.com/rdoc/rdoc/issues
-
- EOF
- raise
- end
-
- ##
- # Take a block of text and use various heuristics to determine its
+ # 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 attribute_manager = nil
- @attribute_manager = attribute_manager || RDoc::Markup::AttributeManager.new
+ def initialize
+ @attribute_manager = RDoc::Markup::AttributeManager.new
@output = nil
end
@@ -812,61 +107,18 @@ https://github.com/rdoc/rdoc/issues
end
##
- # We take +input+, parse it if necessary, then invoke the output +formatter+
- # using a Visitor to render the result.
+ # We take +text+, parse it then invoke the output +formatter+ using a
+ # Visitor to render the result.
- def convert input, formatter
- document = case input
- when RDoc::Markup::Document then
- input
- else
- RDoc::Markup::Parser.parse input
- end
+ def convert text, formatter
+ document = RDoc::Markup::Parser.parse text
document.accept formatter
end
- autoload :Parser, 'rdoc/markup/parser'
- autoload :PreProcess, 'rdoc/markup/pre_process'
-
- # Inline markup classes
- autoload :AttrChanger, 'rdoc/markup/attr_changer'
- autoload :AttrSpan, 'rdoc/markup/attr_span'
- autoload :Attributes, 'rdoc/markup/attributes'
- autoload :AttributeManager, 'rdoc/markup/attribute_manager'
- autoload :Special, 'rdoc/markup/special'
-
- # RDoc::Markup AST
- autoload :BlankLine, 'rdoc/markup/blank_line'
- autoload :BlockQuote, 'rdoc/markup/block_quote'
- autoload :Document, 'rdoc/markup/document'
- autoload :HardBreak, 'rdoc/markup/hard_break'
- autoload :Heading, 'rdoc/markup/heading'
- autoload :Include, 'rdoc/markup/include'
- autoload :IndentedParagraph, 'rdoc/markup/indented_paragraph'
- autoload :List, 'rdoc/markup/list'
- autoload :ListItem, 'rdoc/markup/list_item'
- autoload :Paragraph, 'rdoc/markup/paragraph'
- autoload :Raw, 'rdoc/markup/raw'
- autoload :Rule, 'rdoc/markup/rule'
- autoload :Verbatim, 'rdoc/markup/verbatim'
-
- # Formatters
- autoload :Formatter, 'rdoc/markup/formatter'
- autoload :FormatterTestCase, 'rdoc/markup/formatter_test_case'
- autoload :TextFormatterTestCase, 'rdoc/markup/text_formatter_test_case'
-
- autoload :ToAnsi, 'rdoc/markup/to_ansi'
- autoload :ToBs, 'rdoc/markup/to_bs'
- autoload :ToHtml, 'rdoc/markup/to_html'
- autoload :ToHtmlCrossref, 'rdoc/markup/to_html_crossref'
- autoload :ToHtmlSnippet, 'rdoc/markup/to_html_snippet'
- autoload :ToLabel, 'rdoc/markup/to_label'
- autoload :ToMarkdown, 'rdoc/markup/to_markdown'
- autoload :ToRdoc, 'rdoc/markup/to_rdoc'
- autoload :ToTableOfContents, 'rdoc/markup/to_table_of_contents'
- autoload :ToTest, 'rdoc/markup/to_test'
- autoload :ToTtOnly, 'rdoc/markup/to_tt_only'
-
end
+require 'rdoc/markup/parser'
+require 'rdoc/markup/attribute_manager'
+require 'rdoc/markup/inline'
+
diff --git a/lib/rdoc/markup/attr_changer.rb b/lib/rdoc/markup/attr_changer.rb
deleted file mode 100644
index 1772f18b2b..0000000000
--- a/lib/rdoc/markup/attr_changer.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-class RDoc::Markup
-
- AttrChanger = Struct.new :turn_on, :turn_off # :nodoc:
-
-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.
-
-class RDoc::Markup::AttrChanger
-
- def to_s # :nodoc:
- "Attr: +#{turn_on}/-#{turn_off}"
- end
-
- def inspect # :nodoc:
- '+%d/-%d' % [turn_on, turn_off]
- end
-
-end
-
diff --git a/lib/rdoc/markup/attr_span.rb b/lib/rdoc/markup/attr_span.rb
deleted file mode 100644
index b5c1b3b7b7..0000000000
--- a/lib/rdoc/markup/attr_span.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-##
-# An array of attributes which parallels the characters in a string.
-
-class RDoc::Markup::AttrSpan
-
- ##
- # Creates a new AttrSpan for +length+ characters
-
- def initialize(length)
- @attrs = Array.new(length, 0)
- end
-
- ##
- # Toggles +bits+ from +start+ to +length+
- def set_attrs(start, length, bits)
- for i in start ... (start+length)
- @attrs[i] |= bits
- end
- end
-
- ##
- # Accesses flags for character +n+
-
- def [](n)
- @attrs[n]
- end
-
-end
-
diff --git a/lib/rdoc/markup/attribute_manager.rb b/lib/rdoc/markup/attribute_manager.rb
index 7ee6f423d6..5b9e070efb 100644
--- a/lib/rdoc/markup/attribute_manager.rb
+++ b/lib/rdoc/markup/attribute_manager.rb
@@ -15,17 +15,9 @@ class RDoc::Markup::AttributeManager
# optimistic
#++
- A_PROTECT = 004 # :nodoc:
+ A_PROTECT = 004 # :nodoc:
- ##
- # Special mask character to prevent inline markup handling
-
- PROTECT_ATTR = A_PROTECT.chr # :nodoc:
-
- ##
- # The attributes enabled for this markup object.
-
- attr_reader :attributes
+ PROTECT_ATTR = A_PROTECT.chr # :nodoc:
##
# This maps delimiters that occur around words (such as *bold* or +tt+)
@@ -64,10 +56,9 @@ class RDoc::Markup::AttributeManager
def initialize
@html_tags = {}
@matching_word_pairs = {}
- @protectable = %w[<]
- @special = []
+ @protectable = %w[<\\]
+ @special = {}
@word_pair_map = {}
- @attributes = RDoc::Markup::Attributes.new
add_word_pair "*", "*", :BOLD
add_word_pair "_", "_", :EM
@@ -80,6 +71,7 @@ class RDoc::Markup::AttributeManager
add_html "code", :TT
end
+
##
# Return an attribute object with the given turn_on and turn_off bits set
@@ -87,34 +79,24 @@ class RDoc::Markup::AttributeManager
RDoc::Markup::AttrChanger.new turn_on, turn_off
end
- ##
- # Changes the current attribute from +current+ to +new+
-
- def change_attribute current, new
+ def change_attribute(current, new)
diff = current ^ new
attribute(new & diff, current & diff)
end
- ##
- # Used by the tests to change attributes by name from +current_set+ to
- # +new_set+
-
- def changed_attribute_by_name current_set, new_set
+ def changed_attribute_by_name(current_set, new_set)
current = new = 0
current_set.each do |name|
- current |= @attributes.bitmap_for(name)
+ current |= RDoc::Markup::Attribute.bitmap_for(name)
end
new_set.each do |name|
- new |= @attributes.bitmap_for(name)
+ new |= RDoc::Markup::Attribute.bitmap_for(name)
end
change_attribute(current, new)
end
- ##
- # Copies +start_pos+ to +end_pos+ from the current string
-
def copy_string(start_pos, end_pos)
res = @str[start_pos...end_pos]
res.gsub!(/\000/, '')
@@ -167,14 +149,13 @@ class RDoc::Markup::AttributeManager
##
# Converts special sequences to RDoc attributes
- def convert_specials str, attrs
- @special.each do |regexp, attribute|
- str.scan(regexp) do
- capture = $~.size == 1 ? 0 : 1
-
- s, e = $~.offset capture
-
- attrs.set_attrs s, e - s, attribute | @attributes.special
+ 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
@@ -183,9 +164,6 @@ class RDoc::Markup::AttributeManager
# Escapes special sequences of text to prevent conversion to RDoc
def mask_protected_sequences
- # protect __send__, __FILE__, etc.
- @str.gsub!(/__([a-z]+)__/i,
- "_#{PROTECT_ATTR}_#{PROTECT_ATTR}\\1_#{PROTECT_ATTR}_#{PROTECT_ATTR}")
@str.gsub!(/\\([#{Regexp.escape @protectable.join('')}])/,
"\\1#{PROTECT_ATTR}")
end
@@ -207,7 +185,7 @@ class RDoc::Markup::AttributeManager
raise ArgumentError, "Word flags may not start with '<'" if
start[0,1] == '<'
- bitmap = @attributes.bitmap_for name
+ bitmap = RDoc::Markup::Attribute.bitmap_for name
if start == stop then
@matching_word_pairs[start] = bitmap
@@ -227,7 +205,7 @@ class RDoc::Markup::AttributeManager
# am.add_html 'em', :EM
def add_html(tag, name)
- @html_tags[tag.downcase] = @attributes.bitmap_for name
+ @html_tags[tag.downcase] = RDoc::Markup::Attribute.bitmap_for name
end
##
@@ -236,14 +214,14 @@ class RDoc::Markup::AttributeManager
#
# @am.add_special(/((https?:)\S+\w)/, :HYPERLINK)
- def add_special pattern, name
- @special << [pattern, @attributes.bitmap_for(name)]
+ def add_special(pattern, name)
+ @special[pattern] = RDoc::Markup::Attribute.bitmap_for name
end
##
# Processes +str+ converting attributes, HTML and specials
- def flow str
+ def flow(str)
@str = str
mask_protected_sequences
@@ -284,12 +262,10 @@ class RDoc::Markup::AttributeManager
end
end
- ##
- # Splits the string into chunks by attribute change
-
def split_into_flow
res = []
current_attr = 0
+ str = ""
str_len = @str.length
@@ -310,9 +286,9 @@ class RDoc::Markup::AttributeManager
res << change_attribute(current_attr, new_attr)
current_attr = new_attr
- if (current_attr & @attributes.special) != 0 then
+ if (current_attr & RDoc::Markup::Attribute::SPECIAL) != 0 then
i += 1 while
- i < str_len and (@attrs[i] & @attributes.special) != 0
+ i < str_len and (@attrs[i] & RDoc::Markup::Attribute::SPECIAL) != 0
res << RDoc::Markup::Special.new(current_attr,
copy_string(start_pos, i))
diff --git a/lib/rdoc/markup/attributes.rb b/lib/rdoc/markup/attributes.rb
deleted file mode 100644
index 3423f10ca7..0000000000
--- a/lib/rdoc/markup/attributes.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-##
-# We manage a set of attributes. Each attribute has a symbol name and a bit
-# value.
-
-class RDoc::Markup::Attributes
-
- ##
- # The special attribute type. See RDoc::Markup#add_special
-
- attr_reader :special
-
- ##
- # Creates a new attributes set.
-
- def initialize
- @special = 1
-
- @name_to_bitmap = [
- [:_SPECIAL_, @special],
- ]
-
- @next_bitmap = @special << 1
- end
-
- ##
- # Returns a unique bit for +name+
-
- def bitmap_for name
- bitmap = @name_to_bitmap.assoc name
-
- unless bitmap then
- bitmap = @next_bitmap
- @next_bitmap <<= 1
- @name_to_bitmap << [name, bitmap]
- else
- bitmap = bitmap.last
- end
-
- bitmap
- end
-
- ##
- # Returns a string representation of +bitmap+
-
- def 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
-
- ##
- # yields each attribute name in +bitmap+
-
- def each_name_of bitmap
- return enum_for __method__, bitmap unless block_given?
-
- @name_to_bitmap.each do |name, bit|
- next if bit == @special
-
- yield name.to_s if (bitmap & bit) != 0
- end
- end
-
-end
-
diff --git a/lib/rdoc/markup/blank_line.rb b/lib/rdoc/markup/blank_line.rb
index 5da0ac8d81..a8c07c8e57 100644
--- a/lib/rdoc/markup/blank_line.rb
+++ b/lib/rdoc/markup/blank_line.rb
@@ -1,20 +1,12 @@
##
-# An empty line. This class is a singleton.
+# An empty line
class RDoc::Markup::BlankLine
- @instance = new
-
- ##
- # RDoc::Markup::BlankLine is a singleton
-
- def self.new
- @instance
+ def == other # :nodoc:
+ self.class == other.class
end
- ##
- # Calls #accept_blank_line on +visitor+
-
def accept visitor
visitor.accept_blank_line self
end
diff --git a/lib/rdoc/markup/block_quote.rb b/lib/rdoc/markup/block_quote.rb
deleted file mode 100644
index 552f0c4baa..0000000000
--- a/lib/rdoc/markup/block_quote.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-##
-# A quoted section which contains markup items.
-
-class RDoc::Markup::BlockQuote < RDoc::Markup::Raw
-
- ##
- # Calls #accept_block_quote on +visitor+
-
- def accept visitor
- visitor.accept_block_quote self
- end
-
-end
-
diff --git a/lib/rdoc/markup/document.rb b/lib/rdoc/markup/document.rb
index be93d80eec..7963e9afe1 100644
--- a/lib/rdoc/markup/document.rb
+++ b/lib/rdoc/markup/document.rb
@@ -3,20 +3,6 @@
class RDoc::Markup::Document
- include Enumerable
-
- ##
- # The file this document was created from. See also
- # RDoc::ClassModule#add_comment
-
- attr_reader :file
-
- ##
- # If a heading is below the given level it will be omitted from the
- # table_of_contents
-
- attr_accessor :omit_headings_below
-
##
# The parts of the Document
@@ -27,10 +13,7 @@ class RDoc::Markup::Document
def initialize *parts
@parts = []
- @parts.concat parts
-
- @file = nil
- @omit_headings_from_table_of_contents_below = nil
+ @parts.push(*parts)
end
##
@@ -40,7 +23,7 @@ class RDoc::Markup::Document
case part
when RDoc::Markup::Document then
unless part.empty? then
- parts.concat part.parts
+ parts.push(*part.parts)
parts << RDoc::Markup::BlankLine.new
end
when String then
@@ -53,91 +36,25 @@ class RDoc::Markup::Document
end
def == other # :nodoc:
- self.class == other.class and
- @file == other.file and
- @parts == other.parts
+ self.class == other.class and @parts == other.parts
end
- ##
- # Runs this document and all its #items through +visitor+
-
def accept visitor
visitor.start_accepting
- visitor.accept_document self
+ @parts.each do |item|
+ item.accept visitor
+ end
visitor.end_accepting
end
- ##
- # Concatenates the given +parts+ onto the document
-
- def concat parts
- self.parts.concat parts
- end
-
- ##
- # Enumerator for the parts of this document
-
- def each &block
- @parts.each(&block)
- end
-
- ##
- # Does this document have no parts?
-
def empty?
- @parts.empty? or (@parts.length == 1 and merged? and @parts.first.empty?)
- end
-
- ##
- # The file this Document was created from.
-
- def file= location
- @file = case location
- when RDoc::TopLevel then
- location.relative_name
- else
- location
- end
- end
-
- ##
- # When this is a collection of documents (#file is not set and this document
- # contains only other documents as its direct children) #merge replaces
- # documents in this class with documents from +other+ when the file matches
- # and adds documents from +other+ when the files do not.
- #
- # The information in +other+ is preferred over the receiver
-
- def merge other
- if empty? then
- @parts = other.parts
- return self
- end
-
- other.parts.each do |other_part|
- self.parts.delete_if do |self_part|
- self_part.file and self_part.file == other_part.file
- end
-
- self.parts << other_part
- end
-
- self
- end
-
- ##
- # Does this Document contain other Documents?
-
- def merged?
- RDoc::Markup::Document === @parts.first
+ @parts.empty?
end
def pretty_print q # :nodoc:
- start = @file ? "[doc (#{@file}): " : '[doc: '
-
- q.group 2, start, ']' do
+ q.group 2, '[doc: ', ']' do
q.seplist @parts do |part|
q.pp part
end
@@ -148,16 +65,7 @@ class RDoc::Markup::Document
# Appends +parts+ to the document
def push *parts
- self.parts.concat parts
- end
-
- ##
- # Returns an Array of headings in the document.
- #
- # Require 'rdoc/markup/formatter' before calling this method.
-
- def table_of_contents
- accept RDoc::Markup::ToTableOfContents.to_toc
+ self.parts.push(*parts)
end
end
diff --git a/lib/rdoc/markup/formatter.rb b/lib/rdoc/markup/formatter.rb
index b668746c7a..993e523f0c 100644
--- a/lib/rdoc/markup/formatter.rb
+++ b/lib/rdoc/markup/formatter.rb
@@ -1,99 +1,24 @@
+require 'rdoc/markup'
+
##
# Base class for RDoc markup formatters
#
-# Formatters are a visitor that converts an RDoc::Markup tree (from a comment)
-# into some kind of output. RDoc ships with formatters for converting back to
-# rdoc, ANSI text, HTML, a Table of Contents and other formats.
-#
-# If you'd like to write your own Formatter use
-# RDoc::Markup::FormatterTestCase. If you're writing a text-output formatter
-# use RDoc::Markup::TextFormatterTestCase which provides extra test cases.
+# Formatters use a visitor pattern to convert content into output.
class RDoc::Markup::Formatter
- ##
- # Tag for inline markup containing a +bit+ for the bitmask and the +on+ and
- # +off+ triggers.
-
InlineTag = Struct.new(:bit, :on, :off)
##
- # 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 "/"
-
- from.delete '.'
- to.delete '.'
-
- 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
-
- ##
# Creates a new Formatter
- def initialize options, markup = nil
- @options = options
-
- @markup = markup || RDoc::Markup.new
- @am = @markup.attribute_manager
- @am.add_special(/<br>/, :HARD_BREAK)
-
- @attributes = @am.attributes
-
+ def initialize
+ @markup = RDoc::Markup.new
+ @am = @markup.attribute_manager
@attr_tags = []
@in_tt = 0
- @tt_bit = @attributes.bitmap_for :TT
-
- @hard_break = ''
- @from_path = '.'
- end
-
- ##
- # Adds +document+ to the output
-
- def accept_document document
- document.parts.each do |item|
- case item
- when RDoc::Markup::Document then # HACK
- accept_document item
- else
- item.accept self
- end
- end
- end
-
- ##
- # Adds a special for links of the form rdoc-...:
-
- def add_special_RDOCLINK
- @markup.add_special(/rdoc-[a-z]+:\S+/, :RDOCLINK)
- end
-
- ##
- # Adds a special for links of the form {<text>}[<url>] and <word>[<url>]
-
- def add_special_TIDYLINK
- @markup.add_special(/(?:
- \{.*?\} | # multi-word label
- \b[^\s{}]+? # single-word label
- )
-
- \[\S+?\] # link target
- /x, :TIDYLINK)
+ @tt_bit = RDoc::Markup::Attribute.bitmap_for :TT
end
##
@@ -101,7 +26,7 @@ class RDoc::Markup::Formatter
# tags for flexibility
def add_tag(name, start, stop)
- attr = @attributes.bitmap_for name
+ attr = RDoc::Markup::Attribute.bitmap_for name
@attr_tags << InlineTag.new(attr, start, stop)
end
@@ -115,7 +40,7 @@ class RDoc::Markup::Formatter
##
# Marks up +content+
- def convert content
+ def convert(content)
@markup.convert content, self
end
@@ -145,12 +70,10 @@ class RDoc::Markup::Formatter
##
# Converts added specials. See RDoc::Markup#add_special
- def convert_special special
- return special.text if in_tt?
-
+ def convert_special(special)
handled = false
- @attributes.each_name_of special.type do |name|
+ RDoc::Markup::Attribute.each_name_of special.type do |name|
method_name = "handle_special_#{name}"
if respond_to? method_name then
@@ -159,11 +82,7 @@ class RDoc::Markup::Formatter
end
end
- unless handled then
- special_name = @attributes.as_string special.type
-
- raise RDoc::Error, "Unhandled special #{special_name}: #{special}"
- end
+ raise "Unhandled special: #{special}" unless handled
special.text
end
@@ -176,26 +95,12 @@ class RDoc::Markup::Formatter
end
##
- # Use ignore in your subclass to ignore the content of a node.
- #
- # ##
- # # We don't support raw nodes in ToNoRaw
- #
- # alias accept_raw ignore
-
- def ignore *node
- end
-
- ##
# Are we currently inside tt tags?
def in_tt?
@in_tt > 0
end
- ##
- # Turns on tags for +item+ on +res+
-
def on_tags res, item
attr_mask = item.turn_on
return if attr_mask.zero?
@@ -208,9 +113,6 @@ class RDoc::Markup::Formatter
end
end
- ##
- # Turns off tags for +item+ on +res+
-
def off_tags res, item
attr_mask = item.turn_off
return if attr_mask.zero?
@@ -224,36 +126,6 @@ class RDoc::Markup::Formatter
end
##
- # Extracts and a scheme, url and an anchor id from +url+ and returns them.
-
- def parse_url url
- case url
- when /^rdoc-label:([^:]*)(?::(.*))?/ then
- scheme = 'link'
- path = "##{$1}"
- id = " id=\"#{$2}\"" if $2
- when /([A-Za-z]+):(.*)/ then
- scheme = $1.downcase
- path = $2
- when /^#/ then
- else
- scheme = 'http'
- path = url
- url = "http://#{url}"
- end
-
- if scheme == 'link' then
- url = if path[0, 1] == '#' then # is this meaningful?
- path
- else
- self.class.gen_relative_url @from_path, path
- end
- end
-
- [scheme, url, id]
- end
-
- ##
# Is +tag+ a tt tag?
def tt? tag
@@ -262,3 +134,10 @@ class RDoc::Markup::Formatter
end
+class RDoc::Markup
+ autoload :ToAnsi, 'rdoc/markup/to_ansi'
+ autoload :ToBs, 'rdoc/markup/to_bs'
+ autoload :ToHtml, 'rdoc/markup/to_html'
+ autoload :ToHtmlCrossref, 'rdoc/markup/to_html_crossref'
+ autoload :ToRdoc, 'rdoc/markup/to_rdoc'
+end
diff --git a/lib/rdoc/markup/formatter_test_case.rb b/lib/rdoc/markup/formatter_test_case.rb
index 6616a75898..26c8d63332 100644
--- a/lib/rdoc/markup/formatter_test_case.rb
+++ b/lib/rdoc/markup/formatter_test_case.rb
@@ -1,61 +1,18 @@
require 'minitest/unit'
+require 'rdoc/markup/formatter'
##
# Test case for creating new RDoc::Markup formatters. See
# test/test_rdoc_markup_to_*.rb for examples.
-#
-# This test case adds a variety of tests to your subclass when
-# #add_visitor_tests is called. Most tests set up a scenario then call a
-# method you will provide to perform the assertion on the output.
-#
-# Your subclass must instantiate a visitor and assign it to <tt>@to</tt>.
-#
-# For example, test_accept_blank_line sets up a RDoc::Markup::BlockLine then
-# calls accept_blank_line on your visitor. You are responsible for asserting
-# that the output is correct.
-#
-# Example:
-#
-# class TestRDocMarkupToNewFormat < RDoc::Markup::FormatterTestCase
-#
-# add_visitor_tests
-#
-# def setup
-# super
-#
-# @to = RDoc::Markup::ToNewFormat.new
-# end
-#
-# def accept_blank_line
-# assert_equal :junk, @to.res.join
-# end
-#
-# # ...
-#
-# end
-
-class RDoc::Markup::FormatterTestCase < RDoc::TestCase
-
- ##
- # Call #setup when inheriting from this test case.
- #
- # Provides the following instance variables:
- #
- # +@m+:: RDoc::Markup.new
- # +@RM+:: RDoc::Markup # to reduce typing
- # +@bullet_list+:: @RM::List.new :BULLET, # ...
- # +@label_list+:: @RM::List.new :LABEL, # ...
- # +@lalpha_list+:: @RM::List.new :LALPHA, # ...
- # +@note_list+:: @RM::List.new :NOTE, # ...
- # +@number_list+:: @RM::List.new :NUMBER, # ...
- # +@ualpha_list+:: @RM::List.new :UALPHA, # ...
+
+class RDoc::Markup::FormatterTestCase < MiniTest::Unit::TestCase
def setup
super
- @options = RDoc::Options.new
-
- @m = @RM.new
+ @m = RDoc::Markup.new
+ @am = RDoc::Markup::AttributeManager.new
+ @RM = RDoc::Markup
@bullet_list = @RM::List.new(:BULLET,
@RM::ListItem.new(nil, @RM::Paragraph.new('l1')),
@@ -82,25 +39,14 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
@RM::ListItem.new(nil, @RM::Paragraph.new('l2')))
end
- ##
- # Call to add the visitor tests to your test case
-
def self.add_visitor_tests
- class_eval do
-
- ##
- # Calls start_accepting which needs to verify startup state
-
+ self.class_eval do
def test_start_accepting
@to.start_accepting
start_accepting
end
- ##
- # Calls end_accepting on your test case which needs to call
- # <tt>@to.end_accepting</tt> and verify document generation
-
def test_end_accepting
@to.start_accepting
@to.res << 'hi'
@@ -108,9 +54,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
end_accepting
end
- ##
- # Calls accept_blank_line
-
def test_accept_blank_line
@to.start_accepting
@@ -119,29 +62,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_blank_line
end
- ##
- # Calls accept_block_quote
-
- def test_accept_block_quote
- @to.start_accepting
-
- @to.accept_block_quote block para 'quote'
-
- accept_block_quote
- end
- ##
- # Test case that calls <tt>@to.accept_document</tt>
-
- def test_accept_document
- @to.start_accepting
- @to.accept_document @RM::Document.new @RM::Paragraph.new 'hello'
-
- accept_document
- end
-
- ##
- # Calls accept_heading with a level 5 RDoc::Markup::Heading
-
def test_accept_heading
@to.start_accepting
@@ -150,79 +70,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_heading
end
- ##
- # Calls accept_heading_1 with a level 1 RDoc::Markup::Heading
-
- def test_accept_heading_1
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- accept_heading_1
- end
-
- ##
- # Calls accept_heading_2 with a level 2 RDoc::Markup::Heading
-
- def test_accept_heading_2
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(2, 'Hello')
-
- accept_heading_2
- end
-
- ##
- # Calls accept_heading_3 with a level 3 RDoc::Markup::Heading
-
- def test_accept_heading_3
- # HACK this doesn't belong here
- skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
-
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(3, 'Hello')
-
- accept_heading_3
- end
-
- ##
- # Calls accept_heading_4 with a level 4 RDoc::Markup::Heading
-
- def test_accept_heading_4
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(4, 'Hello')
-
- accept_heading_4
- end
-
- ##
- # Calls accept_heading_b with a bold level 1 RDoc::Markup::Heading
-
- def test_accept_heading_b
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, '*Hello*')
-
- accept_heading_b
- end
-
- ##
- # Calls accept_heading_suppressed_crossref with a level 1
- # RDoc::Markup::Heading containing a suppressed crossref
-
- def test_accept_heading_suppressed_crossref # HACK to_html_crossref test
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, '\\Hello')
-
- accept_heading_suppressed_crossref
- end
-
- ##
- # Calls accept_paragraph
-
def test_accept_paragraph
@to.start_accepting
@@ -231,103 +78,15 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_paragraph
end
- ##
- # Calls accept_paragraph_b with a RDoc::Markup::Paragraph containing
- # bold words
-
- def test_accept_paragraph_b
- @to.start_accepting
-
- @to.accept_paragraph @RM::Paragraph.new('reg <b>bold words</b> reg')
-
- accept_paragraph_b
- end
-
- ##
- # Calls accept_paragraph_br with a RDoc::Markup::Paragraph containing
- # a \<br>
-
- def test_accept_paragraph_br
- @to.start_accepting
-
- @to.accept_paragraph para 'one<br>two'
-
- accept_paragraph_br
- end
-
- ##
- # Calls accept_paragraph with a Paragraph containing a hard break
-
- def test_accept_paragraph_break
- @to.start_accepting
-
- @to.accept_paragraph para('hello', hard_break, 'world')
-
- accept_paragraph_break
- end
-
- ##
- # Calls accept_paragraph_i with a RDoc::Markup::Paragraph containing
- # emphasized words
-
- def test_accept_paragraph_i
- @to.start_accepting
-
- @to.accept_paragraph @RM::Paragraph.new('reg <em>italic words</em> reg')
-
- accept_paragraph_i
- end
-
- ##
- # Calls accept_paragraph_plus with a RDoc::Markup::Paragraph containing
- # teletype words
-
- def test_accept_paragraph_plus
- @to.start_accepting
-
- @to.accept_paragraph @RM::Paragraph.new('reg +teletype+ reg')
-
- accept_paragraph_plus
- end
-
- ##
- # Calls accept_paragraph_star with a RDoc::Markup::Paragraph containing
- # bold words
-
- def test_accept_paragraph_star
- @to.start_accepting
-
- @to.accept_paragraph @RM::Paragraph.new('reg *bold* reg')
-
- accept_paragraph_star
- end
-
- ##
- # Calls accept_paragraph_underscore with a RDoc::Markup::Paragraph
- # containing emphasized words
-
- def test_accept_paragraph_underscore
- @to.start_accepting
-
- @to.accept_paragraph @RM::Paragraph.new('reg _italic_ reg')
-
- accept_paragraph_underscore
- end
-
- ##
- # Calls accept_verbatim with a RDoc::Markup::Verbatim
-
def test_accept_verbatim
@to.start_accepting
- @to.accept_verbatim @RM::Verbatim.new("hi\n", " world\n")
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
accept_verbatim
end
- ##
- # Calls accept_raw with a RDoc::Markup::Raw
-
def test_accept_raw
@to.start_accepting
@@ -340,9 +99,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_raw
end
- ##
- # Calls accept_rule with a RDoc::Markup::Rule
-
def test_accept_rule
@to.start_accepting
@@ -351,9 +107,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_rule
end
- ##
- # Calls accept_list_item_start_bullet
-
def test_accept_list_item_start_bullet
@to.start_accepting
@@ -364,9 +117,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_start_bullet
end
- ##
- # Calls accept_list_item_start_label
-
def test_accept_list_item_start_label
@to.start_accepting
@@ -377,9 +127,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_start_label
end
- ##
- # Calls accept_list_item_start_lalpha
-
def test_accept_list_item_start_lalpha
@to.start_accepting
@@ -390,9 +137,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_start_lalpha
end
- ##
- # Calls accept_list_item_start_note
-
def test_accept_list_item_start_note
@to.start_accepting
@@ -403,61 +147,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_start_note
end
- ##
- # Calls accept_list_item_start_note_2
-
- def test_accept_list_item_start_note_2
- list = list(:NOTE,
- item('<tt>teletype</tt>',
- para('teletype description')))
-
- @to.start_accepting
-
- list.accept @to
-
- @to.end_accepting
-
- accept_list_item_start_note_2
- end
-
- ##
- # Calls accept_list_item_start_note_multi_description
-
- def test_accept_list_item_start_note_multi_description
- list = list(:NOTE,
- item(%w[label],
- para('description one')),
- item(nil, para('description two')))
-
- @to.start_accepting
-
- list.accept @to
-
- @to.end_accepting
-
- accept_list_item_start_note_multi_description
- end
-
- ##
- # Calls accept_list_item_start_note_multi_label
-
- def test_accept_list_item_start_note_multi_label
- list = list(:NOTE,
- item(%w[one two],
- para('two headers')))
-
- @to.start_accepting
-
- list.accept @to
-
- @to.end_accepting
-
- accept_list_item_start_note_multi_label
- end
-
- ##
- # Calls accept_list_item_start_number
-
def test_accept_list_item_start_number
@to.start_accepting
@@ -468,9 +157,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_start_number
end
- ##
- # Calls accept_list_item_start_ualpha
-
def test_accept_list_item_start_ualpha
@to.start_accepting
@@ -481,9 +167,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_start_ualpha
end
- ##
- # Calls accept_list_item_end_bullet
-
def test_accept_list_item_end_bullet
@to.start_accepting
@@ -496,9 +179,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_end_bullet
end
- ##
- # Calls accept_list_item_end_label
-
def test_accept_list_item_end_label
@to.start_accepting
@@ -511,9 +191,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_end_label
end
- ##
- # Calls accept_list_item_end_lalpha
-
def test_accept_list_item_end_lalpha
@to.start_accepting
@@ -526,9 +203,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_end_lalpha
end
- ##
- # Calls accept_list_item_end_note
-
def test_accept_list_item_end_note
@to.start_accepting
@@ -541,9 +215,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_end_note
end
- ##
- # Calls accept_list_item_end_number
-
def test_accept_list_item_end_number
@to.start_accepting
@@ -556,9 +227,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_end_number
end
- ##
- # Calls accept_list_item_end_ualpha
-
def test_accept_list_item_end_ualpha
@to.start_accepting
@@ -571,9 +239,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_item_end_ualpha
end
- ##
- # Calls accept_list_start_bullet
-
def test_accept_list_start_bullet
@to.start_accepting
@@ -582,9 +247,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_start_bullet
end
- ##
- # Calls accept_list_start_label
-
def test_accept_list_start_label
@to.start_accepting
@@ -593,9 +255,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_start_label
end
- ##
- # Calls accept_list_start_lalpha
-
def test_accept_list_start_lalpha
@to.start_accepting
@@ -604,9 +263,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_start_lalpha
end
- ##
- # Calls accept_list_start_note
-
def test_accept_list_start_note
@to.start_accepting
@@ -615,9 +271,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_start_note
end
- ##
- # Calls accept_list_start_number
-
def test_accept_list_start_number
@to.start_accepting
@@ -626,9 +279,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_start_number
end
- ##
- # Calls accept_list_start_ualpha
-
def test_accept_list_start_ualpha
@to.start_accepting
@@ -637,9 +287,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_start_ualpha
end
- ##
- # Calls accept_list_end_bullet
-
def test_accept_list_end_bullet
@to.start_accepting
@@ -650,9 +297,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_end_bullet
end
- ##
- # Calls accept_list_end_label
-
def test_accept_list_end_label
@to.start_accepting
@@ -663,9 +307,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_end_label
end
- ##
- # Calls accept_list_end_lalpha
-
def test_accept_list_end_lalpha
@to.start_accepting
@@ -676,9 +317,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_end_lalpha
end
- ##
- # Calls accept_list_end_number
-
def test_accept_list_end_number
@to.start_accepting
@@ -689,9 +327,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_end_number
end
- ##
- # Calls accept_list_end_note
-
def test_accept_list_end_note
@to.start_accepting
@@ -702,9 +337,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_end_note
end
- ##
- # Calls accept_list_end_ualpha
-
def test_accept_list_end_ualpha
@to.start_accepting
@@ -714,52 +346,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
accept_list_end_ualpha
end
-
- ##
- # Calls list_nested with a two-level list
-
- def test_list_nested
- doc = @RM::Document.new(
- @RM::List.new(:BULLET,
- @RM::ListItem.new(nil,
- @RM::Paragraph.new('l1'),
- @RM::List.new(:BULLET,
- @RM::ListItem.new(nil,
- @RM::Paragraph.new('l1.1')))),
- @RM::ListItem.new(nil,
- @RM::Paragraph.new('l2'))))
-
- doc.accept @to
-
- list_nested
- end
-
- ##
- # Calls list_verbatim with a list containing a verbatim block
-
- def test_list_verbatim # HACK overblown
- doc =
- doc(
- list(:BULLET,
- item(nil,
- para('list stuff'),
- blank_line,
- verb("* list\n",
- " with\n",
- "\n",
- " second\n",
- "\n",
- " 1. indented\n",
- " 2. numbered\n",
- "\n",
- " third\n",
- "\n",
- "* second\n"))))
-
- doc.accept @to
-
- list_verbatim
- end
end
end
diff --git a/lib/rdoc/markup/hard_break.rb b/lib/rdoc/markup/hard_break.rb
deleted file mode 100644
index 8445ad26e7..0000000000
--- a/lib/rdoc/markup/hard_break.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-# A hard-break in the middle of a paragraph.
-
-class RDoc::Markup::HardBreak
-
- @instance = new
-
- ##
- # RDoc::Markup::HardBreak is a singleton
-
- def self.new
- @instance
- end
-
- ##
- # Calls #accept_hard_break on +visitor+
-
- def accept visitor
- visitor.accept_hard_break self
- end
-
- def == other # :nodoc:
- self.class === other
- end
-
- def pretty_print q # :nodoc:
- q.text "[break]"
- end
-
-end
-
diff --git a/lib/rdoc/markup/heading.rb b/lib/rdoc/markup/heading.rb
index b1f372222f..21e2574d68 100644
--- a/lib/rdoc/markup/heading.rb
+++ b/lib/rdoc/markup/heading.rb
@@ -1,60 +1,12 @@
##
# A heading with a level (1-6) and text
-RDoc::Markup::Heading =
- Struct.new :level, :text do
-
- @to_html = nil
- @to_label = nil
-
- ##
- # A singleton RDoc::Markup::ToLabel formatter for headings.
-
- def self.to_label
- @to_label ||= RDoc::Markup::ToLabel.new
- end
-
- ##
- # A singleton plain HTML formatter for headings. Used for creating labels
- # for the Table of Contents
-
- def self.to_html
- return @to_html if @to_html
-
- markup = RDoc::Markup.new
- markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
-
- @to_html = RDoc::Markup::ToHtml.new nil
-
- def @to_html.handle_special_CROSSREF special
- special.text.sub(/^\\/, '')
- end
-
- @to_html
- end
-
- ##
- # Calls #accept_heading on +visitor+
+class RDoc::Markup::Heading < Struct.new :level, :text
def accept visitor
visitor.accept_heading self
end
- ##
- # An HTML-safe anchor reference for this header.
-
- def aref
- "label-#{self.class.to_label.convert text.dup}"
- end
-
- ##
- # HTML markup of the text of this label without the surrounding header
- # element.
-
- def plain_html
- self.class.to_html.to_html(text.dup)
- end
-
def pretty_print q # :nodoc:
q.group 2, "[head: #{level} ", ']' do
q.pp text
diff --git a/lib/rdoc/markup/include.rb b/lib/rdoc/markup/include.rb
deleted file mode 100644
index a2e8903279..0000000000
--- a/lib/rdoc/markup/include.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-##
-# A file included at generation time. Objects of this class are created by
-# RDoc::RD for an extension-less include.
-#
-# This implementation in incomplete.
-
-class RDoc::Markup::Include
-
- ##
- # The filename to be included, without extension
-
- attr_reader :file
-
- ##
- # Directories to search for #file
-
- attr_reader :include_path
-
- ##
- # Creates a new include that will import +file+ from +include_path+
-
- def initialize file, include_path
- @file = file
- @include_path = include_path
- end
-
- def == other # :nodoc:
- self.class === other and
- @file == other.file and @include_path == other.include_path
- end
-
- def pretty_print q # :nodoc:
- q.group 2, '[incl ', ']' do
- q.text file
- q.breakable
- q.text 'from '
- q.pp include_path
- end
- end
-
-end
-
diff --git a/lib/rdoc/markup/indented_paragraph.rb b/lib/rdoc/markup/indented_paragraph.rb
deleted file mode 100644
index 1b8a8c725d..0000000000
--- a/lib/rdoc/markup/indented_paragraph.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-# An Indented Paragraph of text
-
-class RDoc::Markup::IndentedParagraph < RDoc::Markup::Raw
-
- ##
- # The indent in number of spaces
-
- attr_reader :indent
-
- ##
- # Creates a new IndentedParagraph containing +parts+ indented with +indent+
- # spaces
-
- def initialize indent, *parts
- @indent = indent
-
- super(*parts)
- end
-
- def == other # :nodoc:
- super and indent == other.indent
- end
-
- ##
- # Calls #accept_indented_paragraph on +visitor+
-
- def accept visitor
- visitor.accept_indented_paragraph self
- end
-
- ##
- # Joins the raw paragraph text and converts inline HardBreaks to the
- # +hard_break+ text followed by the indent.
-
- def text hard_break = nil
- @parts.map do |part|
- if RDoc::Markup::HardBreak === part then
- '%1$s%3$*2$s' % [hard_break, @indent, ' '] if hard_break
- else
- part
- end
- end.join
- end
-
-end
-
diff --git a/lib/rdoc/markup/inline.rb b/lib/rdoc/markup/inline.rb
index fb3ab5c74d..1b5eac45ae 100644
--- a/lib/rdoc/markup/inline.rb
+++ b/lib/rdoc/markup/inline.rb
@@ -1 +1,127 @@
-warn "requiring rdoc/markup/inline is deprecated and will be removed in RDoc 4." if $-w
+class RDoc::Markup
+
+ ##
+ # We manage a set of attributes. Each attribute has a symbol name and a bit
+ # value.
+
+ class Attribute
+
+ ##
+ # Special attribute type. See RDoc::Markup#add_special
+
+ 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 # :nodoc:
+
+ ##
+ # 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 # :nodoc:
+ "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
+
+ ##
+ # Creates a new AttrSpan for +length+ characters
+
+ def initialize(length)
+ @attrs = Array.new(length, 0)
+ end
+
+ ##
+ # Toggles +bits+ from +start+ to +length+
+ def set_attrs(start, length, bits)
+ for i in start ... (start+length)
+ @attrs[i] |= bits
+ end
+ end
+
+ ##
+ # Acccesses flags for character +n+
+
+ def [](n)
+ @attrs[n]
+ end
+
+ end
+
+ ##
+ # Hold details of a special sequence
+
+ class Special
+
+ ##
+ # Special type
+
+ attr_reader :type
+
+ ##
+ # Special text
+
+ attr_accessor :text
+
+ ##
+ # Creates a new special sequence of +type+ with +text+
+
+ def initialize(type, text)
+ @type, @text = type, text
+ end
+
+ ##
+ # Specials are equal when the have the same text and type
+
+ def ==(o)
+ self.text == o.text && self.type == o.type
+ end
+
+ def inspect # :nodoc:
+ "#<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 # :nodoc:
+ "Special: type=#{type}, name=#{RDoc::Markup::Attribute.as_string type}, text=#{text.dump}"
+ end
+
+ end
+
+end
+
diff --git a/lib/rdoc/markup/list.rb b/lib/rdoc/markup/list.rb
index 89b7fc20fa..75326ed836 100644
--- a/lib/rdoc/markup/list.rb
+++ b/lib/rdoc/markup/list.rb
@@ -1,24 +1,5 @@
##
-# A List is a homogeneous set of ListItems.
-#
-# The supported list types include:
-#
-# :BULLET::
-# An unordered list
-# :LABEL::
-# An unordered definition list, but using an alternate RDoc::Markup syntax
-# :LALPHA::
-# An ordered list using increasing lowercase English letters
-# :NOTE::
-# An unordered definition list
-# :NUMBER::
-# An ordered list using increasing Arabic numerals
-# :UALPHA::
-# An ordered list using increasing uppercase English letters
-#
-# Definition lists behave like HTML definition lists. Each list item can
-# describe multiple terms. See RDoc::Markup::ListItem for how labels and
-# definition are stored as list items.
+# A List of ListItems
class RDoc::Markup::List
@@ -33,13 +14,12 @@ class RDoc::Markup::List
attr_reader :items
##
- # Creates a new list of +type+ with +items+. Valid list types are:
- # +:BULLET+, +:LABEL+, +:LALPHA+, +:NOTE+, +:NUMBER+, +:UALPHA+
+ # Creates a new list of +type+ with +items+
def initialize type = nil, *items
@type = type
@items = []
- @items.concat items
+ @items.push(*items)
end
##
@@ -55,9 +35,6 @@ class RDoc::Markup::List
@items == other.items
end
- ##
- # Runs this list and all its #items through +visitor+
-
def accept visitor
visitor.accept_list_start self
@@ -94,7 +71,7 @@ class RDoc::Markup::List
# Appends +items+ to the list
def push *items
- @items.concat items
+ @items.push(*items)
end
end
diff --git a/lib/rdoc/markup/list_item.rb b/lib/rdoc/markup/list_item.rb
index c5e59fe167..500e814fe1 100644
--- a/lib/rdoc/markup/list_item.rb
+++ b/lib/rdoc/markup/list_item.rb
@@ -1,12 +1,5 @@
##
# An item within a List that contains paragraphs, headings, etc.
-#
-# For BULLET, NUMBER, LALPHA and UALPHA lists, the label will always be nil.
-# For NOTE and LABEL lists, the list label may contain:
-#
-# * a single String for a single label
-# * an Array of Strings for a list item with multiple terms
-# * nil for an extra description attached to a previously labeled list item
class RDoc::Markup::ListItem
@@ -26,7 +19,7 @@ class RDoc::Markup::ListItem
def initialize label = nil, *parts
@label = label
@parts = []
- @parts.concat parts
+ @parts.push(*parts)
end
##
@@ -42,9 +35,6 @@ class RDoc::Markup::ListItem
@parts == other.parts
end
- ##
- # Runs this list item and all its #parts through +visitor+
-
def accept visitor
visitor.accept_list_item_start self
@@ -71,14 +61,8 @@ class RDoc::Markup::ListItem
def pretty_print q # :nodoc:
q.group 2, '[item: ', ']' do
- case @label
- when Array then
- q.pp @label
- q.text ';'
- q.breakable
- when String then
- q.pp @label
- q.text ';'
+ if @label then
+ q.text @label
q.breakable
end
@@ -92,7 +76,7 @@ class RDoc::Markup::ListItem
# Adds +parts+ to the ListItem
def push *parts
- @parts.concat parts
+ @parts.push(*parts)
end
end
diff --git a/lib/rdoc/markup/paragraph.rb b/lib/rdoc/markup/paragraph.rb
index 7180729f75..a9923ed24d 100644
--- a/lib/rdoc/markup/paragraph.rb
+++ b/lib/rdoc/markup/paragraph.rb
@@ -3,26 +3,9 @@
class RDoc::Markup::Paragraph < RDoc::Markup::Raw
- ##
- # Calls #accept_paragraph on +visitor+
-
def accept visitor
visitor.accept_paragraph self
end
- ##
- # Joins the raw paragraph text and converts inline HardBreaks to the
- # +hard_break+ text.
-
- def text hard_break = ''
- @parts.map do |part|
- if RDoc::Markup::HardBreak === part then
- hard_break
- else
- part
- end
- end.join
- end
-
end
diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb
index 3fce2b4c3b..c214f74782 100644
--- a/lib/rdoc/markup/parser.rb
+++ b/lib/rdoc/markup/parser.rb
@@ -1,4 +1,5 @@
require 'strscan'
+require 'rdoc/text'
##
# A recursive-descent parser for RDoc markup.
@@ -51,15 +52,13 @@ class RDoc::Markup::Parser
attr_reader :tokens
##
- # Parses +str+ into a Document.
- #
- # Use RDoc::Markup#parse instead of this method.
+ # Parsers +str+ into a Document
def self.parse str
parser = new
+ #parser.debug = true
parser.tokenize str
- doc = RDoc::Markup::Document.new
- parser.parse doc
+ RDoc::Markup::Document.new(*parser.parse)
end
##
@@ -75,35 +74,22 @@ class RDoc::Markup::Parser
# Creates a new Parser. See also ::parse
def initialize
- @binary_input = nil
- @current_token = nil
- @debug = false
- @have_encoding = Object.const_defined? :Encoding
- @have_byteslice = ''.respond_to? :byteslice
- @input = nil
- @input_encoding = nil
- @line = 0
- @line_pos = 0
- @s = nil
- @tokens = []
+ @tokens = []
+ @current_token = nil
+ @debug = false
+
+ @line = 0
+ @line_pos = 0
end
##
# Builds a Heading of +level+
def build_heading level
- type, text, = get
-
- text = case type
- when :TEXT then
- skip :NEWLINE
- text
- else
- unget
- ''
- end
-
- RDoc::Markup::Heading.new level, text
+ heading = RDoc::Markup::Heading.new level, text
+ skip :NEWLINE
+
+ heading
end
##
@@ -113,80 +99,44 @@ class RDoc::Markup::Parser
p :list_start => margin if @debug
list = RDoc::Markup::List.new
- label = nil
until @tokens.empty? do
type, data, column, = get
case type
- when *LIST_TOKENS then
- if column < margin || (list.type && list.type != type) then
+ when :BULLET, :LABEL, :LALPHA, :NOTE, :NUMBER, :UALPHA then
+ list_type = type
+
+ if column < margin then
+ unget
+ break
+ end
+
+ if list.type and list.type != list_type then
unget
break
end
- list.type = type
- peek_type, _, column, = peek_token
+ list.type = list_type
case type
when :NOTE, :LABEL then
- label = [] unless label
-
- if peek_type == :NEWLINE then
- # description not on the same line as LABEL/NOTE
- # skip the trailing newline & any blank lines below
- while peek_type == :NEWLINE
- get
- peek_type, _, column, = peek_token
- end
-
- # we may be:
- # - at end of stream
- # - at a column < margin:
- # [text]
- # blah blah blah
- # - at the same column, but with a different type of list item
- # [text]
- # * blah blah
- # - at the same column, with the same type of list item
- # [one]
- # [two]
- # In all cases, we have an empty description.
- # In the last case only, we continue.
- if peek_type.nil? || column < margin then
- empty = true
- elsif column == margin then
- case peek_type
- when type
- empty = :continue
- when *LIST_TOKENS
- empty = true
- else
- empty = false
- end
- else
- empty = false
- end
-
- if empty then
- label << data
- next if empty == :continue
- break
- end
+ _, indent, = get # SPACE
+ if :NEWLINE == peek_token.first then
+ get
+ peek_type, new_indent, peek_column, = peek_token
+ indent = new_indent if
+ peek_type == :INDENT and peek_column >= column
+ unget
end
else
data = nil
+ _, indent, = get
end
- if label then
- data = label << data
- label = nil
- end
-
- list_item = RDoc::Markup::ListItem.new data
- parse list_item, column
- list << list_item
+ list_item = build_list_item(margin + indent, data)
+ list << list_item if list_item
else
unget
break
@@ -195,15 +145,57 @@ class RDoc::Markup::Parser
p :list_end => margin if @debug
- if list.empty? then
- return nil unless label
- return nil unless [:LABEL, :NOTE].include? list.type
+ return nil if list.empty?
- list_item = RDoc::Markup::ListItem.new label, RDoc::Markup::BlankLine.new
- list << list_item
+ list
+ end
+
+ ##
+ # Builds a ListItem that is flush to +indent+ with type +item_type+
+
+ def build_list_item indent, item_type = nil
+ p :list_item_start => [indent, item_type] if @debug
+
+ list_item = RDoc::Markup::ListItem.new item_type
+
+ until @tokens.empty? do
+ type, data, column = get
+
+ if column < indent and
+ not type == :NEWLINE and
+ (type != :INDENT or data < indent) then
+ unget
+ break
+ end
+
+ case type
+ when :INDENT then
+ unget
+ list_item.push(*parse(indent))
+ when :TEXT then
+ unget
+ list_item << build_paragraph(indent)
+ when :HEADER then
+ list_item << build_heading(data)
+ when :NEWLINE then
+ list_item << RDoc::Markup::BlankLine.new
+ when *LIST_TOKENS then
+ unget
+ list_item << build_list(column)
+ else
+ raise ParseError, "Unhandled token #{@current_token.inspect}"
+ end
end
- list
+ p :list_item_end => [indent, item_type] if @debug
+
+ return nil if list_item.empty?
+
+ list_item.parts.shift if
+ RDoc::Markup::BlankLine === list_item.parts.first and
+ list_item.length > 1
+
+ list_item
end
##
@@ -217,101 +209,93 @@ class RDoc::Markup::Parser
until @tokens.empty? do
type, data, column, = get
- if type == :TEXT and column == margin then
- paragraph << data
+ case type
+ when :INDENT then
+ next if data == margin and peek_token[0] == :TEXT
- break if peek_token.first == :BREAK
+ unget
+ break
+ when :TEXT then
+ if column != margin then
+ unget
+ break
+ end
- data << ' ' if skip :NEWLINE
+ paragraph << data
+ skip :NEWLINE
else
unget
break
end
end
- paragraph.parts.last.sub!(/ \z/, '') # cleanup
-
p :paragraph_end => margin if @debug
paragraph
end
##
- # Builds a Verbatim that is indented from +margin+.
- #
- # The verbatim block is shifted left (the least indented lines start in
- # column 0). Each part of the verbatim is one line of text, always
- # terminated by a newline. Blank lines always consist of a single newline
- # character, and there is never a single newline at the end of the verbatim.
+ # Builds a Verbatim that is flush to +margin+
def build_verbatim margin
p :verbatim_begin => margin if @debug
verbatim = RDoc::Markup::Verbatim.new
- min_indent = nil
- generate_leading_spaces = true
- line = ''
-
until @tokens.empty? do
type, data, column, = get
- if type == :NEWLINE then
- line << data
- verbatim << line
- line = ''
- generate_leading_spaces = true
- next
- end
-
- if column <= margin
- unget
- break
- end
+ case type
+ when :INDENT then
+ if margin >= data then
+ unget
+ break
+ end
- if generate_leading_spaces then
- indent = column - margin
- line << ' ' * indent
- min_indent = indent if min_indent.nil? || indent < min_indent
- generate_leading_spaces = false
- end
+ indent = data - margin
- case type
+ verbatim << ' ' * indent
when :HEADER then
- line << '=' * data
+ verbatim << '=' * data
+
_, _, peek_column, = peek_token
peek_column ||= column + data
- indent = peek_column - column - data
- line << ' ' * indent
+ verbatim << ' ' * (peek_column - column - data)
when :RULE then
width = 2 + data
- line << '-' * width
+ verbatim << '-' * width
+
_, _, peek_column, = peek_token
- peek_column ||= column + width
- indent = peek_column - column - width
- line << ' ' * indent
- when :BREAK, :TEXT then
- line << data
- else # *LIST_TOKENS
+ peek_column ||= column + data + 2
+ verbatim << ' ' * (peek_column - column - width)
+ when :TEXT then
+ verbatim << data
+ when *LIST_TOKENS then
+ if column <= margin then
+ unget
+ break
+ end
+
list_marker = case type
- when :BULLET then data
- when :LABEL then "[#{data}]"
- when :NOTE then "#{data}::"
- else # :LALPHA, :NUMBER, :UALPHA
- "#{data}."
+ when :BULLET then '*'
+ when :LABEL then "[#{data}]"
+ when :LALPHA, :NUMBER, :UALPHA then "#{data}."
+ when :NOTE then "#{data}::"
end
- line << list_marker
- peek_type, _, peek_column = peek_token
- unless peek_type == :NEWLINE then
- peek_column ||= column + list_marker.length
- indent = peek_column - column - list_marker.length
- line << ' ' * indent
- end
- end
+ verbatim << list_marker
+
+ _, data, = get
+
+ verbatim << ' ' * (data - list_marker.length)
+ when :NEWLINE then
+ verbatim << data
+ break unless [:INDENT, :NEWLINE].include? peek_token[0]
+ else
+ unget
+ break
+ end
end
- verbatim << line << "\n" unless line.empty?
- verbatim.parts.each { |p| p.slice!(0, min_indent) unless p == "\n" } if min_indent > 0
verbatim.normalize
p :verbatim_end => margin if @debug
@@ -320,21 +304,6 @@ class RDoc::Markup::Parser
end
##
- # The character offset for the input string at the given +byte_offset+
-
- def char_pos byte_offset
- if @have_byteslice then
- @input.byteslice(0, byte_offset).length
- elsif @have_encoding then
- matched = @binary_input[0, byte_offset]
- matched.force_encoding @input_encoding
- matched.length
- else
- byte_offset
- end
- end
-
- ##
# Pulls the next token from the stream.
def get
@@ -344,65 +313,65 @@ class RDoc::Markup::Parser
end
##
- # Parses the tokens into an array of RDoc::Markup::XXX objects,
- # and appends them to the passed +parent+ RDoc::Markup::YYY object.
- #
- # Exits at the end of the token stream, or when it encounters a token
- # in a column less than +indent+ (unless it is a NEWLINE).
- #
- # Returns +parent+.
-
- def parse parent, indent = 0
+ # Parses the tokens into a Document
+
+ def parse indent = 0
p :parse_start => indent if @debug
+ document = []
+
until @tokens.empty? do
type, data, column, = get
- case type
- when :BREAK then
- parent << RDoc::Markup::BlankLine.new
- skip :NEWLINE, false
- next
- when :NEWLINE then
- # trailing newlines are skipped below, so this is a blank line
- parent << RDoc::Markup::BlankLine.new
- skip :NEWLINE, false
- next
- end
-
- # indentation change: break or verbatim
- if column < indent then
+ if type != :INDENT and column < indent then
unget
break
- elsif column > indent then
- unget
- parent << build_verbatim(indent)
- next
end
- # indentation is the same
case type
when :HEADER then
- parent << build_heading(data)
+ document << build_heading(data)
+ when :INDENT then
+ if indent > data then
+ unget
+ break
+ elsif indent == data then
+ next
+ end
+
+ unget
+ document << build_verbatim(indent)
+ when :NEWLINE then
+ document << RDoc::Markup::BlankLine.new
+ skip :NEWLINE, false
when :RULE then
- parent << RDoc::Markup::Rule.new(data)
+ document << RDoc::Markup::Rule.new(data)
skip :NEWLINE
when :TEXT then
unget
- parent << build_paragraph(indent)
+ document << build_paragraph(indent)
+
+ # we're done with this paragraph (indent mismatch)
+ break if peek_token[0] == :TEXT
when *LIST_TOKENS then
unget
- parent << build_list(indent)
+
+ list = build_list(indent)
+
+ document << list if list
+
+ # we're done with this list (indent mismatch)
+ break if LIST_TOKENS.include? peek_token.first and indent > 0
else
type, data, column, line = @current_token
- raise ParseError, "Unhandled token #{type} (#{data.inspect}) at #{line}:#{column}"
+ raise ParseError,
+ "Unhandled token #{type} (#{data.inspect}) at #{line}:#{column}"
end
end
p :parse_end => indent if @debug
- parent
-
+ document
end
##
@@ -415,112 +384,122 @@ class RDoc::Markup::Parser
end
##
- # Creates the StringScanner
+ # Skips a token of +token_type+, optionally raising an error.
- def setup_scanner input
- @line = 0
- @line_pos = 0
- @input = input.dup
+ def skip token_type, error = true
+ type, data, = get
- if @have_encoding and not @have_byteslice then
- @input_encoding = @input.encoding
- @binary_input = @input.force_encoding Encoding::BINARY
+ return unless type # end of stream
+
+ return @current_token if token_type == type
+
+ unget
+
+ raise ParseError, "expected #{token_type} got #{@current_token.inspect}" if
+ error
+ end
+
+ ##
+ # Consumes tokens until NEWLINE and turns them back into text
+
+ def text
+ text = ''
+
+ loop do
+ type, data, = get
+
+ text << case type
+ when :BULLET then
+ _, space, = get # SPACE
+ "*#{' ' * (space - 1)}"
+ when :LABEL then
+ _, space, = get # SPACE
+ "[#{data}]#{' ' * (space - data.length - 2)}"
+ when :LALPHA, :NUMBER, :UALPHA then
+ _, space, = get # SPACE
+ "#{data}.#{' ' * (space - 2)}"
+ when :NOTE then
+ _, space = get # SPACE
+ "#{data}::#{' ' * (space - data.length - 2)}"
+ when :TEXT then
+ data
+ when :NEWLINE then
+ unget
+ break
+ when nil then
+ break
+ else
+ raise ParseError, "unhandled token #{@current_token.inspect}"
+ end
end
- @s = StringScanner.new input
+ text
end
##
- # Skips the next token if its type is +token_type+.
- #
- # Optionally raises an error if the next token is not of the expected type.
+ # Calculates the column and line of the current token based on +offset+.
- def skip token_type, error = true
- type, = get
- return unless type # end of stream
- return @current_token if token_type == type
- unget
- raise ParseError, "expected #{token_type} got #{@current_token.inspect}" if error
+ def token_pos offset
+ [offset - @line_pos, @line]
end
##
# Turns text +input+ into a stream of tokens
def tokenize input
- setup_scanner input
-
- until @s.eos? do
- pos = @s.pos
+ s = StringScanner.new input
- # leading spaces will be reflected by the column of the next token
- # the only thing we loose are trailing spaces at the end of the file
- next if @s.scan(/ +/)
+ @line = 0
+ @line_pos = 0
- # note: after BULLET, LABEL, etc.,
- # indent will be the column of the next non-newline token
+ until s.eos? do
+ pos = s.pos
@tokens << case
- # [CR]LF => :NEWLINE
- when @s.scan(/\r?\n/) then
- token = [:NEWLINE, @s.matched, *token_pos(pos)]
- @line_pos = char_pos @s.pos
+ when s.scan(/\r?\n/) then
+ token = [:NEWLINE, s.matched, *token_pos(pos)]
+ @line_pos = s.pos
@line += 1
token
- # === text => :HEADER then :TEXT
- when @s.scan(/(=+)(\s*)/) then
- level = @s[1].length
- header = [:HEADER, level, *token_pos(pos)]
-
- if @s[2] =~ /^\r?\n/ then
- @s.pos -= @s[2].length
- header
- else
- pos = @s.pos
- @s.scan(/.*/)
- @tokens << header
- [:TEXT, @s.matched.sub(/\r$/, ''), *token_pos(pos)]
- end
- # --- (at least 3) and nothing else on the line => :RULE
- when @s.scan(/(-{3,}) *\r?$/) then
- [:RULE, @s[1].length - 2, *token_pos(pos)]
- # * or - followed by white space and text => :BULLET
- when @s.scan(/([*-]) +(\S)/) then
- @s.pos -= @s[2].bytesize # unget \S
- [:BULLET, @s[1], *token_pos(pos)]
- # A. text, a. text, 12. text => :UALPHA, :LALPHA, :NUMBER
- when @s.scan(/([a-z]|\d+)\. +(\S)/i) then
- # FIXME if tab(s), the column will be wrong
- # either support tabs everywhere by first expanding them to
- # spaces, or assume that they will have been replaced
- # before (and provide a check for that at least in debug
- # mode)
- list_label = @s[1]
- @s.pos -= @s[2].bytesize # unget \S
- list_type =
- case list_label
- when /[a-z]/ then :LALPHA
- when /[A-Z]/ then :UALPHA
- when /\d/ then :NUMBER
- else
- raise ParseError, "BUG token #{list_label}"
- end
- [list_type, list_label, *token_pos(pos)]
- # [text] followed by spaces or end of line => :LABEL
- when @s.scan(/\[(.*?)\]( +|\r?$)/) then
- [:LABEL, @s[1], *token_pos(pos)]
- # text:: followed by spaces or end of line => :NOTE
- when @s.scan(/(.*?)::( +|\r?$)/) then
- [:NOTE, @s[1], *token_pos(pos)]
- # anything else: :TEXT
- else @s.scan(/(.*?)( )?\r?$/)
- token = [:TEXT, @s[1], *token_pos(pos)]
-
- if @s[2] then
- @tokens << token
- [:BREAK, @s[2], *token_pos(pos + @s[1].length)]
- else
- token
- end
+ when s.scan(/ +/) then
+ [:INDENT, s.matched_size, *token_pos(pos)]
+ when s.scan(/(=+)\s*/) then
+ level = s[1].length
+ level = 6 if level > 6
+ @tokens << [:HEADER, level, *token_pos(pos)]
+
+ pos = s.pos
+ s.scan(/.*/)
+ [:TEXT, s.matched, *token_pos(pos)]
+ when s.scan(/^(-{3,}) *$/) then
+ [:RULE, s[1].length - 2, *token_pos(pos)]
+ when s.scan(/([*-])\s+/) then
+ @tokens << [:BULLET, :BULLET, *token_pos(pos)]
+ [:SPACE, s.matched_size, *token_pos(pos)]
+ when s.scan(/([a-z]|\d+)\.[ \t]+\S/i) then
+ list_label = s[1]
+ width = s.matched_size - 1
+
+ s.pos -= 1 # unget \S
+
+ list_type = case list_label
+ when /[a-z]/ then :LALPHA
+ when /[A-Z]/ then :UALPHA
+ when /\d/ then :NUMBER
+ else
+ raise ParseError, "BUG token #{list_label}"
+ end
+
+ @tokens << [list_type, list_label, *token_pos(pos)]
+ [:SPACE, width, *token_pos(pos)]
+ when s.scan(/\[(.*?)\]( +|$)/) then
+ @tokens << [:LABEL, s[1], *token_pos(pos)]
+ [:SPACE, s.matched_size, *token_pos(pos)]
+ when s.scan(/(.*?)::( +|$)/) then
+ @tokens << [:NOTE, s[1], *token_pos(pos)]
+ [:SPACE, s.matched_size, *token_pos(pos)]
+ else s.scan(/.*/)
+ [:TEXT, s.matched, *token_pos(pos)]
end
end
@@ -528,20 +507,9 @@ class RDoc::Markup::Parser
end
##
- # Calculates the column (by character) and line of the current token from
- # +scanner+ based on +byte_offset+.
-
- def token_pos byte_offset
- offset = char_pos byte_offset
-
- [offset - @line_pos, @line]
- end
-
- ##
- # Returns the current token to the token stream
+ # Returns the current token or +token+ to the token stream
- def unget
- token = @current_token
+ def unget token = @current_token
p :unget => token if @debug
raise Error, 'too many #ungets' if token == @tokens.first
@tokens.unshift token if token
@@ -549,3 +517,13 @@ class RDoc::Markup::Parser
end
+require 'rdoc/markup/blank_line'
+require 'rdoc/markup/document'
+require 'rdoc/markup/heading'
+require 'rdoc/markup/list'
+require 'rdoc/markup/list_item'
+require 'rdoc/markup/raw'
+require 'rdoc/markup/paragraph'
+require 'rdoc/markup/rule'
+require 'rdoc/markup/verbatim'
+
diff --git a/lib/rdoc/markup/pre_process.rb b/lib/rdoc/markup/pre_process.rb
deleted file mode 100644
index 6024edcd27..0000000000
--- a/lib/rdoc/markup/pre_process.rb
+++ /dev/null
@@ -1,293 +0,0 @@
-##
-# Handle common directives that can occur in a block of text:
-#
-# \:include: filename
-#
-# Directives can be escaped by preceding them with a backslash.
-#
-# RDoc plugin authors can register additional directives to be handled by
-# using RDoc::Markup::PreProcess::register.
-#
-# Any directive that is not built-in to RDoc (including those registered via
-# plugins) will be stored in the metadata hash on the CodeObject the comment
-# is attached to. See RDoc::Markup@Directives for the list of built-in
-# directives.
-
-class RDoc::Markup::PreProcess
-
- ##
- # An RDoc::Options instance that will be filled in with overrides from
- # directives
-
- attr_accessor :options
-
- ##
- # Adds a post-process handler for directives. The handler will be called
- # with the result RDoc::Comment (or text String) and the code object for the
- # comment (if any).
-
- def self.post_process &block
- @post_processors << block
- end
-
- ##
- # Registered post-processors
-
- def self.post_processors
- @post_processors
- end
-
- ##
- # Registers +directive+ as one handled by RDoc. If a block is given the
- # directive will be replaced by the result of the block, otherwise the
- # directive will be removed from the processed text.
- #
- # The block will be called with the directive name and the directive
- # parameter:
- #
- # RDoc::Markup::PreProcess.register 'my-directive' do |directive, param|
- # # replace text, etc.
- # end
-
- def self.register directive, &block
- @registered[directive] = block
- end
-
- ##
- # Registered directives
-
- def self.registered
- @registered
- end
-
- ##
- # Clears all registered directives and post-processors
-
- def self.reset
- @post_processors = []
- @registered = {}
- end
-
- reset
-
- ##
- # Creates a new pre-processor for +input_file_name+ that will look for
- # included files in +include_path+
-
- def initialize(input_file_name, include_path)
- @input_file_name = input_file_name
- @include_path = include_path
- @options = nil
- end
-
- ##
- # Look for directives in the given +text+.
- #
- # Options that we don't handle are yielded. If the block returns false the
- # directive is restored to the text. If the block returns nil or no block
- # was given the directive is handled according to the registered directives.
- # If a String was returned the directive is replaced with the string.
- #
- # If no matching directive was registered the directive is restored to the
- # text.
- #
- # If +code_object+ is given and the directive is unknown then the
- # directive's parameter is set as metadata on the +code_object+. See
- # RDoc::CodeObject#metadata for details.
-
- def handle text, code_object = nil, &block
- if RDoc::Comment === text then
- comment = text
- text = text.text
- end
-
- encoding = text.encoding if defined?(Encoding)
-
- # regexp helper (square brackets for optional)
- # $1 $2 $3 $4 $5
- # [prefix][\]:directive:[spaces][param]newline
- text.gsub!(/^([ \t]*(?:#|\/?\*)?[ \t]*)(\\?):(\w+):([ \t]*)(.+)?(\r?\n|$)/) do
- # skip something like ':toto::'
- next $& if $4.empty? and $5 and $5[0, 1] == ':'
-
- # skip if escaped
- next "#$1:#$3:#$4#$5\n" unless $2.empty?
-
- # This is not in handle_directive because I didn't want to pass another
- # argument into it
- if comment and $3 == 'markup' then
- next "#{$1.strip}\n" unless $5
- comment.format = $5.downcase
- next "#{$1.strip}\n"
- end
-
- handle_directive $1, $3, $5, code_object, encoding, &block
- end
-
- comment = text unless comment
-
- self.class.post_processors.each do |handler|
- handler.call comment, code_object
- end
-
- text
- end
-
- ##
- # Performs the actions described by +directive+ and its parameter +param+.
- #
- # +code_object+ is used for directives that operate on a class or module.
- # +prefix+ is used to ensure the replacement for handled directives is
- # correct. +encoding+ is used for the <tt>include</tt> directive.
- #
- # For a list of directives in RDoc see RDoc::Markup.
- #--
- # When 1.8.7 support is ditched prefix can be defaulted to ''
-
- def handle_directive prefix, directive, param, code_object = nil,
- encoding = nil
- blankline = "#{prefix.strip}\n"
- directive = directive.downcase
-
- case directive
- when 'arg', 'args' then
- return blankline unless code_object
-
- code_object.params = param
-
- blankline
- when 'category' then
- if RDoc::Context === code_object then
- section = code_object.add_section param
- code_object.temporary_section = section
- end
-
- blankline # ignore category if we're not on an RDoc::Context
- when 'doc' then
- return blankline unless code_object
- code_object.document_self = true
- code_object.force_documentation = true
-
- blankline
- when 'enddoc' then
- return blankline unless code_object
- code_object.done_documenting = true
-
- blankline
- when 'include' then
- filename = param.split.first
- include_file filename, prefix, encoding
- when 'main' then
- @options.main_page = param if @options.respond_to? :main_page
-
- blankline
- when 'nodoc' then
- return blankline unless code_object
- code_object.document_self = nil # notify nodoc
- code_object.document_children = param !~ /all/i
-
- blankline
- when 'notnew', 'not_new', 'not-new' then
- return blankline unless RDoc::AnyMethod === code_object
-
- code_object.dont_rename_initialize = true
-
- blankline
- when 'startdoc' then
- return blankline unless code_object
-
- code_object.start_doc
- code_object.force_documentation = true
-
- blankline
- when 'stopdoc' then
- return blankline unless code_object
-
- code_object.stop_doc
-
- blankline
- when 'title' then
- @options.default_title = param if @options.respond_to? :default_title=
-
- blankline
- when 'yield', 'yields' then
- return blankline unless code_object
- # remove parameter &block
- code_object.params.sub!(/,?\s*&\w+/, '') if code_object.params
-
- code_object.block_params = param
-
- blankline
- else
- result = yield directive, param if block_given?
-
- case result
- when nil then
- code_object.metadata[directive] = param if code_object
-
- if RDoc::Markup::PreProcess.registered.include? directive then
- handler = RDoc::Markup::PreProcess.registered[directive]
- result = handler.call directive, param if handler
- else
- result = "#{prefix}:#{directive}: #{param}\n"
- end
- when false then
- result = "#{prefix}:#{directive}: #{param}\n"
- end
-
- result
- end
- end
-
- ##
- # Handles the <tt>:include: _filename_</tt> directive.
- #
- # If the first line of the included file starts with '#', and contains
- # an encoding information in the form 'coding:' or 'coding=', it is
- # removed.
- #
- # If all lines in the included file start with a '#', this leading '#'
- # is removed before inclusion. The included content is indented like
- # the <tt>:include:</tt> directive.
- #--
- # so all content will be verbatim because of the likely space after '#'?
- # TODO shift left the whole file content in that case
- # TODO comment stop/start #-- and #++ in included file must be processed here
-
- def include_file name, indent, encoding
- full_name = find_include_file name
-
- unless full_name then
- warn "Couldn't find file to include '#{name}' from #{@input_file_name}"
- return ''
- end
-
- content = RDoc::Encoding.read_file full_name, encoding, true
-
- # strip magic comment
- content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
-
- # strip leading '#'s, but only if all lines start with them
- if content =~ /^[^#]/ then
- content.gsub(/^/, indent)
- else
- content.gsub(/^#?/, indent)
- 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/preprocess.rb b/lib/rdoc/markup/preprocess.rb
new file mode 100644
index 0000000000..cefb498916
--- /dev/null
+++ b/lib/rdoc/markup/preprocess.rb
@@ -0,0 +1,130 @@
+require 'rdoc/markup'
+
+##
+# Handle common directives that can occur in a block of text:
+#
+# : include : filename
+#
+# RDoc plugin authors can register additional directives to be handled through
+# RDoc::Markup::PreProcess::register
+
+class RDoc::Markup::PreProcess
+
+ @registered = {}
+
+ ##
+ # Registers +directive+ as one handled by RDoc. If a block is given the
+ # directive will be replaced by the result of the block, otherwise the
+ # directive will be removed from the processed text.
+
+ def self.register directive, &block
+ @registered[directive] = block
+ end
+
+ ##
+ # Registered directives
+
+ def self.registered
+ @registered
+ end
+
+ ##
+ # Creates a new pre-processor for +input_file_name+ that will look for
+ # included files in +include_path+
+
+ def initialize(input_file_name, include_path)
+ @input_file_name = input_file_name
+ @include_path = include_path
+ end
+
+ ##
+ # Look for directives in a chunk of +text+.
+ #
+ # Options that we don't handle are yielded. If the block returns false the
+ # directive is restored to the text. If the block returns nil or no block
+ # was given the directive is handled according to the registered directives.
+ # If a String was returned the directive is replaced with the string.
+ #
+ # If no matching directive was registered the directive is restored to the
+ # text.
+ #
+ # If +code_object+ is given and the param is set as metadata on the
+ # +code_object+. See RDoc::CodeObject#metadata
+
+ def handle text, code_object = nil
+ 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 if block_given?
+
+ case result
+ when nil then
+ code_object.metadata[directive] = param if code_object
+ if RDoc::Markup::PreProcess.registered.include? directive then
+ handler = RDoc::Markup::PreProcess.registered[directive]
+ result = handler.call directive, param if handler
+ else
+ result = "#{prefix}:#{directive}: #{param}\n"
+ end
+ when false then
+ result = "#{prefix}:#{directive}: #{param}\n"
+ end
+
+ result
+ end
+ end
+
+ text
+ end
+
+ ##
+ # Include a file, indenting it correctly.
+
+ def include_file(name, indent)
+ if full_name = find_include_file(name) then
+ content = if defined?(Encoding) then
+ File.binread full_name
+ else
+ File.read full_name
+ end
+ # HACK determine content type and force encoding
+ content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
+
+ # strip leading '#'s, but only if all lines start with them
+ if content =~ /^[^#]/ then
+ content.gsub(/^/, indent)
+ else
+ content.gsub(/^#?/, indent)
+ end
+ else
+ warn "Couldn't find file to include '#{name}' from #{@input_file_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/raw.rb b/lib/rdoc/markup/raw.rb
index e11e8efff4..1124be7cc8 100644
--- a/lib/rdoc/markup/raw.rb
+++ b/lib/rdoc/markup/raw.rb
@@ -13,7 +13,7 @@ class RDoc::Markup::Raw
def initialize *parts
@parts = []
- @parts.concat parts
+ @parts.push(*parts)
end
##
@@ -24,12 +24,9 @@ class RDoc::Markup::Raw
end
def == other # :nodoc:
- self.class == other.class and @parts == other.parts
+ self.class == other.class and text == other.text
end
- ##
- # Calls #accept_raw+ on +visitor+
-
def accept visitor
visitor.accept_raw self
end
@@ -38,11 +35,11 @@ class RDoc::Markup::Raw
# Appends +other+'s parts
def merge other
- @parts.concat other.parts
+ @parts.push(*other.parts)
end
def pretty_print q # :nodoc:
- self.class.name =~ /.*::(\w{1,4})/i
+ self.class.name =~ /.*::(\w{4})/i
q.group 2, "[#{$1.downcase}: ", ']' do
q.seplist @parts do |part|
@@ -55,7 +52,7 @@ class RDoc::Markup::Raw
# Appends +texts+ onto this Paragraph
def push *texts
- self.parts.concat texts
+ self.parts.push(*texts)
end
##
@@ -66,4 +63,3 @@ class RDoc::Markup::Raw
end
end
-
diff --git a/lib/rdoc/markup/rule.rb b/lib/rdoc/markup/rule.rb
index b778f2bc09..4fcd040d2b 100644
--- a/lib/rdoc/markup/rule.rb
+++ b/lib/rdoc/markup/rule.rb
@@ -3,9 +3,6 @@
class RDoc::Markup::Rule < Struct.new :weight
- ##
- # Calls #accept_rule on +visitor+
-
def accept visitor
visitor.accept_rule self
end
diff --git a/lib/rdoc/markup/special.rb b/lib/rdoc/markup/special.rb
deleted file mode 100644
index 1c0fc03eea..0000000000
--- a/lib/rdoc/markup/special.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-##
-# Hold details of a special sequence
-
-class RDoc::Markup::Special
-
- ##
- # Special type
-
- attr_reader :type
-
- ##
- # Special text
-
- attr_accessor :text
-
- ##
- # Creates a new special sequence of +type+ with +text+
-
- def initialize(type, text)
- @type, @text = type, text
- end
-
- ##
- # Specials are equal when the have the same text and type
-
- def ==(o)
- self.text == o.text && self.type == o.type
- end
-
- def inspect # :nodoc:
- "#<RDoc::Markup::Special:0x%x @type=%p, @text=%p>" % [
- object_id, @type, text.dump]
- end
-
- def to_s # :nodoc:
- "Special: type=#{type} text=#{text.dump}"
- end
-
-end
-
diff --git a/lib/rdoc/markup/text_formatter_test_case.rb b/lib/rdoc/markup/text_formatter_test_case.rb
deleted file mode 100644
index 4abf42563b..0000000000
--- a/lib/rdoc/markup/text_formatter_test_case.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-##
-# Test case for creating new plain-text RDoc::Markup formatters. See also
-# RDoc::Markup::FormatterTestCase
-#
-# See test_rdoc_markup_to_rdoc.rb for a complete example.
-#
-# Example:
-#
-# class TestRDocMarkupToNewTextFormat < RDoc::Markup::TextFormatterTestCase
-#
-# add_visitor_tests
-# add_text_tests
-#
-# def setup
-# super
-#
-# @to = RDoc::Markup::ToNewTextFormat.new
-# end
-#
-# def accept_blank_line
-# assert_equal :junk, @to.res.join
-# end
-#
-# # ...
-#
-# end
-
-class RDoc::Markup::TextFormatterTestCase < RDoc::Markup::FormatterTestCase
-
- ##
- # Adds test cases to the calling TestCase.
-
- def self.add_text_tests
- self.class_eval do
-
- ##
- # Test case that calls <tt>@to.accept_heading</tt>
-
- def test_accept_heading_indent
- @to.start_accepting
- @to.indent = 3
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- accept_heading_indent
- end
-
- ##
- # Test case that calls <tt>@to.accept_rule</tt>
-
- def test_accept_rule_indent
- @to.start_accepting
- @to.indent = 3
- @to.accept_rule @RM::Rule.new(1)
-
- accept_rule_indent
- end
-
- ##
- # Test case that calls <tt>@to.accept_verbatim</tt>
-
- def test_accept_verbatim_indent
- @to.start_accepting
- @to.indent = 2
- @to.accept_verbatim @RM::Verbatim.new("hi\n", " world\n")
-
- accept_verbatim_indent
- end
-
- ##
- # Test case that calls <tt>@to.accept_verbatim</tt> with a big indent
-
- def test_accept_verbatim_big_indent
- @to.start_accepting
- @to.indent = 2
- @to.accept_verbatim @RM::Verbatim.new("hi\n", "world\n")
-
- accept_verbatim_big_indent
- end
-
- ##
- # Test case that calls <tt>@to.accept_paragraph</tt> with an indent
-
- def test_accept_paragraph_indent
- @to.start_accepting
- @to.indent = 3
- @to.accept_paragraph @RM::Paragraph.new(('words ' * 30).strip)
-
- accept_paragraph_indent
- end
-
- ##
- # Test case that calls <tt>@to.accept_paragraph</tt> with a long line
-
- def test_accept_paragraph_wrap
- @to.start_accepting
- @to.accept_paragraph @RM::Paragraph.new(('words ' * 30).strip)
-
- accept_paragraph_wrap
- end
-
- ##
- # Test case that calls <tt>@to.attributes</tt> with an escaped
- # cross-reference. If this test doesn't pass something may be very
- # wrong.
-
- def test_attributes
- assert_equal 'Dog', @to.attributes("\\Dog")
- end
-
- end
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_ansi.rb b/lib/rdoc/markup/to_ansi.rb
index 4d439ce88d..9a5be8babb 100644
--- a/lib/rdoc/markup/to_ansi.rb
+++ b/lib/rdoc/markup/to_ansi.rb
@@ -1,18 +1,17 @@
+require 'rdoc/markup/inline'
+
##
# Outputs RDoc markup with vibrant ANSI color!
class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
- ##
- # Creates a new ToAnsi visitor that is ready to output vibrant ANSI color!
-
- def initialize markup = nil
+ def initialize
super
@headings.clear
- @headings[1] = ["\e[1;32m", "\e[m"] # bold
- @headings[2] = ["\e[4;32m", "\e[m"] # underline
- @headings[3] = ["\e[32m", "\e[m"] # just green
+ @headings[1] = ["\e[1;32m", "\e[m"]
+ @headings[2] = ["\e[4;32m", "\e[m"]
+ @headings[3] = ["\e[32m", "\e[m"]
end
##
@@ -24,20 +23,12 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
add_tag :EM, "\e[4m", "\e[m"
end
- ##
- # Overrides indent width to ensure output lines up correctly.
-
def accept_list_item_end list_item
width = case @list_type.last
when :BULLET then
2
when :NOTE, :LABEL then
- if @prefix then
- @res << @prefix.strip
- @prefix = nil
- end
-
- @res << "\n" unless res.length == 1
+ @res << "\n"
2
else
bullet = @list_index.last.to_s
@@ -48,21 +39,12 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
@indent -= width
end
- ##
- # Adds coloring to note and label list items
-
def accept_list_item_start list_item
bullet = case @list_type.last
when :BULLET then
'*'
when :NOTE, :LABEL then
- labels = Array(list_item.label).map do |label|
- attributes(label).strip
- end.join "\n"
-
- labels << ":\n" unless labels.empty?
-
- labels
+ attributes(list_item.label) + ":\n"
else
@list_index.last.to_s + '.'
end
@@ -80,9 +62,6 @@ class RDoc::Markup::ToAnsi < RDoc::Markup::ToRdoc
end
end
- ##
- # Starts accepting with a reset screen
-
def start_accepting
super
diff --git a/lib/rdoc/markup/to_bs.rb b/lib/rdoc/markup/to_bs.rb
index 10c31854d2..e7af129824 100644
--- a/lib/rdoc/markup/to_bs.rb
+++ b/lib/rdoc/markup/to_bs.rb
@@ -1,3 +1,5 @@
+require 'rdoc/markup/inline'
+
##
# Outputs RDoc markup with hot backspace action! You will probably need a
# pager to use this output format.
@@ -6,10 +8,7 @@
class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
- ##
- # Returns a new ToBs that is ready for hot backspace action!
-
- def initialize markup = nil
+ def initialize
super
@in_b = false
@@ -23,12 +22,8 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
def init_tags
add_tag :BOLD, '+b', '-b'
add_tag :EM, '+_', '-_'
- add_tag :TT, '' , '' # we need in_tt information maintained
end
- ##
- # Makes heading text bold.
-
def accept_heading heading
use_prefix or @res << ' ' * @indent
@res << @headings[heading.level][0]
@@ -49,6 +44,7 @@ class RDoc::Markup::ToBs < RDoc::Markup::ToRdoc
when '+_' then @in_em = true
when '-_' then @in_em = false
end
+
''
end
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index 37b9492e23..74e3137eb2 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -1,24 +1,23 @@
+require 'rdoc/markup/formatter'
+require 'rdoc/markup/inline'
+
require 'cgi'
##
-# Outputs RDoc markup as HTML.
+# Outputs RDoc markup as HTML
class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
- include RDoc::Text
-
- # :section: Utilities
-
##
# Maps RDoc::Markup::Parser::LIST_TOKENS types to HTML tags
LIST_TYPE_TO_HTML = {
- :BULLET => ['<ul>', '</ul>'],
- :LABEL => ['<dl class="rdoc-list label-list">', '</dl>'],
- :LALPHA => ['<ol style="list-style-type: lower-alpha">', '</ol>'],
- :NOTE => ['<dl class="rdoc-list note-list">', '</dl>'],
- :NUMBER => ['<ol>', '</ol>'],
- :UALPHA => ['<ol style="list-style-type: upper-alpha">', '</ol>'],
+ :BULLET => ['<ul>', '</ul>'],
+ :LABEL => ['<dl>', '</dl>'],
+ :LALPHA => ['<ol style="display: lower-alpha">', '</ol>'],
+ :NOTE => ['<table>', '</table>'],
+ :NUMBER => ['<ol>', '</ol>'],
+ :UALPHA => ['<ol style="display: upper-alpha">', '</ol>'],
}
attr_reader :res # :nodoc:
@@ -26,106 +25,100 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
attr_reader :list # :nodoc:
##
- # The RDoc::CodeObject HTML is being generated for. This is used to
- # generate namespaced URI fragments
+ # Converts a target url to one that is relative to a given path
- attr_accessor :code_object
+ def self.gen_relative_url(path, target)
+ from = File.dirname path
+ to, to_file = File.split target
- ##
- # Path to this document for relative links
+ from = from.split "/"
+ to = to.split "/"
- attr_accessor :from_path
+ from.delete '.'
+ to.delete '.'
- # :section:
+ while from.size > 0 and to.size > 0 and from[0] == to[0] do
+ from.shift
+ to.shift
+ end
- ##
- # Creates a new formatter that will output HTML
+ from.fill ".."
+ from.concat to
+ from << to_file
+ File.join(*from)
+ end
- def initialize options, markup = nil
+ def initialize
super
- @code_object = nil
- @from_path = ''
+ @th = nil
@in_list_entry = nil
@list = nil
- @th = nil
- @hard_break = "<br>\n"
- # external links
- @markup.add_special(/(?:link:|https?:|mailto:|ftp:|irc:|www\.)\S+\w/,
- :HYPERLINK)
+ # external hyperlinks
+ @markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
- add_special_RDOCLINK
- add_special_TIDYLINK
+ # and links of the form <text>[<url>]
+ @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
init_tags
end
- # :section: Special Handling
- #
- # These methods handle special markup added by RDoc::Markup#add_special.
-
##
- # +special+ is a <code><br></code>
+ # Maps attributes to HTML tags
- def handle_special_HARD_BREAK special
- '<br>'
+ def init_tags
+ add_tag :BOLD, "<b>", "</b>"
+ add_tag :TT, "<tt>", "</tt>"
+ add_tag :EM, "<em>", "</em>"
end
##
- # +special+ is a potential link. The following schemes are handled:
- #
- # <tt>mailto:</tt>::
- # Inserted as-is.
- # <tt>http:</tt>::
- # Links are checked to see if they reference an image. If so, that image
- # gets inserted using an <tt><img></tt> tag. Otherwise a conventional
- # <tt><a href></tt> is used.
- # <tt>link:</tt>::
- # Reference to a local file relative to the output directory.
+ # Generate a hyperlink for url, labeled with text. Handle the
+ # special cases for img: and link: described under handle_special_HYPERLINK
- def handle_special_HYPERLINK(special)
- url = special.text
+ def gen_url(url, text)
+ if url =~ /([A-Za-z]+):(.*)/ then
+ type = $1
+ path = $2
+ else
+ type = "http"
+ path = url
+ url = "http://#{url}"
+ end
- gen_url url, url
+ 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
##
- # +special+ is an rdoc-schemed link that will be converted into a hyperlink.
- #
- # For the +rdoc-ref+ scheme the named reference will be returned without
- # creating a link.
- #
- # For the +rdoc-label+ scheme the footnote and label prefixes are stripped
- # when creating a link. All other contents will be linked verbatim.
-
- def handle_special_RDOCLINK special
- url = special.text
-
- case url
- when /\Ardoc-ref:/
- $'
- when /\Ardoc-label:/
- text = $'
+ # 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.
- text = case text
- when /\Alabel-/ then $'
- when /\Afootmark-/ then "^#{$'}"
- when /\Afoottext-/ then "*#{$'}"
- else text
- end
-
- gen_url url, text
- else
- url =~ /\Ardoc-[a-z]+:/
-
- $'
- end
+ def handle_special_HYPERLINK(special)
+ url = special.text
+ gen_url url, url
end
##
- # This +special+ is a link where the label is different from the URL
- # <tt>label[url]</tt> or <tt>{long label}[url]</tt>
+ # 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
@@ -137,12 +130,40 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
gen_url url, label
end
- # :section: Visitor
- #
- # These methods implement the HTML visitor.
+ ##
+ # 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.join
+ end
##
- # Prepares the visitor for HTML generation
+ # :section: Visitor
def start_accepting
@res = []
@@ -150,225 +171,174 @@ class RDoc::Markup::ToHtml < RDoc::Markup::Formatter
@list = []
end
- ##
- # Returns the generated output
-
def end_accepting
@res.join
end
- ##
- # Adds +block_quote+ to the output
-
- def accept_block_quote block_quote
- @res << "\n<blockquote>"
-
- block_quote.parts.each do |part|
- part.accept self
- end
-
- @res << "</blockquote>\n"
+ def accept_paragraph(paragraph)
+ @res << annotate("<p>") + "\n"
+ @res << wrap(convert_flow(@am.flow(paragraph.text)))
+ @res << annotate("</p>") + "\n"
end
- ##
- # Adds +paragraph+ to the output
-
- def accept_paragraph paragraph
- @res << "\n<p>"
- text = paragraph.text @hard_break
- @res << wrap(to_html(text))
- @res << "</p>\n"
- end
-
- ##
- # Adds +verbatim+ to the output
-
- def accept_verbatim verbatim
- text = verbatim.text.rstrip
-
- @res << if verbatim.ruby? or parseable? text then
- begin
- tokens = RDoc::RubyLex.tokenize text, @options
-
- html = RDoc::TokenStream.to_html tokens
-
- "\n<pre class=\"ruby\">#{html}</pre>\n"
- rescue RDoc::RubyLex::Error
- "\n<pre>#{CGI.escapeHTML text}</pre>\n"
- end
- else
- "\n<pre>#{CGI.escapeHTML text}</pre>\n"
- end
+ def accept_verbatim(verbatim)
+ @res << annotate("<pre>") << "\n"
+ @res << CGI.escapeHTML(verbatim.text)
+ @res << annotate("</pre>") << "\n"
end
- ##
- # Adds +rule+ to the output
-
def accept_rule(rule)
size = rule.weight
size = 10 if size > 10
- @res << "<hr style=\"height: #{size}px\">\n"
+ @res << "<hr style=\"height: #{size}px\"></hr>"
end
- ##
- # Prepares the visitor for consuming +list+
-
def accept_list_start(list)
@list << list.type
- @res << html_list_name(list.type, true)
+ @res << html_list_name(list.type, true) << "\n"
@in_list_entry.push false
end
- ##
- # Finishes consumption of +list+
-
def accept_list_end(list)
@list.pop
if tag = @in_list_entry.pop
- @res << tag
+ @res << annotate(tag) << "\n"
end
@res << html_list_name(list.type, false) << "\n"
end
- ##
- # Prepares the visitor for consuming +list_item+
-
def accept_list_item_start(list_item)
if tag = @in_list_entry.last
- @res << tag
+ @res << annotate(tag) << "\n"
end
@res << list_item_start(list_item, @list.last)
end
- ##
- # Finishes consumption of +list_item+
-
def accept_list_item_end(list_item)
@in_list_entry[-1] = list_end_for(@list.last)
end
- ##
- # Adds +blank_line+ to the output
-
def accept_blank_line(blank_line)
# @res << annotate("<p />") << "\n"
end
- ##
- # Adds +heading+ to the output. The headings greater than 6 are trimmed to
- # level 6.
-
- def accept_heading heading
- level = [6, heading.level].min
-
- label = heading.aref
- label = [@code_object.aref, label].compact.join '-' if
- @code_object and @code_object.respond_to? :aref
-
- @res << "\n<h#{level} id=\"#{label}\">"
- @res << to_html(heading.text)
- unless @options.pipe then
- @res << "<span><a href=\"##{label}\">&para;</a>"
- @res << " <a href=\"#documentation\">&uarr;</a></span>"
- end
- @res << "</h#{level}>\n"
+ def accept_heading(heading)
+ @res << convert_heading(heading.level, @am.flow(heading.text))
end
- ##
- # Adds +raw+ to the output
-
def accept_raw raw
@res << raw.parts.join("\n")
end
- # :section: Utilities
+ private
##
- # CGI-escapes +text+
+ # Converts string +item+
- def convert_string(text)
- CGI.escapeHTML text
+ def convert_string(item)
+ in_tt? ? convert_string_simple(item) : convert_string_fancy(item)
end
##
- # Generate a link to +url+ with content +text+. Handles the special cases
- # for img: and link: described under handle_special_HYPERLINK
+ # Escapes HTML in +item+
- def gen_url url, text
- scheme, url, id = parse_url url
+ def convert_string_simple(item)
+ CGI.escapeHTML item
+ end
- if %w[http https link].include?(scheme) and
- url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then
- "<img src=\"#{url}\" />"
- else
- "<a#{id} href=\"#{url}\">#{text.sub(%r{^#{scheme}:/*}i, '')}</a>"
- end
+ ##
+ # Converts ampersand, dashes, elipsis, quotes, copyright and registered
+ # trademark symbols to HTML escaped Unicode.
+
+ 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
##
- # Determines the HTML list element for +list_type+ and +open_tag+
+ # Converts headings to hN elements
- def html_list_name(list_type, open_tag)
- tags = LIST_TYPE_TO_HTML[list_type]
- raise RDoc::Error, "Invalid list type: #{list_type.inspect}" unless tags
- tags[open_tag ? 0 : 1]
+ def convert_heading(level, flow)
+ [annotate("<h#{level}>"),
+ convert_flow(flow),
+ annotate("</h#{level}>\n")].join
end
##
- # Maps attributes to HTML tags
+ # Determins the HTML list element for +list_type+ and +open_tag+
- def init_tags
- add_tag :BOLD, "<strong>", "</strong>"
- add_tag :TT, "<code>", "</code>"
- add_tag :EM, "<em>", "</em>"
+ def html_list_name(list_type, open_tag)
+ tags = LIST_TYPE_TO_HTML[list_type]
+ raise RDoc::Error, "Invalid list type: #{list_type.inspect}" unless tags
+ annotate tags[open_tag ? 0 : 1]
end
##
- # Returns the HTML tag for +list_type+, possible using a label from
- # +list_item+
+ # Starts a list item
def list_item_start(list_item, list_type)
case list_type
when :BULLET, :LALPHA, :NUMBER, :UALPHA then
- "<li>"
- when :LABEL, :NOTE then
- Array(list_item.label).map do |label|
- "<dt>#{to_html label}\n"
- end.join << "<dd>"
+ annotate("<li>")
+
+ when :LABEL then
+ annotate("<dt>") +
+ convert_flow(@am.flow(list_item.label)) +
+ annotate("</dt>") +
+ annotate("<dd>")
+
+ when :NOTE then
+ annotate("<tr>") +
+ annotate("<td valign=\"top\">") +
+ convert_flow(@am.flow(list_item.label)) +
+ annotate("</td>") +
+ annotate("<td>")
else
raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
end
end
##
- # Returns the HTML end-tag for +list_type+
+ # Ends a list item
def list_end_for(list_type)
case list_type
when :BULLET, :LALPHA, :NUMBER, :UALPHA then
"</li>"
- when :LABEL, :NOTE then
+ when :LABEL then
"</dd>"
+ when :NOTE then
+ "</td></tr>"
else
raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
end
end
- ##
- # Returns true if Ripper is available it can create a sexp from +text+
-
- def parseable? text
- text =~ /\b(def|class|module|require) |=>|\{\s?\||do \|/ and
- text !~ /<%|%>/
- end
-
- ##
- # Converts +item+ to HTML using RDoc::Text#to_html
-
- def to_html item
- super convert_flow @am.flow item
- end
-
end
diff --git a/lib/rdoc/markup/to_html_crossref.rb b/lib/rdoc/markup/to_html_crossref.rb
index 405f68c14f..44e71486fb 100644
--- a/lib/rdoc/markup/to_html_crossref.rb
+++ b/lib/rdoc/markup/to_html_crossref.rb
@@ -1,156 +1,147 @@
+require 'rdoc/markup/to_html'
+
##
-# Subclass of the RDoc::Markup::ToHtml class that supports looking up method
-# names, classes, etc to create links. RDoc::CrossReference is used to
-# generate those links based on the current context.
+# Subclass of the RDoc::Markup::ToHtml class that supports looking up words
+# from a context. Those that are found will be hyperlinked.
class RDoc::Markup::ToHtmlCrossref < RDoc::Markup::ToHtml
- # :stopdoc:
- ALL_CROSSREF_REGEXP = RDoc::CrossReference::ALL_CROSSREF_REGEXP
- CLASS_REGEXP_STR = RDoc::CrossReference::CLASS_REGEXP_STR
- CROSSREF_REGEXP = RDoc::CrossReference::CROSSREF_REGEXP
- METHOD_REGEXP_STR = RDoc::CrossReference::METHOD_REGEXP_STR
- # :startdoc:
-
##
- # RDoc::CodeObject for generating references
+ # Regular expression to match class references
+ #
+ # 1) There can be a '\' in front of text to suppress any cross-references
+ # 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
- attr_accessor :context
+ CLASS_REGEXP_STR = '\\\\?((?:\:{2})?[A-Z]\w*(?:\:\:\w+)*)'
##
- # Should we show '#' characters on method references?
+ # Regular expression to match method references.
+ #
+ # See CLASS_REGEXP_STR
- attr_accessor :show_hash
+ METHOD_REGEXP_STR = '([a-z]\w*[!?=]?)(?:\([\w.+*/=<>-]*\))?'
##
- # Creates a new crossref resolver that generates links relative to +context+
- # which lives at +from_path+ in the generated files. '#' characters on
- # references are removed unless +show_hash+ is true. Only method names
- # preceded by '#' or '::' are linked, unless +hyperlink_all+ is true.
-
- def initialize(options, from_path, context, markup = nil)
- raise ArgumentError, 'from_path cannot be nil' if from_path.nil?
-
- super options, markup
-
- @context = context
- @from_path = from_path
- @hyperlink_all = @options.hyperlink_all
- @show_hash = @options.show_hash
+ # 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}
+
+ # Stand-alone method (proceeded by ::)
+ | ::#{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
- crossref_re = @hyperlink_all ? ALL_CROSSREF_REGEXP : CROSSREF_REGEXP
- @markup.add_special crossref_re, :CROSSREF
+ ##
+ # RDoc::CodeObject for generating references
- @cross_reference = RDoc::CrossReference.new @context
- end
+ attr_accessor :context
##
- # Creates a link to the reference +name+ if the name exists. If +text+ is
- # given it is used as the link text, otherwise +name+ is used.
-
- def cross_reference name, text = nil
- lookup = name
+ # Creates a new crossref resolver that generates links relative to +context+
+ # which lives at +from_path+ in the generated files. '#' characters on
+ # references are removed unless +show_hash+ is true.
- name = name[1..-1] unless @show_hash if name[0, 1] == '#'
+ def initialize(from_path, context, show_hash)
+ raise ArgumentError, 'from_path cannot be nil' if from_path.nil?
+ super()
- name = "#{CGI.unescape $'} at #{$1}" if name =~ /(.*[^#:])@/
+ @markup.add_special(CROSSREF_REGEXP, :CROSSREF)
- text = name unless text
+ @from_path = from_path
+ @context = context
+ @show_hash = show_hash
- link lookup, text
+ @seen = {}
end
##
# We're invoked when any text matches the CROSSREF pattern. If we find the
- # corresponding reference, generate a link. If the name we're looking for
- # contains no punctuation, we look for it up the module/class chain. For
- # example, ToHtml is found, even without the <tt>RDoc::Markup::</tt> prefix,
- # because we look for it in module Markup first.
+ # 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
- return name if name =~ /@[\w-]+\.[\w-]/ # labels that look like emails
-
- unless @hyperlink_all then
- # 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/
- end
-
- cross_reference name
- end
-
- ##
- # Handles <tt>rdoc-ref:</tt> scheme links and allows RDoc::Markup::ToHtml to
- # handle other schemes.
-
- def handle_special_HYPERLINK special
- return cross_reference $' if special.text =~ /\Ardoc-ref:/
-
- super
- end
-
- ##
- # +special+ is an rdoc-schemed link that will be converted into a hyperlink.
- # For the rdoc-ref scheme the cross-reference will be looked up and the
- # given name will be used.
- #
- # All other contents are handled by
- # {the superclass}[rdoc-ref:RDoc::Markup::ToHtml#handle_special_RDOCLINK]
+ # 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/
- def handle_special_RDOCLINK special
- url = special.text
+ return @seen[name] if @seen.include? name
- case url
- when /\Ardoc-ref:/ then
- cross_reference $'
- else
- super
- end
- end
-
- ##
- # Generates links for <tt>rdoc-ref:</tt> scheme URLs and allows
- # RDoc::Markup::ToHtml to handle other schemes.
-
- def gen_url url, text
- return super unless url =~ /\Ardoc-ref:/
-
- cross_reference $', text
- end
-
- ##
- # Creates an HTML link to +name+ with the given +text+.
-
- def link name, text
- original_name = name
+ lookup = name
- if name =~ /(.*[^#:])@/ then
- name = $1
- label = $'
+ name = name[0, 1] unless @show_hash if name[0, 1] == '#'
+
+ # 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
+ type = $2
+ type = '#' if type == '.'
+ method = "#{type}#{$3}"
+ ref = @context.find_symbol container, method
end
- ref = @cross_reference.resolve name, text
+ ref = @context.find_symbol lookup unless ref
- text = ref.output_name @context if
- RDoc::MethodAttr === ref and text == original_name
+ out = if lookup == '\\' then
+ lookup
+ elsif lookup =~ /^\\/ then
+ $'
+ elsif ref and ref.document_self then
+ "<a href=\"#{ref.as_href @from_path}\">#{name}</a>"
+ else
+ name
+ end
- case ref
- when String then
- ref
- else
- path = ref.as_href @from_path
+ @seen[name] = out
- if path =~ /#/ then
- path << "-label-#{label}"
- else
- path << "#label-#{label}"
- end if label
-
- "<a href=\"#{path}\">#{text}</a>"
- end
+ out
end
end
diff --git a/lib/rdoc/markup/to_html_snippet.rb b/lib/rdoc/markup/to_html_snippet.rb
deleted file mode 100644
index 4ad0a9a4b9..0000000000
--- a/lib/rdoc/markup/to_html_snippet.rb
+++ /dev/null
@@ -1,284 +0,0 @@
-##
-# Outputs RDoc markup as paragraphs with inline markup only.
-
-class RDoc::Markup::ToHtmlSnippet < RDoc::Markup::ToHtml
-
- ##
- # After this many characters the input will be cut off.
-
- attr_reader :character_limit
-
- ##
- # The number of characters seen so far.
-
- attr_reader :characters # :nodoc:
-
- ##
- # The attribute bitmask
-
- attr_reader :mask
-
- ##
- # After this many paragraphs the input will be cut off.
-
- attr_reader :paragraph_limit
-
- ##
- # Count of paragraphs found
-
- attr_reader :paragraphs
-
- ##
- # Creates a new ToHtmlSnippet formatter that will cut off the input on the
- # next word boundary after the given number of +characters+ or +paragraphs+
- # of text have been encountered.
-
- def initialize options, characters = 100, paragraphs = 3, markup = nil
- super options, markup
-
- @character_limit = characters
- @paragraph_limit = paragraphs
-
- @characters = 0
- @mask = 0
- @paragraphs = 0
-
- @markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
- end
-
- ##
- # Adds +heading+ to the output as a paragraph
-
- def accept_heading heading
- @res << "<p>#{to_html heading.text}\n"
-
- add_paragraph
- end
-
- ##
- # Raw sections are untrusted and ignored
-
- alias accept_raw ignore
-
- ##
- # Rules are ignored
-
- alias accept_rule ignore
-
- def accept_paragraph paragraph
- para = @in_list_entry.last || "<p>"
-
- text = paragraph.text @hard_break
-
- @res << "#{para}#{wrap to_html text}\n"
-
- add_paragraph
- end
-
- ##
- # Finishes consumption of +list_item+
-
- def accept_list_item_end list_item
- end
-
- ##
- # Prepares the visitor for consuming +list_item+
-
- def accept_list_item_start list_item
- @res << list_item_start(list_item, @list.last)
- end
-
- ##
- # Prepares the visitor for consuming +list+
-
- def accept_list_start list
- @list << list.type
- @res << html_list_name(list.type, true)
- @in_list_entry.push ''
- end
-
- ##
- # Adds +verbatim+ to the output
-
- def accept_verbatim verbatim
- throw :done if @characters >= @character_limit
- input = verbatim.text.rstrip
-
- text = truncate input
- text << ' ...' unless text == input
-
- super RDoc::Markup::Verbatim.new text
-
- add_paragraph
- end
-
- ##
- # Prepares the visitor for HTML snippet generation
-
- def start_accepting
- super
-
- @characters = 0
- end
-
- ##
- # Removes escaping from the cross-references in +special+
-
- def handle_special_CROSSREF special
- special.text.sub(/\A\\/, '')
- end
-
- ##
- # +special+ is a <code><br></code>
-
- def handle_special_HARD_BREAK special
- @characters -= 4
- '<br>'
- end
-
- ##
- # Lists are paragraphs, but notes and labels have a separator
-
- def list_item_start list_item, list_type
- throw :done if @characters >= @character_limit
-
- case list_type
- when :BULLET, :LALPHA, :NUMBER, :UALPHA then
- "<p>"
- when :LABEL, :NOTE then
- labels = Array(list_item.label).map do |label|
- to_html label
- end.join ', '
-
- labels << " &mdash; " unless labels.empty?
-
- start = "<p>#{labels}"
- @characters += 1 # try to include the label
- start
- else
- raise RDoc::Error, "Invalid list type: #{list_type.inspect}"
- end
- end
-
- ##
- # Returns just the text of +link+, +url+ is only used to determine the link
- # type.
-
- def gen_url url, text
- if url =~ /^rdoc-label:([^:]*)(?::(.*))?/ then
- type = "link"
- elsif url =~ /([A-Za-z]+):(.*)/ then
- type = $1
- else
- type = "http"
- end
-
- if (type == "http" or type == "https" or type == "link") and
- url =~ /\.(gif|png|jpg|jpeg|bmp)$/ then
- ''
- else
- text.sub(%r%^#{type}:/*%, '')
- end
- end
-
- ##
- # In snippets, there are no lists
-
- def html_list_name list_type, open_tag
- ''
- end
-
- ##
- # Throws +:done+ when paragraph_limit paragraphs have been encountered
-
- def add_paragraph
- @paragraphs += 1
-
- throw :done if @paragraphs >= @paragraph_limit
- end
-
- ##
- # Marks up +content+
-
- def convert content
- catch :done do
- return super
- end
-
- end_accepting
- end
-
- ##
- # Converts flow items +flow+
-
- def convert_flow flow
- throw :done if @characters >= @character_limit
-
- res = []
- @mask = 0
-
- flow.each do |item|
- case item
- when RDoc::Markup::AttrChanger then
- off_tags res, item
- on_tags res, item
- when String then
- text = convert_string item
- res << truncate(text)
- when RDoc::Markup::Special then
- text = convert_special item
- res << truncate(text)
- else
- raise "Unknown flow element: #{item.inspect}"
- end
-
- if @characters >= @character_limit then
- off_tags res, RDoc::Markup::AttrChanger.new(0, @mask)
- break
- end
- end
-
- res << ' ...' if @characters >= @character_limit
-
- res.join
- end
-
- ##
- # Maintains a bitmask to allow HTML elements to be closed properly. See
- # RDoc::Markup::Formatter.
-
- def on_tags res, item
- @mask ^= item.turn_on
-
- super
- end
-
- ##
- # Maintains a bitmask to allow HTML elements to be closed properly. See
- # RDoc::Markup::Formatter.
-
- def off_tags res, item
- @mask ^= item.turn_off
-
- super
- end
-
- ##
- # Truncates +text+ at the end of the first word after the character_limit.
-
- def truncate text
- length = text.length
- characters = @characters
- @characters += length
-
- return text if @characters < @character_limit
-
- remaining = @character_limit - characters
-
- text =~ /\A(.{#{remaining},}?)(\s|$)/m # TODO word-break instead of \s?
-
- $1
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_joined_paragraph.rb b/lib/rdoc/markup/to_joined_paragraph.rb
deleted file mode 100644
index 6982d86697..0000000000
--- a/lib/rdoc/markup/to_joined_paragraph.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-##
-# Joins the parts of an RDoc::Markup::Paragraph into a single String.
-#
-# This allows for easier maintenance and testing of Markdown support.
-#
-# This formatter only works on Paragraph instances. Attempting to process
-# other markup syntax items will not work.
-
-class RDoc::Markup::ToJoinedParagraph < RDoc::Markup::Formatter
-
- def initialize # :nodoc:
- super nil
- end
-
- def start_accepting # :nodoc:
- end
-
- def end_accepting # :nodoc:
- end
-
- ##
- # Converts the parts of +paragraph+ to a single entry.
-
- def accept_paragraph paragraph
- parts = []
- string = false
-
- paragraph.parts.each do |part|
- if String === part then
- if string then
- string << part
- else
- parts << part
- string = part
- end
- else
- parts << part
- string = false
- end
- end
-
- parts = parts.map do |part|
- if String === part then
- part.rstrip
- else
- part
- end
- end
-
- # TODO use Enumerable#chunk when ruby 1.8 support is dropped
- #parts = paragraph.parts.chunk do |part|
- # String === part
- #end.map do |string, chunk|
- # string ? chunk.join.rstrip : chunk
- #end.flatten
-
- paragraph.parts.replace parts
- end
-
- alias accept_block_quote ignore
- alias accept_heading ignore
- alias accept_list_end ignore
- alias accept_list_item_end ignore
- alias accept_list_item_start ignore
- alias accept_list_start ignore
- alias accept_raw ignore
- alias accept_rule ignore
- alias accept_verbatim ignore
-
-end
-
diff --git a/lib/rdoc/markup/to_label.rb b/lib/rdoc/markup/to_label.rb
deleted file mode 100644
index ace89c324a..0000000000
--- a/lib/rdoc/markup/to_label.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require 'cgi'
-
-##
-# Creates HTML-safe labels suitable for use in id attributes. Tidylinks are
-# converted to their link part and cross-reference links have the suppression
-# marks removed (\\SomeClass is converted to SomeClass).
-
-class RDoc::Markup::ToLabel < RDoc::Markup::Formatter
-
- attr_reader :res # :nodoc:
-
- ##
- # Creates a new formatter that will output HTML-safe labels
-
- def initialize markup = nil
- super nil, markup
-
- @markup.add_special RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF
- @markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\])/, :TIDYLINK)
-
- add_tag :BOLD, '', ''
- add_tag :TT, '', ''
- add_tag :EM, '', ''
-
- @res = []
- end
-
- ##
- # Converts +text+ to an HTML-safe label
-
- def convert text
- label = convert_flow @am.flow text
-
- CGI.escape label
- end
-
- ##
- # Converts the CROSSREF +special+ to plain text, removing the suppression
- # marker, if any
-
- def handle_special_CROSSREF special
- text = special.text
-
- text.sub(/^\\/, '')
- end
-
- ##
- # Converts the TIDYLINK +special+ to just the text part
-
- def handle_special_TIDYLINK special
- text = special.text
-
- return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
-
- $1
- end
-
- alias accept_blank_line ignore
- alias accept_block_quote ignore
- alias accept_heading ignore
- alias accept_list_end ignore
- alias accept_list_item_end ignore
- alias accept_list_item_start ignore
- alias accept_list_start ignore
- alias accept_paragraph ignore
- alias accept_raw ignore
- alias accept_rule ignore
- alias accept_verbatim ignore
- alias end_accepting ignore
- alias handle_special_HARD_BREAK ignore
- alias start_accepting ignore
-
-end
-
diff --git a/lib/rdoc/markup/to_markdown.rb b/lib/rdoc/markup/to_markdown.rb
deleted file mode 100644
index 62ad3ad13e..0000000000
--- a/lib/rdoc/markup/to_markdown.rb
+++ /dev/null
@@ -1,189 +0,0 @@
-# :markup: markdown
-
-##
-# Outputs parsed markup as Markdown
-
-class RDoc::Markup::ToMarkdown < RDoc::Markup::ToRdoc
-
- ##
- # Creates a new formatter that will output Markdown format text
-
- def initialize markup = nil
- super
-
- @headings[1] = ['# ', '']
- @headings[2] = ['## ', '']
- @headings[3] = ['### ', '']
- @headings[4] = ['#### ', '']
- @headings[5] = ['##### ', '']
- @headings[6] = ['###### ', '']
-
- add_special_RDOCLINK
- add_special_TIDYLINK
-
- @hard_break = " \n"
- end
-
- ##
- # Maps attributes to HTML sequences
-
- def init_tags
- add_tag :BOLD, '**', '**'
- add_tag :EM, '*', '*'
- add_tag :TT, '`', '`'
- end
-
- ##
- # Adds a newline to the output
-
- def handle_special_HARD_BREAK special
- " \n"
- end
-
- ##
- # Finishes consumption of `list`
-
- def accept_list_end list
- @res << "\n"
-
- super
- end
-
- ##
- # Finishes consumption of `list_item`
-
- def accept_list_item_end list_item
- width = case @list_type.last
- when :BULLET then
- 4
- when :NOTE, :LABEL then
- use_prefix
-
- 4
- else
- @list_index[-1] = @list_index.last.succ
- 4
- end
-
- @indent -= width
- end
-
- ##
- # Prepares the visitor for consuming `list_item`
-
- def accept_list_item_start list_item
- type = @list_type.last
-
- case type
- when :NOTE, :LABEL then
- bullets = Array(list_item.label).map do |label|
- attributes(label).strip
- end.join "\n"
-
- bullets << "\n:"
-
- @prefix = ' ' * @indent
- @indent += 4
- @prefix << bullets + (' ' * (@indent - 1))
- else
- bullet = type == :BULLET ? '*' : @list_index.last.to_s + '.'
- @prefix = (' ' * @indent) + bullet.ljust(4)
-
- @indent += 4
- end
- end
-
- ##
- # Prepares the visitor for consuming `list`
-
- def accept_list_start list
- case list.type
- when :BULLET, :LABEL, :NOTE then
- @list_index << nil
- when :LALPHA, :NUMBER, :UALPHA then
- @list_index << 1
- else
- raise RDoc::Error, "invalid list type #{list.type}"
- end
-
- @list_width << 4
- @list_type << list.type
- end
-
- ##
- # Adds `rule` to the output
-
- def accept_rule rule
- use_prefix or @res << ' ' * @indent
- @res << '-' * 3
- @res << "\n"
- end
-
- ##
- # Outputs `verbatim` indented 4 columns
-
- def accept_verbatim verbatim
- indent = ' ' * (@indent + 4)
-
- verbatim.parts.each do |part|
- @res << indent unless part == "\n"
- @res << part
- end
-
- @res << "\n" unless @res =~ /\n\z/
- end
-
- ##
- # Creates a Markdown-style URL from +url+ with +text+.
-
- def gen_url url, text
- scheme, url, = parse_url url
-
- "[#{text.sub(%r{^#{scheme}:/*}i, '')}](#{url})"
- end
-
- ##
- # Handles <tt>rdoc-</tt> type links for footnotes.
-
- def handle_rdoc_link url
- case url
- when /\Ardoc-ref:/ then
- $'
- when /\Ardoc-label:footmark-(\d+)/ then
- "[^#{$1}]:"
- when /\Ardoc-label:foottext-(\d+)/ then
- "[^#{$1}]"
- when /\Ardoc-label:label-/ then
- gen_url url, $'
- when /\Ardoc-[a-z]+:/ then
- $'
- end
- end
-
- ##
- # Converts the RDoc markup tidylink into a Markdown.style link.
-
- def handle_special_TIDYLINK special
- text = special.text
-
- return text unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
-
- label = $1
- url = $2
-
- if url =~ /^rdoc-label:foot/ then
- handle_rdoc_link url
- else
- gen_url url, label
- end
- end
-
- ##
- # Converts the rdoc-...: links into a Markdown.style links.
-
- def handle_special_RDOCLINK special
- handle_rdoc_link special.text
- end
-
-end
-
diff --git a/lib/rdoc/markup/to_rdoc.rb b/lib/rdoc/markup/to_rdoc.rb
index f16b4ed5a3..867715bb1e 100644
--- a/lib/rdoc/markup/to_rdoc.rb
+++ b/lib/rdoc/markup/to_rdoc.rb
@@ -1,51 +1,25 @@
+require 'rdoc/markup/inline'
+
##
# Outputs RDoc markup as RDoc markup! (mostly)
class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
- ##
- # Current indent amount for output in characters
-
attr_accessor :indent
-
- ##
- # Output width in characters
-
- attr_accessor :width
-
- ##
- # Stack of current list indexes for alphabetic and numeric lists
-
attr_reader :list_index
-
- ##
- # Stack of list types
-
attr_reader :list_type
-
- ##
- # Stack of list widths for indentation
-
attr_reader :list_width
-
- ##
- # Prefix for the next list item. See #use_prefix
-
attr_reader :prefix
-
- ##
- # Output accumulator
-
attr_reader :res
- ##
- # Creates a new formatter that will output (mostly) \RDoc markup
+ def initialize
+ super
- def initialize markup = nil
- super nil, markup
+ @markup.add_special(/\\[^\s]/, :SUPPRESSED_CROSSREF)
- @markup.add_special(/\\\S/, :SUPPRESSED_CROSSREF)
@width = 78
+ @prefix = ''
+
init_tags
@headings = {}
@@ -57,12 +31,10 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
@headings[4] = ['==== ', '']
@headings[5] = ['===== ', '']
@headings[6] = ['====== ', '']
-
- @hard_break = "\n"
end
##
- # Maps attributes to HTML sequences
+ # Maps attributes to ANSI sequences
def init_tags
add_tag :BOLD, "<b>", "</b>"
@@ -70,31 +42,10 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
add_tag :EM, "<em>", "</em>"
end
- ##
- # Adds +blank_line+ to the output
-
def accept_blank_line blank_line
@res << "\n"
end
- ##
- # Adds +paragraph+ to the output
-
- def accept_block_quote block_quote
- @indent += 2
-
- block_quote.parts.each do |part|
- @prefix = '> '
-
- part.accept self
- end
-
- @indent -= 2
- end
-
- ##
- # Adds +heading+ to the output
-
def accept_heading heading
use_prefix or @res << ' ' * @indent
@res << @headings[heading.level][0]
@@ -103,28 +54,17 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
@res << "\n"
end
- ##
- # Finishes consumption of +list+
-
def accept_list_end list
@list_index.pop
@list_type.pop
@list_width.pop
end
- ##
- # Finishes consumption of +list_item+
-
def accept_list_item_end list_item
width = case @list_type.last
when :BULLET then
2
when :NOTE, :LABEL then
- if @prefix then
- @res << @prefix.strip
- @prefix = nil
- end
-
@res << "\n"
2
else
@@ -136,34 +76,29 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
@indent -= width
end
- ##
- # Prepares the visitor for consuming +list_item+
-
def accept_list_item_start list_item
- type = @list_type.last
-
- case type
+ bullet = case @list_type.last
+ when :BULLET then
+ '*'
+ when :NOTE, :LABEL then
+ attributes(list_item.label) + ":\n"
+ else
+ @list_index.last.to_s + '.'
+ end
+
+ case @list_type.last
when :NOTE, :LABEL then
- bullets = Array(list_item.label).map do |label|
- attributes(label).strip
- end.join "\n"
-
- bullets << ":\n" unless bullets.empty?
-
- @prefix = ' ' * @indent
@indent += 2
- @prefix << bullets + (' ' * @indent)
+ @prefix = bullet + (' ' * @indent)
else
- bullet = type == :BULLET ? '*' : @list_index.last.to_s + '.'
@prefix = (' ' * @indent) + bullet.ljust(bullet.length + 1)
+
width = bullet.length + 1
+
@indent += width
end
end
- ##
- # Prepares the visitor for consuming +list+
-
def accept_list_start list
case list.type
when :BULLET then
@@ -188,34 +123,14 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
@list_type << list.type
end
- ##
- # Adds +paragraph+ to the output
-
def accept_paragraph paragraph
- text = paragraph.text @hard_break
- wrap attributes text
- end
-
- ##
- # Adds +paragraph+ to the output
-
- def accept_indented_paragraph paragraph
- @indent += paragraph.indent
- text = paragraph.text @hard_break
- wrap attributes text
- @indent -= paragraph.indent
+ wrap attributes(paragraph.text)
end
- ##
- # Adds +raw+ to the output
-
def accept_raw raw
@res << raw.parts.join("\n")
end
- ##
- # Adds +rule+ to the output
-
def accept_rule rule
use_prefix or @res << ' ' * @indent
@res << '-' * (@width - @indent)
@@ -223,53 +138,58 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
end
##
- # Outputs +verbatim+ indented 2 columns
+ # Outputs +verbatim+ flush left and indented 2 columns
def accept_verbatim verbatim
indent = ' ' * (@indent + 2)
+ lines = []
+ current_line = []
+
+ # split into lines
verbatim.parts.each do |part|
- @res << indent unless part == "\n"
- @res << part
+ current_line << part
+
+ if part == "\n" then
+ lines << current_line
+ current_line = []
+ end
end
- @res << "\n" unless @res =~ /\n\z/
- end
+ lines << current_line unless current_line.empty?
- ##
- # Applies attribute-specific markup to +text+ using RDoc::AttributeManager
+ # calculate margin
+ indented = lines.select { |line| line != ["\n"] }
+ margin = indented.map { |line| line.first.length }.min
+
+ # flush left
+ indented.each { |line| line[0][0...margin] = '' }
+
+ # output
+ use_prefix or @res << indent # verbatim is unlikely to have prefix
+ @res << lines.shift.join
+
+ lines.each do |line|
+ @res << indent unless line == ["\n"]
+ @res << line.join
+ end
+
+ @res << "\n"
+ end
def attributes text
flow = @am.flow text.dup
convert_flow flow
end
- ##
- # Returns the generated output
-
def end_accepting
@res.join
end
- ##
- # Removes preceding \\ from the suppressed crossref +special+
-
def handle_special_SUPPRESSED_CROSSREF special
- text = special.text
- text = text.sub('\\', '') unless in_tt?
- text
+ special.text.sub(/\\/, '')
end
- ##
- # Adds a newline to the output
-
- def handle_special_HARD_BREAK special
- "\n"
- end
-
- ##
- # Prepares the visitor for text generation
-
def start_accepting
@res = [""]
@indent = 0
@@ -280,20 +200,14 @@ class RDoc::Markup::ToRdoc < RDoc::Markup::Formatter
@list_width = []
end
- ##
- # Adds the stored #prefix to the output and clears it. Lists generate a
- # prefix for later consumption.
-
def use_prefix
- prefix, @prefix = @prefix, nil
+ prefix = @prefix
+ @prefix = nil
@res << prefix if prefix
prefix
end
- ##
- # Wraps +text+ to #width
-
def wrap text
return unless text && !text.empty?
diff --git a/lib/rdoc/markup/to_table_of_contents.rb b/lib/rdoc/markup/to_table_of_contents.rb
deleted file mode 100644
index 2e0f98cfeb..0000000000
--- a/lib/rdoc/markup/to_table_of_contents.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-##
-# Extracts just the RDoc::Markup::Heading elements from a
-# RDoc::Markup::Document to help build a table of contents
-
-class RDoc::Markup::ToTableOfContents < RDoc::Markup::Formatter
-
- @to_toc = nil
-
- ##
- # Singleton for table-of-contents generation
-
- def self.to_toc
- @to_toc ||= new
- end
-
- ##
- # Output accumulator
-
- attr_reader :res
-
- ##
- # Omits headings with a level less than the given level.
-
- attr_accessor :omit_headings_below
-
- def initialize # :nodoc:
- super nil
-
- @omit_headings_below = nil
- end
-
- ##
- # Adds +document+ to the output, using its heading cutoff if present
-
- def accept_document document
- @omit_headings_below = document.omit_headings_below
-
- super
- end
-
- ##
- # Adds +heading+ to the table of contents
-
- def accept_heading heading
- @res << heading unless suppressed? heading
- end
-
- ##
- # Returns the table of contents
-
- def end_accepting
- @res
- end
-
- ##
- # Prepares the visitor for text generation
-
- def start_accepting
- @omit_headings_below = nil
- @res = []
- end
-
- ##
- # Returns true if +heading+ is below the display threshold
-
- def suppressed? heading
- return false unless @omit_headings_below
-
- heading.level > @omit_headings_below
- end
-
- # :stopdoc:
- alias accept_block_quote ignore
- alias accept_raw ignore
- alias accept_rule ignore
- alias accept_blank_line ignore
- alias accept_paragraph ignore
- alias accept_verbatim ignore
- alias accept_list_end ignore
- alias accept_list_item_start ignore
- alias accept_list_item_end ignore
- alias accept_list_end_bullet ignore
- alias accept_list_start ignore
- # :startdoc:
-
-end
-
diff --git a/lib/rdoc/markup/to_test.rb b/lib/rdoc/markup/to_test.rb
index c51f64b917..0afdb96a18 100644
--- a/lib/rdoc/markup/to_test.rb
+++ b/lib/rdoc/markup/to_test.rb
@@ -1,10 +1,11 @@
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
+
##
# This Markup outputter is used for testing purposes.
class RDoc::Markup::ToTest < RDoc::Markup::Formatter
- # :stopdoc:
-
##
# :section: Visitor
@@ -18,15 +19,11 @@ class RDoc::Markup::ToTest < RDoc::Markup::Formatter
end
def accept_paragraph(paragraph)
- @res << convert_flow(@am.flow(paragraph.text))
- end
-
- def accept_raw raw
- @res << raw.parts.join
+ @res << paragraph.text
end
def accept_verbatim(verbatim)
- @res << verbatim.text.gsub(/^(\S)/, ' \1')
+ @res << verbatim.text
end
def accept_list_start(list)
@@ -63,7 +60,5 @@ class RDoc::Markup::ToTest < RDoc::Markup::Formatter
@res << '-' * rule.weight
end
- # :startdoc:
-
end
diff --git a/lib/rdoc/markup/to_tt_only.rb b/lib/rdoc/markup/to_tt_only.rb
deleted file mode 100644
index e2da20c6f3..0000000000
--- a/lib/rdoc/markup/to_tt_only.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-##
-# Extracts sections of text enclosed in plus, tt or code. Used to discover
-# undocumented parameters.
-
-class RDoc::Markup::ToTtOnly < RDoc::Markup::Formatter
-
- ##
- # Stack of list types
-
- attr_reader :list_type
-
- ##
- # Output accumulator
-
- attr_reader :res
-
- ##
- # Creates a new tt-only formatter.
-
- def initialize markup = nil
- super nil, markup
-
- add_tag :TT, nil, nil
- end
-
- ##
- # Adds tts from +block_quote+ to the output
-
- def accept_block_quote block_quote
- tt_sections block_quote.text
- end
-
- ##
- # Pops the list type for +list+ from #list_type
-
- def accept_list_end list
- @list_type.pop
- end
-
- ##
- # Pushes the list type for +list+ onto #list_type
-
- def accept_list_start list
- @list_type << list.type
- end
-
- ##
- # Prepares the visitor for consuming +list_item+
-
- def accept_list_item_start list_item
- case @list_type.last
- when :NOTE, :LABEL then
- Array(list_item.label).map do |label|
- tt_sections label
- end.flatten
- end
- end
-
- ##
- # Adds +paragraph+ to the output
-
- def accept_paragraph paragraph
- tt_sections(paragraph.text)
- end
-
- ##
- # Does nothing to +markup_item+ because it doesn't have any user-built
- # content
-
- def do_nothing markup_item
- end
-
- alias accept_blank_line do_nothing # :nodoc:
- alias accept_heading do_nothing # :nodoc:
- alias accept_list_item_end do_nothing # :nodoc:
- alias accept_raw do_nothing # :nodoc:
- alias accept_rule do_nothing # :nodoc:
- alias accept_verbatim do_nothing # :nodoc:
-
- ##
- # Extracts tt sections from +text+
-
- def tt_sections text
- flow = @am.flow text.dup
-
- flow.each do |item|
- case item
- when String then
- @res << item if in_tt?
- when RDoc::Markup::AttrChanger then
- off_tags res, item
- on_tags res, item
- when RDoc::Markup::Special then
- @res << convert_special(item) if in_tt? # TODO can this happen?
- else
- raise "Unknown flow element: #{item.inspect}"
- end
- end
-
- res
- end
-
- ##
- # Returns an Array of items that were wrapped in plus, tt or code.
-
- def end_accepting
- @res.compact
- end
-
- ##
- # Prepares the visitor for gathering tt sections
-
- def start_accepting
- @res = []
-
- @list_type = []
- end
-
-end
-
diff --git a/lib/rdoc/markup/verbatim.rb b/lib/rdoc/markup/verbatim.rb
index 3886bbe8a5..c684d78765 100644
--- a/lib/rdoc/markup/verbatim.rb
+++ b/lib/rdoc/markup/verbatim.rb
@@ -3,24 +3,6 @@
class RDoc::Markup::Verbatim < RDoc::Markup::Raw
- ##
- # Format of this verbatim section
-
- attr_accessor :format
-
- def initialize *parts # :nodoc:
- super
-
- @format = nil
- end
-
- def == other # :nodoc:
- super and @format == other.format
- end
-
- ##
- # Calls #accept_verbatim on +visitor+
-
def accept visitor
visitor.accept_verbatim self
end
@@ -35,43 +17,20 @@ class RDoc::Markup::Verbatim < RDoc::Markup::Raw
@parts.each do |part|
case part
- when /^\s*\n/ then
+ when /\n/ then
newlines += 1
- parts << part if newlines == 1
+ parts << part if newlines <= 2
else
newlines = 0
parts << part
end
end
- parts.pop if parts.last =~ /\A\r?\n\z/
+ parts.slice!(-1) if parts[-2..-1] == ["\n", "\n"]
@parts = parts
end
- def pretty_print q # :nodoc:
- self.class.name =~ /.*::(\w{1,4})/i
-
- q.group 2, "[#{$1.downcase}: ", ']' do
- if @format then
- q.text "format: #{@format}"
- q.breakable
- end
-
- q.seplist @parts do |part|
- q.pp part
- end
- end
- end
-
- ##
- # Is this verbatim section ruby code?
-
- def ruby?
- @format ||= nil # TODO for older ri data, switch the tree to marshal_dump
- @format == :ruby
- end
-
##
# The text of the section
diff --git a/lib/rdoc/meta_method.rb b/lib/rdoc/meta_method.rb
index 68ba8109e0..e0c065c2ba 100644
--- a/lib/rdoc/meta_method.rb
+++ b/lib/rdoc/meta_method.rb
@@ -1,3 +1,5 @@
+require 'rdoc/any_method'
+
##
# MetaMethod represents a meta-programmed method
diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb
deleted file mode 100644
index 5021929ea0..0000000000
--- a/lib/rdoc/method_attr.rb
+++ /dev/null
@@ -1,398 +0,0 @@
-##
-# Abstract class representing either a method or an attribute.
-
-class RDoc::MethodAttr < RDoc::CodeObject
-
- include Comparable
-
- ##
- # Name of this method/attribute.
-
- attr_accessor :name
-
- ##
- # public, protected, private
-
- attr_accessor :visibility
-
- ##
- # Is this a singleton method/attribute?
-
- attr_accessor :singleton
-
- ##
- # Source file token stream
-
- attr_reader :text
-
- ##
- # Array of other names for this method/attribute
-
- attr_reader :aliases
-
- ##
- # The method/attribute we're aliasing
-
- attr_accessor :is_alias_for
-
- #--
- # The attributes below are for AnyMethod only.
- # They are left here for the time being to
- # allow ri to operate.
- # TODO modify ri to avoid calling these on attributes.
- #++
-
- ##
- # Parameters yielded by the called block
-
- attr_reader :block_params
-
- ##
- # Parameters for this method
-
- attr_accessor :params
-
- ##
- # Different ways to call this method
-
- attr_accessor :call_seq
-
- ##
- # The call_seq or the param_seq with method name, if there is no call_seq.
-
- attr_reader :arglists
-
- ##
- # Pretty parameter list for this method
-
- attr_reader :param_seq
-
-
- ##
- # Creates a new MethodAttr from token stream +text+ and method or attribute
- # name +name+.
- #
- # Usually this is called by super from a subclass.
-
- def initialize text, name
- super()
-
- @text = text
- @name = name
-
- @aliases = []
- @is_alias_for = nil
- @parent_name = nil
- @singleton = nil
- @visibility = :public
- @see = false
-
- @arglists = nil
- @block_params = nil
- @call_seq = nil
- @param_seq = nil
- @params = nil
- end
-
- ##
- # Order by #singleton then #name
-
- def <=>(other)
- [ @singleton ? 0 : 1, name] <=>
- [other.singleton ? 0 : 1, other.name]
- end
-
- def == other # :nodoc:
- super or self.class == other.class and full_name == other.full_name
- end
-
- ##
- # A method/attribute is documented if any of the following is true:
- # - it was marked with :nodoc:;
- # - it has a comment;
- # - it is an alias for a documented method;
- # - it has a +#see+ method that is documented.
-
- def documented?
- super or
- (is_alias_for and is_alias_for.documented?) or
- (see and see.documented?)
- end
-
- ##
- # A method/attribute to look at,
- # in particular if this method/attribute has no documentation.
- #
- # It can be a method/attribute of the superclass or of an included module,
- # including the Kernel module, which is always appended to the included
- # modules.
- #
- # Returns +nil+ if there is no such method/attribute.
- # The +#is_alias_for+ method/attribute, if any, is not included.
- #
- # Templates may generate a "see also ..." if this method/attribute
- # has documentation, and "see ..." if it does not.
-
- def see
- @see = find_see if @see == false
- @see
- end
-
- ##
- # Sets the store for this class or module and its contained code objects.
-
- def store= store
- super
-
- @file = @store.add_file @file.full_name if @file
- end
-
- def find_see # :nodoc:
- return nil if singleton || is_alias_for
-
- # look for the method
- other = find_method_or_attribute name
- return other if other
-
- # if it is a setter, look for a getter
- return nil unless name =~ /[a-z_]=$/i # avoid == or ===
- return find_method_or_attribute name[0..-2]
- end
-
- def find_method_or_attribute name # :nodoc:
- return nil unless parent.respond_to? :ancestors
-
- searched = parent.ancestors
- kernel = @store.modules_hash['Kernel']
-
- searched << kernel if kernel &&
- parent != kernel && !searched.include?(kernel)
-
- searched.each do |ancestor|
- next if parent == ancestor
- next if String === ancestor
-
- other = ancestor.find_method_named('#' << name) ||
- ancestor.find_attribute_named(name)
-
- return other if other
- end
-
- nil
- end
-
- ##
- # Abstract method. Contexts in their building phase call this
- # to register a new alias for this known method/attribute.
- #
- # - creates a new AnyMethod/Attribute named <tt>an_alias.new_name</tt>;
- # - adds +self+ as an alias for the new method or attribute
- # - adds the method or attribute to #aliases
- # - adds the method or attribute to +context+.
-
- def add_alias(an_alias, context)
- raise NotImplementedError
- end
-
- ##
- # HTML fragment reference for this method
-
- def aref
- type = singleton ? 'c' : 'i'
- # % characters are not allowed in html names => dash instead
- "#{aref_prefix}-#{type}-#{html_name}"
- end
-
- ##
- # Prefix for +aref+, defined by subclasses.
-
- def aref_prefix
- raise NotImplementedError
- end
-
- ##
- # Attempts to sanitize the content passed by the ruby parser:
- # remove outer parentheses, etc.
-
- def block_params=(value)
- # 'yield.to_s' or 'assert yield, msg'
- return @block_params = '' if value =~ /^[\.,]/
-
- # remove trailing 'if/unless ...'
- return @block_params = '' if value =~ /^(if|unless)\s/
-
- value = $1.strip if value =~ /^(.+)\s(if|unless)\s/
-
- # outer parentheses
- value = $1 if value =~ /^\s*\((.*)\)\s*$/
- value = value.strip
-
- # proc/lambda
- return @block_params = $1 if value =~ /^(proc|lambda)(\s*\{|\sdo)/
-
- # surrounding +...+ or [...]
- value = $1.strip if value =~ /^\+(.*)\+$/
- value = $1.strip if value =~ /^\[(.*)\]$/
-
- return @block_params = '' if value.empty?
-
- # global variable
- return @block_params = 'str' if value =~ /^\$[&0-9]$/
-
- # wipe out array/hash indices
- value.gsub!(/(\w)\[[^\[]+\]/, '\1')
-
- # remove @ from class/instance variables
- value.gsub!(/@@?([a-z0-9_]+)/, '\1')
-
- # method calls => method name
- value.gsub!(/([A-Z:a-z0-9_]+)\.([a-z0-9_]+)(\s*\(\s*[a-z0-9_.,\s]*\s*\)\s*)?/) do
- case $2
- when 'to_s' then $1
- when 'const_get' then 'const'
- when 'new' then
- $1.split('::').last. # ClassName => class_name
- gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
- gsub(/([a-z\d])([A-Z])/,'\1_\2').
- downcase
- else
- $2
- end
- end
-
- # class prefixes
- value.gsub!(/[A-Za-z0-9_:]+::/, '')
-
- # simple expressions
- value = $1 if value =~ /^([a-z0-9_]+)\s*[-*+\/]/
-
- @block_params = value.strip
- end
-
- ##
- # HTML id-friendly method/attribute name
-
- def html_name
- require 'cgi'
-
- CGI.escape(@name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '')
- end
-
- ##
- # Full method/attribute name including namespace
-
- def full_name
- @full_name ||= "#{parent_name}#{pretty_name}"
- end
-
- def inspect # :nodoc:
- alias_for = @is_alias_for ? " (alias for #{@is_alias_for.name})" : nil
- visibility = self.visibility
- visibility = "forced #{visibility}" if force_documentation
- "#<%s:0x%x %s (%s)%s>" % [
- self.class, object_id,
- full_name,
- visibility,
- alias_for,
- ]
- end
-
- ##
- # '::' for a class method/attribute, '#' for an instance method.
-
- def name_prefix
- @singleton ? '::' : '#'
- end
-
- ##
- # Name for output to HTML. For class methods the full name with a "." is
- # used like +SomeClass.method_name+. For instance methods the class name is
- # used if +context+ does not match the parent.
- #
- # This is to help prevent people from using :: to call class methods.
-
- def output_name context
- return "#{name_prefix}#{@name}" if context == parent
-
- "#{parent_name}#{@singleton ? '.' : '#'}#{@name}"
- end
-
- ##
- # Method/attribute name with class/instance indicator
-
- def pretty_name
- "#{name_prefix}#{@name}"
- end
-
- ##
- # Type of method/attribute (class or instance)
-
- def type
- singleton ? 'class' : 'instance'
- end
-
- ##
- # Path to this method for use with HTML generator output.
-
- def path
- "#{@parent.path}##{aref}"
- end
-
- ##
- # Name of our parent with special handling for un-marshaled methods
-
- def parent_name
- @parent_name || super
- end
-
- def pretty_print q # :nodoc:
- alias_for = @is_alias_for ? "alias for #{@is_alias_for.name}" : nil
-
- q.group 2, "[#{self.class.name} #{full_name} #{visibility}", "]" do
- if alias_for then
- q.breakable
- q.text alias_for
- end
-
- if text then
- q.breakable
- q.text "text:"
- q.breakable
- q.pp @text
- end
-
- unless comment.empty? then
- q.breakable
- q.text "comment:"
- q.breakable
- q.pp @comment
- end
- end
- end
-
- ##
- # Used by RDoc::Generator::JsonIndex to create a record for the search
- # engine.
-
- def search_record
- [
- @name,
- full_name,
- @name,
- @parent.full_name,
- path,
- params,
- snippet(@comment),
- ]
- end
-
- def to_s # :nodoc:
- if @is_alias_for
- "#{self.class.name}: #{full_name} -> #{is_alias_for}"
- else
- "#{self.class.name}: #{full_name}"
- end
- end
-
-end
-
diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb
index dd7482c37c..e7ca6fffde 100644
--- a/lib/rdoc/normal_class.rb
+++ b/lib/rdoc/normal_class.rb
@@ -1,53 +1,25 @@
+require 'rdoc/class_module'
+
##
# A normal class, neither singleton nor anonymous
class RDoc::NormalClass < RDoc::ClassModule
##
- # The ancestors of this class including modules. Unlike Module#ancestors,
- # this class is not included in the result. The result will contain both
- # RDoc::ClassModules and Strings.
+ # Ancestor ClassModules
def ancestors
- if String === superclass then
- super << superclass
- elsif superclass then
- ancestors = super
- ancestors << superclass
- ancestors.concat superclass.ancestors
- else
- super
- end
- end
-
- ##
- # The definition of this class, <tt>class MyClassName</tt>
-
- def definition
- "class #{full_name}"
- end
-
- def direct_ancestors
- superclass ? super + [superclass] : super
+ includes + [superclass]
end
def inspect # :nodoc:
superclass = @superclass ? " < #{@superclass}" : nil
- "<%s:0x%x class %s%s includes: %p extends: %p attributes: %p methods: %p aliases: %p>" % [
+ "<%s:0x%x class %s%s includes: %p attributes: %p methods: %p aliases: %p>" % [
self.class, object_id,
- full_name, superclass, @includes, @extends, @attributes, @method_list, @aliases
+ full_name, superclass, @includes, @attributes, @method_list, @aliases
]
end
- def to_s # :nodoc:
- display = "#{self.class.name} #{self.full_name}"
- if superclass
- display << ' < ' << (superclass.is_a?(String) ? superclass : superclass.full_name)
- end
- display << ' -> ' << is_alias_for.to_s if is_alias_for
- display
- end
-
def pretty_print q # :nodoc:
superclass = @superclass ? " < #{@superclass}" : nil
@@ -58,24 +30,19 @@ class RDoc::NormalClass < RDoc::ClassModule
q.seplist @includes do |inc| q.pp inc end
q.breakable
- q.text "constants:"
- q.breakable
- q.seplist @constants do |const| q.pp const end
-
- q.breakable
q.text "attributes:"
q.breakable
- q.seplist @attributes do |attr| q.pp attr end
+ q.seplist @attributes do |inc| q.pp inc end
q.breakable
q.text "methods:"
q.breakable
- q.seplist @method_list do |meth| q.pp meth end
+ q.seplist @method_list do |inc| q.pp inc end
q.breakable
q.text "aliases:"
q.breakable
- q.seplist @aliases do |aliaz| q.pp aliaz end
+ q.seplist @aliases do |inc| q.pp inc end
q.breakable
q.text "comment:"
diff --git a/lib/rdoc/normal_module.rb b/lib/rdoc/normal_module.rb
index cd77b1e39e..92abe6b440 100644
--- a/lib/rdoc/normal_module.rb
+++ b/lib/rdoc/normal_module.rb
@@ -1,23 +1,23 @@
+require 'rdoc/class_module'
+
##
# A normal module, like NormalClass
class RDoc::NormalModule < RDoc::ClassModule
+ ##
+ # Included NormalModules
+
+ alias ancestors includes
+
def inspect # :nodoc:
- "#<%s:0x%x module %s includes: %p extends: %p attributes: %p methods: %p aliases: %p>" % [
+ "#<%s:0x%x module %s includes: %p attributes: %p methods: %p aliases: %p>" % [
self.class, object_id,
- full_name, @includes, @extends, @attributes, @method_list, @aliases
+ full_name, @includes, @attributes, @method_list, @aliases
]
end
##
- # The definition of this module, <tt>module MyModuleName</tt>
-
- def definition
- "module #{full_name}"
- end
-
- ##
# This is a module, returns true
def module?
@@ -32,24 +32,19 @@ class RDoc::NormalModule < RDoc::ClassModule
q.seplist @includes do |inc| q.pp inc end
q.breakable
- q.breakable
- q.text "constants:"
- q.breakable
- q.seplist @constants do |const| q.pp const end
-
q.text "attributes:"
q.breakable
- q.seplist @attributes do |attr| q.pp attr end
+ q.seplist @attributes do |inc| q.pp inc end
q.breakable
q.text "methods:"
q.breakable
- q.seplist @method_list do |meth| q.pp meth end
+ q.seplist @method_list do |inc| q.pp inc end
q.breakable
q.text "aliases:"
q.breakable
- q.seplist @aliases do |aliaz| q.pp aliaz end
+ q.seplist @aliases do |inc| q.pp inc end
q.breakable
q.text "comment:"
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index 7be43ca776..90415f0aa4 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -1,152 +1,16 @@
require 'optparse'
-require 'pathname'
+
+require 'rdoc/ri/paths'
##
# RDoc::Options handles the parsing and storage of options
-#
-# == Saved Options
-#
-# You can save some options like the markup format in the
-# <tt>.rdoc_options</tt> file in your gem. The easiest way to do this is:
-#
-# rdoc --markup tomdoc --write-options
-#
-# Which will automatically create the file and fill it with the options you
-# specified.
-#
-# The following options will not be saved since they interfere with the user's
-# preferences or with the normal operation of RDoc:
-#
-# * +--coverage-report+
-# * +--dry-run+
-# * +--encoding+
-# * +--force-update+
-# * +--format+
-# * +--pipe+
-# * +--quiet+
-# * +--template+
-# * +--verbose+
-#
-# == Custom Options
-#
-# Generators can hook into RDoc::Options to add generator-specific command
-# line options.
-#
-# When <tt>--format</tt> is encountered in ARGV, RDoc calls ::setup_options on
-# the generator class to add extra options to the option parser. Options for
-# custom generators must occur after <tt>--format</tt>. <tt>rdoc --help</tt>
-# will list options for all installed generators.
-#
-# Example:
-#
-# class RDoc::Generator::Spellcheck
-# RDoc::RDoc.add_generator self
-#
-# def self.setup_options rdoc_options
-# op = rdoc_options.option_parser
-#
-# op.on('--spell-dictionary DICTIONARY',
-# RDoc::Options::Path) do |dictionary|
-# rdoc_options.spell_dictionary = dictionary
-# end
-# end
-# end
-#
-# == Option Validators
-#
-# OptionParser validators will validate and cast user input values. In
-# addition to the validators that ship with OptionParser (String, Integer,
-# Float, TrueClass, FalseClass, Array, Regexp, Date, Time, URI, etc.),
-# RDoc::Options adds Path, PathArray and Template.
class RDoc::Options
##
- # The deprecated options.
-
- DEPRECATED = {
- '--accessor' => 'support discontinued',
- '--diagram' => 'support discontinued',
- '--help-output' => 'support discontinued',
- '--image-format' => 'was an option for --diagram',
- '--inline-source' => 'source code is now always inlined',
- '--merge' => 'ri now always merges class information',
- '--one-file' => 'support discontinued',
- '--op-name' => 'support discontinued',
- '--opname' => 'support discontinued',
- '--promiscuous' => 'files always only document their content',
- '--ri-system' => 'Ruby installers use other techniques',
- }
-
- ##
- # RDoc options ignored (or handled specially) by --write-options
-
- SPECIAL = %w[
- coverage_report
- dry_run
- encoding
- files
- force_output
- force_update
- generator
- generator_name
- generator_options
- generators
- op_dir
- option_parser
- pipe
- rdoc_include
- root
- static_path
- stylesheet_url
- template
- template_dir
- update_output_dir
- verbosity
- write_options
- ]
-
- ##
- # Option validator for OptionParser that matches a directory that exists on
- # the filesystem.
-
- Directory = Object.new
-
- ##
- # Option validator for OptionParser that matches a file or directory that
- # exists on the filesystem.
-
- Path = Object.new
-
- ##
- # Option validator for OptionParser that matches a comma-separated list of
- # files or directories that exist on the filesystem.
+ # Character-set
- PathArray = Object.new
-
- ##
- # Option validator for OptionParser that matches a template directory for an
- # installed generator that lives in
- # <tt>"rdoc/generator/template/#{template_name}"</tt>
-
- Template = Object.new
-
- ##
- # Character-set for HTML output. #encoding is preferred over #charset
-
- attr_accessor :charset
-
- ##
- # If true, RDoc will not write any files.
-
- attr_accessor :dry_run
-
- ##
- # The output encoding. All input files will be transcoded to this encoding.
- #
- # The default encoding is UTF-8. This is set via --encoding.
-
- attr_accessor :encoding
+ attr_reader :charset
##
# Files matching this pattern will be excluded
@@ -159,47 +23,19 @@ class RDoc::Options
attr_accessor :files
##
- # Create the output even if the output directory does not look
- # like an rdoc output directory
-
- attr_accessor :force_output
-
- ##
# Scan newer sources than the flag file if true.
- attr_accessor :force_update
+ attr_reader :force_update
##
- # Formatter to mark up text with
-
- attr_accessor :formatter
-
- ##
- # Description of the output generator (set with the <tt>--format</tt> option)
+ # Description of the output generator (set with the <tt>-fmt</tt> option)
attr_accessor :generator
##
- # For #==
-
- attr_reader :generator_name # :nodoc:
-
- ##
- # Loaded generator options. Used to prevent --help from loading the same
- # options multiple times.
-
- attr_accessor :generator_options
-
- ##
- # Old rdoc behavior: hyperlink all words that match a method name,
- # even if not preceded by '#' or '::'
-
- attr_accessor :hyperlink_all
-
- ##
- # Include line numbers in the source code
+ # Formatter to mark up text with
- attr_accessor :line_numbers
+ attr_accessor :formatter
##
# Name of the file, class or module to display in the initial index page (if
@@ -208,33 +44,11 @@ class RDoc::Options
attr_accessor :main_page
##
- # The default markup format. The default is 'rdoc'. 'markdown', 'tomdoc'
- # and 'rd' are also built-in.
-
- attr_accessor :markup
-
- ##
- # If true, only report on undocumented files
-
- attr_accessor :coverage_report
-
- ##
# The name of the output directory
attr_accessor :op_dir
##
- # The OptionParser for this instance
-
- attr_accessor :option_parser
-
- ##
- # Directory where guides, FAQ, and other pages not associated with a class
- # live. You may leave this unset if these are at the root of your project.
-
- attr_accessor :page_dir
-
- ##
# Is RDoc in pipe mode?
attr_accessor :pipe
@@ -242,49 +56,32 @@ class RDoc::Options
##
# Array of directories to search for files to satisfy an :include:
- attr_accessor :rdoc_include
+ attr_reader :rdoc_include
##
- # Root of the source documentation will be generated for. Set this when
- # building documentation outside the source directory. Defaults to the
- # current directory.
+ # Include private and protected methods in the output?
- attr_accessor :root
+ attr_accessor :show_all
##
# Include the '#' at the front of hyperlinked instance method names
- attr_accessor :show_hash
-
- ##
- # Directory to copy static files from
-
- attr_accessor :static_path
+ attr_reader :show_hash
##
# The number of columns in a tab
- attr_accessor :tab_width
+ attr_reader :tab_width
##
# Template to be used when generating output
- attr_accessor :template
-
- ##
- # Directory the template lives in
-
- attr_accessor :template_dir
+ attr_reader :template
##
# Documentation title
- attr_accessor :title
-
- ##
- # Should RDoc update the timestamps in the output dir?
-
- attr_accessor :update_output_dir
+ attr_reader :title
##
# Verbosity, zero means quiet
@@ -294,252 +91,38 @@ class RDoc::Options
##
# URL of web cvs frontend
- attr_accessor :webcvs
-
- ##
- # Minimum visibility of a documented method. One of +:public+,
- # +:protected+, +:private+. May be overridden on a per-method
- # basis with the :doc: directive.
-
- attr_accessor :visibility
+ attr_reader :webcvs
def initialize # :nodoc:
- init_ivars
- end
-
- def init_ivars # :nodoc:
- @dry_run = false
+ require 'rdoc/rdoc'
+ @op_dir = nil
+ @show_all = false
+ @main_page = nil
@exclude = []
- @files = nil
- @force_output = false
- @force_update = true
- @generator = nil
- @generator_name = nil
- @generator_options = []
@generators = RDoc::RDoc::GENERATORS
- @hyperlink_all = false
- @line_numbers = false
- @main_page = nil
- @markup = 'rdoc'
- @coverage_report = false
- @op_dir = nil
- @page_dir = nil
- @pipe = false
+ @generator = RDoc::Generator::Darkfish
+ @generator_name = nil
@rdoc_include = []
- @root = Pathname(Dir.pwd)
+ @title = nil
+ @template = nil
@show_hash = false
- @static_path = []
- @stylesheet_url = nil # TODO remove in RDoc 4
@tab_width = 8
- @template = nil
- @template_dir = nil
- @title = nil
- @update_output_dir = true
+ @force_update = true
@verbosity = 1
- @visibility = :protected
- @webcvs = nil
- @write_options = false
-
- if Object.const_defined? :Encoding then
- @encoding = Encoding::UTF_8
- @charset = @encoding.name
- else
- @encoding = nil
- @charset = 'UTF-8'
- end
- end
-
- def init_with map # :nodoc:
- init_ivars
-
- encoding = map['encoding']
- @encoding = if Object.const_defined? :Encoding then
- encoding ? Encoding.find(encoding) : encoding
- end
-
- @charset = map['charset']
- @exclude = map['exclude']
- @generator_name = map['generator_name']
- @hyperlink_all = map['hyperlink_all']
- @line_numbers = map['line_numbers']
- @main_page = map['main_page']
- @markup = map['markup']
- @op_dir = map['op_dir']
- @show_hash = map['show_hash']
- @tab_width = map['tab_width']
- @template_dir = map['template_dir']
- @title = map['title']
- @visibility = map['visibility']
- @webcvs = map['webcvs']
-
- @rdoc_include = sanitize_path map['rdoc_include']
- @static_path = sanitize_path map['static_path']
- end
-
- def yaml_initialize tag, map # :nodoc:
- init_with map
- end
-
- def == other # :nodoc:
- self.class === other and
- @encoding == other.encoding and
- @generator_name == other.generator_name and
- @hyperlink_all == other.hyperlink_all and
- @line_numbers == other.line_numbers and
- @main_page == other.main_page and
- @markup == other.markup and
- @op_dir == other.op_dir and
- @rdoc_include == other.rdoc_include and
- @show_hash == other.show_hash and
- @static_path == other.static_path and
- @tab_width == other.tab_width and
- @template == other.template and
- @title == other.title and
- @visibility == other.visibility and
- @webcvs == other.webcvs
- end
-
- ##
- # Check that the files on the command line exist
-
- def check_files
- @files.delete_if do |file|
- if File.exist? file then
- if File.readable? file then
- false
- else
- warn "file '#{file}' not readable"
-
- true
- end
- else
- warn "file '#{file}' not found"
-
- true
- end
- end
- end
-
- ##
- # Ensure only one generator is loaded
-
- def check_generator
- if @generator then
- raise OptionParser::InvalidOption,
- "generator already set to #{@generator_name}"
- end
- end
-
- ##
- # Set the title, but only if not already set. Used to set the title
- # from a source file, so that a title set from the command line
- # will have the priority.
-
- def default_title=(string)
- @title ||= string
- end
-
- ##
- # For dumping YAML
-
- def encode_with coder # :nodoc:
- encoding = @encoding ? @encoding.name : nil
-
- coder.add 'encoding', encoding
- coder.add 'static_path', sanitize_path(@static_path)
- coder.add 'rdoc_include', sanitize_path(@rdoc_include)
-
- ivars = instance_variables.map { |ivar| ivar.to_s[1..-1] }
- ivars -= SPECIAL
-
- ivars.sort.each do |ivar|
- coder.add ivar, instance_variable_get("@#{ivar}")
- end
- end
-
- ##
- # Completes any unfinished option setup business such as filtering for
- # existent files, creating a regexp for #exclude and setting a default
- # #template.
-
- def finish
- @op_dir ||= 'doc'
-
- @rdoc_include << "." if @rdoc_include.empty?
-
- if @exclude.nil? or Regexp === @exclude then
- # done, #finish is being re-run
- elsif @exclude.empty? then
- @exclude = nil
- else
- @exclude = Regexp.new(@exclude.join("|"))
- end
-
- finish_page_dir
-
- check_files
-
- # If no template was specified, use the default template for the output
- # formatter
-
- unless @template then
- @template = @generator_name
- @template_dir = template_dir_for @template
- end
-
- self
- end
-
- ##
- # Fixes the page_dir to be relative to the root_dir and adds the page_dir to
- # the files list.
-
- def finish_page_dir
- return unless @page_dir
-
- @files << @page_dir.to_s
-
- page_dir = @page_dir.expand_path.relative_path_from @root
-
- @page_dir = page_dir
- end
-
- ##
- # Returns a properly-space list of generators and their descriptions.
-
- def generator_descriptions
- lengths = []
-
- generators = RDoc::RDoc::GENERATORS.map do |name, generator|
- lengths << name.length
-
- description = generator::DESCRIPTION if
- generator.const_defined? :DESCRIPTION
-
- [name, description]
- end
+ @pipe = false
- longest = lengths.max
+ @webcvs = nil
- generators.sort.map do |name, description|
- if description then
- " %-*s - %s" % [longest, name, description]
- else
- " #{name}"
- end
- end.join "\n"
+ @charset = 'utf-8'
end
##
- # Parses command line options.
+ # Parse command line options.
- def parse argv
+ def parse(argv)
ignore_invalid = true
- argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
-
opts = OptionParser.new do |opt|
- @option_parser = opt
opt.program_name = File.basename $0
opt.version = RDoc::VERSION
opt.release = nil
@@ -556,17 +139,8 @@ Usage: #{opt.program_name} [options] [names...]
How RDoc generates output depends on the output formatter being used, and on
the options you give.
- Options can be specified via the RDOCOPT environment variable, which
- functions similar to the RUBYOPT environment variable for ruby.
-
- $ export RDOCOPT="--show-hash"
-
- will make rdoc show hashes in method links by default. Command-line options
- always will override those in RDOCOPT.
-
- Available formatters:
-
-#{generator_descriptions}
+ - Darkfish creates frameless HTML output by Michael Granger.
+ - ri creates ri data files
RDoc understands the following file formats:
@@ -582,75 +156,14 @@ Usage: #{opt.program_name} [options] [names...]
opt.banner << " - #{parser}: #{regexp.join ', '}\n"
end
- opt.banner << "\n The following options are deprecated:\n\n"
-
- name_length = DEPRECATED.keys.sort_by { |k| k.length }.last.length
-
- DEPRECATED.sort_by { |k,| k }.each do |name, reason|
- opt.banner << " %*1$2$s %3$s\n" % [-name_length, name, reason]
- end
-
- opt.accept Template do |template|
- template_dir = template_dir_for template
-
- unless template_dir then
- $stderr.puts "could not find template #{template}"
- nil
- else
- [template, template_dir]
- end
- end
-
- opt.accept Directory do |directory|
- directory = File.expand_path directory
-
- raise OptionParser::InvalidArgument unless File.directory? directory
-
- directory
- end
-
- opt.accept Path do |path|
- path = File.expand_path path
-
- raise OptionParser::InvalidArgument unless File.exist? path
-
- path
- end
-
- opt.accept PathArray do |paths,|
- paths = if paths then
- paths.split(',').map { |d| d unless d.empty? }
- end
-
- paths.map do |path|
- path = File.expand_path path
-
- raise OptionParser::InvalidArgument unless File.exist? path
-
- path
- end
- end
-
opt.separator nil
- opt.separator "Parsing options:"
+ opt.separator "Parsing Options:"
opt.separator nil
- if Object.const_defined? :Encoding then
- opt.on("--encoding=ENCODING", "-e", Encoding.list.map { |e| e.name },
- "Specifies the output encoding. All files",
- "read will be converted to this encoding.",
- "The default encoding is UTF-8.",
- "--encoding is preferred over --charset") do |value|
- @encoding = Encoding.find value
- @charset = @encoding.name # may not be valid value
- end
-
- opt.separator nil
- end
-
opt.on("--all", "-a",
- "Synonym for --visibility=private.") do |value|
- @visibility = :private
+ "Include all methods (not just public) in",
+ "the output.") do |value|
+ @show_all = value
end
opt.separator nil
@@ -688,88 +201,33 @@ Usage: #{opt.program_name} [options] [names...]
opt.separator nil
- opt.on("--pipe", "-p",
+ opt.on("--pipe",
"Convert RDoc on stdin to HTML") do
@pipe = true
end
opt.separator nil
-
- opt.on("--tab-width=WIDTH", "-w", OptionParser::DecimalInteger,
- "Set the width of tab characters.") do |value|
- @tab_width = value
- end
-
+ opt.separator "Generator Options:"
opt.separator nil
- opt.on("--visibility=VISIBILITY", "-V", RDoc::VISIBILITIES,
- "Minimum visibility to document a method.",
- "One of 'public', 'protected' (the default)",
- "or 'private'. Can be abbreviated.") do |value|
- @visibility = value
- end
-
- opt.separator nil
-
- markup_formats = RDoc::Text::MARKUP_FORMAT.keys.sort
-
- opt.on("--markup=MARKUP", markup_formats,
- "The markup format for the named files.",
- "The default is rdoc. Valid values are:",
- markup_formats.join(', ')) do |value|
- @markup = value
- end
-
- opt.separator nil
-
- opt.on("--root=ROOT", Directory,
- "Root of the source tree documentation",
- "will be generated for. Set this when",
- "building documentation outside the",
- "source directory. Default is the",
- "current directory.") do |root|
- @root = Pathname(root)
- end
-
- opt.separator nil
-
- opt.on("--page-dir=DIR", Directory,
- "Directory where guides, your FAQ or",
- "other pages not associated with a class",
- "live. Set this when you don't store",
- "such files at your project root.",
- "NOTE: Do not use the same file name in",
- "the page dir and the root of your project") do |page_dir|
- @page_dir = Pathname(page_dir)
- end
-
- opt.separator nil
- opt.separator "Common generator options:"
- opt.separator nil
-
- opt.on("--force-output", "-O",
- "Forces rdoc to write the output files,",
- "even if the output directory exists",
- "and does not seem to have been created",
- "by rdoc.") do |value|
- @force_output = value
+ opt.on("--charset=CHARSET", "-c",
+ "Specifies the output HTML character-set.") do |value|
+ @charset = value
end
opt.separator nil
generator_text = @generators.keys.map { |name| " #{name}" }.sort
- opt.on("-f", "--fmt=FORMAT", "--format=FORMAT", @generators.keys,
+ opt.on("--fmt=FORMAT", "--format=FORMAT", "-f", @generators.keys,
"Set the output formatter. One of:", *generator_text) do |value|
- check_generator
-
@generator_name = value.downcase
setup_generator
end
opt.separator nil
- opt.on("--include=DIRECTORIES", "-i", PathArray,
+ 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|
@@ -778,53 +236,6 @@ Usage: #{opt.program_name} [options] [names...]
opt.separator nil
- opt.on("--[no-]coverage-report=[LEVEL]", "--[no-]dcov", "-C", Integer,
- "Prints a report on undocumented items.",
- "Does not generate files.") do |value|
- value = 0 if value.nil? # Integer converts -C to nil
-
- @coverage_report = value
- @force_update = true if value
- end
-
- opt.separator nil
-
- opt.on("--output=DIR", "--op", "-o",
- "Set the output directory.") do |value|
- @op_dir = value
- end
-
- opt.separator nil
-
- opt.on("-d",
- "Deprecated --diagram option.",
- "Prevents firing debug mode",
- "with legacy invocation.") do |value|
- end
-
- opt.separator nil
- opt.separator 'HTML generator options:'
- opt.separator nil
-
- opt.on("--charset=CHARSET", "-c",
- "Specifies the output HTML character-set.",
- "Use --encoding instead of --charset if",
- "available.") do |value|
- @charset = value
- end
-
- opt.separator nil
-
- opt.on("--hyperlink-all", "-A",
- "Generate hyperlinks for all words that",
- "correspond to known methods, even if they",
- "do not start with '#' or '::' (legacy",
- "behavior).") do |value|
- @hyperlink_all = value
- end
-
- opt.separator nil
-
opt.on("--main=NAME", "-m",
"NAME will be the initial page displayed.") do |value|
@main_page = value
@@ -832,11 +243,9 @@ Usage: #{opt.program_name} [options] [names...]
opt.separator nil
- opt.on("--[no-]line-numbers", "-N",
- "Include line numbers in the source code.",
- "By default, only the number of the first",
- "line is displayed, in a leading comment.") do |value|
- @line_numbers = value
+ opt.on("--output=DIR", "--op", "-o",
+ "Set the output directory.") do |value|
+ @op_dir = value
end
opt.separator nil
@@ -851,31 +260,24 @@ Usage: #{opt.program_name} [options] [names...]
opt.separator nil
- opt.on("--template=NAME", "-T", Template,
- "Set the template used when generating",
- "output. The default depends on the",
- "formatter used.") do |(template, template_dir)|
- @template = template
- @template_dir = template_dir
+ opt.on("--tab-width=WIDTH", "-w", OptionParser::DecimalInteger,
+ "Set the width of tab characters.") do |value|
+ @tab_width = value
end
opt.separator nil
- opt.on("--title=TITLE", "-t",
- "Set TITLE as the title for HTML output.") do |value|
- @title = value
+ opt.on("--template=NAME", "-T",
+ "Set the template used when generating",
+ "output.") do |value|
+ @template = value
end
opt.separator nil
- opt.on("--copy-files=PATH", Path,
- "Specify a file or directory to copy static",
- "files from.",
- "If a file is given it will be copied into",
- "the output dir. If a directory is given the",
- "entire directory will be copied.",
- "You can use this multiple times") do |value|
- @static_path << value
+ opt.on("--title=TITLE", "-t",
+ "Set TITLE as the title for HTML output.") do |value|
+ @title = value
end
opt.separator nil
@@ -890,7 +292,11 @@ Usage: #{opt.program_name} [options] [names...]
end
opt.separator nil
- opt.separator "ri generator options:"
+
+ opt.on("-d", "--diagram", "Prevents -d from tripping --debug")
+
+ opt.separator nil
+ opt.separator "ri Generator Options:"
opt.separator nil
opt.on("--ri", "-r",
@@ -899,8 +305,6 @@ Usage: #{opt.program_name} [options] [names...]
"your home directory unless overridden by a",
"subsequent --op parameter, so no special",
"privileges are needed.") do |value|
- check_generator
-
@generator_name = "ri"
@op_dir ||= RDoc::RI::Paths::HOMEDIR
setup_generator
@@ -913,32 +317,13 @@ Usage: #{opt.program_name} [options] [names...]
"are stored in a site-wide directory,",
"making them accessible to others, so",
"special privileges are needed.") do |value|
- check_generator
-
@generator_name = "ri"
@op_dir = RDoc::RI::Paths::SITEDIR
setup_generator
end
opt.separator nil
- opt.separator "Generic options:"
- opt.separator nil
-
- opt.on("--write-options",
- "Write .rdoc_options to the current",
- "directory with the given options. Not all",
- "options will be used. See RDoc::Options",
- "for details.") do |value|
- @write_options = true
- end
-
- opt.separator nil
-
- opt.on("--[no-]dry-run",
- "Don't write any files") do |value|
- @dry_run = value
- end
-
+ opt.separator "Generic Options:"
opt.separator nil
opt.on("-D", "--[no-]debug",
@@ -946,202 +331,109 @@ Usage: #{opt.program_name} [options] [names...]
$DEBUG_RDOC = value
end
- opt.separator nil
-
opt.on("--[no-]ignore-invalid",
- "Ignore invalid options and continue",
- "(default true).") do |value|
+ "Ignore invalid options and continue.") do |value|
ignore_invalid = value
end
- opt.separator nil
-
opt.on("--quiet", "-q",
"Don't show progress as we parse.") do |value|
@verbosity = 0
end
- opt.separator nil
-
opt.on("--verbose", "-v",
- "Display extra progress as RDoc parses") do |value|
+ "Display extra progress as we parse.") do |value|
@verbosity = 2
end
opt.separator nil
-
- opt.on("--help",
- "Display this help") do
- RDoc::RDoc::GENERATORS.each_key do |generator|
- setup_generator generator
- end
-
- puts opt.help
- exit
- end
-
- opt.separator nil
end
- setup_generator 'darkfish' if
- argv.grep(/\A(-f|--fmt|--format|-r|-R|--ri|--ri-site)\b/).empty?
-
- deprecated = []
- invalid = []
+ argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
+ ignored = []
begin
opts.parse! argv
rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
- if DEPRECATED[e.args.first] then
- deprecated << e.args.first
- elsif %w[--format --ri -r --ri-site -R].include? e.args.first then
- raise
+ if ignore_invalid then
+ ignored << e.args.join(' ')
+ retry
else
- invalid << e.args.join(' ')
+ $stderr.puts opts
+ $stderr.puts
+ $stderr.puts e
+ exit 1
end
-
- retry
- end
-
- unless @generator then
- @generator = RDoc::Generator::Darkfish
- @generator_name = 'darkfish'
end
if @pipe and not argv.empty? then
@pipe = false
- invalid << '-p (with files)'
+ ignored << '-p (with files)'
end
- unless quiet then
- deprecated.each do |opt|
- $stderr.puts 'option ' << opt << ' is deprecated: ' << DEPRECATED[opt]
- end
-
- unless invalid.empty? then
- invalid = "invalid options: #{invalid.join ', '}"
-
- if ignore_invalid then
- $stderr.puts invalid
- $stderr.puts '(invalid options are ignored)'
- else
- $stderr.puts opts
- $stderr.puts invalid
- exit 1
- end
- end
+ unless ignored.empty? or quiet then
+ $stderr.puts "invalid options: #{ignored.join ', '}"
+ $stderr.puts '(invalid options are ignored)'
end
+ @op_dir ||= 'doc'
@files = argv.dup
- finish
+ @rdoc_include << "." if @rdoc_include.empty?
- if @write_options then
- write_options
- exit
+ if @exclude.empty? then
+ @exclude = nil
+ else
+ @exclude = Regexp.new(@exclude.join("|"))
end
- self
- end
+ check_files
- ##
- # Don't display progress as we process the files
+ # If no template was specified, use the default template for the output
+ # formatter
- def quiet
- @verbosity.zero?
+ @template ||= @generator_name
end
##
- # Set quietness to +bool+
+ # 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 quiet= bool
- @verbosity = bool ? 0 : 1
+ def title=(string)
+ @title ||= string
end
##
- # Removes directories from +path+ that are outside the current directory
-
- def sanitize_path path
- require 'pathname'
- dot = Pathname.new('.').expand_path
+ # Don't display progress as we process the files
- path.reject do |item|
- path = Pathname.new(item).expand_path
- relative = path.relative_path_from(dot).to_s
- relative.start_with? '..'
- end
+ def quiet
+ @verbosity.zero?
end
- ##
- # Set up an output generator for the named +generator_name+.
- #
- # If the found generator responds to :setup_options it will be called with
- # the options instance. This allows generators to add custom options or set
- # default options.
-
- def setup_generator generator_name = @generator_name
- @generator = @generators[generator_name]
-
- unless @generator then
- raise OptionParser::InvalidArgument,
- "Invalid output formatter #{generator_name}"
- end
-
- return if @generator_options.include? @generator
-
- @generator_name = generator_name
- @generator_options << @generator
-
- if @generator.respond_to? :setup_options then
- @option_parser ||= OptionParser.new
- @generator.setup_options self
- end
+ def quiet=(bool)
+ @verbosity = bool ? 0 : 1
end
- ##
- # Finds the template dir for +template+
-
- def template_dir_for template
- template_path = File.join 'rdoc', 'generator', 'template', template
-
- $LOAD_PATH.map do |path|
- File.join File.expand_path(path), template_path
- end.find do |dir|
- File.directory? dir
- end
- end
+ private
##
- # This is compatibility code for syck
+ # Set up an output generator for the format in @generator_name
- def to_yaml opts = {} # :nodoc:
- return super if YAML.const_defined?(:ENGINE) and not YAML::ENGINE.syck?
+ def setup_generator
+ @generator = @generators[@generator_name]
- YAML.quick_emit self, opts do |out|
- out.map taguri, to_yaml_style do |map|
- encode_with map
- end
+ unless @generator then
+ raise OptionParser::InvalidArgument, "Invalid output formatter"
end
end
##
- # Displays a warning using Kernel#warn if we're being verbose
-
- def warn message
- super message if @verbosity > 1
- end
-
- ##
- # Writes the YAML file .rdoc_options to the current directory containing the
- # parsed options.
-
- def write_options
- RDoc.load_yaml
-
- open '.rdoc_options', 'w' do |io|
- io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
+ # Check that the files on the command line exist
- YAML.dump self, io
+ def check_files
+ @files.each do |f|
+ stat = File.stat f rescue next
+ raise RDoc::Error, "file '#{f}' not readable" unless stat.readable?
end
end
diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb
index 47ecd746d0..1e4ab7c7a4 100644
--- a/lib/rdoc/parser.rb
+++ b/lib/rdoc/parser.rb
@@ -1,56 +1,52 @@
-# -*- coding: us-ascii -*-
+require 'rdoc'
+require 'rdoc/code_objects'
+require 'rdoc/markup/preprocess'
+require 'rdoc/stats'
##
-# A parser is simple a class that subclasses RDoc::Parser and implements #scan
-# to fill in an RDoc::TopLevel with parsed data.
+# A parser is simple a class that implements
#
-# The initialize method takes an RDoc::TopLevel to fill with parsed content,
-# the name of the file to be parsed, the content of the file, an RDoc::Options
-# object and an RDoc::Stats object to inform the user of parsed items. The
-# scan method is then called to parse the file and must return the
-# RDoc::TopLevel object. By calling super these items will be set for you.
+# #initialize(file_name, body, options)
#
-# In order to be used by RDoc the parser needs to register the file extensions
-# it can parse. Use ::parse_files_matching to register extensions.
+# and
#
-# require 'rdoc'
+# #scan
#
-# class RDoc::Parser::Xyz < RDoc::Parser
-# parse_files_matching /\.xyz$/
+# 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
#
-# def initialize top_level, file_name, content, options, stats
-# super
+# require "rdoc/parser"
+#
+# class RDoc::Parser::Xyz < RDoc::Parser
+# parse_files_matching /\.xyz$/ # <<<<
#
-# # extra initialization if needed
+# def initialize(file_name, body, options)
+# ...
# end
#
# def scan
-# # parse file and fill in @top_level
+# ...
# 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
-
- ##
- # An Array of arrays that maps file extension (or name) regular
- # expressions to parser classes that will parse matching filenames.
- #
- # Use parse_files_matching to register a parser's file extensions.
-
attr_reader :parsers
-
end
##
- # The name of the file being parsed
-
- attr_reader :file_name
-
- ##
# Alias an extension to another extension. After this call, files ending
# "new_ext" will be parsed using the same parser as "old_ext"
@@ -58,7 +54,7 @@ class RDoc::Parser
old_ext = old_ext.sub(/^\.(.*)/, '\1')
new_ext = new_ext.sub(/^\.(.*)/, '\1')
- parser = can_parse_by_name "xxx.#{old_ext}"
+ parser = can_parse "xxx.#{old_ext}"
return false unless parser
RDoc::Parser.parsers.unshift [/\.#{new_ext}$/, parser]
@@ -71,53 +67,18 @@ class RDoc::Parser
# content that an RDoc parser shouldn't try to consume.
def self.binary?(file)
- return false if file =~ /\.(rdoc|txt)$/
-
s = File.read(file, 1024) or return false
- have_encoding = s.respond_to? :encoding
-
- return true if s[0, 2] == Marshal.dump('')[0, 2] or s.index("\x00")
-
- if have_encoding then
- mode = "r"
- s.sub!(/\A#!.*\n/, '') # assume shebang line isn't longer than 1024.
- encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
- mode = "r:#{encoding}" if encoding
- s = File.open(file, mode) {|f| f.gets(nil, 1024)}
-
- not s.valid_encoding?
- else
- if 0.respond_to? :fdiv then
- s.count("\x00-\x7F", "^ -~\t\r\n").fdiv(s.size) > 0.3
- else # HACK 1.8.6
- (s.count("\x00-\x7F", "^ -~\t\r\n").to_f / s.size) > 0.3
- end
- end
- end
-
- ##
- # Processes common directives for CodeObjects for the C and Ruby parsers.
- #
- # Applies +directive+'s +value+ to +code_object+, if appropriate
-
- def self.process_directive code_object, directive, value
- warn "RDoc::Parser::process_directive is deprecated and wil be removed in RDoc 4. Use RDoc::Markup::PreProcess#handle_directive instead" if $-w
-
- case directive
- when 'nodoc' then
- code_object.document_self = nil # notify nodoc
- code_object.document_children = value.downcase != 'all'
- when 'doc' then
- code_object.document_self = true
- code_object.force_documentation = true
- when 'yield', 'yields' then
- # remove parameter &block
- code_object.params.sub!(/,?\s*&\w+/, '') if code_object.params
-
- code_object.block_params = value
- when 'arg', 'args' then
- code_object.params = value
+ if s[0, 2] == Marshal.dump('')[0, 2] then
+ true
+ elsif file =~ /erb\.rb$/ then
+ false
+ elsif s.scan(/<%|%>/).length >= 4 || s.index("\x00") then
+ true
+ elsif 0.respond_to? :fdiv then
+ s.count("\x00-\x7F", "^ -~\t\r\n").fdiv(s.size) > 0.3
+ else # HACK 1.8.6
+ (s.count("\x00-\x7F", "^ -~\t\r\n").to_f / s.size) > 0.3
end
end
@@ -131,96 +92,46 @@ class RDoc::Parser
zip_signature == "PK\x03\x04" or
zip_signature == "PK\x05\x06" or
zip_signature == "PK\x07\x08"
- rescue
- false
end
##
# Return a parser that can handle a particular extension
- def self.can_parse file_name
- parser = can_parse_by_name file_name
+ def self.can_parse(file_name)
+ parser = RDoc::Parser.parsers.find { |regexp,| regexp =~ file_name }.last
# HACK Selenium hides a jar file using a .txt extension
return if parser == RDoc::Parser::Simple and zip? file_name
- parser
- end
-
- ##
- # Returns a parser that can handle the extension for +file_name+. This does
- # not depend upon the file being readable.
-
- def self.can_parse_by_name file_name
- _, parser = RDoc::Parser.parsers.find { |regexp,| regexp =~ file_name }
-
# The default parser must not parse binary files
ext_name = File.extname file_name
return parser if ext_name.empty?
-
- if parser == RDoc::Parser::Simple and ext_name !~ /txt|rdoc/ then
- case check_modeline file_name
- when nil, 'rdoc' then # continue
- else return nil
- end
- end
+ return if parser == RDoc::Parser::Simple and ext_name !~ /txt|rdoc/
parser
- rescue Errno::EACCES
end
##
- # Returns the file type from the modeline in +file_name+
-
- def self.check_modeline file_name
- line = open file_name do |io|
- io.gets
- end
+ # Find the correct parser for a particular file name. Return a SimpleParser
+ # for ones that we don't know
- /-\*-\s*(.*?\S)\s*-\*-/ =~ line
-
- return nil unless type = $1
-
- if /;/ =~ type then
- return nil unless /(?:\s|\A)mode:\s*([^\s;]+)/i =~ type
- type = $1
- end
-
- return nil if /coding:/i =~ type
-
- type.downcase
- rescue ArgumentError # invalid byte sequence, etc.
- end
-
- ##
- # Finds and instantiates the correct parser for the given +file_name+ and
- # +content+.
-
- def self.for top_level, file_name, content, options, stats
+ def self.for(top_level, file_name, body, options, stats)
return if binary? file_name
- parser = use_markup content
-
- unless parser then
- parse_name = file_name
-
- # If no extension, look for shebang
- if file_name !~ /\.\w+$/ && content =~ %r{\A#!(.+)} then
- shebang = $1
- case shebang
- when %r{env\s+ruby}, %r{/ruby}
- parse_name = 'dummy.rb'
- end
+ # 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
-
- parser = can_parse parse_name
end
+ parser = can_parse file_name
+
return unless parser
- parser.new top_level, file_name, content, options, stats
- rescue SystemCallError
- nil
+ parser.new top_level, file_name, body, options, stats
end
##
@@ -232,68 +143,15 @@ class RDoc::Parser
RDoc::Parser.parsers.unshift [regexp, self]
end
- ##
- # If there is a <tt>markup: parser_name</tt> comment at the front of the
- # file, use it to determine the parser. For example:
- #
- # # markup: rdoc
- # # Class comment can go here
- #
- # class C
- # end
- #
- # The comment should appear as the first line of the +content+.
- #
- # If the content contains a shebang or editor modeline the comment may
- # appear on the second or third line.
- #
- # Any comment style may be used to hide the markup comment.
-
- def self.use_markup content
- markup = content.lines.first(3).grep(/markup:\s+(\w+)/) { $1 }.first
-
- return unless markup
-
- # TODO Ruby should be returned only when the filename is correct
- return RDoc::Parser::Ruby if %w[tomdoc markdown].include? markup
-
- markup = Regexp.escape markup
-
- RDoc::Parser.parsers.find do |_, parser|
- /^#{markup}$/i =~ parser.name.sub(/.*:/, '')
- end.last
- end
-
- ##
- # Creates a new Parser storing +top_level+, +file_name+, +content+,
- # +options+ and +stats+ in instance variables. In +@preprocess+ an
- # RDoc::Markup::PreProcess object is created which allows processing of
- # directives.
-
- def initialize top_level, file_name, content, options, stats
+ def initialize(top_level, file_name, content, options, stats)
@top_level = top_level
- @top_level.parser = self.class
- @store = @top_level.store
-
@file_name = file_name
@content = content
@options = options
@stats = stats
-
- @preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
- @preprocess.options = @options
end
- autoload :RubyTools, 'rdoc/parser/ruby_tools'
- autoload :Text, 'rdoc/parser/text'
-
end
-# simple must come first in order to show up last in the parsers list
require 'rdoc/parser/simple'
-require 'rdoc/parser/c'
-require 'rdoc/parser/changelog'
-require 'rdoc/parser/markdown'
-require 'rdoc/parser/rd'
-require 'rdoc/parser/ruby'
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb
index 968ca3c789..f30167aafc 100644
--- a/lib/rdoc/parser/c.rb
+++ b/lib/rdoc/parser/c.rb
@@ -1,9 +1,11 @@
-require 'tsort'
+require 'rdoc/parser'
+require 'rdoc/parser/ruby'
+require 'rdoc/known_classes'
##
-# RDoc::Parser::C attempts to parse C extension files. It looks for
+# 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. It tries to find the corresponding
+# 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.
#
@@ -47,45 +49,16 @@ require 'tsort'
#
# The comment blocks may include special directives:
#
-# [Document-class: +name+]
-# Documentation for the named class.
+# [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-module: +name+]
-# Documentation for the named module.
-#
-# [Document-const: +name+]
-# Documentation for the named +rb_define_const+.
-#
-# Constant values can be supplied on the first line of the comment like so:
-#
-# /* 300: The highest possible score in bowling */
-# rb_define_const(cFoo, "PERFECT", INT2FIX(300));
-#
-# The value can contain internal colons so long as they are escaped with a \
-#
-# [Document-global: +name+]
-# Documentation for the named +rb_define_global_const+
-#
-# [Document-variable: +name+]
-# Documentation for the named +rb_define_variable+
-#
-# [Document-method: +method_name+]
-# Documentation for the named method. Use this when the method name is
-# unambiguous.
-#
-# [Document-method: <tt>ClassName::method_name<tt>]
-# Documentation for a singleton method in the given class. Use this when
-# the method name alone is ambiguous.
-#
-# [Document-method: <tt>ClassName#method_name<tt>]
-# Documentation for a instance method in the given class. Use this when the
-# method name alone is ambiguous.
-#
-# [Document-attr: +name+]
-# Documentation for the named attribute.
+# [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,
+# 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
@@ -123,297 +96,116 @@ class RDoc::Parser::C < RDoc::Parser
include RDoc::Text
##
- # Maps C variable names to names of ruby classes or modules
-
- attr_reader :classes
-
- ##
# C file the parser is parsing
attr_accessor :content
##
- # Dependencies from a missing enclosing class to the classes in
- # missing_dependencies that depend upon it.
-
- attr_reader :enclosure_dependencies
-
- ##
- # Maps C variable names to names of ruby classes (and singleton classes)
-
- attr_reader :known_classes
-
- ##
- # Classes found while parsing the C file that were not yet registered due to
- # a missing enclosing class. These are processed by do_missing
-
- attr_reader :missing_dependencies
-
- ##
- # Maps C variable names to names of ruby singleton classes
-
- attr_reader :singleton_classes
+ # Resets cross-file state. Call when parsing different projects that need
+ # separate documentation.
- ##
- # The TopLevel items in the parsed file belong to
+ def self.reset
+ @@enclosure_classes = {}
+ @@known_bodies = {}
+ end
- attr_reader :top_level
+ reset
##
- # Prepares for parsing a C file. See RDoc::Parser#initialize for details on
- # the arguments.
+ # Prepare to parse a C file
- def initialize top_level, file_name, content, options, stats
+ def initialize(top_level, file_name, content, options, stats)
super
@known_classes = RDoc::KNOWN_CLASSES.dup
- @content = handle_tab_width handle_ifdefs_in @content
- @file_dir = File.dirname @file_name
-
- @classes = load_variable_map :c_class_variables
- @singleton_classes = load_variable_map :c_singleton_class_variables
-
- # missing variable => [handle_class_module arguments]
- @missing_dependencies = {}
-
- # missing enclosure variable => [dependent handle_class_module arguments]
- @enclosure_dependencies = Hash.new { |h, k| h[k] = [] }
- @enclosure_dependencies.instance_variable_set :@missing_dependencies,
- @missing_dependencies
-
- @enclosure_dependencies.extend TSort
-
- def @enclosure_dependencies.tsort_each_node &block
- each_key(&block)
- rescue TSort::Cyclic => e
- cycle_vars = e.message.scan(/"(.*?)"/).flatten
-
- cycle = cycle_vars.sort.map do |var_name|
- delete var_name
-
- var_name, type, mod_name, = @missing_dependencies[var_name]
-
- "#{type} #{mod_name} (#{var_name})"
- end.join ', '
-
- warn "Unable to create #{cycle} due to a cyclic class or module creation"
-
- retry
- end
-
- def @enclosure_dependencies.tsort_each_child node, &block
- fetch(node, []).each(&block)
- end
+ @content = handle_tab_width handle_ifdefs_in(@content)
+ @classes = Hash.new
+ @file_dir = File.dirname(@file_name)
end
- ##
- # Scans #content for rb_define_alias
-
def do_aliases
- @content.scan(/rb_define_alias\s*\(
- \s*(\w+),
- \s*"(.+?)",
- \s*"(.+?)"
- \s*\)/xm) do |var_name, new_name, old_name|
- class_name = @known_classes[var_name]
-
- unless class_name then
- @options.warn "Enclosing class or module %p for alias %s %s is not known" % [
- var_name, new_name, old_name]
- next
- end
-
- class_obj = find_class var_name, class_name
-
- al = RDoc::Alias.new '', old_name, new_name, ''
- al.singleton = @singleton_classes.key? var_name
-
- comment = find_alias_comment var_name, new_name, old_name
-
- comment.normalize
+ @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)
- al.comment = comment
+ as = class_obj.add_alias RDoc::Alias.new("", old_name, new_name, "")
- al.record_location @top_level
-
- class_obj.add_alias al
- @stats.add_alias al
+ @stats.add_alias as
end
end
- ##
- # Scans #content for rb_attr and rb_define_attr
-
- def do_attrs
- @content.scan(/rb_attr\s*\(
- \s*(\w+),
- \s*([\w"()]+),
- \s*([01]),
- \s*([01]),
- \s*\w+\);/xm) do |var_name, attr_name, read, write|
- handle_attr var_name, attr_name, read, write
+ 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
- @content.scan(%r%rb_define_attr\(
- \s*([\w\.]+),
- \s*"([^"]+)",
- \s*(\d+),
- \s*(\d+)\s*\);
- %xm) do |var_name, attr_name, read, write|
- handle_attr var_name, attr_name, read, write
+ # 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
- end
-
- ##
- # Scans #content for boot_defclass
- def do_boot_defclass
@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)
+ handle_class_module(var_name, "class", class_name, parent, nil)
end
- end
- ##
- # Scans #content for rb_define_class, boot_defclass, rb_define_class_under
- # and rb_singleton_class
+ @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
- def do_classes
- do_boot_defclass
- do_define_class
- do_define_class_under
- do_singleton_class
- do_struct_define_without_accessor
+ @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
- ##
- # Scans #content for rb_define_variable, rb_define_readonly_variable,
- # rb_define_const and rb_define_global_const
-
def do_constants
- @content.scan(%r%\Wrb_define_
+ @content.scan(%r{\Wrb_define_
( variable |
readonly_variable |
const |
- global_const )
+ global_const | )
\s*\(
(?:\s*(\w+),)?
\s*"(\w+)",
\s*(.*?)\s*\)\s*;
- %xm) do |type, var_name, const_name, definition|
+ }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
-
- @content.scan(%r%
- \Wrb_curses_define_const
- \s*\(
- \s*
- (\w+)
- \s*
- \)
- \s*;%xm) do |consts|
- const = consts.first
-
- handle_constants 'const', 'mCurses', const, "UINT2NUM(#{const})"
- end
-
- @content.scan(%r%
- \Wrb_file_const
- \s*\(
- \s*
- "([^"]+)",
- \s*
- (.*?)
- \s*
- \)
- \s*;%xm) do |name, value|
- handle_constants 'const', 'rb_mFConst', name, value
- end
- end
-
- ##
- # Scans #content for rb_define_class
-
- def do_define_class
- # 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
- end
-
- ##
- # Scans #content for rb_define_class_under
-
- def do_define_class_under
- @content.scan(/([\w\.]+)\s* = # var_name
- \s*rb_define_class_under\s*
- \(
- \s* (\w+), # under
- \s* "(\w+)", # class_name
- \s*
- (?:
- ([\w\*\s\(\)\.\->]+) | # parent_name
- rb_path2class\("([\w:]+)"\) # path
- )
- \s*
- \)
- /mx) do |var_name, under, class_name, parent_name, path|
- parent = path || parent_name
-
- handle_class_module var_name, :class, class_name, parent, under
- end
- end
-
- ##
- # Scans #content for rb_define_module
-
- def do_define_module
- @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
end
##
- # Scans #content for rb_define_module_under
-
- def do_define_module_under
- @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
- end
-
- ##
- # Scans #content for rb_include_module
+ # 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|
- next unless cls = @classes[c]
- m = @known_classes[m] || m
-
- comment = RDoc::Comment.new '', @top_level
- incl = cls.add_include RDoc::Include.new(m, comment)
- incl.record_location @top_level
+ if cls = @classes[c]
+ m = @known_classes[m] || m
+ cls.add_include RDoc::Include.new(m, "")
+ end
end
end
- ##
- # Scans #content for rb_define_method, rb_define_singleton_method,
- # rb_define_module_function, rb_define_private_method,
- # rb_define_global_function and define_filetest_function
-
def do_methods
- @content.scan(%r%rb_define_
+ @content.scan(%r{rb_define_
(
singleton_method |
method |
@@ -424,159 +216,82 @@ class RDoc::Parser::C < RDoc::Parser
\s*"([^"]+)",
\s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
\s*(-?\w+)\s*\)
- (?:;\s*/[*/]\s+in\s+(\w+?\.(?:cpp|c|y)))?
- %xm) do |type, var_name, meth_name, function, param_count, source_file|
+ (?:;\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, function, param_count,
+ handle_method(type, var_name, meth_name, meth_body, param_count,
source_file)
end
- @content.scan(%r%rb_define_global_function\s*\(
+ @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, function, param_count, source_file|
- handle_method("method", "rb_mKernel", meth_name, function, param_count,
- source_file)
+ }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, function, param_count|
-
- handle_method("method", "rb_mFileTest", meth_name, function, param_count)
- handle_method("singleton_method", "rb_cFile", meth_name, function,
- param_count)
- end
- end
-
- ##
- # Creates classes and module that were missing were defined due to the file
- # order being different than the declaration order.
-
- def do_missing
- return if @missing_dependencies.empty?
-
- @enclosure_dependencies.tsort.each do |in_module|
- arguments = @missing_dependencies.delete in_module
-
- next unless arguments # dependency on existing class
-
- handle_class_module(*arguments)
- end
- end
-
- ##
- # Scans #content for rb_define_module and rb_define_module_under
-
- def do_modules
- do_define_module
- do_define_module_under
- end
+ \s*"([^"]+)",
+ \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+ \s*(-?\w+)\s*\)/xm) do
+ |meth_name, meth_body, param_count|
- ##
- # Scans #content for rb_singleton_class
-
- def do_singleton_class
- @content.scan(/([\w\.]+)\s* = \s*rb_singleton_class\s*
- \(
- \s*(\w+)
- \s*\)/mx) do |sclass_var, class_var|
- handle_singleton sclass_var, class_var
+ 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
- ##
- # Scans #content for struct_define_without_accessor
-
- def do_struct_define_without_accessor
- @content.scan(/([\w\.]+)\s* = \s*rb_struct_define_without_accessor\s*
- \(
- \s*"(\w+)", # Class name
- \s*(\w+), # Parent class
- \s*\w+, # Allocation function
- (\s*"\w+",)* # Attributes
- \s*NULL
- \)/mx) do |var_name, class_name, parent|
- handle_class_module(var_name, :class, class_name, parent, nil)
+ 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
##
- # Finds the comment for an alias on +class_name+ from +new_name+ to
- # +old_name+
-
- def find_alias_comment class_name, new_name, old_name
- content =~ %r%((?>/\*.*?\*/\s+))
- rb_define_alias\(\s*#{Regexp.escape class_name}\s*,
- \s*"#{Regexp.escape new_name}"\s*,
- \s*"#{Regexp.escape old_name}"\s*\);%xm
-
- RDoc::Comment.new($1 || '', @top_level)
- end
-
- ##
- # Finds a comment for rb_define_attr, rb_attr or Document-attr.
- #
- # +var_name+ is the C class variable the attribute is defined on.
- # +attr_name+ is the attribute's name.
- #
- # +read+ and +write+ are the read/write flags ('1' or '0'). Either both or
- # neither must be provided.
-
- def find_attr_comment var_name, attr_name, read = nil, write = nil
- attr_name = Regexp.escape attr_name
-
- rw = if read and write then
- /\s*#{read}\s*,\s*#{write}\s*/xm
- else
- /.*?/m
- end
-
- comment = if @content =~ %r%((?>/\*.*?\*/\s+))
- rb_define_attr\((?:\s*#{var_name},)?\s*
- "#{attr_name}"\s*,
- #{rw}\)\s*;%xm then
- $1
- elsif @content =~ %r%((?>/\*.*?\*/\s+))
- rb_attr\(\s*#{var_name}\s*,
- \s*#{attr_name}\s*,
- #{rw},.*?\)\s*;%xm then
- $1
- elsif @content =~ %r%Document-attr:\s#{attr_name}\s*?\n
- ((?>.*?\*/))%xm then
- $1
- else
- ''
- end
-
- RDoc::Comment.new comment, @top_level
- end
-
- ##
# Find the C code corresponding to a Ruby method
- def find_body class_name, meth_name, meth_obj, file_content, quiet = false
- case file_content
- when %r%((?>/\*.*?\*/\s*)?)
- ((?:(?:static|SWIGINTERN)\s+)?
- (?:intern\s+)?VALUE\s+#{meth_name}
- \s*(\([^)]*\))([^;]|$))%xm then
- comment = RDoc::Comment.new $1, @top_level
- body = $2
- offset, = $~.offset(2)
+ 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 = $1
+ body_text = $2
+ params = $3
+
+ remove_private_comments comment if comment
- comment.remove_private if comment
+ # see if we can find the whole body
- # try to find the whole body
- body = $& if /#{Regexp.escape body}[^(]*?\{.*?^\}/m =~ file_content
+ 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
@@ -584,70 +299,48 @@ class RDoc::Parser::C < RDoc::Parser
# distinct (for example Kernel.hash and Kernel.object_id share the same
# implementation
- override_comment = find_override_comment class_name, meth_obj
+ override_comment = find_override_comment class_name, meth_obj.name
comment = override_comment if override_comment
- comment.normalize
find_modifiers comment, meth_obj if comment
#meth_obj.params = params
meth_obj.start_collecting_tokens
tk = RDoc::RubyToken::Token.new nil, 1, 1
- tk.set_text body
+ tk.set_text body_text
meth_obj.add_token tk
- meth_obj.comment = comment
- meth_obj.offset = offset
- meth_obj.line = file_content[0, offset].count("\n") + 1
-
- body
- when %r%((?>/\*.*?\*/\s*))^\s*(\#\s*define\s+#{meth_name}\s+(\w+))%m then
- comment = RDoc::Comment.new $1, @top_level
- body = $2
- offset = $~.offset(2).first
-
- find_body class_name, $3, meth_obj, file_content, true
-
- comment.normalize
+ meth_obj.comment = strip_stars comment
+ when %r{((?>/\*.*?\*/\s*))^\s*(\#\s*define\s+#{meth_name}\s+(\w+))}m
+ comment = $1
+ body_text = $2
+ find_body class_name, $3, meth_obj, body, true
find_modifiers comment, meth_obj
meth_obj.start_collecting_tokens
tk = RDoc::RubyToken::Token.new nil, 1, 1
- tk.set_text body
+ tk.set_text body_text
meth_obj.add_token tk
- meth_obj.comment = comment
- meth_obj.offset = offset
- meth_obj.line = file_content[0, offset].count("\n") + 1
-
- body
- when %r%^\s*\#\s*define\s+#{meth_name}\s+(\w+)%m then
- # with no comment we hope the aliased definition has it and use it's
- # definition
-
- body = find_body(class_name, $1, meth_obj, file_content, true)
-
- return body if body
-
- @options.warn "No definition for #{meth_name}"
- false
- else # No body, but might still have an override comment
- comment = find_override_comment class_name, meth_obj
-
- if comment then
- comment.normalize
- find_modifiers comment, meth_obj
- meth_obj.comment = comment
+ meth_obj.comment = strip_stars(comment) + meth_obj.comment.to_s
+ 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 = strip_stars comment
else
- @options.warn "No definition for #{meth_name}"
- false
+ warn "No definition for #{meth_name}" unless @options.quiet
+ return false
end
end
+ true
end
- ##
- # Finds a RDoc::NormalClass or RDoc::NormalModule for +raw_name+
-
def find_class(raw_name, name)
unless @classes[raw_name]
if raw_name =~ /^rb_m/
@@ -688,190 +381,155 @@ class RDoc::Parser::C < RDoc::Parser
# */
# VALUE cFoo = rb_define_class("Foo", rb_cObject);
- def find_class_comment class_name, class_mod
+ def find_class_comment(class_name, class_mod)
comment = nil
- if @content =~ %r%
+ if @content =~ %r{
((?>/\*.*?\*/\s+))
(static\s+)?
void\s+
- Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)%xmi then
- comment = $1.sub(%r%Document-(?:class|module):\s+#{class_name}%, '')
- elsif @content =~ %r%Document-(?:class|module):\s+#{class_name}\s*?
- (?:<\s+[:,\w]+)?\n((?>.*?\*/))%xm then
- comment = "/*\n#{$1}"
- elsif @content =~ %r%.*((?>/\*.*?\*/\s+))
- ([\w\.\s]+\s* = \s+)?rb_define_(class|module).*?"(#{class_name})"%xm then
+ Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)?\)}xmi then # )
comment = $1
- elsif @content =~ %r%.*((?>/\*.*?\*/\s+))
- ([\w\.\s]+\s* = \s+)?rb_define_(class|module)_under.*?"(#{class_name.split('::').last})"%xm then
+ elsif @content =~ %r{Document-(?:class|module):\s+#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m then
+ comment = $1
+ elsif @content =~ %r{((?>/\*.*?\*/\s+))
+ ([\w\.\s]+\s* = \s+)?rb_define_(class|module).*?"(#{class_name})"}xm then # "
comment = $1
- else
- comment = ''
end
- comment = RDoc::Comment.new comment, @top_level
- comment.normalize
+ return unless comment
+
+ comment = strip_stars comment
- look_for_directives_in class_mod, comment
+ comment = look_for_directives_in class_mod, comment
- class_mod.add_comment comment, @top_level
+ class_mod.comment = 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, class_name = nil)
- comment = if @content =~ %r%((?>^\s*/\*.*?\*/\s+))
- rb_define_#{type}\((?:\s*(\w+),)?\s*
- "#{const_name}"\s*,
- .*?\)\s*;%xmi then
- $1
- elsif class_name and
- @content =~ %r%Document-(?:const|global|variable):\s
- #{class_name}::#{const_name}
- \s*?\n((?>.*?\*/))%xm then
- "/*\n#{$1}"
- elsif @content =~ %r%Document-(?:const|global|variable):
- \s#{const_name}
- \s*?\n((?>.*?\*/))%xm then
- "/*\n#{$1}"
- else
- ''
- end
-
- RDoc::Comment.new comment, @top_level
+ 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
##
- # Handles modifiers in +comment+ and updates +meth_obj+ as appropriate.
-
- def find_modifiers comment, meth_obj
- comment.normalize
- comment.extract_call_seq meth_obj
+ # If the comment block contains a section that looks like:
+ #
+ # call-seq:
+ # Array.new
+ # Array.new(10)
+ #
+ # use it for the parameters.
- look_for_directives_in meth_obj, comment
+ 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
- ##
- # Finds a <tt>Document-method</tt> override for +meth_obj+ on +class_name+
-
- def find_override_comment class_name, meth_obj
- name = Regexp.escape meth_obj.name
- prefix = Regexp.escape meth_obj.name_prefix
-
- comment = if @content =~ %r%Document-method:
- \s+#{class_name}#{prefix}#{name}
- \s*?\n((?>.*?\*/))%xm then
- "/*#{$1}"
- elsif @content =~ %r%Document-method:
- \s#{name}\s*?\n((?>.*?\*/))%xm then
- "/*#{$1}"
- end
-
- return unless comment
-
- RDoc::Comment.new comment, @top_level
+ 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
- ##
- # Creates a new RDoc::Attr +attr_name+ on class +var_name+ that is either
- # +read+, +write+ or both
-
- def handle_attr(var_name, attr_name, read, write)
+ def handle_attr(var_name, attr_name, reader, writer)
rw = ''
- rw << 'R' if '1' == read
- rw << 'W' if '1' == write
+ rw << 'R' if reader
+ rw << 'W' if writer
class_name = @known_classes[var_name]
return unless class_name
- class_obj = find_class var_name, class_name
-
- return unless class_obj
+ class_obj = find_class(var_name, class_name)
- comment = find_attr_comment var_name, attr_name
- comment.normalize
-
- name = attr_name.gsub(/rb_intern\("([^"]+)"\)/, '\1')
-
- attr = RDoc::Attr.new '', name, rw, comment
-
- attr.record_location @top_level
- class_obj.add_attribute attr
- @stats.add_attribute attr
+ if class_obj
+ comment = find_attr_comment(attr_name)
+ comment = strip_stars comment
+ att = RDoc::Attr.new '', attr_name, rw, comment
+ @stats.add_method att
+ class_obj.add_attribute(att)
+ end
end
- ##
- # Creates a new RDoc::NormalClass or RDoc::NormalModule based on +type+
- # named +class_name+ in +parent+ which was assigned to the C +var_name+.
-
def handle_class_module(var_name, type, class_name, parent, in_module)
parent_name = @known_classes[parent] || parent
if in_module then
- enclosure = @classes[in_module] || @store.find_c_enclosure(in_module)
+ enclosure = @classes[in_module] || @@enclosure_classes[in_module]
if enclosure.nil? and enclosure = @known_classes[in_module] then
- enc_type = /^rb_m/ =~ in_module ? :module : :class
- handle_class_module in_module, enc_type, enclosure, nil, nil
+ type = /^rb_m/ =~ in_module ? "module" : "class"
+ handle_class_module in_module, type, enclosure, nil, nil
enclosure = @classes[in_module]
end
unless enclosure then
- @enclosure_dependencies[in_module] << var_name
- @missing_dependencies[var_name] =
- [var_name, type, class_name, parent, in_module]
-
+ warn "Enclosing class/module '#{in_module}' for #{type} #{class_name} not known"
return
end
else
enclosure = @top_level
end
- if type == :class then
+ if type == "class" then
full_name = if RDoc::ClassModule === enclosure then
enclosure.full_name + "::#{class_name}"
else
class_name
end
- if @content =~ %r%Document-class:\s+#{full_name}\s*<\s+([:,\w]+)% then
+ 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.top_level
find_class_comment cm.full_name, cm
- case cm
- when RDoc::NormalClass
- @stats.add_class cm
- when RDoc::NormalModule
- @stats.add_module cm
- end
-
@classes[var_name] = cm
+ @@enclosure_classes[var_name] = cm
@known_classes[var_name] = cm.full_name
- @store.add_c_enclosure var_name, cm
end
##
- # Adds constants. By providing some_value: at the start of the comment you
- # can override the C value of the comment to give a friendly definition.
+ # 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 <tt>INT2FIX(300)</tt> with the value +300+ in the output
- # RDoc. Values may include quotes and escaped colons (\:).
+ # 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)
class_name = @known_classes[var_name]
@@ -881,20 +539,25 @@ class RDoc::Parser::C < RDoc::Parser
class_obj = find_class var_name, class_name
unless class_obj then
- @options.warn 'Enclosing class or module %p is not known' % [const_name]
+ warn "Enclosing class/module #{const_name.inspect} not known"
return
end
- comment = find_const_comment type, const_name, class_name
- comment.normalize
+ comment = find_const_comment type, const_name
+ comment = strip_stars comment
+ comment = normalize_comment comment
# 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
- no_match, new_definition, new_comment = comment.text.split(/(\A.*):/)
+ elements = comment.split ':'
+
+ if elements.nil? or elements.empty? then
+ con = RDoc::Constant.new const_name, definition, comment
+ else
+ new_definition = elements[0..-2].join(':')
- if no_match and no_match.empty? then
if new_definition.empty? then # Default to literal C definition
new_definition = definition
else
@@ -904,19 +567,18 @@ class RDoc::Parser::C < RDoc::Parser
new_definition.sub!(/\A(\s+)/, '')
- new_comment = "#{$1}#{new_comment.lstrip}"
-
- new_comment = RDoc::Comment.new new_comment, @top_level
+ new_comment = if $1.nil? then
+ elements.last.lstrip
+ else
+ "#{$1}#{elements.last.lstrip}"
+ end
con = RDoc::Constant.new const_name, new_definition, new_comment
- else
- con = RDoc::Constant.new const_name, definition, comment
end
else
con = RDoc::Constant.new const_name, definition, comment
end
- con.record_location @top_level
@stats.add_constant con
class_obj.add_constant con
end
@@ -928,59 +590,46 @@ class RDoc::Parser::C < RDoc::Parser
body.gsub(/^#ifdef HAVE_PROTOTYPES.*?#else.*?\n(.*?)#endif.*?\n/m, '\1')
end
- ##
- # Adds an RDoc::AnyMethod +meth_name+ defined on a class or module assigned
- # to +var_name+. +type+ is the type of method definition function used.
- # +singleton_method+ and +module_function+ create a singleton method.
-
- def handle_method(type, var_name, meth_name, function, param_count,
+ def handle_method(type, var_name, meth_name, meth_body, param_count,
source_file = nil)
class_name = @known_classes[var_name]
- singleton = @singleton_classes.key? 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'
- singleton = true
- type = 'method' # force public
+ if meth_name == "initialize" then
+ meth_name = "new"
+ type = "singleton_method"
end
meth_obj = RDoc::AnyMethod.new '', meth_name
- meth_obj.c_function = function
- meth_obj.singleton =
- singleton || %w[singleton_method module_function].include?(type)
+ meth_obj.singleton = %w[singleton_method module_function].include? type
p_count = Integer(param_count) rescue -1
+ if p_count < 0 then
+ 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
if File.exist? file_name then
- file_content = File.read file_name
+ body = (@@known_bodies[file_name] ||= File.read(file_name))
else
- @options.warn "unknown source #{source_file} for #{meth_name} in #{@file_name}"
+ warn "unknown source #{source_file} for #{meth_name} in #{@file_name}"
end
else
- file_content = @content
+ body = @content
end
- body = find_body class_name, function, meth_obj, file_content
-
- if body and meth_obj.document_self then
- meth_obj.params = if p_count < -1 then # -2 is Array
- '(*args)'
- elsif p_count == -1 then # argc, argv
- rb_scan_args body
- else
- "(#{(1..p_count).map { |i| "p#{i}" }.join ', '})"
- end
-
-
- meth_obj.record_location @top_level
+ 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
meth_obj.visibility = :private if 'private_method' == type
@@ -988,192 +637,67 @@ class RDoc::Parser::C < RDoc::Parser
end
end
- ##
- # Registers a singleton class +sclass_var+ as a singleton of +class_var+
-
- def handle_singleton sclass_var, class_var
- class_name = @known_classes[class_var]
-
- @known_classes[sclass_var] = class_name
- @singleton_classes[sclass_var] = class_name
- end
-
- ##
- # Normalizes tabs in +body+
-
def handle_tab_width(body)
if /\t/ =~ body
tab_width = @options.tab_width
body.split(/\n/).map do |line|
- 1 while line.gsub!(/\t+/) do
- ' ' * (tab_width * $&.length - $`.length % tab_width)
- end && $~
+ 1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)} && $~ #`
line
- end.join "\n"
+ end .join("\n")
else
body
end
end
##
- # Loads the variable map with the given +name+ from the RDoc::Store, if
- # present.
-
- def load_variable_map map_name
- return {} unless files = @store.cache[map_name]
- return {} unless name_map = files[@file_name]
-
- class_map = {}
-
- name_map.each do |variable, name|
- next unless mod = @store.find_class_or_module(name)
-
- class_map[variable] = if map_name == :c_class_variables then
- mod
- else
- name
- end
- @known_classes[variable] = name
- end
-
- class_map
- end
-
- ##
# Look for directives in a normal comment block:
#
# /*
# * :title: My Awesome Project
# */
#
- # This method modifies the +comment+
+ # This routine modifies it's parameter
+
+ def look_for_directives_in(context, comment)
+ preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
- def look_for_directives_in context, comment
- @preprocess.handle comment, context do |directive, param|
+ preprocess.handle comment, context do |directive, param|
case directive
when 'main' then
@options.main_page = param
''
when 'title' then
- @options.default_title = param if @options.respond_to? :default_title=
+ @options.title = param
''
end
end
comment
end
-
- ##
- # Extracts parameters from the +method_body+ and returns a method
- # parameter string. Follows 1.9.3dev's scan-arg-spec, see README.EXT
-
- def rb_scan_args method_body
- method_body =~ /rb_scan_args\((.*?)\)/m
- return '(*args)' unless $1
-
- $1.split(/,/)[2] =~ /"(.*?)"/ # format argument
- format = $1.split(//)
-
- lead = opt = trail = 0
-
- if format.first =~ /\d/ then
- lead = $&.to_i
- format.shift
- if format.first =~ /\d/ then
- opt = $&.to_i
- format.shift
- if format.first =~ /\d/ then
- trail = $&.to_i
- format.shift
- block_arg = true
- end
- end
- end
-
- if format.first == '*' and not block_arg then
- var = true
- format.shift
- if format.first =~ /\d/ then
- trail = $&.to_i
- format.shift
- end
- end
-
- if format.first == ':' then
- hash = true
- format.shift
- end
-
- if format.first == '&' then
- block = true
- format.shift
- end
-
- # if the format string is not empty there's a bug in the C code, ignore it
-
- args = []
- position = 1
-
- (1...(position + lead)).each do |index|
- args << "p#{index}"
- end
-
- position += lead
-
- (position...(position + opt)).each do |index|
- args << "p#{index} = v#{index}"
- end
-
- position += opt
-
- if var then
- args << '*args'
- position += 1
- end
-
- (position...(position + trail)).each do |index|
- args << "p#{index}"
- end
-
- position += trail
-
- if hash then
- args << "p#{position} = {}"
- position += 1
- end
-
- args << '&block' if block
-
- "(#{args.join ', '})"
- 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_%, '//')
+ @content.gsub!(%r{//.*rb_define_}, '//')
+ end
+
+ def remove_private_comments(comment)
+ comment.gsub!(/\/?\*--\n(.*?)\/?\*\+\+/m, '')
+ comment.sub!(/\/?\*--\n.*/m, '')
end
##
- # Extracts the classes, modules, methods, attributes, constants and aliases
- # from a C file and returns an RDoc::TopLevel for this file
+ # Extract the classes/modules and methods from a C file and return the
+ # corresponding top-level object
def scan
remove_commented_out_lines
-
- do_modules
do_classes
- do_missing
-
do_constants
do_methods
do_includes
do_aliases
- do_attrs
-
- @store.add_c_variables self
-
@top_level
end
diff --git a/lib/rdoc/parser/changelog.rb b/lib/rdoc/parser/changelog.rb
deleted file mode 100644
index 782d8f09bf..0000000000
--- a/lib/rdoc/parser/changelog.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-require 'time'
-
-##
-# A ChangeLog file parser.
-#
-# This parser converts a ChangeLog into an RDoc::Markup::Document. When
-# viewed as HTML a ChangeLog page will have an entry for each day's entries in
-# the sidebar table of contents.
-#
-# This parser is meant to parse the MRI ChangeLog, but can be used to parse any
-# {GNU style Change
-# Log}[http://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html].
-
-class RDoc::Parser::ChangeLog < RDoc::Parser
-
- include RDoc::Parser::Text
-
- parse_files_matching(/(\/|\\|\A)ChangeLog[^\/\\]*\z/)
-
- ##
- # Attaches the +continuation+ of the previous line to the +entry_body+.
- #
- # Continued function listings are joined together as a single entry.
- # Continued descriptions are joined to make a single paragraph.
-
- def continue_entry_body entry_body, continuation
- return unless last = entry_body.last
-
- if last =~ /\)\s*\z/ and continuation =~ /\A\(/ then
- last.sub!(/\)\s*\z/, ',')
- continuation.sub!(/\A\(/, '')
- end
-
- if last =~ /\s\z/ then
- last << continuation
- else
- last << ' ' << continuation
- end
- end
-
- ##
- # Creates an RDoc::Markup::Document given the +groups+ of ChangeLog entries.
-
- def create_document groups
- doc = RDoc::Markup::Document.new
- doc.omit_headings_below = 2
- doc.file = @top_level
-
- doc << RDoc::Markup::Heading.new(1, File.basename(@file_name))
- doc << RDoc::Markup::BlankLine.new
-
- groups.sort_by do |day,| day end.reverse_each do |day, entries|
- doc << RDoc::Markup::Heading.new(2, day.dup)
- doc << RDoc::Markup::BlankLine.new
-
- doc.concat create_entries entries
- end
-
- doc
- end
-
- ##
- # Returns a list of ChangeLog entries an RDoc::Markup nodes for the given
- # +entries+.
-
- def create_entries entries
- out = []
-
- entries.each do |entry, items|
- out << RDoc::Markup::Heading.new(3, entry)
- out << RDoc::Markup::BlankLine.new
-
- out << create_items(items)
- end
-
- out
- end
-
- ##
- # Returns an RDoc::Markup::List containing the given +items+ in the
- # ChangeLog
-
- def create_items items
- list = RDoc::Markup::List.new :NOTE
-
- items.each do |item|
- item =~ /\A(.*?(?:\([^)]+\))?):\s*/
-
- title = $1
- body = $'
-
- paragraph = RDoc::Markup::Paragraph.new body
- list_item = RDoc::Markup::ListItem.new title, paragraph
- list << list_item
- end
-
- list
- end
-
- ##
- # Groups +entries+ by date.
-
- def group_entries entries
- entries.group_by do |title, _|
- begin
- Time.parse(title).strftime '%Y-%m-%d'
- rescue NoMethodError, ArgumentError
- time, = title.split ' ', 2
- Time.parse(time).strftime '%Y-%m-%d'
- end
- end
- end
-
- ##
- # Parses the entries in the ChangeLog.
- #
- # Returns an Array of each ChangeLog entry in order of parsing.
- #
- # A ChangeLog entry is an Array containing the ChangeLog title (date and
- # committer) and an Array of ChangeLog items (file and function changed with
- # description).
- #
- # An example result would be:
- #
- # [ 'Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>',
- # [ 'README.EXT: Converted to RDoc format',
- # 'README.EXT.ja: ditto']]
-
- def parse_entries
- entries = []
- entry_name = nil
- entry_body = []
-
- @content.each_line do |line|
- case line
- when /^\s*$/ then
- next
- when /^\w.*/ then
- entries << [entry_name, entry_body] if entry_name
-
- entry_name = $&
-
- begin
- time = Time.parse entry_name
- # HACK Ruby 1.8 does not raise ArgumentError for Time.parse "Other"
- entry_name = nil unless entry_name =~ /#{time.year}/
- rescue NoMethodError
- time, = entry_name.split ' ', 2
- time = Time.parse time
- rescue ArgumentError
- entry_name = nil
- end
-
- entry_body = []
- when /^(\t| {8})?\*\s*(.*)/ then # "\t* file.c (func): ..."
- entry_body << $2
- when /^(\t| {8})?\s*(\(.*)/ then # "\t(func): ..."
- entry = $2
-
- if entry_body.last =~ /:/ then
- entry_body << entry
- else
- continue_entry_body entry_body, entry
- end
- when /^(\t| {8})?\s*(.*)/ then
- continue_entry_body entry_body, $2
- end
- end
-
- entries << [entry_name, entry_body] if entry_name
-
- entries.reject! do |(entry,_)|
- entry == nil
- end
-
- entries
- end
-
- ##
- # Converts the ChangeLog into an RDoc::Markup::Document
-
- def scan
- entries = parse_entries
- grouped_entries = group_entries entries
-
- doc = create_document grouped_entries
-
- @top_level.comment = doc
-
- @top_level
- end
-
-end
-
diff --git a/lib/rdoc/parser/markdown.rb b/lib/rdoc/parser/markdown.rb
deleted file mode 100644
index 6fd88cf614..0000000000
--- a/lib/rdoc/parser/markdown.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-##
-# Parse a Markdown format file. The parsed RDoc::Markup::Document is attached
-# as a file comment.
-
-class RDoc::Parser::Markdown < RDoc::Parser
-
- include RDoc::Parser::Text
-
- parse_files_matching(/\.(md|markdown)(?:\.[^.]+)?$/)
-
- ##
- # Creates an Markdown-format TopLevel for the given file.
-
- def scan
- comment = RDoc::Comment.new @content, @top_level
- comment.format = 'markdown'
-
- @top_level.comment = comment
- end
-
-end
-
-
diff --git a/lib/rdoc/parser/perl.rb b/lib/rdoc/parser/perl.rb
new file mode 100644
index 0000000000..0023a013a6
--- /dev/null
+++ b/lib/rdoc/parser/perl.rb
@@ -0,0 +1,165 @@
+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/rd.rb b/lib/rdoc/parser/rd.rb
deleted file mode 100644
index 09069ae297..0000000000
--- a/lib/rdoc/parser/rd.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-# Parse a RD format file. The parsed RDoc::Markup::Document is attached as a
-# file comment.
-
-class RDoc::Parser::RD < RDoc::Parser
-
- include RDoc::Parser::Text
-
- parse_files_matching(/\.rd(?:\.[^.]+)?$/)
-
- ##
- # Creates an rd-format TopLevel for the given file.
-
- def scan
- comment = RDoc::Comment.new @content, @top_level
- comment.format = 'rd'
-
- @top_level.comment = comment
- end
-
-end
-
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index bfddd53270..bfb118c416 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -7,6 +7,15 @@
# by Keiju ISHITSUKA (Nippon Rational Inc.)
#
+require 'rdoc/ruby_token'
+require 'rdoc/ruby_lex'
+
+require 'rdoc/code_objects'
+require 'rdoc/tokenstream'
+require 'rdoc/markup/preprocess'
+require 'rdoc/parser'
+require 'rdoc/parser/ruby_tools'
+
$TOKEN_DEBUG ||= nil
##
@@ -94,7 +103,7 @@ $TOKEN_DEBUG ||= nil
# You can force the name of a method using the :method: directive:
#
# ##
-# # :method: some_method!
+# # :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:
@@ -105,7 +114,7 @@ $TOKEN_DEBUG ||= nil
# You can also use the :singleton-method: directive with a name:
#
# ##
-# # :singleton-method: some_method!
+# # :singleton-method: woo_hoo!
#
# Additionally you can mark a method as an attribute by
# using :attr:, :attr_reader:, :attr_writer: or :attr_accessor:. Just like
@@ -153,9 +162,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
SINGLE = "<<"
- ##
- # Creates a new Ruby parser.
-
def initialize(top_level, file_name, content, options, stats)
super
@@ -164,10 +170,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
@scanner = RDoc::RubyLex.new content, @options
@scanner.exception_on_syntax_error = false
@prev_seek = nil
- @markup = @options.markup
-
- @encoding = nil
- @encoding = @options.encoding if Object.const_defined? :Encoding
reset
end
@@ -178,7 +180,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
def collect_first_comment
skip_tkspace
comment = ''
- comment.force_encoding @encoding if @encoding
first_line = true
tk = get_tk
@@ -205,21 +206,28 @@ class RDoc::Parser::Ruby < RDoc::Parser
unget_tk tk
- new_comment comment
+ comment
end
- ##
- # Aborts with +msg+
-
def error(msg)
msg = make_message msg
-
- abort msg
+ $stderr.puts msg
+ exit false
end
##
- # Looks for a true or false token. Returns false if TkFALSE or TkNIL are
- # found.
+ # 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
@@ -237,48 +245,32 @@ class RDoc::Parser::Ruby < RDoc::Parser
##
# Look for the name of a class of module (optionally with a leading :: or
- # with :: separated named) and return the ultimate name, the associated
- # container, and the given name (with the ::).
+ # with :: separated named) and return the ultimate name and container
- def get_class_or_module container, ignore_constants = false
+ def get_class_or_module(container)
skip_tkspace
name_t = get_tk
- given_name = ''
# class ::A -> A is in the top level
case name_t
when TkCOLON2, TkCOLON3 then # bug
name_t = get_tk
container = @top_level
- given_name << '::'
end
skip_tkspace false
- given_name << name_t.name
while TkCOLON2 === peek_tk do
prev_container = container
container = container.find_module_named name_t.name
- container ||=
- if ignore_constants then
- RDoc::Context.new
- else
- c = prev_container.add_module RDoc::NormalModule, name_t.name
- c.ignore unless prev_container.document_children
- c
- end
-
- container.record_location @top_level
-
+ unless container then
+ container = prev_container.add_module RDoc::NormalModule, name_t.name
+ end
get_tk
- skip_tkspace false
name_t = get_tk
- given_name << '::' << name_t.name
end
-
skip_tkspace false
-
- return [container, name_t, given_name]
+ return [container, name_t]
end
##
@@ -286,10 +278,9 @@ class RDoc::Parser::Ruby < RDoc::Parser
def get_class_specification
tk = get_tk
- return 'self' if TkSELF === tk
- return '' if TkGVAR === tk
+ return "self" if TkSELF === tk
- res = ''
+ res = ""
while TkCOLON2 === tk or TkCOLON3 === tk or TkCONSTANT === tk do
res += tk.name
tk = get_tk
@@ -338,9 +329,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
def get_constant_with_optional_parens
skip_tkspace false
-
nest = 0
-
while TkLPAREN === (tk = peek_tk) or TkfLPAREN === tk do
get_tk
skip_tkspace
@@ -358,9 +347,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
name
end
- ##
- # Extracts a name or symbol from the token stream.
-
def get_symbol_or_name
tk = get_tk
case tk
@@ -375,10 +361,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
text
when TkId, TkOp then
tk.name
- when TkAMPER,
- TkDSTRING,
- TkSTAR,
- TkSTRING then
+ when TkSTRING, TkDSTRING then
tk.text
else
raise RDoc::Error, "Name or symbol expected (got #{tk})"
@@ -391,18 +374,35 @@ class RDoc::Parser::Ruby < RDoc::Parser
# # :stopdoc:
# # Don't display comment from this point forward
#
- # This routine modifies its +comment+ parameter.
+ # This routine modifies it's parameter
- def look_for_directives_in context, comment
- @preprocess.handle comment, context do |directive, param|
+ def look_for_directives_in(context, comment)
+ preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
+
+ preprocess.handle comment, context do |directive, param|
case directive
+ when 'enddoc' then
+ throw :enddoc
+ when 'main' then
+ @options.main_page = param
+ ''
when 'method', 'singleton-method',
'attr', 'attr_accessor', 'attr_reader', 'attr_writer' then
false # handled elsewhere
when 'section' then
- context.set_current_section param, comment.dup
- comment.text = ''
+ 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
+ ''
end
end
@@ -421,47 +421,28 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
##
- # Creates a comment with the correct format
-
- def new_comment comment
- c = RDoc::Comment.new comment, @top_level
- c.format = @markup
- c
- end
-
- ##
# Creates an RDoc::Attr for the name following +tk+, setting the comment to
# +comment+.
def parse_attr(context, single, tk, comment)
- offset = tk.seek
- line_no = tk.line_no
-
args = parse_symbol_arg 1
- if args.size > 0 then
+ 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, single == SINGLE
- att.record_location @top_level
- att.offset = offset
- att.line = line_no
-
+ att = RDoc::Attr.new get_tkread, name, rw, comment
read_documentation_modifiers att, RDoc::ATTR_MODIFIERS
-
- context.add_attribute att
-
- @stats.add_attribute att
+ if att.document_self
+ context.add_attribute(att)
+ end
else
- warn "'attr' ignored - looks like a variable"
+ warn("'attr' ignored - looks like a variable")
end
end
@@ -470,16 +451,14 @@ class RDoc::Parser::Ruby < RDoc::Parser
# comment for each to +comment+.
def parse_attr_accessor(context, single, tk, comment)
- offset = tk.seek
- line_no = tk.line_no
-
args = parse_symbol_arg
+ read = get_tkread
rw = "?"
+ # TODO If nodoc is given, don't document any of them
+
tmp = RDoc::CodeObject.new
read_documentation_modifiers tmp, RDoc::ATTR_MODIFIERS
- # TODO In most other places we let the context keep track of document_self
- # and add found items appropriately but here we do not. I'm not sure why.
return unless tmp.document_self
case tk.name
@@ -491,30 +470,17 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
for name in args
- att = RDoc::Attr.new get_tkread, name, rw, comment, single == SINGLE
- att.record_location @top_level
- att.offset = offset
- att.line = line_no
-
+ att = RDoc::Attr.new get_tkread, name, rw, comment
context.add_attribute att
- @stats.add_attribute att
end
end
- ##
- # Parses an +alias+ in +context+ with +comment+
-
def parse_alias(context, single, tk, comment)
- offset = tk.seek
- line_no = tk.line_no
-
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 }
@@ -531,22 +497,11 @@ class RDoc::Parser::Ruby < RDoc::Parser
return
end
- al = RDoc::Alias.new(get_tkread, old_name, new_name, comment,
- single == SINGLE)
- al.record_location @top_level
- al.offset = offset
- al.line = line_no
-
+ al = RDoc::Alias.new get_tkread, old_name, new_name, comment
read_documentation_modifiers al, RDoc::ATTR_MODIFIERS
- context.add_alias al
- @stats.add_alias al
-
- al
+ context.add_alias al if al.document_self
end
- ##
- # Extracts call parameters from the token stream.
-
def parse_call_parameters(tk)
end_token = case tk
when TkLPAREN, TkfLPAREN
@@ -584,124 +539,65 @@ class RDoc::Parser::Ruby < RDoc::Parser
res
end
- ##
- # Parses a class in +context+ with +comment+
-
- def parse_class container, single, tk, comment
- offset = tk.seek
- line_no = tk.line_no
-
- declaration_context = container
- container, name_t, given_name = get_class_or_module container
+ 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 given_name =~ /^::/ then
- declaration_context = @top_level
- given_name = $'
- end
+ superclass = "Object"
if TkLT === peek_tk then
get_tk
skip_tkspace
superclass = get_class_specification
- superclass = '(unknown)' if superclass.empty?
+ superclass = "<unknown>" if superclass.empty?
end
cls_type = single == SINGLE ? RDoc::SingleClass : RDoc::NormalClass
- cls = declaration_context.add_class cls_type, given_name, superclass
- cls.ignore unless container.document_children
+ cls = container.add_class cls_type, name, superclass
read_documentation_modifiers cls, RDoc::CLASS_MODIFIERS
cls.record_location @top_level
- cls.offset = offset
- cls.line = line_no
+ cls.comment = comment
- cls.add_comment comment, @top_level
-
- @top_level.add_to_classes_or_modules cls
@stats.add_class cls
parse_statements cls
when TkLSHFT
case name = get_class_specification
- when 'self', container.name
+ when "self", container.name
parse_statements container, SINGLE
- else
- other = @store.find_class_named name
+ when /\A[A-Z]/
+ other = RDoc::TopLevel.find_class_named name
unless other then
- if name =~ /^::/ then
- name = $'
- container = @top_level
- end
-
other = container.add_module RDoc::NormalModule, name
other.record_location @top_level
- other.offset = offset
- other.line = line_no
-
- # class << $gvar
- other.ignore if name.empty?
-
- other.add_comment comment, @top_level
- end
-
- # notify :nodoc: all if not a constant-named class/module
- # (and remove any comment)
- unless name =~ /\A(::)?[A-Z]/ then
- other.document_self = nil
- other.document_children = false
- other.clear_comment
+ other.comment = comment
end
- @top_level.add_to_classes_or_modules other
@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
- ##
- # Parses a constant in +context+ with +comment+. If +ignore_constants+ is
- # true, no found constants will be added to RDoc.
-
- def parse_constant container, tk, comment, ignore_constants = false
- offset = tk.seek
- line_no = tk.line_no
-
+ def parse_constant(container, tk, comment)
name = tk.name
skip_tkspace false
-
- return unless name =~ /^\w+$/
-
eq_tk = get_tk
- if TkCOLON2 === eq_tk then
- unget_tk eq_tk
- unget_tk tk
-
- container, name_t, = get_class_or_module container, ignore_constants
-
- name = name_t.name
-
- eq_tk = get_tk
- end
-
unless TkASSIGN === eq_tk then
unget_tk eq_tk
- return false
+ return
end
- value = ''
- con = RDoc::Constant.new name, value, comment
nest = 0
get_tkread
@@ -710,7 +606,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
if TkGT === tk then
unget_tk tk
unget_tk eq_tk
- return false
+ return
end
rhs_name = ''
@@ -718,32 +614,29 @@ class RDoc::Parser::Ruby < RDoc::Parser
loop do
case tk
when TkSEMICOLON then
- break if nest <= 0
- when TkLPAREN, TkfLPAREN, TkLBRACE, TkfLBRACE, TkLBRACK, TkfLBRACK,
- TkDO, TkIF, TkUNLESS, TkCASE, TkDEF, TkBEGIN then
+ break
+ when TkLPAREN, TkfLPAREN, TkLBRACE, TkLBRACK, TkDO, TkIF, TkUNLESS,
+ TkCASE then
nest += 1
when TkRPAREN, TkRBRACE, TkRBRACK, TkEND then
nest -= 1
when TkCOMMENT then
- if nest <= 0 &&
- (@scanner.lex_state == EXPR_END || !@scanner.continue) then
+ if nest <= 0 && @scanner.lex_state == EXPR_END
unget_tk tk
break
- else
- unget_tk tk
- read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
end
when TkCONSTANT then
rhs_name << tk.name
if nest <= 0 and TkNL === peek_tk then
mod = if rhs_name =~ /^::/ then
- @store.find_class_or_module rhs_name
+ RDoc::TopLevel.find_class_or_module rhs_name
else
container.find_module_named rhs_name
end
- container.add_module_alias mod, name, @top_level if mod
+ container.add_module_alias mod, name if mod
+ get_tk # TkNL
break
end
when TkNL then
@@ -760,66 +653,53 @@ class RDoc::Parser::Ruby < RDoc::Parser
tk = get_tk
end
- res = get_tkread.gsub(/^[ \t]+/, '').strip
+ res = get_tkread.tr("\n", " ").strip
res = "" if res == ";"
- value.replace res
- con.record_location @top_level
- con.offset = offset
- con.line = line_no
+ con = RDoc::Constant.new name, res, comment
read_documentation_modifiers con, RDoc::CONSTANT_MODIFIERS
@stats.add_constant con
- con = container.add_constant con
-
- true
+ container.add_constant con if con.document_self
end
##
# Generates an RDoc::Method or RDoc::Attr from +comment+ by looking for
# :method: or :attr: directives in +comment+.
- def parse_comment container, tk, comment
- return parse_comment_tomdoc container, tk, comment if @markup == 'tomdoc'
- column = tk.char_no
- offset = tk.seek
+ def parse_comment(container, tk, comment)
line_no = tk.line_no
+ column = tk.char_no
- text = comment.text
-
- singleton = !!text.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
+ singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
# REFACTOR
- if text.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
+ if comment.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
name = $1 unless $1.empty?
meth = RDoc::GhostMethod.new get_tkread, name
- meth.record_location @top_level
meth.singleton = singleton
- meth.offset = offset
- meth.line = line_no
meth.start_collecting_tokens
- indent = TkSPACE.new 0, 1, 1
+ indent = TkSPACE.new nil, 1, 1
indent.set_text " " * column
- position_comment = TkCOMMENT.new 0, line_no, 1
- position_comment.set_text "# File #{@top_level.relative_name}, line #{line_no}"
+ position_comment = TkCOMMENT.new nil, line_no, 1
+ position_comment.set_text "# File #{@top_level.absolute_name}, line #{line_no}"
meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
meth.params = ''
- comment.normalize
- comment.extract_call_seq meth
+ extract_call_seq comment, meth
return unless meth.name
- container.add_method meth
+ container.add_method meth if meth.document_self
meth.comment = comment
@stats.add_method meth
- elsif text.sub!(/# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then
+ elsif comment.sub!(/# +:?(attr(_reader|_writer|_accessor)?:) *(\S*).*?\n/i, '') then
rw = case $1
when 'attr_reader' then 'R'
when 'attr_writer' then 'W'
@@ -828,92 +708,21 @@ class RDoc::Parser::Ruby < RDoc::Parser
name = $3 unless $3.empty?
- # TODO authorize 'singleton-attr...'?
att = RDoc::Attr.new get_tkread, name, rw, comment
- att.record_location @top_level
- att.offset = offset
- att.line = line_no
-
container.add_attribute att
- @stats.add_attribute att
- end
-
- true
- end
-
- ##
- # Creates an RDoc::Method on +container+ from +comment+ if there is a
- # Signature section in the comment
- def parse_comment_tomdoc container, tk, comment
- return unless signature = RDoc::TomDoc.signature(comment)
- offset = tk.seek
- line_no = tk.line_no
-
- name, = signature.split %r%[ \(]%, 2
-
- meth = RDoc::GhostMethod.new get_tkread, name
- meth.record_location @top_level
- meth.offset = offset
- meth.line = line_no
-
- meth.start_collecting_tokens
- indent = TkSPACE.new 0, 1, 1
- indent.set_text " " * offset
-
- position_comment = TkCOMMENT.new 0, line_no, 1
- position_comment.set_text "# File #{@top_level.relative_name}, line #{line_no}"
- meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
-
- meth.call_seq = signature
-
- comment.normalize
-
- return unless meth.name
-
- container.add_method meth
-
- meth.comment = comment
-
- @stats.add_method meth
- end
-
- ##
- # Parses an +include+ in +context+ with +comment+
-
- def parse_include context, comment
- loop do
- skip_tkspace_comment
-
- name = get_constant_with_optional_parens
-
- unless name.empty? then
- incl = context.add_include RDoc::Include.new(name, comment)
- incl.record_location @top_level
- end
-
- return unless TkCOMMA === peek_tk
-
- get_tk
+ @stats.add_method att
end
end
- ##
- # Parses an +extend+ in +context+ with +comment+
-
- def parse_extend context, comment
+ def parse_include(context, comment)
loop do
skip_tkspace_comment
name = get_constant_with_optional_parens
-
- unless name.empty? then
- incl = context.add_extend RDoc::Extend.new(name, comment)
- incl.record_location @top_level
- end
+ context.add_include RDoc::Include.new(name, comment) unless name.empty?
return unless TkCOMMA === peek_tk
-
get_tk
end
end
@@ -949,14 +758,16 @@ class RDoc::Parser::Ruby < RDoc::Parser
def parse_meta_attr(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
- if comment.text.sub!(/^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then
+ if comment.sub!(/^# +:?(attr(_reader|_writer|_accessor)?): *(\S*).*?\n/i, '') then
rw = case $1
when 'attr_reader' then 'R'
when 'attr_writer' then 'W'
@@ -966,32 +777,22 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
if name then
- att = RDoc::Attr.new get_tkread, name, rw, comment, single == SINGLE
- att.record_location @top_level
-
+ att = RDoc::Attr.new get_tkread, name, rw, comment
context.add_attribute att
- @stats.add_attribute att
else
args.each do |attr_name|
- att = RDoc::Attr.new(get_tkread, attr_name, rw, comment,
- single == SINGLE)
- att.record_location @top_level
-
+ att = RDoc::Attr.new get_tkread, attr_name, rw, comment
context.add_attribute att
- @stats.add_attribute att
end
end
-
- att
end
##
# Parses a meta-programmed method
def parse_meta_method(container, single, tk, comment)
- column = tk.char_no
- offset = tk.seek
line_no = tk.line_no
+ column = tk.char_no
start_collecting_tokens
add_token tk
@@ -999,9 +800,9 @@ class RDoc::Parser::Ruby < RDoc::Parser
skip_tkspace false
- singleton = !!comment.text.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
+ singleton = !!comment.sub!(/(^# +:?)(singleton-)(method:)/, '\1\3')
- if comment.text.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
+ if comment.sub!(/^# +:?method: *(\S*).*?\n/i, '') then
name = $1 unless $1.empty?
end
@@ -1022,29 +823,25 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
meth = RDoc::MetaMethod.new get_tkread, name
- meth.record_location @top_level
- meth.offset = offset
- meth.line = line_no
meth.singleton = singleton
remove_token_listener self
meth.start_collecting_tokens
- indent = TkSPACE.new 0, 1, 1
+ indent = TkSPACE.new nil, 1, 1
indent.set_text " " * column
- position_comment = TkCOMMENT.new 0, line_no, 1
- position_comment.value = "# File #{@top_level.relative_name}, line #{line_no}"
+ position_comment = TkCOMMENT.new nil, line_no, 1
+ position_comment.value = "# File #{@top_level.absolute_name}, line #{line_no}"
meth.add_tokens [position_comment, NEWLINE_TOKEN, indent]
meth.add_tokens @token_stream
token_listener meth do
meth.params = ''
- comment.normalize
- comment.extract_call_seq meth
+ extract_call_seq comment, meth
- container.add_method meth
+ container.add_method meth if meth.document_self
last_tk = tk
@@ -1056,9 +853,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
break unless last_tk and TkCOMMA === last_tk
when TkSPACE then
# expression continues
- when TkDO then
- parse_statements container, single, meth
- break
else
last_tk = tk
end
@@ -1068,8 +862,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
meth.comment = comment
@stats.add_method meth
-
- meth
end
##
@@ -1079,9 +871,8 @@ class RDoc::Parser::Ruby < RDoc::Parser
added_container = nil
meth = nil
name = nil
- column = tk.char_no
- offset = tk.seek
line_no = tk.line_no
+ column = tk.char_no
start_collecting_tokens
add_token tk
@@ -1089,45 +880,25 @@ class RDoc::Parser::Ruby < RDoc::Parser
token_listener self do
@scanner.instance_eval do @lex_state = EXPR_FNAME end
- skip_tkspace
+ skip_tkspace false
name_t = get_tk
back_tk = skip_tkspace
meth = nil
added_container = false
- case dot = get_tk
- when TkDOT, TkCOLON2 then
+ 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, TkMOD then
- name = case name_t2
- # NOTE: work around '[' being consumed early and not being
- # re-tokenized as a TkAREF
- when TkfLBRACK then
- get_tk
- '[]'
- else
- name_t2.name
- end
+ 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
- constant = prev_container.constants.find do |const|
- const.name == name_t.name
- end
-
- if constant then
- parse_method_dummy prev_container
- return
- end
- end
-
unless container then
added_container = true
obj = name_t.name.split("::").inject(Object) do |state, item|
@@ -1149,15 +920,11 @@ class RDoc::Parser::Ruby < RDoc::Parser
container.record_location @top_level
end
- when TkIDENTIFIER, TkIVAR, TkGVAR then
- parse_method_dummy container
+ when TkIDENTIFIER, TkIVAR then
+ dummy = RDoc::Context.new
+ dummy.parent = container
+ skip_method dummy
return
- when TkTRUE, TkFALSE, TkNIL then
- klass_name = "#{name_t.name.capitalize}Class"
- container = @store.find_class_named klass_name
- container ||= @top_level.add_class RDoc::NormalClass, klass_name
-
- name = name_t2.name
else
warn "unexpected method name token #{name_t.inspect}"
# break
@@ -1190,16 +957,12 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
end
- meth.record_location @top_level
- meth.offset = offset
- meth.line = line_no
-
meth.start_collecting_tokens
- indent = TkSPACE.new 0, 1, 1
+ indent = TkSPACE.new nil, 1, 1
indent.set_text " " * column
- token = TkCOMMENT.new 0, line_no, 1
- token.set_text "# File #{@top_level.relative_name}, line #{line_no}"
+ token = TkCOMMENT.new nil, line_no, 1
+ token.set_text "# File #{@top_level.absolute_name}, line #{line_no}"
meth.add_tokens [token, NEWLINE_TOKEN, indent]
meth.add_tokens @token_stream
@@ -1229,27 +992,13 @@ class RDoc::Parser::Ruby < RDoc::Parser
parse_statements container, single, meth
end
- comment.normalize
- comment.extract_call_seq meth
+ extract_call_seq comment, meth
meth.comment = comment
@stats.add_method meth
end
- ##
- # Parses a method that needs to be ignored.
-
- def parse_method_dummy container
- dummy = RDoc::Context.new
- dummy.parent = container
- dummy.store = container.store
- skip_method dummy
- end
-
- ##
- # Extracts +yield+ parameters from +method+
-
def parse_method_or_yield_parameters(method = nil,
modifiers = RDoc::METHOD_MODIFIERS)
skip_tkspace false
@@ -1273,27 +1022,23 @@ class RDoc::Parser::Ruby < RDoc::Parser
loop do
case tk
when TkSEMICOLON then
- break if nest == 0
- when TkLBRACE, TkfLBRACE then
+ break
+ when TkLBRACE then
nest += 1
when TkRBRACE then
+ # we might have a.each {|i| yield i }
+ unget_tk(tk) if nest.zero?
nest -= 1
- if nest <= 0
- # we might have a.each { |i| yield i }
- unget_tk(tk) if nest < 0
- break
- end
+ break if nest <= 0
when TkLPAREN, TkfLPAREN then
nest += 1
when end_token then
if end_token == TkRPAREN
nest -= 1
- break if nest <= 0
+ break if @scanner.lex_state == EXPR_END and nest <= 0
else
break unless @scanner.continue
end
- when TkRPAREN then
- nest -= 1
when method && method.block_params.nil? && TkCOMMENT then
unget_tk tk
read_documentation_modifiers method, modifiers
@@ -1319,41 +1064,33 @@ class RDoc::Parser::Ruby < RDoc::Parser
#
# and add this as the block_params for the method
- def parse_method_parameters method
+ def parse_method_parameters(method)
res = parse_method_or_yield_parameters method
res = "(#{res})" unless res =~ /\A\(/
method.params = res unless method.params
- return if method.block_params
-
- skip_tkspace false
- read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
+ if method.block_params.nil? then
+ skip_tkspace false
+ read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
+ end
end
- ##
- # Parses an RDoc::NormalModule in +container+ with +comment+
-
- def parse_module container, single, tk, comment
- container, name_t, = get_class_or_module container
+ 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.ignore unless container.document_children
mod.record_location @top_level
read_documentation_modifiers mod, RDoc::CLASS_MODIFIERS
- mod.add_comment comment, @top_level
- parse_statements mod
+ parse_statements(mod)
+ mod.comment = comment
- @top_level.add_to_classes_or_modules mod
@stats.add_module mod
end
- ##
- # Parses an RDoc::Require in +context+ containing +comment+
-
def parse_require(context, comment)
skip_tkspace_comment
tk = get_tk
@@ -1366,40 +1103,17 @@ class RDoc::Parser::Ruby < RDoc::Parser
name = tk.text if TkSTRING === tk
if name then
- @top_level.add_require RDoc::Require.new(name, comment)
+ context.add_require RDoc::Require.new(name, comment)
else
unget_tk tk
end
end
##
- # Parses a rescue
-
- def parse_rescue
- skip_tkspace false
-
- while tk = get_tk
- case tk
- when TkNL, TkSEMICOLON then
- break
- when TkCOMMA then
- skip_tkspace false
-
- get_tk if TkNL === peek_tk
- end
-
- skip_tkspace false
- end
- end
-
- ##
# The core of the ruby parser.
def parse_statements(container, single = NORMAL, current_method = nil,
- comment = new_comment(''))
- raise 'no' unless RDoc::Comment === comment
- comment.force_encoding @encoding if @encoding
-
+ comment = '')
nest = 1
save_visibility = container.visibility
@@ -1407,7 +1121,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
while tk = get_tk do
keep_comment = false
- try_parse_comment = false
non_comment_seen = true unless TkCOMMENT === tk
@@ -1419,26 +1132,20 @@ class RDoc::Parser::Ruby < RDoc::Parser
if TkCOMMENT === tk then
if non_comment_seen then
# Look for RDoc in a comment about to be thrown away
- non_comment_seen = parse_comment container, tk, comment unless
- comment.empty?
+ parse_comment container, tk, comment unless comment.empty?
comment = ''
- comment.force_encoding @encoding if @encoding
+ 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
-
- if TkNL === tk then
- skip_tkspace false # leading spaces
- tk = get_tk
- end
end
- comment = new_comment comment
-
unless comment.empty? then
look_for_directives_in container, comment
@@ -1456,21 +1163,35 @@ class RDoc::Parser::Ruby < RDoc::Parser
keep_comment = true
when TkCLASS then
- parse_class container, single, tk, comment
+ if container.document_children then
+ parse_class container, single, tk, comment
+ else
+ nest += 1
+ end
when TkMODULE then
- parse_module container, single, tk, comment
+ if container.document_children then
+ parse_module container, single, tk, comment
+ else
+ nest += 1
+ end
when TkDEF then
- parse_method container, single, tk, comment
+ if container.document_self then
+ parse_method container, single, tk, comment
+ else
+ nest += 1
+ end
when TkCONSTANT then
- unless parse_constant container, tk, comment, current_method then
- try_parse_comment = true
+ if container.document_self then
+ parse_constant container, tk, comment
end
when TkALIAS then
- parse_alias container, single, tk, comment unless current_method
+ if container.document_self and not current_method then
+ parse_alias container, single, tk, comment
+ end
when TkYIELD then
if current_method.nil? then
@@ -1483,7 +1204,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
# 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
+ when TkUNTIL, TkWHILE then
nest += 1
skip_optional_do_after_expression
@@ -1496,12 +1217,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN then
nest += 1
- when TkSUPER then
- current_method.calls_super = true if current_method
-
- when TkRESCUE then
- parse_rescue
-
when TkIDENTIFIER then
if nest == 1 and current_method.nil? then
case tk.name
@@ -1514,20 +1229,17 @@ class RDoc::Parser::Ruby < RDoc::Parser
when /^attr_(reader|writer|accessor)$/ then
parse_attr_accessor container, single, tk, comment
when 'alias_method' then
- parse_alias container, single, tk, comment
+ parse_alias container, single, tk, comment if
+ container.document_self
when 'require', 'include' then
# ignore
else
- if comment.text =~ /\A#\#$/ then
- case comment.text
+ if container.document_self and comment =~ /\A#\#$/ then
+ case comment
when /^# +:?attr(_reader|_writer|_accessor)?:/ then
parse_meta_attr container, single, tk, comment
else
- method = parse_meta_method container, single, tk, comment
- method.params = container.params if
- container.params
- method.block_params = container.block_params if
- container.block_params
+ parse_meta_method container, single, tk, comment
end
end
end
@@ -1538,8 +1250,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
parse_require container, comment
when "include" then
parse_include container, comment
- when "extend" then
- parse_extend container, comment
end
when TkEND then
@@ -1552,42 +1262,20 @@ class RDoc::Parser::Ruby < RDoc::Parser
return
end
- else
- try_parse_comment = nest == 1
end
- if try_parse_comment then
- non_comment_seen = parse_comment container, tk, comment unless
- comment.empty?
-
- keep_comment = false
- end
-
- unless keep_comment then
- comment = new_comment ''
- comment.force_encoding @encoding if @encoding
- container.params = nil
- container.block_params = nil
- end
+ comment = '' unless keep_comment
begin
get_tkread
skip_tkspace false
end while peek_tk == TkNL
end
-
- container.params = nil
- container.block_params = nil
end
- ##
- # Parse up to +no+ symbol arguments
-
def parse_symbol_arg(no = nil)
args = []
-
skip_tkspace_comment
-
case tk = get_tk
when TkLPAREN
loop do
@@ -1630,46 +1318,28 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
end
end
-
args
end
- ##
- # Returns symbol text from the next token
-
def parse_symbol_in_arg
case tk = get_tk
when TkSYMBOL
tk.text.sub(/^:/, '')
when TkSTRING
eval @read[-1]
- when TkDSTRING, TkIDENTIFIER then
- nil # ignore
else
warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG_RDOC
nil
end
end
- ##
- # Parses statements in the top-level +container+
-
- def parse_top_level_statements container
+ def parse_top_level_statements(container)
comment = collect_first_comment
-
- look_for_directives_in container, comment
-
- @markup = comment.format
-
- # HACK move if to RDoc::Context#comment=
- container.comment = comment if container.document_self unless comment.empty?
-
+ look_for_directives_in(container, comment)
+ container.comment = comment unless comment.empty?
parse_statements container, NORMAL, nil, comment
end
- ##
- # Determines the visibility in +container+ from +tk+
-
def parse_visibility(container, single, tk)
singleton = (single == SINGLE)
@@ -1703,51 +1373,34 @@ class RDoc::Parser::Ruby < RDoc::Parser
when TkNL, TkUNLESS_MOD, TkIF_MOD, TkSEMICOLON then
container.ongoing_visibility = vis
else
- new_methods = []
-
- case vis_type
- when 'module_function' then
+ 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.record_location @top_level
- s_m.singleton = true
- new_methods << s_m
+ s_m.singleton = true if RDoc::AnyMethod === s_m
+ s_m.visibility = :public
+ module_functions << s_m
end
- when 'public_class_method', 'private_class_method' then
- args = parse_symbol_arg
- container.methods_matching args, true do |m|
- if m.parent != container then
- m = m.dup
- m.record_location @top_level
- new_methods << m
+ 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
-
- m.visibility = vis
end
else
args = parse_symbol_arg
container.set_visibility_for args, vis, singleton
end
-
- new_methods.each do |method|
- case method
- when RDoc::AnyMethod then
- container.add_method method
- when RDoc::Attr then
- container.add_attribute method
- end
- method.visibility = vis
- end
end
end
- ##
- # Determines the block parameter for +context+
-
def parse_yield(context, single, tk, method)
return if method.block_params
@@ -1766,102 +1419,95 @@ class RDoc::Parser::Ruby < RDoc::Parser
#
# class MyClass # :nodoc:
#
- # We return the directive name and any parameters as a two element array if
- # the name is in +allowed+. A directive can be found anywhere up to the end
- # of the current line.
+ # We return the directive name and any parameters as a two element array
- def read_directive allowed
- tokens = []
-
- while tk = get_tk do
- tokens << tk
-
- case tk
- when TkNL then return
- when TkCOMMENT then
- return unless tk.text =~ /\s*:?([\w-]+):\s*(.*)/
+ def read_directive(allowed)
+ tk = get_tk
+ result = nil
+ if TkCOMMENT === tk then
+ if tk.text =~ /\s*:?(\w+):\s*(.*)/ then
directive = $1.downcase
-
- return [directive, $2] if allowed.include? directive
-
- return
- end
- end
- ensure
- unless tokens.length == 1 and TkCOMMENT === tokens.first then
- tokens.reverse_each do |token|
- unget_tk token
+ if allowed.include? directive then
+ result = [directive, $2]
+ end
end
+ else
+ unget_tk tk
end
+
+ result
end
- ##
- # Handles directives following the definition for +context+ (any
- # RDoc::CodeObject) if the directives are +allowed+ at this point.
- #
- # See also RDoc::Markup::PreProcess#handle_directive
+ def read_documentation_modifiers(context, allow)
+ dir = read_directive(allow)
- def read_documentation_modifiers context, allowed
- directive, value = read_directive allowed
+ case dir[0]
+ when "notnew", "not_new", "not-new" then
+ context.dont_rename_initialize = true
- return unless directive
+ when "nodoc" then
+ context.document_self = false
+ if dir[1].downcase == "all"
+ context.document_children = false
+ end
- @preprocess.handle_directive '', directive, value, context do |dir, param|
- if %w[notnew not_new not-new].include? dir then
- context.dont_rename_initialize = true
+ when "doc" then
+ context.document_self = true
+ context.force_documentation = true
- true
+ when "yield", "yields" then
+ unless context.params.nil?
+ context.params.sub!(/(,|)\s*&\w+/,'') # remove parameter &proc
end
- end
- end
- ##
- # Removes private comments from +comment+
- #--
- # TODO remove
+ context.block_params = dir[1]
- def remove_private_comments comment
- comment.remove_private
+ when "arg", "args" then
+ context.params = dir[1]
+ end if dir
end
- ##
- # Scans this ruby file for ruby constructs
+ def remove_private_comments(comment)
+ comment.gsub!(/^#--\n.*?^#\+\+/m, '')
+ comment.sub!(/^#--\n.*/m, '')
+ end
def scan
reset
catch :eof do
- begin
- parse_top_level_statements @top_level
-
- rescue StandardError => e
- bytes = ''
-
- 20.times do @scanner.ungetc end
- count = 0
- 60.times do |i|
- count = i
- byte = @scanner.getc
- break unless byte
- bytes << byte
- end
- count -= 20
- count.times do @scanner.ungetc end
+ catch :enddoc do
+ begin
+ parse_top_level_statements @top_level
+ rescue StandardError => e
+ bytes = ''
+
+ 20.times do @scanner.ungetc end
+ count = 0
+ 60.times do |i|
+ count = i
+ byte = @scanner.getc
+ break unless byte
+ bytes << byte
+ end
+ count -= 20
+ count.times do @scanner.ungetc end
- $stderr.puts <<-EOF
+ $stderr.puts <<-EOF
#{self.class} failure around line #{@scanner.line_no} of
#{@file_name}
- EOF
+ EOF
- unless bytes.empty? then
- $stderr.puts
- $stderr.puts bytes.inspect
- end
+ unless bytes.empty? then
+ $stderr.puts
+ $stderr.puts bytes.inspect
+ end
- raise e
+ raise e
+ end
end
end
@@ -1926,9 +1572,6 @@ class RDoc::Parser::Ruby < RDoc::Parser
unget_tk(tk) unless TkIN === tk
end
- ##
- # Skips the next method in +container+
-
def skip_method container
meth = RDoc::AnyMethod.new "", "anon"
parse_method_parameters meth
@@ -1946,11 +1589,10 @@ class RDoc::Parser::Ruby < RDoc::Parser
end
end
- ##
- # Prints +message+ to +$stderr+ unless we're being quiet
-
- def warn message
- @options.warn make_message message
+ def warn(msg)
+ return if @options.quiet
+ msg = make_message msg
+ $stderr.puts msg
end
end
diff --git a/lib/rdoc/parser/ruby_tools.rb b/lib/rdoc/parser/ruby_tools.rb
index 654431ea30..90c03307b4 100644
--- a/lib/rdoc/parser/ruby_tools.rb
+++ b/lib/rdoc/parser/ruby_tools.rb
@@ -43,11 +43,13 @@ module RDoc::Parser::RubyTools
tk = Token(TkSYMBOL).set_text(":" + tk1.text)
end
- # remove the identifier we just read to replace it with a symbol
+ # 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
@@ -60,22 +62,12 @@ module RDoc::Parser::RubyTools
tk
end
- ##
- # Reads and returns all tokens up to one of +tokens+. Leaves the matched
- # token in the token list.
-
def get_tk_until(*tokens)
read = []
loop do
tk = get_tk
-
- case tk
- when *tokens then
- unget_tk tk
- break
- end
-
+ case tk when *tokens then unget_tk tk; break end
read << tk
end
@@ -158,8 +150,6 @@ module RDoc::Parser::RubyTools
@token_listeners.each do |obj|
obj.pop_token
end if @token_listeners
-
- nil
end
end
diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb
index 65cfc1b2e7..e99d2d4319 100644
--- a/lib/rdoc/parser/simple.rb
+++ b/lib/rdoc/parser/simple.rb
@@ -1,11 +1,10 @@
##
# Parse a non-source file. We basically take the whole thing as one big
-# comment.
+# comment. If the first character in the file is '#', we strip leading pound
+# signs.
class RDoc::Parser::Simple < RDoc::Parser
- include RDoc::Parser::Text
-
parse_files_matching(//)
attr_reader :content # :nodoc:
@@ -26,36 +25,20 @@ class RDoc::Parser::Simple < RDoc::Parser
def scan
comment = remove_coding_comment @content
- comment = remove_private_comment comment
-
- comment = RDoc::Comment.new comment, @top_level
+ comment = remove_private_comments comment
@top_level.comment = comment
+ @top_level.parser = self.class
@top_level
end
- ##
- # Removes the encoding magic comment from +text+
+ def remove_private_comments(comment)
+ comment.gsub(/^--\n.*?^\+\+/m, '').sub(/^--\n.*/m, '')
+ end
def remove_coding_comment text
text.sub(/\A# .*coding[=:].*$/, '')
end
- ##
- # Removes private comments.
- #
- # Unlike RDoc::Comment#remove_private this implementation only looks for two
- # dashes at the beginning of the line. Three or more dashes are considered
- # to be a rule and ignored.
-
- def remove_private_comment comment
- # Workaround for gsub encoding for Ruby 1.9.2 and earlier
- empty = ''
- empty.force_encoding comment.encoding if Object.const_defined? :Encoding
-
- comment = comment.gsub(%r%^--\n.*?^\+\+\n?%m, empty)
- comment.sub(%r%^--\n.*%m, empty)
- end
-
end
diff --git a/lib/rdoc/parser/text.rb b/lib/rdoc/parser/text.rb
deleted file mode 100644
index f973313551..0000000000
--- a/lib/rdoc/parser/text.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-##
-# Indicates this parser is text and doesn't contain code constructs.
-#
-# Include this module in a RDoc::Parser subclass to make it show up as a file,
-# not as part of a class or module.
-#--
-# This is not named File to avoid overriding ::File
-
-module RDoc::Parser::Text
-end
-
diff --git a/lib/rdoc/rd.rb b/lib/rdoc/rd.rb
deleted file mode 100644
index 28c5d286e0..0000000000
--- a/lib/rdoc/rd.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-##
-# RDoc::RD implements the RD format from the rdtool gem.
-#
-# To choose RD as your only default format see
-# RDoc::Options@Saved+Options for instructions on setting up a
-# <code>.doc_options</code> file to store your project default.
-#
-# == LICENSE
-#
-# The grammar that produces RDoc::RD::BlockParser and RDoc::RD::InlineParser
-# is included in RDoc under the Ruby License.
-#
-# You can find the original source for rdtool at
-# https://github.com/uwabami/rdtool/
-#
-# You can use, re-distribute or change these files under Ruby's License or GPL.
-#
-# 1. You may make and give away verbatim copies of the source form of the
-# software without restriction, provided that you duplicate all of the
-# original copyright notices and associated disclaimers.
-#
-# 2. You may modify your copy of the software in any way, provided that
-# you do at least ONE of the following:
-#
-# a. place your modifications in the Public Domain or otherwise
-# make them Freely Available, such as by posting said
-# modifications to Usenet or an equivalent medium, or by allowing
-# the author to include your modifications in the software.
-#
-# b. use the modified software only within your corporation or
-# organization.
-#
-# c. give non-standard binaries non-standard names, with
-# instructions on where to get the original software distribution.
-#
-# d. make other distribution arrangements with the author.
-#
-# 3. You may distribute the software in object code or binary form,
-# provided that you do at least ONE of the following:
-#
-# a. distribute the binaries and library files of the software,
-# together with instructions (in the manual page or equivalent)
-# on where to get the original distribution.
-#
-# b. accompany the distribution with the machine-readable source of
-# the software.
-#
-# c. give non-standard binaries non-standard names, with
-# instructions on where to get the original software distribution.
-#
-# d. make other distribution arrangements with the author.
-#
-# 4. You may modify and include the part of the software into any other
-# software (possibly commercial). But some files in the distribution
-# are not written by the author, so that they are not under these terms.
-#
-# For the list of those files and their copying conditions, see the
-# file LEGAL.
-#
-# 5. The scripts and library files supplied as input to or produced as
-# output from the software do not automatically fall under the
-# copyright of the software, but belong to whomever generated them,
-# and may be sold commercially, and may be aggregated with this
-# software.
-#
-# 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE.
-
-class RDoc::RD
-
- ##
- # Parses +rd+ source and returns an RDoc::Markup::Document. If the
- # <tt>=begin</tt> or <tt>=end</tt> lines are missing they will be added.
-
- def self.parse rd
- rd = rd.lines.to_a
-
- if rd.find { |i| /\S/ === i } and !rd.find{|i| /^=begin\b/ === i } then
- rd.unshift("=begin\n").push("=end\n")
- end
-
- parser = RDoc::RD::BlockParser.new
- document = parser.parse rd
-
- # isn't this always true?
- document.parts.shift if RDoc::Markup::BlankLine === document.parts.first
- document.parts.pop if RDoc::Markup::BlankLine === document.parts.last
-
- document
- end
-
- autoload :BlockParser, 'rdoc/rd/block_parser'
- autoload :InlineParser, 'rdoc/rd/inline_parser'
- autoload :Inline, 'rdoc/rd/inline'
-
-end
-
diff --git a/lib/rdoc/rd/block_parser.rb b/lib/rdoc/rd/block_parser.rb
deleted file mode 100644
index 30b772d534..0000000000
--- a/lib/rdoc/rd/block_parser.rb
+++ /dev/null
@@ -1,1055 +0,0 @@
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
-# from Racc grammer file "".
-#
-
-require 'racc/parser.rb'
-
-class RDoc::RD
-
-##
-# RD format parser for headings, paragraphs, lists, verbatim sections that
-# exist as blocks.
-
-class BlockParser < Racc::Parser
-
-
-# :stopdoc:
-
-TMPFILE = ["rdtmp", $$, 0]
-
-MARK_TO_LEVEL = {
- '=' => 1,
- '==' => 2,
- '===' => 3,
- '====' => 4,
- '+' => 5,
- '++' => 6,
-}
-
-# :startdoc:
-
-##
-# Footnotes for this document
-
-attr_reader :footnotes
-
-##
-# Labels for items in this document
-
-attr_reader :labels
-
-##
-# Path to find included files in
-
-attr_accessor :include_path
-
-##
-# Creates a new RDoc::RD::BlockParser. Use #parse to parse an rd-format
-# document.
-
-def initialize
- @inline_parser = RDoc::RD::InlineParser.new self
- @include_path = []
-
- # for testing
- @footnotes = []
- @labels = {}
-end
-
-##
-# Parses +src+ and returns an RDoc::Markup::Document.
-
-def parse src
- @src = src
- @src.push false
-
- @footnotes = []
- @labels = {}
-
- # @i: index(line no.) of src
- @i = 0
-
- # stack for current indentation
- @indent_stack = []
-
- # how indented.
- @current_indent = @indent_stack.join("")
-
- # RDoc::RD::BlockParser for tmp src
- @subparser = nil
-
- # which part is in now
- @in_part = nil
- @part_content = []
-
- @in_verbatim = false
-
- @yydebug = true
-
- document = do_parse
-
- unless @footnotes.empty? then
- blankline = document.parts.pop
-
- document.parts << RDoc::Markup::Rule.new(1)
- document.parts.concat @footnotes
-
- document.parts.push blankline
- end
-
- document
-end
-
-##
-# Returns the next token from the document
-
-def next_token # :nodoc:
- # preprocessing
- # if it is not in RD part
- # => method
- while @in_part != "rd"
- line = @src[@i]
- @i += 1 # next line
-
- case line
- # src end
- when false
- return [false, false]
- # RD part begin
- when /^=begin\s*(?:\bRD\b.*)?\s*$/
- if @in_part # if in non-RD part
- @part_content.push(line)
- else
- @in_part = "rd"
- return [:WHITELINE, "=begin\n"] # <= for textblockand
- end
- # non-RD part begin
- when /^=begin\s+(\w+)/
- part = $1
- if @in_part # if in non-RD part
- @part_content.push(line)
- else
- @in_part = part if @tree.filter[part] # if filter exists
-# p "BEGIN_PART: #{@in_part}" # DEBUG
- end
- # non-RD part end
- when /^=end/
- if @in_part # if in non-RD part
-# p "END_PART: #{@in_part}" # DEBUG
- # make Part-in object
- part = RDoc::RD::Part.new(@part_content.join(""), @tree, "r")
- @part_content.clear
- # call filter, part_out is output(Part object)
- part_out = @tree.filter[@in_part].call(part)
-
- if @tree.filter[@in_part].mode == :rd # if output is RD formated
- subtree = parse_subtree(part_out.to_a)
- else # if output is target formated
- basename = TMPFILE.join('.')
- TMPFILE[-1] += 1
- tmpfile = open(@tree.tmp_dir + "/" + basename + ".#{@in_part}", "w")
- tmpfile.print(part_out)
- tmpfile.close
- subtree = parse_subtree(["=begin\n", "<<< #{basename}\n", "=end\n"])
- end
- @in_part = nil
- return [:SUBTREE, subtree]
- end
- else
- if @in_part # if in non-RD part
- @part_content.push(line)
- end
- end
- end
-
- @current_indent = @indent_stack.join("")
- line = @src[@i]
- case line
- when false
- if_current_indent_equal("") do
- [false, false]
- end
- when /^=end/
- if_current_indent_equal("") do
- @in_part = nil
- [:WHITELINE, "=end"] # MUST CHANGE??
- end
- when /^\s*$/
- @i += 1 # next line
- return [:WHITELINE, ':WHITELINE']
- when /^\#/ # comment line
- @i += 1 # next line
- self.next_token()
- when /^(={1,4})(?!=)\s*(?=\S)/, /^(\+{1,2})(?!\+)\s*(?=\S)/
- rest = $' # '
- rest.strip!
- mark = $1
- if_current_indent_equal("") do
- return [:HEADLINE, [MARK_TO_LEVEL[mark], rest]]
- end
- when /^<<<\s*(\S+)/
- file = $1
- if_current_indent_equal("") do
- suffix = file[-3 .. -1]
- if suffix == ".rd" or suffix == ".rb"
- subtree = parse_subtree(get_included(file))
- [:SUBTREE, subtree]
- else
- [:INCLUDE, file]
- end
- end
- when /^(\s*)\*(\s*)/
- rest = $' # '
- newIndent = $2
- if_current_indent_equal($1) do
- if @in_verbatim
- [:STRINGLINE, line]
- else
- @indent_stack.push("\s" << newIndent)
- [:ITEMLISTLINE, rest]
- end
- end
- when /^(\s*)(\(\d+\))(\s*)/
- rest = $' # '
- mark = $2
- newIndent = $3
- if_current_indent_equal($1) do
- if @in_verbatim
- [:STRINGLINE, line]
- else
- @indent_stack.push("\s" * mark.size << newIndent)
- [:ENUMLISTLINE, rest]
- end
- end
- when /^(\s*):(\s*)/
- rest = $' # '
- newIndent = $2
- if_current_indent_equal($1) do
- if @in_verbatim
- [:STRINGLINE, line]
- else
- @indent_stack.push("\s#{$2}")
- [:DESCLISTLINE, rest]
- end
- end
- when /^(\s*)---(?!-|\s*$)/
- indent = $1
- rest = $'
- /\s*/ === rest
- term = $'
- new_indent = $&
- if_current_indent_equal(indent) do
- if @in_verbatim
- [:STRINGLINE, line]
- else
- @indent_stack.push("\s\s\s" + new_indent)
- [:METHODLISTLINE, term]
- end
- end
- when /^(\s*)/
- if_current_indent_equal($1) do
- [:STRINGLINE, line]
- end
- else
- raise "[BUG] parsing error may occurred."
- end
-end
-
-##
-# Yields to the given block if +indent+ matches the current indent, otherwise
-# an indentation token is processed.
-
-def if_current_indent_equal(indent)
- indent = indent.sub(/\t/, "\s" * 8)
- if @current_indent == indent
- @i += 1 # next line
- yield
- elsif indent.index(@current_indent) == 0
- @indent_stack.push(indent[@current_indent.size .. -1])
- [:INDENT, ":INDENT"]
- else
- @indent_stack.pop
- [:DEDENT, ":DEDENT"]
- end
-end
-private :if_current_indent_equal
-
-##
-# Cuts off excess whitespace in +src+
-
-def cut_off(src)
- ret = []
- whiteline_buf = []
-
- line = src.shift
- /^\s*/ =~ line
-
- indent = Regexp.quote($&)
- ret.push($')
-
- while line = src.shift
- if /^(\s*)$/ =~ line
- whiteline_buf.push(line)
- elsif /^#{indent}/ =~ line
- unless whiteline_buf.empty?
- ret.concat(whiteline_buf)
- whiteline_buf.clear
- end
- ret.push($')
- else
- raise "[BUG]: probably Parser Error while cutting off.\n"
- end
- end
- ret
-end
-private :cut_off
-
-def set_term_to_element(parent, term)
-# parent.set_term_under_document_struct(term, @tree.document_struct)
- parent.set_term_without_document_struct(term)
-end
-private :set_term_to_element
-
-##
-# Raises a ParseError when invalid formatting is found
-
-def on_error(et, ev, _values)
- prv, cur, nxt = format_line_num(@i, @i+1, @i+2)
-
- raise ParseError, <<Msg
-
-RD syntax error: line #{@i+1}:
- #{prv} |#{@src[@i-1].chomp}
- #{cur}=>|#{@src[@i].chomp}
- #{nxt} |#{@src[@i+1].chomp}
-
-Msg
-end
-
-##
-# Current line number
-
-def line_index
- @i
-end
-
-##
-# Parses subtree +src+
-
-def parse_subtree src
- @subparser ||= RDoc::RD::BlockParser.new
-
- @subparser.parse src
-end
-private :parse_subtree
-
-##
-# Retrieves the content for +file+ from the include_path
-
-def get_included(file)
- included = []
-
- @include_path.each do |dir|
- file_name = File.join dir, file
-
- if File.exist? file_name then
- included = IO.readlines file_name
- break
- end
- end
-
- included
-end
-private :get_included
-
-##
-# Formats line numbers +line_numbers+ prettily
-
-def format_line_num(*line_numbers)
- width = line_numbers.collect{|i| i.to_s.length }.max
- line_numbers.collect{|i| sprintf("%#{width}d", i) }
-end
-private :format_line_num
-
-##
-# Retrieves the content of +values+ as a single String
-
-def content values
- values.map { |value| value.content }.join
-end
-
-##
-# Creates a paragraph for +value+
-
-def paragraph value
- content = cut_off(value).join(' ').rstrip
- contents = @inline_parser.parse content
-
- RDoc::Markup::Paragraph.new(*contents)
-end
-
-##
-# Adds footnote +content+ to the document
-
-def add_footnote content
- index = @footnotes.length / 2 + 1
-
- footmark_link = "{^#{index}}[rdoc-label:footmark-#{index}:foottext-#{index}]"
-
- @footnotes << RDoc::Markup::Paragraph.new(footmark_link, ' ', *content)
- @footnotes << RDoc::Markup::BlankLine.new
-
- index
-end
-
-##
-# Adds label +label+ to the document
-
-def add_label label
- @labels[label] = true
-
- label
-end
-
-# :stopdoc:
-
-##### State transition tables begin ###
-
-racc_action_table = [
- 34, 35, 30, 33, 14, 73, 38, 33, 76, 15,
- 88, 34, 35, 30, 33, 40, 34, 35, 30, 33,
- 40, 65, 34, 35, 30, 33, 14, 73, 77, 14,
- 54, 15, 34, 35, 30, 33, 14, 9, 10, 11,
- 12, 15, 34, 35, 30, 33, 14, 73, 81, 54,
- 38, 15, 34, 35, 30, 33, 14, 73, 40, 67,
- 83, 15, 34, 35, 30, 33, 14, 73, 54, 30,
- 35, 15, 34, 35, 30, 33, 34, 47, 36, 14,
- 59, 15, 34, 35, 30, 33, 14, 73, 38, nil,
- nil, 15, 34, 35, 30, 33, nil, 47, nil, nil,
- nil, 15, 34, 35, 30, 33, 14, 73, nil, nil,
- nil, 15, 34, 35, 30, 33, 14, 73, nil, nil,
- nil, 15, 34, 35, 30, 33, 14, 9, 10, 11,
- 12, 15, 34, 35, 30, 33, 14, 73, nil, nil,
- nil, 15, 34, 35, 30, 33, 14, 73, 61, 63,
- nil, 15, nil, 62, 60, 61, 63, 61, 63, 14,
- 62, 87, 62, nil, 79, 34, 35, 30, 33 ]
-
-racc_action_check = [
- 86, 86, 86, 86, 86, 86, 57, 31, 49, 86,
- 86, 41, 41, 41, 41, 41, 15, 15, 15, 15,
- 15, 41, 45, 45, 45, 45, 45, 45, 51, 34,
- 54, 45, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 85, 85, 85, 85, 85, 85, 56, 33,
- 58, 85, 79, 79, 79, 79, 79, 79, 62, 44,
- 66, 79, 78, 78, 78, 78, 78, 78, 30, 28,
- 25, 78, 24, 24, 24, 24, 22, 24, 1, 35,
- 36, 24, 75, 75, 75, 75, 75, 75, 13, nil,
- nil, 75, 27, 27, 27, 27, nil, 27, nil, nil,
- nil, 27, 74, 74, 74, 74, 74, 74, nil, nil,
- nil, 74, 68, 68, 68, 68, 68, 68, nil, nil,
- nil, 68, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 46, 46, 46, 46, 46, 46, nil, nil,
- nil, 46, 47, 47, 47, 47, 47, 47, 39, 39,
- nil, 47, nil, 39, 39, 82, 82, 64, 64, 52,
- 82, 82, 64, nil, 52, 20, 20, 20, 20 ]
-
-racc_action_pointer = [
- 29, 78, 119, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, nil, 81, nil, 13, nil, nil, nil, nil,
- 162, nil, 73, nil, 69, 66, nil, 89, 64, nil,
- 60, 1, nil, 41, 22, 72, 80, nil, nil, 141,
- nil, 8, nil, nil, 46, 19, 129, 139, nil, -5,
- nil, 15, 152, nil, 22, nil, 35, -1, 43, nil,
- nil, nil, 51, nil, 150, nil, 47, nil, 109, nil,
- nil, nil, nil, nil, 99, 79, nil, nil, 59, 49,
- nil, nil, 148, nil, nil, 39, -3, nil, nil ]
-
-racc_action_default = [
- -2, -73, -1, -4, -5, -6, -7, -8, -9, -10,
- -11, -12, -13, -14, -16, -73, -23, -24, -25, -26,
- -27, -31, -32, -34, -72, -36, -38, -72, -40, -42,
- -59, -44, -46, -59, -63, -65, -73, -3, -15, -73,
- -22, -73, -30, -33, -73, -69, -70, -71, -37, -73,
- -41, -73, -51, -58, -61, -45, -73, -62, -64, 89,
- -17, -19, -73, -21, -18, -28, -73, -35, -66, -53,
- -54, -55, -56, -57, -67, -68, -39, -43, -49, -73,
- -60, -47, -73, -29, -52, -48, -73, -20, -50 ]
-
-racc_goto_table = [
- 4, 39, 4, 68, 74, 75, 5, 6, 5, 6,
- 51, 42, 44, 56, 3, 49, 37, 57, 58, 41,
- 43, 48, 84, 50, 66, 55, 1, 64, 84, 84,
- 45, 46, 42, 45, 46, 2, 85, 86, 80, 84,
- 84, nil, nil, nil, nil, nil, nil, nil, 82, nil,
- nil, nil, 78 ]
-
-racc_goto_check = [
- 4, 10, 4, 31, 31, 31, 5, 6, 5, 6,
- 27, 12, 21, 27, 3, 21, 3, 9, 9, 17,
- 19, 23, 32, 26, 11, 29, 1, 10, 32, 32,
- 5, 6, 12, 5, 6, 2, 31, 31, 33, 32,
- 32, nil, nil, nil, nil, nil, nil, nil, 10, nil,
- nil, nil, 4 ]
-
-racc_goto_pointer = [
- nil, 26, 35, 14, 0, 6, 7, nil, nil, -17,
- -14, -17, -9, nil, nil, nil, nil, 4, nil, -2,
- nil, -12, nil, -4, nil, nil, -5, -20, nil, -6,
- nil, -42, -46, -16 ]
-
-racc_goto_default = [
- nil, nil, nil, nil, 70, 71, 72, 7, 8, 13,
- nil, nil, 21, 16, 17, 18, 19, 20, 22, 23,
- 24, nil, 25, 26, 27, 28, 29, nil, 31, 32,
- 52, nil, 69, 53 ]
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 1, 15, :_reduce_1,
- 0, 15, :_reduce_2,
- 2, 16, :_reduce_3,
- 1, 16, :_reduce_4,
- 1, 17, :_reduce_5,
- 1, 17, :_reduce_6,
- 1, 17, :_reduce_none,
- 1, 17, :_reduce_8,
- 1, 17, :_reduce_9,
- 1, 17, :_reduce_10,
- 1, 17, :_reduce_11,
- 1, 21, :_reduce_12,
- 1, 22, :_reduce_13,
- 1, 18, :_reduce_14,
- 2, 23, :_reduce_15,
- 1, 23, :_reduce_16,
- 3, 19, :_reduce_17,
- 1, 25, :_reduce_18,
- 2, 24, :_reduce_19,
- 4, 24, :_reduce_20,
- 2, 24, :_reduce_21,
- 1, 24, :_reduce_22,
- 1, 26, :_reduce_none,
- 1, 26, :_reduce_none,
- 1, 26, :_reduce_none,
- 1, 26, :_reduce_none,
- 1, 20, :_reduce_27,
- 3, 20, :_reduce_28,
- 4, 20, :_reduce_29,
- 2, 31, :_reduce_30,
- 1, 31, :_reduce_31,
- 1, 27, :_reduce_32,
- 2, 32, :_reduce_33,
- 1, 32, :_reduce_34,
- 3, 33, :_reduce_35,
- 1, 28, :_reduce_36,
- 2, 36, :_reduce_37,
- 1, 36, :_reduce_38,
- 3, 37, :_reduce_39,
- 1, 29, :_reduce_40,
- 2, 39, :_reduce_41,
- 1, 39, :_reduce_42,
- 3, 40, :_reduce_43,
- 1, 30, :_reduce_44,
- 2, 42, :_reduce_45,
- 1, 42, :_reduce_46,
- 3, 43, :_reduce_47,
- 3, 41, :_reduce_48,
- 2, 41, :_reduce_49,
- 4, 41, :_reduce_50,
- 1, 41, :_reduce_51,
- 2, 45, :_reduce_52,
- 1, 45, :_reduce_none,
- 1, 46, :_reduce_54,
- 1, 46, :_reduce_55,
- 1, 46, :_reduce_none,
- 1, 46, :_reduce_57,
- 1, 44, :_reduce_none,
- 0, 44, :_reduce_none,
- 2, 47, :_reduce_none,
- 1, 47, :_reduce_none,
- 2, 34, :_reduce_62,
- 1, 34, :_reduce_63,
- 2, 38, :_reduce_64,
- 1, 38, :_reduce_65,
- 2, 35, :_reduce_66,
- 2, 35, :_reduce_67,
- 2, 35, :_reduce_68,
- 1, 35, :_reduce_69,
- 1, 35, :_reduce_none,
- 1, 35, :_reduce_71,
- 0, 35, :_reduce_72 ]
-
-racc_reduce_n = 73
-
-racc_shift_n = 89
-
-racc_token_table = {
- false => 0,
- :error => 1,
- :DUMMY => 2,
- :ITEMLISTLINE => 3,
- :ENUMLISTLINE => 4,
- :DESCLISTLINE => 5,
- :METHODLISTLINE => 6,
- :STRINGLINE => 7,
- :WHITELINE => 8,
- :SUBTREE => 9,
- :HEADLINE => 10,
- :INCLUDE => 11,
- :INDENT => 12,
- :DEDENT => 13 }
-
-racc_nt_base = 14
-
-racc_use_result_var = true
-
-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",
- "DUMMY",
- "ITEMLISTLINE",
- "ENUMLISTLINE",
- "DESCLISTLINE",
- "METHODLISTLINE",
- "STRINGLINE",
- "WHITELINE",
- "SUBTREE",
- "HEADLINE",
- "INCLUDE",
- "INDENT",
- "DEDENT",
- "$start",
- "document",
- "blocks",
- "block",
- "textblock",
- "verbatim",
- "lists",
- "headline",
- "include",
- "textblockcontent",
- "verbatimcontent",
- "verbatim_after_lists",
- "list",
- "itemlist",
- "enumlist",
- "desclist",
- "methodlist",
- "lists2",
- "itemlistitems",
- "itemlistitem",
- "first_textblock_in_itemlist",
- "other_blocks_in_list",
- "enumlistitems",
- "enumlistitem",
- "first_textblock_in_enumlist",
- "desclistitems",
- "desclistitem",
- "description_part",
- "methodlistitems",
- "methodlistitem",
- "whitelines",
- "blocks_in_list",
- "block_in_list",
- "whitelines2" ]
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-def _reduce_1(val, _values, result)
- result = RDoc::Markup::Document.new(*val[0])
- result
-end
-
-def _reduce_2(val, _values, result)
- raise ParseError, "file empty"
- result
-end
-
-def _reduce_3(val, _values, result)
- result = val[0].concat val[1]
- result
-end
-
-def _reduce_4(val, _values, result)
- result = val[0]
- result
-end
-
-def _reduce_5(val, _values, result)
- result = val
- result
-end
-
-def _reduce_6(val, _values, result)
- result = val
- result
-end
-
-# reduce 7 omitted
-
-def _reduce_8(val, _values, result)
- result = val
- result
-end
-
-def _reduce_9(val, _values, result)
- result = val
- result
-end
-
-def _reduce_10(val, _values, result)
- result = [RDoc::Markup::BlankLine.new]
- result
-end
-
-def _reduce_11(val, _values, result)
- result = val[0].parts
- result
-end
-
-def _reduce_12(val, _values, result)
- # val[0] is like [level, title]
- title = @inline_parser.parse(val[0][1])
- result = RDoc::Markup::Heading.new(val[0][0], title)
-
- result
-end
-
-def _reduce_13(val, _values, result)
- result = RDoc::Markup::Include.new val[0], @include_path
-
- result
-end
-
-def _reduce_14(val, _values, result)
- # val[0] is Array of String
- result = paragraph val[0]
-
- result
-end
-
-def _reduce_15(val, _values, result)
- result << val[1].rstrip
- result
-end
-
-def _reduce_16(val, _values, result)
- result = [val[0].rstrip]
- result
-end
-
-def _reduce_17(val, _values, result)
- # val[1] is Array of String
- content = cut_off val[1]
- result = RDoc::Markup::Verbatim.new(*content)
-
- # imform to lexer.
- @in_verbatim = false
-
- result
-end
-
-def _reduce_18(val, _values, result)
- # val[0] is Array of String
- content = cut_off val[0]
- result = RDoc::Markup::Verbatim.new(*content)
-
- # imform to lexer.
- @in_verbatim = false
-
- result
-end
-
-def _reduce_19(val, _values, result)
- result << val[1]
-
- result
-end
-
-def _reduce_20(val, _values, result)
- result.concat val[2]
-
- result
-end
-
-def _reduce_21(val, _values, result)
- result << "\n"
-
- result
-end
-
-def _reduce_22(val, _values, result)
- result = val
- # inform to lexer.
- @in_verbatim = true
-
- result
-end
-
-# reduce 23 omitted
-
-# reduce 24 omitted
-
-# reduce 25 omitted
-
-# reduce 26 omitted
-
-def _reduce_27(val, _values, result)
- result = val[0]
-
- result
-end
-
-def _reduce_28(val, _values, result)
- result = val[1]
-
- result
-end
-
-def _reduce_29(val, _values, result)
- result = val[1].push(val[2])
-
- result
-end
-
-def _reduce_30(val, _values, result)
- result = val[0] << val[1]
- result
-end
-
-def _reduce_31(val, _values, result)
- result = [val[0]]
- result
-end
-
-def _reduce_32(val, _values, result)
- result = RDoc::Markup::List.new :BULLET, *val[0]
-
- result
-end
-
-def _reduce_33(val, _values, result)
- result.push(val[1])
- result
-end
-
-def _reduce_34(val, _values, result)
- result = val
- result
-end
-
-def _reduce_35(val, _values, result)
- result = RDoc::Markup::ListItem.new nil, val[0], *val[1]
-
- result
-end
-
-def _reduce_36(val, _values, result)
- result = RDoc::Markup::List.new :NUMBER, *val[0]
-
- result
-end
-
-def _reduce_37(val, _values, result)
- result.push(val[1])
- result
-end
-
-def _reduce_38(val, _values, result)
- result = val
- result
-end
-
-def _reduce_39(val, _values, result)
- result = RDoc::Markup::ListItem.new nil, val[0], *val[1]
-
- result
-end
-
-def _reduce_40(val, _values, result)
- result = RDoc::Markup::List.new :NOTE, *val[0]
-
- result
-end
-
-def _reduce_41(val, _values, result)
- result.push(val[1])
- result
-end
-
-def _reduce_42(val, _values, result)
- result = val
- result
-end
-
-def _reduce_43(val, _values, result)
- term = @inline_parser.parse val[0].strip
-
- result = RDoc::Markup::ListItem.new term, *val[1]
-
- result
-end
-
-def _reduce_44(val, _values, result)
- result = RDoc::Markup::List.new :LABEL, *val[0]
-
- result
-end
-
-def _reduce_45(val, _values, result)
- result.push(val[1])
- result
-end
-
-def _reduce_46(val, _values, result)
- result = val
- result
-end
-
-def _reduce_47(val, _values, result)
- result = RDoc::Markup::ListItem.new "<tt>#{val[0].strip}</tt>", *val[1]
-
- result
-end
-
-def _reduce_48(val, _values, result)
- result = [val[1]].concat(val[2])
-
- result
-end
-
-def _reduce_49(val, _values, result)
- result = [val[1]]
-
- result
-end
-
-def _reduce_50(val, _values, result)
- result = val[2]
-
- result
-end
-
-def _reduce_51(val, _values, result)
- result = []
-
- result
-end
-
-def _reduce_52(val, _values, result)
- result.concat val[1]
- result
-end
-
-# reduce 53 omitted
-
-def _reduce_54(val, _values, result)
- result = val
- result
-end
-
-def _reduce_55(val, _values, result)
- result = val
- result
-end
-
-# reduce 56 omitted
-
-def _reduce_57(val, _values, result)
- result = []
- result
-end
-
-# reduce 58 omitted
-
-# reduce 59 omitted
-
-# reduce 60 omitted
-
-# reduce 61 omitted
-
-def _reduce_62(val, _values, result)
- result = paragraph [val[0]].concat(val[1])
-
- result
-end
-
-def _reduce_63(val, _values, result)
- result = paragraph [val[0]]
-
- result
-end
-
-def _reduce_64(val, _values, result)
- result = paragraph [val[0]].concat(val[1])
-
- result
-end
-
-def _reduce_65(val, _values, result)
- result = paragraph [val[0]]
-
- result
-end
-
-def _reduce_66(val, _values, result)
- result = [val[0]].concat(val[1])
-
- result
-end
-
-def _reduce_67(val, _values, result)
- result.concat val[1]
- result
-end
-
-def _reduce_68(val, _values, result)
- result = val[1]
- result
-end
-
-def _reduce_69(val, _values, result)
- result = val
- result
-end
-
-# reduce 70 omitted
-
-def _reduce_71(val, _values, result)
- result = []
- result
-end
-
-def _reduce_72(val, _values, result)
- result = []
- result
-end
-
-def _reduce_none(val, _values, result)
- val[0]
-end
-
-end # class BlockParser
-
-end
diff --git a/lib/rdoc/rd/inline.rb b/lib/rdoc/rd/inline.rb
deleted file mode 100644
index ee724fb80f..0000000000
--- a/lib/rdoc/rd/inline.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-##
-# Inline keeps track of markup and labels to create proper links.
-
-class RDoc::RD::Inline
-
- ##
- # The text of the reference
-
- attr_reader :reference
-
- ##
- # The markup of this reference in RDoc format
-
- attr_reader :rdoc
-
- ##
- # Creates a new Inline for +rdoc+ and +reference+.
- #
- # +rdoc+ may be another Inline or a String. If +reference+ is not given it
- # will use the text from +rdoc+.
-
- def self.new rdoc, reference = rdoc
- if self === rdoc and reference.equal? rdoc then
- rdoc
- else
- super
- end
- end
-
- ##
- # Initializes the Inline with +rdoc+ and +inline+
-
- def initialize rdoc, reference # :not-new:
- @reference = reference.equal?(rdoc) ? reference.dup : reference
-
- # unpack
- @reference = @reference.reference if self.class === @reference
- @rdoc = rdoc
- end
-
- def == other # :nodoc:
- self.class === other and
- @reference == other.reference and @rdoc == other.rdoc
- end
-
- ##
- # Appends +more+ to this inline. +more+ may be a String or another Inline.
-
- def append more
- case more
- when String then
- @reference << more
- @rdoc << more
- when RDoc::RD::Inline then
- @reference << more.reference
- @rdoc << more.rdoc
- else
- raise "unknown thingy #{more}"
- end
-
- self
- end
-
- def inspect # :nodoc:
- "(inline: #{self})"
- end
-
- alias to_s rdoc # :nodoc:
-
-end
-
diff --git a/lib/rdoc/rd/inline_parser.rb b/lib/rdoc/rd/inline_parser.rb
deleted file mode 100644
index c3c1f4b030..0000000000
--- a/lib/rdoc/rd/inline_parser.rb
+++ /dev/null
@@ -1,1207 +0,0 @@
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.9
-# from Racc grammer file "".
-#
-
-require 'racc/parser.rb'
-
-require 'strscan'
-
-class RDoc::RD
-
-##
-# RD format parser for inline markup such as emphasis, links, footnotes, etc.
-
-class InlineParser < Racc::Parser
-
-
-# :stopdoc:
-
-EM_OPEN = '((*'
-EM_OPEN_RE = /\A#{Regexp.quote(EM_OPEN)}/
-EM_CLOSE = '*))'
-EM_CLOSE_RE = /\A#{Regexp.quote(EM_CLOSE)}/
-CODE_OPEN = '(({'
-CODE_OPEN_RE = /\A#{Regexp.quote(CODE_OPEN)}/
-CODE_CLOSE = '}))'
-CODE_CLOSE_RE = /\A#{Regexp.quote(CODE_CLOSE)}/
-VAR_OPEN = '((|'
-VAR_OPEN_RE = /\A#{Regexp.quote(VAR_OPEN)}/
-VAR_CLOSE = '|))'
-VAR_CLOSE_RE = /\A#{Regexp.quote(VAR_CLOSE)}/
-KBD_OPEN = '((%'
-KBD_OPEN_RE = /\A#{Regexp.quote(KBD_OPEN)}/
-KBD_CLOSE = '%))'
-KBD_CLOSE_RE = /\A#{Regexp.quote(KBD_CLOSE)}/
-INDEX_OPEN = '((:'
-INDEX_OPEN_RE = /\A#{Regexp.quote(INDEX_OPEN)}/
-INDEX_CLOSE = ':))'
-INDEX_CLOSE_RE = /\A#{Regexp.quote(INDEX_CLOSE)}/
-REF_OPEN = '((<'
-REF_OPEN_RE = /\A#{Regexp.quote(REF_OPEN)}/
-REF_CLOSE = '>))'
-REF_CLOSE_RE = /\A#{Regexp.quote(REF_CLOSE)}/
-FOOTNOTE_OPEN = '((-'
-FOOTNOTE_OPEN_RE = /\A#{Regexp.quote(FOOTNOTE_OPEN)}/
-FOOTNOTE_CLOSE = '-))'
-FOOTNOTE_CLOSE_RE = /\A#{Regexp.quote(FOOTNOTE_CLOSE)}/
-VERB_OPEN = "(('"
-VERB_OPEN_RE = /\A#{Regexp.quote(VERB_OPEN)}/
-VERB_CLOSE = "'))"
-VERB_CLOSE_RE = /\A#{Regexp.quote(VERB_CLOSE)}/
-
-BAR = "|"
-BAR_RE = /\A#{Regexp.quote(BAR)}/
-QUOTE = '"'
-QUOTE_RE = /\A#{Regexp.quote(QUOTE)}/
-SLASH = "/"
-SLASH_RE = /\A#{Regexp.quote(SLASH)}/
-BACK_SLASH = "\\"
-BACK_SLASH_RE = /\A#{Regexp.quote(BACK_SLASH)}/
-URL = "URL:"
-URL_RE = /\A#{Regexp.quote(URL)}/
-
-other_re_mode = Regexp::EXTENDED
-other_re_mode |= Regexp::MULTILINE
-
-OTHER_RE = Regexp.new(
- "\\A.+?(?=#{Regexp.quote(EM_OPEN)}|#{Regexp.quote(EM_CLOSE)}|
- #{Regexp.quote(CODE_OPEN)}|#{Regexp.quote(CODE_CLOSE)}|
- #{Regexp.quote(VAR_OPEN)}|#{Regexp.quote(VAR_CLOSE)}|
- #{Regexp.quote(KBD_OPEN)}|#{Regexp.quote(KBD_CLOSE)}|
- #{Regexp.quote(INDEX_OPEN)}|#{Regexp.quote(INDEX_CLOSE)}|
- #{Regexp.quote(REF_OPEN)}|#{Regexp.quote(REF_CLOSE)}|
- #{Regexp.quote(FOOTNOTE_OPEN)}|#{Regexp.quote(FOOTNOTE_CLOSE)}|
- #{Regexp.quote(VERB_OPEN)}|#{Regexp.quote(VERB_CLOSE)}|
- #{Regexp.quote(BAR)}|
- #{Regexp.quote(QUOTE)}|
- #{Regexp.quote(SLASH)}|
- #{Regexp.quote(BACK_SLASH)}|
- #{Regexp.quote(URL)})", other_re_mode)
-
-# :startdoc:
-
-##
-# Creates a new parser for inline markup in the rd format. The +block_parser+
-# is used to for footnotes and labels in the inline text.
-
-def initialize block_parser
- @block_parser = block_parser
-end
-
-##
-# Parses the +inline+ text from RD format into RDoc format.
-
-def parse inline
- @inline = inline
- @src = StringScanner.new inline
- @pre = ""
- @yydebug = true
- do_parse.to_s
-end
-
-##
-# Returns the next token from the inline text
-
-def next_token
- return [false, false] if @src.eos?
-# p @src.rest if @yydebug
- if ret = @src.scan(EM_OPEN_RE)
- @pre << ret
- [:EM_OPEN, ret]
- elsif ret = @src.scan(EM_CLOSE_RE)
- @pre << ret
- [:EM_CLOSE, ret]
- elsif ret = @src.scan(CODE_OPEN_RE)
- @pre << ret
- [:CODE_OPEN, ret]
- elsif ret = @src.scan(CODE_CLOSE_RE)
- @pre << ret
- [:CODE_CLOSE, ret]
- elsif ret = @src.scan(VAR_OPEN_RE)
- @pre << ret
- [:VAR_OPEN, ret]
- elsif ret = @src.scan(VAR_CLOSE_RE)
- @pre << ret
- [:VAR_CLOSE, ret]
- elsif ret = @src.scan(KBD_OPEN_RE)
- @pre << ret
- [:KBD_OPEN, ret]
- elsif ret = @src.scan(KBD_CLOSE_RE)
- @pre << ret
- [:KBD_CLOSE, ret]
- elsif ret = @src.scan(INDEX_OPEN_RE)
- @pre << ret
- [:INDEX_OPEN, ret]
- elsif ret = @src.scan(INDEX_CLOSE_RE)
- @pre << ret
- [:INDEX_CLOSE, ret]
- elsif ret = @src.scan(REF_OPEN_RE)
- @pre << ret
- [:REF_OPEN, ret]
- elsif ret = @src.scan(REF_CLOSE_RE)
- @pre << ret
- [:REF_CLOSE, ret]
- elsif ret = @src.scan(FOOTNOTE_OPEN_RE)
- @pre << ret
- [:FOOTNOTE_OPEN, ret]
- elsif ret = @src.scan(FOOTNOTE_CLOSE_RE)
- @pre << ret
- [:FOOTNOTE_CLOSE, ret]
- elsif ret = @src.scan(VERB_OPEN_RE)
- @pre << ret
- [:VERB_OPEN, ret]
- elsif ret = @src.scan(VERB_CLOSE_RE)
- @pre << ret
- [:VERB_CLOSE, ret]
- elsif ret = @src.scan(BAR_RE)
- @pre << ret
- [:BAR, ret]
- elsif ret = @src.scan(QUOTE_RE)
- @pre << ret
- [:QUOTE, ret]
- elsif ret = @src.scan(SLASH_RE)
- @pre << ret
- [:SLASH, ret]
- elsif ret = @src.scan(BACK_SLASH_RE)
- @pre << ret
- [:BACK_SLASH, ret]
- elsif ret = @src.scan(URL_RE)
- @pre << ret
- [:URL, ret]
- elsif ret = @src.scan(OTHER_RE)
- @pre << ret
- [:OTHER, ret]
- else
- ret = @src.rest
- @pre << ret
- @src.terminate
- [:OTHER, ret]
- end
-end
-
-##
-# Raises a ParseError when invalid formatting is found
-
-def on_error(et, ev, values)
- lines_of_rest = @src.rest.lines.to_a.length
- prev_words = prev_words_on_error(ev)
- at = 4 + prev_words.length
-
- message = <<-MSG
-RD syntax error: line #{@block_parser.line_index - lines_of_rest}:
-...#{prev_words} #{(ev||'')} #{next_words_on_error()} ...
- MSG
-
- message << " " * at + "^" * (ev ? ev.length : 0) + "\n"
- raise ParseError, message
-end
-
-##
-# Returns words before the error
-
-def prev_words_on_error(ev)
- pre = @pre
- if ev and /#{Regexp.quote(ev)}$/ =~ pre
- pre = $`
- end
- last_line(pre)
-end
-
-##
-# Returns the last line of +src+
-
-def last_line(src)
- if n = src.rindex("\n")
- src[(n+1) .. -1]
- else
- src
- end
-end
-private :last_line
-
-##
-# Returns words following an error
-
-def next_words_on_error
- if n = @src.rest.index("\n")
- @src.rest[0 .. (n-1)]
- else
- @src.rest
- end
-end
-
-##
-# Creates a new RDoc::RD::Inline for the +rdoc+ markup and the raw +reference+
-
-def inline rdoc, reference = rdoc
- RDoc::RD::Inline.new rdoc, reference
-end
-
-# :stopdoc:
-##### State transition tables begin ###
-
-racc_action_table = [
- 63, 64, 65, 153, 81, 62, 76, 78, 79, 87,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 77, 80, 152, 63, 64, 65, 61, 81, 62, 76,
- 78, 79, 124, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 77, 80, 149, 104, 103, 102, 100,
- 101, 99, 115, 116, 117, 164, 105, 106, 107, 108,
- 109, 110, 111, 112, 113, 114, 96, 118, 119, 104,
- 103, 102, 100, 101, 99, 115, 116, 117, 89, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 88,
- 118, 119, 104, 103, 102, 100, 101, 99, 115, 116,
- 117, 161, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 86, 118, 119, 104, 103, 102, 100, 101,
- 99, 115, 116, 117, 85, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 137, 118, 119, 63, 64,
- 65, 61, 81, 62, 76, 78, 79, 84, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 77, 80,
- 22, 23, 24, 25, 26, 21, 18, 19, 176, 177,
- 13, 173, 14, 154, 15, 175, 16, 137, 17, 42,
- 148, 20, 54, 38, 53, 55, 56, 57, 29, 13,
- 177, 14, nil, 15, nil, 16, nil, 17, nil, nil,
- 20, 22, 23, 24, 25, 26, 21, 18, 19, nil,
- nil, 13, nil, 14, nil, 15, nil, 16, nil, 17,
- nil, nil, 20, 22, 23, 24, 25, 26, 21, 18,
- 19, nil, nil, 13, nil, 14, nil, 15, nil, 16,
- nil, 17, nil, nil, 20, 22, 23, 24, 25, 26,
- 21, 18, 19, nil, nil, 13, nil, 14, nil, 15,
- nil, 16, nil, 17, 145, nil, 20, 54, 133, 53,
- 55, 56, 57, nil, 13, nil, 14, nil, 15, nil,
- 16, nil, 17, nil, nil, 20, 22, 23, 24, 25,
- 26, 21, 18, 19, nil, nil, 13, nil, 14, nil,
- 15, nil, 16, nil, 17, 145, nil, 20, 54, 133,
- 53, 55, 56, 57, nil, 13, nil, 14, nil, 15,
- nil, 16, nil, 17, nil, nil, 20, 22, 23, 24,
- 25, 26, 21, 18, 19, nil, nil, 13, nil, 14,
- nil, 15, nil, 16, nil, 17, 145, nil, 20, 54,
- 133, 53, 55, 56, 57, nil, 13, nil, 14, nil,
- 15, nil, 16, nil, 17, 145, nil, 20, 54, 133,
- 53, 55, 56, 57, nil, 13, nil, 14, nil, 15,
- nil, 16, nil, 17, nil, nil, 20, 22, 23, 24,
- 25, 26, 21, 18, 19, nil, nil, 13, nil, 14,
- nil, 15, nil, 16, 122, 17, nil, 54, 20, 53,
- 55, 56, 57, nil, 13, nil, 14, nil, 15, nil,
- 16, nil, 17, nil, nil, 20, 22, 23, 24, 25,
- 26, 21, 18, 19, nil, nil, 13, nil, 14, nil,
- 15, nil, 16, nil, 17, nil, nil, 20, 135, 136,
- 54, 133, 53, 55, 56, 57, nil, 13, nil, 14,
- nil, 15, nil, 16, nil, 17, nil, nil, 20, 135,
- 136, 54, 133, 53, 55, 56, 57, nil, 13, nil,
- 14, nil, 15, nil, 16, nil, 17, nil, nil, 20,
- 135, 136, 54, 133, 53, 55, 56, 57, nil, 13,
- nil, 14, nil, 15, nil, 16, nil, 17, nil, nil,
- 20, 172, 135, 136, 54, 133, 53, 55, 56, 57,
- 165, 135, 136, 54, 133, 53, 55, 56, 57, 95,
- nil, nil, 54, 91, 53, 55, 56, 57, 174, 135,
- 136, 54, 133, 53, 55, 56, 57, 158, nil, nil,
- 54, nil, 53, 55, 56, 57, 178, 135, 136, 54,
- 133, 53, 55, 56, 57, 145, nil, nil, 54, 133,
- 53, 55, 56, 57, 145, nil, nil, 54, 133, 53,
- 55, 56, 57, 135, 136, 54, 133, 53, 55, 56,
- 57, 135, 136, 54, 133, 53, 55, 56, 57, 135,
- 136, 54, 133, 53, 55, 56, 57, 22, 23, 24,
- 25, 26, 21 ]
-
-racc_action_check = [
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 33,
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 59, 59, 59, 59, 59, 59, 59,
- 59, 59, 41, 59, 59, 59, 59, 59, 59, 59,
- 59, 59, 59, 59, 59, 59, 97, 97, 97, 97,
- 97, 97, 97, 97, 97, 125, 97, 97, 97, 97,
- 97, 97, 97, 97, 97, 97, 37, 97, 97, 38,
- 38, 38, 38, 38, 38, 38, 38, 38, 35, 38,
- 38, 38, 38, 38, 38, 38, 38, 38, 38, 34,
- 38, 38, 155, 155, 155, 155, 155, 155, 155, 155,
- 155, 100, 155, 155, 155, 155, 155, 155, 155, 155,
- 155, 155, 32, 155, 155, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 31, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 43, 91, 91, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 29, 20, 20,
- 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
- 17, 17, 17, 17, 17, 17, 17, 17, 165, 165,
- 17, 162, 17, 90, 17, 164, 17, 94, 17, 18,
- 58, 17, 18, 18, 18, 18, 18, 18, 1, 18,
- 172, 18, nil, 18, nil, 18, nil, 18, nil, nil,
- 18, 19, 19, 19, 19, 19, 19, 19, 19, nil,
- nil, 19, nil, 19, nil, 19, nil, 19, nil, 19,
- nil, nil, 19, 16, 16, 16, 16, 16, 16, 16,
- 16, nil, nil, 16, nil, 16, nil, 16, nil, 16,
- nil, 16, nil, nil, 16, 15, 15, 15, 15, 15,
- 15, 15, 15, nil, nil, 15, nil, 15, nil, 15,
- nil, 15, nil, 15, 45, nil, 15, 45, 45, 45,
- 45, 45, 45, nil, 45, nil, 45, nil, 45, nil,
- 45, nil, 45, nil, nil, 45, 14, 14, 14, 14,
- 14, 14, 14, 14, nil, nil, 14, nil, 14, nil,
- 14, nil, 14, nil, 14, 146, nil, 14, 146, 146,
- 146, 146, 146, 146, nil, 146, nil, 146, nil, 146,
- nil, 146, nil, 146, nil, nil, 146, 13, 13, 13,
- 13, 13, 13, 13, 13, nil, nil, 13, nil, 13,
- nil, 13, nil, 13, nil, 13, 138, nil, 13, 138,
- 138, 138, 138, 138, 138, nil, 138, nil, 138, nil,
- 138, nil, 138, nil, 138, 44, nil, 138, 44, 44,
- 44, 44, 44, 44, nil, 44, nil, 44, nil, 44,
- nil, 44, nil, 44, nil, nil, 44, 2, 2, 2,
- 2, 2, 2, 2, 2, nil, nil, 2, nil, 2,
- nil, 2, nil, 2, 39, 2, nil, 39, 2, 39,
- 39, 39, 39, nil, 39, nil, 39, nil, 39, nil,
- 39, nil, 39, nil, nil, 39, 0, 0, 0, 0,
- 0, 0, 0, 0, nil, nil, 0, nil, 0, nil,
- 0, nil, 0, nil, 0, nil, nil, 0, 122, 122,
- 122, 122, 122, 122, 122, 122, nil, 122, nil, 122,
- nil, 122, nil, 122, nil, 122, nil, nil, 122, 127,
- 127, 127, 127, 127, 127, 127, 127, nil, 127, nil,
- 127, nil, 127, nil, 127, nil, 127, nil, nil, 127,
- 42, 42, 42, 42, 42, 42, 42, 42, nil, 42,
- nil, 42, nil, 42, nil, 42, nil, 42, nil, nil,
- 42, 159, 159, 159, 159, 159, 159, 159, 159, 159,
- 126, 126, 126, 126, 126, 126, 126, 126, 126, 36,
- nil, nil, 36, 36, 36, 36, 36, 36, 163, 163,
- 163, 163, 163, 163, 163, 163, 163, 92, nil, nil,
- 92, nil, 92, 92, 92, 92, 171, 171, 171, 171,
- 171, 171, 171, 171, 171, 142, nil, nil, 142, 142,
- 142, 142, 142, 142, 52, nil, nil, 52, 52, 52,
- 52, 52, 52, 95, 95, 95, 95, 95, 95, 95,
- 95, 168, 168, 168, 168, 168, 168, 168, 168, 158,
- 158, 158, 158, 158, 158, 158, 158, 27, 27, 27,
- 27, 27, 27 ]
-
-racc_action_pointer = [
- 423, 188, 384, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, nil, 324, 283, 242, 220, 157, 176, 198,
- 135, nil, nil, nil, nil, nil, nil, 604, nil, 147,
- nil, 110, 96, -9, 69, 56, 526, 43, 66, 401,
- nil, 28, 486, 130, 362, 261, nil, nil, nil, nil,
- nil, nil, 571, nil, nil, nil, nil, nil, 169, 20,
- nil, -3, nil, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
- 150, 112, 544, nil, 172, 579, nil, 43, nil, nil,
- 95, nil, nil, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, 444, nil, nil, 52, 517, 465, nil, nil,
- nil, nil, nil, nil, nil, nil, nil, nil, 343, nil,
- nil, nil, 562, nil, nil, nil, 302, nil, nil, nil,
- nil, nil, nil, nil, nil, 89, nil, nil, 595, 508,
- nil, nil, 168, 535, 171, 164, nil, nil, 587, nil,
- nil, 553, 185, nil, nil, nil, nil, nil, nil ]
-
-racc_action_default = [
- -138, -138, -1, -3, -4, -5, -6, -7, -8, -9,
- -10, -11, -12, -138, -138, -138, -138, -138, -138, -138,
- -138, -103, -104, -105, -106, -107, -108, -111, -110, -138,
- -2, -138, -138, -138, -138, -138, -138, -138, -138, -27,
- -26, -35, -138, -58, -41, -40, -47, -48, -49, -50,
- -51, -52, -63, -66, -67, -68, -69, -70, -138, -138,
- -112, -138, -116, -117, -118, -119, -120, -121, -122, -123,
- -124, -125, -126, -127, -128, -129, -130, -131, -132, -133,
- -134, -135, -137, -109, 179, -13, -14, -15, -16, -17,
- -138, -138, -23, -22, -33, -138, -19, -24, -79, -80,
- -138, -82, -83, -84, -85, -86, -87, -88, -89, -90,
- -91, -92, -93, -94, -95, -96, -97, -98, -99, -100,
- -25, -35, -138, -58, -28, -138, -59, -42, -46, -55,
- -56, -65, -71, -72, -75, -76, -77, -31, -38, -44,
- -53, -54, -57, -61, -73, -74, -39, -62, -101, -102,
- -136, -113, -114, -115, -18, -20, -21, -33, -138, -138,
- -78, -81, -138, -59, -36, -37, -64, -45, -59, -43,
- -60, -138, -34, -36, -37, -29, -30, -32, -34 ]
-
-racc_goto_table = [
- 126, 44, 125, 43, 144, 144, 160, 93, 97, 52,
- 166, 82, 144, 41, 40, 39, 138, 146, 169, 147,
- 167, 94, 44, 1, 123, 129, 169, 52, 36, 37,
- 52, 90, 59, 92, 121, 120, 31, 32, 33, 34,
- 35, 170, 58, 166, 83, 30, 170, 166, 151, nil,
- 150, nil, 166, 159, 8, 166, 8, nil, nil, nil,
- nil, 155, nil, 156, 160, nil, nil, 8, 8, 8,
- 8, 8, nil, 8, 4, nil, 4, 157, nil, nil,
- 163, nil, 162, 52, nil, 168, nil, 4, 4, 4,
- 4, 4, nil, 4, nil, nil, nil, nil, 144, nil,
- nil, nil, 144, nil, nil, 129, 144, 144, nil, 5,
- 129, 5, nil, nil, nil, nil, 171, 6, nil, 6,
- nil, nil, 5, 5, 5, 5, 5, 11, 5, 11,
- 6, 6, 6, 6, 6, 7, 6, 7, nil, nil,
- 11, 11, 11, 11, 11, nil, 11, nil, 7, 7,
- 7, 7, 7, nil, 7 ]
-
-racc_goto_check = [
- 22, 24, 21, 23, 36, 36, 37, 18, 16, 34,
- 35, 41, 36, 20, 19, 17, 25, 25, 28, 32,
- 29, 23, 24, 1, 23, 24, 28, 34, 13, 15,
- 34, 14, 38, 17, 20, 19, 1, 1, 1, 1,
- 1, 33, 1, 35, 39, 3, 33, 35, 42, nil,
- 41, nil, 35, 22, 8, 35, 8, nil, nil, nil,
- nil, 16, nil, 18, 37, nil, nil, 8, 8, 8,
- 8, 8, nil, 8, 4, nil, 4, 23, nil, nil,
- 22, nil, 21, 34, nil, 22, nil, 4, 4, 4,
- 4, 4, nil, 4, nil, nil, nil, nil, 36, nil,
- nil, nil, 36, nil, nil, 24, 36, 36, nil, 5,
- 24, 5, nil, nil, nil, nil, 22, 6, nil, 6,
- nil, nil, 5, 5, 5, 5, 5, 11, 5, 11,
- 6, 6, 6, 6, 6, 7, 6, 7, nil, nil,
- 11, 11, 11, 11, 11, nil, 11, nil, 7, 7,
- 7, 7, 7, nil, 7 ]
-
-racc_goto_pointer = [
- nil, 23, nil, 43, 74, 109, 117, 135, 54, nil,
- nil, 127, nil, 10, -5, 11, -30, -3, -29, -4,
- -5, -40, -42, -15, -17, -28, nil, nil, -120, -107,
- nil, nil, -33, -101, -9, -116, -40, -91, 12, 17,
- nil, -9, -13 ]
-
-racc_goto_default = [
- nil, nil, 2, 3, 46, 47, 48, 49, 50, 9,
- 10, 51, 12, nil, nil, nil, nil, nil, nil, nil,
- nil, nil, nil, nil, 140, nil, 45, 127, 139, 128,
- 141, 130, 142, 143, 132, 131, 134, 98, nil, 28,
- 27, nil, 60 ]
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 1, 27, :_reduce_none,
- 2, 28, :_reduce_2,
- 1, 28, :_reduce_3,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 1, 29, :_reduce_none,
- 3, 30, :_reduce_13,
- 3, 31, :_reduce_14,
- 3, 32, :_reduce_15,
- 3, 33, :_reduce_16,
- 3, 34, :_reduce_17,
- 4, 35, :_reduce_18,
- 3, 35, :_reduce_19,
- 2, 40, :_reduce_20,
- 2, 40, :_reduce_21,
- 1, 40, :_reduce_22,
- 1, 40, :_reduce_23,
- 2, 41, :_reduce_24,
- 2, 41, :_reduce_25,
- 1, 41, :_reduce_26,
- 1, 41, :_reduce_27,
- 2, 39, :_reduce_none,
- 4, 39, :_reduce_29,
- 4, 39, :_reduce_30,
- 2, 43, :_reduce_31,
- 4, 43, :_reduce_32,
- 1, 44, :_reduce_33,
- 3, 44, :_reduce_34,
- 1, 45, :_reduce_none,
- 3, 45, :_reduce_36,
- 3, 45, :_reduce_37,
- 2, 46, :_reduce_38,
- 2, 46, :_reduce_39,
- 1, 46, :_reduce_40,
- 1, 46, :_reduce_41,
- 1, 47, :_reduce_none,
- 2, 51, :_reduce_43,
- 1, 51, :_reduce_44,
- 2, 53, :_reduce_45,
- 1, 53, :_reduce_46,
- 1, 50, :_reduce_none,
- 1, 50, :_reduce_none,
- 1, 50, :_reduce_none,
- 1, 50, :_reduce_none,
- 1, 50, :_reduce_none,
- 1, 50, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 54, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 56, :_reduce_57,
- 1, 52, :_reduce_58,
- 1, 57, :_reduce_59,
- 2, 58, :_reduce_60,
- 1, 58, :_reduce_none,
- 2, 49, :_reduce_62,
- 1, 49, :_reduce_none,
- 2, 48, :_reduce_64,
- 1, 48, :_reduce_none,
- 1, 60, :_reduce_none,
- 1, 60, :_reduce_none,
- 1, 60, :_reduce_none,
- 1, 60, :_reduce_none,
- 1, 60, :_reduce_none,
- 1, 62, :_reduce_none,
- 1, 62, :_reduce_none,
- 1, 59, :_reduce_none,
- 1, 59, :_reduce_none,
- 1, 61, :_reduce_none,
- 1, 61, :_reduce_none,
- 1, 61, :_reduce_none,
- 2, 42, :_reduce_78,
- 1, 42, :_reduce_none,
- 1, 63, :_reduce_none,
- 2, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 1, 63, :_reduce_none,
- 3, 36, :_reduce_101,
- 3, 37, :_reduce_102,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 1, 65, :_reduce_none,
- 2, 66, :_reduce_109,
- 1, 66, :_reduce_none,
- 1, 38, :_reduce_111,
- 1, 67, :_reduce_none,
- 2, 67, :_reduce_113,
- 2, 67, :_reduce_114,
- 2, 67, :_reduce_115,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 2, 64, :_reduce_136,
- 1, 64, :_reduce_none ]
-
-racc_reduce_n = 138
-
-racc_shift_n = 179
-
-racc_token_table = {
- false => 0,
- :error => 1,
- :EX_LOW => 2,
- :QUOTE => 3,
- :BAR => 4,
- :SLASH => 5,
- :BACK_SLASH => 6,
- :URL => 7,
- :OTHER => 8,
- :REF_OPEN => 9,
- :FOOTNOTE_OPEN => 10,
- :FOOTNOTE_CLOSE => 11,
- :EX_HIGH => 12,
- :EM_OPEN => 13,
- :EM_CLOSE => 14,
- :CODE_OPEN => 15,
- :CODE_CLOSE => 16,
- :VAR_OPEN => 17,
- :VAR_CLOSE => 18,
- :KBD_OPEN => 19,
- :KBD_CLOSE => 20,
- :INDEX_OPEN => 21,
- :INDEX_CLOSE => 22,
- :REF_CLOSE => 23,
- :VERB_OPEN => 24,
- :VERB_CLOSE => 25 }
-
-racc_nt_base = 26
-
-racc_use_result_var = true
-
-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",
- "EX_LOW",
- "QUOTE",
- "BAR",
- "SLASH",
- "BACK_SLASH",
- "URL",
- "OTHER",
- "REF_OPEN",
- "FOOTNOTE_OPEN",
- "FOOTNOTE_CLOSE",
- "EX_HIGH",
- "EM_OPEN",
- "EM_CLOSE",
- "CODE_OPEN",
- "CODE_CLOSE",
- "VAR_OPEN",
- "VAR_CLOSE",
- "KBD_OPEN",
- "KBD_CLOSE",
- "INDEX_OPEN",
- "INDEX_CLOSE",
- "REF_CLOSE",
- "VERB_OPEN",
- "VERB_CLOSE",
- "$start",
- "content",
- "elements",
- "element",
- "emphasis",
- "code",
- "var",
- "keyboard",
- "index",
- "reference",
- "footnote",
- "verb",
- "normal_str_ele",
- "substitute",
- "ref_label",
- "ref_label2",
- "ref_url_strings",
- "filename",
- "element_label",
- "element_label2",
- "ref_subst_content",
- "ref_subst_content_q",
- "ref_subst_strings_q",
- "ref_subst_strings_first",
- "ref_subst_ele2",
- "ref_subst_eles",
- "ref_subst_str_ele_first",
- "ref_subst_eles_q",
- "ref_subst_ele",
- "ref_subst_ele_q",
- "ref_subst_str_ele",
- "ref_subst_str_ele_q",
- "ref_subst_strings",
- "ref_subst_string3",
- "ref_subst_string",
- "ref_subst_string_q",
- "ref_subst_string2",
- "ref_url_string",
- "verb_strings",
- "normal_string",
- "normal_strings",
- "verb_string",
- "verb_normal_string" ]
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-# reduce 1 omitted
-
-def _reduce_2(val, _values, result)
- result.append val[1]
- result
-end
-
-def _reduce_3(val, _values, result)
- result = val[0]
- result
-end
-
-# reduce 4 omitted
-
-# reduce 5 omitted
-
-# reduce 6 omitted
-
-# reduce 7 omitted
-
-# reduce 8 omitted
-
-# reduce 9 omitted
-
-# reduce 10 omitted
-
-# reduce 11 omitted
-
-# reduce 12 omitted
-
-def _reduce_13(val, _values, result)
- content = val[1]
- result = inline "<em>#{content}</em>", content
-
- result
-end
-
-def _reduce_14(val, _values, result)
- content = val[1]
- result = inline "<code>#{content}</code>", content
-
- result
-end
-
-def _reduce_15(val, _values, result)
- content = val[1]
- result = inline "+#{content}+", content
-
- result
-end
-
-def _reduce_16(val, _values, result)
- content = val[1]
- result = inline "<tt>#{content}</tt>", content
-
- result
-end
-
-def _reduce_17(val, _values, result)
- label = val[1]
- @block_parser.add_label label.reference
- result = "<span id=\"label-#{label}\">#{label}</span>"
-
- result
-end
-
-def _reduce_18(val, _values, result)
- result = "{#{val[1]}}[#{val[2].join}]"
-
- result
-end
-
-def _reduce_19(val, _values, result)
- scheme, inline = val[1]
-
- result = "{#{inline}}[#{scheme}#{inline.reference}]"
-
- result
-end
-
-def _reduce_20(val, _values, result)
- result = [nil, inline(val[1])]
-
- result
-end
-
-def _reduce_21(val, _values, result)
- result = [
- 'rdoc-label:',
- inline("#{val[0].reference}/#{val[1].reference}")
- ]
-
- result
-end
-
-def _reduce_22(val, _values, result)
- result = ['rdoc-label:', val[0].reference]
-
- result
-end
-
-def _reduce_23(val, _values, result)
- result = ['rdoc-label:', "#{val[0].reference}/"]
-
- result
-end
-
-def _reduce_24(val, _values, result)
- result = [nil, inline(val[1])]
-
- result
-end
-
-def _reduce_25(val, _values, result)
- result = [
- 'rdoc-label:',
- inline("#{val[0].reference}/#{val[1].reference}")
- ]
-
- result
-end
-
-def _reduce_26(val, _values, result)
- result = ['rdoc-label:', val[0]]
-
- result
-end
-
-def _reduce_27(val, _values, result)
- ref = val[0].reference
- result = ['rdoc-label:', inline(ref, "#{ref}/")]
-
- result
-end
-
-# reduce 28 omitted
-
-def _reduce_29(val, _values, result)
- result = val[1]
- result
-end
-
-def _reduce_30(val, _values, result)
- result = val[1]
- result
-end
-
-def _reduce_31(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-def _reduce_32(val, _values, result)
- result = inline "\"#{val[1]}\""
-
- result
-end
-
-def _reduce_33(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-def _reduce_34(val, _values, result)
- result = inline "\"#{val[1]}\""
-
- result
-end
-
-# reduce 35 omitted
-
-def _reduce_36(val, _values, result)
- result = val[1]
- result
-end
-
-def _reduce_37(val, _values, result)
- result = inline val[1]
- result
-end
-
-def _reduce_38(val, _values, result)
- result = val[0].append val[1]
-
- result
-end
-
-def _reduce_39(val, _values, result)
- result = val[0].append val[1]
-
- result
-end
-
-def _reduce_40(val, _values, result)
- result = val[0]
-
- result
-end
-
-def _reduce_41(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-# reduce 42 omitted
-
-def _reduce_43(val, _values, result)
- result = val[0].append val[1]
-
- result
-end
-
-def _reduce_44(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-def _reduce_45(val, _values, result)
- result = val[0].append val[1]
-
- result
-end
-
-def _reduce_46(val, _values, result)
- result = val[0]
-
- result
-end
-
-# reduce 47 omitted
-
-# reduce 48 omitted
-
-# reduce 49 omitted
-
-# reduce 50 omitted
-
-# reduce 51 omitted
-
-# reduce 52 omitted
-
-# reduce 53 omitted
-
-# reduce 54 omitted
-
-# reduce 55 omitted
-
-# reduce 56 omitted
-
-def _reduce_57(val, _values, result)
- result = val[0]
-
- result
-end
-
-def _reduce_58(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-def _reduce_59(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-def _reduce_60(val, _values, result)
- result << val[1]
- result
-end
-
-# reduce 61 omitted
-
-def _reduce_62(val, _values, result)
- result << val[1]
-
- result
-end
-
-# reduce 63 omitted
-
-def _reduce_64(val, _values, result)
- result << val[1]
-
- result
-end
-
-# reduce 65 omitted
-
-# reduce 66 omitted
-
-# reduce 67 omitted
-
-# reduce 68 omitted
-
-# reduce 69 omitted
-
-# reduce 70 omitted
-
-# reduce 71 omitted
-
-# reduce 72 omitted
-
-# reduce 73 omitted
-
-# reduce 74 omitted
-
-# reduce 75 omitted
-
-# reduce 76 omitted
-
-# reduce 77 omitted
-
-def _reduce_78(val, _values, result)
- result << val[1]
- result
-end
-
-# reduce 79 omitted
-
-# reduce 80 omitted
-
-# reduce 81 omitted
-
-# reduce 82 omitted
-
-# reduce 83 omitted
-
-# reduce 84 omitted
-
-# reduce 85 omitted
-
-# reduce 86 omitted
-
-# reduce 87 omitted
-
-# reduce 88 omitted
-
-# reduce 89 omitted
-
-# reduce 90 omitted
-
-# reduce 91 omitted
-
-# reduce 92 omitted
-
-# reduce 93 omitted
-
-# reduce 94 omitted
-
-# reduce 95 omitted
-
-# reduce 96 omitted
-
-# reduce 97 omitted
-
-# reduce 98 omitted
-
-# reduce 99 omitted
-
-# reduce 100 omitted
-
-def _reduce_101(val, _values, result)
- index = @block_parser.add_footnote val[1].rdoc
- result = "{*#{index}}[rdoc-label:foottext-#{index}:footmark-#{index}]"
-
- result
-end
-
-def _reduce_102(val, _values, result)
- result = inline "<tt>#{val[1]}</tt>", val[1]
-
- result
-end
-
-# reduce 103 omitted
-
-# reduce 104 omitted
-
-# reduce 105 omitted
-
-# reduce 106 omitted
-
-# reduce 107 omitted
-
-# reduce 108 omitted
-
-def _reduce_109(val, _values, result)
- result << val[1]
- result
-end
-
-# reduce 110 omitted
-
-def _reduce_111(val, _values, result)
- result = inline val[0]
-
- result
-end
-
-# reduce 112 omitted
-
-def _reduce_113(val, _values, result)
- result = val[1]
- result
-end
-
-def _reduce_114(val, _values, result)
- result = val[1]
- result
-end
-
-def _reduce_115(val, _values, result)
- result = val[1]
- result
-end
-
-# reduce 116 omitted
-
-# reduce 117 omitted
-
-# reduce 118 omitted
-
-# reduce 119 omitted
-
-# reduce 120 omitted
-
-# reduce 121 omitted
-
-# reduce 122 omitted
-
-# reduce 123 omitted
-
-# reduce 124 omitted
-
-# reduce 125 omitted
-
-# reduce 126 omitted
-
-# reduce 127 omitted
-
-# reduce 128 omitted
-
-# reduce 129 omitted
-
-# reduce 130 omitted
-
-# reduce 131 omitted
-
-# reduce 132 omitted
-
-# reduce 133 omitted
-
-# reduce 134 omitted
-
-# reduce 135 omitted
-
-def _reduce_136(val, _values, result)
- result << val[1]
- result
-end
-
-# reduce 137 omitted
-
-def _reduce_none(val, _values, result)
- val[0]
-end
-
-end # class InlineParser
-
-end
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index cff5e78a20..3c08b5e4c1 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -1,39 +1,32 @@
require 'rdoc'
+require 'rdoc/parser'
+
+# Simple must come first
+require 'rdoc/parser/simple'
+require 'rdoc/parser/ruby'
+require 'rdoc/parser/c'
+require 'rdoc/parser/perl'
+
+require 'rdoc/stats'
+require 'rdoc/options'
+
require 'find'
require 'fileutils'
-require 'pathname'
require 'time'
##
-# This is the driver for generating RDoc output. It handles file parsing and
-# generation of output.
-#
-# To use this class to generate RDoc output via the API, the recommended way
-# is:
-#
-# rdoc = RDoc::RDoc.new
-# options = rdoc.load_options # returns an RDoc::Options instance
-# # set extra options
-# rdoc.document options
-#
-# You can also generate output like the +rdoc+ executable:
+# 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 argv
+# rdoc.document(args)
#
-# Where +argv+ is an array of strings, each corresponding to an argument you'd
-# give rdoc on the command line. See <tt>rdoc --help<tt> for details.
+# 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::RDoc
- @current = nil
-
- ##
- # This is the list of supported output generators
-
- GENERATORS = {}
-
##
# File pattern to exclude
@@ -60,9 +53,9 @@ class RDoc::RDoc
attr_reader :stats
##
- # The current documentation store
+ # This is the list of supported output generators
- attr_reader :store
+ GENERATORS = {}
##
# Add +klass+ that can generate output after parsing
@@ -82,14 +75,10 @@ class RDoc::RDoc
##
# Sets the active RDoc::RDoc instance
- def self.current= rdoc
+ def self.current=(rdoc)
@current = rdoc
end
- ##
- # Creates a new RDoc::RDoc instance. Call #document to parse files and
- # generate documentation.
-
def initialize
@current = nil
@exclude = nil
@@ -98,7 +87,6 @@ class RDoc::RDoc
@old_siginfo = nil
@options = nil
@stats = nil
- @store = nil
end
##
@@ -120,21 +108,15 @@ class RDoc::RDoc
file_list = file_list.uniq
file_list = remove_unparseable file_list
-
- file_list.sort
end
##
# Turns RDoc from stdin into HTML
def handle_pipe
- @html = RDoc::Markup::ToHtml.new @options
-
- parser = RDoc::Text::MARKUP_FORMAT[@options.markup]
+ @html = RDoc::Markup::ToHtml.new
- document = parser.parse $stdin.read
-
- out = @html.convert document
+ out = @html.convert $stdin.read
$stdout.write out
end
@@ -151,33 +133,6 @@ class RDoc::RDoc
end
##
- # Loads options from .rdoc_options if the file exists, otherwise creates a
- # new RDoc::Options instance.
-
- def load_options
- options_file = File.expand_path '.rdoc_options'
- return RDoc::Options.new unless File.exist? options_file
-
- RDoc.load_yaml
-
- parse_error = if Object.const_defined? :Psych then
- Psych::SyntaxError
- else
- ArgumentError
- end
-
- begin
- options = YAML.load_file '.rdoc_options'
- rescue *parse_error
- end
-
- raise RDoc::Error, "#{options_file} is not a valid rdoc options file" unless
- RDoc::Options === options
-
- options
- 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
@@ -187,9 +142,7 @@ class RDoc::RDoc
last = {}
- if @options.dry_run then
- # do nothing
- elsif File.exist? dir then
+ if File.exist? dir then
error "#{dir} exists and is not a directory" unless File.directory? dir
begin
@@ -214,30 +167,18 @@ you'll need to specify a different output directory name (using the --op <dir>
option)
ERROR
- end unless @options.force_output
+ end
else
FileUtils.mkdir_p dir
- FileUtils.touch output_flag_file dir
end
last
end
##
- # Sets the current documentation tree to +store+ and sets the store's rdoc
- # driver to this instance.
-
- def store= store
- @store = store
- @store.rdoc = self
- end
-
- ##
# Update the flag file in an output directory.
def update_output_dir(op_dir, time, last = {})
- return if @options.dry_run or not @options.update_output_dir
-
open output_flag_file(op_dir), "w" do |f|
f.puts time.rfc2822
last.each do |n, t|
@@ -312,7 +253,7 @@ option)
file_list << list_files_in_directory(rel_file_name)
end
else
- warn "rdoc can't parse the #{type} #{rel_file_name}"
+ raise RDoc::Error, "I can't deal with a #{type} #{rel_file_name}"
end
end
@@ -335,57 +276,23 @@ option)
# Parses +filename+ and returns an RDoc::TopLevel
def parse_file filename
- if defined?(Encoding) then
- encoding = @options.encoding
- filename = filename.encode encoding
- end
-
@stats.add_file filename
-
- content = RDoc::Encoding.read_file filename, encoding
+ content = read_file_contents filename
return unless content
- filename_path = Pathname(filename).expand_path
- relative_path = filename_path.relative_path_from @options.root
-
- if @options.page_dir and
- relative_path.to_s.start_with? @options.page_dir.to_s then
- relative_path =
- relative_path.relative_path_from @options.page_dir
- end
-
- top_level = @store.add_file filename, relative_path.to_s
+ top_level = RDoc::TopLevel.new filename
parser = RDoc::Parser.for top_level, filename, content, @options, @stats
return unless parser
parser.scan
-
- # restart documentation for the classes & modules found
- top_level.classes_or_modules.each do |cm|
- cm.done_documenting = false
- end
-
- top_level
-
- rescue Errno::EACCES => e
- $stderr.puts <<-EOF
-Unable to read #{filename}, #{e.message}
-
-Please check the permissions for this file. Perhaps you do not have access to
-it or perhaps the original author's permissions are to restrictive. If the
-this is not your library please report a bug to the author.
- EOF
rescue => e
$stderr.puts <<-EOF
Before reporting this, could you check that the file you're documenting
-has proper syntax:
-
- #{Gem.ruby} -c #{filename}
-
-RDoc is not a full Ruby parser and will fail when fed invalid ruby programs.
+compiles cleanly--RDoc is not a full Ruby parser, and gets confused easily if
+fed invalid programs.
The internal error was:
@@ -393,7 +300,7 @@ The internal error was:
EOF
- $stderr.puts e.backtrace.join("\n\t") if $DEBUG_RDOC
+ $stderr.puts e.backtrace.join("\n\t") if $RDOC_DEBUG
raise e
nil
@@ -404,12 +311,12 @@ The internal error was:
def parse_files files
file_list = gather_files files
- @stats = RDoc::Stats.new @store, file_list.length, @options.verbosity
return [] if file_list.empty?
file_info = []
+ @stats = RDoc::Stats.new file_list.size, @options.verbosity
@stats.begin_adding
file_info = file_list.map do |filename|
@@ -423,43 +330,32 @@ The internal error was:
end
##
- # Removes file extensions known to be unparseable from +files+ and TAGS
- # files for emacs and vim.
+ # Removes file extensions known to be unparseable from +files+
def remove_unparseable files
files.reject do |file|
- file =~ /\.(?:class|eps|erb|scpt\.txt|ttf|yml)$/i or
- (file =~ /tags$/i and
- open(file, 'rb') { |io|
- io.read(100) =~ /\A(\f\n[^,]+,\d+$|!_TAG_)/
- })
+ file =~ /\.(?:class|eps|erb|scpt\.txt|ttf|yml)$/i
end
end
##
- # Generates documentation or a coverage report depending upon the settings
- # in +options+.
+ # Format up one or more files according to the given arguments.
#
- # +options+ can be either an RDoc::Options instance or an array of strings
- # equivalent to the strings that would be passed on the command line like
- # <tt>%w[-q -o doc -t My\ Doc\ Title]</tt>. #document will automatically
- # call RDoc::Options#finish if an options instance was given.
+ # 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.
#
- # For a list of options, see either RDoc::Options or <tt>rdoc --help</tt>.
- #
- # 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
- def document options
- self.store = RDoc::Store.new
+ def document(argv)
+ RDoc::TopLevel.reset
+ RDoc::Parser::C.reset
- if RDoc::Options === options then
- @options = options
- @options.finish
- else
- @options = load_options
- @options.parse options
- end
+ @options = RDoc::Options.new
+ @options.parse argv
if @options.pipe then
handle_pipe
@@ -468,64 +364,61 @@ The internal error was:
@exclude = @options.exclude
- unless @options.coverage_report then
- @last_modified = setup_output_dir @options.op_dir, @options.force_update
- end
-
- @store.encoding = @options.encoding if @options.respond_to? :encoding
- @store.dry_run = @options.dry_run
- @store.main = @options.main_page
- @store.title = @options.title
- @store.path = @options.op_dir
-
- @start_time = Time.now
+ @last_modified = setup_output_dir @options.op_dir, @options.force_update
- @store.load_cache
+ start_time = Time.now
file_info = parse_files @options.files
- @options.default_title = "RDoc Documentation"
+ @options.title = "RDoc Documentation"
- @store.complete @options.visibility
-
- @stats.coverage_level = @options.coverage_report
-
- if @options.coverage_report then
- puts
-
- puts @stats.report
- elsif file_info.empty? then
+ if file_info.empty?
$stderr.puts "\nNo newer files." unless @options.quiet
else
gen_klass = @options.generator
- @generator = gen_klass.new @store, @options
+ unless @options.quiet then
+ $stderr.puts "\nGenerating #{gen_klass.name.sub(/^.*::/, '')}..."
+ end
+
+ @generator = gen_klass.for @options
+
+ pwd = Dir.pwd
+
+ Dir.chdir @options.op_dir do
+ begin
+ self.class.current = self
- generate
+ @generator.generate file_info
+ update_output_dir ".", start_time, @last_modified
+ ensure
+ self.class.current = nil
+ end
+ end
end
- if @stats and (@options.coverage_report or not @options.quiet) then
+ unless @options.quiet or not @stats then
puts
- puts @stats.summary
+ @stats.print
end
-
- exit @stats.fully_documented? if @options.coverage_report
end
- ##
- # Generates documentation for +file_info+ (from #parse_files) into the
- # output dir using the generator selected
- # by the RDoc options
+ def read_file_contents(filename)
+ content = open filename, "rb" do |f| f.read end
- def generate
- Dir.chdir @options.op_dir do
- unless @options.quiet then
- $stderr.puts "\nGenerating #{@generator.class.name.sub(/^.*::/, '')} format into #{Dir.pwd}..."
+ utf8 = content.sub!(/\A\xef\xbb\xbf/, '')
+ if defined? Encoding then
+ if /coding[=:]\s*([^\s;]+)/i =~ content[%r"\A(?:#!.*\n)?.*\n"]
+ enc = ::Encoding.find($1)
+ end
+ if enc ||= (Encoding::UTF_8 if utf8)
+ content.force_encoding(enc)
end
-
- @generator.generate
- update_output_dir '.', @start_time, @last_modified
end
+
+ content
+ rescue Errno::EISDIR, Errno::ENOENT
+ nil
end
##
@@ -552,7 +445,6 @@ begin
load extension
rescue => e
warn "error loading #{extension.inspect}: #{e.message} (#{e.class})"
- warn "\t#{e.backtrace.join "\n\t"}" if $DEBUG
end
end
end
diff --git a/lib/rdoc/require.rb b/lib/rdoc/require.rb
index a3d4bd18c0..407b55af35 100644
--- a/lib/rdoc/require.rb
+++ b/lib/rdoc/require.rb
@@ -1,3 +1,5 @@
+require 'rdoc/code_object'
+
##
# A file loaded by \#require
@@ -14,7 +16,6 @@ class RDoc::Require < RDoc::CodeObject
def initialize(name, comment)
super()
@name = name.gsub(/'|"/, "") #'
- @top_level = nil
self.comment = comment
end
@@ -27,25 +28,5 @@ class RDoc::Require < RDoc::CodeObject
]
end
- def to_s # :nodoc:
- "require #{name} in: #{parent}"
- end
-
- ##
- # The RDoc::TopLevel corresponding to this require, or +nil+ if not found.
-
- def top_level
- @top_level ||= begin
- tl = RDoc::TopLevel.all_files_hash[name + '.rb']
-
- if tl.nil? and RDoc::TopLevel.all_files.first.full_name =~ %r(^lib/) then
- # second chance
- tl = RDoc::TopLevel.all_files_hash['lib/' + name + '.rb']
- end
-
- tl
- end
- end
-
end
diff --git a/lib/rdoc/ri.rb b/lib/rdoc/ri.rb
index 8b35e0fa2f..17da3fbe83 100644
--- a/lib/rdoc/ri.rb
+++ b/lib/rdoc/ri.rb
@@ -12,9 +12,7 @@ module RDoc::RI
class Error < RDoc::Error; end
- autoload :Driver, 'rdoc/ri/driver'
- autoload :Paths, 'rdoc/ri/paths'
- autoload :Store, 'rdoc/ri/store'
-
end
+require 'rdoc/ri/store'
+
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 88d87f8084..90fbc7c7a2 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -6,12 +6,11 @@ begin
rescue LoadError
end
-begin
- require 'win32console'
-rescue LoadError
-end
-
-require 'rdoc'
+require 'rdoc/ri'
+require 'rdoc/ri/paths'
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
+require 'rdoc/text'
##
# For RubyGems backwards compatibility
@@ -56,14 +55,6 @@ class RDoc::RI::Driver
end
end
- ##
- # Show all method documentation following a class or module
-
- attr_accessor :show_all
-
- ##
- # An RDoc::RI::Store for each entry in the RI path
-
attr_accessor :stores
##
@@ -76,18 +67,17 @@ class RDoc::RI::Driver
def self.default_options
options = {}
+ options[:use_stdout] = !$stdout.tty?
+ options[:width] = 72
options[:interactive] = false
- options[:profile] = false
- options[:show_all] = false
- options[:use_cache] = true
- options[:use_stdout] = !$stdout.tty?
- options[:width] = 72
+ options[:use_cache] = true
+ options[:profile] = false
# By default all standard paths are used.
- options[:use_system] = true
- options[:use_site] = true
- options[:use_home] = true
- options[:use_gems] = true
+ options[:use_system] = true
+ options[:use_site] = true
+ options[:use_home] = true
+ options[:use_gems] = true
options[:extra_doc_dirs] = []
return options
@@ -125,32 +115,22 @@ Usage: #{opt.program_name} [options] [names...]
Where name can be:
- Class | Module | Module::Class
-
- Class::method | Class#method | Class.method | method
-
- gem_name: | gem_name:README | gem_name:History
+ 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.
-A '.' matches either class or instance methods, while #method
+The form '.' method matches either class or instance methods, while #method
matches only instance and ::method matches only class methods.
-README and other files may be displayed by prefixing them with the gem name
-they're contained in. If the gem name is followed by a ':' all files in the
-gem will be shown. The file name extension may be omitted where it is
-unambiguous.
-
For example:
#{opt.program_name} Fil
#{opt.program_name} File
#{opt.program_name} File.new
#{opt.program_name} zip
- #{opt.program_name} rdoc:README
-Note that shell quoting or escaping may be required for method names containing
+Note that shell quoting may be required for method names containing
punctuation:
#{opt.program_name} 'Array.[]'
@@ -163,10 +143,7 @@ To see the default directories ri will search, run:
Specifying the --system, --site, --home, --gems or --doc-dir options will
limit ri to searching only the specified directories.
-ri options may be set in the 'RI' environment variable.
-
-The ri pager can be set with the 'RI_PAGER' environment variable or the
-'PAGER' environment variable.
+Options may also be set in the 'RI' environment variable.
EOT
opt.separator nil
@@ -174,74 +151,57 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
opt.separator nil
- opt.on("--[no-]interactive", "-i",
- "In interactive mode you can repeatedly",
- "look up methods with autocomplete.") do |interactive|
- options[:interactive] = interactive
- end
-
- opt.separator nil
-
- opt.on("--[no-]all", "-a",
- "Show all documentation for a class or",
- "module.") do |show_all|
- options[:show_all] = show_all
+ formatters = RDoc::Markup.constants.grep(/^To[A-Z][a-z]+$/).sort
+ formatters = formatters.sort.map do |formatter|
+ formatter.to_s.sub('To', '').downcase
end
- opt.separator nil
-
- opt.on("--[no-]list", "-l",
- "List classes ri knows about.") do |list|
- options[:list] = list
+ opt.on("--format=NAME", "-f",
+ "Uses the selected formatter. The default",
+ "formatter is bs for paged output and ansi",
+ "otherwise. Valid formatters are:",
+ formatters.join(' '), formatters) do |value|
+ options[:formatter] = RDoc::Markup.const_get "To#{value.capitalize}"
end
opt.separator nil
- opt.on("--[no-]pager", "-T",
+ opt.on("--no-pager", "-T",
"Send output directly to stdout,",
- "rather than to a pager.") do |use_pager|
- options[:use_stdout] = !use_pager
+ "rather than to a pager.") do
+ options[:use_stdout] = true
end
opt.separator nil
opt.on("--width=WIDTH", "-w", OptionParser::DecimalInteger,
- "Set the width of the output.") do |width|
- options[:width] = width
+ "Set the width of the output.") do |value|
+ options[:width] = value
end
opt.separator nil
- opt.on("--server [PORT]", Integer,
- "Run RDoc server on the given port.",
- "The default port is 8214.") do |port|
- options[:server] = port || 8214
+ opt.on("--interactive", "-i",
+ "In interactive mode you can repeatedly",
+ "look up methods with autocomplete.") do
+ options[:interactive] = true
end
opt.separator nil
- formatters = RDoc::Markup.constants.grep(/^To[A-Z][a-z]+$/).sort
- formatters = formatters.sort.map do |formatter|
- formatter.to_s.sub('To', '').downcase
- end
- formatters -= %w[html label test] # remove useless output formats
-
- opt.on("--format=NAME", "-f",
- "Uses the selected formatter. The default",
- "formatter is bs for paged output and ansi",
- "otherwise. Valid formatters are:",
- formatters.join(' '), formatters) do |value|
- options[:formatter] = RDoc::Markup.const_get "To#{value.capitalize}"
+ opt.on("--[no-]profile",
+ "Run with the ruby profiler") do |value|
+ options[:profile] = value
end
opt.separator nil
opt.separator "Data source options:"
opt.separator nil
- opt.on("--[no-]list-doc-dirs",
+ opt.on("--list-doc-dirs",
"List the directories from which ri will",
- "source documentation on stdout and exit.") do |list_doc_dirs|
- options[:list_doc_dirs] = list_doc_dirs
+ "source documentation on stdout and exit.") do
+ options[:list_doc_dirs] = true
end
opt.separator nil
@@ -309,13 +269,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
opt.separator "Debug options:"
opt.separator nil
- opt.on("--[no-]profile",
- "Run with the ruby profiler") do |value|
- options[:profile] = value
- end
-
- opt.separator nil
-
opt.on("--dump=CACHE", File,
"Dumps data from an ri cache or data file") do |value|
options[:dump_path] = value
@@ -370,14 +323,13 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
require 'profile' if options[:profile]
@names = options[:names]
- @list = options[:list]
@doc_dirs = []
@stores = []
RDoc::RI::Paths.each(options[:use_system], options[:use_site],
- options[:use_home], options[:use_gems],
- *options[:extra_doc_dirs]) do |path, type|
+ options[:use_home], options[:use_gems],
+ *options[:extra_doc_dirs]) do |path, type|
@doc_dirs << path
store = RDoc::RI::Store.new path, type
@@ -388,12 +340,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
@list_doc_dirs = options[:list_doc_dirs]
@interactive = options[:interactive]
- @server = options[:server]
@use_stdout = options[:use_stdout]
- @show_all = options[:show_all]
-
- # pager process for jruby
- @jruby_pager_process = nil
end
##
@@ -407,7 +354,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
paths = RDoc::Markup::Verbatim.new
also_in.each do |store|
- paths.parts.push store.friendly_path, "\n"
+ paths.parts.push ' ', store.friendly_path, "\n"
end
out << paths
end
@@ -424,8 +371,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
klass.superclass unless klass.module?
end.compact.shift || 'Object'
- superclass = superclass.full_name unless String === superclass
-
"#{name} < #{superclass}"
end
@@ -441,23 +386,15 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Adds +extends+ to +out+
-
- def add_extends out, extends
- add_extension_modules out, 'Extended by', extends
- end
-
- ##
- # Adds a list of +extensions+ to this module of the given +type+ to +out+.
- # add_includes and add_extends call this, so you should use those directly.
+ # Adds +includes+ to +out+
- def add_extension_modules out, type, extensions
- return if extensions.empty?
+ def add_includes out, includes
+ return if includes.empty?
out << RDoc::Markup::Rule.new(1)
- out << RDoc::Markup::Heading.new(1, "#{type}:")
+ out << RDoc::Markup::Heading.new(1, "Includes:")
- extensions.each do |modules, store|
+ includes.each do |modules, store|
if modules.length == 1 then
include = modules.first
name = include.name
@@ -485,7 +422,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
verb = RDoc::Markup::Verbatim.new
wout.each do |incl|
- verb.push incl.name, "\n"
+ verb.push ' ', incl.name, "\n"
end
out << verb
@@ -495,52 +432,17 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Adds +includes+ to +out+
-
- def add_includes out, includes
- add_extension_modules out, 'Includes', includes
- end
-
- ##
- # Looks up the method +name+ and adds it to +out+
-
- def add_method out, name
- filtered = lookup_method name
-
- method_out = method_document name, filtered
-
- out.concat method_out.parts
- end
-
- ##
- # Adds documentation for all methods in +klass+ to +out+
-
- def add_method_documentation out, klass
- klass.method_list.each do |method|
- begin
- add_method out, method.full_name
- rescue NotFoundError
- next
- end
- end
- end
-
- ##
# Adds a list of +methods+ to +out+ with a heading of +name+
def add_method_list out, methods, name
- return if methods.empty?
+ return unless methods
out << RDoc::Markup::Heading.new(1, "#{name}:")
out << RDoc::Markup::BlankLine.new
- if @use_stdout and !@interactive then
- out.concat methods.map { |method|
- RDoc::Markup::Verbatim.new method
- }
- else
- out << RDoc::Markup::IndentedParagraph.new(2, methods.join(', '))
- end
+ out.push(*methods.map do |method|
+ RDoc::Markup::Verbatim.new ' ', method
+ end)
out << RDoc::Markup::BlankLine.new
end
@@ -569,8 +471,8 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
klasses = klasses - seen
- ancestors.concat klasses
- unexamined.concat klasses
+ ancestors.push(*klasses)
+ unexamined.push(*klasses)
end
ancestors.reverse
@@ -583,84 +485,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Builds a RDoc::Markup::Document from +found+, +klasess+ and +includes+
-
- def class_document name, found, klasses, includes, extends
- also_in = []
-
- out = RDoc::Markup::Document.new
-
- add_class out, name, klasses
-
- add_includes out, includes
- add_extends out, extends
-
- found.each do |store, klass|
- comment = klass.comment
- # TODO the store's cache should always return an empty Array
- class_methods = store.class_methods[klass.full_name] || []
- instance_methods = store.instance_methods[klass.full_name] || []
- attributes = store.attributes[klass.full_name] || []
-
- if comment.empty? and
- instance_methods.empty? and class_methods.empty? then
- also_in << store
- next
- end
-
- add_from out, store
-
- unless comment.empty? then
- out << RDoc::Markup::Rule.new(1)
-
- if comment.merged? then
- parts = comment.parts
- parts = parts.zip [RDoc::Markup::BlankLine.new] * parts.length
- parts.flatten!
- parts.pop
-
- out.concat parts
- else
- out << comment
- end
- end
-
- if class_methods or instance_methods or not klass.constants.empty? then
- out << RDoc::Markup::Rule.new(1)
- end
-
- unless klass.constants.empty? then
- out << RDoc::Markup::Heading.new(1, "Constants:")
- out << RDoc::Markup::BlankLine.new
- list = RDoc::Markup::List.new :NOTE
-
- constants = klass.constants.sort_by { |constant| constant.name }
-
- list.items.concat constants.map { |constant|
- parts = constant.comment.parts if constant.comment
- parts << RDoc::Markup::Paragraph.new('[not documented]') if
- parts.empty?
-
- RDoc::Markup::ListItem.new(constant.name, *parts)
- }
-
- out << list
- out << RDoc::Markup::BlankLine.new
- end
-
- add_method_list out, class_methods, 'Class methods'
- add_method_list out, instance_methods, 'Instance methods'
- add_method_list out, attributes, 'Attributes'
-
- add_method_documentation out, klass if @show_all
- end
-
- add_also_in out, also_in
-
- out
- end
-
- ##
# Hash mapping a known class or module to the stores it can be loaded from
def classes
@@ -680,32 +504,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Returns the stores wherein +name+ is found along with the classes,
- # extends and includes that match it
-
- def classes_and_includes_and_extends_for name
- klasses = []
- extends = []
- includes = []
-
- found = @stores.map do |store|
- begin
- klass = store.load_class name
- klasses << klass
- extends << [klass.extends, store] if klass.extends
- includes << [klass.includes, store] if klass.includes
- [store, klass]
- rescue RDoc::Store::MissingFileError
- end
- end.compact
-
- extends.reject! do |modules,| modules.empty? end
- includes.reject! do |modules,| modules.empty? end
-
- [found, klasses, includes, extends]
- end
-
- ##
# Completes +name+ based on the caches. For Readline
def complete name
@@ -718,11 +516,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
klass_name = method ? name : klass
if name !~ /#|\./ then
- completions = klasses.grep(/^#{Regexp.escape klass_name}[^:]*$/)
- completions.concat klasses.grep(/^#{Regexp.escape name}[^:]*$/) if
- name =~ /::$/
-
- completions << klass if classes.key? klass # to complete a method name
+ completions.push(*klasses.grep(/^#{klass_name}/))
elsif selector then
completions << klass if classes.key? klass
elsif classes.key? klass_name then
@@ -741,10 +535,10 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
completions << "#{klass}#{selector}"
end
- completions.concat methods
+ completions.push(*methods)
end
- completions.sort.uniq
+ completions.sort
end
##
@@ -764,12 +558,79 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
def display_class name
return if name =~ /#|\./
- found, klasses, includes, extends =
- classes_and_includes_and_extends_for name
+ klasses = []
+ includes = []
+
+ found = @stores.map do |store|
+ begin
+ klass = store.load_class name
+ klasses << klass
+ includes << [klass.includes, store] if klass.includes
+ [store, klass]
+ rescue Errno::ENOENT
+ end
+ end.compact
return if found.empty?
- out = class_document name, found, klasses, includes, extends
+ also_in = []
+
+ includes.reject! do |modules,| modules.empty? end
+
+ out = RDoc::Markup::Document.new
+
+ add_class out, name, klasses
+
+ add_includes out, includes
+
+ found.each do |store, klass|
+ comment = klass.comment
+ class_methods = store.class_methods[klass.full_name]
+ instance_methods = store.instance_methods[klass.full_name]
+ attributes = store.attributes[klass.full_name]
+
+ if comment.empty? and !(instance_methods or class_methods) then
+ also_in << store
+ next
+ end
+
+ add_from out, store
+
+ unless comment.empty? then
+ out << RDoc::Markup::Rule.new(1)
+ out << comment
+ end
+
+ if class_methods or instance_methods or not klass.constants.empty? then
+ out << RDoc::Markup::Rule.new
+ end
+
+ unless klass.constants.empty? then
+ out << RDoc::Markup::Heading.new(1, "Constants:")
+ out << RDoc::Markup::BlankLine.new
+ list = RDoc::Markup::List.new :NOTE
+
+ constants = klass.constants.sort_by { |constant| constant.name }
+
+ list.push(*constants.map do |constant|
+ parts = constant.comment.parts if constant.comment
+ parts << RDoc::Markup::Paragraph.new('[not documented]') if
+ parts.empty?
+
+ RDoc::Markup::ListItem.new(constant.name, *parts)
+ end)
+
+ out << list
+ end
+
+ add_method_list out, class_methods, 'Class methods'
+ add_method_list out, instance_methods, 'Instance methods'
+ add_method_list out, attributes, 'Attributes'
+
+ out << RDoc::Markup::BlankLine.new
+ end
+
+ add_also_in out, also_in
display out
end
@@ -778,9 +639,36 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
# Outputs formatted RI data for method +name+
def display_method name
+ found = load_methods_matching name
+
+ raise NotFoundError, name if found.empty?
+
out = RDoc::Markup::Document.new
- add_method out, name
+ out << RDoc::Markup::Heading.new(1, name)
+ out << RDoc::Markup::BlankLine.new
+
+ found.each do |store, methods|
+ methods.each do |method|
+ out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
+
+ unless name =~ /^#{Regexp.escape method.parent_name}/ then
+ out << RDoc::Markup::Heading.new(3, "Implementation from #{method.parent_name}")
+ end
+ out << RDoc::Markup::Rule.new(1)
+
+ if method.arglists then
+ arglists = method.arglists.chomp.split "\n"
+ arglists = arglists.map { |line| [' ', line, "\n"] }
+ out << RDoc::Markup::Verbatim.new(*arglists.flatten)
+ out << RDoc::Markup::Rule.new(1)
+ end
+
+ out << RDoc::Markup::BlankLine.new
+ out << method.comment
+ out << RDoc::Markup::BlankLine.new
+ end
+ end
display out
end
@@ -792,11 +680,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
# be guessed, raises an error if +name+ couldn't be guessed.
def display_name name
- if name =~ /\w:(\w|$)/ then
- display_page name
- return true
- end
-
return true if display_class name
display_method name if name =~ /::|#|\./
@@ -811,7 +694,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
page do |io|
io.puts "#{name} not found, maybe you meant:"
io.puts
- io.puts matches.sort.join("\n")
+ io.puts matches.join("\n")
end
false
@@ -827,64 +710,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
display_name name
end
end
-
- ##
- # Outputs formatted RI data for page +name+.
-
- def display_page name
- store_name, page_name = name.split ':', 2
-
- store = @stores.find { |s| s.source == store_name }
-
- return display_page_list store if page_name.empty?
-
- pages = store.cache[:pages]
-
- unless pages.include? page_name then
- found_names = pages.select do |n|
- n =~ /#{Regexp.escape page_name}\.[^.]+$/
- end
-
- if found_names.length.zero? then
- return display_page_list store, pages
- elsif found_names.length > 1 then
- return display_page_list store, found_names, page_name
- end
-
- page_name = found_names.first
- end
-
- page = store.load_page page_name
-
- display page.comment
- end
-
- ##
- # Outputs a formatted RI page list for the pages in +store+.
-
- def display_page_list store, pages = store.cache[:pages], search = nil
- out = RDoc::Markup::Document.new
-
- title = if search then
- "#{search} pages"
- else
- 'Pages'
- end
-
- out << RDoc::Markup::Heading.new(1, "#{title} in #{store.friendly_path}")
- out << RDoc::Markup::BlankLine.new
-
- list = RDoc::Markup::List.new(:BULLET)
-
- pages.each do |page|
- list << RDoc::Markup::Paragraph.new(page)
- end
-
- out << list
-
- display out
- end
-
##
# Expands abbreviated klass +klass+ into a fully-qualified class. "Zl::Da"
# will be expanded to Zlib::DataError.
@@ -917,27 +742,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
return [selector, method].join if klass.empty?
- case selector
- when ':' then
- [find_store(klass), selector, method]
- else
- [expand_class(klass), selector, method]
- end.join
- end
-
- ##
- # Filters the methods in +found+ trying to find a match for +name+.
-
- def filter_methods found, name
- regexp = name_regexp name
-
- filtered = found.find_all do |store, methods|
- methods.any? { |method| method.full_name =~ regexp }
- end
-
- return filtered unless filtered.empty?
-
- found
+ "#{expand_class klass}#{selector}#{method}"
end
##
@@ -987,55 +792,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Finds the given +pager+ for jruby. Returns an IO if +pager+ was found.
- #
- # Returns false if +pager+ does not exist.
- #
- # Returns nil if the jruby JVM doesn't support ProcessBuilder redirection
- # (1.6 and older).
-
- def find_pager_jruby pager
- require 'java'
- require 'shellwords'
-
- return nil unless java.lang.ProcessBuilder.constants.include? :Redirect
-
- pager = Shellwords.split pager
-
- pb = java.lang.ProcessBuilder.new(*pager)
- pb = pb.redirect_output java.lang.ProcessBuilder::Redirect::INHERIT
-
- @jruby_pager_process = pb.start
-
- input = @jruby_pager_process.output_stream
-
- io = input.to_io
- io.sync = true
- io
- rescue java.io.IOException
- false
- end
-
- ##
- # Finds a store that matches +name+ which can be the name of a gem, "ruby",
- # "home" or "site".
- #
- # See also RDoc::Store#source
-
- def find_store name
- @stores.each do |store|
- source = store.source
-
- return source if source == name
-
- return source if
- store.type == :gem and source =~ /^#{Regexp.escape name}-\d/
- end
-
- raise RDoc::RI::Driver::NotFoundError, name
- end
-
- ##
# Creates a new RDoc::Markup::Formatter. If a formatter is given with -f,
# use it. If we're outputting to a pager, use bs, otherwise ansi.
@@ -1086,42 +842,20 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Is +file+ in ENV['PATH']?
-
- def in_path? file
- return true if file =~ %r%\A/% and File.exist? file
-
- ENV['PATH'].split(File::PATH_SEPARATOR).any? do |path|
- File.exist? File.join(path, file)
- end
- end
-
- ##
- # Lists classes known to ri starting with +names+. If +names+ is empty all
- # known classes are shown.
+ # Lists classes known to ri
- def list_known_classes names = []
+ def list_known_classes
classes = []
stores.each do |store|
- classes << store.module_names
+ classes << store.modules
end
classes = classes.flatten.uniq.sort
- unless names.empty? then
- filter = Regexp.union names.map { |name| /^#{name}/ }
-
- classes = classes.grep filter
- end
-
page do |io|
if paging? or io.tty? then
- if names.empty? then
- io.puts "Classes and Modules known to ri:"
- else
- io.puts "Classes and Modules starting with #{names.join ', '}:"
- end
+ io.puts "Classes and Modules known to ri:"
io.puts
end
@@ -1140,13 +874,13 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
methods = store.instance_methods[ancestor]
if methods then
- matches = methods.grep(/^#{Regexp.escape method.to_s}/)
+ matches = methods.grep(/^#{method}/)
matches = matches.map do |match|
"#{klass}##{match}"
end
- found.concat matches
+ found.push(*matches)
end
end
@@ -1154,13 +888,13 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
methods = store.class_methods[ancestor]
next unless methods
- matches = methods.grep(/^#{Regexp.escape method.to_s}/)
+ matches = methods.grep(/^#{method}/)
matches = matches.map do |match|
"#{klass}::#{match}"
end
- found.concat matches
+ found.push(*matches)
end
end
@@ -1195,10 +929,10 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
methods = []
methods << load_method(store, :class_methods, ancestor, '::', method) if
- [:class, :both].include? types
+ types == :class or types == :both
methods << load_method(store, :instance_methods, ancestor, '#', method) if
- [:instance, :both].include? types
+ types == :instance or types == :both
found << [store, methods.compact]
end
@@ -1207,58 +941,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Returns a filtered list of methods matching +name+
-
- def lookup_method name
- found = load_methods_matching name
-
- raise NotFoundError, name if found.empty?
-
- filter_methods found, name
- end
-
- ##
- # Builds a RDoc::Markup::Document from +found+, +klasses+ and +includes+
-
- def method_document name, filtered
- out = RDoc::Markup::Document.new
-
- out << RDoc::Markup::Heading.new(1, name)
- out << RDoc::Markup::BlankLine.new
-
- filtered.each do |store, methods|
- methods.each do |method|
- out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
-
- unless name =~ /^#{Regexp.escape method.parent_name}/ then
- out << RDoc::Markup::Heading.new(3, "Implementation from #{method.parent_name}")
- end
-
- out << RDoc::Markup::Rule.new(1)
-
- if method.arglists then
- arglists = method.arglists.chomp.split "\n"
- arglists = arglists.map { |line| line + "\n" }
- out << RDoc::Markup::Verbatim.new(*arglists)
- out << RDoc::Markup::Rule.new(1)
- end
-
- if method.respond_to?(:superclass_method) and method.superclass_method
- out << RDoc::Markup::BlankLine.new
- out << RDoc::Markup::Heading.new(4, "(Uses superclass method #{method.superclass_method})")
- out << RDoc::Markup::Rule.new(1)
- end
-
- out << RDoc::Markup::BlankLine.new
- out << method.comment
- out << RDoc::Markup::BlankLine.new
- end
- end
-
- out
- end
-
- ##
# Returns the type of method (:both, :instance, :class) for +selector+
def method_type selector
@@ -1270,21 +952,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Returns a regular expression for +name+ that will match an
- # RDoc::AnyMethod's name.
-
- def name_regexp name
- klass, type, name = parse_name name
-
- case type
- when '#', '::' then
- /^#{klass}#{type}#{Regexp.escape name}$/
- else
- /^#{klass}(#|::)#{Regexp.escape name}$/
- end
- end
-
- ##
# Paginates output through a pager program.
def page
@@ -1293,7 +960,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
yield pager
ensure
pager.close
- @jruby_pager_process.wait_for if @jruby_pager_process
end
else
yield $stdout
@@ -1311,17 +977,17 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
end
##
- # Extracts the class, selector and method name parts from +name+ like
+ # Extract the class, selector and method name parts from +name+ like
# Foo::Bar#baz.
#
# NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
- # method
+ # method
- def parse_name name
- parts = name.split(/(::?|#|\.)/)
+ def parse_name(name)
+ parts = name.split(/(::|#|\.)/)
if parts.length == 1 then
- if parts.first =~ /^[a-z]|^([%&*+\/<>^`|~-]|\+@|-@|<<|<=>?|===?|=>|=~|>>|\[\]=?|~@)$/ then
+ if parts.first =~ /^[a-z]/ then
type = '.'
meth = parts.pop
else
@@ -1331,16 +997,12 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
elsif parts.length == 2 or parts.last =~ /::|#|\./ then
type = parts.pop
meth = nil
- elsif parts[1] == ':' then
- klass = parts.shift
- type = parts.shift
- meth = parts.join
elsif parts[-2] != '::' or parts.last !~ /^[A-Z]/ then
meth = parts.pop
type = parts.pop
end
- klass ||= parts.join
+ klass = parts.join
[klass, type, meth]
end
@@ -1351,12 +1013,10 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
def run
if @list_doc_dirs then
puts @doc_dirs
- elsif @list then
- list_known_classes @names
- elsif @server then
- start_server
- elsif @interactive or @names.empty? then
+ elsif @interactive then
interactive
+ elsif @names.empty? then
+ list_known_classes
else
display_names @names
end
@@ -1371,28 +1031,14 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
def setup_pager
return if @use_stdout
- jruby = Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-
pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more']
pagers.compact.uniq.each do |pager|
- next unless pager
+ next unless File.exist? pager
- pager_cmd = pager.split.first
+ io = IO.popen pager, "w" rescue next
- next unless in_path? pager_cmd
-
- if jruby then
- case io = find_pager_jruby(pager)
- when nil then break
- when false then next
- else io
- end
- else
- io = IO.popen(pager, 'w') rescue next
- end
-
- next if $? and $?.pid == io.pid and $?.exited? # pager didn't work
+ next if $? and $?.exited? # pager didn't work
@paging = true
@@ -1404,21 +1050,5 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
nil
end
- ##
- # Starts a WEBrick server for ri.
-
- def start_server
- require 'webrick'
-
- server = WEBrick::HTTPServer.new :Port => @server
-
- server.mount '/', RDoc::Servlet
-
- trap 'INT' do server.shutdown end
- trap 'TERM' do server.shutdown end
-
- server.start
- end
-
end
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index d7ea285eaa..df12045203 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -1,8 +1,7 @@
require 'rdoc/ri'
##
-# The directories where ri data lives. Paths can be enumerated via ::each, or
-# queried individually via ::system_dir, ::site_dir, ::home_dir and ::gem_dir.
+# The directories where ri data lives.
module RDoc::RI::Paths
@@ -11,25 +10,14 @@ module RDoc::RI::Paths
version = RbConfig::CONFIG['ruby_version']
- BASE = if RbConfig::CONFIG.key? 'ridir' then
- File.join RbConfig::CONFIG['ridir'], version
- else
- File.join RbConfig::CONFIG['datadir'], 'ri', version
- end
-
- homedir = begin
- File.expand_path('~')
- rescue ArgumentError
- end
-
- homedir ||= ENV['HOME'] ||
- ENV['USERPROFILE'] || ENV['HOMEPATH'] # for 1.8 compatibility
-
- HOMEDIR = if homedir then
- File.join homedir, ".rdoc"
- end
+ base = File.join RbConfig::CONFIG['ridir'], version
+ SYSDIR = File.join base, "system"
+ SITEDIR = File.join base, "site"
+ HOMEDIR = (File.expand_path('~/.rdoc') rescue nil)
#:startdoc:
+ @gemdirs = nil
+
##
# Iterates over each selected path yielding the directory and type.
#
@@ -38,24 +26,21 @@ module RDoc::RI::Paths
# true
# :site:: Where ri for installed libraries are stored. Yielded when
# +site+ is true. Normally no ri data is stored here.
- # :home:: ~/.rdoc. Yielded when +home+ is true.
+ # :home:: ~/.ri. Yielded when +home+ is true.
# :gem:: ri data for an installed gem. Yielded when +gems+ is true.
# :extra:: ri data directory from the command line. Yielded for each
# entry in +extra_dirs+
- def self.each system = true, site = true, home = true, gems = :latest, *extra_dirs # :yields: directory, type
- return enum_for __method__, system, site, home, gems, *extra_dirs unless
- block_given?
-
+ def self.each system, site, home, gems, *extra_dirs # :yields: directory, type
extra_dirs.each do |dir|
yield dir, :extra
end
- yield system_dir, :system if system
- yield site_dir, :site if site
- yield home_dir, :home if home and HOMEDIR
+ yield SYSDIR, :system if system
+ yield SITEDIR, :site if site
+ yield HOMEDIR, :home if home
- gemdirs(gems).each do |dir|
+ gemdirs.each do |dir|
yield dir, :gem
end if gems
@@ -63,72 +48,36 @@ module RDoc::RI::Paths
end
##
- # The ri directory for the gem with +gem_name+.
-
- def self.gem_dir name, version
- req = Gem::Requirement.new "= #{version}"
+ # The latest installed gems' ri directories
- spec = Gem::Specification.find_by_name name, req
+ def self.gemdirs
+ return @gemdirs if @gemdirs
- File.join spec.doc_dir, 'ri'
- end
+ require 'rubygems' unless defined?(Gem)
- ##
- # The latest installed gems' ri directories. +filter+ can be :all or
- # :latest.
- #
- # A +filter+ :all includes all versions of gems and includes gems without
- # ri documentation.
+ # HACK dup'd from Gem.latest_partials and friends
+ all_paths = []
- def self.gemdirs filter = :latest
- require 'rubygems' unless defined?(Gem)
+ all_paths = Gem.path.map do |dir|
+ Dir[File.join(dir, 'doc', '*', 'ri')]
+ end.flatten
ri_paths = {}
- all = Gem::Specification.map do |spec|
- [File.join(spec.doc_dir, 'ri'), spec.name, spec.version]
- end
-
- if filter == :all then
- gemdirs = []
-
- all.group_by do |_, name, _|
- name
- end.sort_by do |group, _|
- group
- end.map do |group, items|
- items.sort_by do |_, _, version|
- version
- end.reverse_each do |dir,|
- gemdirs << dir
+ 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
-
- return gemdirs
- end
-
- all.each do |dir, name, ver|
- next unless File.exist? dir
-
- if ri_paths[name].nil? or ver > ri_paths[name].first then
- ri_paths[name] = [ver, name, dir]
- end
end
- ri_paths.sort_by { |_, (_, name, _)| name }.map { |k, v| v.last }
+ @gemdirs = ri_paths.map { |k,v| v.last }.sort
rescue LoadError
- []
- end
-
- ##
- # The location of the rdoc data in the user's home directory.
- #
- # Like ::system, ri data in the user's home directory is rare and predates
- # libraries distributed via RubyGems. ri data is rarely generated into this
- # directory.
-
- def self.home_dir
- HOMEDIR
+ @gemdirs = []
end
##
@@ -137,7 +86,7 @@ module RDoc::RI::Paths
#
# See also ::each
- def self.path(system = true, site = true, home = true, gems = :latest, *extra_dirs)
+ def self.path(system, site, home, gems, *extra_dirs)
path = raw_path system, site, home, gems, *extra_dirs
path.select { |directory| File.directory? directory }
@@ -159,29 +108,5 @@ module RDoc::RI::Paths
path.compact
end
- ##
- # The location of ri data installed into the site dir.
- #
- # Historically this was available for documentation installed by ruby
- # libraries predating RubyGems. It is unlikely to contain any content for
- # modern ruby installations.
-
- def self.site_dir
- File.join BASE, 'site'
- end
-
- ##
- # The location of the built-in ri data.
- #
- # This data is built automatically when `make` is run when ruby is
- # installed. If you did not install ruby by hand you may need to install
- # the documentation yourself. Please consult the documentation for your
- # package manager or ruby installer for details. You can also use the
- # rdoc-data gem to install system ri data for common versions of ruby.
-
- def self.system_dir
- File.join BASE, 'system'
- end
-
end
diff --git a/lib/rdoc/ri/store.rb b/lib/rdoc/ri/store.rb
index 9fa9bbb03c..81ffb7e674 100644
--- a/lib/rdoc/ri/store.rb
+++ b/lib/rdoc/ri/store.rb
@@ -1,6 +1,248 @@
-module RDoc::RI
+require 'rdoc/code_objects'
+require 'fileutils'
- Store = RDoc::Store # :nodoc:
+##
+# A set of ri data.
+#
+# The store manages reading and writing ri data for a project (gem, path,
+# etc.) and maintains a cache of methods, classes and ancestors in the
+# store.
+
+class RDoc::RI::Store
+
+ ##
+ # Path this store reads or writes
+
+ attr_accessor :path
+
+ ##
+ # Type of ri datastore this was loaded from. See RDoc::RI::Driver,
+ # RDoc::RI::Paths.
+
+ attr_accessor :type
+
+ attr_reader :cache
+
+ ##
+ # Creates a new Store of +type+ that will load or save to +path+
+
+ def initialize path, type = nil
+ @type = type
+ @path = path
+
+ @cache = {
+ :class_methods => {},
+ :instance_methods => {},
+ :attributes => {},
+ :modules => [],
+ :ancestors => {},
+ }
+ end
+
+ ##
+ # Ancestors cache accessor. Maps a klass name to an Array of its ancestors
+ # in this store. If Foo in this store inherits from Object, Kernel won't be
+ # listed (it will be included from ruby's ri store).
+
+ def ancestors
+ @cache[:ancestors]
+ end
+
+ ##
+ # Attributes cache accessor. Maps a class to an Array of its attributes.
+
+ def attributes
+ @cache[:attributes]
+ end
+
+ ##
+ # Path to the cache file
+
+ def cache_path
+ File.join @path, 'cache.ri'
+ end
+
+ ##
+ # Path to the ri data for +klass_name+
+
+ def class_file klass_name
+ name = klass_name.split('::').last
+ File.join class_path(klass_name), "cdesc-#{name}.ri"
+ end
+
+ ##
+ # Class methods cache accessor. Maps a class to an Array of its class
+ # methods (not full name).
+
+ def class_methods
+ @cache[:class_methods]
+ end
+
+ ##
+ # Path where data for +klass_name+ will be stored (methods or class data)
+
+ def class_path klass_name
+ File.join @path, *klass_name.split('::')
+ end
+
+ ##
+ # Friendly rendition of #path
+
+ def friendly_path
+ case type
+ when :gem then
+ sep = Regexp.union(*['/', File::ALT_SEPARATOR].compact)
+ @path =~ /#{sep}doc#{sep}(.*?)#{sep}ri$/
+ "gem #{$1}"
+ when :home then '~/.ri'
+ when :site then 'ruby site'
+ when :system then 'ruby core'
+ else @path
+ end
+ end
+
+ def inspect # :nodoc:
+ "#<%s:0x%x %s %p>" % [self.class, object_id, @path, modules.sort]
+ end
+
+ ##
+ # Instance methods cache accessor. Maps a class to an Array of its
+ # instance methods (not full name).
+
+ def instance_methods
+ @cache[:instance_methods]
+ end
+
+ ##
+ # Loads cache file for this store
+
+ def load_cache
+ open cache_path, 'rb' do |io|
+ @cache = Marshal.load io.read
+ end
+ rescue Errno::ENOENT
+ end
+
+ ##
+ # Loads ri data for +klass_name+
+
+ def load_class klass_name
+ open class_file(klass_name), 'rb' do |io|
+ Marshal.load io.read
+ end
+ end
+
+ ##
+ # Loads ri data for +method_name+ in +klass_name+
+
+ def load_method klass_name, method_name
+ open method_file(klass_name, method_name), 'rb' do |io|
+ Marshal.load io.read
+ end
+ end
+
+ ##
+ # Path to the ri data for +method_name+ in +klass_name+
+
+ def method_file klass_name, method_name
+ method_name = method_name.split('::').last
+ method_name =~ /#(.*)/
+ method_type = $1 ? 'i' : 'c'
+ method_name = $1 if $1
+
+ method_name = if ''.respond_to? :ord then
+ method_name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+ else
+ method_name.gsub(/\W/) { "%%%02x" % $&[0] }
+ end
+
+ File.join class_path(klass_name), "#{method_name}-#{method_type}.ri"
+ end
+
+ ##
+ # Modules cache accessor. An Array of all the modules (and classes) in the
+ # store.
+
+ def modules
+ @cache[:modules]
+ end
+
+ ##
+ # Writes the cache file for this store
+
+ def save_cache
+ # HACK mongrel-1.1.5 documents its files twice
+ @cache[:attributes]. each do |_, m| m.uniq!; m.sort! end
+ @cache[:class_methods]. each do |_, m| m.uniq!; m.sort! end
+ @cache[:instance_methods].each do |_, m| m.uniq!; m.sort! end
+
+ open cache_path, 'wb' do |io|
+ Marshal.dump @cache, io
+ end
+ end
+
+ ##
+ # Writes the ri data for +klass+
+
+ def save_class klass
+ FileUtils.mkdir_p class_path(klass.full_name)
+
+ @cache[:modules] << klass.full_name
+
+ path = class_file klass.full_name
+
+ begin
+ disk_klass = nil
+
+ open path, 'rb' do |io|
+ disk_klass = Marshal.load io.read
+ end
+
+ klass.merge disk_klass
+ rescue Errno::ENOENT
+ end
+
+ # BasicObject has no ancestors
+ ancestors = klass.ancestors.compact.map do |ancestor|
+ # HACK for classes we don't know about (class X < RuntimeError)
+ String === ancestor ? ancestor : ancestor.full_name
+ end
+
+ @cache[:ancestors][klass.full_name] ||= []
+ @cache[:ancestors][klass.full_name].push(*ancestors)
+
+ attributes = klass.attributes.map do |attribute|
+ "#{attribute.type} #{attribute.name}"
+ end
+
+ unless attributes.empty? then
+ @cache[:attributes][klass.full_name] ||= []
+ @cache[:attributes][klass.full_name].push(*attributes)
+ end
+
+ open path, 'wb' do |io|
+ Marshal.dump klass, io
+ end
+ end
+
+ ##
+ # Writes the ri data for +method+ on +klass+
+
+ def save_method klass, method
+ FileUtils.mkdir_p class_path(klass.full_name)
+
+ cache = if method.singleton then
+ @cache[:class_methods]
+ else
+ @cache[:instance_methods]
+ end
+ cache[klass.full_name] ||= []
+ cache[klass.full_name] << method.name
+
+ open method_file(klass.full_name, method.full_name), 'wb' do |io|
+ Marshal.dump method, io
+ end
+ end
end
diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb
index e6e0b41aab..ab5f32ba42 100644
--- a/lib/rdoc/ruby_lex.rb
+++ b/lib/rdoc/ruby_lex.rb
@@ -1,5 +1,3 @@
-# coding: US-ASCII
-
#--
# irb/ruby-lex.rb - ruby lexcal analyzer
# $Release Version: 0.9.5$
@@ -11,6 +9,7 @@
require "e2mmap"
require "irb/slex"
+require "rdoc/ruby_token"
require "stringio"
##
@@ -20,12 +19,6 @@ require "stringio"
class RDoc::RubyLex
- ##
- # Raised upon invalid input
-
- class Error < RDoc::Error
- end
-
# :stopdoc:
extend Exception2MessageMapper
@@ -56,29 +49,6 @@ class RDoc::RubyLex
self.debug_level = 0
- # :startdoc:
-
- ##
- # Returns an Array of +ruby+ tokens. See ::new for a description of
- # +options+.
-
- def self.tokenize ruby, options
- tokens = []
-
- scanner = RDoc::RubyLex.new ruby, options
- scanner.exception_on_syntax_error = true
-
- while token = scanner.token do
- tokens << token
- end
-
- tokens
- end
-
- ##
- # Creates a new lexer for +content+. +options+ is an RDoc::Options, only
- # +tab_width is used.
-
def initialize(content, options)
lex_init
@@ -119,15 +89,12 @@ class RDoc::RubyLex
@prompt = nil
@prev_seek = nil
- @ltype = nil
end
- # :stopdoc:
-
def inspect # :nodoc:
- "#<%s:0x%x pos %d lex_state %p space_seen %p>" % [
+ "#<%s:0x%x lex_state %p space_seen %p>" % [
self.class, object_id,
- @io.pos, @lex_state, @space_seen,
+ @lex_state, @space_seen,
]
end
@@ -153,8 +120,8 @@ class RDoc::RubyLex
end
def get_readed
- if idx = @readed.rindex("\n")
- @base_char_no = @readed.size - (idx + 1)
+ if idx = @readed.reverse.index("\n")
+ @base_char_no = idx
else
@base_char_no += @readed.size
end
@@ -182,7 +149,6 @@ class RDoc::RubyLex
else
@char_no += 1
end
-
c
end
@@ -219,8 +185,8 @@ class RDoc::RubyLex
@seek -= 1
if c == "\n"
@line_no -= 1
- if idx = @readed.rindex("\n")
- @char_no = idx + 1
+ if idx = @readed.reverse.index("\n")
+ @char_no = @readed.size - idx
else
@char_no = @base_char_no + @readed.size
end
@@ -354,7 +320,7 @@ class RDoc::RubyLex
tk = @OP.match(self)
@space_seen = tk.kind_of?(TkSPACE)
rescue SyntaxError => e
- raise Error, "syntax error: #{e.message}" if
+ raise RDoc::Error, "syntax error: #{e.message}" if
@exception_on_syntax_error
tk = TkError.new(@seek, @line_no, @char_no)
@@ -412,7 +378,7 @@ class RDoc::RubyLex
def lex_init()
@OP = IRB::SLex.new
@OP.def_rules("\0", "\004", "\032") do |op, io|
- Token(TkEND_OF_SCRIPT, '')
+ Token(TkEND_OF_SCRIPT)
end
@OP.def_rules(" ", "\t", "\f", "\r", "\13") do |op, io|
@@ -434,15 +400,11 @@ class RDoc::RubyLex
|op, io|
@ltype = "="
res = ''
- nil until (ch = getc) == "\n"
-
- until ( peek_equal?("=end") && peek(4) =~ /\s/ ) do
- (ch = getc)
- res << ch
+ until (ch = getc) == "\n" do res << ch end
+ until peek_equal?("=end") && peek(4) =~ /\s/ do
+ until (ch = getc) == "\n" do res << ch end
end
-
- gets # consume =end
-
+ res << gets
@ltype = nil
Token(TkRD_COMMENT, res)
end
@@ -491,7 +453,7 @@ class RDoc::RubyLex
|op, io|
tk = nil
if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
- (@lex_state != EXPR_ARG || @space_seen)
+ (@lex_state != EXPR_ARG || @space_seen)
c = peek(0)
if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
tk = identify_here_document
@@ -536,8 +498,13 @@ class RDoc::RubyLex
@lex_state = EXPR_BEG;
Token(TkQUESTION)
else
+ str = ch
+ if ch == '\\'
+ str << read_escape
+ end
@lex_state = EXPR_END
- Token(TkSTRING, ch)
+ str << (ch.respond_to?(:ord) ? ch.ord : ch[0])
+ Token(TkINTEGER, str)
end
end
end
@@ -573,12 +540,12 @@ class RDoc::RubyLex
catch(:RET) do
if @lex_state == EXPR_ARG
if @space_seen and peek(0) =~ /[0-9]/
- throw :RET, identify_number(op)
+ throw :RET, identify_number
else
@lex_state = EXPR_BEG
end
elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
- throw :RET, identify_number(op)
+ throw :RET, identify_number
else
@lex_state = EXPR_BEG
end
@@ -707,7 +674,7 @@ class RDoc::RubyLex
tk_c = TkLPAREN
end
@indent_stack.push tk_c
- Token tk_c
+ tk = Token(tk_c)
end
@OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
@@ -808,8 +775,7 @@ class RDoc::RubyLex
@OP.def_rule("_") do
if peek_match?(/_END__/) and @lex_state == EXPR_BEG then
- 6.times { getc }
- Token(TkEND_OF_SCRIPT, '__END__')
+ Token(TkEND_OF_SCRIPT)
else
ungetc
identify_identifier
@@ -856,12 +822,6 @@ class RDoc::RubyLex
end
end
- IDENT_RE = if defined? Encoding then
- eval '/[\w\u{0080}-\u{FFFFF}]/u' # 1.8 can't parse \u{}
- else
- /[\w\x80-\xFF]/
- end
-
def identify_identifier
token = ""
if peek(0) =~ /[$@]/
@@ -871,7 +831,15 @@ class RDoc::RubyLex
end
end
- while (ch = getc) =~ IDENT_RE do
+ # HACK to avoid a warning the regexp is hidden behind an eval
+ # HACK need a better way to detect oniguruma
+ @identifier_re ||= if defined? Encoding then
+ eval '/[\p{Alnum}_]/u'
+ else
+ eval '/[\w\x80-\xff]/'
+ end
+
+ while (ch = getc) =~ @identifier_re
print " :#{ch}: " if RDoc::RubyLex.debug?
token.concat ch
end
@@ -936,8 +904,6 @@ class RDoc::RubyLex
@indent += 1
@indent_stack.push token_c
end
- else
- token_c = TkIDENTIFIER
end
elsif DEINDENT_CLAUSE.include?(token)
@@ -958,8 +924,7 @@ class RDoc::RubyLex
if peek(0) == '='
token.concat getc
end
- elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT ||
- @lex_state == EXPR_ARG
+ elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT
@lex_state = EXPR_ARG
else
@lex_state = EXPR_END
@@ -982,13 +947,12 @@ class RDoc::RubyLex
indent = true
end
if /['"`]/ =~ ch
- user_quote = lt = ch
+ lt = ch
quoted = ""
while (c = getc) && c != lt
quoted.concat c
end
else
- user_quote = nil
lt = '"'
quoted = ch.dup
while (c = getc) && c =~ /\w/
@@ -1008,52 +972,35 @@ class RDoc::RubyLex
end
end
- output_heredoc = reserve.join =~ /\A\r?\n\z/
-
- if output_heredoc then
- doc = '<<'
- doc << '-' if indent
- doc << "#{user_quote}#{quoted}#{user_quote}\n"
- else
- doc = '"'
- end
-
@here_header = false
+ doc = ''
while l = gets
- l = l.sub(/(:?\r)?\n\z/, "\n")
- if (indent ? l.strip : l.chomp) == quoted
+ l = l.sub(/(:?\r)?\n\z/, '')
+ if (indent ? l.strip : l) == quoted
break
end
doc << l
end
- if output_heredoc then
- doc << l.chomp
- else
- doc << '"'
- end
-
@here_header = true
@here_readed.concat reserve
while ch = reserve.pop
ungetc ch
end
- token_class = output_heredoc ? RDoc::RubyLex::TkHEREDOC : Ltype2Token[lt]
@ltype = ltback
@lex_state = EXPR_END
- Token(token_class, doc)
+ Token(Ltype2Token[lt], doc)
end
def identify_quotation
- type = ch = getc
- if lt = PERCENT_LTYPE[type]
+ ch = getc
+ if lt = PERCENT_LTYPE[ch]
ch = getc
- elsif type =~ /\W/
- type = nil
+ elsif ch =~ /\W/
lt = "\""
else
- return Token(TkMOD, '%')
+ raise RDoc::Error, "unknown type of %string #{ch.inspect}"
end
# if ch !~ /\W/
# ungetc
@@ -1061,13 +1008,13 @@ class RDoc::RubyLex
# end
#@ltype = lt
@quoted = ch unless @quoted = PERCENT_PAREN[ch]
- identify_string(lt, @quoted, type)
+ identify_string(lt, @quoted)
end
- def identify_number(op = "")
+ def identify_number
@lex_state = EXPR_END
- num = op
+ num = ''
if peek(0) == "0" && peek(1) !~ /[.eE]/
num << getc
@@ -1088,7 +1035,7 @@ class RDoc::RubyLex
when /[0-7]/
match = /[0-7_]/
when /[89]/
- raise Error, "Illegal octal digit"
+ raise RDoc::Error, "Illegal octal digit"
else
return Token(TkINTEGER, num)
end
@@ -1102,7 +1049,7 @@ class RDoc::RubyLex
if match =~ ch
if ch == "_"
if non_digit
- raise Error, "trailing `#{ch}' in number"
+ raise RDoc::Error, "trailing `#{ch}' in number"
else
non_digit = ch
end
@@ -1114,10 +1061,10 @@ class RDoc::RubyLex
ungetc
num[-1, 1] = ''
if len0
- raise Error, "numeric literal without digits"
+ raise RDoc::Error, "numeric literal without digits"
end
if non_digit
- raise Error, "trailing `#{non_digit}' in number"
+ raise RDoc::Error, "trailing `#{non_digit}' in number"
end
break
end
@@ -1138,7 +1085,7 @@ class RDoc::RubyLex
non_digit = ch
when allow_point && "."
if non_digit
- raise Error, "trailing `#{non_digit}' in number"
+ raise RDoc::Error, "trailing `#{non_digit}' in number"
end
type = TkFLOAT
if peek(0) !~ /[0-9]/
@@ -1150,7 +1097,7 @@ class RDoc::RubyLex
allow_point = false
when allow_e && "e", allow_e && "E"
if non_digit
- raise Error, "trailing `#{non_digit}' in number"
+ raise RDoc::Error, "trailing `#{non_digit}' in number"
end
type = TkFLOAT
if peek(0) =~ /[+-]/
@@ -1161,7 +1108,7 @@ class RDoc::RubyLex
non_digit = ch
else
if non_digit
- raise Error, "trailing `#{non_digit}' in number"
+ raise RDoc::Error, "trailing `#{non_digit}' in number"
end
ungetc
num[-1, 1] = ''
@@ -1172,17 +1119,14 @@ class RDoc::RubyLex
Token(type, num)
end
- def identify_string(ltype, quoted = ltype, type = nil)
- close = PERCENT_PAREN.values.include?(quoted)
+ def identify_string(ltype, quoted = ltype)
@ltype = ltype
@quoted = quoted
- str = if ltype == quoted and %w[" ' /].include? ltype then
+ str = if ltype == quoted then
ltype.dup
- elsif RUBY_VERSION > '1.9' then
- "%#{type or PERCENT_LTYPE.key ltype}#{PERCENT_PAREN_REV[quoted]}"
else
- "%#{type or PERCENT_LTYPE.index ltype}#{PERCENT_PAREN_REV[quoted]}"
+ "%#{PERCENT_PAREN_REV[quoted]}"
end
subtype = nil
@@ -1192,7 +1136,7 @@ class RDoc::RubyLex
while ch = getc
str << ch
- if @quoted == ch and nest <= 0
+ if @quoted == ch and nest == 0
break
elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
ch = getc
@@ -1203,21 +1147,17 @@ class RDoc::RubyLex
else
ungetc
end
- elsif ch == '\\'
- if %w[' /].include? @ltype then
- case ch = getc
- when "\\", "\n", "'"
- when @ltype
- str << ch
- else
- ungetc
- end
+ elsif ch == '\\' and @ltype == "'" #'
+ case ch = getc
+ when "\\", "\n", "'"
else
- str << read_escape
+ ungetc
end
+ elsif ch == '\\' #'
+ str << read_escape
end
- if close then
+ if PERCENT_PAREN.values.include?(@quoted)
if PERCENT_PAREN[ch] == @quoted
nest += 1
elsif ch == @quoted
diff --git a/lib/rdoc/ruby_token.rb b/lib/rdoc/ruby_token.rb
index 7878e4c22a..0c4f837193 100644
--- a/lib/rdoc/ruby_token.rb
+++ b/lib/rdoc/ruby_token.rb
@@ -60,11 +60,6 @@ module RDoc::RubyToken
self
end
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @text]
- end
-
end
class TkNode < Token
@@ -88,12 +83,6 @@ module RDoc::RubyToken
end
alias text node
-
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @node]
- end
-
end
class TkId < Token
@@ -116,12 +105,6 @@ module RDoc::RubyToken
end
alias text name
-
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @name]
- end
-
end
class TkKW < TkId
@@ -147,12 +130,6 @@ module RDoc::RubyToken
end
alias text value
-
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %s, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @value]
- end
-
end
class TkOp < Token
@@ -176,12 +153,6 @@ module RDoc::RubyToken
end
alias text name
-
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @name]
- end
-
end
class TkOPASGN < TkOp
@@ -204,16 +175,10 @@ module RDoc::RubyToken
def text
@text ||= "#{TkToken2Reading[op]}="
end
-
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @op]
- end
-
end
class TkUnknownChar < Token
- def initialize(seek, line_no, char_no, name)
+ def initialize(seek, line_no, char_no, id)
super(seek, line_no, char_no)
@name = name
end
@@ -232,12 +197,6 @@ module RDoc::RubyToken
end
alias text name
-
- def inspect # :nodoc:
- klass = self.class.name.split('::').last
- "{%s %d, %d:%d %p}" % [klass, @seek, @line_no, @char_no, @name]
- end
-
end
class TkError < Token
@@ -294,7 +253,7 @@ module RDoc::RubyToken
[:TkWHILE, TkKW, "while", EXPR_BEG, :TkWHILE_MOD],
[:TkUNTIL, TkKW, "until", EXPR_BEG, :TkUNTIL_MOD],
[:TkFOR, TkKW, "for", EXPR_BEG],
- [:TkBREAK, TkKW, "break", EXPR_MID],
+ [:TkBREAK, TkKW, "break", EXPR_END],
[:TkNEXT, TkKW, "next", EXPR_END],
[:TkREDO, TkKW, "redo", EXPR_END],
[:TkRETRY, TkKW, "retry", EXPR_END],
@@ -331,7 +290,6 @@ module RDoc::RubyToken
[:TkINTEGER, TkVal],
[:TkFLOAT, TkVal],
[:TkSTRING, TkVal],
- [:TkHEREDOC, TkVal],
[:TkXSTRING, TkVal],
[:TkREGEXP, TkVal],
[:TkSYMBOL, TkVal],
@@ -371,13 +329,13 @@ module RDoc::RubyToken
[:TkfLPAREN, Token, "("], # func( #
[:TkfLBRACK, Token, "["], # func[ #
[:TkfLBRACE, Token, "{"], # func{ #
+ [:TkSTAR, Token, "*"], # *arg
+ [:TkAMPER, Token, "&"], # &arg #
[:TkSYMBEG, Token, ":"], # :SYMBOL
- [:TkAMPER, TkOp, "&"],
[:TkGT, TkOp, ">"],
[:TkLT, TkOp, "<"],
[:TkPLUS, TkOp, "+"],
- [:TkSTAR, TkOp, "*"],
[:TkMINUS, TkOp, "-"],
[:TkMULT, TkOp, "*"],
[:TkDIV, TkOp, "/"],
@@ -402,6 +360,7 @@ module RDoc::RubyToken
[:TkSEMICOLON, Token, ";"],
[:TkCOMMENT, TkVal],
+ [:TkRD_COMMENT],
[:TkSPACE, Token, " "],
[:TkNL, Token, "\n"],
[:TkEND_OF_SCRIPT],
@@ -442,9 +401,7 @@ module RDoc::RubyToken
def_token(*defs)
end
- def_token :TkRD_COMMENT, TkCOMMENT
-
- NEWLINE_TOKEN = TkNL.new 0, 0, 0, "\n"
+ NEWLINE_TOKEN = TkNL.new nil, 0, 0, "\n"
class TkSYMBOL
diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb
deleted file mode 100644
index f001c6d66c..0000000000
--- a/lib/rdoc/rubygems_hook.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-require 'rubygems'
-require 'rubygems/user_interaction'
-require 'fileutils'
-require 'rdoc'
-
-##
-# Gem::RDoc provides methods to generate RDoc and ri data for installed gems
-# upon gem installation.
-#
-# This file is automatically required by RubyGems 1.9 and newer.
-
-class RDoc::RubygemsHook
-
- include Gem::UserInteraction
-
- @rdoc_version = nil
- @specs = []
-
- ##
- # Force installation of documentation?
-
- attr_accessor :force
-
- ##
- # Generate rdoc?
-
- attr_accessor :generate_rdoc
-
- ##
- # Generate ri data?
-
- attr_accessor :generate_ri
-
- class << self
-
- ##
- # Loaded version of RDoc. Set by ::load_rdoc
-
- attr_reader :rdoc_version
-
- end
-
- ##
- # Post installs hook that generates documentation for each specification in
- # +specs+
-
- def self.generation_hook installer, specs
- types = installer.document
-
- generate_rdoc = types.include? 'rdoc'
- generate_ri = types.include? 'ri'
-
- specs.each do |spec|
- new(spec, generate_rdoc, generate_ri).generate
- end
- end
-
- ##
- # Loads the RDoc generator
-
- def self.load_rdoc
- return if @rdoc_version
-
- require 'rdoc/rdoc'
-
- @rdoc_version = Gem::Version.new ::RDoc::VERSION
- end
-
- ##
- # Creates a new documentation generator for +spec+. RDoc and ri data
- # generation can be enabled or disabled through +generate_rdoc+ and
- # +generate_ri+ respectively.
- #
- # Only +generate_ri+ is enabled by default.
-
- def initialize spec, generate_rdoc = false, generate_ri = true
- @doc_dir = spec.doc_dir
- @force = false
- @rdoc = nil
- @spec = spec
-
- @generate_rdoc = generate_rdoc
- @generate_ri = generate_ri
-
- @rdoc_dir = spec.doc_dir 'rdoc'
- @ri_dir = spec.doc_dir 'ri'
- end
-
- ##
- # Removes legacy rdoc arguments from +args+
- #--
- # TODO move to RDoc::Options
-
- def delete_legacy_args args
- args.delete '--inline-source'
- args.delete '--promiscuous'
- args.delete '-p'
- args.delete '--one-file'
- end
-
- ##
- # Generates documentation using the named +generator+ ("darkfish" or "ri")
- # and following the given +options+.
- #
- # Documentation will be generated into +destination+
-
- def document generator, options, destination
- generator_name = generator
-
- options = options.dup
- options.exclude ||= [] # TODO maybe move to RDoc::Options#finish
- options.setup_generator generator
- options.op_dir = destination
- options.finish
-
- generator = options.generator.new @rdoc.store, options
-
- @rdoc.options = options
- @rdoc.generator = generator
-
- say "Installing #{generator_name} documentation for #{@spec.full_name}"
-
- FileUtils.mkdir_p options.op_dir
-
- Dir.chdir options.op_dir do
- begin
- @rdoc.class.current = @rdoc
- @rdoc.generator.generate
- ensure
- @rdoc.class.current = nil
- end
- end
- end
-
- ##
- # Generates RDoc and ri data
-
- def generate
- return if @spec.default_gem?
- return unless @generate_ri or @generate_rdoc
-
- setup
-
- options = nil
-
- args = @spec.rdoc_options
- args.concat @spec.require_paths
- args.concat @spec.extra_rdoc_files
-
- case config_args = Gem.configuration[:rdoc]
- when String then
- args = args.concat config_args.split
- when Array then
- args = args.concat config_args
- end
-
- delete_legacy_args args
-
- Dir.chdir @spec.full_gem_path do
- options = ::RDoc::Options.new
- options.default_title = "#{@spec.full_name} Documentation"
- options.parse args
- end
-
- options.quiet = !Gem.configuration.really_verbose
-
- @rdoc = new_rdoc
- @rdoc.options = options
-
- store = RDoc::Store.new
- store.encoding = options.encoding if options.respond_to? :encoding
- store.dry_run = options.dry_run
- store.main = options.main_page
- store.title = options.title
-
- @rdoc.store = store
-
- say "Parsing documentation for #{@spec.full_name}"
-
- Dir.chdir @spec.full_gem_path do
- @rdoc.parse_files options.files
- end
-
- document 'ri', options, @ri_dir if
- @generate_ri and (@force or not File.exist? @ri_dir)
-
- document 'darkfish', options, @rdoc_dir if
- @generate_rdoc and (@force or not File.exist? @rdoc_dir)
- end
-
- ##
- # #new_rdoc creates a new RDoc instance. This method is provided only to
- # make testing easier.
-
- def new_rdoc # :nodoc:
- ::RDoc::RDoc.new
- end
-
- ##
- # Is rdoc documentation installed?
-
- def rdoc_installed?
- File.exist? @rdoc_dir
- end
-
- ##
- # Removes generated RDoc and ri data
-
- def remove
- base_dir = @spec.base_dir
-
- raise Gem::FilePermissionError, base_dir unless File.writable? base_dir
-
- FileUtils.rm_rf @rdoc_dir
- FileUtils.rm_rf @ri_dir
- end
-
- ##
- # Is ri data installed?
-
- def ri_installed?
- File.exist? @ri_dir
- end
-
- ##
- # Prepares the spec for documentation generation
-
- def setup
- self.class.load_rdoc
-
- raise Gem::FilePermissionError, @doc_dir if
- File.exist?(@doc_dir) and not File.writable?(@doc_dir)
-
- FileUtils.mkdir_p @doc_dir unless File.exist? @doc_dir
- end
-
-end
-
diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb
deleted file mode 100644
index 1dca7596db..0000000000
--- a/lib/rdoc/servlet.rb
+++ /dev/null
@@ -1,416 +0,0 @@
-require 'rdoc'
-require 'time'
-require 'webrick'
-
-##
-# This is a WEBrick servlet that allows you to browse ri documentation.
-#
-# You can show documentation through either `ri --server` or, with RubyGems
-# 2.0 or newer, `gem server`. For ri, the server runs on port 8214 by
-# default. For RubyGems the server runs on port 8808 by default.
-#
-# You can use this servlet in your own project by mounting it on a WEBrick
-# server:
-#
-# require 'webrick'
-#
-# server = WEBrick::HTTPServer.new Port: 8000
-#
-# server.mount '/', RDoc::Servlet
-#
-# If you want to mount the servlet some other place than the root, provide the
-# base path when mounting:
-#
-# server.mount '/rdoc', RDoc::Servlet, '/rdoc'
-
-class RDoc::Servlet < WEBrick::HTTPServlet::AbstractServlet
-
- @server_stores = Hash.new { |hash, server| hash[server] = {} }
- @cache = Hash.new { |hash, store| hash[store] = {} }
-
- ##
- # Maps an asset type to its path on the filesystem
-
- attr_reader :asset_dirs
-
- ##
- # An RDoc::Options instance used for rendering options
-
- attr_reader :options
-
- ##
- # Creates an instance of this servlet that shares cached data between
- # requests.
-
- def self.get_instance server, *options # :nodoc:
- stores = @server_stores[server]
-
- new server, stores, @cache, *options
- end
-
- ##
- # Creates a new WEBrick servlet.
- #
- # Use +mount_path+ when mounting the servlet somewhere other than /.
- #
- # +server+ is provided automatically by WEBrick when mounting. +stores+ and
- # +cache+ are provided automatically by the servlet.
-
- def initialize server, stores, cache, mount_path = nil
- super server
-
- @cache = cache
- @mount_path = mount_path
- @stores = stores
-
- @options = RDoc::Options.new
- @options.op_dir = '.'
-
- darkfish_dir = nil
-
- # HACK dup
- $LOAD_PATH.each do |path|
- darkfish_dir = File.join path, 'rdoc/generator/template/darkfish/'
- next unless File.directory? darkfish_dir
- @options.template_dir = darkfish_dir
- break
- end
-
- @asset_dirs = {
- :darkfish => darkfish_dir,
- :json_index =>
- File.expand_path('../generator/template/json_index/', __FILE__),
- }
- end
-
- ##
- # Serves the asset at the path in +req+ for +generator_name+ via +res+.
-
- def asset generator_name, req, res
- asset_dir = @asset_dirs[generator_name]
-
- asset_path = File.join asset_dir, req.path
-
- if_modified_since req, res, asset_path
-
- res.body = File.read asset_path
-
- res.content_type = case req.path
- when /css$/ then 'text/css'
- when /js$/ then 'application/javascript'
- else 'application/octet-stream'
- end
- end
-
- ##
- # GET request entry point. Fills in +res+ for the path, etc. in +req+.
-
- def do_GET req, res
- req.path.sub!(/^#{Regexp.escape @mount_path}/o, '') if @mount_path
-
- case req.path
- when '/' then
- root req, res
- when '/rdoc.css', '/js/darkfish.js', '/js/jquery.js', '/js/search.js',
- %r%^/images/% then
- asset :darkfish, req, res
- when '/js/navigation.js', '/js/searcher.js' then
- asset :json_index, req, res
- when '/js/search_index.js' then
- root_search req, res
- else
- show_documentation req, res
- end
- rescue WEBrick::HTTPStatus::Status
- raise
- rescue => e
- error e, req, res
- end
-
- ##
- # Fills in +res+ with the class, module or page for +req+ from +store+.
- #
- # +path+ is relative to the mount_path and is used to determine the class,
- # module or page name (/RDoc/Servlet.html becomes RDoc::Servlet).
- # +generator+ is used to create the page.
-
- def documentation_page store, generator, path, req, res
- name = path.sub(/.html$/, '').gsub '/', '::'
-
- if klass = store.find_class_or_module(name) then
- res.body = generator.generate_class klass
- elsif page = store.find_text_page(name.sub(/_([^_]*)$/, '.\1')) then
- res.body = generator.generate_page page
- else
- not_found generator, req, res
- end
- end
-
- ##
- # Creates the JSON search index on +res+ for the given +store+. +generator+
- # must respond to \#json_index to build. +req+ is ignored.
-
- def documentation_search store, generator, req, res
- json_index = @cache[store].fetch :json_index do
- @cache[store][:json_index] =
- JSON.dump generator.json_index.build_index
- end
-
- res.content_type = 'application/javascript'
- res.body = "var search_data = #{json_index}"
- end
-
- ##
- # Returns the RDoc::Store and path relative to +mount_path+ for
- # documentation at +path+.
-
- def documentation_source path
- _, source_name, path = path.split '/', 3
-
- store = @stores[source_name]
- return store, path if store
-
- store = store_for source_name
-
- store.load_all
-
- @stores[source_name] = store
-
- return store, path
- end
-
- ##
- # Generates an error page for the +exception+ while handling +req+ on +res+.
-
- def error exception, req, res
- backtrace = exception.backtrace.join "\n"
-
- res.content_type = 'text/html'
- res.status = 500
- res.body = <<-BODY
-<!DOCTYPE html>
-<html>
-<head>
-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-
-<title>Error - #{ERB::Util.html_escape exception.class}</title>
-
-<link type="text/css" media="screen" href="#{@mount_path}/rdoc.css" rel="stylesheet">
-</head>
-<body>
-<h1>Error</h1>
-
-<p>While processing <code>#{ERB::Util.html_escape req.request_uri}</code> the
-RDoc (#{ERB::Util.html_escape RDoc::VERSION}) server has encountered a
-<code>#{ERB::Util.html_escape exception.class}</code>
-exception:
-
-<pre>#{ERB::Util.html_escape exception.message}</pre>
-
-<p>Please report this to the
-<a href="https://github.com/rdoc/rdoc/issues">RDoc issues tracker</a>. Please
-include the RDoc version, the URI above and exception class, message and
-backtrace. If you're viewing a gem's documentation, include the gem name and
-version. If you're viewing Ruby's documentation, include the version of ruby.
-
-<p>Backtrace:
-
-<pre>#{ERB::Util.html_escape backtrace}</pre>
-
-</body>
-</html>
- BODY
- end
-
- ##
- # Instantiates a Darkfish generator for +store+
-
- def generator_for store
- generator = RDoc::Generator::Darkfish.new store, @options
- generator.file_output = false
- generator.asset_rel_path = '..'
-
- rdoc = RDoc::RDoc.new
- rdoc.store = store
- rdoc.generator = generator
- rdoc.options = @options
-
- @options.main_page = store.main
- @options.title = store.title
-
- generator
- end
-
- ##
- # Handles the If-Modified-Since HTTP header on +req+ for +path+. If the
- # file has not been modified a Not Modified response is returned. If the
- # file has been modified a Last-Modified header is added to +res+.
-
- def if_modified_since req, res, path = nil
- last_modified = File.stat(path).mtime if path
-
- res['last-modified'] = last_modified.httpdate
-
- return unless ims = req['if-modified-since']
-
- ims = Time.parse ims
-
- unless ims < last_modified then
- res.body = ''
- raise WEBrick::HTTPStatus::NotModified
- end
- end
-
- ##
- # Returns an Array of installed documentation.
- #
- # Each entry contains the documentation name (gem name, 'Ruby
- # Documentation', etc.), the path relative to the mount point, whether the
- # documentation exists, the type of documentation (See RDoc::RI::Paths#each)
- # and the filesystem to the RDoc::Store for the documentation.
-
- def installed_docs
- ri_paths.map do |path, type|
- store = RDoc::Store.new path, type
- exists = File.exist? store.cache_path
-
- case type
- when :gem then
- gem_path = path[%r%/([^/]*)/ri$%, 1]
- [gem_path, "#{gem_path}/", exists, type, path]
- when :system then
- ['Ruby Documentation', 'ruby/', exists, type, path]
- when :site then
- ['Site Documentation', 'site/', exists, type, path]
- when :home then
- ['Home Documentation', 'home/', exists, type, path]
- end
- end
- end
-
- ##
- # Returns a 404 page built by +generator+ for +req+ on +res+.
-
- def not_found generator, req, res
- res.body = generator.generate_servlet_not_found req.path
- res.status = 404
- end
-
- ##
- # Enumerates the ri paths. See RDoc::RI::Paths#each
-
- def ri_paths &block
- RDoc::RI::Paths.each true, true, true, :all, &block
- end
-
- ##
- # Generates the root page on +res+. +req+ is ignored.
-
- def root req, res
- generator = RDoc::Generator::Darkfish.new nil, @options
-
- res.body = generator.generate_servlet_root installed_docs
-
- res.content_type = 'text/html'
- end
-
- ##
- # Generates a search index for the root page on +res+. +req+ is ignored.
-
- def root_search req, res
- search_index = []
- info = []
-
- installed_docs.map do |name, href, exists, type, path|
- next unless exists
-
- search_index << name
-
- case type
- when :gem
- gemspec = path.gsub(%r%/doc/([^/]*?)/ri$%,
- '/specifications/\1.gemspec')
-
- spec = Gem::Specification.load gemspec
-
- path = spec.full_name
- comment = spec.summary
- when :system then
- path = 'ruby'
- comment = 'Documentation for the Ruby standard library'
- when :site then
- path = 'site'
- comment = 'Documentation for non-gem libraries'
- when :home then
- path = 'home'
- comment = 'Documentation from your home directory'
- end
-
- info << [name, '', path, '', comment]
- end
-
- index = {
- :index => {
- :searchIndex => search_index,
- :longSearchIndex => search_index,
- :info => info,
- }
- }
-
- res.body = "var search_data = #{JSON.dump index};"
- res.content_type = 'application/javascript'
- end
-
- ##
- # Displays documentation for +req+ on +res+, whether that be HTML or some
- # asset.
-
- def show_documentation req, res
- store, path = documentation_source req.path
-
- if_modified_since req, res, store.cache_path
-
- generator = generator_for store
-
- case path
- when nil, '', 'index.html' then
- res.body = generator.generate_index
- when 'table_of_contents.html' then
- res.body = generator.generate_table_of_contents
- when 'js/search_index.js' then
- documentation_search store, generator, req, res
- else
- documentation_page store, generator, path, req, res
- end
- ensure
- res.content_type ||= 'text/html'
- end
-
- ##
- # Returns an RDoc::Store for the given +source_name+ ('ruby' or a gem name).
-
- def store_for source_name
- case source_name
- when 'home' then
- RDoc::Store.new RDoc::RI::Paths.home_dir, :home
- when 'ruby' then
- RDoc::Store.new RDoc::RI::Paths.system_dir, :system
- when 'site' then
- RDoc::Store.new RDoc::RI::Paths.site_dir, :site
- else
- ri_dir, type = ri_paths.find do |dir, dir_type|
- next unless dir_type == :gem
-
- source_name == dir[%r%/([^/]*)/ri$%, 1]
- end
-
- raise RDoc::Error,
- "could not find ri documentation for #{source_name}" unless
- ri_dir
-
- RDoc::Store.new ri_dir, type
- end
- end
-
-end
-
diff --git a/lib/rdoc/single_class.rb b/lib/rdoc/single_class.rb
index 9e77a65c73..1226d56f84 100644
--- a/lib/rdoc/single_class.rb
+++ b/lib/rdoc/single_class.rb
@@ -1,20 +1,12 @@
+require 'rdoc/class_module'
+
##
# A singleton class
class RDoc::SingleClass < RDoc::ClassModule
- ##
- # Adds the superclass to the included modules.
-
def ancestors
- superclass ? super + [superclass] : super
- end
-
- ##
- # The definition of this singleton class, <tt>class << MyClassName</tt>
-
- def definition
- "class << #{full_name}"
+ includes + [superclass]
end
end
diff --git a/lib/rdoc/stats.rb b/lib/rdoc/stats.rb
index 4fa519d243..82e0afdf5d 100644
--- a/lib/rdoc/stats.rb
+++ b/lib/rdoc/stats.rb
@@ -1,444 +1,247 @@
+require 'rdoc'
+
##
-# RDoc statistics collector which prints a summary and report of a project's
-# documentation totals.
+# RDoc stats collector
class RDoc::Stats
- ##
- # Output level for the coverage report
+ attr_reader :nodoc_constants
+ attr_reader :nodoc_methods
- attr_reader :coverage_level
+ attr_reader :num_constants
+ attr_reader :num_files
+ attr_reader :num_methods
- ##
- # Count of files parsed during parsing
+ attr_reader :total_files
- attr_reader :files_so_far
+ def initialize(total_files, verbosity = 1)
+ @nodoc_constants = 0
+ @nodoc_methods = 0
- ##
- # Total number of files found
+ @num_constants = 0
+ @num_files = 0
+ @num_methods = 0
- attr_reader :num_files
+ @total_files = total_files
- ##
- # Creates a new Stats that will have +num_files+. +verbosity+ defaults to 1
- # which will create an RDoc::Stats::Normal outputter.
-
- def initialize store, num_files, verbosity = 1
- @num_files = num_files
- @store = store
-
- @coverage_level = 0
- @doc_items = nil
- @files_so_far = 0
- @fully_documented = false
- @num_params = 0
- @percent_doc = nil
- @start = Time.now
- @undoc_params = 0
+ @start = Time.now
@display = case verbosity
- when 0 then Quiet.new num_files
- when 1 then Normal.new num_files
- else Verbose.new num_files
+ when 0 then Quiet.new total_files
+ when 1 then Normal.new total_files
+ else Verbose.new total_files
end
end
- ##
- # Records the parsing of an alias +as+.
-
- def add_alias as
- @display.print_alias as
+ def begin_adding
+ @display.begin_adding
end
- ##
- # Records the parsing of an attribute +attribute+
-
- def add_attribute attribute
- @display.print_attribute attribute
+ def add_alias(as)
+ @display.print_alias as
+ @num_methods += 1
+ @nodoc_methods += 1 if as.document_self and as.comment.empty?
end
- ##
- # Records the parsing of a class +klass+
-
- def add_class klass
+ def add_class(klass)
@display.print_class klass
end
- ##
- # Records the parsing of +constant+
-
- def add_constant constant
+ def add_constant(constant)
@display.print_constant constant
+ @num_constants += 1
+ @nodoc_constants += 1 if constant.document_self and constant.comment.empty?
end
- ##
- # Records the parsing of +file+
-
def add_file(file)
- @files_so_far += 1
- @display.print_file @files_so_far, file
+ @display.print_file @num_files, file
+ @num_files += 1
end
- ##
- # Records the parsing of +method+
-
def add_method(method)
@display.print_method method
+ @num_methods += 1
+ @nodoc_methods += 1 if method.document_self and method.comment.empty?
end
- ##
- # Records the parsing of a module +mod+
-
def add_module(mod)
@display.print_module mod
end
- ##
- # Call this to mark the beginning of parsing for display purposes
-
- def begin_adding
- @display.begin_adding
- end
-
- ##
- # Calculates documentation totals and percentages for classes, modules,
- # constants, attributes and methods.
-
- def calculate
- return if @doc_items
-
- ucm = @store.unique_classes_and_modules
-
- classes = @store.unique_classes.reject { |cm| cm.full_name == 'Object' }
-
- constants = []
- ucm.each { |cm| constants.concat cm.constants }
-
- methods = []
- ucm.each { |cm| methods.concat cm.method_list }
-
- attributes = []
- ucm.each { |cm| attributes.concat cm.attributes }
-
- @num_attributes, @undoc_attributes = doc_stats attributes
- @num_classes, @undoc_classes = doc_stats classes
- @num_constants, @undoc_constants = doc_stats constants
- @num_methods, @undoc_methods = doc_stats methods
- @num_modules, @undoc_modules = doc_stats @store.unique_modules
-
- @num_items =
- @num_attributes +
- @num_classes +
- @num_constants +
- @num_methods +
- @num_modules +
- @num_params
-
- @undoc_items =
- @undoc_attributes +
- @undoc_classes +
- @undoc_constants +
- @undoc_methods +
- @undoc_modules +
- @undoc_params
-
- @doc_items = @num_items - @undoc_items
- end
-
- ##
- # Sets coverage report level. Accepted values are:
- #
- # false or nil:: No report
- # 0:: Classes, modules, constants, attributes, methods
- # 1:: Level 0 + method parameters
-
- def coverage_level= level
- level = -1 unless level
-
- @coverage_level = level
- end
-
- ##
- # Returns the length and number of undocumented items in +collection+.
-
- def doc_stats collection
- visible = collection.select { |item| item.display? }
- [visible.length, visible.count { |item| not item.documented? }]
- end
-
- ##
- # Call this to mark the end of parsing for display purposes
-
def done_adding
@display.done_adding
end
- ##
- # The documentation status of this project. +true+ when 100%, +false+ when
- # less than 100% and +nil+ when unknown.
- #
- # Set by calling #calculate
+ def print
+ classes = RDoc::TopLevel.classes
+ num_classes = classes.length
+ nodoc_classes = classes.select do |klass|
+ klass.document_self and klass.comment.empty?
+ end.length
- def fully_documented?
- @fully_documented
- end
+ modules = RDoc::TopLevel.modules
+ num_modules = modules.length
+ nodoc_modules = modules.select do |mod|
+ mod.document_self and mod.comment.empty?
+ end.length
- ##
- # A report that says you did a great job!
+ items = num_classes + @num_constants + num_modules + @num_methods
+ doc_items = items -
+ nodoc_classes - @nodoc_constants - nodoc_modules - @nodoc_methods
- def great_job
- report = []
- report << '100% documentation!'
- report << nil
- report << 'Great Job!'
+ percent_doc = doc_items.to_f / items * 100
- report.join "\n"
+ puts "Files: %5d" % @num_files
+ puts "Classes: %5d (%5d undocumented)" % [num_classes, nodoc_classes]
+ puts "Constants: %5d (%5d undocumented)" %
+ [@num_constants, @nodoc_constants]
+ puts "Modules: %5d (%5d undocumented)" % [num_modules, nodoc_modules]
+ puts "Methods: %5d (%5d undocumented)" % [@num_methods, @nodoc_methods]
+ puts "%6.2f%% documented" % percent_doc
+ puts
+ puts "Elapsed: %0.1fs" % (Time.now - @start)
end
##
- # Calculates the percentage of items documented.
+ # Stats printer that prints nothing
- def percent_doc
- return @percent_doc if @percent_doc
+ class Quiet
- @fully_documented = (@num_items - @doc_items) == 0
+ def initialize total_files
+ @total_files = total_files
+ end
- @percent_doc = @doc_items.to_f / @num_items * 100 if @num_items.nonzero?
- @percent_doc ||= 0
+ ##
+ # Prints a message at the beginning of parsing
- @percent_doc
- end
+ def begin_adding(*) end
- ##
- # Returns a report on which items are not documented
+ ##
+ # Prints when an alias is added
- def report
- if @coverage_level > 0 then
- extend RDoc::Text
- end
+ def print_alias(*) end
- report = []
+ ##
+ # Prints when a class is added
- if @coverage_level.zero? then
- calculate
+ def print_class(*) end
- return great_job if @num_items == @doc_items
- end
+ ##
+ # Prints when a constant is added
- ucm = @store.unique_classes_and_modules
+ def print_constant(*) end
- ucm.sort.each do |cm|
- report << report_class_module(cm) {
- [
- report_constants(cm),
- report_attributes(cm),
- report_methods(cm),
- ].compact
- }
- end
+ ##
+ # Prints when a file is added
- if @coverage_level > 0 then
- calculate
+ def print_file(*) end
- return great_job if @num_items == @doc_items
- end
+ ##
+ # Prints when a method is added
- report.unshift nil
- report.unshift 'The following items are not documented:'
+ def print_method(*) end
- report.join "\n"
- end
+ ##
+ # Prints when a module is added
- ##
- # Returns a report on undocumented attributes in ClassModule +cm+
+ def print_module(*) end
- def report_attributes cm
- return if cm.attributes.empty?
+ ##
+ # Prints when RDoc is done
- report = []
+ def done_adding(*) end
- cm.each_attribute do |attr|
- next if attr.documented?
- line = attr.line ? ":#{attr.line}" : nil
- report << " #{attr.definition} :#{attr.name} # in file #{attr.file.full_name}#{line}"
- end
-
- report
end
##
- # Returns a report on undocumented items in ClassModule +cm+
+ # Stats printer that prints just the files being documented with a progress
+ # bar
- def report_class_module cm
- return if cm.fully_documented? and @coverage_level.zero?
- return unless cm.display?
+ class Normal < Quiet
- report = []
+ def begin_adding # :nodoc:
+ puts "Parsing sources..."
+ end
- if cm.in_files.empty? then
- report << "# #{cm.definition} is referenced but empty."
- report << "#"
- report << "# It probably came from another project. I'm sorry I'm holding it against you."
- report << nil
+ ##
+ # Prints a file with a progress bar
+
+ def print_file(files_so_far, filename)
+ progress_bar = sprintf("%3d%% [%2d/%2d] ",
+ 100 * (files_so_far + 1) / @total_files,
+ files_so_far + 1,
+ @total_files)
+
+ if $stdout.tty?
+ # Print a progress bar, but make sure it fits on a single line. Filename
+ # will be truncated if necessary.
+ terminal_width = (ENV['COLUMNS'] || 80).to_i
+ max_filename_size = terminal_width - progress_bar.size
+ if filename.size > max_filename_size
+ # Turn "some_long_filename.rb" to "...ong_filename.rb"
+ filename = filename[(filename.size - max_filename_size) .. -1]
+ filename[0..2] = "..."
+ end
- return report
- elsif cm.documented? then
- documented = true
- report << "#{cm.definition} # is documented"
- else
- report << '# in files:'
+ # Pad the line with whitespaces so that leftover output from the
+ # previous line doesn't show up.
+ line = "#{progress_bar}#{filename}"
+ padding = terminal_width - line.size
+ line << (" " * padding) if padding > 0
- cm.in_files.each do |file|
- report << "# #{file.full_name}"
+ $stdout.print("#{line}\r")
+ else
+ $stdout.puts "#{progress_bar} #{filename}"
end
-
- report << nil
-
- report << "#{cm.definition}"
+ $stdout.flush
end
- body = yield.flatten # HACK remove #flatten
-
- return if body.empty? and documented
-
- report << nil << body unless body.empty?
-
- report << 'end'
- report << nil
-
- report
- end
-
- ##
- # Returns a report on undocumented constants in ClassModule +cm+
-
- def report_constants cm
- return if cm.constants.empty?
-
- report = []
-
- cm.each_constant do |constant|
- # TODO constant aliases are listed in the summary but not reported
- # figure out what to do here
- next if constant.documented? || constant.is_alias_for
-
- line = constant.line ? ":#{constant.line}" : line
- report << " # in file #{constant.file.full_name}#{line}"
- report << " #{constant.name} = nil"
+ def done_adding # :nodoc:
+ puts
end
- report
end
##
- # Returns a report on undocumented methods in ClassModule +cm+
-
- def report_methods cm
- return if cm.method_list.empty?
-
- report = []
-
- cm.each_method do |method|
- next if method.documented? and @coverage_level.zero?
-
- if @coverage_level > 0 then
- params, undoc = undoc_params method
+ # Stats printer that prints everything documented, including the documented
+ # status
- @num_params += params
+ class Verbose < Normal
- unless undoc.empty? then
- @undoc_params += undoc.length
+ ##
+ # Returns a marker for RDoc::CodeObject +co+ being undocumented
- undoc = undoc.map do |param| "+#{param}+" end
- param_report = " # #{undoc.join ', '} is not documented"
- end
- end
-
- next if method.documented? and not param_report
-
- line = method.line ? ":#{method.line}" : nil
- scope = method.singleton ? 'self.' : nil
-
- report << " # in file #{method.file.full_name}#{line}"
- report << param_report if param_report
- report << " def #{scope}#{method.name}#{method.params}; end"
- report << nil
+ def nodoc co
+ " (undocumented)" unless co.documented?
end
- report
- end
-
- ##
- # Returns a summary of the collected statistics.
-
- def summary
- calculate
-
- num_width = [@num_files, @num_items].max.to_s.length
- undoc_width = [
- @undoc_attributes,
- @undoc_classes,
- @undoc_constants,
- @undoc_items,
- @undoc_methods,
- @undoc_modules,
- @undoc_params,
- ].max.to_s.length
-
- report = []
- report << 'Files: %*d' % [num_width, @num_files]
-
- report << nil
-
- report << 'Classes: %*d (%*d undocumented)' % [
- num_width, @num_classes, undoc_width, @undoc_classes]
- report << 'Modules: %*d (%*d undocumented)' % [
- num_width, @num_modules, undoc_width, @undoc_modules]
- report << 'Constants: %*d (%*d undocumented)' % [
- num_width, @num_constants, undoc_width, @undoc_constants]
- report << 'Attributes: %*d (%*d undocumented)' % [
- num_width, @num_attributes, undoc_width, @undoc_attributes]
- report << 'Methods: %*d (%*d undocumented)' % [
- num_width, @num_methods, undoc_width, @undoc_methods]
- report << 'Parameters: %*d (%*d undocumented)' % [
- num_width, @num_params, undoc_width, @undoc_params] if
- @coverage_level > 0
-
- report << nil
-
- report << 'Total: %*d (%*d undocumented)' % [
- num_width, @num_items, undoc_width, @undoc_items]
-
- report << '%6.2f%% documented' % percent_doc
- report << nil
- report << 'Elapsed: %0.1fs' % (Time.now - @start)
-
- report.join "\n"
- end
-
- ##
- # Determines which parameters in +method+ were not documented. Returns a
- # total parameter count and an Array of undocumented methods.
-
- def undoc_params method
- @formatter ||= RDoc::Markup::ToTtOnly.new
+ def print_alias as # :nodoc:
+ puts "\t\talias #{as.new_name} #{as.old_name}#{nodoc as}"
+ end
- params = method.param_list
+ def print_class(klass) # :nodoc:
+ puts "\tclass #{klass.full_name}#{nodoc klass}"
+ end
- return 0, [] if params.empty?
+ def print_constant(constant) # :nodoc:
+ puts "\t\t#{constant.name}#{nodoc constant}"
+ end
- document = parse method.comment
+ def print_file(files_so_far, file) # :nodoc:
+ super
+ puts
+ end
- tts = document.accept @formatter
+ def print_method(method) # :nodoc:
+ puts "\t\t#{method.singleton ? '::' : '#'}#{method.name}#{nodoc method}"
+ end
- undoc = params - tts
+ def print_module(mod) # :nodoc:
+ puts "\tmodule #{mod.full_name}#{nodoc mod}"
+ end
- [params.length, undoc]
end
- autoload :Quiet, 'rdoc/stats/quiet'
- autoload :Normal, 'rdoc/stats/normal'
- autoload :Verbose, 'rdoc/stats/verbose'
-
end
+
diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb
deleted file mode 100644
index c971973bf1..0000000000
--- a/lib/rdoc/stats/normal.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-# Stats printer that prints just the files being documented with a progress
-# bar
-
-class RDoc::Stats::Normal < RDoc::Stats::Quiet
-
- def begin_adding # :nodoc:
- puts "Parsing sources..." if $stdout.tty?
- end
-
- ##
- # Prints a file with a progress bar
-
- def print_file files_so_far, filename
- return unless $stdout.tty?
-
- progress_bar = sprintf("%3d%% [%2d/%2d] ",
- 100 * files_so_far / @num_files,
- files_so_far,
- @num_files)
-
- # Print a progress bar, but make sure it fits on a single line. Filename
- # will be truncated if necessary.
- terminal_width = (ENV['COLUMNS'] || 80).to_i
- max_filename_size = terminal_width - progress_bar.size
-
- if filename.size > max_filename_size then
- # Turn "some_long_filename.rb" to "...ong_filename.rb"
- filename = filename[(filename.size - max_filename_size) .. -1]
- filename[0..2] = "..."
- end
-
- # Pad the line with whitespaces so that leftover output from the
- # previous line doesn't show up.
- line = "#{progress_bar}#{filename}"
- padding = terminal_width - line.size
- line << (" " * padding) if padding > 0
-
- $stdout.print("#{line}\r")
- $stdout.flush
- end
-
- def done_adding # :nodoc:
- puts if $stdout.tty?
- end
-
-end
-
diff --git a/lib/rdoc/stats/quiet.rb b/lib/rdoc/stats/quiet.rb
deleted file mode 100644
index eed27b2a88..0000000000
--- a/lib/rdoc/stats/quiet.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-##
-# Stats printer that prints nothing
-
-class RDoc::Stats::Quiet
-
- ##
- # Creates a new Quiet that will print nothing
-
- def initialize num_files
- @num_files = num_files
- end
-
- ##
- # Prints a message at the beginning of parsing
-
- def begin_adding(*) end
-
- ##
- # Prints when an alias is added
-
- def print_alias(*) end
-
- ##
- # Prints when an attribute is added
-
- def print_attribute(*) end
-
- ##
- # Prints when a class is added
-
- def print_class(*) end
-
- ##
- # Prints when a constant is added
-
- def print_constant(*) end
-
- ##
- # Prints when a file is added
-
- def print_file(*) end
-
- ##
- # Prints when a method is added
-
- def print_method(*) end
-
- ##
- # Prints when a module is added
-
- def print_module(*) end
-
- ##
- # Prints when RDoc is done
-
- def done_adding(*) end
-
-end
-
diff --git a/lib/rdoc/stats/verbose.rb b/lib/rdoc/stats/verbose.rb
deleted file mode 100644
index 430809ae07..0000000000
--- a/lib/rdoc/stats/verbose.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-##
-# Stats printer that prints everything documented, including the documented
-# status
-
-class RDoc::Stats::Verbose < RDoc::Stats::Normal
-
- ##
- # Returns a marker for RDoc::CodeObject +co+ being undocumented
-
- def nodoc co
- " (undocumented)" unless co.documented?
- end
-
- def print_alias as # :nodoc:
- puts " alias #{as.new_name} #{as.old_name}#{nodoc as}"
- end
-
- def print_attribute attribute # :nodoc:
- puts " #{attribute.definition} #{attribute.name}#{nodoc attribute}"
- end
-
- def print_class(klass) # :nodoc:
- puts " class #{klass.full_name}#{nodoc klass}"
- end
-
- def print_constant(constant) # :nodoc:
- puts " #{constant.name}#{nodoc constant}"
- end
-
- def print_file(files_so_far, file) # :nodoc:
- super
- puts
- end
-
- def print_method(method) # :nodoc:
- puts " #{method.singleton ? '::' : '#'}#{method.name}#{nodoc method}"
- end
-
- def print_module(mod) # :nodoc:
- puts " module #{mod.full_name}#{nodoc mod}"
- end
-
-end
-
-
diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
deleted file mode 100644
index 6cbbfb5b69..0000000000
--- a/lib/rdoc/store.rb
+++ /dev/null
@@ -1,977 +0,0 @@
-require 'fileutils'
-
-##
-# A set of rdoc data for a single project (gem, path, etc.).
-#
-# The store manages reading and writing ri data for a project and maintains a
-# cache of methods, classes and ancestors in the store.
-#
-# The store maintains a #cache of its contents for faster lookup. After
-# adding items to the store it must be flushed using #save_cache. The cache
-# contains the following structures:
-#
-# @cache = {
-# :ancestors => {}, # class name => ancestor names
-# :attributes => {}, # class name => attributes
-# :class_methods => {}, # class name => class methods
-# :instance_methods => {}, # class name => instance methods
-# :modules => [], # classes and modules in this store
-# :pages => [], # page names
-# }
-#--
-# TODO need to prune classes
-
-class RDoc::Store
-
- ##
- # Errors raised from loading or saving the store
-
- class Error < RDoc::Error
- end
-
- ##
- # Raised when a stored file for a class, module, page or method is missing.
-
- class MissingFileError < Error
-
- ##
- # The store the file should exist in
-
- attr_reader :store
-
- ##
- # The file the #name should be saved as
-
- attr_reader :file
-
- ##
- # The name of the object the #file would be loaded from
-
- attr_reader :name
-
- ##
- # Creates a new MissingFileError for the missing +file+ for the given
- # +name+ that should have been in the +store+.
-
- def initialize store, file, name
- @store = store
- @file = file
- @name = name
- end
-
- def message # :nodoc:
- "store at #{@store.path} missing file #{@file} for #{@name}"
- end
-
- end
-
- ##
- # Stores the name of the C variable a class belongs to. This helps wire up
- # classes defined from C across files.
-
- attr_reader :c_enclosure_classes # :nodoc:
-
- attr_reader :c_enclosure_names # :nodoc:
-
- ##
- # Maps C variables to class or module names for each parsed C file.
-
- attr_reader :c_class_variables
-
- ##
- # Maps C variables to singleton class names for each parsed C file.
-
- attr_reader :c_singleton_class_variables
-
- ##
- # If true this Store will not write any files
-
- attr_accessor :dry_run
-
- ##
- # Path this store reads or writes
-
- attr_accessor :path
-
- ##
- # The RDoc::RDoc driver for this parse tree. This allows classes consulting
- # the documentation tree to access user-set options, for example.
-
- attr_accessor :rdoc
-
- ##
- # Type of ri datastore this was loaded from. See RDoc::RI::Driver,
- # RDoc::RI::Paths.
-
- attr_accessor :type
-
- ##
- # The contents of the Store
-
- attr_reader :cache
-
- ##
- # The encoding of the contents in the Store
-
- attr_accessor :encoding
-
- ##
- # Creates a new Store of +type+ that will load or save to +path+
-
- def initialize path = nil, type = nil
- @dry_run = false
- @encoding = nil
- @path = path
- @rdoc = nil
- @type = type
-
- @cache = {
- :ancestors => {},
- :attributes => {},
- :class_methods => {},
- :c_class_variables => {},
- :c_singleton_class_variables => {},
- :encoding => @encoding,
- :instance_methods => {},
- :main => nil,
- :modules => [],
- :pages => [],
- :title => nil,
- }
-
- @classes_hash = {}
- @modules_hash = {}
- @files_hash = {}
-
- @c_enclosure_classes = {}
- @c_enclosure_names = {}
-
- @c_class_variables = {}
- @c_singleton_class_variables = {}
-
- @unique_classes = nil
- @unique_modules = nil
- end
-
- ##
- # Adds +module+ as an enclosure (namespace) for the given +variable+ for C
- # files.
-
- def add_c_enclosure variable, namespace
- @c_enclosure_classes[variable] = namespace
- end
-
- ##
- # Adds C variables from an RDoc::Parser::C
-
- def add_c_variables c_parser
- filename = c_parser.top_level.relative_name
-
- @c_class_variables[filename] = make_variable_map c_parser.classes
-
- @c_singleton_class_variables[filename] = c_parser.singleton_classes
- end
-
- ##
- # Adds the file with +name+ as an RDoc::TopLevel to the store. Returns the
- # created RDoc::TopLevel.
-
- def add_file absolute_name, relative_name = absolute_name
- unless top_level = @files_hash[relative_name] then
- top_level = RDoc::TopLevel.new absolute_name, relative_name
- top_level.store = self
- @files_hash[relative_name] = top_level
- end
-
- top_level
- end
-
- ##
- # Returns all classes discovered by RDoc
-
- def all_classes
- @classes_hash.values
- end
-
- ##
- # Returns all classes and modules discovered by RDoc
-
- def all_classes_and_modules
- @classes_hash.values + @modules_hash.values
- end
-
- ##
- # All TopLevels known to RDoc
-
- def all_files
- @files_hash.values
- end
-
- ##
- # Returns all modules discovered by RDoc
-
- def all_modules
- modules_hash.values
- end
-
- ##
- # Ancestors cache accessor. Maps a klass name to an Array of its ancestors
- # in this store. If Foo in this store inherits from Object, Kernel won't be
- # listed (it will be included from ruby's ri store).
-
- def ancestors
- @cache[:ancestors]
- end
-
- ##
- # Attributes cache accessor. Maps a class to an Array of its attributes.
-
- def attributes
- @cache[:attributes]
- end
-
- ##
- # Path to the cache file
-
- def cache_path
- File.join @path, 'cache.ri'
- end
-
- ##
- # Path to the ri data for +klass_name+
-
- def class_file klass_name
- name = klass_name.split('::').last
- File.join class_path(klass_name), "cdesc-#{name}.ri"
- end
-
- ##
- # Class methods cache accessor. Maps a class to an Array of its class
- # methods (not full name).
-
- def class_methods
- @cache[:class_methods]
- end
-
- ##
- # Path where data for +klass_name+ will be stored (methods or class data)
-
- def class_path klass_name
- File.join @path, *klass_name.split('::')
- end
-
- ##
- # Hash of all classes known to RDoc
-
- def classes_hash
- @classes_hash
- end
-
- ##
- # Removes empty items and ensures item in each collection are unique and
- # sorted
-
- def clean_cache_collection collection # :nodoc:
- collection.each do |name, item|
- if item.empty? then
- collection.delete name
- else
- # HACK mongrel-1.1.5 documents its files twice
- item.uniq!
- item.sort!
- end
- end
- end
-
- ##
- # Prepares the RDoc code object tree for use by a generator.
- #
- # It finds unique classes/modules defined, and replaces classes/modules that
- # are aliases for another one by a copy with RDoc::ClassModule#is_alias_for
- # set.
- #
- # It updates the RDoc::ClassModule#constant_aliases attribute of "real"
- # classes or modules.
- #
- # It also completely removes the classes and modules that should be removed
- # from the documentation and the methods that have a visibility below
- # +min_visibility+, which is the <tt>--visibility</tt> option.
- #
- # See also RDoc::Context#remove_from_documentation?
-
- def complete min_visibility
- fix_basic_object_inheritance
-
- # cache included modules before they are removed from the documentation
- all_classes_and_modules.each { |cm| cm.ancestors }
-
- remove_nodoc @classes_hash
- remove_nodoc @modules_hash
-
- @unique_classes = find_unique @classes_hash
- @unique_modules = find_unique @modules_hash
-
- unique_classes_and_modules.each do |cm|
- cm.complete min_visibility
- end
-
- @files_hash.each_key do |file_name|
- tl = @files_hash[file_name]
-
- unless tl.text? then
- tl.modules_hash.clear
- tl.classes_hash.clear
-
- tl.classes_or_modules.each do |cm|
- name = cm.full_name
- if cm.type == 'class' then
- tl.classes_hash[name] = cm if @classes_hash[name]
- else
- tl.modules_hash[name] = cm if @modules_hash[name]
- end
- end
- end
- end
- end
-
- ##
- # Hash of all files known to RDoc
-
- def files_hash
- @files_hash
- end
-
- ##
- # Finds the enclosure (namespace) for the given C +variable+.
-
- def find_c_enclosure variable
- @c_enclosure_classes.fetch variable do
- break unless name = @c_enclosure_names[variable]
-
- mod = find_class_or_module name
-
- unless mod then
- loaded_mod = load_class_data name
-
- file = loaded_mod.in_files.first
-
- return unless file # legacy data source
-
- file.store = self
-
- mod = file.add_module RDoc::NormalModule, name
- end
-
- @c_enclosure_classes[variable] = mod
- end
- end
-
- ##
- # Finds the class with +name+ in all discovered classes
-
- def find_class_named name
- @classes_hash[name]
- end
-
- ##
- # Finds the class with +name+ starting in namespace +from+
-
- def find_class_named_from name, from
- from = find_class_named from unless RDoc::Context === from
-
- until RDoc::TopLevel === from do
- return nil unless from
-
- klass = from.find_class_named name
- return klass if klass
-
- from = from.parent
- end
-
- find_class_named name
- end
-
- ##
- # Finds the class or module with +name+
-
- def find_class_or_module name
- name = $' if name =~ /^::/
- @classes_hash[name] || @modules_hash[name]
- end
-
- ##
- # Finds the file with +name+ in all discovered files
-
- def find_file_named name
- @files_hash[name]
- end
-
- ##
- # Finds the module with +name+ in all discovered modules
-
- def find_module_named name
- @modules_hash[name]
- end
-
- ##
- # Returns the RDoc::TopLevel that is a text file and has the given
- # +file_name+
-
- def find_text_page file_name
- @files_hash.each_value.find do |file|
- file.text? and file.full_name == file_name
- end
- end
-
- ##
- # Finds unique classes/modules defined in +all_hash+,
- # and returns them as an array. Performs the alias
- # updates in +all_hash+: see ::complete.
- #--
- # TODO aliases should be registered by Context#add_module_alias
-
- def find_unique all_hash
- unique = []
-
- all_hash.each_pair do |full_name, cm|
- unique << cm if full_name == cm.full_name
- end
-
- unique
- end
-
- ##
- # Fixes the erroneous <tt>BasicObject < Object</tt> in 1.9.
- #
- # Because we assumed all classes without a stated superclass
- # inherit from Object, we have the above wrong inheritance.
- #
- # We fix BasicObject right away if we are running in a Ruby
- # version >= 1.9. If not, we may be documenting 1.9 source
- # while running under 1.8: we search the files of BasicObject
- # for "object.c", and fix the inheritance if we find it.
-
- def fix_basic_object_inheritance
- basic = classes_hash['BasicObject']
- return unless basic
- if RUBY_VERSION >= '1.9'
- basic.superclass = nil
- elsif basic.in_files.any? { |f| File.basename(f.full_name) == 'object.c' }
- basic.superclass = nil
- end
- end
-
- ##
- # Friendly rendition of #path
-
- def friendly_path
- case type
- when :gem then
- parent = File.expand_path '..', @path
- "gem #{File.basename parent}"
- when :home then '~/.rdoc'
- when :site then 'ruby site'
- when :system then 'ruby core'
- else @path
- end
- end
-
- def inspect # :nodoc:
- "#<%s:0x%x %s %p>" % [self.class, object_id, @path, module_names.sort]
- end
-
- ##
- # Instance methods cache accessor. Maps a class to an Array of its
- # instance methods (not full name).
-
- def instance_methods
- @cache[:instance_methods]
- end
-
- ##
- # Loads all items from this store into memory. This recreates a
- # documentation tree for use by a generator
-
- def load_all
- load_cache
-
- module_names.each do |module_name|
- mod = find_class_or_module(module_name) || load_class(module_name)
-
- # load method documentation since the loaded class/module does not have
- # it
- loaded_methods = mod.method_list.map do |method|
- load_method module_name, method.full_name
- end
-
- mod.method_list.replace loaded_methods
-
- loaded_attributes = mod.attributes.map do |attribute|
- load_method module_name, attribute.full_name
- end
-
- mod.attributes.replace loaded_attributes
- end
-
- all_classes_and_modules.each do |mod|
- descendent_re = /^#{mod.full_name}::[^:]+$/
-
- module_names.each do |name|
- next unless name =~ descendent_re
-
- descendent = find_class_or_module name
-
- case descendent
- when RDoc::NormalClass then
- mod.classes_hash[name] = descendent
- when RDoc::NormalModule then
- mod.modules_hash[name] = descendent
- end
- end
- end
-
- @cache[:pages].each do |page_name|
- page = load_page page_name
- @files_hash[page_name] = page
- end
- end
-
- ##
- # Loads cache file for this store
-
- def load_cache
- #orig_enc = @encoding
-
- open cache_path, 'rb' do |io|
- @cache = Marshal.load io.read
- end
-
- load_enc = @cache[:encoding]
-
- # TODO this feature will be time-consuming to add:
- # a) Encodings may be incompatible but transcodeable
- # b) Need to warn in the appropriate spots, wherever they may be
- # c) Need to handle cross-cache differences in encodings
- # d) Need to warn when generating into a cache with different encodings
- #
- #if orig_enc and load_enc != orig_enc then
- # warn "Cached encoding #{load_enc} is incompatible with #{orig_enc}\n" \
- # "from #{path}/cache.ri" unless
- # Encoding.compatible? orig_enc, load_enc
- #end
-
- @encoding = load_enc unless @encoding
-
- @cache[:pages] ||= []
- @cache[:main] ||= nil
- @cache[:c_class_variables] ||= {}
- @cache[:c_singleton_class_variables] ||= {}
-
- @cache[:c_class_variables].each do |_, map|
- map.each do |variable, name|
- @c_enclosure_names[variable] = name
- end
- end
-
- @cache
- rescue Errno::ENOENT
- end
-
- ##
- # Loads ri data for +klass_name+ and hooks it up to this store.
-
- def load_class klass_name
- obj = load_class_data klass_name
-
- obj.store = self
-
- case obj
- when RDoc::NormalClass then
- @classes_hash[klass_name] = obj
- when RDoc::NormalModule then
- @modules_hash[klass_name] = obj
- end
- end
-
- ##
- # Loads ri data for +klass_name+
-
- def load_class_data klass_name
- file = class_file klass_name
-
- open file, 'rb' do |io|
- Marshal.load io.read
- end
- rescue Errno::ENOENT => e
- error = MissingFileError.new(self, file, klass_name)
- error.set_backtrace e.backtrace
- raise error
- end
-
- ##
- # Loads ri data for +method_name+ in +klass_name+
-
- def load_method klass_name, method_name
- file = method_file klass_name, method_name
-
- open file, 'rb' do |io|
- obj = Marshal.load io.read
- obj.store = self
- obj.parent =
- find_class_or_module(klass_name) || load_class(klass_name) unless
- obj.parent
- obj
- end
- rescue Errno::ENOENT => e
- error = MissingFileError.new(self, file, klass_name + method_name)
- error.set_backtrace e.backtrace
- raise error
- end
-
- ##
- # Loads ri data for +page_name+
-
- def load_page page_name
- file = page_file page_name
-
- open file, 'rb' do |io|
- obj = Marshal.load io.read
- obj.store = self
- obj
- end
- rescue Errno::ENOENT => e
- error = MissingFileError.new(self, file, page_name)
- error.set_backtrace e.backtrace
- raise error
- end
-
- ##
- # Gets the main page for this RDoc store. This page is used as the root of
- # the RDoc server.
-
- def main
- @cache[:main]
- end
-
- ##
- # Sets the main page for this RDoc store.
-
- def main= page
- @cache[:main] = page
- end
-
- ##
- # Converts the variable => ClassModule map +variables+ from a C parser into
- # a variable => class name map.
-
- def make_variable_map variables
- map = {}
-
- variables.each { |variable, class_module|
- map[variable] = class_module.full_name
- }
-
- map
- end
-
- ##
- # Path to the ri data for +method_name+ in +klass_name+
-
- def method_file klass_name, method_name
- method_name = method_name.split('::').last
- method_name =~ /#(.*)/
- method_type = $1 ? 'i' : 'c'
- method_name = $1 if $1
-
- method_name = if ''.respond_to? :ord then
- method_name.gsub(/\W/) { "%%%02x" % $&[0].ord }
- else
- method_name.gsub(/\W/) { "%%%02x" % $&[0] }
- end
-
- File.join class_path(klass_name), "#{method_name}-#{method_type}.ri"
- end
-
- ##
- # Modules cache accessor. An Array of all the module (and class) names in
- # the store.
-
- def module_names
- @cache[:modules]
- end
-
- ##
- # Hash of all modules known to RDoc
-
- def modules_hash
- @modules_hash
- end
-
- ##
- # Returns the RDoc::TopLevel that is a text file and has the given +name+
-
- def page name
- @files_hash.each_value.find do |file|
- file.text? and file.page_name == name
- end
- end
-
- ##
- # Path to the ri data for +page_name+
-
- def page_file page_name
- file_name = File.basename(page_name).gsub('.', '_')
-
- File.join @path, File.dirname(page_name), "page-#{file_name}.ri"
- end
-
- ##
- # Removes from +all_hash+ the contexts that are nodoc or have no content.
- #
- # See RDoc::Context#remove_from_documentation?
-
- def remove_nodoc all_hash
- all_hash.keys.each do |name|
- context = all_hash[name]
- all_hash.delete(name) if context.remove_from_documentation?
- end
- end
-
- ##
- # Saves all entries in the store
-
- def save
- load_cache
-
- all_classes_and_modules.each do |klass|
- save_class klass
-
- klass.each_method do |method|
- save_method klass, method
- end
-
- klass.each_attribute do |attribute|
- save_method klass, attribute
- end
- end
-
- all_files.each do |file|
- save_page file
- end
-
- save_cache
- end
-
- ##
- # Writes the cache file for this store
-
- def save_cache
- clean_cache_collection @cache[:ancestors]
- clean_cache_collection @cache[:attributes]
- clean_cache_collection @cache[:class_methods]
- clean_cache_collection @cache[:instance_methods]
-
- @cache[:modules].uniq!
- @cache[:modules].sort!
-
- @cache[:pages].uniq!
- @cache[:pages].sort!
-
- @cache[:encoding] = @encoding # this gets set twice due to assert_cache
-
- @cache[:c_class_variables].merge! @c_class_variables
- @cache[:c_singleton_class_variables].merge! @c_singleton_class_variables
-
- return if @dry_run
-
- marshal = Marshal.dump @cache
-
- open cache_path, 'wb' do |io|
- io.write marshal
- end
- end
-
- ##
- # Writes the ri data for +klass+ (or module)
-
- def save_class klass
- full_name = klass.full_name
-
- FileUtils.mkdir_p class_path(full_name) unless @dry_run
-
- @cache[:modules] << full_name
-
- path = class_file full_name
-
- begin
- disk_klass = load_class full_name
-
- klass = disk_klass.merge klass
- rescue MissingFileError
- end
-
- # BasicObject has no ancestors
- ancestors = klass.direct_ancestors.compact.map do |ancestor|
- # HACK for classes we don't know about (class X < RuntimeError)
- String === ancestor ? ancestor : ancestor.full_name
- end
-
- @cache[:ancestors][full_name] ||= []
- @cache[:ancestors][full_name].concat ancestors
-
- attribute_definitions = klass.attributes.map do |attribute|
- "#{attribute.definition} #{attribute.name}"
- end
-
- unless attribute_definitions.empty? then
- @cache[:attributes][full_name] ||= []
- @cache[:attributes][full_name].concat attribute_definitions
- end
-
- to_delete = []
-
- unless klass.method_list.empty? then
- @cache[:class_methods][full_name] ||= []
- @cache[:instance_methods][full_name] ||= []
-
- class_methods, instance_methods =
- klass.method_list.partition { |meth| meth.singleton }
-
- class_methods = class_methods. map { |method| method.name }
- instance_methods = instance_methods.map { |method| method.name }
- attribute_names = klass.attributes.map { |attr| attr.name }
-
- old = @cache[:class_methods][full_name] - class_methods
- to_delete.concat old.map { |method|
- method_file full_name, "#{full_name}::#{method}"
- }
-
- old = @cache[:instance_methods][full_name] -
- instance_methods - attribute_names
- to_delete.concat old.map { |method|
- method_file full_name, "#{full_name}##{method}"
- }
-
- @cache[:class_methods][full_name] = class_methods
- @cache[:instance_methods][full_name] = instance_methods
- end
-
- return if @dry_run
-
- FileUtils.rm_f to_delete
-
- marshal = Marshal.dump klass
-
- open path, 'wb' do |io|
- io.write marshal
- end
- end
-
- ##
- # Writes the ri data for +method+ on +klass+
-
- def save_method klass, method
- full_name = klass.full_name
-
- FileUtils.mkdir_p class_path(full_name) unless @dry_run
-
- cache = if method.singleton then
- @cache[:class_methods]
- else
- @cache[:instance_methods]
- end
- cache[full_name] ||= []
- cache[full_name] << method.name
-
- return if @dry_run
-
- marshal = Marshal.dump method
-
- open method_file(full_name, method.full_name), 'wb' do |io|
- io.write marshal
- end
- end
-
- ##
- # Writes the ri data for +page+
-
- def save_page page
- return unless page.text?
-
- path = page_file page.full_name
-
- FileUtils.mkdir_p File.dirname(path) unless @dry_run
-
- cache[:pages] ||= []
- cache[:pages] << page.full_name
-
- return if @dry_run
-
- marshal = Marshal.dump page
-
- open path, 'wb' do |io|
- io.write marshal
- end
- end
-
- ##
- # Source of the contents of this store.
- #
- # For a store from a gem the source is the gem name. For a store from the
- # home directory the source is "home". For system ri store (the standard
- # library documentation) the source is"ruby". For a store from the site
- # ri directory the store is "site". For other stores the source is the
- # #path.
-
- def source
- case type
- when :gem then File.basename File.expand_path '..', @path
- when :home then 'home'
- when :site then 'site'
- when :system then 'ruby'
- else @path
- end
- end
-
- ##
- # Gets the title for this RDoc store. This is used as the title in each
- # page on the RDoc server
-
- def title
- @cache[:title]
- end
-
- ##
- # Sets the title page for this RDoc store.
-
- def title= title
- @cache[:title] = title
- end
-
- ##
- # Returns the unique classes discovered by RDoc.
- #
- # ::complete must have been called prior to using this method.
-
- def unique_classes
- @unique_classes
- end
-
- ##
- # Returns the unique classes and modules discovered by RDoc.
- # ::complete must have been called prior to using this method.
-
- def unique_classes_and_modules
- @unique_classes + @unique_modules
- end
-
- ##
- # Returns the unique modules discovered by RDoc.
- # ::complete must have been called prior to using this method.
-
- def unique_modules
- @unique_modules
- end
-
-end
-
diff --git a/lib/rdoc/task.rb b/lib/rdoc/task.rb
index d347e4d6ab..f87ef7dc0e 100644
--- a/lib/rdoc/task.rb
+++ b/lib/rdoc/task.rb
@@ -21,310 +21,13 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-require 'rubygems'
-begin
- gem 'rdoc'
-rescue Gem::LoadError
-end unless defined?(RDoc)
-
-begin
- gem 'rake'
-rescue Gem::LoadError
-end unless defined?(Rake)
-
require 'rdoc'
require 'rake'
-require 'rake/tasklib'
-
-##
-# RDoc::Task creates the following rake tasks to generate and clean up RDoc
-# output:
-#
-# [rdoc]
-# Main task for this RDoc task.
-#
-# [clobber_rdoc]
-# Delete all the rdoc files. This target is automatically added to the main
-# clobber target.
-#
-# [rerdoc]
-# Rebuild the rdoc files from scratch, even if they are not out of date.
-#
-# Simple Example:
-#
-# require 'rdoc/task'
-#
-# RDoc::Task.new do |rdoc|
-# rdoc.main = "README.rdoc"
-# rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-# end
-#
-# The +rdoc+ object passed to the block is an RDoc::Task object. See the
-# attributes list for the RDoc::Task 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:
-#
-# require 'rdoc/task'
-#
-# RDoc::Task.new :rdoc_dev do |rdoc|
-# rdoc.main = "README.doc"
-# rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-# rdoc.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:
-#
-# require 'rdoc/task'
-#
-# RDoc::Task.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 RDoc::Task < Rake::TaskLib
-
- ##
- # Name of the main, top level task. (default is :rdoc)
-
- attr_accessor :name
-
- ##
- # Comment markup format. rdoc, rd and tomdoc are supported. (default is
- # 'rdoc')
-
- attr_accessor :markup
-
- ##
- # 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
-
- ##
- # Name of format generator (<tt>--format<tt>) used by rdoc. (defaults to
- # rdoc's default)
-
- attr_accessor :generator
-
- ##
- # 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
-
- ##
- # Create an RDoc task with the given name. See the RDoc::Task class overview
- # for documentation.
-
- def initialize name = :rdoc # :yield: self
- defaults
-
- check_names name
-
- @name = name
-
- yield self if block_given?
-
- define
- end
-
- ##
- # Ensures that +names+ only includes names for the :rdoc, :clobber_rdoc and
- # :rerdoc. If other names are given an ArgumentError is raised.
-
- def check_names names
- return unless Hash === names
-
- invalid_options =
- names.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
-
- unless invalid_options.empty? then
- raise ArgumentError, "invalid options: #{invalid_options.join ', '}"
- end
- end
-
- ##
- # Task description for the clobber rdoc task or its renamed equivalent
-
- def clobber_task_description
- "Remove RDoc HTML files"
- end
-
- ##
- # Sets default task values
-
- def defaults
- @name = :rdoc
- @rdoc_files = Rake::FileList.new
- @rdoc_dir = 'html'
- @main = nil
- @title = nil
- @template = nil
- @generator = nil
- @options = []
- end
-
- ##
- # All source is inline now. This method is deprecated
-
- def inline_source # :nodoc:
- warn "RDoc::Task#inline_source is deprecated"
- true
- end
-
- ##
- # All source is inline now. This method is deprecated
-
- def inline_source=(value) # :nodoc:
- warn "RDoc::Task#inline_source is deprecated"
- end
-
- ##
- # Create the tasks defined by this task lib.
-
- def define
- desc rdoc_task_description
- task rdoc_task_name
-
- desc rerdoc_task_description
- task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
-
- desc clobber_task_description
- task clobber_task_name do
- rm_r @rdoc_dir rescue nil
- end
-
- task :clobber => [clobber_task_name]
-
- directory @rdoc_dir
-
- rdoc_target_deps = [
- @rdoc_files,
- Rake.application.rakefile
- ].flatten.compact
-
- task rdoc_task_name => [rdoc_target]
- file rdoc_target => rdoc_target_deps do
- @before_running_rdoc.call if @before_running_rdoc
- args = option_list + @rdoc_files
-
- $stderr.puts "rdoc #{args.join ' '}" if Rake.application.options.trace
- RDoc::RDoc.new.document args
- end
-
- self
- end
-
- ##
- # List of options that will be supplied to RDoc
-
- def option_list
- result = @options.dup
- result << "-o" << @rdoc_dir
- result << "--main" << main if main
- result << "--markup" << markup if markup
- result << "--title" << title if title
- result << "-T" << template if template
- result << '-f' << generator if generator
- result
- end
-
- ##
- # The block passed to this method will be called just before running the
- # RDoc generator. It is allowed to modify RDoc::Task attributes inside the
- # block.
-
- def before_running_rdoc(&block)
- @before_running_rdoc = block
- end
-
- ##
- # Task description for the rdoc task or its renamed equivalent
-
- def rdoc_task_description
- 'Build RDoc HTML files'
- end
-
- ##
- # Task description for the rerdoc task or its renamed description
-
- def rerdoc_task_description
- "Rebuild RDoc HTML files"
- end
-
- private
-
- def rdoc_target
- "#{rdoc_dir}/index.html"
- end
-
- def rdoc_task_name
- case name
- when Hash then (name[:rdoc] || "rdoc").to_s
- else name.to_s
- end
- end
-
- def clobber_task_name
- case name
- when Hash then (name[:clobber_rdoc] || "clobber_rdoc").to_s
- else "clobber_#{name}"
- end
- end
-
- def rerdoc_task_name
- case name
- when Hash then (name[:rerdoc] || "rerdoc").to_s
- else "re#{name}"
- end
- end
-
-end
+require 'rake/rdoctask'
# :stopdoc:
-module Rake
-
- ##
- # For backwards compatibility
-
- RDocTask = RDoc::Task
-
+module RDoc
+ Task = Rake::RDocTask
end
# :startdoc:
diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb
deleted file mode 100644
index c69e3c7cc6..0000000000
--- a/lib/rdoc/test_case.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'minitest/benchmark' if ENV['BENCHMARK']
-
-require 'fileutils'
-require 'pp'
-require 'tempfile'
-require 'tmpdir'
-require 'stringio'
-
-require 'rdoc'
-
-##
-# RDoc::TestCase is an abstract TestCase to provide common setup and teardown
-# across all RDoc tests. The test case uses minitest, so all the assertions
-# of minitest may be used.
-#
-# The testcase provides the following:
-#
-# * A reset code-object tree
-# * A reset markup preprocessor (RDoc::Markup::PreProcess)
-# * The <code>@RM</code> alias of RDoc::Markup (for less typing)
-# * <code>@pwd</code> containing the current working directory
-# * FileUtils, pp, Tempfile, Dir.tmpdir and StringIO
-
-class RDoc::TestCase < MiniTest::Unit::TestCase
-
- ##
- # Abstract test-case setup
-
- def setup
- super
-
- @top_level = nil
-
- @have_encoding = Object.const_defined? :Encoding
-
- @RM = RDoc::Markup
-
- RDoc::Markup::PreProcess.reset
-
- @pwd = Dir.pwd
-
- @store = RDoc::Store.new
-
- @rdoc = RDoc::RDoc.new
- @rdoc.store = @store
-
- g = Object.new
- def g.class_dir() end
- def g.file_dir() end
- @rdoc.generator = g
- end
-
- ##
- # Shortcut for RDoc::Markup::BlankLine.new
-
- def blank_line
- @RM::BlankLine.new
- end
-
- ##
- # Shortcut for RDoc::Markup::BlockQuote.new with +contents+
-
- def block *contents
- @RM::BlockQuote.new(*contents)
- end
-
- ##
- # Creates an RDoc::Comment with +text+ which was defined on +top_level+.
- # By default the comment has the 'rdoc' format.
-
- def comment text, top_level = @top_level
- RDoc::Comment.new text, top_level
- end
-
- ##
- # Shortcut for RDoc::Markup::Document.new with +contents+
-
- def doc *contents
- @RM::Document.new(*contents)
- end
-
- ##
- # Shortcut for RDoc::Markup::HardBreak.new
-
- def hard_break
- @RM::HardBreak.new
- end
-
- ##
- # Shortcut for RDoc::Markup::Heading.new with +level+ and +text+
-
- def head level, text
- @RM::Heading.new level, text
- end
-
- ##
- # Shortcut for RDoc::Markup::ListItem.new with +label+ and +parts+
-
- def item label = nil, *parts
- @RM::ListItem.new label, *parts
- end
-
- ##
- # Shortcut for RDoc::Markup::List.new with +type+ and +items+
-
- def list type = nil, *items
- @RM::List.new type, *items
- end
-
- ##
- # Shortcut for RDoc::Markup::Paragraph.new with +contents+
-
- def para *a
- @RM::Paragraph.new(*a)
- end
-
- ##
- # Shortcut for RDoc::Markup::Rule.new with +weight+
-
- def rule weight
- @RM::Rule.new weight
- end
-
- ##
- # Shortcut for RDoc::Markup::Raw.new with +contents+
-
- def raw *contents
- @RM::Raw.new(*contents)
- end
-
- ##
- # Creates a temporary directory changes the current directory to it for the
- # duration of the block.
- #
- # Depends upon Dir.mktmpdir
-
- def temp_dir
- skip "No Dir::mktmpdir, upgrade your ruby" unless Dir.respond_to? :mktmpdir
-
- Dir.mktmpdir do |temp_dir|
- Dir.chdir temp_dir do
- yield temp_dir
- end
- end
- end
-
- ##
- # Shortcut for RDoc::Markup::Verbatim.new with +parts+
-
- def verb *parts
- @RM::Verbatim.new(*parts)
- end
-
- ##
- # run capture_io with setting $VERBOSE = true
-
- def verbose_capture_io
- capture_io do
- begin
- orig_verbose = $VERBOSE
- $VERBOSE = true
- yield
- ensure
- $VERBOSE = orig_verbose
- end
- end
- end
-end
-
-# This hack allows autoload to work when Dir.pwd is changed for Ruby 1.8 since
-# -I paths are not expanded.
-$LOAD_PATH.each do |load_path|
- break if load_path[0] == ?/
- load_path.replace File.expand_path load_path
-end if RUBY_VERSION < '1.9'
-
diff --git a/lib/rdoc/text.rb b/lib/rdoc/text.rb
index 46b53276b5..5280aa0fd2 100644
--- a/lib/rdoc/text.rb
+++ b/lib/rdoc/text.rb
@@ -1,78 +1,18 @@
-# coding: utf-8
-
-##
-# For RDoc::Text#to_html
-
-require 'strscan'
-
-##
-# For RDoc::Text#snippet
-
-begin
- gem 'json'
-rescue Gem::LoadError
-end
-
-require 'json'
-
##
# Methods for manipulating comment text
module RDoc::Text
##
- # Maps markup formats to classes that can parse them. If the format is
- # unknown, "rdoc" format is used.
-
- MARKUP_FORMAT = {
- 'markdown' => RDoc::Markdown,
- 'rdoc' => RDoc::Markup,
- 'rd' => RDoc::RD,
- 'tomdoc' => RDoc::TomDoc,
- }
-
- MARKUP_FORMAT.default = RDoc::Markup
-
- ##
- # Maps an encoding to a Hash of characters properly transcoded for that
- # encoding.
- #
- # See also encode_fallback.
-
- TO_HTML_CHARACTERS = Hash.new do |h, encoding|
- h[encoding] = {
- :close_dquote => encode_fallback('â€', encoding, '"'),
- :close_squote => encode_fallback('’', encoding, '\''),
- :copyright => encode_fallback('©', encoding, '(c)'),
- :ellipsis => encode_fallback('…', encoding, '...'),
- :em_dash => encode_fallback('—', encoding, '---'),
- :en_dash => encode_fallback('–', encoding, '--'),
- :open_dquote => encode_fallback('“', encoding, '"'),
- :open_squote => encode_fallback('‘', encoding, '\''),
- :trademark => encode_fallback('®', encoding, '(r)'),
- }
- end if Object.const_defined? :Encoding
-
- ##
- # Transcodes +character+ to +encoding+ with a +fallback+ character.
-
- def self.encode_fallback character, encoding, fallback
- character.encode(encoding, :fallback => { character => fallback },
- :undef => :replace, :replace => fallback)
- end
-
- ##
# Expands tab characters in +text+ to eight spaces
def expand_tabs text
expanded = []
text.each_line do |line|
- nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
- r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
- r.force_encoding text.encoding if Object.const_defined? :Encoding
- r
- end
+ line.gsub!(/^(.{8}*?)([^\t\r\n]{0,7})\t/) do
+ "#{$1}#{$2}#{' ' * (8 - $2.size)}"
+ end until line !~ /\t/
expanded << line
end
@@ -84,26 +24,34 @@ module RDoc::Text
# Flush +text+ left based on the shortest line
def flush_left text
- indent = 9999
+ indents = []
text.each_line do |line|
- line_indent = line =~ /\S/ || 9999
- indent = line_indent if indent > line_indent
+ indents << (line =~ /[^\s]/ || 9999)
end
- empty = ''
- empty.force_encoding text.encoding if Object.const_defined? :Encoding
+ indent = indents.min
+
+ flush = []
- text.gsub(/^ {0,#{indent}}/, empty)
+ text.each_line do |line|
+ line[/^ {0,#{indent}}/] = ''
+ flush << line
+ end
+
+ flush.join
end
##
- # Convert a string in markup format into HTML.
+ # Convert a string in markup format into HTML. Removes the first paragraph
+ # tags if +remove_para+ is true.
#
# Requires the including class to implement #formatter
def markup text
- parse(text).accept formatter
+ document = parse text
+
+ document.accept formatter
end
##
@@ -112,35 +60,44 @@ module RDoc::Text
def normalize_comment text
return text if text.empty?
- text = strip_stars text
- text = strip_hashes text
- text = expand_tabs text
- text = flush_left text
- text = strip_newlines text
- text
+ text = strip_hashes text
+ text = expand_tabs text
+ text = flush_left text
+ strip_newlines text
end
##
# Normalizes +text+ then builds a RDoc::Markup::Document from it
- def parse text, format = 'rdoc'
+ def parse text
return text if RDoc::Markup::Document === text
- return text.parse if RDoc::Comment === text
- text = normalize_comment text # TODO remove, should not be necessary
+ text = normalize_comment text
return RDoc::Markup::Document.new if text =~ /\A\n*\z/
- MARKUP_FORMAT[format].parse text
- end
+ RDoc::Markup::Parser.parse text
+ rescue RDoc::Markup::Parser::Error => e
+ $stderr.puts <<-EOF
+While parsing markup, RDoc encountered a #{e.class}:
- ##
- # The first +limit+ characters of +text+ as HTML
+#{e}
+\tfrom #{e.backtrace.join "\n\tfrom "}
- def snippet text, limit = 100
- document = parse text
+---8<---
+#{text}
+---8<---
+
+RDoc #{RDoc::VERSION}
+
+Ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} #{RUBY_RELEASE_DATE}
+
+Please file a bug report with the above information at:
+
+http://rubyforge.org/tracker/?atid=2472&group_id=627&func=browse
- RDoc::Markup::ToHtmlSnippet.new(limit).convert document
+ EOF
+ raise
end
##
@@ -148,167 +105,25 @@ module RDoc::Text
def strip_hashes text
return text if text =~ /^(?>\s*)[^\#]/
-
- empty = ''
- empty.force_encoding text.encoding if Object.const_defined? :Encoding
-
- text.gsub(/^\s*(#+)/) { $1.tr '#', ' ' }.gsub(/^\s+$/, empty)
+ text.gsub(/^\s*(#+)/) { $1.tr '#',' ' }
end
##
# Strips leading and trailing \n characters from +text+
def strip_newlines text
- text.gsub(/\A\n*(.*?)\n*\z/m) do $1 end # block preserves String encoding
+ text.gsub(/\A\n*(.*?)\n*\z/m, '\1')
end
##
# Strips /* */ style comments
def strip_stars text
- return text unless text =~ %r%/\*.*\*/%m
-
- encoding = text.encoding if Object.const_defined? :Encoding
-
- text = text.gsub %r%Document-method:\s+[\w:.#=!?]+%, ''
-
- space = ' '
- space.force_encoding encoding if encoding
-
- text.sub! %r%/\*+% do space * $&.length end
- text.sub! %r%\*+/% do space * $&.length end
- text.gsub! %r%^[ \t]*\*%m do space * $&.length end
-
- empty = ''
- empty.force_encoding encoding if encoding
- text.gsub(/^\s+$/, empty)
- end
-
- ##
- # Converts ampersand, dashes, ellipsis, quotes, copyright and registered
- # trademark symbols in +text+ to properly encoded characters.
-
- def to_html text
- if Object.const_defined? :Encoding then
- html = ''.encode text.encoding
-
- encoded = RDoc::Text::TO_HTML_CHARACTERS[text.encoding]
- else
- html = ''
- encoded = {
- :close_dquote => 'â€',
- :close_squote => '’',
- :copyright => '©',
- :ellipsis => '…',
- :em_dash => '—',
- :en_dash => '–',
- :open_dquote => '“',
- :open_squote => '‘',
- :trademark => '®',
- }
- end
-
- s = StringScanner.new text
- insquotes = false
- indquotes = false
- after_word = nil
-
- until s.eos? do
- case
- when s.scan(/<(tt|code)>.*?<\/\1>/) then # skip contents of tt
- html << s.matched.gsub('\\\\', '\\')
- when s.scan(/<(tt|code)>.*?/) then
- warn "mismatched <#{s[1]}> tag" # TODO signal file/line
- html << s.matched
- when s.scan(/<[^>]+\/?s*>/) then # skip HTML tags
- html << s.matched
- when s.scan(/\\(\S)/) then # unhandled suppressed crossref
- html << s[1]
- after_word = nil
- when s.scan(/\.\.\.(\.?)/) then
- html << s[1] << encoded[:ellipsis]
- after_word = nil
- when s.scan(/\(c\)/) then
- html << encoded[:copyright]
- after_word = nil
- when s.scan(/\(r\)/) then
- html << encoded[:trademark]
- after_word = nil
- when s.scan(/---/) then
- html << encoded[:em_dash]
- after_word = nil
- when s.scan(/--/) then
- html << encoded[:en_dash]
- after_word = nil
- when s.scan(/&quot;|"/) then
- html << encoded[indquotes ? :close_dquote : :open_dquote]
- indquotes = !indquotes
- after_word = nil
- when s.scan(/``/) then # backtick double quote
- html << encoded[:open_dquote]
- after_word = nil
- when s.scan(/''/) then # tick double quote
- html << encoded[:close_dquote]
- after_word = nil
- when s.scan(/'/) then # single quote
- if insquotes
- html << encoded[:close_squote]
- insquotes = false
- elsif after_word
- # Mary's dog, my parents' house: do not start paired quotes
- html << encoded[:close_squote]
- else
- html << encoded[:open_squote]
- insquotes = true
- end
-
- after_word = nil
- else # advance to the next potentially significant character
- match = s.scan(/.+?(?=[<\\.("'`&-])/) #"
-
- if match then
- html << match
- after_word = match =~ /\w$/
- else
- html << s.rest
- break
- end
- end
- end
-
- html
- end
-
- ##
- # Wraps +txt+ to +line_len+
-
- 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.join.strip
+ text = text.gsub %r%Document-method:\s+[\w:.#]+%, ''
+ text.sub! %r%/\*+% do " " * $&.length end
+ text.sub! %r%\*+/% do " " * $&.length end
+ text.gsub! %r%^[ \t]*\*%m do " " * $&.length end
+ text
end
end
diff --git a/lib/rdoc/token_stream.rb b/lib/rdoc/token_stream.rb
deleted file mode 100644
index 851bc05bf5..0000000000
--- a/lib/rdoc/token_stream.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-##
-# 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
-
- ##
- # Converts +token_stream+ to HTML wrapping various tokens with
- # <tt><span></tt> elements. The following tokens types are wrapped in spans
- # with the given class names:
- #
- # TkCONSTANT :: 'ruby-constant'
- # TkKW :: 'ruby-keyword'
- # TkIVAR :: 'ruby-ivar'
- # TkOp :: 'ruby-operator'
- # TkId :: 'ruby-identifier'
- # TkNode :: 'ruby-node'
- # TkCOMMENT :: 'ruby-comment'
- # TkREGEXP :: 'ruby-regexp'
- # TkSTRING :: 'ruby-string'
- # TkVal :: 'ruby-value'
- #
- # Other token types are not wrapped in spans.
-
- def self.to_html token_stream
- token_stream.map do |t|
- next unless t
-
- style = case t
- when RDoc::RubyToken::TkCONSTANT then 'ruby-constant'
- when RDoc::RubyToken::TkKW then 'ruby-keyword'
- 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'
- when RDoc::RubyToken::TkREGEXP then 'ruby-regexp'
- when RDoc::RubyToken::TkSTRING then 'ruby-string'
- when RDoc::RubyToken::TkVal then 'ruby-value'
- end
-
- text = CGI.escapeHTML t.text
-
- if style then
- "<span class=\"#{style}\">#{text}</span>"
- else
- text
- end
- end.join
- end
-
- ##
- # Adds +tokens+ to the collected tokens
-
- def add_tokens(*tokens)
- tokens.flatten.each { |token| @token_stream << token }
- end
-
- alias add_token add_tokens
-
- ##
- # Starts collecting tokens
-
- def collect_tokens
- @token_stream = []
- end
-
- alias start_collecting_tokens collect_tokens
-
- ##
- # Remove the last token from the collected tokens
-
- def pop_token
- @token_stream.pop
- end
-
- ##
- # Current token stream
-
- def token_stream
- @token_stream
- end
-
- ##
- # Returns a string representation of the token stream
-
- def tokens_to_s
- token_stream.map { |token| token.text }.join ''
- end
-
-end
-
diff --git a/lib/rdoc/tokenstream.rb b/lib/rdoc/tokenstream.rb
new file mode 100644
index 0000000000..b1e86543f7
--- /dev/null
+++ b/lib/rdoc/tokenstream.rb
@@ -0,0 +1,52 @@
+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
+
+ ##
+ # Adds +tokens+ to the collected tokens
+
+ def add_tokens(*tokens)
+ tokens.flatten.each { |token| @token_stream << token }
+ end
+
+ alias add_token add_tokens
+
+ ##
+ # Starts collecting tokens
+
+ def collect_tokens
+ @token_stream = []
+ end
+
+ alias start_collecting_tokens collect_tokens
+
+ ##
+ # Remove the last token from the collected tokens
+
+ def pop_token
+ @token_stream.pop
+ end
+
+ ##
+ # Current token stream
+
+ def token_stream
+ @token_stream
+ end
+
+ ##
+ # Returns a string representation of the token stream
+
+ def tokens_to_s
+ token_stream.map { |token| token.text }.join ''
+ end
+
+end
+
diff --git a/lib/rdoc/tom_doc.rb b/lib/rdoc/tom_doc.rb
deleted file mode 100644
index 3a5a098ae8..0000000000
--- a/lib/rdoc/tom_doc.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-# :markup: tomdoc
-
-# A parser for TomDoc based on TomDoc 1.0.0-rc1 (02adef9b5a)
-#
-# The TomDoc specification can be found at:
-#
-# http://tomdoc.org
-#
-# The latest version of the TomDoc specification can be found at:
-#
-# https://github.com/mojombo/tomdoc/blob/master/tomdoc.md
-#
-# To choose TomDoc as your only default format see RDoc::Options@Saved+Options
-# for instructions on setting up a <code>.rdoc_options</code> file to store
-# your project default.
-#
-# There are a few differences between this parser and the specification. A
-# best-effort was made to follow the specification as closely as possible but
-# some choices to deviate were made.
-#
-# A future version of RDoc will warn when a MUST or MUST NOT is violated and
-# may warn when a SHOULD or SHOULD NOT is violated. RDoc will always try
-# to emit documentation even if given invalid TomDoc.
-#
-# Here are some implementation choices this parser currently makes:
-#
-# This parser allows rdoc-style inline markup but you should not depended on
-# it.
-#
-# This parser allows a space between the comment and the method body.
-#
-# This parser does not require the default value to be described for an
-# optional argument.
-#
-# This parser does not examine the order of sections. An Examples section may
-# precede the Arguments section.
-#
-# This class is documented in TomDoc format. Since this is a subclass of the
-# RDoc markup parser there isn't much to see here, unfortunately.
-
-class RDoc::TomDoc < RDoc::Markup::Parser
-
- # Internal: Token accessor
-
- attr_reader :tokens
-
- # Internal: Adds a post-processor which sets the RDoc section based on the
- # comment's status.
- #
- # Returns nothing.
-
- def self.add_post_processor # :nodoc:
- RDoc::Markup::PreProcess.post_process do |comment, code_object|
- next unless code_object and
- RDoc::Comment === comment and comment.format == 'tomdoc'
-
- comment.text.gsub!(/(\A\s*# )(Public|Internal|Deprecated):\s+/) do
- section = code_object.add_section $2
- code_object.temporary_section = section
-
- $1
- end
- end
- end
-
- add_post_processor
-
- # Public: Parses TomDoc from text
- #
- # text - A String containing TomDoc-format text.
- #
- # Examples
- #
- # RDoc::TomDoc.parse <<-TOMDOC
- # This method does some things
- #
- # Returns nothing.
- # TOMDOC
- # # => #<RDoc::Markup::Document:0xXXX @parts=[...], @file=nil>
- #
- # Returns an RDoc::Markup::Document representing the TomDoc format.
-
- def self.parse text
- parser = new
-
- parser.tokenize text
- doc = RDoc::Markup::Document.new
- parser.parse doc
- doc
- end
-
- # Internal: Extracts the Signature section's method signature
- #
- # comment - An RDoc::Comment that will be parsed and have the signature
- # extracted
- #
- # Returns a String containing the signature and nil if not
-
- def self.signature comment
- return unless comment.tomdoc?
-
- document = comment.parse
-
- signature = nil
- found_heading = false
- found_signature = false
-
- document.parts.delete_if do |part|
- next false if found_signature
-
- found_heading ||=
- RDoc::Markup::Heading === part && part.text == 'Signature'
-
- next false unless found_heading
-
- next true if RDoc::Markup::BlankLine === part
-
- if RDoc::Markup::Verbatim === part then
- signature = part
- found_signature = true
- end
- end
-
- signature and signature.text
- end
-
- # Public: Creates a new TomDoc parser. See also RDoc::Markup::parse
-
- def initialize
- super
-
- @section = nil
- end
-
- # Internal: Builds a heading from the token stream
- #
- # level - The level of heading to create
- #
- # Returns an RDoc::Markup::Heading
-
- def build_heading level
- heading = super
-
- @section = heading.text
-
- heading
- end
-
- # Internal: Builds a verbatim from the token stream. A verbatim in the
- # Examples section will be marked as in ruby format.
- #
- # margin - The indentation from the margin for lines that belong to this
- # verbatim section.
- #
- # Returns an RDoc::Markup::Verbatim
-
- def build_verbatim margin
- verbatim = super
-
- verbatim.format = :ruby if @section == 'Examples'
-
- verbatim
- end
-
- # Internal: Builds a paragraph from the token stream
- #
- # margin - Unused
- #
- # Returns an RDoc::Markup::Paragraph.
-
- def build_paragraph margin
- p :paragraph_start => margin if @debug
-
- paragraph = RDoc::Markup::Paragraph.new
-
- until @tokens.empty? do
- type, data, = get
-
- if type == :TEXT then
- paragraph << data
- skip :NEWLINE
- else
- unget
- break
- end
- end
-
- p :paragraph_end => margin if @debug
-
- paragraph
- end
-
- # Internal: Turns text into an Array of tokens
- #
- # text - A String containing TomDoc-format text.
- #
- # Returns self.
-
- def tokenize text
- text.sub!(/\A(Public|Internal|Deprecated):\s+/, '')
-
- setup_scanner text
-
- until @s.eos? do
- pos = @s.pos
-
- # leading spaces will be reflected by the column of the next token
- # the only thing we loose are trailing spaces at the end of the file
- next if @s.scan(/ +/)
-
- @tokens << case
- when @s.scan(/\r?\n/) then
- token = [:NEWLINE, @s.matched, *token_pos(pos)]
- @line_pos = char_pos @s.pos
- @line += 1
- token
- when @s.scan(/(Examples|Signature)$/) then
- @tokens << [:HEADER, 3, *token_pos(pos)]
-
- [:TEXT, @s[1], *token_pos(pos)]
- when @s.scan(/([:\w][\w\[\]]*)[ ]+- /) then
- [:NOTE, @s[1], *token_pos(pos)]
- else
- @s.scan(/.*/)
- [:TEXT, @s.matched.sub(/\r$/, ''), *token_pos(pos)]
- end
- end
-
- self
- end
-
-end
-
diff --git a/lib/rdoc/top_level.rb b/lib/rdoc/top_level.rb
index 64e12d9ff9..306790fc15 100644
--- a/lib/rdoc/top_level.rb
+++ b/lib/rdoc/top_level.rb
@@ -1,10 +1,10 @@
+require 'rdoc/context'
+
##
# A TopLevel context is a representation of the contents of a single file
class RDoc::TopLevel < RDoc::Context
- MARSHAL_VERSION = 0 # :nodoc:
-
##
# This TopLevel's File::Stat struct
@@ -20,115 +20,159 @@ class RDoc::TopLevel < RDoc::Context
attr_accessor :absolute_name
+ attr_accessor :diagram
+
##
- # All the classes or modules that were declared in
- # this file. These are assigned to either +#classes_hash+
- # or +#modules_hash+ once we know what they really are.
+ # The parser that processed this file
- attr_reader :classes_or_modules
+ attr_accessor :parser
- attr_accessor :diagram # :nodoc:
+ ##
+ # Returns all classes and modules discovered by RDoc
+
+ def self.all_classes_and_modules
+ classes_hash.values + modules_hash.values
+ end
##
- # The parser that processed this file
+ # Returns all classes discovered by RDoc
- attr_accessor :parser
+ def self.classes
+ classes_hash.values
+ end
##
- # Creates a new TopLevel for the file at +absolute_name+. If documentation
- # is being generated outside the source dir +relative_name+ is relative to
- # the source directory.
+ # Hash of all classes known to RDoc
- def initialize absolute_name, relative_name = absolute_name
- super()
- @name = nil
- @absolute_name = absolute_name
- @relative_name = relative_name
- @file_stat = File.stat(absolute_name) rescue nil # HACK for testing
- @diagram = nil
- @parser = nil
+ def self.classes_hash
+ @all_classes
+ end
+
+ ##
+ # All TopLevels known to RDoc
+
+ def self.files
+ @all_files.values
+ end
+
+ ##
+ # Hash of all files known to RDoc
- @classes_or_modules = []
+ def self.files_hash
+ @all_files
end
##
- # An RDoc::TopLevel is equal to another with the same relative_name
+ # Finds the class with +name+ in all discovered classes
- def == other
- self.class === other and @relative_name == other.relative_name
+ def self.find_class_named(name)
+ classes_hash[name]
end
- alias eql? ==
+ ##
+ # Finds the class with +name+ starting in namespace +from+
+
+ def self.find_class_named_from name, from
+ from = find_class_named from unless RDoc::Context === from
+
+ until RDoc::TopLevel === from do
+ return nil unless from
+
+ klass = from.find_class_named name
+ return klass if klass
+
+ from = from.parent
+ end
+
+ find_class_named name
+ end
##
- # Adds +an_alias+ to +Object+ instead of +self+.
+ # Finds the class or module with +name+
- def add_alias(an_alias)
- object_class.record_location self
- return an_alias unless @document_self
- object_class.add_alias an_alias
+ def self.find_class_or_module(name)
+ name =~ /^::/
+ name = $' || name
+
+ RDoc::TopLevel.classes_hash[name] || RDoc::TopLevel.modules_hash[name]
end
##
- # Adds +constant+ to +Object+ instead of +self+.
+ # Finds the file with +name+ in all discovered files
- def add_constant constant
- object_class.record_location self
- return constant unless @document_self
- object_class.add_constant constant
+ def self.find_file_named(name)
+ @all_files[name]
end
##
- # Adds +include+ to +Object+ instead of +self+.
+ # Finds the module with +name+ in all discovered modules
- def add_include(include)
- object_class.record_location self
- return include unless @document_self
- object_class.add_include include
+ def self.find_module_named(name)
+ modules_hash[name]
end
##
- # Adds +method+ to +Object+ instead of +self+.
+ # Returns all modules discovered by RDoc
- def add_method(method)
- object_class.record_location self
- return method unless @document_self
- object_class.add_method method
+ def self.modules
+ modules_hash.values
end
##
- # Adds class or module +mod+. Used in the building phase
- # by the ruby parser.
+ # Hash of all modules known to RDoc
- def add_to_classes_or_modules mod
- @classes_or_modules << mod
+ def self.modules_hash
+ @all_modules
end
##
- # Base name of this file
+ # Empties RDoc of stored class, module and file information
- def base_name
- File.basename @relative_name
+ def self.reset
+ @all_classes = {}
+ @all_modules = {}
+ @all_files = {}
end
- alias name base_name
+ reset
+
+ ##
+ # Creates a new TopLevel for +file_name+
+
+ def initialize(file_name)
+ super()
+ @name = nil
+ @relative_name = file_name
+ @absolute_name = file_name
+ @file_stat = File.stat(file_name) rescue nil # HACK for testing
+ @diagram = nil
+ @parser = nil
+
+ RDoc::TopLevel.files_hash[file_name] = self
+ end
##
- # Only a TopLevel that contains text file) will be displayed. See also
- # RDoc::CodeObject#display?
+ # Adds +method+ to Object instead of RDoc::TopLevel
+
+ def add_method(method)
+ object = self.class.find_class_named 'Object'
+ object = add_class RDoc::NormalClass, 'Object' unless object
- def display?
- text? and super
+ object.add_method method
end
##
- # See RDoc::TopLevel::find_class_or_module
- #--
- # TODO Why do we search through all classes/modules found, not just the
- # ones of this instance?
+ # Base name of this file
+
+ def base_name
+ File.basename @absolute_name
+ end
+
+ ##
+ # See RDoc::TopLevel.find_class_or_module
def find_class_or_module name
- @store.find_class_or_module name
+ RDoc::TopLevel.find_class_or_module name
end
##
@@ -142,25 +186,17 @@ class RDoc::TopLevel < RDoc::Context
# Finds a module or class with +name+
def find_module_named(name)
- find_class_or_module(name)
+ find_class_or_module(name) || find_enclosing_module_named(name)
end
##
- # Returns the relative name of this file
+ # The name of this file
def full_name
@relative_name
end
##
- # An RDoc::TopLevel has the same hash as another with the same
- # relative_name
-
- def hash
- @relative_name.hash
- end
-
- ##
# URL for this with a +prefix+
def http_url(prefix)
@@ -179,64 +215,22 @@ class RDoc::TopLevel < RDoc::Context
end
##
- # Time this file was last modified, if known
+ # Date this file was last modified, if known
def last_modified
- @file_stat ? file_stat.mtime : nil
- end
-
- ##
- # Dumps this TopLevel for use by ri. See also #marshal_load
-
- def marshal_dump
- [
- MARSHAL_VERSION,
- @relative_name,
- @parser,
- parse(@comment),
- ]
- end
-
- ##
- # Loads this TopLevel from +array+.
-
- def marshal_load array # :nodoc:
- initialize array[1]
-
- @parser = array[2]
- @comment = array[3]
-
- @file_stat = nil
+ @file_stat ? file_stat.mtime.to_s : 'Unknown'
end
##
- # Returns the NormalClass "Object", creating it if not found.
- #
- # Records +self+ as a location in "Object".
-
- def object_class
- @object_class ||= begin
- oc = @store.find_class_named('Object') || add_class(RDoc::NormalClass, 'Object')
- oc.record_location self
- oc
- end
- end
-
- ##
- # Base name of this file without the extension
-
- def page_name
- basename = File.basename @relative_name
- basename =~ /\.(rb|rdoc|txt|md)$/i
+ # Base name of this file
- $` || basename
- end
+ alias name base_name
##
- # Path to this file for use with HTML generator output.
+ # Path to this file
def path
- http_url @store.rdoc.generator.file_dir
+ http_url RDoc::RDoc.current.generator.file_dir
end
def pretty_print q # :nodoc:
@@ -245,38 +239,10 @@ class RDoc::TopLevel < RDoc::Context
q.breakable
items = @modules.map { |n,m| m }
- items.concat @modules.map { |n,c| c }
+ items.push(*@modules.map { |n,c| c })
q.seplist items do |mod| q.pp mod end
end
end
- ##
- # Search record used by RDoc::Generator::JsonIndex
-
- def search_record
- return unless @parser < RDoc::Parser::Text
-
- [
- page_name,
- '',
- page_name,
- '',
- path,
- '',
- snippet(@comment),
- ]
- end
-
- ##
- # Is this TopLevel from a text file instead of a source code file?
-
- def text?
- @parser and @parser.ancestors.include? RDoc::Parser::Text
- end
-
- def to_s # :nodoc:
- "file #{full_name}"
- end
-
end
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
index 3e28a843fd..b63eae8f02 100644
--- a/lib/resolv-replace.rb
+++ b/lib/resolv-replace.rb
@@ -19,7 +19,7 @@ class TCPSocket < IPSocket
alias original_resolv_initialize initialize
# :startdoc:
def initialize(host, serv, *rest)
- rest[0] = IPSocket.getaddress(rest[0]) if rest[0]
+ rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
end
end
@@ -51,6 +51,7 @@ class UDPSocket < IPSocket
rescue Resolv::ResolvError
raise SocketError, "Hostname not known: #{host}"
end
+ err = nil
addrs[0...-1].each {|addr|
begin
return original_resolv_send(mesg, flags, addr, port)
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 5373f2e140..9a96c55931 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -186,7 +186,7 @@ class Resolv
unless @initialized
@name2addr = {}
@addr2name = {}
- open(@filename, 'rb') {|f|
+ open(@filename) {|f|
f.each {|line|
line.sub!(/#.*/, '')
addr, hostname, *aliases = line.split(/\s+/)
@@ -336,21 +336,6 @@ class Resolv
@initialized = nil
end
- # Sets the resolver timeouts. This may be a single positive number
- # or an array of positive numbers representing timeouts in seconds.
- # If an array is specified, a DNS request will retry and wait for
- # each successive interval in the array until a successful response
- # is received. Specifying +nil+ reverts to the default timeouts:
- # [ 5, second = 5 * 2 / nameserver_count, 2 * second, 4 * second ]
- #
- # Example:
- #
- # dns.timeouts = 3
- #
- def timeouts=(values)
- @config.timeouts = values
- end
-
def lazy_initialize # :nodoc:
@mutex.synchronize {
unless @initialized
@@ -409,7 +394,7 @@ class Resolv
end
end
- def use_ipv6? # :nodoc:
+ def use_ipv6?
begin
list = Socket.ip_address_list
rescue NotImplementedError
@@ -507,7 +492,7 @@ class Resolv
def each_resource(name, typeclass, &proc)
lazy_initialize
- requester = make_udp_requester
+ requester = make_requester
senders = {}
begin
@config.resolv(name) {|candidate, tout, nameserver, port|
@@ -515,26 +500,13 @@ class Resolv
msg.rd = 1
msg.add_question(candidate, typeclass)
unless sender = senders[[candidate, nameserver, port]]
- sender = requester.sender(msg, candidate, nameserver, port)
- next if !sender
- senders[[candidate, nameserver, port]] = sender
+ sender = senders[[candidate, nameserver, port]] =
+ requester.sender(msg, candidate, nameserver, port)
end
reply, reply_name = requester.request(sender, tout)
case reply.rcode
when RCode::NoError
- if reply.tc == 1 and not Requester::TCP === requester
- requester.close
- # Retry via TCP:
- requester = make_tcp_requester(nameserver, port)
- senders = {}
- # This will use TCP for all remaining candidates (assuming the
- # current candidate does not already respond successfully via
- # TCP). This makes sense because we already know the full
- # response will not fit in an untruncated UDP packet.
- redo
- else
- extract_resources(reply, reply_name, typeclass, &proc)
- end
+ extract_resources(reply, reply_name, typeclass, &proc)
return
when RCode::NXDomain
raise Config::NXDomain.new(reply_name.to_s)
@@ -547,7 +519,7 @@ class Resolv
end
end
- def make_udp_requester # :nodoc:
+ def make_requester # :nodoc:
nameserver_port = @config.nameserver_port
if nameserver_port.length == 1
Requester::ConnectedUDP.new(*nameserver_port[0])
@@ -556,10 +528,6 @@ class Resolv
end
end
- def make_tcp_requester(host, port) # :nodoc:
- return Requester::TCP.new(host, port)
- end
-
def extract_resources(msg, name, typeclass) # :nodoc:
if typeclass < Resource::ANY
n0 = Name.create(name)
@@ -615,8 +583,8 @@ class Resolv
base + random(len)
end
- RequestID = {} # :nodoc:
- RequestIDMutex = Mutex.new # :nodoc:
+ RequestID = {}
+ RequestIDMutex = Mutex.new
def self.allocate_request_id(host, port) # :nodoc:
id = nil
@@ -646,9 +614,7 @@ class Resolv
begin
port = rangerand(1024..65535)
udpsock.bind(bind_host, port)
- rescue Errno::EADDRINUSE, # POSIX
- Errno::EACCES, # SunOS: See PRIV_SYS_NFS in privileges(5)
- Errno::EPERM # FreeBSD: security.mac.portacl.port_high is configurable. See mac_portacl(4).
+ rescue Errno::EADDRINUSE
retry
end
end
@@ -660,34 +626,19 @@ class Resolv
end
def request(sender, tout)
- start = Time.now
- timelimit = start + tout
- begin
- sender.send
- rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
- Errno::ENETUNREACH
- raise ResolvTimeout
- end
+ timelimit = Time.now + tout
+ sender.send
while true
- before_select = Time.now
- timeout = timelimit - before_select
+ now = Time.now
+ timeout = timelimit - now
if timeout <= 0
raise ResolvTimeout
end
select_result = IO.select(@socks, nil, nil, timeout)
if !select_result
- after_select = Time.now
- next if after_select < timelimit
- raise ResolvTimeout
- end
- begin
- reply, from = recv_reply(select_result[0])
- rescue Errno::ECONNREFUSED, # GNU/Linux, FreeBSD
- Errno::ECONNRESET # Windows
- # No name server running on the server?
- # Don't wait anymore.
raise ResolvTimeout
end
+ reply, from = recv_reply(select_result[0])
begin
msg = Message.decode(reply)
rescue DecodeError
@@ -733,11 +684,7 @@ class Resolv
af = Socket::AF_INET
end
next if @socks_hash[bind_host]
- begin
- sock = UDPSocket.new(af)
- rescue Errno::EAFNOSUPPORT
- next # The kernel doesn't support the address family.
- end
+ sock = UDPSocket.new(af)
sock.do_not_reverse_lookup = true
sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::F_SETFD
DNS.bind_random_port(sock, bind_host)
@@ -752,12 +699,11 @@ class Resolv
end
def sender(msg, data, host, port=Port)
- sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
- return nil if !sock
service = [host, port]
id = DNS.allocate_request_id(host, port)
request = msg.encode
request[0,2] = [id].pack('n')
+ sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
return @senders[[service, id]] =
Sender.new(request, data, sock, host, port)
end
@@ -778,7 +724,6 @@ class Resolv
attr_reader :data
def send
- raise "@sock is nil." if @sock.nil?
@sock.send(@msg, 0, @host, @port)
end
end
@@ -822,7 +767,6 @@ class Resolv
class Sender < Requester::Sender # :nodoc:
def send
- raise "@sock is nil." if @sock.nil?
@sock.send(@msg, 0)
end
attr_reader :data
@@ -884,27 +828,13 @@ class Resolv
@mutex = Mutex.new
@config_info = config_info
@initialized = nil
- @timeouts = nil
- end
-
- def timeouts=(values)
- if values
- values = Array(values)
- values.each do |t|
- Numeric === t or raise ArgumentError, "#{t.inspect} is not numeric"
- t > 0.0 or raise ArgumentError, "timeout=#{t} must be postive"
- end
- @timeouts = values
- else
- @timeouts = nil
- end
end
def Config.parse_resolv_conf(filename)
nameserver = []
search = nil
ndots = 1
- open(filename, 'rb') {|f|
+ open(filename) {|f|
f.each {|line|
line.sub!(/[#;].*/, '')
keyword, *args = line.split(/\s+/)
@@ -1044,10 +974,6 @@ class Resolv
candidates = []
end
candidates.concat(@search.map {|domain| Name.new(name.to_a + domain)})
- fname = Name.create("#{name}.")
- if !candidates.include?(fname)
- candidates << fname
- end
end
return candidates
end
@@ -1064,7 +990,7 @@ class Resolv
def resolv(name)
candidates = generate_candidates(name)
- timeouts = @timeouts || generate_timeouts
+ timeouts = generate_timeouts
begin
candidates.each {|candidate|
begin
@@ -1214,8 +1140,7 @@ class Resolv
def ==(other) # :nodoc:
return false unless Name === other
- return false unless @absolute == other.absolute?
- return @labels == other.to_a
+ return @labels.join == other.to_a.join && @absolute == other.absolute?
end
alias eql? == # :nodoc:
@@ -1509,7 +1434,6 @@ class Resolv
end
def get_bytes(len = @limit - @index)
- raise DecodeError.new("limit exceeded") if @limit < @index + len
d = @data[@index, len]
@index += len
return d
@@ -1537,7 +1461,6 @@ class Resolv
end
def get_string
- raise DecodeError.new("limit exceeded") if @limit <= @index
len = @data[@index].ord
raise DecodeError.new("limit exceeded") if @limit < @index + 1 + len
d = @data[@index + 1, len]
@@ -1561,7 +1484,6 @@ class Resolv
limit = @index if !limit || @index < limit
d = []
while true
- raise DecodeError.new("limit exceeded") if @limit <= @index
case @data[@index].ord
when 0
@index += 1
@@ -1641,10 +1563,10 @@ class Resolv
return false unless self.class == other.class
s_ivars = self.instance_variables
s_ivars.sort!
- s_ivars.delete :@ttl
+ s_ivars.delete "@ttl"
o_ivars = other.instance_variables
o_ivars.sort!
- o_ivars.delete :@ttl
+ 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}
@@ -1657,7 +1579,7 @@ class Resolv
def hash # :nodoc:
h = 0
vars = self.instance_variables
- vars.delete :@ttl
+ vars.delete "@ttl"
vars.each {|name|
h ^= self.instance_variable_get(name).hash
}
@@ -1955,10 +1877,10 @@ class Resolv
attr_reader :strings
##
- # Returns the concatenated string from +strings+.
+ # Returns the first string from +strings+.
def data
- @strings.join("")
+ @strings[0]
end
def encode_rdata(msg) # :nodoc:
diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb
index e99927943f..28a5923608 100644
--- a/lib/rexml/attribute.rb
+++ b/lib/rexml/attribute.rb
@@ -115,7 +115,7 @@ module REXML
def doctype
if @element
doc = @element.document
- doc.doctype if doc
+ doctype = doc.doctype if doc
end
end
diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb
index 73358edc28..e1235d60f8 100644
--- a/lib/rexml/cdata.rb
+++ b/lib/rexml/cdata.rb
@@ -6,7 +6,7 @@ module REXML
STOP = ']]>'
ILLEGAL = /(\]\]>)/
- # Constructor. CData is data between <![CDATA[ ... ]]>
+ # Constructor. CData is data between <![CDATA[ ... ]]>
#
# _Examples_
# CData.new( source )
diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb
index bf97d5f903..fd59d7283a 100644
--- a/lib/rexml/child.rb
+++ b/lib/rexml/child.rb
@@ -7,7 +7,7 @@ module REXML
# class directly.
class Child
include Node
- attr_reader :parent # The Parent of this object
+ attr_reader :parent # The Parent of this object
# Constructor. Any inheritors of this class should call super to make
# sure this method is called.
@@ -88,7 +88,7 @@ module REXML
# This doesn't yet handle encodings
def bytes
- document.encoding
+ encoding = document.encoding
to_s
end
diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb
index 42a040c456..e401090376 100644
--- a/lib/rexml/comment.rb
+++ b/lib/rexml/comment.rb
@@ -38,15 +38,15 @@ module REXML
# See REXML::Formatters
#
# output::
- # Where to write the string
+ # 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.
+ # 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.
+ # 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.
+ # 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 )
diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 0b3c533bb4..1a946a1587 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -115,6 +115,7 @@ module REXML
output << " #{@long_name.inspect}" if @long_name
output << " #{@uri.inspect}" if @uri
unless @children.empty?
+ next_indent = indent + 1
output << ' ['
@children.each { |child|
output << "\n"
@@ -248,11 +249,11 @@ module REXML
end
def to_s
- notation = "<!NOTATION #{@name} #{@middle}"
- notation << " #{@public.inspect}" if @public
- notation << " #{@system.inspect}" if @system
- notation << ">"
- notation
+ "<!NOTATION #@name #@middle#{
+ @public ? ' ' + public.inspect : ''
+ }#{
+ @system ? ' ' +@system.inspect : ''
+ }>"
end
def write( output, indent=-1 )
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb
index e5cef13b03..0337553a2e 100644
--- a/lib/rexml/document.rb
+++ b/lib/rexml/document.rb
@@ -131,8 +131,7 @@ module REXML
xml_decl().version
end
- # @return the XMLDecl encoding of this document as an
- # Encoding object.
+ # @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
@@ -144,10 +143,6 @@ module REXML
xml_decl().stand_alone?
end
- # :call-seq:
- # doc.write(output=$stdout, indent=-1, transtive=false, ie_hack=false, encoding=nil)
- # doc.write(options={:output => $stdout, :indent => -1, :transtive => false, :ie_hack => false, :encoding => nil})
- #
# Write the XML tree out, optionally with indent. This writes out the
# entire XML document, including XML declarations, doctype declarations,
# and processing instructions (if any are given).
@@ -158,30 +153,18 @@ module REXML
# specified, because it adds unnecessary bandwidth to applications such
# as XML-RPC.
#
- # Accept Nth argument style and options Hash style as argument.
- # The recommended style is options Hash style for one or more
- # arguments case.
- #
- # _Examples_
- # Document.new("<a><b/></a>").write
- #
- # output = ""
- # Document.new("<a><b/></a>").write(output)
- #
- # output = ""
- # Document.new("<a><b/></a>").write(:output => output, :indent => 2)
- #
# See also the classes in the rexml/formatters package for the proper way
- # to change the default formatting of XML output.
+ # to change the default formatting of XML output
#
# _Examples_
+ # Document.new("<a><b/></a>").serialize
#
- # output = ""
- # tr = Transitive.new
- # tr.write(Document.new("<a><b/></a>"), output)
+ # output_string = ""
+ # tr = Transitive.new( output_string )
+ # Document.new("<a><b/></a>").serialize( tr )
#
# output::
- # output an object which supports '<< string'; this is where the
+ # output an object which supports '<< string'; this is where the
# document will be written.
# indent::
# An integer. If -1, no indenting will be used; otherwise, the
@@ -199,31 +182,9 @@ module REXML
# 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
# before the /> on empty tags. Defaults to false
- # encoding::
- # Encoding name as String. Change output encoding to specified encoding
- # instead of encoding in XML declaration.
- # Defaults to nil. It means encoding in XML declaration is used.
- def write(*arguments)
- if arguments.size == 1 and arguments[0].class == Hash
- options = arguments[0]
-
- output = options[:output]
- indent = options[:indent]
- transitive = options[:transitive]
- ie_hack = options[:ie_hack]
- encoding = options[:encoding]
- else
- output, indent, transitive, ie_hack, encoding, = *arguments
- end
-
- output ||= $stdout
- indent ||= -1
- transitive = false if transitive.nil?
- ie_hack = false if ie_hack.nil?
- encoding ||= xml_decl.encoding
-
- if encoding != 'UTF-8' && !output.kind_of?(Output)
- output = Output.new( output, encoding )
+ def write( output=$stdout, indent=-1, transitive=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
@@ -255,20 +216,6 @@ module REXML
return @@entity_expansion_limit
end
- # Set the entity expansion limit. By default the limit is set to 10240.
- #
- # Deprecated. Use REXML.entity_expansion_text_limit= instead.
- def Document::entity_expansion_text_limit=( val )
- REXML.entity_expansion_text_limit = val
- end
-
- # Get the entity expansion limit. By default the limit is set to 10240.
- #
- # Deprecated. Use REXML.entity_expansion_text_limit instead.
- def Document::entity_expansion_text_limit
- return REXML.entity_expansion_text_limit
- end
-
attr_reader :entity_expansion_count
def record_entity_expansion
@@ -278,10 +225,6 @@ module REXML
end
end
- def document
- self
- end
-
private
def build( source )
Parsers::TreeParser.new( source, self ).parse
diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 616771fc0f..f999b0b2b1 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -20,7 +20,7 @@ module REXML
class Element < Parent
include Namespace
- UNDEFINED = "UNDEFINED"; # The default name
+ UNDEFINED = "UNDEFINED"; # The default name
# Mechanisms for accessing attributes and child elements of this
# element.
@@ -31,17 +31,17 @@ module REXML
# Constructor
# 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,
- # attributes, and namespaces will be copied. Children will +not+ be
- # copied.
+ # 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,
+ # attributes, and namespaces will be copied. Children will +not+ be
+ # copied.
# parent::
- # if supplied, must be a Parent, and will be used as
- # the parent of this object.
+ # if supplied, must be a Parent, and will be used as
+ # the parent of this object.
# context::
- # If supplied, must be a hash containing context items. Context items
- # include:
+ # If supplied, must be a hash containing context items. Context items
+ # include:
# * <tt>:respect_whitespace</tt> the value of this is :+all+ or an array of
# strings being the names of the elements to respect
# whitespace for. Defaults to :+all+.
@@ -297,7 +297,7 @@ module REXML
el = @elements.add(element)
attrs.each do |key, value|
el.attributes[key]=value
- end if attrs.kind_of? Hash
+ end if attrs.kind_of? Hash
el
end
@@ -667,7 +667,7 @@ module REXML
#
# Writes out this element, and recursively, all children.
# output::
- # output an object which supports '<< string'; this is where the
+ # output an object which supports '<< string'; this is where the
# document will be written.
# indent::
# An integer. If -1, no indenting will be used; otherwise, the
@@ -778,7 +778,7 @@ module REXML
else
return XPath::first( @element, index )
#{ |element|
- # return element if element.kind_of? Element
+ # return element if element.kind_of? Element
#}
#return nil
end
@@ -874,6 +874,7 @@ module REXML
# a.elements.add(Element.new('b')) #-> <a><b/></a>
# a.elements.add('c') #-> <a><b/><c/></a>
def add element=nil
+ rv = nil
if element.nil?
Element.new("", self, @element.context)
elsif not element.kind_of?(Element)
@@ -895,17 +896,17 @@ module REXML
# that XPaths are automatically filtered for Elements, so that
# non-Element children will not be yielded
# doc = Document.new '<a><b/><c/><d/>sean<b/><c/><d/></a>'
- # doc.root.elements.each {|e|p e} #-> Yields b, c, d, b, c, d elements
- # doc.root.elements.each('b') {|e|p e} #-> Yields b, b elements
- # doc.root.elements.each('child::node()') {|e|p e}
+ # doc.root.each {|e|p e} #-> Yields b, c, d, b, c, d elements
+ # doc.root.each('b') {|e|p e} #-> Yields b, b elements
+ # doc.root.each('child::node()') {|e|p e}
# #-> Yields <b/>, <c/>, <d/>, <b/>, <c/>, <d/>
# XPath.each(doc.root, 'child::node()', &block)
# #-> Yields <b/>, <c/>, <d/>, sean, <b/>, <c/>, <d/>
- def each( xpath=nil )
+ def each( xpath=nil, &block)
XPath::each( @element, xpath ) {|e| yield e if e.kind_of? Element }
end
- def collect( xpath=nil )
+ def collect( xpath=nil, &block )
collection = []
XPath::each( @element, xpath ) {|e|
collection << yield(e) if e.kind_of?(Element)
@@ -913,7 +914,7 @@ module REXML
collection
end
- def inject( xpath=nil, initial=nil )
+ def inject( xpath=nil, initial=nil, &block )
first = true
XPath::each( @element, xpath ) {|e|
if (e.kind_of? Element)
@@ -1086,12 +1087,12 @@ module REXML
# doc.root.attributes['foo'] = '4'
# doc.root.attributes['x:foo'] = nil
def []=( name, value )
- if value.nil? # Delete the named attribute
+ if value.nil? # Delete the named attribute
attr = get_attribute(name)
delete attr
return
end
-
+ element_document = @element.document
unless value.kind_of? Attribute
if @element.document and @element.document.doctype
value = Text::normalize( value, @element.document.doctype )
@@ -1116,8 +1117,8 @@ module REXML
value.prefix != "xmlns" and old_attr.prefix != "xmlns" and
@element.namespace( old_attr.prefix ) ==
@element.namespace( value.prefix )
- store value.name, { old_attr.prefix => old_attr,
- value.prefix => value }
+ store value.name, { old_attr.prefix => old_attr,
+ value.prefix => value }
else
store value.name, value
end
@@ -1196,7 +1197,7 @@ module REXML
return @element
else # the supplied attribute is a top-level one
attr = old
- super(name)
+ res = super(name)
end
@element
end
diff --git a/lib/rexml/encoding.rb b/lib/rexml/encoding.rb
index 1c7e79a124..3feffb80f4 100644
--- a/lib/rexml/encoding.rb
+++ b/lib/rexml/encoding.rb
@@ -1,50 +1,71 @@
-# coding: US-ASCII
+# -*- mode: ruby; ruby-indent-level: 2; indent-tabs-mode: t; tab-width: 2 -*- vim: sw=2 ts=2
module REXML
module Encoding
+ @encoding_methods = {}
+ def self.register(enc, &block)
+ @encoding_methods[enc] = block
+ end
+ def self.apply(obj, enc)
+ @encoding_methods[enc][obj]
+ end
+ def self.encoding_method(enc)
+ @encoding_methods[enc]
+ end
+
+ # Native, default format is UTF-8, so it is declared here rather than in
+ # an encodings/ definition.
+ UTF_8 = 'UTF-8'
+ UTF_16 = 'UTF-16'
+ UNILE = 'UNILE'
+
# ID ---> Encoding name
attr_reader :encoding
- def encoding=(encoding)
- encoding = encoding.name if encoding.is_a?(Encoding)
- if encoding.is_a?(String)
- original_encoding = encoding
- encoding = find_encoding(encoding)
- unless encoding
- raise ArgumentError, "Bad encoding name #{original_encoding}"
+ def encoding=( enc )
+ old_verbosity = $VERBOSE
+ begin
+ $VERBOSE = false
+ enc = enc.nil? ? nil : enc.upcase
+ return false if defined? @encoding and enc == @encoding
+ if enc and enc != UTF_8
+ @encoding = enc
+ raise ArgumentError, "Bad encoding name #@encoding" unless @encoding =~ /^[\w-]+$/
+ @encoding.untaint
+ begin
+ require 'rexml/encodings/ICONV.rb'
+ Encoding.apply(self, "ICONV")
+ rescue LoadError, Exception
+ begin
+ enc_file = File.join( "rexml", "encodings", "#@encoding.rb" )
+ require enc_file
+ Encoding.apply(self, @encoding)
+ rescue LoadError => err
+ puts err.message
+ raise ArgumentError, "No decoder found for encoding #@encoding. Please install iconv."
+ end
+ end
+ else
+ @encoding = UTF_8
+ require 'rexml/encodings/UTF-8.rb'
+ Encoding.apply(self, @encoding)
end
- end
- return false if defined?(@encoding) and encoding == @encoding
- if encoding
- @encoding = encoding.upcase
- else
- @encoding = 'UTF-8'
+ ensure
+ $VERBOSE = old_verbosity
end
true
end
- def encode(string)
- string.encode(@encoding)
- end
-
- def decode(string)
- string.encode(::Encoding::UTF_8, @encoding)
- end
-
- private
- def find_encoding(name)
- case name
- when /\Ashift-jis\z/i
- return "SHIFT_JIS"
- when /\ACP-(\d+)\z/
- name = "CP#{$1}"
- when /\AUTF-8\z/i
- return name
- end
- begin
- ::Encoding::Converter.search_convpath(name, 'UTF-8')
- rescue ::Encoding::ConverterNotFoundError
- return nil
+ def check_encoding str
+ # We have to recognize UTF-16, LSB UTF-16, and UTF-8
+ if str[0,2] == "\xfe\xff"
+ str[0,2] = ""
+ return UTF_16
+ elsif str[0,2] == "\xff\xfe"
+ str[0,2] = ""
+ return UNILE
end
- name
+ str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/m
+ return $3.upcase if $3
+ return UTF_8
end
end
end
diff --git a/lib/rexml/encodings/CP-1252.rb b/lib/rexml/encodings/CP-1252.rb
new file mode 100644
index 0000000000..587c5bdd68
--- /dev/null
+++ b/lib/rexml/encodings/CP-1252.rb
@@ -0,0 +1,103 @@
+#
+# This class was contributed by Mikko Tiihonen mikko DOT tiihonen AT hut DOT fi
+#
+module REXML
+ module Encoding
+ 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)
+ array_utf8 = content.unpack('U*')
+ array_enc = []
+ array_utf8.each do |num|
+ case num
+ # shortcut first bunch basic characters
+ when 0..0xFF; array_enc << num
+ # characters added compared to iso-8859-1
+ when 0x20AC; array_enc << 0x80 # 0xe2 0x82 0xac
+ when 0x201A; array_enc << 0x82 # 0xe2 0x82 0x9a
+ when 0x0192; array_enc << 0x83 # 0xc6 0x92
+ when 0x201E; array_enc << 0x84 # 0xe2 0x82 0x9e
+ when 0x2026; array_enc << 0x85 # 0xe2 0x80 0xa6
+ when 0x2020; array_enc << 0x86 # 0xe2 0x80 0xa0
+ when 0x2021; array_enc << 0x87 # 0xe2 0x80 0xa1
+ when 0x02C6; array_enc << 0x88 # 0xcb 0x86
+ when 0x2030; array_enc << 0x89 # 0xe2 0x80 0xb0
+ when 0x0160; array_enc << 0x8A # 0xc5 0xa0
+ when 0x2039; array_enc << 0x8B # 0xe2 0x80 0xb9
+ when 0x0152; array_enc << 0x8C # 0xc5 0x92
+ when 0x017D; array_enc << 0x8E # 0xc5 0xbd
+ when 0x2018; array_enc << 0x91 # 0xe2 0x80 0x98
+ when 0x2019; array_enc << 0x92 # 0xe2 0x80 0x99
+ when 0x201C; array_enc << 0x93 # 0xe2 0x80 0x9c
+ when 0x201D; array_enc << 0x94 # 0xe2 0x80 0x9d
+ when 0x2022; array_enc << 0x95 # 0xe2 0x80 0xa2
+ when 0x2013; array_enc << 0x96 # 0xe2 0x80 0x93
+ when 0x2014; array_enc << 0x97 # 0xe2 0x80 0x94
+ when 0x02DC; array_enc << 0x98 # 0xcb 0x9c
+ when 0x2122; array_enc << 0x99 # 0xe2 0x84 0xa2
+ when 0x0161; array_enc << 0x9A # 0xc5 0xa1
+ when 0x203A; array_enc << 0x9B # 0xe2 0x80 0xba
+ when 0x0152; array_enc << 0x9C # 0xc5 0x93
+ when 0x017E; array_enc << 0x9E # 0xc5 0xbe
+ when 0x0178; array_enc << 0x9F # 0xc5 0xb8
+ else
+ # all remaining basic characters can be used directly
+ if num <= 0xFF
+ array_enc << num
+ else
+ # Numeric entity (&#nnnn;); shard by Stefan Scholl
+ array_enc.concat "&\##{num};".unpack('C*')
+ end
+ end
+ end
+ array_enc.pack('C*')
+ end
+
+ # Convert to UTF-8
+ def decode_cp1252(str)
+ array_latin9 = str.unpack('C*')
+ array_enc = []
+ array_latin9.each do |num|
+ case num
+ # characters that added compared to iso-8859-1
+ when 0x80; array_enc << 0x20AC # 0xe2 0x82 0xac
+ when 0x82; array_enc << 0x201A # 0xe2 0x82 0x9a
+ when 0x83; array_enc << 0x0192 # 0xc6 0x92
+ when 0x84; array_enc << 0x201E # 0xe2 0x82 0x9e
+ when 0x85; array_enc << 0x2026 # 0xe2 0x80 0xa6
+ when 0x86; array_enc << 0x2020 # 0xe2 0x80 0xa0
+ when 0x87; array_enc << 0x2021 # 0xe2 0x80 0xa1
+ when 0x88; array_enc << 0x02C6 # 0xcb 0x86
+ when 0x89; array_enc << 0x2030 # 0xe2 0x80 0xb0
+ when 0x8A; array_enc << 0x0160 # 0xc5 0xa0
+ when 0x8B; array_enc << 0x2039 # 0xe2 0x80 0xb9
+ when 0x8C; array_enc << 0x0152 # 0xc5 0x92
+ when 0x8E; array_enc << 0x017D # 0xc5 0xbd
+ when 0x91; array_enc << 0x2018 # 0xe2 0x80 0x98
+ when 0x92; array_enc << 0x2019 # 0xe2 0x80 0x99
+ when 0x93; array_enc << 0x201C # 0xe2 0x80 0x9c
+ when 0x94; array_enc << 0x201D # 0xe2 0x80 0x9d
+ when 0x95; array_enc << 0x2022 # 0xe2 0x80 0xa2
+ when 0x96; array_enc << 0x2013 # 0xe2 0x80 0x93
+ when 0x97; array_enc << 0x2014 # 0xe2 0x80 0x94
+ when 0x98; array_enc << 0x02DC # 0xcb 0x9c
+ when 0x99; array_enc << 0x2122 # 0xe2 0x84 0xa2
+ when 0x9A; array_enc << 0x0161 # 0xc5 0xa1
+ when 0x9B; array_enc << 0x203A # 0xe2 0x80 0xba
+ when 0x9C; array_enc << 0x0152 # 0xc5 0x93
+ when 0x9E; array_enc << 0x017E # 0xc5 0xbe
+ when 0x9F; array_enc << 0x0178 # 0xc5 0xb8
+ else
+ array_enc << num
+ end
+ end
+ array_enc.pack('U*')
+ end
+ end
+end
diff --git a/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb
new file mode 100644
index 0000000000..db37b6bf0d
--- /dev/null
+++ b/lib/rexml/encodings/EUC-JP.rb
@@ -0,0 +1,35 @@
+module REXML
+ module Encoding
+ begin
+ require 'uconv'
+
+ def decode_eucjp(str)
+ Uconv::euctou8(str)
+ end
+
+ def encode_eucjp content
+ Uconv::u8toeuc(content)
+ end
+ rescue LoadError
+ require 'nkf'
+
+ EUCTOU8 = '-Ewm0'
+ U8TOEUC = '-Wem0'
+
+ def decode_eucjp(str)
+ NKF.nkf(EUCTOU8, str)
+ end
+
+ def encode_eucjp content
+ NKF.nkf(U8TOEUC, content)
+ end
+ end
+
+ register("EUC-JP") do |obj|
+ class << obj
+ alias decode decode_eucjp
+ alias encode encode_eucjp
+ end
+ end
+ end
+end
diff --git a/lib/rexml/encodings/ICONV.rb b/lib/rexml/encodings/ICONV.rb
new file mode 100644
index 0000000000..172fba7cd1
--- /dev/null
+++ b/lib/rexml/encodings/ICONV.rb
@@ -0,0 +1,22 @@
+require "iconv"
+raise LoadError unless defined? Iconv
+
+module REXML
+ module Encoding
+ def decode_iconv(str)
+ Iconv.conv(UTF_8, @encoding, str)
+ end
+
+ def encode_iconv(content)
+ Iconv.conv(@encoding, UTF_8, content)
+ end
+
+ register("ICONV") do |obj|
+ Iconv.conv(UTF_8, obj.encoding, nil)
+ class << obj
+ alias decode decode_iconv
+ alias encode encode_iconv
+ end
+ end
+ end
+end
diff --git a/lib/rexml/encodings/ISO-8859-1.rb b/lib/rexml/encodings/ISO-8859-1.rb
new file mode 100644
index 0000000000..2873d13bf0
--- /dev/null
+++ b/lib/rexml/encodings/ISO-8859-1.rb
@@ -0,0 +1,7 @@
+require 'rexml/encodings/US-ASCII'
+
+module REXML
+ module Encoding
+ register("ISO-8859-1", &encoding_method("US-ASCII"))
+ end
+end
diff --git a/lib/rexml/encodings/ISO-8859-15.rb b/lib/rexml/encodings/ISO-8859-15.rb
new file mode 100644
index 0000000000..08a19cb755
--- /dev/null
+++ b/lib/rexml/encodings/ISO-8859-15.rb
@@ -0,0 +1,72 @@
+#
+# This class was contributed by Mikko Tiihonen mikko DOT tiihonen AT hut DOT fi
+#
+module REXML
+ module Encoding
+ register("ISO-8859-15") do |o|
+ alias encode to_iso_8859_15
+ alias decode from_iso_8859_15
+ end
+
+ # Convert from UTF-8
+ def to_iso_8859_15(content)
+ array_utf8 = content.unpack('U*')
+ array_enc = []
+ array_utf8.each do |num|
+ case num
+ # shortcut first bunch basic characters
+ when 0..0xA3; array_enc << num
+ # characters removed compared to iso-8859-1
+ when 0xA4; array_enc << '&#164;'
+ when 0xA6; array_enc << '&#166;'
+ when 0xA8; array_enc << '&#168;'
+ when 0xB4; array_enc << '&#180;'
+ when 0xB8; array_enc << '&#184;'
+ when 0xBC; array_enc << '&#188;'
+ when 0xBD; array_enc << '&#189;'
+ when 0xBE; array_enc << '&#190;'
+ # characters added compared to iso-8859-1
+ when 0x20AC; array_enc << 0xA4 # 0xe2 0x82 0xac
+ when 0x0160; array_enc << 0xA6 # 0xc5 0xa0
+ when 0x0161; array_enc << 0xA8 # 0xc5 0xa1
+ when 0x017D; array_enc << 0xB4 # 0xc5 0xbd
+ when 0x017E; array_enc << 0xB8 # 0xc5 0xbe
+ when 0x0152; array_enc << 0xBC # 0xc5 0x92
+ when 0x0153; array_enc << 0xBD # 0xc5 0x93
+ when 0x0178; array_enc << 0xBE # 0xc5 0xb8
+ else
+ # all remaining basic characters can be used directly
+ if num <= 0xFF
+ array_enc << num
+ else
+ # Numeric entity (&#nnnn;); shard by Stefan Scholl
+ array_enc.concat "&\##{num};".unpack('C*')
+ end
+ end
+ end
+ array_enc.pack('C*')
+ end
+
+ # Convert to UTF-8
+ def from_iso_8859_15(str)
+ array_latin9 = str.unpack('C*')
+ array_enc = []
+ array_latin9.each do |num|
+ case num
+ # characters that differ compared to iso-8859-1
+ when 0xA4; array_enc << 0x20AC
+ when 0xA6; array_enc << 0x0160
+ when 0xA8; array_enc << 0x0161
+ when 0xB4; array_enc << 0x017D
+ when 0xB8; array_enc << 0x017E
+ when 0xBC; array_enc << 0x0152
+ when 0xBD; array_enc << 0x0153
+ when 0xBE; array_enc << 0x0178
+ else
+ array_enc << num
+ end
+ end
+ array_enc.pack('U*')
+ end
+ end
+end
diff --git a/lib/rexml/encodings/SHIFT-JIS.rb b/lib/rexml/encodings/SHIFT-JIS.rb
new file mode 100644
index 0000000000..9e0f4af20e
--- /dev/null
+++ b/lib/rexml/encodings/SHIFT-JIS.rb
@@ -0,0 +1,37 @@
+module REXML
+ module Encoding
+ begin
+ require 'uconv'
+
+ def decode_sjis content
+ Uconv::sjistou8(content)
+ end
+
+ def encode_sjis(str)
+ Uconv::u8tosjis(str)
+ end
+ rescue LoadError
+ require 'nkf'
+
+ SJISTOU8 = '-Swm0x'
+ U8TOSJIS = '-Wsm0x'
+
+ def decode_sjis(str)
+ NKF.nkf(SJISTOU8, str)
+ end
+
+ def encode_sjis content
+ NKF.nkf(U8TOSJIS, content)
+ end
+ end
+
+ b = proc do |obj|
+ class << obj
+ alias decode decode_sjis
+ alias encode encode_sjis
+ end
+ end
+ register("SHIFT-JIS", &b)
+ register("SHIFT_JIS", &b)
+ end
+end
diff --git a/lib/rexml/encodings/SHIFT_JIS.rb b/lib/rexml/encodings/SHIFT_JIS.rb
new file mode 100644
index 0000000000..e355704a7c
--- /dev/null
+++ b/lib/rexml/encodings/SHIFT_JIS.rb
@@ -0,0 +1 @@
+require 'rexml/encodings/SHIFT-JIS'
diff --git a/lib/rexml/encodings/UNILE.rb b/lib/rexml/encodings/UNILE.rb
new file mode 100644
index 0000000000..1a18f0c932
--- /dev/null
+++ b/lib/rexml/encodings/UNILE.rb
@@ -0,0 +1,34 @@
+module REXML
+ module Encoding
+ def encode_unile content
+ array_utf8 = content.unpack("U*")
+ array_enc = []
+ array_utf8.each do |num|
+ if ((num>>16) > 0)
+ array_enc << ??
+ array_enc << 0
+ else
+ array_enc << (num & 0xFF)
+ array_enc << (num >> 8)
+ end
+ end
+ array_enc.pack('C*')
+ end
+
+ def decode_unile(str)
+ array_enc=str.unpack('C*')
+ array_utf8 = []
+ 0.step(array_enc.size-1, 2){|i|
+ array_utf8 << (array_enc.at(i) + array_enc.at(i+1)*0x100)
+ }
+ array_utf8.pack('U*')
+ end
+
+ register(UNILE) do |obj|
+ class << obj
+ alias decode decode_unile
+ alias encode encode_unile
+ end
+ end
+ end
+end
diff --git a/lib/rexml/encodings/US-ASCII.rb b/lib/rexml/encodings/US-ASCII.rb
new file mode 100644
index 0000000000..fb4c217074
--- /dev/null
+++ b/lib/rexml/encodings/US-ASCII.rb
@@ -0,0 +1,30 @@
+module REXML
+ module Encoding
+ # Convert from UTF-8
+ def encode_ascii content
+ array_utf8 = content.unpack('U*')
+ array_enc = []
+ array_utf8.each do |num|
+ if num <= 0x7F
+ array_enc << num
+ else
+ # Numeric entity (&#nnnn;); shard by Stefan Scholl
+ array_enc.concat "&\##{num};".unpack('C*')
+ end
+ end
+ array_enc.pack('C*')
+ end
+
+ # Convert to UTF-8
+ def decode_ascii(str)
+ str.unpack('C*').pack('U*')
+ end
+
+ register("US-ASCII") do |obj|
+ class << obj
+ alias decode decode_ascii
+ alias encode encode_ascii
+ end
+ end
+ end
+end
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
new file mode 100644
index 0000000000..2ec058eed5
--- /dev/null
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -0,0 +1,35 @@
+module REXML
+ module Encoding
+ def encode_utf16 content
+ array_utf8 = content.unpack("U*")
+ array_enc = []
+ array_utf8.each do |num|
+ if ((num>>16) > 0)
+ array_enc << 0
+ array_enc << ??
+ else
+ array_enc << (num >> 8)
+ array_enc << (num & 0xFF)
+ end
+ end
+ array_enc.pack('C*')
+ end
+
+ def decode_utf16(str)
+ str = str[2..-1] if /^\376\377/n =~ str
+ array_enc=str.unpack('C*')
+ array_utf8 = []
+ 0.step(array_enc.size-1, 2){|i|
+ array_utf8 << (array_enc.at(i+1) + array_enc.at(i)*0x100)
+ }
+ array_utf8.pack('U*')
+ end
+
+ register(UTF_16) do |obj|
+ class << obj
+ alias decode decode_utf16
+ alias encode encode_utf16
+ end
+ end
+ end
+end
diff --git a/lib/rexml/encodings/UTF-8.rb b/lib/rexml/encodings/UTF-8.rb
new file mode 100644
index 0000000000..bb08f44100
--- /dev/null
+++ b/lib/rexml/encodings/UTF-8.rb
@@ -0,0 +1,18 @@
+module REXML
+ module Encoding
+ def encode_utf8 content
+ content
+ end
+
+ def decode_utf8(str)
+ str
+ end
+
+ register(UTF_8) do |obj|
+ class << obj
+ alias decode decode_utf8
+ alias encode encode_utf8
+ end
+ end
+ end
+end
diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb
index d10b051f18..3d81fbc738 100644
--- a/lib/rexml/entity.rb
+++ b/lib/rexml/entity.rb
@@ -138,14 +138,8 @@ module REXML
matches = @value.scan(PEREFERENCE_RE)
rv = @value.clone
if @parent
- sum = 0
matches.each do |entity_reference|
entity_value = @parent.entity( entity_reference[0] )
- if sum + entity_value.bytesize > Document.entity_expansion_text_limit
- raise "entity expansion has grown too large"
- else
- sum += entity_value.bytesize
- end
rv.gsub!( /%#{entity_reference.join};/um, entity_value )
end
end
@@ -157,7 +151,6 @@ module REXML
# This is a set of entity constants -- the ones defined in the XML
# specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+.
- # CAUTION: these entities does not have parent and document
module EntityConst
# +>+
GT = Entity.new( 'gt', '>' )
diff --git a/lib/rexml/formatters/default.rb b/lib/rexml/formatters/default.rb
index 574c821f96..db44453e1e 100644
--- a/lib/rexml/formatters/default.rb
+++ b/lib/rexml/formatters/default.rb
@@ -22,7 +22,7 @@ module REXML
case node
when Document
- if node.xml_decl.encoding != 'UTF-8' && !output.kind_of?(Output)
+ if node.xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
output = Output.new( output, node.xml_decl.encoding )
end
write_document( node, output )
diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb
index 63f726e8c3..dc4e8026b0 100644
--- a/lib/rexml/formatters/pretty.rb
+++ b/lib/rexml/formatters/pretty.rb
@@ -126,13 +126,11 @@ module REXML
end
def wrap(string, width)
- parts = []
- while string.length > width and place = string.rindex(' ', width)
- parts << string[0...place]
- string = string[place+1..-1]
- end
- parts << string
- parts.join("\n")
+ # 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
end
diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb
index 6cc690d922..3a52e03f01 100644
--- a/lib/rexml/formatters/transitive.rb
+++ b/lib/rexml/formatters/transitive.rb
@@ -37,6 +37,7 @@ module REXML
# If compact and all children are text, and if the formatted output
# is less than the specified width, then try to print everything on
# one line
+ skip = false
@level += @indentation
node.children.each { |child|
write( child, output )
diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb
index 20c8961aee..2d30e5fe92 100644
--- a/lib/rexml/functions.rb
+++ b/lib/rexml/functions.rb
@@ -28,7 +28,6 @@ module REXML
end
end
- # Returns the last node of the given list of nodes.
def Functions::last( )
@@context[:size]
end
@@ -37,7 +36,6 @@ module REXML
@@context[:index]
end
- # Returns the size of the given list of nodes.
def Functions::count( node_set )
node_set.size
end
@@ -131,11 +129,6 @@ module REXML
end
end
- # A node-set is converted to a string by
- # returning the concatenation of the string-value
- # of each of the children of the node in the
- # node-set that is first in document order.
- # If the node-set is empty, an empty string is returned.
def Functions::string_value( o )
rv = ""
o.children.each { |e|
@@ -177,6 +170,7 @@ module REXML
# Kouhei fixed this too
def Functions::substring_after( string, test )
ruby_string = string(string)
+ test_string = string(test)
return $1 if ruby_string =~ /#{test}(.*)/
""
end
diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb
index b33f78f7ce..c8701f3abb 100644
--- a/lib/rexml/light/node.rb
+++ b/lib/rexml/light/node.rb
@@ -2,12 +2,12 @@ require 'rexml/xmltokens'
# [ :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 << "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
@@ -40,7 +40,7 @@ module REXML
end
end
- def each
+ def each( &block )
size.times { |x| yield( at(x+4) ) }
end
diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb
index cab6e9fddb..85457f1ad0 100644
--- a/lib/rexml/node.rb
+++ b/lib/rexml/node.rb
@@ -36,12 +36,12 @@ module REXML
end
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
+ 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
def parent?
diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb
index 0c6cc7a7f8..b7f17b9dff 100644
--- a/lib/rexml/output.rb
+++ b/lib/rexml/output.rb
@@ -10,12 +10,7 @@ module REXML
@output = real_IO
self.encoding = encd
- @to_utf = encoding != 'UTF-8'
-
- if encoding == "UTF-16"
- @output << "\ufeff".encode("UTF-16BE")
- self.encoding = "UTF-16BE"
- end
+ @to_utf = encd == UTF_8 ? false : true
end
def <<( content )
diff --git a/lib/rexml/parseexception.rb b/lib/rexml/parseexception.rb
index 0c4d55abda..0481f72818 100644
--- a/lib/rexml/parseexception.rb
+++ b/lib/rexml/parseexception.rb
@@ -28,7 +28,7 @@ module REXML
err << "\nLine: #{line}\n"
err << "Position: #{position}\n"
err << "Last 80 unconsumed characters:\n"
- err << @source.buffer[0..80].force_encoding("ASCII-8BIT").gsub(/\n/, ' ')
+ err << @source.buffer[0..80].gsub(/\n/, ' ')
end
err
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index a88896c5db..ade35d7921 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -114,10 +114,22 @@ module REXML
def initialize( source )
self.stream = source
- @listeners = []
end
def add_listener( listener )
+ if !defined?(@listeners) or !@listeners
+ @listeners = []
+ instance_eval <<-EOL
+ alias :_old_pull :pull
+ def pull
+ event = _old_pull
+ @listeners.each do |listener|
+ listener.receive event
+ end
+ event
+ end
+ EOL
+ end
@listeners << listener
end
@@ -180,14 +192,6 @@ module REXML
# Returns the next event. This is a +PullEvent+ object.
def pull
- pull_event.tap do |event|
- @listeners.each do |listener|
- listener.receive event
- end
- end
- end
-
- def pull_event
if @closed
x, @closed = @closed, nil
return [ :end_element, x ]
@@ -212,12 +216,7 @@ module REXML
version = version[1] unless version.nil?
encoding = ENCODING.match(results)
encoding = encoding[1] unless encoding.nil?
- if need_source_encoding_update?(encoding)
- @source.encoding = encoding
- end
- if encoding.nil? and /\AUTF-16(?:BE|LE)\z/i =~ @source.encoding
- encoding = "UTF-16"
- end
+ @source.encoding = encoding
standalone = STANDALONE.match(results)
standalone = standalone[1] unless standalone.nil?
return [ :xmldecl, version, encoding, standalone ]
@@ -250,7 +249,9 @@ module REXML
@source.read if @source.buffer.size<2
md = @source.match(/\s*/um, true)
if @source.encoding == "UTF-8"
- @source.buffer.force_encoding(::Encoding::UTF_8)
+ if @source.buffer.respond_to? :force_encoding
+ @source.buffer.force_encoding(Encoding::UTF_8)
+ end
end
end
end
@@ -347,7 +348,7 @@ module REXML
md = @source.match( COMMENT_PATTERN, true )
case md[1]
- when /--/, /-\z/
+ when /--/, /-$/
raise REXML::ParseException.new("Malformed comment", @source)
end
@@ -378,31 +379,31 @@ 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 do |attr_name, prefix, local_part, quote, value|
- if prefix == "xmlns"
- if local_part == "xml"
- if value != "http://www.w3.org/XML/1998/namespace"
+ attrs.each { |a,b,c,d,e|
+ if b == "xmlns"
+ if c == "xml"
+ if d != "http://www.w3.org/XML/1998/namespace"
msg = "The 'xml' prefix must not be bound to any other namespace "+
"(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
raise REXML::ParseException.new( msg, @source, self )
end
- elsif local_part == "xmlns"
+ elsif c == "xmlns"
msg = "The 'xmlns' prefix must not be declared "+
"(http://www.w3.org/TR/REC-xml-names/#ns-decl)"
raise REXML::ParseException.new( msg, @source, self)
end
- curr_ns << local_part
- elsif prefix
- prefixes << prefix unless prefix == "xml"
+ curr_ns << c
+ elsif b
+ prefixes << b unless b == "xml"
end
- if attributes.has_key?(attr_name)
- msg = "Duplicate attribute #{attr_name.inspect}"
- raise REXML::ParseException.new(msg, @source, self)
+ if attributes.has_key? a
+ msg = "Duplicate attribute #{a.inspect}"
+ raise REXML::ParseException.new( msg, @source, self)
end
- attributes[attr_name] = value
- end
+ attributes[a] = e
+ }
end
# Verify that all of the prefixes have been defined
@@ -441,7 +442,6 @@ module REXML
end
return [ :dummy ]
end
- private :pull_event
def entity( reference, entities )
value = nil
@@ -498,13 +498,6 @@ module REXML
end
rv
end
-
- private
- def need_source_encoding_update?(xml_declaration_encoding)
- return false if xml_declaration_encoding.nil?
- return false if /\AUTF-16\z/i =~ xml_declaration_encoding
- true
- end
end
end
end
diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb
index 81041681c2..ca9692c449 100644
--- a/lib/rexml/parsers/lightparser.rb
+++ b/lib/rexml/parsers/lightparser.rb
@@ -44,10 +44,10 @@ module REXML
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
+ # 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 ]
diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb
index 0661af37aa..d0f0c5155e 100644
--- a/lib/rexml/parsers/sax2parser.rb
+++ b/lib/rexml/parsers/sax2parser.rb
@@ -28,15 +28,15 @@ module REXML
# Listen arguments:
#
# Symbol, Array, Block
- # Listen to Symbol events on Array elements
+ # Listen to Symbol events on Array elements
# Symbol, Block
# Listen to Symbol events
# Array, Listener
- # Listen to all events on Array elements
+ # Listen to all events on Array elements
# Array, Block
- # Listen to :start_element events on Array elements
+ # Listen to :start_element events on Array elements
# Listener
- # Listen to All events
+ # Listen to All events
#
# Symbol can be one of: :start_element, :end_element,
# :start_prefix_mapping, :end_prefix_mapping, :characters,
@@ -87,7 +87,7 @@ module REXML
@listeners.each { |sym,match,block|
block.start_document if sym == :start_document or sym.nil?
}
- context = []
+ root = context = []
while true
event = @parser.pull
case event[0]
diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb
index 7dd8172802..96c55d837e 100644
--- a/lib/rexml/parsers/ultralightparser.rb
+++ b/lib/rexml/parsers/ultralightparser.rb
@@ -42,10 +42,10 @@ module REXML
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
+ # 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 ]
diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb
index e643d11511..a37dbdd4b6 100644
--- a/lib/rexml/parsers/xpathparser.rb
+++ b/lib/rexml/parsers/xpathparser.rb
@@ -283,6 +283,7 @@ module REXML
PI = /^processing-instruction\(/
def NodeTest path, parsed
#puts "NodeTest with #{path}"
+ res = nil
case path
when /^\*/
path = $'
@@ -578,6 +579,7 @@ module REXML
NUMBER = /^(\d*\.?\d+)/
NT = /^comment|text|processing-instruction|node$/
def PrimaryExpr path, parsed
+ arry = []
case path
when VARIABLE_REFERENCE
varname = $1
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
index 9bec2158dd..3ad8023470 100644
--- a/lib/rexml/quickpath.rb
+++ b/lib/rexml/quickpath.rb
@@ -6,8 +6,6 @@ module REXML
include Functions
include XMLTokens
- # A base Hash object to be used when initializing a
- # default empty namespaces set.
EMPTY_HASH = {}
def QuickPath::first element, path, namespaces=EMPTY_HASH
@@ -35,6 +33,7 @@ module REXML
results = filter(element.to_a, path)
when /^[\[!\w:]/u
# match on child
+ matches = []
children = element.to_a
results = filter(children, path)
else
@@ -49,20 +48,22 @@ module REXML
def QuickPath::filter elements, path
return elements if path.nil? or path == '' or elements.size == 0
case path
- when /^\/\//u # Descendant
+ when /^\/\//u # Descendant
return axe( elements, "descendant-or-self", $' )
- when /^\/?\b(\w[-\w]*)\b::/u # Axe
+ when /^\/?\b(\w[-\w]*)\b::/u # Axe
+ axe_name = $1
+ rest = $'
return axe( elements, $1, $' )
- when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u # Child
+ 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
+ when /^\/?(\w[-\w]*)\(/u # / Function
return function( elements, $1, $' )
- when Namespace::NAMESPLIT # Element name
+ when Namespace::NAMESPLIT # Element name
name = $2
ns = $1
rest = $'
@@ -79,22 +80,22 @@ module REXML
matches |= predicate( element.to_a, path[1..-1] ) if element.kind_of? Element
end
return matches
- when /^\[/u # Predicate
+ when /^\[/u # Predicate
return predicate( elements, path )
- when /^\/?\.\.\./u # Ancestor
+ when /^\/?\.\.\./u # Ancestor
return axe( elements, "ancestor", $' )
- when /^\/?\.\./u # Parent
+ when /^\/?\.\./u # Parent
return filter( elements.collect{|e|e.parent}, $' )
- when /^\/?\./u # Self
+ when /^\/?\./u # Self
return filter( elements, $' )
- when /^\*/u # Any
+ 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, $' )
+ # children = element.to_a
+ # children.delete_if { |child| !child.kind_of?(Element) }
+ # results |= filter( children, $' )
#end
end
return results
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index bc59a30c64..f89951171a 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -28,16 +28,4 @@ module REXML
Copyright = COPYRIGHT
Version = VERSION
-
- @@entity_expansion_text_limit = 10_240
-
- # Set the entity expansion limit. By default the limit is set to 10240.
- def self.entity_expansion_text_limit=( val )
- @@entity_expansion_text_limit = val
- end
-
- # Get the entity expansion limit. By default the limit is set to 10240.
- def self.entity_expansion_text_limit
- return @@entity_expansion_text_limit
- end
end
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index b653714b2f..1206150b16 100644
--- a/lib/rexml/source.rb
+++ b/lib/rexml/source.rb
@@ -1,4 +1,3 @@
-# coding: US-ASCII
require 'rexml/encoding'
module REXML
@@ -44,7 +43,7 @@ module REXML
if encoding
self.encoding = encoding
else
- detect_encoding
+ self.encoding = check_encoding( @buffer )
end
@line = 0
end
@@ -54,7 +53,16 @@ module REXML
# Overridden to support optimized en/decoding
def encoding=(enc)
return unless super
- encoding_updated
+ @line_break = encode( '>' )
+ if enc != UTF_8
+ @buffer = decode(@buffer)
+ @to_utf = true
+ else
+ @to_utf = false
+ if @buffer.respond_to? :force_encoding
+ @buffer.force_encoding Encoding::UTF_8
+ end
+ end
end
# Scans the source for a given pattern. Note, that this is not your
@@ -119,38 +127,6 @@ module REXML
res = res[-1] if res.kind_of? Array
lines.index( res ) if res
end
-
- private
- def detect_encoding
- buffer_encoding = @buffer.encoding
- detected_encoding = "UTF-8"
- begin
- @buffer.force_encoding("ASCII-8BIT")
- if @buffer[0, 2] == "\xfe\xff"
- @buffer[0, 2] = ""
- detected_encoding = "UTF-16BE"
- elsif @buffer[0, 2] == "\xff\xfe"
- @buffer[0, 2] = ""
- detected_encoding = "UTF-16LE"
- elsif @buffer[0, 3] == "\xef\xbb\xbf"
- @buffer[0, 3] = ""
- detected_encoding = "UTF-8"
- end
- ensure
- @buffer.force_encoding(buffer_encoding)
- end
- self.encoding = detected_encoding
- end
-
- def encoding_updated
- if @encoding != 'UTF-8'
- @buffer = decode(@buffer)
- @to_utf = true
- else
- @to_utf = false
- @buffer.force_encoding ::Encoding::UTF_8
- end
- end
end
# A Source that wraps an IO. See the Source class for method
@@ -162,13 +138,30 @@ module REXML
def initialize(arg, block_size=500, encoding=nil)
@er_source = @source = arg
@to_utf = false
- @pending_buffer = nil
+ # Determining the encoding is a deceptively difficult issue to resolve.
+ # First, we check the first two bytes for UTF-16. Then we
+ # assume that the encoding is at least ASCII enough for the '>', and
+ # we read until we get one of those. This gives us the XML declaration,
+ # if there is one. If there isn't one, the file MUST be UTF-8, as per
+ # the XML spec. If there is one, we can determine the encoding from
+ # it.
+ @buffer = ""
+ str = @source.read( 2 ) || ''
if encoding
- super("", encoding)
+ self.encoding = encoding
+ elsif str[0,2] == "\xfe\xff"
+ @line_break = "\000>"
+ elsif str[0,2] == "\xff\xfe"
+ @line_break = ">\000"
+ elsif str[0,2] == "\xef\xbb"
+ str += @source.read(1)
+ str = '' if (str[2,1] == "\xBF")
+ @line_break = ">"
else
- super(@source.read(3) || "")
+ @line_break = ">"
end
+ super( @source.eof? ? str : str+@source.readline( @line_break ) )
if !@to_utf and
@buffer.respond_to?(:force_encoding) and
@@ -263,14 +256,6 @@ module REXML
private
def readline
str = @source.readline(@line_break)
- if @pending_buffer
- if str.nil?
- str = @pending_buffer
- else
- str = @pending_buffer + str
- end
- @pending_buffer = nil
- end
return nil if str.nil?
if @to_utf
@@ -280,17 +265,5 @@ module REXML
str
end
end
-
- def encoding_updated
- case @encoding
- when "UTF-16BE", "UTF-16LE"
- @source.binmode
- @source.set_encoding(@encoding)
- end
- @line_break = encode(">")
- @pending_buffer, @buffer = @buffer, ""
- @pending_buffer.force_encoding(@encoding)
- super
- end
end
end
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index 7b00b0f104..6623c0c03b 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -1,4 +1,3 @@
-require 'rexml/rexml'
require 'rexml/entity'
require 'rexml/doctype'
require 'rexml/child'
@@ -381,35 +380,25 @@ module REXML
# Unescapes all possible entities
def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
- sum = 0
string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
- s = Text.expand($&, doctype, filter)
- if sum + s.bytesize > REXML.entity_expansion_text_limit
- raise "entity expansion has grown too large"
+ ref = $&
+ if ref[1] == ?#
+ if ref[2] == ?x
+ [ref[3...-1].to_i(16)].pack('U*')
+ else
+ [ref[2...-1].to_i].pack('U*')
+ end
+ elsif ref == '&amp;'
+ '&'
+ elsif filter and filter.include?( ref[1...-1] )
+ ref
+ elsif doctype
+ doctype.entity( ref[1...-1] ) or ref
else
- sum += s.bytesize
+ entity_value = DocType::DEFAULT_ENTITIES[ ref[1...-1] ]
+ entity_value ? entity_value.value : ref
end
- s
}
end
-
- def Text.expand(ref, doctype, filter)
- if ref[1] == ?#
- if ref[2] == ?x
- [ref[3...-1].to_i(16)].pack('U*')
- else
- [ref[2...-1].to_i].pack('U*')
- 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
- end
- end
end
end
diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb
index 8042e5d062..f0ffa78912 100644
--- a/lib/rexml/validation/validation.rb
+++ b/lib/rexml/validation/validation.rb
@@ -33,7 +33,7 @@ module REXML
sattr = [:start_attribute, nil]
eattr = [:end_attribute]
text = [:text, nil]
- k, = event[2].find { |key,value|
+ k,v = event[2].find { |key,value|
sattr[1] = key
#puts "Looking for #{sattr.inspect}"
m = @current.next( sattr )
diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb
index 465e6abeb7..361e4b7106 100644
--- a/lib/rexml/xmldecl.rb
+++ b/lib/rexml/xmldecl.rb
@@ -46,7 +46,11 @@ module REXML
def write(writer, indent=-1, transitive=false, ie_hack=false)
return nil unless @writethis or writer.kind_of? Output
writer << START.sub(/\\/u, '')
- writer << " #{content encoding}"
+ if writer.kind_of? Output
+ writer << " #{content writer.encoding}"
+ else
+ writer << " #{content encoding}"
+ end
writer << STOP.sub(/\\/u, '')
end
@@ -107,7 +111,7 @@ module REXML
private
def content(enc)
rv = "version='#@version'"
- rv << " encoding='#{enc}'" if @writeencoding || enc !~ /\Autf-8\z/i
+ rv << " encoding='#{enc}'" if @writeencoding || enc !~ /utf-8/i
rv << " standalone='#@standalone'" if @standalone
rv
end
diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
index 0f99808def..5f7ecefe29 100644
--- a/lib/rexml/xpath.rb
+++ b/lib/rexml/xpath.rb
@@ -5,19 +5,16 @@ module REXML
# Wrapper class. Use this class to access the XPath functions.
class XPath
include Functions
- # A base Hash object, supposing to be used when initializing a
- # default empty namespaces set, but is currently unused.
- # TODO: either set the namespaces=EMPTY_HASH, or deprecate this.
EMPTY_HASH = {}
# Finds and returns the first node that matches the supplied xpath.
# element::
- # The context element
+ # The context element
# path::
- # The xpath to search for. If not supplied or nil, returns the first
- # node matching '*'.
+ # 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.
+ # 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
@@ -45,7 +42,7 @@ module REXML
# path::
# The xpath to search for. If not supplied or nil, defaults to '*'
# namespaces::
- # If supplied, a Hash which defines a namespace mapping
+ # 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
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index 0fc9da2e08..d9088a25d9 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -5,30 +5,20 @@ require 'rexml/syncenumerator'
require 'rexml/parsers/xpathparser'
class Object
- # provides a unified +clone+ operation, for REXML::XPathParser
- # to use across multiple Object types
def dclone
clone
end
end
class Symbol
- # provides a unified +clone+ operation, for REXML::XPathParser
- # to use across multiple Object types
def dclone ; self ; end
end
class Fixnum
- # provides a unified +clone+ operation, for REXML::XPathParser
- # to use across multiple Object types
def dclone ; self ; end
end
class Float
- # provides a unified +clone+ operation, for REXML::XPathParser
- # to use across multiple Object types
def dclone ; self ; end
end
class Array
- # provides a unified +clone+ operation, for REXML::XPathParser
- # to use across multiple Object+ types
def dclone
klone = self.clone
klone.clear
@@ -697,7 +687,7 @@ module REXML
return rv
else
res = []
- SyncEnumerator.new( set1, set2 ).each { |i1, i2|
+ enum = SyncEnumerator.new( set1, set2 ).each { |i1, i2|
#puts "i1 = #{i1.inspect} (#{i1.class.name})"
#puts "i2 = #{i2.inspect} (#{i2.class.name})"
i1 = norm( i1 )
diff --git a/lib/rinda/.document b/lib/rinda/.document
new file mode 100644
index 0000000000..598977af68
--- /dev/null
+++ b/lib/rinda/.document
@@ -0,0 +1,3 @@
+rinda.rb
+ring.rb
+tuplespace.rb
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 8a2a201c8a..b25fd99856 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -43,10 +43,10 @@ module Rinda
def write_service
Thread.new do
- loop do
- msg = @soc.recv(1024)
- do_write(msg)
- end
+ loop do
+ msg = @soc.recv(1024)
+ do_write(msg)
+ end
end
end
@@ -56,11 +56,11 @@ module Rinda
def do_write(msg)
Thread.new do
- begin
- tuple, sec = Marshal.load(msg)
- @ts.write(tuple, sec)
- rescue
- end
+ begin
+ tuple, sec = Marshal.load(msg)
+ @ts.write(tuple, sec)
+ rescue
+ end
end
end
@@ -69,9 +69,9 @@ module Rinda
def reply_service
Thread.new do
- loop do
- do_reply
- end
+ loop do
+ do_reply
+ end
end
end
@@ -105,8 +105,8 @@ module Rinda
def self.finger
unless @@finger
- @@finger = self.new
- @@finger.lookup_ring_any
+ @@finger = self.new
+ @@finger.lookup_ring_any
end
@@finger
end
@@ -178,15 +178,15 @@ module Rinda
msg = Marshal.dump([[:lookup_ring, DRbObject.new(block)], timeout])
@broadcast_list.each do |it|
- soc = UDPSocket.open
- begin
- soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
- soc.send(msg, 0, it, @port)
- rescue
- nil
- ensure
- soc.close
- end
+ soc = UDPSocket.open
+ begin
+ soc.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+ soc.send(msg, 0, it, @port)
+ rescue
+ nil
+ ensure
+ soc.close
+ end
end
sleep(timeout)
end
@@ -198,22 +198,18 @@ module Rinda
def lookup_ring_any(timeout=5)
queue = Queue.new
- Thread.new do
- self.lookup_ring(timeout) do |ts|
- queue.push(ts)
- end
- queue.push(nil)
+ th = Thread.new do
+ self.lookup_ring(timeout) do |ts|
+ queue.push(ts)
+ end
+ queue.push(nil)
+ while it = queue.pop
+ @rings.push(it)
+ end
end
@primary = queue.pop
raise('RingNotFound') if @primary.nil?
-
- Thread.new do
- while it = queue.pop
- @rings.push(it)
- end
- end
-
@primary
end
@@ -256,7 +252,7 @@ if __FILE__ == $0
when 's'
require 'rinda/tuplespace'
ts = Rinda::TupleSpace.new
- Rinda::RingServer.new(ts)
+ place = Rinda::RingServer.new(ts)
$stdin.gets
when 'w'
finger = Rinda::RingFinger.new(nil)
diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
index e2b983d2a1..113aa0de15 100644
--- a/lib/rinda/tuplespace.rb
+++ b/lib/rinda/tuplespace.rb
@@ -76,7 +76,7 @@ module Rinda
# Reset the expiry time according to +sec_or_renewer+.
#
# +nil+:: it is set to expire in the far future.
- # +true+:: it has expired.
+ # +false+:: it has expired.
# Numeric:: it will expire in that many seconds.
#
# Otherwise the argument refers to some kind of renewer object
@@ -305,7 +305,7 @@ module Rinda
@bin.delete_at(idx) if idx
end
- def find
+ def find(&blk)
@bin.reverse_each do |x|
return x if yield(x)
end
diff --git a/lib/rss.rb b/lib/rss.rb
index fd7364645b..a1d0f76ba1 100644
--- a/lib/rss.rb
+++ b/lib/rss.rb
@@ -1,80 +1,8 @@
-##
-# = RSS reading and writing
+# Copyright (c) 2003-2007 Kouhei Sutou. You can redistribute it and/or
+# modify it under the same terms as Ruby.
#
-# Really Simple Syndication (RSS) is a family of formats that describe 'feeds,'
-# specially constructed XML documents that allow an interested person to
-# subscribe and receive updates from a particular web service. This portion of
-# the standard library provides tooling to read and create these feeds.
-#
-# The standard library supports RSS 0.91, 1.0, 2.0, and Atom, a related format.
-# Here are some links to the standards documents for these formats:
-#
-# * RSS
-# * 0.9.1[http://www.rssboard.org/rss-0-9-1-netscape]
-# * 1.0[http://web.resource.org/rss/1.0/]
-# * 2.0[http://www.rssboard.org/rss-specification]
-# * Atom[http://tools.ietf.org/html/rfc4287]
-#
-# == Consuming RSS
-#
-# If you'd like to read someone's RSS feed with your Ruby code, you've come to
-# the right place. It's really easy to do this, but we'll need the help of
-# open-uri:
-#
-# require 'rss'
-# require 'open-uri'
-#
-# url = 'http://www.ruby-lang.org/en/feeds/news.rss'
-# open(url) do |rss|
-# feed = RSS::Parser.parse(rss)
-# puts "Title: #{feed.channel.title}"
-# feed.items.each do |item|
-# puts "Item: #{item.title}"
-# end
-# end
-#
-# As you can see, the workhorse is RSS::Parser#parse, which takes the source of
-# the feed and a parameter that performs validation on the feed. We get back an
-# object that has all of the data from our feed, accessible through methods.
-# This example shows getting the title out of the channel element, and looping
-# through the list of items.
-#
-# == Producing RSS
-#
-# Producing our own RSS feeds is easy as well. Let's make a very basic feed:
-#
-# require "rss"
-#
-# rss = RSS::Maker.make("atom") do |maker|
-# maker.channel.author = "matz"
-# maker.channel.updated = Time.now.to_s
-# maker.channel.about = "http://www.ruby-lang.org/en/feeds/news.rss"
-# maker.channel.title = "Example Feed"
-#
-# maker.items.new_item do |item|
-# item.link = "http://www.ruby-lang.org/en/news/2010/12/25/ruby-1-9-2-p136-is-released/"
-# item.title = "Ruby 1.9.2-p136 is released"
-# item.updated = Time.now.to_s
-# end
-# end
-#
-# puts rss
-#
-# As you can see, this is a very Builder-like DSL. This code will spit out an
-# Atom feed with one item. If we needed a second item, we'd make another block
-# with maker.items.new_item and build a second one.
-#
-# == Copyright
-#
-# Copyright (c) 2003-2007 Kouhei Sutou <kou@cozmixng.org>
-#
-# You can redistribute it and/or modify it under the same terms as Ruby.
-#
-# There is an additional tutorial by the author of RSS at:
-# http://www.cozmixng.org/~rwiki/?cmd=view;name=RSS+Parser%3A%3ATutorial.en
-
-module RSS
-end
+# Author:: Kouhei Sutou <kou@cozmixng.org>
+# Tutorial:: http://www.cozmixng.org/~rwiki/?cmd=view;name=RSS+Parser%3A%3ATutorial.en
require 'rss/1.0'
require 'rss/2.0'
diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb
index fc16a381c1..ff8ff2249a 100644
--- a/lib/rss/atom.rb
+++ b/lib/rss/atom.rb
@@ -1,24 +1,8 @@
require 'rss/parser'
module RSS
- ##
- # Atom is an XML-based document format that is used to describe 'feeds' of related information.
- # A typical use is in a news feed where the information is periodically updated and which users
- # can subscribe to. The Atom format is described in http://tools.ietf.org/html/rfc4287
- #
- # The Atom module provides support in reading and creating feeds.
- #
- # See the RSS module for examples consuming and creating feeds
module Atom
-
- ##
- # The Atom URI W3C Namespace
-
URI = "http://www.w3.org/2005/Atom"
-
- ##
- # The XHTML URI W3C Namespace
-
XHTML_URI = "http://www.w3.org/1999/xhtml"
module CommonModel
@@ -90,10 +74,6 @@ module RSS
end
end
- # The TextConstruct module is used to define a Text construct Atom element,
- # which is used to store small quantities of human-readable text
- #
- # The TextConstruct has a type attribute, e.g. text, html, xhtml
module TextConstruct
def self.append_features(klass)
super
@@ -120,7 +100,6 @@ module RSS
end
attr_writer :xhtml
-
def xhtml
return @xhtml if @xhtml.nil?
if @xhtml.is_a?(XML::Element) and
@@ -134,7 +113,6 @@ module RSS
{"xmlns" => XHTML_URI}, children)
end
- # Returns true if type is "xhtml"
def have_xml_content?
@type == "xhtml"
end
@@ -162,13 +140,7 @@ module RSS
end
end
- # The PersonConstruct module is used to define a Person Atom element that can be
- # used to describe a person, corporation, or similar entity
- #
- # The PersonConstruct has a Name, Uri, and Email child elements
module PersonConstruct
-
- # Adds attributes for name, uri, and email to the +klass+
def self.append_features(klass)
super
klass.class_eval do
@@ -186,30 +158,22 @@ module RSS
target.__send__("new_#{self.class.name.split(/::/).last.downcase}")
end
- # The name of the person or entity
class Name < RSS::Element
include CommonModel
include ContentModel
end
- # The URI of the person or entity
class Uri < RSS::Element
include CommonModel
include URIContentModel
end
- # The email of the person or entity
class Email < RSS::Element
include CommonModel
include ContentModel
end
end
- # Element used to describe an Atom date and time in the ISO 8601 format
- #
- # Examples:
- # * 2013-03-04T15:30:02Z
- # * 2013-03-04T10:30:02-05:00
module DateConstruct
def self.append_features(klass)
super
@@ -219,17 +183,12 @@ module RSS
end
end
- # Raises NotAvailableValueError if element content is nil
def atom_validate(ignore_unknown_element, tags, uri)
raise NotAvailableValueError.new(tag_name, "") if content.nil?
end
end
module DuplicateLinkChecker
- # Checks if there are duplicate links with the same type and hreflang attributes
- # that have an alternate (or empty) rel attribute
- #
- # Raises a TooMuchTagError if there are duplicates found
def validate_duplicate_links(links)
link_infos = {}
links.each do |link|
@@ -244,9 +203,6 @@ module RSS
end
end
- # Atom feed element
- #
- # A Feed has several metadata attributes in addition to a number of Entry child elements
class Feed < RSS::Element
include RootElementMixin
include CommonModel
@@ -274,7 +230,6 @@ module RSS
tag, URI, occurs, tag, *args)
end
- # Creates a new Atom feed
def initialize(version=nil, encoding=nil, standalone=nil)
super("1.0", version, encoding, standalone)
@feed_type = "atom"
@@ -283,8 +238,6 @@ module RSS
alias_method :items, :entries
- # Returns true if there are any authors for the feed or any of the Entry
- # child elements have an author
def have_author?
authors.any? {|author| !author.to_s.empty?} or
entries.any? {|entry| entry.have_author?(false)}
@@ -368,32 +321,16 @@ module RSS
end
end
- # Atom Icon element
- #
- # Image that provides a visual identification for the Feed. Image should have an aspect
- # ratio of 1:1
class Icon < RSS::Element
include CommonModel
include URIContentModel
end
- # Atom ID element
- #
- # Universally Unique Identifier (UUID) for the Feed
class Id < RSS::Element
include CommonModel
include URIContentModel
end
- # Defines an Atom Link element
- #
- # A Link has the following attributes:
- # * href
- # * rel
- # * type
- # * hreflang
- # * title
- # * length
class Link < RSS::Element
include CommonModel
@@ -414,10 +351,6 @@ module RSS
end
end
- # Atom Logo element
- #
- # Image that provides a visual identification for the Feed. Image should have an aspect
- # ratio of 2:1 (horizontal:vertical)
class Logo < RSS::Element
include CommonModel
include URIContentModel
@@ -432,40 +365,26 @@ module RSS
end
end
- # Atom Rights element
- #
- # TextConstruct that contains copyright information regarding the content in an Entry or Feed
class Rights < RSS::Element
include CommonModel
include TextConstruct
end
- # Atom Subtitle element
- #
- # TextConstruct that conveys a description or subtitle for a Feed
class Subtitle < RSS::Element
include CommonModel
include TextConstruct
end
- # Atom Title element
- #
- # TextConstruct that conveys a description or title for a feed or Entry
class Title < RSS::Element
include CommonModel
include TextConstruct
end
- # Atom Updated element
- #
- # DateConstruct indicating the most recent time when an Entry or Feed was modified
- # in a way the publisher considers significant
class Updated < RSS::Element
include CommonModel
include DateConstruct
end
- # Defines a child Atom Entry element for an Atom Feed
class Entry < RSS::Element
include CommonModel
include DuplicateLinkChecker
@@ -489,10 +408,6 @@ module RSS
tag, URI, occurs, tag, *args)
end
- # Returns whether any of the following are true
- # * There are any authors in the feed
- # * If the parent element has an author and the +check_parent+ parameter was given.
- # * There is a source element that has an author
def have_author?(check_parent=true)
authors.any? {|author| !author.to_s.empty?} or
(check_parent and @parent and @parent.have_author?) or
@@ -612,7 +527,7 @@ module RSS
return false unless inline_other?
return false if inline_other_xml?
- media_type, = mime_split
+ media_type, subtype = mime_split
return true if "text" == media_type.downcase
false
end
@@ -719,8 +634,6 @@ module RSS
end
end
- # Defines a top-level Atom Entry element
- #
class Entry < RSS::Element
include RootElementMixin
include CommonModel
@@ -745,25 +658,21 @@ module RSS
tag, URI, occurs, tag, *args)
end
- # Creates a new Atom Entry element
def initialize(version=nil, encoding=nil, standalone=nil)
super("1.0", version, encoding, standalone)
@feed_type = "atom"
@feed_subtype = "entry"
end
- # Returns the Entry in an array
def items
[self]
end
- # sets up the +maker+ for constructing Entry elements
def setup_maker(maker)
maker = maker.maker if maker.respond_to?("maker")
super(maker)
end
- # Returns where there are any authors present or there is a source with an author
def have_author?
authors.any? {|author| !author.to_s.empty?} or
(source and source.have_author?)
diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb
index 824b2b2dcd..a7ee200b32 100644
--- a/lib/rss/maker.rb
+++ b/lib/rss/maker.rb
@@ -1,56 +1,32 @@
require "rss/rss"
module RSS
- ##
- #
- # Provides a set of builders for various RSS objects
- #
- # * Feeds
- # * RSS 0.91
- # * RSS 1.0
- # * RSS 2.0
- # * Atom 1.0
- #
- # * Elements
- # * Atom::Entry
-
module Maker
-
- # Collection of supported makers
MAKERS = {}
class << self
- # Builder for an RSS object
- # Creates an object of the type passed in +args+
- #
- # Executes the +block+ to populate elements of the created RSS object
def make(version, &block)
self[version].make(&block)
end
- # Returns the maker for the +version+
def [](version)
maker_info = maker(version)
raise UnsupportedMakerVersionError.new(version) if maker_info.nil?
maker_info[:maker]
end
- # Adds a maker to the set of supported makers
def add_maker(version, normalized_version, maker)
MAKERS[version] = {:maker => maker, :version => normalized_version}
end
- # Returns collection of supported maker versions
def versions
MAKERS.keys.uniq.sort
end
- # Returns collection of supported makers
def makers
- MAKERS.values.collect { |info| info[:maker] }.uniq
+ MAKERS.values.collect {|info| info[:maker]}.uniq
end
- # Returns true if the version is supported
def supported?(version)
versions.include?(version)
end
diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb
index c398343ec4..aede4d7c20 100644
--- a/lib/rss/maker/0.9.rb
+++ b/lib/rss/maker/0.9.rb
@@ -24,7 +24,7 @@ module RSS
class Channel < ChannelBase
def to_feed(rss)
channel = Rss::Channel.new
- setup_values(channel)
+ set = setup_values(channel)
_not_set_required_variables = not_set_required_variables
if _not_set_required_variables.empty?
rss.channel = channel
@@ -257,7 +257,7 @@ module RSS
class Item < ItemBase
def to_feed(rss)
item = Rss::Channel::Item.new
- setup_values(item)
+ set = setup_values(item)
_not_set_required_variables = not_set_required_variables
if _not_set_required_variables.empty?
rss.items << item
diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
index 1b9f7c3b79..0d8075f836 100644
--- a/lib/rss/maker/1.0.rb
+++ b/lib/rss/maker/1.0.rb
@@ -32,7 +32,7 @@ module RSS
_not_set_required_variables = not_set_required_variables
if _not_set_required_variables.empty?
channel = RDF::Channel.new(@about)
- setup_values(channel)
+ set = setup_values(channel)
channel.dc_dates.clear
rss.channel = channel
set_parent(channel, rss)
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb
index 36860032da..88ea831164 100644
--- a/lib/rss/maker/base.rb
+++ b/lib/rss/maker/base.rb
@@ -23,8 +23,8 @@ module RSS
end
def inherited(subclass)
- subclass.const_set(:OTHER_ELEMENTS, [])
- subclass.const_set(:NEED_INITIALIZE_VARIABLES, [])
+ subclass.const_set("OTHER_ELEMENTS", [])
+ subclass.const_set("NEED_INITIALIZE_VARIABLES", [])
end
def add_other_element(variable_name)
@@ -353,7 +353,7 @@ module RSS
module SetupDefaultDate
private
- def _set_default_values
+ def _set_default_values(&block)
keep = {
:date => date,
:dc_dates => dc_dates.to_a.dup,
@@ -365,7 +365,7 @@ module RSS
dc_dates.unshift(dc_date)
end
self.date ||= self.dc_date
- super
+ super(&block)
ensure
date = keep[:date]
dc_dates.replace(keep[:dc_dates])
@@ -379,7 +379,7 @@ module RSS
module SetupDefaultLanguage
private
- def _set_default_values
+ def _set_default_values(&block)
keep = {
:dc_languages => dc_languages.to_a.dup,
}
@@ -390,7 +390,7 @@ module RSS
dc_language.value = _language.dup
dc_languages.unshift(dc_language)
end
- super
+ super(&block)
ensure
dc_languages.replace(keep[:dc_languages])
end
@@ -718,7 +718,7 @@ module RSS
["contributor", "name"],
].each do |name, attribute|
def_classed_elements(name, attribute)
- end
+ end
%w(comments id published).each do |element|
attr_accessor element
diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
index 717b074fae..9069c27d06 100644
--- a/lib/rss/maker/dublincore.rb
+++ b/lib/rss/maker/dublincore.rb
@@ -11,7 +11,10 @@ module RSS
plural_name ||= "#{name}s"
full_name = "#{RSS::DC_PREFIX}_#{name}"
full_plural_name = "#{RSS::DC_PREFIX}_#{plural_name}"
+ klass_name = Utils.to_class_name(name)
plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
+ full_plural_klass_name = "self.class::#{plural_klass_name}"
+ full_klass_name = "#{full_plural_klass_name}::#{klass_name}"
klass.def_classed_elements(full_name, "value", plural_klass_name,
full_plural_name, name)
klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb
index f8f5469f2c..b35936b208 100644
--- a/lib/rss/maker/entry.rb
+++ b/lib/rss/maker/entry.rb
@@ -99,7 +99,7 @@ module RSS
end
end
- def _set_default_values
+ def _set_default_values(&block)
keep = {
:authors => authors.to_a.dup,
:contributors => contributors.to_a.dup,
@@ -126,7 +126,7 @@ module RSS
@maker.channel.title {|t| @title = t}
end
self.updated ||= @maker.channel.updated
- super
+ super(&block)
ensure
authors.replace(keep[:authors])
contributors.replace(keep[:contributors])
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
index 06084b4af4..e2b36e0a08 100644
--- a/lib/rss/maker/image.rb
+++ b/lib/rss/maker/image.rb
@@ -13,7 +13,7 @@ module RSS
end
def self.install_image_item(klass)
- klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+ klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
class ImageItem < ImageItemBase
DublinCoreModel.install_dublin_core(self)
end
@@ -57,7 +57,7 @@ EOC
end
def self.install_image_favicon(klass)
- klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+ klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
class ImageFavicon < ImageFaviconBase
DublinCoreModel.install_dublin_core(self)
end
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
index 6a942bfa63..6f008049ca 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -70,9 +70,6 @@ module RSS
class InvalidRSSError < Error; end
- ##
- # Raised if no matching tag is found.
-
class MissingTagError < InvalidRSSError
attr_reader :tag, :parent
def initialize(tag, parent)
@@ -81,9 +78,6 @@ module RSS
end
end
- ##
- # Raised if there are more occurrences of the tag than expected.
-
class TooMuchTagError < InvalidRSSError
attr_reader :tag, :parent
def initialize(tag, parent)
@@ -92,9 +86,6 @@ module RSS
end
end
- ##
- # Raised if a required attribute is missing.
-
class MissingAttributeError < InvalidRSSError
attr_reader :tag, :attribute
def initialize(tag, attribute)
@@ -103,9 +94,6 @@ module RSS
end
end
- ##
- # Raised when an unknown tag is found.
-
class UnknownTagError < InvalidRSSError
attr_reader :tag, :uri
def initialize(tag, uri)
@@ -114,9 +102,6 @@ module RSS
end
end
- ##
- # Raised when an unexpected tag is encountered.
-
class NotExpectedTagError < InvalidRSSError
attr_reader :tag, :uri, :parent
def initialize(tag, uri, parent)
@@ -127,9 +112,6 @@ module RSS
# For backward compatibility :X
NotExceptedTagError = NotExpectedTagError
- ##
- # Raised when an incorrect value is used.
-
class NotAvailableValueError < InvalidRSSError
attr_reader :tag, :value, :attribute
def initialize(tag, value, attribute=nil)
@@ -141,9 +123,6 @@ module RSS
end
end
- ##
- # Raised when an unknown conversion error occurs.
-
class UnknownConversionMethodError < Error
attr_reader :to, :from
def initialize(to, from)
@@ -155,9 +134,6 @@ module RSS
# for backward compatibility
UnknownConvertMethod = UnknownConversionMethodError
- ##
- # Raised when a conversion failure occurs.
-
class ConversionError < Error
attr_reader :string, :to, :from
def initialize(string, to, from)
@@ -168,9 +144,6 @@ module RSS
end
end
- ##
- # Raised when a required variable is not set.
-
class NotSetError < Error
attr_reader :name, :variables
def initialize(name, variables)
@@ -180,9 +153,6 @@ module RSS
end
end
- ##
- # Raised when a RSS::Maker attempts to use an unknown maker.
-
class UnsupportedMakerVersionError < Error
attr_reader :version
def initialize(version)
@@ -259,7 +229,7 @@ EOC
else
rv << value
end
- rv << "</#{elem_name}>"
+ rv << "</#{elem_name}>"
rv
else
''
@@ -290,7 +260,7 @@ EOC
else
rv << value
end
- rv << "</#{elem_name}>"
+ rv << "</#{elem_name}>"
rv
else
''
@@ -701,18 +671,18 @@ EOC
end
def inherited(klass)
- klass.const_set(:MUST_CALL_VALIDATORS, {})
- klass.const_set(:MODELS, [])
- klass.const_set(:GET_ATTRIBUTES, [])
- klass.const_set(:HAVE_CHILDREN_ELEMENTS, [])
- klass.const_set(:TO_ELEMENT_METHODS, [])
- klass.const_set(:NEED_INITIALIZE_VARIABLES, [])
- klass.const_set(:PLURAL_FORMS, {})
+ klass.const_set("MUST_CALL_VALIDATORS", {})
+ klass.const_set("MODELS", [])
+ klass.const_set("GET_ATTRIBUTES", [])
+ klass.const_set("HAVE_CHILDREN_ELEMENTS", [])
+ klass.const_set("TO_ELEMENT_METHODS", [])
+ klass.const_set("NEED_INITIALIZE_VARIABLES", [])
+ klass.const_set("PLURAL_FORMS", {})
tag_name = klass.name.split(/::/).last
tag_name[0, 1] = tag_name[0, 1].downcase
- klass.instance_variable_set(:@tag_name, tag_name)
- klass.instance_variable_set(:@have_content, false)
+ klass.instance_variable_set("@tag_name", tag_name)
+ klass.instance_variable_set("@have_content", false)
end
def install_must_call_validator(prefix, uri)
@@ -1123,8 +1093,9 @@ EOC
tags = tags.sort_by {|x| element_names.index(x) || tags_size}
end
+ _tags = tags.dup if tags
models.each_with_index do |model, i|
- name, _, occurs, = model
+ name, model_uri, occurs, getter = model
if DEBUG
p "before"
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 9f18783fb4..765fdfc598 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -5,18 +5,16 @@
# See LICENSE.txt for permissions.
#++
-require 'rbconfig'
+gem_disabled = !defined? Gem
-module Gem
- VERSION = '2.0.14.1'
+unless gem_disabled
+ # Nuke the Quickloader stuff
+ Gem::QuickLoader.remove
end
-# Must be first since it unloads the prelude from 1.9.2
-require 'rubygems/compatibility'
-
require 'rubygems/defaults'
-require 'rubygems/deprecate'
-require 'rubygems/errors'
+require 'thread'
+require 'etc'
##
# RubyGems is the Ruby standard for publishing and managing third party
@@ -36,9 +34,9 @@ require 'rubygems/errors'
#
# Further RubyGems documentation can be found at:
#
-# * {RubyGems Guides}[http://guides.rubygems.org]
# * {RubyGems API}[http://rubygems.rubyforge.org/rdoc] (also available from
# <tt>gem server</tt>)
+# * {RubyGems Bookshelf}[http://rubygem.org]
#
# == RubyGems Plugins
#
@@ -59,8 +57,8 @@ require 'rubygems/errors'
# For RubyGems packagers, provide lib/rubygems/operating_system.rb and
# override any defaults from lib/rubygems/defaults.rb.
#
-# For Ruby implementers, provide lib/rubygems/defaults/#{RUBY_ENGINE}.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.
@@ -70,8 +68,8 @@ require 'rubygems/errors'
# == Bugs
#
# You can submit bugs to the
-# {RubyGems bug tracker}[https://github.com/rubygems/rubygems/issues]
-# on GitHub
+# {RubyGems bug tracker}[http://rubyforge.org/tracker/?atid=575&group_id=126]
+# on RubyForge
#
# == Credits
#
@@ -99,20 +97,62 @@ require 'rubygems/errors'
# * Daniel Berger -- djberg96(at)gmail.com
# * Phil Hagelberg -- technomancy(at)gmail.com
# * Ryan Davis -- ryand-ruby(at)zenspider.com
-# * Evan Phoenix -- evan(at)fallingsnow.net
-# * Steve Klabnik -- steve(at)steveklabnik.com
#
# (If your name is missing, PLEASE let us know!)
#
-# See {LICENSE.txt}[rdoc-ref:lib/rubygems/LICENSE.txt] for permissions.
-#
# Thanks!
#
# -The RubyGems Team
-
module Gem
- RUBYGEMS_DIR = File.dirname File.expand_path(__FILE__)
+ RubyGemsVersion = VERSION = '1.3.7.1'
+
+ ##
+ # 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
+
+ ##
+ # 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"],
+ :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"],
+ :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 = VERSION
+ # :startdoc:
##
# An Array of Regexps that match windows ruby platforms.
@@ -126,159 +166,181 @@ module Gem
/wince/i,
]
- GEM_DEP_FILES = %w[
- gem.deps.rb
- Gemfile
- Isolate
- ]
-
- ##
- # Subdirectories in a gem repository
-
- REPOSITORY_SUBDIRECTORIES = %w[
- build_info
- cache
- doc
- gems
- specifications
- ]
-
+ @@source_index = nil
@@win_platform = nil
@configuration = nil
@loaded_specs = {}
- @path_to_default_spec_map = {}
+ @loaded_stacks = {}
@platforms = []
@ruby = nil
- @sources = nil
+ @sources = []
- @post_build_hooks ||= []
@post_install_hooks ||= []
@post_uninstall_hooks ||= []
@pre_uninstall_hooks ||= []
@pre_install_hooks ||= []
- @pre_reset_hooks ||= []
- @post_reset_hooks ||= []
##
- # Try to activate a gem containing +path+. Returns true if
- # activation succeeded or wasn't needed because it was already
- # activated. Returns false if it can't find the path in a gem.
-
- def self.try_activate path
- # finds the _latest_ version... regardless of loaded specs and their deps
- # if another gem had a requirement that would mean we shouldn't
- # activate the latest version, then either it would alreaby be activated
- # or if it was ambigious (and thus unresolved) the code in our custom
- # require will try to activate the more specific version.
-
- spec = Gem::Specification.find_inactive_by_path path
-
- unless spec
- spec = Gem::Specification.find_by_path path
- return true if spec && spec.activated?
- return false
+ # 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
- begin
- spec.activate
- rescue Gem::LoadError # this could fail due to gem dep collisions, go lax
- Gem::Specification.find_by_name(spec.name).activate
+ sources = options[:sources] || []
+
+ if version_requirements.empty? then
+ version_requirements = Gem::Requirement.default
end
- return true
- end
+ unless gem.respond_to?(:name) and
+ gem.respond_to?(:requirement) then
+ gem = Gem::Dependency.new(gem, version_requirements)
+ end
- def self.needs
- rs = Gem::RequestSet.new
+ matches = Gem.source_index.find_name(gem.name, gem.requirement)
+ report_activate_error(gem) if matches.empty?
- yield rs
+ 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]
- finish_resolve rs
- end
+ 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.requirement
+
+ raise e
+ end
- def self.finish_resolve(request_set=Gem::RequestSet.new)
- request_set.import Gem::Specification.unresolved_deps.values
+ return false
+ end
+
+ # new load
+ spec = matches.last
+ return false if spec.loaded?
- request_set.resolve_current.each do |s|
- s.full_spec.activate
+ 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
- end
- def self.detect_gemdeps
- if path = ENV['RUBYGEMS_GEMDEPS']
- path = path.dup.untaint
+ # bin directory must come before library directories
+ spec.require_paths.unshift spec.bindir if spec.bindir
- if path == "-"
- here = Dir.pwd.untaint
- start = here
+ require_paths = spec.require_paths.map do |path|
+ File.join spec.full_gem_path, path
+ end
- begin
- while true
- path = GEM_DEP_FILES.find { |f| File.file?(f) }
+ # gem directories must come after -I and ENV['RUBYLIB']
+ insert_index = load_path_insert_index
- if path
- path = File.join here, path
- break
- end
+ 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
- Dir.chdir ".."
+ return true
+ end
- # If we're at a toplevel, stop.
- return if Dir.pwd == here
+ ##
+ # An Array of all possible load paths for all versions of all gems in the
+ # Gem installation.
- here = Dir.pwd
- end
- ensure
- Dir.chdir start
- end
+ 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
- path.untaint
+ result
+ end
- return unless File.file? path
+ ##
+ # Return all the partial paths in +gemdir+.
+
+ def self.all_partials(gemdir)
+ Dir[File.join(gemdir, 'gems/*')]
+ end
- rs = Gem::RequestSet.new
- rs.load_gemdeps path
+ private_class_method :all_partials
- rs.resolve_current.map do |s|
- sp = s.full_spec
- sp.activate
- sp
- end
+ ##
+ # 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?(:requirement) 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
- # specified executable's path is returned. +requirements+ allows
+ # specified executable's path is returned. +version_requirements+ allows
# you to specify specific gem versions.
- def self.bin_path(name, exec_name = nil, *requirements)
- # TODO: fails test_self_bin_path_bin_file_gone_in_latest
- # Gem::Specification.find_by_name(name, *requirements).bin_file exec_name
-
- raise ArgumentError, "you must supply exec_name" unless exec_name
-
- requirements = Gem::Requirement.default if
- requirements.empty?
-
- specs = Gem::Dependency.new(name, requirements).matching_specs(true)
+ 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} (#{requirements})" if specs.empty?
+ "can't find gem #{name} (#{version_requirements})" unless spec
- specs = specs.find_all { |spec|
- spec.executables.include? exec_name
- } if exec_name
+ exec_name ||= spec.default_executable
+
+ unless exec_name
+ msg = "no default executable for #{spec.full_name}"
+ raise Gem::Exception, msg
+ end
- unless spec = specs.last
- msg = "can't find gem #{name} (#{requirements}) with executable #{exec_name}"
- raise Gem::GemNotFoundException, msg
+ unless spec.executables.include? exec_name
+ msg = "can't find executable #{exec_name} for #{spec.full_name}"
+ raise Gem::Exception, msg
end
- spec.bin_file exec_name
+ File.join(spec.full_gem_path, spec.bindir, exec_name)
end
##
@@ -292,9 +354,8 @@ module Gem
# The path where gem executables are to be installed.
def self.bindir(install_dir=Gem.dir)
- # TODO: move to Gem::Dirs
- return File.join install_dir, 'bin' unless
- install_dir.to_s == Gem.default_dir.to_s
+ return File.join(install_dir, 'bin') unless
+ install_dir.to_s == Gem.default_dir
Gem.default_bindir
end
@@ -304,17 +365,22 @@ module Gem
# mainly used by the unit tests to provide test isolation.
def self.clear_paths
- @paths = nil
- @user_home = nil
- Gem::Specification.reset
- Gem::Security.reset if defined?(Gem::Security)
+ @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
- @config_file ||= File.join Gem.user_home, '.gemrc'
+ File.join Gem.user_home, '.gemrc'
end
##
@@ -337,11 +403,9 @@ module Gem
# package is not available as a gem, return nil.
def self.datadir(gem_name)
-# TODO: deprecate and move to Gem::Specification
-# and drop the extra ", gem_name" which is uselessly redundant
spec = @loaded_specs[gem_name]
return nil if spec.nil?
- File.join spec.full_gem_path, "data", gem_name
+ File.join(spec.full_gem_path, 'data', gem_name)
end
##
@@ -352,128 +416,90 @@ module Gem
Zlib::Deflate.deflate data
end
- # DOC: needs doc'd or :nodoc'd
- def self.paths
- @paths ||= Gem::PathSupport.new
- end
-
- # DOC: needs doc'd or :nodoc'd
- def self.paths=(env)
- clear_paths
- @paths = Gem::PathSupport.new env
- Gem::Specification.dirs = @paths.path # FIX: home is at end
- end
-
##
# The path where gems are to be installed.
- #--
- # FIXME deprecate these once everything else has been done -ebh
def self.dir
- # TODO: raise "no"
- paths.home
+ @gem_home ||= nil
+ set_home(ENV['GEM_HOME'] || Gem.configuration.home || default_dir) unless @gem_home
+ @gem_home
end
- def self.path
- # TODO: raise "no"
- paths.path
+ ##
+ # 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 Gem directory +dir+ contains all the proper
+ # 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.
- #
- # If +mode+ is given, missing directories are created with this mode.
- #
- # World-writable directories will never be created.
-
- def self.ensure_gem_subdirectories dir = Gem.dir, mode = nil
- old_umask = File.umask
- File.umask old_umask | 002
+ def self.ensure_gem_subdirectories(gemdir)
require 'fileutils'
- options = {}
-
- options[:mode] = mode if mode
-
- REPOSITORY_SUBDIRECTORIES.each do |name|
- subdir = File.join dir, name
- next if File.exist? subdir
- FileUtils.mkdir_p subdir, options rescue nil
+ Gem::DIRECTORIES.each do |filename|
+ fn = File.join gemdir, filename
+ FileUtils.mkdir_p fn rescue nil unless File.exist? fn
end
- ensure
- File.umask old_umask
end
##
- # Returns a list of paths matching +glob+ that can be used by a gem to pick
+ # 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
#
- # if +check_load_path+ is true (the default), then find_files also searches
- # $LOAD_PATH for files as well as gems.
+ # 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(glob, check_load_path=true)
- files = []
+ 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}"]
- if check_load_path
- files = $LOAD_PATH.map { |load_path|
- Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
- }.flatten.select { |file| File.file? file.untaint }
- end
+ files.select do |load_path_file|
+ File.file? load_path_file.untaint
+ end
+ end.flatten
- files.concat Gem::Specification.map { |spec|
- spec.matches_for_glob("#{glob}#{Gem.suffix_pattern}")
- }.flatten
+ specs = searcher.find_all path
- # $LOAD_PATH might contain duplicate entries or reference
- # the spec dirs directly, so we prune.
- files.uniq! if check_load_path
+ specs_files = specs.map do |spec|
+ searcher.matching_files spec, path
+ end.flatten
- return files
+ (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).
- #++
- #--
- #
- # FIXME move to pathsupport
- #
- #++
def self.find_home
- windows = File::ALT_SEPARATOR
- if not windows or RUBY_VERSION >= '1.9' then
- File.expand_path "~"
- else
- ['HOME', 'USERPROFILE'].each do |key|
- return File.expand_path ENV[key] if ENV[key]
- end
-
- if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
- File.expand_path "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
- end
- end
+ File.expand_path "~"
rescue
- if windows then
- File.expand_path File.join(ENV['HOMEDRIVE'] || ENV['SystemDrive'], '/')
+ if File::ALT_SEPARATOR then
+ "C:/"
else
- File.expand_path "/"
+ "/"
end
end
@@ -483,25 +509,20 @@ module Gem
# Zlib::GzipReader wrapper that unzips +data+.
def self.gunzip(data)
- # TODO: move to utils
require 'stringio'
require 'zlib'
data = StringIO.new data
- unzipped = Zlib::GzipReader.new(data).read
- unzipped.force_encoding Encoding::BINARY if Object.const_defined? :Encoding
- unzipped
+ Zlib::GzipReader.new(data).read
end
##
# Zlib::GzipWriter wrapper that zips +data+.
def self.gzip(data)
- # TODO: move to utils
require 'stringio'
require 'zlib'
zipped = StringIO.new
- zipped.set_encoding Encoding::BINARY if Object.const_defined? :Encoding
Zlib::GzipWriter.wrap zipped do |io| io.write data end
@@ -512,42 +533,46 @@ module Gem
# A Zlib::Inflate#inflate wrapper
def self.inflate(data)
- # TODO: move to utils
require 'zlib'
Zlib::Inflate.inflate data
end
##
- # Top level install helper method. Allows you to install gems interactively:
- #
- # % irb
- # >> Gem.install "minitest"
- # Fetching: minitest-3.0.1.gem (100%)
- # => [#<Gem::Specification:0x1013b4528 @name="minitest", ...>]
-
- def self.install name, version = Gem::Requirement.default
- require "rubygems/dependency_installer"
- inst = Gem::DependencyInstaller.new
- inst.install name, version
- inst.installed_gems
- end
+ # Return a list of all possible load paths for the latest version for all
+ # gems in the Gem installation.
- ##
- # Get the default RubyGems API host. This is normally
- # <tt>https://rubygems.org</tt>.
+ def self.latest_load_paths
+ result = []
- def self.host
- # TODO: move to utils
- @host ||= Gem::DEFAULT_HOST
- end
+ Gem.path.each do |gemdir|
+ each_load_path(latest_partials(gemdir)) do |load_path|
+ result << load_path
+ end
+ end
- ## Set the default RubyGems API host.
+ result
+ end
- def self.host= host
- # TODO: move to utils
- @host = host
+ ##
+ # 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.
#
@@ -556,60 +581,13 @@ module Gem
# so you can override the gem_prelude.rb default $LOAD_PATH paths.
def self.load_path_insert_index
- index = $LOAD_PATH.index ConfigMap[:sitelibdir]
-
- index
+ $LOAD_PATH.index { |p| p.instance_variable_defined? :@gem_prelude_index }
end
- @yaml_loaded = false
-
- ##
- # Loads YAML, preferring Psych
-
- def self.load_yaml
- return if @yaml_loaded
- return unless defined?(gem)
-
- test_syck = ENV['TEST_SYCK']
-
- unless test_syck
- begin
- gem 'psych', '~> 1.2', '>= 1.2.1'
- rescue Gem::LoadError
- # It's OK if the user does not have the psych gem installed. We will
- # attempt to require the stdlib version
- end
-
- begin
- # Try requiring the gem version *or* stdlib version of psych.
- require 'psych'
- rescue ::LoadError
- # If we can't load psych, thats fine, go on.
- else
- # If 'yaml' has already been required, then we have to
- # be sure to switch it over to the newly loaded psych.
- if defined?(YAML::ENGINE) && YAML::ENGINE.yamler != "psych"
- YAML::ENGINE.yamler = "psych"
- end
-
- require 'rubygems/psych_additions'
- require 'rubygems/psych_tree'
- end
+ def self.remove_prelude_paths
+ Gem::QuickLoader::GemLoadPaths.each do |path|
+ $LOAD_PATH.delete(path)
end
-
- require 'yaml'
-
- # If we're supposed to be using syck, then we may have to force
- # activate it via the YAML::ENGINE API.
- if test_syck and defined?(YAML::ENGINE)
- YAML::ENGINE.yamler = "syck" unless YAML::ENGINE.syck?
- end
-
- # Now that we're sure some kind of yaml library is loaded, pull
- # in our hack to deal with Syck's DefaultKey ugliness.
- require 'rubygems/syck_hack'
-
- @yaml_loaded = true
end
##
@@ -620,7 +598,6 @@ module Gem
file = $1
lineno = $2.to_i
- # TODO: it is ALWAYS joined! STUPID!
[file, lineno]
end
@@ -632,6 +609,25 @@ module Gem
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)
@@ -650,17 +646,6 @@ module Gem
end
##
- # Adds a post-build hook that will be passed an Gem::Installer instance
- # when Gem::Installer#install is called. The hook is called after the gem
- # has been extracted and extensions have been built but before the
- # executables or gemspec has been written. If the hook returns +false+ then
- # the gem's files will be removed and the install will be aborted.
-
- def self.post_build(&hook)
- @post_build_hooks << hook
- end
-
- ##
# Adds a post-install hook that will be passed an Gem::Installer instance
# when Gem::Installer#install is called
@@ -669,23 +654,6 @@ module Gem
end
##
- # Adds a post-installs hook that will be passed a Gem::DependencyInstaller
- # and a list of installed specifications when
- # Gem::DependencyInstaller#install is complete
-
- def self.done_installing(&hook)
- @done_installing_hooks << hook
- end
-
- ##
- # Adds a hook that will get run after Gem::Specification.reset is
- # run.
-
- def self.post_reset(&hook)
- @post_reset_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
@@ -696,22 +664,13 @@ module Gem
##
# Adds a pre-install hook that will be passed an Gem::Installer instance
- # when Gem::Installer#install is called. If the hook returns +false+ then
- # the install will be aborted.
+ # when Gem::Installer#install is called
def self.pre_install(&hook)
@pre_install_hooks << hook
end
##
- # Adds a hook that will get run before Gem::Specification.reset is
- # run.
-
- def self.pre_reset(&hook)
- @pre_reset_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
@@ -721,25 +680,57 @@ module Gem
end
##
- # The directory prefix this RubyGems was installed at. If your
- # prefix is in a standard location (ie, rubygems is installed where
- # you'd expect it to be), then prefix returns nil.
+ # The directory prefix this RubyGems was installed at.
def self.prefix
- prefix = File.dirname RUBYGEMS_DIR
+ dir = File.dirname File.expand_path(__FILE__)
+ prefix = File.dirname dir
- if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
- prefix != File.expand_path(ConfigMap[:libdir]) and
- 'lib' == File.basename(RUBYGEMS_DIR) then
+ if prefix == File.expand_path(ConfigMap[:sitelibdir]) or
+ prefix == File.expand_path(ConfigMap[:libdir]) or
+ 'lib' != File.basename(dir) then
+ nil
+ else
prefix
end
end
##
- # Refresh available gems from disk.
+ # 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
- Gem::Specification.reset
+ source_index.refresh!
+
+ MUTEX.synchronize do
+ @searcher = nil
+ end
end
##
@@ -750,46 +741,63 @@ module Gem
end
##
- # The path to the running Ruby interpreter.
+ # 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.ruby
- if @ruby.nil? then
- @ruby = File.join(ConfigMap[:bindir],
- "#{ConfigMap[:ruby_install_name]}#{ConfigMap[:EXEEXT]}")
+ def self.report_activate_error(gem)
+ matches = Gem.source_index.find_name(gem.name)
- @ruby = "\"#{@ruby}\"" if @ruby =~ /\s/
+ if matches.empty? then
+ error = Gem::LoadError.new(
+ "Could not find RubyGem #{gem.name} (#{gem.requirement})\n")
+ else
+ error = Gem::LoadError.new(
+ "RubyGem version error: " +
+ "#{gem.name}(#{matches.first.version} not #{gem.requirement})\n")
end
- @ruby
+ error.name = gem.name
+ error.version_requirement = gem.requirement
+ raise error
end
+ private_class_method :report_activate_error
+
##
- # Returns the latest release-version specification for the gem +name+.
+ # Full path to +libfile+ in +gemname+. Searches for the latest gem unless
+ # +requirements+ is given.
- def self.latest_spec_for name
- dependency = Gem::Dependency.new name
- fetcher = Gem::SpecFetcher.fetcher
- spec_tuples, = fetcher.spec_for_dependency dependency
+ def self.required_location(gemname, libfile, *requirements)
+ requirements = Gem::Requirement.default if requirements.empty?
- spec, = spec_tuples.first
+ matches = Gem.source_index.find_name gemname, requirements
- spec
- end
+ return nil if matches.empty?
- ##
- # Returns the latest release version of RubyGems.
+ 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
- def self.latest_rubygems_version
- latest_version_for('rubygems-update') or
- raise "Can't find 'rubygems-update' in any repo. Check `gem source list`."
+ nil
end
##
- # Returns the version of the latest release-version of gem +name+
+ # 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]
- def self.latest_version_for name
- spec = latest_spec_for name
- spec and spec.version
+ # escape string in case path to ruby executable contain spaces.
+ @ruby.sub!(/.*\s.*/m, '"\&"')
+ end
+
+ @ruby
end
##
@@ -809,34 +817,79 @@ module Gem
end
##
- # A Gem::Version for the currently running RubyGems
+ # 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.rubygems_version
- return @rubygems_version if defined? @rubygems_version
- @rubygems_version = Gem::Version.new Gem::VERSION
+ def self.source_index
+ @@source_index ||= SourceIndex.from_installed_gems
end
##
- # Returns an Array of sources to fetch remote gems from. Uses
- # default_sources if the sources list is empty.
+ # 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
- @sources ||= Gem::SourceList.from(default_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.
- #
- # DOC: This comment is not documentation about the method itself, it's
- # more of a code comment about the implementation.
- def self.sources= new_sources
- if !new_sources
- @sources = nil
- else
- @sources = Gem::SourceList.from(new_sources)
- end
+ def self.sources=(new_sources)
+ @sources = new_sources
end
##
@@ -850,14 +903,7 @@ module Gem
# Suffixes for require-able paths.
def self.suffixes
- @suffixes ||= ['',
- '.rb',
- *%w(DLEXT DLEXT2).map { |key|
- val = RbConfig::CONFIG[key]
- next unless val and not val.empty?
- ".#{val}"
- }
- ].compact.uniq
+ ['', '.rb', '.rbw', '.so', '.bundle', '.dll', '.sl', '.jar']
end
##
@@ -889,18 +935,17 @@ module Gem
# 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)
- paths = nil if paths == [nil]
- paths = paths.first if Array === Array(paths).first
- self.paths = { "GEM_HOME" => home, "GEM_PATH" => paths }
- # TODO: self.paths = home, paths
+ 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.untaint
+ @user_home ||= find_home
end
##
@@ -908,17 +953,18 @@ module Gem
def self.win_platform?
if @@win_platform.nil? then
- ruby_platform = RbConfig::CONFIG['host_os']
- @@win_platform = !!WIN_PATTERNS.find { |r| ruby_platform =~ r }
+ @@win_platform = !!WIN_PATTERNS.find { |r| RUBY_PLATFORM =~ r }
end
@@win_platform
end
##
- # Load +plugins+ as ruby files
+ # Find all 'rubygems_plugin' files and load them
+
+ def self.load_plugins
+ plugins = Gem.find_files 'rubygems_plugin'
- def self.load_plugin_files(plugins)
plugins.each do |plugin|
# Skip older versions of the GemCutter plugin: Its commands are in
@@ -935,34 +981,6 @@ module Gem
end
end
- ##
- # Find all 'rubygems_plugin' files in installed gems and load them
-
- def self.load_plugins
- load_plugin_files find_files('rubygems_plugin', false)
- end
-
- ##
- # Find all 'rubygems_plugin' files in $LOAD_PATH and load them
-
- def self.load_env_plugins
- path = "rubygems_plugin"
-
- files = []
- $LOAD_PATH.each do |load_path|
- globbed = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
-
- globbed.each do |load_path_file|
- files << load_path_file if File.file?(load_path_file.untaint)
- end
- end
-
- load_plugin_files files
- end
-
- # FIX: Almost everywhere else we use the `def self.` way of defining class
- # methods, and then we switch over to `class << self` here. Pick one or the
- # other.
class << self
##
@@ -971,139 +989,149 @@ module Gem
attr_reader :loaded_specs
##
- # Register a Gem::Specification for default gem
+ # The list of hooks to be run before Gem::Install#install does any work
- def register_default_spec(spec)
- spec.files.each do |file|
- @path_to_default_spec_map[file] = spec
- end
- end
-
- ##
- # Find a Gem::Specification of default gem from +path+
-
- def find_unresolved_default_spec(path)
- Gem.suffixes.each do |suffix|
- spec = @path_to_default_spec_map["#{path}#{suffix}"]
- return spec if spec
- end
- nil
- end
+ attr_reader :post_install_hooks
##
- # Remove needless Gem::Specification of default gem from
- # unresolved default gem list
+ # The list of hooks to be run before Gem::Uninstall#uninstall does any
+ # work
- def remove_unresolved_default_spec(spec)
- spec.files.each do |file|
- @path_to_default_spec_map.delete(file)
- end
- end
+ attr_reader :post_uninstall_hooks
##
- # Clear default gem related varibles. It is for test
+ # The list of hooks to be run after Gem::Install#install is finished
- def clear_default_specs
- @path_to_default_spec_map.clear
- end
+ attr_reader :pre_install_hooks
##
- # The list of hooks to be run after Gem::Installer#install extracts files
- # and builds extensions
+ # The list of hooks to be run after Gem::Uninstall#uninstall is finished
- attr_reader :post_build_hooks
+ attr_reader :pre_uninstall_hooks
- ##
- # The list of hooks to be run after Gem::Installer#install completes
- # installation
+ # :stopdoc:
- attr_reader :post_install_hooks
-
- ##
- # The list of hooks to be run after Gem::DependencyInstaller installs a
- # set of gems
+ alias cache source_index # an alias for the old name
- attr_reader :done_installing_hooks
+ # :startdoc:
- ##
- # The list of hooks to be run after Gem::Specification.reset is run.
+ end
- attr_reader :post_reset_hooks
+ ##
+ # Location of Marshal quick gemspecs on remote repositories
- ##
- # The list of hooks to be run after Gem::Uninstaller#uninstall completes
- # installation
+ MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
- attr_reader :post_uninstall_hooks
+ ##
+ # Location of legacy YAML quick gemspecs on remote repositories
- ##
- # The list of hooks to be run before Gem::Installer#install does any work
+ YAML_SPEC_DIR = 'quick/'
- attr_reader :pre_install_hooks
+end
- ##
- # The list of hooks to be run before Gem::Specification.reset is run.
+module Kernel
- attr_reader :pre_reset_hooks
+ remove_method :gem if respond_to?(:gem, true) # defined in gem_prelude.rb on 1.9
- ##
- # The list of hooks to be run before Gem::Uninstaller#uninstall does any
- # work
+ ##
+ # 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
- attr_reader :pre_uninstall_hooks
+ 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
- ##
- # Location of Marshal quick gemspecs on remote repositories
+ private :gem
- MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
+end
- autoload :ConfigFile, 'rubygems/config_file'
- autoload :Dependency, 'rubygems/dependency'
- autoload :DependencyList, 'rubygems/dependency_list'
- autoload :DependencyResolver, 'rubygems/dependency_resolver'
- autoload :PathSupport, 'rubygems/path_support'
- autoload :Platform, 'rubygems/platform'
- autoload :RequestSet, 'rubygems/request_set'
- autoload :Requirement, 'rubygems/requirement'
- autoload :SourceList, 'rubygems/source_list'
- autoload :SpecFetcher, 'rubygems/spec_fetcher'
- autoload :Specification, 'rubygems/specification'
- autoload :Version, 'rubygems/version'
- autoload :Source, 'rubygems/source'
-
- require "rubygems/specification"
+##
+# 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
+ ##
+ # Defaults the operating system (or packager) wants to provide for RubyGems.
+
+ require 'rubygems/defaults/operating_system'
+rescue LoadError
+end
-# REFACTOR: This should be pulled out into some kind of hacks file.
-gem_preluded = Gem::GEM_PRELUDE_SUCKAGE and defined? Gem
-unless gem_preluded then # TODO: remove guard after 1.9.2 dropped
+if defined?(RUBY_ENGINE) then
begin
##
- # Defaults the operating system (or packager) wants to provide for RubyGems.
+ # Defaults the ruby implementation wants to provide for RubyGems
- require 'rubygems/defaults/operating_system'
+ require "rubygems/defaults/#{RUBY_ENGINE}"
rescue LoadError
end
+end
- if defined?(RUBY_ENGINE) then
- begin
- ##
- # Defaults the ruby implementation wants to provide for RubyGems
+require 'rubygems/config_file'
- require "rubygems/defaults/#{RUBY_ENGINE}"
- rescue LoadError
- end
+class << Gem
+ remove_method :try_activate if Gem.respond_to?(:try_activate, true)
+
+ def try_activate(path)
+ spec = Gem.searcher.find(path)
+ return false unless spec
+
+ Gem.activate(spec.name, "= #{spec.version}")
+ return true
end
end
##
-# Loads the default specs.
-Gem::Specification.load_defaults
+# Enables the require hook for RubyGems.
+#
+# if --disable-rubygems was used, then the prelude wasn't loaded, so
+# we need to load the custom_require now.
+
+if gem_disabled
+ require 'rubygems/custom_require'
+end
+
+Gem.clear_paths
-require 'rubygems/core_ext/kernel_gem'
-require 'rubygems/core_ext/kernel_require'
+Gem.load_plugins
-Gem.detect_gemdeps
diff --git a/lib/rubygems/available_set.rb b/lib/rubygems/available_set.rb
deleted file mode 100644
index 80539feee9..0000000000
--- a/lib/rubygems/available_set.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-class Gem::AvailableSet
- Tuple = Struct.new(:spec, :source)
-
- def initialize
- @set = []
- @sorted = nil
- end
-
- attr_reader :set
-
- def add(spec, source)
- @set << Tuple.new(spec, source)
- @sorted = nil
- self
- end
-
- def <<(o)
- case o
- when Gem::AvailableSet
- s = o.set
- when Array
- s = o.map do |sp,so|
- if !sp.kind_of?(Gem::Specification) or !so.kind_of?(Gem::Source)
- raise TypeError, "Array must be in [[spec, source], ...] form"
- end
-
- Tuple.new(sp,so)
- end
- else
- raise TypeError, "must be a Gem::AvailableSet"
- end
-
- @set += s
- @sorted = nil
-
- self
- end
-
- def empty?
- @set.empty?
- end
-
- def all_specs
- @set.map { |t| t.spec }
- end
-
- def match_platform!
- @set.reject! { |t| !Gem::Platform.match(t.spec.platform) }
- @sorted = nil
- self
- end
-
- def sorted
- @sorted ||= @set.sort do |a,b|
- i = b.spec <=> a.spec
- i != 0 ? i : (a.source <=> b.source)
- end
- end
-
- def size
- @set.size
- end
-
- def source_for(spec)
- f = @set.find { |t| t.spec == spec }
- f.source
- end
-
- def pick_best!
- return self if empty?
-
- @set = [sorted.first]
- @sorted = nil
- self
- end
-
- def remove_installed!(dep)
- @set.reject! do |t|
- # already locally installed
- Gem::Specification.any? do |installed_spec|
- dep.name == installed_spec.name and
- dep.requirement.satisfied_by? installed_spec.version
- end
- end
-
- @sorted = nil
- self
- end
-
- def inject_into_list(dep_list)
- @set.each { |t| dep_list.add t.spec }
- end
-end
diff --git a/lib/rubygems/builder.rb b/lib/rubygems/builder.rb
new file mode 100644
index 0000000000..2bcd4b0bb3
--- /dev/null
+++ b/lib/rubygems/builder.rb
@@ -0,0 +1,94 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems/user_interaction'
+
+##
+# 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 if Gem.configuration.verbose
+ @spec.file_name
+ end
+
+ def success
+ <<-EOM
+ Successfully built RubyGem
+ Name: #{@spec.name}
+ Version: #{@spec.version}
+ File: #{@spec.file_name}
+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
index cba79b9196..3491937358 100644
--- a/lib/rubygems/command.rb
+++ b/lib/rubygems/command.rb
@@ -5,12 +5,11 @@
#++
require 'optparse'
-require 'rubygems/requirement'
require 'rubygems/user_interaction'
##
# Base class for all Gem commands. When creating a new gem command, define
-# #initialize, #execute, #arguments, #defaults_str, #description and #usage
+# #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
@@ -147,24 +146,15 @@ class Gem::Command
end
##
+ #
# Display to the user that a gem couldn't be found and reasons why
-
- def show_lookup_failure(gem_name, version, errors, domain)
+ def show_lookup_failure(gem_name, version, errors=nil)
if errors and !errors.empty?
- msg = "Could not find a valid gem '#{gem_name}' (#{version}), here is why:\n"
- errors.each { |x| msg << " #{x.wordy}\n" }
- alert_error msg
+ alert_error "Could not find a valid gem '#{gem_name}' (#{version}), here is why:"
+ errors.each { |x| say " #{x.wordy}" }
else
alert_error "Could not find a valid gem '#{gem_name}' (#{version}) in any repository"
end
-
- unless domain == :local then # HACK
- suggestions = Gem::SpecFetcher.fetcher.suggest_gems_from_name gem_name
-
- unless suggestions.empty?
- alert_error "Possible alternatives: #{suggestions.join(", ")}"
- end
- end
end
##
@@ -178,22 +168,7 @@ class Gem::Command
"Please specify at least one gem name (e.g. gem build GEMNAME)"
end
- args.select { |arg| arg !~ /^-/ }
- end
-
- ##
- # Get all [gem, version] from the command line.
- #
- # An argument in the form gem:ver is pull apart into the gen name and version,
- # respectively.
- def get_all_gem_names_and_versions
- get_all_gem_names.map do |name|
- if /\A(.*):(#{Gem::Requirement::PATTERN_RAW})\z/ =~ name
- [$1, $2]
- else
- [name]
- end
- end
+ gem_names = args.select { |arg| arg !~ /^-/ }
end
##
@@ -285,18 +260,8 @@ class Gem::Command
# Invoke the command with the given list of arguments.
def invoke(*args)
- invoke_with_build_args args, nil
- end
-
- ##
- # Invoke the command with the given list of normal arguments
- # and additional build arguments.
-
- def invoke_with_build_args(args, build_args)
handle_options args
- options[:build_args] = build_args
-
if options[:help] then
show_help
elsif @when_invoked then
@@ -371,7 +336,7 @@ class Gem::Command
def handle_options(args)
args = add_extra_args(args)
- @options = Marshal.load Marshal.dump @defaults # deep copy
+ @options = @defaults.clone
parser.parse!(args)
@options[:args] = args
end
@@ -399,23 +364,18 @@ class Gem::Command
private
- def add_parser_description # :nodoc:
- return unless description
-
- formatted = description.split("\n\n").map do |chunk|
- wrap chunk, 80 - 4
- end.join "\n"
+ ##
+ # Create on demand parser.
- @parser.separator nil
- @parser.separator " Description:"
- formatted.split("\n").each do |line|
- @parser.separator " #{line.rstrip}"
- end
+ def parser
+ create_option_parser if @parser.nil?
+ @parser
end
- def add_parser_options # :nodoc:
- @parser.separator nil
+ def create_option_parser
+ @parser = OptionParser.new
+ @parser.separator nil
regular_options = @option_groups.delete :options
configure_options "", regular_options
@@ -424,56 +384,43 @@ class Gem::Command
@parser.separator nil
configure_options group_name, option_list
end
- end
-
- ##
- # Adds a section with +title+ and +content+ to the parser help view. Used
- # for adding command arguments and default arguments.
-
- def add_parser_run_info title, content
- return if content.empty?
@parser.separator nil
- @parser.separator " #{title}:"
- content.split(/\n/).each do |line|
- @parser.separator " #{line}"
- end
- end
+ configure_options "Common", Gem::Command.common_options
- def add_parser_summary # :nodoc:
- return unless @summary
+ unless arguments.empty?
+ @parser.separator nil
+ @parser.separator " Arguments:"
+ arguments.split(/\n/).each do |arg_desc|
+ @parser.separator " #{arg_desc}"
+ end
+ end
@parser.separator nil
@parser.separator " Summary:"
wrap(@summary, 80 - 4).split("\n").each do |line|
@parser.separator " #{line.strip}"
end
- end
- ##
- # Create on demand parser.
+ if description then
+ formatted = description.split("\n\n").map do |chunk|
+ wrap chunk, 80 - 4
+ end.join "\n"
- def parser
- create_option_parser if @parser.nil?
- @parser
- end
-
- ##
- # Creates an option parser and fills it in with the help info for the
- # command.
-
- def create_option_parser
- @parser = OptionParser.new
-
- add_parser_options
-
- @parser.separator nil
- configure_options "Common", Gem::Command.common_options
+ @parser.separator nil
+ @parser.separator " Description:"
+ formatted.split("\n").each do |line|
+ @parser.separator " #{line.rstrip}"
+ end
+ end
- add_parser_run_info "Arguments", arguments
- add_parser_summary
- add_parser_description
- add_parser_run_info "Defaults", defaults_str
+ unless defaults_str.empty?
+ @parser.separator nil
+ @parser.separator " Defaults:"
+ defaults_str.split(/\n/).each do |line|
+ @parser.separator " #{line}"
+ end
+ end
end
def configure_options(header, option_list)
@@ -483,7 +430,7 @@ class Gem::Command
@parser.separator " #{header}Options:"
option_list.each do |args, handler|
- args.select { |arg| arg =~ /^-/ }
+ dashes = args.select { |arg| arg =~ /^-/ }
@parser.on(*args) do |value|
handler.call(value, @options)
end
@@ -564,7 +511,7 @@ basic help message containing pointers to more information.
http://localhost:8808/
with info about installed gems
Further information:
- http://guides.rubygems.org
+ http://rubygems.rubyforge.org
HELP
# :startdoc:
@@ -572,7 +519,7 @@ basic help message containing pointers to more information.
end
##
-# \Commands will be placed in this namespace
+# 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
index 2af582177d..176e6a0bb4 100644
--- a/lib/rubygems/command_manager.rb
+++ b/lib/rubygems/command_manager.rb
@@ -4,6 +4,7 @@
# See LICENSE.txt for permissions.
#++
+require 'timeout'
require 'rubygems/command'
require 'rubygems/user_interaction'
@@ -18,15 +19,12 @@ require 'rubygems/user_interaction'
# # file rubygems_plugin.rb
# require 'rubygems/command_manager'
#
-# Gem::CommandManager.instance.register_command :edit
-#
-# You should put the implementation of your command in rubygems/commands.
-#
-# # file rubygems/commands/edit_command.rb
# 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
@@ -41,25 +39,9 @@ class Gem::CommandManager
end
##
- # Returns self. Allows a CommandManager instance to stand
- # in for the class itself.
-
- def instance
- self
- end
-
- ##
- # Reset the authoritative instance of the command manager.
-
- def self.reset
- @command_manager = nil
- end
-
- ##
# Register all the subcommands supported by the gem command.
def initialize
- require 'timeout'
@commands = {}
register_command :build
register_command :cert
@@ -90,25 +72,17 @@ class Gem::CommandManager
register_command :unpack
register_command :update
register_command :which
- register_command :yank
end
##
# Register the Symbol +command+ as a gem command.
- def register_command(command, obj=false)
- @commands[command] = obj
+ def register_command(command)
+ @commands[command] = false
end
##
- # Unregister the Symbol +command+ as a gem command.
-
- def unregister_command(command)
- @commands.delete command
- end
-
- ##
- # Returns a Command instance for +command_name+
+ # Return the registered command from the command name.
def [](command_name)
command_name = command_name.intern
@@ -117,68 +91,56 @@ class Gem::CommandManager
end
##
- # Return a sorted list of all command names as strings.
+ # Return a sorted list of all command names (as strings).
def command_names
@commands.keys.collect {|key| key.to_s}.sort
end
##
- # Run the command specified by +args+.
+ # Run the config specified by +args+.
- def run(args, build_args=nil)
- process_args(args, build_args)
+ def run(args)
+ process_args(args)
rescue StandardError, Timeout::Error => ex
alert_error "While executing gem ... (#{ex.class})\n #{ex.to_s}"
- ui.backtrace ex
-
- if Gem.configuration.really_verbose and \
- ex.kind_of?(Gem::Exception) and ex.source_exception
- e = ex.source_exception
-
- ui.errs.puts "Because of: (#{e.class})\n #{e.to_s}"
- ui.backtrace e
- end
-
+ 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, build_args=nil)
+ def process_args(args)
args = args.to_str.split(/\s+/) if args.respond_to?(:to_str)
-
- if args.empty? then
+ if args.size == 0
say Gem::Command::HELP
- terminate_interaction 1
+ terminate_interaction(1)
end
-
- case args.first
- when '-h', '--help' then
+ case args[0]
+ when '-h', '--help'
say Gem::Command::HELP
- terminate_interaction 0
- when '-v', '--version' then
+ terminate_interaction(0)
+ when '-v', '--version'
say Gem::VERSION
- terminate_interaction 0
- when /^-/ then
- alert_error "Invalid option: #{args.first}. See 'gem --help'."
- terminate_interaction 1
+ 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_with_build_args args, build_args
+ 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 Gem::CommandLineError,
- "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
- elsif possibilities.empty? then
- raise Gem::CommandLineError, "Unknown command #{cmd_name}"
+ raise "Ambiguous command #{cmd_name} matches [#{possibilities.join(', ')}]"
+ elsif possibilities.size < 1 then
+ raise "Unknown command #{cmd_name}"
end
self[possibilities.first]
@@ -187,11 +149,7 @@ class Gem::CommandManager
def find_command_possibilities(cmd_name)
len = cmd_name.length
- found = command_names.select { |name| cmd_name == name[0, len] }
-
- exact = found.find { |name| name == cmd_name }
-
- exact ? [exact] : found
+ command_names.select { |n| cmd_name == n[0, len] }
end
private
@@ -199,21 +157,24 @@ class Gem::CommandManager
def load_and_instantiate(command_name)
command_name = command_name.to_s
const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase } << "Command"
- load_error = nil
+ commands = Gem::Commands
+ retried = false
begin
+ commands.const_get const_name
+ rescue NameError
+ raise if retried
+
+ retried = true
begin
require "rubygems/commands/#{command_name}_command"
- rescue LoadError => e
- load_error = e
+ rescue Exception => e
+ alert_error "Loading command: #{command_name} (#{e.class})\n #{e}"
+ ui.errs.puts "\t#{e.backtrace.join "\n\t"}" if
+ Gem.configuration.backtrace
end
- Gem::Commands.const_get(const_name).new
- rescue Exception => e
- e = load_error if load_error
-
- alert_error "Loading command: #{command_name} (#{e.class})\n\t#{e}"
- ui.backtrace e
- end
+ retry
+ end.new
end
end
diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb
index 64563ed3db..e1f0122c6c 100644
--- a/lib/rubygems/commands/build_command.rb
+++ b/lib/rubygems/commands/build_command.rb
@@ -1,14 +1,10 @@
require 'rubygems/command'
-require 'rubygems/package'
+require 'rubygems/builder'
class Gem::Commands::BuildCommand < Gem::Command
def initialize
- super 'build', 'Build a gem from a gemspec'
-
- add_option '--force', 'skip validation of the spec' do |value, options|
- options[:force] = true
- end
+ super('build', 'Build a gem from a gemspec')
end
def arguments # :nodoc:
@@ -21,21 +17,37 @@ class Gem::Commands::BuildCommand < Gem::Command
def execute
gemspec = get_one_gem_name
-
- if File.exist? gemspec then
- spec = Gem::Specification.load gemspec
-
- if spec then
- Gem::Package.build spec, options[:force]
- else
- alert_error "Error loading gemspec. Aborting."
- terminate_interaction 1
+ 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}"
- terminate_interaction 1
end
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
index 5a9320f9c4..f5b698855b 100644
--- a/lib/rubygems/commands/cert_command.rb
+++ b/lib/rubygems/commands/cert_command.rb
@@ -1,228 +1,85 @@
require 'rubygems/command'
require 'rubygems/security'
-require 'openssl'
class Gem::Commands::CertCommand < Gem::Command
def initialize
- super 'cert', 'Manage RubyGems certificates and signing settings',
- :add => [], :remove => [], :list => [], :build => [], :sign => []
-
- OptionParser.accept OpenSSL::X509::Certificate do |certificate|
- begin
- OpenSSL::X509::Certificate.new File.read certificate
- rescue Errno::ENOENT
- raise OptionParser::InvalidArgument, "#{certificate}: does not exist"
- rescue OpenSSL::X509::CertificateError
- raise OptionParser::InvalidArgument,
- "#{certificate}: invalid X509 certificate"
+ 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
- OptionParser.accept OpenSSL::PKey::RSA do |key_file|
- begin
- key = OpenSSL::PKey::RSA.new File.read key_file
- rescue Errno::ENOENT
- raise OptionParser::InvalidArgument, "#{key_file}: does not exist"
- rescue OpenSSL::PKey::RSAError
- raise OptionParser::InvalidArgument, "#{key_file}: invalid RSA key"
+ 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
-
- raise OptionParser::InvalidArgument,
- "#{key_file}: private key not found" unless key.private?
-
- key
- end
-
- add_option('-a', '--add CERT', OpenSSL::X509::Certificate,
- 'Add a trusted certificate.') do |cert, options|
- options[:add] << cert
- end
-
- add_option('-l', '--list [FILTER]',
- 'List trusted certificates where the',
- 'subject contains FILTER') do |filter, options|
- filter ||= ''
-
- options[:list] << filter
- end
-
- add_option('-r', '--remove FILTER',
- 'Remove trusted certificates where the',
- 'subject contains FILTER') do |filter, options|
- options[:remove] << filter
end
add_option('-b', '--build EMAIL_ADDR',
'Build private key and self-signed',
- 'certificate for EMAIL_ADDR') do |email_address, options|
- options[:build] << email_address
+ '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', OpenSSL::X509::Certificate,
- 'Signing certificate for --sign') do |cert, options|
- options[:issuer_cert] = cert
+ 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', OpenSSL::PKey::RSA,
- 'Key for --sign or --build') do |key, options|
- options[:key] = key
+ 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 CERT',
- 'Signs CERT with the key from -K',
- 'and the certificate from -C') do |cert_file, options|
- raise OptionParser::InvalidArgument, "#{cert_file}: does not exist" unless
- File.file? cert_file
-
- options[:sign] << cert_file
+ 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
- options[:add].each do |certificate|
- Gem::Security.trust_dir.trust_cert certificate
-
- say "Added '#{certificate.subject}'"
- end
-
- options[:remove].each do |filter|
- certificates_matching filter do |certificate, path|
- FileUtils.rm path
- say "Removed '#{certificate.subject}'"
- end
- end
-
- options[:list].each do |filter|
- certificates_matching filter do |certificate, _|
- # this could probably be formatted more gracefully
- say certificate.subject.to_s
- end
- end
-
- options[:build].each do |name|
- build name
- end
-
- unless options[:sign].empty? then
- load_default_cert unless options[:issuer_cert]
- load_default_key unless options[:key]
- end
-
- options[:sign].each do |cert_file|
- sign cert_file
- end
- end
-
- def build name
- key = options[:key] || Gem::Security.create_key
-
- cert = Gem::Security.create_cert_email name, key
-
- key_path = Gem::Security.write key, "gem-private_key.pem"
- cert_path = Gem::Security.write cert, "gem-public_cert.pem"
-
- say "Certificate: #{cert_path}"
- say "Private Key: #{key_path}"
- say "Don't forget to move the key file to somewhere private!"
- end
-
- def certificates_matching filter
- return enum_for __method__, filter unless block_given?
-
- Gem::Security.trusted_certificates.select do |certificate, _|
- subject = certificate.subject.to_s
- subject.downcase.index filter
- end.sort_by do |certificate, _|
- certificate.subject.to_a.map { |name, data,| [name, data] }
- end.each do |certificate, path|
- yield certificate, path
- end
- end
-
- def description # :nodoc:
- <<-EOF
-The cert command manages signing keys and certificates for creating signed
-gems. Your signing certificate and private key are typically stored in
-~/.gem/gem-public_cert.pem and ~/.gem/gem-private_key.pem respectively.
-
-To build a certificate for signing gems:
-
- gem cert --build you@example
-
-If you already have an RSA key, or are creating a new certificate for an
-existing key:
-
- gem cert --build you@example --private-key /path/to/key.pem
-
-If you wish to trust a certificate you can add it to the trust list with:
-
- gem cert --add /path/to/cert.pem
-
-You can list trusted certificates with:
-
- gem cert --list
-
-or:
-
- gem cert --list cert_subject_substring
-
-If you wish to remove a previously trusted certificate:
-
- gem cert --remove cert_subject_substring
-
-To sign another gem author's certificate:
-
- gem cert --sign /path/to/other_cert.pem
-
-For further reading on signing gems see `ri Gem::Security`.
- EOF
- end
-
- def load_default_cert
- cert_file = File.join Gem.default_cert_path
- cert = File.read cert_file
- options[:issuer_cert] = OpenSSL::X509::Certificate.new cert
- rescue Errno::ENOENT
- alert_error \
- "--certificate not specified and ~/.gem/gem-public_cert.pem does not exist"
-
- terminate_interaction 1
- rescue OpenSSL::X509::CertificateError
- alert_error \
- "--certificate not specified and ~/.gem/gem-public_cert.pem is not valid"
-
- terminate_interaction 1
- end
-
- def load_default_key
- key_file = File.join Gem.default_key_path
- key = File.read key_file
- options[:key] = OpenSSL::PKey::RSA.new key
- rescue Errno::ENOENT
- alert_error \
- "--private-key not specified and ~/.gem/gem-private_key.pem does not exist"
-
- terminate_interaction 1
- rescue OpenSSL::PKey::RSAError
- alert_error \
- "--private-key not specified and ~/.gem/gem-private_key.pem is not valid"
-
- terminate_interaction 1
- end
-
- def sign cert_file
- cert = File.read cert_file
- cert = OpenSSL::X509::Certificate.new cert
-
- permissions = File.stat(cert_file).mode & 0777
-
- issuer_cert = options[:issuer_cert]
- issuer_key = options[:key]
-
- cert = Gem::Security.sign cert, issuer_key, issuer_cert
-
- Gem::Security.write cert, cert_file, permissions
end
end
diff --git a/lib/rubygems/commands/check_command.rb b/lib/rubygems/commands/check_command.rb
index d7677d47a1..475aeb3795 100644
--- a/lib/rubygems/commands/check_command.rb
+++ b/lib/rubygems/commands/check_command.rb
@@ -1,86 +1,80 @@
require 'rubygems/command'
require 'rubygems/version_option'
require 'rubygems/validator'
-require 'rubygems/doctor'
class Gem::Commands::CheckCommand < Gem::Command
include Gem::VersionOption
def initialize
- super 'check', 'Check a gem repository for added or missing files',
- :alien => true, :doctor => false, :dry_run => false, :gems => true
+ super 'check', 'Check installed gems',
+ :verify => false, :alien => false
- add_option('-a', '--[no-]alien',
- 'Report "unmanaged" or rogue files in the',
- 'gem repository') do |value, options|
- options[:alien] = value
+ add_option( '--verify FILE',
+ 'Verify gem file against its internal',
+ 'checksum') do |value, options|
+ options[:verify] = value
end
- add_option('--[no-]doctor',
- 'Clean up uninstalled gems and broken',
- 'specifications') do |value, options|
- options[:doctor] = value
+ add_option('-a', '--alien', "Report 'unmanaged' or rogue files in the",
+ "gem repository") do |value, options|
+ options[:alien] = true
end
- add_option('--[no-]dry-run',
- 'Do not remove files, only report what',
- 'would be removed') do |value, options|
- options[:dry_run] = value
+ add_option('-v', '--verbose', "Spew more words") do |value, options|
+ options[:verbose] = true
end
- add_option('--[no-]gems',
- 'Check installed gems for problems') do |value, options|
- options[:gems] = value
+ add_option('-t', '--test', "Run unit tests for gem") do |value, options|
+ options[:test] = true
end
- add_version_option 'check'
+ add_version_option 'run tests for'
end
- def check_gems
- say 'Checking gems...'
- say
- gems = get_all_gem_names rescue []
+ 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
- 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}"
+ 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
- else
- say "#{key} is error-free" if Gem.configuration.verbose
+ say
end
- say
end
- end
- def doctor
- say 'Checking for files from uninstalled gems...'
- say
-
- Gem.path.each do |gem_repo|
- doctor = Gem::Doctor.new gem_repo, options[:dry_run]
- doctor.doctor
+ 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
- def execute
- check_gems if options[:gems]
- doctor if options[:doctor]
- end
-
- def arguments # :nodoc:
- 'GEMNAME name of gem to check'
- end
-
- def defaults_str # :nodoc:
- '--gems --alien'
- end
-
- def usage # :nodoc:
- "#{program_name} [OPTIONS] [GEMNAME ...]"
- end
-
end
diff --git a/lib/rubygems/commands/cleanup_command.rb b/lib/rubygems/commands/cleanup_command.rb
index 61f189e449..1b6e405782 100644
--- a/lib/rubygems/commands/cleanup_command.rb
+++ b/lib/rubygems/commands/cleanup_command.rb
@@ -1,4 +1,5 @@
require 'rubygems/command'
+require 'rubygems/source_index'
require 'rubygems/dependency_list'
require 'rubygems/uninstaller'
@@ -7,19 +8,11 @@ class Gem::Commands::CleanupCommand < Gem::Command
def initialize
super 'cleanup',
'Clean up old versions of installed gems in the local repository',
- :force => false, :install_dir => Gem.dir
+ :force => false, :test => false, :install_dir => Gem.dir
add_option('-d', '--dryrun', "") do |value, options|
options[:dryrun] = true
end
-
- @candidate_gems = nil
- @default_gems = []
- @full = nil
- @gems_to_cleanup = nil
- @original_home = nil
- @original_path = nil
- @primary_gems = nil
end
def arguments # :nodoc:
@@ -34,9 +27,6 @@ class Gem::Commands::CleanupCommand < Gem::Command
<<-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.
-
-Older gems that are required to satisify the dependencies of gems
-are not removed.
EOF
end
@@ -46,119 +36,70 @@ are not removed.
def execute
say "Cleaning up installed gems..."
+ primary_gems = {}
- if options[:args].empty? then
- done = false
- last_set = nil
-
- until done do
- clean_gems
-
- this_set = @gems_to_cleanup.map { |spec| spec.full_name }.sort
-
- done = this_set.empty? || last_set == this_set
-
- last_set = this_set
+ 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
- else
- clean_gems
end
- say "Clean Up Complete"
-
- if Gem.configuration.really_verbose then
- skipped = @default_gems.map { |spec| spec.full_name }
+ gems_to_cleanup = []
- say "Skipped default gems: #{skipped.join ', '}"
+ 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
- end
-
- def clean_gems
- get_primary_gems
- get_candidate_gems
- get_gems_to_cleanup
- @full = Gem::DependencyList.from_specs
+ gems_to_cleanup = gems_to_cleanup.select { |spec|
+ primary_gems[spec.name].version != spec.version
+ }
deplist = Gem::DependencyList.new
- @gems_to_cleanup.each do |spec| deplist.add spec end
+ gems_to_cleanup.uniq.each do |spec| deplist.add spec end
- deps = deplist.strongly_connected_components.flatten
+ deps = deplist.strongly_connected_components.flatten.reverse
- @original_home = Gem.dir
- @original_path = Gem.path
+ 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}"
- deps.reverse_each do |spec|
- uninstall_dep spec
- end
+ options[:args] = [spec.name]
- Gem::Specification.reset
- end
+ uninstall_options = {
+ :executables => false,
+ :version => "= #{spec.version}",
+ }
- def get_candidate_gems
- @candidate_gems = unless options[:args].empty? then
- options[:args].map do |gem_name|
- Gem::Specification.find_all_by_name gem_name
- end.flatten
- else
- Gem::Specification.to_a
- end
- end
+ if Gem.user_dir == spec.installation_path then
+ uninstall_options[:install_dir] = spec.installation_path
+ end
- def get_gems_to_cleanup
- gems_to_cleanup = @candidate_gems.select { |spec|
- @primary_gems[spec.name].version != spec.version
- }
-
- default_gems, gems_to_cleanup = gems_to_cleanup.partition { |spec|
- spec.default_gem?
- }
-
- @default_gems += default_gems
- @default_gems.uniq!
- @gems_to_cleanup = gems_to_cleanup.uniq
- end
+ uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
- def get_primary_gems
- @primary_gems = {}
-
- Gem::Specification.each do |spec|
- if @primary_gems[spec.name].nil? or
- @primary_gems[spec.name].version < spec.version then
- @primary_gems[spec.name] = spec
+ 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
- end
- def uninstall_dep spec
- return unless @full.ok_to_remove?(spec.full_name)
-
- if options[:dryrun] then
- say "Dry Run Mode: Would uninstall #{spec.full_name}"
- return
- end
-
- say "Attempting to uninstall #{spec.full_name}"
-
- uninstall_options = {
- :executables => false,
- :version => "= #{spec.version}",
- }
-
- uninstall_options[:user_install] = Gem.user_dir == spec.base_dir
-
- uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
-
- begin
- uninstaller.uninstall
- rescue Gem::DependencyRemovalException, Gem::InstallError,
- Gem::GemNotInHomeException, Gem::FilePermissionError => e
- say "Unable to uninstall #{spec.full_name}:"
- say "\t#{e.class}: #{e.message}"
- end
- ensure
- # Restore path Gem::Uninstaller may have changed
- Gem.use_paths @original_home, *@original_path
+ say "Clean Up Complete"
end
end
diff --git a/lib/rubygems/commands/contents_command.rb b/lib/rubygems/commands/contents_command.rb
index 42c7fabd86..a49918689c 100644
--- a/lib/rubygems/commands/contents_command.rb
+++ b/lib/rubygems/commands/contents_command.rb
@@ -1,4 +1,3 @@
-require 'English'
require 'rubygems/command'
require 'rubygems/version_option'
@@ -53,64 +52,44 @@ class Gem::Commands::ContentsCommand < Gem::Command
end.flatten
path_kind = if spec_dirs.empty? then
- spec_dirs = Gem::Specification.dirs
+ 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
- Gem::Specification.map(&:name)
+ si.map { |_, spec| spec.name }
else
get_all_gem_names
end
gem_names.each do |name|
- # HACK: find_by_name fails for some reason... ARGH
- # How many places must we embed our resolve logic?
- spec = Gem::Specification.find_all_by_name(name, version).last
+ gem_spec = si.find_name(name, version).last
- unless spec then
+ unless gem_spec then
say "Unable to find gem '#{name}' in #{path_kind}"
if Gem.configuration.verbose then
say "\nDirectories searched:"
- spec_dirs.sort.each { |dir| say dir }
+ spec_dirs.each { |dir| say dir }
end
terminate_interaction 1 if gem_names.length == 1
end
- if spec.default_gem?
- files = spec.files.sort.map do |file|
- case file
- when /\A#{spec.bindir}\//
- [Gem::ConfigMap[:bindir], $POSTMATCH]
- when /\.so\z/
- [Gem::ConfigMap[:archdir], file]
- else
- [Gem::ConfigMap[:rubylibdir], file]
- end
- end
- else
- gem_path = spec.full_gem_path
- extra = "/{#{spec.require_paths.join ','}}" if options[:lib_only]
- glob = "#{gem_path}#{extra}/**/*"
- prefix_re = /#{Regexp.escape(gem_path)}\//
- files = Dir[glob].map do |file|
- [gem_path, file.sub(prefix_re, "")]
- end
- end
+ files = options[:lib_only] ? gem_spec.lib_files : gem_spec.files
- files.sort.each do |prefix, basename|
- absolute_path = File.join(prefix, basename)
- next if File.directory? absolute_path
+ files.each do |f|
+ path = if options[:prefix] then
+ File.join gem_spec.full_gem_path, f
+ else
+ f
+ end
- if options[:prefix]
- say absolute_path
- else
- say basename
- end
+ say path
end
end
end
diff --git a/lib/rubygems/commands/dependency_command.rb b/lib/rubygems/commands/dependency_command.rb
index 4690b13a94..649e3c2d2d 100644
--- a/lib/rubygems/commands/dependency_command.rb
+++ b/lib/rubygems/commands/dependency_command.rb
@@ -1,6 +1,7 @@
require 'rubygems/command'
require 'rubygems/local_remote_options'
require 'rubygems/version_option'
+require 'rubygems/source_info_cache'
class Gem::Commands::DependencyCommand < Gem::Command
@@ -43,12 +44,12 @@ class Gem::Commands::DependencyCommand < Gem::Command
end
def execute
- if options[:reverse_dependencies] and remote? and not local? then
- alert_error 'Only reverse dependencies for local gems are supported.'
- terminate_interaction 1
- end
-
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
@@ -58,25 +59,46 @@ class Gem::Commands::DependencyCommand < Gem::Command
/\A#{Regexp.union(*options[:args])}/
end
- # TODO: deprecate for real damnit
- dependency = Gem::Deprecate.skip_during {
- Gem::Dependency.new pattern, options[:version]
- }
+ dependency = Gem::Dependency.new pattern, options[:version]
dependency.prerelease = options[:prerelease]
- specs = []
+ if options[:reverse_dependencies] and remote? and not local? then
+ alert_error 'Only reverse dependencies for local gems are supported.'
+ terminate_interaction 1
+ end
- specs.concat dependency.matching_specs if local?
+ 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
- ss, _ = fetcher.spec_for_dependency dependency
+ begin
+ specs_and_sources = fetcher.find_matching(dependency, false, true,
+ dependency.prerelease?)
+
+ specs_and_sources.each do |spec_tuple, source_uri|
+ spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
- ss.each { |s,o| specs << s }
+ 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 specs.empty? then
+ if source_indexes.empty? then
patterns = options[:args].join ','
say "No gems found matching #{patterns} (#{options[:version]})" if
Gem.configuration.verbose
@@ -84,18 +106,24 @@ class Gem::Commands::DependencyCommand < Gem::Command
terminate_interaction 1
end
- specs = specs.uniq.sort
+ 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.each do |spec|
+ specs.values.each do |_, spec|
reverse[spec.full_name] = find_reverse_dependencies spec
end
end
if options[:pipe_format] then
- specs.each do |spec|
+ specs.values.sort_by { |_, spec| spec }.each do |_, spec|
unless spec.dependencies.empty?
spec.dependencies.sort_by { |dep| dep.name }.each do |dep|
say "#{dep.name} --version '#{dep.requirement}'"
@@ -105,7 +133,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
else
response = ''
- specs.each do |spec|
+ specs.values.sort_by { |_, spec| spec }.each do |_, spec|
response << print_dependencies(spec)
unless reverse[spec.full_name].empty? then
response << " Used by\n"
@@ -137,7 +165,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
def find_reverse_dependencies(spec)
result = []
- Gem::Specification.each do |sp|
+ Gem.source_index.each do |name, sp|
sp.dependencies.each do |dep|
dep = Gem::Dependency.new(*dep) unless Gem::Dependency === dep
@@ -151,5 +179,17 @@ class Gem::Commands::DependencyCommand < Gem::Command
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
index 40e71cf094..a8284b4bf6 100644
--- a/lib/rubygems/commands/environment_command.rb
+++ b/lib/rubygems/commands/environment_command.rb
@@ -13,7 +13,6 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
gempath display path used to search for gems
version display the gem format version
remotesources display the remote gem servers
- platform display the supported gem platforms
<omitted> display everything
EOF
return args.gsub(/^\s+/, '')
@@ -24,38 +23,35 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
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 a
-~/.gemrc file for individual users and a /etc/gemrc for all users. These
-files are YAML files with the following YAML keys:
+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
+ :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
- :disable_default_gem_server: Force specification of gem server host on push
- <gem_command>: A string containing arguments for the specified gem command
+ gem_command: A string containing arguments for the specified gem command
Example:
:verbose: false
install: --no-wrappers
update: --no-wrappers
- :disable_default_gem_server: true
-RubyGems' default local repository can be overridden 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
+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 would like to push gems to a private gem server the RUBYGEMS_HOST
-environment variable can be set to the URI for that 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
@@ -79,9 +75,7 @@ lib/rubygems/defaults/operating_system.rb
when /^gempath/, /^path/, /^GEM_PATH/ then
out << Gem.path.join(File::PATH_SEPARATOR)
when /^remotesources/ then
- out << Gem.sources.to_a.join("\n")
- when /^platform/ then
- out << Gem.platforms.join(File::PATH_SEPARATOR)
+ out << Gem.sources.join("\n")
when nil then
out = "RubyGems Environment:\n"
@@ -125,7 +119,7 @@ lib/rubygems/defaults/operating_system.rb
end
else
- raise Gem::CommandLineError, "Unknown environment option [#{arg}]"
+ raise Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
end
say out
true
diff --git a/lib/rubygems/commands/fetch_command.rb b/lib/rubygems/commands/fetch_command.rb
index f5a8abc349..43229c0512 100644
--- a/lib/rubygems/commands/fetch_command.rb
+++ b/lib/rubygems/commands/fetch_command.rb
@@ -1,6 +1,7 @@
require 'rubygems/command'
require 'rubygems/local_remote_options'
require 'rubygems/version_option'
+require 'rubygems/source_info_cache'
class Gem::Commands::FetchCommand < Gem::Command
@@ -13,7 +14,6 @@ class Gem::Commands::FetchCommand < Gem::Command
add_bulk_threshold_option
add_proxy_option
add_source_option
- add_clear_sources_option
add_version_option
add_platform_option
@@ -34,29 +34,30 @@ class Gem::Commands::FetchCommand < Gem::Command
def execute
version = options[:version] || Gem::Requirement.default
+ all = Gem::Requirement.default != version
- platform = Gem.platforms.last
gem_names = get_all_gem_names
gem_names.each do |gem_name|
dep = Gem::Dependency.new gem_name, version
dep.prerelease = options[:prerelease]
- specs_and_sources, errors = Gem::SpecFetcher.fetcher.spec_for_dependency dep
+ specs_and_sources = Gem::SpecFetcher.fetcher.fetch(dep, all, true,
+ dep.prerelease?)
- if platform then
- filtered = specs_and_sources.select { |s,| s.platform == platform }
- specs_and_sources = filtered unless filtered.empty?
- end
+ specs_and_sources, errors =
+ Gem::SpecFetcher.fetcher.fetch_with_errors(dep, all, true,
+ dep.prerelease?)
- spec, source = specs_and_sources.max_by { |s,| s.version }
+ spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
if spec.nil? then
- show_lookup_failure gem_name, version, errors, options[:domain]
+ show_lookup_failure gem_name, version, errors
next
end
- source.download spec
+ path = Gem::RemoteFetcher.fetcher.download spec, source_uri
+ FileUtils.mv path, spec.file_name
say "Downloaded #{spec.full_name}"
end
diff --git a/lib/rubygems/commands/generate_index_command.rb b/lib/rubygems/commands/generate_index_command.rb
index a7db013caf..945d32383c 100644
--- a/lib/rubygems/commands/generate_index_command.rb
+++ b/lib/rubygems/commands/generate_index_command.rb
@@ -11,16 +11,30 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
def initialize
super 'generate_index',
'Generates the index files for a gem server directory',
- :directory => '.', :build_modern => true
+ :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',
- '(always true)' do |value, options|
+ '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
@@ -29,10 +43,27 @@ class Gem::Commands::GenerateIndexCommand < Gem::Command
'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 . --modern"
+ "--directory . --legacy --modern"
end
def description # :nodoc:
@@ -55,15 +86,33 @@ When done, it will generate a set of files like this:
prerelease_specs.<version>.gz # prerelease specs index
quick/Marshal.<version>/<gemname>.gemspec.rz # Marshal quick index file
-The .rz extension files are compressed with the inflate algorithm.
+ # 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
- # This is always true becasue it's the only way now.
- options[:build_modern] = true
+ 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
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
index 7f1fb486e0..0c4a4ec16f 100644
--- a/lib/rubygems/commands/help_command.rb
+++ b/lib/rubygems/commands/help_command.rb
@@ -14,6 +14,11 @@ Some examples of 'gem' usage.
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:
@@ -37,7 +42,7 @@ Some examples of 'gem' usage.
* Create a gem:
- See http://guides.rubygems.org/make-your-own-gem/
+ See http://rubygems.rubyforge.org/wiki/wiki.pl?CreateAGemInTenMinutes
* See information about RubyGems:
@@ -113,15 +118,7 @@ platform.
format = "#{' ' * margin_width}%-#{desc_width}s%s"
command_manager.command_names.each do |cmd_name|
- command = command_manager[cmd_name]
-
- summary =
- if command then
- command.summary
- else
- "[No command found for #{cmd_name}, bug?]"
- end
-
+ summary = command_manager[cmd_name].summary
summary = wrap(summary, summary_width).split "\n"
out << sprintf(format, cmd_name, summary.shift)
until summary.empty? do
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
index 0b58fa665e..06a89eeb0a 100644
--- a/lib/rubygems/commands/install_command.rb
+++ b/lib/rubygems/commands/install_command.rb
@@ -1,11 +1,10 @@
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'
-require 'rubygems/install_message' # must come before rdoc for messaging
-require 'rubygems/rdoc'
##
# Gem installer command line tool
@@ -14,15 +13,16 @@ require 'rubygems/rdoc'
class Gem::Commands::InstallCommand < Gem::Command
- attr_reader :installed_specs # :nodoc:
-
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,
})
@@ -33,14 +33,6 @@ class Gem::Commands::InstallCommand < Gem::Command
add_platform_option
add_version_option
add_prerelease_option "to be installed. (Only for listed gems)"
-
- add_option(:"Install/Update", '-g', '--file FILE',
- 'Read from a gem dependencies API file and',
- 'install the listed gems') do |v,o|
- o[:gemdeps] = v
- end
-
- @installed_specs = nil
end
def arguments # :nodoc:
@@ -48,8 +40,8 @@ class Gem::Commands::InstallCommand < Gem::Command
end
def defaults_str # :nodoc:
- "--both --version '#{Gem::Requirement.default}' --document --no-force\n" +
- "--install-dir #{Gem.dir}"
+ "--both --version '#{Gem::Requirement.default}' --rdoc --ri --no-force\n" \
+ "--no-test --install-dir #{Gem.dir}"
end
def description # :nodoc:
@@ -109,86 +101,72 @@ to write the specification by hand. For example:
"#{program_name} GEMNAME [GEMNAME ...] [options] -- --build-flags"
end
- def install_from_gemdeps(gf)
- require 'rubygems/request_set'
- rs = Gem::RequestSet.new
- rs.load_gemdeps gf
-
- rs.resolve
-
- specs = rs.install options do |req, inst|
- s = req.full_spec
-
- if inst
- say "Installing #{s.name} (#{s.version})"
- else
- say "Using #{s.name} (#{s.version})"
- end
- end
-
- @installed_specs = specs
-
- raise Gem::SystemExitException, 0
- end
-
def execute
- if gf = options[:gemdeps] then
- install_from_gemdeps gf
- return
+ 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_specs = []
+ installed_gems = []
ENV.delete 'GEM_PATH' if options[:install_dir].nil? and RUBY_VERSION > '1.9'
- if options[:install_dir] and options[:user_install]
- alert_error "Use --install-dir or --user-install but not both"
- terminate_interaction 1
- end
-
exit_code = 0
- if options[:version] != Gem::Requirement.default &&
- get_all_gem_names.size > 1 then
- alert_error "Can't use --version w/ multiple gems. Use name:ver instead."
- terminate_interaction 1
- end
-
-
- get_all_gem_names_and_versions.each do |gem_name, gem_version|
- gem_version ||= options[:version]
-
+ get_all_gem_names.each do |gem_name|
begin
- next if options[:conservative] and
- not Gem::Dependency.new(gem_name, gem_version).matching_specs.empty?
-
inst = Gem::DependencyInstaller.new options
- inst.install gem_name, Gem::Requirement.create(gem_version)
-
- @installed_specs.push(*inst.installed_gems)
-
- next unless errs = inst.errors
-
- errs.each do |x|
- next unless Gem::SourceFetchProblem === x
+ inst.install gem_name, options[:version]
- msg = "Unable to pull data from '#{x.source.uri}': #{x.error.message}"
-
- alert_warning msg
+ 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
- show_lookup_failure e.name, e.version, e.errors, options[:domain]
+ show_lookup_failure e.name, e.version, e.errors
exit_code |= 2
end
end
- unless @installed_specs.empty? then
- gems = @installed_specs.length == 1 ? 'gem' : 'gems'
- say "#{@installed_specs.length} #{gems} installed"
+ 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
diff --git a/lib/rubygems/commands/lock_command.rb b/lib/rubygems/commands/lock_command.rb
index 6b4b25a281..5a43978dd9 100644
--- a/lib/rubygems/commands/lock_command.rb
+++ b/lib/rubygems/commands/lock_command.rb
@@ -30,7 +30,7 @@ generated.
Example:
- gem lock rails-1.0.0 > lockdown.rb
+ gemlock rails-1.0.0 > lockdown.rb
will produce in lockdown.rb:
@@ -75,7 +75,7 @@ lock it down to the exact version.
until pending.empty? do
full_name = pending.shift
- spec = Gem::Specification.load spec_path(full_name)
+ 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"
@@ -87,7 +87,7 @@ lock it down to the exact version.
spec.runtime_dependencies.each do |dep|
next if locked[dep.name]
- candidates = dep.matching_specs
+ candidates = Gem.source_index.search dep
if candidates.empty? then
complain "Unable to satisfy '#{dep}' from currently installed gems"
@@ -99,11 +99,11 @@ lock it down to the exact version.
end
def spec_path(gem_full_name)
- gemspecs = Gem.path.map { |path|
+ gemspecs = Gem.path.map do |path|
File.join path, "specifications", "#{gem_full_name}.gemspec"
- }
+ end
- gemspecs.find { |path| File.exist? path }
+ gemspecs.find { |gemspec| File.exist? gemspec }
end
end
diff --git a/lib/rubygems/commands/mirror_command.rb b/lib/rubygems/commands/mirror_command.rb
index 0f98077cbd..7cb8583326 100644
--- a/lib/rubygems/commands/mirror_command.rb
+++ b/lib/rubygems/commands/mirror_command.rb
@@ -1,17 +1,111 @@
+require 'yaml'
+require 'zlib'
+
require 'rubygems/command'
+require 'open-uri'
class Gem::Commands::MirrorCommand < Gem::Command
+
def initialize
- super('mirror', 'Mirror all gem files (requires rubygems-mirror)')
- begin
- Gem::Specification.find_by_name('rubygems-mirror').activate
- rescue Gem::LoadError
- # no-op
- end
+ 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
- alert_error "Install the rubygems-mirror gem for the mirror command"
+ 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
+
+ source_index_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|
+ source_index_data = Zlib::Inflate.inflate y.read
+ open File.join(save_to, "Marshal.#{Gem.marshal_version}"), "wb" do |out|
+ out.write source_index_data
+ end
+ end
+
+ source_index = Marshal.load source_index_data
+
+ progress = ui.progress_reporter source_index.size,
+ "Fetching #{source_index.size} gems"
+ source_index.each do |fullname, gem|
+ gem_file = gem.file_name
+ 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
index 887faab0a2..9e054f988c 100644
--- a/lib/rubygems/commands/outdated_command.rb
+++ b/lib/rubygems/commands/outdated_command.rb
@@ -16,18 +16,18 @@ class Gem::Commands::OutdatedCommand < Gem::Command
end
def execute
- Gem::Specification.outdated.sort.each do |name|
- local = Gem::Specification.find_all_by_name(name).max
- dep = Gem::Dependency.new local.name, ">= #{local.version}"
- remotes, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
+ locals = Gem::SourceIndex.from_installed_gems
- next if remotes.empty?
+ locals.outdated.sort.each do |name|
+ local = locals.find_name(name).last
- remotes.sort! { |a,b| a[0].version <=> b[0].version }
+ dep = Gem::Dependency.new local.name, ">= #{local.version}"
+ remotes = Gem::SpecFetcher.fetcher.fetch dep
+ remote = remotes.last.first
- highest = remotes.last.first
-
- say "#{local.name} (#{local.version} < #{highest.version})"
+ say "#{local.name} (#{local.version} < #{remote.version})"
end
end
+
end
+
diff --git a/lib/rubygems/commands/owner_command.rb b/lib/rubygems/commands/owner_command.rb
index 11e6e026fd..e88734e8fb 100644
--- a/lib/rubygems/commands/owner_command.rb
+++ b/lib/rubygems/commands/owner_command.rb
@@ -14,14 +14,9 @@ class Gem::Commands::OwnerCommand < Gem::Command
"GEM gem to manage owners for"
end
- def usage # :nodoc:
- "#{program_name} GEM"
- end
-
def initialize
super 'owner', description
add_proxy_option
- add_key_option
defaults.merge! :add => [], :remove => []
add_option '-a', '--add EMAIL', 'Add an owner' do |value, options|
@@ -44,7 +39,7 @@ class Gem::Commands::OwnerCommand < Gem::Command
def show_owners name
response = rubygems_api_request :get, "api/v1/gems/#{name}/owners.yaml" do |request|
- request.add_field "Authorization", api_key
+ request.add_field "Authorization", Gem.configuration.rubygems_api_key
end
with_response response do |resp|
@@ -67,16 +62,12 @@ class Gem::Commands::OwnerCommand < Gem::Command
def manage_owners method, name, owners
owners.each do |owner|
- begin
- response = rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
- request.set_form_data 'email' => owner
- request.add_field "Authorization", api_key
- end
-
- with_response response, "Removing #{owner}"
- rescue
- # ignore
+ response = rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
+ request.set_form_data 'email' => owner
+ request.add_field "Authorization", Gem.configuration.rubygems_api_key
end
+
+ with_response response
end
end
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 8d479211ac..ef11129d2c 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -1,5 +1,6 @@
+require 'fileutils'
require 'rubygems/command'
-require 'rubygems/package'
+require 'rubygems/format'
require 'rubygems/installer'
require 'rubygems/version_option'
@@ -10,9 +11,7 @@ class Gem::Commands::PristineCommand < Gem::Command
def initialize
super 'pristine',
'Restores installed gems to pristine condition from files located in the gem cache',
- :version => Gem::Requirement.default,
- :extensions => true,
- :all => false
+ :version => Gem::Requirement.default
add_option('--all',
'Restore all installed gems to pristine',
@@ -20,17 +19,6 @@ class Gem::Commands::PristineCommand < Gem::Command
options[:all] = value
end
- add_option('--[no-]extensions',
- 'Restore gems with extensions',
- 'in addition to regular gems') do |value, options|
- options[:extensions] = value
- end
-
- add_option('--only-executables',
- 'Only restore executables') do |value, options|
- options[:only_executables] = value
- end
-
add_version_option('restore to', 'pristine condition')
end
@@ -39,42 +27,43 @@ class Gem::Commands::PristineCommand < Gem::Command
end
def defaults_str # :nodoc:
- '--extensions'
+ "--all"
end
def description # :nodoc:
<<-EOF
-The pristine command compares an installed gem with the contents of its
-cached .gem file and restores any files that don't match the cached .gem's
-copy.
+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 an installed gem, the pristine command
-will revert them. All extensions are rebuilt and all bin stubs for the gem
-are regenerated after checking for modifications.
+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 it will be downloaded.
-
-If --no-extensions is provided pristine will not attempt to restore a gem
-with an extension.
+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} [GEMNAME ...]"
+ "#{program_name} [args]"
end
def execute
+ gem_name = nil
+
specs = if options[:all] then
- Gem::Specification.map
+ Gem::SourceIndex.from_installed_gems.map do |name, spec|
+ spec
+ end
else
- get_all_gem_names.map do |gem_name|
- Gem::Specification.find_all_by_name gem_name, options[:version]
- end.flatten
+ gem_name = get_one_gem_name
+ Gem::SourceIndex.from_installed_gems.find_name(gem_name,
+ options[:version])
end
- if specs.to_a.empty? then
+ if specs.empty? then
raise Gem::Exception,
- "Failed to find gems #{options[:args]} #{options[:version]}"
+ "Failed to find gem #{gem_name} #{options[:version]}"
end
install_dir = Gem.dir # TODO use installer option
@@ -82,46 +71,23 @@ with an extension.
raise Gem::FilePermissionError.new(install_dir) unless
File.writable?(install_dir)
- say "Restoring gems to pristine condition..."
+ say "Restoring gem(s) to pristine condition..."
specs.each do |spec|
- if spec.default_gem?
- say "Skipped #{spec.full_name}, it is a default gem"
- next
- end
+ gem = Dir[File.join(Gem.dir, 'cache', spec.file_name)].first
- unless spec.extensions.empty? or options[:extensions] then
- say "Skipped #{spec.full_name}, it needs to compile an extension"
+ if gem.nil? then
+ alert_error "Cached gem for #{spec.full_name} not found, use `gem install` to restore"
next
end
- gem = spec.cache_file
-
- unless File.exist? gem then
- require 'rubygems/remote_fetcher'
-
- say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
- dep = Gem::Dependency.new spec.name, spec.version
- Gem::RemoteFetcher.fetcher.download_to_cache dep
- end
-
# TODO use installer options
- install_defaults = Gem::ConfigFile::PLATFORM_DEFAULTS['install']
- installer_env_shebang = install_defaults.to_s['--env-shebang']
-
- installer = Gem::Installer.new(gem,
- :wrappers => true,
- :force => true,
- :install_dir => spec.base_dir,
- :env_shebang => installer_env_shebang,
- :build_args => spec.build_args)
- if options[:only_executables] then
- installer.generate_bin
- else
- installer.install
- end
+ 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/push_command.rb b/lib/rubygems/commands/push_command.rb
index fccad206fa..cabcd3d94d 100644
--- a/lib/rubygems/commands/push_command.rb
+++ b/lib/rubygems/commands/push_command.rb
@@ -1,7 +1,6 @@
require 'rubygems/command'
require 'rubygems/local_remote_options'
require 'rubygems/gemcutter_utilities'
-require 'rubygems/package'
class Gem::Commands::PushCommand < Gem::Command
include Gem::LocalRemoteOptions
@@ -20,64 +19,23 @@ class Gem::Commands::PushCommand < Gem::Command
end
def initialize
- super 'push', description, :host => self.host
-
+ super 'push', description
add_proxy_option
- add_key_option
-
- add_option('--host HOST',
- 'Push to another gemcutter-compatible host') do |value, options|
- options[:host] = value
- end
-
- @host = nil
end
def execute
- @host = options[:host]
-
- sign_in @host
-
+ sign_in
send_gem get_one_gem_name
end
def send_gem name
- args = [:post, "api/v1/gems"]
-
- latest_rubygems_version = Gem.latest_rubygems_version
-
- if latest_rubygems_version < Gem.rubygems_version and
- Gem.rubygems_version.prerelease? and
- Gem::Version.new('2.0.0.rc.2') != Gem.rubygems_version then
- alert_error <<-ERROR
-You are using a beta release of RubyGems (#{Gem::VERSION}) which is not
-allowed to push gems. Please downgrade or upgrade to a release version.
-
-The latest released RubyGems version is #{latest_rubygems_version}
-
-You can upgrade or downgrade to the latest release version with:
-
- gem update --system=#{latest_rubygems_version}
-
- ERROR
- terminate_interaction 1
- end
-
- unless @host then
- if gem_data = Gem::Package.new(name) then
- @host = gem_data.spec.metadata['default_gem_server']
- end
- end
-
- args << @host if @host
-
- say "Pushing gem to #{@host || Gem.host}..."
+ say "Pushing gem to RubyGems.org..."
- response = rubygems_api_request(*args) do |request|
+ response = rubygems_api_request :post, "api/v1/gems" do |request|
request.body = Gem.read_binary name
request.add_field "Content-Length", request.body.size
request.add_field "Content-Type", "application/octet-stream"
- request.add_field "Authorization", api_key
+ request.add_field "Authorization", Gem.configuration.rubygems_api_key
end
with_response response
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
index 05b214bb63..93b417015c 100644
--- a/lib/rubygems/commands/query_command.rb
+++ b/lib/rubygems/commands/query_command.rb
@@ -14,17 +14,13 @@ class Gem::Commands::QueryCommand < Gem::Command
summary = 'Query gem information in local or remote repositories')
super name, summary,
:name => //, :domain => :local, :details => false, :versions => true,
- :installed => nil, :version => Gem::Requirement.default
+ :installed => false, :version => Gem::Requirement.default
add_option('-i', '--[no-]installed',
'Check for installed gem') do |value, options|
options[:installed] = value
end
- add_option('-I', 'Equivalent to --no-installed') do |value, options|
- options[:installed] = false
- end
-
add_version_option command, "for use with --installed"
add_option('-n', '--name-matches REGEXP',
@@ -67,29 +63,21 @@ class Gem::Commands::QueryCommand < Gem::Command
name = options[:name]
prerelease = options[:prerelease]
- unless options[:installed].nil? then
+ 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
- installed = installed? name, options[:version]
- installed = !installed unless options[:installed]
-
- if installed then
- say "true"
- else
- say "false"
- exit_code |= 1
- end
+ say "false"
+ exit_code |= 1
end
- terminate_interaction exit_code
+ raise Gem::SystemExitException, exit_code
end
- req = Gem::Requirement.default
- # TODO: deprecate for real
- dep = Gem::Deprecate.skip_during { Gem::Dependency.new name, req }
- dep.prerelease = prerelease
+ dep = Gem::Dependency.new name, Gem::Requirement.default
if local? then
if prerelease and not both? then
@@ -102,12 +90,10 @@ class Gem::Commands::QueryCommand < Gem::Command
say
end
- specs = Gem::Specification.find_all { |s|
- s.name =~ name and req =~ s.version
- }
+ specs = Gem.source_index.search dep
spec_tuples = specs.map do |spec|
- [spec.name_tuple, spec]
+ [[spec.name, spec.version, spec.original_platform, spec], :local]
end
output_query_results spec_tuples
@@ -120,25 +106,31 @@ class Gem::Commands::QueryCommand < Gem::Command
say
end
- fetcher = Gem::SpecFetcher.fetcher
+ all = options[:all]
- type = if options[:all]
- if options[:prerelease]
- :complete
- else
- :released
- end
- elsif options[:prerelease]
- :prerelease
- else
- :latest
- end
-
- if options[:name].source.empty?
- spec_tuples = fetcher.detect(type) { true }
- else
- spec_tuples = fetcher.detect(type) do |name_tuple|
- options[:name] === name_tuple.name
+ begin
+ fetcher = Gem::SpecFetcher.fetcher
+ spec_tuples = fetcher.find_matching dep, all, false, prerelease
+
+ spec_tuples += fetcher.find_matching dep, false, false, true if
+ prerelease and all
+ 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
@@ -151,167 +143,137 @@ class Gem::Commands::QueryCommand < Gem::Command
##
# Check if gem +name+ version +version+ is installed.
- def installed?(name, req = Gem::Requirement.default)
- Gem::Specification.any? { |s| s.name =~ name and req =~ s.version }
+ 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|
- versions[spec_tuple.name] << [spec_tuple, source]
+ spec_tuples.each do |spec_tuple, source_uri|
+ versions[spec_tuple.first] << [spec_tuple, source_uri]
end
- versions = versions.sort_by do |(n,_),_|
- n.downcase
+ versions = versions.sort_by do |(name,_),_|
+ name.downcase
end
- output_versions output, versions
-
- say output.join(options[:details] ? "\n\n" : "\n")
- end
-
- def output_versions output, versions
versions.each do |gem_name, matching_tuples|
- matching_tuples = matching_tuples.sort_by { |n,_| n.version }.reverse
+ matching_tuples = matching_tuples.sort_by do |(name, version,_),_|
+ version
+ end.reverse
platforms = Hash.new { |h,version| h[version] = [] }
- matching_tuples.each do |n, _|
- platforms[n.version] << n.platform if n.platform
+ matching_tuples.map do |(name, version, platform,_),_|
+ platforms[version] << platform if platform
end
seen = {}
- matching_tuples.delete_if do |n,_|
- if seen[n.version] then
+ matching_tuples.delete_if do |(name, version,_),_|
+ if seen[version] then
true
else
- seen[n.version] = true
+ seen[version] = true
false
end
end
- output << make_entry(matching_tuples, platforms)
- end
- end
-
- def entry_details entry, detail_tuple, specs, platforms
- return unless options[:details]
+ entry = gem_name.dup
- name_tuple, spec = detail_tuple
+ if options[:versions] then
+ list = if platforms.empty? or options[:details] then
+ matching_tuples.map { |(name, version,_),_| version }.uniq
+ else
+ platforms.sort.reverse.map do |version, pls|
+ if pls == [Gem::Platform::RUBY] then
+ version
+ else
+ ruby = pls.delete Gem::Platform::RUBY
+ platform_list = [ruby, *pls.sort].compact
+ "#{version} #{platform_list.join ' '}"
+ end
+ end
+ end.join ', '
+
+ entry << " (#{list})"
+ end
- spec = spec.fetch_spec name_tuple unless Gem::Specification === spec
+ if options[:details] then
+ detail_tuple = matching_tuples.first
- entry << "\n"
+ 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
- spec_platforms entry, platforms
- spec_authors entry, spec
- spec_homepage entry, spec
- spec_license entry, spec
- spec_loaded_from entry, spec, specs
- spec_summary entry, spec
- end
+ entry << "\n"
- def entry_versions entry, name_tuples, platforms
- return unless options[:versions]
+ non_ruby = platforms.any? do |_, pls|
+ pls.any? { |pl| pl != Gem::Platform::RUBY }
+ end
- list =
- if platforms.empty? or options[:details] then
- name_tuples.map { |n| n.version }.uniq
- else
- platforms.sort.reverse.map do |version, pls|
- if pls == [Gem::Platform::RUBY] then
- version
+ if non_ruby then
+ if platforms.length == 1 then
+ title = platforms.values.length == 1 ? 'Platform' : 'Platforms'
+ entry << " #{title}: #{platforms.values.sort.join ', '}\n"
else
- ruby = pls.delete Gem::Platform::RUBY
- platform_list = [ruby, *pls.sort].compact
- "#{version} #{platform_list.join ' '}"
+ 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
- end
-
- entry << " (#{list.join ', '})"
- end
-
- def make_entry entry_tuples, platforms
- detail_tuple = entry_tuples.first
-
- name_tuples, specs = entry_tuples.flatten.partition do |item|
- Gem::NameTuple === item
- end
-
- entry = [name_tuples.first.name]
-
- entry_versions entry, name_tuples, platforms
- entry_details entry, detail_tuple, specs, platforms
-
- entry.join
- end
-
- def spec_authors entry, spec
- authors = "Author#{spec.authors.length > 1 ? 's' : ''}: "
- authors << spec.authors.join(', ')
- entry << format_text(authors, 68, 4)
- end
-
- def spec_homepage entry, spec
- return if spec.homepage.nil? or spec.homepage.empty?
-
- entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
- end
- def spec_license entry, spec
- return if spec.license.nil? or spec.license.empty?
+ authors = "Author#{spec.authors.length > 1 ? 's' : ''}: "
+ authors << spec.authors.join(', ')
+ entry << format_text(authors, 68, 4)
- licenses = "License#{spec.licenses.length > 1 ? 's' : ''}: "
- licenses << spec.licenses.join(', ')
- entry << "\n" << format_text(licenses, 68, 4)
- end
+ 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
- def spec_loaded_from entry, spec, specs
- return unless spec.loaded_from
-
- if specs.length == 1 then
- default = spec.default_gem? ? ' (default)' : nil
- entry << "\n" << " Installed at#{default}: #{spec.base_dir}"
- else
- label = 'Installed at'
- specs.each do |s|
- version = s.version.to_s
- version << ', default' if s.default_gem?
- entry << "\n" << " #{label} (#{version}): #{s.base_dir}"
- label = ' ' * label.length
- end
- end
- end
+ if spec.homepage and not spec.homepage.empty? then
+ entry << "\n" << format_text("Homepage: #{spec.homepage}", 68, 4)
+ end
- def spec_platforms entry, platforms
- non_ruby = platforms.any? do |_, pls|
- pls.any? { |pl| pl != Gem::Platform::RUBY }
- 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
- return unless non_ruby
+ 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
- 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"
+ entry << "\n\n" << format_text(spec.summary, 68, 4)
end
+ output << entry
end
- end
- def spec_summary entry, spec
- entry << "\n\n" << format_text(spec.summary, 68, 4)
+ 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
index df00f3a5df..ea0f3ad592 100644
--- a/lib/rubygems/commands/rdoc_command.rb
+++ b/lib/rubygems/commands/rdoc_command.rb
@@ -1,7 +1,6 @@
require 'rubygems/command'
require 'rubygems/version_option'
-require 'rubygems/rdoc'
-require 'fileutils'
+require 'rubygems/doc_manager'
class Gem::Commands::RdocCommand < Gem::Command
include Gem::VersionOption
@@ -9,7 +8,7 @@ class Gem::Commands::RdocCommand < Gem::Command
def initialize
super 'rdoc', 'Generates RDoc for pre-installed gems',
:version => Gem::Requirement.default,
- :include_rdoc => false, :include_ri => true, :overwrite => false
+ :include_rdoc => true, :include_ri => true, :overwrite => false
add_option('--all',
'Generate RDoc/RI documentation for all',
@@ -40,7 +39,7 @@ class Gem::Commands::RdocCommand < Gem::Command
end
def defaults_str # :nodoc:
- "--version '#{Gem::Requirement.default}' --ri --no-overwrite"
+ "--version '#{Gem::Requirement.default}' --rdoc --ri --no-overwrite"
end
def description # :nodoc:
@@ -55,37 +54,37 @@ The rdoc command builds RDoc and RI documentation for installed gems. Use
end
def execute
- specs = if options[:all] then
- Gem::Specification.to_a
- else
- get_all_gem_names.map do |name|
- Gem::Specification.find_by_name name, options[:version]
- end.flatten.uniq
- end
-
- if specs.empty? then
- alert_error 'No matching gems found'
- terminate_interaction 1
+ 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
- specs.each do |spec|
- doc = Gem::RDoc.new spec, options[:include_rdoc], options[:include_ri]
-
- doc.force = options[:overwrite]
+ if specs.empty?
+ raise "Failed to find gem #{gem_name} to generate RDoc for #{options[:version]}"
+ end
- if options[:overwrite] then
- FileUtils.rm_rf File.join(spec.doc_dir, 'ri')
- FileUtils.rm_rf File.join(spec.doc_dir, 'rdoc')
+ if options[:include_ri]
+ specs.sort.each do |spec|
+ doc = Gem::DocManager.new(spec)
+ doc.generate_ri if options[:overwrite] || !doc.ri_installed?
end
- begin
- doc.generate
- rescue Errno::ENOENT => e
- e.message =~ / - /
- alert_error "Unable to document #{spec.full_name}, #{$'} is missing, skipping"
- terminate_interaction 1 if specs.length == 1
+ Gem::DocManager.update_ri_cache
+ end
+
+ if options[:include_rdoc]
+ specs.sort.each do |spec|
+ doc = Gem::DocManager.new(spec)
+ doc.generate_rdoc if options[:overwrite] || !doc.rdoc_installed?
end
end
+
+ true
end
end
diff --git a/lib/rubygems/commands/search_command.rb b/lib/rubygems/commands/search_command.rb
index c125715fe2..52e96fd1ef 100644
--- a/lib/rubygems/commands/search_command.rb
+++ b/lib/rubygems/commands/search_command.rb
@@ -7,8 +7,6 @@ class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand
super 'search', 'Display all gems whose name contains STRING'
remove_option '--name-matches'
-
- defaults[:domain] = :remote
end
def arguments # :nodoc:
@@ -16,7 +14,7 @@ class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand
end
def defaults_str # :nodoc:
- "--remote --no-details"
+ "--local --no-details"
end
def usage # :nodoc:
diff --git a/lib/rubygems/commands/server_command.rb b/lib/rubygems/commands/server_command.rb
index 4796ce2ad6..4277787035 100644
--- a/lib/rubygems/commands/server_command.rb
+++ b/lib/rubygems/commands/server_command.rb
@@ -17,7 +17,7 @@ class Gem::Commands::ServerCommand < Gem::Command
else
begin
Socket.getservbyname port
- rescue SocketError
+ rescue SocketError => e
raise OptionParser::InvalidArgument, "#{port}: no such named service"
end
end
@@ -43,14 +43,6 @@ class Gem::Commands::ServerCommand < Gem::Command
options[:addresses] ||= []
options[:addresses].push(*address)
end
-
- add_option '-l', '--launch[=COMMAND]',
- 'launches a browser window',
- "COMMAND defaults to 'start' on Windows",
- "and 'open' on all other platforms" do |launch, options|
- launch ||= Gem.win_platform? ? 'start' : 'open'
- options[:launch] = launch
- end
end
def defaults_str # :nodoc:
@@ -78,7 +70,7 @@ You can set up a shortcut to gem server documentation using the URL:
end
def execute
- options[:gemdir] = Gem.path if options[:gemdir].empty?
+ options[:gemdir] << Gem.dir if options[:gemdir].empty?
Gem::Server.run options
end
diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb
index face77fae9..4bc115eaf8 100644
--- a/lib/rubygems/commands/setup_command.rb
+++ b/lib/rubygems/commands/setup_command.rb
@@ -1,26 +1,19 @@
require 'rubygems/command'
+require 'fileutils'
+require 'rbconfig'
+require 'tmpdir'
##
# Installs RubyGems itself. This command is ordinarily only available from a
# RubyGems checkout or tarball.
class Gem::Commands::SetupCommand < Gem::Command
- HISTORY_HEADER = /^===\s*[\d.]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
- VERSION_MATCHER = /^===\s*([\d.]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/
def initialize
- require 'tmpdir'
-
super 'setup', 'Install RubyGems',
- :format_executable => true, :document => %w[ri],
+ :format_executable => true, :rdoc => true, :ri => true,
:site_or_vendor => :sitelibdir,
- :destdir => '', :prefix => '', :previous_version => ''
-
- add_option '--previous-version=VERSION',
- 'Previous version of rubygems',
- 'Used for changelog processing' do |version, options|
- options[:previous_version] = version
- end
+ :destdir => '', :prefix => ''
add_option '--prefix=PREFIX',
'Prefix path for installing RubyGems',
@@ -35,7 +28,13 @@ class Gem::Commands::SetupCommand < Gem::Command
end
add_option '--[no-]vendor',
- 'Install into vendorlibdir not sitelibdir' do |vendor, options|
+ '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
@@ -45,44 +44,19 @@ class Gem::Commands::SetupCommand < Gem::Command
options[:format_executable] = value
end
- add_option '--[no-]document [TYPES]', Array,
- 'Generate documentation for RubyGems.',
- 'List the documentation types you wish to',
- 'generate. For example: rdoc,ri' do |value, options|
- options[:document] = case value
- when nil then %w[rdoc ri]
- when false then []
- else value
- end
- end
-
add_option '--[no-]rdoc',
'Generate RDoc documentation for RubyGems' do |value, options|
- if value then
- options[:document] << 'rdoc'
- else
- options[:document].delete 'rdoc'
- end
-
- options[:document].uniq!
+ options[:rdoc] = value
end
add_option '--[no-]ri',
'Generate RI documentation for RubyGems' do |value, options|
- if value then
- options[:document] << 'ri'
- else
- options[:document].delete 'ri'
- end
-
- options[:document].uniq!
+ options[:ri] = value
end
-
- @verbose = nil
end
def check_ruby_version
- required_version = Gem::Requirement.new '>= 1.8.7'
+ 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}"
@@ -91,7 +65,7 @@ class Gem::Commands::SetupCommand < Gem::Command
end
def defaults_str # :nodoc:
- "--format-executable --document ri"
+ "--format-executable --rdoc --ri"
end
def description # :nodoc:
@@ -124,7 +98,6 @@ By default, this RubyGems will install gem as:
check_ruby_version
- require 'fileutils'
if Gem.configuration.really_verbose then
extend FileUtils::Verbose
else
@@ -139,13 +112,13 @@ By default, this RubyGems will install gem as:
remove_old_bin_files bin_dir
- remove_old_lib_files lib_dir
+ remove_source_caches install_destdir
say "RubyGems #{Gem::VERSION} installed"
uninstall_old_gemcutter
- documentation_success = install_rdoc
+ install_rdoc
say
if @verbose then
@@ -153,13 +126,19 @@ By default, this RubyGems will install gem as:
say
end
- if options[:previous_version].empty?
- options[:previous_version] = Gem::VERSION.sub(/[0-9]+$/, '0')
- end
+ release_notes = File.join Dir.pwd, 'History.txt'
- options[:previous_version] = Gem::Version.new(options[:previous_version])
+ release_notes = if File.exist? release_notes then
+ open release_notes do |io|
+ text = io.gets '==='
+ text << io.gets('===')
+ text[0...-3]
+ end
+ else
+ "Oh-no! Unable to find release notes!"
+ end
- show_release_notes
+ say release_notes
say
say "-" * 78
@@ -174,31 +153,6 @@ By default, this RubyGems will install gem as:
say "to remove it by hand."
say
end
-
- if documentation_success
- if options[:document].include? 'rdoc' then
- say "Rdoc documentation was installed. You may now invoke:"
- say " gem server"
- say "and then peruse beautifully formatted documentation for your gems"
- say "with your web browser."
- say "If you do not wish to install this documentation in the future, use the"
- say "--no-document flag, or set it as the default in your ~/.gemrc file. See"
- say "'gem help env' for details."
- say
- end
-
- if options[:document].include? 'ri' then
- say "Ruby Interactive (ri) documentation was installed. ri is kind of like man "
- say "pages for ruby libraries. You may access it like this:"
- say " ri Classname"
- say " ri Classname.class_method"
- say " ri Classname#instance_method"
- say "If you do not wish to install this documentation in the future, use the"
- say "--no-document flag, or set it as the default in your ~/.gemrc file. See"
- say "'gem help env' for details."
- say
- end
- end
end
def install_executables(bin_dir)
@@ -219,7 +173,7 @@ By default, this RubyGems will install gem as:
end
dest_file = File.join bin_dir, bin_file_formatted
- bin_tmp_file = File.join Dir.tmpdir, "#{bin_file}.#{$$}"
+ bin_tmp_file = File.join Dir.tmpdir, bin_file
begin
bin = File.readlines bin_file
@@ -259,27 +213,18 @@ TEXT
end
end
- def install_file file, dest_dir
- dest_file = File.join dest_dir, file
- dest_dir = File.dirname dest_file
- mkdir_p dest_dir unless File.directory? dest_dir
-
- install file, dest_file, :mode => 0644
- end
-
def install_lib(lib_dir)
say "Installing RubyGems" if @verbose
- lib_files = rb_files_in 'lib'
- pem_files = pem_files_in 'lib'
-
Dir.chdir 'lib' do
+ lib_files = Dir[File.join('**', '*rb')]
+
lib_files.each do |lib_file|
- install_file lib_file, lib_dir
- end
+ dest_file = File.join lib_dir, lib_file
+ dest_dir = File.dirname dest_file
+ mkdir_p dest_dir unless File.directory? dest_dir
- pem_files.each do |pem_file|
- install_file pem_file, lib_dir
+ install lib_file, dest_file, :mode => 0644
end
end
end
@@ -289,12 +234,6 @@ TEXT
rubygems_name = "rubygems-#{Gem::VERSION}"
rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
- begin
- Gem.ensure_gem_subdirectories Gem.dir
- rescue SystemCallError
- # ignore
- end
-
if File.writable? gem_doc_dir and
(not File.exist? rubygems_doc_dir or
File.writable? rubygems_doc_dir) then
@@ -303,42 +242,27 @@ TEXT
rm_rf dir
end
- require 'rubygems/rdoc'
-
- fake_spec = Gem::Specification.new 'rubygems', Gem::VERSION
- def fake_spec.full_gem_path
- File.expand_path '../../../..', __FILE__
+ if options[:ri] then
+ ri_dir = File.join rubygems_doc_dir, 'ri'
+ say "Installing #{rubygems_name} ri into #{ri_dir}" if @verbose
+ run_rdoc '--ri', '--op', ri_dir
end
- generate_ri = options[:document].include? 'ri'
- generate_rdoc = options[:document].include? 'rdoc'
-
- rdoc = Gem::RDoc.new fake_spec, generate_rdoc, generate_ri
- rdoc.generate
-
- return true
+ if options[:rdoc] then
+ rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
+ say "Installing #{rubygems_name} rdoc into #{rdoc_dir}" if @verbose
+ run_rdoc '--op', rdoc_dir
+ end
elsif @verbose then
say "Skipping RDoc generation, #{gem_doc_dir} not writable"
say "Set the GEM_HOME environment variable if you want RDoc generated"
end
-
- return false
end
def make_destination_dirs(install_destdir)
- lib_dir, bin_dir = Gem.default_rubygems_dirs
-
- unless lib_dir
- lib_dir, bin_dir = generate_default_dirs(install_destdir)
- end
-
- mkdir_p lib_dir
- mkdir_p bin_dir
-
- return lib_dir, bin_dir
- end
+ lib_dir = nil
+ bin_dir = nil
- def generate_default_dirs(install_destdir)
prefix = options[:prefix]
site_or_vendor = options[:site_or_vendor]
@@ -367,19 +291,10 @@ TEXT
bin_dir = File.join install_destdir, bin_dir.gsub(/^[a-zA-Z]:/, '')
end
- [lib_dir, bin_dir]
- end
-
- def pem_files_in dir
- Dir.chdir dir do
- Dir[File.join('**', '*pem')]
- end
- end
+ mkdir_p lib_dir
+ mkdir_p bin_dir
- def rb_files_in dir
- Dir.chdir dir do
- Dir[File.join('**', '*rb')]
- end
+ return lib_dir, bin_dir
end
def remove_old_bin_files(bin_dir)
@@ -414,60 +329,35 @@ abort "#{deprecation_message}"
end
end
- def remove_old_lib_files lib_dir
- rubygems_dir = File.join lib_dir, 'rubygems'
- lib_files = rb_files_in 'lib/rubygems'
-
- old_lib_files = rb_files_in rubygems_dir
+ def remove_source_caches(install_destdir)
+ if install_destdir.empty?
+ require 'rubygems/source_info_cache'
- to_remove = old_lib_files - lib_files
+ user_cache_file = File.join(install_destdir,
+ Gem::SourceInfoCache.user_cache_file)
+ system_cache_file = File.join(install_destdir,
+ Gem::SourceInfoCache.system_cache_file)
- to_remove.delete_if do |file|
- file.start_with? 'defaults'
- end
-
- Dir.chdir rubygems_dir do
- to_remove.each do |file|
- FileUtils.rm_f file
-
- warn "unable to remove old file #{file} please remove it by hand" if
- File.exist? file
- end
+ say "Removing old source_cache files" if Gem.configuration.really_verbose
+ 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 show_release_notes
- release_notes = File.join Dir.pwd, 'History.txt'
-
- release_notes =
- if File.exist? release_notes then
- history = File.read release_notes
-
- history.force_encoding Encoding::UTF_8 if
- Object.const_defined? :Encoding
-
- history = history.sub(/^# coding:.*?^=/m, '')
-
- text = history.split(HISTORY_HEADER)
- text.shift # correct an off-by-one generated by split
- version_lines = history.scan(HISTORY_HEADER)
- versions = history.scan(VERSION_MATCHER).flatten.map do |x|
- Gem::Version.new(x)
- end
-
- history_string = ""
+ def run_rdoc(*args)
+ begin
+ gem 'rdoc'
+ rescue Gem::LoadError
+ end
- until versions.length == 0 or
- versions.shift < options[:previous_version] do
- history_string += version_lines.shift + text.shift
- end
+ require 'rdoc/rdoc'
- history_string
- else
- "Oh-no! Unable to find release notes!"
- end
+ args << '--quiet'
+ args << '--main' << 'README'
+ args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
- say release_notes
+ r = RDoc::RDoc.new
+ r.document args
end
def uninstall_old_gemcutter
diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb
index f4cc3e57ae..245ab91c9f 100644
--- a/lib/rubygems/commands/sources_command.rb
+++ b/lib/rubygems/commands/sources_command.rb
@@ -1,5 +1,7 @@
+require 'fileutils'
require 'rubygems/command'
require 'rubygems/remote_fetcher'
+require 'rubygems/source_info_cache'
require 'rubygems/spec_fetcher'
require 'rubygems/local_remote_options'
@@ -8,8 +10,6 @@ class Gem::Commands::SourcesCommand < Gem::Command
include Gem::LocalRemoteOptions
def initialize
- require 'fileutils'
-
super 'sources',
'Manage the sources and cache file RubyGems uses to search for gems'
@@ -48,54 +48,54 @@ class Gem::Commands::SourcesCommand < Gem::Command
options[:update])
if options[:clear_all] then
- path = File.join Gem.user_home, '.gem', 'specs'
+ path = Gem::SpecFetcher.fetcher.dir
FileUtils.rm_rf path
- unless File.exist? path then
+ 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
- unless File.writable? path then
- say "*** Unable to remove source cache (write protected) ***"
- else
- say "*** Unable to remove source cache ***"
- end
-
- terminate_interaction 1
+ 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 source_uri = options[:add] then
- uri = URI source_uri
+ if options[:add] then
+ source_uri = options[:add]
+ uri = URI.parse source_uri
- if uri.scheme and uri.scheme.downcase == 'http' and
- uri.host.downcase == 'rubygems.org' then
- question = <<-QUESTION.chomp
-https://rubygems.org is recommended for security over #{uri}
+ begin
+ Gem::SpecFetcher.fetcher.load_specs uri, 'specs'
+ Gem.sources << source_uri
+ Gem.configuration.write
-Do you want to add this insecure source?
- QUESTION
+ 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
- terminate_interaction 1 unless ask_yes_no question
- end
+ if e.uri =~ /specs\.#{Regexp.escape Gem.marshal_version}\.gz$/ and
+ gem_repo then
- source = Gem::Source.new source_uri
+ alert_warning <<-EOF
+RubyGems 1.2+ index not found for:
+\t#{source_uri}
- begin
- if Gem.sources.include? source_uri then
- say "source #{source_uri} already present in the cache"
- else
- source.load_specs :released
- Gem.sources << source
- Gem.configuration.write
+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
- rescue URI::Error, ArgumentError
- say "#{source_uri} is not a URI"
- terminate_interaction 1
- rescue Gem::RemoteFetcher::FetchError => e
- say "Error fetching #{source_uri}:\n\t#{e.message}"
- terminate_interaction 1
end
end
@@ -113,9 +113,17 @@ Do you want to add this insecure source?
end
if options[:update] then
- Gem.sources.each_source do |src|
- src.load_specs :released
- src.load_specs :latest
+ 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"
@@ -125,8 +133,8 @@ Do you want to add this insecure source?
say "*** CURRENT SOURCES ***"
say
- Gem.sources.each do |src|
- say src
+ Gem.sources.each do |source|
+ say source
end
end
end
diff --git a/lib/rubygems/commands/specification_command.rb b/lib/rubygems/commands/specification_command.rb
index b40dfd5f3c..07d2c2cf0d 100644
--- a/lib/rubygems/commands/specification_command.rb
+++ b/lib/rubygems/commands/specification_command.rb
@@ -1,7 +1,9 @@
+require 'yaml'
require 'rubygems/command'
require 'rubygems/local_remote_options'
require 'rubygems/version_option'
-require 'rubygems/package'
+require 'rubygems/source_info_cache'
+require 'rubygems/format'
class Gem::Commands::SpecificationCommand < Gem::Command
@@ -9,15 +11,12 @@ class Gem::Commands::SpecificationCommand < Gem::Command
include Gem::VersionOption
def initialize
- Gem.load_yaml
-
super 'specification', 'Display gem specification (in yaml)',
:domain => :local, :version => Gem::Requirement.default,
:format => :yaml
add_version_option('examine')
add_platform_option
- add_prerelease_option
add_option('--all', 'Output specifications for all versions of',
'the gem') do |value, options|
@@ -28,7 +27,7 @@ class Gem::Commands::SpecificationCommand < Gem::Command
options[:format] = :ruby
end
- add_option('--yaml', 'Output YAML format') do |value, options|
+ add_option('--yaml', 'Output RUBY format') do |value, options|
options[:format] = :yaml
end
@@ -63,58 +62,45 @@ FIELD name of gemspec field to show
"Please specify a gem name or file on the command line"
end
- case v = options[:version]
- when String
- req = Gem::Requirement.create v
- when Gem::Requirement
- req = v
- else
- raise Gem::CommandLineError, "Unsupported version type: '#{v}'"
- end
+ dep = Gem::Dependency.new gem, options[:version]
- if !req.none? and options[:all]
- alert_error "Specify --all or -v, not both"
- terminate_interaction 1
- end
+ field = get_one_optional_argument
- if options[:all]
- dep = Gem::Dependency.new gem
- else
- dep = Gem::Dependency.new gem, req
- end
+ if field then
+ field = field.intern
- field = get_one_optional_argument
+ if options[:format] == :ruby then
+ raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive"
+ end
- raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive" if
- field and options[:format] == :ruby
+ 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::Package.new(gem).spec rescue nil
+ specs << Gem::Format.from_file_by_path(gem).spec rescue nil
end
if specs.empty? then
- specs.push(*dep.matching_specs)
+ specs.push(*Gem.source_index.search(dep))
end
end
if remote? then
- dep.prerelease = options[:prerelease]
- found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dep
+ found = Gem::SpecFetcher.fetcher.fetch dep
specs.push(*found.map { |spec,| spec })
end
if specs.empty? then
- alert_error "No gem matching '#{dep}' found"
+ alert_error "Unknown gem '#{gem}'"
terminate_interaction 1
end
- unless options[:all] then
- specs = [specs.sort_by { |s| s.version }.last]
- end
-
- specs.each do |s|
+ output = lambda do |s|
s = s.send field if field
say case options[:format]
@@ -125,5 +111,14 @@ FIELD name of gemspec field to show
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
index 36c517e27c..78cbdcc00a 100644
--- a/lib/rubygems/commands/stale_command.rb
+++ b/lib/rubygems/commands/stale_command.rb
@@ -11,8 +11,7 @@ class Gem::Commands::StaleCommand < Gem::Command
def execute
gem_to_atime = {}
- Gem::Specification.each do |spec|
- name = spec.full_name
+ Gem.source_index.each do |name, spec|
Dir["#{spec.full_gem_path}/**/*.*"].each do |file|
next if File.directory?(file)
stat = File.stat(file)
diff --git a/lib/rubygems/commands/uninstall_command.rb b/lib/rubygems/commands/uninstall_command.rb
index 56aa8ee57f..db6aeed022 100644
--- a/lib/rubygems/commands/uninstall_command.rb
+++ b/lib/rubygems/commands/uninstall_command.rb
@@ -13,8 +13,7 @@ class Gem::Commands::UninstallCommand < Gem::Command
def initialize
super 'uninstall', 'Uninstall gems from the local repository',
- :version => Gem::Requirement.default, :user_install => true,
- :check_dev => false
+ :version => Gem::Requirement.default, :user_install => true
add_option('-a', '--[no-]all',
'Uninstall all matching versions'
@@ -28,12 +27,6 @@ class Gem::Commands::UninstallCommand < Gem::Command
options[:ignore] = value
end
- add_option('-D', '--[no-]-check-development',
- 'Check development dependencies while uninstalling',
- '(default: false)') do |value, options|
- options[:check_dev] = value
- end
-
add_option('-x', '--[no-]executables',
'Uninstall applicable executables without',
'confirmation') do |value, options|
@@ -56,17 +49,6 @@ class Gem::Commands::UninstallCommand < Gem::Command
options[:user_install] = value
end
- add_option('--[no-]format-executable',
- 'Assume executable names match Ruby\'s prefix and suffix.') do |value, options|
- options[:format_executable] = value
- end
-
- add_option('--[no-]force',
- 'Uninstall all versions of the named gems',
- 'ignoring dependencies') do |value, options|
- options[:force] = value
- end
-
add_version_option
add_platform_option
end
@@ -76,8 +58,8 @@ class Gem::Commands::UninstallCommand < Gem::Command
end
def defaults_str # :nodoc:
- "--version '#{Gem::Requirement.default}' --no-force " +
- "--install-dir #{Gem.dir}\n" +
+ "--version '#{Gem::Requirement.default}' --no-force " \
+ "--install-dir #{Gem.dir}\n" \
"--user-install"
end
@@ -86,22 +68,12 @@ class Gem::Commands::UninstallCommand < Gem::Command
end
def execute
- # REFACTOR: stolen from cleanup_command
- deplist = Gem::DependencyList.new
- get_all_gem_names.uniq.each do |name|
- Gem::Specification.find_all_by_name(name).each do |spec|
- deplist.add spec
- end
- end
-
- deps = deplist.strongly_connected_components.flatten.reverse
-
- deps.map(&:name).uniq.each do |gem_name|
+ 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" +
+ alert("In order to remove #{spec.name}, please execute:\n" \
"\tgem uninstall #{spec.name} --install-dir=#{spec.installation_path}")
end
end
diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb
index 7eefd32a6e..8ed99babbe 100644
--- a/lib/rubygems/commands/unpack_command.rb
+++ b/lib/rubygems/commands/unpack_command.rb
@@ -1,15 +1,13 @@
+require 'fileutils'
require 'rubygems/command'
require 'rubygems/installer'
require 'rubygems/version_option'
-require 'rubygems/remote_fetcher'
class Gem::Commands::UnpackCommand < Gem::Command
include Gem::VersionOption
def initialize
- require 'fileutils'
-
super 'unpack', 'Unpack an installed gem to the current directory',
:version => Gem::Requirement.default,
:target => Dir.pwd
@@ -19,10 +17,6 @@ class Gem::Commands::UnpackCommand < Gem::Command
options[:target] = value
end
- add_option('--spec', 'unpack the gem specification') do |value, options|
- options[:spec] = true
- end
-
add_version_option
end
@@ -38,6 +32,16 @@ class Gem::Commands::UnpackCommand < Gem::Command
"#{program_name} GEMNAME"
end
+ def download dependency
+ found = Gem::SpecFetcher.fetcher.fetch dependency
+
+ return if found.empty?
+
+ spec, source_uri = found.first
+
+ Gem::RemoteFetcher.fetcher.download spec, source_uri
+ 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
@@ -48,53 +52,19 @@ class Gem::Commands::UnpackCommand < Gem::Command
dependency = Gem::Dependency.new name, options[:version]
path = get_path dependency
- unless path then
- alert_error "Gem '#{name}' not installed nor fetchable."
- next
- end
-
- if @options[:spec] then
- spec, metadata = get_metadata path
-
- if metadata.nil? then
- alert_error "--spec is unsupported on '#{name}' (old format gem)"
- next
- end
-
- spec_file = File.basename spec.spec_file
-
- open spec_file, 'w' do |io|
- io.write metadata
- end
- else
+ if path then
basename = File.basename path, '.gem'
target_dir = File.expand_path basename, options[:target]
-
- package = Gem::Package.new path
- package.extract_files target_dir
-
+ 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
##
- #
- # Find cached filename in Gem.path. Returns nil if the file cannot be found.
- #
- #--
- # TODO: see comments in get_path() about general service.
-
- def find_in_cache(filename)
- Gem.path.each do |path|
- this_path = File.join(path, "cache", filename)
- return this_path if File.exist? this_path
- end
-
- return nil
- end
-
- ##
# Return the full path to the cached gem file matching the given
# name and version requirement. Returns 'nil' if no match.
#
@@ -114,50 +84,25 @@ class Gem::Commands::UnpackCommand < Gem::Command
def get_path dependency
return dependency.name if dependency.name =~ /\.gem$/i
- specs = dependency.matching_specs
+ specs = Gem.source_index.search dependency
- selected = specs.sort_by { |s| s.version }.last # HACK: hunt last down
+ selected = specs.sort_by { |s| s.version }.last
- return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless
- selected
+ return download(dependency) if selected.nil?
return unless dependency.name =~ /^#{selected.name}$/i
# We expect to find (basename).gem in the 'cache' directory. Furthermore,
# the name match must be exact (ignoring case).
+ filename = selected.file_name
+ path = nil
- path = find_in_cache File.basename selected.cache_file
-
- return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless path
-
- path
- end
-
- ##
- # Extracts the Gem::Specification and raw metadata from the .gem file at
- # +path+.
- #--
- # TODO move to Gem::Package as #raw_spec or something
-
- def get_metadata path
- format = Gem::Package.new path
- spec = format.spec
-
- metadata = nil
-
- open path, Gem.binary_mode do |io|
- tar = Gem::Package::TarReader.new io
- tar.each_entry do |entry|
- case entry.full_name
- when 'metadata' then
- metadata = entry.read
- when 'metadata.gz' then
- metadata = Gem.gunzip entry.read
- end
- end
+ Gem.path.find do |gem_dir|
+ path = File.join gem_dir, 'cache', filename
+ File.exist? path
end
- return spec, metadata
+ path
end
end
diff --git a/lib/rubygems/commands/update_command.rb b/lib/rubygems/commands/update_command.rb
index a31de0071a..45d82e9385 100644
--- a/lib/rubygems/commands/update_command.rb
+++ b/lib/rubygems/commands/update_command.rb
@@ -1,12 +1,10 @@
require 'rubygems/command'
require 'rubygems/command_manager'
-require 'rubygems/dependency_installer'
require 'rubygems/install_update_options'
require 'rubygems/local_remote_options'
require 'rubygems/spec_fetcher'
require 'rubygems/version_option'
-require 'rubygems/install_message' # must come before rdoc for messaging
-require 'rubygems/rdoc'
+require 'rubygems/commands/install_command'
class Gem::Commands::UpdateCommand < Gem::Command
@@ -14,34 +12,24 @@ class Gem::Commands::UpdateCommand < Gem::Command
include Gem::LocalRemoteOptions
include Gem::VersionOption
- attr_reader :installer # :nodoc:
-
def initialize
- super 'update', 'Update installed gems to the latest version',
- :document => %w[rdoc ri],
- :force => false
+ 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
- OptionParser.accept Gem::Version do |value|
- Gem::Version.new value
-
- value
- end
-
- add_option('--system [VERSION]', Gem::Version,
+ add_option('--system',
'Update the RubyGems system software') do |value, options|
- value = true unless value
-
options[:system] = value
end
add_local_remote_options
add_platform_option
add_prerelease_option "as update targets"
-
- @updated = []
- @installer = nil
end
def arguments # :nodoc:
@@ -49,7 +37,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
end
def defaults_str # :nodoc:
- "--document --no-force --install-dir #{Gem.dir}"
+ "--rdoc --ri --no-force --no-test --install-dir #{Gem.dir}"
end
def usage # :nodoc:
@@ -60,117 +48,97 @@ class Gem::Commands::UpdateCommand < Gem::Command
hig = {}
if options[:system] then
- update_rubygems
- return
+ say "Updating RubyGems"
+
+ unless options[:args].empty? then
+ raise "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::VERSION
+ hig['rubygems-update'] = rubygems_update
+
+ options[:user_install] = false
else
say "Updating installed gems"
hig = {} # highest installed gems
- Gem::Specification.each do |spec|
+ 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].uniq
+ gems_to_update = which_to_update hig, options[:args]
- updated = update_gems gems_to_update
+ updated = []
- if updated.empty? then
- say "Nothing to update"
- else
- say "Gems updated: #{updated.map { |spec| spec.name }.join ' '}"
- end
- end
-
- def update_gem name, version = Gem::Requirement.default
- return if @updated.any? { |spec| spec.name == name }
-
- @installer ||= Gem::DependencyInstaller.new options
+ installer = Gem::DependencyInstaller.new options
- success = false
-
- say "Updating #{name}"
- begin
- @installer.install name, Gem::Requirement.new(version)
- success = true
- rescue Gem::InstallError => e
- alert_error "Error installing #{name}:\n\t#{e.message}"
+ gems_to_update.uniq.sort.each do |name|
+ next if updated.any? { |spec| spec.name == name }
success = false
- end
- @installer.installed_gems.each do |spec|
- @updated << spec
- end
- end
+ 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
- def update_gems gems_to_update
- gems_to_update.uniq.sort.each do |(name, version)|
- update_gem name, version
+ installer.installed_gems.each do |spec|
+ updated << spec
+ say "Successfully installed #{spec.full_name}" if success
+ end
end
- @updated
- end
+ if gems_to_update.include? "rubygems-update" then
+ Gem.source_index.refresh!
- ##
- # Update RubyGems software to the latest version.
-
- def update_rubygems
- unless options[:args].empty? then
- alert_error "Gem names are not allowed with the --system option"
- terminate_interaction 1
- end
+ update_gems = Gem.source_index.find_name 'rubygems-update'
- options[:user_install] = false
+ latest_update_gem = update_gems.sort_by { |s| s.version }.last
- # TODO: rename version and other variable name conflicts
- # TODO: get rid of all this indirection on name and other BS
+ say "Updating RubyGems to #{latest_update_gem.version}"
+ installed = do_rubygems_update latest_update_gem.version
- version = options[:system]
- if version == true then
- version = Gem::Version.new Gem::VERSION
- requirement = Gem::Requirement.new ">= #{Gem::VERSION}"
+ say "RubyGems system software updated" if installed
else
- version = Gem::Version.new version
- requirement = Gem::Requirement.new version
- end
-
- rubygems_update = Gem::Specification.new
- rubygems_update.name = 'rubygems-update'
- rubygems_update.version = version
+ if updated.empty? then
+ say "Nothing to update"
+ else
+ say "Gems updated: #{updated.map { |spec| spec.name }.join ', '}"
- hig = {
- 'rubygems-update' => rubygems_update
- }
+ if options[:generate_ri] then
+ updated.each do |gem|
+ Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
+ end
- gems_to_update = which_to_update hig, options[:args], :system
- name, up_ver = gems_to_update.first
- current_ver = Gem.rubygems_version
-
- target = if options[:system] == true then
- up_ver
- else
- version
- end
+ Gem::DocManager.update_ri_cache
+ end
- if current_ver == target then
- # if options[:system] != true and version == current_ver then
- say "Latest version currently installed. Aborting."
- terminate_interaction
+ if options[:generate_rdoc] then
+ updated.each do |gem|
+ Gem::DocManager.new(gem, options[:rdoc_args]).generate_rdoc
+ end
+ end
+ end
end
+ end
- update_gem name, target
-
- installed_gems = Gem::Specification.find_all_by_name 'rubygems-update', requirement
- version = installed_gems.last.version
+ ##
+ # Update the RubyGems software to +version+.
+ def do_rubygems_update(version)
args = []
- args << '--prefix' << Gem.prefix if Gem.prefix
- # TODO use --document for >= 1.9 , --no-rdoc --no-ri < 1.9
- args << '--no-rdoc' unless options[:document].include? 'rdoc'
- args << '--no-ri' unless options[:document].include? 'ri'
+ 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}"
@@ -181,14 +149,13 @@ class Gem::Commands::UpdateCommand < Gem::Command
# Make sure old rubygems isn't loaded
old = ENV["RUBYOPT"]
- ENV.delete("RUBYOPT") if old
- installed = system setup_cmd
- say "RubyGems system software updated" if installed
+ ENV.delete("RUBYOPT")
+ system setup_cmd
ENV["RUBYOPT"] = old if old
end
end
- def which_to_update highest_installed_gems, gem_names, system = false
+ def which_to_update(highest_installed_gems, gem_names)
result = []
highest_installed_gems.each do |l_name, l_spec|
@@ -196,23 +163,35 @@ class Gem::Commands::UpdateCommand < Gem::Command
gem_names.all? { |name| /#{name}/ !~ l_spec.name }
dependency = Gem::Dependency.new l_spec.name, "> #{l_spec.version}"
- dependency.prerelease = options[:prerelease]
- fetcher = Gem::SpecFetcher.fetcher
+ 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 == //
- spec_tuples, _ = fetcher.search_for_dependency dependency
+ specs = Gem::SourceInfoCache.search_with_source dependency
- matching_gems = spec_tuples.select do |g,_|
- g.name == l_name and g.match_platform?
+ spec_tuples = specs.map do |spec, source_uri|
+ [[spec.name, spec.version, spec.original_platform], source_uri]
+ end
+ end
end
- highest_remote_gem = matching_gems.sort_by { |g,_| g.version }.last
+ matching_gems = spec_tuples.select do |(name, version, platform),|
+ name == l_name and Gem::Platform.match platform
+ end
- highest_remote_gem ||= [Gem::NameTuple.null]
- highest_remote_ver = highest_remote_gem.first.version
+ highest_remote_gem = matching_gems.sort_by do |(name, version),|
+ version
+ end.last
- if system or (l_spec.version < highest_remote_ver) then
- result << [l_spec.name, [l_spec.version, highest_remote_ver].max]
+ if highest_remote_gem and
+ l_spec.version < highest_remote_gem.first[1] then
+ result << l_name
end
end
diff --git a/lib/rubygems/commands/which_command.rb b/lib/rubygems/commands/which_command.rb
index 6495278a87..b785f15660 100644
--- a/lib/rubygems/commands/which_command.rb
+++ b/lib/rubygems/commands/which_command.rb
@@ -1,6 +1,10 @@
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
@@ -24,13 +28,13 @@ class Gem::Commands::WhichCommand < Gem::Command
end
def execute
+ searcher = Gem::GemPathSearcher.new
+
found = false
options[:args].each do |arg|
- arg = arg.sub(/#{Regexp.union(*Gem.suffixes)}$/, '')
dirs = $LOAD_PATH
-
- spec = Gem::Specification.find_by_path arg
+ spec = searcher.find arg
if spec then
if options[:search_gems_first] then
@@ -40,7 +44,6 @@ class Gem::Commands::WhichCommand < Gem::Command
end
end
- # TODO: this is totally redundant and stupid
paths = find_paths arg, dirs
if paths.empty? then
@@ -58,9 +61,9 @@ class Gem::Commands::WhichCommand < Gem::Command
result = []
dirs.each do |dir|
- Gem.suffixes.each do |ext|
+ EXT.each do |ext|
full_path = File.join dir, "#{package_name}#{ext}"
- if File.exist? full_path and not File.directory? full_path then
+ if File.exist? full_path then
result << full_path
return result unless options[:show_all]
end
diff --git a/lib/rubygems/commands/yank_command.rb b/lib/rubygems/commands/yank_command.rb
deleted file mode 100644
index df4142d395..0000000000
--- a/lib/rubygems/commands/yank_command.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'rubygems/command'
-require 'rubygems/local_remote_options'
-require 'rubygems/version_option'
-require 'rubygems/gemcutter_utilities'
-
-class Gem::Commands::YankCommand < Gem::Command
- include Gem::LocalRemoteOptions
- include Gem::VersionOption
- include Gem::GemcutterUtilities
-
- def description # :nodoc:
- 'Remove a specific gem version release from RubyGems.org'
- end
-
- def arguments # :nodoc:
- "GEM name of gem"
- end
-
- def usage # :nodoc:
- "#{program_name} GEM -v VERSION [-p PLATFORM] [--undo] [--key KEY_NAME]"
- end
-
- def initialize
- super 'yank', description
-
- add_version_option("remove")
- add_platform_option("remove")
-
- add_option('--undo') do |value, options|
- options[:undo] = true
- end
-
- add_option('-k', '--key KEY_NAME',
- 'Use API key from your gem credentials file') do |value, options|
- options[:key] = value
- end
- end
-
- def execute
- sign_in
-
- version = get_version_from_requirements(options[:version])
- platform = get_platform_from_requirements(options)
- api_key = Gem.configuration.rubygems_api_key
- api_key = Gem.configuration.api_keys[options[:key].to_sym] if options[:key]
-
- if version then
- if options[:undo] then
- unyank_gem(version, platform, api_key)
- else
- yank_gem(version, platform, api_key)
- end
- else
- say "A version argument is required: #{usage}"
- terminate_interaction
- end
- end
-
- def yank_gem(version, platform, api_key)
- say "Yanking gem from #{self.host}..."
- yank_api_request(:delete, version, platform, "api/v1/gems/yank", api_key)
- end
-
- def unyank_gem(version, platform, api_key)
- say "Unyanking gem from #{host}..."
- yank_api_request(:put, version, platform, "api/v1/gems/unyank", api_key)
- end
-
- private
-
- def yank_api_request(method, version, platform, api, api_key)
- name = get_one_gem_name
- response = rubygems_api_request(method, api) do |request|
- request.add_field("Authorization", api_key)
-
- data = {
- 'gem_name' => name,
- 'version' => version,
- }
- data['platform'] = platform if platform
-
- request.set_form_data data
- end
- say response.body
- end
-
- def get_version_from_requirements(requirements)
- requirements.requirements.first[1].version
- rescue
- nil
- end
-
- def get_platform_from_requirements(requirements)
- Gem.platforms[1].to_s if requirements.key? :added_platform
- end
-
-end
-
diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb
deleted file mode 100644
index 87d5672dd4..0000000000
--- a/lib/rubygems/compatibility.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# :stopdoc:
-
-#--
-# This file contains all sorts of little compatibility hacks that we've
-# had to introduce over the years. Quarantining them into one file helps
-# us know when we can get rid of them.
-#
-# Ruby 1.9.x has introduced some things that are awkward, and we need to
-# support them, so we define some constants to use later.
-#++
-module Gem
- # Only MRI 1.9.2 has the custom prelude.
- GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/ and RUBY_ENGINE == "ruby"
-end
-
-# Gem::QuickLoader exists in the gem prelude code in ruby 1.9.2 itself.
-# We gotta get rid of it if it's there, before we do anything else.
-if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
- Gem::QuickLoader.remove
-
- $LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
-
- if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then
- # TODO path does not exist here
- raise LoadError, "another rubygems is already loaded from #{path}"
- end
-
- class << Gem
- remove_method :try_activate if Gem.respond_to?(:try_activate, true)
- end
-end
-
-module Gem
- RubyGemsVersion = VERSION
-
- RbConfigPriorities = %w[
- EXEEXT RUBY_SO_NAME arch bindir datadir libdir ruby_install_name
- ruby_version rubylibprefix sitedir sitelibdir vendordir vendorlibdir
- rubylibdir
- ]
-
- unless defined?(ConfigMap)
- ##
- # Configuration settings from ::RbConfig
- ConfigMap = Hash.new do |cm, key|
- cm[key] = RbConfig::CONFIG[key.to_s]
- end
- else
- RbConfigPriorities.each do |key|
- ConfigMap[key.to_sym] = RbConfig::CONFIG[key]
- end
- end
-
- RubyGemsPackageVersion = VERSION
-end
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index da0b082624..71fb98f272 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -4,13 +4,10 @@
# See LICENSE.txt for permissions.
#++
-require 'rubygems/user_interaction'
-require 'rbconfig'
-
##
-# Gem::ConfigFile RubyGems options and gem command options from gemrc.
+# Gem::ConfigFile RubyGems options and gem command options from ~/.gemrc.
#
-# gemrc is a YAML file that uses strings to match gem command arguments and
+# ~/.gemrc is a YAML file that uses strings to match gem command arguments and
# symbols to match RubyGems options.
#
# Gem command arguments use a String key that matches the command name and
@@ -24,21 +21,14 @@ require 'rbconfig'
# RubyGems options use symbol keys. Valid options are:
#
# +:backtrace+:: See #backtrace
+# +:benchmark+:: See #benchmark
# +:sources+:: Sets Gem::sources
# +:verbose+:: See #verbose
-#
-# gemrc files may exist in various locations and are read and merged in
-# the following order:
-#
-# - system wide (/etc/gemrc)
-# - per user (~/.gemrc)
-# - per environment (gemrc files listed in the GEMRC environment variable)
class Gem::ConfigFile
- include Gem::UserInteraction
-
DEFAULT_BACKTRACE = false
+ DEFAULT_BENCHMARK = false
DEFAULT_BULK_THRESHOLD = 1000
DEFAULT_VERBOSITY = true
DEFAULT_UPDATE_SOURCES = true
@@ -55,37 +45,14 @@ class Gem::ConfigFile
PLATFORM_DEFAULTS = {}
- # :stopdoc:
-
system_config_path =
begin
- require "etc"
+ require 'etc.so'
Etc.sysconfdir
- rescue LoadError, NoMethodError
- begin
- # TODO: remove after we drop 1.8.7 and 1.9.1
- require 'Win32API'
-
- CSIDL_COMMON_APPDATA = 0x0023
- path = 0.chr * 260
- if RUBY_VERSION > '1.9' then
- SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP',
- 'L', :stdcall
- SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
- else
- SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP',
- 'L'
- SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
- end
-
- path.strip
- rescue LoadError
- RbConfig::CONFIG["sysconfdir"] || "/etc"
- end
+ rescue LoadError
+ '/etc'
end
- # :startdoc:
-
SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'
##
@@ -109,6 +76,11 @@ class Gem::ConfigFile
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. (deprecated)
@@ -128,10 +100,11 @@ class Gem::ConfigFile
attr_accessor :update_sources
##
- # True if we want to force specification of gem server when pushing a gem
+ # API key for RubyGems.org
- attr_accessor :disable_default_gem_server
+ attr_reader :rubygems_api_key
+ ##
# openssl verify mode value, used for remote https connection
attr_reader :ssl_verify_mode
@@ -159,29 +132,29 @@ class Gem::ConfigFile
# <tt>--debug</tt>::
# Enable Ruby level debug messages. Handled early for the same reason as
# --backtrace.
- #--
- # TODO: parse options upstream, pass in options directly
- def initialize(args)
+ def initialize(arg_list)
@config_file_name = nil
need_config_file_name = false
- arg_list = []
-
- args.each do |arg|
+ 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_list << arg
+ arg
end
- end
+ end.compact
@backtrace = DEFAULT_BACKTRACE
+ @benchmark = DEFAULT_BENCHMARK
@bulk_threshold = DEFAULT_BULK_THRESHOLD
@verbose = DEFAULT_VERBOSITY
@update_sources = DEFAULT_UPDATE_SOURCES
@@ -190,120 +163,50 @@ class Gem::ConfigFile
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
- environment_config = (ENV['GEMRC'] || '').split(/[:;]/).inject({}) do |result, file|
- result.merge load_file file
- end
-
@hash = operating_system_config.merge platform_config
@hash = @hash.merge system_config
@hash = @hash.merge user_config
- @hash = @hash.merge environment_config
# HACK these override command-line args, which is bad
- @backtrace = @hash[:backtrace] if @hash.key? :backtrace
- @bulk_threshold = @hash[:bulk_threshold] if @hash.key? :bulk_threshold
- @home = @hash[:gemhome] if @hash.key? :gemhome
- @path = @hash[:gempath] if @hash.key? :gempath
- @update_sources = @hash[:update_sources] if @hash.key? :update_sources
- @verbose = @hash[:verbose] if @hash.key? :verbose
- @disable_default_gem_server = @hash[:disable_default_gem_server] if @hash.key? :disable_default_gem_server
-
+ @backtrace = @hash[:backtrace] if @hash.key? :backtrace
+ @benchmark = @hash[:benchmark] if @hash.key? :benchmark
+ @bulk_threshold = @hash[:bulk_threshold] if @hash.key? :bulk_threshold
+ @home = @hash[:gemhome] if @hash.key? :gemhome
+ @path = @hash[:gempath] if @hash.key? :gempath
+ @update_sources = @hash[:update_sources] if @hash.key? :update_sources
+ @verbose = @hash[:verbose] if @hash.key? :verbose
@ssl_verify_mode = @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
@ssl_ca_cert = @hash[:ssl_ca_cert] if @hash.key? :ssl_ca_cert
- @api_keys = nil
- @rubygems_api_key = nil
+ load_rubygems_api_key
Gem.sources = @hash[:sources] if @hash.key? :sources
handle_arguments arg_list
end
##
- # Hash of RubyGems.org and alternate API keys
-
- def api_keys
- load_api_keys unless @api_keys
-
- @api_keys
- end
-
- ##
- # Checks the permissions of the credentials file. If they are not 0600 an
- # error message is displayed and RubyGems aborts.
-
- def check_credentials_permissions
- return if Gem.win_platform? # windows doesn't write 0600 as 0600
- return unless File.exist? credentials_path
-
- existing_permissions = File.stat(credentials_path).mode & 0777
-
- return if existing_permissions == 0600
-
- alert_error <<-ERROR
-Your gem push credentials file located at:
-
-\t#{credentials_path}
-
-has file permissions of 0#{existing_permissions.to_s 8} but 0600 is required.
-
-You should reset your credentials at:
-
-\thttps://rubygems.org/profile/edit
-
-if you believe they were disclosed to a third party.
- ERROR
-
- terminate_interaction 1
- end
-
- ##
# Location of RubyGems.org credentials
def credentials_path
- File.join Gem.user_home, '.gem', 'credentials'
- end
-
- def load_api_keys
- check_credentials_permissions
-
- @api_keys = if File.exist? credentials_path then
- load_file(credentials_path)
- else
- @hash
- end
-
- if @api_keys.key? :rubygems_api_key then
- @rubygems_api_key = @api_keys[:rubygems_api_key]
- @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless
- @api_keys.key? :rubygems
- end
+ File.join(Gem.user_home, '.gem', 'credentials')
end
- ##
- # Returns the RubyGems.org API key
-
- def rubygems_api_key
- load_api_keys unless @rubygems_api_key
+ def load_rubygems_api_key
+ api_key_hash = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
- @rubygems_api_key
+ @rubygems_api_key = api_key_hash[:rubygems_api_key] if api_key_hash.key? :rubygems_api_key
end
- ##
- # Sets the RubyGems.org API key to +api_key+
-
- def rubygems_api_key= api_key
- check_credentials_permissions
-
+ def rubygems_api_key=(api_key)
config = load_file(credentials_path).merge(:rubygems_api_key => api_key)
- dirname = File.dirname credentials_path
- Dir.mkdir(dirname) unless File.exist? dirname
+ dirname = File.dirname(credentials_path)
+ Dir.mkdir(dirname) unless File.exists?(dirname)
- Gem.load_yaml
+ require 'yaml'
- permissions = 0600 & (~File.umask)
- File.open(credentials_path, 'w', permissions) do |f|
+ File.open(credentials_path, 'w') do |f|
f.write config.to_yaml
end
@@ -311,24 +214,15 @@ if you believe they were disclosed to a third party.
end
def load_file(filename)
- Gem.load_yaml
-
- return {} unless filename and File.exist? filename
-
+ return {} unless filename and File.exists?(filename)
begin
- content = YAML.load(File.read(filename))
- unless content.kind_of? Hash
- warn "Failed to load #{filename} because it doesn't contain valid YAML hash"
- return {}
- end
- return content
+ require 'yaml'
+ YAML.load(File.read(filename))
rescue ArgumentError
- warn "Failed to load #{filename}"
+ warn "Failed to load #{config_file_name}"
rescue Errno::EACCES
- warn "Failed to load #{filename} due to permissions problem."
- end
-
- {}
+ 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.
@@ -346,11 +240,13 @@ if you believe they were disclosed to a third party.
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
@@ -367,6 +263,8 @@ if you believe they were disclosed to a third party.
case arg
when /^--(backtrace|traceback)$/ then
@backtrace = true
+ when /^--bench(mark)?$/ then
+ @benchmark = true
when /^--debug$/ then
$DEBUG = true
else
@@ -378,41 +276,25 @@ if you believe they were disclosed to a third party.
# Really verbose mode gives you extra output.
def really_verbose
case verbose
- when true, false, nil then
- false
- else
- true
+ 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] = if @hash.key?(:backtrace)
- @hash[:backtrace]
- else
- DEFAULT_BACKTRACE
- end
-
- yaml_hash[:bulk_threshold] = if @hash.key?(:bulk_threshold)
- @hash[:bulk_threshold]
- else
- DEFAULT_BULK_THRESHOLD
- end
-
- yaml_hash[:sources] = Gem.sources.to_a
-
- yaml_hash[:update_sources] = if @hash.key?(:update_sources)
- @hash[:update_sources]
- else
- DEFAULT_UPDATE_SOURCES
- end
-
- yaml_hash[:verbose] = if @hash.key?(:verbose)
- @hash[:verbose]
- else
- DEFAULT_VERBOSITY
- end
+ 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'
@@ -429,6 +311,7 @@ if you believe they were disclosed to a third party.
# Writes out this config file, replacing its source.
def write
+ require 'yaml'
open config_file_name, 'w' do |io|
io.write to_yaml
end
@@ -446,13 +329,17 @@ if you believe they were disclosed to a third party.
def ==(other) # :nodoc:
self.class === other and
- @backtrace == other.backtrace and
- @bulk_threshold == other.bulk_threshold and
- @verbose == other.verbose and
- @update_sources == other.update_sources and
- @hash == other.hash
+ @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
- protected :hash
+
end
+
diff --git a/lib/rubygems/core_ext/kernel_gem.rb b/lib/rubygems/core_ext/kernel_gem.rb
deleted file mode 100644
index f946d0d5d7..0000000000
--- a/lib/rubygems/core_ext/kernel_gem.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-module Kernel
-
- # REFACTOR: This should be pulled out into some kind of hacks file.
- remove_method :gem if 'method' == defined? gem # from gem_prelude.rb on 1.9
-
- ##
- # Use Kernel#gem to activate a specific version of +gem_name+.
- #
- # +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, *requirements) # :doc:
- skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
- raise Gem::LoadError, "skipping #{gem_name}" if skip_list.include? gem_name
-
- if gem_name.kind_of? Gem::Dependency
- unless Gem::Deprecate.skip
- warn "#{Gem.location_of_caller.join ':'}:Warning: Kernel.gem no longer "\
- "accepts a Gem::Dependency object, please pass the name "\
- "and requirements directly"
- end
-
- requirements = gem_name.requirement
- gem_name = gem_name.name
- end
-
- spec = Gem::Dependency.new(gem_name, *requirements).to_spec
- spec.activate if spec
- end
-
- private :gem
-
-end
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
deleted file mode 100755
index a591d386a9..0000000000
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'monitor'
-
-module Kernel
-
- RUBYGEMS_ACTIVATION_MONITOR = Monitor.new # :nodoc:
-
- if defined?(gem_original_require) then
- # Ruby ships with a custom_require, override its require
- remove_method :require
- else
- ##
- # The Kernel#require from before RubyGems was loaded.
-
- alias gem_original_require require
- private :gem_original_require
- end
-
- ##
- # 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
- RUBYGEMS_ACTIVATION_MONITOR.enter
-
- path = path.to_path if path.respond_to? :to_path
-
- spec = Gem.find_unresolved_default_spec(path)
- if spec
- Gem.remove_unresolved_default_spec(spec)
- gem(spec.name)
- end
-
- # If there are no unresolved deps, then we can use just try
- # normal require handle loading a gem from the rescue below.
-
- if Gem::Specification.unresolved_deps.empty? then
- begin
- RUBYGEMS_ACTIVATION_MONITOR.exit
- return gem_original_require(path)
- ensure
- RUBYGEMS_ACTIVATION_MONITOR.enter
- end
- end
-
- # If +path+ is for a gem that has already been loaded, don't
- # bother trying to find it in an unresolved gem, just go straight
- # to normal require.
- #--
- # TODO request access to the C implementation of this to speed up RubyGems
-
- spec = Gem::Specification.find { |s|
- s.activated? and s.contains_requirable_file? path
- }
-
- begin
- RUBYGEMS_ACTIVATION_MONITOR.exit
- return gem_original_require(path)
- ensure
- RUBYGEMS_ACTIVATION_MONITOR.enter
- end if spec
-
- # Attempt to find +path+ in any unresolved gems...
-
- found_specs = Gem::Specification.find_in_unresolved path
-
- # If there are no directly unresolved gems, then try and find +path+
- # in any gems that are available via the currently unresolved gems.
- # For example, given:
- #
- # a => b => c => d
- #
- # If a and b are currently active with c being unresolved and d.rb is
- # requested, then find_in_unresolved_tree will find d.rb in d because
- # it's a dependency of c.
- #
- if found_specs.empty? then
- found_specs = Gem::Specification.find_in_unresolved_tree path
-
- found_specs.each do |found_spec|
- found_spec.activate
- end
-
- # We found +path+ directly in an unresolved gem. Now we figure out, of
- # the possible found specs, which one we should activate.
- else
-
- # Check that all the found specs are just different
- # versions of the same gem
- names = found_specs.map(&:name).uniq
-
- if names.size > 1 then
- raise Gem::LoadError, "#{path} found in multiple gems: #{names.join ', '}"
- end
-
- # Ok, now find a gem that has no conflicts, starting
- # at the highest version.
- valid = found_specs.select { |s| s.conflicts.empty? }.last
-
- unless valid then
- le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"
- le.name = names.first
- raise le
- end
-
- valid.activate
- end
-
- begin
- RUBYGEMS_ACTIVATION_MONITOR.exit
- return gem_original_require(path)
- ensure
- RUBYGEMS_ACTIVATION_MONITOR.enter
- end
- rescue LoadError => load_error
- if load_error.message.start_with?("Could not find") or
- (load_error.message.end_with?(path) and Gem.try_activate(path)) then
- begin
- RUBYGEMS_ACTIVATION_MONITOR.exit
- return gem_original_require(path)
- ensure
- RUBYGEMS_ACTIVATION_MONITOR.enter
- end
- end
-
- raise load_error
- ensure
- RUBYGEMS_ACTIVATION_MONITOR.exit
- end
-
- private :require
-
-end
-
diff --git a/lib/rubygems/custom_require.rb b/lib/rubygems/custom_require.rb
new file mode 100644
index 0000000000..480cb7e315
--- /dev/null
+++ b/lib/rubygems/custom_require.rb
@@ -0,0 +1,44 @@
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+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.end_with?(path)
+ if Gem.try_activate(path)
+ return gem_original_require(path)
+ end
+ end
+
+ raise load_error
+ end
+
+ private :require
+ private :gem_original_require
+
+end unless Kernel.private_method_defined?(:gem_original_require)
+
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index cc8dc722fc..8950d0f73d 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -1,8 +1,6 @@
module Gem
- DEFAULT_HOST = "https://rubygems.org"
@post_install_hooks ||= []
- @done_installing_hooks ||= []
@post_uninstall_hooks ||= []
@pre_uninstall_hooks ||= []
@pre_install_hooks ||= []
@@ -11,7 +9,7 @@ module Gem
# An Array of the default sources that come with RubyGems
def self.default_sources
- %w[https://rubygems.org/]
+ %w[http://rubygems.org/]
end
##
@@ -19,58 +17,30 @@ module Gem
# specified in the environment
def self.default_dir
- path = if defined? RUBY_FRAMEWORK_VERSION then
- [
- File.dirname(ConfigMap[:sitedir]),
- 'Gems',
- ConfigMap[:ruby_version]
- ]
- elsif ConfigMap[:rubylibprefix] then
- [
- ConfigMap[:rubylibprefix],
- 'gems',
- ConfigMap[:ruby_version]
- ]
- else
- [
- ConfigMap[:libdir],
- ruby_engine,
- 'gems',
- ConfigMap[:ruby_version]
- ]
- end
-
- @default_dir ||= File.join(*path)
- end
-
- ##
- # Paths where RubyGems' .rb files and bin files are installed
-
- def self.default_rubygems_dirs
- nil # default to standard layout
+ if defined? RUBY_FRAMEWORK_VERSION then
+ File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
+ ConfigMap[:ruby_version]
+ elsif ConfigMap[:rubylibprefix] then
+ File.join(ConfigMap[:rubylibprefix], '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
- parts = [Gem.user_home, '.gem', ruby_engine]
- parts << ConfigMap[:ruby_version] unless ConfigMap[:ruby_version].empty?
- File.join parts
- end
-
- ##
- # How String Gem paths should be split. Overridable for esoteric platforms.
-
- def self.path_separator
- File::PATH_SEPARATOR
+ File.join Gem.user_home, '.gem', ruby_engine, ConfigMap[:ruby_version]
end
##
# Default gem load path
def self.default_path
- if Gem.user_home && File.exist?(Gem.user_home) then
+ if File.exist? Gem.user_home then
[user_dir, default_dir]
else
[default_dir]
@@ -103,27 +73,29 @@ module Gem
end
##
- # A wrapper around RUBY_ENGINE const that may not be defined
+ # The default system-wide source info cache directory
- def self.ruby_engine
- if defined? RUBY_ENGINE then
- RUBY_ENGINE
- else
- 'ruby'
- end
+ def self.default_system_source_cache_dir
+ File.join Gem.dir, 'source_cache'
end
##
- # The default signing key path
+ # The default user-specific source info cache directory
- def self.default_key_path
- File.join Gem.user_home, ".gem", "gem-private_key.pem"
+ def self.default_user_source_cache_dir
+ File.join Gem.user_home, '.gem', 'source_cache'
end
##
- # The default signing certificate chain path
+ # A wrapper around RUBY_ENGINE const that may not be defined
- def self.default_cert_path
- File.join Gem.user_home, ".gem", "gem-public_cert.pem"
+ 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
index 1e3cc168a8..ec5d88b607 100644
--- a/lib/rubygems/dependency.rb
+++ b/lib/rubygems/dependency.rb
@@ -1,23 +1,32 @@
+require "rubygems/requirement"
+
##
# The Dependency class holds a Gem name and a Gem::Requirement.
-require "rubygems/requirement"
-
class Gem::Dependency
+ # :stopdoc:
+ @warned_version_requirement = false
+
+ def self.warned_version_requirement
+ @warned_version_requirement
+ end
+
+ def self.warned_version_requirement= value
+ @warned_version_requirement = value
+ end
+ # :startdoc:
+
##
# Valid dependency types.
#--
# When this list is updated, be sure to change
# Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
- #
- # REFACTOR: This type of constant, TYPES, indicates we might want
- # two classes, used via inheritance or duck typing.
TYPES = [
- :development,
- :runtime,
- ]
+ :development,
+ :runtime,
+ ]
##
# Dependency name or regular expression.
@@ -30,28 +39,22 @@ class Gem::Dependency
attr_writer :prerelease
##
+ # Dependency type.
+
+ attr_reader :type
+
+ ##
# Constructs a dependency with +name+ and +requirements+. The last
# argument can optionally be the dependency type, which defaults to
# <tt>:runtime</tt>.
def initialize name, *requirements
- case name
- when String then # ok
- when Regexp then
- msg = ["NOTE: Dependency.new w/ a regexp is deprecated.",
- "Dependency.new called from #{Gem.location_of_caller.join(":")}"]
- warn msg.join("\n") unless Gem::Deprecate.skip
- else
- raise ArgumentError,
- "dependency name must be a String, was #{name.inspect}"
- end
-
type = Symbol === requirements.last ? requirements.pop : :runtime
requirements = requirements.first if 1 == requirements.length # unpack
unless TYPES.include? type
- raise ArgumentError, "Valid types are #{TYPES.inspect}, " +
- "not #{type.inspect}"
+ raise ArgumentError, "Valid types are #{TYPES.inspect}, "
+ + "not #{@type.inspect}"
end
@name = name
@@ -59,7 +62,7 @@ class Gem::Dependency
@type = type
@prerelease = false
- # This is for Marshal backwards compatibility. See the comments in
+ # This is for Marshal backwards compatability. See the comments in
# +requirement+ for the dirty details.
@version_requirements = @requirement
@@ -74,13 +77,8 @@ class Gem::Dependency
end
def inspect # :nodoc:
- if @prerelease
- "<%s type=%p name=%p requirements=%p prerelease=ok>" %
- [self.class, self.type, self.name, requirement.to_s]
- else
- "<%s type=%p name=%p requirements=%p>" %
- [self.class, self.type, self.name, requirement.to_s]
- end
+ "<%s type=%p name=%p requirements=%p>" %
+ [self.class, @type, @name, requirement.to_s]
end
##
@@ -90,15 +88,7 @@ class Gem::Dependency
@prerelease || requirement.prerelease?
end
- ##
- # Is this dependency simply asking for the latest version
- # of a gem?
-
- def latest_version?
- @requirement.none?
- end
-
- def pretty_print q # :nodoc:
+ def pretty_print(q) # :nodoc:
q.group 1, 'Gem::Dependency.new(', ')' do
q.pp name
q.text ','
@@ -134,8 +124,6 @@ class Gem::Dependency
# Children, define explicit marshal and unmarshal behavior for
# public classes. Marshal formats are part of your public API.
- # REFACTOR: See above
-
if defined?(@version_requirement) && @version_requirement
version = @version_requirement.instance_variable_get :@version
@version_requirement = nil
@@ -145,24 +133,42 @@ class Gem::Dependency
@requirement = @version_requirements if defined?(@version_requirements)
end
- # DOC: this method needs documentation or :nodoc''d
+ ##
+ # Rails subclasses Gem::Dependency and uses this method, so we'll hack
+ # around it.
+
+ alias __requirement requirement # :nodoc:
+
def requirements_list
requirement.as_list
end
def to_s # :nodoc:
- if type != :runtime then
- "#{name} (#{requirement}, #{type})"
- else
- "#{name} (#{requirement})"
+ "#{name} (#{requirement}, #{type})"
+ end
+
+ def version_requirements # :nodoc:
+ unless Gem::Dependency.warned_version_requirement then
+ warn "#{Gem.location_of_caller.join ':'}:Warning: " \
+ "Gem::Dependency#version_requirements is deprecated " \
+ "and will be removed on or after August 2010. " \
+ "Use #requirement"
+
+ Gem::Dependency.warned_version_requirement = true
end
+
+ __requirement
end
- ##
- # Dependency type.
+ alias version_requirement version_requirements # :nodoc:
- def type
- @type ||= :runtime
+ def version_requirements= requirements # :nodoc:
+ warn "#{Gem.location_of_caller.join ':'}:Warning: " \
+ "Gem::Dependency#version_requirements= is deprecated " \
+ "and will be removed on or after August 2010. " \
+ "Use Gem::Dependency.new."
+
+ @requirement = Gem::Requirement.create requirements
end
def == other # :nodoc:
@@ -176,7 +182,7 @@ class Gem::Dependency
# Dependencies are ordered by name.
def <=> other
- self.name <=> other.name
+ [@name] <=> [other.name]
end
##
@@ -187,11 +193,16 @@ class Gem::Dependency
def =~ other
unless Gem::Dependency === other
- return unless other.respond_to?(:name) && other.respond_to?(:version)
- other = Gem::Dependency.new other.name, other.version
+ other = Gem::Dependency.new other.name, other.version rescue return false
end
- return false unless name === other.name
+ pattern = name
+
+ if Regexp === pattern then
+ return false unless pattern =~ other.name
+ else
+ return false unless pattern == other.name
+ end
reqs = other.requirement.requirements
@@ -203,109 +214,19 @@ class Gem::Dependency
requirement.satisfied_by? version
end
- # DOC: this method needs either documented or :nodoc'd
+ def match?(spec_name, spec_version)
+ pattern = name
- def match? obj, version=nil
- if !version
- name = obj.name
- version = obj.version
+ if Regexp === pattern
+ return false unless pattern =~ spec_name
else
- name = obj
+ return false unless pattern == spec_name
end
- return false unless self.name === name
return true if requirement.none?
- requirement.satisfied_by? Gem::Version.new(version)
- end
-
- # DOC: this method needs either documented or :nodoc'd
-
- def matches_spec? spec
- return false unless name === spec.name
- return true if requirement.none?
-
- requirement.satisfied_by?(spec.version)
- end
-
- ##
- # Merges the requirements of +other+ into this dependency
-
- def merge other
- unless name == other.name then
- raise ArgumentError,
- "#{self} and #{other} have different names"
- end
-
- default = Gem::Requirement.default
- self_req = self.requirement
- other_req = other.requirement
-
- return self.class.new name, self_req if other_req == default
- return self.class.new name, other_req if self_req == default
-
- self.class.new name, self_req.as_list.concat(other_req.as_list)
- end
-
- # DOC: this method needs either documented or :nodoc'd
-
- def matching_specs platform_only = false
- matches = Gem::Specification.find_all { |spec|
- self.name === spec.name and # TODO: == instead of ===
- requirement.satisfied_by? spec.version
- }
-
- if platform_only
- matches.reject! { |spec|
- not Gem::Platform.match spec.platform
- }
- end
-
- matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
+ requirement.satisfied_by? Gem::Version.new(spec_version)
end
- ##
- # True if the dependency will not always match the latest version.
-
- def specific?
- @requirement.specific?
- end
-
- # DOC: this method needs either documented or :nodoc'd
-
- def to_specs
- matches = matching_specs true
-
- # TODO: check Gem.activated_spec[self.name] in case matches falls outside
-
- if matches.empty? then
- specs = Gem::Specification.find_all { |s|
- s.name == name
- }.map { |x| x.full_name }
-
- if specs.empty?
- total = Gem::Specification.to_a.size
- error = Gem::LoadError.new \
- "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)"
- else
- error = Gem::LoadError.new \
- "Could not find '#{name}' (#{requirement}) - did find: [#{specs.join ','}]"
- end
- error.name = self.name
- error.requirement = self.requirement
- raise error
- end
-
- # TODO: any other resolver validations should go here
-
- matches
- end
-
- # DOC: this method needs either documented or :nodoc'd
-
- def to_spec
- matches = self.to_specs
-
- matches.find { |spec| spec.activated? } or matches.last
- end
end
+
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index ee361db94b..099d223295 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -1,12 +1,8 @@
require 'rubygems'
require 'rubygems/dependency_list'
-require 'rubygems/package'
require 'rubygems/installer'
require 'rubygems/spec_fetcher'
require 'rubygems/user_interaction'
-require 'rubygems/source_local'
-require 'rubygems/source_specific_file'
-require 'rubygems/available_set'
##
# Installs a gem along with all its dependencies from local and remote gems.
@@ -18,24 +14,16 @@ class Gem::DependencyInstaller
attr_reader :gems_to_install
attr_reader :installed_gems
- ##
- # Documentation types. For use by the Gem.done_installing hook
-
- attr_reader :document
-
DEFAULT_OPTIONS = {
- :env_shebang => false,
- :document => %w[ri],
- :domain => :both, # HACK dup
- :force => false,
- :format_executable => false, # HACK dup
+ :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,
- :build_args => nil,
- :build_docs_in_background => false,
- }.freeze
+ :prerelease => false,
+ :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
+ :wrappers => true,
+ }
##
# Creates a new installer instance.
@@ -54,43 +42,32 @@ class Gem::DependencyInstaller
# :security_policy:: See Gem::Installer::new and Gem::Security.
# :user_install:: See Gem::Installer.new
# :wrappers:: See Gem::Installer::new
- # :build_args:: See Gem::Installer::new
def initialize(options = {})
- @install_dir = options[:install_dir] || Gem.dir
-
if options[:install_dir] then
- # HACK shouldn't change the global settings, needed for -i behavior
- # maybe move to the install command? See also github #442
- Gem::Specification.dirs = @install_dir
+ 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]
- @dev_shallow = options[:dev_shallow]
- @development = options[:development]
- @document = options[:document]
- @domain = options[:domain]
- @env_shebang = options[:env_shebang]
- @force = options[:force]
- @format_executable = options[:format_executable]
+ @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]
- @build_args = options[:build_args]
- @build_docs_in_background = options[:build_docs_in_background]
-
- # Indicates that we should not try to update any deps unless
- # we absolutely must.
- @minimal_deps = options[:minimal_deps]
-
- @available = nil
+ @prerelease = options[:prerelease]
+ @security_policy = options[:security_policy]
+ @user_install = options[:user_install]
+ @wrappers = options[:wrappers]
+
@installed_gems = []
- @toplevel_specs = nil
+ @install_dir = options[:install_dir] || Gem.dir
@cache_dir = options[:cache_dir] || @install_dir
# Set with any errors that SpecFetcher finds while search through
@@ -98,75 +75,41 @@ class Gem::DependencyInstaller
@errors = nil
end
- attr_reader :errors
-
- ##
- # Creates an AvailableSet to install from based on +dep_or_name+ and
- # +version+
-
- def available_set_for dep_or_name, version # :nodoc:
- if String === dep_or_name then
- find_spec_by_name_and_version dep_or_name, version, @prerelease
- else
- dep = dep_or_name.dup
- dep.prerelease = @prerelease
- @available = find_gems_with_sources dep
- end
-
- @available.pick_best!
- end
-
- ##
- # Indicated, based on the requested domain, if local
- # gems should be considered.
-
- def consider_local?
- @domain == :both or @domain == :local
- end
-
- ##
- # Indicated, based on the requested domain, if remote
- # gems should be considered.
-
- def consider_remote?
- @domain == :both or @domain == :remote
- 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 preferred over older gems, and
+ # sources. Gems are sorted with newer gems prefered over older gems, and
# local gems preferred over remote gems.
def find_gems_with_sources(dep)
- set = Gem::AvailableSet.new
-
- if consider_local?
- sl = Gem::Source::Local.new
+ # Reset the errors
+ @errors = nil
+ gems_and_sources = []
- if spec = sl.find_gem(dep.name)
- if dep.matches_spec? spec
- set.add spec, sl
- end
+ 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 consider_remote?
+ if @domain == :both or @domain == :remote then
begin
- found, errors = Gem::SpecFetcher.fetcher.spec_for_dependency dep
-
- if @errors
- @errors += errors
- else
- @errors = errors
+ requirements = dep.requirement.requirements.map do |req, ver|
+ req
end
- set << found
+ all = !dep.prerelease? &&
+ # we only need latest if there's one requirement and it is
+ # guaranteed to match the newest specs
+ (requirements.length > 1 or
+ (requirements.first != ">=" and requirements.first != ">"))
+
+ found, @errors = Gem::SpecFetcher.fetcher.fetch_with_errors dep, all, true, dep.prerelease?
+
+ gems_and_sources.push(*found)
rescue Gem::RemoteFetcher::FetchError => e
- # FIX if there is a problem talking to the network, we either need to always tell
- # the user (no really_verbose) or fail hard, not silently tell them that we just
- # couldn't find their requested gem.
if Gem.configuration.really_verbose then
say "Error fetching remote data:\t\t#{e.message}"
say "Falling back to local-only install"
@@ -175,7 +118,9 @@ class Gem::DependencyInstaller
end
end
- set
+ gems_and_sources.sort_by do |gem, source|
+ [gem, source =~ /^http:\/\// ? 0 : 1] # local gems win
+ end
end
##
@@ -183,84 +128,45 @@ class Gem::DependencyInstaller
# remote sources unless the ignore_dependencies was given.
def gather_dependencies
- specs = @available.all_specs
-
- # these gems were listed by the user, always install them
- keep_names = specs.map { |spec| spec.full_name }
-
- if @dev_shallow
- @toplevel_specs = keep_names
- end
+ specs = @specs_and_sources.map { |spec,_| spec }
dependency_list = Gem::DependencyList.new @development
dependency_list.add(*specs)
- to_do = specs.dup
- add_found_dependencies to_do, dependency_list unless @ignore_dependencies
-
- # REFACTOR maybe abstract away using Gem::Specification.include? so
- # that this isn't dependent only on the currently installed gems
- dependency_list.specs.reject! { |spec|
- not keep_names.include?(spec.full_name) and
- Gem::Specification.include?(spec)
- }
-
- unless dependency_list.ok? or @ignore_dependencies or @force then
- reason = dependency_list.why_not_ok?.map { |k,v|
- "#{k} requires #{v.join(", ")}"
- }.join("; ")
- raise Gem::DependencyError, "Unable to resolve dependencies: #{reason}"
- end
- @gems_to_install = dependency_list.dependency_order.reverse
- end
+ unless @ignore_dependencies then
+ to_do = specs.dup
+ seen = {}
- def add_found_dependencies to_do, dependency_list
- seen = {}
- dependencies = Hash.new { |h, name| h[name] = Gem::Dependency.new name }
+ until to_do.empty? do
+ spec = to_do.shift
+ next if spec.nil? or seen[spec.name]
+ seen[spec.name] = true
- until to_do.empty? do
- spec = to_do.shift
+ deps = spec.runtime_dependencies
+ deps |= spec.development_dependencies if @development
- # HACK why is spec nil?
- next if spec.nil? or seen[spec.name]
- seen[spec.name] = true
+ deps.each do |dep|
+ results = find_gems_with_sources(dep).reverse
- deps = spec.runtime_dependencies
+ results.reject! do |dep_spec,|
+ to_do.push dep_spec
- if @development
- if @dev_shallow
- if @toplevel_specs.include? spec.full_name
- deps |= spec.development_dependencies
+ @source_index.any? do |_, installed_spec|
+ dep.name == installed_spec.name and
+ dep.requirement.satisfied_by? installed_spec.version
+ end
end
- else
- deps |= spec.development_dependencies
- end
- end
-
- deps.each do |dep|
- dependencies[dep.name] = dependencies[dep.name].merge dep
-
- if @minimal_deps
- next if Gem::Specification.any? do |installed_spec|
- dep.name == installed_spec.name and
- dep.requirement.satisfied_by? installed_spec.version
- end
- end
- results = find_gems_with_sources(dep)
-
- results.sorted.each do |t|
- to_do.push t.spec
+ 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
-
- results.remove_installed! dep
-
- @available << results
- results.inject_into_list dependency_list
end
end
- dependency_list.remove_specs_unsatisfied_by dependencies
+ @gems_to_install = dependency_list.dependency_order.reverse
end
##
@@ -271,44 +177,45 @@ class Gem::DependencyInstaller
def find_spec_by_name_and_version(gem_name,
version = Gem::Requirement.default,
prerelease = false)
-
- set = Gem::AvailableSet.new
-
- if consider_local?
- if gem_name =~ /\.gem$/ and File.file? gem_name then
- src = Gem::Source::SpecificFile.new(gem_name)
- set.add src.spec, src
- elsif gem_name =~ /\.gem$/ then
- Dir[gem_name].each do |name|
- begin
- src = Gem::Source::SpecificFile.new name
- set.add src.spec, src
- rescue Gem::Package::FormatError
- end
- end
- else
- local = Gem::Source::Local.new
-
- if s = local.find_gem(gem_name, version)
- set.add s, local
+ 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 set.empty?
+ if spec_and_source.nil? then
dep = Gem::Dependency.new gem_name, version
- # HACK Dependency objects should be immutable
dep.prerelease = true if prerelease
+ spec_and_sources = find_gems_with_sources(dep).reverse
- set = find_gems_with_sources(dep)
- set.match_platform!
+ spec_and_source = spec_and_sources.find { |spec, source|
+ Gem::Platform.match spec.platform
+ }
end
- if set.empty?
- raise Gem::SpecificGemNotFoundException.new(gem_name, version, @errors)
+ if spec_and_source.nil? then
+ raise Gem::GemNotFoundException.new(
+ "Could not find a valid gem '#{gem_name}' (#{version}) locally or in a repository",
+ gem_name, version, @errors)
end
- @available = set
+ @specs_and_sources = [spec_and_source]
end
##
@@ -326,85 +233,54 @@ class Gem::DependencyInstaller
# separately.
def install dep_or_name, version = Gem::Requirement.default
- available_set_for dep_or_name, version
+ if String === dep_or_name then
+ find_spec_by_name_and_version dep_or_name, version, @prerelease
+ else
+ dep_or_name.prerelease = @prerelease
+ @specs_and_sources = [find_gems_with_sources(dep_or_name).last]
+ end
@installed_gems = []
gather_dependencies
- # REFACTOR is the last gem always the one that the user requested?
- # This code assumes that but is that actually validated by the code?
-
- last = @gems_to_install.size - 1
- @gems_to_install.each_with_index do |spec, index|
- # REFACTOR more current spec set hardcoding, should be abstracted?
- next if Gem::Specification.include?(spec) and index != last
+ @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 = @available.source_for spec
-
+ _, source_uri = @specs_and_sources.assoc spec
begin
- # REFACTOR make the fetcher to use configurable
- local_gem_path = source.download spec, @cache_dir
+ local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
+ @cache_dir
rescue Gem::RemoteFetcher::FetchError
- # TODO I doubt all fetch errors are recoverable, we should at least
- # report the errors probably.
next if @force
raise
end
- if @development
- if @dev_shallow
- is_dev = @toplevel_specs.include? spec.full_name
- else
- is_dev = true
- end
- end
-
inst = Gem::Installer.new local_gem_path,
:bin_dir => @bin_dir,
- :development => is_dev,
+ :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,
- :build_args => @build_args
+ :wrappers => @wrappers
spec = inst.install
@installed_gems << spec
end
- # Since this is currently only called for docs, we can be lazy and just say
- # it's documentation. Ideally the hook adder could decide whether to be in
- # the background or not, and what to call it.
- in_background "Installing documentation" do
- Gem.done_installing_hooks.each do |hook|
- hook.call self, @installed_gems
- end
- end unless Gem.done_installing_hooks.empty?
-
@installed_gems
end
- def in_background what
- fork_happened = false
- if @build_docs_in_background and Process.respond_to?(:fork)
- begin
- Process.fork do
- yield
- end
- fork_happened = true
- say "#{what} in a background process."
- rescue NotImplementedError
- end
- end
- yield unless fork_happened
- end
end
+
diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb
index 3e40325527..25d469d68c 100644
--- a/lib/rubygems/dependency_list.rb
+++ b/lib/rubygems/dependency_list.rb
@@ -5,18 +5,12 @@
#++
require 'tsort'
-require 'rubygems/deprecate'
##
# Gem::DependencyList is used for installing and uninstalling gems in the
# correct order to avoid conflicts.
-#--
-# TODO: It appears that all but topo-sort functionality is being duplicated
-# (or is planned to be duplicated) elsewhere in rubygems. Is the majority of
-# this class necessary anymore? Especially #ok?, #why_not_ok?
class Gem::DependencyList
- attr_reader :specs
include Enumerable
include TSort
@@ -27,11 +21,15 @@ class Gem::DependencyList
attr_accessor :development
##
- # Creates a DependencyList from the current specs.
+ # Creates a DependencyList from a Gem::SourceIndex +source_index+
- def self.from_specs
+ def self.from_source_index(source_index)
list = new
- list.add(*Gem::Specification.to_a)
+
+ source_index.each do |full_name, spec|
+ list.add spec
+ end
+
list
end
@@ -49,11 +47,7 @@ class Gem::DependencyList
# Adds +gemspecs+ to the dependency list.
def add(*gemspecs)
- @specs.concat gemspecs
- end
-
- def clear
- @specs.clear
+ @specs.push(*gemspecs)
end
##
@@ -110,26 +104,11 @@ class Gem::DependencyList
# Are all the dependencies in the list satisfied?
def ok?
- why_not_ok?(:quick).empty?
- end
-
- def why_not_ok? quick = false
- unsatisfied = Hash.new { |h,k| h[k] = [] }
- each do |spec|
- spec.runtime_dependencies.each do |dep|
- inst = Gem::Specification.any? { |installed_spec|
- dep.name == installed_spec.name and
- dep.requirement.satisfied_by? installed_spec.version
- }
-
- unless inst or @specs.find { |s| s.satisfies_requirement? dep } then
- unsatisfied[spec.name] << dep
- return unsatisfied if quick
- end
+ @specs.all? do |spec|
+ spec.runtime_dependencies.all? do |dep|
+ @specs.find { |s| s.satisfies_requirement? dep }
end
end
-
- unsatisfied
end
##
@@ -138,7 +117,7 @@ class Gem::DependencyList
# If removing the gemspec creates breaks a currently ok dependency, then it
# is NOT ok to remove the gemspec.
- def ok_to_remove?(full_name, check_dev=true)
+ def ok_to_remove?(full_name)
gem_to_remove = find_name full_name
siblings = @specs.find_all { |s|
@@ -149,9 +128,7 @@ class Gem::DependencyList
deps = []
@specs.each do |spec|
- check = check_dev ? spec.dependencies : spec.runtime_dependencies
-
- check.each do |dep|
+ spec.dependencies.each do |dep|
deps << dep if gem_to_remove.satisfies_requirement?(dep)
end
end
@@ -164,18 +141,6 @@ class Gem::DependencyList
end
##
- # Remove everything in the DependencyList that matches but doesn't
- # satisfy items in +dependencies+ (a hash of gem names to arrays of
- # dependencies).
-
- def remove_specs_unsatisfied_by dependencies
- specs.reject! { |spec|
- dep = dependencies[spec.name]
- dep and not dep.requirement.satisfied_by? spec.version
- }
- end
-
- ##
# Removes the gemspec matching +full_name+ from the dependency list
def remove_by_name(full_name)
@@ -210,7 +175,7 @@ class Gem::DependencyList
@specs.each(&block)
end
- def tsort_each_child(node)
+ def tsort_each_child(node, &block)
specs = @specs.sort.reverse
dependencies = node.runtime_dependencies
@@ -222,7 +187,6 @@ class Gem::DependencyList
begin
yield spec
rescue TSort::Cyclic
- # do nothing
end
break
end
@@ -237,7 +201,13 @@ class Gem::DependencyList
# +ignored+.
def active_count(specs, ignored)
- specs.count { |spec| ignored[spec.full_name].nil? }
+ result = 0
+
+ specs.each do |spec|
+ result += 1 unless ignored[spec.full_name]
+ end
+
+ result
end
end
diff --git a/lib/rubygems/dependency_resolver.rb b/lib/rubygems/dependency_resolver.rb
deleted file mode 100644
index 66f55eb9ad..0000000000
--- a/lib/rubygems/dependency_resolver.rb
+++ /dev/null
@@ -1,575 +0,0 @@
-require 'rubygems'
-require 'rubygems/dependency'
-require 'rubygems/exceptions'
-
-require 'uri'
-require 'net/http'
-
-module Gem
-
- # Raised when a DependencyConflict reaches the toplevel.
- # Indicates which dependencies were incompatible.
- #
- class DependencyResolutionError < Gem::Exception
- def initialize(conflict)
- @conflict = conflict
- a, b = conflicting_dependencies
-
- super "unable to resolve conflicting dependencies '#{a}' and '#{b}'"
- end
-
- attr_reader :conflict
-
- def conflicting_dependencies
- @conflict.conflicting_dependencies
- end
- end
-
- # Raised when a dependency requests a gem for which there is
- # no spec.
- #
- class UnsatisfiableDepedencyError < Gem::Exception
- def initialize(dep)
- super "unable to find any gem matching dependency '#{dep}'"
-
- @dependency = dep
- end
-
- attr_reader :dependency
- end
-
- # Raised when dependencies conflict and create the inability to
- # find a valid possible spec for a request.
- #
- class ImpossibleDependenciesError < Gem::Exception
- def initialize(request, conflicts)
- s = conflicts.size == 1 ? "" : "s"
- super "detected #{conflicts.size} conflict#{s} with dependency '#{request.dependency}'"
- @request = request
- @conflicts = conflicts
- end
-
- def dependency
- @request.dependency
- end
-
- attr_reader :conflicts
- end
-
- # Given a set of Gem::Dependency objects as +needed+ and a way
- # to query the set of available specs via +set+, calculates
- # a set of ActivationRequest objects which indicate all the specs
- # that should be activated to meet the all the requirements.
- #
- class DependencyResolver
-
- # Represents a specification retrieved via the rubygems.org
- # API. This is used to avoid having to load the full
- # Specification object when all we need is the name, version,
- # and dependencies.
- #
- class APISpecification
- attr_reader :set # :nodoc:
-
- def initialize(set, api_data)
- @set = set
- @name = api_data[:name]
- @version = Gem::Version.new api_data[:number]
- @dependencies = api_data[:dependencies].map do |name, ver|
- Gem::Dependency.new name, ver.split(/\s*,\s*/)
- end
- end
-
- attr_reader :name, :version, :dependencies
-
- def == other # :nodoc:
- self.class === other and
- @set == other.set and
- @name == other.name and
- @version == other.version and
- @dependencies == other.dependencies
- end
-
- def full_name
- "#{@name}-#{@version}"
- end
- end
-
- # The global rubygems pool, available via the rubygems.org API.
- # Returns instances of APISpecification.
- #
- class APISet
- def initialize
- @data = Hash.new { |h,k| h[k] = [] }
- @dep_uri = URI 'https://rubygems.org/api/v1/dependencies'
- end
-
- # Return data for all versions of the gem +name+.
- #
- def versions(name)
- if @data.key?(name)
- return @data[name]
- end
-
- uri = @dep_uri + "?gems=#{name}"
- str = Gem::RemoteFetcher.fetcher.fetch_path uri
-
- Marshal.load(str).each do |ver|
- @data[ver[:name]] << ver
- end
-
- @data[name]
- end
-
- # Return an array of APISpecification objects matching
- # DependencyRequest +req+.
- #
- def find_all(req)
- res = []
-
- versions(req.name).each do |ver|
- if req.dependency.match? req.name, ver[:number]
- res << APISpecification.new(self, ver)
- end
- end
-
- res
- end
-
- # A hint run by the resolver to allow the Set to fetch
- # data for DependencyRequests +reqs+.
- #
- def prefetch(reqs)
- names = reqs.map { |r| r.dependency.name }
- needed = names.find_all { |d| !@data.key?(d) }
-
- return if needed.empty?
-
- uri = @dep_uri + "?gems=#{needed.sort.join ','}"
- str = Gem::RemoteFetcher.fetcher.fetch_path uri
-
- Marshal.load(str).each do |ver|
- @data[ver[:name]] << ver
- end
- end
- end
-
- # Represents a possible Specification object returned
- # from IndexSet. Used to delay needed to download full
- # Specification objects when only the +name+ and +version+
- # are needed.
- #
- class IndexSpecification
- def initialize(set, name, version, source, plat)
- @set = set
- @name = name
- @version = version
- @source = source
- @platform = plat
-
- @spec = nil
- end
-
- attr_reader :name, :version, :source
-
- def full_name
- "#{@name}-#{@version}"
- end
-
- def spec
- @spec ||= @set.load_spec(@name, @version, @source)
- end
-
- def dependencies
- spec.dependencies
- end
- end
-
- # The global rubygems pool represented via the traditional
- # source index.
- #
- class IndexSet
- def initialize
- @f = Gem::SpecFetcher.fetcher
-
- @all = Hash.new { |h,k| h[k] = [] }
-
- list, _ = @f.available_specs(:released)
- list.each do |uri, specs|
- specs.each do |n|
- @all[n.name] << [uri, n]
- end
- end
-
- @specs = {}
- end
-
- # Return an array of IndexSpecification objects matching
- # DependencyRequest +req+.
- #
- def find_all(req)
- res = []
-
- name = req.dependency.name
-
- @all[name].each do |uri, n|
- if req.dependency.match? n
- res << IndexSpecification.new(self, n.name, n.version,
- uri, n.platform)
- end
- end
-
- res
- end
-
- # No prefetching needed since we load the whole index in
- # initially.
- #
- def prefetch(gems)
- end
-
- # Called from IndexSpecification to get a true Specification
- # object.
- #
- def load_spec(name, ver, source)
- key = "#{name}-#{ver}"
- @specs[key] ||= source.fetch_spec(Gem::NameTuple.new(name, ver))
- end
- end
-
- # A set which represents the installed gems. Respects
- # all the normal settings that control where to look
- # for installed gems.
- #
- class CurrentSet
- def find_all(req)
- req.dependency.matching_specs
- end
-
- def prefetch(gems)
- end
- end
-
- # Create DependencyResolver object which will resolve
- # the tree starting with +needed+ Depedency objects.
- #
- # +set+ is an object that provides where to look for
- # specifications to satisify the Dependencies. This
- # defaults to IndexSet, which will query rubygems.org.
- #
- def initialize(needed, set=IndexSet.new)
- @set = set || IndexSet.new # Allow nil to mean IndexSet
- @needed = needed
-
- @conflicts = nil
- end
-
- # Provide a DependencyResolver that queries only against
- # the already installed gems.
- #
- def self.for_current_gems(needed)
- new needed, CurrentSet.new
- end
-
- # Contains all the conflicts encountered while doing resolution
- #
- attr_reader :conflicts
-
- # Proceed with resolution! Returns an array of ActivationRequest
- # objects.
- #
- def resolve
- @conflicts = []
-
- needed = @needed.map { |n| DependencyRequest.new(n, nil) }
-
- res = resolve_for needed, []
-
- if res.kind_of? DependencyConflict
- raise DependencyResolutionError.new(res)
- end
-
- res
- end
-
- # Used internally to indicate that a dependency conflicted
- # with a spec that would be activated.
- #
- class DependencyConflict
- def initialize(dependency, activated, failed_dep=dependency)
- @dependency = dependency
- @activated = activated
- @failed_dep = failed_dep
- end
-
- attr_reader :dependency, :activated
-
- # Return the Specification that listed the dependency
- #
- def requester
- @failed_dep.requester
- end
-
- def for_spec?(spec)
- @dependency.name == spec.name
- end
-
- # Return the 2 dependency objects that conflicted
- #
- def conflicting_dependencies
- [@failed_dep.dependency, @activated.request.dependency]
- end
- end
-
- # Used Internally. Wraps a Depedency object to also track
- # which spec contained the Dependency.
- #
- class DependencyRequest
- def initialize(dep, act)
- @dependency = dep
- @requester = act
- end
-
- attr_reader :dependency, :requester
-
- def name
- @dependency.name
- end
-
- def matches_spec?(spec)
- @dependency.matches_spec? spec
- end
-
- def to_s
- @dependency.to_s
- end
-
- def ==(other)
- case other
- when Dependency
- @dependency == other
- when DependencyRequest
- @dependency == other.dependency && @requester == other.requester
- else
- false
- end
- end
- end
-
- # Specifies a Specification object that should be activated.
- # Also contains a dependency that was used to introduce this
- # activation.
- #
- class ActivationRequest
- def initialize(spec, req, others_possible=true)
- @spec = spec
- @request = req
- @others_possible = others_possible
- end
-
- attr_reader :spec, :request
-
- # Indicate if this activation is one of a set of possible
- # requests for the same Dependency request.
- #
- def others_possible?
- @others_possible
- end
-
- # Return the ActivationRequest that contained the dependency
- # that we were activated for.
- #
- def parent
- @request.requester
- end
-
- def name
- @spec.name
- end
-
- def full_name
- @spec.full_name
- end
-
- def version
- @spec.version
- end
-
- def full_spec
- Gem::Specification === @spec ? @spec : @spec.spec
- end
-
- def download(path)
- if @spec.respond_to? :source
- source = @spec.source
- else
- source = Gem.sources.first
- end
-
- Gem.ensure_gem_subdirectories path
-
- source.download full_spec, path
- end
-
- def ==(other)
- case other
- when Gem::Specification
- @spec == other
- when ActivationRequest
- @spec == other.spec && @request == other.request
- else
- false
- end
- end
-
- ##
- # Indicates if the requested gem has already been installed.
-
- def installed?
- this_spec = full_spec
-
- Gem::Specification.any? do |s|
- s == this_spec
- end
- end
- end
-
- def requests(s, act)
- reqs = []
- s.dependencies.each do |d|
- next unless d.type == :runtime
- reqs << DependencyRequest.new(d, act)
- end
-
- @set.prefetch(reqs)
-
- reqs
- end
-
- # The meat of the algorithm. Given +needed+ DependencyRequest objects
- # and +specs+ being a list to ActivationRequest, calculate a new list
- # of ActivationRequest objects.
- #
- def resolve_for(needed, specs)
- until needed.empty?
- dep = needed.shift
-
- # If there is already a spec activated for the requested name...
- if existing = specs.find { |s| dep.name == s.name }
-
- # then we're done since this new dep matches the
- # existing spec.
- next if dep.matches_spec? existing
-
- # There is a conflict! We return the conflict
- # object which will be seen by the caller and be
- # handled at the right level.
-
- # If the existing activation indicates that there
- # are other possibles for it, then issue the conflict
- # on the dep for the activation itself. Otherwise, issue
- # it on the requester's request itself.
- #
- if existing.others_possible?
- conflict = DependencyConflict.new(dep, existing)
- else
- depreq = existing.request.requester.request
- conflict = DependencyConflict.new(depreq, existing, dep)
- end
- @conflicts << conflict
-
- return conflict
- end
-
- # Get a list of all specs that satisfy dep
- possible = @set.find_all(dep)
-
- case possible.size
- when 0
- # If there are none, then our work here is done.
- raise UnsatisfiableDepedencyError.new(dep)
- when 1
- # If there is one, then we just add it to specs
- # and process the specs dependencies by adding
- # them to needed.
-
- spec = possible.first
- act = ActivationRequest.new(spec, dep, false)
-
- specs << act
-
- # Put the deps for at the beginning of needed
- # rather than the end to match the depth first
- # searching done by the multiple case code below.
- #
- # This keeps the error messages consistent.
- needed = requests(spec, act) + needed
- else
- # There are multiple specs for this dep. This is
- # the case that this class is built to handle.
-
- # Sort them so that we try the highest versions
- # first.
- possible = possible.sort_by { |s| s.version }
-
- # We track the conflicts seen so that we can report them
- # to help the user figure out how to fix the situation.
- conflicts = []
-
- # To figure out which to pick, we keep resolving
- # given each one being activated and if there isn't
- # a conflict, we know we've found a full set.
- #
- # We use an until loop rather than #reverse_each
- # to keep the stack short since we're using a recursive
- # algorithm.
- #
- until possible.empty?
- s = possible.pop
-
- # Recursively call #resolve_for with this spec
- # and add it's dependencies into the picture...
-
- act = ActivationRequest.new(s, dep)
-
- try = requests(s, act) + needed
-
- res = resolve_for(try, specs + [act])
-
- # While trying to resolve these dependencies, there may
- # be a conflict!
-
- if res.kind_of? DependencyConflict
- # The conflict might be created not by this invocation
- # but rather one up the stack, so if we can't attempt
- # to resolve this conflict (conflict isn't with the spec +s+)
- # then just return it so the caller can try to sort it out.
- return res unless res.for_spec? s
-
- # Otherwise, this is a conflict that we can attempt to fix
- conflicts << [s, res]
-
- # Optimization:
- #
- # Because the conflict indicates the dependency that trigger
- # it, we can prune possible based on this new information.
- #
- # This cuts down on the number of iterations needed.
- possible.delete_if { |x| !res.dependency.matches_spec? x }
- else
- # No conflict, return the specs
- return res
- end
- end
-
- # We tried all possibles and nothing worked, so we let the user
- # know and include as much information about the problem since
- # the user is going to have to take action to fix this.
- raise ImpossibleDependenciesError.new(dep, conflicts)
- end
- end
-
- specs
- end
- end
-end
diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
deleted file mode 100644
index 274d6a5c12..0000000000
--- a/lib/rubygems/deprecate.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-##
-# Provides a single method +deprecate+ to be used to declare when
-# something is going away.
-#
-# class Legacy
-# def self.klass_method
-# # ...
-# end
-#
-# def instance_method
-# # ...
-# end
-#
-# extend Gem::Deprecate
-# deprecate :instance_method, "X.z", 2011, 4
-#
-# class << self
-# extend Gem::Deprecate
-# deprecate :klass_method, :none, 2011, 4
-# end
-# end
-
-module Gem::Deprecate
-
- def self.skip # :nodoc:
- @skip ||= false
- end
-
- def self.skip= v # :nodoc:
- @skip = v
- end
-
- ##
- # Temporarily turn off warnings. Intended for tests only.
-
- def skip_during
- Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
- yield
- ensure
- Gem::Deprecate.skip = original
- end
-
- ##
- # Simple deprecation method that deprecates +name+ by wrapping it up
- # in a dummy method. It warns on each call to the dummy method
- # telling the user of +repl+ (unless +repl+ is :none) and the
- # year/month that it is planned to go away.
-
- def deprecate name, repl, year, month
- class_eval {
- old = "_deprecated_#{name}"
- alias_method old, name
- define_method name do |*args, &block| # TODO: really works on 1.8.7?
- klass = self.kind_of? Module
- target = klass ? "#{self}." : "#{self.class}#"
- msg = [ "NOTE: #{target}#{name} is deprecated",
- repl == :none ? " with no replacement" : "; use #{repl} instead",
- ". It will be removed on or after %4d-%02d-01." % [year, month],
- "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
- ]
- warn "#{msg.join}." unless Gem::Deprecate.skip
- send old, *args, &block
- end
- }
- end
-
- module_function :deprecate, :skip_during
-
-end
-
diff --git a/lib/rubygems/doc_manager.rb b/lib/rubygems/doc_manager.rb
new file mode 100644
index 0000000000..d26d87a26f
--- /dev/null
+++ b/lib/rubygems/doc_manager.rb
@@ -0,0 +1,240 @@
+#--
+# 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
+
+ ##
+ # Is the RI documentation installed?
+
+ def ri_installed?
+ File.exist?(File.join(@doc_dir, "ri"))
+ 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
+
+ say "rdoc #{args.join ' '}" if Gem.configuration.really_verbose
+
+ 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/doctor.rb b/lib/rubygems/doctor.rb
deleted file mode 100644
index 4fb399e24c..0000000000
--- a/lib/rubygems/doctor.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-require 'rubygems'
-require 'rubygems/user_interaction'
-require 'pathname'
-
-##
-# Cleans up after a partially-failed uninstall or for an invalid
-# Gem::Specification.
-#
-# If a specification was removed by hand this will remove any remaining files.
-#
-# If a corrupt specification was installed this will clean up warnings by
-# removing the bogus specification.
-
-class Gem::Doctor
-
- include Gem::UserInteraction
-
- ##
- # Maps a gem subdirectory to the files that are expected to exist in the
- # subdirectory.
-
- REPOSITORY_EXTENSION_MAP = [ # :nodoc:
- ['specifications', '.gemspec'],
- ['build_info', '.info'],
- ['cache', '.gem'],
- ['doc', ''],
- ['gems', ''],
- ]
-
- raise 'Update REPOSITORY_EXTENSION_MAP' unless
- Gem::REPOSITORY_SUBDIRECTORIES.sort ==
- REPOSITORY_EXTENSION_MAP.map { |(k,_)| k }.sort
-
- ##
- # Creates a new Gem::Doctor that will clean up +gem_repository+. Only one
- # gem repository may be cleaned at a time.
- #
- # If +dry_run+ is true no files or directories will be removed.
-
- def initialize gem_repository, dry_run = false
- @gem_repository = Pathname(gem_repository)
- @dry_run = dry_run
-
- @installed_specs = nil
- end
-
- ##
- # Specs installed in this gem repository
-
- def installed_specs # :nodoc:
- @installed_specs ||= Gem::Specification.map { |s| s.full_name }
- end
-
- ##
- # Are we doctoring a gem repository?
-
- def gem_repository?
- not installed_specs.empty?
- end
-
- ##
- # Cleans up uninstalled files and invalid gem specifications
-
- def doctor
- @orig_home = Gem.dir
- @orig_path = Gem.path
-
- say "Checking #{@gem_repository}"
-
- Gem.use_paths @gem_repository.to_s
-
- unless gem_repository? then
- say 'This directory does not appear to be a RubyGems repository, ' +
- 'skipping'
- say
- return
- end
-
- doctor_children
-
- say
- ensure
- Gem.use_paths @orig_home, *@orig_path
- end
-
- ##
- # Cleans up children of this gem repository
-
- def doctor_children # :nodoc:
- REPOSITORY_EXTENSION_MAP.each do |sub_directory, extension|
- doctor_child sub_directory, extension
- end
- end
-
- ##
- # Removes files in +sub_directory+ with +extension+
-
- def doctor_child sub_directory, extension # :nodoc:
- directory = @gem_repository + sub_directory
-
- directory.children.sort.each do |child|
- next unless child.exist?
-
- basename = child.basename(extension).to_s
- next if installed_specs.include? basename
- next if /^rubygems-\d/ =~ basename
- next if 'specifications' == sub_directory and 'default' == basename
-
- type = child.directory? ? 'directory' : 'file'
-
- action = if @dry_run then
- 'Extra'
- else
- child.rmtree
- 'Removed'
- end
-
- say "#{action} #{type} #{sub_directory}/#{child.basename}"
- end
- rescue Errno::ENOENT
- # ignore
- end
-
-end
-
diff --git a/lib/rubygems/errors.rb b/lib/rubygems/errors.rb
index e296ef3127..950b34d744 100644
--- a/lib/rubygems/errors.rb
+++ b/lib/rubygems/errors.rb
@@ -1,89 +1,35 @@
-#--
-# This file contains all the various exceptions and other errors that are used
-# inside of RubyGems.
-#
-# DOC: Confirm _all_
-#++
+class Gem::ErrorReason; end
-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.
+# Generated when trying to lookup a gem to indicate that the gem
+# was found, but that it isn't usable on the current platform.
+#
+# fetch and install read these and report them to the user to aid
+# in figuring out why a gem couldn't be installed.
+#
+class Gem::PlatformMismatch < Gem::ErrorReason
- class LoadError < ::LoadError
- # Name of gem
- attr_accessor :name
+ attr_reader :name
+ attr_reader :version
+ attr_reader :platforms
- # Version requirement of gem
- attr_accessor :requirement
+ def initialize(name, version)
+ @name = name
+ @version = version
+ @platforms = []
end
- # FIX: does this need to exist? The subclass is the only other reference
- # I can find.
- class ErrorReason; end
-
- # Generated when trying to lookup a gem to indicate that the gem
- # was found, but that it isn't usable on the current platform.
- #
- # fetch and install read these and report them to the user to aid
- # in figuring out why a gem couldn't be installed.
- #
- class PlatformMismatch < ErrorReason
-
- ##
- # the name of the gem
- attr_reader :name
-
- ##
- # the version
- attr_reader :version
-
- ##
- # The platforms that are mismatched
- attr_reader :platforms
-
- def initialize(name, version)
- @name = name
- @version = version
- @platforms = []
- end
-
- ##
- # append a platform to the list of mismatched platforms.
- #
- # Platforms are added via this instead of injected via the constructor
- # so that we can loop over a list of mismatches and just add them rather
- # than perform some kind of calculation mismatch summary before creation.
- def add_platform(platform)
- @platforms << platform
- end
-
- ##
- # A wordy description of the error.
- def wordy
- "Found %s (%s), but was for platform%s %s" %
- [@name,
- @version,
- @platforms.size == 1 ? '' : 's',
- @platforms.join(' ,')]
- end
+ def add_platform(platform)
+ @platforms << platform
end
- ##
- # An error that indicates we weren't able to fetch some
- # data from a source
+ def wordy
+ prefix = "Found #{@name} (#{@version})"
- class SourceFetchProblem < ErrorReason
- def initialize(source, error)
- @source = source
- @error = error
- end
-
- attr_reader :source, :error
-
- def wordy
- "Unable to download data from #{@source.uri} - #{@error.message}"
+ if @platforms.size == 1
+ "#{prefix}, but was for platform #{@platforms[0]}"
+ else
+ "#{prefix}, but was for platforms #{@platforms.join(' ,')}"
end
end
+
end
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb
index ff389b320b..55d67f9125 100644
--- a/lib/rubygems/exceptions.rb
+++ b/lib/rubygems/exceptions.rb
@@ -1,14 +1,7 @@
-# TODO: the documentation in here is terrible.
-#
-# Each exception needs a brief description and the scenarios where it is
-# likely to be raised
-
##
# Base exception class for RubyGems. All exception raised by RubyGems are a
# subclass of this one.
-class Gem::Exception < RuntimeError
- attr_accessor :source_exception
-end
+class Gem::Exception < RuntimeError; end
class Gem::CommandLineError < Gem::Exception; end
@@ -31,18 +24,11 @@ class Gem::EndOfYAMLException < Gem::Exception; end
##
# Signals that a file permission error is preventing the user from
-# operating on the given directory.
-
+# installing in the requested directories.
class Gem::FilePermissionError < Gem::Exception
-
- attr_reader :directory
-
- def initialize directory
- @directory = directory
-
- super "You don't have write permissions for the #{directory} directory."
+ def initialize(path)
+ super("You don't have write permissions into the #{path} directory.")
end
-
end
##
@@ -51,12 +37,9 @@ class Gem::FormatException < Gem::Exception
attr_accessor :file_path
end
-class Gem::GemNotFoundException < Gem::Exception; end
-
-class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
- def initialize(name, version, errors=nil)
- super "Could not find a valid gem '#{name}' (#{version}) locally or in a repository"
-
+class Gem::GemNotFoundException < Gem::Exception
+ def initialize(msg, name=nil, version=nil, errors=nil)
+ super msg
@name = name
@version = version
@errors = errors
@@ -106,4 +89,3 @@ class Gem::SystemExitException < SystemExit
end
end
-
diff --git a/lib/rubygems/ext.rb b/lib/rubygems/ext.rb
index b2bb09aad5..97ee762a4a 100644
--- a/lib/rubygems/ext.rb
+++ b/lib/rubygems/ext.rb
@@ -15,5 +15,4 @@ require 'rubygems/ext/builder'
require 'rubygems/ext/configure_builder'
require 'rubygems/ext/ext_conf_builder'
require 'rubygems/ext/rake_builder'
-require 'rubygems/ext/cmake_builder'
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index 79cae906ee..c029bbe1e9 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -13,26 +13,27 @@ class Gem::Ext::Builder
def self.make(dest_path, results)
unless File.exist? 'Makefile' then
- raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
+ raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
end
- # try to find make program from Ruby configure arguments first
- RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
- make_program = $1 || ENV['MAKE'] || ENV['make']
+ 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
- destdir = '"DESTDIR=%s"' % ENV['DESTDIR'] if RUBY_VERSION > '2.0'
+ ['', ' install'].each do |target|
+ cmd = "#{make_program}#{target}"
+ results << cmd
+ results << `#{cmd} #{redirector}`
- ['', 'install'].each do |target|
- # Pass DESTDIR via command line to override what's in MAKEFLAGS
- cmd = [
- make_program,
- destdir,
- target
- ].join(' ').rstrip
- run(cmd, results, "make #{target}".rstrip)
+ raise Gem::InstallError, "make#{target} failed:\n\n#{results}" unless
+ $?.success?
end
end
@@ -40,26 +41,12 @@ class Gem::Ext::Builder
'2>&1'
end
- def self.run(command, results, command_name = nil)
- verbose = Gem.configuration.really_verbose
-
- begin
- # TODO use Process.spawn when ruby 1.8 support is dropped.
- rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], nil
- if verbose
- puts(command)
- system(command)
- else
- results << command
- results << `#{command} #{redirector}`
- end
- ensure
- ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
- end
+ def self.run(command, results)
+ results << command
+ results << `#{command} #{redirector}`
unless $?.success? then
- results << "Building has failed. See above output for more information on the failure." if verbose
- raise Gem::InstallError, "#{command_name || class_name} failed:\n\n#{results.join "\n"}"
+ raise Gem::InstallError, "#{class_name} failed:\n\n#{results.join "\n"}"
end
end
diff --git a/lib/rubygems/ext/cmake_builder.rb b/lib/rubygems/ext/cmake_builder.rb
deleted file mode 100644
index d6d106f4ae..0000000000
--- a/lib/rubygems/ext/cmake_builder.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
- def self.build(extension, directory, dest_path, results)
- unless File.exist?('Makefile') then
- cmd = "cmake . -DCMAKE_INSTALL_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/configure_builder.rb b/lib/rubygems/ext/configure_builder.rb
index ef8b29e427..c2087eb5ad 100644
--- a/lib/rubygems/ext/configure_builder.rb
+++ b/lib/rubygems/ext/configure_builder.rb
@@ -8,10 +8,10 @@ require 'rubygems/ext/builder'
class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
- def self.build(extension, directory, dest_path, results, args=[])
+ def self.build(extension, directory, dest_path, results)
unless File.exist?('Makefile') then
cmd = "sh ./configure --prefix=#{dest_path}"
- cmd << " #{args.join ' '}" unless args.empty?
+ cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
run cmd, results
end
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 5112eb8e2f..b3d588dc9c 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -6,60 +6,18 @@
require 'rubygems/ext/builder'
require 'rubygems/command'
-require 'fileutils'
-require 'tempfile'
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
- FileEntry = FileUtils::Entry_ # :nodoc:
- def self.build(extension, directory, dest_path, results, args=[])
- tmp_dest = Dir.mktmpdir(".gem.", ".")
+ 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?
- t = nil
- Tempfile.open %w"siteconf .rb", "." do |siteconf|
- t = siteconf
- siteconf.puts "require 'rbconfig'"
- siteconf.puts "dest_path = #{(tmp_dest || dest_path).dump}"
- %w[sitearchdir sitelibdir].each do |dir|
- siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
- siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
- end
+ run cmd, results
- siteconf.flush
-
- siteconf_path = File.expand_path siteconf.path
-
- rubyopt = ENV["RUBYOPT"]
- destdir = ENV["DESTDIR"]
-
- begin
- ENV["RUBYOPT"] = ["-r#{siteconf_path}", rubyopt].compact.join(' ')
- cmd = [Gem.ruby, File.basename(extension), *args].join ' '
-
- run cmd, results
-
- ENV["DESTDIR"] = nil
- ENV["RUBYOPT"] = rubyopt
- siteconf.unlink
-
- make dest_path, results
-
- if tmp_dest
- FileEntry.new(tmp_dest).traverse do |ent|
- destent = ent.class.new(dest_path, ent.rel)
- destent.exist? or File.rename(ent.path, destent.path)
- end
- end
- ensure
- ENV["RUBYOPT"] = rubyopt
- ENV["DESTDIR"] = destdir
- end
- end
- t.unlink if t and t.path
+ make dest_path, results
results
- ensure
- FileUtils.rm_rf tmp_dest if tmp_dest
end
end
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb
index 2ac6edd5c8..3b45ef4369 100644
--- a/lib/rubygems/ext/rake_builder.rb
+++ b/lib/rubygems/ext/rake_builder.rb
@@ -9,26 +9,18 @@ require 'rubygems/command'
class Gem::Ext::RakeBuilder < Gem::Ext::Builder
- def self.build(extension, directory, dest_path, results, args=[])
+ def self.build(extension, directory, dest_path, results)
if File.basename(extension) =~ /mkrf_conf/i then
cmd = "#{Gem.ruby} #{File.basename extension}"
- cmd << " #{args.join " "}" unless args.empty?
+ 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.to_s + '"' if dest_path.to_s.include?(' ')
+ dest_path = '"' + dest_path + '"' if dest_path.include?(' ')
- rake = ENV['rake']
-
- rake ||= begin
- "\"#{Gem.ruby}\" -rubygems #{Gem.bin_path('rake', 'rake')}"
- rescue Gem::Exception
- end
-
- rake ||= Gem.default_exec_format % 'rake'
-
- cmd = "#{rake} RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
+ 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
diff --git a/lib/rubygems/format.rb b/lib/rubygems/format.rb
new file mode 100644
index 0000000000..82eaf9e77e
--- /dev/null
+++ b/lib/rubygems/format.rb
@@ -0,0 +1,83 @@
+#--
+# 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
+ attr_accessor :file_entries
+ attr_accessor :gem_path
+
+ extend Gem::UserInteraction
+
+ ##
+ # Constructs a Format representing the gem's data which came from +gem_path+
+
+ def initialize(gem_path)
+ @gem_path = gem_path
+ end
+
+ ##
+ # Reads the gem +file_path+ using +security_policy+ and returns a Format
+ # representing the data in the gem
+
+ 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
+
+ start = File.read file_path, 20
+
+ if start.nil? or start.length < 20 then
+ nil
+ elsif start.include?("MD5SUM =") # old version gems
+ require 'rubygems/old_format'
+
+ Gem::OldFormat.from_file_by_path file_path
+ else
+ open file_path, Gem.binary_mode do |io|
+ from_io io, file_path, security_policy
+ end
+ end
+ end
+
+ ##
+ # Reads a gem from +io+ at +gem_path+ using +security_policy+ and returns a
+ # Format representing the data from 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
new file mode 100644
index 0000000000..7891d596c4
--- /dev/null
+++ b/lib/rubygems/gem_openssl.rb
@@ -0,0 +1,94 @@
+#--
+# 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?
+ raise 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
new file mode 100644
index 0000000000..6ee3c078d5
--- /dev/null
+++ b/lib/rubygems/gem_path_searcher.rb
@@ -0,0 +1,100 @@
+##
+# 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)
+ return [] unless @lib_dirs[spec.object_id] # case no paths
+ 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(',')}}" if
+ spec.require_paths
+ end
+
+end
+
diff --git a/lib/rubygems/gem_runner.rb b/lib/rubygems/gem_runner.rb
index 8060e15312..07a792dd9b 100644
--- a/lib/rubygems/gem_runner.rb
+++ b/lib/rubygems/gem_runner.rb
@@ -4,14 +4,9 @@
# See LICENSE.txt for permissions.
#++
-require 'rubygems'
require 'rubygems/command_manager'
require 'rubygems/config_file'
-
-##
-# Load additional plugins from $LOAD_PATH
-
-Gem.load_env_plugins rescue nil
+require 'rubygems/doc_manager'
##
# Run an instance of the gem program.
@@ -25,24 +20,27 @@ Gem.load_env_plugins rescue nil
class Gem::GemRunner
def initialize(options={})
- # TODO: nuke these 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.
- # TODO use slice!
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
@@ -57,17 +55,24 @@ class Gem::GemRunner
Gem::Command.add_specific_extra_args command_name, config_args
end
- cmd.run Gem.configuration.args, build_args
+ 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.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
-Gem.load_plugins
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
index c0628ebfb5..225bd704f9 100644
--- a/lib/rubygems/gemcutter_utilities.rb
+++ b/lib/rubygems/gemcutter_utilities.rb
@@ -1,52 +1,19 @@
+require 'net/http'
require 'rubygems/remote_fetcher'
module Gem::GemcutterUtilities
- # TODO: move to Gem::Command
- OptionParser.accept Symbol do |value|
- value.to_sym
- end
-
- ##
- # Add the --key option
-
- def add_key_option
- add_option('-k', '--key KEYNAME', Symbol,
- 'Use the given API key',
- 'from ~/.gem/credentials') do |value,options|
- options[:key] = value
- end
- end
-
- def api_key
- if options[:key] then
- verify_api_key options[:key]
- elsif Gem.configuration.api_keys.key?(host)
- Gem.configuration.api_keys[host]
- else
- Gem.configuration.rubygems_api_key
- end
- end
- def sign_in sign_in_host = nil
- sign_in_host ||= self.host
+ def sign_in
return if Gem.configuration.rubygems_api_key
- pretty_host = if Gem::DEFAULT_HOST == sign_in_host then
- 'RubyGems.org'
- else
- sign_in_host
- end
-
- say "Enter your #{pretty_host} credentials."
- say "Don't have an account yet? " +
- "Create one at #{sign_in_host}/sign_up"
+ say "Enter your RubyGems.org credentials."
+ say "Don't have an account yet? Create one at http://rubygems.org/sign_up"
email = ask " Email: "
password = ask_for_password "Password: "
say "\n"
- response = rubygems_api_request(:get, "api/v1/api_key",
- sign_in_host) do |request|
+ response = rubygems_api_request :get, "api/v1/api_key" do |request|
request.basic_auth email, password
end
@@ -56,38 +23,16 @@ module Gem::GemcutterUtilities
end
end
- attr_writer :host
- def host
- configured_host = Gem.host unless
- Gem.configuration.disable_default_gem_server
-
- @host ||=
- begin
- env_rubygems_host = ENV['RUBYGEMS_HOST']
- env_rubygems_host = nil if
- env_rubygems_host and env_rubygems_host.empty?
-
- env_rubygems_host|| configured_host
- end
- end
-
- def rubygems_api_request(method, path, host = nil, &block)
- require 'net/http'
-
- self.host = host if host
- unless self.host
- alert_error "You must specify a gem server"
- terminate_interaction 1 # TODO: question this
- end
-
- uri = URI.parse "#{self.host}/#{path}"
+ def rubygems_api_request(method, path, &block)
+ host = ENV['RUBYGEMS_HOST'] || 'https://rubygems.org'
+ uri = URI.parse "#{host}/#{path}"
request_method = Net::HTTP.const_get method.to_s.capitalize
Gem::RemoteFetcher.fetcher.request(uri, request_method, &block)
end
- def with_response resp, error_prefix = nil
+ def with_response(resp)
case resp
when Net::HTTPSuccess then
if block_given? then
@@ -96,20 +41,8 @@ module Gem::GemcutterUtilities
say resp.body
end
else
- message = resp.body
- message = "#{error_prefix}: #{message}" if error_prefix
-
- say message
- terminate_interaction 1 # TODO: question this
- end
- end
-
- def verify_api_key(key)
- if Gem.configuration.api_keys.key? key then
- Gem.configuration.api_keys[key]
- else
- alert_error "No such API key. Please add it to your configuration (done automatically on initial `gem push`)."
- terminate_interaction 1 # TODO: question this
+ say resp.body
+ terminate_interaction 1
end
end
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb
index 85c90f7d78..f85fe8467d 100644
--- a/lib/rubygems/indexer.rb
+++ b/lib/rubygems/indexer.rb
@@ -1,6 +1,9 @@
+require 'fileutils'
+require 'tmpdir'
+require 'zlib'
+
require 'rubygems'
-require 'rubygems/package'
-require 'time'
+require 'rubygems/format'
begin
gem 'builder'
@@ -16,6 +19,11 @@ 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
@@ -49,21 +57,22 @@ class Gem::Indexer
# Create an indexer that will index the gems in +directory+.
def initialize(directory, options = {})
- require 'fileutils'
- require 'tmpdir'
- require 'zlib'
-
- unless defined?(Builder::XChar) then
- raise "Gem::Indexer requires that the XML Builder library be installed:" +
- "\n\tgem install builder"
+ unless ''.respond_to? :to_xs then
+ raise "Gem::Indexer requires that the XML Builder library be installed:" \
+ "\n\tgem install builder"
end
- options = { :build_modern => true }.merge options
+ 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_#{$$}")
+ @directory = File.join Dir.tmpdir, "gem_generate_index_#{$$}"
marshal_name = "Marshal.#{Gem.marshal_version}"
@@ -71,23 +80,26 @@ class Gem::Indexer
@marshal_index = File.join @directory, marshal_name
@quick_dir = File.join @directory, 'quick'
+
@quick_marshal_dir = File.join @quick_dir, marshal_name
- @quick_marshal_dir_base = File.join "quick", marshal_name # FIX: UGH
@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}")
+ @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
@@ -97,8 +109,6 @@ class Gem::Indexer
# 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.
- #--
- # TODO move to Gem::Specification
def abbreviate(spec)
spec.files = []
@@ -112,30 +122,107 @@ class Gem::Indexer
##
# Build various indicies
- def build_indicies
- Gem::Specification.dirs = []
- Gem::Specification.add_specs(*map_gems_to_specs(gem_file_list))
-
- build_marshal_gemspecs
- build_modern_indicies if @build_modern
+ 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.released_gems.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
- count = Gem::Specification.count
- progress = ui.progress_reporter count,
- "Generating Marshal quick index gemspecs for #{count} gems",
+ 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
- Gem::Specification.each do |spec|
- spec_file_name = "#{spec.original_name}.gemspec.rz"
+ index.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)
@@ -143,7 +230,7 @@ class Gem::Indexer
files << marshal_name
- progress.updated spec.original_name
+ progress.updated original_name
end
progress.done
@@ -163,8 +250,8 @@ class Gem::Indexer
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.
+ # 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
@@ -187,15 +274,13 @@ class Gem::Indexer
##
# Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
- def build_modern_indicies
- prerelease, released = Gem::Specification.partition { |s|
- s.version.prerelease?
- }
- latest_specs = Gem::Specification.latest_specs
-
- build_modern_index(released.sort, @specs_index, 'specs')
- build_modern_index(latest_specs.sort, @latest_specs_index, 'latest specs')
- build_modern_index(prerelease.sort, @prerelease_specs_index,
+ def build_modern_indicies(index)
+ build_modern_index(index.released_specs.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,
@@ -206,41 +291,165 @@ class Gem::Indexer
"#{@prerelease_specs_index}.gz"]
end
- def map_gems_to_specs gems
- gems.map { |gemfile|
- if File.size(gemfile) == 0 then
- alert_warning "Skipping zero-length gem: #{gemfile}"
- next
+ ##
+ # 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::VERSION}</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.file_name}"
+ 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::Package.new(gemfile).spec
- spec.loaded_from = gemfile
-
- # HACK: fuck this shit - borks all tests that use pl1
- # if File.basename(gemfile, ".gem") != spec.original_name then
- # exp = spec.full_name
- # exp << " (#{spec.original_name})" if
- # spec.original_name != spec.full_name
- # msg = "Skipping misnamed gem: #{gemfile} should be named #{exp}"
- # alert_warning msg
- # next
- # end
-
- abbreviate spec
- sanitize spec
-
- spec
- rescue SignalException => e
- alert_error "Received signal, exiting"
- raise
- rescue Exception => e
- msg = ["Unable to process #{gemfile}",
- "#{e.message} (#{e.class})",
- "\t#{e.backtrace.join "\n\t"}"].join("\n")
- alert_error msg
+ 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
- }.compact
+
+ progress.done
+ end
+
+ index
end
##
@@ -252,6 +461,20 @@ class Gem::Indexer
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
@@ -295,7 +518,7 @@ class Gem::Indexer
# List of gem file names to index.
def gem_file_list
- Dir[File.join(@dest_directory, "gems", '*.gem')]
+ Dir.glob(File.join(@dest_directory, "gems", "*.gem"))
end
##
@@ -303,7 +526,8 @@ class Gem::Indexer
def generate_index
make_temp_directories
- build_indicies
+ index = collect_specs
+ build_indicies index
install_indicies
rescue SignalException
ensure
@@ -327,22 +551,24 @@ class Gem::Indexer
say "Moving index into production dir #{@dest_directory}" if verbose
- files = @files
+ 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
+ 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_base)
+ 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)
+ FileUtils.mv @quick_marshal_dir, dst_name, :verbose => verbose,
+ :force => true
end
files = files.map do |path|
- path.sub(/^#{Regexp.escape @directory}\/?/, '') # HACK?
+ path.sub @directory, ''
end
files.each do |file|
@@ -350,8 +576,8 @@ class Gem::Indexer
dst_name = File.join @dest_directory, file
FileUtils.rm_rf dst_name, :verbose => verbose
- FileUtils.mv(src_name, @dest_directory,
- :verbose => verbose, :force => true)
+ FileUtils.mv src_name, @dest_directory, :verbose => verbose,
+ :force => true
end
end
@@ -382,10 +608,10 @@ class Gem::Indexer
# be replaced by their XML entity equivalent.
def sanitize(spec)
- spec.summary = sanitize_string(spec.summary)
- spec.description = sanitize_string(spec.description)
+ 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.authors = spec.authors.collect { |a| sanitize_string(a) }
spec
end
@@ -394,24 +620,19 @@ class Gem::Indexer
# Sanitize a single string.
def sanitize_string(string)
- return string unless 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 gemspec
+ # Strings for authors. Need a way to disallow bad values on gempsec
# generation. (Probably won't happen.)
- string = string.to_s
-
- begin
- Builder::XChar.encode string
- rescue NameError, NoMethodError
- string.to_xs
- end
+ string ? string.to_s.to_xs : string
end
##
- # Perform an in-place update of the repository from newly added gems.
+ # 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
@@ -428,19 +649,14 @@ class Gem::Indexer
terminate_interaction 0
end
- specs = map_gems_to_specs updated_gems
- prerelease, released = specs.partition { |s| s.version.prerelease? }
+ index = collect_specs updated_gems
- Gem::Specification.dirs = []
- Gem::Specification.add_specs(*specs)
-
- files = build_marshal_gemspecs
+ files = build_marshal_gemspecs index
Gem.time 'Updated indexes' do
- update_specs_index released, @dest_specs_index, @specs_index
- update_specs_index released, @dest_latest_specs_index, @latest_specs_index
- update_specs_index(prerelease,
- @dest_prerelease_specs_index,
+ update_specs_index index.released_gems, @dest_specs_index, @specs_index
+ update_specs_index index.released_gems, @dest_latest_specs_index, @latest_specs_index
+ update_specs_index(index.prerelease_gems, @dest_prerelease_specs_index,
@prerelease_specs_index)
end
@@ -458,12 +674,12 @@ class Gem::Indexer
files << "#{@prerelease_specs_index}.gz"
files = files.map do |path|
- path.sub(/^#{Regexp.escape @directory}\/?/, '') # HACK?
+ path.sub @directory, ''
end
files.each do |file|
src_name = File.join @directory, file
- dst_name = File.join @dest_directory, file # REFACTOR: duped above
+ dst_name = File.join @dest_directory, File.dirname(file)
FileUtils.mv src_name, dst_name, :verbose => verbose,
:force => true
@@ -479,7 +695,7 @@ class Gem::Indexer
def update_specs_index(index, source, dest)
specs_index = Marshal.load Gem.read_binary(source)
- index.each do |spec|
+ 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]
@@ -491,4 +707,6 @@ class Gem::Indexer
Marshal.dump specs_index, io
end
end
+
end
+
diff --git a/lib/rubygems/install_message.rb b/lib/rubygems/install_message.rb
deleted file mode 100644
index c1979c1549..0000000000
--- a/lib/rubygems/install_message.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'rubygems'
-require 'rubygems/user_interaction'
-
-##
-# A default post-install hook that displays "Successfully installed
-# some_gem-1.0"
-
-Gem.post_install do |installer|
- ui = Gem::DefaultUserInteraction.ui
- ui.say "Successfully installed #{installer.spec.full_name}"
-end
-
diff --git a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb
index ffa8f910df..4e7f9e7952 100644
--- a/lib/rubygems/install_update_options.rb
+++ b/lib/rubygems/install_update_options.rb
@@ -5,13 +5,7 @@
#++
require 'rubygems'
-
-# forward-declare
-
-module Gem::Security # :nodoc:
- class Policy # :nodoc:
- end
-end
+require 'rubygems/security'
##
# Mixin methods for install and update options for Gem::Commands
@@ -22,14 +16,9 @@ module Gem::InstallUpdateOptions
# Add the install/update options to the option parser.
def add_install_update_options
- # TODO: use @parser.accept
OptionParser.accept Gem::Security::Policy do |value|
- require 'rubygems/security'
-
value = Gem::Security::Policies[value]
- valid = Gem::Security::Policies.keys.sort
- message = "#{value} (#{valid.join ', '} are valid)"
- raise OptionParser::InvalidArgument, message if value.nil?
+ raise OptionParser::InvalidArgument, value if value.nil?
value
end
@@ -40,49 +29,21 @@ module Gem::InstallUpdateOptions
end
add_option(:"Install/Update", '-n', '--bindir DIR',
- 'Directory where binary files are',
- 'located') do |value, options|
+ 'Directory where binary files are',
+ 'located') do |value, options|
options[:bin_dir] = File.expand_path(value)
end
- add_option(:"Install/Update", '--[no-]document [TYPES]', Array,
- 'Generate documentation for installed gems',
- 'List the documentation types you wish to',
- 'generate. For example: rdoc,ri') do |value, options|
- options[:document] = case value
- when nil then %w[ri]
- when false then []
- else 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", '-N', '--no-document',
- 'Disable documentation generation') do |value, options|
- options[:document] = []
- end
-
- add_option(:Deprecated, '--[no-]rdoc',
- 'Generate RDoc for installed gems',
- 'Use --document instead') do |value, options|
- if value then
- options[:document] << 'rdoc'
- else
- options[:document].delete 'rdoc'
- end
-
- options[:document].uniq!
- end
-
- add_option(:Deprecated, '--[no-]ri',
- 'Generate ri data for installed gems.',
- 'Use --document instead') do |value, options|
- if value then
- options[:document] << 'ri'
- else
- options[:document].delete 'ri'
- end
-
- options[:document].uniq!
+ 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',
@@ -97,6 +58,10 @@ module Gem::InstallUpdateOptions
options[:force] = value
end
+ add_option(:"Install/Update", '-t', '--[no-]test',
+ 'Ignored; just for compatiblity') do |value, options|
+ end
+
add_option(:"Install/Update", '-w', '--[no-]wrappers',
'Use bin wrappers for executables',
'Not available on dosish platforms') do |value, options|
@@ -114,6 +79,12 @@ module Gem::InstallUpdateOptions
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',
@@ -128,30 +99,9 @@ module Gem::InstallUpdateOptions
end
add_option(:"Install/Update", "--development",
- "Install additional development",
+ "Install any additional development",
"dependencies") do |value, options|
options[:development] = true
- options[:dev_shallow] = true
- end
-
- add_option(:"Install/Update", "--development-all",
- "Install development dependencies for all",
- "gems (including dev deps themselves)") do |value, options|
- options[:development] = true
- options[:dev_shallow] = false
- end
-
- add_option(:"Install/Update", "--conservative",
- "Don't attempt to upgrade gems already",
- "meeting version requirement") do |value, options|
- options[:conservative] = true
- options[:minimal_deps] = true
- end
-
- add_option(:"Install/Update", "--minimal-deps",
- "Don't upgrade any dependencies that already",
- "meet version requirements") do |value, options|
- options[:minimal_deps] = true
end
end
@@ -159,7 +109,7 @@ module Gem::InstallUpdateOptions
# Default options for the gem install command.
def install_update_defaults_str
- '--document=rdoc,ri --wrappers'
+ '--rdoc --no-force --wrappers'
end
end
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index 0ccf7ad52f..f64696fe7a 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -4,22 +4,23 @@
# See LICENSE.txt for permissions.
#++
-require 'rubygems/exceptions'
-require 'rubygems/package'
-require 'rubygems/ext'
-require 'rubygems/user_interaction'
require 'fileutils'
-require 'thread'
+require 'rbconfig'
+
+require 'rubygems/format'
+require 'rubygems/ext'
+require 'rubygems/require_paths_builder'
##
-# The installer installs the files contained in the .gem into the Gem.home.
+# 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 invokes pre and post install hooks. Hooks can be added either
+# 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.
@@ -33,22 +34,13 @@ class Gem::Installer
ENV_PATHS = %w[/usr/bin/env /bin/env]
##
- # The builder shells-out to run various commands after changing the
- # directory. This means multiple installations cannot be allowed to build
- # extensions in parallel as they may change each other's directories leading
- # to broken extensions or failed installations.
-
- CHDIR_MUTEX = Mutex.new # :nodoc:
-
- ##
# Raised when there is an error while building extensions.
#
class ExtensionBuildError < Gem::InstallError; end
include Gem::UserInteraction
- # DOC: Missing docs or :nodoc:.
- attr_reader :gem
+ include Gem::RequirePathsBuilder
##
# The directory a gem's executables will be installed into
@@ -61,9 +53,9 @@ class Gem::Installer
attr_reader :gem_home
##
- # The options passed when the Gem::Installer was instantiated.
+ # The Gem::Specification for the gem being installed
- attr_reader :options
+ attr_reader :spec
@path_warning = false
@@ -74,7 +66,6 @@ class Gem::Installer
attr_accessor :path_warning
- # DOC: Missing docs or :nodoc:.
attr_writer :exec_format
# Defaults to use Ruby's program prefix and suffix.
@@ -88,117 +79,66 @@ class Gem::Installer
# Constructs an Installer instance that will install the gem located at
# +gem+. +options+ is a Hash with the following keys:
#
- # :bin_dir:: Where to put a bin wrapper if needed.
- # :development:: Whether or not development dependencies should be installed.
# :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.
- # :ignore_dependencies:: Don't raise if a dependency is missing.
- # :install_dir:: The directory to install the gem into.
# :security_policy:: Use the specified security policy. See Gem::Security
- # :user_install:: Indicate that the gem should be unpacked into the users
- # personal gem directory.
- # :only_install_dir:: Only validate dependencies against what is in the
- # install_dir
# :wrappers:: Install wrappers if true, symlinks if false.
- # :build_args:: An Array of arguments to pass to the extension builder
- # process. If not set, then Gem::Command.build_args is used
def initialize(gem, options={})
- require 'fileutils'
-
@gem = gem
- @options = options
- @package = Gem::Package.new @gem
-
- process_options
-
- @package.security_policy = @security_policy
-
- if options[:user_install] and not options[:unpack] then
- @gem_home = Gem.user_dir
- @bin_dir = Gem.bindir gem_home unless options[:bin_dir]
- check_that_user_bin_dir_is_in_path
- end
- end
- ##
- # Checks if +filename+ exists in +@bin_dir+.
- #
- # If +@force+ is set +filename+ is overwritten.
- #
- # If +filename+ exists and is a RubyGems wrapper for different gem the user
- # is consulted.
- #
- # If +filename+ exists and +@bin_dir+ is Gem.default_bindir (/usr/local) the
- # user is consulted.
- #
- # Otherwise +filename+ is overwritten.
-
- def check_executable_overwrite filename # :nodoc:
- return if @force
-
- generated_bin = File.join @bin_dir, formatted_program_filename(filename)
-
- return unless File.exist? generated_bin
-
- ruby_executable = false
- existing = nil
-
- open generated_bin, 'rb' do |io|
- next unless io.gets =~ /^#!/ # shebang
- io.gets # blankline
+ options = {
+ :bin_dir => nil,
+ :env_shebang => false,
+ :exec_format => false,
+ :force => false,
+ :install_dir => Gem.dir,
+ :source_index => Gem.source_index,
+ }.merge options
- # TODO detect a specially formatted comment instead of trying
- # to run a regexp against ruby code.
- next unless io.gets =~ /This file was generated by RubyGems/
+ @env_shebang = options[:env_shebang]
+ @force = options[:force]
+ gem_home = options[:install_dir]
+ @gem_home = File.expand_path(gem_home)
+ @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]
- ruby_executable = true
- existing = io.read.slice(/^gem (['"])(.*?)(\1),/, 2)
+ begin
+ @format = Gem::Format.from_file_by_path @gem, @security_policy
+ rescue Gem::Package::FormatError
+ raise Gem::InstallError, "invalid gem format for #{@gem}"
end
- return if spec.name == existing
-
- # somebody has written to RubyGems' directory, overwrite, too bad
- return if Gem.default_bindir != @bin_dir and not ruby_executable
-
- question = "#{spec.name}'s executable \"#{filename}\" conflicts with "
-
- if ruby_executable then
- question << existing
-
- return if ask_yes_no "#{question}\nOverwrite the executable?", false
-
- conflict = "installed executable from #{existing}"
- else
- question << generated_bin
-
- return if ask_yes_no "#{question}\nOverwrite the executable?", false
+ if options[:user_install] and not options[:unpack] then
+ @gem_home = Gem.user_dir
- conflict = generated_bin
+ 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
end
- raise Gem::InstallError,
- "\"#{filename}\" from #{spec.name} conflicts with #{conflict}"
- end
+ FileUtils.mkdir_p @gem_home
+ raise Gem::FilePermissionError, @gem_home unless
+ options[:unpack] or File.writable? @gem_home
- ##
- # Lazy accessor for the spec's gem directory.
+ @spec = @format.spec
- def gem_dir
- @gem_dir ||= File.join(gem_home, "gems", spec.full_name)
- end
-
- ##
- # Lazy accessor for the installer's spec.
-
- def spec
- @spec ||= @package.spec
- rescue Gem::Package::Error => e
- raise Gem::InstallError, "invalid gem: #{e.message}"
+ @gem_dir = File.join(@gem_home, "gems", @spec.full_name).untaint
end
##
@@ -213,87 +153,72 @@ class Gem::Installer
# specifications/<gem-version>.gemspec #=> the Gem::Specification
def install
- pre_install_checks
-
- run_pre_install_hooks
-
- # Completely remove any previous gem files
- FileUtils.rm_rf gem_dir
-
- FileUtils.mkdir_p gem_dir
-
- extract_files
+ # 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
- build_extensions
- write_build_info_file
- run_post_build_hooks
+ if rrgv = @spec.required_rubygems_version then
+ unless rrgv.satisfied_by? Gem::Version.new(Gem::VERSION) then
+ raise Gem::InstallError,
+ "#{@spec.name} requires RubyGems version #{rrgv}. " +
+ "Try 'gem update --system' to update RubyGems itself."
+ end
+ end
- generate_bin
- write_spec
- write_cache_file
+ unless @ignore_dependencies then
+ deps = @spec.runtime_dependencies
+ deps |= @spec.development_dependencies if @development
- say spec.post_install_message unless spec.post_install_message.nil?
+ deps.each do |dep_gem|
+ ensure_dependency @spec, dep_gem
+ end
+ end
+ end
- spec.loaded_from = spec_file
+ Gem.pre_install_hooks.each do |hook|
+ hook.call self
+ end
- Gem::Specification.add_spec spec unless Gem::Specification.include? spec
+ FileUtils.mkdir_p @gem_home unless File.directory? @gem_home
- run_post_install_hooks
+ Gem.ensure_gem_subdirectories @gem_home
- spec
+ FileUtils.mkdir_p @gem_dir
- # TODO This rescue is in the wrong place. What is raising this exception?
- # move this rescue to around the code that actually might raise it.
- rescue Zlib::GzipFile::Error
- raise Gem::InstallError, "gzip error installing #{gem}"
- end
+ extract_files
+ generate_bin
+ build_extensions
+ write_spec
- def run_pre_install_hooks # :nodoc:
- Gem.pre_install_hooks.each do |hook|
- if hook.call(self) == false then
- location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
+ write_require_paths_file_if_needed
- message = "pre-install hook#{location} failed for #{spec.full_name}"
- raise Gem::InstallError, message
- end
+ # 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
- end
- def run_post_build_hooks # :nodoc:
- Gem.post_build_hooks.each do |hook|
- if hook.call(self) == false then
- FileUtils.rm_rf gem_dir
+ say @spec.post_install_message unless @spec.post_install_message.nil?
- location = " at #{$1}" if hook.inspect =~ /@(.*:\d+)/
+ @spec.loaded_from = File.join(@gem_home, 'specifications', @spec.spec_name)
- message = "post-build hook#{location} failed for #{spec.full_name}"
- raise Gem::InstallError, message
- end
- end
- end
+ @source_index.add_spec @spec
- def run_post_install_hooks # :nodoc:
Gem.post_install_hooks.each do |hook|
hook.call self
end
- end
-
- ##
- #
- # Return an Array of Specifications contained within the gem_home
- # we'll be installing into.
-
- def installed_specs
- @specs ||= begin
- specs = []
-
- Dir[File.join(gem_home, "specifications", "*.gemspec")].each do |path|
- spec = Gem::Specification.load path.untaint
- specs << spec if spec
- end
- specs
- end
+ return @spec
+ rescue Zlib::GzipFile::Error
+ raise Gem::InstallError, "gzip error installing #{@gem}"
end
##
@@ -307,16 +232,15 @@ class Gem::Installer
unless installation_satisfies_dependency? dependency then
raise Gem::InstallError, "#{spec.name} requires #{dependency}"
end
+
true
end
##
- # True if the gems in the system satisfy +dependency+.
+ # True if the gems in the source_index satisfy +dependency+.
def installation_satisfies_dependency?(dependency)
- return true if installed_specs.detect { |s| dependency.matches_spec? s }
- return false if @only_install_dir
- not dependency.matching_specs.empty?
+ @source_index.find_name(dependency.name, dependency.requirement).size > 0
end
##
@@ -324,25 +248,23 @@ class Gem::Installer
def unpack(directory)
@gem_dir = directory
+ @format = Gem::Format.from_file_by_path @gem, @security_policy
extract_files
end
##
- # The location of of the spec file that is installed.
- #
-
- def spec_file
- File.join gem_home, "specifications", "#{spec.full_name}.gemspec"
- end
-
- ##
# Writes the .gemspec specification (in Ruby) to the gem home's
# specifications directory.
def write_spec
- open spec_file, 'w' do |file|
- file.puts spec.to_ruby_for_cache
- file.fsync rescue nil # for filesystems without fsync(2)
+ rubycode = @spec.to_ruby
+
+ file_name = File.join @gem_home, 'specifications', @spec.spec_name
+
+ file_name.untaint
+
+ File.open(file_name, "w") do |file|
+ file.puts rubycode
end
end
@@ -361,34 +283,28 @@ class Gem::Installer
end
end
- # DOC: Missing docs or :nodoc:.
def generate_bin
- return if spec.executables.nil? or spec.executables.empty?
+ return if @spec.executables.nil? or @spec.executables.empty?
- Dir.mkdir @bin_dir unless File.exist? @bin_dir
- raise Gem::FilePermissionError.new(@bin_dir) unless File.writable? @bin_dir
-
- spec.executables.each do |filename|
- filename.untaint
- bin_path = File.join gem_dir, spec.bindir, filename
+ # 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)
- unless File.exist? bin_path then
- # TODO change this to a more useful warning
- warn "#{bin_path} maybe `gem pristine #{spec.name}` will fix it?"
- next
- end
+ 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 "#{@spec.bindir}/#{filename}", @gem_dir
mode = File.stat(bin_path).mode | 0111
- FileUtils.chmod mode, bin_path
-
- check_executable_overwrite filename
+ File.chmod mode, bin_path
if @wrappers then
- generate_bin_script filename, @bin_dir
+ generate_bin_script filename, bindir
else
- generate_bin_symlink filename, @bin_dir
+ generate_bin_symlink filename, bindir
end
-
end
end
@@ -402,15 +318,24 @@ class Gem::Installer
def generate_bin_script(filename, bindir)
bin_script_path = File.join bindir, formatted_program_filename(filename)
- FileUtils.rm_f bin_script_path # prior install may have been --no-wrappers
+ exec_path = File.join @gem_dir, @spec.bindir, filename
- File.open bin_script_path, 'wb', 0755 do |file|
- file.print app_script_text(filename)
- end
+ # 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
- say bin_script_path if Gem.configuration.really_verbose
+ 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 filename, bindir
+ generate_windows_script filename, bindir
+ #else
+ # FileUtils.rm_f bin_script_path
+ # FileUtils.cp exec_path, bin_script_path,
+ # :verbose => Gem.configuration.really_verbose
+ #end
end
##
@@ -424,14 +349,14 @@ class Gem::Installer
return
end
- src = File.join gem_dir, spec.bindir, filename
+ 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
+ return if @spec.version < cur_version
end
File.unlink dst
end
@@ -442,49 +367,20 @@ class Gem::Installer
##
# Generates a #! line for +bin_file_name+'s wrapper copying arguments if
# necessary.
- #
- # If the :custom_shebang config is set, then it is used as a template
- # for how to create the shebang used for to run a gem's executables.
- #
- # The template supports 4 expansions:
- #
- # $env the path to the unix env utility
- # $ruby the path to the currently running ruby interpreter
- # $exec the path to the gem's executable
- # $name the name of the gem the executable is for
- #
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
+ 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}")
+ shebang = first_line.sub(/\A\#!.*?ruby\S*(?=(\s+\S+))/, "#!#{Gem.ruby}")
opts = $1
shebang.strip! # Avoid nasty ^M issues.
end
- if which = Gem.configuration[:custom_shebang]
- # replace bin_file_name with "ruby" to avoid endless loops
- which = which.gsub(/ #{bin_file_name}$/," #{Gem::ConfigMap[:ruby_install_name]}")
-
- which = which.gsub(/\$(\w+)/) do
- case $1
- when "env"
- @env_path ||= ENV_PATHS.find {|env_path| File.executable? env_path }
- when "ruby"
- "#{Gem.ruby}#{opts}"
- when "exec"
- bin_file_name
- when "name"
- spec.name
- end
- end
-
- "#!#{which}"
- elsif not ruby_name then
+ if not ruby_name then
"#!#{Gem.ruby}#{opts}"
elsif opts then
"#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
@@ -496,116 +392,15 @@ class Gem::Installer
end
##
- # Ensures the Gem::Specification written out for this gem is loadable upon
- # installation.
-
- def ensure_loadable_spec
- ruby = spec.to_ruby_for_cache
- ruby.untaint
-
- begin
- eval ruby
- rescue StandardError, SyntaxError => e
- raise Gem::InstallError,
- "The specification for #{spec.full_name} is corrupt (#{e.class})"
- end
- end
-
- # DOC: Missing docs or :nodoc:.
- def ensure_required_ruby_version_met
- 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
- end
-
- # DOC: Missing docs or :nodoc:.
- def ensure_required_rubygems_version_met
- if rrgv = spec.required_rubygems_version then
- unless rrgv.satisfied_by? Gem.rubygems_version then
- raise Gem::InstallError,
- "#{spec.name} requires RubyGems version #{rrgv}. " +
- "Try 'gem update --system' to update RubyGems itself."
- end
- end
- end
-
- # DOC: Missing docs or :nodoc:.
- def ensure_dependencies_met
- deps = spec.runtime_dependencies
- deps |= spec.development_dependencies if @development
-
- deps.each do |dep_gem|
- ensure_dependency spec, dep_gem
- end
- end
-
- # DOC: Missing docs or :nodoc:.
- def process_options
- @options = {
- :bin_dir => nil,
- :env_shebang => false,
- :force => false,
- :install_dir => Gem.dir,
- :only_install_dir => false
- }.merge options
-
- @env_shebang = options[:env_shebang]
- @force = options[:force]
- @gem_home = options[:install_dir]
- @ignore_dependencies = options[:ignore_dependencies]
- @format_executable = options[:format_executable]
- @security_policy = options[:security_policy]
- @wrappers = options[:wrappers]
- @only_install_dir = options[:only_install_dir]
-
- # 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.
- @bin_dir = options[:bin_dir] || Gem.bindir(gem_home)
- @development = options[:development]
-
- @build_args = options[:build_args] || Gem::Command.build_args
- end
-
- # DOC: Missing docs or :nodoc:.
- def check_that_user_bin_dir_is_in_path
- user_bin_dir = @bin_dir || Gem.bindir(gem_home)
- user_bin_dir = user_bin_dir.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if
- File::ALT_SEPARATOR
-
- path = ENV['PATH']
- if Gem.win_platform? then
- path = path.downcase
- user_bin_dir = user_bin_dir.downcase
- end
-
- unless 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
- end
-
- # DOC: Missing docs or :nodoc:.
- def verify_gem_home(unpack = false)
- FileUtils.mkdir_p gem_home
- raise Gem::FilePermissionError, gem_home unless
- unpack or File.writable?(gem_home)
- end
-
- ##
# Return the text for an application file.
def app_script_text(bin_file_name)
- return <<-TEXT
+ <<-TEXT
#{shebang bin_file_name}
#
# This file was generated by RubyGems.
#
-# The application '#{spec.name}' is installed as part of a gem, and
+# The application '#{@spec.name}' is installed as part of a gem, and
# this file is here to facilitate running it.
#
@@ -613,17 +408,13 @@ require 'rubygems'
version = "#{Gem::Requirement.default}"
-if ARGV.first
- str = ARGV.first
- str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
- if str =~ /\\A_(.*)_\\z/
- version = $1
- ARGV.shift
- end
+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)
+gem '#{@spec.name}', version
+load Gem.bin_path('#{@spec.name}', '#{bin_file_name}', version)
TEXT
end
@@ -631,14 +422,13 @@ TEXT
# return the stub script text used to launch the true ruby script
def windows_stub_script(bindir, bin_file_name)
- ruby = File.basename(Gem.ruby).chomp('"')
- return <<-TEXT
+ <<-TEXT
@ECHO OFF
IF NOT "%~f0" == "~f0" GOTO :WinNT
-@"#{ruby}" "#{File.join(bindir, bin_file_name)}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@"#{File.basename(Gem.ruby).chomp('"')}" "#{File.join(bindir, bin_file_name)}" %1 %2 %3 %4 %5 %6 %7 %8 %9
GOTO :EOF
:WinNT
-@"#{ruby}" "%~dpn0" %*
+@"#{File.basename(Gem.ruby).chomp('"')}" "%~dpn0" %*
TEXT
end
@@ -647,25 +437,16 @@ TEXT
# configure scripts and rakefiles or mkrf_conf files.
def build_extensions
- return if spec.extensions.empty?
-
- if @build_args.empty?
- say "Building native extensions. This could take a while..."
- else
- say "Building native extensions with: '#{@build_args.join(' ')}'"
- say "This could take a while..."
- end
-
- dest_path = File.join gem_dir, spec.require_paths.first
+ 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|
+ @spec.extensions.each do |extension|
break if ran_rake
results = []
- extension ||= ""
- extension_dir = File.join gem_dir, File.dirname(extension)
-
builder = case extension
when /extconf/ then
Gem::Ext::ExtConfBuilder
@@ -674,48 +455,36 @@ TEXT
when /rakefile/i, /mkrf_conf/i then
ran_rake = true
Gem::Ext::RakeBuilder
- when /CMakeLists.txt/ then
- Gem::Ext::CmakeBuilder
else
- message = "No builder for extension '#{extension}'"
- extension_build_error extension_dir, message
+ results = ["No builder for extension '#{extension}'"]
+ nil
end
begin
- FileUtils.mkdir_p dest_path
+ Dir.chdir File.join(@gem_dir, File.dirname(extension))
+ results = builder.build(extension, @gem_dir, dest_path, results)
- CHDIR_MUTEX.synchronize do
- Dir.chdir extension_dir do
- results = builder.build(extension, gem_dir, dest_path,
- results, @build_args)
+ say results.join("\n") if Gem.configuration.really_verbose
- say results.join("\n") if Gem.configuration.really_verbose
- end
- end
- rescue
- extension_build_error(extension_dir, results.join("\n"), $@)
- end
- end
- end
-
- ##
- # Logs the build +output+ in +build_dir+, then raises ExtensionBuildError.
+ rescue => ex
+ results = results.join "\n"
- def extension_build_error(build_dir, output, backtrace = nil)
- gem_make_out = File.join build_dir, 'gem_make.out'
+ File.open('gem_make.out', 'wb') { |f| f.puts results }
- open gem_make_out, 'wb' do |io| io.puts output end
-
- message = <<-EOF
+ message = <<-EOF
ERROR: Failed to build gem native extension.
- #{output}
+#{results}
-Gem files will remain installed in #{gem_dir} for inspection.
-Results logged to #{gem_make_out}
-EOF
+Gem files will remain installed in #{@gem_dir} for inspection.
+Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
+ EOF
- raise ExtensionBuildError, message, backtrace
+ raise ExtensionBuildError, message
+ ensure
+ Dir.chdir start_dir
+ end
+ end
end
##
@@ -724,87 +493,48 @@ EOF
# Ensures that files can't be installed outside the gem directory.
def extract_files
- @package.extract_files gem_dir
- 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
-
- ##
- #
- # Return the target directory where the gem is to be installed. This
- # directory is not guaranteed to be populated.
- #
-
- def dir
- gem_dir.to_s
- end
+ @gem_dir = File.expand_path @gem_dir
- ##
- # Performs various checks before installing the gem such as the install
- # repository is writable and its directories exist, required ruby and
- # rubygems versions are met and that dependencies are installed.
- #
- # Version and dependency checks are skipped if this install is forced.
- #
- # The dependent check will be skipped this install is ignoring dependencies.
+ raise ArgumentError, "format required to extract from" if @format.nil?
- def pre_install_checks
- verify_gem_home options[:unpack]
+ @format.file_entries.each do |entry, file_data|
+ path = entry['path'].untaint
- # If we're forcing the install then disable security unless the security
- # policy says that we only install signed gems.
- @security_policy = nil if
- @force and @security_policy and not @security_policy.only_signed
-
- ensure_loadable_spec
-
- Gem.ensure_gem_subdirectories gem_home
-
- return true if @force
-
- ensure_required_ruby_version_met
- ensure_required_rubygems_version_met
- ensure_dependencies_met unless @ignore_dependencies
-
- true
- end
+ if path =~ /\A\// then # for extra sanity
+ raise Gem::InstallError,
+ "attempt to install file into #{entry['path'].inspect}"
+ end
- ##
- # Writes the file containing the arguments for building this gem's
- # extensions.
+ path = File.expand_path File.join(@gem_dir, path)
- def write_build_info_file
- return if @build_args.empty?
+ 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
- build_info_dir = File.join gem_home, 'build_info'
+ FileUtils.rm_rf(path) if File.exists?(path)
+ FileUtils.mkdir_p File.dirname(path)
- FileUtils.mkdir_p build_info_dir
+ File.open(path, "wb") do |out|
+ out.write file_data
+ end
- build_info_file = File.join build_info_dir, "#{spec.full_name}.info"
+ FileUtils.chmod entry['mode'], path
- open build_info_file, 'w' do |io|
- @build_args.each do |arg|
- io.puts arg
- end
+ say path if Gem.configuration.really_verbose
end
end
##
- # Writes the .gem file to the cache directory
-
- def write_cache_file
- cache_file = File.join gem_home, 'cache', spec.file_name
+ # Prefix and suffix the program filename the same as ruby.
- FileUtils.cp @gem, cache_file unless File.exist? cache_file
+ def formatted_program_filename(filename)
+ if @format_executable then
+ self.class.exec_format % File.basename(filename)
+ else
+ filename
+ end
end
end
diff --git a/lib/rubygems/installer_test_case.rb b/lib/rubygems/installer_test_case.rb
deleted file mode 100644
index 62a468a8a2..0000000000
--- a/lib/rubygems/installer_test_case.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-require 'rubygems/test_case'
-require 'rubygems/installer'
-
-class Gem::Installer
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :bin_dir
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :build_args
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :gem_dir
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :force
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :format
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :gem_home
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :env_shebang
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :ignore_dependencies
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :format_executable
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :security_policy
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :spec
-
- ##
- # Available through requiring rubygems/installer_test_case
-
- attr_writer :wrappers
-end
-
-##
-# A test case for Gem::Installer.
-
-class Gem::InstallerTestCase < Gem::TestCase
-
- ##
- # Creates the following instance variables:
- #
- # @spec::
- # a spec named 'a', intended for regular installs
- # @user_spec::
- # a spec named 'b', intended for user installs
-
- # @gem::
- # the path to a built gem from @spec
- # @user_spec::
- # the path to a built gem from @user_spec
- #
- # @installer::
- # a Gem::Installer for the @spec that installs into @gemhome
- # @user_installer::
- # a Gem::Installer for the @user_spec that installs into Gem.user_dir
-
- def setup
- super
-
- @spec = quick_gem 'a' do |spec|
- util_make_exec spec
- end
-
- @user_spec = quick_gem 'b' do |spec|
- util_make_exec spec
- end
-
- util_build_gem @spec
- util_build_gem @user_spec
-
- @gem = @spec.cache_file
- @user_gem = @user_spec.cache_file
-
- @installer = util_installer @spec, @gemhome
- @user_installer = util_installer @user_spec, Gem.user_dir, :user
- end
-
- def util_gem_bindir spec = @spec # :nodoc:
- # TODO: deprecate
- spec.bin_dir
- end
-
- def util_gem_dir spec = @spec # :nodoc:
- # TODO: deprecate
- spec.gem_dir
- end
-
- ##
- # The path where installed executables live
-
- def util_inst_bindir
- File.join @gemhome, "bin"
- end
-
- ##
- # Adds an executable named "executable" to +spec+ with the given +shebang+.
- #
- # The executable is also written to the bin dir in @tmpdir and the installed
- # gem directory for +spec+.
-
- def util_make_exec(spec = @spec, shebang = "#!/usr/bin/ruby")
- spec.executables = %w[executable]
- spec.files << 'bin/executable'
-
- exec_path = spec.bin_file "executable"
- write_file exec_path do |io|
- io.puts shebang
- end
-
- bin_path = File.join @tempdir, "bin", "executable"
- write_file bin_path do |io|
- io.puts shebang
- end
- end
-
- ##
- # Builds the @spec gem and returns an installer for it. The built gem
- # includes:
- #
- # bin/executable
- # lib/code.rb
- # ext/a/mkrf_conf.rb
-
- def util_setup_gem(ui = @ui) # HACK fix use_ui to make this automatic
- @spec.files << File.join('lib', 'code.rb')
- @spec.extensions << File.join('ext', 'a', 'mkrf_conf.rb')
-
- Dir.chdir @tempdir do
- FileUtils.mkdir_p 'bin'
- FileUtils.mkdir_p 'lib'
- FileUtils.mkdir_p File.join('ext', 'a')
- File.open File.join('bin', 'executable'), 'w' do |f|
- f.puts "raise 'ran executable'"
- end
- File.open File.join('lib', 'code.rb'), 'w' do |f| f.puts '1' end
- File.open File.join('ext', 'a', 'mkrf_conf.rb'), 'w' do |f|
- f << <<-EOF
- File.open 'Rakefile', 'w' do |rf| rf.puts "task :default" end
- EOF
- end
-
- use_ui ui do
- FileUtils.rm_f @gem
-
- @gem = Gem::Package.build @spec
- end
- end
-
- @installer = Gem::Installer.new @gem
- end
-
- ##
- # Creates an installer for +spec+ that will install into +gem_home+. If
- # +user+ is true a user-install will be performed.
-
- def util_installer(spec, gem_home, user=false)
- Gem::Installer.new(spec.cache_file,
- :install_dir => gem_home,
- :user_install => user)
- end
-
-end
-
diff --git a/lib/rubygems/local_remote_options.rb b/lib/rubygems/local_remote_options.rb
index a1e106d9be..e238c7292c 100644
--- a/lib/rubygems/local_remote_options.rb
+++ b/lib/rubygems/local_remote_options.rb
@@ -51,7 +51,6 @@ module Gem::LocalRemoteOptions
end
add_bulk_threshold_option
- add_clear_sources_option
add_source_option
add_proxy_option
add_update_sources_option
@@ -70,18 +69,6 @@ module Gem::LocalRemoteOptions
end
##
- # Add the --clear-sources option
-
- def add_clear_sources_option
- add_option(:"Local/Remote", '--clear-sources',
- 'Clear the gem sources') do |value, options|
-
- Gem.sources = nil
- options[:sources_cleared] = true
- end
- end
-
- ##
# Add the --http-proxy option
def add_proxy_option
@@ -101,14 +88,14 @@ module Gem::LocalRemoteOptions
accept_uri_http
add_option(:"Local/Remote", '--source URL', URI::HTTP,
- 'Add URL as a remote source for gems') do |source, options|
-
+ 'Use URL as the remote source for gems') do |source, options|
source << '/' if source !~ /\/\z/
- if options.delete :sources_cleared then
- Gem.sources = [source]
- else
+ 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
@@ -117,7 +104,7 @@ module Gem::LocalRemoteOptions
# Add the --update-sources option
def add_update_sources_option
- add_option(:Deprecated, '-u', '--[no-]update-sources',
+ add_option(:"Local/Remote", '-u', '--[no-]update-sources',
'Update local source cache') do |value, options|
Gem.configuration.update_sources = value
end
diff --git a/lib/rubygems/mock_gem_ui.rb b/lib/rubygems/mock_gem_ui.rb
deleted file mode 100644
index 76a9389676..0000000000
--- a/lib/rubygems/mock_gem_ui.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'stringio'
-require 'rubygems/user_interaction'
-
-##
-# This Gem::StreamUI subclass records input and output to StringIO for
-# retrieval during tests.
-
-class Gem::MockGemUi < Gem::StreamUI
- ##
- # Raised when you haven't provided enough input to your MockGemUi
-
- class InputEOFError < RuntimeError
-
- def initialize question
- super "Out of input for MockGemUi on #{question.inspect}"
- end
-
- end
-
- class TermError < RuntimeError
- attr_reader :exit_code
-
- def initialize exit_code
- super
- @exit_code = exit_code
- end
- end
- class SystemExitException < RuntimeError; end
-
- module TTY
-
- attr_accessor :tty
-
- def tty?()
- @tty = true unless defined?(@tty)
- @tty
- end
-
- def noecho
- yield self
- end
- end
-
- def initialize(input = "")
- ins = StringIO.new input
- outs = StringIO.new
- errs = StringIO.new
-
- ins.extend TTY
- outs.extend TTY
- errs.extend TTY
-
- super ins, outs, errs, true
-
- @terminated = false
- end
-
- def ask question
- raise InputEOFError, question if @ins.eof?
-
- super
- end
-
- def input
- @ins.string
- end
-
- def output
- @outs.string
- end
-
- def error
- @errs.string
- end
-
- def terminated?
- @terminated
- end
-
- def terminate_interaction(status=0)
- @terminated = true
-
- raise TermError, status if status != 0
- raise SystemExitException
- end
-
-end
-
diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb
deleted file mode 100644
index d16fad26f1..0000000000
--- a/lib/rubygems/name_tuple.rb
+++ /dev/null
@@ -1,110 +0,0 @@
-##
-#
-# Represents a gem of name +name+ at +version+ of +platform+. These
-# wrap the data returned from the indexes.
-
-require 'rubygems/platform'
-
-class Gem::NameTuple
- def initialize(name, version, platform="ruby")
- @name = name
- @version = version
-
- unless platform.kind_of? Gem::Platform
- platform = "ruby" if !platform or platform.empty?
- end
-
- @platform = platform
- end
-
- attr_reader :name, :version, :platform
-
- ##
- # Turn an array of [name, version, platform] into an array of
- # NameTuple objects.
-
- def self.from_list list
- list.map { |t| new(*t) }
- end
-
- ##
- # Turn an array of NameTuple objects back into an array of
- # [name, version, platform] tuples.
-
- def self.to_basic list
- list.map { |t| t.to_a }
- end
-
- ##
- # A null NameTuple, ie name=nil, version=0
-
- def self.null
- new nil, Gem::Version.new(0), nil
- end
-
- ##
- # Indicate if this NameTuple matches the current platform.
-
- def match_platform?
- Gem::Platform.match @platform
- end
-
- ##
- # Indicate if this NameTuple is for a prerelease version.
- def prerelease?
- @version.prerelease?
- end
-
- ##
- # Return the name that the gemspec file would be
-
- def spec_name
- case @platform
- when nil, 'ruby', ''
- "#{@name}-#{@version}.gemspec"
- else
- "#{@name}-#{@version}-#{@platform}.gemspec"
- end
- end
-
- ##
- # Convert back to the [name, version, platform] tuple
-
- def to_a
- [@name, @version, @platform]
- end
-
- def to_s
- "#<Gem::NameTuple #{@name}, #{@version}, #{@platform}>"
- end
-
- def <=> other
- to_a <=> other.to_a
- end
-
- include Comparable
-
- ##
- # Compare with +other+. Supports another NameTuple or an Array
- # in the [name, version, platform] format.
-
- def == other
- case other
- when self.class
- @name == other.name and
- @version == other.version and
- @platform == other.platform
- when Array
- to_a == other
- else
- false
- end
- end
-
- alias_method :eql?, :==
-
- def hash
- to_a.hash
- end
-
-end
diff --git a/lib/rubygems/old_format.rb b/lib/rubygems/old_format.rb
new file mode 100644
index 0000000000..43967db412
--- /dev/null
+++ b/lib/rubygems/old_format.rb
@@ -0,0 +1,152 @@
+#--
+# 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
index 957446257d..937da584cb 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -3,562 +3,94 @@
# Copyright (C) 2004 Mauricio Julio Fernández Pradier
# See LICENSE.txt for additional licensing information.
#++
-#
-# Example using a Gem::Package
-#
-# Builds a .gem file given a Gem::Specification. A .gem file is a tarball
-# which contains a data.tar.gz and metadata.gz, and possibly signatures.
-#
-# require 'rubygems'
-# require 'rubygems/package'
-#
-# spec = Gem::Specification.new do |s|
-# s.summary = "Ruby based make-like utility."
-# s.name = 'rake'
-# s.version = PKG_VERSION
-# s.requirements << 'none'
-# 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::Package.build spec
-#
-# Reads a .gem file.
-#
-# require 'rubygems'
-# require 'rubygems/package'
-#
-# the_gem = Gem::Package.new(path_to_dot_gem)
-# the_gem.contents # get the files in the gem
-# the_gem.extract_files destination_directory # extract the gem into a directory
-# the_gem.spec # get the spec out of the gem
-# the_gem.verify # check the gem is OK (contains valid gem specification, contains a not corrupt contents archive)
-#
-# #files are the files in the .gem tar file, not the ruby files in the gem
-# #extract_files and #contents automatically call #verify
-require 'rubygems/security'
-require 'rubygems/specification'
-require 'rubygems/user_interaction'
+require 'fileutils'
+require 'find'
+require 'stringio'
+require 'yaml'
require 'zlib'
-class Gem::Package
-
- include Gem::UserInteraction
-
- class Error < Gem::Exception; end
-
- class FormatError < Error
- attr_reader :path
-
- def initialize message, path = nil
- @path = path
-
- message << " in #{path}" if path
-
- super message
- end
-
- end
-
- class PathError < Error
- def initialize destination, destination_dir
- super "installing into parent path %s of %s is not allowed" %
- [destination, destination_dir]
- end
- end
-
- class NonSeekableIO < Error; end
-
- class TooLongFileName < Error; end
-
- ##
- # Raised when a tar file is corrupt
-
- class TarInvalidError < Error; end
-
- attr_accessor :build_time # :nodoc:
-
- ##
- # Checksums for the contents of the package
-
- attr_reader :checksums
-
- ##
- # The files in this package. This is not the contents of the gem, just the
- # files in the top-level container.
-
- attr_reader :files
-
- ##
- # The security policy used for verifying the contents of this package.
-
- attr_accessor :security_policy
-
- ##
- # Sets the Gem::Specification to use to build this package.
-
- attr_writer :spec
-
- def self.build spec, skip_validation=false
- gem_file = spec.file_name
-
- package = new gem_file
- package.spec = spec
- package.build skip_validation
-
- gem_file
- end
-
- ##
- # Creates a new Gem::Package for the file at +gem+.
- #
- # If +gem+ is an existing file in the old format a Gem::Package::Old will be
- # returned.
-
- def self.new gem
- return super unless Gem::Package == self
- return super unless File.exist? gem
-
- start = File.read gem, 20
-
- return super unless start
- return super unless start.include? 'MD5SUM ='
-
- Gem::Package::Old.new gem
- end
-
- ##
- # Creates a new package that will read or write to the file +gem+.
-
- def initialize gem # :notnew:
- @gem = gem
-
- @build_time = Time.now
- @checksums = {}
- @contents = nil
- @digests = Hash.new { |h, algorithm| h[algorithm] = {} }
- @files = nil
- @security_policy = nil
- @signatures = {}
- @signer = nil
- @spec = nil
- end
-
- ##
- # Adds a checksum for each entry in the gem to checksums.yaml.gz.
-
- def add_checksums tar
- Gem.load_yaml
-
- checksums_by_algorithm = Hash.new { |h, algorithm| h[algorithm] = {} }
-
- @checksums.each do |name, digests|
- digests.each do |algorithm, digest|
- checksums_by_algorithm[algorithm][name] = digest.hexdigest
- end
- end
-
- tar.add_file_signed 'checksums.yaml.gz', 0444, @signer do |io|
- gzip_to io do |gz_io|
- YAML.dump checksums_by_algorithm, gz_io
- end
- end
- end
-
- ##
- # Adds the files listed in the packages's Gem::Specification to data.tar.gz
- # and adds this file to the +tar+.
-
- def add_contents tar # :nodoc:
- digests = tar.add_file_signed 'data.tar.gz', 0444, @signer do |io|
- gzip_to io do |gz_io|
- Gem::Package::TarWriter.new gz_io do |data_tar|
- add_files data_tar
- end
- end
- end
-
- @checksums['data.tar.gz'] = digests
- end
-
- ##
- # Adds files included the package's Gem::Specification to the +tar+ file
-
- def add_files tar # :nodoc:
- @spec.files.each do |file|
- stat = File.stat file
-
- next unless stat.file?
-
- tar.add_file_simple file, stat.mode, stat.size do |dst_io|
- open file, 'rb' do |src_io|
- dst_io.write src_io.read 16384 until src_io.eof?
- end
- end
- end
- end
-
- ##
- # Adds the package's Gem::Specification to the +tar+ file
-
- def add_metadata tar # :nodoc:
- digests = tar.add_file_signed 'metadata.gz', 0444, @signer do |io|
- gzip_to io do |gz_io|
- gz_io.write @spec.to_yaml
- end
- end
-
- @checksums['metadata.gz'] = digests
- end
-
- ##
- # Builds this package based on the specification set by #spec=
-
- def build skip_validation = false
- Gem.load_yaml
- require 'rubygems/security'
-
- @spec.mark_version
- @spec.validate unless skip_validation
-
- setup_signer
-
- open @gem, 'wb' do |gem_io|
- Gem::Package::TarWriter.new gem_io do |gem|
- add_metadata gem
- add_contents gem
- add_checksums gem
- end
- end
-
- say <<-EOM
- Successfully built RubyGem
- Name: #{@spec.name}
- Version: #{@spec.version}
- File: #{File.basename @spec.cache_file}
-EOM
- ensure
- @signer = nil
- end
-
- ##
- # A list of file names contained in this gem
-
- def contents
- return @contents if @contents
-
- verify unless @spec
-
- @contents = []
-
- open @gem, 'rb' do |io|
- gem_tar = Gem::Package::TarReader.new io
-
- gem_tar.each do |entry|
- next unless entry.full_name == 'data.tar.gz'
-
- open_tar_gz entry do |pkg_tar|
- pkg_tar.each do |contents_entry|
- @contents << contents_entry.full_name
- end
- end
-
- return @contents
- end
- end
- end
-
- ##
- # Creates a digest of the TarEntry +entry+ from the digest algorithm set by
- # the security policy.
-
- def digest entry # :nodoc:
- algorithms = if @checksums then
- @checksums.keys
- else
- [Gem::Security::DIGEST_NAME]
- end
-
- algorithms.each do |algorithm|
- digester = OpenSSL::Digest.new algorithm
-
- digester << entry.read(16384) until entry.eof?
-
- entry.rewind
-
- @digests[algorithm][entry.full_name] = digester
- end
-
- @digests
- end
-
- ##
- # Extracts the files in this package into +destination_dir+
-
- def extract_files destination_dir
- verify unless @spec
-
- FileUtils.mkdir_p destination_dir
-
- open @gem, 'rb' do |io|
- reader = Gem::Package::TarReader.new io
-
- reader.each do |entry|
- next unless entry.full_name == 'data.tar.gz'
-
- extract_tar_gz entry, destination_dir
-
- return # ignore further entries
- end
- end
- end
-
- ##
- # Extracts all the files in the gzipped tar archive +io+ into
- # +destination_dir+.
- #
- # If an entry in the archive contains a relative path above
- # +destination_dir+ or an absolute path is encountered an exception is
- # raised.
-
- def extract_tar_gz io, destination_dir # :nodoc:
- open_tar_gz io do |tar|
- tar.each do |entry|
- destination = install_location entry.full_name, destination_dir
-
- FileUtils.rm_rf destination
-
- FileUtils.mkdir_p File.dirname destination
-
- open destination, 'wb', entry.header.mode do |out|
- out.write entry.read
- end
-
- say destination if Gem.configuration.really_verbose
- end
- end
- end
-
- ##
- # Gzips content written to +gz_io+ to +io+.
- #--
- # Also sets the gzip modification time to the package build time to ease
- # testing.
-
- def gzip_to io # :yields: gz_io
- gz_io = Zlib::GzipWriter.new io, Zlib::BEST_COMPRESSION
- gz_io.mtime = @build_time
-
- yield gz_io
- ensure
- gz_io.close
- end
-
- ##
- # Returns the full path for installing +filename+.
- #
- # If +filename+ is not inside +destination_dir+ an exception is raised.
-
- def install_location filename, destination_dir # :nodoc:
- raise Gem::Package::PathError.new(filename, destination_dir) if
- filename.start_with? '/'
-
- destination_dir = File.realpath destination_dir if
- File.respond_to? :realpath
-
- destination = File.join destination_dir, filename
- destination = File.expand_path destination
-
- raise Gem::Package::PathError.new(destination, destination_dir) unless
- destination.start_with? destination_dir
-
- destination.untaint
- destination
- end
-
- ##
- # Loads a Gem::Specification from the TarEntry +entry+
-
- def load_spec entry # :nodoc:
- case entry.full_name
- when 'metadata' then
- @spec = Gem::Specification.from_yaml entry.read
- when 'metadata.gz' then
- args = [entry]
- args << { :external_encoding => Encoding::UTF_8 } if
- Object.const_defined?(:Encoding) &&
- Zlib::GzipReader.method(:wrap).arity != 1
-
- Zlib::GzipReader.wrap(*args) do |gzio|
- @spec = Gem::Specification.from_yaml gzio.read
- end
- end
- end
-
- ##
- # Opens +io+ as a gzipped tar archive
-
- def open_tar_gz io # :nodoc:
- Zlib::GzipReader.wrap io do |gzio|
- tar = Gem::Package::TarReader.new gzio
-
- yield tar
- end
- end
+require 'rubygems/security'
+require 'rubygems/specification'
- ##
- # Reads and loads checksums.yaml.gz from the tar file +gem+
+##
+# Wrapper for FileUtils meant to provide logging and additional operations if
+# needed.
- def read_checksums gem
- Gem.load_yaml
+class Gem::FileOperations
- @checksums = gem.seek 'checksums.yaml.gz' do |entry|
- Zlib::GzipReader.wrap entry do |gz_io|
- YAML.load gz_io.read
- end
- end
+ def initialize(logger = nil)
+ @logger = logger
end
- ##
- # Prepares the gem for signing and checksum generation. If a signing
- # certificate and key are not present only checksum generation is set up.
-
- def setup_signer
- if @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 }
+ 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
- @signer = Gem::Security::Signer.new nil, nil
- @spec.cert_chain = @signer.cert_chain.map { |cert| cert.to_pem } if
- @signer.cert_chain
+ super
end
end
- ##
- # The spec for this gem.
- #
- # If this is a package for a built gem the spec is loaded from the
- # gem and returned. If this is a package for a gem being built the provided
- # spec is returned.
-
- def spec
- verify unless @spec
-
- @spec
- end
-
- ##
- # Verifies that this gem:
- #
- # * Contains a valid gem specification
- # * Contains a contents archive
- # * The contents archive is not corrupt
- #
- # After verification the gem specification from the gem is available from
- # #spec
-
- def verify
- @files = []
- @spec = nil
-
- open @gem, 'rb' do |io|
- Gem::Package::TarReader.new io do |reader|
- read_checksums reader
-
- verify_files reader
- end
- end
-
- verify_checksums @digests, @checksums
-
- @security_policy.verify_signatures @spec, @digests, @signatures if
- @security_policy
-
- true
- rescue Gem::Security::Exception
- @spec = nil
- @files = []
- raise
- rescue Errno::ENOENT => e
- raise Gem::Package::FormatError.new e.message
- rescue Gem::Package::TarInvalidError => e
- raise Gem::Package::FormatError.new e.message, @gem
- end
-
- ##
- # Verifies the +checksums+ against the +digests+. This check is not
- # cryptographically secure. Missing checksums are ignored.
-
- def verify_checksums digests, checksums # :nodoc:
- return unless checksums
+end
- checksums.sort.each do |algorithm, gem_digests|
- gem_digests.sort.each do |file_name, gem_hexdigest|
- computed_digest = digests[algorithm][file_name]
+module Gem::Package
- unless computed_digest.hexdigest == gem_hexdigest then
- raise Gem::Package::FormatError.new \
- "#{algorithm} checksum mismatch for #{file_name}", @gem
+ 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
- ##
- # Verifies the files of the +gem+
-
- def verify_files gem
- gem.each do |entry|
- file_name = entry.full_name
- @files << file_name
-
- case file_name
- when /\.sig$/ then
- @signatures[$`] = entry.read if @security_policy
- next
- else
- digest entry
- end
-
- case file_name
- when /^metadata(.gz)?$/ then
- load_spec entry
- when 'data.tar.gz' then
- verify_gz entry
- end
- end
-
- unless @spec then
- raise Gem::Package::FormatError.new 'package metadata is missing', @gem
- end
-
- unless @files.include? 'data.tar.gz' then
- raise Gem::Package::FormatError.new \
- 'package content (data.tar.gz) is missing', @gem
- end
- end
-
- ##
- # Verifies that +entry+ is a valid gzipped file.
-
- def verify_gz entry # :nodoc:
- Zlib::GzipReader.wrap entry do |gzio|
- gzio.read 16384 until gzio.eof? # gzip checksum verification
- end
- rescue Zlib::GzipFile::Error => e
- raise Gem::Package::FormatError.new(e.message, entry.full_name)
- end
-
end
-require 'rubygems/package/digest_io'
-require 'rubygems/package/old'
+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/digest_io.rb b/lib/rubygems/package/digest_io.rb
deleted file mode 100644
index f8bde0f557..0000000000
--- a/lib/rubygems/package/digest_io.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-# IO wrapper that creates digests of contents written to the IO it wraps.
-
-class Gem::Package::DigestIO
-
- ##
- # Collected digests for wrapped writes.
- #
- # {
- # 'SHA1' => #<OpenSSL::Digest: [...]>,
- # 'SHA512' => #<OpenSSL::Digest: [...]>,
- # }
-
- attr_reader :digests
-
- ##
- # Wraps +io+ and updates digest for each of the digest algorithms in
- # the +digests+ Hash. Returns the digests hash. Example:
- #
- # io = StringIO.new
- # digests = {
- # 'SHA1' => OpenSSL::Digest.new('SHA1'),
- # 'SHA512' => OpenSSL::Digest.new('SHA512'),
- # }
- #
- # Gem::Package::DigestIO.wrap io, digests do |digest_io|
- # digest_io.write "hello"
- # end
- #
- # digests['SHA1'].hexdigest #=> "aaf4c61d[...]"
- # digests['SHA512'].hexdigest #=> "9b71d224[...]"
-
- def self.wrap io, digests
- digest_io = new io, digests
-
- yield digest_io
-
- return digests
- end
-
- ##
- # Creates a new DigestIO instance. Using ::wrap is recommended, see the
- # ::wrap documentation for documentation of +io+ and +digests+.
-
- def initialize io, digests
- @io = io
- @digests = digests
- end
-
- ##
- # Writes +data+ to the underlying IO and updates the digests
-
- def write data
- result = @io.write data
-
- @digests.each do |_, digest|
- digest << data
- end
-
- result
- end
-
-end
-
diff --git a/lib/rubygems/package/f_sync_dir.rb b/lib/rubygems/package/f_sync_dir.rb
new file mode 100644
index 0000000000..f7eb7f3ce3
--- /dev/null
+++ b/lib/rubygems/package/f_sync_dir.rb
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+#--
+# 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/old.rb b/lib/rubygems/package/old.rb
deleted file mode 100644
index d74753fa90..0000000000
--- a/lib/rubygems/package/old.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-##
-# The format class knows the guts of the ancient .gem file format and provides
-# the capability to read such ancient gems.
-#
-# Please pretend this doesn't exist.
-
-class Gem::Package::Old < Gem::Package
-
- undef_method :spec=
-
- ##
- # Creates a new old-format package reader for +gem+. Old-format packages
- # cannot be written.
-
- def initialize gem
- require 'fileutils'
- require 'zlib'
- Gem.load_yaml
-
- @contents = nil
- @gem = gem
- @security_policy = nil
- @spec = nil
- end
-
- ##
- # A list of file names contained in this gem
-
- def contents
- verify
-
- return @contents if @contents
-
- open @gem, 'rb' do |io|
- read_until_dashes io # spec
- header = file_list io
-
- @contents = header.map { |file| file['path'] }
- end
- end
-
- ##
- # Extracts the files in this package into +destination_dir+
-
- def extract_files destination_dir
- verify
-
- errstr = "Error reading files from gem"
-
- open @gem, 'rb' do |io|
- read_until_dashes io # spec
- header = file_list io
- raise Gem::Exception, errstr unless header
-
- header.each do |entry|
- full_name = entry['path']
-
- destination = install_location full_name, destination_dir
-
- file_data = ''
-
- read_until_dashes io do |line|
- file_data << line
- end
-
- file_data = file_data.strip.unpack("m")[0]
- file_data = Zlib::Inflate.inflate file_data
-
- raise Gem::Package::FormatError, "#{full_name} in #{@gem} is corrupt" if
- file_data.length != entry['size'].to_i
-
- FileUtils.rm_rf destination
-
- FileUtils.mkdir_p File.dirname destination
-
- open destination, 'wb', entry['mode'] do |out|
- out.write file_data
- end
-
- say destination if Gem.configuration.really_verbose
- end
- end
- rescue Zlib::DataError
- raise Gem::Exception, errstr
- end
-
- ##
- # Reads the file list section from the old-format gem +io+
-
- def file_list io # :nodoc:
- header = ''
-
- read_until_dashes io do |line|
- header << line
- end
-
- YAML.load header
- end
-
- ##
- # Reads lines until a "---" separator is found
-
- def read_until_dashes io # :nodoc:
- while (line = io.gets) && line.chomp.strip != "---" do
- yield line if block_given?
- end
- end
-
- ##
- # Skips the Ruby self-install header in +io+.
-
- def skip_ruby io # :nodoc:
- loop do
- line = io.gets
-
- return if line.chomp == '__END__'
- break unless line
- end
-
- raise Gem::Exception, "Failed to find end of ruby script while reading gem"
- end
-
- ##
- # The specification for this gem
-
- def spec
- verify
-
- return @spec if @spec
-
- yaml = ''
-
- open @gem, 'rb' do |io|
- skip_ruby io
- read_until_dashes io do |line|
- yaml << line
- end
- end
-
- yaml_error = if RUBY_VERSION < '1.9' then
- YAML::ParseError
- elsif YAML::ENGINE.yamler == 'syck' then
- YAML::ParseError
- else
- YAML::SyntaxError
- end
-
- begin
- @spec = Gem::Specification.from_yaml yaml
- rescue yaml_error => e
- raise Gem::Exception, "Failed to parse gem specification out of gem file"
- end
- rescue ArgumentError => e
- raise Gem::Exception, "Failed to parse gem specification out of gem file"
- end
-
- ##
- # Raises an exception if a security policy that verifies data is active.
- # Old format gems cannot be verified as signed.
-
- def verify
- return true unless @security_policy
-
- raise Gem::Security::Exception,
- 'old format gems do not contain signatures and cannot be verified' if
- @security_policy.verify_data
-
- true
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_header.rb b/lib/rubygems/package/tar_header.rb
index 28da1db0b5..4f923b9b5e 100644
--- a/lib/rubygems/package/tar_header.rb
+++ b/lib/rubygems/package/tar_header.rb
@@ -102,24 +102,61 @@ class Gem::Package::TarHeader
fields = header.unpack UNPACK_FORMAT
- 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
+ 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
##
diff --git a/lib/rubygems/package/tar_input.rb b/lib/rubygems/package/tar_input.rb
new file mode 100644
index 0000000000..6c286585e9
--- /dev/null
+++ b/lib/rubygems/package/tar_input.rb
@@ -0,0 +1,219 @@
+# -*- coding: iso-8859-1 -*-
+#++
+# 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 or defined? Maglev then
+ # these implementations have working Zlib
+ 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
new file mode 100644
index 0000000000..7d99a51127
--- /dev/null
+++ b/lib/rubygems/package/tar_output.rb
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+#--
+# 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
index e257fdd846..e6a71d386c 100644
--- a/lib/rubygems/package/tar_reader.rb
+++ b/lib/rubygems/package/tar_reader.rb
@@ -9,7 +9,7 @@
class Gem::Package::TarReader
- include Enumerable
+ include Gem::Package
##
# Raised if the tar IO is not seekable
@@ -52,9 +52,9 @@ class Gem::Package::TarReader
# Iterates over files in the tarball yielding each entry
def each
- return enum_for __method__ unless block_given?
+ loop do
+ return if @io.eof?
- until @io.eof? do
header = Gem::Package::TarHeader.from @io
return if header.empty?
@@ -100,23 +100,6 @@ class Gem::Package::TarReader
end
end
- ##
- # Seeks through the tar file until it finds the +entry+ with +name+ and
- # yields it. Rewinds the tar file to the beginning when the block
- # terminates.
-
- def seek name # :yields: entry
- found = find do |entry|
- entry.full_name == name
- end
-
- return unless found
-
- return yield found
- ensure
- rewind
- 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
index 7034e59210..eeb70bf000 100644
--- a/lib/rubygems/package/tar_reader/entry.rb
+++ b/lib/rubygems/package/tar_reader/entry.rb
@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
#++
-# Copyright (C) 2004 Mauricio Julio Fernández Pradier
+# Copyright (C) 2004 Mauricio Julio Fernández Pradier
# See LICENSE.txt for additional licensing information.
#--
@@ -68,10 +67,6 @@ class Gem::Package::TarReader::Entry
else
@header.name
end
- rescue ArgumentError => e
- raise unless e.message == 'string contains null byte'
- raise Gem::Package::TarInvalidError,
- 'tar is corrupt, name contains null byte'
end
##
diff --git a/lib/rubygems/package/tar_test_case.rb b/lib/rubygems/package/tar_test_case.rb
deleted file mode 100644
index 4601f1328f..0000000000
--- a/lib/rubygems/package/tar_test_case.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require 'rubygems/test_case'
-require 'rubygems/package'
-
-##
-# A test case for Gem::Package::Tar* classes
-
-class Gem::Package::TarTestCase < Gem::TestCase
-
- def ASCIIZ(str, length)
- str + "\0" * (length - str.length)
- end
-
- def SP(s)
- s + " "
- end
-
- def SP_Z(s)
- s + " \0"
- end
-
- def Z(s)
- s + "\0"
- end
-
- def assert_headers_equal(expected, actual)
- expected = expected.to_s unless String === expected
- actual = actual.to_s unless String === actual
-
- fields = %w[
- name 100
- mode 8
- uid 8
- gid 8
- size 12
- mtime 12
- checksum 8
- typeflag 1
- linkname 100
- magic 6
- version 2
- uname 32
- gname 32
- devmajor 8
- devminor 8
- prefix 155
- ]
-
- offset = 0
-
- until fields.empty? do
- name = fields.shift
- length = fields.shift.to_i
-
- if name == "checksum" then
- chksum_off = offset
- offset += length
- next
- end
-
- assert_equal expected[offset, length], actual[offset, length],
- "Field #{name} of the tar header differs."
-
- offset += length
- end
-
- assert_equal expected[chksum_off, 8], actual[chksum_off, 8]
- end
-
- def calc_checksum(header)
- sum = header.unpack("C*").inject{|s,a| s + a}
- SP(Z(to_oct(sum, 6)))
- end
-
- def header(type, fname, dname, length, mode, checksum = nil)
- checksum ||= " " * 8
-
- arr = [ # struct tarfile_entry_posix
- ASCIIZ(fname, 100), # char name[100]; ASCII + (Z unless filled)
- Z(to_oct(mode, 7)), # char mode[8]; 0 padded, octal null
- Z(to_oct(0, 7)), # char uid[8]; ditto
- Z(to_oct(0, 7)), # char gid[8]; ditto
- Z(to_oct(length, 11)), # char size[12]; 0 padded, octal, null
- Z(to_oct(0, 11)), # char mtime[12]; 0 padded, octal, null
- checksum, # char checksum[8]; 0 padded, octal, null, space
- type, # char typeflag[1]; file: "0" dir: "5"
- "\0" * 100, # char linkname[100]; ASCII + (Z unless filled)
- "ustar\0", # char magic[6]; "ustar\0"
- "00", # char version[2]; "00"
- ASCIIZ("wheel", 32), # char uname[32]; ASCIIZ
- ASCIIZ("wheel", 32), # char gname[32]; ASCIIZ
- Z(to_oct(0, 7)), # char devmajor[8]; 0 padded, octal, null
- Z(to_oct(0, 7)), # char devminor[8]; 0 padded, octal, null
- ASCIIZ(dname, 155) # char prefix[155]; ASCII + (Z unless filled)
- ]
-
- format = "C100C8C8C8C12C12C8CC100C6C2C32C32C8C8C155"
- h = if RUBY_VERSION >= "1.9" then
- arr.join
- else
- arr = arr.join("").split(//).map{|x| x[0]}
- arr.pack format
- end
- ret = h + "\0" * (512 - h.size)
- assert_equal(512, ret.size)
- ret
- end
-
- def tar_dir_header(name, prefix, mode)
- h = header("5", name, prefix, 0, mode)
- checksum = calc_checksum(h)
- header("5", name, prefix, 0, mode, checksum)
- end
-
- def tar_file_header(fname, dname, mode, length)
- h = header("0", fname, dname, length, mode)
- checksum = calc_checksum(h)
- header("0", fname, dname, length, mode, checksum)
- end
-
- def to_oct(n, pad_size)
- "%0#{pad_size}o" % n
- end
-
- def util_entry(tar)
- io = TempIO.new tar
-
- header = Gem::Package::TarHeader.from io
-
- Gem::Package::TarReader::Entry.new header, io
- end
-
- def util_dir_entry
- util_entry tar_dir_header("foo", "bar", 0)
- end
-
-end
-
diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb
index f2c11e3544..d115162a76 100644
--- a/lib/rubygems/package/tar_writer.rb
+++ b/lib/rubygems/package/tar_writer.rb
@@ -40,12 +40,12 @@ class Gem::Package::TarWriter
# number of bytes will be more than #limit
def write(data)
- if data.bytesize + @written > @limit
+ if data.size + @written > @limit
raise FileOverflow, "You tried to feed more data than fits in the file."
end
@io.write data
- @written += data.bytesize
- data.bytesize
+ @written += data.size
+ data.size
end
end
@@ -130,62 +130,6 @@ class Gem::Package::TarWriter
end
##
- # Adds +name+ with permissions +mode+ to the tar, yielding +io+ for writing
- # the file. The +digest_algorithm+ is written to a read-only +name+.sum
- # file following the given file contents containing the digest name and
- # hexdigest separated by a tab.
- #
- # The created digest object is returned.
-
- def add_file_digest name, mode, digest_algorithms # :yields: io
- digests = digest_algorithms.map do |digest_algorithm|
- digest = digest_algorithm.new
- [digest.name, digest]
- end
-
- digests = Hash[*digests.flatten]
-
- add_file name, mode do |io|
- Gem::Package::DigestIO.wrap io, digests do |digest_io|
- yield digest_io
- end
- end
-
- digests
- end
-
- ##
- # Adds +name+ with permissions +mode+ to the tar, yielding +io+ for writing
- # the file. The +signer+ is used to add a digest file using its
- # digest_algorithm per add_file_digest and a cryptographic signature in
- # +name+.sig. If the signer has no key only the checksum file is added.
- #
- # Returns the digest.
-
- def add_file_signed name, mode, signer
- digest_algorithms = [
- signer.digest_algorithm,
- OpenSSL::Digest::SHA512,
- ].uniq
-
- digests = add_file_digest name, mode, digest_algorithms do |io|
- yield io
- end
-
- signature_digest = digests.values.find do |digest|
- digest.name == signer.digest_name
- end
-
- signature = signer.sign signature_digest.digest
-
- add_file_simple "#{name}.sig", 0444, signature.length do |io|
- io.write signature
- end if signature
-
- digests
- end
-
- ##
# Add file +name+ with permissions +mode+ +size+ bytes long. Yields an IO
# to write the file to.
@@ -267,9 +211,9 @@ class Gem::Package::TarWriter
# Splits +name+ into a name and prefix that can fit in the TarHeader
def split_name(name) # :nodoc:
- raise Gem::Package::TooLongFileName if name.bytesize > 256
+ raise Gem::Package::TooLongFileName if name.size > 256
- if name.bytesize <= 100 then
+ if name.size <= 100 then
prefix = ""
else
parts = name.split(/\//)
@@ -278,15 +222,15 @@ class Gem::Package::TarWriter
loop do
nxt = parts.pop
- break if newname.bytesize + 1 + nxt.bytesize > 100
+ break if newname.size + 1 + nxt.size > 100
newname = nxt + "/" + newname
end
prefix = (parts + [nxt]).join "/"
name = newname
- if name.bytesize > 100 or prefix.bytesize > 155 then
- raise Gem::Package::TooLongFileName
+ if name.size > 100 or prefix.size > 155 then
+ raise Gem::Package::TooLongFileName
end
end
diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb
index 09384cc0e7..d43dfc8323 100644
--- a/lib/rubygems/package_task.rb
+++ b/lib/rubygems/package_task.rb
@@ -20,7 +20,6 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
require 'rubygems'
-require 'rubygems/package'
begin
gem 'rake'
rescue Gem::LoadError
@@ -44,10 +43,13 @@ require 'rake/packagetask'
# 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
@@ -84,7 +86,7 @@ class Gem::PackageTask < Rake::PackageTask
# Initialization tasks without the "yield self" or define operations.
def init(gem)
- super gem.full_name, :noversion
+ super gem.name, gem.version
@gem_spec = gem
@package_files += gem_spec.files if gem_spec.files
end
@@ -96,14 +98,11 @@ class Gem::PackageTask < Rake::PackageTask
def define
super
- gem_file = File.basename gem_spec.cache_file
- gem_path = File.join package_dir, gem_file
- gem_dir = File.join package_dir, gem_spec.full_name
-
task :package => [:gem]
- directory package_dir
- directory gem_dir
+ gem_file = gem_spec.file_name
+ gem_path = File.join package_dir, gem_file
+ gem_dir = File.join package_dir, gem_spec.full_name
desc "Build the gem file #{gem_file}"
task :gem => [gem_path]
@@ -112,13 +111,10 @@ class Gem::PackageTask < Rake::PackageTask
Gem.configuration.verbose = trace
file gem_path => [package_dir, gem_dir] + @gem_spec.files do
- chdir(gem_dir) do
- when_writing "Creating #{gem_spec.file_name}" do
- Gem::Package.build gem_spec
-
- verbose trace do
- mv gem_file, '..'
- end
+ when_writing "Creating #{gem_spec.file_name}" do
+ Gem::Builder.new(gem_spec).build
+ verbose trace do
+ mv gem_file, gem_path
end
end
end
diff --git a/lib/rubygems/path_support.rb b/lib/rubygems/path_support.rb
deleted file mode 100644
index 7195b322ef..0000000000
--- a/lib/rubygems/path_support.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-##
-#
-# Gem::PathSupport facilitates the GEM_HOME and GEM_PATH environment settings
-# to the rest of RubyGems.
-#
-class Gem::PathSupport
- ##
- # The default system path for managing Gems.
- attr_reader :home
-
- ##
- # Array of paths to search for Gems.
- attr_reader :path
-
- ##
- #
- # Constructor. Takes a single argument which is to be treated like a
- # hashtable, or defaults to ENV, the system environment.
- #
- def initialize(env=ENV)
- @env = env
-
- # note 'env' vs 'ENV'...
- @home = env["GEM_HOME"] || ENV["GEM_HOME"] || Gem.default_dir
-
- if File::ALT_SEPARATOR then
- @home = @home.gsub(File::ALT_SEPARATOR, File::SEPARATOR)
- end
-
- self.path = env["GEM_PATH"] || ENV["GEM_PATH"]
- end
-
- private
-
- ##
- # Set the Gem home directory (as reported by Gem.dir).
-
- def home=(home)
- @home = home.to_s
- end
-
- ##
- # Set the Gem search path (as reported by Gem.path).
-
- def path=(gpaths)
- # FIX: it should be [home, *path], not [*path, home]
-
- gem_path = []
-
- # FIX: I can't tell wtf this is doing.
- gpaths ||= (ENV['GEM_PATH'] || "").empty? ? nil : ENV["GEM_PATH"]
-
- if gpaths
- if gpaths.kind_of?(Array)
- gem_path = gpaths.dup
- else
- gem_path = gpaths.split(Gem.path_separator)
- end
-
- if File::ALT_SEPARATOR then
- gem_path.map! do |this_path|
- this_path.gsub File::ALT_SEPARATOR, File::SEPARATOR
- end
- end
-
- gem_path << @home
- else
- gem_path = Gem.default_path + [@home]
-
- if defined?(APPLE_GEM_HOME)
- gem_path << APPLE_GEM_HOME
- end
- end
-
- @path = gem_path.uniq
- end
-end
diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb
index 4a4674b72f..c9a084707a 100644
--- a/lib/rubygems/platform.rb
+++ b/lib/rubygems/platform.rb
@@ -1,5 +1,3 @@
-require "rubygems/deprecate"
-
##
# Available list of platforms for targeting Gem installations.
@@ -21,8 +19,7 @@ class Gem::Platform
def self.match(platform)
Gem.platforms.any? do |local_platform|
- platform.nil? or
- local_platform == platform or
+ platform.nil? or local_platform == platform or
(local_platform != Gem::Platform::RUBY and local_platform =~ platform)
end
end
@@ -66,29 +63,27 @@ class Gem::Platform
@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 /^macruby$/ then [ 'macruby', nil ]
- 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 /^dalvik(\d+)?$/ then [ 'dalvik', $1 ]
- when /^dotnet$/ then [ 'dotnet', nil ]
- when /^dotnet([\d.]*)/ then [ 'dotnet', $1 ]
- when /linux/ then [ 'linux', $1 ]
- when /mingw32/ then [ 'mingw32', nil ]
+ 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 /^dotnet$/ then [ 'dotnet', nil ]
+ when /^dotnet([\d.]*)/ then [ 'dotnet', $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 ]
+ 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 ]
+ when /^(\w+_platform)(\d+)/ then [ $1, $2 ]
+ else [ 'unknown', nil ]
end
when Gem::Platform then
@cpu = arch.cpu
@@ -111,18 +106,17 @@ class Gem::Platform
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 to_a == other.to_a
- end
-
- alias :eql? :==
-
- def hash # :nodoc:
- to_a.hash
+ self.class === other and
+ @cpu == other.cpu and @os == other.os and @version == other.version
end
##
@@ -156,7 +150,6 @@ class Gem::Platform
when /^i686-darwin(\d)/ then ['x86', 'darwin', $1 ]
when /^i\d86-linux/ then ['x86', 'linux', nil ]
when 'java', 'jruby' then [nil, 'java', nil ]
- when /^dalvik(\d+)?$/ then [nil, 'dalvik', $1 ]
when /dotnet(\-(\d+\.\d+))?/ then ['universal','dotnet', $2 ]
when /mswin32(\_(\d+))?/ then ['x86', 'mswin32', $2 ]
when 'powerpc-darwin' then ['powerpc', 'darwin', nil ]
@@ -185,5 +178,6 @@ class Gem::Platform
# This will be replaced with Gem::Platform::local.
CURRENT = 'current'
+
end
diff --git a/lib/rubygems/psych_additions.rb b/lib/rubygems/psych_additions.rb
deleted file mode 100644
index 08a5cb37ea..0000000000
--- a/lib/rubygems/psych_additions.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# This exists just to satify bugs in marshal'd gemspecs that
-# contain a reference to YAML::PrivateType. We prune these out
-# in Specification._load, but if we don't have the constant, Marshal
-# blows up.
-
-module Psych
- class PrivateType
- end
-end
diff --git a/lib/rubygems/psych_tree.rb b/lib/rubygems/psych_tree.rb
deleted file mode 100644
index e3f1d1a08a..0000000000
--- a/lib/rubygems/psych_tree.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Gem
- if defined? ::Psych::Visitors
- class NoAliasYAMLTree < Psych::Visitors::YAMLTree
- def self.create
- new({})
- end unless respond_to? :create
-
- def visit_String(str)
- return super unless str == '=' # or whatever you want
-
- quote = Psych::Nodes::Scalar::SINGLE_QUOTED
- @emitter.scalar str, nil, nil, false, true, quote
- end
-
- # Noop this out so there are no anchors
- def register(target, obj)
- end
-
- # This is ported over from the yaml_tree in 1.9.3
- def format_time time
- if time.utc?
- time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
- else
- time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
- end
- end
-
- private :format_time
- end
- end
-end
diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
deleted file mode 100644
index f16c8696f0..0000000000
--- a/lib/rubygems/rdoc.rb
+++ /dev/null
@@ -1,336 +0,0 @@
-require 'rubygems'
-require 'rubygems/user_interaction'
-require 'fileutils'
-
-begin
- gem 'rdoc'
-rescue Gem::LoadError
- # swallow
-else
- # This will force any deps that 'rdoc' might have
- # (such as json) that are ambigious to be activated, which
- # is important because we end up using Specification.reset
- # and we don't want the warning it pops out.
- Gem.finish_resolve
-end
-
-loaded_hook = false
-
-begin
- require 'rdoc/rubygems_hook'
- loaded_hook = true
- module Gem
- RDoc = RDoc::RubygemsHook
- end
-rescue LoadError
-end
-
-##
-# Gem::RDoc provides methods to generate RDoc and ri data for installed gems.
-# It works for RDoc 1.0.1 (in Ruby 1.8) up to RDoc 3.6.
-#
-# This implementation is considered obsolete. The RDoc project is the
-# appropriate location to find this functionality. This file provides the
-# hooks to load RDoc generation code from the "rdoc" gem and a fallback in
-# case the installed version of RDoc does not have them.
-
-class Gem::RDoc # :nodoc: all
-
- include Gem::UserInteraction
- extend Gem::UserInteraction
-
- @rdoc_version = nil
- @specs = []
-
- ##
- # Force installation of documentation?
-
- attr_accessor :force
-
- ##
- # Generate rdoc?
-
- attr_accessor :generate_rdoc
-
- ##
- # Generate ri data?
-
- attr_accessor :generate_ri
-
- class << self
-
- ##
- # Loaded version of RDoc. Set by ::load_rdoc
-
- attr_reader :rdoc_version
-
- end
-
- ##
- # Post installs hook that generates documentation for each specification in
- # +specs+
-
- def self.generation_hook installer, specs
- start = Time.now
- types = installer.document
-
- generate_rdoc = types.include? 'rdoc'
- generate_ri = types.include? 'ri'
-
- specs.each do |spec|
- new(spec, generate_rdoc, generate_ri).generate
- end
-
- return unless generate_rdoc or generate_ri
-
- duration = (Time.now - start).to_i
- names = specs.map(&:name).join ', '
-
- say "Done installing documentation for #{names} after #{duration} seconds"
- end
-
- ##
- # Loads the RDoc generator
-
- def self.load_rdoc
- return if @rdoc_version
-
- require 'rdoc/rdoc'
-
- @rdoc_version = if ::RDoc.const_defined? :VERSION then
- Gem::Version.new ::RDoc::VERSION
- else
- Gem::Version.new '1.0.1'
- end
-
- rescue LoadError => e
- raise Gem::DocumentError, "RDoc is not installed: #{e}"
- end
-
- ##
- # Creates a new documentation generator for +spec+. RDoc and ri data
- # generation can be enabled or disabled through +generate_rdoc+ and
- # +generate_ri+ respectively.
- #
- # Only +generate_ri+ is enabled by default.
-
- def initialize spec, generate_rdoc = true, generate_ri = true
- @doc_dir = spec.doc_dir
- @file_info = nil
- @force = false
- @rdoc = nil
- @spec = spec
-
- @generate_rdoc = generate_rdoc
- @generate_ri = generate_ri
-
- @rdoc_dir = spec.doc_dir 'rdoc'
- @ri_dir = spec.doc_dir 'ri'
- end
-
- ##
- # Removes legacy rdoc arguments from +args+
- #--
- # TODO move to RDoc::Options
-
- def delete_legacy_args args
- args.delete '--inline-source'
- args.delete '--promiscuous'
- args.delete '-p'
- args.delete '--one-file'
- end
-
- ##
- # Generates documentation using the named +generator+ ("darkfish" or "ri")
- # and following the given +options+.
- #
- # Documentation will be generated into +destination+
-
- def document generator, options, destination
- generator_name = generator
-
- options = options.dup
- options.exclude ||= [] # TODO maybe move to RDoc::Options#finish
- options.setup_generator generator
- options.op_dir = destination
- options.finish
-
- generator = options.generator.new @rdoc.store, options
-
- @rdoc.options = options
- @rdoc.generator = generator
-
- say "Installing #{generator_name} documentation for #{@spec.full_name}"
-
- FileUtils.mkdir_p options.op_dir
-
- Dir.chdir options.op_dir do
- begin
- @rdoc.class.current = @rdoc
- @rdoc.generator.generate @file_info
- ensure
- @rdoc.class.current = nil
- end
- end
- end
-
- ##
- # Generates RDoc and ri data
-
- def generate
- return unless @generate_ri or @generate_rdoc
-
- setup
-
- options = nil
-
- if Gem::Requirement.new('< 3').satisfied_by? self.class.rdoc_version then
- generate_legacy
- return
- end
-
- ::RDoc::TopLevel.reset # TODO ::RDoc::RDoc.reset
- ::RDoc::Parser::C.reset
-
- args = @spec.rdoc_options
- args.concat @spec.require_paths
- args.concat @spec.extra_rdoc_files
-
- case config_args = Gem.configuration[:rdoc]
- when String then
- args = args.concat config_args.split
- when Array then
- args = args.concat config_args
- end
-
- delete_legacy_args args
-
- Dir.chdir @spec.full_gem_path do
- options = ::RDoc::Options.new
- options.default_title = "#{@spec.full_name} Documentation"
- options.parse args
- end
-
- options.quiet = !Gem.configuration.really_verbose
-
- @rdoc = new_rdoc
- @rdoc.options = options
-
- say "Parsing documentation for #{@spec.full_name}"
-
- Dir.chdir @spec.full_gem_path do
- @file_info = @rdoc.parse_files options.files
- end
-
- document 'ri', options, @ri_dir if
- @generate_ri and (@force or not File.exist? @ri_dir)
-
- document 'darkfish', options, @rdoc_dir if
- @generate_rdoc and (@force or not File.exist? @rdoc_dir)
- end
-
- ##
- # Generates RDoc and ri data for legacy RDoc versions. This method will not
- # exist in future versions.
-
- def generate_legacy
- if @generate_rdoc then
- FileUtils.rm_rf @rdoc_dir
- say "Installing RDoc documentation for #{@spec.full_name}"
- legacy_rdoc '--op', @rdoc_dir
- end
-
- if @generate_ri then
- FileUtils.rm_rf @ri_dir
- say "Installing ri documentation for #{@spec.full_name}"
- legacy_rdoc '--ri', '--op', @ri_dir
- end
- end
-
- ##
- # Generates RDoc using a legacy version of RDoc from the ARGV-like +args+.
- # This method will not exist in future versions.
-
- def legacy_rdoc *args
- args << @spec.rdoc_options
- 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
-
- delete_legacy_args args if
- Gem::Requirement.new('>= 2.4.0') =~ self.class.rdoc_version
-
- r = new_rdoc
- say "rdoc #{args.join ' '}" if Gem.configuration.really_verbose
-
- Dir.chdir @spec.full_gem_path do
- begin
- r.document args
- rescue Errno::EACCES => e
- dirname = File.dirname e.message.split("-")[1].strip
- raise Gem::FilePermissionError, dirname
- rescue Interrupt => e
- raise e
- rescue Exception => ex
- alert_error "While generating documentation for #{@spec.full_name}"
- ui.errs.puts "... MESSAGE: #{ex}"
- ui.errs.puts "... RDOC args: #{args.join(' ')}"
- ui.backtrace ex
- ui.errs.puts "(continuing with the rest of the installation)"
- ensure
- end
- end
- end
-
- ##
- # #new_rdoc creates a new RDoc instance. This method is provided only to
- # make testing easier.
-
- def new_rdoc # :nodoc:
- ::RDoc::RDoc.new
- end
-
- ##
- # Is rdoc documentation installed?
-
- def rdoc_installed?
- File.exist? @rdoc_dir
- end
-
- ##
- # Removes generated RDoc and ri data
-
- def remove
- base_dir = @spec.base_dir
-
- raise Gem::FilePermissionError, base_dir unless File.writable? base_dir
-
- FileUtils.rm_rf @rdoc_dir
- FileUtils.rm_rf @ri_dir
- end
-
- ##
- # Is ri data installed?
-
- def ri_installed?
- File.exist? @ri_dir
- end
-
- ##
- # Prepares the spec for documentation generation
-
- def setup
- self.class.load_rdoc
-
- raise Gem::FilePermissionError, @doc_dir if
- File.exist?(@doc_dir) and not File.writable?(@doc_dir)
-
- FileUtils.mkdir_p @doc_dir unless File.exist? @doc_dir
- end
-
-end unless loaded_hook
-
-Gem.done_installing(&Gem::RDoc.method(:generation_hook))
-
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
index facbc7a9a6..8cd1f968e6 100644
--- a/lib/rubygems/remote_fetcher.rb
+++ b/lib/rubygems/remote_fetcher.rb
@@ -1,9 +1,9 @@
-require 'rubygems'
-require 'rubygems/user_interaction'
-require 'cgi'
-require 'thread'
+require 'net/http'
+require 'stringio'
+require 'time'
require 'uri'
-require 'resolv'
+
+require 'rubygems'
##
# RemoteFetcher handles the details of fetching gems and gem information from
@@ -35,13 +35,6 @@ class Gem::RemoteFetcher
end
- ##
- # A FetchError that indicates that the reason for not being
- # able to fetch data was that the host could not be contacted
-
- class UnknownHostError < FetchError
- end
-
@fetcher = nil
##
@@ -61,20 +54,11 @@ class Gem::RemoteFetcher
# * 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
- #
- # +dns+: An object to use for DNS resolution of the API endpoint.
- # By default, use Resolv::DNS.
-
- def initialize(proxy=nil, dns=Resolv::DNS.new)
- require 'net/http'
- require 'stringio'
- require 'time'
- require 'uri'
+ def initialize(proxy = nil)
Socket.do_not_reverse_lookup = true
@connections = {}
- @connections_mutex = Mutex.new
@requests = Hash.new 0
@proxy_uri =
case proxy
@@ -83,51 +67,6 @@ class Gem::RemoteFetcher
when URI::HTTP then proxy
else URI.parse(proxy)
end
- @user_agent = user_agent
- @env_no_proxy = get_no_proxy_from_env
-
- @dns = dns
- end
-
- ##
- #
- # Given a source at +uri+, calculate what hostname to actually
- # connect to query the data for it.
-
- def api_endpoint(uri)
- host = uri.host
-
- begin
- res = @dns.getresource "_rubygems._tcp.#{host}",
- Resolv::DNS::Resource::IN::SRV
- rescue Resolv::ResolvError
- uri
- else
- target = res.target.to_s.strip
-
- if /\.#{Regexp.quote(host)}\z/ =~ target
- return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
- end
-
- uri
- end
- end
-
- ##
- # Given a name and requirement, downloads this gem into cache and returns the
- # filename. Returns nil if the gem cannot be located.
- #--
- # Should probably be integrated with #download below, but that will be a
- # larger, more emcompassing effort. -erikh
-
- def download_to_cache dependency
- found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency
-
- return if found.empty?
-
- spec, source = found.sort_by { |(s,_)| s.version }.last
-
- download spec, source.uri.to_s
end
##
@@ -136,16 +75,13 @@ class Gem::RemoteFetcher
# always replaced.
def download(spec, source_uri, install_dir = Gem.dir)
- cache_dir =
- if Dir.pwd == install_dir then # see fetch_command
- install_dir
- elsif File.writable? install_dir then
- File.join install_dir, "cache"
- else
- File.join Gem.user_dir, "cache"
- end
+ 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 = File.basename spec.cache_file
+ gem_file_name = spec.file_name
local_gem_path = File.join cache_dir, gem_file_name
FileUtils.mkdir_p cache_dir rescue nil unless File.exist? cache_dir
@@ -153,8 +89,8 @@ class Gem::RemoteFetcher
# Always escape URI's to deal with potential spaces and such
unless URI::Generic === source_uri
source_uri = URI.parse(URI.const_defined?(:DEFAULT_PARSER) ?
- URI::DEFAULT_PARSER.escape(source_uri.to_s) :
- URI.escape(source_uri.to_s))
+ URI::DEFAULT_PARSER.escape(source_uri) :
+ URI.escape(source_uri))
end
scheme = source_uri.scheme
@@ -162,8 +98,6 @@ class Gem::RemoteFetcher
# URI.parse gets confused by MS Windows paths with forward slashes.
scheme = nil if scheme =~ /^[a-z]$/i
- # REFACTOR: split this up and dispatch on scheme (eg download_http)
- # REFACTOR: be sure to clean up fake fetcher when you do this... cleaner
case scheme
when 'http', 'https' then
unless File.exist? local_gem_path then
@@ -173,7 +107,7 @@ class Gem::RemoteFetcher
remote_gem_path = source_uri + "gems/#{gem_file_name}"
- self.cache_update_path remote_gem_path, local_gem_path
+ gem = self.fetch_path remote_gem_path
rescue Gem::RemoteFetcher::FetchError
raise if spec.original_platform == spec.platform
@@ -184,7 +118,11 @@ class Gem::RemoteFetcher
remote_gem_path = source_uri + "gems/#{alternate_name}"
- self.cache_update_path remote_gem_path, local_gem_path
+ gem = self.fetch_path remote_gem_path
+ end
+
+ File.open local_gem_path, 'wb' do |fp|
+ fp.write gem
end
end
when 'file' then
@@ -192,7 +130,7 @@ class Gem::RemoteFetcher
path = source_uri.path
path = File.dirname(path) if File.extname(path) == '.gem'
- remote_gem_path = correct_for_windows_path(File.join(path, 'gems', gem_file_name))
+ remote_gem_path = File.join(path, 'gems', gem_file_name)
FileUtils.cp(remote_gem_path, local_gem_path)
rescue Errno::EACCES
@@ -209,11 +147,11 @@ class Gem::RemoteFetcher
source_uri.path
end
- source_path = unescape source_path
+ source_path = URI.unescape source_path
begin
FileUtils.cp source_path, local_gem_path unless
- File.identical?(source_path, local_gem_path)
+ File.expand_path(source_path) == File.expand_path(local_gem_path)
rescue Errno::EACCES
local_gem_path = source_uri.to_s
end
@@ -221,102 +159,25 @@ class Gem::RemoteFetcher
say "Using local gem #{local_gem_path}" if
Gem.configuration.really_verbose
else
- raise ArgumentError, "unsupported URI scheme #{source_uri.scheme}"
+ raise Gem::InstallError, "unsupported URI scheme #{source_uri.scheme}"
end
local_gem_path
end
##
- # File Fetcher. Dispatched by +fetch_path+. Use it instead.
-
- def fetch_file uri, *_
- Gem.read_binary correct_for_windows_path uri.path
- end
-
- ##
- # HTTP Fetcher. Dispatched by +fetch_path+. Use it instead.
-
- def fetch_http uri, last_modified = nil, head = false, depth = 0
- 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
-
- location = URI.parse response['Location']
-
- if https?(uri) && !https?(location)
- raise FetchError.new("redirecting to non-https resource: #{location}", uri)
- end
-
- fetch_http(location, last_modified, head, depth + 1)
- else
- raise FetchError.new("bad response #{response.message} #{response.code}", uri)
- end
- end
-
- alias :fetch_https :fetch_http
-
- ##
# Downloads +uri+ and returns it as a String.
def fetch_path(uri, mtime = nil, head = false)
- uri = URI.parse uri unless URI::Generic === uri
-
- raise ArgumentError, "bad uri: #{uri}" unless uri
-
- unless uri.scheme
- raise ArgumentError, "uri scheme is invalid: #{uri.scheme.inspect}"
- end
-
- data = send "fetch_#{uri.scheme}", uri, mtime, head
-
- if data and !head and uri.to_s =~ /gz$/
- begin
- data = Gem.gunzip data
- rescue Zlib::GzipFile::Error
- raise FetchError.new("server did not return a valid file", uri.to_s)
- end
- end
-
+ 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 UnknownHostError.new('timed out', uri.to_s)
+ raise FetchError.new('timed out', uri)
rescue IOError, SocketError, SystemCallError => e
- if e.message =~ /getaddrinfo/
- raise UnknownHostError.new('no such name', uri.to_s)
- else
- raise FetchError.new("#{e.class}: #{e}", uri.to_s)
- end
- end
-
- ##
- # Downloads +uri+ to +path+ if necessary. If no path is given, it just
- # passes the data.
-
- def cache_update_path uri, path = nil, update = true
- mtime = path && File.stat(path).mtime rescue nil
-
- if mtime && Net::HTTPNotModified === fetch_path(uri, mtime, true)
- Gem.read_binary(path)
- else
- data = fetch_path(uri)
-
- if update and path then
- open(path, 'wb') do |io|
- io.write data
- end
- end
-
- data
- end
+ raise FetchError.new("#{e.class}: #{e}", uri)
end
##
@@ -328,41 +189,14 @@ class Gem::RemoteFetcher
response['content-length'].to_i
end
- def escape_auth_info(str)
- str && CGI.escape(str)
- end
-
- def unescape_auth_info(str)
- str && CGI.unescape(str)
- end
-
def escape(str)
return unless str
- @uri_parser ||= uri_escaper
- @uri_parser.escape str
+ URI.escape(str)
end
def unescape(str)
return unless str
- @uri_parser ||= uri_escaper
- @uri_parser.unescape str
- end
-
- def uri_escaper
- URI::Parser.new
- rescue NameError
- URI
- end
-
- ##
- # Returns list of no_proxy entries (if any) from the environment
-
- def get_no_proxy_from_env
- env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
-
- return [] if env_no_proxy.nil? or env_no_proxy.empty?
-
- env_no_proxy.split(/\s*,\s*/)
+ URI.unescape(str)
end
##
@@ -377,8 +211,8 @@ class Gem::RemoteFetcher
if uri and uri.user.nil? and uri.password.nil? then
# Probably we have http_proxy_* variables?
- uri.user = escape_auth_info(ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER'])
- uri.password = escape_auth_info(ENV['http_proxy_pass'] || ENV['HTTP_PROXY_PASS'])
+ uri.user = escape(ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER'])
+ uri.password = escape(ENV['http_proxy_pass'] || ENV['HTTP_PROXY_PASS'])
end
uri
@@ -388,7 +222,7 @@ class Gem::RemoteFetcher
# Normalize the URI by adding "http://" if it is missing.
def normalize_uri(uri)
- (uri =~ /^(https?|ftp|file):/i) ? uri : "http://#{uri}"
+ (uri =~ /^(https?|ftp|file):/) ? uri : "http://#{uri}"
end
##
@@ -398,31 +232,27 @@ class Gem::RemoteFetcher
def connection_for(uri)
net_http_args = [uri.host, uri.port]
- if @proxy_uri and not no_proxy?(uri.host) then
+ if @proxy_uri then
net_http_args += [
@proxy_uri.host,
@proxy_uri.port,
- unescape_auth_info(@proxy_uri.user),
- unescape_auth_info(@proxy_uri.password)
+ @proxy_uri.user,
+ @proxy_uri.password
]
end
- connection_id = [Thread.current.object_id, *net_http_args].join ':'
+ connection_id = net_http_args.join ':'
+ @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
+ connection = @connections[connection_id]
- connection = @connections_mutex.synchronize do
- @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
- @connections[connection_id]
- end
-
- if https?(uri) and not connection.started? then
+ if uri.scheme == 'https' and not connection.started? then
configure_connection_for_https(connection)
end
connection.start unless connection.started?
connection
- rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
- Errno::EHOSTDOWN => e
+ rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
raise FetchError.new(e.message, uri)
end
@@ -443,12 +273,6 @@ class Gem::RemoteFetcher
add_rubygems_trusted_certs(store)
end
connection.cert_store = store
- rescue LoadError => e
- raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
- e.message =~ / -- openssl$/
-
- raise Gem::Exception.new(
- 'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
end
def add_rubygems_trusted_certs(store)
@@ -458,21 +282,53 @@ class Gem::RemoteFetcher
end
end
- def correct_for_windows_path(path)
- if path[0].chr == '/' && path[1].chr =~ /[a-z]/i && path[2].chr == ':'
- path = path[1..-1]
- else
- path
+ ##
+ # 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
- end
- def no_proxy? host
- host = host.downcase
- @env_no_proxy.each do |pattern|
- pattern = pattern.downcase
- return true if host[-pattern.length, pattern.length ] == pattern
+ 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
+
+ location = URI.parse response['Location']
+
+ if https?(uri) && !https?(location)
+ raise FetchError.new("redirecting to non-https resource: #{location}", uri)
+ end
+
+ open_uri_or_path(response['Location'], last_modified, head, depth + 1)
+ else
+ raise FetchError.new("bad response #{response.message} #{response.code}", uri)
end
- return false
end
##
@@ -487,7 +343,12 @@ class Gem::RemoteFetcher
request.basic_auth uri.user, uri.password
end
- request.add_field 'User-Agent', @user_agent
+ ua = "RubyGems/#{Gem::VERSION} #{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'
@@ -508,34 +369,7 @@ class Gem::RemoteFetcher
say "#{request.method} #{uri}" if
Gem.configuration.really_verbose
-
- file_name = File.basename(uri.path)
- # perform download progress reporter only for gems
- if request.response_body_permitted? && file_name =~ /\.gem$/
- reporter = ui.download_reporter
- response = connection.request(request) do |incomplete_response|
- if Net::HTTPOK === incomplete_response
- reporter.fetch(file_name, incomplete_response.content_length)
- downloaded = 0
- data = ''
-
- incomplete_response.read_body do |segment|
- data << segment
- downloaded += segment.length
- reporter.update(downloaded)
- end
- reporter.done
- if incomplete_response.respond_to? :body=
- incomplete_response.body = data
- else
- incomplete_response.instance_variable_set(:@body, data)
- end
- end
- end
- else
- response = connection.request request
- end
-
+ response = connection.request request
say "#{response.code} #{response.message}" if
Gem.configuration.really_verbose
@@ -579,28 +413,8 @@ class Gem::RemoteFetcher
connection.start
end
- def user_agent
- ua = "RubyGems/#{Gem::VERSION} #{Gem::Platform.local}"
-
- ruby_version = RUBY_VERSION
- ruby_version += 'dev' if RUBY_PATCHLEVEL == -1
-
- ua << " Ruby/#{ruby_version} (#{RUBY_RELEASE_DATE}"
- if RUBY_PATCHLEVEL >= 0 then
- ua << " patchlevel #{RUBY_PATCHLEVEL}"
- elsif defined?(RUBY_REVISION) then
- ua << " revision #{RUBY_REVISION}"
- end
- ua << ")"
-
- ua << " #{RUBY_ENGINE}" if defined?(RUBY_ENGINE) and RUBY_ENGINE != 'ruby'
-
- ua
- end
-
def https?(uri)
uri.scheme.downcase == 'https'
end
-
end
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
deleted file mode 100644
index 6c52b90c40..0000000000
--- a/lib/rubygems/request_set.rb
+++ /dev/null
@@ -1,182 +0,0 @@
-require 'rubygems'
-require 'rubygems/dependency'
-require 'rubygems/dependency_resolver'
-require 'rubygems/dependency_list'
-require 'rubygems/installer'
-require 'tsort'
-
-module Gem
- class RequestSet
-
- include TSort
-
- def initialize(*deps)
- @dependencies = deps
-
- yield self if block_given?
- end
-
- attr_reader :dependencies
-
- # Declare that a gem of name +name+ with +reqs+ requirements
- # is needed.
- #
- def gem(name, *reqs)
- @dependencies << Gem::Dependency.new(name, reqs)
- end
-
- # Add +deps+ Gem::Depedency objects to the set.
- #
- def import(deps)
- @dependencies += deps
- end
-
- # Resolve the requested dependencies and return an Array of
- # Specification objects to be activated.
- #
- def resolve(set=nil)
- r = Gem::DependencyResolver.new(@dependencies, set)
- @requests = r.resolve
- end
-
- # Resolve the requested dependencies against the gems
- # available via Gem.path and return an Array of Specification
- # objects to be activated.
- #
- def resolve_current
- resolve DependencyResolver::CurrentSet.new
- end
-
- # Load a dependency management file.
- #
- def load_gemdeps(path)
- gf = GemDepedencyAPI.new(self, path)
- gf.load
- end
-
- def specs
- @specs ||= @requests.map { |r| r.full_spec }
- end
-
- def tsort_each_node(&block)
- @requests.each(&block)
- end
-
- def tsort_each_child(node)
- node.spec.dependencies.each do |dep|
- next if dep.type == :development
-
- match = @requests.find { |r| dep.match? r.spec.name, r.spec.version }
- if match
- begin
- yield match
- rescue TSort::Cyclic
- end
- else
- raise Gem::DependencyError, "Unresolved depedency found during sorting - #{dep}"
- end
- end
- end
-
- def sorted_requests
- @sorted ||= strongly_connected_components.flatten
- end
-
- def specs_in(dir)
- Dir["#{dir}/specifications/*.gemspec"].map do |g|
- Gem::Specification.load g
- end
- end
-
- def install_into(dir, force=true, &b)
- existing = force ? [] : specs_in(dir)
-
- dir = File.expand_path dir
-
- installed = []
-
- sorted_requests.each do |req|
- if existing.find { |s| s.full_name == req.spec.full_name }
- b.call req, nil if b
- next
- end
-
- path = req.download(dir)
-
- inst = Gem::Installer.new path, :install_dir => dir,
- :only_install_dir => true
-
- b.call req, inst if b
-
- inst.install
-
- installed << req
- end
-
- installed
- end
-
- def install(options, &b)
- if dir = options[:install_dir]
- return install_into(dir, false, &b)
- end
-
- cache_dir = options[:cache_dir] || Gem.dir
-
- specs = []
-
- sorted_requests.each do |req|
- if req.installed?
- b.call req, nil if b
- next
- end
-
- path = req.download cache_dir
-
- inst = Gem::Installer.new path, options
-
- b.call req, inst if b
-
- specs << inst.install
- end
-
- specs
- end
-
- # A semi-compatible DSL for Bundler's Gemfile format
- #
- class GemDepedencyAPI
- def initialize(set, path)
- @set = set
- @path = path
- end
-
- def load
- instance_eval File.read(@path).untaint, @path, 1
- end
-
- # DSL
-
- def source(url)
- end
-
- def gem(name, *reqs)
- # Ignore the opts for now.
- reqs.pop if reqs.last.kind_of?(Hash)
-
- @set.gem name, *reqs
- end
-
- def platform(what)
- if what == :ruby
- yield
- end
- end
-
- alias_method :platforms, :platform
-
- def group(*what)
- end
- end
- end
-end
diff --git a/lib/rubygems/require_paths_builder.rb b/lib/rubygems/require_paths_builder.rb
new file mode 100644
index 0000000000..5cf41b9da8
--- /dev/null
+++ b/lib/rubygems/require_paths_builder.rb
@@ -0,0 +1,13 @@
+require 'rubygems'
+
+module Gem::RequirePathsBuilder
+ def write_require_paths_file_if_needed(spec = @spec, gem_home = @gem_home)
+ require_paths = spec.require_paths
+ return if require_paths.size == 1 and require_paths.first == "lib"
+ file_name = "#{gem_home}/gems/#{@spec.full_name}/.require_paths".untaint
+ File.open(file_name, "wb") do |file|
+ file.puts require_paths
+ end
+ end
+end
+
diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
index ed768924a8..d51bf8ffa3 100644
--- a/lib/rubygems/requirement.rb
+++ b/lib/rubygems/requirement.rb
@@ -1,38 +1,24 @@
+require "rubygems/version"
+
##
# A Requirement is a set of one or more version restrictions. It supports a
# few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
-# REFACTOR: The fact that a requirement is singular or plural is kind of
-# awkward. Is Requirement the right name for this? Or should it be one
-# [op, number] pair, and we call the list of requirements something else?
-# Since a Requirement is held by a Dependency, maybe this should be made
-# singular and the list aspect should be pulled up into Dependency?
-
-require "rubygems/version"
-require "rubygems/deprecate"
-
-# If we're being loaded after yaml was already required, then
-# load our yaml + workarounds now.
-Gem.load_yaml if defined? ::YAML
-
class Gem::Requirement
+ include Comparable
+
OPS = { #:nodoc:
"=" => 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 >= r },
"<=" => lambda { |v, r| v <= r },
- "~>" => lambda { |v, r| v >= r && v.release < r.bump }
+ "~>" => lambda { |v, r| v = v.release; v >= r && v < r.bump }
}
quoted = OPS.keys.map { |k| Regexp.quote k }.join "|"
- PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*"
- PATTERN = /\A#{PATTERN_RAW}\z/
-
- DefaultRequirement = [">=", Gem::Version.new(0)]
-
- class BadRequirementError < ArgumentError; end
+ PATTERN = /\A\s*(#{quoted})?\s*(#{Gem::Version::VERSION_PATTERN})\s*\z/
##
# Factory method to create a Gem::Requirement object. Input may be
@@ -41,9 +27,6 @@ class Gem::Requirement
# If the input is "weird", the default version requirement is
# returned.
- # REFACTOR: There's no reason that this can't be unified with .new.
- # .new is the standard Ruby factory method.
-
def self.create input
case input
when Gem::Requirement then
@@ -61,6 +44,10 @@ class Gem::Requirement
##
# 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
new '>= 0'
@@ -78,23 +65,14 @@ class Gem::Requirement
# parse("1.0") # => ["=", "1.0"]
# parse(Gem::Version.new("1.0")) # => ["=, "1.0"]
- # REFACTOR: Little two element arrays like this have no real semantic
- # value. I'd love to see something like this:
- # Constraint = Struct.new(:operator, :version); (or similar)
- # and have a Requirement be a list of Constraints.
-
def self.parse obj
return ["=", obj] if Gem::Version === obj
unless PATTERN =~ obj.to_s
- raise BadRequirementError, "Illformed requirement [#{obj.inspect}]"
+ raise ArgumentError, "Illformed requirement [#{obj.inspect}]"
end
- if $1 == ">=" && $2 == "0"
- DefaultRequirement
- else
- [$1 || "=", Gem::Version.new($2)]
- end
+ [$1 || "=", Gem::Version.new($2)]
end
##
@@ -114,27 +92,17 @@ class Gem::Requirement
requirements.compact!
requirements.uniq!
- if requirements.empty?
- @requirements = [DefaultRequirement]
- else
- @requirements = requirements.map! { |r| self.class.parse r }
- end
+ requirements << ">= 0" if requirements.empty?
+ @none = (requirements == ">= 0")
+ @requirements = requirements.map! { |r| self.class.parse r }
end
- ##
- # true if this gem has no requirements.
-
- # FIX: maybe this should be using #default ?
def none?
- if @requirements.size == 1
- @requirements[0] == DefaultRequirement
- else
- false
- end
+ @none ||= (to_s == ">= 0")
end
def as_list # :nodoc:
- requirements.map { |op, version| "#{op} #{version}" }.sort
+ requirements.map { |op, version| "#{op} #{version}" }
end
def hash # :nodoc:
@@ -142,42 +110,13 @@ class Gem::Requirement
end
def marshal_dump # :nodoc:
- fix_syck_default_key_in_requirements
-
[@requirements]
end
def marshal_load array # :nodoc:
@requirements = array[0]
-
- fix_syck_default_key_in_requirements
- end
-
- def yaml_initialize(tag, vals) # :nodoc:
- vals.each do |ivar, val|
- instance_variable_set "@#{ivar}", val
- end
-
- Gem.load_yaml
- fix_syck_default_key_in_requirements
- end
-
- def init_with coder # :nodoc:
- yaml_initialize coder.tag, coder.map
- end
-
- def to_yaml_properties
- ["@requirements"]
end
- def encode_with(coder)
- coder.add 'requirements', @requirements
- end
-
- ##
- # A requirement is a prerelease if any of the versions inside of it
- # are prereleases
-
def prerelease?
requirements.any? { |r| r.last.prerelease? }
end
@@ -192,51 +131,23 @@ class Gem::Requirement
# True if +version+ satisfies this Requirement.
def satisfied_by? version
- raise ArgumentError, "Need a Gem::Version: #{version.inspect}" unless
- Gem::Version === version
- # #28965: syck has a bug with unquoted '=' YAML.loading as YAML::DefaultKey
- requirements.all? { |op, rv| (OPS[op] || OPS["="]).call version, rv }
- end
-
- alias :=== :satisfied_by?
- alias :=~ :satisfied_by?
-
- ##
- # True if the requirement will not always match the latest version.
-
- def specific?
- return true if @requirements.length > 1 # GIGO, > 1, > 2 is silly
-
- not %w[> >=].include? @requirements.first.first # grab the operator
+ requirements.all? { |op, rv| OPS[op].call version, rv }
end
def to_s # :nodoc:
as_list.join ", "
end
- # DOC: this should probably be :nodoc'd
- def == other
- Gem::Requirement === other and to_s == other.to_s
- end
-
- private
-
- # DOC: this should probably be :nodoc'd
- def fix_syck_default_key_in_requirements
- Gem.load_yaml
-
- # Fixup the Syck DefaultKey bug
- @requirements.each do |r|
- if r[0].kind_of? Gem::SyckDefaultKey
- r[0] = "="
- end
- end
+ def <=> other # :nodoc:
+ to_s <=> other.to_s
end
end
-# This is needed for compatibility with older yaml
-# gemspecs.
+# :stopdoc:
+# Gem::Version::Requirement is used in a lot of old YAML specs. It's aliased
+# here for backwards compatibility. I'd like to remove this, maybe in RubyGems
+# 2.0.
+
+::Gem::Version::Requirement = ::Gem::Requirement
+# :startdoc:
-class Gem::Version
- Requirement = Gem::Requirement
-end
diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
index bed47ab9f3..5cd3fb756f 100644
--- a/lib/rubygems/security.rb
+++ b/lib/rubygems/security.rb
@@ -4,110 +4,79 @@
# See LICENSE.txt for permissions.
#++
-require 'rubygems/exceptions'
-require 'fileutils'
-
-begin
- require 'openssl'
-rescue LoadError => e
- raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
- e.message =~ / -- openssl$/
-
- module OpenSSL # :nodoc:
- class Digest # :nodoc:
- class SHA1 # :nodoc:
- def name
- 'SHA1'
- end
- end
- end
- module PKey # :nodoc:
- class RSA # :nodoc:
- end
- end
- end
-end
+require 'rubygems'
+require 'rubygems/gem_openssl'
-##
-# = Signing gems
+# = Signed Gems README
+#
+# == Table of Contents
+# * Overview
+# * Walkthrough
+# * Command-Line Options
+# * OpenSSL Reference
+# * Bugs/TODO
+# * About the Author
#
-# The Gem::Security implements cryptographic signatures for gems. The section
+# == 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
#
-# === Building your certificate
-#
# 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 yourself:
-# $ gem cert --build you@example.com
+# # build a private key and certificate for gemmaster@example.com
+# $ gem cert --build gemmaster@example.com
#
-# This could take anywhere from a few seconds to a minute or two, 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.
+# 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: Move both files to ~/.gem if you don't already have a
-# key and certificate in that directory. Ensure the file permissions make the
-# key unreadable by others (by default the file is saved securely).
+# 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).
#
-# 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 Gems
+# # signing key and certificate chain
+# s.signing_key = '/mnt/floppy/gem-private_key.pem'
+# s.cert_chain = ['gem-public_cert.pem']
#
-# In RubyGems 2 and newer there is no extra work to sign a gem. RubyGems will
-# automatically find your key and certificate in your home directory and use
-# them to sign newly packaged gems.
+# (Be sure to replace "/mnt/floppy" with the ultra-secret path to your private
+# key).
#
-# If your certificate is not self-signed (signed by a third party) RubyGems
-# will attempt to load the certificate chain from the trusted certificates.
-# Use <code>gem cert --add signing_cert.pem</code> to add your signers as
-# trusted certificates. See below for further information on certificate
-# chains.
+# 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:
#
-# If you build your gem it will automatically be signed. If you peek inside
-# your gem file, you'll see a couple of new files have been added:
-#
-# $ tar tf your-gem-1.0.gem
-# metadata.gz
-# metadata.gz.sum
-# metadata.gz.sig # metadata signature
+# $ tar tf tar tf Imlib2-Ruby-0.5.0.gem
# data.tar.gz
-# data.tar.gz.sum
-# data.tar.gz.sig # data signature
-#
-# === Manually signing gems
-#
-# If you wish to store your key in a separate secure location you'll need to
-# set your gems up for signing by hand. To do this, set the
-# <code>signing_key</code> and <code>cert_chain</code> in the gemspec before
-# packaging your gem:
-#
-# s.signing_key = '/secure/path/to/gem-private_key.pem'
-# s.cert_chain = %w[/secure/path/to/gem-public_cert.pem]
-#
-# When you package your gem with these options set RubyGems will automatically
-# load your key and certificate from the secure paths.
-#
-# === Signed gems and security policies
+# 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: <code>-P HighSecurity</code>, like this:
+# following options: "-P HighSecurity", like this:
#
# # install the gem with using the security policy "HighSecurity"
-# $ sudo gem install your.gem -P HighSecurity
+# $ sudo gem install Imlib2-Ruby-0.5.0.gem -P HighSecurity
#
-# The <code>-P</code> option sets your security policy -- we'll talk about
-# that in just a minute. Eh, what's this?
+# The -P option sets your security policy -- we'll talk about that in just a
+# minute. Eh, what's this?
#
-# $ gem install -P HighSecurity your-gem-1.0.gem
-# ERROR: While executing gem ... (Gem::Security::Exception)
-# root cert /CN=you/DC=example is not trusted
+# 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
@@ -140,48 +109,46 @@ end
# RubyGems will simply refuse to install the package. Oh well, maybe
# he'll have better luck causing problems for CPAN users instead :).
#
-# The reason RubyGems refused to install your shiny new signed gem was because
-# it was from an untrusted source. Well, your code is infallible (naturally),
-# so you need to add yourself as a trusted source:
+# 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.
#
-# # add trusted certificate
-# gem cert --add ~/.gem/gem-public_cert.pem
+# Here's how:
#
-# You've now added your public certificate as a trusted source. Now you can
-# install packages signed by your private key without any hassle. Let's try
-# the install command above again:
+# # 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)
-# $ gem install -P HighSecurity your-gem-1.0.gem
-# Successfully installed your-gem-1.0
-# 1 gem installed
-#
-# This time RubyGems will accept your signed package and begin installing.
+# $ 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 by running <code>gem help cert</code>:
-#
-# Options:
-# -a, --add CERT Add a trusted certificate.
-# -l, --list [FILTER] List trusted certificates where the
-# subject contains FILTER
-# -r, --remove FILTER Remove trusted certificates where the
-# subject contains FILTER
-# -b, --build EMAIL_ADDR Build private key and self-signed
-# certificate for EMAIL_ADDR
-# -C, --certificate CERT Signing certificate for --sign
-# -K, --private-key KEY Key for --sign or --build
-# -s, --sign CERT Signs CERT with the key from -K
-# and the certificate from -C
+# the other security commands:
#
-# We've already covered the <code>--build</code> option, and the
-# <code>--add</code>, <code>--list</code>, and <code>--remove</code> commands
-# seem fairly straightforward; they allow you to add, list, and remove the
-# certificates in your trusted certificate list. But what's with this
-# <code>--sign</code> option?
+# Usage: gem cert [options]
#
-# === Certificate chains
+# 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
@@ -203,102 +170,106 @@ end
# trust. Here's a hypothetical example of a trust hierarchy based (roughly)
# on geography:
#
+#
# --------------------------
-# | rubygems@rubygems.org |
+# | rubygems@rubyforge.org |
# --------------------------
# |
# -----------------------------------
# | |
# ---------------------------- -----------------------------
-# | seattlerb@seattlerb.org | | dcrubyists@richkilmer.com |
+# | seattle.rb@zenspider.com | | dcrubyists@richkilmer.com |
# ---------------------------- -----------------------------
# | | | |
# --------------- ---------------- ----------- --------------
-# | drbrain | | zenspider | | pabs@dc | | tomcope@dc |
+# | alf@seattle | | bob@portland | | pabs@dc | | tomcope@dc |
# --------------- ---------------- ----------- --------------
#
#
-# Now, rather than having 4 trusted certificates (one for drbrain, zenspider,
-# pabs@dc, and tomecope@dc), a user could actually get by with one
-# certificate, the "rubygems@rubygems.org" certificate.
-#
-# Here's how it works:
-#
-# I install "rdoc-3.12.gem", a package signed by "drbrain". I've never heard
-# of "drbrain", but his certificate has a valid signature from the
-# "seattle.rb@seattlerb.org" certificate, which in turn has a valid signature
-# from the "rubygems@rubygems.org" certificate. Voila! At this point, it's
-# much more reasonable for me to trust a package signed by "drbrain", because
-# I can establish a chain to "rubygems@rubygems.org", which I do trust.
+# 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:
#
-# === Signing certificates
+# 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.
#
-# The <code>--sign</code> option allows all this to happen. A developer
-# creates their build certificate with the <code>--build</code> 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:
+# 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, your buddy "drbrain"),
-# 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,
-# "drbrain" would save his newly signed certificate as
-# <code>~/.gem/gem-public_cert.pem</code>
+# 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:
#
-# Obviously this RubyGems trust infrastructure doesn't exist yet. Also, in
-# the "real world", issuers actually generate the child certificate from a
+# # 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...
#
-# At this point you should know how to do all of these new and interesting
-# things:
+# 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
#
-# == Manually verifying signatures
-#
-# In case you don't trust RubyGems you can verify gem signatures manually:
+# If you've got any questions, feel free to contact me at the email address
+# below. The next couple of sections
#
-# 1. Fetch and unpack the gem
#
-# gem fetch some_signed_gem
-# tar -xf some_signed_gem-1.0.gem
+# == Command-Line Options
#
-# 2. Grab the public key from the gemspec
+# Here's a brief summary of the certificate-related command line options:
#
-# gem spec some_signed_gem-1.0.gem cert_chain | \
-# ruby -ryaml -e 'puts YAML.load_documents($stdin)' > public_key.crt
+# gem install
+# -P, --trust-policy POLICY Specify gem trust policy.
#
-# 3. Generate a SHA1 hash of the data.tar.gz
-#
-# openssl dgst -sha1 < data.tar.gz > my.hash
-#
-# 4. Verify the signature
-#
-# openssl rsautl -verify -inkey public_key.crt -certin \
-# -in data.tar.gz.sig > verified.hash
-#
-# 5. Compare your hash to the verified hash
+# 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.
#
-# diff -s verified.hash my.hash
+# A more detailed description of each options is available in the walkthrough
+# above.
#
-# 6. Repeat 5 and 6 with metadata.gz
#
# == OpenSSL Reference
#
-# The .pem files generated by --build and --sign are PEM files. Here's a
-# couple of useful OpenSSL commands for manipulating them:
+# 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)
@@ -320,8 +291,8 @@ end
# * 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 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)
@@ -331,256 +302,485 @@ end
# 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)
-# * Honor extension restrictions
+# * 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.
-# * Flexible signature and key algorithms, not hard-coded to RSA and SHA1.
+# 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)
#
-# == Original author
+# == About the Author
#
# Paul Duncan <pabs@pablotron.org>
# http://pablotron.org/
module Gem::Security
- ##
- # Gem::Security default exception type
-
class Exception < Gem::Exception; end
- ##
- # Digest algorithm used to sign gems
-
- DIGEST_ALGORITHM = OpenSSL::Digest::SHA1
-
- ##
- # Used internally to select the signing digest from all computed digests
-
- DIGEST_NAME = DIGEST_ALGORITHM.new.name # :nodoc:
-
- ##
- # Algorithm for creating the key pair used to sign gems
-
- KEY_ALGORITHM = OpenSSL::PKey::RSA
-
- ##
- # Length of keys created by KEY_ALGORITHM
-
- KEY_LENGTH = 2048
-
- ##
- # One year in seconds
-
- ONE_YEAR = 86400 * 365
-
- ##
- # The default set of extensions are:
#
- # * The certificate is not a certificate authority
- # * The key for the certificate may be used for key and data encipherment
- # and digital signatures
- # * The certificate contains a subject key identifier
-
- EXTENSIONS = {
- 'basicConstraints' => 'CA:FALSE',
- 'keyUsage' =>
- 'keyEncipherment,dataEncipherment,digitalSignature',
- 'subjectKeyIdentifier' => 'hash',
+ # 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,
+ },
}
- def self.alt_name_or_x509_entry certificate, x509_entry
- alt_name = certificate.extensions.find do |extension|
- extension.oid == "#{x509_entry}AltName"
- end
-
- return alt_name.value if alt_name
-
- certificate.send x509_entry
- end
-
- ##
- # Creates an unsigned certificate for +subject+ and +key+. The lifetime of
- # the key is from the current time to +age+ which defaults to one year.
#
- # The +extensions+ restrict the key to the indicated uses.
-
- def self.create_cert subject, key, age = ONE_YEAR, extensions = EXTENSIONS,
- serial = 1
- cert = OpenSSL::X509::Certificate.new
-
- cert.public_key = key.public_key
- cert.version = 2
- cert.serial = serial
+ # 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
- cert.not_before = Time.now
- cert.not_after = Time.now + age
+ #
+ # Get the path to the file for this cert.
+ #
+ def self.trusted_cert_path(cert, opt = {})
+ opt = Gem::Security::OPT.merge(opt)
- cert.subject = subject
+ # get digest algorithm, calculate checksum of root.subject
+ algo = opt[:dgst_algo]
+ dgst = algo.hexdigest(cert.subject.to_s)
- ef = OpenSSL::X509::ExtensionFactory.new nil, cert
+ # build path to trusted cert file
+ name = "cert-#{dgst}.pem"
- cert.extensions = extensions.map do |ext_name, value|
- ef.create_extension ext_name, value
+ # join and return path components
+ File::join(opt[:trust_dir], name)
end
- cert
- end
-
- ##
- # Creates a self-signed certificate with an issuer and subject from +email+,
- # a subject alternative name of +email+ and the given +extensions+ for the
- # +key+.
+ #
+ # 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
- def self.create_cert_email email, key, age = ONE_YEAR, extensions = EXTENSIONS
- subject = email_to_name email
+ # 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
- extensions = extensions.merge "subjectAltName" => "email:#{email}"
+ # 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
- create_cert_self_signed subject, key, age, extensions
+ # return the signing chain
+ chain.map { |cert| cert.subject }
+ end
+ end
end
- ##
- # Creates a self-signed certificate with an issuer and subject of +subject+
- # and the given +extensions+ for the +key+.
-
- def self.create_cert_self_signed subject, key, age = ONE_YEAR,
- extensions = EXTENSIONS, serial = 1
- certificate = create_cert subject, key, age, extensions
-
- sign certificate, key, certificate, age, extensions, serial
- 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
+ )
- ##
- # Creates a new key pair of the specified +length+ and +algorithm+. The
- # default is a 2048 bit RSA key.
+ #
+ # 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
+ )
- def self.create_key length = KEY_LENGTH, algorithm = KEY_ALGORITHM
- algorithm.new length
- end
+ #
+ # 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
+ )
- ##
- # Turns +email_address+ into an OpenSSL::X509::Name
+ #
+ # 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
+ )
- def self.email_to_name email_address
- email_address = email_address.gsub(/[^\w@.-]+/i, '_')
+ #
+ # 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
+ )
- cn, dcs = email_address.split '@'
+ #
+ # Hash of configured security policies
+ #
+ Policies = {
+ 'NoSecurity' => NoSecurity,
+ 'AlmostNoSecurity' => AlmostNoSecurity,
+ 'LowSecurity' => LowSecurity,
+ 'MediumSecurity' => MediumSecurity,
+ 'HighSecurity' => HighSecurity,
+ }
- dcs = dcs.split '.'
+ #
+ # 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)
- name = "CN=#{cn}/#{dcs.map { |dc| "DC=#{dc}" }.join '/'}"
+ # set up issuer information
+ cert.issuer = signing_cert.subject
+ cert.sign(signing_key, opt[:dgst_algo].new)
- OpenSSL::X509::Name.parse name
+ cert
end
- ##
- # Signs +expired_certificate+ with +private_key+ if the keys match and the
- # expired certificate was self-signed.
- #--
- # TODO increment serial
-
- def self.re_sign expired_certificate, private_key, age = ONE_YEAR,
- extensions = EXTENSIONS
- raise Gem::Security::Exception,
- "incorrect signing key for re-signing " +
- "#{expired_certificate.subject}" unless
- expired_certificate.public_key.to_pem == private_key.public_key.to_pem
-
- unless expired_certificate.subject.to_s ==
- expired_certificate.issuer.to_s then
- subject = alt_name_or_x509_entry expired_certificate, :subject
- issuer = alt_name_or_x509_entry expired_certificate, :issuer
-
- raise Gem::Security::Exception,
- "#{subject} is not self-signed, contact #{issuer} " +
- "to obtain a valid certificate"
+ #
+ # 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
-
- serial = expired_certificate.serial + 1
-
- create_cert_self_signed(expired_certificate.subject, private_key, age,
- extensions, serial)
end
- ##
- # Resets the trust directory for verifying gems.
-
- def self.reset
- @trust_dir = nil
+ #
+ # 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
- ##
- # Sign the public key from +certificate+ with the +signing_key+ and
- # +signing_cert+, using the Gem::Security::DIGEST_ALGORITHM. Uses the
- # default certificate validity range and extensions.
#
- # Returns the newly signed certificate.
-
- def self.sign certificate, signing_key, signing_cert,
- age = ONE_YEAR, extensions = EXTENSIONS, serial = 1
- signee_subject = certificate.subject
- signee_key = certificate.public_key
-
- alt_name = certificate.extensions.find do |extension|
- extension.oid == 'subjectAltName'
+ # 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
- extensions = extensions.merge 'subjectAltName' => alt_name.value if
- alt_name
+ # build self-signed public cert from key
+ cert = build_cert(name, key, opt)
- issuer_alt_name = signing_cert.extensions.find do |extension|
- extension.oid == 'subjectAltName'
+ # 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
- extensions = extensions.merge 'issuerAltName' => issuer_alt_name.value if
- issuer_alt_name
-
- signed = create_cert signee_subject, signee_key, age, extensions, serial
- signed.issuer = signing_cert.subject
-
- signed.sign signing_key, Gem::Security::DIGEST_ALGORITHM.new
+ # return key, cert, and paths (if applicable)
+ { :key => key, :cert => cert,
+ :key_path => path[:key], :cert_path => path[:cert] }
end
- ##
- # Returns a Gem::Security::TrustDir which wraps the directory where trusted
- # certificates live.
+ #
+ # 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)
- def self.trust_dir
- return @trust_dir if @trust_dir
+ # verify trust directory (can't write to nowhere, you know)
+ verify_trust_dir(opt[:trust_dir], opt[:perms][:trust_dir])
- dir = File.join Gem.user_home, '.gem', 'trust'
+ # write cert to output file
+ File.open(path, 'wb') do |file|
+ file.chmod(opt[:perms][:trusted_cert])
+ file.write(cert.to_pem)
+ end
- @trust_dir ||= Gem::Security::TrustDir.new dir
+ # return nil
+ nil
end
- ##
- # Enumerates the trusted certificates via Gem::Security::TrustDir.
+ #
+ # Basic OpenSSL-based package signing class.
+ #
+ class Signer
+ attr_accessor :key, :cert_chain
- def self.trusted_certificates &block
- trust_dir.each_certificate(&block)
- end
+ def initialize(key, cert_chain)
+ Gem.ensure_ssl_available
+ @algo = Gem::Security::OPT[:dgst_algo]
+ @key, @cert_chain = key, cert_chain
- ##
- # Writes +pemmable+, which must respond to +to_pem+ to +path+ with the given
- # +permissions+.
+ # 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
- def self.write pemmable, path, permissions = 0600
- path = File.expand_path path
+ # 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
- open path, 'wb', permissions do |io|
- io.write pemmable.to_pem
+ #
+ # Sign data with given digest algorithm
+ #
+ def sign(data)
+ @key.sign(@algo.new, data)
end
- path
end
-
- reset
-
end
-require 'rubygems/security/policy'
-require 'rubygems/security/policies'
-require 'rubygems/security/signer'
-require 'rubygems/security/trust_dir'
-
diff --git a/lib/rubygems/security/policies.rb b/lib/rubygems/security/policies.rb
deleted file mode 100644
index a976ecaf59..0000000000
--- a/lib/rubygems/security/policies.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-module Gem::Security
-
- ##
- # No security policy: all package signature checks are disabled.
-
- NoSecurity = Policy.new(
- 'No Security',
- :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(
- 'Almost No Security',
- :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(
- 'Low Security',
- :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(
- 'Medium Security',
- :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(
- 'High Security',
- :verify_data => true,
- :verify_signer => true,
- :verify_chain => true,
- :verify_root => true,
- :only_trusted => true,
- :only_signed => true
- )
-
- ##
- # Policy used to verify a certificate and key when signing a gem
-
- SigningPolicy = Policy.new(
- 'Signing Policy',
- :verify_data => false,
- :verify_signer => true,
- :verify_chain => true,
- :verify_root => true,
- :only_trusted => false,
- :only_signed => false
- )
-
- ##
- # Hash of configured security policies
-
- Policies = {
- 'NoSecurity' => NoSecurity,
- 'AlmostNoSecurity' => AlmostNoSecurity,
- 'LowSecurity' => LowSecurity,
- 'MediumSecurity' => MediumSecurity,
- 'HighSecurity' => HighSecurity,
- # SigningPolicy is not intended for use by `gem -P` so do not list it
- }
-
-end
-
diff --git a/lib/rubygems/security/policy.rb b/lib/rubygems/security/policy.rb
deleted file mode 100644
index 467ee932b5..0000000000
--- a/lib/rubygems/security/policy.rb
+++ /dev/null
@@ -1,263 +0,0 @@
-##
-# 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 in
-# Gem::Security::Policies.
-
-class Gem::Security::Policy
-
- attr_reader :name
-
- attr_accessor :only_signed
- attr_accessor :only_trusted
- attr_accessor :verify_chain
- attr_accessor :verify_data
- attr_accessor :verify_root
- attr_accessor :verify_signer
-
- ##
- # Create a new Gem::Security::Policy object with the given mode and
- # options.
-
- def initialize name, policy = {}, opt = {}
- require 'openssl'
-
- @name = name
-
- @opt = opt
-
- # Default to security
- @only_signed = true
- @only_trusted = true
- @verify_chain = true
- @verify_data = true
- @verify_root = true
- @verify_signer = true
-
- 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
-
- ##
- # Verifies each certificate in +chain+ has signed the following certificate
- # and is valid for the given +time+.
-
- def check_chain chain, time
- raise Gem::Security::Exception, 'missing signing chain' unless chain
- raise Gem::Security::Exception, 'empty signing chain' if chain.empty?
-
- begin
- chain.each_cons 2 do |issuer, cert|
- check_cert cert, issuer, time
- end
-
- true
- rescue Gem::Security::Exception => e
- raise Gem::Security::Exception, "invalid signing chain: #{e.message}"
- end
- end
-
- ##
- # Verifies that +data+ matches the +signature+ created by +public_key+ and
- # the +digest+ algorithm.
-
- def check_data public_key, digest, signature, data
- raise Gem::Security::Exception, "invalid signature" unless
- public_key.verify digest.new, signature, data.digest
-
- true
- end
-
- ##
- # Ensures that +signer+ is valid for +time+ and was signed by the +issuer+.
- # If the +issuer+ is +nil+ no verification is performed.
-
- def check_cert signer, issuer, time
- raise Gem::Security::Exception, 'missing signing certificate' unless
- signer
-
- message = "certificate #{signer.subject}"
-
- if not_before = signer.not_before and not_before > time then
- raise Gem::Security::Exception,
- "#{message} not valid before #{not_before}"
- end
-
- if not_after = signer.not_after and not_after < time then
- raise Gem::Security::Exception, "#{message} not valid after #{not_after}"
- end
-
- if issuer and not signer.verify issuer.public_key then
- raise Gem::Security::Exception,
- "#{message} was not issued by #{issuer.subject}"
- end
-
- true
- end
-
- ##
- # Ensures the public key of +key+ matches the public key in +signer+
-
- def check_key signer, key
- unless signer and key then
- return true unless @only_signed
-
- raise Gem::Security::Exception, 'missing key or signature'
- end
-
- raise Gem::Security::Exception,
- "certificate #{signer.subject} does not match the signing key" unless
- signer.public_key.to_pem == key.public_key.to_pem
-
- true
- end
-
- ##
- # Ensures the root certificate in +chain+ is self-signed and valid for
- # +time+.
-
- def check_root chain, time
- raise Gem::Security::Exception, 'missing signing chain' unless chain
-
- root = chain.first
-
- raise Gem::Security::Exception, 'missing root certificate' unless root
-
- raise Gem::Security::Exception,
- "root certificate #{root.subject} is not self-signed " +
- "(issuer #{root.issuer})" if
- root.issuer.to_s != root.subject.to_s # HACK to_s is for ruby 1.8
-
- check_cert root, root, time
- end
-
- ##
- # Ensures the root of +chain+ has a trusted certificate in +trust_dir+ and
- # the digests of the two certificates match according to +digester+
-
- def check_trust chain, digester, trust_dir
- raise Gem::Security::Exception, 'missing signing chain' unless chain
-
- root = chain.first
-
- raise Gem::Security::Exception, 'missing root certificate' unless root
-
- path = Gem::Security.trust_dir.cert_path root
-
- unless File.exist? path then
- message = "root cert #{root.subject} is not trusted"
-
- message << " (root of signing cert #{chain.last.subject})" if
- chain.length > 1
-
- raise Gem::Security::Exception, message
- end
-
- save_cert = OpenSSL::X509::Certificate.new File.read path
- save_dgst = digester.digest save_cert.public_key.to_s
-
- pkey_str = root.public_key.to_s
- cert_dgst = digester.digest pkey_str
-
- raise Gem::Security::Exception,
- "trusted root certificate #{root.subject} checksum " +
- "does not match signing root certificate checksum" unless
- save_dgst == cert_dgst
-
- true
- end
-
- def inspect # :nodoc:
- ("[Policy: %s - data: %p signer: %p chain: %p root: %p " +
- "signed-only: %p trusted-only: %p]") % [
- @name, @verify_chain, @verify_data, @verify_root, @verify_signer,
- @only_signed, @only_trusted,
- ]
- end
-
- ##
- # Verifies the certificate +chain+ is valid, the +digests+ match the
- # signatures +signatures+ created by the signer depending on the +policy+
- # settings.
- #
- # If +key+ is given it is used to validate the signing certificate.
-
- def verify chain, key = nil, digests = {}, signatures = {}
- if @only_signed and signatures.empty? then
- raise Gem::Security::Exception,
- "unsigned gems are not allowed by the #{name} policy"
- end
-
- opt = @opt
- digester = Gem::Security::DIGEST_ALGORITHM
- trust_dir = opt[:trust_dir]
- time = Time.now
-
- _, signer_digests = digests.find do |algorithm, file_digests|
- file_digests.values.first.name == Gem::Security::DIGEST_NAME
- end
-
- if @verify_data then
- raise Gem::Security::Exception, 'no digests provided (probable bug)' if
- signer_digests.nil? or signer_digests.empty?
- else
- signer_digests = {}
- end
-
- signer = chain.last
-
- check_key signer, key if key
-
- check_cert signer, nil, time if @verify_signer
-
- check_chain chain, time if @verify_chain
-
- check_root chain, time if @verify_root
-
- check_trust chain, digester, trust_dir if @only_trusted
-
- signatures.each do |file, _|
- digest = signer_digests[file]
-
- raise Gem::Security::Exception, "missing digest for #{file}" unless
- digest
- end
-
- signer_digests.each do |file, digest|
- signature = signatures[file]
-
- raise Gem::Security::Exception, "missing signature for #{file}" unless
- signature
-
- check_data signer.public_key, digester, signature, digest if @verify_data
- end
-
- true
- end
-
- ##
- # Extracts the certificate chain from the +spec+ and calls #verify to ensure
- # the signatures and certificate chain is valid according to the policy..
-
- def verify_signatures spec, digests, signatures
- chain = spec.cert_chain.map do |cert_pem|
- OpenSSL::X509::Certificate.new cert_pem
- end
-
- verify chain, nil, digests, signatures
-
- true
- end
-
- alias to_s name # :nodoc:
-
-end
-
diff --git a/lib/rubygems/security/signer.rb b/lib/rubygems/security/signer.rb
deleted file mode 100644
index 78455c0732..0000000000
--- a/lib/rubygems/security/signer.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-##
-# Basic OpenSSL-based package signing class.
-
-class Gem::Security::Signer
-
- ##
- # The chain of certificates for signing including the signing certificate
-
- attr_accessor :cert_chain
-
- ##
- # The private key for the signing certificate
-
- attr_accessor :key
-
- ##
- # The digest algorithm used to create the signature
-
- attr_reader :digest_algorithm
-
- ##
- # The name of the digest algorithm, used to pull digests out of the hash by
- # name.
-
- attr_reader :digest_name # :nodoc:
-
- ##
- # Creates a new signer with an RSA +key+ or path to a key, and a certificate
- # +chain+ containing X509 certificates, encoding certificates or paths to
- # certificates.
-
- def initialize key, cert_chain
- @cert_chain = cert_chain
- @key = key
-
- unless @key then
- default_key = File.join Gem.default_key_path
- @key = default_key if File.exist? default_key
- end
-
- unless @cert_chain then
- default_cert = File.join Gem.default_cert_path
- @cert_chain = [default_cert] if File.exist? default_cert
- end
-
- @digest_algorithm = Gem::Security::DIGEST_ALGORITHM
- @digest_name = Gem::Security::DIGEST_NAME
-
- @key = OpenSSL::PKey::RSA.new File.read @key if
- @key and not OpenSSL::PKey::RSA === @key
-
- if @cert_chain then
- @cert_chain = @cert_chain.compact.map do |cert|
- next cert if OpenSSL::X509::Certificate === cert
-
- cert = File.read cert if File.exist? cert
-
- OpenSSL::X509::Certificate.new cert
- end
-
- load_cert_chain
- end
- end
-
- ##
- # Loads any missing issuers in the cert chain from the trusted certificates.
- #
- # If the issuer does not exist it is ignored as it will be checked later.
-
- def load_cert_chain # :nodoc:
- return if @cert_chain.empty?
-
- while @cert_chain.first.issuer.to_s != @cert_chain.first.subject.to_s do
- issuer = Gem::Security.trust_dir.issuer_of @cert_chain.first
-
- break unless issuer # cert chain is verified later
-
- @cert_chain.unshift issuer
- end
- end
-
- ##
- # Sign data with given digest algorithm
-
- def sign data
- return unless @key
-
- if @cert_chain.length == 1 and @cert_chain.last.not_after < Time.now then
- re_sign_key
- end
-
- Gem::Security::SigningPolicy.verify @cert_chain, @key
-
- @key.sign @digest_algorithm.new, data
- end
-
- ##
- # Attempts to re-sign the private key if the signing certificate is expired.
- #
- # The key will be re-signed if:
- # * The expired certificate is self-signed
- # * The expired certificate is saved at ~/.gem/gem-public_cert.pem
- # * There is no file matching the expiry date at
- # ~/.gem/gem-public_cert.pem.expired.%Y%m%d%H%M%S
- #
- # If the signing certificate can be re-signed the expired certificate will
- # be saved as ~/.gem/gem-pubilc_cert.pem.expired.%Y%m%d%H%M%S where the
- # expiry time (not after) is used for the timestamp.
-
- def re_sign_key # :nodoc:
- old_cert = @cert_chain.last
-
- disk_cert_path = File.join Gem.default_cert_path
- disk_cert = File.read disk_cert_path rescue nil
- disk_key =
- File.read File.join(Gem.default_key_path) rescue nil
-
- if disk_key == @key.to_pem and disk_cert == old_cert.to_pem then
- expiry = old_cert.not_after.strftime '%Y%m%d%H%M%S'
- old_cert_file = "gem-public_cert.pem.expired.#{expiry}"
- old_cert_path = File.join Gem.user_home, ".gem", old_cert_file
-
- unless File.exist? old_cert_path then
- Gem::Security.write old_cert, old_cert_path
-
- cert = Gem::Security.re_sign old_cert, @key
-
- Gem::Security.write cert, disk_cert_path
-
- @cert_chain = [cert]
- end
- end
- end
-
-end
-
diff --git a/lib/rubygems/security/trust_dir.rb b/lib/rubygems/security/trust_dir.rb
deleted file mode 100644
index dd51308ee5..0000000000
--- a/lib/rubygems/security/trust_dir.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-class Gem::Security::TrustDir
-
- DEFAULT_PERMISSIONS = {
- :trust_dir => 0700,
- :trusted_cert => 0600,
- }
-
- def initialize dir, permissions = DEFAULT_PERMISSIONS
- @dir = dir
- @permissions = permissions
-
- @digester = Gem::Security::DIGEST_ALGORITHM
- end
-
- attr_reader :dir
-
- ##
- # Returns the path to the trusted +certificate+
-
- def cert_path certificate
- name_path certificate.subject
- end
-
- ##
- # Enumerates trusted certificates.
-
- def each_certificate
- return enum_for __method__ unless block_given?
-
- glob = File.join @dir, '*.pem'
-
- Dir[glob].each do |certificate_file|
- begin
- certificate = load_certificate certificate_file
-
- yield certificate, certificate_file
- rescue OpenSSL::X509::CertificateError
- next # HACK warn
- end
- end
- end
-
- ##
- # Returns the issuer certificate of the given +certificate+ if it exists in
- # the trust directory.
-
- def issuer_of certificate
- path = name_path certificate.issuer
-
- return unless File.exist? path
-
- load_certificate path
- end
-
- ##
- # Returns the path to the trusted certificate with the given ASN.1 +name+
-
- def name_path name
- digest = @digester.hexdigest name.to_s
-
- File.join @dir, "cert-#{digest}.pem"
- end
-
- ##
- # Loads the given +certificate_file+
-
- def load_certificate certificate_file
- pem = File.read certificate_file
-
- OpenSSL::X509::Certificate.new pem
- end
-
- ##
- # Add a certificate to trusted certificate list.
-
- def trust_cert certificate
- verify
-
- destination = cert_path certificate
-
- open destination, 'wb', @permissions[:trusted_cert] do |io|
- io.write certificate.to_pem
- end
- 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 verify
- if File.exist? @dir then
- raise Gem::Security::Exception,
- "trust directory #{@dir} is not a directory" unless
- File.directory? @dir
-
- FileUtils.chmod 0700, @dir
- else
- FileUtils.mkdir_p @dir, :mode => @permissions[:trust_dir]
- end
- end
-
-end
-
diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb
index f2d1428489..3b966f269b 100644
--- a/lib/rubygems/server.rb
+++ b/lib/rubygems/server.rb
@@ -1,9 +1,10 @@
require 'webrick'
+require 'yaml'
require 'zlib'
require 'erb'
require 'rubygems'
-require 'rubygems/rdoc'
+require 'rubygems/doc_manager'
##
# Gem::Server and allows users to serve gems for consumption by
@@ -17,6 +18,10 @@ require 'rubygems/rdoc'
# * "/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
#
@@ -72,49 +77,47 @@ class Gem::Server
<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["ri_installed"] then %>
- <a href="<%=spec["doc_path"]%>">[rdoc]</a>
- <% elsif 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>
+ <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>
@@ -426,60 +429,73 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
def self.run(options)
new(options[:gemdir], options[:port], options[:daemon],
- options[:launch], options[:addresses]).run
+ options[:addresses]).run
end
- def initialize(gem_dirs, port, daemon, launch = nil, addresses = nil)
- Gem::RDoc.load_rdoc
+ ##
+ # Only the first directory in gem_dirs is used for serving gems
+
+ def initialize(gem_dirs, port, daemon, addresses = nil)
Socket.do_not_reverse_lookup = true
- @gem_dirs = Array gem_dirs
- @port = port
- @daemon = daemon
- @launch = launch
+ @gem_dirs = Array gem_dirs
+ @port = port
+ @daemon = daemon
@addresses = addresses
-
- logger = WEBrick::Log.new nil, WEBrick::BasicLog::FATAL
+ logger = WEBrick::Log.new nil, WEBrick::BasicLog::FATAL
@server = WEBrick::HTTPServer.new :DoNotListen => true, :Logger => logger
- @spec_dirs = @gem_dirs.map { |gem_dir| File.join gem_dir, 'specifications' }
- @spec_dirs.reject! { |spec_dir| !File.directory? spec_dir }
+ @spec_dirs = @gem_dirs.map do |gem_dir|
+ spec_dir = File.join gem_dir, 'specifications'
- reset_gems
+ unless File.directory? spec_dir then
+ raise ArgumentError, "#{gem_dir} does not appear to be a gem repository"
+ end
- @have_rdoc_4_plus = nil
- end
+ spec_dir
+ end
- def add_date res
- res['date'] = @spec_dirs.map do |spec_dir|
- File.stat(spec_dir).mtime
- end.max
+ @source_index = Gem::SourceIndex.from_gems_in(*@spec_dirs)
end
- def doc_root gem_name
- if have_rdoc_4_plus? then
- "/doc_root/#{gem_name}/"
+ def Marshal(req, res)
+ @source_index.refresh!
+
+ add_date res
+
+ 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
- "/doc_root/#{gem_name}/rdoc/index.html"
+ res['content-type'] = 'application/octet-stream'
end
+
+ res.body << index
end
- def have_rdoc_4_plus?
- @have_rdoc_4_plus ||=
- Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? Gem::RDoc.rdoc_version
+ def add_date res
+ res['date'] = @spec_dirs.map do |spec_dir|
+ File.stat(spec_dir).mtime
+ end.max
end
def latest_specs(req, res)
- reset_gems
+ @source_index.refresh!
res['content-type'] = 'application/x-gzip'
add_date res
- latest_specs = Gem::Specification.latest_specs
-
- specs = latest_specs.sort.map do |spec|
- platform = spec.original_platform || Gem::Platform::RUBY
+ 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
@@ -531,20 +547,34 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
end
def quick(req, res)
- reset_gems
+ @source_index.refresh!
res['content-type'] = 'text/plain'
add_date res
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
- marshal_format, name, version, platform = $1, $2, $3, $4
- specs = Gem::Specification.find_all_by_name name, version
+ dep = Gem::Dependency.new $2, $3
+ specs = @source_index.search dep
+ marshal_format = $1
- selector = [name, version, platform].map(&:inspect).join ' '
+ selector = [$2, $3, $4].map { |s| s.inspect }.join ' '
- platform = if platform then
- Gem::Platform.new platform.sub(/^-/, '')
+ platform = if $4 then
+ Gem::Platform.new $4.sub(/^-/, '')
else
Gem::Platform::RUBY
end
@@ -560,6 +590,9 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
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."
@@ -567,8 +600,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
end
def root(req, res)
- reset_gems
-
+ @source_index.refresh!
add_date res
raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found." unless
@@ -577,15 +609,13 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
specs = []
total_file_count = 0
- Gem::Specification.each do |spec|
+ @source_index.each do |path, spec|
total_file_count += spec.files.size
- deps = spec.dependencies.map { |dep|
- {
- "name" => dep.name,
+ deps = spec.dependencies.map do |dep|
+ { "name" => dep.name,
"type" => dep.type,
- "version" => dep.requirement.to_s,
- }
- }
+ "version" => dep.requirement.to_s, }
+ end
deps = deps.sort_by { |dep| [dep["name"].downcase, dep["version"]] }
deps.last["is_last"] = true unless deps.empty?
@@ -599,15 +629,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
"authors" => spec.authors.sort.join(", "),
"date" => spec.date.to_s,
"dependencies" => deps,
- "doc_path" => doc_root(spec.full_name),
+ "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::RDoc.new(spec).rdoc_installed?,
- "ri_installed" => Gem::RDoc.new(spec).ri_installed?,
+ "rdoc_installed" => Gem::DocManager.new(spec).rdoc_installed?,
"summary" => spec.summary,
"version" => spec.version.to_s,
}
@@ -616,14 +645,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
specs << {
"authors" => "Chad Fowler, Rich Kilmer, Jim Weirich, Eric Hodel and others",
"dependencies" => [],
- "doc_path" => doc_root("rubygems-#{Gem::VERSION}"),
+ "doc_path" => "/doc_root/rubygems-#{Gem::VERSION}/rdoc/index.html",
"executables" => [{"executable" => 'gem', "is_last" => true}],
"only_one_executable" => true,
"full_name" => "rubygems-#{Gem::VERSION}",
"has_deps" => false,
"homepage" => "http://docs.rubygems.org/",
"name" => 'rubygems',
- "ri_installed" => true,
+ "rdoc_installed" => true,
"summary" => "RubyGems itself",
"version" => Gem::VERSION,
}
@@ -646,9 +675,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
values = { "gem_count" => specs.size.to_s, "specs" => specs,
"total_file_count" => total_file_count.to_s }
- # suppress 1.9.3dev warning about unused variable
- values = values
-
result = template.result binding
res.body = result
end
@@ -699,13 +725,6 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
end
##
- # Updates the server to use the latest installed gems.
-
- def reset_gems # :nodoc:
- Gem::Specification.dirs = @gem_dirs
- end
-
- ##
# Returns true and prepares http response, if rdoc for the requested gem
# name pattern was found.
#
@@ -723,15 +742,15 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
when 1
new_path = File.basename(found_gems[0])
res.status = 302
- res['Location'] = doc_root new_path
+ 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(new_path),
+ :name => base_name,
+ :url => "/doc_root/#{base_name}/rdoc/index.html",
:summary => ''
}
end
@@ -749,6 +768,12 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
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)
@@ -769,38 +794,26 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
@server.mount_proc "/rdoc", method(:rdoc)
- file_handlers = {
- '/gems' => '/cache/',
- }
-
- if have_rdoc_4_plus? then
- @server.mount '/doc_root', RDoc::Servlet, '/doc_root'
- else
- file_handlers['/doc_root'] = '/doc/'
- end
-
- @gem_dirs.each do |gem_dir|
- file_handlers.each do |mount_point, mount_dir|
- @server.mount(mount_point, WEBrick::HTTPServlet::FileHandler,
- File.join(gem_dir, mount_dir), true)
- end
+ paths = { "/gems" => "/cache/", "/doc_root" => "/doc/" }
+ paths.each do |mount_point, mount_dir|
+ @server.mount(mount_point, WEBrick::HTTPServlet::FileHandler,
+ File.join(@gem_dirs.first, mount_dir), true)
end
trap("INT") { @server.shutdown; exit! }
trap("TERM") { @server.shutdown; exit! }
- launch if @launch
-
@server.start
end
def specs(req, res)
- reset_gems
+ @source_index.refresh!
add_date res
- specs = Gem::Specification.sort_by(&:sort_obj).map do |spec|
- platform = spec.original_platform || Gem::Platform::RUBY
+ specs = @source_index.sort.map do |_, spec|
+ platform = spec.original_platform
+ platform = Gem::Platform::RUBY if platform.nil?
[spec.name, spec.version, platform]
end
@@ -820,14 +833,27 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
end
end
- def launch
- listeners = @server.listeners.map{|l| l.addr[2] }
+ def yaml(req, res)
+ @source_index.refresh!
- # TODO: 0.0.0.0 == any, not localhost.
- host = listeners.any?{|l| l == '0.0.0.0'} ? 'localhost' : listeners.first
+ add_date res
- say "Launching browser to http://#{host}:#{@port}"
+ index = @source_index.to_yaml
- system("#{@launch} http://#{host}:#{@port}")
+ 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.rb b/lib/rubygems/source.rb
deleted file mode 100644
index c997d78ca6..0000000000
--- a/lib/rubygems/source.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require 'uri'
-require 'fileutils'
-
-class Gem::Source
- FILES = {
- :released => 'specs',
- :latest => 'latest_specs',
- :prerelease => 'prerelease_specs',
- }
-
- def initialize(uri)
- unless uri.kind_of? URI
- uri = URI.parse(uri.to_s)
- end
-
- @uri = uri
- @api_uri = nil
- end
-
- attr_reader :uri
-
- def api_uri
- require 'rubygems/remote_fetcher'
- @api_uri ||= Gem::RemoteFetcher.fetcher.api_endpoint uri
- end
-
- def <=>(other)
- if !@uri
- return 0 unless other.uri
- return -1
- end
-
- return 1 if !other.uri
-
- @uri.to_s <=> other.uri.to_s
- end
-
- include Comparable
-
- def ==(other)
- case other
- when self.class
- @uri == other.uri
- else
- false
- end
- end
-
- alias_method :eql?, :==
-
- def hash
- @uri.hash
- end
-
- ##
- # Returns the local directory to write +uri+ to.
-
- def cache_dir(uri)
- # Correct for windows paths
- escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/')
- root = File.join Gem.user_home, '.gem', 'specs'
- File.join root, "#{uri.host}%#{uri.port}", File.dirname(escaped_path)
- end
-
- def update_cache?
- @update_cache ||=
- begin
- File.stat(Gem.user_home).uid == Process.uid
- rescue Errno::ENOENT
- false
- end
- end
-
- def fetch_spec(name)
- fetcher = Gem::RemoteFetcher.fetcher
-
- spec_file_name = name.spec_name
-
- uri = @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
- spec = Marshal.load(spec) rescue nil
- return spec if spec
- end
-
- 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
-
- # TODO: Investigate setting Gem::Specification#loaded_from to a URI
- Marshal.load spec
- end
-
- ##
- # Loads +type+ kind of specs fetching from +@uri+ if the on-disk cache is
- # out of date.
- #
- # +type+ is one of the following:
- #
- # :released => Return the list of all released specs
- # :latest => Return the list of only the highest version of each gem
- # :prerelease => Return the list of all prerelease only specs
- #
-
- def load_specs(type)
- file = FILES[type]
- fetcher = Gem::RemoteFetcher.fetcher
- file_name = "#{file}.#{Gem.marshal_version}"
- spec_path = @uri + "#{file_name}.gz"
- cache_dir = cache_dir spec_path
- local_file = File.join(cache_dir, file_name)
- retried = false
-
- FileUtils.mkdir_p cache_dir if update_cache?
-
- spec_dump = fetcher.cache_update_path spec_path, local_file, update_cache?
-
- begin
- Gem::NameTuple.from_list Marshal.load(spec_dump)
- rescue ArgumentError
- if update_cache? && !retried
- FileUtils.rm local_file
- retried = true
- retry
- else
- raise Gem::Exception.new("Invalid spec cache file in #{local_file}")
- end
- end
- end
-
- def download(spec, dir=Dir.pwd)
- fetcher = Gem::RemoteFetcher.fetcher
- fetcher.download spec, @uri.to_s, dir
- end
-end
diff --git a/lib/rubygems/source_index.rb b/lib/rubygems/source_index.rb
new file mode 100644
index 0000000000..f9b8ea0f81
--- /dev/null
+++ b/lib/rubygems/source_index.rb
@@ -0,0 +1,597 @@
+#--
+# 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 # :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 defined? Encoding then
+ File.read file_name, :encoding => 'UTF-8'
+ else
+ File.read file_name
+ 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 = {}
+ specifications.each{ |full_name, spec| add_spec spec }
+ @spec_dirs = nil
+ end
+
+ # TODO: remove method
+ def all_gems
+ @gems
+ end
+
+ def prerelease_gems
+ @gems.reject{ |name, gem| !gem.version.prerelease? }
+ end
+
+ def released_gems
+ @gems.reject{ |name, gem| gem.version.prerelease? }
+ 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 released 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 if curr_ver.prerelease?
+ 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
+
+ ##
+ # An array including only the released gemspecs
+
+ def released_specs
+ released_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.
+ @gems[name] = gem_spec
+ 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)
+ @gems.delete full_name
+ 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.requirement
+ 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
new file mode 100644
index 0000000000..36615d82a1
--- /dev/null
+++ b/lib/rubygems/source_info_cache.rb
@@ -0,0 +1,395 @@
+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 then
+ 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
new file mode 100644
index 0000000000..d8106b2806
--- /dev/null
+++ b/lib/rubygems/source_info_cache_entry.rb
@@ -0,0 +1,56 @@
+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/source_list.rb b/lib/rubygems/source_list.rb
deleted file mode 100644
index 7bd8ef0b78..0000000000
--- a/lib/rubygems/source_list.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'rubygems/source'
-
-class Gem::SourceList
- def initialize
- @sources = []
- end
-
- attr_reader :sources
-
- def self.from(ary)
- list = new
-
- if ary
- ary.each do |x|
- list << x
- end
- end
-
- return list
- end
-
- def initialize_copy(other)
- @sources = @sources.dup
- end
-
- def <<(obj)
- src = case obj
- when URI
- Gem::Source.new(obj)
- when Gem::Source
- obj
- else
- Gem::Source.new(URI.parse(obj))
- end
-
- @sources << src
- src
- end
-
- def replace(other)
- @sources.clear
-
- other.each do |x|
- self << x
- end
-
- self
- end
-
- def each
- @sources.each { |s| yield s.uri.to_s }
- end
-
- def each_source(&b)
- @sources.each(&b)
- end
-
- def ==(other)
- to_a == other
- end
-
- def to_a
- @sources.map { |x| x.uri.to_s }
- end
-
- alias_method :to_ary, :to_a
-
- def first
- @sources.first
- end
-
- def include?(other)
- if other.kind_of? Gem::Source
- @sources.include? other
- else
- @sources.find { |x| x.uri.to_s == other.to_s }
- end
- end
-
- def delete(uri)
- if uri.kind_of? Gem::Source
- @sources.delete uri
- else
- @sources.delete_if { |x| x.uri.to_s == uri.to_s }
- end
- end
-end
diff --git a/lib/rubygems/source_local.rb b/lib/rubygems/source_local.rb
deleted file mode 100644
index 44b170c4a4..0000000000
--- a/lib/rubygems/source_local.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'rubygems/source'
-
-class Gem::Source::Local < Gem::Source
- def initialize
- @uri = nil
- end
-
- def load_specs(type)
- names = []
-
- @specs = {}
-
- Dir["*.gem"].each do |file|
- begin
- pkg = Gem::Package.new(file)
- rescue SystemCallError, Gem::Package::FormatError
- # ignore
- else
- tup = pkg.spec.name_tuple
- @specs[tup] = [File.expand_path(file), pkg]
-
- case type
- when :released
- unless pkg.spec.version.prerelease?
- names << pkg.spec.name_tuple
- end
- when :prerelease
- if pkg.spec.version.prerelease?
- names << pkg.spec.name_tuple
- end
- when :latest
- tup = pkg.spec.name_tuple
-
- cur = names.find { |x| x.name == tup.name }
- if !cur
- names << tup
- elsif cur.version < tup.version
- names.delete cur
- names << tup
- end
- else
- names << pkg.spec.name_tuple
- end
- end
- end
-
- names
- end
-
- def find_gem(gem_name, version=Gem::Requirement.default,
- prerelease=false)
- load_specs :complete
-
- found = []
-
- @specs.each do |n, data|
- if n.name == gem_name
- s = data[1].spec
-
- if version.satisfied_by?(s.version)
- if prerelease
- found << s
- elsif !s.version.prerelease?
- found << s
- end
- end
- end
- end
-
- found.sort_by { |s| s.version }.last
- end
-
- def fetch_spec(name)
- load_specs :complete
-
- if data = @specs[name]
- data.last.spec
- else
- raise Gem::Exception, "Unable to find spec for '#{name}'"
- end
- end
-
- def download(spec, cache_dir=nil)
- load_specs :complete
-
- @specs.each do |name, data|
- return data[0] if data[1].spec == spec
- end
-
- raise Gem::Exception, "Unable to find file for '#{spec.full_name}'"
- end
-end
diff --git a/lib/rubygems/source_specific_file.rb b/lib/rubygems/source_specific_file.rb
deleted file mode 100644
index d296e617cc..0000000000
--- a/lib/rubygems/source_specific_file.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class Gem::Source::SpecificFile < Gem::Source
- def initialize(file)
- @uri = nil
- @path = ::File.expand_path(file)
-
- @package = Gem::Package.new @path
- @spec = @package.spec
- @name = @spec.name_tuple
- end
-
- attr_reader :spec
-
- def load_specs(*a)
- [@name]
- end
-
- def fetch_spec(name)
- return @spec if name == @name
- raise Gem::Exception, "Unable to find '#{name}'"
- @spec
- end
-
- def download(spec, dir=nil)
- return @path if spec == @spec
- raise Gem::Exception, "Unable to download '#{spec.full_name}'"
- end
-
-end
diff --git a/lib/rubygems/spec_fetcher.rb b/lib/rubygems/spec_fetcher.rb
index e4db426633..dac35d85d0 100644
--- a/lib/rubygems/spec_fetcher.rb
+++ b/lib/rubygems/spec_fetcher.rb
@@ -1,8 +1,9 @@
+require 'zlib'
+require 'fileutils'
+
require 'rubygems/remote_fetcher'
require 'rubygems/user_interaction'
require 'rubygems/errors'
-require 'rubygems/text'
-require 'rubygems/name_tuple'
##
# SpecFetcher handles metadata updates from remote gem repositories.
@@ -10,7 +11,11 @@ require 'rubygems/name_tuple'
class Gem::SpecFetcher
include Gem::UserInteraction
- include Gem::Text
+
+ ##
+ # The SpecFetcher cache dir.
+
+ attr_reader :dir # :nodoc:
##
# Cache of latest specs
@@ -39,196 +44,256 @@ class Gem::SpecFetcher
def initialize
@dir = File.join Gem.user_home, '.gem', 'specs'
- @update_cache =
- begin
- File.stat(Gem.user_home).uid == Process.uid
- rescue Errno::EACCES, Errno::ENOENT
- false
- end
+ @update_cache = File.stat(Gem.user_home).uid == Process.uid
@specs = {}
@latest_specs = {}
@prerelease_specs = {}
- @caches = {
- :latest => @latest_specs,
- :prerelease => @prerelease_specs,
- :released => @specs,
- }
-
@fetcher = Gem::RemoteFetcher.fetcher
end
##
- #
- # Find and fetch gem name tuples that match +dependency+.
- #
- # If +matching_platform+ is false, gems for all platforms are returned.
+ # Returns the local directory to write +uri+ to.
- def search_for_dependency(dependency, matching_platform=true)
- found = {}
+ def cache_dir(uri)
+ File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(uri.path)
+ end
- rejected_specs = {}
+ ##
+ # Fetch specs matching +dependency+. If +all+ is true, all matching
+ # (released) versions are returned. If +matching_platform+ is
+ # false, all platforms are returned. If +prerelease+ is true,
+ # prerelease versions are included.
- if dependency.prerelease?
- type = :complete
- elsif dependency.latest_version?
- type = :latest
- else
- type = :released
+ def fetch_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
+ specs_and_sources, errors = find_matching_with_errors dependency, all, matching_platform, prerelease
+
+ ss = specs_and_sources.map do |spec_tuple, source_uri|
+ [fetch_spec(spec_tuple, URI.parse(source_uri)), source_uri]
end
- list, errors = available_specs(type)
- list.each do |source, specs|
- found[source] = specs.select do |tup|
- if dependency.match?(tup)
- if matching_platform and !Gem::Platform.match(tup.platform)
- pm = (
- rejected_specs[dependency] ||= \
- Gem::PlatformMismatch.new(tup.name, tup.version))
- pm.add_platform tup.platform
- false
- else
- true
- end
- end
- end
+ return [ss, errors]
+
+ 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), nil]
end
+ end
+
+ def fetch(*args)
+ fetch_with_errors(*args).first
+ 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}"
- errors += rejected_specs.values
+ cache_dir = cache_dir uri
- tuples = []
+ 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'
- found.each do |source, specs|
- specs.each do |s|
- tuples << [s, source]
+ 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
- tuples = tuples.sort_by { |x| x[0] }
-
- return [tuples, errors]
+ # TODO: Investigate setting Gem::Specification#loaded_from to a URI
+ Marshal.load spec
end
-
##
- # Return all gem name tuples who's names match +obj+
+ # Find spec names that match +dependency+. If +all+ is true, all
+ # matching released versions are returned. If +matching_platform+
+ # is false, gems for all platforms are returned.
- def detect(type=:complete)
- tuples = []
+ def find_matching_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
+ found = {}
+
+ rejected_specs = {}
- list, _ = available_specs(type)
- list.each do |source, specs|
- specs.each do |tup|
- if yield(tup)
- tuples << [tup, source]
+ list(all, prerelease).each do |source_uri, specs|
+ found[source_uri] = specs.select do |spec_name, version, spec_platform|
+ if dependency.match?(spec_name, version)
+ if matching_platform and !Gem::Platform.match(spec_platform)
+ pm = (rejected_specs[dependency] ||= Gem::PlatformMismatch.new(spec_name, version))
+ pm.add_platform spec_platform
+ false
+ else
+ true
+ end
end
end
end
- tuples
+ errors = rejected_specs.values
+
+ 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, errors]
end
+ def find_matching(*args)
+ find_matching_with_errors(*args).first
+ end
##
- # Find and fetch specs that match +dependency+.
- #
- # If +matching_platform+ is false, gems for all platforms are returned.
+ # Returns Array of gem repositories that were generated with RubyGems less
+ # than 1.2.
- def spec_for_dependency(dependency, matching_platform=true)
- tuples, errors = search_for_dependency(dependency, matching_platform)
+ def legacy_repos
+ Gem.sources.reject do |source_uri|
+ source_uri = URI.parse source_uri
+ spec_path = source_uri + "specs.#{Gem.marshal_version}.gz"
- specs = []
- tuples.each do |tup, source|
begin
- spec = source.fetch_spec(tup)
- rescue Gem::RemoteFetcher::FetchError => e
- errors << Gem::SourceFetchProblem.new(source, e)
- else
- specs << [spec, source]
+ @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
-
- return [specs, errors]
end
##
- # Suggests gems based on the supplied +gem_name+. Returns an array of
- # alternative gem names.
+ # Returns a list of gems available for each source in Gem::sources. If
+ # +all+ is true, all released 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
- def suggest_gems_from_name gem_name
- gem_name = gem_name.downcase.tr('_-', '')
- max = gem_name.size / 2
- names = available_specs(:complete).first.values.flatten(1)
+ list = {}
- matches = names.map { |n|
- next unless n.match_platform?
+ file = { :latest => 'latest_specs',
+ :prerelease => 'prerelease_specs',
+ :all => 'specs' }[type]
- distance = levenshtein_distance gem_name, n.name.downcase.tr('_-', '')
+ cache = { :latest => @latest_specs,
+ :prerelease => @prerelease_specs,
+ :all => @specs }[type]
- next if distance >= max
+ Gem.sources.each do |source_uri|
+ source_uri = URI.parse source_uri
- return [n.name] if distance == 0
+ unless cache.include? source_uri
+ cache[source_uri] = load_specs source_uri, file
+ end
- [n.name, distance]
- }.compact
+ list[source_uri] = cache[source_uri]
+ end
- matches = matches.uniq.sort_by { |name, dist| dist }
+ if type == :all
+ list.values.map do |gems|
+ gems.reject! { |g| !g[1] || g[1].prerelease? }
+ end
+ end
- matches.first(5).map { |name, dist| name }
+ list
end
##
- # Returns a list of gems available for each source in Gem::sources.
- #
- # +type+ can be one of 3 values:
- # :released => Return the list of all released specs
- # :complete => Return the list of all specs
- # :latest => Return the list of only the highest version of each gem
- # :prerelease => Return the list of all prerelease only specs
- #
-
- def available_specs(type)
- errors = []
- list = {}
+ # Loads specs in +file+, fetching from +source_uri+ if the on-disk cache is
+ # out of date.
- Gem.sources.each_source do |source|
- begin
- names = case type
- when :latest
- tuples_for source, :latest
- when :released
- tuples_for source, :released
- when :complete
- tuples_for(source, :prerelease, true) +
- tuples_for(source, :released)
- when :prerelease
- tuples_for(source, :prerelease)
- else
- raise Gem::Exception, "Unknown type - :#{type}"
- end
- rescue Gem::RemoteFetcher::FetchError => e
- errors << Gem::SourceFetchProblem.new(source, e)
+ 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
- list[source] = names
+ loaded = true
end
+ else
+ spec_dump = @fetcher.fetch_path spec_path
+ loaded = true
end
- [list, errors]
- end
+ specs = begin
+ Marshal.load spec_dump
+ rescue ArgumentError
+ spec_dump = @fetcher.fetch_path spec_path
+ loaded = true
- def tuples_for(source, type, gracefully_ignore=false)
- cache = @caches[type]
+ Marshal.load spec_dump
+ end
- if gracefully_ignore
+ if loaded and @update_cache then
begin
- cache[source.uri] ||= source.load_specs(type)
- rescue Gem::RemoteFetcher::FetchError
- []
+ FileUtils.mkdir_p cache_dir
+
+ open local_file, 'wb' do |io|
+ io << spec_dump
+ end
+ rescue
end
- else
- cache[source.uri] ||= source.load_specs(type)
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
index cc31c898f3..4c5a02d39c 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
#--
# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
# All rights reserved.
@@ -8,51 +7,33 @@
require 'rubygems/version'
require 'rubygems/requirement'
require 'rubygems/platform'
-require 'rubygems/deprecate'
# :stopdoc:
-# date.rb can't be loaded for `make install` due to miniruby
-# Date is needed for old gems that stored #date as Date instead of Time.
-class Date; end
+class Date; end # for ruby_code if date.rb wasn't required
# :startdoc:
##
-# The Specification class contains the information for a Gem. Typically
+# The Specification class contains the metadata for a Gem. Typically
# defined in a .gemspec file or a Rakefile, and looks like this:
#
-# Gem::Specification.new do |s|
-# s.name = 'example'
-# s.version = '0.1.0'
-# s.summary = "This is an example!"
-# s.description = "Much longer explanation of the example!"
-# s.authors = ["Ruby Coder"]
-# s.email = 'rubycoder@example.com'
-# s.files = ["lib/example.rb"]
-# s.homepage = 'https://rubygems.org/gems/example'
+# spec = Gem::Specification.new do |s|
+# s.name = 'example'
+# s.version = '1.0'
+# s.summary = 'Example gem specification'
+# ...
# end
#
-# Starting in RubyGems 1.9.0, a Specification can hold arbitrary
-# metadata. This metadata is accessed via Specification#metadata
-# and has the following restrictions:
-#
-# * Must be a Hash object
-# * All keys and values must be Strings
-# * Keys can be a maximum of 128 bytes and values can be a
-# maximum of 1024 bytes
-# * All strings must be UTF8, no binary data is allowed
-#
-# For example, to add metadata for the location of a bugtracker:
-#
-# s.metadata = { "bugtracker" => "http://somewhere.com/blah" }
+# For a great way to package gems, use Hoe.
class Gem::Specification
- # REFACTOR: Consider breaking out this version stuff into a separate
- # module. There's enough special stuff around it that it may justify
- # a separate class.
+ ##
+ # Allows deinstallation of gems with legacy platforms.
+
+ attr_accessor :original_platform # :nodoc:
##
- # The version number of a specification that does not specify one
+ # The the version number of a specification that does not specify one
# (i.e. RubyGems 0.7 or earlier).
NONEXISTENT_SPECIFICATION_VERSION = -1
@@ -61,24 +42,12 @@ class Gem::Specification
# The specification version applied to any new Specification instances
# created. This should be bumped whenever something in the spec format
# changes.
- #
- # Specification Version History:
- #
- # spec ruby
- # ver ver yyyy-mm-dd description
- # -1 <0.8.0 pre-spec-version-history
- # 1 0.8.0 2004-08-01 Deprecated "test_suite_file" for "test_files"
- # "test_file=x" is a shortcut for "test_files=[x]"
- # 2 0.9.5 2007-10-01 Added "required_rubygems_version"
- # Now forward-compatible with future versions
- # 3 1.3.2 2009-01-03 Added Fixnum validation to specification_version
- # 4 1.9.0 2011-06-07 Added metadata
#--
# When updating this number, be sure to also update #to_ruby.
#
# NOTE RubyGems < 1.2 cannot load specification versions > 2.
- CURRENT_SPECIFICATION_VERSION = 4
+ CURRENT_SPECIFICATION_VERSION = 3
##
# An informal list of changes to the specification. The highest-valued
@@ -96,979 +65,221 @@ class Gem::Specification
],
3 => [
'Added Fixnum validation to the specification_version'
- ],
- 4 => [
- 'Added sandboxed freeform metadata to the specification version.'
]
}
- MARSHAL_FIELDS = { -1 => 16, 1 => 16, 2 => 16, 3 => 17, 4 => 18 }
-
- today = Time.now.utc
- TODAY = Time.utc(today.year, today.month, today.day)
+ # :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:
##
- # List of attribute names: [:name, :version, ...]
+ # Optional block used to gather newly defined instances.
- @@required_attributes = [:rubygems_version,
- :specification_version,
- :name,
- :version,
- :date,
- :summary,
- :require_paths]
+ @@gather = nil
##
- # Map of attribute names to default values.
-
- @@default_value = {
- :authors => [],
- :autorequire => nil,
- :bindir => 'bin',
- :cert_chain => [],
- :date => TODAY,
- :dependencies => [],
- :description => nil,
- :email => nil,
- :executables => [],
- :extensions => [],
- :extra_rdoc_files => [],
- :files => [],
- :homepage => nil,
- :licenses => [],
- :metadata => {},
- :name => nil,
- :platform => Gem::Platform::RUBY,
- :post_install_message => nil,
- :rdoc_options => [],
- :require_paths => ['lib'],
- :required_ruby_version => Gem::Requirement.default,
- :required_rubygems_version => Gem::Requirement.default,
- :requirements => [],
- :rubyforge_project => nil,
- :rubygems_version => Gem::VERSION,
- :signing_key => nil,
- :specification_version => CURRENT_SPECIFICATION_VERSION,
- :summary => nil,
- :test_files => [],
- :version => nil,
- }
-
- @@attributes = @@default_value.keys.sort_by { |s| s.to_s }
- @@array_attributes = @@default_value.reject { |k,v| v != [] }.keys
- @@nil_attributes, @@non_nil_attributes = @@default_value.keys.partition { |k|
- @@default_value[k].nil?
- }
-
- ######################################################################
- # :section: Required gemspec attributes
-
- ##
- # This gem's name.
- #
- # Usage:
- #
- # spec.name = 'rake'
-
- attr_accessor :name
-
- ##
- # This gem's version.
- #
- # The version string can contain numbers and periods, such as +1.0.0+.
- # A gem is a 'prerelease' gem if the version has a letter in it, such as
- # +1.0.0.pre+.
- #
- # Usage:
- #
- # spec.version = '0.4.1'
+ # List of attribute names: [:name, :version, ...]
- attr_reader :version
+ @@required_attributes = []
##
- # Paths in the gem to add to <code>$LOAD_PATH</code> when this gem is
- # activated.
+ # List of _all_ attributes and default values:
#
- # If you have an extension you do not need to add <code>"ext"</code> to the
- # require path, the extension build process will copy the extension files
- # into "lib" for you.
- #
- # The default value is <code>"lib"</code>
- #
- # Usage:
- #
- # # If all library files are in the root directory...
- # spec.require_path = '.'
+ # [[:name, nil],
+ # [:bindir, 'bin'],
+ # ...]
- attr_accessor :require_paths
-
- ##
- # The version of RubyGems used to create this gem.
- #
- # Do not set this, it is set automatically when the gem is packaged.
+ @@attributes = []
- attr_accessor :rubygems_version
+ @@nil_attributes = []
+ @@non_nil_attributes = [:@original_platform]
##
- # A short summary of this gem's description. Displayed in `gem list -d`.
- #
- # The #description should be more detailed than the summary.
- #
- # Usage:
- #
- # spec.summary = "This is a small summary of my gem"
+ # List of array attributes
- attr_reader :summary
+ @@array_attributes = []
##
- # The platform this gem runs on.
- #
- # This is usually Gem::Platform::RUBY or Gem::Platform::CURRENT.
- #
- # Most gems contain pure Ruby code; they should simply leave the default
- # value in place. Some gems contain C (or other) code to be compiled into a
- # Ruby "extension". The should leave the default value in place unless
- # their code will only compile on a certain type of system. Some gems
- # consist of pre-compiled code ("binary gems"). It's especially important
- # that they set the platform attribute appropriately. A shortcut is to set
- # the platform to Gem::Platform::CURRENT, which will cause the gem builder
- # to set the platform to the appropriate value for the system on which the
- # build is being performed.
- #
- # If this attribute is set to a non-default value, it will be included in
- # the filename of the gem when it is built such as:
- # nokogiri-1.6.0-x86-mingw32.gem
- #
- # Usage:
- #
- # spec.platform = Gem::Platform.local
-
- def platform= 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
+ # Map of attribute names to default values.
- invalidate_memoized_attributes
-
- @new_platform
- end
+ @@default_value = {}
##
- # 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.
- #
- # Usage:
- #
- # require 'rake'
- # spec.files = FileList['lib/**/*.rb',
- # 'bin/*',
- # '[A-Z]*',
- # 'test/**/*'].to_a
- #
- # # or without Rake...
- # spec.files = Dir['lib/**/*.rb'] + Dir['bin/*']
- # spec.files += Dir['[A-Z]*'] + Dir['test/**/*']
- # spec.files.reject! { |fn| fn.include? "CVS" }
+ # Names of all specification attributes
- def files
- # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
- # DOC: Why isn't it normal? Why does it suck? How can we fix this?
- @files = [@files,
- @test_files,
- add_bindir(@executables),
- @extra_rdoc_files,
- @extensions,
- ].flatten.uniq.compact
+ def self.attribute_names
+ @@attributes.map { |name, default| name }
end
- ######################################################################
- # :section: Optional gemspec attributes
-
- ##
- # The path in the gem for executable scripts. Usually 'bin'
- #
- # Usage:
- #
- # spec.bindir = 'bin'
-
- attr_accessor :bindir
-
- ##
- # The certificate chain used to sign this gem. See Gem::Security for
- # details.
-
- attr_accessor :cert_chain
-
- ##
- # A long description of this gem
- #
- # The description should be more detailed than the summary.
- #
- # Usage:
- #
- # spec.description = <<-EOF
- # Rake is a Make-like program implemented in Ruby. Tasks and
- # dependencies are specified in standard Ruby syntax.
- # EOF
-
- attr_reader :description
-
- ##
- # A contact email address (or addresses) for this gem
- #
- # Usage:
- #
- # spec.email = 'john.jones@example.com'
- # spec.email = ['jack@example.com', 'jill@example.com']
-
- attr_accessor :email
-
- ##
- # The URL of this gem's home page
- #
- # Usage:
- #
- # spec.homepage = 'http://rake.rubyforge.org'
-
- attr_accessor :homepage
-
- ##
- # A message that gets displayed after the gem is installed.
- #
- # Usage:
- #
- # spec.post_install_message = "Thanks for installing!"
-
- attr_accessor :post_install_message
-
- ##
- # The key used to sign this gem. See Gem::Security for details.
-
- attr_accessor :signing_key
-
##
- # :attr_accessor: metadata
- #
- # Arbitrary metadata for this gem. An instance of Hash.
- #
- # metadata is simply a Symbol => String association that contains arbitary
- # data that could be useful to other consumers.
-
- attr_accessor :metadata
-
- ##
- # Adds a development dependency named +gem+ with +requirements+ to this
- # gem.
- #
- # Usage:
- #
- # spec.add_development_dependency 'example', '~> 1.1', '>= 1.1.4'
- #
- # Development dependencies aren't installed by default and aren't
- # activated when a gem is required.
+ # Default values for specification attributes
- def add_development_dependency(gem, *requirements)
- add_dependency_with_type(gem, :development, *requirements)
+ def self.attribute_defaults
+ @@attributes.dup
end
##
- # Adds a runtime dependency named +gem+ with +requirements+ to this gem.
- #
- # Usage:
- #
- # spec.add_runtime_dependency 'example', '~> 1.1', '>= 1.1.4'
+ # The default value for specification attribute +name+
- def add_runtime_dependency(gem, *requirements)
- add_dependency_with_type(gem, :runtime, *requirements)
+ def self.default_value(name)
+ @@default_value[name]
end
##
- # Singular writer for #authors
- #
- # Usage:
- #
- # spec.author = 'John Jones'
+ # Required specification attributes
- def author= o
- self.authors = [o]
+ def self.required_attributes
+ @@required_attributes.dup
end
##
- # Sets the list of authors, ensuring it is an array.
- #
- # Usage:
- #
- # spec.authors = ['John Jones', 'Mary Smith']
+ # Is +name+ a required attribute?
- def authors= value
- @authors = Array(value).flatten.grep(String)
+ def self.required_attribute?(name)
+ @@required_attributes.include? name.to_sym
end
##
- # Executables included in the gem.
- #
- # For example, the rake gem has rake as an executable. You don’t specify the
- # full path (as in bin/rake); all application-style files are expected to be
- # found in bindir. These files must be executable ruby files. Files that
- # use bash or other interpreters will not work.
- #
- # Usage:
- #
- # spec.executables << 'rake'
+ # Specification attributes that are arrays (appendable and so-forth)
- def executables
- @executables ||= []
+ def self.array_attributes
+ @@array_attributes.dup
end
##
- # Extensions to build when installing the gem, specifically the paths to
- # extconf.rb-style files used to compile extensions.
- #
- # These files will be run when the gem is installed, causing the C (or
- # whatever) code to be compiled on the user’s machine.
+ # Specifies the +name+ and +default+ for a specification attribute, and
+ # creates a reader and writer method like Module#attr_accessor.
#
- # Usage:
- #
- # spec.extensions << 'ext/rmagic/extconf.rb'
- #
- # See Gem::Ext::Builder for information about writing extensions for gems.
+ # The reader method returns the default if the value hasn't been set.
- def extensions
- @extensions ||= []
- end
-
- ##
- # Extra files to add to RDoc such as README or doc/examples.txt
- #
- # When the user elects to generate the RDoc documentation for a gem (typically
- # at install time), all the library files are sent to RDoc for processing.
- # This option allows you to have some non-code files included for a more
- # complete set of documentation.
- #
- # Usage:
- #
- # spec.extra_rdoc_files = ['README', 'doc/user-guide.txt']
+ 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
- def extra_rdoc_files
- @extra_rdoc_files ||= []
+ @@attributes << [name, default]
+ @@default_value[name] = default
+ attr_accessor(name)
end
##
- # The license for this gem.
- #
- # The license must be a short name, no more than 64 characters.
- #
- # This should just be the name of your license. The full
- # text of the license should be inside of the gem when you build it.
- #
- # You can set multiple licenses with #licenses=
- #
- # Usage:
- # spec.license = 'MIT'
+ # Same as :attribute, but ensures that values assigned to the attribute
+ # are array values by applying :to_a to the value.
- def license=o
- self.licenses = [o]
- end
+ def self.array_attribute(name)
+ @@non_nil_attributes << ["@#{name}".intern, []]
- ##
- # The license(s) for the library.
- #
- # Each license must be a short name, no more than 64 characters.
- #
- # This should just be the name of your license. The full
- # text of the license should be inside of the gem when you build it.
- #
- # Usage:
- # spec.licenses = ['MIT', 'GPL-2']
+ @@array_attributes << name
+ @@attributes << [name, []]
+ @@default_value[name] = []
+ code = %{
+ def #{name}
+ @#{name} ||= []
+ end
+ def #{name}=(value)
+ @#{name} = Array(value)
+ end
+ }
- def licenses= licenses
- @licenses = Array licenses
+ module_eval code, __FILE__, __LINE__ - 9
end
##
- # Specifies the rdoc options to be used when generating API documentation.
- #
- # Usage:
- #
- # spec.rdoc_options << '--title' << 'Rake -- Ruby Make' <<
- # '--main' << 'README' <<
- # '--line-numbers'
+ # Same as attribute above, but also records this attribute as mandatory.
- def rdoc_options
- @rdoc_options ||= []
+ def self.required_attribute(*args)
+ @@required_attributes << args.first
+ attribute(*args)
end
##
- # The version of Ruby required by this gem. The ruby version can be
- # specified to the patch-level:
- #
- # $ ruby -v -e 'p Gem.ruby_version'
- # ruby 2.0.0p247 (2013-06-27 revision 41674) [x86_64-darwin12.4.0]
- # #<Gem::Version "2.0.0.247">
+ # Sometimes we don't want the world to use a setter method for a
+ # particular attribute.
#
- # Usage:
- #
- # # This gem will work with 1.8.6 or greater...
- # spec.required_ruby_version = '>= 1.8.6'
- #
- # # Only with ruby 2.0.x
- # spec.required_ruby_version = '~> 2.0'
+ # +read_only+ makes it private so we can still use it internally.
- def required_ruby_version= req
- @required_ruby_version = Gem::Requirement.create req
+ def self.read_only(*names)
+ names.each do |name|
+ private "#{name}="
+ end
end
- ##
- # Lists the external (to RubyGems) requirements that must be met for this gem
- # to work. It's simply information for the user.
- #
- # Usage:
- #
- # spec.requirements << 'libmagick, v6.0'
- # spec.requirements << 'A good graphics card'
+ # Shortcut for creating several attributes at once (each with a default
+ # value of +nil+).
- def requirements
- @requirements ||= []
+ def self.attributes(*args)
+ args.each do |arg|
+ attribute(arg, nil)
+ end
end
##
- # A collection of unit test files. They will be loaded as unit tests when
- # the user requests a gem to be unit tested.
- #
- # Usage:
- # spec.test_files = Dir.glob('test/tc_*.rb')
- # spec.test_files = ['tests/test-suite.rb']
+ # Some attributes require special behaviour when they are accessed. This
+ # allows for that.
- def test_files= files
- @test_files = Array files
+ def self.overwrite_accessor(name, &block)
+ remove_method name
+ define_method(name, &block)
end
- ######################################################################
- # :section: Specification internals
-
- ##
- # True when this gemspec has been activated. This attribute is not persisted.
-
- attr_accessor :activated
-
- alias :activated? :activated
-
- ##
- # Autorequire was used by old RubyGems to automatically require a file.
- #
- # Deprecated: It is neither supported nor functional.
-
- attr_accessor :autorequire # :nodoc:
-
##
- # Sets the default executable for this gem.
+ # 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
#
- # Deprecated: You must now specify the executable name to Gem.bin_path.
-
- attr_writer :default_executable
-
- ##
- # Path this gemspec was loaded from. This attribute is not persisted.
-
- attr_reader :loaded_from
-
- ##
- # Allows deinstallation of gems with legacy platforms.
-
- attr_writer :original_platform # :nodoc:
-
- ##
- # The version of ruby required by this gem
-
- attr_reader :required_ruby_version
-
- ##
- # The RubyGems version required by this gem
-
- attr_reader :required_rubygems_version
-
- ##
- # The rubyforge project this gem lives under. i.e. RubyGems'
- # rubyforge_project is "rubygems".
+ # s.require_path = 'mylib'
#
- # This option is deprecated.
-
- attr_accessor :rubyforge_project
-
- ##
- # The Gem::Specification version of this gemspec.
+ # instead of:
#
- # Do not set this, it is set automatically when the gem is packaged.
-
- attr_accessor :specification_version
-
- class << self
- def default_specifications_dir
- File.join(Gem.default_dir, "specifications", "default")
- end
-
- def each_spec(search_dirs) # :nodoc:
- search_dirs.each { |dir|
- Dir[File.join(dir, "*.gemspec")].each { |path|
- spec = Gem::Specification.load path.untaint
- # #load returns nil if the spec is bad, so we just ignore
- # it at this stage
- yield(spec) if spec
- }
- }
- end
-
- def each_default(&block) # :nodoc:
- each_spec([default_specifications_dir],
- &block)
- end
-
- def each_normal(&block) # :nodoc:
- each_spec(dirs, &block)
- end
- end
-
- def self._all # :nodoc:
- unless defined?(@@all) && @@all then
-
- specs = {}
- each_default do |spec|
- specs[spec.full_name] ||= spec
- end
- each_normal do |spec|
- specs[spec.full_name] ||= spec
- end
-
- @@all = specs.values
-
- # After a reset, make sure already loaded specs
- # are still marked as activated.
- specs = {}
- Gem.loaded_specs.each_value{|s| specs[s] = true}
- @@all.each{|s| s.activated = true if specs[s]}
-
- _resort!
- end
- @@all
- end
-
- def self._resort! # :nodoc:
- @@all.sort! { |a, b|
- names = a.name <=> b.name
- next names if names.nonzero?
- b.version <=> a.version
- }
- end
-
- ##
- # Loads the default specifications. It should be called only once.
-
- def self.load_defaults
- each_default do |spec|
- Gem.register_default_spec(spec)
- end
- end
-
- ##
- # Adds +spec+ to the known specifications, keeping the collection
- # properly sorted.
-
- def self.add_spec spec
- # TODO: find all extraneous adds
- # puts
- # p :add_spec => [spec.full_name, caller.reject { |s| s =~ /minitest/ }]
-
- # TODO: flush the rest of the crap from the tests
- # raise "no dupes #{spec.full_name} in #{all_names.inspect}" if
- # _all.include? spec
-
- raise "nil spec!" unless spec # TODO: remove once we're happy with tests
-
- return if _all.include? spec
-
- _all << spec
- _resort!
- end
-
- ##
- # Adds multiple specs to the known specifications.
-
- def self.add_specs *specs
- raise "nil spec!" if specs.any?(&:nil?) # TODO: remove once we're happy
-
- # TODO: this is much more efficient, but we need the extra checks for now
- # _all.concat specs
- # _resort!
-
- specs.each do |spec| # TODO: slow
- add_spec spec
- end
- end
-
- ##
- # Returns all specifications. This method is discouraged from use.
- # You probably want to use one of the Enumerable methods instead.
-
- def self.all
- warn "NOTE: Specification.all called from #{caller.first}" unless
- Gem::Deprecate.skip
- _all
- end
-
- ##
- # Sets the known specs to +specs+. Not guaranteed to work for you in
- # the future. Use at your own risk. Caveat emptor. Doomy doom doom.
- # Etc etc.
+ # s.require_paths = ['mylib']
#
- #--
- # Makes +specs+ the known specs
- # Listen, time is a river
- # Winter comes, code breaks
+ # That above convenience is available courtesy of:
#
- # -- wilsonb
-
- def self.all= specs
- @@all = specs
- end
-
- ##
- # Return full names of all specs in sorted order.
-
- def self.all_names
- self._all.map(&:full_name)
- end
-
- ##
- # Return the list of all array-oriented instance variables.
- #--
- # Not sure why we need to use so much stupid reflection in here...
-
- def self.array_attributes
- @@array_attributes.dup
- end
-
- ##
- # Return the list of all instance variables.
- #--
- # Not sure why we need to use so much stupid reflection in here...
-
- def self.attribute_names
- @@attributes.dup
- end
-
- ##
- # Return the directories that Specification uses to find specs.
-
- def self.dirs
- @@dirs ||= Gem.path.collect { |dir|
- File.join dir.dup.untaint, "specifications"
- }
- end
-
- ##
- # Set the directories that Specification uses to find specs. Setting
- # this resets the list of known specs.
-
- def self.dirs= dirs
- # TODO: find extra calls to dir=
- # warn "NOTE: dirs= called from #{caller.first} for #{dirs.inspect}"
-
- self.reset
-
- # ugh
- @@dirs = Array(dirs).map { |dir| File.join dir, "specifications" }
- end
-
- extend Enumerable
-
- ##
- # Enumerate every known spec. See ::dirs= and ::add_spec to set the list of
- # specs.
-
- def self.each
- return enum_for(:each) unless block_given?
-
- self._all.each do |x|
- yield x
- end
- end
-
- ##
- # Returns every spec that matches +name+ and optional +requirements+.
-
- def self.find_all_by_name name, *requirements
- requirements = Gem::Requirement.default if requirements.empty?
-
- # TODO: maybe try: find_all { |s| spec === dep }
-
- Gem::Dependency.new(name, *requirements).matching_specs
- end
-
- ##
- # Find the best specification matching a +name+ and +requirements+. Raises
- # if the dependency doesn't resolve to a valid specification.
-
- def self.find_by_name name, *requirements
- requirements = Gem::Requirement.default if requirements.empty?
+ # attribute_alias_singular :require_path, :require_paths
- # TODO: maybe try: find { |s| spec === dep }
-
- Gem::Dependency.new(name, *requirements).to_spec
- end
-
- ##
- # Return the best specification that contains the file matching +path+.
-
- def self.find_by_path path
- self.find { |spec|
- spec.contains_requirable_file? path
+ def self.attribute_alias_singular(singular, plural)
+ define_method("#{singular}=") { |val|
+ send("#{plural}=", [val])
}
- end
-
- ##
- # Return the best specification that contains the file matching +path+
- # amongst the specs that are not activated.
-
- def self.find_inactive_by_path path
- self.find { |spec|
- spec.contains_requirable_file? path unless spec.activated?
- }
- end
-
- ##
- # Return currently unresolved specs that contain the file matching +path+.
-
- def self.find_in_unresolved path
- # TODO: do we need these?? Kill it
- specs = unresolved_deps.values.map { |dep| dep.to_specs }.flatten
-
- specs.find_all { |spec| spec.contains_requirable_file? path }
- end
-
- ##
- # Search through all unresolved deps and sub-dependencies and return
- # specs that contain the file matching +path+.
-
- def self.find_in_unresolved_tree path
- specs = unresolved_deps.values.map { |dep| dep.to_specs }.flatten
-
- specs.reverse_each do |spec|
- trails = []
- spec.traverse do |from_spec, dep, to_spec, trail|
- next unless to_spec.conflicts.empty?
- trails << trail if to_spec.contains_requirable_file? path
- end
-
- next if trails.empty?
-
- return trails.map(&:reverse).sort.first.reverse
- end
-
- []
- 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)
- Gem.load_yaml
-
- 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
-
- spec.specification_version ||= NONEXISTENT_SPECIFICATION_VERSION
- spec.reset_nil_attributes_to_default
-
- spec
- end
-
- ##
- # Return the latest specs, optionally including prerelease specs if
- # +prerelease+ is true.
-
- def self.latest_specs prerelease = false
- result = Hash.new { |h,k| h[k] = {} }
- native = {}
-
- Gem::Specification.reverse_each do |spec|
- next if spec.version.prerelease? unless prerelease
-
- native[spec.name] = spec.version if spec.platform == Gem::Platform::RUBY
- result[spec.name][spec.platform] = spec
- end
-
- result.map(&:last).map(&:values).flatten.reject { |spec|
- minimum = native[spec.name]
- minimum && spec.version < minimum
+ define_method("#{singular}") {
+ val = send("#{plural}")
+ val.nil? ? nil : val.first
}
end
##
- # Loads Ruby format gemspec from +file+.
-
- def self.load file
- return unless file
- file = file.dup.untaint
- return unless File.file?(file)
-
- code = if defined? Encoding
- File.read file, :mode => 'r:UTF-8:-'
- else
- File.read file
- end
-
- code.untaint
-
- begin
- spec = eval code, binding, file
-
- if Gem::Specification === spec
- spec.loaded_from = file.to_s
- return spec
- end
-
- warn "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
- rescue SignalException, SystemExit
- raise
- rescue SyntaxError, Exception => e
- warn "Invalid gemspec in [#{file}]: #{e}"
- end
-
- nil
- end
-
- ##
- # Specification attributes that must be non-nil
-
- def self.non_nil_attributes
- @@non_nil_attributes.dup
- 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 =~ /\A--- /
- result.gsub!(/ !!null \n/, " \n")
- # date: 2011-04-26 00:00:00.000000000Z
- # date: 2011-04-26 00:00:00.000000000 Z
- result.gsub!(/^(date: \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+?)Z/, '\1 Z')
- result
- end
-
- ##
- # Return a list of all outdated specifications. This method is HEAVY
- # as it must go fetch specifications from the server.
-
- def self.outdated
- outdateds = []
-
- # TODO: maybe we should switch to rubygems' version service?
- fetcher = Gem::SpecFetcher.fetcher
-
- latest_specs(true).each do |local|
- dependency = Gem::Dependency.new local.name, ">= #{local.version}"
- remotes, _ = fetcher.search_for_dependency dependency
- remotes = remotes.map { |n, _| n.version }
- latest = remotes.sort.last
-
- outdateds << local.name if latest and local.version < latest
- end
-
- outdateds
- end
-
- ##
- # Removes +spec+ from the known specs.
-
- def self.remove_spec spec
- _all.delete spec
- end
-
- ##
- # Is +name+ a required attribute?
-
- def self.required_attribute?(name)
- @@required_attributes.include? name.to_sym
- end
-
- ##
- # Required specification attributes
-
- def self.required_attributes
- @@required_attributes.dup
- end
-
- ##
- # Reset the list of known specs, running pre and post reset hooks
- # registered in Gem.
-
- def self.reset
- @@dirs = nil
- Gem.pre_reset_hooks.each { |hook| hook.call }
- @@all = nil
- unresolved = unresolved_deps
- unless unresolved.empty? then
- w = "W" + "ARN"
- warn "#{w}: Unresolved specs during Gem::Specification.reset:"
- unresolved.values.each do |dep|
- warn " #{dep}"
- end
- warn "#{w}: Clearing out unresolved specs."
- warn "Please report a bug if this causes problems."
- unresolved.clear
- end
- Gem.post_reset_hooks.each { |hook| hook.call }
- end
+ # Dump only crucial instance variables.
+ #--
+ # MAINTAIN ORDER!
- # DOC: This method needs documented or nodoc'd
- def self.unresolved_deps
- @unresolved_deps ||= Hash.new { |h, n| h[n] = Gem::Dependency.new n }
+ 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
##
@@ -1094,16 +305,11 @@ class Gem::Specification
raise TypeError, "invalid Gem::Specification format #{array.inspect}"
end
- # Cleanup any YAML::PrivateType. They only show up for an old bug
- # where nil => null, so just convert them to nil based on the type.
-
- array.map! { |e| e.kind_of?(YAML::PrivateType) ? nil : e }
-
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.date = array[4]
+ 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]
@@ -1118,110 +324,50 @@ class Gem::Specification
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 :@metadata, array[18]
spec.instance_variable_set :@loaded, false
- spec.instance_variable_set :@activated, false
spec
end
- def <=>(other) # :nodoc:
- sort_obj <=> other.sort_obj
- end
-
- def == other # :nodoc:
- self.class === other &&
- name == other.name &&
- version == other.version &&
- platform == other.platform
- end
-
##
- # Dump only crucial instance variables.
- #--
- # MAINTAIN ORDER!
- # (down with the man)
+ # List of depedencies that will automatically be activated at runtime.
- def _dump(limit)
- Marshal.dump [
- @rubygems_version,
- @specification_version,
- @name,
- @version,
- date,
- @summary,
- @required_ruby_version,
- @required_rubygems_version,
- @original_platform,
- @dependencies,
- @rubyforge_project,
- @email,
- @authors,
- @description,
- @homepage,
- true, # has_rdoc
- @new_platform,
- @licenses,
- @metadata
- ]
+ def runtime_dependencies
+ dependencies.select { |d| d.type == :runtime || d.type == nil }
end
##
- # Activate this spec, registering it as a loaded spec and adding
- # it's lib paths to $LOAD_PATH. Returns true if the spec was
- # activated, false if it was previously activated. Freaks out if
- # there are conflicts upon activation.
-
- def activate
- raise_if_conflicts
-
- return false if Gem.loaded_specs[self.name]
+ # List of dependencies that are used for development
- activate_dependencies
- add_self_to_load_path
+ def development_dependencies
+ dependencies.select { |d| d.type == :development }
+ end
- Gem.loaded_specs[self.name] = self
- @activated = true
- @loaded = true
+ def test_suite_file # :nodoc:
+ warn 'test_suite_file deprecated, use test_files'
+ test_files.first
+ end
- return true
+ def test_suite_file=(val) # :nodoc:
+ warn 'test_suite_file= deprecated, use test_files='
+ @test_files = [] unless defined? @test_files
+ @test_files << val
end
##
- # Activate all unambiguously resolved runtime dependencies of this
- # spec. Add any ambigous dependencies to the unresolved list to be
- # resolved later, as needed.
-
- def activate_dependencies
- unresolved = Gem::Specification.unresolved_deps
+ # true when this gemspec has been loaded from a specifications directory.
+ # This attribute is not persisted.
- self.runtime_dependencies.each do |spec_dep|
- if loaded = Gem.loaded_specs[spec_dep.name]
- next if spec_dep.matches_spec? loaded
-
- msg = "can't satisfy '#{spec_dep}', already activated '#{loaded.full_name}'"
- e = Gem::LoadError.new msg
- e.name = spec_dep.name
-
- raise e
- end
+ attr_accessor :loaded
- specs = spec_dep.to_specs
-
- if specs.size == 1 then
- specs.first.activate
- else
- name = spec_dep.name
- unresolved[name] = unresolved[name].merge spec_dep
- end
- end
+ ##
+ # Path this gemspec was loaded from. This attribute is not persisted.
- unresolved.delete self.name
- end
+ attr_accessor :loaded_from
##
# Returns an array with bindir attached to each executable in the
- # +executables+ list
+ # executables list
def add_bindir(executables)
return nil if executables.nil?
@@ -1236,310 +382,307 @@ class Gem::Specification
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
+ # Files in the Gem under one of the require_paths
- unless dependency.respond_to?(:name) &&
- dependency.respond_to?(:version_requirements)
- dependency = Gem::Dependency.new(dependency.to_s, requirements, type)
+ def lib_files
+ @files.select do |file|
+ require_paths.any? do |path|
+ file.index(path) == 0
+ end
end
-
- dependencies << dependency
end
- private :add_dependency_with_type
+ ##
+ # True if this gem was loaded from disk
- alias add_dependency add_runtime_dependency
+ alias :loaded? :loaded
##
- # Adds this spec's require paths to LOAD_PATH, in the proper location.
+ # True if this gem has files in test_files
- def add_self_to_load_path
- return if default_gem?
+ def has_unit_tests?
+ not test_files.empty?
+ end
- paths = require_paths.map do |path|
- File.join full_gem_path, path
- end
+ # :stopdoc:
+ alias has_test_suite? has_unit_tests?
+ # :startdoc:
- # gem directories must come after -I and ENV['RUBYLIB']
- insert_index = Gem.load_path_insert_index
+ ##
+ # Specification constructor. Assigns the default values to the
+ # attributes and yields itself for further
+ # initialization. Optionally takes +name+ and +version+.
- if insert_index then
- # gem directories must come after -I and ENV['RUBYLIB']
- $LOAD_PATH.insert(insert_index, *paths)
- else
- # we are probably testing in core, -I and RUBYLIB don't apply
- $LOAD_PATH.unshift(*paths)
- end
- end
+ def initialize name = nil, version = nil
+ @new_platform = nil
+ assign_defaults
+ @loaded = false
+ @loaded_from = nil
- ##
- # Singular reader for #authors. Returns the first author in the list
+ self.name = name if name
+ self.version = version if version
+
+ yield self if block_given?
- def author
- val = authors and val.first
+ @@gather.call(self) if @@gather
end
##
- # The list of author names who wrote this gem.
- #
- # spec.authors = ['Chad Fowler', 'Jim Weirich', 'Rich Kilmer']
+ # 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 }
- def authors
- @authors ||= []
+ 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
##
- # Returns the full path to the base gem directory.
- #
- # eg: /usr/local/lib/ruby/gems/1.8
+ # 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 base_dir
- return Gem.dir unless loaded_from
- @base_dir ||= if default_gem? then
- File.dirname File.dirname File.dirname loaded_from
- else
- File.dirname File.dirname loaded_from
- end
- end
+ def assign_defaults
+ @@nil_attributes.each do |name|
+ instance_variable_set name, nil
+ end
- ##
- # Returns the full path to installed gem's bin directory.
- #
- # NOTE: do not confuse this with +bindir+, which is just 'bin', not
- # a full path.
+ @@non_nil_attributes.each do |name, default|
+ value = case default
+ when Time, Numeric, Symbol, true, false, nil then default
+ else default.dup
+ end
- def bin_dir
- @bin_dir ||= File.join gem_dir, bindir # TODO: this is unfortunate
+ instance_variable_set name, value
+ end
+
+ # HACK
+ instance_variable_set :@new_platform, Gem::Platform::RUBY
end
##
- # Returns the full path to an executable named +name+ in this gem.
+ # 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 bin_file name
- File.join bin_dir, name
- end
+ def self.from_yaml(input)
+ input = normalize_yaml_input input
+ spec = YAML.load input
- ##
- # Returns the build_args used to install the gem
+ if spec && spec.class == FalseClass then
+ raise Gem::EndOfYAMLException
+ end
- def build_args
- if File.exists? build_info_file
- File.readlines(build_info_file).map { |x| x.strip }
- else
- []
+ unless Gem::Specification === spec then
+ raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
end
- end
- ##
- # Returns the full path to the build info directory
+ 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
- def build_info_dir
- File.join base_dir, "build_info"
+ spec
end
##
- # Returns the full path to the file containing the build
- # information generated when the gem was installed
+ # Loads ruby format gemspec from +filename+
- def build_info_file
- File.join build_info_dir, "#{full_name}.info"
+ def self.load(filename)
+ gemspec = nil
+ raise "NESTED Specification.load calls not allowed!" if @@gather
+ @@gather = proc { |gs| gemspec = gs }
+ data = File.read filename
+ eval data, nil, filename
+ gemspec
+ ensure
+ @@gather = nil
end
##
- # Returns the full path to the cache directory containing this
- # spec's cached gem.
+ # Make sure the YAML specification is properly formatted with dashes
- def cache_dir
- @cache_dir ||= File.join base_dir, "cache"
+ def self.normalize_yaml_input(input)
+ result = input.respond_to?(:read) ? input.read : input
+ result = "--- " + result unless result =~ /^--- /
+ result
end
##
- # Returns the full path to the cached gem for this spec.
+ # Sets the rubygems_version to the current RubyGems version
- def cache_file
- @cache_file ||= File.join cache_dir, "#{full_name}.gem"
+ def mark_version
+ @rubygems_version = Gem::VERSION
end
##
- # Return any possible conflicts against the currently loaded specs.
-
- def conflicts
- conflicts = {}
- Gem.loaded_specs.values.each do |spec|
- bad = self.runtime_dependencies.find_all { |dep|
- spec.name == dep.name and not spec.satisfies_requirement? dep
- }
+ # Ignore unknown attributes while loading
- conflicts[spec] = bad unless bad.empty?
+ 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
- conflicts
end
##
- # Return true if this spec can require +file+.
-
- def contains_requirable_file? file
- root = full_gem_path
- suffixes = Gem.suffixes
+ # 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.
- require_paths.any? do |lib|
- base = "#{root}/#{lib}/#{file}"
- suffixes.any? { |suf| File.file? "#{base}#{suf}" }
- end
+ def add_development_dependency(gem, *requirements)
+ add_dependency_with_type(gem, :development, *requirements)
end
##
- # The date this gem was created. Lazily defaults to the current UTC date.
+ # Adds a runtime dependency named +gem+ with +requirements+ to this Gem.
+ # For example:
#
- # There is no need to set this in your gem specification.
+ # spec.add_runtime_dependency 'jabber4r', '> 0.1', '<= 0.5'
- def date
- @date ||= TODAY
+ def add_runtime_dependency(gem, *requirements)
+ add_dependency_with_type(gem, :runtime, *requirements)
end
- DateTimeFormat = /\A
- (\d{4})-(\d{2})-(\d{2})
- (\s+ \d{2}:\d{2}:\d{2}\.\d+ \s* (Z | [-+]\d\d:\d\d) )?
- \Z/x
+ ##
+ # Adds a runtime dependency
+
+ alias add_dependency add_runtime_dependency
##
- # The date this gem was created
- #
- # DO NOT set this, it is set automatically when the gem is packaged.
+ # 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 date= 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.
- @date = case date
- when String then
- if DateTimeFormat =~ date then
- Time.utc($1.to_i, $2.to_i, $3.to_i)
-
- # Workaround for where the date format output from psych isn't
- # parsed as a Time object by syck and thus comes through as a
- # string.
- elsif /\A(\d{4})-(\d{2})-(\d{2}) \d{2}:\d{2}:\d{2}\.\d+?Z\z/ =~ date then
- Time.utc($1.to_i, $2.to_i, $3.to_i)
- else
- raise(Gem::InvalidSpecificationException,
- "invalid date format in specification: #{date.inspect}")
- end
- when Time, Date then
- Time.utc(date.year, date.month, date.day)
- else
- TODAY
- end
+ def full_name
+ if platform == Gem::Platform::RUBY or platform.nil? then
+ "#{@name}-#{@version}"
+ else
+ "#{@name}-#{@version}-#{platform}"
+ end
end
##
- # The default executable for this gem.
- #
- # Deprecated: The name of the gem is assumed to be the name of the
- # executable now. See Gem.bin_path.
+ # Returns the full name (name-version) of this gemspec using the original
+ # platform. For use with legacy gems.
- def default_executable # :nodoc:
- if defined?(@default_executable) and @default_executable
- result = @default_executable
- elsif @executables and @executables.size == 1
- result = Array(@executables).first
+ def original_name # :nodoc:
+ if platform == Gem::Platform::RUBY or platform.nil? then
+ "#{@name}-#{@version}"
else
- result = nil
+ "#{@name}-#{@version}-#{@original_platform}"
end
- result
end
##
- # The default value for specification attribute +name+
+ # The full path to the gem (install path + full name).
- def default_value name
- @@default_value[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
##
- # A list of Gem::Dependency objects this gem depends on.
+ # The default (generated) file name of the gem. See also #spec_name.
#
- # Use #add_dependency or #add_development_dependency to add dependencies to
- # a gem.
+ # spec.file_name # => "example-1.0.gem"
- def dependencies
- @dependencies ||= []
+ def file_name
+ full_name + '.gem'
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]]
+ # The directory that this gem was installed into.
- def dependent_gems
- # REFACTOR: out = []; each; out; ? Really? No #collect love?
- out = []
- Gem::Specification.each do |spec|
- spec.dependencies.each do |dep|
- if self.satisfies_requirement?(dep) then
- sats = []
- find_all_satisfiers(dep) do |sat|
- sats << sat
- end
- out << [spec, dep, sats]
- end
- end
+ def installation_path
+ unless @loaded_from then
+ raise Gem::Exception, "spec #{full_name} is not from an installed gem"
end
- out
+
+ File.expand_path File.dirname(File.dirname(@loaded_from))
end
##
- # Returns all specs that matches this spec's runtime dependencies.
+ # Checks if this specification meets the requirement of +dependency+.
- def dependent_specs
- runtime_dependencies.map { |dep| dep.to_specs }.flatten
+ def satisfies_requirement?(dependency)
+ return @name == dependency.name &&
+ dependency.requirement.satisfied_by?(@version)
end
##
- # A detailed description of this gem. See also #summary
+ # Returns an object you can use to sort specifications in #sort_by.
- def description= str
- @description = str.to_s
+ def sort_obj
+ [@name, @version, @new_platform == Gem::Platform::RUBY ? -1 : 1]
end
##
- # List of dependencies that are used for development
+ # The default name of the gemspec. See also #file_name
+ #
+ # spec.spec_name # => "example-1.0.gemspec"
- def development_dependencies
- dependencies.select { |d| d.type == :development }
+ def spec_name
+ full_name + '.gemspec'
+ end
+
+ def <=>(other) # :nodoc:
+ sort_obj <=> other.sort_obj
end
##
- # Returns the full path to this spec's documentation directory. If +type+
- # is given it will be appended to the end. For examlpe:
- #
- # spec.doc_dir # => "/path/to/gem_repo/doc/a-1"
- #
- # spec.doc_dir 'ri' # => "/path/to/gem_repo/doc/a-1/ri"
+ # Tests specs for equality (across all attributes).
- def doc_dir type = nil
- @doc_dir ||= File.join base_dir, 'doc', full_name
+ def ==(other) # :nodoc:
+ self.class === other && same_attributes?(other)
+ end
- if type then
- File.join @doc_dir, type
- else
- @doc_dir
+ 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 encode_with coder # :nodoc:
mark_version
+ attributes = @@attributes.map { |name,| name.to_s }.sort
+ attributes = attributes - %w[name version platform]
+
coder.add 'name', @name
coder.add 'version', @version
platform = case @original_platform
@@ -1552,349 +695,239 @@ class Gem::Specification
end
coder.add 'platform', platform
- attributes = @@attributes.map(&:to_s) - %w[name version platform]
attributes.each do |name|
coder.add name, instance_variable_get("@#{name}")
end
end
- def eql? other # :nodoc:
- self.class === other && same_attributes?(other)
- end
-
- ##
- # Singular accessor for #executables
-
- def executable
- val = executables and val.first
- end
-
- ##
- # Singular accessor for #executables
-
- def executable=o
- self.executables = [o]
- end
-
- ##
- # Sets executables to +value+, ensuring it is an array. Don't
- # use this, push onto the array instead.
-
- def executables= value
- # TODO: warn about setting instead of pushing
- @executables = Array(value)
- end
-
- ##
- # Sets extensions to +extensions+, ensuring it is an array. Don't
- # use this, push onto the array instead.
+ def to_yaml(opts = {}) # :nodoc:
+ return super if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
- def extensions= extensions
- # TODO: warn about setting instead of pushing
- @extensions = Array extensions
+ yaml = YAML.quick_emit object_id, opts do |out|
+ out.map taguri, to_yaml_style do |map|
+ encode_with map
+ end
+ end
end
- ##
- # Sets extra_rdoc_files to +files+, ensuring it is an array. Don't
- # use this, push onto the array instead.
-
- def extra_rdoc_files= files
- # TODO: warn about setting instead of pushing
- @extra_rdoc_files = Array files
+ def init_with coder # :nodoc:
+ yaml_initialize coder.tag, coder.map
end
- ##
- # The default (generated) file name of the gem. See also #spec_name.
- #
- # spec.file_name # => "example-1.0.gem"
+ def yaml_initialize(tag, vals) # :nodoc:
+ vals.each do |ivar, val|
+ instance_variable_set "@#{ivar}", val
+ end
- def file_name
- "#{full_name}.gem"
+ @original_platform = @platform # for backwards compatibility
+ self.platform = Gem::Platform.new @platform
end
##
- # Sets files to +files+, ensuring it is an array.
-
- def files= files
- @files = Array files
- 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.
- ##
- # Finds all gems that satisfy +dep+
+ def to_ruby
+ mark_version
+ result = []
+ result << "# -*- encoding: utf-8 -*-"
+ result << nil
+ result << "Gem::Specification.new do |s|"
- def find_all_satisfiers dep
- Gem::Specification.each do |spec|
- yield spec if spec.satisfies_requirement? dep
+ 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
- end
-
- private :find_all_satisfiers
-
- ##
- # Creates a duplicate spec without large blobs that aren't used at runtime.
-
- def for_cache
- spec = dup
-
- spec.files = nil
- spec.test_files = nil
-
- spec
- end
-
- ##
- # The full path to the gem (install path + full name).
-
- def full_gem_path
- # TODO: This is a heavily used method by gems, so we'll need
- # to aleast just alias it to #gem_dir rather than remove it.
+ result << ""
+ result << " s.required_rubygems_version = #{ruby_code required_rubygems_version} if s.respond_to? :required_rubygems_version="
- # TODO: also, shouldn't it default to full_name if it hasn't been written?
- return @full_gem_path if defined?(@full_gem_path) && @full_gem_path
+ handled = [
+ :dependencies,
+ :name,
+ :platform,
+ :required_rubygems_version,
+ :specification_version,
+ :version,
+ ]
- @full_gem_path = File.expand_path File.join(gems_dir, full_name)
- @full_gem_path.untaint
+ attributes = @@attributes.sort_by { |attr_name,| attr_name.to_s }
- return @full_gem_path if File.directory? @full_gem_path
+ 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
- @full_gem_path = File.expand_path File.join(gems_dir, original_name)
- 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
- ##
- # 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.
+ result << " if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then"
- def full_name
- @full_name ||= if platform == Gem::Platform::RUBY or platform.nil? then
- "#{@name}-#{@version}".untaint
- else
- "#{@name}-#{@version}-#{platform}".untaint
- end
- end
+ 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
- ##
- # Returns the full path to this spec's gem directory.
- # eg: /usr/local/lib/ruby/1.8/gems/mygem-1.0
+ result << " else"
- def gem_dir
- @gem_dir ||= File.expand_path File.join(gems_dir, full_name)
- end
+ 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
- ##
- # Returns the full path to the gems directory containing this spec's
- # gem directory. eg: /usr/local/lib/ruby/1.8/gems
+ result << ' end'
- def gems_dir
- # TODO: this logic seems terribly broken, but tests fail if just base_dir
- @gems_dir ||= File.join(loaded_from && base_dir || Gem.dir, "gems")
- 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"
- ##
- # Deprecated and ignored, defaults to true.
- #
- # Formerly used to indicate this gem was RDoc-capable.
+ result << "end"
+ result << nil
- def has_rdoc # :nodoc:
- true
+ result.join "\n"
end
##
- # Deprecated and ignored.
+ # Checks that the specification contains all required fields, and does a
+ # very basic sanity check.
#
- # Formerly used to indicate this gem was RDoc-capable.
-
- def has_rdoc= ignored # :nodoc:
- @has_rdoc = true
- end
-
- alias :has_rdoc? :has_rdoc # :nodoc:
-
- ##
- # 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:
-
- def hash # :nodoc:
- @@attributes.inject(0) { |hash_code, (name, _)|
- hash_code ^ self.send(name).hash
- }
- end
-
- def init_with coder # :nodoc:
- yaml_initialize coder.tag, coder.map
- end
-
- ##
- # Specification constructor. Assigns the default values to the attributes
- # and yields itself for further initialization. Optionally takes +name+ and
- # +version+.
+ # Raises InvalidSpecificationException if the spec does not pass the
+ # checks..
- def initialize name = nil, version = nil
- @loaded = false
- @activated = false
- @loaded_from = nil
- @original_platform = nil
+ def validate
+ extend Gem::UserInteraction
+ normalize
- @@nil_attributes.each do |key|
- instance_variable_set "@#{key}", nil
+ if rubygems_version != Gem::VERSION then
+ raise Gem::InvalidSpecificationException,
+ "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
end
- @@non_nil_attributes.each do |key|
- default = default_value(key)
- value = case default
- when Time, Numeric, Symbol, true, false, nil then default
- else default.dup
- end
-
- instance_variable_set "@#{key}", value
+ @@required_attributes.each do |symbol|
+ unless self.send symbol then
+ raise Gem::InvalidSpecificationException,
+ "missing value for attribute #{symbol}"
+ end
end
- @new_platform = Gem::Platform::RUBY
-
- self.name = name if name
- self.version = version if version
-
- yield self if block_given?
- end
-
- ##
- # Duplicates array_attributes from +other_spec+ so state isn't shared.
+ unless String === name then
+ raise Gem::InvalidSpecificationException,
+ "invalid value for attribute name: \"#{name.inspect}\""
+ end
- def initialize_copy other_spec
- self.class.array_attributes.each do |name|
- name = :"@#{name}"
- next unless other_spec.instance_variable_defined? name
-
- begin
- val = other_spec.instance_variable_get(name)
- if val then
- instance_variable_set name, val.dup
- elsif Gem.configuration.really_verbose
- warn "WARNING: #{full_name} has an invalid nil value for #{name}"
- end
- rescue TypeError
- e = Gem::FormatException.new \
- "#{full_name} has an invalid value for #{name}"
+ if require_paths.empty? then
+ raise Gem::InvalidSpecificationException,
+ 'specification must have at least one require_path'
+ end
- e.file_path = loaded_from
- raise e
- 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
- end
+ @extra_rdoc_files.delete_if do |file| File.directory? file end
+ @extensions.delete_if do |file| File.directory? file end
- ##
- # Expire memoized instance variables that can incorrectly generate, replace
- # or miss files due changes in certain attributes used to compute them.
+ non_files = files.select do |file|
+ !File.file? file
+ end
- def invalidate_memoized_attributes
- @full_name = nil
- @cache_file = nil
- end
+ unless non_files.empty? then
+ non_files = non_files.map { |file| file.inspect }
+ raise Gem::InvalidSpecificationException,
+ "[#{non_files.join ", "}] are not files"
+ end
- private :invalidate_memoized_attributes
+ unless specification_version.is_a?(Fixnum)
+ raise Gem::InvalidSpecificationException,
+ 'specification_version must be a Fixnum (did you mean version?)'
+ end
- def inspect
- if $DEBUG
- super
+ case platform
+ when Gem::Platform, Gem::Platform::RUBY then # ok
else
- "#<#{self.class}:0x#{__id__.to_s(16)} #{full_name}>"
+ raise Gem::InvalidSpecificationException,
+ "invalid platform #{platform.inspect}, see Gem::Platform"
end
- end
-
- ##
- # Returns a string usable in Dir.glob to match all requirable paths
- # for this spec.
-
- def lib_dirs_glob
- dirs = if self.require_paths.size > 1 then
- "{#{self.require_paths.join(',')}}"
- else
- self.require_paths.first
- end
-
- "#{self.full_gem_path}/#{dirs}"
- end
-
- ##
- # Files in the Gem under one of the require_paths
- def lib_files
- @files.select do |file|
- require_paths.any? do |path|
- file.start_with? path
- end
+ unless Array === authors and
+ authors.all? { |author| String === author } then
+ raise Gem::InvalidSpecificationException,
+ 'authors must be Array of Strings'
end
- end
- ##
- # Singular accessor for #licenses
-
- def license
- val = licenses and val.first
- end
+ licenses.each { |license|
+ if license.length > 64
+ raise Gem::InvalidSpecificationException,
+ "each license must be 64 characters or less"
+ end
+ }
- ##
- # Plural accessor for setting licenses
+ # reject FIXME and TODO
- def licenses
- @licenses ||= []
- end
+ unless authors.grep(/FIXME|TODO/).empty? then
+ raise Gem::InvalidSpecificationException,
+ '"FIXME" or "TODO" is not an author'
+ end
- ##
- # Set the location a Specification was loaded from. +obj+ is converted
- # to a String.
+ unless Array(email).grep(/FIXME|TODO/).empty? then
+ raise Gem::InvalidSpecificationException,
+ '"FIXME" or "TODO" is not an email address'
+ end
- def loaded_from= path
- @loaded_from = path.to_s
+ if description =~ /FIXME|TODO/ then
+ raise Gem::InvalidSpecificationException,
+ '"FIXME" or "TODO" is not a description'
+ end
- # reset everything @loaded_from depends upon
- @base_dir = nil
- @bin_dir = nil
- @cache_dir = nil
- @cache_file = nil
- @doc_dir = nil
- @full_gem_path = nil
- @gem_dir = nil
- @gems_dir = nil
- @ri_dir = nil
- @spec_dir = nil
- @spec_file = nil
- end
+ if summary =~ /FIXME|TODO/ then
+ raise Gem::InvalidSpecificationException,
+ '"FIXME" or "TODO" is not a summary'
+ end
- ##
- # Sets the rubygems_version to the current RubyGems version.
+ 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
- def mark_version
- @rubygems_version = Gem::VERSION
- end
+ # Warnings
- ##
- # Return all files in this gem that match for +glob+.
+ %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
- def matches_for_glob glob # TODO: rename?
- # TODO: do we need these?? Kill it
- glob = File.join(self.lib_dirs_glob, glob)
+ if summary and not summary.empty? and description == summary then
+ alert_warning 'description and summary are identical'
+ end
- Dir[glob].map { |f| f.untaint } # FIX our tests are broken, run w/ SAFE=1
- end
+ alert_warning "deprecated autorequire specified" if autorequire
- ##
- # Warn about unknown attributes while loading a spec.
+ executables.each do |executable|
+ executable_path = File.join bindir, executable
+ shebang = File.read(executable_path, 2) == '#!'
- 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
+ alert_warning "#{executable_path} is missing #! line" unless shebang
end
+
+ true
end
##
@@ -1909,55 +942,44 @@ class Gem::Specification
@files ||= []
@files.concat(@extra_rdoc_files)
end
-
- @files = @files.uniq if @files
- @extensions = @extensions.uniq if @extensions
- @test_files = @test_files.uniq if @test_files
- @executables = @executables.uniq if @executables
- @extra_rdoc_files = @extra_rdoc_files.uniq if @extra_rdoc_files
+ @files.uniq! if @files
end
##
- # Return a NameTuple that represents this Specification
-
- def name_tuple
- Gem::NameTuple.new name, version, original_platform
- end
-
- ##
- # Returns the full name (name-version) of this gemspec using the original
- # platform. For use with legacy gems.
+ # 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 original_name # :nodoc:
- if platform == Gem::Platform::RUBY or platform.nil? then
- "#{@name}-#{@version}"
- else
- "#{@name}-#{@version}-#{@original_platform}"
+ 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
- ##
- # Cruft. Use +platform+.
-
- def original_platform # :nodoc:
- @original_platform ||= platform
- end
-
- ##
- # The platform this gem runs on. See Gem::Platform for details.
-
- def platform
- @new_platform ||= Gem::Platform::RUBY
+ 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
- # REFACTOR: each_attr - use in to_yaml as well
- @@attributes.each do |attr_name|
+ 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_value(attr_name) or
+ if current_value != default or
self.class.required_attribute? attr_name then
q.text "s.#{attr_name} = "
@@ -1977,82 +999,38 @@ class Gem::Specification
end
##
- # Check the spec for possible conflicts and freak out if there are any.
-
- def raise_if_conflicts
- other = Gem.loaded_specs[self.name]
-
- if other and self.version != other.version 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.
-
- msg = "can't activate #{full_name}, already activated #{other.full_name}"
-
- e = Gem::LoadError.new msg
- e.name = self.name
- # TODO: e.requirement = dep.requirement
-
- raise e
- end
-
- conf = self.conflicts
+ # Adds a dependency on gem +dependency+ with type +type+ that requires
+ # +requirements+. Valid types are currently <tt>:runtime</tt> and
+ # <tt>:development</tt>.
- unless conf.empty? then
- y = conf.map { |act,con|
- "#{act.full_name} conflicts with #{con.join(", ")}"
- }.join ", "
+ def add_dependency_with_type(dependency, type, *requirements)
+ requirements = if requirements.empty? then
+ Gem::Requirement.default
+ else
+ requirements.flatten
+ end
- # TODO: improve message by saying who activated `con`
+ unless dependency.respond_to?(:name) &&
+ dependency.respond_to?(:version_requirements)
- raise Gem::LoadError, "Unable to activate #{self.full_name}, because #{y}"
+ dependency = Gem::Dependency.new(dependency, requirements, type)
end
- end
- ##
- # Sets rdoc_options to +value+, ensuring it is an array. Don't
- # use this, push onto the array instead.
-
- def rdoc_options= options
- # TODO: warn about setting instead of pushing
- @rdoc_options = Array options
- end
-
- ##
- # Singular accessor for #require_paths
-
- def require_path
- val = require_paths and val.first
- end
-
- ##
- # Singular accessor for #require_paths
-
- def require_path= path
- self.require_paths = [path]
+ dependencies << dependency
end
- ##
- # The RubyGems version required by this gem
-
- def required_rubygems_version= req
- @required_rubygems_version = Gem::Requirement.create req
- end
+ private :add_dependency_with_type
##
- # Set requirements to +req+, ensuring it is an array. Don't
- # use this, push onto the array instead.
+ # Finds all gems that satisfy +dep+
- def requirements= req
- # TODO: warn about setting instead of pushing
- @requirements = Array req
+ def find_all_satisfiers(dep)
+ Gem.source_index.each do |_, gem|
+ yield gem if gem.satisfies_requirement? dep
+ end
end
- ##
- # Returns the full path to this spec's ri directory.
-
- def ri_dir
- @ri_dir ||= File.join base_dir, 'ri', full_name
- end
+ private :find_all_satisfiers
##
# Return a string containing a Ruby code representation of the given
@@ -2060,540 +1038,465 @@ class Gem::Specification
def ruby_code(obj)
case obj
- when String then obj.dump
- when Array then '[' + obj.map { |x| ruby_code x }.join(", ") + ']'
- when Hash then
- seg = obj.keys.sort.map { |k| "#{k.to_s.dump} => #{obj[k].to_s.dump}" }
- "{ #{seg.join(', ')} }"
- when Gem::Version then obj.to_s.dump
- when Date then obj.strftime('%Y-%m-%d').dump
- when Time then obj.strftime('%Y-%m-%d').dump
+ 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
- list = obj.as_list
- "Gem::Requirement.new(#{ruby_code(list.size == 1 ? obj.to_s : list)})"
+ 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
+
##
- # List of dependencies that will automatically be activated at runtime.
+ # :attr_accessor: rubygems_version
+ #
+ # The version of RubyGems used to create this gem.
+ #
+ # Do not set this, it is set automatically when the gem is packaged.
- def runtime_dependencies
- dependencies.select { |d| d.type == :runtime }
- end
+ required_attribute :rubygems_version, Gem::VERSION
##
- # True if this gem has the same attributes as +other+.
-
- def same_attributes? spec
- @@attributes.all? { |name, default| self.send(name) == spec.send(name) }
- end
+ # :attr_accessor: specification_version
+ #
+ # The Gem::Specification version of this gemspec.
+ #
+ # Do not set this, it is set automatically when the gem is packaged.
- private :same_attributes?
+ required_attribute :specification_version, CURRENT_SPECIFICATION_VERSION
##
- # Checks if this specification meets the requirement of +dependency+.
+ # :attr_accessor: name
+ #
+ # This gem's name
- def satisfies_requirement? dependency
- return @name == dependency.name &&
- dependency.requirement.satisfied_by?(@version)
- end
+ required_attribute :name
##
- # Returns an object you can use to sort specifications in #sort_by.
+ # :attr_accessor: version
+ #
+ # This gem's version
- def sort_obj
- # TODO: this is horrible. Deprecate it.
- [@name, @version, @new_platform == Gem::Platform::RUBY ? -1 : 1]
- end
+ required_attribute :version
##
- # Returns the full path to the directory containing this spec's
- # gemspec file. eg: /usr/local/lib/ruby/gems/1.8/specifications
+ # :attr_accessor: date
+ #
+ # The date this gem was created
+ #
+ # Do not set this, it is set automatically when the gem is packaged.
- def spec_dir
- @spec_dir ||= File.join base_dir, "specifications"
- end
+ required_attribute :date, TODAY
##
- # Returns the full path to this spec's gemspec file.
- # eg: /usr/local/lib/ruby/gems/1.8/specifications/mygem-1.0.gemspec
+ # :attr_accessor: summary
+ #
+ # A short summary of this gem's description. Displayed in `gem list -d`.
+ #
+ # The description should be more detailed than the summary. For example,
+ # you might wish to copy the entire README into the description.
+ #
+ # As of RubyGems 1.3.2 newlines are no longer stripped.
- def spec_file
- @spec_file ||= File.join spec_dir, "#{full_name}.gemspec"
- end
+ required_attribute :summary
##
- # The default name of the gemspec. See also #file_name
+ # :attr_accessor: require_paths
#
- # spec.spec_name # => "example-1.0.gemspec"
+ # Paths in the gem to add to $LOAD_PATH when this gem is activated.
+ #
+ # The default 'lib' is typically sufficient.
- def spec_name
- "#{full_name}.gemspec"
- end
+ required_attribute :require_paths, ['lib']
+
+ # :section: Optional gemspec attributes
##
- # A short summary of this gem's description.
+ # :attr_accessor: email
+ #
+ # A contact email for this gem
+ #
+ # If you are providing multiple authors and multiple emails they should be
+ # in the same order such that:
+ #
+ # Hash[*spec.authors.zip(spec.emails).flatten]
+ #
+ # Gives a hash of author name to email address.
- def summary= str
- @summary = str.to_s.strip.
- gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').gsub(/\n[ \t]*/, " ") # so. weird.
- end
+ attribute :email
##
- # Singular accessor for #test_files
+ # :attr_accessor: homepage
+ #
+ # The URL of this gem's home page
- def test_file
- val = test_files and val.first
- end
+ attribute :homepage
##
- # Singular mutator for #test_files
+ # :attr_accessor: rubyforge_project
+ #
+ # The rubyforge project this gem lives under. i.e. RubyGems'
+ # rubyforge_project is "rubygems".
- def test_file= file
- self.test_files = [file]
- end
+ attribute :rubyforge_project
##
- # Test files included in this gem. You cannot append to this accessor, you
- # must assign to it.
+ # :attr_accessor: description
+ #
+ # A long description of this gem
- def test_files
- # 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
+ attribute :description
##
- # 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.
+ # :attr_accessor: autorequire
#
- # REFACTOR: This, plus stuff like #ruby_code and #pretty_print, should
- # probably be extracted out into some sort of separate class. SRP, do you
- # speak it!??!
-
- def to_ruby
- mark_version
- result = []
- result << "# -*- encoding: utf-8 -*-"
- result << nil
- result << "Gem::Specification.new do |s|"
+ # Autorequire was used by old RubyGems to automatically require a file.
+ # It no longer is supported.
- 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="
+ attribute :autorequire
- if metadata and !metadata.empty?
- result << " s.metadata = #{ruby_code metadata} if s.respond_to? :metadata="
- end
+ ##
+ # :attr_accessor: default_executable
+ #
+ # The default executable for this gem.
+ #
+ # This is not used.
- handled = [
- :dependencies,
- :name,
- :platform,
- :required_rubygems_version,
- :specification_version,
- :version,
- :has_rdoc,
- :default_executable,
- :metadata
- ]
+ attribute :default_executable
- @@attributes.each do |attr_name|
- next if handled.include? attr_name
- current_value = self.send(attr_name)
- if current_value != default_value(attr_name) or
- self.class.required_attribute? attr_name then
- result << " s.#{attr_name} = #{ruby_code current_value}"
- end
- end
+ ##
+ # :attr_accessor: bindir
+ #
+ # The path in the gem for executable scripts
- unless dependencies.empty? then
- result << nil
- result << " if s.respond_to? :specification_version then"
- result << " s.specification_version = #{specification_version}"
- result << nil
+ attribute :bindir, 'bin'
- result << " if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then"
+ ##
+ # :attr_accessor: has_rdoc
+ #
+ # Deprecated and ignored, defaults to true.
+ #
+ # Formerly used to indicate this gem was RDoc-capable.
- dependencies.each do |dep|
- req = dep.requirements_list.inspect
- dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
- result << " s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{req})"
- end
+ attribute :has_rdoc, true
- result << " else"
+ ##
+ # True if this gem supports RDoc
- dependencies.each do |dep|
- version_reqs_param = dep.requirements_list.inspect
- result << " s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
- end
+ alias :has_rdoc? :has_rdoc
- result << ' end'
+ ##
+ # :attr_accessor: required_ruby_version
+ #
+ # The version of ruby required by this gem
- 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"
- end
+ attribute :required_ruby_version, Gem::Requirement.default
- result << "end"
- result << nil
+ ##
+ # :attr_accessor: required_rubygems_version
+ #
+ # The RubyGems version required by this gem
- result.join "\n"
- end
+ attribute :required_rubygems_version, Gem::Requirement.default
##
- # Returns a Ruby lighter-weight code representation of this specification,
- # used for indexing only.
+ # :attr_accessor: platform
+ #
+ # The platform this gem runs on. See Gem::Platform for details.
#
- # See #to_ruby.
+ # Setting this to any value other than Gem::Platform::RUBY or
+ # Gem::Platform::CURRENT is probably wrong.
- def to_ruby_for_cache
- for_cache.to_ruby
- end
+ attribute :platform, Gem::Platform::RUBY
- def to_s # :nodoc:
- "#<Gem::Specification name=#{@name} version=#{@version}>"
- end
+ ##
+ # :attr_accessor: signing_key
+ #
+ # The key used to sign this gem. See Gem::Security for details.
- def to_yaml(opts = {}) # :nodoc:
- if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
- # Because the user can switch the YAML engine behind our
- # back, we have to check again here to make sure that our
- # psych code was properly loaded, and load it if not.
- unless Gem.const_defined?(:NoAliasYAMLTree)
- require 'rubygems/psych_tree'
- end
+ attribute :signing_key, nil
- builder = Gem::NoAliasYAMLTree.create
- builder << self
- ast = builder.tree
+ ##
+ # :attr_accessor: cert_chain
+ #
+ # The certificate chain used to sign this gem. See Gem::Security for
+ # details.
- io = StringIO.new
- io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
+ attribute :cert_chain, []
- Psych::Visitors::Emitter.new(io).accept(ast)
+ ##
+ # :attr_accessor: post_install_message
+ #
+ # A message that gets displayed after the gem is installed
- io.string.gsub(/ !!null \n/, " \n")
- else
- YAML.quick_emit object_id, opts do |out|
- out.map taguri, to_yaml_style do |map|
- encode_with map
- end
- end
- end
- end
+ attribute :post_install_message, nil
##
- # Recursively walk dependencies of this spec, executing the +block+ for each
- # hop.
+ # :attr_accessor: authors
+ #
+ # The list of author names who wrote this gem.
+ #
+ # If you are providing multiple authors and multiple emails they should be
+ # in the same order such that:
+ #
+ # Hash[*spec.authors.zip(spec.emails).flatten]
+ #
+ # Gives a hash of author name to email address.
- def traverse trail = [], &block
- trail = trail + [self]
- runtime_dependencies.each do |dep|
- dep.to_specs.each do |dep_spec|
- block[self, dep, dep_spec, trail + [dep_spec]]
- dep_spec.traverse(trail, &block) unless
- trail.map(&:name).include? dep_spec.name
- end
- end
- end
+ array_attribute :authors
##
- # Checks that the specification contains all required fields, and does a
- # very basic sanity check.
+ # :attr_accessor: licenses
#
- # Raises InvalidSpecificationException if the spec does not pass the
- # checks..
+ # The license(s) for the library. Each license must be a short name, no
+ # more than 64 characters.
- def validate packaging = true
- require 'rubygems/user_interaction'
- extend Gem::UserInteraction
- normalize
+ array_attribute :licenses
- nil_attributes = self.class.non_nil_attributes.find_all do |name|
- instance_variable_get("@#{name}").nil?
- end
+ ##
+ # :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.
- unless nil_attributes.empty? then
- raise Gem::InvalidSpecificationException,
- "#{nil_attributes.join ', '} must not be nil"
- end
+ array_attribute :files
- if packaging and rubygems_version != Gem::VERSION then
- raise Gem::InvalidSpecificationException,
- "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
- end
+ ##
+ # :attr_accessor: test_files
+ #
+ # Test files included in this gem. You cannot append to this accessor, you
+ # must assign to it.
- @@required_attributes.each do |symbol|
- unless self.send symbol then
- raise Gem::InvalidSpecificationException,
- "missing value for attribute #{symbol}"
- end
- end
+ array_attribute :test_files
- unless String === name then
- raise Gem::InvalidSpecificationException,
- "invalid value for attribute name: \"#{name.inspect}\""
- end
+ ##
+ # :attr_accessor: rdoc_options
+ #
+ # An ARGV style array of options to RDoc
- if require_paths.empty? then
- raise Gem::InvalidSpecificationException,
- 'specification must have at least one require_path'
- end
+ array_attribute :rdoc_options
- @files.delete_if { |x| File.directory?(x) }
- @test_files.delete_if { |x| File.directory?(x) }
- @executables.delete_if { |x| File.directory?(File.join(@bindir, x)) }
- @extra_rdoc_files.delete_if { |x| File.directory?(x) }
- @extensions.delete_if { |x| File.directory?(x) }
+ ##
+ # :attr_accessor: extra_rdoc_files
+ #
+ # Extra files to add to RDoc such as README or doc/examples.txt
- non_files = files.reject { |x| File.file?(x) }
+ array_attribute :extra_rdoc_files
- unless not packaging or non_files.empty? then
- raise Gem::InvalidSpecificationException,
- "[\"#{non_files.join "\", \""}\"] are not files"
- end
+ ##
+ # :attr_accessor: executables
+ #
+ # Executables included in the gem.
- unless specification_version.is_a?(Fixnum)
- raise Gem::InvalidSpecificationException,
- 'specification_version must be a Fixnum (did you mean version?)'
- end
+ array_attribute :executables
- case platform
- when Gem::Platform, Gem::Platform::RUBY then # ok
- else
- raise Gem::InvalidSpecificationException,
- "invalid platform #{platform.inspect}, see Gem::Platform"
- end
+ ##
+ # :attr_accessor: extensions
+ #
+ # Extensions to build when installing the gem. See
+ # Gem::Installer#build_extensions for valid values.
- self.class.array_attributes.each do |field|
- val = self.send field
- klass = case field
- when :dependencies
- Gem::Dependency
- else
- String
- end
+ array_attribute :extensions
- unless Array === val and val.all? { |x| x.kind_of?(klass) } then
- raise(Gem::InvalidSpecificationException,
- "#{field} must be an Array of #{klass}")
- end
- end
+ ##
+ # :attr_accessor: requirements
+ #
+ # An array or things required by this gem. Not used by anything
+ # presently.
- # FIX: uhhhh single element array.each?
- [:authors].each do |field|
- val = self.send field
- raise Gem::InvalidSpecificationException, "#{field} may not be empty" if
- val.empty?
- end
+ array_attribute :requirements
- unless Hash === metadata
- raise Gem::InvalidSpecificationException,
- 'metadata must be a hash'
- end
+ ##
+ # :attr_reader: dependencies
+ #
+ # A list of Gem::Dependency objects this gem depends on.
+ #
+ # Use #add_dependency or #add_development_dependency to add dependencies to
+ # a gem.
- metadata.keys.each do |k|
- if !k.kind_of?(String)
- raise Gem::InvalidSpecificationException,
- 'metadata keys must be a String'
- end
+ array_attribute :dependencies
- if k.size > 128
- raise Gem::InvalidSpecificationException,
- "metadata key too large (#{k.size} > 128)"
- end
- end
+ read_only :dependencies
- metadata.values.each do |k|
- if !k.kind_of?(String)
- raise Gem::InvalidSpecificationException,
- 'metadata values must be a String'
- end
+ # :section: Aliased gemspec attributes
- if k.size > 1024
- raise Gem::InvalidSpecificationException,
- "metadata value too large (#{k.size} > 1024)"
- end
- end
+ ##
+ # Singular accessor for #executables
- licenses.each { |license|
- if license.length > 64
- raise Gem::InvalidSpecificationException,
- "each license must be 64 characters or less"
- end
- }
+ attribute_alias_singular :executable, :executables
- alert_warning 'licenses is empty' if licenses.empty?
+ ##
+ # Singular accessor for #authors
- validate_permissions
+ attribute_alias_singular :author, :authors
- # reject lazy developers:
+ ##
+ # Singular accessor for #licenses
- # FIX: Doesn't this just evaluate to "FIXME" or "TODO"?
- lazy = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, '')
+ attribute_alias_singular :license, :licenses
- unless authors.grep(/FI XME|TO DO/x).empty? then
- raise Gem::InvalidSpecificationException, "#{lazy} is not an author"
- end
+ ##
+ # Singular accessor for #require_paths
- unless Array(email).grep(/FI XME|TO DO/x).empty? then
- raise Gem::InvalidSpecificationException, "#{lazy} is not an email"
- end
+ attribute_alias_singular :require_path, :require_paths
- if description =~ /FI XME|TO DO/x then
- raise Gem::InvalidSpecificationException, "#{lazy} is not a description"
- end
+ ##
+ # Singular accessor for #test_files
- if summary =~ /FI XME|TO DO/x then
- raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
- end
+ attribute_alias_singular :test_file, :test_files
- 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
+ ##
+ # has_rdoc is now ignored
- # Warnings
+ overwrite_accessor :has_rdoc do
+ true
+ end
- %w[author description email homepage summary].each do |attribute|
- value = self.send attribute
- alert_warning "no #{attribute} specified" if value.nil? or value.empty?
- end
+ ##
+ # has_rdoc is now ignored
- if description == summary then
- alert_warning 'description and summary are identical'
- end
+ overwrite_accessor :has_rdoc= do |value|
+ @has_rdoc = true
+ end
- # TODO: raise at some given date
- alert_warning "deprecated autorequire specified" if autorequire
+ overwrite_accessor :version= do |version|
+ @version = Gem::Version.create(version)
+ self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
+ return @version
+ end
- executables.each do |executable|
- executable_path = File.join(bindir, executable)
- shebang = File.read(executable_path, 2) == '#!'
+ overwrite_accessor :platform do
+ @new_platform
+ end
- alert_warning "#{executable_path} is missing #! line" unless shebang
+ overwrite_accessor :platform= do |platform|
+ if @original_platform.nil? or
+ @original_platform == Gem::Platform::RUBY then
+ @original_platform = platform
end
- dependencies.each do |dep|
- prerelease_dep = dep.requirements_list.any? do |req|
- Gem::Requirement.new(req).prerelease?
- end
+ case platform
+ when Gem::Platform::CURRENT then
+ @new_platform = Gem::Platform.local
+ @original_platform = @new_platform.to_s
- alert_warning "prerelease dependency on #{dep} is not recommended" if
- prerelease_dep
+ 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
- true
- end
+ @platform = @new_platform.to_s
- ##
- # Checks to see if the files to be packaged are world-readable.
+ @new_platform
+ end
- def validate_permissions
- return if Gem.win_platform?
+ overwrite_accessor :required_ruby_version= do |value|
+ @required_ruby_version = Gem::Requirement.create(value)
+ end
- files.each do |file|
- next if File.stat(file).mode & 0444 == 0444
- alert_warning "#{file} is not world-readable"
- end
+ overwrite_accessor :required_rubygems_version= do |value|
+ @required_rubygems_version = Gem::Requirement.create(value)
+ end
- executables.each do |name|
- exec = File.join @bindir, name
- next if File.stat(exec).executable?
- alert_warning "#{exec} is not executable"
+ 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
- ##
- # Set the version to +version+, potentially also setting
- # required_rubygems_version if +version+ indicates it is a
- # prerelease.
+ overwrite_accessor :date do
+ self.date = nil if @date.nil? # HACK Sets the default value for date
+ @date
+ end
- def version= version
- @version = Gem::Version.create(version)
- self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
- invalidate_memoized_attributes
+ overwrite_accessor :summary= do |str|
+ @summary = if str then
+ str.strip.
+ gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
+ gsub(/\n[ \t]*/, " ")
+ end
+ end
- return @version
+ overwrite_accessor :description= do |str|
+ @description = str.to_s
end
- # FIX: have this handle the platform/new_platform/original_platform bullshit
- def yaml_initialize(tag, vals) # :nodoc:
- vals.each do |ivar, val|
- case ivar
- when "date"
- # Force Date to go through the extra coerce logic in date=
- self.date = val.untaint
+ 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
- instance_variable_set "@#{ivar}", val.untaint
+ result = nil
end
+ result
+ rescue
+ nil
end
-
- @original_platform = @platform # for backwards compatibility
- self.platform = Gem::Platform.new @platform
end
- ##
- # Reset nil attributes to their default values to make the spec valid
-
- def reset_nil_attributes_to_default
- nil_attributes = self.class.non_nil_attributes.find_all do |name|
- !instance_variable_defined?("@#{name}") || instance_variable_get("@#{name}").nil?
+ 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
-
- nil_attributes.each do |attribute|
- default = self.default_value attribute
-
- value = case default
- when Time, Numeric, Symbol, true, false, nil then default
- else default.dup
- end
-
- instance_variable_set "@#{attribute}", value
+ if defined?(@test_files) and @test_files then
+ @test_files
+ else
+ @test_files = []
end
end
- def default_gem?
- loaded_from &&
- File.dirname(loaded_from) == self.class.default_specifications_dir
+ overwrite_accessor :files do
+ # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
+ @files = [@files,
+ @test_files,
+ add_bindir(@executables),
+ @extra_rdoc_files,
+ @extensions,
+ ].flatten.uniq.compact
end
-
- extend Gem::Deprecate
-
- # TODO:
- # deprecate :has_rdoc, :none, 2011, 10
- # deprecate :has_rdoc?, :none, 2011, 10
- # deprecate :has_rdoc=, :none, 2011, 10
- # deprecate :default_executable, :none, 2011, 10
- # deprecate :default_executable=, :none, 2011, 10
- # deprecate :file_name, :cache_file, 2011, 10
- # deprecate :full_gem_path, :cache_file, 2011, 10
end
-
-# DOC: What is this and why is it here, randomly, at the end of this file?
-Gem.clear_paths
diff --git a/lib/rubygems/ssl_certs/.document b/lib/rubygems/ssl_certs/.document
deleted file mode 100644
index fb66f13c33..0000000000
--- a/lib/rubygems/ssl_certs/.document
+++ /dev/null
@@ -1 +0,0 @@
-# Ignore all files in this directory
diff --git a/lib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem b/lib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
deleted file mode 100644
index 20585f1c01..0000000000
--- a/lib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
diff --git a/lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem b/lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem
deleted file mode 100644
index 6fbdf52b17..0000000000
--- a/lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow
-gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD
-VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw
-AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6
-2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr
-ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt
-4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq
-m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/
-vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT
-8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE
-IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO
-KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO
-GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/
-s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g
-JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD
-AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9
-MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy
-bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
-Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ
-zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj
-Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY
-Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5
-B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx
-PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR
-pu/xO28QOG8=
------END CERTIFICATE-----
diff --git a/lib/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem b/lib/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
deleted file mode 100644
index 87676acf5f..0000000000
--- a/lib/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
diff --git a/lib/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem b/lib/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
deleted file mode 100644
index 9e6810ab70..0000000000
--- a/lib/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
diff --git a/lib/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem b/lib/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
deleted file mode 100644
index 4b8939ccba..0000000000
--- a/lib/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
-ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
-KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
-ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
-MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
-ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
-b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
-U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
-I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
-wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
-AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
-oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
-BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
-dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
-MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
-MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
-E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
-MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
-hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
-95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
-2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
diff --git a/lib/rubygems/ssl_certs/GeoTrustGlobalCA.pem b/lib/rubygems/ssl_certs/GeoTrustGlobalCA.pem
deleted file mode 100644
index bcb2529761..0000000000
--- a/lib/rubygems/ssl_certs/GeoTrustGlobalCA.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
diff --git a/lib/rubygems/ssl_certs/ca-bundle.pem b/lib/rubygems/ssl_certs/ca-bundle.pem
new file mode 100644
index 0000000000..b4dac9112f
--- /dev/null
+++ b/lib/rubygems/ssl_certs/ca-bundle.pem
@@ -0,0 +1,3366 @@
+##
+## ca-bundle.crt -- Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Sun Feb 19 04:03:37 2012
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt). This file can be found in the mozilla source tree:
+## https://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.82 $ $Date: 2012/02/18 21:41:46 $
+
+GTE CyberTrust Global Root
+==========================
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
+Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
+A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
+MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
+Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
+IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
+sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
+HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
+AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
+M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
+NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+Thawte Server CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
+dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
+AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
+b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
+BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
+c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
+A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
+/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
+1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
+GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
+GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+Thawte Premium Server CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
+dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
+AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
+ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
+AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
+VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
+aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
+cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
+Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
+qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
+SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
+8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
+UCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+Equifax Secure CA
+=================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
+ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
+MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
+B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
+fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
+8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
+A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
+CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
+A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
+spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
+Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
+zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
+BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
+70+sB3c4
+-----END CERTIFICATE-----
+
+Digital Signature Trust Co. Global CA 1
+=======================================
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
+ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
+MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
+NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
+o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
+BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
+IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
+MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
+BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
+kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
+RbyhkwS7hp86W0N6w4pl
+-----END CERTIFICATE-----
+
+Digital Signature Trust Co. Global CA 3
+=======================================
+-----BEGIN CERTIFICATE-----
+MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
+ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
+MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
+IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
+VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
+xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
+BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
+dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
+IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
+MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
+BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
+AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
+up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
+mPnHfxsb1gYgAlihw6ID
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
+TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
+WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
+Tqj/ZA1k
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G2
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
+FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
+lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
+1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
+Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
+-----END CERTIFICATE-----
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+ValiCert Class 1 VA
+===================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
+MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
+GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
+DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
+lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
+icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
+Orf1LXLI
+-----END CERTIFICATE-----
+
+ValiCert Class 2 VA
+===================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
+MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
+CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
+ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
+SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
+UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
+W9ViH0Pd
+-----END CERTIFICATE-----
+
+RSA Root Certificate 1
+======================
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
+b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
+bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
+MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
+d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
+UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
+LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
+3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
+BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
+3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
+V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
+on+jjBXu
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Verisign Class 4 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
+tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
+8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
+Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
+Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
+mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
+RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
+UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+Entrust.net Secure Server CA
+============================
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
+BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
+cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
+ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
+A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
+eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
+dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
+aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
+gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
+ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
+CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
+dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
+NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
+HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
+BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
+Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
+n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
+AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
+gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
+AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
+oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
+o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
+2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
+OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+Equifax Secure Global eBusiness CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
+bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
+HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
+b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
+PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
+qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
+hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
+BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
+MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
+I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
+NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 1
+=============================
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
+LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
+ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
+IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
+1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
+IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
+MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
+Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
+AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
+lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+Equifax Secure eBusiness CA 2
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
+ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
+MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
+DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
+2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
+BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
+A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
+JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
+A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
+uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
+Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
+jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
+78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
+V+GRMOrN
+-----END CERTIFICATE-----
+
+AddTrust Low-Value Services Root
+================================
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
+cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
+CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
+ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
+54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
+oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
+Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
+GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
+HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
+RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
+HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
+ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
+iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
+mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
+ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+AddTrust Public Services Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
+cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
+BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
+dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
+nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
+d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
+Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
+HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
+A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
+A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
+JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
+Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
+EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+AddTrust Qualified Certificates Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
+cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
+CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
+IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
+64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
+KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
+L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
+wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
+MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
+BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
+azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
+GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
+RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
+iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+RSA Security 2048 v3
+====================
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
+ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
+MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
+BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
+Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
+WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
+KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
++Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
+MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
+FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
+v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
+0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
+VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
+nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
+pKnXwiJPZ9d37CAFYd4=
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Global CA 2
+====================
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
+MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
+NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
+LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
+Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
+HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
+K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
+srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
+ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
+OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
+x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
+H4z1Ir+rzoPz4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+America Online Root Certification Authority 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
+A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
+T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
+v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
+DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
+sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
+8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
+o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
+GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
+VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
+3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
+Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
+-----END CERTIFICATE-----
+
+America Online Root Certification Authority 2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
+QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
+A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
+T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
+fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
+f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
+qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
+RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
+gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
+6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
+FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
+Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
+B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
+aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
+T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
++DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
+JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
+zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
+ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
+1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
+GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
+Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
+cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Certum Root CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
+ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
+Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
+by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
+wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
+kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
+89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
+Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
+NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
+GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
+0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
+qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+Comodo Secure Services root
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
+MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
+Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
+BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
+9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
+rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
+oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
+p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
+FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
+YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
+aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
+4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
+DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
+pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
+RR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+Comodo Trusted Services root
+============================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
+MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
+bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
+IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
+3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
+/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
+juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
+ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
+DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
+ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
+cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
+uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
+BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
+R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
+9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA
+=============================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
+ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
+HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
+bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
+vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
+jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
+C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
+vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
+22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
+HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
+dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
+BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
+EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
+MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
+nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+TDC Internet Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE
+ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx
+NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu
+ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j
+xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL
+znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc
+5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6
+otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI
+AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM
+VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM
+MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC
+AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe
+UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G
+CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m
+gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb
+O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU
+Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+TDC OCES Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UE
+ChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5
+MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuH
+nEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0
+zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvV
+iGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBde
+dObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO
+3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB
+5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5k
+ay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBm
+cmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZp
+Y2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4x
+LjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEM
+MAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYm
+aHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
+MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647
++RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6
+NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4
+A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYsc
+A+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9
+AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1
+AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw==
+-----END CERTIFICATE-----
+
+UTN DATACorp SGC Root CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
+BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
+MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
+HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
+dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
+raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
+wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
+9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
+33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
+DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
+BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
+LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
+DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
+I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
+EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
+DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+UTN USERFirst Hardware Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
+BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
+OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
+eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
+ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
+wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
+tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
+i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
+Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
+gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
+UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
+BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
+XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
+lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
+iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
+nfhmqA==
+-----END CERTIFICATE-----
+
+Camerfirma Chambers of Commerce Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
+NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
+cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
+MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
+AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
+xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
+NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
+DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
+d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
+cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
+AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
+bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
+VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
+fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
+L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
+UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
+ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
+erfutGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+Camerfirma Global Chambersign Root
+==================================
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
+NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
+YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
+MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
+ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
+1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
+by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
+6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
+8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
+BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
+aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
+Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
+aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
+ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
+PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
+gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
+PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
+IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
+t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+NetLock Notary (Class A) Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
+EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
+ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
+DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
+EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
+VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
+cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
+D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
+z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
+/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
+tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
+4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
+A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
+Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
+bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
+LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
+ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
+IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
+IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
+b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
+Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
+bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
+ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
+ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
+CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
+KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
+8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+NetLock Business (Class B) Root
+===============================
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
+VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
+VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
+bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
+VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
+o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
+1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
+HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
+RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
+dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
+ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
+c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
+YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
+Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
+bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
+IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
+YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
+cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
+43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
+stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+NetLock Express (Class C) Root
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
+CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
+BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
+BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
+dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
+ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
+W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
+euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
+DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
+RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
+YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
+IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
+aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
+ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
+emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
+IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
+UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
+YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
+xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
+gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
+YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
+AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
+Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
+U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
+LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
+cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
+dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
+AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
+3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
+vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
+fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
+fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
+EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
+1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
+lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
+g14=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+Firmaprofesional Root CA
+========================
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT
+GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp
+Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA
+ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL
+MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT
+OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2
+ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V
+j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH
+lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf
+3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8
+NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww
+KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG
+AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD
+ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf
+wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
+7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG
+VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+Wells Fargo Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
+BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
+bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
+MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
+x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
+E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
+OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
+sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
+YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
+BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
+ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
+m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
+OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
+x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
+tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 1
+==================
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
+EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
+dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
+MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
+aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
+MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
+NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
+AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
+b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
+7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
+cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
+WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
+haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
+MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
+MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
+jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
+MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
+VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
+vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
+OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
+1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
+nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
+x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
+NY6E0F/6MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+DST ACES CA X6
+==============
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
+MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
+MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
+CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
+DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
+pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
+GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
+MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
+Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
+dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
+CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
+5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
+Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
+vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
+oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 1
+==============================================
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
+MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
+acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
+MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
+TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
+aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
+yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
+Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
+8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
+W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
+BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
+sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
+q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
+nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
+MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
+dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
+LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
+x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
+QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
+5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
+AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
+Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
+9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
+UrbnBEI=
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+WellsSecure Public Root Certificate Authority
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
+F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
+NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
+bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
+VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
+iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
+i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
+bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
+K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
+AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
+cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
+lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
+i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
+GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
+K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
+bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
+qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
+E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
+tylv2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+IGC/A
+=====
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
+VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
+Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
+MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
+EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
+STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
+TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
+So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
+HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
+frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
+tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
+egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
+iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
+q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
+MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
+lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
+0mBWWg==
+-----END CERTIFICATE-----
+
+Security Communication EV RootCA1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
+BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
+Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
+/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
+WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
+ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
+bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
+9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
+iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
+Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
+mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
+T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
+BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
+EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
+MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
+dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
+GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
+d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
+oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
+QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
+PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
+MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
+IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
+VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
+LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
+dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
+4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
+AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
+egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
+Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
+PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
+c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
+cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
+IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
+WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
+MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
+Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
+HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
+nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
+aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
+yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
+S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
+======================================
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
+AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
+LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
+HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
+U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
+IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
+yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
+2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
+4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
+2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
+8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
+HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
+Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
+5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
+czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
+ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
+BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
+cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
+AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
+EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
+/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
+MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
+3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
+eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
+/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
+RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
+Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+TC TrustCenter Class 2 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
+MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
+IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
+xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
+Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
+SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
+dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
+KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
+TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
+JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
+vQ==
+-----END CERTIFICATE-----
+
+TC TrustCenter Class 3 CA II
+============================
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
+IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
+MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
+c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
+AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
+yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
+6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
+uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
+2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
+7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
+Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
+cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
+SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
+O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
+yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
+IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
+092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
+5A==
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA I
+=============================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
+MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
+VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
+JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
+qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
+xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
+ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
+gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
+BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
+1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
+vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
+ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
+7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+ComSign Secured CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
+AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
+NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
+QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
+49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
+7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
+kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
+9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
+AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
+U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
+j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
+AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
+BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
+FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
+51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+Buypass Class 2 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
+MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
+cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
+0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
+0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
+uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
+1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
+7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
+fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
+wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+Buypass Class 3 CA 1
+====================
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
+MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
+c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
+ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
+n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
+AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
+1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
+pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
+EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
+htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
+el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
+==========================================================================
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
+QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
+Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
+IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
+X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
+gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
+eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
+TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
+Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
+uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
+qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
+ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
+Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
+Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
+FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
+zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
+XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
+bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
+RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
+1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
+2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
+Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
+AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+============================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+CA Disig
+========
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
+QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
+MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
+bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
+GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
+Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
+hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
+ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
+gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
+AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
+aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
+ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
+BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
+WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
+mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
+ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
+4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+Juur-SK
+=======
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
+c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
+DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
+SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
+aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
+TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
++Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
+UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
+Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
+MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
+HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
+AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
+cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
+AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
+cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
+A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
+ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
+abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
+IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
+Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
+yyqcjg==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
+T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
+MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
+A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
+WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
+YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
+MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
+m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
+HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
+xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
+3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
+2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
+TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
+4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
+9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
+aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
+eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
+zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
+ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
+KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
+nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
+I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
+MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
+tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
+XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
+f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
+hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
+CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
+bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
+D/xwzoiQ
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+===================================================
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
+ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
+MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
+cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
+aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
+8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
+jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
+JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
+9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
+SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
+F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
+D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
+Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+TC TrustCenter Universal CA III
+===============================
+-----BEGIN CERTIFICATE-----
+MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
+IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
+Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
+QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
+KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
+QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
+juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
+CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
+M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
+A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
+g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
+KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
+BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
+CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
+woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - Autorité Racine
+=============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+Root CA Generalitat Valenciana
+==============================
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
+ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
+IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
+WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
+CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
+F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
+ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
+D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
+JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
+AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
+dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
+ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
+AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
+YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
+AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
+AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
+YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
+AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
+OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
+dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
+BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
+b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
+TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
+Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
+NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
+iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
++GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+A-Trust-nQual-03
+================
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
+Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
+a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
+dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
+RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
+ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
+c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
+zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
+yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
+SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
+iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
+cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
+eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
+ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
+sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
+JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
+ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
diff --git a/lib/rubygems/syck_hack.rb b/lib/rubygems/syck_hack.rb
deleted file mode 100644
index 5356aa081e..0000000000
--- a/lib/rubygems/syck_hack.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# :stopdoc:
-
-# Hack to handle syck's DefaultKey bug
-#
-# This file is always loaded AFTER either syck or psych are already
-# loaded. It then looks at what constants are available and creates
-# a consistent view on all rubys.
-#
-# All this is so that there is always a YAML::Syck::DefaultKey
-# class no matter if the full yaml library has loaded or not.
-#
-
-module YAML
- # In newer 1.9.2, there is a Syck toplevel constant instead of it
- # being underneith YAML. If so, reference it back under YAML as
- # well.
- if defined? ::Syck
- # for tests that change YAML::ENGINE
- # 1.8 does not support the second argument to const_defined?
- remove_const :Syck rescue nil
-
- Syck = ::Syck
-
- # JRuby's "Syck" is called "Yecht"
- elsif defined? YAML::Yecht
- Syck = YAML::Yecht
-
- # Otherwise, if there is no YAML::Syck, then we've got just psych
- # loaded, so lets define a stub for DefaultKey.
- elsif !defined? YAML::Syck
- module Syck
- class DefaultKey
- end
- end
- end
-
- # Now that we've got something that is always here, define #to_s
- # so when code tries to use this, it at least just shows up like it
- # should.
- module Syck
- class DefaultKey
- remove_method :to_s rescue nil
-
- def to_s
- '='
- end
- end
- end
-
- SyntaxError = Error unless defined? SyntaxError
-end
-
-# Sometime in the 1.9 dev cycle, the Syck constant was moved from under YAML
-# to be a toplevel constant. So gemspecs created under these versions of Syck
-# will have references to Syck::DefaultKey.
-#
-# So we need to be sure that we reference Syck at the toplevel too so that
-# we can always load these kind of gemspecs.
-#
-if !defined?(Syck)
- Syck = YAML::Syck
-end
-
-# Now that we've got Syck setup in all the right places, store
-# a reference to the DefaultKey class inside Gem. We do this so that
-# if later on YAML, etc are redefined, we've still got a consistent
-# place to find the DefaultKey class for comparison.
-
-module Gem
- # for tests that change YAML::ENGINE
- remove_const :SyckDefaultKey if const_defined? :SyckDefaultKey
-
- SyckDefaultKey = YAML::Syck::DefaultKey
-end
-
-# :startdoc:
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
deleted file mode 100644
index 7d087afade..0000000000
--- a/lib/rubygems/test_case.rb
+++ /dev/null
@@ -1,1116 +0,0 @@
-# TODO: $SAFE = 1
-
-begin
- gem 'minitest', '~> 4.0'
-rescue NoMethodError
- # for ruby tests
-end
-
-if defined? Gem::QuickLoader
- Gem::QuickLoader.load_full_rubygems_library
-else
- require 'rubygems'
-end
-
-begin
- gem 'minitest'
-rescue Gem::LoadError
-end
-
-# We have to load these up front because otherwise we'll try to load
-# them while we're testing rubygems, and thus we can't actually load them.
-unless Gem::Dependency.new('rdoc', '>= 3.10').matching_specs.empty?
- gem 'rdoc'
- gem 'json'
-end
-
-require 'rubygems/deprecate'
-require 'minitest/autorun'
-require 'fileutils'
-require 'tmpdir'
-require 'uri'
-require 'rubygems/package'
-require 'rubygems/test_utilities'
-require 'pp'
-require 'zlib'
-require 'pathname'
-require 'shellwords'
-Gem.load_yaml
-
-require 'rubygems/mock_gem_ui'
-
-module Gem
-
- ##
- # Allows setting the gem path searcher. This method is available when
- # requiring 'rubygems/test_case'
-
- def self.searcher=(searcher)
- @searcher = searcher
- end
-
- ##
- # Allows toggling Windows behavior. This method is available when requiring
- # 'rubygems/test_case'
-
- def self.win_platform=(val)
- @@win_platform = val
- end
-
- ##
- # Allows setting path to ruby. This method is available when requiring
- # 'rubygems/test_case'
-
- def self.ruby= ruby
- @ruby = ruby
- end
-
- ##
- # When rubygems/test_case is required the default user interaction is a
- # MockGemUi.
-
- module DefaultUserInteraction
- @ui = Gem::MockGemUi.new
- end
-end
-
-##
-# RubyGemTestCase provides a variety of methods for testing rubygems and
-# gem-related behavior in a sandbox. Through RubyGemTestCase you can install
-# and uninstall gems, fetch remote gems through a stub fetcher and be assured
-# your normal set of gems is not affected.
-#
-# Tests are always run at a safe level of 1.
-
-class Gem::TestCase < MiniTest::Unit::TestCase
-
- # TODO: move to minitest
- def assert_path_exists path, msg = nil
- msg = message(msg) { "Expected path '#{path}' to exist" }
- assert File.exist?(path), msg
- end
-
- # TODO: move to minitest
- def refute_path_exists path, msg = nil
- msg = message(msg) { "Expected path '#{path}' to not exist" }
- refute File.exist?(path), msg
- end
-
- def scan_make_command_lines(output)
- output.scan(/^#{Regexp.escape make_command}(?:[[:blank:]].*)?$/)
- end
-
- def parse_make_command_line(line)
- command, *args = line.shellsplit
-
- targets = []
- macros = {}
-
- args.each do |arg|
- case arg
- when /\A(\w+)=/
- macros[$1] = $'
- else
- targets << arg
- end
- end
-
- targets << '' if targets.empty?
-
- {
- :command => command,
- :targets => targets,
- :macros => macros,
- }
- end
-
- def assert_contains_make_command(target, output, msg = nil)
- if output.match(/\n/)
- msg = message(msg) {
- 'Expected output containing make command "%s": %s' % [
- ('%s %s' % [make_command, target]).rstrip,
- output.inspect
- ]
- }
- else
- msg = message(msg) {
- 'Expected make command "%s": %s' % [
- ('%s %s' % [make_command, target]).rstrip,
- output.inspect
- ]
- }
- end
-
- assert scan_make_command_lines(output).any? { |line|
- make = parse_make_command_line(line)
-
- if make[:targets].include?(target)
- yield make, line if block_given?
- true
- else
- false
- end
- }, msg
- end
-
- include Gem::DefaultUserInteraction
-
- undef_method :default_test if instance_methods.include? 'default_test' or
- instance_methods.include? :default_test
-
- @@project_dir = Dir.pwd.untaint unless defined?(@@project_dir)
-
- @@initial_reset = false
-
- ##
- # #setup prepares a sandboxed location to install gems. All installs are
- # directed to a temporary directory. All install plugins are removed.
- #
- # If the +RUBY+ environment variable is set the given path is used for
- # Gem::ruby. The local platform is set to <tt>i386-mswin32</tt> for Windows
- # or <tt>i686-darwin8.10.1</tt> otherwise.
- #
- # If the +KEEP_FILES+ environment variable is set the files will not be
- # removed from <tt>/tmp/test_rubygems_#{$$}.#{Time.now.to_i}</tt>.
-
- def setup
- super
-
- @orig_gem_home = ENV['GEM_HOME']
- @orig_gem_path = ENV['GEM_PATH']
-
- @current_dir = Dir.pwd
- @ui = Gem::MockGemUi.new
-
- tmpdir = File.expand_path Dir.tmpdir
- tmpdir.untaint
-
- if ENV['KEEP_FILES'] then
- @tempdir = File.join(tmpdir, "test_rubygems_#{$$}.#{Time.now.to_i}")
- else
- @tempdir = File.join(tmpdir, "test_rubygems_#{$$}")
- end
- @tempdir.untaint
-
- FileUtils.mkdir_p @tempdir
-
- # This makes the tempdir consistent on OS X.
- # File.expand_path Dir.tmpdir #=> "/var/..."
- # Dir.chdir Dir.tmpdir do File.expand_path '.' end #=> "/private/var/..."
- # TODO use File#realpath above instead of #expand_path once 1.8 support is
- # dropped.
- Dir.chdir @tempdir do
- @tempdir = File.expand_path '.'
- @tempdir.untaint
- end
-
- @gemhome = File.join @tempdir, 'gemhome'
- @userhome = File.join @tempdir, 'userhome'
-
- @orig_ruby = if ENV['RUBY'] then
- ruby = Gem.instance_variable_get :@ruby
- Gem.instance_variable_set :@ruby, ENV['RUBY']
- ruby
- end
-
- Gem.ensure_gem_subdirectories @gemhome
-
- @orig_LOAD_PATH = $LOAD_PATH.dup
- $LOAD_PATH.map! { |s| File.expand_path(s).untaint }
-
- Dir.chdir @tempdir
-
- @orig_ENV_HOME = ENV['HOME']
- ENV['HOME'] = @userhome
- Gem.instance_variable_set :@user_home, nil
-
- FileUtils.mkdir_p @gemhome
- FileUtils.mkdir_p @userhome
-
- @default_dir = File.join @tempdir, 'default'
- @default_spec_dir = File.join @default_dir, "specifications", "default"
- Gem.instance_variable_set :@default_dir, @default_dir
- FileUtils.mkdir_p @default_spec_dir
-
- # We use Gem::Specification.reset the first time only so that if there
- # are unresolved deps that leak into the whole test suite, they're at least
- # reported once.
- if @@initial_reset
- Gem::Specification.unresolved_deps.clear # done to avoid cross-test warnings
- else
- @@initial_reset = true
- Gem::Specification.reset
- end
- Gem.use_paths(@gemhome)
-
- Gem::Security.reset
-
- Gem.loaded_specs.clear
- Gem.clear_default_specs
- Gem::Specification.unresolved_deps.clear
-
- Gem.configuration.verbose = true
- Gem.configuration.update_sources = true
-
- Gem::RemoteFetcher.fetcher = Gem::FakeFetcher.new
-
- @gem_repo = "http://gems.example.com/"
- @uri = URI.parse @gem_repo
- Gem.sources.replace [@gem_repo]
-
- Gem.searcher = nil
- Gem::SpecFetcher.fetcher = nil
- @orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
- Gem::ConfigMap[:BASERUBY] = Gem::ConfigMap[:ruby_install_name]
-
- @orig_arch = Gem::ConfigMap[:arch]
-
- if win_platform?
- util_set_arch 'i386-mswin32'
- else
- util_set_arch 'i686-darwin8.10.1'
- end
-
- @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
-
- # TODO: move to installer test cases
- Gem.post_build_hooks.clear
- Gem.post_install_hooks.clear
- Gem.done_installing_hooks.clear
- Gem.post_reset_hooks.clear
- Gem.post_uninstall_hooks.clear
- Gem.pre_install_hooks.clear
- Gem.pre_reset_hooks.clear
- Gem.pre_uninstall_hooks.clear
-
- # TODO: move to installer test cases
- Gem.post_build do |installer|
- @post_build_hook_arg = installer
- true
- end
-
- Gem.post_install do |installer|
- @post_install_hook_arg = installer
- end
-
- Gem.post_uninstall do |uninstaller|
- @post_uninstall_hook_arg = uninstaller
- end
-
- Gem.pre_install do |installer|
- @pre_install_hook_arg = installer
- true
- end
-
- Gem.pre_uninstall do |uninstaller|
- @pre_uninstall_hook_arg = uninstaller
- end
- end
-
- ##
- # #teardown restores the process to its original state and removes the
- # tempdir unless the +KEEP_FILES+ environment variable was set.
-
- def teardown
- $LOAD_PATH.replace @orig_LOAD_PATH if @orig_LOAD_PATH
-
- Gem::ConfigMap[:BASERUBY] = @orig_BASERUBY
- Gem::ConfigMap[:arch] = @orig_arch
-
- if defined? Gem::RemoteFetcher then
- Gem::RemoteFetcher.fetcher = nil
- end
-
- Dir.chdir @current_dir
-
- FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']
-
- ENV['GEM_HOME'] = @orig_gem_home
- ENV['GEM_PATH'] = @orig_gem_path
-
- _ = @orig_ruby
- Gem.instance_variable_set :@ruby, @orig_ruby if @orig_ruby
-
- if @orig_ENV_HOME then
- ENV['HOME'] = @orig_ENV_HOME
- else
- ENV.delete 'HOME'
- end
-
- Gem.instance_variable_set :@default_dir, nil
- end
-
- ##
- # Builds and installs the Gem::Specification +spec+
-
- def install_gem spec, options = {}
- require 'rubygems/installer'
-
- gem = File.join @tempdir, "gems", "#{spec.full_name}.gem"
-
- unless File.exists? gem
- use_ui Gem::MockGemUi.new do
- Dir.chdir @tempdir do
- Gem::Package.build spec
- end
- end
-
- gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
- end
-
- Gem::Installer.new(gem, options.merge({:wrappers => true})).install
- end
-
- ##
- # Builds and installs the Gem::Specification +spec+ into the user dir
-
- def install_gem_user spec
- install_gem spec, :user_install => true
- end
-
- ##
- # Uninstalls the Gem::Specification +spec+
- def uninstall_gem spec
- require 'rubygems/uninstaller'
-
- Gem::Uninstaller.new(spec.name,
- :executables => true, :user_install => true).uninstall
- end
-
- ##
- # creates a temporary directory with hax
- # TODO: deprecate and remove
-
- def create_tmpdir
- tmpdir = nil
- Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
- tmpdir = File.join tmpdir, "test_rubygems_#{$$}"
- FileUtils.mkdir_p tmpdir
- return tmpdir
- end
-
- ##
- # Enables pretty-print for all tests
-
- def mu_pp(obj)
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding(Encoding.default_external) if defined? Encoding
- s.chomp
- end
-
- ##
- # Reads a Marshal file at +path+
-
- def read_cache(path)
- open path.dup.untaint, 'rb' do |io|
- Marshal.load io.read
- end
- end
-
- ##
- # Reads a binary file at +path+
-
- def read_binary(path)
- Gem.read_binary path
- end
-
- ##
- # Writes a binary file to +path+ which is relative to +@gemhome+
-
- def write_file(path)
- path = File.join @gemhome, path unless Pathname.new(path).absolute?
- dir = File.dirname path
- FileUtils.mkdir_p dir
-
- open path, 'wb' do |io|
- yield io if block_given?
- end
-
- path
- end
-
- def all_spec_names
- Gem::Specification.map(&:full_name)
- end
-
- ##
- # Creates a Gem::Specification with a minimum of extra work. +name+ and
- # +version+ are the gem's name and version, platform, author, email,
- # homepage, summary and description are defaulted. The specification is
- # yielded for customization.
- #
- # The gem is added to the installed gems in +@gemhome+ and the runtime.
- #
- # Use this with #write_file to build an installed gem.
-
- def quick_gem(name, version='2')
- require 'rubygems/specification'
-
- spec = Gem::Specification.new do |s|
- s.platform = Gem::Platform::RUBY
- s.name = name
- s.version = version
- s.author = 'A User'
- s.email = 'example@example.com'
- s.homepage = 'http://example.com'
- s.summary = "this is a summary"
- s.description = "This is a test description"
-
- yield(s) if block_given?
- end
-
- Gem::Specification.map # HACK: force specs to (re-)load before we write
-
- written_path = write_file spec.spec_file do |io|
- io.write spec.to_ruby_for_cache
- end
-
- spec.loaded_from = spec.loaded_from = written_path
-
- Gem::Specification.add_spec spec.for_cache
-
- return spec
- end
-
- def quick_spec name, version = '2'
- # TODO: deprecate
- require 'rubygems/specification'
-
- spec = Gem::Specification.new do |s|
- s.platform = Gem::Platform::RUBY
- s.name = name
- s.version = version
- s.author = 'A User'
- s.email = 'example@example.com'
- s.homepage = 'http://example.com'
- s.summary = "this is a summary"
- s.description = "This is a test description"
-
- yield(s) if block_given?
- end
-
- spec.loaded_from = spec.spec_file
-
- Gem::Specification.add_spec spec
-
- return spec
- end
-
- ##
- # Builds a gem from +spec+ and places it in <tt>File.join @gemhome,
- # 'cache'</tt>. Automatically creates files based on +spec.files+
-
- def util_build_gem(spec)
- dir = spec.gem_dir
- FileUtils.mkdir_p dir
-
- Dir.chdir dir do
- spec.files.each do |file|
- next if File.exist? file
- FileUtils.mkdir_p File.dirname(file)
- File.open file, 'w' do |fp| fp.puts "# #{file}" end
- end
-
- use_ui Gem::MockGemUi.new do
- Gem::Package.build spec
- end
-
- cache = spec.cache_file
- FileUtils.mv File.basename(cache), cache
- end
- end
-
- def util_remove_gem(spec)
- FileUtils.rm_rf spec.cache_file
- FileUtils.rm_rf spec.spec_file
- end
-
- ##
- # Removes all installed gems from +@gemhome+.
-
- def util_clear_gems
- FileUtils.rm_rf File.join(@gemhome, "gems") # TODO: use Gem::Dirs
- FileUtils.rm_rf File.join(@gemhome, "specifications")
- Gem::Specification.reset
- end
-
- ##
- # Install the provided specs
-
- def install_specs(*specs)
- Gem::Specification.add_specs(*specs)
- Gem.searcher = nil
- end
-
- ##
- # Installs the provided default specs including writing the spec file
-
- def install_default_gems(*specs)
- install_default_specs(*specs)
-
- specs.each do |spec|
- open spec.loaded_from, 'w' do |io|
- io.write spec.to_ruby_for_cache
- end
- end
- end
-
- ##
- # Install the provided default specs
-
- def install_default_specs(*specs)
- install_specs(*specs)
- specs.each do |spec|
- Gem.register_default_spec(spec)
- end
- end
-
- ##
- # Create a new spec (or gem if passed an array of files) and set it
- # up properly. Use this instead of util_spec and util_gem.
-
- def new_spec name, version, deps = nil, *files
- require 'rubygems/specification'
-
- spec = Gem::Specification.new do |s|
- s.platform = Gem::Platform::RUBY
- s.name = name
- s.version = version
- s.author = 'A User'
- s.email = 'example@example.com'
- s.homepage = 'http://example.com'
- s.summary = "this is a summary"
- s.description = "This is a test description"
-
- Array(deps).each do |n, req|
- s.add_dependency n, (req || '>= 0')
- end
-
- s.files.push(*files) unless files.empty?
-
- yield s if block_given?
- end
-
- spec.loaded_from = spec.spec_file
-
- unless files.empty? then
- write_file spec.spec_file do |io|
- io.write spec.to_ruby_for_cache
- end
-
- util_build_gem spec
-
- cache_file = File.join @tempdir, 'gems', "#{spec.full_name}.gem"
- FileUtils.mkdir_p File.dirname cache_file
- FileUtils.mv spec.cache_file, cache_file
- FileUtils.rm spec.spec_file
- end
-
- spec
- end
-
- def new_default_spec(name, version, deps = nil, *files)
- spec = new_spec(name, version, deps)
- spec.loaded_from = File.join(@default_spec_dir, spec.spec_name)
- spec.files = files
-
- lib_dir = File.join(@tempdir, "default_gems", "lib")
- $LOAD_PATH.unshift(lib_dir)
- files.each do |file|
- rb_path = File.join(lib_dir, file)
- FileUtils.mkdir_p(File.dirname(rb_path))
- File.open(rb_path, "w") do |rb|
- rb << "# #{file}"
- end
- end
-
- spec
- end
-
- ##
- # Creates a spec with +name+, +version+ and +deps+.
-
- def util_spec(name, version, deps = nil, &block)
- # TODO: deprecate
- raise "deps or block, not both" if deps and block
-
- if deps then
- block = proc do |s|
- # Since Hash#each is unordered in 1.8, sort
- # the keys and iterate that way so the tests are
- # deteriminstic on all implementations.
- deps.keys.sort.each do |n|
- s.add_dependency n, (deps[n] || '>= 0')
- end
- end
- end
-
- quick_spec(name, version, &block)
- end
-
- ##
- # Creates a gem with +name+, +version+ and +deps+. The specification will
- # be yielded before gem creation for customization. The gem will be placed
- # in <tt>File.join @tempdir, 'gems'</tt>. The specification and .gem file
- # location are returned.
-
- def util_gem(name, version, deps = nil, &block)
- # TODO: deprecate
- raise "deps or block, not both" if deps and block
-
- if deps then
- block = proc do |s|
- # Since Hash#each is unordered in 1.8, sort
- # the keys and iterate that way so the tests are
- # deterministic on all implementations.
- deps.keys.sort.each do |n|
- s.add_dependency n, (deps[n] || '>= 0')
- end
- end
- end
-
- spec = quick_gem(name, version, &block)
-
- util_build_gem spec
-
- cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
- FileUtils.mkdir_p File.dirname cache_file
- FileUtils.mv spec.cache_file, cache_file
- FileUtils.rm spec.spec_file
-
- spec.loaded_from = nil
-
- [spec, cache_file]
- end
-
- ##
- # Gzips +data+.
-
- def util_gzip(data)
- out = StringIO.new
-
- Zlib::GzipWriter.wrap out do |io|
- io.write data
- end
-
- out.string
- end
-
- ##
- # Creates several default gems which all have a lib/code.rb file. The gems
- # are not installed but are available in the cache dir.
- #
- # +@a1+:: gem a version 1, this is the best-described gem.
- # +@a2+:: gem a version 2
- # +@a3a:: gem a version 3.a
- # +@a_evil9+:: gem a_evil version 9, use this to ensure similarly-named gems
- # don't collide with a.
- # +@b2+:: gem b version 2
- # +@c1_2+:: gem c version 1.2
- # +@pl1+:: gem pl version 1, this gem has a legacy platform of i386-linux.
- #
- # Additional +prerelease+ gems may also be created:
- #
- # +@a2_pre+:: gem a version 2.a
- # TODO: nuke this and fix tests. this should speed up a lot
-
- def util_make_gems(prerelease = false)
- @a1 = quick_gem 'a', '1' do |s|
- s.files = %w[lib/code.rb]
- s.require_paths = %w[lib]
- s.date = Gem::Specification::TODAY - 86400
- s.homepage = 'http://a.example.com'
- s.email = %w[example@example.com example2@example.com]
- s.authors = %w[Example Example2]
- s.description = <<-DESC
-This line is really, really long. So long, in fact, that it is more than eighty characters long! The purpose of this line is for testing wrapping behavior because sometimes people don't wrap their text to eighty characters. Without the wrapping, the text might not look good in the RSS feed.
-
-Also, a list:
- * An entry that\'s actually kind of sort
- * an entry that\'s really long, which will probably get wrapped funny. That's ok, somebody wasn't thinking straight when they made it more than eighty characters.
- DESC
- end
-
- init = proc do |s|
- s.files = %w[lib/code.rb]
- s.require_paths = %w[lib]
- end
-
- @a2 = quick_gem('a', '2', &init)
- @a3a = quick_gem('a', '3.a', &init)
- @a_evil9 = quick_gem('a_evil', '9', &init)
- @b2 = quick_gem('b', '2', &init)
- @c1_2 = quick_gem('c', '1.2', &init)
- @x = quick_gem('x', '1', &init)
- @dep_x = quick_gem('dep_x', '1') do |s|
- s.files = %w[lib/code.rb]
- s.require_paths = %w[lib]
- s.add_dependency 'x', '>= 1'
- end
-
- @pl1 = quick_gem 'pl', '1' do |s| # l for legacy
- s.files = %w[lib/code.rb]
- s.require_paths = %w[lib]
- s.platform = Gem::Platform.new 'i386-linux'
- s.instance_variable_set :@original_platform, 'i386-linux'
- end
-
- if prerelease
- @a2_pre = quick_gem('a', '2.a', &init)
- write_file File.join(*%W[gems #{@a2_pre.original_name} lib code.rb])
- util_build_gem @a2_pre
- end
-
- write_file File.join(*%W[gems #{@a1.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@a2.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@a3a.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@b2.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@c1_2.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@pl1.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@x.original_name} lib code.rb])
- write_file File.join(*%W[gems #{@dep_x.original_name} lib code.rb])
-
- [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2, @pl1, @x, @dep_x].each do |spec|
- util_build_gem spec
- end
-
- FileUtils.rm_r File.join(@gemhome, "gems", @pl1.original_name)
- end
-
- ##
- # Set the platform to +arch+
-
- def util_set_arch(arch)
- Gem::ConfigMap[:arch] = arch
- platform = Gem::Platform.new arch
-
- Gem.instance_variable_set :@platforms, nil
- Gem::Platform.instance_variable_set :@local, nil
-
- platform
- end
-
- ##
- # Sets up a fake fetcher using the gems from #util_make_gems. Optionally
- # additional +prerelease+ gems may be included.
- #
- # Gems created by this method may be fetched using Gem::RemoteFetcher.
-
- def util_setup_fake_fetcher(prerelease = false)
- require 'zlib'
- require 'socket'
- require 'rubygems/remote_fetcher'
-
- @fetcher = Gem::FakeFetcher.new
-
- util_make_gems(prerelease)
- Gem::Specification.reset
-
- @all_gems = [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2].sort
- @all_gem_names = @all_gems.map { |gem| gem.full_name }
-
- gem_names = [@a1.full_name, @a2.full_name, @a3a.full_name, @b2.full_name]
- @gem_names = gem_names.sort.join("\n")
-
- Gem::RemoteFetcher.fetcher = @fetcher
- end
-
- ##
- # Add +spec+ to +@fetcher+ serving the data in the file +path+.
- # +repo+ indicates which repo to make +spec+ appear to be in.
-
- def add_to_fetcher(spec, path=nil, repo=@gem_repo)
- path ||= spec.cache_file
- @fetcher.data["#{@gem_repo}gems/#{spec.file_name}"] = read_binary(path)
- end
-
- ##
- # Sets up Gem::SpecFetcher to return information from the gems in +specs+.
- # Best used with +@all_gems+ from #util_setup_fake_fetcher.
-
- def util_setup_spec_fetcher(*specs)
- specs -= Gem::Specification._all
- Gem::Specification.add_specs(*specs)
-
- spec_fetcher = Gem::SpecFetcher.fetcher
-
- prerelease, all = Gem::Specification.partition { |spec|
- spec.version.prerelease?
- }
-
- spec_fetcher.specs[@uri] = []
- all.each do |spec|
- spec_fetcher.specs[@uri] << spec.name_tuple
- end
-
- spec_fetcher.latest_specs[@uri] = []
- Gem::Specification.latest_specs.each do |spec|
- spec_fetcher.latest_specs[@uri] << spec.name_tuple
- end
-
- spec_fetcher.prerelease_specs[@uri] = []
- prerelease.each do |spec|
- spec_fetcher.prerelease_specs[@uri] << spec.name_tuple
- end
-
- v = Gem.marshal_version
-
- Gem::Specification.each do |spec|
- path = "#{@gem_repo}quick/Marshal.#{v}/#{spec.original_name}.gemspec.rz"
- data = Marshal.dump spec
- data_deflate = Zlib::Deflate.deflate data
- @fetcher.data[path] = data_deflate
- end unless Gem::RemoteFetcher === @fetcher # HACK for test_download_to_cache
-
- nil # force errors
- end
-
- ##
- # Deflates +data+
-
- def util_zip(data)
- Zlib::Deflate.deflate data
- end
-
- ##
- # Is this test being run on a Windows platform?
-
- def self.win_platform?
- Gem.win_platform?
- end
-
- ##
- # Is this test being run on a Windows platform?
-
- def win_platform?
- Gem.win_platform?
- end
-
- ##
- # Returns whether or not we're on a version of Ruby built with VC++ (or
- # Borland) versus Cygwin, Mingw, etc.
-
- def self.vc_windows?
- RUBY_PLATFORM.match('mswin')
- end
-
- ##
- # Returns whether or not we're on a version of Ruby built with VC++ (or
- # Borland) versus Cygwin, Mingw, etc.
-
- def vc_windows?
- RUBY_PLATFORM.match('mswin')
- end
-
- ##
- # Returns the make command for the current platform. For versions of Ruby
- # built on MS Windows with VC++ or Borland it will return 'nmake'. On all
- # other platforms, including Cygwin, it will return 'make'.
-
- def self.make_command
- ENV["make"] || (vc_windows? ? 'nmake' : 'make')
- end
-
- ##
- # Returns the make command for the current platform. For versions of Ruby
- # built on MS Windows with VC++ or Borland it will return 'nmake'. On all
- # other platforms, including Cygwin, it will return 'make'.
-
- def make_command
- ENV["make"] || (vc_windows? ? 'nmake' : 'make')
- end
-
- ##
- # Returns whether or not the nmake command could be found.
-
- def nmake_found?
- system('nmake /? 1>NUL 2>&1')
- end
-
- # In case we're building docs in a background process, this method waits for
- # that process to exit (or if it's already been reaped, or never happened,
- # swallows the Errno::ECHILD error).
- def wait_for_child_process_to_exit
- Process.wait if Process.respond_to?(:fork)
- rescue Errno::ECHILD
- end
-
- ##
- # Allows tests to use a random (but controlled) port number instead of
- # a hardcoded one. This helps CI tools when running parallels builds on
- # the same builder slave.
-
- def self.process_based_port
- @@process_based_port ||= 8000 + $$ % 1000
- end
-
- ##
- # See ::process_based_port
-
- def process_based_port
- self.class.process_based_port
- end
-
- ##
- # Allows the proper version of +rake+ to be used for the test.
-
- def build_rake_in(good=true)
- gem_ruby = Gem.ruby
- Gem.ruby = @@ruby
- env_rake = ENV["rake"]
- rake = (good ? @@good_rake : @@bad_rake)
- ENV["rake"] = rake
- yield rake
- ensure
- Gem.ruby = gem_ruby
- if env_rake
- ENV["rake"] = env_rake
- else
- ENV.delete("rake")
- end
- end
-
- ##
- # Finds the path to the ruby executable
-
- def self.rubybin
- ruby = ENV["RUBY"]
- return ruby if ruby
- ruby = "ruby"
- rubyexe = "#{ruby}.exe"
-
- 3.times do
- if File.exist? ruby and File.executable? ruby and !File.directory? ruby
- return File.expand_path(ruby)
- end
- if File.exist? rubyexe and File.executable? rubyexe
- return File.expand_path(rubyexe)
- end
- ruby = File.join("..", ruby)
- end
-
- begin
- require "rbconfig"
- File.join(RbConfig::CONFIG["bindir"],
- RbConfig::CONFIG["ruby_install_name"] +
- RbConfig::CONFIG["EXEEXT"])
- rescue LoadError
- "ruby"
- end
- end
-
- @@ruby = rubybin
- @@good_rake = "#{rubybin} #{File.expand_path('../../../test/rubygems/good_rake.rb', __FILE__)}"
- @@bad_rake = "#{rubybin} #{File.expand_path('../../../test/rubygems/bad_rake.rb', __FILE__)}"
-
- ##
- # Construct a new Gem::Dependency.
-
- def dep name, *requirements
- Gem::Dependency.new name, *requirements
- end
-
- ##
- # Constructs a new Gem::Requirement.
-
- def req *requirements
- return requirements.first if Gem::Requirement === requirements.first
- Gem::Requirement.create requirements
- end
-
- ##
- # Constructs a new Gem::Specification.
-
- def spec name, version, &block
- Gem::Specification.new name, v(version), &block
- end
-
- ##
- # Construct a new Gem::Version.
-
- def v string
- Gem::Version.create string
- end
-
- class StaticSet
- def initialize(specs)
- @specs = specs.sort_by { |s| s.full_name }
- end
-
- def find_spec(dep)
- @specs.reverse_each do |s|
- return s if dep.matches_spec? s
- end
- end
-
- def find_all(dep)
- @specs.find_all { |s| dep.matches_spec? s }
- end
-
- def prefetch(reqs)
- end
- end
-
- ##
- # Loads certificate named +cert_name+ from <tt>test/rubygems/</tt>.
-
- def self.load_cert cert_name
- cert_file = cert_path cert_name
-
- cert = File.read cert_file
-
- OpenSSL::X509::Certificate.new cert
- end
-
- ##
- # Returns the path to the certificate named +cert_name+ from
- # <tt>test/rubygems/</tt>.
-
- def self.cert_path cert_name
- if 32 == (Time.at(2**32) rescue 32) then
- cert_file =
- File.expand_path "../../../test/rubygems/#{cert_name}_cert_32.pem",
- __FILE__
-
- return cert_file if File.exist? cert_file
- end
-
- File.expand_path "../../../test/rubygems/#{cert_name}_cert.pem", __FILE__
- end
-
- ##
- # Loads an RSA private key named +key_name+ in <tt>test/rubygems/</tt>
-
- def self.load_key key_name
- key_file = key_path key_name
-
- key = File.read key_file
-
- OpenSSL::PKey::RSA.new key
- end
-
- ##
- # Returns the path tot he key named +key_name+ from <tt>test/rubygems</tt>
-
- def self.key_path key_name
- File.expand_path "../../../test/rubygems/#{key_name}_key.pem", __FILE__
- end
-
- # :stopdoc:
- # only available in RubyGems tests
-
- begin
- PRIVATE_KEY = load_key 'private'
- PRIVATE_KEY_PATH = key_path 'private'
- PUBLIC_KEY = PRIVATE_KEY.public_key
-
- PUBLIC_CERT = load_cert 'public'
- PUBLIC_CERT_PATH = cert_path 'public'
- rescue Errno::ENOENT
- PRIVATE_KEY = nil
- PUBLIC_KEY = nil
- PUBLIC_CERT = nil
- end
-
-end
diff --git a/lib/rubygems/test_utilities.rb b/lib/rubygems/test_utilities.rb
index eed42f59a7..9a4759cb99 100644
--- a/lib/rubygems/test_utilities.rb
+++ b/lib/rubygems/test_utilities.rb
@@ -24,25 +24,14 @@ class Gem::FakeFetcher
attr_reader :data
attr_reader :last_request
- attr_reader :api_endpoints
attr_accessor :paths
def initialize
@data = {}
@paths = []
- @api_endpoints = {}
- end
-
- def api_endpoint(uri)
- @api_endpoints[uri] || uri
end
def find_data(path)
- if URI === path and "URI::#{path.scheme.upcase}" != path.class.name then
- raise ArgumentError,
- "mismatch for scheme #{path.scheme} and class #{path.class}"
- end
-
path = path.to_s
@paths << path
raise ArgumentError, 'need full URI' unless path =~ %r'^https?://'
@@ -54,7 +43,7 @@ class Gem::FakeFetcher
@data[path]
end
- def fetch_path path, mtime = nil, head = false
+ def fetch_path path, mtime = nil
data = find_data(path)
if data.respond_to?(:call) then
@@ -68,15 +57,6 @@ class Gem::FakeFetcher
end
end
- def cache_update_path uri, path = nil, update = true
- if data = fetch_path(uri)
- open(path, 'wb') { |io| io.write data } if path and update
- data
- else
- Gem.read_binary(path) if path
- end
- end
-
# Thanks, FakeWeb!
def open_uri_or_path(path)
data = find_data(path)
@@ -117,14 +97,10 @@ class Gem::FakeFetcher
end
def download spec, source_uri, install_dir = Gem.dir
- name = File.basename spec.cache_file
- path = if Dir.pwd == install_dir then # see fetch_command
- install_dir
- else
- File.join install_dir, "cache"
- end
+ name = spec.file_name
+ path = File.join(install_dir, 'cache', name)
- path = File.join path, name
+ Gem.ensure_gem_subdirectories install_dir
if source_uri =~ /^http/ then
File.open(path, "wb") do |f|
@@ -137,16 +113,6 @@ class Gem::FakeFetcher
path
end
- def download_to_cache dependency
- found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency
-
- return if found.empty?
-
- spec, source = found.first
-
- download spec, source.uri.to_s
- end
-
end
# :stopdoc:
@@ -162,8 +128,6 @@ end
##
# A StringIO duck-typed class that uses Tempfile instead of String as the
# backing store.
-#
-# This is available when rubygems/test_utilities is required.
#--
# This class was added to flush out problems in Rubinius' IO implementation.
diff --git a/lib/rubygems/text.rb b/lib/rubygems/text.rb
index 793cd953cb..c694e8a9c0 100644
--- a/lib/rubygems/text.rb
+++ b/lib/rubygems/text.rb
@@ -15,7 +15,7 @@ module Gem::Text
while work.length > wrap do
if work =~ /^(.{0,#{wrap}})[ \n]/ then
- result << $1.rstrip
+ result << $1
work.slice!(0, $&.length)
else
result << work.slice!(0, wrap)
@@ -26,40 +26,5 @@ module Gem::Text
result.join("\n").gsub(/^/, " " * indent)
end
- # This code is based directly on the Text gem implementation
- # Returns a value representing the "cost" of transforming str1 into str2
- def levenshtein_distance str1, str2
- s = str1
- t = str2
- n = s.length
- m = t.length
- max = n/2
-
- return m if (0 == n)
- return n if (0 == m)
- return n if (n - m).abs > max
-
- d = (0..m).to_a
- x = nil
-
- n.times do |i|
- e = i+1
-
- m.times do |j|
- cost = (s[i] == t[j]) ? 0 : 1
- x = [
- d[j+1] + 1, # insertion
- e + 1, # deletion
- d[j] + cost # substitution
- ].min
- d[j] = e
- e = x
- end
-
- d[m] = x
- end
-
- return x
- end
end
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
index d672b9dec1..1dea232634 100644
--- a/lib/rubygems/uninstaller.rb
+++ b/lib/rubygems/uninstaller.rb
@@ -7,7 +7,7 @@
require 'fileutils'
require 'rubygems'
require 'rubygems/dependency_list'
-require 'rubygems/rdoc'
+require 'rubygems/doc_manager'
require 'rubygems/user_interaction'
##
@@ -42,29 +42,26 @@ class Gem::Uninstaller
# Constructs an uninstaller that will uninstall +gem+
def initialize(gem, options = {})
- # TODO document the valid options
- @gem = gem
- @version = options[:version] || Gem::Requirement.default
- @gem_home = File.expand_path(options[:install_dir] || Gem.dir)
+ @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]
- @format_executable = options[:format_executable]
-
- # Indicate if development dependencies should be checked when
- # uninstalling. (default: false)
- #
- @check_dev = options[:check_dev]
-
- if options[:force]
- @force_all = true
- @force_ignore = true
- end
+ @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
##
@@ -72,89 +69,45 @@ class Gem::Uninstaller
# directory, and the cached .gem file.
def uninstall
- dependency = Gem::Dependency.new @gem, @version
-
- list = []
-
- dirs =
- Gem::Specification.dirs +
- [Gem::Specification.default_specifications_dir]
-
- Gem::Specification.each_spec dirs do |spec|
- next unless dependency.matches_spec? spec
-
- list << spec
- end
-
- default_specs, list = list.partition do |spec|
- spec.default_gem?
- end
-
- list, other_repo_specs = list.partition do |spec|
- @gem_home == spec.base_dir or
- (@user_install and spec.base_dir == Gem.user_dir)
- end
+ list = @source_index.find_name @gem, @version
+ list += @user_index.find_name @gem, @version if @user_install
if list.empty? then
- if other_repo_specs.empty?
- if default_specs.empty?
- raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
- else
- message =
- "gem #{@gem.inspect} cannot be uninstalled " +
- "because it is a default gem"
- raise Gem::InstallError, message
- end
- end
-
- other_repos = other_repo_specs.map { |spec| spec.base_dir }.uniq
-
- message = ["#{@gem} is not installed in GEM_HOME, try:"]
- message.concat other_repos.map { |repo|
- "\tgem uninstall -i #{repo} #{@gem}"
- }
+ raise Gem::InstallError, "cannot uninstall, check `gem list -d #{@gem}`"
- raise Gem::InstallError, message.join("\n")
- elsif @force_all then
- remove_all list
+ 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
- _, index = choose_from_list "Select gem to uninstall:", gem_names
+ gem_name, index = choose_from_list "Select gem to uninstall:", gem_names
if index == list.size then
- remove_all list
+ remove_all list.dup
elsif index >= 0 && index < list.size then
- uninstall_gem list[index]
+ uninstall_gem list[index], list.dup
else
say "Error: must enter a number [1-#{list.size+1}]"
end
else
- uninstall_gem list.first
+ uninstall_gem list.first, list.dup
end
end
##
# Uninstalls gem +spec+
- def uninstall_gem(spec)
+ def uninstall_gem(spec, specs)
@spec = spec
- unless dependencies_ok? spec
- unless ask_if_ok(spec)
- raise Gem::DependencyRemovalException,
- "Uninstallation aborted due to dependent gem(s)"
- end
- end
-
Gem.pre_uninstall_hooks.each do |hook|
hook.call self
end
remove_executables @spec
- remove @spec
+ remove @spec, specs
Gem.post_uninstall_hooks.each do |hook|
hook.call self
@@ -168,51 +121,44 @@ class Gem::Uninstaller
# +gemspec+.
def remove_executables(spec)
- return if spec.nil? or spec.executables.empty?
+ return if spec.nil?
- executables = spec.executables.clone
+ unless spec.executables.empty? then
+ bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
- # Leave any executables created by other installed versions
- # of this gem installed.
+ list = @source_index.find_name(spec.name).delete_if { |s|
+ s.version == spec.version
+ }
- list = Gem::Specification.find_all { |s|
- s.name == spec.name && s.version != spec.version
- }
+ executables = spec.executables.clone
- list.each do |s|
- s.executables.each do |exe_name|
- executables.delete exe_name
+ list.each do |s|
+ s.executables.each do |exe_name|
+ executables.delete exe_name
+ end
end
- end
-
- return if executables.empty?
-
- executables = executables.map { |exec| formatted_program_filename exec }
- remove = if @force_executables.nil? then
- ask_yes_no("Remove executables:\n" +
- "\t#{executables.join ', '}\n\n" +
- "in addition to the gem?",
- true)
- else
- @force_executables
- end
+ return if executables.empty?
- if remove then
- bin_dir = @bin_dir || Gem.bindir(spec.base_dir)
-
- raise Gem::FilePermissionError, bin_dir unless File.writable? bin_dir
-
- executables.each do |exe_name|
- say "Removing #{exe_name}"
+ 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
- exe_file = File.join bin_dir, exe_name
+ unless answer then
+ say "Executables and scripts will remain installed."
+ else
+ raise Gem::FilePermissionError, bindir unless File.writable? bindir
- FileUtils.rm_f exe_file
- FileUtils.rm_f "#{exe_file}.bat"
+ 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
- else
- say "Executables and scripts will remain installed."
end
end
@@ -222,7 +168,7 @@ class Gem::Uninstaller
# NOTE: removes uninstalled gems from +list+.
def remove_all(list)
- list.each { |spec| uninstall_gem spec }
+ list.dup.each { |spec| uninstall_gem spec, list }
end
##
@@ -232,7 +178,12 @@ class Gem::Uninstaller
# Warning: this method modifies the +list+ parameter. Once it has
# uninstalled a gem, it is removed from that list.
- def remove(spec)
+ 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 \
@@ -242,42 +193,44 @@ class Gem::Uninstaller
raise e
end
- raise Gem::FilePermissionError, spec.base_dir unless
- File.writable?(spec.base_dir)
+ raise Gem::FilePermissionError, spec.installation_path unless
+ File.writable?(spec.installation_path)
FileUtils.rm_rf spec.full_gem_path
- # TODO: should this be moved to spec?... I vote eww (also exists in docmgr)
- old_platform_name = [spec.name,
- spec.version,
- spec.original_platform].join '-'
+ original_platform_name = [
+ spec.name, spec.version, spec.original_platform].join '-'
- gemspec = spec.spec_file
+ spec_dir = File.join spec.installation_path, 'specifications'
+ gemspec = File.join spec_dir, spec.spec_name
unless File.exist? gemspec then
- gemspec = File.join(File.dirname(gemspec), "#{old_platform_name}.gemspec")
+ gemspec = File.join spec_dir, "#{original_platform_name}.gemspec"
end
FileUtils.rm_rf gemspec
- gem = spec.cache_file
- gem = File.join(spec.cache_dir, "#{old_platform_name}.gem") unless
- File.exist? gem
+ cache_dir = File.join spec.installation_path, 'cache'
+ gem = File.join cache_dir, spec.file_name
+
+ unless File.exist? gem then
+ gem = File.join cache_dir, "#{original_platform_name}.gem"
+ end
FileUtils.rm_rf gem
- Gem::RDoc.new(spec).remove
+ Gem::DocManager.new(spec).uninstall_doc
say "Successfully uninstalled #{spec.full_name}"
- Gem::Specification.remove_spec spec
+ 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
+ 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
@@ -286,40 +239,24 @@ class Gem::Uninstaller
def dependencies_ok?(spec)
return true if @force_ignore
- deplist = Gem::DependencyList.from_specs
- deplist.ok_to_remove?(spec.full_name, @check_dev)
+ 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}"
- msg << ''
-
- siblings = Gem::Specification.select do |s|
- s.name == spec.name && s.full_name != spec.full_name
- end
-
- spec.dependent_gems.each do |dep_spec, dep, satlist|
- unless siblings.any? { |s| s.satisfies_requirement? dep }
- msg << "#{dep_spec.name}-#{dep_spec.version} depends on #{dep}"
- end
+ spec.dependent_gems.each do |gem,dep,satlist|
+ msg <<
+ ("#{gem.name}-#{gem.version} depends on " +
+ "[#{dep.name} (#{dep.requirement})]")
end
-
- msg << 'If you remove this gem, these dependencies will not be met.'
+ 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"), false)
+ return ask_yes_no(msg.join("\n"), true)
end
- def formatted_program_filename(filename)
- # TODO perhaps the installer should leave a small manifest
- # of what it did for us to find rather than trying to recreate
- # it again.
- if @format_executable then
- require 'rubygems/installer'
- Gem::Installer.exec_format % File.basename(filename)
- else
- filename
- end
- end
end
+
diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb
index 0974476507..1ab948dcb6 100644
--- a/lib/rubygems/user_interaction.rb
+++ b/lib/rubygems/user_interaction.rb
@@ -66,7 +66,7 @@ module Gem::DefaultUserInteraction
end
##
-# Make the default UI accessible without the "ui." prefix. Classes
+# 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.
#
@@ -84,40 +84,44 @@ module Gem::UserInteraction
include Gem::DefaultUserInteraction
- def alert(*args)
- ui.alert(*args)
- end
-
- def alert_error(*args)
- ui.alert_error(*args)
- end
+ ##
+ # :method: alert
- def alert_warning(*args)
- ui.alert_warning(*args)
- end
+ ##
+ # :method: alert_error
- def ask(*args)
- ui.ask(*args)
- end
+ ##
+ # :method: alert_warning
- def ask_for_password(*args)
- ui.ask_for_password(*args)
- end
+ ##
+ # :method: ask
- def ask_yes_no(*args)
- ui.ask_yes_no(*args)
- end
+ ##
+ # :method: ask_yes_no
- def choose_from_list(*args)
- ui.choose_from_list(*args)
- end
+ ##
+ # :method: choose_from_list
- def say(*args)
- ui.say(*args)
- end
+ ##
+ # :method: say
- def terminate_interaction(*args)
- ui.terminate_interaction(*args)
+ ##
+ # :method: terminate_interaction
+
+ [:alert,
+ :alert_error,
+ :alert_warning,
+ :ask,
+ :ask_for_password,
+ :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
@@ -128,29 +132,10 @@ class Gem::StreamUI
attr_reader :ins, :outs, :errs
- def initialize(in_stream, out_stream, err_stream=STDERR, usetty=true)
+ def initialize(in_stream, out_stream, err_stream=STDERR)
@ins = in_stream
@outs = out_stream
@errs = err_stream
- @usetty = usetty
- end
-
- def tty?
- if RUBY_VERSION < '1.9.3' and RUBY_PLATFORM =~ /mingw|mswin/ then
- @usetty
- else
- @usetty && @ins.tty?
- end
- end
-
- ##
- # Prints a formatted backtrace to the errors stream if backtraces are
- # enabled.
-
- def backtrace exception
- return unless Gem.configuration.backtrace
-
- @errs.puts "\t#{exception.backtrace.join "\n\t"}"
end
##
@@ -182,7 +167,7 @@ class Gem::StreamUI
# default.
def ask_yes_no(question, default=nil)
- unless tty? then
+ unless @ins.tty? then
if default.nil? then
raise Gem::OperationNotSupportedError,
"Not connected to a tty and no default specified"
@@ -191,24 +176,29 @@ class Gem::StreamUI
end
end
- default_answer = case default
- when nil
- 'yn'
- when true
- 'Yn'
- else
- 'yN'
- end
+ qstr = case default
+ when nil
+ 'yn'
+ when true
+ 'Yn'
+ else
+ 'yN'
+ end
result = nil
- while result.nil? do
- result = case ask "#{question} [#{default_answer}]"
- when /^y/i then true
- when /^n/i then false
- when /^$/ then default
- else nil
- end
+ while result.nil?
+ result = ask("#{question} [#{qstr}]")
+ result = case result
+ when /^[Yy].*/
+ true
+ when /^[Nn].*/
+ false
+ when /^$/
+ default
+ else
+ nil
+ end
end
return result
@@ -218,7 +208,7 @@ class Gem::StreamUI
# Ask a question. Returns an answer if connected to a tty, nil otherwise.
def ask(question)
- return nil if not tty?
+ return nil if not @ins.tty?
@outs.print(question + " ")
@outs.flush
@@ -228,70 +218,48 @@ class Gem::StreamUI
result
end
- if RUBY_VERSION > '1.9.2' then
- ##
- # Ask for a password. Does not echo response to terminal.
-
- def ask_for_password(question)
- return nil if not tty?
+ ##
+ # Ask for a password. Does not echo response to terminal.
- require 'io/console'
+ def ask_for_password(question)
+ return nil if not @ins.tty?
- @outs.print(question + " ")
- @outs.flush
+ @outs.print(question + " ")
+ @outs.flush
- password = @ins.noecho {@ins.gets}
- password.chomp! if password
- password
- end
- else
- ##
- # Ask for a password. Does not echo response to terminal.
+ Gem.win_platform? ? ask_for_password_on_windows : ask_for_password_on_unix
+ end
- def ask_for_password(question)
- return nil if not tty?
+ ##
+ # Asks for a password that works on windows. Ripped from the Heroku gem.
- @outs.print(question + " ")
- @outs.flush
+ def ask_for_password_on_windows
+ require "Win32API"
+ char = nil
+ password = ''
- Gem.win_platform? ? ask_for_password_on_windows : ask_for_password_on_unix
- end
-
- ##
- # Asks for a password that works on windows. Ripped from the Heroku gem.
-
- def ask_for_password_on_windows
- return nil if not tty?
-
- require "Win32API"
- char = nil
- password = ''
-
- while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
- break if char == 10 || char == 13 # received carriage return or newline
- if char == 127 || char == 8 # backspace and delete
- password.slice!(-1, 1)
- else
- password << char.chr
- end
+ while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+ break if char == 10 || char == 13 # received carriage return or newline
+ if char == 127 || char == 8 # backspace and delete
+ password.slice!(-1, 1)
+ else
+ password << char.chr
end
-
- puts
- password
end
- ##
- # Asks for a password that works on unix
+ puts
+ password
+ end
- def ask_for_password_on_unix
- return nil if not tty?
+ ##
+ # Asks for a password that works on unix
- system "stty -echo"
- password = @ins.gets
- password.chomp! if password
- system "stty echo"
- password
- end
+ def ask_for_password_on_unix
+ system "stty -echo"
+ password = @ins.gets
+ password.chomp! if password
+ system "stty echo"
+ password
end
##
@@ -346,10 +314,6 @@ class Gem::StreamUI
# Return a progress reporter object chosen from the current verbosity.
def progress_reporter(*args)
- if self.kind_of?(Gem::SilentUI)
- return SilentProgressReporter.new(@outs, *args)
- end
-
case Gem.configuration.verbose
when nil, false
SilentProgressReporter.new(@outs, *args)
@@ -448,89 +412,6 @@ class Gem::StreamUI
end
end
- ##
- # Return a download reporter object chosen from the current verbosity
-
- def download_reporter(*args)
- if self.kind_of?(Gem::SilentUI)
- return SilentDownloadReporter.new(@outs, *args)
- end
-
- case Gem.configuration.verbose
- when nil, false
- SilentDownloadReporter.new(@outs, *args)
- else
- VerboseDownloadReporter.new(@outs, *args)
- end
- end
-
- ##
- # An absolutely silent download reporter.
-
- class SilentDownloadReporter
- def initialize(out_stream, *args)
- end
-
- def fetch(filename, filesize)
- end
-
- def update(current)
- end
-
- def done
- end
- end
-
- ##
- # A progress reporter that prints out messages about the current progress.
-
- class VerboseDownloadReporter
- attr_reader :file_name, :total_bytes, :progress
-
- def initialize(out_stream, *args)
- @out = out_stream
- @progress = 0
- end
-
- def fetch(file_name, total_bytes)
- @file_name = file_name
- @total_bytes = total_bytes.to_i
- @units = @total_bytes.zero? ? 'B' : '%'
-
- update_display(false)
- end
-
- def update(bytes)
- new_progress = if @units == 'B' then
- bytes
- else
- ((bytes.to_f * 100) / total_bytes.to_f).ceil
- end
-
- return if new_progress == @progress
-
- @progress = new_progress
- update_display
- end
-
- def done
- @progress = 100 if @units == '%'
- update_display(true, true)
- end
-
- private
-
- def update_display(show_progress = true, new_line = false)
- return unless @out.tty?
-
- if show_progress then
- @out.print "\rFetching: %s (%3d%s)" % [@file_name, @progress, @units]
- else
- @out.print "Fetching: %s" % @file_name
- end
- @out.puts if new_line
- end
- end
end
##
@@ -539,34 +420,16 @@ end
class Gem::ConsoleUI < Gem::StreamUI
def initialize
- super STDIN, STDOUT, STDERR, true
+ super STDIN, STDOUT, STDERR
end
end
##
# SilentUI is a UI choice that is absolutely silent.
-class Gem::SilentUI < Gem::StreamUI
- def initialize
- reader, writer = nil, nil
-
- begin
- reader = File.open('/dev/null', 'r')
- writer = File.open('/dev/null', 'w')
- rescue Errno::ENOENT
- reader = File.open('nul', 'r')
- writer = File.open('nul', 'w')
- end
-
- super reader, writer, writer, false
- end
-
- def download_reporter(*args)
- SilentDownloadReporter.new(@outs, *args)
- end
-
- def progress_reporter(*args)
- SilentProgressReporter.new(@outs, *args)
+class Gem::SilentUI
+ def method_missing(sym, *args, &block)
+ self
end
end
diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb
index e5183d401f..16e12ef02e 100644
--- a/lib/rubygems/validator.rb
+++ b/lib/rubygems/validator.rb
@@ -4,9 +4,18 @@
# See LICENSE.txt for permissions.
#++
-require 'rubygems/package'
+require 'find'
+
+require 'digest'
+require 'rubygems/format'
require 'rubygems/installer'
+begin
+ gem '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
@@ -14,17 +23,25 @@ class Gem::Validator
include Gem::UserInteraction
- def initialize
- require 'find'
- end
-
##
# 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)
- # TODO remove me? The code here only validate an MD5SUM that was
- # in some old formatted gems, but hasn't been for a long time.
+ 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
##
@@ -45,25 +62,17 @@ class Gem::Validator
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 do
- def <=> other
- return nil unless self.class === other
-
- [path, problem] <=> [other.path, other.problem]
- end
- end
+ ErrorData = Struct.new :path, :problem
##
# Checks the gem directory for the following potential
@@ -75,22 +84,20 @@ class Gem::Validator
# * 1 cache - 1 spec - 1 directory.
#
# returns a hash of ErrorData objects, keyed on the problem gem's name.
- #--
- # TODO needs further cleanup
def alien(gems=[])
errors = Hash.new { |h,k| h[k] = {} }
- Gem::Specification.each do |spec|
- next unless gems.include? spec.name unless gems.empty?
+ Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec|
+ next unless gems.include? gem_spec.name unless gems.empty?
- gem_name = spec.file_name
- gem_path = spec.cache_file
- spec_path = spec.spec_file
- gem_directory = spec.full_gem_path
+ install_dir = gem_spec.installation_path
+ gem_path = File.join install_dir, "cache", gem_spec.file_name
+ spec_path = File.join install_dir, "specifications", gem_spec.spec_name
+ gem_directory = gem_spec.full_gem_path
unless File.directory? gem_directory then
- errors[gem_name][spec.full_name] =
+ errors[gem_name][gem_spec.full_name] =
"Gem registered but doesn't exist at #{gem_directory}"
next
end
@@ -105,20 +112,22 @@ class Gem::Validator
good, gone, unreadable = nil, nil, nil, nil
open gem_path, Gem.binary_mode do |file|
- package = Gem::Package.new gem_path
+ format = Gem::Format.from_file_by_path(gem_path)
- good, gone = package.contents.partition { |file_name|
- File.exist? File.join(gem_directory, file_name)
+ 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 { |file_name|
- File.readable? File.join(gem_directory, file_name)
+ 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
@@ -127,10 +136,9 @@ class Gem::Validator
begin
next unless data # HACK `gem check -a mkrf`
- source = File.join gem_directory, entry['path']
-
- open source, Gem.binary_mode do |f|
- unless f.read == data then
+ 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
@@ -139,6 +147,7 @@ class Gem::Validator
end
installed_files = find_files_for_gem(gem_directory)
+ good.map! { |entry, _| entry['path'] }
extras = installed_files - good - unreadable
extras.each do |extra|
@@ -150,12 +159,88 @@ class Gem::Validator
end
errors.each do |name, subhash|
- errors[name] = subhash.map do |path, msg|
- ErrorData.new path, msg
- end.sort
+ errors[name] = subhash.map { |path, msg| ErrorData.new(path, msg) }
end
errors
end
+
+=begin
+ 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
+=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
+
+=begin
+ 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
+=end
+ result = MiniTest::Unit.new
+ result.run
+
+ 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
index 2b7bf9b422..50d8204a5d 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -8,18 +8,15 @@
#
# 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. If a prerelease part contains both
-# letters and numbers, it will be broken into multiple parts to
-# provide expected sort behavior (1.0.a10 becomes 1.0.a.10, and is
-# greater than 1.0.a9).
+# 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.b1
-# 3. 1.0.a.2
+# 2. 1.0.b
+# 3. 1.0.a
# 4. 0.9
#
# == How Software Changes
@@ -129,8 +126,8 @@
# specify your dependency as ">= 2.0.0" then, you're good, right? What
# happens if fnord 3.0 comes out and it isn't backwards compatible
# with 2.y.z? Your stuff will break as a result of using ">=". The
-# better route is to specify your dependency with an "approximate" version
-# specifier ("~>"). They're a tad confusing, so here is how the dependency
+# better route is to specify your dependency with a "spermy" version
+# specifier. They're a tad confusing, so here is how the dependency
# specifiers work:
#
# Specification From ... To (exclusive)
@@ -141,14 +138,10 @@
# "~> 3.5.0" 3.5.0 ... 3.6
class Gem::Version
- autoload :Requirement, 'rubygems/requirement'
-
include Comparable
- # FIX: These are only used once, in .correct?. Do they deserve to be
- # constants?
- VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' # :nodoc:
- ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
+ VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
+ ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
##
# A string representation of this Version.
@@ -171,10 +164,8 @@ class Gem::Version
# ver2 = Version.create(ver1) # -> (ver1)
# ver3 = Version.create(nil) # -> nil
- # REFACTOR: There's no real reason this should be separate from #initialize.
-
def self.create input
- if self === input then # check yourself before you wreck yourself
+ if input.respond_to? :version then
input
elsif input.nil? then
nil
@@ -191,14 +182,17 @@ class Gem::Version
raise ArgumentError, "Malformed version number string #{version}" unless
self.class.correct?(version)
- @version = version.to_s.dup.strip
+ @version = version.to_s
+ @version.strip!
+
+ segments # prime @segments
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, e.g, 5.3.1.b.2 => 5.4, are ignored.
+ # Pre-release (alpha) parts, e.g, 5.3.1.b2 => 5.4, are ignored.
def bump
segments = self.segments.dup
@@ -214,17 +208,13 @@ class Gem::Version
# same precision. Version "1.0" is not the same as version "1".
def eql? other
- self.class === other and @version == other.version
+ self.class === other and segments == other.segments
end
def hash # :nodoc:
@hash ||= segments.hash
end
- def init_with coder # :nodoc:
- yaml_initialize coder.tag, coder.map
- end
-
def inspect # :nodoc:
"#<#{self.class} #{version.inspect}>"
end
@@ -245,25 +235,11 @@ class Gem::Version
initialize array[0]
end
- def yaml_initialize(tag, map)
- @version = map['version']
- @segments = nil
- @hash = nil
- end
-
- def to_yaml_properties
- ["@version"]
- end
-
- def encode_with coder
- coder.add 'version', @version
- end
-
##
# A version is considered a prerelease if it contains a letter.
def prerelease?
- @prerelease ||= !!(@version =~ /[a-zA-Z]/)
+ @prerelease ||= segments.any? { |s| String === s }
end
def pretty_print q # :nodoc:
@@ -284,10 +260,12 @@ class Gem::Version
def segments # :nodoc:
- # segments is lazy so it can pick up version values that come from
- # old marshaled versions, which don't go through marshal_load.
+ # @segments is lazy so it can pick up @version values that come
+ # from old marshaled versions, which don't go through
+ # marshal_load. +segments+ is called in +initialize+ to "prime
+ # the pump" in normal cases.
- @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
+ @segments ||= @version.scan(/[0-9a-z]+/i).map do |s|
/^\d+$/ =~ s ? s.to_i : s
end
end
@@ -295,7 +273,7 @@ class Gem::Version
##
# A recommended version for use with a ~> Requirement.
- def approximate_recommendation
+ def spermy_recommendation
segments = self.segments.dup
segments.pop while segments.any? { |s| String === s }
@@ -306,33 +284,23 @@ class Gem::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. Attempts to compare to something that's not a
- # <tt>Gem::Version</tt> return +nil+.
+ # 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 unless Gem::Version === other
- return 0 if @version == other.version
+ return 1 unless other # HACK: comparable with nil? why?
+ return nil unless self.class === other
- lhsegments = segments
- rhsegments = other.segments
-
- lhsize = lhsegments.size
- rhsize = rhsegments.size
+ lhsize = segments.size
+ rhsize = other.segments.size
limit = (lhsize > rhsize ? lhsize : rhsize) - 1
- i = 0
-
- while i <= limit
- lhs, rhs = lhsegments[i] || 0, rhsegments[i] || 0
- i += 1
-
- next if lhs == rhs
- return -1 if String === lhs && Numeric === rhs
- return 1 if Numeric === lhs && String === rhs
+ 0.upto(limit) do |i|
+ lhs, rhs = segments[i] || 0, other.segments[i] || 0
- return lhs <=> rhs
+ return -1 if String === lhs && Numeric === rhs
+ return 1 if Numeric === lhs && String === rhs
+ return lhs <=> rhs if lhs != rhs
end
return 0
diff --git a/lib/scanf.rb b/lib/scanf.rb
index cd1596be8f..dd6ba6c9d0 100644
--- a/lib/scanf.rb
+++ b/lib/scanf.rb
@@ -1,288 +1,305 @@
# scanf for Ruby
#
-#--
# $Release Version: 1.1.2 $
# $Revision$
# $Id$
# $Author$
-#++
#
-# == Description
-#
-# scanf is an implementation of the C function scanf(3), modified as necessary
-# for ruby compatibility.
-#
-# the methods provided are String#scanf, IO#scanf, and
-# Kernel#scanf. Kernel#scanf is a wrapper around STDIN.scanf. IO#scanf
-# can be used on any IO stream, including file handles and sockets.
-# scanf can be called either with or without a block.
-#
-# Scanf scans an input string or stream according to a <b>format</b>, as
-# described below in Conversions, and returns an array of matches between
-# the format and the input. The format is defined in a string, and is
-# similar (though not identical) to the formats used in Kernel#printf and
-# Kernel#sprintf.
-#
-# The format may contain <b>conversion specifiers</b>, which tell scanf
-# what form (type) each particular matched substring should be converted
-# to (e.g., decimal integer, floating point number, literal string,
-# etc.) The matches and conversions take place from left to right, and
-# the conversions themselves are returned as an array.
-#
-# The format string may also contain characters other than those in the
-# conversion specifiers. White space (blanks, tabs, or newlines) in the
-# format string matches any amount of white space, including none, in
-# the input. Everything else matches only itself.
-#
-# Scanning stops, and scanf returns, when any input character fails to
-# match the specifications in the format string, or when input is
-# exhausted, or when everything in the format string has been
-# matched. All matches found up to the stopping point are returned in
-# the return array (or yielded to the block, if a block was given).
-#
-#
-# == Basic usage
-#
-# require 'scanf'
-#
-# # String#scanf and IO#scanf take a single argument, the format string
-# array = a_string.scanf("%d%s")
-# array = an_io.scanf("%d%s")
-#
-# # Kernel#scanf reads from STDIN
-# array = scanf("%d%s")
-#
-# == Block usage
-#
-# When called with a block, scanf keeps scanning the input, cycling back
-# 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.
-#
-# str = "123 abc 456 def 789 ghi"
-# str.scanf("%d%s") { |num,str| [ num * 2, str.upcase ] }
-# # => [[246, "ABC"], [912, "DEF"], [1578, "GHI"]]
-#
-# == Conversions
-#
-# The single argument to scanf is a format string, which generally
-# includes one or more conversion specifiers. Conversion specifiers
-# begin with the percent character ('%') and include information about
-# what scanf should next scan for (string, decimal number, single
-# character, etc.).
-#
-# There may be an optional maximum field width, expressed as a decimal
-# integer, between the % and the conversion. If no width is given, a
-# default of `infinity' is used (with the exception of the %c specifier;
-# see below). Otherwise, given a field width of <em>n</em> for a given
-# conversion, at most <em>n</em> characters are scanned in processing
-# that conversion. Before conversion begins, most conversions skip
-# white space in the input string; this white space is not counted
-# against the field width.
-#
-# The following conversions are available.
-#
-# [%]
-# Matches a literal `%'. That is, `%%' in the format string matches a
-# single input `%' character. No conversion is done, and the resulting
-# '%' is not included in the return array.
-#
-# [d]
-# Matches an optionally signed decimal integer.
-#
-# [u]
-# Same as d.
-#
-# [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
-# base are recognized.
-#
-# [o]
-# Matches an optionally signed octal integer.
-#
-# [x, X]
-# Matches an optionally signed hexadecimal integer,
-#
-# [a, e, f, g, A, E, F, G]
-# Matches an optionally signed floating-point number.
-#
-# [s]
-# Matches a sequence of non-white-space character. The input string stops at
-# white space or at the maximum field width, whichever occurs first.
-#
-# [c]
-# Matches a single character, or a sequence of <em>n</em> characters if a
-# field width of <em>n</em> is specified. The usual skip of leading white
-# space is suppressed. To skip white space first, use an explicit space in
-# the format.
-#
-# [[]
-# Matches a nonempty sequence of characters from the specified set
-# of accepted characters. The usual skip of leading white space is
-# suppressed. This bracketed sub-expression is interpreted exactly like a
-# character class in a Ruby regular expression. (In fact, it is placed as-is
-# in a regular expression.) The matching against the input string ends with
-# the appearance of a character not in (or, with a circumflex, in) the set,
-# or when the field width runs out, whichever comes first.
-#
-# === Assignment suppression
-#
-# To require that a particular match occur, but without including the result
-# in the return array, place the <b>assignment suppression flag</b>, which is
-# the star character ('*'), immediately after the leading '%' of a format
-# specifier (just before the field width, if any).
-#
-# == scanf for Ruby compared with scanf in C
-#
-# scanf for Ruby is based on the C function scanf(3), but with modifications,
-# dictated mainly by the underlying differences between the languages.
-#
-# === Unimplemented flags and specifiers
-#
-# * The only flag implemented in scanf for Ruby is '<tt>*</tt>' (ignore
-# upcoming conversion). Many of the flags available in C versions of
-# scanf(3) have to do with the type of upcoming pointer arguments, and are
-# meaningless in Ruby.
-#
-# * The <tt>n</tt> specifier (store number of characters consumed so far in
-# next pointer) is not implemented.
-#
-# * The <tt>p</tt> specifier (match a pointer value) is not implemented.
-#
-# === Altered specifiers
-#
-# [o, u, x, X]
-# In scanf for Ruby, all of these specifiers scan for an optionally signed
-# integer, rather than for an unsigned integer like their C counterparts.
-#
-# === Return values
-#
-# scanf for Ruby returns an array of successful conversions, whereas
-# scanf(3) returns the number of conversions successfully
-# completed. (See below for more details on scanf for Ruby's return
-# values.)
-#
-# == Return values
-#
-# Without a block, scanf returns an array containing all the conversions
-# it has found. If none are found, scanf will return an empty array. An
-# unsuccessful match is never ignored, but rather always signals the end
-# of the scanning operation. If the first unsuccessful match takes place
-# after one or more successful matches have already taken place, the
-# returned array will contain the results of those successful matches.
-#
-# With a block scanf returns a 'map'-like array of transformations from
-# the block -- that is, an array reflecting what the block did with each
-# yielded result from the iterative scanf operation. (See "Block
-# usage", above.)
-#
-# == Current limitations and bugs
-#
-# When using IO#scanf under Windows, make sure you open your files in
-# binary mode:
-#
-# File.open("filename", "rb")
-#
-# so that scanf can keep track of characters correctly.
-#
-# Support for character classes is reasonably complete (since it
-# essentially piggy-backs on Ruby's regular expression handling of
-# character classes), but users are advised that character class testing
-# has not been exhaustive, and that they should exercise some caution
-# in using any of the more complex and/or arcane character class
-# idioms.
-#
-# == License and copyright
-#
-# Copyright:: (c) 2002-2003 David Alan Black
-# License:: Distributed on the same licensing terms as Ruby itself
-#
-# == Warranty disclaimer
-#
-# This software is provided "as is" and without any express or implied
-# warranties, including, without limitation, the implied warranties of
-# merchantability and fitness for a particular purpose.
-#
-# == Credits and acknowledgements
-#
-# scanf was developed as the major activity of the Austin Ruby Codefest
-# (Austin, Texas, August 2002).
-#
-# Principal author:: David Alan Black (mailto:dblack@superlink.net)
-# Co-author:: Hal Fulton (mailto:hal9000@hypermetrics.com)
-# 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 Gavin Sinclair for some feedback on the documentation.
-#
-# The text for parts of this document, especially the Description and
-# Conversions sections, above, were adapted from the Linux Programmer's
-# Manual manpage for scanf(3), dated 1995-11-01.
-#
-# == Bugs and bug reports
-#
-# scanf for Ruby is based on something of an amalgam of C scanf
-# implementations and documentation, rather than on a single canonical
-# description. Suggestions for features and behaviors which appear in
-# other scanfs, and would be meaningful in Ruby, are welcome, as are
-# reports of suspicious behaviors and/or bugs. (Please see "Credits and
-# acknowledgements", above, for email addresses.)
+# A product of the Austin Ruby Codefest (Austin, Texas, August 2002)
+
+=begin
+
+=scanf for Ruby
+
+==Description
+
+scanf for Ruby is an implementation of the C function scanf(3),
+modified as necessary for Ruby compatibility.
+
+The methods provided are String#scanf, IO#scanf, and
+Kernel#scanf. Kernel#scanf is a wrapper around STDIN.scanf. IO#scanf
+can be used on any IO stream, including file handles and sockets.
+scanf can be called either with or without a block.
+
+scanf for Ruby scans an input string or stream according to a
+<b>format</b>, as described below ("Conversions"), and returns an
+array of matches between the format and the input. The format is
+defined in a string, and is similar (though not identical) to the
+formats used in Kernel#printf and Kernel#sprintf.
+
+The format may contain <b>conversion specifiers</b>, which tell scanf
+what form (type) each particular matched substring should be converted
+to (e.g., decimal integer, floating point number, literal string,
+etc.) The matches and conversions take place from left to right, and
+the conversions themselves are returned as an array.
+
+The format string may also contain characters other than those in the
+conversion specifiers. White space (blanks, tabs, or newlines) in the
+format string matches any amount of white space, including none, in
+the input. Everything else matches only itself.
+
+Scanning stops, and scanf returns, when any input character fails to
+match the specifications in the format string, or when input is
+exhausted, or when everything in the format string has been
+matched. All matches found up to the stopping point are returned in
+the return array (or yielded to the block, if a block was given).
+
+
+==Basic usage
+
+ require 'scanf.rb'
+
+ # String#scanf and IO#scanf take a single argument (a format string)
+ array = aString.scanf("%d%s")
+ array = anIO.scanf("%d%s")
+
+ # Kernel#scanf reads from STDIN
+ array = scanf("%d%s")
+
+==Block usage
+
+When called with a block, scanf keeps scanning the input, cycling back
+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.
+
+ str = "123 abc 456 def 789 ghi"
+ str.scanf("%d%s") { |num,str| [ num * 2, str.upcase ] }
+ # => [[246, "ABC"], [912, "DEF"], [1578, "GHI"]]
+
+==Conversions
+
+The single argument to scanf is a format string, which generally
+includes one or more conversion specifiers. Conversion specifiers
+begin with the percent character ('%') and include information about
+what scanf should next scan for (string, decimal number, single
+character, etc.).
+
+There may be an optional maximum field width, expressed as a decimal
+integer, between the % and the conversion. If no width is given, a
+default of `infinity' is used (with the exception of the %c specifier;
+see below). Otherwise, given a field width of <em>n</em> for a given
+conversion, at most <em>n</em> characters are scanned in processing
+that conversion. Before conversion begins, most conversions skip
+white space in the input string; this white space is not counted
+against the field width.
+
+The following conversions are available. (See the files EXAMPLES
+and <tt>tests/scanftests.rb</tt> for examples.)
+
+[%]
+ Matches a literal `%'. That is, `%%' in the format string matches a
+ single input `%' character. No conversion is done, and the resulting
+ '%' is not included in the return array.
+
+[d]
+ Matches an optionally signed decimal integer.
+
+[u]
+ Same as d.
+
+[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
+ base are recognized.
+
+[o]
+ Matches an optionally signed octal integer.
+
+[x,X]
+ Matches an optionally signed hexadecimal integer,
+
+[a,e,f,g,A,E,F,G]
+ Matches an optionally signed floating-point number.
+
+[s]
+ Matches a sequence of non-white-space character. The input string stops at
+ white space or at the maximum field width, whichever occurs first.
+
+[c]
+ Matches a single character, or a sequence of <em>n</em> characters if a
+ field width of <em>n</em> is specified. The usual skip of leading white
+ space is suppressed. To skip white space first, use an explicit space in
+ the format.
+
+[<tt>[</tt>]
+ Matches a nonempty sequence of characters from the specified set
+ of accepted characters. The usual skip of leading white space is
+ suppressed. This bracketed sub-expression is interpreted exactly like a
+ character class in a Ruby regular expression. (In fact, it is placed as-is
+ in a regular expression.) The matching against the input string ends with
+ the appearance of a character not in (or, with a circumflex, in) the set,
+ or when the field width runs out, whichever comes first.
+
+===Assignment suppression
+
+To require that a particular match occur, but without including the result
+in the return array, place the <b>assignment suppression flag</b>, which is
+the star character ('*'), immediately after the leading '%' of a format
+specifier (just before the field width, if any).
+
+==Examples
+
+See the files <tt>EXAMPLES</tt> and <tt>tests/scanftests.rb</tt>.
+
+==scanf for Ruby compared with scanf in C
+
+scanf for Ruby is based on the C function scanf(3), but with modifications,
+dictated mainly by the underlying differences between the languages.
+
+===Unimplemented flags and specifiers
+
+* The only flag implemented in scanf for Ruby is '<tt>*</tt>' (ignore
+ upcoming conversion). Many of the flags available in C versions of scanf(4)
+ have to do with the type of upcoming pointer arguments, and are literally
+ meaningless in Ruby.
+
+* The <tt>n</tt> specifier (store number of characters consumed so far in
+ next pointer) is not implemented.
+
+* The <tt>p</tt> specifier (match a pointer value) is not implemented.
+
+===Altered specifiers
+
+[o,u,x,X]
+ In scanf for Ruby, all of these specifiers scan for an optionally signed
+ integer, rather than for an unsigned integer like their C counterparts.
+
+===Return values
+
+scanf for Ruby returns an array of successful conversions, whereas
+scanf(3) returns the number of conversions successfully
+completed. (See below for more details on scanf for Ruby's return
+values.)
+
+==Return values
+
+Without a block, scanf returns an array containing all the conversions
+it has found. If none are found, scanf will return an empty array. An
+unsuccesful match is never ignored, but rather always signals the end
+of the scanning operation. If the first unsuccessful match takes place
+after one or more successful matches have already taken place, the
+returned array will contain the results of those successful matches.
+
+With a block scanf returns a 'map'-like array of transformations from
+the block -- that is, an array reflecting what the block did with each
+yielded result from the iterative scanf operation. (See "Block
+usage", above.)
+
+==Test suite
+
+scanf for Ruby includes a suite of unit tests (requiring the
+<tt>TestUnit</tt> package), which can be run with the command <tt>ruby
+tests/scanftests.rb</tt> or the command <tt>make test</tt>.
+
+==Current limitations and bugs
+
+When using IO#scanf under Windows, make sure you open your files in
+binary mode:
+
+ File.open("filename", "rb")
+
+so that scanf can keep track of characters correctly.
+
+Support for character classes is reasonably complete (since it
+essentially piggy-backs on Ruby's regular expression handling of
+character classes), but users are advised that character class testing
+has not been exhaustive, and that they should exercise some caution
+in using any of the more complex and/or arcane character class
+idioms.
+
+
+==Technical notes
+
+===Rationale behind scanf for Ruby
+
+The impetus for a scanf implementation in Ruby comes chiefly from the fact
+that existing pattern matching operations, such as Regexp#match and
+String#scan, return all results as strings, which have to be converted to
+integers or floats explicitly in cases where what's ultimately wanted are
+integer or float values.
+
+===Design of scanf for Ruby
+
+scanf for Ruby is essentially a <format string>-to-<regular
+expression> converter.
+
+When scanf is called, a FormatString object is generated from the
+format string ("%d%s...") argument. The FormatString object breaks the
+format string down into atoms ("%d", "%5f", "blah", etc.), and from
+each atom it creates a FormatSpecifier object, which it
+saves.
+
+Each FormatSpecifier has a regular expression fragment and a "handler"
+associated with it. For example, the regular expression fragment
+associated with the format "%d" is "([-+]?\d+)", and the handler
+associated with it is a wrapper around String#to_i. scanf itself calls
+FormatString#match, passing in the input string. FormatString#match
+iterates through its FormatSpecifiers; for each one, it matches the
+corresponding regular expression fragment against the string. If
+there's a match, it sends the matched string to the handler associated
+with the FormatSpecifier.
+
+Thus, to follow up the "%d" example: if "123" occurs in the input
+string when a FormatSpecifier consisting of "%d" is reached, the "123"
+will be matched against "([-+]?\d+)", and the matched string will be
+rendered into an integer by a call to to_i.
+
+The rendered match is then saved to an accumulator array, and the
+input string is reduced to the post-match substring. Thus the string
+is "eaten" from the left as the FormatSpecifiers are applied in
+sequence. (This is done to a duplicate string; the original string is
+not altered.)
+
+As soon as a regular expression fragment fails to match the string, or
+when the FormatString object runs out of FormatSpecifiers, scanning
+stops and results accumulated so far are returned in an array.
+
+==License and copyright
+
+Copyright:: (c) 2002-2003 David Alan Black
+License:: Distributed on the same licensing terms as Ruby itself
+
+==Warranty disclaimer
+
+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.
+
+==Credits and acknowledgements
+
+scanf for Ruby was developed as the major activity of the Austin
+Ruby Codefest (Austin, Texas, August 2002).
+
+Principal author:: David Alan Black (mailto:dblack@superlink.net)
+Co-author:: Hal Fulton (mailto:hal9000@hypermetrics.com)
+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 Gavin Sinclair for some feedback on the documentation.
+
+The text for parts of this document, especially the Description and
+Conversions sections, above, were adapted from the Linux Programmer's
+Manual manpage for scanf(3), dated 1995-11-01.
+
+==Bugs and bug reports
+
+scanf for Ruby is based on something of an amalgam of C scanf
+implementations and documentation, rather than on a single canonical
+description. Suggestions for features and behaviors which appear in
+other scanfs, and would be meaningful in Ruby, are welcome, as are
+reports of suspicious behaviors and/or bugs. (Please see "Credits and
+acknowledgements", above, for email addresses.)
+
+=end
module Scanf
- # :stopdoc:
-
- # ==Technical notes
- #
- # ===Rationale behind scanf for Ruby
- #
- # The impetus for a scanf implementation in Ruby comes chiefly from the fact
- # that existing pattern matching operations, such as Regexp#match and
- # String#scan, return all results as strings, which have to be converted to
- # integers or floats explicitly in cases where what's ultimately wanted are
- # integer or float values.
- #
- # ===Design of scanf for Ruby
- #
- # scanf for Ruby is essentially a <format string>-to-<regular
- # expression> converter.
- #
- # When scanf is called, a FormatString object is generated from the
- # format string ("%d%s...") argument. The FormatString object breaks the
- # format string down into atoms ("%d", "%5f", "blah", etc.), and from
- # each atom it creates a FormatSpecifier object, which it
- # saves.
- #
- # Each FormatSpecifier has a regular expression fragment and a "handler"
- # associated with it. For example, the regular expression fragment
- # associated with the format "%d" is "([-+]?\d+)", and the handler
- # associated with it is a wrapper around String#to_i. scanf itself calls
- # FormatString#match, passing in the input string. FormatString#match
- # iterates through its FormatSpecifiers; for each one, it matches the
- # corresponding regular expression fragment against the string. If
- # there's a match, it sends the matched string to the handler associated
- # with the FormatSpecifier.
- #
- # Thus, to follow up the "%d" example: if "123" occurs in the input
- # string when a FormatSpecifier consisting of "%d" is reached, the "123"
- # will be matched against "([-+]?\d+)", and the matched string will be
- # rendered into an integer by a call to to_i.
- #
- # The rendered match is then saved to an accumulator array, and the
- # input string is reduced to the post-match substring. Thus the string
- # is "eaten" from the left as the FormatSpecifiers are applied in
- # sequence. (This is done to a duplicate string; the original string is
- # not altered.)
- #
- # As soon as a regular expression fragment fails to match the string, or
- # when the FormatString object runs out of FormatSpecifiers, scanning
- # stops and results accumulated so far are returned in an array.
class FormatSpecifier
@@ -304,8 +321,6 @@ module Scanf
end
end
(sign == ?- ? -1 : 1) * Math.ldexp(f, exp.to_i)
- elsif /\A([-+]?\d+)\.([eE][-+]\d+)/ =~ s
- ($1 << $2).to_f
else
s.to_f
end
@@ -499,16 +514,16 @@ module Scanf
%
# another percent sign, or...
(?:%|
- # optional assignment suppression flag
- \*?
- # optional maximum field width
- \d*
- # named character class, ...
- (?:\[\[:\w+:\]\]|
- # traditional character class, or...
- \[[^\]]*\]|
- # specifier letter.
- [#{SPECIFIERS}])))|
+ # optional assignment suppression flag
+ \*?
+ # optional maximum field width
+ \d*
+ # named character class, ...
+ (?:\[\[:\w+:\]\]|
+ # traditional character class, or...
+ \[[^\]]*\]|
+ # specifier letter.
+ [#{SPECIFIERS}])))|
# or miscellaneous characters
[^%\s]+/ix
@@ -557,61 +572,39 @@ module Scanf
return accum.compact
end
end
- # :startdoc:
end
class IO
- #:stopdoc:
- # The trick here is doing a match where you grab one *line*
- # of input at a time. The linebreak may or may not occur
- # at the boundary where the string matches a format specifier.
- # And if it does, some rule about whitespace may or may not
- # be in effect...
- #
- # That's why this is much more elaborate than the string
- # version.
- #
- # For each line:
- #
- # Match succeeds (non-emptily)
- # and the last attempted spec/string sub-match succeeded:
- #
- # could the last spec keep matching?
- # yes: save interim results and continue (next line)
- #
- # The last attempted spec/string did not match:
- #
- # are we on the next-to-last spec in the string?
- # yes:
- # is fmt_string.string_left all spaces?
- # yes: does current spec care about input space?
- # yes: fatal failure
- # no: save interim results and continue
- # no: continue [this state could be analyzed further]
- #
- #:startdoc:
-
- # Scans the current string until the match is exhausted,
- # yielding each match as it is encountered in the string.
- # A block is not necessary though, as the results will simply
- # be aggregated into the final array.
- #
- # "123 456".block_scanf("%d")
- # # => [123, 456]
- #
- # If a block is given, the value from that is returned from
- # the yield is added to an output array.
- #
- # "123 456".block_scanf("%d) do |digit,| # the ',' unpacks the Array
- # digit + 100
- # end
- # # => [223, 556]
- #
- # See Scanf for details on creating a format string.
- #
- # You will need to require 'scanf' to use use IO#scanf.
- def scanf(str,&b) #:yield: current_match
+# The trick here is doing a match where you grab one *line*
+# of input at a time. The linebreak may or may not occur
+# at the boundary where the string matches a format specifier.
+# And if it does, some rule about whitespace may or may not
+# be in effect...
+#
+# That's why this is much more elaborate than the string
+# version.
+#
+# For each line:
+# Match succeeds (non-emptily)
+# and the last attempted spec/string sub-match succeeded:
+#
+# could the last spec keep matching?
+# yes: save interim results and continue (next line)
+#
+# The last attempted spec/string did not match:
+#
+# are we on the next-to-last spec in the string?
+# yes:
+# is fmt_string.string_left all spaces?
+# yes: does current spec care about input space?
+# yes: fatal failure
+# no: save interim results and continue
+# no: continue [this state could be analyzed further]
+#
+#
+
+ def scanf(str,&b)
return block_scanf(str,&b) if b
return [] unless str.size > 0
@@ -691,28 +684,7 @@ end
class String
- # :section: scanf
- #
- # You will need to require 'scanf' to use these methods
-
- # Scans the current string. If a block is given, it
- # functions exactly like block_scanf.
- #
- # arr = "123 456".scanf("%d%d")
- # # => [123, 456]
- #
- # require 'pp'
- #
- # "this 123 read that 456 other".scanf("%s%d%s") {|m| pp m}
- #
- # # ["this", 123, "read"]
- # # ["that", 456, "other"]
- # # => [["this", 123, "read"], ["that", 456, "other"]]
- #
- # See Scanf for details on creating a format string.
- #
- # You will need to require 'scanf' to use String#scanf
- def scanf(fstr,&b) #:yield: current_match
+ def scanf(fstr,&b)
if b
block_scanf(fstr,&b)
else
@@ -726,26 +698,7 @@ class String
end
end
- # Scans the current string until the match is exhausted
- # yielding each match as it is encountered in the string.
- # A block is not necessary as the results will simply
- # be aggregated into the final array.
- #
- # "123 456".block_scanf("%d")
- # # => [123, 456]
- #
- # If a block is given, the value from that is returned from
- # the yield is added to an output array.
- #
- # "123 456".block_scanf("%d) do |digit,| # the ',' unpacks the Array
- # digit + 100
- # end
- # # => [223, 556]
- #
- # See Scanf for details on creating a format string.
- #
- # You will need to require 'scanf' to use String#block_scanf
- def block_scanf(fstr) #:yield: current_match
+ def block_scanf(fstr,&b)
fs = Scanf::FormatString.new(fstr)
str = self.dup
final = []
@@ -760,12 +713,7 @@ end
module Kernel
private
- # Scans STDIN for data matching +format+. See IO#scanf for details.
- #
- # See Scanf for details on creating a format string.
- #
- # You will need to require 'scanf' to use Kernel#scanf.
- def scanf(format, &b) #:doc:
- STDIN.scanf(format ,&b)
+ def scanf(fs,&b)
+ STDIN.scanf(fs,&b)
end
end
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index 15fe86f444..5f8f69836d 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -41,9 +41,9 @@ end
module SecureRandom
# SecureRandom.random_bytes generates a random binary string.
#
- # The argument _n_ specifies the length of the result string.
+ # The argument n specifies the length of the result string.
#
- # If _n_ is not specified, 16 is assumed.
+ # If n is not specified, 16 is assumed.
# It may be larger in future.
#
# The result may contain any byte: "\x00" - "\xff".
@@ -54,10 +54,10 @@ module SecureRandom
# If secure random number generator is not available,
# NotImplementedError is raised.
def self.random_bytes(n=nil)
- n = n ? n.to_int : 16
+ n ||= 16
if defined? OpenSSL::Random
- @pid = 0 if !defined?(@pid)
+ @pid = $$ if !defined?(@pid)
pid = $$
if @pid != pid
now = Time.now
@@ -78,9 +78,9 @@ module SecureRandom
raise Errno::ENOENT
end
@has_urandom = true
- ret = f.read(n)
+ ret = f.readpartial(n)
if ret.length != n
- raise NotImplementedError, "Unexpected partial read from random device: only #{ret.length} for #{n} bytes"
+ raise NotImplementedError, "Unexpected partial read from random device"
end
return ret
}
@@ -94,17 +94,16 @@ module SecureRandom
require 'Win32API'
crypt_acquire_context = Win32API.new("advapi32", "CryptAcquireContext", 'PPPII', 'L')
- @crypt_gen_random = Win32API.new("advapi32", "CryptGenRandom", 'VIP', 'L')
+ @crypt_gen_random = Win32API.new("advapi32", "CryptGenRandom", 'LIP', 'L')
- hProvStr = " " * DL::SIZEOF_VOIDP
+ 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
- type = DL::SIZEOF_VOIDP == DL::SIZEOF_LONG_LONG ? 'q' : 'l'
- @hProv, = hProvStr.unpack(type)
+ @hProv, = hProvStr.unpack('L')
@has_win32 = true
rescue LoadError
@@ -124,10 +123,10 @@ module SecureRandom
# SecureRandom.hex generates a random hex string.
#
- # The argument _n_ specifies the length of the random length.
- # The length of the result string is twice of _n_.
+ # The argument n specifies the length of the random length.
+ # The length of the result string is twice of n.
#
- # If _n_ is not specified, 16 is assumed.
+ # If n is not specified, 16 is assumed.
# It may be larger in future.
#
# The result may contain 0-9 and a-f.
@@ -143,10 +142,10 @@ module SecureRandom
# SecureRandom.base64 generates a random base64 string.
#
- # The argument _n_ specifies the length of the random length.
- # The length of the result string is about 4/3 of _n_.
+ # 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.
+ # 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 "=".
@@ -157,7 +156,7 @@ module SecureRandom
# If secure random number generator is not available,
# NotImplementedError is raised.
#
- # See RFC 3548 for the definition of base64.
+ # See RFC 3548 for base64.
def self.base64(n=nil)
[random_bytes(n)].pack("m*").delete("\n")
end
@@ -187,7 +186,7 @@ module SecureRandom
# If secure random number generator is not available,
# NotImplementedError is raised.
#
- # See RFC 3548 for the definition of URL-safe base64.
+ # See RFC 3548 for URL-safe base64.
def self.urlsafe_base64(n=nil, padding=false)
s = [random_bytes(n)].pack("m*")
s.delete!("\n")
@@ -198,7 +197,7 @@ module SecureRandom
# SecureRandom.random_number generates a random number.
#
- # If a positive integer is given as _n_,
+ # If an positive integer is given as n,
# SecureRandom.random_number returns an integer:
# 0 <= SecureRandom.random_number(n) < n.
#
@@ -206,7 +205,7 @@ module SecureRandom
# p SecureRandom.random_number(100) #=> 88
#
# If 0 is given or an argument is not given,
- # SecureRandom.random_number returns a float:
+ # SecureRandom.random_number returns an float:
# 0.0 <= SecureRandom.random_number() < 1.0.
#
# p SecureRandom.random_number #=> 0.596506046187744
@@ -261,6 +260,6 @@ module SecureRandom
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].force_encoding("filesystem").tr("\r", '').chomp
+ msg[0, len].tr("\r", '').chomp
end
end
diff --git a/lib/set.rb b/lib/set.rb
index b378253606..5e4e0878bd 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
#--
# set.rb - defines the Set class
#++
@@ -35,13 +36,6 @@
# Enumerable objects besides sets and arrays. An Enumerable object
# can be converted to Set using the +to_set+ method.
#
-# == Comparison
-#
-# The comparison operators <, >, <= and >= are implemented as
-# shorthand for the {proper_,}{subset?,superset?} methods. However,
-# the <=> operator is intentionally left out because not every pair of
-# sets is comparable. ({x,y} vs. {x,z} for example)
-#
# == Example
#
# require 'set'
@@ -82,7 +76,7 @@ class Set
end
end
- def do_with_enum(enum, &block) # :nodoc:
+ def do_with_enum(enum, &block)
if enum.respond_to?(:each_entry)
enum.each_entry(&block)
elsif enum.respond_to?(:each)
@@ -95,22 +89,22 @@ class Set
# Copy internal hash.
def initialize_copy(orig)
- @hash = orig.instance_variable_get(:@hash).dup
+ @hash = orig.instance_eval{@hash}.dup
end
- def freeze # :nodoc:
+ def freeze # :nodoc:
super
@hash.freeze
self
end
- def taint # :nodoc:
+ def taint # :nodoc:
super
@hash.taint
self
end
- def untaint # :nodoc:
+ def untaint # :nodoc:
super
@hash.untaint
self
@@ -136,8 +130,8 @@ class Set
# Replaces the contents of the set with the contents of the given
# enumerable object and returns self.
def replace(enum)
- if enum.instance_of?(self.class)
- @hash.replace(enum.instance_variable_get(:@hash))
+ if enum.class == self.class
+ @hash.replace(enum.instance_eval { @hash })
else
clear
merge(enum)
@@ -151,18 +145,18 @@ class Set
@hash.keys
end
- def flatten_merge(set, seen = Set.new) # :nodoc:
+ def flatten_merge(set, seen = Set.new)
set.each { |e|
if e.is_a?(Set)
- if seen.include?(e_id = e.object_id)
- raise ArgumentError, "tried to flatten recursive Set"
- end
+ if seen.include?(e_id = e.object_id)
+ raise ArgumentError, "tried to flatten recursive Set"
+ end
- seen.add(e_id)
- flatten_merge(e, seen)
- seen.delete(e_id)
+ seen.add(e_id)
+ flatten_merge(e, seen)
+ seen.delete(e_id)
else
- add(e)
+ add(e)
end
}
@@ -198,7 +192,6 @@ class Set
return false if size < set.size
set.all? { |o| include?(o) }
end
- alias >= superset?
# Returns true if the set is a proper superset of the given set.
def proper_superset?(set)
@@ -206,7 +199,6 @@ class Set
return false if size <= set.size
set.all? { |o| include?(o) }
end
- alias > proper_superset?
# Returns true if the set is a subset of the given set.
def subset?(set)
@@ -214,7 +206,6 @@ class Set
return false if set.size < size
all? { |o| set.include?(o) }
end
- alias <= subset?
# Returns true if the set is a proper subset of the given set.
def proper_subset?(set)
@@ -222,14 +213,13 @@ class Set
return false if set.size <= size
all? { |o| set.include?(o) }
end
- alias < proper_subset?
# Calls the given block once for each element in the set, passing
# the element as parameter. Returns an enumerator if no block is
# given.
- def each(&block)
- block or return enum_for(__method__)
- @hash.each_key(&block)
+ def each
+ block_given? or return enum_for(__method__)
+ @hash.each_key { |o| yield(o) }
self
end
@@ -295,19 +285,19 @@ class Set
# Equivalent to Set#delete_if, but returns nil if no changes were
# made.
- def reject!(&block)
- block or return enum_for(__method__)
+ def reject!
+ block_given? or return enum_for(__method__)
n = size
- delete_if(&block)
+ delete_if { |o| yield(o) }
size == n ? nil : self
end
# Equivalent to Set#keep_if, but returns nil if no changes were
# made.
- def select!(&block)
- block or return enum_for(__method__)
+ def select!
+ block_given? or return enum_for(__method__)
n = size
- keep_if(&block)
+ keep_if { |o| yield(o) }
size == n ? nil : self
end
@@ -335,15 +325,15 @@ class Set
def |(enum)
dup.merge(enum)
end
- alias + | ##
- alias union | ##
+ alias + | ##
+ alias union | ##
# Returns a new set built by duplicating the set, removing every
# element that appears in the given enumerable object.
def -(enum)
dup.subtract(enum)
end
- alias difference - ##
+ alias difference - ##
# Returns a new set containing elements common to the set and the
# given enumerable object.
@@ -352,7 +342,7 @@ class Set
do_with_enum(enum) { |o| n.add(o) if include?(o) }
n
end
- alias intersection & ##
+ alias intersection & ##
# Returns a new set containing elements exclusive between the set
# and the given enumerable object. (set ^ enum) is equivalent to
@@ -377,13 +367,13 @@ class Set
end
end
- def hash # :nodoc:
+ def hash # :nodoc:
@hash.hash
end
- def eql?(o) # :nodoc:
+ def eql?(o) # :nodoc:
return false unless o.is_a?(Set)
- @hash.eql?(o.instance_variable_get(:@hash))
+ @hash.eql?(o.instance_eval{@hash})
end
# Classifies the set by the return value of the given block and
@@ -434,23 +424,23 @@ class Set
if func.arity == 2
require 'tsort'
- class << dig = {} # :nodoc:
- include TSort
+ class << dig = {} # :nodoc:
+ include TSort
- alias tsort_each_node each_key
- def tsort_each_child(node, &block)
- fetch(node).each(&block)
- end
+ alias tsort_each_node each_key
+ def tsort_each_child(node, &block)
+ fetch(node).each(&block)
+ end
end
each { |u|
- dig[u] = a = []
- each{ |v| func.call(u, v) and a << v }
+ dig[u] = a = []
+ each{ |v| func.call(u, v) and a << v }
}
set = Set.new()
dig.each_strongly_connected_component { |css|
- set.add(self.class.new(css))
+ set.add(self.class.new(css))
}
set
else
@@ -477,153 +467,150 @@ class Set
end
end
- def pretty_print(pp) # :nodoc:
+ def pretty_print(pp) # :nodoc:
pp.text sprintf('#<%s: {', self.class.name)
pp.nest(1) {
pp.seplist(self) { |o|
- pp.pp o
+ pp.pp o
}
}
pp.text "}>"
end
- def pretty_print_cycle(pp) # :nodoc:
+ def pretty_print_cycle(pp) # :nodoc:
pp.text sprintf('#<%s: {%s}>', self.class.name, empty? ? '' : '...')
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
-#
+#
class SortedSet < Set
@@setup = false
class << self
- def [](*ary) # :nodoc:
+ def [](*ary) # :nodoc:
new(ary)
end
- def setup # :nodoc:
+ def setup # :nodoc:
@@setup and return
module_eval {
# a hack to shut up warning
alias old_init initialize
+ remove_method :old_init
}
begin
- require 'rbtree'
-
- module_eval %{
- def initialize(*args)
- @hash = RBTree.new
- super
- end
-
- def add(o)
- o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
- super
- end
- alias << add
- }
+ require 'rbtree'
+
+ module_eval %{
+ def initialize(*args, &block)
+ @hash = RBTree.new
+ super
+ end
+
+ def add(o)
+ o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
+ super
+ end
+ alias << add
+ }
rescue LoadError
- module_eval %{
- def initialize(*args)
- @keys = nil
- super
- end
-
- def clear
- @keys = nil
- super
- end
-
- def replace(enum)
- @keys = nil
- super
- end
-
- def add(o)
- o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
- @keys = nil
- super
- end
- alias << add
-
- def delete(o)
- @keys = nil
- @hash.delete(o)
- self
- end
-
- def delete_if
- block_given? or return enum_for(__method__)
- n = @hash.size
- super
- @keys = nil if @hash.size != n
- self
- end
-
- def keep_if
+ module_eval %{
+ def initialize(*args, &block)
+ @keys = nil
+ super
+ end
+
+ def clear
+ @keys = nil
+ super
+ end
+
+ def replace(enum)
+ @keys = nil
+ super
+ end
+
+ def add(o)
+ o.respond_to?(:<=>) or raise ArgumentError, "value must respond to <=>"
+ @keys = nil
+ super
+ end
+ alias << add
+
+ def delete(o)
+ @keys = nil
+ @hash.delete(o)
+ self
+ end
+
+ def delete_if
block_given? or return enum_for(__method__)
- n = @hash.size
- super
- @keys = nil if @hash.size != n
- self
- end
-
- def merge(enum)
- @keys = nil
- super
- end
-
- def each(&block)
- block or return enum_for(__method__)
- to_a.each(&block)
- self
- end
-
- def to_a
- (@keys = @hash.keys).sort! unless @keys
- @keys
- end
- }
+ n = @hash.size
+ super
+ @keys = nil if @hash.size != n
+ self
+ end
+
+ def keep_if
+ block_given? or return enum_for(__method__)
+ n = @hash.size
+ super
+ @keys = nil if @hash.size != n
+ self
+ end
+
+ def merge(enum)
+ @keys = nil
+ super
+ end
+
+ def each
+ block_given? or return enum_for(__method__)
+ to_a.each { |o| yield(o) }
+ self
+ end
+
+ def to_a
+ (@keys = @hash.keys).sort! unless @keys
+ @keys
+ end
+ }
end
- module_eval {
- # a hack to shut up warning
- remove_method :old_init
- }
@@setup = true
end
end
- def initialize(*args, &block) # :nodoc:
+ def initialize(*args, &block) # :nodoc:
SortedSet.setup
initialize(*args, &block)
end
@@ -670,54 +657,54 @@ end
#
# if @proc.arity == 2
# instance_eval %{
-# def add(o)
-# @hash[o] = true if @proc.call(self, o)
-# self
-# end
-# alias << add
-#
-# def add?(o)
-# if include?(o) || !@proc.call(self, o)
-# nil
-# else
-# @hash[o] = true
-# self
-# end
-# end
+# def add(o)
+# @hash[o] = true if @proc.call(self, o)
+# self
+# end
+# alias << add
+#
+# def add?(o)
+# if include?(o) || !@proc.call(self, o)
+# nil
+# else
+# @hash[o] = true
+# self
+# end
+# end
#
-# def replace(enum)
-# enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable"
-# clear
-# enum.each_entry { |o| add(o) }
+# def replace(enum)
+# enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable"
+# clear
+# enum.each_entry { |o| add(o) }
#
-# self
-# end
+# self
+# end
#
-# def merge(enum)
-# enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable"
-# enum.each_entry { |o| add(o) }
+# def merge(enum)
+# enum.respond_to?(:each) or raise ArgumentError, "value must be enumerable"
+# enum.each_entry { |o| add(o) }
#
-# self
-# end
+# self
+# end
# }
# else
# instance_eval %{
-# def add(o)
+# 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
-# else
-# @hash[o] = true
-# self
-# end
-# end
+# self
+# end
+# alias << add
+#
+# def add?(o)
+# if include?(o) || !@proc.call(o)
+# nil
+# else
+# @hash[o] = true
+# self
+# end
+# end
# }
# end
#
@@ -729,4 +716,634 @@ end
# end
# end
-# Tests have been moved to test/test_set.rb.
+if $0 == __FILE__
+ eval DATA.read, nil, $0, __LINE__+4
+end
+
+__END__
+
+require 'test/unit'
+
+class TC_Set < Test::Unit::TestCase
+ def test_aref
+ assert_nothing_raised {
+ Set[]
+ Set[nil]
+ Set[1,2,3]
+ }
+
+ assert_equal(0, Set[].size)
+ assert_equal(1, Set[nil].size)
+ assert_equal(1, Set[[]].size)
+ assert_equal(1, Set[[nil]].size)
+
+ set = Set[2,4,6,4]
+ assert_equal(Set.new([2,4,6]), set)
+ end
+
+ def test_s_new
+ assert_nothing_raised {
+ Set.new()
+ Set.new(nil)
+ Set.new([])
+ Set.new([1,2])
+ Set.new('a'..'c')
+ }
+ assert_raises(ArgumentError) {
+ Set.new(false)
+ }
+ assert_raises(ArgumentError) {
+ Set.new(1)
+ }
+ assert_raises(ArgumentError) {
+ Set.new(1,2)
+ }
+
+ assert_equal(0, Set.new().size)
+ assert_equal(0, Set.new(nil).size)
+ assert_equal(0, Set.new([]).size)
+ assert_equal(1, Set.new([nil]).size)
+
+ ary = [2,4,6,4]
+ set = Set.new(ary)
+ ary.clear
+ assert_equal(false, set.empty?)
+ assert_equal(3, set.size)
+
+ ary = [1,2,3]
+
+ s = Set.new(ary) { |o| o * 2 }
+ assert_equal([2,4,6], s.sort)
+ end
+
+ def test_clone
+ set1 = Set.new
+ set2 = set1.clone
+ set1 << 'abc'
+ assert_equal(Set.new, set2)
+ end
+
+ def test_dup
+ set1 = Set[1,2]
+ set2 = set1.dup
+
+ assert_not_same(set1, set2)
+
+ assert_equal(set1, set2)
+
+ set1.add(3)
+
+ assert_not_equal(set1, set2)
+ end
+
+ def test_size
+ assert_equal(0, Set[].size)
+ assert_equal(2, Set[1,2].size)
+ assert_equal(2, Set[1,2,1].size)
+ end
+
+ def test_empty?
+ assert_equal(true, Set[].empty?)
+ assert_equal(false, Set[1, 2].empty?)
+ end
+
+ def test_clear
+ set = Set[1,2]
+ ret = set.clear
+
+ assert_same(set, ret)
+ assert_equal(true, set.empty?)
+ end
+
+ def test_replace
+ set = Set[1,2]
+ ret = set.replace('a'..'c')
+
+ assert_same(set, ret)
+ assert_equal(Set['a','b','c'], set)
+ end
+
+ def test_to_a
+ set = Set[1,2,3,2]
+ ary = set.to_a
+
+ assert_equal([1,2,3], ary.sort)
+ end
+
+ def test_flatten
+ # test1
+ set1 = Set[
+ 1,
+ Set[
+ 5,
+ Set[7,
+ Set[0]
+ ],
+ Set[6,2],
+ 1
+ ],
+ 3,
+ Set[3,4]
+ ]
+
+ set2 = set1.flatten
+ set3 = Set.new(0..7)
+
+ assert_not_same(set2, set1)
+ assert_equal(set3, set2)
+
+ # test2; destructive
+ orig_set1 = set1
+ set1.flatten!
+
+ assert_same(orig_set1, set1)
+ assert_equal(set3, set1)
+
+ # test3; multiple occurrences of a set in an set
+ set1 = Set[1, 2]
+ set2 = Set[set1, Set[set1, 4], 3]
+
+ assert_nothing_raised {
+ set2.flatten!
+ }
+
+ assert_equal(Set.new(1..4), set2)
+
+ # test4; recursion
+ set2 = Set[]
+ set1 = Set[1, set2]
+ set2.add(set1)
+
+ assert_raises(ArgumentError) {
+ set1.flatten!
+ }
+
+ # test5; miscellaneous
+ empty = Set[]
+ set = Set[Set[empty, "a"],Set[empty, "b"]]
+
+ assert_nothing_raised {
+ set.flatten
+ }
+
+ set1 = empty.merge(Set["no_more", set])
+
+ assert_nil(Set.new(0..31).flatten!)
+
+ x = Set[Set[],Set[1,2]].flatten!
+ y = Set[1,2]
+
+ assert_equal(x, y)
+ end
+
+ def test_include?
+ set = Set[1,2,3]
+
+ assert_equal(true, set.include?(1))
+ assert_equal(true, set.include?(2))
+ assert_equal(true, set.include?(3))
+ assert_equal(false, set.include?(0))
+ assert_equal(false, set.include?(nil))
+
+ set = Set["1",nil,"2",nil,"0","1",false]
+ assert_equal(true, set.include?(nil))
+ assert_equal(true, set.include?(false))
+ assert_equal(true, set.include?("1"))
+ assert_equal(false, set.include?(0))
+ assert_equal(false, set.include?(true))
+ end
+
+ def test_superset?
+ set = Set[1,2,3]
+
+ assert_raises(ArgumentError) {
+ set.superset?()
+ }
+
+ assert_raises(ArgumentError) {
+ set.superset?(2)
+ }
+
+ assert_raises(ArgumentError) {
+ set.superset?([2])
+ }
+
+ assert_equal(true, set.superset?(Set[]))
+ assert_equal(true, set.superset?(Set[1,2]))
+ assert_equal(true, set.superset?(Set[1,2,3]))
+ assert_equal(false, set.superset?(Set[1,2,3,4]))
+ assert_equal(false, set.superset?(Set[1,4]))
+
+ assert_equal(true, Set[].superset?(Set[]))
+ end
+
+ def test_proper_superset?
+ set = Set[1,2,3]
+
+ assert_raises(ArgumentError) {
+ set.proper_superset?()
+ }
+
+ assert_raises(ArgumentError) {
+ set.proper_superset?(2)
+ }
+
+ assert_raises(ArgumentError) {
+ set.proper_superset?([2])
+ }
+
+ assert_equal(true, set.proper_superset?(Set[]))
+ assert_equal(true, set.proper_superset?(Set[1,2]))
+ assert_equal(false, set.proper_superset?(Set[1,2,3]))
+ assert_equal(false, set.proper_superset?(Set[1,2,3,4]))
+ assert_equal(false, set.proper_superset?(Set[1,4]))
+
+ assert_equal(false, Set[].proper_superset?(Set[]))
+ end
+
+ def test_subset?
+ set = Set[1,2,3]
+
+ assert_raises(ArgumentError) {
+ set.subset?()
+ }
+
+ assert_raises(ArgumentError) {
+ set.subset?(2)
+ }
+
+ assert_raises(ArgumentError) {
+ set.subset?([2])
+ }
+
+ assert_equal(true, set.subset?(Set[1,2,3,4]))
+ assert_equal(true, set.subset?(Set[1,2,3]))
+ assert_equal(false, set.subset?(Set[1,2]))
+ assert_equal(false, set.subset?(Set[]))
+
+ assert_equal(true, Set[].subset?(Set[1]))
+ assert_equal(true, Set[].subset?(Set[]))
+ end
+
+ def test_proper_subset?
+ set = Set[1,2,3]
+
+ assert_raises(ArgumentError) {
+ set.proper_subset?()
+ }
+
+ assert_raises(ArgumentError) {
+ set.proper_subset?(2)
+ }
+
+ assert_raises(ArgumentError) {
+ set.proper_subset?([2])
+ }
+
+ assert_equal(true, set.proper_subset?(Set[1,2,3,4]))
+ assert_equal(false, set.proper_subset?(Set[1,2,3]))
+ assert_equal(false, set.proper_subset?(Set[1,2]))
+ assert_equal(false, set.proper_subset?(Set[]))
+
+ assert_equal(false, Set[].proper_subset?(Set[]))
+ end
+
+ def test_each
+ ary = [1,3,5,7,10,20]
+ set = Set.new(ary)
+
+ ret = set.each { |o| }
+ assert_same(set, ret)
+
+ e = set.each
+ assert_instance_of(Enumerator, e)
+
+ assert_nothing_raised {
+ set.each { |o|
+ ary.delete(o) or raise "unexpected element: #{o}"
+ }
+
+ ary.empty? or raise "forgotten elements: #{ary.join(', ')}"
+ }
+ end
+
+ def test_add
+ set = Set[1,2,3]
+
+ ret = set.add(2)
+ assert_same(set, ret)
+ assert_equal(Set[1,2,3], set)
+
+ ret = set.add?(2)
+ assert_nil(ret)
+ assert_equal(Set[1,2,3], set)
+
+ ret = set.add(4)
+ assert_same(set, ret)
+ assert_equal(Set[1,2,3,4], set)
+
+ ret = set.add?(5)
+ assert_same(set, ret)
+ assert_equal(Set[1,2,3,4,5], set)
+ end
+
+ def test_delete
+ set = Set[1,2,3]
+
+ ret = set.delete(4)
+ assert_same(set, ret)
+ assert_equal(Set[1,2,3], set)
+
+ ret = set.delete?(4)
+ assert_nil(ret)
+ assert_equal(Set[1,2,3], set)
+
+ ret = set.delete(2)
+ assert_equal(set, ret)
+ assert_equal(Set[1,3], set)
+
+ ret = set.delete?(1)
+ assert_equal(set, ret)
+ assert_equal(Set[3], set)
+ end
+
+ def test_delete_if
+ set = Set.new(1..10)
+ ret = set.delete_if { |i| i > 10 }
+ assert_same(set, ret)
+ assert_equal(Set.new(1..10), set)
+
+ set = Set.new(1..10)
+ ret = set.delete_if { |i| i % 3 == 0 }
+ assert_same(set, ret)
+ assert_equal(Set[1,2,4,5,7,8,10], set)
+ end
+
+ def test_collect!
+ set = Set[1,2,3,'a','b','c',-1..1,2..4]
+
+ ret = set.collect! { |i|
+ case i
+ when Numeric
+ i * 2
+ when String
+ i.upcase
+ else
+ nil
+ end
+ }
+
+ assert_same(set, ret)
+ assert_equal(Set[2,4,6,'A','B','C',nil], set)
+ end
+
+ def test_reject!
+ set = Set.new(1..10)
+
+ ret = set.reject! { |i| i > 10 }
+ assert_nil(ret)
+ assert_equal(Set.new(1..10), set)
+
+ ret = set.reject! { |i| i % 3 == 0 }
+ assert_same(set, ret)
+ assert_equal(Set[1,2,4,5,7,8,10], set)
+ end
+
+ def test_merge
+ set = Set[1,2,3]
+
+ ret = set.merge([2,4,6])
+ assert_same(set, ret)
+ assert_equal(Set[1,2,3,4,6], set)
+ end
+
+ def test_subtract
+ set = Set[1,2,3]
+
+ ret = set.subtract([2,4,6])
+ assert_same(set, ret)
+ assert_equal(Set[1,3], set)
+ end
+
+ def test_plus
+ set = Set[1,2,3]
+
+ ret = set + [2,4,6]
+ assert_not_same(set, ret)
+ assert_equal(Set[1,2,3,4,6], ret)
+ end
+
+ def test_minus
+ set = Set[1,2,3]
+
+ ret = set - [2,4,6]
+ assert_not_same(set, ret)
+ assert_equal(Set[1,3], ret)
+ end
+
+ def test_and
+ set = Set[1,2,3,4]
+
+ ret = set & [2,4,6]
+ assert_not_same(set, ret)
+ assert_equal(Set[2,4], ret)
+ end
+
+ def test_xor
+ set = Set[1,2,3,4]
+ ret = set ^ [2,4,5,5]
+ assert_not_same(set, ret)
+ assert_equal(Set[1,3,5], ret)
+ end
+
+ def test_eq
+ set1 = Set[2,3,1]
+ set2 = Set[1,2,3]
+
+ assert_equal(set1, set1)
+ assert_equal(set1, set2)
+ assert_not_equal(Set[1], [1])
+
+ set1 = Class.new(Set)["a", "b"]
+ set2 = Set["a", "b", set1]
+ set1 = set1.add(set1.clone)
+
+# assert_equal(set1, set2)
+# assert_equal(set2, set1)
+ assert_equal(set2, set2.clone)
+ assert_equal(set1.clone, set1)
+
+ assert_not_equal(Set[Exception.new,nil], Set[Exception.new,Exception.new], "[ruby-dev:26127]")
+ end
+
+ # def test_hash
+ # end
+
+ # def test_eql?
+ # end
+
+ def test_classify
+ set = Set.new(1..10)
+ ret = set.classify { |i| i % 3 }
+
+ assert_equal(3, ret.size)
+ assert_instance_of(Hash, ret)
+ ret.each_value { |value| assert_instance_of(Set, value) }
+ assert_equal(Set[3,6,9], ret[0])
+ assert_equal(Set[1,4,7,10], ret[1])
+ assert_equal(Set[2,5,8], ret[2])
+ end
+
+ def test_divide
+ set = Set.new(1..10)
+ ret = set.divide { |i| i % 3 }
+
+ assert_equal(3, ret.size)
+ n = 0
+ ret.each { |s| n += s.size }
+ assert_equal(set.size, n)
+ assert_equal(set, ret.flatten)
+
+ set = Set[7,10,5,11,1,3,4,9,0]
+ ret = set.divide { |a,b| (a - b).abs == 1 }
+
+ assert_equal(4, ret.size)
+ n = 0
+ ret.each { |s| n += s.size }
+ assert_equal(set.size, n)
+ assert_equal(set, ret.flatten)
+ ret.each { |s|
+ if s.include?(0)
+ assert_equal(Set[0,1], s)
+ elsif s.include?(3)
+ assert_equal(Set[3,4,5], s)
+ elsif s.include?(7)
+ assert_equal(Set[7], s)
+ elsif s.include?(9)
+ assert_equal(Set[9,10,11], s)
+ else
+ raise "unexpected group: #{s.inspect}"
+ end
+ }
+ end
+
+ def test_inspect
+ set1 = Set[1]
+
+ assert_equal('#<Set: {1}>', set1.inspect)
+
+ set2 = Set[Set[0], 1, 2, set1]
+ assert_equal(false, set2.inspect.include?('#<Set: {...}>'))
+
+ set1.add(set2)
+ assert_equal(true, set1.inspect.include?('#<Set: {...}>'))
+ end
+
+ # def test_pretty_print
+ # end
+
+ # def test_pretty_print_cycle
+ # end
+end
+
+class TC_SortedSet < Test::Unit::TestCase
+ def test_sortedset
+ s = SortedSet[4,5,3,1,2]
+
+ assert_equal([1,2,3,4,5], s.to_a)
+
+ prev = nil
+ s.each { |o| assert(prev < o) if prev; prev = o }
+ assert_not_nil(prev)
+
+ s.map! { |o| -2 * o }
+
+ assert_equal([-10,-8,-6,-4,-2], s.to_a)
+
+ prev = nil
+ ret = s.each { |o| assert(prev < o) if prev; prev = o }
+ assert_not_nil(prev)
+ assert_same(s, ret)
+
+ s = SortedSet.new([2,1,3]) { |o| o * -2 }
+ assert_equal([-6,-4,-2], s.to_a)
+
+ s = SortedSet.new(['one', 'two', 'three', 'four'])
+ a = []
+ ret = s.delete_if { |o| a << o; o.start_with?('t') }
+ assert_same(s, ret)
+ assert_equal(['four', 'one'], s.to_a)
+ assert_equal(['four', 'one', 'three', 'two'], a)
+
+ s = SortedSet.new(['one', 'two', 'three', 'four'])
+ a = []
+ ret = s.reject! { |o| a << o; o.start_with?('t') }
+ assert_same(s, ret)
+ assert_equal(['four', 'one'], s.to_a)
+ assert_equal(['four', 'one', 'three', 'two'], a)
+
+ s = SortedSet.new(['one', 'two', 'three', 'four'])
+ a = []
+ ret = s.reject! { |o| a << o; false }
+ assert_same(nil, ret)
+ assert_equal(['four', 'one', 'three', 'two'], s.to_a)
+ assert_equal(['four', 'one', 'three', 'two'], a)
+ end
+end
+
+class TC_Enumerable < Test::Unit::TestCase
+ def test_to_set
+ ary = [2,5,4,3,2,1,3]
+
+ set = ary.to_set
+ assert_instance_of(Set, set)
+ assert_equal([1,2,3,4,5], set.sort)
+
+ set = ary.to_set { |o| o * -2 }
+ assert_instance_of(Set, set)
+ assert_equal([-10,-8,-6,-4,-2], set.sort)
+
+ set = ary.to_set(SortedSet)
+ assert_instance_of(SortedSet, set)
+ assert_equal([1,2,3,4,5], set.to_a)
+
+ set = ary.to_set(SortedSet) { |o| o * -2 }
+ assert_instance_of(SortedSet, set)
+ assert_equal([-10,-8,-6,-4,-2], set.sort)
+ end
+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
+# end
diff --git a/lib/shell.rb b/lib/shell.rb
index 8c91090414..d2ce26d3b3 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -1,8 +1,8 @@
#
# shell.rb -
-# $Release Version: 0.7 $
-# $Revision: 1.9 $
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision: 1.9 $
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
@@ -19,73 +19,6 @@ require "shell/error"
require "shell/command-processor"
require "shell/process-controller"
-# Shell implements an idiomatic Ruby interface for common UNIX shell commands.
-#
-# It provides users the ability to execute commands with filters and pipes,
-# like +sh+/+csh+ by using native facilities of Ruby.
-#
-# == Examples
-#
-# === Temp file creation
-#
-# In this example we will create three +tmpFile+'s in three different folders
-# under the +/tmp+ directory.
-#
-# sh = Shell.cd("/tmp") # Change to the /tmp directory
-# sh.mkdir "shell-test-1" unless sh.exists?("shell-test-1")
-# # make the 'shell-test-1' directory if it doesn't already exist
-# sh.cd("shell-test-1") # Change to the /tmp/shell-test-1 directory
-# for dir in ["dir1", "dir3", "dir5"]
-# if !sh.exists?(dir)
-# sh.mkdir dir # make dir if it doesnt' already exist
-# sh.cd(dir) do
-# # change to the `dir` directory
-# f = sh.open("tmpFile", "w") # open a new file in write mode
-# f.print "TEST\n" # write to the file
-# f.close # close the file handler
-# end
-# print sh.pwd # output the process working directory
-# end
-# end
-#
-# === Temp file creationg with self
-#
-# This example is identical to the first, except we're using
-# CommandProcessor#transact.
-#
-# CommandProcessor#transact executes the given block against self, in this case
-# +sh+; our Shell object. Within the block we can substitute +sh.cd+ to +cd+,
-# because the scope within the block uses +sh+ already.
-#
-# sh = Shell.cd("/tmp")
-# sh.transact do
-# mkdir "shell-test-1" unless exists?("shell-test-1")
-# cd("shell-test-1")
-# for dir in ["dir1", "dir3", "dir5"]
-# if !exists?(dir)
-# mkdir dir
-# cd(dir) do
-# f = open("tmpFile", "w")
-# f.print "TEST\n"
-# f.close
-# end
-# print pwd
-# end
-# end
-# end
-#
-# === Pipe /etc/printcap into a file
-#
-# In this example we will read the operating system file +/etc/printcap+,
-# generated by +cupsd+, and then output it to a new file relative to the +pwd+
-# of +sh+.
-#
-# sh = Shell.new
-# sh.cat("/etc/printcap") | sh.tee("tee1") > "tee2"
-# (sh.cat < "/etc/printcap") | sh.tee("tee11") > "tee12"
-# sh.cat("/etc/printcap") | sh.tee("tee1") >> "tee2"
-# (sh.cat < "/etc/printcap") | sh.tee("tee11") >> "tee12"
-#
class Shell
@RCS_ID='-$Id: shell.rb,v 1.9 2002/03/04 12:01:10 keiju Exp keiju $-'
@@ -118,50 +51,27 @@ class Shell
@verbose = val if val
end
-
- # call-seq:
- # Shell.cd(path)
- #
- # Creates a new Shell instance with the current working directory
- # set to +path+.
def cd(path)
new(path)
end
- # Returns the directories in the current shell's PATH environment variable
- # as an array of directory names. This sets the system_path for all
- # instances of Shell.
- #
- # Example: If in your current shell, you did:
- #
- # $ echo $PATH
- # /usr/bin:/bin:/usr/local/bin
- #
- # Running this method in the above shell would then return:
- #
- # ["/usr/bin", "/bin", "/usr/local/bin"]
- #
def default_system_path
if @default_system_path
- @default_system_path
+ @default_system_path
else
- ENV["PATH"].split(":")
+ ENV["PATH"].split(":")
end
end
- # Sets the system_path that new instances of Shell should have as their
- # initial system_path.
- #
- # +path+ should be an array of directory name strings.
def default_system_path=(path)
@default_system_path = path
end
def default_record_separator
if @default_record_separator
- @default_record_separator
+ @default_record_separator
else
- $/
+ $/
end
end
@@ -177,11 +87,6 @@ class Shell
end
- # call-seq:
- # Shell.new(pwd, umask) -> obj
- #
- # Creates a Shell object which current directory is set to the process
- # current directory, unless otherwise specified by the +pwd+ argument.
def initialize(pwd = Dir.pwd, umask = nil)
@cwd = File.expand_path(pwd)
@dir_stack = []
@@ -197,21 +102,14 @@ class Shell
@debug = Shell.debug
end
- # Returns the command search path in an array
attr_reader :system_path
- # Sets the system path (the Shell instance's PATH environment variable).
- #
- # +path+ should be an array of directory name strings.
def system_path=(path)
@system_path = path
rehash
end
-
- # Returns the umask
- attr_accessor :umask
- attr_accessor :record_separator
+ attr_accessor :umask, :record_separator
attr_accessor :verbose, :debug
def debug=(val)
@@ -241,7 +139,6 @@ class Shell
# Shell#mkdir
# Shell#rmdir
- # Returns the current working directory.
attr_reader :cwd
alias dir cwd
alias getwd cwd
@@ -250,13 +147,6 @@ class Shell
attr_reader :dir_stack
alias dirs dir_stack
- # call-seq:
- # Shell.chdir(path)
- #
- # Creates a Shell object which current directory is set to +path+.
- #
- # If a block is given, it restores the current directory when the block ends.
- #
# If called as iterator, it restores the current directory when the
# block ends.
def chdir(path = nil, verbose = @verbose)
@@ -266,10 +156,10 @@ class Shell
notify("chdir(with block) #{path}") if verbose
cwd_old = @cwd
begin
- chdir(path, nil)
- yield
+ chdir(path, nil)
+ yield
ensure
- chdir(cwd_old, nil)
+ chdir(cwd_old, nil)
end
else
notify("chdir #{path}") if verbose
@@ -282,17 +172,6 @@ class Shell
end
alias cd chdir
- # call-seq:
- # pushdir(path)
- # pushdir(path) { &block }
- #
- # Pushes the current directory to the directory stack, changing the current
- # directory to +path+.
- #
- # If +path+ is omitted, it exchanges its current directory and the top of its
- # directory stack.
- #
- # If a block is given, it restores the current directory when the block ends.
def pushdir(path = nil, verbose = @verbose)
check_point
@@ -300,9 +179,9 @@ class Shell
notify("pushdir(with block) #{path}") if verbose
pushdir(path, nil)
begin
- yield
+ yield
ensure
- popdir
+ popdir
end
elsif path
notify("pushdir #{path}") if verbose
@@ -313,20 +192,18 @@ class Shell
else
notify("pushdir") if verbose
if pop = @dir_stack.pop
- @dir_stack.push @cwd
- chdir pop
- notify "dir stack: [#{@dir_stack.join ', '}]"
- self
+ @dir_stack.push @cwd
+ chdir pop
+ notify "dir stack: [#{@dir_stack.join ', '}]"
+ self
else
- Shell.Fail DirStackEmpty
+ Shell.Fail DirStackEmpty
end
end
Void.new(self)
end
alias pushd pushdir
- # Pops a directory from the directory stack, and sets the current directory
- # to it.
def popdir
check_point
@@ -342,40 +219,36 @@ class Shell
end
alias popd popdir
- # Returns a list of scheduled jobs.
+ #
+ # process management
+ #
def jobs
@process_controller.jobs
end
- # call-seq:
- # kill(signal, job)
- #
- # Sends the given +signal+ to the given +job+
def kill(sig, command)
@process_controller.kill_job(sig, command)
end
- # Convenience method for Shell::CommandProcessor.def_system_command
+ #
+ # command definitions
+ #
def Shell.def_system_command(command, path = command)
CommandProcessor.def_system_command(command, path)
end
- # Convenience method for Shell::CommandProcessor.undef_system_command
def Shell.undef_system_command(command)
CommandProcessor.undef_system_command(command)
end
- # Convenience method for Shell::CommandProcessor.alias_command
def Shell.alias_command(ali, command, *opts, &block)
CommandProcessor.alias_command(ali, command, *opts, &block)
end
- # Convenience method for Shell::CommandProcessor.unalias_command
def Shell.unalias_command(ali)
CommandProcessor.unalias_command(ali)
end
- # Convenience method for Shell::CommandProcessor.install_system_commands
def Shell.install_system_commands(pre = "sys_")
CommandProcessor.install_system_commands(pre)
end
@@ -389,35 +262,35 @@ class Shell
end
end
- def self.notify(*opts)
+ def self.notify(*opts, &block)
Shell::debug_output_synchronize do
if opts[-1].kind_of?(String)
- yorn = verbose?
+ yorn = verbose?
else
- yorn = opts.pop
+ 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
+ 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
else
- prefix = "shell: "
+ prefix = "shell: "
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
+ mes = mes.dup
+ yield mes if iterator?
+ if _head
+ _head = false
+# "shell" " + mes
+ prefix + mes
+ else
+ " "* prefix.size + mes
+ end
}.join("\n")+"\n"
end
end
diff --git a/lib/shell/builtin-command.rb b/lib/shell/builtin-command.rb
index b1ca5c38f6..e489da4eca 100644
--- a/lib/shell/builtin-command.rb
+++ b/lib/shell/builtin-command.rb
@@ -1,8 +1,8 @@
#
# shell/builtin-command.rb -
-# $Release Version: 0.7 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
@@ -40,7 +40,7 @@ class Shell
def each(rs = nil)
rs = @shell.record_separator unless rs
for str in @strings
- yield str + rs
+ yield str + rs
end
end
end
@@ -53,11 +53,11 @@ class Shell
def each(rs = nil)
if @cat_files.empty?
- super
+ super
else
- for src in @cat_files
- @shell.foreach(src, rs){|l| yield l}
- end
+ for src in @cat_files
+ @shell.foreach(src, rs){|l| yield l}
+ end
end
end
end
@@ -71,14 +71,14 @@ class Shell
def each(rs = nil)
if @pattern[0] == ?/
- @files = Dir[@pattern]
+ @files = Dir[@pattern]
else
- prefix = @shell.pwd+"/"
- @files = Dir[prefix+@pattern].collect{|p| p.sub(prefix, "")}
+ prefix = @shell.pwd+"/"
+ @files = Dir[prefix+@pattern].collect{|p| p.sub(prefix, "")}
end
rs = @shell.record_separator unless rs
for f in @files
- yield f+rs
+ yield f+rs
end
end
end
@@ -90,9 +90,9 @@ class Shell
#
# def each(rs = nil)
# ary = []
-# super{|l| ary.push l}
+# super{|l| ary.push l}
# for l in ary.sort!
-# yield l
+# yield l
# end
# end
# end
@@ -107,7 +107,7 @@ class Shell
def input=(filter)
@input.input=filter
for l in @input
- @io << l
+ @io << l
end
end
@@ -122,9 +122,9 @@ class Shell
def input=(filter)
begin
- super
+ super
ensure
- @io.close
+ @io.close
end
end
end
@@ -138,9 +138,9 @@ class Shell
def each(rs = nil)
to = @shell.open(@to_filename, "w")
begin
- super{|l| to << l; yield l}
+ super{|l| to << l; yield l}
ensure
- to.close
+ to.close
end
end
end
@@ -153,7 +153,7 @@ class Shell
def each(rs = nil)
while job = @jobs.shift
- job.each{|l| yield l}
+ job.each{|l| yield l}
end
end
end
diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
index f52d0ead6d..f3f2bf05b6 100644
--- a/lib/shell/command-processor.rb
+++ b/lib/shell/command-processor.rb
@@ -1,8 +1,8 @@
#
# shell/command-controller.rb -
-# $Release Version: 0.7 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
@@ -18,11 +18,6 @@ require "shell/system-command"
require "shell/builtin-command"
class Shell
- # In order to execute a command on your OS, you need to define it as a
- # Shell method.
- #
- # Alternatively, you can execute any command via
- # Shell::CommandProcessor#system even if it is not defined.
class CommandProcessor
# include Error
@@ -42,11 +37,11 @@ class Shell
# define CommandProcessor#methods to Shell#methods and Filter#methods
for m in CommandProcessor.instance_methods(false) - NoDelegateMethods
- add_delegate_command_to_shell(m)
+ add_delegate_command_to_shell(m)
end
def self.method_added(id)
- add_delegate_command_to_shell(id)
+ add_delegate_command_to_shell(id)
end
end
@@ -55,14 +50,14 @@ class Shell
#
def self.run_config
begin
- load File.expand_path("~/.rb_shell") if ENV.key?("HOME")
+ load File.expand_path("~/.rb_shell") if ENV.key?("HOME")
rescue LoadError, Errno::ENOENT
rescue
- print "load error: #{rc}\n"
- print $!.class, ": ", $!, "\n"
- for err in $@[0, $@.size - 2]
- print "\t", err, "\n"
- end
+ print "load error: #{rc}\n"
+ print $!.class, ": ", $!, "\n"
+ for err in $@[0, $@.size - 2]
+ print "\t", err, "\n"
+ end
end
end
@@ -73,94 +68,108 @@ class Shell
#
# CommandProcessor#expand_path(path)
- # path: String
- # return: String
- # returns the absolute path for <path>
+ # path: String
+ # return: String
+ # returns the absolute path for <path>
#
def expand_path(path)
@shell.expand_path(path)
end
- # call-seq:
- # foreach(path, record_separator) -> Enumerator
- # foreach(path, record_separator) { block }
#
- # See IO.foreach when +path+ is a file.
+ # File related commands
+ # Shell#foreach
+ # Shell#open
+ # Shell#unlink
+ # Shell#test
#
- # See Dir.foreach when +path+ is a directory.
+ # -
+ #
+ # CommandProcessor#foreach(path, rs)
+ # path: String
+ # rs: String - record separator
+ # iterator
+ # Same as:
+ # File#foreach (when path is file)
+ # Dir#foreach (when path is directory)
+ # path is relative to pwd
#
def foreach(path = nil, *rs)
path = "." unless path
path = expand_path(path)
if File.directory?(path)
- Dir.foreach(path){|fn| yield fn}
+ Dir.foreach(path){|fn| yield fn}
else
- IO.foreach(path, *rs){|l| yield l}
+ IO.foreach(path, *rs){|l| yield l}
end
end
- # call-seq:
- # open(path, mode, permissions) -> Enumerator
- # open(path, mode, permissions) { block }
- #
- # See IO.open when +path+ is a file.
#
- # See Dir.open when +path+ is a directory.
+ # CommandProcessor#open(path, mode)
+ # path: String
+ # mode: String
+ # return: File or Dir
+ # Same as:
+ # File#open (when path is file)
+ # Dir#open (when path is directory)
+ # mode has an effect only when path is a file
#
def open(path, mode = nil, perm = 0666, &b)
path = expand_path(path)
if File.directory?(path)
- Dir.open(path, &b)
+ Dir.open(path, &b)
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)
- end
+ 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)
+ end
end
end
# public :open
- # call-seq:
- # unlink(path)
- #
- # See IO.unlink when +path+ is a file.
#
- # See Dir.unlink when +path+ is a directory.
+ # CommandProcessor#unlink(path)
+ # same as:
+ # Dir#unlink (when path is directory)
+ # File#unlink (when path is file)
#
def unlink(path)
@shell.check_point
path = expand_path(path)
if File.directory?(path)
- Dir.unlink(path)
+ Dir.unlink(path)
else
- IO.unlink(path)
+ IO.unlink(path)
end
Void.new(@shell)
end
- # See Shell::CommandProcessor#test
- alias top_level_test test
- # call-seq:
- # test(command, file1, file2) -> true or false
- # [command, file1, file2] -> true or false
- #
- # Tests if the given +command+ exists in +file1+, or optionally +file2+.
#
- # Example:
- # sh[?e, "foo"]
- # sh[:e, "foo"]
- # sh["e", "foo"]
- # sh[:exists?, "foo"]
- # sh["exists?", "foo"]
+ # CommandProcessor#test(command, file1, file2)
+ # CommandProcessor#[command, file1, file2]
+ # command: char or String or Symbol
+ # file1: String
+ # file2: String(optional)
+ # return: Boolean
+ # same as:
+ # test() (when command is char or length 1 string or symbol)
+ # FileTest.command (others)
+ # example:
+ # sh[?e, "foo"]
+ # sh[:e, "foo"]
+ # 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
@@ -168,137 +177,132 @@ class Shell
case command
when Integer
- if file2
- top_level_test(command, file1, file2)
- else
- top_level_test(command, file1)
- end
+ if file2
+ top_level_test(command, file1, file2)
+ else
+ top_level_test(command, file1)
+ end
when String
- if command.size == 1
- if file2
- top_level_test(command, file1, file2)
- else
- top_level_test(command, file1)
- end
- else
- if file2
- FileTest.send(command, file1, file2)
- else
- FileTest.send(command, file1)
- end
- end
+ if command.size == 1
+ if file2
+ top_level_test(command, file1, file2)
+ else
+ top_level_test(command, file1)
+ end
+ else
+ if file2
+ FileTest.send(command, file1, file2)
+ else
+ FileTest.send(command, file1)
+ end
+ end
end
end
- # See Shell::CommandProcessor#test
alias [] test
- # call-seq:
- # mkdir(path)
#
- # Same as Dir.mkdir, except multiple directories are allowed.
+ # Dir related methods
+ #
+ # Shell#mkdir
+ # Shell#rmdir
+ #
+ #--
+ #
+ # 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
+ 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
+ d = expand_path(dir)
+ if perm
+ Dir.mkdir(d, perm)
+ else
+ Dir.mkdir(d)
+ end
+ File.chmod(d, 0666 & ~@shell.umask) if @shell.umask
end
Void.new(@shell)
end
- # call-seq:
- # rmdir(path)
#
- # Same as Dir.rmdir, except multiple directories are allowed.
+ # 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))
+ Dir.rmdir(expand_path(dir))
end
Void.new(@shell)
end
- # call-seq:
- # system(command, *options) -> SystemCommand
- #
- # Executes the given +command+ with the +options+ parameter.
#
- # Example:
- # print sh.system("ls", "-l")
- # sh.system("ls", "-l") | sh.head > STDOUT
+ # CommandProcessor#system(command, *opts)
+ # command: String
+ # opts: String
+ # return: SystemCommand
+ # Same as system() function
+ # example:
+ # print sh.system("ls", "-l")
+ # sh.system("ls", "-l") | sh.head > STDOUT
#
def system(command, *opts)
if opts.empty?
- if command =~ /\*|\?|\{|\}|\[|\]|<|>|\(|\)|~|&|\||\\|\$|;|'|`|"|\n/
- return SystemCommand.new(@shell, find_system_command("sh"), "-c", command)
- else
- command, *opts = command.split(/\s+/)
- end
+ if command =~ /\*|\?|\{|\}|\[|\]|<|>|\(|\)|~|&|\||\\|\$|;|'|`|"|\n/
+ return SystemCommand.new(@shell, find_system_command("sh"), "-c", command)
+ else
+ command, *opts = command.split(/\s+/)
+ end
end
SystemCommand.new(@shell, find_system_command(command), *opts)
end
- # call-seq:
- # rehash
#
- # Clears the command hash table.
+ # ProcessCommand#rehash
+ # clear command hash table.
+ #
def rehash
@system_commands = {}
end
- def check_point # :nodoc:
+ #
+ # ProcessCommand#transact
+ #
+ def check_point
@shell.process_controller.wait_all_jobs_execution
end
- alias finish_all_jobs check_point # :nodoc:
+ alias finish_all_jobs check_point
- # call-seq:
- # transact { block }
- #
- # Executes a block as self
- #
- # Example:
- # sh.transact { system("ls", "-l") | head > STDOUT }
def transact(&block)
begin
- @shell.instance_eval(&block)
+ @shell.instance_eval(&block)
ensure
- check_point
+ check_point
end
end
- # call-seq:
- # out(device) { block }
#
- # Calls <code>device.print</code> on the result passing the _block_ to
- # #transact
+ # internal commands
+ #
def out(dev = STDOUT, &block)
dev.print transact(&block)
end
- # call-seq:
- # echo(*strings) -> Echo
- #
- # Returns a Echo object, for the given +strings+
def echo(*strings)
Echo.new(@shell, *strings)
end
- # call-seq:
- # cat(*filename) -> Cat
- #
- # Returns a Cat object, for the given +filenames+
def cat(*filenames)
Cat.new(@shell, *filenames)
end
@@ -306,10 +310,7 @@ class Shell
# def sort(*filenames)
# Sort.new(self, *filenames)
# end
- # call-seq:
- # glob(pattern) -> Glob
- #
- # Returns a Glob filter object, with the given +pattern+ object
+
def glob(pattern)
Glob.new(@shell, pattern)
end
@@ -317,37 +318,29 @@ class Shell
def append(to, filter)
case to
when String
- AppendFile.new(@shell, to, filter)
+ AppendFile.new(@shell, to, filter)
when IO
- AppendIO.new(@shell, to, filter)
+ AppendIO.new(@shell, to, filter)
else
- Shell.Fail Error::CantApplyMethod, "append", to.class
+ Shell.Fail Error::CantApplyMethod, "append", to.class
end
end
- # call-seq:
- # tee(file) -> Tee
- #
- # Returns a Tee filter object, with the given +file+ command
def tee(file)
Tee.new(@shell, file)
end
- # call-seq:
- # concat(*jobs) -> Concat
- #
- # Returns a Concat object, for the given +jobs+
def concat(*jobs)
Concat.new(@shell, *jobs)
end
# %pwd, %cwd -> @pwd
- def notify(*opts)
+ def notify(*opts, &block)
Shell.notify(*opts) {|mes|
- yield mes if iterator?
+ yield mes if iterator?
- mes.gsub!("%pwd", "#{@cwd}")
- mes.gsub!("%cwd", "#{@cwd}")
+ mes.gsub!("%pwd", "#{@cwd}")
+ mes.gsub!("%cwd", "#{@cwd}")
}
end
@@ -358,55 +351,45 @@ class Shell
return command if /^\// =~ command
case path = @system_commands[command]
when String
- if exists?(path)
- return path
- else
- Shell.Fail Error::CommandNotFound, command
- end
+ if exists?(path)
+ return path
+ else
+ Shell.Fail Error::CommandNotFound, command
+ end
when false
- Shell.Fail Error::CommandNotFound, command
+ Shell.Fail Error::CommandNotFound, command
end
for p in @shell.system_path
- path = join(p, command)
- if FileTest.exist?(path)
- @system_commands[command] = path
- return path
- end
+ path = join(p, command)
+ if FileTest.exist?(path)
+ @system_commands[command] = path
+ return path
+ end
end
@system_commands[command] = false
Shell.Fail Error::CommandNotFound, command
end
- # call-seq:
- # def_system_command(command, path) -> Shell::SystemCommand
#
- # Defines a command, registering +path+ as a Shell method for the given
- # +command+.
- #
- # Shell::CommandProcessor.def_system_command "ls"
- # #=> Defines ls.
- #
- # Shell::CommandProcessor.def_system_command "sys_sort", "sort"
- # #=> Defines sys_sort as sort
+ # CommandProcessor.def_system_command(command, path)
+ # command: String
+ # path: String
+ # define 'command()' method as method.
#
def self.def_system_command(command, path = command)
begin
- eval((d = %Q[def #{command}(*opts)
- SystemCommand.new(@shell, '#{path}', *opts)
+ eval((d = %Q[def #{command}(*opts)
+ 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.debug.kind_of?(Integer) && Shell.debug > 1)
+ Shell.debug.kind_of?(Integer) && Shell.debug > 1)
end
- # call-seq:
- # undef_system_command(command) -> self
- #
- # Undefines a command
def self.undef_system_command(command)
command = command.id2name if command.kind_of?(Symbol)
remove_method(command)
@@ -415,249 +398,194 @@ class Shell
self
end
+ # define command alias
+ # ex)
+ # def_alias_command("ls_c", "ls", "-C", "-F")
+ # def_alias_command("ls_c", "ls"){|*opts| ["-C", "-F", *opts]}
+ #
@alias_map = {}
- # Returns a list of aliased commands
def self.alias_map
@alias_map
end
- # call-seq:
- # alias_command(alias, command, *options) -> self
- #
- # Creates a command alias at the given +alias+ for the given +command+,
- # passing any +options+ along with it.
- #
- # Shell::CommandProcessor.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
- # Shell::CommandProcessor.alias_command("lsC", "ls"){|*opts| ["-CBF", "--show-control-chars", *opts]}
- #
- def self.alias_command(ali, command, *opts)
+ def self.alias_command(ali, command, *opts, &block)
ali = ali.id2name if ali.kind_of?(Symbol)
command = command.id2name if command.kind_of?(Symbol)
begin
- if iterator?
- @alias_map[ali.intern] = proc
+ if iterator?
+ @alias_map[ali.intern] = proc
- eval((d = %Q[def #{ali}(*opts)
+ eval((d = %Q[def #{ali}(*opts)
@shell.__send__(:#{command},
*(CommandProcessor.alias_map[:#{ali}].call *opts))
- end]), nil, __FILE__, __LINE__ - 1)
+ end]), nil, __FILE__, __LINE__ - 1)
- else
+ else
args = opts.collect{|opt| '"' + opt + '"'}.join(",")
eval((d = %Q[def #{ali}(*opts)
@shell.__send__(:#{command}, #{args}, *opts)
end]), nil, __FILE__, __LINE__ - 1)
- end
+ end
rescue SyntaxError
- Shell.notify "warn: Can't alias #{ali} command: #{command}."
- Shell.notify("Definition of #{ali}: ", d)
- raise
+ 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.debug.kind_of?(Integer) && Shell.debug > 1)
+ Shell.debug.kind_of?(Integer) && Shell.debug > 1)
self
end
- # call-seq:
- # unalias_command(alias) -> self
- #
- # Unaliases the given +alias+ command.
def self.unalias_command(ali)
ali = ali.id2name if ali.kind_of?(Symbol)
@alias_map.delete ali.intern
undef_system_command(ali)
end
- # :nodoc:
- #
- # Delegates File and FileTest methods into Shell, including the following
- # commands:
- #
- # * Shell#blockdev?(file)
- # * Shell#chardev?(file)
- # * Shell#directory?(file)
- # * Shell#executable?(file)
- # * Shell#executable_real?(file)
- # * Shell#exist?(file)/Shell#exists?(file)
- # * Shell#file?(file)
- # * Shell#grpowned?(file)
- # * Shell#owned?(file)
- # * Shell#pipe?(file)
- # * Shell#readable?(file)
- # * Shell#readable_real?(file)
- # * Shell#setgid?(file)
- # * Shell#setuid?(file)
- # * Shell#size(file)/Shell#size?(file)
- # * Shell#socket?(file)
- # * Shell#sticky?(file)
- # * Shell#symlink?(file)
- # * Shell#writable?(file)
- # * Shell#writable_real?(file)
- # * Shell#zero?(file)
- # * Shell#syscopy(filename_from, filename_to)
- # * Shell#copy(filename_from, filename_to)
- # * Shell#move(filename_from, filename_to)
- # * Shell#compare(filename_from, filename_to)
- # * Shell#safe_unlink(*filenames)
- # * Shell#makedirs(*filenames)
- # * Shell#install(filename_from, filename_to, mode)
- #
- # And also, there are some aliases for convenience:
- #
- # * Shell#cmp <- Shell#compare
- # * Shell#mv <- Shell#move
- # * Shell#cp <- Shell#copy
- # * Shell#rm_f <- Shell#safe_unlink
- # * Shell#mkpath <- Shell#makedirs
+ #
+ # CommandProcessor.def_builtin_commands(delegation_class, command_specs)
+ # delegation_class: Class or Module
+ # command_specs: [[command_name, [argument,...]],...]
+ # command_name: String
+ # arguments: String
+ # FILENAME?? -> expand_path(filename??)
+ # *FILENAME?? -> filename??.collect{|f|expand_path(f)}.join(", ")
+ # define command_name(argument,...) as
+ # delegation_class.command_name(argument,...)
#
def self.def_builtin_commands(delegation_class, command_specs)
for meth, args in command_specs
- arg_str = args.collect{|arg| arg.downcase}.join(", ")
- call_arg_str = args.collect{
- |arg|
- case arg
- when /^(FILENAME.*)$/
- format("expand_path(%s)", $1.downcase)
- when /^(\*FILENAME.*)$/
- # \*FILENAME* -> filenames.collect{|fn| expand_path(fn)}.join(", ")
- $1.downcase + '.collect{|fn| expand_path(fn)}'
- else
- arg
- end
- }.join(", ")
- d = %Q[def #{meth}(#{arg_str})
- #{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)
- eval d
+ arg_str = args.collect{|arg| arg.downcase}.join(", ")
+ call_arg_str = args.collect{
+ |arg|
+ case arg
+ when /^(FILENAME.*)$/
+ format("expand_path(%s)", $1.downcase)
+ when /^(\*FILENAME.*)$/
+ # \*FILENAME* -> filenames.collect{|fn| expand_path(fn)}.join(", ")
+ $1.downcase + '.collect{|fn| expand_path(fn)}'
+ else
+ arg
+ end
+ }.join(", ")
+ d = %Q[def #{meth}(#{arg_str})
+ #{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)
+ eval d
end
end
- # call-seq:
- # install_system_commands(prefix = "sys_")
#
- # Defines all commands in the Shell.default_system_path as Shell method,
- # all with given +prefix+ appended to their names.
+ # CommandProcessor.install_system_commands(pre)
+ # pre: String - command name prefix
+ # defines every command which belongs in default_system_path via
+ # CommandProcessor.command(). It doesn't define already defined
+ # methods twice. By default, "pre_" is prefixes to each method
+ # name. Characters that may not be used in a method name are
+ # all converted to '_'. Definition errors are just ignored.
#
- # Any invalid character names are converted to +_+, and errors are passed
- # to Shell.notify.
- #
- # Methods already defined are skipped.
def self.install_system_commands(pre = "sys_")
defined_meth = {}
for m in Shell.methods
- defined_meth[m] = true
+ defined_meth[m] = true
end
sh = Shell.new
for path in Shell.default_system_path
- next unless sh.directory? path
- sh.cd path
- sh.foreach do
- |cn|
- if !defined_meth[pre + cn] && sh.file?(cn) && sh.executable?(cn)
- command = (pre + cn).gsub(/\W/, "_").sub(/^([0-9])/, '_\1')
- begin
- def_system_command(command, sh.expand_path(cn))
- rescue
- Shell.notify "warn: Can't define #{command} path: #{cn}"
- end
- defined_meth[command] = command
- end
- end
+ next unless sh.directory? path
+ sh.cd path
+ sh.foreach do
+ |cn|
+ if !defined_meth[pre + cn] && sh.file?(cn) && sh.executable?(cn)
+ command = (pre + cn).gsub(/\W/, "_").sub(/^([0-9])/, '_\1')
+ begin
+ def_system_command(command, sh.expand_path(cn))
+ rescue
+ Shell.notify "warn: Can't define #{command} path: #{cn}"
+ end
+ defined_meth[command] = command
+ end
+ end
end
end
- def self.add_delegate_command_to_shell(id) # :nodoc:
+ #----------------------------------------------------------------------
+ #
+ # class initializing methods -
+ #
+ #----------------------------------------------------------------------
+ def self.add_delegate_command_to_shell(id)
id = id.intern if id.kind_of?(String)
name = id.id2name
if Shell.method_defined?(id)
- Shell.notify "warn: override definition of Shell##{name}."
- Shell.notify "warn: alias Shell##{name} to Shell##{name}_org.\n"
- Shell.module_eval "alias #{name}_org #{name}"
+ Shell.notify "warn: override definition of Shell##{name}."
+ Shell.notify "warn: alias Shell##{name} to Shell##{name}_org.\n"
+ Shell.module_eval "alias #{name}_org #{name}"
end
Shell.notify "method added: Shell##{name}.", Shell.debug?
Shell.module_eval(%Q[def #{name}(*args, &block)
- begin
- @command_processor.__send__(:#{name}, *args, &block)
- rescue Exception
- $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
- $@.delete_if{|s| /^\\(eval\\):/ =~ s}
- raise
- end
+ begin
+ @command_processor.__send__(:#{name}, *args, &block)
+ rescue Exception
+ $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+ $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+ raise
+ end
end], __FILE__, __LINE__)
if Shell::Filter.method_defined?(id)
- Shell.notify "warn: override definition of Shell::Filter##{name}."
- Shell.notify "warn: alias Shell##{name} to Shell::Filter##{name}_org."
- Filter.module_eval "alias #{name}_org #{name}"
+ Shell.notify "warn: override definition of Shell::Filter##{name}."
+ Shell.notify "warn: alias Shell##{name} to Shell::Filter##{name}_org."
+ Filter.module_eval "alias #{name}_org #{name}"
end
Shell.notify "method added: Shell::Filter##{name}.", Shell.debug?
Filter.module_eval(%Q[def #{name}(*args, &block)
- begin
- self | @shell.__send__(:#{name}, *args, &block)
- rescue Exception
- $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
- $@.delete_if{|s| /^\\(eval\\):/ =~ s}
- raise
- end
+ begin
+ self | @shell.__send__(:#{name}, *args, &block)
+ rescue Exception
+ $@.delete_if{|s| /:in `__getobj__'$/ =~ s} #`
+ $@.delete_if{|s| /^\\(eval\\):/ =~ s}
+ raise
+ end
end], __FILE__, __LINE__)
end
- # Delegates File methods into Shell, including the following commands:
- #
- # * Shell#atime(file)
- # * Shell#basename(file, *opt)
- # * Shell#chmod(mode, *files)
- # * Shell#chown(owner, group, *file)
- # * Shell#ctime(file)
- # * Shell#delete(*file)
- # * Shell#dirname(file)
- # * Shell#ftype(file)
- # * Shell#join(*file)
- # * Shell#link(file_from, file_to)
- # * Shell#lstat(file)
- # * Shell#mtime(file)
- # * Shell#readlink(file)
- # * Shell#rename(file_from, file_to)
- # * Shell#split(file)
- # * Shell#stat(file)
- # * Shell#symlink(file_from, file_to)
- # * Shell#truncate(file, length)
- # * Shell#utime(atime, mtime, *file)
+ #
+ # define default builtin commands
#
def self.install_builtin_commands
# method related File.
- # (exclude open/foreach/unlink)
+ # (exclude open/foreach/unlink)
normal_delegation_file_methods = [
- ["atime", ["FILENAME"]],
- ["basename", ["fn", "*opts"]],
- ["chmod", ["mode", "*FILENAMES"]],
- ["chown", ["owner", "group", "*FILENAME"]],
- ["ctime", ["FILENAMES"]],
- ["delete", ["*FILENAMES"]],
- ["dirname", ["FILENAME"]],
- ["ftype", ["FILENAME"]],
- ["join", ["*items"]],
- ["link", ["FILENAME_O", "FILENAME_N"]],
- ["lstat", ["FILENAME"]],
- ["mtime", ["FILENAME"]],
- ["readlink", ["FILENAME"]],
- ["rename", ["FILENAME_FROM", "FILENAME_TO"]],
- # ["size", ["FILENAME"]],
- ["split", ["pathname"]],
- ["stat", ["FILENAME"]],
- ["symlink", ["FILENAME_O", "FILENAME_N"]],
- ["truncate", ["FILENAME", "length"]],
- ["utime", ["atime", "mtime", "*FILENAMES"]]]
+ ["atime", ["FILENAME"]],
+ ["basename", ["fn", "*opts"]],
+ ["chmod", ["mode", "*FILENAMES"]],
+ ["chown", ["owner", "group", "*FILENAME"]],
+ ["ctime", ["FILENAMES"]],
+ ["delete", ["*FILENAMES"]],
+ ["dirname", ["FILENAME"]],
+ ["ftype", ["FILENAME"]],
+ ["join", ["*items"]],
+ ["link", ["FILENAME_O", "FILENAME_N"]],
+ ["lstat", ["FILENAME"]],
+ ["mtime", ["FILENAME"]],
+ ["readlink", ["FILENAME"]],
+ ["rename", ["FILENAME_FROM", "FILENAME_TO"]],
+ # ["size", ["FILENAME"]],
+ ["split", ["pathname"]],
+ ["stat", ["FILENAME"]],
+ ["symlink", ["FILENAME_O", "FILENAME_N"]],
+ ["truncate", ["FILENAME", "length"]],
+ ["utime", ["atime", "mtime", "*FILENAMES"]]]
def_builtin_commands(File, normal_delegation_file_methods)
alias_method :rm, :delete
# method related FileTest
def_builtin_commands(FileTest,
- FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]})
+ FileTest.singleton_methods(false).collect{|m| [m, ["FILENAME"]]})
end
diff --git a/lib/shell/error.rb b/lib/shell/error.rb
index 2701338b5a..dbb788a6fc 100644
--- a/lib/shell/error.rb
+++ b/lib/shell/error.rb
@@ -1,8 +1,8 @@
#
# shell/error.rb -
-# $Release Version: 0.7 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
diff --git a/lib/shell/filter.rb b/lib/shell/filter.rb
index d53ed06315..3f88d0f5d2 100644
--- a/lib/shell/filter.rb
+++ b/lib/shell/filter.rb
@@ -1,27 +1,26 @@
#
# shell/filter.rb -
-# $Release Version: 0.7 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
#
#
-class Shell #:nodoc:
- # Any result of command exection is a Filter.
+class Shell
#
- # This class includes Enumerable, therefore a Filter object can use all
- # Enumerable
- # facilities.
+ # Filter
+ # A method to require
+ # each()
#
class Filter
include Enumerable
def initialize(sh)
- @shell = sh # parent shell
- @input = nil # input filter
+ @shell = sh # parent shell
+ @input = nil # input filter
end
attr_reader :input
@@ -30,86 +29,59 @@ class Shell #:nodoc:
@input = filter
end
- # call-seq:
- # each(record_separator=nil) { block }
- #
- # Iterates a block for each line.
def each(rs = nil)
rs = @shell.record_separator unless rs
if @input
- @input.each(rs){|l| yield l}
+ @input.each(rs){|l| yield l}
end
end
- # call-seq:
- # < source
- #
- # Inputs from +source+, which is either a string of a file name or an IO
- # object.
def < (src)
case src
when String
- cat = Cat.new(@shell, src)
- cat | self
+ cat = Cat.new(@shell, src)
+ cat | self
when IO
- self.input = src
- self
+ self.input = src
+ self
else
- Shell.Fail Error::CantApplyMethod, "<", to.class
+ Shell.Fail Error::CantApplyMethod, "<", to.class
end
end
- # call-seq:
- # > source
- #
- # Outputs from +source+, which is either a string of a file name or an IO
- # object.
def > (to)
case to
when String
- dst = @shell.open(to, "w")
- begin
- each(){|l| dst << l}
- ensure
- dst.close
- end
+ dst = @shell.open(to, "w")
+ begin
+ each(){|l| dst << l}
+ ensure
+ dst.close
+ end
when IO
- each(){|l| to << l}
+ each(){|l| to << l}
else
- Shell.Fail Error::CantApplyMethod, ">", to.class
+ Shell.Fail Error::CantApplyMethod, ">", to.class
end
self
end
- # call-seq:
- # >> source
- #
- # Appends the output to +source+, which is either a string of a file name
- # or an IO object.
def >> (to)
begin
- Shell.cd(@shell.pwd).append(to, self)
+ Shell.cd(@shell.pwd).append(to, self)
rescue CantApplyMethod
- Shell.Fail Error::CantApplyMethod, ">>", to.class
+ Shell.Fail Error::CantApplyMethod, ">>", to.class
end
end
- # call-seq:
- # | filter
- #
- # Processes a pipeline.
def | (filter)
filter.input = self
if active?
- @shell.process_controller.start_job filter
+ @shell.process_controller.start_job filter
end
filter
end
- # call-seq:
- # filter1 + filter2
- #
- # Outputs +filter1+, and then +filter2+ using Join.new
def + (filter)
Join.new(@shell, self, filter)
end
@@ -128,9 +100,9 @@ class Shell #:nodoc:
def inspect
if @shell.debug.kind_of?(Integer) && @shell.debug > 2
- super
+ super
else
- to_s
+ to_s
end
end
end
diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
index b973539b4b..2198b88d51 100644
--- a/lib/shell/process-controller.rb
+++ b/lib/shell/process-controller.rb
@@ -1,8 +1,8 @@
#
# shell/process-controller.rb -
-# $Release Version: 0.7 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
@@ -27,60 +27,60 @@ class Shell
extend Forwardable
def_delegator("@ProcessControllersMonitor",
- "synchronize", "process_controllers_exclusive")
+ "synchronize", "process_controllers_exclusive")
def active_process_controllers
- process_controllers_exclusive do
- @ProcessControllers.dup
- end
+ process_controllers_exclusive do
+ @ProcessControllers.dup
+ end
end
def activate(pc)
- process_controllers_exclusive do
- @ProcessControllers[pc] ||= 0
- @ProcessControllers[pc] += 1
- end
+ process_controllers_exclusive do
+ @ProcessControllers[pc] ||= 0
+ @ProcessControllers[pc] += 1
+ end
end
def inactivate(pc)
- process_controllers_exclusive do
- if @ProcessControllers[pc]
- if (@ProcessControllers[pc] -= 1) == 0
- @ProcessControllers.delete(pc)
- @ProcessControllersCV.signal
- end
- end
- end
+ process_controllers_exclusive do
+ if @ProcessControllers[pc]
+ if (@ProcessControllers[pc] -= 1) == 0
+ @ProcessControllers.delete(pc)
+ @ProcessControllersCV.signal
+ end
+ end
+ end
end
def each_active_object
- process_controllers_exclusive do
- for ref in @ProcessControllers.keys
- yield ref
- end
- end
+ process_controllers_exclusive do
+ for ref in @ProcessControllers.keys
+ yield ref
+ end
+ end
end
def block_output_synchronize(&b)
- @BlockOutputMonitor.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
+ 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
@@ -105,8 +105,8 @@ class Shell
def jobs
jobs = []
@jobs_sync.synchronize(:SH) do
- jobs.concat @waiting_jobs
- jobs.concat @active_jobs
+ jobs.concat @waiting_jobs
+ jobs.concat @active_jobs
end
jobs
end
@@ -121,120 +121,120 @@ class Shell
def jobs_exist?
@jobs_sync.synchronize(:SH) do
- @active_jobs.empty? or @waiting_jobs.empty?
+ @active_jobs.empty? or @waiting_jobs.empty?
end
end
def active_jobs_exist?
@jobs_sync.synchronize(:SH) do
- @active_jobs.empty?
+ @active_jobs.empty?
end
end
def waiting_jobs_exist?
@jobs_sync.synchronize(:SH) do
- @waiting_jobs.empty?
+ @waiting_jobs.empty?
end
end
# schedule a command
def add_schedule(command)
@jobs_sync.synchronize(:EX) do
- ProcessController.activate(self)
- if @active_jobs.empty?
- start_job command
- else
- @waiting_jobs.push(command)
- end
+ ProcessController.activate(self)
+ if @active_jobs.empty?
+ start_job command
+ else
+ @waiting_jobs.push(command)
+ end
end
end
# start a job
def start_job(command = nil)
@jobs_sync.synchronize(:EX) do
- if command
- return if command.active?
- @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
- start_job(job) if job.input == command
- end
-# command.notify "job(%id) post2-start.", @shell.debug?
+ if command
+ return if command.active?
+ @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
+ start_job(job) if job.input == command
+ end
+# command.notify "job(%id) post2-start.", @shell.debug?
end
end
def waiting_job?(job)
@jobs_sync.synchronize(:SH) do
- @waiting_jobs.include?(job)
+ @waiting_jobs.include?(job)
end
end
def active_job?(job)
@jobs_sync.synchronize(:SH) do
- @active_jobs.include?(job)
+ @active_jobs.include?(job)
end
end
# terminate a job
def terminate_job(command)
@jobs_sync.synchronize(:EX) do
- @active_jobs.delete command
- ProcessController.inactivate(self)
- if @active_jobs.empty?
- command.notify("start_job in terminate_job(%id)", Shell::debug?)
- start_job
- end
+ @active_jobs.delete command
+ ProcessController.inactivate(self)
+ if @active_jobs.empty?
+ command.notify("start_job in terminate_job(%id)", Shell::debug?)
+ start_job
+ end
end
end
# kill a job
def kill_job(sig, command)
@jobs_sync.synchronize(:EX) do
- if @waiting_jobs.delete command
- ProcessController.inactivate(self)
- return
- elsif @active_jobs.include?(command)
- begin
- r = command.kill(sig)
- ProcessController.inactivate(self)
- rescue
- print "Shell: Warn: $!\n" if @shell.verbose?
- return nil
- end
- @active_jobs.delete command
- r
- end
+ if @waiting_jobs.delete command
+ ProcessController.inactivate(self)
+ return
+ elsif @active_jobs.include?(command)
+ begin
+ r = command.kill(sig)
+ ProcessController.inactivate(self)
+ rescue
+ print "Shell: Warn: $!\n" if @shell.verbose?
+ return nil
+ end
+ @active_jobs.delete command
+ r
+ end
end
end
# wait for all jobs to terminate
def wait_all_jobs_execution
@job_monitor.synchronize do
- 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?
- end
+ 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?
+ end
end
end
# simple fork
- def sfork(command)
+ def sfork(command, &block)
pipe_me_in, pipe_peer_out = IO.pipe
pipe_peer_in, pipe_me_out = IO.pipe
@@ -244,73 +244,73 @@ class Shell
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)
-
- ObjectSpace.each_object(IO) do |io|
- if ![STDIN, STDOUT, STDERR].include?(io)
- io.close unless io.closed?
- end
- end
-
- yield
- }
- end
- pid_cv.signal
-
- pipe_peer_in.close
- pipe_peer_out.close
- command.notify "job(%name:##{pid}) start", @shell.debug?
-
- begin
- _pid = nil
- command.notify("job(%id) start to waiting finish.", @shell.debug?)
- _pid = Process.waitpid(pid, nil)
- rescue Errno::ECHILD
- command.notify "warn: job(%id) was done already waitpid."
- _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 terminates
- if USING_AT_EXIT_WHEN_PROCESS_EXIT or _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?
- end
- end
+ 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)
+
+ ObjectSpace.each_object(IO) do |io|
+ if ![STDIN, STDOUT, STDERR].include?(io)
+ io.close unless io.closed?
+ end
+ end
+
+ yield
+ }
+ end
+ pid_cv.signal
+
+ pipe_peer_in.close
+ pipe_peer_out.close
+ command.notify "job(%name:##{pid}) start", @shell.debug?
+
+ begin
+ _pid = nil
+ command.notify("job(%id) start to waiting finish.", @shell.debug?)
+ _pid = Process.waitpid(pid, nil)
+ rescue Errno::ECHILD
+ command.notify "warn: job(%id) was done already waitpid."
+ _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 terminates
+ if USING_AT_EXIT_WHEN_PROCESS_EXIT or _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?
+ end
+ end
end
pid_mutex.synchronize do
- while !pid
- pid_cv.wait(pid_mutex)
- end
+ while !pid
+ pid_cv.wait(pid_mutex)
+ end
end
return pid, pipe_me_in, pipe_me_out
diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb
index 1a8bb1a90f..af9b0a8e37 100644
--- a/lib/shell/system-command.rb
+++ b/lib/shell/system-command.rb
@@ -1,8 +1,8 @@
#
# shell/system-command.rb -
-# $Release Version: 0.7 $
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7 $
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
@@ -15,7 +15,7 @@ class Shell
class SystemCommand < Filter
def initialize(sh, command, *opts)
if t = opts.find{|opt| !opt.kind_of?(String) && opt.class}
- Shell.Fail Error::TypeError, t.class, "String"
+ Shell.Fail Error::TypeError, t.class, "String"
end
super(sh)
@command = command
@@ -41,7 +41,7 @@ class Shell
def input=(inp)
super
if active?
- start_export
+ start_export
end
end
@@ -49,12 +49,12 @@ class Shell
notify([@command, *@opts].join(" "))
@pid, @pipe_in, @pipe_out = @shell.process_controller.sfork(self) {
- Dir.chdir @shell.pwd
- $0 = @command
- exec(@command, *@opts)
+ Dir.chdir @shell.pwd
+ $0 = @command
+ exec(@command, *@opts)
}
if @input
- start_export
+ start_export
end
start_import
end
@@ -65,18 +65,18 @@ class Shell
def terminate
begin
- @pipe_in.close
+ @pipe_in.close
rescue IOError
end
begin
- @pipe_out.close
+ @pipe_out.close
rescue IOError
end
end
def kill(sig)
if @pid
- Process.kill(sig, @pid)
+ Process.kill(sig, @pid)
end
end
@@ -84,75 +84,75 @@ class Shell
notify "Job(%id) start imp-pipe.", @shell.debug?
rs = @shell.record_separator unless rs
_eop = true
- Thread.start {
- begin
- while l = @pipe_in.gets
- @input_queue.push l
- end
- _eop = false
- rescue Errno::EPIPE
- _eop = false
- ensure
- if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _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.")
- redo
- end
- notify "job(%id}) close imp-pipe.", @shell.debug?
- @input_queue.push :EOF
- @pipe_in.close
- end
+ th = Thread.start {
+ begin
+ while l = @pipe_in.gets
+ @input_queue.push l
+ end
+ _eop = false
+ rescue Errno::EPIPE
+ _eop = false
+ ensure
+ if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _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.")
+ redo
+ end
+ notify "job(%id}) close imp-pipe.", @shell.debug?
+ @input_queue.push :EOF
+ @pipe_in.close
+ end
}
end
def start_export
notify "job(%id) start exp-pipe.", @shell.debug?
_eop = true
- Thread.start{
- begin
- @input.each do |l|
- ProcessController::block_output_synchronize do
- @pipe_out.print l
- end
- end
- _eop = false
- rescue Errno::EPIPE, Errno::EIO
- _eop = false
- ensure
- if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _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.")
- redo
- end
- notify "job(%id) close exp-pipe.", @shell.debug?
- @pipe_out.close
- end
+ th = Thread.start{
+ begin
+ @input.each do |l|
+ ProcessController::block_output_synchronize do
+ @pipe_out.print l
+ end
+ end
+ _eop = false
+ rescue Errno::EPIPE, Errno::EIO
+ _eop = false
+ ensure
+ if !ProcessController::USING_AT_EXIT_WHEN_PROCESS_EXIT and _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.")
+ redo
+ end
+ notify "job(%id) close exp-pipe.", @shell.debug?
+ @pipe_out.close
+ end
}
end
alias super_each each
def each(rs = nil)
while (l = @input_queue.pop) != :EOF
- yield l
+ yield l
end
end
# ex)
# if you wish to output:
- # "shell: job(#{@command}:#{@pid}) close pipe-out."
- # then
- # mes: "job(%id) close pipe-out."
+ # "shell: job(#{@command}:#{@pid}) close pipe-out."
+ # then
+ # mes: "job(%id) close pipe-out."
# yorn: Boolean(@shell.debug? or @shell.verbose?)
- def notify(*opts)
+ def notify(*opts, &block)
@shell.notify(*opts) do |mes|
- yield mes if iterator?
+ yield mes if iterator?
- mes.gsub!("%id", "#{@command}:##{@pid}")
- mes.gsub!("%name", "#{@command}")
- mes.gsub!("%pid", "#{@pid}")
- mes
+ mes.gsub!("%id", "#{@command}:##{@pid}")
+ mes.gsub!("%name", "#{@command}")
+ mes.gsub!("%pid", "#{@pid}")
+ mes
end
end
end
diff --git a/lib/shell/version.rb b/lib/shell/version.rb
index 2568627e2b..6e4c170351 100644
--- a/lib/shell/version.rb
+++ b/lib/shell/version.rb
@@ -1,15 +1,15 @@
#
# version.rb - shell version definition file
-# $Release Version: 0.7$
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ruby-lang.org)
+# $Release Version: 0.7$
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ruby-lang.org)
#
# --
#
#
#
-class Shell # :nodoc:
+class Shell
@RELEASE_VERSION = "0.7"
@LAST_UPDATE_DATE = "07/03/20"
end
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index c3586d29fa..f1300612bb 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -1,79 +1,41 @@
-##
-# == Manipulates strings like the UNIX Bourne shell
+#
+# shellwords.rb: Manipulates strings a la UNIX Bourne shell
+#
+
#
# This module manipulates strings according to the word parsing rules
# of the UNIX Bourne shell.
#
# The shellwords() function was originally a port of shellwords.pl,
-# but modified to conform to POSIX / SUSv3 (IEEE Std 1003.1-2001 [1]).
-#
-# === Usage
-#
-# You can use shellwords to parse a string into a Bourne shell friendly Array.
-#
-# require 'shellwords'
-#
-# argv = Shellwords.split('three blind "mice"')
-# argv #=> ["three", "blind", "mice"]
-#
-# Once you've required Shellwords, you can use the #split alias
-# String#shellsplit.
-#
-# argv = "see how they run".shellsplit
-# argv #=> ["see", "how", "they", "run"]
-#
-# Be careful you don't leave a quote unmatched.
+# but modified to conform to POSIX / SUSv3 (IEEE Std 1003.1-2001).
#
-# argv = "they all ran after the farmer's wife".shellsplit
-# #=> ArgumentError: Unmatched double quote: ...
+# Authors:
+# - Wakou Aoyama
+# - Akinori MUSHA <knu@iDaemons.org>
#
-# In this case, you might want to use Shellwords.escape, or it's alias
-# String#shellescape.
+# Contact:
+# - Akinori MUSHA <knu@iDaemons.org> (current maintainer)
#
-# This method will escape the String for you to safely use with a Bourne shell.
-#
-# argv = Shellwords.escape("special's.txt")
-# argv #=> "special\\s.txt"
-# system("cat " + argv)
-#
-# Shellwords also comes with a core extension for Array, Array#shelljoin.
-#
-# argv = %w{ls -lta lib}
-# system(argv.shelljoin)
-#
-# You can use this method to create an escaped string out of an array of tokens
-# separated by a space. In this example we'll use the literal shortcut for
-# Array.new.
-#
-# === Authors
-# * Wakou Aoyama
-# * Akinori MUSHA <knu@iDaemons.org>
-#
-# === Contact
-# * Akinori MUSHA <knu@iDaemons.org> (current maintainer)
-#
-# === Resources
-#
-# 1: {IEEE Std 1003.1-2004}[http://pubs.opengroup.org/onlinepubs/009695399/toc.htm]
-
module Shellwords
+ #
# Splits a string into an array of tokens in the same way the UNIX
# Bourne shell does.
#
# argv = Shellwords.split('here are "two words"')
# argv #=> ["here", "are", "two words"]
#
- # String#shellsplit is a shortcut for this function.
+ # +String#shellsplit+ is a shorthand for this function.
#
# argv = 'here are "two words"'.shellsplit
# argv #=> ["here", "are", "two words"]
+ #
def shellsplit(line)
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(/\\(.)/, '\\1'))
+ field << (word || sq || (dq || esc).gsub(/\\(?=.)/, ''))
if sep
words << field
field = ''
@@ -90,48 +52,32 @@ module Shellwords
alias split shellsplit
end
+ #
# Escapes a string so that it can be safely used in a Bourne shell
- # command line. +str+ can be a non-string object that responds to
- # +to_s+.
+ # command line.
#
# Note that a resulted string should be used unquoted and is not
# intended for use in double quotes nor in single quotes.
#
- # argv = Shellwords.escape("It's better to give than to receive")
- # argv #=> "It\\'s\\ better\\ to\\ give\\ than\\ to\\ receive"
- #
- # String#shellescape is a shorthand for this function.
- #
- # argv = "It's better to give than to receive".shellescape
- # argv #=> "It\\'s\\ better\\ to\\ give\\ than\\ to\\ receive"
- #
- # # Search files in lib for method definitions
- # pattern = "^[ \t]*def "
- # open("| grep -Ern #{pattern.shellescape} lib") { |grep|
- # grep.each_line { |line|
- # file, lineno, matched_line = line.split(':', 3)
- # # ...
- # }
+ # open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
+ # # ...
# }
#
- # It is the caller's responsibility to encode the string in the right
- # encoding for the shell environment where this string is used.
+ # +String#shellescape+ is a shorthand for this function.
#
- # Multibyte characters are treated as multibyte characters, not bytes.
+ # open("| grep #{pattern.shellescape} file") { |pipe|
+ # # ...
+ # }
#
- # Returns an empty quoted String if +str+ has a length of zero.
def shellescape(str)
- str = str.to_s
-
# An empty argument will be skipped, so return empty quotes.
return "''" if str.empty?
str = str.dup
- # Treat multibyte characters as is. It is caller's responsibility
- # to encode the string in the right encoding for the shell
- # environment.
- str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/, "\\\\\\1")
+ # Process as a single byte sequence because not all shell
+ # implementations are multibyte aware.
+ str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
# A LF cannot be escaped with a backslash because a backslash + LF
# combo is regarded as line continuation and simply ignored.
@@ -146,25 +92,19 @@ module Shellwords
alias escape shellescape
end
- # Builds a command line string from an argument list, +array+.
- #
- # All elements are joined into a single string with fields separated by a
- # space, where each element is escaped for Bourne shell and stringified using
- # +to_s+.
- #
- # ary = ["There's", "a", "time", "and", "place", "for", "everything"]
- # argv = Shellwords.join(ary)
- # argv #=> "There\\'s a time and place for everything"
#
- # Array#shelljoin is a shortcut for this function.
+ # Builds a command line string from an argument list +array+ joining
+ # all elements escaped for Bourne shell and separated by a space.
#
- # ary = ["Don't", "rock", "the", "boat"]
- # argv = ary.shelljoin
- # argv #=> "Don\\'t rock the boat"
+ # open('|' + Shellwords.join(['grep', pattern, *files])) { |pipe|
+ # # ...
+ # }
#
- # You can also mix non-string objects in the elements as allowed in Array#join.
+ # +Array#shelljoin+ is a shorthand for this function.
#
- # output = `#{['ps', '-p', $$].shelljoin}`
+ # open('|' + ['grep', pattern, *files].shelljoin) { |pipe|
+ # # ...
+ # }
#
def shelljoin(array)
array.map { |arg| shellescape(arg) }.join(' ')
@@ -178,37 +118,38 @@ module Shellwords
end
class String
+ #
# call-seq:
# str.shellsplit => array
#
# Splits +str+ into an array of tokens in the same way the UNIX
- # Bourne shell does.
+ # Bourne shell does. See +Shellwords::shellsplit+ for details.
#
- # See Shellwords.shellsplit for details.
def shellsplit
Shellwords.split(self)
end
+ #
# call-seq:
# str.shellescape => string
#
# Escapes +str+ so that it can be safely used in a Bourne shell
- # command line.
+ # command line. See +Shellwords::shellescape+ for details.
#
- # See Shellwords.shellescape for details.
def shellescape
Shellwords.escape(self)
end
end
class Array
+ #
# call-seq:
# array.shelljoin => string
#
# Builds a command line string from an argument list +array+ joining
# all elements escaped for Bourne shell and separated by a space.
+ # See +Shellwords::shelljoin+ for details.
#
- # See Shellwords.shelljoin for details.
def shelljoin
Shellwords.join(self)
end
diff --git a/lib/singleton.rb b/lib/singleton.rb
index be1f7ff6ca..3c81b2d3cb 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -1,140 +1,108 @@
-require 'thread'
-
# The Singleton module implements the Singleton pattern.
#
-# == Usage
-#
-# To use Singleton, include the module in your class.
-#
+# Usage:
# class Klass
# include Singleton
# # ...
# end
#
-# This ensures that only one instance of Klass can be created.
+# * 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
-# # => true
-#
-# Klass.new
-# # => NoMethodError - new is private ...
-#
-# The instance is created at upon the first call of Klass.instance().
+# * ``The instance'' is created at instantiation time, in other
+# words the first call of Klass.instance(), thus
#
# class OtherKlass
# include Singleton
# # ...
# end
+# ObjectSpace.each_object(OtherKlass){} # => 0.
#
-# ObjectSpace.each_object(OtherKlass){}
-# # => 0
+# * This behavior is preserved under inheritance and cloning.
#
-# OtherKlass.instance
-# ObjectSpace.each_object(OtherKlass){}
-# # => 1
#
#
-# This behavior is preserved under inheritance and cloning.
+# This is achieved by marking
+# * Klass.new and Klass.allocate - as private
#
-# == Implementation
+# Providing (or modifying) the class methods
+# * Klass.inherited(sub_klass) and Klass.clone() -
+# to ensure that the Singleton pattern is properly
+# inherited and cloned.
#
-# This above is achieved by:
+# * Klass.instance() - returning ``the instance''. After a
+# successful self modifying (normally the first) call the
+# method body is a simple:
#
-# * Making Klass.new and Klass.allocate private.
+# def Klass.instance()
+# return @singleton__instance__
+# end
#
-# * Overriding Klass.inherited(sub_klass) and Klass.clone() to ensure that the
-# Singleton properties are kept when inherited and cloned.
+# * Klass._load(str) - calling Klass.instance()
#
-# * Providing the Klass.instance() method that returns the same object each
-# time it is called.
+# * Klass._instantiate?() - returning ``the instance'' or
+# nil. This hook method puts a second (or nth) thread calling
+# Klass.instance() on a waiting loop. The return value
+# signifies the successful completion or premature termination
+# of the first, or more generally, current "instantiation thread".
#
-# * Overriding Klass._load(str) to call Klass.instance().
#
-# * Overriding Klass#clone and Klass#dup to raise TypeErrors to prevent
-# cloning or duping.
-#
-# == Singleton and Marshal
-#
-# By default Singleton's #_dump(depth) returns the empty string. Marshalling by
-# default will strip state information, e.g. instance variables and taint
-# state, from the instance. Classes using Singleton can provide custom
-# _load(str) and _dump(depth) methods to retain some of the previous state of
-# the instance.
-#
-# require 'singleton'
-#
-# class Example
-# include Singleton
-# attr_accessor :keep, :strip
-# def _dump(depth)
-# # this strips the @strip information from the instance
-# Marshal.dump(@keep, depth)
-# end
-#
-# def self._load(str)
-# instance.keep = Marshal.load(str)
-# instance
-# end
-# end
-#
-# a = Example.instance
-# a.keep = "keep this"
-# a.strip = "get rid of this"
-# a.taint
-#
-# stored_state = Marshal.dump(a)
-#
-# a.keep = nil
-# a.strip = nil
-# b = Marshal.load(stored_state)
-# p a == b # => true
-# p a.keep # => "keep this"
-# p a.strip # => nil
+# The instance method of Singleton are
+# * clone and dup - raising TypeErrors to prevent cloning or duping
#
+# * _dump(depth) - returning the empty string. Marshalling strips
+# by default all state information, e.g. instance variables and
+# taint state, from ``the instance''. Providing custom _load(str)
+# and _dump(depth) hooks allows the (partially) resurrections of
+# a previous state of ``the instance''.
+
+require 'thread'
+
module Singleton
- # Raises a TypeError to prevent cloning.
+ # disable build-in copying methods
def clone
raise TypeError, "can't clone instance of singleton #{self.class}"
end
-
- # Raises a TypeError to prevent duping.
def dup
raise TypeError, "can't dup instance of singleton #{self.class}"
end
- # By default, do not retain any state when marshalling.
+ # default marshalling strategy
def _dump(depth = -1)
''
end
- module SingletonClassMethods # :nodoc:
-
- def clone # :nodoc:
+ module SingletonClassMethods
+ # properly clone the Singleton pattern - did you know
+ # that duping doesn't copy class methods?
+ def clone
Singleton.__init__(super)
end
- # By default calls instance(). Override to retain singleton state.
def _load(str)
instance
end
private
+ # ensure that the Singleton pattern is properly inherited
def inherited(sub_klass)
super
Singleton.__init__(sub_klass)
end
end
- class << Singleton # :nodoc:
- def __init__(klass) # :nodoc:
+ class << Singleton
+ def __init__(klass)
klass.instance_eval {
@singleton__instance__ = nil
@singleton__mutex__ = Mutex.new
}
- def klass.instance # :nodoc:
+ def klass.instance
return @singleton__instance__ if @singleton__instance__
@singleton__mutex__.synchronize {
return @singleton__instance__ if @singleton__instance__
@@ -147,7 +115,7 @@ module Singleton
private
- # extending an object with Singleton is a bad idea
+ # extending an object with Singleton is a bad idea
undef_method :extend_object
def append_features(mod)
@@ -160,13 +128,186 @@ module Singleton
def included(klass)
super
- klass.private_class_method :new, :allocate
+ klass.private_class_method :new, :allocate
klass.extend SingletonClassMethods
Singleton.__init__(klass)
end
end
- ##
- # :singleton-method: _load
- # By default calls instance(). Override to retain singleton state.
+end
+
+
+if __FILE__ == $0
+
+def num_of_instances(klass)
+ "#{ObjectSpace.each_object(klass){}} #{klass} instance(s)"
+end
+
+# The basic and most important example.
+
+class SomeSingletonClass
+ include Singleton
+end
+puts "There are #{num_of_instances(SomeSingletonClass)}"
+
+a = SomeSingletonClass.instance
+b = SomeSingletonClass.instance # a and b are same object
+puts "basic test is #{a == b}"
+
+begin
+ SomeSingletonClass.new
+rescue NoMethodError => mes
+ puts mes
+end
+
+
+
+puts "\nThreaded example with exception and customized #_instantiate?() hook"; p
+Thread.abort_on_exception = false
+
+class Ups < SomeSingletonClass
+ def initialize
+ self.class.__sleep
+ puts "initialize called by thread ##{Thread.current[:i]}"
+ end
+end
+
+class << Ups
+ def _instantiate?
+ @enter.push Thread.current[:i]
+ while false.equal?(@singleton__instance__)
+ @singleton__mutex__.unlock
+ sleep 0.08
+ @singleton__mutex__.lock
+ end
+ @leave.push Thread.current[:i]
+ @singleton__instance__
+ end
+
+ def __sleep
+ sleep(rand(0.08))
+ end
+
+ def new
+ begin
+ __sleep
+ raise "boom - thread ##{Thread.current[:i]} failed to create instance"
+ ensure
+ # simple flip-flop
+ class << self
+ remove_method :new
+ end
+ end
+ end
+
+ def instantiate_all
+ @enter = []
+ @leave = []
+ 1.upto(9) {|i|
+ Thread.new {
+ begin
+ Thread.current[:i] = i
+ __sleep
+ instance
+ rescue RuntimeError => mes
+ puts mes
+ end
+ }
+ }
+ puts "Before there were #{num_of_instances(self)}"
+ sleep 3
+ puts "Now there is #{num_of_instances(self)}"
+ puts "#{@enter.join '; '} was the order of threads entering the waiting loop"
+ puts "#{@leave.join '; '} was the order of threads leaving the waiting loop"
+ end
+end
+
+
+Ups.instantiate_all
+# results in message like
+# Before there were 0 Ups instance(s)
+# boom - thread #6 failed to create instance
+# initialize called by thread #3
+# Now there is 1 Ups instance(s)
+# 3; 2; 1; 8; 4; 7; 5 was the order of threads entering the waiting loop
+# 3; 2; 1; 7; 4; 8; 5 was the order of threads leaving the waiting loop
+
+
+puts "\nLets see if class level cloning really works"
+Yup = Ups.clone
+def Yup.new
+ begin
+ __sleep
+ raise "boom - thread ##{Thread.current[:i]} failed to create instance"
+ ensure
+ # simple flip-flop
+ class << self
+ remove_method :new
+ end
+ end
+end
+Yup.instantiate_all
+
+
+puts "\n\n","Customized marshalling"
+class A
+ include Singleton
+ attr_accessor :persist, :die
+ def _dump(depth)
+ # this strips the @die information from the instance
+ Marshal.dump(@persist,depth)
+ end
+end
+
+def A._load(str)
+ instance.persist = Marshal.load(str)
+ instance
+end
+
+a = A.instance
+a.persist = ["persist"]
+a.die = "die"
+a.taint
+
+stored_state = Marshal.dump(a)
+# change state
+a.persist = nil
+a.die = nil
+b = Marshal.load(stored_state)
+p a == b # => true
+p a.persist # => ["persist"]
+p a.die # => nil
+
+
+puts "\n\nSingleton with overridden default #inherited() hook"
+class Up
+end
+def Up.inherited(sub_klass)
+ puts "#{sub_klass} subclasses #{self}"
+end
+
+
+class Middle < Up
+ include Singleton
+end
+
+class Down < Middle; end
+
+puts "and basic \"Down test\" is #{Down.instance == Down.instance}\n
+Various exceptions"
+
+begin
+ module AModule
+ include Singleton
+ end
+rescue TypeError => mes
+ puts mes #=> Inclusion of the OO-Singleton module in module AModule
+end
+
+begin
+ 'aString'.extend Singleton
+rescue NoMethodError => mes
+ puts mes #=> undefined method `extend_object' for Singleton:Module
+end
+
end
diff --git a/lib/sync.rb b/lib/sync.rb
index dc513fc16b..b97d36eb43 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -1,8 +1,8 @@
#
# sync.rb - 2 phase lock with counter
-# $Release Version: 1.0$
-# $Revision$
-# by Keiju ISHITSUKA(keiju@ishitsuka.com)
+# $Release Version: 1.0$
+# $Revision$
+# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
# --
# Sync_m, Synchronizer_m
@@ -10,8 +10,8 @@
# obj.extend(Sync_m)
# or
# class Foo
-# include Sync_m
-# :
+# include Sync_m
+# :
# end
#
# Sync_m#sync_mode
@@ -41,10 +41,9 @@ unless defined? Thread
raise "Thread not available for this ruby interpreter"
end
-##
-# A module that provides a two-phase lock with a counter.
-
module Sync_m
+ RCS_ID='-$Id$-'
+
# lock mode
UN = :UN
SH = :SH
@@ -59,17 +58,17 @@ module Sync_m
class UnknownLocker < Err
Message = "Thread(%s) not locked."
def UnknownLocker.Fail(th)
- super(th.inspect)
+ super(th.inspect)
end
end
class LockModeFailer < Err
Message = "Unknown lock mode(%s)"
def LockModeFailer.Fail(mode)
- if mode.id2name
- mode = id2name
- end
- super(mode)
+ if mode.id2name
+ mode = id2name
+ end
+ super(mode)
end
end
end
@@ -101,12 +100,12 @@ module Sync_m
def sync_extend
unless (defined? locked? and
- defined? shared? and
- defined? exclusive? and
- defined? lock and
- defined? unlock and
- defined? try_lock and
- defined? synchronize)
+ defined? shared? and
+ defined? exclusive? and
+ defined? lock and
+ defined? unlock and
+ defined? try_lock and
+ defined? synchronize)
Sync_m.define_aliases(singleton_class)
end
sync_initialize
@@ -129,33 +128,27 @@ module Sync_m
def sync_try_lock(mode = EX)
return unlock if mode == UN
@sync_mutex.synchronize do
- sync_try_lock_sub(mode)
+ ret = sync_try_lock_sub(mode)
end
+ ret
end
def sync_lock(m = EX)
return unlock if m == UN
- Thread.handle_interrupt(StandardError => :on_blocking) do
- while true
- @sync_mutex.synchronize do
- begin
- 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
- unless sync_waiting.include?(Thread.current) || sync_upgrade_waiting.reverse_each.any?{|w| w.first == Thread.current }
- sync_waiting.push Thread.current
- end
- end
- @sync_mutex.sleep
- end
- ensure
- sync_waiting.delete(Thread.current)
- end
- end
+
+ 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
end
end
self
@@ -165,7 +158,7 @@ module Sync_m
wakeup_threads = []
@sync_mutex.synchronize do
if sync_mode == UN
- Err::UnknownLocker.Fail(Thread.current)
+ Err::UnknownLocker.Fail(Thread.current)
end
m = sync_mode if m == EX and sync_mode == SH
@@ -173,51 +166,51 @@ module Sync_m
runnable = false
case m
when UN
- Err::UnknownLocker.Fail(Thread.current)
+ 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
+ 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
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
+ 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 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
end
end
for th in wakeup_threads
@@ -227,13 +220,11 @@ module Sync_m
end
def sync_synchronize(mode = EX)
- Thread.handle_interrupt(StandardError => :on_blocking) do
- sync_lock(mode)
- begin
- yield
- ensure
- sync_unlock
- end
+ sync_lock(mode)
+ begin
+ yield
+ ensure
+ sync_unlock
end
end
@@ -273,34 +264,34 @@ module Sync_m
when SH
case sync_mode
when UN
- self.sync_mode = m
- sync_sh_locker[Thread.current] = 1
- ret = true
+ self.sync_mode = m
+ sync_sh_locker[Thread.current] = 1
+ ret = true
when SH
- count = 0 unless count = sync_sh_locker[Thread.current]
- sync_sh_locker[Thread.current] = count + 1
- ret = true
+ count = 0 unless count = sync_sh_locker[Thread.current]
+ sync_sh_locker[Thread.current] = count + 1
+ ret = true
when EX
- # in EX mode, lock will upgrade to EX lock
- if sync_ex_locker == Thread.current
- self.sync_ex_count = sync_ex_count + 1
- ret = true
- else
- ret = false
- end
+ # in EX mode, lock will upgrade to EX lock
+ if sync_ex_locker == Thread.current
+ self.sync_ex_count = sync_ex_count + 1
+ ret = true
+ else
+ ret = false
+ end
end
when EX
if sync_mode == UN or
- 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
- ret = true
+ 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
+ ret = true
elsif sync_mode == EX && sync_ex_locker == Thread.current
- self.sync_ex_count = sync_ex_count + 1
- ret = true
+ self.sync_ex_count = sync_ex_count + 1
+ ret = true
else
- ret = false
+ ret = false
end
else
Err::LockModeFailer.Fail mode
@@ -308,21 +299,9 @@ module Sync_m
return ret
end
end
-
-##
-# An alias for Sync_m from sync.rb
-
Synchronizer_m = Sync_m
-##
-# A class that providesa two-phase lock with a counter. See Sync_m for
-# details.
-
class Sync
include Sync_m
end
-
-##
-# An alias for Sync from sync.rb. See Sync_m for details.
-
Synchronizer = Sync
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 6dadf2f4b4..8bdf086b33 100644..100755
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -39,7 +39,7 @@ require 'thread'
# 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 existence of these temp files can make
+# 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
@@ -79,6 +79,7 @@ require 'thread'
# same Tempfile object from multiple threads then you should protect it with a
# mutex.
class Tempfile < DelegateClass(File)
+ MAX_TRY = 10 # :nodoc:
include Dir::Tmpname
# call-seq:
@@ -126,14 +127,12 @@ class Tempfile < DelegateClass(File)
# If Tempfile.new cannot find a unique filename within a limited
# number of tries, then it will raise an exception.
def initialize(basename, *rest)
- if block_given?
- warn "Tempfile.new doesn't call the given block."
- end
@data = []
@clean_proc = Remover.new(@data)
ObjectSpace.define_finalizer(self, @clean_proc)
create(basename, *rest) do |tmpname, n, opts|
+ lock = tmpname + '.lock'
mode = File::RDWR|File::CREAT|File::EXCL
perm = 0600
if opts
@@ -143,8 +142,13 @@ class Tempfile < DelegateClass(File)
else
opts = perm
end
- @data[1] = @tmpfile = File.open(tmpname, mode, opts)
- @data[0] = @tmpname = tmpname
+ self.class.mkdir(lock)
+ begin
+ @data[1] = @tmpfile = File.open(tmpname, mode, opts)
+ @data[0] = @tmpname = tmpname
+ ensure
+ self.class.rmdir(lock)
+ end
@mode = mode & ~(File::CREAT|File::EXCL)
perm or opts.freeze
@opts = opts
@@ -161,13 +165,10 @@ class Tempfile < DelegateClass(File)
__setobj__(@tmpfile)
end
- def _close # :nodoc:
- begin
- @tmpfile.close if @tmpfile
- ensure
- @tmpfile = nil
- @data[1] = nil if @data
- end
+ def _close # :nodoc:
+ @tmpfile.close if @tmpfile
+ @tmpfile = nil
+ @data[1] = nil if @data
end
protected :_close
@@ -190,6 +191,7 @@ class Tempfile < DelegateClass(File)
def close!
_close
unlink
+ ObjectSpace.undefine_finalizer(self)
end
# Unlinks (deletes) the file from the filesystem. One should always unlink
@@ -226,18 +228,18 @@ class Tempfile < DelegateClass(File)
# # to do so again.
# end
def unlink
+ # keep this order for thread safeness
return unless @tmpname
begin
- File.unlink(@tmpname)
- rescue Errno::ENOENT
+ if File.exist?(@tmpname)
+ File.unlink(@tmpname)
+ end
+ # remove tmpname from remover
+ @data[0] = @data[2] = nil
+ @tmpname = nil
rescue Errno::EACCES
# may not be able to unlink on Windows; just ignore
- return
end
- # remove tmpname from remover
- @data[0] = @data[1] = nil
- @tmpname = nil
- ObjectSpace.undefine_finalizer(self)
end
alias delete unlink
@@ -261,10 +263,6 @@ class Tempfile < DelegateClass(File)
end
alias length size
- def inspect
- "#<#{self.class}:#{path}>"
- end
-
# :stopdoc:
class Remover
def initialize(data)
@@ -273,22 +271,20 @@ class Tempfile < DelegateClass(File)
end
def call(*args)
- return if @pid != $$
-
- path, tmpfile = *@data
+ if @pid == $$
+ path, tmpfile = *@data
- STDERR.print "removing ", path, "..." if $DEBUG
+ STDERR.print "removing ", path, "..." if $DEBUG
- tmpfile.close if tmpfile
+ tmpfile.close if tmpfile
- if path
- begin
- File.unlink(path)
- rescue Errno::ENOENT
+ # keep this order for thread safeness
+ if path
+ File.unlink(path) if File.exist?(path)
end
- end
- STDERR.print "done\n" if $DEBUG
+ STDERR.print "done\n" if $DEBUG
+ end
end
end
# :startdoc:
@@ -300,7 +296,7 @@ class Tempfile < DelegateClass(File)
#
# If a block is given, then a Tempfile object will be constructed,
# and the block is run with said object as argument. The Tempfile
- # object will be automatically closed after the block terminates.
+ # 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.
@@ -320,15 +316,22 @@ class Tempfile < DelegateClass(File)
tempfile = new(*args)
if block_given?
- begin
- yield(tempfile)
- ensure
- tempfile.close
- end
+ begin
+ yield(tempfile)
+ ensure
+ tempfile.close
+ end
else
- tempfile
+ tempfile
end
end
+
+ def mkdir(*args)
+ Dir.mkdir(*args)
+ end
+ def rmdir(*args)
+ Dir.rmdir(*args)
+ end
end
end
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 23c1be8f92..fd7fe06f43 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -3,863 +3,64 @@
require 'minitest/unit'
require 'test/unit/assertions'
require 'test/unit/testcase'
-require 'optparse'
module Test
module Unit
TEST_UNIT_IMPLEMENTATION = 'test/unit compatibility layer using minitest'
- module RunCount
- @@run_count = 0
-
- def self.have_run?
- @@run_count.nonzero?
- end
-
- def run(*)
- @@run_count += 1
- super
- end
-
- def run_once
- return if have_run?
- return if $! # don't run if there was an exception
- yield
- end
- module_function :run_once
- end
-
- module Options
- def initialize(*, &block)
- @init_hook = block
- @options = nil
- super(&nil)
- end
-
- def option_parser
- @option_parser ||= OptionParser.new
- end
-
- def process_args(args = [])
- return @options if @options
- orig_args = args.dup
- options = {}
- opts = option_parser
- setup_options(opts, options)
- opts.parse!(args)
- orig_args -= args
- args = @init_hook.call(args, options) if @init_hook
- non_options(args, options)
- @help = orig_args.map { |s| s =~ /[\s|&<>$()]/ ? s.inspect : s }.join " "
- @options = options
- if @options[:parallel]
- @files = args
- @args = orig_args
- end
- options
- end
-
- private
- def setup_options(opts, options)
- opts.separator 'minitest options:'
- opts.version = MiniTest::Unit::VERSION
-
- options[:retry] = true
- options[:job_status] = nil
-
- opts.on '-h', '--help', 'Display this help.' do
- puts opts
- exit
- end
-
- opts.on '-s', '--seed SEED', Integer, "Sets random seed" do |m|
- options[:seed] = m
- end
-
- opts.on '-v', '--verbose', "Verbose. Show progress processing files." do
- options[:verbose] = true
- self.verbose = options[:verbose]
- end
-
- opts.on '-n', '--name PATTERN', "Filter test names on pattern." do |a|
- options[:filter] = a
- end
-
- opts.on '--jobs-status [TYPE]', [:normal, :replace],
- "Show status of jobs every file; Disabled when --jobs isn't specified." do |type|
- options[:job_status] = type || :normal
- end
-
- opts.on '-j N', '--jobs N', "Allow run tests with N jobs at once" do |a|
- if /^t/ =~ a
- options[:testing] = true # For testing
- options[:parallel] = a[1..-1].to_i
- else
- options[:parallel] = a.to_i
- end
- end
-
- opts.on '--separate', "Restart job process after one testcase has done" do
- options[:parallel] ||= 1
- options[:separate] = true
- end
-
- opts.on '--retry', "Retry running testcase when --jobs specified" do
- options[:retry] = true
- end
-
- opts.on '--no-retry', "Disable --retry" do
- options[:retry] = false
- end
-
- opts.on '--ruby VAL', "Path to ruby; It'll have used at -j option" do |a|
- options[:ruby] = a.split(/ /).reject(&:empty?)
- end
-
- opts.on '-q', '--hide-skip', 'Hide skipped tests' do
- options[:hide_skip] = true
- end
-
- opts.on '--show-skip', 'Show skipped tests' do
- options[:hide_skip] = false
- end
-
- opts.on '--color[=WHEN]',
- [:always, :never, :auto],
- "colorize the output. WHEN defaults to 'always'", "or can be 'never' or 'auto'." do |c|
- options[:color] = c || :always
- end
-
- opts.on '--tty[=WHEN]',
- [:yes, :no],
- "force to output tty control. WHEN defaults to 'yes'", "or can be 'no'." do |c|
- @tty = c != :no
- end
- end
-
- def non_options(files, options)
- begin
- require "rbconfig"
- rescue LoadError
- warn "#{caller(1)[0]}: warning: Parallel running disabled because can't get path to ruby; run specify with --ruby argument"
- options[:parallel] = nil
+ 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
- options[:ruby] ||= [RbConfig.ruby]
- end
-
- true
- end
- end
-
- module GlobOption
- @@testfile_prefix = "test"
-
- def setup_options(parser, options)
- super
- parser.on '-b', '--basedir=DIR', 'Base directory of test suites.' do |dir|
- options[:base_directory] = dir
- end
- parser.on '-x', '--exclude PATTERN', 'Exclude test files on pattern.' do |pattern|
- (options[:reject] ||= []) << pattern
- end
- end
-
- def non_options(files, options)
- paths = [options.delete(:base_directory), nil].uniq
- if reject = options.delete(:reject)
- reject_pat = Regexp.union(reject.map {|r| /#{r}/ })
- end
- files.map! {|f|
- f = f.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
- ((paths if /\A\.\.?(?:\z|\/)/ !~ f) || [nil]).any? do |prefix|
- if prefix
- path = f.empty? ? prefix : "#{prefix}/#{f}"
- else
- next if f.empty?
- path = f
- end
- if !(match = Dir["#{path}/**/#{@@testfile_prefix}_*.rb"]).empty?
- if reject
- match.reject! {|n|
- n[(prefix.length+1)..-1] if prefix
- reject_pat =~ n
- }
- end
- break match
- elsif !reject or reject_pat !~ f and File.exist? path
- break path
- end
- end or
- raise ArgumentError, "file not found: #{f}"
- }
- files.flatten!
- super(files, options)
- end
- end
-
- module LoadPathOption
- def setup_options(parser, options)
- super
- parser.on '-Idirectory', 'Add library load path' do |dirs|
- dirs.split(':').each { |d| $LOAD_PATH.unshift d }
+ files << arg
end
end
- end
- module GCStressOption
- def setup_options(parser, options)
- super
- parser.on '--[no-]gc-stress', 'Set GC.stress as true' do |flag|
- options[:gc_stress] = flag
- end
+ if block_given?
+ files = yield files
end
- def non_options(files, options)
- if options.delete(:gc_stress)
- MiniTest::Unit::TestCase.class_eval do
- oldrun = instance_method(:run)
- define_method(:run) do |runner|
- begin
- gc_stress, GC.stress = GC.stress, true
- oldrun.bind(self).call(runner)
- ensure
- GC.stress = gc_stress
- end
- end
- end
- end
- super
- end
- end
-
- module RequireFiles
- def non_options(files, options)
- return false if !super
- result = false
- files.each {|f|
- d = File.dirname(path = File.realpath(f))
- unless $:.include? d
- $: << d
- end
- begin
- require path unless options[:parallel]
- result = true
- rescue LoadError
- puts "#{f}: #{$!}"
- end
- }
- result
- end
- end
-
- class Runner < MiniTest::Unit
- include Test::Unit::Options
- include Test::Unit::GlobOption
- include Test::Unit::LoadPathOption
- include Test::Unit::GCStressOption
- include Test::Unit::RunCount
-
- class Worker
- def self.launch(ruby,args=[])
- io = IO.popen([*ruby,
- "#{File.dirname(__FILE__)}/unit/parallel.rb",
- *args], "rb+")
- new(io, io.pid, :waiting)
- end
-
- attr_reader :quit_called
-
- def initialize(io, pid, status)
- @io = io
- @pid = pid
- @status = status
- @file = nil
- @real_file = nil
- @loadpath = []
- @hooks = {}
- @quit_called = false
- end
-
- def puts(*args)
- @io.puts(*args)
- end
-
- def run(task,type)
- @file = File.basename(task, ".rb")
- @real_file = task
- begin
- puts "loadpath #{[Marshal.dump($:-@loadpath)].pack("m0")}"
- @loadpath = $:.dup
- puts "run #{task} #{type}"
- @status = :prepare
- rescue Errno::EPIPE
- died
- rescue IOError
- raise unless ["stream closed","closed stream"].include? $!.message
- died
- end
- end
-
- def hook(id,&block)
- @hooks[id] ||= []
- @hooks[id] << block
- self
- end
-
- def read
- res = (@status == :quit) ? @io.read : @io.gets
- res && res.chomp
- end
-
- def close
- @io.close unless @io.closed?
- self
- rescue IOError
- end
-
- def quit
- return if @io.closed?
- @quit_called = true
- @io.puts "quit"
- @io.close
- end
-
- def kill
- Process.kill(:KILL, @pid)
- rescue Errno::ESRCH
- end
-
- def died(*additional)
- @status = :quit
- @io.close
-
- call_hook(:dead,*additional)
- end
-
- def to_s
- if @file
- "#{@pid}=#{@file}"
- else
- "#{@pid}:#{@status.to_s.ljust(7)}"
- end
- end
-
- attr_reader :io, :pid
- attr_accessor :status, :file, :real_file, :loadpath
-
- private
-
- def call_hook(id,*additional)
- @hooks[id] ||= []
- @hooks[id].each{|hook| hook[self,additional] }
- self
- end
-
- end
-
- class << self; undef autorun; end
-
- @@stop_auto_run = false
- def self.autorun
- at_exit {
- Test::Unit::RunCount.run_once {
- exit(Test::Unit::Runner.new.run(ARGV) || true)
- } unless @@stop_auto_run
- } unless @@installed_at_exit
- @@installed_at_exit = true
- end
-
- def after_worker_down(worker, e=nil, c=false)
- return unless @options[:parallel]
- return if @interrupt
- warn e if e
- @need_quit = true
- warn ""
- warn "Some worker was crashed. It seems ruby interpreter's bug"
- warn "or, a bug of test/unit/parallel.rb. try again without -j"
- warn "option."
- warn ""
- STDERR.flush
- exit c
- end
-
- def terminal_width
- unless @terminal_width ||= nil
- begin
- require 'io/console'
- width = $stdout.winsize[1]
- rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF, Errno::EINVAL
- width = ENV["COLUMNS"].to_i.nonzero? || 80
- end
- width -= 1 if /mswin|mingw/ =~ RUBY_PLATFORM
- @terminal_width = width
- end
- @terminal_width
- end
-
- def del_status_line
- @status_line_size ||= 0
- unless @options[:job_status] == :replace
- $stdout.puts
- return
- end
- print "\r"+" "*@status_line_size+"\r"
- $stdout.flush
- @status_line_size = 0
- end
-
- def put_status(line)
- unless @options[:job_status] == :replace
- print(line)
- return
- end
- @status_line_size ||= 0
- del_status_line
- $stdout.flush
- line = line[0...terminal_width]
- print line
- $stdout.flush
- @status_line_size = line.size
- end
-
- def add_status(line)
- unless @options[:job_status] == :replace
- print(line)
- return
- end
- @status_line_size ||= 0
- line = line[0...(terminal_width-@status_line_size)]
- print line
- $stdout.flush
- @status_line_size += line.size
- end
-
- def jobs_status
- return unless @options[:job_status]
- puts "" unless @options[:verbose] or @options[:job_status] == :replace
- status_line = @workers.map(&:to_s).join(" ")
- update_status(status_line) or (puts; nil)
- end
-
- def del_jobs_status
- return unless @options[:job_status] == :replace && @status_line_size.nonzero?
- del_status_line
- end
-
- def after_worker_quit(worker)
- return unless @options[:parallel]
- return if @interrupt
- @workers.delete(worker)
- @dead_workers << worker
- @ios = @workers.map(&:io)
- end
-
- def launch_worker
- begin
- worker = Worker.launch(@options[:ruby],@args)
- rescue => e
- abort "ERROR: Failed to launch job process - #{e.class}: #{e.message}"
- end
- worker.hook(:dead) do |w,info|
- after_worker_quit w
- after_worker_down w, *info if !info.empty? && !worker.quit_called
- end
- @workers << worker
- @ios << worker.io
- @workers_hash[worker.io] = worker
- worker
- end
-
- def delete_worker(worker)
- @workers_hash.delete worker.io
- @workers.delete worker
- @ios.delete worker.io
- end
-
- def quit_workers
- return if @workers.empty?
- @workers.reject! do |worker|
- begin
- timeout(1) do
- worker.quit
- end
- rescue Errno::EPIPE
- rescue Timeout::Error
- end
- worker.close
- end
-
- return if @workers.empty?
- begin
- timeout(0.2 * @workers.size) do
- Process.waitall
- end
- rescue Timeout::Error
- @workers.each do |worker|
- worker.kill
- end
- @worker.clear
- end
- end
-
- def start_watchdog
- Thread.new do
- while stat = Process.wait2
- break if @interrupt # Break when interrupt
- pid, stat = stat
- w = (@workers + @dead_workers).find{|x| pid == x.pid }
- next unless w
- w = w.dup
- if w.status != :quit && !w.quit_called?
- # Worker down
- w.died(nil, !stat.signaled? && stat.exitstatus)
- end
- end
- end
- end
-
- def deal(io, type, result, rep, shutting_down = false)
- worker = @workers_hash[io]
- case worker.read
- when /^okay$/
- worker.status = :running
- jobs_status
- when /^ready(!)?$/
- bang = $1
- worker.status = :ready
-
- return nil unless task = @tasks.shift
- if @options[:separate] and not bang
- worker.quit
- worker = add_worker
- end
- worker.run(task, type)
- @test_count += 1
-
- jobs_status
- when /^done (.+?)$/
- r = Marshal.load($1.unpack("m")[0])
- result << r[0..1] unless r[0..1] == [nil,nil]
- rep << {file: worker.real_file, report: r[2], result: r[3], testcase: r[5]}
- $:.push(*r[4]).uniq!
- return true
- when /^p (.+?)$/
- del_jobs_status
- print $1.unpack("m")[0]
- jobs_status if @options[:job_status] == :replace
- when /^after (.+?)$/
- @warnings << Marshal.load($1.unpack("m")[0])
- when /^bye (.+?)$/
- after_worker_down worker, Marshal.load($1.unpack("m")[0])
- when /^bye$/, nil
- if shutting_down || worker.quit_called
- after_worker_quit worker
- else
- after_worker_down worker
- end
- end
- return false
- end
-
- def _run_parallel suites, type, result
- if @options[:parallel] < 1
- warn "Error: parameter of -j option should be greater than 0."
- return
- end
-
- # Require needed things for parallel running
- require 'thread'
- require 'timeout'
- @tasks = @files.dup # Array of filenames.
- @need_quit = false
- @dead_workers = [] # Array of dead workers.
- @warnings = []
- @total_tests = @tasks.size.to_s(10)
- rep = [] # FIXME: more good naming
-
- @workers = [] # Array of workers.
- @workers_hash = {} # out-IO => worker
- @ios = [] # Array of worker IOs
- begin
- # Thread: watchdog
- watchdog = start_watchdog
-
- @options[:parallel].times {launch_worker}
-
- while _io = IO.select(@ios)[0]
- break if _io.any? do |io|
- @need_quit or
- (deal(io, type, result, rep).nil? and
- !@workers.any? {|x| [:running, :prepare].include? x.status})
- end
- end
- rescue Interrupt => ex
- @interrupt = ex
- return result
- ensure
- watchdog.kill if watchdog
- if @interrupt
- @ios.select!{|x| @workers_hash[x].status == :running }
- while !@ios.empty? && (__io = IO.select(@ios,[],[],10))
- __io[0].reject! {|io| deal(io, type, result, rep, true)}
- end
- end
-
- quit_workers
-
- unless @interrupt || !@options[:retry] || @need_quit
- @options[:parallel] = false
- suites, rep = rep.partition {|r| r[:testcase] && r[:file] && r[:report].any? {|e| !e[2].is_a?(MiniTest::Skip)}}
- suites.map {|r| r[:file]}.uniq.each {|file| require file}
- suites.map! {|r| eval("::"+r[:testcase])}
- del_status_line or puts
- unless suites.empty?
- puts "Retrying..."
- _run_suites(suites, type)
- end
- end
- unless @options[:retry]
- del_status_line or puts
- end
- unless rep.empty?
- rep.each do |r|
- r[:report].each do |f|
- puke(*f) if f
- end
- end
- if @options[:retry]
- @errors += rep.map{|x| x[:result][0] }.inject(:+)
- @failures += rep.map{|x| x[:result][1] }.inject(:+)
- @skips += rep.map{|x| x[:result][2] }.inject(:+)
- end
- end
- unless @warnings.empty?
- warn ""
- @warnings.uniq! {|w| w[1].message}
- @warnings.each do |w|
- warn "#{w[0]}: #{w[1].message} (#{w[1].class})"
- end
- warn ""
- end
- end
- end
-
- def _run_suites suites, type
- _prepare_run(suites, type)
- @interrupt = nil
- result = []
- GC.start
- if @options[:parallel]
- _run_parallel suites, type, result
+ 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
- suites.each {|suite|
- begin
- result << _run_suite(suite, type)
- rescue Interrupt => e
- @interrupt = e
- break
- end
- }
+ raise ArgumentError, "file not found: #{f}"
end
- report.reject!{|r| r.start_with? "Skipped:" } if @options[:hide_skip]
- report.sort_by!{|r| r.start_with?("Skipped:") ? 0 : \
- (r.start_with?("Failure:") ? 1 : 2) }
- result
- end
+ }
+ files.flatten!
- alias mini_run_suite _run_suite
+ reject_pat = Regexp.union(reject.map {|r| /#{r}/ })
+ files.reject! {|f| reject_pat =~ f }
- def output
- (@output ||= nil) || super
- end
-
- def _prepare_run(suites, type)
- options[:job_status] ||= :replace if @tty && !@verbose
- case options[:color]
- when :always
- color = true
- when :auto, nil
- color = @options[:job_status] == :replace && /dumb/ !~ ENV["TERM"]
- else
- color = false
- end
- if color
- # dircolors-like style
- colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
- @passed_color = "\e[#{colors["pass"] || "32"}m"
- @failed_color = "\e[#{colors["fail"] || "31"}m"
- @skipped_color = "\e[#{colors["skip"] || "33"}m"
- @reset_color = "\e[m"
- else
- @passed_color = @failed_color = @skipped_color = @reset_color = ""
- end
- if color or @options[:job_status] == :replace
- @verbose = !options[:parallel]
- @output = StatusLineOutput.new(self)
- end
- if /\A\/(.*)\/\z/ =~ (filter = options[:filter])
- filter = Regexp.new($1)
- end
- type = "#{type}_methods"
- total = if filter
- suites.inject(0) {|n, suite| n + suite.send(type).grep(filter).size}
- else
- suites.inject(0) {|n, suite| n + suite.send(type).size}
- end
- @test_count = 0
- @total_tests = total.to_s(10)
- end
-
- def new_test(s)
- @test_count += 1
- update_status(s)
- end
-
- def update_status(s)
- count = @test_count.to_s(10).rjust(@total_tests.size)
- put_status("#{@passed_color}[#{count}/#{@total_tests}]#{@reset_color} #{s}")
- end
-
- def _print(s); $stdout.print(s); end
- def succeed; del_status_line; end
-
- def failed(s)
- sep = "\n"
- @report_count ||= 0
- report.each do |msg|
- if msg.start_with? "Skipped:"
- if @options[:hide_skip]
- del_status_line
- next
- end
- color = @skipped_color
- else
- color = @failed_color
- end
- msg = msg.split(/$/, 2)
- $stdout.printf("%s%s%3d) %s%s%s\n",
- sep, color, @report_count += 1,
- msg[0], @reset_color, msg[1])
- sep = nil
- end
- report.clear
- end
-
- # Overriding of MiniTest::Unit#puke
- def puke klass, meth, e
- # TODO:
- # this overriding is for minitest feature that skip messages are
- # hidden when not verbose (-v), note this is temporally.
- n = report.size
- rep = super
- if MiniTest::Skip === e and /no message given\z/ =~ e.message
- report.slice!(n..-1)
- rep = "."
- end
- rep
- end
-
- def initialize # :nodoc:
- super
- @tty = $stdout.tty?
- end
-
- def status(*args)
- result = super
- raise @interrupt if @interrupt
- result
- end
-
- def run(*args)
- result = super
- puts "\nruby -v: #{RUBY_DESCRIPTION}"
- result
- end
- end
-
- class StatusLineOutput < Struct.new(:runner)
- def puts(*a) $stdout.puts(*a) unless a.empty? end
- def respond_to_missing?(*a) $stdout.respond_to?(*a) end
- def method_missing(*a, &b) $stdout.__send__(*a, &b) end
-
- def print(s)
- case s
- when /\A(.*\#.*) = \z/
- runner.new_test($1)
- when /\A(.* s) = \z/
- runner.add_status(" = "+$1.chomp)
- when /\A\.+\z/
- runner.succeed
- when /\A[EFS]\z/
- runner.failed(s)
- else
- $stdout.print(s)
+ files.each {|f|
+ d = File.dirname(path = File.expand_path(f))
+ unless $:.include? d
+ $: << d
end
- end
- end
-
- class AutoRunner
- class Runner < Test::Unit::Runner
- include Test::Unit::RequireFiles
- end
-
- attr_accessor :to_run, :options
-
- def initialize(force_standalone = false, default_dir = nil, argv = ARGV)
- @force_standalone = force_standalone
- @runner = Runner.new do |files, options|
- options[:base_directory] ||= default_dir
- files << default_dir if files.empty? and default_dir
- @to_run = files
- yield self if block_given?
- files
- end
- Runner.runner = @runner
- @options = @runner.option_parser
- if @force_standalone
- @options.banner.sub!(/\[options\]/, '\& tests...')
- end
- @argv = argv
- end
-
- def process_args(*args)
- @runner.process_args(*args)
- !@to_run.empty?
- end
-
- def run
- if @force_standalone and not process_args(@argv)
- abort @options.banner
+ begin
+ require path
+ rescue LoadError
+ puts "#{f}: #{$!}"
end
- @runner.run(@argv) || true
- end
+ }
- def self.run(*args)
- new(*args).run
- end
+ ARGV.replace minitest_argv
end
-
- class ProxyError < StandardError
- def initialize(ex)
- @message = ex.message
- @backtrace = ex.backtrace
- end
-
- attr_accessor :message, :backtrace
- end
- end
-end
-
-class MiniTest::Unit::TestCase
- undef run_test
- RUN_TEST_TRACE = "#{__FILE__}:#{__LINE__+3}:in `run_test'".freeze
- def run_test(name)
- progname, $0 = $0, "#{$0}: #{self.class}##{name}"
- self.__send__(name)
- ensure
- $@.delete(RUN_TEST_TRACE) if $@
- $0 = progname
end
end
-Test::Unit::Runner.autorun
+MiniTest::Unit.autorun
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 67a289757b..d375e3de85 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -6,85 +6,27 @@ module Test
module Assertions
include MiniTest::Assertions
- def mu_pp(obj) #:nodoc:
+ def mu_pp(obj)
obj.pretty_inspect.chomp
end
- MINI_DIR = File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), "minitest") #:nodoc:
-
- UNASSIGNED = Object.new # :nodoc:
-
- # :call-seq:
- # assert( test, failure_message = UNASSIGNED )
- #
- #Tests if +test+ is true.
- #
- #+msg+ may be a String or a Proc. If +msg+ is a String, it will be used
- #as the failure message. Otherwise, the result of calling +msg+ will be
- #used as the message if the assertion fails.
- #
- #If no +msg+ is given, a default message will be used.
- #
- # assert(false, "This was expected to be true")
- def assert(test, msg = UNASSIGNED)
- case msg
- when UNASSIGNED
- msg = nil
- when String, Proc
- else
- bt = caller.reject { |s| s.rindex(MINI_DIR, 0) }
+ def assert(test, msg = (nomsg = true; nil))
+ unless nomsg or msg.instance_of?(String) or msg.instance_of?(Proc) or
+ (bt = caller).first.rindex(MiniTest::MINI_DIR, 0)
+ bt.delete_if {|s| s.rindex(MiniTest::MINI_DIR, 0)}
raise ArgumentError, "assertion message must be String or Proc, but #{msg.class} was given.", bt
end
super
end
- # :call-seq:
- # assert_block( failure_message = nil )
- #
- #Tests the result of the given block. If the block does not return true,
- #the assertion will fail. The optional +failure_message+ argument is the same as in
- #Assertions#assert.
- #
- # assert_block do
- # [1, 2, 3].any? { |num| num < 1 }
- # end
def assert_block(*msgs)
assert yield, *msgs
end
- # :call-seq:
- # assert_raise( *args, &block )
- #
- #Tests if the given block raises an exception. Acceptable exception
- #types maye be given as optional arguments. If the last argument is a
- #String, it will be used as the error message.
- #
- # assert_raise do #Fails, no Exceptions are raised
- # end
- #
- # assert_raise NameError do
- # puts x #Raises NameError, so assertion succeeds
- # end
def assert_raise(*args, &b)
assert_raises(*args, &b)
end
- # :call-seq:
- # assert_nothing_raised( *args, &block )
- #
- #If any exceptions are given as arguments, the assertion will
- #fail if one of those exceptions are raised. Otherwise, the test fails
- #if any exceptions are raised.
- #
- #The final argument may be a failure message.
- #
- # assert_nothing_raised RuntimeError do
- # raise Exception #Assertion passes, Exception is not a RuntimeError
- # end
- #
- # assert_nothing_raised do
- # raise Exception #Assertion fails
- # end
def assert_nothing_raised(*args)
self._assertions += 1
if Module === args.last
@@ -94,8 +36,6 @@ module Test
end
begin
line = __LINE__; yield
- rescue MiniTest::Skip
- raise
rescue Exception => e
bt = e.backtrace
as = e.instance_of?(MiniTest::Assertion)
@@ -114,16 +54,6 @@ module Test
nil
end
- # :call-seq:
- # assert_nothing_thrown( failure_message = nil, &block )
- #
- #Fails if the given block uses a call to Kernel#throw.
- #
- #An optional failure message may be provided as the final argument.
- #
- # assert_nothing_thrown "Something was thrown!" do
- # throw :problem?
- # end
def assert_nothing_thrown(msg=nil)
begin
yield
@@ -135,12 +65,6 @@ module Test
assert(true, "Expected nothing to be thrown")
end
- # :call-seq:
- # assert_equal( expected, actual, failure_message = nil )
- #
- #Tests if +expected+ is equal to +actual+.
- #
- #An optional failure message may be provided as the final argument.
def assert_equal(exp, act, msg = nil)
msg = message(msg) {
exp_str = mu_pp(exp)
@@ -187,34 +111,16 @@ module Test
assert(exp == act, msg)
end
- # :call-seq:
- # assert_not_nil( expression, failure_message = nil )
- #
- #Tests if +expression+ is not nil.
- #
- #An optional failure message may be provided as the final argument.
def assert_not_nil(exp, msg=nil)
msg = message(msg) { "<#{mu_pp(exp)}> expected to not be nil" }
assert(!exp.nil?, msg)
end
- # :call-seq:
- # assert_not_equal( expected, actual, failure_message = nil )
- #
- #Tests if +expected+ is not equal to +actual+.
- #
- #An optional failure message may be provided as the final argument.
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)
end
- # :call-seq:
- # assert_no_match( regexp, string, failure_message = nil )
- #
- #Tests if the given Regexp does not match a given String.
- #
- #An optional failure message may be provided as the final argument.
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
@@ -222,15 +128,6 @@ module Test
assert(regexp !~ string, msg)
end
- # :call-seq:
- # assert_not_same( expected, actual, failure_message = nil )
- #
- #Tests if +expected+ is not the same object as +actual+.
- #This test uses Object#equal? to test equality.
- #
- #An optional failure message may be provided as the final argument.
- #
- # assert_not_same("x", "x") #Succeeds
def assert_not_same(expected, actual, message="")
msg = message(msg) { build_message(message, <<EOT, expected, expected.__id__, actual, actual.__id__) }
<?>
@@ -241,76 +138,9 @@ EOT
assert(!actual.equal?(expected), msg)
end
- # :call-seq:
- # assert_respond_to( object, method, failure_message = nil )
- #
- #Tests if the given Object responds to +method+.
- #
- #An optional failure message may be provided as the final argument.
- #
- # assert_respond_to("hello", :reverse) #Succeeds
- # assert_respond_to("hello", :does_not_exist) #Fails
- def assert_respond_to obj, (meth, priv), msg = nil
- if priv
- msg = message(msg) {
- "Expected #{mu_pp(obj)} (#{obj.class}) to respond to ##{meth}#{" privately" if priv}"
- }
- return assert obj.respond_to?(meth, priv), msg
- end
- #get rid of overcounting
- super if !caller[0].rindex(MINI_DIR, 0) || !obj.respond_to?(meth)
- end
-
- # :call-seq:
- # assert_send( +send_array+, failure_message = nil )
- #
- # 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], :member?, 1]) # -> pass
- # assert_send([[1, 2], :member?, 4]) # -> fail
- def assert_send send_ary, m = nil
- recv, msg, *args = send_ary
- m = message(m) {
- if args.empty?
- argsstr = ""
- else
- (argsstr = mu_pp(args)).sub!(/\A\[(.*)\]\z/m, '(\1)')
- end
- "Expected #{mu_pp(recv)}.#{msg}#{argsstr} to return true"
- }
- assert recv.__send__(msg, *args), m
- end
-
- # :call-seq:
- # assert_not_send( +send_array+, failure_message = nil )
- #
- # Passes if the method send doesn't return a true value.
- #
- # +send_array+ is composed of:
- # * A receiver
- # * A method
- # * Arguments to the method
- #
- # Example:
- # assert_not_send([[1, 2], :member?, 1]) # -> fail
- # assert_not_send([[1, 2], :member?, 4]) # -> pass
- def assert_not_send send_ary, m = nil
- recv, msg, *args = send_ary
- m = message(m) {
- if args.empty?
- argsstr = ""
- else
- (argsstr = mu_pp(args)).sub!(/\A\[(.*)\]\z/m, '(\1)')
- end
- "Expected #{mu_pp(recv)}.#{msg}#{argsstr} to return false"
- }
- assert !recv.__send__(msg, *args), m
+ # 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)
end
ms = instance_methods(true).map {|sym| sym.to_s }
@@ -318,12 +148,10 @@ EOT
mname = ('assert_not_' << m.to_s[/.*?_(.*)/, 1])
alias_method(mname, m) unless ms.include? mname
end
- alias assert_include assert_includes
- alias assert_not_include assert_not_includes
- def build_message(head, template=nil, *arguments) #:nodoc:
+ def build_message(head, template=nil, *arguments)
template &&= template.chomp
- template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) }
+ template.gsub(/\?/) { mu_pp(arguments.shift) }
end
end
end
diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb
deleted file mode 100644
index f8fa01ebdc..0000000000
--- a/lib/test/unit/parallel.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'test/unit'
-
-module Test
- module Unit
- class Worker < Runner
- class << self
- undef autorun
- end
-
- alias orig_run_suite mini_run_suite
- undef _run_suite
- undef _run_suites
- undef run
-
- def increment_io(orig)
- *rest, io = 32.times.inject([orig.dup]){|ios, | ios << ios.last.dup }
- rest.each(&:close)
- io
- end
-
- def _run_suites(suites, type)
- suites.map do |suite|
- _run_suite(suite, type)
- end
- end
-
- def _run_suite(suite, type)
- @partial_report = []
- orig_testout = MiniTest::Unit.output
- i,o = IO.pipe
-
- MiniTest::Unit.output = o
- orig_stdin, orig_stdout = $stdin, $stdout
-
- th = Thread.new do
- begin
- while buf = (self.verbose ? i.gets : i.read(5))
- _report "p", buf
- end
- rescue IOError
- rescue Errno::EPIPE
- end
- end
-
- e, f, s = @errors, @failures, @skips
-
- begin
- result = orig_run_suite(suite, type)
- rescue Interrupt
- @need_exit = true
- result = [nil,nil]
- end
-
- MiniTest::Unit.output = orig_testout
- $stdin = orig_stdin
- $stdout = orig_stdout
-
- o.close
- begin
- th.join
- rescue IOError
- raise unless ["stream closed","closed stream"].include? $!.message
- end
- i.close
-
- result << @partial_report
- @partial_report = nil
- result << [@errors-e,@failures-f,@skips-s]
- result << ($: - @old_loadpath)
- result << suite.name
-
- begin
- _report "done", Marshal.dump(result)
- rescue Errno::EPIPE; end
- return result
- ensure
- MiniTest::Unit.output = orig_stdout
- $stdin = orig_stdin
- $stdout = orig_stdout
- o.close if o && !o.closed?
- i.close if i && !i.closed?
- end
-
- def run(args = [])
- process_args args
- @@stop_auto_run = true
- @opts = @options.dup
- @need_exit = false
-
- @old_loadpath = []
- begin
- begin
- @stdout = increment_io(STDOUT)
- @stdin = increment_io(STDIN)
- rescue
- exit 2
- end
- exit 2 unless @stdout && @stdin
-
- @stdout.sync = true
- _report "ready!"
- while buf = @stdin.gets
- case buf.chomp
- when /^loadpath (.+?)$/
- @old_loadpath = $:.dup
- $:.push(*Marshal.load($1.unpack("m")[0].force_encoding("ASCII-8BIT"))).uniq!
- when /^run (.+?) (.+?)$/
- _report "okay"
-
- @options = @opts.dup
- suites = MiniTest::Unit::TestCase.test_suites
-
- begin
- require $1
- rescue LoadError
- _report "after", Marshal.dump([$1, ProxyError.new($!)])
- _report "ready"
- next
- end
- _run_suites MiniTest::Unit::TestCase.test_suites-suites, $2.to_sym
-
- if @need_exit
- begin
- _report "bye"
- rescue Errno::EPIPE; end
- exit
- else
- _report "ready"
- end
- when /^quit$/
- begin
- _report "bye"
- rescue Errno::EPIPE; end
- exit
- end
- end
- rescue Errno::EPIPE
- rescue Exception => e
- begin
- trace = e.backtrace
- err = ["#{trace.shift}: #{e.message} (#{e.class})"] + trace.map{|t| t.prepend("\t") }
-
- _report "bye", Marshal.dump(err.join("\n"))
- rescue Errno::EPIPE;end
- exit
- ensure
- @stdin.close if @stdin
- @stdout.close if @stdout
- end
- end
-
- def _report(res, *args)
- res = "#{res} #{args.pack("m0")}" unless args.empty?
- @stdout.puts(res)
- end
-
- def puke(klass, meth, e)
- if e.is_a?(MiniTest::Skip)
- new_e = MiniTest::Skip.new(e.message)
- new_e.set_backtrace(e.backtrace)
- e = new_e
- end
- @partial_report << [klass.name, meth, e.is_a?(MiniTest::Assertion) ? e : ProxyError.new(e)]
- super
- end
- end
- end
-end
-
-if $0 == __FILE__
- module Test
- module Unit
- class TestCase < MiniTest::Unit::TestCase
- undef on_parallel_worker?
- def on_parallel_worker?
- true
- end
- end
- end
- end
- require 'rubygems'
- class Gem::TestCase < MiniTest::Unit::TestCase
- @@project_dir = File.expand_path('../../../..', __FILE__)
- end
-
- Test::Unit::Worker.new.run(ARGV)
-end
diff --git a/lib/test/unit/test-unit.gemspec b/lib/test/unit/test-unit.gemspec
deleted file mode 100644
index 6c7d22379d..0000000000
--- a/lib/test/unit/test-unit.gemspec
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- ruby -*-
-
-Gem::Specification.new do |s|
- s.name = "test-unit"
- s.version = "#{RUBY_VERSION}.0"
- s.homepage = "http://www.ruby-lang.org"
- s.author = "Shota Fukumori"
- s.email = "sorah@tubusu.net"
- s.summary = "test/unit compatible API testing framework"
- s.description =
- "This library implements test/unit compatible API on minitest. " +
- "The test/unit means that test/unit which was bundled with Ruby 1.8."
- s.executables = ["testrb"]
-end
diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb
index 59637e1234..ec3d362c21 100644
--- a/lib/test/unit/testcase.rb
+++ b/lib/test/unit/testcase.rb
@@ -7,28 +7,9 @@ module Test
class TestCase < MiniTest::Unit::TestCase
include Assertions
-
- def on_parallel_worker?
- false
- end
-
- def run runner
- @options = runner.options
- super runner
- end
-
def self.test_order
:sorted
end
-
- def self.method_added(name)
- return unless name.to_s.start_with?("test_")
- @test_methods ||= {}
- if @test_methods[name]
- warn "test/unit warning: method #{ self }##{ name } is redefined"
- end
- @test_methods[name] = true
- end
end
end
end
diff --git a/lib/thread.rb b/lib/thread.rb
index b140a9e445..f3831a7425 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -1,6 +1,6 @@
#
-# thread.rb - thread support classes
-# by Yukihiro Matsumoto <matz@netlab.co.jp>
+# thread.rb - thread support classes
+# by Yukihiro Matsumoto <matz@netlab.co.jp>
#
# Copyright (C) 2001 Yukihiro Matsumoto
# Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
@@ -52,7 +52,7 @@ class ConditionVariable
# Creates a new ConditionVariable
#
def initialize
- @waiters = {}
+ @waiters = []
@waiters_mutex = Mutex.new
end
@@ -63,19 +63,12 @@ class ConditionVariable
# even if no other thread doesn't signal.
#
def wait(mutex, timeout=nil)
- Thread.handle_interrupt(StandardError => :never) do
- begin
- Thread.handle_interrupt(StandardError => :on_blocking) do
- @waiters_mutex.synchronize do
- @waiters[Thread.current] = true
- end
- mutex.sleep timeout
- end
- ensure
- @waiters_mutex.synchronize do
- @waiters.delete(Thread.current)
- end
+ begin
+ # TODO: mutex should not be used
+ @waiters_mutex.synchronize do
+ @waiters.push(Thread.current)
end
+ mutex.sleep timeout
end
self
end
@@ -84,13 +77,11 @@ class ConditionVariable
# Wakes up the first thread in line waiting for this lock.
#
def signal
- Thread.handle_interrupt(StandardError => :on_blocking) do
- begin
- t, _ = @waiters_mutex.synchronize { @waiters.shift }
- t.run if t
- rescue ThreadError
- retry # t was already dead?
- end
+ begin
+ t = @waiters_mutex.synchronize { @waiters.shift }
+ t.run if t
+ rescue ThreadError
+ retry
end
self
end
@@ -99,17 +90,16 @@ class ConditionVariable
# Wakes up all threads waiting for this lock.
#
def broadcast
- Thread.handle_interrupt(StandardError => :on_blocking) do
- threads = nil
- @waiters_mutex.synchronize do
- threads = @waiters.keys
- @waiters.clear
- end
- for t in threads
- begin
- t.run
- rescue ThreadError
- end
+ # TODO: imcomplete
+ waiters0 = nil
+ @waiters_mutex.synchronize do
+ waiters0 = @waiters.dup
+ @waiters.clear
+ end
+ for t in waiters0
+ begin
+ t.run
+ rescue ThreadError
end
end
self
@@ -149,23 +139,26 @@ class Queue
#
def initialize
@que = []
- @que.taint # enable tainted communication
- @num_waiting = 0
+ @waiting = []
+ @que.taint # enable tainted comunication
+ @waiting.taint
self.taint
@mutex = Mutex.new
- @cond = ConditionVariable.new
end
#
# Pushes +obj+ to the queue.
#
def push(obj)
- Thread.handle_interrupt(StandardError => :on_blocking) do
- @mutex.synchronize do
- @que.push obj
- @cond.signal
+ @mutex.synchronize{
+ @que.push obj
+ begin
+ t = @waiting.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
end
- end
+ }
end
#
@@ -184,26 +177,17 @@ class Queue
# thread isn't suspended, and an exception is raised.
#
def pop(non_block=false)
- Thread.handle_interrupt(StandardError => :on_blocking) do
- @mutex.synchronize do
- while true
- if @que.empty?
- if non_block
- raise ThreadError, "queue empty"
- else
- begin
- @num_waiting += 1
- @cond.wait @mutex
- ensure
- @num_waiting -= 1
- end
- end
- else
- return @que.shift
- end
+ @mutex.synchronize{
+ while true
+ if @que.empty?
+ raise ThreadError, "queue empty" if non_block
+ @waiting.push Thread.current
+ @mutex.sleep
+ else
+ return @que.shift
end
end
- end
+ }
end
#
@@ -246,7 +230,7 @@ class Queue
# Returns the number of threads waiting on the queue.
#
def num_waiting
- @num_waiting
+ @waiting.size
end
end
@@ -263,8 +247,8 @@ class SizedQueue < Queue
def initialize(max)
raise ArgumentError, "queue size must be positive" unless max > 0
@max = max
- @enque_cond = ConditionVariable.new
- @num_enqueue_waiting = 0
+ @queue_wait = []
+ @queue_wait.taint # enable tainted comunication
super()
end
@@ -279,17 +263,23 @@ class SizedQueue < Queue
# Sets the maximum size of the queue.
#
def max=(max)
- raise ArgumentError, "queue size must be positive" unless max > 0
-
- @mutex.synchronize do
+ diff = nil
+ @mutex.synchronize {
if max <= @max
@max = max
else
diff = max - @max
@max = max
- diff.times do
- @enque_cond.signal
- end
+ end
+ }
+ if diff
+ diff.times do
+ begin
+ t = @queue_wait.shift
+ t.run if t
+ rescue ThreadError
+ retry
+ end
end
end
max
@@ -300,34 +290,21 @@ class SizedQueue < Queue
# until space becomes available.
#
def push(obj)
- Thread.handle_interrupt(RuntimeError => :on_blocking) do
- @mutex.synchronize do
- while true
- break if @que.length < @max
- @num_enqueue_waiting += 1
- begin
- @enque_cond.wait @mutex
- ensure
- @num_enqueue_waiting -= 1
- end
- end
-
- @que.push obj
- @cond.signal
+ @mutex.synchronize{
+ while true
+ break if @que.length < @max
+ @queue_wait.push Thread.current
+ @mutex.sleep
end
- end
- end
- #
- # Removes all objects from the queue.
- #
- def clear
- super
- @mutex.synchronize do
- @max.times do
- @enque_cond.signal
+ @que.push obj
+ begin
+ t = @waiting.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
end
- end
+ }
end
#
@@ -345,11 +322,16 @@ class SizedQueue < Queue
#
def pop(*args)
retval = super
- @mutex.synchronize do
+ @mutex.synchronize {
if @que.length < @max
- @enque_cond.signal
+ begin
+ t = @queue_wait.shift
+ t.wakeup if t
+ rescue ThreadError
+ retry
+ end
end
- end
+ }
retval
end
@@ -367,7 +349,7 @@ class SizedQueue < Queue
# Returns the number of threads waiting on the queue.
#
def num_waiting
- @num_waiting + @num_enqueue_waiting
+ @waiting.size + @queue_wait.size
end
end
diff --git a/lib/thwait.rb b/lib/thwait.rb
index f5876236e4..963ff4d1b6 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -1,8 +1,8 @@
#
# thwait.rb - thread synchronization class
-# $Release Version: 0.9 $
-# $Revision: 1.3 $
-# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.)
+# $Release Version: 0.9 $
+# $Revision: 1.3 $
+# by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.)
require "thread.rb"
require "e2mmap.rb"
@@ -19,10 +19,10 @@ require "e2mmap.rb"
# STDERR.puts "Thread #{t} has terminated."
# end
#
-#
+#
# th = ThreadsWait.new(thread1,...)
# th.next_wait # next one to be done
-#
+#
#
class ThreadsWait
RCS_ID='-$Id: thwait.rb,v 1.3 1998/06/26 03:19:34 keiju Exp keiju $-'
@@ -39,7 +39,7 @@ class ThreadsWait
tw = ThreadsWait.new(*threads)
if block_given?
tw.all_waits do |th|
- yield th
+ yield th
end
else
tw.all_waits
@@ -91,11 +91,11 @@ class ThreadsWait
@threads.concat threads
for th in threads
Thread.start(th) do |t|
- begin
- t.join
- ensure
- @wait_queue.push t
- end
+ begin
+ t.join
+ ensure
+ @wait_queue.push t
+ end
end
end
end
@@ -131,12 +131,13 @@ class ThreadsWait
end
end
-##
-# An alias for ThreadsWait from thwait.rb
-
ThWait = ThreadsWait
+
# Documentation comments:
# - Source of documentation is evenly split between Nutshell, existing
# comments, and my own rephrasing.
# - I'm not particularly confident that the comments are all exactly correct.
+# - The history, etc., up the top appears in the RDoc output. Perhaps it would
+# be better to direct that not to appear, and put something else there
+# instead.
diff --git a/lib/time.rb b/lib/time.rb
index 12c2b30e25..1c43371d4e 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -1,98 +1,51 @@
-require 'date'
-# = time.rb
#
-# When 'time' is required, Time is extended with additional methods for parsing
-# and converting Times.
+# == Introduction
#
-# == Features
+# 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)
#
-# This library extends the Time class with the following conversions between
-# date strings and Time objects:
+# == Design Issues
#
-# * date-time defined by {RFC 2822}[http://www.ietf.org/rfc/rfc2822.txt]
-# * HTTP-date defined by {RFC 2616}[http://www.ietf.org/rfc/rfc2616.txt]
-# * dateTime defined by XML Schema Part 2: Datatypes ({ISO
-# 8601}[http://www.iso.org/iso/date_and_time_format])
-# * various formats handled by Date._parse
-# * custom formats handled by Date._strptime
+# === Specialized interface
#
-# == Examples
+# This library provides methods dedicated to special purposes:
+# * RFC 2822, RFC 2616 and XML Schema.
+# * They makes usual life easier.
#
-# All examples assume you have loaded Time with:
+# === Doesn't depend on strftime
#
-# require 'time'
+# This library doesn't use +strftime+. Especially #rfc2822 doesn't depend
+# on +strftime+ because:
#
-# All of these examples were done using the EST timezone which is GMT-5.
+# * %a and %b are locale sensitive
#
-# === Converting to a String
+# 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.
#
-# t = Time.now
-# t.iso8601 # => "2011-10-05T22:26:12-04:00"
-# t.rfc2822 # => "Wed, 05 Oct 2011 22:26:12 -0400"
-# t.httpdate # => "Thu, 06 Oct 2011 02:26:12 GMT"
+# * %z is not portable
#
-# === Time.parse
+# %z is required to generate zone in date-time of RFC 2822
+# but it is not portable.
#
-# #parse takes a string representation of a Time and attempts to parse it
-# using a heuristic.
-#
-# Date.parse("2010-10-31") #=> 2010-10-31 00:00:00 -0500
-#
-# Any missing pieces of the date are inferred based on the current date.
-#
-# # assuming the current date is "2011-10-31"
-# Time.parse("12:00") #=> 2011-10-31 12:00:00 -0500
-#
-# We can change the date used to infer our missing elements by passing a second
-# object that responds to #mon, #day and #year, such as Date, Time or DateTime.
-# We can also use our own object.
-#
-# class MyDate
-# attr_reader :mon, :day, :year
-#
-# def initialize(mon, day, year)
-# @mon, @day, @year = mon, day, year
-# end
-# end
-#
-# d = Date.parse("2010-10-28")
-# t = Time.parse("2010-10-29")
-# dt = DateTime.parse("2010-10-30")
-# md = MyDate.new(10,31,2010)
-#
-# Time.parse("12:00", d) #=> 2010-10-28 12:00:00 -0500
-# Time.parse("12:00", t) #=> 2010-10-29 12:00:00 -0500
-# Time.parse("12:00", dt) #=> 2010-10-30 12:00:00 -0500
-# Time.parse("12:00", md) #=> 2010-10-31 12:00:00 -0500
-#
-# #parse also accepts an optional block. You can use this block to specify how
-# to handle the year component of the date. This is specifically designed for
-# handling two digit years. For example, if you wanted to treat all two digit
-# years prior to 70 as the year 2000+ you could write this:
-#
-# Time.parse("01-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
-# #=> 2001-10-31 00:00:00 -0500
-# Time.parse("70-10-31") {|year| year + (year < 70 ? 2000 : 1900)}
-# #=> 1970-10-31 00:00:00 -0500
-#
-# === Time.strptime
+
+require 'date/format'
+
#
-# #strptime works similar to +parse+ except that instead of using a heuristic
-# to detect the format of the input string, you provide a second argument that
-# is describes the format of the string. For example:
+# Implements the extensions to the Time class that are described in the
+# documentation for the time.rb library.
#
-# Time.strptime("2000-10-31", "%Y-%m-%d") #=> 2000-10-31 00:00:00 -0500
-
class Time
class << Time
- #
- # A hash of timezones mapped to hour differences from UTC. The
- # set of time zones corresponds to the ones specified by RFC 2822
- # and ISO 8601.
- #
- ZoneOffset = { # :nodoc:
+ ZoneOffset = {
'UTC' => 0,
# ISO 8601
'Z' => 0,
@@ -109,26 +62,6 @@ class Time
'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4, 'R' => -5, 'S' => -6,
'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12,
}
-
- #
- # Return the number of seconds the specified time zone differs
- # from UTC.
- #
- # Numeric time zones that include minutes, such as
- # <code>-10:00</code> or <code>+1330</code> will work, as will
- # simpler hour-only time zones like <code>-10</code> or
- # <code>+13</code>.
- #
- # Textual time zones listed in ZoneOffset are also supported.
- #
- # If the time zone does not match any of the above, +zone_offset+
- # will check if the local time zone (both with and without
- # potential Daylight Saving \Time changes being in effect) matches
- # +zone+. Specifying a value for +year+ will change the year used
- # to find the local time zone.
- #
- # If +zone_offset+ is unable to determine the offset, nil will be
- # returned.
def zone_offset(zone, year=self.now.year)
off = nil
zone = zone.upcase
@@ -149,6 +82,7 @@ class Time
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".
@@ -279,15 +213,15 @@ class Time
# values (1 or 0) are assumed if broken or missing. For example:
#
# # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and
- # # your time zone is GMT:
+ # # 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
#
- # Since there are numerous conflicts among locally defined time zone
- # abbreviations all over the world, this method is not intended to
+ # Since there are numerous conflicts among locally defined timezone
+ # abbreviations all over the world, this method is not made to
# understand all of them. For example, the abbreviation "CST" is
# used variously as:
#
@@ -298,27 +232,29 @@ class Time
# +10:30 in Australia/Adelaide,
# etc.
#
- # Based on this fact, this method only understands the time zone
- # abbreviations described in RFC 822 and the system time zone, in the
+ # Based on the fact, this method only understands the timezone
+ # abbreviations described in RFC 822 and the system timezone, in the
# order named. (i.e. a definition in RFC 822 overrides the system
- # time zone definition.) The system time zone is taken from
+ # timezone definition.) The system timezone is taken from
# <tt>Time.local(year, 1, 1).zone</tt> and
# <tt>Time.local(year, 7, 1).zone</tt>.
- # If the extracted time zone abbreviation does not match any of them,
+ # If the extracted timezone abbreviation does not match any of them,
# it is ignored and the given time is regarded as a local time.
#
# ArgumentError is raised if Date._parse cannot extract information from
- # +date+ or if the Time class cannot represent specified date.
+ # +date+ or Time class cannot represent specified date.
#
- # This method can be used as a fail-safe for other parsing methods as:
+ # This method can be used as fail-safe for other parsing methods as:
#
# Time.rfc2822(date) rescue Time.parse(date)
# Time.httpdate(date) rescue Time.parse(date)
# Time.xmlschema(date) rescue Time.parse(date)
#
- # A failure of Time.parse should be checked, though.
+ # A failure for Time.parse should be checked, though.
+ #
+ # time library should be required to use this method as follows.
#
- # You must require 'time' to use this method.
+ # require 'time'
#
def parse(date, now=self.now)
comp = !block_given?
@@ -337,72 +273,13 @@ class Time
# 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}
- #
- # Below is a list of the formating options:
- #
- # %a :: The abbreviated weekday name ("Sun")
- # %A :: The full weekday name ("Sunday")
- # %b :: The abbreviated month name ("Jan")
- # %B :: The full month name ("January")
- # %c :: The preferred local date and time representation
- # %C :: Century (20 in 2009)
- # %d :: Day of the month (01..31)
- # %D :: Date (%m/%d/%y)
- # %e :: Day of the month, blank-padded ( 1..31)
- # %F :: Equivalent to %Y-%m-%d (the ISO 8601 date format)
- # %h :: Equivalent to %b
- # %H :: Hour of the day, 24-hour clock (00..23)
- # %I :: Hour of the day, 12-hour clock (01..12)
- # %j :: Day of the year (001..366)
- # %k :: hour, 24-hour clock, blank-padded ( 0..23)
- # %l :: hour, 12-hour clock, blank-padded ( 0..12)
- # %L :: Millisecond of the second (000..999)
- # %m :: Month of the year (01..12)
- # %M :: Minute of the hour (00..59)
- # %n :: Newline (\n)
- # %N :: Fractional seconds digits, default is 9 digits (nanosecond)
- # %3N :: millisecond (3 digits)
- # %6N :: microsecond (6 digits)
- # %9N :: nanosecond (9 digits)
- # %p :: Meridian indicator ("AM" or "PM")
- # %P :: Meridian indicator ("am" or "pm")
- # %r :: time, 12-hour (same as %I:%M:%S %p)
- # %R :: time, 24-hour (%H:%M)
- # %s :: Number of seconds since 1970-01-01 00:00:00 UTC.
- # %S :: Second of the minute (00..60)
- # %t :: Tab character (\t)
- # %T :: time, 24-hour (%H:%M:%S)
- # %u :: Day of the week as a decimal, Monday being 1. (1..7)
- # %U :: Week number of the current year, starting with the first Sunday as
- # the first day of the first week (00..53)
- # %v :: VMS date (%e-%b-%Y)
- # %V :: Week number of year according to ISO 8601 (01..53)
- # %W :: Week number of the current year, starting with the first Monday
- # as the first day of the first week (00..53)
- # %w :: Day of the week (Sunday is 0, 0..6)
- # %x :: Preferred representation for the date alone, no time
- # %X :: Preferred representation for the time alone, no date
- # %y :: Year without a century (00..99)
- # %Y :: Year with century
- # %z :: Time zone as hour offset from UTC (e.g. +0900)
- # %Z :: Time zone name
- # %% :: Literal "%" character
-
+ # 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
- if seconds = d[:seconds]
- if offset = d[:offset]
- Time.at(seconds).localtime(offset)
- else
- Time.at(seconds)
- end
- else
- 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)
- end
+ 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)
end
MonthValue = {
@@ -416,11 +293,13 @@ class Time
# updated by RFC 1123.
#
# ArgumentError is raised if +date+ is not compliant with RFC 2822
- # or if the Time class cannot represent specified date.
+ # or Time class cannot represent specified date.
#
# See #rfc2822 for more information on this format.
#
- # You must require 'time' to use this method.
+ # time library should be required to use this method as follows.
+ #
+ # require 'time'
#
def rfc2822(date)
if /\A\s*
@@ -463,15 +342,17 @@ class Time
alias rfc822 rfc2822
#
- # Parses +date+ as an HTTP-date defined by RFC 2616 and converts it to a
- # Time object.
+ # Parses +date+ as HTTP-date defined by RFC 2616 and converts it to a Time
+ # object.
#
- # ArgumentError is raised if +date+ is not compliant with RFC 2616 or if
- # the Time class cannot represent specified date.
+ # ArgumentError is raised if +date+ is not compliant with RFC 2616 or Time
+ # class cannot represent specified date.
#
# See #httpdate for more information on this format.
#
- # You must require 'time' to use this method.
+ # time library should be required to use this method as follows.
+ #
+ # require 'time'
#
def httpdate(date)
if /\A\s*
@@ -511,16 +392,18 @@ class Time
end
#
- # Parses +date+ as a dateTime defined by the XML Schema and converts it to
- # a Time object. The format is a restricted version of the format defined
- # by ISO 8601.
+ # Parses +date+ as dateTime defined by XML Schema and converts it to a Time
+ # object. The format is restricted version of the format defined by ISO
+ # 8601.
#
- # ArgumentError is raised if +date+ is not compliant with the format or if
- # the Time class cannot represent specified date.
+ # ArgumentError is raised if +date+ is not compliant with the format or Time
+ # class cannot represent specified date.
#
# See #xmlschema for more information on this format.
#
- # You must require 'time' to use this method.
+ # time library should be required to use this method as follows.
+ #
+ # require 'time'
#
def xmlschema(date)
if /\A\s*
@@ -564,7 +447,9 @@ class Time
#
# If +self+ is a UTC time, -0000 is used as zone.
#
- # You must require 'time' to use this method.
+ # time library should be required to use this method as follows.
+ #
+ # require 'time'
#
def rfc2822
sprintf('%s, %02d %s %0*d %02d:%02d:%02d ',
@@ -590,14 +475,16 @@ class Time
]
#
- # Returns a string which represents the time as RFC 1123 date of HTTP-date
+ # Returns a string which represents the time as rfc1123-date of HTTP-date
# defined by RFC 2616:
#
# day-of-week, DD month-name CCYY hh:mm:ss GMT
#
# Note that the result is always UTC (GMT).
#
- # You must require 'time' to use this method.
+ # time library should be required to use this method as follows.
+ #
+ # require 'time'
#
def httpdate
t = dup.utc
@@ -608,7 +495,7 @@ class Time
end
#
- # Returns a string which represents the time as a dateTime defined by XML
+ # Returns a string which represents the time as dateTime defined by XML
# Schema:
#
# CCYY-MM-DDThh:mm:ssTZD
@@ -618,18 +505,28 @@ class Time
#
# If self is a UTC time, Z is used as TZD. [+-]hh:mm is used otherwise.
#
- # +fractional_digits+ specifies a number of digits to use for fractional
- # seconds. Its default value is 0.
+ # +fractional_seconds+ specifies a number of digits of fractional seconds.
+ # Its default value is 0.
+ #
+ # time library should be required to use this method as follows.
#
- # You must require 'time' to use this method.
+ # require 'time'
#
def xmlschema(fraction_digits=0)
- fraction_digits = fraction_digits.to_i
- s = strftime("%FT%T")
- if fraction_digits > 0
- s << strftime(".%#{fraction_digits}N")
+ sprintf('%0*d-%02d-%02dT%02d:%02d:%02d',
+ year < 0 ? 5 : 4, year, mon, day, hour, min, sec) +
+ if fraction_digits == 0
+ ''
+ else
+ '.' + sprintf('%0*d', fraction_digits, (subsec * 10**fraction_digits).floor)
+ end +
+ if utc?
+ 'Z'
+ else
+ off = utc_offset
+ sign = off < 0 ? '-' : '+'
+ sprintf('%s%02d:%02d', sign, *(off.abs / 60).divmod(60))
end
- s << (utc? ? 'Z' : strftime("%:z"))
end
alias iso8601 xmlschema
end
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 284305bcca..aa0e7576d5 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -1,22 +1,23 @@
-# Timeout long-running blocks
+# = timeout.rb
#
-# == Synopsis
+# execution timeout
+#
+# = Synopsis
#
# require 'timeout'
# status = Timeout::timeout(5) {
-# # Something that should be interrupted if it takes more than 5 seconds...
+# # Something that should be interrupted if it takes too much time...
# }
#
-# == Description
+# = Description
#
-# Timeout provides a way to auto-terminate a potentially long-running
-# operation if it hasn't finished in 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 by a fixed amount of time.
#
-# Previous versions didn't use a module for namespacing, however
-# #timeout is provided for backwards compatibility. You
-# should prefer Timeout#timeout instead.
+# Previous versions of timeout didn't provide use a module for namespace. This version
+# provides both Timeout.timeout, and a backwards-compatible #timeout.
#
-# == Copyright
+# = Copyright
#
# Copyright:: (C) 2000 Network Applied Communication Laboratory, Inc.
# Copyright:: (C) 2000 Information-technology Promotion Agency, Japan
@@ -28,26 +29,17 @@ module Timeout
class ExitException < ::Exception # :nodoc:
end
- # :stopdoc:
THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
- # :startdoc:
- # Perform an operation in a block, raising an error if it takes longer than
- # +sec+ seconds to complete.
- #
- # +sec+:: Number of seconds to wait for the block to terminate. Any number
- # may be used, including Floats to specify fractional seconds. A
- # value of 0 or +nil+ will execute the block without any timeout.
- # +klass+:: Exception Class to raise if the block fails to terminate
- # in +sec+ seconds. Omitting will use the default, Timeout::Error
- #
- # Returns the result of the block *if* the block completed before
- # +sec+ seconds, otherwise throws an exception, based on the value of +klass+.
+ # 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).
#
- # Note that this is both a method of module Timeout, so you can <tt>include
- # Timeout</tt> into your classes so they have a #timeout method, as well as
- # a module method, so you can call it directly as Timeout.timeout().
+ # 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?
exception = klass || Class.new(ExitException)
@@ -91,8 +83,8 @@ end
#
# Timeout::timeout(n, e, &block).
#
-# This method is deprecated and provided only for backwards compatibility.
-# You should use Timeout#timeout instead.
+# Defined for backwards compatibility with earlier versions of timeout.rb, see
+# Timeout#timeout.
def timeout(n, e = nil, &block)
Timeout::timeout(n, e, &block)
end
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 18d4fb683d..f043ad5006 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -18,28 +18,23 @@ class Dir
# Returns the operating system's temporary file path.
def Dir::tmpdir
+ tmp = '.'
if $SAFE > 0
tmp = @@systmpdir
else
- tmp = nil
- for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp', '.']
- next if !dir
- dir = File.expand_path(dir)
- if stat = File.stat(dir) and stat.directory? and stat.writable? and
- (!stat.world_writable? or stat.sticky?)
- tmp = dir
- break
- end rescue nil
+ for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp']
+ if dir and stat = File.stat(dir) and stat.directory? and stat.writable?
+ tmp = dir
+ break
+ end rescue nil
end
- raise ArgumentError, "could not find a temporary directory" if !tmp
- tmp
+ File.expand_path(tmp)
end
end
# Dir.mktmpdir creates a temporary directory.
#
# The directory is created with 0700 permission.
- # Application should not change the permission to make the temporary directory accesible from other users.
#
# The prefix and suffix of the name of the directory is specified by
# the optional first argument, <i>prefix_suffix</i>.
@@ -60,7 +55,7 @@ class Dir
# If a block is given,
# it is yielded with the path of the directory.
# The directory and its contents are removed
- # using FileUtils.remove_entry before Dir.mktmpdir returns.
+ # using FileUtils.remove_entry_secure before Dir.mktmpdir returns.
# The value of the block is returned.
#
# Dir.mktmpdir {|dir|
@@ -78,7 +73,7 @@ class Dir
# open("#{dir}/foo", "w") { ... }
# ensure
# # remove the directory.
- # FileUtils.remove_entry dir
+ # FileUtils.remove_entry_secure dir
# end
#
def Dir.mktmpdir(prefix_suffix=nil, *rest)
@@ -87,11 +82,7 @@ class Dir
begin
yield path
ensure
- stat = File.stat(File.dirname(path))
- if stat.world_writable? and !stat.sticky?
- raise ArgumentError, "parent directory is world writable but not sticky"
- end
- FileUtils.remove_entry path
+ FileUtils.remove_entry_secure path
end
else
path
@@ -138,7 +129,7 @@ class Dir
end
n = nil
begin
- path = File.join(tmpdir, make_tmpname(basename, n))
+ path = File.expand_path(make_tmpname(basename, n), tmpdir)
yield(path, n, *opts)
rescue Errno::EEXIST
n ||= 0
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 4266abf1b6..318b254ac8 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -1,89 +1,37 @@
-#--
-# $Release Version: 0.3$
-# $Revision: 1.12 $
-require "thread"
-
-##
-# Outputs a source level execution trace of a Ruby program.
-#
-# It does this by registering an event handler with Kernel#set_trace_func for
-# processing incoming events. It also provides methods for filtering unwanted
-# trace output (see Tracer.add_filter, Tracer.on, and Tracer.off).
-#
-# == Example
-#
-# Consider the following ruby script
+# tracer.rb -
+# $Release Version: 0.3$
+# $Revision: 1.12 $
+# by Keiju ISHITSUKA(keiju@ishitsuka.com)
#
-# class A
-# def square(a)
-# return a*a
-# end
-# end
+# --
#
-# a = A.new
-# a.square(5)
+#
#
-# Running the above script using <code>ruby -r tracer example.rb</code> will
-# output the following trace to STDOUT (Note you can also explicitly
-# <code>require 'tracer'</code>)
-#
-# #0:<internal:lib/rubygems/custom_require>:38:Kernel:<: -
-# #0:example.rb:3::-: class A
-# #0:example.rb:3::C: class A
-# #0:example.rb:4::-: def square(a)
-# #0:example.rb:7::E: end
-# #0:example.rb:9::-: a = A.new
-# #0:example.rb:10::-: a.square(5)
-# #0:example.rb:4:A:>: def square(a)
-# #0:example.rb:5:A:-: return a*a
-# #0:example.rb:6:A:<: end
-# | | | | |
-# | | | | ---------------------+ event
-# | | | ------------------------+ class
-# | | --------------------------+ line
-# | ------------------------------------+ filename
-# ---------------------------------------+ thread
-#
-# Symbol table used for displaying incoming events:
-#
-# +}+:: call a C-language routine
-# +{+:: return from a C-language routine
-# +>+:: call a Ruby method
-# +C+:: start a class or module definition
-# +E+:: finish a class or module definition
-# +-+:: execute code on a new line
-# +^+:: raise an exception
-# +<+:: return from a Ruby method
-#
-# == Copyright
+require "thread"
+
#
-# by Keiju ISHITSUKA(keiju@ishitsuka.com)
+# tracer main class
#
class Tracer
class << self
- # display additional debug information (defaults to false)
attr_accessor :verbose
alias verbose? verbose
- # output stream used to output trace (defaults to STDOUT)
attr_accessor :stdout
-
- # mutex lock used by tracer for displaying trace output
attr_reader :stdout_mutex
- # display process id in trace output (defaults to false)
+ # display process id?
attr_accessor :display_process_id
alias display_process_id? display_process_id
- # display thread id in trace output (defaults to true)
+ # display thread id?
attr_accessor :display_thread_id
alias display_thread_id? display_thread_id
- # display C-routine calls in trace output (defaults to false)
+ # display builtin method call?
attr_accessor :display_c_call
alias display_c_call? display_c_call
end
-
Tracer::stdout = STDOUT
Tracer::verbose = false
Tracer::display_process_id = false
@@ -92,7 +40,6 @@ class Tracer
@stdout_mutex = Mutex.new
- # Symbol table used for displaying trace information
EVENT_SYMBOL = {
"line" => "-",
"call" => ">",
@@ -105,7 +52,7 @@ class Tracer
"unknown" => "?"
}
- def initialize # :nodoc:
+ def initialize
@threads = Hash.new
if defined? Thread.main
@threads[Thread.main.object_id] = 0
@@ -118,17 +65,17 @@ class Tracer
@filters = []
end
- def stdout # :nodoc:
+ def stdout
Tracer.stdout
end
- def on # :nodoc:
+ def on
if block_given?
on
begin
- yield
+ yield
ensure
- off
+ off
end
else
set_trace_func method(:trace_func).to_proc
@@ -136,34 +83,34 @@ class Tracer
end
end
- def off # :nodoc:
+ def off
set_trace_func nil
stdout.print "Trace off\n" if Tracer.verbose?
end
- def add_filter(p = proc) # :nodoc:
+ def add_filter(p = proc)
@filters.push p
end
- def set_get_line_procs(file, p = proc) # :nodoc:
+ def set_get_line_procs(file, p = proc)
@get_line_procs[file] = p
end
- def get_line(file, line) # :nodoc:
+ def get_line(file, line)
if p = @get_line_procs[file]
return p.call(line)
end
unless list = SCRIPT_LINES__[file]
begin
- f = File::open(file)
- begin
- SCRIPT_LINES__[file] = list = f.readlines
- ensure
- f.close
- end
+ f = File::open(file)
+ begin
+ SCRIPT_LINES__[file] = list = f.readlines
+ ensure
+ f.close
+ end
rescue
- SCRIPT_LINES__[file] = list = []
+ SCRIPT_LINES__[file] = list = []
end
end
@@ -174,7 +121,7 @@ class Tracer
end
end
- def get_thread_no # :nodoc:
+ def get_thread_no
if no = @threads[Thread.current.object_id]
no
else
@@ -182,54 +129,37 @@ class Tracer
end
end
- def trace_func(event, file, line, id, binding, klass, *) # :nodoc:
+ 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
+ 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
- stdout.printf("%s:%d:%s:%s: %s",
- file,
- line,
- klass || '',
- EVENT_SYMBOL[event],
- source)
+ 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
end
- # Reference to singleton instance of Tracer
Single = new
-
- ##
- # Start tracing
- #
- # === Example
- #
- # Tracer.on
- # # code to trace here
- # Tracer.off
- #
- # You can also pass a block:
- #
- # Tracer.on {
- # # trace everything in this block
- # }
-
def Tracer.on
if block_given?
Single.on{yield}
@@ -238,42 +168,19 @@ class Tracer
end
end
- ##
- # Disable tracing
-
def Tracer.off
Single.off
end
- ##
- # Register an event handler <code>p</code> which is called everytime a line
- # in +file_name+ is executed.
- #
- # Example:
- #
- # Tracer.set_get_line_procs("example.rb", lambda { |line|
- # puts "line number executed is #{line}"
- # })
-
def Tracer.set_get_line_procs(file_name, p = proc)
Single.set_get_line_procs(file_name, p)
end
- ##
- # Used to filter unwanted trace output
- #
- # Example which only outputs lines of code executed within the Kernel class:
- #
- # Tracer.add_filter do |event, file, line, id, binding, klass, *rest|
- # "Kernel" == klass.to_s
- # end
-
def Tracer.add_filter(p = proc)
Single.add_filter(p)
end
end
-# :stopdoc:
SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
if $0 == __FILE__
@@ -283,12 +190,6 @@ if $0 == __FILE__
ARGV.shift
Tracer.on
require $0
-else
- # call Tracer.on only if required by -r command-line option
- count = caller.count {|bt| %r%/rubygems/core_ext/kernel_require\.rb:% !~ bt}
- if (defined?(Gem) and count == 0) or
- (!defined?(Gem) and count <= 1)
- Tracer.on
- end
+elsif caller.count {|bt| /\A<internal:[^<>]+>:/ !~ bt} <= 1
+ Tracer.on
end
-# :startdoc:
diff --git a/lib/un.rb b/lib/un.rb
index e06e0e759b..3c1f3eca86 100644
--- a/lib/un.rb
+++ b/lib/un.rb
@@ -69,9 +69,9 @@ end
#
# ruby -run -e cp -- [OPTION] SOURCE DEST
#
-# -p preserve file attributes if possible
-# -r copy recursively
-# -v verbose
+# -p preserve file attributes if possible
+# -r copy recursively
+# -v verbose
#
def cp
@@ -90,9 +90,9 @@ end
#
# ruby -run -e ln -- [OPTION] TARGET LINK_NAME
#
-# -s make symbolic links instead of hard links
-# -f remove existing destination files
-# -v verbose
+# -s make symbolic links instead of hard links
+# -f remove existing destination files
+# -v verbose
#
def ln
@@ -111,7 +111,7 @@ end
#
# ruby -run -e mv -- [OPTION] SOURCE DEST
#
-# -v verbose
+# -v verbose
#
def mv
@@ -127,9 +127,9 @@ end
#
# ruby -run -e rm -- [OPTION] FILE
#
-# -f ignore nonexistent files
-# -r remove the contents of directories recursively
-# -v verbose
+# -f ignore nonexistent files
+# -r remove the contents of directories recursively
+# -v verbose
#
def rm
@@ -146,8 +146,8 @@ end
#
# ruby -run -e mkdir -- [OPTION] DIR
#
-# -p no error if existing, make parent directories as needed
-# -v verbose
+# -p no error if existing, make parent directories as needed
+# -v verbose
#
def mkdir
@@ -163,8 +163,8 @@ end
#
# ruby -run -e rmdir -- [OPTION] DIR
#
-# -p remove DIRECTORY and its ancestors.
-# -v verbose
+# -p remove DIRECTORY and its ancestors.
+# -v verbose
#
def rmdir
@@ -179,10 +179,10 @@ end
#
# ruby -run -e install -- [OPTION] SOURCE DEST
#
-# -p apply access/modification times of SOURCE files to
-# corresponding destination files
-# -m set permission mode (as in chmod), instead of 0755
-# -v verbose
+# -p apply access/modification times of SOURCE files to
+# corresponding destination files
+# -m set permission mode (as in chmod), instead of 0755
+# -v verbose
#
def install
@@ -200,7 +200,7 @@ end
#
# ruby -run -e chmod -- [OPTION] OCTAL-MODE FILE
#
-# -v verbose
+# -v verbose
#
def chmod
@@ -215,7 +215,7 @@ end
#
# ruby -run -e touch -- [OPTION] FILE
#
-# -v verbose
+# -v verbose
#
def touch
@@ -229,9 +229,9 @@ end
#
# ruby -run -e wait_writable -- [OPTION] FILE
#
-# -n RETRY count to retry
-# -w SEC each wait time in seconds
-# -v verbose
+# -n RETRY count to retry
+# -w SEC each wait time in seconds
+# -v verbose
#
def wait_writable
@@ -260,15 +260,15 @@ end
#
# 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
+# -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
@@ -311,17 +311,16 @@ def httpd
[:Port, :MaxClients].each do |name|
opt = options[name] and (options[name] = Integer(opt)) rescue nil
end
- unless argv.size == 1
- raise ArgumentError, "DocumentRoot is mandatory"
+ unless argv.empty?
+ options[:DocumentRoot] = argv.shift
end
- options[:DocumentRoot] = argv.shift
s = WEBrick::HTTPServer.new(options)
shut = proc {s.shutdown}
- siglist = %w"TERM QUIT"
- siglist.concat(%w"HUP INT") if STDIN.tty?
- siglist &= Signal.list.keys
- siglist.each do |sig|
- Signal.trap(sig, shut)
+ Signal.trap("TERM", shut)
+ Signal.trap("QUIT", shut) if Signal.list.has_key?("QUIT")
+ if STDIN.tty?
+ Signal.trap("HUP", shut) if Signal.list.has_key?("HUP")
+ Signal.trap("INT", shut)
end
s.start
end
@@ -338,11 +337,11 @@ def help
all = argv.empty?
open(__FILE__) do |me|
while me.gets("##\n")
- if help = me.gets("\n\n")
- if all or argv.delete help[/-e \w+/].sub(/-e /, "")
- print help.gsub(/^# ?/, "")
- end
- end
+ if help = me.gets("\n\n")
+ if all or argv.delete help[/-e \w+/].sub(/-e /, "")
+ print help.gsub(/^# ?/, "")
+ end
+ end
end
end
end
diff --git a/lib/uri.rb b/lib/uri.rb
index 2e136eb682..41bb09b467 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -1,97 +1,15 @@
-# URI is a module providing classes to handle Uniform Resource Identifiers
-# (RFC2396[http://tools.ietf.org/html/rfc2396])
#
-# == Features
-#
-# * Uniform handling of handling URIs
-# * Flexibility to introduce custom URI schemes
-# * Flexibility to have an alternate URI::Parser (or just different patterns
-# and regexp's)
-#
-# == Basic example
-#
-# require 'uri'
-#
-# uri = URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
-# #=> #<URI::HTTP:0x00000000b14880
-# URL:http://foo.com/posts?id=30&limit=5#time=1305298413>
-# uri.scheme
-# #=> "http"
-# uri.host
-# #=> "foo.com"
-# uri.path
-# #=> "/posts"
-# uri.query
-# #=> "id=30&limit=5"
-# uri.fragment
-# #=> "time=1305298413"
-#
-# uri.to_s
-# #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
-#
-# == Adding custom URIs
-#
-# module URI
-# class RSYNC < Generic
-# DEFAULT_PORT = 873
-# end
-# @@schemes['RSYNC'] = RSYNC
-# end
-# #=> URI::RSYNC
-#
-# URI.scheme_list
-# #=> {"FTP"=>URI::FTP, "HTTP"=>URI::HTTP, "HTTPS"=>URI::HTTPS,
-# "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS, "MAILTO"=>URI::MailTo,
-# "RSYNC"=>URI::RSYNC}
-#
-# uri = URI("rsync://rsync.foo.com")
-# #=> #<URI::RSYNC:0x00000000f648c8 URL:rsync://rsync.foo.com>
-#
-# == RFC References
-#
-# A good place to view an RFC spec is http://www.ietf.org/rfc.html
-#
-# Here is a list of all related RFC's.
-# - RFC822[http://tools.ietf.org/html/rfc822]
-# - RFC1738[http://tools.ietf.org/html/rfc1738]
-# - RFC2255[http://tools.ietf.org/html/rfc2255]
-# - RFC2368[http://tools.ietf.org/html/rfc2368]
-# - RFC2373[http://tools.ietf.org/html/rfc2373]
-# - RFC2396[http://tools.ietf.org/html/rfc2396]
-# - RFC2732[http://tools.ietf.org/html/rfc2732]
-# - RFC3986[http://tools.ietf.org/html/rfc3986]
-#
-# == Class tree
-#
-# - URI::Generic (in uri/generic.rb)
-# - URI::FTP - (in uri/ftp.rb)
-# - URI::HTTP - (in uri/http.rb)
-# - URI::HTTPS - (in uri/https.rb)
-# - URI::LDAP - (in uri/ldap.rb)
-# - URI::LDAPS - (in uri/ldaps.rb)
-# - URI::MailTo - (in uri/mailto.rb)
-# - URI::Parser - (in uri/common.rb)
-# - URI::REGEXP - (in uri/common.rb)
-# - URI::REGEXP::PATTERN - (in uri/common.rb)
-# - URI::Util - (in uri/common.rb)
-# - URI::Escape - (in uri/common.rb)
-# - URI::Error - (in uri/common.rb)
-# - URI::InvalidURIError - (in uri/common.rb)
-# - URI::InvalidComponentError - (in uri/common.rb)
-# - URI::BadURIError - (in uri/common.rb)
-#
-# == Copyright Info
+# URI support for Ruby
#
# Author:: Akira Yamada <akira@ruby-lang.org>
-# Documentation::
-# Akira Yamada <akira@ruby-lang.org>
-# Dmitry V. Sabanin <sdmitry@lrn.ru>
-# Vincent Batts <vbatts@hashbangbash.com>
+# Documentation:: Akira Yamada <akira@ruby-lang.org>, Dmitry V. Sabanin <sdmitry@lrn.ru>
# 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
+#
module URI
# :stopdoc:
diff --git a/lib/uri/.document b/lib/uri/.document
new file mode 100644
index 0000000000..214dd2e48f
--- /dev/null
+++ b/lib/uri/.document
@@ -0,0 +1,7 @@
+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 e71b36793b..456f039599 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -1,4 +1,3 @@
-#--
# = uri/common.rb
#
# Author:: Akira Yamada <akira@ruby-lang.org>
@@ -6,13 +5,8 @@
# License::
# You can redistribute it and/or modify it under the same term as Ruby.
#
-# See URI for general documentation
-#
module URI
- #
- # Includes URI::REGEXP::PATTERN
- #
module REGEXP
#
# Patterns used to parse URI's
@@ -37,7 +31,7 @@ module URI
# mark = "-" | "_" | "." | "!" | "~" | "*" | "'" |
# "(" | ")"
# unreserved = alphanum | mark
- UNRESERVED = "\\-_.!~*'()#{ALNUM}"
+ UNRESERVED = "-_.!~*'()#{ALNUM}"
# reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
# "$" | ","
# reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
@@ -57,10 +51,6 @@ module URI
# :startdoc:
end # REGEXP
- # class that Parses String's into URI's
- #
- # It contains a Hash set of patterns and Regexp's that match and validate.
- #
class Parser
include REGEXP
@@ -78,15 +68,15 @@ module URI
#
# You can use the following keys:
#
- # * :ESCAPED (URI::PATTERN::ESCAPED in default)
- # * :UNRESERVED (URI::PATTERN::UNRESERVED in default)
- # * :DOMLABEL (URI::PATTERN::DOMLABEL in default)
- # * :TOPLABEL (URI::PATTERN::TOPLABEL in default)
- # * :HOSTNAME (URI::PATTERN::HOSTNAME in default)
+ # * <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(:ESCAPED => "(?:%[a-fA-F0-9]{2}|%u[a-fA-F0-9]{4})")
+ # 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
#
@@ -105,197 +95,122 @@ module URI
@regexp.each_value {|v| v.freeze}
@regexp.freeze
end
+ attr_reader :pattern, :regexp
- # The Hash of patterns.
- #
- # see also URI::Parser.initialize_pattern
- attr_reader :pattern
-
- # The Hash of Regexp
- #
- # see also URI::Parser.initialize_regexp
- attr_reader :regexp
-
- # Returns a split URI against regexp[:ABS_URI]
def split(uri)
case uri
when ''
- # null uri
+ # null uri
when @regexp[:ABS_URI]
- scheme, opaque, userinfo, host, port,
- registry, path, query, fragment = $~[1..-1]
+ scheme, opaque, userinfo, host, port,
+ registry, path, query, fragment = $~[1..-1]
- # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
+ # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
- # absoluteURI = scheme ":" ( hier_part | opaque_part )
- # hier_part = ( net_path | abs_path ) [ "?" query ]
- # opaque_part = uric_no_slash *uric
+ # 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 ]
+ # abs_path = "/" path_segments
+ # net_path = "//" authority [ abs_path ]
- # authority = server | reg_name
- # server = [ [ userinfo "@" ] hostport ]
+ # 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
+ 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
+ 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 ]
+ # URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
- # relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ]
+ # relativeURI = ( net_path | abs_path | rel_path ) [ "?" query ]
- # net_path = "//" authority [ abs_path ]
- # abs_path = "/" path_segments
- # rel_path = rel_segment [ abs_path ]
+ # net_path = "//" authority [ abs_path ]
+ # abs_path = "/" path_segments
+ # rel_path = rel_segment [ abs_path ]
- # authority = server | reg_name
- # server = [ [ userinfo "@" ] hostport ]
+ # authority = server | reg_name
+ # server = [ [ userinfo "@" ] hostport ]
else
- raise InvalidURIError, "bad URI(is not URI?): #{uri}"
+ 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
+ scheme,
+ userinfo, host, port, # X
+ registry, # X
+ path, # Y
+ opaque, # Y
+ query,
+ fragment
]
return ret
end
- #
- # == Args
- #
- # +uri+::
- # String
- #
- # == Description
- #
- # parses +uri+ and constructs either matching URI scheme object
- # (FTP, HTTP, HTTPS, LDAP, LDAPS, or MailTo) or URI::Generic
- #
- # == Usage
- #
- # p = URI::Parser.new
- # p.parse("ldap://ldap.example.com/dc=example?user=john")
- # #=> #<URI::LDAP:0x00000000b9e7e8 URL:ldap://ldap.example.com/dc=example?user=john>
- #
def parse(uri)
scheme, userinfo, host, port,
- registry, path, opaque, query, fragment = self.split(uri)
+ 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,
+ 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)
+ Generic.new(scheme, userinfo, host, port,
+ registry, path, opaque, query,
+ fragment, self)
end
end
-
- #
- # == Args
- #
- # +uris+::
- # an Array of Strings
- #
- # == Description
- #
- # Attempts to parse and merge a set of URIs
- #
- def join(*uris)
- uris[0] = convert_to_uri(uris[0])
- uris.inject :merge
+ def join(*str)
+ u = self.parse(str[0])
+ str[1 .. -1].each do |x|
+ u = u.merge(x)
+ end
+ u
end
- #
- # :call-seq:
- # extract( str )
- # extract( str, schemes )
- # extract( str, schemes ) {|item| block }
- #
- # == Args
- #
- # +str+::
- # String to search
- # +schemes+::
- # Patterns to apply to +str+
- #
- # == Description
- #
- # Attempts to parse and merge a set of URIs
- # If no +block+ given , then returns the result,
- # else it calls +block+ for each element in result.
- #
- # see also URI::Parser.make_regexp
- #
- def extract(str, schemes = nil)
+ def extract(str, schemes = nil, &block)
if block_given?
- str.scan(make_regexp(schemes)) { yield $& }
- nil
+ str.scan(make_regexp(schemes)) { yield $& }
+ nil
else
- result = []
- str.scan(make_regexp(schemes)) { result.push $& }
- result
+ result = []
+ str.scan(make_regexp(schemes)) { result.push $& }
+ result
end
end
- # returns Regexp that is default self.regexp[:ABS_URI_REF],
- # unless +schemes+ is provided. Then it is a Regexp.union with self.pattern[:X_ABS_URI]
def make_regexp(schemes = nil)
unless schemes
- @regexp[:ABS_URI_REF]
+ @regexp[:ABS_URI_REF]
else
- /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x
+ /(?=#{Regexp.union(*schemes)}:)#{@pattern[:X_ABS_URI]}/x
end
end
- #
- # :call-seq:
- # escape( str )
- # escape( str, unsafe )
- #
- # == Args
- #
- # +str+::
- # String to make safe
- # +unsafe+::
- # Regexp to apply. Defaults to self.regexp[:UNSAFE]
- #
- # == Description
- #
- # constructs a safe String from +str+, removing unsafe characters,
- # replacing them with codes.
- #
def escape(str, unsafe = @regexp[:UNSAFE])
unless unsafe.kind_of?(Regexp)
# perhaps unsafe is String object
@@ -311,22 +226,6 @@ module URI
end.force_encoding(Encoding::US_ASCII)
end
- #
- # :call-seq:
- # unescape( str )
- # unescape( str, unsafe )
- #
- # == Args
- #
- # +str+::
- # String to remove escapes from
- # +unsafe+::
- # Regexp to apply. Defaults to self.regexp[:ESCAPED]
- #
- # == Description
- #
- # Removes escapes from +str+
- #
def unescape(str, escaped = @regexp[:ESCAPED])
str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding)
end
@@ -338,14 +237,13 @@ module URI
private
- # Constructs the default Hash of patterns
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] = opts.delete(:DOMLABEL) || PATTERN::DOMLABEL
- ret[:TOPLABEL] = opts.delete(:TOPLABEL) || PATTERN::TOPLABEL
+ 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)
@@ -363,9 +261,8 @@ module URI
ret[:FRAGMENT] = fragment = "#{uric}*"
# hostname = *( domainlabel "." ) toplabel [ "." ]
- # reg-name = *( unreserved / pct-encoded / sub-delims ) # RFC3986
unless hostname
- ret[:HOSTNAME] = hostname = "(?:[a-zA-Z0-9\\-.]|%\\h\\h)+"
+ ret[:HOSTNAME] = hostname = "(?:#{domlabel}\\.)*#{toplabel}\\.?"
end
# RFC 2373, APPENDIX B:
@@ -432,7 +329,7 @@ module URI
ret[:REL_SEGMENT] = rel_segment = "(?:[#{unreserved};@&=+$,]|#{escaped})+"
# scheme = alpha *( alpha | digit | "+" | "-" | "." )
- ret[:SCHEME] = scheme = "[#{PATTERN::ALPHA}][\\-+.#{PATTERN::ALPHA}\\d]*"
+ ret[:SCHEME] = scheme = "[#{PATTERN::ALPHA}][-+.#{PATTERN::ALPHA}\\d]*"
# abs_path = "/" path_segments
ret[:ABS_PATH] = abs_path = "/#{path_segments}"
@@ -452,7 +349,7 @@ module URI
ret[:REL_URI] = rel_uri = "(?:#{net_path}|#{abs_path}|#{rel_path})(?:\\?#{query})?"
# URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]
- ret[:URI_REF] = "(?:#{abs_uri}|#{rel_uri})?(?:##{fragment})?"
+ ret[:URI_REF] = uri_ref = "(?:#{abs_uri}|#{rel_uri})?(?:##{fragment})?"
ret[:X_ABS_URI] = "
(#{scheme}): (?# 1: scheme)
@@ -496,7 +393,6 @@ module URI
ret
end
- # Constructs the default Hash of Regexp's
def initialize_regexp(pattern)
ret = {}
@@ -514,34 +410,21 @@ module URI
ret[:UNSAFE] = Regexp.new("[^#{pattern[:UNRESERVED]}#{pattern[:RESERVED]}]")
# for Generic#initialize
- ret[:SCHEME] = Regexp.new("\\A#{pattern[:SCHEME]}\\z")
- ret[:USERINFO] = Regexp.new("\\A#{pattern[:USERINFO]}\\z")
- ret[:HOST] = Regexp.new("\\A#{pattern[:HOST]}\\z")
- ret[:PORT] = Regexp.new("\\A#{pattern[:PORT]}\\z")
- ret[:OPAQUE] = Regexp.new("\\A#{pattern[:OPAQUE_PART]}\\z")
- ret[:REGISTRY] = Regexp.new("\\A#{pattern[:REG_NAME]}\\z")
- ret[:ABS_PATH] = Regexp.new("\\A#{pattern[:ABS_PATH]}\\z")
- ret[:REL_PATH] = Regexp.new("\\A#{pattern[:REL_PATH]}\\z")
- ret[:QUERY] = Regexp.new("\\A#{pattern[:QUERY]}\\z")
- ret[:FRAGMENT] = Regexp.new("\\A#{pattern[:FRAGMENT]}\\z")
+ 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
-
- def convert_to_uri(uri)
- if uri.is_a?(URI::Generic)
- uri
- elsif uri = String.try_convert(uri)
- parse(uri)
- else
- raise ArgumentError,
- "bad argument (expected URI object or URI string)"
- end
- end
-
end # class Parser
- # URI::Parser.new
DEFAULT_PARSER = Parser.new
DEFAULT_PARSER.pattern.each_pair do |sym, str|
unless REGEXP::PATTERN.const_defined?(sym)
@@ -584,7 +467,6 @@ module URI
module_function :make_components_hash
end
- # module for escaping unsafe characters with codes.
module Escape
#
# == Synopsis
@@ -649,13 +531,12 @@ module URI
DEFAULT_PARSER.unescape(*arg)
end
alias decode unescape
- end # module Escape
+ end
extend Escape
include REGEXP
@@schemes = {}
- # Returns a Hash of the defined schemes
def self.scheme_list
@@schemes
end
@@ -765,22 +646,9 @@ module URI
#
# require 'uri'
#
- # p URI.join("http://example.com/","main.rbx")
+ # p URI.join("http://localhost/","main.rbx")
# # => #<URI::HTTP:0x2022ac02 URL:http://localhost/main.rbx>
#
- # p URI.join('http://example.com', 'foo')
- # # => #<URI::HTTP:0x01ab80a0 URL:http://example.com/foo>
- #
- # p URI.join('http://example.com', '/foo', '/bar')
- # # => #<URI::HTTP:0x01aaf0b0 URL:http://example.com/bar>
- #
- # p URI.join('http://example.com', '/foo', 'bar')
- # # => #<URI::HTTP:0x801a92af0 URL:http://example.com/bar>
- #
- # p URI.join('http://example.com', '/foo/', 'bar')
- # # => #<URI::HTTP:0x80135a3a0 URL:http://example.com/foo/bar>
- #
- #
def self.join(*str)
DEFAULT_PARSER.join(*str)
end
@@ -870,11 +738,10 @@ module URI
# Encode given +str+ to URL-encoded form data.
#
- # This method doesn't convert *, -, ., 0-9, A-Z, _, a-z, but does convert SP
- # (ASCII space) to + and converts others to %XX.
+ # This doesn't convert *, -, ., 0-9, A-Z, _, a-z,
+ # does convert SP to +, and convert others to %XX.
#
- # This is an implementation of
- # http://www.w3.org/TR/html5/association-of-controls-and-forms.html#url-encoded-form-data
+ # This refers http://www.w3.org/TR/html5/forms.html#url-encoded-form-data
#
# See URI.decode_www_form_component, URI.encode_www_form
def self.encode_www_form_component(str)
@@ -891,14 +758,12 @@ module URI
# Decode given +str+ of URL-encoded form data.
#
- # This decodes + to SP.
+ # This decods + to SP.
#
# See URI.encode_www_form_component, URI.decode_www_form
def self.decode_www_form_component(str, enc=Encoding::UTF_8)
raise ArgumentError, "invalid %-encoding (#{str})" unless /\A[^%]*(?:%\h\h[^%]*)*\z/ =~ str
- str.dup.force_encoding("ASCII-8BIT") \
- .gsub(/\+|%\h\h/, TBLDECWWWCOMP_) \
- .force_encoding(enc)
+ str.gsub(/\+|%\h\h/, TBLDECWWWCOMP_).force_encoding(enc)
end
# Generate URL-encoded form data from given +enum+.
@@ -908,45 +773,29 @@ module URI
#
# This internally uses URI.encode_www_form_component(str).
#
- # This method doesn't convert the encoding of given items, so convert them
- # before call this method if you want to send data as other than original
- # encoding or mixed encoding data. (Strings which are encoded in an HTML5
- # ASCII incompatible encoding are converted to UTF-8.)
- #
- # This method doesn't handle files. When you send a file, use
- # multipart/form-data.
+ # This doesn't convert encodings of give items, so convert them before call
+ # this method if you want to send data as other than original encoding or
+ # mixed encoding data. (strings which is encoded in HTML5 ASCII incompatible
+ # encoding is converted to UTF-8)
#
- # This is an implementation of
- # http://www.w3.org/TR/html5/forms.html#url-encoded-form-data
+ # This doesn't treat files. When you send a file, use multipart/form-data.
#
- # URI.encode_www_form([["q", "ruby"], ["lang", "en"]])
- # #=> "q=ruby&lang=en"
- # URI.encode_www_form("q" => "ruby", "lang" => "en")
- # #=> "q=ruby&lang=en"
- # URI.encode_www_form("q" => ["ruby", "perl"], "lang" => "en")
- # #=> "q=ruby&q=perl&lang=en"
- # URI.encode_www_form([["q", "ruby"], ["q", "perl"], ["lang", "en"]])
- # #=> "q=ruby&q=perl&lang=en"
+ # This refers http://www.w3.org/TR/html5/forms.html#url-encoded-form-data
#
# See URI.encode_www_form_component, URI.decode_www_form
def self.encode_www_form(enum)
- enum.map do |k,v|
- if v.nil?
- encode_www_form_component(k)
- elsif v.respond_to?(:to_ary)
- v.to_ary.map do |w|
- str = encode_www_form_component(k)
- unless w.nil?
- str << '='
- str << encode_www_form_component(w)
- end
- end.join('&')
+ str = nil
+ enum.each do |k,v|
+ if str
+ str << '&'
else
- str = encode_www_form_component(k)
- str << '='
- str << encode_www_form_component(v)
+ str = nil.to_s
end
- end.join('&')
+ str << encode_www_form_component(k)
+ str << '='
+ str << encode_www_form_component(v)
+ end
+ str
end
WFKV_ = '(?:[^%#=;&]*(?:%\h\h[^%#=;&]*)*)' # :nodoc:
@@ -982,22 +831,14 @@ module URI
end
ary
end
-end # module URI
+end
module Kernel
-
- #
- # Returns +uri+ converted to a URI object.
+ # alias for URI.parse.
#
- def URI(uri)
- if uri.is_a?(URI::Generic)
- uri
- elsif uri = String.try_convert(uri)
- URI.parse(uri)
- else
- raise ArgumentError,
- "bad argument (expected URI object or URI string)"
- end
+ # This method is introduced at 1.8.2.
+ def URI(uri_str) # :doc:
+ URI.parse(uri_str)
end
module_function :URI
end
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index 9153c88636..4e33dadd33 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -1,11 +1,10 @@
+#
# = uri/ftp.rb
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# License:: You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
#
-# See URI for general documentation
-#
require 'uri/generic'
@@ -20,18 +19,13 @@ module URI
# http://tools.ietf.org/html/draft-hoffman-ftp-uri-04
#
class FTP < Generic
- # A Default port of 21 for URI::FTP
DEFAULT_PORT = 21
- #
- # An Array of the available components for URI::FTP
- #
COMPONENT = [
:scheme,
:userinfo, :host, :port,
:path, :typecode
].freeze
-
#
# Typecode is "a", "i" or "d".
#
@@ -40,16 +34,10 @@ module URI
# * "d" indicates the contents of a directory should be displayed
#
TYPECODE = ['a', 'i', 'd'].freeze
-
- # Typecode prefix
- # ';type='
TYPECODE_PREFIX = ';type='.freeze
def self.new2(user, password, host, port, path,
- typecode = nil, arg_check = true) # :nodoc:
- # Do not use this method! Not tested. [Bug #7301]
- # This methods remains just for compatibility,
- # Keep it undocumented until the active maintainer is assigned.
+ typecode = nil, arg_check = true)
typecode = nil if typecode.size == 0
if typecode && !TYPECODE.include?(typecode)
raise ArgumentError,
@@ -130,7 +118,6 @@ module URI
# +opaque+, +query+ and +fragment+, in that order.
#
def initialize(*arg)
- raise InvalidURIError unless arg[5]
arg[5] = arg[5].sub(/^\//,'').sub(/^%2F/,'/')
super(*arg)
@typecode = nil
@@ -146,15 +133,8 @@ module URI
end
end
end
-
- # typecode accessor
- #
- # see URI::FTP::COMPONENT
attr_reader :typecode
- # validates typecode +v+,
- # returns a +true+ or +false+ boolean
- #
def check_typecode(v)
if TYPECODE.include?(v)
return true
@@ -165,39 +145,11 @@ module URI
end
private :check_typecode
- # private setter for the typecode +v+
- #
- # see also URI::FTP.typecode=
- #
def set_typecode(v)
@typecode = v
end
protected :set_typecode
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the typecode +v+.
- # (with validation)
- #
- # see also URI::FTP.check_typecode
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("ftp://john@ftp.example.com/my_file.img")
- # #=> #<URI::FTP:0x00000000923650 URL:ftp://john@ftp.example.com/my_file.img>
- # uri.typecode = "i"
- # # => "i"
- # uri
- # #=> #<URI::FTP:0x00000000923650 URL:ftp://john@ftp.example.com/my_file.img;type=i>
- #
def typecode=(typecode)
check_typecode(typecode)
set_typecode(typecode)
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 474a820d1b..c4252fb5bf 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1,11 +1,10 @@
+#
# = uri/generic.rb
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# License:: You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
#
-# See URI for general documentation
-#
require 'uri/common'
@@ -18,9 +17,6 @@ module URI
class Generic
include URI
- #
- # A Default port of nil for URI::Generic
- #
DEFAULT_PORT = nil
#
@@ -30,16 +26,10 @@ module URI
self::DEFAULT_PORT
end
- #
- # Returns default port
- #
def default_port
self.class.default_port
end
- #
- # An Array of the available components for URI::Generic
- #
COMPONENT = [
:scheme,
:userinfo, :host, :port, :registry,
@@ -55,14 +45,10 @@ module URI
self::COMPONENT
end
- #
- # Default to not use the registry for a URI::Generic
- #
USE_REGISTRY = false
#
- # Returns whether a registry of naming
- # authorities are being used.
+ # DOC: FIXME!
#
def self.use_registry
self::USE_REGISTRY
@@ -86,8 +72,8 @@ module URI
rescue InvalidComponentError
if args.kind_of?(Array)
return self.build(args.collect{|x|
- if x.is_a?(String)
- DEFAULT_PARSER.escape(x)
+ if x
+ parser.escape(x)
else
x
end
@@ -96,7 +82,7 @@ module URI
tmp = {}
args.each do |key, value|
tmp[key] = if value
- DEFAULT_PARSER.escape(value)
+ parser.escape(value)
else
value
end
@@ -121,7 +107,7 @@ module URI
def self.build(args)
if args.kind_of?(Array) &&
args.size == ::URI::Generic::COMPONENT.size
- tmp = args.dup
+ tmp = args
elsif args.kind_of?(Hash)
tmp = ::URI::Generic::COMPONENT.collect do |c|
if args.include?(c)
@@ -131,9 +117,8 @@ module URI
end
end
else
- component = self.class.component rescue ::URI::Generic::COMPONENT
raise ArgumentError,
- "expected Array of or Hash of components of #{self.class} (#{component.join(', ')})"
+ "expected Array of or Hash of components of #{self.class} (#{self.class.component.join(', ')})"
end
tmp << nil
@@ -152,11 +137,11 @@ module URI
# +port+::
# Server port
# +registry+::
- # Registry of naming authorities.
+ # DOC: FIXME!
# +path+::
# Path on server
# +opaque+::
- # Opaque part
+ # DOC: FIXME!
# +query+::
# Query data
# +fragment+::
@@ -175,7 +160,7 @@ module URI
path, opaque,
query,
fragment,
- parser = DEFAULT_PARSER,
+ parser = DEFAULT_PARSER,
arg_check = false)
@scheme = nil
@user = nil
@@ -192,7 +177,7 @@ module URI
if arg_check
self.scheme = scheme
self.userinfo = userinfo
- self.hostname = host
+ self.host = host
self.port = port
self.path = path
self.query = query
@@ -219,82 +204,15 @@ module URI
self.set_path('') if !@path && !@opaque # (see RFC2396 Section 5.2)
self.set_port(self.default_port) if self.default_port && !@port
end
-
- #
- # returns the scheme component of the URI.
- #
- # URI("http://foo/bar/baz").scheme #=> "http"
- #
attr_reader :scheme
-
- # returns the host component of the URI.
- #
- # URI("http://foo/bar/baz").host #=> "foo"
- #
- # It returns nil if no host component.
- #
- # URI("mailto:foo@example.org").host #=> nil
- #
- # The component doesn't contains the port number.
- #
- # URI("http://foo:8080/bar/baz").host #=> "foo"
- #
- # Since IPv6 addresses are wrapped by brackets in URIs,
- # this method returns IPv6 addresses wrapped by brackets.
- # This form is not appropriate to pass socket methods such as TCPSocket.open.
- # If unwrapped host names are required, use "hostname" method.
- #
- # URI("http://[::1]/bar/baz").host #=> "[::1]"
- # URI("http://[::1]/bar/baz").hostname #=> "::1"
- #
attr_reader :host
-
- # returns the port component of the URI.
- #
- # URI("http://foo/bar/baz").port #=> "80"
- #
- # URI("http://foo:8080/bar/baz").port #=> "8080"
- #
attr_reader :port
-
- # returns the registry component of the URI.
- #
- # (see RFC2396 Section 3.2)
- #
attr_reader :registry
-
- # returns the path component of the URI.
- #
- # URI("http://foo/bar/baz").path #=> "/bar/baz"
- #
attr_reader :path
-
- # returns the query component of the URI.
- #
- # URI("http://foo/bar/baz?search=FooBar").query #=> "search=FooBar"
- #
attr_reader :query
-
- # returns the opaque part of the URI.
- #
- # URI("mailto:foo@example.org").opaque #=> "foo@example.org"
- #
- # Portion of the path that does make use of the slash '/'.
- # The path typically refers to the absolute path and the opaque part.
- # (see RFC2396 Section 3 and 5.2)
- #
attr_reader :opaque
-
- # returns the fragment component of the URI.
- #
- # URI("http://foo/bar/baz?search=FooBar#ponies").fragment #=> "ponies"
- #
attr_reader :fragment
- # returns the parser to be used.
- #
- # Unless a URI::Parser is defined, then DEFAULT_PARSER is used.
- #
def parser
if !defined?(@parser) || !@parser
DEFAULT_PARSER
@@ -315,16 +233,10 @@ module URI
end
private :replace!
- #
- # Components of the URI in the order.
- #
def component
self.class.component
end
- #
- # check the scheme +v+ component against the URI::Parser Regexp for :SCHEME
- #
def check_scheme(v)
if v && parser.regexp[:SCHEME] !~ v
raise InvalidComponentError,
@@ -335,53 +247,17 @@ module URI
end
private :check_scheme
- # protected setter for the scheme component +v+
- #
- # see also URI::Generic.scheme=
- #
def set_scheme(v)
- @scheme = v ? v.downcase : v
+ @scheme = v
end
protected :set_scheme
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the scheme component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_scheme
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com")
- # uri.scheme = "https"
- # # => "https"
- # uri
- # #=> #<URI::HTTP:0x000000008e89e8 URL:https://my.example.com>
- #
def scheme=(v)
check_scheme(v)
set_scheme(v)
v
end
- #
- # check the +user+ and +password+.
- #
- # If +password+ is not provided, then +user+ is
- # split, using URI::Generic.split_userinfo, to
- # pull +user+ and +password.
- #
- # see also URI::Generic.check_user, URI::Generic.check_password
- #
def check_userinfo(user, password = nil)
if !password
user, password = split_userinfo(user)
@@ -393,13 +269,6 @@ module URI
end
private :check_userinfo
- #
- # check the user +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp for :USERINFO
- #
- # Can not have a registry or opaque component defined,
- # with a user component defined.
- #
def check_user(v)
if @registry || @opaque
raise InvalidURIError,
@@ -417,13 +286,6 @@ module URI
end
private :check_user
- #
- # check the password +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp for :USERINFO
- #
- # Can not have a registry or opaque component defined,
- # with a user component defined.
- #
def check_password(v, user = @user)
if @registry || @opaque
raise InvalidURIError,
@@ -457,69 +319,18 @@ module URI
# returns userinfo
end
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the +user+ component.
- # (with validation)
- #
- # see also URI::Generic.check_user
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://john:S3nsit1ve@my.example.com")
- # uri.user = "sam"
- # # => "sam"
- # uri
- # #=> #<URI::HTTP:0x00000000881d90 URL:http://sam:V3ry_S3nsit1ve@my.example.com>
- #
def user=(user)
check_user(user)
set_user(user)
# returns user
end
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the +password+ component.
- # (with validation)
- #
- # see also URI::Generic.check_password
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://john:S3nsit1ve@my.example.com")
- # uri.password = "V3ry_S3nsit1ve"
- # # => "V3ry_S3nsit1ve"
- # uri
- # #=> #<URI::HTTP:0x00000000881d90 URL:http://john:V3ry_S3nsit1ve@my.example.com>
- #
def password=(password)
check_password(password)
set_password(password)
# returns password
end
- # protect setter for the +user+ component, and +password+ if available.
- # (with validation)
- #
- # see also URI::Generic.userinfo=
- #
def set_userinfo(user, password = nil)
unless password
user, password = split_userinfo(user)
@@ -531,28 +342,18 @@ module URI
end
protected :set_userinfo
- # protected setter for the user component +v+
- #
- # see also URI::Generic.user=
- #
def set_user(v)
set_userinfo(v, @password)
v
end
protected :set_user
- # protected setter for the password component +v+
- #
- # see also URI::Generic.password=
- #
def set_password(v)
@password = v
# returns v
end
protected :set_password
- # returns the userinfo +ui+ as user, password
- # if properly formated as 'user:password'
def split_userinfo(ui)
return nil, nil unless ui
user, password = ui.split(/:/, 2)
@@ -561,13 +362,11 @@ module URI
end
private :split_userinfo
- # escapes 'user:password' +v+ based on RFC 1738 section 3.1
def escape_userpass(v)
v = parser.escape(v, /[@:\/]/o) # RFC 1738 section 3.1 #/
end
private :escape_userpass
- # returns the userinfo, either as 'user' or 'user:password'
def userinfo
if @user.nil?
nil
@@ -578,23 +377,14 @@ module URI
end
end
- # returns the user component
def user
@user
end
- # returns the password component
def password
@password
end
- #
- # check the host +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp for :HOST
- #
- # Can not have a registry or opaque component defined,
- # with a host component defined.
- #
def check_host(v)
return v unless v
@@ -610,83 +400,17 @@ module URI
end
private :check_host
- # protected setter for the host component +v+
- #
- # see also URI::Generic.host=
- #
def set_host(v)
@host = v
end
protected :set_host
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the host component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_host
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com")
- # uri.host = "foo.com"
- # # => "foo.com"
- # uri
- # #=> #<URI::HTTP:0x000000008e89e8 URL:http://foo.com>
- #
def host=(v)
check_host(v)
set_host(v)
v
end
- # extract the host part of the URI and unwrap brackets for IPv6 addresses.
- #
- # This method is same as URI::Generic#host except
- # brackets for IPv6 (andn future IP) addresses are removed.
- #
- # u = URI("http://[::1]/bar")
- # p u.hostname #=> "::1"
- # p u.host #=> "[::1]"
- #
- def hostname
- v = self.host
- /\A\[(.*)\]\z/ =~ v ? $1 : v
- end
-
- # set the host part of the URI as the argument with brackets for IPv6 addresses.
- #
- # This method is same as URI::Generic#host= except
- # the argument can be bare IPv6 address.
- #
- # u = URI("http://foo/bar")
- # p u.to_s #=> "http://foo/bar"
- # u.hostname = "::1"
- # p u.to_s #=> "http://[::1]/bar"
- #
- # If the arugument seems IPv6 address,
- # it is wrapped by brackets.
- #
- def hostname=(v)
- v = "[#{v}]" if /\A\[.*\]\z/ !~ v && /:/ =~ v
- self.host = v
- end
-
- #
- # check the port +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp for :PORT
- #
- # Can not have a registry or opaque component defined,
- # with a port component defined.
- #
def check_port(v)
return v unless v
@@ -702,10 +426,6 @@ module URI
end
private :check_port
- # protected setter for the port component +v+
- #
- # see also URI::Generic.port=
- #
def set_port(v)
unless !v || v.kind_of?(Fixnum)
if v.empty?
@@ -718,42 +438,12 @@ module URI
end
protected :set_port
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the port component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_port
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com")
- # uri.port = 8080
- # # => 8080
- # uri
- # #=> #<URI::HTTP:0x000000008e89e8 URL:http://my.example.com:8080>
- #
def port=(v)
check_port(v)
set_port(v)
port
end
- #
- # check the registry +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp for :REGISTRY
- #
- # Can not have a host, port or user component defined,
- # with a registry component defined.
- #
def check_registry(v)
return v unless v
@@ -772,42 +462,17 @@ module URI
end
private :check_registry
- # protected setter for the registry component +v+
- #
- # see also URI::Generic.registry=
- #
def set_registry(v)
@registry = v
end
protected :set_registry
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the registry component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_registry
- #
def registry=(v)
check_registry(v)
set_registry(v)
v
end
- #
- # check the path +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp
- # for :ABS_PATH and :REL_PATH
- #
- # Can not have a opaque component defined,
- # with a path component defined.
- #
def check_path(v)
# raise if both hier and opaque are not nil, because:
# absoluteURI = scheme ":" ( hier_part | opaque_part )
@@ -835,51 +500,17 @@ module URI
end
private :check_path
- # protected setter for the path component +v+
- #
- # see also URI::Generic.path=
- #
def set_path(v)
@path = v
end
protected :set_path
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the path component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_path
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com/pub/files")
- # uri.path = "/faq/"
- # # => "/faq/"
- # uri
- # #=> #<URI::HTTP:0x000000008e89e8 URL:http://my.example.com/faq/>
- #
def path=(v)
check_path(v)
set_path(v)
v
end
- #
- # check the query +v+ component for RFC2396 compliance
- # and against the URI::Parser Regexp for :QUERY
- #
- # Can not have a opaque component defined,
- # with a query component defined.
- #
def check_query(v)
return v unless v
@@ -900,51 +531,17 @@ module URI
end
private :check_query
- # protected setter for the query component +v+
- #
- # see also URI::Generic.query=
- #
def set_query(v)
@query = v
end
protected :set_query
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the query component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_query
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com/?id=25")
- # uri.query = "id=1"
- # # => "id=1"
- # uri
- # #=> #<URI::HTTP:0x000000008e89e8 URL:http://my.example.com/?id=1>
- #
def query=(v)
check_query(v)
set_query(v)
v
end
- #
- # check the opaque +v+ component for RFC2396 compliance and
- # against the URI::Parser Regexp for :OPAQUE
- #
- # Can not have a host, port, user or path component defined,
- # with an opaque component defined.
- #
def check_opaque(v)
return v unless v
@@ -963,37 +560,17 @@ module URI
end
private :check_opaque
- # protected setter for the opaque component +v+
- #
- # see also URI::Generic.opaque=
- #
def set_opaque(v)
@opaque = v
end
protected :set_opaque
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the opaque component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_opaque
- #
def opaque=(v)
check_opaque(v)
set_opaque(v)
v
end
- #
- # check the fragment +v+ component against the URI::Parser Regexp for :FRAGMENT
- #
def check_fragment(v)
return v unless v
@@ -1006,38 +583,11 @@ module URI
end
private :check_fragment
- # protected setter for the fragment component +v+
- #
- # see also URI::Generic.fragment=
- #
def set_fragment(v)
@fragment = v
end
protected :set_fragment
- #
- # == Args
- #
- # +v+::
- # String
- #
- # == Description
- #
- # public setter for the fragment component +v+.
- # (with validation)
- #
- # see also URI::Generic.check_fragment
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com/?id=25#time=1305212049")
- # uri.fragment = "time=1305212086"
- # # => "time=1305212086"
- # uri
- # #=> #<URI::HTTP:0x000000007a81f8 URL:http://my.example.com/?id=25#time=1305212086>
- #
def fragment=(v)
check_fragment(v)
set_fragment(v)
@@ -1074,18 +624,11 @@ module URI
!absolute?
end
- #
- # returns an Array of the path split on '/'
- #
def split_path(path)
path.split(%r{/+}, -1)
end
private :split_path
- #
- # Merges a base path +base+, with relative path +rel+,
- # returns a modified base path.
- #
def merge_path(base, rel)
# RFC2396, Section 5.2, 5)
@@ -1240,7 +783,14 @@ module URI
# return base and rel.
# you can modify `base', but can not `rel'.
def merge0(oth)
- oth = parser.send(:convert_to_uri, oth)
+ case oth
+ when Generic
+ when String
+ oth = parser.parse(oth)
+ else
+ raise ArgumentError,
+ "bad argument(expected URI object or URI string)"
+ end
if self.relative? && oth.relative?
raise BadURIError,
@@ -1262,7 +812,6 @@ module URI
end
private :merge0
- # :stopdoc:
def route_from_path(src, dst)
case dst
when src
@@ -1299,11 +848,17 @@ module URI
return '../' * src_path.size + tmp
end
private :route_from_path
- # :startdoc:
- # :stopdoc:
def route_from0(oth)
- oth = parser.send(:convert_to_uri, oth)
+ case oth
+ when Generic
+ when String
+ oth = parser.parse(oth)
+ else
+ raise ArgumentError,
+ "bad argument(expected URI object or URI string)"
+ end
+
if self.relative?
raise BadURIError,
"relative URI: #{self}"
@@ -1324,11 +879,9 @@ module URI
if rel.userinfo != oth.userinfo ||
rel.host.to_s.downcase != oth.host.to_s.downcase ||
rel.port != oth.port
-
- if self.userinfo.nil? && self.host.nil?
- return self, self.dup
- end
-
+ if self.userinfo.nil? && self.host.nil?
+ return self, self.dup
+ end
rel.set_port(nil) if rel.port == oth.default_port
return rel, rel
end
@@ -1350,8 +903,6 @@ module URI
return oth, rel
end
private :route_from0
- # :startdoc:
-
#
# == Args
#
@@ -1411,7 +962,16 @@ module URI
# #=> #<URI::Generic:0x2020c2f6 URL:/main.rbx?page=1>
#
def route_to(oth)
- parser.send(:convert_to_uri, oth).route_from(self)
+ case oth
+ when Generic
+ when String
+ oth = parser.parse(oth)
+ else
+ raise ArgumentError,
+ "bad argument(expected URI object or URI string)"
+ end
+
+ oth.route_from(self)
end
#
@@ -1438,7 +998,6 @@ module URI
end
end
- # returns the assemble String with path and query components
def path_query
str = @path
if @query
@@ -1524,9 +1083,6 @@ module URI
=begin
=end
-
-
- # returns an Array of the components defined from the COMPONENT Array
def component_ary
component.collect do |x|
self.send(x)
@@ -1567,25 +1123,6 @@ module URI
@@to_s.bind(self).call.sub!(/>\z/) {" URL:#{self}>"}
end
- #
- # == Args
- #
- # +v+::
- # URI or String
- #
- # == Description
- #
- # attempt to parse other URI +oth+
- # return [parsed_oth, self]
- #
- # == Usage
- #
- # require 'uri'
- #
- # uri = URI.parse("http://my.example.com")
- # uri.coerce("http://foo.com")
- # #=> [#<URI::HTTP:0x00000000bcb028 URL:http://foo.com/>, #<URI::HTTP:0x00000000d92178 URL:http://my.example.com>]
- #
def coerce(oth)
case oth
when String
@@ -1596,80 +1133,5 @@ module URI
return oth, self
end
-
- # returns a proxy URI.
- # The proxy URI is obtained from environment variables such as http_proxy,
- # ftp_proxy, no_proxy, etc.
- # If there is no proper proxy, nil is returned.
- #
- # Note that capitalized variables (HTTP_PROXY, FTP_PROXY, NO_PROXY, etc.)
- # are examined too.
- #
- # But http_proxy and HTTP_PROXY is treated specially under CGI environment.
- # It's because HTTP_PROXY may be set by Proxy: header.
- # So HTTP_PROXY is not used.
- # http_proxy is not used too if the variable is case insensitive.
- # CGI_HTTP_PROXY can be used instead.
- def find_proxy
- raise BadURIError, "relative URI: #{self}" if self.relative?
- name = self.scheme.downcase + '_proxy'
- proxy_uri = nil
- if name == 'http_proxy' && ENV.include?('REQUEST_METHOD') # CGI?
- # HTTP_PROXY conflicts with *_proxy for proxy settings and
- # HTTP_* for header information in CGI.
- # So it should be careful to use it.
- pairs = ENV.reject {|k, v| /\Ahttp_proxy\z/i !~ k }
- case pairs.length
- when 0 # no proxy setting anyway.
- proxy_uri = nil
- when 1
- k, _ = pairs.shift
- if k == 'http_proxy' && ENV[k.upcase] == nil
- # http_proxy is safe to use because ENV is case sensitive.
- proxy_uri = ENV[name]
- else
- proxy_uri = nil
- end
- else # http_proxy is safe to use because ENV is case sensitive.
- proxy_uri = ENV.to_hash[name]
- end
- if !proxy_uri
- # Use CGI_HTTP_PROXY. cf. libwww-perl.
- proxy_uri = ENV["CGI_#{name.upcase}"]
- end
- elsif name == 'http_proxy'
- unless proxy_uri = ENV[name]
- if proxy_uri = ENV[name.upcase]
- warn 'The environment variable HTTP_PROXY is discouraged. Use http_proxy.'
- end
- end
- else
- proxy_uri = ENV[name] || ENV[name.upcase]
- end
-
- if proxy_uri.nil? || proxy_uri.empty?
- return nil
- end
-
- if self.hostname
- require 'socket'
- begin
- addr = IPSocket.getaddress(self.hostname)
- return nil if /\A127\.|\A::1\z/ =~ addr
- rescue SocketError
- end
- end
-
- name = 'no_proxy'
- if no_proxy = ENV[name] || ENV[name.upcase]
- no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port|
- if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
- (!port || self.port == port.to_i)
- return nil
- end
- }
- end
- URI.parse(proxy_uri)
- end
end
end
diff --git a/lib/uri/http.rb b/lib/uri/http.rb
index 9877b1ee59..69a7658918 100644
--- a/lib/uri/http.rb
+++ b/lib/uri/http.rb
@@ -1,11 +1,10 @@
+#
# = uri/http.rb
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# License:: You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
#
-# See URI for general documentation
-#
require 'uri/generic'
@@ -20,10 +19,8 @@ module URI
# update. See <URL:http://support.microsoft.com/kb/834489>.
#
class HTTP < Generic
- # A Default port of 80 for URI::HTTP
DEFAULT_PORT = 80
- # An Array of the available components for URI::HTTP
COMPONENT = [
:scheme,
:userinfo, :host, :port,
@@ -49,7 +46,7 @@ module URI
# Example:
#
# newuri = URI::HTTP.build({:host => 'www.example.com',
- # :path => '/foo/bar'})
+ # :path> => '/foo/bar'})
#
# newuri = URI::HTTP.build([nil, "www.example.com", nil, "/path",
# "query", 'fragment'])
@@ -74,11 +71,8 @@ module URI
#
# Example:
#
- # uri = URI::HTTP.new('http', nil, "www.example.com", nil, "/path",
- # "query", 'fragment')
- #
- #
- # See also URI::Generic.new
+ # uri = URI::HTTP.new(['http', nil, "www.example.com", nil, "/path",
+ # "query", 'fragment'])
#
def initialize(*arg)
super(*arg)
@@ -94,7 +88,7 @@ module URI
#
def request_uri
r = path_query
- if r && r[0] != ?/
+ if r[0] != ?/
r = '/' + r
end
diff --git a/lib/uri/https.rb b/lib/uri/https.rb
index 7d242e7e79..9761636304 100644
--- a/lib/uri/https.rb
+++ b/lib/uri/https.rb
@@ -1,11 +1,10 @@
+#
# = uri/https.rb
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# License:: You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
#
-# See URI for general documentation
-#
require 'uri/http'
@@ -15,7 +14,6 @@ module URI
# than 'http:'. Other than that, HTTPS URIs are identical to HTTP URIs;
# see URI::HTTP.
class HTTPS < HTTP
- # A Default port of 443 for URI::HTTPS
DEFAULT_PORT = 443
end
@@schemes['HTTPS'] = HTTPS
diff --git a/lib/uri/ldap.rb b/lib/uri/ldap.rb
index 56d748e59e..6739a018af 100644
--- a/lib/uri/ldap.rb
+++ b/lib/uri/ldap.rb
@@ -1,3 +1,4 @@
+#
# = uri/ldap.rb
#
# Author::
@@ -8,8 +9,6 @@
# You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
#
-# See URI for general documentation
-#
require 'uri/generic'
@@ -21,10 +20,8 @@ module URI
#
class LDAP < Generic
- # A Default port of 389 for URI::LDAP
DEFAULT_PORT = 389
- # An Array of the available components for URI::LDAP
COMPONENT = [
:scheme,
:host, :port,
@@ -35,41 +32,12 @@ module URI
:extensions,
].freeze
- # Scopes available for the starting point.
- #
- # * SCOPE_BASE - the Base DN
- # * SCOPE_ONE - one level under the Base DN, not including the base DN and
- # not including any entries under this.
- # * SCOPE_SUB - subtress, all entries at all levels
- #
SCOPE = [
SCOPE_ONE = 'one',
SCOPE_SUB = 'sub',
SCOPE_BASE = 'base',
].freeze
- #
- # == Description
- #
- # Create a new URI::LDAP object from components, with syntax checking.
- #
- # The components accepted are host, port, dn, attributes,
- # scope, filter, and extensions.
- #
- # 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
- # [host, port, dn, attributes, scope, filter, extensions].
- #
- # Example:
- #
- # newuri = URI::LDAP.build({:host => 'ldap.example.com',
- # :dn> => '/dc=example'})
- #
- # newuri = URI::LDAP.build(["ldap.example.com", nil,
- # "/dc=example;dc=com", "query", nil, nil, nil])
- #
def self.build(args)
tmp = Util::make_components_hash(self, args)
@@ -88,23 +56,6 @@ module URI
return super(tmp)
end
- #
- # == Description
- #
- # Create a new URI::LDAP object from generic URI components as per
- # RFC 2396. No LDAP-specific syntax checking is performed.
- #
- # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
- # +opaque+, +query+ and +fragment+, in that order.
- #
- # Example:
- #
- # uri = URI::LDAP.new("ldap", nil, "ldap.example.com", nil,
- # "/dc=example;dc=com", "query", nil, nil, nil, nil)
- #
- #
- # See also URI::Generic.new
- #
def initialize(*arg)
super(*arg)
@@ -116,14 +67,11 @@ module URI
parse_query
end
- # private method to cleanup +dn+ from using the +path+ component attribute
def parse_dn
@dn = @path[1..-1]
end
private :parse_dn
- # private method to cleanup +attributes+, +scope+, +filter+ and +extensions+,
- # from using the +query+ component attribute
def parse_query
@attributes = nil
@scope = nil
@@ -141,7 +89,6 @@ module URI
end
private :parse_query
- # private method to assemble +query+ from +attributes+, +scope+, +filter+ and +extensions+.
def build_path_query
@path = '/' + @dn
@@ -154,12 +101,10 @@ module URI
end
private :build_path_query
- # returns dn.
def dn
@dn
end
- # private setter for dn +val+
def set_dn(val)
@dn = val
build_path_query
@@ -167,18 +112,15 @@ module URI
end
protected :set_dn
- # setter for dn +val+
def dn=(val)
set_dn(val)
val
end
- # returns attributes.
def attributes
@attributes
end
- # private setter for attributes +val+
def set_attributes(val)
@attributes = val
build_path_query
@@ -186,18 +128,15 @@ module URI
end
protected :set_attributes
- # setter for attributes +val+
def attributes=(val)
set_attributes(val)
val
end
- # returns scope.
def scope
@scope
end
- # private setter for scope +val+
def set_scope(val)
@scope = val
build_path_query
@@ -205,18 +144,15 @@ module URI
end
protected :set_scope
- # setter for scope +val+
def scope=(val)
set_scope(val)
val
end
- # returns filter.
def filter
@filter
end
- # private setter for filter +val+
def set_filter(val)
@filter = val
build_path_query
@@ -224,18 +160,15 @@ module URI
end
protected :set_filter
- # setter for filter +val+
def filter=(val)
set_filter(val)
val
end
- # returns extensions.
def extensions
@extensions
end
- # private setter for extensions +val+
def set_extensions(val)
@extensions = val
build_path_query
@@ -243,14 +176,11 @@ module URI
end
protected :set_extensions
- # setter for extensions +val+
def extensions=(val)
set_extensions(val)
val
end
- # Checks if URI has a path
- # For URI::LDAP this will return +false+
def hierarchical?
false
end
diff --git a/lib/uri/ldaps.rb b/lib/uri/ldaps.rb
index 42bbfe86ba..6da333150f 100644
--- a/lib/uri/ldaps.rb
+++ b/lib/uri/ldaps.rb
@@ -1,10 +1,3 @@
-# = uri/ldap.rb
-#
-# License:: You can redistribute it and/or modify it under the same term as Ruby.
-#
-# See URI for general documentation
-#
-
require 'uri/ldap'
module URI
@@ -13,7 +6,6 @@ module URI
# than 'ldap:'. Other than that, LDAPS URIs are identical to LDAP URIs;
# see URI::LDAP.
class LDAPS < LDAP
- # A Default port of 636 for URI::LDAPS
DEFAULT_PORT = 636
end
@@schemes['LDAPS'] = LDAPS
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 079340cf58..3edaac93f3 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -1,11 +1,10 @@
+#
# = uri/mailto.rb
#
# Author:: Akira Yamada <akira@ruby-lang.org>
# License:: You can redistribute it and/or modify it under the same term as Ruby.
# Revision:: $Id$
#
-# See URI for general documentation
-#
require 'uri/generic'
@@ -17,10 +16,8 @@ module URI
class MailTo < Generic
include REGEXP
- # A Default port of nil for URI::MailTo
DEFAULT_PORT = nil
- # An Array of the available components for URI::MailTo
COMPONENT = [ :scheme, :to, :headers ].freeze
# :stopdoc:
@@ -103,7 +100,7 @@ module URI
if tmp[:headers].kind_of?(Array)
tmp[:opaque] << tmp[:headers].collect { |x|
if x.kind_of?(Array)
- x[0] + '=' + x[1..-1].join
+ x[0] + '=' + x[1..-1].to_s
else
x.to_s
end
@@ -158,9 +155,6 @@ module URI
# E-mail headers set by the URL, as an Array of Arrays
attr_reader :headers
- # check the to +v+ component against either
- # * URI::Parser Regexp for :OPAQUE
- # * MAILBOX_PATTERN
def check_to(v)
return true unless v
return true if v.size == 0
@@ -174,22 +168,17 @@ module URI
end
private :check_to
- # private setter for to +v+
def set_to(v)
@to = v
end
protected :set_to
- # setter for to +v+
def to=(v)
check_to(v)
set_to(v)
v
end
- # check the headers +v+ component against either
- # * URI::Parser Regexp for :OPAQUE
- # * HEADER_PATTERN
def check_headers(v)
return true unless v
return true if v.size == 0
@@ -204,7 +193,6 @@ module URI
end
private :check_headers
- # private setter for headers +v+
def set_headers(v)
@headers = []
if v
@@ -215,14 +203,12 @@ module URI
end
protected :set_headers
- # setter for headers +v+
def headers=(v)
check_headers(v)
set_headers(v)
v
end
- # Constructs String from URI
def to_s
@scheme + ':' +
if @to
diff --git a/lib/weakref.rb b/lib/weakref.rb
index dd2cee16aa..ba39242445 100644
--- a/lib/weakref.rb
+++ b/lib/weakref.rb
@@ -1,117 +1,80 @@
-require "delegate"
-
-# Weak Reference class that allows a referenced object to be
-# garbage-collected.
-#
-# A WeakRef may be used exactly like the object it references.
+# Weak Reference class that does not bother GCing.
#
# Usage:
-#
-# foo = Object.new # create a new object instance
-# p foo.to_s # original's class
-# foo = WeakRef.new(foo) # reassign foo with WeakRef instance
-# p foo.to_s # should be same class
-# GC.start # start the garbage collector
-# p foo.to_s # should raise exception (recycled)
-#
-# == Example
-#
-# With help from WeakRef, we can implement our own redimentary WeakHash class.
-#
-# We will call it WeakHash, since it's really just a Hash except all of it's
-# keys and values can be garbage collected.
-#
-# require 'weakref'
-#
-# class WeakHash < Hash
-# def []= key, obj
-# super WeakRef.new(key), WeakRef.new(obj)
-# end
-# end
-#
-# This is just a simple implementation, we've opened the Hash class and changed
-# Hash#store to create a new WeakRef object with +key+ and +obj+ parameters
-# before passing them as our key-value pair to the hash.
-#
-# With this you will have to limit your self to String key's, otherwise you
-# will get an ArgumentError because WeakRef cannot create a finalizer for a
-# Symbol. Symbols are immutable and cannot be garbage collected.
-#
-# Let's see it in action:
-#
-# omg = "lol"
-# c = WeakHash.new
-# c['foo'] = "bar"
-# c['baz'] = Object.new
-# c['qux'] = omg
-# puts c.inspect
-# #=> {"foo"=>"bar", "baz"=>#<Object:0x007f4ddfc6cb48>, "qux"=>"lol"}
-#
-# # Now run the garbage collector
-# GC.start
-# c['foo'] #=> nil
-# c['baz'] #=> nil
-# c['qux'] #=> nil
-# omg #=> "lol"
-#
-# puts c.inspect
-# #=> WeakRef::RefError: Invalid Reference - probably recycled
-#
-# You can see the local variable +omg+ stayed, although it's reference in our
-# hash object was garbage collected, along with the rest of the keys and
-# values. Also, when we tried to inspect our hash, we got a WeakRef::RefError,
-# this is because these objects were also garbage collected.
+# foo = Object.new
+# 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
+# p foo.to_s # should raise exception (recycled)
-class WeakRef < Delegator
+require "delegate"
+require 'thread'
- ##
- # RefError is raised when a referenced object has been recycled by the
- # garbage collector
+class WeakRef < Delegator
class RefError < StandardError
end
- @@__map = ::ObjectSpace::WeakMap.new
-
- ##
- # Creates a weak reference to +orig+
- #
- # Raises an ArgumentError if the given +orig+ is immutable, such as Symbol,
- # Fixnum, or Float.
+ @@id_map = {} # obj -> [ref,...]
+ @@id_rev_map = {} # ref -> obj
+ @@mutex = Mutex.new
+ @@final = lambda {|id|
+ @@mutex.synchronize {
+ rids = @@id_map[id]
+ if rids
+ for rid in rids
+ @@id_rev_map.delete(rid)
+ end
+ @@id_map.delete(id)
+ end
+ rid = @@id_rev_map[id]
+ if rid
+ @@id_rev_map.delete(id)
+ @@id_map[rid].delete(id)
+ @@id_map.delete(rid) if @@id_map[rid].empty?
+ end
+ }
+ }
def initialize(orig)
- case orig
- when true, false, nil
- @delegate_sd_obj = orig
- else
- @@__map[self] = orig
- end
+ @__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
end
- def __getobj__ # :nodoc:
- @@__map[self] or defined?(@delegate_sd_obj) ? @delegate_sd_obj :
- Kernel::raise(RefError, "Invalid Reference - probably recycled", Kernel::caller(2))
+ def __getobj__
+ unless @@id_rev_map[self.object_id] == @__id
+ Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
+ end
+ begin
+ ObjectSpace._id2ref(@__id)
+ rescue RangeError
+ Kernel::raise RefError, "Invalid Reference - probably recycled", Kernel::caller(2)
+ end
end
-
- def __setobj__(obj) # :nodoc:
+ def __setobj__(obj)
end
- ##
- # Returns true if the referenced object is still alive.
-
def weakref_alive?
- !!(@@__map[self] or defined?(@delegate_sd_obj))
+ @@id_rev_map[self.object_id] == @__id
end
end
if __FILE__ == $0
# require 'thread'
foo = Object.new
- p foo.to_s # original's class
+ p foo.to_s # original's class
foo = WeakRef.new(foo)
- p foo.to_s # should be same class
+ p foo.to_s # should be same class
ObjectSpace.garbage_collect
ObjectSpace.garbage_collect
- p foo.to_s # should raise exception (recycled)
+ p foo.to_s # should raise exception (recycled)
end
diff --git a/lib/webrick.rb b/lib/webrick.rb
index be6d314dd6..8fca81bafb 100644
--- a/lib/webrick.rb
+++ b/lib/webrick.rb
@@ -1,210 +1,13 @@
-##
-# = WEB server toolkit.
#
-# WEBrick is an HTTP server toolkit that can be configured as an HTTPS server,
-# a proxy server, and a virtual-host server. WEBrick features complete
-# logging of both server operations and HTTP access. WEBrick supports both
-# basic and digest authentication in addition to algorithms not in RFC 2617.
-#
-# A WEBrick server can be composed of multiple WEBrick servers or servlets to
-# provide differing behavior on a per-host or per-path basis. WEBrick
-# includes servlets for handling CGI scripts, ERb pages, ruby blocks and
-# directory listings.
-#
-# WEBrick also includes tools for daemonizing a process and starting a process
-# at a higher privilege level and dropping permissions.
-#
-# == Starting an HTTP server
-#
-# To create a new WEBrick::HTTPServer that will listen to connections on port
-# 8000 and serve documents from the current user's public_html folder:
-#
-# require 'webrick'
-#
-# root = File.expand_path '~/public_html'
-# server = WEBrick::HTTPServer.new :Port => 8000, :DocumentRoot => root
-#
-# To run the server you will need to provide a suitable shutdown hook as
-# starting the server blocks the current thread:
-#
-# trap 'INT' do server.shutdown end
-#
-# server.start
-#
-# == Custom Behavior
-#
-# The easiest way to have a server perform custom operations is through
-# WEBrick::HTTPServer#mount_proc. The block given will be called with a
-# WEBrick::HTTPRequest with request info and a WEBrick::HTTPResponse which
-# must be filled in appropriately:
-#
-# server.mount_proc '/' do |req, res|
-# res.body = 'Hello, world!'
-# end
-#
-# Remember that <tt>server.mount_proc</tt> must <tt>server.start</tt>.
-#
-# == Servlets
-#
-# Advanced custom behavior can be obtained through mounting a subclass of
-# WEBrick::HTTPServlet::AbstractServlet. Servlets provide more modularity
-# when writing an HTTP server than mount_proc allows. Here is a simple
-# servlet:
-#
-# class Simple < WEBrick::HTTPServlet::AbstractServlet
-# def do_GET request, response
-# status, content_type, body = do_stuff_with request
-#
-# response.status = 200
-# response['Content-Type'] = 'text/plain'
-# response.body = 'Hello, World!'
-# end
-# end
-#
-# To initialize the servlet you mount it on the server:
-#
-# server.mount '/simple', Simple
-#
-# See WEBrick::HTTPServlet::AbstractServlet for more details.
-#
-# == Virtual Hosts
-#
-# A server can act as a virtual host for multiple host names. After creating
-# the listening host, additional hosts that do not listen can be created and
-# attached as virtual hosts:
-#
-# server = WEBrick::HTTPServer.new # ...
-#
-# vhost = WEBrick::HTTPServer.new :ServerName => 'vhost.example',
-# :DoNotListen => true, # ...
-# vhost.mount '/', ...
-#
-# server.virtual_host vhost
-#
-# If no +:DocumentRoot+ is provided and no servlets or procs are mounted on the
-# main server it will return 404 for all URLs.
-#
-# == HTTPS
-#
-# To create an HTTPS server you only need to enable SSL and provide an SSL
-# certificate name:
-#
-# require 'webrick'
-# require 'webrick/https'
-#
-# cert_name = [
-# %w[CN localhost],
-# ]
-#
-# server = WEBrick::HTTPServer.new(:Port => 8000,
-# :SSLEnable => true,
-# :SSLCertName => cert_name)
-#
-# This will start the server with a self-generated self-signed certificate.
-# The certificate will be changed every time the server is restarted.
-#
-# To create a server with a pre-determined key and certificate you can provide
-# them:
-#
-# require 'webrick'
-# require 'webrick/https'
-# require 'openssl'
-#
-# cert = OpenSSL::X509::Certificate.new File.read '/path/to/cert.pem'
-# pkey = OpenSSL::PKey::RSA.new File.read '/path/to/pkey.pem'
-#
-# server = WEBrick::HTTPServer.new(:Port => 8000,
-# :SSLEnable => true,
-# :SSLCertificate => cert,
-# :SSLPrivateKey => pkey)
-#
-# == Proxy Server
-#
-# WEBrick can act as a proxy server:
-#
-# require 'webrick'
-# require 'webrick/httpproxy'
-#
-# proxy = WEBrick::HTTPProxyServer.new :Port => 8000
-#
-# trap 'INT' do proxy.shutdown end
-#
-# See WEBrick::HTTPProxy for further details including modifying proxied
-# responses.
-#
-# == Basic and Digest authentication
-#
-# WEBrick provides both Basic and Digest authentication for regular and proxy
-# servers. See WEBrick::HTTPAuth, WEBrick::HTTPAuth::BasicAuth and
-# WEBrick::HTTPAuth::DigestAuth.
-#
-# == WEBrick as a Production Web Server
-#
-# WEBrick can be run as a production server for small loads.
-#
-# === Daemonizing
-#
-# To start a WEBrick server as a daemon simple run WEBrick::Daemon.start
-# before starting the server.
-#
-# === Dropping Permissions
-#
-# WEBrick can be started as one user to gain permission to bind to port 80 or
-# 443 for serving HTTP or HTTPS traffic then can drop these permissions for
-# regular operation. To listen on all interfaces for HTTP traffic:
-#
-# sockets = WEBrick::Utils.create_listeners nil, 80
-#
-# Then drop privileges:
-#
-# WEBrick::Utils.su 'www'
-#
-# Then create a server that does not listen by default:
-#
-# server = WEBrick::HTTPServer.new :DoNotListen => true, # ...
-#
-# Then overwrite the listening sockets with the port 80 sockets:
-#
-# server.listeners.replace sockets
-#
-# === Logging
-#
-# WEBrick can separately log server operations and end-user access. For
-# server operations:
-#
-# log_file = File.open '/var/log/webrick.log', 'a+'
-# log = WEBrick::Log.new log_file
-#
-# For user access logging:
-#
-# access_log = [
-# [log_file, WEBrick::AccessLog::COMBINED_LOG_FORMAT],
-# ]
-#
-# server = WEBrick::HTTPServer.new :Logger => log, :AccessLog => access_log
-#
-# See WEBrick::AccessLog for further log formats.
-#
-# === Log Rotation
-#
-# To rotate logs in WEBrick on a HUP signal (like syslogd can send), open the
-# log file in 'a+' mode (as above) and trap 'HUP' to reopen the log file:
-#
-# trap 'HUP' do log_file.reopen '/path/to/webrick.log', 'a+'
-#
-# == Copyright
+# WEBrick -- WEB server toolkit.
#
# Author: IPR -- Internet Programming with Ruby -- writers
-#
# Copyright (c) 2000 TAKAHASHI Masayoshi, GOTOU YUUZOU
# Copyright (c) 2002 Internet Programming with Ruby writers. All rights
# reserved.
-#--
+#
# $IPR: webrick.rb,v 1.12 2002/10/01 17:16:31 gotoyuzo Exp $
-module WEBrick
-end
-
require 'webrick/compat.rb'
require 'webrick/version.rb'
diff --git a/lib/webrick/accesslog.rb b/lib/webrick/accesslog.rb
index 0a3c380406..0bed8097d5 100644
--- a/lib/webrick/accesslog.rb
+++ b/lib/webrick/accesslog.rb
@@ -1,4 +1,4 @@
-#--
+#
# accesslog.rb -- Access log handling utilities
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -8,89 +8,20 @@
# $IPR: accesslog.rb,v 1.1 2002/10/01 17:16:32 gotoyuzo Exp $
module WEBrick
-
- ##
- # AccessLog provides logging to various files in various formats.
- #
- # Multiple logs may be written to at the same time:
- #
- # access_log = [
- # [$stderr, WEBrick::AccessLog::COMMON_LOG_FORMAT],
- # [$stderr, WEBrick::AccessLog::REFERER_LOG_FORMAT],
- # ]
- #
- # server = WEBrick::HTTPServer.new :AccessLog => access_log
- #
- # Custom log formats may be defined. WEBrick::AccessLog provides a subset
- # of the formatting from Apache's mod_log_config
- # http://httpd.apache.org/docs/mod/mod_log_config.html#formats. See
- # AccessLog::setup_params for a list of supported options
-
module AccessLog
-
- ##
- # Raised if a parameter such as %e, %i, %o or %n is used without fetching
- # a specific field.
-
class AccessLogError < StandardError; end
- ##
- # The Common Log Format's time format
-
CLF_TIME_FORMAT = "[%d/%b/%Y:%H:%M:%S %Z]"
-
- ##
- # Common Log Format
-
COMMON_LOG_FORMAT = "%h %l %u %t \"%r\" %s %b"
-
- ##
- # Short alias for Common Log Format
-
CLF = COMMON_LOG_FORMAT
-
- ##
- # Referer Log Format
-
REFERER_LOG_FORMAT = "%{Referer}i -> %U"
-
- ##
- # User-Agent Log Format
-
AGENT_LOG_FORMAT = "%{User-Agent}i"
-
- ##
- # Combined Log Format
-
COMBINED_LOG_FORMAT = "#{CLF} \"%{Referer}i\" \"%{User-agent}i\""
module_function
- # This format specification is a subset of mod_log_config of Apache:
- #
- # %a:: Remote IP address
- # %b:: Total response size
- # %e{variable}:: Given variable in ENV
- # %f:: Response filename
- # %h:: Remote host name
- # %{header}i:: Given request header
- # %l:: Remote logname, always "-"
- # %m:: Request method
- # %{attr}n:: Given request attribute from <tt>req.attributes</tt>
- # %{header}o:: Given response header
- # %p:: Server's request port
- # %{format}p:: The canonical port of the server serving the request or the
- # actual port or the client's actual port. Valid formats are
- # canonical, local or remote.
- # %q:: Request query string
- # %r:: First line of the request
- # %s:: Request status
- # %t:: Time the request was recieved
- # %T:: Time taken to process the request
- # %u:: Remote user from auth
- # %U:: Unparsed URI
- # %%:: Literal %
-
+ # This format specification is a subset of mod_log_config of Apache.
+ # http://httpd.apache.org/docs/mod/mod_log_config.html#formats
def setup_params(config, req, res)
params = Hash.new("")
params["a"] = req.peeraddr[3]
@@ -115,10 +46,6 @@ module WEBrick
params
end
- ##
- # Formats +params+ according to +format_string+ which is described in
- # setup_params.
-
def format(format_string, params)
format_string.gsub(/\%(?:\{(.*?)\})?>?([a-zA-Z%])/){
param, spec = $1, $2
@@ -129,13 +56,6 @@ module WEBrick
(param = params[spec][param]) ? escape(param) : "-"
when ?t
params[spec].strftime(param || CLF_TIME_FORMAT)
- when ?p
- case param
- when 'remote'
- escape(params["i"].peeraddr[1].to_s)
- else
- escape(params["p"].to_s)
- end
when ?%
"%"
else
@@ -144,9 +64,6 @@ module WEBrick
}
end
- ##
- # Escapes control characters in +data+
-
def escape(data)
if data.tainted?
data.gsub(/[[:cntrl:]\\]+/) {$&.dump[1...-1]}.untaint
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 80f636edc3..7099d14689 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -13,44 +13,10 @@ require "webrick/config"
require "stringio"
module WEBrick
-
- # A CGI library using WEBrick requests and responses.
- #
- # Example:
- #
- # class MyCGI < WEBrick::CGI
- # def do_GET req, res
- # res.body = 'it worked!'
- # res.status = 200
- # end
- # end
- #
- # MyCGI.new.start
-
class CGI
-
- # The CGI error exception class
-
CGIError = Class.new(StandardError)
- ##
- # The CGI configuration. This is based on WEBrick::Config::HTTP
-
- attr_reader :config
-
- ##
- # The CGI logger
-
- attr_reader :logger
-
- ##
- # Creates a new CGI interface.
- #
- # The first argument in +args+ is a configuration hash which would update
- # WEBrick::Config::HTTP.
- #
- # Any remaining arguments are stored in the <code>@options</code> instance
- # variable for use by a subclass.
+ attr_reader :config, :logger
def initialize(*args)
if defined?(MOD_RUBY)
@@ -75,17 +41,10 @@ module WEBrick
@options = args
end
- ##
- # Reads +key+ from the configuration
-
def [](key)
@config[key]
end
- ##
- # Starts the CGI process with the given environment +env+ and standard
- # input and output +stdin+ and +stdout+.
-
def start(env=ENV, stdin=$stdin, stdout=$stdout)
sock = WEBrick::CGI::Socket.new(@config, env, stdin, stdout)
req = HTTPRequest.new(@config)
@@ -149,10 +108,6 @@ module WEBrick
end
end
- ##
- # Services the request +req+ which will fill in the response +res+. See
- # WEBrick::HTTPServlet::AbstractServlet#service for details.
-
def service(req, res)
method_name = "do_" + req.request_method.gsub(/-/, "_")
if respond_to?(method_name)
@@ -163,10 +118,7 @@ module WEBrick
end
end
- ##
- # Provides HTTP socket emulation from the CGI environment
-
- class Socket # :nodoc:
+ class Socket
include Enumerable
private
@@ -191,7 +143,7 @@ module WEBrick
setup_header
@header_part << CRLF
@header_part.rewind
- rescue Exception
+ rescue Exception => ex
raise CGIError, "invalid CGI environment"
end
end
diff --git a/lib/webrick/compat.rb b/lib/webrick/compat.rb
index 33521f0a76..ad7760b640 100644
--- a/lib/webrick/compat.rb
+++ b/lib/webrick/compat.rb
@@ -8,28 +8,8 @@
#
# $IPR: compat.rb,v 1.6 2002/10/01 17:16:32 gotoyuzo Exp $
-##
-# System call error module used by webrick for cross platform compatability.
-#
-# EPROTO:: protocol error
-# ECONNRESET:: remote host reset the connection request
-# ECONNABORTED:: Client sent TCP reset (RST) before server has accepted the
-# connection requested by client.
-#
module Errno
- ##
- # Protocol error.
-
class EPROTO < SystemCallError; end
-
- ##
- # Remote host reset the connection request.
-
class ECONNRESET < SystemCallError; end
-
- ##
- # Client sent TCP reset (RST) before server has accepted the connection
- # requested by client.
-
class ECONNABORTED < SystemCallError; end
end
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index c347da4be6..0fbb67f487 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -16,7 +16,7 @@ require 'webrick/log'
module WEBrick
module Config
- LIBDIR = File::dirname(__FILE__) # :nodoc:
+ LIBDIR = File::dirname(__FILE__)
# for GenericServer
General = {
@@ -67,30 +67,6 @@ module WEBrick
:Escape8bitURI => false
)
- ##
- # Default configuration for WEBrick::HTTPServlet::FileHandler
- #
- # :AcceptableLanguages::
- # Array of languages allowed for accept-language. There is no default
- # :DirectoryCallback::
- # Allows preprocessing of directory requests. There is no default
- # callback.
- # :FancyIndexing::
- # If true, show an index for directories. The default is true.
- # :FileCallback::
- # Allows preprocessing of file requests. There is no default callback.
- # :HandlerCallback::
- # Allows preprocessing of requests. There is no default callback.
- # :HandlerTable::
- # Maps file suffixes to file handlers. DefaultFileHandler is used by
- # default but any servlet can be used.
- # :NondisclosureName::
- # Do not show files matching this array of globs. .ht* and *~ are
- # excluded by default.
- # :UserDir::
- # Directory inside ~user to serve content from for /~user requests.
- # Only works if mounted on /. Disabled by default.
-
FileHandler = {
:NondisclosureName => [".ht*", "*~"],
:FancyIndexing => false,
@@ -102,37 +78,10 @@ module WEBrick
:AcceptableLanguages => [] # ["en", "ja", ... ]
}
- ##
- # Default configuration for WEBrick::HTTPAuth::BasicAuth
- #
- # :AutoReloadUserDB:: Reload the user database provided by :UserDB
- # automatically?
-
BasicAuth = {
:AutoReloadUserDB => true,
}
- ##
- # Default configuration for WEBrick::HTTPAuth::DigestAuth.
- #
- # :Algorithm:: MD5, MD5-sess (default), SHA1, SHA1-sess
- # :Domain:: An Array of URIs that define the protected space
- # :Qop:: 'auth' for authentication, 'auth-int' for integrity protection or
- # both
- # :UseOpaque:: Should the server send opaque values to the client? This
- # helps prevent replay attacks.
- # :CheckNc:: Should the server check the nonce count? This helps the
- # server detect replay attacks.
- # :UseAuthenticationInfoHeader:: Should the server send an
- # AuthenticationInfo header?
- # :AutoReloadUserDB:: Reload the user database provided by :UserDB
- # automatically?
- # :NonceExpirePeriod:: How long should we store used nonces? Default is
- # 30 minutes.
- # :NonceExpireDelta:: How long is a nonce valid? Default is 1 minute
- # :InternetExplorerHack:: Hack which allows Internet Explorer to work.
- # :OperaHack:: Hack which allows Opera to work.
-
DigestAuth = {
:Algorithm => 'MD5-sess', # or 'MD5'
:Domain => nil, # an array includes domain names.
diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb
index d8df23133d..814e6645a3 100644
--- a/lib/webrick/cookie.rb
+++ b/lib/webrick/cookie.rb
@@ -12,56 +12,14 @@ require 'time'
require 'webrick/httputils'
module WEBrick
-
- ##
- # Processes HTTP cookies
-
class Cookie
- ##
- # The cookie name
-
attr_reader :name
-
- ##
- # The cookie value
-
- attr_accessor :value
-
- ##
- # The cookie version
-
- attr_accessor :version
-
- ##
- # The cookie domain
- attr_accessor :domain
-
- ##
- # The cookie path
-
- attr_accessor :path
-
- ##
- # Is this a secure cookie?
-
- attr_accessor :secure
-
- ##
- # The cookie comment
-
- attr_accessor :comment
-
- ##
- # The maximum age of the cookie
-
- attr_accessor :max_age
-
+ attr_accessor :value, :version
+ attr_accessor :domain, :path, :secure
+ attr_accessor :comment, :max_age
#attr_accessor :comment_url, :discard, :port
- ##
- # Creates a new cookie with the given +name+ and +value+
-
def initialize(name, value)
@name = name
@value = value
@@ -71,25 +29,14 @@ module WEBrick
@expires = @comment_url = @discard = @port = nil
end
- ##
- # Sets the cookie expiration to the time +t+. The expiration time may be
- # a false value to disable expiration or a Time or HTTP format time string
- # to set the expiration date.
-
def expires=(t)
@expires = t && (t.is_a?(Time) ? t.httpdate : t.to_s)
end
- ##
- # Retrieves the expiration time as a Time
-
def expires
@expires && Time.parse(@expires)
end
- ##
- # The cookie string suitable for use in an HTTP header
-
def to_s
ret = ""
ret << @name << "=" << @value
@@ -103,10 +50,8 @@ module WEBrick
ret
end
- ##
- # Parses a Cookie field sent from the user-agent. Returns an array of
- # cookies.
-
+ # Cookie::parse()
+ # It parses Cookie field sent from the user agent.
def self.parse(str)
if str
ret = []
@@ -131,9 +76,6 @@ module WEBrick
end
end
- ##
- # Parses the cookie in +str+
-
def self.parse_set_cookie(str)
cookie_elem = str.split(/;/)
first_elem = cookie_elem.shift
@@ -159,9 +101,6 @@ module WEBrick
return cookie
end
- ##
- # Parses the cookies in +str+
-
def self.parse_set_cookies(str)
return str.split(/,(?=[^;,]*=)|,$/).collect{|c|
parse_set_cookie(c)
diff --git a/lib/webrick/htmlutils.rb b/lib/webrick/htmlutils.rb
index 4cb3d0d7f6..cf8d542c09 100644
--- a/lib/webrick/htmlutils.rb
+++ b/lib/webrick/htmlutils.rb
@@ -1,4 +1,4 @@
-#--
+#
# htmlutils.rb -- HTMLUtils Module
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -11,17 +11,13 @@
module WEBrick
module HTMLUtils
- ##
- # Escapes &, ", > and < in +string+
-
def escape(string)
- return "" unless string
- str = string.b
+ str = string ? string.dup : ""
str.gsub!(/&/n, '&amp;')
str.gsub!(/\"/n, '&quot;')
str.gsub!(/>/n, '&gt;')
str.gsub!(/</n, '&lt;')
- str.force_encoding(string.encoding)
+ str
end
module_function :escape
diff --git a/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb
index 96d479b2d7..147c04021c 100644
--- a/lib/webrick/httpauth.rb
+++ b/lib/webrick/httpauth.rb
@@ -15,46 +15,10 @@ require 'webrick/httpauth/htdigest'
require 'webrick/httpauth/htgroup'
module WEBrick
-
- ##
- # HTTPAuth provides both basic and digest authentication.
- #
- # To enable authentication for requests in WEBrick you will need a user
- # database and an authenticator. To start, here's an Htpasswd database for
- # use with a DigestAuth authenticator:
- #
- # config = { :Realm => 'DigestAuth example realm' }
- #
- # htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file'
- # htpasswd.auth_type = WEBrick::HTTPAuth::DigestAuth
- # htpasswd.set_passwd config[:Realm], 'username', 'password'
- # htpasswd.flush
- #
- # The +:Realm+ is used to provide different access to different groups
- # across several resources on a server. Typically you'll need only one
- # realm for a server.
- #
- # This database can be used to create an authenticator:
- #
- # config[:UserDB] = htpasswd
- #
- # digest_auth = WEBrick::HTTPAuth::DigestAuth.new config
- #
- # To authenticate a request call #authenticate with a request and response
- # object in a servlet:
- #
- # def do_GET req, res
- # @authenticator.authenticate req, res
- # end
- #
- # For digest authentication the authenticator must not be created every
- # request, it must be passed in as an option via WEBrick::HTTPServer#mount.
-
module HTTPAuth
module_function
- def _basic_auth(req, res, realm, req_field, res_field, err_type,
- block) # :nodoc:
+ def _basic_auth(req, res, realm, req_field, res_field, err_type, block)
user = pass = nil
if /^Basic\s+(.*)/o =~ req[req_field]
userpass = $1
@@ -68,26 +32,12 @@ module WEBrick
raise err_type
end
- ##
- # Simple wrapper for providing basic authentication for a request. When
- # called with a request +req+, response +res+, authentication +realm+ and
- # +block+ the block will be called with a +username+ and +password+. If
- # the block returns true the request is allowed to continue, otherwise an
- # HTTPStatus::Unauthorized error is raised.
-
- def basic_auth(req, res, realm, &block) # :yield: username, password
+ def basic_auth(req, res, realm, &block)
_basic_auth(req, res, realm, "Authorization", "WWW-Authenticate",
HTTPStatus::Unauthorized, block)
end
- ##
- # Simple wrapper for providing basic authentication for a proxied request.
- # When called with a request +req+, response +res+, authentication +realm+
- # and +block+ the block will be called with a +username+ and +password+.
- # If the block returns true the request is allowed to continue, otherwise
- # an HTTPStatus::ProxyAuthenticationRequired error is raised.
-
- def proxy_basic_auth(req, res, realm, &block) # :yield: username, password
+ def proxy_basic_auth(req, res, realm, &block)
_basic_auth(req, res, realm, "Proxy-Authorization", "Proxy-Authenticate",
HTTPStatus::ProxyAuthenticationRequired, block)
end
diff --git a/lib/webrick/httpauth/authenticator.rb b/lib/webrick/httpauth/authenticator.rb
index f6d4ab844f..d93f12a97a 100644
--- a/lib/webrick/httpauth/authenticator.rb
+++ b/lib/webrick/httpauth/authenticator.rb
@@ -1,4 +1,4 @@
-#--
+#
# httpauth/authenticator.rb -- Authenticator mix-in module.
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -9,45 +9,17 @@
module WEBrick
module HTTPAuth
-
- ##
- # Module providing generic support for both Digest and Basic
- # authentication schemes.
-
module Authenticator
+ RequestField = "Authorization"
+ ResponseField = "WWW-Authenticate"
+ ResponseInfoField = "Authentication-Info"
+ AuthException = HTTPStatus::Unauthorized
+ AuthScheme = nil # must override by the derived class
- RequestField = "Authorization" # :nodoc:
- ResponseField = "WWW-Authenticate" # :nodoc:
- ResponseInfoField = "Authentication-Info" # :nodoc:
- AuthException = HTTPStatus::Unauthorized # :nodoc:
-
- ##
- # Method of authentication, must be overridden by the including class
-
- AuthScheme = nil
-
- ##
- # The realm this authenticator covers
-
- attr_reader :realm
-
- ##
- # The user database for this authenticator
-
- attr_reader :userdb
-
- ##
- # The logger for this authenticator
-
- attr_reader :logger
+ attr_reader :realm, :userdb, :logger
private
- # :stopdoc:
-
- ##
- # Initializes the authenticator from +config+
-
def check_init(config)
[:UserDB, :Realm].each{|sym|
unless config[sym]
@@ -65,9 +37,6 @@ module WEBrick
@auth_scheme = self::class::AuthScheme
end
- ##
- # Ensures +req+ has credentials that can be authenticated.
-
def check_scheme(req)
unless credentials = req[@request_field]
error("no credentials in the request.")
@@ -98,19 +67,13 @@ module WEBrick
log(:info, fmt, *args)
end
end
-
- # :startdoc:
end
- ##
- # Module providing generic support for both Digest and Basic
- # authentication schemes for proxies.
-
module ProxyAuthenticator
- RequestField = "Proxy-Authorization" # :nodoc:
- ResponseField = "Proxy-Authenticate" # :nodoc:
- InfoField = "Proxy-Authentication-Info" # :nodoc:
- AuthException = HTTPStatus::ProxyAuthenticationRequired # :nodoc:
+ RequestField = "Proxy-Authorization"
+ ResponseField = "Proxy-Authenticate"
+ InfoField = "Proxy-Authentication-Info"
+ AuthException = HTTPStatus::ProxyAuthenticationRequired
end
end
end
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb
index 3ff20b56d2..210fb00bbe 100644
--- a/lib/webrick/httpauth/basicauth.rb
+++ b/lib/webrick/httpauth/basicauth.rb
@@ -13,31 +13,10 @@ require 'webrick/httpauth/authenticator'
module WEBrick
module HTTPAuth
-
- ##
- # Basic Authentication for WEBrick
- #
- # Use this class to add basic authentication to a WEBrick servlet.
- #
- # Here is an example of how to set up a BasicAuth:
- #
- # config = { :Realm => 'BasicAuth example realm' }
- #
- # htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file'
- # htpasswd.set_passwd config[:Realm], 'username', 'password'
- # htpasswd.flush
- #
- # config[:UserDB] = htpasswd
- #
- # basic_auth = WEBrick::HTTPAuth::BasicAuth.new config
-
class BasicAuth
include Authenticator
- AuthScheme = "Basic" # :nodoc:
-
- ##
- # Used by UserDB to create a basic password entry
+ AuthScheme = "Basic"
def self.make_passwd(realm, user, pass)
pass ||= ""
@@ -46,26 +25,11 @@ module WEBrick
attr_reader :realm, :userdb, :logger
- ##
- # Creates a new BasicAuth instance.
- #
- # See WEBrick::Config::BasicAuth for default configuration entries
- #
- # You must supply the following configuration entries:
- #
- # :Realm:: The name of the realm being protected.
- # :UserDB:: A database of usernames and passwords.
- # A WEBrick::HTTPAuth::Htpasswd instance should be used.
-
def initialize(config, default=Config::BasicAuth)
check_init(config)
@config = default.dup.update(config)
end
- ##
- # Authenticates a +req+ and returns a 401 Unauthorized using +res+ if
- # the authentication was not correct.
-
def authenticate(req, res)
unless basic_credentials = check_scheme(req)
challenge(req, res)
@@ -88,19 +52,12 @@ module WEBrick
req.user = userid
end
- ##
- # Returns a challenge response which asks for for authentication
- # information
-
def challenge(req, res)
res[@response_field] = "#{@auth_scheme} realm=\"#{@realm}\""
raise @auth_exception
end
end
- ##
- # Basic authentication for proxy servers. See BasicAuth for details.
-
class ProxyBasicAuth < BasicAuth
include ProxyAuthenticator
end
diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb
index 78ad45b233..1c6942be8b 100644
--- a/lib/webrick/httpauth/digestauth.rb
+++ b/lib/webrick/httpauth/digestauth.rb
@@ -19,70 +19,18 @@ require 'digest/sha1'
module WEBrick
module HTTPAuth
-
- ##
- # RFC 2617 Digest Access Authentication for WEBrick
- #
- # Use this class to add digest authentication to a WEBrick servlet.
- #
- # Here is an example of how to set up DigestAuth:
- #
- # config = { :Realm => 'DigestAuth example realm' }
- #
- # htdigest = WEBrick::HTTPAuth::Htdigest.new 'my_password_file'
- # htdigest.set_passwd config[:Realm], 'username', 'password'
- # htdigest.flush
- #
- # config[:UserDB] = htdigest
- #
- # digest_auth = WEBrick::HTTPAuth::DigestAuth.new config
- #
- # When using this as with a servlet be sure not to create a new DigestAuth
- # object in the servlet's #initialize. By default WEBrick creates a new
- # servlet instance for every request and the DigestAuth object must be
- # used across requests.
-
class DigestAuth
include Authenticator
- AuthScheme = "Digest" # :nodoc:
-
- ##
- # Struct containing the opaque portion of the digest authentication
-
- OpaqueInfo = Struct.new(:time, :nonce, :nc) # :nodoc:
-
- ##
- # Digest authentication algorithm
-
- attr_reader :algorithm
-
- ##
- # Quality of protection. RFC 2617 defines "auth" and "auth-int"
-
- attr_reader :qop
-
- ##
- # Used by UserDB to create a digest password entry
+ AuthScheme = "Digest"
+ OpaqueInfo = Struct.new(:time, :nonce, :nc)
+ attr_reader :algorithm, :qop
def self.make_passwd(realm, user, pass)
pass ||= ""
Digest::MD5::hexdigest([user, realm, pass].join(":"))
end
- ##
- # Creates a new DigestAuth instance. Be sure to use the same DigestAuth
- # instance for multiple requests as it saves state between requests in
- # order to perform authentication.
- #
- # See WEBrick::Config::DigestAuth for default configuration entries
- #
- # You must supply the following configuration entries:
- #
- # :Realm:: The name of the realm being protected.
- # :UserDB:: A database of usernames and passwords.
- # A WEBrick::HTTPAuth::Htdigest instance should be used.
-
def initialize(config, default=Config::DigestAuth)
check_init(config)
@config = default.dup.update(config)
@@ -96,6 +44,7 @@ module WEBrick
@nonce_expire_period = @config[:NonceExpirePeriod]
@nonce_expire_delta = @config[:NonceExpireDelta]
@internet_explorer_hack = @config[:InternetExplorerHack]
+ @opera_hack = @config[:OperaHack]
case @algorithm
when 'MD5','MD5-sess'
@@ -113,10 +62,6 @@ module WEBrick
@mutex = Mutex.new
end
- ##
- # Authenticates a +req+ and returns a 401 Unauthorized using +res+ if
- # the authentication was not correct.
-
def authenticate(req, res)
unless result = @mutex.synchronize{ _authenticate(req, res) }
challenge(req, res)
@@ -127,10 +72,6 @@ module WEBrick
return true
end
- ##
- # Returns a challenge response which asks for for authentication
- # information
-
def challenge(req, res, stale=false)
nonce = generate_next_nonce(req)
if @use_opaque
@@ -155,8 +96,6 @@ module WEBrick
private
- # :stopdoc:
-
MustParams = ['username','realm','nonce','uri','response']
MustParamsAuth = ['cnonce','nc']
@@ -189,7 +128,8 @@ module WEBrick
end
auth_req['algorithm'] ||= 'MD5'
- if auth_req['algorithm'].upcase != @algorithm.upcase
+ if auth_req['algorithm'] != @algorithm &&
+ (@opera_hack && auth_req['algorithm'] != @algorithm.upcase)
error('%s: algorithm unmatch. "%s" for "%s"',
auth_req['username'], auth_req['algorithm'], @algorithm)
return false
@@ -225,7 +165,8 @@ module WEBrick
nonce_is_invalid = true
end
- if /-sess$/i =~ auth_req['algorithm']
+ if /-sess$/ =~ auth_req['algorithm'] ||
+ (@opera_hack && /-SESS$/ =~ auth_req['algorithm'])
ha1 = hexdigest(password, auth_req['nonce'], auth_req['cnonce'])
else
ha1 = password
@@ -390,17 +331,12 @@ module WEBrick
@h.hexdigest(args.join(":"))
end
- # :startdoc:
end
- ##
- # Digest authentication for proxy servers. See DigestAuth for details.
-
class ProxyDigestAuth < DigestAuth
include ProxyAuthenticator
- private
- def check_uri(req, auth_req) # :nodoc:
+ def check_uri(req, auth_req)
return true
end
end
diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb
index 4b74588c77..3949756f2b 100644
--- a/lib/webrick/httpauth/htdigest.rb
+++ b/lib/webrick/httpauth/htdigest.rb
@@ -13,26 +13,9 @@ require 'tempfile'
module WEBrick
module HTTPAuth
-
- ##
- # Htdigest accesses apache-compatible digest password files. Passwords are
- # matched to a realm where they are valid. For security, the path for a
- # digest password database should be stored outside of the paths available
- # to the HTTP server.
- #
- # Htdigest is intended for use with WEBrick::HTTPAuth::DigestAuth and
- # stores passwords using cryptographic hashes.
- #
- # htpasswd = WEBrick::HTTPAuth::Htdigest.new 'my_password_file'
- # htpasswd.set_passwd 'my realm', 'username', 'password'
- # htpasswd.flush
-
class Htdigest
include UserDB
- ##
- # Open a digest password database at +path+
-
def initialize(path)
@path = path
@mtime = Time.at(0)
@@ -43,9 +26,6 @@ module WEBrick
reload
end
- ##
- # Reloads passwords from the database
-
def reload
mtime = File::mtime(@path)
if mtime > @mtime
@@ -64,10 +44,6 @@ module WEBrick
end
end
- ##
- # Flush the password database. If +output+ is given the database will
- # be written there instead of to the original path.
-
def flush(output=nil)
output ||= @path
tmp = Tempfile.new("htpasswd", File::dirname(output))
@@ -80,10 +56,6 @@ module WEBrick
end
end
- ##
- # Retrieves a password from the database for +user+ in +realm+. If
- # +reload_db+ is true the database will be reloaded first.
-
def get_passwd(realm, user, reload_db)
reload() if reload_db
if hash = @digest[realm]
@@ -91,9 +63,6 @@ module WEBrick
end
end
- ##
- # Sets a password in the database for +user+ in +realm+ to +pass+.
-
def set_passwd(realm, user, pass)
@mutex.synchronize{
unless @digest[realm]
@@ -103,19 +72,13 @@ module WEBrick
}
end
- ##
- # Removes a password from the database for +user+ in +realm+.
-
def delete_passwd(realm, user)
if hash = @digest[realm]
hash.delete(user)
end
end
- ##
- # Iterate passwords in the database.
-
- def each # :yields: [user, realm, password_hash]
+ def each
@digest.keys.sort.each{|realm|
hash = @digest[realm]
hash.keys.sort.each{|user|
diff --git a/lib/webrick/httpauth/htgroup.rb b/lib/webrick/httpauth/htgroup.rb
index 0ecabef820..c9270c61cc 100644
--- a/lib/webrick/httpauth/htgroup.rb
+++ b/lib/webrick/httpauth/htgroup.rb
@@ -11,26 +11,7 @@ require 'tempfile'
module WEBrick
module HTTPAuth
-
- ##
- # Htgroup accesses apache-compatible group files. Htgroup can be used to
- # provide group-based authentication for users. Currently Htgroup is not
- # directly integrated with any authenticators in WEBrick. For security,
- # the path for a digest password database should be stored outside of the
- # paths available to the HTTP server.
- #
- # Example:
- #
- # htgroup = WEBrick::HTTPAuth::Htgroup.new 'my_group_file'
- # htgroup.add 'superheroes', %w[spiderman batman]
- #
- # htgroup.members('superheroes').include? 'magneto' # => false
-
class Htgroup
-
- ##
- # Open a group database at +path+
-
def initialize(path)
@path = path
@mtime = Time.at(0)
@@ -39,9 +20,6 @@ module WEBrick
reload
end
- ##
- # Reload groups from the database
-
def reload
if (mtime = File::mtime(@path)) > @mtime
@group.clear
@@ -56,10 +34,6 @@ module WEBrick
end
end
- ##
- # Flush the group database. If +output+ is given the database will be
- # written there instead of to the original path.
-
def flush(output=nil)
output ||= @path
tmp = Tempfile.new("htgroup", File::dirname(output))
@@ -74,17 +48,11 @@ module WEBrick
end
end
- ##
- # Retrieve the list of members from +group+
-
def members(group)
reload
@group[group] || []
end
- ##
- # Add an Array of +members+ to +group+
-
def add(group, members)
@group[group] = members(group) | members
end
diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb
index 205a6db2f0..8a058861d3 100644
--- a/lib/webrick/httpauth/htpasswd.rb
+++ b/lib/webrick/httpauth/htpasswd.rb
@@ -13,27 +13,9 @@ require 'tempfile'
module WEBrick
module HTTPAuth
-
- ##
- # Htpasswd accesses apache-compatible password files. Passwords are
- # matched to a realm where they are valid. For security, the path for a
- # password database should be stored outside of the paths available to the
- # HTTP server.
- #
- # Htpasswd is intended for use with WEBrick::HTTPAuth::BasicAuth.
- #
- # To create an Htpasswd database with a single user:
- #
- # htpasswd = WEBrick::HTTPAuth::Htpasswd.new 'my_password_file'
- # htpasswd.set_passwd 'my realm', 'username', 'password'
- # htpasswd.flush
-
class Htpasswd
include UserDB
- ##
- # Open a password database at +path+
-
def initialize(path)
@path = path
@mtime = Time.at(0)
@@ -43,9 +25,6 @@ module WEBrick
reload
end
- ##
- # Reload passwords from the database
-
def reload
mtime = File::mtime(@path)
if mtime > @mtime
@@ -69,10 +48,6 @@ module WEBrick
end
end
- ##
- # Flush the password database. If +output+ is given the database will
- # be written there instead of to the original path.
-
def flush(output=nil)
output ||= @path
tmp = Tempfile.new("htpasswd", File::dirname(output))
@@ -85,33 +60,20 @@ module WEBrick
end
end
- ##
- # Retrieves a password from the database for +user+ in +realm+. If
- # +reload_db+ is true the database will be reloaded first.
-
def get_passwd(realm, user, reload_db)
reload() if reload_db
@passwd[user]
end
- ##
- # Sets a password in the database for +user+ in +realm+ to +pass+.
-
def set_passwd(realm, user, pass)
@passwd[user] = make_passwd(realm, user, pass)
end
- ##
- # Removes a password from the database for +user+ in +realm+.
-
def delete_passwd(realm, user)
@passwd.delete(user)
end
- ##
- # Iterate passwords in the database.
-
- def each # :yields: [user, password]
+ def each
@passwd.keys.sort.each{|user|
yield([user, @passwd[user]])
}
diff --git a/lib/webrick/httpauth/userdb.rb b/lib/webrick/httpauth/userdb.rb
index 005c18dfd0..0285f89352 100644
--- a/lib/webrick/httpauth/userdb.rb
+++ b/lib/webrick/httpauth/userdb.rb
@@ -1,4 +1,4 @@
-#--
+#
# httpauth/userdb.rb -- UserDB mix-in module.
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -9,42 +9,19 @@
module WEBrick
module HTTPAuth
-
- ##
- # User database mixin for HTTPAuth. This mixin dispatches user record
- # access to the underlying auth_type for this database.
-
module UserDB
-
- ##
- # The authentication type.
- #
- # WEBrick::HTTPAuth::BasicAuth or WEBrick::HTTPAuth::DigestAuth are
- # built-in.
-
- attr_accessor :auth_type
-
- ##
- # Creates an obscured password in +realm+ with +user+ and +password+
- # using the auth_type of this database.
+ attr_accessor :auth_type # BasicAuth or DigestAuth
def make_passwd(realm, user, pass)
@auth_type::make_passwd(realm, user, pass)
end
- ##
- # Sets a password in +realm+ with +user+ and +password+ for the
- # auth_type of this database.
-
def set_passwd(realm, user, pass)
self[user] = pass
end
- ##
- # Retrieves a password in +realm+ for +user+ for the auth_type of this
- # database. +reload_db+ is a dummy value.
-
def get_passwd(realm, user, reload_db=false)
+ # reload_db is dummy
make_passwd(realm, user, self[user])
end
end
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index 7c34d33df0..ce99c55d8f 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -15,17 +15,16 @@ require "net/http"
Net::HTTP::version_1_2 if RUBY_VERSION < "1.7"
module WEBrick
-
- NullReader = Object.new # :nodoc:
- class << NullReader # :nodoc:
+ NullReader = Object.new
+ class << NullReader
def read(*args)
nil
end
alias gets read
end
- FakeProxyURI = Object.new # :nodoc:
- class << FakeProxyURI # :nodoc:
+ FakeProxyURI = Object.new
+ class << FakeProxyURI
def method_missing(meth, *args)
if %w(scheme host port path query userinfo).member?(meth.to_s)
return nil
@@ -34,61 +33,13 @@ module WEBrick
end
end
- # :startdoc:
-
- ##
- # An HTTP Proxy server which proxies GET, HEAD and POST requests.
- #
- # To create a simple proxy server:
- #
- # require 'webrick'
- # require 'webrick/httpproxy'
- #
- # proxy = WEBrick::HTTPProxyServer.new Port: 8000
- #
- # trap 'INT' do proxy.shutdown end
- # trap 'TERM' do proxy.shutdown end
- #
- # proxy.start
- #
- # See ::new for proxy-specific configuration items.
- #
- # == Modifying proxied responses
- #
- # To modify content the proxy server returns use the +:ProxyContentHandler+
- # option:
- #
- # handler = proc do |req, res|
- # if res['content-type'] == 'text/plain' then
- # res.body << "\nThis content was proxied!\n"
- # end
- # end
- #
- # proxy =
- # WEBrick::HTTPProxyServer.new Port: 8000, ProxyContentHandler: handler
-
class HTTPProxyServer < HTTPServer
-
- ##
- # Proxy server configurations. The proxy server handles the following
- # configuration items in addition to those supported by HTTPServer:
- #
- # :ProxyAuthProc:: Called with a request and response to authorize a
- # request
- # :ProxyVia:: Appended to the via header
- # :ProxyURI:: The proxy server's URI
- # :ProxyContentHandler:: Called with a request and response and allows
- # modification of the response
- # :ProxyTimeout:: Sets the proxy timeouts to 30 seconds for open and 60
- # seconds for read operations
-
def initialize(config={}, default=Config::HTTP)
super(config, default)
c = @config
@via = "#{c[:HTTPVersion]} #{c[:ServerName]}:#{c[:Port]}"
end
- # :stopdoc:
def service(req, res)
if req.request_method == "CONNECT"
do_CONNECT(req, res)
@@ -186,7 +137,7 @@ module WEBrick
res.send_response(ua)
access_log(@config, req, res)
- # Should clear request-line not to send the response twice.
+ # Should clear request-line not to send the sesponse twice.
# see: HTTPServer#run
req.parse(NullReader) rescue nil
end
@@ -333,7 +284,5 @@ module WEBrick
set_via(res)
res.body = response.body
end
-
- # :stopdoc:
end
end
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index 76420730b1..96f97340ae 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -15,139 +15,29 @@ require 'webrick/httputils'
require 'webrick/cookie'
module WEBrick
-
- ##
- # An HTTP request. This is consumed by service and do_* methods in
- # WEBrick servlets
-
class HTTPRequest
+ BODY_CONTAINABLE_METHODS = [ "POST", "PUT" ]
- BODY_CONTAINABLE_METHODS = [ "POST", "PUT" ] # :nodoc:
-
- # :section: Request line
-
- ##
- # The complete request line such as:
- #
- # GET / HTTP/1.1
-
+ # Request line
attr_reader :request_line
+ attr_reader :request_method, :unparsed_uri, :http_version
- ##
- # The request method, GET, POST, PUT, etc.
-
- attr_reader :request_method
-
- ##
- # The unparsed URI of the request
-
- attr_reader :unparsed_uri
-
- ##
- # The HTTP version of the request
-
- attr_reader :http_version
-
- # :section: Request-URI
-
- ##
- # The parsed URI of the request
-
- attr_reader :request_uri
-
- ##
- # The request path
-
- attr_reader :path
-
- ##
- # The script name (CGI variable)
-
- attr_accessor :script_name
-
- ##
- # The path info (CGI variable)
-
- attr_accessor :path_info
+ # Request-URI
+ attr_reader :request_uri, :path
+ attr_accessor :script_name, :path_info, :query_string
- ##
- # The query from the URI of the request
-
- attr_accessor :query_string
-
- # :section: Header and entity body
-
- ##
- # The raw header of the request
-
- attr_reader :raw_header
-
- ##
- # The parsed header of the request
-
- attr_reader :header
-
- ##
- # The parsed request cookies
-
- attr_reader :cookies
-
- ##
- # The Accept header value
-
- attr_reader :accept
-
- ##
- # The Accept-Charset header value
-
- attr_reader :accept_charset
-
- ##
- # The Accept-Encoding header value
-
- attr_reader :accept_encoding
-
- ##
- # The Accept-Language header value
-
- attr_reader :accept_language
-
- # :section:
-
- ##
- # The remote user (CGI variable)
+ # Header and entity body
+ attr_reader :raw_header, :header, :cookies
+ attr_reader :accept, :accept_charset
+ attr_reader :accept_encoding, :accept_language
+ # Misc
attr_accessor :user
-
- ##
- # The socket address of the server
-
- attr_reader :addr
-
- ##
- # The socket address of the client
-
- attr_reader :peeraddr
-
- ##
- # Hash of request attributes
-
+ attr_reader :addr, :peeraddr
attr_reader :attributes
-
- ##
- # Is this a keep-alive connection?
-
attr_reader :keep_alive
-
- ##
- # The local time this request was received
-
attr_reader :request_time
- ##
- # Creates a new HTTP request. WEBrick::Config::HTTP is the default
- # configuration.
-
def initialize(config)
@config = config
@buffer_size = @config[:InputBufferSize]
@@ -184,10 +74,6 @@ module WEBrick
@forwarded_server = @forwarded_for = nil
end
- ##
- # Parses a request from +socket+. This is called internally by
- # WEBrick::HTTPServer.
-
def parse(socket=nil)
@socket = socket
begin
@@ -236,29 +122,12 @@ module WEBrick
end
end
- ##
- # Generate HTTP/1.1 100 continue response if the client expects it,
- # otherwise does nothing.
-
- def continue # :nodoc:
- if self['expect'] == '100-continue' && @config[:HTTPVersion] >= "1.1"
- @socket << "HTTP/#{@config[:HTTPVersion]} 100 continue#{CRLF}#{CRLF}"
- @header.delete('expect')
- end
- end
-
- ##
- # Returns the request body.
-
- def body(&block) # :yields: body_chunk
+ def body(&block)
block ||= Proc.new{|chunk| @body << chunk }
read_body(@socket, block)
@body.empty? ? nil : @body
end
- ##
- # Request query as a Hash
-
def query
unless @query
parse_query()
@@ -266,23 +135,14 @@ module WEBrick
@query
end
- ##
- # The content-length header
-
def content_length
return Integer(self['content-length'])
end
- ##
- # The content-type header
-
def content_type
return self['content-type']
end
- ##
- # Retrieves +header_name+
-
def [](header_name)
if @header
value = @header[header_name.downcase]
@@ -290,61 +150,38 @@ module WEBrick
end
end
- ##
- # Iterates over the request headers
-
def each
- if @header
- @header.each{|k, v|
- value = @header[k]
- yield(k, value.empty? ? nil : value.join(", "))
- }
- end
+ @header.each{|k, v|
+ value = @header[k]
+ yield(k, value.empty? ? nil : value.join(", "))
+ }
end
- ##
- # The host this request is for
-
def host
return @forwarded_host || @host
end
- ##
- # The port this request is for
-
def port
return @forwarded_port || @port
end
- ##
- # The server name this request is for
-
def server_name
return @forwarded_server || @config[:ServerName]
end
- ##
- # The client's IP address
-
def remote_ip
return self["client-ip"] || @forwarded_for || @peeraddr[3]
end
- ##
- # Is this an SSL request?
-
def ssl?
return @request_uri.scheme == "https"
end
- ##
- # Should the connection this request was made on be kept alive?
-
def keep_alive?
@keep_alive
end
- def to_s # :nodoc:
+ def to_s
ret = @request_line.dup
@raw_header.each{|line| ret << line }
ret << CRLF
@@ -352,14 +189,11 @@ module WEBrick
ret
end
- ##
- # Consumes any remaining body and updates keep-alive status
-
- def fixup() # :nodoc:
+ def fixup()
begin
body{|chunk| } # read remaining body
rescue HTTPStatus::Error => ex
- @logger.error("HTTPRequest#fixup: #{ex.class} occurred.")
+ @logger.error("HTTPRequest#fixup: #{ex.class} occured.")
@keep_alive = false
rescue => ex
@logger.error(ex)
@@ -367,11 +201,11 @@ module WEBrick
end
end
- # This method provides the metavariables defined by the revision 3
- # of "The WWW Common Gateway Interface Version 1.1"
- # http://Web.Golux.Com/coar/cgi/
-
def meta_vars
+ # This method provides the metavariables defined by the revision 3
+ # of ``The WWW Common Gateway Interface Version 1.1''.
+ # (http://Web.Golux.Com/coar/cgi/)
+
meta = Hash.new
cl = self["Content-Length"]
@@ -408,13 +242,9 @@ module WEBrick
private
- # :stopdoc:
-
- MAX_URI_LENGTH = 2083 # :nodoc:
-
def read_request_line(socket)
- @request_line = read_line(socket, MAX_URI_LENGTH) if socket
- if @request_line.bytesize >= MAX_URI_LENGTH and @request_line[-1, 1] != LF
+ @request_line = read_line(socket, 1024) if socket
+ if @request_line.bytesize >= 1024 and @request_line[-1, 1] != LF
raise HTTPStatus::RequestURITooLarge
end
@request_time = Time.now
@@ -443,7 +273,6 @@ module WEBrick
if @config[:Escape8bitURI]
str = HTTPUtils::escape8bit(str)
end
- str.sub!(%r{\A/+}o, '/')
uri = URI::parse(str)
return uri if uri.absolute?
if @forwarded_host
@@ -577,7 +406,5 @@ module WEBrick
@forwarded_for = addrs.first
end
end
-
- # :startdoc:
end
end
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb
index 8e3eb39a31..16bf15b6dd 100644
--- a/lib/webrick/httpresponse.rb
+++ b/lib/webrick/httpresponse.rb
@@ -15,81 +15,16 @@ require 'webrick/httputils'
require 'webrick/httpstatus'
module WEBrick
- ##
- # An HTTP response. This is filled in by the service or do_* methods of a
- # WEBrick HTTP Servlet.
-
class HTTPResponse
-
- ##
- # HTTP Response version
-
- attr_reader :http_version
-
- ##
- # Response status code (200)
-
- attr_reader :status
-
- ##
- # Response header
-
- attr_reader :header
-
- ##
- # Response cookies
-
+ attr_reader :http_version, :status, :header
attr_reader :cookies
-
- ##
- # Response reason phrase ("OK")
-
attr_accessor :reason_phrase
-
- ##
- # Body may be a String or IO subclass.
-
attr_accessor :body
- ##
- # Request method for this response
-
- attr_accessor :request_method
-
- ##
- # Request URI for this response
-
- attr_accessor :request_uri
-
- ##
- # Request HTTP version for this response
-
- attr_accessor :request_http_version
-
- ##
- # Filename of the static file in this response. Only used by the
- # FileHandler servlet.
-
+ attr_accessor :request_method, :request_uri, :request_http_version
attr_accessor :filename
-
- ##
- # Is this a keep-alive response?
-
attr_accessor :keep_alive
-
- ##
- # Configuration for this response
-
- attr_reader :config
-
- ##
- # Bytes sent in this response
-
- attr_reader :sent_size
-
- ##
- # Creates a new HTTP response object. WEBrick::Config::HTTP is the
- # default configuration.
+ attr_reader :config, :sent_size
def initialize(config)
@config = config
@@ -110,97 +45,58 @@ module WEBrick
@sent_size = 0
end
- ##
- # The response's HTTP status line
-
def status_line
"HTTP/#@http_version #@status #@reason_phrase #{CRLF}"
end
- ##
- # Sets the response's status to the +status+ code
-
def status=(status)
@status = status
@reason_phrase = HTTPStatus::reason_phrase(status)
end
- ##
- # Retrieves the response header +field+
-
def [](field)
@header[field.downcase]
end
- ##
- # Sets the response header +field+ to +value+
-
def []=(field, value)
@header[field.downcase] = value.to_s
end
- ##
- # The content-length header
-
def content_length
if len = self['content-length']
return Integer(len)
end
end
- ##
- # Sets the content-length header to +len+
-
def content_length=(len)
self['content-length'] = len.to_s
end
- ##
- # The content-type header
-
def content_type
self['content-type']
end
- ##
- # Sets the content-type header to +type+
-
def content_type=(type)
self['content-type'] = type
end
- ##
- # Iterates over each header in the resopnse
-
def each
- @header.each{|field, value| yield(field, value) }
+ @header.each{|k, v| yield(k, v) }
end
- ##
- # Will this response body be returned using chunked transfer-encoding?
-
def chunked?
@chunked
end
- ##
- # Enables chunked transfer encoding.
-
def chunked=(val)
@chunked = val ? true : false
end
- ##
- # Will this response's connection be kept alive?
-
def keep_alive?
@keep_alive
end
- ##
- # Sends the response on +socket+
-
- def send_response(socket) # :nodoc:
+ def send_response(socket)
begin
setup_header()
send_header(socket)
@@ -214,10 +110,7 @@ module WEBrick
end
end
- ##
- # Sets up the headers for sending
-
- def setup_header() # :nodoc:
+ def setup_header()
@reason_phrase ||= HTTPStatus::reason_phrase(@status)
@header['server'] ||= @config[:ServerSoftware]
@header['date'] ||= Time.now.httpdate
@@ -257,13 +150,8 @@ module WEBrick
if @header['connection'] == "close"
@keep_alive = false
elsif keep_alive?
- if chunked? || @header['content-length'] || @status == 304 || @status == 204 || HTTPStatus.info?(@status)
+ if chunked? || @header['content-length']
@header['connection'] = "Keep-Alive"
- else
- msg = "Could not determine content-length of response body. Set content-length of the response or set Response#chunked = true"
- @logger.warn(msg)
- @header['connection'] = "close"
- @keep_alive = false
end
else
@header['connection'] = "close"
@@ -277,10 +165,7 @@ module WEBrick
end
end
- ##
- # Sends the headers on +socket+
-
- def send_header(socket) # :nodoc:
+ def send_header(socket)
if @http_version.major > 0
data = status_line()
@header.each{|key, value|
@@ -295,38 +180,25 @@ module WEBrick
end
end
- ##
- # Sends the body on +socket+
-
- def send_body(socket) # :nodoc:
+ def send_body(socket)
case @body
when IO then send_body_io(socket)
else send_body_string(socket)
end
end
- def to_s # :nodoc:
+ def to_s
ret = ""
send_response(ret)
ret
end
- ##
- # Redirects to +url+ with a WEBrick::HTTPStatus::Redirect +status+.
- #
- # Example:
- #
- # res.set_redirect WEBrick::HTTPStatus::TemporaryRedirect
-
def set_redirect(status, url)
@body = "<HTML><A HREF=\"#{url.to_s}\">#{url.to_s}</A>.</HTML>\n"
@header['location'] = url.to_s
raise status
end
- ##
- # Creates an error page for exception +ex+ with an optional +backtrace+
-
def set_error(ex, backtrace=false)
case ex
when HTTPStatus::Status
@@ -380,25 +252,18 @@ module WEBrick
private
- # :stopdoc:
-
def send_body_io(socket)
begin
if @request_method == "HEAD"
# do nothing
elsif chunked?
- begin
- buf = ''
- data = ''
- while true
- @body.readpartial( @buffer_size, buf ) # there is no need to clear buf?
- data << format("%x", buf.bytesize) << CRLF
- data << buf << CRLF
- _write_data(socket, data)
- data.clear
- @sent_size += buf.bytesize
- end
- rescue EOFError # do nothing
+ while buf = @body.read(@buffer_size)
+ next if buf.empty?
+ data = ""
+ data << format("%x", buf.bytesize) << CRLF
+ data << buf << CRLF
+ _write_data(socket, data)
+ @sent_size += buf.bytesize
end
_write_data(socket, "0#{CRLF}#{CRLF}")
else
@@ -415,7 +280,7 @@ module WEBrick
if @request_method == "HEAD"
# do nothing
elsif chunked?
- body ? @body.bytesize : 0
+ remain = body ? @body.bytesize : 0
while buf = @body[@sent_size, @buffer_size]
break if buf.empty?
data = ""
@@ -457,8 +322,5 @@ module WEBrick
def _write_data(socket, data)
socket << data
end
-
- # :startdoc:
end
-
end
diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb
index 9194f9411c..dd9d178618 100644
--- a/lib/webrick/https.rb
+++ b/lib/webrick/https.rb
@@ -15,28 +15,8 @@ module WEBrick
HTTP.update(SSL)
end
- ##
- #--
- # Adds SSL functionality to WEBrick::HTTPRequest
-
class HTTPRequest
-
- ##
- # HTTP request SSL cipher
-
- attr_reader :cipher
-
- ##
- # HTTP request server certificate
-
- attr_reader :server_cert
-
- ##
- # HTTP request client certificate
-
- attr_reader :client_cert
-
- # :stopdoc:
+ attr_reader :cipher, :server_cert, :client_cert
alias orig_parse parse
@@ -58,7 +38,6 @@ module WEBrick
end
return orig_parse_uri(str)
end
- private :parse_uri
alias orig_meta_vars meta_vars
@@ -80,7 +59,5 @@ module WEBrick
end
meta
end
-
- # :startdoc:
end
end
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index 7a7b931dad..929d856a4a 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -19,28 +19,7 @@ require 'webrick/accesslog'
module WEBrick
class HTTPServerError < ServerError; end
- ##
- # An HTTP Server
-
class HTTPServer < ::WEBrick::GenericServer
- ##
- # Creates a new HTTP server according to +config+
- #
- # An HTTP server uses the following attributes:
- #
- # :AccessLog:: An array of access logs. See WEBrick::AccessLog
- # :BindAddress:: Local address for the server to bind to
- # :DocumentRoot:: Root path to serve files from
- # :DocumentRootOptions:: Options for the default HTTPServlet::FileHandler
- # :HTTPVersion:: The HTTP version of this server
- # :Port:: Port to listen on
- # :RequestCallback:: Called with a request and response before each
- # request is serviced.
- # :RequestTimeout:: Maximum time to wait between requests
- # :ServerAlias:: Array of alternate names for this server for virtual
- # hosting
- # :ServerName:: Name for this server for virtual hosting
-
def initialize(config={}, default=Config::HTTP)
super(config, default)
@http_version = HTTPVersion::convert(@config[:HTTPVersion])
@@ -61,9 +40,6 @@ module WEBrick
@virtual_hosts = Array.new
end
- ##
- # Processes requests on +sock+
-
def run(sock)
while true
res = HTTPResponse.new(@config)
@@ -117,9 +93,6 @@ module WEBrick
end
end
- ##
- # Services +req+ and fills in +res+
-
def service(req, res)
if req.unparsed_uri == "*"
if req.request_method == "OPTIONS"
@@ -138,45 +111,27 @@ module WEBrick
si.service(req, res)
end
- ##
- # The default OPTIONS request handler says GET, HEAD, POST and OPTIONS
- # requests are allowed.
-
def do_OPTIONS(req, res)
res["allow"] = "GET,HEAD,POST,OPTIONS"
end
- ##
- # Mounts +servlet+ on +dir+ passing +options+ to the servlet at creation
- # time
-
def mount(dir, servlet, *options)
@logger.debug(sprintf("%s is mounted on %s.", servlet.inspect, dir))
@mount_tab[dir] = [ servlet, options ]
end
- ##
- # Mounts +proc+ or +block+ on +dir+ and calls it with a
- # WEBrick::HTTPRequest and WEBrick::HTTPResponse
-
def mount_proc(dir, proc=nil, &block)
proc ||= block
raise HTTPServerError, "must pass a proc or block" unless proc
mount(dir, HTTPServlet::ProcHandler.new(proc))
end
- ##
- # Unmounts +dir+
-
def unmount(dir)
@logger.debug(sprintf("unmount %s.", dir))
@mount_tab.delete(dir)
end
alias umount unmount
- ##
- # Finds a servlet for +path+
-
def search_servlet(path)
script_name, path_info = @mount_tab.scan(path)
servlet, options = @mount_tab[script_name]
@@ -185,9 +140,6 @@ module WEBrick
end
end
- ##
- # Adds +server+ as a virtual host.
-
def virtual_host(server)
@virtual_hosts << server
@virtual_hosts = @virtual_hosts.sort_by{|s|
@@ -199,9 +151,6 @@ module WEBrick
}
end
- ##
- # Finds the appropriate virtual host to handle +req+
-
def lookup_server(req)
@virtual_hosts.find{|s|
(s[:BindAddress].nil? || req.addr[3] == s[:BindAddress]) &&
@@ -211,10 +160,6 @@ module WEBrick
}
end
- ##
- # Logs +req+ and +res+ in the access logs. +config+ is used for the
- # server name.
-
def access_log(config, req, res)
param = AccessLog::setup_params(config, req, res)
@config[:AccessLog].each{|logger, fmt|
@@ -222,13 +167,7 @@ module WEBrick
}
end
- ##
- # Mount table for the path a servlet is mounted on in the directory space
- # of the server. Users of WEBrick can only access this indirectly via
- # WEBrick::HTTPServer#mount, WEBrick::HTTPServer#unmount and
- # WEBrick::HTTPServer#search_servlet
-
- class MountTable # :nodoc:
+ class MountTable
def initialize
@tab = Hash.new
compile
diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
index d3b00ab4e1..f8bf14a330 100644
--- a/lib/webrick/httpservlet/abstract.rb
+++ b/lib/webrick/httpservlet/abstract.rb
@@ -18,88 +18,17 @@ module WEBrick
module HTTPServlet
class HTTPServletError < StandardError; end
- ##
- # AbstractServlet allows HTTP server modules to be reused across multiple
- # servers and allows encapsulation of functionality.
- #
- # By default a servlet will respond to GET, HEAD (through an alias to GET)
- # and OPTIONS requests.
- #
- # By default a new servlet is initialized for every request. A servlet
- # instance can be reused by overriding ::get_instance in the
- # AbstractServlet subclass.
- #
- # == A Simple Servlet
- #
- # class Simple < WEBrick::HTTPServlet::AbstractServlet
- # def do_GET request, response
- # status, content_type, body = do_stuff_with request
- #
- # response.status = status
- # response['Content-Type'] = content_type
- # response.body = body
- # end
- #
- # def do_stuff_with request
- # return 200, 'text/plain', 'you got a page'
- # end
- # end
- #
- # This servlet can be mounted on a server at a given path:
- #
- # server.mount '/simple', Simple
- #
- # == Servlet Configuration
- #
- # Servlets can be configured via initialize. The first argument is the
- # HTTP server the servlet is being initialized for.
- #
- # class Configurable < Simple
- # def initialize server, color, size
- # super server
- # @color = color
- # @size = size
- # end
- #
- # def do_stuff_with request
- # content = "<p " \
- # %q{style="color: #{@color}; font-size: #{@size}"} \
- # ">Hello, World!"
- #
- # return 200, "text/html", content
- # end
- # end
- #
- # This servlet must be provided two arguments at mount time:
- #
- # server.mount '/configurable', Configurable, 'red', '2em'
-
class AbstractServlet
-
- ##
- # Factory for servlet instances that will handle a request from +server+
- # using +options+ from the mount point. By default a new servlet
- # instance is created for every call.
-
- def self.get_instance(server, *options)
- self.new(server, *options)
+ def self.get_instance(config, *options)
+ self.new(config, *options)
end
- ##
- # Initializes a new servlet for +server+ using +options+ which are
- # stored as-is in +@options+. +@logger+ is also provided.
-
def initialize(server, *options)
@server = @config = server
@logger = @server[:Logger]
@options = options
end
- ##
- # Dispatches to a +do_+ method based on +req+ if such a method is
- # available. (+do_GET+ for a GET request). Raises a MethodNotAllowed
- # exception if the method is not implemented.
-
def service(req, res)
method_name = "do_" + req.request_method.gsub(/-/, "_")
if respond_to?(method_name)
@@ -110,23 +39,14 @@ module WEBrick
end
end
- ##
- # Raises a NotFound exception
-
def do_GET(req, res)
raise HTTPStatus::NotFound, "not found."
end
- ##
- # Dispatches to do_GET
-
def do_HEAD(req, res)
do_GET(req, res)
end
- ##
- # Returns the allowed HTTP request methods
-
def do_OPTIONS(req, res)
m = self.methods.grep(/\Ado_([A-Z]+)\z/) {$1}
m.sort!
@@ -135,9 +55,6 @@ module WEBrick
private
- ##
- # Redirects to a path ending in /
-
def redirect_to_directory_uri(req, res)
if req.path[-1] != ?/
location = WEBrick::HTTPUtils.escape_path(req.path + "/")
diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb
index 32ecb6fe00..dd7325d25c 100644
--- a/lib/webrick/httpservlet/cgi_runner.rb
+++ b/lib/webrick/httpservlet/cgi_runner.rb
@@ -20,6 +20,7 @@ end
STDIN.binmode
+buf = ""
len = sysread(STDIN, 8).to_i
out = sysread(STDIN, len)
STDOUT.reopen(open(out, "w"))
@@ -37,7 +38,7 @@ hash.each{|k, v| ENV[k] = v if v }
dir = File::dirname(ENV["SCRIPT_FILENAME"])
Dir::chdir dir
-if ARGV[0]
+if interpreter = ARGV[0]
argv = ARGV.dup
argv << ENV["SCRIPT_FILENAME"]
exec(*argv)
diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb
index 7c012ca64b..1976ae6948 100644
--- a/lib/webrick/httpservlet/cgihandler.rb
+++ b/lib/webrick/httpservlet/cgihandler.rb
@@ -16,20 +16,9 @@ require 'webrick/httpservlet/abstract'
module WEBrick
module HTTPServlet
- ##
- # Servlet for handling CGI scripts
- #
- # Example:
- #
- # server.mount('/cgi/my_script', WEBrick::HTTPServlet::CGIHandler,
- # '/path/to/my_script')
-
class CGIHandler < AbstractServlet
- Ruby = RbConfig.ruby # :nodoc:
- CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" # :nodoc:
-
- ##
- # Creates a new CGI script servlet for the script at +name+
+ Ruby = RbConfig.ruby
+ CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\""
def initialize(server, name)
super(server, name)
@@ -38,8 +27,6 @@ module WEBrick
@cgicmd = "#{CGIRunner} #{server[:CGIInterpreter]}"
end
- # :stopdoc:
-
def do_GET(req, res)
data = nil
status = -1
@@ -115,8 +102,6 @@ module WEBrick
res.body = body
end
alias do_POST do_GET
-
- # :startdoc:
end
end
diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb
index 34b4b9e68b..845db07169 100644
--- a/lib/webrick/httpservlet/erbhandler.rb
+++ b/lib/webrick/httpservlet/erbhandler.rb
@@ -15,37 +15,12 @@ require 'erb'
module WEBrick
module HTTPServlet
- ##
- # ERBHandler evaluates an ERB file and returns the result. This handler
- # is automatically used if there are .rhtml files in a directory served by
- # the FileHandler.
- #
- # ERBHandler supports GET and POST methods.
- #
- # The ERB file is evaluated with the local variables +servlet_request+ and
- # +servlet_response+ which are a WEBrick::HTTPRequest and
- # WEBrick::HTTPResponse respectively.
- #
- # Example .rhtml file:
- #
- # Request to <%= servlet_request.request_uri %>
- #
- # Query params <%= servlet_request.query.inspect %>
-
class ERBHandler < AbstractServlet
-
- ##
- # Creates a new ERBHandler on +server+ that will evaluate and serve the
- # ERB file +name+
-
def initialize(server, name)
super(server, name)
@script_filename = name
end
- ##
- # Handles GET requests
-
def do_GET(req, res)
unless defined?(ERB)
@logger.warn "#{self.class}: ERB not defined."
@@ -54,7 +29,7 @@ module WEBrick
begin
data = open(@script_filename){|io| io.read }
res.body = evaluate(ERB.new(data), req, res)
- res['content-type'] ||=
+ res['content-type'] =
HTTPUtils::mime_type(@script_filename, @config[:MimeTypes])
rescue StandardError => ex
raise
@@ -64,21 +39,13 @@ module WEBrick
end
end
- ##
- # Handles POST requests
-
alias do_POST do_GET
private
-
- ##
- # Evaluates +erb+ providing +servlet_request+ and +servlet_response+ as
- # local variables.
-
def evaluate(erb, servlet_request, servlet_response)
Module.new.module_eval{
- servlet_request.meta_vars
- servlet_request.query
+ meta_vars = servlet_request.meta_vars
+ query = servlet_request.query
erb.result(binding)
}
end
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index d8c66dfdc3..daad8abd27 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -18,29 +18,12 @@ require 'webrick/httpstatus'
module WEBrick
module HTTPServlet
- ##
- # Servlet for serving a single file. You probably want to use the
- # FileHandler servlet instead as it handles directories and fancy indexes.
- #
- # Example:
- #
- # server.mount('/my_page.txt', WEBrick::HTTPServlet::DefaultFileHandler,
- # '/path/to/my_page.txt')
- #
- # This servlet handles If-Modified-Since and Range requests.
-
class DefaultFileHandler < AbstractServlet
-
- ##
- # Creates a DefaultFileHandler instance for the file at +local_path+.
-
def initialize(server, local_path)
super(server, local_path)
@local_path = local_path
end
- # :stopdoc:
-
def do_GET(req, res)
st = File::stat(@local_path)
mtime = st.mtime
@@ -140,46 +123,19 @@ module WEBrick
last = filesize - 1 if last >= filesize
return first, last
end
-
- # :startdoc:
end
- ##
- # Serves a directory including fancy indexing and a variety of other
- # options.
- #
- # Example:
- #
- # server.mount '/assets', WEBrick::FileHandler, '/path/to/assets'
-
class FileHandler < AbstractServlet
- HandlerTable = Hash.new # :nodoc:
-
- ##
- # Allow custom handling of requests for files with +suffix+ by class
- # +handler+
+ HandlerTable = Hash.new
def self.add_handler(suffix, handler)
HandlerTable[suffix] = handler
end
- ##
- # Remove custom handling of requests for files with +suffix+
-
def self.remove_handler(suffix)
HandlerTable.delete(suffix)
end
- ##
- # Creates a FileHandler servlet on +server+ that serves files starting
- # at directory +root+
- #
- # +options+ may be a Hash containing keys from
- # WEBrick::Config::FileHandler or +true+ or +false+.
- #
- # If +options+ is true or false then +:FancyIndexing+ is enabled or
- # disabled respectively.
-
def initialize(server, root, options={}, default=Config::FileHandler)
@config = server.config
@logger = @config[:Logger]
@@ -190,8 +146,6 @@ module WEBrick
@options = default.dup.update(options)
end
- # :stopdoc:
-
def service(req, res)
# if this class is mounted on "/" and /~username is requested.
# we're going to override path informations before invoking service.
@@ -480,7 +434,6 @@ module WEBrick
_end_of_html_
end
- # :startdoc:
end
end
end
diff --git a/lib/webrick/httpservlet/prochandler.rb b/lib/webrick/httpservlet/prochandler.rb
index 2f5aa66f45..2be3c854c1 100644
--- a/lib/webrick/httpservlet/prochandler.rb
+++ b/lib/webrick/httpservlet/prochandler.rb
@@ -13,19 +13,7 @@ require 'webrick/httpservlet/abstract.rb'
module WEBrick
module HTTPServlet
- ##
- # Mounts a proc at a path that accepts a request and response.
- #
- # Instead of mounting this servlet with WEBrick::HTTPServer#mount use
- # WEBrick::HTTPServer#mount_proc:
- #
- # server.mount_proc '/' do |req, res|
- # res.body = 'it worked!'
- # res.status = 200
- # end
-
class ProcHandler < AbstractServlet
- # :stopdoc:
def get_instance(server, *options)
self
end
@@ -39,7 +27,6 @@ module WEBrick
end
alias do_POST do_GET
- # :startdoc:
end
end
diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb
index afc8e75a47..a49be32be9 100644
--- a/lib/webrick/httpstatus.rb
+++ b/lib/webrick/httpstatus.rb
@@ -1,4 +1,4 @@
-#--
+#
# httpstatus.rb -- HTTPStatus Class
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -10,50 +10,30 @@
module WEBrick
- ##
- # This module is used to manager HTTP status codes.
- #
- # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for more
- # information.
module HTTPStatus
- ##
- # Root of the HTTP status class hierarchy
class Status < StandardError
- def initialize(*args) # :nodoc:
+ def initialize(*args)
args[0] = AccessLog.escape(args[0]) unless args.empty?
super(*args)
end
class << self
- attr_reader :code, :reason_phrase # :nodoc:
+ attr_reader :code, :reason_phrase
end
-
- # Returns the HTTP status code
def code() self::class::code end
-
- # Returns the HTTP status description
def reason_phrase() self::class::reason_phrase end
-
- alias to_i code # :nodoc:
+ alias to_i code
end
-
- # Root of the HTTP info statuses
class Info < Status; end
- # Root of the HTTP sucess statuses
class Success < Status; end
- # Root of the HTTP redirect statuses
class Redirect < Status; end
- # Root of the HTTP error statuses
class Error < Status; end
- # Root of the HTTP client error statuses
class ClientError < Error; end
- # Root of the HTTP server error statuses
class ServerError < Error; end
class EOFError < StandardError; end
- # HTTP status codes and descriptions
- StatusMessage = { # :nodoc:
+ StatusMessage = {
100 => 'Continue',
101 => 'Switching Protocols',
200 => 'OK',
@@ -63,7 +43,6 @@ module WEBrick
204 => 'No Content',
205 => 'Reset Content',
206 => 'Partial Content',
- 207 => 'Multi-Status',
300 => 'Multiple Choices',
301 => 'Moved Permanently',
302 => 'Found',
@@ -89,28 +68,16 @@ module WEBrick
415 => 'Unsupported Media Type',
416 => 'Request Range Not Satisfiable',
417 => 'Expectation Failed',
- 422 => 'Unprocessable Entity',
- 423 => 'Locked',
- 424 => 'Failed Dependency',
- 426 => 'Upgrade Required',
- 428 => 'Precondition Required',
- 429 => 'Too Many Requests',
- 431 => 'Request Header Fields Too Large',
500 => 'Internal Server Error',
501 => 'Not Implemented',
502 => 'Bad Gateway',
503 => 'Service Unavailable',
504 => 'Gateway Timeout',
- 505 => 'HTTP Version Not Supported',
- 507 => 'Insufficient Storage',
- 511 => 'Network Authentication Required',
+ 505 => 'HTTP Version Not Supported'
}
- # Maps a status code to the corresponding Status class
- CodeToError = {} # :nodoc:
+ CodeToError = {}
- # Creates a status or error class for each status code and
- # populates the CodeToError map.
StatusMessage.each{|code, message|
message.freeze
var_name = message.gsub(/[ \-]/,'_').upcase
@@ -132,57 +99,28 @@ module WEBrick
CodeToError[code] = err_class
}
- ##
- # Returns the description corresponding to the HTTP status +code+
- #
- # WEBrick::HTTPStatus.reason_phrase 404
- # => "Not Found"
def reason_phrase(code)
StatusMessage[code.to_i]
end
-
- ##
- # Is +code+ an informational status?
def info?(code)
code.to_i >= 100 and code.to_i < 200
end
-
- ##
- # Is +code+ a successful status?
def success?(code)
code.to_i >= 200 and code.to_i < 300
end
-
- ##
- # Is +code+ a redirection status?
def redirect?(code)
code.to_i >= 300 and code.to_i < 400
end
-
- ##
- # Is +code+ an error status?
def error?(code)
code.to_i >= 400 and code.to_i < 600
end
-
- ##
- # Is +code+ a client error status?
def client_error?(code)
code.to_i >= 400 and code.to_i < 500
end
-
- ##
- # Is +code+ a server error status?
def server_error?(code)
code.to_i >= 500 and code.to_i < 600
end
- ##
- # Returns the status class corresponding to +code+
- #
- # WEBrick::HTTPStatus[302]
- # => WEBrick::HTTPStatus::NotFound
- #
def self.[](code)
CodeToError[code]
end
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index a5f0632b86..f029dacb56 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -12,21 +12,12 @@ require 'socket'
require 'tempfile'
module WEBrick
- CR = "\x0d" # :nodoc:
- LF = "\x0a" # :nodoc:
- CRLF = "\x0d\x0a" # :nodoc:
-
- ##
- # HTTPUtils provides utility methods for working with the HTTP protocol.
- #
- # This module is generally used internally by WEBrick
+ CR = "\x0d"
+ LF = "\x0a"
+ CRLF = "\x0d\x0a"
module HTTPUtils
- ##
- # Normalizes a request path. Raises an exception if the path cannot be
- # normalized.
-
def normalize_path(path)
raise "abnormal path `#{path}'" if path[0] != ?/
ret = path.dup
@@ -40,8 +31,7 @@ module WEBrick
end
module_function :normalize_path
- ##
- # Default mime types
+ #####
DefaultMimeTypes = {
"ai" => "application/postscript",
@@ -67,7 +57,6 @@ module WEBrick
"jpe" => "image/jpeg",
"jpeg" => "image/jpeg",
"jpg" => "image/jpeg",
- "js" => "application/javascript",
"lha" => "application/octet-stream",
"lzh" => "application/octet-stream",
"mov" => "video/quicktime",
@@ -89,7 +78,6 @@ module WEBrick
"rtf" => "application/rtf",
"sgm" => "text/sgml",
"sgml" => "text/sgml",
- "svg" => "image/svg+xml",
"tif" => "image/tiff",
"tiff" => "image/tiff",
"txt" => "text/plain",
@@ -102,9 +90,7 @@ module WEBrick
"zip" => "application/zip",
}
- ##
- # Loads Apache-compatible mime.types in +file+.
-
+ # Load Apache compatible mime.types file.
def load_mime_types(file)
open(file){ |io|
hash = Hash.new
@@ -121,10 +107,6 @@ module WEBrick
end
module_function :load_mime_types
- ##
- # Returns the mime type of +filename+ from the list in +mime_tab+. If no
- # mime type was found application/octet-stream is returned.
-
def mime_type(filename, mime_tab)
suffix1 = (/\.(\w+)$/ =~ filename && $1.downcase)
suffix2 = (/\.(\w+)\.[\w\-]+$/ =~ filename && $1.downcase)
@@ -132,9 +114,7 @@ module WEBrick
end
module_function :mime_type
- ##
- # Parses an HTTP header +raw+ into a hash of header fields with an Array
- # of values.
+ #####
def parse_header(raw)
header = Hash.new([].freeze)
@@ -166,18 +146,12 @@ module WEBrick
end
module_function :parse_header
- ##
- # Splits a header value +str+ according to HTTP specification.
-
def split_header_value(str)
str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]+)+)
(?:,\s*|\Z)'xn).flatten
end
module_function :split_header_value
- ##
- # Parses a Range header value +ranges_specifier+
-
def parse_range_header(ranges_specifier)
if /^bytes=(.*)/ =~ ranges_specifier
byte_range_set = split_header_value($1)
@@ -193,9 +167,6 @@ module WEBrick
end
module_function :parse_range_header
- ##
- # Parses q values in +value+ as used in Accept headers.
-
def parse_qvalues(value)
tmp = []
if value
@@ -214,8 +185,7 @@ module WEBrick
end
module_function :parse_qvalues
- ##
- # Removes quotes and escapes from +str+
+ #####
def dequote(str)
ret = (/\A"(.*)"\Z/ =~ str) ? $1 : str.dup
@@ -224,43 +194,20 @@ module WEBrick
end
module_function :dequote
- ##
- # Quotes and escapes quotes in +str+
-
def quote(str)
'"' << str.gsub(/[\\\"]/o, "\\\1") << '"'
end
module_function :quote
- ##
- # Stores multipart form data. FormData objects are created when
- # WEBrick::HTTPUtils.parse_form_data is called.
+ #####
class FormData < String
- EmptyRawHeader = [].freeze # :nodoc:
- EmptyHeader = {}.freeze # :nodoc:
-
- ##
- # The name of the form data part
-
- attr_accessor :name
+ EmptyRawHeader = [].freeze
+ EmptyHeader = {}.freeze
- ##
- # The filename of the form data part
-
- attr_accessor :filename
-
- attr_accessor :next_data # :nodoc:
+ attr_accessor :name, :filename, :next_data
protected :next_data
- ##
- # Creates a new FormData object.
- #
- # +args+ is an Array of form data entries. One FormData will be created
- # for each entry.
- #
- # This is called by WEBrick::HTTPUtils.parse_form_data for you
-
def initialize(*args)
@name = @filename = @next_data = nil
if args.empty?
@@ -277,9 +224,6 @@ module WEBrick
end
end
- ##
- # Retrieves the header at the first entry in +key+
-
def [](*key)
begin
@header[key[0].downcase].join(", ")
@@ -288,12 +232,6 @@ module WEBrick
end
end
- ##
- # Adds +str+ to this FormData which may be the body, a header or a
- # header entry.
- #
- # This is called by WEBrick::HTTPUtils.parse_form_data for you
-
def <<(str)
if @header
super
@@ -309,11 +247,6 @@ module WEBrick
self
end
- ##
- # Adds +data+ at the end of the chain of entries
- #
- # This is called by WEBrick::HTTPUtils.parse_form_data for you.
-
def append_data(data)
tmp = self
while tmp
@@ -326,9 +259,6 @@ module WEBrick
self
end
- ##
- # Yields each entry in this FormData
-
def each_data
tmp = self
while tmp
@@ -338,9 +268,6 @@ module WEBrick
end
end
- ##
- # Returns all the FormData as an Array
-
def list
ret = []
each_data{|data|
@@ -349,22 +276,13 @@ module WEBrick
ret
end
- ##
- # A FormData will behave like an Array
-
alias :to_ary :list
- ##
- # This FormData's body
-
def to_s
String.new(self)
end
end
- ##
- # Parses the query component of a URI in +str+
-
def parse_query(str)
query = Hash.new
if str
@@ -386,9 +304,6 @@ module WEBrick
end
module_function :parse_query
- ##
- # Parses form data in +io+ with the given +boundary+
-
def parse_form_data(io, boundary)
boundary_regexp = /\A--#{Regexp.quote(boundary)}(--)?#{CRLF}\z/
form_data = Hash.new
@@ -433,22 +348,10 @@ module WEBrick
module_function
- # :stopdoc:
-
def _make_regex(str) /([#{Regexp.escape(str)}])/n end
def _make_regex!(str) /([^#{Regexp.escape(str)}])/n end
- def _escape(str, regex)
- str = str.b
- str.gsub!(regex) {"%%%02X" % $1.ord}
- # %-escaped string should contain US-ASCII only
- str.force_encoding(Encoding::US_ASCII)
- end
- def _unescape(str, regex)
- str = str.b
- str.gsub!(regex) {$1.hex.chr}
- # encoding of %-unescaped string is unknown
- str
- end
+ def _escape(str, regex) str.gsub(regex){ "%%%02X" % $1.ord } end
+ def _unescape(str, regex) str.gsub(regex){ $1.hex.chr } end
UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
UNESCAPED_FORM = _make_regex(reserved+control+delims+unwise+nonascii)
@@ -456,41 +359,24 @@ module WEBrick
ESCAPED = /%([0-9a-fA-F]{2})/
UNESCAPED_PCHAR = _make_regex!(unreserved+":@&=+$,")
- # :startdoc:
-
- ##
- # Escapes HTTP reserved and unwise characters in +str+
-
def escape(str)
_escape(str, UNESCAPED)
end
- ##
- # Unescapes HTTP reserved and unwise characters in +str+
-
def unescape(str)
_unescape(str, ESCAPED)
end
- ##
- # Escapes form reserved characters in +str+
-
def escape_form(str)
ret = _escape(str, UNESCAPED_FORM)
ret.gsub!(/ /, "+")
ret
end
- ##
- # Unescapes form reserved characters in +str+
-
def unescape_form(str)
_unescape(str.gsub(/\+/, " "), ESCAPED)
end
- ##
- # Escapes path +str+
-
def escape_path(str)
result = ""
str.scan(%r{/([^/]*)}).each{|i|
@@ -499,9 +385,6 @@ module WEBrick
return result
end
- ##
- # Escapes 8 bit characters in +str+
-
def escape8bit(str)
_escape(str, NONASCII)
end
diff --git a/lib/webrick/httpversion.rb b/lib/webrick/httpversion.rb
index cdfb957296..86907a26bd 100644
--- a/lib/webrick/httpversion.rb
+++ b/lib/webrick/httpversion.rb
@@ -1,4 +1,4 @@
-#--
+#
# HTTPVersion.rb -- presentation of HTTP version
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -8,33 +8,15 @@
# $IPR: httpversion.rb,v 1.5 2002/09/21 12:23:37 gotoyuzo Exp $
module WEBrick
-
- ##
- # Represents an HTTP protocol version
-
class HTTPVersion
include Comparable
- ##
- # The major protocol version number
-
- attr_accessor :major
-
- ##
- # The minor protocol version number
-
- attr_accessor :minor
-
- ##
- # Converts +version+ into an HTTPVersion
+ attr_accessor :major, :minor
def self.convert(version)
version.is_a?(self) ? version : new(version)
end
- ##
- # Creates a new HTTPVersion from +version+.
-
def initialize(version)
case version
when HTTPVersion
@@ -50,10 +32,6 @@ module WEBrick
end
end
- ##
- # Compares this version with +other+ according to the HTTP specification
- # rules.
-
def <=>(other)
unless other.is_a?(self.class)
other = self.class.new(other)
@@ -64,10 +42,6 @@ module WEBrick
return ret
end
- ##
- # The HTTP version as show in the HTTP request and response. For example,
- # "1.1"
-
def to_s
format("%d.%d", @major, @minor)
end
diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb
index 41cde4a740..0ffa12dd96 100644
--- a/lib/webrick/log.rb
+++ b/lib/webrick/log.rb
@@ -1,4 +1,4 @@
-#--
+#
# log.rb -- Log Class
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -9,43 +9,12 @@
# $IPR: log.rb,v 1.26 2002/10/06 17:06:10 gotoyuzo Exp $
module WEBrick
-
- ##
- # A generic logging class
-
class BasicLog
+ # log-level constant
+ FATAL, ERROR, WARN, INFO, DEBUG = 1, 2, 3, 4, 5
- # Fatal log level which indicates a server crash
-
- FATAL = 1
-
- # Error log level which indicates a recoverable error
-
- ERROR = 2
-
- # Warning log level which indicates a possible problem
-
- WARN = 3
-
- # Information log level which indicates possibly useful information
-
- INFO = 4
-
- # Debugging error level for messages used in server development or
- # debugging
-
- DEBUG = 5
-
- # log-level, messages above this level will be logged
attr_accessor :level
- ##
- # Initializes a new logger for +log_file+ that outputs messages at +level+
- # or higher. +log_file+ can be a filename, an IO-like object that
- # responds to #<< or nil which outputs to $stderr.
- #
- # If no level is given INFO is chosen by default
-
def initialize(log_file=nil, level=nil)
@level = level || INFO
case log_file
@@ -60,17 +29,11 @@ module WEBrick
end
end
- ##
- # Closes the logger (also closes the log device associated to the logger)
def close
@log.close if @opened
@log = nil
end
- ##
- # Logs +data+ at +level+ if the given level is above the current log
- # level.
-
def log(level, data)
if @log && level <= @level
data += "\n" if /\n\Z/ !~ data
@@ -78,45 +41,26 @@ module WEBrick
end
end
- ##
- # Synonym for log(INFO, obj.to_s)
def <<(obj)
log(INFO, obj.to_s)
end
- # Shortcut for logging a FATAL message
def fatal(msg) log(FATAL, "FATAL " << format(msg)); end
- # Shortcut for logging an ERROR message
def error(msg) log(ERROR, "ERROR " << format(msg)); end
- # Shortcut for logging a WARN message
def warn(msg) log(WARN, "WARN " << format(msg)); end
- # Shortcut for logging an INFO message
def info(msg) log(INFO, "INFO " << format(msg)); end
- # Shortcut for logging a DEBUG message
def debug(msg) log(DEBUG, "DEBUG " << format(msg)); end
- # Will the logger output FATAL messages?
def fatal?; @level >= FATAL; end
- # Will the logger output ERROR messages?
def error?; @level >= ERROR; end
- # Will the logger output WARN messages?
def warn?; @level >= WARN; end
- # Will the logger output INFO messages?
def info?; @level >= INFO; end
- # Will the logger output DEBUG messages?
def debug?; @level >= DEBUG; end
private
- ##
- # Formats +arg+ for the logger
- #
- # * If +arg+ is an Exception, it will format the error message and
- # the back trace.
- # * If +arg+ responds to #to_str, it will return it.
- # * Otherwise it will return +arg+.inspect.
def format(arg)
- if arg.is_a?(Exception)
+ str = if arg.is_a?(Exception)
"#{arg.class}: #{arg.message}\n\t" <<
arg.backtrace.join("\n\t") << "\n"
elsif arg.respond_to?(:to_str)
@@ -127,25 +71,14 @@ module WEBrick
end
end
- ##
- # A logging class that prepends a timestamp to each message.
-
class Log < BasicLog
- # Format of the timestamp which is applied to each logged line. The
- # default is <tt>"[%Y-%m-%d %H:%M:%S]"</tt>
attr_accessor :time_format
- ##
- # Same as BasicLog#initialize
- #
- # You can set the timestamp format through #time_format
def initialize(log_file=nil, level=nil)
super(log_file, level)
@time_format = "[%Y-%m-%d %H:%M:%S]"
end
- ##
- # Same as BasicLog#log
def log(level, data)
tmp = Time.now.strftime(@time_format)
tmp << " " << data
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 3f5371ba47..c4d23bd67b 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -15,33 +15,15 @@ require 'webrick/log'
module WEBrick
- ##
- # Server error exception
-
class ServerError < StandardError; end
- ##
- # Base server class
-
class SimpleServer
-
- ##
- # A SimpleServer only yields when you start it
-
def SimpleServer.start
yield
end
end
- ##
- # A generic module for daemonizing a process
-
class Daemon
-
- ##
- # Performs the standard operations for daemonizing a process. Runs a
- # block, if given.
-
def Daemon.start
exit!(0) if fork
Process::setsid
@@ -55,41 +37,8 @@ module WEBrick
end
end
- ##
- # Base TCP server class. You must subclass GenericServer and provide a #run
- # method.
-
class GenericServer
-
- ##
- # The server status. One of :Stop, :Running or :Shutdown
-
- attr_reader :status
-
- ##
- # The server configuration
-
- attr_reader :config
-
- ##
- # The server logger. This is independent from the HTTP access log.
-
- attr_reader :logger
-
- ##
- # Tokens control the number of outstanding clients. The
- # <code>:MaxClients</code> configuration sets this.
-
- attr_reader :tokens
-
- ##
- # Sockets listening for connections.
-
- attr_reader :listeners
-
- ##
- # Creates a new generic server from +config+. The default configuration
- # comes from +default+.
+ attr_reader :status, :config, :logger, :tokens, :listeners
def initialize(config={}, default=Config::General)
@config = default.dup.update(config)
@@ -117,42 +66,14 @@ module WEBrick
end
end
- ##
- # Retrieves +key+ from the configuration
-
def [](key)
@config[key]
end
- ##
- # Adds listeners from +address+ and +port+ to the server. See
- # WEBrick::Utils::create_listeners for details.
-
def listen(address, port)
@listeners += Utils::create_listeners(address, port, @logger)
end
- ##
- # Starts the server and runs the +block+ for each connection. This method
- # does not return until the server is stopped from a signal handler or
- # another thread using #stop or #shutdown.
- #
- # If the block raises a subclass of StandardError the exception is logged
- # and ignored. If an IOError or Errno::EBADF exception is raised the
- # exception is ignored. If an Exception subclass is raised the exception
- # is logged and re-raised which stops the server.
- #
- # To completely shut down a server call #shutdown from ensure:
- #
- # server = WEBrick::GenericServer.new
- # # or WEBrick::HTTPServer.new
- #
- # begin
- # server.start
- # ensure
- # server.shutdown
- # end
-
def start(&block)
raise ServerError, "already started." if @status != :Stop
server_type = @config[:ServerType] || SimpleServer
@@ -164,58 +85,44 @@ module WEBrick
thgroup = ThreadGroup.new
@status = :Running
- begin
- while @status == :Running
- begin
- if svrs = IO.select(@listeners, nil, nil, 2.0)
- 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)
- else
- @tokens.push(nil)
- end
- }
- end
- rescue Errno::EBADF, IOError => ex
- # if the listening socket was closed in GenericServer#shutdown,
- # IO::select raise it.
- rescue StandardError => ex
- msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
- @logger.error msg
- rescue Exception => ex
- @logger.fatal ex
- raise
+ while @status == :Running
+ begin
+ if svrs = IO.select(@listeners, nil, nil, 2.0)
+ 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)
+ else
+ @tokens.push(nil)
+ end
+ }
end
+ rescue Errno::EBADF, IOError => ex
+ # if the listening socket was closed in GenericServer#shutdown,
+ # IO::select raise it.
+ rescue Exception => ex
+ msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
+ @logger.error msg
end
-
- ensure
- @status = :Shutdown
- @logger.info "going to shutdown ..."
- thgroup.list.each{|th| th.join if th[:WEBrickThread] }
- call_callback(:StopCallback)
- @logger.info "#{self.class}#start done."
- @status = :Stop
end
+
+ @logger.info "going to shutdown ..."
+ thgroup.list.each{|th| th.join if th[:WEBrickThread] }
+ call_callback(:StopCallback)
+ @logger.info "#{self.class}#start done."
+ @status = :Stop
}
end
- ##
- # Stops the server from accepting new connections.
-
def stop
if @status == :Running
@status = :Shutdown
end
end
- ##
- # Shuts down the server and all listening sockets. New listeners must be
- # provided to restart the server.
-
def shutdown
stop
@listeners.each{|s|
@@ -239,22 +146,12 @@ module WEBrick
@listeners.clear
end
- ##
- # You must subclass GenericServer and implement \#run which accepts a TCP
- # client socket
-
def run(sock)
@logger.fatal "run() must be provided by user."
end
private
- # :stopdoc:
-
- ##
- # Accepts a TCP client socket from the TCP server socket +svr+ and returns
- # the client socket.
-
def accept_client(svr)
sock = nil
begin
@@ -264,22 +161,13 @@ module WEBrick
Utils::set_close_on_exec(sock)
rescue Errno::ECONNRESET, Errno::ECONNABORTED,
Errno::EPROTO, Errno::EINVAL => ex
- rescue StandardError => ex
+ rescue Exception => ex
msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
@logger.error msg
end
return sock
end
- ##
- # Starts a server thread for the client socket +sock+ that runs the given
- # +block+.
- #
- # Sets the socket to the <code>:WEBrickSocket</code> thread local variable
- # in the thread.
- #
- # If any errors occur in the block they are logged and handled.
-
def start_thread(sock, &block)
Thread.start{
begin
@@ -308,14 +196,11 @@ module WEBrick
else
@logger.debug "close: <address unknown>"
end
- sock.close unless sock.closed?
+ sock.close
end
}
end
- ##
- # Calls the callback +callback_name+ from the configuration with +args+
-
def call_callback(callback_name, *args)
if cb = @config[callback_name]
cb.call(*args)
diff --git a/lib/webrick/ssl.rb b/lib/webrick/ssl.rb
index cf0f3ddb23..ff73ad1b8b 100644
--- a/lib/webrick/ssl.rb
+++ b/lib/webrick/ssl.rb
@@ -12,53 +12,6 @@ module WEBrick
module Config
svrsoft = General[:ServerSoftware]
osslv = ::OpenSSL::OPENSSL_VERSION.split[1]
-
- ##
- # Default SSL server configuration.
- #
- # WEBrick can automatically create a self-signed certificate if
- # <code>:SSLCertName</code> is set. For more information on the various
- # SSL options see OpenSSL::SSL::SSLContext.
- #
- # :ServerSoftware ::
- # The server software name used in the Server: header.
- # :SSLEnable :: false,
- # Enable SSL for this server. Defaults to false.
- # :SSLCertificate ::
- # The SSL certificate for the server.
- # :SSLPrivateKey ::
- # The SSL private key for the server certificate.
- # :SSLClientCA :: nil,
- # Array of certificates that will be sent to the client.
- # :SSLExtraChainCert :: nil,
- # Array of certificates that willbe added to the certificate chain
- # :SSLCACertificateFile :: nil,
- # Path to a CA certificate file
- # :SSLCACertificatePath :: nil,
- # Path to a directory containing CA certificates
- # :SSLCertificateStore :: nil,
- # OpenSSL::X509::Store used for certificate validation of the client
- # :SSLTmpDhCallback :: nil,
- # Callback invoked when DH parameters are required.
- # :SSLVerifyClient ::
- # Sets whether the client is verified. This defaults to VERIFY_NONE
- # which is typical for an HTTPS server.
- # :SSLVerifyDepth ::
- # Number of CA certificates to walk when verifying a certificate chain
- # :SSLVerifyCallback ::
- # Custom certificate verification callback
- # :SSLTimeout ::
- # Maximum session lifetime
- # :SSLOptions ::
- # Various SSL options
- # :SSLStartImmediately ::
- # Immediately start SSL upon connection? Defaults to true
- # :SSLCertName ::
- # SSL certificate name. Must be set to enable automatic certificate
- # creation.
- # :SSLCertComment ::
- # Comment used during automatic certificate creation.
-
SSL = {
:ServerSoftware => "#{svrsoft} OpenSSL/#{osslv}",
:SSLEnable => false,
@@ -69,7 +22,6 @@ module WEBrick
:SSLCACertificateFile => nil,
:SSLCACertificatePath => nil,
:SSLCertificateStore => nil,
- :SSLTmpDhCallback => nil,
:SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE,
:SSLVerifyDepth => nil,
:SSLVerifyCallback => nil, # custom verification
@@ -84,10 +36,6 @@ module WEBrick
end
module Utils
- ##
- # Creates a self-signed certificate with the given number of +bits+,
- # the issuer +cn+ and a +comment+ to be stored in the certificate.
-
def create_self_signed_cert(bits, cn, comment)
rsa = OpenSSL::PKey::RSA.new(bits){|p, n|
case p
@@ -102,8 +50,8 @@ module WEBrick
end
}
cert = OpenSSL::X509::Certificate.new
- cert.version = 2
- cert.serial = 1
+ cert.version = 3
+ cert.serial = 0
name = OpenSSL::X509::Name.new(cn)
cert.subject = name
cert.issuer = name
@@ -130,25 +78,13 @@ module WEBrick
module_function :create_self_signed_cert
end
- ##
- #--
- # Updates WEBrick::GenericServer with SSL functionality
-
class GenericServer
-
- ##
- # SSL context for the server when run in SSL mode
-
- def ssl_context # :nodoc:
+ def ssl_context
@ssl_context ||= nil
end
undef listen
-
- ##
- # Updates +listen+ to enable SSL when the SSL configuration is active.
-
- def listen(address, port) # :nodoc:
+ def listen(address, port)
listeners = Utils::create_listeners(address, port, @logger)
if @config[:SSLEnable]
unless ssl_context
@@ -164,10 +100,7 @@ module WEBrick
@listeners += listeners
end
- ##
- # Sets up an SSL context for +config+
-
- def setup_ssl_context(config) # :nodoc:
+ def setup_ssl_context(config)
unless config[:SSLCertificate]
cn = config[:SSLCertName]
comment = config[:SSLCertComment]
@@ -183,7 +116,6 @@ module WEBrick
ctx.ca_file = config[:SSLCACertificateFile]
ctx.ca_path = config[:SSLCACertificatePath]
ctx.cert_store = config[:SSLCertificateStore]
- ctx.tmp_dh_callback = config[:SSLTmpDhCallback]
ctx.verify_mode = config[:SSLVerifyClient]
ctx.verify_depth = config[:SSLVerifyDepth]
ctx.verify_callback = config[:SSLVerifyCallback]
diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
index f2373572ce..dee9363441 100644
--- a/lib/webrick/utils.rb
+++ b/lib/webrick/utils.rb
@@ -18,8 +18,6 @@ end
module WEBrick
module Utils
- ##
- # Sets IO operations on +io+ to be non-blocking
def set_non_blocking(io)
flag = File::NONBLOCK
if defined?(Fcntl::F_GETFL)
@@ -29,17 +27,13 @@ module WEBrick
end
module_function :set_non_blocking
- ##
- # Sets the close on exec flag for +io+
def set_close_on_exec(io)
if defined?(Fcntl::FD_CLOEXEC)
- io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+ io.fcntl(Fcntl::FD_CLOEXEC, 1)
end
end
module_function :set_close_on_exec
- ##
- # Changes the process's uid and gid to the ones of +user+
def su(user)
if defined?(Etc)
pw = Etc.getpwnam(user)
@@ -52,8 +46,6 @@ module WEBrick
end
module_function :su
- ##
- # The server hostname
def getservername
host = Socket::gethostname
begin
@@ -64,10 +56,6 @@ module WEBrick
end
module_function :getservername
- ##
- # Creates TCP server sockets bound to +address+:+port+ and returns them.
- #
- # It will create IPV4 and IPV6 sockets on all interfaces.
def create_listeners(address, port, logger=nil)
unless port
raise ArgumentError, "must specify port"
@@ -96,14 +84,10 @@ module WEBrick
end
module_function :create_listeners
- ##
- # Characters used to generate random strings
RAND_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
"0123456789" +
"abcdefghijklmnopqrstuvwxyz"
- ##
- # Generates a random string of length +len+
def random_string(len)
rand_max = RAND_CHARS.bytesize
ret = ""
@@ -118,69 +102,28 @@ module WEBrick
require "timeout"
require "singleton"
- ##
- # Class used to manage timeout handlers across multiple threads.
- #
- # Timeout handlers should be managed by using the class methods which are
- # synchronized.
- #
- # id = TimeoutHandler.register(10, Timeout::Error)
- # begin
- # sleep 20
- # puts 'foo'
- # ensure
- # TimeoutHandler.cancel(id)
- # end
- #
- # will raise Timeout::Error
- #
- # id = TimeoutHandler.register(10, Timeout::Error)
- # begin
- # sleep 5
- # puts 'foo'
- # ensure
- # TimeoutHandler.cancel(id)
- # end
- #
- # will print 'foo'
- #
class TimeoutHandler
include Singleton
+ TimeoutMutex = Mutex.new
- ##
- # Mutex used to synchronize access across threads
- TimeoutMutex = Mutex.new # :nodoc:
-
- ##
- # Registers a new timeout handler
- #
- # +time+:: Timeout in seconds
- # +exception+:: Exception to raise when timeout elapsed
def TimeoutHandler.register(seconds, exception)
TimeoutMutex.synchronize{
instance.register(Thread.current, Time.now + seconds, exception)
}
end
- ##
- # Cancels the timeout handler +id+
def TimeoutHandler.cancel(id)
TimeoutMutex.synchronize{
instance.cancel(Thread.current, id)
}
end
- ##
- # Creates a new TimeoutHandler. You should use ::register and ::cancel
- # instead of creating the timeout handler directly.
def initialize
@timeout_info = Hash.new
Thread.start{
while true
now = Time.now
- @timeout_info.keys.each{|thread|
- ary = @timeout_info[thread]
- next unless ary
+ @timeout_info.each{|thread, ary|
ary.dup.each{|info|
time, exception = *info
interrupt(thread, info.object_id, exception) if time < now
@@ -191,8 +134,6 @@ module WEBrick
}
end
- ##
- # Interrupts the timeout handler +id+ and raises +exception+
def interrupt(thread, id, exception)
TimeoutMutex.synchronize{
if cancel(thread, id) && thread.alive?
@@ -201,19 +142,12 @@ module WEBrick
}
end
- ##
- # Registers a new timeout handler
- #
- # +time+:: Timeout in seconds
- # +exception+:: Exception to raise when timeout elapsed
def register(thread, time, exception)
@timeout_info[thread] ||= Array.new
@timeout_info[thread] << [time, exception]
return @timeout_info[thread].last.object_id
end
- ##
- # Cancels the timeout handler +id+
def cancel(thread, id)
if ary = @timeout_info[thread]
ary.delete_if{|info| info.object_id == id }
@@ -226,11 +160,6 @@ module WEBrick
end
end
- ##
- # Executes the passed block and raises +exception+ if execution takes more
- # than +seconds+.
- #
- # If +seconds+ is zero or nil, simply executes the block
def timeout(seconds, exception=Timeout::Error)
return yield if seconds.nil? or seconds.zero?
# raise ThreadError, "timeout within critical session" if Thread.critical
diff --git a/lib/webrick/version.rb b/lib/webrick/version.rb
index 48bdc6d94d..b2b9fd3b78 100644
--- a/lib/webrick/version.rb
+++ b/lib/webrick/version.rb
@@ -1,4 +1,4 @@
-#--
+#
# version.rb -- version and release date
#
# Author: IPR -- Internet Programming with Ruby -- writers
@@ -9,9 +9,5 @@
# $IPR: version.rb,v 1.74 2003/07/22 19:20:43 gotoyuzo Exp $
module WEBrick
-
- ##
- # The WEBrick version
-
VERSION = "1.3.1"
end
diff --git a/lib/xmlrpc.rb b/lib/xmlrpc.rb
deleted file mode 100644
index d8208d02a8..0000000000
--- a/lib/xmlrpc.rb
+++ /dev/null
@@ -1,301 +0,0 @@
-# == Author and Copyright
-#
-# Copyright (C) 2001-2004 by Michael Neumann (mailto:mneumann@ntecs.de)
-#
-# Released under the same term of license as Ruby.
-#
-# == Overview
-#
-# XMLRPC is a lightweight protocol that enables remote procedure calls over
-# HTTP. It is defined at http://www.xmlrpc.com.
-#
-# XMLRPC allows you to create simple distributed computing solutions that span
-# computer languages. Its distinctive feature is its simplicity compared to
-# other approaches like SOAP and CORBA.
-#
-# The Ruby standard library package 'xmlrpc' enables you to create a server that
-# implements remote procedures and a client that calls them. Very little code
-# is required to achieve either of these.
-#
-# == Example
-#
-# Try the following code. It calls a standard demonstration remote procedure.
-#
-# require 'xmlrpc/client'
-# require 'pp'
-#
-# server = XMLRPC::Client.new2("http://xmlrpc-c.sourceforge.net/api/sample.php")
-# result = server.call("sample.sumAndDifference", 5, 3)
-# pp result
-#
-# == Documentation
-#
-# See http://www.ntecs.de/projects/xmlrpc4r. There is plenty of detail there to
-# use the client and implement a server.
-#
-# == Features of XMLRPC for Ruby
-#
-# * Extensions
-# * Introspection
-# * multiCall
-# * optionally nil values and integers larger than 32 Bit
-#
-# * Server
-# * Standalone XML-RPC server
-# * CGI-based (works with FastCGI)
-# * Apache mod_ruby server
-# * WEBrick servlet
-#
-# * Client
-# * synchronous/asynchronous calls
-# * Basic HTTP-401 Authentification
-# * HTTPS protocol (SSL)
-#
-# * Parsers
-# * NQXML (XMLParser::NQXMLStreamParser, XMLParser::NQXMLTreeParser)
-# * Expat (XMLParser::XMLStreamParser, XMLParser::XMLTreeParser)
-# * REXML (XMLParser::REXMLStreamParser)
-# * xml-scan (XMLParser::XMLScanStreamParser)
-# * Fastest parser is Expat's XMLParser::XMLStreamParser!
-#
-# * General
-# * possible to choose between XMLParser module (Expat wrapper) and REXML/NQXML (pure Ruby) parsers
-# * Marshalling Ruby objects to Hashs and reconstruct them later from a Hash
-# * SandStorm component architecture XMLRPC::Client interface
-#
-# == Howto
-#
-# === Client
-#
-# require "xmlrpc/client"
-#
-# # Make an object to represent the XML-RPC server.
-# server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
-#
-# # Call the remote server and get our result
-# result = server.call("sample.sumAndDifference", 5, 3)
-#
-# sum = result["sum"]
-# difference = result["difference"]
-#
-# puts "Sum: #{sum}, Difference: #{difference}"
-#
-# === XMLRPC::Client with XML-RPC fault-structure handling
-#
-# There are two possible ways, of handling a fault-structure:
-#
-# ==== by catching a XMLRPC::FaultException exception
-#
-# require "xmlrpc/client"
-#
-# # Make an object to represent the XML-RPC server.
-# server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
-#
-# begin
-# # Call the remote server and get our result
-# result = server.call("sample.sumAndDifference", 5, 3)
-#
-# sum = result["sum"]
-# difference = result["difference"]
-#
-# puts "Sum: #{sum}, Difference: #{difference}"
-#
-# rescue XMLRPC::FaultException => e
-# puts "Error: "
-# puts e.faultCode
-# puts e.faultString
-# end
-#
-# ==== by calling "call2" which returns a boolean
-#
-# require "xmlrpc/client"
-#
-# # Make an object to represent the XML-RPC server.
-# server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
-#
-# # Call the remote server and get our result
-# ok, result = server.call2("sample.sumAndDifference", 5, 3)
-#
-# if ok
-# sum = result["sum"]
-# difference = result["difference"]
-#
-# puts "Sum: #{sum}, Difference: #{difference}"
-# else
-# puts "Error: "
-# puts result.faultCode
-# puts result.faultString
-# end
-#
-# === Using XMLRPC::Client::Proxy
-#
-# You can create a Proxy object onto which you can call methods. This way it
-# looks nicer. Both forms, _call_ and _call2_ are supported through _proxy_ and
-# _proxy2_. You can additionally give arguments to the Proxy, which will be
-# given to each XML-RPC call using that Proxy.
-#
-# require "xmlrpc/client"
-#
-# # Make an object to represent the XML-RPC server.
-# server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
-#
-# # Create a Proxy object
-# sample = server.proxy("sample")
-#
-# # Call the remote server and get our result
-# result = sample.sumAndDifference(5,3)
-#
-# sum = result["sum"]
-# difference = result["difference"]
-#
-# puts "Sum: #{sum}, Difference: #{difference}"
-#
-# === CGI-based server using XMLRPC::CGIServer
-#
-# There are also two ways to define handler, the first is
-# like C/PHP, the second like Java, of course both ways
-# can be mixed:
-#
-# ==== C/PHP-like (handler functions)
-#
-# require "xmlrpc/server"
-#
-# s = XMLRPC::CGIServer.new
-#
-# s.add_handler("sample.sumAndDifference") do |a,b|
-# { "sum" => a + b, "difference" => a - b }
-# end
-#
-# s.serve
-#
-# ==== Java-like (handler classes)
-#
-# require "xmlrpc/server"
-#
-# s = XMLRPC::CGIServer.new
-#
-# class MyHandler
-# def sumAndDifference(a, b)
-# { "sum" => a + b, "difference" => a - b }
-# end
-# end
-#
-# # NOTE: Security Hole (read below)!!!
-# s.add_handler("sample", MyHandler.new)
-# s.serve
-#
-#
-# To return a fault-structure you have to raise an XMLRPC::FaultException e.g.:
-#
-# raise XMLRPC::FaultException.new(3, "division by Zero")
-#
-# ===== Security Note
-#
-# From Brian Candler:
-#
-# Above code sample has an extremely nasty security hole, in that you can now call
-# any method of 'MyHandler' remotely, including methods inherited from Object
-# and Kernel! For example, in the client code, you can use
-#
-# puts server.call("sample.send","`","ls")
-#
-# (backtick being the method name for running system processes). Needless to
-# say, 'ls' can be replaced with something else.
-#
-# The version which binds proc objects (or the version presented below in the next section)
-# doesn't have this problem, but people may be tempted to use the second version because it's
-# so nice and 'Rubyesque'. I think it needs a big red disclaimer.
-#
-#
-# From Michael:
-#
-# A solution is to undef insecure methods or to use
-# XMLRPC::Service::PublicInstanceMethodsInterface as shown below:
-#
-# class MyHandler
-# def sumAndDifference(a, b)
-# { "sum" => a + b, "difference" => a - b }
-# end
-# end
-#
-# # ... server initialization ...
-#
-# s.add_handler(XMLRPC::iPIMethods("sample"), MyHandler.new)
-#
-# # ...
-#
-# This adds only public instance methods explicitly declared in class MyHandler
-# (and not those inherited from any other class).
-#
-# ==== With interface declarations
-#
-# Code sample from the book Ruby Developer's Guide:
-#
-# require "xmlrpc/server"
-#
-# class Num
-# INTERFACE = XMLRPC::interface("num") {
-# meth 'int add(int, int)', 'Add two numbers', 'add'
-# meth 'int div(int, int)', 'Divide two numbers'
-# }
-#
-# def add(a, b) a + b end
-# def div(a, b) a / b end
-# end
-#
-#
-# s = XMLRPC::CGIServer.new
-# s.add_handler(Num::INTERFACE, Num.new)
-# s.serve
-#
-# === Standalone XMLRPC::Server
-#
-# Same as CGI-based server, the only difference being
-#
-# server = XMLRPC::CGIServer.new
-#
-# must be changed to
-#
-# server = XMLRPC::Server.new(8080)
-#
-# if you want a server listening on port 8080.
-# The rest is the same.
-#
-# === Choosing a different XMLParser or XMLWriter
-#
-# The examples above all use the default parser (which is now since 1.8
-# XMLParser::REXMLStreamParser) and a default XMLRPC::XMLWriter.
-# If you want to use a different XMLParser, then you have to call the
-# ParserWriterChooseMixin#set_parser method of XMLRPC::Client instances
-# or instances of subclasses of XMLRPC::BasicServer or by editing
-# xmlrpc/config.rb.
-#
-# XMLRPC::Client Example:
-#
-# # ...
-# server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
-# server.set_parser(XMLRPC::XMLParser::XMLParser.new)
-# # ...
-#
-# XMLRPC::Server Example:
-#
-# # ...
-# s = XMLRPC::CGIServer.new
-# s.set_parser(XMLRPC::XMLParser::XMLStreamParser.new)
-# # ...
-#
-# or:
-#
-# # ...
-# server = XMLRPC::Server.new(8080)
-# server.set_parser(XMLRPC::XMLParser::NQXMLParser.new)
-# # ...
-#
-#
-# Note that XMLParser::XMLStreamParser is incredible faster (and uses less memory) than any
-# other parser and scales well for large documents. For example for a 0.5 MB XML
-# document with many tags, XMLParser::XMLStreamParser is ~350 (!) times faster than
-# XMLParser::NQXMLTreeParser and still ~18 times as fast as XMLParser::XMLTreeParser.
-#
-# You can change the XML-writer by calling method ParserWriterChooseMixin#set_writer.
-module XMLRPC; end
diff --git a/lib/xmlrpc/.document b/lib/xmlrpc/.document
new file mode 100644
index 0000000000..e475c53ed0
--- /dev/null
+++ b/lib/xmlrpc/.document
@@ -0,0 +1 @@
+README.rdoc
diff --git a/lib/xmlrpc/README.rdoc b/lib/xmlrpc/README.rdoc
new file mode 100644
index 0000000000..221d675219
--- /dev/null
+++ b/lib/xmlrpc/README.rdoc
@@ -0,0 +1,300 @@
+= XMLRPC for Ruby
+
+== Author and Copyright
+
+Copyright (C) 2001-2004 by Michael Neumann (mailto:mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+== Overview
+
+XMLRPC is a lightweight protocol that enables remote procedure calls over
+HTTP. It is defined at http://www.xmlrpc.com.
+
+XMLRPC allows you to create simple distributed computing solutions that span
+computer languages. Its distinctive feature is its simplicity compared to
+other approaches like SOAP and CORBA.
+
+The Ruby standard library package 'xmlrpc' enables you to create a server that
+implements remote procedures and a client that calls them. Very little code
+is required to achieve either of these.
+
+== Example
+
+Try the following code. It calls a standard demonstration remote procedure.
+
+ require 'xmlrpc/client'
+ require 'pp'
+
+ server = XMLRPC::Client.new2("http://xmlrpc-c.sourceforge.net/api/sample.php")
+ result = server.call("sample.sumAndDifference", 5, 3)
+ pp result
+
+== Documentation
+
+See http://www.ntecs.de/projects/xmlrpc4r. There is plenty of detail there to
+use the client and implement a server.
+
+== Features of XMLRPC for Ruby
+
+* Extensions
+ * Introspection
+ * multiCall
+ * optionally nil values and integers larger than 32 Bit
+
+* Server
+ * Standalone XML-RPC server
+ * CGI-based (works with FastCGI)
+ * Apache mod_ruby server
+ * WEBrick servlet
+
+* Client
+ * synchronous/asynchronous calls
+ * Basic HTTP-401 Authentification
+ * HTTPS protocol (SSL)
+
+* Parsers
+ * NQXML (NQXMLStreamParser, NQXMLTreeParser)
+ * Expat (XMLStreamParser, XMLTreeParser)
+ * REXML (REXMLStreamParser)
+ * xml-scan (XMLScanStreamParser)
+ * Fastest parser is Expat's XMLStreamParser!
+
+* General
+ * possible to choose between XMLParser module (Expat wrapper) and REXML/NQXML (pure Ruby) parsers
+ * Marshalling Ruby objects to Hashs and reconstruct them later from a Hash
+ * SandStorm component architecture Client interface
+
+== Howto
+
+=== Client
+
+ require "xmlrpc/client"
+
+ # Make an object to represent the XML-RPC server.
+ server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
+
+ # Call the remote server and get our result
+ result = server.call("sample.sumAndDifference", 5, 3)
+
+ sum = result["sum"]
+ difference = result["difference"]
+
+ puts "Sum: #{sum}, Difference: #{difference}"
+
+=== Client with XML-RPC fault-structure handling
+
+There are two possible ways, of handling a fault-structure:
+
+==== by catching a XMLRPC::FaultException exception
+
+ require "xmlrpc/client"
+
+ # Make an object to represent the XML-RPC server.
+ server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
+
+ begin
+ # Call the remote server and get our result
+ result = server.call("sample.sumAndDifference", 5, 3)
+
+ sum = result["sum"]
+ difference = result["difference"]
+
+ puts "Sum: #{sum}, Difference: #{difference}"
+
+ rescue XMLRPC::FaultException => e
+ puts "Error: "
+ puts e.faultCode
+ puts e.faultString
+ end
+
+==== by calling "call2" which returns a boolean
+
+ require "xmlrpc/client"
+
+ # Make an object to represent the XML-RPC server.
+ server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
+
+ # Call the remote server and get our result
+ ok, result = server.call2("sample.sumAndDifference", 5, 3)
+
+ if ok
+ sum = result["sum"]
+ difference = result["difference"]
+
+ puts "Sum: #{sum}, Difference: #{difference}"
+ else
+ puts "Error: "
+ puts result.faultCode
+ puts result.faultString
+ end
+
+=== Client using Proxy
+
+You can create a +Proxy+ object onto which you can call methods. This way it
+looks nicer. Both forms, _call_ and _call2_ are supported through _proxy_ and
+<i>proxy2</i>. You can additionally give arguments to the Proxy, which will be
+given to each XML-RPC call using that Proxy.
+
+ require "xmlrpc/client"
+
+ # Make an object to represent the XML-RPC server.
+ server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
+
+ # Create a Proxy object
+ sample = server.proxy("sample")
+
+ # Call the remote server and get our result
+ result = sample.sumAndDifference(5,3)
+
+ sum = result["sum"]
+ difference = result["difference"]
+
+ puts "Sum: #{sum}, Difference: #{difference}"
+
+=== CGI-based Server
+
+There are also two ways to define handler, the first is
+like C/PHP, the second like Java, of course both ways
+can be mixed:
+
+==== C/PHP-like (handler functions)
+
+ require "xmlrpc/server"
+
+ s = XMLRPC::CGIServer.new
+
+ s.add_handler("sample.sumAndDifference") do |a,b|
+ { "sum" => a + b, "difference" => a - b }
+ end
+
+ s.serve
+
+==== Java-like (handler classes)
+
+ require "xmlrpc/server"
+
+ s = XMLRPC::CGIServer.new
+
+ class MyHandler
+ def sumAndDifference(a, b)
+ { "sum" => a + b, "difference" => a - b }
+ end
+ end
+
+ # NOTE: Security Hole (read below)!!!
+ s.add_handler("sample", MyHandler.new)
+ s.serve
+
+
+To return a fault-structure you have to raise an FaultException e.g.:
+
+ raise XMLRPC::FaultException.new(3, "division by Zero")
+
+===== Security Note
+
+From Brian Candler:
+
+ Above code sample has an extremely nasty security hole, in that you can now call
+ any method of 'MyHandler' remotely, including methods inherited from Object
+ and Kernel! For example, in the client code, you can use
+
+ puts server.call("sample.send","`","ls")
+
+ (backtick being the method name for running system processes). Needless to
+ say, 'ls' can be replaced with something else.
+
+ The version which binds proc objects (or the version presented below in the next section)
+ doesn't have this problem, but people may be tempted to use the second version because it's
+ so nice and 'Rubyesque'. I think it needs a big red disclaimer.
+
+
+From Michael:
+
+A solution is to undef insecure methods or to use (({XMLRPC::iPIMethods})) as shown below:
+
+ class MyHandler
+ def sumAndDifference(a, b)
+ { "sum" => a + b, "difference" => a - b }
+ end
+ end
+
+ # ... server initialization ...
+
+ s.add_handler(XMLRPC::iPIMethods("sample"), MyHandler.new)
+
+ # ...
+
+This adds only public instance methods explicitly declared in class MyHandler
+(and not those inherited from any other class).
+
+==== With interface declarations
+
+Code sample from the book Ruby Developer's Guide:
+
+ require "xmlrpc/server"
+
+ class Num
+ INTERFACE = XMLRPC::interface("num") {
+ meth 'int add(int, int)', 'Add two numbers', 'add'
+ meth 'int div(int, int)', 'Divide two numbers'
+ }
+
+ def add(a, b) a + b end
+ def div(a, b) a / b end
+ end
+
+
+ s = XMLRPC::CGIServer.new
+ s.add_handler(Num::INTERFACE, Num.new)
+ s.serve
+
+=== Standalone server
+
+Same as CGI-based server, only that the line
+
+ server = XMLRPC::CGIServer.new
+
+must be changed to
+
+ server = XMLRPC::Server.new(8080)
+
+if you want a server listening on port 8080.
+The rest is the same.
+
+=== Choosing a different XML Parser or XML Writer
+
+The examples above all use the default parser (which is now since 1.8
+REXMLStreamParser) and a default XML writer. If you want to use a different
+XML parser, then you have to call the <i>set_parser</i> method of
+<tt>XMLRPC::Client</tt> instances or instances of subclasses of
+<tt>XMLRPC::BasicServer</tt> or by editing xmlrpc/config.rb.
+
+Client Example:
+
+ # ...
+ server = XMLRPC::Client.new( "xmlrpc-c.sourceforge.net", "/api/sample.php")
+ server.set_parser(XMLRPC::XMLParser::XMLParser.new)
+ # ...
+
+Server Example:
+
+ # ...
+ s = XMLRPC::CGIServer.new
+ s.set_parser(XMLRPC::XMLParser::XMLStreamParser.new)
+ # ...
+
+or:
+
+ # ...
+ server = XMLRPC::Server.new(8080)
+ server.set_parser(XMLRPC::XMLParser::NQXMLParser.new)
+ # ...
+
+
+Note that XMLStreamParser is incredible faster (and uses less memory) than any
+other parser and scales well for large documents. For example for a 0.5 MB XML
+document with many tags, XMLStreamParser is ~350 (!) times faster than
+NQXMLTreeParser and still ~18 times as fast as XMLTreeParser.
+
+You can change the XML-writer by calling method <i>set_writer</i>.
diff --git a/lib/xmlrpc/README.txt b/lib/xmlrpc/README.txt
new file mode 100644
index 0000000000..ade842d8b1
--- /dev/null
+++ b/lib/xmlrpc/README.txt
@@ -0,0 +1,31 @@
+= XMLRPC for Ruby, Standard Library Documentation
+
+== Overview
+
+XMLRPC is a lightweight protocol that enables remote procedure calls over
+HTTP. It is defined at http://www.xmlrpc.com.
+
+XMLRPC allows you to create simple distributed computing solutions that span
+computer languages. Its distinctive feature is its simplicity compared to
+other approaches like SOAP and CORBA.
+
+The Ruby standard library package 'xmlrpc' enables you to create a server that
+implements remote procedures and a client that calls them. Very little code
+is required to achieve either of these.
+
+== Example
+
+Try the following code. It calls a standard demonstration remote procedure.
+
+ require 'xmlrpc/client'
+ require 'pp'
+
+ server = XMLRPC::Client.new2("http://xmlrpc-c.sourceforge.net/api/sample.php")
+ result = server.call("sample.sumAndDifference", 5, 3)
+ pp result
+
+== Documentation
+
+See http://www.ntecs.de/projects/xmlrpc4r. There is plenty of detail there to
+use the client and implement a server.
+
diff --git a/lib/xmlrpc/base64.rb b/lib/xmlrpc/base64.rb
index 4aac3520c5..bfa8c0a2d5 100644
--- a/lib/xmlrpc/base64.rb
+++ b/lib/xmlrpc/base64.rb
@@ -1,23 +1,46 @@
-#
-# xmlrpc/base64.rb
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# Released under the same term of license as Ruby.
-
-module XMLRPC # :nodoc:
-
-# This class is necessary for 'xmlrpc4r' to determine that a string should
-# be transmitted base64-encoded and not as a raw-string.
-#
-# You can use XMLRPC::Base64 on the client and server-side as a
-# parameter and/or return-value.
+=begin
+= xmlrpc/base64.rb
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::Base64>))
+
+= XMLRPC::Base64
+== Description
+This class is necessary for (('xmlrpc4r')) to determine that a string should
+be transmitted base64-encoded and not as a raw-string.
+You can use (({XMLRPC::Base64})) on the client and server-side as a
+parameter and/or return-value.
+
+== Class Methods
+--- XMLRPC::Base64.new( str, state = :dec )
+ Creates a new (({XMLRPC::Base64})) instance with string ((|str|)) as the
+ internal string. When ((|state|)) is (({:dec})) it assumes that the
+ string ((|str|)) is not in base64 format (perhaps already decoded),
+ otherwise if ((|state|)) is (({:enc})) it decodes ((|str|))
+ and stores it as the internal string.
+
+--- XMLRPC::Base64.decode( str )
+ Decodes string ((|str|)) with base64 and returns that value.
+
+--- XMLRPC::Base64.encode( str )
+ Encodes string ((|str|)) with base64 and returns that value.
+
+== Instance Methods
+--- XMLRPC::Base64#decoded
+ Returns the internal string decoded.
+
+--- XMLRPC::Base64#encoded
+ Returns the internal string encoded with base64.
+
+=end
+
+module XMLRPC
+
class Base64
- # Creates a new XMLRPC::Base64 instance with string +str+ as the
- # internal string. When +state+ is +:dec+ it assumes that the
- # string +str+ is not in base64 format (perhaps already decoded),
- # otherwise if +state+ is +:enc+ it decodes +str+
- # and stores it as the internal string.
def initialize(str, state = :dec)
case state
when :enc
@@ -29,23 +52,19 @@ class Base64
end
end
- # Returns the decoded internal string.
def decoded
@str
end
- # Returns the base64 encoded internal string.
def encoded
Base64.encode(@str)
end
- # Decodes string +str+ with base64 and returns that value.
def Base64.decode(str)
str.gsub(/\s+/, "").unpack("m")[0]
end
- # Encodes string +str+ with base64 and returns that value.
def Base64.encode(str)
[str].pack("m")
end
diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
index e9608cda3d..65c9cd0c9c 100644
--- a/lib/xmlrpc/client.rb
+++ b/lib/xmlrpc/client.rb
@@ -1,55 +1,287 @@
-# xmlrpc/client.rb
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# Released under the same term of license as Ruby.
-#
-# History
-# $Id$
-#
+=begin
+= xmlrpc/client.rb
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::Client>))
+* ((<XMLRPC::Client::Proxy>))
+
+
+= XMLRPC::Client
+== Synopsis
+ require "xmlrpc/client"
+
+ server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
+ begin
+ param = server.call("michael.add", 4, 5)
+ puts "4 + 5 = #{param}"
+ rescue XMLRPC::FaultException => e
+ puts "Error:"
+ puts e.faultCode
+ puts e.faultString
+ end
+
+or
+
+ require "xmlrpc/client"
+
+ server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
+ ok, param = server.call2("michael.add", 4, 5)
+ if ok then
+ puts "4 + 5 = #{param}"
+ else
+ puts "Error:"
+ puts param.faultCode
+ puts param.faultString
+ end
+
+== Description
+Class (({XMLRPC::Client})) provides remote procedure calls to a XML-RPC server.
+After setting the connection-parameters with ((<XMLRPC::Client.new>)) which
+creates a new (({XMLRPC::Client})) instance, you can execute a remote procedure
+by sending the ((<call|XMLRPC::Client#call>)) or ((<call2|XMLRPC::Client#call2>))
+message to this new instance. The given parameters indicate which method to
+call on the remote-side and of course the parameters for the remote procedure.
+
+== Class Methods
+--- XMLRPC::Client.new( host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, user=nil, password=nil, use_ssl=false, timeout =nil)
+ Creates an object which represents the remote XML-RPC server on the
+ given host ((|host|)). If the server is CGI-based, ((|path|)) is the
+ path to the CGI-script, which will be called, otherwise (in the
+ case of a standalone server) ((|path|)) should be (({"/RPC2"})).
+ ((|port|)) is the port on which the XML-RPC server listens.
+ If ((|proxy_host|)) is given, then a proxy server listening at
+ ((|proxy_host|)) is used. ((|proxy_port|)) is the port of the
+ proxy server.
+
+ Default values for ((|host|)), ((|path|)) and ((|port|)) are 'localhost', '/RPC2' and
+ '80' respectively using SSL '443'.
+
+ If ((|user|)) and ((|password|)) are given, each time a request is send,
+ a Authorization header is send. Currently only Basic Authentification is
+ implemented no Digest.
+
+ If ((|use_ssl|)) is set to (({true})), comunication over SSL is enabled.
+ Note, that you need the SSL package from RAA installed.
+
+ Parameter ((|timeout|)) is the time to wait for a XML-RPC response, defaults to 30.
+
+--- XMLRPC::Client.new2( uri, proxy=nil, timeout=nil)
+--- XMLRPC::Client.new_from_uri( uri, proxy=nil, timeout=nil)
+: uri
+ URI specifying protocol (http or https), host, port, path, user and password.
+ Example: https://user:password@host:port/path
+
+: proxy
+ Is of the form "host:port".
+
+: timeout
+ Defaults to 30.
+
+--- XMLRPC::Client.new3( hash={} )
+--- XMLRPC::Client.new_from_hash( hash={} )
+ Parameter ((|hash|)) has following case-insensitive keys:
+ * host
+ * path
+ * port
+ * proxy_host
+ * proxy_port
+ * user
+ * password
+ * use_ssl
+ * timeout
+
+ Calls ((<XMLRPC::Client.new>)) with the corresponding values.
+
+== Instance Methods
+--- XMLRPC::Client#call( method, *args )
+ Invokes the method named ((|method|)) with the parameters given by
+ ((|args|)) on the XML-RPC server.
+ The parameter ((|method|)) is converted into a (({String})) and should
+ be a valid XML-RPC method-name.
+ Each parameter of ((|args|)) must be of one of the following types,
+ where (({Hash})), (({Struct})) and (({Array})) can contain any of these listed ((:types:)):
+ * (({Fixnum})), (({Bignum}))
+ * (({TrueClass})), (({FalseClass})) ((({true})), (({false})))
+ * (({String})), (({Symbol}))
+ * (({Float}))
+ * (({Hash})), (({Struct}))
+ * (({Array}))
+ * (({Date})), (({Time})), (({XMLRPC::DateTime}))
+ * (({XMLRPC::Base64}))
+ * A Ruby object which class includes XMLRPC::Marshallable (only if Config::ENABLE_MARSHALLABLE is (({true}))).
+ That object is converted into a hash, with one additional key/value pair "___class___" which contains the class name
+ for restoring later that object.
+
+ The method returns the return-value from the RPC
+ ((-stands for Remote Procedure Call-)).
+ The type of the return-value is one of the above shown,
+ only that a (({Bignum})) is only allowed when it fits in 32-bit and
+ that a XML-RPC (('dateTime.iso8601')) type is always returned as
+ a ((<(({XMLRPC::DateTime}))|URL:datetime.html>)) object and
+ a (({Struct})) is never returned, only a (({Hash})), the same for a (({Symbol})), where
+ always a (({String})) is returned.
+ A (({XMLRPC::Base64})) is returned as a (({String})) from xmlrpc4r version 1.6.1 on.
+
+ If the remote procedure returned a fault-structure, then a
+ (({XMLRPC::FaultException})) exception is raised, which has two accessor-methods
+ (({faultCode})) and (({faultString})) of type (({Integer})) and (({String})).
+
+--- XMLRPC::Client#call2( method, *args )
+ The difference between this method and ((<call|XMLRPC::Client#call>)) is, that
+ this method do ((*not*)) raise a (({XMLRPC::FaultException})) exception.
+ The method returns an array of two values. The first value indicates if
+ the second value is a return-value ((({true}))) or an object of type
+ (({XMLRPC::FaultException})).
+ Both are explained in ((<call|XMLRPC::Client#call>)).
+
+ Simple to remember: The "2" in "call2" denotes the number of values it returns.
+
+--- XMLRPC::Client#multicall( *methods )
+ You can use this method to execute several methods on a XMLRPC server which supports
+ the multi-call extension.
+ Example:
+
+ s.multicall(
+ ['michael.add', 3, 4],
+ ['michael.sub', 4, 5]
+ )
+ # => [7, -1]
+
+--- XMLRPC::Client#multicall2( *methods )
+ Same as ((<XMLRPC::Client#multicall>)), but returns like ((<XMLRPC::Client#call2>)) two parameters
+ instead of raising an (({XMLRPC::FaultException})).
+
+--- XMLRPC::Client#proxy( prefix, *args )
+ Returns an object of class (({XMLRPC::Client::Proxy})), initialized with
+ ((|prefix|)) and ((|args|)). A proxy object returned by this method behaves
+ like ((<XMLRPC::Client#call>)), i.e. a call on that object will raise a
+ (({XMLRPC::FaultException})) when a fault-structure is returned by that call.
+
+--- XMLRPC::Client#proxy2( prefix, *args )
+ Almost the same like ((<XMLRPC::Client#proxy>)) only that a call on the returned
+ (({XMLRPC::Client::Proxy})) object behaves like ((<XMLRPC::Client#call2>)), i.e.
+ a call on that object will return two parameters.
+
+
+
+
+--- XMLRPC::Client#call_async(...)
+--- XMLRPC::Client#call2_async(...)
+--- XMLRPC::Client#multicall_async(...)
+--- XMLRPC::Client#multicall2_async(...)
+--- XMLRPC::Client#proxy_async(...)
+--- XMLRPC::Client#proxy2_async(...)
+ In contrast to corresponding methods without "_async", these can be
+ called concurrently and use for each request a new connection, where the
+ non-asynchronous counterparts use connection-alive (one connection for all requests)
+ if possible.
+
+ Note, that you have to use Threads to call these methods concurrently.
+ The following example calls two methods concurrently:
+
+ Thread.new {
+ p client.call_async("michael.add", 4, 5)
+ }
+
+ Thread.new {
+ p client.call_async("michael.div", 7, 9)
+ }
+
+
+--- XMLRPC::Client#timeout
+--- XMLRPC::Client#user
+--- XMLRPC::Client#password
+ Return the corresponding attributes.
+
+--- XMLRPC::Client#timeout= (new_timeout)
+--- XMLRPC::Client#user= (new_user)
+--- XMLRPC::Client#password= (new_password)
+ Set the corresponding attributes.
+
+
+--- XMLRPC::Client#set_writer( writer )
+ Sets the XML writer to use for generating XML output.
+ Should be an instance of a class from module (({XMLRPC::XMLWriter})).
+ If this method is not called, then (({XMLRPC::Config::DEFAULT_WRITER})) is used.
+
+--- XMLRPC::Client#set_parser( parser )
+ Sets the XML parser to use for parsing XML documents.
+ Should be an instance of a class from module (({XMLRPC::XMLParser})).
+ If this method is not called, then (({XMLRPC::Config::DEFAULT_PARSER})) is used.
+
+--- XMLRPC::Client#cookie
+--- XMLRPC::Client#cookie= (cookieString)
+ Get and set the HTTP Cookie header.
+
+--- XMLRPC::Client#http_header_extra= (additionalHeaders)
+ Set extra HTTP headers that are included in the request.
+
+--- XMLRPC::Client#http_header_extra
+ Access the via ((<XMLRPC::Client#http_header_extra=>)) assigned header.
+
+--- XMLRPC::Client#http_last_response
+ Returns the (({Net::HTTPResponse})) object of the last RPC.
+
+= XMLRPC::Client::Proxy
+== Synopsis
+ require "xmlrpc/client"
+
+ server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
+
+ michael = server.proxy("michael")
+ michael2 = server.proxy("michael", 4)
+
+ # both calls should return the same value '9'.
+ p michael.add(4,5)
+ p michael2.add(5)
+
+== Description
+Class (({XMLRPC::Client::Proxy})) makes XML-RPC calls look nicer!
+You can call any method onto objects of that class - the object handles
+(({method_missing})) and will forward the method call to a XML-RPC server.
+Don't use this class directly, but use instead method ((<XMLRPC::Client#proxy>)) or
+((<XMLRPC::Client#proxy2>)).
+
+== Class Methods
+--- XMLRPC::Client::Proxy.new( server, prefix, args=[], meth=:call, delim="." )
+ Creates an object which provides (({method_missing})).
+
+ ((|server|)) must be of type (({XMLRPC::Client})), which is the XML-RPC server to be used
+ for a XML-RPC call. ((|prefix|)) and ((|delim|)) will be prepended to the methodname
+ called onto this object.
+
+ Parameter ((|meth|)) is the method (call, call2, call_async, call2_async) to use for
+ a RPC.
+
+ ((|args|)) are arguments which are automatically given
+ to every XML-RPC call before the arguments provides through (({method_missing})).
+
+== Instance Methods
+Every method call is forwarded to the XML-RPC server defined in ((<new|XMLRPC::Client::Proxy#new>)).
+
+Note: Inherited methods from class (({Object})) cannot be used as XML-RPC names, because they get around
+(({method_missing})).
+
+
+
+= History
+ $Id$
+
+=end
+
+
+
require "xmlrpc/parser"
require "xmlrpc/create"
require "xmlrpc/config"
require "xmlrpc/utils" # ParserWriterChooseMixin
require "net/http"
-require "uri"
-
-module XMLRPC # :nodoc:
-
- # Provides remote procedure calls to a XML-RPC server.
- #
- # After setting the connection-parameters with XMLRPC::Client.new which
- # creates a new XMLRPC::Client instance, you can execute a remote procedure
- # by sending the XMLRPC::Client#call or XMLRPC::Client#call2
- # message to this new instance.
- #
- # The given parameters indicate which method to call on the remote-side and
- # of course the parameters for the remote procedure.
- #
- # require "xmlrpc/client"
- #
- # server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
- # begin
- # param = server.call("michael.add", 4, 5)
- # puts "4 + 5 = #{param}"
- # rescue XMLRPC::FaultException => e
- # puts "Error:"
- # puts e.faultCode
- # puts e.faultString
- # end
- #
- # or
- #
- # require "xmlrpc/client"
- #
- # server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
- # ok, param = server.call2("michael.add", 4, 5)
- # if ok then
- # puts "4 + 5 = #{param}"
- # else
- # puts "Error:"
- # puts param.faultCode
- # puts param.faultString
- # end
+
+module XMLRPC
+
class Client
USER_AGENT = "XMLRPC::Client (Ruby #{RUBY_VERSION})"
@@ -58,26 +290,8 @@ module XMLRPC # :nodoc:
include ParseContentType
- # Creates an object which represents the remote XML-RPC server on the
- # given +host+. If the server is CGI-based, +path+ is the
- # path to the CGI-script, which will be called, otherwise (in the
- # case of a standalone server) +path+ should be <tt>"/RPC2"</tt>.
- # +port+ is the port on which the XML-RPC server listens.
- #
- # If +proxy_host+ is given, then a proxy server listening at
- # +proxy_host+ is used. +proxy_port+ is the port of the
- # proxy server.
- #
- # Default values for +host+, +path+ and +port+ are 'localhost', '/RPC2' and
- # '80' respectively using SSL '443'.
- #
- # If +user+ and +password+ are given, each time a request is sent,
- # an Authorization header is sent. Currently only Basic Authentication is
- # implemented, no Digest.
- #
- # If +use_ssl+ is set to +true+, communication over SSL is enabled.
- #
- # Parameter +timeout+ is the time to wait for a XML-RPC response, defaults to 30.
+ # Constructors -------------------------------------------------------------------
+
def initialize(host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil,
user=nil, password=nil, use_ssl=nil, timeout=nil)
@@ -110,7 +324,8 @@ module XMLRPC # :nodoc:
@proxy_port = @proxy_port.to_i if @proxy_port != nil
# HTTP object for synchronous calls
- @http = net_http(@host, @port, @proxy_host, @proxy_port)
+ Net::HTTP.version_1_2
+ @http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port)
@http.use_ssl = @use_ssl if @use_ssl
@http.read_timeout = @timeout
@http.open_timeout = @timeout
@@ -122,55 +337,28 @@ module XMLRPC # :nodoc:
class << self
- # Creates an object which represents the remote XML-RPC server at the
- # given +uri+. The URI should have a host, port, path, user and password.
- # Example: https://user:password@host:port/path
- #
- # Raises an ArgumentError if the +uri+ is invalid,
- # or if the protocol isn't http or https.
- #
- # If a +proxy+ is given it should be in the form of "host:port".
- #
- # The optional +timeout+ defaults to 30 seconds.
def new2(uri, proxy=nil, timeout=nil)
- begin
- url = URI(uri)
- rescue URI::InvalidURIError => e
- raise ArgumentError, e.message, e.backtrace
- end
+ if match = /^([^:]+):\/\/(([^@]+)@)?([^\/]+)(\/.*)?$/.match(uri)
+ proto = match[1]
+ user, passwd = (match[3] || "").split(":")
+ host, port = match[4].split(":")
+ path = match[5]
+
+ if proto != "http" and proto != "https"
+ raise "Wrong protocol specified. Only http or https allowed!"
+ end
- unless URI::HTTP === url
- raise ArgumentError, "Wrong protocol specified. Only http or https allowed!"
+ else
+ raise "Wrong URI as parameter!"
end
- proto = url.scheme
- user = url.user
- passwd = url.password
- host = url.host
- port = url.port
- path = url.path.empty? ? nil : url.request_uri
-
proxy_host, proxy_port = (proxy || "").split(":")
- proxy_port = proxy_port.to_i if proxy_port
self.new(host, path, port, proxy_host, proxy_port, user, passwd, (proto == "https"), timeout)
end
alias new_from_uri new2
- # Receives a Hash and calls XMLRPC::Client.new
- # with the corresponding values.
- #
- # The +hash+ parameter has following case-insensitive keys:
- # * host
- # * path
- # * port
- # * proxy_host
- # * proxy_port
- # * user
- # * password
- # * use_ssl
- # * timeout
def new3(hash={})
# convert all keys into lowercase strings
@@ -186,76 +374,38 @@ module XMLRPC # :nodoc:
end
- # Add additional HTTP headers to the request
+ # Attribute Accessors -------------------------------------------------------------------
+
+ # add additional HTTP headers to the request
attr_accessor :http_header_extra
- # Returns the Net::HTTPResponse object of the last RPC.
+ # makes last HTTP response accessible
attr_reader :http_last_response
- # Get and set the HTTP Cookie header.
+ # Cookie support
attr_accessor :cookie
- # Return the corresponding attributes.
attr_reader :timeout, :user, :password
- # Sets the Net::HTTP#read_timeout and Net::HTTP#open_timeout to
- # +new_timeout+
def timeout=(new_timeout)
@timeout = new_timeout
@http.read_timeout = @timeout
@http.open_timeout = @timeout
end
- # Changes the user for the Basic Authentication header to +new_user+
def user=(new_user)
@user = new_user
set_auth
end
- # Changes the password for the Basic Authentication header to
- # +new_password+
def password=(new_password)
@password = new_password
set_auth
end
- # Invokes the method named +method+ with the parameters given by
- # +args+ on the XML-RPC server.
- #
- # The +method+ parameter is converted into a String and should
- # be a valid XML-RPC method-name.
- #
- # Each parameter of +args+ must be of one of the following types,
- # where Hash, Struct and Array can contain any of these listed _types_:
- #
- # * Fixnum, Bignum
- # * TrueClass, FalseClass, +true+, +false+
- # * String, Symbol
- # * Float
- # * Hash, Struct
- # * Array
- # * Date, Time, XMLRPC::DateTime
- # * XMLRPC::Base64
- # * A Ruby object which class includes XMLRPC::Marshallable
- # (only if Config::ENABLE_MARSHALLABLE is +true+).
- # That object is converted into a hash, with one additional key/value
- # pair <code>___class___</code> which contains the class name
- # for restoring that object later.
- #
- # The method returns the return-value from the Remote Procedure Call.
- #
- # The type of the return-value is one of the types shown above.
- #
- # A Bignum is only allowed when it fits in 32-bit. A XML-RPC
- # +dateTime.iso8601+ type is always returned as a XMLRPC::DateTime object.
- # Struct is never returned, only a Hash, the same for a Symbol, where as a
- # String is always returned. XMLRPC::Base64 is returned as a String from
- # xmlrpc4r version 1.6.1 on.
- #
- # If the remote procedure returned a fault-structure, then a
- # XMLRPC::FaultException exception is raised, which has two accessor-methods
- # +faultCode+ an Integer, and +faultString+ a String.
+ # Call methods --------------------------------------------------------------
+
def call(method, *args)
ok, param = call2(method, *args)
if ok
@@ -265,37 +415,12 @@ module XMLRPC # :nodoc:
end
end
- # The difference between this method and XMLRPC::Client#call is, that
- # this method will <b>NOT</b> raise a XMLRPC::FaultException exception.
- #
- # The method returns an array of two values. The first value indicates if
- # the second value is +true+ or an XMLRPC::FaultException.
- #
- # Both are explained in XMLRPC::Client#call.
- #
- # Simple to remember: The "2" in "call2" denotes the number of values it returns.
def call2(method, *args)
request = create().methodCall(method, *args)
data = do_rpc(request, false)
parser().parseMethodResponse(data)
end
- # Similar to XMLRPC::Client#call, however can be called concurrently and
- # use a new connection for each request. In contrast to the corresponding
- # method without the +_async+ suffix, which use connect-alive (one
- # connection for all requests).
- #
- # Note, that you have to use Thread to call these methods concurrently.
- # The following example calls two methods concurrently:
- #
- # Thread.new {
- # p client.call_async("michael.add", 4, 5)
- # }
- #
- # Thread.new {
- # p client.call_async("michael.div", 7, 9)
- # }
- #
def call_async(method, *args)
ok, param = call2_async(method, *args)
if ok
@@ -305,9 +430,6 @@ module XMLRPC # :nodoc:
end
end
- # Same as XMLRPC::Client#call2, but can be called concurrently.
- #
- # See also XMLRPC::Client#call_async
def call2_async(method, *args)
request = create().methodCall(method, *args)
data = do_rpc(request, true)
@@ -315,14 +437,8 @@ module XMLRPC # :nodoc:
end
- # You can use this method to execute several methods on a XMLRPC server
- # which support the multi-call extension.
- #
- # s.multicall(
- # ['michael.add', 3, 4],
- # ['michael.sub', 4, 5]
- # )
- # # => [7, -1]
+ # Multicall methods --------------------------------------------------------------
+
def multicall(*methods)
ok, params = multicall2(*methods)
if ok
@@ -332,30 +448,10 @@ module XMLRPC # :nodoc:
end
end
- # Same as XMLRPC::Client#multicall, but returns two parameters instead of
- # raising an XMLRPC::FaultException.
- #
- # See XMLRPC::Client#call2
def multicall2(*methods)
gen_multicall(methods, false)
end
- # Similar to XMLRPC::Client#multicall, however can be called concurrently and
- # use a new connection for each request. In contrast to the corresponding
- # method without the +_async+ suffix, which use connect-alive (one
- # connection for all requests).
- #
- # Note, that you have to use Thread to call these methods concurrently.
- # The following example calls two methods concurrently:
- #
- # Thread.new {
- # p client.multicall_async("michael.add", 4, 5)
- # }
- #
- # Thread.new {
- # p client.multicall_async("michael.div", 7, 9)
- # }
- #
def multicall_async(*methods)
ok, params = multicall2_async(*methods)
if ok
@@ -365,65 +461,31 @@ module XMLRPC # :nodoc:
end
end
- # Same as XMLRPC::Client#multicall2, but can be called concurrently.
- #
- # See also XMLRPC::Client#multicall_async
def multicall2_async(*methods)
gen_multicall(methods, true)
end
- # Returns an object of class XMLRPC::Client::Proxy, initialized with
- # +prefix+ and +args+.
- #
- # A proxy object returned by this method behaves like XMLRPC::Client#call,
- # i.e. a call on that object will raise a XMLRPC::FaultException when a
- # fault-structure is returned by that call.
+ # Proxy generating methods ------------------------------------------
+
def proxy(prefix=nil, *args)
Proxy.new(self, prefix, args, :call)
end
- # Almost the same like XMLRPC::Client#proxy only that a call on the returned
- # XMLRPC::Client::Proxy object will return two parameters.
- #
- # See XMLRPC::Client#call2
def proxy2(prefix=nil, *args)
Proxy.new(self, prefix, args, :call2)
end
- # Similar to XMLRPC::Client#proxy, however can be called concurrently and
- # use a new connection for each request. In contrast to the corresponding
- # method without the +_async+ suffix, which use connect-alive (one
- # connection for all requests).
- #
- # Note, that you have to use Thread to call these methods concurrently.
- # The following example calls two methods concurrently:
- #
- # Thread.new {
- # p client.proxy_async("michael.add", 4, 5)
- # }
- #
- # Thread.new {
- # p client.proxy_async("michael.div", 7, 9)
- # }
- #
def proxy_async(prefix=nil, *args)
Proxy.new(self, prefix, args, :call_async)
end
- # Same as XMLRPC::Client#proxy2, but can be called concurrently.
- #
- # See also XMLRPC::Client#proxy_async
def proxy2_async(prefix=nil, *args)
Proxy.new(self, prefix, args, :call2_async)
end
- private
-
- def net_http(host, port, proxy_host, proxy_port)
- Net::HTTP.new host, port, proxy_host, proxy_port
- end
+ private # ----------------------------------------------------------
def set_auth
if @user.nil?
@@ -431,7 +493,7 @@ module XMLRPC # :nodoc:
else
a = "#@user"
a << ":#@password" if @password != nil
- @auth = "Basic " + [a].pack("m0")
+ @auth = ("Basic " + [a].pack("m")).chomp
end
end
@@ -439,7 +501,7 @@ module XMLRPC # :nodoc:
header = {
"User-Agent" => USER_AGENT,
"Content-Type" => "text/xml; charset=utf-8",
- "Content-Length" => request.bytesize.to_s,
+ "Content-Length" => request.size.to_s,
"Connection" => (async ? "close" : "keep-alive")
}
@@ -456,14 +518,15 @@ module XMLRPC # :nodoc:
if async
# use a new HTTP object for each call
- http = net_http(@host, @port, @proxy_host, @proxy_port)
+ Net::HTTP.version_1_2
+ http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port)
http.use_ssl = @use_ssl if @use_ssl
http.read_timeout = @timeout
http.open_timeout = @timeout
# post request
http.start {
- resp = http.request_post(@path, request, header)
+ resp = http.post2(@path, request, header)
}
else
# reuse the HTTP object for each call => connection alive is possible
@@ -472,7 +535,7 @@ module XMLRPC # :nodoc:
@http.start if not @http.started?
# post request
- resp = @http.request_post(@path, request, header)
+ resp = @http.post2(@path, request, header)
end
@http_last_response = resp
@@ -486,9 +549,7 @@ module XMLRPC # :nodoc:
raise "HTTP-Error: #{resp.code} #{resp.message}"
end
- # assume text/xml on instances where Content-Type header is not set
- ct_expected = resp["Content-Type"] || 'text/xml'
- ct = parse_content_type(ct_expected).first
+ ct = parse_content_type(resp["Content-Type"]).first
if ct != "text/xml"
if ct == "text/html"
raise "Wrong content-type (received '#{ct}' but expected 'text/xml'): \n#{data}"
@@ -498,8 +559,10 @@ module XMLRPC # :nodoc:
end
expected = resp["Content-Length"] || "<unknown>"
- if data.nil? or data.bytesize == 0
- raise "Wrong size. Was #{data.bytesize}, should be #{expected}"
+ if data.nil? or data.size == 0
+ raise "Wrong size. Was #{data.size}, should be #{expected}"
+ elsif expected != "<unknown>" and expected.to_i != data.size and resp["Transfer-Encoding"].nil?
+ raise "Wrong size. Was #{data.size}, should be #{expected}"
end
set_cookies = resp.get_fields("Set-Cookie")
@@ -539,39 +602,8 @@ module XMLRPC # :nodoc:
- # XML-RPC calls look nicer!
- #
- # You can call any method onto objects of that class - the object handles
- # XMLRPC::Client::Proxy#method_missing and will forward the method call to
- # a XML-RPC server.
- #
- # Don't use this class directly, instead use the public instance method
- # XMLRPC::Client#proxy or XMLRPC::Client#proxy2.
- #
- # require "xmlrpc/client"
- #
- # server = XMLRPC::Client.new("www.ruby-lang.org", "/RPC2", 80)
- #
- # michael = server.proxy("michael")
- # michael2 = server.proxy("michael", 4)
- #
- # # both calls should return the same value '9'.
- # p michael.add(4,5)
- # p michael2.add(5)
class Proxy
- # Creates an object which provides XMLRPC::Client::Proxy#method_missing.
- #
- # The given +server+ must be an instance of XMLRPC::Client, which is the
- # XML-RPC server to be used for a XML-RPC call.
- #
- # +prefix+ and +delim+ will be prepended to the method name called onto this object.
- #
- # An optional parameter +meth+ is the method to use for a RPC.
- # It can be either, call, call2, call_async, call2_async
- #
- # +args+ are arguments which are automatically given to every XML-RPC
- # call before being provided through +method_missing+.
def initialize(server, prefix, args=[], meth=:call, delim=".")
@server = server
@prefix = prefix ? prefix + delim : ""
@@ -579,11 +611,6 @@ module XMLRPC # :nodoc:
@meth = meth
end
- # Every method call is forwarded to the XML-RPC server defined in
- # XMLRPC::Client::Proxy#new.
- #
- # Note: Inherited methods from class Object cannot be used as XML-RPC
- # names, because they get around +method_missing+.
def method_missing(mid, *args)
pre = @prefix + mid.to_s
arg = @args + args
diff --git a/lib/xmlrpc/config.rb b/lib/xmlrpc/config.rb
index 0213bef2a6..34c3bbaf1b 100644
--- a/lib/xmlrpc/config.rb
+++ b/lib/xmlrpc/config.rb
@@ -3,28 +3,26 @@
# Configuration file for XML-RPC for Ruby
#
-module XMLRPC # :nodoc:
+module XMLRPC
module Config
- # or XMLWriter::XMLParser
- DEFAULT_WRITER = XMLWriter::Simple
-
- # === Available parsers
- #
- # * XMLParser::NQXMLTreeParser
- # * XMLParser::NQXMLStreamParser
- # * XMLParser::XMLTreeParser
- # * XMLParser::XMLStreamParser (fastest)
- # * XMLParser::REXMLStreamParser
- # * XMLParser::XMLScanStreamParser
+ DEFAULT_WRITER = XMLWriter::Simple # or XMLWriter::XMLParser
+
+ # available parser:
+ # * XMLParser::NQXMLTreeParser
+ # * XMLParser::NQXMLStreamParser
+ # * XMLParser::XMLTreeParser
+ # * XMLParser::XMLStreamParser (fastest)
+ # * XMLParser::REXMLStreamParser
+ # * XMLParser::XMLScanStreamParser
DEFAULT_PARSER = XMLParser::REXMLStreamParser
- # enable <code><nil/></code> tag
+ # enable <nil/> tag
ENABLE_NIL_CREATE = false
ENABLE_NIL_PARSER = false
- # allows integers greater than 32-bit if +true+
+ # allows integers greater than 32-bit if true
ENABLE_BIGINT = false
# enable marshalling ruby objects which include XMLRPC::Marshallable
diff --git a/lib/xmlrpc/create.rb b/lib/xmlrpc/create.rb
index 13c9cd8faa..a1dc0968f0 100644
--- a/lib/xmlrpc/create.rb
+++ b/lib/xmlrpc/create.rb
@@ -1,4 +1,6 @@
#
+# Creates XML-RPC call/response documents
+#
# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
#
# $Id$
@@ -7,7 +9,7 @@
require "date"
require "xmlrpc/base64"
-module XMLRPC # :nodoc:
+module XMLRPC
module XMLWriter
@@ -98,8 +100,6 @@ module XMLRPC # :nodoc:
end # module XMLWriter
- # Creates XML-RPC call/response documents
- #
class Create
def initialize(xml_writer = nil)
@@ -132,14 +132,14 @@ module XMLRPC # :nodoc:
#
- # Generates a XML-RPC methodResponse document
+ # generates a XML-RPC methodResponse document
#
- # When +is_ret+ is +false+ then the +params+ array must
+ # if is_ret == false then the params array must
# contain only one element, which is a structure
# of a fault return-value.
#
- # When +is_ret+ is +true+ then a normal
- # return-value of all the given +params+ is created.
+ # if is_ret == true then a normal
+ # return-value of all the given params is created.
#
def methodResponse(is_ret, *params)
@@ -167,12 +167,15 @@ module XMLRPC # :nodoc:
+ #####################################
private
+ #####################################
#
- # Converts a Ruby object into a XML-RPC <code><value></code> tag
+ # converts a Ruby object into
+ # a XML-RPC <value> tag
#
- def conv2value(param) # :doc:
+ def conv2value(param)
val = case param
when Fixnum, Bignum
@@ -203,7 +206,6 @@ module XMLRPC # :nodoc:
end
when Float
- raise "Wrong value #{param}. Not allowed!" unless param.finite?
@writer.tag("double", param.to_s)
when Struct
diff --git a/lib/xmlrpc/datetime.rb b/lib/xmlrpc/datetime.rb
index dff2304f92..d6c80a2cb9 100644
--- a/lib/xmlrpc/datetime.rb
+++ b/lib/xmlrpc/datetime.rb
@@ -1,95 +1,115 @@
-#
-# xmlrpc/datetime.rb
-# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
-#
-# Released under the same term of license as Ruby.
-#
+=begin
+= xmlrpc/datetime.rb
+Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::DateTime>))
+
+= XMLRPC::DateTime
+== Description
+This class is important to handle XMLRPC (('dateTime.iso8601')) values,
+correcly, because normal UNIX-dates (class (({Date}))) only handle dates
+from year 1970 on, and class (({Time})) handles dates without the time
+component. (({XMLRPC::DateTime})) is able to store a XMLRPC
+(('dateTime.iso8601')) value correctly.
+
+== Class Methods
+--- XMLRPC::DateTime.new( year, month, day, hour, min, sec )
+ Creates a new (({XMLRPC::DateTime})) instance with the
+ parameters ((|year|)), ((|month|)), ((|day|)) as date and
+ ((|hour|)), ((|min|)), ((|sec|)) as time.
+ Raises (({ArgumentError})) if a parameter is out of range, or ((|year|)) is not
+ of type (({Integer})).
+
+== Instance Methods
+--- XMLRPC::DateTime#year
+--- XMLRPC::DateTime#month
+--- XMLRPC::DateTime#day
+--- XMLRPC::DateTime#hour
+--- XMLRPC::DateTime#min
+--- XMLRPC::DateTime#sec
+ Return the value of the specified date/time component.
+
+--- XMLRPC::DateTime#mon
+ Alias for ((<XMLRPC::DateTime#month>)).
+
+--- XMLRPC::DateTime#year=( value )
+--- XMLRPC::DateTime#month=( value )
+--- XMLRPC::DateTime#day=( value )
+--- XMLRPC::DateTime#hour=( value )
+--- XMLRPC::DateTime#min=( value )
+--- XMLRPC::DateTime#sec=( value )
+ Set ((|value|)) as the new date/time component.
+ Raises (({ArgumentError})) if ((|value|)) is out of range, or in the case
+ of (({XMLRPC::DateTime#year=})) if ((|value|)) is not of type (({Integer})).
+
+--- XMLRPC::DateTime#mon=( value )
+ Alias for ((<XMLRPC::DateTime#month=>)).
+
+--- XMLRPC::DateTime#to_time
+ Return a (({Time})) object of the date/time which (({self})) represents.
+ If the (('year')) is below 1970, this method returns (({nil})),
+ because (({Time})) cannot handle years below 1970.
+ The used timezone is GMT.
+
+--- XMLRPC::DateTime#to_date
+ Return a (({Date})) object of the date which (({self})) represents.
+ The (({Date})) object do ((*not*)) contain the time component (only date).
+
+--- XMLRPC::DateTime#to_a
+ Returns all date/time components in an array.
+ Returns (({[year, month, day, hour, min, sec]})).
+=end
+
require "date"
-module XMLRPC # :nodoc:
+module XMLRPC
-# This class is important to handle XMLRPC +dateTime.iso8601+ values,
-# correcly, because normal UNIX-dates, ie: Date, only handle dates
-# from year 1970 on, and ruby's native Time class handles dates without the
-# time component.
-#
-# XMLRPC::DateTime is able to store a XMLRPC +dateTime.iso8601+ value correctly.
class DateTime
- # Return the value of the specified date/time component.
attr_reader :year, :month, :day, :hour, :min, :sec
- # Set +value+ as the new date/time component.
- #
- # Raises ArgumentError if the given +value+ is out of range, or in the case
- # of XMLRPC::DateTime#year= if +value+ is not of type Integer.
def year= (value)
raise ArgumentError, "date/time out of range" unless value.is_a? Integer
@year = value
end
- # Set +value+ as the new date/time component.
- #
- # Raises an ArgumentError if the given +value+ isn't between 1 and 12.
def month= (value)
raise ArgumentError, "date/time out of range" unless (1..12).include? value
@month = value
end
- # Set +value+ as the new date/time component.
- #
- # Raises an ArgumentError if the given +value+ isn't between 1 and 31.
def day= (value)
raise ArgumentError, "date/time out of range" unless (1..31).include? value
@day = value
end
- # Set +value+ as the new date/time component.
- #
- # Raises an ArgumentError if the given +value+ isn't between 0 and 24.
def hour= (value)
raise ArgumentError, "date/time out of range" unless (0..24).include? value
@hour = value
end
- # Set +value+ as the new date/time component.
- #
- # Raises an ArgumentError if the given +value+ isn't between 0 and 59.
def min= (value)
raise ArgumentError, "date/time out of range" unless (0..59).include? value
@min = value
end
- # Set +value+ as the new date/time component.
- #
- # Raises an ArgumentError if the given +value+ isn't between 0 and 59.
def sec= (value)
raise ArgumentError, "date/time out of range" unless (0..59).include? value
@sec = value
end
- # Alias for XMLRPC::DateTime#month.
alias mon month
- # Alias for XMLRPC::DateTime#month=.
alias mon= month=
- # Creates a new XMLRPC::DateTime instance with the
- # parameters +year+, +month+, +day+ as date and
- # +hour+, +min+, +sec+ as time.
- #
- # Raises an ArgumentError if a parameter is out of range,
- # or if +year+ is not of the Integer type.
def initialize(year, month, day, hour, min, sec)
self.year, self.month, self.day = year, month, day
self.hour, self.min, self.sec = hour, min, sec
end
- # Return a Time object of the date/time which represents +self+.
- # If the <code>@year</code> is below 1970, this method returns +nil+,
- # because Time cannot handle years below 1970.
- #
- # The timezone used is GMT.
def to_time
if @year >= 1970
Time.gm(*to_a)
@@ -98,21 +118,14 @@ class DateTime
end
end
- # Return a Date object of the date which represents +self+.
- #
- # The Date object do _not_ contain the time component (only date).
def to_date
Date.new(*to_a[0,3])
end
- # Returns all date/time components in an array.
- #
- # Returns +[year, month, day, hour, min, sec]+.
def to_a
[@year, @month, @day, @hour, @min, @sec]
end
- # Returns whether or not all date/time components are an array.
def ==(o)
self.to_a == Array(o) rescue false
end
diff --git a/lib/xmlrpc/httpserver.rb b/lib/xmlrpc/httpserver.rb
index dd0d7417c1..66d52139db 100644
--- a/lib/xmlrpc/httpserver.rb
+++ b/lib/xmlrpc/httpserver.rb
@@ -1,3 +1,7 @@
+#
+# Implements a simple HTTP-server by using John W. Small's (jsmall@laser.net)
+# ruby-generic-server.
+#
# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
#
# $Id$
@@ -6,13 +10,11 @@
require "gserver"
-# Implements a simple HTTP-server by using John W. Small's (jsmall@laser.net)
-# ruby-generic-server: GServer.
class HttpServer < GServer
##
- # +handle_obj+ specifies the object, that receives calls from +request_handler+
- # and +ip_auth_handler+
+ # handle_obj specifies the object, that receives calls to request_handler
+ # and ip_auth_handler
def initialize(handle_obj, port = 8080, host = DEFAULT_HOST, maxConnections = 4,
stdlog = $stdout, audit = true, debug = true)
@handler = handle_obj
@@ -21,16 +23,19 @@ class HttpServer < GServer
private
+ # Constants -----------------------------------------------
+
CRLF = "\r\n"
HTTP_PROTO = "HTTP/1.0"
SERVER_NAME = "HttpServer (Ruby #{RUBY_VERSION})"
- # Default header for the server name
DEFAULT_HEADER = {
"Server" => SERVER_NAME
}
- # Mapping of status codes and error messages
+ ##
+ # Mapping of status code and error message
+ #
StatusCodeMapping = {
200 => "OK",
400 => "Bad Request",
@@ -40,6 +45,8 @@ private
500 => "Internal Server Error"
}
+ # Classes -------------------------------------------------
+
class Request
attr_reader :data, :header, :method, :path, :proto
@@ -67,7 +74,10 @@ private
end
end
- # A case-insensitive Hash class for HTTP header
+
+ ##
+ # a case-insensitive Hash class for HTTP header
+ #
class Table
include Enumerable
@@ -93,15 +103,15 @@ private
@hash.each {|k,v| yield k.capitalize, v }
end
- # Output the Hash table for the HTTP header
def writeTo(port)
each { |k,v| port << "#{k}: #{v}" << CRLF }
end
end # class Table
- # Generates a Hash with the HTTP headers
- def http_header(header=nil) # :doc:
+ # Helper Methods ------------------------------------------
+
+ def http_header(header=nil)
new_header = Table.new(DEFAULT_HEADER)
new_header.update(header) unless header.nil?
@@ -111,14 +121,11 @@ private
new_header
end
- # Returns a string which represents the time as rfc1123-date of HTTP-date
- def http_date( aTime ) # :doc:
+ def http_date( aTime )
aTime.gmtime.strftime( "%a, %d %b %Y %H:%M:%S GMT" )
end
- # Returns a string which includes the status code message as,
- # http headers, and body for the response.
- def http_resp(status_code, status_message=nil, header=nil, body=nil) # :doc:
+ def http_resp(status_code, status_message=nil, header=nil, body=nil)
status_message ||= StatusCodeMapping[status_code]
str = ""
@@ -129,11 +136,9 @@ private
str
end
- # Handles the HTTP request and writes the response back to the client, +io+.
- #
- # If an Exception is raised while handling the request, the client will receive
- # a 500 "Internal Server Error" message.
- def serve(io) # :doc:
+ # Main Serve Loop -----------------------------------------
+
+ def serve(io)
# perform IP authentification
unless @handler.ip_auth_handler(io)
io << http_resp(403, "Forbidden")
@@ -165,7 +170,7 @@ private
io << http_resp(response.status, response.status_message,
response.header, response.body)
- rescue Exception
+ rescue Exception => e
io << http_resp(500, "Internal Server Error")
end
diff --git a/lib/xmlrpc/marshal.rb b/lib/xmlrpc/marshal.rb
index ef1234f801..d121828312 100644
--- a/lib/xmlrpc/marshal.rb
+++ b/lib/xmlrpc/marshal.rb
@@ -1,4 +1,6 @@
#
+# Marshalling of XML-RPC methodCall and methodResponse
+#
# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
#
# $Id$
@@ -9,12 +11,13 @@ require "xmlrpc/create"
require "xmlrpc/config"
require "xmlrpc/utils"
-module XMLRPC # :nodoc:
+module XMLRPC
- # Marshalling of XMLRPC::Create#methodCall and XMLRPC::Create#methodResponse
class Marshal
include ParserWriterChooseMixin
+ # class methods -------------------------------
+
class << self
def dump_call( methodName, *params )
@@ -38,6 +41,8 @@ module XMLRPC # :nodoc:
end # class self
+ # instance methods ----------------------------
+
def initialize( parser = nil, writer = nil )
set_parser( parser )
set_writer( writer )
@@ -51,12 +56,16 @@ module XMLRPC # :nodoc:
create.methodResponse( ! param.kind_of?( XMLRPC::FaultException ) , param )
end
- # Returns <code>[ methodname, params ]</code>
+ ##
+ # returns [ methodname, params ]
+ #
def load_call( stringOrReadable )
parser.parseMethodCall( stringOrReadable )
end
- # Returns +paramOrFault+
+ ##
+ # returns paramOrFault
+ #
def load_response( stringOrReadable )
parser.parseMethodResponse( stringOrReadable )[1]
end
@@ -64,3 +73,4 @@ module XMLRPC # :nodoc:
end # class Marshal
end
+
diff --git a/lib/xmlrpc/parser.rb b/lib/xmlrpc/parser.rb
index 0afbd07e6b..d8e91b0098 100644
--- a/lib/xmlrpc/parser.rb
+++ b/lib/xmlrpc/parser.rb
@@ -1,3 +1,6 @@
+#
+# Parser for XML-RPC call and response
+#
# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
#
# $Id$
@@ -9,6 +12,7 @@ require "xmlrpc/base64"
require "xmlrpc/datetime"
+# add some methods to NQXML::Node
module NQXML
class Node
@@ -45,41 +49,29 @@ module NQXML
end # class Node
end # module NQXML
-module XMLRPC # :nodoc:
+module XMLRPC
- # Raised when the remote procedure returns a fault-structure, which has two
- # accessor-methods +faultCode+ an Integer, and +faultString+ a String.
class FaultException < StandardError
attr_reader :faultCode, :faultString
- # Creates a new XMLRPC::FaultException instance.
- #
- # +faultString+ is passed to StandardError as the +msg+ of the Exception.
+ alias message faultString
+
def initialize(faultCode, faultString)
@faultCode = faultCode
@faultString = faultString
- super(@faultString)
end
- # The +faultCode+ and +faultString+ of the exception in a Hash.
+ # returns a hash
def to_h
{"faultCode" => @faultCode, "faultString" => @faultString}
end
end
- # Helper class used to convert types.
module Convert
-
- # Converts a String to an Integer
- #
- # See also String.to_i
def self.int(str)
str.to_i
end
- # Converts a String to +true+ or +false+
- #
- # Raises an exception if +str+ is not +0+ or +1+
def self.boolean(str)
case str
when "0" then false
@@ -89,18 +81,10 @@ module XMLRPC # :nodoc:
end
end
- # Converts a String to a Float
- #
- # See also String.to_f
def self.double(str)
str.to_f
end
- # Converts a the given +str+ to a +dateTime.iso8601+ formatted date.
- #
- # Raises an exception if the String isn't in +dateTime.iso8601+ format.
- #
- # See also, XMLRPC::DateTime
def self.dateTime(str)
case str
when /^(-?\d\d\d\d)-?(\d\d)-?(\d\d)T(\d\d):(\d\d):(\d\d)(?:Z|([+-])(\d\d):?(\d\d))?$/
@@ -131,16 +115,12 @@ module XMLRPC # :nodoc:
end
end
- # Decodes the given +str+ using XMLRPC::Base64.decode
def self.base64(str)
XMLRPC::Base64.decode(str)
end
- # Converts the given +hash+ to a marshalled object.
- #
- # Returns the given +hash+ if an exception occurs.
def self.struct(hash)
- # convert to marshalled object
+ # convert to marhalled object
klass = hash["___class___"]
if klass.nil? or Config::ENABLE_MARSHALLING == false
hash
@@ -162,15 +142,6 @@ module XMLRPC # :nodoc:
end
end
- # Converts the given +hash+ to an XMLRPC::FaultException object by passing
- # the +faultCode+ and +faultString+ attributes of the Hash to
- # XMLRPC::FaultException.new
- #
- # Raises an Exception if the given +hash+ doesn't meet the requirements.
- # Those requirements being:
- # * 2 keys
- # * <code>'faultCode'</code> key is an Integer
- # * <code>'faultString'</code> key is a String
def self.fault(hash)
if hash.kind_of? Hash and hash.size == 2 and
hash.has_key? "faultCode" and hash.has_key? "faultString" and
@@ -184,7 +155,6 @@ module XMLRPC # :nodoc:
end # module Convert
- # Parser for XML-RPC call and response
module XMLParser
class AbstractTreeParser
@@ -199,8 +169,10 @@ module XMLRPC # :nodoc:
private
- # Removes all whitespaces but in the tags i4, i8, int, boolean....
+ #
+ # remove all whitespaces but in the tags i4, int, boolean....
# and all comments
+ #
def removeWhitespacesAndComments(node)
remove = []
childs = node.childNodes.to_a
@@ -208,7 +180,7 @@ module XMLRPC # :nodoc:
case _nodeType(nd)
when :TEXT
# TODO: add nil?
- unless %w(i4 i8 int boolean string double dateTime.iso8601 base64).include? node.nodeName
+ unless %w(i4 int boolean string double dateTime.iso8601 base64).include? node.nodeName
if node.nodeName == "value"
if not node.childNodes.to_a.detect {|n| _nodeType(n) == :ELEMENT}.nil?
@@ -246,7 +218,9 @@ module XMLRPC # :nodoc:
node
end
- # Returns, when successfully the only child-node
+ #
+ # returns, when successfully the only child-node
+ #
def hasOnlyOneChild(node, name=nil)
if node.childNodes.to_a.size != 1
raise "wrong xml-rpc (size)"
@@ -263,7 +237,7 @@ module XMLRPC # :nodoc:
end
end
- # The node `node` has empty string or string
+ # the node `node` has empty string or string
def text_zero_one(node)
nodes = node.childNodes.to_a.size
@@ -280,7 +254,7 @@ module XMLRPC # :nodoc:
def integer(node)
#TODO: check string for float because to_i returnsa
# 0 when wrong string
- nodeMustBe(node, %w(i4 i8 int))
+ nodeMustBe(node, %w(i4 int))
hasOnlyOneChild(node)
Convert.int(text(node.firstChild))
@@ -442,7 +416,7 @@ module XMLRPC # :nodoc:
text_zero_one(node)
when :ELEMENT
case child.nodeName
- when "i4", "i8", "int" then integer(child)
+ when "i4", "int" then integer(child)
when "boolean" then boolean(child)
when "string" then string(child)
when "double" then double(child)
@@ -552,7 +526,7 @@ module XMLRPC # :nodoc:
case name
when "string"
@value = @data
- when "i4", "i8", "int"
+ when "i4", "int"
@value = Convert.int(@data)
when "boolean"
@value = Convert.boolean(@data)
@@ -602,6 +576,7 @@ module XMLRPC # :nodoc:
end # module StreamParserMixin
+ # ---------------------------------------------------------------------------
class XMLStreamParser < AbstractStreamParser
def initialize
require "xmlparser"
@@ -610,7 +585,7 @@ module XMLRPC # :nodoc:
}
end
end # class XMLStreamParser
-
+ # ---------------------------------------------------------------------------
class NQXMLStreamParser < AbstractStreamParser
def initialize
require "nqxml/streamingparser"
@@ -639,7 +614,7 @@ module XMLRPC # :nodoc:
end # class XMLRPCParser
end # class NQXMLStreamParser
-
+ # ---------------------------------------------------------------------------
class XMLTreeParser < AbstractTreeParser
def initialize
@@ -650,10 +625,10 @@ module XMLRPC # :nodoc:
if defined? XML::DOM::Builder
return if defined? XML::DOM::Node::DOCUMENT # code below has been already executed
klass = XML::DOM::Node
- klass.const_set(:DOCUMENT, klass::DOCUMENT_NODE)
- klass.const_set(:TEXT, klass::TEXT_NODE)
- klass.const_set(:COMMENT, klass::COMMENT_NODE)
- klass.const_set(:ELEMENT, klass::ELEMENT_NODE)
+ klass.const_set("DOCUMENT", klass::DOCUMENT_NODE)
+ klass.const_set("TEXT", klass::TEXT_NODE)
+ klass.const_set("COMMENT", klass::COMMENT_NODE)
+ klass.const_set("ELEMENT", klass::ELEMENT_NODE)
end
end
@@ -691,7 +666,7 @@ module XMLRPC # :nodoc:
end
end # class XMLParser
-
+ # ---------------------------------------------------------------------------
class NQXMLTreeParser < AbstractTreeParser
def initialize
@@ -719,7 +694,7 @@ module XMLRPC # :nodoc:
end
end # class NQXMLTreeParser
-
+ # ---------------------------------------------------------------------------
class REXMLStreamParser < AbstractStreamParser
def initialize
require "rexml/document"
@@ -739,12 +714,12 @@ module XMLRPC # :nodoc:
end
def parse(str)
- REXML::Document.parse_stream(str, self)
+ parser = REXML::Document.parse_stream(str, self)
end
end
end
-
+ # ---------------------------------------------------------------------------
class XMLScanStreamParser < AbstractStreamParser
def initialize
require "xmlscan/parser"
@@ -768,7 +743,7 @@ module XMLRPC # :nodoc:
end
alias :on_stag :startElement
- alias :on_etag :endElement
+ alias :on_etag :endElement
def on_stag_end(name); end
@@ -813,7 +788,7 @@ module XMLRPC # :nodoc:
end
end
-
+ # ---------------------------------------------------------------------------
XMLParser = XMLTreeParser
NQXMLParser = NQXMLTreeParser
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index c16375b405..b7345cd9d6 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -1,7 +1,146 @@
-# xmlrpc/server.rb
-# Copyright (C) 2001, 2002, 2003, 2005 by Michael Neumann (mneumann@ntecs.de)
-#
-# Released under the same term of license as Ruby.
+=begin
+= xmlrpc/server.rb
+Copyright (C) 2001, 2002, 2003, 2005 by Michael Neumann (mneumann@ntecs.de)
+
+Released under the same term of license as Ruby.
+
+= Classes
+* ((<XMLRPC::BasicServer>))
+* ((<XMLRPC::CGIServer>))
+* ((<XMLRPC::ModRubyServer>))
+* ((<XMLRPC::Server>))
+* ((<XMLRPC::WEBrickServlet>))
+
+= XMLRPC::BasicServer
+== Description
+Is the base class for all XML-RPC server-types (CGI, standalone).
+You can add handler and set a default handler.
+Do not use this server, as this is/should be an abstract class.
+
+=== How the method to call is found
+The arity (number of accepted arguments) of a handler (method or (({Proc})) object) is
+compared to the given arguments submitted by the client for a RPC ((-Remote Procedure Call-)).
+A handler is only called if it accepts the number of arguments, otherwise the search
+for another handler will go on. When at the end no handler was found,
+the ((<default_handler|XMLRPC::BasicServer#set_default_handler>)) will be called.
+With this technique it is possible to do overloading by number of parameters, but
+only for (({Proc})) handler, because you cannot define two methods of the same name in
+the same class.
+
+
+== Class Methods
+--- XMLRPC::BasicServer.new( class_delim="." )
+ Creates a new (({XMLRPC::BasicServer})) instance, which should not be
+ done, because (({XMLRPC::BasicServer})) is an abstract class. This
+ method should be called from a subclass indirectly by a (({super})) call
+ in the method (({initialize})). The paramter ((|class_delim|)) is used
+ in ((<add_handler|XMLRPC::BasicServer#add_handler>)) when an object is
+ added as handler, to delimit the object-prefix and the method-name.
+
+== Instance Methods
+--- XMLRPC::BasicServer#add_handler( name, signature=nil, help=nil ) { aBlock }
+ Adds ((|aBlock|)) to the list of handlers, with ((|name|)) as the name of the method.
+ Parameters ((|signature|)) and ((|help|)) are used by the Introspection method if specified,
+ where ((|signature|)) is either an Array containing strings each representing a type of it's
+ signature (the first is the return value) or an Array of Arrays if the method has multiple
+ signatures. Value type-names are "int, boolean, double, string, dateTime.iso8601, base64, array, struct".
+
+ Parameter ((|help|)) is a String with informations about how to call this method etc.
+
+ A handler method or code-block can return the types listed at
+ ((<XMLRPC::Client#call|URL:client.html#index:0>)).
+ When a method fails, it can tell it the client by throwing an
+ (({XMLRPC::FaultException})) like in this example:
+ s.add_handler("michael.div") do |a,b|
+ if b == 0
+ raise XMLRPC::FaultException.new(1, "division by zero")
+ else
+ a / b
+ end
+ end
+ The client gets in the case of (({b==0})) an object back of type
+ (({XMLRPC::FaultException})) that has a ((|faultCode|)) and ((|faultString|))
+ field.
+
+--- XMLRPC::BasicServer#add_handler( prefix, obj )
+ This is the second form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
+ To add an object write:
+ server.add_handler("michael", MyHandlerClass.new)
+ All public methods of (({MyHandlerClass})) are accessible to
+ the XML-RPC clients by (('michael."name of method"')). This is
+ where the ((|class_delim|)) in ((<new|XMLRPC::BasicServer.new>))
+ has it's role, a XML-RPC method-name is defined by
+ ((|prefix|)) + ((|class_delim|)) + (('"name of method"')).
+
+--- XMLRPC::BasicServer#add_handler( interface, obj )
+ This is the third form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
+
+ Use (({XMLRPC::interface})) to generate an ServiceInterface object, which
+ represents an interface (with signature and help text) for a handler class.
+
+ Parameter ((|interface|)) must be of type (({XMLRPC::ServiceInterface})).
+ Adds all methods of ((|obj|)) which are defined in ((|interface|)) to the
+ server.
+
+ This is the recommended way of adding services to a server!
+
+
+--- XMLRPC::BasicServer#get_default_handler
+ Returns the default-handler, which is called when no handler for
+ a method-name is found.
+ It is a (({Proc})) object or (({nil})).
+
+--- XMLRPC::BasicServer#set_default_handler ( &handler )
+ Sets ((|handler|)) as the default-handler, which is called when
+ no handler for a method-name is found. ((|handler|)) is a code-block.
+ The default-handler is called with the (XML-RPC) method-name as first argument, and
+ the other arguments are the parameters given by the client-call.
+
+ If no block is specified the default of (({XMLRPC::BasicServer})) is used, which raises a
+ XMLRPC::FaultException saying "method missing".
+
+
+--- XMLRPC::BasicServer#set_writer( writer )
+ Sets the XML writer to use for generating XML output.
+ Should be an instance of a class from module (({XMLRPC::XMLWriter})).
+ If this method is not called, then (({XMLRPC::Config::DEFAULT_WRITER})) is used.
+
+--- XMLRPC::BasicServer#set_parser( parser )
+ Sets the XML parser to use for parsing XML documents.
+ Should be an instance of a class from module (({XMLRPC::XMLParser})).
+ If this method is not called, then (({XMLRPC::Config::DEFAULT_PARSER})) is used.
+
+--- XMLRPC::BasicServer#add_introspection
+ Adds the introspection handlers "system.listMethods", "system.methodSignature" and "system.methodHelp",
+ where only the first one works.
+
+--- XMLRPC::BasicServer#add_multicall
+ Adds the multi-call handler "system.multicall".
+
+--- XMLRPC::BasicServer#get_service_hook
+ Returns the service-hook, which is called on each service request (RPC) unless it's (({nil})).
+
+--- XMLRPC::BasicServer#set_service_hook ( &handler )
+ A service-hook is called for each service request (RPC).
+ You can use a service-hook for example to wrap existing methods and catch exceptions of them or
+ convert values to values recognized by XMLRPC. You can disable it by passing (({nil})) as parameter
+ ((|handler|)) .
+
+ The service-hook is called with a (({Proc})) object and with the parameters for this (({Proc})).
+ An example:
+
+ server.set_service_hook {|obj, *args|
+ begin
+ ret = obj.call(*args) # call the original service-method
+ # could convert the return value
+ rescue
+ # rescue exceptions
+ end
+ }
+
+=end
+
+
require "xmlrpc/parser"
require "xmlrpc/create"
@@ -10,26 +149,9 @@ require "xmlrpc/utils" # ParserWriterChooseMixin
-module XMLRPC # :nodoc:
+module XMLRPC
-# This is the base class for all XML-RPC server-types (CGI, standalone).
-# You can add handler and set a default handler.
-# Do not use this server, as this is/should be an abstract class.
-#
-# === How the method to call is found
-# The arity (number of accepted arguments) of a handler (method or Proc
-# object) is compared to the given arguments submitted by the client for a
-# RPC, or Remote Procedure Call.
-#
-# A handler is only called if it accepts the number of arguments, otherwise
-# the search for another handler will go on. When at the end no handler was
-# found, the default_handler, XMLRPC::BasicServer#set_default_handler will be
-# called.
-#
-# With this technique it is possible to do overloading by number of parameters, but
-# only for Proc handler, because you cannot define two methods of the same name in
-# the same class.
class BasicServer
include ParserWriterChooseMixin
@@ -45,14 +167,6 @@ class BasicServer
ERR_MC_EXPECTED_STRUCT = 8
- # Creates a new XMLRPC::BasicServer instance, which should not be
- # done, because XMLRPC::BasicServer is an abstract class. This
- # method should be called from a subclass indirectly by a +super+ call
- # in the initialize method.
- #
- # The paramter +class_delim+ is used by add_handler, see
- # XMLRPC::BasicServer#add_handler, when an object is added as a handler, to
- # delimit the object-prefix and the method-name.
def initialize(class_delim=".")
@handler = []
@default_handler = nil
@@ -66,52 +180,6 @@ class BasicServer
add_introspection if Config::ENABLE_INTROSPECTION
end
- # Adds +aBlock+ to the list of handlers, with +name+ as the name of
- # the method.
- #
- # Parameters +signature+ and +help+ are used by the Introspection method if
- # specified, where +signature+ is either an Array containing strings each
- # representing a type of it's signature (the first is the return value) or
- # an Array of Arrays if the method has multiple signatures.
- #
- # Value type-names are "int, boolean, double, string, dateTime.iso8601,
- # base64, array, struct".
- #
- # Parameter +help+ is a String with information about how to call this method etc.
- #
- # When a method fails, it can tell the client by throwing an
- # XMLRPC::FaultException like in this example:
- #
- # s.add_handler("michael.div") do |a,b|
- # if b == 0
- # raise XMLRPC::FaultException.new(1, "division by zero")
- # else
- # a / b
- # end
- # end
- #
- # In the case of <code>b==0</code> the client gets an object back of type
- # XMLRPC::FaultException that has a +faultCode+ and +faultString+ field.
- #
- # This is the second form of ((<add_handler|XMLRPC::BasicServer#add_handler>)).
- # To add an object write:
- #
- # server.add_handler("michael", MyHandlerClass.new)
- #
- # All public methods of MyHandlerClass are accessible to
- # the XML-RPC clients by <code>michael."name of method"</code>. This is
- # where the +class_delim+ in XMLRPC::BasicServer.new plays it's role, a
- # XML-RPC method-name is defined by +prefix+ + +class_delim+ + <code>"name
- # of method"</code>.
- #
- # The third form of +add_handler is to use XMLRPC::Service::Interface to
- # generate an object, which represents an interface (with signature and
- # help text) for a handler class.
- #
- # The +interface+ parameter must be an instance of XMLRPC::Service::Interface.
- # Adds all methods of +obj+ which are defined in the +interface+ to the server.
- #
- # This is the recommended way of adding services to a server!
def add_handler(prefix, obj_or_signature=nil, help=nil, &block)
if block_given?
# proc-handler
@@ -132,62 +200,24 @@ class BasicServer
self
end
- # Returns the service-hook, which is called on each service request (RPC)
- # unless it's +nil+.
def get_service_hook
@service_hook
end
- # A service-hook is called for each service request (RPC).
- #
- # You can use a service-hook for example to wrap existing methods and catch
- # exceptions of them or convert values to values recognized by XMLRPC.
- #
- # You can disable it by passing +nil+ as the +handler+ parameter.
- #
- # The service-hook is called with a Proc object along with any parameters.
- #
- # An example:
- #
- # server.set_service_hook {|obj, *args|
- # begin
- # ret = obj.call(*args) # call the original service-method
- # # could convert the return value
- # rescue
- # # rescue exceptions
- # end
- # }
- #
def set_service_hook(&handler)
@service_hook = handler
self
end
- # Returns the default-handler, which is called when no handler for
- # a method-name is found.
- #
- # It is either a Proc object or +nil+.
def get_default_handler
@default_handler
end
- # Sets +handler+ as the default-handler, which is called when
- # no handler for a method-name is found.
- #
- # +handler+ is a code-block.
- #
- # The default-handler is called with the (XML-RPC) method-name as first
- # argument, and the other arguments are the parameters given by the
- # client-call.
- #
- # If no block is specified the default of XMLRPC::BasicServer is
- # used, which raises a XMLRPC::FaultException saying "method missing".
- def set_default_handler(&handler)
+ def set_default_handler (&handler)
@default_handler = handler
self
end
- # Adds the multi-call handler <code>"system.multicall"</code>.
def add_multicall
add_handler("system.multicall", %w(array array), "Multicall Extension") do |arrStructs|
unless arrStructs.is_a? Array
@@ -230,9 +260,6 @@ class BasicServer
self
end
- # Adds the introspection handlers <code>"system.listMethods"</code>,
- # <code>"system.methodSignature"</code> and
- # <code>"system.methodHelp"</code>, where only the first one works.
def add_introspection
add_handler("system.listMethods",%w(array), "List methods available on this XML-RPC server") do
methods = []
@@ -285,12 +312,15 @@ class BasicServer
handle(method, *params)
end
- private
+ private # --------------------------------------------------------------
def multicall_fault(nr, str)
{"faultCode" => nr, "faultString" => str}
end
+ #
+ # method dispatch
+ #
def dispatch(methodname, *args)
for name, obj in @handler
if obj.kind_of? Proc
@@ -318,7 +348,9 @@ class BasicServer
end
- # Returns +true+, if the arity of +obj+ matches +n_args+
+ #
+ # returns true, if the arity of "obj" matches
+ #
def check_arity(obj, n_args)
ary = obj.arity
@@ -341,6 +373,9 @@ class BasicServer
end
end
+ #
+ #
+ #
def handle(methodname, *args)
create().methodResponse(*call_method(methodname, *args))
end
@@ -349,44 +384,57 @@ class BasicServer
end
-# Implements a CGI-based XML-RPC server.
-#
-# require "xmlrpc/server"
-#
-# s = XMLRPC::CGIServer.new
-#
-# s.add_handler("michael.add") do |a,b|
-# a + b
-# end
-#
-# s.add_handler("michael.div") do |a,b|
-# if b == 0
-# raise XMLRPC::FaultException.new(1, "division by zero")
-# else
-# a / b
-# end
-# end
-#
-# s.set_default_handler do |name, *args|
-# raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
-# " or wrong number of parameters!")
-# end
-#
-# s.serve
-#
-#
-# <b>Note:</b> Make sure that you don't write to standard-output in a
-# handler, or in any other part of your program, this would cause a CGI-based
-# server to fail!
+=begin
+= XMLRPC::CGIServer
+== Synopsis
+ require "xmlrpc/server"
+
+ s = XMLRPC::CGIServer.new
+
+ s.add_handler("michael.add") do |a,b|
+ a + b
+ end
+
+ s.add_handler("michael.div") do |a,b|
+ if b == 0
+ raise XMLRPC::FaultException.new(1, "division by zero")
+ else
+ a / b
+ end
+ end
+
+ s.set_default_handler do |name, *args|
+ raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+ " or wrong number of parameters!")
+ end
+
+ s.serve
+
+== Description
+Implements a CGI-based XML-RPC server.
+
+== Superclass
+((<XMLRPC::BasicServer>))
+
+== Class Methods
+--- XMLRPC::CGIServer.new( *a )
+ Creates a new (({XMLRPC::CGIServer})) instance. All parameters given
+ are by-passed to ((<XMLRPC::BasicServer.new>)). You can only create
+ ((*one*)) (({XMLRPC::CGIServer})) instance, because more than one makes
+ no sense.
+
+== Instance Methods
+--- XMLRPC::CGIServer#serve
+ Call this after you have added all you handlers to the server.
+ This method processes a XML-RPC methodCall and sends the answer
+ back to the client.
+ Make sure that you don't write to standard-output in a handler, or in
+ any other part of your program, this would case a CGI-based server to fail!
+=end
+
class CGIServer < BasicServer
@@obj = nil
- # Creates a new XMLRPC::CGIServer instance.
- #
- # All parameters given are by-passed to XMLRPC::BasicServer.new.
- #
- # You can only create <b>one</b> XMLRPC::CGIServer instance, because more
- # than one makes no sense.
def CGIServer.new(*a)
@@obj = super(*a) if @@obj.nil?
@@obj
@@ -396,10 +444,6 @@ class CGIServer < BasicServer
super(*a)
end
- # Call this after you have added all you handlers to the server.
- #
- # This method processes a XML-RPC method call and sends the answer
- # back to the client.
def serve
catch(:exit_serve) {
length = ENV['CONTENT_LENGTH'].to_i
@@ -412,7 +456,7 @@ class CGIServer < BasicServer
$stdin.binmode if $stdin.respond_to? :binmode
data = $stdin.read(length)
- http_error(400, "Bad Request") if data.nil? or data.bytesize != length
+ http_error(400, "Bad Request") if data.nil? or data.size != length
http_write(process(data), "Content-type" => "text/xml; charset=utf-8")
}
@@ -430,7 +474,7 @@ class CGIServer < BasicServer
</head>
<body>
<h1>#{err}</h1>
- <p>Unexpected error occurred while processing XML-RPC request!</p>
+ <p>Unexpected error occured while processing XML-RPC request!</p>
</body>
</html>
MSGEND
@@ -443,7 +487,7 @@ class CGIServer < BasicServer
h = {}
header.each {|key, value| h[key.to_s.capitalize] = value}
h['Status'] ||= "200 OK"
- h['Content-length'] ||= body.bytesize.to_s
+ h['Content-length'] ||= body.size.to_s
str = ""
h.each {|key, value| str << "#{key}: #{value}\r\n"}
@@ -454,24 +498,24 @@ class CGIServer < BasicServer
end
+=begin
+= XMLRPC::ModRubyServer
+== Description
+Implements a XML-RPC server, which works with Apache mod_ruby.
+
+Use it in the same way as CGIServer!
+
+== Superclass
+((<XMLRPC::BasicServer>))
+=end
-# Implements a XML-RPC server, which works with Apache mod_ruby.
-#
-# Use it in the same way as XMLRPC::CGIServer!
class ModRubyServer < BasicServer
- # Creates a new XMLRPC::ModRubyServer instance.
- #
- # All parameters given are by-passed to XMLRPC::BasicServer.new.
def initialize(*a)
@ap = Apache::request
super(*a)
end
- # Call this after you have added all you handlers to the server.
- #
- # This method processes a XML-RPC method call and sends the answer
- # back to the client.
def serve
catch(:exit_serve) {
header = {}
@@ -487,7 +531,7 @@ class ModRubyServer < BasicServer
@ap.binmode
data = @ap.read(length)
- http_error(400, "Bad Request") if data.nil? or data.bytesize != length
+ http_error(400, "Bad Request") if data.nil? or data.size != length
http_write(process(data), 200, "Content-type" => "text/xml; charset=utf-8")
}
@@ -505,7 +549,7 @@ class ModRubyServer < BasicServer
</head>
<body>
<h1>#{err}</h1>
- <p>Unexpected error occurred while processing XML-RPC request!</p>
+ <p>Unexpected error occured while processing XML-RPC request!</p>
</body>
</html>
MSGEND
@@ -518,7 +562,7 @@ class ModRubyServer < BasicServer
h = {}
header.each {|key, value| h[key.to_s.capitalize] = value}
h['Status'] ||= "200 OK"
- h['Content-length'] ||= body.bytesize.to_s
+ h['Content-length'] ||= body.size.to_s
h.each {|key, value| @ap.headers_out[key] = value }
@ap.content_type = h["Content-type"]
@@ -530,47 +574,63 @@ class ModRubyServer < BasicServer
end
+=begin
+= XMLRPC::Server
+== Synopsis
+ require "xmlrpc/server"
+
+ s = XMLRPC::Server.new(8080)
+
+ s.add_handler("michael.add") do |a,b|
+ a + b
+ end
+
+ s.add_handler("michael.div") do |a,b|
+ if b == 0
+ raise XMLRPC::FaultException.new(1, "division by zero")
+ else
+ a / b
+ end
+ end
+
+ s.set_default_handler do |name, *args|
+ raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+ " or wrong number of parameters!")
+ end
+
+ s.serve
+
+== Description
+Implements a standalone XML-RPC server. The method (({serve}))) is left if a SIGHUP is sent to the
+program.
+
+== Superclass
+((<XMLRPC::WEBrickServlet>))
+
+== Class Methods
+--- XMLRPC::Server.new( port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a )
+ Creates a new (({XMLRPC::Server})) instance, which is a XML-RPC server listening on
+ port ((|port|)) and accepts requests for the host ((|host|)), which is by default only the localhost.
+ The server is not started, to start it you have to call ((<serve|XMLRPC::Server#serve>)).
+
+ Parameters ((|audit|)) and ((|debug|)) are obsolete!
+
+ All additionally given parameters in ((|*a|)) are by-passed to ((<XMLRPC::BasicServer.new>)).
+
+== Instance Methods
+--- XMLRPC::Server#serve
+ Call this after you have added all you handlers to the server.
+ This method starts the server to listen for XML-RPC requests and answer them.
+
+--- XMLRPC::Server#shutdown
+ Stops and shuts the server down.
+
+=end
class WEBrickServlet < BasicServer; end # forward declaration
-# Implements a standalone XML-RPC server. The method XMLRPC::Server#serve is
-# left if a SIGHUP is sent to the program.
-#
-# require "xmlrpc/server"
-#
-# s = XMLRPC::Server.new(8080)
-#
-# s.add_handler("michael.add") do |a,b|
-# a + b
-# end
-#
-# s.add_handler("michael.div") do |a,b|
-# if b == 0
-# raise XMLRPC::FaultException.new(1, "division by zero")
-# else
-# a / b
-# end
-# end
-#
-# s.set_default_handler do |name, *args|
-# raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
-# " or wrong number of parameters!")
-# end
-#
-# s.serve
class Server < WEBrickServlet
- # Creates a new XMLRPC::Server instance, which is a XML-RPC server
- # listening on the given +port+ and accepts requests for the given +host+,
- # which is +localhost+ by default.
- #
- # The server is not started, to start it you have to call
- # XMLRPC::Server#serve.
- #
- # The optional +audit+ and +debug+ parameters are obsolete!
- #
- # All additionally provided parameters in <code>*a</code> are by-passed to
- # XMLRPC::BasicServer.new.
def initialize(port=8080, host="127.0.0.1", maxConnections=4, stdlog=$stdout, audit=true, debug=true, *a)
super(*a)
require 'webrick'
@@ -579,8 +639,6 @@ class Server < WEBrickServlet
@server.mount("/", self)
end
- # Call this after you have added all you handlers to the server.
- # This method starts the server to listen for XML-RPC requests and answer them.
def serve
signals = %w[INT TERM HUP] & Signal.list.keys
signals.each { |signal| trap(signal) { @server.shutdown } }
@@ -588,42 +646,60 @@ class Server < WEBrickServlet
@server.start
end
- # Stops and shuts the server down.
def shutdown
@server.shutdown
end
end
+=begin
+= XMLRPC::WEBrickServlet
+== Synopsis
+
+ require "webrick"
+ require "xmlrpc/server"
+
+ s = XMLRPC::WEBrickServlet.new
+ s.add_handler("michael.add") do |a,b|
+ a + b
+ end
+
+ s.add_handler("michael.div") do |a,b|
+ if b == 0
+ raise XMLRPC::FaultException.new(1, "division by zero")
+ else
+ a / b
+ end
+ end
+
+ s.set_default_handler do |name, *args|
+ raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
+ " or wrong number of parameters!")
+ end
+
+ httpserver = WEBrick::HTTPServer.new(:Port => 8080)
+ httpserver.mount("/RPC2", s)
+ trap("HUP") { httpserver.shutdown } # use 1 instead of "HUP" on Windows
+ httpserver.start
+
+== Instance Methods
+
+--- XMLRPC::WEBrickServlet#set_valid_ip( *ip_addr )
+ Specifies the valid IP addresses that are allowed to connect to the server.
+ Each IP is either a (({String})) or a (({Regexp})).
+
+--- XMLRPC::WEBrickServlet#get_valid_ip
+ Return the via method ((<set_valid_ip|XMLRPC::Server#set_valid_ip>)) specified
+ valid IP addresses.
+
+== Description
+Implements a servlet for use with WEBrick, a pure Ruby (HTTP-) server framework.
+
+== Superclass
+((<XMLRPC::BasicServer>))
+
+=end
-# Implements a servlet for use with WEBrick, a pure Ruby (HTTP) server
-# framework.
-#
-# require "webrick"
-# require "xmlrpc/server"
-#
-# s = XMLRPC::WEBrickServlet.new
-# s.add_handler("michael.add") do |a,b|
-# a + b
-# end
-#
-# s.add_handler("michael.div") do |a,b|
-# if b == 0
-# raise XMLRPC::FaultException.new(1, "division by zero")
-# else
-# a / b
-# end
-# end
-#
-# s.set_default_handler do |name, *args|
-# raise XMLRPC::FaultException.new(-99, "Method #{name} missing" +
-# " or wrong number of parameters!")
-# end
-#
-# httpserver = WEBrick::HTTPServer.new(:Port => 8080)
-# httpserver.mount("/RPC2", s)
-# trap("HUP") { httpserver.shutdown } # use 1 instead of "HUP" on Windows
-# httpserver.start
class WEBrickServlet < BasicServer
def initialize(*a)
super
@@ -631,7 +707,8 @@ class WEBrickServlet < BasicServer
@valid_ip = nil
end
- # Deprecated from WEBrick/1.2.2, but does not break anything.
+ # deprecated from WEBrick/1.2.2.
+ # but does not break anything.
def require_path_info?
false
end
@@ -641,9 +718,6 @@ class WEBrickServlet < BasicServer
self
end
- # Specifies the valid IP addresses that are allowed to connect to the server.
- #
- # Each IP is either a String or a Regexp.
def set_valid_ip(*ip_addr)
if ip_addr.size == 1 and ip_addr[0].nil?
@valid_ip = nil
@@ -652,9 +726,6 @@ class WEBrickServlet < BasicServer
end
end
- # Return the valid IP addresses that are allowed to connect to the server.
- #
- # See also, XMLRPC::Server#set_valid_ip
def get_valid_ip
@valid_ip
end
@@ -680,17 +751,17 @@ class WEBrickServlet < BasicServer
data = request.body
- if data.nil? or data.bytesize != length
+ if data.nil? or data.size != length
raise WEBrick::HTTPStatus::BadRequest
end
resp = process(data)
- if resp.nil? or resp.bytesize <= 0
+ if resp.nil? or resp.size <= 0
raise WEBrick::HTTPStatus::InternalServerError
end
response.status = 200
- response['Content-Length'] = resp.bytesize
+ response['Content-Length'] = resp.size
response['Content-Type'] = "text/xml; charset=utf-8"
response.body = resp
end
diff --git a/lib/xmlrpc/utils.rb b/lib/xmlrpc/utils.rb
index 186938a56e..b86509cb3a 100644
--- a/lib/xmlrpc/utils.rb
+++ b/lib/xmlrpc/utils.rb
@@ -1,41 +1,32 @@
#
+# Defines ParserWriterChooseMixin, which makes it possible to choose a
+# different XML writer and/or XML parser then the default one.
+# The Mixin is used in client.rb (class Client) and server.rb (class
+# BasicServer)
+#
# Copyright (C) 2001, 2002, 2003 by Michael Neumann (mneumann@ntecs.de)
#
# $Id$
#
-module XMLRPC # :nodoc:
+module XMLRPC
+ #
# This module enables a user-class to be marshalled
# by XML-RPC for Ruby into a Hash, with one additional
- # key/value pair <code>___class___ => ClassName</code>
+ # key/value pair "___class___" => ClassName
#
module Marshallable
end
- # Defines ParserWriterChooseMixin, which makes it possible to choose a
- # different XMLWriter and/or XMLParser then the default one.
- #
- # The Mixin is used in client.rb (class XMLRPC::Client)
- # and server.rb (class XMLRPC::BasicServer)
module ParserWriterChooseMixin
- # Sets the XMLWriter to use for generating XML output.
- #
- # Should be an instance of a class from module XMLRPC::XMLWriter.
- #
- # If this method is not called, then XMLRPC::Config::DEFAULT_WRITER is used.
def set_writer(writer)
@create = Create.new(writer)
self
end
- # Sets the XMLParser to use for parsing XML documents.
- #
- # Should be an instance of a class from module XMLRPC::XMLParser.
- #
- # If this method is not called, then XMLRPC::Config::DEFAULT_PARSER is used.
def set_parser(parser)
@parser = parser
self
@@ -64,8 +55,11 @@ module XMLRPC # :nodoc:
module Service
- # Base class for XMLRPC::Service::Interface definitions, used
- # by XMLRPC::BasicServer#add_handler
+ #
+ # base class for Service Interface definitions, used
+ # by BasicServer#add_handler
+ #
+
class BasicInterface
attr_reader :prefix, :methods
@@ -88,7 +82,7 @@ module XMLRPC # :nodoc:
@methods << [mname, meth_name || mname, sig, help]
end
- private
+ private # ---------------------------------
def parse_sig(sig)
# sig is a String
@@ -105,8 +99,8 @@ module XMLRPC # :nodoc:
end # class BasicInterface
#
- # Class which wraps a XMLRPC::Service::Interface definition, used
- # by XMLRPC::BasicServer#add_handler
+ # class which wraps a Service Interface definition, used
+ # by BasicServer#add_handler
#
class Interface < BasicInterface
def initialize(prefix, &p)
@@ -122,7 +116,7 @@ module XMLRPC # :nodoc:
}
end
- private
+ private # ---------------------------------
def meth(*a)
add_method(*a)
@@ -148,13 +142,13 @@ module XMLRPC # :nodoc:
#
- # Short-form to create a XMLRPC::Service::Interface
+ # short-form to create a Service::Interface
#
def self.interface(prefix, &p)
Service::Interface.new(prefix, &p)
end
- # Short-cut for creating a XMLRPC::Service::PublicInstanceMethodsInterface
+ # short-cut for creating a PublicInstanceMethodsInterface
def self.iPIMethods(prefix)
Service::PublicInstanceMethodsInterface.new(prefix)
end
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 6f60f9d7c5..9b5a9b2787 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -1,89 +1,43 @@
-##
-# The YAML module is an alias of Psych, the YAML engine for ruby.
-
-begin
- require 'psych'
-rescue LoadError
- warn "#{caller[0]}:"
- warn "It seems your ruby installation is missing psych (for YAML output)."
- warn "To eliminate this warning, please install libyaml and reinstall your ruby."
- raise
-end
-
-YAML = Psych
-
-module Psych # :nodoc:
- # For compatibility, deprecated
+module YAML
class EngineManager # :nodoc:
- attr_reader :yamler # :nodoc:
+ attr_reader :yamler
- def initialize # :nodoc:
- @yamler = 'psych'
+ def initialize
+ @yamler = nil
end
- def syck? # :nodoc:
- false
+ def syck?
+ 'syck' == @yamler
end
- # Psych is always used and this method has no effect.
- #
- # This method is still present for compatibility.
- #
- # You may still use the Syck engine by installing
- # the 'syck' gem and using the Syck constant.
- def yamler= engine # :nodoc:
- case engine
- when 'syck' then warn "syck has been removed, psych is used instead"
- when 'psych' then @yamler = 'psych'
- else
- raise(ArgumentError, "bad engine")
- end
+ def yamler= engine
+ raise(ArgumentError, "bad engine") unless %w{syck psych}.include?(engine)
+
+ require engine
+ Object.class_eval <<-eorb, __FILE__, __LINE__ + 1
+ remove_const 'YAML'
+ YAML = #{engine.capitalize}
+ remove_method :to_yaml
+ alias :to_yaml :#{engine}_to_yaml
+ eorb
+
+ @yamler = engine
engine
end
end
- ENGINE = EngineManager.new # :nodoc:
+ ENGINE = YAML::EngineManager.new
end
-# YAML Ain't Markup Language
-#
-# This module provides a Ruby interface for data serialization in YAML format.
-#
-# The underlying implementation is the libyaml wrapper Psych.
-#
-# == Usage
-#
-# Working with YAML can be very simple, for example:
-#
-# require 'yaml' # STEP ONE, REQUIRE YAML!
-# # Parse a YAML string
-# YAML.load("--- foo") #=> "foo"
-#
-# # Emit some YAML
-# YAML.dump("foo") # => "--- foo\n...\n"
-# { :a => 'b'}.to_yaml # => "---\n:a: b\n"
-#
-# == Security
-#
-# Do not use YAML to load untrusted data. Doing so is unsafe and could allow
-# malicious input to execute arbitrary code inside your application. Please see
-# doc/security.rdoc for more information.
-#
-# == History
-#
-# Syck was the original for YAML implementation in Ruby's standard library
-# developed by why the lucky stiff.
-#
-# You can still use Syck, if you prefer, for parsing and emitting YAML, but you
-# must install the 'syck' gem now in order to use it.
-#
-# In older Ruby versions, ie. <= 1.9, Syck is still provided, however it was
-# completely removed with the release of Ruby 2.0.0.
-#
-# == More info
-#
-# For more advanced details on the implementation see Psych, and also check out
-# http://yaml.org for spec details and other helpful information.
-module YAML
+engine = (!defined?(Syck) && defined?(Psych) ? 'psych' : 'syck')
+
+module Syck
+ ENGINE = YAML::ENGINE
end
+
+module Psych
+ ENGINE = YAML::ENGINE
+end
+
+YAML::ENGINE.yamler = engine
diff --git a/lib/yaml/dbm.rb b/lib/yaml/dbm.rb
index 976fdb3bb6..973e88dbc7 100644
--- a/lib/yaml/dbm.rb
+++ b/lib/yaml/dbm.rb
@@ -1,48 +1,19 @@
require 'yaml'
require 'dbm'
-
-module YAML
-
-# YAML + DBM = YDBM
-#
-# YAML::DBM provides the same interface as ::DBM.
#
-# However, while DBM only allows strings for both keys and values,
-# this library allows one to use most Ruby objects for values
-# by first converting them to YAML. Keys must be strings.
-#
-# Conversion to and from YAML is performed automatically.
+# YAML + DBM = YDBM
+# - Same interface as DBM class
#
-# See the documentation for ::DBM and ::YAML for more information.
+module YAML
+
class DBM < ::DBM
VERSION = "0.1"
-
- # Return value associated with +key+ from database.
- #
- # Returns +nil+ if there is no such +key+.
def []( key )
fetch( key )
end
-
- # :call-seq:
- # []=( key, value )
- #
- # Set +key+ to +value+ in database.
- #
- # +value+ will be converted to YAML before storage.
def []=( key, val )
store( key, val )
end
-
- # :call-seq:
- # fetch( key, ifnone = nil )
- # fetch( key, &block )
- #
- # Return value associated with +key+.
- #
- # If there is no value for +key+ and no block is given, returns +ifnone+.
- #
- # Otherwise, calls block passing in the given +key+.
def fetch( keystr, ifnone = nil )
begin
val = super( keystr )
@@ -55,30 +26,12 @@ class DBM < ::DBM
ifnone
end
end
-
- # Deprecated, used YAML::DBM#key instead.
- # ----
- # Note:
- # YAML::DBM#index makes warning from internal of ::DBM#index.
- # It says 'DBM#index is deprecated; use DBM#key', but DBM#key
- # behaves not same as DBM#index.
- #
def index( keystr )
super( keystr.to_yaml )
end
-
- def key( keystr )
- invert[keystr]
- end
-
- # Returns an array containing the values associated with the given keys.
def values_at( *keys )
keys.collect { |k| fetch( k ) }
end
-
- # Deletes value from database associated with +key+.
- #
- # Returns value or +nil+.
def delete( key )
v = super( key )
if String === v
@@ -86,89 +39,45 @@ class DBM < ::DBM
end
v
end
-
- # Calls the given block once for each +key+, +value+ pair in the database.
- # Deletes all entries for which the block returns true.
- #
- # Returns +self+.
- def delete_if # :yields: [key, value]
+ def delete_if
del_keys = keys.dup
del_keys.delete_if { |k| yield( k, fetch( k ) ) == false }
del_keys.each { |k| delete( k ) }
self
end
-
- # Converts the contents of the database to an in-memory Hash, then calls
- # Hash#reject with the specified code block, returning a new Hash.
def reject
hsh = self.to_hash
hsh.reject { |k,v| yield k, v }
end
-
- # Calls the given block once for each +key+, +value+ pair in the database.
- #
- # Returns +self+.
- def each_pair # :yields: [key, value]
+ def each_pair
keys.each { |k| yield k, fetch( k ) }
self
end
-
- # Calls the given block for each value in database.
- #
- # Returns +self+.
- def each_value # :yields: value
+ def each_value
super { |v| yield YAML.load( v ) }
self
end
-
- # Returns an array of values from the database.
def values
super.collect { |v| YAML.load( v ) }
end
-
- # Returns true if specified value is found in the database.
def has_value?( val )
each_value { |v| return true if v == val }
return false
end
-
- # Returns a Hash (not a DBM database) created by using each value in the
- # database as a key, with the corresponding key as its value.
- #
- # Note that all values in the hash will be Strings, but the keys will be
- # actual objects.
def invert
h = {}
keys.each { |k| h[ self.fetch( k ) ] = k }
h
end
-
- # Replaces the contents of the database with the contents of the specified
- # object. Takes any object which implements the each_pair method, including
- # Hash and DBM objects.
def replace( hsh )
clear
update( hsh )
end
-
- # Removes a [key, value] pair from the database, and returns it.
- # If the database is empty, returns +nil+.
- #
- # The order in which values are removed/returned is not guaranteed.
def shift
a = super
a[1] = YAML.load( a[1] ) if a
a
end
-
- # :call-seq:
- # select( &block )
- # select( *keys )
- #
- # If a block is provided, returns a new array containing [key, value] pairs
- # for which the block returns true.
- #
- # Otherwise, same as #values_at
def select( *keys )
if block_given?
self.keys.collect { |k| v = self[k]; [k, v] if yield k, v }.compact
@@ -176,48 +85,26 @@ class DBM < ::DBM
values_at( *keys )
end
end
-
- # :call-seq:
- # store( key, value )
- #
- #Stores +value+ in database with +key+ as the index. +value+ is converted
- #to YAML before being stored.
- #
- #Returns +value+
def store( key, val )
super( key, val.to_yaml )
val
end
-
- # Updates the database with multiple values from the specified object.
- # Takes any object which implements the each_pair method, including
- # Hash and DBM objects.
- #
- # Returns +self+.
def update( hsh )
- hsh.each_pair do |k,v|
- self.store( k, v )
+ hsh.keys.each do |k|
+ self.store( k, hsh.fetch( k ) )
end
self
end
-
- # Converts the contents of the database to an array of [key, value] arrays,
- # and returns it.
def to_a
a = []
keys.each { |k| a.push [ k, self.fetch( k ) ] }
a
end
-
-
- # Converts the contents of the database to an in-memory Hash object, and
- # returns it.
def to_hash
h = {}
keys.each { |k| h[ k ] = self.fetch( k ) }
h
end
-
alias :each :each_pair
end
diff --git a/lib/yaml/store.rb b/lib/yaml/store.rb
index b0b580ba1a..a7f8a5657d 100644
--- a/lib/yaml/store.rb
+++ b/lib/yaml/store.rb
@@ -4,57 +4,19 @@
require 'yaml'
require 'pstore'
-# YAML::Store provides the same functionality as PStore, except it uses YAML
-# to dump objects instead of Marshal.
-#
-# == Example
-#
-# require 'yaml/store'
-#
-# Person = Struct.new :first_name, :last_name
-#
-# people = [Person.new("Bob", "Smith"), Person.new("Mary", "Johnson")]
-#
-# store = YAML::Store.new "test.store"
-#
-# store.transaction do
-# store["people"] = people
-# store["greeting"] = { "hello" => "world" }
-# end
-#
-# After running the above code, the contents of "test.store" will be:
-#
-# ---
-# people:
-# - !ruby/struct:Person
-# first_name: Bob
-# last_name: Smith
-# - !ruby/struct:Person
-# first_name: Mary
-# last_name: Johnson
-# greeting:
-# hello: world
-
class YAML::Store < PStore
-
- # :call-seq:
- # initialize( file_name, yaml_opts = {} )
- #
- # Creates a new YAML::Store object, which will store data in +file_name+.
- # If the file does not already exist, it will be created.
- #
- #
- # Options passed in through +yaml_opts+ will be used when converting the
- # store to YAML via Hash#to_yaml().
- def initialize file_name, yaml_opts = {}
- @opt = yaml_opts
- super
+ def initialize( *o )
+ @opt = {}
+ if String === o.first
+ super(o.shift)
+ end
+ if o.last.is_a? Hash
+ @opt.update(o.pop)
+ end
end
- # :stopdoc:
-
def dump(table)
- YAML.dump @table
+ @table.to_yaml(@opt)
end
def load(content)
@@ -70,7 +32,7 @@ class YAML::Store < PStore
false
end
- EMPTY_MARSHAL_DATA = YAML.dump({})
+ EMPTY_MARSHAL_DATA = {}.to_yaml
EMPTY_MARSHAL_CHECKSUM = Digest::MD5.digest(EMPTY_MARSHAL_DATA)
def empty_marshal_data
EMPTY_MARSHAL_DATA
diff --git a/load.c b/load.c
index 806c65374b..94a3f1da32 100644
--- a/load.c
+++ b/load.c
@@ -4,24 +4,20 @@
#include "ruby/ruby.h"
#include "ruby/util.h"
-#include "internal.h"
#include "dln.h"
#include "eval_intern.h"
-#include "probes.h"
-#include "node.h"
VALUE ruby_dln_librefs;
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
-#define IS_RBEXT(e) (strcmp((e), ".rb") == 0)
-#define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0)
+#define IS_RBEXT(e) (strcmp(e, ".rb") == 0)
+#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)
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
#else
-#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0)
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
#endif
+
static const char *const loadable_ext[] = {
".rb", DLEXT,
#ifdef DLEXT2
@@ -37,120 +33,21 @@ rb_get_load_path(void)
return load_path;
}
-enum expand_type {
- EXPAND_ALL,
- EXPAND_RELATIVE,
- EXPAND_HOME,
- EXPAND_NON_CACHE
-};
-
-/* Construct expanded load path and store it to cache.
- We rebuild load path partially if the cache is invalid.
- We don't cache non string object and expand it every time. We ensure that
- string objects in $LOAD_PATH are frozen.
- */
-static void
-rb_construct_expanded_load_path(int type, int *has_relative, int *has_non_cache)
+VALUE
+rb_get_expanded_load_path(void)
{
- rb_vm_t *vm = GET_VM();
- VALUE load_path = vm->load_path;
- VALUE expanded_load_path = vm->expanded_load_path;
+ VALUE load_path = rb_get_load_path();
VALUE ary;
long i;
- int level = rb_safe_level();
- ary = rb_ary_tmp_new(RARRAY_LEN(load_path));
+ ary = rb_ary_new2(RARRAY_LEN(load_path));
for (i = 0; i < RARRAY_LEN(load_path); ++i) {
- VALUE path, as_str, expanded_path;
- int is_string, non_cache;
- char *as_cstr;
- as_str = path = RARRAY_PTR(load_path)[i];
- is_string = RB_TYPE_P(path, T_STRING) ? 1 : 0;
- non_cache = !is_string ? 1 : 0;
- as_str = rb_get_path_check_to_string(path, level);
- as_cstr = RSTRING_PTR(as_str);
-
- if (!non_cache) {
- if ((type == EXPAND_RELATIVE &&
- rb_is_absolute_path(as_cstr)) ||
- (type == EXPAND_HOME &&
- (!as_cstr[0] || as_cstr[0] != '~')) ||
- (type == EXPAND_NON_CACHE)) {
- /* Use cached expanded path. */
- rb_ary_push(ary, RARRAY_PTR(expanded_load_path)[i]);
- continue;
- }
- }
- if (!*has_relative && !rb_is_absolute_path(as_cstr))
- *has_relative = 1;
- if (!*has_non_cache && non_cache)
- *has_non_cache = 1;
- /* Freeze only string object. We expand other objects every time. */
- if (is_string)
- rb_str_freeze(path);
- as_str = rb_get_path_check_convert(path, as_str, level);
- expanded_path = rb_file_expand_path_fast(as_str, Qnil);
- rb_str_freeze(expanded_path);
- rb_ary_push(ary, expanded_path);
+ VALUE path = rb_file_expand_path(RARRAY_PTR(load_path)[i], Qnil);
+ rb_str_freeze(path);
+ rb_ary_push(ary, path);
}
rb_obj_freeze(ary);
- vm->expanded_load_path = ary;
- rb_ary_replace(vm->load_path_snapshot, vm->load_path);
-}
-
-static VALUE
-load_path_getcwd(void)
-{
- char *cwd = my_getcwd();
- VALUE cwd_str = rb_filesystem_str_new_cstr(cwd);
- xfree(cwd);
- return cwd_str;
-}
-
-VALUE
-rb_get_expanded_load_path(void)
-{
- rb_vm_t *vm = GET_VM();
- const VALUE non_cache = Qtrue;
-
- if (!rb_ary_shared_with_p(vm->load_path_snapshot, vm->load_path)) {
- /* The load path was modified. Rebuild the expanded load path. */
- int has_relative = 0, has_non_cache = 0;
- rb_construct_expanded_load_path(EXPAND_ALL, &has_relative, &has_non_cache);
- if (has_relative) {
- vm->load_path_check_cache = load_path_getcwd();
- }
- else if (has_non_cache) {
- /* Non string object. */
- vm->load_path_check_cache = non_cache;
- }
- else {
- vm->load_path_check_cache = 0;
- }
- }
- else if (vm->load_path_check_cache == non_cache) {
- int has_relative = 1, has_non_cache = 1;
- /* Expand only non-cacheable objects. */
- rb_construct_expanded_load_path(EXPAND_NON_CACHE,
- &has_relative, &has_non_cache);
- }
- else if (vm->load_path_check_cache) {
- int has_relative = 1, has_non_cache = 1;
- VALUE cwd = load_path_getcwd();
- if (!rb_str_equal(vm->load_path_check_cache, cwd)) {
- /* Current working directory or filesystem encoding was changed.
- Expand relative load path and non-cacheable objects again. */
- vm->load_path_check_cache = cwd;
- rb_construct_expanded_load_path(EXPAND_RELATIVE,
- &has_relative, &has_non_cache);
- }
- else {
- /* Expand only tilde (User HOME) and non-cacheable objects. */
- rb_construct_expanded_load_path(EXPAND_HOME,
- &has_relative, &has_non_cache);
- }
- }
- return vm->expanded_load_path;
+ return ary;
}
static VALUE
@@ -165,147 +62,12 @@ get_loaded_features(void)
return GET_VM()->loaded_features;
}
-static void
-reset_loaded_features_snapshot(void)
-{
- rb_vm_t *vm = GET_VM();
- rb_ary_replace(vm->loaded_features_snapshot, vm->loaded_features);
-}
-
-static struct st_table *
-get_loaded_features_index_raw(void)
-{
- return GET_VM()->loaded_features_index;
-}
-
static st_table *
get_loading_table(void)
{
return GET_VM()->loading_table;
}
-static void
-features_index_add_single(VALUE short_feature, VALUE offset)
-{
- struct st_table *features_index;
- VALUE this_feature_index = Qnil;
- char *short_feature_cstr;
-
- Check_Type(offset, T_FIXNUM);
- Check_Type(short_feature, T_STRING);
- short_feature_cstr = StringValueCStr(short_feature);
-
- features_index = get_loaded_features_index_raw();
- st_lookup(features_index, (st_data_t)short_feature_cstr, (st_data_t *)&this_feature_index);
-
- if (NIL_P(this_feature_index)) {
- st_insert(features_index, (st_data_t)ruby_strdup(short_feature_cstr), (st_data_t)offset);
- }
- else if (RB_TYPE_P(this_feature_index, T_FIXNUM)) {
- VALUE feature_indexes[2];
- feature_indexes[0] = this_feature_index;
- feature_indexes[1] = offset;
- this_feature_index = rb_ary_tmp_new(numberof(feature_indexes));
- rb_ary_cat(this_feature_index, feature_indexes, numberof(feature_indexes));
- st_insert(features_index, (st_data_t)short_feature_cstr, (st_data_t)this_feature_index);
- }
- else {
- Check_Type(this_feature_index, T_ARRAY);
- rb_ary_push(this_feature_index, offset);
- }
-}
-
-/* Add to the loaded-features index all the required entries for
- `feature`, located at `offset` in $LOADED_FEATURES. We add an
- index entry at each string `short_feature` for which
- feature == "#{prefix}#{short_feature}#{e}"
- where `e` is empty or matches %r{^\.[^./]*$}, and `prefix` is empty
- or ends in '/'. This maintains the invariant that `rb_feature_p()`
- relies on for its fast lookup.
-*/
-static void
-features_index_add(VALUE feature, VALUE offset)
-{
- VALUE short_feature;
- const char *feature_str, *feature_end, *ext, *p;
-
- feature_str = StringValuePtr(feature);
- feature_end = feature_str + RSTRING_LEN(feature);
-
- for (ext = feature_end; ext > feature_str; ext--)
- if (*ext == '.' || *ext == '/')
- break;
- if (*ext != '.')
- ext = NULL;
- /* Now `ext` points to the only string matching %r{^\.[^./]*$} that is
- at the end of `feature`, or is NULL if there is no such string. */
-
- p = ext ? ext : feature_end;
- while (1) {
- p--;
- while (p >= feature_str && *p != '/')
- p--;
- if (p < feature_str)
- break;
- /* Now *p == '/'. We reach this point for every '/' in `feature`. */
- short_feature = rb_str_subseq(feature, p + 1 - feature_str, feature_end - p - 1);
- features_index_add_single(short_feature, offset);
- if (ext) {
- short_feature = rb_str_subseq(feature, p + 1 - feature_str, ext - p - 1);
- features_index_add_single(short_feature, offset);
- }
- }
- features_index_add_single(feature, offset);
- if (ext) {
- short_feature = rb_str_subseq(feature, 0, ext - feature_str);
- features_index_add_single(short_feature, offset);
- }
-}
-
-static int
-loaded_features_index_clear_i(st_data_t key, st_data_t val, st_data_t arg)
-{
- xfree((char *)key);
- return ST_DELETE;
-}
-
-static st_table *
-get_loaded_features_index(void)
-{
- VALUE features;
- int i;
- rb_vm_t *vm = GET_VM();
-
- if (!rb_ary_shared_with_p(vm->loaded_features_snapshot, vm->loaded_features)) {
- /* The sharing was broken; something (other than us in rb_provide_feature())
- modified loaded_features. Rebuild the index. */
- st_foreach(vm->loaded_features_index, loaded_features_index_clear_i, 0);
- features = vm->loaded_features;
- for (i = 0; i < RARRAY_LEN(features); i++) {
- VALUE entry, as_str;
- as_str = entry = rb_ary_entry(features, i);
- StringValue(as_str);
- if (as_str != entry)
- rb_ary_store(features, i, as_str);
- rb_str_freeze(as_str);
- features_index_add(as_str, INT2FIX(i));
- }
- reset_loaded_features_snapshot();
- }
- return vm->loaded_features_index;
-}
-
-/* This searches `load_path` for a value such that
- name == "#{load_path[i]}/#{feature}"
- if `feature` is a suffix of `name`, or otherwise
- name == "#{load_path[i]}/#{feature}#{ext}"
- for an acceptable string `ext`. It returns
- `load_path[i].to_str` if found, else 0.
-
- If type is 's', then `ext` is acceptable only if IS_DLEXT(ext);
- if 'r', then only if IS_RBEXT(ext); otherwise `ext` may be absent
- or have any value matching `%r{^\.[^./]*$}`.
-*/
static VALUE
loaded_feature_path(const char *name, long vlen, const char *feature, long len,
int type, VALUE load_path)
@@ -314,38 +76,34 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len,
long plen;
const char *e;
- if (vlen < len+1) return 0;
- if (!strncmp(name+(vlen-len), feature, len)) {
- plen = vlen - len;
- }
- else {
+ if(vlen < len) return 0;
+ if (!strncmp(name+(vlen-len),feature,len)){
+ plen = vlen - len - 1;
+ } else {
for (e = name + vlen; name != e && *e != '.' && *e != '/'; --e);
- if (*e != '.' ||
+ if (*e!='.' ||
e-name < len ||
- strncmp(e-len, feature, len))
+ strncmp(e-len,feature,len) )
return 0;
- plen = e - name - len;
+ plen = e - name - len - 1;
}
- if (plen > 0 && name[plen-1] != '/') {
- return 0;
- }
- if (type == 's' ? !IS_DLEXT(&name[plen+len]) :
- type == 'r' ? !IS_RBEXT(&name[plen+len]) :
- 0) {
- return 0;
- }
- /* Now name == "#{prefix}/#{feature}#{ext}" where ext is acceptable
- (possibly empty) and prefix is some string of length plen. */
-
- if (plen > 0) --plen; /* exclude '.' */
for (i = 0; i < RARRAY_LEN(load_path); ++i) {
VALUE p = RARRAY_PTR(load_path)[i];
const char *s = StringValuePtr(p);
long n = RSTRING_LEN(p);
- if (n != plen) continue;
- if (n && strncmp(name, s, n)) continue;
- return p;
+ if (n != plen ) continue;
+ if (n && (strncmp(name, s, n) || name[n] != '/')) continue;
+ switch (type) {
+ case 's':
+ if (IS_DLEXT(&name[n+len+1])) return p;
+ break;
+ case 'r':
+ if (IS_RBEXT(&name[n+len+1])) return p;
+ break;
+ default:
+ return p;
+ }
}
return 0;
}
@@ -373,10 +131,10 @@ loaded_feature_path_i(st_data_t v, st_data_t b, st_data_t f)
static int
rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const char **fn)
{
- VALUE features, this_feature_index = Qnil, v, p, load_path = 0;
+ VALUE v, features, p, load_path = 0;
const char *f, *e;
long i, len, elen, n;
- st_table *loading_tbl, *features_index;
+ st_table *loading_tbl;
st_data_t data;
int type;
@@ -392,49 +150,8 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
type = 0;
}
features = get_loaded_features();
- features_index = get_loaded_features_index();
-
- st_lookup(features_index, (st_data_t)feature, (st_data_t *)&this_feature_index);
- /* We search `features` for an entry such that either
- "#{features[i]}" == "#{load_path[j]}/#{feature}#{e}"
- for some j, or
- "#{features[i]}" == "#{feature}#{e}"
- Here `e` is an "allowed" extension -- either empty or one
- of the extensions accepted by IS_RBEXT, IS_SOEXT, or
- IS_DLEXT. Further, if `ext && rb` then `IS_RBEXT(e)`,
- and if `ext && !rb` then `IS_SOEXT(e) || IS_DLEXT(e)`.
-
- If `expanded`, then only the latter form (without load_path[j])
- is accepted. Otherwise either form is accepted, *unless* `ext`
- is false and an otherwise-matching entry of the first form is
- preceded by an entry of the form
- "#{features[i2]}" == "#{load_path[j2]}/#{feature}#{e2}"
- where `e2` matches %r{^\.[^./]*$} but is not an allowed extension.
- After a "distractor" entry of this form, only entries of the
- form "#{feature}#{e}" are accepted.
-
- In `rb_provide_feature()` and `get_loaded_features_index()` we
- maintain an invariant that the array `this_feature_index` will
- point to every entry in `features` which has the form
- "#{prefix}#{feature}#{e}"
- where `e` is empty or matches %r{^\.[^./]*$}, and `prefix` is empty
- or ends in '/'. This includes both match forms above, as well
- as any distractors, so we may ignore all other entries in `features`.
- */
- for (i = 0; !NIL_P(this_feature_index); i++) {
- VALUE entry;
- long index;
- if (RB_TYPE_P(this_feature_index, T_ARRAY)) {
- if (i >= RARRAY_LEN(this_feature_index)) break;
- entry = RARRAY_PTR(this_feature_index)[i];
- }
- else {
- if (i > 0) break;
- entry = this_feature_index;
- }
- index = FIX2LONG(entry);
-
- v = RARRAY_PTR(features)[index];
+ for (i = 0; i < RARRAY_LEN(features); ++i) {
+ v = RARRAY_PTR(features)[i];
f = StringValuePtr(v);
if ((n = RSTRING_LEN(v)) < len) continue;
if (strncmp(f, feature, len) != 0) {
@@ -457,7 +174,6 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
return 'r';
}
}
-
loading_tbl = get_loading_table();
if (loading_tbl) {
f = 0;
@@ -466,7 +182,7 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
fs.name = feature;
fs.len = len;
fs.type = type;
- fs.load_path = load_path ? load_path : rb_get_expanded_load_path();
+ fs.load_path = load_path ? load_path : rb_get_load_path();
fs.result = 0;
st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs);
if ((f = fs.result) != 0) {
@@ -483,9 +199,6 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
else {
VALUE bufstr;
char *buf;
- static const char so_ext[][4] = {
- ".so", ".o",
- };
if (ext && *ext) return 0;
bufstr = rb_str_tmp_new(len + DLEXT_MAXLEN);
@@ -499,14 +212,6 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c
return i ? 's' : 'r';
}
}
- for (i = 0; i < numberof(so_ext); i++) {
- strlcpy(buf + len, so_ext[i], DLEXT_MAXLEN + 1);
- if (st_get_key(loading_tbl, (st_data_t)buf, &data)) {
- rb_str_resize(bufstr, 0);
- if (fn) *fn = (const char*)data;
- return 's';
- }
- }
rb_str_resize(bufstr, 0);
}
}
@@ -527,7 +232,7 @@ rb_feature_provided(const char *feature, const char **loading)
if (*feature == '.' &&
(feature[1] == '/' || strncmp(feature+1, "./", 2) == 0)) {
- fullpath = rb_file_expand_path_fast(rb_get_path(rb_str_new2(feature)), Qnil);
+ fullpath = rb_file_expand_path(rb_str_new2(feature), Qnil);
feature = RSTRING_PTR(fullpath);
}
if (ext && !strchr(ext, '/')) {
@@ -548,18 +253,7 @@ rb_feature_provided(const char *feature, const char **loading)
static void
rb_provide_feature(VALUE feature)
{
- VALUE features;
-
- features = get_loaded_features();
- if (OBJ_FROZEN(features)) {
- rb_raise(rb_eRuntimeError,
- "$LOADED_FEATURES is frozen; cannot append feature");
- }
- rb_str_freeze(feature);
-
- rb_ary_push(features, feature);
- features_index_add(feature, INT2FIX(RARRAY_LEN(features)-1));
- reset_loaded_features_snapshot();
+ rb_ary_push(get_loaded_features(), feature);
}
void
@@ -606,7 +300,7 @@ rb_load_internal(VALUE fname, int wrap)
th->mild_compile_error++;
node = (NODE *)rb_load_file(RSTRING_PTR(fname));
loaded = TRUE;
- iseq = rb_iseq_new_top(node, rb_str_new2("<top (required)>"), fname, rb_realpath_internal(Qnil, fname, 1), Qfalse);
+ iseq = rb_iseq_new_top(node, rb_str_new2("<top (required)>"), fname, fname, Qfalse);
th->mild_compile_error--;
rb_iseq_eval(iseq);
}
@@ -620,12 +314,11 @@ rb_load_internal(VALUE fname, int wrap)
th->top_self = self;
th->top_wrapper = wrapper;
- if (!loaded && !FIXNUM_P(GET_THREAD()->errinfo)) {
- /* an error on loading don't include INT2FIX(TAG_FATAL) see r35625 */
+ if (!loaded) {
rb_exc_raise(GET_THREAD()->errinfo);
}
if (state) {
- rb_vm_jump_tag_but_local_jump(state);
+ rb_vm_jump_tag_but_local_jump(state, Qundef);
}
if (!NIL_P(GET_THREAD()->errinfo)) {
@@ -676,13 +369,6 @@ rb_f_load(int argc, VALUE *argv)
VALUE fname, wrap, path;
rb_scan_args(argc, argv, "11", &fname, &wrap);
-
- if (RUBY_DTRACE_LOAD_ENTRY_ENABLED()) {
- RUBY_DTRACE_LOAD_ENTRY(StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
- }
-
path = rb_find_file(FilePathValue(fname));
if (!path) {
if (!rb_file_load_ok(RSTRING_PTR(fname)))
@@ -690,13 +376,6 @@ rb_f_load(int argc, VALUE *argv)
path = fname;
}
rb_load_internal(path, RTEST(wrap));
-
- if (RUBY_DTRACE_LOAD_RETURN_ENABLED()) {
- RUBY_DTRACE_LOAD_RETURN(StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
- }
-
return Qtrue;
}
@@ -713,45 +392,15 @@ load_lock(const char *ftptr)
}
/* partial state */
ftptr = ruby_strdup(ftptr);
- data = (st_data_t)rb_thread_shield_new();
+ data = (st_data_t)rb_barrier_new();
st_insert(loading_tbl, (st_data_t)ftptr, data);
return (char *)ftptr;
}
- else if (RB_TYPE_P((VALUE)data, T_NODE) && nd_type((VALUE)data) == NODE_MEMO) {
- NODE *memo = RNODE(data);
- void (*init)(void) = (void (*)(void))memo->nd_cfnc;
- data = (st_data_t)rb_thread_shield_new();
- st_insert(loading_tbl, (st_data_t)ftptr, data);
- (*init)();
- return (char *)"";
- }
if (RTEST(ruby_verbose)) {
rb_warning("loading in progress, circular require considered harmful - %s", ftptr);
- /* TODO: display to $stderr, not stderr in C */
rb_backtrace();
}
- switch (rb_thread_shield_wait((VALUE)data)) {
- case Qfalse:
- data = (st_data_t)ftptr;
- st_insert(loading_tbl, data, (st_data_t)rb_thread_shield_new());
- return 0;
- case Qnil:
- return 0;
- }
- return (char *)ftptr;
-}
-
-static int
-release_thread_shield(st_data_t *key, st_data_t *value, st_data_t done, int existing)
-{
- VALUE thread_shield = (VALUE)*value;
- if (!existing) return ST_STOP;
- if (done ? rb_thread_shield_destroy(thread_shield) : rb_thread_shield_release(thread_shield)) {
- /* still in-use */
- return ST_CONTINUE;
- }
- xfree((char *)*key);
- return ST_DELETE;
+ return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0;
}
static void
@@ -759,47 +408,41 @@ load_unlock(const char *ftptr, int done)
{
if (ftptr) {
st_data_t key = (st_data_t)ftptr;
+ st_data_t data;
st_table *loading_tbl = get_loading_table();
- st_update(loading_tbl, key, release_thread_shield, done);
+ if (st_delete(loading_tbl, &key, &data)) {
+ VALUE barrier = (VALUE)data;
+ xfree((char *)key);
+ if (done)
+ rb_barrier_destroy(barrier);
+ else
+ rb_barrier_release(barrier);
+ }
}
}
/*
* call-seq:
- * require(name) -> true or false
- *
- * Loads the given +name+, returning +true+ if successful and +false+ if the
- * feature is already loaded.
- *
- * If the filename does not resolve to an absolute path, it will be searched
- * for in the directories listed in <code>$LOAD_PATH</code> (<code>$:</code>).
+ * require(string) -> true or false
*
- * If the filename has the extension ".rb", it is loaded as a source file; if
- * the extension is ".so", ".o", or ".dll", or the default shared library
- * extension 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 until found. If the file named cannot be found, a LoadError
- * will be raised.
- *
- * For Ruby extensions the filename given may use any shared library
- * extension. For example, on Linux the socket extension is "socket.so" and
- * <code>require 'socket.dll'</code> will load the socket extension.
- *
- * The absolute path of the loaded file is added to
- * <code>$LOADED_FEATURES</code> (<code>$"</code>). A file will not be
- * loaded again if its path already appears in <code>$"</code>. For example,
- * <code>require 'a'; require './a'</code> will not load <code>a.rb</code>
- * again.
- *
- * require "my-library.rb"
- * require "db-driver"
- *
- * Any constants or globals within the loaded source file will be available
- * in the calling program's global namespace. However, local variables will
- * not be propagated to the loading environment.
+ * 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 its name already
+ * appears in <code>$"</code>. The file name is converted to an absolute
+ * path, so ``<code>require 'a'; require './a'</code>'' will not load
+ * <code>a.rb</code> twice.
*
+ * require "my-library.rb"
+ * require "db-driver"
*/
VALUE
@@ -808,20 +451,13 @@ rb_f_require(VALUE obj, VALUE fname)
return rb_require_safe(fname, rb_safe_level());
}
-/*
- * call-seq:
- * require_relative(string) -> true or false
- *
- * Ruby tries to load the library named _string_ relative to the requiring
- * file's path. If the file's path cannot be determined a LoadError is raised.
- * If a file is loaded +true+ is returned and false otherwise.
- */
VALUE
rb_f_require_relative(VALUE obj, VALUE fname)
{
+ VALUE rb_current_realfilepath(void);
VALUE base = rb_current_realfilepath();
if (NIL_P(base)) {
- rb_loaderror("cannot infer basepath");
+ rb_raise(rb_eLoadError, "cannot infer basepath");
}
base = rb_file_dirname(base);
return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level());
@@ -840,7 +476,7 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level)
if (ext && !strchr(ext, '/')) {
if (IS_RBEXT(ext)) {
if (rb_feature_p(ftptr, ext, TRUE, FALSE, &loading)) {
- if (loading) *path = rb_filesystem_str_new_cstr(loading);
+ if (loading) *path = rb_str_new2(loading);
return 'r';
}
if ((tmp = rb_find_file_safe(fname, safe_level)) != 0) {
@@ -853,10 +489,10 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level)
}
else if (IS_SOEXT(ext)) {
if (rb_feature_p(ftptr, ext, FALSE, FALSE, &loading)) {
- if (loading) *path = rb_filesystem_str_new_cstr(loading);
+ if (loading) *path = rb_str_new2(loading);
return 's';
}
- tmp = rb_str_subseq(fname, 0, ext - RSTRING_PTR(fname));
+ tmp = rb_str_new(RSTRING_PTR(fname), ext - RSTRING_PTR(fname));
#ifdef DLEXT2
OBJ_FREEZE(tmp);
if (rb_find_file_ext_safe(&tmp, loadable_ext + 1, safe_level)) {
@@ -878,7 +514,7 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level)
}
else if (IS_DLEXT(ext)) {
if (rb_feature_p(ftptr, ext, FALSE, FALSE, &loading)) {
- if (loading) *path = rb_filesystem_str_new_cstr(loading);
+ if (loading) *path = rb_str_new2(loading);
return 's';
}
if ((tmp = rb_find_file_safe(fname, safe_level)) != 0) {
@@ -890,7 +526,7 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level)
}
}
else if ((ft = rb_feature_p(ftptr, 0, FALSE, FALSE, &loading)) == 'r') {
- if (loading) *path = rb_filesystem_str_new_cstr(loading);
+ if (loading) *path = rb_str_new2(loading);
return 'r';
}
tmp = fname;
@@ -898,16 +534,13 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level)
switch (type) {
case 0:
if (ft)
- goto statically_linked;
+ break;
ftptr = RSTRING_PTR(tmp);
return rb_feature_p(ftptr, 0, FALSE, TRUE, 0);
default:
- if (ft) {
- statically_linked:
- if (loading) *path = rb_filesystem_str_new_cstr(loading);
- return ft;
- }
+ if (ft)
+ break;
case 1:
ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
if (rb_feature_p(ftptr, ext, !--type, TRUE, &loading) && !loading)
@@ -920,7 +553,9 @@ search_required(VALUE fname, volatile VALUE *path, int safe_level)
static void
load_failed(VALUE fname)
{
- rb_load_fail(fname, "cannot load such file");
+ VALUE mesg = rb_str_buf_new_cstr("no such file to load -- ");
+ rb_str_append(mesg, fname); /* should be ASCII compatible */
+ rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg));
}
static VALUE
@@ -942,12 +577,6 @@ rb_require_safe(VALUE fname, int safe)
} volatile saved;
char *volatile ftptr = 0;
- if (RUBY_DTRACE_REQUIRE_ENTRY_ENABLED()) {
- RUBY_DTRACE_REQUIRE_ENTRY(StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
- }
-
PUSH_TAG();
saved.safe = rb_safe_level();
if ((state = EXEC_TAG()) == 0) {
@@ -958,28 +587,11 @@ rb_require_safe(VALUE fname, int safe)
rb_set_safe_level_force(safe);
FilePathValue(fname);
rb_set_safe_level_force(0);
-
- if (RUBY_DTRACE_FIND_REQUIRE_ENTRY_ENABLED()) {
- RUBY_DTRACE_FIND_REQUIRE_ENTRY(StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
- }
-
found = search_required(fname, &path, safe);
-
- if (RUBY_DTRACE_FIND_REQUIRE_RETURN_ENABLED()) {
- RUBY_DTRACE_FIND_REQUIRE_RETURN(StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
- }
if (found) {
if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) {
result = Qfalse;
}
- else if (!*ftptr) {
- rb_provide_feature(path);
- result = Qtrue;
- }
else {
switch (found) {
case 'r':
@@ -988,7 +600,7 @@ rb_require_safe(VALUE fname, int safe)
case 's':
handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext,
- path, 0, path);
+ path, 0, path, path);
rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
break;
}
@@ -1011,12 +623,6 @@ rb_require_safe(VALUE fname, int safe)
th->errinfo = errinfo;
- if (RUBY_DTRACE_REQUIRE_RETURN_ENABLED()) {
- RUBY_DTRACE_REQUIRE_RETURN(StringValuePtr(fname),
- rb_sourcefile(),
- rb_sourceline());
- }
-
return result;
}
@@ -1028,30 +634,23 @@ rb_require(const char *fname)
return rb_require_safe(fn, rb_safe_level());
}
-static int
-register_init_ext(st_data_t *key, st_data_t *value, st_data_t init, int existing)
+static VALUE
+init_ext_call(VALUE arg)
{
- const char *name = (char *)*key;
- if (existing) {
- /* already registered */
- rb_warn("%s is already registered", name);
- }
- else {
- *value = (st_data_t)NEW_MEMO(init, 0, 0);
- *key = (st_data_t)ruby_strdup(name);
- }
- return ST_CONTINUE;
+ SCOPE_SET(NOEX_PUBLIC);
+ (*(void (*)(void))arg)();
+ return Qnil;
}
-RUBY_FUNC_EXPORTED void
+void
ruby_init_ext(const char *name, void (*init)(void))
{
- st_table *loading_tbl = get_loading_table();
-
- if (!loading_tbl) {
- GET_VM()->loading_table = loading_tbl = st_init_strtable();
+ if (load_lock(name)) {
+ rb_vm_call_cfunc(rb_vm_top_self(), init_ext_call, (VALUE)init,
+ 0, rb_str_new2(name), Qnil);
+ rb_provide(name);
+ load_unlock(name, 1);
}
- st_update(loading_tbl, (st_data_t)name, register_init_ext, (st_data_t)init);
}
/*
@@ -1094,11 +693,7 @@ rb_mod_autoload(VALUE mod, VALUE sym, VALUE file)
static VALUE
rb_mod_autoload_p(VALUE mod, VALUE sym)
{
- ID id = rb_check_id(&sym);
- if (!id) {
- return Qnil;
- }
- return rb_autoload_p(mod, id);
+ return rb_autoload_p(mod, rb_to_id(sym));
}
/*
@@ -1115,7 +710,7 @@ rb_mod_autoload_p(VALUE mod, VALUE sym)
static VALUE
rb_f_autoload(VALUE obj, VALUE sym, VALUE file)
{
- VALUE klass = rb_class_real(rb_vm_cbase());
+ VALUE klass = rb_vm_cbase();
if (NIL_P(klass)) {
rb_raise(rb_eTypeError, "Can not set autoload on singleton class");
}
@@ -1148,7 +743,7 @@ void
Init_load()
{
#undef rb_intern
-#define rb_intern(str) rb_intern2((str), strlen(str))
+#define rb_intern(str) rb_intern2(str, strlen(str))
rb_vm_t *vm = GET_VM();
static const char var_load_path[] = "$:";
ID id_load_path = rb_intern2(var_load_path, sizeof(var_load_path)-1);
@@ -1157,15 +752,10 @@ Init_load()
rb_alias_variable(rb_intern("$-I"), id_load_path);
rb_alias_variable(rb_intern("$LOAD_PATH"), id_load_path);
vm->load_path = rb_ary_new();
- vm->expanded_load_path = rb_ary_tmp_new(0);
- vm->load_path_snapshot = rb_ary_tmp_new(0);
- vm->load_path_check_cache = 0;
rb_define_virtual_variable("$\"", get_loaded_features, 0);
rb_define_virtual_variable("$LOADED_FEATURES", get_loaded_features, 0);
vm->loaded_features = rb_ary_new();
- vm->loaded_features_snapshot = rb_ary_tmp_new(0);
- vm->loaded_features_index = st_init_strtable();
rb_define_global_function("load", rb_f_load, -1);
rb_define_global_function("require", rb_f_require, 1);
@@ -1175,6 +765,6 @@ Init_load()
rb_define_global_function("autoload", rb_f_autoload, 2);
rb_define_global_function("autoload?", rb_f_autoload_p, 1);
- ruby_dln_librefs = rb_ary_tmp_new(0);
+ ruby_dln_librefs = rb_ary_new();
rb_gc_register_mark_object(ruby_dln_librefs);
}
diff --git a/main.c b/main.c
index 16da117732..a782939ff3 100644
--- a/main.c
+++ b/main.c
@@ -11,13 +11,12 @@
#undef RUBY_EXPORT
#include "ruby.h"
-#include "vm_debug.h"
+#include "debug.h"
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
-#ifdef RUBY_DEBUG_ENV
-#include <stdlib.h>
-#endif
+
+RUBY_GLOBAL_SETUP
int
main(int argc, char **argv)
diff --git a/man/erb.1 b/man/erb.1
index 8c47e581d3..80b564a061 100644
--- a/man/erb.1
+++ b/man/erb.1
@@ -1,5 +1,5 @@
.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd November 7, 2012
+.Dd December 27, 2008
.Dt ERB(1) "" "Ruby Programmers Reference Guide"
.Os UNIX
.Sh NAME
@@ -22,8 +22,8 @@ is a command line front-end for
.Li "ERB"
library, which is an implementation of eRuby.
.Pp
-ERB provides an easy to use but powerful templating system for Ruby.
-Using ERB, actual Ruby code can be added to any plain text document for the
+eRuby provdes an easy to use but powerful templating system for Ruby.
+Using eRuby, actual Ruby code can be added to any plain text document for the
purposes of generating document information details and/or flow control.
.Pp
.Nm
@@ -41,7 +41,7 @@ Prints the version of
.It Fl -encoding Ar external Ns Op : Ns Ar internal
Specifies the default value(s) for external encodings and internal encoding. Values should be separated with colon (:).
.Pp
-You can omit the one for internal encodings, then the value
+You can ommit the one for internal encodings, then the value
.Pf ( Li "Encoding.default_internal" ) will be nil.
.Pp
.It Fl P
@@ -80,7 +80,7 @@ And leading whitespaces are removed if the erb directive starts with
.Pp
.It Fl U
can be one of
-Sets the default value for internal encodings
+Sets the defalut value for internal encodings
.Pf ( Li "Encoding.default_internal" ) to UTF-8.
.Pp
.It Fl d
@@ -91,7 +91,7 @@ will be set to true.
.Pp
.It Fl h
.It Fl -help
-Prints a summary of the options.
+Prints a summry of the options.
.Pp
.It Fl n
Used with
@@ -146,12 +146,12 @@ class.
.Li Security vulnerabilities should be reported via an email to
.Aq security@ruby-lang.org Ns
.Li .
-Reported problems will be published after being fixed.
+Reported problems will be published after fixed.
.Pp
.Li And you can report other bugs and feature requests via the
-Ruby Issue Tracking System (http://bugs.ruby-lang.org).
+Ruby Issue Tracking System (http://redmine.ruby-lang.org).
Do not report security vulnerabilities
-via the system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immedately.
.El
.Sh AUTHORS
Written by Masatoshi SEKI.
diff --git a/man/goruby.1 b/man/goruby.1
index 62a7bad23f..f69b951a06 100644
--- a/man/goruby.1
+++ b/man/goruby.1
@@ -1,10 +1,10 @@
.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd November 7, 2012
+.Dd October 25, 2008
.Dt GORUBY(1) "" "Ruby Programmers Reference Guide"
.Os UNIX
.Sh NAME
.Nm goruby
-.Nd A code-golfer's best friend
+.Nd Code-golfer's best friend
.Sh SYNOPSIS
.Nm
.Op options ...
@@ -14,12 +14,12 @@
.Sh DESCRIPTION
.Sy goruby
is a kind of Ruby language processor
-which recognizes extremely shortened programs as below:
+which recognizes extremely shorten programs as bellow;
.Bd -literal -offset indent
rq"date";s De.td
.Ed
.Pp
-Which means:
+This means
.Bd -literal -offset indent
require"date";puts Date.today
.Ed
@@ -35,5 +35,5 @@ The stiff version of Ruby interpreter.
.El
.Pp
.Sh AUTHORS
-Originally written by Nobuyoshi Nakada and developed by the
+Originally written by Nobuyoshi Nakada and developed by
Ruby core team.
diff --git a/man/irb.1 b/man/irb.1
index 543217e099..dc78baeff7 100644
--- a/man/irb.1
+++ b/man/irb.1
@@ -1,5 +1,5 @@
.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd November 7, 2012
+.Dd October 25, 2008
.Dt IRB(1) "" "Ruby Programmers Reference Guide"
.Os UNIX
.Sh NAME
@@ -27,7 +27,7 @@
.Pp
.Sh DESCRIPTION
.Nm
-is the REPL(read-eval-print loop) environment for Ruby programs.
+is the REPL(read-eval&print loop) environment for Ruby programs.
.Pp
.Sh OPTIONS
.Bl -tag -width "1234567890123" -compact
@@ -41,7 +41,7 @@ Prints the version of
Same as `ruby -E' .
Specifies the default value(s) for external encodings and internal encoding. Values should be separated with colon (:).
.Pp
-You can omit the one for internal encodings, then the value
+You can ommit the one for internal encodings, then the value
.Pf ( Li "Encoding.default_internal" ) will be nil.
.Pp
.It Fl I Ar path
@@ -52,7 +52,7 @@ directory
.Pp
.It Fl U
Same as `ruby -U' .
-Sets the default value for internal encodings
+Sets the defalut value for internal encodings
.Pf ( Li "Encoding.default_internal" ) to UTF-8.
.Pp
.It Fl d
@@ -162,12 +162,12 @@ Personal irb initialization.
.Li Security vulnerabilities should be reported via an email to
.Aq security@ruby-lang.org Ns
.Li .
-Reported problems will be published after being fixed.
+Reported problems will be published after fixed.
.Pp
.Li And you can report other bugs and feature requests via the
-Ruby Issue Tracking System (http://bugs.ruby-lang.org).
+Ruby Issue Tracking System (http://redmine.ruby-lang.org).
Do not report security vulnerabilities
-via the system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immedately.
.El
.Sh AUTHORS
Written by Keiju ISHITSUKA.
diff --git a/man/rake.1 b/man/rake.1
index c8ba5dd82c..2f80dbf7f4 100644
--- a/man/rake.1
+++ b/man/rake.1
@@ -1,4 +1,4 @@
-.Dd November 7, 2012
+.Dd November 30, 2008
.Dt RAKE(1) "" "Ruby Programmers Reference Guide"
.Os UNIX
.Sh NAME
@@ -37,7 +37,7 @@ No XML files to edit. No quirky Makefile syntax to worry about (is that a tab or
.It
Users can specify tasks with prerequisites.
.It
-Rake supports rule patterns to synthesize implicit tasks.
+Rake supports rule patterns to sythesize implicit tasks.
.It
Flexible FileLists that act like arrays but know about manipulating file names and paths.
.It
diff --git a/man/ri.1 b/man/ri.1
index cadf4b8e16..baced73528 100644
--- a/man/ri.1
+++ b/man/ri.1
@@ -1,5 +1,5 @@
.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd November 7, 2012
+.Dd December 29, 2008
.Dt RI(1) "" "Ruby Programmers Reference Guide"
.Os UNIX
.Sh NAME
@@ -18,7 +18,7 @@
.Op Ar target ...
.Sh DESCRIPTION
.Nm
-is a CLI front end for the Ruby API reference.
+is a CUI front end for the Ruby API reference.
You can search and read API reference for classes and methods with
.Nm .
.Pp
@@ -77,8 +77,7 @@ directories. May be repeated.
.It Fl -fmt Ar FORMAT
.It Fl -format Ns = Ns FORMAT
Format to use when displaying output:
-.Pp
-ansi, bs, html, plain, simple
+.Dd ansi, bs, html, plain, simple
.Pp
Use 'bs' (backspace) with most pager programs. To use ANSI, either disable the
pager or tell the pager to allow control characters.
@@ -169,12 +168,12 @@ Searches user-wide documents here.
.Li Security vulnerabilities should be reported via an email to
.Aq security@ruby-lang.org Ns
.Li .
-Reported problems will be published after being fixed.
+Reported problems will be published after fixed.
.Pp
.Li And you can report other bugs and feature requests via the
-Ruby Issue Tracking System (http://bugs.ruby-lang.org).
+Ruby Issue Tracking System (http://redmine.ruby-lang.org).
Do not report security vulnerabilities
-via the system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immedately.
.El
.Sh AUTHORS
Written by Dave Thomas
diff --git a/man/ruby.1 b/man/ruby.1
index 84f6bf47d7..9ac2324c1a 100644
--- a/man/ruby.1
+++ b/man/ruby.1
@@ -1,5 +1,5 @@
.\"Ruby is copyrighted by Yukihiro Matsumoto <matz@netlab.jp>.
-.Dd November 7, 2012
+.Dd October 25, 2008
.Dt RUBY(1) "" "Ruby Programmers Reference Guide"
.\".Dt RUBY 1
.Os UNIX
@@ -32,12 +32,12 @@
.Sh DESCRIPTION
Ruby is an interpreted scripting language for quick and easy
object-oriented programming. It has many features to process text
-files and to do system management tasks (like in Perl). It is simple,
+files and to do system management tasks (as in Perl). It is simple,
straight-forward, and extensible.
.Pp
If you want a language for easy object-oriented programming, or you
don't like the Perl ugliness, or you do like the concept of LISP, but
-don't like too many parentheses, Ruby might be your language of
+don't like too much parentheses, Ruby may be the language of your
choice.
.Sh FEATURES
Ruby's features are as follows:
@@ -53,7 +53,7 @@ time check.
.Pp
.It Sy "No declaration needed"
You can use variables in your Ruby programs without any declarations.
-Variable names denote their scope - global, class, instance, or local.
+Variable names denote their scope, local, global, instance, etc.
.Pp
.It Sy "Simple syntax"
Ruby has a simple syntax influenced slightly from Eiffel.
@@ -64,11 +64,11 @@ from anywhere are automatically collected by the garbage collector
built into the interpreter.
.Pp
.It Sy "Everything is an object"
-Ruby is a purely object-oriented language, and was so since its
+Ruby is the purely object-oriented language, and was so since its
creation. Even such basic data as integers are seen as objects.
.Pp
.It Sy "Class, inheritance, and methods"
-Being an object-oriented language, Ruby naturally has basic
+Of course, as an object-oriented language, Ruby has such basic
features like classes, inheritance, and methods.
.Pp
.It Sy "Singleton methods"
@@ -81,7 +81,7 @@ to.
.It Sy "Mix-in by modules"
Ruby intentionally does not have the multiple inheritance as it is a
source of confusion. Instead, Ruby has the ability to share
-implementations across the inheritance tree. This is often called a
+implementations across the inheritance tree. This is often called
.Sq Mix-in .
.Pp
.It Sy "Iterators"
@@ -90,7 +90,7 @@ Ruby has iterators for loop abstraction.
.It Sy "Closures"
In Ruby, you can objectify the procedure.
.Pp
-.It Sy "Text processing and regular expressions"
+.It Sy "Text processing and regular expression"
Ruby has a bunch of text processing features like in Perl.
.Pp
.It Sy "M17N, character set independent"
@@ -102,8 +102,8 @@ different character encodings, without dependence on Unicode.
With built-in bignums, you can for example calculate factorial(400).
.Pp
.It Sy "Reflection and domain specific languages"
-Class is also an instance of the Class class. Definition of classes and methods
-is an expression just as 1+1 is. So your programs can even write and modify programs.
+Class is also an instance of Class class. Definition of classes and methods
+is just an expression as 1+1 is. So your programs can even write and modify programs.
Thus you can write your application in your own programming language on top of Ruby.
.Pp
.It Sy "Exception handling"
@@ -123,8 +123,9 @@ on-the-fly.
Libraries called "builtin libraries" and "standard libraries" are bundled with Ruby.
And you can obtain more libraries via the package management system called `RubyGems'.
.Pp
-Moreover there are thousands of Ruby projects on GitHub
-.Pf <\fBhttps://github.com/languages/Ruby\fR> Ns .
+Moreover there are thousands of Ruby projects in Rubyforge
+.Pf ( "http://www.rubyforge.org" ) and RAA
+.Pf ( "http://raa.ruby-lang.org" ) Ns .
.El
.Pp
.Sh OPTIONS
@@ -160,13 +161,9 @@ Causes Ruby to switch to the directory.
.It Fl -encoding Ar external Ns Op : Ns Ar internal
Specifies the default value(s) for external encodings and internal encoding. Values should be separated with colon (:).
.Pp
-You can omit the one for internal encodings, then the value
+You can ommit the one for internal encodings, then the value
.Pf ( Li "Encoding.default_internal" ) will be nil.
.Pp
-.It Fl -external-encoding Ns = Ns Ar encoding
-.It Fl -internal-encoding Ns = Ns Ar encoding
-Specify the default external or internal character encoding
-.Pp
.It Fl F Ar pattern
Specifies input field separator
.Pf ( Li "$;" ) .
@@ -198,7 +195,7 @@ ASCII-8BIT (BINARY)
.It Fl S
Makes Ruby use the
.Ev PATH
-environment variable to search for script, unless its name begins
+environment variable to search for script, unless if its name begins
with a slash. This is used to emulate
.Li #!
on machines that don't support it, in the following manner:
@@ -212,11 +209,11 @@ on machines that don't support it, in the following manner:
Turns on taint checks at the specified level (default 1).
.Pp
.It Fl U
-Sets the default value for internal encodings
+Sets the defalut value for internal encodings
.Pf ( Li "Encoding.default_internal" ) to UTF-8.
.Pp
.It Fl W Ns Op Ar level=2
-Turns on verbose mode at the specified level without printing the version
+Turns on verbose mode at the specified level, without printing version
message at the beginning. The level can be;
.Bl -hang -offset indent
.It Sy 0
@@ -262,7 +259,7 @@ will be set to true.
.Pp
.It Fl e Ar command
Specifies script from command-line while telling Ruby not to search
-the rest of the arguments for a script file name.
+the rest of arguments for a script file name.
.Pp
.It Fl h
.It Fl -help
@@ -337,8 +334,8 @@ On some systems
.Li "$0"
does not always contain the full pathname, so you need the
.Fl S
-switch to tell Ruby to search for the script if necessary (to handle embedded
-spaces and such). A better construct than
+switch to tell Ruby to search for the script if necessary. To handle
+embedded spaces or such. A better construct than
.Li "$*"
would be
.Li ${1+"$@"} ,
@@ -346,7 +343,7 @@ but it does not work if the script is being interpreted by
.Xr csh 1 .
.Pp
.It Fl v
-Enables verbose mode. Ruby will print its version at the beginning
+Enables verbose mode. Ruby will print its version at the beginning,
and set the variable
.Li "$VERBOSE"
to true. Some methods print extra messages if this variable is true.
@@ -361,16 +358,16 @@ variable to true.
.Pp
.It Fl x Ns Op Ar directory
Tells Ruby that the script is embedded in a message. Leading garbage
-will be discarded until the first line that starts with
+will be discarded until the first that starts with
.Dq #!
and contains the string,
.Dq ruby .
-Any meaningful switches on that line will be applied. The end of the script
+Any meaningful switches on that line will applied. The end of script
must be specified with either
.Li EOF ,
.Li "^D" ( Li "control-D" ) ,
.Li "^Z" ( Li "control-Z" ) ,
-or the reserved word
+or reserved word
.Li __END__ .
If the directory name is specified, Ruby will switch to that directory
before executing script.
@@ -380,8 +377,8 @@ before executing script.
DO NOT USE.
.Pp
Turns on compiler debug mode. Ruby will print a bunch of internal
-state messages during compilation. Only specify this switch you are going to
-debug the Ruby interpreter.
+state messages during compiling scripts. You don't have to specify
+this switch, unless you are going to debug the Ruby interpreter.
.Pp
.It Fl -disable- Ns Ar FEATURE
.It Fl -enable- Ns Ar FEATURE
@@ -416,11 +413,11 @@ Prints the specified target.
can be one of;
.Bl -hang -offset indent
.It Sy insns
-disassembled instructions
+disassembed instructions
.Pp
.El
.Pp
-Only specify this switch if you are going to debug the Ruby interpreter.
+You don't have to specify this switch, unless you are going to debug the Ruby interpreter.
.Pp
.It Fl -verbose
Enables verbose mode without printing version message at the
@@ -477,7 +474,7 @@ environment variable on calling Kernel#system.
This variable is obsolete.
.El
.Pp
-And Ruby depends on some RubyGems related environment variables unless RubyGems is disabled.
+And Ruby depends on some RubyGems related environment variables unless disabled RubyGems.
See the help of
.Xr gem 1
as bellow.
@@ -500,15 +497,15 @@ Ruby Application Archive.
.Li Security vulnerabilities should be reported via an email to
.Aq security@ruby-lang.org Ns
.Li .
-Reported problems will be published after they've been fixed.
+Reported problems will be published after fixed.
.Pp
.Li And you can report other bugs and feature requests via the
-Ruby Issue Tracking System (http://bugs.ruby-lang.org).
+Ruby Issue Tracking System (http://redmine.ruby-lang.org).
Do not report security vulnerabilities
-via the system because it publishes the vulnerabilities immediately.
+via the system because it publishes the vulnerabilities immedately.
.El
.Sh AUTHORS
Ruby is designed and implemented by
.An Yukihiro Matsumoto Aq matz@netlab.jp .
.Pp
-See <\fBhttp://bugs.ruby-lang.org/wiki/ruby/Contributors\fR> for contributors to Ruby.
+See <\fBhttp://redmine.ruby-lang.org/wiki/ruby/Contributors\fR> for contributors to Ruby.
diff --git a/marshal.c b/marshal.c
index a6f9229c34..73799413c5 100644
--- a/marshal.c
+++ b/marshal.c
@@ -14,7 +14,6 @@
#include "ruby/st.h"
#include "ruby/util.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include <math.h>
#ifdef HAVE_FLOAT_H
@@ -26,7 +25,7 @@
#define BITSPERSHORT (2*CHAR_BIT)
#define SHORTMASK ((1<<BITSPERSHORT)-1)
-#define SHORTDN(x) RSHIFT((x),BITSPERSHORT)
+#define SHORTDN(x) RSHIFT(x,BITSPERSHORT)
#if SIZEOF_SHORT == SIZEOF_BDIGITS
#define SHORTLEN(x) (x)
@@ -83,6 +82,8 @@ static ID s_dump, s_load, s_mdump, s_mload;
static ID s_dump_data, s_load_data, s_alloc, s_call;
static ID s_getbyte, s_read, s_write, s_binmode;
+ID rb_id_encoding(void);
+
typedef struct {
VALUE newclass;
VALUE oldclass;
@@ -185,7 +186,7 @@ memsize_dump_arg(const void *ptr)
static const rb_data_type_t dump_arg_data = {
"dump_arg",
- {mark_dump_arg, free_dump_arg, memsize_dump_arg,},
+ mark_dump_arg, free_dump_arg, memsize_dump_arg
};
static const char *
@@ -210,7 +211,7 @@ class2path(VALUE klass)
VALUE path = rb_class_path(klass);
const char *n;
- n = must_not_be_anonymous((RB_TYPE_P(klass, T_CLASS) ? "class" : "module"), path);
+ n = must_not_be_anonymous((TYPE(klass) == T_CLASS ? "class" : "module"), path);
if (rb_path_to_class(path) != rb_class_real(klass)) {
rb_raise(rb_eTypeError, "%s can't be referred to", n);
}
@@ -245,8 +246,6 @@ w_bytes(const char *s, long n, struct dump_arg *arg)
w_nbyte(s, n, arg);
}
-#define w_cstr(s, arg) w_bytes((s), strlen(s), (arg))
-
static void
w_short(int x, struct dump_arg *arg)
{
@@ -310,6 +309,35 @@ w_long(long x, struct dump_arg *arg)
#define MANT_BITS 8
#endif
+static int
+save_mantissa(double d, char *buf)
+{
+ int e, i = 0;
+ unsigned long m;
+ double n;
+
+ d = modf(ldexp(frexp(fabs(d), &e), DECIMAL_MANT), &d);
+ if (d > 0) {
+ buf[i++] = 0;
+ do {
+ d = modf(ldexp(d, MANT_BITS), &n);
+ m = (unsigned long)n;
+#if MANT_BITS > 24
+ buf[i++] = (char)(m >> 24);
+#endif
+#if MANT_BITS > 16
+ buf[i++] = (char)(m >> 16);
+#endif
+#if MANT_BITS > 8
+ buf[i++] = (char)(m >> 8);
+#endif
+ buf[i++] = (char)m;
+ } while (d > 0);
+ while (!buf[i - 1]) --i;
+ }
+ return i;
+}
+
static double
load_mantissa(double d, const char *buf, long len)
{
@@ -343,6 +371,7 @@ load_mantissa(double d, const char *buf, long len)
}
#else
#define load_mantissa(d, buf, len) (d)
+#define save_mantissa(d, buf) 0
#endif
#ifdef DBL_DIG
@@ -354,54 +383,29 @@ load_mantissa(double d, const char *buf, long len)
static void
w_float(double d, struct dump_arg *arg)
{
- char *ruby_dtoa(double d_, int mode, int ndigits, int *decpt, int *sign, char **rve);
char buf[FLOAT_DIG + (DECIMAL_MANT + 7) / 8 + 10];
if (isinf(d)) {
- if (d < 0) w_cstr("-inf", arg);
- else w_cstr("inf", arg);
+ if (d < 0) strcpy(buf, "-inf");
+ else strcpy(buf, "inf");
}
else if (isnan(d)) {
- w_cstr("nan", arg);
+ strcpy(buf, "nan");
}
else if (d == 0.0) {
- if (1.0/d < 0) w_cstr("-0", arg);
- else w_cstr("0", arg);
+ if (1.0/d < 0) strcpy(buf, "-0");
+ else strcpy(buf, "0");
}
else {
- int decpt, sign, digs, len = 0;
- char *e, *p = ruby_dtoa(d, 0, 0, &decpt, &sign, &e);
- if (sign) buf[len++] = '-';
- digs = (int)(e - p);
- if (decpt < -3 || decpt > digs) {
- buf[len++] = p[0];
- if (--digs > 0) buf[len++] = '.';
- memcpy(buf + len, p + 1, digs);
- len += digs;
- len += snprintf(buf + len, sizeof(buf) - len, "e%d", decpt - 1);
- }
- else if (decpt > 0) {
- memcpy(buf + len, p, decpt);
- len += decpt;
- if ((digs -= decpt) > 0) {
- buf[len++] = '.';
- memcpy(buf + len, p + decpt, digs);
- len += digs;
- }
- }
- else {
- buf[len++] = '0';
- buf[len++] = '.';
- if (decpt) {
- memset(buf + len, '0', -decpt);
- len -= decpt;
- }
- memcpy(buf + len, p, digs);
- len += digs;
- }
- xfree(p);
- w_bytes(buf, len, arg);
+ size_t len;
+
+ /* xxx: should not use system's sprintf(3) */
+ snprintf(buf, sizeof(buf), "%.*g", FLOAT_DIG, d);
+ len = strlen(buf);
+ w_bytes(buf, len + save_mantissa(d, buf + len), arg);
+ return;
}
+ w_bytes(buf, strlen(buf), arg);
}
static void
@@ -418,7 +422,7 @@ w_symbol(ID id, struct dump_arg *arg)
else {
sym = rb_id2str(id);
if (!sym) {
- rb_raise(rb_eTypeError, "can't dump anonymous ID %"PRIdVALUE, id);
+ rb_raise(rb_eTypeError, "can't dump anonymous ID %ld", id);
}
encidx = rb_enc_get_index(sym);
if (encidx == rb_usascii_encindex() ||
@@ -457,17 +461,12 @@ hash_each(VALUE key, VALUE value, struct dump_call_arg *arg)
return ST_CONTINUE;
}
-#define SINGLETON_DUMP_UNABLE_P(klass) \
- (RCLASS_M_TBL(klass)->num_entries || \
- (RCLASS_IV_TBL(klass) && RCLASS_IV_TBL(klass)->num_entries > 1))
-
static void
w_extended(VALUE klass, struct dump_arg *arg, int check)
{
if (check && FL_TEST(klass, FL_SINGLETON)) {
- VALUE origin = RCLASS_ORIGIN(klass);
- if (SINGLETON_DUMP_UNABLE_P(klass) ||
- (origin != klass && SINGLETON_DUMP_UNABLE_P(origin))) {
+ if (RCLASS_M_TBL(klass)->num_entries ||
+ (RCLASS_IV_TBL(klass) && RCLASS_IV_TBL(klass)->num_entries > 1)) {
rb_raise(rb_eTypeError, "singleton can't be dumped");
}
klass = RCLASS_SUPER(klass);
@@ -511,12 +510,8 @@ w_uclass(VALUE obj, VALUE super, struct dump_arg *arg)
}
static int
-w_obj_each(st_data_t key, st_data_t val, st_data_t a)
+w_obj_each(ID id, VALUE value, struct dump_call_arg *arg)
{
- ID id = (ID)key;
- VALUE value = (VALUE)val;
- struct dump_call_arg *arg = (struct dump_call_arg *)a;
-
if (id == rb_id_encoding()) return ST_CONTINUE;
if (id == rb_intern("E")) return ST_CONTINUE;
w_symbol(id, arg->arg);
@@ -598,7 +593,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
st_table *ivtbl = 0;
st_data_t num;
int hasiv = 0;
-#define has_ivars(obj, ivtbl) (((ivtbl) = rb_generic_ivar_table(obj)) != 0 || \
+#define has_ivars(obj, ivtbl) ((ivtbl = rb_generic_ivar_table(obj)) != 0 || \
(!SPECIAL_CONST_P(obj) && !ENCODING_IS_ASCII8BIT(obj)))
if (limit == 0) {
@@ -615,6 +610,9 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
return;
}
+ if ((hasiv = has_ivars(obj, ivtbl)) != 0) {
+ w_byte(TYPE_IVAR, arg);
+ }
if (obj == Qnil) {
w_byte(TYPE_NIL, arg);
}
@@ -641,40 +639,31 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
else if (SYMBOL_P(obj)) {
w_symbol(SYM2ID(obj), arg);
}
- else if (FLONUM_P(obj)) {
- st_add_direct(arg->data, obj, arg->data->num_entries);
- w_byte(TYPE_FLOAT, arg);
- w_float(RFLOAT_VALUE(obj), arg);
- }
else {
- VALUE v;
-
arg->infection |= (int)FL_TEST(obj, MARSHAL_INFECTION);
- if (rb_obj_respond_to(obj, s_mdump, TRUE)) {
- st_add_direct(arg->data, obj, arg->data->num_entries);
+ if (rb_respond_to(obj, s_mdump)) {
+ volatile VALUE v;
+
+ st_add_direct(arg->data, obj, arg->data->num_entries);
- v = rb_funcall2(obj, s_mdump, 0, 0);
+ v = rb_funcall(obj, s_mdump, 0, 0);
check_dump_arg(arg, s_mdump);
- hasiv = has_ivars(v, ivtbl);
- if (hasiv) w_byte(TYPE_IVAR, arg);
w_class(TYPE_USRMARSHAL, obj, arg, FALSE);
w_object(v, arg, limit);
- if (hasiv) w_ivar(v, ivtbl, &c_arg);
+ if (hasiv) w_ivar(obj, ivtbl, &c_arg);
return;
}
- if (rb_obj_respond_to(obj, s_dump, TRUE)) {
+ if (rb_respond_to(obj, s_dump)) {
+ VALUE v;
st_table *ivtbl2 = 0;
int hasiv2;
- v = INT2NUM(limit);
- v = rb_funcall2(obj, s_dump, 1, &v);
+ v = rb_funcall(obj, s_dump, 1, INT2NUM(limit));
check_dump_arg(arg, s_dump);
- if (!RB_TYPE_P(v, T_STRING)) {
+ if (TYPE(v) != T_STRING) {
rb_raise(rb_eTypeError, "_dump() must return string");
}
- hasiv = has_ivars(obj, ivtbl);
- if (hasiv) w_byte(TYPE_IVAR, arg);
if ((hasiv2 = has_ivars(v, ivtbl2)) != 0 && !hasiv) {
w_byte(TYPE_IVAR, arg);
}
@@ -692,7 +681,6 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
st_add_direct(arg->data, obj, arg->data->num_entries);
- hasiv = has_ivars(obj, ivtbl);
{
st_data_t compat_data;
rb_alloc_func_t allocator = rb_get_alloc_func(RBASIC(obj)->klass);
@@ -703,10 +691,8 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
VALUE real_obj = obj;
obj = compat->dumper(real_obj);
st_insert(arg->compat_tbl, (st_data_t)obj, (st_data_t)real_obj);
- if (obj != real_obj && !ivtbl) hasiv = 0;
}
}
- if (hasiv) w_byte(TYPE_IVAR, arg);
switch (BUILTIN_TYPE(obj)) {
case T_CLASS:
@@ -715,9 +701,8 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
}
w_byte(TYPE_CLASS, arg);
{
- VALUE path = class2path(obj);
+ volatile VALUE path = class2path(obj);
w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
- RB_GC_GUARD(path);
}
break;
@@ -726,7 +711,6 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
{
VALUE path = class2path(obj);
w_bytes(RSTRING_PTR(path), RSTRING_LEN(path), arg);
- RB_GC_GUARD(path);
}
break;
@@ -838,12 +822,12 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
{
VALUE v;
- if (!rb_obj_respond_to(obj, s_dump_data, TRUE)) {
+ if (!rb_respond_to(obj, s_dump_data)) {
rb_raise(rb_eTypeError,
- "no _dump_data is defined for class %s",
+ "no marshal_dump is defined for class %s",
rb_obj_classname(obj));
}
- v = rb_funcall2(obj, s_dump_data, 0, 0);
+ v = rb_funcall(obj, s_dump_data, 0);
check_dump_arg(arg, s_dump_data);
w_class(TYPE_DATA, obj, arg, TRUE);
w_object(v, arg, limit);
@@ -855,7 +839,6 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
rb_obj_classname(obj));
break;
}
- RB_GC_GUARD(obj);
}
if (hasiv) {
w_ivar(obj, ivtbl, &c_arg);
@@ -878,16 +861,9 @@ clear_dump_arg(struct dump_arg *arg)
}
}
-NORETURN(static inline void io_needed(void));
-static inline void
-io_needed(void)
-{
- rb_raise(rb_eTypeError, "instance of IO needed");
-}
-
/*
* call-seq:
- * dump( obj [, anIO] , limit=-1 ) -> anIO
+ * dump( obj [, anIO] , limit=--1 ) -> anIO
*
* Serializes obj and all descendant objects. If anIO is
* specified, the serialized data will be written to it, otherwise the
@@ -899,7 +875,7 @@ io_needed(void)
* def initialize(str)
* @str = str
* end
- * def say_hello
+ * def sayHello
* @str
* end
* end
@@ -909,7 +885,7 @@ io_needed(void)
* o = Klass.new("hello\n")
* data = Marshal.dump(o)
* obj = Marshal.load(data)
- * obj.say_hello #=> "hello\n"
+ * obj.sayHello #=> "hello\n"
*
* Marshal can't dump following objects:
* * anonymous Class/Module.
@@ -931,15 +907,15 @@ marshal_dump(int argc, VALUE *argv)
rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
if (argc == 3) {
if (!NIL_P(a2)) limit = NUM2INT(a2);
- if (NIL_P(a1)) io_needed();
+ if (NIL_P(a1)) goto type_error;
port = a1;
}
else if (argc == 2) {
if (FIXNUM_P(a1)) limit = FIX2INT(a1);
- else if (NIL_P(a1)) io_needed();
+ else if (NIL_P(a1)) goto type_error;
else port = a1;
}
- RB_GC_GUARD(wrapper) = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg);
+ wrapper = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg);
arg->dest = 0;
arg->symbols = st_init_numtable();
arg->data = st_init_numtable();
@@ -949,10 +925,12 @@ marshal_dump(int argc, VALUE *argv)
arg->str = rb_str_buf_new(0);
if (!NIL_P(port)) {
if (!rb_respond_to(port, s_write)) {
- io_needed();
+ type_error:
+ rb_raise(rb_eTypeError, "instance of IO needed");
}
arg->dest = port;
- if (rb_check_funcall(port, s_binmode, 0, 0) != Qundef) {
+ if (rb_respond_to(port, s_binmode)) {
+ rb_funcall2(port, s_binmode, 0, 0);
check_dump_arg(arg, s_binmode);
}
}
@@ -976,9 +954,6 @@ marshal_dump(int argc, VALUE *argv)
struct load_arg {
VALUE src;
- char *buf;
- long buflen;
- long readable;
long offset;
st_table *symbols;
st_table *data;
@@ -1023,22 +998,15 @@ memsize_load_arg(const void *ptr)
static const rb_data_type_t load_arg_data = {
"load_arg",
- {mark_load_arg, free_load_arg, memsize_load_arg,},
+ mark_load_arg, free_load_arg, memsize_load_arg
};
-#define r_entry(v, arg) r_entry0((v), (arg)->data->num_entries, (arg))
+#define r_entry(v, arg) r_entry0(v, (arg)->data->num_entries, arg)
static VALUE r_entry0(VALUE v, st_index_t num, struct load_arg *arg);
static VALUE r_object(struct load_arg *arg);
static ID r_symbol(struct load_arg *arg);
static VALUE path2class(VALUE path);
-NORETURN(static void too_short(void));
-static void
-too_short(void)
-{
- rb_raise(rb_eArgError, "marshal data too short");
-}
-
static st_index_t
r_prepare(struct load_arg *arg)
{
@@ -1048,50 +1016,25 @@ r_prepare(struct load_arg *arg)
return idx;
}
-static unsigned char
-r_byte1_buffered(struct load_arg *arg)
-{
- if (arg->buflen == 0) {
- long readable = arg->readable < BUFSIZ ? arg->readable : BUFSIZ;
- VALUE str, n = LONG2NUM(readable);
-
- str = rb_funcall2(arg->src, s_read, 1, &n);
-
- check_load_arg(arg, s_read);
- if (NIL_P(str)) too_short();
- StringValue(str);
- arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
- memcpy(arg->buf, RSTRING_PTR(str), RSTRING_LEN(str));
- arg->offset = 0;
- arg->buflen = RSTRING_LEN(str);
- }
- arg->buflen--;
- return arg->buf[arg->offset++];
-}
-
static int
r_byte(struct load_arg *arg)
{
int c;
- if (RB_TYPE_P(arg->src, T_STRING)) {
+ if (TYPE(arg->src) == T_STRING) {
if (RSTRING_LEN(arg->src) > arg->offset) {
c = (unsigned char)RSTRING_PTR(arg->src)[arg->offset++];
}
else {
- too_short();
+ rb_raise(rb_eArgError, "marshal data too short");
}
}
else {
- if (arg->readable >0 || arg->buflen > 0) {
- c = r_byte1_buffered(arg);
- }
- else {
- VALUE v = rb_funcall2(arg->src, s_getbyte, 0, 0);
- check_load_arg(arg, s_getbyte);
- if (NIL_P(v)) rb_eof_error();
- c = (unsigned char)NUM2CHR(v);
- }
+ VALUE src = arg->src;
+ VALUE v = rb_funcall2(src, s_getbyte, 0, 0);
+ check_load_arg(arg, s_getbyte);
+ if (NIL_P(v)) rb_eof_error();
+ c = (unsigned char)NUM2CHR(v);
}
return c;
}
@@ -1144,68 +1087,6 @@ r_long(struct load_arg *arg)
return x;
}
-static VALUE
-r_bytes1(long len, struct load_arg *arg)
-{
- VALUE str, n = LONG2NUM(len);
-
- str = rb_funcall2(arg->src, s_read, 1, &n);
- check_load_arg(arg, s_read);
- if (NIL_P(str)) too_short();
- StringValue(str);
- if (RSTRING_LEN(str) != len) too_short();
- arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
-
- return str;
-}
-
-static VALUE
-r_bytes1_buffered(long len, struct load_arg *arg)
-{
- VALUE str;
-
- if (len <= arg->buflen) {
- str = rb_str_new(arg->buf+arg->offset, len);
- arg->offset += len;
- arg->buflen -= len;
- }
- else {
- long buflen = arg->buflen;
- long readable = arg->readable + 1;
- long tmp_len, read_len, need_len = len - buflen;
- VALUE tmp, n;
-
- readable = readable < BUFSIZ ? readable : BUFSIZ;
- read_len = need_len > readable ? need_len : readable;
- n = LONG2NUM(read_len);
- tmp = rb_funcall2(arg->src, s_read, 1, &n);
-
- check_load_arg(arg, s_read);
- if (NIL_P(tmp)) too_short();
- StringValue(tmp);
-
- tmp_len = RSTRING_LEN(tmp);
-
- if (tmp_len < need_len) too_short();
- arg->infection |= (int)FL_TEST(tmp, MARSHAL_INFECTION);
-
- str = rb_str_new(arg->buf+arg->offset, buflen);
- rb_str_cat(str, RSTRING_PTR(tmp), need_len);
-
- if (tmp_len > need_len) {
- buflen = tmp_len - need_len;
- memcpy(arg->buf, RSTRING_PTR(tmp)+need_len, buflen);
- arg->buflen = buflen;
- }
- else {
- arg->buflen = 0;
- }
- arg->offset = 0;
- }
-
- return str;
-}
-
#define r_bytes(arg) r_bytes0(r_long(arg), (arg))
static VALUE
@@ -1214,22 +1095,25 @@ r_bytes0(long len, struct load_arg *arg)
VALUE str;
if (len == 0) return rb_str_new(0, 0);
- if (RB_TYPE_P(arg->src, T_STRING)) {
+ if (TYPE(arg->src) == T_STRING) {
if (RSTRING_LEN(arg->src) - arg->offset >= len) {
str = rb_str_new(RSTRING_PTR(arg->src)+arg->offset, len);
arg->offset += len;
}
else {
- too_short();
+ too_short:
+ rb_raise(rb_eArgError, "marshal data too short");
}
}
else {
- if (arg->readable > 0 || arg->buflen > 0) {
- str = r_bytes1_buffered(len, arg);
- }
- else {
- str = r_bytes1(len, arg);
- }
+ VALUE src = arg->src;
+ VALUE n = LONG2NUM(len);
+ str = rb_funcall2(src, s_read, 1, &n);
+ check_load_arg(arg, s_read);
+ if (NIL_P(str)) goto too_short;
+ StringValue(str);
+ if (RSTRING_LEN(str) != len) goto too_short;
+ arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
}
return str;
}
@@ -1252,19 +1136,19 @@ id2encidx(ID id, VALUE val)
static ID
r_symlink(struct load_arg *arg)
{
- st_data_t id;
+ ID id;
long num = r_long(arg);
- if (!st_lookup(arg->symbols, num, &id)) {
- rb_raise(rb_eArgError, "bad symbol");
+ if (st_lookup(arg->symbols, num, &id)) {
+ return id;
}
- return (ID)id;
+ rb_raise(rb_eArgError, "bad symbol");
}
static ID
r_symreal(struct load_arg *arg, int ivar)
{
- VALUE s = r_bytes(arg);
+ volatile VALUE s = r_bytes(arg);
ID id;
int idx = -1;
st_index_t n = arg->symbols->num_entries;
@@ -1277,7 +1161,8 @@ r_symreal(struct load_arg *arg, int ivar)
idx = id2encidx(id, r_object(arg));
}
}
- if (idx > 0) rb_enc_associate_index(s, idx);
+ if (idx < 0) idx = rb_usascii_encindex();
+ rb_enc_associate_index(s, idx);
id = rb_intern_str(s);
st_insert(arg->symbols, (st_data_t)n, (st_data_t)id);
@@ -1291,8 +1176,6 @@ r_symbol(struct load_arg *arg)
again:
switch ((type = r_byte(arg))) {
- default:
- rb_raise(rb_eArgError, "dump format error for symbol(0x%x)", type);
case TYPE_IVAR:
ivar = 1;
goto again;
@@ -1303,6 +1186,9 @@ r_symbol(struct load_arg *arg)
rb_raise(rb_eArgError, "dump format error (symlink with encoding)");
}
return r_symlink(arg);
+ default:
+ rb_raise(rb_eArgError, "dump format error for symbol(0x%x)", type);
+ break;
}
}
@@ -1328,8 +1214,7 @@ r_entry0(VALUE v, st_index_t num, struct load_arg *arg)
else {
st_insert(arg->data, num, (st_data_t)v);
}
- if (arg->infection &&
- !RB_TYPE_P(v, T_CLASS) && !RB_TYPE_P(v, T_MODULE)) {
+ if (arg->infection) {
FL_SET(v, arg->infection);
if ((VALUE)real_obj != Qundef)
FL_SET((VALUE)real_obj, arg->infection);
@@ -1386,8 +1271,9 @@ path2class(VALUE path)
{
VALUE v = rb_path_to_class(path);
- if (!RB_TYPE_P(v, T_CLASS)) {
- rb_raise(rb_eArgError, "%"PRIsVALUE" does not refer to class", path);
+ if (TYPE(v) != T_CLASS) {
+ rb_raise(rb_eArgError, "%.*s does not refer to class",
+ (int)RSTRING_LEN(path), RSTRING_PTR(path));
}
return v;
}
@@ -1397,24 +1283,27 @@ path2module(VALUE path)
{
VALUE v = rb_path_to_class(path);
- if (!RB_TYPE_P(v, T_MODULE)) {
- rb_raise(rb_eArgError, "%"PRIsVALUE" does not refer to module", path);
+ if (TYPE(v) != T_MODULE) {
+ rb_raise(rb_eArgError, "%.*s does not refer to module",
+ (int)RSTRING_LEN(path), RSTRING_PTR(path));
}
return v;
}
static VALUE
-obj_alloc_by_klass(VALUE klass, struct load_arg *arg, VALUE *oldclass)
+obj_alloc_by_path(VALUE path, struct load_arg *arg)
{
+ VALUE klass;
st_data_t data;
rb_alloc_func_t allocator;
+ klass = path2class(path);
+
allocator = rb_get_alloc_func(klass);
if (st_lookup(compat_allocator_tbl, (st_data_t)allocator, &data)) {
marshal_compat_t *compat = (marshal_compat_t*)data;
VALUE real_obj = rb_obj_alloc(klass);
VALUE obj = rb_obj_alloc(compat->oldclass);
- if (oldclass) *oldclass = compat->oldclass;
st_insert(arg->compat_tbl, (st_data_t)obj, (st_data_t)real_obj);
return obj;
}
@@ -1423,30 +1312,6 @@ obj_alloc_by_klass(VALUE klass, struct load_arg *arg, VALUE *oldclass)
}
static VALUE
-obj_alloc_by_path(VALUE path, struct load_arg *arg)
-{
- return obj_alloc_by_klass(path2class(path), arg, 0);
-}
-
-static VALUE
-append_extmod(VALUE obj, VALUE extmod)
-{
- long i = RARRAY_LEN(extmod);
- while (i > 0) {
- VALUE m = RARRAY_PTR(extmod)[--i];
- rb_extend_object(obj, m);
- }
- return obj;
-}
-
-#define prohibit_ivar(type, str) do { \
- if (!ivp || !*ivp) break; \
- rb_raise(rb_eTypeError, \
- "can't override instance variable of "type" `%"PRIsVALUE"'", \
- (str)); \
- } while (0)
-
-static VALUE
r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{
VALUE v = Qnil;
@@ -1480,7 +1345,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{
VALUE m = path2module(r_unique(arg));
- if (NIL_P(extmod)) extmod = rb_ary_tmp_new(0);
+ if (NIL_P(extmod)) extmod = rb_ary_new2(0);
rb_ary_push(extmod, m);
v = r_object0(arg, 0, extmod);
@@ -1499,11 +1364,11 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_raise(rb_eTypeError, "singleton can't be loaded");
}
v = r_object0(arg, 0, extmod);
- if (rb_special_const_p(v) || RB_TYPE_P(v, T_OBJECT) || RB_TYPE_P(v, T_CLASS)) {
+ if (rb_special_const_p(v) || TYPE(v) == T_OBJECT || TYPE(v) == T_CLASS) {
format_error:
rb_raise(rb_eArgError, "dump format error (user class)");
}
- if (RB_TYPE_P(v, T_MODULE) || !RTEST(rb_class_inherited_p(c, RBASIC(v)->klass))) {
+ if (TYPE(v) == T_MODULE || !RTEST(rb_class_inherited_p(c, RBASIC(v)->klass))) {
VALUE tmp = rb_obj_alloc(c);
if (TYPE(v) != TYPE(tmp)) goto format_error;
@@ -1565,9 +1430,10 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{
long len;
BDIGIT *digits;
- VALUE data;
+ volatile VALUE data;
- NEWOBJ_OF(big, struct RBignum, rb_cBignum, T_BIGNUM);
+ NEWOBJ(big, struct RBignum);
+ OBJSETUP(big, rb_cBignum, T_BIGNUM);
RBIGNUM_SET_SIGN(big, (r_byte(arg) == '+'));
len = r_long(arg);
data = r_bytes0(len * 2, arg);
@@ -1578,7 +1444,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
#endif
digits = RBIGNUM_DIGITS(big);
MEMCPY(digits, RSTRING_PTR(data), char, len * 2);
- rb_str_resize(data, 0L);
#if SIZEOF_BDIGITS > SIZEOF_SHORT
MEMZERO((char *)digits + len * 2, char,
RBIGNUM_LEN(big) * sizeof(BDIGIT) - len * 2);
@@ -1614,7 +1479,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_REGEXP:
{
- VALUE str = r_bytes(arg);
+ volatile VALUE str = r_bytes(arg);
int options = r_byte(arg);
int has_encoding = FALSE;
st_index_t idx = r_prepare(arg);
@@ -1653,13 +1518,10 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
v = rb_ary_new2(len);
v = r_entry(v, arg);
- arg->readable += len - 1;
while (len--) {
rb_ary_push(v, r_object(arg));
- arg->readable--;
}
v = r_leave(v, arg);
- arg->readable++;
}
break;
@@ -1670,14 +1532,11 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
v = rb_hash_new();
v = r_entry(v, arg);
- arg->readable += (len - 1) * 2;
while (len--) {
VALUE key = r_object(arg);
VALUE value = r_object(arg);
rb_hash_aset(v, key, value);
- arg->readable -= 2;
}
- arg->readable += 2;
if (type == TYPE_HASH_DEF) {
RHASH_IFNONE(v) = r_object(arg);
}
@@ -1695,7 +1554,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
long len = r_long(arg);
v = rb_obj_alloc(klass);
- if (!RB_TYPE_P(v, T_STRUCT)) {
+ if (TYPE(v) != T_STRUCT) {
rb_raise(rb_eTypeError, "class %s not a struct", rb_class2name(klass));
}
mem = rb_struct_s_members(klass);
@@ -1704,7 +1563,6 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_class2name(klass));
}
- arg->readable += (len - 1) * 2;
v = r_entry0(v, idx, arg);
values = rb_ary_new2(len);
for (i=0; i<len; i++) {
@@ -1717,11 +1575,9 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_id2name(SYM2ID(RARRAY_PTR(mem)[i])));
}
rb_ary_push(values, r_object(arg));
- arg->readable -= 2;
}
rb_struct_initialize(v, values);
v = r_leave(v, arg);
- arg->readable += 2;
}
break;
@@ -1730,7 +1586,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
VALUE klass = path2class(r_unique(arg));
VALUE data;
- if (!rb_obj_respond_to(klass, s_load, TRUE)) {
+ if (!rb_respond_to(klass, s_load)) {
rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
rb_class2name(klass));
}
@@ -1739,7 +1595,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
r_ivar(data, NULL, arg);
*ivp = FALSE;
}
- v = rb_funcall2(klass, s_load, 1, &data);
+ v = rb_funcall(klass, s_load, 1, data);
check_load_arg(arg, s_load);
v = r_entry(v, arg);
v = r_leave(v, arg);
@@ -1749,27 +1605,24 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_USRMARSHAL:
{
VALUE klass = path2class(r_unique(arg));
- VALUE oldclass = 0;
VALUE data;
- v = obj_alloc_by_klass(klass, arg, &oldclass);
+ v = rb_obj_alloc(klass);
if (!NIL_P(extmod)) {
- /* for the case marshal_load is overridden */
- append_extmod(v, extmod);
+ while (RARRAY_LEN(extmod) > 0) {
+ VALUE m = rb_ary_pop(extmod);
+ rb_extend_object(v, m);
+ }
}
- if (!rb_obj_respond_to(v, s_mload, TRUE)) {
+ if (!rb_respond_to(v, s_mload)) {
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
rb_class2name(klass));
}
v = r_entry(v, arg);
data = r_object(arg);
- rb_funcall2(v, s_mload, 1, &data);
+ rb_funcall(v, s_mload, 1, data);
check_load_arg(arg, s_mload);
v = r_leave(v, arg);
- if (!NIL_P(extmod)) {
- if (oldclass) append_extmod(v, extmod);
- rb_ary_clear(extmod);
- }
}
break;
@@ -1777,7 +1630,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{
st_index_t idx = r_prepare(arg);
v = obj_alloc_by_path(r_unique(arg), arg);
- if (!RB_TYPE_P(v, T_OBJECT)) {
+ if (TYPE(v) != T_OBJECT) {
rb_raise(rb_eArgError, "dump format error");
}
v = r_entry0(v, idx, arg);
@@ -1787,34 +1640,40 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
break;
case TYPE_DATA:
- {
- VALUE klass = path2class(r_unique(arg));
- VALUE oldclass = 0;
- VALUE r;
-
- v = obj_alloc_by_klass(klass, arg, &oldclass);
- if (!RB_TYPE_P(v, T_DATA)) {
- rb_raise(rb_eArgError, "dump format error");
- }
- v = r_entry(v, arg);
- if (!rb_obj_respond_to(v, s_load_data, TRUE)) {
- rb_raise(rb_eTypeError,
- "class %s needs to have instance method `_load_data'",
- rb_class2name(klass));
- }
- r = r_object0(arg, 0, extmod);
- rb_funcall2(v, s_load_data, 1, &r);
- check_load_arg(arg, s_load_data);
- v = r_leave(v, arg);
- }
- break;
+ {
+ VALUE klass = path2class(r_unique(arg));
+ if (rb_respond_to(klass, s_alloc)) {
+ static int warn = TRUE;
+ if (warn) {
+ rb_warn("define `allocate' instead of `_alloc'");
+ warn = FALSE;
+ }
+ v = rb_funcall(klass, s_alloc, 0);
+ check_load_arg(arg, s_alloc);
+ }
+ else {
+ v = rb_obj_alloc(klass);
+ }
+ if (TYPE(v) != T_DATA) {
+ rb_raise(rb_eArgError, "dump format error");
+ }
+ v = r_entry(v, arg);
+ if (!rb_respond_to(v, s_load_data)) {
+ rb_raise(rb_eTypeError,
+ "class %s needs to have instance method `_load_data'",
+ rb_class2name(klass));
+ }
+ rb_funcall(v, s_load_data, 1, r_object0(arg, 0, extmod));
+ check_load_arg(arg, s_load_data);
+ v = r_leave(v, arg);
+ }
+ break;
case TYPE_MODULE_OLD:
{
- VALUE str = r_bytes(arg);
+ volatile VALUE str = r_bytes(arg);
v = rb_path_to_class(str);
- prohibit_ivar("class/module", str);
v = r_entry(v, arg);
v = r_leave(v, arg);
}
@@ -1822,10 +1681,9 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_CLASS:
{
- VALUE str = r_bytes(arg);
+ volatile VALUE str = r_bytes(arg);
v = path2class(str);
- prohibit_ivar("class", str);
v = r_entry(v, arg);
v = r_leave(v, arg);
}
@@ -1833,10 +1691,9 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_MODULE:
{
- VALUE str = r_bytes(arg);
+ volatile VALUE str = r_bytes(arg);
v = path2module(str);
- prohibit_ivar("module", str);
v = r_entry(v, arg);
v = r_leave(v, arg);
}
@@ -1873,13 +1730,6 @@ r_object(struct load_arg *arg)
static void
clear_load_arg(struct load_arg *arg)
{
- if (arg->buf) {
- xfree(arg->buf);
- arg->buf = 0;
- }
- arg->buflen = 0;
- arg->offset = 0;
- arg->readable = 0;
if (!arg->symbols) return;
st_free_table(arg->symbols);
arg->symbols = 0;
@@ -1899,9 +1749,6 @@ clear_load_arg(struct load_arg *arg)
* may be either an instance of IO or an object that responds to
* to_str. If proc is specified, it will be passed each object as it
* is deserialized.
- *
- * Never pass untrusted data (including user supplied input) to this method.
- * Please see the overview for further details.
*/
static VALUE
marshal_load(int argc, VALUE *argv)
@@ -1919,13 +1766,15 @@ marshal_load(int argc, VALUE *argv)
port = v;
}
else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
- rb_check_funcall(port, s_binmode, 0, 0);
+ if (rb_respond_to(port, s_binmode)) {
+ rb_funcall2(port, s_binmode, 0, 0);
+ }
infection = (int)(FL_TAINT | FL_TEST(port, FL_UNTRUSTED));
}
else {
- io_needed();
+ rb_raise(rb_eTypeError, "instance of IO needed");
}
- RB_GC_GUARD(wrapper) = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg);
+ wrapper = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg);
arg->infection = infection;
arg->src = port;
arg->offset = 0;
@@ -1933,12 +1782,6 @@ marshal_load(int argc, VALUE *argv)
arg->data = st_init_numtable();
arg->compat_tbl = st_init_numtable();
arg->proc = 0;
- arg->readable = 0;
-
- if (NIL_P(v))
- arg->buf = xmalloc(BUFSIZ);
- else
- arg->buf = 0;
major = r_byte(arg);
minor = r_byte(arg);
@@ -1996,21 +1839,6 @@ marshal_load(int argc, VALUE *argv)
* precedence over _dump if both are defined. marshal_dump may result in
* smaller Marshal strings.
*
- * == Security considerations
- *
- * By design, Marshal.load can deserialize almost any class loaded into the
- * Ruby process. In many cases this can lead to remote code execution if the
- * Marshal data is loaded from an untrusted source.
- *
- * As a result, Marshal.load is not suitable as a general purpose serialization
- * format and you should never unmarshal user supplied input or other untrusted
- * data.
- *
- * If you need to deserialize untrusted data, use JSON or another serialization
- * format that is only able to load simple, 'primitive' types such as String,
- * Array, Hash, etc. Never allow user input to specify arbitrary types to
- * deserialize into.
- *
* == marshal_dump and marshal_load
*
* When dumping an object the method marshal_dump will be called.
diff --git a/math.c b/math.c
index 96bd1e9f73..23bca55c4b 100644
--- a/math.c
+++ b/math.c
@@ -10,28 +10,23 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "internal.h"
#include <math.h>
#include <errno.h>
-#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
- !defined(signbit)
- extern int signbit(double);
-#endif
-
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
VALUE rb_mMath;
VALUE rb_eMathDomainError;
-#define Need_Float(x) do {if (!RB_TYPE_P(x, T_FLOAT)) {(x) = rb_to_float(x);}} while(0)
+extern VALUE rb_to_float(VALUE val);
+#define Need_Float(x) do {if (TYPE(x) != T_FLOAT) {(x) = rb_to_float(x);}} while(0)
#define Need_Float2(x,y) do {\
Need_Float(x);\
Need_Float(y);\
} while (0)
#define domain_error(msg) \
- rb_raise(rb_eMathDomainError, "Numerical argument is out of domain - " #msg)
+ rb_raise(rb_eMathDomainError, "Numerical argument is out of domain - " #msg);
/*
* call-seq:
@@ -56,20 +51,11 @@ VALUE rb_eMathDomainError;
static VALUE
math_atan2(VALUE obj, VALUE y, VALUE x)
{
-#ifndef M_PI
-# define M_PI 3.14159265358979323846
-#endif
double dx, dy;
Need_Float2(y, x);
dx = RFLOAT_VALUE(x);
dy = RFLOAT_VALUE(y);
- if (dx == 0.0 && dy == 0.0) {
- if (!signbit(dx))
- return DBL2NUM(dy);
- if (!signbit(dy))
- return DBL2NUM(M_PI);
- return DBL2NUM(-M_PI);
- }
+ if (dx == 0.0 && dy == 0.0) domain_error("atan2");
if (isinf(dx) && isinf(dy)) domain_error("atan2");
return DBL2NUM(atan2(dy, dx));
}
@@ -765,8 +751,6 @@ exp1(sqrt)
*/
/*
- * Document-class: Math
- *
* The <code>Math</code> module contains module functions for basic
* trigonometric and transcendental functions. See class
* <code>Float</code> for a list of constants that
diff --git a/method.h b/method.h
index 7d03b99c96..e03f0d2357 100644
--- a/method.h
+++ b/method.h
@@ -11,14 +11,6 @@
#ifndef METHOD_H
#define METHOD_H
-#ifndef END_OF_ENUMERATION
-# ifdef __GNUC__
-# define END_OF_ENUMERATION(key)
-# else
-# define END_OF_ENUMERATION(key) END_OF_##key##_PLACEHOLDER = 0
-# endif
-#endif
-
typedef enum {
NOEX_PUBLIC = 0x00,
NOEX_NOSUPER = 0x01,
@@ -30,15 +22,12 @@ typedef enum {
NOEX_MODFUNC = 0x12,
NOEX_SUPER = 0x20,
NOEX_VCALL = 0x40,
- NOEX_RESPONDS = 0x80,
-
- NOEX_BIT_WIDTH = 8,
- NOEX_SAFE_SHIFT_OFFSET = ((NOEX_BIT_WIDTH+3)/4)*4 /* round up to nibble */
+ NOEX_RESPONDS = 0x80
} rb_method_flag_t;
-#define NOEX_SAFE(n) ((int)((n) >> NOEX_SAFE_SHIFT_OFFSET) & 0x0F)
-#define NOEX_WITH(n, s) (((s) << NOEX_SAFE_SHIFT_OFFSET) | (n) | (ruby_running ? 0 : NOEX_BASIC))
-#define NOEX_WITH_SAFE(n) NOEX_WITH((n), rb_safe_level())
+#define NOEX_SAFE(n) ((int)((n) >> 8) & 0x0F)
+#define NOEX_WITH(n, s) ((s << 8) | (n) | (ruby_running ? 0 : NOEX_BASIC))
+#define NOEX_WITH_SAFE(n) NOEX_WITH(n, rb_safe_level())
/* method data type */
@@ -52,17 +41,11 @@ typedef enum {
VM_METHOD_TYPE_UNDEF,
VM_METHOD_TYPE_NOTIMPLEMENTED,
VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
- VM_METHOD_TYPE_MISSING, /* wrapper for method_missing(id) */
- VM_METHOD_TYPE_REFINED,
-
- END_OF_ENUMERATION(VM_METHOD_TYPE)
+ VM_METHOD_TYPE_MISSING /* wrapper for method_missing(id) */
} rb_method_type_t;
-struct rb_call_info_struct;
-
typedef struct rb_method_cfunc_struct {
VALUE (*func)(ANYARGS);
- VALUE (*invoker)(VALUE (*func)(ANYARGS), VALUE recv, int argc, const VALUE *argv);
int argc;
} rb_method_cfunc_t;
@@ -83,11 +66,8 @@ typedef struct rb_method_definition_struct {
VALUE proc; /* should be mark */
enum method_optimized_type {
OPTIMIZED_METHOD_TYPE_SEND,
- OPTIMIZED_METHOD_TYPE_CALL,
-
- OPTIMIZED_METHOD_TYPE__MAX
+ OPTIMIZED_METHOD_TYPE_CALL
} optimize_type;
- struct rb_method_entry_struct *orig_me;
} body;
int alias_count;
} rb_method_definition_t;
@@ -106,36 +86,18 @@ struct unlinked_method_entry_list_entry {
};
#define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
-#define UNDEFINED_REFINED_METHOD_P(def) \
- ((def)->type == VM_METHOD_TYPE_REFINED && \
- UNDEFINED_METHOD_ENTRY_P((def)->body.orig_me))
void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex);
rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex);
-rb_method_entry_t *rb_method_entry(VALUE klass, ID id, VALUE *define_class_ptr);
-void rb_add_refined_method_entry(VALUE refined_class, ID mid);
-rb_method_entry_t *rb_resolve_refined_method(VALUE refinements,
- const rb_method_entry_t *me,
- VALUE *defined_class_ptr);
-rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id,
- VALUE *defined_class_ptr);
-rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id,
- VALUE *defined_class_ptr);
-
-rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, ID id, VALUE *define_class_ptr);
+rb_method_entry_t *rb_method_entry(VALUE klass, ID id);
+
+rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, ID id);
rb_method_entry_t *rb_method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *, rb_method_flag_t noex);
int rb_method_entry_arity(const rb_method_entry_t *me);
-int rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2);
-st_index_t rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me);
-
-VALUE rb_method_entry_location(rb_method_entry_t *me);
-VALUE rb_mod_method_location(VALUE mod, ID id);
-VALUE rb_obj_method_location(VALUE obj, ID id);
void rb_mark_method_entry(const rb_method_entry_t *me);
void rb_free_method_entry(rb_method_entry_t *me);
void rb_sweep_method_entry(void *vm);
-void rb_free_m_table(st_table *tbl);
#endif /* METHOD_H */
diff --git a/misc/README b/misc/README
index 93d1de90b2..12646ac819 100644
--- a/misc/README
+++ b/misc/README
@@ -1,10 +1,6 @@
README this file
inf-ruby.el program to run ruby under emacs
-rb_optparse.bash bash completion script
-rb_optparse.zsh zsh completion script
-rdoc-mode.el RDoc mode for emacs
ruby-mode.el ruby mode for emacs
-ruby-style.el Ruby's C/C++ mode style for emacs
rubydb2x.el ruby debugger support for emacs 19.2x or before
rubydb3x.el ruby debugger support for emacs 19.3x or later
ruby-electric.el emacs minor mode providing electric commands
diff --git a/misc/inf-ruby.el b/misc/inf-ruby.el
index ea03eee23d..6b5d74c304 100644
--- a/misc/inf-ruby.el
+++ b/misc/inf-ruby.el
@@ -10,7 +10,7 @@
;;;
;;; (0) check ruby-program-name variable that can run your environment.
;;;
-;;; (1) modify .emacs to use ruby-mode
+;;; (1) modify .emacs to use ruby-mode
;;; for example :
;;;
;;; (autoload 'ruby-mode "ruby-mode"
@@ -19,7 +19,7 @@
;;; (append '(("\\.rb$" . ruby-mode)) auto-mode-alist))
;;; (setq interpreter-mode-alist (append '(("ruby" . ruby-mode))
;;; interpreter-mode-alist))
-;;;
+;;;
;;; (2) set to load inf-ruby and set inf-ruby key definition in ruby-mode.
;;;
;;; (autoload 'run-ruby "inf-ruby"
@@ -49,47 +49,47 @@
;;; Revision 1.6 2002/09/07 14:35:46 nobu
;;; * misc/inf-ruby.el (inferior-ruby-error-regexp-alist): regexp
;;; alist for error message from ruby.
-;;;
+;;;
;;; * misc/inf-ruby.el (inferior-ruby-mode): fixed for Emacs.
-;;;
+;;;
;;; * misc/inf-ruby.el (ruby-send-region): compilation-parse-errors
;;; doesn't parse first line, so insert separators before each
;;; evaluations.
-;;;
+;;;
;;; Revision 1.5 2002/08/19 10:05:47 nobu
;;; * misc/inf-ruby.el (inf-ruby-keys): ruby-send-definition
;;; conflicted with ruby-insert-end.
-;;;
+;;;
;;; * misc/inf-ruby.el (inferior-ruby-mode): compilation-minor-mode.
-;;;
+;;;
;;; * misc/inf-ruby.el (ruby-send-region): send as here document to
;;; adjust source file/line. [ruby-talk:47113], [ruby-dev:17965]
-;;;
+;;;
;;; * misc/inf-ruby.el (ruby-send-terminator): added to make unique
;;; terminator.
-;;;
+;;;
;;; Revision 1.4 2002/01/29 07:16:09 matz
;;; * file.c (rb_stat_rdev_major): added. [new]
-;;;
+;;;
;;; * file.c (rb_stat_rdev_minor): added. [new]
-;;;
+;;;
;;; * file.c (rb_stat_inspect): print mode in octal.
-;;;
+;;;
;;; Revision 1.3 1999/12/01 09:24:18 matz
;;; 19991201
-;;;
+;;;
;;; Revision 1.2 1999/08/13 05:45:18 matz
;;; 1.4.0
-;;;
+;;;
;;; Revision 1.1.1.1.2.1 1999/07/15 07:59:59 matz
;;; 990715
-;;;
+;;;
;;; Revision 1.1.1.1 1999/01/20 04:59:36 matz
;;; ruby 1.3 cycle
-;;;
+;;;
;;; Revision 1.1.2.1 1998/12/16 07:30:36 matz
;;; first public release of 1.1d (pre1.2) series
-;;;
+;;;
;;; Revision 1.4 1998/05/20 02:45:58 senda
;;; default program to irb
;;;
@@ -196,7 +196,7 @@ For information on running multiple processes in multiple buffers, see
documentation for variable ruby-buffer.
Commands:
-Return after the end of the process' output sends the text from the
+Return after the end of the process' output sends the text from the
end of process to point.
Return before the end of the process' output copies the sexp ending at point
to the end of the process' output, and sends it.
@@ -220,9 +220,9 @@ to continue it."
(use-local-map inferior-ruby-mode-map)
(setq comint-input-filter (function ruby-input-filter))
(setq comint-get-old-input (function ruby-get-old-input))
+ (compilation-shell-minor-mode t)
(make-local-variable 'compilation-error-regexp-alist)
(setq compilation-error-regexp-alist inferior-ruby-error-regexp-alist)
- (compilation-shell-minor-mode t)
(run-hooks 'inferior-ruby-mode-hook))
(defvar inferior-ruby-filter-regexp "\\`\\s *\\S ?\\S ?\\s *\\'"
@@ -358,14 +358,14 @@ Then switch to the process buffer."
(switch-to-ruby t))
(defun ruby-send-definition-and-go ()
- "Send the current definition to the inferior Ruby.
+ "Send the current definition to the inferior Ruby.
Then switch to the process buffer."
(interactive)
(ruby-send-definition)
(switch-to-ruby t))
(defun ruby-send-block-and-go ()
- "Send the current block to the inferior Ruby.
+ "Send the current block to the inferior Ruby.
Then switch to the process buffer."
(interactive)
(ruby-send-block)
@@ -380,13 +380,13 @@ Used by these commands to determine defaults.")
(defvar ruby-prev-l/c-dir/file nil
"Caches the last (directory . file) pair.
Caches the last pair used in the last ruby-load-file command.
-Used for determining the default in the
+Used for determining the default in the
next one.")
(defun ruby-load-file (file-name)
"Load a Ruby file into the inferior Ruby process."
(interactive (comint-get-source "Load Ruby file: " ruby-prev-l/c-dir/file
- ruby-source-modes t)) ; T because LOAD
+ ruby-source-modes t)) ; T because LOAD
; needs an exact name
(comint-check-source file-name) ; Check to see if buffer needs saved.
(setq ruby-prev-l/c-dir/file (cons (file-name-directory file-name)
@@ -408,7 +408,7 @@ next one.")
(defvar inf-ruby-load-hook nil
"This hook is run when inf-ruby is loaded in.
This is a good place to put keybindings.")
-
+
(run-hooks 'inf-ruby-load-hook)
(provide 'inf-ruby)
diff --git a/misc/rb_optparse.bash b/misc/rb_optparse.bash
deleted file mode 100644
index 8a59ec2dda..0000000000
--- a/misc/rb_optparse.bash
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/bash
-# Completion for bash:
-#
-# (1) install this file,
-#
-# (2) load the script, and
-# . ~/.profile.d/rb_optparse.bash
-#
-# (3) define completions in your .bashrc,
-# rb_optparse command_using_optparse_1
-# rb_optparse command_using_optparse_2
-
-_rb_optparse() {
- COMPREPLY=($("${COMP_WORDS[0]}" "--*-completion-bash=${COMP_WORDS[COMP_CWORD]}"))
- return 0
-}
-
-rb_optparse () {
- [ $# = 0 ] || complete -o default -F _rb_optparse "$@"
-}
diff --git a/misc/rb_optparse.zsh b/misc/rb_optparse.zsh
deleted file mode 100755
index d53170c5f7..0000000000
--- a/misc/rb_optparse.zsh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/zsh
-# Completion for zsh:
-# (based on <http://d.hatena.ne.jp/rubikitch/20071002/zshcomplete>)
-#
-# (1) install this file.
-# mkdir -p ~/.zsh.d
-# cp rb_optparse.zsh ~/.zsh.d/rb_optparse.zsh
-#
-# (2) load the script, and add a directory to fpath before compinit.
-# echo '. ~/.zsh.d/rb_optparse.zsh' >> ~/.zshrc
-# echo 'fpath=(~/.zsh.d/Completion $fpath)' >> ~/.zshrc
-# echo 'autoload -U compinit; compinit' >> ~/.zshrc
-#
-# (3) restart zsh.
-#
-# (4) geneate completion files once.
-# generate-complete-function/ruby/optparse COMMAND1
-# generate-complete-function/ruby/optparse COMMAND2
-#
-
-generate-complete-function/ruby/optparse ()
-{
- local cmpl="_${1:t}"
- mkdir -p "${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}"
- $1 "--*-completion-zsh=${1:t}" >! "${ZSH_COMPLETION_DIR-$HOME/.zsh.d/Completion}/$cmpl"
- if [[ $(type -w "$cmpl") == "${cmpl}: function" ]]; then
- unfunction "$cmpl"
- autoload -U "$cmpl"
- else
- compinit "$cmpl"
- fi
-}
-
-compdef _command generate-complete-function/ruby/optparse
-
-for cmd in "$@"; do
- generate-complete-function/ruby/optparse "$cmd"
-done
diff --git a/misc/rdoc-mode.el b/misc/rdoc-mode.el
index ec715798ae..d04af49156 100644
--- a/misc/rdoc-mode.el
+++ b/misc/rdoc-mode.el
@@ -1,7 +1,7 @@
;;
;; rdoc-mode.el
;; Major mode for RDoc editing
-;;
+;;
;; Created: Fri Sep 18 09:04:49 JST 2009
@@ -12,19 +12,18 @@
"Major mode for RD editing.
\\{rdoc-mode-map}"
(make-local-variable 'paragraph-separate)
- (setq paragraph-separate "^\\(=+\\|\\*+\\)[ \t\v\f]*\\|^\\s *$")
+ (setq paragraph-separate "^\\(=+\\|\\*+\\)\\s \\|^\\s *$")
(make-local-variable 'paragraph-start)
(setq paragraph-start paragraph-separate)
- (make-local-variable 'require-final-newline)
+ (make-local-variable 'require-final-newline)
(setq require-final-newline t)
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults '((rdoc-font-lock-keywords) t nil))
(make-local-variable 'font-lock-keywords)
(setq font-lock-keywords rdoc-font-lock-keywords)
(make-local-variable 'outline-regexp)
- (setq outline-regexp "^\\(=+\\)[ \t\v\f]*")
+ (setq outline-regexp "^\\(=+\\)\\s ")
(outline-minor-mode t)
- (setq show-trailing-whitespace t)
(rdoc-setup-keys)
(setq indent-tabs-mode nil)
(run-hooks 'rdoc-mode-hook)
@@ -56,19 +55,19 @@
(defvar rdoc-font-lock-keywords
(list
- (list "^=([^=\r\n].*)?$"
+ (list "^= .*$"
0 rdoc-heading1-face)
- (list "^==([^=\r\n].*)?$"
+ (list "^== .*$"
0 rdoc-heading2-face)
- (list "^===([^=\r\n].*)?$"
+ (list "^=== .*$"
0 rdoc-heading3-face)
- (list "^====+.*$"
+ (list "^=====* .*$"
0 rdoc-heading4-face)
- (list "\\(^\\|[ \t\v\f]\\)\\(\\*\\(\\sw\\|[-_:]\\)+\\*\\)\\($\\|[ \t\v\f]\\)"
+ (list "\\(^\\|\\s \\)\\(\\*\\(\\sw\\|[-_:]\\)+\\*\\)\\($\\|\\s \\)"
2 rdoc-bold-face) ; *bold*
- (list "\\(^\\|[ \t\v\f]\\)\\(_\\(\\sw\\|[-_:]\\)+_\\)\\($\\|[ \t\v\f]\\)"
+ (list "\\(^\\|\\s \\)\\(_\\(\\sw\\|[-_:]\\)+_\\)\\($\\|\\s \\)"
2 rdoc-emphasis-face) ; _emphasis_
- (list "\\(^\\|[ \t\v\f]\\)\\(\\+\\(\\sw\\|[-_:]\\)+\\+\\)\\($\\|[ \t\v\f]\\)"
+ (list "\\(^\\|\\s \\)\\(\\+\\(\\sw\\|[-_:]\\)+\\+\\)\\($\\|\\s \\)"
2 rdoc-code-face) ; +code+
(list "<em>[^<>]*</em>" 0 rdoc-emphasis-face)
(list "<i>[^<>]*</i>" 0 rdoc-emphasis-face)
@@ -77,54 +76,7 @@
(list "<code>[^<>]*</code>" 0 rdoc-code-face)
(list "^\\([-*]\\|[0-9]+\\.\\|[A-Za-z]\\.\\)\\s "
1 rdoc-description-face) ; bullet | numbered | alphabetically numbered
- (list "^\\[[^\]]*\\]\\|\\S .*::\\)\\([ \t\v\f]\\|$\\)"
+ (list "^\\[[^\]]*\\]\\|\\S .*::\\)\\(\\s \\|$\\)"
1 rdoc-description-face) ; labeled | node
- ;(list "^[ \t\v\f]+\\(.*\\)" 1 rdoc-verbatim-face)
+ ;(list "^\\s +\\(.*\\)" 1 rdoc-verbatim-face)
))
-
-(defun rdoc-imenu-create-index ()
- (let ((root '(nil . nil))
- cur-alist
- (cur-level 0)
- (pattern (concat outline-regexp "\\(.*?\\)[ \t\v\f]*$"))
- (empty-heading "-")
- (self-heading ".")
- pos level heading alist)
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward pattern (point-max) t)
- (setq heading (match-string-no-properties 2)
- level (min 6 (length (match-string-no-properties 1)))
- pos (match-beginning 1))
- (if (= (length heading) 0)
- (setq heading empty-heading))
- (setq alist (list (cons heading pos)))
- (cond
- ((= cur-level level) ; new sibling
- (setcdr cur-alist alist)
- (setq cur-alist alist))
- ((< cur-level level) ; first child
- (dotimes (i (- level cur-level 1))
- (setq alist (list (cons empty-heading alist))))
- (if cur-alist
- (let* ((parent (car cur-alist))
- (self-pos (cdr parent)))
- (setcdr parent (cons (cons self-heading self-pos) alist)))
- (setcdr root alist)) ; primogenitor
- (setq cur-alist alist
- cur-level level))
- (t ; new sibling of an ancestor
- (let ((sibling-alist (last (cdr root))))
- (dotimes (i (1- level))
- (setq sibling-alist (last (cdar sibling-alist))))
- (setcdr sibling-alist alist)
- (setq cur-alist alist
- cur-level level))))))
- (cdr root)))
-
-(defun rdoc-set-imenu-create-index-function ()
- (setq imenu-create-index-function 'rdoc-imenu-create-index))
-
-(add-hook 'rdoc-mode-hook 'rdoc-set-imenu-create-index-function)
-
-(provide 'rdoc-mode)
diff --git a/misc/ruby-additional.el b/misc/ruby-additional.el
deleted file mode 100644
index 152067e48e..0000000000
--- a/misc/ruby-additional.el
+++ /dev/null
@@ -1,100 +0,0 @@
-;; missing functions in Emacs 24.
-
-(eval-after-load "\\(\\`\\|/\\)ruby-mode\\.elc?\\(\\.gz\\)?\\'"
- (progn
- (define-key ruby-mode-map "\C-c\C-e" 'ruby-insert-end)
- (define-key ruby-mode-map "\C-c{" 'ruby-toggle-block)
-
- (defun ruby-insert-end ()
- (interactive)
- (if (eq (char-syntax (char-before)) ?w)
- (insert " "))
- (insert "end")
- (save-excursion
- (if (eq (char-syntax (char-after)) ?w)
- (insert " "))
- (ruby-indent-line t)
- (end-of-line)))
-
- (defun ruby-brace-to-do-end ()
- (when (looking-at "{")
- (let ((orig (point)) (end (progn (ruby-forward-sexp) (point))))
- (when (eq (char-before) ?\})
- (delete-char -1)
- (if (eq (char-syntax (char-before)) ?w)
- (insert " "))
- (insert "end")
- (if (eq (char-syntax (char-after)) ?w)
- (insert " "))
- (goto-char orig)
- (delete-char 1)
- (if (eq (char-syntax (char-before)) ?w)
- (insert " "))
- (insert "do")
- (when (looking-at "\\sw\\||")
- (insert " ")
- (backward-char))
- t))))
-
- (defun ruby-do-end-to-brace ()
- (when (and (or (bolp)
- (not (memq (char-syntax (char-before)) '(?w ?_))))
- (looking-at "\\<do\\(\\s \\|$\\)"))
- (let ((orig (point)) (end (progn (ruby-forward-sexp) (point))))
- (backward-char 3)
- (when (looking-at ruby-block-end-re)
- (delete-char 3)
- (insert "}")
- (goto-char orig)
- (delete-char 2)
- (insert "{")
- (if (looking-at "\\s +|")
- (delete-char (- (match-end 0) (match-beginning 0) 1)))
- t))))
-
- (defun ruby-toggle-block ()
- (interactive)
- (or (ruby-brace-to-do-end)
- (ruby-do-end-to-brace)))
-
- (defun ruby-mode-set-encoding ()
- "Insert a magic comment header with the proper encoding always.
-Now encoding needs to be set always explicitly actually."
- (save-excursion
- (let ((coding-system))
- (widen)
- (goto-char (point-min))
- (if (re-search-forward "[^\0-\177]" nil t)
- (progn
- (goto-char (point-min))
- (setq coding-system
- (or coding-system-for-write
- buffer-file-coding-system))
- (if coding-system
- (setq coding-system
- (or (coding-system-get coding-system 'mime-charset)
- (coding-system-change-eol-conversion coding-system nil))))
- (setq coding-system
- (if coding-system
- (symbol-name
- (or (and ruby-use-encoding-map
- (cdr (assq coding-system ruby-encoding-map)))
- coding-system))
- "ascii-8bit")))
- (setq coding-system "us-ascii"))
- (if (looking-at "^#!") (beginning-of-line 2))
- (cond ((looking-at "\\s *#.*-\*-\\s *\\(en\\)?coding\\s *:\\s *\\([-a-z0-9_]*\\)\\s *\\(;\\|-\*-\\)")
- (unless (string= (match-string 2) coding-system)
- (goto-char (match-beginning 2))
- (delete-region (point) (match-end 2))
- (and (looking-at "-\*-")
- (let ((n (skip-chars-backward " ")))
- (cond ((= n 0) (insert " ") (backward-char))
- ((= n -1) (insert " "))
- ((forward-char)))))
- (insert coding-system)))
- ((looking-at "\\s *#.*coding\\s *[:=]"))
- (t (when ruby-insert-encoding-magic-comment
- (insert "# -*- coding: " coding-system " -*-\n")))))))
-
- ))
diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el
index 95644e24cd..174bd00fd9 100644
--- a/misc/ruby-electric.el
+++ b/misc/ruby-electric.el
@@ -85,7 +85,7 @@ inserted. The word 'all' will do all insertions."
(const :tag "Double quote" ?\" )
(const :tag "Back quote" ?\` )
(const :tag "Vertical bar" ?\| ))
- :group 'ruby-electric)
+ :group 'ruby-electric)
(defcustom ruby-electric-newline-before-closing-bracket nil
"*Controls whether a newline should be inserted before the
@@ -142,13 +142,13 @@ strings. Note that you must have Font Lock enabled."
(defun ruby-electric-is-last-command-char-expandable-punct-p()
(or (memq 'all ruby-electric-expand-delimiters-list)
- (memq last-command-event ruby-electric-expand-delimiters-list)))
+ (memq last-command-char ruby-electric-expand-delimiters-list)))
(defun ruby-electric-space-can-be-expanded-p()
(if (ruby-electric-code-at-point-p)
- (let* ((ruby-electric-keywords-re
+ (let* ((ruby-electric-keywords-re
(concat ruby-electric-simple-keywords-re "\\s-$"))
- (ruby-electric-single-keyword-in-line-re
+ (ruby-electric-single-keyword-in-line-re
(concat "\\s-*" ruby-electric-keywords-re)))
(save-excursion
(backward-word 1)
@@ -168,19 +168,14 @@ strings. Note that you must have Font Lock enabled."
(insert " ")
(save-excursion
(if ruby-electric-newline-before-closing-bracket
- (progn
- (newline)
- (insert "}")
- (ruby-indent-line t))
- (insert "}"))))
+ (newline))
+ (insert "}")))
((ruby-electric-string-at-point-p)
- (if (eq last-command-event ?{)
- (save-excursion
- (backward-char 1)
- (or (char-equal ?\# (preceding-char))
- (insert "#"))
- (forward-char 1)
- (insert "}")))))))
+ (save-excursion
+ (backward-char 1)
+ (when (char-equal ?\# (preceding-char))
+ (forward-char 1)
+ (insert "}")))))))
(defun ruby-electric-matching-char(arg)
(interactive "P")
@@ -188,7 +183,7 @@ strings. Note that you must have Font Lock enabled."
(and (ruby-electric-is-last-command-char-expandable-punct-p)
(ruby-electric-code-at-point-p)
(save-excursion
- (insert (cdr (assoc last-command-event
+ (insert (cdr (assoc last-command-char
ruby-electric-matching-delimeter-alist))))))
(defun ruby-electric-bar(arg)
@@ -198,7 +193,7 @@ strings. Note that you must have Font Lock enabled."
(ruby-electric-code-at-point-p)
(and (save-excursion (re-search-backward ruby-electric-expandable-bar nil t))
(= (point) (match-end 0))) ;looking-back is missing on XEmacs
- (save-excursion
+ (save-excursion
(insert "|"))))
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index dcaa396a2e..8df37d2f88 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -72,7 +72,7 @@
"Regexp to match")
(defconst ruby-indent-beg-re
- (concat "\\(\\s *" (regexp-opt '("class" "module" "def") t) "\\)\\|"
+ (concat "\\(\\s *" (regexp-opt '("class" "module" "def") t) "\\)"
(regexp-opt '("if" "unless" "case" "while" "until" "for" "begin")))
"Regexp to match where the indentation gets deeper.")
@@ -104,7 +104,7 @@
(regexp-opt (append ruby-modifier-beg-keywords ruby-block-op-keywords))
"Regexp to match hanging block modifiers.")
-(defconst ruby-block-end-re "\\_<end\\_>")
+(defconst ruby-block-end-re "\\<end\\>")
(defconst ruby-here-doc-beg-re
"\\(<\\)<\\(-\\)?\\(\\([a-zA-Z0-9_]+\\)\\|[\"]\\([^\"]+\\)[\"]\\|[']\\([^']+\\)[']\\)")
@@ -132,9 +132,9 @@
(concat "-?\\([\"']\\|\\)" contents "\\1"))))))
(defconst ruby-delimiter
- (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\_<\\("
+ (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
ruby-block-beg-re
- "\\)\\_>\\|" ruby-block-end-re
+ "\\)\\>\\|" ruby-block-end-re
"\\|^=begin\\|" ruby-here-doc-beg-re)
)
@@ -172,7 +172,8 @@
(define-key ruby-mode-map "\t" 'ruby-indent-command)
(define-key ruby-mode-map "\C-c\C-e" 'ruby-insert-end)
(define-key ruby-mode-map "\C-j" 'ruby-reindent-then-newline-and-indent)
- (define-key ruby-mode-map "\C-c{" 'ruby-toggle-block)
+ (define-key ruby-mode-map "\C-m" 'newline)
+ (define-key ruby-mode-map "\C-c\C-c" 'comment-region)
(define-key ruby-mode-map "\C-c\C-u" 'uncomment-region))
(defvar ruby-mode-syntax-table nil
@@ -190,7 +191,6 @@
(modify-syntax-entry ?$ "." ruby-mode-syntax-table)
(modify-syntax-entry ?? "_" ruby-mode-syntax-table)
(modify-syntax-entry ?_ "_" ruby-mode-syntax-table)
- (modify-syntax-entry ?: "_" ruby-mode-syntax-table)
(modify-syntax-entry ?< "." ruby-mode-syntax-table)
(modify-syntax-entry ?> "." ruby-mode-syntax-table)
(modify-syntax-entry ?& "." ruby-mode-syntax-table)
@@ -248,8 +248,6 @@ Also ignores spaces after parenthesis when 'space."
"*Use `ruby-encoding-map' to set encoding magic comment if this is non-nil."
:type 'boolean :group 'ruby)
-(defvar ruby-indent-point nil "internal variable")
-
(eval-when-compile (require 'cl))
(defun ruby-imenu-create-index-in-block (prefix beg end)
(let ((index-alist '()) (case-fold-search nil)
@@ -299,19 +297,18 @@ Also ignores spaces after parenthesis when 'space."
(defun ruby-mode-variables ()
(set-syntax-table ruby-mode-syntax-table)
- (setq show-trailing-whitespace t)
(setq local-abbrev-table ruby-mode-abbrev-table)
(make-local-variable 'indent-line-function)
(setq indent-line-function 'ruby-indent-line)
(make-local-variable 'require-final-newline)
(setq require-final-newline t)
- (make-local-variable 'comment-start)
+ (make-variable-buffer-local 'comment-start)
(setq comment-start "# ")
- (make-local-variable 'comment-end)
+ (make-variable-buffer-local 'comment-end)
(setq comment-end "")
- (make-local-variable 'comment-column)
+ (make-variable-buffer-local 'comment-column)
(setq comment-column ruby-comment-column)
- (make-local-variable 'comment-start-skip)
+ (make-variable-buffer-local 'comment-start-skip)
(setq comment-start-skip "#+ *")
(setq indent-tabs-mode ruby-indent-tabs-mode)
(make-local-variable 'parse-sexp-ignore-comments)
@@ -360,6 +357,45 @@ Also ignores spaces after parenthesis when 'space."
(t (insert "# -*- coding: " coding-system " -*-\n"))
)))))
+;;;###autoload
+(defun ruby-mode ()
+ "Major mode for editing ruby scripts.
+\\[ruby-indent-command] properly indents subexpressions of multi-line
+class, module, def, if, while, for, do, and case statements, taking
+nesting into account.
+
+The variable ruby-indent-level controls the amount of indentation.
+\\{ruby-mode-map}"
+ (interactive)
+ (kill-all-local-variables)
+ (use-local-map ruby-mode-map)
+ (setq mode-name "Ruby")
+ (setq major-mode 'ruby-mode)
+ (ruby-mode-variables)
+
+ (make-local-variable 'imenu-create-index-function)
+ (setq imenu-create-index-function 'ruby-imenu-create-index)
+
+ (make-local-variable 'add-log-current-defun-function)
+ (setq add-log-current-defun-function 'ruby-add-log-current-method)
+
+ (add-hook
+ (cond ((boundp 'before-save-hook)
+ (make-local-variable 'before-save-hook)
+ 'before-save-hook)
+ ((boundp 'write-contents-functions) 'write-contents-functions)
+ ((boundp 'write-contents-hooks) 'write-contents-hooks))
+ 'ruby-mode-set-encoding)
+
+ (set (make-local-variable 'font-lock-defaults) '((ruby-font-lock-keywords) nil nil))
+ (set (make-local-variable 'font-lock-keywords) ruby-font-lock-keywords)
+ (set (make-local-variable 'font-lock-syntax-table) ruby-font-lock-syntax-table)
+ (set (make-local-variable 'font-lock-syntactic-keywords) ruby-font-lock-syntactic-keywords)
+
+ (if (fboundp 'run-mode-hooks)
+ (run-mode-hooks 'ruby-mode-hook)
+ (run-hooks 'ruby-mode-hook)))
+
(defun ruby-current-indentation ()
(save-excursion
(beginning-of-line)
@@ -402,12 +438,6 @@ Also ignores spaces after parenthesis when 'space."
((and (eq c ?:) (or (not b) (eq (char-syntax b) ? ))))
((eq c ?\\) (eq b ??)))))
-(defun ruby-singleton-class-p ()
- (save-excursion
- (forward-word -1)
- (and (or (bolp) (not (eq (char-before (point)) ?_)))
- (looking-at "class\\s *<<"))))
-
(defun ruby-expr-beg (&optional option)
(save-excursion
(store-match-data nil)
@@ -421,8 +451,7 @@ Also ignores spaces after parenthesis when 'space."
(or (eq (char-syntax (char-before (point))) ?w)
(ruby-special-char-p))))
nil)
- ((and (eq option 'heredoc) (< space 0))
- (not (progn (goto-char start) (ruby-singleton-class-p))))
+ ((and (eq option 'heredoc) (< space 0)) t)
((or (looking-at ruby-operator-re)
(looking-at "[\\[({,;]")
(and (looking-at "[!?]")
@@ -438,7 +467,7 @@ Also ignores spaces after parenthesis when 'space."
ruby-block-mid-keywords)
'words))
(goto-char (match-end 0))
- (not (looking-at "\\s_\\|[!?:]")))
+ (not (looking-at "\\s_")))
((eq option 'expr-qstr)
(looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
((eq option 'expr-re)
@@ -460,12 +489,8 @@ Also ignores spaces after parenthesis when 'space."
(no-error nil)
((error "unterminated string")))))
-(defun ruby-deep-indent-paren-p (c &optional pos)
- (cond ((save-excursion
- (if pos (goto-char pos))
- (ruby-expr-beg))
- nil)
- ((listp ruby-deep-indent-paren)
+(defun ruby-deep-indent-paren-p (c)
+ (cond ((listp ruby-deep-indent-paren)
(let ((deep (assoc c ruby-deep-indent-paren)))
(cond (deep
(or (cdr deep) ruby-deep-indent-paren-style))
@@ -499,7 +524,7 @@ Also ignores spaces after parenthesis when 'space."
(t
(setq in-string (point))
(goto-char end))))
- ((looking-at "/=")
+ ((looking-at "/=")
(goto-char pnt))
((looking-at "/")
(cond
@@ -557,7 +582,7 @@ Also ignores spaces after parenthesis when 'space."
(progn
(and (eq deep 'space) (looking-at ".\\s +[^# \t\n]")
(setq pnt (1- (match-end 0))))
- (setq nest (cons (cons (char-after (point)) (point)) nest))
+ (setq nest (cons (cons (char-after (point)) pnt) nest))
(setq pcol (cons (cons pnt depth) pcol))
(setq depth 0))
(setq nest (cons (cons (char-after (point)) pnt) nest))
@@ -565,13 +590,7 @@ Also ignores spaces after parenthesis when 'space."
(goto-char pnt)
)
((looking-at "[])}]")
- (if (ruby-deep-indent-paren-p (matching-paren (char-after))
- (if nest
- (cdr (nth 0 nest))
- (save-excursion
- (forward-char)
- (ruby-backward-sexp)
- (point))))
+ (if (ruby-deep-indent-paren-p (matching-paren (char-after)))
(setq depth (cdr (car pcol)) pcol (cdr pcol))
(setq depth (1- depth)))
(setq nest (cdr nest))
@@ -602,7 +621,7 @@ Also ignores spaces after parenthesis when 'space."
(setq nest (cons (cons nil pnt) nest))
(setq depth (1+ depth))))
(goto-char (match-end 0)))
- ((looking-at (concat "\\_<\\(" ruby-block-beg-re "\\)\\_>"))
+ ((looking-at (concat "\\<\\(" ruby-block-beg-re "\\)\\>"))
(and
(save-match-data
(or (not (looking-at (concat "do" ruby-keyword-end-re)))
@@ -620,7 +639,6 @@ Also ignores spaces after parenthesis when 'space."
(not (eq ?_ w))
(not (eq ?! w))
(not (eq ?? w))
- (not (eq ?: w))
(skip-chars-forward " \t")
(goto-char (match-beginning 0))
(or (not (looking-at ruby-modifier-re))
@@ -675,10 +693,10 @@ Also ignores spaces after parenthesis when 'space."
(goto-char pnt))
((looking-at ruby-here-doc-beg-re)
(if (re-search-forward (ruby-here-doc-end-match)
- ruby-indent-point t)
+ indent-point t)
(forward-line 1)
(setq in-string (match-end 0))
- (goto-char ruby-indent-point)))
+ (goto-char indent-point)))
(t
(error (format "bad string %s"
(buffer-substring (point) pnt)
@@ -708,7 +726,7 @@ Also ignores spaces after parenthesis when 'space."
(defun ruby-calculate-indent (&optional parse-start)
(save-excursion
(beginning-of-line)
- (let ((ruby-indent-point (point))
+ (let ((indent-point (point))
(case-fold-search nil)
state bol eol begin op-end
(paren (progn (skip-syntax-forward " ")
@@ -720,22 +738,18 @@ Also ignores spaces after parenthesis when 'space."
(setq parse-start (point)))
(back-to-indentation)
(setq indent (current-column))
- (setq state (ruby-parse-region parse-start ruby-indent-point))
+ (setq state (ruby-parse-region parse-start indent-point))
(cond
((nth 0 state) ; within string
(setq indent nil)) ; do nothing
((car (nth 1 state)) ; in paren
(goto-char (setq begin (cdr (nth 1 state))))
- (let ((deep (ruby-deep-indent-paren-p (car (nth 1 state))
- (1- (cdr (nth 1 state))))))
+ (let ((deep (ruby-deep-indent-paren-p (car (nth 1 state)))))
(if deep
(cond ((and (eq deep t) (eq (car (nth 1 state)) paren))
(skip-syntax-backward " ")
(setq indent (1- (current-column))))
- ((eq deep 'space)
- (goto-char (cdr (nth 1 state)))
- (setq indent (1+ (current-column))))
- ((let ((s (ruby-parse-region (point) ruby-indent-point)))
+ ((let ((s (ruby-parse-region (point) indent-point)))
(and (nth 2 s) (> (nth 2 s) 0)
(or (goto-char (cdr (nth 1 s))) t)))
(forward-word -1)
@@ -749,8 +763,7 @@ Also ignores spaces after parenthesis when 'space."
(goto-char parse-start) (back-to-indentation))
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
(and (eq (car (nth 1 state)) paren)
- (ruby-deep-indent-paren-p (matching-paren paren)
- (1- (cdr (nth 1 state))))
+ (ruby-deep-indent-paren-p (matching-paren paren))
(search-backward (char-to-string paren))
(setq indent (current-column)))))
((and (nth 2 state) (> (nth 2 state) 0)) ; in nest
@@ -766,18 +779,16 @@ Also ignores spaces after parenthesis when 'space."
(setq indent (ruby-indent-size (current-column) (nth 2 state))))
(t
(setq indent (+ (current-column) ruby-indent-level)))))
-
+
((and (nth 2 state) (< (nth 2 state) 0)) ; in negative nest
(setq indent (ruby-indent-size (current-column) (nth 2 state)))))
(when indent
- (goto-char ruby-indent-point)
+ (goto-char indent-point)
(end-of-line)
(setq eol (point))
(beginning-of-line)
(cond
- ((and (not (ruby-deep-indent-paren-p paren
- (and (cdr (nth 1 state))
- (1- (cdr (nth 1 state))))))
+ ((and (not (ruby-deep-indent-paren-p paren))
(re-search-forward ruby-negative eol t))
(and (not (eq ?_ (char-after (match-end 0))))
(setq indent (- indent ruby-indent-level))))
@@ -865,7 +876,7 @@ Also ignores spaces after parenthesis when 'space."
((car (nth 1 state)) indent)
(t
(+ indent ruby-indent-level))))))))
- (goto-char ruby-indent-point)
+ (goto-char indent-point)
(beginning-of-line)
(skip-syntax-forward " ")
(if (looking-at "\\.[^.]")
@@ -894,12 +905,12 @@ Also ignores spaces after parenthesis when 'space."
With argument, do this that many times.
Returns t unless search stops due to end of buffer."
(interactive "p")
- (and (re-search-backward (concat "^\\(" ruby-block-beg-re "\\)\\_>")
+ (and (re-search-backward (concat "^\\(" ruby-block-beg-re "\\)\\b")
nil 'move (or arg 1))
(progn (beginning-of-line) t)))
(defun ruby-beginning-of-indent ()
- (and (re-search-backward (concat "^\\(" ruby-indent-beg-re "\\)\\_>")
+ (and (re-search-backward (concat "^\\(" ruby-indent-beg-re "\\)\\b")
nil 'move)
(progn
(beginning-of-line)
@@ -915,7 +926,7 @@ An end of a defun is found by moving forward from the beginning of one."
(forward-line 1))
(defun ruby-move-to-block (n)
- (let (start pos done down (orig (point)))
+ (let (start pos done down)
(setq start (ruby-calculate-indent))
(setq down (looking-at (if (< n 0) ruby-block-end-re
(concat "\\<\\(" ruby-block-beg-re "\\)\\>"))))
@@ -941,18 +952,8 @@ An end of a defun is found by moving forward from the beginning of one."
(save-excursion
(back-to-indentation)
(if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
- (setq done nil)))))
- (back-to-indentation)
- (when (< n 0)
- (let ((eol (point-at-eol)) state next)
- (if (< orig eol) (setq eol orig))
- (setq orig (point))
- (while (and (setq next (apply 'ruby-parse-partial eol state))
- (< (point) eol))
- (setq state next))
- (when (cdaadr state)
- (goto-char (cdaadr state)))
- (backward-word)))))
+ (setq done nil))))))
+ (back-to-indentation))
(defun-region-command ruby-beginning-of-block (&optional arg)
"Move backward to next beginning-of-block"
@@ -972,7 +973,6 @@ An end of a defun is found by moving forward from the beginning of one."
(condition-case nil
(while (> i 0)
(skip-syntax-forward " ")
- (if (looking-at ",\\s *") (goto-char (match-end 0)))
(cond ((looking-at "\\?\\(\\\\[CM]-\\)*\\\\?\\S ")
(goto-char (match-end 0)))
((progn
@@ -1115,7 +1115,7 @@ balanced expression is found."
(concat "^[ \t]*\\(def\\|class\\|module\\)[ \t]+"
"\\("
;; \\. and :: for class method
- "\\([A-Za-z_]" ruby-symbol-re "*\\|\\.\\|::" "\\)"
+ "\\([A-Za-z_]" ruby-symbol-re "*\\|\\.\\|::" "\\)"
"+\\)")
nil t)
(progn
@@ -1166,62 +1166,12 @@ balanced expression is found."
(if mlist (concat mlist mname) mname)
mlist)))))
-(defun ruby-brace-to-do-end ()
- (when (looking-at "{")
- (let ((orig (point)) (end (progn (ruby-forward-sexp) (point))))
- (when (eq (char-before) ?\})
- (delete-char -1)
- (if (eq (char-syntax (char-before)) ?w)
- (insert " "))
- (insert "end")
- (if (eq (char-syntax (char-after)) ?w)
- (insert " "))
- (goto-char orig)
- (delete-char 1)
- (if (eq (char-syntax (char-before)) ?w)
- (insert " "))
- (insert "do")
- (when (looking-at "\\sw\\||")
- (insert " ")
- (backward-char))
- t))))
-
-(defun ruby-do-end-to-brace ()
- (when (and (or (bolp)
- (not (memq (char-syntax (char-before)) '(?w ?_))))
- (looking-at "\\<do\\(\\s \\|$\\)"))
- (let ((orig (point)) (end (progn (ruby-forward-sexp) (point))))
- (backward-char 3)
- (when (looking-at ruby-block-end-re)
- (delete-char 3)
- (insert "}")
- (goto-char orig)
- (delete-char 2)
- (insert "{")
- (if (looking-at "\\s +|")
- (delete-char (- (match-end 0) (match-beginning 0) 1)))
- t))))
-
-(defun ruby-toggle-block ()
- (interactive)
- (or (ruby-brace-to-do-end)
- (ruby-do-end-to-brace)))
-
-(eval-when-compile
- (if (featurep 'font-lock)
- (defmacro eval-when-font-lock-available (&rest args) (cons 'progn args))
- (defmacro eval-when-font-lock-available (&rest args))))
-
-(eval-when-compile
- (if (featurep 'hilit19)
- (defmacro eval-when-hilit19-available (&rest args) (cons 'progn args))
- (defmacro eval-when-hilit19-available (&rest args))))
-
-(eval-when-font-lock-available
+(cond
+ ((featurep 'font-lock)
(or (boundp 'font-lock-variable-name-face)
(setq font-lock-variable-name-face font-lock-type-face))
- (defconst ruby-font-lock-syntactic-keywords
+ (setq ruby-font-lock-syntactic-keywords
`(
;; #{ }, #$hoge, #@foo are not comments
("\\(#\\)[{$@]" 1 (1 . nil))
@@ -1277,8 +1227,7 @@ balanced expression is found."
(let ((old-point (point)) (case-fold-search nil))
(beginning-of-line)
(catch 'found-beg
- (while (and (re-search-backward ruby-here-doc-beg-re nil t)
- (not (ruby-singleton-class-p)))
+ (while (re-search-backward ruby-here-doc-beg-re nil t)
(if (not (or (ruby-in-ppss-context-p 'anything)
(ruby-here-doc-find-end old-point)))
(throw 'found-beg t)))))))
@@ -1331,7 +1280,7 @@ buffer position `limit' or the end of the buffer."
(not (re-search-forward ruby-here-doc-beg-re eol t))))
(string-to-syntax "|")))))))
- (eval-when-compile
+ (if (featurep 'xemacs)
(put 'ruby-mode 'font-lock-defaults
'((ruby-font-lock-keywords)
nil nil nil
@@ -1377,7 +1326,7 @@ buffer position `limit' or the end of the buffer."
1 font-lock-function-name-face)
;; keywords
(cons (concat
- "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\_<\\(defined\\?\\|"
+ "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|"
(regexp-opt
'("alias"
"and"
@@ -1422,7 +1371,7 @@ buffer position `limit' or the end of the buffer."
;; here-doc beginnings
(list ruby-here-doc-beg-re 0 'font-lock-string-face)
;; variables
- '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\_<\\(nil\\|self\\|true\\|false\\)\\>"
+ '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>"
2 font-lock-variable-name-face)
;; variables
'("\\(\\$\\([^a-zA-Z0-9 \n]\\|[0-9]\\)\\)\\W"
@@ -1438,12 +1387,11 @@ buffer position `limit' or the end of the buffer."
'("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)"
(2 font-lock-string-face))
;; constants
- '("\\(^\\|[^_]\\)\\_<\\([A-Z]+\\(\\w\\|_\\)*\\)"
+ '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)"
2 font-lock-type-face)
;; symbols
'("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
2 font-lock-reference-face)
- '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-reference-face)
;; expression expansion
'("#\\({[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\|\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+\\)"
0 font-lock-variable-name-face t)
@@ -1453,7 +1401,7 @@ buffer position `limit' or the end of the buffer."
)
"*Additional expressions to highlight in ruby mode."))
-(eval-when-hilit19-available
+ ((featurep 'hilit19)
(hilit-set-mode-patterns
'ruby-mode
'(("[^$\\?]\\(\"[^\\\"]*\\(\\\\\\(.\\|\n\\)[^\\\"]*\\)*\"\\)" 1 string)
@@ -1470,45 +1418,7 @@ buffer position `limit' or the end of the buffer."
("\\$\\(.\\|\\sw+\\)" nil type)
("[$@].[a-zA-Z_0-9]*" nil struct)
("^__END__" nil label))))
+ )
-;;;###autoload
-(defun ruby-mode ()
- "Major mode for editing ruby scripts.
-\\[ruby-indent-command] properly indents subexpressions of multi-line
-class, module, def, if, while, for, do, and case statements, taking
-nesting into account.
-
-The variable ruby-indent-level controls the amount of indentation.
-\\{ruby-mode-map}"
- (interactive)
- (kill-all-local-variables)
- (use-local-map ruby-mode-map)
- (setq mode-name "Ruby")
- (setq major-mode 'ruby-mode)
- (ruby-mode-variables)
-
- (make-local-variable 'imenu-create-index-function)
- (setq imenu-create-index-function 'ruby-imenu-create-index)
-
- (make-local-variable 'add-log-current-defun-function)
- (setq add-log-current-defun-function 'ruby-add-log-current-method)
-
- (add-hook
- (cond ((boundp 'before-save-hook)
- (make-local-variable 'before-save-hook)
- 'before-save-hook)
- ((boundp 'write-contents-functions) 'write-contents-functions)
- ((boundp 'write-contents-hooks) 'write-contents-hooks))
- 'ruby-mode-set-encoding)
-
- (set (make-local-variable 'font-lock-defaults) '((ruby-font-lock-keywords) nil nil))
- (set (make-local-variable 'font-lock-keywords) ruby-font-lock-keywords)
- (set (make-local-variable 'font-lock-syntax-table) ruby-font-lock-syntax-table)
- (set (make-local-variable 'font-lock-syntactic-keywords) ruby-font-lock-syntactic-keywords)
-
- (if (fboundp 'run-mode-hooks)
- (run-mode-hooks 'ruby-mode-hook)
- (run-hooks 'ruby-mode-hook)))
-
(provide 'ruby-mode)
diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 3ce55cd1ab..c433025dbc 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -54,7 +54,6 @@
(c-basic-offset . 4)
(tab-width . 8)
(indent-tabs-mode . t)
- (setq show-trailing-whitespace t)
(c-offsets-alist
(case-label . *)
(label . (ruby-style-label-indent *))
diff --git a/missing/alloca.c b/missing/alloca.c
index 96121f7647..d23917f3f7 100644
--- a/missing/alloca.c
+++ b/missing/alloca.c
@@ -6,7 +6,7 @@
This implementation of the PWB library alloca() function,
which is used to allocate space off the run-time stack so
- that it is automatically reclaimed upon procedure exit,
+ that it is automatically reclaimed upon procedure exit,
was inspired by discussions with J. Q. Johnson of Cornell.
It should work under any C implementation that uses an
@@ -30,8 +30,6 @@ static char SCCSid[] = "@(#)alloca.c 1.1"; /* for the "what" utility */
#endif
#include "ruby/config.h"
-#define X3J11 1 /* config.h should contain void if needed */
-
#ifdef C_ALLOCA
#ifdef emacs
@@ -54,12 +52,12 @@ typedef void *pointer; /* generic pointer type */
typedef char *pointer; /* generic pointer type */
#endif /* X3J11 */
-#ifndef NULL
#define NULL 0 /* null pointer constant */
-#endif
+#ifdef RUBY_LIB_PREFIX
#define xmalloc ruby_xmalloc
#define xfree ruby_xfree
+#endif
extern void xfree();
extern pointer xmalloc();
diff --git a/missing/cbrt.c b/missing/cbrt.c
index 1bcbc63392..54db2703a0 100644
--- a/missing/cbrt.c
+++ b/missing/cbrt.c
@@ -1,4 +1,3 @@
-#include "ruby/missing.h"
#include <math.h>
double cbrt(double x)
diff --git a/missing/close.c b/missing/close.c
index 831e75efe1..d87f9e3164 100644
--- a/missing/close.c
+++ b/missing/close.c
@@ -1,11 +1,9 @@
/* Ignore ECONNRESET of FreeBSD */
-#include "ruby/missing.h"
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
-#undef getpeername
int
ruby_getpeername(int s, struct sockaddr * name,
socklen_t * namelen)
@@ -22,7 +20,6 @@ ruby_getpeername(int s, struct sockaddr * name,
return s;
}
-#undef getsockname
int
ruby_getsockname(int s, struct sockaddr * name,
socklen_t * namelen)
@@ -39,7 +36,6 @@ ruby_getsockname(int s, struct sockaddr * name,
return s;
}
-#undef shutdown
int
ruby_shutdown(int s, int how)
{
@@ -55,7 +51,6 @@ ruby_shutdown(int s, int how)
return s;
}
-#undef close
int
ruby_close(int s)
{
diff --git a/missing/crt_externs.h b/missing/crt_externs.h
deleted file mode 100644
index cc96d46738..0000000000
--- a/missing/crt_externs.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MISSING_CRT_EXTERNS_H
-#define MISSING_CRT_EXTERNS_H
-
-char ***_NSGetEnviron();
-#undef environ
-#define environ (*_NSGetEnviron())
-
-#endif
diff --git a/missing/crypt.c b/missing/crypt.c
index 68a4d2bf13..d5a9281f77 100644
--- a/missing/crypt.c
+++ b/missing/crypt.c
@@ -34,7 +34,6 @@
static char sccsid[] = "@(#)crypt.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
-#include "ruby/missing.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -258,21 +257,21 @@ typedef union {
*/
#define TO_SIX_BIT(rslt, src) { \
C_block cvt; \
- cvt.b[0] = (unsigned char)(src); (src) >>= 6; \
- cvt.b[1] = (unsigned char)(src); (src) >>= 6; \
- cvt.b[2] = (unsigned char)(src); (src) >>= 6; \
- cvt.b[3] = (unsigned char)(src); \
- (rslt) = (cvt.b32.i0 & 0x3f3f3f3fL) << 2; \
+ cvt.b[0] = (unsigned char)src; src >>= 6; \
+ cvt.b[1] = (unsigned char)src; src >>= 6; \
+ cvt.b[2] = (unsigned char)src; src >>= 6; \
+ cvt.b[3] = (unsigned char)src; \
+ rslt = (cvt.b32.i0 & 0x3f3f3f3fL) << 2; \
}
/*
* These macros may someday permit efficient use of 64-bit integers.
*/
-#define ZERO(d,d0,d1) ((d0) = 0, (d1) = 0)
-#define LOAD(d,d0,d1,bl) ((d0) = (bl).b32.i0, (d1) = (bl).b32.i1)
-#define LOADREG(d,d0,d1,s,s0,s1) ((d0) = (s0), (d1) = (s1))
-#define OR(d,d0,d1,bl) ((d0) |= (bl).b32.i0, (d1) |= (bl).b32.i1)
-#define STORE(s,s0,s1,bl) ((bl).b32.i0 = (s0), (bl).b32.i1 = (s1))
+#define ZERO(d,d0,d1) d0 = 0, d1 = 0
+#define LOAD(d,d0,d1,bl) d0 = (bl).b32.i0, d1 = (bl).b32.i1
+#define LOADREG(d,d0,d1,s,s0,s1) d0 = s0, d1 = s1
+#define OR(d,d0,d1,bl) d0 |= (bl).b32.i0, d1 |= (bl).b32.i1
+#define STORE(s,s0,s1,bl) (bl).b32.i0 = s0, (bl).b32.i1 = s1
#define DCL_BLOCK(d,d0,d1) long d0, d1
#if defined(LARGEDATA)
@@ -280,27 +279,27 @@ typedef union {
#define LGCHUNKBITS 3
#define CHUNKBITS (1<<LGCHUNKBITS)
#define PERM6464(d,d0,d1,cpp,p) \
- LOAD((d),(d0),(d1),(p)[(0<<CHUNKBITS)+(cpp)[0]]); \
- OR ((d),(d0),(d1),(p)[(1<<CHUNKBITS)+(cpp)[1]]); \
- OR ((d),(d0),(d1),(p)[(2<<CHUNKBITS)+(cpp)[2]]); \
- OR ((d),(d0),(d1),(p)[(3<<CHUNKBITS)+(cpp)[3]]); \
- OR (d),(d0),(d1),(p)[(4<<CHUNKBITS)+(cpp)[4]]); \
- OR (d),(d0),(d1),(p)[(5<<CHUNKBITS)+(cpp)[5]]); \
- OR (d),(d0),(d1),(p)[(6<<CHUNKBITS)+(cpp)[6]]); \
- OR (d),(d0),(d1),(p)[(7<<CHUNKBITS)+(cpp)[7]]);
+ LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]); \
+ OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]); \
+ OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]); \
+ OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]); \
+ OR (d,d0,d1,(p)[(4<<CHUNKBITS)+(cpp)[4]]); \
+ OR (d,d0,d1,(p)[(5<<CHUNKBITS)+(cpp)[5]]); \
+ OR (d,d0,d1,(p)[(6<<CHUNKBITS)+(cpp)[6]]); \
+ OR (d,d0,d1,(p)[(7<<CHUNKBITS)+(cpp)[7]]);
#define PERM3264(d,d0,d1,cpp,p) \
- LOAD((d),(d0),(d1),(p)[(0<<CHUNKBITS)+(cpp)[0]]); \
- OR ((d),(d0),(d1),(p)[(1<<CHUNKBITS)+(cpp)[1]]); \
- OR ((d),(d0),(d1),(p)[(2<<CHUNKBITS)+(cpp)[2]]); \
- OR ((d),(d0),(d1),(p)[(3<<CHUNKBITS)+(cpp)[3]]);
+ LOAD(d,d0,d1,(p)[(0<<CHUNKBITS)+(cpp)[0]]); \
+ OR (d,d0,d1,(p)[(1<<CHUNKBITS)+(cpp)[1]]); \
+ OR (d,d0,d1,(p)[(2<<CHUNKBITS)+(cpp)[2]]); \
+ OR (d,d0,d1,(p)[(3<<CHUNKBITS)+(cpp)[3]]);
#else
/* "small data" */
#define LGCHUNKBITS 2
#define CHUNKBITS (1<<LGCHUNKBITS)
#define PERM6464(d,d0,d1,cpp,p) \
- { C_block tblk; permute((cpp),&tblk,(p),8); LOAD ((d),(d0),(d1),tblk); }
+ { C_block tblk; permute(cpp,&tblk,p,8); LOAD (d,d0,d1,tblk); }
#define PERM3264(d,d0,d1,cpp,p) \
- { C_block tblk; permute((cpp),&tblk,(p),4); LOAD ((d),(d0),(d1),tblk); }
+ { C_block tblk; permute(cpp,&tblk,p,4); LOAD (d,d0,d1,tblk); }
STATIC void
permute(cp, out, p, chars_in)
@@ -694,34 +693,34 @@ des_cipher(in, out, salt, num_iter)
loop_count = 8;
do {
-#define SPTAB(t, i) (*(long *)((unsigned char *)(t) + (i)*(sizeof(long)/4)))
+#define SPTAB(t, i) (*(long *)((unsigned char *)t + i*(sizeof(long)/4)))
#if defined(gould)
/* use this if B.b[i] is evaluated just once ... */
-#define DOXOR(x,y,i) (x)^=SPTAB(SPE[0][(i)],B.b[(i)]); (y)^=SPTAB(SPE[1][(i)],B.b[(i)]);
+#define DOXOR(x,y,i) x^=SPTAB(SPE[0][i],B.b[i]); y^=SPTAB(SPE[1][i],B.b[i]);
#else
#if defined(pdp11)
/* use this if your "long" int indexing is slow */
-#define DOXOR(x,y,i) j=B.b[(i)]; (x)^=SPTAB(SPE[0][(i)],j); (y)^=SPTAB(SPE[1][(i)],j);
+#define DOXOR(x,y,i) j=B.b[i]; x^=SPTAB(SPE[0][i],j); y^=SPTAB(SPE[1][i],j);
#else
/* use this if "k" is allocated to a register ... */
-#define DOXOR(x,y,i) k=B.b[(i)]; (x)^=SPTAB(SPE[0][(i)],k); (y)^=SPTAB(SPE[1][(i)],k);
+#define DOXOR(x,y,i) k=B.b[i]; x^=SPTAB(SPE[0][i],k); y^=SPTAB(SPE[1][i],k);
#endif
#endif
#define CRUNCH(p0, p1, q0, q1) \
- k = ((q0) ^ (q1)) & SALT; \
- B.b32.i0 = k ^ (q0) ^ kp->b32.i0; \
- B.b32.i1 = k ^ (q1) ^ kp->b32.i1; \
+ k = (q0 ^ q1) & SALT; \
+ B.b32.i0 = k ^ q0 ^ kp->b32.i0; \
+ B.b32.i1 = k ^ q1 ^ kp->b32.i1; \
kp = (C_block *)((char *)kp+ks_inc); \
\
- DOXOR((p0), (p1), 0); \
- DOXOR((p0), (p1), 1); \
- DOXOR((p0), (p1), 2); \
- DOXOR((p0), (p1), 3); \
- DOXOR((p0), (p1), 4); \
- DOXOR((p0), (p1), 5); \
- DOXOR((p0), (p1), 6); \
- DOXOR((p0), (p1), 7);
+ DOXOR(p0, p1, 0); \
+ DOXOR(p0, p1, 1); \
+ DOXOR(p0, p1, 2); \
+ DOXOR(p0, p1, 3); \
+ DOXOR(p0, p1, 4); \
+ DOXOR(p0, p1, 5); \
+ DOXOR(p0, p1, 6); \
+ DOXOR(p0, p1, 7);
CRUNCH(L0, L1, R0, R1);
CRUNCH(R0, R1, L0, L1);
diff --git a/missing/erf.c b/missing/erf.c
index d72c4eaf4e..fe65b9a479 100644
--- a/missing/erf.c
+++ b/missing/erf.c
@@ -3,7 +3,6 @@
reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
(New Algorithm handbook in C language) (Gijyutsu hyouron
sha, Tokyo, 1991) p.227 [in Japanese] */
-#include "ruby/missing.h"
#include <stdio.h>
#include <math.h>
diff --git a/missing/ffs.c b/missing/ffs.c
deleted file mode 100644
index bad99cf116..0000000000
--- a/missing/ffs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ffs.c - find first set bit */
-/* ffs() is defined by Single Unix Specification. */
-
-#include "ruby.h"
-
-int ffs(int arg)
-{
- unsigned int x = (unsigned int)arg;
- int r;
-
- if (x == 0)
- return 0;
-
- r = 1;
-
-#if 32 < SIZEOF_INT * CHAR_BIT
- if ((x & 0xffffffff) == 0) {
- x >>= 32;
- r += 32;
- }
-#endif
-
- if ((x & 0xffff) == 0) {
- x >>= 16;
- r += 16;
- }
-
- if ((x & 0xff) == 0) {
- x >>= 8;
- r += 8;
- }
-
- if ((x & 0xf) == 0) {
- x >>= 4;
- r += 4;
- }
-
- if ((x & 0x3) == 0) {
- x >>= 2;
- r += 2;
- }
-
- if ((x & 0x1) == 0) {
- x >>= 1;
- r += 1;
- }
-
- return r;
-}
diff --git a/missing/finite.c b/missing/finite.c
index ab7686317b..8d0b7af262 100644
--- a/missing/finite.c
+++ b/missing/finite.c
@@ -1,7 +1,5 @@
/* public domain rewrite of finite(3) */
-#include "ruby/missing.h"
-
int
finite(double n)
{
diff --git a/missing/flock.c b/missing/flock.c
index 435d66aefb..b02f8bf832 100644
--- a/missing/flock.c
+++ b/missing/flock.c
@@ -1,8 +1,7 @@
#include "ruby/config.h"
-#include "ruby/ruby.h"
#if defined _WIN32
-#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H && !defined(__native_client__)
+#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H
/* These are the flock() constants. Since this sytems doesn't have
flock(), the values of the constants are probably not available.
@@ -28,7 +27,7 @@ int
flock(int fd, int operation)
{
struct flock lock;
-
+
switch (operation & ~LOCK_NB) {
case LOCK_SH:
lock.l_type = F_RDLCK;
@@ -45,7 +44,7 @@ flock(int fd, int operation)
}
lock.l_whence = SEEK_SET;
lock.l_start = lock.l_len = 0L;
-
+
return fcntl(fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &lock);
}
diff --git a/missing/hypot.c b/missing/hypot.c
index 765581bacb..5a663553cf 100644
--- a/missing/hypot.c
+++ b/missing/hypot.c
@@ -1,6 +1,5 @@
/* public domain rewrite of hypot */
-#include "ruby/missing.h"
#include <math.h>
double hypot(double x, double y)
diff --git a/missing/isinf.c b/missing/isinf.c
index 55187adc63..4aef51b213 100644
--- a/missing/isinf.c
+++ b/missing/isinf.c
@@ -27,7 +27,7 @@ isinf(double n)
#include <ieeefp.h>
#endif
-/*
+/*
* isinf may be provided only as a macro.
* ex. HP-UX, Solaris 10
* http://www.gnu.org/software/automake/manual/autoconf/Function-Portability.html
diff --git a/missing/isnan.c b/missing/isnan.c
index 5846947f50..a8733978ad 100644
--- a/missing/isnan.c
+++ b/missing/isnan.c
@@ -1,7 +1,5 @@
/* public domain rewrite of isnan(3) */
-#include "ruby/missing.h"
-
static int double_ne(double n1, double n2);
int
diff --git a/missing/langinfo.c b/missing/langinfo.c
index 9ba06b15f6..6373afd0f5 100644
--- a/missing/langinfo.c
+++ b/missing/langinfo.c
@@ -32,12 +32,11 @@
* http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c
*/
-#include "ruby/missing.h"
#include <stdlib.h>
#include <string.h>
#if defined _WIN32 || defined __CYGWIN__
#include <windows.h>
-#if defined _WIN32 && !defined strncasecmp
+#if defined _WIN32
#define strncasecmp strnicmp
#endif
#endif
@@ -56,7 +55,7 @@
#endif
#define digit(x) ((x) >= '0' && (x) <= '9')
-#define strstart(s, n) (strncasecmp((s), (n), strlen(n)) == 0)
+#define strstart(s, n) (strncasecmp(s, n, strlen(n)) == 0)
static char buf[16];
@@ -65,7 +64,7 @@ nl_langinfo_codeset(void)
{
const char *l, *p;
int n;
-
+
if (((l = getenv("LC_ALL")) && *l) ||
((l = getenv("LC_CTYPE")) && *l) ||
((l = getenv("LANG")) && *l)) {
diff --git a/missing/lgamma_r.c b/missing/lgamma_r.c
index 6d2f38f40c..ba8535b18a 100644
--- a/missing/lgamma_r.c
+++ b/missing/lgamma_r.c
@@ -8,7 +8,6 @@ reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
http://oku.edu.mie-u.ac.jp/~okumura/algo/
*/
-#include "ruby/missing.h"
/***********************************************************
gamma.c -- Gamma function
***********************************************************/
@@ -47,17 +46,6 @@ loggamma(double x) /* the natural logarithm of the Gamma function. */
+ 0.5 * LOG_2PI - log(v) - x + (x - 0.5) * log(x);
}
-
-#ifdef __MINGW_ATTRIB_PURE
-/* get rid of bugs in math.h of mingw */
-#define modf(_X, _Y) __extension__ ({\
- double intpart_modf_bug = intpart_modf_bug;\
- double result_modf_bug = modf((_X), &intpart_modf_bug);\
- *(_Y) = intpart_modf_bug;\
- result_modf_bug;\
-})
-#endif
-
/* the natural logarithm of the absolute value of the Gamma function */
double
lgamma_r(double x, int *signp)
diff --git a/missing/memcmp.c b/missing/memcmp.c
index a81eec4244..5b3ad3817a 100644
--- a/missing/memcmp.c
+++ b/missing/memcmp.c
@@ -1,6 +1,5 @@
/* public domain rewrite of memcmp(3) */
-#include "ruby/missing.h"
#include <stddef.h>
int
diff --git a/missing/memmove.c b/missing/memmove.c
index e8e17e87e7..19c5f18847 100644
--- a/missing/memmove.c
+++ b/missing/memmove.c
@@ -1,6 +1,5 @@
/* public domain rewrite of memcmp(3) */
-#include "ruby/missing.h"
#include <stddef.h>
void *
diff --git a/missing/os2.c b/missing/os2.c
index 27dc2f1964..3448cdc281 100644
--- a/missing/os2.c
+++ b/missing/os2.c
@@ -94,14 +94,14 @@ char *cmd;
if (*s == '=')
goto doshell; */
for (s = cmd; *s; s++) {
- if (*sw == '-' && *s != ' ' &&
+ if (*sw == '-' && *s != ' ' &&
!isalpha(*s) && index("$&*(){}[]'\";\\|?<>~`\n",*s)) {
if (*s == '\n' && !s[1]) {
*s = '\0';
break;
}
goto doshell;
- } else if (*sw == '/' && *s != ' ' &&
+ } else if (*sw == '/' && *s != ' ' &&
!isalpha(*s) && index("^()<>|&\n",*s)) {
if (*s == '\n' && !s[1]) {
*s = '\0';
diff --git a/missing/setproctitle.c b/missing/setproctitle.c
deleted file mode 100644
index 9dcf37560b..0000000000
--- a/missing/setproctitle.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Based on setproctitle.c from openssh-5.6p1 */
-/* Based on conf.c from UCB sendmail 8.8.8 */
-
-/*
- * Copyright 2003 Damien Miller
- * Copyright (c) 1983, 1995-1997 Eric P. Allman
- * Copyright (c) 1988, 1993
- * The Regents of the University of California. 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. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 "ruby.h"
-#include "ruby/util.h"
-#define compat_init_setproctitle ruby_init_setproctitle
-
-#ifndef HAVE_SETPROCTITLE
-
-#include <stdarg.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_PSTAT_H
-#include <sys/pstat.h>
-#endif
-#include <string.h>
-
-#if defined(__APPLE__)
-# ifdef HAVE_CRT_EXTERNS_H
-# include <crt_externs.h>
-# undef environ
-# define environ (*_NSGetEnviron())
-# else
-# include "crt_externs.h"
-# endif
-#endif
-
-#define SPT_NONE 0 /* don't use it at all */
-#define SPT_PSTAT 1 /* use pstat(PSTAT_SETCMD, ...) */
-#define SPT_REUSEARGV 2 /* cover argv with title information */
-
-#ifndef SPT_TYPE
-# define SPT_TYPE SPT_NONE
-#endif
-
-#ifndef SPT_PADCHAR
-# define SPT_PADCHAR '\0'
-#endif
-
-#if SPT_TYPE == SPT_REUSEARGV
-static char *argv_start = NULL;
-static size_t argv_env_len = 0;
-static size_t argv_len = 0;
-#endif
-
-#endif /* HAVE_SETPROCTITLE */
-
-void
-compat_init_setproctitle(int argc, char *argv[])
-{
-#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
- extern char **environ;
- char *lastargv = NULL;
- char *lastenvp = NULL;
- char **envp = environ;
- int i;
-
- /*
- * NB: This assumes that argv has already been copied out of the
- * way. This is true for sshd, but may not be true for other
- * programs. Beware.
- */
-
- if (argc == 0 || argv[0] == NULL)
- return;
-
- /* Fail if we can't allocate room for the new environment */
- for (i = 0; envp[i] != NULL; i++)
- ;
- if ((environ = calloc(i + 1, sizeof(*environ))) == NULL) {
- environ = envp; /* put it back */
- return;
- }
-
- /*
- * Find the last argv string or environment variable within
- * our process memory area.
- */
- for (i = 0; i < argc; i++) {
- if (lastargv == NULL || lastargv + 1 == argv[i])
- lastargv = argv[i] + strlen(argv[i]);
- }
- lastenvp = lastargv;
- for (i = 0; envp[i] != NULL; i++) {
- if (lastenvp + 1 == envp[i])
- lastenvp = envp[i] + strlen(envp[i]);
- }
-
- argv[1] = NULL;
- argv_start = argv[0];
- argv_len = lastargv - argv[0];
- argv_env_len = lastenvp - argv[0];
-
- for (i = 0; envp[i] != NULL; i++)
- environ[i] = ruby_strdup(envp[i]);
- environ[i] = NULL;
-#endif /* SPT_REUSEARGV */
-}
-
-#ifndef HAVE_SETPROCTITLE
-void
-setproctitle(const char *fmt, ...)
-{
-#if SPT_TYPE != SPT_NONE
- va_list ap;
- char ptitle[1024];
- size_t len;
- size_t argvlen;
-#if SPT_TYPE == SPT_PSTAT
- union pstun pst;
-#endif
-
-#if SPT_TYPE == SPT_REUSEARGV
- if (argv_env_len <= 0)
- return;
-#endif
-
- va_start(ap, fmt);
- if (fmt != NULL) {
- vsnprintf(ptitle, sizeof(ptitle) , fmt, ap);
- }
- va_end(ap);
-
-#if SPT_TYPE == SPT_PSTAT
- pst.pst_command = ptitle;
- pstat(PSTAT_SETCMD, pst, strlen(ptitle), 0, 0);
-#elif SPT_TYPE == SPT_REUSEARGV
- len = strlcpy(argv_start, ptitle, argv_env_len);
- argvlen = len > argv_len ? argv_env_len : argv_len;
- for(; len < argvlen; len++)
- argv_start[len] = SPT_PADCHAR;
-#endif
-
-#endif /* SPT_NONE */
-}
-
-#endif /* HAVE_SETPROCTITLE */
diff --git a/missing/strchr.c b/missing/strchr.c
index 465f07b61e..bebd7ba578 100644
--- a/missing/strchr.c
+++ b/missing/strchr.c
@@ -1,9 +1,5 @@
/* public domain rewrite of strchr(3) and strrchr(3) */
-#include "ruby/missing.h"
-
-size_t strlen(const char*);
-
char *
strchr(const char *s, int c)
{
diff --git a/missing/strerror.c b/missing/strerror.c
index 907b5aee0d..023935a1ff 100644
--- a/missing/strerror.c
+++ b/missing/strerror.c
@@ -1,7 +1,5 @@
/* public domain rewrite of strerror(3) */
-#include "ruby/missing.h"
-
extern int sys_nerr;
extern char *sys_errlist[];
diff --git a/missing/strlcat.c b/missing/strlcat.c
index 4e2d7cc85a..b309648155 100644
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -31,7 +31,6 @@
static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
-#include "ruby/missing.h"
#include <sys/types.h>
#include <string.h>
diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 2ebc38f98f..5f586964b7 100644
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -31,7 +31,6 @@
static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */
-#include "ruby/missing.h"
#include <sys/types.h>
#include <string.h>
diff --git a/missing/strstr.c b/missing/strstr.c
index e6613c5d2f..2e9c282fb1 100644
--- a/missing/strstr.c
+++ b/missing/strstr.c
@@ -1,9 +1,5 @@
/* public domain rewrite of strstr(3) */
-#include "ruby/missing.h"
-
-size_t strlen(const char*);
-
char *
strstr(const char *haystack, const char *needle)
{
diff --git a/missing/strtol.c b/missing/strtol.c
index 87bd73124c..da6636f316 100644
--- a/missing/strtol.c
+++ b/missing/strtol.c
@@ -1,6 +1,5 @@
/* public domain rewrite of strtol(3) */
-#include "ruby/missing.h"
#include <ctype.h>
long
diff --git a/missing/x86_64-chkstk.s b/missing/x86_64-chkstk.s
deleted file mode 100644
index 6d1227b6d2..0000000000
--- a/missing/x86_64-chkstk.s
+++ /dev/null
@@ -1,10 +0,0 @@
- .text
-.globl ___chkstk
-___chkstk:
- pushq %rax
- movq %rax, %rcx
- movq %rsp, %rdx
- call _ruby_alloca_chkstk
- popq %rax
- subq %rax, %rsp
- ret
diff --git a/nacl/GNUmakefile.in b/nacl/GNUmakefile.in
deleted file mode 100644
index c1aaa36c7c..0000000000
--- a/nacl/GNUmakefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2012 Google Inc. All Rights Reserved.
-# Author: yugui@google.com (Yugui Sonoda)
-
-include Makefile
--include uncommon.mk
-
-NACL_SDK_ROOT=@NACL_SDK_ROOT@
-NACL_TOOLCHAIN=@NACL_TOOLCHAIN@
-NACL_TOOLCHAIN_DIR=$(NACL_SDK_ROOT)/toolchain/$(NACL_TOOLCHAIN)
-CC:=$(NACL_TOOLCHAIN_DIR)/bin/$(CC)
-LD:=$(NACL_TOOLCHAIN_DIR)/bin/$(LD)
-NM:=$(NACL_TOOLCHAIN_DIR)/bin/$(NM)
-AR:=$(NACL_TOOLCHAIN_DIR)/bin/$(AR)
-AS:=$(NACL_TOOLCHAIN_DIR)/bin/$(AS)
-RANLIB:=$(NACL_TOOLCHAIN_DIR)/bin/$(RANLIB)
-OBJDUMP:=$(NACL_TOOLCHAIN_DIR)/bin/$(OBJDUMP)
-OBJCOPY:=$(NACL_TOOLCHAIN_DIR)/bin/$(OBJCOPY)
-PYTHON=@PYTHON@
-
-PPROGRAM=pepper-$(PROGRAM)
-PEPPER_LIBS=-lppapi
-PROGRAM_NMF=$(PROGRAM:.nexe=.nmf)
-PPROGRAM_NMF=$(PPROGRAM:.nexe=.nmf)
-
-GNUmakefile: $(srcdir)/nacl/GNUmakefile.in
-$(PPROGRAM): $(PROGRAM) pepper_main.$(OBJEXT)
- $(Q)$(MAKE) $(MFLAGS) PROGRAM=$(PPROGRAM) MAINOBJ="pepper_main.$(OBJEXT)" LIBS="$(LIBS) $(PEPPER_LIBS)" program
-$(PROGRAM_NMF) $(PPROGRAM_NMF): $(@:.nmf=.nexe) nacl/create_nmf.rb
-
-.PHONY: pprogram package show_naclflags
-.SUFFIXES: .nexe .nmf
-.nexe.nmf:
- $(ECHO) generating manifest $@
- $(Q)$(MINIRUBY) $(srcdir)/nacl/create_nmf.rb --verbose=$(V) $(@:.nmf=.nexe) $@
-
-pepper_main.$(OBJEXT): $(srcdir)/nacl/pepper_main.c
- @$(ECHO) compiling nacl/pepper_main.c
- $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(srcdir)/nacl/pepper_main.c
-ruby.$(OBJEXT):
- @$(ECHO) compiling $<
- $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@.tmp -c $<
- $(Q) $(OBJCOPY) --weaken-symbol=rb_load_file $@.tmp $@
- @-$(RM) $@.tmp
-file.$(OBJEXT):
- @$(ECHO) compiling $<
- $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@.tmp -c $<
- $(Q) $(OBJCOPY) --weaken-symbol=rb_file_load_ok $@.tmp $@
- @-$(RM) $@.tmp
-
-.rbconfig.time:
- @$(MAKE) .rbconfig.raw.time RBCONFIG=.rbconfig.raw.time
- @sed \
- -e 's!CONFIG\["CC"\] = .*!CONFIG\["CC"\] = "$(CC)"!' \
- -e 's!CONFIG\["LD"\] = .*!CONFIG\["LD"\] = "$(LD)"!' \
- -e 's!CONFIG\["NM"\] = .*!CONFIG\["NM"\] = "$(NM)"!' \
- -e 's!CONFIG\["AR"\] = .*!CONFIG\["AR"\] = "$(AR)"!' \
- -e 's!CONFIG\["AS"\] = .*!CONFIG\["AS"\] = "$(AS)"!' \
- -e 's!CONFIG\["RANLIB"\] = .*!CONFIG\["RANLIB"\] = "$(RANLIB)"!' \
- -e 's!CONFIG\["OBJDUMP"\] = .*!CONFIG\["OBJDUMP"\] = "$(OBJDUMP)"!' \
- -e 's!CONFIG\["OBJCOPY"\] = .*!CONFIG\["OBJCOPY"\] = "$(OBJCOPY)"!' \
- -i.bak rbconfig.rb
- @touch .rbconfig.time
-
-all: pprogram
-main: $(PROGRAM_NMF)
-pprogram: showflags $(PPROGRAM) $(PPROGRAM_NMF)
-program: $(PROGRAM_NMF)
-prog: pprogram
-
-package: pprogram install-lib install-ext-comm install-ext-arch
- $(INSTALL_DATA) $(srcdir)/nacl/example.html $(prefix)
- $(ECHO) generating manifest $@
- $(Q)$(MINIRUBY) $(srcdir)/nacl/package.rb $(prefix)
-
-showflags: show_naclflags
-
-show_naclflags:
- @echo " NACL_SDK_ROOT = $(NACL_SDK_ROOT)"
- @echo " NM = $(NM)"
- @echo " AR = $(AR)"
- @echo " AS = $(AS)"
- @echo " RANLIB = $(RANLIB)"
- @echo " OBJDUMP = $(OBJDUMP)"
- @echo " OBJCOPY = $(OBJCOPY)"
-
-clean-local::
- -$(RM) $(PPROGRAM) pepper_main.$(OBJEXT) $(PROGRAM_NMF) $(PPRGORAM_NMF)
diff --git a/nacl/README.nacl b/nacl/README.nacl
deleted file mode 100644
index e70f272715..0000000000
--- a/nacl/README.nacl
+++ /dev/null
@@ -1,34 +0,0 @@
-=begin
-= Native Client port of Ruby
-
-= How to build
-== Prerequisites
-You need to install the following things before building NaCl port of Ruby.
-* Ruby 1.9.3 or later
-* Python 2.6 or later
-* NativeClient SDK pepper 22 or later
-* GNU make
-
-== Steps
-(1) Extract all files from the tarball:
- $ tar xzf ruby-X.Y.Z.tar.gz
-(2) Set NACL_SDK_ROOT environment vairanble to the path to the Native Client SDK you installed:
- $ export NACL_SDK_ROOT=/home/yugui/src/nacl_sdk/pepper_16
-(3) Configure
- $ ./configure --prefix=/tmp/nacl-ruby --host=x86_64-nacl --with-baseruby=/path/to/ruby-1.9.3
-(4) Make
- $ make
- $ make package
-
-Now you have ruby.nexe. You can run it by sel_ldr in NaCl SDK.
-
-"make package" installs "pepper-ruby.nexe", an example Pepper application that
-embeds Ruby", and libraries to $prefix. You can run it by the following steps:
-(5) Publish the $prefix directory on a web server
-(6) Visit the example.html on the web server by a browser that implements Pepper 18 or later.
- -- e.g., Chrome 18 implements Pepper 18, Chrome 19 implements Pepper 19, ...
-
-= Copyright
-* Copyright 2012 Google Inc. All Rights Reserved.
-* Author: yugui@google.com (Yugui Sonoda)
-=end
diff --git a/nacl/create_nmf.rb b/nacl/create_nmf.rb
deleted file mode 100644
index cdfe7ad239..0000000000
--- a/nacl/create_nmf.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/ruby
-# Copyright:: Copyright 2012 Google Inc.
-# License:: All Rights Reserved.
-# Original Author:: Yugui Sonoda (mailto:yugui@google.com)
-#
-# Wrapper for create_nmf.py / generate_nmf.py
-
-require File.join(File.dirname(__FILE__), 'nacl-config')
-
-include NaClConfig
-$verbosity = 0
-
-def usage_and_exit
- $stderr.puts "Usage: #{$PROGRAM_NAME} [--verbose=N] path/to/input.nexe path/to/output.nmf"
- exit false
-end
-
-def create_dynamically_linked(nmf, exe)
- cmd = [
- PYTHON, CREATE_NMF,
- '-o', nmf,
- '-D', OBJDUMP,
- '-L', HOST_LIB,
- exe
- ]
- puts cmd.join(' ') if $verbosity > 0
- exec(*cmd)
-end
-
-def create_statically_linked(nmf, exe)
- File.open(nmf, "w") {|f|
- f.write <<-EOS.gsub(/^ {6}/, '')
- {
- "program": {
- "#{ARCH}": {
- "url": "#{exe}"
- }
- }
- }
- EOS
- }
-end
-
-def main
- while m = ARGV.first.match(/--([a-z-]+)(?:=(\S+))?/)
- case m[1]
- when 'verbose'
- usage_and_exit unless m[2][/\A[0-9]+\z/]
- $verbosity = m[2].to_i
- when 'help'
- usage_end_exit
- end
- ARGV.shift
- end
-
- usage_and_exit if ARGV.size < 2
-
- exe, nmf = ARGV[0], ARGV[1]
- if newlib?
- create_statically_linked(nmf, exe)
- else
- create_dynamically_linked(nmf, exe)
- end
-end
-
-if __FILE__ == $0
- main()
-end
-
-
diff --git a/nacl/dirent.h b/nacl/dirent.h
deleted file mode 100644
index 31bdad31b7..0000000000
--- a/nacl/dirent.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2011 Google Inc. All Rights Reserved.
- * Author: yugui@google.com (Yugui Sonoda)
- */
-#ifndef RUBY_NACL_DIRENT_H
-#define RUBY_NACL_DIRENT_H
-
-/* NaCl SDK 0.3 has implementations of dir functions but no declaration in
- * dirent.h */
-int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
-void rewinddir(DIR *dirp);
-long telldir(DIR *dirp);
-void seekdir(DIR *dirp, long offset);
-
-#endif
diff --git a/nacl/example.html b/nacl/example.html
deleted file mode 100644
index 3cc33298dd..0000000000
--- a/nacl/example.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Ruby Example</title>
-
- <script type="text/javascript">
- RubyModule = null; // Global application object.
- statusText = 'NO-STATUS';
- rubyReady = false;
-
- // Indicate load success.
- function moduleDidLoad() {
- RubyModule = document.getElementById('ruby');
- form = document.getElementById('source-form');
- form.style.display = "block";
- updateStatus('SUCCESS');
- }
-
- function evalSource() {
- if (rubyReady) {
- RubyModule.postMessage('eval:' + document.getElementById("source").value);
- } else {
- throw "Not yet ready";
- }
- return false;
- }
-
- function RubyError(message) {
- this.message = message;
- this.toString = function() {
- return message;
- }
- }
-
- function FatalError(message) {
- this.message = message;
- }
-
- // The 'message' event handler. This handler is fired when the NaCl module
- // posts a message to the browser by calling PPB_Messaging.PostMessage()
- // (in C) or pp::Instance.PostMessage() (in C++). This implementation
- // simply displays the content of the message in an alert panel.
- function handleMessage(message_event) {
- var raw = message_event.data;
- var components;
- if (raw.indexOf("error") == 0) {
- components = raw.split(":", 2);
- throw new RubyError(components[1]);
- } else if (raw.indexOf("return") == 0) {
- components = raw.split(":", 2);
- document.getElementById("result").value = components[1];
- } else if (raw == "rubyReady") {
- rubyReady = true;
- } else {
- throw new FatalError(raw);
- }
- }
-
- // If the page loads before the Native Client module loads, then set the
- // status message indicating that the module is still loading. Otherwise,
- // do not change the status message.
- function pageDidLoad() {
- if (RubyModule == null) {
- updateStatus('LOADING...');
- } else {
- // It's possible that the Native Client module onload event fired
- // before the page's onload event. In this case, the status message
- // will reflect 'SUCCESS', but won't be displayed. This call will
- // display the current message.
- updateStatus();
- }
- }
-
- // Set the global status message. If the element with id 'statusField'
- // exists, then set its HTML to the status message as well.
- // opt_message The message test. If this is null or undefined, then
- // attempt to set the element with id 'statusField' to the value of
- // |statusText|.
- function updateStatus(opt_message) {
- if (opt_message)
- statusText = opt_message;
- var statusField = document.getElementById('status_field');
- if (statusField) {
- statusField.innerHTML = statusText;
- }
- }
- </script>
-</head>
-<body onload="pageDidLoad()">
-
-<h1>Native Client Module Ruby</h1>
-<p>
- <!-- Load the published .nexe. This includes the 'nacl' attribute which
- shows how to load multi-architecture modules. Each entry in the "nexes"
- object in the .nmf manifest file is a key-value pair: the key is the
- instruction set architecture ('x86-32', 'x86-64', etc.); the value is a URL
- for the desired NaCl module.
- To load the debug versions of your .nexes, set the 'nacl' attribute to the
- _dbg.nmf version of the manifest file.
-
- Note: Since this NaCl module does not use any real-estate in the browser,
- it's width and height are set to 0.
-
- Note: The <EMBED> element is wrapped inside a <DIV>, which has both a 'load'
- and a 'message' event listener attached. This wrapping method is used
- instead of attaching the event listeners directly to the <EMBED> element to
- ensure that the listeners are active before the NaCl module 'load' event
- fires. This also allows you to use PPB_Messaging.PostMessage() (in C) or
- pp::Instance.PostMessage() (in C++) from within the initialization code in
- your NaCl module.
- -->
- <div id="listener">
- <script type="text/javascript">
- var listener = document.getElementById('listener');
- listener.addEventListener('load', moduleDidLoad, true);
- listener.addEventListener('message', handleMessage, true);
- </script>
-
- <embed name="nacl_module"
- id="ruby"
- width="0" height="0"
- src="ruby.nmf"
- type="application/x-nacl" />
- <form id="source-form" action="#" method="post" style="display:none"
- onsubmit="evalSource(); return false">
- <table>
- <tbody>
- <tr>
- <th>Source</th>
- <td>
- <textarea rows="10" cols="80" id="source"></textarea>
- <input type="submit" />
- </td>
- </tr>
- <tr>
- <th>Result</th>
- <td>
- <textarea rows="10" cols="80" id="result"></textarea>
- </td>
- </tr>
- </tbody>
- </table>
- </form>
- </div>
-</p>
-
-<h2>Status</h2>
-<div id="status_field">NO-STATUS</div>
-</body>
-</html>
diff --git a/nacl/ioctl.h b/nacl/ioctl.h
deleted file mode 100644
index 0a18eeb3f5..0000000000
--- a/nacl/ioctl.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
-// Author: yugui@google.com (Yugui Sonoda)
-#ifndef RUBY_NACL_IOCTL_H
-#define RUBY_NACL_IOCTL_H
-int ioctl(int fd, int request, ...);
-struct flock{};
-#endif
diff --git a/nacl/nacl-config.rb b/nacl/nacl-config.rb
deleted file mode 100644
index b90c9ed100..0000000000
--- a/nacl/nacl-config.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/ruby
-#
-# Copyright:: Copyright 2012 Google Inc.
-# License:: All Rights Reserved.
-# Original Author:: Yugui Sonoda (mailto:yugui@google.com)
-#
-# Convenient functions/constants for native client specific configurations.
-require 'rbconfig'
-
-module NaClConfig
- config = RbConfig::CONFIG
-
- cpu_nick = config['host_alias'].sub(/-gnu$|-newlib$/, '').sub(/-nacl$/, '').sub(/i.86/, 'x86_32')
- ARCH = cpu_nick.sub('x86_64', 'x86-64').sub('x86_32', 'x86-32')
- HOST = ARCH.sub(/x86-../, 'x86_64') + '-nacl'
-
- lib_suffix = config['host_cpu'][/i.86/] ? '32' : ''
- PYTHON = config['PYTHON']
- OBJDUMP = config['OBJDUMP']
- SDK_ROOT = config['NACL_SDK_ROOT']
- CREATE_NMF = [
- File.join(SDK_ROOT, 'build_tools', 'nacl_sdk_scons', 'site_tools', 'create_nmf.py'),
- File.join(SDK_ROOT, 'tools', 'create_nmf.py')
- ].find{|path| File.exist?(path) } or raise "No create_nmf found"
- HOST_LIB = File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], HOST, "lib#{lib_suffix}")
-
- INSTALL_PROGRAM = config['INSTALL_PROGRAM']
- INSTALL_LIBRARY = config['INSTALL_DATA']
-
- SEL_LDR = [
- File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "sel_ldr_#{cpu_nick}"),
- File.join(SDK_ROOT, 'tools', "sel_ldr_#{cpu_nick}")
- ].find{|path| File.executable?(path)} or raise "No sel_ldr found"
- IRT_CORE = [
- File.join(SDK_ROOT, 'toolchain', config['NACL_TOOLCHAIN'], 'bin', "irt_core_#{cpu_nick}.nexe"),
- File.join(SDK_ROOT, 'tools', "irt_core_#{cpu_nick}.nexe")
- ].find{|path| File.executable?(path)} or raise "No irt_core found"
- RUNNABLE_LD = File.join(HOST_LIB, 'runnable-ld.so')
-
- module_function
-
- def newlib?
- RbConfig::CONFIG['NACL_SDK_VARIANT'] == 'newlib'
- end
-
- def self.config(name)
- if NaClConfig::const_defined?(name.upcase)
- NaClConfig::const_get(name.upcase)
- elsif NaClConfig::respond_to?(name) and NaClConfig::method(name).arity == 0
- NaClConfig::send(name)
- else
- raise ArgumentError, "No such config: #{name}"
- end
- end
-end
-
-if $0 == __FILE__
- ARGV.each do |arg|
- puts NaClConfig::config(arg)
- end
-end
diff --git a/nacl/package.rb b/nacl/package.rb
deleted file mode 100644
index f4f50f24ed..0000000000
--- a/nacl/package.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/ruby
-# Copyright:: Copyright 2012 Google Inc.
-# License:: All Rights Reserved.
-# Original Author:: Yugui Sonoda (mailto:yugui@google.com)
-#
-# Generates a runnable package of the pepper API example.
-
-require File.join(File.dirname(__FILE__), 'nacl-config')
-require 'json'
-require 'find'
-require 'fileutils'
-
-include NaClConfig
-
-class Installation
- include NaClConfig
-
- SRC_DIRS = [ Dir.pwd, HOST_LIB ]
-
- def initialize(destdir)
- @destdir = destdir
- @manifest = {
- "files" => {}
- }
- ruby_libs.each do |path|
- raise "Collision of #{path}" if @manifest['files'].key? path
- @manifest['files'][path] = {
- ARCH => {
- "url" => path
- }
- }
- if path[/\.so$/]
- alternate_path = path.gsub('/', "_")
- raise "Collision of #{alternate_path}" if @manifest['files'].key? alternate_path
- @manifest['files'][alternate_path] = {
- ARCH => {
- "url" => path
- }
- }
- end
- end
- end
-
- def manifest
- @manifest.dup
- end
-
- def install_program(basename)
- do_install_binary(basename, File.join(@destdir, "bin", ARCH))
- @manifest["program"] = {
- ARCH => {
- "url" => File.join("bin", ARCH, basename)
- }
- }
- end
-
- def install_library(name, basename)
- do_install_binary(basename, File.join(@destdir, "lib", ARCH))
- @manifest["files"][name] = {
- ARCH => {
- "url" => File.join("lib", ARCH, basename)
- }
- }
- end
-
- private
- def do_install_binary(basename, dest_dir)
- full_path = nil
- catch(:found) {
- SRC_DIRS.each do |path|
- full_path = File.join(path, basename)
- if File.exist? full_path
- throw :found
- end
- end
- raise Errno::ENOENT, "No such file to install: %s" % basename
- }
- FileUtils.mkdir_p dest_dir
- system("#{INSTALL_PROGRAM} #{full_path} #{dest_dir}")
- end
-
- def ruby_libs
- Find.find(RbConfig::CONFIG['rubylibdir']).select{|path| File.file?(path) }.map{|path| path.sub("#{@destdir}/", "") }
- end
-end
-
-def install(destdir)
- inst = Installation.new(destdir)
- manifest = JSON.parse(File.read("pepper-ruby.nmf"))
-
- program = File.basename(manifest['program'][ARCH]['url'])
- inst.install_program(program)
-
- manifest['files'].each do |name, attr|
- inst.install_library(name, File.basename(attr[ARCH]["url"]))
- end
-
- File.open(File.join(destdir, "ruby.nmf"), "w") {|f|
- f.puts JSON.pretty_generate(inst.manifest)
- }
-end
-
-def main
- install(ARGV[0])
-end
-
-if __FILE__ == $0
- main()
-end
diff --git a/nacl/pepper_main.c b/nacl/pepper_main.c
deleted file mode 100644
index c0e497b387..0000000000
--- a/nacl/pepper_main.c
+++ /dev/null
@@ -1,870 +0,0 @@
-/******************************************************************************
- Copyright 2012 Google Inc. All Rights Reserved.
- Author: yugui@google.com (Yugui Sonoda)
- ******************************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <pthread.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/pp_module.h"
-#include "ppapi/c/pp_var.h"
-#include "ppapi/c/ppb.h"
-#include "ppapi/c/ppb_core.h"
-#include "ppapi/c/ppb_file_ref.h"
-#include "ppapi/c/ppb_instance.h"
-#include "ppapi/c/ppb_messaging.h"
-#include "ppapi/c/ppb_url_loader.h"
-#include "ppapi/c/ppb_url_request_info.h"
-#include "ppapi/c/ppb_url_response_info.h"
-#include "ppapi/c/ppb_var.h"
-#include "ppapi/c/ppp.h"
-#include "ppapi/c/ppp_instance.h"
-#include "ppapi/c/ppp_messaging.h"
-
-#include "verconf.h"
-#include "ruby/ruby.h"
-#include "version.h"
-#include "gc.h"
-
-#ifdef HAVE_STRUCT_PPB_CORE
-typedef struct PPB_Core PPB_Core;
-#endif
-#ifdef HAVE_STRUCT_PPB_MESSAGING
-typedef struct PPB_Messaging PPB_Messaging;
-#endif
-#ifdef HAVE_STRUCT_PPB_VAR
-typedef struct PPB_Var PPB_Var;
-#endif
-#ifdef HAVE_STRUCT_PPB_URLLOADER
-typedef struct PPB_URLLoader PPB_URLLoader;
-#endif
-#ifdef HAVE_STRUCT_PPB_URLREQUESTINFO
-typedef struct PPB_URLRequestInfo PPB_URLRequestInfo;
-#endif
-#ifdef HAVE_STRUCT_PPB_URLRESPONSEINFO
-typedef struct PPB_URLResponseInfo PPB_URLResponseInfo;
-#endif
-#ifdef HAVE_STRUCT_PPP_INSTANCE
-typedef struct PPP_Instance PPP_Instance;
-#endif
-
-static PP_Module module_id = 0;
-static PPB_Core* core_interface = NULL;
-static PPB_Messaging* messaging_interface = NULL;
-static PPB_Var* var_interface = NULL;
-static PPB_URLLoader* loader_interface = NULL;
-static PPB_URLRequestInfo* request_interface = NULL;
-static PPB_URLResponseInfo* response_interface = NULL;
-static PPB_FileRef* fileref_interface = NULL;
-static struct st_table* instance_data = NULL;
-
-static VALUE instance_table = Qundef;
-
-static PP_Instance current_instance = 0;
-
-/******************************************************************************
- * State of instance
- ******************************************************************************/
-
-static void inst_mark(void *const ptr);
-static void inst_free(void *const ptr);
-static size_t inst_memsize(void *const ptr);
-static const rb_data_type_t pepper_instance_data_type = {
- "PepperInstance",
- { inst_mark, inst_free, inst_memsize }
-};
-
-struct PepperInstance {
- PP_Instance instance;
- PP_Resource url_loader;
- VALUE self;
- void* async_call_args;
- union {
- int32_t as_int;
- const char* as_str;
- VALUE as_value;
- } async_call_result;
- char buf[1000];
-
- pthread_t th;
- pthread_mutex_t mutex;
- pthread_cond_t cond;
-};
-
-struct PepperInstance*
-pruby_get_instance(PP_Instance instance)
-{
- VALUE self = rb_hash_aref(instance_table, INT2FIX(instance));
- if (RTEST(self)) {
- struct PepperInstance *inst;
- TypedData_Get_Struct(self, struct PepperInstance, &pepper_instance_data_type, inst);
- return inst;
- }
- else {
- return NULL;
- }
-}
-
-#define GET_PEPPER_INSTANCE() (pruby_get_instance(current_instance))
-
-struct PepperInstance*
-pruby_register_instance(PP_Instance instance)
-{
- VALUE obj;
- struct PepperInstance *data;
- obj = TypedData_Make_Struct(rb_cData, struct PepperInstance, &pepper_instance_data_type, data);
- data->self = obj;
- data->instance = instance;
- data->url_loader = 0;
-
- pthread_mutex_init(&data->mutex, NULL);
- pthread_cond_init(&data->cond, NULL);
-
- rb_hash_aset(instance_table, INT2FIX(instance), obj);
- return data;
-}
-
-int
-pruby_unregister_instance(PP_Instance instance)
-{
- VALUE inst = rb_hash_delete(instance_table, INT2FIX(instance));
- return RTEST(inst);
-}
-
-static void
-inst_mark(void *const ptr)
-{
- RUBY_MARK_ENTER("PepperInstance"0);
- if (ptr) {
- const struct PepperInstance* inst = (struct PepperInstance*)ptr;
- RUBY_MARK_UNLESS_NULL(inst->async_call_result.as_value);
- }
- RUBY_MARK_LEAVE("PepperInstance"0);
-}
-
-static void
-inst_free(void *const ptr)
-{
- ruby_xfree(ptr);
-}
-
-static size_t
-inst_memsize(void *const ptr)
-{
- if (ptr) {
- const struct PepperInstance* inst = (struct PepperInstance*)ptr;
- return sizeof(*inst);
- } else {
- return 0;
- }
-}
-
-void
-pruby_async_return_int(void* data, int32_t result)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- instance->async_call_result.as_int = result;
- if (pthread_cond_signal(&instance->cond)) {
- perror("pepper-ruby:pthread_cond_signal");
- }
-}
-
-void
-pruby_async_return_str(void* data, const char *result)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- instance->async_call_result.as_str = result;
- if (pthread_cond_signal(&instance->cond)) {
- perror("pepper-ruby:pthread_cond_signal");
- }
-}
-
-void
-pruby_async_return_value(void* data, VALUE value)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- instance->async_call_result.as_value = value;
- if (pthread_cond_signal(&instance->cond)) {
- perror("pepper-ruby:pthread_cond_signal");
- }
-}
-/******************************************************************************
- * Conversion between Ruby's VALUE, Pepper's Var and C string
- ******************************************************************************/
-
-/**
- * Creates a new string PP_Var from C string. The resulting object will be a
- * refcounted string object. It will be AddRef()ed for the caller. When the
- * caller is done with it, it should be Release()d.
- * @param[in] str C string to be converted to PP_Var
- * @return PP_Var containing string.
- */
-static struct PP_Var
-pruby_cstr_to_var(const char* str)
-{
-#ifdef PPB_VAR_INTERFACE_1_0
- if (var_interface != NULL)
- return var_interface->VarFromUtf8(module_id, str, strlen(str));
- return PP_MakeUndefined();
-#else
- return var_interface->VarFromUtf8(str, strlen(str));
-#endif
-}
-
-/**
- * Returns a mutable C string contained in the @a var or NULL if @a var is not
- * string. This makes a copy of the string in the @a var and adds a NULL
- * terminator. Note that VarToUtf8() does not guarantee the NULL terminator on
- * the returned string. See the comments for VarToUtf8() in ppapi/c/ppb_var.h
- * for more info. The caller is responsible for freeing the returned memory.
- * @param[in] var PP_Var containing string.
- * @return a mutable C string representation of @a var.
- * @note The caller is responsible for freeing the returned string.
- */
-static char*
-pruby_var_to_cstr(struct PP_Var var)
-{
- uint32_t len = 0;
- if (var_interface != NULL) {
- const char* var_c_str = var_interface->VarToUtf8(var, &len);
- if (len > 0) {
- char* c_str = (char*)malloc(len + 1);
- memcpy(c_str, var_c_str, len);
- c_str[len] = '\0';
- return c_str;
- }
- }
- return NULL;
-}
-
-static struct PP_Var
-pruby_str_to_var(volatile VALUE str)
-{
- if (!RB_TYPE_P(str, T_STRING)) {
- fprintf(stderr, "[BUG] Unexpected object type: %x\n", TYPE(str));
- exit(EXIT_FAILURE);
- }
-#ifdef PPB_VAR_INTERFACE_1_0
- if (var_interface != NULL) {
- return var_interface->VarFromUtf8(module_id, RSTRING_PTR(str), RSTRING_LEN(str));
- }
-#else
- return var_interface->VarFromUtf8(RSTRING_PTR(str), RSTRING_LEN(str));
-#endif
- return PP_MakeUndefined();
-}
-
-static struct PP_Var
-pruby_obj_to_var(volatile VALUE obj)
-{
- static const char* const error =
- "throw 'Failed to convert the result to a JavaScript object';";
- int state;
- obj = rb_protect(&rb_obj_as_string, obj, &state);
- if (!state) {
- return pruby_str_to_var(obj);
- }
- else {
- return pruby_cstr_to_var(error);
- }
-}
-
-int
-pruby_var_equal_to_cstr_p(struct PP_Var lhs, const char* rhs)
-{
- uint32_t len = 0;
- if (var_interface == NULL) {
- return 0;
- }
- else {
- const char* const cstr = var_interface->VarToUtf8(lhs, &len);
- return strncmp(cstr, rhs, len) == 0;
- }
-}
-
-int
-pruby_var_prefixed_p(struct PP_Var var, const char* prefix)
-{
- uint32_t len = 0;
- if (var_interface == NULL) {
- return 0;
- }
- else {
- const char* const cstr = var_interface->VarToUtf8(var, &len);
- const size_t prefix_len = strlen(prefix);
- return len >= prefix_len && memcmp(cstr, prefix, len) == 0;
- }
-}
-
-
-/******************************************************************************
- * Messaging
- ******************************************************************************/
-
-/* Posts the given C string as a message.
- * @param data pointer to a NULL-terminated string */
-void
-pruby_post_cstr(void* data)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- const char* const msg = (const char*)instance->async_call_args;
- messaging_interface->PostMessage(instance->instance,
- pruby_cstr_to_var(msg));
-}
-
-/* Posts the given Ruby VALUE as a message.
- * @param data a VALUE casted to void* */
-void
-pruby_post_value(void* data)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- volatile VALUE value = (VALUE)instance->async_call_args;
- messaging_interface->PostMessage(instance->instance, pruby_obj_to_var(value));
-}
-
-
-
-/******************************************************************************
- * Ruby initialization
- ******************************************************************************/
-
-static void
-init_loadpath(void)
-{
- ruby_incpush("lib/ruby/"RUBY_LIB_VERSION);
- ruby_incpush("lib/ruby/"RUBY_LIB_VERSION"/"RUBY_PLATFORM);
- ruby_incpush(".");
-}
-
-static VALUE
-init_libraries_internal(VALUE unused)
-{
- extern void Init_enc();
- extern void Init_ext();
-
- init_loadpath();
- Init_enc();
- Init_ext();
- return Qnil;
-}
-
-static void*
-init_libraries(void* data)
-{
- int state;
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- current_instance = instance->instance;
-
- if (pthread_mutex_lock(&instance->mutex)) {
- perror("pepper-ruby:pthread_mutex_lock");
- return 0;
- }
- rb_protect(&init_libraries_internal, Qnil, &state);
- pthread_mutex_unlock(&instance->mutex);
-
- if (state) {
- volatile VALUE err = rb_errinfo();
- err = rb_obj_as_string(err);
- } else {
- instance->async_call_args = (void*)"rubyReady";
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(pruby_post_cstr, instance), 0);
- }
- return NULL;
-}
-
-static int
-init_libraries_if_necessary(void)
-{
- static int initialized = 0;
- if (!initialized) {
- struct PepperInstance* const instance = GET_PEPPER_INSTANCE();
- int err;
- initialized = 1;
- err = pthread_create(&instance->th, NULL, &init_libraries, instance);
- if (err) {
- fprintf(stderr, "pepper_ruby:pthread_create: %s\n", strerror(err));
- exit(EXIT_FAILURE);
- }
- pthread_detach(instance->th);
- }
- return 0;
-}
-
-static int
-pruby_init(void)
-{
- RUBY_INIT_STACK;
- ruby_init();
-
- instance_table = rb_hash_new();
- rb_gc_register_mark_object(instance_table);
-
- return 0;
-}
-
-
-/******************************************************************************
- * Ruby evaluation
- ******************************************************************************/
-
-static void*
-pruby_eval(void* data)
-{
- extern VALUE ruby_eval_string_from_file_protect(const char* src, const char* path, int* state);
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- volatile VALUE src = (VALUE)instance->async_call_args;
- volatile VALUE result = Qnil;
- volatile int state;
-
- RUBY_INIT_STACK;
-
- if (pthread_mutex_lock(&instance->mutex)) {
- perror("pepper-ruby:pthread_mutex_lock");
- return 0;
- }
- result = ruby_eval_string_from_file_protect(
- RSTRING_PTR(src), "(pepper-ruby)", &state);
- pthread_mutex_unlock(&instance->mutex);
-
- if (!state) {
- instance->async_call_args =
- rb_str_concat(rb_usascii_str_new_cstr("return:"),
- rb_obj_as_string(result));
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(pruby_post_value, instance), 0);
- return NULL;
- }
- else {
- rb_set_errinfo(Qnil);
- instance->async_call_args =
- rb_str_concat(rb_usascii_str_new_cstr("error:"),
- rb_obj_as_string(result));
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(pruby_post_value, instance), 0);
- return NULL;
- }
-}
-
-
-/******************************************************************************
- * Pepper Module callbacks
- ******************************************************************************/
-
-/**
- * Called when the NaCl module is instantiated on the web page. The identifier
- * of the new instance will be passed in as the first argument (this value is
- * generated by the browser and is an opaque handle). This is called for each
- * instantiation of the NaCl module, which is each time the <embed> tag for
- * this module is encountered.
- *
- * If this function reports a failure (by returning @a PP_FALSE), the NaCl
- * module will be deleted and DidDestroy will be called.
- * @param[in] instance The identifier of the new instance representing this
- * NaCl module.
- * @param[in] argc The number of arguments contained in @a argn and @a argv.
- * @param[in] argn An array of argument names. These argument names are
- * supplied in the <embed> tag, for example:
- * <embed id="nacl_module" dimensions="2">
- * will produce two arguments, one named "id" and one named "dimensions".
- * @param[in] argv An array of argument values. These are the values of the
- * arguments listed in the <embed> tag. In the above example, there will
- * be two elements in this array, "nacl_module" and "2". The indices of
- * these values match the indices of the corresponding names in @a argn.
- * @return @a PP_TRUE on success.
- */
-static PP_Bool
-Instance_DidCreate(PP_Instance instance,
- uint32_t argc, const char* argn[], const char* argv[])
-{
- struct PepperInstance* data = pruby_register_instance(instance);
- current_instance = instance;
- return init_libraries_if_necessary() ? PP_FALSE : PP_TRUE;
-}
-
-/**
- * Called when the NaCl module is destroyed. This will always be called,
- * even if DidCreate returned failure. This routine should deallocate any data
- * associated with the instance.
- * @param[in] instance The identifier of the instance representing this NaCl
- * module.
- */
-static void Instance_DidDestroy(PP_Instance instance) {
- struct PepperInstance* data = pruby_get_instance(instance);
- core_interface->ReleaseResource(data->url_loader);
- pruby_unregister_instance(instance);
-}
-
-/**
- * Called when the position, the size, or the clip rect of the element in the
- * browser that corresponds to this NaCl module has changed.
- * @param[in] instance The identifier of the instance representing this NaCl
- * module.
- * @param[in] position The location on the page of this NaCl module. This is
- * relative to the top left corner of the viewport, which changes as the
- * page is scrolled.
- * @param[in] clip The visible region of the NaCl module. This is relative to
- * the top left of the plugin's coordinate system (not the page). If the
- * plugin is invisible, @a clip will be (0, 0, 0, 0).
- */
-#ifdef PPP_INSTANCE_INTERFACE_1_0
-static void
-Instance_DidChangeView(PP_Instance instance,
- const struct PP_Rect* position,
- const struct PP_Rect* clip)
-{
-}
-#else
-static void
-Instance_DidChangeView(PP_Instance instance, PP_Resource view_resource)
-{
-}
-#endif
-
-/**
- * Notification that the given NaCl module has gained or lost focus.
- * Having focus means that keyboard events will be sent to the NaCl module
- * represented by @a instance. A NaCl module's default condition is that it
- * will not have focus.
- *
- * Note: clicks on NaCl modules will give focus only if you handle the
- * click event. You signal if you handled it by returning @a true from
- * HandleInputEvent. Otherwise the browser will bubble the event and give
- * focus to the element on the page that actually did end up consuming it.
- * If you're not getting focus, check to make sure you're returning true from
- * the mouse click in HandleInputEvent.
- * @param[in] instance The identifier of the instance representing this NaCl
- * module.
- * @param[in] has_focus Indicates whether this NaCl module gained or lost
- * event focus.
- */
-static void
-Instance_DidChangeFocus(PP_Instance instance, PP_Bool has_focus)
-{
-}
-
-/**
- * Handler that gets called after a full-frame module is instantiated based on
- * registered MIME types. This function is not called on NaCl modules. This
- * function is essentially a place-holder for the required function pointer in
- * the PPP_Instance structure.
- * @param[in] instance The identifier of the instance representing this NaCl
- * module.
- * @param[in] url_loader A PP_Resource an open PPB_URLLoader instance.
- * @return PP_FALSE.
- */
-static PP_Bool
-Instance_HandleDocumentLoad(PP_Instance instance, PP_Resource url_loader)
-{
- /* NaCl modules do not need to handle the document load function. */
- return PP_FALSE;
-}
-
-
-/**
- * Handler for messages coming in from the browser via postMessage. The
- * @a var_message can contain anything: a JSON string; a string that encodes
- * method names and arguments; etc. For example, you could use JSON.stringify
- * in the browser to create a message that contains a method name and some
- * parameters, something like this:
- * var json_message = JSON.stringify({ "myMethod" : "3.14159" });
- * nacl_module.postMessage(json_message);
- * On receipt of this message in @a var_message, you could parse the JSON to
- * retrieve the method name, match it to a function call, and then call it with
- * the parameter.
- * @param[in] instance The instance ID.
- * @param[in] message The contents, copied by value, of the message sent from
- * browser via postMessage.
- */
-void
-Messaging_HandleMessage(PP_Instance instance, struct PP_Var var_message)
-{
- char* const message = pruby_var_to_cstr(var_message);
- size_t message_len = strlen(message);
- current_instance = instance;
-
- if (strstr(message, "eval:") != NULL) {
- volatile VALUE src;
- struct PepperInstance* const instance_data = GET_PEPPER_INSTANCE();
- int err;
-#define EVAL_PREFIX_LEN 5
- src = rb_str_new(message + EVAL_PREFIX_LEN, message_len - EVAL_PREFIX_LEN);
- instance_data->async_call_args = (void*)src;
- err = pthread_create(&instance_data->th, NULL, &pruby_eval, instance_data);
- if (err) {
- fprintf(stderr, "pepper_ruby:pthread_create: %s\n", strerror(err));
- exit(EXIT_FAILURE);
- }
- pthread_detach(instance_data->th);
- }
- free(message);
-}
-
-/**
- * Entry points for the module.
- * Initialize instance interface and scriptable object class.
- * @param[in] a_module_id Module ID
- * @param[in] get_browser_interface Pointer to PPB_GetInterface
- * @return PP_OK on success, any other value on failure.
- */
-PP_EXPORT int32_t
-PPP_InitializeModule(PP_Module a_module_id, PPB_GetInterface get_browser_interface)
-{
- module_id = a_module_id;
- core_interface = (PPB_Core*)(get_browser_interface(PPB_CORE_INTERFACE));
- if (core_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- var_interface = (PPB_Var*)(get_browser_interface(PPB_VAR_INTERFACE));
- if (var_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- messaging_interface = (PPB_Messaging*)(get_browser_interface(PPB_MESSAGING_INTERFACE));
- if (messaging_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- loader_interface = (PPB_URLLoader*)(get_browser_interface(PPB_URLLOADER_INTERFACE));
- if (loader_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- request_interface = (PPB_URLRequestInfo*)(get_browser_interface(PPB_URLREQUESTINFO_INTERFACE));
- if (request_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- response_interface = (PPB_URLResponseInfo*)(get_browser_interface(PPB_URLRESPONSEINFO_INTERFACE));
- if (response_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- fileref_interface = (PPB_FileRef*)(get_browser_interface(PPB_FILEREF_INTERFACE));
- if (fileref_interface == NULL) return PP_ERROR_NOINTERFACE;
-
- return pruby_init() ? PP_ERROR_FAILED : PP_OK;
-}
-
-/**
- * Returns an interface pointer for the interface of the given name, or NULL
- * if the interface is not supported.
- * @param[in] interface_name name of the interface
- * @return pointer to the interface
- */
-PP_EXPORT const void*
-PPP_GetInterface(const char* interface_name)
-{
- if (strcmp(interface_name, PPP_INSTANCE_INTERFACE) == 0) {
- static PPP_Instance instance_interface = {
- &Instance_DidCreate,
- &Instance_DidDestroy,
- &Instance_DidChangeView,
- &Instance_DidChangeFocus,
- &Instance_HandleDocumentLoad
- };
- return &instance_interface;
- } else if (strcmp(interface_name, PPP_MESSAGING_INTERFACE) == 0) {
- static PPP_Messaging messaging_interface = {
- &Messaging_HandleMessage
- };
- return &messaging_interface;
- }
- return NULL;
-}
-
-/**
- * Called before the plugin module is unloaded.
- */
-PP_EXPORT void
-PPP_ShutdownModule()
-{
- ruby_cleanup(0);
-}
-
-/******************************************************************************
- * Overwrites rb_file_load_ok
- ******************************************************************************/
-
-static void
-load_ok_internal(void* data, int32_t unused)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- const char *const path = (const char*)instance->async_call_args;
- PP_Resource req;
- int result;
-
- instance->url_loader = loader_interface->Create(instance->instance);
- req = request_interface->Create(instance->instance);
- request_interface->SetProperty(
- req, PP_URLREQUESTPROPERTY_METHOD, pruby_cstr_to_var("HEAD"));
- request_interface->SetProperty(
- req, PP_URLREQUESTPROPERTY_URL, pruby_cstr_to_var(path));
-
- result = loader_interface->Open(
- instance->url_loader, req,
- PP_MakeCompletionCallback(pruby_async_return_int, instance));
- if (result != PP_OK_COMPLETIONPENDING) {
- pruby_async_return_int(instance, result);
- }
-}
-
-static void
-pruby_file_fetch_check_response(void* data, int32_t unused)
-{
- /* PPAPI main thread */
- PP_Resource res;
- struct PepperInstance* const instance = (struct PepperInstance*)data;
-
- res = loader_interface->GetResponseInfo(instance->url_loader);
- if (res) {
- struct PP_Var status =
- response_interface->GetProperty(res, PP_URLRESPONSEPROPERTY_STATUSCODE);
- if (status.type == PP_VARTYPE_INT32) {
- pruby_async_return_int(instance, status.value.as_int / 100 == 2 ? PP_OK : PP_ERROR_FAILED);
- return;
- }
- else {
- messaging_interface->PostMessage(
- instance->instance, pruby_cstr_to_var("Unexpected type: ResponseInfoInterface::GetProperty"));
- }
- }
- else {
- messaging_interface->PostMessage(
- instance->instance, pruby_cstr_to_var("Failed to open URL: URLLoaderInterface::GetResponseInfo"));
- }
- pruby_async_return_int(instance, PP_ERROR_FAILED);
-}
-
-
-int
-rb_file_load_ok(const char *path)
-{
- struct PepperInstance* const instance = GET_PEPPER_INSTANCE();
- if (path[0] == '.' && path[1] == '/') path += 2;
-
- instance->async_call_args = (void*)path;
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(load_ok_internal, instance), 0);
- if (pthread_cond_wait(&instance->cond, &instance->mutex)) {
- perror("pepper-ruby:pthread_cond_wait");
- return 0;
- }
- if (instance->async_call_result.as_int != PP_OK) {
- fprintf(stderr, "Failed to open URL: %d: %s\n",
- instance->async_call_result.as_int, path);
- return 0;
- }
-
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(pruby_file_fetch_check_response, instance), 0);
- if (pthread_cond_wait(&instance->cond, &instance->mutex)) {
- perror("pepper-ruby:pthread_cond_wait");
- return 0;
- }
- return instance->async_call_result.as_int == PP_OK;
-}
-
-/******************************************************************************
- * Overwrites rb_load_file
- ******************************************************************************/
-
-static void
-load_file_internal(void* data, int32_t unused)
-{
- /* PPAPI main thread */
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- const char *const path = (const char*)instance->async_call_args;
- PP_Resource req;
- int result;
-
- instance->url_loader = loader_interface->Create(instance->instance);
- req = request_interface->Create(instance->instance);
- request_interface->SetProperty(
- req, PP_URLREQUESTPROPERTY_METHOD, pruby_cstr_to_var("GET"));
- request_interface->SetProperty(
- req, PP_URLREQUESTPROPERTY_URL, pruby_cstr_to_var(path));
-
- result = loader_interface->Open(
- instance->url_loader, req,
- PP_MakeCompletionCallback(pruby_async_return_int, instance));
- if (result != PP_OK_COMPLETIONPENDING) {
- pruby_async_return_int(instance, result);
- }
-}
-
-static void
-load_file_read_contents_callback(void *data, int result)
-{
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- if (result > 0) {
- rb_str_buf_cat(instance->async_call_result.as_value,
- instance->buf, result);
- loader_interface->ReadResponseBody(
- instance->url_loader, instance->buf, 1000, PP_MakeCompletionCallback(load_file_read_contents_callback, instance));
- }
- else if (result == 0) {
- pruby_async_return_value(data, instance->async_call_result.as_value);
- }
- else {
- pruby_async_return_value(data, INT2FIX(result));
- }
-}
-
-static void
-load_file_read_contents(void *data, int result)
-{
- struct PepperInstance* const instance = (struct PepperInstance*)data;
- instance->async_call_result.as_value = rb_str_new(0, 0);
- loader_interface->ReadResponseBody(
- instance->url_loader, instance->buf, 1000, PP_MakeCompletionCallback(load_file_read_contents_callback, instance));
-}
-
-void*
-rb_load_file(const char *path)
-{
- const char *real_path;
- struct PepperInstance* instance;
- if (path[0] != '.' || path[1] != '/') path += 2;
-
- instance = GET_PEPPER_INSTANCE();
-
- instance->async_call_args = (void*)path;
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(load_file_internal, instance), 0);
- if (pthread_cond_wait(&instance->cond, &instance->mutex)) {
- perror("pepper-ruby:pthread_cond_wait");
- return 0;
- }
- if (instance->async_call_result.as_int != PP_OK) {
- fprintf(stderr, "Failed to open URL: %d: %s\n",
- instance->async_call_result.as_int, path);
- return 0;
- }
-
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(pruby_file_fetch_check_response, instance), 0);
- if (pthread_cond_wait(&instance->cond, &instance->mutex)) {
- perror("pepper-ruby:pthread_cond_wait");
- return 0;
- }
- if (instance->async_call_result.as_int != PP_OK) return 0;
-
- core_interface->CallOnMainThread(
- 0, PP_MakeCompletionCallback(load_file_read_contents, instance), 0);
- if (pthread_cond_wait(&instance->cond, &instance->mutex)) {
- perror("pepper-ruby:pthread_cond_wait");
- return 0;
- }
- if (FIXNUM_P(instance->async_call_result.as_value)) {
- return 0;
- }
- else if (RB_TYPE_P(instance->async_call_result.as_value, T_STRING)) {
- VALUE str = instance->async_call_result.as_value;
- extern void* rb_compile_cstr(const char *f, const char *s, int len, int line);
- return rb_compile_cstr(path, RSTRING_PTR(str), RSTRING_LEN(str), 0);
- }
- else {
- return 0;
- }
-}
diff --git a/nacl/resource.h b/nacl/resource.h
deleted file mode 100644
index 57ca53b093..0000000000
--- a/nacl/resource.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2011 Google Inc. All Rights Reserved.
- * Author: yugui@google.com (Yugui Sonoda)
- * */
-#ifndef RUBY_NACL_RESOURCE_H
-#define RUBY_NACL_RESOURCE_H
-int getrusage(int who, struct rusage *usage);
-#endif
diff --git a/nacl/select.h b/nacl/select.h
deleted file mode 100644
index 921721a2fd..0000000000
--- a/nacl/select.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
-// Author: yugui@google.com (Yugui Sonoda)
-#ifndef RUBY_NACL_SELECT_H
-#define RUBY_NACL_SELECT_H
-int select(int num_fds, fd_set *in_fds, fd_set *out_fds,
- fd_set *ex_fds, struct timeval *timeout);
-#endif
diff --git a/nacl/signal.h b/nacl/signal.h
deleted file mode 100644
index 54832de1fe..0000000000
--- a/nacl/signal.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
-// Author: yugui@google.com (Yugui Sonoda)
-#ifndef RUBY_NACL_SIGNAL_H
-#define RUBY_NACL_SIGNAL_H
-int kill(pid_t pid, int signal);
-#endif
diff --git a/nacl/stat.h b/nacl/stat.h
deleted file mode 100644
index 7be40ada7c..0000000000
--- a/nacl/stat.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2011 Google Inc. All Rights Reserved.
- * Author: yugui@google.com (Yugui Sonoda)
- * */
-#ifndef RUBY_NACL_STAT_H
-#define RUBY_NACL_STAT_H
-mode_t umask(mode_t mask);
-struct stat;
-int lstat(const char* path, struct stat* result);
-#endif
diff --git a/nacl/unistd.h b/nacl/unistd.h
deleted file mode 100644
index 1c97390c63..0000000000
--- a/nacl/unistd.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2012 Google Inc. All Rights Reserved.
-// Author: yugui@google.com (Yugui Sonoda)
-#ifndef RUBY_NACL_UNISTD_H
-#define RUBY_NACL_UNISTD_H
-int seteuid(pid_t pid);
-int setegid(pid_t pid);
-int truncate(const char* path, off_t new_size);
-int ftruncate(int fd, off_t new_size);
-#endif
diff --git a/nacl/utime.h b/nacl/utime.h
deleted file mode 100644
index 96910051e4..0000000000
--- a/nacl/utime.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright 2011 Google Inc. All Rights Reserved.
- * Author: yugui@google.com (Yugui Sonoda)
- */
-
-#ifndef RUBY_NACL_UTIME_H
-#define RUBY_NACL_UTIME_H
-#include <utime.h>
-int utime(const char *filename, const struct utimbuf *times);
-int utimes(const char *filename, const struct timeval times[2]);
-#endif
diff --git a/node.c b/node.c
index 472a959ef9..e7d3c4cd34 100644
--- a/node.c
+++ b/node.c
@@ -16,21 +16,21 @@
#define AR(str) rb_str_concat(buf, (str))
#define A_INDENT add_indent(buf, indent)
-#define A_ID(id) add_id(buf, (id))
-#define A_INT(val) rb_str_catf(buf, "%d", (val))
-#define A_LONG(val) rb_str_catf(buf, "%ld", (val))
+#define A_ID(id) add_id(buf, id)
+#define A_INT(val) rb_str_catf(buf, "%d", (val));
+#define A_LONG(val) rb_str_catf(buf, "%ld", (val));
#define A_LIT(lit) AR(rb_inspect(lit))
#define A_NODE_HEADER(node) \
rb_str_catf(buf, "@ %s (line: %d)", ruby_node_name(nd_type(node)), nd_line(node))
#define A_FIELD_HEADER(name) \
- rb_str_catf(buf, "+- %s:", (name))
+ rb_str_catf(buf, "+- %s:", name)
#define D_NULL_NODE A_INDENT; A("(null node)"); A("\n");
#define D_NODE_HEADER(node) A_INDENT; A_NODE_HEADER(node); A("\n");
#define COMPOUND_FIELD(name, name2, block) \
do { \
- A_INDENT; A_FIELD_HEADER(comment ? (name2) : (name)); A("\n"); \
+ A_INDENT; A_FIELD_HEADER(comment ? name2 : name); A("\n"); \
rb_str_cat2(indent, next_indent); \
block; \
rb_str_resize(indent, RSTRING_LEN(indent) - 4); \
@@ -38,7 +38,7 @@
#define SIMPLE_FIELD(name, name2, block) \
do { \
- A_INDENT; A_FIELD_HEADER(comment ? (name2) : (name)); A(" "); block; A("\n"); \
+ A_INDENT; A_FIELD_HEADER(comment ? name2 : name); A(" "); block; A("\n"); \
} while (0)
#define F_CUSTOM1(name, ann, block) SIMPLE_FIELD(#name, #name " (" ann ")", block)
@@ -77,7 +77,7 @@ add_id(VALUE buf, ID id)
else {
VALUE str = rb_id2str(id);
if (str) {
- A(":"); AR(str);
+ A(":"); AR(rb_id2str(id));
}
else {
A("(internal variable)");
@@ -501,7 +501,7 @@ dump_node(VALUE buf, VALUE indent, int comment, NODE *node)
F_CUSTOM1(nd_nth, "variable", {
char name[3];
name[0] = '$';
- name[1] = (char)node->nd_nth;
+ name[1] = node->nd_nth;
name[2] = '\0';
A(name);
});
@@ -823,15 +823,6 @@ dump_node(VALUE buf, VALUE indent, int comment, NODE *node)
F_NODE(nd_next, "next");
break;
- case NODE_KW_ARG:
- ANN("keyword arguments");
- ANN("format: def method_name([nd_body=some], [nd_next..])");
- ANN("example: def foo(a:1, b:2); end");
- F_NODE(nd_body, "body");
- LAST_NODE;
- F_NODE(nd_next, "next");
- break;
-
case NODE_POSTARG:
ANN("post arguments");
ANN("format: *[nd_1st], [nd_2nd..] = ..");
@@ -846,21 +837,52 @@ dump_node(VALUE buf, VALUE indent, int comment, NODE *node)
F_NODE(nd_2nd, "post arguments");
break;
+ case NODE_ARGS_AUX:
+ ANN("method parameters (cont'd)");
+ F_CUSTOM1(nd_rest, "rest argument", {
+ if (node->nd_rest == 1) A("nil (with last comma)");
+ else A_ID(node->nd_rest);
+ });
+ F_CUSTOM1(nd_body, "block argument", { A_ID((ID)node->nd_body); });
+ LAST_NODE;
+ F_CUSTOM2(nd_next, "aux info 2", {
+ node = node->nd_next;
+ next_indent = "| ";
+ if (!node) {
+ D_NULL_NODE;
+ }
+ else {
+ D_NODE_HEADER(node);
+ ANN("method parameters (cont'd)");
+ F_ID(nd_pid, "first post argument");
+ F_LONG(nd_plen, "post argument length");
+ LAST_NODE;
+ F_CUSTOM2(nd_next, "aux info 3", {
+ node = node->nd_next;
+ next_indent = "| ";
+ if (!node) {
+ D_NULL_NODE;
+ }
+ else {
+ D_NODE_HEADER(node);
+ ANN("method parameters (cont'd)");
+ F_NODE(nd_1st, "init arguments (m)");
+ LAST_NODE;
+ F_NODE(nd_2nd, "init arguments (p)");
+ }
+ });
+ }
+ });
+ break;
+
case NODE_ARGS:
ANN("method parameters");
ANN("format: def method_name(.., [nd_opt=some], *[nd_rest], [nd_pid], .., &[nd_body])");
ANN("example: def foo(a, b, opt1=1, opt2=2, *rest, y, z, &blk); end");
- F_INT(nd_ainfo->pre_args_num, "count of mandatory (pre-)arguments");
- F_NODE(nd_ainfo->pre_init, "initialization of (pre-)arguments");
- F_INT(nd_ainfo->post_args_num, "count of mandatory post-arguments");
- F_NODE(nd_ainfo->post_init, "initialization of post-arguments");
- F_ID(nd_ainfo->first_post_arg, "first post argument");
- F_ID(nd_ainfo->rest_arg, "rest argument");
- F_ID(nd_ainfo->block_arg, "block argument");
- F_NODE(nd_ainfo->opt_args, "optional arguments");
- LAST_NODE;
- F_NODE(nd_ainfo->kw_args, "keyword arguments");
- F_NODE(nd_ainfo->kw_rest_arg, "keyword rest argument");
+ F_LONG(nd_frml, "argc");
+ F_NODE(nd_next, "aux info 1");
+ LAST_NODE;
+ F_NODE(nd_opt, "optional arguments");
break;
case NODE_SCOPE:
diff --git a/node.h b/node.h
index d294fcc492..f8cf7de7b2 100644
--- a/node.h
+++ b/node.h
@@ -88,8 +88,6 @@ enum node_type {
#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND
NODE_OP_ASGN_OR,
#define NODE_OP_ASGN_OR NODE_OP_ASGN_OR
- NODE_OP_CDECL,
-#define NODE_OP_CDECL NODE_OP_CDECL
NODE_CALL,
#define NODE_CALL NODE_CALL
NODE_FCALL,
@@ -156,8 +154,6 @@ enum node_type {
#define NODE_ARGS_AUX NODE_ARGS_AUX
NODE_OPT_ARG,
#define NODE_OPT_ARG NODE_OPT_ARG
- NODE_KW_ARG,
-#define NODE_KW_ARG NODE_KW_ARG
NODE_POSTARG,
#define NODE_POSTARG NODE_POSTARG
NODE_ARGSCAT,
@@ -192,8 +188,6 @@ enum node_type {
#define NODE_COLON2 NODE_COLON2
NODE_COLON3,
#define NODE_COLON3 NODE_COLON3
- NODE_CREF,
-#define NODE_CREF NODE_CREF
NODE_DOT2,
#define NODE_DOT2 NODE_DOT2
NODE_DOT3,
@@ -232,13 +226,15 @@ enum node_type {
#define NODE_PRELUDE NODE_PRELUDE
NODE_LAMBDA,
#define NODE_LAMBDA NODE_LAMBDA
+ NODE_OPTBLOCK,
+#define NODE_OPTBLOCK NODE_OPTBLOCK
NODE_LAST
#define NODE_LAST NODE_LAST
};
typedef struct RNode {
- VALUE flags;
- VALUE nd_reserved; /* ex nd_file */
+ unsigned long flags;
+ char *nd_file;
union {
struct RNode *node;
ID id;
@@ -257,7 +253,6 @@ typedef struct RNode {
ID id;
long state;
struct rb_global_entry *entry;
- struct rb_args_info *args;
long cnt;
VALUE value;
} u3;
@@ -265,17 +260,16 @@ typedef struct RNode {
#define RNODE(obj) (R_CAST(RNode)(obj))
-/* 0..4:T_TYPES, 5:reserved, 6:NODE_FL_CREF_OMOD_SHARED, 7:NODE_FL_NEWLINE */
+/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */
#define NODE_FL_NEWLINE (((VALUE)1)<<7)
#define NODE_FL_CREF_PUSHED_BY_EVAL NODE_FL_NEWLINE
-#define NODE_FL_CREF_OMOD_SHARED (((VALUE)1)<<6)
#define NODE_TYPESHIFT 8
#define NODE_TYPEMASK (((VALUE)0x7f)<<NODE_TYPESHIFT)
#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
#define nd_set_type(n,t) \
- RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)(t))<<NODE_TYPESHIFT)&NODE_TYPEMASK))
+ RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|((((unsigned long)t)<<NODE_TYPESHIFT)&NODE_TYPEMASK))
#define NODE_LSHIFT (NODE_TYPESHIFT+7)
#define NODE_LMASK (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
@@ -283,8 +277,6 @@ typedef struct RNode {
#define nd_set_line(n,l) \
RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
-#define nd_refinements nd_reserved
-
#define nd_head u1.node
#define nd_alen u2.argc
#define nd_next u3.node
@@ -329,7 +321,6 @@ typedef struct RNode {
#define nd_recv u1.node
#define nd_mid u2.id
#define nd_args u3.node
-#define nd_ainfo u3.args
#define nd_noex u3.id
#define nd_defn u3.node
@@ -371,7 +362,7 @@ typedef struct RNode {
#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
#define NEW_ITER(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0)
-#define NEW_LAMBDA(a,b) NEW_NODE(NODE_LAMBDA,0,NEW_SCOPE(a,b),0)
+#define NEW_LAMBDA(a) NEW_NODE(NODE_LAMBDA,a,0,0)
#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
@@ -381,7 +372,7 @@ typedef struct RNode {
#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
-#define NEW_YIELD(a) NEW_NODE(NODE_YIELD,a,0,0)
+#define NEW_YIELD(a,s) NEW_NODE(NODE_YIELD,a,0,s)
#define NEW_LIST(a) NEW_ARRAY(a)
#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
@@ -401,7 +392,6 @@ typedef struct RNode {
#define NEW_OP_ASGN22(i,o) NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
-#define NEW_OP_CDECL(v,op,val) NEW_NODE(NODE_OP_CDECL,v,val,op)
#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,0)
#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
@@ -425,9 +415,9 @@ typedef struct RNode {
#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
+#define NEW_ARGS(m,o) NEW_NODE(NODE_ARGS,o,m,0)
#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0)
#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0)
-#define NEW_KW_ARG(i,v) NEW_NODE(NODE_KW_ARG,i,v,0)
#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0)
#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
@@ -443,7 +433,6 @@ typedef struct RNode {
#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b),0)
#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
-#define NEW_CREF(a) NEW_NODE(NODE_CREF,a,0,0)
#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
@@ -457,33 +446,15 @@ typedef struct RNode {
#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
#define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0)
-#define NEW_MEMO(a,b,c) NEW_NODE(NODE_MEMO,a,b,c)
-
-#define roomof(x, y) ((sizeof(x) + sizeof(y) - 1) / sizeof(y))
-#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value))
-#define NEW_MEMO_FOR(type, value) \
- (rb_ary_set_len(((value) = rb_ary_tmp_new(roomof(type, VALUE))), \
- roomof(type, VALUE)), \
- MEMO_FOR(type, value))
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
+#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0)
VALUE rb_parser_new(void);
VALUE rb_parser_end_seen_p(VALUE);
VALUE rb_parser_encoding(VALUE);
-VALUE rb_parser_get_yydebug(VALUE);
-VALUE rb_parser_set_yydebug(VALUE, VALUE);
-VALUE rb_parser_dump_tree(NODE *node, int comment);
-NODE *rb_parser_append_print(VALUE, NODE *);
-NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int);
NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int);
NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int);
-NODE *rb_parser_compile_string_path(volatile VALUE vparser, VALUE fname, VALUE src, int line);
-NODE *rb_parser_compile_file_path(volatile VALUE vparser, VALUE fname, VALUE input, int line);
NODE *rb_compile_cstr(const char*, const char*, int, int);
NODE *rb_compile_string(const char*, VALUE, int);
@@ -501,35 +472,6 @@ struct rb_global_entry *rb_global_entry(ID);
VALUE rb_gvar_get(struct rb_global_entry *);
VALUE rb_gvar_set(struct rb_global_entry *, VALUE);
VALUE rb_gvar_defined(struct rb_global_entry *);
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-
-struct rb_args_info {
- NODE *pre_init;
- NODE *post_init;
-
- int pre_args_num; /* count of mandatory pre-arguments */
- int post_args_num; /* count of mandatory post-arguments */
-
- ID first_post_arg;
-
- ID rest_arg;
- ID block_arg;
-
- NODE *kw_args;
- NODE *kw_rest_arg;
-
- NODE *opt_args;
-};
-
-struct parser_params;
-void *rb_parser_malloc(struct parser_params *, size_t);
-void *rb_parser_realloc(struct parser_params *, void *, size_t);
-void *rb_parser_calloc(struct parser_params *, size_t, size_t);
-void rb_parser_free(struct parser_params *, void *);
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
#if defined(__cplusplus)
#if 0
diff --git a/numeric.c b/numeric.c
index 95d8bc952e..40629f56b6 100644
--- a/numeric.c
+++ b/numeric.c
@@ -12,8 +12,6 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
#include "ruby/util.h"
-#include "internal.h"
-#include "id.h"
#include <ctype.h>
#include <math.h>
#include <stdio.h>
@@ -30,14 +28,6 @@
#include <ieeefp.h>
#endif
-#if !defined HAVE_ISFINITE && !defined isfinite
-#if defined HAVE_FINITE && !defined finite && !defined _WIN32
-extern int finite(double);
-# define HAVE_ISFINITE 1
-# define isfinite(x) finite(x)
-#endif
-#endif
-
/* use IEEE 64bit values if not defined */
#ifndef FLT_RADIX
#define FLT_RADIX 2
@@ -74,19 +64,21 @@ extern int finite(double);
#endif
#ifdef HAVE_INFINITY
-#elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
-const union bytesequence4_or_float rb_infinity = {{0x00, 0x00, 0x80, 0x7f}};
+#elif BYTE_ORDER == LITTLE_ENDIAN
+const unsigned char rb_infinity[] = "\x00\x00\x80\x7f";
#else
-const union bytesequence4_or_float rb_infinity = {{0x7f, 0x80, 0x00, 0x00}};
+const unsigned char rb_infinity[] = "\x7f\x80\x00\x00";
#endif
#ifdef HAVE_NAN
-#elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
-const union bytesequence4_or_float rb_nan = {{0x00, 0x00, 0xc0, 0x7f}};
+#elif BYTE_ORDER == LITTLE_ENDIAN
+const unsigned char rb_nan[] = "\x00\x00\xc0\x7f";
#else
-const union bytesequence4_or_float rb_nan = {{0x7f, 0xc0, 0x00, 0x00}};
+const unsigned char rb_nan[] = "\x7f\xc0\x00\x00";
#endif
+extern double round(double);
+
#ifndef HAVE_ROUND
double
round(double x)
@@ -109,7 +101,7 @@ static VALUE fix_uminus(VALUE num);
static VALUE fix_mul(VALUE x, VALUE y);
static VALUE int_pow(long x, unsigned long y);
-static ID id_coerce, id_to_i, id_eq, id_div;
+static ID id_coerce, id_to_i, id_eq;
VALUE rb_cNumeric;
VALUE rb_cFloat;
@@ -125,79 +117,6 @@ rb_num_zerodiv(void)
rb_raise(rb_eZeroDivError, "divided by 0");
}
-/* experimental API */
-int
-rb_num_to_uint(VALUE val, unsigned int *ret)
-{
-#define NUMERR_TYPE 1
-#define NUMERR_NEGATIVE 2
-#define NUMERR_TOOLARGE 3
- if (FIXNUM_P(val)) {
- long v = FIX2LONG(val);
-#if SIZEOF_INT < SIZEOF_LONG
- if (v > (long)UINT_MAX) return NUMERR_TOOLARGE;
-#endif
- if (v < 0) return NUMERR_NEGATIVE;
- *ret = (unsigned int)v;
- return 0;
- }
-
- switch (TYPE(val)) {
- case T_BIGNUM:
- if (RBIGNUM_NEGATIVE_P(val)) return NUMERR_NEGATIVE;
-#if SIZEOF_INT < SIZEOF_LONG
- /* long is 64bit */
- return NUMERR_TOOLARGE;
-#else
- /* long is 32bit */
-#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS)
- if (RBIGNUM_LEN(val) > DIGSPERLONG) return NUMERR_TOOLARGE;
- *ret = (unsigned int)rb_big2ulong((VALUE)val);
- return 0;
-#endif
- }
- return NUMERR_TYPE;
-}
-
-#define method_basic_p(klass) rb_method_basic_definition_p(klass, mid)
-
-static inline int
-positive_int_p(VALUE num)
-{
- const ID mid = '>';
-
- if (FIXNUM_P(num)) {
- if (method_basic_p(rb_cFixnum))
- return (SIGNED_VALUE)num > 0;
- }
- else if (RB_TYPE_P(num, T_BIGNUM)) {
- if (method_basic_p(rb_cBignum))
- return RBIGNUM_POSITIVE_P(num);
- }
- return RTEST(rb_funcall(num, mid, 1, INT2FIX(0)));
-}
-
-static inline int
-negative_int_p(VALUE num)
-{
- const ID mid = '<';
-
- if (FIXNUM_P(num)) {
- if (method_basic_p(rb_cFixnum))
- return (SIGNED_VALUE)num < 0;
- }
- else if (RB_TYPE_P(num, T_BIGNUM)) {
- if (method_basic_p(rb_cBignum))
- return RBIGNUM_NEGATIVE_P(num);
- }
- return RTEST(rb_funcall(num, mid, 1, INT2FIX(0)));
-}
-
-int
-rb_num_negative_p(VALUE num)
-{
- return negative_int_p(num);
-}
/*
* call-seq:
@@ -231,24 +150,16 @@ coerce_body(VALUE *x)
return rb_funcall(x[1], id_coerce, 1, x[0]);
}
-NORETURN(static void coerce_failed(VALUE x, VALUE y));
-static void
-coerce_failed(VALUE x, VALUE y)
-{
- if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
- y = rb_inspect(y);
- }
- else {
- y = rb_obj_class(y);
- }
- rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
- y, rb_obj_class(x));
-}
-
static VALUE
coerce_rescue(VALUE *x)
{
- coerce_failed(x[0], x[1]);
+ volatile VALUE v = rb_inspect(x[1]);
+
+ rb_raise(rb_eTypeError, "%s can't be coerced into %s",
+ rb_special_const_p(x[1])?
+ RSTRING_PTR(v):
+ rb_obj_classname(x[1]),
+ rb_obj_classname(x[0]));
return Qnil; /* dummy */
}
@@ -260,15 +171,8 @@ do_coerce(VALUE *x, VALUE *y, int err)
a[0] = *x; a[1] = *y;
- if (!rb_respond_to(*y, id_coerce)) {
- if (err) {
- coerce_rescue(a);
- }
- return FALSE;
- }
-
- ary = rb_rescue(coerce_body, (VALUE)a, err ? coerce_rescue : 0, (VALUE)a);
- if (!RB_TYPE_P(ary, T_ARRAY) || RARRAY_LEN(ary) != 2) {
+ ary = rb_rescue(coerce_body, (VALUE)a, err?coerce_rescue:0, (VALUE)a);
+ if (TYPE(ary) != T_ARRAY || RARRAY_LEN(ary) != 2) {
if (err) {
rb_raise(rb_eTypeError, "coerce must return [x, y]");
}
@@ -321,11 +225,10 @@ num_sadded(VALUE x, VALUE name)
/* Numerics should be values; singleton_methods should not be added to them */
rb_remove_method_id(rb_singleton_class(x), mid);
rb_raise(rb_eTypeError,
- "can't define singleton method \"%"PRIsVALUE"\" for %"PRIsVALUE,
- rb_id2str(mid),
- rb_obj_class(x));
-
- UNREACHABLE;
+ "can't define singleton method \"%s\" for %s",
+ rb_id2name(mid),
+ rb_obj_classname(x));
+ return Qnil; /* not reached */
}
/* :nodoc: */
@@ -333,9 +236,8 @@ static VALUE
num_init_copy(VALUE x, VALUE y)
{
/* Numerics are immutable values, which should not be copied */
- rb_raise(rb_eTypeError, "can't copy %"PRIsVALUE, rb_obj_class(x));
-
- UNREACHABLE;
+ rb_raise(rb_eTypeError, "can't copy %s", rb_obj_classname(x));
+ return Qnil; /* not reached */
}
/*
@@ -469,10 +371,10 @@ num_remainder(VALUE x, VALUE y)
VALUE z = rb_funcall(x, '%', 1, y);
if ((!rb_equal(z, INT2FIX(0))) &&
- ((negative_int_p(x) &&
- positive_int_p(y)) ||
- (positive_int_p(x) &&
- negative_int_p(y)))) {
+ ((RTEST(rb_funcall(x, '<', 1, INT2FIX(0))) &&
+ RTEST(rb_funcall(y, '>', 1, INT2FIX(0)))) ||
+ (RTEST(rb_funcall(x, '>', 1, INT2FIX(0))) &&
+ RTEST(rb_funcall(y, '<', 1, INT2FIX(0)))))) {
return rb_funcall(z, '-', 1, y);
}
return z;
@@ -543,10 +445,8 @@ num_real_p(VALUE num)
* call-seq:
* num.integer? -> true or false
*
- * Returns +true+ if +num+ is an Integer (including Fixnum and Bignum).
- *
- * (1.0).integer? #=> false
- * (1).integer? #=> true
+ * Returns <code>true</code> if <i>num</i> is an <code>Integer</code>
+ * (including <code>Fixnum</code> and <code>Bignum</code>).
*/
static VALUE
@@ -570,7 +470,7 @@ num_int_p(VALUE num)
static VALUE
num_abs(VALUE num)
{
- if (negative_int_p(num)) {
+ if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) {
return rb_funcall(num, rb_intern("-@"), 0);
}
return num;
@@ -619,11 +519,8 @@ num_nonzero_p(VALUE num)
* call-seq:
* num.to_int -> integer
*
- * Invokes the child class's +to_i+ method to convert +num+ to an integer.
- *
- * 1.0.class => Float
- * 1.0.to_int.class => Fixnum
- * 1.0.to_i.class => Fixnum
+ * Invokes the child class's <code>to_i</code> method to convert
+ * <i>num</i> to an integer.
*/
static VALUE
@@ -640,22 +537,15 @@ num_to_int(VALUE num)
* <code>Float</code> objects represent inexact real numbers using
* the native architecture's double-precision floating point
* representation.
- *
- * Floating point has a different arithmetic and is a inexact number.
- * So you should know its esoteric system. see following:
- *
- * - http://docs.sun.com/source/806-3568/ncg_goldberg.html
- * - http://wiki.github.com/rdp/ruby_tutorials_core/ruby-talk-faq#wiki-floats_imprecise
- * - http://en.wikipedia.org/wiki/Floating_point#Accuracy_problems
*/
VALUE
-rb_float_new_in_heap(double d)
+rb_float_new(double d)
{
- NEWOBJ_OF(flt, struct RFloat, rb_cFloat, T_FLOAT);
+ NEWOBJ(flt, struct RFloat);
+ OBJSETUP(flt, rb_cFloat, T_FLOAT);
flt->float_value = d;
- OBJ_FREEZE(flt);
return (VALUE)flt;
}
@@ -697,7 +587,7 @@ flo_to_s(VALUE flt)
buf[decpt] = '.';
rb_str_cat(s, buf, digs + 1);
}
- else if (decpt <= DBL_DIG) {
+ else if (decpt - digs < float_dig) {
long len;
char *ptr;
rb_str_cat(s, buf, digs);
@@ -739,15 +629,7 @@ flo_to_s(VALUE flt)
}
/*
- * call-seq:
- * flt.coerce(numeric) -> array
- *
- * Returns an array with both <i>aNumeric</i> and <i>flt</i> represented
- * as <code>Float</code> objects.
- * This is achieved by converting <i>aNumeric</i> to a <code>Float</code>.
- *
- * 1.2.coerce(3) #=> [3.0, 1.2]
- * 2.5.coerce(1.1) #=> [1.1, 2.5]
+ * MISSING: documentation
*/
static VALUE
@@ -885,18 +767,16 @@ flodivmod(double x, double y, double *divp, double *modp)
double div, mod;
if (y == 0.0) rb_num_zerodiv();
- if ((x == 0.0) || (isinf(y) && !isinf(x)))
- mod = x;
- else {
#ifdef HAVE_FMOD
- mod = fmod(x, y);
+ mod = fmod(x, y);
#else
+ {
double z;
modf(x/y, &z);
mod = x - z * y;
-#endif
}
+#endif
if (isinf(x) && !isinf(y) && !isnan(y))
div = x;
else
@@ -909,26 +789,13 @@ flodivmod(double x, double y, double *divp, double *modp)
if (divp) *divp = div;
}
-/*
- * Returns the modulo of division of x by y.
- * An error will be raised if y == 0.
- */
-
-double
-ruby_float_mod(double x, double y)
-{
- double mod;
- flodivmod(x, y, 0, &mod);
- return mod;
-}
-
/*
* call-seq:
- * float % other -> float
- * float.modulo(other) -> float
+ * flt % other -> float
+ * flt.modulo(other) -> float
*
- * Return the modulo after division of +float+ by +other+.
+ * Return the modulo after division of <code>flt</code> by <code>other</code>.
*
* 6543.21.modulo(137) #=> 104.21
* 6543.21.modulo(137.24) #=> 92.9299999999996
@@ -937,7 +804,7 @@ ruby_float_mod(double x, double y)
static VALUE
flo_mod(VALUE x, VALUE y)
{
- double fy;
+ double fy, mod;
switch (TYPE(y)) {
case T_FIXNUM:
@@ -952,14 +819,15 @@ flo_mod(VALUE x, VALUE y)
default:
return rb_num_coerce_bin(x, y, '%');
}
- return DBL2NUM(ruby_float_mod(RFLOAT_VALUE(x), fy));
+ flodivmod(RFLOAT_VALUE(x), fy, 0, &mod);
+ return DBL2NUM(mod);
}
static VALUE
dbl2ival(double d)
{
- d = round(d);
if (FIXABLE(d)) {
+ d = round(d);
return LONG2FIX((long)d);
}
return rb_dbl2big(d);
@@ -967,12 +835,9 @@ dbl2ival(double d)
/*
* call-seq:
- * float.divmod(numeric) -> array
- *
- * See Numeric#divmod.
+ * flt.divmod(numeric) -> array
*
- * 42.0.divmod 6 #=> [7, 0.0]
- * 42.0.divmod 5 #=> [8, 2.0]
+ * See <code>Numeric#divmod</code>.
*/
static VALUE
@@ -1053,10 +918,10 @@ num_eql(VALUE x, VALUE y)
/*
* call-seq:
- * number <=> other -> 0 or nil
+ * num <=> other -> 0 or nil
*
- * Returns zero if +number+ equals +other+, otherwise +nil+ is returned if the
- * two values are incomparable.
+ * Returns zero if <i>num</i> equals <i>other</i>, <code>nil</code>
+ * otherwise.
*/
static VALUE
@@ -1080,8 +945,6 @@ num_equal(VALUE x, VALUE y)
* Returns <code>true</code> only if <i>obj</i> has the same value
* as <i>flt</i>. Contrast this with <code>Float#eql?</code>, which
* requires <i>obj</i> to be a <code>Float</code>.
- * The result of <code>NaN == NaN</code> is undefined, so the
- * implementation-dependent value is returned.
*
* 1.0 == 1 #=> true
*
@@ -1094,8 +957,11 @@ flo_eq(VALUE x, VALUE y)
switch (TYPE(y)) {
case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
case T_BIGNUM:
- return rb_integer_float_eq(y, x);
+ b = rb_big2dbl(y);
+ break;
case T_FLOAT:
b = RFLOAT_VALUE(y);
#if defined(_MSC_VER) && _MSC_VER < 1300
@@ -1144,46 +1010,40 @@ rb_dbl_cmp(double a, double b)
/*
* call-seq:
- * float <=> real -> -1, 0, +1 or nil
- *
- * Returns -1, 0, +1 or nil depending on whether +float+ is less than, equal
- * to, or greater than +real+. This is the basis for the tests in Comparable.
- *
- * The result of <code>NaN <=> NaN</code> is undefined, so the
- * implementation-dependent value is returned.
+ * flt <=> real -> -1, 0, +1 or nil
*
- * +nil+ is returned if the two values are incomparable.
+ * Returns -1, 0, +1 or nil depending on whether <i>flt</i> is less
+ * than, equal to, or greater than <i>real</i>. This is the basis for
+ * the tests in <code>Comparable</code>.
*/
static VALUE
flo_cmp(VALUE x, VALUE y)
{
double a, b;
- VALUE i;
a = RFLOAT_VALUE(x);
if (isnan(a)) return Qnil;
switch (TYPE(y)) {
case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
case T_BIGNUM:
- {
- VALUE rel = rb_integer_float_cmp(y, x);
- if (FIXNUM_P(rel))
- return INT2FIX(-FIX2INT(rel));
- return rel;
- }
+ if (isinf(a)) {
+ if (a > 0.0) return INT2FIX(1);
+ else return INT2FIX(-1);
+ }
+ b = rb_big2dbl(y);
+ break;
case T_FLOAT:
b = RFLOAT_VALUE(y);
break;
default:
- if (isinf(a) && (i = rb_check_funcall(y, rb_intern("infinite?"), 0, 0)) != Qundef) {
- if (RTEST(i)) {
- int j = rb_cmpint(i, x, y);
- j = (a > 0.0) ? (j > 0 ? 0 : +1) : (j < 0 ? 0 : -1);
- return INT2FIX(j);
- }
+ if (isinf(a) && (!rb_respond_to(y, rb_intern("infinite?")) ||
+ !RTEST(rb_funcall(y, rb_intern("infinite?"), 0, 0)))) {
if (a > 0.0) return INT2FIX(1);
return INT2FIX(-1);
}
@@ -1197,8 +1057,6 @@ flo_cmp(VALUE x, VALUE y)
* flt > real -> true or false
*
* <code>true</code> if <code>flt</code> is greater than <code>real</code>.
- * The result of <code>NaN > NaN</code> is undefined, so the
- * implementation-dependent value is returned.
*/
static VALUE
@@ -1209,13 +1067,12 @@ flo_gt(VALUE x, VALUE y)
a = RFLOAT_VALUE(x);
switch (TYPE(y)) {
case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
case T_BIGNUM:
- {
- VALUE rel = rb_integer_float_cmp(y, x);
- if (FIXNUM_P(rel))
- return -FIX2INT(rel) > 0 ? Qtrue : Qfalse;
- return Qfalse;
- }
+ b = rb_big2dbl(y);
+ break;
case T_FLOAT:
b = RFLOAT_VALUE(y);
@@ -1239,8 +1096,6 @@ flo_gt(VALUE x, VALUE y)
*
* <code>true</code> if <code>flt</code> is greater than
* or equal to <code>real</code>.
- * The result of <code>NaN >= NaN</code> is undefined, so the
- * implementation-dependent value is returned.
*/
static VALUE
@@ -1251,13 +1106,12 @@ flo_ge(VALUE x, VALUE y)
a = RFLOAT_VALUE(x);
switch (TYPE(y)) {
case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
case T_BIGNUM:
- {
- VALUE rel = rb_integer_float_cmp(y, x);
- if (FIXNUM_P(rel))
- return -FIX2INT(rel) >= 0 ? Qtrue : Qfalse;
- return Qfalse;
- }
+ b = rb_big2dbl(y);
+ break;
case T_FLOAT:
b = RFLOAT_VALUE(y);
@@ -1280,8 +1134,6 @@ flo_ge(VALUE x, VALUE y)
* flt < real -> true or false
*
* <code>true</code> if <code>flt</code> is less than <code>real</code>.
- * The result of <code>NaN < NaN</code> is undefined, so the
- * implementation-dependent value is returned.
*/
static VALUE
@@ -1292,13 +1144,12 @@ flo_lt(VALUE x, VALUE y)
a = RFLOAT_VALUE(x);
switch (TYPE(y)) {
case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
case T_BIGNUM:
- {
- VALUE rel = rb_integer_float_cmp(y, x);
- if (FIXNUM_P(rel))
- return -FIX2INT(rel) < 0 ? Qtrue : Qfalse;
- return Qfalse;
- }
+ b = rb_big2dbl(y);
+ break;
case T_FLOAT:
b = RFLOAT_VALUE(y);
@@ -1322,8 +1173,6 @@ flo_lt(VALUE x, VALUE y)
*
* <code>true</code> if <code>flt</code> is less than
* or equal to <code>real</code>.
- * The result of <code>NaN <= NaN</code> is undefined, so the
- * implementation-dependent value is returned.
*/
static VALUE
@@ -1334,13 +1183,12 @@ flo_le(VALUE x, VALUE y)
a = RFLOAT_VALUE(x);
switch (TYPE(y)) {
case T_FIXNUM:
+ b = (double)FIX2LONG(y);
+ break;
+
case T_BIGNUM:
- {
- VALUE rel = rb_integer_float_cmp(y, x);
- if (FIXNUM_P(rel))
- return -FIX2INT(rel) <= 0 ? Qtrue : Qfalse;
- return Qfalse;
- }
+ b = rb_big2dbl(y);
+ break;
case T_FLOAT:
b = RFLOAT_VALUE(y);
@@ -1365,8 +1213,6 @@ flo_le(VALUE x, VALUE y)
* Returns <code>true</code> only if <i>obj</i> is a
* <code>Float</code> with the same value as <i>flt</i>. Contrast this
* with <code>Float#==</code>, which performs type conversions.
- * The result of <code>NaN.eql?(NaN)</code> is undefined, so the
- * implementation-dependent value is returned.
*
* 1.0.eql?(1) #=> false
*/
@@ -1374,7 +1220,7 @@ flo_le(VALUE x, VALUE y)
static VALUE
flo_eql(VALUE x, VALUE y)
{
- if (RB_TYPE_P(y, T_FLOAT)) {
+ if (TYPE(y) == T_FLOAT) {
double a = RFLOAT_VALUE(x);
double b = RFLOAT_VALUE(y);
#if defined(_MSC_VER) && _MSC_VER < 1300
@@ -1495,8 +1341,8 @@ flo_is_finite_p(VALUE num)
{
double value = RFLOAT_VALUE(num);
-#if HAVE_ISFINITE
- if (!isfinite(value))
+#if HAVE_FINITE
+ if (!finite(value))
return Qfalse;
#else
if (isinf(value) || isnan(value))
@@ -1558,48 +1404,6 @@ flo_ceil(VALUE num)
}
/*
- * Assumes num is an Integer, ndigits <= 0
- */
-static VALUE
-int_round_0(VALUE num, int ndigits)
-{
- VALUE n, f, h, r;
- long bytes;
- ID op;
- /* If 10**N / 2 > num, then return 0 */
- /* We have log_256(10) > 0.415241 and log_256(1/2) = -0.125, so */
- bytes = FIXNUM_P(num) ? sizeof(long) : rb_funcall(num, idSize, 0);
- if (-0.415241 * ndigits - 0.125 > bytes ) {
- return INT2FIX(0);
- }
-
- f = int_pow(10, -ndigits);
- if (FIXNUM_P(num) && FIXNUM_P(f)) {
- SIGNED_VALUE x = FIX2LONG(num), y = FIX2LONG(f);
- int neg = x < 0;
- if (neg) x = -x;
- x = (x + y / 2) / y * y;
- if (neg) x = -x;
- return LONG2NUM(x);
- }
- if (RB_TYPE_P(f, T_FLOAT)) {
- /* then int_pow overflow */
- return INT2FIX(0);
- }
- h = rb_funcall(f, '/', 1, INT2FIX(2));
- r = rb_funcall(num, '%', 1, f);
- n = rb_funcall(num, '-', 1, r);
- op = negative_int_p(num) ? rb_intern("<=") : '<';
- if (!RTEST(rb_funcall(r, op, 1, h))) {
- n = rb_funcall(n, '+', 1, f);
- }
- return n;
-}
-
-static VALUE
-flo_truncate(VALUE num);
-
-/*
* call-seq:
* flt.round([ndigits]) -> integer or float
*
@@ -1634,48 +1438,50 @@ flo_round(int argc, VALUE *argv, VALUE num)
{
VALUE nd;
double number, f;
- int ndigits = 0;
- int binexp;
- enum {float_dig = DBL_DIG+2};
+ int ndigits = 0, i;
+ long val;
if (argc > 0 && rb_scan_args(argc, argv, "01", &nd) == 1) {
ndigits = NUM2INT(nd);
}
- if (ndigits < 0) {
- return int_round_0(flo_truncate(num), ndigits);
- }
number = RFLOAT_VALUE(num);
- if (ndigits == 0) {
- return dbl2ival(number);
- }
- frexp(number, &binexp);
-
-/* Let `exp` be such that `number` is written as:"0.#{digits}e#{exp}",
- i.e. such that 10 ** (exp - 1) <= |number| < 10 ** exp
- Recall that up to float_dig digits can be needed to represent a double,
- so if ndigits + exp >= float_dig, the intermediate value (number * 10 ** ndigits)
- will be an integer and thus the result is the original number.
- If ndigits + exp <= 0, the result is 0 or "1e#{exp}", so
- if ndigits + exp < 0, the result is 0.
- We have:
- 2 ** (binexp-1) <= |number| < 2 ** binexp
- 10 ** ((binexp-1)/log_2(10)) <= |number| < 10 ** (binexp/log_2(10))
- If binexp >= 0, and since log_2(10) = 3.322259:
- 10 ** (binexp/4 - 1) < |number| < 10 ** (binexp/3)
- floor(binexp/4) <= exp <= ceil(binexp/3)
- If binexp <= 0, swap the /4 and the /3
- So if ndigits + floor(binexp/(4 or 3)) >= float_dig, the result is number
- If ndigits + ceil(binexp/(3 or 4)) < 0 the result is 0
-*/
- if (isinf(number) || isnan(number) ||
- (ndigits >= float_dig - (binexp > 0 ? binexp / 4 : binexp / 3 - 1))) {
- return num;
+ f = 1.0;
+ i = abs(ndigits);
+ while (--i >= 0)
+ f = f*10.0;
+
+ if (isinf(f)) {
+ if (ndigits < 0) number = 0;
}
- if (ndigits < - (binexp > 0 ? binexp / 3 + 1 : binexp / 4)) {
- return DBL2NUM(0);
+ else {
+ if (ndigits < 0) {
+ double absnum = fabs(number);
+ if (absnum < f) return INT2FIX(0);
+ if (!FIXABLE(number)) {
+ VALUE f10 = int_pow(10, -ndigits);
+ VALUE n10 = f10;
+ if (number < 0) {
+ extern VALUE rb_big_uminus(VALUE x);
+ f10 = FIXNUM_P(f10) ? fix_uminus(f10) : rb_big_uminus(f10);
+ }
+ num = rb_big_idiv(rb_dbl2big(absnum), n10);
+ return FIXNUM_P(num) ? fix_mul(num, f10) : rb_big_mul(num, f10);
+ }
+ number /= f;
+ }
+ else number *= f;
+ number = round(number);
+ if (ndigits < 0) number *= f;
+ else number /= f;
+ }
+
+ if (ndigits > 0) return DBL2NUM(number);
+
+ if (!FIXABLE(number)) {
+ return rb_dbl2big(number);
}
- f = pow(10, ndigits);
- return DBL2NUM(round(number * f) / f);
+ val = (long)number;
+ return LONG2FIX(val);
}
/*
@@ -1748,7 +1554,7 @@ num_ceil(VALUE num)
* num.round([ndigits]) -> integer or float
*
* Rounds <i>num</i> to a given precision in decimal digits (default 0 digits).
- * Precision may be negative. Returns a floating point number when <i>ndigits</i>
+ * Precision may be negative. Returns a floating point number when ndigits
* is more than zero. <code>Numeric</code> implements this by converting itself
* to a <code>Float</code> and invoking <code>Float#round</code>.
*/
@@ -1774,50 +1580,28 @@ num_truncate(VALUE num)
return flo_truncate(rb_Float(num));
}
-static double
-ruby_float_step_size(double beg, double end, double unit, int excl)
-{
- const double epsilon = DBL_EPSILON;
- double n = (end - beg)/unit;
- double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
-
- if (isinf(unit)) {
- return unit > 0 ? beg <= end : beg >= end;
- }
- if (err>0.5) err=0.5;
- if (excl) {
- if (n<=0) return 0;
- if (n<1)
- n = 0;
- else
- n = floor(n - err);
- }
- else {
- if (n<0) return 0;
- n = floor(n + err);
- }
- return n+1;
-}
int
ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
{
- if (RB_TYPE_P(from, T_FLOAT) || RB_TYPE_P(to, T_FLOAT) || RB_TYPE_P(step, T_FLOAT)) {
+ if (TYPE(from) == T_FLOAT || TYPE(to) == T_FLOAT || TYPE(step) == T_FLOAT) {
+ const double epsilon = DBL_EPSILON;
double beg = NUM2DBL(from);
double end = NUM2DBL(to);
double unit = NUM2DBL(step);
- double n = ruby_float_step_size(beg, end, unit, excl);
+ double n = (end - beg)/unit;
+ double err = (fabs(beg) + fabs(end) + fabs(end-beg)) / fabs(unit) * epsilon;
long i;
if (isinf(unit)) {
- /* if unit is infinity, i*unit+beg is NaN */
- if (n) rb_yield(DBL2NUM(beg));
+ if (unit > 0 ? beg <= end : beg >= end) rb_yield(DBL2NUM(beg));
}
else {
+ if (err>0.5) err=0.5;
+ n = floor(n + err);
+ if (!excl || ((long)n)*unit+beg < end) n++;
for (i=0; i<n; i++) {
- double d = i*unit+beg;
- if (unit >= 0 ? end < d : d < end) d = end;
- rb_yield(DBL2NUM(d));
+ rb_yield(DBL2NUM(i*unit+beg));
}
}
return TRUE;
@@ -1825,53 +1609,6 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
return FALSE;
}
-VALUE
-num_interval_step_size(VALUE from, VALUE to, VALUE step, int excl)
-{
- if (FIXNUM_P(from) && FIXNUM_P(to) && FIXNUM_P(step)) {
- long delta, diff;
-
- diff = FIX2LONG(step);
- if (!diff) rb_num_zerodiv();
- delta = FIX2LONG(to) - FIX2LONG(from);
- if (diff < 0) {
- diff = -diff;
- delta = -delta;
- }
- if (excl) {
- delta--;
- }
- if (delta < 0) {
- return INT2FIX(0);
- }
- return ULONG2NUM(delta / diff + 1UL);
- }
- else if (RB_TYPE_P(from, T_FLOAT) || RB_TYPE_P(to, T_FLOAT) || RB_TYPE_P(step, T_FLOAT)) {
- double n = ruby_float_step_size(NUM2DBL(from), NUM2DBL(to), NUM2DBL(step), excl);
-
- if (isinf(n)) return DBL2NUM(n);
- if (POSFIXABLE(n)) return LONG2FIX(n);
- return rb_dbl2big(n);
- }
- else {
- VALUE result;
- ID cmp = RTEST(rb_funcall(step, '>', 1, INT2FIX(0))) ? '>' : '<';
- if (RTEST(rb_funcall(from, cmp, 1, to))) return INT2FIX(0);
- result = rb_funcall(rb_funcall(to, '-', 1, from), id_div, 1, step);
- if (!excl || RTEST(rb_funcall(rb_funcall(from, '+', 1, rb_funcall(result, '*', 1, step)), cmp, 1, to))) {
- result = rb_funcall(result, '+', 1, INT2FIX(1));
- }
- return result;
- }
-}
-
-static VALUE
-num_step_size(VALUE from, VALUE args)
-{
- VALUE to = RARRAY_PTR(args)[0];
- VALUE step = (RARRAY_LEN(args) > 1) ? RARRAY_PTR(args)[1] : INT2FIX(1);
- return num_interval_step_size(from, to, step, FALSE);
-}
/*
* call-seq:
* num.step(limit[, step]) {|i| block } -> self
@@ -1907,15 +1644,19 @@ num_step(int argc, VALUE *argv, VALUE from)
{
VALUE to, step;
- RETURN_SIZED_ENUMERATOR(from, argc, argv, num_step_size);
+ RETURN_ENUMERATOR(from, argc, argv);
if (argc == 1) {
to = argv[0];
step = INT2FIX(1);
}
else {
- rb_check_arity(argc, 1, 2);
- to = argv[0];
- step = argv[1];
+ if (argc == 2) {
+ to = argv[0];
+ step = argv[1];
+ }
+ else {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+ }
if (rb_equal(step, INT2FIX(0))) {
rb_raise(rb_eArgError, "step can't be 0");
}
@@ -1945,7 +1686,7 @@ num_step(int argc, VALUE *argv, VALUE from)
VALUE i = from;
ID cmp;
- if (positive_int_p(step)) {
+ if (RTEST(rb_funcall(step, '>', 1, INT2FIX(0)))) {
cmp = '>';
}
else {
@@ -1960,10 +1701,6 @@ num_step(int argc, VALUE *argv, VALUE from)
return from;
}
-#define LONG_MIN_MINUS_ONE ((double)LONG_MIN-1)
-#define LONG_MAX_PLUS_ONE (2*(double)(LONG_MAX/2+1))
-#define ULONG_MAX_PLUS_ONE (2*(double)(ULONG_MAX/2+1))
-
SIGNED_VALUE
rb_num2long(VALUE val)
{
@@ -1976,8 +1713,8 @@ rb_num2long(VALUE val)
switch (TYPE(val)) {
case T_FLOAT:
- if (RFLOAT_VALUE(val) < LONG_MAX_PLUS_ONE
- && RFLOAT_VALUE(val) > LONG_MIN_MINUS_ONE) {
+ if (RFLOAT_VALUE(val) <= (double)LONG_MAX
+ && RFLOAT_VALUE(val) >= (double)LONG_MIN) {
return (SIGNED_VALUE)(RFLOAT_VALUE(val));
}
else {
@@ -2010,8 +1747,8 @@ rb_num2ulong(VALUE val)
switch (TYPE(val)) {
case T_FLOAT:
- if (RFLOAT_VALUE(val) < ULONG_MAX_PLUS_ONE
- && RFLOAT_VALUE(val) > LONG_MIN_MINUS_ONE) {
+ if (RFLOAT_VALUE(val) <= (double)LONG_MAX
+ && RFLOAT_VALUE(val) >= (double)LONG_MIN) {
return (VALUE)RFLOAT_VALUE(val);
}
else {
@@ -2049,15 +1786,14 @@ check_int(SIGNED_VALUE num)
}
static void
-check_uint(VALUE num, int sign)
+check_uint(VALUE num, VALUE sign)
{
static const VALUE mask = ~(VALUE)UINT_MAX;
- if (sign) {
+ if (RTEST(sign)) {
/* minus */
- if ((num & mask) != mask || (num & ~mask) <= INT_MAX)
-#define VALUE_MSBMASK ((VALUE)1 << ((sizeof(VALUE) * CHAR_BIT) - 1))
- rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned int'", num|VALUE_MSBMASK);
+ if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)
+ rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned int'", num);
}
else {
/* plus */
@@ -2087,10 +1823,10 @@ rb_fix2int(VALUE val)
unsigned long
rb_num2uint(VALUE val)
{
- VALUE num = rb_num2ulong(val);
+ unsigned long num = rb_num2ulong(val);
- check_uint(num, negative_int_p(val));
- return (unsigned long)num;
+ check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
+ return num;
}
unsigned long
@@ -2103,7 +1839,7 @@ rb_fix2uint(VALUE val)
}
num = FIX2ULONG(val);
- check_uint(num, negative_int_p(val));
+ check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num;
}
#else
@@ -2120,84 +1856,10 @@ rb_fix2int(VALUE val)
}
#endif
-void
-rb_out_of_short(SIGNED_VALUE num)
-{
- rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `short'",
- num, num < 0 ? "small" : "big");
-}
-
-static void
-check_short(SIGNED_VALUE num)
-{
- if ((SIGNED_VALUE)(short)num != num) {
- rb_out_of_short(num);
- }
-}
-
-static void
-check_ushort(VALUE num, int sign)
-{
- static const VALUE mask = ~(VALUE)USHRT_MAX;
-
- if (sign) {
- /* minus */
- if ((num & mask) != mask || (num & ~mask) <= SHRT_MAX)
-#define VALUE_MSBMASK ((VALUE)1 << ((sizeof(VALUE) * CHAR_BIT) - 1))
- rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too small to convert to `unsigned short'", num|VALUE_MSBMASK);
- }
- else {
- /* plus */
- if ((num & mask) != 0)
- rb_raise(rb_eRangeError, "integer %"PRIuVALUE " too big to convert to `unsigned short'", num);
- }
-}
-
-short
-rb_num2short(VALUE val)
-{
- long num = rb_num2long(val);
-
- check_short(num);
- return num;
-}
-
-short
-rb_fix2short(VALUE val)
-{
- long num = FIXNUM_P(val)?FIX2LONG(val):rb_num2long(val);
-
- check_short(num);
- return num;
-}
-
-unsigned short
-rb_num2ushort(VALUE val)
-{
- VALUE num = rb_num2ulong(val);
-
- check_ushort(num, negative_int_p(val));
- return (unsigned long)num;
-}
-
-unsigned short
-rb_fix2ushort(VALUE val)
-{
- unsigned long num;
-
- if (!FIXNUM_P(val)) {
- return rb_num2ushort(val);
- }
- num = FIX2ULONG(val);
-
- check_ushort(num, negative_int_p(val));
- return num;
-}
-
VALUE
rb_num2fix(VALUE val)
{
- SIGNED_VALUE v;
+ long v;
if (FIXNUM_P(val)) return val;
@@ -2209,13 +1871,6 @@ rb_num2fix(VALUE val)
#if HAVE_LONG_LONG
-#define LLONG_MIN_MINUS_ONE ((double)LLONG_MIN-1)
-#define LLONG_MAX_PLUS_ONE (2*(double)(LLONG_MAX/2+1))
-#define ULLONG_MAX_PLUS_ONE (2*(double)(ULLONG_MAX/2+1))
-#ifndef ULLONG_MAX
-#define ULLONG_MAX ((unsigned LONG_LONG)LLONG_MAX*2+1)
-#endif
-
LONG_LONG
rb_num2ll(VALUE val)
{
@@ -2227,8 +1882,8 @@ rb_num2ll(VALUE val)
switch (TYPE(val)) {
case T_FLOAT:
- if (RFLOAT_VALUE(val) < LLONG_MAX_PLUS_ONE
- && RFLOAT_VALUE(val) > LLONG_MIN_MINUS_ONE) {
+ if (RFLOAT_VALUE(val) <= (double)LLONG_MAX
+ && RFLOAT_VALUE(val) >= (double)LLONG_MIN) {
return (LONG_LONG)(RFLOAT_VALUE(val));
}
else {
@@ -2245,63 +1900,26 @@ rb_num2ll(VALUE val)
case T_STRING:
rb_raise(rb_eTypeError, "no implicit conversion from string");
- break;
+ return Qnil; /* not reached */
case T_TRUE:
case T_FALSE:
rb_raise(rb_eTypeError, "no implicit conversion from boolean");
- break;
+ return Qnil; /* not reached */
default:
- break;
+ val = rb_to_int(val);
+ return NUM2LL(val);
}
-
- val = rb_to_int(val);
- return NUM2LL(val);
}
unsigned LONG_LONG
rb_num2ull(VALUE val)
{
- switch (TYPE(val)) {
- case T_NIL:
- rb_raise(rb_eTypeError, "no implicit conversion from nil");
-
- case T_FIXNUM:
- return (LONG_LONG)FIX2LONG(val); /* this is FIX2LONG, inteneded */
-
- case T_FLOAT:
- if (RFLOAT_VALUE(val) < ULLONG_MAX_PLUS_ONE
- && RFLOAT_VALUE(val) > 0) {
- return (unsigned LONG_LONG)(RFLOAT_VALUE(val));
- }
- else {
- char buf[24];
- char *s;
-
- snprintf(buf, sizeof(buf), "%-.10g", RFLOAT_VALUE(val));
- if ((s = strchr(buf, ' ')) != 0) *s = '\0';
- rb_raise(rb_eRangeError, "float %s out of range of unsgined long long", buf);
- }
-
- case T_BIGNUM:
+ if (TYPE(val) == T_BIGNUM) {
return rb_big2ull(val);
-
- case T_STRING:
- rb_raise(rb_eTypeError, "no implicit conversion from string");
- break;
-
- case T_TRUE:
- case T_FALSE:
- rb_raise(rb_eTypeError, "no implicit conversion from boolean");
- break;
-
- default:
- break;
}
-
- val = rb_to_int(val);
- return NUM2ULL(val);
+ return (unsigned LONG_LONG)rb_num2ll(val);
}
#endif /* HAVE_LONG_LONG */
@@ -2314,12 +1932,14 @@ rb_num2ull(VALUE val)
*
*/
+
/*
* call-seq:
* int.to_i -> integer
* int.to_int -> integer
* int.floor -> integer
* int.ceil -> integer
+ * int.round -> integer
* int.truncate -> integer
*
* As <i>int</i> is already an <code>Integer</code>, all these
@@ -2406,8 +2026,8 @@ fix_succ(VALUE num)
* (-1).next #=> 0
*/
-VALUE
-rb_int_succ(VALUE num)
+static VALUE
+int_succ(VALUE num)
{
if (FIXNUM_P(num)) {
long i = FIX2LONG(num) + 1;
@@ -2416,8 +2036,6 @@ rb_int_succ(VALUE num)
return rb_funcall(num, '+', 1, INT2FIX(1));
}
-#define int_succ rb_int_succ
-
/*
* call-seq:
* int.pred -> integer
@@ -2428,8 +2046,8 @@ rb_int_succ(VALUE num)
* (-1).pred #=> -2
*/
-VALUE
-rb_int_pred(VALUE num)
+static VALUE
+int_pred(VALUE num)
{
if (FIXNUM_P(num)) {
long i = FIX2LONG(num) - 1;
@@ -2438,27 +2056,16 @@ rb_int_pred(VALUE num)
return rb_funcall(num, '-', 1, INT2FIX(1));
}
-#define int_pred rb_int_pred
-
VALUE
rb_enc_uint_chr(unsigned int code, rb_encoding *enc)
{
int n;
VALUE str;
- switch (n = rb_enc_codelen(code, enc)) {
- case ONIGERR_INVALID_CODE_POINT_VALUE:
- rb_raise(rb_eRangeError, "invalid codepoint 0x%X in %s", code, rb_enc_name(enc));
- break;
- case ONIGERR_TOO_BIG_WIDE_CHAR_VALUE:
- case 0:
- rb_raise(rb_eRangeError, "%u out of char range", code);
- break;
+ if ((n = rb_enc_codelen(code, enc)) <= 0) {
+ rb_raise(rb_eRangeError, "%d out of char range", code);
}
str = rb_enc_str_new(0, n, enc);
rb_enc_mbcput(code, RSTRING_PTR(str), enc);
- if (rb_enc_precise_mbclen(RSTRING_PTR(str), RSTRING_END(str), enc) != n) {
- rb_raise(rb_eRangeError, "invalid codepoint 0x%X in %s", code, rb_enc_name(enc));
- }
return str;
}
@@ -2478,25 +2085,18 @@ static VALUE
int_chr(int argc, VALUE *argv, VALUE num)
{
char c;
- unsigned int i;
+ unsigned int i = NUM2UINT(num);
rb_encoding *enc;
- if (rb_num_to_uint(num, &i) == 0) {
- }
- else if (FIXNUM_P(num)) {
- rb_raise(rb_eRangeError, "%ld out of char range", FIX2LONG(num));
- }
- else {
- rb_raise(rb_eRangeError, "bignum out of char range");
- }
-
switch (argc) {
case 0:
+ if (i < 0) {
+ out_of_range:
+ rb_raise(rb_eRangeError, "%d out of char range", i);
+ }
if (0xff < i) {
enc = rb_default_internal_encoding();
- if (!enc) {
- rb_raise(rb_eRangeError, "%d out of char range", i);
- }
+ if (!enc) goto out_of_range;
goto decode;
}
c = (char)i;
@@ -2509,7 +2109,7 @@ int_chr(int argc, VALUE *argv, VALUE num)
case 1:
break;
default:
- rb_check_arity(argc, 0, 1);
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
break;
}
enc = rb_to_encoding(argv[0]);
@@ -2532,7 +2132,8 @@ int_chr(int argc, VALUE *argv, VALUE num)
*/
static VALUE
-int_ord(VALUE num)
+int_ord(num)
+ VALUE num;
{
return num;
}
@@ -2721,6 +2322,7 @@ fix_mul(VALUE x, VALUE y)
#if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
LONG_LONG d;
#else
+ volatile long c;
VALUE r;
#endif
@@ -2734,11 +2336,13 @@ fix_mul(VALUE x, VALUE y)
#else
if (FIT_SQRT_LONG(a) && FIT_SQRT_LONG(b))
return LONG2FIX(a*b);
+ c = a * b;
+ r = LONG2FIX(c);
+
if (a == 0) return x;
- if (MUL_OVERFLOW_FIXNUM_P(a, b))
+ if (FIX2LONG(r) != c || c/a != b) {
r = rb_big_mul(rb_int2big(a), rb_int2big(b));
- else
- r = LONG2FIX(a * b);
+ }
return r;
#endif
}
@@ -2779,6 +2383,8 @@ fixdivmod(long x, long y, long *divp, long *modp)
if (modp) *modp = mod;
}
+VALUE rb_big_fdiv(VALUE x, VALUE y);
+
/*
* call-seq:
* fix.fdiv(numeric) -> float
@@ -2807,6 +2413,8 @@ fix_fdiv(VALUE x, VALUE y)
}
}
+VALUE rb_rational_reciprocal(VALUE x);
+
static VALUE
fix_divide(VALUE x, VALUE y, ID op)
{
@@ -2894,7 +2502,12 @@ fix_mod(VALUE x, VALUE y)
x = rb_int2big(FIX2LONG(x));
return rb_big_modulo(x, y);
case T_FLOAT:
- return DBL2NUM(ruby_float_mod((double)FIX2LONG(x), RFLOAT_VALUE(y)));
+ {
+ double mod;
+
+ flodivmod((double)FIX2LONG(x), RFLOAT_VALUE(y), 0, &mod);
+ return DBL2NUM(mod);
+ }
default:
return rb_num_coerce_bin(x, y, '%');
}
@@ -2960,10 +2573,11 @@ int_pow(long x, unsigned long y)
y >>= 1;
}
{
- if (MUL_OVERFLOW_FIXNUM_P(x, z)) {
+ volatile long xz = x * z;
+ if (!POSFIXABLE(xz) || xz / x != z) {
goto bignum;
}
- z = x * z;
+ z = xz;
}
} while (--y);
if (neg) z = -z;
@@ -2978,7 +2592,7 @@ int_pow(long x, unsigned long y)
* be negative or fractional.
*
* 2 ** 3 #=> 8
- * 2 ** -1 #=> (1/2)
+ * 2 ** -1 #=> 0.5
* 2 ** 0.5 #=> 1.4142135623731
*/
@@ -2990,13 +2604,6 @@ fix_pow(VALUE x, VALUE y)
if (FIXNUM_P(y)) {
long b = FIX2LONG(y);
- if (a == 1) return INT2FIX(1);
- if (a == -1) {
- if (b % 2 == 0)
- return INT2FIX(1);
- else
- return INT2FIX(-1);
- }
if (b < 0)
return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
@@ -3006,18 +2613,27 @@ fix_pow(VALUE x, VALUE y)
if (b > 0) return INT2FIX(0);
return DBL2NUM(INFINITY);
}
+ if (a == 1) return INT2FIX(1);
+ if (a == -1) {
+ if (b % 2 == 0)
+ return INT2FIX(1);
+ else
+ return INT2FIX(-1);
+ }
return int_pow(a, b);
}
switch (TYPE(y)) {
case T_BIGNUM:
+
+ if (rb_funcall(y, '<', 1, INT2FIX(0)))
+ return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
+
+ if (a == 0) return INT2FIX(0);
if (a == 1) return INT2FIX(1);
if (a == -1) {
if (int_even_p(y)) return INT2FIX(1);
else return INT2FIX(-1);
}
- if (negative_int_p(y))
- return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
- if (a == 0) return INT2FIX(0);
x = rb_int2big(FIX2LONG(x));
return rb_big_pow(x, y);
case T_FLOAT:
@@ -3057,7 +2673,7 @@ fix_equal(VALUE x, VALUE y)
case T_BIGNUM:
return rb_big_eq(y, x);
case T_FLOAT:
- return rb_integer_float_eq(x, y);
+ return (double)FIX2LONG(x) == RFLOAT_VALUE(y) ? Qtrue : Qfalse;
default:
return num_equal(x, y);
}
@@ -3067,11 +2683,10 @@ fix_equal(VALUE x, VALUE y)
* call-seq:
* fix <=> numeric -> -1, 0, +1 or nil
*
- * Comparison---Returns -1, 0, +1 or nil depending on whether +fix+ is less
- * than, equal to, or greater than +numeric+. This is the basis for the tests
- * in Comparable.
- *
- * +nil+ is returned if the two values are incomparable.
+ * Comparison---Returns -1, 0, +1 or nil depending on whether
+ * <i>fix</i> is less than, equal to, or greater than
+ * <i>numeric</i>. This is the basis for the tests in
+ * <code>Comparable</code>.
*/
static VALUE
@@ -3086,7 +2701,7 @@ fix_cmp(VALUE x, VALUE y)
case T_BIGNUM:
return rb_big_cmp(rb_int2big(FIX2LONG(x)), y);
case T_FLOAT:
- return rb_integer_float_cmp(x, y);
+ return rb_dbl_cmp((double)FIX2LONG(x), RFLOAT_VALUE(y));
default:
return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
}
@@ -3111,7 +2726,7 @@ fix_gt(VALUE x, VALUE y)
case T_BIGNUM:
return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) > 0 ? Qtrue : Qfalse;
case T_FLOAT:
- return rb_integer_float_cmp(x, y) == INT2FIX(1) ? Qtrue : Qfalse;
+ return (double)FIX2LONG(x) > RFLOAT_VALUE(y) ? Qtrue : Qfalse;
default:
return rb_num_coerce_relop(x, y, '>');
}
@@ -3136,10 +2751,7 @@ fix_ge(VALUE x, VALUE y)
case T_BIGNUM:
return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) >= 0 ? Qtrue : Qfalse;
case T_FLOAT:
- {
- VALUE rel = rb_integer_float_cmp(x, y);
- return rel == INT2FIX(1) || rel == INT2FIX(0) ? Qtrue : Qfalse;
- }
+ return (double)FIX2LONG(x) >= RFLOAT_VALUE(y) ? Qtrue : Qfalse;
default:
return rb_num_coerce_relop(x, y, rb_intern(">="));
}
@@ -3164,7 +2776,7 @@ fix_lt(VALUE x, VALUE y)
case T_BIGNUM:
return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) < 0 ? Qtrue : Qfalse;
case T_FLOAT:
- return rb_integer_float_cmp(x, y) == INT2FIX(-1) ? Qtrue : Qfalse;
+ return (double)FIX2LONG(x) < RFLOAT_VALUE(y) ? Qtrue : Qfalse;
default:
return rb_num_coerce_relop(x, y, '<');
}
@@ -3189,10 +2801,7 @@ fix_le(VALUE x, VALUE y)
case T_BIGNUM:
return FIX2INT(rb_big_cmp(rb_int2big(FIX2LONG(x)), y)) <= 0 ? Qtrue : Qfalse;
case T_FLOAT:
- {
- VALUE rel = rb_integer_float_cmp(x, y);
- return rel == INT2FIX(-1) || rel == INT2FIX(0) ? Qtrue : Qfalse;
- }
+ return (double)FIX2LONG(x) <= RFLOAT_VALUE(y) ? Qtrue : Qfalse;
default:
return rb_num_coerce_relop(x, y, rb_intern("<="));
}
@@ -3208,29 +2817,22 @@ fix_le(VALUE x, VALUE y)
static VALUE
fix_rev(VALUE num)
{
- return ~num | FIXNUM_FLAG;
-}
+ long val = FIX2LONG(num);
-static int
-bit_coerce(VALUE *x, VALUE *y, int err)
-{
- if (!FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
- VALUE orig = *x;
- do_coerce(x, y, err);
- if (!FIXNUM_P(*x) && !RB_TYPE_P(*x, T_BIGNUM)
- && !FIXNUM_P(*y) && !RB_TYPE_P(*y, T_BIGNUM)) {
- if (!err) return FALSE;
- coerce_failed(orig, *y);
- }
- }
- return TRUE;
+ val = ~val;
+ return LONG2NUM(val);
}
-VALUE
-rb_num_coerce_bit(VALUE x, VALUE y, ID func)
+static VALUE
+bit_coerce(VALUE x)
{
- bit_coerce(&x, &y, TRUE);
- return rb_funcall(x, func, 1, y);
+ 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;
}
/*
@@ -3243,17 +2845,13 @@ rb_num_coerce_bit(VALUE x, VALUE y, ID func)
static VALUE
fix_and(VALUE x, VALUE y)
{
- if (FIXNUM_P(y)) {
- long val = FIX2LONG(x) & FIX2LONG(y);
- return LONG2NUM(val);
- }
+ long val;
- if (RB_TYPE_P(y, T_BIGNUM)) {
+ if (!FIXNUM_P(y = bit_coerce(y))) {
return rb_big_and(y, x);
}
-
- bit_coerce(&x, &y, TRUE);
- return rb_funcall(x, rb_intern("&"), 1, y);
+ val = FIX2LONG(x) & FIX2LONG(y);
+ return LONG2NUM(val);
}
/*
@@ -3266,17 +2864,13 @@ fix_and(VALUE x, VALUE y)
static VALUE
fix_or(VALUE x, VALUE y)
{
- if (FIXNUM_P(y)) {
- long val = FIX2LONG(x) | FIX2LONG(y);
- return LONG2NUM(val);
- }
+ long val;
- if (RB_TYPE_P(y, T_BIGNUM)) {
+ if (!FIXNUM_P(y = bit_coerce(y))) {
return rb_big_or(y, x);
}
-
- bit_coerce(&x, &y, TRUE);
- return rb_funcall(x, rb_intern("|"), 1, y);
+ val = FIX2LONG(x) | FIX2LONG(y);
+ return LONG2NUM(val);
}
/*
@@ -3289,17 +2883,13 @@ fix_or(VALUE x, VALUE y)
static VALUE
fix_xor(VALUE x, VALUE y)
{
- if (FIXNUM_P(y)) {
- long val = FIX2LONG(x) ^ FIX2LONG(y);
- return LONG2NUM(val);
- }
+ long val;
- if (RB_TYPE_P(y, T_BIGNUM)) {
+ if (!FIXNUM_P(y = bit_coerce(y))) {
return rb_big_xor(y, x);
}
-
- bit_coerce(&x, &y, TRUE);
- return rb_funcall(x, rb_intern("^"), 1, y);
+ val = FIX2LONG(x) ^ FIX2LONG(y);
+ return LONG2NUM(val);
}
static VALUE fix_lshift(long, unsigned long);
@@ -3473,12 +3063,6 @@ fix_size(VALUE fix)
return INT2FIX(sizeof(long));
}
-static VALUE
-int_upto_size(VALUE from, VALUE args)
-{
- return num_interval_step_size(from, RARRAY_PTR(args)[0], INT2FIX(1), FALSE);
-}
-
/*
* call-seq:
* int.upto(limit) {|i| block } -> self
@@ -3499,7 +3083,7 @@ int_upto_size(VALUE from, VALUE args)
static VALUE
int_upto(VALUE from, VALUE to)
{
- RETURN_SIZED_ENUMERATOR(from, 1, &to, int_upto_size);
+ RETURN_ENUMERATOR(from, 1, &to);
if (FIXNUM_P(from) && FIXNUM_P(to)) {
long i, end;
@@ -3520,12 +3104,6 @@ int_upto(VALUE from, VALUE to)
return from;
}
-static VALUE
-int_downto_size(VALUE from, VALUE args)
-{
- return num_interval_step_size(from, RARRAY_PTR(args)[0], INT2FIX(-1), FALSE);
-}
-
/*
* call-seq:
* int.downto(limit) {|i| block } -> self
@@ -3547,7 +3125,7 @@ int_downto_size(VALUE from, VALUE args)
static VALUE
int_downto(VALUE from, VALUE to)
{
- RETURN_SIZED_ENUMERATOR(from, 1, &to, int_downto_size);
+ RETURN_ENUMERATOR(from, 1, &to);
if (FIXNUM_P(from) && FIXNUM_P(to)) {
long i, end;
@@ -3568,18 +3146,6 @@ int_downto(VALUE from, VALUE to)
return from;
}
-static VALUE
-int_dotimes_size(VALUE num)
-{
- if (FIXNUM_P(num)) {
- if (NUM2LONG(num) <= 0) return INT2FIX(0);
- }
- else {
- if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) return INT2FIX(0);
- }
- return num;
-}
-
/*
* call-seq:
* int.times {|i| block } -> self
@@ -3602,7 +3168,7 @@ int_dotimes_size(VALUE num)
static VALUE
int_dotimes(VALUE num)
{
- RETURN_SIZED_ENUMERATOR(num, 0, 0, int_dotimes_size);
+ RETURN_ENUMERATOR(num, 0, 0);
if (FIXNUM_P(num)) {
long i, end;
@@ -3626,7 +3192,7 @@ int_dotimes(VALUE num)
/*
* call-seq:
- * int.round([ndigits]) -> integer or float
+ * num.round([ndigits]) -> integer or float
*
* Rounds <i>flt</i> to a given precision in decimal digits (default 0 digits).
* Precision may be negative. Returns a floating point number when +ndigits+
@@ -3640,7 +3206,7 @@ int_dotimes(VALUE num)
static VALUE
int_round(int argc, VALUE* argv, VALUE num)
{
- VALUE n;
+ VALUE n, f, h, r;
int ndigits;
if (argc == 0) return num;
@@ -3652,7 +3218,26 @@ int_round(int argc, VALUE* argv, VALUE num)
if (ndigits == 0) {
return num;
}
- return int_round_0(num, ndigits);
+ ndigits = -ndigits;
+ if (ndigits < 0) {
+ rb_raise(rb_eArgError, "ndigits out of range");
+ }
+ f = int_pow(10, ndigits);
+ if (FIXNUM_P(num) && FIXNUM_P(f)) {
+ SIGNED_VALUE x = FIX2LONG(num), y = FIX2LONG(f);
+ int neg = x < 0;
+ if (neg) x = -x;
+ x = (x + y / 2) / y * y;
+ if (neg) x = -x;
+ return LONG2NUM(x);
+ }
+ h = rb_funcall(f, '/', 1, INT2FIX(2));
+ r = rb_funcall(num, '%', 1, f);
+ n = rb_funcall(num, '-', 1, r);
+ if (!RTEST(rb_funcall(r, '<', 1, h))) {
+ n = rb_funcall(n, '+', 1, f);
+ }
+ return n;
}
/*
@@ -3751,12 +3336,10 @@ Init_Numeric(void)
#elif defined(__BORLANDC__)
/* Turn off floating point exceptions for overflow, etc. */
_control87(MCW_EM, MCW_EM);
- _control87(_control87(0,0),0x1FFF);
#endif
id_coerce = rb_intern("coerce");
id_to_i = rb_intern("to_i");
id_eq = rb_intern("==");
- id_div = rb_intern("div");
rb_eZeroDivError = rb_define_class("ZeroDivisionError", rb_eStandardError);
rb_eFloatDomainError = rb_define_class("FloatDomainError", rb_eRangeError);
@@ -3819,7 +3402,6 @@ Init_Numeric(void)
rb_cFixnum = rb_define_class("Fixnum", rb_cInteger);
rb_define_method(rb_cFixnum, "to_s", fix_to_s, -1);
- rb_define_alias(rb_cFixnum, "inspect", "to_s");
rb_define_method(rb_cFixnum, "-@", fix_uminus, 0);
rb_define_method(rb_cFixnum, "+", fix_plus, 1);
@@ -3865,97 +3447,21 @@ Init_Numeric(void)
rb_undef_alloc_func(rb_cFloat);
rb_undef_method(CLASS_OF(rb_cFloat), "new");
- /*
- * Represents the rounding mode for floating point addition.
- *
- * Usually defaults to 1, rounding to the nearest number.
- *
- * Other modes include:
- *
- * -1:: Indeterminable
- * 0:: Rounding towards zero
- * 1:: Rounding to the nearest number
- * 2:: Rounding towards positive infinity
- * 3:: Rounding towards negative infinity
- */
rb_define_const(rb_cFloat, "ROUNDS", INT2FIX(FLT_ROUNDS));
- /*
- * The base of the floating point, or number of unique digits used to
- * represent the number.
- *
- * Usually defaults to 2 on most systems, which would represent a base-10 decimal.
- */
rb_define_const(rb_cFloat, "RADIX", INT2FIX(FLT_RADIX));
- /*
- * The number of base digits for the +double+ data type.
- *
- * Usually defaults to 53.
- */
rb_define_const(rb_cFloat, "MANT_DIG", INT2FIX(DBL_MANT_DIG));
- /*
- * The number of decimal digits in a double-precision floating point.
- *
- * Usually defaults to 15.
- */
rb_define_const(rb_cFloat, "DIG", INT2FIX(DBL_DIG));
- /*
- * The smallest posable exponent value in a double-precision floating
- * point.
- *
- * Usually defaults to -1021.
- */
rb_define_const(rb_cFloat, "MIN_EXP", INT2FIX(DBL_MIN_EXP));
- /*
- * The largest possible exponent value in a double-precision floating
- * point.
- *
- * Usually defaults to 1024.
- */
rb_define_const(rb_cFloat, "MAX_EXP", INT2FIX(DBL_MAX_EXP));
- /*
- * The smallest negative exponent in a double-precision floating point
- * where 10 raised to this power minus 1.
- *
- * Usually defaults to -307.
- */
rb_define_const(rb_cFloat, "MIN_10_EXP", INT2FIX(DBL_MIN_10_EXP));
- /*
- * The largest positive exponent in a double-precision floating point where
- * 10 raised to this power minus 1.
- *
- * Usually defaults to 308.
- */
rb_define_const(rb_cFloat, "MAX_10_EXP", INT2FIX(DBL_MAX_10_EXP));
- /*
- * The smallest positive integer in a double-precision floating point.
- *
- * Usually defaults to 2.2250738585072014e-308.
- */
rb_define_const(rb_cFloat, "MIN", DBL2NUM(DBL_MIN));
- /*
- * The largest possible integer in a double-precision floating point number.
- *
- * Usually defaults to 1.7976931348623157e+308.
- */
rb_define_const(rb_cFloat, "MAX", DBL2NUM(DBL_MAX));
- /*
- * The difference between 1 and the smallest double-precision floating
- * point number.
- *
- * Usually defaults to 2.2204460492503131e-16.
- */
rb_define_const(rb_cFloat, "EPSILON", DBL2NUM(DBL_EPSILON));
- /*
- * An expression representing positive infinity.
- */
rb_define_const(rb_cFloat, "INFINITY", DBL2NUM(INFINITY));
- /*
- * An expression representing a value which is "not a number".
- */
rb_define_const(rb_cFloat, "NAN", DBL2NUM(NAN));
rb_define_method(rb_cFloat, "to_s", flo_to_s, 0);
- rb_define_alias(rb_cFloat, "inspect", "to_s");
rb_define_method(rb_cFloat, "coerce", flo_coerce, 1);
rb_define_method(rb_cFloat, "-@", flo_uminus, 0);
rb_define_method(rb_cFloat, "+", flo_plus, 1);
diff --git a/object.c b/object.c
index 9812862eb3..7ef2c9a8fe 100644
--- a/object.c
+++ b/object.c
@@ -14,15 +14,11 @@
#include "ruby/ruby.h"
#include "ruby/st.h"
#include "ruby/util.h"
-#include "ruby/encoding.h"
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
#include <math.h>
#include <float.h>
-#include "constant.h"
-#include "internal.h"
-#include "probes.h"
VALUE rb_cBasicObject;
VALUE rb_mKernel;
@@ -37,19 +33,14 @@ VALUE rb_cFalseClass;
static ID id_eq, id_eql, id_match, id_inspect;
static ID id_init_copy, id_init_clone, id_init_dup;
-static ID id_const_missing;
-
-#define CLASS_OR_MODULE_P(obj) \
- (!SPECIAL_CONST_P(obj) && \
- (BUILTIN_TYPE(obj) == T_CLASS || BUILTIN_TYPE(obj) == T_MODULE))
/*
* call-seq:
* obj === other -> true or false
*
- * Case Equality -- For class Object, effectively the same as calling
- * <code>#==</code>, but typically overridden by descendants to provide
- * meaningful semantics in +case+ statements.
+ * Case Equality---For class <code>Object</code>, effectively the same
+ * as calling <code>#==</code>, but typically overridden by descendants
+ * to provide meaningful semantics in <code>case</code> statements.
*/
VALUE
@@ -75,30 +66,23 @@ rb_eql(VALUE obj1, VALUE obj2)
* obj.equal?(other) -> true or false
* obj.eql?(other) -> true or false
*
- * Equality --- At the <code>Object</code> level, <code>==</code> returns
- * <code>true</code> only if +obj+ and +other+ are the same object.
- * Typically, this method is overridden in descendant classes to provide
- * class-specific meaning.
+ * Equality---At the <code>Object</code> level, <code>==</code> returns
+ * <code>true</code> only if <i>obj</i> and <i>other</i> are the
+ * same object. Typically, this method is overridden in descendant
+ * classes to provide class-specific meaning.
*
* Unlike <code>==</code>, the <code>equal?</code> method should never be
- * overridden by subclasses as it is used to determine object identity
- * (that is, <code>a.equal?(b)</code> if and only if <code>a</code> is the
- * same object as <code>b</code>):
- *
- * obj = "a"
- * other = obj.dup
- *
- * a == other #=> true
- * a.equal? other #=> false
- * a.equal? a #=> true
- *
- * The <code>eql?</code> method returns <code>true</code> if +obj+ and
- * +other+ refer to the same hash key. This is used by Hash to test members
- * for equality. For objects of class <code>Object</code>, <code>eql?</code>
- * is synonymous with <code>==</code>. Subclasses normally continue this
- * tradition by aliasing <code>eql?</code> to their overridden <code>==</code>
- * method, but there are exceptions. <code>Numeric</code> types, for
- * example, perform type conversion across <code>==</code>, but not across
+ * overridden by subclasses: it is used to determine object identity
+ * (that is, <code>a.equal?(b)</code> iff <code>a</code> is the same
+ * object as <code>b</code>).
+ *
+ * The <code>eql?</code> method returns <code>true</code> if
+ * <i>obj</i> and <i>anObject</i> have the same value. Used by
+ * <code>Hash</code> to test members for equality. For objects of
+ * class <code>Object</code>, <code>eql?</code> is synonymous with
+ * <code>==</code>. Subclasses normally continue this tradition, but
+ * there are exceptions. <code>Numeric</code> types, for example,
+ * perform type conversion across <code>==</code>, but not across
* <code>eql?</code>, so:
*
* 1 == 1.0 #=> true
@@ -112,31 +96,11 @@ rb_obj_equal(VALUE obj1, VALUE obj2)
return Qfalse;
}
-/*
- * Generates a Fixnum hash value for this object. This function must have the
- * property that <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
- *
- * The hash value is used along with #eql? by the Hash class to determine if
- * two objects reference the same hash key. Any hash value that exceeds the
- * capacity of a Fixnum will be truncated before being used.
- *
- * The hash value for an object may not be identical across invocations or
- * implementations of ruby. If you need a stable identifier across ruby
- * invocations and implementations you will need to generate one with a custom
- * method.
- */
VALUE
rb_obj_hash(VALUE obj)
{
VALUE oid = rb_obj_id(obj);
-#if SIZEOF_LONG == SIZEOF_VOIDP
- st_index_t index = NUM2LONG(oid);
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
- st_index_t index = NUM2LL(oid);
-#else
-# error not supported
-#endif
- st_index_t h = rb_hash_end(rb_hash_start(index));
+ st_index_t h = rb_hash_end(rb_hash_start(NUM2LONG(oid)));
return LONG2FIX(h);
}
@@ -219,33 +183,6 @@ rb_obj_singleton_class(VALUE obj)
return rb_singleton_class(obj);
}
-void
-rb_obj_copy_ivar(VALUE dest, VALUE obj)
-{
- if (!(RBASIC(dest)->flags & ROBJECT_EMBED) && ROBJECT_IVPTR(dest)) {
- xfree(ROBJECT_IVPTR(dest));
- ROBJECT(dest)->as.heap.ivptr = 0;
- ROBJECT(dest)->as.heap.numiv = 0;
- ROBJECT(dest)->as.heap.iv_index_tbl = 0;
- }
- if (RBASIC(obj)->flags & ROBJECT_EMBED) {
- MEMCPY(ROBJECT(dest)->as.ary, ROBJECT(obj)->as.ary, VALUE, ROBJECT_EMBED_LEN_MAX);
- RBASIC(dest)->flags |= ROBJECT_EMBED;
- }
- else {
- long len = ROBJECT(obj)->as.heap.numiv;
- VALUE *ptr = 0;
- if (len > 0) {
- ptr = ALLOC_N(VALUE, len);
- MEMCPY(ptr, ROBJECT(obj)->as.heap.ivptr, VALUE, len);
- }
- ROBJECT(dest)->as.heap.ivptr = ptr;
- ROBJECT(dest)->as.heap.numiv = len;
- ROBJECT(dest)->as.heap.iv_index_tbl = ROBJECT(obj)->as.heap.iv_index_tbl;
- RBASIC(dest)->flags &= ~ROBJECT_EMBED;
- }
-}
-
static void
init_copy(VALUE dest, VALUE obj)
{
@@ -258,7 +195,25 @@ init_copy(VALUE dest, VALUE obj)
rb_gc_copy_finalizer(dest, obj);
switch (TYPE(obj)) {
case T_OBJECT:
- rb_obj_copy_ivar(dest, obj);
+ if (!(RBASIC(dest)->flags & ROBJECT_EMBED) && ROBJECT_IVPTR(dest)) {
+ xfree(ROBJECT_IVPTR(dest));
+ ROBJECT(dest)->as.heap.ivptr = 0;
+ ROBJECT(dest)->as.heap.numiv = 0;
+ ROBJECT(dest)->as.heap.iv_index_tbl = 0;
+ }
+ if (RBASIC(obj)->flags & ROBJECT_EMBED) {
+ MEMCPY(ROBJECT(dest)->as.ary, ROBJECT(obj)->as.ary, VALUE, ROBJECT_EMBED_LEN_MAX);
+ RBASIC(dest)->flags |= ROBJECT_EMBED;
+ }
+ else {
+ long len = ROBJECT(obj)->as.heap.numiv;
+ VALUE *ptr = ALLOC_N(VALUE, len);
+ MEMCPY(ptr, ROBJECT(obj)->as.heap.ivptr, VALUE, len);
+ ROBJECT(dest)->as.heap.ivptr = ptr;
+ ROBJECT(dest)->as.heap.numiv = len;
+ ROBJECT(dest)->as.heap.iv_index_tbl = ROBJECT(obj)->as.heap.iv_index_tbl;
+ RBASIC(dest)->flags &= ~ROBJECT_EMBED;
+ }
break;
case T_CLASS:
case T_MODULE:
@@ -266,10 +221,6 @@ init_copy(VALUE dest, VALUE obj)
st_free_table(RCLASS_IV_TBL(dest));
RCLASS_IV_TBL(dest) = 0;
}
- if (RCLASS_CONST_TBL(dest)) {
- rb_free_const_table(RCLASS_CONST_TBL(dest));
- RCLASS_CONST_TBL(dest) = 0;
- }
if (RCLASS_IV_TBL(obj)) {
RCLASS_IV_TBL(dest) = st_copy(RCLASS_IV_TBL(obj));
}
@@ -305,19 +256,13 @@ VALUE
rb_obj_clone(VALUE obj)
{
VALUE clone;
- VALUE singleton;
if (rb_special_const_p(obj)) {
rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj));
}
clone = rb_obj_alloc(rb_obj_class(obj));
- singleton = rb_singleton_class_clone_and_attach(obj, clone);
- RBASIC(clone)->klass = singleton;
- if (FL_TEST(singleton, FL_SINGLETON)) {
- rb_singleton_class_attached(singleton, clone);
- }
- RBASIC(clone)->flags &= (FL_TAINT|FL_UNTRUSTED);
- RBASIC(clone)->flags |= RBASIC(obj)->flags & ~(FL_FREEZE|FL_FINALIZE);
+ RBASIC(clone)->klass = rb_singleton_class_clone(obj);
+ RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT) | FL_TEST(clone, FL_UNTRUSTED)) & ~(FL_FREEZE|FL_FINALIZE);
init_copy(clone, obj);
rb_funcall(clone, id_init_clone, 1, obj);
RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE;
@@ -364,7 +309,6 @@ rb_obj_init_copy(VALUE obj, VALUE orig)
{
if (obj == orig) return obj;
rb_check_frozen(obj);
- rb_check_trusted(obj);
if (TYPE(obj) != TYPE(orig) || rb_obj_class(obj) != rb_obj_class(orig)) {
rb_raise(rb_eTypeError, "initialize_copy should take same class object");
}
@@ -392,42 +336,24 @@ rb_obj_init_dup_clone(VALUE obj, VALUE orig)
VALUE
rb_any_to_s(VALUE obj)
{
+ const char *cname = rb_obj_classname(obj);
VALUE str;
- VALUE cname = rb_class_name(CLASS_OF(obj));
- str = rb_sprintf("#<%"PRIsVALUE":%p>", cname, (void*)obj);
+ str = rb_sprintf("#<%s:%p>", cname, (void*)obj);
OBJ_INFECT(str, obj);
return str;
}
-/*
- * If the default external encoding is ASCII compatible, the encoding of
- * inspected result must be compatible with it.
- * If the default external encoding is ASCII incomapatible,
- * the result must be ASCII only.
- */
VALUE
rb_inspect(VALUE obj)
{
- VALUE str = rb_obj_as_string(rb_funcall(obj, id_inspect, 0, 0));
- rb_encoding *ext = rb_default_external_encoding();
- if (!rb_enc_asciicompat(ext)) {
- if (!rb_enc_str_asciionly_p(str))
- rb_raise(rb_eEncCompatError, "inspected result must be ASCII only if default external encoding is ASCII incompatible");
- return str;
- }
- if (rb_enc_get(str) != ext && !rb_enc_str_asciionly_p(str))
- rb_raise(rb_eEncCompatError, "inspected result must be ASCII only or use the same encoding with default external");
- return str;
+ return rb_obj_as_string(rb_funcall(obj, id_inspect, 0, 0));
}
static int
-inspect_i(st_data_t k, st_data_t v, st_data_t a)
+inspect_i(ID id, VALUE value, VALUE str)
{
- ID id = (ID)k;
- VALUE value = (VALUE)v;
- VALUE str = (VALUE)a;
VALUE str2;
const char *ivname;
@@ -471,69 +397,46 @@ inspect_obj(VALUE obj, VALUE str, int recur)
* call-seq:
* obj.inspect -> string
*
- * Returns a string containing a human-readable representation of <i>obj</i>.
- * By default, show the class name and the list of the instance variables and
- * their values (by calling #inspect on each of them).
- * User defined classes should override this method to make better
- * representation of <i>obj</i>. When overriding this method, it should
- * return a string whose encoding is compatible with the default external
- * encoding.
+ * Returns a string containing a human-readable representation of
+ * <i>obj</i>. If not overridden and no instance variables, uses the
+ * <code>to_s</code> method to generate the string.
+ * <i>obj</i>. If not overridden, uses the <code>to_s</code> method to
+ * generate the string.
*
* [ 1, 2, 3..4, 'five' ].inspect #=> "[1, 2, 3..4, \"five\"]"
* Time.new.inspect #=> "2008-03-08 19:43:39 +0900"
- *
- * class Foo
- * end
- * Foo.new.inspect #=> "#<Foo:0x0300c868>"
- *
- * class Bar
- * def initialize
- * @bar = 1
- * end
- * end
- * Bar.new.inspect #=> "#<Bar:0x0300c868 @bar=1>"
- *
- * class Baz
- * def to_s
- * "baz"
- * end
- * end
- * Baz.new.inspect #=> "#<Baz:0x0300c868>"
*/
static VALUE
rb_obj_inspect(VALUE obj)
{
- if (rb_ivar_count(obj) > 0) {
- VALUE str;
- VALUE c = rb_class_name(CLASS_OF(obj));
+ extern int rb_obj_basic_to_s_p(VALUE);
- str = rb_sprintf("-<%"PRIsVALUE":%p", c, (void*)obj);
- return rb_exec_recursive(inspect_obj, obj, str);
- }
- else {
- return rb_any_to_s(obj);
- }
-}
+ if (TYPE(obj) == T_OBJECT && rb_obj_basic_to_s_p(obj)) {
+ int has_ivar = 0;
+ VALUE *ptr = ROBJECT_IVPTR(obj);
+ long len = ROBJECT_NUMIV(obj);
+ long i;
-static VALUE
-class_or_module_required(VALUE c)
-{
- if (SPECIAL_CONST_P(c)) goto not_class;
- switch (BUILTIN_TYPE(c)) {
- case T_MODULE:
- case T_CLASS:
- case T_ICLASS:
- break;
+ for (i = 0; i < len; i++) {
+ if (ptr[i] != Qundef) {
+ has_ivar = 1;
+ break;
+ }
+ }
- default:
- not_class:
- rb_raise(rb_eTypeError, "class or module required");
+ if (has_ivar) {
+ VALUE str;
+ const char *c = rb_obj_classname(obj);
+
+ str = rb_sprintf("-<%s:%p", c, (void*)obj);
+ return rb_exec_recursive(inspect_obj, obj, str);
+ }
+ return rb_any_to_s(obj);
}
- return c;
+ return rb_funcall(obj, rb_intern("to_s"), 0, 0);
}
-static VALUE class_search_ancestor(VALUE cl, VALUE c);
/*
* call-seq:
@@ -541,21 +444,20 @@ static VALUE class_search_ancestor(VALUE cl, VALUE c);
*
* Returns <code>true</code> if <i>obj</i> is an instance of the given
* class. See also <code>Object#kind_of?</code>.
- *
- * class A; end
- * class B < A; end
- * class C < B; end
- *
- * b = B.new
- * b.instance_of? A #=> false
- * b.instance_of? B #=> true
- * b.instance_of? C #=> false
*/
VALUE
rb_obj_is_instance_of(VALUE obj, VALUE c)
{
- c = class_or_module_required(c);
+ switch (TYPE(c)) {
+ case T_MODULE:
+ case T_CLASS:
+ case T_ICLASS:
+ break;
+ default:
+ rb_raise(rb_eTypeError, "class or module required");
+ }
+
if (rb_obj_class(obj) == c) return Qtrue;
return Qfalse;
}
@@ -576,13 +478,11 @@ rb_obj_is_instance_of(VALUE obj, VALUE c)
* end
* class B < A; end
* class C < B; end
- *
* b = B.new
- * b.is_a? A #=> true
- * b.is_a? B #=> true
- * b.is_a? C #=> false
- * b.is_a? M #=> true
- *
+ * b.instance_of? A #=> false
+ * b.instance_of? B #=> true
+ * b.instance_of? C #=> false
+ * b.instance_of? M #=> false
* b.kind_of? A #=> true
* b.kind_of? B #=> true
* b.kind_of? C #=> false
@@ -594,28 +494,24 @@ rb_obj_is_kind_of(VALUE obj, VALUE c)
{
VALUE cl = CLASS_OF(obj);
- c = class_or_module_required(c);
- return class_search_ancestor(cl, RCLASS_ORIGIN(c)) ? Qtrue : Qfalse;
-}
+ switch (TYPE(c)) {
+ case T_MODULE:
+ case T_CLASS:
+ case T_ICLASS:
+ break;
+
+ default:
+ rb_raise(rb_eTypeError, "class or module required");
+ }
-static VALUE
-class_search_ancestor(VALUE cl, VALUE c)
-{
while (cl) {
if (cl == c || RCLASS_M_TBL(cl) == RCLASS_M_TBL(c))
- return cl;
+ return Qtrue;
cl = RCLASS_SUPER(cl);
}
- return 0;
+ return Qfalse;
}
-VALUE
-rb_class_search_ancestor(VALUE cl, VALUE c)
-{
- cl = class_or_module_required(cl);
- c = class_or_module_required(c);
- return class_search_ancestor(cl, RCLASS_ORIGIN(c));
-}
/*
* call-seq:
@@ -651,9 +547,9 @@ rb_obj_tap(VALUE obj)
* Example:
*
* class Foo
- * def self.inherited(subclass)
- * puts "New subclass: #{subclass}"
- * end
+ * def self.inherited(subclass)
+ * puts "New subclass: #{subclass}"
+ * end
* end
*
* class Bar < Foo
@@ -668,54 +564,6 @@ rb_obj_tap(VALUE obj)
* New subclass: Baz
*/
-/* Document-method: method_added
- *
- * call-seq:
- * method_added(method_name)
- *
- * Invoked as a callback whenever an instance method is added to the
- * receiver.
- *
- * module Chatty
- * def self.method_added(method_name)
- * puts "Adding #{method_name.inspect}"
- * end
- * def self.some_class_method() end
- * def some_instance_method() end
- * end
- *
- * produces:
- *
- * Adding :some_instance_method
- *
- */
-
-/* Document-method: method_removed
- *
- * call-seq:
- * method_removed(method_name)
- *
- * Invoked as a callback whenever an instance method is removed from the
- * receiver.
- *
- * module Chatty
- * def self.method_removed(method_name)
- * puts "Removing #{method_name.inspect}"
- * end
- * def self.some_class_method() end
- * def some_instance_method() end
- * class << self
- * remove_method :some_class_method
- * end
- * remove_method :some_instance_method
- * end
- *
- * produces:
- *
- * Removing :some_instance_method
- *
- */
-
/*
* Document-method: singleton_method_added
*
@@ -794,30 +642,12 @@ rb_obj_tap(VALUE obj)
* Undefining one
*/
-/*
- * Document-method: extended
- *
- * call-seq:
- * extended(othermod)
- *
- * The equivalent of <tt>included</tt>, but for extended modules.
- *
- * module A
- * def self.extended(mod)
- * puts "#{self} extended in #{mod}"
- * end
- * end
- * module Enumerable
- * extend A
- * end
- * # => prints "A extended in Enumerable"
- */
/*
* Document-method: included
*
* call-seq:
- * included(othermod)
+ * included( othermod )
*
* Callback invoked whenever the receiver is included in another
* module or class. This should be used in preference to
@@ -832,35 +662,15 @@ rb_obj_tap(VALUE obj)
* module Enumerable
* include A
* end
- * # => prints "A included in Enumerable"
- */
-
-/*
- * Document-method: prepended
- *
- * call-seq:
- * prepended(othermod)
- *
- * The equivalent of <tt>included</tt>, but for prepended modules.
- *
- * module A
- * def self.prepended(mod)
- * puts "#{self} prepended to #{mod}"
- * end
- * end
- * module Enumerable
- * prepend A
- * end
- * # => prints "A prepended to Enumerable"
*/
/*
* Document-method: initialize
*
* call-seq:
- * BasicObject.new
+ * BasicObject.new( *args )
*
- * Returns a new BasicObject.
+ * Returns a new BasicObject. Arguments are ignored.
*/
/*
@@ -902,7 +712,9 @@ rb_obj_taint(VALUE obj)
{
rb_secure(4);
if (!OBJ_TAINTED(obj)) {
- rb_check_frozen(obj);
+ if (OBJ_FROZEN(obj)) {
+ rb_error_frozen("object");
+ }
OBJ_TAINT(obj);
}
return obj;
@@ -921,7 +733,9 @@ rb_obj_untaint(VALUE obj)
{
rb_secure(3);
if (OBJ_TAINTED(obj)) {
- rb_check_frozen(obj);
+ if (OBJ_FROZEN(obj)) {
+ rb_error_frozen("object");
+ }
FL_UNSET(obj, FL_TAINT);
}
return obj;
@@ -954,7 +768,9 @@ rb_obj_untrust(VALUE obj)
{
rb_secure(4);
if (!OBJ_UNTRUSTED(obj)) {
- rb_check_frozen(obj);
+ if (OBJ_FROZEN(obj)) {
+ rb_error_frozen("object");
+ }
OBJ_UNTRUST(obj);
}
return obj;
@@ -973,7 +789,9 @@ rb_obj_trust(VALUE obj)
{
rb_secure(3);
if (OBJ_UNTRUSTED(obj)) {
- rb_check_frozen(obj);
+ if (OBJ_FROZEN(obj)) {
+ rb_error_frozen("object");
+ }
FL_UNSET(obj, FL_UNTRUSTED);
}
return obj;
@@ -1117,23 +935,6 @@ nil_to_a(VALUE obj)
}
/*
- * Document-method: to_h
- *
- * call-seq:
- * nil.to_h -> {}
- *
- * Always returns an empty hash.
- *
- * nil.to_h #=> {}
- */
-
-static VALUE
-nil_to_h(VALUE obj)
-{
- return rb_hash_new();
-}
-
-/*
* call-seq:
* nil.inspect -> "nil"
*
@@ -1357,24 +1158,7 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
}
-/*
- * call-seq:
- * obj <=> other -> 0 or nil
- *
- * Returns 0 if +obj+ and +other+ are the same object
- * or <code>obj == other</code>, otherwise nil.
- *
- * The <=> is used by various methods to compare objects, for example
- * Enumerable#sort, Enumerable#max etc.
- *
- * Your implementation of <=> should return one of the following values: -1, 0,
- * 1 or nil. -1 means self is smaller than other. 0 means self is equal to other.
- * 1 means self is bigger than other. Nil means the two values could not be
- * compared.
- *
- * When you define <=>, you can include Comparable to gain the methods <=, <,
- * ==, >=, > and between?.
- */
+/* :nodoc: */
static VALUE
rb_obj_cmp(VALUE obj1, VALUE obj2)
{
@@ -1423,35 +1207,23 @@ rb_obj_cmp(VALUE obj1, VALUE obj2)
static VALUE
rb_mod_to_s(VALUE klass)
{
- ID id_defined_at;
- VALUE refined_class, defined_at;
-
if (FL_TEST(klass, FL_SINGLETON)) {
- VALUE s = rb_usascii_str_new2("#<Class:");
+ VALUE s = rb_usascii_str_new2("#<");
VALUE v = rb_iv_get(klass, "__attached__");
- if (CLASS_OR_MODULE_P(v)) {
+ rb_str_cat2(s, "Class:");
+ switch (TYPE(v)) {
+ case T_CLASS: case T_MODULE:
rb_str_append(s, rb_inspect(v));
- }
- else {
+ break;
+ default:
rb_str_append(s, rb_any_to_s(v));
+ break;
}
rb_str_cat2(s, ">");
return s;
}
- refined_class = rb_refinement_module_get_refined_class(klass);
- if (!NIL_P(refined_class)) {
- VALUE s = rb_usascii_str_new2("#<refinement:");
-
- rb_str_concat(s, rb_inspect(refined_class));
- rb_str_cat2(s, "@");
- CONST_ID(id_defined_at, "__defined_at__");
- defined_at = rb_attr_get(klass, id_defined_at);
- rb_str_concat(s, rb_inspect(defined_at));
- rb_str_cat2(s, ">");
- return s;
- }
return rb_str_dup(rb_class_name(klass));
}
@@ -1505,16 +1277,23 @@ rb_class_inherited_p(VALUE mod, VALUE arg)
VALUE start = mod;
if (mod == arg) return Qtrue;
- if (!CLASS_OR_MODULE_P(arg) && !RB_TYPE_P(arg, T_ICLASS)) {
+ switch (TYPE(arg)) {
+ case T_MODULE:
+ case T_CLASS:
+ break;
+ default:
rb_raise(rb_eTypeError, "compared with non class/module");
}
- arg = RCLASS_ORIGIN(arg);
- if (class_search_ancestor(mod, arg)) {
- return Qtrue;
+ while (mod) {
+ if (RCLASS_M_TBL(mod) == RCLASS_M_TBL(arg))
+ return Qtrue;
+ mod = RCLASS_SUPER(mod);
}
/* not mod < arg; check if mod > arg */
- if (class_search_ancestor(arg, start)) {
- return Qfalse;
+ while (arg) {
+ if (RCLASS_M_TBL(arg) == RCLASS_M_TBL(start))
+ return Qfalse;
+ arg = RCLASS_SUPER(arg);
}
return Qnil;
}
@@ -1553,7 +1332,11 @@ rb_mod_lt(VALUE mod, VALUE arg)
static VALUE
rb_mod_ge(VALUE mod, VALUE arg)
{
- if (!CLASS_OR_MODULE_P(arg)) {
+ switch (TYPE(arg)) {
+ case T_MODULE:
+ case T_CLASS:
+ break;
+ default:
rb_raise(rb_eTypeError, "compared with non class/module");
}
@@ -1580,14 +1363,13 @@ rb_mod_gt(VALUE mod, VALUE arg)
/*
* call-seq:
- * module <=> other_module -> -1, 0, +1, or nil
+ * mod <=> other_mod -> -1, 0, +1, or nil
*
- * Comparison---Returns -1, 0, +1 or nil depending on whether +module+
- * includes +other_module+, they are the same, or if +module+ is included by
- * +other_module+. This is the basis for the tests in Comparable.
- *
- * Returns +nil+ if +module+ has no relationship with +other_module+, if
- * +other_module+ is not a module, or if the two values are incomparable.
+ * Comparison---Returns -1 if <i>mod</i> includes <i>other_mod</i>, 0 if
+ * <i>mod</i> is the same as <i>other_mod</i>, and +1 if <i>mod</i> is
+ * included by <i>other_mod</i>. Returns <code>nil</code> if <i>mod</i>
+ * has no relationship with <i>other_mod</i> or if <i>other_mod</i> is
+ * not a module.
*/
static VALUE
@@ -1596,7 +1378,11 @@ rb_mod_cmp(VALUE mod, VALUE arg)
VALUE cmp;
if (mod == arg) return INT2FIX(0);
- if (!CLASS_OR_MODULE_P(arg)) {
+ switch (TYPE(arg)) {
+ case T_MODULE:
+ case T_CLASS:
+ break;
+ default:
return Qnil;
}
@@ -1632,7 +1418,7 @@ rb_class_s_alloc(VALUE klass)
* the module object, and the block is evaluated in the context of this
* module using <code>module_eval</code>.
*
- * fred = Module.new do
+ * Fred = Module.new do
* def meth1
* "hello"
* end
@@ -1641,17 +1427,16 @@ rb_class_s_alloc(VALUE klass)
* end
* end
* a = "my string"
- * a.extend(fred) #=> "my string"
+ * a.extend(Fred) #=> "my string"
* a.meth1 #=> "hello"
* a.meth2 #=> "bye"
- *
- * Assign the module to a constant (name starting uppercase) if you
- * want to treat it like a regular module.
*/
static VALUE
rb_mod_initialize(VALUE module)
{
+ extern VALUE rb_mod_module_exec(int argc, VALUE *argv, VALUE mod);
+
if (rb_block_given_p()) {
rb_mod_module_exec(1, &module, module);
}
@@ -1660,32 +1445,12 @@ rb_mod_initialize(VALUE module)
/*
* call-seq:
- * Class.new(super_class=Object) -> a_class
- * Class.new(super_class=Object) { |mod| ... } -> a_class
+ * Class.new(super_class=Object) -> a_class
*
* Creates a new anonymous (unnamed) class with the given superclass
* (or <code>Object</code> if no parameter is given). You can give a
* class a name by assigning the class object to a constant.
*
- * If a block is given, it is passed the class object, and the block
- * is evaluated in the context of this class using
- * <code>class_eval</code>.
- *
- * fred = Class.new do
- * def meth1
- * "hello"
- * end
- * def meth2
- * "bye"
- * end
- * end
- *
- * a = fred.new #=> #<#<Class:0x100381890>:0x100376b98>
- * a.meth1 #=> "hello"
- * a.meth2 #=> "bye"
- *
- * Assign the class to a constant (name starting uppercase) if you
- * want to treat it like a regular class.
*/
static VALUE
@@ -1702,9 +1467,6 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
else {
rb_scan_args(argc, argv, "01", &super);
rb_check_inheritable(super);
- if (super != rb_cBasicObject && !RCLASS_SUPER(super)) {
- rb_raise(rb_eTypeError, "can't inherit uninitialized class");
- }
}
RCLASS_SUPER(klass) = super;
rb_make_metaclass(klass, RBASIC(super)->klass);
@@ -1740,7 +1502,6 @@ VALUE
rb_obj_alloc(VALUE klass)
{
VALUE obj;
- rb_alloc_func_t allocator;
if (RCLASS_SUPER(klass) == 0 && klass != rb_cBasicObject) {
rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
@@ -1748,23 +1509,7 @@ rb_obj_alloc(VALUE klass)
if (FL_TEST(klass, FL_SINGLETON)) {
rb_raise(rb_eTypeError, "can't create instance of singleton class");
}
- allocator = rb_get_alloc_func(klass);
- if (!allocator) {
- rb_raise(rb_eTypeError, "allocator undefined for %"PRIsVALUE,
- klass);
- }
-
-#if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED
- if (RUBY_DTRACE_OBJECT_CREATE_ENABLED()) {
- const char * file = rb_sourcefile();
- RUBY_DTRACE_OBJECT_CREATE(rb_class2name(klass),
- file ? file : "",
- rb_sourceline());
- }
-#endif
-
- obj = (*allocator)(klass);
-
+ obj = rb_funcall(klass, ID_ALLOCATOR, 0, 0);
if (rb_obj_class(obj) != rb_class_real(klass)) {
rb_raise(rb_eTypeError, "wrong instance allocation");
}
@@ -1774,7 +1519,8 @@ rb_obj_alloc(VALUE klass)
static VALUE
rb_class_allocate_instance(VALUE klass)
{
- NEWOBJ_OF(obj, struct RObject, klass, T_OBJECT);
+ NEWOBJ(obj, struct RObject);
+ OBJSETUP(obj, klass, T_OBJECT);
return (VALUE)obj;
}
@@ -1820,7 +1566,7 @@ rb_class_new_instance(int argc, VALUE *argv, VALUE klass)
*
*/
-VALUE
+static VALUE
rb_class_superclass(VALUE klass)
{
VALUE super = RCLASS_SUPER(klass);
@@ -1829,7 +1575,7 @@ rb_class_superclass(VALUE klass)
if (klass == rb_cBasicObject) return Qnil;
rb_raise(rb_eTypeError, "uninitialized class");
}
- while (RB_TYPE_P(super, T_ICLASS)) {
+ while (TYPE(super) == T_ICLASS) {
super = RCLASS_SUPER(super);
}
if (!super) {
@@ -1838,12 +1584,6 @@ rb_class_superclass(VALUE klass)
return super;
}
-VALUE
-rb_class_get_superclass(VALUE klass)
-{
- return RCLASS_SUPER(klass);
-}
-
/*
* call-seq:
* attr_reader(symbol, ...) -> nil
@@ -1881,7 +1621,7 @@ rb_mod_attr(int argc, VALUE *argv, VALUE klass)
* attr_writer(symbol, ...) -> nil
*
* Creates an accessor method to allow assignment to the attribute
- * <i>symbol</i><code>.id2name</code>.
+ * <i>aSymbol</i><code>.id2name</code>.
*/
static VALUE
@@ -1924,45 +1664,20 @@ rb_mod_attr_accessor(int argc, VALUE *argv, VALUE klass)
/*
* call-seq:
* mod.const_get(sym, inherit=true) -> obj
- * mod.const_get(str, inherit=true) -> obj
- *
- * Checks for a constant with the given name in <i>mod</i>
- * If +inherit+ is set, the lookup will also search
- * the ancestors (and +Object+ if <i>mod</i> is a +Module+.)
*
- * The value of the constant is returned if a definition is found,
- * otherwise a +NameError+ is raised.
+ * Returns the value of the named constant in <i>mod</i>.
*
* Math.const_get(:PI) #=> 3.14159265358979
*
- * This method will recursively look up constant names if a namespaced
- * class name is provided. For example:
- *
- * module Foo; class Bar; end end
- * Object.const_get 'Foo::Bar'
- *
- * The +inherit+ flag is respected on each lookup. For example:
- *
- * module Foo
- * class Bar
- * VAL = 10
- * end
- *
- * class Baz < Bar; end
- * end
- *
- * Object.const_get 'Foo::Baz::VAL' # => 10
- * Object.const_get 'Foo::Baz::VAL', false # => NameError
+ * If the constant is not defined or is defined by the ancestors and
+ * +inherit+ is false, +NameError+ will be raised.
*/
static VALUE
rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
{
VALUE name, recur;
- rb_encoding *enc;
- const char *pbeg, *p, *path, *pend;
ID id;
- int nestable = 1;
if (argc == 1) {
name = argv[0];
@@ -1971,85 +1686,11 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
else {
rb_scan_args(argc, argv, "11", &name, &recur);
}
-
- if (SYMBOL_P(name)) {
- name = rb_sym_to_s(name);
- nestable = 0;
- }
-
- name = rb_check_string_type(name);
- Check_Type(name, T_STRING);
-
- enc = rb_enc_get(name);
- path = RSTRING_PTR(name);
-
- if (!rb_enc_asciicompat(enc)) {
- rb_raise(rb_eArgError, "invalid class path encoding (non ASCII)");
- }
-
- pbeg = p = path;
- pend = path + RSTRING_LEN(name);
-
- if (p >= pend || !*p) {
- wrong_name:
- rb_raise(rb_eNameError, "wrong constant name %"PRIsVALUE,
- QUOTE(name));
- }
-
- if (p + 2 < pend && p[0] == ':' && p[1] == ':') {
- if (!nestable) goto wrong_name;
- mod = rb_cObject;
- p += 2;
- pbeg = p;
- }
-
- while (p < pend) {
- VALUE part;
- long len, beglen;
-
- while (p < pend && *p != ':') p++;
-
- if (pbeg == p) goto wrong_name;
-
- id = rb_check_id_cstr(pbeg, len = p-pbeg, enc);
- beglen = pbeg-path;
-
- if (p < pend && p[0] == ':') {
- if (!nestable) goto wrong_name;
- if (p + 2 >= pend || p[1] != ':') goto wrong_name;
- p += 2;
- pbeg = p;
- }
-
- if (!RB_TYPE_P(mod, T_MODULE) && !RB_TYPE_P(mod, T_CLASS)) {
- rb_raise(rb_eTypeError, "%"PRIsVALUE" does not refer to class/module",
- QUOTE(name));
- }
-
- if (!id) {
- if (!ISUPPER(*pbeg) || !rb_enc_symname2_p(pbeg, len, enc)) {
- part = rb_str_subseq(name, beglen, len);
- rb_name_error_str(part, "wrong constant name %"PRIsVALUE,
- QUOTE(part));
- }
- else if (!rb_method_basic_definition_p(CLASS_OF(mod), id_const_missing)) {
- id = rb_intern3(pbeg, len, enc);
- }
- else {
- part = rb_str_subseq(name, beglen, len);
- rb_name_error_str(part, "uninitialized constant %"PRIsVALUE"%"PRIsVALUE,
- rb_str_subseq(name, 0, beglen),
- QUOTE(part));
- }
- }
- if (!rb_is_const_id(id)) {
- rb_name_error(id, "wrong constant name %"PRIsVALUE,
- QUOTE_ID(id));
- }
- mod = RTEST(recur) ? rb_const_get(mod, id) : rb_const_get_at(mod, id);
+ id = rb_to_id(name);
+ if (!rb_is_const_id(id)) {
+ rb_name_error(id, "wrong constant name %s", rb_id2name(id));
}
-
- return mod;
+ return RTEST(recur) ? rb_const_get(mod, id) : rb_const_get_at(mod, id);
}
/*
@@ -2070,8 +1711,7 @@ rb_mod_const_set(VALUE mod, VALUE name, VALUE value)
ID id = rb_to_id(name);
if (!rb_is_const_id(id)) {
- rb_name_error(id, "wrong constant name %"PRIsVALUE,
- QUOTE_ID(id));
+ rb_name_error(id, "wrong constant name %s", rb_id2name(id));
}
rb_const_set(mod, id, value);
return value;
@@ -2081,40 +1721,12 @@ rb_mod_const_set(VALUE mod, VALUE name, VALUE value)
* call-seq:
* mod.const_defined?(sym, inherit=true) -> true or false
*
- * Says whether _mod_ or its ancestors have a constant with the given name:
- *
- * Float.const_defined?(:EPSILON) #=> true, found in Float itself
- * Float.const_defined?("String") #=> true, found in Object (ancestor)
- * BasicObject.const_defined?(:Hash) #=> false
- *
- * If _mod_ is a +Module+, additionally +Object+ and its ancestors are checked:
- *
- * Math.const_defined?(:String) #=> true, found in Object
- *
- * In each of the checked classes or modules, if the constant is not present
- * but there is an autoload for it, +true+ is returned directly without
- * autoloading:
- *
- * module Admin
- * autoload :User, 'admin/user'
- * end
- * Admin.const_defined?(:User) #=> true
- *
- * If the constant is not found the callback +const_missing+ is *not* called
- * and the method returns +false+.
- *
- * If +inherit+ is false, the lookup only checks the constants in the receiver:
- *
- * IO.const_defined?(:SYNC) #=> true, found in File::Constants (ancestor)
- * IO.const_defined?(:SYNC, false) #=> false, not found in IO itself
- *
- * In this case, the same logic for autoloading applies.
- *
- * If the argument is not a valid constant name +NameError+ is raised with the
- * message "wrong constant name _name_":
- *
- * Hash.const_defined? 'foobar' #=> NameError: wrong constant name foobar
+ * Returns <code>true</code> if a constant with the given name is
+ * defined by <i>mod</i>, or its ancestors if +inherit+ is not false.
*
+ * Math.const_defined? "PI" #=> true
+ * IO.const_defined? "SYNC" #=> true
+ * IO.const_defined? "SYNC", false #=> false
*/
static VALUE
@@ -2130,22 +1742,18 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod)
else {
rb_scan_args(argc, argv, "11", &name, &recur);
}
- if (!(id = rb_check_id(&name))) {
- if (rb_is_const_name(name)) {
- return Qfalse;
- }
- else {
- rb_name_error_str(name, "wrong constant name %"PRIsVALUE,
- QUOTE(name));
- }
- }
+ id = rb_to_id(name);
if (!rb_is_const_id(id)) {
- rb_name_error(id, "wrong constant name %"PRIsVALUE,
- QUOTE_ID(id));
+ rb_name_error(id, "wrong constant name %s", rb_id2name(id));
}
return RTEST(recur) ? rb_const_defined(mod, id) : rb_const_defined_at(mod, id);
}
+VALUE rb_obj_methods(int argc, VALUE *argv, VALUE obj);
+VALUE rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj);
+VALUE rb_obj_private_methods(int argc, VALUE *argv, VALUE obj);
+VALUE rb_obj_public_methods(int argc, VALUE *argv, VALUE obj);
+
/*
* call-seq:
* obj.instance_variable_get(symbol) -> obj
@@ -2169,20 +1777,10 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod)
static VALUE
rb_obj_ivar_get(VALUE obj, VALUE iv)
{
- ID id = rb_check_id(&iv);
+ ID id = rb_to_id(iv);
- if (!id) {
- if (rb_is_instance_name(iv)) {
- return Qnil;
- }
- else {
- rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as an instance variable name",
- QUOTE(iv));
- }
- }
if (!rb_is_instance_id(id)) {
- rb_name_error(id, "`%"PRIsVALUE"' is not allowed as an instance variable name",
- QUOTE_ID(id));
+ rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
}
return rb_ivar_get(obj, id);
}
@@ -2213,8 +1811,7 @@ rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
ID id = rb_to_id(iv);
if (!rb_is_instance_id(id)) {
- rb_name_error(id, "`%"PRIsVALUE"' is not allowed as an instance variable name",
- QUOTE_ID(id));
+ rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
}
return rb_ivar_set(obj, id, val);
}
@@ -2240,20 +1837,10 @@ rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
static VALUE
rb_obj_ivar_defined(VALUE obj, VALUE iv)
{
- ID id = rb_check_id(&iv);
+ ID id = rb_to_id(iv);
- if (!id) {
- if (rb_is_instance_name(iv)) {
- return Qfalse;
- }
- else {
- rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as an instance variable name",
- QUOTE(iv));
- }
- }
if (!rb_is_instance_id(id)) {
- rb_name_error(id, "`%"PRIsVALUE"' is not allowed as an instance variable name",
- QUOTE_ID(id));
+ rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
}
return rb_ivar_defined(obj, id);
}
@@ -2275,21 +1862,10 @@ rb_obj_ivar_defined(VALUE obj, VALUE iv)
static VALUE
rb_mod_cvar_get(VALUE obj, VALUE iv)
{
- ID id = rb_check_id(&iv);
+ ID id = rb_to_id(iv);
- if (!id) {
- if (rb_is_class_name(iv)) {
- rb_name_error_str(iv, "uninitialized class variable %"PRIsVALUE" in %"PRIsVALUE"",
- iv, rb_class_name(obj));
- }
- else {
- rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name",
- QUOTE(iv));
- }
- }
if (!rb_is_class_id(id)) {
- rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name",
- QUOTE_ID(id));
+ rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
}
return rb_cvar_get(obj, id);
}
@@ -2317,8 +1893,7 @@ rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val)
ID id = rb_to_id(iv);
if (!rb_is_class_id(id)) {
- rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name",
- QUOTE_ID(id));
+ rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
}
rb_cvar_set(obj, id, val);
return val;
@@ -2341,20 +1916,10 @@ rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val)
static VALUE
rb_mod_cvar_defined(VALUE obj, VALUE iv)
{
- ID id = rb_check_id(&iv);
+ ID id = rb_to_id(iv);
- if (!id) {
- if (rb_is_class_name(iv)) {
- return Qfalse;
- }
- else {
- rb_name_error_str(iv, "`%"PRIsVALUE"' is not allowed as a class variable name",
- QUOTE(iv));
- }
- }
if (!rb_is_class_id(id)) {
- rb_name_error(id, "`%"PRIsVALUE"' is not allowed as a class variable name",
- QUOTE_ID(id));
+ rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
}
return rb_cvar_defined(obj, id);
}
@@ -2374,7 +1939,6 @@ static struct conv_method_tbl {
{"to_s", 0},
{NULL, 0}
};
-#define IMPLICIT_CONVERSIONS 7
static VALUE
convert_type(VALUE val, const char *tname, const char *method, int raise)
@@ -2394,16 +1958,11 @@ convert_type(VALUE val, const char *tname, const char *method, int raise)
r = rb_check_funcall(val, m, 0, 0);
if (r == Qundef) {
if (raise) {
- const char *msg = i < IMPLICIT_CONVERSIONS ?
- "no implicit conversion of" : "can't convert";
- const char *cname = NIL_P(val) ? "nil" :
- val == Qtrue ? "true" :
- val == Qfalse ? "false" :
- NULL;
- if (cname)
- rb_raise(rb_eTypeError, "%s %s into %s", msg, cname, tname);
- rb_raise(rb_eTypeError, "%s %"PRIsVALUE" into %s", msg,
- rb_obj_class(val),
+ rb_raise(rb_eTypeError, "can't convert %s into %s",
+ NIL_P(val) ? "nil" :
+ val == Qtrue ? "true" :
+ val == Qfalse ? "false" :
+ rb_obj_classname(val),
tname);
}
return Qnil;
@@ -2411,16 +1970,6 @@ convert_type(VALUE val, const char *tname, const char *method, int raise)
return r;
}
-NORETURN(static void conversion_mismatch(VALUE, const char *, const char *, VALUE));
-static void
-conversion_mismatch(VALUE val, const char *tname, const char *method, VALUE result)
-{
- VALUE cname = rb_obj_class(val);
- rb_raise(rb_eTypeError,
- "can't convert %"PRIsVALUE" to %s (%"PRIsVALUE"#%s gives %"PRIsVALUE")",
- cname, tname, cname, method, rb_obj_class(result));
-}
-
VALUE
rb_convert_type(VALUE val, int type, const char *tname, const char *method)
{
@@ -2429,7 +1978,9 @@ rb_convert_type(VALUE val, int type, const char *tname, const char *method)
if (TYPE(val) == type) return val;
v = convert_type(val, tname, method, TRUE);
if (TYPE(v) != type) {
- conversion_mismatch(val, tname, method, v);
+ const char *cname = rb_obj_classname(val);
+ rb_raise(rb_eTypeError, "can't convert %s to %s (%s#%s gives %s)",
+ cname, tname, cname, method, rb_obj_classname(v));
}
return v;
}
@@ -2444,7 +1995,9 @@ rb_check_convert_type(VALUE val, int type, const char *tname, const char *method
v = convert_type(val, tname, method, FALSE);
if (NIL_P(v)) return Qnil;
if (TYPE(v) != type) {
- conversion_mismatch(val, tname, method, v);
+ const char *cname = rb_obj_classname(val);
+ rb_raise(rb_eTypeError, "can't convert %s to %s (%s#%s gives %s)",
+ cname, tname, cname, method, rb_obj_classname(v));
}
return v;
}
@@ -2456,10 +2009,12 @@ rb_to_integer(VALUE val, const char *method)
VALUE v;
if (FIXNUM_P(val)) return val;
- if (RB_TYPE_P(val, T_BIGNUM)) return val;
+ if (TYPE(val) == T_BIGNUM) return val;
v = convert_type(val, "Integer", method, TRUE);
if (!rb_obj_is_kind_of(v, rb_cInteger)) {
- conversion_mismatch(val, "Integer", method, v);
+ const char *cname = rb_obj_classname(val);
+ rb_raise(rb_eTypeError, "can't convert %s to Integer (%s#%s gives %s)",
+ cname, cname, method, rb_obj_classname(v));
}
return v;
}
@@ -2470,7 +2025,7 @@ rb_check_to_integer(VALUE val, const char *method)
VALUE v;
if (FIXNUM_P(val)) return val;
- if (RB_TYPE_P(val, T_BIGNUM)) return val;
+ if (TYPE(val) == T_BIGNUM) return val;
v = convert_type(val, "Integer", method, FALSE);
if (!rb_obj_is_kind_of(v, rb_cInteger)) {
return Qnil;
@@ -2484,12 +2039,6 @@ rb_to_int(VALUE val)
return rb_to_integer(val, "to_int");
}
-VALUE
-rb_check_to_int(VALUE val)
-{
- return rb_check_to_integer(val, "to_int");
-}
-
static VALUE
rb_convert_to_integer(VALUE val, int base)
{
@@ -2554,15 +2103,11 @@ rb_Integer(VALUE val)
* In any case, strings should be strictly conformed to numeric
* representation. This behavior is different from that of
* <code>String#to_i</code>. Non string values will be converted using
- * <code>to_int</code>, and <code>to_i</code>. Passing <code>nil</code>
- * raises a TypeError.
+ * <code>to_int</code>, and <code>to_i</code>.
*
* Integer(123.999) #=> 123
* Integer("0x1a") #=> 26
* Integer(Time.new) #=> 1204973019
- * Integer("0930", 10) #=> 930
- * Integer("111", 2) #=> 7
- * Integer(nil) #=> TypeError
*/
static VALUE
@@ -2673,8 +2218,6 @@ rb_str_to_dbl(VALUE str, int badcheck)
{
char *s;
long len;
- double ret;
- VALUE v = 0;
StringValue(str);
s = RSTRING_PTR(str);
@@ -2684,16 +2227,14 @@ rb_str_to_dbl(VALUE str, int badcheck)
rb_raise(rb_eArgError, "string for Float contains null byte");
}
if (s[len]) { /* no sentinel somehow */
- char *p = ALLOCV(v, len);
+ char *p = ALLOCA_N(char, len+1);
+
MEMCPY(p, s, char, len);
p[len] = '\0';
s = p;
}
}
- ret = rb_cstr_to_dbl(s, badcheck);
- if (v)
- ALLOCV_END(v);
- return ret;
+ return rb_cstr_to_dbl(s, badcheck);
}
VALUE
@@ -2719,8 +2260,6 @@ rb_Float(VALUE val)
default:
return rb_convert_type(val, T_FLOAT, "Float", "to_f");
}
-
- UNREACHABLE;
}
/*
@@ -2744,7 +2283,7 @@ rb_f_float(VALUE obj, VALUE arg)
VALUE
rb_to_float(VALUE val)
{
- if (RB_TYPE_P(val, T_FLOAT)) return val;
+ if (TYPE(val) == T_FLOAT) return val;
if (!rb_obj_is_kind_of(val, rb_cNumeric)) {
rb_raise(rb_eTypeError, "can't convert %s into Float",
NIL_P(val) ? "nil" :
@@ -2758,7 +2297,7 @@ rb_to_float(VALUE val)
VALUE
rb_check_to_float(VALUE val)
{
- if (RB_TYPE_P(val, T_FLOAT)) return val;
+ if (TYPE(val) == T_FLOAT) return val;
if (!rb_obj_is_kind_of(val, rb_cNumeric)) {
return Qnil;
}
@@ -2790,10 +2329,7 @@ rb_num2dbl(VALUE val)
VALUE
rb_String(VALUE val)
{
- VALUE tmp = rb_check_string_type(val);
- if (NIL_P(tmp))
- tmp = rb_convert_type(val, T_STRING, "String", "to_s");
- return tmp;
+ return rb_convert_type(val, T_STRING, "String", "to_s");
}
@@ -2801,9 +2337,8 @@ rb_String(VALUE val)
* call-seq:
* String(arg) -> string
*
- * Returns <i>arg</i> as an <code>String</code>.
- *
- * First tries to call its <code>to_str</code> method, then its <code>to_s</code> method.
+ * Converts <i>arg</i> to a <code>String</code> by calling its
+ * <code>to_s</code> method.
*
* String(self) #=> "main"
* String(self.class) #=> "Object"
@@ -2834,9 +2369,8 @@ rb_Array(VALUE val)
* call-seq:
* Array(arg) -> array
*
- * Returns +arg+ as an Array.
- *
- * First tries to call Array#to_ary on +arg+, then Array#to_a.
+ * Returns <i>arg</i> as an <code>Array</code>. First tries to call
+ * <i>arg</i><code>.to_ary</code>, then <i>arg</i><code>.to_a</code>.
*
* Array(1..5) #=> [1, 2, 3, 4, 5]
*/
@@ -2847,57 +2381,16 @@ rb_f_array(VALUE obj, VALUE arg)
return rb_Array(arg);
}
-VALUE
-rb_Hash(VALUE val)
-{
- VALUE tmp;
-
- if (NIL_P(val)) return rb_hash_new();
- tmp = rb_check_hash_type(val);
- if (NIL_P(tmp)) {
- if (RB_TYPE_P(val, T_ARRAY) && RARRAY_LEN(val) == 0)
- return rb_hash_new();
- rb_raise(rb_eTypeError, "can't convert %s into Hash", rb_obj_classname(val));
- }
- return tmp;
-}
-
-/*
- * call-seq:
- * Hash(arg) -> hash
- *
- * Converts <i>arg</i> to a <code>Hash</code> by calling
- * <i>arg</i><code>.to_hash</code>. Returns an empty <code>Hash</code> when
- * <i>arg</i> is <tt>nil</tt> or <tt>[]</tt>.
- *
- * Hash([]) #=> {}
- * Hash(nil) #=> nil
- * Hash(key: :value) #=> {:key => :value}
- * Hash([1, 2, 3]) #=> TypeError
- */
-
-static VALUE
-rb_f_hash(VALUE obj, VALUE arg)
-{
- return rb_Hash(arg);
-}
-
/*
* Document-class: Class
*
* Classes in Ruby are first-class objects---each is an instance of
* class <code>Class</code>.
*
- * Typically, you create a new class by using:
- *
- * class Name
- * # some class describing the class behavior
- * end
- *
- * When a new class is created, an object of type Class is initialized and
- * assigned to a global constant (<code>Name</code> in this case).
- *
- * When <code>Name.new</code> is called to create a new object, the
+ * When a new class is created (typically using <code>class Name ...
+ * end</code>), an object of type <code>Class</code> is created and
+ * assigned to a global constant (<code>Name</code> in this case). When
+ * <code>Name.new</code> is called to create a new object, the
* <code>new</code> method in <code>Class</code> is run by default.
* This can be demonstrated by overriding <code>new</code> in
* <code>Class</code>:
@@ -2969,69 +2462,17 @@ rb_f_hash(VALUE obj, VALUE arg)
*
* BasicObject is the parent class of all classes in Ruby. It's an explicit
* blank class.
- *
- * BasicObject can be used for creating object hierarchies independent of
- * Ruby's object hierarchy, proxy objects like the Delegator class, or other
- * uses where namespace pollution from Ruby's methods and classes must be
- * avoided.
- *
- * To avoid polluting BasicObject for other users an appropriately named
- * subclass of BasicObject should be created instead of directly modifying
- * BasicObject:
- *
- * class MyObjectSystem < BasicObject
- * end
- *
- * BasicObject does not include Kernel (for methods like +puts+) and
- * BasicObject is outside of the namespace of the standard library so common
- * classes will not be found without a using a full class path.
- *
- * A variety of strategies can be used to provide useful portions of the
- * standard library to subclasses of BasicObject. A subclass could
- * <code>include Kernel</code> to obtain +puts+, +exit+, etc. A custom
- * Kernel-like module could be created and included or delegation can be used
- * via #method_missing:
- *
- * class MyObjectSystem < BasicObject
- * DELEGATE = [:puts, :p]
- *
- * def method_missing(name, *args, &block)
- * super unless DELEGATE.include? name
- * ::Kernel.send(name, *args, &block)
- * end
- *
- * def respond_to_missing?(name, include_private = false)
- * DELEGATE.include?(name) or super
- * end
- * end
- *
- * Access to classes and modules from the Ruby standard library can be
- * obtained in a BasicObject subclass by referencing the desired constant
- * from the root like <code>::File</code> or <code>::Enumerator</code>.
- * Like #method_missing, #const_missing can be used to delegate constant
- * lookup to +Object+:
- *
- * class MyObjectSystem < BasicObject
- * def self.const_missing(name)
- * ::Object.const_get(name)
- * end
- * end
*/
/* Document-class: Object
*
- * Object is the default root of all Ruby objects. Object inherits from
- * BasicObject which allows creating alternate object hierarchies. Methods
- * on object are available to all classes unless explicitly overridden.
+ * Object is the root of Ruby's class hierarchy. Its methods are available
+ * to all classes unless explicitly overridden.
*
* Object mixes in the Kernel module, making the built-in kernel functions
- * globally accessible. Although the instance methods of Object are defined
+ * globally accessible. Although the instance methods of Object are defined
* by the Kernel module, we have chosen to document them here for clarity.
*
- * When referencing constants in classes inheriting from Object you do not
- * need to use the full namespace. For example, referencing +File+ inside
- * +YourClass+ will find the top-level File class.
- *
* In the descriptions of Object's methods, the parameter <i>symbol</i> refers
* to a symbol, which is either a quoted string or a Symbol (such as
* <code>:name</code>).
@@ -3040,6 +2481,7 @@ rb_f_hash(VALUE obj, VALUE arg)
void
Init_Object(void)
{
+ extern void Init_class_hierarchy(void);
int i;
Init_class_hierarchy();
@@ -3055,7 +2497,7 @@ Init_Object(void)
#undef rb_intern
#define rb_intern(str) rb_intern_const(str)
- rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, 0);
+ rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, -1);
rb_define_alloc_func(rb_cBasicObject, rb_class_allocate_instance);
rb_define_method(rb_cBasicObject, "==", rb_obj_equal, 1);
rb_define_method(rb_cBasicObject, "equal?", rb_obj_equal, 1);
@@ -3066,24 +2508,11 @@ Init_Object(void)
rb_define_private_method(rb_cBasicObject, "singleton_method_removed", rb_obj_dummy, 1);
rb_define_private_method(rb_cBasicObject, "singleton_method_undefined", rb_obj_dummy, 1);
- /* Document-module: Kernel
- *
- * The Kernel module is included by class Object, so its methods are
- * available in every Ruby object.
- *
- * The Kernel instance methods are documented in class Object while the
- * module methods are documented here. These methods are called without a
- * receiver and thus can be called in functional form:
- *
- * sprintf "%.1f", 1.234 #=> "1.2"
- *
- */
rb_mKernel = rb_define_module("Kernel");
rb_include_module(rb_cObject, rb_mKernel);
rb_define_private_method(rb_cClass, "inherited", rb_obj_dummy, 1);
rb_define_private_method(rb_cModule, "included", rb_obj_dummy, 1);
rb_define_private_method(rb_cModule, "extended", rb_obj_dummy, 1);
- rb_define_private_method(rb_cModule, "prepended", rb_obj_dummy, 1);
rb_define_private_method(rb_cModule, "method_added", rb_obj_dummy, 1);
rb_define_private_method(rb_cModule, "method_removed", rb_obj_dummy, 1);
rb_define_private_method(rb_cModule, "method_undefined", rb_obj_dummy, 1);
@@ -3115,17 +2544,17 @@ Init_Object(void)
rb_define_method(rb_mKernel, "to_s", rb_any_to_s, 0);
rb_define_method(rb_mKernel, "inspect", rb_obj_inspect, 0);
- rb_define_method(rb_mKernel, "methods", rb_obj_methods, -1); /* in class.c */
+ rb_define_method(rb_mKernel, "methods", rb_obj_methods, -1);
rb_define_method(rb_mKernel, "singleton_methods", rb_obj_singleton_methods, -1); /* in class.c */
- rb_define_method(rb_mKernel, "protected_methods", rb_obj_protected_methods, -1); /* in class.c */
- rb_define_method(rb_mKernel, "private_methods", rb_obj_private_methods, -1); /* in class.c */
- rb_define_method(rb_mKernel, "public_methods", rb_obj_public_methods, -1); /* in class.c */
+ rb_define_method(rb_mKernel, "protected_methods", rb_obj_protected_methods, -1);
+ rb_define_method(rb_mKernel, "private_methods", rb_obj_private_methods, -1);
+ rb_define_method(rb_mKernel, "public_methods", rb_obj_public_methods, -1);
rb_define_method(rb_mKernel, "instance_variables", rb_obj_instance_variables, 0); /* in variable.c */
rb_define_method(rb_mKernel, "instance_variable_get", rb_obj_ivar_get, 1);
rb_define_method(rb_mKernel, "instance_variable_set", rb_obj_ivar_set, 2);
rb_define_method(rb_mKernel, "instance_variable_defined?", rb_obj_ivar_defined, 1);
- rb_define_method(rb_mKernel, "remove_instance_variable",
- rb_obj_remove_instance_variable, 1); /* in variable.c */
+ rb_define_private_method(rb_mKernel, "remove_instance_variable",
+ rb_obj_remove_instance_variable, 1); /* in variable.c */
rb_define_method(rb_mKernel, "instance_of?", rb_obj_is_instance_of, 1);
rb_define_method(rb_mKernel, "kind_of?", rb_obj_is_kind_of, 1);
@@ -3140,14 +2569,12 @@ Init_Object(void)
rb_define_global_function("String", rb_f_string, 1);
rb_define_global_function("Array", rb_f_array, 1);
- rb_define_global_function("Hash", rb_f_hash, 1);
rb_cNilClass = rb_define_class("NilClass", rb_cObject);
rb_define_method(rb_cNilClass, "to_i", nil_to_i, 0);
rb_define_method(rb_cNilClass, "to_f", nil_to_f, 0);
rb_define_method(rb_cNilClass, "to_s", nil_to_s, 0);
rb_define_method(rb_cNilClass, "to_a", nil_to_a, 0);
- rb_define_method(rb_cNilClass, "to_h", nil_to_h, 0);
rb_define_method(rb_cNilClass, "inspect", nil_inspect, 0);
rb_define_method(rb_cNilClass, "&", false_and, 1);
rb_define_method(rb_cNilClass, "|", false_or, 1);
@@ -3156,9 +2583,6 @@ Init_Object(void)
rb_define_method(rb_cNilClass, "nil?", rb_true, 0);
rb_undef_alloc_func(rb_cNilClass);
rb_undef_method(CLASS_OF(rb_cNilClass), "new");
- /*
- * An alias of +nil+
- */
rb_define_global_const("NIL", Qnil);
rb_define_method(rb_cModule, "freeze", rb_mod_freeze, 0);
@@ -3171,7 +2595,6 @@ Init_Object(void)
rb_define_method(rb_cModule, ">=", rb_mod_ge, 1);
rb_define_method(rb_cModule, "initialize_copy", rb_mod_init_copy, 1); /* in class.c */
rb_define_method(rb_cModule, "to_s", rb_mod_to_s, 0);
- rb_define_alias(rb_cModule, "inspect", "to_s");
rb_define_method(rb_cModule, "included_modules", rb_mod_included_modules, 0); /* in class.c */
rb_define_method(rb_cModule, "include?", rb_mod_include_p, 1); /* in class.c */
rb_define_method(rb_cModule, "name", rb_mod_name, 0); /* in variable.c */
@@ -3201,57 +2624,41 @@ Init_Object(void)
rb_define_method(rb_cModule, "const_missing",
rb_mod_const_missing, 1); /* in variable.c */
rb_define_method(rb_cModule, "class_variables",
- rb_mod_class_variables, -1); /* in variable.c */
+ rb_mod_class_variables, 0); /* in variable.c */
rb_define_method(rb_cModule, "remove_class_variable",
rb_mod_remove_cvar, 1); /* in variable.c */
rb_define_method(rb_cModule, "class_variable_get", rb_mod_cvar_get, 1);
rb_define_method(rb_cModule, "class_variable_set", rb_mod_cvar_set, 2);
rb_define_method(rb_cModule, "class_variable_defined?", rb_mod_cvar_defined, 1);
- rb_define_method(rb_cModule, "public_constant", rb_mod_public_constant, -1); /* in variable.c */
- rb_define_method(rb_cModule, "private_constant", rb_mod_private_constant, -1); /* in variable.c */
rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0);
rb_define_method(rb_cClass, "new", rb_class_new_instance, -1);
rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1);
+ rb_define_method(rb_cClass, "initialize_copy", rb_class_init_copy, 1); /* in class.c */
rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0);
rb_define_alloc_func(rb_cClass, rb_class_s_alloc);
rb_undef_method(rb_cClass, "extend_object");
rb_undef_method(rb_cClass, "append_features");
- rb_undef_method(rb_cClass, "prepend_features");
-
- /*
- * Document-class: Data
- *
- * This is a recommended base class for C extensions using Data_Make_Struct
- * or Data_Wrap_Struct, see README.EXT for details.
- */
+
rb_cData = rb_define_class("Data", rb_cObject);
rb_undef_alloc_func(rb_cData);
rb_cTrueClass = rb_define_class("TrueClass", rb_cObject);
rb_define_method(rb_cTrueClass, "to_s", true_to_s, 0);
- rb_define_alias(rb_cTrueClass, "inspect", "to_s");
rb_define_method(rb_cTrueClass, "&", true_and, 1);
rb_define_method(rb_cTrueClass, "|", true_or, 1);
rb_define_method(rb_cTrueClass, "^", true_xor, 1);
rb_undef_alloc_func(rb_cTrueClass);
rb_undef_method(CLASS_OF(rb_cTrueClass), "new");
- /*
- * An alias of +true+
- */
rb_define_global_const("TRUE", Qtrue);
rb_cFalseClass = rb_define_class("FalseClass", rb_cObject);
rb_define_method(rb_cFalseClass, "to_s", false_to_s, 0);
- rb_define_alias(rb_cFalseClass, "inspect", "to_s");
rb_define_method(rb_cFalseClass, "&", false_and, 1);
rb_define_method(rb_cFalseClass, "|", false_or, 1);
rb_define_method(rb_cFalseClass, "^", false_xor, 1);
rb_undef_alloc_func(rb_cFalseClass);
rb_undef_method(CLASS_OF(rb_cFalseClass), "new");
- /*
- * An alias of +false+
- */
rb_define_global_const("FALSE", Qfalse);
id_eq = rb_intern("==");
@@ -3261,7 +2668,6 @@ Init_Object(void)
id_init_copy = rb_intern("initialize_copy");
id_init_clone = rb_intern("initialize_clone");
id_init_dup = rb_intern("initialize_dup");
- id_const_missing = rb_intern("const_missing");
for (i=0; conv_method_names[i].method; i++) {
conv_method_names[i].id = rb_intern(conv_method_names[i].method);
diff --git a/pack.c b/pack.c
index 0ed54cdcbb..7366b765a7 100644
--- a/pack.c
+++ b/pack.c
@@ -20,6 +20,10 @@
((__GNUC__ > (major)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))
+
+#define SIZE16 2
+#define SIZE32 4
+
#if SIZEOF_SHORT != 2 || SIZEOF_LONG != 4
# define NATINT_PACK
#endif
@@ -88,27 +92,27 @@ TOKEN_PASTE(swap,x)(xtype z) \
#endif
#ifndef swap16
-# define swap16(x) ((uint16_t)((((x)&0xFF)<<8) | (((x)>>8)&0xFF)))
+# define swap16(x) ((((x)&0xFF)<<8) | (((x)>>8)&0xFF))
#endif
#ifndef swap32
-# define swap32(x) ((uint32_t)((((x)&0xFF)<<24) \
+# define swap32(x) ((((x)&0xFF)<<24) \
|(((x)>>24)&0xFF) \
|(((x)&0x0000FF00)<<8) \
- |(((x)&0x00FF0000)>>8) ))
+ |(((x)&0x00FF0000)>>8) )
#endif
#ifndef swap64
# ifdef HAVE_INT64_T
# define byte_in_64bit(n) ((uint64_t)0xff << (n))
-# define swap64(x) ((uint64_t)((((x)&byte_in_64bit(0))<<56) \
+# define swap64(x) ((((x)&byte_in_64bit(0))<<56) \
|(((x)>>56)&0xFF) \
|(((x)&byte_in_64bit(8))<<40) \
|(((x)&byte_in_64bit(48))>>40) \
|(((x)&byte_in_64bit(16))<<24) \
|(((x)&byte_in_64bit(40))>>24) \
|(((x)&byte_in_64bit(24))<<8) \
- |(((x)&byte_in_64bit(32))>>8)))
+ |(((x)&byte_in_64bit(32))>>8))
# endif
#endif
@@ -144,35 +148,61 @@ TOKEN_PASTE(swap,x)(xtype z) \
# endif
#endif
-#if SIZEOF_FLOAT == 4 && defined(HAVE_INT32_T)
-# define swapf(x) swap32(x)
-# define FLOAT_SWAPPER uint32_t
-#else
- define_swapx(f,float)
-#endif
+#if SIZEOF_FLOAT == 4
+# ifdef HAVE_UINT32_T
+# define swapf(x) swap32(x)
+# define FLOAT_SWAPPER uint32_t
+# else /* SIZEOF_FLOAT == 4 but undivide by known size of int */
+ define_swapx(f,float)
+# endif
+#else /* SIZEOF_FLOAT != 4 */
+ define_swapx(f,float)
+#endif /* #if SIZEOF_FLOAT == 4 */
+
+#if SIZEOF_DOUBLE == 8
+# ifdef HAVE_UINT64_T /* SIZEOF_DOUBLE == 8 == SIZEOF_UINT64_T */
+# define swapd(x) swap64(x)
+# define DOUBLE_SWAPPER uint64_t
+# else
+# if SIZEOF_LONG == 4 /* SIZEOF_DOUBLE == 8 && 4 == SIZEOF_LONG */
+ static double
+ swapd(const double d)
+ {
+ double dtmp = d;
+ unsigned long utmp[2];
+ unsigned long utmp0;
-#if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T)
-# define swapd(x) swap64(x)
-# define DOUBLE_SWAPPER uint64_t
-#elif SIZEOF_DOUBLE == 8 && defined(HAVE_INT32_T)
+ utmp[0] = 0; utmp[1] = 0;
+ memcpy(utmp,&dtmp,sizeof(double));
+ utmp0 = utmp[0];
+ utmp[0] = swapl(utmp[1]);
+ utmp[1] = swapl(utmp0);
+ memcpy(&dtmp,utmp,sizeof(double));
+ return dtmp;
+ }
+# elif SIZEOF_SHORT == 4 /* SIZEOF_DOUBLE == 8 && 4 == SIZEOF_SHORT */
static double
swapd(const double d)
{
double dtmp = d;
- uint32_t utmp[2];
- uint32_t utmp0;
+ unsigned short utmp[2];
+ unsigned short utmp0;
utmp[0] = 0; utmp[1] = 0;
memcpy(utmp,&dtmp,sizeof(double));
utmp0 = utmp[0];
- utmp[0] = swap32(utmp[1]);
- utmp[1] = swap32(utmp0);
+ utmp[0] = swaps(utmp[1]);
+ utmp[1] = swaps(utmp0);
memcpy(&dtmp,utmp,sizeof(double));
return dtmp;
}
-#else
+# else /* SIZEOF_DOUBLE == 8 but undivide by known size of int */
define_swapx(d, double)
-#endif
+# endif
+# endif /* #if SIZEOF_LONG == 8 */
+#else /* SIZEOF_DOUBLE != 8 */
+ define_swapx(d, double)
+#endif /* #if SIZEOF_DOUBLE == 8 */
#undef define_swapx
@@ -187,22 +217,22 @@ TOKEN_PASTE(swap,x)(xtype z) \
#ifdef FLOAT_SWAPPER
# define FLOAT_CONVWITH(y) FLOAT_SWAPPER y;
-# define HTONF(x,y) (memcpy(&(y),&(x),sizeof(float)), \
- (y) = rb_htonf((FLOAT_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(float)), \
- (x))
-# define HTOVF(x,y) (memcpy(&(y),&(x),sizeof(float)), \
- (y) = rb_htovf((FLOAT_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(float)), \
- (x))
-# define NTOHF(x,y) (memcpy(&(y),&(x),sizeof(float)), \
- (y) = rb_ntohf((FLOAT_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(float)), \
- (x))
-# define VTOHF(x,y) (memcpy(&(y),&(x),sizeof(float)), \
- (y) = rb_vtohf((FLOAT_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(float)), \
- (x))
+# define HTONF(x,y) (memcpy(&y,&x,sizeof(float)), \
+ y = rb_htonf((FLOAT_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(float)), \
+ x)
+# define HTOVF(x,y) (memcpy(&y,&x,sizeof(float)), \
+ y = rb_htovf((FLOAT_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(float)), \
+ x)
+# define NTOHF(x,y) (memcpy(&y,&x,sizeof(float)), \
+ y = rb_ntohf((FLOAT_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(float)), \
+ x)
+# define VTOHF(x,y) (memcpy(&y,&x,sizeof(float)), \
+ y = rb_vtohf((FLOAT_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(float)), \
+ x)
#else
# define FLOAT_CONVWITH(y)
# define HTONF(x,y) rb_htonf(x)
@@ -213,22 +243,22 @@ TOKEN_PASTE(swap,x)(xtype z) \
#ifdef DOUBLE_SWAPPER
# define DOUBLE_CONVWITH(y) DOUBLE_SWAPPER y;
-# define HTOND(x,y) (memcpy(&(y),&(x),sizeof(double)), \
- (y) = rb_htond((DOUBLE_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(double)), \
- (x))
-# define HTOVD(x,y) (memcpy(&(y),&(x),sizeof(double)), \
- (y) = rb_htovd((DOUBLE_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(double)), \
- (x))
-# define NTOHD(x,y) (memcpy(&(y),&(x),sizeof(double)), \
- (y) = rb_ntohd((DOUBLE_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(double)), \
- (x))
-# define VTOHD(x,y) (memcpy(&(y),&(x),sizeof(double)), \
- (y) = rb_vtohd((DOUBLE_SWAPPER)(y)), \
- memcpy(&(x),&(y),sizeof(double)), \
- (x))
+# define HTOND(x,y) (memcpy(&y,&x,sizeof(double)), \
+ y = rb_htond((DOUBLE_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(double)), \
+ x)
+# define HTOVD(x,y) (memcpy(&y,&x,sizeof(double)), \
+ y = rb_htovd((DOUBLE_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(double)), \
+ x)
+# define NTOHD(x,y) (memcpy(&y,&x,sizeof(double)), \
+ y = rb_ntohd((DOUBLE_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(double)), \
+ x)
+# define VTOHD(x,y) (memcpy(&y,&x,sizeof(double)), \
+ y = rb_vtohd((DOUBLE_SWAPPER)y), \
+ memcpy(&x,&y,sizeof(double)), \
+ x)
#else
# define DOUBLE_CONVWITH(y)
# define HTOND(x,y) rb_htond(x)
@@ -237,20 +267,22 @@ TOKEN_PASTE(swap,x)(xtype z) \
# define VTOHD(x,y) rb_vtohd(x)
#endif
+VALUE rb_big2ulong_pack(VALUE x);
+
static unsigned long
num2i32(VALUE x)
{
x = rb_to_int(x); /* is nil OK? (should not) */
if (FIXNUM_P(x)) return FIX2LONG(x);
- if (RB_TYPE_P(x, T_BIGNUM)) {
+ if (TYPE(x) == T_BIGNUM) {
return rb_big2ulong_pack(x);
}
rb_raise(rb_eTypeError, "can't convert %s to `integer'", rb_obj_classname(x));
-
- UNREACHABLE;
+ return 0; /* not reached */
}
+#define QUAD_SIZE 8
#define MAX_INTEGER_PACK_SIZE 8
/* #define FORCE_BIG_PACK */
@@ -261,31 +293,6 @@ static void qpencode(VALUE,VALUE,long);
static unsigned long utf8_to_uv(const char*,long*);
-static ID id_associated;
-
-static void
-str_associate(VALUE str, VALUE add)
-{
- VALUE assoc;
-
- assoc = rb_attr_get(str, id_associated);
- if (RB_TYPE_P(assoc, T_ARRAY)) {
- /* already associated */
- rb_ary_concat(assoc, add);
- }
- else {
- rb_ivar_set(str, id_associated, add);
- }
-}
-
-static VALUE
-str_associated(VALUE str)
-{
- VALUE assoc = rb_attr_get(str, id_associated);
- if (NIL_P(assoc)) assoc = Qfalse;
- return assoc;
-}
-
/*
* call-seq:
* arr.pack ( aTemplateString ) -> aBinaryString
@@ -315,15 +322,15 @@ str_associated(VALUE str)
* Integer | Array |
* Directive | Element | Meaning
* ---------------------------------------------------------------------------
- * C | Integer | 8-bit unsigned (unsigned char)
- * S | Integer | 16-bit unsigned, native endian (uint16_t)
- * L | Integer | 32-bit unsigned, native endian (uint32_t)
- * Q | Integer | 64-bit unsigned, native endian (uint64_t)
+ * C | Integer | 8-bit unsigned integer (unsigned char)
+ * S | Integer | 16-bit unsigned integer, native endian (uint16_t)
+ * L | Integer | 32-bit unsigned integer, native endian (uint32_t)
+ * Q | Integer | 64-bit unsigned integer, native endian (uint64_t)
* | |
- * c | Integer | 8-bit signed (signed char)
- * s | Integer | 16-bit signed, native endian (int16_t)
- * l | Integer | 32-bit signed, native endian (int32_t)
- * q | Integer | 64-bit signed, native endian (int64_t)
+ * c | Integer | 8-bit signed integer (char)
+ * s | Integer | 16-bit signed integer, native endian (int16_t)
+ * l | Integer | 32-bit signed integer, native endian (int32_t)
+ * q | Integer | 64-bit signed integer, native endian (int64_t)
* | |
* S_, S! | Integer | unsigned short, native endian
* I, I_, I! | Integer | unsigned int, native endian
@@ -333,38 +340,24 @@ str_associated(VALUE str)
* i, i_, i! | Integer | signed int, native endian
* l_, l! | Integer | signed long, native endian
* | |
- * S> L> Q> | Integer | same as the directives without ">" except
- * s> l> q> | | big endian
- * S!> I!> | | (available since Ruby 1.9.3)
- * L!> | | "S>" is same as "n"
- * s!> i!> | | "L>" is same as "N"
- * l!> | |
- * | |
- * S< L< Q< | Integer | same as the directives without "<" except
- * s< l< q< | | little endian
- * S!< I!< | | (available since Ruby 1.9.3)
- * L!< | | "S<" is same as "v"
- * s!< i!< | | "L<" is same as "V"
- * l!< | |
- * | |
- * n | Integer | 16-bit unsigned, network (big-endian) byte order
- * N | Integer | 32-bit unsigned, network (big-endian) byte order
- * v | Integer | 16-bit unsigned, VAX (little-endian) byte order
- * V | Integer | 32-bit unsigned, VAX (little-endian) byte order
+ * n | Integer | 16-bit unsigned integer, network (big-endian) byte order
+ * N | Integer | 32-bit unsigned integer, network (big-endian) byte order
+ * v | Integer | 16-bit unsigned integer, VAX (little-endian) byte order
+ * V | Integer | 32-bit unsigned integer, VAX (little-endian) byte order
* | |
* U | Integer | UTF-8 character
* w | Integer | BER-compressed integer
- *
+ *
* Float | |
* Directive | | Meaning
* ---------------------------------------------------------------------------
- * D, d | Float | double-precision, native format
- * F, f | Float | single-precision, native format
- * E | Float | double-precision, little-endian byte order
- * e | Float | single-precision, little-endian byte order
- * G | Float | double-precision, network (big-endian) byte order
- * g | Float | single-precision, network (big-endian) byte order
- *
+ * D, d | Float | double-precision float, native format
+ * F, f | Float | single-precision float, native format
+ * E | Float | double-precision float, little-endian byte order
+ * e | Float | single-precision float, little-endian byte order
+ * G | Float | double-precision float, network (big-endian) byte order
+ * g | Float | single-precision float, network (big-endian) byte order
+ *
* String | |
* Directive | | Meaning
* ---------------------------------------------------------------------------
@@ -381,7 +374,7 @@ str_associated(VALUE str)
* | | (if count is 0, no line feed are added, see RFC 4648)
* P | String | pointer to a structure (fixed-length string)
* p | String | pointer to a null-terminated string
- *
+ *
* Misc. | |
* Directive | | Meaning
* ---------------------------------------------------------------------------
@@ -404,7 +397,7 @@ pack_pack(VALUE ary, VALUE fmt)
#ifdef NATINT_PACK
int natint; /* native integer */
#endif
- int integer_size, bigendian_p;
+ int signed_p, integer_size, bigendian_p;
StringValue(fmt);
p = RSTRING_PTR(fmt);
@@ -419,7 +412,6 @@ pack_pack(VALUE ary, VALUE fmt)
#define NEXTFROM (items-- > 0 ? RARRAY_PTR(ary)[idx++] : TOO_FEW)
while (p < pend) {
- int explicit_endian = 0;
if (RSTRING_PTR(fmt) + RSTRING_LEN(fmt) != pend) {
rb_raise(rb_eRuntimeError, "format string modified");
}
@@ -435,39 +427,19 @@ pack_pack(VALUE ary, VALUE fmt)
}
continue;
}
-
- {
+ if (*p == '_' || *p == '!') {
static const char natstr[] = "sSiIlL";
- static const char endstr[] = "sSiIlLqQ";
- modifiers:
- switch (*p) {
- case '_':
- case '!':
- if (strchr(natstr, type)) {
+ if (strchr(natstr, type)) {
#ifdef NATINT_PACK
- natint = 1;
+ natint = 1;
#endif
- p++;
- }
- else {
- rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
- }
- goto modifiers;
-
- case '<':
- case '>':
- if (!strchr(endstr, type)) {
- rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, endstr);
- }
- if (explicit_endian) {
- rb_raise(rb_eRangeError, "Can't use both '<' and '>'");
- }
- explicit_endian = *p++;
- goto modifiers;
+ p++;
+ }
+ else {
+ rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
}
}
-
if (*p == '*') { /* set data length */
len = strchr("@Xxu", type) ? 0
: strchr("PMm", type) ? 1
@@ -537,8 +509,6 @@ pack_pack(VALUE ary, VALUE fmt)
}
break;
-#define castchar(from) (char)((from) & 0xff)
-
case 'b': /* bit string (ascending) */
{
int byte = 0;
@@ -554,7 +524,7 @@ pack_pack(VALUE ary, VALUE fmt)
if (i & 7)
byte >>= 1;
else {
- char c = castchar(byte);
+ char c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
byte = 0;
}
@@ -562,7 +532,7 @@ pack_pack(VALUE ary, VALUE fmt)
if (len & 7) {
char c;
byte >>= 7 - (len & 7);
- c = castchar(byte);
+ c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
}
len = j;
@@ -584,7 +554,7 @@ pack_pack(VALUE ary, VALUE fmt)
if (i & 7)
byte <<= 1;
else {
- char c = castchar(byte);
+ char c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
byte = 0;
}
@@ -592,7 +562,7 @@ pack_pack(VALUE ary, VALUE fmt)
if (len & 7) {
char c;
byte <<= 7 - (len & 7);
- c = castchar(byte);
+ c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
}
len = j;
@@ -617,13 +587,13 @@ pack_pack(VALUE ary, VALUE fmt)
if (i & 1)
byte >>= 4;
else {
- char c = castchar(byte);
+ char c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
byte = 0;
}
}
if (len & 1) {
- char c = castchar(byte);
+ char c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
}
len = j;
@@ -648,13 +618,13 @@ pack_pack(VALUE ary, VALUE fmt)
if (i & 1)
byte <<= 4;
else {
- char c = castchar(byte);
+ char c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
byte = 0;
}
}
if (len & 1) {
- char c = castchar(byte);
+ char c = byte & 0xff;
rb_str_buf_cat(res, &c, 1);
}
len = j;
@@ -676,70 +646,78 @@ pack_pack(VALUE ary, VALUE fmt)
break;
case 's': /* signed short */
+ signed_p = 1;
integer_size = NATINT_LEN(short, 2);
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'S': /* unsigned short */
+ signed_p = 0;
integer_size = NATINT_LEN(short, 2);
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'i': /* signed int */
+ signed_p = 1;
integer_size = (int)sizeof(int);
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'I': /* unsigned int */
+ signed_p = 0;
integer_size = (int)sizeof(int);
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'l': /* signed long */
+ signed_p = 1;
integer_size = NATINT_LEN(long, 4);
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'L': /* unsigned long */
+ signed_p = 0;
integer_size = NATINT_LEN(long, 4);
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'q': /* signed quad (64bit) int */
- integer_size = 8;
+ signed_p = 1;
+ integer_size = 8;
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'Q': /* unsigned quad (64bit) int */
- integer_size = 8;
+ signed_p = 0;
+ integer_size = 8;
bigendian_p = BIGENDIAN_P();
goto pack_integer;
case 'n': /* unsigned short (network byte-order) */
+ signed_p = 0;
integer_size = 2;
bigendian_p = 1;
goto pack_integer;
case 'N': /* unsigned long (network byte-order) */
+ signed_p = 0;
integer_size = 4;
bigendian_p = 1;
goto pack_integer;
case 'v': /* unsigned short (VAX byte-order) */
+ signed_p = 0;
integer_size = 2;
bigendian_p = 0;
goto pack_integer;
case 'V': /* unsigned long (VAX byte-order) */
+ signed_p = 0;
integer_size = 4;
bigendian_p = 0;
goto pack_integer;
pack_integer:
- if (explicit_endian) {
- bigendian_p = explicit_endian == '>';
- }
-
switch (integer_size) {
#if defined(HAVE_INT16_T) && !defined(FORCE_BIG_PACK)
case SIZEOF_INT16_T:
@@ -952,8 +930,6 @@ pack_pack(VALUE ary, VALUE fmt)
}
if (len <= 2)
len = 45;
- else if (len > 63 && type == 'u')
- len = 63;
else
len = len / 3 * 3;
while (plen > 0) {
@@ -1013,11 +989,11 @@ pack_pack(VALUE ary, VALUE fmt)
char c, *bufs, *bufe;
from = NEXTFROM;
- if (RB_TYPE_P(from, T_BIGNUM)) {
+ if (TYPE(from) == T_BIGNUM) {
VALUE big128 = rb_uint2big(128);
- while (RB_TYPE_P(from, T_BIGNUM)) {
+ while (TYPE(from) == T_BIGNUM) {
from = rb_big_divmod(from, big128);
- c = castchar(NUM2INT(RARRAY_PTR(from)[1]) | 0x80); /* mod */
+ c = NUM2INT(RARRAY_PTR(from)[1]) | 0x80; /* mod */
rb_str_buf_cat(buf, &c, sizeof(char));
from = RARRAY_PTR(from)[0]; /* div */
}
@@ -1032,7 +1008,7 @@ pack_pack(VALUE ary, VALUE fmt)
}
while (ul) {
- c = castchar((ul & 0x7f) | 0x80);
+ c = (char)(ul & 0x7f) | 0x80;
rb_str_buf_cat(buf, &c, sizeof(char));
ul >>= 7;
}
@@ -1056,14 +1032,12 @@ pack_pack(VALUE ary, VALUE fmt)
break;
default:
- rb_warning("unknown pack directive '%c' in '%s'",
- type, RSTRING_PTR(fmt));
break;
}
}
if (associates) {
- str_associate(res, associates);
+ rb_str_associate(res, associates);
}
OBJ_INFECT(res, fmt);
switch (enc_info) {
@@ -1091,7 +1065,7 @@ encodes(VALUE str, const char *s, long len, int type, int tail_lf)
char buff[4096];
long i = 0;
const char *trans = type == 'u' ? uu_table : b64_table;
- char padding;
+ int padding;
if (type == 'u') {
buff[i++] = (char)len + ' ';
@@ -1206,11 +1180,11 @@ hex2num(char c)
#define PACK_LENGTH_ADJUST_SIZE(sz) do { \
tmp_len = 0; \
- if (len > (long)((send-s)/(sz))) { \
+ if (len > (long)((send-s)/sz)) { \
if (!star) { \
- tmp_len = len-(send-s)/(sz); \
+ tmp_len = len-(send-s)/sz; \
} \
- len = (send-s)/(sz); \
+ len = (send-s)/sz; \
} \
} while (0)
@@ -1261,15 +1235,15 @@ infected_str_new(const char *ptr, long len, VALUE str)
* Integer | |
* Directive | Returns | Meaning
* -----------------------------------------------------------------
- * C | Integer | 8-bit unsigned (unsigned char)
- * S | Integer | 16-bit unsigned, native endian (uint16_t)
- * L | Integer | 32-bit unsigned, native endian (uint32_t)
- * Q | Integer | 64-bit unsigned, native endian (uint64_t)
+ * C | Integer | 8-bit unsigned integer (unsigned char)
+ * S | Integer | 16-bit unsigned integer, native endian (uint16_t)
+ * L | Integer | 32-bit unsigned integer, native endian (uint32_t)
+ * Q | Integer | 64-bit unsigned integer, native endian (uint64_t)
* | |
- * c | Integer | 8-bit signed (signed char)
- * s | Integer | 16-bit signed, native endian (int16_t)
- * l | Integer | 32-bit signed, native endian (int32_t)
- * q | Integer | 64-bit signed, native endian (int64_t)
+ * c | Integer | 8-bit signed integer (signed char)
+ * s | Integer | 16-bit signed integer, native endian (int16_t)
+ * l | Integer | 32-bit signed integer, native endian (int32_t)
+ * q | Integer | 64-bit signed integer, native endian (int64_t)
* | |
* S_, S! | Integer | unsigned short, native endian
* I, I_, I! | Integer | unsigned int, native endian
@@ -1279,38 +1253,24 @@ infected_str_new(const char *ptr, long len, VALUE str)
* i, i_, i! | Integer | signed int, native endian
* l_, l! | Integer | signed long, native endian
* | |
- * S> L> Q> | Integer | same as the directives without ">" except
- * s> l> q> | | big endian
- * S!> I!> | | (available since Ruby 1.9.3)
- * L!> Q!> | | "S>" is same as "n"
- * s!> i!> | | "L>" is same as "N"
- * l!> q!> | |
- * | |
- * S< L< Q< | Integer | same as the directives without "<" except
- * s< l< q< | | little endian
- * S!< I!< | | (available since Ruby 1.9.3)
- * L!< Q!< | | "S<" is same as "v"
- * s!< i!< | | "L<" is same as "V"
- * l!< q!< | |
- * | |
- * n | Integer | 16-bit unsigned, network (big-endian) byte order
- * N | Integer | 32-bit unsigned, network (big-endian) byte order
- * v | Integer | 16-bit unsigned, VAX (little-endian) byte order
- * V | Integer | 32-bit unsigned, VAX (little-endian) byte order
+ * n | Integer | 16-bit unsigned integer, network (big-endian) byte order
+ * N | Integer | 32-bit unsigned integer, network (big-endian) byte order
+ * v | Integer | 16-bit unsigned integer, VAX (little-endian) byte order
+ * V | Integer | 32-bit unsigned integer, VAX (little-endian) byte order
* | |
* U | Integer | UTF-8 character
* w | Integer | BER-compressed integer (see Array.pack)
- *
+ *
* Float | |
* Directive | Returns | Meaning
* -----------------------------------------------------------------
- * D, d | Float | double-precision, native format
- * F, f | Float | single-precision, native format
- * E | Float | double-precision, little-endian byte order
- * e | Float | single-precision, little-endian byte order
- * G | Float | double-precision, network (big-endian) byte order
- * g | Float | single-precision, network (big-endian) byte order
- *
+ * D, d | Float | double-precision float, native format
+ * F, f | Float | single-precision float, native format
+ * E | Float | double-precision float, little-endian byte order
+ * e | Float | single-precision float, little-endian byte order
+ * G | Float | double-precision float, network (big-endian) byte order
+ * g | Float | single-precision float, network (big-endian) byte order
+ *
* String | |
* Directive | Returns | Meaning
* -----------------------------------------------------------------
@@ -1327,7 +1287,7 @@ infected_str_new(const char *ptr, long len, VALUE str)
* | | base64 encoded string (RFC 4648) if followed by 0
* P | String | pointer to a structure (fixed-length string)
* p | String | pointer to a null-terminated string
- *
+ *
* Misc. | |
* Directive | Returns | Meaning
* -----------------------------------------------------------------
@@ -1370,7 +1330,6 @@ pack_unpack(VALUE str, VALUE fmt)
ary = block_p ? Qnil : rb_ary_new();
while (p < pend) {
- int explicit_endian = 0;
type = *p++;
#ifdef NATINT_PACK
natint = 0;
@@ -1383,41 +1342,20 @@ pack_unpack(VALUE str, VALUE fmt)
}
continue;
}
-
star = 0;
- {
+ if (*p == '_' || *p == '!') {
static const char natstr[] = "sSiIlL";
- static const char endstr[] = "sSiIlLqQ";
-
- modifiers:
- switch (*p) {
- case '_':
- case '!':
- if (strchr(natstr, type)) {
+ if (strchr(natstr, type)) {
#ifdef NATINT_PACK
- natint = 1;
+ natint = 1;
#endif
- p++;
- }
- else {
- rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
- }
- goto modifiers;
-
- case '<':
- case '>':
- if (!strchr(endstr, type)) {
- rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, endstr);
- }
- if (explicit_endian) {
- rb_raise(rb_eRangeError, "Can't use both '<' and '>'");
- }
- explicit_endian = *p++;
- goto modifiers;
+ p++;
+ }
+ else {
+ rb_raise(rb_eArgError, "'%c' allowed only after types %s", *p, natstr);
}
}
-
if (p >= pend)
len = 1;
else if (*p == '*') {
@@ -1484,7 +1422,7 @@ pack_unpack(VALUE str, VALUE fmt)
if (p[-1] == '*' || len > (send - s) * 8)
len = (send - s) * 8;
bits = 0;
- UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
+ UNPACK_PUSH(bitstr = rb_str_new(0, len));
t = RSTRING_PTR(bitstr);
for (i=0; i<len; i++) {
if (i & 7) bits >>= 1;
@@ -1504,7 +1442,7 @@ pack_unpack(VALUE str, VALUE fmt)
if (p[-1] == '*' || len > (send - s) * 8)
len = (send - s) * 8;
bits = 0;
- UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
+ UNPACK_PUSH(bitstr = rb_str_new(0, len));
t = RSTRING_PTR(bitstr);
for (i=0; i<len; i++) {
if (i & 7) bits <<= 1;
@@ -1524,7 +1462,7 @@ pack_unpack(VALUE str, VALUE fmt)
if (p[-1] == '*' || len > (send - s) * 2)
len = (send - s) * 2;
bits = 0;
- UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
+ UNPACK_PUSH(bitstr = rb_str_new(0, len));
t = RSTRING_PTR(bitstr);
for (i=0; i<len; i++) {
if (i & 1)
@@ -1546,7 +1484,7 @@ pack_unpack(VALUE str, VALUE fmt)
if (p[-1] == '*' || len > (send - s) * 2)
len = (send - s) * 2;
bits = 0;
- UNPACK_PUSH(bitstr = rb_usascii_str_new(0, len));
+ UNPACK_PUSH(bitstr = rb_str_new(0, len));
t = RSTRING_PTR(bitstr);
for (i=0; i<len; i++) {
if (i & 1)
@@ -1615,13 +1553,13 @@ pack_unpack(VALUE str, VALUE fmt)
case 'q':
signed_p = 1;
- integer_size = 8;
+ integer_size = QUAD_SIZE;
bigendian_p = BIGENDIAN_P();
goto unpack_integer;
case 'Q':
signed_p = 0;
- integer_size = 8;
+ integer_size = QUAD_SIZE;
bigendian_p = BIGENDIAN_P();
goto unpack_integer;
@@ -1650,10 +1588,6 @@ pack_unpack(VALUE str, VALUE fmt)
goto unpack_integer;
unpack_integer:
- if (explicit_endian) {
- bigendian_p = explicit_endian == '>';
- }
-
switch (integer_size) {
#if defined(HAVE_INT16_T) && !defined(FORCE_BIG_PACK)
case SIZEOF_INT16_T:
@@ -1756,7 +1690,7 @@ pack_unpack(VALUE str, VALUE fmt)
default:
if (integer_size > MAX_INTEGER_PACK_SIZE)
- rb_bug("unexpected integer size for pack: %d", integer_size);
+ rb_bug("unexpected intger size for pack: %d", integer_size);
PACK_LENGTH_ADJUST_SIZE(integer_size);
while (len-- > 0) {
union {
@@ -1849,7 +1783,7 @@ pack_unpack(VALUE str, VALUE fmt)
PACK_LENGTH_ADJUST_SIZE(sizeof(float));
while (len-- > 0) {
float tmp;
- FLOAT_CONVWITH(ftmp);
+ FLOAT_CONVWITH(ftmp;)
memcpy(&tmp, s, sizeof(float));
s += sizeof(float);
@@ -1954,7 +1888,7 @@ pack_unpack(VALUE str, VALUE fmt)
b64_xtable[i] = -1;
}
for (i = 0; i < 64; i++) {
- b64_xtable[(unsigned char)b64_table[i]] = (char)i;
+ b64_xtable[(unsigned char)b64_table[i]] = i;
}
}
if (len == 0) {
@@ -1973,17 +1907,17 @@ pack_unpack(VALUE str, VALUE fmt)
if (s + 1 == send && *s == '=') break;
d = b64_xtable[(unsigned char)*s++];
if (d == -1) rb_raise(rb_eArgError, "invalid base64");
- *ptr++ = castchar(a << 2 | b >> 4);
- *ptr++ = castchar(b << 4 | c >> 2);
- *ptr++ = castchar(c << 6 | d);
+ *ptr++ = a << 2 | b >> 4;
+ *ptr++ = b << 4 | c >> 2;
+ *ptr++ = c << 6 | d;
}
if (c == -1) {
- *ptr++ = castchar(a << 2 | b >> 4);
+ *ptr++ = a << 2 | b >> 4;
if (b & 0xf) rb_raise(rb_eArgError, "invalid base64");
}
else if (d == -1) {
- *ptr++ = castchar(a << 2 | b >> 4);
- *ptr++ = castchar(b << 4 | c >> 2);
+ *ptr++ = a << 2 | b >> 4;
+ *ptr++ = b << 4 | c >> 2;
if (c & 0x3) rb_raise(rb_eArgError, "invalid base64");
}
}
@@ -2002,16 +1936,16 @@ pack_unpack(VALUE str, VALUE fmt)
while ((d = b64_xtable[(unsigned char)*s]) == -1 && s < send) {if (*s == '=') break; s++;}
if (*s == '=' || s >= send) break;
s++;
- *ptr++ = castchar(a << 2 | b >> 4);
- *ptr++ = castchar(b << 4 | c >> 2);
- *ptr++ = castchar(c << 6 | d);
+ *ptr++ = a << 2 | b >> 4;
+ *ptr++ = b << 4 | c >> 2;
+ *ptr++ = c << 6 | d;
}
if (a != -1 && b != -1) {
if (c == -1 && *s == '=')
- *ptr++ = castchar(a << 2 | b >> 4);
+ *ptr++ = a << 2 | b >> 4;
else if (c != -1 && *s == '=') {
- *ptr++ = castchar(a << 2 | b >> 4);
- *ptr++ = castchar(b << 4 | c >> 2);
+ *ptr++ = a << 2 | b >> 4;
+ *ptr++ = b << 4 | c >> 2;
}
}
}
@@ -2023,29 +1957,27 @@ pack_unpack(VALUE str, VALUE fmt)
case 'M':
{
VALUE buf = infected_str_new(0, send - s, str);
- char *ptr = RSTRING_PTR(buf), *ss = s;
+ char *ptr = RSTRING_PTR(buf);
int c1, c2;
while (s < send) {
if (*s == '=') {
if (++s == send) break;
- if (s+1 < send && *s == '\r' && *(s+1) == '\n')
- s++;
+ if (s+1 < send && *s == '\r' && *(s+1) == '\n')
+ s++;
if (*s != '\n') {
if ((c1 = hex2num(*s)) == -1) break;
if (++s == send) break;
if ((c2 = hex2num(*s)) == -1) break;
- *ptr++ = castchar(c1 << 4 | c2);
+ *ptr++ = c1 << 4 | c2;
}
}
else {
*ptr++ = *s;
}
s++;
- ss = s;
}
rb_str_set_len(buf, ptr - RSTRING_PTR(buf));
- rb_str_buf_cat(buf, ss, send-ss);
ENCODING_CODERANGE_SET(buf, rb_ascii8bit_encindex(), ENC_CODERANGE_VALID);
UNPACK_PUSH(buf);
}
@@ -2080,16 +2012,16 @@ pack_unpack(VALUE str, VALUE fmt)
if (t) {
VALUE a, *p, *pend;
- if (!(a = str_associated(str))) {
+ if (!(a = rb_str_associated(str))) {
rb_raise(rb_eArgError, "no associated pointer");
}
p = RARRAY_PTR(a);
pend = p + RARRAY_LEN(a);
while (p < pend) {
- if (RB_TYPE_P(*p, T_STRING) && RSTRING_PTR(*p) == t) {
+ if (TYPE(*p) == T_STRING && RSTRING_PTR(*p) == t) {
if (len < RSTRING_LEN(*p)) {
tmp = rb_tainted_str_new(t, len);
- str_associate(tmp, a);
+ rb_str_associate(tmp, a);
}
else {
tmp = *p;
@@ -2122,13 +2054,13 @@ pack_unpack(VALUE str, VALUE fmt)
if (t) {
VALUE a, *p, *pend;
- if (!(a = str_associated(str))) {
+ if (!(a = rb_str_associated(str))) {
rb_raise(rb_eArgError, "no associated pointer");
}
p = RARRAY_PTR(a);
pend = p + RARRAY_LEN(a);
while (p < pend) {
- if (RB_TYPE_P(*p, T_STRING) && RSTRING_PTR(*p) == t) {
+ if (TYPE(*p) == T_STRING && RSTRING_PTR(*p) == t) {
tmp = *p;
break;
}
@@ -2175,8 +2107,6 @@ pack_unpack(VALUE str, VALUE fmt)
break;
default:
- rb_warning("unknown unpack directive '%c' in '%s'",
- type, RSTRING_PTR(fmt));
break;
}
}
@@ -2194,43 +2124,41 @@ rb_uv_to_utf8(char buf[6], unsigned long uv)
return 1;
}
if (uv <= 0x7ff) {
- buf[0] = castchar(((uv>>6)&0xff)|0xc0);
- buf[1] = castchar((uv&0x3f)|0x80);
+ buf[0] = (char)((uv>>6)&0xff)|0xc0;
+ buf[1] = (char)(uv&0x3f)|0x80;
return 2;
}
if (uv <= 0xffff) {
- buf[0] = castchar(((uv>>12)&0xff)|0xe0);
- buf[1] = castchar(((uv>>6)&0x3f)|0x80);
- buf[2] = castchar((uv&0x3f)|0x80);
+ buf[0] = (char)((uv>>12)&0xff)|0xe0;
+ buf[1] = (char)((uv>>6)&0x3f)|0x80;
+ buf[2] = (char)(uv&0x3f)|0x80;
return 3;
}
if (uv <= 0x1fffff) {
- buf[0] = castchar(((uv>>18)&0xff)|0xf0);
- buf[1] = castchar(((uv>>12)&0x3f)|0x80);
- buf[2] = castchar(((uv>>6)&0x3f)|0x80);
- buf[3] = castchar((uv&0x3f)|0x80);
+ buf[0] = (char)((uv>>18)&0xff)|0xf0;
+ buf[1] = (char)((uv>>12)&0x3f)|0x80;
+ buf[2] = (char)((uv>>6)&0x3f)|0x80;
+ buf[3] = (char)(uv&0x3f)|0x80;
return 4;
}
if (uv <= 0x3ffffff) {
- buf[0] = castchar(((uv>>24)&0xff)|0xf8);
- buf[1] = castchar(((uv>>18)&0x3f)|0x80);
- buf[2] = castchar(((uv>>12)&0x3f)|0x80);
- buf[3] = castchar(((uv>>6)&0x3f)|0x80);
- buf[4] = castchar((uv&0x3f)|0x80);
+ buf[0] = (char)((uv>>24)&0xff)|0xf8;
+ buf[1] = (char)((uv>>18)&0x3f)|0x80;
+ buf[2] = (char)((uv>>12)&0x3f)|0x80;
+ buf[3] = (char)((uv>>6)&0x3f)|0x80;
+ buf[4] = (char)(uv&0x3f)|0x80;
return 5;
}
if (uv <= 0x7fffffff) {
- buf[0] = castchar(((uv>>30)&0xff)|0xfc);
- buf[1] = castchar(((uv>>24)&0x3f)|0x80);
- buf[2] = castchar(((uv>>18)&0x3f)|0x80);
- buf[3] = castchar(((uv>>12)&0x3f)|0x80);
- buf[4] = castchar(((uv>>6)&0x3f)|0x80);
- buf[5] = castchar((uv&0x3f)|0x80);
+ buf[0] = (char)((uv>>30)&0xff)|0xfc;
+ buf[1] = (char)((uv>>24)&0x3f)|0x80;
+ buf[2] = (char)((uv>>18)&0x3f)|0x80;
+ buf[3] = (char)((uv>>12)&0x3f)|0x80;
+ buf[4] = (char)((uv>>6)&0x3f)|0x80;
+ buf[5] = (char)(uv&0x3f)|0x80;
return 6;
}
rb_raise(rb_eRangeError, "pack(U): value out of range");
-
- UNREACHABLE;
}
static const unsigned long utf8_limits[] = {
@@ -2298,6 +2226,4 @@ Init_pack(void)
{
rb_define_method(rb_cArray, "pack", pack_pack, 1);
rb_define_method(rb_cString, "unpack", pack_unpack, 1);
-
- id_associated = rb_intern_const("__pack_associated__");
}
diff --git a/parse.y b/parse.y
index 7484f4e53b..5f02f9dfcc 100644
--- a/parse.y
+++ b/parse.y
@@ -11,9 +11,6 @@
%{
-#ifndef PARSER_DEBUG
-#define PARSER_DEBUG 0
-#endif
#define YYDEBUG 1
#define YYERROR_VERBOSE 1
#define YYSTACK_USE_ALLOCA 0
@@ -21,7 +18,6 @@
#include "ruby/ruby.h"
#include "ruby/st.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include "node.h"
#include "parse.h"
#include "id.h"
@@ -29,14 +25,13 @@
#include <stdio.h>
#include <errno.h>
#include <ctype.h>
-#include "probes.h"
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-#define YYMALLOC(size) rb_parser_malloc(parser, (size))
-#define YYREALLOC(ptr, size) rb_parser_realloc(parser, (ptr), (size))
-#define YYCALLOC(nelem, size) rb_parser_calloc(parser, (nelem), (size))
-#define YYFREE(ptr) rb_parser_free(parser, (ptr))
+#define YYMALLOC(size) rb_parser_malloc(parser, size)
+#define YYREALLOC(ptr, size) rb_parser_realloc(parser, ptr, size)
+#define YYCALLOC(nelem, size) rb_parser_calloc(parser, nelem, size)
+#define YYFREE(ptr) rb_parser_free(parser, ptr)
#define malloc YYMALLOC
#define realloc YYREALLOC
#define calloc YYCALLOC
@@ -44,12 +39,11 @@
#ifndef RIPPER
static ID register_symid(ID, const char *, long, rb_encoding *);
-static ID register_symid_str(ID, VALUE);
-#define REGISTER_SYMID(id, name) register_symid((id), (name), strlen(name), enc)
+#define REGISTER_SYMID(id, name) register_symid(id, name, strlen(name), enc)
#include "id.c"
#endif
-#define is_notop_id(id) ((id)>tLAST_OP_ID)
+#define is_notop_id(id) ((id)>tLAST_TOKEN)
#define is_local_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_LOCAL)
#define is_global_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_GLOBAL)
#define is_instance_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_INSTANCE)
@@ -57,65 +51,40 @@ static ID register_symid_str(ID, VALUE);
#define is_const_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CONST)
#define is_class_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_CLASS)
#define is_junk_id(id) (is_notop_id(id)&&((id)&ID_SCOPE_MASK)==ID_JUNK)
-#define id_type(id) (is_notop_id(id) ? (int)((id)&ID_SCOPE_MASK) : -1)
#define is_asgn_or_id(id) ((is_notop_id(id)) && \
(((id)&ID_SCOPE_MASK) == ID_GLOBAL || \
((id)&ID_SCOPE_MASK) == ID_INSTANCE || \
((id)&ID_SCOPE_MASK) == ID_CLASS))
-enum lex_state_bits {
- EXPR_BEG_bit, /* ignore newline, +/- is a sign. */
- EXPR_END_bit, /* newline significant, +/- is an operator. */
- EXPR_ENDARG_bit, /* ditto, and unbound braces. */
- EXPR_ENDFN_bit, /* ditto, and unbound braces. */
- EXPR_ARG_bit, /* newline significant, +/- is an operator. */
- EXPR_CMDARG_bit, /* newline significant, +/- is an operator. */
- EXPR_MID_bit, /* newline significant, +/- is an operator. */
- EXPR_FNAME_bit, /* ignore newline, no reserved words. */
- EXPR_DOT_bit, /* right after `.' or `::', no reserved words. */
- EXPR_CLASS_bit, /* immediate after `class', no here document. */
- EXPR_VALUE_bit, /* alike EXPR_BEG but label is disallowed. */
- EXPR_MAX_STATE
-};
-/* examine combinations */
enum lex_state_e {
-#define DEF_EXPR(n) EXPR_##n = (1 << EXPR_##n##_bit)
- DEF_EXPR(BEG),
- DEF_EXPR(END),
- DEF_EXPR(ENDARG),
- DEF_EXPR(ENDFN),
- DEF_EXPR(ARG),
- DEF_EXPR(CMDARG),
- DEF_EXPR(MID),
- DEF_EXPR(FNAME),
- DEF_EXPR(DOT),
- DEF_EXPR(CLASS),
- DEF_EXPR(VALUE),
- EXPR_BEG_ANY = (EXPR_BEG | EXPR_VALUE | EXPR_MID | EXPR_CLASS),
- EXPR_ARG_ANY = (EXPR_ARG | EXPR_CMDARG),
- EXPR_END_ANY = (EXPR_END | EXPR_ENDARG | EXPR_ENDFN)
+ EXPR_BEG, /* ignore newline, +/- is a sign. */
+ EXPR_END, /* newline significant, +/- is an operator. */
+ EXPR_ENDARG, /* ditto, and unbound braces. */
+ EXPR_ENDFN, /* ditto, and unbound braces. */
+ EXPR_ARG, /* newline significant, +/- is an operator. */
+ EXPR_CMDARG, /* newline significant, +/- is an operator. */
+ EXPR_MID, /* newline significant, +/- is an operator. */
+ EXPR_FNAME, /* ignore newline, no reserved words. */
+ EXPR_DOT, /* right after `.' or `::', no reserved words. */
+ EXPR_CLASS, /* immediate after `class', no here document. */
+ EXPR_VALUE, /* alike EXPR_BEG but label is disallowed. */
+ EXPR_MAX_STATE
};
-#define IS_lex_state_for(x, ls) ((x) & (ls))
-#define IS_lex_state(ls) IS_lex_state_for(lex_state, (ls))
-
-#if PARSER_DEBUG
-static const char *lex_state_name(enum lex_state_e state);
-#endif
typedef VALUE stack_type;
-# define BITSTACK_PUSH(stack, n) ((stack) = ((stack)<<1)|((n)&1))
-# define BITSTACK_POP(stack) ((stack) = (stack) >> 1)
-# define BITSTACK_LEXPOP(stack) ((stack) = ((stack) >> 1) | ((stack) & 1))
-# define BITSTACK_SET_P(stack) ((stack)&1)
+# define BITSTACK_PUSH(stack, n) (stack = (stack<<1)|((n)&1))
+# define BITSTACK_POP(stack) (stack = stack >> 1)
+# define BITSTACK_LEXPOP(stack) (stack = (stack >> 1) | (stack & 1))
+# define BITSTACK_SET_P(stack) (stack&1)
-#define COND_PUSH(n) BITSTACK_PUSH(cond_stack, (n))
+#define COND_PUSH(n) BITSTACK_PUSH(cond_stack, n)
#define COND_POP() BITSTACK_POP(cond_stack)
#define COND_LEXPOP() BITSTACK_LEXPOP(cond_stack)
#define COND_P() BITSTACK_SET_P(cond_stack)
-#define CMDARG_PUSH(n) BITSTACK_PUSH(cmdarg_stack, (n))
+#define CMDARG_PUSH(n) BITSTACK_PUSH(cmdarg_stack, n)
#define CMDARG_POP() BITSTACK_POP(cmdarg_stack)
#define CMDARG_LEXPOP() BITSTACK_LEXPOP(cmdarg_stack)
#define CMDARG_P() BITSTACK_SET_P(cmdarg_stack)
@@ -130,9 +99,7 @@ struct vtable {
struct local_vars {
struct vtable *args;
struct vtable *vars;
- struct vtable *used;
struct local_vars *prev;
- stack_type cmdargs;
};
#define DVARS_INHERIT ((void*)1)
@@ -200,7 +167,7 @@ vtable_included(const struct vtable * tbl, ID id)
if (POINTER_P(tbl)) {
for (i = 0; i < tbl->pos; i++) {
if (tbl->tbl[i] == id) {
- return i+1;
+ return 1;
}
}
}
@@ -243,14 +210,12 @@ struct parser_params {
int parser_lpar_beg;
int parser_in_single;
int parser_in_def;
- int parser_brace_nest;
int parser_compile_for_eval;
VALUE parser_cur_mid;
int parser_in_defined;
char *parser_tokenbuf;
int parser_tokidx;
int parser_toksiz;
- int parser_tokline;
VALUE parser_lex_input;
VALUE parser_lex_lastline;
VALUE parser_lex_nextline;
@@ -268,8 +233,8 @@ struct parser_params {
int has_shebang;
char *parser_ruby_sourcefile; /* current source file */
int parser_ruby_sourceline; /* current line no. */
- VALUE parser_ruby_sourcefile_string;
rb_encoding *enc;
+ rb_encoding *utf8;
int parser_yydebug;
@@ -281,10 +246,10 @@ struct parser_params {
VALUE coverage;
int nerr;
- int parser_token_info_enabled;
token_info *parser_token_info;
#else
/* Ripper only */
+ VALUE parser_ruby_sourcefile_string;
const char *tokp;
VALUE delayed;
int delayed_line;
@@ -297,15 +262,26 @@ struct parser_params {
#endif
};
-#define STR_NEW(p,n) rb_enc_str_new((p),(n),current_enc)
-#define STR_NEW0() rb_enc_str_new(0,0,current_enc)
-#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),current_enc)
-#define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),current_enc)
+#define UTF8_ENC() (parser->utf8 ? parser->utf8 : \
+ (parser->utf8 = rb_utf8_encoding()))
+#define STR_NEW(p,n) rb_enc_str_new((p),(n),parser->enc)
+#define STR_NEW0() rb_enc_str_new(0,0,parser->enc)
+#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),parser->enc)
+#define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),parser->enc)
#define ENC_SINGLE(cr) ((cr)==ENC_CODERANGE_7BIT)
-#define TOK_INTERN(mb) rb_intern3(tok(), toklen(), current_enc)
+#define TOK_INTERN(mb) rb_intern3(tok(), toklen(), parser->enc)
+
+#ifdef YYMALLOC
+void *rb_parser_malloc(struct parser_params *, size_t);
+void *rb_parser_realloc(struct parser_params *, void *, size_t);
+void *rb_parser_calloc(struct parser_params *, size_t, size_t);
+void rb_parser_free(struct parser_params *, void *);
+#endif
static int parser_yyerror(struct parser_params*, const char*);
-#define yyerror(msg) parser_yyerror(parser, (msg))
+#define yyerror(msg) parser_yyerror(parser, msg)
+
+#define YYLEX_PARAM parser
#define lex_strterm (parser->parser_lex_strterm)
#define lex_state (parser->parser_lex_state)
@@ -314,7 +290,6 @@ static int parser_yyerror(struct parser_params*, const char*);
#define class_nest (parser->parser_class_nest)
#define paren_nest (parser->parser_paren_nest)
#define lpar_beg (parser->parser_lpar_beg)
-#define brace_nest (parser->parser_brace_nest)
#define in_single (parser->parser_in_single)
#define in_def (parser->parser_in_def)
#define compile_for_eval (parser->parser_compile_for_eval)
@@ -323,7 +298,6 @@ static int parser_yyerror(struct parser_params*, const char*);
#define tokenbuf (parser->parser_tokenbuf)
#define tokidx (parser->parser_tokidx)
#define toksiz (parser->parser_toksiz)
-#define tokline (parser->parser_tokline)
#define lex_input (parser->parser_lex_input)
#define lex_lastline (parser->parser_lex_lastline)
#define lex_nextline (parser->parser_lex_nextline)
@@ -339,8 +313,6 @@ static int parser_yyerror(struct parser_params*, const char*);
#define ruby__end__seen (parser->parser_ruby__end__seen)
#define ruby_sourceline (parser->parser_ruby_sourceline)
#define ruby_sourcefile (parser->parser_ruby_sourcefile)
-#define ruby_sourcefile_string (parser->parser_ruby_sourcefile_string)
-#define current_enc (parser->enc)
#define yydebug (parser->parser_yydebug)
#ifdef RIPPER
#else
@@ -350,22 +322,18 @@ static int parser_yyerror(struct parser_params*, const char*);
#define ruby_coverage (parser->coverage)
#endif
-#if YYPURE
static int yylex(void*, void*);
-#else
-static int yylex(void*);
-#endif
#ifndef RIPPER
#define yyparse ruby_yyparse
static NODE* node_newnode(struct parser_params *, enum node_type, VALUE, VALUE, VALUE);
-#define rb_node_newnode(type, a1, a2, a3) node_newnode(parser, (type), (a1), (a2), (a3))
+#define rb_node_newnode(type, a1, a2, a3) node_newnode(parser, type, a1, a2, a3)
static NODE *cond_gen(struct parser_params*,NODE*);
-#define cond(node) cond_gen(parser, (node))
+#define cond(node) cond_gen(parser, node)
static NODE *logop_gen(struct parser_params*,enum node_type,NODE*,NODE*);
-#define logop(type,node1,node2) logop_gen(parser, (type), (node1), (node2))
+#define logop(type,node1,node2) logop_gen(parser, type, node1, node2)
static NODE *newline_node(NODE*);
static void fixpos(NODE*,NODE*);
@@ -377,92 +345,86 @@ static NODE *remove_begin(NODE*);
#define void_expr0(node) void_expr_gen(parser, (node))
#define void_expr(node) void_expr0((node) = remove_begin(node))
static void void_stmts_gen(struct parser_params*,NODE*);
-#define void_stmts(node) void_stmts_gen(parser, (node))
+#define void_stmts(node) void_stmts_gen(parser, node)
static void reduce_nodes_gen(struct parser_params*,NODE**);
-#define reduce_nodes(n) reduce_nodes_gen(parser,(n))
+#define reduce_nodes(n) reduce_nodes_gen(parser,n)
static void block_dup_check_gen(struct parser_params*,NODE*,NODE*);
-#define block_dup_check(n1,n2) block_dup_check_gen(parser,(n1),(n2))
+#define block_dup_check(n1,n2) block_dup_check_gen(parser,n1,n2)
static NODE *block_append_gen(struct parser_params*,NODE*,NODE*);
-#define block_append(h,t) block_append_gen(parser,(h),(t))
+#define block_append(h,t) block_append_gen(parser,h,t)
static NODE *list_append_gen(struct parser_params*,NODE*,NODE*);
-#define list_append(l,i) list_append_gen(parser,(l),(i))
+#define list_append(l,i) list_append_gen(parser,l,i)
static NODE *list_concat_gen(struct parser_params*,NODE*,NODE*);
-#define list_concat(h,t) list_concat_gen(parser,(h),(t))
+#define list_concat(h,t) list_concat_gen(parser,h,t)
static NODE *arg_append_gen(struct parser_params*,NODE*,NODE*);
-#define arg_append(h,t) arg_append_gen(parser,(h),(t))
+#define arg_append(h,t) arg_append_gen(parser,h,t)
static NODE *arg_concat_gen(struct parser_params*,NODE*,NODE*);
-#define arg_concat(h,t) arg_concat_gen(parser,(h),(t))
+#define arg_concat(h,t) arg_concat_gen(parser,h,t)
static NODE *literal_concat_gen(struct parser_params*,NODE*,NODE*);
-#define literal_concat(h,t) literal_concat_gen(parser,(h),(t))
+#define literal_concat(h,t) literal_concat_gen(parser,h,t)
static int literal_concat0(struct parser_params *, VALUE, VALUE);
static NODE *new_evstr_gen(struct parser_params*,NODE*);
-#define new_evstr(n) new_evstr_gen(parser,(n))
+#define new_evstr(n) new_evstr_gen(parser,n)
static NODE *evstr2dstr_gen(struct parser_params*,NODE*);
-#define evstr2dstr(n) evstr2dstr_gen(parser,(n))
+#define evstr2dstr(n) evstr2dstr_gen(parser,n)
static NODE *splat_array(NODE*);
static NODE *call_bin_op_gen(struct parser_params*,NODE*,ID,NODE*);
-#define call_bin_op(recv,id,arg1) call_bin_op_gen(parser, (recv),(id),(arg1))
+#define call_bin_op(recv,id,arg1) call_bin_op_gen(parser, recv,id,arg1)
static NODE *call_uni_op_gen(struct parser_params*,NODE*,ID);
-#define call_uni_op(recv,id) call_uni_op_gen(parser, (recv),(id))
+#define call_uni_op(recv,id) call_uni_op_gen(parser, recv,id)
-static NODE *new_args_gen(struct parser_params*,NODE*,NODE*,ID,NODE*,NODE*);
-#define new_args(f,o,r,p,t) new_args_gen(parser, (f),(o),(r),(p),(t))
-static NODE *new_args_tail_gen(struct parser_params*,NODE*,ID,ID);
-#define new_args_tail(k,kr,b) new_args_tail_gen(parser, (k),(kr),(b))
+static NODE *new_args_gen(struct parser_params*,NODE*,NODE*,ID,NODE*,ID);
+#define new_args(f,o,r,p,b) new_args_gen(parser, f,o,r,p,b)
static NODE *negate_lit(NODE*);
static NODE *ret_args_gen(struct parser_params*,NODE*);
-#define ret_args(node) ret_args_gen(parser, (node))
+#define ret_args(node) ret_args_gen(parser, node)
static NODE *arg_blk_pass(NODE*,NODE*);
static NODE *new_yield_gen(struct parser_params*,NODE*);
-#define new_yield(node) new_yield_gen(parser, (node))
-static NODE *dsym_node_gen(struct parser_params*,NODE*);
-#define dsym_node(node) dsym_node_gen(parser, (node))
+#define new_yield(node) new_yield_gen(parser, node)
static NODE *gettable_gen(struct parser_params*,ID);
-#define gettable(id) gettable_gen(parser,(id))
+#define gettable(id) gettable_gen(parser,id)
static NODE *assignable_gen(struct parser_params*,ID,NODE*);
-#define assignable(id,node) assignable_gen(parser, (id), (node))
+#define assignable(id,node) assignable_gen(parser, id, node)
static NODE *aryset_gen(struct parser_params*,NODE*,NODE*);
-#define aryset(node1,node2) aryset_gen(parser, (node1), (node2))
+#define aryset(node1,node2) aryset_gen(parser, node1, node2)
static NODE *attrset_gen(struct parser_params*,NODE*,ID);
-#define attrset(node,id) attrset_gen(parser, (node), (id))
+#define attrset(node,id) attrset_gen(parser, node, id)
static void rb_backref_error_gen(struct parser_params*,NODE*);
-#define rb_backref_error(n) rb_backref_error_gen(parser,(n))
+#define rb_backref_error(n) rb_backref_error_gen(parser,n)
static NODE *node_assign_gen(struct parser_params*,NODE*,NODE*);
-#define node_assign(node1, node2) node_assign_gen(parser, (node1), (node2))
-
-static NODE *new_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs);
-static NODE *new_attr_op_assign_gen(struct parser_params *parser, NODE *lhs, ID attr, ID op, NODE *rhs);
-#define new_attr_op_assign(lhs, type, attr, op, rhs) new_attr_op_assign_gen(parser, (lhs), (attr), (op), (rhs))
-static NODE *new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs);
-#define new_const_op_assign(lhs, op, rhs) new_const_op_assign_gen(parser, (lhs), (op), (rhs))
+#define node_assign(node1, node2) node_assign_gen(parser, node1, node2)
static NODE *match_op_gen(struct parser_params*,NODE*,NODE*);
-#define match_op(node1,node2) match_op_gen(parser, (node1), (node2))
+#define match_op(node1,node2) match_op_gen(parser, node1, node2)
static ID *local_tbl_gen(struct parser_params*);
#define local_tbl() local_tbl_gen(parser)
static void fixup_nodes(NODE **);
+extern int rb_dvar_defined(ID);
+extern int rb_local_defined(ID);
+extern int rb_parse_in_eval(void);
+extern int rb_parse_in_main(void);
+
static VALUE reg_compile_gen(struct parser_params*, VALUE, int);
-#define reg_compile(str,options) reg_compile_gen(parser, (str), (options))
+#define reg_compile(str,options) reg_compile_gen(parser, str, options)
static void reg_fragment_setenc_gen(struct parser_params*, VALUE, int);
-#define reg_fragment_setenc(str,options) reg_fragment_setenc_gen(parser, (str), (options))
+#define reg_fragment_setenc(str,options) reg_fragment_setenc_gen(parser, str, options)
static int reg_fragment_check_gen(struct parser_params*, VALUE, int);
-#define reg_fragment_check(str,options) reg_fragment_check_gen(parser, (str), (options))
+#define reg_fragment_check(str,options) reg_fragment_check_gen(parser, str, options)
static NODE *reg_named_capture_assign_gen(struct parser_params* parser, VALUE regexp, NODE *match);
-#define reg_named_capture_assign(regexp,match) reg_named_capture_assign_gen(parser,(regexp),(match))
+#define reg_named_capture_assign(regexp,match) reg_named_capture_assign_gen(parser,regexp,match)
#define get_id(id) (id)
#define get_value(val) (val)
#else
-#define value_expr(node) ((void)(node))
#define remove_begin(node) (node)
#define rb_dvar_defined(id) 0
#define rb_local_defined(id) 0
@@ -471,55 +433,43 @@ static ID ripper_get_id(VALUE);
static VALUE ripper_get_value(VALUE);
#define get_value(val) ripper_get_value(val)
static VALUE assignable_gen(struct parser_params*,VALUE);
-#define assignable(lhs,node) assignable_gen(parser, (lhs))
-static int id_is_var_gen(struct parser_params *parser, ID id);
-#define id_is_var(id) id_is_var_gen(parser, (id))
-
-#define node_assign(node1, node2) dispatch2(assign, (node1), (node2))
-
-static VALUE new_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE op, VALUE rhs);
-static VALUE new_attr_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE type, VALUE attr, VALUE op, VALUE rhs);
-#define new_attr_op_assign(lhs, type, attr, op, rhs) new_attr_op_assign_gen(parser, (lhs), (type), (attr), (op), (rhs))
-
+#define assignable(lhs,node) assignable_gen(parser, lhs)
#endif /* !RIPPER */
-#define new_op_assign(lhs, op, rhs) new_op_assign_gen(parser, (lhs), (op), (rhs))
-
static ID formal_argument_gen(struct parser_params*, ID);
-#define formal_argument(id) formal_argument_gen(parser, (id))
+#define formal_argument(id) formal_argument_gen(parser, id)
static ID shadowing_lvar_gen(struct parser_params*,ID);
-#define shadowing_lvar(name) shadowing_lvar_gen(parser, (name))
+#define shadowing_lvar(name) shadowing_lvar_gen(parser, name)
static void new_bv_gen(struct parser_params*,ID);
-#define new_bv(id) new_bv_gen(parser, (id))
+#define new_bv(id) new_bv_gen(parser, id)
static void local_push_gen(struct parser_params*,int);
-#define local_push(top) local_push_gen(parser,(top))
+#define local_push(top) local_push_gen(parser,top)
static void local_pop_gen(struct parser_params*);
#define local_pop() local_pop_gen(parser)
static int local_var_gen(struct parser_params*, ID);
-#define local_var(id) local_var_gen(parser, (id))
+#define local_var(id) local_var_gen(parser, id);
static int arg_var_gen(struct parser_params*, ID);
-#define arg_var(id) arg_var_gen(parser, (id))
+#define arg_var(id) arg_var_gen(parser, id)
static int local_id_gen(struct parser_params*, ID);
-#define local_id(id) local_id_gen(parser, (id))
+#define local_id(id) local_id_gen(parser, id)
static ID internal_id_gen(struct parser_params*);
#define internal_id() internal_id_gen(parser)
static const struct vtable *dyna_push_gen(struct parser_params *);
#define dyna_push() dyna_push_gen(parser)
static void dyna_pop_gen(struct parser_params*, const struct vtable *);
-#define dyna_pop(node) dyna_pop_gen(parser, (node))
+#define dyna_pop(node) dyna_pop_gen(parser, node)
static int dyna_in_block_gen(struct parser_params*);
#define dyna_in_block() dyna_in_block_gen(parser)
#define dyna_var(id) local_var(id)
-static int dvar_defined_gen(struct parser_params*,ID,int);
-#define dvar_defined(id) dvar_defined_gen(parser, (id), 0)
-#define dvar_defined_get(id) dvar_defined_gen(parser, (id), 1)
+static int dvar_defined_gen(struct parser_params*,ID);
+#define dvar_defined(id) dvar_defined_gen(parser, id)
static int dvar_curr_gen(struct parser_params*,ID);
-#define dvar_curr(id) dvar_curr_gen(parser, (id))
+#define dvar_curr(id) dvar_curr_gen(parser, id)
static int lvar_defined_gen(struct parser_params*, ID);
-#define lvar_defined(id) lvar_defined_gen(parser, (id))
+#define lvar_defined(id) lvar_defined_gen(parser, id)
#define RE_OPTION_ONCE (1<<16)
#define RE_OPTION_ENCODING_SHIFT 8
@@ -548,6 +498,7 @@ static int lvar_defined_gen(struct parser_params*, ID);
#include "eventids1.c"
#include "eventids2.c"
+static ID ripper_id_gets;
static VALUE ripper_dispatch0(struct parser_params*,ID);
static VALUE ripper_dispatch1(struct parser_params*,ID,VALUE);
@@ -555,15 +506,13 @@ static VALUE ripper_dispatch2(struct parser_params*,ID,VALUE,VALUE);
static VALUE ripper_dispatch3(struct parser_params*,ID,VALUE,VALUE,VALUE);
static VALUE ripper_dispatch4(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE);
static VALUE ripper_dispatch5(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,VALUE);
-static VALUE ripper_dispatch7(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE,VALUE);
#define dispatch0(n) ripper_dispatch0(parser, TOKEN_PASTE(ripper_id_, n))
-#define dispatch1(n,a) ripper_dispatch1(parser, TOKEN_PASTE(ripper_id_, n), (a))
-#define dispatch2(n,a,b) ripper_dispatch2(parser, TOKEN_PASTE(ripper_id_, n), (a), (b))
-#define dispatch3(n,a,b,c) ripper_dispatch3(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c))
-#define dispatch4(n,a,b,c,d) ripper_dispatch4(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d))
-#define dispatch5(n,a,b,c,d,e) ripper_dispatch5(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e))
-#define dispatch7(n,a,b,c,d,e,f,g) ripper_dispatch7(parser, TOKEN_PASTE(ripper_id_, n), (a), (b), (c), (d), (e), (f), (g))
+#define dispatch1(n,a) ripper_dispatch1(parser, TOKEN_PASTE(ripper_id_, n), a)
+#define dispatch2(n,a,b) ripper_dispatch2(parser, TOKEN_PASTE(ripper_id_, n), a, b)
+#define dispatch3(n,a,b,c) ripper_dispatch3(parser, TOKEN_PASTE(ripper_id_, n), a, b, c)
+#define dispatch4(n,a,b,c,d) ripper_dispatch4(parser, TOKEN_PASTE(ripper_id_, n), a, b, c, d)
+#define dispatch5(n,a,b,c,d,e) ripper_dispatch5(parser, TOKEN_PASTE(ripper_id_, n), a, b, c, d, e)
#define yyparse ripper_yyparse
@@ -575,80 +524,62 @@ static VALUE ripper_id2sym(ID);
#endif
#define arg_new() dispatch0(args_new)
-#define arg_add(l,a) dispatch2(args_add, (l), (a))
-#define arg_add_star(l,a) dispatch2(args_add_star, (l), (a))
-#define arg_add_block(l,b) dispatch2(args_add_block, (l), (b))
-#define arg_add_optblock(l,b) ((b)==Qundef? (l) : dispatch2(args_add_block, (l), (b)))
-#define bare_assoc(v) dispatch1(bare_assoc_hash, (v))
-#define arg_add_assocs(l,b) arg_add((l), bare_assoc(b))
-
-#define args2mrhs(a) dispatch1(mrhs_new_from_args, (a))
+#define arg_add(l,a) dispatch2(args_add, l, a)
+#define arg_add_star(l,a) dispatch2(args_add_star, l, a)
+#define arg_add_block(l,b) dispatch2(args_add_block, l, b)
+#define arg_add_optblock(l,b) ((b)==Qundef? l : dispatch2(args_add_block, l, b))
+#define bare_assoc(v) dispatch1(bare_assoc_hash, v)
+#define arg_add_assocs(l,b) arg_add(l, bare_assoc(b))
+
+#define args2mrhs(a) dispatch1(mrhs_new_from_args, a)
#define mrhs_new() dispatch0(mrhs_new)
-#define mrhs_add(l,a) dispatch2(mrhs_add, (l), (a))
-#define mrhs_add_star(l,a) dispatch2(mrhs_add_star, (l), (a))
+#define mrhs_add(l,a) dispatch2(mrhs_add, l, a)
+#define mrhs_add_star(l,a) dispatch2(mrhs_add_star, l, a)
#define mlhs_new() dispatch0(mlhs_new)
-#define mlhs_add(l,a) dispatch2(mlhs_add, (l), (a))
-#define mlhs_add_star(l,a) dispatch2(mlhs_add_star, (l), (a))
+#define mlhs_add(l,a) dispatch2(mlhs_add, l, a)
+#define mlhs_add_star(l,a) dispatch2(mlhs_add_star, l, a)
-#define params_new(pars, opts, rest, pars2, kws, kwrest, blk) \
- dispatch7(params, (pars), (opts), (rest), (pars2), (kws), (kwrest), (blk))
+#define params_new(pars, opts, rest, pars2, blk) \
+ dispatch5(params, pars, opts, rest, pars2, blk)
-#define blockvar_new(p,v) dispatch2(block_var, (p), (v))
-#define blockvar_add_star(l,a) dispatch2(block_var_add_star, (l), (a))
-#define blockvar_add_block(l,a) dispatch2(block_var_add_block, (l), (a))
+#define blockvar_new(p,v) dispatch2(block_var, p, v)
+#define blockvar_add_star(l,a) dispatch2(block_var_add_star, l, a)
+#define blockvar_add_block(l,a) dispatch2(block_var_add_block, l, a)
-#define method_optarg(m,a) ((a)==Qundef ? (m) : dispatch2(method_add_arg,(m),(a)))
-#define method_arg(m,a) dispatch2(method_add_arg,(m),(a))
-#define method_add_block(m,b) dispatch2(method_add_block, (m), (b))
+#define method_optarg(m,a) ((a)==Qundef ? m : dispatch2(method_add_arg,m,a))
+#define method_arg(m,a) dispatch2(method_add_arg,m,a)
+#define method_add_block(m,b) dispatch2(method_add_block, m, b)
#define escape_Qundef(x) ((x)==Qundef ? Qnil : (x))
-static inline VALUE
-new_args_gen(struct parser_params *parser, VALUE f, VALUE o, VALUE r, VALUE p, VALUE tail)
-{
- NODE *t = (NODE *)tail;
- VALUE k = t->u1.value, kr = t->u2.value, b = t->u3.value;
- return params_new(f, o, r, p, k, kr, escape_Qundef(b));
-}
-#define new_args(f,o,r,p,t) new_args_gen(parser, (f),(o),(r),(p),(t))
-
-static inline VALUE
-new_args_tail_gen(struct parser_params *parser, VALUE k, VALUE kr, VALUE b)
-{
- return (VALUE)rb_node_newnode(NODE_MEMO, k, kr, b);
-}
-#define new_args_tail(k,kr,b) new_args_tail_gen(parser, (k),(kr),(b))
-
#define FIXME 0
#endif /* RIPPER */
#ifndef RIPPER
-# define Qnone 0
-# define ifndef_ripper(x) (x)
+# define ifndef_ripper(x) x
#else
-# define Qnone Qnil
# define ifndef_ripper(x)
#endif
#ifndef RIPPER
-# define rb_warn0(fmt) rb_compile_warn(ruby_sourcefile, ruby_sourceline, (fmt))
-# define rb_warnI(fmt,a) rb_compile_warn(ruby_sourcefile, ruby_sourceline, (fmt), (a))
-# define rb_warnS(fmt,a) rb_compile_warn(ruby_sourcefile, ruby_sourceline, (fmt), (a))
-# define rb_warn4S(file,line,fmt,a) rb_compile_warn((file), (line), (fmt), (a))
-# define rb_warning0(fmt) rb_compile_warning(ruby_sourcefile, ruby_sourceline, (fmt))
-# define rb_warningS(fmt,a) rb_compile_warning(ruby_sourcefile, ruby_sourceline, (fmt), (a))
+# define rb_warn0(fmt) rb_compile_warn(ruby_sourcefile, ruby_sourceline, fmt)
+# define rb_warnI(fmt,a) rb_compile_warn(ruby_sourcefile, ruby_sourceline, fmt, a)
+# define rb_warnS(fmt,a) rb_compile_warn(ruby_sourcefile, ruby_sourceline, fmt, a)
+# define rb_warning0(fmt) rb_compile_warning(ruby_sourcefile, ruby_sourceline, fmt)
+# define rb_warningS(fmt,a) rb_compile_warning(ruby_sourcefile, ruby_sourceline, fmt, a)
#else
-# define rb_warn0(fmt) ripper_warn0(parser, (fmt))
-# define rb_warnI(fmt,a) ripper_warnI(parser, (fmt), (a))
-# define rb_warnS(fmt,a) ripper_warnS(parser, (fmt), (a))
-# define rb_warn4S(file,line,fmt,a) ripper_warnS(parser, (fmt), (a))
-# define rb_warning0(fmt) ripper_warning0(parser, (fmt))
-# define rb_warningS(fmt,a) ripper_warningS(parser, (fmt), (a))
+# define rb_warn0(fmt) ripper_warn0(parser, fmt)
+# define rb_warnI(fmt,a) ripper_warnI(parser, fmt, a)
+# define rb_warnS(fmt,a) ripper_warnS(parser, fmt, a)
+# define rb_warning0(fmt) ripper_warning0(parser, fmt)
+# define rb_warningS(fmt,a) ripper_warningS(parser, fmt, a)
static void ripper_warn0(struct parser_params*, const char*);
static void ripper_warnI(struct parser_params*, const char*, int);
+#if 0
static void ripper_warnS(struct parser_params*, const char*, const char*);
+#endif
static void ripper_warning0(struct parser_params*, const char*);
static void ripper_warningS(struct parser_params*, const char*, const char*);
#endif
@@ -659,9 +590,8 @@ static void ripper_compile_error(struct parser_params*, const char *fmt, ...);
# define compile_error ripper_compile_error
# define PARSER_ARG parser,
#else
-# define rb_compile_error rb_compile_error_with_enc
-# define compile_error parser->nerr++,rb_compile_error_with_enc
-# define PARSER_ARG ruby_sourcefile, ruby_sourceline, current_enc,
+# define compile_error parser->nerr++,rb_compile_error
+# define PARSER_ARG ruby_sourcefile, ruby_sourceline,
#endif
/* Older versions of Yacc set YYMAXDEPTH to a very low value by default (150,
@@ -676,16 +606,15 @@ static void ripper_compile_error(struct parser_params*, const char *fmt, ...);
#ifndef RIPPER
static void token_info_push(struct parser_params*, const char *token);
static void token_info_pop(struct parser_params*, const char *token);
-#define token_info_push(token) (RTEST(ruby_verbose) ? token_info_push(parser, (token)) : (void)0)
-#define token_info_pop(token) (RTEST(ruby_verbose) ? token_info_pop(parser, (token)) : (void)0)
+#define token_info_push(token) (RTEST(ruby_verbose) ? token_info_push(parser, token) : (void)0)
+#define token_info_pop(token) (RTEST(ruby_verbose) ? token_info_pop(parser, token) : (void)0)
#else
#define token_info_push(token) /* nothing */
#define token_info_pop(token) /* nothing */
#endif
%}
-%pure-parser
-%lex-param {struct parser_params *parser}
+%pure_parser
%parse-param {struct parser_params *parser}
%union {
@@ -758,68 +687,59 @@ static void token_info_pop(struct parser_params*, const char *token);
%type <node> singleton strings string string1 xstring regexp
%type <node> string_contents xstring_contents regexp_contents string_content
-%type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word
+%type <node> words qwords word_list qword_list word
%type <node> literal numeric dsym cpath
%type <node> top_compstmt top_stmts top_stmt
-%type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call
-%type <node> expr_value arg_value primary_value fcall
+%type <node> bodystmt compstmt stmts stmt expr arg primary command command_call method_call
+%type <node> expr_value arg_value primary_value
%type <node> if_tail opt_else case_body cases opt_rescue exc_list exc_var opt_ensure
%type <node> args call_args opt_call_args
-%type <node> paren_args opt_paren_args args_tail opt_args_tail block_args_tail opt_block_args_tail
+%type <node> paren_args opt_paren_args
%type <node> command_args aref_args opt_block_arg block_arg var_ref var_lhs
-%type <node> command_asgn mrhs superclass block_call block_command
+%type <node> mrhs superclass block_call block_command
%type <node> f_block_optarg f_block_opt
%type <node> f_arglist f_args f_arg f_arg_item f_optarg f_marg f_marg_list f_margs
%type <node> assoc_list assocs assoc undef_list backref string_dvar for_var
%type <node> block_param opt_block_param block_param_def f_opt
-%type <node> f_kwarg f_kw f_block_kwarg f_block_kw
%type <node> bv_decls opt_bv_decl bvar
%type <node> lambda f_larglist lambda_body
%type <node> brace_block cmd_brace_block do_block lhs none fitem
%type <node> mlhs mlhs_head mlhs_basic mlhs_item mlhs_node mlhs_post mlhs_inner
-%type <id> fsym keyword_variable user_variable sym symbol operation operation2 operation3
+%type <id> fsym variable sym symbol operation operation2 operation3
%type <id> cname fname op f_rest_arg f_block_arg opt_f_block_arg f_norm_arg f_bad_arg
-%type <id> f_kwrest
/*%%%*/
/*%
%type <val> program reswords then do dot_or_colon
%*/
-%token END_OF_INPUT 0 "end-of-input"
-%token tUPLUS RUBY_TOKEN(UPLUS) "unary+"
-%token tUMINUS RUBY_TOKEN(UMINUS) "unary-"
-%token tPOW RUBY_TOKEN(POW) "**"
-%token tCMP RUBY_TOKEN(CMP) "<=>"
-%token tEQ RUBY_TOKEN(EQ) "=="
-%token tEQQ RUBY_TOKEN(EQQ) "==="
-%token tNEQ RUBY_TOKEN(NEQ) "!="
-%token tGEQ RUBY_TOKEN(GEQ) ">="
-%token tLEQ RUBY_TOKEN(LEQ) "<="
-%token tANDOP "&&"
-%token tOROP "||"
-%token tMATCH RUBY_TOKEN(MATCH) "=~"
-%token tNMATCH RUBY_TOKEN(NMATCH) "!~"
-%token tDOT2 RUBY_TOKEN(DOT2) ".."
-%token tDOT3 RUBY_TOKEN(DOT3) "..."
-%token tAREF RUBY_TOKEN(AREF) "[]"
-%token tASET RUBY_TOKEN(ASET) "[]="
-%token tLSHFT RUBY_TOKEN(LSHFT) "<<"
-%token tRSHFT RUBY_TOKEN(RSHFT) ">>"
-%token tCOLON2 "::"
-%token tCOLON3 ":: at EXPR_BEG"
+%token tUPLUS /* unary+ */
+%token tUMINUS /* unary- */
+%token tPOW /* ** */
+%token tCMP /* <=> */
+%token tEQ /* == */
+%token tEQQ /* === */
+%token tNEQ /* != */
+%token tGEQ /* >= */
+%token tLEQ /* <= */
+%token tANDOP tOROP /* && and || */
+%token tMATCH tNMATCH /* =~ and !~ */
+%token tDOT2 tDOT3 /* .. and ... */
+%token tAREF tASET /* [] and []= */
+%token tLSHFT tRSHFT /* << and >> */
+%token tCOLON2 /* :: */
+%token tCOLON3 /* :: at EXPR_BEG */
%token <id> tOP_ASGN /* +=, -= etc. */
-%token tASSOC "=>"
-%token tLPAREN "("
-%token tLPAREN_ARG "( arg"
-%token tRPAREN ")"
-%token tLBRACK "["
-%token tLBRACE "{"
-%token tLBRACE_ARG "{ arg"
-%token tSTAR "*"
-%token tDSTAR "**arg"
-%token tAMPER "&"
-%token tLAMBDA "->"
-%token tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG tWORDS_BEG tQWORDS_BEG tSYMBOLS_BEG tQSYMBOLS_BEG
-%token tSTRING_DBEG tSTRING_DEND tSTRING_DVAR tSTRING_END tLAMBEG
+%token tASSOC /* => */
+%token tLPAREN /* ( */
+%token tLPAREN_ARG /* ( */
+%token tRPAREN /* ) */
+%token tLBRACK /* [ */
+%token tLBRACE /* { */
+%token tLBRACE_ARG /* { */
+%token tSTAR /* * */
+%token tAMPER /* & */
+%token tLAMBDA /* -> */
+%token tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG tWORDS_BEG tQWORDS_BEG
+%token tSTRING_DBEG tSTRING_DVAR tSTRING_END tLAMBEG
/*
* precedence table
@@ -849,6 +769,17 @@ static void token_info_pop(struct parser_params*, const char *token);
%right tPOW
%right '!' '~' tUPLUS
+%nonassoc idNULL
+%nonassoc idRespond_to
+%nonassoc idIFUNC
+%nonassoc idCFUNC
+%nonassoc id_core_set_method_alias
+%nonassoc id_core_set_variable_alias
+%nonassoc id_core_undef_method
+%nonassoc id_core_define_method
+%nonassoc id_core_define_singleton_method
+%nonassoc id_core_set_postexe
+
%token tLAST_TOKEN
%%
@@ -928,6 +859,9 @@ top_stmts : none
top_stmt : stmt
| keyword_BEGIN
{
+ if (in_def || in_single) {
+ yyerror("BEGIN in method");
+ }
/*%%%*/
/* local_push(0); */
/*%
@@ -1000,7 +934,7 @@ stmts : none
dispatch0(void_stmt));
%*/
}
- | stmt_or_begin
+ | stmt
{
/*%%%*/
$$ = newline_node($1);
@@ -1008,7 +942,7 @@ stmts : none
$$ = dispatch2(stmts_add, dispatch0(stmts_new), $1);
%*/
}
- | stmts terms stmt_or_begin
+ | stmts terms stmt
{
/*%%%*/
$$ = block_append($1, newline_node($3));
@@ -1022,31 +956,6 @@ stmts : none
}
;
-stmt_or_begin : stmt
- {
- $$ = $1;
- }
- | keyword_BEGIN
- {
- yyerror("BEGIN is permitted only at toplevel");
- /*%%%*/
- /* local_push(0); */
- /*%
- %*/
- }
- '{' top_compstmt '}'
- {
- /*%%%*/
- ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
- $4);
- /* NEW_PREEXE($4)); */
- /* local_pop(); */
- $$ = NEW_BEGIN(0);
- /*%
- $$ = dispatch1(BEGIN, $4);
- %*/
- }
-
stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
{
/*%%%*/
@@ -1142,7 +1051,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
NODE *resq = NEW_RESBODY(0, remove_begin($3), 0);
$$ = NEW_RESCUE(remove_begin($1), resq, 0);
/*%
- $$ = dispatch2(rescue_mod, $1, $3);
+ $$ = dispatch2(rescue_mod, $3, $1);
%*/
}
| keyword_END '{' compstmt '}'
@@ -1157,7 +1066,15 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
$$ = dispatch1(END, $3);
%*/
}
- | command_asgn
+ | lhs '=' command_call
+ {
+ /*%%%*/
+ value_expr($3);
+ $$ = node_assign($1, $3);
+ /*%
+ $$ = dispatch2(assign, $1, $3);
+ %*/
+ }
| mlhs '=' command_call
{
/*%%%*/
@@ -1170,8 +1087,32 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
}
| var_lhs tOP_ASGN command_call
{
+ /*%%%*/
value_expr($3);
- $$ = new_op_assign($1, $2, $3);
+ if ($1) {
+ ID vid = $1->nd_vid;
+ if ($2 == tOROP) {
+ $1->nd_value = $3;
+ $$ = NEW_OP_ASGN_OR(gettable(vid), $1);
+ if (is_asgn_or_id(vid)) {
+ $$->nd_aid = vid;
+ }
+ }
+ else if ($2 == tANDOP) {
+ $1->nd_value = $3;
+ $$ = NEW_OP_ASGN_AND(gettable(vid), $1);
+ }
+ else {
+ $$ = $1;
+ $$->nd_value = NEW_CALL(gettable(vid), $2, NEW_LIST($3));
+ }
+ }
+ else {
+ $$ = NEW_BEGIN(0);
+ }
+ /*%
+ $$ = dispatch3(opassign, $1, $2, $3);
+ %*/
}
| primary_value '[' opt_call_args rbracket tOP_ASGN command_call
{
@@ -1196,28 +1137,65 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
}
| primary_value '.' tIDENTIFIER tOP_ASGN command_call
{
+ /*%%%*/
value_expr($5);
- $$ = new_attr_op_assign($1, ripper_id2sym('.'), $3, $4, $5);
+ if ($4 == tOROP) {
+ $4 = 0;
+ }
+ else if ($4 == tANDOP) {
+ $4 = 1;
+ }
+ $$ = NEW_OP_ASGN2($1, $3, $4, $5);
+ fixpos($$, $1);
+ /*%
+ $$ = dispatch3(field, $1, ripper_id2sym('.'), $3);
+ $$ = dispatch3(opassign, $$, $4, $5);
+ %*/
}
| primary_value '.' tCONSTANT tOP_ASGN command_call
{
+ /*%%%*/
value_expr($5);
- $$ = new_attr_op_assign($1, ripper_id2sym('.'), $3, $4, $5);
+ if ($4 == tOROP) {
+ $4 = 0;
+ }
+ else if ($4 == tANDOP) {
+ $4 = 1;
+ }
+ $$ = NEW_OP_ASGN2($1, $3, $4, $5);
+ fixpos($$, $1);
+ /*%
+ $$ = dispatch3(field, $1, ripper_id2sym('.'), $3);
+ $$ = dispatch3(opassign, $$, $4, $5);
+ %*/
}
| primary_value tCOLON2 tCONSTANT tOP_ASGN command_call
{
/*%%%*/
- $$ = NEW_COLON2($1, $3);
- $$ = new_const_op_assign($$, $4, $5);
+ yyerror("constant re-assignment");
+ $$ = 0;
/*%
$$ = dispatch2(const_path_field, $1, $3);
$$ = dispatch3(opassign, $$, $4, $5);
+ $$ = dispatch1(assign_error, $$);
%*/
}
| primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_call
{
+ /*%%%*/
value_expr($5);
- $$ = new_attr_op_assign($1, ripper_intern("::"), $3, $4, $5);
+ if ($4 == tOROP) {
+ $4 = 0;
+ }
+ else if ($4 == tANDOP) {
+ $4 = 1;
+ }
+ $$ = NEW_OP_ASGN2($1, $3, $4, $5);
+ fixpos($$, $1);
+ /*%
+ $$ = dispatch3(field, $1, ripper_intern("::"), $3);
+ $$ = dispatch3(opassign, $$, $4, $5);
+ %*/
}
| backref tOP_ASGN command_call
{
@@ -1259,27 +1237,6 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
| expr
;
-command_asgn : lhs '=' command_call
- {
- /*%%%*/
- value_expr($3);
- $$ = node_assign($1, $3);
- /*%
- $$ = dispatch2(assign, $1, $3);
- %*/
- }
- | lhs '=' command_asgn
- {
- /*%%%*/
- value_expr($3);
- $$ = node_assign($1, $3);
- /*%
- $$ = dispatch2(assign, $1, $3);
- %*/
- }
- ;
-
-
expr : command_call
| expr keyword_and expr
{
@@ -1333,12 +1290,21 @@ command_call : command
;
block_command : block_call
- | block_call dot_or_colon operation2 command_args
+ | block_call '.' operation2 command_args
{
/*%%%*/
$$ = NEW_CALL($1, $3, $4);
/*%
- $$ = dispatch3(call, $1, $2, $3);
+ $$ = dispatch3(call, $1, ripper_id2sym('.'), $3);
+ $$ = method_arg($$, $4);
+ %*/
+ }
+ | block_call tCOLON2 operation2 command_args
+ {
+ /*%%%*/
+ $$ = NEW_CALL($1, $3, $4);
+ /*%
+ $$ = dispatch3(call, $1, ripper_intern("::"), $3);
$$ = method_arg($$, $4);
%*/
}
@@ -1366,33 +1332,22 @@ cmd_brace_block : tLBRACE_ARG
}
;
-fcall : operation
+command : operation command_args %prec tLOWEST
{
/*%%%*/
- $$ = NEW_FCALL($1, 0);
- nd_set_line($$, tokline);
- /*%
- %*/
- }
- ;
-
-command : fcall command_args %prec tLOWEST
- {
- /*%%%*/
- $$ = $1;
- $$->nd_args = $2;
+ $$ = NEW_FCALL($1, $2);
+ fixpos($$, $2);
/*%
$$ = dispatch2(command, $1, $2);
%*/
}
- | fcall command_args cmd_brace_block
+ | operation command_args cmd_brace_block
{
/*%%%*/
block_dup_check($2,$3);
- $1->nd_args = $2;
- $3->nd_iter = $1;
+ $3->nd_iter = NEW_FCALL($1, $2);
$$ = $3;
- fixpos($$, $1);
+ fixpos($$, $2);
/*%
$$ = dispatch2(command, $1, $2);
$$ = method_add_block($$, $3);
@@ -1639,14 +1594,10 @@ mlhs_post : mlhs_item
}
;
-mlhs_node : user_variable
+mlhs_node : variable
{
$$ = assignable($1, 0);
}
- | keyword_variable
- {
- $$ = assignable($1, 0);
- }
| primary_value '[' opt_call_args rbracket
{
/*%%%*/
@@ -1713,7 +1664,7 @@ mlhs_node : user_variable
}
;
-lhs : user_variable
+lhs : variable
{
$$ = assignable($1, 0);
/*%%%*/
@@ -1722,15 +1673,6 @@ lhs : user_variable
$$ = dispatch1(var_field, $$);
%*/
}
- | keyword_variable
- {
- $$ = assignable($1, 0);
- /*%%%*/
- if (!$$) $$ = NEW_BEGIN(0);
- /*%
- $$ = dispatch1(var_field, $$);
- %*/
- }
| primary_value '[' opt_call_args rbracket
{
/*%%%*/
@@ -1911,7 +1853,6 @@ op : '|' { ifndef_ripper($$ = '|'); }
| '/' { ifndef_ripper($$ = '/'); }
| '%' { ifndef_ripper($$ = '%'); }
| tPOW { ifndef_ripper($$ = tPOW); }
- | tDSTAR { ifndef_ripper($$ = tDSTAR); }
| '!' { ifndef_ripper($$ = '!'); }
| '~' { ifndef_ripper($$ = '~'); }
| tUPLUS { ifndef_ripper($$ = tUPLUS); }
@@ -1956,18 +1897,63 @@ arg : lhs '=' arg
}
| var_lhs tOP_ASGN arg
{
+ /*%%%*/
value_expr($3);
- $$ = new_op_assign($1, $2, $3);
+ if ($1) {
+ ID vid = $1->nd_vid;
+ if ($2 == tOROP) {
+ $1->nd_value = $3;
+ $$ = NEW_OP_ASGN_OR(gettable(vid), $1);
+ if (is_asgn_or_id(vid)) {
+ $$->nd_aid = vid;
+ }
+ }
+ else if ($2 == tANDOP) {
+ $1->nd_value = $3;
+ $$ = NEW_OP_ASGN_AND(gettable(vid), $1);
+ }
+ else {
+ $$ = $1;
+ $$->nd_value = NEW_CALL(gettable(vid), $2, NEW_LIST($3));
+ }
+ }
+ else {
+ $$ = NEW_BEGIN(0);
+ }
+ /*%
+ $$ = dispatch3(opassign, $1, $2, $3);
+ %*/
}
| var_lhs tOP_ASGN arg modifier_rescue arg
{
/*%%%*/
value_expr($3);
$3 = NEW_RESCUE($3, NEW_RESBODY(0,$5,0), 0);
+ if ($1) {
+ ID vid = $1->nd_vid;
+ if ($2 == tOROP) {
+ $1->nd_value = $3;
+ $$ = NEW_OP_ASGN_OR(gettable(vid), $1);
+ if (is_asgn_or_id(vid)) {
+ $$->nd_aid = vid;
+ }
+ }
+ else if ($2 == tANDOP) {
+ $1->nd_value = $3;
+ $$ = NEW_OP_ASGN_AND(gettable(vid), $1);
+ }
+ else {
+ $$ = $1;
+ $$->nd_value = NEW_CALL(gettable(vid), $2, NEW_LIST($3));
+ }
+ }
+ else {
+ $$ = NEW_BEGIN(0);
+ }
/*%
$3 = dispatch2(rescue_mod, $3, $5);
+ $$ = dispatch3(opassign, $1, $2, $3);
%*/
- $$ = new_op_assign($1, $2, $3);
}
| primary_value '[' opt_call_args rbracket tOP_ASGN arg
{
@@ -1997,37 +1983,75 @@ arg : lhs '=' arg
}
| primary_value '.' tIDENTIFIER tOP_ASGN arg
{
+ /*%%%*/
value_expr($5);
- $$ = new_attr_op_assign($1, ripper_id2sym('.'), $3, $4, $5);
+ if ($4 == tOROP) {
+ $4 = 0;
+ }
+ else if ($4 == tANDOP) {
+ $4 = 1;
+ }
+ $$ = NEW_OP_ASGN2($1, $3, $4, $5);
+ fixpos($$, $1);
+ /*%
+ $1 = dispatch3(field, $1, ripper_id2sym('.'), $3);
+ $$ = dispatch3(opassign, $1, $4, $5);
+ %*/
}
| primary_value '.' tCONSTANT tOP_ASGN arg
{
+ /*%%%*/
value_expr($5);
- $$ = new_attr_op_assign($1, ripper_id2sym('.'), $3, $4, $5);
+ if ($4 == tOROP) {
+ $4 = 0;
+ }
+ else if ($4 == tANDOP) {
+ $4 = 1;
+ }
+ $$ = NEW_OP_ASGN2($1, $3, $4, $5);
+ fixpos($$, $1);
+ /*%
+ $1 = dispatch3(field, $1, ripper_id2sym('.'), $3);
+ $$ = dispatch3(opassign, $1, $4, $5);
+ %*/
}
| primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg
{
+ /*%%%*/
value_expr($5);
- $$ = new_attr_op_assign($1, ripper_intern("::"), $3, $4, $5);
+ if ($4 == tOROP) {
+ $4 = 0;
+ }
+ else if ($4 == tANDOP) {
+ $4 = 1;
+ }
+ $$ = NEW_OP_ASGN2($1, $3, $4, $5);
+ fixpos($$, $1);
+ /*%
+ $1 = dispatch3(field, $1, ripper_intern("::"), $3);
+ $$ = dispatch3(opassign, $1, $4, $5);
+ %*/
}
| primary_value tCOLON2 tCONSTANT tOP_ASGN arg
{
/*%%%*/
- $$ = NEW_COLON2($1, $3);
- $$ = new_const_op_assign($$, $4, $5);
+ yyerror("constant re-assignment");
+ $$ = NEW_BEGIN(0);
/*%
$$ = dispatch2(const_path_field, $1, $3);
$$ = dispatch3(opassign, $$, $4, $5);
+ $$ = dispatch1(assign_error, $$);
%*/
}
| tCOLON3 tCONSTANT tOP_ASGN arg
{
/*%%%*/
- $$ = NEW_COLON3($2);
- $$ = new_const_op_assign($$, $3, $4);
+ yyerror("constant re-assignment");
+ $$ = NEW_BEGIN(0);
/*%
$$ = dispatch1(top_const_field, $2);
$$ = dispatch3(opassign, $$, $3, $4);
+ $$ = dispatch1(assign_error, $$);
%*/
}
| backref tOP_ASGN arg
@@ -2243,7 +2267,7 @@ arg : lhs '=' arg
{
/*%%%*/
$$ = match_op($1, $3);
- if (nd_type($1) == NODE_LIT && RB_TYPE_P($1->nd_lit, T_REGEXP)) {
+ if (nd_type($1) == NODE_LIT && TYPE($1->nd_lit) == T_REGEXP) {
$$ = reg_named_capture_assign($1->nd_lit, $$);
}
/*%
@@ -2383,26 +2407,6 @@ opt_paren_args : none
opt_call_args : none
| call_args
- | args ','
- {
- $$ = $1;
- }
- | args ',' assocs ','
- {
- /*%%%*/
- $$ = arg_append($1, NEW_HASH($3));
- /*%
- $$ = arg_add_assocs($1, $3);
- %*/
- }
- | assocs ','
- {
- /*%%%*/
- $$ = NEW_LIST(NEW_HASH($1));
- /*%
- $$ = arg_add_assocs(arg_new(), $1);
- %*/
- }
;
call_args : command
@@ -2476,6 +2480,10 @@ opt_block_arg : ',' block_arg
{
$$ = $2;
}
+ | ','
+ {
+ $$ = 0;
+ }
| none
{
$$ = 0;
@@ -2573,8 +2581,6 @@ primary : literal
| regexp
| words
| qwords
- | symbols
- | qsymbols
| var_ref
| backref
| tFID
@@ -2587,8 +2593,6 @@ primary : literal
}
| k_begin
{
- $<val>1 = cmdarg_stack;
- cmdarg_stack = 0;
/*%%%*/
$<num>$ = ruby_sourceline;
/*%
@@ -2597,7 +2601,6 @@ primary : literal
bodystmt
k_end
{
- cmdarg_stack = $<val>1;
/*%%%*/
if ($3 == NULL) {
$$ = NEW_NIL();
@@ -2613,26 +2616,13 @@ primary : literal
$$ = dispatch1(begin, $3);
%*/
}
- | tLPAREN_ARG {lex_state = EXPR_ENDARG;} rparen
- {
- /*%%%*/
- $$ = 0;
- /*%
- $$ = dispatch1(paren, 0);
- %*/
- }
- | tLPAREN_ARG
+ | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} rparen
{
- $<val>1 = cmdarg_stack;
- cmdarg_stack = 0;
- }
- expr {lex_state = EXPR_ENDARG;} rparen
- {
- cmdarg_stack = $<val>1;
+ rb_warning0("(...) interpreted as grouped expression");
/*%%%*/
- $$ = $3;
+ $$ = $2;
/*%
- $$ = dispatch1(paren, $3);
+ $$ = dispatch1(paren, $2);
%*/
}
| tLPAREN compstmt ')'
@@ -2699,7 +2689,7 @@ primary : literal
| keyword_yield '(' rparen
{
/*%%%*/
- $$ = NEW_YIELD(0);
+ $$ = NEW_YIELD(0, Qfalse);
/*%
$$ = dispatch1(yield, dispatch1(paren, arg_new()));
%*/
@@ -2707,7 +2697,7 @@ primary : literal
| keyword_yield
{
/*%%%*/
- $$ = NEW_YIELD(0);
+ $$ = NEW_YIELD(0, Qfalse);
/*%
$$ = dispatch0(yield0);
%*/
@@ -2738,11 +2728,12 @@ primary : literal
$$ = dispatch2(unary, ripper_intern("not"), Qnil);
%*/
}
- | fcall brace_block
+ | operation brace_block
{
/*%%%*/
- $2->nd_iter = $1;
+ $2->nd_iter = NEW_FCALL($1, 0);
$$ = $2;
+ fixpos($2->nd_iter, $2);
/*%
$$ = method_arg(dispatch1(fcall, $1), arg_new());
$$ = method_add_block($$, $2);
@@ -2755,6 +2746,7 @@ primary : literal
block_dup_check($1->nd_args, $2);
$2->nd_iter = $1;
$$ = $2;
+ fixpos($$, $1);
/*%
$$ = method_add_block($1, $2);
%*/
@@ -2860,17 +2852,17 @@ primary : literal
m->nd_next = block_append(
NEW_IF(
NEW_NODE(NODE_AND,
- NEW_CALL(NEW_CALL(NEW_DVAR(id), idLength, 0),
- idEq, one),
- NEW_CALL(NEW_CALL(NEW_DVAR(id), idAREF, zero),
+ NEW_CALL(NEW_CALL(NEW_DVAR(id), rb_intern("length"), 0),
+ rb_intern("=="), one),
+ NEW_CALL(NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero),
rb_intern("kind_of?"), NEW_LIST(NEW_LIT(rb_cArray))),
0),
NEW_DASGN_CURR(id,
- NEW_CALL(NEW_DVAR(id), idAREF, zero)),
+ NEW_CALL(NEW_DVAR(id), rb_intern("[]"), zero)),
0),
node_assign($2, NEW_DVAR(id)));
- args = new_args(m, 0, id, 0, new_args_tail(0, 0, 0));
+ args = new_args(m, 0, id, 0, 0);
}
else {
if (nd_type($2) == NODE_LASGN ||
@@ -2879,11 +2871,11 @@ primary : literal
$2->nd_value = NEW_DVAR(id);
m->nd_plen = 1;
m->nd_next = $2;
- args = new_args(m, 0, 0, 0, new_args_tail(0, 0, 0));
+ args = new_args(m, 0, 0, 0, 0);
}
else {
m->nd_next = node_assign(NEW_MASGN(NEW_LIST($2), 0), NEW_DVAR(id));
- args = new_args(m, 0, id, 0, new_args_tail(0, 0, 0));
+ args = new_args(m, 0, id, 0, 0);
}
}
scope = NEW_NODE(NODE_SCOPE, tbl, $8, args);
@@ -3287,98 +3279,126 @@ f_margs : f_marg_list
}
;
-
-block_args_tail : f_block_kwarg ',' f_kwrest opt_f_block_arg
+block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_f_block_arg
{
- $$ = new_args_tail($1, $3, $4);
- }
- | f_block_kwarg opt_f_block_arg
- {
- $$ = new_args_tail($1, Qnone, $2);
- }
- | f_kwrest opt_f_block_arg
- {
- $$ = new_args_tail(Qnone, $1, $2);
- }
- | f_block_arg
- {
- $$ = new_args_tail(Qnone, Qnone, $1);
- }
- ;
-
-opt_block_args_tail : ',' block_args_tail
- {
- $$ = $2;
- }
- | /* none */
- {
- $$ = new_args_tail(Qnone, Qnone, Qnone);
- }
- ;
-
-block_param : f_arg ',' f_block_optarg ',' f_rest_arg opt_block_args_tail
- {
- $$ = new_args($1, $3, $5, Qnone, $6);
+ /*%%%*/
+ $$ = new_args($1, $3, $5, 0, $6);
+ /*%
+ $$ = params_new($1, $3, $5, Qnil, escape_Qundef($6));
+ %*/
}
- | f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail
+ | f_arg ',' f_block_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
+ /*%%%*/
$$ = new_args($1, $3, $5, $7, $8);
+ /*%
+ $$ = params_new($1, $3, $5, $7, escape_Qundef($8));
+ %*/
}
- | f_arg ',' f_block_optarg opt_block_args_tail
+ | f_arg ',' f_block_optarg opt_f_block_arg
{
- $$ = new_args($1, $3, Qnone, Qnone, $4);
+ /*%%%*/
+ $$ = new_args($1, $3, 0, 0, $4);
+ /*%
+ $$ = params_new($1, $3, Qnil, Qnil, escape_Qundef($4));
+ %*/
}
- | f_arg ',' f_block_optarg ',' f_arg opt_block_args_tail
+ | f_arg ',' f_block_optarg ',' f_arg opt_f_block_arg
{
- $$ = new_args($1, $3, Qnone, $5, $6);
+ /*%%%*/
+ $$ = new_args($1, $3, 0, $5, $6);
+ /*%
+ $$ = params_new($1, $3, Qnil, $5, escape_Qundef($6));
+ %*/
}
- | f_arg ',' f_rest_arg opt_block_args_tail
+ | f_arg ',' f_rest_arg opt_f_block_arg
{
- $$ = new_args($1, Qnone, $3, Qnone, $4);
+ /*%%%*/
+ $$ = new_args($1, 0, $3, 0, $4);
+ /*%
+ $$ = params_new($1, Qnil, $3, Qnil, escape_Qundef($4));
+ %*/
}
| f_arg ','
{
- $$ = new_args($1, Qnone, 1, Qnone, new_args_tail(Qnone, Qnone, Qnone));
/*%%%*/
+ $$ = new_args($1, 0, 1, 0, 0);
/*%
+ $$ = params_new($1, Qnil, Qnil, Qnil, Qnil);
dispatch1(excessed_comma, $$);
%*/
}
- | f_arg ',' f_rest_arg ',' f_arg opt_block_args_tail
+ | f_arg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
- $$ = new_args($1, Qnone, $3, $5, $6);
+ /*%%%*/
+ $$ = new_args($1, 0, $3, $5, $6);
+ /*%
+ $$ = params_new($1, Qnil, $3, $5, escape_Qundef($6));
+ %*/
}
- | f_arg opt_block_args_tail
+ | f_arg opt_f_block_arg
{
- $$ = new_args($1, Qnone, Qnone, Qnone, $2);
+ /*%%%*/
+ $$ = new_args($1, 0, 0, 0, $2);
+ /*%
+ $$ = params_new($1, Qnil,Qnil, Qnil, escape_Qundef($2));
+ %*/
}
- | f_block_optarg ',' f_rest_arg opt_block_args_tail
+ | f_block_optarg ',' f_rest_arg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, $3, Qnone, $4);
+ /*%%%*/
+ $$ = new_args(0, $1, $3, 0, $4);
+ /*%
+ $$ = params_new(Qnil, $1, $3, Qnil, escape_Qundef($4));
+ %*/
}
- | f_block_optarg ',' f_rest_arg ',' f_arg opt_block_args_tail
+ | f_block_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, $3, $5, $6);
+ /*%%%*/
+ $$ = new_args(0, $1, $3, $5, $6);
+ /*%
+ $$ = params_new(Qnil, $1, $3, $5, escape_Qundef($6));
+ %*/
}
- | f_block_optarg opt_block_args_tail
+ | f_block_optarg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, Qnone, Qnone, $2);
+ /*%%%*/
+ $$ = new_args(0, $1, 0, 0, $2);
+ /*%
+ $$ = params_new(Qnil, $1, Qnil, Qnil,escape_Qundef($2));
+ %*/
}
- | f_block_optarg ',' f_arg opt_block_args_tail
+ | f_block_optarg ',' f_arg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, Qnone, $3, $4);
+ /*%%%*/
+ $$ = new_args(0, $1, 0, $3, $4);
+ /*%
+ $$ = params_new(Qnil, $1, Qnil, $3, escape_Qundef($4));
+ %*/
}
- | f_rest_arg opt_block_args_tail
+ | f_rest_arg opt_f_block_arg
{
- $$ = new_args(Qnone, Qnone, $1, Qnone, $2);
+ /*%%%*/
+ $$ = new_args(0, 0, $1, 0, $2);
+ /*%
+ $$ = params_new(Qnil, Qnil, $1, Qnil, escape_Qundef($2));
+ %*/
}
- | f_rest_arg ',' f_arg opt_block_args_tail
+ | f_rest_arg ',' f_arg opt_f_block_arg
{
- $$ = new_args(Qnone, Qnone, $1, $3, $4);
+ /*%%%*/
+ $$ = new_args(0, 0, $1, $3, $4);
+ /*%
+ $$ = params_new(Qnil, Qnil, $1, $3, escape_Qundef($4));
+ %*/
}
- | block_args_tail
+ | f_block_arg
{
- $$ = new_args(Qnone, Qnone, Qnone, Qnone, $1);
+ /*%%%*/
+ $$ = new_args(0, 0, 0, 0, $1);
+ /*%
+ $$ = params_new(Qnil, Qnil, Qnil, Qnil, $1);
+ %*/
}
;
@@ -3394,7 +3414,7 @@ block_param_def : '|' opt_bv_decl '|'
/*%%%*/
$$ = 0;
/*%
- $$ = blockvar_new(params_new(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil),
+ $$ = blockvar_new(params_new(Qnil,Qnil,Qnil,Qnil,Qnil),
escape_Qundef($2));
%*/
}
@@ -3403,7 +3423,7 @@ block_param_def : '|' opt_bv_decl '|'
/*%%%*/
$$ = 0;
/*%
- $$ = blockvar_new(params_new(Qnil,Qnil,Qnil,Qnil,Qnil,Qnil,Qnil),
+ $$ = blockvar_new(params_new(Qnil,Qnil,Qnil,Qnil,Qnil),
Qnil);
%*/
}
@@ -3418,16 +3438,13 @@ block_param_def : '|' opt_bv_decl '|'
;
-opt_bv_decl : opt_nl
- {
- $$ = 0;
- }
- | opt_nl ';' bv_decls opt_nl
+opt_bv_decl : none
+ | ';' bv_decls
{
/*%%%*/
$$ = 0;
/*%
- $$ = $3;
+ $$ = $2;
%*/
}
;
@@ -3443,7 +3460,7 @@ bv_decls : bvar
/*%c%*/
/*%c
{
- rb_ary_push($1, $3);
+ rb_ary_push($$, $3);
}
%*/
;
@@ -3470,26 +3487,23 @@ lambda : {
lpar_beg = ++paren_nest;
}
f_larglist
- {
- $<num>$ = ruby_sourceline;
- }
lambda_body
{
lpar_beg = $<num>2;
/*%%%*/
- $$ = NEW_LAMBDA($3, $5);
- nd_set_line($$, $<num>4);
+ $$ = $3;
+ $$->nd_body = NEW_SCOPE($3->nd_head, $4);
/*%
- $$ = dispatch2(lambda, $3, $5);
+ $$ = dispatch2(lambda, $3, $4);
%*/
dyna_pop($<vars>1);
}
;
-f_larglist : '(' f_args opt_bv_decl ')'
+f_larglist : '(' f_args opt_bv_decl rparen
{
/*%%%*/
- $$ = $2;
+ $$ = NEW_LAMBDA($2);
/*%
$$ = dispatch1(paren, $2);
%*/
@@ -3497,7 +3511,7 @@ f_larglist : '(' f_args opt_bv_decl ')'
| f_args
{
/*%%%*/
- $$ = $1;
+ $$ = NEW_LAMBDA($1);
/*%
$$ = $1;
%*/
@@ -3551,80 +3565,53 @@ block_call : command do_block
$$ = method_add_block($1, $2);
%*/
}
- | block_call dot_or_colon operation2 opt_paren_args
+ | block_call '.' operation2 opt_paren_args
{
/*%%%*/
$$ = NEW_CALL($1, $3, $4);
/*%
- $$ = dispatch3(call, $1, $2, $3);
+ $$ = dispatch3(call, $1, ripper_id2sym('.'), $3);
$$ = method_optarg($$, $4);
%*/
}
- | block_call dot_or_colon operation2 opt_paren_args brace_block
+ | block_call tCOLON2 operation2 opt_paren_args
{
/*%%%*/
- block_dup_check($4, $5);
- $5->nd_iter = NEW_CALL($1, $3, $4);
- $$ = $5;
- fixpos($$, $1);
- /*%
- $$ = dispatch4(command_call, $1, $2, $3, $4);
- $$ = method_add_block($$, $5);
- %*/
- }
- | block_call dot_or_colon operation2 command_args do_block
- {
- /*%%%*/
- block_dup_check($4, $5);
- $5->nd_iter = NEW_CALL($1, $3, $4);
- $$ = $5;
- fixpos($$, $1);
+ $$ = NEW_CALL($1, $3, $4);
/*%
- $$ = dispatch4(command_call, $1, $2, $3, $4);
- $$ = method_add_block($$, $5);
+ $$ = dispatch3(call, $1, ripper_intern("::"), $3);
+ $$ = method_optarg($$, $4);
%*/
}
;
-method_call : fcall paren_args
+method_call : operation paren_args
{
/*%%%*/
- $$ = $1;
- $$->nd_args = $2;
+ $$ = NEW_FCALL($1, $2);
+ fixpos($$, $2);
/*%
$$ = method_arg(dispatch1(fcall, $1), $2);
%*/
}
- | primary_value '.' operation2
- {
- /*%%%*/
- $<num>$ = ruby_sourceline;
- /*% %*/
- }
- opt_paren_args
+ | primary_value '.' operation2 opt_paren_args
{
/*%%%*/
- $$ = NEW_CALL($1, $3, $5);
- nd_set_line($$, $<num>4);
+ $$ = NEW_CALL($1, $3, $4);
+ fixpos($$, $1);
/*%
$$ = dispatch3(call, $1, ripper_id2sym('.'), $3);
- $$ = method_optarg($$, $5);
+ $$ = method_optarg($$, $4);
%*/
}
- | primary_value tCOLON2 operation2
- {
- /*%%%*/
- $<num>$ = ruby_sourceline;
- /*% %*/
- }
- paren_args
+ | primary_value tCOLON2 operation2 paren_args
{
/*%%%*/
- $$ = NEW_CALL($1, $3, $5);
- nd_set_line($$, $<num>4);
+ $$ = NEW_CALL($1, $3, $4);
+ fixpos($$, $1);
/*%
$$ = dispatch3(call, $1, ripper_id2sym('.'), $3);
- $$ = method_optarg($$, $5);
+ $$ = method_optarg($$, $4);
%*/
}
| primary_value tCOLON2 operation3
@@ -3635,38 +3622,26 @@ method_call : fcall paren_args
$$ = dispatch3(call, $1, ripper_intern("::"), $3);
%*/
}
- | primary_value '.'
- {
- /*%%%*/
- $<num>$ = ruby_sourceline;
- /*% %*/
- }
- paren_args
+ | primary_value '.' paren_args
{
/*%%%*/
- $$ = NEW_CALL($1, rb_intern("call"), $4);
- nd_set_line($$, $<num>3);
+ $$ = NEW_CALL($1, rb_intern("call"), $3);
+ fixpos($$, $1);
/*%
$$ = dispatch3(call, $1, ripper_id2sym('.'),
ripper_intern("call"));
- $$ = method_optarg($$, $4);
+ $$ = method_optarg($$, $3);
%*/
}
- | primary_value tCOLON2
+ | primary_value tCOLON2 paren_args
{
/*%%%*/
- $<num>$ = ruby_sourceline;
- /*% %*/
- }
- paren_args
- {
- /*%%%*/
- $$ = NEW_CALL($1, rb_intern("call"), $4);
- nd_set_line($$, $<num>3);
+ $$ = NEW_CALL($1, rb_intern("call"), $3);
+ fixpos($$, $1);
/*%
$$ = dispatch3(call, $1, ripper_intern("::"),
ripper_intern("call"));
- $$ = method_optarg($$, $4);
+ $$ = method_optarg($$, $3);
%*/
}
| keyword_super paren_args
@@ -4012,51 +3987,6 @@ word : string_content
}
;
-symbols : tSYMBOLS_BEG ' ' tSTRING_END
- {
- /*%%%*/
- $$ = NEW_ZARRAY();
- /*%
- $$ = dispatch0(symbols_new);
- $$ = dispatch1(array, $$);
- %*/
- }
- | tSYMBOLS_BEG symbol_list tSTRING_END
- {
- /*%%%*/
- $$ = $2;
- /*%
- $$ = dispatch1(array, $2);
- %*/
- }
- ;
-
-symbol_list : /* none */
- {
- /*%%%*/
- $$ = 0;
- /*%
- $$ = dispatch0(symbols_new);
- %*/
- }
- | symbol_list word ' '
- {
- /*%%%*/
- $2 = evstr2dstr($2);
- if (nd_type($2) == NODE_DSTR) {
- nd_set_type($2, NODE_DSYM);
- }
- else {
- nd_set_type($2, NODE_LIT);
- $2->nd_lit = rb_str_intern($2->nd_lit);
- }
- $$ = list_append($1, $2);
- /*%
- $$ = dispatch2(symbols_add, $1, $2);
- %*/
- }
- ;
-
qwords : tQWORDS_BEG ' ' tSTRING_END
{
/*%%%*/
@@ -4076,25 +4006,6 @@ qwords : tQWORDS_BEG ' ' tSTRING_END
}
;
-qsymbols : tQSYMBOLS_BEG ' ' tSTRING_END
- {
- /*%%%*/
- $$ = NEW_ZARRAY();
- /*%
- $$ = dispatch0(qsymbols_new);
- $$ = dispatch1(array, $$);
- %*/
- }
- | tQSYMBOLS_BEG qsym_list tSTRING_END
- {
- /*%%%*/
- $$ = $2;
- /*%
- $$ = dispatch1(array, $2);
- %*/
- }
- ;
-
qword_list : /* none */
{
/*%%%*/
@@ -4113,28 +4024,6 @@ qword_list : /* none */
}
;
-qsym_list : /* none */
- {
- /*%%%*/
- $$ = 0;
- /*%
- $$ = dispatch0(qsymbols_new);
- %*/
- }
- | qsym_list tSTRING_CONTENT ' '
- {
- /*%%%*/
- VALUE lit;
- lit = $2->nd_lit;
- $2->nd_lit = ID2SYM(rb_intern_str(lit));
- nd_set_type($2, NODE_LIT);
- $$ = list_append($1, $2);
- /*%
- $$ = dispatch2(qsymbols_add, $1, $2);
- %*/
- }
- ;
-
string_contents : /* none */
{
/*%%%*/
@@ -4237,21 +4126,16 @@ string_content : tSTRING_CONTENT
lex_strterm = 0;
lex_state = EXPR_BEG;
}
- {
- $<num>$ = brace_nest;
- brace_nest = 0;
- }
- compstmt tSTRING_DEND
+ compstmt '}'
{
cond_stack = $<val>1;
cmdarg_stack = $<val>2;
lex_strterm = $<node>3;
- brace_nest = $<num>4;
/*%%%*/
- if ($5) $5->flags &= ~NODE_FL_NEWLINE;
- $$ = new_evstr($5);
+ if ($4) $4->flags &= ~NODE_FL_NEWLINE;
+ $$ = new_evstr($4);
/*%
- $$ = dispatch1(string_embexpr, $5);
+ $$ = dispatch1(string_embexpr, $4);
%*/
}
;
@@ -4304,7 +4188,26 @@ dsym : tSYMBEG xstring_contents tSTRING_END
{
lex_state = EXPR_END;
/*%%%*/
- $$ = dsym_node($2);
+ if (!($$ = $2)) {
+ $$ = NEW_LIT(ID2SYM(rb_intern("")));
+ }
+ else {
+ VALUE lit;
+
+ switch (nd_type($$)) {
+ case NODE_DSTR:
+ nd_set_type($$, NODE_DSYM);
+ break;
+ case NODE_STR:
+ lit = $$->nd_lit;
+ $$->nd_lit = ID2SYM(rb_intern_str(lit));
+ nd_set_type($$, NODE_LIT);
+ break;
+ default:
+ $$ = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST($$));
+ break;
+ }
+ }
/*%
$$ = dispatch1(dyna_symbol, $2);
%*/
@@ -4331,14 +4234,12 @@ numeric : tINTEGER
}
;
-user_variable : tIDENTIFIER
+variable : tIDENTIFIER
| tIVAR
| tGVAR
| tCONSTANT
| tCVAR
- ;
-
-keyword_variable: keyword_nil {ifndef_ripper($$ = keyword_nil);}
+ | keyword_nil {ifndef_ripper($$ = keyword_nil);}
| keyword_self {ifndef_ripper($$ = keyword_self);}
| keyword_true {ifndef_ripper($$ = keyword_true);}
| keyword_false {ifndef_ripper($$ = keyword_false);}
@@ -4347,20 +4248,7 @@ keyword_variable: keyword_nil {ifndef_ripper($$ = keyword_nil);}
| keyword__ENCODING__ {ifndef_ripper($$ = keyword__ENCODING__);}
;
-var_ref : user_variable
- {
- /*%%%*/
- if (!($$ = gettable($1))) $$ = NEW_BEGIN(0);
- /*%
- if (id_is_var(get_id($1))) {
- $$ = dispatch1(var_ref, $1);
- }
- else {
- $$ = dispatch1(vcall, $1);
- }
- %*/
- }
- | keyword_variable
+var_ref : variable
{
/*%%%*/
if (!($$ = gettable($1))) $$ = NEW_BEGIN(0);
@@ -4370,7 +4258,7 @@ var_ref : user_variable
}
;
-var_lhs : user_variable
+var_lhs : variable
{
$$ = assignable($1, 0);
/*%%%*/
@@ -4378,14 +4266,6 @@ var_lhs : user_variable
$$ = dispatch1(var_field, $$);
%*/
}
- | keyword_variable
- {
- $$ = assignable($1, 0);
- /*%%%*/
- /*%
- $$ = dispatch1(var_field, $$);
- %*/
- }
;
backref : tNTH_REF
@@ -4403,7 +4283,6 @@ superclass : term
| '<'
{
lex_state = EXPR_BEG;
- command_start = TRUE;
}
expr_value term
{
@@ -4434,99 +4313,128 @@ f_arglist : '(' f_args rparen
| f_args term
{
$$ = $1;
- lex_state = EXPR_BEG;
- command_start = TRUE;
}
;
-args_tail : f_kwarg ',' f_kwrest opt_f_block_arg
- {
- $$ = new_args_tail($1, $3, $4);
- }
- | f_kwarg opt_f_block_arg
- {
- $$ = new_args_tail($1, Qnone, $2);
- }
- | f_kwrest opt_f_block_arg
+f_args : f_arg ',' f_optarg ',' f_rest_arg opt_f_block_arg
{
- $$ = new_args_tail(Qnone, $1, $2);
- }
- | f_block_arg
- {
- $$ = new_args_tail(Qnone, Qnone, $1);
- }
- ;
-
-opt_args_tail : ',' args_tail
- {
- $$ = $2;
- }
- | /* none */
- {
- $$ = new_args_tail(Qnone, Qnone, Qnone);
- }
- ;
-
-f_args : f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
- {
- $$ = new_args($1, $3, $5, Qnone, $6);
+ /*%%%*/
+ $$ = new_args($1, $3, $5, 0, $6);
+ /*%
+ $$ = params_new($1, $3, $5, Qnil, escape_Qundef($6));
+ %*/
}
- | f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_args_tail
+ | f_arg ',' f_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
+ /*%%%*/
$$ = new_args($1, $3, $5, $7, $8);
+ /*%
+ $$ = params_new($1, $3, $5, $7, escape_Qundef($8));
+ %*/
}
- | f_arg ',' f_optarg opt_args_tail
+ | f_arg ',' f_optarg opt_f_block_arg
{
- $$ = new_args($1, $3, Qnone, Qnone, $4);
+ /*%%%*/
+ $$ = new_args($1, $3, 0, 0, $4);
+ /*%
+ $$ = params_new($1, $3, Qnil, Qnil, escape_Qundef($4));
+ %*/
}
- | f_arg ',' f_optarg ',' f_arg opt_args_tail
+ | f_arg ',' f_optarg ',' f_arg opt_f_block_arg
{
- $$ = new_args($1, $3, Qnone, $5, $6);
+ /*%%%*/
+ $$ = new_args($1, $3, 0, $5, $6);
+ /*%
+ $$ = params_new($1, $3, Qnil, $5, escape_Qundef($6));
+ %*/
}
- | f_arg ',' f_rest_arg opt_args_tail
+ | f_arg ',' f_rest_arg opt_f_block_arg
{
- $$ = new_args($1, Qnone, $3, Qnone, $4);
+ /*%%%*/
+ $$ = new_args($1, 0, $3, 0, $4);
+ /*%
+ $$ = params_new($1, Qnil, $3, Qnil, escape_Qundef($4));
+ %*/
}
- | f_arg ',' f_rest_arg ',' f_arg opt_args_tail
+ | f_arg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
- $$ = new_args($1, Qnone, $3, $5, $6);
+ /*%%%*/
+ $$ = new_args($1, 0, $3, $5, $6);
+ /*%
+ $$ = params_new($1, Qnil, $3, $5, escape_Qundef($6));
+ %*/
}
- | f_arg opt_args_tail
+ | f_arg opt_f_block_arg
{
- $$ = new_args($1, Qnone, Qnone, Qnone, $2);
+ /*%%%*/
+ $$ = new_args($1, 0, 0, 0, $2);
+ /*%
+ $$ = params_new($1, Qnil, Qnil, Qnil,escape_Qundef($2));
+ %*/
}
- | f_optarg ',' f_rest_arg opt_args_tail
+ | f_optarg ',' f_rest_arg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, $3, Qnone, $4);
+ /*%%%*/
+ $$ = new_args(0, $1, $3, 0, $4);
+ /*%
+ $$ = params_new(Qnil, $1, $3, Qnil, escape_Qundef($4));
+ %*/
}
- | f_optarg ',' f_rest_arg ',' f_arg opt_args_tail
+ | f_optarg ',' f_rest_arg ',' f_arg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, $3, $5, $6);
+ /*%%%*/
+ $$ = new_args(0, $1, $3, $5, $6);
+ /*%
+ $$ = params_new(Qnil, $1, $3, $5, escape_Qundef($6));
+ %*/
}
- | f_optarg opt_args_tail
+ | f_optarg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, Qnone, Qnone, $2);
+ /*%%%*/
+ $$ = new_args(0, $1, 0, 0, $2);
+ /*%
+ $$ = params_new(Qnil, $1, Qnil, Qnil,escape_Qundef($2));
+ %*/
}
- | f_optarg ',' f_arg opt_args_tail
+ | f_optarg ',' f_arg opt_f_block_arg
{
- $$ = new_args(Qnone, $1, Qnone, $3, $4);
+ /*%%%*/
+ $$ = new_args(0, $1, 0, $3, $4);
+ /*%
+ $$ = params_new(Qnil, $1, Qnil, $3, escape_Qundef($4));
+ %*/
}
- | f_rest_arg opt_args_tail
+ | f_rest_arg opt_f_block_arg
{
- $$ = new_args(Qnone, Qnone, $1, Qnone, $2);
+ /*%%%*/
+ $$ = new_args(0, 0, $1, 0, $2);
+ /*%
+ $$ = params_new(Qnil, Qnil, $1, Qnil,escape_Qundef($2));
+ %*/
}
- | f_rest_arg ',' f_arg opt_args_tail
+ | f_rest_arg ',' f_arg opt_f_block_arg
{
- $$ = new_args(Qnone, Qnone, $1, $3, $4);
+ /*%%%*/
+ $$ = new_args(0, 0, $1, $3, $4);
+ /*%
+ $$ = params_new(Qnil, Qnil, $1, $3, escape_Qundef($4));
+ %*/
}
- | args_tail
+ | f_block_arg
{
- $$ = new_args(Qnone, Qnone, Qnone, Qnone, $1);
+ /*%%%*/
+ $$ = new_args(0, 0, 0, 0, $1);
+ /*%
+ $$ = params_new(Qnil, Qnil, Qnil, Qnil, $1);
+ %*/
}
| /* none */
{
- $$ = new_args_tail(Qnone, Qnone, Qnone);
- $$ = new_args(Qnone, Qnone, Qnone, Qnone, $$);
+ /*%%%*/
+ $$ = new_args(0, 0, 0, 0, 0);
+ /*%
+ $$ = params_new(Qnil, Qnil, Qnil, Qnil, Qnil);
+ %*/
}
;
@@ -4624,94 +4532,6 @@ f_arg : f_arg_item
}
;
-f_kw : tLABEL arg_value
- {
- arg_var(formal_argument(get_id($1)));
- $$ = assignable($1, $2);
- /*%%%*/
- $$ = NEW_KW_ARG(0, $$);
- /*%
- $$ = rb_assoc_new($$, $2);
- %*/
- }
- ;
-
-f_block_kw : tLABEL primary_value
- {
- arg_var(formal_argument(get_id($1)));
- $$ = assignable($1, $2);
- /*%%%*/
- $$ = NEW_KW_ARG(0, $$);
- /*%
- $$ = rb_assoc_new($$, $2);
- %*/
- }
- ;
-
-f_block_kwarg : f_block_kw
- {
- /*%%%*/
- $$ = $1;
- /*%
- $$ = rb_ary_new3(1, $1);
- %*/
- }
- | f_block_kwarg ',' f_block_kw
- {
- /*%%%*/
- NODE *kws = $1;
-
- while (kws->nd_next) {
- kws = kws->nd_next;
- }
- kws->nd_next = $3;
- $$ = $1;
- /*%
- $$ = rb_ary_push($1, $3);
- %*/
- }
- ;
-
-
-f_kwarg : f_kw
- {
- /*%%%*/
- $$ = $1;
- /*%
- $$ = rb_ary_new3(1, $1);
- %*/
- }
- | f_kwarg ',' f_kw
- {
- /*%%%*/
- NODE *kws = $1;
-
- while (kws->nd_next) {
- kws = kws->nd_next;
- }
- kws->nd_next = $3;
- $$ = $1;
- /*%
- $$ = rb_ary_push($1, $3);
- %*/
- }
- ;
-
-kwrest_mark : tPOW
- | tDSTAR
- ;
-
-f_kwrest : kwrest_mark tIDENTIFIER
- {
- shadowing_lvar(get_id($2));
- $$ = $2;
- }
- | kwrest_mark
- {
- $$ = internal_id();
- }
- ;
-
f_opt : tIDENTIFIER '=' arg_value
{
arg_var(formal_argument(get_id($1)));
@@ -4930,16 +4750,6 @@ assoc : arg_value tASSOC arg_value
$$ = dispatch2(assoc_new, $1, $2);
%*/
}
- | tDSTAR arg_value
- {
- /*%%%*/
- $$ = list_append(NEW_LIST(0), $2);
- /*%
- $$ = dispatch1(assoc_splat, $2);
- %*/
- }
- ;
-
;
operation : tIDENTIFIER
@@ -5020,30 +4830,30 @@ static int parser_here_document(struct parser_params*,NODE*);
# define nextc() parser_nextc(parser)
-# define pushback(c) parser_pushback(parser, (c))
+# define pushback(c) parser_pushback(parser, c)
# define newtok() parser_newtok(parser)
-# define tokspace(n) parser_tokspace(parser, (n))
-# define tokadd(c) parser_tokadd(parser, (c))
-# define tok_hex(numlen) parser_tok_hex(parser, (numlen))
-# define read_escape(flags,e) parser_read_escape(parser, (flags), (e))
-# define tokadd_escape(e) parser_tokadd_escape(parser, (e))
+# define tokspace(n) parser_tokspace(parser, n)
+# define tokadd(c) parser_tokadd(parser, c)
+# define tok_hex(numlen) parser_tok_hex(parser, numlen)
+# define read_escape(flags,e) parser_read_escape(parser, flags, e)
+# define tokadd_escape(e) parser_tokadd_escape(parser, e)
# define regx_options() parser_regx_options(parser)
-# define tokadd_string(f,t,p,n,e) parser_tokadd_string(parser,(f),(t),(p),(n),(e))
-# define parse_string(n) parser_parse_string(parser,(n))
-# define tokaddmbc(c, enc) parser_tokaddmbc(parser, (c), (enc))
-# define here_document(n) parser_here_document(parser,(n))
+# define tokadd_string(f,t,p,n,e) parser_tokadd_string(parser,f,t,p,n,e)
+# define parse_string(n) parser_parse_string(parser,n)
+# define tokaddmbc(c, enc) parser_tokaddmbc(parser, c, enc)
+# define here_document(n) parser_here_document(parser,n)
# define heredoc_identifier() parser_heredoc_identifier(parser)
-# define heredoc_restore(n) parser_heredoc_restore(parser,(n))
-# define whole_match_p(e,l,i) parser_whole_match_p(parser,(e),(l),(i))
+# define heredoc_restore(n) parser_heredoc_restore(parser,n)
+# define whole_match_p(e,l,i) parser_whole_match_p(parser,e,l,i)
#ifndef RIPPER
-# define set_yylval_str(x) (yylval.node = NEW_STR(x))
-# define set_yylval_num(x) (yylval.num = (x))
-# define set_yylval_id(x) (yylval.id = (x))
-# define set_yylval_name(x) (yylval.id = (x))
-# define set_yylval_literal(x) (yylval.node = NEW_LIT(x))
-# define set_yylval_node(x) (yylval.node = (x))
-# define yylval_id() (yylval.id)
+# define set_yylval_str(x) yylval.node = NEW_STR(x)
+# define set_yylval_num(x) yylval.num = x
+# define set_yylval_id(x) yylval.id = x
+# define set_yylval_name(x) yylval.id = x
+# define set_yylval_literal(x) yylval.node = NEW_LIT(x)
+# define set_yylval_node(x) yylval.node = x
+# define yylval_id() yylval.id
#else
static inline VALUE
ripper_yylval_id(ID x)
@@ -5062,9 +4872,9 @@ ripper_yylval_id(ID x)
#ifndef RIPPER
#define ripper_flush(p) (void)(p)
#else
-#define ripper_flush(p) ((p)->tokp = (p)->parser_lex_p)
+#define ripper_flush(p) (p->tokp = p->parser_lex_p)
-#define yylval_rval (*(RB_TYPE_P(yylval.val, T_NODE) ? &yylval.node->nd_rval : &yylval.val))
+#define yylval_rval *(RB_TYPE_P(yylval.val, T_NODE) ? &yylval.node->nd_rval : &yylval.val)
static int
ripper_has_scan_event(struct parser_params *parser)
@@ -5127,11 +4937,11 @@ ripper_dispatch_delayed_token(struct parser_params *parser, int t)
# define SIGN_EXTEND_CHAR(c) ((((unsigned char)(c)) ^ 128) - 128)
#endif
-#define parser_encoding_name() (current_enc->name)
-#define parser_mbclen() mbclen((lex_p-1),lex_pend,current_enc)
-#define parser_precise_mbclen() rb_enc_precise_mbclen((lex_p-1),lex_pend,current_enc)
-#define is_identchar(p,e,enc) (rb_enc_isalnum(*(p),(enc)) || (*(p)) == '_' || !ISASCII(*(p)))
-#define parser_is_identchar() (!parser->eofp && is_identchar((lex_p-1),lex_pend,current_enc))
+#define parser_encoding_name() (parser->enc->name)
+#define parser_mbclen() mbclen((lex_p-1),lex_pend,parser->enc)
+#define parser_precise_mbclen() rb_enc_precise_mbclen((lex_p-1),lex_pend,parser->enc)
+#define is_identchar(p,e,enc) (rb_enc_isalnum(*p,enc) || (*p) == '_' || !ISASCII(*p))
+#define parser_is_identchar() (!parser->eofp && is_identchar((lex_p-1),lex_pend,parser->enc))
#define parser_isascii() ISASCII(*(lex_p-1))
@@ -5168,7 +4978,7 @@ token_info_push(struct parser_params *parser, const char *token)
{
token_info *ptinfo;
- if (!parser->parser_token_info_enabled) return;
+ if (compile_for_eval) return;
ptinfo = ALLOC(token_info);
ptinfo->token = token;
ptinfo->linenum = ruby_sourceline;
@@ -5198,11 +5008,9 @@ token_info_pop(struct parser_params *parser, const char *token)
if (token_info_has_nonspaces(parser, token) || ptinfo->nonspc) { /* SKIP */
goto finish;
}
- if (parser->parser_token_info_enabled) {
- rb_compile_warn(ruby_sourcefile, linenum,
- "mismatched indentations at '%s' with '%s' at %d",
- token, ptinfo->token, ptinfo->linenum);
- }
+ rb_compile_warning(ruby_sourcefile, linenum,
+ "mismatched indentations at '%s' with '%s' at %d",
+ token, ptinfo->token, ptinfo->linenum);
finish:
xfree(ptinfo);
@@ -5252,7 +5060,7 @@ parser_yyerror(struct parser_params *parser, const char *msg)
buf = ALLOCA_N(char, len+2);
MEMCPY(buf, p, char, len);
buf[len] = '\0';
- rb_compile_error_with_enc(NULL, 0, (void *)current_enc, "%s%s%s", pre, buf, post);
+ rb_compile_error_append("%s%s%s", pre, buf, post);
i = (int)(lex_p - p);
p2 = buf; pe = buf + len;
@@ -5274,14 +5082,17 @@ parser_yyerror(struct parser_params *parser, const char *msg)
static void parser_prepare(struct parser_params *parser);
#ifndef RIPPER
+VALUE ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always);
+
static VALUE
-debug_lines(VALUE fname)
+debug_lines(const char *f)
{
ID script_lines;
CONST_ID(script_lines, "SCRIPT_LINES__");
if (rb_const_defined_at(rb_cObject, script_lines)) {
VALUE hash = rb_const_get_at(rb_cObject, script_lines);
- if (RB_TYPE_P(hash, T_HASH)) {
+ if (TYPE(hash) == T_HASH) {
+ VALUE fname = rb_str_new2(f);
VALUE lines = rb_ary_new();
rb_hash_aset(hash, fname, lines);
return lines;
@@ -5291,10 +5102,12 @@ debug_lines(VALUE fname)
}
static VALUE
-coverage(VALUE fname, int n)
+coverage(const char *f, int n)
{
+ extern VALUE rb_get_coverages(void);
VALUE coverages = rb_get_coverages();
if (RTEST(coverages) && RBASIC(coverages)->klass == 0) {
+ VALUE fname = rb_str_new2(f);
VALUE lines = rb_ary_new2(n);
int i;
RBASIC(lines)->klass = 0;
@@ -5313,14 +5126,14 @@ e_option_supplied(struct parser_params *parser)
}
static VALUE
-yycompile0(VALUE arg)
+yycompile0(VALUE arg, int tracing)
{
int n;
NODE *tree;
struct parser_params *parser = (struct parser_params *)arg;
if (!compile_for_eval && rb_safe_level() == 0) {
- ruby_debug_lines = debug_lines(ruby_sourcefile_string);
+ ruby_debug_lines = debug_lines(ruby_sourcefile);
if (ruby_debug_lines && ruby_sourceline > 0) {
VALUE str = STR_NEW0();
n = ruby_sourceline;
@@ -5330,28 +5143,13 @@ yycompile0(VALUE arg)
}
if (!e_option_supplied(parser)) {
- ruby_coverage = coverage(ruby_sourcefile_string, ruby_sourceline);
+ ruby_coverage = coverage(ruby_sourcefile, ruby_sourceline);
}
}
parser_prepare(parser);
deferred_nodes = 0;
-#ifndef RIPPER
- parser->parser_token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
-#endif
-#ifndef RIPPER
- if (RUBY_DTRACE_PARSE_BEGIN_ENABLED()) {
- RUBY_DTRACE_PARSE_BEGIN(parser->parser_ruby_sourcefile,
- parser->parser_ruby_sourceline);
- }
-#endif
n = yyparse((void*)parser);
-#ifndef RIPPER
- if (RUBY_DTRACE_PARSE_END_ENABLED()) {
- RUBY_DTRACE_PARSE_END(parser->parser_ruby_sourcefile,
- parser->parser_ruby_sourceline);
- }
-#endif
ruby_debug_lines = 0;
ruby_coverage = 0;
compile_for_eval = 0;
@@ -5373,12 +5171,11 @@ yycompile0(VALUE arg)
}
static NODE*
-yycompile(struct parser_params *parser, VALUE fname, int line)
+yycompile(struct parser_params *parser, const char *f, int line)
{
- ruby_sourcefile_string = rb_str_new_frozen(fname);
- ruby_sourcefile = RSTRING_PTR(fname);
+ ruby_sourcefile = ruby_strdup(f);
ruby_sourceline = line - 1;
- return (NODE *)rb_suppress_tracing(yycompile0, (VALUE)parser);
+ return (NODE *)ruby_suppress_tracing(yycompile0, (VALUE)parser, TRUE);
}
#endif /* !RIPPER */
@@ -5420,7 +5217,7 @@ lex_getline(struct parser_params *parser)
must_be_ascii_compatible(line);
#ifndef RIPPER
if (ruby_debug_lines) {
- rb_enc_associate(line, current_enc);
+ rb_enc_associate(line, parser->enc);
rb_ary_push(ruby_debug_lines, line);
}
if (ruby_coverage) {
@@ -5430,16 +5227,15 @@ lex_getline(struct parser_params *parser)
return line;
}
-#ifdef RIPPER
-static rb_data_type_t parser_data_type;
-#else
static const rb_data_type_t parser_data_type;
+#ifndef RIPPER
static NODE*
-parser_compile_string(volatile VALUE vparser, VALUE fname, VALUE s, int line)
+parser_compile_string(volatile VALUE vparser, const char *f, VALUE s, int line)
{
struct parser_params *parser;
NODE *node;
+ volatile VALUE tmp;
TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
lex_gets = lex_get_str;
@@ -5448,8 +5244,8 @@ parser_compile_string(volatile VALUE vparser, VALUE fname, VALUE s, int line)
lex_pbeg = lex_p = lex_pend = 0;
compile_for_eval = rb_parse_in_eval();
- node = yycompile(parser, fname, line);
- RB_GC_GUARD(vparser); /* prohibit tail call optimization */
+ node = yycompile(parser, f, line);
+ tmp = vparser; /* prohibit tail call optimization */
return node;
}
@@ -5458,18 +5254,12 @@ NODE*
rb_compile_string(const char *f, VALUE s, int line)
{
must_be_ascii_compatible(s);
- return parser_compile_string(rb_parser_new(), rb_filesystem_str_new_cstr(f), s, line);
+ return parser_compile_string(rb_parser_new(), f, s, line);
}
NODE*
rb_parser_compile_string(volatile VALUE vparser, const char *f, VALUE s, int line)
{
- return rb_parser_compile_string_path(vparser, rb_filesystem_str_new_cstr(f), s, line);
-}
-
-NODE*
-rb_parser_compile_string_path(volatile VALUE vparser, VALUE f, VALUE s, int line)
-{
must_be_ascii_compatible(s);
return parser_compile_string(vparser, f, s, line);
}
@@ -5478,14 +5268,14 @@ NODE*
rb_compile_cstr(const char *f, const char *s, int len, int line)
{
VALUE str = rb_str_new(s, len);
- return parser_compile_string(rb_parser_new(), rb_filesystem_str_new_cstr(f), str, line);
+ return parser_compile_string(rb_parser_new(), f, str, line);
}
NODE*
rb_parser_compile_cstr(volatile VALUE vparser, const char *f, const char *s, int len, int line)
{
VALUE str = rb_str_new(s, len);
- return parser_compile_string(vparser, rb_filesystem_str_new_cstr(f), str, line);
+ return parser_compile_string(vparser, f, str, line);
}
static VALUE
@@ -5505,13 +5295,8 @@ rb_compile_file(const char *f, VALUE file, int start)
NODE*
rb_parser_compile_file(volatile VALUE vparser, const char *f, VALUE file, int start)
{
- return rb_parser_compile_file_path(vparser, rb_filesystem_str_new_cstr(f), file, start);
-}
-
-NODE*
-rb_parser_compile_file_path(volatile VALUE vparser, VALUE fname, VALUE file, int start)
-{
struct parser_params *parser;
+ volatile VALUE tmp;
NODE *node;
TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
@@ -5520,8 +5305,8 @@ rb_parser_compile_file_path(volatile VALUE vparser, VALUE fname, VALUE file, int
lex_pbeg = lex_p = lex_pend = 0;
compile_for_eval = rb_parse_in_eval();
- node = yycompile(parser, fname, start);
- RB_GC_GUARD(vparser); /* prohibit tail call optimization */
+ node = yycompile(parser, f, start);
+ tmp = vparser; /* prohibit tail call optimization */
return node;
}
@@ -5562,10 +5347,8 @@ parser_str_new(const char *p, long n, rb_encoding *enc, int func, rb_encoding *e
return str;
}
-#define lex_goto_eol(parser) ((parser)->parser_lex_p = (parser)->parser_lex_pend)
-#define lex_eol_p() (lex_p >= lex_pend)
-#define peek(c) peek_n((c), 0)
-#define peek_n(c,n) (lex_p+(n) < lex_pend && (c) == (unsigned char)lex_p[n])
+#define lex_goto_eol(parser) (parser->parser_lex_p = parser->parser_lex_pend)
+#define peek(c) (lex_p < lex_pend && (c) == *lex_p)
static inline int
parser_nextc(struct parser_params *parser)
@@ -5590,7 +5373,6 @@ parser_nextc(struct parser_params *parser)
if (parser->tokp < lex_pend) {
if (NIL_P(parser->delayed)) {
parser->delayed = rb_str_buf_new(1024);
- rb_enc_associate(parser->delayed, current_enc);
rb_str_buf_cat(parser->delayed,
parser->tokp, lex_pend - parser->tokp);
parser->delayed_line = ruby_sourceline;
@@ -5644,7 +5426,6 @@ static char*
parser_newtok(struct parser_params *parser)
{
tokidx = 0;
- tokline = ruby_sourceline;
if (!tokenbuf) {
toksiz = 60;
tokenbuf = ALLOC_N(char, 60);
@@ -5694,7 +5475,6 @@ parser_tok_hex(struct parser_params *parser, size_t *numlen)
#define tokcopy(n) memcpy(tokspace(n), lex_p - (n), (n))
-/* return value is for ?\u3042 */
static int
parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
int string_literal, int symbol_literal, int regexp_literal)
@@ -5729,7 +5509,7 @@ parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
tokcopy((int)numlen);
}
else if (codepoint >= 0x80) {
- *encp = rb_utf8_encoding();
+ *encp = UTF8_ENC();
if (string_literal) tokaddmbc(codepoint, *encp);
}
else if (string_literal) {
@@ -5756,7 +5536,7 @@ parser_tokadd_utf8(struct parser_params *parser, rb_encoding **encp,
tokcopy(4);
}
else if (codepoint >= 0x80) {
- *encp = rb_utf8_encoding();
+ *encp = UTF8_ENC();
if (string_literal) tokaddmbc(codepoint, *encp);
}
else if (string_literal) {
@@ -5804,12 +5584,14 @@ parser_read_escape(struct parser_params *parser, int flags,
case '0': case '1': case '2': case '3': /* octal constant */
case '4': case '5': case '6': case '7':
+ if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
pushback(c);
c = scan_oct(lex_p, 3, &numlen);
lex_p += numlen;
return c;
case 'x': /* hex constant */
+ if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
c = tok_hex(&numlen);
if (numlen == 0) return 0;
return c;
@@ -5882,6 +5664,7 @@ parser_tokadd_escape(struct parser_params *parser, rb_encoding **encp)
case '0': case '1': case '2': case '3': /* octal constant */
case '4': case '5': case '6': case '7':
+ if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
{
ruby_scan_oct(--lex_p, 3, &numlen);
if (numlen == 0) goto eof;
@@ -5891,9 +5674,10 @@ parser_tokadd_escape(struct parser_params *parser, rb_encoding **encp)
return 0;
case 'x': /* hex constant */
+ if (flags & (ESCAPE_CONTROL|ESCAPE_META)) goto eof;
{
tok_hex(&numlen);
- if (numlen == 0) return -1;
+ if (numlen == 0) goto eof;
tokcopy((int)numlen + 2);
}
return 0;
@@ -5941,6 +5725,8 @@ parser_tokadd_escape(struct parser_params *parser, rb_encoding **encp)
return 0;
}
+extern int rb_char_to_option_kcode(int c, int *option, int *kcode);
+
static int
parser_regx_options(struct parser_params *parser)
{
@@ -5980,7 +5766,9 @@ parser_regx_options(struct parser_params *parser)
static void
dispose_string(VALUE str)
{
- rb_str_free(str);
+ /* TODO: should use another API? */
+ if (RBASIC(str)->flags & RSTRING_NOEMBED)
+ xfree(RSTRING_PTR(str));
rb_gc_force_recycle(str);
}
@@ -5998,20 +5786,7 @@ parser_tokadd_mbchar(struct parser_params *parser, int c)
return c;
}
-#define tokadd_mbchar(c) parser_tokadd_mbchar(parser, (c))
-
-static inline int
-simple_re_meta(int c)
-{
- switch (c) {
- case '$': case '*': case '+': case '.':
- case '?': case '^': case '|':
- case ')': case ']': case '}': case '>':
- return TRUE;
- default:
- return FALSE;
- }
-}
+#define tokadd_mbchar(c) parser_tokadd_mbchar(parser, c)
static int
parser_tokadd_string(struct parser_params *parser,
@@ -6036,8 +5811,8 @@ parser_tokadd_string(struct parser_params *parser,
}
#define mixed_escape(beg, enc1, enc2) do { \
const char *pos = lex_p; \
- lex_p = (beg); \
- mixed_error((enc1), (enc2)); \
+ lex_p = beg; \
+ mixed_error(enc1, enc2); \
lex_p = pos; \
} while (0)
@@ -6087,16 +5862,7 @@ parser_tokadd_string(struct parser_params *parser,
continue;
default:
- if (c == -1) return -1;
- if (!ISASCII(c)) {
- if ((func & STR_FUNC_EXPAND) == 0) tokadd('\\');
- goto non_ascii;
- }
if (func & STR_FUNC_REGEXP) {
- if (c == term && !simple_re_meta(c)) {
- tokadd(c);
- continue;
- }
pushback(c);
if ((c = tokadd_escape(&enc)) < 0)
return -1;
@@ -6121,7 +5887,6 @@ parser_tokadd_string(struct parser_params *parser,
}
}
else if (!parser_isascii()) {
- non_ascii:
has_nonascii = 1;
if (enc != *encp) {
mixed_error(enc, *encp);
@@ -6135,7 +5900,7 @@ parser_tokadd_string(struct parser_params *parser,
break;
}
if (c & 0x80) {
- has_nonascii = 1;
+ has_nonascii = 1;
if (enc != *encp) {
mixed_error(enc, *encp);
continue;
@@ -6150,89 +5915,6 @@ parser_tokadd_string(struct parser_params *parser,
#define NEW_STRTERM(func, term, paren) \
rb_node_newnode(NODE_STRTERM, (func), (term) | ((paren) << (CHAR_BIT * 2)), 0)
-#ifdef RIPPER
-static void
-ripper_flush_string_content(struct parser_params *parser, rb_encoding *enc)
-{
- if (!NIL_P(parser->delayed)) {
- ptrdiff_t len = lex_p - parser->tokp;
- if (len > 0) {
- rb_enc_str_buf_cat(parser->delayed, parser->tokp, len, enc);
- }
- ripper_dispatch_delayed_token(parser, tSTRING_CONTENT);
- parser->tokp = lex_p;
- }
-}
-
-#define flush_string_content(enc) ripper_flush_string_content(parser, (enc))
-#else
-#define flush_string_content(enc) ((void)(enc))
-#endif
-
-RUBY_FUNC_EXPORTED const unsigned int ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32];
-/* this can be shared with ripper, since it's independent from struct
- * parser_params. */
-#ifndef RIPPER
-#define BIT(c, idx) (((c) / 32 - 1 == idx) ? (1U << ((c) % 32)) : 0)
-#define SPECIAL_PUNCT(idx) ( \
- BIT('~', idx) | BIT('*', idx) | BIT('$', idx) | BIT('?', idx) | \
- BIT('!', idx) | BIT('@', idx) | BIT('/', idx) | BIT('\\', idx) | \
- BIT(';', idx) | BIT(',', idx) | BIT('.', idx) | BIT('=', idx) | \
- BIT(':', idx) | BIT('<', idx) | BIT('>', idx) | BIT('\"', idx) | \
- BIT('&', idx) | BIT('`', idx) | BIT('\'', idx) | BIT('+', idx) | \
- BIT('0', idx))
-const unsigned int ruby_global_name_punct_bits[] = {
- SPECIAL_PUNCT(0),
- SPECIAL_PUNCT(1),
- SPECIAL_PUNCT(2),
-};
-#undef BIT
-#undef SPECIAL_PUNCT
-#endif
-
-static inline int
-is_global_name_punct(const char c)
-{
- if (c <= 0x20 || 0x7e < c) return 0;
- return (ruby_global_name_punct_bits[(c - 0x20) / 32] >> (c % 32)) & 1;
-}
-
-static int
-parser_peek_variable_name(struct parser_params *parser)
-{
- int c;
- const char *p = lex_p;
-
- if (p + 1 >= lex_pend) return 0;
- c = *p++;
- switch (c) {
- case '$':
- if ((c = *p) == '-') {
- if (++p >= lex_pend) return 0;
- c = *p;
- }
- else if (is_global_name_punct(c) || ISDIGIT(c)) {
- return tSTRING_DVAR;
- }
- break;
- case '@':
- if ((c = *p) == '@') {
- if (++p >= lex_pend) return 0;
- c = *p;
- }
- break;
- case '{':
- lex_p = p;
- command_start = TRUE;
- return tSTRING_DBEG;
- default:
- return 0;
- }
- if (!ISASCII(c) || c == '_' || ISALPHA(c))
- return tSTRING_DVAR;
- return 0;
-}
-
static int
parser_parse_string(struct parser_params *parser, NODE *quote)
{
@@ -6240,7 +5922,7 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
int term = nd_term(quote);
int paren = nd_paren(quote);
int c, space = 0;
- rb_encoding *enc = current_enc;
+ rb_encoding *enc = parser->enc;
if (func == -1) return tSTRING_END;
c = nextc();
@@ -6263,10 +5945,15 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
}
newtok();
if ((func & STR_FUNC_EXPAND) && c == '#') {
- int t = parser_peek_variable_name(parser);
- if (t) return t;
+ switch (c = nextc()) {
+ case '$':
+ case '@':
+ pushback(c);
+ return tSTRING_DVAR;
+ case '{':
+ return tSTRING_DBEG;
+ }
tokadd('#');
- c = nextc();
}
pushback(c);
if (tokadd_string(func, term, paren, &quote->nd_nest,
@@ -6286,7 +5973,17 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
tokfix();
set_yylval_str(STR_NEW3(tok(), toklen(), enc, func));
- flush_string_content(enc);
+
+#ifdef RIPPER
+ if (!NIL_P(parser->delayed)){
+ ptrdiff_t len = lex_p - parser->tokp;
+ if (len > 0) {
+ rb_enc_str_buf_cat(parser->delayed, parser->tokp, len, enc);
+ }
+ ripper_dispatch_delayed_token(parser, tSTRING_CONTENT);
+ parser->tokp = lex_p;
+ }
+#endif
return tSTRING_CONTENT;
}
@@ -6386,21 +6083,6 @@ parser_whole_match_p(struct parser_params *parser,
return strncmp(eos, p, len) == 0;
}
-#ifdef RIPPER
-static void
-ripper_dispatch_heredoc_end(struct parser_params *parser)
-{
- if (!NIL_P(parser->delayed))
- ripper_dispatch_delayed_token(parser, tSTRING_CONTENT);
- lex_goto_eol(parser);
- ripper_dispatch_ignored_scan_event(parser, tHEREDOC_END);
-}
-
-#define dispatch_heredoc_end() ripper_dispatch_heredoc_end(parser)
-#else
-#define dispatch_heredoc_end() ((void)0)
-#endif
-
static int
parser_here_document(struct parser_params *parser, NODE *here)
{
@@ -6408,7 +6090,7 @@ parser_here_document(struct parser_params *parser, NODE *here)
const char *eos, *p, *pend;
long len;
VALUE str = 0;
- rb_encoding *enc = current_enc;
+ rb_encoding *enc = parser->enc;
eos = RSTRING_PTR(here->nd_lit);
len = RSTRING_LEN(here->nd_lit) - 1;
@@ -6437,7 +6119,6 @@ parser_here_document(struct parser_params *parser, NODE *here)
return 0;
}
if (was_bol() && whole_match_p(eos, len, indent)) {
- dispatch_heredoc_end();
heredoc_restore(lex_strterm);
return tSTRING_END;
}
@@ -6464,10 +6145,7 @@ parser_here_document(struct parser_params *parser, NODE *here)
if (pend < lex_pend) rb_str_cat(str, "\n", 1);
lex_goto_eol(parser);
if (nextc() == -1) {
- if (str) {
- dispose_string(str);
- str = 0;
- }
+ if (str) dispose_string(str);
goto error;
}
} while (!whole_match_p(eos, len, indent));
@@ -6476,10 +6154,15 @@ parser_here_document(struct parser_params *parser, NODE *here)
/* int mb = ENC_CODERANGE_7BIT, *mbp = &mb;*/
newtok();
if (c == '#') {
- int t = parser_peek_variable_name(parser);
- if (t) return t;
+ switch (c = nextc()) {
+ case '$':
+ case '@':
+ pushback(c);
+ return tSTRING_DVAR;
+ case '{':
+ return tSTRING_DBEG;
+ }
tokadd('#');
- c = nextc();
}
do {
pushback(c);
@@ -6489,7 +6172,6 @@ parser_here_document(struct parser_params *parser, NODE *here)
}
if (c != '\n') {
set_yylval_str(STR_NEW3(tok(), toklen(), enc, func));
- flush_string_content(enc);
return tSTRING_CONTENT;
}
tokadd(nextc());
@@ -6498,7 +6180,12 @@ parser_here_document(struct parser_params *parser, NODE *here)
} while (!whole_match_p(eos, len, indent));
str = STR_NEW3(tok(), toklen(), enc, func);
}
- dispatch_heredoc_end();
+#ifdef RIPPER
+ if (!NIL_P(parser->delayed))
+ ripper_dispatch_delayed_token(parser, tSTRING_CONTENT);
+ lex_goto_eol(parser);
+ ripper_dispatch_ignored_scan_event(parser, tHEREDOC_END);
+#endif
heredoc_restore(lex_strterm);
lex_strterm = NEW_STRTERM(-1, 0, 0);
set_yylval_str(str);
@@ -6532,7 +6219,7 @@ formal_argument_gen(struct parser_params *parser, ID lhs)
static int
lvar_defined_gen(struct parser_params *parser, ID id)
{
- return (dyna_in_block() && dvar_defined_get(id)) || local_id(id);
+ return (dyna_in_block() && dvar_defined(id)) || local_id(id);
}
/* emacsen -*- hack */
@@ -6564,6 +6251,9 @@ parser_set_encode(struct parser_params *parser, const char *name)
VALUE excargs[3];
if (idx < 0) {
+ VALUE rb_make_backtrace(void);
+ VALUE rb_make_exception(int, VALUE*);
+
excargs[1] = rb_sprintf("unknown encoding name: %s", name);
error:
excargs[0] = rb_eArgError;
@@ -6613,28 +6303,6 @@ magic_comment_encoding(struct parser_params *parser, const char *name, const cha
parser_set_encode(parser, val);
}
-static void
-parser_set_token_info(struct parser_params *parser, const char *name, const char *val)
-{
- int *p = &parser->parser_token_info_enabled;
-
- switch (*val) {
- case 't': case 'T':
- if (strcasecmp(val, "true") == 0) {
- *p = TRUE;
- return;
- }
- break;
- case 'f': case 'F':
- if (strcasecmp(val, "false") == 0) {
- *p = FALSE;
- return;
- }
- break;
- }
- rb_compile_warning(ruby_sourcefile, ruby_sourceline, "invalid value for %s: %s", name, val);
-}
-
struct magic_comment {
const char *name;
rb_magic_comment_setter_t func;
@@ -6644,7 +6312,6 @@ struct magic_comment {
static const struct magic_comment magic_comments[] = {
{"coding", magic_comment_encoding, parser_encode_length},
{"encoding", magic_comment_encoding, parser_encode_length},
- {"warn_indent", parser_set_token_info},
};
#endif
@@ -6687,9 +6354,9 @@ parser_magic_comment(struct parser_params *parser, const char *str, long len)
VALUE name = 0, val = 0;
const char *beg, *end, *vbeg, *vend;
#define str_copy(_s, _p, _n) ((_s) \
- ? (void)(rb_str_resize((_s), (_n)), \
+ ? (rb_str_resize((_s), (_n)), \
MEMCPY(RSTRING_PTR(_s), (_p), char, (_n)), (_s)) \
- : (void)((_s) = STR_NEW((_p), (_n))))
+ : ((_s) = STR_NEW((_p), (_n))))
if (len <= 7) return FALSE;
if (!(beg = magic_comment_marker(str, len))) return FALSE;
@@ -6767,7 +6434,6 @@ parser_magic_comment(struct parser_params *parser, const char *str, long len)
}
} while (++p < magic_comments + numberof(magic_comments));
#else
- str_copy(val, vbeg, vend - vbeg);
dispatch2(magic_comment, name, val);
#endif
}
@@ -6843,13 +6509,10 @@ parser_prepare(struct parser_params *parser)
parser->enc = rb_enc_get(lex_lastline);
}
-#define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
-#define IS_END() IS_lex_state(EXPR_END_ANY)
-#define IS_BEG() IS_lex_state(EXPR_BEG_ANY)
+#define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG)
+#define IS_END() (lex_state == EXPR_END || lex_state == EXPR_ENDARG || lex_state == EXPR_ENDFN)
+#define IS_BEG() (lex_state == EXPR_BEG || lex_state == EXPR_MID || lex_state == EXPR_VALUE || lex_state == EXPR_CLASS)
#define IS_SPCARG(c) (IS_ARG() && space_seen && !ISSPACE(c))
-#define IS_LABEL_POSSIBLE() ((IS_lex_state(EXPR_BEG | EXPR_ENDFN) && !cmd_state) || IS_ARG())
-#define IS_LABEL_SUFFIX(n) (peek_n(':',(n)) && !peek_n(':', (n)+1))
-#define IS_AFTER_OPERATOR() IS_lex_state(EXPR_FNAME | EXPR_DOT)
#ifndef RIPPER
#define ambiguous_operator(op, syn) ( \
@@ -6858,10 +6521,12 @@ parser_prepare(struct parser_params *parser)
#else
#define ambiguous_operator(op, syn) dispatch2(operator_ambiguous, ripper_intern(op), rb_str_new_cstr(syn))
#endif
-#define warn_balanced(op, syn) ((void) \
- (!IS_lex_state_for(last_state, EXPR_CLASS|EXPR_DOT|EXPR_FNAME|EXPR_ENDFN|EXPR_ENDARG) && \
+#define warn_balanced(op, syn) \
+ (last_state != EXPR_CLASS && last_state != EXPR_DOT && \
+ last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \
+ last_state != EXPR_ENDARG && \
space_seen && !ISSPACE(c) && \
- (ambiguous_operator(op, syn), 0)))
+ (ambiguous_operator(op, syn), 0))
static int
parser_yylex(struct parser_params *parser)
@@ -6940,7 +6605,12 @@ parser_yylex(struct parser_params *parser)
#endif
/* fall through */
case '\n':
- if (IS_lex_state(EXPR_BEG | EXPR_VALUE | EXPR_CLASS | EXPR_FNAME | EXPR_DOT)) {
+ switch (lex_state) {
+ case EXPR_BEG:
+ case EXPR_FNAME:
+ case EXPR_DOT:
+ case EXPR_CLASS:
+ case EXPR_VALUE:
#ifdef RIPPER
if (!fallthru) {
ripper_dispatch_scan_event(parser, tIGNORED_NL);
@@ -6948,6 +6618,8 @@ parser_yylex(struct parser_params *parser)
fallthru = FALSE;
#endif
goto retry;
+ default:
+ break;
}
while ((c = nextc())) {
switch (c) {
@@ -6988,17 +6660,7 @@ parser_yylex(struct parser_params *parser)
return tOP_ASGN;
}
pushback(c);
- if (IS_SPCARG(c)) {
- rb_warning0("`**' interpreted as argument prefix");
- c = tDSTAR;
- }
- else if (IS_BEG()) {
- c = tDSTAR;
- }
- else {
- warn_balanced("**", "argument prefix");
- c = tPOW;
- }
+ c = tPOW;
}
else {
if (c == '=') {
@@ -7019,12 +6681,17 @@ parser_yylex(struct parser_params *parser)
c = '*';
}
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
+ }
return c;
case '!':
c = nextc();
- if (IS_AFTER_OPERATOR()) {
+ if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if (c == '@') {
return '!';
@@ -7079,7 +6746,12 @@ parser_yylex(struct parser_params *parser)
}
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
+ }
if ((c = nextc()) == '=') {
if ((c = nextc()) == '=') {
return tEQQ;
@@ -7100,19 +6772,18 @@ parser_yylex(struct parser_params *parser)
last_state = lex_state;
c = nextc();
if (c == '<' &&
- !IS_lex_state(EXPR_DOT | EXPR_CLASS) &&
+ lex_state != EXPR_DOT &&
+ lex_state != EXPR_CLASS &&
!IS_END() &&
(!IS_ARG() || space_seen)) {
int token = heredoc_identifier();
if (token) return token;
}
- if (IS_AFTER_OPERATOR()) {
- lex_state = EXPR_ARG;
- }
- else {
- if (IS_lex_state(EXPR_CLASS))
- command_start = TRUE;
- lex_state = EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
}
if (c == '=') {
if ((c = nextc()) == '>') {
@@ -7135,7 +6806,12 @@ parser_yylex(struct parser_params *parser)
return '<';
case '>':
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
+ }
if ((c = nextc()) == '=') {
return tGEQ;
}
@@ -7156,11 +6832,11 @@ parser_yylex(struct parser_params *parser)
return tSTRING_BEG;
case '`':
- if (IS_lex_state(EXPR_FNAME)) {
+ if (lex_state == EXPR_FNAME) {
lex_state = EXPR_ENDFN;
return c;
}
- if (IS_lex_state(EXPR_DOT)) {
+ if (lex_state == EXPR_DOT) {
if (cmd_state)
lex_state = EXPR_CMDARG;
else
@@ -7184,7 +6860,7 @@ parser_yylex(struct parser_params *parser)
compile_error(PARSER_ARG "incomplete character syntax");
return 0;
}
- if (rb_enc_isspace(c, current_enc)) {
+ if (rb_enc_isspace(c, parser->enc)) {
if (!IS_ARG()) {
int c2 = 0;
switch (c) {
@@ -7217,12 +6893,12 @@ parser_yylex(struct parser_params *parser)
return '?';
}
newtok();
- enc = current_enc;
+ enc = parser->enc;
if (!parser_isascii()) {
if (tokadd_mbchar(c) == -1) return 0;
}
- else if ((rb_enc_isalnum(c, current_enc) || c == '_') &&
- lex_p < lex_pend && is_identchar(lex_p, lex_pend, current_enc)) {
+ else if ((rb_enc_isalnum(c, parser->enc) || c == '_') &&
+ lex_p < lex_pend && is_identchar(lex_p, lex_pend, parser->enc)) {
goto ternary;
}
else if (c == '\\') {
@@ -7236,10 +6912,6 @@ parser_yylex(struct parser_params *parser)
tokadd(c);
}
}
- else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) {
- nextc();
- if (tokadd_mbchar(c) == -1) return 0;
- }
else {
c = read_escape(0, &enc);
tokadd(c);
@@ -7281,7 +6953,12 @@ parser_yylex(struct parser_params *parser)
warn_balanced("&", "argument prefix");
c = '&';
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG;
+ }
return c;
case '|':
@@ -7300,13 +6977,18 @@ parser_yylex(struct parser_params *parser)
lex_state = EXPR_BEG;
return tOP_ASGN;
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
+ lex_state = EXPR_ARG;
+ }
+ else {
+ lex_state = EXPR_BEG;
+ }
pushback(c);
return '|';
case '+':
c = nextc();
- if (IS_AFTER_OPERATOR()) {
+ if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if (c == '@') {
return tUPLUS;
@@ -7335,7 +7017,7 @@ parser_yylex(struct parser_params *parser)
case '-':
c = nextc();
- if (IS_AFTER_OPERATOR()) {
+ if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if (c == '@') {
return tUMINUS;
@@ -7349,7 +7031,7 @@ parser_yylex(struct parser_params *parser)
return tOP_ASGN;
}
if (c == '>') {
- lex_state = EXPR_ENDFN;
+ lex_state = EXPR_ARG;
return tLAMBDA;
}
if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous())) {
@@ -7612,15 +7294,12 @@ parser_yylex(struct parser_params *parser)
lex_state = EXPR_ENDFN;
else
lex_state = EXPR_ENDARG;
- if (c == '}') {
- if (!brace_nest--) c = tSTRING_DEND;
- }
return c;
case ':':
c = nextc();
if (c == ':') {
- if (IS_BEG() || IS_lex_state(EXPR_CLASS) || IS_SPCARG(-1)) {
+ if (IS_BEG() || lex_state == EXPR_CLASS || IS_SPCARG(-1)) {
lex_state = EXPR_BEG;
return tCOLON3;
}
@@ -7648,7 +7327,7 @@ parser_yylex(struct parser_params *parser)
return tSYMBEG;
case '/':
- if (IS_lex_state(EXPR_BEG_ANY)) {
+ if (IS_BEG()) {
lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
return tREGEXP_BEG;
}
@@ -7659,11 +7338,16 @@ parser_yylex(struct parser_params *parser)
}
pushback(c);
if (IS_SPCARG(c)) {
- (void)arg_ambiguous();
+ arg_ambiguous();
lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
return tREGEXP_BEG;
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
+ }
warn_balanced("/", "regexp literal");
return '/';
@@ -7673,7 +7357,12 @@ parser_yylex(struct parser_params *parser)
lex_state = EXPR_BEG;
return tOP_ASGN;
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
+ }
pushback(c);
return '^';
@@ -7687,7 +7376,7 @@ parser_yylex(struct parser_params *parser)
return ',';
case '~':
- if (IS_AFTER_OPERATOR()) {
+ if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
if ((c = nextc()) != '@') {
pushback(c);
}
@@ -7713,7 +7402,7 @@ parser_yylex(struct parser_params *parser)
case '[':
paren_nest++;
- if (IS_AFTER_OPERATOR()) {
+ if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
lex_state = EXPR_ARG;
if ((c = nextc()) == ']') {
if ((c = nextc()) == '=') {
@@ -7737,7 +7426,6 @@ parser_yylex(struct parser_params *parser)
return c;
case '{':
- ++brace_nest;
if (lpar_beg && lpar_beg == paren_nest) {
lex_state = EXPR_BEG;
lpar_beg = 0;
@@ -7746,9 +7434,9 @@ parser_yylex(struct parser_params *parser)
CMDARG_PUSH(0);
return tLAMBEG;
}
- if (IS_ARG() || IS_lex_state(EXPR_END | EXPR_ENDFN))
+ if (IS_ARG() || lex_state == EXPR_END || lex_state == EXPR_ENDFN)
c = '{'; /* block (primary) */
- else if (IS_lex_state(EXPR_ENDARG))
+ else if (lex_state == EXPR_ENDARG)
c = tLBRACE_ARG; /* block (expr) */
else
c = tLBRACE; /* hash */
@@ -7771,7 +7459,7 @@ parser_yylex(struct parser_params *parser)
return '\\';
case '%':
- if (IS_lex_state(EXPR_BEG_ANY)) {
+ if (IS_BEG()) {
int term;
int paren;
@@ -7783,7 +7471,7 @@ parser_yylex(struct parser_params *parser)
}
else {
term = nextc();
- if (rb_enc_isalnum(term, current_enc) || !parser_isascii()) {
+ if (rb_enc_isalnum(term, parser->enc) || !parser_isascii()) {
yyerror("unknown type of %string");
return 0;
}
@@ -7820,18 +7508,6 @@ parser_yylex(struct parser_params *parser)
pushback(c);
return tQWORDS_BEG;
- case 'I':
- lex_strterm = NEW_STRTERM(str_dword, term, paren);
- do {c = nextc();} while (ISSPACE(c));
- pushback(c);
- return tSYMBOLS_BEG;
-
- case 'i':
- lex_strterm = NEW_STRTERM(str_sword, term, paren);
- do {c = nextc();} while (ISSPACE(c));
- pushback(c);
- return tQSYMBOLS_BEG;
-
case 'x':
lex_strterm = NEW_STRTERM(str_xquote, term, paren);
return tXSTRING_BEG;
@@ -7858,7 +7534,12 @@ parser_yylex(struct parser_params *parser)
if (IS_SPCARG(c)) {
goto quotation;
}
- lex_state = IS_AFTER_OPERATOR() ? EXPR_ARG : EXPR_BEG;
+ switch (lex_state) {
+ case EXPR_FNAME: case EXPR_DOT:
+ lex_state = EXPR_ARG; break;
+ default:
+ lex_state = EXPR_BEG; break;
+ }
pushback(c);
warn_balanced("%%", "string literal");
return '%';
@@ -7919,7 +7600,7 @@ parser_yylex(struct parser_params *parser)
case '`': /* $`: string before last match */
case '\'': /* $': string after last match */
case '+': /* $+: string matches last paren. */
- if (IS_lex_state_for(last_state, EXPR_FNAME)) {
+ if (last_state == EXPR_FNAME) {
tokadd('$');
tokadd(c);
goto gvar;
@@ -7936,7 +7617,7 @@ parser_yylex(struct parser_params *parser)
c = nextc();
} while (c != -1 && ISDIGIT(c));
pushback(c);
- if (IS_lex_state_for(last_state, EXPR_FNAME)) goto gvar;
+ if (last_state == EXPR_FNAME) goto gvar;
tokfix();
set_yylval_node(NEW_NTH_REF(atoi(tok()+1)));
return tNTH_REF;
@@ -7944,8 +7625,7 @@ parser_yylex(struct parser_params *parser)
default:
if (!parser_is_identchar()) {
pushback(c);
- compile_error(PARSER_ARG "`$%c' is not allowed as a global variable name", c);
- return 0;
+ return '$';
}
case '0':
tokadd('$');
@@ -7960,8 +7640,7 @@ parser_yylex(struct parser_params *parser)
tokadd('@');
c = nextc();
}
- if (c != -1 && (ISDIGIT(c) || !parser_is_identchar())) {
- pushback(c);
+ if (c != -1 && ISDIGIT(c)) {
if (tokidx == 1) {
compile_error(PARSER_ARG "`@%c' is not allowed as an instance variable name", c);
}
@@ -7970,6 +7649,10 @@ parser_yylex(struct parser_params *parser)
}
return 0;
}
+ if (!parser_is_identchar()) {
+ pushback(c);
+ return '@';
+ }
break;
case '_':
@@ -7989,7 +7672,7 @@ parser_yylex(struct parser_params *parser)
default:
if (!parser_is_identchar()) {
- compile_error(PARSER_ARG "Invalid char `\\x%02X' in expression", c);
+ rb_compile_error(PARSER_ARG "Invalid char `\\x%02X' in expression", c);
goto retry;
}
@@ -8039,9 +7722,9 @@ parser_yylex(struct parser_params *parser)
result = tFID;
}
else {
- if (IS_lex_state(EXPR_FNAME)) {
+ if (lex_state == EXPR_FNAME) {
if ((c = nextc()) == '=' && !peek('~') && !peek('>') &&
- (!peek('=') || (peek_n('>', 1)))) {
+ (!peek('=') || (lex_p + 1 < lex_pend && lex_p[1] == '>'))) {
result = tIDENTIFIER;
tokadd(c);
tokfix();
@@ -8058,15 +7741,16 @@ parser_yylex(struct parser_params *parser)
}
}
- if (IS_LABEL_POSSIBLE()) {
- if (IS_LABEL_SUFFIX(0)) {
+ if ((lex_state == EXPR_BEG && !cmd_state) ||
+ IS_ARG()) {
+ if (peek(':') && !(lex_p + 1 < lex_pend && lex_p[1] == ':')) {
lex_state = EXPR_BEG;
nextc();
set_yylval_name(TOK_INTERN(!ENC_SINGLE(mb)));
return tLABEL;
}
}
- if (mb == ENC_CODERANGE_7BIT && !IS_lex_state(EXPR_DOT)) {
+ if (mb == ENC_CODERANGE_7BIT && lex_state != EXPR_DOT) {
const struct kwtable *kw;
/* See if it is a reserved word. */
@@ -8078,10 +7762,8 @@ parser_yylex(struct parser_params *parser)
set_yylval_name(rb_intern(kw->name));
return kw->id[0];
}
- if (lex_state == EXPR_BEG) {
- command_start = TRUE;
- }
if (kw->id[0] == keyword_do) {
+ command_start = TRUE;
if (lpar_beg && lpar_beg == paren_nest) {
lpar_beg = 0;
--paren_nest;
@@ -8090,11 +7772,11 @@ parser_yylex(struct parser_params *parser)
if (COND_P()) return keyword_do_cond;
if (CMDARG_P() && state != EXPR_CMDARG)
return keyword_do_block;
- if (state & (EXPR_BEG | EXPR_ENDARG))
+ if (state == EXPR_ENDARG || state == EXPR_BEG)
return keyword_do_block;
return keyword_do;
}
- if (state & (EXPR_BEG | EXPR_VALUE))
+ if (state == EXPR_BEG || state == EXPR_VALUE)
return kw->id[0];
else {
if (kw->id[0] != kw->id[1])
@@ -8104,7 +7786,9 @@ parser_yylex(struct parser_params *parser)
}
}
- if (IS_lex_state(EXPR_BEG_ANY | EXPR_ARG_ANY | EXPR_DOT)) {
+ if (IS_BEG() ||
+ lex_state == EXPR_DOT ||
+ IS_ARG()) {
if (cmd_state) {
lex_state = EXPR_CMDARG;
}
@@ -8123,8 +7807,7 @@ parser_yylex(struct parser_params *parser)
ID ident = TOK_INTERN(!ENC_SINGLE(mb));
set_yylval_name(ident);
- if (!IS_lex_state_for(last_state, EXPR_DOT|EXPR_FNAME) &&
- is_local_id(ident) && lvar_defined(ident)) {
+ if (last_state != EXPR_DOT && is_local_id(ident) && lvar_defined(ident)) {
lex_state = EXPR_END;
}
}
@@ -8168,13 +7851,13 @@ node_newnode(struct parser_params *parser, enum node_type type, VALUE a0, VALUE
return n;
}
-static enum node_type
+enum node_type
nodetype(NODE *node) /* for debug */
{
return (enum node_type)nd_type(node);
}
-static int
+int
nodeline(NODE *node)
{
return nd_line(node);
@@ -8204,14 +7887,14 @@ parser_warning(struct parser_params *parser, NODE *node, const char *mesg)
{
rb_compile_warning(ruby_sourcefile, nd_line(node), "%s", mesg);
}
-#define parser_warning(node, mesg) parser_warning(parser, (node), (mesg))
+#define parser_warning(node, mesg) parser_warning(parser, node, mesg)
static void
parser_warn(struct parser_params *parser, NODE *node, const char *mesg)
{
rb_compile_warn(ruby_sourcefile, nd_line(node), "%s", mesg);
}
-#define parser_warn(node, mesg) parser_warn(parser, (node), (mesg))
+#define parser_warn(node, mesg) parser_warn(parser, node, mesg)
static NODE*
block_append_gen(struct parser_params *parser, NODE *head, NODE *tail)
@@ -8249,7 +7932,7 @@ block_append_gen(struct parser_params *parser, NODE *head, NODE *tail)
case NODE_REDO:
case NODE_RETRY:
if (RTEST(ruby_verbose)) {
- parser_warning(tail, "statement not reached");
+ parser_warning(nd, "statement not reached");
}
break;
@@ -8332,8 +8015,6 @@ static NODE *
literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail)
{
enum node_type htype;
- NODE *headlast;
- VALUE lit;
if (!head) return tail;
if (!tail) return head;
@@ -8342,20 +8023,11 @@ literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail)
if (htype == NODE_EVSTR) {
NODE *node = NEW_DSTR(Qnil);
head = list_append(node, head);
- htype = NODE_DSTR;
}
switch (nd_type(tail)) {
case NODE_STR:
- if (htype == NODE_DSTR && (headlast = head->nd_next->nd_end->nd_head) &&
- nd_type(headlast) == NODE_STR) {
- htype = NODE_STR;
- lit = headlast->nd_lit;
- }
- else {
- lit = head->nd_lit;
- }
if (htype == NODE_STR) {
- if (!literal_concat0(parser, lit, tail->nd_lit)) {
+ if (!literal_concat0(parser, head->nd_lit, tail->nd_lit)) {
error:
rb_gc_force_recycle((VALUE)head);
rb_gc_force_recycle((VALUE)tail);
@@ -8377,20 +8049,11 @@ literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail)
head = tail;
}
else if (NIL_P(tail->nd_lit)) {
- append:
head->nd_alen += tail->nd_alen - 1;
head->nd_next->nd_end->nd_next = tail->nd_next;
head->nd_next->nd_end = tail->nd_next->nd_end;
rb_gc_force_recycle((VALUE)tail);
}
- else if (htype == NODE_DSTR && (headlast = head->nd_next->nd_end->nd_head) &&
- nd_type(headlast) == NODE_STR) {
- lit = headlast->nd_lit;
- if (!literal_concat0(parser, lit, tail->nd_lit))
- goto error;
- tail->nd_lit = Qnil;
- goto append;
- }
else {
nd_set_type(tail, NODE_ARRAY);
tail->nd_head = NEW_STR(tail->nd_lit);
@@ -8459,7 +8122,7 @@ match_op_gen(struct parser_params *parser, NODE *node1, NODE *node2)
return NEW_MATCH2(node1, node2);
case NODE_LIT:
- if (RB_TYPE_P(node1->nd_lit, T_REGEXP)) {
+ if (TYPE(node1->nd_lit) == T_REGEXP) {
return NEW_MATCH2(node1, node2);
}
}
@@ -8472,7 +8135,7 @@ match_op_gen(struct parser_params *parser, NODE *node1, NODE *node2)
return NEW_MATCH3(node2, node1);
case NODE_LIT:
- if (RB_TYPE_P(node2->nd_lit, T_REGEXP)) {
+ if (TYPE(node2->nd_lit) == T_REGEXP) {
return NEW_MATCH3(node2, node1);
}
}
@@ -8484,76 +8147,51 @@ match_op_gen(struct parser_params *parser, NODE *node1, NODE *node2)
static NODE*
gettable_gen(struct parser_params *parser, ID id)
{
- switch (id) {
- case keyword_self:
+ if (id == keyword_self) {
return NEW_SELF();
- case keyword_nil:
+ }
+ else if (id == keyword_nil) {
return NEW_NIL();
- case keyword_true:
+ }
+ else if (id == keyword_true) {
return NEW_TRUE();
- case keyword_false:
+ }
+ else if (id == keyword_false) {
return NEW_FALSE();
- case keyword__FILE__:
- return NEW_STR(rb_str_dup(ruby_sourcefile_string));
- case keyword__LINE__:
- return NEW_LIT(INT2FIX(tokline));
- case keyword__ENCODING__:
- return NEW_LIT(rb_enc_from_encoding(current_enc));
- }
- switch (id_type(id)) {
- case ID_LOCAL:
+ }
+ else if (id == keyword__FILE__) {
+ return NEW_STR(rb_external_str_new_with_enc(ruby_sourcefile, strlen(ruby_sourcefile),
+ rb_filesystem_encoding()));
+ }
+ else if (id == keyword__LINE__) {
+ return NEW_LIT(INT2FIX(ruby_sourceline));
+ }
+ else if (id == keyword__ENCODING__) {
+ return NEW_LIT(rb_enc_from_encoding(parser->enc));
+ }
+ else if (is_local_id(id)) {
if (dyna_in_block() && dvar_defined(id)) return NEW_DVAR(id);
if (local_id(id)) return NEW_LVAR(id);
/* method call without arguments */
return NEW_VCALL(id);
- case ID_GLOBAL:
+ }
+ else if (is_global_id(id)) {
return NEW_GVAR(id);
- case ID_INSTANCE:
+ }
+ else if (is_instance_id(id)) {
return NEW_IVAR(id);
- case ID_CONST:
+ }
+ else if (is_const_id(id)) {
return NEW_CONST(id);
- case ID_CLASS:
- return NEW_CVAR(id);
}
- compile_error(PARSER_ARG "identifier %s is not valid to get", rb_id2name(id));
- return 0;
-}
-#else /* !RIPPER */
-static int
-id_is_var_gen(struct parser_params *parser, ID id)
-{
- if (is_notop_id(id)) {
- switch (id & ID_SCOPE_MASK) {
- case ID_GLOBAL: case ID_INSTANCE: case ID_CONST: case ID_CLASS:
- return 1;
- case ID_LOCAL:
- if (dyna_in_block() && dvar_defined(id)) return 1;
- if (local_id(id)) return 1;
- /* method call without arguments */
- return 0;
- }
+ else if (is_class_id(id)) {
+ return NEW_CVAR(id);
}
compile_error(PARSER_ARG "identifier %s is not valid to get", rb_id2name(id));
return 0;
}
#endif /* !RIPPER */
-#if PARSER_DEBUG
-static const char *
-lex_state_name(enum lex_state_e state)
-{
- static const char names[][12] = {
- "EXPR_BEG", "EXPR_END", "EXPR_ENDARG", "EXPR_ENDFN", "EXPR_ARG",
- "EXPR_CMDARG", "EXPR_MID", "EXPR_FNAME", "EXPR_DOT", "EXPR_CLASS",
- "EXPR_VALUE",
- };
-
- if ((unsigned)state & ~(~0u << EXPR_MAX_STATE))
- return names[ffs(state)];
- return NULL;
-}
-#endif
-
#ifdef RIPPER
static VALUE
assignable_gen(struct parser_params *parser, VALUE lhs)
@@ -8567,34 +8205,31 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val)
# define assignable_result(x) get_value(lhs)
# define parser_yyerror(parser, x) dispatch1(assign_error, lhs)
#else
-# define assignable_result(x) (x)
+# define assignable_result(x) x
#endif
if (!id) return assignable_result(0);
- switch (id) {
- case keyword_self:
+ if (id == keyword_self) {
yyerror("Can't change the value of self");
- goto error;
- case keyword_nil:
+ }
+ else if (id == keyword_nil) {
yyerror("Can't assign to nil");
- goto error;
- case keyword_true:
+ }
+ else if (id == keyword_true) {
yyerror("Can't assign to true");
- goto error;
- case keyword_false:
+ }
+ else if (id == keyword_false) {
yyerror("Can't assign to false");
- goto error;
- case keyword__FILE__:
+ }
+ else if (id == keyword__FILE__) {
yyerror("Can't assign to __FILE__");
- goto error;
- case keyword__LINE__:
+ }
+ else if (id == keyword__LINE__) {
yyerror("Can't assign to __LINE__");
- goto error;
- case keyword__ENCODING__:
+ }
+ else if (id == keyword__ENCODING__) {
yyerror("Can't assign to __ENCODING__");
- goto error;
}
- switch (id_type(id)) {
- case ID_LOCAL:
+ else if (is_local_id(id)) {
if (dyna_in_block()) {
if (dvar_curr(id)) {
return assignable_result(NEW_DASGN_CURR(id, val));
@@ -8616,54 +8251,43 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val)
}
return assignable_result(NEW_LASGN(id, val));
}
- break;
- case ID_GLOBAL:
+ }
+ else if (is_global_id(id)) {
return assignable_result(NEW_GASGN(id, val));
- case ID_INSTANCE:
+ }
+ else if (is_instance_id(id)) {
return assignable_result(NEW_IASGN(id, val));
- case ID_CONST:
+ }
+ else if (is_const_id(id)) {
if (!in_def && !in_single)
return assignable_result(NEW_CDECL(id, val, 0));
yyerror("dynamic constant assignment");
- break;
- case ID_CLASS:
+ }
+ else if (is_class_id(id)) {
return assignable_result(NEW_CVASGN(id, val));
- default:
+ }
+ else {
compile_error(PARSER_ARG "identifier %s is not valid to set", rb_id2name(id));
}
- error:
return assignable_result(0);
#undef assignable_result
#undef parser_yyerror
}
-static int
-is_private_local_id(ID name)
-{
- VALUE s;
- if (name == idUScore) return 1;
- if (!is_local_id(name)) return 0;
- s = rb_id2str(name);
- if (!s) return 0;
- return RSTRING_PTR(s)[0] == '_';
-}
-
-#define LVAR_USED ((ID)1 << (sizeof(ID) * CHAR_BIT - 1))
-
static ID
shadowing_lvar_gen(struct parser_params *parser, ID name)
{
- if (is_private_local_id(name)) return name;
+ ID uscore;
+
+ CONST_ID(uscore, "_");
+ if (uscore == name) return name;
if (dyna_in_block()) {
if (dvar_curr(name)) {
yyerror("duplicated argument name");
}
- else if (dvar_defined_get(name) || local_id(name)) {
+ else if (dvar_defined(name) || local_id(name)) {
rb_warningS("shadowing outer local variable - %s", rb_id2name(name));
vtable_add(lvtbl->vars, name);
- if (lvtbl->used) {
- vtable_add(lvtbl->used, (ID)ruby_sourceline | LVAR_USED);
- }
}
}
else {
@@ -8704,41 +8328,9 @@ block_dup_check_gen(struct parser_params *parser, NODE *node1, NODE *node2)
}
}
-static const char id_type_names[][9] = {
- "LOCAL",
- "INSTANCE",
- "", /* INSTANCE2 */
- "GLOBAL",
- "ATTRSET",
- "CONST",
- "CLASS",
- "JUNK",
-};
-
ID
rb_id_attrset(ID id)
{
- if (!is_notop_id(id)) {
- switch (id) {
- case tAREF: case tASET:
- return tASET; /* only exception */
- }
- rb_name_error(id, "cannot make operator ID :%s attrset", rb_id2name(id));
- }
- else {
- int scope = (int)(id & ID_SCOPE_MASK);
- switch (scope) {
- case ID_LOCAL: case ID_INSTANCE: case ID_GLOBAL:
- case ID_CONST: case ID_CLASS: case ID_JUNK:
- break;
- case ID_ATTRSET:
- return id;
- default:
- rb_name_error(id, "cannot make %s ID %+"PRIsVALUE" attrset",
- id_type_names[scope], ID2SYM(id));
-
- }
- }
id &= ~ID_SCOPE_MASK;
id |= ID_ATTRSET;
return id;
@@ -8993,7 +8585,7 @@ void_expr_gen(struct parser_params *parser, NODE *node)
int line = ruby_sourceline;
ruby_sourceline = nd_line(node);
- rb_warnS("possibly useless use of %s in void context", useless);
+ rb_warnS("useless use of %s in void context", useless);
ruby_sourceline = line;
}
}
@@ -9067,10 +8659,6 @@ reduce_nodes_gen(struct parser_params *parser, NODE **body)
if (!subnodes(nd_head, nd_resq)) goto end;
break;
case NODE_RESCUE:
- if (node->nd_else) {
- body = &node->nd_resq;
- break;
- }
if (!subnodes(nd_head, nd_resq)) goto end;
break;
default:
@@ -9084,30 +8672,6 @@ reduce_nodes_gen(struct parser_params *parser, NODE **body)
}
static int
-is_static_content(NODE *node)
-{
- if (!node) return 1;
- switch (nd_type(node)) {
- case NODE_HASH:
- if (!(node = node->nd_head)) break;
- case NODE_ARRAY:
- do {
- if (!is_static_content(node->nd_head)) return 0;
- } while ((node = node->nd_next) != 0);
- case NODE_LIT:
- case NODE_STR:
- case NODE_NIL:
- case NODE_TRUE:
- case NODE_FALSE:
- case NODE_ZARRAY:
- break;
- default:
- return 0;
- }
- return 1;
-}
-
-static int
assign_in_cond(struct parser_params *parser, NODE *node)
{
switch (nd_type(node)) {
@@ -9127,9 +8691,23 @@ assign_in_cond(struct parser_params *parser, NODE *node)
}
if (!node->nd_value) return 1;
- if (is_static_content(node->nd_value)) {
+ switch (nd_type(node->nd_value)) {
+ case NODE_LIT:
+ case NODE_STR:
+ case NODE_NIL:
+ case NODE_TRUE:
+ case NODE_FALSE:
/* reports always */
parser_warn(node->nd_value, "found = in conditional, should be ==");
+ return 1;
+
+ case NODE_DSTR:
+ case NODE_XSTR:
+ case NODE_DXSTR:
+ case NODE_EVSTR:
+ case NODE_DREGX:
+ default:
+ break;
}
return 1;
}
@@ -9258,7 +8836,7 @@ cond0(struct parser_params *parser, NODE *node)
break;
case NODE_LIT:
- if (RB_TYPE_P(node->nd_lit, T_REGEXP)) {
+ if (TYPE(node->nd_lit) == T_REGEXP) {
warn_unless_e_option(parser, node, "regex literal in condition");
nd_set_type(node, NODE_MATCH);
}
@@ -9321,9 +8899,18 @@ ret_args_gen(struct parser_params *parser, NODE *node)
static NODE *
new_yield_gen(struct parser_params *parser, NODE *node)
{
- if (node) no_blockarg(parser, node);
+ long state = Qtrue;
- return NEW_YIELD(node);
+ if (node) {
+ no_blockarg(parser, node);
+ if (node && nd_type(node) == NODE_SPLAT) {
+ state = Qtrue;
+ }
+ }
+ else {
+ state = Qfalse;
+ }
+ return NEW_YIELD(node, state);
}
static NODE*
@@ -9337,16 +8924,7 @@ negate_lit(NODE *node)
node->nd_lit = rb_funcall(node->nd_lit,tUMINUS,0,0);
break;
case T_FLOAT:
-#if USE_FLONUM
- if (FLONUM_P(node->nd_lit)) {
- node->nd_lit = DBL2NUM(-RFLOAT_VALUE(node->nd_lit));
- }
- else {
- RFLOAT(node->nd_lit)->float_value = -RFLOAT_VALUE(node->nd_lit);
- }
-#else
RFLOAT(node->nd_lit)->float_value = -RFLOAT_VALUE(node->nd_lit);
-#endif
break;
default:
break;
@@ -9364,181 +8942,32 @@ arg_blk_pass(NODE *node1, NODE *node2)
return node1;
}
-
static NODE*
-new_args_gen(struct parser_params *parser, NODE *m, NODE *o, ID r, NODE *p, NODE *tail)
+new_args_gen(struct parser_params *parser, NODE *m, NODE *o, ID r, NODE *p, ID b)
{
int saved_line = ruby_sourceline;
- struct rb_args_info *args = tail->nd_ainfo;
-
- args->pre_args_num = m ? rb_long2int(m->nd_plen) : 0;
- args->pre_init = m ? m->nd_next : 0;
-
- args->post_args_num = p ? rb_long2int(p->nd_plen) : 0;
- args->post_init = p ? p->nd_next : 0;
- args->first_post_arg = p ? p->nd_pid : 0;
-
- args->rest_arg = r;
-
- args->opt_args = o;
-
- ruby_sourceline = saved_line;
-
- return tail;
-}
-
-static NODE*
-new_args_tail_gen(struct parser_params *parser, NODE *k, ID kr, ID b)
-{
- int saved_line = ruby_sourceline;
- struct rb_args_info *args;
- NODE *kw_rest_arg = 0;
NODE *node;
+ NODE *i1, *i2 = 0;
- args = ALLOC(struct rb_args_info);
- MEMZERO(args, struct rb_args_info, 1);
- node = NEW_NODE(NODE_ARGS, 0, 0, args);
+ node = NEW_ARGS(m ? m->nd_plen : 0, o);
+ i1 = m ? m->nd_next : 0;
+ node->nd_next = NEW_ARGS_AUX(r, b);
- args->block_arg = b;
- args->kw_args = k;
- if (k && !kr) kr = internal_id();
- if (kr) {
- arg_var(kr);
- kw_rest_arg = NEW_DVAR(kr);
+ if (p) {
+ i2 = p->nd_next;
+ node->nd_next->nd_next = NEW_ARGS_AUX(p->nd_pid, p->nd_plen);
}
- args->kw_rest_arg = kw_rest_arg;
-
- ruby_sourceline = saved_line;
- return node;
-}
-
-static NODE*
-dsym_node_gen(struct parser_params *parser, NODE *node)
-{
- VALUE lit;
-
- if (!node) {
- return NEW_LIT(ID2SYM(idNULL));
+ else if (i1) {
+ node->nd_next->nd_next = NEW_ARGS_AUX(0, 0);
}
-
- switch (nd_type(node)) {
- case NODE_DSTR:
- nd_set_type(node, NODE_DSYM);
- break;
- case NODE_STR:
- lit = node->nd_lit;
- node->nd_lit = ID2SYM(rb_intern_str(lit));
- nd_set_type(node, NODE_LIT);
- break;
- default:
- node = NEW_NODE(NODE_DSYM, Qnil, 1, NEW_LIST(node));
- break;
+ if (i1 || i2) {
+ node->nd_next->nd_next->nd_next = NEW_NODE(NODE_AND, i1, i2, 0);
}
+ ruby_sourceline = saved_line;
return node;
}
#endif /* !RIPPER */
-#ifndef RIPPER
-static NODE *
-new_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs)
-{
- NODE *asgn;
-
- if (lhs) {
- ID vid = lhs->nd_vid;
- if (op == tOROP) {
- lhs->nd_value = rhs;
- asgn = NEW_OP_ASGN_OR(gettable(vid), lhs);
- if (is_asgn_or_id(vid)) {
- asgn->nd_aid = vid;
- }
- }
- else if (op == tANDOP) {
- lhs->nd_value = rhs;
- asgn = NEW_OP_ASGN_AND(gettable(vid), lhs);
- }
- else {
- asgn = lhs;
- asgn->nd_value = NEW_CALL(gettable(vid), op, NEW_LIST(rhs));
- }
- }
- else {
- asgn = NEW_BEGIN(0);
- }
- return asgn;
-}
-
-static NODE *
-new_attr_op_assign_gen(struct parser_params *parser, NODE *lhs, ID attr, ID op, NODE *rhs)
-{
- NODE *asgn;
-
- if (op == tOROP) {
- op = 0;
- }
- else if (op == tANDOP) {
- op = 1;
- }
- asgn = NEW_OP_ASGN2(lhs, attr, op, rhs);
- fixpos(asgn, lhs);
- return asgn;
-}
-
-static NODE *
-new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rhs)
-{
- NODE *asgn;
-
- if (op == tOROP) {
- op = 0;
- }
- else if (op == tANDOP) {
- op = 1;
- }
- if (lhs) {
- asgn = NEW_OP_CDECL(lhs, op, rhs);
- }
- else {
- asgn = NEW_BEGIN(0);
- }
- fixpos(asgn, lhs);
- return asgn;
-}
-#else
-static VALUE
-new_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE op, VALUE rhs)
-{
- return dispatch3(opassign, lhs, op, rhs);
-}
-
-static VALUE
-new_attr_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE type, VALUE attr, VALUE op, VALUE rhs)
-{
- VALUE recv = dispatch3(field, lhs, type, attr);
- return dispatch3(opassign, recv, op, rhs);
-}
-#endif
-
-static void
-warn_unused_var(struct parser_params *parser, struct local_vars *local)
-{
- int i, cnt;
- ID *v, *u;
-
- if (!local->used) return;
- v = local->vars->tbl;
- u = local->used->tbl;
- cnt = local->used->pos;
- if (cnt != local->vars->pos) {
- rb_bug("local->used->pos != local->vars->pos");
- }
- for (i = 0; i < cnt; ++i) {
- if (!v[i] || (u[i] & LVAR_USED)) continue;
- if (is_private_local_id(v[i])) continue;
- rb_warn4S(ruby_sourcefile, (int)u[i], "assigned but unused variable - %s", rb_id2name(v[i]));
- }
-}
-
static void
local_push_gen(struct parser_params *parser, int inherit_dvars)
{
@@ -9548,11 +8977,6 @@ local_push_gen(struct parser_params *parser, int inherit_dvars)
local->prev = lvtbl;
local->args = vtable_alloc(0);
local->vars = vtable_alloc(inherit_dvars ? DVARS_INHERIT : DVARS_TOPSCOPE);
- local->used = !(inherit_dvars &&
- (ifndef_ripper(compile_for_eval || e_option_supplied(parser))+0)) &&
- RTEST(ruby_verbose) ? vtable_alloc(0) : 0;
- local->cmdargs = cmdarg_stack;
- cmdarg_stack = 0;
lvtbl = local;
}
@@ -9560,38 +8984,38 @@ static void
local_pop_gen(struct parser_params *parser)
{
struct local_vars *local = lvtbl->prev;
- if (lvtbl->used) {
- warn_unused_var(parser, lvtbl);
- vtable_free(lvtbl->used);
- }
vtable_free(lvtbl->args);
vtable_free(lvtbl->vars);
- cmdarg_stack = lvtbl->cmdargs;
xfree(lvtbl);
lvtbl = local;
}
#ifndef RIPPER
static ID*
+vtable_tblcpy(ID *buf, const struct vtable *src)
+{
+ int i, cnt = vtable_size(src);
+
+ if (cnt > 0) {
+ buf[0] = cnt;
+ for (i = 0; i < cnt; i++) {
+ buf[i] = src->tbl[i];
+ }
+ return buf;
+ }
+ return 0;
+}
+
+static ID*
local_tbl_gen(struct parser_params *parser)
{
- int cnt_args = vtable_size(lvtbl->args);
- int cnt_vars = vtable_size(lvtbl->vars);
- int cnt = cnt_args + cnt_vars;
- int i, j;
+ int cnt = vtable_size(lvtbl->args) + vtable_size(lvtbl->vars);
ID *buf;
if (cnt <= 0) return 0;
buf = ALLOC_N(ID, cnt + 1);
- MEMCPY(buf+1, lvtbl->args->tbl, ID, cnt_args);
- /* remove IDs duplicated to warn shadowing */
- for (i = 0, j = cnt_args+1; i < cnt_vars; ++i) {
- ID id = lvtbl->vars->tbl[i];
- if (!vtable_included(lvtbl->args, id)) {
- buf[j++] = id;
- }
- }
- if (--j < cnt) REALLOC_N(buf, ID, (cnt = j) + 1);
+ vtable_tblcpy(buf+1, lvtbl->args);
+ vtable_tblcpy(buf+vtable_size(lvtbl->args)+1, lvtbl->vars);
buf[0] = cnt;
return buf;
}
@@ -9608,37 +9032,28 @@ static int
local_var_gen(struct parser_params *parser, ID id)
{
vtable_add(lvtbl->vars, id);
- if (lvtbl->used) {
- vtable_add(lvtbl->used, (ID)ruby_sourceline);
- }
return vtable_size(lvtbl->vars) - 1;
}
static int
local_id_gen(struct parser_params *parser, ID id)
{
- struct vtable *vars, *args, *used;
+ struct vtable *vars, *args;
vars = lvtbl->vars;
args = lvtbl->args;
- used = lvtbl->used;
while (vars && POINTER_P(vars->prev)) {
vars = vars->prev;
args = args->prev;
- if (used) used = used->prev;
}
if (vars && vars->prev == DVARS_INHERIT) {
return rb_local_defined(id);
}
- else if (vtable_included(args, id)) {
- return 1;
- }
else {
- int i = vtable_included(vars, id);
- if (i && used) used->tbl[i-1] |= LVAR_USED;
- return i != 0;
+ return (vtable_included(args, id) ||
+ vtable_included(vars, id));
}
}
@@ -9647,9 +9062,6 @@ dyna_push_gen(struct parser_params *parser)
{
lvtbl->args = vtable_alloc(lvtbl->args);
lvtbl->vars = vtable_alloc(lvtbl->vars);
- if (lvtbl->used) {
- lvtbl->used = vtable_alloc(lvtbl->used);
- }
return lvtbl->args;
}
@@ -9658,11 +9070,6 @@ dyna_pop_1(struct parser_params *parser)
{
struct vtable *tmp;
- if ((tmp = lvtbl->used) != 0) {
- warn_unused_var(parser, lvtbl);
- lvtbl->used = lvtbl->used->prev;
- vtable_free(tmp);
- }
tmp = lvtbl->args;
lvtbl->args = lvtbl->args->prev;
vtable_free(tmp);
@@ -9692,27 +9099,22 @@ dyna_in_block_gen(struct parser_params *parser)
}
static int
-dvar_defined_gen(struct parser_params *parser, ID id, int get)
+dvar_defined_gen(struct parser_params *parser, ID id)
{
- struct vtable *vars, *args, *used;
- int i;
+ struct vtable *vars, *args;
args = lvtbl->args;
vars = lvtbl->vars;
- used = lvtbl->used;
while (POINTER_P(vars)) {
if (vtable_included(args, id)) {
return 1;
}
- if ((i = vtable_included(vars, id)) != 0) {
- if (used) used->tbl[i-1] |= LVAR_USED;
+ if (vtable_included(vars, id)) {
return 1;
}
args = args->prev;
vars = vars->prev;
- if (get) used = 0;
- if (used) used = used->prev;
}
if (vars == DVARS_INHERIT) {
@@ -9730,6 +9132,9 @@ dvar_curr_gen(struct parser_params *parser, ID id)
}
#ifndef RIPPER
+VALUE rb_reg_compile(VALUE str, int options, const char *sourcefile, int sourceline);
+VALUE rb_reg_check_preprocess(VALUE);
+
static void
reg_fragment_setenc_gen(struct parser_params* parser, VALUE str, int options)
{
@@ -9752,7 +9157,7 @@ reg_fragment_setenc_gen(struct parser_params* parser, VALUE str, int options)
}
rb_enc_associate(str, rb_ascii8bit_encoding());
}
- else if (current_enc == rb_usascii_encoding()) {
+ else if (parser->enc == rb_usascii_encoding()) {
if (rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) {
/* raise in re.c */
rb_enc_associate(str, rb_usascii_encoding());
@@ -9972,8 +9377,9 @@ static const struct {
} op_tbl[] = {
{tDOT2, ".."},
{tDOT3, "..."},
+ {'+', "+(binary)"},
+ {'-', "-(binary)"},
{tPOW, "**"},
- {tDSTAR, "**"},
{tUPLUS, "+@"},
{tUMINUS, "-@"},
{tCMP, "<=>"},
@@ -10005,8 +9411,8 @@ static struct symbols {
st_table *ivar2_id;
st_table *id_ivar2;
#endif
- VALUE op_sym[tLAST_OP_ID];
-} global_symbols = {tLAST_TOKEN};
+ VALUE op_sym[tLAST_TOKEN];
+} global_symbols = {tLAST_ID};
static const struct st_hash_type symhash = {
rb_str_hash_cmp,
@@ -10050,12 +9456,6 @@ Init_sym(void)
global_symbols.id_ivar2 = st_init_numtable_with_size(1000);
#endif
- (void)nodetype;
- (void)nodeline;
-#if PARSER_DEBUG
- (void)lex_state_name(-1);
-#endif
-
Init_id();
}
@@ -10064,7 +9464,7 @@ rb_gc_mark_symbols(void)
{
rb_mark_tbl(global_symbols.id_str);
rb_gc_mark_locations(global_symbols.op_sym,
- global_symbols.op_sym + numberof(global_symbols.op_sym));
+ global_symbols.op_sym + tLAST_TOKEN);
}
#endif /* !RIPPER */
@@ -10083,17 +9483,22 @@ is_special_global_name(const char *m, const char *e, rb_encoding *enc)
int mb = 0;
if (m >= e) return 0;
- if (is_global_name_punct(*m)) {
+ switch (*m) {
+ case '~': case '*': case '$': case '?': case '!': case '@':
+ case '/': case '\\': case ';': case ',': case '.': case '=':
+ case ':': case '<': case '>': case '\"':
+ case '&': case '`': case '\'': case '+':
+ case '0':
++m;
- }
- else if (*m == '-') {
+ break;
+ case '-':
++m;
if (m < e && is_identchar(m, e, enc)) {
if (!ISASCII(*m)) mb = 1;
m += rb_enc_mbclen(m, e, enc);
}
- }
- else {
+ break;
+ default:
if (!rb_enc_isdigit(*m, enc)) return 0;
do {
if (!ISASCII(*m)) mb = 1;
@@ -10115,32 +9520,24 @@ rb_enc_symname_p(const char *name, rb_encoding *enc)
return rb_enc_symname2_p(name, strlen(name), enc);
}
-#define IDSET_ATTRSET_FOR_SYNTAX ((1U<<ID_LOCAL)|(1U<<ID_CONST))
-#define IDSET_ATTRSET_FOR_INTERN (~(~0U<<(1<<ID_SCOPE_SHIFT)) & ~(1U<<ID_ATTRSET))
-
-static int
-rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int allowed_atttset)
+int
+rb_enc_symname2_p(const char *name, long len, rb_encoding *enc)
{
const char *m = name;
const char *e = m + len;
- int type = ID_JUNK;
+ int localid = FALSE;
- if (!m || len <= 0) return -1;
+ if (!m) return FALSE;
switch (*m) {
case '\0':
- return -1;
+ return FALSE;
case '$':
- type = ID_GLOBAL;
- if (is_special_global_name(++m, e, enc)) return type;
+ if (is_special_global_name(++m, e, enc)) return TRUE;
goto id;
case '@':
- type = ID_INSTANCE;
- if (*++m == '@') {
- ++m;
- type = ID_CLASS;
- }
+ if (*++m == '@') ++m;
goto id;
case '<':
@@ -10161,7 +9558,7 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a
switch (*++m) {
case '~': ++m; break;
case '=': if (*++m == '=') ++m; break;
- default: return -1;
+ default: return FALSE;
}
break;
@@ -10178,135 +9575,72 @@ rb_enc_symname_type(const char *name, long len, rb_encoding *enc, unsigned int a
break;
case '[':
- if (*++m != ']') return -1;
+ if (*++m != ']') return FALSE;
if (*++m == '=') ++m;
break;
case '!':
- if (len == 1) return ID_JUNK;
switch (*++m) {
+ case '\0': return TRUE;
case '=': case '~': ++m; break;
- default: return -1;
+ default: return FALSE;
}
break;
default:
- type = rb_enc_isupper(*m, enc) ? ID_CONST : ID_LOCAL;
+ localid = !rb_enc_isupper(*m, enc);
id:
if (m >= e || (*m != '_' && !rb_enc_isalpha(*m, enc) && ISASCII(*m)))
- return -1;
+ return FALSE;
while (m < e && is_identchar(m, e, enc)) m += rb_enc_mbclen(m, e, enc);
- if (m >= e) break;
- switch (*m) {
- case '!': case '?':
- if (type == ID_GLOBAL || type == ID_CLASS || type == ID_INSTANCE) return -1;
- type = ID_JUNK;
- ++m;
- if (m + 1 < e || *m != '=') break;
- /* fall through */
- case '=':
- if (!(allowed_atttset & (1U << type))) return -1;
- type = ID_ATTRSET;
- ++m;
- break;
+ if (localid) {
+ switch (*m) {
+ case '!': case '?': case '=': ++m;
+ }
}
break;
}
- return m == e ? type : -1;
-}
-
-int
-rb_enc_symname2_p(const char *name, long len, rb_encoding *enc)
-{
- return rb_enc_symname_type(name, len, enc, IDSET_ATTRSET_FOR_SYNTAX) != -1;
-}
-
-static int
-rb_str_symname_type(VALUE name, unsigned int allowed_atttset)
-{
- const char *ptr = StringValuePtr(name);
- long len = RSTRING_LEN(name);
- int type = rb_enc_symname_type(ptr, len, rb_enc_get(name), allowed_atttset);
- RB_GC_GUARD(name);
- return type;
+ return m == e;
}
static ID
register_symid(ID id, const char *name, long len, rb_encoding *enc)
{
VALUE str = rb_enc_str_new(name, len, enc);
- return register_symid_str(id, str);
-}
-
-static ID
-register_symid_str(ID id, VALUE str)
-{
OBJ_FREEZE(str);
st_add_direct(global_symbols.sym_id, (st_data_t)str, id);
st_add_direct(global_symbols.id_str, id, (st_data_t)str);
return id;
}
-static int
-sym_check_asciionly(VALUE str)
-{
- if (!rb_enc_asciicompat(rb_enc_get(str))) return FALSE;
- switch (rb_enc_str_coderange(str)) {
- case ENC_CODERANGE_BROKEN:
- rb_raise(rb_eEncodingError, "invalid encoding symbol");
- case ENC_CODERANGE_7BIT:
- return TRUE;
- }
- return FALSE;
-}
-
-/*
- * _str_ itself will be registered at the global symbol table. _str_
- * can be modified before the registration, since the encoding will be
- * set to ASCII-8BIT if it is a special global name.
- */
-static ID intern_str(VALUE str);
-
ID
rb_intern3(const char *name, long len, rb_encoding *enc)
{
+ const char *m = name;
+ const char *e = m + len;
+ unsigned char c;
VALUE str;
+ ID id;
+ long last;
+ int mb;
st_data_t data;
struct RString fake_str;
- fake_str.basic.flags = T_STRING|RSTRING_NOEMBED;
+ fake_str.basic.flags = T_STRING|RSTRING_NOEMBED|FL_FREEZE;
fake_str.basic.klass = rb_cString;
fake_str.as.heap.len = len;
fake_str.as.heap.ptr = (char *)name;
fake_str.as.heap.aux.capa = len;
str = (VALUE)&fake_str;
rb_enc_associate(str, enc);
- OBJ_FREEZE(str);
+
+ if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) {
+ rb_raise(rb_eEncodingError, "invalid encoding symbol");
+ }
if (st_lookup(global_symbols.sym_id, str, &data))
return (ID)data;
- str = rb_enc_str_new(name, len, enc); /* make true string */
- return intern_str(str);
-}
-
-static ID
-intern_str(VALUE str)
-{
- const char *name, *m, *e;
- long len, last;
- rb_encoding *enc, *symenc;
- unsigned char c;
- ID id;
- int mb;
-
- RSTRING_GETMEM(str, name, len);
- m = name;
- e = m + len;
- enc = rb_enc_get(str);
- symenc = enc;
-
- if (!len || (rb_cString && !rb_enc_asciicompat(enc))) {
- junk:
+ if (rb_cString && !rb_enc_asciicompat(enc)) {
id = ID_JUNK;
goto new_id;
}
@@ -10314,21 +9648,18 @@ intern_str(VALUE str)
id = 0;
switch (*m) {
case '$':
- if (len < 2) goto junk;
id |= ID_GLOBAL;
if ((mb = is_special_global_name(++m, e, enc)) != 0) {
- if (!--mb) symenc = rb_usascii_encoding();
+ if (!--mb) enc = rb_ascii8bit_encoding();
goto new_id;
}
break;
case '@':
if (m[1] == '@') {
- if (len < 3) goto junk;
m++;
id |= ID_CLASS;
}
else {
- if (len < 2) goto junk;
id |= ID_INSTANCE;
}
m++;
@@ -10351,42 +9682,52 @@ intern_str(VALUE str)
}
}
}
- break;
- }
- if (name[last] == '=') {
- /* attribute assignment */
- if (last > 1 && name[last-1] == '=')
- goto junk;
- id = rb_intern3(name, last, enc);
- if (id > tLAST_OP_ID && !is_attrset_id(id)) {
- enc = rb_enc_get(rb_id2str(id));
- id = rb_id_attrset(id);
- goto id_register;
+
+ if (m[last] == '=') {
+ /* attribute assignment */
+ id = rb_intern3(name, last, enc);
+ if (id > tLAST_TOKEN && !is_attrset_id(id)) {
+ enc = rb_enc_get(rb_id2str(id));
+ id = rb_id_attrset(id);
+ goto id_register;
+ }
+ id = ID_ATTRSET;
}
- id = ID_ATTRSET;
- }
- else if (id == 0) {
- if (rb_enc_isupper(m[0], enc)) {
+ else if (rb_enc_isupper(m[0], enc)) {
id = ID_CONST;
- }
+ }
else {
id = ID_LOCAL;
}
+ break;
}
+ mb = 0;
if (!rb_enc_isdigit(*m, enc)) {
while (m <= name + last && is_identchar(m, e, enc)) {
if (ISASCII(*m)) {
m++;
}
else {
+ mb = 1;
m += rb_enc_mbclen(m, e, enc);
}
}
}
- if (id != ID_ATTRSET && m - name < len) id = ID_JUNK;
- if (sym_check_asciionly(str)) symenc = rb_usascii_encoding();
+ if (m - name < len) id = ID_JUNK;
+ if (enc != rb_usascii_encoding()) {
+ /*
+ * this clause makes sense only when called from other than
+ * rb_intern_str() taking care of code-range.
+ */
+ if (!mb) {
+ for (; m <= name + len; ++m) {
+ if (!ISASCII(*m)) goto mbstr;
+ }
+ enc = rb_usascii_encoding();
+ }
+ mbstr:;
+ }
new_id:
- if (symenc != enc) rb_enc_associate(str, symenc);
if (global_symbols.last_id >= ~(ID)0 >> (ID_SCOPE_SHIFT+RUBY_SPECIAL_SHIFT)) {
if (len > 20) {
rb_raise(rb_eRuntimeError, "symbol table overflow (symbol %.20s...)",
@@ -10399,7 +9740,7 @@ intern_str(VALUE str)
}
id |= ++global_symbols.last_id << ID_SCOPE_SHIFT;
id_register:
- return register_symid_str(id, str);
+ return register_symid(id, name, len, enc);
}
ID
@@ -10418,11 +9759,18 @@ rb_intern(const char *name)
ID
rb_intern_str(VALUE str)
{
- st_data_t id;
+ rb_encoding *enc;
+ ID id;
- if (st_lookup(global_symbols.sym_id, str, &id))
- return (ID)id;
- return intern_str(rb_str_dup(str));
+ if (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) {
+ enc = rb_usascii_encoding();
+ }
+ else {
+ enc = rb_enc_get(str);
+ }
+ id = rb_intern3(RSTRING_PTR(str), RSTRING_LEN(str), enc);
+ RB_GC_GUARD(str);
+ return id;
}
VALUE
@@ -10466,21 +9814,16 @@ rb_id2str(ID id)
}
if (is_attrset_id(id)) {
- ID id_stem = (id & ~ID_SCOPE_MASK);
+ ID id2 = (id & ~ID_SCOPE_MASK) | ID_LOCAL;
VALUE str;
- do {
- if (!!(str = rb_id2str(id_stem | ID_LOCAL))) break;
- if (!!(str = rb_id2str(id_stem | ID_CONST))) break;
- if (!!(str = rb_id2str(id_stem | ID_INSTANCE))) break;
- if (!!(str = rb_id2str(id_stem | ID_GLOBAL))) break;
- if (!!(str = rb_id2str(id_stem | ID_CLASS))) break;
- if (!!(str = rb_id2str(id_stem | ID_JUNK))) break;
- return 0;
- } while (0);
+ while (!(str = rb_id2str(id2))) {
+ if (!is_local_id(id2)) return 0;
+ id2 = (id & ~ID_SCOPE_MASK) | ID_CONST;
+ }
str = rb_str_dup(str);
rb_str_cat(str, "=", 1);
- register_symid_str(id, str);
+ rb_intern_str(str);
if (st_lookup(global_symbols.id_str, id, &data)) {
VALUE str = (VALUE)data;
if (RBASIC(str)->klass == 0)
@@ -10545,24 +9888,12 @@ rb_is_class_id(ID id)
}
int
-rb_is_global_id(ID id)
-{
- return is_global_id(id);
-}
-
-int
rb_is_instance_id(ID id)
{
return is_instance_id(id);
}
int
-rb_is_attrset_id(ID id)
-{
- return is_attrset_id(id);
-}
-
-int
rb_is_local_id(ID id)
{
return is_local_id(id);
@@ -10574,144 +9905,6 @@ rb_is_junk_id(ID id)
return is_junk_id(id);
}
-/**
- * Returns ID for the given name if it is interned already, or 0.
- *
- * \param namep the pointer to the name object
- * \return the ID for *namep
- * \pre the object referred by \p namep must be a Symbol or
- * a String, or possible to convert with to_str method.
- * \post the object referred by \p namep is a Symbol or a
- * String if non-zero value is returned, or is a String
- * if 0 is returned.
- */
-ID
-rb_check_id(volatile VALUE *namep)
-{
- st_data_t id;
- VALUE tmp;
- VALUE name = *namep;
-
- if (SYMBOL_P(name)) {
- return SYM2ID(name);
- }
- else if (!RB_TYPE_P(name, T_STRING)) {
- tmp = rb_check_string_type(name);
- if (NIL_P(tmp)) {
- tmp = rb_inspect(name);
- rb_raise(rb_eTypeError, "%s is not a symbol",
- RSTRING_PTR(tmp));
- }
- name = tmp;
- *namep = name;
- }
-
- sym_check_asciionly(name);
-
- if (st_lookup(global_symbols.sym_id, (st_data_t)name, &id))
- return (ID)id;
-
- if (rb_is_attrset_name(name)) {
- struct RString fake_str;
- const VALUE localname = (VALUE)&fake_str;
- /* make local name by chopping '=' */
- fake_str.basic.flags = T_STRING|RSTRING_NOEMBED;
- fake_str.basic.klass = rb_cString;
- fake_str.as.heap.len = RSTRING_LEN(name) - 1;
- fake_str.as.heap.ptr = RSTRING_PTR(name);
- fake_str.as.heap.aux.capa = fake_str.as.heap.len;
- rb_enc_copy(localname, name);
- OBJ_FREEZE(localname);
-
- if (st_lookup(global_symbols.sym_id, (st_data_t)localname, &id)) {
- return rb_id_attrset((ID)id);
- }
- RB_GC_GUARD(name);
- }
-
- return (ID)0;
-}
-
-ID
-rb_check_id_cstr(const char *ptr, long len, rb_encoding *enc)
-{
- st_data_t id;
- struct RString fake_str;
- const VALUE name = (VALUE)&fake_str;
- fake_str.basic.flags = T_STRING|RSTRING_NOEMBED;
- fake_str.basic.klass = rb_cString;
- fake_str.as.heap.len = len;
- fake_str.as.heap.ptr = (char *)ptr;
- fake_str.as.heap.aux.capa = len;
- rb_enc_associate(name, enc);
-
- sym_check_asciionly(name);
-
- if (st_lookup(global_symbols.sym_id, (st_data_t)name, &id))
- return (ID)id;
-
- if (rb_is_attrset_name(name)) {
- fake_str.as.heap.len = len - 1;
- if (st_lookup(global_symbols.sym_id, (st_data_t)name, &id)) {
- return rb_id_attrset((ID)id);
- }
- }
-
- return (ID)0;
-}
-
-int
-rb_is_const_name(VALUE name)
-{
- return rb_str_symname_type(name, 0) == ID_CONST;
-}
-
-int
-rb_is_class_name(VALUE name)
-{
- return rb_str_symname_type(name, 0) == ID_CLASS;
-}
-
-int
-rb_is_global_name(VALUE name)
-{
- return rb_str_symname_type(name, 0) == ID_GLOBAL;
-}
-
-int
-rb_is_instance_name(VALUE name)
-{
- return rb_str_symname_type(name, 0) == ID_INSTANCE;
-}
-
-int
-rb_is_attrset_name(VALUE name)
-{
- return rb_str_symname_type(name, IDSET_ATTRSET_FOR_INTERN) == ID_ATTRSET;
-}
-
-int
-rb_is_local_name(VALUE name)
-{
- return rb_str_symname_type(name, 0) == ID_LOCAL;
-}
-
-int
-rb_is_method_name(VALUE name)
-{
- switch (rb_str_symname_type(name, 0)) {
- case ID_LOCAL: case ID_ATTRSET: case ID_JUNK:
- return TRUE;
- }
- return FALSE;
-}
-
-int
-rb_is_junk_name(VALUE name)
-{
- return rb_str_symname_type(name, IDSET_ATTRSET_FOR_SYNTAX) == -1;
-}
-
#endif /* !RIPPER */
static void
@@ -10725,7 +9918,6 @@ parser_initialize(struct parser_params *parser)
parser->parser_class_nest = 0;
parser->parser_paren_nest = 0;
parser->parser_lpar_beg = 0;
- parser->parser_brace_nest = 0;
parser->parser_in_single = 0;
parser->parser_in_def = 0;
parser->parser_in_defined = 0;
@@ -10743,13 +9935,13 @@ parser_initialize(struct parser_params *parser)
parser->parser_lvtbl = 0;
parser->parser_ruby__end__seen = 0;
parser->parser_ruby_sourcefile = 0;
- parser->parser_ruby_sourcefile_string = Qnil;
#ifndef RIPPER
parser->is_ripper = 0;
parser->parser_eval_tree_begin = 0;
parser->parser_eval_tree = 0;
#else
parser->is_ripper = 1;
+ parser->parser_ruby_sourcefile_string = Qnil;
parser->delayed = Qnil;
parser->result = Qnil;
@@ -10759,7 +9951,7 @@ parser_initialize(struct parser_params *parser)
#ifdef YYMALLOC
parser->heap = NULL;
#endif
- parser->enc = rb_utf8_encoding();
+ parser->enc = rb_usascii_encoding();
}
#ifdef RIPPER
@@ -10777,12 +9969,12 @@ parser_mark(void *ptr)
rb_gc_mark(p->parser_lex_input);
rb_gc_mark(p->parser_lex_lastline);
rb_gc_mark(p->parser_lex_nextline);
- rb_gc_mark(p->parser_ruby_sourcefile_string);
#ifndef RIPPER
rb_gc_mark((VALUE)p->parser_eval_tree_begin) ;
rb_gc_mark((VALUE)p->parser_eval_tree) ;
rb_gc_mark(p->debug_lines);
#else
+ rb_gc_mark(p->parser_ruby_sourcefile_string);
rb_gc_mark(p->delayed);
rb_gc_mark(p->value);
rb_gc_mark(p->result);
@@ -10807,6 +9999,9 @@ parser_free(void *ptr)
prev = local->prev;
xfree(local);
}
+#ifndef RIPPER
+ xfree(p->parser_ruby_sourcefile);
+#endif
xfree(p);
}
@@ -10823,22 +10018,24 @@ parser_memsize(const void *ptr)
size += sizeof(*local);
if (local->vars) size += local->vars->capa * sizeof(ID);
}
+#ifndef RIPPER
+ if (p->parser_ruby_sourcefile) {
+ size += strlen(p->parser_ruby_sourcefile) + 1;
+ }
+#endif
return size;
}
-static
-#ifndef RIPPER
-const
-#endif
-rb_data_type_t parser_data_type = {
+static const rb_data_type_t parser_data_type = {
"parser",
- {
- parser_mark,
- parser_free,
- parser_memsize,
- },
+ parser_mark,
+ parser_free,
+ parser_memsize,
};
+VALUE rb_parser_get_yydebug(VALUE);
+VALUE rb_parser_set_yydebug(VALUE, VALUE);
+
#ifndef RIPPER
#undef rb_reserved_word
@@ -10894,7 +10091,7 @@ rb_parser_encoding(VALUE vparser)
struct parser_params *parser;
TypedData_Get_Struct(vparser, struct parser_params, &parser_data_type, parser);
- return rb_enc_from_encoding(current_enc);
+ return rb_enc_from_encoding(parser->enc);
}
/*
@@ -11029,7 +10226,7 @@ ripper_validate_object(VALUE self, VALUE x)
}
#endif
-#define validate(x) ((x) = get_value(x))
+#define validate(x) (x = get_value(x))
static VALUE
ripper_dispatch0(struct parser_params *parser, ID mid)
@@ -11082,19 +10279,6 @@ ripper_dispatch5(struct parser_params *parser, ID mid, VALUE a, VALUE b, VALUE c
return rb_funcall(parser->value, mid, 5, a, b, c, d, e);
}
-static VALUE
-ripper_dispatch7(struct parser_params *parser, ID mid, VALUE a, VALUE b, VALUE c, VALUE d, VALUE e, VALUE f, VALUE g)
-{
- validate(a);
- validate(b);
- validate(c);
- validate(d);
- validate(e);
- validate(f);
- validate(g);
- return rb_funcall(parser->value, mid, 7, a, b, c, d, e, f, g);
-}
-
static const struct kw_assoc {
ID id;
const char *name;
@@ -11240,12 +10424,14 @@ ripper_warnI(struct parser_params *parser, const char *fmt, int a)
STR_NEW2(fmt), INT2NUM(a));
}
+#if 0
static void
ripper_warnS(struct parser_params *parser, const char *fmt, const char *str)
{
rb_funcall(parser->value, rb_intern("warn"), 2,
STR_NEW2(fmt), STR_NEW2(str));
}
+#endif
static void
ripper_warning0(struct parser_params *parser, const char *fmt)
@@ -11263,7 +10449,7 @@ ripper_warningS(struct parser_params *parser, const char *fmt, const char *str)
static VALUE
ripper_lex_get_generic(struct parser_params *parser, VALUE src)
{
- return rb_io_gets(src);
+ return rb_funcall(src, ripper_id_gets, 0);
}
static VALUE
@@ -11299,7 +10485,7 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
TypedData_Get_Struct(self, struct parser_params, &parser_data_type, parser);
rb_scan_args(argc, argv, "12", &src, &fname, &lineno);
- if (RB_TYPE_P(src, T_FILE)) {
+ if (rb_obj_respond_to(src, ripper_id_gets, 0)) {
parser->parser_lex_gets = ripper_lex_get_generic;
}
else {
@@ -11323,6 +10509,8 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
return Qnil;
}
+extern VALUE rb_thread_pass(void);
+
struct ripper_args {
struct parser_params *parser;
int argc;
@@ -11457,24 +10645,9 @@ ripper_value(VALUE self, VALUE obj)
}
#endif
-
void
Init_ripper(void)
{
- parser_data_type.parent = RTYPEDDATA_TYPE(rb_parser_new());
-
- ripper_init_eventids1();
- ripper_init_eventids2();
- /* ensure existing in symbol table */
- (void)rb_intern("||");
- (void)rb_intern("&&");
-
- InitVM(ripper);
-}
-
-void
-InitVM_ripper(void)
-{
VALUE Ripper;
Ripper = rb_define_class("Ripper", rb_cObject);
@@ -11495,19 +10668,11 @@ InitVM_ripper(void)
rb_define_method(rb_mKernel, "validate_object", ripper_validate_object, 1);
#endif
- ripper_init_eventids1_table(Ripper);
- ripper_init_eventids2_table(Ripper);
-
-# if 0
- /* Hack to let RDoc document SCRIPT_LINES__ */
-
- /*
- * When a Hash is assigned to +SCRIPT_LINES__+ the contents of files loaded
- * after the assignment will be added as an Array of lines with the file
- * name as the key.
- */
- rb_define_global_const("SCRIPT_LINES__", Qnil);
-#endif
-
+ ripper_id_gets = rb_intern("gets");
+ ripper_init_eventids1(Ripper);
+ ripper_init_eventids2(Ripper);
+ /* ensure existing in symbol table */
+ rb_intern("||");
+ rb_intern("&&");
}
#endif /* RIPPER */
diff --git a/prelude.rb b/prelude.rb
index 2b371e7134..04bf85044b 100644
--- a/prelude.rb
+++ b/prelude.rb
@@ -1,9 +1,25 @@
+class Mutex
+ # call-seq:
+ # mutex.synchronize { ... }
+ #
+ # Obtains a lock, runs the block, and releases the lock when the
+ # block completes. See the example under Mutex.
+ def synchronize
+ self.lock
+ begin
+ yield
+ ensure
+ self.unlock rescue nil
+ end
+ end
+end
+
class Thread
MUTEX_FOR_THREAD_EXCLUSIVE = Mutex.new # :nodoc:
# 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.
diff --git a/probes.d b/probes.d
deleted file mode 100644
index 31aef37854..0000000000
--- a/probes.d
+++ /dev/null
@@ -1,211 +0,0 @@
-#include "vm_opts.h"
-
-provider ruby {
- /*
- ruby:::method-entry(classname, methodname, filename, lineno);
-
- This probe is fired just before a method is entered.
-
- * `classname` name of the class (a string)
- * `methodname` name of the method about to be executed (a string)
- * `filename` the file name where the method is _being called_ (a string)
- * `lineno` the line number where the method is _being called_ (an int)
- */
- probe method__entry(const char *, const char *, const char *, int);
- /*
- ruby:::method-return(classname, methodname, filename, lineno);
-
- This probe is fired just after a method has returned. The arguments are
- the same as "ruby:::function-entry".
- */
- probe method__return(const char *, const char *, const char *, int);
-
- /*
- ruby:::cmethod-entry(classname, methodname, filename, lineno);
-
- This probe is fired just before a C method is entered. The arguments are
- the same as "ruby:::function-entry".
- */
- probe cmethod__entry(const char *, const char *, const char *, int);
- /*
- ruby:::cmethod-return(classname, methodname, filename, lineno);
-
- This probe is fired just before a C method returns. The arguments are
- the same as "ruby:::function-entry".
- */
- probe cmethod__return(const char *, const char *, const char *, int);
-
- /*
- ruby:::require-entry(requiredfile, filename, lineno);
-
- This probe is fired on calls to `rb_require_safe` (when a file is
- required).
-
- * `requiredfile` is the name of the file to be required (string).
- * `filename` is the file that called "require" (string).
- * `lineno` is the line number where the call to require was made (int).
- */
- probe require__entry(const char *, const char *, int);
-
- /*
- ruby:::require-return(requiredfile, filename, lineno);
-
- This probe is fired just before `rb_require_safe` (when a file is required)
- returns. The arguments are the same as "ruby:::require-entry". This
- probe will not fire if there was an exception during file require.
- */
- probe require__return(const char *, const char *, int);
-
- /*
- ruby:::find-require-entry(requiredfile, filename, lineno);
-
- This probe is fired right before `search_required` is called.
- `search_required` determines whether the file has already been required by
- searching loaded features ($"), and if not, figures out which file must be
- loaded.
-
- * `requiredfile` is the file to be required (string).
- * `filename` is the file that called "require" (string).
- * `lineno` is the line number where the call to require was made (int).
- */
- probe find__require__entry(const char *, const char *, int);
-
- /*
- ruby:::find-require-return(requiredfile, filename, lineno);
-
- This probe is fired right after `search_required` returns. See the
- documentation for "ruby:::find-require-entry" for more details. Arguments
- for this probe are the same as "ruby:::find-require-entry".
- */
- probe find__require__return(const char *, const char *, int);
-
- /*
- ruby:::load-entry(loadedfile, filename, lineno);
-
- This probe is fired when calls to "load" are made. The arguments are the
- same as "ruby:::require-entry".
- */
- probe load__entry(const char *, const char *, int);
-
- /*
- ruby:::load-return(loadedfile, filename, lineno);
-
- This probe is fired when "load" returns. The arguments are the same as
- "ruby:::load-entry".
- */
- probe load__return(const char *, const char *, int);
-
- /*
- ruby:::raise(classname, filename, lineno);
-
- This probe is fired when an exception is raised.
-
- * `classname` is the class name of the raised exception (string)
- * `filename` the name of the file where the exception was raised (string)
- * `lineno` the line number in the file where the exception was raised (int)
- */
- probe raise(const char *, const char *, int);
-
- /*
- ruby:::object-create(classname, filename, lineno);
-
- This probe is fired when an object is about to be allocated.
-
- * `classname` the class of the allocated object (string)
- * `filename` the name of the file where the object is allocated (string)
- * `lineno` the line number in the file where the object is allocated (int)
- */
- probe object__create(const char *, const char *, int);
-
- /*
- ruby:::array-create(length, filename, lineno);
-
- This probe is fired when an Array is about to be allocated.
-
- * `length` the size of the array (long)
- * `filename` the name of the file where the array is allocated (string)
- * `lineno` the line number in the file where the array is allocated (int)
- */
- probe array__create(long, const char *, int);
-
- /*
- ruby:::hash-create(length, filename, lineno);
-
- This probe is fired when a Hash is about to be allocated.
-
- * `length` the size of the hash (long)
- * `filename` the name of the file where the hash is allocated (string)
- * `lineno` the line number in the file where the hash is allocated (int)
- */
- probe hash__create(long, const char *, int);
-
- /*
- ruby:::string-create(length, filename, lineno);
-
- This probe is fired when a String is about to be allocated.
-
- * `length` the size of the string (long)
- * `filename` the name of the file where the string is allocated (string)
- * `lineno` the line number in the file where the string is allocated (int)
- */
- probe string__create(long, const char *, int);
-
- /*
- ruby:::parse-begin(sourcefile, lineno);
-
- Fired just before parsing and compiling a source file.
-
- * `sourcefile` the file being parsed (string)
- * `lineno` the line number where the source starts (int)
- */
- probe parse__begin(const char *, int);
-
- /*
- ruby:::parse-end(sourcefile, lineno);
-
- Fired just after parsing and compiling a source file.
-
- * `sourcefile` the file being parsed (string)
- * `lineno` the line number where the source ended (int)
- */
- probe parse__end(const char *, int);
-
-#if VM_COLLECT_USAGE_DETAILS
- probe insn(const char *);
- probe insn__operand(const char *, const char *);
-#endif
-
- /*
- ruby:::gc-mark-begin();
-
- Fired at the beginning of a mark phase.
- */
- probe gc__mark__begin();
-
- /*
- ruby:::gc-mark-end();
-
- Fired at the end of a mark phase.
- */
- probe gc__mark__end();
-
- /*
- ruby:::gc-sweep-begin();
-
- Fired at the beginning of a sweep phase.
- */
- probe gc__sweep__begin();
-
- /*
- ruby:::gc-sweep-end();
-
- Fired at the end of a sweep phase.
- */
- probe gc__sweep__end();
-};
-
-#pragma D attributes Stable/Evolving/Common provider ruby provider
-#pragma D attributes Stable/Evolving/Common provider ruby module
-#pragma D attributes Stable/Evolving/Common provider ruby function
-#pragma D attributes Evolving/Evolving/Common provider ruby name
-#pragma D attributes Evolving/Evolving/Common provider ruby args
diff --git a/probes_helper.h b/probes_helper.h
deleted file mode 100644
index 12a18dcb34..0000000000
--- a/probes_helper.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef RUBY_PROBES_HELPER_H
-#define RUBY_PROBES_HELPER_H
-
-#include "ruby/ruby.h"
-#include "probes.h"
-
-VALUE rb_class_path_no_cache(VALUE _klass);
-
-#define RUBY_DTRACE_HOOK(name, th, klazz, id) \
-do { \
- if (RUBY_DTRACE_##name##_ENABLED()) { \
- VALUE _klass = (klazz); \
- VALUE _id = (id); \
- const char * classname; \
- const char * methodname; \
- const char * filename; \
- if (!_klass) { \
- rb_thread_method_id_and_class((th), &_id, &_klass); \
- } \
- if (_klass) { \
- if (RB_TYPE_P(_klass, T_ICLASS)) { \
- _klass = RBASIC(_klass)->klass; \
- } \
- else if (FL_TEST(_klass, FL_SINGLETON)) { \
- _klass = rb_iv_get(_klass, "__attached__"); \
- } \
- switch (TYPE(_klass)) { \
- case T_CLASS: \
- case T_ICLASS: \
- case T_MODULE: \
- { \
- VALUE _name = rb_class_path_no_cache(_klass); \
- if (!NIL_P(_name)) { \
- classname = StringValuePtr(_name); \
- } \
- else { \
- classname = "<unknown>"; \
- } \
- methodname = rb_id2name(_id); \
- filename = rb_sourcefile(); \
- if (classname && methodname && filename) { \
- RUBY_DTRACE_##name( \
- classname, \
- methodname, \
- filename, \
- rb_sourceline()); \
- } \
- break; \
- } \
- } \
- } \
- } \
-} while (0)
-
-#define RUBY_DTRACE_METHOD_ENTRY_HOOK(th, klass, id) \
- RUBY_DTRACE_HOOK(METHOD_ENTRY, th, klass, id)
-
-#define RUBY_DTRACE_METHOD_RETURN_HOOK(th, klass, id) \
- RUBY_DTRACE_HOOK(METHOD_RETURN, th, klass, id)
-
-#define RUBY_DTRACE_CMETHOD_ENTRY_HOOK(th, klass, id) \
- RUBY_DTRACE_HOOK(CMETHOD_ENTRY, th, klass, id)
-
-#define RUBY_DTRACE_CMETHOD_RETURN_HOOK(th, klass, id) \
- RUBY_DTRACE_HOOK(CMETHOD_RETURN, th, klass, id)
-
-#endif /* RUBY_PROBES_HELPER_H */
diff --git a/proc.c b/proc.c
index 8d18e2c3db..7b1d1474a8 100644
--- a/proc.c
+++ b/proc.c
@@ -10,17 +10,13 @@
**********************************************************************/
#include "eval_intern.h"
-#include "internal.h"
#include "gc.h"
-#include "iseq.h"
struct METHOD {
VALUE recv;
VALUE rclass;
- VALUE defined_class;
ID id;
- rb_method_entry_t *me;
- struct unlinked_method_entry_list_entry *ume;
+ rb_method_entry_t me;
};
VALUE rb_cUnboundMethod;
@@ -28,10 +24,12 @@ VALUE rb_cMethod;
VALUE rb_cBinding;
VALUE rb_cProc;
-static VALUE bmcall(VALUE, VALUE, int, VALUE *, VALUE);
+VALUE rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc);
+
+static VALUE bmcall(VALUE, VALUE);
static int method_arity(VALUE);
-static int method_min_max_arity(VALUE, int *max);
-static ID attached;
+static int rb_obj_is_method(VALUE m);
+rb_iseq_t *rb_method_get_iseq(VALUE method);
/* Proc */
@@ -73,11 +71,9 @@ proc_memsize(const void *ptr)
static const rb_data_type_t proc_data_type = {
"proc",
- {
- proc_mark,
- proc_free,
- proc_memsize,
- },
+ proc_mark,
+ proc_free,
+ proc_memsize,
};
VALUE
@@ -130,39 +126,39 @@ proc_clone(VALUE self)
* call-seq:
* prc.lambda? -> true or false
*
- * Returns +true+ for a Proc object for which argument handling is rigid.
- * Such procs are typically generated by +lambda+.
+ * Returns true for a Proc object which argument handling is rigid.
+ * Such procs are typically generated by lambda.
*
- * A Proc object generated by +proc+ ignores extra arguments.
+ * A Proc object generated by proc ignore extra arguments.
*
* proc {|a,b| [a,b] }.call(1,2,3) #=> [1,2]
*
- * It provides +nil+ for missing arguments.
+ * It provides nil for lacked arguments.
*
* proc {|a,b| [a,b] }.call(1) #=> [1,nil]
*
- * It expands a single array argument.
+ * It expand single-array argument.
*
* proc {|a,b| [a,b] }.call([1,2]) #=> [1,2]
*
- * A Proc object generated by +lambda+ doesn't have such tricks.
+ * A Proc object generated by lambda doesn't have such tricks.
*
* lambda {|a,b| [a,b] }.call(1,2,3) #=> ArgumentError
* lambda {|a,b| [a,b] }.call(1) #=> ArgumentError
* lambda {|a,b| [a,b] }.call([1,2]) #=> ArgumentError
*
* Proc#lambda? is a predicate for the tricks.
- * It returns +true+ if no tricks apply.
+ * It returns true if no tricks.
*
* lambda {}.lambda? #=> true
* proc {}.lambda? #=> false
*
- * Proc.new is the same as +proc+.
+ * Proc.new is same as proc.
*
* Proc.new {}.lambda? #=> false
*
- * +lambda+, +proc+ and Proc.new preserve the tricks of
- * a Proc object given by <code>&</code> argument.
+ * lambda, proc and Proc.new preserves the tricks of
+ * a Proc object given by & argument.
*
* lambda(&lambda {}).lambda? #=> true
* proc(&lambda {}).lambda? #=> true
@@ -172,13 +168,13 @@ proc_clone(VALUE self)
* proc(&proc {}).lambda? #=> false
* Proc.new(&proc {}).lambda? #=> false
*
- * A Proc object generated by <code>&</code> argument has the tricks
+ * A Proc object generated by & argument has the tricks
*
* def n(&b) b.lambda? end
* n {} #=> false
*
- * The <code>&</code> argument preserves the tricks if a Proc object
- * is given by <code>&</code> argument.
+ * The & argument preserves the tricks if a Proc object is given
+ * by & argument.
*
* n(&lambda {}) #=> true
* n(&proc {}) #=> false
@@ -192,18 +188,18 @@ proc_clone(VALUE self)
* n(&method(:m)) #=> true
* n(&method(:m).to_proc) #=> true
*
- * +define_method+ is treated the same as method definition.
+ * define_method is treated same as method definition.
* The defined method has no tricks.
*
* class C
* define_method(:d) {}
* end
- * C.new.d(1,2) #=> ArgumentError
+ * C.new.e(1,2) #=> ArgumentError
* C.new.method(:d).to_proc.lambda? #=> true
*
- * +define_method+ always defines a method without the tricks,
+ * define_method always defines a method without the tricks,
* even if a non-lambda Proc object is given.
- * This is the only exception for which the tricks are not preserved.
+ * This is the only exception which the tricks are not preserved.
*
* class C
* define_method(:e, &proc {})
@@ -211,19 +207,20 @@ proc_clone(VALUE self)
* C.new.e(1,2) #=> ArgumentError
* C.new.method(:e).to_proc.lambda? #=> true
*
- * This exception insures that methods never have tricks
- * and makes it easy to have wrappers to define methods that behave as usual.
+ * This exception is for a wrapper of define_method.
+ * It eases defining a method defining method which defines a usual method which has no tricks.
*
- * class C
- * def self.def2(name, &body)
+ * class << C
+ * def def2(name, &body)
* define_method(name, &body)
* end
- *
+ * end
+ * class C
* def2(:f) {}
* end
* C.new.f(1,2) #=> ArgumentError
*
- * The wrapper <i>def2</i> defines a method which has no tricks.
+ * The wrapper, def2, defines a method which has no tricks.
*
*/
@@ -245,7 +242,7 @@ binding_free(void *ptr)
RUBY_FREE_ENTER("binding");
if (ptr) {
bind = ptr;
- ruby_xfree(bind);
+ ruby_xfree(ptr);
}
RUBY_FREE_LEAVE("binding");
}
@@ -258,8 +255,7 @@ binding_mark(void *ptr)
if (ptr) {
bind = ptr;
RUBY_MARK_UNLESS_NULL(bind->env);
- RUBY_MARK_UNLESS_NULL(bind->path);
- RUBY_MARK_UNLESS_NULL(bind->blockprocval);
+ RUBY_MARK_UNLESS_NULL(bind->filename);
}
RUBY_MARK_LEAVE("binding");
}
@@ -272,15 +268,13 @@ binding_memsize(const void *ptr)
static const rb_data_type_t binding_data_type = {
"binding",
- {
- binding_mark,
- binding_free,
- binding_memsize,
- },
+ binding_mark,
+ binding_free,
+ binding_memsize,
};
-VALUE
-rb_binding_alloc(VALUE klass)
+static VALUE
+binding_alloc(VALUE klass)
{
VALUE obj;
rb_binding_t *bind;
@@ -292,14 +286,13 @@ rb_binding_alloc(VALUE klass)
static VALUE
binding_dup(VALUE self)
{
- VALUE bindval = rb_binding_alloc(rb_cBinding);
+ VALUE bindval = binding_alloc(rb_cBinding);
rb_binding_t *src, *dst;
GetBindingPtr(self, src);
GetBindingPtr(bindval, dst);
dst->env = src->env;
- dst->path = src->path;
- dst->blockprocval = src->blockprocval;
- dst->first_lineno = src->first_lineno;
+ dst->filename = src->filename;
+ dst->line_no = src->line_no;
return bindval;
}
@@ -313,16 +306,22 @@ binding_clone(VALUE self)
}
VALUE
-rb_binding_new_with_cfp(rb_thread_t *th, const rb_control_frame_t *src_cfp)
-{
- return rb_vm_make_binding(th, src_cfp);
-}
-
-VALUE
rb_binding_new(void)
{
rb_thread_t *th = GET_THREAD();
- return rb_binding_new_with_cfp(th, th->cfp);
+ rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
+ VALUE bindval = binding_alloc(rb_cBinding);
+ rb_binding_t *bind;
+
+ if (cfp == 0) {
+ rb_raise(rb_eRuntimeError, "Can't create Binding Object on top of Fiber.");
+ }
+
+ GetBindingPtr(bindval, bind);
+ bind->env = rb_vm_make_env_object(th, cfp);
+ bind->filename = cfp->iseq->filename;
+ bind->line_no = rb_vm_get_sourceline(cfp);
+ return bindval;
}
/*
@@ -332,12 +331,12 @@ rb_binding_new(void)
* 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. See also the description of class +Binding+.
+ * environment. Also see the description of class +Binding+.
*
- * def get_binding(param)
+ * def getBinding(param)
* return binding
* end
- * b = get_binding("hello")
+ * b = getBinding("hello")
* eval("param", b) #=> "hello"
*/
@@ -356,10 +355,10 @@ rb_f_binding(VALUE self)
* <em>lineno</em> parameters are present, they will be used when
* reporting syntax errors.
*
- * def get_binding(param)
+ * def getBinding(param)
* return binding
* end
- * b = get_binding("hello")
+ * b = getBinding("hello")
* b.eval("param") #=> "hello"
*/
@@ -381,13 +380,17 @@ proc_new(VALUE klass, int is_lambda)
rb_control_frame_t *cfp = th->cfp;
rb_block_t *block;
- if ((block = rb_vm_control_frame_block_ptr(cfp)) != 0) {
- /* block found */
+ if ((GC_GUARDED_PTR_REF(cfp->lfp[0])) != 0) {
+
+ block = GC_GUARDED_PTR_REF(cfp->lfp[0]);
}
else {
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
- if ((block = rb_vm_control_frame_block_ptr(cfp)) != 0) {
+ if ((GC_GUARDED_PTR_REF(cfp->lfp[0])) != 0) {
+
+ block = GC_GUARDED_PTR_REF(cfp->lfp[0]);
+
if (is_lambda) {
rb_warn("tried to create Proc object without a block");
}
@@ -460,14 +463,6 @@ rb_block_proc(void)
return proc_new(rb_cProc, FALSE);
}
-/*
- * call-seq:
- * lambda { |...| block } -> a_proc
- *
- * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
- * check the number of parameters passed when called.
- */
-
VALUE
rb_block_lambda(void)
{
@@ -481,16 +476,20 @@ rb_f_lambda(void)
return rb_block_lambda();
}
-/* Document-method: ===
- *
- * call-seq:
- * proc === obj -> result_of_proc
+/*
+ * call-seq:
+ * lambda { |...| block } -> a_proc
*
- * Invokes the block with +obj+ as the proc's parameter like Proc#call. It
- * is to allow a proc object to be a target of +when+ clause in a case
- * statement.
+ * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
+ * check the number of parameters passed when called.
*/
+static VALUE
+proc_lambda(void)
+{
+ return rb_block_lambda();
+}
+
/* CHECKME: are the argument checking semantics correct? */
/*
@@ -506,10 +505,10 @@ rb_f_lambda(void)
* to an array). Note that prc.() invokes prc.call() with the parameters
* given. It's a syntax sugar to hide "call".
*
- * For procs created using <code>lambda</code> or <code>->()</code> an error
- * is generated if the wrong number of parameters are passed to a Proc with
- * multiple parameters. For procs created using <code>Proc.new</code> or
- * <code>Kernel.proc</code>, extra parameters are silently discarded.
+ * 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>.
@@ -517,21 +516,27 @@ rb_f_lambda(void)
* 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 = lambda {|a,b| a}
+ * a_proc = Proc.new {|a,b| a}
* a_proc.call(1,2,3)
*
* <em>produces:</em>
*
- * prog.rb:4:in `block in <main>': wrong number of arguments (3 for 2) (ArgumentError)
- * from prog.rb:5:in `call'
- * from prog.rb:5:in `<main>'
+ * prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
+ * from prog.rb:4:in `call'
+ * from prog.rb:5
+ */
+
+/*
+ * call-seq:
+ * prc === obj -> result_of_proc
*
+ * Invokes the block, with <i>obj</i> as the block's parameter. It is
+ * to allow a proc object to be a target of +when+ clause in the case statement.
*/
static VALUE
proc_call(int argc, VALUE *argv, VALUE procval)
{
- VALUE vret;
rb_proc_t *proc;
rb_block_t *blockptr = 0;
rb_iseq_t *iseq;
@@ -548,9 +553,8 @@ proc_call(int argc, VALUE *argv, VALUE procval)
}
}
- vret = rb_vm_invoke_proc(GET_THREAD(), proc, argc, argv, blockptr);
- RB_GC_GUARD(procval);
- return vret;
+ return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
+ argc, argv, blockptr);
}
#if SIZEOF_LONG > SIZEOF_INT
@@ -570,20 +574,15 @@ check_argc(long argc)
VALUE
rb_proc_call(VALUE self, VALUE args)
{
- VALUE vret;
rb_proc_t *proc;
GetProcPtr(self, proc);
- vret = rb_vm_invoke_proc(GET_THREAD(), proc,
+ return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
check_argc(RARRAY_LEN(args)), RARRAY_PTR(args), 0);
- RB_GC_GUARD(self);
- RB_GC_GUARD(args);
- return vret;
}
VALUE
rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
{
- VALUE vret;
rb_proc_t *proc;
rb_block_t *block = 0;
GetProcPtr(self, proc);
@@ -594,10 +593,8 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
block = &pass_proc->block;
}
- vret = rb_vm_invoke_proc(GET_THREAD(), proc, argc, argv, block);
- RB_GC_GUARD(self);
- RB_GC_GUARD(pass_procval);
- return vret;
+ return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
+ argc, argv, block);
}
/*
@@ -611,25 +608,14 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
* arguments. A <code>proc</code> with no argument declarations
* is the same a block declaring <code>||</code> as its arguments.
*
- * proc {}.arity #=> 0
- * proc {||}.arity #=> 0
- * proc {|a|}.arity #=> 1
- * proc {|a,b|}.arity #=> 2
- * proc {|a,b,c|}.arity #=> 3
- * proc {|*a|}.arity #=> -1
- * proc {|a,*b|}.arity #=> -2
- * proc {|a,*b, c|}.arity #=> -3
- *
- * proc { |x = 0| }.arity #=> 0
- * lambda { |a = 0| }.arity #=> -1
- * proc { |x=0, y| }.arity #=> 0
- * lambda { |x=0, y| }.arity #=> -2
- * proc { |x=0, y=0| }.arity #=> 0
- * lambda { |x=0, y=0| }.arity #=> -1
- * proc { |x, y=0| }.arity #=> 1
- * lambda { |x, y=0| }.arity #=> -2
- * proc { |(x, y), z=0| }.arity #=> 1
- * lambda { |(x, y), z=0| }.arity #=> -2
+ * 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
+ * Proc.new {|a,*b, c|}.arity #=> -3
*/
static VALUE
@@ -639,23 +625,8 @@ proc_arity(VALUE self)
return INT2FIX(arity);
}
-static inline int
-rb_iseq_min_max_arity(const rb_iseq_t *iseq, int *max)
-{
- *max = iseq->arg_rest == -1 ?
- iseq->argc + iseq->arg_post_len + iseq->arg_opts - (iseq->arg_opts > 0)
- : UNLIMITED_ARGUMENTS;
- return iseq->argc + iseq->arg_post_len;
-}
-
-/*
- * Returns the number of required parameters and stores the maximum
- * number of parameters in max, or UNLIMITED_ARGUMENTS if no max.
- * For non-lambda procs, the maximum is the number of non-ignored
- * parameters even though there is no actual limit to the number of parameters
- */
-static int
-rb_proc_min_max_arity(VALUE self, int *max)
+int
+rb_proc_arity(VALUE self)
{
rb_proc_t *proc;
rb_iseq_t *iseq;
@@ -663,27 +634,22 @@ rb_proc_min_max_arity(VALUE self, int *max)
iseq = proc->block.iseq;
if (iseq) {
if (BUILTIN_TYPE(iseq) != T_NODE) {
- return rb_iseq_min_max_arity(iseq, max);
+ if (iseq->arg_rest < 0) {
+ return iseq->argc;
+ }
+ else {
+ return -(iseq->argc + 1 + iseq->arg_post_len);
+ }
}
else {
NODE *node = (NODE *)iseq;
if (IS_METHOD_PROC_NODE(node)) {
- /* e.g. method(:foo).to_proc.arity */
- return method_min_max_arity(node->nd_tval, max);
+ /* method(:foo).to_proc.arity */
+ return method_arity(node->nd_tval);
}
}
}
- *max = UNLIMITED_ARGUMENTS;
- return 0;
-}
-
-int
-rb_proc_arity(VALUE self)
-{
- rb_proc_t *proc;
- int max, min = rb_proc_min_max_arity(self, &max);
- GetProcPtr(self, proc);
- return (proc->is_lambda ? min == max : max != UNLIMITED_ARGUMENTS) ? min : -min-1;
+ return -1;
}
#define get_proc_iseq rb_proc_get_iseq
@@ -715,8 +681,8 @@ iseq_location(rb_iseq_t *iseq)
VALUE loc[2];
if (!iseq) return Qnil;
- loc[0] = iseq->location.path;
- if (iseq->line_info_table) {
+ loc[0] = iseq->filename;
+ if (iseq->insn_info_table) {
loc[1] = INT2FIX(rb_iseq_first_lineno(iseq));
}
else {
@@ -729,8 +695,8 @@ iseq_location(rb_iseq_t *iseq)
* call-seq:
* prc.source_location -> [String, Fixnum]
*
- * Returns the Ruby source filename and line number containing this proc
- * or +nil+ if this proc was not defined in Ruby (i.e. native)
+ * returns the ruby source filename and line number containing this proc
+ * or nil if this proc was not defined in ruby (i.e. native)
*/
VALUE
@@ -760,12 +726,12 @@ unnamed_parameters(int arity)
/*
* call-seq:
- * prc.parameters -> array
+ * proc.parameters -> array
*
- * Returns the parameter information of this proc.
+ * returns the parameter information of this proc.
*
- * prc = lambda{|x, y=42, *other|}
- * prc.parameters #=> [[:req, :x], [:opt, :y], [:rest, :other]]
+ * prc = lambda{|x, y=42, *rest|}
+ * prc.parameters #=> [[:req, :x], [:opt, :y], [:rest, :rest]]
*/
static VALUE
@@ -779,29 +745,53 @@ rb_proc_parameters(VALUE self)
return rb_iseq_parameters(iseq, is_proc);
}
-st_index_t
-rb_hash_proc(st_index_t hash, VALUE prc)
+/*
+ * 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(VALUE self, VALUE other)
{
- rb_proc_t *proc;
- GetProcPtr(prc, proc);
- hash = rb_hash_uint(hash, (st_index_t)proc->block.iseq);
- hash = rb_hash_uint(hash, (st_index_t)proc->envval);
- return rb_hash_uint(hash, (st_index_t)proc->block.ep >> 16);
+ if (self == other) {
+ return Qtrue;
+ }
+ else {
+ if (rb_obj_is_proc(other)) {
+ rb_proc_t *p1, *p2;
+ GetProcPtr(self, p1);
+ GetProcPtr(other, p2);
+ if (p1->envval == p2->envval &&
+ p1->block.iseq->iseq_size == p2->block.iseq->iseq_size &&
+ p1->block.iseq->local_size == p2->block.iseq->local_size &&
+ MEMCMP(p1->block.iseq->iseq, p2->block.iseq->iseq, VALUE,
+ p1->block.iseq->iseq_size) == 0) {
+ return Qtrue;
+ }
+ }
+ }
+ return Qfalse;
}
/*
* call-seq:
* prc.hash -> integer
*
- * Returns a hash value corresponding to proc body.
+ * Return hash value corresponding to proc body.
*/
static VALUE
proc_hash(VALUE self)
{
st_index_t hash;
- hash = rb_hash_start(0);
- hash = rb_hash_proc(hash, self);
+ rb_proc_t *proc;
+ GetProcPtr(self, proc);
+ hash = rb_hash_start((st_index_t)proc->block.iseq);
+ hash = rb_hash_uint(hash, (st_index_t)proc->envval);
+ hash = rb_hash_uint(hash, (st_index_t)proc->block.lfp >> 16);
hash = rb_hash_end(hash);
return LONG2FIX(hash);
}
@@ -810,7 +800,7 @@ proc_hash(VALUE self)
* call-seq:
* prc.to_s -> string
*
- * Returns the unique identifier for this proc, along with
+ * Shows the unique identifier for this proc, along with
* an indication of where the proc was defined.
*/
@@ -828,14 +818,14 @@ proc_to_s(VALUE self)
is_lambda = proc->is_lambda ? " (lambda)" : "";
if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
- int first_lineno = 0;
+ int line_no = 0;
- if (iseq->line_info_table) {
- first_lineno = rb_iseq_first_lineno(iseq);
+ if (iseq->insn_info_table) {
+ line_no = rb_iseq_first_lineno(iseq);
}
str = rb_sprintf("#<%s:%p@%s:%d%s>", cname, (void *)self,
- RSTRING_PTR(iseq->location.path),
- first_lineno, is_lambda);
+ RSTRING_PTR(iseq->filename),
+ line_no, is_lambda);
}
else {
str = rb_sprintf("#<%s:%p%s>", cname, (void *)proc->block.iseq,
@@ -867,21 +857,20 @@ static void
bm_mark(void *ptr)
{
struct METHOD *data = ptr;
- rb_gc_mark(data->defined_class);
rb_gc_mark(data->rclass);
rb_gc_mark(data->recv);
- if (data->me) rb_mark_method_entry(data->me);
+ rb_mark_method_entry(&data->me);
}
static void
bm_free(void *ptr)
{
struct METHOD *data = ptr;
- struct unlinked_method_entry_list_entry *ume = data->ume;
- data->me->mark = 0;
- ume->me = data->me;
- ume->next = GET_VM()->unlinked_method_entry_list;
- GET_VM()->unlinked_method_entry_list = ume;
+ rb_method_definition_t *def = data->me.def;
+ if (def->alias_count == 0)
+ xfree(def);
+ else if (def->alias_count > 0)
+ def->alias_count--;
xfree(ptr);
}
@@ -893,29 +882,22 @@ bm_memsize(const void *ptr)
static const rb_data_type_t method_data_type = {
"method",
- {
- bm_mark,
- bm_free,
- bm_memsize,
- },
+ bm_mark,
+ bm_free,
+ bm_memsize,
};
-VALUE
+static inline int
rb_obj_is_method(VALUE m)
{
- if (rb_typeddata_is_kind_of(m, &method_data_type)) {
- return Qtrue;
- }
- else {
- return Qfalse;
- }
+ return rb_typeddata_is_kind_of(m, &method_data_type);
}
static VALUE
mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
{
VALUE method;
- VALUE rclass = klass, defined_class;
+ VALUE rclass = klass;
ID rid = id;
struct METHOD *data;
rb_method_entry_t *me, meb;
@@ -923,9 +905,9 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
rb_method_flag_t flag = NOEX_UNDEF;
again:
- me = rb_method_entry_without_refinements(klass, id, &defined_class);
+ me = rb_method_entry(klass, id);
if (UNDEFINED_METHOD_ENTRY_P(me)) {
- ID rmiss = idRespond_to_missing;
+ ID rmiss = rb_intern("respond_to_missing?");
VALUE sym = ID2SYM(id);
if (obj != Qundef && !rb_method_basic_definition_p(klass, rmiss)) {
@@ -934,7 +916,6 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
def->type = VM_METHOD_TYPE_MISSING;
def->original_id = id;
def->alias_count = 0;
- defined_class = klass;
meb.flag = 0;
meb.mark = 0;
@@ -960,35 +941,36 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
}
rb_name_error(id, "method `%s' for %s `%s' is %s",
rb_id2name(id),
- (RB_TYPE_P(klass, T_MODULE)) ? "module" : "class",
+ (TYPE(klass) == T_MODULE) ? "module" : "class",
rb_class2name(klass),
v);
}
}
if (def && def->type == VM_METHOD_TYPE_ZSUPER) {
- klass = RCLASS_SUPER(defined_class);
+ klass = RCLASS_SUPER(me->klass);
id = def->original_id;
goto again;
}
- klass = defined_class;
+ klass = me->klass;
while (rclass != klass &&
- (FL_TEST(rclass, FL_SINGLETON) || RB_TYPE_P(rclass, T_ICLASS))) {
+ (FL_TEST(rclass, FL_SINGLETON) || TYPE(rclass) == T_ICLASS)) {
rclass = RCLASS_SUPER(rclass);
}
+ if (TYPE(klass) == T_ICLASS) {
+ klass = RBASIC(klass)->klass;
+ }
+
gen_method:
method = TypedData_Make_Struct(mclass, struct METHOD, &method_data_type, data);
data->recv = obj;
data->rclass = rclass;
- data->defined_class = defined_class;
data->id = rid;
- data->me = ALLOC(rb_method_entry_t);
- *data->me = *me;
- data->me->def->alias_count++;
- data->ume = ALLOC(struct unlinked_method_entry_list_entry);
+ data->me = *me;
+ if (def) def->alias_count++;
OBJ_INFECT(method, klass);
@@ -1025,14 +1007,14 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
* meth == other_meth -> true or false
*
* Two method objects are equal if they are bound to the same
- * object and refer to the same method definition and their owners are the
- * same class or module.
+ * object and refer to the same method definition.
*/
static VALUE
method_eq(VALUE method, VALUE other)
{
struct METHOD *m1, *m2;
+ extern int rb_method_entry_eq(rb_method_entry_t *m1, rb_method_entry_t *m2);
if (!rb_obj_is_method(other))
return Qfalse;
@@ -1043,7 +1025,7 @@ method_eq(VALUE method, VALUE other)
m1 = (struct METHOD *)DATA_PTR(method);
m2 = (struct METHOD *)DATA_PTR(other);
- if (!rb_method_entry_eq(m1->me, m2->me) ||
+ if (!rb_method_entry_eq(&m1->me, &m2->me) ||
m1->rclass != m2->rclass ||
m1->recv != m2->recv) {
return Qfalse;
@@ -1056,7 +1038,7 @@ method_eq(VALUE method, VALUE other)
* call-seq:
* meth.hash -> integer
*
- * Returns a hash value corresponding to the method object.
+ * Return a hash value corresponding to the method object.
*/
static VALUE
@@ -1068,7 +1050,7 @@ method_hash(VALUE method)
TypedData_Get_Struct(method, struct METHOD, &method_data_type, m);
hash = rb_hash_start((st_index_t)m->rclass);
hash = rb_hash_uint(hash, (st_index_t)m->recv);
- hash = rb_hash_method_entry(hash, m->me);
+ hash = rb_hash_uint(hash, (st_index_t)m->me.def);
hash = rb_hash_end(hash);
return INT2FIX(hash);
@@ -1078,7 +1060,7 @@ method_hash(VALUE method)
* call-seq:
* meth.unbind -> unbound_method
*
- * Dissociates <i>meth</i> from its current receiver. The resulting
+ * 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>).
*/
@@ -1094,12 +1076,9 @@ method_unbind(VALUE obj)
&method_data_type, data);
data->recv = Qundef;
data->id = orig->id;
- data->me = ALLOC(rb_method_entry_t);
- *data->me = *orig->me;
- if (orig->me->def) orig->me->def->alias_count++;
+ data->me = orig->me;
+ if (orig->me.def) orig->me.def->alias_count++;
data->rclass = orig->rclass;
- data->defined_class = orig->defined_class;
- data->ume = ALLOC(struct unlinked_method_entry_list_entry);
OBJ_INFECT(method, obj);
return method;
@@ -1148,39 +1127,9 @@ static VALUE
method_owner(VALUE obj)
{
struct METHOD *data;
- VALUE defined_class;
TypedData_Get_Struct(obj, struct METHOD, &method_data_type, data);
- defined_class = data->defined_class;
-
- if (RB_TYPE_P(defined_class, T_ICLASS)) {
- defined_class = RBASIC(defined_class)->klass;
- }
-
- return defined_class;
-}
-
-void
-rb_method_name_error(VALUE klass, VALUE str)
-{
- const char *s0 = " class";
- VALUE c = klass;
-
- if (FL_TEST(c, FL_SINGLETON)) {
- VALUE obj = rb_ivar_get(klass, attached);
-
- switch (TYPE(obj)) {
- case T_MODULE:
- case T_CLASS:
- c = obj;
- s0 = "";
- }
- }
- else if (RB_TYPE_P(c, T_MODULE)) {
- s0 = " module";
- }
- rb_name_error_str(str, "undefined method `%"PRIsVALUE"' for%s `%"PRIsVALUE"'",
- QUOTE(str), s0, rb_class_name(c));
+ return data->me.klass;
}
/*
@@ -1214,11 +1163,7 @@ rb_method_name_error(VALUE klass, VALUE str)
VALUE
rb_obj_method(VALUE obj, VALUE vid)
{
- ID id = rb_check_id(&vid);
- if (!id) {
- rb_method_name_error(CLASS_OF(obj), vid);
- }
- return mnew(CLASS_OF(obj), obj, id, rb_cMethod, FALSE);
+ return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod, FALSE);
}
/*
@@ -1231,11 +1176,7 @@ rb_obj_method(VALUE obj, VALUE vid)
VALUE
rb_obj_public_method(VALUE obj, VALUE vid)
{
- ID id = rb_check_id(&vid);
- if (!id) {
- rb_method_name_error(CLASS_OF(obj), vid);
- }
- return mnew(CLASS_OF(obj), obj, id, rb_cMethod, TRUE);
+ return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod, TRUE);
}
/*
@@ -1272,11 +1213,7 @@ rb_obj_public_method(VALUE obj, VALUE vid)
static VALUE
rb_mod_instance_method(VALUE mod, VALUE vid)
{
- ID id = rb_check_id(&vid);
- if (!id) {
- rb_method_name_error(mod, vid);
- }
- return mnew(mod, Qundef, id, rb_cUnboundMethod, FALSE);
+ return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod, FALSE);
}
/*
@@ -1289,11 +1226,7 @@ rb_mod_instance_method(VALUE mod, VALUE vid)
static VALUE
rb_mod_public_instance_method(VALUE mod, VALUE vid)
{
- ID id = rb_check_id(&vid);
- if (!id) {
- rb_method_name_error(mod, vid);
- }
- return mnew(mod, Qundef, id, rb_cUnboundMethod, TRUE);
+ return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod, TRUE);
}
/*
@@ -1344,8 +1277,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
id = rb_to_id(argv[0]);
body = rb_block_lambda();
}
- else {
- rb_check_arity(argc, 1, 2);
+ else if (argc == 2) {
id = rb_to_id(argv[0]);
body = argv[1];
if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
@@ -1354,12 +1286,14 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
rb_obj_classname(body));
}
}
+ else {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+ }
if (rb_obj_is_method(body)) {
struct METHOD *method = (struct METHOD *)DATA_PTR(body);
VALUE rclass = method->rclass;
- if (rclass != mod && !RB_TYPE_P(rclass, T_MODULE) &&
- !RTEST(rb_class_inherited_p(mod, rclass))) {
+ if (rclass != mod && !RTEST(rb_class_inherited_p(mod, rclass))) {
if (FL_TEST(rclass, FL_SINGLETON)) {
rb_raise(rb_eTypeError,
"can't bind singleton method to a different class");
@@ -1370,8 +1304,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
rb_class2name(rclass));
}
}
- rb_method_entry_set(mod, id, method->me, noex);
- RB_GC_GUARD(body);
+ rb_method_entry_set(mod, id, &method->me, noex);
}
else if (rb_obj_is_proc(body)) {
rb_proc_t *proc;
@@ -1382,7 +1315,6 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
proc->block.iseq->klass = mod;
proc->is_lambda = TRUE;
proc->is_from_method = TRUE;
- proc->block.klass = mod;
}
rb_add_method(mod, id, VM_METHOD_TYPE_BMETHOD, (void *)body, noex);
}
@@ -1428,45 +1360,9 @@ rb_obj_define_method(int argc, VALUE *argv, VALUE obj)
return rb_mod_define_method(argc, argv, klass);
}
-/*
- * define_method(symbol, method) -> new_method
- * define_method(symbol) { block } -> proc
- *
- * Defines a global function by _method_ or the block.
- */
-
-static VALUE
-top_define_method(int argc, VALUE *argv, VALUE obj)
-{
- rb_thread_t *th = GET_THREAD();
- VALUE klass;
-
- rb_secure(4);
- klass = th->top_wrapper;
- if (klass) {
- rb_warning("main.define_method in the wrapped load is effective only in wrapper module");
- }
- else {
- klass = rb_cObject;
- }
- return rb_mod_define_method(argc, argv, klass);
-}
/*
- * call-seq:
- * method.clone -> new_method
- *
- * Returns a clone of this method.
- *
- * class A
- * def foo
- * return "bar"
- * end
- * end
- *
- * m = A.new.method(:foo)
- * m.call # => "bar"
- * n = m.clone.call # => "bar"
+ * MISSING: documentation
*/
static VALUE
@@ -1479,10 +1375,7 @@ method_clone(VALUE self)
clone = TypedData_Make_Struct(CLASS_OF(self), struct METHOD, &method_data_type, data);
CLONESETUP(clone, self);
*data = *orig;
- data->me = ALLOC(rb_method_entry_t);
- *data->me = *orig->me;
- if (data->me->def) data->me->def->alias_count++;
- data->ume = ALLOC(struct unlinked_method_entry_list_entry);
+ if (data->me.def) data->me.def->alias_count++;
return clone;
}
@@ -1503,13 +1396,6 @@ method_clone(VALUE self)
VALUE
rb_method_call(int argc, VALUE *argv, VALUE method)
{
- VALUE proc = rb_block_given_p() ? rb_block_proc() : Qnil;
- return rb_method_call_with_block(argc, argv, method, proc);
-}
-
-VALUE
-rb_method_call_with_block(int argc, VALUE *argv, VALUE method, VALUE pass_procval)
-{
VALUE result = Qnil; /* OK */
struct METHOD *data;
int state;
@@ -1521,27 +1407,18 @@ rb_method_call_with_block(int argc, VALUE *argv, VALUE method, VALUE pass_procva
}
PUSH_TAG();
if (OBJ_TAINTED(method)) {
- const int safe_level_to_run = 4 /*SAFE_LEVEL_MAX*/;
safe = rb_safe_level();
- if (rb_safe_level() < safe_level_to_run) {
- rb_set_safe_level_force(safe_level_to_run);
+ if (rb_safe_level() < 4) {
+ rb_set_safe_level_force(4);
}
}
if ((state = EXEC_TAG()) == 0) {
rb_thread_t *th = GET_THREAD();
- rb_block_t *block = 0;
- VALUE defined_class;
-
- if (!NIL_P(pass_procval)) {
- rb_proc_t *pass_proc;
- GetProcPtr(pass_procval, pass_proc);
- block = &pass_proc->block;
- }
+ VALUE rb_vm_call(rb_thread_t *th, VALUE recv, VALUE id, int argc, const VALUE *argv,
+ const rb_method_entry_t *me);
- th->passed_block = block;
- defined_class = data->defined_class;
- if (BUILTIN_TYPE(defined_class) == T_MODULE) defined_class = data->rclass;
- result = rb_vm_call(th, data->recv, data->id, argc, argv, data->me, defined_class);
+ PASS_PASSED_BLOCK_TH(th);
+ result = rb_vm_call(th, data->recv, data->id, argc, argv, &data->me);
}
POP_TAG();
if (safe >= 0)
@@ -1646,104 +1523,71 @@ static VALUE
umethod_bind(VALUE method, VALUE recv)
{
struct METHOD *data, *bound;
- VALUE methclass;
- VALUE rclass;
TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
- methclass = data->rclass;
- if (!RB_TYPE_P(methclass, T_MODULE) &&
- methclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, methclass)) {
- if (FL_TEST(methclass, FL_SINGLETON)) {
+ if (data->rclass != CLASS_OF(recv) && !rb_obj_is_kind_of(recv, data->rclass)) {
+ if (FL_TEST(data->rclass, FL_SINGLETON)) {
rb_raise(rb_eTypeError,
"singleton method called for a different object");
}
else {
rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
- rb_class2name(methclass));
+ rb_class2name(data->rclass));
}
}
method = TypedData_Make_Struct(rb_cMethod, struct METHOD, &method_data_type, bound);
*bound = *data;
- bound->me = ALLOC(rb_method_entry_t);
- *bound->me = *data->me;
- if (bound->me->def) bound->me->def->alias_count++;
- rclass = CLASS_OF(recv);
- if (BUILTIN_TYPE(bound->defined_class) == T_MODULE) {
- VALUE ic = rb_class_search_ancestor(rclass, bound->defined_class);
- if (ic) {
- rclass = ic;
- }
- else {
- rclass = rb_include_class_new(methclass, rclass);
- }
- }
+ if (bound->me.def) bound->me.def->alias_count++;
bound->recv = recv;
- bound->rclass = rclass;
- data->ume = ALLOC(struct unlinked_method_entry_list_entry);
+ bound->rclass = CLASS_OF(recv);
return method;
}
-/*
- * Returns the number of required parameters and stores the maximum
- * number of parameters in max, or UNLIMITED_ARGUMENTS
- * if there is no maximum.
- */
-static int
-rb_method_entry_min_max_arity(const rb_method_entry_t *me, int *max)
+int
+rb_method_entry_arity(const rb_method_entry_t *me)
{
const rb_method_definition_t *def = me->def;
- if (!def) return *max = 0;
+ if (!def) return 0;
switch (def->type) {
case VM_METHOD_TYPE_CFUNC:
- if (def->body.cfunc.argc < 0) {
- *max = UNLIMITED_ARGUMENTS;
- return 0;
- }
- return *max = check_argc(def->body.cfunc.argc);
+ if (def->body.cfunc.argc < 0)
+ return -1;
+ return check_argc(def->body.cfunc.argc);
case VM_METHOD_TYPE_ZSUPER:
- *max = UNLIMITED_ARGUMENTS;
- return 0;
+ return -1;
case VM_METHOD_TYPE_ATTRSET:
- return *max = 1;
+ return 1;
case VM_METHOD_TYPE_IVAR:
- return *max = 0;
+ return 0;
case VM_METHOD_TYPE_BMETHOD:
- return rb_proc_min_max_arity(def->body.proc, max);
+ return rb_proc_arity(def->body.proc);
case VM_METHOD_TYPE_ISEQ: {
rb_iseq_t *iseq = def->body.iseq;
- return rb_iseq_min_max_arity(iseq, max);
+ if (iseq->arg_rest == -1 && iseq->arg_opts == 0) {
+ return iseq->argc;
+ }
+ else {
+ return -(iseq->argc + 1 + iseq->arg_post_len);
+ }
}
case VM_METHOD_TYPE_UNDEF:
case VM_METHOD_TYPE_NOTIMPLEMENTED:
- return *max = 0;
- case VM_METHOD_TYPE_MISSING:
- *max = UNLIMITED_ARGUMENTS;
return 0;
+ case VM_METHOD_TYPE_MISSING:
+ return -1;
case VM_METHOD_TYPE_OPTIMIZED: {
switch (def->body.optimize_type) {
case OPTIMIZED_METHOD_TYPE_SEND:
- *max = UNLIMITED_ARGUMENTS;
- return 0;
+ return -1;
default:
break;
}
}
- case VM_METHOD_TYPE_REFINED:
- *max = UNLIMITED_ARGUMENTS;
- return 0;
}
- rb_bug("rb_method_entry_min_max_arity: invalid method entry type (%d)", def->type);
- UNREACHABLE;
-}
-
-int
-rb_method_entry_arity(const rb_method_entry_t *me)
-{
- int max, min = rb_method_entry_min_max_arity(me, &max);
- return min == max ? min : -min-1;
+ rb_bug("rb_method_entry_arity: invalid method entry type (%d)", def->type);
}
/*
@@ -1792,38 +1636,13 @@ method_arity(VALUE method)
struct METHOD *data;
TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
- return rb_method_entry_arity(data->me);
-}
-
-static rb_method_entry_t *
-original_method_entry(VALUE mod, ID id)
-{
- VALUE rclass;
- rb_method_entry_t *me;
- while ((me = rb_method_entry(mod, id, &rclass)) != 0) {
- rb_method_definition_t *def = me->def;
- if (!def) break;
- if (def->type != VM_METHOD_TYPE_ZSUPER) break;
- mod = RCLASS_SUPER(rclass);
- id = def->original_id;
- }
- return me;
-}
-
-static int
-method_min_max_arity(VALUE method, int *max)
-{
- struct METHOD *data;
-
- TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
- return rb_method_entry_min_max_arity(data->me, max);
+ return rb_method_entry_arity(&data->me);
}
int
rb_mod_method_arity(VALUE mod, ID id)
{
- rb_method_entry_t *me = original_method_entry(mod, id);
- if (!me) return 0; /* should raise? */
+ rb_method_entry_t *me = rb_method_entry(mod, id);
return rb_method_entry_arity(me);
}
@@ -1839,7 +1658,7 @@ method_get_def(VALUE method)
struct METHOD *data;
TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
- return data->me->def;
+ return data->me.def;
}
static rb_iseq_t *
@@ -1861,57 +1680,31 @@ rb_method_get_iseq(VALUE method)
return method_get_iseq(method_get_def(method));
}
-static VALUE
-method_def_location(rb_method_definition_t *def)
-{
- if (def->type == VM_METHOD_TYPE_ATTRSET || def->type == VM_METHOD_TYPE_IVAR) {
- if (!def->body.attr.location)
- return Qnil;
- return rb_ary_dup(def->body.attr.location);
- }
- return iseq_location(method_get_iseq(def));
-}
-
-VALUE
-rb_method_entry_location(rb_method_entry_t *me)
-{
- if (!me || !me->def) return Qnil;
- return method_def_location(me->def);
-}
-
-VALUE
-rb_mod_method_location(VALUE mod, ID id)
-{
- rb_method_entry_t *me = original_method_entry(mod, id);
- return rb_method_entry_location(me);
-}
-
-VALUE
-rb_obj_method_location(VALUE obj, ID id)
-{
- return rb_mod_method_location(CLASS_OF(obj), id);
-}
-
/*
* call-seq:
* meth.source_location -> [String, Fixnum]
*
- * Returns the Ruby source filename and line number containing this method
- * or nil if this method was not defined in Ruby (i.e. native)
+ * returns the ruby source filename and line number containing this method
+ * or nil if this method was not defined in ruby (i.e. native)
*/
VALUE
rb_method_location(VALUE method)
{
rb_method_definition_t *def = method_get_def(method);
- return method_def_location(def);
+ if (def->type == VM_METHOD_TYPE_ATTRSET || def->type == VM_METHOD_TYPE_IVAR) {
+ if (!def->body.attr.location)
+ return Qnil;
+ return rb_ary_dup(def->body.attr.location);
+ }
+ return iseq_location(method_get_iseq(def));
}
/*
* call-seq:
* meth.parameters -> array
*
- * Returns the parameter information of this method.
+ * returns the parameter information of this method
*/
static VALUE
@@ -1929,7 +1722,7 @@ rb_method_parameters(VALUE method)
* meth.to_s -> string
* meth.inspect -> string
*
- * Returns the name of the underlying method.
+ * Show the name of the underlying method.
*
* "cat".method(:count).inspect #=> "#<Method: String#count>"
*/
@@ -1948,11 +1741,11 @@ method_inspect(VALUE method)
rb_str_buf_cat2(str, s);
rb_str_buf_cat2(str, ": ");
- if (FL_TEST(data->me->klass, FL_SINGLETON)) {
- VALUE v = rb_ivar_get(data->me->klass, attached);
+ if (FL_TEST(data->me.klass, FL_SINGLETON)) {
+ VALUE v = rb_iv_get(data->me.klass, "__attached__");
if (data->recv == Qundef) {
- rb_str_buf_append(str, rb_inspect(data->me->klass));
+ rb_str_buf_append(str, rb_inspect(data->me.klass));
}
else if (data->recv == v) {
rb_str_buf_append(str, rb_inspect(v));
@@ -1968,15 +1761,15 @@ method_inspect(VALUE method)
}
else {
rb_str_buf_cat2(str, rb_class2name(data->rclass));
- if (data->rclass != data->me->klass) {
+ if (data->rclass != data->me.klass) {
rb_str_buf_cat2(str, "(");
- rb_str_buf_cat2(str, rb_class2name(data->me->klass));
+ rb_str_buf_cat2(str, rb_class2name(data->me.klass));
rb_str_buf_cat2(str, ")");
}
}
rb_str_buf_cat2(str, sharp);
- rb_str_append(str, rb_id2str(data->me->def->original_id));
- if (data->me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) {
+ rb_str_append(str, rb_id2str(data->me.def->original_id));
+ if (data->me.def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) {
rb_str_buf_cat2(str, " (not-implemented)");
}
rb_str_buf_cat2(str, ">");
@@ -1987,20 +1780,21 @@ method_inspect(VALUE method)
static VALUE
mproc(VALUE method)
{
- return rb_funcall2(rb_mRubyVMFrozenCore, idProc, 0, 0);
+ return rb_funcall(Qnil, rb_intern("proc"), 0);
}
static VALUE
mlambda(VALUE method)
{
- return rb_funcall(rb_mRubyVMFrozenCore, idLambda, 0, 0);
+ return rb_funcall(Qnil, rb_intern("lambda"), 0);
}
static VALUE
-bmcall(VALUE args, VALUE method, int argc, VALUE *argv, VALUE passed_proc)
+bmcall(VALUE args, VALUE method)
{
volatile VALUE a;
VALUE ret;
+ int argc;
if (CLASS_OF(args) != rb_cArray) {
args = rb_ary_new3(1, args);
@@ -2009,7 +1803,7 @@ bmcall(VALUE args, VALUE method, int argc, VALUE *argv, VALUE passed_proc)
else {
argc = check_argc(RARRAY_LEN(args));
}
- ret = rb_method_call_with_block(argc, RARRAY_PTR(args), method, passed_proc);
+ ret = rb_method_call(argc, RARRAY_PTR(args), method);
RB_GC_GUARD(a) = args;
return ret;
}
@@ -2034,10 +1828,7 @@ static VALUE
method_proc(VALUE method)
{
VALUE procval;
- struct METHOD *meth;
rb_proc_t *proc;
- rb_env_t *env;
-
/*
* class Method
* def to_proc
@@ -2047,16 +1838,9 @@ method_proc(VALUE method)
* end
* end
*/
- TypedData_Get_Struct(method, struct METHOD, &method_data_type, meth);
procval = rb_iterate(mlambda, 0, bmcall, method);
GetProcPtr(procval, proc);
proc->is_from_method = 1;
- proc->block.self = meth->recv;
- proc->block.klass = meth->defined_class;
- GetEnvPtr(proc->envval, env);
- env->block.self = meth->recv;
- env->block.klass = meth->defined_class;
- env->block.iseq = method_get_iseq(meth->me->def);
return procval;
}
@@ -2109,23 +1893,22 @@ proc_binding(VALUE self)
rb_binding_t *bind;
GetProcPtr(self, proc);
- if (RB_TYPE_P((VALUE)proc->block.iseq, T_NODE)) {
+ if (TYPE(proc->block.iseq) == T_NODE) {
if (!IS_METHOD_PROC_NODE((NODE *)proc->block.iseq)) {
rb_raise(rb_eArgError, "Can't create Binding from C level Proc");
}
}
- bindval = rb_binding_alloc(rb_cBinding);
+ bindval = binding_alloc(rb_cBinding);
GetBindingPtr(bindval, bind);
bind->env = proc->envval;
- bind->blockprocval = proc->blockprocval;
if (RUBY_VM_NORMAL_ISEQ_P(proc->block.iseq)) {
- bind->path = proc->block.iseq->location.path;
- bind->first_lineno = rb_iseq_first_lineno(proc->block.iseq);
+ bind->filename = proc->block.iseq->filename;
+ bind->line_no = rb_iseq_first_lineno(proc->block.iseq);
}
else {
- bind->path = Qnil;
- bind->first_lineno = 0;
+ bind->filename = Qnil;
+ bind->line_no = 0;
}
return bindval;
}
@@ -2218,17 +2001,22 @@ curry(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc)
static VALUE
proc_curry(int argc, VALUE *argv, VALUE self)
{
- int sarity, max_arity, min_arity = rb_proc_min_max_arity(self, &max_arity);
- VALUE arity;
+ int sarity, marity = rb_proc_arity(self);
+ VALUE arity, opt = Qfalse;
+
+ if (marity < 0) {
+ marity = -marity - 1;
+ opt = Qtrue;
+ }
rb_scan_args(argc, argv, "01", &arity);
if (NIL_P(arity)) {
- arity = INT2FIX(min_arity);
+ arity = INT2FIX(marity);
}
else {
sarity = FIX2INT(arity);
- if (rb_proc_lambda_p(self)) {
- rb_check_arity(sarity, min_arity, max_arity);
+ if (rb_proc_lambda_p(self) && (sarity < marity || (sarity > marity && !opt))) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", sarity, marity);
}
}
@@ -2323,9 +2111,10 @@ Init_Proc(void)
rb_define_method(rb_cProc, "arity", proc_arity, 0);
rb_define_method(rb_cProc, "clone", proc_clone, 0);
rb_define_method(rb_cProc, "dup", proc_dup, 0);
+ rb_define_method(rb_cProc, "==", proc_eq, 1);
+ rb_define_method(rb_cProc, "eql?", proc_eq, 1);
rb_define_method(rb_cProc, "hash", proc_hash, 0);
rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
- rb_define_alias(rb_cProc, "inspect", "to_s");
rb_define_method(rb_cProc, "lambda?", rb_proc_lambda_p, 0);
rb_define_method(rb_cProc, "binding", proc_binding, 0);
rb_define_method(rb_cProc, "curry", proc_curry, -1);
@@ -2344,7 +2133,7 @@ Init_Proc(void)
/* utility functions */
rb_define_global_function("proc", rb_block_proc, 0);
- rb_define_global_function("lambda", rb_block_lambda, 0);
+ rb_define_global_function("lambda", proc_lambda, 0);
/* Method */
rb_cMethod = rb_define_class("Method", rb_cObject);
@@ -2393,9 +2182,6 @@ Init_Proc(void)
/* Kernel */
rb_define_method(rb_mKernel, "define_singleton_method", rb_obj_define_method, -1);
-
- rb_define_private_method(rb_singleton_class(rb_vm_top_self()),
- "define_method", top_define_method, -1);
}
/*
@@ -2415,15 +2201,15 @@ Init_Proc(void)
* def initialize(n)
* @secret = n
* end
- * def get_binding
+ * def getBinding
* return binding()
* end
* end
*
* k1 = Demo.new(99)
- * b1 = k1.get_binding
+ * b1 = k1.getBinding
* k2 = Demo.new(-3)
- * b2 = k2.get_binding
+ * b2 = k2.getBinding
*
* eval("@secret", b1) #=> 99
* eval("@secret", b2) #=> -3
@@ -2443,6 +2229,5 @@ Init_Binding(void)
rb_define_method(rb_cBinding, "dup", binding_dup, 0);
rb_define_method(rb_cBinding, "eval", bind_eval, -1);
rb_define_global_function("binding", rb_f_binding, 0);
- attached = rb_intern("__attached__");
}
diff --git a/process.c b/process.c
index 458c862f4f..c1804922e1 100644
--- a/process.c
+++ b/process.c
@@ -13,9 +13,7 @@
#include "ruby/ruby.h"
#include "ruby/io.h"
-#include "ruby/thread.h"
#include "ruby/util.h"
-#include "internal.h"
#include "vm_core.h"
#include <stdio.h>
@@ -30,9 +28,6 @@
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#ifdef HAVE_PROCESS_H
-#include <process.h>
-#endif
#include <time.h>
#include <ctype.h>
@@ -44,6 +39,8 @@
#define EXIT_FAILURE 1
#endif
+struct timeval rb_time_interval(VALUE);
+
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
@@ -63,31 +60,15 @@
#endif
#include <sys/stat.h>
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/stat.h"
-# include "nacl/unistd.h"
-#endif
-
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
#ifdef HAVE_GRP_H
#include <grp.h>
#endif
-#define numberof(array) (int)(sizeof(array)/sizeof((array)[0]))
-
-/* define system APIs */
-#ifdef _WIN32
-#undef open
-#define open rb_w32_uopen
-#endif
-
#if defined(HAVE_TIMES) || defined(_WIN32)
static VALUE rb_cProcessTms;
#endif
@@ -111,6 +92,10 @@ static VALUE rb_cProcessTms;
#define WSTOPSIG WEXITSTATUS
#endif
+#if defined(__APPLE__) && ( defined(__MACH__) || defined(__DARWIN__) ) && !defined(__MacOS_X__)
+#define __MacOS_X__ 1
+#endif
+
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
#define HAVE_44BSD_SETUID 1
#define HAVE_44BSD_SETGID 1
@@ -123,14 +108,12 @@ static VALUE rb_cProcessTms;
#ifdef BROKEN_SETREUID
#define setreuid ruby_setreuid
-int setreuid(rb_uid_t ruid, rb_uid_t euid);
#endif
#ifdef BROKEN_SETREGID
#define setregid ruby_setregid
-int setregid(rb_gid_t rgid, rb_gid_t egid);
#endif
-#if defined(HAVE_44BSD_SETUID) || defined(__APPLE__)
+#if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__)
#if !defined(USE_SETREUID) && !defined(BROKEN_SETREUID)
#define OBSOLETE_SETREUID 1
#endif
@@ -139,97 +122,20 @@ int setregid(rb_gid_t rgid, rb_gid_t egid);
#endif
#endif
-#define preserving_errno(stmts) \
- do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
-
-static void check_uid_switch(void);
-static void check_gid_switch(void);
-
-#if 1
-#define p_uid_from_name p_uid_from_name
-#define p_gid_from_name p_gid_from_name
+#if SIZEOF_RLIM_T == SIZEOF_INT
+# define RLIM2NUM(v) UINT2NUM(v)
+# define NUM2RLIM(v) NUM2UINT(v)
+#elif SIZEOF_RLIM_T == SIZEOF_LONG
+# define RLIM2NUM(v) ULONG2NUM(v)
+# define NUM2RLIM(v) NUM2ULONG(v)
+#elif SIZEOF_RLIM_T == SIZEOF_LONG_LONG
+# define RLIM2NUM(v) ULL2NUM(v)
+# define NUM2RLIM(v) NUM2ULL(v)
#endif
-#if defined(HAVE_PWD_H)
-# if defined(HAVE_GETPWNAM_R) && defined(_SC_GETPW_R_SIZE_MAX)
-# define USE_GETPWNAM_R 1
-# define GETPW_R_SIZE_INIT sysconf(_SC_GETPW_R_SIZE_MAX)
-# define GETPW_R_SIZE_DEFAULT 0x1000
-# define GETPW_R_SIZE_LIMIT 0x10000
-# endif
-# ifdef USE_GETPWNAM_R
-# define PREPARE_GETPWNAM \
- VALUE getpw_buf = 0
-# define FINISH_GETPWNAM \
- ALLOCV_END(getpw_buf)
-# define OBJ2UID1(id) obj2uid((id), &getpw_buf)
-# define OBJ2UID(id) obj2uid0(id)
-static rb_uid_t obj2uid(VALUE id, VALUE *getpw_buf);
-static inline rb_uid_t
-obj2uid0(VALUE id)
-{
- rb_uid_t uid;
- PREPARE_GETPWNAM;
- uid = OBJ2UID1(id);
- FINISH_GETPWNAM;
- return uid;
-}
-# else
-# define PREPARE_GETPWNAM /* do nothing */
-# define FINISH_GETPWNAM /* do nothing */
-# define OBJ2UID(id) obj2uid((id))
-static rb_uid_t obj2uid(VALUE id);
-# endif
-#else
-# define PREPARE_GETPWNAM /* do nothing */
-# define FINISH_GETPWNAM /* do nothing */
-# define OBJ2UID(id) NUM2UIDT(id)
-# ifdef p_uid_from_name
-# undef p_uid_from_name
-# define p_uid_from_name rb_f_notimplement
-# endif
-#endif
+#define preserving_errno(stmts) \
+ do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
-#if defined(HAVE_GRP_H)
-# if defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
-# define USE_GETGRNAM_R
-# define GETGR_R_SIZE_INIT sysconf(_SC_GETGR_R_SIZE_MAX)
-# define GETGR_R_SIZE_DEFAULT 0x1000
-# define GETGR_R_SIZE_LIMIT 0x10000
-# endif
-# ifdef USE_GETGRNAM_R
-# define PREPARE_GETGRNAM \
- VALUE getgr_buf = 0
-# define FINISH_GETGRNAM \
- ALLOCV_END(getgr_buf)
-# define OBJ2GID1(id) obj2gid((id), &getgr_buf)
-# define OBJ2GID(id) obj2gid0(id)
-static rb_gid_t obj2gid(VALUE id, VALUE *getgr_buf);
-static inline rb_gid_t
-obj2gid0(VALUE id)
-{
- rb_gid_t gid;
- PREPARE_GETGRNAM;
- gid = OBJ2GID1(id);
- FINISH_GETGRNAM;
- return gid;
-}
-static rb_gid_t obj2gid(VALUE id, VALUE *getgr_buf);
-# else
-# define PREPARE_GETGRNAM /* do nothing */
-# define FINISH_GETGRNAM /* do nothing */
-# define OBJ2GID(id) obj2gid((id))
-static rb_gid_t obj2gid(VALUE id);
-# endif
-#else
-# define PREPARE_GETGRNAM /* do nothing */
-# define FINISH_GETGRNAM /* do nothing */
-# define OBJ2GID(id) NUM2GIDT(id)
-# ifdef p_gid_from_name
-# undef p_gid_from_name
-# define p_gid_from_name rb_f_notimplement
-# endif
-#endif
/*
* call-seq:
@@ -320,7 +226,7 @@ rb_last_status_set(int status, rb_pid_t pid)
rb_iv_set(th->last_status, "pid", PIDT2NUM(pid));
}
-void
+static void
rb_last_status_clear(void)
{
GET_THREAD()->last_status = Qnil;
@@ -404,10 +310,6 @@ pst_message(VALUE str, rb_pid_t pid, int status)
* stat.to_s -> string
*
* Show pid and exit status as a string.
- *
- * system("false")
- * p $?.to_s #=> "pid 12766 exit 1"
- *
*/
static VALUE
@@ -431,10 +333,6 @@ pst_to_s(VALUE st)
* stat.inspect -> string
*
* Override the inspection method.
- *
- * system("false")
- * p $?.inspect #=> "#<Process::Status: pid 12861 exit 1>"
- *
*/
static VALUE
@@ -723,7 +621,7 @@ struct waitpid_arg {
};
#endif
-static void *
+static VALUE
rb_waitpid_blocking(void *data)
{
rb_pid_t result;
@@ -739,7 +637,7 @@ rb_waitpid_blocking(void *data)
result = wait4(arg->pid, arg->st, arg->flags, NULL);
#endif
- return (void *)(VALUE)result;
+ return (VALUE)result;
}
rb_pid_t
@@ -753,11 +651,11 @@ rb_waitpid(rb_pid_t pid, int *st, int flags)
arg.pid = pid;
arg.st = st;
arg.flags = flags;
- result = (rb_pid_t)(VALUE)rb_thread_call_without_gvl(rb_waitpid_blocking, &arg,
- RUBY_UBF_PROCESS, 0);
+ result = (rb_pid_t)rb_thread_blocking_region(rb_waitpid_blocking, &arg,
+ RUBY_UBF_PROCESS, 0);
if (result < 0) {
if (errno == EINTR) {
- RUBY_VM_CHECK_INTS(GET_THREAD());
+ RUBY_VM_CHECK_INTS();
goto retry;
}
return (rb_pid_t)-1;
@@ -786,8 +684,8 @@ rb_waitpid(rb_pid_t pid, int *st, int flags)
}
for (;;) {
- result = (rb_pid_t)(VALUE)rb_thread_blocking_region(rb_waitpid_blocking,
- st, RUBY_UBF_PROCESS, 0);
+ result = (rb_pid_t)rb_thread_blocking_region(rb_waitpid_blocking,
+ st, RUBY_UBF_PROCESS, 0);
if (result < 0) {
if (errno == EINTR) {
rb_thread_schedule();
@@ -853,8 +751,8 @@ rb_waitpid(rb_pid_t pid, int *st, int flags)
* haven't been reported). Not all flags are available on all
* platforms, but a flag value of zero will work on all platforms.
*
- * Calling this method raises a SystemCallError if there are no child
- * processes. Not available on all platforms.
+ * Calling this method raises a <code>SystemError</code> if there are
+ * no child processes. Not available on all platforms.
*
* include Process
* fork { exit 99 } #=> 27429
@@ -906,7 +804,8 @@ proc_wait(int argc, VALUE *argv)
* Waits for a child process to exit (see Process::waitpid for exact
* semantics) and returns an array containing the process id and the
* exit status (a <code>Process::Status</code> object) of that
- * child. Raises a SystemCallError if there are no child processes.
+ * child. Raises a <code>SystemError</code> if there are no child
+ * processes.
*
* Process.fork { exit 99 } #=> 27437
* pid, status = Process.wait2
@@ -938,9 +837,9 @@ proc_wait2(int argc, VALUE *argv)
*
* <em>produces</em>:
*
- * [[30982, #<Process::Status: pid 30982 exit 0>],
- * [30979, #<Process::Status: pid 30979 exit 1>],
- * [30976, #<Process::Status: pid 30976 exit 2>]]
+ * [[27434, #<Process::Status: pid=27434,exited(0)>],
+ * [27433, #<Process::Status: pid=27433,exited(1)>],
+ * [27432, #<Process::Status: pid=27432,exited(2)>]]
*/
static VALUE
@@ -1075,83 +974,22 @@ proc_detach(VALUE obj, VALUE pid)
return rb_detach_process(NUM2PIDT(pid));
}
-static int forked_child = 0;
-
-#ifdef SIGPIPE
-static RETSIGTYPE (*saved_sigpipe_handler)(int) = 0;
-#endif
-
-#ifdef SIGPIPE
-static RETSIGTYPE
-sig_do_nothing(int sig)
-{
-}
-#endif
-
-/* This function should be async-signal-safe. Actually it is. */
-static void
-before_exec_async_signal_safe(void)
-{
-#ifdef SIGPIPE
- /*
- * Some OS commands don't initialize signal handler properly. Thus we have
- * to reset signal handler before exec(). Otherwise, system() and similar
- * child process interaction might fail. (e.g. ruby -e "system 'yes | ls'")
- * [ruby-dev:12261]
- */
- saved_sigpipe_handler = signal(SIGPIPE, sig_do_nothing); /* async-signal-safe */
-#endif
-}
-
-static void
-before_exec_non_async_signal_safe(void)
-{
- if (!forked_child) {
- /*
- * On Mac OS X 10.5.x (Leopard) or earlier, exec() may return ENOTSUPP
- * if the process have multiple threads. Therefore we have to kill
- * internal threads temporary. [ruby-core:10583]
- * This is also true on Haiku. It returns Errno::EPERM against exec()
- * in multiple threads.
- */
- rb_thread_stop_timer_thread(0);
- }
-}
-
-static void
-before_exec(void)
-{
- before_exec_non_async_signal_safe();
- before_exec_async_signal_safe();
-}
-
-/* This function should be async-signal-safe. Actually it is. */
-static void
-after_exec_async_signal_safe(void)
-{
-#ifdef SIGPIPE
- signal(SIGPIPE, saved_sigpipe_handler); /* async-signal-safe */
+#ifndef HAVE_STRING_H
+char *strtok();
#endif
-}
-
-static void
-after_exec_non_async_signal_safe(void)
-{
- rb_thread_reset_timer_thread();
- rb_thread_start_timer_thread();
- forked_child = 0;
-}
+void rb_thread_stop_timer_thread(void);
+void rb_thread_start_timer_thread(void);
+void rb_thread_reset_timer_thread(void);
-static void
-after_exec(void)
-{
- after_exec_async_signal_safe();
- after_exec_non_async_signal_safe();
-}
+static int forked_child = 0;
+#define before_exec() \
+ (rb_enable_interrupt(), (forked_child ? 0 : (rb_thread_stop_timer_thread(), 1)))
+#define after_exec() \
+ (rb_thread_reset_timer_thread(), rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt())
#define before_fork() before_exec()
-#define after_fork() (rb_threadptr_pending_interrupt_clear(GET_THREAD()), after_exec())
+#define after_fork() (GET_THREAD()->thrown_errinfo = 0, after_exec())
#include "dln.h"
@@ -1165,61 +1003,35 @@ security(const char *str)
}
}
-#if defined(HAVE_FORK) && !defined(__native_client__)
-
-/* try_with_sh and exec_with_sh should be async-signal-safe. Actually it is.*/
-#define try_with_sh(prog, argv, envp) ((saved_errno == ENOEXEC) ? exec_with_sh((prog), (argv), (envp)) : (void)0)
-static void
-exec_with_sh(const char *prog, char **argv, char **envp)
-{
- *argv = (char *)prog;
- *--argv = (char *)"sh";
- if (envp)
- execve("/bin/sh", argv, envp); /* async-signal-safe */
- else
- execv("/bin/sh", argv); /* async-signal-safe */
-}
-
-#else
-#define try_with_sh(prog, argv, envp) (void)0
-#endif
-
-/* This function should be async-signal-safe. Actually it is. */
static int
-proc_exec_cmd(const char *prog, VALUE argv_str, VALUE envp_str)
+proc_exec_v(char **argv, const char *prog)
{
-#ifdef __native_client__
- rb_notimplement();
- UNREACHABLE;
-#else
- char **argv;
- char **envp;
-# if defined(__EMX__) || defined(OS2)
- char **new_argv = NULL;
-# endif
-
- argv = ARGVSTR2ARGV(argv_str);
+ char fbuf[MAXPATHLEN];
+ if (!prog)
+ prog = argv[0];
+ prog = dln_find_exe_r(prog, 0, fbuf, sizeof(fbuf));
if (!prog) {
errno = ENOENT;
return -1;
}
-# if defined(__EMX__) || defined(OS2)
+#if defined(__EMX__) || defined(OS2)
{
-# define COMMAND "cmd.exe"
+#define COMMAND "cmd.exe"
char *extension;
if ((extension = strrchr(prog, '.')) != NULL && STRCASECMP(extension, ".bat") == 0) {
+ char **new_argv;
char *p;
int n;
for (n = 0; argv[n]; n++)
/* no-op */;
- new_argv = ALLOC_N(char*, n + 2);
+ new_argv = ALLOCA_N(char*, n + 2);
for (; n > 0; n--)
new_argv[n + 1] = argv[n];
- new_argv[1] = strcpy(ALLOC_N(char, strlen(argv[0]) + 1), argv[0]);
+ new_argv[1] = strcpy(ALLOCA_N(char, strlen(argv[0]) + 1), argv[0]);
for (p = new_argv[1]; *p != '\0'; p++)
if (*p == '/')
*p = '\\';
@@ -1232,188 +1044,105 @@ proc_exec_cmd(const char *prog, VALUE argv_str, VALUE envp_str)
}
}
}
-# endif /* __EMX__ */
- envp = envp_str ? (char **)RSTRING_PTR(envp_str) : NULL;
- if (envp_str)
- execve(prog, argv, envp); /* async-signal-safe */
- else
- execv(prog, argv); /* async-signal-safe */
- preserving_errno(try_with_sh(prog, argv, envp)); /* try_with_sh() is async-signal-safe. */
-# if defined(__EMX__) || defined(OS2)
- if (new_argv) {
- xfree(new_argv[0]);
- xfree(new_argv);
- }
-# endif
- return -1;
-#endif
-}
-
-/* deprecated */
-static int
-proc_exec_v(char **argv, const char *prog)
-{
- char fbuf[MAXPATHLEN];
-
- if (!prog)
- prog = argv[0];
- prog = dln_find_exe_r(prog, 0, fbuf, sizeof(fbuf));
- if (!prog) {
- errno = ENOENT;
- return -1;
- }
+#endif /* __EMX__ */
before_exec();
execv(prog, argv);
- preserving_errno(try_with_sh(prog, argv, 0); after_exec());
+ preserving_errno(after_exec());
return -1;
}
-/* deprecated */
int
rb_proc_exec_n(int argc, VALUE *argv, const char *prog)
{
-#define ARGV_COUNT(n) ((n)+1)
-#define ARGV_SIZE(n) (sizeof(char*) * ARGV_COUNT(n))
-#define ALLOC_ARGV(n, v) ALLOCV_N(char*, (v), ARGV_COUNT(n))
-
char **args;
int i;
- int ret = -1;
- VALUE v;
- args = ALLOC_ARGV(argc+1, v);
+ args = ALLOCA_N(char*, argc+1);
for (i=0; i<argc; i++) {
args[i] = RSTRING_PTR(argv[i]);
}
args[i] = 0;
if (args[0]) {
- ret = proc_exec_v(args, prog);
+ return proc_exec_v(args, prog);
}
- ALLOCV_END(v);
- return ret;
-
-#undef ARGV_COUNT
-#undef ARGV_SIZE
-#undef ALLOC_ARGV
+ return -1;
}
-/* This function should be async-signal-safe. Actually it is. */
-static int
-proc_exec_sh(const char *str, VALUE envp_str)
+int
+rb_proc_exec(const char *str)
{
-#ifdef __native_client__
- rb_notimplement();
- UNREACHABLE;
-#else
- const char *s;
-
- s = str;
- while (*s == ' ' || *s == '\t' || *s == '\n')
- s++;
+#ifndef _WIN32
+ const char *s = str;
+ char *ss, *t;
+ char **argv, **a;
+#endif
- if (!*s) {
- errno = ENOENT;
- return -1;
- }
+ while (*str && ISSPACE(*str))
+ str++;
#ifdef _WIN32
+ before_exec();
rb_w32_spawn(P_OVERLAY, (char *)str, 0);
- return -1;
+ after_exec();
#else
+ for (s=str; *s; s++) {
+ if (ISSPACE(*s)) {
+ const char *p, *nl = NULL;
+ for (p = s; ISSPACE(*p); p++) {
+ if (*p == '\n') nl = p;
+ }
+ if (!*p) break;
+ if (nl) s = nl;
+ }
+ if (*s != ' ' && !ISALPHA(*s) && strchr("*?{}[]<>()~&|\\$;'`\"\n",*s)) {
#if defined(__CYGWIN32__) || defined(__EMX__)
- {
- char fbuf[MAXPATHLEN];
- char *shell = dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf));
- int status = -1;
- if (shell)
- execl(shell, "sh", "-c", str, (char *) NULL);
- else
- status = system(str);
- if (status != -1)
- exit(status);
- }
+ char fbuf[MAXPATHLEN];
+ char *shell = dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf));
+ int status = -1;
+ before_exec();
+ if (shell)
+ execl(shell, "sh", "-c", str, (char *) NULL);
+ else
+ status = system(str);
+ after_exec();
+ if (status != -1)
+ exit(status);
#else
- if (envp_str)
- execle("/bin/sh", "sh", "-c", str, (char *)NULL, (char **)RSTRING_PTR(envp_str)); /* async-signal-safe */
- else
- execl("/bin/sh", "sh", "-c", str, (char *)NULL); /* async-signal-safe */
+ before_exec();
+ execl("/bin/sh", "sh", "-c", str, (char *)NULL);
+ preserving_errno(after_exec());
#endif
- return -1;
+ return -1;
+ }
+ }
+ a = argv = ALLOCA_N(char*, (s-str)/2+2);
+ ss = ALLOCA_N(char, s-str+1);
+ memcpy(ss, str, s-str);
+ ss[s-str] = '\0';
+ if ((*a++ = strtok(ss, " \t")) != 0) {
+ while ((t = strtok(NULL, " \t")) != 0) {
+ *a++ = t;
+ }
+ *a = NULL;
+ }
+ if (argv[0]) {
+ return proc_exec_v(argv, 0);
+ }
+ errno = ENOENT;
#endif /* _WIN32 */
-#endif
-}
-
-int
-rb_proc_exec(const char *str)
-{
- int ret;
- before_exec();
- ret = proc_exec_sh(str, Qfalse);
- preserving_errno(after_exec());
- return ret;
-}
-
-static void
-mark_exec_arg(void *ptr)
-{
- struct rb_execarg *eargp = ptr;
- if (eargp->use_shell)
- rb_gc_mark(eargp->invoke.sh.shell_script);
- else {
- rb_gc_mark(eargp->invoke.cmd.command_name);
- rb_gc_mark(eargp->invoke.cmd.command_abspath);
- rb_gc_mark(eargp->invoke.cmd.argv_str);
- rb_gc_mark(eargp->invoke.cmd.argv_buf);
- }
- rb_gc_mark(eargp->redirect_fds);
- rb_gc_mark(eargp->envp_str);
- rb_gc_mark(eargp->envp_buf);
- rb_gc_mark(eargp->dup2_tmpbuf);
- rb_gc_mark(eargp->rlimit_limits);
- rb_gc_mark(eargp->fd_dup2);
- rb_gc_mark(eargp->fd_close);
- rb_gc_mark(eargp->fd_open);
- rb_gc_mark(eargp->fd_dup2_child);
- rb_gc_mark(eargp->env_modification);
- rb_gc_mark(eargp->chdir_dir);
-}
-
-static void
-free_exec_arg(void *ptr)
-{
- xfree(ptr);
-}
-
-static size_t
-memsize_exec_arg(const void *ptr)
-{
- return ptr ? sizeof(struct rb_execarg) : 0;
+ return -1;
}
-static const rb_data_type_t exec_arg_data_type = {
- "exec_arg",
- {mark_exec_arg, free_exec_arg, memsize_exec_arg},
-};
-
#if defined(_WIN32)
#define HAVE_SPAWNV 1
#endif
#if !defined(HAVE_FORK) && defined(HAVE_SPAWNV)
-# define USE_SPAWNV 1
-#else
-# define USE_SPAWNV 0
-#endif
-#ifndef P_NOWAIT
-# define P_NOWAIT _P_NOWAIT
-#endif
-
-#if USE_SPAWNV
#if defined(_WIN32)
-#define proc_spawn_cmd_internal(argv, prog) rb_w32_aspawn(P_NOWAIT, (prog), (argv))
+#define proc_spawn_v(argv, prog) rb_w32_aspawn(P_NOWAIT, prog, argv)
#else
static rb_pid_t
-proc_spawn_cmd_internal(char **argv, char *prog)
+proc_spawn_v(char **argv, char *prog)
{
char fbuf[MAXPATHLEN];
rb_pid_t status;
@@ -1426,53 +1155,59 @@ proc_spawn_cmd_internal(char **argv, char *prog)
return -1;
before_exec();
- status = spawnv(P_NOWAIT, prog, (const char **)argv);
- if (status == -1 && errno == ENOEXEC) {
- *argv = (char *)prog;
- *--argv = (char *)"sh";
- status = spawnv(P_NOWAIT, "/bin/sh", (const char **)argv);
- after_exec();
- if (status == -1) errno = ENOEXEC;
- }
+ status = spawnv(P_WAIT, prog, argv);
rb_last_status_set(status == -1 ? 127 : status, 0);
+ after_exec();
return status;
}
#endif
static rb_pid_t
-proc_spawn_cmd(char **argv, VALUE prog, struct rb_execarg *eargp)
+proc_spawn_n(int argc, VALUE *argv, VALUE prog)
{
- rb_pid_t pid = -1;
+ char **args;
+ int i;
- if (argv[0]) {
-#if defined(_WIN32)
- DWORD flags = 0;
- if (eargp->new_pgroup_given && eargp->new_pgroup_flag) {
- flags = CREATE_NEW_PROCESS_GROUP;
- }
- pid = rb_w32_aspawn_flags(P_NOWAIT, prog ? RSTRING_PTR(prog) : 0, argv, flags);
-#else
- pid = proc_spawn_cmd_internal(argv, prog ? RSTRING_PTR(prog) : 0);
-#endif
+ args = ALLOCA_N(char*, argc + 1);
+ for (i = 0; i < argc; i++) {
+ args[i] = RSTRING_PTR(argv[i]);
}
- return pid;
+ args[i] = (char*) 0;
+ if (args[0])
+ return proc_spawn_v(args, prog ? RSTRING_PTR(prog) : 0);
+ return -1;
}
#if defined(_WIN32)
-#define proc_spawn_sh(str) rb_w32_spawn(P_NOWAIT, (str), 0)
+#define proc_spawn(str) rb_w32_spawn(P_NOWAIT, str, 0)
#else
static rb_pid_t
-proc_spawn_sh(char *str)
+proc_spawn(char *str)
{
char fbuf[MAXPATHLEN];
+ char *s, *t;
+ char **argv, **a;
rb_pid_t status;
- char *shell = dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf));
- before_exec();
- status = spawnl(P_NOWAIT, (shell ? shell : "/bin/sh"), "sh", "-c", str, (char*)NULL);
- rb_last_status_set(status == -1 ? 127 : status, 0);
- after_exec();
- return status;
+ for (s = str; *s; s++) {
+ if (*s != ' ' && !ISALPHA(*s) && strchr("*?{}[]<>()~&|\\$;'`\"\n",*s)) {
+ char *shell = dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf));
+ before_exec();
+ status = shell?spawnl(P_WAIT,shell,"sh","-c",str,(char*)NULL):system(str);
+ rb_last_status_set(status == -1 ? 127 : status, 0);
+ after_exec();
+ return status;
+ }
+ }
+ a = argv = ALLOCA_N(char*, (s - str) / 2 + 2);
+ s = ALLOCA_N(char, s - str + 1);
+ strcpy(s, str);
+ if (*a++ = strtok(s, " \t")) {
+ while (t = strtok(NULL, " \t"))
+ *a++ = t;
+ *a = NULL;
+ }
+ return argv[0] ? proc_spawn_v(argv, 0) : -1;
}
#endif
#endif
@@ -1484,8 +1219,22 @@ hide_obj(VALUE obj)
return obj;
}
+enum {
+ EXEC_OPTION_PGROUP,
+ EXEC_OPTION_RLIMIT,
+ EXEC_OPTION_UNSETENV_OTHERS,
+ EXEC_OPTION_ENV,
+ EXEC_OPTION_CHDIR,
+ EXEC_OPTION_UMASK,
+ EXEC_OPTION_DUP2,
+ EXEC_OPTION_CLOSE,
+ EXEC_OPTION_OPEN,
+ EXEC_OPTION_DUP2_CHILD,
+ EXEC_OPTION_CLOSE_OTHERS
+};
+
static VALUE
-check_exec_redirect_fd(VALUE v, int iskey)
+check_exec_redirect_fd(VALUE v)
{
VALUE tmp;
int fd;
@@ -1517,62 +1266,35 @@ check_exec_redirect_fd(VALUE v, int iskey)
wrong:
rb_raise(rb_eArgError, "negative file descriptor");
}
-#ifdef _WIN32
- else if (fd >= 3 && iskey) {
- rb_raise(rb_eArgError, "wrong file descriptor (%d)", fd);
- }
-#endif
return INT2FIX(fd);
}
-static VALUE
-check_exec_redirect1(VALUE ary, VALUE key, VALUE param)
-{
- if (ary == Qfalse) {
- ary = hide_obj(rb_ary_new());
- }
- if (!RB_TYPE_P(key, T_ARRAY)) {
- VALUE fd = check_exec_redirect_fd(key, !NIL_P(param));
- rb_ary_push(ary, hide_obj(rb_assoc_new(fd, param)));
- }
- else {
- int i, n=0;
- for (i = 0 ; i < RARRAY_LEN(key); i++) {
- VALUE v = RARRAY_PTR(key)[i];
- VALUE fd = check_exec_redirect_fd(v, !NIL_P(param));
- rb_ary_push(ary, hide_obj(rb_assoc_new(fd, param)));
- n++;
- }
- }
- return ary;
-}
-
static void
-check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
+check_exec_redirect(VALUE key, VALUE val, VALUE options)
{
- VALUE param;
+ int index;
+ VALUE ary, param;
VALUE path, flags, perm;
- VALUE tmp;
ID id;
switch (TYPE(val)) {
case T_SYMBOL:
id = SYM2ID(val);
if (id == rb_intern("close")) {
+ index = EXEC_OPTION_CLOSE;
param = Qnil;
- eargp->fd_close = check_exec_redirect1(eargp->fd_close, key, param);
}
else if (id == rb_intern("in")) {
+ index = EXEC_OPTION_DUP2;
param = INT2FIX(0);
- eargp->fd_dup2 = check_exec_redirect1(eargp->fd_dup2, key, param);
}
else if (id == rb_intern("out")) {
+ index = EXEC_OPTION_DUP2;
param = INT2FIX(1);
- eargp->fd_dup2 = check_exec_redirect1(eargp->fd_dup2, key, param);
}
else if (id == rb_intern("err")) {
+ index = EXEC_OPTION_DUP2;
param = INT2FIX(2);
- eargp->fd_dup2 = check_exec_redirect1(eargp->fd_dup2, key, param);
}
else {
rb_raise(rb_eArgError, "wrong exec redirect symbol: %s",
@@ -1581,27 +1303,27 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
break;
case T_FILE:
- io:
- val = check_exec_redirect_fd(val, 0);
+ val = check_exec_redirect_fd(val);
/* fall through */
case T_FIXNUM:
+ index = EXEC_OPTION_DUP2;
param = val;
- eargp->fd_dup2 = check_exec_redirect1(eargp->fd_dup2, key, param);
break;
case T_ARRAY:
path = rb_ary_entry(val, 0);
if (RARRAY_LEN(val) == 2 && SYMBOL_P(path) &&
SYM2ID(path) == rb_intern("child")) {
- param = check_exec_redirect_fd(rb_ary_entry(val, 1), 0);
- eargp->fd_dup2_child = check_exec_redirect1(eargp->fd_dup2_child, key, param);
+ index = EXEC_OPTION_DUP2_CHILD;
+ param = check_exec_redirect_fd(rb_ary_entry(val, 1));
}
else {
+ index = EXEC_OPTION_OPEN;
FilePathValue(path);
flags = rb_ary_entry(val, 1);
if (NIL_P(flags))
flags = INT2NUM(O_RDONLY);
- else if (RB_TYPE_P(flags, T_STRING))
+ else if (TYPE(flags) == T_STRING)
flags = INT2NUM(rb_io_modestr_oflags(StringValueCStr(flags)));
else
flags = rb_to_int(flags);
@@ -1609,15 +1331,15 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
perm = NIL_P(perm) ? INT2FIX(0644) : rb_to_int(perm);
param = hide_obj(rb_ary_new3(3, hide_obj(rb_str_dup(path)),
flags, perm));
- eargp->fd_open = check_exec_redirect1(eargp->fd_open, key, param);
}
break;
case T_STRING:
+ index = EXEC_OPTION_OPEN;
path = val;
FilePathValue(path);
- if (RB_TYPE_P(key, T_FILE))
- key = check_exec_redirect_fd(key, 1);
+ if (TYPE(key) == T_FILE)
+ key = check_exec_redirect_fd(key);
if (FIXNUM_P(key) && (FIX2INT(key) == 1 || FIX2INT(key) == 2))
flags = INT2NUM(O_WRONLY|O_CREAT|O_TRUNC);
else
@@ -1625,29 +1347,42 @@ check_exec_redirect(VALUE key, VALUE val, struct rb_execarg *eargp)
perm = INT2FIX(0644);
param = hide_obj(rb_ary_new3(3, hide_obj(rb_str_dup(path)),
flags, perm));
- eargp->fd_open = check_exec_redirect1(eargp->fd_open, key, param);
break;
default:
- tmp = val;
- val = rb_io_check_io(tmp);
- if (!NIL_P(val)) goto io;
rb_raise(rb_eArgError, "wrong exec redirect action");
}
+ ary = rb_ary_entry(options, index);
+ if (NIL_P(ary)) {
+ ary = hide_obj(rb_ary_new());
+ rb_ary_store(options, index, ary);
+ }
+ if (TYPE(key) != T_ARRAY) {
+ VALUE fd = check_exec_redirect_fd(key);
+ rb_ary_push(ary, hide_obj(rb_assoc_new(fd, param)));
+ }
+ else {
+ int i, n=0;
+ for (i = 0 ; i < RARRAY_LEN(key); i++) {
+ VALUE v = RARRAY_PTR(key)[i];
+ VALUE fd = check_exec_redirect_fd(v);
+ rb_ary_push(ary, hide_obj(rb_assoc_new(fd, param)));
+ n++;
+ }
+ }
}
-#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+#ifdef RLIM2NUM
static int rlimit_type_by_lname(const char *name);
#endif
int
-rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
+rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val)
{
- struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
-
+ VALUE options = e->options;
ID id;
-#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+#ifdef RLIM2NUM
int rtype;
#endif
@@ -1658,44 +1393,33 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
id = SYM2ID(key);
#ifdef HAVE_SETPGID
if (id == rb_intern("pgroup")) {
- pid_t pgroup;
- if (eargp->pgroup_given) {
+ if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_PGROUP))) {
rb_raise(rb_eArgError, "pgroup option specified twice");
}
if (!RTEST(val))
- pgroup = -1; /* asis(-1) means "don't call setpgid()". */
+ val = Qfalse;
else if (val == Qtrue)
- pgroup = 0; /* new process group. */
+ val = INT2FIX(0);
else {
- pgroup = NUM2PIDT(val);
+ pid_t pgroup = NUM2PIDT(val);
if (pgroup < 0) {
rb_raise(rb_eArgError, "negative process group ID : %ld", (long)pgroup);
}
+ val = PIDT2NUM(pgroup);
}
- eargp->pgroup_given = 1;
- eargp->pgroup_pgid = pgroup;
- }
- else
-#endif
-#ifdef _WIN32
- if (id == rb_intern("new_pgroup")) {
- if (eargp->new_pgroup_given) {
- rb_raise(rb_eArgError, "new_pgroup option specified twice");
- }
- eargp->new_pgroup_given = 1;
- eargp->new_pgroup_flag = RTEST(val) ? 1 : 0;
+ rb_ary_store(options, EXEC_OPTION_PGROUP, val);
}
else
#endif
-#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+#ifdef RLIM2NUM
if (strncmp("rlimit_", rb_id2name(id), 7) == 0 &&
(rtype = rlimit_type_by_lname(rb_id2name(id)+7)) != -1) {
- VALUE ary = eargp->rlimit_limits;
+ VALUE ary = rb_ary_entry(options, EXEC_OPTION_RLIMIT);
VALUE tmp, softlim, hardlim;
- if (eargp->rlimit_limits == Qfalse)
- ary = eargp->rlimit_limits = hide_obj(rb_ary_new());
- else
- ary = eargp->rlimit_limits;
+ if (NIL_P(ary)) {
+ ary = hide_obj(rb_ary_new());
+ rb_ary_store(options, EXEC_OPTION_RLIMIT, ary);
+ }
tmp = rb_check_array_type(val);
if (!NIL_P(tmp)) {
if (RARRAY_LEN(tmp) == 1)
@@ -1717,34 +1441,33 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
else
#endif
if (id == rb_intern("unsetenv_others")) {
- if (eargp->unsetenv_others_given) {
+ if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS))) {
rb_raise(rb_eArgError, "unsetenv_others option specified twice");
}
- eargp->unsetenv_others_given = 1;
- eargp->unsetenv_others_do = RTEST(val) ? 1 : 0;
+ val = RTEST(val) ? Qtrue : Qfalse;
+ rb_ary_store(options, EXEC_OPTION_UNSETENV_OTHERS, val);
}
else if (id == rb_intern("chdir")) {
- if (eargp->chdir_given) {
+ if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_CHDIR))) {
rb_raise(rb_eArgError, "chdir option specified twice");
}
FilePathValue(val);
- eargp->chdir_given = 1;
- eargp->chdir_dir = hide_obj(rb_str_dup(val));
+ rb_ary_store(options, EXEC_OPTION_CHDIR,
+ hide_obj(rb_str_dup(val)));
}
else if (id == rb_intern("umask")) {
- mode_t cmask = NUM2MODET(val);
- if (eargp->umask_given) {
+ mode_t cmask = NUM2LONG(val);
+ if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_UMASK))) {
rb_raise(rb_eArgError, "umask option specified twice");
}
- eargp->umask_given = 1;
- eargp->umask_mask = cmask;
+ rb_ary_store(options, EXEC_OPTION_UMASK, LONG2NUM(cmask));
}
else if (id == rb_intern("close_others")) {
- if (eargp->close_others_given) {
+ if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS))) {
rb_raise(rb_eArgError, "close_others option specified twice");
}
- eargp->close_others_given = 1;
- eargp->close_others_do = RTEST(val) ? 1 : 0;
+ val = RTEST(val) ? Qtrue : Qfalse;
+ rb_ary_store(options, EXEC_OPTION_CLOSE_OTHERS, val);
}
else if (id == rb_intern("in")) {
key = INT2FIX(0);
@@ -1758,38 +1481,9 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
key = INT2FIX(2);
goto redirect;
}
- else if (id == rb_intern("uid")) {
-#ifdef HAVE_SETUID
- if (eargp->uid_given) {
- rb_raise(rb_eArgError, "uid option specified twice");
- }
- check_uid_switch();
- {
- eargp->uid = OBJ2UID(val);
- eargp->uid_given = 1;
- }
-#else
- rb_raise(rb_eNotImpError,
- "uid option is unimplemented on this machine");
-#endif
- }
- else if (id == rb_intern("gid")) {
-#ifdef HAVE_SETGID
- if (eargp->gid_given) {
- rb_raise(rb_eArgError, "gid option specified twice");
- }
- check_gid_switch();
- {
- eargp->gid = OBJ2GID(val);
- eargp->gid_given = 1;
- }
-#else
- rb_raise(rb_eNotImpError,
- "gid option is unimplemented on this machine");
-#endif
- }
else {
- return ST_STOP;
+ rb_raise(rb_eArgError, "wrong exec option symbol: %s",
+ rb_id2name(id));
}
break;
@@ -1797,98 +1491,61 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
case T_FILE:
case T_ARRAY:
redirect:
- check_exec_redirect(key, val, eargp);
+ check_exec_redirect(key, val, options);
break;
default:
- return ST_STOP;
+ rb_raise(rb_eArgError, "wrong exec option");
}
- RB_GC_GUARD(execarg_obj);
return ST_CONTINUE;
}
-int
-rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val)
-{
- return rb_execarg_addopt(e->execarg_obj, key, val);
-}
-
static int
check_exec_options_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
{
VALUE key = (VALUE)st_key;
VALUE val = (VALUE)st_val;
- VALUE execarg_obj = (VALUE)arg;
- if (rb_execarg_addopt(execarg_obj, key, val) != ST_CONTINUE) {
- if (SYMBOL_P(key))
- rb_raise(rb_eArgError, "wrong exec option symbol: %"PRIsVALUE,
- key);
- rb_raise(rb_eArgError, "wrong exec option");
- }
- return ST_CONTINUE;
+ struct rb_exec_arg *e = (struct rb_exec_arg *)arg;
+ return rb_exec_arg_addopt(e, key, val);
}
-static int
-check_exec_options_i_extract(st_data_t st_key, st_data_t st_val, st_data_t arg)
-{
- VALUE key = (VALUE)st_key;
- VALUE val = (VALUE)st_val;
- VALUE *args = (VALUE *)arg;
- VALUE execarg_obj = args[0];
- if (rb_execarg_addopt(execarg_obj, key, val) != ST_CONTINUE) {
- VALUE nonopts = args[1];
- if (NIL_P(nonopts)) args[1] = nonopts = rb_hash_new();
- rb_hash_aset(nonopts, key, val);
- }
- return ST_CONTINUE;
-}
-
-static int
-check_exec_fds_1(struct rb_execarg *eargp, VALUE h, int maxhint, VALUE ary)
+static VALUE
+check_exec_fds(VALUE options)
{
- long i;
+ VALUE h = rb_hash_new();
+ VALUE ary;
+ int index, i;
+ int maxhint = -1;
- if (ary != Qfalse) {
+ for (index = EXEC_OPTION_DUP2; index <= EXEC_OPTION_DUP2_CHILD; index++) {
+ ary = rb_ary_entry(options, index);
+ if (NIL_P(ary))
+ continue;
for (i = 0; i < RARRAY_LEN(ary); i++) {
VALUE elt = RARRAY_PTR(ary)[i];
int fd = FIX2INT(RARRAY_PTR(elt)[0]);
if (RTEST(rb_hash_lookup(h, INT2FIX(fd)))) {
rb_raise(rb_eArgError, "fd %d specified twice", fd);
}
- if (ary == eargp->fd_open || ary == eargp->fd_dup2)
+ if (index == EXEC_OPTION_OPEN || index == EXEC_OPTION_DUP2)
rb_hash_aset(h, INT2FIX(fd), Qtrue);
- else if (ary == eargp->fd_dup2_child)
+ else if (index == EXEC_OPTION_DUP2_CHILD)
rb_hash_aset(h, INT2FIX(fd), RARRAY_PTR(elt)[1]);
- else /* ary == eargp->fd_close */
+ else /* index == EXEC_OPTION_CLOSE */
rb_hash_aset(h, INT2FIX(fd), INT2FIX(-1));
if (maxhint < fd)
maxhint = fd;
- if (ary == eargp->fd_dup2 || ary == eargp->fd_dup2_child) {
+ if (index == EXEC_OPTION_DUP2 || index == EXEC_OPTION_DUP2_CHILD) {
fd = FIX2INT(RARRAY_PTR(elt)[1]);
if (maxhint < fd)
maxhint = fd;
}
}
}
- return maxhint;
-}
-
-static VALUE
-check_exec_fds(struct rb_execarg *eargp)
-{
- VALUE h = rb_hash_new();
- VALUE ary;
- int maxhint = -1;
- long i;
- maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_dup2);
- maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_close);
- maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_open);
- maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_dup2_child);
-
- if (eargp->fd_dup2_child) {
- ary = eargp->fd_dup2_child;
+ ary = rb_ary_entry(options, EXEC_OPTION_DUP2_CHILD);
+ if (!NIL_P(ary)) {
for (i = 0; i < RARRAY_LEN(ary); i++) {
VALUE elt = RARRAY_PTR(ary)[i];
int newfd = FIX2INT(RARRAY_PTR(elt)[0]);
@@ -1918,28 +1575,18 @@ check_exec_fds(struct rb_execarg *eargp)
}
}
- eargp->close_others_maxhint = maxhint;
+ if (rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS) != Qfalse) {
+ rb_ary_store(options, EXEC_OPTION_CLOSE_OTHERS, INT2FIX(maxhint));
+ }
return h;
}
static void
-rb_check_exec_options(VALUE opthash, VALUE execarg_obj)
+rb_check_exec_options(VALUE opthash, struct rb_exec_arg *e)
{
if (RHASH_EMPTY_P(opthash))
return;
- st_foreach(RHASH_TBL(opthash), check_exec_options_i, (st_data_t)execarg_obj);
-}
-
-VALUE
-rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash)
-{
- VALUE args[2];
- if (RHASH_EMPTY_P(opthash))
- return Qnil;
- args[0] = execarg_obj;
- args[1] = Qnil;
- st_foreach(RHASH_TBL(opthash), check_exec_options_i_extract, (st_data_t)args);
- return args[1];
+ st_foreach(RHASH_TBL(opthash), check_exec_options_i, (st_data_t)e);
}
static int
@@ -1980,7 +1627,9 @@ rb_check_argv(int argc, VALUE *argv)
int i;
const char *name = 0;
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+ if (argc == 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments");
+ }
prog = 0;
tmp = rb_check_array_type(argv[0]);
@@ -1992,12 +1641,12 @@ rb_check_argv(int argc, VALUE *argv)
argv[0] = RARRAY_PTR(tmp)[1];
SafeStringValue(prog);
StringValueCStr(prog);
- prog = rb_str_new_frozen(prog);
+ prog = rb_str_new4(prog);
name = RSTRING_PTR(prog);
}
for (i = 0; i < argc; i++) {
SafeStringValue(argv[i]);
- argv[i] = rb_str_new_frozen(argv[i]);
+ argv[i] = rb_str_new4(argv[i]);
StringValueCStr(argv[i]);
}
security(name ? name : RSTRING_PTR(argv[0]));
@@ -2005,12 +1654,12 @@ rb_check_argv(int argc, VALUE *argv)
}
static VALUE
-rb_exec_getargs(int *argc_p, VALUE **argv_p, int accept_shell, VALUE *env_ret, VALUE *opthash_ret)
+rb_exec_getargs(int *argc_p, VALUE **argv_p, int accept_shell, VALUE *env_ret, VALUE *opthash_ret, struct rb_exec_arg *e)
{
VALUE hash, prog;
if (0 < *argc_p) {
- hash = rb_check_hash_type((*argv_p)[*argc_p-1]);
+ hash = rb_check_convert_type((*argv_p)[*argc_p-1], T_HASH, "Hash", "to_hash");
if (!NIL_P(hash)) {
*opthash_ret = hash;
(*argc_p)--;
@@ -2018,7 +1667,7 @@ rb_exec_getargs(int *argc_p, VALUE **argv_p, int accept_shell, VALUE *env_ret, V
}
if (0 < *argc_p) {
- hash = rb_check_hash_type((*argv_p)[0]);
+ hash = rb_check_convert_type((*argv_p)[0], T_HASH, "Hash", "to_hash");
if (!NIL_P(hash)) {
*env_ret = hash;
(*argc_p)--;
@@ -2036,339 +1685,43 @@ rb_exec_getargs(int *argc_p, VALUE **argv_p, int accept_shell, VALUE *env_ret, V
return prog;
}
-#ifndef _WIN32
-struct string_part {
- const char *ptr;
- size_t len;
-};
-
-static int
-compare_posix_sh(const void *key, const void *el)
-{
- const struct string_part *word = key;
- int ret = strncmp(word->ptr, el, word->len);
- if (!ret && ((const char *)el)[word->len]) ret = -1;
- return ret;
-}
-#endif
-
static void
-rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VALUE execarg_obj)
+rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, struct rb_exec_arg *e)
{
- struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
- char fbuf[MAXPATHLEN];
-
- MEMZERO(eargp, struct rb_execarg, 1);
+ VALUE options;
+ MEMZERO(e, struct rb_exec_arg, 1);
+ options = hide_obj(rb_ary_new());
+ e->options = options;
if (!NIL_P(opthash)) {
- rb_check_exec_options(opthash, execarg_obj);
+ rb_check_exec_options(opthash, e);
}
if (!NIL_P(env)) {
env = rb_check_exec_env(env);
- eargp->env_modification = env;
- }
-
- eargp->use_shell = argc == 0;
- if (eargp->use_shell)
- eargp->invoke.sh.shell_script = prog;
- else
- eargp->invoke.cmd.command_name = prog;
-
-#ifndef _WIN32
- if (eargp->use_shell) {
- static const char posix_sh_cmds[][9] = {
- "!", /* reserved */
- ".", /* special built-in */
- ":", /* special built-in */
- "break", /* special built-in */
- "case", /* reserved */
- "continue", /* special built-in */
- "do", /* reserved */
- "done", /* reserved */
- "elif", /* reserved */
- "else", /* reserved */
- "esac", /* reserved */
- "eval", /* special built-in */
- "exec", /* special built-in */
- "exit", /* special built-in */
- "export", /* special built-in */
- "fi", /* reserved */
- "for", /* reserved */
- "if", /* reserved */
- "in", /* reserved */
- "readonly", /* special built-in */
- "return", /* special built-in */
- "set", /* special built-in */
- "shift", /* special built-in */
- "then", /* reserved */
- "times", /* special built-in */
- "trap", /* special built-in */
- "unset", /* special built-in */
- "until", /* reserved */
- "while", /* reserved */
- };
- const char *p;
- struct string_part first = {0, 0};
- int has_meta = 0;
- /*
- * meta characters:
- *
- * * Pathname Expansion
- * ? Pathname Expansion
- * {} Grouping Commands
- * [] Pathname Expansion
- * <> Redirection
- * () Grouping Commands
- * ~ Tilde Expansion
- * & AND Lists, Asynchronous Lists
- * | OR Lists, Pipelines
- * \ Escape Character
- * $ Parameter Expansion
- * ; Sequential Lists
- * ' Single-Quotes
- * ` Command Substitution
- * " Double-Quotes
- * \n Lists
- *
- * # Comment
- * = Assignment preceding command name
- * % (used in Parameter Expansion)
- */
- for (p = RSTRING_PTR(prog); *p; p++) {
- if (*p == ' ' || *p == '\t') {
- if (first.ptr && !first.len) first.len = p - first.ptr;
- }
- else {
- if (!first.ptr) first.ptr = p;
- }
- if (!has_meta && strchr("*?{}[]<>()~&|\\$;'`\"\n#", *p))
- has_meta = 1;
- if (!first.len) {
- if (*p == '=') {
- has_meta = 1;
- }
- else if (*p == '/') {
- first.len = 0x100; /* longer than any posix_sh_cmds */
- }
- }
- if (has_meta)
- break;
- }
- if (!has_meta && first.ptr) {
- if (!first.len) first.len = p - first.ptr;
- if (first.len > 0 && first.len <= sizeof(posix_sh_cmds[0]) &&
- bsearch(&first, posix_sh_cmds, numberof(posix_sh_cmds), sizeof(posix_sh_cmds[0]), compare_posix_sh))
- has_meta = 1;
- }
- if (!has_meta) {
- /* avoid shell since no shell meta charactor found. */
- eargp->use_shell = 0;
- }
- if (!eargp->use_shell) {
- VALUE argv_buf;
- argv_buf = hide_obj(rb_str_buf_new(0));
- p = RSTRING_PTR(prog);
- while (*p) {
- while (*p == ' ' || *p == '\t')
- p++;
- if (*p) {
- const char *w = p;
- while (*p && *p != ' ' && *p != '\t')
- p++;
- rb_str_buf_cat(argv_buf, w, p-w);
- rb_str_buf_cat(argv_buf, "", 1); /* append '\0' */
- }
- }
- eargp->invoke.cmd.argv_buf = argv_buf;
- eargp->invoke.cmd.command_name = hide_obj(rb_str_new_cstr(RSTRING_PTR(argv_buf)));
- }
- }
-#endif
-
- if (!eargp->use_shell) {
- const char *abspath;
- abspath = dln_find_exe_r(RSTRING_PTR(eargp->invoke.cmd.command_name), 0, fbuf, sizeof(fbuf));
- if (abspath)
- eargp->invoke.cmd.command_abspath = rb_str_new_cstr(abspath);
- else
- eargp->invoke.cmd.command_abspath = Qnil;
+ rb_ary_store(options, EXEC_OPTION_ENV, env);
}
- if (!eargp->use_shell && !eargp->invoke.cmd.argv_buf) {
- int i;
- VALUE argv_buf;
- argv_buf = rb_str_buf_new(0);
- hide_obj(argv_buf);
- for (i = 0; i < argc; i++) {
- rb_str_buf_cat2(argv_buf, StringValueCStr(argv[i]));
- rb_str_buf_cat(argv_buf, "", 1); /* append '\0' */
- }
- eargp->invoke.cmd.argv_buf = argv_buf;
- }
-
- if (!eargp->use_shell) {
- const char *p, *ep, *null=NULL;
- VALUE argv_str;
- argv_str = hide_obj(rb_str_buf_new(sizeof(char*) * (argc + 2)));
- rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* place holder for /bin/sh of try_with_sh. */
- p = RSTRING_PTR(eargp->invoke.cmd.argv_buf);
- ep = p + RSTRING_LEN(eargp->invoke.cmd.argv_buf);
- while (p < ep) {
- rb_str_buf_cat(argv_str, (char *)&p, sizeof(p));
- p += strlen(p) + 1;
- }
- rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* terminator for execve. */
- eargp->invoke.cmd.argv_str = argv_str;
- }
- RB_GC_GUARD(execarg_obj);
-}
-
-VALUE
-rb_execarg_new(int argc, VALUE *argv, int accept_shell)
-{
- VALUE execarg_obj;
- struct rb_execarg *eargp;
- execarg_obj = TypedData_Make_Struct(rb_cData, struct rb_execarg, &exec_arg_data_type, eargp);
- hide_obj(execarg_obj);
- rb_execarg_init(argc, argv, accept_shell, execarg_obj);
- return execarg_obj;
-}
-
-struct rb_execarg
-*rb_execarg_get(VALUE execarg_obj)
-{
- struct rb_execarg *eargp;
- TypedData_Get_Struct(execarg_obj, struct rb_execarg, &exec_arg_data_type, eargp);
- return eargp;
-}
-
-VALUE
-rb_execarg_init(int argc, VALUE *argv, int accept_shell, VALUE execarg_obj)
-{
- struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
- VALUE prog, ret;
- VALUE env = Qnil, opthash = Qnil;
- prog = rb_exec_getargs(&argc, &argv, accept_shell, &env, &opthash);
- rb_exec_fillarg(prog, argc, argv, env, opthash, execarg_obj);
- ret = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
- RB_GC_GUARD(execarg_obj);
- return ret;
+ e->argc = argc;
+ e->argv = argv;
+ e->prog = prog ? RSTRING_PTR(prog) : 0;
}
VALUE
rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e)
{
- return rb_execarg_init(argc, argv, accept_shell, e->execarg_obj);
-}
-
-void
-rb_execarg_setenv(VALUE execarg_obj, VALUE env)
-{
- struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
- env = !NIL_P(env) ? rb_check_exec_env(env) : Qfalse;
- eargp->env_modification = env;
-}
-
-static int
-fill_envp_buf_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
-{
- VALUE key = (VALUE)st_key;
- VALUE val = (VALUE)st_val;
- VALUE envp_buf = (VALUE)arg;
-
- rb_str_buf_cat2(envp_buf, StringValueCStr(key));
- rb_str_buf_cat2(envp_buf, "=");
- rb_str_buf_cat2(envp_buf, StringValueCStr(val));
- rb_str_buf_cat(envp_buf, "", 1); /* append '\0' */
-
- return ST_CONTINUE;
-}
-
-
-static long run_exec_dup2_tmpbuf_size(long n);
-
-void
-rb_execarg_fixup(VALUE execarg_obj)
-{
- struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
- int unsetenv_others;
- VALUE envopts;
- VALUE ary;
-
- eargp->redirect_fds = check_exec_fds(eargp);
-
- ary = eargp->fd_dup2;
- if (ary != Qfalse) {
- size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary));
- VALUE tmpbuf = hide_obj(rb_str_new(0, len));
- rb_str_set_len(tmpbuf, len);
- eargp->dup2_tmpbuf = tmpbuf;
- }
-
- unsetenv_others = eargp->unsetenv_others_given && eargp->unsetenv_others_do;
- envopts = eargp->env_modification;
- if (unsetenv_others || envopts != Qfalse) {
- VALUE envtbl, envp_str, envp_buf;
- char *p, *ep;
- if (unsetenv_others) {
- envtbl = rb_hash_new();
- }
- else {
- envtbl = rb_const_get(rb_cObject, rb_intern("ENV"));
- envtbl = rb_convert_type(envtbl, T_HASH, "Hash", "to_hash");
- }
- hide_obj(envtbl);
- if (envopts != Qfalse) {
- st_table *stenv = RHASH_TBL(envtbl);
- long i;
- for (i = 0; i < RARRAY_LEN(envopts); i++) {
- VALUE pair = RARRAY_PTR(envopts)[i];
- VALUE key = RARRAY_PTR(pair)[0];
- VALUE val = RARRAY_PTR(pair)[1];
- if (NIL_P(val)) {
- st_data_t stkey = (st_data_t)key;
- st_delete(stenv, &stkey, NULL);
- }
- else {
- st_insert(stenv, (st_data_t)key, (st_data_t)val);
- }
- }
- }
- envp_buf = rb_str_buf_new(0);
- hide_obj(envp_buf);
- st_foreach(RHASH_TBL(envtbl), fill_envp_buf_i, (st_data_t)envp_buf);
- envp_str = rb_str_buf_new(sizeof(char*) * (RHASH_SIZE(envtbl) + 1));
- hide_obj(envp_str);
- p = RSTRING_PTR(envp_buf);
- ep = p + RSTRING_LEN(envp_buf);
- while (p < ep) {
- rb_str_buf_cat(envp_str, (char *)&p, sizeof(p));
- p += strlen(p) + 1;
- }
- p = NULL;
- rb_str_buf_cat(envp_str, (char *)&p, sizeof(p));
- eargp->envp_str = envp_str;
- eargp->envp_buf = envp_buf;
-
- /*
- char **tmp_envp = (char **)RSTRING_PTR(envp_str);
- while (*tmp_envp) {
- printf("%s\n", *tmp_envp);
- tmp_envp++;
- }
- */
- }
- RB_GC_GUARD(execarg_obj);
+ VALUE prog;
+ VALUE env = Qnil, opthash = Qnil;
+ prog = rb_exec_getargs(&argc, &argv, accept_shell, &env, &opthash, e);
+ rb_exec_fillarg(prog, argc, argv, env, opthash, e);
+ return prog;
}
void
rb_exec_arg_fixup(struct rb_exec_arg *e)
{
- rb_execarg_fixup(e->execarg_obj);
+ e->redirect_fds = check_exec_fds(e->options);
}
-static int rb_exec_without_timer_thread(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen);
-
/*
* call-seq:
* exec([env,] command... [,options])
@@ -2405,13 +1758,6 @@ static int rb_exec_without_timer_thread(const struct rb_execarg *eargp, char *er
* Raises SystemCallError if the command couldn't execute (typically
* <code>Errno::ENOENT</code> when it was not found).
*
- * This method modifies process attributes according to _options_
- * (details described in <code>spawn</code>)
- * before <code>exec(2)</code> system call.
- * The modified attributes may be retained when <code>exec(2)</code> system call fails.
- * For example, hard resource limits is not restorable.
- * If it is not acceptable, consider to create a child process using <code>spawn</code> or <code>system</code>.
- *
* exec "echo *" # echoes list of files in current directory
* # never get here
*
@@ -2423,25 +1769,19 @@ static int rb_exec_without_timer_thread(const struct rb_execarg *eargp, char *er
VALUE
rb_f_exec(int argc, VALUE *argv)
{
- VALUE execarg_obj, fail_str;
- struct rb_execarg *eargp;
+ struct rb_exec_arg earg;
#define CHILD_ERRMSG_BUFLEN 80
char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' };
- execarg_obj = rb_execarg_new(argc, argv, TRUE);
- eargp = rb_execarg_get(execarg_obj);
- rb_execarg_fixup(execarg_obj);
- fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
+ rb_exec_arg_init(argc, argv, TRUE, &earg);
+ if (NIL_P(rb_ary_entry(earg.options, EXEC_OPTION_CLOSE_OTHERS)))
+ rb_exec_arg_addopt(&earg, ID2SYM(rb_intern("close_others")), Qfalse);
+ rb_exec_arg_fixup(&earg);
-#if defined(__APPLE__) || defined(__HAIKU__)
- rb_exec_without_timer_thread(eargp, errmsg, sizeof(errmsg));
-#else
- rb_exec_async_signal_safe(eargp, errmsg, sizeof(errmsg));
-#endif
- RB_GC_GUARD(execarg_obj);
+ rb_exec_err(&earg, errmsg, sizeof(errmsg));
if (errmsg[0])
rb_sys_fail(errmsg);
- rb_sys_fail_str(fail_str);
+ rb_sys_fail(earg.prog);
return Qnil; /* dummy */
}
@@ -2481,28 +1821,16 @@ redirect_dup(int oldfd)
ttyprintf("dup(%d) => %d\n", oldfd, ret);
return ret;
}
-#else
-#define redirect_dup(oldfd) dup(oldfd)
-#endif
-#if defined(DEBUG_REDIRECT) || defined(_WIN32)
static int
redirect_dup2(int oldfd, int newfd)
{
int ret;
ret = dup2(oldfd, newfd);
- if (newfd >= 0 && newfd <= 2)
- SetStdHandle(newfd == 0 ? STD_INPUT_HANDLE : newfd == 1 ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE, (HANDLE)rb_w32_get_osfhandle(newfd));
-#if defined(DEBUG_REDIRECT)
ttyprintf("dup2(%d, %d)\n", oldfd, newfd);
-#endif
return ret;
}
-#else
-#define redirect_dup2(oldfd, newfd) dup2((oldfd), (newfd))
-#endif
-#if defined(DEBUG_REDIRECT)
static int
redirect_close(int fd)
{
@@ -2522,14 +1850,16 @@ redirect_open(const char *pathname, int flags, mode_t perm)
}
#else
+#define redirect_dup(oldfd) dup(oldfd)
+#define redirect_dup2(oldfd, newfd) dup2(oldfd, newfd)
#define redirect_close(fd) close(fd)
-#define redirect_open(pathname, flags, perm) open((pathname), (flags), (perm))
+#define redirect_open(pathname, flags, perm) open(pathname, flags, perm)
#endif
static int
-save_redirect_fd(int fd, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+save_redirect_fd(int fd, VALUE save, char *errmsg, size_t errmsg_buflen)
{
- if (sargp) {
+ if (!NIL_P(save)) {
VALUE newary;
int save_fd = redirect_dup(fd);
if (save_fd == -1) {
@@ -2538,19 +1868,18 @@ save_redirect_fd(int fd, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
ERRMSG("dup");
return -1;
}
- rb_update_max_fd(save_fd);
- newary = sargp->fd_dup2;
- if (newary == Qfalse) {
+ newary = rb_ary_entry(save, EXEC_OPTION_DUP2);
+ if (NIL_P(newary)) {
newary = hide_obj(rb_ary_new());
- sargp->fd_dup2 = newary;
+ rb_ary_store(save, EXEC_OPTION_DUP2, newary);
}
rb_ary_push(newary,
hide_obj(rb_assoc_new(INT2FIX(fd), INT2FIX(save_fd))));
- newary = sargp->fd_close;
- if (newary == Qfalse) {
+ newary = rb_ary_entry(save, EXEC_OPTION_CLOSE);
+ if (NIL_P(newary)) {
newary = hide_obj(rb_ary_new());
- sargp->fd_close = newary;
+ rb_ary_store(save, EXEC_OPTION_CLOSE, newary);
}
rb_ary_push(newary, hide_obj(rb_assoc_new(INT2FIX(save_fd), Qnil)));
}
@@ -2558,6 +1887,28 @@ save_redirect_fd(int fd, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
return 0;
}
+static VALUE
+save_env_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+{
+ rb_ary_push(ary, hide_obj(rb_ary_dup(argv[0])));
+ return Qnil;
+}
+
+static void
+save_env(VALUE save)
+{
+ if (!NIL_P(save) && NIL_P(rb_ary_entry(save, EXEC_OPTION_ENV))) {
+ VALUE env = rb_const_get(rb_cObject, rb_intern("ENV"));
+ if (RTEST(env)) {
+ VALUE ary = hide_obj(rb_ary_new());
+ rb_block_call(env, rb_intern("each"), 0, 0, save_env_i,
+ (VALUE)ary);
+ rb_ary_store(save, EXEC_OPTION_ENV, ary);
+ }
+ rb_ary_store(save, EXEC_OPTION_UNSETENV_OTHERS, Qtrue);
+ }
+}
+
static int
intcmp(const void *a, const void *b)
{
@@ -2570,30 +1921,25 @@ intrcmp(const void *a, const void *b)
return *(int*)b - *(int*)a;
}
-struct run_exec_dup2_fd_pair {
- int oldfd;
- int newfd;
- long older_index;
- long num_newer;
-};
-
-static long
-run_exec_dup2_tmpbuf_size(long n)
-{
- return sizeof(struct run_exec_dup2_fd_pair) * n;
-}
-
-/* This function should be async-signal-safe when sargp is NULL. Hopefully it is. */
static int
-run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+run_exec_dup2(VALUE ary, VALUE save, char *errmsg, size_t errmsg_buflen)
{
long n, i;
int ret;
int extra_fd = -1;
- struct run_exec_dup2_fd_pair *pairs = 0;
+ struct fd_pair {
+ int oldfd;
+ int newfd;
+ long older_index;
+ long num_newer;
+ } *pairs = 0;
n = RARRAY_LEN(ary);
- pairs = (struct run_exec_dup2_fd_pair *)RSTRING_PTR(tmpbuf);
+ pairs = (struct fd_pair *)malloc(sizeof(struct fd_pair) * n);
+ if (pairs == NULL) {
+ ERRMSG("malloc");
+ return -1;
+ }
/* initialize oldfd and newfd: O(n) */
for (i = 0; i < n; i++) {
@@ -2604,17 +1950,17 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
}
/* sort the table by oldfd: O(n log n) */
- if (!sargp)
- qsort(pairs, n, sizeof(struct run_exec_dup2_fd_pair), intcmp); /* hopefully async-signal-safe */
+ if (!RTEST(save))
+ qsort(pairs, n, sizeof(struct fd_pair), intcmp);
else
- qsort(pairs, n, sizeof(struct run_exec_dup2_fd_pair), intrcmp);
+ qsort(pairs, n, sizeof(struct fd_pair), intrcmp);
/* initialize older_index and num_newer: O(n log n) */
for (i = 0; i < n; i++) {
int newfd = pairs[i].newfd;
- struct run_exec_dup2_fd_pair key, *found;
+ struct fd_pair key, *found;
key.oldfd = newfd;
- found = bsearch(&key, pairs, n, sizeof(struct run_exec_dup2_fd_pair), intcmp); /* hopefully async-signal-safe */
+ found = bsearch(&key, pairs, n, sizeof(struct fd_pair), intcmp);
pairs[i].num_newer = 0;
if (found) {
while (pairs < found && (found-1)->oldfd == newfd)
@@ -2631,14 +1977,13 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
for (i = 0; i < n; i++) {
long j = i;
while (j != -1 && pairs[j].oldfd != -1 && pairs[j].num_newer == 0) {
- if (save_redirect_fd(pairs[j].newfd, sargp, errmsg, errmsg_buflen) < 0) /* async-signal-safe */
+ if (save_redirect_fd(pairs[j].newfd, save, errmsg, errmsg_buflen) < 0)
goto fail;
- ret = redirect_dup2(pairs[j].oldfd, pairs[j].newfd); /* async-signal-safe */
+ ret = redirect_dup2(pairs[j].oldfd, pairs[j].newfd);
if (ret == -1) {
ERRMSG("dup2");
goto fail;
}
- rb_update_max_fd(pairs[j].newfd); /* async-signal-safe but don't need to call it in a child process. */
pairs[j].oldfd = -1;
j = pairs[j].older_index;
if (j != -1)
@@ -2654,14 +1999,14 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
if (pairs[i].oldfd == pairs[i].newfd) { /* self cycle */
#ifdef F_GETFD
int fd = pairs[i].oldfd;
- ret = fcntl(fd, F_GETFD); /* async-signal-safe */
+ ret = fcntl(fd, F_GETFD);
if (ret == -1) {
ERRMSG("fcntl(F_GETFD)");
goto fail;
}
if (ret & FD_CLOEXEC) {
ret &= ~FD_CLOEXEC;
- ret = fcntl(fd, F_SETFD, ret); /* async-signal-safe */
+ ret = fcntl(fd, F_SETFD, ret);
if (ret == -1) {
ERRMSG("fcntl(F_SETFD)");
goto fail;
@@ -2672,60 +2017,57 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
continue;
}
if (extra_fd == -1) {
- extra_fd = redirect_dup(pairs[i].oldfd); /* async-signal-safe */
+ extra_fd = redirect_dup(pairs[i].oldfd);
if (extra_fd == -1) {
ERRMSG("dup");
goto fail;
}
- rb_update_max_fd(extra_fd);
}
else {
- ret = redirect_dup2(pairs[i].oldfd, extra_fd); /* async-signal-safe */
+ ret = redirect_dup2(pairs[i].oldfd, extra_fd);
if (ret == -1) {
ERRMSG("dup2");
goto fail;
}
- rb_update_max_fd(extra_fd);
}
pairs[i].oldfd = extra_fd;
j = pairs[i].older_index;
pairs[i].older_index = -1;
while (j != -1) {
- ret = redirect_dup2(pairs[j].oldfd, pairs[j].newfd); /* async-signal-safe */
+ ret = redirect_dup2(pairs[j].oldfd, pairs[j].newfd);
if (ret == -1) {
ERRMSG("dup2");
goto fail;
}
- rb_update_max_fd(ret);
pairs[j].oldfd = -1;
j = pairs[j].older_index;
}
}
if (extra_fd != -1) {
- ret = redirect_close(extra_fd); /* async-signal-safe */
+ ret = redirect_close(extra_fd);
if (ret == -1) {
ERRMSG("close");
goto fail;
}
}
+ xfree(pairs);
return 0;
fail:
+ xfree(pairs);
return -1;
}
-/* This function should be async-signal-safe. Actually it is. */
static int
run_exec_close(VALUE ary, char *errmsg, size_t errmsg_buflen)
{
- long i;
- int ret;
+ int i, ret;
for (i = 0; i < RARRAY_LEN(ary); i++) {
VALUE elt = RARRAY_PTR(ary)[i];
int fd = FIX2INT(RARRAY_PTR(elt)[0]);
- ret = redirect_close(fd); /* async-signal-safe */
+ ret = redirect_close(fd);
if (ret == -1) {
ERRMSG("close");
return -1;
@@ -2734,12 +2076,10 @@ run_exec_close(VALUE ary, char *errmsg, size_t errmsg_buflen)
return 0;
}
-/* This function should be async-signal-safe when sargp is NULL. Actually it is. */
static int
-run_exec_open(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+run_exec_open(VALUE ary, VALUE save, char *errmsg, size_t errmsg_buflen)
{
- long i;
- int ret;
+ int i, ret;
for (i = 0; i < RARRAY_LEN(ary);) {
VALUE elt = RARRAY_PTR(ary)[i];
@@ -2749,12 +2089,11 @@ run_exec_open(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
int flags = NUM2INT(RARRAY_PTR(param)[1]);
int perm = NUM2INT(RARRAY_PTR(param)[2]);
int need_close = 1;
- int fd2 = redirect_open(path, flags, perm); /* async-signal-safe */
+ int fd2 = redirect_open(path, flags, perm);
if (fd2 == -1) {
ERRMSG("open");
return -1;
}
- rb_update_max_fd(fd2);
while (i < RARRAY_LEN(ary) &&
(elt = RARRAY_PTR(ary)[i], RARRAY_PTR(elt)[1] == param)) {
fd = FIX2INT(RARRAY_PTR(elt)[0]);
@@ -2762,19 +2101,18 @@ run_exec_open(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
need_close = 0;
}
else {
- if (save_redirect_fd(fd, sargp, errmsg, errmsg_buflen) < 0) /* async-signal-safe */
+ if (save_redirect_fd(fd, save, errmsg, errmsg_buflen) < 0)
return -1;
- ret = redirect_dup2(fd2, fd); /* async-signal-safe */
+ ret = redirect_dup2(fd2, fd);
if (ret == -1) {
ERRMSG("dup2");
return -1;
}
- rb_update_max_fd(fd);
}
i++;
}
if (need_close) {
- ret = redirect_close(fd2); /* async-signal-safe */
+ ret = redirect_close(fd2);
if (ret == -1) {
ERRMSG("close");
return -1;
@@ -2784,74 +2122,62 @@ run_exec_open(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
return 0;
}
-/* This function should be async-signal-safe when sargp is NULL. Actually it is. */
static int
-run_exec_dup2_child(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+run_exec_dup2_child(VALUE ary, VALUE save, char *errmsg, size_t errmsg_buflen)
{
- long i;
- int ret;
-
+ int i, ret;
for (i = 0; i < RARRAY_LEN(ary); i++) {
VALUE elt = RARRAY_PTR(ary)[i];
int newfd = FIX2INT(RARRAY_PTR(elt)[0]);
int oldfd = FIX2INT(RARRAY_PTR(elt)[1]);
- if (save_redirect_fd(newfd, sargp, errmsg, errmsg_buflen) < 0) /* async-signal-safe */
+ if (save_redirect_fd(newfd, save, errmsg, errmsg_buflen) < 0)
return -1;
- ret = redirect_dup2(oldfd, newfd); /* async-signal-safe */
+ ret = redirect_dup2(oldfd, newfd);
if (ret == -1) {
ERRMSG("dup2");
return -1;
}
- rb_update_max_fd(newfd);
}
return 0;
}
#ifdef HAVE_SETPGID
-/* This function should be async-signal-safe when sargp is NULL. Actually it is. */
static int
-run_exec_pgroup(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+run_exec_pgroup(VALUE obj, VALUE save, char *errmsg, size_t errmsg_buflen)
{
/*
* If FD_CLOEXEC is available, rb_fork waits the child's execve.
* So setpgid is done in the child when rb_fork is returned in the parent.
* No race condition, even without setpgid from the parent.
- * (Is there an environment which has setpgid but no FD_CLOEXEC?)
+ * (Is there an environment which has setpgid but FD_CLOEXEC?)
*/
int ret;
pid_t pgroup;
-
- pgroup = eargp->pgroup_pgid;
- if (pgroup == -1)
- return 0;
-
- if (sargp) {
+ if (!NIL_P(save)) {
/* maybe meaningless with no fork environment... */
- sargp->pgroup_given = 1;
- sargp->pgroup_pgid = getpgrp();
+ rb_ary_store(save, EXEC_OPTION_PGROUP, PIDT2NUM(getpgrp()));
}
-
+ pgroup = NUM2PIDT(obj);
if (pgroup == 0) {
- pgroup = getpid(); /* async-signal-safe */
+ pgroup = getpid();
}
- ret = setpgid(getpid(), pgroup); /* async-signal-safe */
+ ret = setpgid(getpid(), pgroup);
if (ret == -1) ERRMSG("setpgid");
return ret;
}
#endif
-#if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM)
-/* This function should be async-signal-safe when sargp is NULL. Hopefully it is. */
+#ifdef RLIM2NUM
static int
-run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+run_exec_rlimit(VALUE ary, VALUE save, char *errmsg, size_t errmsg_buflen)
{
- long i;
+ int i;
for (i = 0; i < RARRAY_LEN(ary); i++) {
VALUE elt = RARRAY_PTR(ary)[i];
int rtype = NUM2INT(RARRAY_PTR(elt)[0]);
struct rlimit rlim;
- if (sargp) {
+ if (!NIL_P(save)) {
VALUE tmp, newary;
if (getrlimit(rtype, &rlim) == -1) {
ERRMSG("getrlimit");
@@ -2860,15 +2186,16 @@ run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg
tmp = hide_obj(rb_ary_new3(3, RARRAY_PTR(elt)[0],
RLIM2NUM(rlim.rlim_cur),
RLIM2NUM(rlim.rlim_max)));
- if (sargp->rlimit_limits == Qfalse)
- newary = sargp->rlimit_limits = hide_obj(rb_ary_new());
- else
- newary = sargp->rlimit_limits;
+ newary = rb_ary_entry(save, EXEC_OPTION_RLIMIT);
+ if (NIL_P(newary)) {
+ newary = hide_obj(rb_ary_new());
+ rb_ary_store(save, EXEC_OPTION_RLIMIT, newary);
+ }
rb_ary_push(newary, tmp);
}
rlim.rlim_cur = NUM2RLIM(RARRAY_PTR(elt)[1]);
rlim.rlim_max = NUM2RLIM(RARRAY_PTR(elt)[2]);
- if (setrlimit(rtype, &rlim) == -1) { /* hopefully async-signal-safe */
+ if (setrlimit(rtype, &rlim) == -1) {
ERRMSG("setrlimit");
return -1;
}
@@ -2877,70 +2204,50 @@ run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg
}
#endif
-#if !defined(HAVE_FORK)
-static VALUE
-save_env_i(VALUE i, VALUE ary, int argc, VALUE *argv)
-{
- rb_ary_push(ary, hide_obj(rb_ary_dup(argv[0])));
- return Qnil;
-}
-
-static void
-save_env(struct rb_execarg *sargp)
-{
- if (!sargp)
- return;
- if (sargp->env_modification == Qfalse) {
- VALUE env = rb_const_get(rb_cObject, rb_intern("ENV"));
- if (RTEST(env)) {
- VALUE ary = hide_obj(rb_ary_new());
- rb_block_call(env, idEach, 0, 0, save_env_i,
- (VALUE)ary);
- sargp->env_modification = ary;
- }
- sargp->unsetenv_others_given = 1;
- sargp->unsetenv_others_do = 1;
- }
-}
-#endif
-
-/* This function should be async-signal-safe when sargp is NULL. Hopefully it is. */
int
-rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
+rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char *errmsg, size_t errmsg_buflen)
{
+ VALUE options = e->options;
+ VALUE soptions = Qnil;
VALUE obj;
- if (sargp) {
- /* assume that sargp is always NULL on fork-able environments */
- MEMZERO(sargp, struct rb_execarg, 1);
- sargp->redirect_fds = Qnil;
+ if (!RTEST(options))
+ return 0;
+
+ if (s) {
+ s->argc = 0;
+ s->argv = NULL;
+ s->prog = NULL;
+ s->options = soptions = hide_obj(rb_ary_new());
+ s->redirect_fds = Qnil;
}
#ifdef HAVE_SETPGID
- if (eargp->pgroup_given) {
- if (run_exec_pgroup(eargp, sargp, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
+ obj = rb_ary_entry(options, EXEC_OPTION_PGROUP);
+ if (RTEST(obj)) {
+ if (run_exec_pgroup(obj, soptions, errmsg, errmsg_buflen) == -1)
return -1;
}
#endif
-#if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM)
- obj = eargp->rlimit_limits;
- if (obj != Qfalse) {
- if (run_exec_rlimit(obj, sargp, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */
+#ifdef RLIM2NUM
+ obj = rb_ary_entry(options, EXEC_OPTION_RLIMIT);
+ if (!NIL_P(obj)) {
+ if (run_exec_rlimit(obj, soptions, errmsg, errmsg_buflen) == -1)
return -1;
}
#endif
-#if !defined(HAVE_FORK)
- if (eargp->unsetenv_others_given && eargp->unsetenv_others_do) {
- save_env(sargp);
+ obj = rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS);
+ if (RTEST(obj)) {
+ save_env(soptions);
rb_env_clear();
}
- obj = eargp->env_modification;
- if (obj != Qfalse) {
- long i;
- save_env(sargp);
+ obj = rb_ary_entry(options, EXEC_OPTION_ENV);
+ if (!NIL_P(obj)) {
+ int i;
+ save_env(soptions);
for (i = 0; i < RARRAY_LEN(obj); i++) {
VALUE pair = RARRAY_PTR(obj)[i];
VALUE key = RARRAY_PTR(pair)[0];
@@ -2951,188 +2258,125 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
ruby_setenv(StringValueCStr(key), StringValueCStr(val));
}
}
-#endif
- if (eargp->umask_given) {
- mode_t mask = eargp->umask_mask;
- mode_t oldmask = umask(mask); /* never fail */ /* async-signal-safe */
- if (sargp) {
- sargp->umask_given = 1;
- sargp->umask_mask = oldmask;
+ obj = rb_ary_entry(options, EXEC_OPTION_CHDIR);
+ if (!NIL_P(obj)) {
+ if (!NIL_P(soptions)) {
+ char *cwd = my_getcwd();
+ rb_ary_store(soptions, EXEC_OPTION_CHDIR,
+ hide_obj(rb_str_new2(cwd)));
+ xfree(cwd);
+ }
+ if (chdir(RSTRING_PTR(obj)) == -1) {
+ ERRMSG("chdir");
+ return -1;
}
}
- obj = eargp->fd_dup2;
- if (obj != Qfalse) {
- if (run_exec_dup2(obj, eargp->dup2_tmpbuf, sargp, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */
+ obj = rb_ary_entry(options, EXEC_OPTION_UMASK);
+ if (!NIL_P(obj)) {
+ mode_t mask = NUM2LONG(obj);
+ mode_t oldmask = umask(mask); /* never fail */
+ if (!NIL_P(soptions))
+ rb_ary_store(soptions, EXEC_OPTION_UMASK, LONG2NUM(oldmask));
+ }
+
+ obj = rb_ary_entry(options, EXEC_OPTION_DUP2);
+ if (!NIL_P(obj)) {
+ if (run_exec_dup2(obj, soptions, errmsg, errmsg_buflen) == -1)
return -1;
}
- obj = eargp->fd_close;
- if (obj != Qfalse) {
- if (sargp)
+ obj = rb_ary_entry(options, EXEC_OPTION_CLOSE);
+ if (!NIL_P(obj)) {
+ if (!NIL_P(soptions))
rb_warn("cannot close fd before spawn");
else {
- if (run_exec_close(obj, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
+ if (run_exec_close(obj, errmsg, errmsg_buflen) == -1)
return -1;
}
}
#ifdef HAVE_FORK
- if (!eargp->close_others_given || eargp->close_others_do) {
- rb_close_before_exec(3, eargp->close_others_maxhint, eargp->redirect_fds); /* async-signal-safe */
+ obj = rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS);
+ if (obj != Qfalse) {
+ rb_close_before_exec(3, FIX2INT(obj), e->redirect_fds);
}
#endif
- obj = eargp->fd_open;
- if (obj != Qfalse) {
- if (run_exec_open(obj, sargp, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
+ obj = rb_ary_entry(options, EXEC_OPTION_OPEN);
+ if (!NIL_P(obj)) {
+ if (run_exec_open(obj, soptions, errmsg, errmsg_buflen) == -1)
return -1;
}
- obj = eargp->fd_dup2_child;
- if (obj != Qfalse) {
- if (run_exec_dup2_child(obj, sargp, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
+ obj = rb_ary_entry(options, EXEC_OPTION_DUP2_CHILD);
+ if (!NIL_P(obj)) {
+ if (run_exec_dup2_child(obj, soptions, errmsg, errmsg_buflen) == -1)
return -1;
}
- if (eargp->chdir_given) {
- if (sargp) {
- char *cwd = my_getcwd();
- sargp->chdir_given = 1;
- sargp->chdir_dir = hide_obj(rb_str_new2(cwd));
- xfree(cwd);
- }
- if (chdir(RSTRING_PTR(eargp->chdir_dir)) == -1) { /* async-signal-safe */
- ERRMSG("chdir");
- return -1;
- }
- }
-
-#ifdef HAVE_SETGID
- if (eargp->gid_given) {
- if (setgid(eargp->gid) < 0) {
- ERRMSG("setgid");
- return -1;
- }
- }
-#endif
-#ifdef HAVE_SETUID
- if (eargp->uid_given) {
- if (setuid(eargp->uid) < 0) {
- ERRMSG("setuid");
- return -1;
- }
- }
-#endif
-
- if (sargp) {
- VALUE ary = sargp->fd_dup2;
- if (ary != Qfalse) {
- size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary));
- VALUE tmpbuf = hide_obj(rb_str_new(0, len));
- rb_str_set_len(tmpbuf, len);
- sargp->dup2_tmpbuf = tmpbuf;
- }
- }
-
return 0;
}
int
-rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char *errmsg, size_t errmsg_buflen)
-{
- return rb_execarg_run_options(rb_execarg_get(e->execarg_obj), rb_execarg_get(s->execarg_obj), errmsg, errmsg_buflen);
-}
-
-int
rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s)
{
- return rb_execarg_run_options(rb_execarg_get(e->execarg_obj), rb_execarg_get(s->execarg_obj), NULL, 0);
+ return rb_run_exec_options_err(e, s, NULL, 0);
}
-/* This function should be async-signal-safe. Hopefully it is. */
int
-rb_exec_async_signal_safe(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
+rb_exec_err(const struct rb_exec_arg *e, char *errmsg, size_t errmsg_buflen)
{
-#if !defined(HAVE_FORK)
- struct rb_execarg sarg, *const sargp = &sarg;
-#else
- struct rb_execarg *const sargp = NULL;
-#endif
+ int argc = e->argc;
+ VALUE *argv = e->argv;
+ const char *prog = e->prog;
- before_exec_async_signal_safe(); /* async-signal-safe */
-
- if (rb_execarg_run_options(eargp, sargp, errmsg, errmsg_buflen) < 0) { /* hopefully async-signal-safe */
- goto failure;
+ if (rb_run_exec_options_err(e, NULL, errmsg, errmsg_buflen) < 0) {
+ return -1;
}
- if (eargp->use_shell) {
- proc_exec_sh(RSTRING_PTR(eargp->invoke.sh.shell_script), eargp->envp_str); /* async-signal-safe */
+ if (argc == 0) {
+ rb_proc_exec(prog);
}
else {
- char *abspath = NULL;
- if (!NIL_P(eargp->invoke.cmd.command_abspath))
- abspath = RSTRING_PTR(eargp->invoke.cmd.command_abspath);
- proc_exec_cmd(abspath, eargp->invoke.cmd.argv_str, eargp->envp_str); /* async-signal-safe */
+ rb_proc_exec_n(argc, argv, prog);
}
-#if !defined(HAVE_FORK)
- preserving_errno(rb_execarg_run_options(sargp, NULL, errmsg, errmsg_buflen));
-#endif
-
-failure:
- preserving_errno(after_exec_async_signal_safe()); /* async-signal-safe */
return -1;
}
-static int
-rb_exec_without_timer_thread(const struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
-{
- int ret;
- before_exec_non_async_signal_safe(); /* async-signal-safe if forked_child is true */
- ret = rb_exec_async_signal_safe(eargp, errmsg, errmsg_buflen); /* hopefully async-signal-safe */
- preserving_errno(after_exec_non_async_signal_safe()); /* not async-signal-safe because it calls rb_thread_start_timer_thread. */
- return ret;
-}
-
-int
-rb_exec_err(const struct rb_exec_arg *e, char *errmsg, size_t errmsg_buflen)
-{
- return rb_exec_without_timer_thread(rb_execarg_get(e->execarg_obj), errmsg, errmsg_buflen);
-}
-
int
rb_exec(const struct rb_exec_arg *e)
{
#if !defined FD_CLOEXEC && !defined HAVE_SPAWNV
char errmsg[80] = { '\0' };
- int ret = rb_exec_without_timer_thread(rb_execarg_get(e->execarg_obj), errmsg, sizeof(errmsg));
+ int ret = rb_exec_err(e, errmsg, sizeof(errmsg));
preserving_errno(
if (errmsg[0]) {
fprintf(stderr, "%s\n", errmsg);
}
else {
fprintf(stderr, "%s:%d: command not found: %s\n",
- rb_sourcefile(), rb_sourceline(),
- RSTRING_PTR(e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name));
+ rb_sourcefile(), rb_sourceline(), e->prog);
}
);
return ret;
#else
- return rb_exec_without_timer_thread(rb_execarg_get(e->execarg_obj), NULL, 0);
+ return rb_exec_err(e, NULL, 0);
#endif
}
#ifdef HAVE_FORK
-/* This function should be async-signal-safe. Hopefully it is. */
static int
rb_exec_atfork(void* arg, char *errmsg, size_t errmsg_buflen)
{
- return rb_exec_async_signal_safe(arg, errmsg, errmsg_buflen); /* hopefully async-signal-safe */
+ rb_thread_atfork_before_exec();
+ return rb_exec_err(arg, errmsg, errmsg_buflen);
}
#endif
#ifdef HAVE_FORK
+#ifdef FD_CLOEXEC
#if SIZEOF_INT == SIZEOF_LONG
#define proc_syswait (VALUE (*)(VALUE))rb_syswait
#else
@@ -3143,11 +2387,12 @@ proc_syswait(VALUE pid)
return Qnil;
}
#endif
+#endif
static int
move_fds_to_avoid_crash(int *fdp, int n, VALUE fds)
{
- int min = 0;
+ long min = 0;
int i;
for (i = 0; i < n; i++) {
int ret;
@@ -3156,10 +2401,9 @@ move_fds_to_avoid_crash(int *fdp, int n, VALUE fds)
min = fdp[i]+1;
while (RTEST(rb_hash_lookup(fds, INT2FIX(min))))
min++;
- ret = rb_cloexec_fcntl_dupfd(fdp[i], min);
+ ret = fcntl(fdp[i], F_DUPFD, min);
if (ret == -1)
return -1;
- rb_update_max_fd(ret);
close(fdp[i]);
fdp[i] = ret;
}
@@ -3186,33 +2430,12 @@ pipe_nocrash(int filedes[2], VALUE fds)
return ret;
}
-struct chfunc_protect_t {
- int (*chfunc)(void*, char *, size_t);
- void *arg;
- char *errmsg;
- size_t buflen;
-};
-
-static VALUE
-chfunc_protect(VALUE arg)
-{
- struct chfunc_protect_t *p = (struct chfunc_protect_t *)arg;
-
- return (VALUE)(*p->chfunc)(p->arg, p->errmsg, p->buflen);
-}
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
/*
* Forks child process, and returns the process ID in the parent
* process.
*
* If +status+ is given, protects from any exceptions and sets the
- * jump status to it, and returns -1. If failed to fork new process
- * but no exceptions occurred, sets 0 to it. Otherwise, if forked
- * successfully, the value of +status+ is undetermined.
+ * jump status to it.
*
* In the child process, just returns 0 if +chfunc+ is +NULL+.
* Otherwise +chfunc+ will be called with +charg+, and then the child
@@ -3230,36 +2453,39 @@ chfunc_protect(VALUE arg)
*
* +chfunc+ must not raise any exceptions.
*/
-
-static rb_pid_t
-retry_fork(int *status, int *ep, int chfunc_is_async_signal_safe)
+rb_pid_t
+rb_fork_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds,
+ char *errmsg, size_t errmsg_buflen)
{
rb_pid_t pid;
- int state = 0;
+ int err, state = 0;
+#ifdef FD_CLOEXEC
+ int ep[2];
+#endif
#define prefork() ( \
rb_io_flush(rb_stdout), \
rb_io_flush(rb_stderr) \
)
+ prefork();
- while (1) {
- prefork();
- if (!chfunc_is_async_signal_safe)
- before_fork();
- pid = fork();
- if (pid == 0) /* fork succeed, child process */
- return pid;
- if (!chfunc_is_async_signal_safe)
- preserving_errno(after_fork());
- if (0 < pid) /* fork succeed, parent process */
- return pid;
- /* fork failed */
+#ifdef FD_CLOEXEC
+ if (chfunc) {
+ if (pipe_nocrash(ep, fds)) return -1;
+ if (fcntl(ep[1], F_SETFD, FD_CLOEXEC)) {
+ preserving_errno((close(ep[0]), close(ep[1])));
+ return -1;
+ }
+ }
+#endif
+ for (; before_fork(), (pid = fork()) < 0; prefork()) {
+ after_fork();
switch (errno) {
case EAGAIN:
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
#endif
- if (!status && !ep) {
+ if (!status && !chfunc) {
rb_thread_sleep(1);
continue;
}
@@ -3268,158 +2494,68 @@ retry_fork(int *status, int *ep, int chfunc_is_async_signal_safe)
if (status) *status = state;
if (!state) continue;
}
- /* fall through */
default:
- if (ep) {
+#ifdef FD_CLOEXEC
+ if (chfunc) {
preserving_errno((close(ep[0]), close(ep[1])));
}
+#endif
if (state && !status) rb_jump_tag(state);
return -1;
}
}
-}
-
-static void
-send_child_error(int fd, int state, char *errmsg, size_t errmsg_buflen, int chfunc_is_async_signal_safe)
-{
- VALUE io = Qnil;
- int err;
-
- if (!chfunc_is_async_signal_safe) {
- if (write(fd, &state, sizeof(state)) == sizeof(state) && state) {
- VALUE errinfo = rb_errinfo();
- io = rb_io_fdopen(fd, O_WRONLY|O_BINARY, NULL);
- rb_marshal_dump(errinfo, io);
- rb_io_flush(io);
- }
- }
- err = errno;
- if (write(fd, &err, sizeof(err)) < 0) err = errno;
- if (errmsg && 0 < errmsg_buflen) {
- errmsg[errmsg_buflen-1] = '\0';
- errmsg_buflen = strlen(errmsg);
- if (errmsg_buflen > 0 && write(fd, errmsg, errmsg_buflen) < 0)
- err = errno;
- }
- if (!NIL_P(io)) rb_io_close(io);
-}
-
-static int
-recv_child_error(int fd, int *statep, VALUE *excp, int *errp, char *errmsg, size_t errmsg_buflen, int chfunc_is_async_signal_safe)
-{
- int err, state = 0;
- VALUE io = Qnil;
- ssize_t size;
- VALUE exc = Qnil;
- if (!chfunc_is_async_signal_safe) {
- if ((read(fd, &state, sizeof(state))) == sizeof(state) && state) {
- io = rb_io_fdopen(fd, O_RDONLY|O_BINARY, NULL);
- exc = rb_marshal_load(io);
- rb_set_errinfo(exc);
- }
- if (!*statep && state) *statep = state;
- *excp = exc;
- }
-#define READ_FROM_CHILD(ptr, len) \
- (NIL_P(io) ? read(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
- if ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {
- err = errno;
- }
- *errp = err;
- if (size == sizeof(err) &&
- errmsg && 0 < errmsg_buflen) {
- ssize_t ret = READ_FROM_CHILD(errmsg, errmsg_buflen-1);
- if (0 <= ret) {
- errmsg[ret] = '\0';
- }
- }
- if (NIL_P(io))
- close(fd);
- else
- rb_io_close(io);
- return size != 0;
-}
-
-static rb_pid_t
-rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
- int chfunc_is_async_signal_safe, VALUE fds,
- char *errmsg, size_t errmsg_buflen)
-{
- rb_pid_t pid;
- int err, state = 0;
- int ep[2];
- VALUE exc = Qnil;
- int error_occurred;
-
- if (status) *status = 0;
-
- if (!chfunc) {
- pid = retry_fork(status, NULL, FALSE);
- if (pid < 0)
- return pid;
- if (!pid) {
- forked_child = 1;
- after_fork();
- }
- return pid;
- }
- else {
- if (pipe_nocrash(ep, fds)) return -1;
- pid = retry_fork(status, ep, chfunc_is_async_signal_safe);
- if (pid < 0)
- return pid;
- if (!pid) {
- int ret;
- forked_child = 1;
- close(ep[0]);
- if (chfunc_is_async_signal_safe)
- ret = chfunc(charg, errmsg, errmsg_buflen);
- else {
- struct chfunc_protect_t arg;
- arg.chfunc = chfunc;
- arg.arg = charg;
- arg.errmsg = errmsg;
- arg.buflen = errmsg_buflen;
- ret = (int)rb_protect(chfunc_protect, (VALUE)&arg, &state);
+ if (!pid) {
+ forked_child = 1;
+ if (chfunc) {
+#ifdef FD_CLOEXEC
+ close(ep[0]);
+#endif
+ if (!(*chfunc)(charg, errmsg, errmsg_buflen)) _exit(EXIT_SUCCESS);
+#ifdef FD_CLOEXEC
+ err = errno;
+ (void)write(ep[1], &err, sizeof(err));
+ if (errmsg && 0 < errmsg_buflen) {
+ errmsg[errmsg_buflen-1] = '\0';
+ (void)write(ep[1], errmsg, strlen(errmsg));
}
- if (!ret) _exit(EXIT_SUCCESS);
- send_child_error(ep[1], state, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
+#endif
#if EXIT_SUCCESS == 127
- _exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
#else
- _exit(127);
+ _exit(127);
#endif
- }
- close(ep[1]);
- error_occurred = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
- if (state || error_occurred) {
- if (status) {
- rb_protect(proc_syswait, (VALUE)pid, status);
- if (state) *status = state;
- }
- else {
- rb_syswait(pid);
- if (state) rb_exc_raise(exc);
+ }
+ }
+ after_fork();
+#ifdef FD_CLOEXEC
+ if (pid && chfunc) {
+ ssize_t size;
+ close(ep[1]);
+ if ((size = read(ep[0], &err, sizeof(err))) < 0) {
+ err = errno;
+ }
+ if (size == sizeof(err) &&
+ errmsg && 0 < errmsg_buflen) {
+ ssize_t ret;
+ ret = read(ep[0], errmsg, errmsg_buflen-1);
+ if (0 <= ret) {
+ errmsg[ret] = '\0';
}
- errno = err;
- return -1;
}
- return pid;
+ close(ep[0]);
+ if (size) {
+ if (status) {
+ rb_protect(proc_syswait, (VALUE)pid, status);
+ }
+ else {
+ rb_syswait(pid);
+ }
+ errno = err;
+ return -1;
+ }
}
-}
-
-rb_pid_t
-rb_fork_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds,
- char *errmsg, size_t errmsg_buflen)
-{
- return rb_fork_internal(status, chfunc, charg, FALSE, fds, errmsg, errmsg_buflen);
-}
-
-rb_pid_t
-rb_fork_async_signal_safe(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds,
- char *errmsg, size_t errmsg_buflen)
-{
- return rb_fork_internal(status, chfunc, charg, TRUE, fds, errmsg, errmsg_buflen);
+#endif
+ return pid;
}
struct chfunc_wrapper_t {
@@ -3441,20 +2577,14 @@ rb_fork(int *status, int (*chfunc)(void*), void *charg, VALUE fds)
struct chfunc_wrapper_t warg;
warg.chfunc = chfunc;
warg.arg = charg;
- return rb_fork_internal(status, chfunc_wrapper, &warg, FALSE, fds, NULL, 0);
+ return rb_fork_err(status, chfunc_wrapper, &warg, fds, NULL, 0);
}
else {
- return rb_fork_internal(status, NULL, NULL, FALSE, fds, NULL, 0);
+ return rb_fork_err(status, NULL, NULL, fds, NULL, 0);
}
}
-rb_pid_t
-rb_fork_ruby(int *status)
-{
- return rb_fork_internal(status, NULL, NULL, FALSE, Qnil, NULL, 0);
-}
-
#endif
#if defined(HAVE_FORK) && !defined(CANNOT_FORK_WITH_PTHREAD)
@@ -3488,7 +2618,7 @@ rb_f_fork(VALUE obj)
rb_secure(2);
- switch (pid = rb_fork_ruby(NULL)) {
+ switch (pid = rb_fork(0, 0, 0, Qnil)) {
case 0:
rb_thread_atfork();
if (rb_block_given_p()) {
@@ -3511,29 +2641,6 @@ rb_f_fork(VALUE obj)
#define rb_f_fork rb_f_notimplement
#endif
-static int
-exit_status_code(VALUE status)
-{
- int istatus;
-
- 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;
- }
- return istatus;
-}
-
/*
* call-seq:
* Process.exit!(status=false)
@@ -3553,14 +2660,24 @@ rb_f_exit_bang(int argc, VALUE *argv, VALUE obj)
rb_secure(4);
if (argc > 0 && rb_scan_args(argc, argv, "01", &status) == 1) {
- istatus = exit_status_code(status);
+ switch (status) {
+ case Qtrue:
+ istatus = EXIT_SUCCESS;
+ break;
+ case Qfalse:
+ istatus = EXIT_FAILURE;
+ break;
+ default:
+ istatus = NUM2INT(status);
+ break;
+ }
}
else {
istatus = EXIT_FAILURE;
}
_exit(istatus);
- UNREACHABLE;
+ return Qnil; /* not reached */
}
void
@@ -3627,14 +2744,27 @@ rb_f_exit(int argc, VALUE *argv)
rb_secure(4);
if (argc > 0 && rb_scan_args(argc, argv, "01", &status) == 1) {
- istatus = exit_status_code(status);
+ 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);
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
@@ -3652,6 +2782,8 @@ rb_f_exit(int argc, VALUE *argv)
VALUE
rb_f_abort(int argc, VALUE *argv)
{
+ extern void ruby_error_print(void);
+
rb_secure(4);
if (argc == 0) {
if (!NIL_P(GET_THREAD()->errinfo)) {
@@ -3668,95 +2800,132 @@ rb_f_abort(int argc, VALUE *argv)
args[0] = INT2NUM(EXIT_FAILURE);
rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
}
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
+
+#if defined(POSIX_SIGNAL)
+# define signal(a,b) posix_signal(a,b)
+#endif
+
void
rb_syswait(rb_pid_t pid)
{
+ static int overriding;
+#ifdef SIGHUP
+ RETSIGTYPE (*hfunc)(int) = 0;
+#endif
+#ifdef SIGQUIT
+ RETSIGTYPE (*qfunc)(int) = 0;
+#endif
+ RETSIGTYPE (*ifunc)(int) = 0;
int status;
+ int i, hooked = FALSE;
- rb_waitpid(pid, &status, 0);
+ if (!overriding) {
+#ifdef SIGHUP
+ hfunc = signal(SIGHUP, SIG_IGN);
+#endif
+#ifdef SIGQUIT
+ qfunc = signal(SIGQUIT, SIG_IGN);
+#endif
+ ifunc = signal(SIGINT, SIG_IGN);
+ overriding = TRUE;
+ hooked = TRUE;
+ }
+
+ do {
+ i = rb_waitpid(pid, &status, 0);
+ } while (i == -1 && errno == EINTR);
+
+ if (hooked) {
+#ifdef SIGHUP
+ signal(SIGHUP, hfunc);
+#endif
+#ifdef SIGQUIT
+ signal(SIGQUIT, qfunc);
+#endif
+ signal(SIGINT, ifunc);
+ overriding = FALSE;
+ }
+}
+
+static VALUE
+rb_exec_arg_prepare(struct rb_exec_arg *earg, int argc, VALUE *argv, int default_close_others)
+{
+ VALUE prog = rb_exec_arg_init(argc, argv, TRUE, earg);
+ if (NIL_P(rb_ary_entry(earg->options, EXEC_OPTION_CLOSE_OTHERS))) {
+ VALUE v = default_close_others ? Qtrue : Qfalse;
+ rb_exec_arg_addopt(earg, ID2SYM(rb_intern("close_others")), v);
+ }
+ rb_exec_arg_fixup(earg);
+ return prog;
}
static rb_pid_t
-rb_spawn_process(struct rb_execarg *eargp, char *errmsg, size_t errmsg_buflen)
+rb_spawn_process(struct rb_exec_arg *earg, VALUE prog, char *errmsg, size_t errmsg_buflen)
{
rb_pid_t pid;
-#if !USE_SPAWNV
+#if defined HAVE_FORK || !defined HAVE_SPAWNV
int status;
#endif
-#if !defined HAVE_FORK || USE_SPAWNV
- VALUE prog;
- struct rb_execarg sarg;
+#if !defined HAVE_FORK
+ struct rb_exec_arg sarg;
+ int argc;
+ VALUE *argv;
#endif
-#if defined HAVE_FORK && !USE_SPAWNV
- pid = rb_fork_async_signal_safe(&status, rb_exec_atfork, eargp, eargp->redirect_fds, errmsg, errmsg_buflen);
+#if defined HAVE_FORK
+ pid = rb_fork_err(&status, rb_exec_atfork, earg, earg->redirect_fds, errmsg, errmsg_buflen);
#else
- prog = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
-
- if (rb_execarg_run_options(eargp, &sarg, errmsg, errmsg_buflen) < 0) {
+ if (rb_run_exec_options_err(earg, &sarg, errmsg, errmsg_buflen) < 0) {
return -1;
}
- if (prog && !eargp->use_shell) {
- char **argv = ARGVSTR2ARGV(eargp->invoke.cmd.argv_str);
- argv[0] = RSTRING_PTR(prog);
- }
+ argc = earg->argc;
+ argv = earg->argv;
+ if (prog && argc) argv[0] = prog;
# if defined HAVE_SPAWNV
- if (eargp->use_shell) {
- pid = proc_spawn_sh(RSTRING_PTR(prog));
+ if (!argc) {
+ pid = proc_spawn(RSTRING_PTR(prog));
}
else {
- char **argv = ARGVSTR2ARGV(eargp->invoke.cmd.argv_str);
- pid = proc_spawn_cmd(argv, prog, eargp);
+ pid = proc_spawn_n(argc, argv, prog);
}
# if defined(_WIN32)
if (pid == -1)
rb_last_status_set(0x7f << 8, 0);
# endif
# else
- if (!eargp->use_shell) {
- char **argv = ARGVSTR2ARGV(eargp->invoke.cmd.argv_str);
- int argc = ARGVSTR2ARGC(eargp->invoke.cmd.argv_str);
- prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
- }
+ if (argc) prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
status = system(StringValuePtr(prog));
rb_last_status_set((status & 0xff) << 8, 0);
# endif
- rb_execarg_run_options(&sarg, NULL, errmsg, errmsg_buflen);
+ rb_run_exec_options_err(&sarg, NULL, errmsg, errmsg_buflen);
#endif
return pid;
}
static rb_pid_t
-rb_spawn_internal(int argc, VALUE *argv, char *errmsg, size_t errmsg_buflen)
+rb_spawn_internal(int argc, VALUE *argv, int default_close_others,
+ char *errmsg, size_t errmsg_buflen)
{
- VALUE execarg_obj;
- struct rb_execarg *eargp;
- rb_pid_t ret;
-
- execarg_obj = rb_execarg_new(argc, argv, TRUE);
- eargp = rb_execarg_get(execarg_obj);
- rb_execarg_fixup(execarg_obj);
- ret = rb_spawn_process(eargp, errmsg, errmsg_buflen);
- RB_GC_GUARD(execarg_obj);
- return ret;
+ struct rb_exec_arg earg;
+ VALUE prog = rb_exec_arg_prepare(&earg, argc, argv, default_close_others);
+ return rb_spawn_process(&earg, prog, errmsg, errmsg_buflen);
}
rb_pid_t
rb_spawn_err(int argc, VALUE *argv, char *errmsg, size_t errmsg_buflen)
{
- return rb_spawn_internal(argc, argv, errmsg, errmsg_buflen);
+ return rb_spawn_internal(argc, argv, TRUE, errmsg, errmsg_buflen);
}
rb_pid_t
rb_spawn(int argc, VALUE *argv)
{
- return rb_spawn_internal(argc, argv, NULL, 0);
+ return rb_spawn_internal(argc, argv, TRUE, NULL, 0);
}
/*
@@ -3805,16 +2974,12 @@ rb_f_system(int argc, VALUE *argv)
#ifdef SIGCHLD
RETSIGTYPE (*chfunc)(int);
- rb_last_status_clear();
chfunc = signal(SIGCHLD, SIG_DFL);
#endif
- pid = rb_spawn_internal(argc, argv, NULL, 0);
+ pid = rb_spawn_internal(argc, argv, FALSE, NULL, 0);
#if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
if (pid > 0) {
- int ret, status;
- ret = rb_waitpid(pid, &status, 0);
- if (ret == (rb_pid_t)-1)
- rb_sys_fail("Another thread waited the process started by system().");
+ rb_syswait(pid);
}
#endif
#ifdef SIGCHLD
@@ -3860,12 +3025,11 @@ rb_f_system(int argc, VALUE *argv)
* :pgroup => true or 0 : make a new process group
* :pgroup => pgid : join to specified process group
* :pgroup => nil : don't change the process group (default)
- * create new process group: Windows only
- * :new_pgroup => true : the new process is the root process of a new process group
- * :new_pgroup => false : don't create a new process group (default)
* resource limit: resourcename is core, cpu, data, etc. See Process.setrlimit.
* :rlimit_resourcename => limit
* :rlimit_resourcename => [cur_limit, max_limit]
+ * current directory:
+ * :chdir => str
* umask:
* :umask => int
* redirection:
@@ -3887,9 +3051,8 @@ rb_f_system(int argc, VALUE *argv)
* integer : the file descriptor of specified the integer
* io : the file descriptor specified as io.fileno
* file descriptor inheritance: close non-redirected non-standard fds (3, 4, 5, ...) or not
- * :close_others => true : don't inherit
- * current directory:
- * :chdir => str
+ * :close_others => false : inherit fds (default for system and exec)
+ * :close_others => true : don't inherit (default for spawn and IO.popen)
*
* If a hash is given as +env+, the environment is
* updated by +env+ before <code>exec(2)</code> in the child process.
@@ -3901,7 +3064,6 @@ rb_f_system(int argc, VALUE *argv)
* If a hash is given as +options+,
* it specifies
* process group,
- * create new process group,
* resource limit,
* current directory,
* umask and
@@ -3923,17 +3085,6 @@ rb_f_system(int argc, VALUE *argv)
* pid = spawn(command, :pgroup=>true) # process leader
* pid = spawn(command, :pgroup=>10) # belongs to the process group 10
*
- * The <code>:new_pgroup</code> key in +options+ specifies to pass
- * +CREATE_NEW_PROCESS_GROUP+ flag to <code>CreateProcessW()</code> that is
- * Windows API. This option is only for Windows.
- * true means the new process is the root process of the new process group.
- * The new process has CTRL+C disabled. This flag is necessary for
- * <code>Process.kill(:SIGINT, pid)</code> on the subprocess.
- * :new_pgroup is false by default.
- *
- * pid = spawn(command, :new_pgroup=>true) # new process group
- * pid = spawn(command, :new_pgroup=>false) # same process group
- *
* The <code>:rlimit_</code><em>foo</em> key specifies a resource limit.
* <em>foo</em> should be one of resource types such as <code>core</code>.
* The corresponding value should be an integer or an array which have one or
@@ -3945,6 +3096,10 @@ rb_f_system(int argc, VALUE *argv)
* pid = spawn(command, :rlimit_core=>max) # enable core dump
* pid = spawn(command, :rlimit_core=>0) # never dump core.
*
+ * The <code>:chdir</code> key in +options+ specifies the current directory.
+ *
+ * pid = spawn(command, :chdir=>"/var/tmp")
+ *
* The <code>:umask</code> key in +options+ specifies the umask.
*
* pid = spawn(command, :umask=>077)
@@ -4011,7 +3166,7 @@ rb_f_system(int argc, VALUE *argv)
* This is different from fd.
* For example, :err=>:out means redirecting child stderr to parent stdout.
* But :err=>[:child, :out] means redirecting child stderr to child stdout.
- * They differ if stdout is redirected in the child process as follows.
+ * They differs if stdout is redirected in the child process as follows.
*
* # stdout and stderr is redirected to log file.
* # The file "log" is opened just once.
@@ -4024,10 +3179,6 @@ rb_f_system(int argc, VALUE *argv)
* io = IO.popen(["sh", "-c", "echo out; echo err >&2", :err=>[:child, :out]])
* p io.read #=> "out\nerr\n"
*
- * The <code>:chdir</code> key in +options+ specifies the current directory.
- *
- * pid = spawn(command, :chdir=>"/var/tmp")
- *
* spawn closes all non-standard unspecified descriptors by default.
* The "standard" descriptors are 0, 1 and 2.
* This behavior is specified by :close_others option.
@@ -4039,9 +3190,6 @@ rb_f_system(int argc, VALUE *argv)
*
* :close_others is true by default for spawn and IO.popen.
*
- * Note that fds which close-on-exec flag is already set are closed
- * regardless of :close_others option.
- *
* So IO.pipe and spawn can be used as IO.popen.
*
* # similar to r = IO.popen(command)
@@ -4082,21 +3230,13 @@ rb_f_spawn(int argc, VALUE *argv)
{
rb_pid_t pid;
char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' };
- VALUE execarg_obj, fail_str;
- struct rb_execarg *eargp;
-
- execarg_obj = rb_execarg_new(argc, argv, TRUE);
- eargp = rb_execarg_get(execarg_obj);
- rb_execarg_fixup(execarg_obj);
- fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
-
- pid = rb_spawn_process(eargp, errmsg, sizeof(errmsg));
- RB_GC_GUARD(execarg_obj);
+ struct rb_exec_arg earg;
+ pid = rb_spawn_process(&earg, rb_exec_arg_prepare(&earg, argc, argv, TRUE), errmsg, sizeof(errmsg));
if (pid == -1) {
const char *prog = errmsg;
- if (!prog[0]) {
- rb_sys_fail_str(fail_str);
+ if (!prog[0] && !(prog = earg.prog) && earg.argc) {
+ prog = RSTRING_PTR(earg.argv[0]);
}
rb_sys_fail(prog);
}
@@ -4133,10 +3273,12 @@ rb_f_sleep(int argc, VALUE *argv)
if (argc == 0) {
rb_thread_sleep_forever();
}
- else {
- rb_check_arity(argc, 0, 1);
+ else if (argc == 1) {
rb_thread_wait_for(rb_time_interval(argv[0]));
}
+ else {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
+ }
end = time(0) - beg;
@@ -4258,40 +3400,6 @@ proc_setpgid(VALUE obj, VALUE pid, VALUE pgrp)
#endif
-#ifdef HAVE_GETSID
-/*
- * call-seq:
- * Process.getsid() -> integer
- * Process.getsid(pid) -> integer
- *
- * Returns the session ID for for the given process id. If not give,
- * return current process sid. Not available on all platforms.
- *
- * Process.getsid() #=> 27422
- * Process.getsid(0) #=> 27422
- * Process.getsid(Process.pid()) #=> 27422
- */
-static VALUE
-proc_getsid(int argc, VALUE *argv)
-{
- rb_pid_t sid;
- VALUE pid;
-
- rb_secure(2);
- rb_scan_args(argc, argv, "01", &pid);
-
- if (NIL_P(pid))
- pid = INT2NUM(0);
-
- sid = getsid(NUM2PIDT(pid));
- if (sid < 0) rb_sys_fail(0);
- return PIDT2NUM(sid);
-}
-#else
-#define proc_getsid rb_f_notimplement
-#endif
-
-
#if defined(HAVE_SETSID) || (defined(HAVE_SETPGRP) && defined(TIOCNOTTY))
#if !defined(HAVE_SETSID)
static rb_pid_t ruby_setsid(void);
@@ -4338,8 +3446,7 @@ ruby_setsid(void)
#endif
if (ret == -1) return -1;
- if ((fd = rb_cloexec_open("/dev/tty", O_RDWR, 0)) >= 0) {
- rb_update_max_fd(fd);
+ if ((fd = open("/dev/tty", O_RDWR)) >= 0) {
ioctl(fd, TIOCNOTTY, NULL);
close(fd);
}
@@ -4419,114 +3526,83 @@ proc_setpriority(VALUE obj, VALUE which, VALUE who, VALUE prio)
#define proc_setpriority rb_f_notimplement
#endif
-#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
+#if defined(RLIM2NUM)
static int
rlimit_resource_name2int(const char *name, int casetype)
{
- int resource;
- const char *p;
-#define RESCHECK(r) \
- do { \
- if (STRCASECMP(name, #r) == 0) { \
- resource = RLIMIT_##r; \
- goto found; \
- } \
- } while (0)
-
- switch (TOUPPER(*name)) {
+ size_t len = strlen(name);
+ if (16 < len) return -1;
+ if (casetype == 1) {
+ size_t i;
+ char *name2 = ALLOCA_N(char, len+1);
+ for (i = 0; i < len; i++) {
+ if (!ISLOWER(name[i]))
+ return -1;
+ name2[i] = TOUPPER(name[i]);
+ }
+ name2[len] = '\0';
+ name = name2;
+ }
+
+ switch (*name) {
case 'A':
#ifdef RLIMIT_AS
- RESCHECK(AS);
+ if (strcmp(name, "AS") == 0) return RLIMIT_AS;
#endif
break;
case 'C':
#ifdef RLIMIT_CORE
- RESCHECK(CORE);
+ if (strcmp(name, "CORE") == 0) return RLIMIT_CORE;
#endif
#ifdef RLIMIT_CPU
- RESCHECK(CPU);
+ if (strcmp(name, "CPU") == 0) return RLIMIT_CPU;
#endif
break;
case 'D':
#ifdef RLIMIT_DATA
- RESCHECK(DATA);
+ if (strcmp(name, "DATA") == 0) return RLIMIT_DATA;
#endif
break;
case 'F':
#ifdef RLIMIT_FSIZE
- RESCHECK(FSIZE);
+ if (strcmp(name, "FSIZE") == 0) return RLIMIT_FSIZE;
#endif
break;
case 'M':
#ifdef RLIMIT_MEMLOCK
- RESCHECK(MEMLOCK);
-#endif
-#ifdef RLIMIT_MSGQUEUE
- RESCHECK(MSGQUEUE);
+ if (strcmp(name, "MEMLOCK") == 0) return RLIMIT_MEMLOCK;
#endif
break;
case 'N':
#ifdef RLIMIT_NOFILE
- RESCHECK(NOFILE);
+ if (strcmp(name, "NOFILE") == 0) return RLIMIT_NOFILE;
#endif
#ifdef RLIMIT_NPROC
- RESCHECK(NPROC);
-#endif
-#ifdef RLIMIT_NICE
- RESCHECK(NICE);
+ if (strcmp(name, "NPROC") == 0) return RLIMIT_NPROC;
#endif
break;
case 'R':
#ifdef RLIMIT_RSS
- RESCHECK(RSS);
-#endif
-#ifdef RLIMIT_RTPRIO
- RESCHECK(RTPRIO);
-#endif
-#ifdef RLIMIT_RTTIME
- RESCHECK(RTTIME);
+ if (strcmp(name, "RSS") == 0) return RLIMIT_RSS;
#endif
break;
case 'S':
#ifdef RLIMIT_STACK
- RESCHECK(STACK);
+ if (strcmp(name, "STACK") == 0) return RLIMIT_STACK;
#endif
#ifdef RLIMIT_SBSIZE
- RESCHECK(SBSIZE);
-#endif
-#ifdef RLIMIT_SIGPENDING
- RESCHECK(SIGPENDING);
+ if (strcmp(name, "SBSIZE") == 0) return RLIMIT_SBSIZE;
#endif
break;
}
return -1;
-
- found:
- switch (casetype) {
- case 0:
- for (p = name; *p; p++)
- if (!ISUPPER(*p))
- return -1;
- break;
-
- case 1:
- for (p = name; *p; p++)
- if (!ISLOWER(*p))
- return -1;
- break;
-
- default:
- rb_bug("unexpected casetype");
- }
- return resource;
-#undef RESCHECK
}
static int
@@ -4573,8 +3649,6 @@ rlimit_resource_type(VALUE rtype)
return r;
rb_raise(rb_eArgError, "invalid resource name: %s", name);
-
- UNREACHABLE;
}
static rlim_t
@@ -4613,8 +3687,6 @@ rlimit_resource_value(VALUE rval)
if (strcmp(name, "SAVED_CUR") == 0) return RLIM_SAVED_CUR;
#endif
rb_raise(rb_eArgError, "invalid resource value: %s", name);
-
- UNREACHABLE;
}
#endif
@@ -4674,22 +3746,17 @@ proc_getrlimit(VALUE obj, VALUE resource)
* The available resources are OS dependent.
* Ruby may support following resources.
*
- * [AS] total available memory (bytes) (SUSv3, NetBSD, FreeBSD, OpenBSD but 4.4BSD-Lite)
* [CORE] core size (bytes) (SUSv3)
* [CPU] CPU time (seconds) (SUSv3)
* [DATA] data segment (bytes) (SUSv3)
* [FSIZE] file size (bytes) (SUSv3)
- * [MEMLOCK] total size for mlock(2) (bytes) (4.4BSD, GNU/Linux)
- * [MSGQUEUE] allocation for POSIX message queues (bytes) (GNU/Linux)
- * [NICE] ceiling on process's nice(2) value (number) (GNU/Linux)
* [NOFILE] file descriptors (number) (SUSv3)
+ * [STACK] stack size (bytes) (SUSv3)
+ * [AS] total available memory (bytes) (SUSv3, NetBSD, FreeBSD, OpenBSD but 4.4BSD-Lite)
+ * [MEMLOCK] total size for mlock(2) (bytes) (4.4BSD, GNU/Linux)
* [NPROC] number of processes for the user (number) (4.4BSD, GNU/Linux)
* [RSS] resident memory size (bytes) (4.2BSD, GNU/Linux)
- * [RTPRIO] ceiling on the process's real-time priority (number) (GNU/Linux)
- * [RTTIME] CPU time for real-time process (us) (GNU/Linux)
* [SBSIZE] all socket buffers (bytes) (NetBSD, FreeBSD)
- * [SIGPENDING] number of queued signals allowed (signals) (GNU/Linux)
- * [STACK] stack size (bytes) (SUSv3)
*
* _cur_limit_ and _max_limit_ may be
* <code>:INFINITY</code>, <code>"INFINITY"</code> or
@@ -4700,7 +3767,7 @@ proc_getrlimit(VALUE obj, VALUE resource)
* corresponding symbols and strings too.
* See system setrlimit(2) manual for details.
*
- * The following example raises the soft limit of core size to
+ * The following example raise the soft limit of core size to
* the hard limit to try to make core dump possible.
*
* Process.setrlimit(:CORE, Process.getrlimit(:CORE)[1])
@@ -4762,146 +3829,13 @@ check_gid_switch(void)
* <code>Process::UID</code>, and <code>Process::GID</code> modules.
*/
-#if defined(HAVE_PWD_H)
-static rb_uid_t
-obj2uid(VALUE id
-# ifdef USE_GETPWNAM_R
- , VALUE *getpw_tmp
-# endif
- )
-{
- rb_uid_t uid;
- VALUE tmp;
-
- if (FIXNUM_P(id) || NIL_P(tmp = rb_check_string_type(id))) {
- uid = NUM2UIDT(id);
- }
- else {
- const char *usrname = StringValueCStr(id);
- struct passwd *pwptr;
-#ifdef USE_GETPWNAM_R
- struct passwd pwbuf;
- char *getpw_buf;
- long getpw_buf_len;
- if (!*getpw_tmp) {
- getpw_buf_len = GETPW_R_SIZE_INIT;
- if (getpw_buf_len < 0) getpw_buf_len = GETPW_R_SIZE_DEFAULT;
- getpw_buf = rb_alloc_tmp_buffer(getpw_tmp, getpw_buf_len);
- }
- else {
- getpw_buf = RSTRING_PTR(*getpw_tmp);
- getpw_buf_len = rb_str_capacity(*getpw_tmp);
- }
- errno = ERANGE;
- /* gepwnam_r() on MacOS X doesn't set errno if buffer size is insufficient */
- while (getpwnam_r(usrname, &pwbuf, getpw_buf, getpw_buf_len, &pwptr)) {
- if (errno != ERANGE || getpw_buf_len >= GETPW_R_SIZE_LIMIT) {
- rb_free_tmp_buffer(getpw_tmp);
- rb_sys_fail("getpwnam_r");
- }
- rb_str_modify_expand(*getpw_tmp, getpw_buf_len);
- getpw_buf = RSTRING_PTR(*getpw_tmp);
- getpw_buf_len = rb_str_capacity(*getpw_tmp);
- }
-#else
- pwptr = getpwnam(usrname);
-#endif
- if (!pwptr) {
-#ifndef USE_GETPWNAM_R
- endpwent();
-#endif
- rb_raise(rb_eArgError, "can't find user for %s", usrname);
- }
- uid = pwptr->pw_uid;
-#ifndef USE_GETPWNAM_R
- endpwent();
-#endif
- }
- return uid;
-}
-
-# ifdef p_uid_from_name
-static VALUE
-p_uid_from_name(VALUE self, VALUE id)
-{
- return UIDT2NUM(OBJ2UID(id));
-}
-# endif
-#endif
-
-#if defined(HAVE_GRP_H)
-static rb_gid_t
-obj2gid(VALUE id
-# ifdef USE_GETGRNAM_R
- , VALUE *getgr_tmp
-# endif
- )
-{
- rb_gid_t gid;
- VALUE tmp;
-
- if (FIXNUM_P(id) || NIL_P(tmp = rb_check_string_type(id))) {
- gid = NUM2GIDT(id);
- }
- else {
- const char *grpname = StringValueCStr(id);
- struct group *grptr;
-#ifdef USE_GETGRNAM_R
- struct group grbuf;
- char *getgr_buf;
- long getgr_buf_len;
- if (!*getgr_tmp) {
- getgr_buf_len = GETGR_R_SIZE_INIT;
- if (getgr_buf_len < 0) getgr_buf_len = GETGR_R_SIZE_DEFAULT;
- getgr_buf = rb_alloc_tmp_buffer(getgr_tmp, getgr_buf_len);
- }
- else {
- getgr_buf = RSTRING_PTR(*getgr_tmp);
- getgr_buf_len = rb_str_capacity(*getgr_tmp);
- }
- errno = ERANGE;
- /* gegrnam_r() on MacOS X doesn't set errno if buffer size is insufficient */
- while (getgrnam_r(grpname, &grbuf, getgr_buf, getgr_buf_len, &grptr)) {
- if (errno != ERANGE || getgr_buf_len >= GETGR_R_SIZE_LIMIT) {
- rb_free_tmp_buffer(getgr_tmp);
- rb_sys_fail("getgrnam_r");
- }
- rb_str_modify_expand(*getgr_tmp, getgr_buf_len);
- getgr_buf = RSTRING_PTR(*getgr_tmp);
- getgr_buf_len = rb_str_capacity(*getgr_tmp);
- }
-#else
- grptr = getgrnam(grpname);
-#endif
- if (!grptr) {
-#ifndef USE_GETGRNAM_R
- endgrent();
-#endif
- rb_raise(rb_eArgError, "can't find group for %s", grpname);
- }
- gid = grptr->gr_gid;
-#ifndef USE_GETGRNAM_R
- endgrent();
-#endif
- }
- return gid;
-}
-
-# ifdef p_gid_from_name
-static VALUE
-p_gid_from_name(VALUE self, VALUE id)
-{
- return GIDT2NUM(OBJ2GID(id));
-}
-# endif
-#endif
#if defined HAVE_SETUID
/*
* call-seq:
- * Process::Sys.setuid(user) -> nil
+ * Process::Sys.setuid(integer) -> nil
*
- * Set the user ID of the current process to _user_. Not
+ * Set the user ID of the current process to _integer_. Not
* available on all platforms.
*
*/
@@ -4910,7 +3844,7 @@ static VALUE
p_sys_setuid(VALUE obj, VALUE id)
{
check_uid_switch();
- if (setuid(OBJ2UID(id)) != 0) rb_sys_fail(0);
+ if (setuid(NUM2UIDT(id)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -4921,9 +3855,9 @@ p_sys_setuid(VALUE obj, VALUE id)
#if defined HAVE_SETRUID
/*
* call-seq:
- * Process::Sys.setruid(user) -> nil
+ * Process::Sys.setruid(integer) -> nil
*
- * Set the real user ID of the calling process to _user_.
+ * Set the real user ID of the calling process to _integer_.
* Not available on all platforms.
*
*/
@@ -4932,7 +3866,7 @@ static VALUE
p_sys_setruid(VALUE obj, VALUE id)
{
check_uid_switch();
- if (setruid(OBJ2UID(id)) != 0) rb_sys_fail(0);
+ if (setruid(NUM2UIDT(id)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -4943,10 +3877,10 @@ p_sys_setruid(VALUE obj, VALUE id)
#if defined HAVE_SETEUID
/*
* call-seq:
- * Process::Sys.seteuid(user) -> nil
+ * Process::Sys.seteuid(integer) -> nil
*
* Set the effective user ID of the calling process to
- * _user_. Not available on all platforms.
+ * _integer_. Not available on all platforms.
*
*/
@@ -4954,7 +3888,7 @@ static VALUE
p_sys_seteuid(VALUE obj, VALUE id)
{
check_uid_switch();
- if (seteuid(OBJ2UID(id)) != 0) rb_sys_fail(0);
+ if (seteuid(NUM2UIDT(id)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -4967,7 +3901,7 @@ p_sys_seteuid(VALUE obj, VALUE id)
* call-seq:
* Process::Sys.setreuid(rid, eid) -> nil
*
- * Sets the (user) real and/or effective user IDs of the current
+ * Sets the (integer) real and/or effective user IDs of the current
* process to _rid_ and _eid_, respectively. A value of
* <code>-1</code> for either means to leave that ID unchanged. Not
* available on all platforms.
@@ -4977,13 +3911,8 @@ p_sys_seteuid(VALUE obj, VALUE id)
static VALUE
p_sys_setreuid(VALUE obj, VALUE rid, VALUE eid)
{
- rb_uid_t ruid, euid;
- PREPARE_GETPWNAM;
check_uid_switch();
- ruid = OBJ2UID1(rid);
- euid = OBJ2UID1(eid);
- FINISH_GETPWNAM;
- if (setreuid(ruid, euid) != 0) rb_sys_fail(0);
+ if (setreuid(NUM2UIDT(rid),NUM2UIDT(eid)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -4996,7 +3925,7 @@ p_sys_setreuid(VALUE obj, VALUE rid, VALUE eid)
* call-seq:
* Process::Sys.setresuid(rid, eid, sid) -> nil
*
- * Sets the (user) real, effective, and saved user IDs of the
+ * Sets the (integer) real, effective, and saved user IDs of the
* current process to _rid_, _eid_, and _sid_ respectively. A
* value of <code>-1</code> for any value means to
* leave that ID unchanged. Not available on all platforms.
@@ -5006,14 +3935,8 @@ p_sys_setreuid(VALUE obj, VALUE rid, VALUE eid)
static VALUE
p_sys_setresuid(VALUE obj, VALUE rid, VALUE eid, VALUE sid)
{
- rb_uid_t ruid, euid, suid;
- PREPARE_GETPWNAM;
check_uid_switch();
- ruid = OBJ2UID1(rid);
- euid = OBJ2UID1(eid);
- suid = OBJ2UID1(sid);
- FINISH_GETPWNAM;
- if (setresuid(ruid, euid, suid) != 0) rb_sys_fail(0);
+ if (setresuid(NUM2UIDT(rid),NUM2UIDT(eid),NUM2UIDT(sid)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -5043,9 +3966,9 @@ proc_getuid(VALUE obj)
#if defined(HAVE_SETRESUID) || defined(HAVE_SETREUID) || defined(HAVE_SETRUID) || defined(HAVE_SETUID)
/*
* call-seq:
- * Process.uid= user -> numeric
+ * Process.uid= integer -> numeric
*
- * Sets the (user) user ID for this process. Not available on all
+ * Sets the (integer) user ID for this process. Not available on all
* platforms.
*/
@@ -5056,7 +3979,7 @@ proc_setuid(VALUE obj, VALUE id)
check_uid_switch();
- uid = OBJ2UID(id);
+ uid = NUM2UIDT(id);
#if defined(HAVE_SETRESUID)
if (setresuid(uid, -1, -1) < 0) rb_sys_fail(0);
#elif defined HAVE_SETREUID
@@ -5096,11 +4019,11 @@ static rb_uid_t SAVED_USER_ID = -1;
int
setreuid(rb_uid_t ruid, rb_uid_t euid)
{
- if (ruid != (rb_uid_t)-1 && ruid != getuid()) {
- if (euid == (rb_uid_t)-1) euid = geteuid();
+ if (ruid != -1 && ruid != getuid()) {
+ if (euid == -1) euid = geteuid();
if (setuid(ruid) < 0) return -1;
}
- if (euid != (rb_uid_t)-1 && euid != geteuid()) {
+ if (euid != -1 && euid != geteuid()) {
if (seteuid(euid) < 0) return -1;
}
return 0;
@@ -5109,10 +4032,10 @@ setreuid(rb_uid_t ruid, rb_uid_t euid)
/*
* call-seq:
- * Process::UID.change_privilege(user) -> fixnum
+ * Process::UID.change_privilege(integer) -> fixnum
*
* Change the current process's real and effective user ID to that
- * specified by _user_. Returns the new user ID. Not
+ * specified by _integer_. Returns the new user ID. Not
* available on all platforms.
*
* [Process.uid, Process.euid] #=> [0, 0]
@@ -5127,7 +4050,7 @@ p_uid_change_privilege(VALUE obj, VALUE id)
check_uid_switch();
- uid = OBJ2UID(id);
+ uid = NUM2UIDT(id);
if (geteuid() == 0) { /* root-user */
#if defined(HAVE_SETRESUID)
@@ -5140,24 +4063,21 @@ p_uid_change_privilege(VALUE obj, VALUE id)
if (getuid() == uid) {
if (SAVED_USER_ID == uid) {
if (setreuid(-1, uid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
if (uid == 0) { /* (r,e,s) == (root, root, x) */
if (setreuid(-1, SAVED_USER_ID) < 0) rb_sys_fail(0);
if (setreuid(SAVED_USER_ID, 0) < 0) rb_sys_fail(0);
SAVED_USER_ID = 0; /* (r,e,s) == (x, root, root) */
if (setreuid(uid, uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
- }
- else {
+ } else {
if (setreuid(0, -1) < 0) rb_sys_fail(0);
SAVED_USER_ID = 0;
if (setreuid(uid, uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
}
}
- }
- else {
+ } else {
if (setreuid(uid, uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
}
@@ -5165,14 +4085,12 @@ p_uid_change_privilege(VALUE obj, VALUE id)
if (getuid() == uid) {
if (SAVED_USER_ID == uid) {
if (seteuid(uid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
if (uid == 0) {
if (setruid(SAVED_USER_ID) < 0) rb_sys_fail(0);
SAVED_USER_ID = 0;
if (setruid(0) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
if (setruid(0) < 0) rb_sys_fail(0);
SAVED_USER_ID = 0;
if (seteuid(uid) < 0) rb_sys_fail(0);
@@ -5180,40 +4098,32 @@ p_uid_change_privilege(VALUE obj, VALUE id)
SAVED_USER_ID = uid;
}
}
- }
- else {
+ } else {
if (seteuid(uid) < 0) rb_sys_fail(0);
if (setruid(uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
}
#else
- (void)uid;
rb_notimplement();
#endif
- }
- else { /* unprivileged user */
+ } else { /* unprivileged user */
#if defined(HAVE_SETRESUID)
- if (setresuid((getuid() == uid)? (rb_uid_t)-1: uid,
- (geteuid() == uid)? (rb_uid_t)-1: uid,
- (SAVED_USER_ID == uid)? (rb_uid_t)-1: uid) < 0) rb_sys_fail(0);
+ if (setresuid((getuid() == uid)? -1: uid,
+ (geteuid() == uid)? -1: uid,
+ (SAVED_USER_ID == uid)? -1: uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
if (SAVED_USER_ID == uid) {
- if (setreuid((getuid() == uid)? (rb_uid_t)-1: uid,
- (geteuid() == uid)? (rb_uid_t)-1: uid) < 0)
- rb_sys_fail(0);
- }
- else if (getuid() != uid) {
- if (setreuid(uid, (geteuid() == uid)? (rb_uid_t)-1: uid) < 0)
- rb_sys_fail(0);
+ if (setreuid((getuid() == uid)? -1: uid,
+ (geteuid() == uid)? -1: uid) < 0) rb_sys_fail(0);
+ } else if (getuid() != uid) {
+ if (setreuid(uid, (geteuid() == uid)? -1: uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
- }
- else if (/* getuid() == uid && */ geteuid() != uid) {
+ } else if (/* getuid() == uid && */ geteuid() != uid) {
if (setreuid(geteuid(), uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
if (setreuid(uid, -1) < 0) rb_sys_fail(0);
- }
- else { /* getuid() == uid && geteuid() == uid */
+ } else { /* getuid() == uid && geteuid() == uid */
if (setreuid(-1, SAVED_USER_ID) < 0) rb_sys_fail(0);
if (setreuid(SAVED_USER_ID, uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
@@ -5223,25 +4133,21 @@ p_uid_change_privilege(VALUE obj, VALUE id)
if (SAVED_USER_ID == uid) {
if (geteuid() != uid && seteuid(uid) < 0) rb_sys_fail(0);
if (getuid() != uid && setruid(uid) < 0) rb_sys_fail(0);
- }
- else if (/* SAVED_USER_ID != uid && */ geteuid() == uid) {
+ } else if (/* SAVED_USER_ID != uid && */ geteuid() == uid) {
if (getuid() != uid) {
if (setruid(uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
- }
- else {
+ } else {
if (setruid(SAVED_USER_ID) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
if (setruid(uid) < 0) rb_sys_fail(0);
}
- }
- else if (/* geteuid() != uid && */ getuid() == uid) {
+ } else if (/* geteuid() != uid && */ getuid() == uid) {
if (seteuid(uid) < 0) rb_sys_fail(0);
if (setruid(SAVED_USER_ID) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
if (setruid(uid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
@@ -5250,24 +4156,21 @@ p_uid_change_privilege(VALUE obj, VALUE id)
/* (r,e,s)==(uid,?,?) ==> (uid,uid,uid) */
if (setuid(uid) < 0) rb_sys_fail(0);
SAVED_USER_ID = uid;
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
#elif defined HAVE_SETEUID
if (getuid() == uid && SAVED_USER_ID == uid) {
if (seteuid(uid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
#elif defined HAVE_SETUID
if (getuid() == uid && SAVED_USER_ID == uid) {
if (setuid(uid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
@@ -5283,9 +4186,9 @@ p_uid_change_privilege(VALUE obj, VALUE id)
#if defined HAVE_SETGID
/*
* call-seq:
- * Process::Sys.setgid(group) -> nil
+ * Process::Sys.setgid(integer) -> nil
*
- * Set the group ID of the current process to _group_. Not
+ * Set the group ID of the current process to _integer_. Not
* available on all platforms.
*
*/
@@ -5294,7 +4197,7 @@ static VALUE
p_sys_setgid(VALUE obj, VALUE id)
{
check_gid_switch();
- if (setgid(OBJ2GID(id)) != 0) rb_sys_fail(0);
+ if (setgid(NUM2GIDT(id)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -5305,9 +4208,9 @@ p_sys_setgid(VALUE obj, VALUE id)
#if defined HAVE_SETRGID
/*
* call-seq:
- * Process::Sys.setrgid(group) -> nil
+ * Process::Sys.setrgid(integer) -> nil
*
- * Set the real group ID of the calling process to _group_.
+ * Set the real group ID of the calling process to _integer_.
* Not available on all platforms.
*
*/
@@ -5316,7 +4219,7 @@ static VALUE
p_sys_setrgid(VALUE obj, VALUE id)
{
check_gid_switch();
- if (setrgid(OBJ2GID(id)) != 0) rb_sys_fail(0);
+ if (setrgid(NUM2GIDT(id)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -5327,10 +4230,10 @@ p_sys_setrgid(VALUE obj, VALUE id)
#if defined HAVE_SETEGID
/*
* call-seq:
- * Process::Sys.setegid(group) -> nil
+ * Process::Sys.setegid(integer) -> nil
*
* Set the effective group ID of the calling process to
- * _group_. Not available on all platforms.
+ * _integer_. Not available on all platforms.
*
*/
@@ -5338,7 +4241,7 @@ static VALUE
p_sys_setegid(VALUE obj, VALUE id)
{
check_gid_switch();
- if (setegid(OBJ2GID(id)) != 0) rb_sys_fail(0);
+ if (setegid(NUM2GIDT(id)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -5351,7 +4254,7 @@ p_sys_setegid(VALUE obj, VALUE id)
* call-seq:
* Process::Sys.setregid(rid, eid) -> nil
*
- * Sets the (group) real and/or effective group IDs of the current
+ * Sets the (integer) real and/or effective group IDs of the current
* process to <em>rid</em> and <em>eid</em>, respectively. A value of
* <code>-1</code> for either means to leave that ID unchanged. Not
* available on all platforms.
@@ -5361,13 +4264,8 @@ p_sys_setegid(VALUE obj, VALUE id)
static VALUE
p_sys_setregid(VALUE obj, VALUE rid, VALUE eid)
{
- rb_gid_t rgid, egid;
- PREPARE_GETGRNAM;
check_gid_switch();
- rgid = OBJ2GID(rid);
- egid = OBJ2GID(eid);
- FINISH_GETGRNAM;
- if (setregid(rgid, egid) != 0) rb_sys_fail(0);
+ if (setregid(NUM2GIDT(rid),NUM2GIDT(eid)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -5379,7 +4277,7 @@ p_sys_setregid(VALUE obj, VALUE rid, VALUE eid)
* call-seq:
* Process::Sys.setresgid(rid, eid, sid) -> nil
*
- * Sets the (group) real, effective, and saved user IDs of the
+ * Sets the (integer) real, effective, and saved user IDs of the
* current process to <em>rid</em>, <em>eid</em>, and <em>sid</em>
* respectively. A value of <code>-1</code> for any value means to
* leave that ID unchanged. Not available on all platforms.
@@ -5389,14 +4287,8 @@ p_sys_setregid(VALUE obj, VALUE rid, VALUE eid)
static VALUE
p_sys_setresgid(VALUE obj, VALUE rid, VALUE eid, VALUE sid)
{
- rb_gid_t rgid, egid, sgid;
- PREPARE_GETGRNAM;
check_gid_switch();
- rgid = OBJ2GID(rid);
- egid = OBJ2GID(eid);
- sgid = OBJ2GID(sid);
- FINISH_GETGRNAM;
- if (setresgid(rgid, egid, sgid) != 0) rb_sys_fail(0);
+ if (setresgid(NUM2GIDT(rid),NUM2GIDT(eid),NUM2GIDT(sid)) != 0) rb_sys_fail(0);
return Qnil;
}
#else
@@ -5423,8 +4315,7 @@ p_sys_issetugid(VALUE obj)
rb_secure(2);
if (issetugid()) {
return Qtrue;
- }
- else {
+ } else {
return Qfalse;
}
}
@@ -5467,7 +4358,7 @@ proc_setgid(VALUE obj, VALUE id)
check_gid_switch();
- gid = OBJ2GID(id);
+ gid = NUM2GIDT(id);
#if defined(HAVE_SETRESGID)
if (setresgid(gid, -1, -1) < 0) rb_sys_fail(0);
#elif defined HAVE_SETREGID
@@ -5491,52 +4382,7 @@ proc_setgid(VALUE obj, VALUE id)
#endif
-#if defined(HAVE_SETGROUPS) || defined(HAVE_GETGROUPS)
-/*
- * Maximum supplementary groups are platform dependent.
- * FWIW, 65536 is enough big for our supported OSs.
- *
- * OS Name max groups
- * -----------------------------------------------
- * Linux Kernel >= 2.6.3 65536
- * Linux Kernel < 2.6.3 32
- * IBM AIX 5.2 64
- * IBM AIX 5.3 ... 6.1 128
- * IBM AIX 7.1 128 (can be configured to be up to 2048)
- * OpenBSD, NetBSD 16
- * FreeBSD < 8.0 16
- * FreeBSD >=8.0 1023
- * Darwin (Mac OS X) 16
- * Sun Solaris 7,8,9,10 16
- * Sun Solaris 11 / OpenSolaris 1024
- * HP-UX 20
- * Windows 1015
- */
-static int _maxgroups = -1;
-static int
-get_sc_ngroups_max(void)
-{
-#ifdef _SC_NGROUPS_MAX
- return (int)sysconf(_SC_NGROUPS_MAX);
-#elif defined(NGROUPS_MAX)
- return (int)NGROUPS_MAX;
-#else
- return -1;
-#endif
-}
-static int
-maxgroups(void)
-{
- if (_maxgroups < 0) {
- _maxgroups = get_sc_ngroups_max();
- if (_maxgroups < 0)
- _maxgroups = RB_MAX_GROUPS;
- }
-
- return _maxgroups;
-}
-#endif
-
+static int maxgroups = 32;
#ifdef HAVE_GETGROUPS
@@ -5554,17 +4400,13 @@ maxgroups(void)
static VALUE
proc_getgroups(VALUE obj)
{
- VALUE ary, tmp;
+ VALUE ary;
int i, ngroups;
rb_gid_t *groups;
- ngroups = getgroups(0, NULL);
- if (ngroups == -1)
- rb_sys_fail(0);
-
- groups = ALLOCV_N(rb_gid_t, tmp, ngroups);
+ groups = ALLOCA_N(rb_gid_t, maxgroups);
- ngroups = getgroups(ngroups, groups);
+ ngroups = getgroups(maxgroups, groups);
if (ngroups == -1)
rb_sys_fail(0);
@@ -5572,8 +4414,6 @@ proc_getgroups(VALUE obj)
for (i = 0; i < ngroups; i++)
rb_ary_push(ary, GIDT2NUM(groups[i]));
- ALLOCV_END(tmp);
-
return ary;
}
#else
@@ -5598,31 +4438,45 @@ proc_getgroups(VALUE obj)
static VALUE
proc_setgroups(VALUE obj, VALUE ary)
{
- int ngroups, i;
+ size_t ngroups, i;
rb_gid_t *groups;
- VALUE tmp;
- PREPARE_GETGRNAM;
+ struct group *gr;
Check_Type(ary, T_ARRAY);
- ngroups = RARRAY_LENINT(ary);
- if (ngroups > maxgroups())
- rb_raise(rb_eArgError, "too many groups, %d max", maxgroups());
+ ngroups = RARRAY_LEN(ary);
+ if (ngroups > (size_t)maxgroups)
+ rb_raise(rb_eArgError, "too many groups, %u max", maxgroups);
- groups = ALLOCV_N(rb_gid_t, tmp, ngroups);
+ groups = ALLOCA_N(rb_gid_t, ngroups);
- for (i = 0; i < ngroups; i++) {
+ for (i = 0; i < ngroups && i < (size_t)RARRAY_LEN(ary); i++) {
VALUE g = RARRAY_PTR(ary)[i];
- groups[i] = OBJ2GID1(g);
+ if (FIXNUM_P(g)) {
+ groups[i] = NUM2GIDT(g);
+ }
+ else {
+ VALUE tmp = rb_check_string_type(g);
+
+ if (NIL_P(tmp)) {
+ groups[i] = NUM2GIDT(g);
+ }
+ else {
+ gr = getgrnam(RSTRING_PTR(tmp));
+ if (gr == NULL) {
+ RB_GC_GUARD(tmp);
+ rb_raise(rb_eArgError,
+ "can't find group for %s", RSTRING_PTR(tmp));
+ }
+ groups[i] = gr->gr_gid;
+ }
+ }
}
- FINISH_GETGRNAM;
- if (setgroups(ngroups, groups) == -1) /* ngroups <= maxgroups */
+ if (setgroups((int)ngroups, groups) == -1) /* ngroups <= maxgroups */
rb_sys_fail(0);
- ALLOCV_END(tmp);
-
return proc_getgroups(obj);
}
#else
@@ -5651,7 +4505,7 @@ proc_setgroups(VALUE obj, VALUE ary)
static VALUE
proc_initgroups(VALUE obj, VALUE uname, VALUE base_grp)
{
- if (initgroups(StringValuePtr(uname), OBJ2GID(base_grp)) != 0) {
+ if (initgroups(StringValuePtr(uname), NUM2GIDT(base_grp)) != 0) {
rb_sys_fail(0);
}
return proc_getgroups(obj);
@@ -5660,7 +4514,7 @@ proc_initgroups(VALUE obj, VALUE uname, VALUE base_grp)
#define proc_initgroups rb_f_notimplement
#endif
-#if defined(_SC_NGROUPS_MAX) || defined(NGROUPS_MAX)
+
/*
* call-seq:
* Process.maxgroups -> fixnum
@@ -5674,13 +4528,10 @@ proc_initgroups(VALUE obj, VALUE uname, VALUE base_grp)
static VALUE
proc_getmaxgroups(VALUE obj)
{
- return INT2FIX(maxgroups());
+ return INT2FIX(maxgroups);
}
-#else
-#define proc_getmaxgroups rb_f_notimplement
-#endif
-#ifdef HAVE_SETGROUPS
+
/*
* call-seq:
* Process.maxgroups= fixnum -> fixnum
@@ -5692,29 +4543,17 @@ proc_getmaxgroups(VALUE obj)
static VALUE
proc_setmaxgroups(VALUE obj, VALUE val)
{
- int ngroups = FIX2INT(val);
- int ngroups_max = get_sc_ngroups_max();
-
- if (ngroups <= 0)
- rb_raise(rb_eArgError, "maxgroups %d shold be positive", ngroups);
-
- if (ngroups > RB_MAX_GROUPS)
- ngroups = RB_MAX_GROUPS;
+ int ngroups = FIX2UINT(val);
- if (ngroups_max > 0 && ngroups > ngroups_max)
- ngroups = ngroups_max;
+ if (ngroups > 4096)
+ ngroups = 4096;
- _maxgroups = ngroups;
+ maxgroups = ngroups;
- return INT2FIX(_maxgroups);
+ return INT2FIX(maxgroups);
}
-#else
-#define proc_setmaxgroups rb_f_notimplement
-#endif
#if defined(HAVE_DAEMON) || (defined(HAVE_FORK) && defined(HAVE_SETSID))
-static int rb_daemon(int nochdir, int noclose);
-
/*
* call-seq:
* Process.daemon() -> 0
@@ -5738,51 +4577,47 @@ proc_daemon(int argc, VALUE *argv)
rb_secure(2);
rb_scan_args(argc, argv, "02", &nochdir, &noclose);
+#if defined(HAVE_DAEMON)
prefork();
- n = rb_daemon(RTEST(nochdir), RTEST(noclose));
- if (n < 0) rb_sys_fail("daemon");
- return INT2FIX(n);
-}
-
-static int
-rb_daemon(int nochdir, int noclose)
-{
- int err = 0;
-#ifdef HAVE_DAEMON
before_fork();
- err = daemon(nochdir, noclose);
+ n = daemon(RTEST(nochdir), RTEST(noclose));
after_fork();
- rb_thread_atfork();
-#else
- int n;
-
-#define fork_daemon() \
- switch (rb_fork_ruby(NULL)) { \
- case -1: return -1; \
- case 0: rb_thread_atfork(); break; \
- default: _exit(EXIT_SUCCESS); \
+ if (n < 0) rb_sys_fail("daemon");
+ return INT2FIX(n);
+#elif defined(HAVE_FORK)
+ switch (rb_fork(0, 0, 0, Qnil)) {
+ case -1:
+ rb_sys_fail("daemon");
+ case 0:
+ break;
+ default:
+ _exit(EXIT_SUCCESS);
}
- fork_daemon();
-
- if (setsid() < 0) return -1;
+ proc_setsid();
/* must not be process-leader */
- fork_daemon();
+ switch (rb_fork(0, 0, 0, Qnil)) {
+ case -1:
+ rb_sys_fail("daemon");
+ case 0:
+ break;
+ default:
+ _exit(EXIT_SUCCESS);
+ }
- if (!nochdir)
- err = chdir("/");
+ if (!RTEST(nochdir))
+ (void)chdir("/");
- if (!noclose && (n = rb_cloexec_open("/dev/null", O_RDWR, 0)) != -1) {
- rb_update_max_fd(n);
+ if (!RTEST(noclose) && (n = open("/dev/null", O_RDWR, 0)) != -1) {
(void)dup2(n, 0);
(void)dup2(n, 1);
(void)dup2(n, 2);
if (n > 2)
(void)close (n);
}
+ return INT2FIX(0);
#endif
- return err;
}
#else
#define proc_daemon rb_f_notimplement
@@ -5804,11 +4639,11 @@ static rb_gid_t SAVED_GROUP_ID = -1;
int
setregid(rb_gid_t rgid, rb_gid_t egid)
{
- if (rgid != (rb_gid_t)-1 && rgid != getgid()) {
- if (egid == (rb_gid_t)-1) egid = getegid();
+ if (rgid != -1 && rgid != getgid()) {
+ if (egid == -1) egid = getegid();
if (setgid(rgid) < 0) return -1;
}
- if (egid != (rb_gid_t)-1 && egid != getegid()) {
+ if (egid != -1 && egid != getegid()) {
if (setegid(egid) < 0) return -1;
}
return 0;
@@ -5817,10 +4652,10 @@ setregid(rb_gid_t rgid, rb_gid_t egid)
/*
* call-seq:
- * Process::GID.change_privilege(group) -> fixnum
+ * Process::GID.change_privilege(integer) -> fixnum
*
* Change the current process's real and effective group ID to that
- * specified by _group_. Returns the new group ID. Not
+ * specified by _integer_. Returns the new group ID. Not
* available on all platforms.
*
* [Process.gid, Process.egid] #=> [0, 0]
@@ -5835,7 +4670,7 @@ p_gid_change_privilege(VALUE obj, VALUE id)
check_gid_switch();
- gid = OBJ2GID(id);
+ gid = NUM2GIDT(id);
if (geteuid() == 0) { /* root-user */
#if defined(HAVE_SETRESGID)
@@ -5848,24 +4683,21 @@ p_gid_change_privilege(VALUE obj, VALUE id)
if (getgid() == gid) {
if (SAVED_GROUP_ID == gid) {
if (setregid(-1, gid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
if (gid == 0) { /* (r,e,s) == (root, y, x) */
if (setregid(-1, SAVED_GROUP_ID) < 0) rb_sys_fail(0);
if (setregid(SAVED_GROUP_ID, 0) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = 0; /* (r,e,s) == (x, root, root) */
if (setregid(gid, gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
- }
- else { /* (r,e,s) == (z, y, x) */
+ } else { /* (r,e,s) == (z, y, x) */
if (setregid(0, 0) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = 0;
if (setregid(gid, gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
}
}
- }
- else {
+ } else {
if (setregid(gid, gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
}
@@ -5873,15 +4705,13 @@ p_gid_change_privilege(VALUE obj, VALUE id)
if (getgid() == gid) {
if (SAVED_GROUP_ID == gid) {
if (setegid(gid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
if (gid == 0) {
if (setegid(gid) < 0) rb_sys_fail(0);
if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = 0;
if (setrgid(0) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
if (setrgid(0) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = 0;
if (setegid(gid) < 0) rb_sys_fail(0);
@@ -5889,8 +4719,7 @@ p_gid_change_privilege(VALUE obj, VALUE id)
SAVED_GROUP_ID = gid;
}
}
- }
- else {
+ } else {
if (setegid(gid) < 0) rb_sys_fail(0);
if (setrgid(gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
@@ -5898,30 +4727,24 @@ p_gid_change_privilege(VALUE obj, VALUE id)
#else
rb_notimplement();
#endif
- }
- else { /* unprivileged user */
+ } else { /* unprivileged user */
#if defined(HAVE_SETRESGID)
- if (setresgid((getgid() == gid)? (rb_gid_t)-1: gid,
- (getegid() == gid)? (rb_gid_t)-1: gid,
- (SAVED_GROUP_ID == gid)? (rb_gid_t)-1: gid) < 0) rb_sys_fail(0);
+ if (setresgid((getgid() == gid)? -1: gid,
+ (getegid() == gid)? -1: gid,
+ (SAVED_GROUP_ID == gid)? -1: gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
if (SAVED_GROUP_ID == gid) {
- if (setregid((getgid() == gid)? (rb_uid_t)-1: gid,
- (getegid() == gid)? (rb_uid_t)-1: gid) < 0)
- rb_sys_fail(0);
- }
- else if (getgid() != gid) {
- if (setregid(gid, (getegid() == gid)? (rb_uid_t)-1: gid) < 0)
- rb_sys_fail(0);
+ if (setregid((getgid() == gid)? -1: gid,
+ (getegid() == gid)? -1: gid) < 0) rb_sys_fail(0);
+ } else if (getgid() != gid) {
+ if (setregid(gid, (getegid() == gid)? -1: gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
- }
- else if (/* getgid() == gid && */ getegid() != gid) {
+ } else if (/* getgid() == gid && */ getegid() != gid) {
if (setregid(getegid(), gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
if (setregid(gid, -1) < 0) rb_sys_fail(0);
- }
- else { /* getgid() == gid && getegid() == gid */
+ } else { /* getgid() == gid && getegid() == gid */
if (setregid(-1, SAVED_GROUP_ID) < 0) rb_sys_fail(0);
if (setregid(SAVED_GROUP_ID, gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
@@ -5931,25 +4754,21 @@ p_gid_change_privilege(VALUE obj, VALUE id)
if (SAVED_GROUP_ID == gid) {
if (getegid() != gid && setegid(gid) < 0) rb_sys_fail(0);
if (getgid() != gid && setrgid(gid) < 0) rb_sys_fail(0);
- }
- else if (/* SAVED_GROUP_ID != gid && */ getegid() == gid) {
+ } else if (/* SAVED_GROUP_ID != gid && */ getegid() == gid) {
if (getgid() != gid) {
if (setrgid(gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
- }
- else {
+ } else {
if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
if (setrgid(gid) < 0) rb_sys_fail(0);
- }
}
- else if (/* getegid() != gid && */ getgid() == gid) {
+ } else if (/* getegid() != gid && */ getgid() == gid) {
if (setegid(gid) < 0) rb_sys_fail(0);
if (setrgid(SAVED_GROUP_ID) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
if (setrgid(gid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
@@ -5958,29 +4777,25 @@ p_gid_change_privilege(VALUE obj, VALUE id)
/* (r,e,s)==(gid,?,?) ==> (gid,gid,gid) */
if (setgid(gid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = gid;
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
#elif defined HAVE_SETEGID
if (getgid() == gid && SAVED_GROUP_ID == gid) {
if (setegid(gid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
#elif defined HAVE_SETGID
if (getgid() == gid && SAVED_GROUP_ID == gid) {
if (setgid(gid) < 0) rb_sys_fail(0);
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
#else
- (void)gid;
rb_notimplement();
#endif
}
@@ -6007,9 +4822,22 @@ proc_geteuid(VALUE obj)
}
#if defined(HAVE_SETRESUID) || defined(HAVE_SETREUID) || defined(HAVE_SETEUID) || defined(HAVE_SETUID) || defined(_POSIX_SAVED_IDS)
-static void
-proc_seteuid(rb_uid_t uid)
+/*
+ * call-seq:
+ * Process.euid= integer
+ *
+ * Sets the effective user ID for this process. Not available on all
+ * platforms.
+ */
+
+static VALUE
+proc_seteuid(VALUE obj, VALUE euid)
{
+ rb_uid_t uid;
+
+ check_uid_switch();
+
+ uid = NUM2UIDT(euid);
#if defined(HAVE_SETRESUID)
if (setresuid(-1, uid, -1) < 0) rb_sys_fail(0);
#elif defined HAVE_SETREUID
@@ -6026,25 +4854,12 @@ proc_seteuid(rb_uid_t uid)
#else
rb_notimplement();
#endif
+ return euid;
}
#endif
#if defined(HAVE_SETRESUID) || defined(HAVE_SETREUID) || defined(HAVE_SETEUID) || defined(HAVE_SETUID)
-/*
- * call-seq:
- * Process.euid= user
- *
- * Sets the effective user ID for this process. Not available on all
- * platforms.
- */
-
-static VALUE
-proc_seteuid_m(VALUE mod, VALUE euid)
-{
- check_uid_switch();
- proc_seteuid(OBJ2UID(euid));
- return euid;
-}
+#define proc_seteuid_m proc_seteuid
#else
#define proc_seteuid_m rb_f_notimplement
#endif
@@ -6052,22 +4867,17 @@ proc_seteuid_m(VALUE mod, VALUE euid)
static rb_uid_t
rb_seteuid_core(rb_uid_t euid)
{
-#if defined(HAVE_SETRESUID) || (defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID))
rb_uid_t uid;
-#endif
check_uid_switch();
-#if defined(HAVE_SETRESUID) || (defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID))
uid = getuid();
-#endif
#if defined(HAVE_SETRESUID)
if (uid != euid) {
if (setresuid(-1,euid,euid) < 0) rb_sys_fail(0);
SAVED_USER_ID = euid;
- }
- else {
+ } else {
if (setresuid(-1,euid,-1) < 0) rb_sys_fail(0);
}
#elif defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID)
@@ -6091,11 +4901,11 @@ rb_seteuid_core(rb_uid_t euid)
/*
* call-seq:
- * Process::UID.grant_privilege(user) -> fixnum
- * Process::UID.eid= user -> fixnum
+ * Process::UID.grant_privilege(integer) -> fixnum
+ * Process::UID.eid= integer -> fixnum
*
* Set the effective user ID, and if possible, the saved user ID of
- * the process to the given _user_. Returns the new
+ * the process to the given _integer_. Returns the new
* effective user ID. Not available on all platforms.
*
* [Process.uid, Process.euid] #=> [0, 0]
@@ -6106,7 +4916,7 @@ rb_seteuid_core(rb_uid_t euid)
static VALUE
p_uid_grant_privilege(VALUE obj, VALUE id)
{
- rb_seteuid_core(OBJ2UID(id));
+ rb_seteuid_core(NUM2UIDT(id));
return id;
}
@@ -6143,16 +4953,11 @@ proc_getegid(VALUE obj)
static VALUE
proc_setegid(VALUE obj, VALUE egid)
{
-#if defined(HAVE_SETRESGID) || defined(HAVE_SETREGID) || defined(HAVE_SETEGID) || defined(HAVE_SETGID)
rb_gid_t gid;
-#endif
check_gid_switch();
-#if defined(HAVE_SETRESGID) || defined(HAVE_SETREGID) || defined(HAVE_SETEGID) || defined(HAVE_SETGID)
- gid = OBJ2GID(egid);
-#endif
-
+ gid = NUM2GIDT(egid);
#if defined(HAVE_SETRESGID)
if (setresgid(-1, gid, -1) < 0) rb_sys_fail(0);
#elif defined HAVE_SETREGID
@@ -6182,22 +4987,17 @@ proc_setegid(VALUE obj, VALUE egid)
static rb_gid_t
rb_setegid_core(rb_gid_t egid)
{
-#if defined(HAVE_SETRESGID) || (defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID))
rb_gid_t gid;
-#endif
check_gid_switch();
-#if defined(HAVE_SETRESGID) || (defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID))
gid = getgid();
-#endif
#if defined(HAVE_SETRESGID)
if (gid != egid) {
if (setresgid(-1,egid,egid) < 0) rb_sys_fail(0);
SAVED_GROUP_ID = egid;
- }
- else {
+ } else {
if (setresgid(-1,egid,-1) < 0) rb_sys_fail(0);
}
#elif defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID)
@@ -6221,11 +5021,11 @@ rb_setegid_core(rb_gid_t egid)
/*
* call-seq:
- * Process::GID.grant_privilege(group) -> fixnum
- * Process::GID.eid = group -> fixnum
+ * Process::GID.grant_privilege(integer) -> fixnum
+ * Process::GID.eid = integer -> fixnum
*
* Set the effective group ID, and if possible, the saved group ID of
- * the process to the given _group_. Returns the new
+ * the process to the given _integer_. Returns the new
* effective group ID. Not available on all platforms.
*
* [Process.gid, Process.egid] #=> [0, 0]
@@ -6236,7 +5036,7 @@ rb_setegid_core(rb_gid_t egid)
static VALUE
p_gid_grant_privilege(VALUE obj, VALUE id)
{
- rb_setegid_core(OBJ2GID(id));
+ rb_setegid_core(NUM2GIDT(id));
return id;
}
@@ -6278,17 +5078,12 @@ p_uid_exchangeable(void)
static VALUE
p_uid_exchange(VALUE obj)
{
- rb_uid_t uid;
-#if defined(HAVE_SETRESUID) || (defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID))
- rb_uid_t euid;
-#endif
+ rb_uid_t uid, euid;
check_uid_switch();
uid = getuid();
-#if defined(HAVE_SETRESUID) || (defined(HAVE_SETREUID) && !defined(OBSOLETE_SETREUID))
euid = geteuid();
-#endif
#if defined(HAVE_SETRESUID)
if (setresuid(euid, uid, uid) < 0) rb_sys_fail(0);
@@ -6340,17 +5135,12 @@ p_gid_exchangeable(void)
static VALUE
p_gid_exchange(VALUE obj)
{
- rb_gid_t gid;
-#if defined(HAVE_SETRESGID) || (defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID))
- rb_gid_t egid;
-#endif
+ rb_gid_t gid, egid;
check_gid_switch();
gid = getgid();
-#if defined(HAVE_SETRESGID) || (defined(HAVE_SETREGID) && !defined(OBSOLETE_SETREGID))
egid = getegid();
-#endif
#if defined(HAVE_SETRESGID)
if (setresgid(egid, gid, gid) < 0) rb_sys_fail(0);
@@ -6420,31 +5210,25 @@ p_uid_switch(VALUE obj)
euid = geteuid();
if (uid != euid) {
- proc_seteuid(uid);
+ proc_seteuid(obj, UIDT2NUM(uid));
if (rb_block_given_p()) {
under_uid_switch = 1;
return rb_ensure(rb_yield, Qnil, p_uid_sw_ensure, SAVED_USER_ID);
- }
- else {
+ } else {
return UIDT2NUM(euid);
}
- }
- else if (euid != SAVED_USER_ID) {
- proc_seteuid(SAVED_USER_ID);
+ } else if (euid != SAVED_USER_ID) {
+ proc_seteuid(obj, UIDT2NUM(SAVED_USER_ID));
if (rb_block_given_p()) {
under_uid_switch = 1;
return rb_ensure(rb_yield, Qnil, p_uid_sw_ensure, euid);
- }
- else {
+ } else {
return UIDT2NUM(uid);
}
- }
- else {
+ } else {
errno = EPERM;
rb_sys_fail(0);
}
-
- UNREACHABLE;
}
#else
static VALUE
@@ -6472,8 +5256,7 @@ p_uid_switch(VALUE obj)
if (rb_block_given_p()) {
under_uid_switch = 1;
return rb_ensure(rb_yield, Qnil, p_uid_sw_ensure, obj);
- }
- else {
+ } else {
return UIDT2NUM(euid);
}
}
@@ -6539,8 +5322,7 @@ p_gid_switch(VALUE obj)
if (rb_block_given_p()) {
under_gid_switch = 1;
return rb_ensure(rb_yield, Qnil, p_gid_sw_ensure, SAVED_GROUP_ID);
- }
- else {
+ } else {
return GIDT2NUM(egid);
}
}
@@ -6549,8 +5331,7 @@ p_gid_switch(VALUE obj)
if (rb_block_given_p()) {
under_gid_switch = 1;
return rb_ensure(rb_yield, Qnil, p_gid_sw_ensure, egid);
- }
- else {
+ } else {
return GIDT2NUM(gid);
}
}
@@ -6558,8 +5339,6 @@ p_gid_switch(VALUE obj)
errno = EPERM;
rb_sys_fail(0);
}
-
- UNREACHABLE;
}
#else
static VALUE
@@ -6587,8 +5366,7 @@ p_gid_switch(VALUE obj)
if (rb_block_given_p()) {
under_gid_switch = 1;
return rb_ensure(rb_yield, Qnil, p_gid_sw_ensure, obj);
- }
- else {
+ } else {
return GIDT2NUM(egid);
}
}
@@ -6600,12 +5378,12 @@ p_gid_switch(VALUE obj)
* call-seq:
* Process.times -> aStructTms
*
- * Returns a <code>Tms</code> structure (see <code>Struct::Tms</code>)
- * that contains user and system CPU times for this process,
- * and also for children processes.
+ * Returns a <code>Tms</code> structure (see <code>Struct::Tms</code>
+ * on page 388) that contains user and system CPU times for this
+ * process.
*
* t = Process.times
- * [ t.utime, t.stime, t.cutime, t.cstime ] #=> [0.0, 0.02, 0.00, 0.00]
+ * [ t.utime, t.stime ] #=> [0.0, 0.02]
*/
VALUE
@@ -6666,17 +5444,13 @@ Init_process(void)
rb_mProcess = rb_define_module("Process");
#ifdef WNOHANG
- /* see Process.wait */
rb_define_const(rb_mProcess, "WNOHANG", INT2FIX(WNOHANG));
#else
- /* see Process.wait */
rb_define_const(rb_mProcess, "WNOHANG", INT2FIX(0));
#endif
#ifdef WUNTRACED
- /* see Process.wait */
rb_define_const(rb_mProcess, "WUNTRACED", INT2FIX(WUNTRACED));
#else
- /* see Process.wait */
rb_define_const(rb_mProcess, "WUNTRACED", INT2FIX(0));
#endif
@@ -6724,158 +5498,69 @@ Init_process(void)
rb_define_module_function(rb_mProcess, "getpgid", proc_getpgid, 1);
rb_define_module_function(rb_mProcess, "setpgid", proc_setpgid, 2);
- rb_define_module_function(rb_mProcess, "getsid", proc_getsid, -1);
rb_define_module_function(rb_mProcess, "setsid", proc_setsid, 0);
rb_define_module_function(rb_mProcess, "getpriority", proc_getpriority, 2);
rb_define_module_function(rb_mProcess, "setpriority", proc_setpriority, 3);
#ifdef HAVE_GETPRIORITY
- /* see Process.setpriority */
rb_define_const(rb_mProcess, "PRIO_PROCESS", INT2FIX(PRIO_PROCESS));
- /* see Process.setpriority */
rb_define_const(rb_mProcess, "PRIO_PGRP", INT2FIX(PRIO_PGRP));
- /* see Process.setpriority */
rb_define_const(rb_mProcess, "PRIO_USER", INT2FIX(PRIO_USER));
#endif
rb_define_module_function(rb_mProcess, "getrlimit", proc_getrlimit, 1);
rb_define_module_function(rb_mProcess, "setrlimit", proc_setrlimit, -1);
-#if defined(RLIM2NUM) && defined(RLIM_INFINITY)
+#ifdef RLIM2NUM
{
VALUE inf = RLIM2NUM(RLIM_INFINITY);
#ifdef RLIM_SAVED_MAX
{
VALUE v = RLIM_INFINITY == RLIM_SAVED_MAX ? inf : RLIM2NUM(RLIM_SAVED_MAX);
- /* see Process.setrlimit */
rb_define_const(rb_mProcess, "RLIM_SAVED_MAX", v);
}
#endif
- /* see Process.setrlimit */
rb_define_const(rb_mProcess, "RLIM_INFINITY", inf);
#ifdef RLIM_SAVED_CUR
{
VALUE v = RLIM_INFINITY == RLIM_SAVED_CUR ? inf : RLIM2NUM(RLIM_SAVED_CUR);
- /* see Process.setrlimit */
rb_define_const(rb_mProcess, "RLIM_SAVED_CUR", v);
}
#endif
}
-#ifdef RLIMIT_AS
- /* Maximum size of the process's virtual memory (address space) in bytes.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_AS", INT2FIX(RLIMIT_AS));
-#endif
#ifdef RLIMIT_CORE
- /* Maximum size of the core file.
- *
- * see the system getrlimit(2) manual for details.
- */
rb_define_const(rb_mProcess, "RLIMIT_CORE", INT2FIX(RLIMIT_CORE));
#endif
#ifdef RLIMIT_CPU
- /* CPU time limit in seconds.
- *
- * see the system getrlimit(2) manual for details.
- */
rb_define_const(rb_mProcess, "RLIMIT_CPU", INT2FIX(RLIMIT_CPU));
#endif
#ifdef RLIMIT_DATA
- /* Maximum size of the process's data segment.
- *
- * see the system getrlimit(2) manual for details.
- */
rb_define_const(rb_mProcess, "RLIMIT_DATA", INT2FIX(RLIMIT_DATA));
#endif
#ifdef RLIMIT_FSIZE
- /* Maximum size of files that the process may create.
- *
- * see the system getrlimit(2) manual for details.
- */
rb_define_const(rb_mProcess, "RLIMIT_FSIZE", INT2FIX(RLIMIT_FSIZE));
#endif
-#ifdef RLIMIT_MEMLOCK
- /* Maximum number of bytes of memory that may be locked into RAM.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_MEMLOCK", INT2FIX(RLIMIT_MEMLOCK));
+#ifdef RLIMIT_NOFILE
+ rb_define_const(rb_mProcess, "RLIMIT_NOFILE", INT2FIX(RLIMIT_NOFILE));
#endif
-#ifdef RLIMIT_MSGQUEUE
- /* Specifies the limit on the number of bytes that can be allocated
- * for POSIX message queues for the real user ID of the calling process.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_MSGQUEUE", INT2FIX(RLIMIT_MSGQUEUE));
+#ifdef RLIMIT_STACK
+ rb_define_const(rb_mProcess, "RLIMIT_STACK", INT2FIX(RLIMIT_STACK));
#endif
-#ifdef RLIMIT_NICE
- /* Specifies a ceiling to which the process's nice value can be raised.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_NICE", INT2FIX(RLIMIT_NICE));
+#ifdef RLIMIT_AS
+ rb_define_const(rb_mProcess, "RLIMIT_AS", INT2FIX(RLIMIT_AS));
#endif
-#ifdef RLIMIT_NOFILE
- /* Specifies a value one greater than the maximum file descriptor
- * number that can be opened by this process.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_NOFILE", INT2FIX(RLIMIT_NOFILE));
+#ifdef RLIMIT_MEMLOCK
+ rb_define_const(rb_mProcess, "RLIMIT_MEMLOCK", INT2FIX(RLIMIT_MEMLOCK));
#endif
#ifdef RLIMIT_NPROC
- /* The maximum number of processes that can be created for the
- * real user ID of the calling process.
- *
- * see the system getrlimit(2) manual for details.
- */
rb_define_const(rb_mProcess, "RLIMIT_NPROC", INT2FIX(RLIMIT_NPROC));
#endif
#ifdef RLIMIT_RSS
- /* Specifies the limit (in pages) of the process's resident set.
- *
- * see the system getrlimit(2) manual for details.
- */
rb_define_const(rb_mProcess, "RLIMIT_RSS", INT2FIX(RLIMIT_RSS));
#endif
-#ifdef RLIMIT_RTPRIO
- /* Specifies a ceiling on the real-time priority that may be set for this process.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_RTPRIO", INT2FIX(RLIMIT_RTPRIO));
-#endif
-#ifdef RLIMIT_RTTIME
- /* Specifies limit on CPU time this process scheduled under a real-time
- * scheduling policy can consume.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_RTTIME", INT2FIX(RLIMIT_RTTIME));
-#endif
#ifdef RLIMIT_SBSIZE
- /* Maximum size of the socket buffer.
- */
rb_define_const(rb_mProcess, "RLIMIT_SBSIZE", INT2FIX(RLIMIT_SBSIZE));
#endif
-#ifdef RLIMIT_SIGPENDING
- /* Specifies a limit on the number of signals that may be queued for
- * the real user ID of the calling process.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_SIGPENDING", INT2FIX(RLIMIT_SIGPENDING));
-#endif
-#ifdef RLIMIT_STACK
- /* Maximum size of the stack, in bytes.
- *
- * see the system getrlimit(2) manual for details.
- */
- rb_define_const(rb_mProcess, "RLIMIT_STACK", INT2FIX(RLIMIT_STACK));
-#endif
#endif
rb_define_module_function(rb_mProcess, "uid", proc_getuid, 0);
@@ -6924,12 +5609,6 @@ Init_process(void)
rb_define_module_function(rb_mProcGID, "sid_available?", p_gid_have_saved_id, 0);
rb_define_module_function(rb_mProcUID, "switch", p_uid_switch, 0);
rb_define_module_function(rb_mProcGID, "switch", p_gid_switch, 0);
-#ifdef p_uid_from_name
- rb_define_module_function(rb_mProcUID, "from_name", p_uid_from_name, 1);
-#endif
-#ifdef p_gid_from_name
- rb_define_module_function(rb_mProcGID, "from_name", p_gid_from_name, 1);
-#endif
rb_mProcID_Syscall = rb_define_module_under(rb_mProcess, "Sys");
diff --git a/random.c b/random.c
index 4cb6aee773..2da40b2bb6 100644
--- a/random.c
+++ b/random.c
@@ -73,9 +73,6 @@ The original copyright notice follows.
#endif
#include <math.h>
#include <errno.h>
-#if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
#ifdef _WIN32
# if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400
@@ -95,7 +92,7 @@ typedef int int_must_be_32bit_at_least[sizeof(int) * CHAR_BIT < 32 ? -1 : 1];
#define UMASK 0x80000000U /* most significant w-r bits */
#define LMASK 0x7fffffffU /* least significant r bits */
#define MIXBITS(u,v) ( ((u) & UMASK) | ((v) & LMASK) )
-#define TWIST(u,v) ((MIXBITS((u),(v)) >> 1) ^ ((v)&1U ? MATRIX_A : 0U))
+#define TWIST(u,v) ((MIXBITS(u,v) >> 1) ^ ((v)&1U ? MATRIX_A : 0U))
enum {MT_MAX_STATE = N};
@@ -218,6 +215,8 @@ genrand_real2(struct MT *mt)
#undef N
#undef M
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
+
typedef struct {
VALUE seed;
struct MT mt;
@@ -230,20 +229,15 @@ static rb_random_t default_rand;
static VALUE rand_init(struct MT *mt, VALUE vseed);
static VALUE random_seed(void);
-static rb_random_t *
-rand_start(rb_random_t *r)
+static struct MT *
+default_mt(void)
{
+ rb_random_t *r = &default_rand;
struct MT *mt = &r->mt;
if (!genrand_initialized(mt)) {
r->seed = rand_init(mt, random_seed());
}
- return r;
-}
-
-static struct MT *
-default_mt(void)
-{
- return &rand_start(&default_rand)->mt;
+ return mt;
}
unsigned int
@@ -265,7 +259,7 @@ rb_genrand_real(void)
#define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
#define DIGSPERINT (SIZEOF_INT/SIZEOF_BDIGITS)
#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
-#define BIGDN(x) RSHIFT((x),BITSPERDIG)
+#define BIGDN(x) RSHIFT(x,BITSPERDIG)
#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
#define BDIGMAX ((BDIGIT)-1)
@@ -327,7 +321,6 @@ int_pair_to_real_inclusive(unsigned int a, unsigned int b)
VALUE rb_cRandom;
#define id_minus '-'
#define id_plus '+'
-static ID id_rand, id_bytes;
/* :nodoc: */
static void
@@ -336,12 +329,7 @@ random_mark(void *ptr)
rb_gc_mark(((rb_random_t *)ptr)->seed);
}
-static void
-random_free(void *ptr)
-{
- if (ptr != &default_rand)
- xfree(ptr);
-}
+#define random_free RUBY_TYPED_DEFAULT_FREE
static size_t
random_memsize(const void *ptr)
@@ -351,11 +339,9 @@ random_memsize(const void *ptr)
static const rb_data_type_t random_data_type = {
"random",
- {
- random_mark,
- random_free,
- random_memsize,
- },
+ random_mark,
+ random_free,
+ random_memsize,
};
static rb_random_t *
@@ -366,16 +352,6 @@ get_rnd(VALUE obj)
return ptr;
}
-static rb_random_t *
-try_get_rnd(VALUE obj)
-{
- if (obj == rb_cRandom) {
- return rand_start(&default_rand);
- }
- if (!rb_typeddata_is_kind_of(obj, &random_data_type)) return NULL;
- return DATA_PTR(obj);
-}
-
/* :nodoc: */
static VALUE
random_alloc(VALUE klass)
@@ -404,7 +380,7 @@ rand_init(struct MT *mt, VALUE vseed)
fixnum_seed = -fixnum_seed;
buf[0] = (unsigned int)(fixnum_seed & 0xffffffff);
#if SIZEOF_LONG > SIZEOF_INT32
- if ((long)(int32_t)fixnum_seed != fixnum_seed) {
+ if ((long)(int)fixnum_seed != fixnum_seed) {
if ((buf[1] = (unsigned int)(fixnum_seed >> 32)) != 0) ++len;
}
#endif
@@ -416,7 +392,7 @@ rand_init(struct MT *mt, VALUE vseed)
}
else {
if (blen > MT_MAX_STATE * SIZEOF_INT32 / SIZEOF_BDIGITS)
- blen = MT_MAX_STATE * SIZEOF_INT32 / SIZEOF_BDIGITS;
+ blen = (len = MT_MAX_STATE) * SIZEOF_INT32 / SIZEOF_BDIGITS;
len = roomof((int)blen * SIZEOF_BDIGITS, SIZEOF_INT32);
}
/* allocate ints for init_by_array */
@@ -450,13 +426,20 @@ rand_init(struct MT *mt, VALUE vseed)
}
/*
- * call-seq:
- * Random.new(seed = Random.new_seed) -> prng
+ * call-seq: Random.new([seed]) -> prng
+ *
+ * Creates new Mersenne Twister based pseudorandom number generator with
+ * seed. When the argument seed is omitted, the generator is initialized
+ * with Random.new_seed.
*
- * Creates a new PRNG using +seed+ to set the initial state. If +seed+ is
- * omitted, the generator is initialized with Random.new_seed.
+ * The argument seed is used to ensure repeatable sequences of random numbers
+ * between different runs of the program.
*
- * See Random.srand for more information on the use of seed values.
+ * prng = Random.new(1234)
+ * [ prng.rand, prng.rand ] #=> [0.191519450378892, 0.622108771039832]
+ * [ prng.integer(10), prng.integer(1000) ] #=> [4, 664]
+ * prng = Random.new(1234)
+ * [ prng.rand, prng.rand ] #=> [0.191519450378892, 0.622108771039832]
*/
static VALUE
random_init(int argc, VALUE *argv, VALUE obj)
@@ -465,18 +448,16 @@ random_init(int argc, VALUE *argv, VALUE obj)
rb_random_t *rnd = get_rnd(obj);
if (argc == 0) {
- rb_check_frozen(obj);
vseed = random_seed();
}
else {
rb_scan_args(argc, argv, "01", &vseed);
- rb_check_copyable(obj, vseed);
}
rnd->seed = rand_init(&rnd->mt, vseed);
return obj;
}
-#define DEFAULT_SEED_LEN (DEFAULT_SEED_CNT * (int)sizeof(int))
+#define DEFAULT_SEED_LEN (DEFAULT_SEED_CNT * sizeof(int))
#if defined(S_ISCHR) && !defined(DOSISH)
# define USE_DEV_URANDOM 1
@@ -499,19 +480,16 @@ fill_random_seed(unsigned int seed[DEFAULT_SEED_CNT])
memset(seed, 0, DEFAULT_SEED_LEN);
#if USE_DEV_URANDOM
- if ((fd = rb_cloexec_open("/dev/urandom", O_RDONLY
+ if ((fd = open("/dev/urandom", O_RDONLY
#ifdef O_NONBLOCK
|O_NONBLOCK
#endif
#ifdef O_NOCTTY
|O_NOCTTY
#endif
- , 0)) >= 0) {
- rb_update_max_fd(fd);
+ )) >= 0) {
if (fstat(fd, &statbuf) == 0 && S_ISCHR(statbuf.st_mode)) {
- if (read(fd, seed, DEFAULT_SEED_LEN) < DEFAULT_SEED_LEN) {
- /* abandon */;
- }
+ (void)read(fd, seed, DEFAULT_SEED_LEN);
}
close(fd);
}
@@ -540,7 +518,8 @@ make_seed_value(const void *ptr)
{
const long len = DEFAULT_SEED_LEN/SIZEOF_BDIGITS;
BDIGIT *digits;
- NEWOBJ_OF(big, struct RBignum, rb_cBignum, T_BIGNUM);
+ NEWOBJ(big, struct RBignum);
+ OBJSETUP(big, rb_cBignum, T_BIGNUM);
RBIGNUM_SET_SIGN(big, 1);
rb_big_resize((VALUE)big, len + 1);
@@ -563,10 +542,7 @@ make_seed_value(const void *ptr)
/*
* call-seq: Random.new_seed -> integer
*
- * Returns an arbitrary seed value. This is used by Random.new
- * when no seed value is specified as an argument.
- *
- * Random.new_seed #=> 115032730400174366788466674494640623225
+ * Returns arbitrary value for seed.
*/
static VALUE
random_seed(void)
@@ -579,16 +555,7 @@ random_seed(void)
/*
* call-seq: prng.seed -> integer
*
- * Returns the seed value used to initialize the generator. This may be used to
- * initialize another generator with the same state at a later time, causing it
- * to produce the same sequence of numbers.
- *
- * prng1 = Random.new(1234)
- * prng1.seed #=> 1234
- * prng1.rand(100) #=> 47
- *
- * prng2 = Random.new(prng1.seed)
- * prng2.rand(100) #=> 47
+ * Returns the seed of the generator.
*/
static VALUE
random_get_seed(VALUE obj)
@@ -600,14 +567,9 @@ random_get_seed(VALUE obj)
static VALUE
random_copy(VALUE obj, VALUE orig)
{
- rb_random_t *rnd1, *rnd2;
- struct MT *mt;
-
- if (!OBJ_INIT_COPY(obj, orig)) return obj;
-
- rnd1 = get_rnd(obj);
- rnd2 = get_rnd(orig);
- mt = &rnd1->mt;
+ rb_random_t *rnd1 = get_rnd(obj);
+ rb_random_t *rnd2 = get_rnd(orig);
+ struct MT *mt = &rnd1->mt;
*rnd1 = *rnd2;
mt->next = mt->state + numberof(mt->state) - mt->left + 1;
@@ -690,7 +652,6 @@ random_load(VALUE obj, VALUE dump)
VALUE *ary;
unsigned long x;
- rb_check_copyable(obj, dump);
Check_Type(dump, T_ARRAY);
ary = RARRAY_PTR(dump);
switch (RARRAY_LEN(dump)) {
@@ -770,26 +731,17 @@ random_load(VALUE obj, VALUE dump)
}
/*
- * call-seq:
- * srand(number = Random.new_seed) -> old_seed
+ * call-seq:
+ * srand(number=0) -> old_seed
*
- * Seeds the system pseudo-random number generator, Random::DEFAULT, with
- * +number+. The previous seed value is returned.
- *
- * If +number+ is omitted, seeds the generator using a source of entropy
- * provided by the operating system, if available (/dev/urandom on Unix systems
- * or the RSA cryptographic provider on Windows), which is then combined with
- * the time, the process id, and a sequence number.
- *
- * srand may be used to ensure repeatable sequences of pseudo-random numbers
- * between different runs of the program. By setting the seed to a known value,
- * programs can be made deterministic during testing.
- *
- * srand 1234 # => 268519324636777531569100071560086917274
- * [ rand, rand ] # => [0.1915194503788923, 0.6221087710398319]
- * [ rand(10), rand(1000) ] # => [4, 664]
- * srand 1234 # => 1234
- * [ rand, rand ] # => [0.1915194503788923, 0.6221087710398319]
+ * Seeds the pseudorandom number generator to the value of
+ * <i>number</i>. If <i>number</i> is omitted
+ * or zero, seeds the generator using a combination of the time, the
+ * process id, and a sequence number. (This is also the behavior if
+ * <code>Kernel::rand</code> is called without previously calling
+ * <code>srand</code>, but without the sequence.) By setting the seed
+ * to a known value, scripts can be made deterministic during testing.
+ * The previous seed value is returned. Also see <code>Kernel::rand</code>.
*/
static VALUE
@@ -872,8 +824,8 @@ limited_big_rand(struct MT *mt, struct RBignum *limit)
0))
#else
/* SIZEOF_BDIGITS == 4 */
-# define BIG_GET32(big,i) (RBIGNUM_DIGITS(big)[(i)])
-# define BIG_SET32(big,i,d) (RBIGNUM_DIGITS(big)[(i)] = (d))
+# define BIG_GET32(big,i) (RBIGNUM_DIGITS(big)[i])
+# define BIG_SET32(big,i,d) (RBIGNUM_DIGITS(big)[i] = (d))
#endif
retry:
mask = 0;
@@ -898,93 +850,32 @@ limited_big_rand(struct MT *mt, struct RBignum *limit)
return rb_big_norm((VALUE)val);
}
-/*
- * Returns random unsigned long value in [0, +limit+].
- *
- * Note that +limit+ is included, and the range of the argument and the
- * return value depends on environments.
- */
unsigned long
-rb_genrand_ulong_limited(unsigned long limit)
+rb_rand_internal(unsigned long i)
{
- return limited_rand(default_mt(), limit);
+ struct MT *mt = default_mt();
+ return limited_rand(mt, i);
}
unsigned int
rb_random_int32(VALUE obj)
{
- rb_random_t *rnd = try_get_rnd(obj);
- if (!rnd) {
-#if SIZEOF_LONG * CHAR_BIT > 32
- VALUE lim = ULONG2NUM(0x100000000UL);
-#elif defined HAVE_LONG_LONG
- VALUE lim = ULL2NUM((LONG_LONG)0xffffffff+1);
-#else
- VALUE lim = rb_big_plus(ULONG2NUM(0xffffffff), INT2FIX(1));
-#endif
- return (unsigned int)NUM2ULONG(rb_funcall2(obj, id_rand, 1, &lim));
- }
+ rb_random_t *rnd = get_rnd(obj);
return genrand_int32(&rnd->mt);
}
double
rb_random_real(VALUE obj)
{
- rb_random_t *rnd = try_get_rnd(obj);
- if (!rnd) {
- VALUE v = rb_funcall2(obj, id_rand, 0, 0);
- double d = NUM2DBL(v);
- if (d < 0.0) {
- rb_raise(rb_eRangeError, "random number too small %g", d);
- }
- else if (d >= 1.0) {
- rb_raise(rb_eRangeError, "random number too big %g", d);
- }
- return d;
- }
+ rb_random_t *rnd = get_rnd(obj);
return genrand_real(&rnd->mt);
}
-static inline VALUE
-ulong_to_num_plus_1(unsigned long n)
-{
-#if HAVE_LONG_LONG
- return ULL2NUM((LONG_LONG)n+1);
-#else
- if (n >= ULONG_MAX) {
- return rb_big_plus(ULONG2NUM(n), INT2FIX(1));
- }
- return ULONG2NUM(n+1);
-#endif
-}
-
-unsigned long
-rb_random_ulong_limited(VALUE obj, unsigned long limit)
-{
- rb_random_t *rnd = try_get_rnd(obj);
- if (!rnd) {
- extern int rb_num_negative_p(VALUE);
- VALUE lim = ulong_to_num_plus_1(limit);
- VALUE v = rb_to_int(rb_funcall2(obj, id_rand, 1, &lim));
- unsigned long r = NUM2ULONG(v);
- if (rb_num_negative_p(v)) {
- rb_raise(rb_eRangeError, "random number too small %ld", r);
- }
- if (r > limit) {
- rb_raise(rb_eRangeError, "random number too big %ld", r);
- }
- return r;
- }
- return limited_rand(&rnd->mt, limit);
-}
-
/*
- * call-seq: prng.bytes(size) -> a_string
- *
- * Returns a random binary string containing +size+ bytes.
+ * call-seq: prng.bytes(size) -> prng
*
- * random_string = Random.new.bytes(10) # => "\xD7:R\xAB?\x83\xCE\xFAkO"
- * random_string.size # => 10
+ * Returns a random binary string. The argument size specified the length of
+ * the result string.
*/
static VALUE
random_bytes(VALUE obj, VALUE len)
@@ -995,17 +886,11 @@ random_bytes(VALUE obj, VALUE len)
VALUE
rb_random_bytes(VALUE obj, long n)
{
- rb_random_t *rnd = try_get_rnd(obj);
- VALUE bytes;
- char *ptr;
+ rb_random_t *rnd = get_rnd(obj);
+ VALUE bytes = rb_str_new(0, n);
+ char *ptr = RSTRING_PTR(bytes);
unsigned int r, i;
- if (!rnd) {
- VALUE len = LONG2NUM(n);
- return rb_funcall2(obj, id_bytes, 1, &len);
- }
- bytes = rb_str_new(0, n);
- ptr = RSTRING_PTR(bytes);
for (; n >= SIZEOF_INT32; n -= SIZEOF_INT32) {
r = genrand_int32(&rnd->mt);
i = SIZEOF_INT32;
@@ -1025,12 +910,11 @@ rb_random_bytes(VALUE obj, long n)
}
static VALUE
-range_values(VALUE vmax, VALUE *begp, VALUE *endp, int *exclp)
+range_values(VALUE vmax, VALUE *begp, int *exclp)
{
VALUE end, r;
if (!rb_range_values(vmax, begp, &end, exclp)) return Qfalse;
- if (endp) *endp = end;
if (!rb_respond_to(end, id_minus)) return Qfalse;
r = rb_funcall2(end, id_minus, 1, begp);
if (NIL_P(r)) return Qfalse;
@@ -1086,141 +970,49 @@ float_value(VALUE v)
return x;
}
-static inline VALUE
-rand_range(struct MT* mt, VALUE range)
-{
- VALUE beg = Qundef, end = Qundef, vmax, v;
- int excl = 0;
-
- if ((v = vmax = range_values(range, &beg, &end, &excl)) == Qfalse)
- return Qfalse;
- if (!RB_TYPE_P(vmax, T_FLOAT) && (v = rb_check_to_integer(vmax, "to_int"), !NIL_P(v))) {
- long max;
- vmax = v;
- v = Qnil;
- if (FIXNUM_P(vmax)) {
- fixnum:
- if ((max = FIX2LONG(vmax) - excl) >= 0) {
- unsigned long r = limited_rand(mt, (unsigned long)max);
- v = ULONG2NUM(r);
- }
- }
- else if (BUILTIN_TYPE(vmax) == T_BIGNUM && RBIGNUM_SIGN(vmax) && !rb_bigzero_p(vmax)) {
- vmax = excl ? rb_big_minus(vmax, INT2FIX(1)) : rb_big_norm(vmax);
- if (FIXNUM_P(vmax)) {
- excl = 0;
- goto fixnum;
- }
- v = limited_big_rand(mt, RBIGNUM(vmax));
- }
- }
- else if (v = rb_check_to_float(vmax), !NIL_P(v)) {
- int scale = 1;
- double max = RFLOAT_VALUE(v), mid = 0.5, r;
- if (isinf(max)) {
- double min = float_value(rb_to_float(beg)) / 2.0;
- max = float_value(rb_to_float(end)) / 2.0;
- scale = 2;
- mid = max + min;
- max -= min;
- }
- else {
- float_value(v);
- }
- v = Qnil;
- if (max > 0.0) {
- if (excl) {
- r = genrand_real(mt);
- }
- else {
- r = genrand_real2(mt);
- }
- if (scale > 1) {
- return rb_float_new(+(+(+(r - 0.5) * max) * scale) + mid);
- }
- v = rb_float_new(r * max);
- }
- else if (max == 0.0 && !excl) {
- v = rb_float_new(0.0);
- }
- }
-
- if (FIXNUM_P(beg) && FIXNUM_P(v)) {
- long x = FIX2LONG(beg) + FIX2LONG(v);
- return LONG2NUM(x);
- }
- switch (TYPE(v)) {
- case T_NIL:
- break;
- case T_BIGNUM:
- return rb_big_plus(v, beg);
- case T_FLOAT: {
- VALUE f = rb_check_to_float(beg);
- if (!NIL_P(f)) {
- return DBL2NUM(RFLOAT_VALUE(v) + RFLOAT_VALUE(f));
- }
- }
- default:
- return rb_funcall2(beg, id_plus, 1, &v);
- }
-
- return v;
-}
-
-static VALUE rand_random(int argc, VALUE *argv, rb_random_t *rnd);
-
/*
* call-seq:
- * prng.rand -> float
- * prng.rand(max) -> number
- *
- * When +max+ is an Integer, +rand+ returns a random integer greater than
- * or equal to zero and less than +max+. Unlike Kernel.rand, when +max+
- * is a negative integer or zero, +rand+ raises an ArgumentError.
+ * prng.rand -> float
+ * prng.rand(limit) -> number
*
- * prng = Random.new
- * prng.rand(100) # => 42
+ * When the argument is an +Integer+ or a +Bignum+, it returns a
+ * random integer greater than or equal to zero and less than the
+ * argument. Unlike Random.rand, when the argument is a negative
+ * integer or zero, it raises an ArgumentError.
*
- * When +max+ is a Float, +rand+ returns a random floating point number
- * between 0.0 and +max+, including 0.0 and excluding +max+.
+ * When the argument is a +Float+, it returns a random floating point
+ * number between 0.0 and _max_, including 0.0 and excluding _max_.
*
- * prng.rand(1.5) # => 1.4600282860034115
+ * When the argument _limit_ is a +Range+, it returns a random
+ * number where range.member?(number) == true.
+ * prng.rand(5..9) #=> one of [5, 6, 7, 8, 9]
+ * prng.rand(5...9) #=> one of [5, 6, 7, 8]
+ * prng.rand(5.0..9.0) #=> between 5.0 and 9.0, including 9.0
+ * prng.rand(5.0...9.0) #=> between 5.0 and 9.0, excluding 9.0
*
- * When +max+ is a Range, +rand+ returns a random number where
- * range.member?(number) == true.
+ * +begin+/+end+ of the range have to have subtract and add methods.
*
- * prng.rand(5..9) # => one of [5, 6, 7, 8, 9]
- * prng.rand(5...9) # => one of [5, 6, 7, 8]
- * prng.rand(5.0..9.0) # => between 5.0 and 9.0, including 9.0
- * prng.rand(5.0...9.0) # => between 5.0 and 9.0, excluding 9.0
- *
- * Both the beginning and ending values of the range must respond to subtract
- * (<tt>-</tt>) and add (<tt>+</tt>)methods, or rand will raise an
- * ArgumentError.
+ * Otherwise, it raises an ArgumentError.
*/
static VALUE
random_rand(int argc, VALUE *argv, VALUE obj)
{
- return rand_random(argc, argv, get_rnd(obj));
-}
-
-static VALUE
-rand_random(int argc, VALUE *argv, rb_random_t *rnd)
-{
- VALUE vmax, v;
+ rb_random_t *rnd = get_rnd(obj);
+ VALUE vmax, beg = Qundef, v;
+ int excl = 0;
if (argc == 0) {
return rb_float_new(genrand_real(&rnd->mt));
}
- else {
- rb_check_arity(argc, 0, 1);
+ else if (argc != 1) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
}
vmax = argv[0];
if (NIL_P(vmax)) {
v = Qnil;
}
- else if (!RB_TYPE_P(vmax, T_FLOAT) && (v = rb_check_to_integer(vmax, "to_int"), !NIL_P(v))) {
- v = rand_int(&rnd->mt, v, 1);
+ else if (TYPE(vmax) != T_FLOAT && (v = rb_check_to_integer(vmax, "to_int"), !NIL_P(v))) {
+ v = rand_int(&rnd->mt, vmax = v, 1);
}
else if (v = rb_check_to_float(vmax), !NIL_P(v)) {
double max = float_value(v);
@@ -1229,45 +1021,79 @@ rand_random(int argc, VALUE *argv, rb_random_t *rnd)
else
v = Qnil;
}
- else if ((v = rand_range(&rnd->mt, vmax)) != Qfalse) {
- /* nothing to do */
+ else if ((v = range_values(vmax, &beg, &excl)) != Qfalse) {
+ vmax = v;
+ if (TYPE(vmax) != T_FLOAT && (v = rb_check_to_integer(vmax, "to_int"), !NIL_P(v))) {
+ long max;
+ vmax = v;
+ v = Qnil;
+ if (FIXNUM_P(vmax)) {
+ fixnum:
+ if ((max = FIX2LONG(vmax) - excl) >= 0) {
+ unsigned long r = limited_rand(&rnd->mt, (unsigned long)max);
+ v = ULONG2NUM(r);
+ }
+ }
+ else if (BUILTIN_TYPE(vmax) == T_BIGNUM && RBIGNUM_SIGN(vmax) && !rb_bigzero_p(vmax)) {
+ vmax = excl ? rb_big_minus(vmax, INT2FIX(1)) : rb_big_norm(vmax);
+ if (FIXNUM_P(vmax)) {
+ excl = 0;
+ goto fixnum;
+ }
+ v = limited_big_rand(&rnd->mt, RBIGNUM(vmax));
+ }
+ }
+ else if (v = rb_check_to_float(vmax), !NIL_P(v)) {
+ double max = float_value(v), r;
+ v = Qnil;
+ if (max > 0.0) {
+ if (excl) {
+ r = genrand_real(&rnd->mt);
+ }
+ else {
+ r = genrand_real2(&rnd->mt);
+ }
+ v = rb_float_new(r * max);
+ }
+ else if (max == 0.0 && !excl) {
+ v = rb_float_new(0.0);
+ }
+ }
}
else {
v = Qnil;
- (void)NUM2LONG(vmax);
+ NUM2LONG(vmax);
}
if (NIL_P(v)) {
VALUE mesg = rb_str_new_cstr("invalid argument - ");
rb_str_append(mesg, rb_obj_as_string(argv[0]));
rb_exc_raise(rb_exc_new3(rb_eArgError, mesg));
}
-
- return v;
+ if (beg == Qundef) return v;
+ if (FIXNUM_P(beg) && FIXNUM_P(v)) {
+ long x = FIX2LONG(beg) + FIX2LONG(v);
+ return LONG2NUM(x);
+ }
+ switch (TYPE(v)) {
+ case T_BIGNUM:
+ return rb_big_plus(v, beg);
+ case T_FLOAT: {
+ VALUE f = rb_check_to_float(beg);
+ if (!NIL_P(f)) {
+ RFLOAT_VALUE(v) += RFLOAT_VALUE(f);
+ return v;
+ }
+ }
+ default:
+ return rb_funcall2(beg, id_plus, 1, &v);
+ }
}
/*
* call-seq:
- * prng1 == prng2 -> true or false
- *
- * Returns true if the two generators have the same internal state, otherwise
- * false. Equivalent generators will return the same sequence of
- * pseudo-random numbers. Two generators will generally have the same state
- * only if they were initialized with the same seed
+ * prng1 == prng2 -> true or false
*
- * Random.new == Random.new # => false
- * Random.new(1234) == Random.new(1234) # => true
- *
- * and have the same invocation history.
- *
- * prng1 = Random.new(1234)
- * prng2 = Random.new(1234)
- * prng1 == prng2 # => true
- *
- * prng1.rand # => 0.1915194503788923
- * prng1 == prng2 # => false
- *
- * prng2.rand # => 0.1915194503788923
- * prng1 == prng2 # => true
+ * Returns true if the generators' states equal.
*/
static VALUE
random_equal(VALUE self, VALUE other)
@@ -1284,48 +1110,34 @@ random_equal(VALUE self, VALUE other)
}
/*
- * call-seq:
- * rand(max=0) -> number
- *
- * If called without an argument, or if <tt>max.to_i.abs == 0</tt>, rand
- * returns a pseudo-random floating point number between 0.0 and 1.0,
- * including 0.0 and excluding 1.0.
- *
- * rand #=> 0.2725926052826416
- *
- * When +max.abs+ is greater than or equal to 1, +rand+ returns a pseudo-random
- * integer greater than or equal to 0 and less than +max.to_i.abs+.
- *
- * rand(100) #=> 12
- *
- * When +max+ is a Range, +rand+ returns a random number where
- * range.member?(number) == true.
- *
- * Negative or floating point values for +max+ are allowed, but may give
- * surprising results.
- *
- * rand(-100) # => 87
- * rand(-0.5) # => 0.8130921818028143
- * rand(1.9) # equivalent to rand(1), which is always 0
+ * call-seq:
+ * rand(max=0) -> number
*
- * Kernel.srand may be used to ensure that sequences of random numbers are
- * reproducible between different runs of a program.
+ * Converts <i>max</i> to an integer using max1 =
+ * max<code>.to_i.abs</code>. If _max_ is +nil+ the result is zero, returns a
+ * pseudorandom floating point number greater than or equal to 0.0 and
+ * less than 1.0. Otherwise, returns a pseudorandom integer greater
+ * than or equal to zero and less than max1. <code>Kernel::srand</code>
+ * may be used to ensure repeatable sequences of random numbers between
+ * different runs of the program. Ruby currently uses a modified
+ * Mersenne Twister with a period of 2**19937-1.
*
- * See also Random.rand.
+ * srand 1234 #=> 0
+ * [ rand, rand ] #=> [0.191519450163469, 0.49766366626136]
+ * [ rand(10), rand(1000) ] #=> [6, 817]
+ * srand 1234 #=> 1234
+ * [ rand, rand ] #=> [0.191519450163469, 0.49766366626136]
*/
static VALUE
rb_f_rand(int argc, VALUE *argv, VALUE obj)
{
- VALUE v, vmax, r;
+ VALUE vmax, r;
struct MT *mt = default_mt();
if (argc == 0) goto zero_arg;
rb_scan_args(argc, argv, "01", &vmax);
if (NIL_P(vmax)) goto zero_arg;
- if ((v = rand_range(mt, vmax)) != Qfalse) {
- return v;
- }
vmax = rb_to_int(vmax);
if (vmax == INT2FIX(0) || NIL_P(r = rand_int(mt, vmax, 0))) {
zero_arg:
@@ -1334,42 +1146,7 @@ rb_f_rand(int argc, VALUE *argv, VALUE obj)
return r;
}
-/*
- * call-seq:
- * Random.rand -> float
- * Random.rand(max) -> number
- *
- * Alias of Random::DEFAULT.rand.
- */
-
-static VALUE
-random_s_rand(int argc, VALUE *argv, VALUE obj)
-{
- return rand_random(argc, argv, rand_start(&default_rand));
-}
-
-#define SIP_HASH_STREAMING 0
-#define sip_hash24 ruby_sip_hash24
-#if !defined _WIN32 && !defined BYTE_ORDER
-# ifdef WORDS_BIGENDIAN
-# define BYTE_ORDER BIG_ENDIAN
-# else
-# define BYTE_ORDER LITTLE_ENDIAN
-# endif
-# ifndef LITTLE_ENDIAN
-# define LITTLE_ENDIAN 1234
-# endif
-# ifndef BIG_ENDIAN
-# define BIG_ENDIAN 4321
-# endif
-#endif
-#include "siphash.c"
-
static st_index_t hashseed;
-static union {
- uint8_t key[16];
- uint32_t u32[(16 * sizeof(uint8_t) - 1) / sizeof(uint32_t)];
-} sipseed;
static VALUE
init_randomseed(struct MT *mt, unsigned int initial[DEFAULT_SEED_CNT])
@@ -1389,7 +1166,6 @@ Init_RandomSeed(void)
unsigned int initial[DEFAULT_SEED_CNT];
struct MT *mt = &r->mt;
VALUE seed = init_randomseed(mt, initial);
- int i;
hashseed = genrand_int32(mt);
#if SIZEOF_ST_INDEX_T*CHAR_BIT > 4*8
@@ -1405,9 +1181,6 @@ Init_RandomSeed(void)
hashseed |= genrand_int32(mt);
#endif
- for (i = 0; i < numberof(sipseed.u32); ++i)
- sipseed.u32[i] = genrand_int32(mt);
-
rb_global_variable(&r->seed);
r->seed = seed;
}
@@ -1418,17 +1191,6 @@ rb_hash_start(st_index_t h)
return st_hash_start(hashseed + h);
}
-st_index_t
-rb_memhash(const void *ptr, long len)
-{
- sip_uint64_t h = sip_hash24(sipseed.key, ptr, len);
-#ifdef HAVE_UINT64_T
- return (st_index_t)h;
-#else
- return (st_index_t)(h.u32[0] ^ h.u32[1]);
-#endif
-}
-
static void
Init_RandomSeed2(void)
{
@@ -1447,30 +1209,6 @@ rb_reset_random_seed(void)
r->seed = INT2FIX(0);
}
-/*
- * Document-class: Random
- *
- * Random provides an interface to Ruby's pseudo-random number generator, or
- * PRNG. The PRNG produces a deterministic sequence of bits which approximate
- * true randomness. The sequence may be represented by integers, floats, or
- * binary strings.
- *
- * The generator may be initialized with either a system-generated or
- * user-supplied seed value by using Random.srand.
- *
- * The class method Random.rand provides the base functionality of Kernel.rand
- * along with better handling of floating point values. These are both
- * interfaces to Random::DEFAULT, the Ruby system PRNG.
- *
- * Random.new will create a new PRNG with a state independent of
- * Random::DEFAULT, allowing multiple generators with different seed values or
- * sequence positions to exist simultaneously. Random objects can be
- * marshaled, allowing sequences to be saved and resumed.
- *
- * PRNGs are currently implemented as a modified Mersenne Twister with a period
- * of 2**19937-1.
- */
-
void
Init_Random(void)
{
@@ -1485,24 +1223,15 @@ Init_Random(void)
rb_define_method(rb_cRandom, "bytes", random_bytes, 1);
rb_define_method(rb_cRandom, "seed", random_get_seed, 0);
rb_define_method(rb_cRandom, "initialize_copy", random_copy, 1);
- rb_define_private_method(rb_cRandom, "marshal_dump", random_dump, 0);
- rb_define_private_method(rb_cRandom, "marshal_load", random_load, 1);
+ rb_define_method(rb_cRandom, "marshal_dump", random_dump, 0);
+ rb_define_method(rb_cRandom, "marshal_load", random_load, 1);
rb_define_private_method(rb_cRandom, "state", random_state, 0);
rb_define_private_method(rb_cRandom, "left", random_left, 0);
rb_define_method(rb_cRandom, "==", random_equal, 1);
- {
- VALUE rand_default = TypedData_Wrap_Struct(rb_cRandom, &random_data_type, &default_rand);
- rb_gc_register_mark_object(rand_default);
- rb_define_const(rb_cRandom, "DEFAULT", rand_default);
- }
-
rb_define_singleton_method(rb_cRandom, "srand", rb_f_srand, -1);
- rb_define_singleton_method(rb_cRandom, "rand", random_s_rand, -1);
+ rb_define_singleton_method(rb_cRandom, "rand", rb_f_rand, -1);
rb_define_singleton_method(rb_cRandom, "new_seed", random_seed, 0);
rb_define_private_method(CLASS_OF(rb_cRandom), "state", random_s_state, 0);
rb_define_private_method(CLASS_OF(rb_cRandom), "left", random_s_left, 0);
-
- id_rand = rb_intern("rand");
- id_bytes = rb_intern("bytes");
}
diff --git a/range.c b/range.c
index cea90140d9..1866df1507 100644
--- a/range.c
+++ b/range.c
@@ -11,16 +11,11 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
-#include "internal.h"
-#include "id.h"
-
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
-#include <math.h>
VALUE rb_cRange;
-static ID id_cmp, id_succ, id_beg, id_end, id_excl, id_integer_p, id_div;
+static ID id_cmp, id_succ, id_beg, id_end, id_excl;
+
+extern VALUE rb_struct_init_copy(VALUE copy, VALUE s);
#define RANGE_BEG(r) (RSTRUCT(r)->as.ary[0])
#define RANGE_END(r) (RSTRUCT(r)->as.ary[1])
@@ -74,10 +69,10 @@ rb_range_new(VALUE beg, VALUE end, int exclude_end)
/*
* call-seq:
- * Range.new(begin, end, exclude_end=false) -> rng
+ * Range.new(start, end, exclusive=false) -> range
*
- * Constructs a range using the given +begin+ and +end+. If the +exclude_end+
- * parameter is omitted or is <code>false</code>, the +rng+ will include
+ * Constructs a range using the given <i>start</i> and <i>end</i>. If the third
+ * parameter is omitted or is <code>false</code>, the <i>range</i> will include
* the end object; otherwise, it will be excluded.
*/
@@ -89,7 +84,7 @@ range_initialize(int argc, VALUE *argv, VALUE range)
rb_scan_args(argc, argv, "21", &beg, &end, &flags);
/* Ranges are immutable, so that they should be initialized only once. */
if (RANGE_EXCL(range) != Qnil) {
- rb_name_error(idInitialize, "`initialize' called twice");
+ rb_name_error(rb_intern("initialize"), "`initialize' called twice");
}
range_init(range, beg, end, RTEST(flags));
return Qnil;
@@ -101,10 +96,7 @@ range_initialize(int argc, VALUE *argv, VALUE range)
* call-seq:
* rng.exclude_end? -> true or false
*
- * Returns <code>true</code> if the range excludes its end value.
- *
- * (1..5).exclude_end? #=> false
- * (1...5).exclude_end? #=> true
+ * Returns <code>true</code> if <i>rng</i> excludes its end value.
*/
static VALUE
@@ -132,9 +124,9 @@ recursive_equal(VALUE range, VALUE obj, int recur)
* call-seq:
* rng == obj -> true or false
*
- * Returns <code>true</code> only if +obj+ is a Range, has equivalent
- * begin and end items (by comparing them with <code>==</code>), and has
- * the same #exclude_end? setting as the range.
+ * Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
+ * beginning and end items (by comparing them with <code>==</code>), and has
+ * the same <code>exclude_end?</code> setting as <i>rng</i>.
*
* (0..2) == (0..2) #=> true
* (0..2) == Range.new(0,2) #=> true
@@ -200,9 +192,9 @@ recursive_eql(VALUE range, VALUE obj, int recur)
* call-seq:
* rng.eql?(obj) -> true or false
*
- * Returns <code>true</code> only if +obj+ is a Range, has equivalent
- * begin and end items (by comparing them with <code>eql?</code>),
- * and has the same #exclude_end? setting as the range.
+ * Returns <code>true</code> only if <i>obj</i> is a Range, has equivalent
+ * beginning and end items (by comparing them with #eql?), and has the same
+ * #exclude_end? setting as <i>rng</i>.
*
* (0..2).eql?(0..2) #=> true
* (0..2).eql?(Range.new(0,2)) #=> true
@@ -243,9 +235,9 @@ recursive_hash(VALUE range, VALUE dummy, int recur)
* call-seq:
* rng.hash -> fixnum
*
- * Compute a hash-code for this range. Two ranges with equal
- * begin and end points (using <code>eql?</code>), and the same
- * #exclude_end? value will generate the same hash-code.
+ * Generate a hash value such that two ranges with the same start and
+ * end points, and the same value for the "exclude end" flag, generate
+ * the same hash value.
*/
static VALUE
@@ -314,6 +306,8 @@ step_i(VALUE i, void *arg)
return Qnil;
}
+extern int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl);
+
static int
discrete_object_p(VALUE obj)
{
@@ -321,61 +315,35 @@ discrete_object_p(VALUE obj)
return rb_respond_to(obj, id_succ);
}
-static VALUE
-range_step_size(VALUE range, VALUE args)
-{
- VALUE b = RANGE_BEG(range), e = RANGE_END(range);
- VALUE step = INT2FIX(1);
- if (args) {
- step = RARRAY_PTR(args)[0];
- if (!rb_obj_is_kind_of(step, rb_cNumeric)) {
- step = rb_to_int(step);
- }
- }
- if (rb_funcall(step, '<', 1, INT2FIX(0))) {
- rb_raise(rb_eArgError, "step can't be negative");
- }
- else if (!rb_funcall(step, '>', 1, INT2FIX(0))) {
- rb_raise(rb_eArgError, "step can't be 0");
- }
-
- if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) {
- return num_interval_step_size(b, e, step, EXCL(range));
- }
- return Qnil;
-}
/*
* call-seq:
* rng.step(n=1) {| obj | block } -> rng
* rng.step(n=1) -> an_enumerator
*
- * Iterates over the range, passing each <code>n</code>th element to the block.
- * If begin and end are numeric, +n+ is added for each iteration.
- * Otherwise <code>step</code> invokes <code>succ</code> to iterate through
- * range elements.
+ * Iterates over <i>rng</i>, passing each <i>n</i>th element to the block. If
+ * the range contains numbers, <i>n</i> is added for each iteration. Otherwise
+ * <code>step</code> invokes <code>succ</code> to iterate through range
+ * elements. The following code uses class <code>Xs</code>, which is defined
+ * in the class-level documentation.
*
* If no block is given, an enumerator is returned instead.
*
- * range = Xs.new(1)..Xs.new(10)
- * range.step(2) {|x| puts x}
- * puts
- * range.step(3) {|x| puts x}
+ * range = Xs.new(1)..Xs.new(10)
+ * range.step(2) {|x| puts x}
+ * range.step(3) {|x| puts x}
*
* <em>produces:</em>
*
- * 1 x
- * 3 xxx
- * 5 xxxxx
- * 7 xxxxxxx
- * 9 xxxxxxxxx
- *
- * 1 x
- * 4 xxxx
- * 7 xxxxxxx
- * 10 xxxxxxxxxx
- *
- * See Range for the definition of class Xs.
+ * 1 x
+ * 3 xxx
+ * 5 xxxxx
+ * 7 xxxxxxx
+ * 9 xxxxxxxxx
+ * 1 x
+ * 4 xxxx
+ * 7 xxxxxxx
+ * 10 xxxxxxxxxx
*/
@@ -384,7 +352,7 @@ range_step(int argc, VALUE *argv, VALUE range)
{
VALUE b, e, step, tmp;
- RETURN_SIZED_ENUMERATOR(range, argc, argv, range_step_size);
+ RETURN_ENUMERATOR(range, argc, argv);
b = RANGE_BEG(range);
e = RANGE_END(range);
@@ -433,7 +401,7 @@ range_step(int argc, VALUE *argv, VALUE range)
else if (rb_obj_is_kind_of(b, rb_cNumeric) ||
!NIL_P(rb_check_to_integer(b, "to_int")) ||
!NIL_P(rb_check_to_integer(e, "to_int"))) {
- ID op = EXCL(range) ? '<' : idLE;
+ ID op = EXCL(range) ? '<' : rb_intern("<=");
VALUE v = b;
int i = 0;
@@ -471,213 +439,6 @@ range_step(int argc, VALUE *argv, VALUE range)
return range;
}
-#if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T)
-union int64_double {
- int64_t i;
- double d;
-};
-
-static VALUE
-int64_as_double_to_num(int64_t i)
-{
- union int64_double convert;
- if (i < 0) {
- convert.i = -i;
- return DBL2NUM(-convert.d);
- }
- else {
- convert.i = i;
- return DBL2NUM(convert.d);
- }
-}
-
-static int64_t
-double_as_int64(double d)
-{
- union int64_double convert;
- convert.d = fabs(d);
- return d < 0 ? -convert.i : convert.i;
-}
-#endif
-
-static int
-is_integer_p(VALUE v)
-{
- VALUE is_int = rb_check_funcall(v, id_integer_p, 0, 0);
- return RTEST(is_int) && is_int != Qundef;
-}
-
-/*
- * call-seq:
- * rng.bsearch {|obj| block } -> value
- *
- * By using binary search, finds a value in range which meets the given
- * condition in O(log n) where n is the size of the range.
- *
- * You can use this method in two use cases: a find-minimum mode and
- * a find-any mode. In either case, the elements of the range must be
- * monotone (or sorted) with respect to the block.
- *
- * In find-minimum mode (this is a good choice for typical use case),
- * the block must return true or false, and there must be a value x
- * so that:
- *
- * - the block returns false for any value which is less than x, and
- * - the block returns true for any value which is greater than or
- * equal to i.
- *
- * If x is within the range, this method returns the value x.
- * Otherwise, it returns nil.
- *
- * ary = [0, 4, 7, 10, 12]
- * (0...ary.size).bsearch {|i| ary[i] >= 4 } #=> 1
- * (0...ary.size).bsearch {|i| ary[i] >= 6 } #=> 2
- * (0...ary.size).bsearch {|i| ary[i] >= 8 } #=> 3
- * (0...ary.size).bsearch {|i| ary[i] >= 100 } #=> nil
- *
- * (0.0...Float::INFINITY).bsearch {|x| Math.log(x) >= 0 } #=> 1.0
- *
- * In find-any mode (this behaves like libc's bsearch(3)), the block
- * must return a number, and there must be two values x and y (x <= y)
- * so that:
- *
- * - the block returns a positive number for v if v < x,
- * - the block returns zero for v if x <= v < y, and
- * - the block returns a negative number for v if y <= v.
- *
- * This method returns any value which is within the intersection of
- * the given range and x...y (if any). If there is no value that
- * satisfies the condition, it returns nil.
- *
- * ary = [0, 100, 100, 100, 200]
- * (0..4).bsearch {|i| 100 - ary[i] } #=> 1, 2 or 3
- * (0..4).bsearch {|i| 300 - ary[i] } #=> nil
- * (0..4).bsearch {|i| 50 - ary[i] } #=> nil
- *
- * You must not mix the two modes at a time; the block must always
- * return either true/false, or always return a number. It is
- * undefined which value is actually picked up at each iteration.
- */
-
-static VALUE
-range_bsearch(VALUE range)
-{
- VALUE beg, end;
- int smaller, satisfied = 0;
-
- /* Implementation notes:
- * Floats are handled by mapping them to 64 bits integers.
- * Apart from sign issues, floats and their 64 bits integer have the
- * same order, assuming they are represented as exponent followed
- * by the mantissa. This is true with or without implicit bit.
- *
- * Finding the average of two ints needs to be careful about
- * potential overflow (since float to long can use 64 bits)
- * as well as the fact that -1/2 can be 0 or -1 in C89.
- *
- * Note that -0.0 is mapped to the same int as 0.0 as we don't want
- * (-1...0.0).bsearch to yield -0.0.
- */
-
-#define BSEARCH_CHECK(val) \
- do { \
- VALUE v = rb_yield(val); \
- if (FIXNUM_P(v)) { \
- if (FIX2INT(v) == 0) return val; \
- smaller = FIX2INT(v) < 0; \
- } \
- else if (v == Qtrue) { \
- satisfied = 1; \
- smaller = 1; \
- } \
- else if (v == Qfalse || v == Qnil) { \
- smaller = 0; \
- } \
- else if (rb_obj_is_kind_of(v, rb_cNumeric)) { \
- int cmp = rb_cmpint(rb_funcall(v, id_cmp, 1, INT2FIX(0)), v, INT2FIX(0)); \
- if (!cmp) return val; \
- smaller = cmp < 0; \
- } \
- else { \
- rb_raise(rb_eTypeError, "wrong argument type %s" \
- " (must be numeric, true, false or nil)", \
- rb_obj_classname(v)); \
- } \
- } while (0)
-
-#define BSEARCH(conv) \
- do { \
- RETURN_ENUMERATOR(range, 0, 0); \
- if (EXCL(range)) high--; \
- org_high = high; \
- while (low < high) { \
- mid = ((high < 0) == (low < 0)) ? low + ((high - low) / 2) \
- : (low < -high) ? -((-1 - low - high)/2 + 1) : (low + high) / 2; \
- BSEARCH_CHECK(conv(mid)); \
- if (smaller) { \
- high = mid; \
- } \
- else { \
- low = mid + 1; \
- } \
- } \
- if (low == org_high) { \
- BSEARCH_CHECK(conv(low)); \
- if (!smaller) return Qnil; \
- } \
- if (!satisfied) return Qnil; \
- return conv(low); \
- } while (0)
-
-
- beg = RANGE_BEG(range);
- end = RANGE_END(range);
-
- if (FIXNUM_P(beg) && FIXNUM_P(end)) {
- long low = FIX2LONG(beg);
- long high = FIX2LONG(end);
- long mid, org_high;
- BSEARCH(INT2FIX);
- }
-#if SIZEOF_DOUBLE == 8 && defined(HAVE_INT64_T)
- else if (RB_TYPE_P(beg, T_FLOAT) || RB_TYPE_P(end, T_FLOAT)) {
- int64_t low = double_as_int64(RFLOAT_VALUE(rb_Float(beg)));
- int64_t high = double_as_int64(RFLOAT_VALUE(rb_Float(end)));
- int64_t mid, org_high;
- BSEARCH(int64_as_double_to_num);
- }
-#endif
- else if (is_integer_p(beg) && is_integer_p(end)) {
- VALUE low = rb_to_int(beg);
- VALUE high = rb_to_int(end);
- VALUE mid, org_high;
- RETURN_ENUMERATOR(range, 0, 0);
- if (EXCL(range)) high = rb_funcall(high, '-', 1, INT2FIX(1));
- org_high = high;
-
- while (rb_cmpint(rb_funcall(low, id_cmp, 1, high), low, high) < 0) {
- mid = rb_funcall(rb_funcall(high, '+', 1, low), id_div, 1, INT2FIX(2));
- BSEARCH_CHECK(mid);
- if (smaller) {
- high = mid;
- }
- else {
- low = rb_funcall(mid, '+', 1, INT2FIX(1));
- }
- }
- if (rb_equal(low, org_high)) {
- BSEARCH_CHECK(low);
- if (!smaller) return Qnil;
- }
- if (!satisfied) return Qnil;
- return low;
- }
- else {
- rb_raise(rb_eTypeError, "can't do binary search for %s", rb_obj_classname(beg));
- }
- return range;
-}
-
static VALUE
each_i(VALUE v, void *arg)
{
@@ -694,45 +455,23 @@ sym_each_i(VALUE v, void *arg)
/*
* call-seq:
- * rng.size -> num
- *
- * Returns the number of elements in the range. Both the begin and the end of
- * the Range must be Numeric, otherwise nil is returned.
- *
- * (10..20).size #=> 11
- * ('a'..'z').size #=> nil
- * (-Float::INFINITY..Float::INFINITY).size #=> Infinity
- */
-
-static VALUE
-range_size(VALUE range)
-{
- VALUE b = RANGE_BEG(range), e = RANGE_END(range);
- if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) {
- return num_interval_step_size(b, e, INT2FIX(1), EXCL(range));
- }
- return Qnil;
-}
-
-/*
- * call-seq:
* rng.each {| i | block } -> rng
* rng.each -> an_enumerator
*
- * Iterates over the elements of range, passing each in turn to the
- * block.
- *
- * The +each+ method can only be used if the begin object of the range
- * supports the +succ+ method. A TypeError is raised if the object
- * does not have +succ+ method defined (like Float).
+ * Iterates over the elements <i>rng</i>, passing each in turn to the
+ * block. You can only iterate if the start object of the range
+ * supports the +succ+ method (which means that you can't iterate over
+ * ranges of +Float+ objects).
*
* If no block is given, an enumerator is returned instead.
*
- * (10..15).each {|n| print n, ' ' }
- * # prints: 10 11 12 13 14 15
+ * (10..15).each do |n|
+ * print n, ' '
+ * end
*
- * (2.5..5).each {|n| print n, ' ' }
- * # raises: TypeError: can't iterate from Float
+ * <em>produces:</em>
+ *
+ * 10 11 12 13 14 15
*/
static VALUE
@@ -740,7 +479,7 @@ range_each(VALUE range)
{
VALUE beg, end;
- RETURN_SIZED_ENUMERATOR(range, 0, 0, range_size);
+ RETURN_ENUMERATOR(range, 0, 0);
beg = RANGE_BEG(range);
end = RANGE_END(range);
@@ -787,9 +526,7 @@ range_each(VALUE range)
* call-seq:
* rng.begin -> obj
*
- * Returns the object that defines the beginning of the range.
- *
- * (1..10).begin #=> 1
+ * Returns the first object in <i>rng</i>.
*/
static VALUE
@@ -803,7 +540,7 @@ range_begin(VALUE range)
* call-seq:
* rng.end -> obj
*
- * Returns the object that defines the end of the range.
+ * Returns the object that defines the end of <i>rng</i>.
*
* (1..10).end #=> 10
* (1...10).end #=> 10
@@ -836,11 +573,7 @@ first_i(VALUE i, VALUE *ary)
* rng.first -> obj
* rng.first(n) -> an_array
*
- * Returns the first object in the range, or an array of the first +n+
- * elements.
- *
- * (10..20).first #=> 10
- * (10..20).first(3) #=> [10, 11, 12]
+ * Returns the first object in <i>rng</i>, or the first +n+ elements.
*/
static VALUE
@@ -853,7 +586,7 @@ range_first(int argc, VALUE *argv, VALUE range)
rb_scan_args(argc, argv, "1", &n);
ary[0] = n;
ary[1] = rb_ary_new2(NUM2LONG(n));
- rb_block_call(range, idEach, 0, 0, first_i, (VALUE)ary);
+ rb_block_call(range, rb_intern("each"), 0, 0, first_i, (VALUE)ary);
return ary[1];
}
@@ -864,21 +597,14 @@ range_first(int argc, VALUE *argv, VALUE range)
* rng.last -> obj
* rng.last(n) -> an_array
*
- * Returns the last object in the range,
- * or an array of the last +n+ elements.
- *
- * Note that with no arguments +last+ will return the object that defines
- * the end of the range even if #exclude_end? is +true+.
- *
- * (10..20).last #=> 20
- * (10...20).last #=> 20
- * (10..20).last(3) #=> [18, 19, 20]
- * (10...20).last(3) #=> [17, 18, 19]
+ * Returns the last object in <i>rng</i>, or the last +n+ elements.
*/
static VALUE
range_last(int argc, VALUE *argv, VALUE range)
{
+ VALUE rb_ary_last(int, VALUE *, VALUE);
+
if (argc == 0) return RANGE_END(range);
return rb_ary_last(argc, argv, rb_Array(range));
}
@@ -889,13 +615,10 @@ range_last(int argc, VALUE *argv, VALUE range)
* rng.min -> obj
* rng.min {| a,b | block } -> obj
*
- * Returns the minimum value in the range. Returns +nil+ if the begin
- * value of the range is larger than the end value.
+ * Returns the minimum value in <i>rng</i>. The second uses
+ * the block to compare values. Returns nil if the first
+ * value in range is larger than the last value.
*
- * Can be given an optional block to override the default comparison
- * method <code>a <=> b</code>.
- *
- * (10..20).min #=> 10
*/
@@ -921,13 +644,10 @@ range_min(VALUE range)
* rng.max -> obj
* rng.max {| a,b | block } -> obj
*
- * Returns the maximum value in the range. Returns +nil+ if the begin
- * value of the range larger than the end value.
- *
- * Can be given an optional block to override the default comparison
- * method <code>a <=> b</code>.
+ * Returns the maximum value in <i>rng</i>. The second uses
+ * the block to compare values. Returns nil if the first
+ * value in range is larger than the last value.
*
- * (10..20).max #=> 20
*/
static VALUE
@@ -950,9 +670,6 @@ range_max(VALUE range)
rb_raise(rb_eTypeError, "cannot exclude non Integer end value");
}
if (c == 0) return Qnil;
- if (!FIXNUM_P(b) && !rb_obj_is_kind_of(b,rb_cInteger)) {
- rb_raise(rb_eTypeError, "cannot exclude end value with non Integer begin value");
- }
if (FIXNUM_P(e)) {
return LONG2NUM(FIX2LONG(e) - 1);
}
@@ -1004,16 +721,16 @@ rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err)
if (beg < 0)
goto out_of_range;
}
- if (end < 0)
- end += len;
- if (!excl)
- end++; /* include end point */
if (err == 0 || err == 2) {
if (beg > len)
goto out_of_range;
if (end > len)
end = len;
}
+ if (end < 0)
+ end += len;
+ if (!excl)
+ end++; /* include end point */
len = end - beg;
if (len < 0)
len = 0;
@@ -1034,8 +751,7 @@ rb_range_beg_len(VALUE range, long *begp, long *lenp, long len, int err)
* call-seq:
* rng.to_s -> string
*
- * Convert this range object to a printable form (using #to_s to convert the
- * begin and end objects).
+ * Convert this range object to a printable form.
*/
static VALUE
@@ -1076,7 +792,7 @@ inspect_range(VALUE range, VALUE dummy, int recur)
* rng.inspect -> string
*
* Convert this range object to a printable form (using
- * <code>inspect</code> to convert the begin and end
+ * <code>inspect</code> to convert the start and end
* objects).
*/
@@ -1091,9 +807,10 @@ range_inspect(VALUE range)
* call-seq:
* rng === obj -> true or false
*
- * Returns <code>true</code> if +obj+ is an element of the range,
- * <code>false</code> otherwise. Conveniently, <code>===</code> is the
- * comparison operator used by <code>case</code> statements.
+ * Returns <code>true</code> if <i>obj</i> is an element of
+ * <i>rng</i>, <code>false</code> otherwise. Conveniently,
+ * <code>===</code> is the comparison operator used by
+ * <code>case</code> statements.
*
* case 79
* when 1..50 then print "low\n"
@@ -1115,16 +832,15 @@ range_eqq(VALUE range, VALUE val)
/*
* call-seq:
- * rng.member?(obj) -> true or false
- * rng.include?(obj) -> true or false
+ * rng.member?(val) -> true or false
+ * rng.include?(val) -> true or false
*
- * Returns <code>true</code> if +obj+ is an element of
- * the range, <code>false</code> otherwise. If begin and end are
- * numeric, comparison is done according to the magnitude of the values.
+ * Returns <code>true</code> if <i>obj</i> is an element of
+ * <i>rng</i>, <code>false</code> otherwise. If beg and end are
+ * numeric, comparison is done according magnitude of values.
*
- * ("a".."z").include?("g") #=> true
- * ("a".."z").include?("A") #=> false
- * ("a".."z").include?("cc") #=> false
+ * ("a".."z").include?("g") # -> true
+ * ("a".."z").include?("A") # -> false
*/
static VALUE
@@ -1151,10 +867,10 @@ range_include(VALUE range, VALUE val)
}
return Qfalse;
}
- else if (RB_TYPE_P(beg, T_STRING) && RB_TYPE_P(end, T_STRING) &&
+ else if (TYPE(beg) == T_STRING && TYPE(end) == T_STRING &&
RSTRING_LEN(beg) == 1 && RSTRING_LEN(end) == 1) {
if (NIL_P(val)) return Qfalse;
- if (RB_TYPE_P(val, T_STRING)) {
+ if (TYPE(val) == T_STRING) {
if (RSTRING_LEN(val) == 0 || RSTRING_LEN(val) > 1)
return Qfalse;
else {
@@ -1177,17 +893,14 @@ range_include(VALUE range, VALUE val)
/*
* call-seq:
- * rng.cover?(obj) -> true or false
- *
- * Returns <code>true</code> if +obj+ is between the begin and end of
- * the range.
+ * rng.cover?(val) -> true or false
*
- * This tests <code>begin <= obj <= end</code> when #exclude_end? is +false+
- * and <code>begin <= obj < end</code> when #exclude_end? is +true+.
+ * Returns <code>true</code> if <i>obj</i> is between beg and end,
+ * i.e <code>beg <= obj <= end</code> (or <i>end</i> exclusive when
+ * <code>exclude_end?</code> is true).
*
* ("a".."z").cover?("c") #=> true
* ("a".."z").cover?("5") #=> false
- * ("a".."z").cover?("cc") #=> true
*/
static VALUE
@@ -1214,7 +927,8 @@ static VALUE
range_dumper(VALUE range)
{
VALUE v;
- NEWOBJ_OF(m, struct RObject, rb_cObject, T_OBJECT);
+ NEWOBJ(m, struct RObject);
+ OBJSETUP(m, rb_cObject, T_OBJECT);
v = (VALUE)m;
@@ -1227,7 +941,7 @@ range_dumper(VALUE range)
static VALUE
range_loader(VALUE range, VALUE obj)
{
- if (!RB_TYPE_P(obj, T_OBJECT) || RBASIC(obj)->klass != rb_cObject) {
+ if (TYPE(obj) != T_OBJECT || RBASIC(obj)->klass != rb_cObject) {
rb_raise(rb_eTypeError, "not a dumped range object");
}
@@ -1246,11 +960,11 @@ range_alloc(VALUE klass)
}
/* A <code>Range</code> represents an interval---a set of values with a
- * beginning and an end. Ranges may be constructed using the
+ * start and an end. Ranges may be constructed using the
* <em>s</em><code>..</code><em>e</em> and
* <em>s</em><code>...</code><em>e</em> literals, or with
- * Range::new. Ranges constructed using <code>..</code>
- * run from the beginning to the end inclusively. Those created using
+ * <code>Range::new</code>. Ranges constructed using <code>..</code>
+ * run from the start to the end inclusively. Those created using
* <code>...</code> exclude the end value. When used as an iterator,
* ranges return each value in the sequence.
*
@@ -1259,20 +973,10 @@ range_alloc(VALUE klass)
* ('a'..'e').to_a #=> ["a", "b", "c", "d", "e"]
* ('a'...'e').to_a #=> ["a", "b", "c", "d"]
*
- * == Custom Objects in Ranges
- *
- * Ranges can be constructed using any objects that can be compared
- * using the <code><=></code> operator.
- * Methods that treat the range as a sequence (#each and methods inherited
- * from Enumerable) expect the begin object to implement a
- * <code>succ</code> method to return the next object in sequence.
- * The #step and #include? methods require the begin
- * object to implement <code>succ</code> or to be numeric.
- *
- * In the <code>Xs</code> class below both <code><=></code> and
- * <code>succ</code> are implemented so <code>Xs</code> can be used
- * to construct ranges. Note that the Comparable module is included
- * so the <code>==</code> method is defined in terms of <code><=></code>.
+ * Ranges can be constructed using objects of any type, as long as the
+ * objects can be compared using their <code><=></code> operator and
+ * they support the <code>succ</code> method to return the next object
+ * in sequence.
*
* class Xs # represent a string of 'x's
* include Comparable
@@ -1294,12 +998,17 @@ range_alloc(VALUE klass)
* end
* end
*
- * An example of using <code>Xs</code> to construct a range:
- *
* r = Xs.new(3)..Xs.new(6) #=> xxx..xxxxxx
* r.to_a #=> [xxx, xxxx, xxxxx, xxxxxx]
* r.member?(Xs.new(5)) #=> true
*
+ * In the previous code example, class <code>Xs</code> includes the
+ * <code>Comparable</code> module. This is because
+ * <code>Enumerable#member?</code> checks for equality using
+ * <code>==</code>. Including <code>Comparable</code> ensures that the
+ * <code>==</code> method is defined in terms of the <code><=></code>
+ * method implemented in <code>Xs</code>.
+ *
*/
void
@@ -1313,8 +1022,6 @@ Init_Range(void)
id_beg = rb_intern("begin");
id_end = rb_intern("end");
id_excl = rb_intern("excl");
- id_integer_p = rb_intern("integer?");
- id_div = rb_intern("div");
rb_cRange = rb_struct_define_without_accessor(
"Range", rb_cObject, range_alloc,
@@ -1330,14 +1037,12 @@ Init_Range(void)
rb_define_method(rb_cRange, "hash", range_hash, 0);
rb_define_method(rb_cRange, "each", range_each, 0);
rb_define_method(rb_cRange, "step", range_step, -1);
- rb_define_method(rb_cRange, "bsearch", range_bsearch, 0);
rb_define_method(rb_cRange, "begin", range_begin, 0);
rb_define_method(rb_cRange, "end", range_end, 0);
rb_define_method(rb_cRange, "first", range_first, -1);
rb_define_method(rb_cRange, "last", range_last, -1);
rb_define_method(rb_cRange, "min", range_min, 0);
rb_define_method(rb_cRange, "max", range_max, 0);
- rb_define_method(rb_cRange, "size", range_size, 0);
rb_define_method(rb_cRange, "to_s", range_to_s, 0);
rb_define_method(rb_cRange, "inspect", range_inspect, 0);
diff --git a/rational.c b/rational.c
index 02c751fa94..83ef5bf088 100644
--- a/rational.c
+++ b/rational.c
@@ -1,12 +1,11 @@
/*
- rational.c: Coded by Tadayoshi Funaba 2008-2012
+ rational.c: Coded by Tadayoshi Funaba 2008,2009
This implementation is based on Keiju Ishitsuka's Rational library
which is written in ruby.
*/
#include "ruby.h"
-#include "internal.h"
#include <math.h>
#include <float.h>
@@ -25,7 +24,7 @@ VALUE rb_cRational;
static ID id_abs, id_cmp, id_convert, id_eqeq_p, id_expt, id_fdiv,
id_floor, id_idiv, id_inspect, id_integer_p, id_negate, id_to_f,
- id_to_i, id_to_s, id_truncate, id_i_num, id_i_den;
+ id_to_i, id_to_s, id_truncate;
#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
@@ -33,7 +32,7 @@ static ID id_abs, id_cmp, id_convert, id_eqeq_p, id_expt, id_fdiv,
inline static VALUE \
f_##n(VALUE x, VALUE y)\
{\
- return rb_funcall(x, (op), 1, y);\
+ return rb_funcall(x, op, 1, y);\
}
#define fun1(n) \
@@ -106,7 +105,7 @@ f_mul(VALUE x, VALUE y)
if (FIXNUM_P(y)) {
long iy = FIX2LONG(y);
if (iy == 0) {
- if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM))
+ if (FIXNUM_P(x) || TYPE(x) == T_BIGNUM)
return ZERO;
}
else if (iy == 1)
@@ -115,7 +114,7 @@ f_mul(VALUE x, VALUE y)
else if (FIXNUM_P(x)) {
long ix = FIX2LONG(x);
if (ix == 0) {
- if (FIXNUM_P(y) || RB_TYPE_P(y, T_BIGNUM))
+ if (FIXNUM_P(y) || TYPE(y) == T_BIGNUM)
return ZERO;
}
else if (ix == 1)
@@ -137,22 +136,8 @@ fun1(floor)
fun1(inspect)
fun1(integer_p)
fun1(negate)
-
-inline static VALUE
-f_to_i(VALUE x)
-{
- if (RB_TYPE_P(x, T_STRING))
- return rb_str_to_inum(x, 10, 0);
- return rb_funcall(x, id_to_i, 0);
-}
-inline static VALUE
-f_to_f(VALUE x)
-{
- if (RB_TYPE_P(x, T_STRING))
- return DBL2NUM(rb_str_to_dbl(x, 0));
- return rb_funcall(x, id_to_f, 0);
-}
-
+fun1(to_f)
+fun1(to_i)
fun1(to_s)
fun1(truncate)
@@ -168,8 +153,6 @@ fun2(expt)
fun2(fdiv)
fun2(idiv)
-#define f_expt10(x) f_expt(INT2FIX(10), x)
-
inline static VALUE
f_negative_p(VALUE x)
{
@@ -221,26 +204,6 @@ f_one_p(VALUE x)
}
inline static VALUE
-f_minus_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, INT2FIX(-1));
-}
-
-inline static VALUE
f_kind_of_p(VALUE x, VALUE c)
{
return rb_obj_is_kind_of(x, c);
@@ -368,7 +331,8 @@ f_lcm(VALUE x, VALUE y)
inline static VALUE
nurat_s_new_internal(VALUE klass, VALUE num, VALUE den)
{
- NEWOBJ_OF(obj, struct RRational, klass, T_RATIONAL);
+ NEWOBJ(obj, struct RRational);
+ OBJSETUP(obj, klass, T_RATIONAL);
obj->num = num;
obj->den = den;
@@ -439,7 +403,7 @@ f_rational_new_bang2(VALUE klass, VALUE x, VALUE y)
#ifdef CANON
static int canonicalization = 0;
-RUBY_FUNC_EXPORTED void
+void
nurat_canonicalization(int f)
{
canonicalization = f;
@@ -568,27 +532,6 @@ f_rational_new_no_reduce2(VALUE klass, VALUE x, VALUE y)
* Rational(x[, y]) -> numeric
*
* Returns x/y;
- *
- * Rational(1, 2) #=> (1/2)
- * Rational('1/2') #=> (1/2)
- * Rational(nil) #=> TypeError
- * Rational(1, nil) #=> TypeError
- *
- * Syntax of string form:
- *
- * string form = extra spaces , rational , extra spaces ;
- * rational = [ sign ] , unsigned rational ;
- * unsigned rational = numerator | numerator , "/" , denominator ;
- * numerator = integer part | fractional part | integer part , fractional part ;
- * denominator = digits ;
- * integer part = digits ;
- * fractional part = "." , digits , [ ( "e" | "E" ) , [ sign ] , digits ] ;
- * sign = "-" | "+" ;
- * digits = digit , { digit | "_" , digit } ;
- * digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
- * extra spaces = ? \s* ? ;
- *
- * See String#to_r.
*/
static VALUE
nurat_f_rational(int argc, VALUE *argv, VALUE klass)
@@ -602,6 +545,8 @@ nurat_f_rational(int argc, VALUE *argv, VALUE klass)
*
* Returns the numerator.
*
+ * For example:
+ *
* Rational(7).numerator #=> 7
* Rational(7, 1).numerator #=> 7
* Rational(9, -4).numerator #=> -9
@@ -620,6 +565,8 @@ nurat_numerator(VALUE self)
*
* Returns the denominator (always positive).
*
+ * For example:
+ *
* Rational(7).denominator #=> 1
* Rational(7, 1).denominator #=> 1
* Rational(9, -4).denominator #=> 4
@@ -641,6 +588,7 @@ inline static VALUE
f_imul(long a, long b)
{
VALUE r;
+ volatile long c;
if (a == 0 || b == 0)
return ZERO;
@@ -649,10 +597,10 @@ f_imul(long a, long b)
else if (b == 1)
return LONG2NUM(a);
- if (MUL_OVERFLOW_LONG_P(a, b))
+ c = a * b;
+ r = LONG2NUM(c);
+ if (NUM2LONG(r) != c || (c / a) != b)
r = rb_big_mul(rb_int2big(a), rb_int2big(b));
- else
- r = LONG2NUM(a * b);
return r;
}
@@ -719,10 +667,12 @@ f_addsub(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
/*
* call-seq:
- * rat + numeric -> numeric
+ * rat + numeric -> numeric_result
*
* Performs addition.
*
+ * For example:
+ *
* Rational(2, 3) + Rational(2, 3) #=> (4/3)
* Rational(900) + Rational(1) #=> (900/1)
* Rational(-2, 9) + Rational(-9, 2) #=> (-85/18)
@@ -759,10 +709,12 @@ nurat_add(VALUE self, VALUE other)
/*
* call-seq:
- * rat - numeric -> numeric
+ * rat - numeric -> numeric_result
*
* Performs subtraction.
*
+ * For example:
+ *
* Rational(2, 3) - Rational(2, 3) #=> (0/1)
* Rational(900) - Rational(1) #=> (899/1)
* Rational(-2, 9) - Rational(-9, 2) #=> (77/18)
@@ -838,10 +790,12 @@ f_muldiv(VALUE self, VALUE anum, VALUE aden, VALUE bnum, VALUE bden, int k)
/*
* call-seq:
- * rat * numeric -> numeric
+ * rat * numeric -> numeric_result
*
* Performs multiplication.
*
+ * For example:
+ *
* Rational(2, 3) * Rational(2, 3) #=> (4/9)
* Rational(900) * Rational(1) #=> (900/1)
* Rational(-2, 9) * Rational(-9, 2) #=> (1/1)
@@ -878,11 +832,13 @@ nurat_mul(VALUE self, VALUE other)
/*
* call-seq:
- * rat / numeric -> numeric
- * rat.quo(numeric) -> numeric
+ * rat / numeric -> numeric_result
+ * rat.quo(numeric) -> numeric_result
*
* Performs division.
*
+ * For example:
+ *
* Rational(2, 3) / Rational(2, 3) #=> (1/1)
* Rational(900) / Rational(1) #=> (900/1)
* Rational(-2, 9) / Rational(-9, 2) #=> (4/81)
@@ -905,16 +861,6 @@ nurat_div(VALUE self, VALUE other)
other, ONE, '/');
}
case T_FLOAT:
- {
- double x = RFLOAT_VALUE(other), den;
- get_dat1(self);
-
- if (isnan(x)) return DBL2NUM(NAN);
- if (isinf(x)) return INT2FIX(0);
- if (x != 0.0 && modf(x, &den) == 0.0) {
- return rb_rational_raw2(dat->num, f_mul(rb_dbl2big(den), dat->den));
- }
- }
return rb_funcall(f_to_f(self), '/', 1, other);
case T_RATIONAL:
if (f_zero_p(other))
@@ -941,6 +887,8 @@ nurat_div(VALUE self, VALUE other)
*
* Performs division and returns the value as a float.
*
+ * For example:
+ *
* Rational(2, 3).fdiv(1) #=> 0.6666666666666666
* Rational(2, 3).fdiv(0.5) #=> 1.3333333333333333
* Rational(2).fdiv(3) #=> 0.6666666666666666
@@ -953,22 +901,14 @@ nurat_fdiv(VALUE self, VALUE other)
return f_to_f(f_div(self, other));
}
-inline static VALUE
-f_odd_p(VALUE integer)
-{
- if (rb_funcall(integer, '%', 1, INT2FIX(2)) != INT2FIX(0)) {
- return Qtrue;
- }
- return Qfalse;
-
-}
-
/*
* call-seq:
- * rat ** numeric -> numeric
+ * rat ** numeric -> numeric_result
*
* Performs exponentiation.
*
+ * For example:
+ *
* Rational(2) ** Rational(3) #=> (8/1)
* Rational(10) ** -2 #=> (1/100)
* Rational(10) ** -2.0 #=> 0.01
@@ -979,7 +919,7 @@ f_odd_p(VALUE integer)
static VALUE
nurat_expt(VALUE self, VALUE other)
{
- if (k_numeric_p(other) && k_exact_zero_p(other))
+ if (k_exact_zero_p(other))
return f_rational_new_bang1(CLASS_OF(self), ONE);
if (k_rational_p(other)) {
@@ -989,22 +929,6 @@ nurat_expt(VALUE self, VALUE other)
other = dat->num; /* c14n */
}
- /* Deal with special cases of 0**n and 1**n */
- if (k_numeric_p(other) && k_exact_p(other)) {
- get_dat1(self);
- if (f_one_p(dat->den))
- if (f_one_p(dat->num))
- return f_rational_new_bang1(CLASS_OF(self), ONE);
- else if (f_minus_one_p(dat->num) && k_integer_p(other))
- return f_rational_new_bang1(CLASS_OF(self), INT2FIX(f_odd_p(other) ? -1 : 1));
- else if (f_zero_p(dat->num))
- if (FIX2INT(f_cmp(other, ZERO)) == -1)
- rb_raise_zerodiv();
- else
- return f_rational_new_bang1(CLASS_OF(self), ZERO);
- }
-
- /* General case */
switch (TYPE(other)) {
case T_FIXNUM:
{
@@ -1041,11 +965,11 @@ nurat_expt(VALUE self, VALUE other)
/*
* call-seq:
- * rational <=> numeric -> -1, 0, +1 or nil
+ * rat <=> numeric -> -1, 0, +1 or nil
*
* Performs comparison and returns -1, 0, or +1.
*
- * +nil+ is returned if the two values are incomparable.
+ * For example:
*
* Rational(2, 3) <=> Rational(2, 3) #=> 0
* Rational(5) <=> 5 #=> 0
@@ -1096,6 +1020,8 @@ nurat_cmp(VALUE self, VALUE other)
*
* Returns true if rat equals object numerically.
*
+ * For example:
+ *
* Rational(2, 3) == Rational(2, 3) #=> true
* Rational(5) == 5 #=> true
* Rational(0) == 0.0 #=> true
@@ -1155,8 +1081,6 @@ nurat_coerce(VALUE self, VALUE other)
if (k_exact_zero_p(RCOMPLEX(other)->imag))
return rb_assoc_new(f_rational_new_bang1
(CLASS_OF(self), RCOMPLEX(other)->real), self);
- else
- return rb_assoc_new(other, rb_Complex(self, INT2FIX(0)));
}
rb_raise(rb_eTypeError, "%s can't be coerced into %s",
@@ -1211,6 +1135,7 @@ nurat_ceil(VALUE self)
return f_negate(f_idiv(f_negate(dat->num), dat->den));
}
+
/*
* call-seq:
* rat.to_i -> integer
@@ -1220,6 +1145,8 @@ nurat_ceil(VALUE self)
* Equivalent to
* rat.truncate.
*
+ * For example:
+ *
* Rational(2, 3).to_i #=> 0
* Rational(3).to_i #=> 3
* Rational(300.6).to_i #=> 300
@@ -1272,19 +1199,9 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
if (!k_integer_p(n))
rb_raise(rb_eTypeError, "not an integer");
- b = f_expt10(n);
+ b = f_expt(INT2FIX(10), n);
s = f_mul(self, b);
- if (k_float_p(s)) {
- if (f_lt_p(n, ZERO))
- return ZERO;
- return self;
- }
-
- if (!k_rational_p(s)) {
- s = f_rational_new_bang1(CLASS_OF(self), s);
- }
-
s = (*func)(s);
s = f_div(f_rational_new_bang1(CLASS_OF(self), s), b);
@@ -1302,6 +1219,8 @@ f_round_common(int argc, VALUE *argv, VALUE self, VALUE (*func)(VALUE))
*
* Returns the truncated value (toward negative infinity).
*
+ * For example:
+ *
* Rational(3).floor #=> 3
* Rational(2, 3).floor #=> 0
* Rational(-3, 2).floor #=> -1
@@ -1326,6 +1245,8 @@ nurat_floor_n(int argc, VALUE *argv, VALUE self)
*
* Returns the truncated value (toward positive infinity).
*
+ * For example:
+ *
* Rational(3).ceil #=> 3
* Rational(2, 3).ceil #=> 1
* Rational(-3, 2).ceil #=> -1
@@ -1350,6 +1271,8 @@ nurat_ceil_n(int argc, VALUE *argv, VALUE self)
*
* Returns the truncated value (toward zero).
*
+ * For example:
+ *
* Rational(3).truncate #=> 3
* Rational(2, 3).truncate #=> 0
* Rational(-3, 2).truncate #=> -1
@@ -1375,6 +1298,8 @@ nurat_truncate_n(int argc, VALUE *argv, VALUE self)
* Returns the truncated value (toward the nearest integer;
* 0.5 => 1; -0.5 => -1).
*
+ * For example:
+ *
* Rational(3).round #=> 3
* Rational(2, 3).round #=> 1
* Rational(-3, 2).round #=> -2
@@ -1398,6 +1323,8 @@ nurat_round_n(int argc, VALUE *argv, VALUE self)
*
* Return the value as a float.
*
+ * For example:
+ *
* Rational(2).to_f #=> 2.0
* Rational(9, 4).to_f #=> 2.25
* Rational(-3, 4).to_f #=> -0.75
@@ -1416,6 +1343,8 @@ nurat_to_f(VALUE self)
*
* Returns self.
*
+ * For example:
+ *
* Rational(2).to_r #=> (2/1)
* Rational(-8, 6).to_r #=> (-4/3)
*/
@@ -1426,12 +1355,12 @@ nurat_to_r(VALUE self)
}
#define id_ceil rb_intern("ceil")
-#define f_ceil(x) rb_funcall((x), id_ceil, 0)
+#define f_ceil(x) rb_funcall(x, id_ceil, 0)
#define id_quo rb_intern("quo")
-#define f_quo(x,y) rb_funcall((x), id_quo, 1, (y))
+#define f_quo(x,y) rb_funcall(x, id_quo, 1, y)
-#define f_reciprocal(x) f_quo(ONE, (x))
+#define f_reciprocal(x) f_quo(ONE, x)
/*
The algorithm here is the method described in CLISP. Bruno Haible has
@@ -1526,10 +1455,12 @@ nurat_rationalize_internal(VALUE a, VALUE b, VALUE *p, VALUE *q)
* rat.rationalize -> self
* rat.rationalize(eps) -> rational
*
- * Returns a simpler approximation of the value if the optional
+ * Returns a simpler approximation of the value if an optional
* argument eps is given (rat-|eps| <= result <= rat+|eps|), self
* otherwise.
*
+ * For example:
+ *
* r = Rational(5033165, 16777216)
* r.rationalize #=> (5033165/16777216)
* r.rationalize(Rational('0.01')) #=> (3/10)
@@ -1593,9 +1524,11 @@ f_format(VALUE self, VALUE (*func)(VALUE))
*
* Returns the value as a string.
*
+ * For example:
+ *
* Rational(2).to_s #=> "2/1"
* Rational(-8, 6).to_s #=> "-4/3"
- * Rational('1/2').to_s #=> "1/2"
+ * Rational('0.5').to_s #=> "1/2"
*/
static VALUE
nurat_to_s(VALUE self)
@@ -1609,9 +1542,11 @@ nurat_to_s(VALUE self)
*
* Returns the value as a string for inspection.
*
+ * For example:
+ *
* Rational(2).inspect #=> "(2/1)"
* Rational(-8, 6).inspect #=> "(-4/3)"
- * Rational('1/2').inspect #=> "(1/2)"
+ * Rational('0.5').inspect #=> "(1/2)"
*/
static VALUE
nurat_inspect(VALUE self)
@@ -1627,25 +1562,6 @@ nurat_inspect(VALUE self)
/* :nodoc: */
static VALUE
-nurat_dumper(VALUE self)
-{
- return self;
-}
-
-/* :nodoc: */
-static VALUE
-nurat_loader(VALUE self, VALUE a)
-{
- get_dat1(self);
-
- dat->num = rb_ivar_get(a, id_i_num);
- dat->den = rb_ivar_get(a, id_i_den);
-
- return self;
-}
-
-/* :nodoc: */
-static VALUE
nurat_marshal_dump(VALUE self)
{
VALUE a;
@@ -1660,17 +1576,14 @@ nurat_marshal_dump(VALUE self)
static VALUE
nurat_marshal_load(VALUE self, VALUE a)
{
- rb_check_frozen(self);
- rb_check_trusted(self);
-
+ get_dat1(self);
Check_Type(a, T_ARRAY);
- if (RARRAY_LEN(a) != 2)
- rb_raise(rb_eArgError, "marshaled rational must have an array whose length is 2 but %ld", RARRAY_LEN(a));
- if (f_zero_p(RARRAY_PTR(a)[1]))
- rb_raise_zerodiv();
+ dat->num = RARRAY_PTR(a)[0];
+ dat->den = RARRAY_PTR(a)[1];
+ rb_copy_generic_ivar(self, a);
- rb_ivar_set(self, id_i_num, RARRAY_PTR(a)[0]);
- rb_ivar_set(self, id_i_den, RARRAY_PTR(a)[1]);
+ if (f_zero_p(dat->den))
+ rb_raise_zerodiv();
return self;
}
@@ -1691,6 +1604,8 @@ rb_rational_reciprocal(VALUE x)
* Returns the greatest common divisor (always positive). 0.gcd(x)
* and x.gcd(0) return abs(x).
*
+ * For example:
+ *
* 2.gcd(2) #=> 2
* 3.gcd(-7) #=> 1
* ((1<<31)-1).gcd((1<<61)-1) #=> 1
@@ -1709,6 +1624,8 @@ rb_gcd(VALUE self, VALUE other)
* Returns the least common multiple (always positive). 0.lcm(x) and
* x.lcm(0) return zero.
*
+ * For example:
+ *
* 2.lcm(2) #=> 2
* 3.lcm(-7) #=> 21
* ((1<<31)-1).lcm((1<<61)-1) #=> 4951760154835678088235319297
@@ -1726,6 +1643,8 @@ rb_lcm(VALUE self, VALUE other)
*
* Returns an array; [int.gcd(int2), int.lcm(int2)].
*
+ * For example:
+ *
* 2.gcdlcm(2) #=> [2, 2]
* 3.gcdlcm(-7) #=> [1, 21]
* ((1<<31)-1).gcdlcm((1<<61)-1) #=> [1, 4951760154835678088235319297]
@@ -1761,13 +1680,13 @@ rb_Rational(VALUE x, VALUE y)
}
#define id_numerator rb_intern("numerator")
-#define f_numerator(x) rb_funcall((x), id_numerator, 0)
+#define f_numerator(x) rb_funcall(x, id_numerator, 0)
#define id_denominator rb_intern("denominator")
-#define f_denominator(x) rb_funcall((x), id_denominator, 0)
+#define f_denominator(x) rb_funcall(x, id_denominator, 0)
#define id_to_r rb_intern("to_r")
-#define f_to_r(x) rb_funcall((x), id_to_r, 0)
+#define f_to_r(x) rb_funcall(x, id_to_r, 0)
/*
* call-seq:
@@ -1823,6 +1742,8 @@ integer_denominator(VALUE self)
*
* Returns the numerator. The result is machine dependent.
*
+ * For example:
+ *
* n = 0.3.numerator #=> 5404319552844595
* d = 0.3.denominator #=> 18014398509481984
* n.fdiv(d) #=> 0.3
@@ -1870,7 +1791,7 @@ nilclass_to_r(VALUE self)
* call-seq:
* nil.rationalize([eps]) -> (0/1)
*
- * Returns zero as a rational. The optional argument eps is always
+ * Returns zero as a rational. An optional argument eps is always
* ignored.
*/
static VALUE
@@ -1886,6 +1807,8 @@ nilclass_rationalize(int argc, VALUE *argv, VALUE self)
*
* Returns the value as a rational.
*
+ * For example:
+ *
* 1.to_r #=> (1/1)
* (1<<64).to_r #=> (18446744073709551616/1)
*/
@@ -1899,7 +1822,7 @@ integer_to_r(VALUE self)
* call-seq:
* int.rationalize([eps]) -> rational
*
- * Returns the value as a rational. The optional argument eps is
+ * Returns the value as a rational. An optional argument eps is
* always ignored.
*/
static VALUE
@@ -1934,7 +1857,7 @@ float_decode(VALUE self)
#endif
#define id_lshift rb_intern("<<")
-#define f_lshift(x,n) rb_funcall((x), id_lshift, 1, (n))
+#define f_lshift(x,n) rb_funcall(x, id_lshift, 1, n)
/*
* call-seq:
@@ -1945,12 +1868,12 @@ float_decode(VALUE self)
* NOTE: 0.3.to_r isn't the same as '0.3'.to_r. The latter is
* equivalent to '3/10'.to_r, but the former isn't so.
*
+ * For example:
+ *
* 2.0.to_r #=> (2/1)
* 2.5.to_r #=> (5/2)
* -0.75.to_r #=> (-3/4)
* 0.0.to_r #=> (0/1)
- *
- * See rationalize.
*/
static VALUE
float_to_r(VALUE self)
@@ -1979,14 +1902,14 @@ float_to_r(VALUE self)
* flt.rationalize([eps]) -> rational
*
* Returns a simpler approximation of the value (flt-|eps| <= result
- * <= flt+|eps|). if the optional eps is not given, it will be chosen
+ * <= flt+|eps|). if eps is not given, it will be chosen
* automatically.
*
+ * For example:
+ *
* 0.3.rationalize #=> (3/10)
* 1.333.rationalize #=> (1333/1000)
* 1.333.rationalize(0.01) #=> (4/3)
- *
- * See to_r.
*/
static VALUE
float_rationalize(int argc, VALUE *argv, VALUE self)
@@ -2011,25 +1934,17 @@ float_rationalize(int argc, VALUE *argv, VALUE self)
return rb_rational_new1(f_lshift(f, n));
#if FLT_RADIX == 2
- {
- VALUE two_times_f, den;
-
- two_times_f = f_mul(TWO, f);
- den = f_lshift(ONE, f_sub(ONE, n));
-
- a = rb_rational_new2(f_sub(two_times_f, ONE), den);
- b = rb_rational_new2(f_add(two_times_f, ONE), den);
- }
+ a = rb_rational_new2(f_sub(f_mul(TWO, f), ONE),
+ f_lshift(ONE, f_sub(ONE, n)));
+ b = rb_rational_new2(f_add(f_mul(TWO, f), ONE),
+ f_lshift(ONE, f_sub(ONE, n)));
#else
- {
- VALUE radix_times_f, den;
-
- radix_times_f = f_mul(INT2FIX(FLT_RADIX), f);
- den = f_expt(INT2FIX(FLT_RADIX), f_sub(ONE, n));
-
- a = rb_rational_new2(f_sub(radix_times_f, INT2FIX(FLT_RADIX - 1)), den);
- b = rb_rational_new2(f_add(radix_times_f, INT2FIX(FLT_RADIX - 1)), den);
- }
+ a = rb_rational_new2(f_sub(f_mul(INT2FIX(FLT_RADIX), f),
+ INT2FIX(FLT_RADIX - 1)),
+ f_expt(INT2FIX(FLT_RADIX), f_sub(ONE, n)));
+ b = rb_rational_new2(f_add(f_mul(INT2FIX(FLT_RADIX), f),
+ INT2FIX(FLT_RADIX - 1)),
+ f_expt(INT2FIX(FLT_RADIX), f_sub(ONE, n)));
#endif
}
@@ -2040,225 +1955,141 @@ float_rationalize(int argc, VALUE *argv, VALUE self)
return rb_rational_new2(p, q);
}
-#include <ctype.h>
+static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore;
-inline static int
-issign(int c)
-{
- return (c == '-' || c == '+');
-}
+#define WS "\\s*"
+#define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)"
+#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
+#define DENOMINATOR DIGITS
+#define PATTERN "\\A" WS "([-+])?(" NUMERATOR ")(?:\\/(" DENOMINATOR "))?" WS
-static int
-read_sign(const char **s)
+static void
+make_patterns(void)
{
- int sign = '?';
+ static const char rat_pat_source[] = PATTERN;
+ static const char an_e_pat_source[] = "[eE]";
+ static const char a_dot_pat_source[] = "\\.";
+ static const char underscores_pat_source[] = "_+";
- if (issign(**s)) {
- sign = **s;
- (*s)++;
- }
- return sign;
-}
-
-inline static int
-isdecimal(int c)
-{
- return isdigit((unsigned char)c);
-}
+ if (rat_pat) return;
-static int
-read_digits(const char **s, int strict,
- VALUE *num, int *count)
-{
- char *b, *bb;
- int us = 1, ret = 1;
- VALUE tmp;
+ rat_pat = rb_reg_new(rat_pat_source, sizeof rat_pat_source - 1, 0);
+ rb_gc_register_mark_object(rat_pat);
- if (!isdecimal(**s)) {
- *num = ZERO;
- return 0;
- }
+ an_e_pat = rb_reg_new(an_e_pat_source, sizeof an_e_pat_source - 1, 0);
+ rb_gc_register_mark_object(an_e_pat);
- bb = b = ALLOCV_N(char, tmp, strlen(*s) + 1);
+ a_dot_pat = rb_reg_new(a_dot_pat_source, sizeof a_dot_pat_source - 1, 0);
+ rb_gc_register_mark_object(a_dot_pat);
- while (isdecimal(**s) || **s == '_') {
- if (**s == '_') {
- if (strict) {
- if (us) {
- ret = 0;
- goto conv;
- }
- }
- us = 1;
- }
- else {
- if (count)
- (*count)++;
- *b++ = **s;
- us = 0;
- }
- (*s)++;
- }
- if (us)
- do {
- (*s)--;
- } while (**s == '_');
- conv:
- *b = '\0';
- *num = rb_cstr_to_inum(bb, 10, 0);
- ALLOCV_END(tmp);
- return ret;
-}
+ underscores_pat = rb_reg_new(underscores_pat_source,
+ sizeof underscores_pat_source - 1, 0);
+ rb_gc_register_mark_object(underscores_pat);
-inline static int
-islettere(int c)
-{
- return (c == 'e' || c == 'E');
+ an_underscore = rb_usascii_str_new2("_");
+ rb_gc_register_mark_object(an_underscore);
}
-static int
-read_num(const char **s, int numsign, int strict,
- VALUE *num)
-{
- VALUE ip, fp, exp;
+#define id_match rb_intern("match")
+#define f_match(x,y) rb_funcall(x, id_match, 1, y)
- *num = rb_rational_new2(ZERO, ONE);
- exp = Qnil;
+#define id_aref rb_intern("[]")
+#define f_aref(x,y) rb_funcall(x, id_aref, 1, y)
- if (**s != '.') {
- if (!read_digits(s, strict, &ip, NULL))
- return 0;
- *num = rb_rational_new2(ip, ONE);
- }
+#define id_post_match rb_intern("post_match")
+#define f_post_match(x) rb_funcall(x, id_post_match, 0)
- if (**s == '.') {
- int count = 0;
+#define id_split rb_intern("split")
+#define f_split(x,y) rb_funcall(x, id_split, 1, y)
- (*s)++;
- if (!read_digits(s, strict, &fp, &count))
- return 0;
- {
- VALUE l = f_expt10(INT2NUM(count));
- *num = f_mul(*num, l);
- *num = f_add(*num, fp);
- *num = f_div(*num, l);
- }
- }
+#include <ctype.h>
- if (islettere(**s)) {
- int expsign;
+static VALUE
+string_to_r_internal(VALUE self)
+{
+ VALUE s, m;
- (*s)++;
- expsign = read_sign(s);
- if (!read_digits(s, strict, &exp, NULL))
- return 0;
- if (expsign == '-')
- exp = f_negate(exp);
- }
+ s = self;
- if (numsign == '-')
- *num = f_negate(*num);
- if (!NIL_P(exp)) {
- VALUE l = f_expt10(exp);
- *num = f_mul(*num, l);
- }
- return 1;
-}
+ if (RSTRING_LEN(s) == 0)
+ return rb_assoc_new(Qnil, self);
-inline static int
-read_den(const char **s, int strict,
- VALUE *num)
-{
- if (!read_digits(s, strict, num, NULL))
- return 0;
- return 1;
-}
+ m = f_match(rat_pat, s);
-static int
-read_rat_nos(const char **s, int sign, int strict,
- VALUE *num)
-{
- VALUE den;
+ if (!NIL_P(m)) {
+ VALUE v, ifp, exp, ip, fp;
+ VALUE si = f_aref(m, INT2FIX(1));
+ VALUE nu = f_aref(m, INT2FIX(2));
+ VALUE de = f_aref(m, INT2FIX(3));
+ VALUE re = f_post_match(m);
- if (!read_num(s, sign, strict, num))
- return 0;
- if (**s == '/') {
- (*s)++;
- if (!read_den(s, strict, &den))
- return 0;
- if (!(FIXNUM_P(den) && FIX2LONG(den) == 1))
- *num = f_div(*num, den);
- }
- return 1;
-}
+ {
+ VALUE a;
+
+ a = f_split(nu, an_e_pat);
+ ifp = RARRAY_PTR(a)[0];
+ if (RARRAY_LEN(a) != 2)
+ exp = Qnil;
+ else
+ exp = RARRAY_PTR(a)[1];
+
+ a = f_split(ifp, a_dot_pat);
+ ip = RARRAY_PTR(a)[0];
+ if (RARRAY_LEN(a) != 2)
+ fp = Qnil;
+ else
+ fp = RARRAY_PTR(a)[1];
+ }
-static int
-read_rat(const char **s, int strict,
- VALUE *num)
-{
- int sign;
+ v = rb_rational_new1(f_to_i(ip));
- sign = read_sign(s);
- if (!read_rat_nos(s, sign, strict, num))
- return 0;
- return 1;
-}
+ if (!NIL_P(fp)) {
+ char *p = StringValuePtr(fp);
+ long count = 0;
+ VALUE l;
-inline static void
-skip_ws(const char **s)
-{
- while (isspace((unsigned char)**s))
- (*s)++;
-}
+ while (*p) {
+ if (rb_isdigit(*p))
+ count++;
+ p++;
+ }
-static int
-parse_rat(const char *s, int strict,
- VALUE *num)
-{
- skip_ws(&s);
- if (!read_rat(&s, strict, num))
- return 0;
- skip_ws(&s);
+ l = f_expt(INT2FIX(10), LONG2NUM(count));
+ v = f_mul(v, l);
+ v = f_add(v, f_to_i(fp));
+ v = f_div(v, l);
+ }
+ if (!NIL_P(si) && *StringValuePtr(si) == '-')
+ v = f_negate(v);
+ if (!NIL_P(exp))
+ v = f_mul(v, f_expt(INT2FIX(10), f_to_i(exp)));
+#if 0
+ if (!NIL_P(de) && (!NIL_P(fp) || !NIL_P(exp)))
+ return rb_assoc_new(v, rb_usascii_str_new2("dummy"));
+#endif
+ if (!NIL_P(de))
+ v = f_div(v, f_to_i(de));
- if (strict)
- if (*s != '\0')
- return 0;
- return 1;
+ return rb_assoc_new(v, re);
+ }
+ return rb_assoc_new(Qnil, self);
}
static VALUE
string_to_r_strict(VALUE self)
{
- char *s;
- VALUE num;
-
- rb_must_asciicompat(self);
-
- s = RSTRING_PTR(self);
-
- if (!s || memchr(s, '\0', RSTRING_LEN(self)))
- rb_raise(rb_eArgError, "string contains null byte");
-
- if (s && s[RSTRING_LEN(self)]) {
- rb_str_modify(self);
- s = RSTRING_PTR(self);
- s[RSTRING_LEN(self)] = '\0';
- }
-
- if (!s)
- s = (char *)"";
-
- if (!parse_rat(s, 1, &num)) {
- VALUE ins = f_inspect(self);
+ VALUE a = string_to_r_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(ins));
+ StringValuePtr(s));
}
-
- if (RB_TYPE_P(num, T_FLOAT))
- rb_raise(rb_eFloatDomainError, "Infinity");
- return num;
+ 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_r -> rational
@@ -2271,6 +2102,8 @@ string_to_r_strict(VALUE self)
* NOTE: '0.3'.to_r isn't the same as 0.3.to_r. The former is
* equivalent to '3/10'.to_r, but the latter isn't so.
*
+ * For example:
+ *
* ' 2 '.to_r #=> (2/1)
* '300/2'.to_r #=> (150/1)
* '-9.2'.to_r #=> (-46/5)
@@ -2279,46 +2112,27 @@ string_to_r_strict(VALUE self)
* '21 june 09'.to_r #=> (21/1)
* '21/06/09'.to_r #=> (7/2)
* 'bwv 1079'.to_r #=> (0/1)
- *
- * See Kernel.Rational.
*/
static VALUE
string_to_r(VALUE self)
{
- char *s;
- VALUE num;
+ VALUE s, a, backref;
- rb_must_asciicompat(self);
-
- s = RSTRING_PTR(self);
-
- if (s && s[RSTRING_LEN(self)]) {
- rb_str_modify(self);
- s = RSTRING_PTR(self);
- s[RSTRING_LEN(self)] = '\0';
- }
+ backref = rb_backref_get();
+ rb_match_busy(backref);
- if (!s)
- s = (char *)"";
+ s = f_gsub(self, underscores_pat, an_underscore);
+ a = string_to_r_internal(s);
- (void)parse_rat(s, 0, &num);
+ rb_backref_set(backref);
- if (RB_TYPE_P(num, T_FLOAT))
- rb_raise(rb_eFloatDomainError, "Infinity");
- return num;
+ if (!NIL_P(RARRAY_PTR(a)[0]))
+ return RARRAY_PTR(a)[0];
+ return rb_rational_new1(INT2FIX(0));
}
-VALUE
-rb_cstr_to_rat(const char *s, int strict) /* for complex's internal */
-{
- VALUE num;
-
- (void)parse_rat(s, strict, &num);
-
- if (RB_TYPE_P(num, T_FLOAT))
- rb_raise(rb_eFloatDomainError, "Infinity");
- return num;
-}
+#define id_to_r rb_intern("to_r")
+#define f_to_r(x) rb_funcall(x, id_to_r, 0)
static VALUE
nurat_s_convert(int argc, VALUE *argv, VALUE klass)
@@ -2400,8 +2214,8 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass)
* a/b (b>0). Where a is numerator and b is denominator. Integer a
* equals rational a/1 mathematically.
*
- * In ruby, you can create rational object with Rational, to_r or
- * rationalize method. The return values will be irreducible.
+ * In ruby, you can create rational object with Rational or to_r
+ * method. The return values will be irreducible.
*
* Rational(1) #=> (1/1)
* Rational(2, 3) #=> (2/3)
@@ -2418,7 +2232,6 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass)
* 0.3.to_r #=> (5404319552844595/18014398509481984)
* '0.3'.to_r #=> (3/10)
* '2/3'.to_r #=> (2/3)
- * 0.3.rationalize #=> (3/10)
*
* A rational object is an exact number, which helps you to write
* program without any rounding errors.
@@ -2438,7 +2251,6 @@ nurat_s_convert(int argc, VALUE *argv, VALUE klass)
void
Init_Rational(void)
{
- VALUE compat;
#undef rb_intern
#define rb_intern(str) rb_intern_const(str)
@@ -2459,8 +2271,6 @@ Init_Rational(void)
id_to_i = rb_intern("to_i");
id_to_s = rb_intern("to_s");
id_truncate = rb_intern("truncate");
- id_i_num = rb_intern("@numerator");
- id_i_den = rb_intern("@denominator");
rb_cRational = rb_define_class("Rational", rb_cNumeric);
@@ -2520,10 +2330,8 @@ Init_Rational(void)
rb_define_method(rb_cRational, "to_s", nurat_to_s, 0);
rb_define_method(rb_cRational, "inspect", nurat_inspect, 0);
- rb_define_private_method(rb_cRational, "marshal_dump", nurat_marshal_dump, 0);
- compat = rb_define_class_under(rb_cRational, "compatible", rb_cObject);
- rb_define_private_method(compat, "marshal_load", nurat_marshal_load, 1);
- rb_marshal_define_compat(rb_cRational, compat, nurat_dumper, nurat_loader);
+ rb_define_method(rb_cRational, "marshal_dump", nurat_marshal_dump, 0);
+ rb_define_method(rb_cRational, "marshal_load", nurat_marshal_load, 1);
/* --- */
@@ -2547,6 +2355,8 @@ Init_Rational(void)
rb_define_method(rb_cFloat, "to_r", float_to_r, 0);
rb_define_method(rb_cFloat, "rationalize", float_rationalize, -1);
+ make_patterns();
+
rb_define_method(rb_cString, "to_r", string_to_r, 0);
rb_define_private_method(CLASS_OF(rb_cRational), "convert", nurat_s_convert, -1);
diff --git a/re.c b/re.c
index 506d015d1a..0c31751f7f 100644
--- a/re.c
+++ b/re.c
@@ -13,7 +13,6 @@
#include "ruby/re.h"
#include "ruby/encoding.h"
#include "ruby/util.h"
-#include "internal.h"
#include "regint.h"
#include <ctype.h>
@@ -22,8 +21,8 @@ VALUE rb_eRegexpError;
typedef char onig_errmsg_buffer[ONIG_MAX_ERROR_MESSAGE_LEN];
#define errcpy(err, msg) strlcpy((err), (msg), ONIG_MAX_ERROR_MESSAGE_LEN)
-#define BEG(no) (regs->beg[(no)])
-#define END(no) (regs->end[(no)])
+#define BEG(no) regs->beg[no]
+#define END(no) regs->end[no]
#if 'a' == 97 /* it's ascii */
static const char casetable[] = {
@@ -97,18 +96,6 @@ rb_memcmp(const void *p1, const void *p2, long len)
return memcmp(p1, p2, len);
}
-#ifdef HAVE_MEMMEM
-static inline long
-rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n)
-{
- const unsigned char *y;
-
- if (y = memmem(ys, n, xs, m))
- return y - ys;
- else
- return -1;
-}
-#else
static inline long
rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n)
{
@@ -126,9 +113,6 @@ rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n
if (m > SIZEOF_VALUE)
rb_bug("!!too long pattern string!!");
- if (!(y = memchr(y, *x, n - m + 1)))
- return -1;
-
/* Prepare hash value */
for (hx = *x++, hy = *y++; x < xe; ++x, ++y) {
hx <<= CHAR_BIT;
@@ -147,7 +131,6 @@ rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n
}
return y - ys - m;
}
-#endif
static inline long
rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n)
@@ -236,12 +219,12 @@ rb_memsearch(const void *x0, long m, const void *y0, long n, rb_encoding *enc)
return 0;
}
else if (m == 1) {
- const unsigned char *ys;
-
- if (ys = memchr(y, *x, n))
- return ys - y;
- else
- return -1;
+ const unsigned char *ys = y, *ye = ys + n;
+ for (; y < ye; ++y) {
+ if (*x == *y)
+ return y - ys;
+ }
+ return -1;
}
else if (m <= SIZEOF_VALUE) {
return rb_memsearch_ss(x0, m, y0, n);
@@ -331,19 +314,18 @@ rb_reg_check(VALUE re)
}
}
+int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p);
+
static void
rb_reg_expr_str(VALUE str, const char *s, long len,
rb_encoding *enc, rb_encoding *resenc)
{
const char *p, *pend;
- int cr = ENC_CODERANGE_UNKNOWN;
int need_escape = 0;
int c, clen;
p = s; pend = p + len;
- rb_str_coderange_scan_restartable(p, pend, enc, &cr);
- if (rb_enc_asciicompat(enc) &&
- (cr == ENC_CODERANGE_VALID || cr == ENC_CODERANGE_7BIT)) {
+ if (rb_enc_asciicompat(enc)) {
while (p < pend) {
c = rb_enc_ascget(p, pend, &clen, enc);
if (c == -1) {
@@ -739,7 +721,7 @@ reg_named_captures_iter(const OnigUChar *name, const OnigUChar *name_end,
VALUE ary = rb_ary_new2(back_num);
int i;
- for (i = 0; i < back_num; i++)
+ for(i = 0; i < back_num; i++)
rb_ary_store(ary, i, INT2NUM(back_refs[i]));
rb_hash_aset(hash, rb_str_new((const char*)name, name_end-name),ary);
@@ -785,7 +767,7 @@ onig_new_with_source(regex_t** reg, const UChar* pattern, const UChar* pattern_e
{
int r;
- *reg = (regex_t* )malloc(sizeof(regex_t));
+ *reg = (regex_t* )xmalloc(sizeof(regex_t));
if (IS_NULL(*reg)) return ONIGERR_MEMORY;
r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
@@ -842,7 +824,8 @@ VALUE rb_cMatch;
static VALUE
match_alloc(VALUE klass)
{
- NEWOBJ_OF(match, struct RMatch, klass, T_MATCH);
+ NEWOBJ(match, struct RMatch);
+ OBJSETUP(match, klass, T_MATCH);
match->str = 0;
match->rmatch = 0;
@@ -876,7 +859,7 @@ update_char_offset(VALUE match)
struct re_registers *regs;
int i, num_regs, num_pos;
long c;
- char *s, *p, *q;
+ char *s, *p, *q, *e;
rb_encoding *enc;
pair_t *pairs;
@@ -912,6 +895,7 @@ update_char_offset(VALUE match)
qsort(pairs, num_pos, sizeof(pair_t), pair_byte_cmp);
s = p = RSTRING_PTR(RMATCH(match)->str);
+ e = s + RSTRING_LEN(RMATCH(match)->str);
c = 0;
for (i = 0; i < num_pos; i++) {
q = s + pairs[i].byte_pos;
@@ -954,8 +938,11 @@ match_init_copy(VALUE obj, VALUE orig)
{
struct rmatch *rm;
- if (!OBJ_INIT_COPY(obj, orig)) return obj;
+ if (obj == orig) return obj;
+ if (!rb_obj_is_instance_of(orig, rb_obj_class(obj))) {
+ rb_raise(rb_eTypeError, "wrong argument class");
+ }
RMATCH(obj)->str = RMATCH(orig)->str;
RMATCH(obj)->regexp = RMATCH(orig)->regexp;
@@ -1046,7 +1033,7 @@ match_backref_number(VALUE match, VALUE backref)
VALUE regexp = RMATCH(match)->regexp;
match_check(match);
- switch (TYPE(backref)) {
+ switch(TYPE(backref)) {
default:
return NUM2INT(backref);
@@ -1665,16 +1652,18 @@ match_captures(VALUE match)
static int
name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end)
{
- return onig_name_to_backref_number(RREGEXP(regexp)->ptr,
- (const unsigned char* )name, (const unsigned char* )name_end, regs);
-}
+ int num;
-NORETURN(static void name_to_backref_error(VALUE name));
-static void
-name_to_backref_error(VALUE name)
-{
- rb_raise(rb_eIndexError, "undefined group name reference: % "PRIsVALUE,
- name);
+ num = onig_name_to_backref_number(RREGEXP(regexp)->ptr,
+ (const unsigned char* )name, (const unsigned char* )name_end, regs);
+ if (num >= 1) {
+ return num;
+ }
+ else {
+ VALUE s = rb_str_new(name, (long )(name_end - name));
+ rb_raise(rb_eIndexError, "undefined group name reference: %s",
+ StringValuePtr(s));
+ }
}
/*
@@ -1684,12 +1673,11 @@ name_to_backref_error(VALUE name)
* mtch[range] -> array
* mtch[name] -> str or nil
*
- * Match Reference -- <code>MatchData</code> acts as an array, and may be
- * accessed using the normal array indexing techniques. <code>mtch[0]</code>
- * is equivalent to the special variable <code>$&</code>, and returns the
- * entire matched string. <code>mtch[1]</code>, <code>mtch[2]</code>, and so
- * on return the values of the matched backreferences (portions of the
- * pattern between parentheses).
+ * Match Reference---<code>MatchData</code> acts as an array, and may be
+ * accessed using the normal array indexing techniques. <i>mtch</i>[0] is
+ * equivalent to the special variable <code>$&</code>, and returns the entire
+ * matched string. <i>mtch</i>[1], <i>mtch</i>[2], and so on return the values
+ * of the matched backreferences (portions of the pattern between parentheses).
*
* m = /(.)(.)(\d+)(\d)/.match("THX1138.")
* m #=> #<MatchData "HX1138" 1:"H" 2:"X" 3:"113" 4:"8">
@@ -1724,16 +1712,17 @@ match_aref(int argc, VALUE *argv, VALUE match)
switch (TYPE(idx)) {
case T_SYMBOL:
- idx = rb_id2str(SYM2ID(idx));
- /* fall through */
+ p = rb_id2name(SYM2ID(idx));
+ goto name_to_backref;
+ break;
case T_STRING:
p = StringValuePtr(idx);
- if (!rb_enc_compatible(RREGEXP(RMATCH(match)->regexp)->src, idx) ||
- (num = name_to_backref_number(RMATCH_REGS(match), RMATCH(match)->regexp,
- p, p + RSTRING_LEN(idx))) < 1) {
- name_to_backref_error(idx);
- }
+
+ name_to_backref:
+ num = name_to_backref_number(RMATCH_REGS(match),
+ RMATCH(match)->regexp, p, p + strlen(p));
return rb_reg_nth_match(num, match);
+ break;
default:
break;
@@ -1910,7 +1899,9 @@ read_escaped_byte(const char **pp, const char *end, onig_errmsg_buffer err)
int code;
int meta_prefix = 0, ctrl_prefix = 0;
size_t len;
+ int retbyte;
+ retbyte = -1;
if (p == end || *p++ != '\\') {
errcpy(err, "too short escaped multibyte character");
return -1;
@@ -2396,8 +2387,8 @@ rb_reg_initialize(VALUE obj, const char *s, long len, rb_encoding *enc,
re->ptr = 0;
if (rb_enc_dummy_p(enc)) {
- errcpy(err, "can't make regexp with dummy encoding");
- return -1;
+ errcpy(err, "can't make regexp with dummy encoding");
+ return -1;
}
unescaped = rb_reg_preprocess(s, s+len, enc, &fixed_enc, err);
@@ -2463,7 +2454,8 @@ rb_reg_initialize_str(VALUE obj, VALUE str, int options, onig_errmsg_buffer err,
static VALUE
rb_reg_s_alloc(VALUE klass)
{
- NEWOBJ_OF(re, struct RRegexp, klass, T_REGEXP);
+ NEWOBJ(re, struct RRegexp);
+ OBJSETUP(re, klass, T_REGEXP);
re->ptr = 0;
re->src = 0;
@@ -2588,7 +2580,7 @@ reg_hash(VALUE re)
*
* /abc/ == /abc/x #=> false
* /abc/ == /abc/i #=> false
- * /abc/ == /abc/u #=> false
+ * /abc/ == /abc/n #=> false
* /abc/u == /abc/n #=> false
*/
@@ -2596,7 +2588,7 @@ static VALUE
rb_reg_equal(VALUE re1, VALUE re2)
{
if (re1 == re2) return Qtrue;
- if (!RB_TYPE_P(re2, T_REGEXP)) return Qfalse;
+ if (TYPE(re2) != T_REGEXP) return Qfalse;
rb_reg_check(re1); rb_reg_check(re2);
if (FL_TEST(re1, KCODE_FIXED) != FL_TEST(re2, KCODE_FIXED)) return Qfalse;
if (RREGEXP(re1)->ptr->options != RREGEXP(re2)->ptr->options) return Qfalse;
@@ -2644,7 +2636,7 @@ match_equal(VALUE match1, VALUE match2)
{
const struct re_registers *regs1, *regs2;
if (match1 == match2) return Qtrue;
- if (!RB_TYPE_P(match2, T_MATCH)) return Qfalse;
+ if (TYPE(match2) != T_MATCH) return Qfalse;
if (!rb_str_equal(RMATCH(match1)->str, RMATCH(match2)->str)) return Qfalse;
if (!rb_reg_equal(RMATCH(match1)->regexp, RMATCH(match2)->regexp)) return Qfalse;
regs1 = RMATCH_REGS(match1);
@@ -2662,7 +2654,12 @@ reg_operand(VALUE s, int check)
return rb_sym_to_s(s);
}
else {
- return (check ? rb_str_to_str : rb_check_string_type)(s);
+ VALUE tmp = rb_check_string_type(s);
+ if (check && NIL_P(tmp)) {
+ rb_raise(rb_eTypeError, "can't convert %s to String",
+ rb_obj_classname(s));
+ }
+ return tmp;
}
}
@@ -2716,7 +2713,7 @@ reg_match_pos(VALUE re, VALUE *strp, long pos)
* The parser detects 'regexp-literal =~ expression' for the assignment.
* The regexp must be a literal without interpolation and placed at left hand side.
*
- * The assignment does not occur if the regexp is not a literal.
+ * The assignment is not occur if the regexp is not a literal.
*
* re = /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/
* re =~ " x = y "
@@ -2730,7 +2727,7 @@ reg_match_pos(VALUE re, VALUE *strp, long pos)
* /(?<lhs>\w+)\s*=\s*#{rhs_pat}/ =~ "x = y"
* p lhs # undefined local variable
*
- * The assignment does not occur if the regexp is placed at the right hand side.
+ * The assignment is not occur if the regexp is placed at right hand side.
*
* " x = y " =~ /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/
* p lhs, rhs # undefined local variable
@@ -2750,7 +2747,7 @@ rb_reg_match(VALUE re, VALUE str)
* call-seq:
* rxp === str -> true or false
*
- * Case Equality---Used in case statements.
+ * Case Equality---Synonym for <code>Regexp#=~</code> used in case statements.
*
* a = "HELLO"
* case a
@@ -2758,13 +2755,10 @@ rb_reg_match(VALUE re, VALUE str)
* when /^[A-Z]*$/; print "Upper case\n"
* else; print "Mixed case\n"
* end
- * #=> "Upper case"
*
- * Following a regular expression literal with the #=== operator allows you to
- * compare against a String.
+ * <em>produces:</em>
*
- * /^[a-z]*$/ === "HELLO" #=> false
- * /^[A-Z]*$/ === "HELLO" #=> true
+ * Upper case
*/
VALUE
@@ -2802,7 +2796,7 @@ rb_reg_match2(VALUE re)
long start;
VALUE line = rb_lastline_get();
- if (!RB_TYPE_P(line, T_STRING)) {
+ if (TYPE(line) != T_STRING) {
rb_backref_set(Qnil);
return Qnil;
}
@@ -2879,27 +2873,25 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re)
/*
* call-seq:
- * Regexp.new(string, [options [, kcode]]) -> regexp
+ * Regexp.new(string, [options [, lang]]) -> regexp
* Regexp.new(regexp) -> regexp
- * Regexp.compile(string, [options [, kcode]]) -> regexp
+ * Regexp.compile(string, [options [, lang]]) -> regexp
* Regexp.compile(regexp) -> regexp
*
- * Constructs a new regular expression from +pattern+, which can be either a
- * String or a Regexp (in which case that regexp's options are propagated),
- * and new options may not be specified (a change as of Ruby 1.8).
- *
- * If +options+ is a Fixnum, it should be one or more of the constants
- * Regexp::EXTENDED, Regexp::IGNORECASE, and Regexp::MULTILINE,
- * <em>or</em>-ed together. Otherwise, if +options+ is not
- * +nil+ or +false+, the regexp will be case insensitive.
- *
- * When the +kcode+ parameter is `n' or `N' sets the regexp no encoding.
- * It means that the regexp is for binary strings.
- *
- * r1 = Regexp.new('^a-z+:\\s+\w+') #=> /^a-z+:\s+\w+/
- * r2 = Regexp.new('cat', true) #=> /cat/i
- * r3 = Regexp.new(r2) #=> /cat/i
- * r4 = Regexp.new('dog', Regexp::EXTENDED | Regexp::IGNORECASE) #=> /dog/ix
+ * Constructs a new regular expression from <i>pattern</i>, which can be either
+ * a <code>String</code> or a <code>Regexp</code> (in which case that regexp's
+ * options are propagated, and new options may not be specified (a change as of
+ * Ruby 1.8). If <i>options</i> is a <code>Fixnum</code>, it should be one or
+ * more of the constants <code>Regexp::EXTENDED</code>,
+ * <code>Regexp::IGNORECASE</code>, and <code>Regexp::MULTILINE</code>,
+ * <em>or</em>-ed together. Otherwise, if <i>options</i> is not
+ * <code>nil</code>, the regexp will be case insensitive.
+ * When the <i>lang</i> parameter is `n' or `N' sets the regexp no encoding.
+ *
+ * r1 = Regexp.new('^a-z+:\\s+\w+') #=> /^a-z+:\s+\w+/
+ * r2 = Regexp.new('cat', true) #=> /cat/i
+ * r3 = Regexp.new('dog', Regexp::EXTENDED) #=> /dog/x
+ * r4 = Regexp.new(r2) #=> /cat/i
*/
static VALUE
@@ -2912,8 +2904,10 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
const char *ptr;
long len;
- rb_check_arity(argc, 1, 3);
- if (RB_TYPE_P(argv[0], T_REGEXP)) {
+ if (argc == 0 || argc > 3) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", argc);
+ }
+ if (TYPE(argv[0]) == T_REGEXP) {
VALUE re = argv[0];
if (argc > 1) {
@@ -3266,7 +3260,12 @@ rb_reg_init_copy(VALUE copy, VALUE re)
const char *s;
long len;
- if (!OBJ_INIT_COPY(copy, re)) return copy;
+ if (copy == re) return copy;
+ rb_check_frozen(copy);
+ /* need better argument type check */
+ if (!rb_obj_is_instance_of(re, rb_obj_class(copy))) {
+ rb_raise(rb_eTypeError, "wrong argument type");
+ }
rb_reg_check(re);
s = RREGEXP_SRC_PTR(re);
len = RREGEXP_SRC_LEN(re);
@@ -3286,7 +3285,7 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
rb_encoding *str_enc = rb_enc_get(str);
rb_encoding *src_enc = rb_enc_get(src);
int acompat = rb_enc_asciicompat(str_enc);
-#define ASCGET(s,e,cl) (acompat ? (*(cl)=1,ISASCII((s)[0])?(s)[0]:-1) : rb_enc_ascget((s), (e), (cl), str_enc))
+#define ASCGET(s,e,cl) (acompat ? (*cl=1,ISASCII(s[0])?s[0]:-1) : rb_enc_ascget(s, e, cl, str_enc))
p = s = RSTRING_PTR(str);
e = s + RSTRING_LEN(str);
@@ -3341,12 +3340,7 @@ rb_reg_regsub(VALUE str, VALUE src, struct re_registers *regs, VALUE regexp)
name_end += c == -1 ? mbclen(name_end, e, str_enc) : clen;
}
if (name_end < e) {
- VALUE n = rb_str_subseq(str, (long)(name - RSTRING_PTR(str)),
- (long)(name_end - name));
- if (!rb_enc_compatible(RREGEXP(regexp)->src, n) ||
- (no = name_to_backref_number(regs, regexp, name, name_end)) < 1) {
- name_to_backref_error(n);
- }
+ no = name_to_backref_number(regs, regexp, name, name_end);
p = s = name_end + clen;
break;
}
@@ -3451,16 +3445,14 @@ match_setter(VALUE val)
* Regexp.last_match -> matchdata
* Regexp.last_match(n) -> str
*
- * The first form returns the MatchData object generated by the
- * last successful pattern match. Equivalent to reading the special global
- * variable <code>$~</code> (see Special global variables in Regexp for
- * details).
- *
- * The second form returns the <i>n</i>th field in this MatchData object.
- * _n_ can be a string or symbol to reference a named capture.
+ * The first form returns the <code>MatchData</code> object generated by the
+ * last successful pattern match. Equivalent to reading the global variable
+ * <code>$~</code>. The second form returns the <i>n</i>th field in this
+ * <code>MatchData</code> object.
+ * <em>n</em> can be a string or symbol to reference a named capture.
*
- * Note that the last_match is local to the thread and method scope of the
- * method that did the pattern match.
+ * Note that the <code>last_match</code> is local to the thread and method scope
+ * of the method that did the pattern match.
*
* /c(.)t/ =~ 'cat' #=> 0
* Regexp.last_match #=> #<MatchData "cat" 1:"a">
@@ -3566,16 +3558,10 @@ Init_Regexp(void)
rb_define_method(rb_cRegexp, "names", rb_reg_names, 0);
rb_define_method(rb_cRegexp, "named_captures", rb_reg_named_captures, 0);
- /* see Regexp.options and Regexp.new */
rb_define_const(rb_cRegexp, "IGNORECASE", INT2FIX(ONIG_OPTION_IGNORECASE));
- /* see Regexp.options and Regexp.new */
rb_define_const(rb_cRegexp, "EXTENDED", INT2FIX(ONIG_OPTION_EXTEND));
- /* see Regexp.options and Regexp.new */
rb_define_const(rb_cRegexp, "MULTILINE", INT2FIX(ONIG_OPTION_MULTILINE));
- /* see Regexp.options and Regexp.new */
rb_define_const(rb_cRegexp, "FIXEDENCODING", INT2FIX(ARG_ENCODING_FIXED));
- /* see Regexp.options and Regexp.new */
- rb_define_const(rb_cRegexp, "NOENCODING", INT2FIX(ARG_ENCODING_NONE));
rb_global_variable(&reg_cache);
diff --git a/regcomp.c b/regcomp.c
index b4264a40bd..06b67f5b69 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1,9 +1,8 @@
/**********************************************************************
- regcomp.c - Onigmo (Oniguruma-mod) (regular expression library)
+ regcomp.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2013 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,7 +49,6 @@ onig_set_default_case_fold_flag(OnigCaseFoldType case_fold_flag)
static unsigned char PadBuf[WORD_ALIGNMENT_SIZE];
#endif
-#if 0
static UChar*
str_dup(UChar* s, UChar* end)
{
@@ -65,7 +63,6 @@ str_dup(UChar* s, UChar* end)
}
else return NULL;
}
-#endif
static void
swap_node(Node* a, Node* b)
@@ -118,7 +115,7 @@ static int
bitset_is_empty(BitSetRef bs)
{
int i;
- for (i = 0; i < BITSET_SIZE; i++) {
+ for (i = 0; i < (int )BITSET_SIZE; i++) {
if (bs[i] != 0) return 0;
}
return 1;
@@ -126,12 +123,6 @@ bitset_is_empty(BitSetRef bs)
#ifdef ONIG_DEBUG
static int
-onig_is_prelude(void)
-{
- return !rb_const_defined(rb_cThread, rb_intern_const("MUTEX_FOR_THREAD_EXCLUSIVE"));
-}
-
-static int
bitset_on_num(BitSetRef bs)
{
int i, n;
@@ -145,7 +136,7 @@ bitset_on_num(BitSetRef bs)
#endif
extern int
-onig_bbuf_init(BBuf* buf, OnigDistance size)
+onig_bbuf_init(BBuf* buf, int size)
{
if (size <= 0) {
size = 0;
@@ -156,7 +147,7 @@ onig_bbuf_init(BBuf* buf, OnigDistance size)
if (IS_NULL(buf->p)) return(ONIGERR_MEMORY);
}
- buf->alloc = (unsigned int )size;
+ buf->alloc = size;
buf->used = 0;
return 0;
}
@@ -243,7 +234,7 @@ add_abs_addr(regex_t* reg, int addr)
}
static int
-add_length(regex_t* reg, OnigDistance len)
+add_length(regex_t* reg, int len)
{
LengthType l = (LengthType )len;
@@ -288,7 +279,7 @@ add_opcode_rel_addr(regex_t* reg, int opcode, int addr)
}
static int
-add_bytes(regex_t* reg, UChar* bytes, OnigDistance len)
+add_bytes(regex_t* reg, UChar* bytes, int len)
{
BBUF_ADD(reg, bytes, len);
return 0;
@@ -321,7 +312,7 @@ static int compile_tree(Node* node, regex_t* reg);
(op) == OP_EXACTMB3N || (op) == OP_EXACTMBN || (op) == OP_EXACTN_IC)
static int
-select_str_opcode(int mb_len, OnigDistance str_len, int ignore_case)
+select_str_opcode(int mb_len, int str_len, int ignore_case)
{
int op;
@@ -437,12 +428,12 @@ add_compile_string_length(UChar* s ARG_UNUSED, int mb_len, OnigDistance str_len,
if (IS_NEED_STR_LEN_OP_EXACT(op))
len += SIZE_LENGTH;
- len += mb_len * (int )str_len;
+ len += mb_len * str_len;
return len;
}
static int
-add_compile_string(UChar* s, int mb_len, OnigDistance str_len,
+add_compile_string(UChar* s, int mb_len, int str_len,
regex_t* reg, int ignore_case)
{
int op = select_str_opcode(mb_len, str_len, ignore_case);
@@ -1266,26 +1257,6 @@ compile_length_enclose_node(EncloseNode* node, regex_t* reg)
}
break;
- case ENCLOSE_CONDITION:
- len = SIZE_OP_CONDITION;
- if (NTYPE(node->target) == NT_ALT) {
- Node* x = node->target;
-
- tlen = compile_length_tree(NCAR(x), reg); /* yes-node */
- if (tlen < 0) return tlen;
- len += tlen + SIZE_OP_JUMP;
- if (NCDR(x) == NULL) return ONIGERR_PARSER_BUG;
- x = NCDR(x);
- tlen = compile_length_tree(NCAR(x), reg); /* no-node */
- if (tlen < 0) return tlen;
- len += tlen;
- if (NCDR(x) != NULL) return ONIGERR_INVALID_CONDITION_PATTERN;
- }
- else {
- return ONIGERR_PARSER_BUG;
- }
- break;
-
default:
return ONIGERR_TYPE_BUG;
break;
@@ -1389,39 +1360,6 @@ compile_enclose_node(EncloseNode* node, regex_t* reg)
}
break;
- case ENCLOSE_CONDITION:
- r = add_opcode(reg, OP_CONDITION);
- if (r) return r;
- r = add_mem_num(reg, node->regnum);
- if (r) return r;
-
- if (NTYPE(node->target) == NT_ALT) {
- Node* x = node->target;
- int len2;
-
- len = compile_length_tree(NCAR(x), reg); /* yes-node */
- if (len < 0) return len;
- if (NCDR(x) == NULL) return ONIGERR_PARSER_BUG;
- x = NCDR(x);
- len2 = compile_length_tree(NCAR(x), reg); /* no-node */
- if (len2 < 0) return len2;
- if (NCDR(x) != NULL) return ONIGERR_INVALID_CONDITION_PATTERN;
-
- x = node->target;
- r = add_rel_addr(reg, len + SIZE_OP_JUMP);
- if (r) return r;
- r = compile_tree(NCAR(x), reg); /* yes-node */
- if (r) return r;
- r = add_opcode_rel_addr(reg, OP_JUMP, len2);
- if (r) return r;
- x = NCDR(x);
- r = compile_tree(NCAR(x), reg); /* no-node */
- }
- else {
- return ONIGERR_PARSER_BUG;
- }
- break;
-
default:
return ONIGERR_TYPE_BUG;
break;
@@ -1476,28 +1414,12 @@ compile_anchor_node(AnchorNode* node, regex_t* reg)
case ANCHOR_SEMI_END_BUF: r = add_opcode(reg, OP_SEMI_END_BUF); break;
case ANCHOR_BEGIN_POSITION: r = add_opcode(reg, OP_BEGIN_POSITION); break;
- /* used for implicit anchor optimization: /.*a/ ==> /(?:^|\G).*a/ */
- case ANCHOR_ANYCHAR_STAR: r = add_opcode(reg, OP_BEGIN_POS_OR_LINE); break;
-
- case ANCHOR_WORD_BOUND:
- if (node->ascii_range) r = add_opcode(reg, OP_ASCII_WORD_BOUND);
- else r = add_opcode(reg, OP_WORD_BOUND);
- break;
- case ANCHOR_NOT_WORD_BOUND:
- if (node->ascii_range) r = add_opcode(reg, OP_NOT_ASCII_WORD_BOUND);
- else r = add_opcode(reg, OP_NOT_WORD_BOUND);
- break;
+ case ANCHOR_WORD_BOUND: r = add_opcode(reg, OP_WORD_BOUND); break;
+ case ANCHOR_NOT_WORD_BOUND: r = add_opcode(reg, OP_NOT_WORD_BOUND); break;
#ifdef USE_WORD_BEGIN_END
- case ANCHOR_WORD_BEGIN:
- if (node->ascii_range) r = add_opcode(reg, OP_ASCII_WORD_BEGIN);
- else r = add_opcode(reg, OP_WORD_BEGIN);
- break;
- case ANCHOR_WORD_END:
- if (node->ascii_range) r = add_opcode(reg, OP_ASCII_WORD_END);
- else r = add_opcode(reg, OP_WORD_END);
- break;
+ case ANCHOR_WORD_BEGIN: r = add_opcode(reg, OP_WORD_BEGIN); break;
+ case ANCHOR_WORD_END: r = add_opcode(reg, OP_WORD_END); break;
#endif
- case ANCHOR_KEEP: r = add_opcode(reg, OP_KEEP); break;
case ANCHOR_PREC_READ:
r = add_opcode(reg, OP_PUSH_POS);
@@ -1715,14 +1637,8 @@ compile_tree(Node* node, regex_t* reg)
switch (NCTYPE(node)->ctype) {
case ONIGENC_CTYPE_WORD:
- if (NCTYPE(node)->ascii_range != 0) {
- if (NCTYPE(node)->not != 0) op = OP_NOT_ASCII_WORD;
- else op = OP_ASCII_WORD;
- }
- else {
- if (NCTYPE(node)->not != 0) op = OP_NOT_WORD;
- else op = OP_WORD;
- }
+ if (NCTYPE(node)->not != 0) op = OP_NOT_WORD;
+ else op = OP_WORD;
break;
default:
return ONIGERR_TYPE_BUG;
@@ -1943,12 +1859,7 @@ renumber_by_map(Node* node, GroupNumRemap* map)
r = renumber_by_map(NQTFR(node)->target, map);
break;
case NT_ENCLOSE:
- {
- EncloseNode* en = NENCLOSE(node);
- if (en->type == ENCLOSE_CONDITION)
- en->regnum = map[en->regnum].new_val;
- r = renumber_by_map(en->target, map);
- }
+ r = renumber_by_map(NENCLOSE(node)->target, map);
break;
case NT_BREF:
@@ -2115,7 +2026,6 @@ quantifiers_memory_node_info(Node* node)
case ENCLOSE_OPTION:
case ENCLOSE_STOP_BACKTRACK:
- case ENCLOSE_CONDITION:
r = quantifiers_memory_node_info(en->target);
break;
default:
@@ -2247,7 +2157,6 @@ get_min_match_length(Node* node, OnigDistance *min, ScanEnv* env)
#endif
case ENCLOSE_OPTION:
case ENCLOSE_STOP_BACKTRACK:
- case ENCLOSE_CONDITION:
r = get_min_match_length(en->target, min, env);
break;
}
@@ -2365,7 +2274,6 @@ get_max_match_length(Node* node, OnigDistance *max, ScanEnv* env)
#endif
case ENCLOSE_OPTION:
case ENCLOSE_STOP_BACKTRACK:
- case ENCLOSE_CONDITION:
r = get_max_match_length(en->target, max, env);
break;
}
@@ -2397,7 +2305,7 @@ get_char_length_tree1(Node* node, regex_t* reg, int* len, int level)
do {
r = get_char_length_tree1(NCAR(node), reg, &tlen, level);
if (r == 0)
- *len = (int )distance_add(*len, tlen);
+ *len = distance_add(*len, tlen);
} while (r == 0 && IS_NOT_NULL(node = NCDR(node)));
break;
@@ -2444,7 +2352,7 @@ get_char_length_tree1(Node* node, regex_t* reg, int* len, int level)
if (qn->lower == qn->upper) {
r = get_char_length_tree1(qn->target, reg, &tlen, level);
if (r == 0)
- *len = (int )distance_multiply(tlen, qn->lower);
+ *len = distance_multiply(tlen, qn->lower);
}
else
r = GET_CHAR_LEN_VARLEN;
@@ -2488,7 +2396,6 @@ get_char_length_tree1(Node* node, regex_t* reg, int* len, int level)
#endif
case ENCLOSE_OPTION:
case ENCLOSE_STOP_BACKTRACK:
- case ENCLOSE_CONDITION:
r = get_char_length_tree1(en->target, reg, len, level);
break;
default:
@@ -2518,10 +2425,9 @@ get_char_length_tree(Node* node, regex_t* reg, int* len)
static int
is_not_included(Node* x, Node* y, regex_t* reg)
{
- int i;
- OnigDistance len;
+ int i, len;
OnigCodePoint code;
- UChar *p;
+ UChar *p, c;
int ytype;
retry:
@@ -2532,8 +2438,7 @@ is_not_included(Node* x, Node* y, regex_t* reg)
switch (ytype) {
case NT_CTYPE:
if (NCTYPE(y)->ctype == NCTYPE(x)->ctype &&
- NCTYPE(y)->not != NCTYPE(x)->not &&
- NCTYPE(y)->ascii_range == NCTYPE(x)->ascii_range)
+ NCTYPE(y)->not != NCTYPE(x)->not)
return 1;
else
return 0;
@@ -2569,12 +2474,7 @@ is_not_included(Node* x, Node* y, regex_t* reg)
if (IS_NULL(xc->mbuf) && !IS_NCCLASS_NOT(xc)) {
for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
if (BITSET_AT(xc->bs, i)) {
- if (NCTYPE(y)->ascii_range) {
- if (IS_CODE_SB_WORD(reg->enc, i)) return 0;
- }
- else {
- if (ONIGENC_IS_CODE_WORD(reg->enc, i)) return 0;
- }
+ if (IS_CODE_SB_WORD(reg->enc, i)) return 0;
}
}
return 1;
@@ -2583,12 +2483,7 @@ is_not_included(Node* x, Node* y, regex_t* reg)
}
else {
for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
- int is_word;
- if (NCTYPE(y)->ascii_range)
- is_word = IS_CODE_SB_WORD(reg->enc, i);
- else
- is_word = ONIGENC_IS_CODE_WORD(reg->enc, i);
- if (! is_word) {
+ if (! IS_CODE_SB_WORD(reg->enc, i)) {
if (!IS_NCCLASS_NOT(xc)) {
if (BITSET_AT(xc->bs, i))
return 0;
@@ -2646,22 +2541,15 @@ is_not_included(Node* x, Node* y, regex_t* reg)
if (NSTRING_LEN(x) == 0)
break;
+ c = *(xs->s);
switch (ytype) {
case NT_CTYPE:
switch (NCTYPE(y)->ctype) {
case ONIGENC_CTYPE_WORD:
- if (NCTYPE(y)->ascii_range) {
- if (ONIGENC_IS_MBC_ASCII_WORD(reg->enc, xs->s, xs->end))
- return NCTYPE(y)->not;
- else
- return !(NCTYPE(y)->not);
- }
- else {
- if (ONIGENC_IS_MBC_WORD(reg->enc, xs->s, xs->end))
- return NCTYPE(y)->not;
- else
- return !(NCTYPE(y)->not);
- }
+ if (ONIGENC_IS_MBC_WORD(reg->enc, xs->s, xs->end))
+ return NCTYPE(y)->not;
+ else
+ return !(NCTYPE(y)->not);
break;
default:
break;
@@ -2689,7 +2577,7 @@ is_not_included(Node* x, Node* y, regex_t* reg)
return 0;
}
else {
- for (i = 0, p = ys->s, q = xs->s; (OnigDistance )i < len; i++, p++, q++) {
+ for (i = 0, p = ys->s, q = xs->s; i < len; i++, p++, q++) {
if (*p != *q) return 1;
}
}
@@ -2778,7 +2666,6 @@ get_head_value_node(Node* node, int exact, regex_t* reg)
case ENCLOSE_MEMORY:
case ENCLOSE_STOP_BACKTRACK:
- case ENCLOSE_CONDITION:
n = get_head_value_node(en->target, exact, reg);
break;
}
@@ -3177,11 +3064,6 @@ setup_subexp_call(Node* node, ScanEnv* env)
cn->unset_addr_list = env->unset_addr_list;
}
#ifdef USE_NAMED_GROUP
-#ifdef USE_PERL_SUBEXP_CALL
- else if (cn->name == cn->name_end) {
- goto set_call_attr;
- }
-#endif
else {
int *refs;
@@ -3192,8 +3074,7 @@ setup_subexp_call(Node* node, ScanEnv* env)
ONIGERR_UNDEFINED_NAME_REFERENCE, cn->name, cn->name_end);
return ONIGERR_UNDEFINED_NAME_REFERENCE;
}
- else if (n > 1 &&
- ! IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL)) {
+ else if (n > 1) {
onig_scan_env_set_error_string(env,
ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL, cn->name, cn->name_end);
return ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL;
@@ -3286,7 +3167,7 @@ setup_look_behind(Node* node, regex_t* reg, ScanEnv* env)
}
static int
-next_setup(Node* node, Node* next_node, int in_root, regex_t* reg)
+next_setup(Node* node, Node* next_node, regex_t* reg)
{
int type;
@@ -3302,7 +3183,7 @@ next_setup(Node* node, Node* next_node, int in_root, regex_t* reg)
qn->next_head_exact = n;
}
#endif
- /* automatic possessivation a*b ==> (?>a*)b */
+ /* automatic posseivation a*b ==> (?>a*)b */
if (qn->lower <= 1) {
int ttype = NTYPE(qn->target);
if (IS_NODE_TYPE_SIMPLE(ttype)) {
@@ -3320,32 +3201,10 @@ next_setup(Node* node, Node* next_node, int in_root, regex_t* reg)
}
}
}
-
-#ifndef ONIG_DONT_OPTIMIZE
- if (NTYPE(node) == NT_QTFR && /* the type may be changed by above block */
- in_root && /* qn->lower == 0 && */
- NTYPE(qn->target) == NT_CANY &&
- ! IS_MULTILINE(reg->options)) {
- /* implicit anchor: /.*a/ ==> /(?:^|\G).*a/ */
- Node *np;
- np = onig_node_new_list(NULL_NODE, NULL_NODE);
- CHECK_NULL_RETURN_MEMERR(np);
- swap_node(node, np);
- NCDR(node) = onig_node_new_list(np, NULL_NODE);
- if (IS_NULL(NCDR(node))) {
- onig_node_free(np);
- return ONIGERR_MEMORY;
- }
- np = onig_node_new_anchor(ANCHOR_ANYCHAR_STAR); /* (?:^|\G) */
- CHECK_NULL_RETURN_MEMERR(np);
- NCAR(node) = np;
- }
-#endif
}
}
else if (type == NT_ENCLOSE) {
EncloseNode* en = NENCLOSE(node);
- in_root = 0;
if (en->type == ENCLOSE_MEMORY) {
node = en->target;
goto retry;
@@ -3358,10 +3217,9 @@ next_setup(Node* node, Node* next_node, int in_root, regex_t* reg)
static int
update_string_node_case_fold(regex_t* reg, Node *node)
{
- UChar *p, *end, buf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
+ UChar *p, *q, *end, buf[ONIGENC_MBC_CASE_FOLD_MAXLEN];
UChar *sbuf, *ebuf, *sp;
- int r, i, len;
- OnigDistance sbuf_size;
+ int r, i, len, sbuf_size;
StrNode* sn = NSTR(node);
end = sn->end;
@@ -3374,14 +3232,11 @@ update_string_node_case_fold(regex_t* reg, Node *node)
p = sn->s;
while (p < end) {
len = ONIGENC_MBC_CASE_FOLD(reg->enc, reg->case_fold_flag, &p, end, buf);
+ q = buf;
for (i = 0; i < len; i++) {
if (sp >= ebuf) {
- UChar* p = (UChar* )xrealloc(sbuf, sbuf_size * 2);
- if (IS_NULL(p)) {
- xfree(sbuf);
- return ONIGERR_MEMORY;
- }
- sbuf = p;
+ sbuf = (UChar* )xrealloc(sbuf, sbuf_size * 2);
+ CHECK_NULL_RETURN_MEMERR(sbuf);
sp = sbuf + sbuf_size;
sbuf_size *= 2;
ebuf = sbuf + sbuf_size;
@@ -3428,22 +3283,18 @@ expand_case_fold_string_alt(int item_num, OnigCaseFoldCodeItem items[],
UChar *p, int slen, UChar *end,
regex_t* reg, Node **rnode)
{
- int r, i, j, len, varlen, varclen;
+ int r, i, j, len, varlen;
Node *anode, *var_anode, *snode, *xnode, *an;
UChar buf[ONIGENC_CODE_TO_MBC_MAXLEN];
*rnode = var_anode = NULL_NODE;
varlen = 0;
- varclen = 0;
for (i = 0; i < item_num; i++) {
if (items[i].byte_len != slen) {
varlen = 1;
break;
}
- if (items[i].code_len != 1) {
- varclen = 1;
- }
}
if (varlen != 0) {
@@ -3528,8 +3379,6 @@ expand_case_fold_string_alt(int item_num, OnigCaseFoldCodeItem items[],
}
}
- if (varclen && !varlen)
- return 2;
return varlen;
mem_err2:
@@ -3547,7 +3396,6 @@ expand_case_fold_string(Node* node, regex_t* reg)
#define THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION 8
int r, n, len, alt_num;
- int varlen = 0;
UChar *start, *end, *p;
Node *top_root, *root, *snode, *prev_node;
OnigCaseFoldCodeItem items[ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM];
@@ -3610,7 +3458,6 @@ expand_case_fold_string(Node* node, regex_t* reg)
r = expand_case_fold_string_alt(n, items, p, len, end, reg, &prev_node);
if (r < 0) goto mem_err;
- if (r > 0) varlen = 1;
if (r == 1) {
if (IS_NULL(root)) {
top_root = prev_node;
@@ -3624,7 +3471,7 @@ expand_case_fold_string(Node* node, regex_t* reg)
root = NCAR(prev_node);
}
- else { /* r == 0 || r == 2 */
+ else { /* r == 0 */
if (IS_NOT_NULL(root)) {
if (IS_NULL(onig_node_list_add(root, prev_node))) {
onig_node_free(prev_node);
@@ -3667,20 +3514,9 @@ expand_case_fold_string(Node* node, regex_t* reg)
/* ending */
top_root = (IS_NOT_NULL(top_root) ? top_root : prev_node);
- if (!varlen) {
- /* When all expanded strings are same length, case-insensitive
- BM search will be used. */
- r = update_string_node_case_fold(reg, node);
- if (r == 0) {
- NSTRING_SET_AMBIG(node);
- }
- }
- else {
- swap_node(node, top_root);
- r = 0;
- }
+ swap_node(node, top_root);
onig_node_free(top_root);
- return r;
+ return 0;
mem_err:
r = ONIGERR_MEMORY;
@@ -3835,7 +3671,6 @@ setup_comb_exp_check(Node* node, int state, ScanEnv* env)
#define IN_NOT (1<<1)
#define IN_REPEAT (1<<2)
#define IN_VAR_REPEAT (1<<3)
-#define IN_ROOT (1<<4)
/* setup_tree does the following work.
1. check empty loop. (set qn->target_empty_info)
@@ -3850,25 +3685,18 @@ setup_tree(Node* node, regex_t* reg, int state, ScanEnv* env)
{
int type;
int r = 0;
- int in_root = state & IN_ROOT;
- state &= ~IN_ROOT;
-restart:
type = NTYPE(node);
switch (type) {
case NT_LIST:
{
Node* prev = NULL_NODE;
- int prev_in_root = 0;
- state |= in_root;
do {
r = setup_tree(NCAR(node), reg, state, env);
if (IS_NOT_NULL(prev) && r == 0) {
- r = next_setup(prev, NCAR(node), prev_in_root, reg);
+ r = next_setup(prev, NCAR(node), reg);
}
prev = NCAR(node);
- prev_in_root = state & IN_ROOT;
- state &= ~IN_ROOT;
} while (r == 0 && IS_NOT_NULL(node = NCDR(node)));
}
break;
@@ -3963,47 +3791,21 @@ restart:
/* expand string */
#define EXPAND_STRING_MAX_LENGTH 100
if (NTYPE(target) == NT_STR) {
- if (qn->lower > 1) {
- int i, n = qn->lower;
- OnigDistance len = NSTRING_LEN(target);
+ if (!IS_REPEAT_INFINITE(qn->lower) && qn->lower == qn->upper &&
+ qn->lower > 1 && qn->lower <= EXPAND_STRING_MAX_LENGTH) {
+ int len = NSTRING_LEN(target);
StrNode* sn = NSTR(target);
- Node* np;
- np = onig_node_new_str(sn->s, sn->end);
- if (IS_NULL(np)) return ONIGERR_MEMORY;
- NSTR(np)->flag = sn->flag;
-
- for (i = 1; i < n && (i+1) * len <= EXPAND_STRING_MAX_LENGTH; i++) {
- r = onig_node_str_cat(np, sn->s, sn->end);
- if (r) {
- onig_node_free(np);
- return r;
+ if (len * qn->lower <= EXPAND_STRING_MAX_LENGTH) {
+ int i, n = qn->lower;
+ onig_node_conv_to_str_node(node, NSTR(target)->flag);
+ for (i = 0; i < n; i++) {
+ r = onig_node_str_cat(node, sn->s, sn->end);
+ if (r) break;
}
+ onig_node_free(target);
+ break; /* break case NT_QTFR: */
}
- if (i < qn->upper || IS_REPEAT_INFINITE(qn->upper)) {
- Node *np1, *np2;
-
- qn->lower -= i;
- if (! IS_REPEAT_INFINITE(qn->upper))
- qn->upper -= i;
-
- np1 = onig_node_new_list(np, NULL);
- if (IS_NULL(np1)) {
- onig_node_free(np);
- return ONIGERR_MEMORY;
- }
- swap_node(np1, node);
- np2 = onig_node_list_add(node, np1);
- if (IS_NULL(np2)) {
- onig_node_free(np1);
- return ONIGERR_MEMORY;
- }
- }
- else {
- swap_node(np, node);
- onig_node_free(np);
- }
- break; /* break case NT_QTFR: */
}
}
@@ -4032,7 +3834,6 @@ restart:
case ENCLOSE_OPTION:
{
OnigOptionType options = reg->options;
- state |= in_root;
reg->options = NENCLOSE(node)->option;
r = setup_tree(NENCLOSE(node)->target, reg, state, env);
reg->options = options;
@@ -4062,18 +3863,6 @@ restart:
}
}
break;
-
- case ENCLOSE_CONDITION:
-#ifdef USE_NAMED_GROUP
- if (! IS_ENCLOSE_NAME_REF(NENCLOSE(node)) &&
- env->num_named > 0 &&
- IS_SYNTAX_BV(env->syntax, ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP) &&
- !ONIG_IS_OPTION_ON(env->option, ONIG_OPTION_CAPTURE_GROUP)) {
- return ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED;
- }
-#endif
- r = setup_tree(NENCLOSE(node)->target, reg, state, env);
- break;
}
}
break;
@@ -4095,19 +3884,13 @@ restart:
( BIT_NT_LIST | BIT_NT_ALT | BIT_NT_STR | BIT_NT_CCLASS | BIT_NT_CTYPE | \
BIT_NT_CANY | BIT_NT_ANCHOR | BIT_NT_ENCLOSE | BIT_NT_QTFR | BIT_NT_CALL )
-#define ALLOWED_ENCLOSE_IN_LB ( ENCLOSE_MEMORY | ENCLOSE_OPTION )
-#define ALLOWED_ENCLOSE_IN_LB_NOT ENCLOSE_OPTION
+#define ALLOWED_ENCLOSE_IN_LB ( ENCLOSE_MEMORY )
+#define ALLOWED_ENCLOSE_IN_LB_NOT 0
#define ALLOWED_ANCHOR_IN_LB \
-( ANCHOR_LOOK_BEHIND | ANCHOR_LOOK_BEHIND_NOT | ANCHOR_BEGIN_LINE | \
- ANCHOR_END_LINE | ANCHOR_BEGIN_BUF | ANCHOR_BEGIN_POSITION | ANCHOR_KEEP | \
- ANCHOR_WORD_BOUND | ANCHOR_NOT_WORD_BOUND | \
- ANCHOR_WORD_BEGIN | ANCHOR_WORD_END )
+( ANCHOR_LOOK_BEHIND | ANCHOR_BEGIN_LINE | ANCHOR_END_LINE | ANCHOR_BEGIN_BUF | ANCHOR_BEGIN_POSITION )
#define ALLOWED_ANCHOR_IN_LB_NOT \
-( ANCHOR_LOOK_BEHIND | ANCHOR_LOOK_BEHIND_NOT | ANCHOR_BEGIN_LINE | \
- ANCHOR_END_LINE | ANCHOR_BEGIN_BUF | ANCHOR_BEGIN_POSITION | ANCHOR_KEEP | \
- ANCHOR_WORD_BOUND | ANCHOR_NOT_WORD_BOUND | \
- ANCHOR_WORD_BEGIN | ANCHOR_WORD_END )
+( ANCHOR_LOOK_BEHIND | ANCHOR_LOOK_BEHIND_NOT | ANCHOR_BEGIN_LINE | ANCHOR_END_LINE | ANCHOR_BEGIN_BUF | ANCHOR_BEGIN_POSITION )
case ANCHOR_LOOK_BEHIND:
{
@@ -4117,7 +3900,6 @@ restart:
if (r > 0) return ONIGERR_INVALID_LOOK_BEHIND_PATTERN;
r = setup_look_behind(node, reg, env);
if (r != 0) return r;
- if (NTYPE(node) != NT_ANCHOR) goto restart;
r = setup_tree(an->target, reg, state, env);
}
break;
@@ -4130,7 +3912,6 @@ restart:
if (r > 0) return ONIGERR_INVALID_LOOK_BEHIND_PATTERN;
r = setup_look_behind(node, reg, env);
if (r != 0) return r;
- if (NTYPE(node) != NT_ANCHOR) goto restart;
r = setup_tree(an->target, reg, (state | IN_NOT), env);
}
break;
@@ -4145,151 +3926,32 @@ restart:
return r;
}
-#ifndef USE_SUNDAY_QUICK_SEARCH
-/* set skip map for Boyer-Moore search */
+/* set skip map for Boyer-Moor search */
static int
-set_bm_skip(UChar* s, UChar* end, regex_t* reg,
- UChar skip[], int** int_skip, int ignore_case)
+set_bm_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
+ UChar skip[], int** int_skip)
{
- OnigDistance i, len;
- int clen, flen, n, j, k;
- UChar *p, buf[ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM][ONIGENC_MBC_CASE_FOLD_MAXLEN];
- OnigCaseFoldCodeItem items[ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM];
- OnigEncoding enc = reg->enc;
+ int i, len;
len = end - s;
if (len < ONIG_CHAR_TABLE_SIZE) {
- for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = (UChar )len;
-
- n = 0;
- for (i = 0; i < len - 1; i += clen) {
- p = s + i;
- if (ignore_case)
- n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
- p, end, items);
- clen = enclen(enc, p, end);
-
- for (j = 0; j < n; j++) {
- if ((items[j].code_len != 1) || (items[j].byte_len != clen))
- return 1; /* different length isn't supported. */
- flen = ONIGENC_CODE_TO_MBC(enc, items[j].code[0], buf[j]);
- if (flen != clen)
- return 1; /* different length isn't supported. */
- }
- for (j = 0; j < clen; j++) {
- skip[s[i + j]] = (UChar )(len - 1 - i - j);
- for (k = 0; k < n; k++) {
- skip[buf[k][j]] = (UChar )(len - 1 - i - j);
- }
- }
- }
- }
- else {
- if (IS_NULL(*int_skip)) {
- *int_skip = (int* )xmalloc(sizeof(int) * ONIG_CHAR_TABLE_SIZE);
- if (IS_NULL(*int_skip)) return ONIGERR_MEMORY;
- }
- for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) (*int_skip)[i] = (int )len;
-
- n = 0;
- for (i = 0; i < len - 1; i += clen) {
- p = s + i;
- if (ignore_case)
- n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
- p, end, items);
- clen = enclen(enc, p, end);
-
- for (j = 0; j < n; j++) {
- if ((items[j].code_len != 1) || (items[j].byte_len != clen))
- return 1; /* different length isn't supported. */
- flen = ONIGENC_CODE_TO_MBC(enc, items[j].code[0], buf[j]);
- if (flen != clen)
- return 1; /* different length isn't supported. */
- }
- for (j = 0; j < clen; j++) {
- (*int_skip)[s[i + j]] = (int )(len - 1 - i - j);
- for (k = 0; k < n; k++) {
- (*int_skip)[buf[k][j]] = (int )(len - 1 - i - j);
- }
- }
- }
- }
- return 0;
-}
-
-#else /* USE_SUNDAY_QUICK_SEARCH */
-
-/* set skip map for Sunday's quick search */
-static int
-set_bm_skip(UChar* s, UChar* end, regex_t* reg,
- UChar skip[], int** int_skip, int ignore_case)
-{
- OnigDistance i, len;
- int clen, flen, n, j, k;
- UChar *p, buf[ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM][ONIGENC_MBC_CASE_FOLD_MAXLEN];
- OnigCaseFoldCodeItem items[ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM];
- OnigEncoding enc = reg->enc;
+ for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = len;
- len = end - s;
- if (len < ONIG_CHAR_TABLE_SIZE) {
- for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = (UChar )(len + 1);
-
- n = 0;
- for (i = 0; i < len; i += clen) {
- p = s + i;
- if (ignore_case)
- n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
- p, end, items);
- clen = enclen(enc, p, end);
-
- for (j = 0; j < n; j++) {
- if ((items[j].code_len != 1) || (items[j].byte_len != clen))
- return 1; /* different length isn't supported. */
- flen = ONIGENC_CODE_TO_MBC(enc, items[j].code[0], buf[j]);
- if (flen != clen)
- return 1; /* different length isn't supported. */
- }
- for (j = 0; j < clen; j++) {
- skip[s[i + j]] = (UChar )(len - i - j);
- for (k = 0; k < n; k++) {
- skip[buf[k][j]] = (UChar )(len - i - j);
- }
- }
- }
+ for (i = 0; i < len - 1; i++)
+ skip[s[i]] = len - 1 - i;
}
else {
if (IS_NULL(*int_skip)) {
*int_skip = (int* )xmalloc(sizeof(int) * ONIG_CHAR_TABLE_SIZE);
if (IS_NULL(*int_skip)) return ONIGERR_MEMORY;
}
- for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) (*int_skip)[i] = (int )(len + 1);
-
- n = 0;
- for (i = 0; i < len; i += clen) {
- p = s + i;
- if (ignore_case)
- n = ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc, reg->case_fold_flag,
- p, end, items);
- clen = enclen(enc, p, end);
-
- for (j = 0; j < n; j++) {
- if ((items[j].code_len != 1) || (items[j].byte_len != clen))
- return 1; /* different length isn't supported. */
- flen = ONIGENC_CODE_TO_MBC(enc, items[j].code[0], buf[j]);
- if (flen != clen)
- return 1; /* different length isn't supported. */
- }
- for (j = 0; j < clen; j++) {
- (*int_skip)[s[i + j]] = (int )(len - i - j);
- for (k = 0; k < n; k++) {
- (*int_skip)[buf[k][j]] = (int )(len - i - j);
- }
- }
- }
+ for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) (*int_skip)[i] = len;
+
+ for (i = 0; i < len - 1; i++)
+ (*int_skip)[s[i]] = len - 1 - i;
}
return 0;
}
-#endif /* USE_SUNDAY_QUICK_SEARCH */
#define OPT_EXACT_MAXLEN 24
@@ -4316,7 +3978,7 @@ typedef struct {
OptAncInfo anc;
int reach_end;
- int ignore_case; /* -1: unset, 0: case sensitive, 1: ignore case */
+ int ignore_case;
int len;
UChar s[OPT_EXACT_MAXLEN];
} OptExactInfo;
@@ -4382,12 +4044,12 @@ distance_value(MinMaxLen* mm)
11, 11, 11, 11, 11, 10, 10, 10, 10, 10
};
- OnigDistance d;
+ int d;
if (mm->max == ONIG_INFINITE_DISTANCE) return 0;
d = mm->max - mm->min;
- if (d < sizeof(dist_vals)/sizeof(dist_vals[0]))
+ if (d < (int )(sizeof(dist_vals)/sizeof(dist_vals[0])))
/* return dist_vals[d] * 16 / (mm->min + 12); */
return (int )dist_vals[d];
else
@@ -4495,9 +4157,6 @@ concat_opt_anc_info(OptAncInfo* to, OptAncInfo* left, OptAncInfo* right,
if (right_len == 0) {
to->right_anchor |= left->right_anchor;
}
- else {
- to->right_anchor |= (left->right_anchor & ANCHOR_PREC_READ_NOT);
- }
}
static int
@@ -4556,7 +4215,7 @@ clear_opt_exact_info(OptExactInfo* ex)
clear_mml(&ex->mmd);
clear_opt_anc_info(&ex->anc);
ex->reach_end = 0;
- ex->ignore_case = -1; /* unset */
+ ex->ignore_case = 0;
ex->len = 0;
ex->s[0] = '\0';
}
@@ -4574,10 +4233,11 @@ concat_opt_exact_info(OptExactInfo* to, OptExactInfo* add, OnigEncoding enc)
UChar *p, *end;
OptAncInfo tanc;
- if (to->ignore_case < 0)
- to->ignore_case = add->ignore_case;
- else if (to->ignore_case != add->ignore_case)
- return ; /* avoid */
+ if (! to->ignore_case && add->ignore_case) {
+ if (to->len >= add->len) return ; /* avoid */
+
+ to->ignore_case = 1;
+ }
p = add->s;
end = p + add->len;
@@ -4643,10 +4303,7 @@ alt_merge_opt_exact_info(OptExactInfo* to, OptExactInfo* add, OptEnv* env)
to->reach_end = 0;
}
to->len = i;
- if (to->ignore_case < 0)
- to->ignore_case = add->ignore_case;
- else if (add->ignore_case >= 0)
- to->ignore_case |= add->ignore_case;
+ to->ignore_case |= add->ignore_case;
alt_merge_opt_anc_info(&to->anc, &add->anc);
if (! to->reach_end) to->anc.right_anchor = 0;
@@ -4676,8 +4333,8 @@ select_opt_exact_info(OnigEncoding enc, OptExactInfo* now, OptExactInfo* alt)
if (alt->len > 1) v2 += 5;
}
- if (now->ignore_case <= 0) v1 *= 2;
- if (alt->ignore_case <= 0) v2 *= 2;
+ if (now->ignore_case == 0) v1 *= 2;
+ if (alt->ignore_case == 0) v2 *= 2;
if (comp_distance_value(&now->mmd, &alt->mmd, v1, v2) > 0)
copy_opt_exact_info(now, alt);
@@ -4775,7 +4432,7 @@ comp_opt_exact_or_map_info(OptExactInfo* e, OptMapInfo* m)
if (m->value <= 0) return -1;
- ve = COMP_EM_BASE * e->len * (e->ignore_case > 0 ? 1 : 2);
+ ve = COMP_EM_BASE * e->len * (e->ignore_case ? 1 : 2);
vm = COMP_EM_BASE * 5 * 2 / m->value;
return comp_distance_value(&e->mmd, &m->mmd, ve, vm);
}
@@ -4874,7 +4531,7 @@ concat_left_node_opt_info(OnigEncoding enc, NodeOptInfo* to, NodeOptInfo* add)
if (to->expr.len > 0) {
if (add->len.max > 0) {
if (to->expr.len > (int )add->len.max)
- to->expr.len = (int )add->len.max;
+ to->expr.len = add->len.max;
if (to->expr.mmd.max == 0)
select_opt_exact_info(enc, &to->exb, &to->expr);
@@ -4952,20 +4609,19 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
case NT_STR:
{
StrNode* sn = NSTR(node);
- OnigDistance slen = sn->end - sn->s;
+ int slen = sn->end - sn->s;
int is_raw = NSTRING_IS_RAW(node);
if (! NSTRING_IS_AMBIG(node)) {
concat_opt_exact_info_str(&opt->exb, sn->s, sn->end,
- is_raw, env->enc);
- opt->exb.ignore_case = 0;
+ NSTRING_IS_RAW(node), env->enc);
if (slen > 0) {
add_char_opt_map_info(&opt->map, *(sn->s), env->enc);
}
set_mml(&opt->len, slen, slen);
}
else {
- OnigDistance max;
+ int max;
if (NSTRING_IS_DONT_GET_OPT_INFO(node)) {
int n = onigenc_strlen(env->enc, sn->s, sn->end);
@@ -4988,7 +4644,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
set_mml(&opt->len, slen, max);
}
- if ((OnigDistance )opt->exb.len == slen)
+ if (opt->exb.len == slen)
opt->exb.reach_end = 1;
}
break;
@@ -4998,7 +4654,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
int i, z;
CClassNode* cc = NCCLASS(node);
- /* no need to check ignore case. (set in setup_tree()) */
+ /* no need to check ignore case. (setted in setup_tree()) */
if (IS_NOT_NULL(cc->mbuf) || IS_NCCLASS_NOT(cc)) {
OnigDistance min = ONIGENC_MBC_MINLEN(env->enc);
@@ -5021,25 +4677,23 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
case NT_CTYPE:
{
int i, min, max;
- int maxcode;
max = ONIGENC_MBC_MAXLEN_DIST(env->enc);
if (max == 1) {
min = 1;
- maxcode = NCTYPE(node)->ascii_range ? 0x80 : SINGLE_BYTE_SIZE;
switch (NCTYPE(node)->ctype) {
case ONIGENC_CTYPE_WORD:
if (NCTYPE(node)->not != 0) {
for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
- if (! ONIGENC_IS_CODE_WORD(env->enc, i) || i >= maxcode) {
+ if (! ONIGENC_IS_CODE_WORD(env->enc, i)) {
add_char_opt_map_info(&opt->map, (UChar )i, env->enc);
}
}
}
else {
- for (i = 0; i < maxcode; i++) {
+ for (i = 0; i < SINGLE_BYTE_SIZE; i++) {
if (ONIGENC_IS_CODE_WORD(env->enc, i)) {
add_char_opt_map_info(&opt->map, (UChar )i, env->enc);
}
@@ -5071,8 +4725,6 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
case ANCHOR_END_BUF:
case ANCHOR_SEMI_END_BUF:
case ANCHOR_END_LINE:
- case ANCHOR_LOOK_BEHIND: /* just for (?<=x).* */
- case ANCHOR_PREC_READ_NOT: /* just for (?!x).* */
add_opt_anc_info(&opt->anc, NANCHOR(node)->type);
break;
@@ -5095,6 +4747,8 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
}
break;
+ case ANCHOR_PREC_READ_NOT:
+ case ANCHOR_LOOK_BEHIND: /* Sorry, I can't make use of it. */
case ANCHOR_LOOK_BEHIND_NOT:
break;
}
@@ -5152,11 +4806,10 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
r = optimize_node_left(qn->target, &nopt, env);
if (r) break;
- if (/*qn->lower == 0 &&*/ IS_REPEAT_INFINITE(qn->upper)) {
+ if (qn->lower == 0 && IS_REPEAT_INFINITE(qn->upper)) {
if (env->mmd.max == 0 &&
NTYPE(qn->target) == NT_CANY && qn->greedy) {
if (IS_MULTILINE(env->options))
- /* implicit anchor: /.*a/ ==> /\A.*a/ */
add_opt_anc_info(&opt->anc, ANCHOR_ANYCHAR_STAR_ML);
else
add_opt_anc_info(&opt->anc, ANCHOR_ANYCHAR_STAR);
@@ -5236,7 +4889,6 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
break;
case ENCLOSE_STOP_BACKTRACK:
- case ENCLOSE_CONDITION:
r = optimize_node_left(en->target, opt, env);
break;
}
@@ -5245,7 +4897,7 @@ optimize_node_left(Node* node, NodeOptInfo* opt, OptEnv* env)
default:
#ifdef ONIG_DEBUG
- if (!onig_is_prelude()) fprintf(stderr, "optimize_node_left: undefined node type %d\n",
+ fprintf(stderr, "optimize_node_left: undefined node type %d\n",
NTYPE(node));
#endif
r = ONIGERR_TYPE_BUG;
@@ -5259,38 +4911,29 @@ static int
set_optimize_exact_info(regex_t* reg, OptExactInfo* e)
{
int r;
- int allow_reverse;
if (e->len == 0) return 0;
- reg->exact = (UChar* )xmalloc(e->len);
- CHECK_NULL_RETURN_MEMERR(reg->exact);
- xmemcpy(reg->exact, e->s, e->len);
- reg->exact_end = reg->exact + e->len;
+ if (e->ignore_case) {
+ reg->exact = (UChar* )xmalloc(e->len);
+ CHECK_NULL_RETURN_MEMERR(reg->exact);
+ xmemcpy(reg->exact, e->s, e->len);
+ reg->exact_end = reg->exact + e->len;
+ reg->optimize = ONIG_OPTIMIZE_EXACT_IC;
+ }
+ else {
+ int allow_reverse;
+
+ reg->exact = str_dup(e->s, e->s + e->len);
+ CHECK_NULL_RETURN_MEMERR(reg->exact);
+ reg->exact_end = reg->exact + e->len;
- allow_reverse =
+ allow_reverse =
ONIGENC_IS_ALLOWED_REVERSE_MATCH(reg->enc, reg->exact, reg->exact_end);
- if (e->ignore_case > 0) {
if (e->len >= 3 || (e->len >= 2 && allow_reverse)) {
- r = set_bm_skip(reg->exact, reg->exact_end, reg,
- reg->map, &(reg->int_map), 1);
- if (r == 0) {
- reg->optimize = (allow_reverse != 0
- ? ONIG_OPTIMIZE_EXACT_BM_IC : ONIG_OPTIMIZE_EXACT_BM_NOT_REV_IC);
- }
- else {
- reg->optimize = ONIG_OPTIMIZE_EXACT_IC;
- }
- }
- else {
- reg->optimize = ONIG_OPTIMIZE_EXACT_IC;
- }
- }
- else {
- if (e->len >= 3 || (e->len >= 2 && allow_reverse)) {
- r = set_bm_skip(reg->exact, reg->exact_end, reg,
- reg->map, &(reg->int_map), 0);
+ r = set_bm_skip(reg->exact, reg->exact_end, reg->enc,
+ reg->map, &(reg->int_map));
if (r) return r;
reg->optimize = (allow_reverse != 0
@@ -5305,7 +4948,7 @@ set_optimize_exact_info(regex_t* reg, OptExactInfo* e)
reg->dmax = e->mmd.max;
if (reg->dmin != ONIG_INFINITE_DISTANCE) {
- reg->threshold_len = (int )(reg->dmin + (reg->exact_end - reg->exact));
+ reg->threshold_len = reg->dmin + (reg->exact_end - reg->exact);
}
return 0;
@@ -5324,7 +4967,7 @@ set_optimize_map_info(regex_t* reg, OptMapInfo* m)
reg->dmax = m->mmd.max;
if (reg->dmin != ONIG_INFINITE_DISTANCE) {
- reg->threshold_len = (int )(reg->dmin + 1);
+ reg->threshold_len = reg->dmin + 1;
}
}
@@ -5357,11 +5000,9 @@ set_optimize_info_from_tree(Node* node, regex_t* reg, ScanEnv* scan_env)
if (r) return r;
reg->anchor = opt.anc.left_anchor & (ANCHOR_BEGIN_BUF |
- ANCHOR_BEGIN_POSITION | ANCHOR_ANYCHAR_STAR | ANCHOR_ANYCHAR_STAR_ML |
- ANCHOR_LOOK_BEHIND);
+ ANCHOR_BEGIN_POSITION | ANCHOR_ANYCHAR_STAR | ANCHOR_ANYCHAR_STAR_ML);
- reg->anchor |= opt.anc.right_anchor & (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF |
- ANCHOR_PREC_READ_NOT);
+ reg->anchor |= opt.anc.right_anchor & (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF);
if (reg->anchor & (ANCHOR_END_BUF | ANCHOR_SEMI_END_BUF)) {
reg->anchor_dmin = opt.len.min;
@@ -5391,7 +5032,7 @@ set_optimize_info_from_tree(Node* node, regex_t* reg, ScanEnv* scan_env)
}
#if defined(ONIG_DEBUG_COMPILE) || defined(ONIG_DEBUG_MATCH)
- if (!onig_is_prelude()) print_optimize_info(stderr, reg);
+ print_optimize_info(stderr, reg);
#endif
return r;
}
@@ -5443,7 +5084,7 @@ static void print_enc_string(FILE* fp, OnigEncoding enc,
}
}
- fprintf(fp, "/ (%s)\n", enc->name);
+ fprintf(fp, "/\n");
}
static void
@@ -5452,14 +5093,14 @@ print_distance_range(FILE* f, OnigDistance a, OnigDistance b)
if (a == ONIG_INFINITE_DISTANCE)
fputs("inf", f);
else
- fprintf(f, "(%"PRIuSIZE")", a);
+ fprintf(f, "(%u)", a);
fputs("-", f);
if (b == ONIG_INFINITE_DISTANCE)
fputs("inf", f);
else
- fprintf(f, "(%"PRIuSIZE")", b);
+ fprintf(f, "(%u)", b);
}
static void
@@ -5505,7 +5146,7 @@ print_anchor(FILE* f, int anchor)
}
if (anchor & ANCHOR_ANYCHAR_STAR_ML) {
if (q) fprintf(f, ", ");
- fprintf(f, "anychar-star-ml");
+ fprintf(f, "anychar-star-pl");
}
fprintf(f, "]");
@@ -5515,8 +5156,7 @@ static void
print_optimize_info(FILE* f, regex_t* reg)
{
static const char* on[] = { "NONE", "EXACT", "EXACT_BM", "EXACT_BM_NOT_REV",
- "EXACT_IC", "MAP",
- "EXACT_BM_IC", "EXACT_BM_NOT_REV_IC" };
+ "EXACT_IC", "MAP" };
fprintf(f, "optimize: %s\n", on[reg->optimize]);
fprintf(f, " anchor: "); print_anchor(f, reg->anchor);
@@ -5536,7 +5176,7 @@ print_optimize_info(FILE* f, regex_t* reg)
for (p = reg->exact; p < reg->exact_end; p++) {
fputc(*p, f);
}
- fprintf(f, "]: length: %ld\n", (reg->exact_end - reg->exact));
+ fprintf(f, "]: length: %d\n", (reg->exact_end - reg->exact));
}
else if (reg->optimize & ONIG_OPTIMIZE_MAP) {
int c, i, n = 0;
@@ -5593,10 +5233,9 @@ onig_free(regex_t* reg)
}
size_t
-onig_memsize(const regex_t *reg)
+onig_memsize(regex_t *reg)
{
size_t size = sizeof(regex_t);
- if (IS_NULL(reg)) return 0;
if (IS_NOT_NULL(reg->p)) size += reg->alloc;
if (IS_NOT_NULL(reg->exact)) size += reg->exact_end - reg->exact;
if (IS_NOT_NULL(reg->int_map)) size += sizeof(int) * ONIG_CHAR_TABLE_SIZE;
@@ -5607,15 +5246,6 @@ onig_memsize(const regex_t *reg)
return size;
}
-size_t
-onig_region_memsize(const OnigRegion *regs)
-{
- size_t size = sizeof(*regs);
- if (IS_NULL(regs)) return 0;
- size += regs->allocated * (sizeof(*regs->beg) + sizeof(*regs->end));
- return size;
-}
-
#define REGEX_TRANSFER(to,from) do {\
(to)->state = ONIG_STATE_MODIFY;\
onig_free_body(to);\
@@ -5677,8 +5307,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
{
#define COMPILE_INIT_SIZE 20
- int r;
- OnigDistance init_size;
+ int r, init_size;
Node* root;
ScanEnv scan_env = {0};
#ifdef USE_SUBEXP_CALL
@@ -5692,7 +5321,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
reg->state = ONIG_STATE_COMPILING;
#ifdef ONIG_DEBUG
- if (!onig_is_prelude()) print_enc_string(stderr, reg->enc, pattern, pattern_end);
+ print_enc_string(stderr, reg->enc, pattern, pattern_end);
#endif
if (reg->alloc == 0) {
@@ -5716,15 +5345,6 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
r = onig_parse_make_tree(&root, pattern, pattern_end, reg, &scan_env);
if (r != 0) goto err;
-#ifdef ONIG_DEBUG_PARSE_TREE
-# if 0
- fprintf(stderr, "ORIGINAL PARSE TREE:\n");
- if (!onig_is_prelude()) {
- print_tree(stderr, root);
- }
-# endif
-#endif
-
#ifdef USE_NAMED_GROUP
/* mixed use named group and no-named group */
if (scan_env.num_named > 0 &&
@@ -5757,11 +5377,11 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
reg->num_call = 0;
#endif
- r = setup_tree(root, reg, IN_ROOT, &scan_env);
+ r = setup_tree(root, reg, 0, &scan_env);
if (r != 0) goto err_unset;
#ifdef ONIG_DEBUG_PARSE_TREE
- if (!onig_is_prelude()) print_tree(stderr, root);
+ print_tree(stderr, root);
#endif
reg->capture_history = scan_env.capture_history;
@@ -5841,9 +5461,9 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
#ifdef ONIG_DEBUG_COMPILE
#ifdef USE_NAMED_GROUP
- if (!onig_is_prelude()) onig_print_names(stderr, reg);
+ onig_print_names(stderr, reg);
#endif
- if (!onig_is_prelude()) print_compiled_byte_code_list(stderr, reg);
+ print_compiled_byte_code_list(stderr, reg);
#endif
end:
@@ -5906,7 +5526,7 @@ onig_reg_init(regex_t* reg, OnigOptionType option,
return ONIGERR_INVALID_ARGUMENT;
if (ONIGENC_IS_UNDEF(enc))
- return ONIGERR_DEFAULT_ENCODING_IS_NOT_SET;
+ return ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED;
if ((option & (ONIG_OPTION_DONT_CAPTURE_GROUP|ONIG_OPTION_CAPTURE_GROUP))
== (ONIG_OPTION_DONT_CAPTURE_GROUP|ONIG_OPTION_CAPTURE_GROUP)) {
@@ -6006,7 +5626,7 @@ onig_end(void)
THREAD_ATOMIC_START;
#ifdef ONIG_DEBUG_STATISTICS
- if (!onig_is_prelude()) onig_print_statistics(stderr);
+ onig_print_statistics(stderr);
#endif
#ifdef USE_SHARED_CCLASS_TABLE
@@ -6131,26 +5751,19 @@ OnigOpInfoType OnigOpInfo[] = {
{ OP_NOT_WORD_BOUND, "not-word-bound", ARG_NON },
{ OP_WORD_BEGIN, "word-begin", ARG_NON },
{ OP_WORD_END, "word-end", ARG_NON },
- { OP_ASCII_WORD, "ascii-word", ARG_NON },
- { OP_NOT_ASCII_WORD, "not-ascii-word", ARG_NON },
- { OP_ASCII_WORD_BOUND, "ascii-word-bound", ARG_NON },
- { OP_NOT_ASCII_WORD_BOUND,"not-ascii-word-bound", ARG_NON },
- { OP_ASCII_WORD_BEGIN, "ascii-word-begin", ARG_NON },
- { OP_ASCII_WORD_END, "ascii-word-end", ARG_NON },
{ OP_BEGIN_BUF, "begin-buf", ARG_NON },
{ OP_END_BUF, "end-buf", ARG_NON },
{ OP_BEGIN_LINE, "begin-line", ARG_NON },
{ OP_END_LINE, "end-line", ARG_NON },
{ OP_SEMI_END_BUF, "semi-end-buf", ARG_NON },
{ OP_BEGIN_POSITION, "begin-position", ARG_NON },
- { OP_BEGIN_POS_OR_LINE, "begin-pos-or-line", ARG_NON },
{ OP_BACKREF1, "backref1", ARG_NON },
{ OP_BACKREF2, "backref2", ARG_NON },
{ OP_BACKREFN, "backrefn", ARG_MEMNUM },
{ OP_BACKREFN_IC, "backrefn-ic", ARG_SPECIAL },
{ OP_BACKREF_MULTI, "backref_multi", ARG_SPECIAL },
{ OP_BACKREF_MULTI_IC, "backref_multi-ic", ARG_SPECIAL },
- { OP_BACKREF_WITH_LEVEL, "backref_at_level", ARG_SPECIAL },
+ { OP_BACKREF_WITH_LEVEL, "backref_at_level", ARG_SPECIAL },
{ OP_MEMORY_START_PUSH, "mem-start-push", ARG_MEMNUM },
{ OP_MEMORY_START, "mem-start", ARG_MEMNUM },
{ OP_MEMORY_END_PUSH, "mem-end-push", ARG_MEMNUM },
@@ -6159,7 +5772,6 @@ OnigOpInfoType OnigOpInfo[] = {
{ OP_MEMORY_END_REC, "mem-end-rec", ARG_MEMNUM },
{ OP_SET_OPTION_PUSH, "set-option-push", ARG_OPTION },
{ OP_SET_OPTION, "set-option", ARG_OPTION },
- { OP_KEEP, "keep", ARG_NON },
{ OP_FAIL, "fail", ARG_NON },
{ OP_JUMP, "jump", ARG_RELADDR },
{ OP_PUSH, "push", ARG_RELADDR },
@@ -6187,7 +5799,6 @@ OnigOpInfoType OnigOpInfo[] = {
{ OP_FAIL_LOOK_BEHIND_NOT, "fail-look-behind-not", ARG_NON },
{ OP_CALL, "call", ARG_ABSADDR },
{ OP_RETURN, "return", ARG_NON },
- { OP_CONDITION, "condition", ARG_SPECIAL },
{ OP_STATE_CHECK_PUSH, "state-check-push", ARG_SPECIAL },
{ OP_STATE_CHECK_PUSH_OR_JUMP, "state-check-push-or-jump", ARG_SPECIAL },
{ OP_STATE_CHECK, "state-check", ARG_STATE_CHECK },
@@ -6197,7 +5808,7 @@ OnigOpInfoType OnigOpInfo[] = {
{ -1, "", ARG_NON }
};
-static const char*
+static char*
op2name(int opcode)
{
int i;
@@ -6398,7 +6009,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
GET_POINTER_INC(cc, bp);
n = bitset_on_num(cc->bs);
- fprintf(f, ":%"PRIuPTR":%d", (uintptr_t)cc, n);
+ fprintf(f, ":%u:%d", (unsigned int )cc, n);
}
break;
@@ -6479,12 +6090,6 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
fprintf(f, ":%d:(%d)", scn, addr);
break;
- case OP_CONDITION:
- GET_MEMNUM_INC(mem, bp);
- GET_RELADDR_INC(addr, bp);
- fprintf(f, ":%d:(%d)", mem, addr);
- break;
-
default:
fprintf(stderr, "onig_print_compiled_byte_code: undefined code %d\n",
*--bp);
@@ -6501,15 +6106,17 @@ print_compiled_byte_code_list(FILE* f, regex_t* reg)
UChar* bp = reg->p;
UChar* end = reg->p + reg->used;
- fprintf(f, "code length: %d", reg->used);
+ fprintf(f, "code length: %d\n", reg->used);
- ncode = -1;
+ ncode = 0;
while (bp < end) {
ncode++;
- if (ncode % 5 == 0)
- fprintf(f, "\n%ld:", bp - reg->p);
- else
- fprintf(f, " %ld:", bp - reg->p);
+ if (bp > reg->p) {
+ if (ncode % 5 == 0)
+ fprintf(f, "\n");
+ else
+ fputs(" ", f);
+ }
onig_print_compiled_byte_code(f, bp, end, &bp, reg->enc);
}
@@ -6519,7 +6126,7 @@ print_compiled_byte_code_list(FILE* f, regex_t* reg)
static void
print_indent_tree(FILE* f, Node* node, int indent)
{
- int i, type, container_p = 0;
+ int i, type;
int add = 3;
UChar* p;
@@ -6534,9 +6141,9 @@ print_indent_tree(FILE* f, Node* node, int indent)
case NT_LIST:
case NT_ALT:
if (NTYPE(node) == NT_LIST)
- fprintf(f, "<list:%"PRIxPTR">\n", (intptr_t)node);
+ fprintf(f, "<list:%x>\n", (int )node);
else
- fprintf(f, "<alt:%"PRIxPTR">\n", (intptr_t)node);
+ fprintf(f, "<alt:%x>\n", (int )node);
print_indent_tree(f, NCAR(node), indent + add);
while (IS_NOT_NULL(node = NCDR(node))) {
@@ -6549,8 +6156,8 @@ print_indent_tree(FILE* f, Node* node, int indent)
break;
case NT_STR:
- fprintf(f, "<string%s:%"PRIxPTR">",
- (NSTRING_IS_RAW(node) ? "-raw" : ""), (intptr_t)node);
+ fprintf(f, "<string%s:%x>",
+ (NSTRING_IS_RAW(node) ? "-raw" : ""), (int )node);
for (p = NSTR(node)->s; p < NSTR(node)->end; p++) {
if (*p >= 0x20 && *p < 0x7f)
fputc(*p, f);
@@ -6561,11 +6168,11 @@ print_indent_tree(FILE* f, Node* node, int indent)
break;
case NT_CCLASS:
- fprintf(f, "<cclass:%"PRIxPTR">", (intptr_t)node);
+ fprintf(f, "<cclass:%x>", (int )node);
if (IS_NCCLASS_NOT(NCCLASS(node))) fputs(" not", f);
if (NCCLASS(node)->mbuf) {
BBuf* bbuf = NCCLASS(node)->mbuf;
- for (i = 0; i < (int )bbuf->used; i++) {
+ for (i = 0; i < bbuf->used; i++) {
if (i > 0) fprintf(f, ",");
fprintf(f, "%0x", bbuf->p[i]);
}
@@ -6573,7 +6180,7 @@ print_indent_tree(FILE* f, Node* node, int indent)
break;
case NT_CTYPE:
- fprintf(f, "<ctype:%"PRIxPTR"> ", (intptr_t)node);
+ fprintf(f, "<ctype:%x> ", (int )node);
switch (NCTYPE(node)->ctype) {
case ONIGENC_CTYPE_WORD:
if (NCTYPE(node)->not != 0)
@@ -6589,11 +6196,11 @@ print_indent_tree(FILE* f, Node* node, int indent)
break;
case NT_CANY:
- fprintf(f, "<anychar:%"PRIxPTR">", (intptr_t)node);
+ fprintf(f, "<anychar:%x>", (int )node);
break;
case NT_ANCHOR:
- fprintf(f, "<anchor:%"PRIxPTR"> ", (intptr_t)node);
+ fprintf(f, "<anchor:%x> ", (int )node);
switch (NANCHOR(node)->type) {
case ANCHOR_BEGIN_BUF: fputs("begin buf", f); break;
case ANCHOR_END_BUF: fputs("end buf", f); break;
@@ -6601,7 +6208,6 @@ print_indent_tree(FILE* f, Node* node, int indent)
case ANCHOR_END_LINE: fputs("end line", f); break;
case ANCHOR_SEMI_END_BUF: fputs("semi end buf", f); break;
case ANCHOR_BEGIN_POSITION: fputs("begin position", f); break;
- case ANCHOR_ANYCHAR_STAR: fputs("begin position/line", f); break;
case ANCHOR_WORD_BOUND: fputs("word bound", f); break;
case ANCHOR_NOT_WORD_BOUND: fputs("not word bound", f); break;
@@ -6609,11 +6215,10 @@ print_indent_tree(FILE* f, Node* node, int indent)
case ANCHOR_WORD_BEGIN: fputs("word begin", f); break;
case ANCHOR_WORD_END: fputs("word end", f); break;
#endif
- case ANCHOR_PREC_READ: fputs("prec read", f); container_p = TRUE; break;
- case ANCHOR_PREC_READ_NOT: fputs("prec read not", f); container_p = TRUE; break;
- case ANCHOR_LOOK_BEHIND: fputs("look_behind", f); container_p = TRUE; break;
- case ANCHOR_LOOK_BEHIND_NOT: fputs("look_behind_not",f); container_p = TRUE; break;
- case ANCHOR_KEEP: fputs("keep",f); break;
+ case ANCHOR_PREC_READ: fputs("prec read", f); break;
+ case ANCHOR_PREC_READ_NOT: fputs("prec read not", f); break;
+ case ANCHOR_LOOK_BEHIND: fputs("look_behind", f); break;
+ case ANCHOR_LOOK_BEHIND_NOT: fputs("look_behind_not",f); break;
default:
fprintf(f, "ERROR: undefined anchor type.\n");
@@ -6626,7 +6231,7 @@ print_indent_tree(FILE* f, Node* node, int indent)
int* p;
BRefNode* br = NBREF(node);
p = BACKREFS_P(br);
- fprintf(f, "<backref:%"PRIxPTR">", (intptr_t)node);
+ fprintf(f, "<backref:%x>", (int )node);
for (i = 0; i < br->back_num; i++) {
if (i > 0) fputs(", ", f);
fprintf(f, "%d", p[i]);
@@ -6638,24 +6243,25 @@ print_indent_tree(FILE* f, Node* node, int indent)
case NT_CALL:
{
CallNode* cn = NCALL(node);
- fprintf(f, "<call:%"PRIxPTR">", (intptr_t)node);
+ fprintf(f, "<call:%x>", (int )node);
p_string(f, cn->name_end - cn->name, cn->name);
}
break;
#endif
case NT_QTFR:
- fprintf(f, "<quantifier:%"PRIxPTR">{%d,%d}%s\n", (intptr_t)node,
+ fprintf(f, "<quantifier:%x>{%d,%d}%s\n", (int )node,
NQTFR(node)->lower, NQTFR(node)->upper,
(NQTFR(node)->greedy ? "" : "?"));
print_indent_tree(f, NQTFR(node)->target, indent + add);
break;
case NT_ENCLOSE:
- fprintf(f, "<enclose:%"PRIxPTR"> ", (intptr_t)node);
+ fprintf(f, "<enclose:%x> ", (int )node);
switch (NENCLOSE(node)->type) {
case ENCLOSE_OPTION:
- fprintf(f, "option:%d", NENCLOSE(node)->option);
+ fprintf(f, "option:%d\n", NENCLOSE(node)->option);
+ print_indent_tree(f, NENCLOSE(node)->target, indent + add);
break;
case ENCLOSE_MEMORY:
fprintf(f, "memory:%d", NENCLOSE(node)->regnum);
@@ -6663,9 +6269,6 @@ print_indent_tree(FILE* f, Node* node, int indent)
case ENCLOSE_STOP_BACKTRACK:
fprintf(f, "stop-bt");
break;
- case ENCLOSE_CONDITION:
- fprintf(f, "condition:%d", NENCLOSE(node)->regnum);
- break;
default:
break;
@@ -6682,9 +6285,6 @@ print_indent_tree(FILE* f, Node* node, int indent)
if (type != NT_LIST && type != NT_ALT && type != NT_QTFR &&
type != NT_ENCLOSE)
fprintf(f, "\n");
-
- if (container_p) print_indent_tree(f, NANCHOR(node)->target, indent + add);
-
fflush(f);
}
#endif /* ONIG_DEBUG */
diff --git a/regenc.c b/regenc.c
index 288eac433d..b9b03b03bf 100644
--- a/regenc.c
+++ b/regenc.c
@@ -1,9 +1,8 @@
/**********************************************************************
- regenc.c - Onigmo (Oniguruma-mod) (regular expression library)
+ regenc.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +66,7 @@ onigenc_get_right_adjust_char_head(OnigEncoding enc, const UChar* start, const U
{
UChar* p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc, start, s, end);
if (p < s) {
- p += enclen(enc, p, end);
+ p += enclen(enc, p, end);
}
return p;
}
@@ -733,9 +732,8 @@ onigenc_mbn_is_mbc_ambiguous(OnigEncoding enc, OnigCaseFoldType flag,
extern int
onigenc_mb2_code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
{
- if (code <= 0xff) return 1;
- if (code <= 0xffff) return 2;
- return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
+ if ((code & 0xff00) != 0) return 2;
+ else return 1;
}
extern int
@@ -761,7 +759,7 @@ onigenc_mb2_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
if (enclen(enc, buf, p) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif
- return (int )(p - buf);
+ return (int)(p - buf);
}
extern int
@@ -784,7 +782,7 @@ onigenc_mb4_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
if (enclen(enc, buf, p) != (p - buf))
return ONIGERR_INVALID_CODE_POINT_VALUE;
#endif
- return (int )(p - buf);
+ return (int)(p - buf);
}
extern int
@@ -813,7 +811,7 @@ onigenc_minimum_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
len = onigenc_strlen(enc, p, end);
for (pbe = (pb = PBS) + sizeof(PBS)/sizeof(PBS[0]); pb < pbe; ++pb) {
if (len == pb->len &&
- onigenc_with_ascii_strnicmp(enc, p, end, pb->name, pb->len) == 0)
+ onigenc_with_ascii_strncmp(enc, p, end, pb->name, pb->len) == 0)
return pb->ctype;
}
@@ -869,27 +867,6 @@ onigenc_with_ascii_strncmp(OnigEncoding enc, const UChar* p, const UChar* end,
return 0;
}
-extern int
-onigenc_with_ascii_strnicmp(OnigEncoding enc, const UChar* p, const UChar* end,
- const UChar* sascii /* ascii */, int n)
-{
- int x, c;
-
- while (n-- > 0) {
- if (p >= end) return (int )(*sascii);
-
- c = (int )ONIGENC_MBC_TO_CODE(enc, p, end);
- if (ONIGENC_IS_ASCII_CODE(c))
- c = ONIGENC_ASCII_CODE_TO_LOWER_CASE(c);
- x = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*sascii) - c;
- if (x) return x;
-
- sascii++;
- p += enclen(enc, p, end);
- }
- return 0;
-}
-
/* Property management */
static int
resize_property_list(int new_size, const OnigCodePoint*** plist, int* psize)
diff --git a/regenc.h b/regenc.h
index 3ad3faea3e..9974165258 100644
--- a/regenc.h
+++ b/regenc.h
@@ -1,11 +1,10 @@
#ifndef ONIGURUMA_REGENC_H
#define ONIGURUMA_REGENC_H
/**********************************************************************
- regenc.h - Onigmo (Oniguruma-mod) (regular expression library)
+ regenc.h - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -40,10 +39,6 @@
#endif
#include "ruby/oniguruma.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
typedef struct {
OnigCodePoint from;
OnigCodePoint to;
@@ -108,10 +103,10 @@ typedef struct {
#define PosixBracketEntryInit(name, ctype) {(const UChar *)name, ctype, (short int)(sizeof(name) - 1)}
-#define USE_CRNL_AS_LINE_TERMINATOR
+/* #define USE_CRNL_AS_LINE_TERMINATOR */
#define USE_UNICODE_PROPERTIES
/* #define USE_UNICODE_CASE_FOLD_TURKISH_AZERI */
-/* #define USE_UNICODE_ALL_LINE_TERMINATORS */ /* see Unicode.org UTS #18 */
+/* #define USE_UNICODE_ALL_LINE_TERMINATORS */ /* see Unicode.org UTF#18 */
#define ONIG_ENCODING_INIT_DEFAULT ONIG_ENCODING_ASCII
@@ -171,8 +166,6 @@ ONIG_EXTERN const UChar OnigEncISO_8859_1_ToUpperCaseTable[];
ONIG_EXTERN int
onigenc_with_ascii_strncmp P_((OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n));
-ONIG_EXTERN int
-onigenc_with_ascii_strnicmp P_((OnigEncoding enc, const UChar* p, const UChar* end, const UChar* sascii /* ascii */, int n));
ONIG_EXTERN UChar*
onigenc_step P_((OnigEncoding enc, const UChar* p, const UChar* end, int n));
@@ -193,11 +186,6 @@ ONIG_EXTERN const unsigned short OnigEncAsciiCtypeTable[];
(ONIGENC_IS_ASCII_CODE_CTYPE(code, ONIGENC_CTYPE_UPPER) ||\
ONIGENC_IS_ASCII_CODE_CTYPE(code, ONIGENC_CTYPE_LOWER))
-/* Check if the code is in the range. (from <= code && code <= to) */
-#define ONIGENC_IS_IN_RANGE(code, from, to) \
- ((OnigCodePoint )((code) - (from)) <= (OnigCodePoint )((to) - (from)))
-
-
#ifdef ONIG_ENC_REGISTER
extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*);
#define OnigEncodingName(n) encoding_##n
@@ -220,8 +208,4 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*);
#define ENC_ALIAS(name, orig)
#define ENC_DUMMY(name)
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#endif /* ONIGURUMA_REGENC_H */
diff --git a/regerror.c b/regerror.c
index d32b50d12b..3c8b7371c2 100644
--- a/regerror.c
+++ b/regerror.c
@@ -1,9 +1,8 @@
/**********************************************************************
- regerror.c - Onigmo (Oniguruma-mod) (regular expression library)
+ regerror.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -40,7 +39,7 @@
#endif
extern UChar*
-onig_error_code_to_format(OnigPosition code)
+onig_error_code_to_format(int code)
{
const char *p;
@@ -65,8 +64,8 @@ onig_error_code_to_format(OnigPosition code)
p = "undefined bytecode (bug)"; break;
case ONIGERR_UNEXPECTED_BYTECODE:
p = "unexpected bytecode (bug)"; break;
- case ONIGERR_DEFAULT_ENCODING_IS_NOT_SET:
- p = "default multibyte-encoding is not set"; break;
+ case ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED:
+ p = "default multibyte-encoding is not setted"; break;
case ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR:
p = "can't convert to wide-char on specified multibyte-encoding"; break;
case ONIGERR_INVALID_ARGUMENT:
@@ -115,8 +114,6 @@ onig_error_code_to_format(OnigPosition code)
p = "invalid pattern in look-behind"; break;
case ONIGERR_INVALID_REPEAT_RANGE_PATTERN:
p = "invalid repeat range {lower,upper}"; break;
- case ONIGERR_INVALID_CONDITION_PATTERN:
- p = "invalid conditional pattern"; break;
case ONIGERR_TOO_BIG_NUMBER:
p = "too big number"; break;
case ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE:
@@ -133,8 +130,6 @@ onig_error_code_to_format(OnigPosition code)
p = "too short multibyte code string"; break;
case ONIGERR_TOO_BIG_BACKREF_NUMBER:
p = "too big backref number"; break;
- case ONIGERR_TOO_MANY_CAPTURE_GROUPS:
- p = "too many capture groups are specified"; break;
case ONIGERR_INVALID_BACKREF:
#ifdef USE_NAMED_GROUP
p = "invalid backref number/name"; break;
@@ -145,8 +140,6 @@ onig_error_code_to_format(OnigPosition code)
p = "numbered backref/call is not allowed. (use name)"; break;
case ONIGERR_TOO_BIG_WIDE_CHAR_VALUE:
p = "too big wide-char value"; break;
- case ONIGERR_TOO_SHORT_DIGITS:
- p = "too short digits"; break;
case ONIGERR_TOO_LONG_WIDE_CHAR_VALUE:
p = "too long wide-char value"; break;
case ONIGERR_INVALID_CODE_POINT_VALUE:
@@ -239,7 +232,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
*is_over = ((p < end) ? 1 : 0);
}
else {
- len = (int )MIN((end - s), buf_size);
+ len = (int)MIN((end - s), buf_size);
xmemcpy(buf, s, (size_t )len);
*is_over = ((buf_size < (end - s)) ? 1 : 0);
}
@@ -253,11 +246,11 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
extern int
#ifdef HAVE_STDARG_PROTOTYPES
-onig_error_code_to_str(UChar* s, OnigPosition code, ...)
+onig_error_code_to_str(UChar* s, int code, ...)
#else
onig_error_code_to_str(s, code, va_alist)
UChar* s;
- OnigPosition code;
+ int code;
va_dcl
#endif
{
@@ -316,7 +309,7 @@ onig_error_code_to_str(s, code, va_alist)
}
va_end(vargs);
- return (int )len;
+ return (int)len;
}
void
@@ -332,7 +325,7 @@ onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
need = (pat_end - pat) * 4 + 4;
- if (n + need < (size_t )bufsize) {
+ if (n + need < (size_t)bufsize) {
strcat((char* )buf, ": /");
s = buf + onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, buf);
diff --git a/regexec.c b/regexec.c
index eb6f6c2d42..c78d8ea998 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1,9 +1,8 @@
/**********************************************************************
- regexec.c - Onigmo (Oniguruma-mod) (regular expression library)
+ regexec.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2013 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,44 +34,8 @@
#ifdef USE_CRNL_AS_LINE_TERMINATOR
#define ONIGENC_IS_MBC_CRNL(enc,p,end) \
(ONIGENC_MBC_TO_CODE(enc,p,end) == 13 && \
- ONIGENC_MBC_TO_CODE(enc,(p+enclen(enc,p,end)),end) == 10)
-#define ONIGENC_IS_MBC_NEWLINE_EX(enc,p,start,end,option,check_prev) \
- is_mbc_newline_ex((enc),(p),(start),(end),(option),(check_prev))
-static int
-is_mbc_newline_ex(OnigEncoding enc, const UChar *p, const UChar *start,
- const UChar *end, OnigOptionType option, int check_prev)
-{
- if (IS_NEWLINE_CRLF(option)) {
- if (ONIGENC_MBC_TO_CODE(enc, p, end) == 0x0a) {
- if (check_prev) {
- const UChar *prev = onigenc_get_prev_char_head(enc, start, p, end);
- if ((prev != NULL) && ONIGENC_MBC_TO_CODE(enc, prev, end) == 0x0d)
- return 0;
- else
- return 1;
- }
- else
- return 1;
- }
- else {
- const UChar *pnext = p + enclen(enc, p, end);
- if (pnext < end &&
- ONIGENC_MBC_TO_CODE(enc, p, end) == 0x0d &&
- ONIGENC_MBC_TO_CODE(enc, pnext, end) == 0x0a)
- return 1;
- if (ONIGENC_IS_MBC_NEWLINE(enc, p, end))
- return 1;
- return 0;
- }
- }
- else {
- return ONIGENC_IS_MBC_NEWLINE(enc, p, end);
- }
-}
-#else /* USE_CRNL_AS_LINE_TERMINATOR */
-#define ONIGENC_IS_MBC_NEWLINE_EX(enc,p,start,end,option,check_prev) \
- ONIGENC_IS_MBC_NEWLINE((enc), (p), (end))
-#endif /* USE_CRNL_AS_LINE_TERMINATOR */
+ ONIGENC_IS_MBC_NEWLINE(enc,(p+enclen(enc,p)),end))
+#endif
#ifdef USE_CAPTURE_HISTORY
static void history_tree_free(OnigCaptureTreeNode* node);
@@ -95,8 +58,6 @@ history_tree_clear(OnigCaptureTreeNode* node)
node->beg = ONIG_REGION_NOTPOS;
node->end = ONIG_REGION_NOTPOS;
node->group = -1;
- xfree(node->childs);
- node->childs = (OnigCaptureTreeNode** )0;
}
}
@@ -145,20 +106,14 @@ history_tree_add_child(OnigCaptureTreeNode* parent, OnigCaptureTreeNode* child)
n = HISTORY_TREE_INIT_ALLOC_SIZE;
parent->childs =
(OnigCaptureTreeNode** )xmalloc(sizeof(OnigCaptureTreeNode*) * n);
- CHECK_NULL_RETURN_MEMERR(parent->childs);
}
else {
- OnigCaptureTreeNode** tmp;
n = parent->allocated * 2;
- tmp =
+ parent->childs =
(OnigCaptureTreeNode** )xrealloc(parent->childs,
sizeof(OnigCaptureTreeNode*) * n);
- if (tmp == 0) {
- history_tree_clear(parent);
- return ONIGERR_MEMORY;
- }
- parent->childs = tmp;
}
+ CHECK_NULL_RETURN_MEMERR(parent->childs);
for (i = parent->allocated; i < n; i++) {
parent->childs[i] = (OnigCaptureTreeNode* )0;
}
@@ -173,7 +128,7 @@ history_tree_add_child(OnigCaptureTreeNode* parent, OnigCaptureTreeNode* child)
static OnigCaptureTreeNode*
history_tree_clone(OnigCaptureTreeNode* node)
{
- int i, r;
+ int i;
OnigCaptureTreeNode *clone, *child;
clone = history_node_new();
@@ -187,12 +142,7 @@ history_tree_clone(OnigCaptureTreeNode* node)
history_tree_free(clone);
return (OnigCaptureTreeNode* )0;
}
- r = history_tree_add_child(clone, child);
- if (r != 0) {
- history_tree_free(child);
- history_tree_free(clone);
- return (OnigCaptureTreeNode* )0;
- }
+ history_tree_add_child(clone, child);
}
return clone;
@@ -227,11 +177,11 @@ onig_region_resize(OnigRegion* region, int n)
n = ONIG_NREGION;
if (region->allocated == 0) {
- region->beg = (OnigPosition* )xmalloc(n * sizeof(OnigPosition));
+ region->beg = (int* )xmalloc(n * sizeof(int));
if (region->beg == 0)
return ONIGERR_MEMORY;
- region->end = (OnigPosition* )xmalloc(n * sizeof(OnigPosition));
+ region->end = (int* )xmalloc(n * sizeof(int));
if (region->end == 0) {
xfree(region->beg);
return ONIGERR_MEMORY;
@@ -240,24 +190,26 @@ onig_region_resize(OnigRegion* region, int n)
region->allocated = n;
}
else if (region->allocated < n) {
- OnigPosition *tmp;
+ int *tmp;
region->allocated = 0;
- tmp = (OnigPosition* )xrealloc(region->beg, n * sizeof(OnigPosition));
+ tmp = (int* )xrealloc(region->beg, n * sizeof(int));
if (tmp == 0) {
xfree(region->beg);
xfree(region->end);
return ONIGERR_MEMORY;
}
region->beg = tmp;
- tmp = (OnigPosition* )xrealloc(region->end, n * sizeof(OnigPosition));
+ tmp = (int* )xrealloc(region->end, n * sizeof(int));
if (tmp == 0) {
xfree(region->beg);
- xfree(region->end);
return ONIGERR_MEMORY;
}
region->end = tmp;
+ if (region->beg == 0 || region->end == 0)
+ return ONIGERR_MEMORY;
+
region->allocated = n;
}
@@ -295,8 +247,8 @@ onig_region_init(OnigRegion* region)
{
region->num_regs = 0;
region->allocated = 0;
- region->beg = (OnigPosition* )0;
- region->end = (OnigPosition* )0;
+ region->beg = (int* )0;
+ region->end = (int* )0;
region->history_root = (OnigCaptureTreeNode* )0;
}
@@ -331,13 +283,11 @@ extern void
onig_region_copy(OnigRegion* to, OnigRegion* from)
{
#define RREGC_SIZE (sizeof(int) * from->num_regs)
- int i, r;
+ int i;
if (to == from) return;
- r = onig_region_resize(to, from->num_regs);
- if (r) return;
-
+ onig_region_resize(to, from->num_regs);
for (i = 0; i < from->num_regs; i++) {
to->beg[i] = from->beg[i];
to->end[i] = from->end[i];
@@ -384,21 +334,19 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
#define STK_MASK_MEM_END_OR_MARK 0x8000 /* MEM_END or MEM_END_MARK */
#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
-#define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start, arg_gpos) do {\
+#define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start) do {\
(msa).stack_p = (void* )0;\
(msa).options = (arg_option);\
(msa).region = (arg_region);\
(msa).start = (arg_start);\
- (msa).gpos = (arg_gpos);\
(msa).best_len = ONIG_MISMATCH;\
} while(0)
#else
-#define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start, arg_gpos) do {\
+#define MATCH_ARG_INIT(msa, arg_option, arg_region, arg_start) do {\
(msa).stack_p = (void* )0;\
(msa).options = (arg_option);\
(msa).region = (arg_region);\
(msa).start = (arg_start);\
- (msa).gpos = (arg_gpos);\
} while(0)
#endif
@@ -438,24 +386,24 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
if ((msa).state_check_buff) xfree((msa).state_check_buff);\
}\
} while(0)
-#else /* USE_COMBINATION_EXPLOSION_CHECK */
+#else
#define MATCH_ARG_FREE(msa) if ((msa).stack_p) xfree((msa).stack_p)
-#endif /* USE_COMBINATION_EXPLOSION_CHECK */
+#endif
#define STACK_INIT(alloc_addr, ptr_num, stack_num) do {\
if (msa->stack_p) {\
- alloc_addr = (char* )xalloca(sizeof(OnigStackIndex) * (ptr_num));\
+ alloc_addr = (char* )xalloca(sizeof(char*) * (ptr_num));\
stk_alloc = (OnigStackType* )(msa->stack_p);\
stk_base = stk_alloc;\
stk = stk_base;\
stk_end = stk_base + msa->stack_n;\
}\
else {\
- alloc_addr = (char* )xalloca(sizeof(OnigStackIndex) * (ptr_num)\
+ alloc_addr = (char* )xalloca(sizeof(char*) * (ptr_num)\
+ sizeof(OnigStackType) * (stack_num));\
- stk_alloc = (OnigStackType* )(alloc_addr + sizeof(OnigStackIndex) * (ptr_num));\
+ stk_alloc = (OnigStackType* )(alloc_addr + sizeof(char*) * (ptr_num));\
stk_base = stk_alloc;\
stk = stk_base;\
stk_end = stk_base + (stack_num);\
@@ -562,14 +510,13 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
state_check_buff[x/8] |= (1<<(x%8)); \
}
-#define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
+#define STACK_PUSH(stack_type,pat,s,sprev) do {\
STACK_ENSURE(1);\
stk->type = (stack_type);\
stk->u.state.pcode = (pat);\
stk->u.state.pstr = (s);\
stk->u.state.pstr_prev = (sprev);\
stk->u.state.state_check = 0;\
- stk->u.state.pkeep = (keep);\
STACK_INC;\
} while(0)
@@ -580,14 +527,13 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
STACK_INC;\
} while(0)
-#define STACK_PUSH_ALT_WITH_STATE_CHECK(pat,s,sprev,snum,keep) do {\
+#define STACK_PUSH_ALT_WITH_STATE_CHECK(pat,s,sprev,snum) do {\
STACK_ENSURE(1);\
stk->type = STK_ALT;\
stk->u.state.pcode = (pat);\
stk->u.state.pstr = (s);\
stk->u.state.pstr_prev = (sprev);\
stk->u.state.state_check = ((state_check_buff != NULL) ? (snum) : 0);\
- stk->u.state.pkeep = (keep);\
STACK_INC;\
} while(0)
@@ -605,13 +551,12 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
#define ELSE_IF_STATE_CHECK_MARK(stk)
-#define STACK_PUSH(stack_type,pat,s,sprev,keep) do {\
+#define STACK_PUSH(stack_type,pat,s,sprev) do {\
STACK_ENSURE(1);\
stk->type = (stack_type);\
stk->u.state.pcode = (pat);\
stk->u.state.pstr = (s);\
stk->u.state.pstr_prev = (sprev);\
- stk->u.state.pkeep = (keep);\
STACK_INC;\
} while(0)
@@ -622,12 +567,12 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
} while(0)
#endif /* USE_COMBINATION_EXPLOSION_CHECK */
-#define STACK_PUSH_ALT(pat,s,sprev,keep) STACK_PUSH(STK_ALT,pat,s,sprev,keep)
-#define STACK_PUSH_POS(s,sprev,keep) STACK_PUSH(STK_POS,NULL_UCHARP,s,sprev,keep)
-#define STACK_PUSH_POS_NOT(pat,s,sprev,keep) STACK_PUSH(STK_POS_NOT,pat,s,sprev,keep)
+#define STACK_PUSH_ALT(pat,s,sprev) STACK_PUSH(STK_ALT,pat,s,sprev)
+#define STACK_PUSH_POS(s,sprev) STACK_PUSH(STK_POS,NULL_UCHARP,s,sprev)
+#define STACK_PUSH_POS_NOT(pat,s,sprev) STACK_PUSH(STK_POS_NOT,pat,s,sprev)
#define STACK_PUSH_STOP_BT STACK_PUSH_TYPE(STK_STOP_BT)
-#define STACK_PUSH_LOOK_BEHIND_NOT(pat,s,sprev,keep) \
- STACK_PUSH(STK_LOOK_BEHIND_NOT,pat,s,sprev,keep)
+#define STACK_PUSH_LOOK_BEHIND_NOT(pat,s,sprev) \
+ STACK_PUSH(STK_LOOK_BEHIND_NOT,pat,s,sprev)
#define STACK_PUSH_REPEAT(id, pat) do {\
STACK_ENSURE(1);\
@@ -934,7 +879,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
}\
k++;\
}\
- break;\
+ break;\
}\
}\
}\
@@ -975,7 +920,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
}\
k++;\
}\
- break;\
+ break;\
}\
}\
else {\
@@ -1038,7 +983,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
} while(0)
static int string_cmp_ic(OnigEncoding enc, int case_fold_flag,
- UChar* s1, UChar** ps2, OnigDistance mblen, const UChar* text_end)
+ UChar* s1, UChar** ps2, int mblen, const UChar* text_end)
{
UChar buf1[ONIGENC_MBC_CASE_FOLD_MAXLEN];
UChar buf2[ONIGENC_MBC_CASE_FOLD_MAXLEN];
@@ -1112,23 +1057,20 @@ make_capture_history_tree(OnigCaptureTreeNode* node, OnigStackType** kp,
child = history_node_new();
CHECK_NULL_RETURN_MEMERR(child);
child->group = n;
- child->beg = k->u.mem.pstr - str;
+ child->beg = (int )(k->u.mem.pstr - str);
r = history_tree_add_child(node, child);
- if (r != 0) {
- history_tree_free(child);
- return r;
- }
+ if (r != 0) return r;
*kp = (k + 1);
r = make_capture_history_tree(child, kp, stk_top, str, reg);
if (r != 0) return r;
k = *kp;
- child->end = k->u.mem.pstr - str;
+ child->end = (int )(k->u.mem.pstr - str);
}
}
else if (k->type == STK_MEM_END) {
if (k->u.mem.num == node->group) {
- node->end = k->u.mem.pstr - str;
+ node->end = (int )(k->u.mem.pstr - str);
*kp = k;
return 0;
}
@@ -1138,7 +1080,7 @@ make_capture_history_tree(OnigCaptureTreeNode* node, OnigStackType** kp,
return 1; /* 1: root node ending. */
}
-#endif /* USE_CAPTURE_HISTORY */
+#endif
#ifdef USE_BACKREF_WITH_LEVEL
static int mem_is_in_memp(int mem, int num, UChar* memp)
@@ -1183,7 +1125,7 @@ static int backref_match_at_nested_level(regex_t* reg
if (ignore_case != 0) {
if (string_cmp_ic(reg->enc, case_fold_flag,
- pstart, &ss, pend - pstart, send) == 0)
+ pstart, &ss, (int )(pend - pstart), send) == 0)
return 0; /* or goto next_mem; */
}
else {
@@ -1226,14 +1168,14 @@ static struct timeval ts, te;
#define GETTIME(t) gettimeofday(&(t), (struct timezone* )0)
#define TIMEDIFF(te,ts) (((te).tv_usec - (ts).tv_usec) + \
(((te).tv_sec - (ts).tv_sec)*1000000))
-#else /* USE_TIMEOFDAY */
+#else
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
static struct tms ts, te;
#define GETTIME(t) times(&(t))
#define TIMEDIFF(te,ts) ((te).tms_utime - (ts).tms_utime)
-#endif /* USE_TIMEOFDAY */
+#endif
static int OpCounter[256];
static int OpPrevCounter[256];
@@ -1282,13 +1224,12 @@ onig_print_statistics(FILE* f)
MaxStackDepth = stk - stk_base;\
} while(0)
-#else /* ONIG_DEBUG_STATISTICS */
+#else
#define STACK_INC stk++
#define MOP_IN(opcode)
#define MOP_OUT
-#endif /* ONIG_DEBUG_STATISTICS */
-
+#endif
/* matching region of POSIX API */
@@ -1299,12 +1240,9 @@ typedef struct {
regoff_t rm_eo;
} posix_regmatch_t;
-void onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
- OnigEncoding enc);
-
/* match data(str - end) from position (sstart). */
/* if sstart == str then set sprev to NULL. */
-static OnigPosition
+static long
match_at(regex_t* reg, const UChar* str, const UChar* end,
#ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
const UChar* right_range,
@@ -1313,8 +1251,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
{
static const UChar FinishCode[] = { OP_FINISH };
- int i, num_mem, pop_level;
- ptrdiff_t n, best_len;
+ int i, n, num_mem, best_len, pop_level;
LengthType tlen, tlen2;
MemNumType mem;
RelAddrType addr;
@@ -1323,7 +1260,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
OnigCaseFoldType case_fold_flag = reg->case_fold_flag;
UChar *s, *q, *sbegin;
UChar *p = reg->p;
- UChar *pkeep;
char *alloca_base;
OnigStackType *stk_alloc, *stk_base, *stk, *stk_end;
OnigStackType *stkp; /* used as any purpose. */
@@ -1335,23 +1271,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
unsigned char* state_check_buff = msa->state_check_buff;
int num_comb_exp_check = reg->num_comb_exp_check;
#endif
-
-#ifdef USE_SUBEXP_CALL
- /* Stack #0 is used to store the pattern itself and used for (?R), \g<0>, etc. */
- n = reg->num_repeat + (reg->num_mem + 1) * 2;
-
- STACK_INIT(alloca_base, n, INIT_MATCH_STACK_SIZE);
- pop_level = reg->stack_pop_level;
- num_mem = reg->num_mem;
- repeat_stk = (OnigStackIndex* )alloca_base;
-
- mem_start_stk = (OnigStackIndex* )(repeat_stk + reg->num_repeat);
- mem_end_stk = mem_start_stk + (num_mem + 1);
- for (i = 0; i <= num_mem; i++) {
- mem_start_stk[i] = mem_end_stk[i] = INVALID_STACK_INDEX;
- }
-#else /* USE_SUBEXP_CALL */
- /* Stack #0 not is used. */
n = reg->num_repeat + reg->num_mem * 2;
STACK_INIT(alloca_base, n, INIT_MATCH_STACK_SIZE);
@@ -1368,11 +1287,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
for (i = 1; i <= num_mem; i++) {
mem_start_stk[i] = mem_end_stk[i] = INVALID_STACK_INDEX;
}
-#endif /* USE_SUBEXP_CALL */
#ifdef ONIG_DEBUG_MATCH
- fprintf(stderr, "match_at: str: %"PRIdPTR" (%p), end: %"PRIdPTR" (%p), start: %"PRIdPTR" (%p), sprev: %"PRIdPTR" (%p)\n",
- (intptr_t)str, str, (intptr_t)end, end, (intptr_t)sstart, sstart, (intptr_t)sprev, sprev);
+ fprintf(stderr, "match_at: str: %d, end: %d, start: %d, sprev: %d\n",
+ (int )str, (int )end, (int )sstart, (int )sprev);
fprintf(stderr, "size: %d, start offset: %d\n",
(int )(end - str), (int )(sstart - str));
#endif
@@ -1380,7 +1298,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STACK_PUSH_ENSURED(STK_ALT, (UChar *)FinishCode); /* bottom stack */
best_len = ONIG_MISMATCH;
s = (UChar* )sstart;
- pkeep = (UChar* )sstart;
while (1) {
#ifdef ONIG_DEBUG_MATCH
if (s) {
@@ -1388,18 +1305,16 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
int len;
fprintf(stderr, "%4d> \"", (int )(s - str));
bp = buf;
- if (*p != OP_FINISH) { /* s may not be a valid pointer if OP_FINISH. */
- for (i = 0, q = s; i < 7 && q < end; i++) {
- len = enclen(encode, q, end);
- while (len-- > 0) *bp++ = *q++;
- }
+ for (i = 0, q = s; i < 7 && q < end; i++) {
+ len = enclen(encode, q, end);
+ while (len-- > 0) *bp++ = *q++;
}
if (q < end) { xmemcpy(bp, "...\"", 4); bp += 4; }
else { xmemcpy(bp, "\"", 1); bp += 1; }
*bp = 0;
fputs((char* )buf, stderr);
for (i = 0; i < 20 - (bp - buf); i++) fputc(' ', stderr);
- onig_print_compiled_byte_code(stderr, p, p + strlen((char *)p), NULL, encode);
+ onig_print_compiled_byte_code(stderr, p, NULL, encode);
fprintf(stderr, "\n");
}
#endif
@@ -1427,18 +1342,18 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (IS_POSIX_REGION(msa->options)) {
posix_regmatch_t* rmt = (posix_regmatch_t* )region;
- rmt[0].rm_so = (regoff_t )(((pkeep > s) ? s : pkeep) - str);
- rmt[0].rm_eo = (regoff_t )(s - str);
+ rmt[0].rm_so = sstart - str;
+ rmt[0].rm_eo = s - str;
for (i = 1; i <= num_mem; i++) {
if (mem_end_stk[i] != INVALID_STACK_INDEX) {
if (BIT_STATUS_AT(reg->bt_mem_start, i))
- rmt[i].rm_so = (regoff_t )(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
+ rmt[i].rm_so = STACK_AT(mem_start_stk[i])->u.mem.pstr - str;
else
- rmt[i].rm_so = (regoff_t )((UChar* )((void* )(mem_start_stk[i])) - str);
+ rmt[i].rm_so = (UChar* )((void* )(mem_start_stk[i])) - str;
- rmt[i].rm_eo = (regoff_t )((BIT_STATUS_AT(reg->bt_mem_end, i)
+ rmt[i].rm_eo = (BIT_STATUS_AT(reg->bt_mem_end, i)
? STACK_AT(mem_end_stk[i])->u.mem.pstr
- : (UChar* )((void* )mem_end_stk[i])) - str);
+ : (UChar* )((void* )mem_end_stk[i])) - str;
}
else {
rmt[i].rm_so = rmt[i].rm_eo = ONIG_REGION_NOTPOS;
@@ -1447,8 +1362,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}
else {
#endif /* USE_POSIX_API_REGION_OPTION */
- region->beg[0] = ((pkeep > s) ? s : pkeep) - str;
- region->end[0] = s - str;
+ region->beg[0] = sstart - str;
+ region->end[0] = s - str;
for (i = 1; i <= num_mem; i++) {
if (mem_end_stk[i] != INVALID_STACK_INDEX) {
if (BIT_STATUS_AT(reg->bt_mem_start, i))
@@ -1480,8 +1395,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}
node->group = 0;
- node->beg = ((pkeep > s) ? s : pkeep) - str;
- node->end = s - str;
+ node->beg = sstart - str;
+ node->end = s - str;
stkp = stk_base;
r = make_capture_history_tree(region->history_root, &stkp,
@@ -1878,7 +1793,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
DATA_ENSURE(1);
n = enclen(encode, s, end);
DATA_ENSURE(n);
- if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0)) goto fail;
+ if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail;
s += n;
MOP_OUT;
break;
@@ -1893,10 +1808,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_ANYCHAR_STAR: MOP_IN(OP_ANYCHAR_STAR);
while (DATA_ENSURE_CHECK1) {
- STACK_PUSH_ALT(p, s, sprev, pkeep);
+ STACK_PUSH_ALT(p, s, sprev);
n = enclen(encode, s, end);
DATA_ENSURE(n);
- if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0)) goto fail;
+ if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail;
sprev = s;
s += n;
}
@@ -1905,7 +1820,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_ANYCHAR_ML_STAR: MOP_IN(OP_ANYCHAR_ML_STAR);
while (DATA_ENSURE_CHECK1) {
- STACK_PUSH_ALT(p, s, sprev, pkeep);
+ STACK_PUSH_ALT(p, s, sprev);
n = enclen(encode, s, end);
if (n > 1) {
DATA_ENSURE(n);
@@ -1923,11 +1838,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_ANYCHAR_STAR_PEEK_NEXT: MOP_IN(OP_ANYCHAR_STAR_PEEK_NEXT);
while (DATA_ENSURE_CHECK1) {
if (*p == *s) {
- STACK_PUSH_ALT(p + 1, s, sprev, pkeep);
+ STACK_PUSH_ALT(p + 1, s, sprev);
}
n = enclen(encode, s, end);
DATA_ENSURE(n);
- if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0)) goto fail;
+ if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail;
sprev = s;
s += n;
}
@@ -1938,7 +1853,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_ANYCHAR_ML_STAR_PEEK_NEXT:MOP_IN(OP_ANYCHAR_ML_STAR_PEEK_NEXT);
while (DATA_ENSURE_CHECK1) {
if (*p == *s) {
- STACK_PUSH_ALT(p + 1, s, sprev, pkeep);
+ STACK_PUSH_ALT(p + 1, s, sprev);
}
n = enclen(encode, s, end);
if (n > 1) {
@@ -1962,10 +1877,10 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STATE_CHECK_VAL(scv, mem);
if (scv) goto fail;
- STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem, pkeep);
+ STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem);
n = enclen(encode, s, end);
DATA_ENSURE(n);
- if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 0)) goto fail;
+ if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail;
sprev = s;
s += n;
}
@@ -1980,7 +1895,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STATE_CHECK_VAL(scv, mem);
if (scv) goto fail;
- STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem, pkeep);
+ STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem);
n = enclen(encode, s, end);
if (n > 1) {
DATA_ENSURE(n);
@@ -2005,15 +1920,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
MOP_OUT;
break;
- case OP_ASCII_WORD: MOP_IN(OP_ASCII_WORD);
- DATA_ENSURE(1);
- if (! ONIGENC_IS_MBC_ASCII_WORD(encode, s, end))
- goto fail;
-
- s += enclen(encode, s, end);
- MOP_OUT;
- break;
-
case OP_NOT_WORD: MOP_IN(OP_NOT_WORD);
DATA_ENSURE(1);
if (ONIGENC_IS_MBC_WORD(encode, s, end))
@@ -2023,15 +1929,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
MOP_OUT;
break;
- case OP_NOT_ASCII_WORD: MOP_IN(OP_NOT_ASCII_WORD);
- DATA_ENSURE(1);
- if (ONIGENC_IS_MBC_ASCII_WORD(encode, s, end))
- goto fail;
-
- s += enclen(encode, s, end);
- MOP_OUT;
- break;
-
case OP_WORD_BOUND: MOP_IN(OP_WORD_BOUND);
if (ON_STR_BEGIN(s)) {
DATA_ENSURE(1);
@@ -2051,25 +1948,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
continue;
break;
- case OP_ASCII_WORD_BOUND: MOP_IN(OP_ASCII_WORD_BOUND);
- if (ON_STR_BEGIN(s)) {
- DATA_ENSURE(1);
- if (! ONIGENC_IS_MBC_ASCII_WORD(encode, s, end))
- goto fail;
- }
- else if (ON_STR_END(s)) {
- if (! ONIGENC_IS_MBC_ASCII_WORD(encode, sprev, end))
- goto fail;
- }
- else {
- if (ONIGENC_IS_MBC_ASCII_WORD(encode, s, end)
- == ONIGENC_IS_MBC_ASCII_WORD(encode, sprev, end))
- goto fail;
- }
- MOP_OUT;
- continue;
- break;
-
case OP_NOT_WORD_BOUND: MOP_IN(OP_NOT_WORD_BOUND);
if (ON_STR_BEGIN(s)) {
if (DATA_ENSURE_CHECK1 && ONIGENC_IS_MBC_WORD(encode, s, end))
@@ -2088,24 +1966,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
continue;
break;
- case OP_NOT_ASCII_WORD_BOUND: MOP_IN(OP_NOT_ASCII_WORD_BOUND);
- if (ON_STR_BEGIN(s)) {
- if (DATA_ENSURE_CHECK1 && ONIGENC_IS_MBC_ASCII_WORD(encode, s, end))
- goto fail;
- }
- else if (ON_STR_END(s)) {
- if (ONIGENC_IS_MBC_ASCII_WORD(encode, sprev, end))
- goto fail;
- }
- else {
- if (ONIGENC_IS_MBC_ASCII_WORD(encode, s, end)
- != ONIGENC_IS_MBC_ASCII_WORD(encode, sprev, end))
- goto fail;
- }
- MOP_OUT;
- continue;
- break;
-
#ifdef USE_WORD_BEGIN_END
case OP_WORD_BEGIN: MOP_IN(OP_WORD_BEGIN);
if (DATA_ENSURE_CHECK1 && ONIGENC_IS_MBC_WORD(encode, s, end)) {
@@ -2117,16 +1977,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
goto fail;
break;
- case OP_ASCII_WORD_BEGIN: MOP_IN(OP_ASCII_WORD_BEGIN);
- if (DATA_ENSURE_CHECK1 && ONIGENC_IS_MBC_ASCII_WORD(encode, s, end)) {
- if (ON_STR_BEGIN(s) || !ONIGENC_IS_MBC_ASCII_WORD(encode, sprev, end)) {
- MOP_OUT;
- continue;
- }
- }
- goto fail;
- break;
-
case OP_WORD_END: MOP_IN(OP_WORD_END);
if (!ON_STR_BEGIN(s) && ONIGENC_IS_MBC_WORD(encode, sprev, end)) {
if (ON_STR_END(s) || !ONIGENC_IS_MBC_WORD(encode, s, end)) {
@@ -2136,16 +1986,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}
goto fail;
break;
-
- case OP_ASCII_WORD_END: MOP_IN(OP_ASCII_WORD_END);
- if (!ON_STR_BEGIN(s) && ONIGENC_IS_MBC_ASCII_WORD(encode, sprev, end)) {
- if (ON_STR_END(s) || !ONIGENC_IS_MBC_ASCII_WORD(encode, s, end)) {
- MOP_OUT;
- continue;
- }
- }
- goto fail;
- break;
#endif
case OP_BEGIN_BUF: MOP_IN(OP_BEGIN_BUF);
@@ -2163,18 +2003,12 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
break;
case OP_BEGIN_LINE: MOP_IN(OP_BEGIN_LINE);
- op_begin_line:
if (ON_STR_BEGIN(s)) {
if (IS_NOTBOL(msa->options)) goto fail;
MOP_OUT;
continue;
}
- else if (ONIGENC_IS_MBC_NEWLINE(encode, sprev, end)
-#ifdef USE_CRNL_AS_LINE_TERMINATOR
- && !(IS_NEWLINE_CRLF(option)
- && ONIGENC_IS_MBC_CRNL(encode, sprev, end))
-#endif
- && !ON_STR_END(s)) {
+ else if (ONIGENC_IS_MBC_NEWLINE(encode, sprev, end) && !ON_STR_END(s)) {
MOP_OUT;
continue;
}
@@ -2184,7 +2018,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_END_LINE: MOP_IN(OP_END_LINE);
if (ON_STR_END(s)) {
#ifndef USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
- if (IS_EMPTY_STR || !ONIGENC_IS_MBC_NEWLINE_EX(encode, sprev, str, end, option, 1)) {
+ if (IS_EMPTY_STR || !ONIGENC_IS_MBC_NEWLINE(encode, sprev, end)) {
#endif
if (IS_NOTEOL(msa->options)) goto fail;
MOP_OUT;
@@ -2193,17 +2027,23 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}
#endif
}
- else if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 1)) {
+ else if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) {
+ MOP_OUT;
+ continue;
+ }
+#ifdef USE_CRNL_AS_LINE_TERMINATOR
+ else if (ONIGENC_IS_MBC_CRNL(encode, s, end)) {
MOP_OUT;
continue;
}
+#endif
goto fail;
break;
case OP_SEMI_END_BUF: MOP_IN(OP_SEMI_END_BUF);
if (ON_STR_END(s)) {
#ifndef USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
- if (IS_EMPTY_STR || !ONIGENC_IS_MBC_NEWLINE_EX(encode, sprev, str, end, option, 1)) {
+ if (IS_EMPTY_STR || !ONIGENC_IS_MBC_NEWLINE(encode, sprev, end)) {
#endif
if (IS_NOTEOL(msa->options)) goto fail;
MOP_OUT;
@@ -2212,42 +2052,32 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
}
#endif
}
- else if (ONIGENC_IS_MBC_NEWLINE_EX(encode, s, str, end, option, 1)) {
- UChar* ss = s + enclen(encode, s, end);
- if (ON_STR_END(ss)) {
- MOP_OUT;
- continue;
- }
+ else if (ONIGENC_IS_MBC_NEWLINE(encode, s, end) &&
+ ON_STR_END(s + enclen(encode, s, end))) {
+ MOP_OUT;
+ continue;
+ }
#ifdef USE_CRNL_AS_LINE_TERMINATOR
- else if (IS_NEWLINE_CRLF(option)
- && ONIGENC_IS_MBC_CRNL(encode, s, end)) {
- ss += enclen(encode, ss, end);
- if (ON_STR_END(ss)) {
- MOP_OUT;
- continue;
- }
- }
-#endif
+ else if (ONIGENC_IS_MBC_CRNL(encode, s, end)) {
+ UChar* ss = s + enclen(encode, s);
+ ss += enclen(encode, ss);
+ if (ON_STR_END(ss)) {
+ MOP_OUT;
+ continue;
+ }
}
+#endif
goto fail;
break;
case OP_BEGIN_POSITION: MOP_IN(OP_BEGIN_POSITION);
- if (s != msa->gpos)
+ if (s != msa->start)
goto fail;
MOP_OUT;
continue;
break;
- case OP_BEGIN_POS_OR_LINE: MOP_IN(OP_BEGIN_POS_OR_LINE);
- if (s != msa->gpos)
- goto op_begin_line;
-
- MOP_OUT;
- continue;
- break;
-
case OP_MEMORY_START_PUSH: MOP_IN(OP_MEMORY_START_PUSH);
GET_MEMNUM_INC(mem, p);
STACK_PUSH_MEM_START(mem, s);
@@ -2276,12 +2106,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
continue;
break;
- case OP_KEEP: MOP_IN(OP_KEEP);
- pkeep = s;
- MOP_OUT;
- continue;
- break;
-
#ifdef USE_SUBEXP_CALL
case OP_MEMORY_END_PUSH_REC: MOP_IN(OP_MEMORY_END_PUSH_REC);
GET_MEMNUM_INC(mem, p);
@@ -2374,7 +2198,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
n = pend - pstart;
DATA_ENSURE(n);
sprev = s;
- STRING_CMP_IC(case_fold_flag, pstart, &s, (int)n, end);
+ STRING_CMP_IC(case_fold_flag, pstart, &s, n, end);
while (sprev + (len = enclen(encode, sprev, end)) < s)
sprev += len;
@@ -2493,7 +2317,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
#if 0 /* no need: IS_DYNAMIC_OPTION() == 0 */
case OP_SET_OPTION_PUSH: MOP_IN(OP_SET_OPTION_PUSH);
GET_OPTION_INC(option, p);
- STACK_PUSH_ALT(p, s, sprev, pkeep);
+ STACK_PUSH_ALT(p, s, sprev);
p += SIZE_OP_SET_OPTION + SIZE_OP_FAIL;
MOP_OUT;
continue;
@@ -2521,8 +2345,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STACK_NULL_CHECK(isnull, mem, s);
if (isnull) {
#ifdef ONIG_DEBUG_MATCH
- fprintf(stderr, "NULL_CHECK_END: skip id:%d, s:%"PRIdPTR" (%p)\n",
- (int )mem, (intptr_t )s, s);
+ fprintf(stderr, "NULL_CHECK_END: skip id:%d, s:%d\n",
+ (int )mem, (int )s);
#endif
null_check_found:
/* empty loop founded, skip next instruction */
@@ -2556,11 +2380,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STACK_NULL_CHECK_MEMST(isnull, mem, s, reg);
if (isnull) {
#ifdef ONIG_DEBUG_MATCH
- fprintf(stderr, "NULL_CHECK_END_MEMST: skip id:%d, s:%"PRIdPTR" (%p)\n",
- (int )mem, (intptr_t )s, s);
+ fprintf(stderr, "NULL_CHECK_END_MEMST: skip id:%d, s:%d\n",
+ (int )mem, (int )s);
#endif
if (isnull == -1) goto fail;
- goto null_check_found;
+ goto null_check_found;
}
}
MOP_OUT;
@@ -2582,11 +2406,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
#endif
if (isnull) {
#ifdef ONIG_DEBUG_MATCH
- fprintf(stderr, "NULL_CHECK_END_MEMST_PUSH: skip id:%d, s:%"PRIdPTR" (%p)\n",
- (int )mem, (intptr_t )s, s);
+ fprintf(stderr, "NULL_CHECK_END_MEMST_PUSH: skip id:%d, s:%d\n",
+ (int )mem, (int )s);
#endif
if (isnull == -1) goto fail;
- goto null_check_found;
+ goto null_check_found;
}
else {
STACK_PUSH_NULL_CHECK_END(mem);
@@ -2607,7 +2431,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_PUSH: MOP_IN(OP_PUSH);
GET_RELADDR_INC(addr, p);
- STACK_PUSH_ALT(p + addr, s, sprev, pkeep);
+ STACK_PUSH_ALT(p + addr, s, sprev);
MOP_OUT;
continue;
break;
@@ -2619,7 +2443,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (scv) goto fail;
GET_RELADDR_INC(addr, p);
- STACK_PUSH_ALT_WITH_STATE_CHECK(p + addr, s, sprev, mem, pkeep);
+ STACK_PUSH_ALT_WITH_STATE_CHECK(p + addr, s, sprev, mem);
MOP_OUT;
continue;
break;
@@ -2632,7 +2456,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
p += addr;
}
else {
- STACK_PUSH_ALT_WITH_STATE_CHECK(p + addr, s, sprev, mem, pkeep);
+ STACK_PUSH_ALT_WITH_STATE_CHECK(p + addr, s, sprev, mem);
}
MOP_OUT;
continue;
@@ -2659,7 +2483,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
GET_RELADDR_INC(addr, p);
if (*p == *s && DATA_ENSURE_CHECK1) {
p++;
- STACK_PUSH_ALT(p + addr, s, sprev, pkeep);
+ STACK_PUSH_ALT(p + addr, s, sprev);
MOP_OUT;
continue;
}
@@ -2672,7 +2496,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
GET_RELADDR_INC(addr, p);
if (*p == *s) {
p++;
- STACK_PUSH_ALT(p + addr, s, sprev, pkeep);
+ STACK_PUSH_ALT(p + addr, s, sprev);
MOP_OUT;
continue;
}
@@ -2691,7 +2515,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STACK_PUSH_REPEAT(mem, p);
if (reg->repeat_range[mem].lower == 0) {
- STACK_PUSH_ALT(p + addr, s, sprev, pkeep);
+ STACK_PUSH_ALT(p + addr, s, sprev);
}
}
MOP_OUT;
@@ -2708,7 +2532,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
STACK_PUSH_REPEAT(mem, p);
if (reg->repeat_range[mem].lower == 0) {
- STACK_PUSH_ALT(p, s, sprev, pkeep);
+ STACK_PUSH_ALT(p, s, sprev);
p += addr;
}
}
@@ -2727,7 +2551,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
/* end of repeat. Nothing to do. */
}
else if (stkp->u.repeat.count >= reg->repeat_range[mem].lower) {
- STACK_PUSH_ALT(p, s, sprev, pkeep);
+ STACK_PUSH_ALT(p, s, sprev);
p = STACK_AT(si)->u.repeat.pcode; /* Don't use stkp after PUSH. */
}
else {
@@ -2758,7 +2582,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
UChar* pcode = stkp->u.repeat.pcode;
STACK_PUSH_REPEAT_INC(si);
- STACK_PUSH_ALT(pcode, s, sprev, pkeep);
+ STACK_PUSH_ALT(pcode, s, sprev);
}
else {
p = stkp->u.repeat.pcode;
@@ -2781,7 +2605,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
break;
case OP_PUSH_POS: MOP_IN(OP_PUSH_POS);
- STACK_PUSH_POS(s, sprev, pkeep);
+ STACK_PUSH_POS(s, sprev);
MOP_OUT;
continue;
break;
@@ -2798,7 +2622,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
case OP_PUSH_POS_NOT: MOP_IN(OP_PUSH_POS_NOT);
GET_RELADDR_INC(addr, p);
- STACK_PUSH_POS_NOT(p + addr, s, sprev, pkeep);
+ STACK_PUSH_POS_NOT(p + addr, s, sprev);
MOP_OUT;
continue;
break;
@@ -2840,7 +2664,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
/* goto fail; */
}
else {
- STACK_PUSH_LOOK_BEHIND_NOT(p + addr, s, sprev, pkeep);
+ STACK_PUSH_LOOK_BEHIND_NOT(p + addr, s, sprev);
s = q;
sprev = (UChar* )onigenc_get_prev_char_head(encode, str, s, end);
}
@@ -2870,18 +2694,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
break;
#endif
- case OP_CONDITION: MOP_IN(OP_CONDITION);
- GET_MEMNUM_INC(mem, p);
- GET_RELADDR_INC(addr, p);
- if ((mem > num_mem) ||
- (mem_end_stk[mem] == INVALID_STACK_INDEX) ||
- (mem_start_stk[mem] == INVALID_STACK_INDEX)) {
- p += addr;
- }
- MOP_OUT;
- continue;
- break;
-
case OP_FINISH:
goto finish;
break;
@@ -2894,7 +2706,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
p = stk->u.state.pcode;
s = stk->u.state.pstr;
sprev = stk->u.state.pstr_prev;
- pkeep = stk->u.state.pkeep;
#ifdef USE_COMBINATION_EXPLOSION_CHECK
if (stk->u.state.state_check != 0) {
@@ -2959,7 +2770,7 @@ slow_search(OnigEncoding enc, UChar* target, UChar* target_end,
}
s += n;
}
- return (UChar* )NULL;
+ return (UChar*)NULL;
}
while (s < end) {
if (*s == *target) {
@@ -3077,8 +2888,6 @@ slow_search_backward_ic(OnigEncoding enc, int case_fold_flag,
return (UChar* )NULL;
}
-#ifndef USE_SUNDAY_QUICK_SEARCH
-/* Boyer-Moore-Horspool search applied to a multibyte string */
static UChar*
bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
const UChar* text, const UChar* text_end,
@@ -3086,11 +2895,11 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
{
const UChar *s, *se, *t, *p, *end;
const UChar *tail;
- ptrdiff_t skip, tlen1;
+ int skip, tlen1;
#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_notrev: text: %"PRIuPTR" (%p), text_end: %"PRIuPTR" (%p), text_range: %"PRIuPTR" (%p)\n",
- text, text, text_end, text_end, text_range, text_range);
+ fprintf(stderr, "bm_search_notrev: text: %d, text_end: %d, text_range: %d\n",
+ (int )text, (int )text_end, (int )text_range);
#endif
tail = target_end - 1;
@@ -3135,7 +2944,6 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
return (UChar* )NULL;
}
-/* Boyer-Moore-Horspool search */
static UChar*
bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
const UChar* text, const UChar* text_end, const UChar* text_range)
@@ -3143,11 +2951,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
const UChar *s, *t, *p, *end;
const UChar *tail;
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search: text: %"PRIuPTR", text_end: %"PRIuPTR", text_range: %"PRIuPTR"\n",
- text, text_end, text_range);
-#endif
-
end = text_range + (target_end - target) - 1;
if (end > text_end)
end = text_end;
@@ -3158,10 +2961,6 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
while (s < end) {
p = s;
t = tail;
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_loop: pos: %d %s\n",
- (int)(s - text), s);
-#endif
while (*p == *t) {
if (t == target) return (UChar* )p;
p--; t--;
@@ -3183,315 +2982,10 @@ bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
return (UChar* )NULL;
}
-/* Boyer-Moore-Horspool search applied to a multibyte string (ignore case) */
-static UChar*
-bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
- const UChar* text, const UChar* text_end,
- const UChar* text_range)
-{
- const UChar *s, *se, *t, *end;
- const UChar *tail;
- ptrdiff_t skip, tlen1;
- OnigEncoding enc = reg->enc;
- int case_fold_flag = reg->case_fold_flag;
-
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_notrev_ic: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
- (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-#endif
-
- tail = target_end - 1;
- tlen1 = tail - target;
- end = text_range;
- if (end + tlen1 > text_end)
- end = text_end - tlen1;
-
- s = text;
-
- if (IS_NULL(reg->int_map)) {
- while (s < end) {
- se = s + tlen1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- s, se + 1))
- return (UChar* )s;
- skip = reg->map[*se];
- t = s;
- do {
- s += enclen(reg->enc, s, end);
- } while ((s - t) < skip && s < end);
- }
- }
- else {
- while (s < end) {
- se = s + tlen1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- s, se + 1))
- return (UChar* )s;
- skip = reg->int_map[*se];
- t = s;
- do {
- s += enclen(reg->enc, s, end);
- } while ((s - t) < skip && s < end);
- }
- }
-
- return (UChar* )NULL;
-}
-
-/* Boyer-Moore-Horspool search (ignore case) */
-static UChar*
-bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
- const UChar* text, const UChar* text_end, const UChar* text_range)
-{
- const UChar *s, *p, *end;
- const UChar *tail;
- OnigEncoding enc = reg->enc;
- int case_fold_flag = reg->case_fold_flag;
-
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_ic: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
- (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-#endif
-
- end = text_range + (target_end - target) - 1;
- if (end > text_end)
- end = text_end;
-
- tail = target_end - 1;
- s = text + (target_end - target) - 1;
- if (IS_NULL(reg->int_map)) {
- while (s < end) {
- p = s - (target_end - target) + 1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- p, s + 1))
- return (UChar* )p;
- s += reg->map[*s];
- }
- }
- else { /* see int_map[] */
- while (s < end) {
- p = s - (target_end - target) + 1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- p, s + 1))
- return (UChar* )p;
- s += reg->int_map[*s];
- }
- }
- return (UChar* )NULL;
-}
-
-#else /* USE_SUNDAY_QUICK_SEARCH */
-
-/* Sunday's quick search applied to a multibyte string */
-static UChar*
-bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
- const UChar* text, const UChar* text_end,
- const UChar* text_range)
-{
- const UChar *s, *se, *t, *p, *end;
- const UChar *tail;
- ptrdiff_t skip, tlen1;
- OnigEncoding enc = reg->enc;
-
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_notrev: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
- (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-#endif
-
- tail = target_end - 1;
- tlen1 = tail - target;
- end = text_range;
- if (end + tlen1 > text_end)
- end = text_end - tlen1;
-
- s = text;
-
- if (IS_NULL(reg->int_map)) {
- while (s < end) {
- p = se = s + tlen1;
- t = tail;
- while (*p == *t) {
- if (t == target) return (UChar* )s;
- p--; t--;
- }
- if (s + 1 >= end) break;
- skip = reg->map[se[1]];
- t = s;
- do {
- s += enclen(enc, s, end);
- } while ((s - t) < skip && s < end);
- }
- }
- else {
- while (s < end) {
- p = se = s + tlen1;
- t = tail;
- while (*p == *t) {
- if (t == target) return (UChar* )s;
- p--; t--;
- }
- if (s + 1 >= end) break;
- skip = reg->int_map[se[1]];
- t = s;
- do {
- s += enclen(enc, s, end);
- } while ((s - t) < skip && s < end);
- }
- }
-
- return (UChar* )NULL;
-}
-
-/* Sunday's quick search */
-static UChar*
-bm_search(regex_t* reg, const UChar* target, const UChar* target_end,
- const UChar* text, const UChar* text_end, const UChar* text_range)
-{
- const UChar *s, *t, *p, *end;
- const UChar *tail;
- ptrdiff_t tlen1;
-
- tail = target_end - 1;
- tlen1 = tail - target;
- end = text_range + tlen1;
- if (end > text_end)
- end = text_end;
-
- s = text + tlen1;
- if (IS_NULL(reg->int_map)) {
- while (s < end) {
- p = s;
- t = tail;
- while (*p == *t) {
- if (t == target) return (UChar* )p;
- p--; t--;
- }
- if (s + 1 >= end) break;
- s += reg->map[s[1]];
- }
- }
- else { /* see int_map[] */
- while (s < end) {
- p = s;
- t = tail;
- while (*p == *t) {
- if (t == target) return (UChar* )p;
- p--; t--;
- }
- if (s + 1 >= end) break;
- s += reg->int_map[s[1]];
- }
- }
- return (UChar* )NULL;
-}
-
-/* Sunday's quick search applied to a multibyte string (ignore case) */
-static UChar*
-bm_search_notrev_ic(regex_t* reg, const UChar* target, const UChar* target_end,
- const UChar* text, const UChar* text_end,
- const UChar* text_range)
-{
- const UChar *s, *se, *t, *end;
- const UChar *tail;
- ptrdiff_t skip, tlen1;
- OnigEncoding enc = reg->enc;
- int case_fold_flag = reg->case_fold_flag;
-
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_notrev_ic: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
- (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-#endif
-
- tail = target_end - 1;
- tlen1 = tail - target;
- end = text_range;
- if (end + tlen1 > text_end)
- end = text_end - tlen1;
-
- s = text;
-
- if (IS_NULL(reg->int_map)) {
- while (s < end) {
- se = s + tlen1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- s, se + 1))
- return (UChar* )s;
- if (s + 1 >= end) break;
- skip = reg->map[se[1]];
- t = s;
- do {
- s += enclen(enc, s, end);
- } while ((s - t) < skip && s < end);
- }
- }
- else {
- while (s < end) {
- se = s + tlen1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- s, se + 1))
- return (UChar* )s;
- if (s + 1 >= end) break;
- skip = reg->int_map[se[1]];
- t = s;
- do {
- s += enclen(enc, s, end);
- } while ((s - t) < skip && s < end);
- }
- }
-
- return (UChar* )NULL;
-}
-
-/* Sunday's quick search (ignore case) */
-static UChar*
-bm_search_ic(regex_t* reg, const UChar* target, const UChar* target_end,
- const UChar* text, const UChar* text_end, const UChar* text_range)
-{
- const UChar *s, *p, *end;
- const UChar *tail;
- ptrdiff_t tlen1;
- OnigEncoding enc = reg->enc;
- int case_fold_flag = reg->case_fold_flag;
-
-#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "bm_search_ic: text: %d (%p), text_end: %d (%p), text_range: %d (%p)\n",
- (int )text, text, (int )text_end, text_end, (int )text_range, text_range);
-#endif
-
- tail = target_end - 1;
- tlen1 = tail - target;
- end = text_range + tlen1;
- if (end > text_end)
- end = text_end;
-
- s = text + tlen1;
- if (IS_NULL(reg->int_map)) {
- while (s < end) {
- p = s - tlen1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- p, s + 1))
- return (UChar* )p;
- if (s + 1 >= end) break;
- s += reg->map[s[1]];
- }
- }
- else { /* see int_map[] */
- while (s < end) {
- p = s - tlen1;
- if (str_lower_case_match(enc, case_fold_flag, target, target_end,
- p, s + 1))
- return (UChar* )p;
- if (s + 1 >= end) break;
- s += reg->int_map[s[1]];
- }
- }
- return (UChar* )NULL;
-}
-#endif /* USE_SUNDAY_QUICK_SEARCH */
-
static int
set_bm_backward_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
int** skip)
+
{
int i, len;
@@ -3500,7 +2994,7 @@ set_bm_backward_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
if (IS_NULL(*skip)) return ONIGERR_MEMORY;
}
- len = (int )(end - s);
+ len = end - s;
for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++)
(*skip)[i] = len;
@@ -3568,11 +3062,11 @@ map_search_backward(OnigEncoding enc, UChar map[],
return (UChar* )NULL;
}
-extern OnigPosition
+extern long
onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at, OnigRegion* region,
OnigOptionType option)
{
- ptrdiff_t r;
+ long r;
UChar *prev;
OnigMatchArg msa;
@@ -3601,7 +3095,7 @@ onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at, On
THREAD_ATOMIC_END;
#endif /* USE_RECOMPILE_API && USE_MULTI_THREAD_SYSTEM */
- MATCH_ARG_INIT(msa, option, region, at, at);
+ MATCH_ARG_INIT(msa, option, region, at);
#ifdef USE_COMBINATION_EXPLOSION_CHECK
{
int offset = at - str;
@@ -3640,8 +3134,8 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
UChar *p, *pprev = (UChar* )NULL;
#ifdef ONIG_DEBUG_SEARCH
- fprintf(stderr, "forward_search_range: str: %"PRIuPTR" (%p), end: %"PRIuPTR" (%p), s: %"PRIuPTR" (%p), range: %"PRIuPTR" (%p)\n",
- str, str, end, end, s, s, range, range);
+ fprintf(stderr, "forward_search_range: str: %d, end: %d, s: %d, range: %d\n",
+ (int )str, (int )end, (int )s, (int )range);
#endif
p = s;
@@ -3673,14 +3167,6 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
p = bm_search_notrev(reg, reg->exact, reg->exact_end, p, end, range);
break;
- case ONIG_OPTIMIZE_EXACT_BM_IC:
- p = bm_search_ic(reg, reg->exact, reg->exact_end, p, end, range);
- break;
-
- case ONIG_OPTIMIZE_EXACT_BM_NOT_REV_IC:
- p = bm_search_notrev_ic(reg, reg->exact, reg->exact_end, p, end, range);
- break;
-
case ONIG_OPTIMIZE_MAP:
p = map_search(reg->enc, reg->map, p, range, end);
break;
@@ -3702,7 +3188,7 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
if (!ON_STR_BEGIN(p)) {
prev = onigenc_get_prev_char_head(reg->enc,
(pprev ? pprev : str), p, end);
- if (!ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 0))
+ if (!ONIGENC_IS_MBC_NEWLINE(reg->enc, prev, end))
goto retry_gate;
}
break;
@@ -3712,11 +3198,15 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s,
#ifndef USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
prev = (UChar* )onigenc_get_prev_char_head(reg->enc,
(pprev ? pprev : str), p);
- if (prev && ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 1))
+ if (prev && ONIGENC_IS_MBC_NEWLINE(reg->enc, prev, end))
goto retry_gate;
#endif
}
- else if (! ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, p, str, end, reg->options, 1))
+ else if (! ONIGENC_IS_MBC_NEWLINE(reg->enc, p, end)
+#ifdef USE_CRNL_AS_LINE_TERMINATOR
+ && ! ONIGENC_IS_MBC_CRNL(reg->enc, p, end)
+#endif
+ )
goto retry_gate;
break;
}
@@ -3768,7 +3258,7 @@ static int set_bm_backward_skip P_((UChar* s, UChar* end, OnigEncoding enc,
#define BM_BACKWARD_SEARCH_LENGTH_THRESHOLD 100
-static int
+static long
backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
UChar* s, const UChar* range, UChar* adjrange,
UChar** low, UChar** high)
@@ -3788,8 +3278,6 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
break;
case ONIG_OPTIMIZE_EXACT_IC:
- case ONIG_OPTIMIZE_EXACT_BM_IC:
- case ONIG_OPTIMIZE_EXACT_BM_NOT_REV_IC:
p = slow_search_backward_ic(reg->enc, reg->case_fold_flag,
reg->exact, reg->exact_end,
range, adjrange, end, p);
@@ -3822,7 +3310,7 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
case ANCHOR_BEGIN_LINE:
if (!ON_STR_BEGIN(p)) {
prev = onigenc_get_prev_char_head(reg->enc, str, p, end);
- if (!ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 0)) {
+ if (!ONIGENC_IS_MBC_NEWLINE(reg->enc, prev, end)) {
p = prev;
goto retry;
}
@@ -3834,13 +3322,17 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
#ifndef USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
prev = onigenc_get_prev_char_head(reg->enc, adjrange, p);
if (IS_NULL(prev)) goto fail;
- if (ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 1)) {
+ if (ONIGENC_IS_MBC_NEWLINE(reg->enc, prev, end)) {
p = prev;
goto retry;
}
#endif
}
- else if (! ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, p, str, end, reg->options, 1)) {
+ else if (! ONIGENC_IS_MBC_NEWLINE(reg->enc, p, end)
+#ifdef USE_CRNL_AS_LINE_TERMINATOR
+ && ! ONIGENC_IS_MBC_CRNL(reg->enc, p, end)
+#endif
+ ) {
p = onigenc_get_prev_char_head(reg->enc, adjrange, p, end);
if (IS_NULL(p)) goto fail;
goto retry;
@@ -3871,23 +3363,15 @@ backward_search_range(regex_t* reg, const UChar* str, const UChar* end,
}
-extern OnigPosition
+extern long
onig_search(regex_t* reg, const UChar* str, const UChar* end,
const UChar* start, const UChar* range, OnigRegion* region, OnigOptionType option)
{
- return onig_search_gpos(reg, str, end, start, start, range, region, option);
-}
-
-extern OnigPosition
-onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
- const UChar* global_pos,
- const UChar* start, const UChar* range, OnigRegion* region, OnigOptionType option)
-{
- ptrdiff_t r;
+ int r;
UChar *s, *prev;
OnigMatchArg msa;
-#ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
const UChar *orig_start = start;
+#ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
const UChar *orig_range = range;
#endif
@@ -3918,8 +3402,8 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
#ifdef ONIG_DEBUG_SEARCH
fprintf(stderr,
- "onig_search (entry point): str: %"PRIuPTR" (%p), end: %"PRIuPTR", start: %"PRIuPTR", range: %"PRIuPTR"\n",
- str, str, end - str, start - str, range - str);
+ "onig_search (entry point): str: %d, end: %d, start: %d, range: %d\n",
+ (int )str, (int )(end - str), (int )(start - str), (int )(range - str));
#endif
if (region
@@ -4020,14 +3504,15 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
start = min_semi_end - reg->anchor_dmax;
if (start < end)
start = onigenc_get_right_adjust_char_head(reg->enc, str, start, end);
+ else { /* match with empty at end */
+ start = onigenc_get_prev_char_head(reg->enc, str, end, end);
+ }
}
if ((OnigDistance )(max_semi_end - (range - 1)) < reg->anchor_dmin) {
range = max_semi_end - reg->anchor_dmin + 1;
}
- if (start > range) goto mismatch_no_msa;
- /* If start == range, match with empty at end.
- Backward search is used. */
+ if (start >= range) goto mismatch_no_msa;
}
else {
if ((OnigDistance )(min_semi_end - range) > reg->anchor_dmax) {
@@ -4050,7 +3535,6 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
#ifdef USE_CRNL_AS_LINE_TERMINATOR
pre_end = ONIGENC_STEP_BACK(reg->enc, str, pre_end, end, 1);
if (IS_NOT_NULL(pre_end) &&
- IS_NEWLINE_CRLF(reg->options) &&
ONIGENC_IS_MBC_CRNL(reg->enc, pre_end, end)) {
min_semi_end = pre_end;
}
@@ -4065,9 +3549,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
}
}
else if ((reg->anchor & ANCHOR_ANYCHAR_STAR_ML)) {
- if (! (reg->anchor & ANCHOR_LOOK_BEHIND)) {
- goto begin_position;
- }
+ goto begin_position;
}
}
else if (str == end) { /* empty string */
@@ -4082,7 +3564,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
s = (UChar* )start;
prev = (UChar* )NULL;
- MATCH_ARG_INIT(msa, option, region, start, start);
+ MATCH_ARG_INIT(msa, option, region, start);
#ifdef USE_COMBINATION_EXPLOSION_CHECK
msa.state_check_buff = (void* )0;
msa.state_check_buff_size = 0; /* NO NEED, for valgrind */
@@ -4098,7 +3580,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
(int )(end - str), (int )(start - str), (int )(range - str));
#endif
- MATCH_ARG_INIT(msa, option, region, start, global_pos);
+ MATCH_ARG_INIT(msa, option, region, orig_start);
#ifdef USE_COMBINATION_EXPLOSION_CHECK
{
int offset = (MIN(start, range) - str);
@@ -4151,19 +3633,9 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
if ((reg->anchor & ANCHOR_ANYCHAR_STAR) != 0) {
do {
- if ((reg->anchor & ANCHOR_BEGIN_POSITION) == 0)
- msa.gpos = s; /* move \G position */
MATCH_AND_RETURN_CHECK(orig_range);
prev = s;
s += enclen(reg->enc, s, end);
-
- if ((reg->anchor & (ANCHOR_LOOK_BEHIND | ANCHOR_PREC_READ_NOT)) == 0) {
- while (!ONIGENC_IS_MBC_NEWLINE_EX(reg->enc, prev, str, end, reg->options, 0)
- && s < range) {
- prev = s;
- s += enclen(reg->enc, s, end);
- }
- }
} while (s < range);
goto mismatch;
}
@@ -4183,7 +3655,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
else { /* backward search */
#ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
if (orig_start < end)
- orig_start += enclen(reg->enc, orig_start, end); /* is upper range */
+ orig_start += enclen(reg->enc, orig_start, end); /* is upper range */
#endif
if (reg->optimize != ONIG_OPTIMIZE_NONE) {
@@ -4257,7 +3729,7 @@ onig_search_gpos(regex_t* reg, const UChar* str, const UChar* end,
ONIG_STATE_DEC_THREAD(reg);
/* If result is mismatch and no FIND_NOT_EMPTY option,
- then the region is not set in match_at(). */
+ then the region is not setted in match_at(). */
if (IS_FIND_NOT_EMPTY(reg->options) && region
#ifdef USE_POSIX_API_REGION_OPTION
&& !IS_POSIX_REGION(option)
diff --git a/regint.h b/regint.h
index 7d0a16d8f6..c2bf71da7e 100644
--- a/regint.h
+++ b/regint.h
@@ -1,11 +1,10 @@
#ifndef ONIGURUMA_REGINT_H
#define ONIGURUMA_REGINT_H
/**********************************************************************
- regint.h - Onigmo (Oniguruma-mod) (regular expression library)
+ regint.h - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2012 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,6 +48,7 @@
#endif
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+ (defined(__ppc__) && defined(__APPLE__)) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
defined(__mc68020__)
#define PLATFORM_UNALIGNED_WORD_ACCESS
@@ -58,15 +58,12 @@
/* spec. config */
#define USE_NAMED_GROUP
#define USE_SUBEXP_CALL
-#define USE_PERL_SUBEXP_CALL
-#define USE_CAPITAL_P_NAMED_GROUP
#define USE_BACKREF_WITH_LEVEL /* \k<name+n>, \k<name-n> */
#define USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT /* /(?:()|())*\2/ */
#define USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE /* /\n$/ =~ "\n" */
#define USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
/* #define USE_RECOMPILE_API */
/* !!! moved to regenc.h. */ /* #define USE_CRNL_AS_LINE_TERMINATOR */
-#define USE_NO_INVALID_QUANTIFIER
/* internal config */
#define USE_PARSE_TREE_NODE_RECYCLE
@@ -74,18 +71,10 @@
#define USE_QTFR_PEEK_NEXT
#define USE_ST_LIBRARY
#define USE_SHARED_CCLASS_TABLE
-#define USE_SUNDAY_QUICK_SEARCH
#define INIT_MATCH_STACK_SIZE 160
#define DEFAULT_MATCH_STACK_LIMIT_SIZE 0 /* unlimited */
-/* check config */
-#if defined(USE_PERL_SUBEXP_CALL) || defined(USE_CAPITAL_P_NAMED_GROUP)
-#if !defined(USE_NAMED_GROUP) || !defined(USE_SUBEXP_CALL)
-#error USE_NAMED_GROUP and USE_SUBEXP_CALL must be defined.
-#endif
-#endif
-
#if defined(__GNUC__)
# define ARG_UNUSED __attribute__ ((unused))
#else
@@ -104,14 +93,13 @@
#ifdef ONIG_ESCAPE_UCHAR_COLLISION
#undef ONIG_ESCAPE_UCHAR_COLLISION
#endif
-#define USE_WORD_BEGIN_END /* "\<": word-begin, "\>": word-end */
#undef USE_MATCH_RANGE_IS_COMPLETE_RANGE
#undef USE_CAPTURE_HISTORY
#define USE_VARIABLE_META_CHARS
-#define USE_POSIX_API_REGION_OPTION /* needed for POSIX API support */
+#define USE_WORD_BEGIN_END /* "\<": word-begin, "\>": word-end */
+#define USE_POSIX_REGION_OPTION /* needed for POSIX API support */
#define USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
/* #define USE_COMBINATION_EXPLOSION_CHECK */ /* (X*)* */
-
/* #define USE_MULTI_THREAD_SYSTEM */
#define THREAD_SYSTEM_INIT /* depend on thread system */
#define THREAD_SYSTEM_END /* depend on thread system */
@@ -231,41 +219,12 @@
#include <sys/types.h>
#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stddef.h>
-#endif
-
-#ifdef _WIN32
-#include <malloc.h> /* for alloca() */
-#endif
-
#ifdef ONIG_DEBUG
# include <stdio.h>
#endif
-#ifdef _WIN32
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-#ifndef _INTPTR_T_DEFINED
-#define _INTPTR_T_DEFINED
-typedef int intptr_t;
-#endif
-#ifndef _UINTPTR_T_DEFINED
-#define _UINTPTR_T_DEFINED
-typedef unsigned int uintptr_t;
-#endif
-#endif
-#endif /* _WIN32 */
-
#include "regenc.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
#ifdef MIN
#undef MIN
#endif
@@ -281,8 +240,6 @@ typedef unsigned int uintptr_t;
#define CHECK_NULL_RETURN_MEMERR(p) if (IS_NULL(p)) return ONIGERR_MEMORY
#define NULL_UCHARP ((UChar* )0)
-#define ONIG_LAST_CODE_POINT (~((OnigCodePoint )0))
-
#ifdef PLATFORM_UNALIGNED_WORD_ACCESS
#define PLATFORM_GET_INC(val,p,type) do{\
@@ -322,11 +279,9 @@ typedef unsigned int uintptr_t;
#define ONIG_OPTIMIZE_NONE 0
#define ONIG_OPTIMIZE_EXACT 1 /* Slow Search */
#define ONIG_OPTIMIZE_EXACT_BM 2 /* Boyer Moore Search */
-#define ONIG_OPTIMIZE_EXACT_BM_NOT_REV 3 /* BM (applied to a multibyte string) */
+#define ONIG_OPTIMIZE_EXACT_BM_NOT_REV 3 /* BM (but not simple match) */
#define ONIG_OPTIMIZE_EXACT_IC 4 /* Slow Search (ignore case) */
#define ONIG_OPTIMIZE_MAP 5 /* char map */
-#define ONIG_OPTIMIZE_EXACT_BM_IC 6 /* BM (ignore case) */
-#define ONIG_OPTIMIZE_EXACT_BM_NOT_REV_IC 7 /* BM (applied to a multibyte string) (ignore case) */
/* bit status */
typedef unsigned int BitStatusType;
@@ -369,10 +324,6 @@ typedef unsigned int BitStatusType;
#define IS_NOTBOL(option) ((option) & ONIG_OPTION_NOTBOL)
#define IS_NOTEOL(option) ((option) & ONIG_OPTION_NOTEOL)
#define IS_POSIX_REGION(option) ((option) & ONIG_OPTION_POSIX_REGION)
-#define IS_ASCII_RANGE(option) ((option) & ONIG_OPTION_ASCII_RANGE)
-#define IS_POSIX_BRACKET_ALL_RANGE(option) ((option) & ONIG_OPTION_POSIX_BRACKET_ALL_RANGE)
-#define IS_WORD_BOUND_ALL_RANGE(option) ((option) & ONIG_OPTION_WORD_BOUND_ALL_RANGE)
-#define IS_NEWLINE_CRLF(option) ((option) & ONIG_OPTION_NEWLINE_CRLF)
/* OP_SET_OPTION is required for these options.
#define IS_DYNAMIC_OPTION(option) \
@@ -390,7 +341,7 @@ typedef unsigned int BitStatusType;
/* bitset */
#define BITS_PER_BYTE 8
#define SINGLE_BYTE_SIZE (1 << BITS_PER_BYTE)
-#define BITS_IN_ROOM ((int )sizeof(Bits) * BITS_PER_BYTE)
+#define BITS_IN_ROOM (sizeof(Bits) * BITS_PER_BYTE)
#define BITSET_SIZE (SINGLE_BYTE_SIZE / BITS_IN_ROOM)
#ifdef PLATFORM_UNALIGNED_WORD_ACCESS
@@ -401,15 +352,15 @@ typedef unsigned char Bits;
typedef Bits BitSet[BITSET_SIZE];
typedef Bits* BitSetRef;
-#define SIZE_BITSET (int )sizeof(BitSet)
+#define SIZE_BITSET (int)sizeof(BitSet)
#define BITSET_CLEAR(bs) do {\
int i;\
- for (i = 0; i < BITSET_SIZE; i++) { (bs)[i] = 0; } \
+ for (i = 0; i < (int )BITSET_SIZE; i++) { (bs)[i] = 0; } \
} while (0)
-#define BS_ROOM(bs,pos) (bs)[(int )(pos) / BITS_IN_ROOM]
-#define BS_BIT(pos) (1 << ((int )(pos) % BITS_IN_ROOM))
+#define BS_ROOM(bs,pos) (bs)[pos / BITS_IN_ROOM]
+#define BS_BIT(pos) (1 << (pos % BITS_IN_ROOM))
#define BITSET_AT(bs, pos) (BS_ROOM(bs,pos) & BS_BIT(pos))
#define BITSET_SET_BIT(bs, pos) BS_ROOM(bs,pos) |= BS_BIT(pos)
@@ -448,7 +399,7 @@ typedef struct _BBuf {
} while (0)
#define BBUF_WRITE(buf,pos,bytes,n) do{\
- int used = (pos) + (int )(n);\
+ int used = (pos) + (n);\
if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\
xmemcpy((buf)->p + (pos), (bytes), (n));\
if ((buf)->used < (unsigned int )used) (buf)->used = used;\
@@ -457,7 +408,7 @@ typedef struct _BBuf {
#define BBUF_WRITE1(buf,pos,byte) do{\
int used = (pos) + 1;\
if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\
- (buf)->p[(pos)] = (UChar )(byte);\
+ (buf)->p[(pos)] = (byte);\
if ((buf)->used < (unsigned int )used) (buf)->used = used;\
} while (0)
@@ -516,8 +467,6 @@ typedef struct _BBuf {
#define ANCHOR_ANYCHAR_STAR (1<<14) /* ".*" optimize info */
#define ANCHOR_ANYCHAR_STAR_ML (1<<15) /* ".*" optimize info (multi-line) */
-#define ANCHOR_KEEP (1<<16)
-
/* operation code */
enum OpCode {
OP_FINISH = 0, /* matching process terminator (no more alternative) */
@@ -561,20 +510,12 @@ enum OpCode {
OP_WORD_BEGIN,
OP_WORD_END,
- OP_ASCII_WORD,
- OP_NOT_ASCII_WORD,
- OP_ASCII_WORD_BOUND,
- OP_NOT_ASCII_WORD_BOUND,
- OP_ASCII_WORD_BEGIN,
- OP_ASCII_WORD_END,
-
OP_BEGIN_BUF,
OP_END_BUF,
OP_BEGIN_LINE,
OP_END_LINE,
OP_SEMI_END_BUF,
OP_BEGIN_POSITION,
- OP_BEGIN_POS_OR_LINE, /* used for implicit anchor optimization */
OP_BACKREF1,
OP_BACKREF2,
@@ -591,8 +532,6 @@ enum OpCode {
OP_MEMORY_END,
OP_MEMORY_END_REC, /* push marker to stack */
- OP_KEEP,
-
OP_FAIL, /* pop stack and move */
OP_JUMP,
OP_PUSH,
@@ -623,8 +562,6 @@ enum OpCode {
OP_CALL, /* \g<name> */
OP_RETURN,
- OP_CONDITION,
-
OP_STATE_CHECK_PUSH, /* combination explosion check and push */
OP_STATE_CHECK_PUSH_OR_JUMP, /* check ok -> push, else jump */
OP_STATE_CHECK, /* check only */
@@ -645,15 +582,15 @@ typedef short int StateCheckNumType;
typedef void* PointerType;
#define SIZE_OPCODE 1
-#define SIZE_RELADDR (int )sizeof(RelAddrType)
-#define SIZE_ABSADDR (int )sizeof(AbsAddrType)
-#define SIZE_LENGTH (int )sizeof(LengthType)
-#define SIZE_MEMNUM (int )sizeof(MemNumType)
-#define SIZE_STATE_CHECK_NUM (int )sizeof(StateCheckNumType)
-#define SIZE_REPEATNUM (int )sizeof(RepeatNumType)
-#define SIZE_OPTION (int )sizeof(OnigOptionType)
-#define SIZE_CODE_POINT (int )sizeof(OnigCodePoint)
-#define SIZE_POINTER (int )sizeof(PointerType)
+#define SIZE_RELADDR (int)sizeof(RelAddrType)
+#define SIZE_ABSADDR (int)sizeof(AbsAddrType)
+#define SIZE_LENGTH (int)sizeof(LengthType)
+#define SIZE_MEMNUM (int)sizeof(MemNumType)
+#define SIZE_STATE_CHECK_NUM (int)sizeof(StateCheckNumType)
+#define SIZE_REPEATNUM (int)sizeof(RepeatNumType)
+#define SIZE_OPTION (int)sizeof(OnigOptionType)
+#define SIZE_CODE_POINT (int)sizeof(OnigCodePoint)
+#define SIZE_POINTER (int)sizeof(PointerType)
#define GET_RELADDR_INC(addr,p) PLATFORM_GET_INC(addr, p, RelAddrType)
@@ -705,7 +642,6 @@ typedef void* PointerType;
#define SIZE_OP_FAIL_LOOK_BEHIND_NOT SIZE_OPCODE
#define SIZE_OP_CALL (SIZE_OPCODE + SIZE_ABSADDR)
#define SIZE_OP_RETURN SIZE_OPCODE
-#define SIZE_OP_CONDITION (SIZE_OPCODE + SIZE_MEMNUM + SIZE_RELADDR)
#ifdef USE_COMBINATION_EXPLOSION_CHECK
#define SIZE_OP_STATE_CHECK (SIZE_OPCODE + SIZE_STATE_CHECK_NUM)
@@ -792,7 +728,6 @@ typedef struct _OnigStackType {
#ifdef USE_COMBINATION_EXPLOSION_CHECK
unsigned int state_check;
#endif
- UChar *pkeep; /* keep pattern position */
} state;
struct {
int count; /* for OP_REPEAT_INC, OP_REPEAT_INC_NG */
@@ -805,7 +740,7 @@ typedef struct _OnigStackType {
struct {
int num; /* memory num */
UChar *pstr; /* start/end position */
- /* Following information is set, if this stack type is MEM-START */
+ /* Following information is setted, if this stack type is MEM-START */
OnigStackIndex start; /* prev. info (for backtrack "(...)*" ) */
OnigStackIndex end; /* prev. info (for backtrack "(...)*" ) */
} mem;
@@ -828,10 +763,9 @@ typedef struct {
size_t stack_n;
OnigOptionType options;
OnigRegion* region;
- const UChar* start; /* search start position */
- const UChar* gpos; /* global position (for \G: BEGIN_POSITION) */
+ const UChar* start; /* search start position (for \G: BEGIN_POSITION) */
#ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
- OnigPosition best_len; /* for ONIG_OPTION_FIND_LONGEST */
+ int best_len; /* for ONIG_OPTION_FIND_LONGEST */
UChar* best_s;
#endif
#ifdef USE_COMBINATION_EXPLOSION_CHECK
@@ -848,7 +782,7 @@ typedef struct {
typedef struct {
short int opcode;
- const char* name;
+ char* name;
short int arg_type;
} OnigOpInfoType;
@@ -862,9 +796,9 @@ extern void onig_print_statistics P_((FILE* f));
#endif
#endif
-extern UChar* onig_error_code_to_format P_((OnigPosition code));
+extern UChar* onig_error_code_to_format P_((int code));
extern void onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));
-extern int onig_bbuf_init P_((BBuf* buf, OnigDistance size));
+extern int onig_bbuf_init P_((BBuf* buf, int size));
extern int onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo, const char *sourcefile, int sourceline));
extern void onig_chain_reduce P_((regex_t* reg));
extern void onig_chain_link_add P_((regex_t* to, regex_t* add));
@@ -878,8 +812,7 @@ typedef void hash_table_type;
#include "ruby/st.h"
typedef st_data_t hash_data_type;
#else
-#include "st.h"
-typedef uintptr_t hash_data_type;
+typedef unsigned long hash_data_type;
#endif
extern hash_table_type* onig_st_init_strend_table_with_size P_((st_index_t size));
@@ -905,11 +838,4 @@ typedef int (*ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE)(void);
extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));
-extern size_t onig_memsize P_((const regex_t *reg));
-extern size_t onig_region_memsize P_((const struct re_registers *regs));
-
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#endif /* ONIGURUMA_REGINT_H */
diff --git a/regparse.c b/regparse.c
index d5693d109e..bf40603ddd 100644
--- a/regparse.c
+++ b/regparse.c
@@ -1,9 +1,9 @@
+/* -*- mode:c; c-file-style:"gnu" -*- */
/**********************************************************************
- regparse.c - Onigmo (Oniguruma-mod) (regular expression library)
+ regparse.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2013 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,11 +50,7 @@ const OnigSyntaxType OnigSyntaxRuby = {
ONIG_SYN_OP2_PLUS_POSSESSIVE_REPEAT |
ONIG_SYN_OP2_CCLASS_SET_OP | ONIG_SYN_OP2_ESC_CAPITAL_C_BAR_CONTROL |
ONIG_SYN_OP2_ESC_CAPITAL_M_BAR_META | ONIG_SYN_OP2_ESC_V_VTAB |
- ONIG_SYN_OP2_ESC_H_XDIGIT |
- ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER |
- ONIG_SYN_OP2_QMARK_LPAREN_CONDITION |
- ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK |
- ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP )
+ ONIG_SYN_OP2_ESC_H_XDIGIT )
, ( SYN_GNU_REGEX_BV |
ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV |
ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND |
@@ -64,8 +60,7 @@ const OnigSyntaxType OnigSyntaxRuby = {
ONIG_SYN_WARN_CC_OP_NOT_ESCAPED |
ONIG_SYN_WARN_CC_DUP |
ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT )
- , ( ONIG_OPTION_ASCII_RANGE | ONIG_OPTION_POSIX_BRACKET_ALL_RANGE |
- ONIG_OPTION_WORD_BOUND_ALL_RANGE )
+ , ONIG_OPTION_NONE
,
{
(OnigCodePoint )'\\' /* esc */
@@ -138,7 +133,7 @@ bbuf_clone(BBuf** rto, BBuf* from)
(OnigCodePoint )(ONIGENC_MBC_MINLEN(enc) > 1 ? 0 : 0x80)
#define SET_ALL_MULTI_BYTE_RANGE(enc, pbuf) \
- add_code_range_to_buf(pbuf, env, MBCODE_START_POS(enc), ONIG_LAST_CODE_POINT)
+ add_code_range_to_buf(pbuf, env, MBCODE_START_POS(enc), ~((OnigCodePoint )0))
#define ADD_ALL_MULTI_BYTE_RANGE(enc, mbuf) do {\
if (! ONIGENC_IS_SINGLEBYTE(enc)) {\
@@ -156,7 +151,7 @@ bbuf_clone(BBuf** rto, BBuf* from)
#define BITSET_IS_EMPTY(bs,empty) do {\
int i;\
empty = 1;\
- for (i = 0; i < BITSET_SIZE; i++) {\
+ for (i = 0; i < (int )BITSET_SIZE; i++) {\
if ((bs)[i] != 0) {\
empty = 0; break;\
}\
@@ -185,35 +180,35 @@ static void
bitset_invert(BitSetRef bs)
{
int i;
- for (i = 0; i < BITSET_SIZE; i++) { bs[i] = ~(bs[i]); }
+ for (i = 0; i < (int )BITSET_SIZE; i++) { bs[i] = ~(bs[i]); }
}
static void
bitset_invert_to(BitSetRef from, BitSetRef to)
{
int i;
- for (i = 0; i < BITSET_SIZE; i++) { to[i] = ~(from[i]); }
+ for (i = 0; i < (int )BITSET_SIZE; i++) { to[i] = ~(from[i]); }
}
static void
bitset_and(BitSetRef dest, BitSetRef bs)
{
int i;
- for (i = 0; i < BITSET_SIZE; i++) { dest[i] &= bs[i]; }
+ for (i = 0; i < (int )BITSET_SIZE; i++) { dest[i] &= bs[i]; }
}
static void
bitset_or(BitSetRef dest, BitSetRef bs)
{
int i;
- for (i = 0; i < BITSET_SIZE; i++) { dest[i] |= bs[i]; }
+ for (i = 0; i < (int )BITSET_SIZE; i++) { dest[i] |= bs[i]; }
}
static void
bitset_copy(BitSetRef dest, BitSetRef bs)
{
int i;
- for (i = 0; i < BITSET_SIZE; i++) { dest[i] = bs[i]; }
+ for (i = 0; i < (int )BITSET_SIZE; i++) { dest[i] = bs[i]; }
}
extern int
@@ -263,12 +258,7 @@ strdup_with_null(OnigEncoding enc, UChar* s, UChar* end)
/* scan pattern methods */
#define PEND_VALUE 0
-#ifdef __GNUC__
-/* get rid of Wunused-but-set-variable and Wuninitialized */
-#define PFETCH_READY UChar* pfetch_prev = NULL; (void)pfetch_prev
-#else
#define PFETCH_READY UChar* pfetch_prev
-#endif
#define PEND (p < end ? 0 : 1)
#define PUNFETCH p = pfetch_prev
#define PINC do { \
@@ -286,7 +276,7 @@ strdup_with_null(OnigEncoding enc, UChar* s, UChar* end)
static UChar*
strcat_capa(UChar* dest, UChar* dest_end, const UChar* src, const UChar* src_end,
- size_t capa)
+ int capa)
{
UChar* r;
@@ -303,7 +293,7 @@ strcat_capa(UChar* dest, UChar* dest_end, const UChar* src, const UChar* src_end
/* dest on static area */
static UChar*
strcat_capa_from_static(UChar* dest, UChar* dest_end,
- const UChar* src, const UChar* src_end, size_t capa)
+ const UChar* src, const UChar* src_end, int capa)
{
UChar* r;
@@ -425,6 +415,9 @@ typedef struct {
typedef st_table NameTable;
typedef st_data_t HashDataType; /* 1.6 st.h doesn't define st_data_t type */
+#define NAMEBUF_SIZE 24
+#define NAMEBUF_SIZE_1 25
+
#ifdef ONIG_DEBUG
static int
i_print_name_entry(UChar* key, NameEntry* e, void* arg)
@@ -586,7 +579,7 @@ onig_number_of_names(regex_t* reg)
NameTable* t = (NameTable* )reg->name_table;
if (IS_NOT_NULL(t))
- return (int )t->num_entries;
+ return t->num_entries;
else
return 0;
}
@@ -679,7 +672,7 @@ onig_names_free(regex_t* reg)
}
static NameEntry*
-name_find(regex_t* reg, const UChar* name, const UChar* name_end)
+name_find(regex_t* reg, UChar* name, UChar* name_end)
{
int i, len;
NameEntry* e;
@@ -783,12 +776,10 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
}
else if (t->num == t->alloc) {
int i;
- NameEntry* p;
alloc = t->alloc * 2;
- p = (NameEntry* )xrealloc(t->e, sizeof(NameEntry) * alloc);
- CHECK_NULL_RETURN_MEMERR(p);
- t->e = p;
+ t->e = (NameEntry* )xrealloc(t->e, sizeof(NameEntry) * alloc);
+ CHECK_NULL_RETURN_MEMERR(t->e);
t->alloc = alloc;
clear:
@@ -830,11 +821,9 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
}
else {
if (e->back_num > e->back_alloc) {
- int* p;
alloc = e->back_alloc * 2;
- p = (int* )xrealloc(e->back_refs, sizeof(int) * alloc);
- CHECK_NULL_RETURN_MEMERR(p);
- e->back_refs = p;
+ e->back_refs = (int* )xrealloc(e->back_refs, sizeof(int) * alloc);
+ CHECK_NULL_RETURN_MEMERR(e->back_refs);
e->back_alloc = alloc;
}
e->back_refs[e->back_num - 1] = backref;
@@ -978,8 +967,6 @@ scan_env_add_mem_entry(ScanEnv* env)
Node** p;
need = env->num_mem + 1;
- if (need > ONIG_MAX_CAPTURE_GROUP_NUM)
- return ONIGERR_TOO_MANY_CAPTURE_GROUPS;
if (need >= SCANENV_MEMNODES_SIZE) {
if (env->mem_alloc <= need) {
if (IS_NULL(env->mem_nodes_dynamic)) {
@@ -1217,7 +1204,7 @@ node_new_cclass_by_codepoint_range(int not, OnigCodePoint sb_out,
}
static Node*
-node_new_ctype(int type, int not, int ascii_range)
+node_new_ctype(int type, int not)
{
Node* node = node_new();
CHECK_NULL_RETURN(node);
@@ -1225,7 +1212,6 @@ node_new_ctype(int type, int not, int ascii_range)
SET_NTYPE(node, NT_CTYPE);
NCTYPE(node)->ctype = type;
NCTYPE(node)->not = not;
- NCTYPE(node)->ascii_range = ascii_range;
return node;
}
@@ -1297,7 +1283,6 @@ onig_node_new_anchor(int type)
NANCHOR(node)->type = type;
NANCHOR(node)->target = NULL;
NANCHOR(node)->char_len = -1;
- NANCHOR(node)->ascii_range = 0;
return node;
}
@@ -1465,7 +1450,7 @@ onig_node_str_cat(Node* node, const UChar* s, const UChar* end)
CHECK_NULL_RETURN_MEMERR(p);
NSTR(node)->s = p;
- NSTR(node)->capa = (int )capa;
+ NSTR(node)->capa = capa;
}
}
else {
@@ -1493,15 +1478,6 @@ node_str_cat_char(Node* node, UChar c)
return onig_node_str_cat(node, s, s + 1);
}
-static int
-node_str_cat_codepoint(Node* node, OnigEncoding enc, OnigCodePoint c)
-{
- UChar buf[ONIGENC_CODE_TO_MBC_MAXLEN];
- int num = ONIGENC_CODE_TO_MBC(enc, c, buf);
- if (num < 0) return num;
- return onig_node_str_cat(node, buf, buf + num);
-}
-
extern void
onig_node_conv_to_str_node(Node* node, int flag)
{
@@ -1554,8 +1530,7 @@ static Node*
node_new_str_raw(UChar* s, UChar* end)
{
Node* node = node_new_str(s, end);
- if (IS_NOT_NULL(node))
- NSTRING_SET_RAW(node);
+ NSTRING_SET_RAW(node);
return node;
}
@@ -1582,9 +1557,9 @@ str_node_split_last_char(StrNode* sn, OnigEncoding enc)
if (sn->end > sn->s) {
p = onigenc_get_prev_char_head(enc, sn->s, sn->end, sn->end);
- if (p && p > sn->s) { /* can be split. */
+ if (p && p > sn->s) { /* can be splitted. */
n = node_new_str(p, sn->end);
- if (IS_NOT_NULL(n) && (sn->flag & NSTR_RAW) != 0)
+ if ((sn->flag & NSTR_RAW) != 0)
NSTRING_SET_RAW(n);
sn->end = (UChar* )p;
}
@@ -1647,16 +1622,14 @@ onig_scan_unsigned_number(UChar** src, const UChar* end, OnigEncoding enc)
}
static int
-scan_unsigned_hexadecimal_number(UChar** src, UChar* end, int minlen,
- int maxlen, OnigEncoding enc)
+scan_unsigned_hexadecimal_number(UChar** src, UChar* end, int maxlen,
+ OnigEncoding enc)
{
OnigCodePoint c;
unsigned int num, val;
- int restlen;
UChar* p = *src;
PFETCH_READY;
- restlen = maxlen - minlen;
num = 0;
while (!PEND && maxlen-- != 0) {
PFETCH(c);
@@ -1672,8 +1645,6 @@ scan_unsigned_hexadecimal_number(UChar** src, UChar* end, int minlen,
break;
}
}
- if (maxlen > restlen)
- return -2; /* not enough digits */
*src = p;
return num;
}
@@ -1737,7 +1708,7 @@ add_code_range_to_buf0(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePo
int checkdup)
{
int r, inc_n, pos;
- OnigCodePoint low, high, bound, x;
+ int low, high, bound, x;
OnigCodePoint n, *data;
BBuf* bbuf;
@@ -1758,50 +1729,41 @@ add_code_range_to_buf0(BBuf** pbuf, ScanEnv* env, OnigCodePoint from, OnigCodePo
data = (OnigCodePoint* )(bbuf->p);
data++;
- bound = (from == 0) ? 0 : n;
- for (low = 0; low < bound; ) {
+ for (low = 0, bound = n; low < bound; ) {
x = (low + bound) >> 1;
- if (from - 1 > data[x*2 + 1])
+ if (from > data[x*2 + 1])
low = x + 1;
else
bound = x;
}
- high = (to == ONIG_LAST_CODE_POINT) ? n : low;
- for (bound = n; high < bound; ) {
+ for (high = low, bound = n; high < bound; ) {
x = (high + bound) >> 1;
- if (to + 1 >= data[x*2])
+ if (to >= data[x*2] - 1)
high = x + 1;
else
bound = x;
}
- /* data[(low-1)*2+1] << from <= data[low*2]
- * data[(high-1)*2+1] <= to << data[high*2]
- */
inc_n = low + 1 - high;
if (n + inc_n > ONIG_MAX_MULTI_BYTE_RANGES_NUM)
return ONIGERR_TOO_MANY_MULTI_BYTE_RANGES;
if (inc_n != 1) {
- if (checkdup && from <= data[low*2+1]
- && (data[low*2] <= from || data[low*2+1] <= to))
- CC_DUP_WARN(env);
+ if (checkdup && to >= data[low*2]) CC_DUP_WARN(env);
if (from > data[low*2])
from = data[low*2];
if (to < data[(high - 1)*2 + 1])
to = data[(high - 1)*2 + 1];
}
- if (inc_n != 0) {
+ if (inc_n != 0 && (OnigCodePoint )high < n) {
int from_pos = SIZE_CODE_POINT * (1 + high * 2);
int to_pos = SIZE_CODE_POINT * (1 + (low + 1) * 2);
+ int size = (n - high) * 2 * SIZE_CODE_POINT;
if (inc_n > 0) {
- if (high < n) {
- int size = (n - high) * 2 * SIZE_CODE_POINT;
- BBUF_MOVE_RIGHT(bbuf, from_pos, to_pos, size);
- }
+ BBUF_MOVE_RIGHT(bbuf, from_pos, to_pos, size);
}
else {
BBUF_MOVE_LEFT_REDUCE(bbuf, from_pos, to_pos);
@@ -1869,11 +1831,11 @@ not_code_range_buf(OnigEncoding enc, BBuf* bbuf, BBuf** pbuf, ScanEnv* env)
r = add_code_range_to_buf(pbuf, env, pre, from - 1);
if (r != 0) return r;
}
- if (to == ONIG_LAST_CODE_POINT) break;
+ if (to == ~((OnigCodePoint )0)) break;
pre = to + 1;
}
- if (to < ONIG_LAST_CODE_POINT) {
- r = add_code_range_to_buf(pbuf, env, to + 1, ONIG_LAST_CODE_POINT);
+ if (to < ~((OnigCodePoint )0)) {
+ r = add_code_range_to_buf(pbuf, env, to + 1, ~((OnigCodePoint )0));
}
return r;
}
@@ -2086,8 +2048,8 @@ and_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env)
}
}
if (r != 0) {
- bbuf_free(pbuf);
- return r;
+ bbuf_free(pbuf);
+ return r;
}
dest->mbuf = pbuf;
@@ -2144,8 +2106,8 @@ or_cclass(CClassNode* dest, CClassNode* cc, ScanEnv* env)
}
}
if (r != 0) {
- bbuf_free(pbuf);
- return r;
+ bbuf_free(pbuf);
+ return r;
}
dest->mbuf = pbuf;
@@ -2184,9 +2146,7 @@ conv_backslash_value(int c, ScanEnv* env)
return c;
}
-#ifdef USE_NO_INVALID_QUANTIFIER
-#define is_invalid_quantifier_target(node) 0
-#else
+#if 0 /* no invalid quantifier */
static int
is_invalid_quantifier_target(Node* node)
{
@@ -2218,6 +2178,8 @@ is_invalid_quantifier_target(Node* node)
}
return 0;
}
+#else
+#define is_invalid_quantifier_target(node) 0
#endif
/* ?:0, *:1, +:2, ??:3, *?:4, +?:5 */
@@ -2277,7 +2239,7 @@ onig_reduce_nested_quantifier(Node* pnode, Node* cnode)
cnum = popular_quantifier_num(c);
if (pnum < 0 || cnum < 0) return ;
- switch (ReduceTypeTable[cnum][pnum]) {
+ switch(ReduceTypeTable[cnum][pnum]) {
case RQ_DEL:
*pnode = *cnode;
break;
@@ -2336,9 +2298,6 @@ enum TokenSyms {
TK_CC_OPEN,
TK_QUOTE_OPEN,
TK_CHAR_PROPERTY, /* \p{...}, \P{...} */
- TK_LINEBREAK,
- TK_EXTENDED_GRAPHEME_CLUSTER,
- TK_KEEP,
/* in cc */
TK_CC_CLOSE,
TK_CC_RANGE,
@@ -2356,10 +2315,8 @@ typedef struct {
UChar* s;
int c;
OnigCodePoint code;
- struct {
- int subtype;
- int ascii_range;
- } anchor;
+ int anchor;
+ int subtype;
struct {
int lower;
int upper;
@@ -2380,7 +2337,6 @@ typedef struct {
UChar* name;
UChar* name_end;
int gnum;
- int rel;
} call;
struct {
int ctype;
@@ -2562,8 +2518,6 @@ get_name_end_code_point(OnigCodePoint start)
switch (start) {
case '<': return (OnigCodePoint )'>'; break;
case '\'': return (OnigCodePoint )'\''; break;
- case '(': return (OnigCodePoint )')'; break;
- case '{': return (OnigCodePoint )'}'; break;
default:
break;
}
@@ -2626,7 +2580,7 @@ fetch_name_with_level(OnigCodePoint start_code, UChar** src, UChar* end,
name_end = p;
PFETCH(c);
if (c == end_code || c == ')' || c == '+' || c == '-') {
- if (is_num == 2) r = ONIGERR_INVALID_GROUP_NAME;
+ if (is_num == 2) r = ONIGERR_INVALID_GROUP_NAME;
break;
}
@@ -2689,7 +2643,7 @@ fetch_name_with_level(OnigCodePoint start_code, UChar** src, UChar* end,
#endif /* USE_BACKREF_WITH_LEVEL */
/*
- ref: 0 -> define name (don't allow number name)
+ def: 0 -> define name (don't allow number name)
1 -> reference name (allow number name)
*/
static int
@@ -2751,7 +2705,7 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
name_end = p;
PFETCH(c);
if (c == end_code || c == ')') {
- if (is_num == 2) r = ONIGERR_INVALID_GROUP_NAME;
+ if (is_num == 2) r = ONIGERR_INVALID_GROUP_NAME;
break;
}
@@ -2924,8 +2878,8 @@ CLOSE_BRACKET_WITHOUT_ESC_WARN(ScanEnv* env, UChar* c)
{
if (onig_warn == onig_null_warn) return ;
- if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED)) {
- onig_syntax_warn(env, "regular expression has '%s' without escape", c);
+ if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED)) {
+ onig_syntax_warn(env, "regular expression has '%s' without escape", c);
}
}
@@ -2934,9 +2888,9 @@ CC_DUP_WARN(ScanEnv *env)
{
if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ;
- if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_CC_DUP) &&
- !(env->warnings_flag & ONIG_SYN_WARN_CC_DUP)) {
- env->warnings_flag |= ONIG_SYN_WARN_CC_DUP;
+ if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_DUP) &&
+ !((env)->warnings_flag & ONIG_SYN_WARN_CC_DUP)) {
+ (env)->warnings_flag |= ONIG_SYN_WARN_CC_DUP;
onig_syntax_warn(env, "character class has duplicated range");
}
}
@@ -3055,32 +3009,32 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
switch (c) {
case 'w':
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_WORD;
+ tok->u.prop.ctype = ONIGENC_CTYPE_W;
tok->u.prop.not = 0;
break;
case 'W':
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_WORD;
+ tok->u.prop.ctype = ONIGENC_CTYPE_W;
tok->u.prop.not = 1;
break;
case 'd':
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_DIGIT;
+ tok->u.prop.ctype = ONIGENC_CTYPE_D;
tok->u.prop.not = 0;
break;
case 'D':
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_DIGIT;
+ tok->u.prop.ctype = ONIGENC_CTYPE_D;
tok->u.prop.not = 1;
break;
case 's':
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_SPACE;
+ tok->u.prop.ctype = ONIGENC_CTYPE_S;
tok->u.prop.not = 0;
break;
case 'S':
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_SPACE;
+ tok->u.prop.ctype = ONIGENC_CTYPE_S;
tok->u.prop.not = 1;
break;
case 'h':
@@ -3115,7 +3069,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
}
}
else {
- onig_syntax_warn(env, "invalid Unicode Property \\%c", c);
+ onig_syntax_warn(env, "invalid Unicode Property \\%c", c);
}
break;
@@ -3125,7 +3079,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
prev = p;
if (PPEEK_IS('{') && IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_X_BRACE_HEX8)) {
PINC;
- num = scan_unsigned_hexadecimal_number(&p, end, 0, 8, enc);
+ num = scan_unsigned_hexadecimal_number(&p, end, 8, enc);
if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
if (!PEND) {
c2 = PPEEK;
@@ -3145,7 +3099,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
}
}
else if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_X_HEX2)) {
- num = scan_unsigned_hexadecimal_number(&p, end, 0, 2, enc);
+ num = scan_unsigned_hexadecimal_number(&p, end, 2, enc);
if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
if (p == prev) { /* can't read nothing. */
num = 0; /* but, it's not error */
@@ -3161,9 +3115,8 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
prev = p;
if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_U_HEX4)) {
- num = scan_unsigned_hexadecimal_number(&p, end, 4, 4, enc);
- if (num < -1) return ONIGERR_TOO_SHORT_DIGITS;
- else if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
+ num = scan_unsigned_hexadecimal_number(&p, end, 4, enc);
+ if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
if (p == prev) { /* can't read nothing. */
num = 0; /* but, it's not error */
}
@@ -3203,7 +3156,7 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
else if (c == '[') {
if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_POSIX_BRACKET) && (PPEEK_IS(':'))) {
OnigCodePoint send[] = { (OnigCodePoint )':', (OnigCodePoint )']' };
- tok->backp = p; /* point at '[' is read */
+ tok->backp = p; /* point at '[' is readed */
PINC;
if (str_exist_check_with_esc(send, 2, p, end,
(OnigCodePoint )']', enc, syn)) {
@@ -3237,81 +3190,6 @@ fetch_token_in_cc(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
return tok->type;
}
-#ifdef USE_NAMED_GROUP
-static int
-fetch_named_backref_token(OnigCodePoint c, OnigToken* tok, UChar** src,
- UChar* end, ScanEnv* env)
-{
- int r, num;
- const OnigSyntaxType* syn = env->syntax;
- UChar* prev;
- UChar* p = *src;
- UChar* name_end;
- int* backs;
- int back_num;
-
- prev = p;
-
-#ifdef USE_BACKREF_WITH_LEVEL
- name_end = NULL_UCHARP; /* no need. escape gcc warning. */
- r = fetch_name_with_level(c, &p, end, &name_end,
- env, &back_num, &tok->u.backref.level);
- if (r == 1) tok->u.backref.exist_level = 1;
- else tok->u.backref.exist_level = 0;
-#else
- r = fetch_name(&p, end, &name_end, env, &back_num, 1);
-#endif
- if (r < 0) return r;
-
- if (back_num != 0) {
- if (back_num < 0) {
- back_num = BACKREF_REL_TO_ABS(back_num, env);
- if (back_num <= 0)
- return ONIGERR_INVALID_BACKREF;
- }
-
- if (IS_SYNTAX_BV(syn, ONIG_SYN_STRICT_CHECK_BACKREF)) {
- if (back_num > env->num_mem ||
- IS_NULL(SCANENV_MEM_NODES(env)[back_num]))
- return ONIGERR_INVALID_BACKREF;
- }
- tok->type = TK_BACKREF;
- tok->u.backref.by_name = 0;
- tok->u.backref.num = 1;
- tok->u.backref.ref1 = back_num;
- }
- else {
- num = onig_name_to_group_numbers(env->reg, prev, name_end, &backs);
- if (num <= 0) {
- onig_scan_env_set_error_string(env,
- ONIGERR_UNDEFINED_NAME_REFERENCE, prev, name_end);
- return ONIGERR_UNDEFINED_NAME_REFERENCE;
- }
- if (IS_SYNTAX_BV(syn, ONIG_SYN_STRICT_CHECK_BACKREF)) {
- int i;
- for (i = 0; i < num; i++) {
- if (backs[i] > env->num_mem ||
- IS_NULL(SCANENV_MEM_NODES(env)[backs[i]]))
- return ONIGERR_INVALID_BACKREF;
- }
- }
-
- tok->type = TK_BACKREF;
- tok->u.backref.by_name = 1;
- if (num == 1) {
- tok->u.backref.num = 1;
- tok->u.backref.ref1 = backs[0];
- }
- else {
- tok->u.backref.num = num;
- tok->u.backref.refs = backs;
- }
- }
- *src = p;
- return 0;
-}
-#endif
-
static int
fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
{
@@ -3421,74 +3299,68 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
case 'w':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_W_WORD)) break;
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_WORD;
+ tok->u.prop.ctype = ONIGENC_CTYPE_W;
tok->u.prop.not = 0;
break;
case 'W':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_W_WORD)) break;
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_WORD;
+ tok->u.prop.ctype = ONIGENC_CTYPE_W;
tok->u.prop.not = 1;
break;
case 'b':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_B_WORD_BOUND)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_WORD_BOUND;
- tok->u.anchor.ascii_range = IS_ASCII_RANGE(env->option)
- && ! IS_WORD_BOUND_ALL_RANGE(env->option);
+ tok->u.anchor = ANCHOR_WORD_BOUND;
break;
case 'B':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_B_WORD_BOUND)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_NOT_WORD_BOUND;
- tok->u.anchor.ascii_range = IS_ASCII_RANGE(env->option)
- && ! IS_WORD_BOUND_ALL_RANGE(env->option);
+ tok->u.anchor = ANCHOR_NOT_WORD_BOUND;
break;
#ifdef USE_WORD_BEGIN_END
case '<':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_WORD_BEGIN;
- tok->u.anchor.ascii_range = IS_ASCII_RANGE(env->option);
+ tok->u.anchor = ANCHOR_WORD_BEGIN;
break;
case '>':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_WORD_END;
- tok->u.anchor.ascii_range = IS_ASCII_RANGE(env->option);
+ tok->u.anchor = ANCHOR_WORD_END;
break;
#endif
case 's':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_S_WHITE_SPACE)) break;
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_SPACE;
+ tok->u.prop.ctype = ONIGENC_CTYPE_S;
tok->u.prop.not = 0;
break;
case 'S':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_S_WHITE_SPACE)) break;
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_SPACE;
+ tok->u.prop.ctype = ONIGENC_CTYPE_S;
tok->u.prop.not = 1;
break;
case 'd':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_D_DIGIT)) break;
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_DIGIT;
+ tok->u.prop.ctype = ONIGENC_CTYPE_D;
tok->u.prop.not = 0;
break;
case 'D':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_D_DIGIT)) break;
tok->type = TK_CHAR_TYPE;
- tok->u.prop.ctype = ONIGENC_CTYPE_DIGIT;
+ tok->u.prop.ctype = ONIGENC_CTYPE_D;
tok->u.prop.not = 1;
break;
@@ -3510,26 +3382,26 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR)) break;
begin_buf:
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_BEGIN_BUF;
+ tok->u.subtype = ANCHOR_BEGIN_BUF;
break;
case 'Z':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_SEMI_END_BUF;
+ tok->u.subtype = ANCHOR_SEMI_END_BUF;
break;
case 'z':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR)) break;
end_buf:
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_END_BUF;
+ tok->u.subtype = ANCHOR_END_BUF;
break;
case 'G':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_CAPITAL_G_BEGIN_ANCHOR)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = ANCHOR_BEGIN_POSITION;
+ tok->u.subtype = ANCHOR_BEGIN_POSITION;
break;
case '`':
@@ -3548,7 +3420,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
prev = p;
if (PPEEK_IS('{') && IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_X_BRACE_HEX8)) {
PINC;
- num = scan_unsigned_hexadecimal_number(&p, end, 0, 8, enc);
+ num = scan_unsigned_hexadecimal_number(&p, end, 8, enc);
if (num < 0) return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
if (!PEND) {
if (ONIGENC_IS_CODE_XDIGIT(enc, PPEEK))
@@ -3566,7 +3438,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
}
}
else if (IS_SYNTAX_OP(syn, ONIG_SYN_OP_ESC_X_HEX2)) {
- num = scan_unsigned_hexadecimal_number(&p, end, 0, 2, enc);
+ num = scan_unsigned_hexadecimal_number(&p, end, 2, enc);
if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
if (p == prev) { /* can't read nothing. */
num = 0; /* but, it's not error */
@@ -3582,9 +3454,8 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
prev = p;
if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_U_HEX4)) {
- num = scan_unsigned_hexadecimal_number(&p, end, 4, 4, enc);
- if (num < -1) return ONIGERR_TOO_SHORT_DIGITS;
- else if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
+ num = scan_unsigned_hexadecimal_number(&p, end, 4, enc);
+ if (num < 0) return ONIGERR_TOO_BIG_NUMBER;
if (p == prev) { /* can't read nothing. */
num = 0; /* but, it's not error */
}
@@ -3651,69 +3522,98 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_K_NAMED_BACKREF)) {
PFETCH(c);
if (c == '<' || c == '\'') {
- r = fetch_named_backref_token(c, tok, &p, end, env);
+ UChar* name_end;
+ int* backs;
+ int back_num;
+
+ prev = p;
+
+#ifdef USE_BACKREF_WITH_LEVEL
+ name_end = NULL_UCHARP; /* no need. escape gcc warning. */
+ r = fetch_name_with_level((OnigCodePoint )c, &p, end, &name_end,
+ env, &back_num, &tok->u.backref.level);
+ if (r == 1) tok->u.backref.exist_level = 1;
+ else tok->u.backref.exist_level = 0;
+#else
+ r = fetch_name(&p, end, &name_end, env, &back_num, 1);
+#endif
if (r < 0) return r;
+
+ if (back_num != 0) {
+ if (back_num < 0) {
+ back_num = BACKREF_REL_TO_ABS(back_num, env);
+ if (back_num <= 0)
+ return ONIGERR_INVALID_BACKREF;
+ }
+
+ if (IS_SYNTAX_BV(syn, ONIG_SYN_STRICT_CHECK_BACKREF)) {
+ if (back_num > env->num_mem ||
+ IS_NULL(SCANENV_MEM_NODES(env)[back_num]))
+ return ONIGERR_INVALID_BACKREF;
+ }
+ tok->type = TK_BACKREF;
+ tok->u.backref.by_name = 0;
+ tok->u.backref.num = 1;
+ tok->u.backref.ref1 = back_num;
+ }
+ else {
+ num = onig_name_to_group_numbers(env->reg, prev, name_end, &backs);
+ if (num <= 0) {
+ onig_scan_env_set_error_string(env,
+ ONIGERR_UNDEFINED_NAME_REFERENCE, prev, name_end);
+ return ONIGERR_UNDEFINED_NAME_REFERENCE;
+ }
+ if (IS_SYNTAX_BV(syn, ONIG_SYN_STRICT_CHECK_BACKREF)) {
+ int i;
+ for (i = 0; i < num; i++) {
+ if (backs[i] > env->num_mem ||
+ IS_NULL(SCANENV_MEM_NODES(env)[backs[i]]))
+ return ONIGERR_INVALID_BACKREF;
+ }
+ }
+
+ tok->type = TK_BACKREF;
+ tok->u.backref.by_name = 1;
+ if (num == 1) {
+ tok->u.backref.num = 1;
+ tok->u.backref.ref1 = backs[0];
+ }
+ else {
+ tok->u.backref.num = num;
+ tok->u.backref.refs = backs;
+ }
+ }
}
else {
- PUNFETCH;
- onig_syntax_warn(env, "invalid back reference");
+ PUNFETCH;
+ onig_syntax_warn(env, "invalid back reference");
}
}
break;
#endif
-#if defined(USE_SUBEXP_CALL) || defined(USE_NAMED_GROUP)
- case 'g':
-#ifdef USE_NAMED_GROUP
- if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_G_BRACE_BACKREF)) {
- PFETCH(c);
- if (c == '{') {
- r = fetch_named_backref_token(c, tok, &p, end, env);
- if (r < 0) return r;
- }
- else
- PUNFETCH;
- }
-#endif
#ifdef USE_SUBEXP_CALL
+ case 'g':
if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_G_SUBEXP_CALL)) {
PFETCH(c);
if (c == '<' || c == '\'') {
- int gnum = -1, rel = 0;
+ int gnum;
UChar* name_end;
- OnigCodePoint cnext;
-
- cnext = PPEEK;
- if (cnext == '0') {
- PINC;
- if (PPEEK_IS(get_name_end_code_point(c))) { /* \g<0>, \g'0' */
- PINC;
- name_end = p;
- gnum = 0;
- }
- }
- else if (cnext == '+') {
- PINC;
- rel = 1;
- }
+
prev = p;
- if (gnum < 0) {
- r = fetch_name((OnigCodePoint )c, &p, end, &name_end, env, &gnum, 1);
- if (r < 0) return r;
- }
+ r = fetch_name((OnigCodePoint )c, &p, end, &name_end, env, &gnum, 1);
+ if (r < 0) return r;
tok->type = TK_CALL;
tok->u.call.name = prev;
tok->u.call.name_end = name_end;
tok->u.call.gnum = gnum;
- tok->u.call.rel = rel;
}
else {
- onig_syntax_warn(env, "invalid subexp call");
- PUNFETCH;
+ onig_syntax_warn(env, "invalid subexp call");
+ PUNFETCH;
}
}
-#endif
break;
#endif
@@ -3741,25 +3641,7 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
}
}
else {
- onig_syntax_warn(env, "invalid Unicode Property \\%c", c);
- }
- break;
-
- case 'R':
- if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK)) {
- tok->type = TK_LINEBREAK;
- }
- break;
-
- case 'X':
- if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER)) {
- tok->type = TK_EXTENDED_GRAPHEME_CLUSTER;
- }
- break;
-
- case 'K':
- if (IS_SYNTAX_OP2(syn, ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP)) {
- tok->type = TK_KEEP;
+ onig_syntax_warn(env, "invalid Unicode Property \\%c", c);
}
break;
@@ -3879,97 +3761,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
}
goto start;
}
-#ifdef USE_PERL_SUBEXP_CALL
- /* (?&name), (?n), (?R), (?0), (?+n), (?-n) */
- c = PPEEK;
- if ((c == '&' || c == 'R' || ONIGENC_IS_CODE_DIGIT(enc, c)) &&
- IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_SUBEXP_CALL)) {
- /* (?&name), (?n), (?R), (?0) */
- int gnum;
- UChar *name;
- UChar *name_end;
-
- if (c == 'R' || c == '0') {
- PINC; /* skip 'R' / '0' */
- if (!PPEEK_IS(')')) return ONIGERR_INVALID_GROUP_NAME;
- PINC; /* skip ')' */
- name_end = name = p;
- gnum = 0;
- }
- else {
- int numref = 1;
- if (c == '&') { /* (?&name) */
- PINC;
- numref = 0; /* don't allow number name */
- }
- name = p;
- r = fetch_name((OnigCodePoint )'(', &p, end, &name_end, env, &gnum, numref);
- if (r < 0) return r;
- }
-
- tok->type = TK_CALL;
- tok->u.call.name = name;
- tok->u.call.name_end = name_end;
- tok->u.call.gnum = gnum;
- tok->u.call.rel = 0;
- break;
- }
- else if ((c == '-' || c == '+') &&
- IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_SUBEXP_CALL)) {
- /* (?+n), (?-n) */
- int gnum;
- UChar *name;
- UChar *name_end;
- OnigCodePoint cnext;
- PFETCH_READY;
-
- PINC; /* skip '-' / '+' */
- cnext = PPEEK;
- if (ONIGENC_IS_CODE_DIGIT(enc, cnext)) {
- if (c == '-') PUNFETCH;
- name = p;
- r = fetch_name((OnigCodePoint )'(', &p, end, &name_end, env, &gnum, 1);
- if (r < 0) return r;
-
- tok->type = TK_CALL;
- tok->u.call.name = name;
- tok->u.call.name_end = name_end;
- tok->u.call.gnum = gnum;
- tok->u.call.rel = 1;
- break;
- }
- }
-#endif /* USE_PERL_SUBEXP_CALL */
-#ifdef USE_CAPITAL_P_NAMED_GROUP
- if (PPEEK_IS('P') &&
- IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP)) {
- int gnum;
- UChar *name;
- UChar *name_end;
- PFETCH_READY;
-
- PINC; /* skip 'P' */
- PFETCH(c);
- if (c == '=') { /* (?P=name): backref */
- r = fetch_named_backref_token((OnigCodePoint )'(', tok, &p, end, env);
- if (r < 0) return r;
- break;
- }
- else if (c == '>') { /* (?P>name): subexp call */
- name = p;
- r = fetch_name((OnigCodePoint )'(', &p, end, &name_end, env, &gnum, 0);
- if (r < 0) return r;
-
- tok->type = TK_CALL;
- tok->u.call.name = name;
- tok->u.call.name_end = name_end;
- tok->u.call.gnum = gnum;
- tok->u.call.rel = 0;
- break;
- }
- PUNFETCH;
- }
-#endif /* USE_CAPITAL_P_NAMED_GROUP */
PUNFETCH;
}
@@ -3985,15 +3776,15 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
case '^':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_LINE_ANCHOR)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = (IS_SINGLELINE(env->option)
- ? ANCHOR_BEGIN_BUF : ANCHOR_BEGIN_LINE);
+ tok->u.subtype = (IS_SINGLELINE(env->option)
+ ? ANCHOR_BEGIN_BUF : ANCHOR_BEGIN_LINE);
break;
case '$':
if (! IS_SYNTAX_OP(syn, ONIG_SYN_OP_LINE_ANCHOR)) break;
tok->type = TK_ANCHOR;
- tok->u.anchor.subtype = (IS_SINGLELINE(env->option)
- ? ANCHOR_SEMI_END_BUF : ANCHOR_END_LINE);
+ tok->u.subtype = (IS_SINGLELINE(env->option)
+ ? ANCHOR_SEMI_END_BUF : ANCHOR_END_LINE);
break;
case '[':
@@ -4110,56 +3901,43 @@ add_ctype_to_cc_by_range(CClassNode* cc, int ctype ARG_UNUSED, int not,
}
static int
-add_ctype_to_cc(CClassNode* cc, int ctype, int not, int char_prop, ScanEnv* env)
+add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
{
- int maxcode, ascii_range;
int c, r;
const OnigCodePoint *ranges;
OnigCodePoint sb_out;
OnigEncoding enc = env->enc;
- OnigOptionType option = env->option;
- ascii_range = IS_ASCII_RANGE(option) && (char_prop == 0);
-
- r = ONIGENC_GET_CTYPE_CODE_RANGE(enc, ctype, &sb_out, &ranges);
- if (r == 0) {
- if (ascii_range) {
- CClassNode ccwork;
- initialize_cclass(&ccwork);
- r = add_ctype_to_cc_by_range(&ccwork, ctype, not, env, sb_out,
- ranges);
- if (r == 0) {
- if (not) {
- r = add_code_range_to_buf0(&(ccwork.mbuf), env, 0x80, ONIG_LAST_CODE_POINT, FALSE);
- }
- else {
- CClassNode ccascii;
- initialize_cclass(&ccascii);
- if (ONIGENC_MBC_MINLEN(env->enc) > 1) {
- add_code_range(&(ccascii.mbuf), env, 0x00, 0x7F);
- }
- else {
- bitset_set_range(env, ccascii.bs, 0x00, 0x7F);
- }
- r = and_cclass(&ccwork, &ccascii, env);
- if (IS_NOT_NULL(ccascii.mbuf)) bbuf_free(ccascii.mbuf);
- }
- if (r == 0) {
- r = or_cclass(cc, &ccwork, env);
- }
- if (IS_NOT_NULL(ccwork.mbuf)) bbuf_free(ccwork.mbuf);
+ switch (ctype) {
+ case ONIGENC_CTYPE_D:
+ case ONIGENC_CTYPE_S:
+ case ONIGENC_CTYPE_W:
+ ctype ^= ONIGENC_CTYPE_SPECIAL_MASK;
+ if (not != 0) {
+ for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
+ if (! ONIGENC_IS_ASCII_CODE_CTYPE((OnigCodePoint )c, ctype))
+ BITSET_SET_BIT_CHKDUP(cc->bs, c);
}
+ ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
}
else {
- r = add_ctype_to_cc_by_range(cc, ctype, not, env, sb_out, ranges);
+ for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
+ if (ONIGENC_IS_ASCII_CODE_CTYPE((OnigCodePoint )c, ctype))
+ BITSET_SET_BIT_CHKDUP(cc->bs, c);
+ }
}
- return r;
+ return 0;
+ break;
+ }
+
+ r = ONIGENC_GET_CTYPE_CODE_RANGE(enc, ctype, &sb_out, &ranges);
+ if (r == 0) {
+ return add_ctype_to_cc_by_range(cc, ctype, not, env, sb_out, ranges);
}
else if (r != ONIG_NO_SUPPORT_CONFIG) {
return r;
}
- maxcode = ascii_range ? 0x80 : SINGLE_BYTE_SIZE;
r = 0;
switch (ctype) {
case ONIGENC_CTYPE_ALPHA:
@@ -4192,39 +3970,32 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, int char_prop, ScanEnv* env)
case ONIGENC_CTYPE_PRINT:
if (not != 0) {
for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
- if (! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype)
- || c >= maxcode)
+ if (! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
BITSET_SET_BIT_CHKDUP(cc->bs, c);
}
- if (ascii_range)
- ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
}
else {
- for (c = 0; c < maxcode; c++) {
+ for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
if (ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
BITSET_SET_BIT_CHKDUP(cc->bs, c);
}
- if (! ascii_range)
- ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
+ ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
}
break;
case ONIGENC_CTYPE_WORD:
if (not == 0) {
- for (c = 0; c < maxcode; c++) {
- if (ONIGENC_IS_CODE_WORD(enc, c)) BITSET_SET_BIT_CHKDUP(cc->bs, c);
+ for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
+ if (IS_CODE_SB_WORD(enc, c)) BITSET_SET_BIT_CHKDUP(cc->bs, c);
}
- if (! ascii_range)
- ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
+ ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
}
else {
for (c = 0; c < SINGLE_BYTE_SIZE; c++) {
if ((ONIGENC_CODE_TO_MBCLEN(enc, c) > 0) /* check invalid code point */
- && (! ONIGENC_IS_CODE_WORD(enc, c) || c >= maxcode))
+ && ! ONIGENC_IS_CODE_WORD(enc, c))
BITSET_SET_BIT_CHKDUP(cc->bs, c);
}
- if (ascii_range)
- ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
}
break;
@@ -4283,9 +4054,7 @@ parse_posix_bracket(CClassNode* cc, UChar** src, UChar* end, ScanEnv* env)
if (onigenc_with_ascii_strncmp(enc, p, end, (UChar* )":]", 2) != 0)
return ONIGERR_INVALID_POSIX_BRACKET_TYPE;
- r = add_ctype_to_cc(cc, pb->ctype, not,
- IS_POSIX_BRACKET_ALL_RANGE(env->option),
- env);
+ r = add_ctype_to_cc(cc, pb->ctype, not, env);
if (r != 0) return r;
PINC; PINC;
@@ -4358,7 +4127,7 @@ parse_char_property(Node** np, OnigToken* tok, UChar** src, UChar* end,
*np = node_new_cclass();
CHECK_NULL_RETURN_MEMERR(*np);
cc = NCCLASS(*np);
- r = add_ctype_to_cc(cc, ctype, 0, 1, env);
+ r = add_ctype_to_cc(cc, ctype, 0, env);
if (r != 0) return r;
if (tok->u.prop.not != 0) NCCLASS_SET_NOT(cc);
@@ -4573,7 +4342,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
UChar* psave = p;
int i, base = tok->base;
- buf[0] = (UChar )tok->u.c;
+ buf[0] = tok->u.c;
for (i = 1; i < ONIGENC_MBC_MAXLEN(env->enc); i++) {
r = fetch_token_in_cc(tok, &p, end, env);
if (r < 0) goto err;
@@ -4581,7 +4350,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
fetched = 1;
break;
}
- buf[i] = (UChar )tok->u.c;
+ buf[i] = tok->u.c;
}
if (i < ONIGENC_MBC_MINLEN(env->enc)) {
@@ -4650,7 +4419,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
break;
case TK_CHAR_TYPE:
- r = add_ctype_to_cc(cc, tok->u.prop.ctype, tok->u.prop.not, 0, env);
+ r = add_ctype_to_cc(cc, tok->u.prop.ctype, tok->u.prop.not, env);
if (r != 0) return r;
next_class:
@@ -4664,7 +4433,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
ctype = fetch_char_property_to_ctype(&p, end, env);
if (ctype < 0) return ctype;
- r = add_ctype_to_cc(cc, ctype, tok->u.prop.not, 1, env);
+ r = add_ctype_to_cc(cc, ctype, tok->u.prop.not, env);
if (r != 0) return r;
goto next_class;
}
@@ -4717,7 +4486,7 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC)) {
CC_ESC_WARN(env, (UChar* )"-");
- goto range_end_val; /* [0-9-a] is allowed as [0-9\-a] */
+ goto sb_char; /* [0-9-a] is allowed as [0-9\-a] */
}
r = ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS;
goto err;
@@ -4812,10 +4581,8 @@ parse_char_class(Node** np, OnigToken* tok, UChar** src, UChar* end,
if (ONIGENC_IS_CODE_NEWLINE(env->enc, NEWLINE_CODE)) {
if (ONIGENC_CODE_TO_MBCLEN(env->enc, NEWLINE_CODE) == 1)
BITSET_SET_BIT_CHKDUP(cc->bs, NEWLINE_CODE);
- else {
- r = add_code_range(&(cc->mbuf), env, NEWLINE_CODE, NEWLINE_CODE);
- if (r < 0) goto err;
- }
+ else
+ add_code_range(&(cc->mbuf), env, NEWLINE_CODE, NEWLINE_CODE);
}
}
}
@@ -4835,8 +4602,8 @@ static int
parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
ScanEnv* env)
{
- int r = 0, num;
- Node *target, *work1 = NULL, *work2 = NULL;
+ int r, num;
+ Node *target;
OnigOptionType option;
OnigCodePoint c;
OnigEncoding enc = env->enc;
@@ -4872,10 +4639,10 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
case '=':
*np = onig_node_new_anchor(ANCHOR_PREC_READ);
break;
- case '!': /* preceding read */
+ case '!': /* preceding read */
*np = onig_node_new_anchor(ANCHOR_PREC_READ_NOT);
break;
- case '>': /* (?>...) stop backtrack */
+ case '>': /* (?>...) stop backtrack */
*np = node_new_enclose(ENCLOSE_STOP_BACKTRACK);
break;
@@ -4887,16 +4654,6 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
else
return ONIGERR_UNDEFINED_GROUP_OPTION;
break;
-
-#ifdef USE_CAPITAL_P_NAMED_GROUP
- case 'P': /* (?P<name>...) */
- if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP)) {
- PFETCH(c);
- if (c == '<') goto named_group1;
- }
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-#endif
#endif
case '<': /* look behind (?<=...), (?<!...) */
@@ -4906,7 +4663,7 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
else if (c == '!')
*np = onig_node_new_anchor(ANCHOR_LOOK_BEHIND_NOT);
#ifdef USE_NAMED_GROUP
- else { /* (?<name>...) */
+ else {
if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP)) {
UChar *name;
UChar *name_end;
@@ -4962,9 +4719,14 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
*np = node_new_enclose_memory(env->option, 0);
CHECK_NULL_RETURN_MEMERR(*np);
num = scan_env_add_mem_entry(env);
- if (num < 0) return num;
- if (num >= (int )BIT_STATUS_BITS_NUM)
+ if (num < 0) {
+ onig_node_free(*np);
+ return num;
+ }
+ else if (num >= (int )BIT_STATUS_BITS_NUM) {
+ onig_node_free(*np);
return ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY;
+ }
NENCLOSE(*np)->regnum = num;
BIT_STATUS_ON_AT_SIMPLE(env->capture_history, num);
}
@@ -4973,106 +4735,10 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
}
break;
- case '(': /* conditional expression: (?(cond)yes), (?(cond)yes|no) */
- if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_LPAREN_CONDITION)) {
- UChar *name = NULL;
- UChar *name_end;
- PFETCH(c);
- if (ONIGENC_IS_CODE_DIGIT(enc, c)) { /* (n) */
- PUNFETCH;
- r = fetch_name((OnigCodePoint )'(', &p, end, &name_end, env, &num, 1);
- if (r < 0) return r;
- if (num < 0) {
- num = BACKREF_REL_TO_ABS(num, env);
- if (num <= 0)
- return ONIGERR_INVALID_BACKREF;
- }
- if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_STRICT_CHECK_BACKREF)) {
- if (num > env->num_mem ||
- IS_NULL(SCANENV_MEM_NODES(env)[num]))
- return ONIGERR_INVALID_BACKREF;
- }
- }
-#ifdef USE_NAMED_GROUP
- else if (c == '<' || c == '\'') { /* (<name>), ('name') */
- int nums;
- int *backs;
-
- name = p;
- r = fetch_name((OnigCodePoint )c, &p, end, &name_end, env, &num, 0);
- if (r < 0) return r;
- PFETCH(c);
- if (c != ')') return ONIGERR_UNDEFINED_GROUP_OPTION;
-
- nums = onig_name_to_group_numbers(env->reg, name, name_end, &backs);
- if (nums <= 0) {
- onig_scan_env_set_error_string(env,
- ONIGERR_UNDEFINED_NAME_REFERENCE, name, name_end);
- return ONIGERR_UNDEFINED_NAME_REFERENCE;
- }
- if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_STRICT_CHECK_BACKREF)) {
- int i;
- for (i = 0; i < nums; i++) {
- if (backs[i] > env->num_mem ||
- IS_NULL(SCANENV_MEM_NODES(env)[backs[i]]))
- return ONIGERR_INVALID_BACKREF;
- }
- }
- num = backs[0]; /* XXX: use left most named group as Perl */
- }
-#endif
- else
- return ONIGERR_INVALID_CONDITION_PATTERN;
- *np = node_new_enclose(ENCLOSE_CONDITION);
- CHECK_NULL_RETURN_MEMERR(*np);
- NENCLOSE(*np)->regnum = num;
- if (IS_NOT_NULL(name)) NENCLOSE(*np)->state |= NST_NAME_REF;
- }
- else
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-
-#if 0
- case '|': /* branch reset: (?|...) */
- if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_QMARK_VBAR_BRANCH_RESET)) {
- /* TODO */
- }
- else
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-#endif
-
- case '^': /* loads default options */
- if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL)) {
- /* d-imsx */
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
- ONOFF(option, ONIG_OPTION_IGNORECASE, 1);
- ONOFF(option, ONIG_OPTION_SINGLELINE, 0);
- ONOFF(option, ONIG_OPTION_MULTILINE, 1);
- ONOFF(option, ONIG_OPTION_EXTEND, 1);
- PFETCH(c);
- }
-#if 0
- else if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) {
- /* d-imx */
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 0);
- ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 0);
- ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 0);
- ONOFF(option, ONIG_OPTION_IGNORECASE, 1);
- ONOFF(option, ONIG_OPTION_MULTILINE, 1);
- ONOFF(option, ONIG_OPTION_EXTEND, 1);
- PFETCH(c);
- }
-#endif
- else {
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- }
- /* fall through */
#ifdef USE_POSIXLINE_OPTION
case 'p':
#endif
case '-': case 'i': case 'm': case 's': case 'x':
- case 'a': case 'd': case 'l': case 'u':
{
int neg = 0;
@@ -5108,54 +4774,6 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
ONOFF(option, ONIG_OPTION_MULTILINE|ONIG_OPTION_SINGLELINE, neg);
break;
#endif
-
- case 'a': /* limits \d, \s, \w and POSIX brackets to ASCII range */
- if ((IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) ||
- IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) &&
- (neg == 0)) {
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 0);
- ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 1);
- ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 1);
- }
- else
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-
- case 'u':
- if ((IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) ||
- IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY)) &&
- (neg == 0)) {
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
- ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 1);
- ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 1);
- }
- else
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-
- case 'd':
- if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) &&
- (neg == 0)) {
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
- }
- else if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_RUBY) &&
- (neg == 0)) {
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 0);
- ONOFF(option, ONIG_OPTION_POSIX_BRACKET_ALL_RANGE, 0);
- ONOFF(option, ONIG_OPTION_WORD_BOUND_ALL_RANGE, 0);
- }
- else
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-
- case 'l':
- if (IS_SYNTAX_OP2(env->syntax, ONIG_SYN_OP2_OPTION_PERL) && (neg == 0)) {
- ONOFF(option, ONIG_OPTION_ASCII_RANGE, 1);
- }
- else
- return ONIGERR_UNDEFINED_GROUP_OPTION;
- break;
-
default:
return ONIGERR_UNDEFINED_GROUP_OPTION;
}
@@ -5221,29 +4839,10 @@ parse_enclose(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
r = scan_env_set_mem_node(env, NENCLOSE(*np)->regnum, *np);
if (r != 0) return r;
}
- else if (NENCLOSE(*np)->type == ENCLOSE_CONDITION) {
- if (NTYPE(target) != NT_ALT) {
- /* convert (?(cond)yes) to (?(cond)yes|empty) */
- work1 = node_new_empty();
- if (IS_NULL(work1)) goto err;
- work2 = onig_node_new_alt(work1, NULL_NODE);
- if (IS_NULL(work2)) goto err;
- work1 = onig_node_new_alt(target, work2);
- if (IS_NULL(work1)) goto err;
- NENCLOSE(*np)->target = work1;
- }
- }
}
*src = p;
return 0;
-
- err:
- onig_node_free(work1);
- onig_node_free(work2);
- onig_node_free(*np);
- *np = NULL;
- return ONIGERR_MEMORY;
}
static const char* const PopularQStr[] = {
@@ -5288,23 +4887,30 @@ set_quantifier(Node* qnode, Node* target, int group, ScanEnv* env)
#ifdef USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
if (!IS_QUANTIFIER_BY_NUMBER(qn) && !IS_QUANTIFIER_BY_NUMBER(qnt) &&
IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT)) {
- switch (ReduceTypeTable[targetq_num][nestq_num]) {
+ UChar buf[WARN_BUFSIZE];
+
+ switch(ReduceTypeTable[targetq_num][nestq_num]) {
case RQ_ASIS:
break;
case RQ_DEL:
- if (onig_warn != onig_null_warn) {
- onig_syntax_warn(env, "regular expression has redundant nested repeat operator '%s'",
- PopularQStr[targetq_num]);
+ if (onig_verb_warn != onig_null_warn) {
+ onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
+ env->pattern, env->pattern_end,
+ (UChar* )"redundant nested repeat operator");
+ (*onig_verb_warn)((char* )buf);
}
goto warn_exit;
break;
default:
- if (onig_warn != onig_null_warn) {
- onig_syntax_warn(env, "nested repeat operator '%s' and '%s' was replaced with '%s' in regular expression",
- PopularQStr[targetq_num], PopularQStr[nestq_num],
- ReduceQStr[ReduceTypeTable[targetq_num][nestq_num]]);
+ if (onig_verb_warn != onig_null_warn) {
+ onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
+ env->pattern, env->pattern_end,
+ (UChar* )"nested repeat operator %s and %s was replaced with '%s'",
+ PopularQStr[targetq_num], PopularQStr[nestq_num],
+ ReduceQStr[ReduceTypeTable[targetq_num][nestq_num]]);
+ (*onig_verb_warn)((char* )buf);
}
goto warn_exit;
break;
@@ -5530,207 +5136,6 @@ i_apply_case_fold(OnigCodePoint from, OnigCodePoint to[],
}
static int
-node_linebreak(Node** np, ScanEnv* env)
-{
- /* same as (?>\x0D\x0A|[\x0A-\x0D\x{85}\x{2028}\x{2029}]) */
- Node* left = NULL;
- Node* right = NULL;
- Node* target1 = NULL;
- Node* target2 = NULL;
- CClassNode* cc;
- int num1, num2;
- UChar buf[ONIGENC_CODE_TO_MBC_MAXLEN * 2];
-
- /* \x0D\x0A */
- num1 = ONIGENC_CODE_TO_MBC(env->enc, 0x0D, buf);
- if (num1 < 0) return num1;
- num2 = ONIGENC_CODE_TO_MBC(env->enc, 0x0A, buf + num1);
- if (num2 < 0) return num2;
- left = node_new_str_raw(buf, buf + num1 + num2);
- if (IS_NULL(left)) goto err;
-
- /* [\x0A-\x0D] or [\x0A-\x0D\x{85}\x{2028}\x{2029}] */
- right = node_new_cclass();
- if (IS_NULL(right)) goto err;
- cc = NCCLASS(right);
- if (ONIGENC_MBC_MINLEN(env->enc) > 1) {
- add_code_range(&(cc->mbuf), env, 0x0A, 0x0D);
- }
- else {
- bitset_set_range(env, cc->bs, 0x0A, 0x0D);
- }
-
- /* TODO: move this block to enc/unicode.c */
- if (ONIGENC_IS_UNICODE(env->enc)) {
- /* UTF-8, UTF-16BE/LE, UTF-32BE/LE */
- add_code_range(&(cc->mbuf), env, 0x85, 0x85);
- add_code_range(&(cc->mbuf), env, 0x2028, 0x2029);
- }
-
- /* ...|... */
- target1 = onig_node_new_alt(right, NULL_NODE);
- if (IS_NULL(target1)) goto err;
- right = NULL;
- target2 = onig_node_new_alt(left, target1);
- if (IS_NULL(target2)) goto err;
- left = NULL;
- target1 = NULL;
-
- /* (?>...) */
- *np = node_new_enclose(ENCLOSE_STOP_BACKTRACK);
- if (IS_NULL(*np)) goto err;
- NENCLOSE(*np)->target = target2;
- return ONIG_NORMAL;
-
- err:
- onig_node_free(left);
- onig_node_free(right);
- onig_node_free(target1);
- onig_node_free(target2);
- return ONIGERR_MEMORY;
-}
-
-static int
-node_extended_grapheme_cluster(Node** np, ScanEnv* env)
-{
- /* same as (?>\P{M}\p{M}*) */
- Node* np1 = NULL;
- Node* np2 = NULL;
- Node* qn = NULL;
- Node* list1 = NULL;
- Node* list2 = NULL;
- int r = 0;
-
-#ifdef USE_UNICODE_PROPERTIES
- if (ONIGENC_IS_UNICODE(env->enc)) {
- /* UTF-8, UTF-16BE/LE, UTF-32BE/LE */
- CClassNode* cc1;
- CClassNode* cc2;
- UChar* propname = (UChar* )"M";
- int ctype = env->enc->property_name_to_ctype(ONIG_ENCODING_ASCII,
- propname, propname + 1);
- if (ctype >= 0) {
- /* \P{M} */
- np1 = node_new_cclass();
- if (IS_NULL(np1)) goto err;
- cc1 = NCCLASS(np1);
- r = add_ctype_to_cc(cc1, ctype, 0, 1, env);
- if (r != 0) goto err;
- NCCLASS_SET_NOT(cc1);
-
- /* \p{M}* */
- np2 = node_new_cclass();
- if (IS_NULL(np2)) goto err;
- cc2 = NCCLASS(np2);
- r = add_ctype_to_cc(cc2, ctype, 0, 1, env);
- if (r != 0) goto err;
-
- qn = node_new_quantifier(0, REPEAT_INFINITE, 0);
- if (IS_NULL(qn)) goto err;
- NQTFR(qn)->target = np2;
- np2 = NULL;
-
- /* \P{M}\p{M}* */
- list2 = node_new_list(qn, NULL_NODE);
- if (IS_NULL(list2)) goto err;
- qn = NULL;
- list1 = node_new_list(np1, list2);
- if (IS_NULL(list1)) goto err;
- np1 = NULL;
- list2 = NULL;
-
- /* (?>...) */
- *np = node_new_enclose(ENCLOSE_STOP_BACKTRACK);
- if (IS_NULL(*np)) goto err;
- NENCLOSE(*np)->target = list1;
- return ONIG_NORMAL;
- }
- }
-#endif /* USE_UNICODE_PROPERTIES */
- if (IS_NULL(*np)) {
- /* PerlSyntax: (?s:.), RubySyntax: (?m:.) */
- OnigOptionType option;
- np1 = node_new_anychar();
- if (IS_NULL(np1)) goto err;
-
- option = env->option;
- ONOFF(option, ONIG_OPTION_MULTILINE, 0);
- *np = node_new_option(option);
- if (IS_NULL(*np)) goto err;
- NENCLOSE(*np)->target = np1;
- }
- return ONIG_NORMAL;
-
- err:
- onig_node_free(np1);
- onig_node_free(np2);
- onig_node_free(qn);
- onig_node_free(list1);
- onig_node_free(list2);
- return (r == 0) ? ONIGERR_MEMORY : r;
-}
-
-static int
-countbits(unsigned int bits)
-{
- bits = (bits & 0x55555555) + ((bits >> 1) & 0x55555555);
- bits = (bits & 0x33333333) + ((bits >> 2) & 0x33333333);
- bits = (bits & 0x0f0f0f0f) + ((bits >> 4) & 0x0f0f0f0f);
- bits = (bits & 0x00ff00ff) + ((bits >> 8) & 0x00ff00ff);
- return (bits & 0x0000ffff) + ((bits >>16) & 0x0000ffff);
-}
-
-static int
-is_onechar_cclass(CClassNode* cc, OnigCodePoint* code)
-{
- const OnigCodePoint not_found = ONIG_LAST_CODE_POINT;
- OnigCodePoint c = not_found;
- int i;
- BBuf *bbuf = cc->mbuf;
-
- if (IS_NCCLASS_NOT(cc)) return 0;
-
- /* check bbuf */
- if (IS_NOT_NULL(bbuf)) {
- OnigCodePoint n, *data;
- GET_CODE_POINT(n, bbuf->p);
- data = (OnigCodePoint* )(bbuf->p) + 1;
- if ((n == 1) && (data[0] == data[1])) {
- /* only one char found in the bbuf, save the code point. */
- c = data[0];
- if (((c < SINGLE_BYTE_SIZE) && BITSET_AT(cc->bs, c))) {
- /* skip if c is included in the bitset */
- c = not_found;
- }
- }
- else {
- return 0; /* the bbuf contains multiple chars */
- }
- }
-
- /* check bitset */
- for (i = 0; i < BITSET_SIZE; i++) {
- Bits b1 = cc->bs[i];
- if (b1 != 0) {
- if (((b1 & (b1 - 1)) == 0) && (c == not_found)) {
- c = BITS_IN_ROOM * i + countbits(b1 - 1);
- } else {
- return 0; /* the character class contains multiple chars */
- }
- }
- }
-
- if (c != not_found) {
- *code = c;
- return 1;
- }
-
- /* the character class contains no char. */
- return 0;
-}
-
-
-static int
parse_exp(Node** np, OnigToken* tok, int term,
UChar** src, UChar* end, ScanEnv* env)
{
@@ -5748,7 +5153,6 @@ parse_exp(Node** np, OnigToken* tok, int term,
end_of_token:
*np = node_new_empty();
return tok->type;
- break;
case TK_SUBEXP_OPEN:
r = parse_enclose(np, tok, TK_SUBEXP_CLOSE, src, end, env);
@@ -5780,42 +5184,18 @@ parse_exp(Node** np, OnigToken* tok, int term,
else goto tk_byte;
break;
- case TK_LINEBREAK:
- r = node_linebreak(np, env);
- if (r < 0) return r;
- break;
-
- case TK_EXTENDED_GRAPHEME_CLUSTER:
- r = node_extended_grapheme_cluster(np, env);
- if (r < 0) return r;
- break;
-
- case TK_KEEP:
- *np = onig_node_new_anchor(ANCHOR_KEEP);
- CHECK_NULL_RETURN_MEMERR(*np);
- break;
-
case TK_STRING:
tk_byte:
{
*np = node_new_str(tok->backp, *src);
CHECK_NULL_RETURN_MEMERR(*np);
- string_loop:
while (1) {
r = fetch_token(tok, src, end, env);
if (r < 0) return r;
- if (r == TK_STRING) {
- r = onig_node_str_cat(*np, tok->backp, *src);
- }
-#ifndef NUMBERED_CHAR_IS_NOT_CASE_AMBIG
- else if (r == TK_CODE_POINT) {
- r = node_str_cat_codepoint(*np, env->enc, tok->u.code);
- }
-#endif
- else {
- break;
- }
+ if (r != TK_STRING) break;
+
+ r = onig_node_str_cat(*np, tok->backp, *src);
if (r < 0) return r;
}
@@ -5868,15 +5248,15 @@ parse_exp(Node** np, OnigToken* tok, int term,
case TK_CODE_POINT:
{
- *np = node_new_empty();
- CHECK_NULL_RETURN_MEMERR(*np);
- r = node_str_cat_codepoint(*np, env->enc, tok->u.code);
- if (r != 0) return r;
+ UChar buf[ONIGENC_CODE_TO_MBC_MAXLEN];
+ int num = ONIGENC_CODE_TO_MBC(env->enc, tok->u.code, buf);
+ if (num < 0) return num;
#ifdef NUMBERED_CHAR_IS_NOT_CASE_AMBIG
- NSTRING_SET_RAW(*np);
+ *np = node_new_str_raw(buf, buf + num);
#else
- goto string_loop;
+ *np = node_new_str(buf, buf + num);
#endif
+ CHECK_NULL_RETURN_MEMERR(*np);
}
break;
@@ -5901,9 +5281,21 @@ parse_exp(Node** np, OnigToken* tok, int term,
case TK_CHAR_TYPE:
{
switch (tok->u.prop.ctype) {
+ case ONIGENC_CTYPE_D:
+ case ONIGENC_CTYPE_S:
+ case ONIGENC_CTYPE_W:
+ {
+ CClassNode* cc;
+ *np = node_new_cclass();
+ CHECK_NULL_RETURN_MEMERR(*np);
+ cc = NCCLASS(*np);
+ add_ctype_to_cc(cc, tok->u.prop.ctype, 0, env);
+ if (tok->u.prop.not != 0) NCCLASS_SET_NOT(cc);
+ }
+ break;
+
case ONIGENC_CTYPE_WORD:
- *np = node_new_ctype(tok->u.prop.ctype, tok->u.prop.not,
- IS_ASCII_RANGE(env->option));
+ *np = node_new_ctype(tok->u.prop.ctype, tok->u.prop.not);
CHECK_NULL_RETURN_MEMERR(*np);
break;
@@ -5920,7 +5312,6 @@ parse_exp(Node** np, OnigToken* tok, int term,
r = ONIGENC_GET_CTYPE_CODE_RANGE(env->enc, tok->u.prop.ctype,
&sb_out, &mbr);
if (r == 0 &&
- ! IS_ASCII_RANGE(env->option) &&
ONIGENC_CODE_RANGE_NUM(mbr)
>= THRESHOLD_RANGE_NUM_FOR_SHARE_CCLASS) {
type_cclass_key key;
@@ -5969,8 +5360,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
*np = node_new_cclass();
CHECK_NULL_RETURN_MEMERR(*np);
cc = NCCLASS(*np);
- r = add_ctype_to_cc(cc, tok->u.prop.ctype, 0, 0, env);
- if (r != 0) return r;
+ add_ctype_to_cc(cc, tok->u.prop.ctype, 0, env);
if (tok->u.prop.not != 0) NCCLASS_SET_NOT(cc);
#ifdef USE_SHARED_CCLASS_TABLE
}
@@ -5993,20 +5383,11 @@ parse_exp(Node** np, OnigToken* tok, int term,
case TK_CC_OPEN:
{
CClassNode* cc;
- OnigCodePoint code;
r = parse_char_class(np, tok, src, end, env);
if (r != 0) return r;
cc = NCCLASS(*np);
- if (is_onechar_cclass(cc, &code)) {
- onig_node_free(*np);
- *np = node_new_empty();
- CHECK_NULL_RETURN_MEMERR(*np);
- r = node_str_cat_codepoint(*np, env->enc, code);
- if (r != 0) return r;
- goto string_loop;
- }
if (IS_IGNORECASE(env->option)) {
IApplyCaseFoldArg iarg;
@@ -6065,8 +5446,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
{
int gnum = tok->u.call.gnum;
- if (gnum < 0 || tok->u.call.rel != 0) {
- if (gnum > 0) gnum--;
+ if (gnum < 0) {
gnum = BACKREF_REL_TO_ABS(gnum, env);
if (gnum <= 0)
return ONIGERR_INVALID_BACKREF;
@@ -6079,9 +5459,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
#endif
case TK_ANCHOR:
- *np = onig_node_new_anchor(tok->u.anchor.subtype);
- CHECK_NULL_RETURN_MEMERR(*np);
- NANCHOR(*np)->ascii_range = tok->u.anchor.ascii_range;
+ *np = onig_node_new_anchor(tok->u.anchor);
break;
case TK_OP_REPEAT:
@@ -6139,7 +5517,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
*targetp = qn;
}
else if (r == 1) {
- onig_node_free(qn);
+ onig_node_free(qn);
}
else if (r == 2) { /* split case: /abc+/ */
Node *tmp;
@@ -6264,21 +5642,6 @@ parse_regexp(Node** top, UChar** src, UChar* end, ScanEnv* env)
if (r < 0) return r;
r = parse_subexp(top, &tok, TK_EOT, src, end, env);
if (r < 0) return r;
-
-#ifdef USE_SUBEXP_CALL
- if (env->num_call > 0) {
- /* Capture the pattern itself. It is used for (?R), (?0) and \g<0>. */
- const int num = 0;
- Node* np;
- np = node_new_enclose_memory(env->option, 0);
- CHECK_NULL_RETURN_MEMERR(np);
- NENCLOSE(np)->regnum = num;
- NENCLOSE(np)->target = *top;
- r = scan_env_set_mem_node(env, num, np);
- if (r != 0) return r;
- *top = np;
- }
-#endif
return 0;
}
diff --git a/regparse.h b/regparse.h
index 4f45e2b72c..18f7e6bd8f 100644
--- a/regparse.h
+++ b/regparse.h
@@ -1,11 +1,10 @@
#ifndef ONIGURUMA_REGPARSE_H
#define ONIGURUMA_REGPARSE_H
/**********************************************************************
- regparse.h - Onigmo (Oniguruma-mod) (regular expression library)
+ regparse.h - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,10 +31,6 @@
#include "regint.h"
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-
/* node type */
#define NT_STR 0
#define NT_CCLASS 1
@@ -92,7 +87,6 @@
#define ENCLOSE_MEMORY (1<<0)
#define ENCLOSE_OPTION (1<<1)
#define ENCLOSE_STOP_BACKTRACK (1<<2)
-#define ENCLOSE_CONDITION (1<<3)
#define NODE_STR_MARGIN 16
#define NODE_STR_BUF_SIZE 24 /* sizeof(CClassNode) - sizeof(int)*4 */
@@ -102,7 +96,7 @@
#define NSTR_AMBIG (1<<1)
#define NSTR_DONT_GET_OPT_INFO (1<<2)
-#define NSTRING_LEN(node) (OnigDistance )((node)->u.str.end - (node)->u.str.s)
+#define NSTRING_LEN(node) ((node)->u.str.end - (node)->u.str.s)
#define NSTRING_SET_RAW(node) (node)->u.str.flag |= NSTR_RAW
#define NSTRING_CLEAR_RAW(node) (node)->u.str.flag &= ~NSTR_RAW
#define NSTRING_SET_AMBIG(node) (node)->u.str.flag |= NSTR_AMBIG
@@ -152,7 +146,6 @@
#define IS_ENCLOSE_STOP_BT_SIMPLE_REPEAT(en) \
(((en)->state & NST_STOP_BT_SIMPLE_REPEAT) != 0)
#define IS_ENCLOSE_NAMED_GROUP(en) (((en)->state & NST_NAMED_GROUP) != 0)
-#define IS_ENCLOSE_NAME_REF(en) (((en)->state & NST_NAME_REF) != 0)
#define SET_CALL_RECURSION(node) (node)->u.call.state |= NST_RECURSION
#define IS_CALL_RECURSION(cn) (((cn)->state & NST_RECURSION) != 0)
@@ -243,7 +236,6 @@ typedef struct {
int type;
struct _Node* target;
int char_len;
- int ascii_range;
} AnchorNode;
typedef struct {
@@ -256,7 +248,6 @@ typedef struct {
NodeBase base;
int ctype;
int not;
- int ascii_range;
} CtypeNode;
typedef struct _Node {
@@ -360,8 +351,4 @@ extern int onig_print_names(FILE*, regex_t*);
#endif
#endif
-#if defined __GNUC__ && __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
-
#endif /* ONIGURUMA_REGPARSE_H */
diff --git a/regsyntax.c b/regsyntax.c
index 7cb98f2d46..fc639dfcdf 100644
--- a/regsyntax.c
+++ b/regsyntax.c
@@ -1,9 +1,8 @@
/**********************************************************************
- regsyntax.c - Onigmo (Oniguruma-mod) (regular expression library)
+ regsyntax.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
* Copyright (c) 2002-2006 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2012 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -154,8 +153,7 @@ const OnigSyntaxType OnigSyntaxJava = {
ONIG_SYN_OP2_ESC_V_VTAB | ONIG_SYN_OP2_ESC_U_HEX4 |
ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY )
, ( SYN_GNU_REGEX_BV | ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND )
- , ( ONIG_OPTION_SINGLELINE | ONIG_OPTION_ASCII_RANGE |
- ONIG_OPTION_WORD_BOUND_ALL_RANGE )
+ , ONIG_OPTION_SINGLELINE
,
{
(OnigCodePoint )'\\' /* esc */
@@ -167,8 +165,7 @@ const OnigSyntaxType OnigSyntaxJava = {
}
};
-/* Perl 5.8 */
-const OnigSyntaxType OnigSyntaxPerl58 = {
+const OnigSyntaxType OnigSyntaxPerl = {
(( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |
ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |
ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |
@@ -177,9 +174,7 @@ const OnigSyntaxType OnigSyntaxPerl58 = {
, ( ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE |
ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |
ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY |
- ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
- ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER |
- ONIG_SYN_OP2_QMARK_LPAREN_CONDITION)
+ ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT )
, SYN_GNU_REGEX_BV
, ONIG_OPTION_SINGLELINE
,
@@ -193,8 +188,8 @@ const OnigSyntaxType OnigSyntaxPerl58 = {
}
};
-/* Perl 5.8 + named group */
-const OnigSyntaxType OnigSyntaxPerl58_NG = {
+/* Perl + named group */
+const OnigSyntaxType OnigSyntaxPerl_NG = {
(( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |
ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |
ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |
@@ -204,8 +199,6 @@ const OnigSyntaxType OnigSyntaxPerl58_NG = {
ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |
ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY |
ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
- ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER |
- ONIG_SYN_OP2_QMARK_LPAREN_CONDITION |
ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP |
ONIG_SYN_OP2_ESC_K_NAMED_BACKREF |
ONIG_SYN_OP2_ESC_G_SUBEXP_CALL )
@@ -224,71 +217,6 @@ const OnigSyntaxType OnigSyntaxPerl58_NG = {
}
};
-/* Perl 5.10+ */
-const OnigSyntaxType OnigSyntaxPerl = {
- (( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |
- ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |
- ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |
- ONIG_SYN_OP_ESC_C_CONTROL )
- & ~ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END )
- , ( ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE |
- ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |
- ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY |
- ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
- ONIG_SYN_OP2_ESC_CAPITAL_X_EXTENDED_GRAPHEME_CLUSTER |
- ONIG_SYN_OP2_QMARK_LPAREN_CONDITION |
- ONIG_SYN_OP2_PLUS_POSSESSIVE_REPEAT |
- ONIG_SYN_OP2_PLUS_POSSESSIVE_INTERVAL |
- ONIG_SYN_OP2_ESC_CAPITAL_R_LINEBREAK |
- ONIG_SYN_OP2_ESC_CAPITAL_K_KEEP |
- ONIG_SYN_OP2_QMARK_SUBEXP_CALL |
- ONIG_SYN_OP2_ESC_G_BRACE_BACKREF |
- ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP |
- ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP |
- ONIG_SYN_OP2_ESC_K_NAMED_BACKREF )
- , ( SYN_GNU_REGEX_BV |
- ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME |
- ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME_CALL )
- , ( ONIG_OPTION_SINGLELINE | ONIG_OPTION_CAPTURE_GROUP )
- ,
- {
- (OnigCodePoint )'\\' /* esc */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* anychar '.' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* anytime '*' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* zero or one time '?' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* one or more time '+' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* anychar anytime */
- }
-};
-
-const OnigSyntaxType OnigSyntaxPython = {
- (( SYN_GNU_REGEX_OP | ONIG_SYN_OP_QMARK_NON_GREEDY |
- ONIG_SYN_OP_ESC_OCTAL3 | ONIG_SYN_OP_ESC_X_HEX2 |
- ONIG_SYN_OP_ESC_X_BRACE_HEX8 | ONIG_SYN_OP_ESC_CONTROL_CHARS |
- ONIG_SYN_OP_ESC_C_CONTROL )
- & ~ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END )
- , ( ONIG_SYN_OP2_QMARK_GROUP_EFFECT | ONIG_SYN_OP2_OPTION_PERL |
- ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY |
- ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
- ONIG_SYN_OP2_PLUS_POSSESSIVE_REPEAT |
- ONIG_SYN_OP2_ESC_V_VTAB |
- ONIG_SYN_OP2_ESC_U_HEX4 |
- ONIG_SYN_OP2_QMARK_LPAREN_CONDITION |
- ONIG_SYN_OP2_QMARK_CAPITAL_P_NAMED_GROUP )
- , ( SYN_GNU_REGEX_BV |
- ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV )
- , ( ONIG_OPTION_SINGLELINE | ONIG_OPTION_ASCII_RANGE )
- ,
- {
- (OnigCodePoint )'\\' /* esc */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* anychar '.' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* anytime '*' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* zero or one time '?' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* one or more time '+' */
- , (OnigCodePoint )ONIG_INEFFECTIVE_META_CHAR /* anychar anytime */
- }
-};
-
extern int
diff --git a/ruby.c b/ruby.c
index 9e112623a9..945f18363a 100644
--- a/ruby.c
+++ b/ruby.c
@@ -17,7 +17,6 @@
#endif
#include "ruby/ruby.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include "eval_intern.h"
#include "dln.h"
#include <stdio.h>
@@ -52,13 +51,11 @@
char *getenv();
#endif
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+VALUE rb_parser_get_yydebug(VALUE);
+VALUE rb_parser_set_yydebug(VALUE, VALUE);
-#if defined DISABLE_RUBYGEMS && DISABLE_RUBYGEMS
-#define DEFAULT_RUBYGEMS_ENABLED "disabled"
-#else
-#define DEFAULT_RUBYGEMS_ENABLED "enabled"
-#endif
+const char *ruby_get_inplace_mode(void);
+void ruby_set_inplace_mode(const char *);
#define DISABLE_BIT(bit) (1U << disable_##bit)
enum disable_flag_bits {
@@ -70,10 +67,8 @@ enum disable_flag_bits {
#define DUMP_BIT(bit) (1U << dump_##bit)
enum dump_flag_bits {
dump_version,
- dump_version_v,
dump_copyright,
dump_usage,
- dump_help,
dump_yydebug,
dump_syntax,
dump_parsetree,
@@ -116,96 +111,62 @@ cmdline_options_init(struct cmdline_options *opt)
opt->src.enc.index = src_encoding_index;
opt->ext.enc.index = -1;
opt->intern.enc.index = -1;
-#if defined DISABLE_RUBYGEMS && DISABLE_RUBYGEMS
- opt->disable |= DISABLE_BIT(gems);
-#endif
return opt;
}
-static NODE *load_file(VALUE, VALUE, int, struct cmdline_options *);
+static NODE *load_file(VALUE, const char *, int, struct cmdline_options *);
static void forbid_setid(const char *, struct cmdline_options *);
-#define forbid_setid(s) forbid_setid((s), opt)
+#define forbid_setid(s) forbid_setid(s, opt)
static struct {
int argc;
char **argv;
+#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
+ size_t len;
+#endif
} origarg;
static void
-usage(const char *name, int help)
+usage(const char *name)
{
/* This message really ought to be max 23 lines.
* Removed -h because the user already knows that option. Others? */
- struct message {
- const char *str;
- unsigned short namelen, secondlen;
- };
-#define M(shortopt, longopt, desc) { \
- shortopt " " longopt " " desc, \
- (unsigned short)sizeof(shortopt), \
- (unsigned short)sizeof(longopt), \
-}
- static const struct message usage_msg[] = {
- M("-0[octal]", "", "specify record separator (\\0, if no argument)"),
- M("-a", "", "autosplit mode with -n or -p (splits $_ into $F)"),
- M("-c", "", "check syntax only"),
- M("-Cdirectory", "", "cd to directory before executing your script"),
- M("-d", ", --debug", "set debugging flags (set $DEBUG to true)"),
- M("-e 'command'", "", "one line of script. Several -e's allowed. Omit [programfile]"),
- M("-Eex[:in]", ", --encoding=ex[:in]", "specify the default external and internal character encodings"),
- M("-Fpattern", "", "split() pattern for autosplit (-a)"),
- M("-i[extension]", "", "edit ARGV files in place (make backup if extension supplied)"),
- M("-Idirectory", "", "specify $LOAD_PATH directory (may be used more than once)"),
- M("-l", "", "enable line ending processing"),
- M("-n", "", "assume 'while gets(); ... end' loop around your script"),
- M("-p", "", "assume loop like -n but print line also like sed"),
- M("-rlibrary", "", "require the library before executing your script"),
- M("-s", "", "enable some switch parsing for switches after script name"),
- M("-S", "", "look for the script using PATH environment variable"),
- M("-T[level=1]", "", "turn on tainting checks"),
- M("-v", ", --verbose", "print version number, then turn on verbose mode"),
- M("-w", "", "turn warnings on for your script"),
- M("-W[level=2]", "", "set warning level; 0=silence, 1=medium, 2=verbose"),
- M("-x[directory]", "", "strip off text before #!ruby line and perhaps cd to directory"),
- M("-h", "", "show this message, --help for more info"),
- };
- static const struct message help_msg[] = {
- M("--copyright", "", "print the copyright"),
- M("--enable=feature[,...]", ", --disable=feature[,...]",
- "enable or disable features"),
- M("--external-encoding=encoding", ", --internal-encoding=encoding",
- "specify the default external or internal character encoding"),
- M("--version", "", "print the version"),
- M("--help", "", "show this message, -h for short message"),
+ static const char *const usage_msg[] = {
+ "-0[octal] specify record separator (\\0, if no argument)",
+ "-a autosplit mode with -n or -p (splits $_ into $F)",
+ "-c check syntax only",
+ "-Cdirectory cd to directory, before executing your script",
+ "-d set debugging flags (set $DEBUG to true)",
+ "-e 'command' one line of script. Several -e's allowed. Omit [programfile]",
+ "-Eex[:in] specify the default external and internal character encodings",
+ "-Fpattern split() pattern for autosplit (-a)",
+ "-i[extension] edit ARGV files in place (make backup if extension supplied)",
+ "-Idirectory specify $LOAD_PATH directory (may be used more than once)",
+ "-l enable line ending processing",
+ "-n assume 'while gets(); ... end' loop around your script",
+ "-p assume loop like -n but print line also like sed",
+ "-rlibrary require the library, before executing your script",
+ "-s enable some switch parsing for switches after script name",
+ "-S look for the script using PATH environment variable",
+ "-T[level=1] turn on tainting checks",
+ "-v print version number, then turn on verbose mode",
+ "-w turn warnings on for your script",
+ "-W[level=2] set warning level; 0=silence, 1=medium, 2=verbose",
+ "-x[directory] strip off text before #!ruby line and perhaps cd to directory",
+ "--copyright print the copyright",
+ "--version print the version",
+ NULL
};
- static const struct message features[] = {
- M("gems", "", "rubygems (default: "DEFAULT_RUBYGEMS_ENABLED")"),
- M("rubyopt", "", "RUBYOPT environment variable (default: enabled)"),
- };
- int i, w = 16, num = numberof(usage_msg) - (help ? 1 : 0);
-#define SHOW(m) do { \
- int wrap = help && (m).namelen + (m).secondlen - 2 > w; \
- printf(" %.*s%-*.*s%-*s%s\n", (m).namelen-1, (m).str, \
- (wrap ? 0 : w - (m).namelen + 1), \
- (help ? (m).secondlen-1 : 0), (m).str + (m).namelen, \
- (wrap ? w + 3 : 0), (wrap ? "\n" : ""), \
- (m).str + (m).namelen + (m).secondlen); \
- } while (0)
+ const char *const *p = usage_msg;
printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name);
- for (i = 0; i < num; ++i)
- SHOW(usage_msg[i]);
-
- if (!help) return;
-
- for (i = 0; i < numberof(help_msg); ++i)
- SHOW(help_msg[i]);
- puts("Features:");
- for (i = 0; i < numberof(features); ++i)
- SHOW(features[i]);
+ while (*p)
+ printf(" %s\n", *p++);
}
+VALUE rb_get_load_path(void);
+
#ifdef MANGLED_PATH
static VALUE
rubylib_mangled_path(const char *s, unsigned int l)
@@ -294,14 +255,7 @@ push_include_cygwin(const char *path, VALUE (*filter)(VALUE))
p = strncpy(RSTRING_PTR(buf), p, len);
}
}
-#ifdef HAVE_CYGWIN_CONV_PATH
-#define CONV_TO_POSIX_PATH(p, lib) \
- cygwin_conv_path(CCP_WIN_A_TO_POSIX|CCP_RELATIVE, (p), (lib), sizeof(lib))
-#else
-#define CONV_TO_POSIX_PATH(p, lib) \
- cygwin_conv_to_posix_path((p), (lib))
-#endif
- if (CONV_TO_POSIX_PATH(p, rubylib) == 0)
+ if (cygwin_conv_to_posix_path(p, rubylib) == 0)
p = rubylib;
push_include(p, filter);
if (!*s) break;
@@ -389,7 +343,7 @@ ruby_init_loadpath_safe(int safe_level)
extern const char ruby_initial_load_paths[];
const char *paths = ruby_initial_load_paths;
#if defined LOAD_RELATIVE
-# if defined HAVE_DLADDR || defined HAVE_CYGWIN_CONV_PATH
+# if defined HAVE_DLADDR || (defined __CYGWIN__ && defined CCP_WIN_A_TO_POSIX)
# define VARIABLE_LIBPATH 1
# else
# define VARIABLE_LIBPATH 0
@@ -416,6 +370,7 @@ ruby_init_loadpath_safe(int safe_level)
#elif defined(HAVE_DLADDR)
Dl_info dli;
if (dladdr((void *)(VALUE)expand_include_path, &dli)) {
+ VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
char fbuf[MAXPATHLEN];
char *f = dln_find_file_r(dli.dli_fname, getenv(PATH_ENV), fbuf, sizeof(fbuf));
VALUE fname = rb_str_new_cstr(f ? f : dli.dli_fname);
@@ -456,21 +411,9 @@ ruby_init_loadpath_safe(int safe_level)
#endif
p = strrchr(libpath, '/');
if (p) {
- static const char bindir[] = "/bin";
-#ifdef LIBDIR_BASENAME
- static const char libdir[] = "/"LIBDIR_BASENAME;
-#else
- static const char libdir[] = "/lib";
-#endif
- const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1;
- const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1;
*p = 0;
- if (p - libpath >= bindir_len && !STRCASECMP(p - bindir_len, bindir)) {
- p -= bindir_len;
- *p = 0;
- }
- else if (p - libpath >= libdir_len && !strcmp(p - libdir_len, libdir)) {
- p -= libdir_len;
+ if (p - libpath > 3 && !(STRCASECMP(p - 4, "/bin") && strcmp(p - 4, "/lib"))) {
+ p -= 4;
*p = 0;
}
}
@@ -483,25 +426,22 @@ ruby_init_loadpath_safe(int safe_level)
#define PREFIX_PATH() rb_str_new(libpath, baselen)
#else
baselen = p - libpath;
- rb_str_resize(sopath, baselen);
+ rb_str_set_len(sopath, baselen);
libpath = RSTRING_PTR(sopath);
#define PREFIX_PATH() sopath
#endif
#define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen)
-#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))
+#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), path, len)
#else
static const char exec_prefix[] = RUBY_EXEC_PREFIX;
-#define RUBY_RELATIVE(path, len) rubylib_mangled_path((path), (len))
+#define RUBY_RELATIVE(path, len) rubylib_mangled_path(path, len)
#define PREFIX_PATH() RUBY_RELATIVE(exec_prefix, sizeof(exec_prefix)-1)
#endif
load_path = GET_VM()->load_path;
if (safe_level == 0) {
-#ifdef MANGLED_PATH
- rubylib_mangled_path("", 0);
-#endif
ruby_push_include(getenv("RUBYLIB"), identical_path);
}
@@ -522,51 +462,38 @@ static void
add_modules(VALUE *req_list, const char *mod)
{
VALUE list = *req_list;
- VALUE feature;
if (!list) {
*req_list = list = rb_ary_new();
RBASIC(list)->klass = 0;
}
- feature = rb_str_new2(mod);
- RBASIC(feature)->klass = 0;
- rb_ary_push(list, feature);
+ rb_ary_push(list, rb_obj_freeze(rb_str_new2(mod)));
}
+extern void Init_ext(void);
+extern VALUE rb_vm_top_self(void);
+
static void
require_libraries(VALUE *req_list)
{
VALUE list = *req_list;
- VALUE self = rb_vm_top_self();
ID require;
rb_thread_t *th = GET_THREAD();
- rb_encoding *extenc = rb_default_external_encoding();
+ rb_block_t *prev_base_block = th->base_block;
int prev_parse_in_eval = th->parse_in_eval;
+ th->base_block = 0;
th->parse_in_eval = 0;
Init_ext(); /* should be called here for some reason :-( */
CONST_ID(require, "require");
while (list && RARRAY_LEN(list) > 0) {
VALUE feature = rb_ary_shift(list);
- rb_enc_associate(feature, extenc);
- RBASIC(feature)->klass = rb_cString;
- OBJ_FREEZE(feature);
- rb_funcall2(self, require, 1, &feature);
+ rb_funcall2(rb_vm_top_self(), require, 1, &feature);
}
*req_list = 0;
th->parse_in_eval = prev_parse_in_eval;
-}
-
-static rb_env_t*
-toplevel_context(VALUE toplevel_binding)
-{
- rb_env_t *env;
- rb_binding_t *bind;
-
- GetBindingPtr(toplevel_binding, bind);
- GetEnvPtr(bind->env, env);
- return env;
+ th->base_block = prev_base_block;
}
static void
@@ -633,6 +560,8 @@ process_sflag(int *sflag)
}
}
+NODE *rb_parser_append_print(VALUE, NODE *);
+NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
static long proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt);
static void
@@ -683,16 +612,16 @@ moreswitches(const char *s, struct cmdline_options *opt, int envopt)
}
#define NAME_MATCH_P(name, str, len) \
- ((len) < (int)sizeof(name) && strncmp((str), (name), (len)) == 0)
+ ((len) < (int)sizeof(name) && strncmp((str), name, (len)) == 0)
#define UNSET_WHEN(name, bit, str, len) \
- if (NAME_MATCH_P((name), (str), (len))) { \
+ if (NAME_MATCH_P(name, str, len)) { \
*(unsigned int *)arg &= ~(bit); \
return; \
}
#define SET_WHEN(name, bit, str, len) \
- if (NAME_MATCH_P((name), (str), (len))) { \
+ if (NAME_MATCH_P(name, str, len)) { \
*(unsigned int *)arg |= (bit); \
return; \
}
@@ -730,7 +659,6 @@ dump_option(const char *str, int len, void *arg)
SET_WHEN_DUMP(version);
SET_WHEN_DUMP(copyright);
SET_WHEN_DUMP(usage);
- SET_WHEN_DUMP(help);
SET_WHEN_DUMP(yydebug);
SET_WHEN_DUMP(syntax);
SET_WHEN_DUMP(parsetree);
@@ -757,11 +685,11 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
}
#define set_internal_encoding_once(opt, e, elen) \
- set_option_encoding_once("default_internal", &(opt)->intern.enc.name, (e), (elen))
+ set_option_encoding_once("default_internal", &opt->intern.enc.name, e, elen)
#define set_external_encoding_once(opt, e, elen) \
- set_option_encoding_once("default_external", &(opt)->ext.enc.name, (e), (elen))
+ set_option_encoding_once("default_external", &opt->ext.enc.name, e, elen)
#define set_source_encoding_once(opt, e, elen) \
- set_option_encoding_once("source", &(opt)->src.enc.name, (e), (elen))
+ set_option_encoding_once("source", &opt->src.enc.name, e, elen)
static long
proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
@@ -774,7 +702,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
for (argc--, argv++; argc > 0; argc--, argv++) {
const char *const arg = argv[0];
- if (!arg || arg[0] != '-' || !arg[1])
+ if (arg[0] != '-' || !arg[1])
break;
s = arg + 1;
@@ -813,7 +741,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
s++;
goto reswitch;
}
- opt->dump |= DUMP_BIT(version_v);
+ ruby_show_version();
opt->verbose = 1;
case 'w':
ruby_verbose = Qtrue;
@@ -1036,17 +964,17 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
s++;
# define is_option_end(c, allow_hyphen) \
- (!(c) || ((allow_hyphen) && (c) == '-') || (c) == '=')
+ (!(c) || (allow_hyphen && (c) == '-') || (c) == '=')
# define check_envopt(name, allow_envopt) \
- (((allow_envopt) || !envopt) ? (void)0 : \
+ ((allow_envopt || !envopt) ? (void)0 : \
rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: --" name))
# define need_argument(name, s) \
- ((*(s)++ ? !*(s) : (!--argc || !((s) = *++argv))) ? \
+ ((*s++ ? !*s : (!--argc || !(s = *++argv))) ? \
rb_raise(rb_eRuntimeError, "missing argument for --" name) \
: (void)0)
# define is_option_with_arg(name, allow_hyphen, allow_envopt) \
- (strncmp((name), s, n = sizeof(name) - 1) == 0 && is_option_end(s[n], (allow_hyphen)) ? \
- (check_envopt(name, (allow_envopt)), s += n, need_argument(name, s), 1) : 0)
+ (strncmp(name, s, n = sizeof(name) - 1) == 0 && is_option_end(s[n], allow_hyphen) ? \
+ (check_envopt(name, allow_envopt), s += n, need_argument(name, s), 1) : 0)
if (strcmp("copyright", s) == 0) {
if (envopt) goto noenvopt_long;
@@ -1078,7 +1006,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
if (!*(s = ++p)) break;
set_encoding_part(internal);
if (!*(s = ++p)) break;
-#if defined ALLOW_DEFAULT_SOURCE_ENCODING && ALLOW_DEFAULT_SOURCE_ENCODING
+#if ALLOW_DEFAULT_SOURCE_ENCODING
set_encoding_part(source);
if (!*(s = ++p)) break;
#endif
@@ -1093,7 +1021,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
else if (is_option_with_arg("external-encoding", Qfalse, Qtrue)) {
set_external_encoding_once(opt, s, 0);
}
-#if defined ALLOW_DEFAULT_SOURCE_ENCODING && ALLOW_DEFAULT_SOURCE_ENCODING
+#if ALLOW_DEFAULT_SOURCE_ENCODING
else if (is_option_with_arg("source-encoding", Qfalse, Qtrue)) {
set_source_encoding_once(opt, s, 0);
}
@@ -1115,7 +1043,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
}
else if (strcmp("help", s) == 0) {
if (envopt) goto noenvopt_long;
- opt->dump |= DUMP_BIT(help);
+ opt->dump |= DUMP_BIT(usage);
goto switch_end;
}
else {
@@ -1165,9 +1093,12 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
return argc0 - argc;
}
+void Init_prelude(void);
+
static void
-ruby_init_prelude(void)
+ruby_init_gems(int enable)
{
+ if (enable) rb_define_module("Gem");
Init_prelude();
rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
}
@@ -1211,7 +1142,7 @@ uscore_get(void)
VALUE line;
line = rb_lastline_get();
- if (!RB_TYPE_P(line, T_STRING)) {
+ if (TYPE(line) != T_STRING) {
rb_raise(rb_eTypeError, "$_ value need to be String (%s given)",
NIL_P(line) ? "nil" : rb_obj_classname(line));
}
@@ -1229,9 +1160,11 @@ uscore_get(void)
*/
static VALUE
-rb_f_sub(int argc, VALUE *argv)
+rb_f_sub(argc, argv)
+ int argc;
+ VALUE *argv;
{
- VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("sub"), argc, argv);
+ VALUE str = rb_funcall3(uscore_get(), rb_intern("sub"), argc, argv);
rb_lastline_set(str);
return str;
}
@@ -1248,9 +1181,11 @@ rb_f_sub(int argc, VALUE *argv)
*/
static VALUE
-rb_f_gsub(int argc, VALUE *argv)
+rb_f_gsub(argc, argv)
+ int argc;
+ VALUE *argv;
{
- VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("gsub"), argc, argv);
+ VALUE str = rb_funcall3(uscore_get(), rb_intern("gsub"), argc, argv);
rb_lastline_set(str);
return str;
}
@@ -1268,7 +1203,7 @@ rb_f_gsub(int argc, VALUE *argv)
static VALUE
rb_f_chop(void)
{
- VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("chop"), 0, 0);
+ VALUE str = rb_funcall3(uscore_get(), rb_intern("chop"), 0, 0);
rb_lastline_set(str);
return str;
}
@@ -1286,15 +1221,17 @@ rb_f_chop(void)
*/
static VALUE
-rb_f_chomp(int argc, VALUE *argv)
+rb_f_chomp(argc, argv)
+ int argc;
+ VALUE *argv;
{
- VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("chomp"), argc, argv);
+ VALUE str = rb_funcall3(uscore_get(), rb_intern("chomp"), argc, argv);
rb_lastline_set(str);
return str;
}
-/* blank function in dmyext.c or generated by enc/make_encmake.rb */
-extern void Init_enc(void);
+void rb_stdio_set_default_encoding(void);
+VALUE rb_parser_dump_tree(NODE *node, int comment);
static VALUE
process_options(int argc, char **argv, struct cmdline_options *opt)
@@ -1307,13 +1244,13 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
char fbuf[MAXPATHLEN];
int i = (int)proc_options(argc, argv, opt, 0);
rb_thread_t *th = GET_THREAD();
- VALUE toplevel_binding = Qundef;
+ rb_env_t *env = 0;
argc -= i;
argv += i;
- if (opt->dump & (DUMP_BIT(usage)|DUMP_BIT(help))) {
- usage(origarg.argv[0], (opt->dump & DUMP_BIT(help)));
+ if (opt->dump & DUMP_BIT(usage)) {
+ usage(origarg.argv[0]);
return Qtrue;
}
@@ -1333,12 +1270,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
opt->intern.enc.name = int_enc_name;
}
- if (opt->src.enc.name)
- rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
-
- if (opt->dump & (DUMP_BIT(version) | DUMP_BIT(version_v))) {
+ if (opt->dump & DUMP_BIT(version)) {
ruby_show_version();
- if (opt->dump & DUMP_BIT(version)) return Qtrue;
+ return Qtrue;
}
if (opt->dump & DUMP_BIT(copyright)) {
ruby_show_copyright();
@@ -1357,7 +1291,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
}
else {
opt->script = argv[0];
- if (!opt->script || opt->script[0] == '\0') {
+ if (opt->script[0] == '\0') {
opt->script = "-";
}
else if (opt->do_search) {
@@ -1383,13 +1317,12 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
#if defined DOSISH || defined __CYGWIN__
translit_char(RSTRING_PTR(opt->script_name), '\\', '/');
#endif
+ rb_obj_freeze(opt->script_name);
ruby_init_loadpath_safe(opt->safe_level);
- Init_enc();
rb_enc_find_index("encdb");
lenc = rb_locale_encoding();
rb_enc_associate(rb_progname, lenc);
- rb_obj_freeze(rb_progname);
parser = rb_parser_new();
if (opt->dump & DUMP_BIT(yydebug)) {
rb_parser_set_yydebug(parser, Qtrue);
@@ -1417,30 +1350,27 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
opt->intern.enc.index = -1;
}
rb_enc_associate(opt->script_name, lenc);
- rb_obj_freeze(opt->script_name);
{
long i;
VALUE load_path = GET_VM()->load_path;
for (i = 0; i < RARRAY_LEN(load_path); ++i) {
- RARRAY_PTR(load_path)[i] =
- rb_enc_associate(rb_str_dup(RARRAY_PTR(load_path)[i]), lenc);
+ rb_enc_associate(RARRAY_PTR(load_path)[i], lenc);
}
}
- if (!(opt->disable & DISABLE_BIT(gems))) {
-#if defined DISABLE_RUBYGEMS && DISABLE_RUBYGEMS
- rb_require("rubygems");
-#else
- rb_define_module("Gem");
-#endif
- }
- ruby_init_prelude();
+ ruby_init_gems(!(opt->disable & DISABLE_BIT(gems)));
ruby_set_argv(argc, argv);
process_sflag(&opt->sflag);
- toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
+ {
+ /* set eval context */
+ VALUE toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
+ rb_binding_t *bind;
+
+ GetBindingPtr(toplevel_binding, bind);
+ GetEnvPtr(bind->env, env);
+ }
#define PREPARE_PARSE_MAIN(expr) do { \
- rb_env_t *env = toplevel_context(toplevel_binding); \
th->parse_in_eval--; \
th->base_block = &env->block; \
expr; \
@@ -1458,9 +1388,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
eenc = lenc;
}
rb_enc_associate(opt->e_script, eenc);
- ruby_set_script_name(opt->script_name);
+ rb_vm_set_progname(rb_progname = opt->script_name);
require_libraries(&opt->req_list);
- ruby_set_script_name(progname);
+ rb_vm_set_progname(rb_progname = progname);
PREPARE_PARSE_MAIN({
tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
@@ -1472,10 +1402,11 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
}
PREPARE_PARSE_MAIN({
- tree = load_file(parser, opt->script_name, 1, opt);
+ tree = load_file(parser, opt->script, 1, opt);
});
}
- ruby_set_script_name(opt->script_name);
+ rb_progname = opt->script_name;
+ rb_vm_set_progname(rb_progname);
if (opt->dump & DUMP_BIT(yydebug)) return Qtrue;
if (opt->ext.enc.index >= 0) {
@@ -1533,9 +1464,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
PREPARE_PARSE_MAIN({
VALUE path = Qnil;
- if (!opt->e_script && strcmp(opt->script, "-")) {
- path = rb_realpath_internal(Qnil, opt->script_name, 1);
- }
+ if (!opt->e_script && strcmp(opt->script, "-")) path = opt->script_name;
iseq = rb_iseq_new_main(tree, opt->script_name, path);
});
@@ -1550,14 +1479,13 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_define_readonly_boolean("$-a", opt->do_split);
rb_set_safe_level(opt->safe_level);
- rb_gc_set_params();
return iseq;
}
struct load_file_arg {
VALUE parser;
- VALUE fname;
+ const char *fname;
int script;
struct cmdline_options *opt;
};
@@ -1568,9 +1496,7 @@ load_file_internal(VALUE arg)
extern VALUE rb_stdin;
struct load_file_arg *argp = (struct load_file_arg *)arg;
VALUE parser = argp->parser;
- VALUE fname_v = rb_str_encode_ospath(argp->fname);
- const char *fname = StringValueCStr(fname_v);
- const char *orig_fname = StringValueCStr(argp->fname);
+ const char *fname = argp->fname;
int script = argp->script;
struct cmdline_options *opt = argp->opt;
VALUE f;
@@ -1578,8 +1504,9 @@ load_file_internal(VALUE arg)
NODE *tree = 0;
rb_encoding *enc;
ID set_encoding;
- int xflag = 0;
+ if (!fname)
+ rb_load_fail(fname);
if (strcmp(fname, "-") == 0) {
f = rb_stdin;
}
@@ -1588,27 +1515,14 @@ load_file_internal(VALUE arg)
#if defined DOSISH || defined __CYGWIN__
{
const char *ext = strrchr(fname, '.');
- if (ext && STRCASECMP(ext, ".exe") == 0) {
+ if (ext && STRCASECMP(ext, ".exe") == 0)
mode |= O_BINARY;
- xflag = 1;
- }
}
#endif
- if ((fd = rb_cloexec_open(fname, mode, 0)) < 0) {
- rb_load_fail(fname_v, strerror(errno));
+ if ((fd = open(fname, mode)) < 0) {
+ rb_load_fail(fname);
}
- rb_update_max_fd(fd);
-#if !defined DOSISH && !defined __CYGWIN__
- {
- struct stat st;
- if (fstat(fd, &st) != 0)
- rb_load_fail(fname_v, strerror(errno));
- if (S_ISDIR(st.st_mode)) {
- errno = EISDIR;
- rb_load_fail(fname_v, strerror(EISDIR));
- }
- }
-#endif
+
f = rb_io_fdopen(fd, mode, fname);
}
@@ -1624,7 +1538,7 @@ load_file_internal(VALUE arg)
enc = rb_ascii8bit_encoding();
rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
- if (xflag || opt->xflag) {
+ if (opt->xflag) {
line_start--;
search_shebang:
forbid_setid("-x");
@@ -1639,7 +1553,7 @@ load_file_internal(VALUE arg)
}
}
}
- rb_loaderror("no Ruby script found in input");
+ rb_raise(rb_eLoadError, "no Ruby script found in input");
}
c = rb_io_getbyte(f);
@@ -1689,7 +1603,7 @@ load_file_internal(VALUE arg)
if (f != rb_stdin) rb_io_close(f);
f = Qnil;
}
- ruby_set_script_name(opt->script_name);
+ rb_vm_set_progname(rb_progname = opt->script_name);
require_libraries(&opt->req_list); /* Why here? unnatural */
}
if (opt->src.enc.index >= 0) {
@@ -1699,29 +1613,17 @@ load_file_internal(VALUE arg)
enc = rb_locale_encoding();
}
else {
- enc = rb_utf8_encoding();
+ enc = rb_usascii_encoding();
}
if (NIL_P(f)) {
f = rb_str_new(0, 0);
rb_enc_associate(f, enc);
- return (VALUE)rb_parser_compile_string(parser, orig_fname, f, line_start);
+ return (VALUE)rb_parser_compile_string(parser, fname, f, line_start);
}
rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
- tree = rb_parser_compile_file(parser, orig_fname, f, line_start);
+ tree = rb_parser_compile_file(parser, fname, f, line_start);
rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
if (script && tree && rb_parser_end_seen_p(parser)) {
- /*
- * DATA is a File that contains the data section of the executed file.
- * To create a data section use <tt>__END__</tt>:
- *
- * $ cat t.rb
- * puts DATA.gets
- * __END__
- * hello world!
- *
- * $ ruby t.rb
- * hello world!
- */
rb_define_global_const("DATA", f);
}
else if (f != rb_stdin) {
@@ -1737,7 +1639,7 @@ restore_lineno(VALUE lineno)
}
static NODE *
-load_file(VALUE parser, VALUE fname, int script, struct cmdline_options *opt)
+load_file(VALUE parser, const char *fname, int script, struct cmdline_options *opt)
{
struct load_file_arg arg;
arg.parser = parser;
@@ -1751,11 +1653,66 @@ void *
rb_load_file(const char *fname)
{
struct cmdline_options opt;
- VALUE fname_v = rb_str_new_cstr(fname);
- return load_file(rb_parser_new(), fname_v, 0, cmdline_options_init(&opt));
+ return load_file(rb_parser_new(), fname, 0, cmdline_options_init(&opt));
}
+#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
+#if !defined(_WIN32)
+#define USE_ENVSPACE_FOR_ARG0
+#endif
+
+#ifdef USE_ENVSPACE_FOR_ARG0
+extern char **environ;
+#endif
+
+static size_t
+get_arglen(int argc, char **argv)
+{
+ char *s = argv[0];
+ int i;
+
+ if (!argc) return 0;
+ s += strlen(s);
+ /* See if all the arguments are contiguous in memory */
+ for (i = 1; i < argc; i++) {
+ if (argv[i] == s + 1) {
+ s++;
+ s += strlen(s); /* this one is ok too */
+ }
+ else {
+ break;
+ }
+ }
+#if defined(USE_ENVSPACE_FOR_ARG0)
+ if (environ && (s+1 == environ[0])) {
+ s++;
+ s += strlen(s);
+ for (i = 1; environ[i]; i++) {
+ if (environ[i] == s + 1) {
+ s++;
+ s += strlen(s); /* this one is ok too */
+ }
+ }
+# if defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
+ {
+ char *t = malloc(s - environ[0] + 1);
+ for (i = 0; environ[i]; i++) {
+ size_t len = strlen(environ[i]) + 1;
+ memcpy(t, environ[i], len);
+ environ[i] = t;
+ t += len;
+ }
+ }
+# else
+ ruby_setenv("", NULL); /* duplicate environ vars */
+# endif
+ }
+#endif
+ return s - argv[0];
+}
+#endif
+
static void
set_arg0(VALUE val, ID id)
{
@@ -1767,37 +1724,54 @@ set_arg0(VALUE val, ID id)
StringValue(val);
s = RSTRING_PTR(val);
i = RSTRING_LEN(val);
-
+#if defined(PSTAT_SETCMD)
+ if (i > PST_CLEN) {
+ union pstun un;
+ char buf[PST_CLEN + 1]; /* PST_CLEN is 64 (HP-UX 11.23) */
+ strlcpy(buf, s, sizeof(buf));
+ un.pst_command = buf;
+ pstat(PSTAT_SETCMD, un, PST_CLEN, 0, 0);
+ }
+ else {
+ union pstun un;
+ un.pst_command = s;
+ pstat(PSTAT_SETCMD, un, i, 0, 0);
+ }
+#elif defined(HAVE_SETPROCTITLE)
setproctitle("%.*s", (int)i, s);
+#else
+
+ if ((size_t)i > origarg.len - origarg.argc) {
+ i = (long)(origarg.len - origarg.argc);
+ }
+
+ memcpy(origarg.argv[0], s, i);
+
+ {
+ int j;
+ char *t = origarg.argv[0] + i;
+ *t = '\0';
+ if ((size_t)(i + 1) < origarg.len) {
+ memset(t + 1, '\0', origarg.len - i - 1);
+ }
+ for (j = 1; j < origarg.argc; j++) {
+ origarg.argv[j] = t;
+ }
+ }
+#endif
rb_progname = rb_obj_freeze(rb_external_str_new(s, i));
}
-/*! Sets the current script name to this value.
- *
- * This is similiar to <code>$0 = name</code> in Ruby level but also affects
- * <code>Method#location</code> and others.
- */
void
ruby_script(const char *name)
{
if (name) {
- rb_progname = rb_external_str_new(name, strlen(name));
+ rb_progname = rb_obj_freeze(rb_external_str_new(name, strlen(name)));
rb_vm_set_progname(rb_progname);
}
}
-/*! Sets the current script name to this value.
- *
- * Same as ruby_script() but accepts a VALUE.
- */
-void
-ruby_set_script_name(VALUE name)
-{
- rb_progname = rb_str_dup(name);
- rb_vm_set_progname(rb_progname);
-}
-
static void
init_ids(struct cmdline_options *opt)
{
@@ -1843,12 +1817,10 @@ opt_W_getter(ID id, void *data)
return INT2FIX(1);
case Qtrue:
return INT2FIX(2);
- default:
- return Qnil;
}
+ return Qnil; /* not reached */
}
-/*! Defines built-in variables */
void
ruby_prog_init(void)
{
@@ -1862,13 +1834,6 @@ ruby_prog_init(void)
rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0);
rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
- /*
- * ARGV contains the command line arguments used to run ruby with the
- * first value containing the name of the executable.
- *
- * A library like OptionParser can be used to process command-line
- * arguments.
- */
rb_define_global_const("ARGV", rb_argv);
}
@@ -1886,7 +1851,7 @@ ruby_set_argv(int argc, char **argv)
#endif
rb_ary_clear(av);
for (i = 0; i < argc; i++) {
- VALUE arg = rb_external_str_new_cstr(argv[i]);
+ VALUE arg = rb_external_str_new(argv[i], strlen(argv[i]));
OBJ_FREEZE(arg);
rb_ary_push(av, arg);
@@ -1898,59 +1863,14 @@ ruby_process_options(int argc, char **argv)
{
struct cmdline_options opt;
VALUE iseq;
- const char *script_name = (argc > 0 && argv[0]) ? argv[0] : "ruby";
- ruby_script(script_name); /* for the time being */
+ ruby_script(argv[0]); /* for the time being */
rb_argv0 = rb_str_new4(rb_progname);
rb_gc_register_mark_object(rb_argv0);
iseq = process_options(argc, argv, cmdline_options_init(&opt));
-
-#ifndef HAVE_SETPROCTITLE
- {
- extern void ruby_init_setproctitle(int argc, char *argv[]);
- ruby_init_setproctitle(argc, argv);
- }
-#endif
-
return (void*)(struct RData*)iseq;
}
-static void
-fill_standard_fds(void)
-{
- int f0, f1, f2, fds[2];
- struct stat buf;
- f0 = fstat(0, &buf) == -1 && errno == EBADF;
- f1 = fstat(1, &buf) == -1 && errno == EBADF;
- f2 = fstat(2, &buf) == -1 && errno == EBADF;
- if (f0) {
- if (pipe(fds) == 0) {
- close(fds[1]);
- if (fds[0] != 0) {
- dup2(fds[0], 0);
- close(fds[0]);
- }
- }
- }
- if (f1 || f2) {
- if (pipe(fds) == 0) {
- close(fds[0]);
- if (f1 && fds[1] != 1)
- dup2(fds[1], 1);
- if (f2 && fds[1] != 2)
- dup2(fds[1], 2);
- if (fds[1] != 1 && fds[1] != 2)
- close(fds[1]);
- }
- }
-}
-
-/*! Initializes the process for ruby(1).
- *
- * This function assumes this process is ruby(1) and it has just started.
- * Usually programs that embeds CRuby interpreter should not call this function,
- * and should do their own initialization.
- */
void
ruby_sysinit(int *argc, char ***argv)
{
@@ -1960,8 +1880,10 @@ ruby_sysinit(int *argc, char ***argv)
#endif
origarg.argc = *argc;
origarg.argv = *argv;
+#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
+ origarg.len = get_arglen(origarg.argc, origarg.argv);
+#endif
#if defined(USE_DLN_A_OUT)
dln_argv0 = origarg.argv[0];
#endif
- fill_standard_fds();
}
diff --git a/ruby_atomic.h b/ruby_atomic.h
deleted file mode 100644
index 789efdc4ea..0000000000
--- a/ruby_atomic.h
+++ /dev/null
@@ -1,170 +0,0 @@
-#ifndef RUBY_ATOMIC_H
-#define RUBY_ATOMIC_H
-
-#if 0
-#elif defined HAVE_GCC_ATOMIC_BUILTINS
-typedef unsigned int rb_atomic_t;
-# define ATOMIC_SET(var, val) (void)__atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST)
-# define ATOMIC_INC(var) __atomic_fetch_add(&(var), 1, __ATOMIC_SEQ_CST)
-# define ATOMIC_DEC(var) __atomic_fetch_sub(&(var), 1, __ATOMIC_SEQ_CST)
-# define ATOMIC_OR(var, val) __atomic_or_fetch(&(var), (val), __ATOMIC_SEQ_CST)
-# define ATOMIC_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST)
-# define ATOMIC_CAS(var, oldval, newval) \
-({ __typeof__(oldval) oldvaldup = (oldval); /* oldval should not be modified */ \
- __atomic_compare_exchange_n(&(var), &oldvaldup, (newval), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \
- oldvaldup; })
-
-# define ATOMIC_SIZE_ADD(var, val) __atomic_fetch_add(&(var), (val), __ATOMIC_SEQ_CST)
-# define ATOMIC_SIZE_SUB(var, val) __atomic_fetch_sub(&(var), (val), __ATOMIC_SEQ_CST)
-
-# define ATOMIC_PTR_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST)
-
-#elif defined HAVE_GCC_SYNC_BUILTINS
-/* @shyouhei hack to support atomic operations in case of gcc. Gcc
- * has its own pseudo-insns to support them. See info, or
- * http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html */
-
-typedef unsigned int rb_atomic_t; /* Anything OK */
-# define ATOMIC_SET(var, val) (void)__sync_lock_test_and_set(&(var), (val))
-# define ATOMIC_INC(var) __sync_fetch_and_add(&(var), 1)
-# define ATOMIC_DEC(var) __sync_fetch_and_sub(&(var), 1)
-# define ATOMIC_OR(var, val) __sync_or_and_fetch(&(var), (val))
-# define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
-# define ATOMIC_CAS(var, oldval, newval) __sync_val_compare_and_swap(&(var), (oldval), (newval))
-
-# define ATOMIC_SIZE_ADD(var, val) __sync_fetch_and_add(&(var), (val))
-# define ATOMIC_SIZE_SUB(var, val) __sync_fetch_and_sub(&(var), (val))
-
-# define ATOMIC_PTR_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
-
-#elif defined _WIN32
-#if defined _MSC_VER && _MSC_VER > 1200
-#pragma intrinsic(_InterlockedOr)
-#endif
-typedef LONG rb_atomic_t;
-
-# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
-# define ATOMIC_INC(var) InterlockedIncrement(&(var))
-# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
-#if defined __GNUC__
-# define ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val))
-#elif defined _MSC_VER && _MSC_VER <= 1200
-# define ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val))
-static inline void
-rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
-{
-#ifdef _M_IX86
- __asm mov eax, var;
- __asm mov ecx, val;
- __asm lock or [eax], ecx;
-#else
-#error unsupported architecture
-#endif
-}
-#else
-# define ATOMIC_OR(var, val) _InterlockedOr(&(var), (val))
-#endif
-# define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val))
-# define ATOMIC_CAS(var, oldval, newval) InterlockedCompareExchange(&(var), (newval), (oldval))
-# if defined _MSC_VER && _MSC_VER <= 1200
-static inline rb_atomic_t
-rb_w32_atomic_cas(volatile rb_atomic_t *var, rb_atomic_t oldval, rb_atomic_t newval)
-{
- return (rb_atomic_t)InterlockedCompareExchange((PVOID *)var, (PVOID)newval, (PVOID)oldval);
-}
-# undef ATOMIC_CAS
-# define ATOMIC_CAS(var, oldval, newval) rb_w32_atomic_cas(&(var), (oldval), (newval))
-# endif
-# ifdef _M_AMD64
-# define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd64((LONG_LONG *)&(var), (val))
-# define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd64((LONG_LONG *)&(var), -(LONG)(val))
-# define ATOMIC_SIZE_INC(var) InterlockedIncrement64(&(var))
-# define ATOMIC_SIZE_DEC(var) InterlockedDecrement64(&(var))
-# define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange64(&(var), (val))
-# define ATOMIC_SIZE_CAS(var, oldval, val) InterlockedCompareExchange64(&(var), (oldval), (val))
-# else
-# define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd((LONG *)&(var), (val))
-# define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd((LONG *)&(var), -(LONG)(val))
-# define ATOMIC_SIZE_INC(var) InterlockedIncrement((LONG *)&(var))
-# define ATOMIC_SIZE_DEC(var) InterlockedDecrement((LONG *)&(var))
-# define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val))
-# endif
-
-#elif defined(__sun) && defined(HAVE_ATOMIC_H)
-#include <atomic.h>
-typedef unsigned int rb_atomic_t;
-
-# define ATOMIC_SET(var, val) (void)atomic_swap_uint(&(var), (val))
-# define ATOMIC_INC(var) atomic_inc_uint(&(var))
-# define ATOMIC_DEC(var) atomic_dec_uint(&(var))
-# define ATOMIC_OR(var, val) atomic_or_uint(&(var), (val))
-# define ATOMIC_EXCHANGE(var, val) atomic_swap_uint(&(var), (val))
-# define ATOMIC_CAS(var, oldval, newval) atomic_cas_uint(&(var), (oldval), (newval))
-
-# if SIZEOF_SIZE_T == SIZEOF_LONG
-# define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val))
-# define ATOMIC_SIZE_SUB(var, val) atomic_add_long(&(var), -(val))
-# define ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var))
-# define ATOMIC_SIZE_DEC(var) atomic_dec_ulong(&(var))
-# define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_ulong(&(var), (val))
-# define ATOMIC_SIZE_CAS(var, oldval, val) atomic_cas_ulong(&(var), (oldval), (val))
-# else
-# define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val))
-# define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val))
-# define ATOMIC_SIZE_INC(var) atomic_inc_uint(&(var))
-# define ATOMIC_SIZE_DEC(var) atomic_dec_uint(&(var))
-# define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_uint(&(var), (val))
-# endif
-
-#else
-typedef int rb_atomic_t;
-#define NEED_RUBY_ATOMIC_OPS
-extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
-extern rb_atomic_t ruby_atomic_compare_and_swap(rb_atomic_t *ptr,
- rb_atomic_t cmp,
- rb_atomic_t newval);
-
-# define ATOMIC_SET(var, val) (void)((var) = (val))
-# define ATOMIC_INC(var) ((var)++)
-# define ATOMIC_DEC(var) ((var)--)
-# define ATOMIC_OR(var, val) ((var) |= (val))
-# define ATOMIC_EXCHANGE(var, val) ruby_atomic_exchange(&(var), (val))
-# define ATOMIC_CAS(var, oldval, newval) ruby_atomic_compare_and_swap(&(var), (oldval), (newval))
-
-# define ATOMIC_SIZE_ADD(var, val) (void)((var) += (val))
-# define ATOMIC_SIZE_SUB(var, val) (void)((var) -= (val))
-# define ATOMIC_SIZE_EXCHANGE(var, val) atomic_size_exchange(&(var), (val))
-static inline size_t
-atomic_size_exchange(size_t *ptr, size_t val)
-{
- size_t old = *ptr;
- *ptr = val;
- return old;
-}
-#endif
-
-#ifndef ATOMIC_SIZE_INC
-# define ATOMIC_SIZE_INC(var) ATOMIC_INC(var)
-#endif
-#ifndef ATOMIC_SIZE_DEC
-# define ATOMIC_SIZE_DEC(var) ATOMIC_DEC(var)
-#endif
-#ifndef ATOMIC_SIZE_EXCHANGE
-# define ATOMIC_SIZE_EXCHANGE(var, val) ATOMIC_EXCHANGE(var, val)
-#endif
-#ifndef ATOMIC_SIZE_CAS
-# define ATOMIC_SIZE_CAS(var, oldval, val) ATOMIC_CAS(var, oldval, val)
-#endif
-
-#ifndef ATOMIC_PTR_EXCHANGE
-# if SIZEOF_VOIDP == SIZEOF_SIZE_T
-# define ATOMIC_PTR_EXCHANGE(var, val) (void *)ATOMIC_SIZE_EXCHANGE(*(size_t *)&(var), (size_t)(val))
-# endif
-#endif
-#ifndef ATOMIC_PTR_CAS
-# if SIZEOF_VOIDP == SIZEOF_SIZE_T
-# define ATOMIC_PTR_CAS(var, oldval, val) (void *)ATOMIC_SIZE_CAS(*(size_t *)&(var), (size_t)(oldval), (size_t)(val))
-# endif
-#endif
-
-#endif /* RUBY_ATOMIC_H */
diff --git a/safe.c b/safe.c
index 05c1aa395b..bb725e1394 100644
--- a/safe.c
+++ b/safe.c
@@ -1,6 +1,6 @@
/**********************************************************************
- safe.c -
+ eval.c -
$Author$
created at: Tue Sep 23 09:44:32 JST 2008
@@ -122,7 +122,7 @@ void
rb_check_safe_str(VALUE x)
{
rb_check_safe_obj(x);
- if (!RB_TYPE_P(x, T_STRING)) {
+ if (TYPE(x) != T_STRING) {
rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
rb_obj_classname(x));
}
diff --git a/sample/README b/sample/README
index 796aba1dc3..c1b9532203 100644
--- a/sample/README
+++ b/sample/README
@@ -23,7 +23,7 @@ less.rb front end for less
list.rb stupid object sample
list2.rb stupid object sample
list3.rb stupid object sample
-mine.rb simple mine sweeper
+mine.rb simple mine sweeper
mkproto.rb extract prototype from C
mpart.rb split file int multi part
observ.rb observer design pattern sample
diff --git a/sample/biorhythm.rb b/sample/biorhythm.rb
index bd7c39f5aa..6465daa29f 100644
--- a/sample/biorhythm.rb
+++ b/sample/biorhythm.rb
@@ -1,13 +1,13 @@
#!/usr/local/bin/ruby
#
-# biorhythm.rb -
+# biorhythm.rb -
# $Release Version: $
# $Revision$
# by Yasuo OHBA(STAFS Development Room)
#
# --
#
-#
+#
#
# probably based on:
@@ -29,13 +29,13 @@ require "date.rb"
require "optparse"
require "optparse/date"
-def print_header(y, m, d, p, w)
+def printHeader(y, m, d, p, w)
print "\n>>> Biorhythm <<<\n"
printf "The birthday %04d.%02d.%02d is a %s\n", y, m, d, w
printf "Age in days: [%d]\n\n", p
end
-def get_position(z)
+def getPosition(z)
pi = Math::PI
z = Integer(z)
phys = (50.0 * (1.0 + sin((z / 23.0 - (z / 23)) * 360.0 * pi / 180.0))).to_i
@@ -89,25 +89,25 @@ ausgabeart = options[:graph] ? "g" : "v"
display_period = options[:days]
if ausgabeart == "v"
- print_header(bd.year, bd.month, bd.day, dd - bd, bd.strftime("%a"))
+ printHeader(bd.year, bd.month, bd.day, dd - bd, bd.strftime("%a"))
print "\n"
-
- phys, emot, geist = get_position(dd - bd)
+
+ phys, emot, geist = getPosition(dd - bd)
printf "Biorhythm: %04d.%02d.%02d\n", dd.year, dd.month, dd.day
printf "Physical: %d%%\n", phys
printf "Emotional: %d%%\n", emot
printf "Mental: %d%%\n", geist
print "\n"
else
- print_header(bd.year, bd.month, bd.day, dd - bd, bd.strftime("%a"))
+ printHeader(bd.year, bd.month, bd.day, dd - bd, bd.strftime("%a"))
print " P=physical, E=emotional, M=mental\n"
print " -------------------------+-------------------------\n"
print " Bad Condition | Good Condition\n"
print " -------------------------+-------------------------\n"
-
+
(dd - bd).step(dd - bd + display_period) do |z|
- phys, emot, geist = get_position(z)
-
+ phys, emot, geist = getPosition(z)
+
printf "%04d.%02d.%02d : ", dd.year, dd.month, dd.day
p = (phys / 2.0 + 0.5).to_i
e = (emot / 2.0 + 0.5).to_i
diff --git a/sample/coverage.rb b/sample/coverage.rb
index 1e036f95f9..5e15f99716 100644
--- a/sample/coverage.rb
+++ b/sample/coverage.rb
@@ -17,7 +17,7 @@ at_exit do
File.writable?(f) || File.writable?(File.dirname(f))
end
unless writable[cfile]
- cfile = cfile.gsub(File::PATH_SEPARATOR, "#")
+ cfile = cfile.gsub(File.PATH_SEPARATOR, "#")
next unless writable[cfile]
end
diff --git a/sample/drb/README.rd.ja b/sample/drb/README.rd.ja
index ec78dc70dd..04143b9ad5 100644
--- a/sample/drb/README.rd.ja
+++ b/sample/drb/README.rd.ja
@@ -1,59 +1,59 @@
-= サンプルスクリプト
+= ¥µ¥ó¥×¥ë¥¹¥¯¥ê¥×¥È
-* Arrayをリモートã‹ã‚‰åˆ©ç”¨ã—ã¦ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã‚’試ã™ã€‚
+* Array¤ò¥ê¥â¡¼¥È¤«¤éÍøÍѤ·¤Æ¥¤¥Æ¥ì¡¼¥¿¤ò»î¤¹¡£
* darray.rb --- server
* darrayc.rb --- client
-* 簡易ãƒãƒ£ãƒƒãƒˆ
+* ´Ê°×¥Á¥ã¥Ã¥È
* dchats.rb --- server
* dchatc.rb --- client
-* 分散chasen
+* ʬ»¶chasen
* dhasen.rb --- server
* dhasenc.rb --- client
-* 簡易ログサーãƒ
+* ´Ê°×¥í¥°¥µ¡¼¥Ð
* dlogd.rb --- server
* dlogc.rb --- client
-* Queueサーãƒã€‚
- クライアントdqin.rbã¯Queueサーãƒã®çŸ¥ã‚‰ãªã„オブジェクト(DQEntry)ã‚’
- pushã™ã‚‹ãŒDRbUnknownã«ã‚ˆã‚Šã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆdqout.rbãŒpopã§ãる。
+* Queue¥µ¡¼¥Ð¡£
+ ¥¯¥é¥¤¥¢¥ó¥Èdqin.rb¤ÏQueue¥µ¡¼¥Ð¤ÎÃΤé¤Ê¤¤¥ª¥Ö¥¸¥§¥¯¥È(DQEntry)¤ò
+ push¤¹¤ë¤¬DRbUnknown¤Ë¤è¤ê¥¯¥é¥¤¥¢¥ó¥Èdqout.rb¤¬pop¤Ç¤­¤ë¡£
* dqueue.rb --- server
- * dqin.rb --- client。DQEntryオブジェクトをpushã™ã‚‹
- * dqout.rb --- client。DQEntryオブジェクトをpopã™ã‚‹
- * dqlib.rb --- DQEntryを定義ã—ãŸãƒ©ã‚¤ãƒ–ラリ
+ * dqin.rb --- client¡£DQEntry¥ª¥Ö¥¸¥§¥¯¥È¤òpush¤¹¤ë
+ * dqout.rb --- client¡£DQEntry¥ª¥Ö¥¸¥§¥¯¥È¤òpop¤¹¤ë
+ * dqlib.rb --- DQEntry¤òÄêµÁ¤·¤¿¥é¥¤¥Ö¥é¥ê
-* åå‰ã«ã‚ˆã‚‹å‚ç…§
- IdConvをカスタマイズã—ã¦idã§ãªãåå‰ã§å‚ç…§ã™ã‚‹ä¾‹
+* ̾Á°¤Ë¤è¤ë»²¾È
+ IdConv¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤Æid¤Ç¤Ê¤¯Ì¾Á°¤Ç»²¾È¤¹¤ëÎã
* name.rb --- server
* namec.rb --- client
-* extservã®ã‚µãƒ³ãƒ—ル
+* extserv¤Î¥µ¥ó¥×¥ë
* extserv_test.rb
-* TimerIdConvã®ä½¿ç”¨ä¾‹
- * holders.rb --- server。ruby -d hodlers.rbã¨ã™ã‚‹ã¨TimerIdConvを使用ã™ã‚‹ã€‚
+* TimerIdConv¤Î»ÈÍÑÎã
+ * holders.rb --- server¡£ruby -d hodlers.rb¤È¤¹¤ë¤ÈTimerIdConv¤ò»ÈÍѤ¹¤ë¡£
* holderc.rb --- client
-* rinda.rbã®ä½¿ç”¨ä¾‹
- * rinda_ts.rb --- TupleSpaceサーãƒã€‚
- * rindac.rb --- TupleSpaceã®clientã§ã‚¢ãƒ—リケーションã®client
- * rindas.rb --- TupleSpaceã®clientã§ã‚¢ãƒ—リケーションã®server
+* rinda.rb¤Î»ÈÍÑÎã
+ * rinda_ts.rb --- TupleSpace¥µ¡¼¥Ð¡£
+ * rindac.rb --- TupleSpace¤Îclient¤Ç¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îclient
+ * rindas.rb --- TupleSpace¤Îclient¤Ç¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îserver
-* observerã®ä½¿ç”¨ä¾‹
+* observer¤Î»ÈÍÑÎã
cdbiff - ((<URI:http://namazu.org/~satoru/cdbiff/>))
* dbiff.rb --- dcdbiff server
* dcdbiff.rb --- dcdbiff client
-* drbsslã®ä½¿ç”¨ä¾‹
+* drbssl¤Î»ÈÍÑÎã
* drbssl_s.rb
* drbssl_c.rb
-* DRbProtoclã®è¿½åР例
+* DRbProtocl¤ÎÄɲÃÎã
* http0.rb
* http0serv.rb
-* ringã®ä½¿ç”¨ä¾‹
+* ring¤Î»ÈÍÑÎã
* ring_place.rb
* ring_echo.rb
diff --git a/sample/drb/darray.rb b/sample/drb/darray.rb
index d2ac39513f..95ee01ff03 100644
--- a/sample/drb/darray.rb
+++ b/sample/drb/darray.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- Array
- Copyright (c) 1999-2001 Masatoshi SEKI
+ Copyright (c) 1999-2001 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/darrayc.rb b/sample/drb/darrayc.rb
index 579e11564e..b181d22699 100644
--- a/sample/drb/darrayc.rb
+++ b/sample/drb/darrayc.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- Array client
- Copyright (c) 1999-2001 Masatoshi SEKI
+ Copyright (c) 1999-2001 Masatoshi SEKI
=end
require 'drb/drb'
@@ -19,7 +19,7 @@ p a
puts "# find"
p ro.find { |x| x.kind_of? String }
-
+
puts "# each, break"
ro.each do |x|
next if x == "five"
diff --git a/sample/drb/dbiff.rb b/sample/drb/dbiff.rb
index b50edc0898..8faef50b07 100644
--- a/sample/drb/dbiff.rb
+++ b/sample/drb/dbiff.rb
@@ -18,13 +18,13 @@ class Biff
def run
last = Time.now
while true
- begin
+ begin
sleep(@interval)
current = File::mtime(@filename)
if current > last
changed
begin
- notify_observers(@filename, current)
+ notify_observers(@filename, current)
rescue Error
end
last = current
diff --git a/sample/drb/dchatc.rb b/sample/drb/dchatc.rb
index 2b8ddbf4cc..b506f5bbba 100644
--- a/sample/drb/dchatc.rb
+++ b/sample/drb/dchatc.rb
@@ -1,12 +1,12 @@
=begin
distributed Ruby --- chat client
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'drb/drb'
class ChatClient
- include DRbUndumped
+ include DRbUndumped
def initialize(name)
@name = name
diff --git a/sample/drb/dchats.rb b/sample/drb/dchats.rb
index ccb2c7c9c5..012dfeeebe 100644
--- a/sample/drb/dchats.rb
+++ b/sample/drb/dchats.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- chat server
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'thread'
require 'drb/drb'
diff --git a/sample/drb/dhasen.rb b/sample/drb/dhasen.rb
index 651b9c6c8a..fb1724afa3 100644
--- a/sample/drb/dhasen.rb
+++ b/sample/drb/dhasen.rb
@@ -1,13 +1,13 @@
=begin
distributed Ruby --- dRuby Sample Server --- chasen server
- Copyright (c) 1999-2001 Masatoshi SEKI
+ Copyright (c) 1999-2001 Masatoshi SEKI
=end
=begin
How to play.
Terminal 1
- | % ruby dhasen.rb
+ | % ruby dhasen.rb
| druby://yourhost:7640
Terminal 2
diff --git a/sample/drb/dhasenc.rb b/sample/drb/dhasenc.rb
index dddac9882c..2774feba5a 100644
--- a/sample/drb/dhasenc.rb
+++ b/sample/drb/dhasenc.rb
@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: euc-jp -*-
=begin
distributed Ruby --- dRuby Sample Client -- chasen client
- Copyright (c) 1999-2001 Masatoshi SEKI
+ Copyright (c) 1999-2001 Masatoshi SEKI
=end
require 'drb/drb'
@@ -10,5 +10,5 @@ there = ARGV.shift || raise("usage: #{$0} <server_uri>")
DRb.start_service
dhasen = DRbObject.new(nil, there)
-print dhasen.sparse("本日ã¯ã€æ™´å¤©ãªã‚Šã€‚", "-F", '(%BB %m %M)\n', "-j")
-print dhasen.sparse("本日ã¯ã€æ™´å¤©ãªã‚Šã€‚", "-F", '(%m %M)\n')
+print dhasen.sparse("ËÜÆü¤Ï¡¢À²Å·¤Ê¤ê¡£", "-F", '(%BB %m %M)\n', "-j")
+print dhasen.sparse("ËÜÆü¤Ï¡¢À²Å·¤Ê¤ê¡£", "-F", '(%m %M)\n')
diff --git a/sample/drb/dlogc.rb b/sample/drb/dlogc.rb
index 3939a71827..c75bc7b520 100644
--- a/sample/drb/dlogc.rb
+++ b/sample/drb/dlogc.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- Log test
- Copyright (c) 1999-2001 Masatoshi SEKI
+ Copyright (c) 1999-2001 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/dlogd.rb b/sample/drb/dlogd.rb
index fef7ca0f1d..9f9aa2fd56 100644
--- a/sample/drb/dlogd.rb
+++ b/sample/drb/dlogd.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- Log server
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/dqin.rb b/sample/drb/dqin.rb
index 4751335fff..3ba1caa80c 100644
--- a/sample/drb/dqin.rb
+++ b/sample/drb/dqin.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- store
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/dqout.rb b/sample/drb/dqout.rb
index f2b0b4ac95..4700e55cf7 100644
--- a/sample/drb/dqout.rb
+++ b/sample/drb/dqout.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- fetch
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/dqueue.rb b/sample/drb/dqueue.rb
index 1c8878c080..a5a43655fd 100644
--- a/sample/drb/dqueue.rb
+++ b/sample/drb/dqueue.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- Queue
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'thread'
diff --git a/sample/drb/drbc.rb b/sample/drb/drbc.rb
index 50a86c39e8..00132b46c8 100644
--- a/sample/drb/drbc.rb
+++ b/sample/drb/drbc.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- dRuby Sample Client
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/drbch.rb b/sample/drb/drbch.rb
index 07fdcd5fae..495ff1c346 100644
--- a/sample/drb/drbch.rb
+++ b/sample/drb/drbch.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- dRuby Sample Client
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/drbm.rb b/sample/drb/drbm.rb
index 3390608cd1..74a15a4696 100644
--- a/sample/drb/drbm.rb
+++ b/sample/drb/drbm.rb
@@ -1,13 +1,13 @@
=begin
multiple DRbServer
- Copyright (c) 1999-2002 Masatoshi SEKI
+ Copyright (c) 1999-2002 Masatoshi SEKI
=end
=begin
How to play.
Terminal 1
- | % ruby drbm.rb
+ | % ruby drbm.rb
| druby://yourhost:7640 druby://yourhost:7641
Terminal 2
@@ -24,7 +24,7 @@ class Hoge
def initialize(s)
@str = s
end
-
+
def to_s
@str
end
diff --git a/sample/drb/drbmc.rb b/sample/drb/drbmc.rb
index fd191401e6..c654fcea05 100644
--- a/sample/drb/drbmc.rb
+++ b/sample/drb/drbmc.rb
@@ -1,6 +1,6 @@
=begin
multiple DRbServer client
- Copyright (c) 1999-2002 Masatoshi SEKI
+ Copyright (c) 1999-2002 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/drbs-acl.rb b/sample/drb/drbs-acl.rb
index 71c4f7bf42..151dd945d8 100644
--- a/sample/drb/drbs-acl.rb
+++ b/sample/drb/drbs-acl.rb
@@ -1,13 +1,13 @@
=begin
distributed Ruby --- dRuby Sample Server
- Copyright (c) 1999-2000 Masatoshi SEKI
+ Copyright (c) 1999-2000 Masatoshi SEKI
=end
=begin
How to play.
Terminal 1
- | % ruby drbs.rb
+ | % ruby drbs.rb
| druby://yourhost:7640
Terminal 2
@@ -41,7 +41,7 @@ if __FILE__ == $0
acl = ACL.new(%w(deny all
allow 192.168.1.*
allow localhost))
-
+
DRb.install_acl(acl)
DRb.start_service(nil, DRbEx.new)
diff --git a/sample/drb/drbs.rb b/sample/drb/drbs.rb
index 5a913d9918..b76e283c80 100644
--- a/sample/drb/drbs.rb
+++ b/sample/drb/drbs.rb
@@ -1,13 +1,13 @@
=begin
distributed Ruby --- dRuby Sample Server
- Copyright (c) 1999-2000,2002 Masatoshi SEKI
+ Copyright (c) 1999-2000,2002 Masatoshi SEKI
=end
=begin
How to play.
Terminal 1
- | % ruby drbs.rb
+ | % ruby drbs.rb
| druby://yourhost:7640
Terminal 2
diff --git a/sample/drb/extserv_test.rb b/sample/drb/extserv_test.rb
index 2c4f485dc6..83d871a6a2 100644
--- a/sample/drb/extserv_test.rb
+++ b/sample/drb/extserv_test.rb
@@ -1,11 +1,11 @@
=begin
dRuby sample
- Copyright (c) 2000 Masatoshi SEKI
+ Copyright (c) 2000 Masatoshi SEKI
= How to play
* Terminal 1
-
+
% ruby -I. extserv_test.rb server
druby://yourhost:12345
@@ -26,11 +26,11 @@ end
class Foo
include DRbUndumped
-
+
def initialize(str)
@str = str
end
-
+
def hello(it)
"#{it}: #{self}"
end
@@ -55,7 +55,7 @@ when 'server'
DRb::ExtServManager.command['itest1'] = "ruby -I. #{$0} itest1"
DRb::ExtServManager.command['itest2'] = "ruby -I. #{$0} itest2"
-
+
s = DRb::ExtServManager.new
DRb.start_service(ARGV.shift, s)
puts DRb.uri
@@ -72,7 +72,7 @@ else
t2 = s.service('itest2').front
puts t2
puts t1.hello(t2)
- if (cmd == 'quit')
+ if (cmd == 'quit')
s.service('itest1').stop_service
s.service('itest2').stop_service
end
diff --git a/sample/drb/gw_cu.rb b/sample/drb/gw_cu.rb
index 8079cbdc4f..0e5ed36b8f 100644
--- a/sample/drb/gw_cu.rb
+++ b/sample/drb/gw_cu.rb
@@ -13,7 +13,7 @@ class Foo
end
end
-DRb.start_service('drbunix:', nil)
+DRb.start_service('drubyunix:', nil)
puts DRb.uri
ro = DRbObject.new(nil, ARGV.shift)
diff --git a/sample/drb/holderc.rb b/sample/drb/holderc.rb
index e627916d76..8dd72ebd11 100644
--- a/sample/drb/holderc.rb
+++ b/sample/drb/holderc.rb
@@ -11,7 +11,7 @@ DRb.start_service()
ro = DRbObject.new(nil, there)
ary = []
-10.times do
+10.times do
ary.push(ro.gen)
end
diff --git a/sample/drb/holders.rb b/sample/drb/holders.rb
index 293426faa5..2d9974f3fc 100644
--- a/sample/drb/holders.rb
+++ b/sample/drb/holders.rb
@@ -14,7 +14,7 @@
% ruby holderc.rb druby://yourhost:1234
=end
-
+
require 'drb/drb'
@@ -36,11 +36,11 @@ end
class DRbEx4
include DRbUndumped
-
+
def initialize
@curr = 1
end
-
+
def gen
begin
@curr += 1
diff --git a/sample/drb/http0.rb b/sample/drb/http0.rb
index d4c9f6b7fb..7649925282 100644
--- a/sample/drb/http0.rb
+++ b/sample/drb/http0.rb
@@ -46,14 +46,14 @@ module DRb
def close; end
def alive?; false; end
-
+
def send_request(ref, msg_id, *arg, &b)
stream = StrStream.new
@msg.send_request(stream, ref, msg_id, *arg, &b)
@reply_stream = StrStream.new
post(@uri, stream.buf)
end
-
+
def recv_reply
@msg.recv_reply(@reply_stream)
end
@@ -66,7 +66,7 @@ module DRb
http.post(path, data, {'Content-Type'=>'application/octetstream;'}) do |str|
sio.write(str)
if @config[:load_limit] < sio.buf.size
- raise TypeError, 'too large packet'
+ raise TypeError, 'too large packet'
end
end
@reply_stream = sio
diff --git a/sample/drb/http0serv.rb b/sample/drb/http0serv.rb
index 8318123fa9..100d126b8f 100644
--- a/sample/drb/http0serv.rb
+++ b/sample/drb/http0serv.rb
@@ -5,7 +5,7 @@ require 'thread'
module DRb
module HTTP0
-
+
def self.open_server(uri, config)
unless /^http:/ =~ uri
raise(DRbBadScheme, uri) unless uri =~ /^http:/
@@ -20,7 +20,7 @@ module DRb
@drb = drb
@queue = Queue.new
end
-
+
def do_POST(req, res)
@req = req
@res = res
@@ -28,7 +28,7 @@ module DRb
@res.body = @queue.pop
@res['content-type'] = 'application/octet-stream;'
end
-
+
def req_body
@req.body
end
@@ -36,7 +36,7 @@ module DRb
def reply(body)
@queue.push(body)
end
-
+
def close
@queue.push('')
end
@@ -78,7 +78,7 @@ module DRb
s.start
end
end
-
+
class ServerSide
def initialize(callback, config)
@callback = callback
@@ -86,7 +86,7 @@ module DRb
@msg = DRbMessage.new(@config)
@req_stream = StrStream.new(@callback.req_body)
end
-
+
def close
@callback.close if @callback
@callback = nil
diff --git a/sample/drb/name.rb b/sample/drb/name.rb
index 9527d47764..86b478fbec 100644
--- a/sample/drb/name.rb
+++ b/sample/drb/name.rb
@@ -1,12 +1,12 @@
=begin
distributed Ruby --- NamedObject Sample
- Copyright (c) 2000-2001 Masatoshi SEKI
+ Copyright (c) 2000-2001 Masatoshi SEKI
=end
=begin
How to play.
-* start server
+* start server
Terminal 1
| % ruby name.rb druby://yourhost:7640
| druby://yourhost:7640
@@ -28,9 +28,9 @@ How to play.
| druby://yourhost:7640
| [return] to exit
-* continue client
+* continue client
Terminal 2
- type [return]
+ type [return]
| 1
| 2
=end
@@ -44,7 +44,7 @@ module DRbNamedObject
def drb_name=(name)
@drb_name = name
- Thread.exclusive do
+ Thread.exclusive do
raise(IndexError, name) if DRbNAMEDICT[name]
DRbNAMEDICT[name] = self
end
@@ -62,7 +62,7 @@ class DRbNamedIdConv < DRb::DRbIdConv
def to_id(obj)
if obj.kind_of? DRbNamedObject
- return obj.drb_name
+ return obj.drb_name
else
return super
end
@@ -98,7 +98,7 @@ class Front
@name['seq'] = seq
@name['mutex'] = mutex
end
-
+
def [](k)
@name[k]
end
@@ -108,7 +108,7 @@ if __FILE__ == $0
uri = ARGV.shift
name_conv = DRbNamedIdConv.new
-
+
DRb.install_id_conv(name_conv)
DRb.start_service(uri, Front.new)
puts DRb.uri
diff --git a/sample/drb/namec.rb b/sample/drb/namec.rb
index 98b9d0e532..f6db6f3022 100644
--- a/sample/drb/namec.rb
+++ b/sample/drb/namec.rb
@@ -1,6 +1,6 @@
=begin
distributed Ruby --- NamedObject Sample Client
- Copyright (c) 2000-2001 Masatoshi SEKI
+ Copyright (c) 2000-2001 Masatoshi SEKI
=end
require 'drb/drb'
diff --git a/sample/drb/old_tuplespace.rb b/sample/drb/old_tuplespace.rb
index 0da9fa84c3..3e13b92ee1 100644
--- a/sample/drb/old_tuplespace.rb
+++ b/sample/drb/old_tuplespace.rb
@@ -82,7 +82,7 @@ class TupleSpace
end
end
return nil unless found
-
+
@que[sz].delete_at(i)
return x
@@ -167,7 +167,7 @@ if __FILE__ == $0
def client(ts, n)
Thread.start {
ac = Object.new
- tuples = (1..10).collect { |i|
+ tuples = (1..10).collect { |i|
['req', ac, i * 10 + n]
}
ts.out(*tuples)
@@ -201,7 +201,7 @@ if __FILE__ == $0
clients.push(client(ts, n))
end
- (1..3).each do
+ (1..3).each do
watcher(ts)
end
diff --git a/sample/drb/ring_echo.rb b/sample/drb/ring_echo.rb
index 3b743cab8e..0633aa839a 100644
--- a/sample/drb/ring_echo.rb
+++ b/sample/drb/ring_echo.rb
@@ -8,7 +8,7 @@ class RingEcho
def initialize(name)
@name = name
end
-
+
def echo(str)
"#{@name}: #{str}"
end
diff --git a/sample/drb/simpletuple.rb b/sample/drb/simpletuple.rb
index 1b9b7a35a7..3ae9208c79 100644
--- a/sample/drb/simpletuple.rb
+++ b/sample/drb/simpletuple.rb
@@ -13,7 +13,7 @@ class SimpleTupleSpace
@waiting.taint
self.taint
end
-
+
def out(key, obj)
Thread.critical = true
@hash[key] ||= []
@@ -48,7 +48,7 @@ class SimpleTupleSpace
Thread.critical = false
end
end
-end
+end
if __FILE__ == $0
ts = SimpleTupleSpace.new
@@ -75,7 +75,7 @@ if __FILE__ == $0
}
end
- 3.times do
+ 3.times do
servers.push(server(ts))
end
diff --git a/sample/drb/speedc.rb b/sample/drb/speedc.rb
index 64b8a65021..14d526d48d 100644
--- a/sample/drb/speedc.rb
+++ b/sample/drb/speedc.rb
@@ -11,7 +11,7 @@ when /^tcpromp:/, /^unixromp:/
foo = client.resolve("foo")
when /^druby:/
require 'drb/drb'
-
+
DRb.start_service
foo = DRbObject.new(nil, uri)
end
diff --git a/sample/drb/speeds.rb b/sample/drb/speeds.rb
index 7984059423..76b4b29dba 100644
--- a/sample/drb/speeds.rb
+++ b/sample/drb/speeds.rb
@@ -3,7 +3,7 @@ class Foo
def initialize
@i = 0
end
-
+
def foo(i)
@i = i
i + i
@@ -24,7 +24,7 @@ when /^tcpromp:/, /^unixromp:/
when /^druby:/
require 'drb/drb'
-
+
DRb.start_service(uri, Foo.new)
end
diff --git a/sample/from.rb b/sample/from.rb
index 918745e55f..aa93e6726a 100644
--- a/sample/from.rb
+++ b/sample/from.rb
@@ -36,7 +36,7 @@ def get_mailfile(user)
file = user
unless user
file = ENV['MAIL']
- user = ENV['USER'] || ENV['USERNAME'] || ENV['LOGNAME']
+ user = ENV['USER'] || ENV['USERNAME'] || ENV['LOGNAME']
end
if file == nil or !File.exist?(file)
diff --git a/sample/fullpath.rb b/sample/fullpath.rb
index 112ca58081..8472e5d8f4 100644
--- a/sample/fullpath.rb
+++ b/sample/fullpath.rb
@@ -3,7 +3,7 @@
if ARGV[0] =~ /-p/
ARGV.shift
- path = ARGV.shift
+ path = ARGV.shift
end
if path == nil
diff --git a/sample/list.rb b/sample/list.rb
index 85899ce7ff..221f7edb16 100644
--- a/sample/list.rb
+++ b/sample/list.rb
@@ -5,7 +5,6 @@ class MyElem
# @variables are instance variable, no declaration needed
@data = item
@succ = nil
- @head = nil
end
def data
diff --git a/sample/list2.rb b/sample/list2.rb
index 1d71affc1b..914cb8996e 100644
--- a/sample/list2.rb
+++ b/sample/list2.rb
@@ -9,7 +9,7 @@ class Point
sprintf("%d@%d", @x, @y)
end
end
-
+
list1 = [10, 20, Point.new(2, 3), Point.new(4, 5)]
list2 = [20, Point.new(4, 5), list1]
print("list1:\n", list1.join("\n"), "\n")
diff --git a/sample/list3.rb b/sample/list3.rb
index 1d9f04b710..1d756fdff0 100644
--- a/sample/list3.rb
+++ b/sample/list3.rb
@@ -11,7 +11,7 @@ class Point
sprintf("%d@%d", @x, @y)
end
end
-
+
list1 = [10, 20, Point.new(2, 3), Point.new(4, 5)]
list2 = [20, Point.new(4, 5), list1]
print("list1: ", list1.inspect, "\n")
diff --git a/sample/logger/app.rb b/sample/logger/app.rb
index 97b62bca30..924bcba4b0 100644
--- a/sample/logger/app.rb
+++ b/sample/logger/app.rb
@@ -41,6 +41,6 @@ end
status = MyApp.new(1, 2, 3).start
if status != 0
- puts 'Some error(s) occurred.'
+ puts 'Some error(s) occured.'
puts 'See "app.log".'
end
diff --git a/sample/mine.rb b/sample/mine.rb
index a841d1a60a..4ef006685e 100755..100644
--- a/sample/mine.rb
+++ b/sample/mine.rb
@@ -1,5 +1,5 @@
-#! /usr/bin/ruby -Ku
-# -*- coding: utf-8 -*-
+#! /usr/bin/ruby -Ke
+# -*- encoding: euc-jp -*-
class Board
def clr
@@ -13,19 +13,19 @@ class Board
end
def put(x, y, col, str)
pos(x,y); colorstr(43,str)
- pos(0,@hi); print "残り:",@mc,"/",@total," "
+ pos(0,@hi); print "»Ä¤ê:",@mc,"/",@total," "
pos(x,y)
end
private :clr, :pos, :colorstr, :put
- CHR=["・","1","ï¼’","3","ï¼”","5","ï¼–","ï¼—","8","★","â—","@@"]
+ CHR=["¡¦","£±","£²","£³","£´","£µ","£¶","£·","£¸","¡ú","¡ü","@@"]
COL=[46,43,45] # default,opened,over
def initialize(h,w,m)
- # ゲーム盤ã®ç”Ÿæˆ(h:縦,w:横,m:çˆ†å¼¾ã®æ•°)
+ # ¥²¡¼¥àÈפÎÀ¸À®(h:½Ä¡¤w:²£¡¤m:ÇúÃÆ¤Î¿ô)
@hi=h; @wi=w; @m=m
reset
end
def reset
- # ゲーム盤を(å†)åˆæœŸåŒ–ã™ã‚‹
+ # ¥²¡¼¥àÈפò(ºÆ)½é´ü²½¤¹¤ë
srand()
@cx=0; @cy=0; @mc=@m
@over=false
@@ -47,7 +47,7 @@ class Board
pos(@cx,@cy)
end
def mark
- # ç¾åœ¨ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®ã«ãƒžãƒ¼ã‚¯ã‚’ã¤ã‘ã‚‹
+ # ¸½ºß¤Î¥«¡¼¥½¥ë°ÌÃ֤˥ޡ¼¥¯¤ò¤Ä¤±¤ë
if @state[@wi*@cy+@cx] != nil then return end
@state[@wi*@cy+@cx] = "MARK"
@mc=@mc-1;
@@ -55,8 +55,8 @@ class Board
put(@cx, @cy, COL[1], CHR[9])
end
def open(x=@cx,y=@cy)
- # ç¾åœ¨ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®ã‚’オープンã«ã™ã‚‹
- # 爆弾ãŒã‚れã°ã‚²ãƒ¼ãƒ ã‚ªãƒ¼ãƒãƒ¼
+ # ¸½ºß¤Î¥«¡¼¥½¥ë°ÌÃÖ¤ò¥ª¡¼¥×¥ó¤Ë¤¹¤ë
+ # ÇúÃÆ¤¬¤¢¤ì¤Ð¥²¡¼¥à¥ª¡¼¥Ð¡¼
if @state[@wi*y+x] =="OPEN" then return 0 end
if @state[@wi*y+x] == nil then @total=@total-1 end
if @state[@wi*y+x] =="MARK" then @mc=@mc+1 end
@@ -76,7 +76,7 @@ class Board
pos(@cx,@cy)
end
def fetch(x,y)
- # (x,y)ã®ä½ç½®ã®çˆ†å¼¾ã®æ•°(0 or 1)ã‚’è¿”ã™
+ # (x,y)¤Î°ÌÃÖ¤ÎÇúÃÆ¤Î¿ô(0 or 1)¤òÊÖ¤¹
if x < 0 then 0
elsif x >= @wi then 0
elsif y < 0 then 0
@@ -86,13 +86,13 @@ class Board
end
end
def count(x,y)
- # (x,y)ã«éš£æŽ¥ã™ã‚‹çˆ†å¼¾ã®æ•°ã‚’è¿”ã™
+ # (x,y)¤ËÎÙÀܤ¹¤ëÇúÃÆ¤Î¿ô¤òÊÖ¤¹
fetch(x-1,y-1)+fetch(x,y-1)+fetch(x+1,y-1)+
fetch(x-1,y) + fetch(x+1,y)+
fetch(x-1,y+1)+fetch(x,y+1)+fetch(x+1,y+1)
end
def over(win)
- # ゲームã®çµ‚了
+ # ¥²¡¼¥à¤Î½ªÎ»
quit
unless win
pos(@cx,@cy); print CHR[11]
@@ -103,8 +103,8 @@ class Board
end
end
def over?
- # ゲームã®çµ‚了ãƒã‚§ãƒƒã‚¯
- # 終了処ç†ã‚‚呼ã³å‡ºã™
+ # ¥²¡¼¥à¤Î½ªÎ»¥Á¥§¥Ã¥¯
+ # ½ªÎ»½èÍý¤â¸Æ¤Ó½Ð¤¹
remain = (@mc+@total == 0)
if @over || remain
over(remain)
@@ -114,8 +114,8 @@ class Board
end
end
def quit
- # ゲームã®ä¸­æ–­(ã¾ãŸã¯çµ‚了)
- # 盤é¢ã‚’å…¨ã¦è¦‹ã›ã‚‹
+ # ¥²¡¼¥à¤ÎÃæÃÇ(¤Þ¤¿¤Ï½ªÎ»)
+ # È×Ì̤òÁ´¤Æ¸«¤»¤ë
@hi.times do|y|
pos(0,y)
@wi.times do|x|
@@ -125,19 +125,19 @@ class Board
end
end
def down
- # カーソルを下ã«
+ # ¥«¡¼¥½¥ë¤ò²¼¤Ë
if @cy < @hi-1 then @cy=@cy+1; pos(@cx, @cy) end
end
def up
- # カーソルを上ã«
+ # ¥«¡¼¥½¥ë¤ò¾å¤Ë
if @cy > 0 then @cy=@cy-1; pos(@cx, @cy) end
end
def left
- # カーソルを左ã«
+ # ¥«¡¼¥½¥ë¤òº¸¤Ë
if @cx > 0 then @cx=@cx-1; pos(@cx, @cy) end
end
def right
- # カーソルをå³ã«
+ # ¥«¡¼¥½¥ë¤ò±¦¤Ë
if @cx < @wi-1 then @cx=@cx+1; pos(@cx, @cy) end
end
end
diff --git a/sample/openssl/certstore.rb b/sample/openssl/certstore.rb
index c0bc21bcbb..bbc637f668 100644
--- a/sample/openssl/certstore.rb
+++ b/sample/openssl/certstore.rb
@@ -48,7 +48,7 @@ class CertStore
case guess_cert_type(cert)
when CERT_TYPE_SELF_SIGNED
true
- when CERT_TYPE_OTHER
+ when CERT_TYPE_OTHER
true
else
false
diff --git a/sample/openssl/smime_write.rb b/sample/openssl/smime_write.rb
index 5a5236c750..535b3d6685 100644
--- a/sample/openssl/smime_write.rb
+++ b/sample/openssl/smime_write.rb
@@ -20,4 +20,4 @@ smime0 = PKCS7::write_smime(p7sig)
rcpt = X509::Certificate.new(File::read(rcpt_file))
p7enc = PKCS7::encrypt([rcpt], smime0)
-print PKCS7::write_smime(p7enc)
+print PKCS7::write_smime(p7enc)
diff --git a/sample/optparse/opttest.rb b/sample/optparse/opttest.rb
index 9247af494f..9247af494f 100755..100644
--- a/sample/optparse/opttest.rb
+++ b/sample/optparse/opttest.rb
diff --git a/sample/rss/re_read.rb b/sample/rss/re_read.rb
index c386ab20f6..ee54a18a88 100755
--- a/sample/rss/re_read.rb
+++ b/sample/rss/re_read.rb
@@ -24,7 +24,7 @@ ARGV.each do |fname|
File.open(fname) do |f|
source = f.read
end
-
+
rss = nil
read = false
begin
@@ -44,7 +44,7 @@ ARGV.each do |fname|
rescue RSS::Error
error($!) if verbose
end
-
+
if rss.nil?
puts "Invalid feed: #{fname}"
elsif !read
diff --git a/sample/svr.rb b/sample/svr.rb
index eb49ccf170..f4f29eb8e7 100644
--- a/sample/svr.rb
+++ b/sample/svr.rb
@@ -26,7 +26,7 @@ loop do
s.close
socks.delete(s)
# single thread gets may block whole service
- elsif str = s.gets
+ elsif str = s.gets
s.write(str)
end
end
diff --git a/sample/test.rb b/sample/test.rb
index 21547c442c..fc7a7f5db7 100755..100644
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -4,103 +4,9 @@
$testnum=0
$ntest=0
$failed = 0
-class Progress
- def initialize
- @color = nil
- @tty = nil
- @quiet = nil
- @verbose = nil
- ARGV.each do |arg|
- case arg
- when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
- warn "unknown --color argument: #$3" if $3
- @color = $1 ? nil : !$2
- when /\A--tty(=(?:yes|(no)|(.*)))?\z/
- warn "unknown --tty argument: #$3" if $3
- @tty = !$1 || !$2
- true
- when /\A-(q|-quiet)\z/
- @quiet = true
- when /\A-(v|-verbose)\z/
- @verbose = true
- end
- end
- @tty = STDERR.tty? && !STDOUT.tty? && /dumb/ !~ ENV["TERM"] if @tty.nil?
- @eol = @tty && !@verbose ? "\r\e[K\r" : "\n"
- case @color
- when nil
- @color = @tty
- end
- if @color
- # dircolors-like style
- colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
- @passed = "\e[#{colors["pass"] || "32"}m"
- @failed = "\e[#{colors["fail"] || "31"}m"
- @reset = "\e[m"
- else
- @passed = @failed = @reset = ""
- end
- extend(Rotator) if @tty
- end
-
- def passed_string
- "."
- end
- def failed_string
- "#{@failed}F#{@reset}"
- end
- def init_string
- end
- def finish_string
- if @quiet
- @eol
- else
- "#{@passed}#{@ok ? 'OK' : ''} #{$testnum}#{@reset}#{@eol}"
- end
- end
- def pass
- STDERR.print passed_string
- end
- def fail
- @ok = false
- STDERR.print failed_string
- end
- def init
- @ok = true
- STDERR.print init_string
- end
- def finish
- STDERR.print finish_string
- end
-
- module Rotator
- ROTATOR = %w[- \\ | /]
- BS = "\b" * ROTATOR[0].size
- def passed_string
- "#{BS}#{ROTATOR[(@count += 1) % ROTATOR.size]}"
- end
- def failed_string
- "#{BS}#{super}#{ROTATOR[@count % ROTATOR.size]}"
- end
- def init_string
- @count = 0
- " "
- end
- def finish_string
- s = "#{BS}#{' ' * BS.size}#{BS}#{super}"
- s.gsub!(/\n/, "\r\e[2K\r") if @quiet
- s
- end
- end
-end
-PROGRESS = Progress.new
def test_check(what)
- unless $ntest.zero?
- PROGRESS.finish
- end
- STDERR.print "sample/test.rb:#{what} "
- PROGRESS.init
+ STDERR.print "\nsample/test.rb:#{what} "
$what = what
$testnum = 0
end
@@ -110,12 +16,12 @@ def test_ok(cond,n=1)
$ntest+=1
where = (st = caller(n)) ? st[0] : "caller error! (n=#{n}, trace=#{caller(0).join(', ')}"
if cond
- PROGRESS.pass
+ STDERR.print "."
printf "ok %d (%s)\n", $testnum, where
else
- PROGRESS.fail
+ STDERR.print "F"
printf "not ok %s %d -- %s\n", $what, $testnum, where
- $failed+=1
+ $failed+=1
end
STDOUT.flush
STDERR.flush
@@ -751,7 +657,7 @@ $string = "this must be handled no.3"
begin
begin
raise "exception in rescue clause"
- rescue
+ rescue
raise $string
end
test_ok(false)
@@ -765,7 +671,7 @@ end
begin
begin
raise "this must be handled no.4"
- ensure
+ ensure
raise "exception in ensure clause"
end
test_ok(false)
@@ -835,7 +741,7 @@ test_ok($x[1,3] == [1, 2, 3])
$x[0, 2] = 10
test_ok($x[0] == 10 && $x[1] == 2)
-
+
$x[0, 0] = -1
test_ok($x[0] == -1 && $x[1] == 10)
@@ -911,7 +817,7 @@ $x = {1=>2, 2=>4, 3=>6}
test_ok($x[1] == 2)
-test_ok(begin
+test_ok(begin
for k,v in $x
raise if k*2 != v
end
@@ -1258,7 +1164,7 @@ def proc_return4
end
test_ok(proc_return4() == 42)
-def ljump_test(state, proc, *args)
+def ljump_test(state, proc, *args)
x = state
begin
proc.call(*args)
@@ -1456,7 +1362,7 @@ class ITER_TEST4 < ITER_TEST3
end
end
-ITER_TEST4.new.foo(44){55}
+ITER_TEST4.new.foo(44){55}
class ITER_TEST5
def tt(aa)
@@ -1722,8 +1628,8 @@ test_ok(-265419172580680477752431643787347.to_s(36) == "-justanotherrubyhacker")
a = []
(0..255).each {|n|
- ch = [n].pack("C")
- a.push ch if /a#{Regexp.quote ch}b/x =~ "ab"
+ ch = [n].pack("C")
+ a.push ch if /a#{Regexp.quote ch}b/x =~ "ab"
}
test_ok(a.size == 0)
@@ -2015,6 +1921,34 @@ test_ok(done)
File.unlink "script_tmp" or `/bin/rm -f "script_tmp"`
File.unlink "script_tmp.bak" or `/bin/rm -f "script_tmp.bak"`
+$bad = false
+if (dir = File.dirname(File.dirname(__FILE__))) == '.'
+ dir = ""
+else
+ dir << "/"
+end
+
+def valid_syntax?(code, fname)
+ p fname
+ code = code.dup.force_encoding("ascii-8bit")
+ code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) {
+ "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n"
+ }
+ code.force_encoding("us-ascii")
+ catch {|tag| eval(code, binding, fname, 0)}
+rescue Exception
+ STDERR.puts $!.message
+ false
+end
+
+for script in Dir["#{dir}{lib,sample,ext,test}/**/*.rb"].sort
+ unless valid_syntax? IO::read(script), script
+ STDERR.puts script
+ $bad = true
+ end
+end
+test_ok(!$bad)
+
test_check "const"
TEST1 = 1
TEST2 = 2
@@ -2054,7 +1988,7 @@ end
test_ok(bar.test2 == "test2")
test_ok(bar.test == "test")
-test_ok(foo.test == "test")
+test_ok(foo.test == "test")
begin
foo.test2
@@ -2148,7 +2082,7 @@ class Gods
def self.ruler1 # <= per method definition style
@@rule
- end
+ end
class << self # <= multiple method definition style
def ruler2
@@rule
@@ -2353,7 +2287,6 @@ ObjectSpace.each_object{|o|
test_ok true # reach here or dumps core
-PROGRESS.finish
if $failed > 0
printf "not ok/test: %d failed %d\n", $ntest, $failed
else
diff --git a/sample/trojan.rb b/sample/trojan.rb
index 2be9567b98..3a35ac21c2 100644
--- a/sample/trojan.rb
+++ b/sample/trojan.rb
@@ -5,7 +5,7 @@ path = ENV['PATH'].split(File::PATH_SEPARATOR)
for dir in path
if File.directory?(dir)
for f in d = Dir.open(dir)
- fpath = File.join(dir, f)
+ fpath = File.join(dir, f)
if File.file?(fpath) && (File.stat(fpath).mode & 022) != 0
printf("file %s is writable from other users\n", fpath)
end
diff --git a/sample/webrick/httpproxy.rb b/sample/webrick/httpproxy.rb
index c84457ece7..bca0cc4626 100644
--- a/sample/webrick/httpproxy.rb
+++ b/sample/webrick/httpproxy.rb
@@ -1,9 +1,10 @@
require "webrick"
require "webrick/httpproxy"
-# The :ProxyContentHandler proc will be invoked before sending a response to
-# the User-Agent. You can inspect the pair of request and response messages
-# (or edit the response message if necessary).
+# :ProxyContentHandler will be invoked before sending
+# response to User-Agenge. You can inspect the pair of
+# request and response messages (or can edit the response
+# message if necessary).
pch = Proc.new{|req, res|
p [ req.request_line, res.status_line ]
diff --git a/signal.c b/signal.c
index ff6828ea28..30c565b119 100644
--- a/signal.c
+++ b/signal.c
@@ -16,38 +16,34 @@
#include <signal.h>
#include <stdio.h>
#include <errno.h>
-#include "ruby_atomic.h"
-#include "eval_intern.h"
-#if defined(__native_client__) && defined(NACL_NEWLIB)
-# include "nacl/signal.h"
-#endif
+#ifdef _WIN32
+typedef LONG rb_atomic_t;
-#ifdef NEED_RUBY_ATOMIC_OPS
-rb_atomic_t
-ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val)
-{
- rb_atomic_t old = *ptr;
- *ptr = val;
- return old;
-}
+# define ATOMIC_TEST(var) InterlockedExchange(&(var), 0)
+# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
+# define ATOMIC_INC(var) InterlockedIncrement(&(var))
+# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
-rb_atomic_t
-ruby_atomic_compare_and_swap(rb_atomic_t *ptr, rb_atomic_t cmp,
- rb_atomic_t newval)
-{
- rb_atomic_t old = *ptr;
- if (old == cmp) {
- *ptr = newval;
- }
- return old;
-}
+#else
+typedef int rb_atomic_t;
+
+# define ATOMIC_TEST(var) ((var) ? ((var) = 0, 1) : 0)
+# define ATOMIC_SET(var, val) ((var) = (val))
+# define ATOMIC_INC(var) (++(var))
+# define ATOMIC_DEC(var) (--(var))
#endif
#if defined(__BEOS__) || defined(__HAIKU__)
#undef SIGBUS
#endif
+#if defined HAVE_SIGPROCMASK || defined HAVE_SIGSETMASK
+#define USE_TRAP_MASK 1
+#else
+#define USE_TRAP_MASK 0
+#endif
+
#ifndef NSIG
# define NSIG (_SIGMAX + 1) /* For QNX */
#endif
@@ -213,26 +209,6 @@ signo2signm(int no)
return 0;
}
-/*
- * call-seq:
- * Signal.signame(signo) -> string
- *
- * convert signal number to signal name
- *
- * Signal.trap("INT") { |signo| puts Signal.signame(signo) }
- * Process.kill("INT", 0)
- *
- * <em>produces:</em>
- *
- * INT
- */
-static VALUE
-sig_signame(VALUE recv, VALUE signo)
-{
- const char *signame = signo2signm(NUM2INT(signo));
- return rb_str_new_cstr(signame);
-}
-
const char *
ruby_signal_name(int no)
{
@@ -261,7 +237,10 @@ esignal_init(int argc, VALUE *argv, VALUE self)
if (!NIL_P(sig)) argnum = 2;
else sig = argv[0];
}
- rb_check_arity(argc, 1, argnum);
+ if (argc < 1 || argnum < argc) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+ argc, argnum);
+ }
if (argnum == 2) {
signo = NUM2INT(sig);
if (signo < 0 || signo > NSIG) {
@@ -330,11 +309,11 @@ ruby_default_signal(int sig)
* call-seq:
* Process.kill(signal, pid, ...) -> fixnum
*
- * Sends the given signal to the specified process id(s) if _pid_ is positive.
- * If _pid_ is zero _signal_ is sent to all processes whose group ID is equal
- * to the group ID of the process. _signal_ may be an integer signal number or
- * a POSIX signal name (either with or without a +SIG+ prefix). If _signal_ is
- * negative (or starts with a minus sign), kills process groups instead of
+ * Sends the given signal to the specified process id(s), or to the
+ * current process if _pid_ is zero. _signal_ may be an
+ * integer signal number or a POSIX signal name (either with or without
+ * a +SIG+ prefix). If _signal_ is negative (or starts
+ * with a minus sign), kills process groups instead of
* processes. Not all signals are available on all platforms.
*
* pid = fork do
@@ -363,18 +342,17 @@ ruby_default_signal(int sig)
VALUE
rb_f_kill(int argc, VALUE *argv)
{
-#ifndef HAVE_KILLPG
-#define killpg(pg, sig) kill(-(pg), (sig))
+#ifndef HAS_KILLPG
+#define killpg(pg, sig) kill(-(pg), sig)
#endif
int negative = 0;
int sig;
int i;
- volatile VALUE str;
const char *s;
rb_secure(2);
- rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
-
+ if (argc < 2)
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for at least 2)", argc);
switch (TYPE(argv[0])) {
case T_FIXNUM:
sig = FIX2INT(argv[0]);
@@ -387,14 +365,14 @@ rb_f_kill(int argc, VALUE *argv)
case T_STRING:
s = RSTRING_PTR(argv[0]);
- str_signal:
if (s[0] == '-') {
negative++;
s++;
}
+ str_signal:
if (strncmp("SIG", s, 3) == 0)
s += 3;
- if ((sig = signm2signo(s)) == 0)
+ if((sig = signm2signo(s)) == 0)
rb_raise(rb_eArgError, "unsupported name `SIG%s'", s);
if (negative)
@@ -402,13 +380,17 @@ rb_f_kill(int argc, VALUE *argv)
break;
default:
- str = rb_check_string_type(argv[0]);
- if (!NIL_P(str)) {
- s = RSTRING_PTR(str);
- goto str_signal;
+ {
+ VALUE str;
+
+ str = rb_check_string_type(argv[0]);
+ if (!NIL_P(str)) {
+ s = RSTRING_PTR(str);
+ goto str_signal;
+ }
+ rb_raise(rb_eArgError, "bad signal type %s",
+ rb_obj_classname(argv[0]));
}
- rb_raise(rb_eArgError, "bad signal type %s",
- rb_obj_classname(argv[0]));
break;
}
@@ -425,6 +407,7 @@ rb_f_kill(int argc, VALUE *argv)
rb_sys_fail(0);
}
}
+ rb_thread_polling();
return INT2FIX(i-1);
}
@@ -446,46 +429,33 @@ typedef RETSIGTYPE ruby_sigaction_t(int);
#define SIGINFO_ARG
#endif
-#ifdef USE_SIGALTSTACK
-int rb_sigaltstack_size(void)
-{
- /* XXX: BSD_vfprintf() uses >1500KiB stack and x86-64 need >5KiB stack. */
- int size = 8192;
+#ifdef POSIX_SIGNAL
-#ifdef MINSIGSTKSZ
- if (size < MINSIGSTKSZ)
- size = MINSIGSTKSZ;
-#endif
-#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
- {
- int pagesize;
- pagesize = (int)sysconf(_SC_PAGE_SIZE);
- if (size < pagesize)
- size = pagesize;
- }
+#ifdef USE_SIGALTSTACK
+#ifdef SIGSTKSZ
+#define ALT_STACK_SIZE (SIGSTKSZ*2)
+#else
+#define ALT_STACK_SIZE (4*1024)
#endif
-
- return size;
-}
-
/* alternate stack for SIGSEGV */
void
rb_register_sigaltstack(rb_thread_t *th)
{
stack_t newSS, oldSS;
- if (!th->altstack)
- rb_bug("rb_register_sigaltstack: th->altstack not initialized\n");
+ if (th->altstack) return;
- newSS.ss_sp = th->altstack;
- newSS.ss_size = rb_sigaltstack_size();
+ newSS.ss_sp = th->altstack = malloc(ALT_STACK_SIZE);
+ if (newSS.ss_sp == NULL)
+ /* should handle error */
+ rb_bug("rb_register_sigaltstack. malloc error\n");
+ newSS.ss_size = ALT_STACK_SIZE;
newSS.ss_flags = 0;
sigaltstack(&newSS, &oldSS); /* ignore error. */
}
-#endif /* USE_SIGALTSTACK */
+#endif
-#ifdef POSIX_SIGNAL
static sighandler_t
ruby_signal(int signum, sighandler_t handler)
{
@@ -496,7 +466,7 @@ ruby_signal(int signum, sighandler_t handler)
#endif
sigemptyset(&sigact.sa_mask);
-#ifdef USE_SIGALTSTACK
+#ifdef SA_SIGINFO
sigact.sa_sigaction = (ruby_sigaction_t*)handler;
sigact.sa_flags = SA_SIGINFO;
#else
@@ -509,11 +479,7 @@ ruby_signal(int signum, sighandler_t handler)
sigact.sa_flags |= SA_NOCLDWAIT;
#endif
#if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
- if (signum == SIGSEGV
-#ifdef SIGBUS
- || signum == SIGBUS
-#endif
- )
+ if (signum == SIGSEGV)
sigact.sa_flags |= SA_ONSTACK;
#endif
if (sigaction(signum, &sigact, &old) < 0) {
@@ -521,10 +487,7 @@ ruby_signal(int signum, sighandler_t handler)
rb_bug_errno("sigaction", errno);
}
}
- if (old.sa_flags & SA_SIGINFO)
- return (sighandler_t)old.sa_sigaction;
- else
- return old.sa_handler;
+ return old.sa_handler;
}
sighandler_t
@@ -533,19 +496,8 @@ posix_signal(int signum, sighandler_t handler)
return ruby_signal(signum, handler);
}
-#elif defined _WIN32
-static inline sighandler_t
-ruby_signal(int signum, sighandler_t handler)
-{
- if (signum == SIGKILL) {
- errno = EINVAL;
- return SIG_ERR;
- }
- return signal(signum, handler);
-}
-
#else /* !POSIX_SIGNAL */
-#define ruby_signal(sig,handler) (/* rb_trap_accept_nativethreads[(sig)] = 0,*/ signal((sig),(handler)))
+#define ruby_signal(sig,handler) (/* rb_trap_accept_nativethreads[sig] = 0,*/ signal((sig),(handler)))
#if 0 /* def HAVE_NATIVETHREAD */
static sighandler_t
ruby_nativethread_signal(int signum, sighandler_t handler)
@@ -564,7 +516,6 @@ sighandler(int sig)
{
ATOMIC_INC(signal_buff.cnt[sig]);
ATOMIC_INC(signal_buff.size);
- rb_thread_wakeup_timer_thread();
#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
ruby_signal(sig, sighandler);
#endif
@@ -576,24 +527,34 @@ rb_signal_buff_size(void)
return signal_buff.size;
}
+#if USE_TRAP_MASK
+# ifdef HAVE_SIGPROCMASK
+static sigset_t trap_last_mask;
+# else
+static int trap_last_mask;
+# endif
+#endif
+
#if HAVE_PTHREAD_H
#include <pthread.h>
#endif
-static void
+void
rb_disable_interrupt(void)
{
-#ifdef HAVE_PTHREAD_SIGMASK
+#if USE_TRAP_MASK
sigset_t mask;
sigfillset(&mask);
+ sigdelset(&mask, SIGVTALRM);
+ sigdelset(&mask, SIGSEGV);
pthread_sigmask(SIG_SETMASK, &mask, NULL);
#endif
}
-static void
+void
rb_enable_interrupt(void)
{
-#ifdef HAVE_PTHREAD_SIGMASK
+#if USE_TRAP_MASK
sigset_t mask;
sigemptyset(&mask);
pthread_sigmask(SIG_SETMASK, &mask, NULL);
@@ -608,8 +569,12 @@ rb_get_next_signal(void)
if (signal_buff.size != 0) {
for (i=1; i<RUBY_NSIG; i++) {
if (signal_buff.cnt[i] > 0) {
- ATOMIC_DEC(signal_buff.cnt[i]);
- ATOMIC_DEC(signal_buff.size);
+ rb_disable_interrupt();
+ {
+ ATOMIC_DEC(signal_buff.cnt[i]);
+ ATOMIC_DEC(signal_buff.size);
+ }
+ rb_enable_interrupt();
sig = i;
break;
}
@@ -618,110 +583,53 @@ rb_get_next_signal(void)
return sig;
}
-
-#if defined(USE_SIGALTSTACK) || defined(_WIN32)
-static void
-check_stack_overflow(const void *addr)
-{
- int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
- NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
- rb_thread_t *th = ruby_current_thread;
- if (ruby_stack_overflowed_p(th, addr)) {
- ruby_thread_stack_overflow(th);
- }
-}
-#ifdef _WIN32
-#define CHECK_STACK_OVERFLOW() check_stack_overflow(0)
-#else
-#define CHECK_STACK_OVERFLOW() check_stack_overflow(info->si_addr)
-#endif
-#else
-#define CHECK_STACK_OVERFLOW() (void)0
-#endif
-
#ifdef SIGBUS
static RETSIGTYPE
-sigbus(int sig SIGINFO_ARG)
+sigbus(int sig)
{
-/*
- * Mac OS X makes KERN_PROTECTION_FAILURE when thread touch guard page.
- * and it's delivered as SIGBUS instaed of SIGSEGV to userland. It's crazy
- * wrong IMHO. but anyway we have to care it. Sigh.
- */
- /* Seems Linux also delivers SIGBUS. */
-#if defined __APPLE__ || defined __linux__
- CHECK_STACK_OVERFLOW();
-#endif
rb_bug("Bus Error");
}
#endif
#ifdef SIGSEGV
-static void ruby_abort(void)
-{
-#ifdef __sun
- /* Solaris's abort() is async signal unsafe. Of course, it is not
- * POSIX compliant.
- */
- raise(SIGABRT);
-#else
- abort();
-#endif
-
-}
-
static int segv_received = 0;
-extern int ruby_disable_gc_stress;
-
static RETSIGTYPE
sigsegv(int sig SIGINFO_ARG)
{
+#ifdef USE_SIGALTSTACK
+ int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
+ NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
+ rb_thread_t *th = GET_THREAD();
+ if (ruby_stack_overflowed_p(th, info->si_addr)) {
+ ruby_thread_stack_overflow(th);
+ }
+#endif
if (segv_received) {
- ssize_t RB_UNUSED_VAR(err);
- char msg[] = "SEGV received in SEGV handler\n";
-
- err = write(2, msg, sizeof(msg));
- ruby_abort();
+ fprintf(stderr, "SEGV received in SEGV handler\n");
+ exit(EXIT_FAILURE);
}
+ else {
+ extern int ruby_disable_gc_stress;
+ segv_received = 1;
+ ruby_disable_gc_stress = 1;
+ rb_bug("Segmentation fault");
+ }
+}
+#endif
- CHECK_STACK_OVERFLOW();
-
- segv_received = 1;
- ruby_disable_gc_stress = 1;
- rb_bug("Segmentation fault");
+#ifdef SIGPIPE
+static RETSIGTYPE
+sigpipe(int sig)
+{
+ /* do nothing */
}
#endif
static void
signal_exec(VALUE cmd, int safe, int sig)
{
- rb_thread_t *cur_th = GET_THREAD();
- volatile unsigned long old_interrupt_mask = cur_th->interrupt_mask;
- int state;
-
- /*
- * workaround the following race:
- * 1. signal_enque queues signal for execution
- * 2. user calls trap(sig, "IGNORE"), setting SIG_IGN
- * 3. rb_signal_exec runs on queued signal
- */
- if (IMMEDIATE_P(cmd))
- return;
-
- cur_th->interrupt_mask |= TRAP_INTERRUPT_MASK;
- TH_PUSH_TAG(cur_th);
- if ((state = EXEC_TAG()) == 0) {
- VALUE signum = INT2NUM(sig);
- rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe);
- }
- TH_POP_TAG();
- cur_th = GET_THREAD();
- cur_th->interrupt_mask = old_interrupt_mask;
-
- if (state) {
- /* XXX: should be replaced with rb_threadptr_pending_interrupt_enque() */
- JUMP_TAG(state);
- }
+ VALUE signum = INT2NUM(sig);
+ rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe);
}
void
@@ -778,6 +686,19 @@ rb_signal_exec(rb_thread_t *th, int sig)
}
}
+struct trap_arg {
+#if USE_TRAP_MASK
+# ifdef HAVE_SIGPROCMASK
+ sigset_t mask;
+# else
+ int mask;
+# endif
+#endif
+ int sig;
+ sighandler_t func;
+ VALUE cmd;
+};
+
static sighandler_t
default_handler(int sig)
{
@@ -806,17 +727,20 @@ default_handler(int sig)
break;
#ifdef SIGBUS
case SIGBUS:
- func = (sighandler_t)sigbus;
+ func = sigbus;
break;
#endif
#ifdef SIGSEGV
case SIGSEGV:
func = (sighandler_t)sigsegv;
+# ifdef USE_SIGALTSTACK
+ rb_register_sigaltstack(GET_THREAD());
+# endif
break;
#endif
#ifdef SIGPIPE
case SIGPIPE:
- func = SIG_IGN;
+ func = sigpipe;
break;
#endif
default:
@@ -859,7 +783,7 @@ trap_handler(VALUE *cmd, int sig)
if (strncmp(RSTRING_PTR(command), "SIG_IGN", 7) == 0) {
sig_ign:
func = SIG_IGN;
- *cmd = Qtrue;
+ *cmd = 0;
}
else if (strncmp(RSTRING_PTR(command), "SIG_DFL", 7) == 0) {
sig_dfl:
@@ -885,7 +809,6 @@ sig_dfl:
else {
rb_proc_t *proc;
GetProcPtr(*cmd, proc);
- (void)proc;
}
}
@@ -925,28 +848,21 @@ trap_signm(VALUE vsig)
}
static VALUE
-trap(int sig, sighandler_t func, VALUE command)
+trap(struct trap_arg *arg)
{
- sighandler_t oldfunc;
- VALUE oldcmd;
+ sighandler_t oldfunc, func = arg->func;
+ VALUE oldcmd, command = arg->cmd;
+ int sig = arg->sig;
rb_vm_t *vm = GET_VM();
- /*
- * Be careful. ruby_signal() and trap_list[sig].cmd must be changed
- * atomically. In current implementation, we only need to don't call
- * RUBY_VM_CHECK_INTS().
- */
oldfunc = ruby_signal(sig, func);
oldcmd = vm->trap_list[sig].cmd;
switch (oldcmd) {
case 0:
- case Qtrue:
if (oldfunc == SIG_IGN) oldcmd = rb_str_new2("IGNORE");
else if (oldfunc == sighandler) oldcmd = rb_str_new2("DEFAULT");
else oldcmd = Qnil;
break;
- case Qnil:
- break;
case Qundef:
oldcmd = rb_str_new2("EXIT");
break;
@@ -954,38 +870,34 @@ trap(int sig, sighandler_t func, VALUE command)
vm->trap_list[sig].cmd = command;
vm->trap_list[sig].safe = rb_safe_level();
-
+ /* enable at least specified signal. */
+#if USE_TRAP_MASK
+#ifdef HAVE_SIGPROCMASK
+ sigdelset(&arg->mask, sig);
+#else
+ arg->mask &= ~sigmask(sig);
+#endif
+#endif
return oldcmd;
}
-static int
-reserved_signal_p(int signo)
+#if USE_TRAP_MASK
+static VALUE
+trap_ensure(struct trap_arg *arg)
{
-/* Synchronous signal can't deliver to main thread */
-#ifdef SIGSEGV
- if (signo == SIGSEGV)
- return 1;
-#endif
-#ifdef SIGBUS
- if (signo == SIGBUS)
- return 1;
-#endif
-#ifdef SIGILL
- if (signo == SIGILL)
- return 1;
-#endif
-#ifdef SIGFPE
- if (signo == SIGFPE)
- return 1;
+ /* enable interrupt */
+ pthread_sigmask(SIG_SETMASK, &arg->mask, NULL);
+ trap_last_mask = arg->mask;
+ return 0;
+}
#endif
-/* used ubf internal see thread_pthread.c. */
-#ifdef SIGVTALRM
- if (signo == SIGVTALRM)
- return 1;
+void
+rb_trap_restore_mask(void)
+{
+#if USE_TRAP_MASK
+ pthread_sigmask(SIG_SETMASK, &trap_last_mask, NULL);
#endif
-
- return 0;
}
/*
@@ -1022,36 +934,39 @@ reserved_signal_p(int signo)
static VALUE
sig_trap(int argc, VALUE *argv)
{
- int sig;
- sighandler_t func;
- VALUE cmd;
+ struct trap_arg arg;
rb_secure(2);
- rb_check_arity(argc, 1, 2);
-
- sig = trap_signm(argv[0]);
- if (reserved_signal_p(sig)) {
- const char *name = signo2signm(sig);
- if (name)
- rb_raise(rb_eArgError, "can't trap reserved signal: SIG%s", name);
- else
- rb_raise(rb_eArgError, "can't trap reserved signal: %d", sig);
+ if (argc < 1 || argc > 2) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
}
+ arg.sig = trap_signm(argv[0]);
if (argc == 1) {
- cmd = rb_block_proc();
- func = sighandler;
+ arg.cmd = rb_block_proc();
+ arg.func = sighandler;
}
else {
- cmd = argv[1];
- func = trap_handler(&cmd, sig);
+ arg.cmd = argv[1];
+ arg.func = trap_handler(&arg.cmd, arg.sig);
}
- if (OBJ_TAINTED(cmd)) {
+ if (OBJ_TAINTED(arg.cmd)) {
rb_raise(rb_eSecurityError, "Insecure: tainted signal trap");
}
+#if USE_TRAP_MASK
+ {
+ sigset_t fullmask;
- return trap(sig, func, cmd);
+ /* disable interrupt */
+ sigfillset(&fullmask);
+ pthread_sigmask(SIG_BLOCK, &fullmask, &arg.mask);
+
+ return rb_ensure(trap, (VALUE)&arg, trap_ensure, (VALUE)&arg);
+ }
+#else
+ return trap(&arg);
+#endif
}
/*
@@ -1080,14 +995,10 @@ install_sighandler(int signum, sighandler_t handler)
{
sighandler_t old;
- /* At this time, there is no subthread. Then sigmask guarantee atomics. */
- rb_disable_interrupt();
old = ruby_signal(signum, handler);
- /* signal handler should be inherited during exec. */
if (old != SIG_DFL) {
ruby_signal(signum, old);
}
- rb_enable_interrupt();
}
#if defined(SIGCLD) || defined(SIGCHLD)
@@ -1095,15 +1006,34 @@ static void
init_sigchld(int sig)
{
sighandler_t oldfunc;
+#if USE_TRAP_MASK
+# ifdef HAVE_SIGPROCMASK
+ sigset_t mask;
+ sigset_t fullmask;
+# else
+ int mask;
+ int fullmask;
+# endif
+#endif
+
+#if USE_TRAP_MASK
+ /* disable interrupt */
+ sigfillset(&fullmask);
+ pthread_sigmask(SIG_BLOCK, &fullmask, &mask);
+#endif
- rb_disable_interrupt();
oldfunc = ruby_signal(sig, SIG_DFL);
if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) {
ruby_signal(sig, oldfunc);
} else {
GET_VM()->trap_list[sig].cmd = 0;
}
- rb_enable_interrupt();
+
+#if USE_TRAP_MASK
+ sigdelset(&mask, sig);
+ pthread_sigmask(SIG_SETMASK, &mask, NULL);
+ trap_last_mask = mask;
+#endif
}
#endif
@@ -1119,9 +1049,8 @@ ruby_sig_finalize(void)
}
+#ifdef RUBY_DEBUG_ENV
int ruby_enable_coredump = 0;
-#ifndef RUBY_DEBUG_ENV
-#define ruby_enable_coredump 0
#endif
/*
@@ -1169,7 +1098,6 @@ Init_signal(void)
rb_define_global_function("trap", sig_trap, -1);
rb_define_module_function(mSignal, "trap", sig_trap, -1);
rb_define_module_function(mSignal, "list", sig_list, 0);
- rb_define_module_function(mSignal, "signame", sig_signame, 1);
rb_define_method(rb_eSignal, "initialize", esignal_init, -1);
rb_define_method(rb_eSignal, "signo", esignal_signo, 0);
@@ -1196,19 +1124,22 @@ Init_signal(void)
install_sighandler(SIGUSR2, sighandler);
#endif
- if (!ruby_enable_coredump) {
+#ifdef RUBY_DEBUG_ENV
+ if (!ruby_enable_coredump)
+#endif
+ {
#ifdef SIGBUS
- install_sighandler(SIGBUS, (sighandler_t)sigbus);
+ install_sighandler(SIGBUS, sigbus);
#endif
#ifdef SIGSEGV
# ifdef USE_SIGALTSTACK
- rb_register_sigaltstack(GET_THREAD());
+ rb_register_sigaltstack(GET_THREAD());
# endif
- install_sighandler(SIGSEGV, (sighandler_t)sigsegv);
+ install_sighandler(SIGSEGV, (sighandler_t)sigsegv);
#endif
}
#ifdef SIGPIPE
- install_sighandler(SIGPIPE, SIG_IGN);
+ install_sighandler(SIGPIPE, sigpipe);
#endif
#if defined(SIGCLD)
diff --git a/siphash.c b/siphash.c
deleted file mode 100644
index c100b14ee7..0000000000
--- a/siphash.c
+++ /dev/null
@@ -1,483 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-#include "siphash.h"
-#ifndef SIP_HASH_STREAMING
- #define SIP_HASH_STREAMING 1
-#endif
-
-#ifdef _WIN32
- #define BYTE_ORDER __LITTLE_ENDIAN
-#elif !defined BYTE_ORDER
- #include <endian.h>
-#endif
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN __LITTLE_ENDIAN
-#endif
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN __BIG_ENDIAN
-#endif
-
-#if BYTE_ORDER == LITTLE_ENDIAN
- #define lo u32[0]
- #define hi u32[1]
-#elif BYTE_ORDER == BIG_ENDIAN
- #define hi u32[0]
- #define lo u32[1]
-#else
- #error "Only strictly little or big endian supported"
-#endif
-
-#ifndef UNALIGNED_WORD_ACCESS
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
- defined(__mc68020__)
-# define UNALIGNED_WORD_ACCESS 1
-# endif
-#endif
-#ifndef UNALIGNED_WORD_ACCESS
-# define UNALIGNED_WORD_ACCESS 0
-#endif
-
-#define U8TO32_LE(p) \
- (((uint32_t)((p)[0]) ) | ((uint32_t)((p)[1]) << 8) | \
- ((uint32_t)((p)[2]) << 16) | ((uint32_t)((p)[3]) << 24)) \
-
-#define U32TO8_LE(p, v) \
-do { \
- (p)[0] = (uint8_t)((v) ); \
- (p)[1] = (uint8_t)((v) >> 8); \
- (p)[2] = (uint8_t)((v) >> 16); \
- (p)[3] = (uint8_t)((v) >> 24); \
-} while (0)
-
-#ifdef HAVE_UINT64_T
-#define U8TO64_LE(p) \
- ((uint64_t)U8TO32_LE(p) | ((uint64_t)U8TO32_LE((p) + 4)) << 32 )
-
-#define U64TO8_LE(p, v) \
-do { \
- U32TO8_LE((p), (uint32_t)((v) )); \
- U32TO8_LE((p) + 4, (uint32_t)((v) >> 32)); \
-} while (0)
-
-#define ROTL64(v, s) \
- ((v) << (s)) | ((v) >> (64 - (s)))
-
-#define ROTL64_TO(v, s) ((v) = ROTL64((v), (s)))
-
-#define ADD64_TO(v, s) ((v) += (s))
-#define XOR64_TO(v, s) ((v) ^= (s))
-#define XOR64_INT(v, x) ((v) ^= (x))
-#else
-#define U8TO64_LE(p) u8to64_le(p)
-static inline uint64_t
-u8to64_le(const uint8_t *p)
-{
- uint64_t ret;
- ret.lo = U8TO32_LE(p);
- ret.hi = U8TO32_LE(p + 4);
- return ret;
-}
-
-#define U64TO8_LE(p, v) u64to8_le(p, v)
-static inline void
-u64to8_le(uint8_t *p, uint64_t v)
-{
- U32TO8_LE(p, v.lo);
- U32TO8_LE(p + 4, v.hi);
-}
-
-#define ROTL64_TO(v, s) ((s) > 32 ? rotl64_swap(rotl64_to(&(v), (s) - 32)) : \
- (s) == 32 ? rotl64_swap(&(v)) : rotl64_to(&(v), (s)))
-static inline uint64_t *
-rotl64_to(uint64_t *v, unsigned int s)
-{
- uint32_t uhi = (v->hi << s) | (v->lo >> (32 - s));
- uint32_t ulo = (v->lo << s) | (v->hi >> (32 - s));
- v->hi = uhi;
- v->lo = ulo;
- return v;
-}
-
-static inline uint64_t *
-rotl64_swap(uint64_t *v)
-{
- uint32_t t = v->lo;
- v->lo = v->hi;
- v->hi = t;
- return v;
-}
-
-#define ADD64_TO(v, s) add64_to(&(v), (s))
-static inline uint64_t *
-add64_to(uint64_t *v, const uint64_t s)
-{
- v->lo += s.lo;
- v->hi += s.hi;
- if (v->lo < s.lo) v->hi++;
- return v;
-}
-
-#define XOR64_TO(v, s) xor64_to(&(v), (s))
-static inline uint64_t *
-xor64_to(uint64_t *v, const uint64_t s)
-{
- v->lo ^= s.lo;
- v->hi ^= s.hi;
- return v;
-}
-
-#define XOR64_INT(v, x) ((v).lo ^= (x))
-#endif
-
-static const union {
- char bin[32];
- uint64_t u64[4];
-} sip_init_state_bin = {"uespemos""modnarod""arenegyl""setybdet"};
-#define sip_init_state sip_init_state_bin.u64
-
-#if SIP_HASH_STREAMING
-struct sip_interface_st {
- void (*init)(sip_state *s, const uint8_t *key);
- void (*update)(sip_state *s, const uint8_t *data, size_t len);
- void (*final)(sip_state *s, uint64_t *digest);
-};
-
-static void int_sip_init(sip_state *state, const uint8_t *key);
-static void int_sip_update(sip_state *state, const uint8_t *data, size_t len);
-static void int_sip_final(sip_state *state, uint64_t *digest);
-
-static const sip_interface sip_methods = {
- int_sip_init,
- int_sip_update,
- int_sip_final
-};
-#endif /* SIP_HASH_STREAMING */
-
-#define SIP_COMPRESS(v0, v1, v2, v3) \
-do { \
- ADD64_TO((v0), (v1)); \
- ADD64_TO((v2), (v3)); \
- ROTL64_TO((v1), 13); \
- ROTL64_TO((v3), 16); \
- XOR64_TO((v1), (v0)); \
- XOR64_TO((v3), (v2)); \
- ROTL64_TO((v0), 32); \
- ADD64_TO((v2), (v1)); \
- ADD64_TO((v0), (v3)); \
- ROTL64_TO((v1), 17); \
- ROTL64_TO((v3), 21); \
- XOR64_TO((v1), (v2)); \
- XOR64_TO((v3), (v0)); \
- ROTL64_TO((v2), 32); \
-} while(0)
-
-#if SIP_HASH_STREAMING
-static void
-int_sip_dump(sip_state *state)
-{
- int v;
-
- for (v = 0; v < 4; v++) {
-#if HAVE_UINT64_T
- printf("v%d: %" PRIx64 "\n", v, state->v[v]);
-#else
- printf("v%d: %" PRIx32 "%.8" PRIx32 "\n", v, state->v[v].hi, state->v[v].lo);
-#endif
- }
-}
-
-static void
-int_sip_init(sip_state *state, const uint8_t key[16])
-{
- uint64_t k0, k1;
-
- k0 = U8TO64_LE(key);
- k1 = U8TO64_LE(key + sizeof(uint64_t));
-
- state->v[0] = k0; XOR64_TO(state->v[0], sip_init_state[0]);
- state->v[1] = k1; XOR64_TO(state->v[1], sip_init_state[1]);
- state->v[2] = k0; XOR64_TO(state->v[2], sip_init_state[2]);
- state->v[3] = k1; XOR64_TO(state->v[3], sip_init_state[3]);
-}
-
-static inline void
-int_sip_round(sip_state *state, int n)
-{
- int i;
-
- for (i = 0; i < n; i++) {
- SIP_COMPRESS(state->v[0], state->v[1], state->v[2], state->v[3]);
- }
-}
-
-static inline void
-int_sip_update_block(sip_state *state, uint64_t m)
-{
- XOR64_TO(state->v[3], m);
- int_sip_round(state, state->c);
- XOR64_TO(state->v[0], m);
-}
-
-static inline void
-int_sip_pre_update(sip_state *state, const uint8_t **pdata, size_t *plen)
-{
- int to_read;
- uint64_t m;
-
- if (!state->buflen) return;
-
- to_read = sizeof(uint64_t) - state->buflen;
- memcpy(state->buf + state->buflen, *pdata, to_read);
- m = U8TO64_LE(state->buf);
- int_sip_update_block(state, m);
- *pdata += to_read;
- *plen -= to_read;
- state->buflen = 0;
-}
-
-static inline void
-int_sip_post_update(sip_state *state, const uint8_t *data, size_t len)
-{
- uint8_t r = len % sizeof(uint64_t);
- if (r) {
- memcpy(state->buf, data + len - r, r);
- state->buflen = r;
- }
-}
-
-static void
-int_sip_update(sip_state *state, const uint8_t *data, size_t len)
-{
- uint64_t *end;
- uint64_t *data64;
-
- state->msglen_byte = state->msglen_byte + (len % 256);
- data64 = (uint64_t *) data;
-
- int_sip_pre_update(state, &data, &len);
-
- end = data64 + (len / sizeof(uint64_t));
-
-#if BYTE_ORDER == LITTLE_ENDIAN
- while (data64 != end) {
- int_sip_update_block(state, *data64++);
- }
-#elif BYTE_ORDER == BIG_ENDIAN
- {
- uint64_t m;
- uint8_t *data8 = data;
- for (; data8 != (uint8_t *) end; data8 += sizeof(uint64_t)) {
- m = U8TO64_LE(data8);
- int_sip_update_block(state, m);
- }
- }
-#endif
-
- int_sip_post_update(state, data, len);
-}
-
-static inline void
-int_sip_pad_final_block(sip_state *state)
-{
- int i;
- /* pad with 0's and finalize with msg_len mod 256 */
- for (i = state->buflen; i < sizeof(uint64_t); i++) {
- state->buf[i] = 0x00;
- }
- state->buf[sizeof(uint64_t) - 1] = state->msglen_byte;
-}
-
-static void
-int_sip_final(sip_state *state, uint64_t *digest)
-{
- uint64_t m;
-
- int_sip_pad_final_block(state);
-
- m = U8TO64_LE(state->buf);
- int_sip_update_block(state, m);
-
- XOR64_INT(state->v[2], 0xff);
-
- int_sip_round(state, state->d);
-
- *digest = state->v[0];
- XOR64_TO(*digest, state->v[1]);
- XOR64_TO(*digest, state->v[2]);
- XOR64_TO(*digest, state->v[3]);
-}
-
-sip_hash *
-sip_hash_new(const uint8_t key[16], int c, int d)
-{
- sip_hash *h = NULL;
-
- if (!(h = (sip_hash *) malloc(sizeof(sip_hash)))) return NULL;
- return sip_hash_init(h, key, c, d);
-}
-
-sip_hash *
-sip_hash_init(sip_hash *h, const uint8_t key[16], int c, int d)
-{
- h->state->c = c;
- h->state->d = d;
- h->state->buflen = 0;
- h->state->msglen_byte = 0;
- h->methods = &sip_methods;
- h->methods->init(h->state, key);
- return h;
-}
-
-int
-sip_hash_update(sip_hash *h, const uint8_t *msg, size_t len)
-{
- h->methods->update(h->state, msg, len);
- return 1;
-}
-
-int
-sip_hash_final(sip_hash *h, uint8_t **digest, size_t* len)
-{
- uint64_t digest64;
- uint8_t *ret;
-
- h->methods->final(h->state, &digest64);
- if (!(ret = (uint8_t *)malloc(sizeof(uint64_t)))) return 0;
- U64TO8_LE(ret, digest64);
- *len = sizeof(uint64_t);
- *digest = ret;
-
- return 1;
-}
-
-int
-sip_hash_final_integer(sip_hash *h, uint64_t *digest)
-{
- h->methods->final(h->state, digest);
- return 1;
-}
-
-int
-sip_hash_digest(sip_hash *h, const uint8_t *data, size_t data_len, uint8_t **digest, size_t *digest_len)
-{
- if (!sip_hash_update(h, data, data_len)) return 0;
- return sip_hash_final(h, digest, digest_len);
-}
-
-int
-sip_hash_digest_integer(sip_hash *h, const uint8_t *data, size_t data_len, uint64_t *digest)
-{
- if (!sip_hash_update(h, data, data_len)) return 0;
- return sip_hash_final_integer(h, digest);
-}
-
-void
-sip_hash_free(sip_hash *h)
-{
- free(h);
-}
-
-void
-sip_hash_dump(sip_hash *h)
-{
- int_sip_dump(h->state);
-}
-#endif /* SIP_HASH_STREAMING */
-
-#define SIP_2_ROUND(m, v0, v1, v2, v3) \
-do { \
- XOR64_TO((v3), (m)); \
- SIP_COMPRESS(v0, v1, v2, v3); \
- SIP_COMPRESS(v0, v1, v2, v3); \
- XOR64_TO((v0), (m)); \
-} while (0)
-
-uint64_t
-sip_hash24(const uint8_t key[16], const uint8_t *data, size_t len)
-{
- uint64_t k0, k1;
- uint64_t v0, v1, v2, v3;
- uint64_t m, last;
- const uint8_t *end = data + len - (len % sizeof(uint64_t));
-
- k0 = U8TO64_LE(key);
- k1 = U8TO64_LE(key + sizeof(uint64_t));
-
- v0 = k0; XOR64_TO(v0, sip_init_state[0]);
- v1 = k1; XOR64_TO(v1, sip_init_state[1]);
- v2 = k0; XOR64_TO(v2, sip_init_state[2]);
- v3 = k1; XOR64_TO(v3, sip_init_state[3]);
-
-#if BYTE_ORDER == LITTLE_ENDIAN && UNALIGNED_WORD_ACCESS
- {
- uint64_t *data64 = (uint64_t *)data;
- while (data64 != (uint64_t *) end) {
- m = *data64++;
- SIP_2_ROUND(m, v0, v1, v2, v3);
- }
- }
-#elif BYTE_ORDER == BIG_ENDIAN
- for (; data != end; data += sizeof(uint64_t)) {
- m = U8TO64_LE(data);
- SIP_2_ROUND(m, v0, v1, v2, v3);
- }
-#endif
-
-#ifdef HAVE_UINT64_T
- last = (uint64_t)len << 56;
-#define OR_BYTE(n) (last |= ((uint64_t) end[n]) << ((n) * 8))
-#else
- last.hi = len << 24;
- last.lo = 0;
-#define OR_BYTE(n) do { \
- if (n >= 4) \
- last.hi |= ((uint32_t) end[n]) << ((n) >= 4 ? (n) * 8 - 32 : 0); \
- else \
- last.lo |= ((uint32_t) end[n]) << ((n) >= 4 ? 0 : (n) * 8); \
- } while (0)
-#endif
-
- switch (len % sizeof(uint64_t)) {
- case 7:
- OR_BYTE(6);
- case 6:
- OR_BYTE(5);
- case 5:
- OR_BYTE(4);
- case 4:
-#if BYTE_ORDER == LITTLE_ENDIAN && UNALIGNED_WORD_ACCESS
- #if HAVE_UINT64_T
- last |= (uint64_t) ((uint32_t *) end)[0];
- #else
- last.lo |= ((uint32_t *) end)[0];
- #endif
- break;
-#elif BYTE_ORDER == BIG_ENDIAN
- OR_BYTE(3);
-#endif
- case 3:
- OR_BYTE(2);
- case 2:
- OR_BYTE(1);
- case 1:
- OR_BYTE(0);
- break;
- case 0:
- break;
- }
-
- SIP_2_ROUND(last, v0, v1, v2, v3);
-
- XOR64_INT(v2, 0xff);
-
- SIP_COMPRESS(v0, v1, v2, v3);
- SIP_COMPRESS(v0, v1, v2, v3);
- SIP_COMPRESS(v0, v1, v2, v3);
- SIP_COMPRESS(v0, v1, v2, v3);
-
- XOR64_TO(v0, v1);
- XOR64_TO(v0, v2);
- XOR64_TO(v0, v3);
- return v0;
-}
diff --git a/siphash.h b/siphash.h
deleted file mode 100644
index 3f3988408b..0000000000
--- a/siphash.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef SIPHASH_H
-#define SIPHASH_H 1
-#include <stdlib.h>
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-#ifndef HAVE_UINT64_T
-typedef struct {
- uint32_t u32[2];
-} sip_uint64_t;
-#define uint64_t sip_uint64_t
-#else
-typedef uint64_t sip_uint64_t;
-#endif
-
-typedef struct {
- int c;
- int d;
- uint64_t v[4];
- uint8_t buf[sizeof(uint64_t)];
- uint8_t buflen;
- uint8_t msglen_byte;
-} sip_state;
-
-typedef struct sip_interface_st sip_interface;
-
-typedef struct {
- sip_state state[1];
- const sip_interface *methods;
-} sip_hash;
-
-sip_hash *sip_hash_new(const uint8_t key[16], int c, int d);
-sip_hash *sip_hash_init(sip_hash *h, const uint8_t key[16], int c, int d);
-int sip_hash_update(sip_hash *h, const uint8_t *data, size_t len);
-int sip_hash_final(sip_hash *h, uint8_t **digest, size_t *len);
-int sip_hash_final_integer(sip_hash *h, uint64_t *digest);
-int sip_hash_digest(sip_hash *h, const uint8_t *data, size_t data_len, uint8_t **digest, size_t *digest_len);
-int sip_hash_digest_integer(sip_hash *h, const uint8_t *data, size_t data_len, uint64_t *digest);
-void sip_hash_free(sip_hash *h);
-void sip_hash_dump(sip_hash *h);
-
-uint64_t sip_hash24(const uint8_t key[16], const uint8_t *data, size_t len);
-
-#endif
diff --git a/sparc.c b/sparc.c
deleted file mode 100644
index 5c5dc8ef8e..0000000000
--- a/sparc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/********************************************************************
- Flush register windows on sparc.
-
- This function is in a separate file to prevent inlining. The "flushw"
- assembler instruction used on sparcv9 flushes all register windows
- except the current one, so if it is inlined, the current register
- window of the process executing the instruction will not be flushed
- correctly.
-
- See http://bugs.ruby-lang.org/issues/5244 for discussion.
-*********************************************************************/
-void
-rb_sparc_flush_register_windows(void)
-{
- asm
-#ifdef __GNUC__
- __volatile__
-#endif
-
-/* This condition should be in sync with one in configure.in */
-#if defined(__sparcv9) || defined(__sparc_v9__) || defined(__arch64__)
-# ifdef __GNUC__
- ("flushw" : : : "%o7")
-# else
- ("flushw")
-# endif /* __GNUC__ */
-#else
- ("ta 0x03")
-#endif
- ;
-}
diff --git a/spec/README b/spec/README
index 9821404697..786aa5b786 100644
--- a/spec/README
+++ b/spec/README
@@ -1,16 +1,15 @@
= RubySpec
-RubySpec (http://rubyspec.org) provides the annotation of the Ruby
-implementation in an executable format. The make task
-`update-rubyspec' retrieves the specification and puts it into this
-directory.
+RubySpec (http://rubyspec.org) provides the Ruby langauge specification in an
+executable format. The make task `update-rubyspec' retrieves the specification
+and put it into this directory.
== Directory structure
spec
+-- mspec driver library for executing the specification.
+-- rubyspec
- +-- core specification for core libraries
- | +-- array
+ +-- core specification for core libraries
+ | +-- array
| +-- bignum
| +-- ...
|
diff --git a/spec/default.mspec b/spec/default.mspec
index e45526c7ac..6505fca904 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,4 +1,4 @@
-load File.dirname(__FILE__) + '/rubyspec/default.mspec'
+load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
class MSpecScript
builddir = Dir.pwd
srcdir = ENV['SRCDIR']
@@ -13,9 +13,10 @@ class MSpecScript
set :target, File.join(builddir, "miniruby#{config['exeext']}")
set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__))
set :flags, %W[
- -I#{File.expand_path srcdir}/lib
- -I#{File.expand_path srcdir}/#{config['EXTOUT']}/common
- -I#{File.expand_path srcdir}/-
- #{File.expand_path srcdir}/tool/runruby.rb --archdir=#{Dir.pwd} --extout=#{config['EXTOUT']}
+ -I#{srcdir}/lib
+ -I#{srcdir}/#{config['EXTOUT']}/common
+ -I#{srcdir}/-
+ -r#{srcdir}/ext/purelib.rb
+ #{srcdir}/tool/runruby.rb --extout=#{config['EXTOUT']}
]
end
diff --git a/sprintf.c b/sprintf.c
index 15259960fc..60d54f49bf 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -14,7 +14,6 @@
#include "ruby/ruby.h"
#include "ruby/re.h"
#include "ruby/encoding.h"
-#include "internal.h"
#include <math.h>
#include <stdarg.h>
@@ -31,7 +30,9 @@ static void fmt_setup(char*,size_t,int,int,int,int);
static char*
remove_sign_bits(char *str, int base)
{
- char *t = str;
+ char *s, *t;
+
+ s = t = str;
if (base == 16) {
while (*t == 'f') {
@@ -93,20 +94,17 @@ sign_bits(int base, const char *p)
#define PUSH(s, l) do { \
CHECK(l);\
- memcpy(&buf[blen], (s), (l));\
+ memcpy(&buf[blen], s, l);\
blen += (l);\
} while (0)
#define FILL(c, l) do { \
CHECK(l);\
- memset(&buf[blen], (c), (l));\
+ memset(&buf[blen], c, l);\
blen += (l);\
} while (0)
#define GETARG() (nextvalue != Qundef ? nextvalue : \
- GETNEXTARG())
-
-#define GETNEXTARG() ( \
posarg == -1 ? \
(rb_raise(rb_eArgError, "unnumbered(%d) mixed with numbered", nextarg), 0) : \
posarg == -2 ? \
@@ -114,29 +112,29 @@ sign_bits(int base, const char *p)
(posarg = nextarg++, GETNTHARG(posarg)))
#define GETPOSARG(n) (posarg > 0 ? \
- (rb_raise(rb_eArgError, "numbered(%d) after unnumbered(%d)", (n), posarg), 0) : \
+ (rb_raise(rb_eArgError, "numbered(%d) after unnumbered(%d)", n, posarg), 0) : \
posarg == -2 ? \
- (rb_raise(rb_eArgError, "numbered(%d) after named", (n)), 0) : \
- (((n) < 1) ? (rb_raise(rb_eArgError, "invalid index - %d$", (n)), 0) : \
+ (rb_raise(rb_eArgError, "numbered(%d) after named", n), 0) : \
+ ((n < 1) ? (rb_raise(rb_eArgError, "invalid index - %d$", n), 0) : \
(posarg = -1, GETNTHARG(n))))
#define GETNTHARG(nth) \
- (((nth) >= argc) ? (rb_raise(rb_eArgError, "too few arguments"), 0) : argv[(nth)])
+ ((nth >= argc) ? (rb_raise(rb_eArgError, "too few arguments"), 0) : argv[nth])
-#define GETNAMEARG(id, name, len, enc) ( \
+#define GETNAMEARG(id, name, len) ( \
posarg > 0 ? \
- (rb_enc_raise((enc), rb_eArgError, "named%.*s after unnumbered(%d)", (len), (name), posarg), 0) : \
+ (rb_raise(rb_eArgError, "named%.*s after unnumbered(%d)", (len), (name), posarg), 0) : \
posarg == -1 ? \
- (rb_enc_raise((enc), rb_eArgError, "named%.*s after numbered", (len), (name)), 0) : \
- (posarg = -2, rb_hash_lookup2(get_hash(&hash, argc, argv), (id), Qundef)))
+ (rb_raise(rb_eArgError, "named%.*s after numbered", (len), (name)), 0) : \
+ (posarg = -2, rb_hash_lookup2(get_hash(&hash, argc, argv), id, Qundef)))
#define GETNUM(n, val) \
for (; p < end && rb_enc_isdigit(*p, enc); p++) { \
- int next_n = 10 * (n) + (*p - '0'); \
- if (next_n / 10 != (n)) {\
+ int next_n = 10 * n + (*p - '0'); \
+ if (next_n / 10 != n) {\
rb_raise(rb_eArgError, #val " too big"); \
} \
- (n) = next_n; \
+ n = next_n; \
} \
if (p >= end) { \
rb_raise(rb_eArgError, "malformed format string - %%*[0-9]"); \
@@ -145,15 +143,15 @@ sign_bits(int base, const char *p)
#define GETASTER(val) do { \
t = p++; \
n = 0; \
- GETNUM(n, (val)); \
+ GETNUM(n, val); \
if (*p == '$') { \
tmp = GETPOSARG(n); \
} \
else { \
- tmp = GETNEXTARG(); \
+ tmp = GETARG(); \
p = t; \
} \
- (val) = NUM2INT(tmp); \
+ val = NUM2INT(tmp); \
} while (0)
static VALUE
@@ -165,7 +163,7 @@ get_hash(volatile VALUE *hash, int argc, const VALUE *argv)
if (argc != 2) {
rb_raise(rb_eArgError, "one hash required");
}
- tmp = rb_check_hash_type(argv[1]);
+ tmp = rb_check_convert_type(argv[1], T_HASH, "Hash", "to_hash");
if (NIL_P(tmp)) {
rb_raise(rb_eArgError, "one hash required");
}
@@ -426,7 +424,7 @@ get_hash(volatile VALUE *hash, int argc, const VALUE *argv)
* For more complex formatting, Ruby supports a reference by name.
* %<name>s style uses format style, but %{name} style doesn't.
*
- * Examples:
+ * Exapmles:
* sprintf("%<foo>d : %<bar>f", { :foo => 1, :bar => 2 })
* #=> 1 : 2.000000
* sprintf("%{foo}f", { :foo => 1 })
@@ -570,7 +568,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
{
const char *start = p;
char term = (*p == '<') ? '>' : '}';
- int len;
for (; p < end && *p != term; ) {
p += rb_enc_mbclen(p, end, enc);
@@ -578,27 +575,14 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (p >= end) {
rb_raise(rb_eArgError, "malformed name - unmatched parenthesis");
}
-#if SIZEOF_INT < SIZEOF_SIZE_T
- if ((size_t)(p - start) >= INT_MAX) {
- const int message_limit = 20;
- len = (int)(rb_enc_right_char_head(start, start + message_limit, p, enc) - start);
- rb_enc_raise(enc, rb_eArgError,
- "too long name (%"PRIdSIZE" bytes) - %.*s...%c",
- (size_t)(p - start - 2), len, start, term);
- }
-#endif
- len = (int)(p - start + 1); /* including parenthesis */
if (id) {
- rb_enc_raise(enc, rb_eArgError, "named%.*s after <%s>",
- len, start, rb_id2name(id));
+ rb_raise(rb_eArgError, "name%.*s after <%s>",
+ (int)(p - start + 1), start, rb_id2name(id));
}
- nextvalue = GETNAMEARG((id = rb_check_id_cstr(start + 1,
- len - 2 /* without parenthesis */,
- enc),
- ID2SYM(id)),
- start, len, enc);
+ id = rb_intern3(start + 1, p - start - 1, enc);
+ nextvalue = GETNAMEARG(ID2SYM(id), start, (int)(p - start + 1));
if (nextvalue == Qundef) {
- rb_enc_raise(enc, rb_eKeyError, "key%.*s not found", len, start);
+ rb_raise(rb_eKeyError, "key%.*s not found", (int)(p - start + 1), start);
}
if (term == '}') goto format_s;
p++;
@@ -659,7 +643,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
rb_raise(rb_eArgError, "%%c requires a character");
}
c = rb_enc_codepoint_len(RSTRING_PTR(tmp), RSTRING_END(tmp), &n, enc);
- RB_GC_GUARD(tmp);
}
else {
c = NUM2INT(val);
@@ -730,7 +713,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
}
CHECK(len);
memcpy(&buf[blen], RSTRING_PTR(str), len);
- RB_GC_GUARD(str);
blen += len;
if (flags&FMINUS) {
CHECK(width);
@@ -743,7 +725,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
}
}
PUSH(RSTRING_PTR(str), len);
- RB_GC_GUARD(str);
rb_enc_associate(result, enc);
}
break;
@@ -757,6 +738,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
case 'B':
case 'u':
{
+ volatile VALUE tmp1;
volatile VALUE val = GETARG();
char fbuf[32], nbuf[64], *s;
const char *prefix = 0;
@@ -764,7 +746,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
char sc = 0;
long v = 0;
int base, bignum = 0;
- int len;
+ int len, pos;
switch (*p) {
case 'd':
@@ -907,7 +889,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
val = rb_big_clone(val);
rb_big_2comp(val);
}
- tmp = rb_big2str0(val, base, RBIGNUM_SIGN(val));
+ tmp1 = tmp = rb_big2str0(val, base, RBIGNUM_SIGN(val));
s = RSTRING_PTR(tmp);
if (*s == '-') {
dots = 1;
@@ -928,6 +910,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
len = rb_long2int(RSTRING_END(tmp) - s);
}
+ pos = -1;
if (dots) {
prec -= 2;
width -= 2;
@@ -1001,7 +984,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
}
}
PUSH(s, len);
- RB_GC_GUARD(tmp);
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
@@ -1086,7 +1068,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
}
sprint_exit:
- RB_GC_GUARD(fmt);
/* XXX - We cannot validate the number of arguments if (digit)$ style used.
*/
if (posarg >= 0 && nextarg < argc) {
@@ -1140,21 +1121,11 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
# define quad_t LONG_LONG
# define u_quad_t unsigned LONG_LONG
# endif
-#elif SIZEOF_LONG != SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == 8
-# define _HAVE_SANE_QUAD_
-# define quad_t LONG_LONG
-# define u_quad_t unsigned LONG_LONG
#endif
#define FLOATING_POINT 1
#define BSD__dtoa ruby_dtoa
-#define BSD__hdtoa ruby_hdtoa
#include "vsnprintf.c"
-typedef struct {
- rb_printf_buffer base;
- volatile VALUE value;
-} rb_printf_buffer_extra;
-
static int
ruby__sfvwrite(register rb_printf_buffer *fp, register struct __suio *uio)
{
@@ -1178,76 +1149,27 @@ ruby__sfvwrite(register rb_printf_buffer *fp, register struct __suio *uio)
len -= n;
}
fp->_p = (unsigned char *)buf;
- rb_str_set_len(result, buf - RSTRING_PTR(result));
return 0;
}
-static char *
-ruby__sfvextra(rb_printf_buffer *fp, size_t valsize, void *valp, long *sz, int sign)
-{
- VALUE value, result = (VALUE)fp->_bf._base;
- rb_encoding *enc;
- char *cp;
-
- if (valsize != sizeof(VALUE)) return 0;
- value = *(VALUE *)valp;
- if (RBASIC(result)->klass) {
- rb_raise(rb_eRuntimeError, "rb_vsprintf reentered");
- }
- if (sign == '+') {
- value = rb_inspect(value);
- }
- else {
- value = rb_obj_as_string(value);
- if (sign == ' ') value = QUOTE(value);
- }
- enc = rb_enc_compatible(result, value);
- if (enc) {
- rb_enc_associate(result, enc);
- }
- else {
- enc = rb_enc_get(result);
- value = rb_str_conv_enc_opts(value, rb_enc_get(value), enc,
- ECONV_UNDEF_REPLACE|ECONV_INVALID_REPLACE,
- Qnil);
- *(volatile VALUE *)valp = value;
- }
- StringValueCStr(value);
- RSTRING_GETMEM(value, cp, *sz);
- ((rb_printf_buffer_extra *)fp)->value = value;
- OBJ_INFECT(result, value);
- return cp;
-}
-
VALUE
rb_enc_vsprintf(rb_encoding *enc, const char *fmt, va_list ap)
{
- rb_printf_buffer_extra buffer;
-#define f buffer.base
+ rb_printf_buffer f;
VALUE result;
f._flags = __SWR | __SSTR;
f._bf._size = 0;
f._w = 120;
result = rb_str_buf_new(f._w);
- if (enc) {
- if (rb_enc_mbminlen(enc) > 1) {
- /* the implementation deeply depends on plain char */
- rb_raise(rb_eArgError, "cannot construct wchar_t based encoding string: %s",
- rb_enc_name(enc));
- }
- rb_enc_associate(result, enc);
- }
+ if (enc) rb_enc_associate(result, enc);
f._bf._base = (unsigned char *)result;
f._p = (unsigned char *)RSTRING_PTR(result);
RBASIC(result)->klass = 0;
f.vwrite = ruby__sfvwrite;
- f.vextra = ruby__sfvextra;
- buffer.value = 0;
BSD_vfprintf(&f, fmt, ap);
RBASIC(result)->klass = rb_cString;
rb_str_resize(result, (char *)f._p - RSTRING_PTR(result));
-#undef f
return result;
}
@@ -1287,8 +1209,7 @@ rb_sprintf(const char *format, ...)
VALUE
rb_str_vcatf(VALUE str, const char *fmt, va_list ap)
{
- rb_printf_buffer_extra buffer;
-#define f buffer.base
+ rb_printf_buffer f;
VALUE klass;
StringValue(str);
@@ -1301,12 +1222,9 @@ rb_str_vcatf(VALUE str, const char *fmt, va_list ap)
klass = RBASIC(str)->klass;
RBASIC(str)->klass = 0;
f.vwrite = ruby__sfvwrite;
- f.vextra = ruby__sfvextra;
- buffer.value = 0;
BSD_vfprintf(&f, fmt, ap);
RBASIC(str)->klass = klass;
rb_str_resize(str, (char *)f._p - RSTRING_PTR(str));
-#undef f
return str;
}
diff --git a/st.c b/st.c
index 6b97a11091..ec518e936a 100644
--- a/st.c
+++ b/st.c
@@ -25,22 +25,8 @@ struct st_table_entry {
st_table_entry *fore, *back;
};
-typedef struct st_packed_entry {
- st_index_t hash;
- st_data_t key, val;
-} st_packed_entry;
-
-#define STATIC_ASSERT(name, expr) typedef int static_assert_##name##_check[(expr) ? 1 : -1];
-
#define ST_DEFAULT_MAX_DENSITY 5
#define ST_DEFAULT_INIT_TABLE_SIZE 11
-#define ST_DEFAULT_SECOND_TABLE_SIZE 19
-#define ST_DEFAULT_PACKED_TABLE_SIZE 18
-#define PACKED_UNIT (int)(sizeof(st_packed_entry) / sizeof(st_table_entry*))
-#define MAX_PACKED_HASH (int)(ST_DEFAULT_PACKED_TABLE_SIZE * sizeof(st_table_entry*) / sizeof(st_packed_entry))
-
-STATIC_ASSERT(st_packed_entry, sizeof(st_packed_entry) == sizeof(st_table_entry*[PACKED_UNIT]))
-STATIC_ASSERT(st_packed_bins, sizeof(st_packed_entry[MAX_PACKED_HASH]) <= sizeof(st_table_entry*[ST_DEFAULT_PACKED_TABLE_SIZE]))
/*
* DEFAULT_MAX_DENSITY is the default for the largest we allow the
@@ -52,8 +38,7 @@ STATIC_ASSERT(st_packed_bins, sizeof(st_packed_entry[MAX_PACKED_HASH]) <= sizeof
*
*/
-#define type_numhash st_hashtype_num
-const struct st_hash_type st_hashtype_num = {
+static const struct st_hash_type type_numhash = {
st_numcmp,
st_numhash,
};
@@ -76,68 +61,19 @@ static void rehash(st_table *);
#ifdef RUBY
#define malloc xmalloc
#define calloc xcalloc
-#define realloc xrealloc
#define free(x) xfree(x)
#endif
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-#define EQUAL(table,x,y) ((x)==(y) || (*(table)->type->compare)((x),(y)) == 0)
+#define alloc(type) (type*)malloc((size_t)sizeof(type))
+#define Calloc(n,s) (char*)calloc((n),(s))
-#define do_hash(key,table) (st_index_t)(*(table)->type->hash)((key))
-#define do_hash_bin(key,table) (do_hash((key), (table))%(table)->num_bins)
+#define EQUAL(table,x,y) ((x)==(y) || (*table->type->compare)((x),(y)) == 0)
-/* preparation for possible allocation improvements */
-#define st_alloc_entry() (st_table_entry *)malloc(sizeof(st_table_entry))
-#define st_free_entry(entry) free(entry)
-#define st_alloc_table() (st_table *)malloc(sizeof(st_table))
-#define st_dealloc_table(table) free(table)
-#define st_alloc_bins(size) (st_table_entry **)calloc(size, sizeof(st_table_entry *))
-#define st_free_bins(bins, size) free(bins)
-static inline st_table_entry**
-st_realloc_bins(st_table_entry **bins, st_index_t newsize, st_index_t oldsize)
-{
- bins = (st_table_entry **)realloc(bins, newsize * sizeof(st_table_entry *));
- MEMZERO(bins, st_table_entry*, newsize);
- return bins;
-}
-
-/* Shortage */
-#define bins as.big.bins
-#define head as.big.head
-#define tail as.big.tail
-#define real_entries as.packed.real_entries
-
-/* preparation for possible packing improvements */
-#define PACKED_BINS(table) ((table)->as.packed.entries)
-#define PACKED_ENT(table, i) PACKED_BINS(table)[i]
-#define PKEY(table, i) PACKED_ENT((table), (i)).key
-#define PVAL(table, i) PACKED_ENT((table), (i)).val
-#define PHASH(table, i) PACKED_ENT((table), (i)).hash
-#define PKEY_SET(table, i, v) (PKEY((table), (i)) = (v))
-#define PVAL_SET(table, i, v) (PVAL((table), (i)) = (v))
-#define PHASH_SET(table, i, v) (PHASH((table), (i)) = (v))
-
-/* this function depends much on packed layout, so that it placed here */
-static inline void
-remove_packed_entry(st_table *table, st_index_t i)
-{
- table->real_entries--;
- table->num_entries--;
- if (i < table->real_entries) {
- MEMMOVE(&PACKED_ENT(table, i), &PACKED_ENT(table, i+1),
- st_packed_entry, table->real_entries - i);
- }
-}
-
-static inline void
-remove_safe_packed_entry(st_table *table, st_index_t i, st_data_t never)
-{
- table->num_entries--;
- PKEY_SET(table, i, never);
- PVAL_SET(table, i, never);
- PHASH_SET(table, i, 0);
-}
+/* remove cast to unsigned int in the future */
+#define do_hash(key,table) (unsigned int)(st_index_t)(*(table)->type->hash)((key))
+#define do_hash_bin(key,table) (do_hash(key, table)%(table)->num_bins)
/*
* MINSIZE is the minimum size of a dictionary.
@@ -149,8 +85,8 @@ remove_safe_packed_entry(st_table *table, st_index_t i, st_data_t never)
Table of prime numbers 2^n+a, 2<=n<=30.
*/
static const unsigned int primes[] = {
- ST_DEFAULT_INIT_TABLE_SIZE,
- ST_DEFAULT_SECOND_TABLE_SIZE,
+ 8 + 3,
+ 16 + 3,
32 + 5,
64 + 3,
128 + 3,
@@ -225,6 +161,8 @@ stat_col(void)
}
#endif
+#define MAX_PACKED_NUMHASH (ST_DEFAULT_INIT_TABLE_SIZE/2)
+
st_table*
st_init_table_with_size(const struct st_hash_type *type, st_index_t size)
{
@@ -243,19 +181,14 @@ st_init_table_with_size(const struct st_hash_type *type, st_index_t size)
}
#endif
+ size = new_size(size); /* round up to prime number */
- tbl = st_alloc_table();
+ tbl = alloc(st_table);
tbl->type = type;
tbl->num_entries = 0;
- tbl->entries_packed = size <= MAX_PACKED_HASH;
- if (tbl->entries_packed) {
- size = ST_DEFAULT_PACKED_TABLE_SIZE;
- }
- else {
- size = new_size(size); /* round up to prime number */
- }
+ tbl->entries_packed = type == &type_numhash && size/2 <= MAX_PACKED_NUMHASH;
tbl->num_bins = size;
- tbl->bins = st_alloc_bins(size);
+ tbl->bins = (st_table_entry **)Calloc(size, sizeof(st_table_entry*));
tbl->head = 0;
tbl->tail = 0;
@@ -312,16 +245,15 @@ st_clear(st_table *table)
if (table->entries_packed) {
table->num_entries = 0;
- table->real_entries = 0;
return;
}
- for (i = 0; i < table->num_bins; i++) {
+ for(i = 0; i < table->num_bins; i++) {
ptr = table->bins[i];
table->bins[i] = 0;
while (ptr != 0) {
next = ptr->next;
- st_free_entry(ptr);
+ free(ptr);
ptr = next;
}
}
@@ -334,8 +266,8 @@ void
st_free_table(st_table *table)
{
st_clear(table);
- st_free_bins(table->bins, table->num_bins);
- st_dealloc_table(table);
+ free(table->bins);
+ free(table);
}
size_t
@@ -350,7 +282,7 @@ st_memsize(const st_table *table)
}
#define PTR_NOT_EQUAL(table, ptr, hash_val, key) \
-((ptr) != 0 && ((ptr)->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key)))
+((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key)))
#ifdef HASH_LOG
static void
@@ -374,66 +306,46 @@ count_collision(const struct st_hash_type *type)
#define FOUND_ENTRY
#endif
-#define FIND_ENTRY(table, ptr, hash_val, bin_pos) \
- ((ptr) = find_entry((table), key, (hash_val), ((bin_pos) = (hash_val)%(table)->num_bins)))
-
-static st_table_entry *
-find_entry(st_table *table, st_data_t key, st_index_t hash_val, st_index_t bin_pos)
-{
- register st_table_entry *ptr = table->bins[bin_pos];
- FOUND_ENTRY;
- if (PTR_NOT_EQUAL(table, ptr, hash_val, key)) {
- COLLISION;
- while (PTR_NOT_EQUAL(table, ptr->next, hash_val, key)) {
- ptr = ptr->next;
- }
- ptr = ptr->next;
- }
- return ptr;
-}
-
-static inline st_index_t
-find_packed_index_from(st_table *table, st_index_t hash_val, st_data_t key, st_index_t i)
-{
- while (i < table->real_entries &&
- (PHASH(table, i) != hash_val || !EQUAL(table, key, PKEY(table, i)))) {
- i++;
- }
- return i;
-}
-
-static inline st_index_t
-find_packed_index(st_table *table, st_index_t hash_val, st_data_t key)
-{
- return find_packed_index_from(table, hash_val, key, 0);
-}
+#define FIND_ENTRY(table, ptr, hash_val, bin_pos) do {\
+ bin_pos = hash_val%(table)->num_bins;\
+ ptr = (table)->bins[bin_pos];\
+ FOUND_ENTRY;\
+ if (PTR_NOT_EQUAL(table, ptr, hash_val, key)) {\
+ COLLISION;\
+ while (PTR_NOT_EQUAL(table, ptr->next, hash_val, key)) {\
+ ptr = ptr->next;\
+ }\
+ ptr = ptr->next;\
+ }\
+} while (0)
#define collision_check 0
int
st_lookup(st_table *table, register st_data_t key, st_data_t *value)
{
- st_index_t hash_val;
+ st_index_t hash_val, bin_pos;
register st_table_entry *ptr;
- hash_val = do_hash(key, table);
-
if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, key);
- if (i < table->real_entries) {
- if (value != 0) *value = PVAL(table, i);
- return 1;
- }
+ st_index_t i;
+ for (i = 0; i < table->num_entries; i++) {
+ if ((st_data_t)table->bins[i*2] == key) {
+ if (value !=0) *value = (st_data_t)table->bins[i*2+1];
+ return 1;
+ }
+ }
return 0;
}
- ptr = find_entry(table, key, hash_val, hash_val % table->num_bins);
+ hash_val = do_hash(key, table);
+ FIND_ENTRY(table, ptr, hash_val, bin_pos);
if (ptr == 0) {
return 0;
}
else {
- if (value != 0) *value = ptr->record;
+ if (value != 0) *value = ptr->record;
return 1;
}
}
@@ -441,21 +353,22 @@ st_lookup(st_table *table, register st_data_t key, st_data_t *value)
int
st_get_key(st_table *table, register st_data_t key, st_data_t *result)
{
- st_index_t hash_val;
+ st_index_t hash_val, bin_pos;
register st_table_entry *ptr;
- hash_val = do_hash(key, table);
-
if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, key);
- if (i < table->real_entries) {
- if (result != 0) *result = PKEY(table, i);
- return 1;
- }
+ st_index_t i;
+ for (i = 0; i < table->num_entries; i++) {
+ if ((st_data_t)table->bins[i*2] == key) {
+ if (result !=0) *result = (st_data_t)table->bins[i*2];
+ return 1;
+ }
+ }
return 0;
}
- ptr = find_entry(table, key, hash_val, hash_val % table->num_bins);
+ hash_val = do_hash(key, table);
+ FIND_ENTRY(table, ptr, hash_val, bin_pos);
if (ptr == 0) {
return 0;
@@ -469,120 +382,85 @@ st_get_key(st_table *table, register st_data_t key, st_data_t *result)
#undef collision_check
#define collision_check 1
-static inline st_table_entry *
-new_entry(st_table * table, st_data_t key, st_data_t value,
- st_index_t hash_val, register st_index_t bin_pos)
-{
- register st_table_entry *entry = st_alloc_entry();
-
- entry->next = table->bins[bin_pos];
- table->bins[bin_pos] = entry;
- entry->hash = hash_val;
- entry->key = key;
- entry->record = value;
-
- return entry;
-}
-
-static inline void
-add_direct(st_table *table, st_data_t key, st_data_t value,
- st_index_t hash_val, register st_index_t bin_pos)
-{
- register st_table_entry *entry;
- if (table->num_entries > ST_DEFAULT_MAX_DENSITY * table->num_bins) {
- rehash(table);
- bin_pos = hash_val % table->num_bins;
- }
-
- entry = new_entry(table, key, value, hash_val, bin_pos);
-
- if (table->head != 0) {
- entry->fore = 0;
- (entry->back = table->tail)->fore = entry;
- table->tail = entry;
- }
- else {
- table->head = table->tail = entry;
- entry->fore = entry->back = 0;
- }
- table->num_entries++;
-}
+#define MORE_PACKABLE_P(table) \
+ ((st_index_t)((table)->num_entries+1) * 2 <= (table)->num_bins && \
+ (table)->num_entries+1 <= MAX_PACKED_NUMHASH)
+
+#define ADD_DIRECT(table, key, value, hash_val, bin_pos)\
+do {\
+ st_table_entry *entry;\
+ if (table->num_entries > ST_DEFAULT_MAX_DENSITY * table->num_bins) {\
+ rehash(table);\
+ bin_pos = hash_val % table->num_bins;\
+ }\
+ \
+ entry = alloc(st_table_entry);\
+ \
+ entry->hash = hash_val;\
+ entry->key = key;\
+ entry->record = value;\
+ entry->next = table->bins[bin_pos];\
+ if (table->head != 0) {\
+ entry->fore = 0;\
+ (entry->back = table->tail)->fore = entry;\
+ table->tail = entry;\
+ }\
+ else {\
+ table->head = table->tail = entry;\
+ entry->fore = entry->back = 0;\
+ }\
+ table->bins[bin_pos] = entry;\
+ table->num_entries++;\
+} while (0)
static void
unpack_entries(register st_table *table)
{
st_index_t i;
- st_packed_entry packed_bins[MAX_PACKED_HASH];
- register st_table_entry *entry, *preventry = 0, **chain;
+ struct st_table_entry *packed_bins[MAX_PACKED_NUMHASH*2];
st_table tmp_table = *table;
- MEMCPY(packed_bins, PACKED_BINS(table), st_packed_entry, MAX_PACKED_HASH);
- table->as.packed.entries = packed_bins;
+ memcpy(packed_bins, table->bins, sizeof(struct st_table_entry *) * table->num_entries*2);
+ table->bins = packed_bins;
tmp_table.entries_packed = 0;
-#if ST_DEFAULT_INIT_TABLE_SIZE == ST_DEFAULT_PACKED_TABLE_SIZE
- MEMZERO(tmp_table.bins, st_table_entry*, tmp_table.num_bins);
-#else
- tmp_table.bins = st_realloc_bins(tmp_table.bins, ST_DEFAULT_INIT_TABLE_SIZE, tmp_table.num_bins);
- tmp_table.num_bins = ST_DEFAULT_INIT_TABLE_SIZE;
-#endif
- i = 0;
- chain = &tmp_table.head;
- do {
- st_data_t key = packed_bins[i].key;
- st_data_t val = packed_bins[i].val;
- st_index_t hash = packed_bins[i].hash;
- entry = new_entry(&tmp_table, key, val, hash,
- hash % ST_DEFAULT_INIT_TABLE_SIZE);
- *chain = entry;
- entry->back = preventry;
- preventry = entry;
- chain = &entry->fore;
- } while (++i < MAX_PACKED_HASH);
- *chain = NULL;
- tmp_table.tail = entry;
- *table = tmp_table;
-}
-
-static void
-add_packed_direct(st_table *table, st_data_t key, st_data_t value, st_index_t hash_val)
-{
- if (table->real_entries < MAX_PACKED_HASH) {
- st_index_t i = table->real_entries++;
- PKEY_SET(table, i, key);
- PVAL_SET(table, i, value);
- PHASH_SET(table, i, hash_val);
- table->num_entries++;
- }
- else {
- unpack_entries(table);
- add_direct(table, key, value, hash_val, hash_val % table->num_bins);
+ tmp_table.num_entries = 0;
+ memset(tmp_table.bins, 0, sizeof(struct st_table_entry *) * tmp_table.num_bins);
+ for (i = 0; i < table->num_entries; i++) {
+ st_insert(&tmp_table, (st_data_t)packed_bins[i*2], (st_data_t)packed_bins[i*2+1]);
}
+ *table = tmp_table;
}
-
int
st_insert(register st_table *table, register st_data_t key, st_data_t value)
{
- st_index_t hash_val;
- register st_index_t bin_pos;
+ st_index_t hash_val, bin_pos;
register st_table_entry *ptr;
- hash_val = do_hash(key, table);
-
if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, key);
- if (i < table->real_entries) {
- PVAL_SET(table, i, value);
- return 1;
+ st_index_t i;
+ for (i = 0; i < table->num_entries; i++) {
+ if ((st_data_t)table->bins[i*2] == key) {
+ table->bins[i*2+1] = (struct st_table_entry*)value;
+ return 1;
+ }
+ }
+ if (MORE_PACKABLE_P(table)) {
+ i = table->num_entries++;
+ table->bins[i*2] = (struct st_table_entry*)key;
+ table->bins[i*2+1] = (struct st_table_entry*)value;
+ return 0;
+ }
+ else {
+ unpack_entries(table);
}
- add_packed_direct(table, key, value, hash_val);
- return 0;
}
+ hash_val = do_hash(key, table);
FIND_ENTRY(table, ptr, hash_val, bin_pos);
if (ptr == 0) {
- add_direct(table, key, value, hash_val, bin_pos);
+ ADD_DIRECT(table, key, value, hash_val, bin_pos);
return 0;
}
else {
@@ -595,28 +473,34 @@ int
st_insert2(register st_table *table, register st_data_t key, st_data_t value,
st_data_t (*func)(st_data_t))
{
- st_index_t hash_val;
- register st_index_t bin_pos;
+ st_index_t hash_val, bin_pos;
register st_table_entry *ptr;
- hash_val = do_hash(key, table);
-
if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, key);
- if (i < table->real_entries) {
- PVAL_SET(table, i, value);
- return 1;
- }
- key = (*func)(key);
- add_packed_direct(table, key, value, hash_val);
- return 0;
+ st_index_t i;
+ for (i = 0; i < table->num_entries; i++) {
+ if ((st_data_t)table->bins[i*2] == key) {
+ table->bins[i*2+1] = (struct st_table_entry*)value;
+ return 1;
+ }
+ }
+ if (MORE_PACKABLE_P(table)) {
+ i = table->num_entries++;
+ table->bins[i*2] = (struct st_table_entry*)key;
+ table->bins[i*2+1] = (struct st_table_entry*)value;
+ return 0;
+ }
+ else {
+ unpack_entries(table);
+ }
}
+ hash_val = do_hash(key, table);
FIND_ENTRY(table, ptr, hash_val, bin_pos);
if (ptr == 0) {
key = (*func)(key);
- add_direct(table, key, value, hash_val, bin_pos);
+ ADD_DIRECT(table, key, value, hash_val, bin_pos);
return 0;
}
else {
@@ -628,25 +512,36 @@ st_insert2(register st_table *table, register st_data_t key, st_data_t value,
void
st_add_direct(st_table *table, st_data_t key, st_data_t value)
{
- st_index_t hash_val;
+ st_index_t hash_val, bin_pos;
- hash_val = do_hash(key, table);
if (table->entries_packed) {
- add_packed_direct(table, key, value, hash_val);
- return;
+ int i;
+ if (MORE_PACKABLE_P(table)) {
+ i = table->num_entries++;
+ table->bins[i*2] = (struct st_table_entry*)key;
+ table->bins[i*2+1] = (struct st_table_entry*)value;
+ return;
+ }
+ else {
+ unpack_entries(table);
+ }
}
- add_direct(table, key, value, hash_val, hash_val % table->num_bins);
+ hash_val = do_hash(key, table);
+ bin_pos = hash_val % table->num_bins;
+ ADD_DIRECT(table, key, value, hash_val, bin_pos);
}
static void
rehash(register st_table *table)
{
register st_table_entry *ptr, **new_bins;
- st_index_t new_num_bins, hash_val;
+ st_index_t i, new_num_bins, hash_val;
new_num_bins = new_size(table->num_bins+1);
- new_bins = st_realloc_bins(table->bins, new_num_bins, table->num_bins);
+ new_bins = (st_table_entry**)
+ xrealloc(table->bins, new_num_bins * sizeof(st_table_entry*));
+ for (i = 0; i < new_num_bins; ++i) new_bins[i] = 0;
table->num_bins = new_num_bins;
table->bins = new_bins;
@@ -663,33 +558,34 @@ st_table*
st_copy(st_table *old_table)
{
st_table *new_table;
- st_table_entry *ptr, *entry, *prev, **tailp;
+ st_table_entry *ptr, *entry, *prev, **tail;
st_index_t num_bins = old_table->num_bins;
st_index_t hash_val;
- new_table = st_alloc_table();
+ new_table = alloc(st_table);
if (new_table == 0) {
return 0;
}
*new_table = *old_table;
- new_table->bins = st_alloc_bins(num_bins);
+ new_table->bins = (st_table_entry**)
+ Calloc((unsigned)num_bins, sizeof(st_table_entry*));
if (new_table->bins == 0) {
- st_dealloc_table(new_table);
+ free(new_table);
return 0;
}
if (old_table->entries_packed) {
- MEMCPY(new_table->bins, old_table->bins, st_table_entry*, old_table->num_bins);
+ memcpy(new_table->bins, old_table->bins, sizeof(struct st_table_entry *) * old_table->num_bins);
return new_table;
}
if ((ptr = old_table->head) != 0) {
prev = 0;
- tailp = &new_table->head;
+ tail = &new_table->head;
do {
- entry = st_alloc_entry();
+ entry = alloc(st_table_entry);
if (entry == 0) {
st_free_table(new_table);
return 0;
@@ -699,8 +595,8 @@ st_copy(st_table *old_table)
entry->next = new_table->bins[hash_val];
new_table->bins[hash_val] = entry;
entry->back = prev;
- *tailp = prev = entry;
- tailp = &entry->fore;
+ *tail = prev = entry;
+ tail = &entry->fore;
} while ((ptr = ptr->fore) != 0);
new_table->tail = prev;
}
@@ -708,22 +604,21 @@ st_copy(st_table *old_table)
return new_table;
}
-static inline void
-remove_entry(st_table *table, st_table_entry *ptr)
-{
- if (ptr->fore == 0 && ptr->back == 0) {
- table->head = 0;
- table->tail = 0;
- }
- else {
- st_table_entry *fore = ptr->fore, *back = ptr->back;
- if (fore) fore->back = back;
- if (back) back->fore = fore;
- if (ptr == table->head) table->head = fore;
- if (ptr == table->tail) table->tail = back;
- }
- table->num_entries--;
-}
+#define REMOVE_ENTRY(table, ptr) do \
+ { \
+ if (ptr->fore == 0 && ptr->back == 0) { \
+ table->head = 0; \
+ table->tail = 0; \
+ } \
+ else { \
+ st_table_entry *fore = ptr->fore, *back = ptr->back; \
+ if (fore) fore->back = back; \
+ if (back) back->fore = fore; \
+ if (ptr == table->head) table->head = fore; \
+ if (ptr == table->tail) table->tail = back; \
+ } \
+ table->num_entries--; \
+ } while (0)
int
st_delete(register st_table *table, register st_data_t *key, st_data_t *value)
@@ -732,28 +627,30 @@ st_delete(register st_table *table, register st_data_t *key, st_data_t *value)
st_table_entry **prev;
register st_table_entry *ptr;
- hash_val = do_hash(*key, table);
-
if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, *key);
- if (i < table->real_entries) {
- if (value != 0) *value = PVAL(table, i);
- *key = PKEY(table, i);
- remove_packed_entry(table, i);
- return 1;
+ st_index_t i;
+ for (i = 0; i < table->num_entries; i++) {
+ if ((st_data_t)table->bins[i*2] == *key) {
+ if (value != 0) *value = (st_data_t)table->bins[i*2+1];
+ table->num_entries--;
+ memmove(&table->bins[i*2], &table->bins[(i+1)*2],
+ sizeof(struct st_table_entry*) * 2*(table->num_entries-i));
+ return 1;
+ }
}
if (value != 0) *value = 0;
return 0;
}
- prev = &table->bins[hash_val % table->num_bins];
- for (;(ptr = *prev) != 0; prev = &ptr->next) {
+ hash_val = do_hash_bin(*key, table);
+
+ for (prev = &table->bins[hash_val]; (ptr = *prev) != 0; prev = &ptr->next) {
if (EQUAL(table, *key, ptr->key)) {
*prev = ptr->next;
- remove_entry(table, ptr);
+ REMOVE_ENTRY(table, ptr);
if (value != 0) *value = ptr->record;
*key = ptr->key;
- st_free_entry(ptr);
+ free(ptr);
return 1;
}
}
@@ -768,25 +665,25 @@ st_delete_safe(register st_table *table, register st_data_t *key, st_data_t *val
st_index_t hash_val;
register st_table_entry *ptr;
- hash_val = do_hash(*key, table);
-
if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, *key);
- if (i < table->real_entries) {
- if (value != 0) *value = PVAL(table, i);
- *key = PKEY(table, i);
- remove_safe_packed_entry(table, i, never);
- return 1;
+ st_index_t i;
+ for (i = 0; i < table->num_entries; i++) {
+ if ((st_data_t)table->bins[i*2] == *key) {
+ if (value != 0) *value = (st_data_t)table->bins[i*2+1];
+ table->bins[i*2] = (void *)never;
+ return 1;
+ }
}
if (value != 0) *value = 0;
return 0;
}
- ptr = table->bins[hash_val % table->num_bins];
+ hash_val = do_hash_bin(*key, table);
+ ptr = table->bins[hash_val];
for (; ptr != 0; ptr = ptr->next) {
if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) {
- remove_entry(table, ptr);
+ REMOVE_ENTRY(table, ptr);
*key = ptr->key;
if (value != 0) *value = ptr->record;
ptr->key = ptr->record = never;
@@ -806,16 +703,15 @@ st_cleanup_safe(st_table *table, st_data_t never)
if (table->entries_packed) {
st_index_t i = 0, j = 0;
- while (PKEY(table, i) != never) {
- if (i++ == table->real_entries) return;
+ while ((st_data_t)table->bins[i*2] != never) {
+ if (i++ == table->num_entries) return;
}
- for (j = i; ++i < table->real_entries;) {
- if (PKEY(table, i) == never) continue;
- PACKED_ENT(table, j) = PACKED_ENT(table, i);
+ for (j = i; ++i < table->num_entries;) {
+ if ((st_data_t)table->bins[i*2] == never) continue;
+ table->bins[j*2] = table->bins[i*2];
+ table->bins[j*2+1] = table->bins[i*2+1];
j++;
}
- table->real_entries = j;
- /* table->num_entries really should be equal j at this moment, but let set it anyway */
table->num_entries = j;
return;
}
@@ -826,7 +722,7 @@ st_cleanup_safe(st_table *table, st_data_t never)
if (ptr->key == never) {
tmp = ptr;
*last = ptr = ptr->next;
- st_free_entry(tmp);
+ free(tmp);
}
else {
ptr = *(last = &ptr->next);
@@ -836,142 +732,54 @@ st_cleanup_safe(st_table *table, st_data_t never)
}
int
-st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg)
-{
- st_index_t hash_val, bin_pos;
- register st_table_entry *ptr, **last, *tmp;
- st_data_t value = 0;
- int retval, existing = 0;
-
- hash_val = do_hash(key, table);
-
- if (table->entries_packed) {
- st_index_t i = find_packed_index(table, hash_val, key);
- if (i < table->real_entries) {
- key = PKEY(table, i);
- value = PVAL(table, i);
- existing = 1;
- }
- {
- retval = (*func)(&key, &value, arg, existing);
- if (!table->entries_packed) {
- FIND_ENTRY(table, ptr, hash_val, bin_pos);
- goto unpacked;
- }
- switch (retval) {
- case ST_CONTINUE:
- if (!existing) {
- add_packed_direct(table, key, value, hash_val);
- break;
- }
- PVAL_SET(table, i, value);
- break;
- case ST_DELETE:
- if (!existing) break;
- remove_packed_entry(table, i);
- }
- }
- return existing;
- }
-
- FIND_ENTRY(table, ptr, hash_val, bin_pos);
-
- if (ptr != 0) {
- key = ptr->key;
- value = ptr->record;
- existing = 1;
- }
- {
- retval = (*func)(&key, &value, arg, existing);
- unpacked:
- switch (retval) {
- case ST_CONTINUE:
- if (!existing) {
- add_direct(table, key, value, hash_val, hash_val % table->num_bins);
- break;
- }
- ptr->record = value;
- break;
- case ST_DELETE:
- if (!existing) break;
- last = &table->bins[bin_pos];
- for (; (tmp = *last) != 0; last = &tmp->next) {
- if (ptr == tmp) {
- tmp = ptr->fore;
- *last = ptr->next;
- remove_entry(table, ptr);
- st_free_entry(ptr);
- break;
- }
- }
- break;
- }
- return existing;
- }
-}
-
-int
-st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t never)
+st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
{
st_table_entry *ptr, **last, *tmp;
enum st_retval retval;
st_index_t i;
if (table->entries_packed) {
- for (i = 0; i < table->real_entries; i++) {
- st_data_t key, val;
- st_index_t hash;
- key = PKEY(table, i);
- val = PVAL(table, i);
- hash = PHASH(table, i);
- if (key == never) continue;
- retval = (*func)(key, val, arg);
- if (!table->entries_packed) {
- FIND_ENTRY(table, ptr, hash, i);
- if (retval == ST_CHECK) {
- if (!ptr) goto deleted;
- goto unpacked_continue;
- }
- goto unpacked;
- }
- switch (retval) {
+ for (i = 0; i < table->num_entries; i++) {
+ st_index_t j;
+ st_data_t key, val;
+ key = (st_data_t)table->bins[i*2];
+ val = (st_data_t)table->bins[i*2+1];
+ retval = (*func)(key, val, arg);
+ switch (retval) {
case ST_CHECK: /* check if hash is modified during iteration */
- if (PHASH(table, i) == 0 && PKEY(table, i) == never) {
- break;
- }
- i = find_packed_index_from(table, hash, key, i);
- if (i >= table->real_entries) {
- i = find_packed_index(table, hash, key);
- if (i >= table->real_entries) goto deleted;
- }
+ for (j = 0; j < table->num_entries; j++) {
+ if ((st_data_t)table->bins[j*2] == key)
+ break;
+ }
+ if (j == table->num_entries) {
+ /* call func with error notice */
+ retval = (*func)(0, 0, arg, 1);
+ return 1;
+ }
/* fall through */
case ST_CONTINUE:
break;
case ST_STOP:
return 0;
case ST_DELETE:
- remove_safe_packed_entry(table, i, never);
- break;
- }
- }
- return 0;
- }
- else {
- ptr = table->head;
+ table->num_entries--;
+ memmove(&table->bins[i*2], &table->bins[(i+1)*2],
+ sizeof(struct st_table_entry*) * 2*(table->num_entries-i));
+ i--;
+ break;
+ }
+ }
+ return 0;
}
- if (ptr != 0) {
+ if ((ptr = table->head) != 0) {
do {
- if (ptr->key == never)
- goto unpacked_continue;
i = ptr->hash % table->num_bins;
retval = (*func)(ptr->key, ptr->record, arg);
- unpacked:
switch (retval) {
case ST_CHECK: /* check if hash is modified during iteration */
for (tmp = table->bins[i]; tmp != ptr; tmp = tmp->next) {
if (!tmp) {
- deleted:
/* call func with error notice */
retval = (*func)(0, 0, arg, 1);
return 1;
@@ -979,76 +787,8 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
}
/* fall through */
case ST_CONTINUE:
- unpacked_continue:
- ptr = ptr->fore;
- break;
- case ST_STOP:
- return 0;
- case ST_DELETE:
- last = &table->bins[ptr->hash % table->num_bins];
- for (; (tmp = *last) != 0; last = &tmp->next) {
- if (ptr == tmp) {
- tmp = ptr->fore;
- remove_entry(table, ptr);
- ptr->key = ptr->record = never;
- ptr->hash = 0;
- ptr = tmp;
- break;
- }
- }
- }
- } while (ptr && table->head);
- }
- return 0;
-}
-
-int
-st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
-{
- st_table_entry *ptr, **last, *tmp;
- enum st_retval retval;
- st_index_t i;
-
- if (table->entries_packed) {
- for (i = 0; i < table->real_entries; i++) {
- st_data_t key, val, hash;
- key = PKEY(table, i);
- val = PVAL(table, i);
- hash = PHASH(table, i);
- retval = (*func)(key, val, arg);
- if (!table->entries_packed) {
- FIND_ENTRY(table, ptr, hash, i);
- if (!ptr) return 0;
- goto unpacked;
- }
- switch (retval) {
- case ST_CONTINUE:
- break;
- case ST_CHECK:
- case ST_STOP:
- return 0;
- case ST_DELETE:
- remove_packed_entry(table, i);
- i--;
- break;
- }
- }
- return 0;
- }
- else {
- ptr = table->head;
- }
-
- if (ptr != 0) {
- do {
- i = ptr->hash % table->num_bins;
- retval = (*func)(ptr->key, ptr->record, arg);
- unpacked:
- switch (retval) {
- case ST_CONTINUE:
ptr = ptr->fore;
break;
- case ST_CHECK:
case ST_STOP:
return 0;
case ST_DELETE:
@@ -1057,8 +797,9 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
if (ptr == tmp) {
tmp = ptr->fore;
*last = ptr->next;
- remove_entry(table, ptr);
- st_free_entry(ptr);
+ REMOVE_ENTRY(table, ptr);
+ free(ptr);
+ if (ptr == tmp) return 0;
ptr = tmp;
break;
}
@@ -1081,13 +822,13 @@ st_reverse_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
for (i = table->num_entries-1; 0 <= i; i--) {
int j;
st_data_t key, val;
- key = PKEY(table, i);
- val = PVAL(table, i);
+ key = (st_data_t)table->bins[i*2];
+ val = (st_data_t)table->bins[i*2+1];
retval = (*func)(key, val, arg);
switch (retval) {
case ST_CHECK: /* check if hash is modified during iteration */
for (j = 0; j < table->num_entries; j++) {
- if (PKEY(table, j) == key)
+ if ((st_data_t)table->bins[j*2] == key)
break;
}
if (j == table->num_entries) {
@@ -1101,7 +842,9 @@ st_reverse_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
case ST_STOP:
return 0;
case ST_DELETE:
- remove_packed_entry(table, i);
+ table->num_entries--;
+ memmove(&table->bins[i*2], &table->bins[(i+1)*2],
+ sizeof(struct st_table_entry*) * 2*(table->num_entries-i));
break;
}
}
@@ -1134,8 +877,8 @@ st_reverse_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
if (ptr == tmp) {
tmp = ptr->back;
*last = ptr->next;
- remove_entry(table, ptr);
- st_free_entry(ptr);
+ REMOVE_ENTRY(table, ptr);
+ free(ptr);
ptr = tmp;
break;
}
@@ -1247,9 +990,7 @@ strhash(st_data_t arg)
#else
#ifndef UNALIGNED_WORD_ACCESS
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
- defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD86) || \
- defined(__mc68020__)
+# if defined __i386__ || defined _M_IX86
# define UNALIGNED_WORD_ACCESS 1
# endif
#endif
@@ -1262,15 +1003,13 @@ strhash(st_data_t arg)
#define MURMUR 2
#endif
-#define MurmurMagic_1 (st_index_t)0xc6a4a793
-#define MurmurMagic_2 (st_index_t)0x5bd1e995
#if MURMUR == 1
-#define MurmurMagic MurmurMagic_1
+#define MurmurMagic 0xc6a4a793
#elif MURMUR == 2
#if SIZEOF_ST_INDEX_T > 4
-#define MurmurMagic ((MurmurMagic_1 << 32) | MurmurMagic_2)
+#define MurmurMagic 0xc6a4a7935bd1e995
#else
-#define MurmurMagic MurmurMagic_2
+#define MurmurMagic 0x5bd1e995
#endif
#endif
@@ -1307,12 +1046,12 @@ murmur_finish(st_index_t h)
return h;
}
-#define murmur_step(h, k) murmur((h), (k), 16)
+#define murmur_step(h, k) murmur(h, k, 16)
#if MURMUR == 1
-#define murmur1(h) murmur_step((h), 16)
+#define murmur1(h) murmur_step(h, 16)
#else
-#define murmur1(h) murmur_step((h), 24)
+#define murmur1(h) murmur_step(h, 24)
#endif
st_index_t
@@ -1323,7 +1062,7 @@ st_hash(const void *ptr, size_t len, st_index_t h)
h += 0xdeadbeef;
-#define data_at(n) (st_index_t)((unsigned char)data[(n)])
+#define data_at(n) (st_index_t)((unsigned char)data[n])
#define UNALIGNED_ADD_4 UNALIGNED_ADD(2); UNALIGNED_ADD(1); UNALIGNED_ADD(0)
#if SIZEOF_ST_INDEX_T > 4
#define UNALIGNED_ADD_8 UNALIGNED_ADD(6); UNALIGNED_ADD(5); UNALIGNED_ADD(4); UNALIGNED_ADD(3); UNALIGNED_ADD_4
diff --git a/strftime.c b/strftime.c
index b05653ffd5..3c32d09d99 100644
--- a/strftime.c
+++ b/strftime.c
@@ -48,7 +48,6 @@
*/
#include "ruby/ruby.h"
-#include "ruby/encoding.h"
#include "timev.h"
#ifndef GAWK
@@ -74,6 +73,9 @@
#define VMS_EXT 1 /* include %v for VMS date format */
#define MAILHEADER_EXT 1 /* add %z for HHMM format */
#define ISO_DATE_EXT 1 /* %G and %g for year of ISO week */
+#ifndef GAWK
+#define POSIX_SEMANTICS 1 /* call tzset() if TZ changes */
+#endif
#if defined(ISO_DATE_EXT)
#if ! defined(POSIX2_DATE)
@@ -121,14 +123,39 @@ extern char *getenv();
extern char *strchr();
#endif
-#define range(low, item, hi) max((low), min((item), (hi)))
+#define range(low, item, hi) max(low, min(item, hi))
+
+#if defined __WIN32__ || defined _WIN32
+#define DLL_IMPORT __declspec(dllimport)
+#endif
+#ifndef DLL_IMPORT
+#define DLL_IMPORT
+#endif
+#if !defined(OS2) && defined(HAVE_TZNAME)
+extern DLL_IMPORT char *tzname[2];
+#ifdef HAVE_DAYLIGHT
+extern DLL_IMPORT int daylight;
+#endif
+#ifdef HAVE_VAR_TIMEZONE
+extern DLL_IMPORT TYPEOF_VAR_TIMEZONE timezone;
+#endif
+#ifdef HAVE_VAR_ALTZONE
+extern DLL_IMPORT TYPEOF_VAR_ALTZONE altzone;
+#endif
+#endif
#undef min /* just in case */
/* min --- return minimum of two numbers */
+#ifndef __STDC__
+static inline int
+min(a, b)
+int a, b;
+#else
static inline int
min(int a, int b)
+#endif
{
return (a < b ? a : b);
}
@@ -137,8 +164,14 @@ min(int a, int b)
/* max --- return maximum of two numbers */
+#ifndef __STDC__
+static inline int
+max(a, b)
+int a, b;
+#else
static inline int
max(int a, int b)
+#endif
{
return (a > b ? a : b);
}
@@ -156,30 +189,36 @@ max(int a, int b)
/* strftime --- produce formatted time */
-/*
- * enc is the encoding of the format. It is used as the encoding of resulted
- * string, but the name of the month and weekday are always US-ASCII. So it
- * is only used for the timezone name on Windows.
- */
static size_t
-rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encoding *enc, const struct vtm *vtm, VALUE timev, struct timespec *ts, int gmt)
+rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const struct vtm *vtm, VALUE timev, struct timespec *ts, int gmt)
{
- const char *const endp = s + maxsize;
- const char *const start = s;
+ char *endp = s + maxsize;
+ char *start = s;
const char *sp, *tp;
-#define TBUFSIZE 100
- auto char tbuf[TBUFSIZE];
+ auto char tbuf[100];
long off;
ptrdiff_t i;
int w;
long y;
- int precision, flags, colons;
+ static short first = 1;
+#ifdef POSIX_SEMANTICS
+ static char *savetz = NULL;
+ static size_t savetzlen = 0;
+ char *tz;
+#endif /* POSIX_SEMANTICS */
+#ifndef HAVE_TM_ZONE
+#ifndef HAVE_TM_NAME
+#if ((defined(MAILHEADER_EXT) && !HAVE_VAR_TIMEZONE && HAVE_GETTIMEOFDAY) || \
+ (!HAVE_TZNAME && HAVE_TIMEZONE))
+ struct timeval tv;
+ struct timezone zone;
+#endif
+#endif /* HAVE_TM_NAME */
+#endif /* HAVE_TM_ZONE */
+ int precision, flags;
char padding;
- enum {LEFT, CHCASE, LOWER, UPPER};
+ enum {LEFT, CHCASE, LOWER, UPPER, LOCALE_O, LOCALE_E};
#define BIT_OF(n) (1U<<(n))
-#ifdef MAILHEADER_EXT
- int sign;
-#endif
/* various tables, useful in North America */
static const char days_l[][10] = {
@@ -203,22 +242,52 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
return 0;
}
- if (enc && (enc == rb_usascii_encoding() ||
- enc == rb_ascii8bit_encoding() || enc == rb_locale_encoding())) {
- enc = NULL;
+#ifndef POSIX_SEMANTICS
+ if (first) {
+ tzset();
+ first = 0;
}
+#else /* POSIX_SEMANTICS */
+ tz = getenv("TZ");
+ if (first) {
+ if (tz != NULL) {
+ size_t tzlen = strlen(tz);
+
+ savetz = (char *) malloc(tzlen + 1);
+ if (savetz != NULL) {
+ savetzlen = tzlen + 1;
+ memcpy(savetz, tz, savetzlen);
+ }
+ }
+ tzset();
+ first = 0;
+ }
+ /* if we have a saved TZ, and it is different, recapture and reset */
+ if (tz && savetz && (tz[0] != savetz[0] || strcmp(tz, savetz) != 0)) {
+ size_t i = strlen(tz) + 1;
+ if (i > savetzlen) {
+ savetz = (char *) realloc(savetz, i);
+ if (savetz) {
+ savetzlen = i;
+ memcpy(savetz, tz, i);
+ }
+ } else
+ memcpy(savetz, tz, i);
+ tzset();
+ }
+#endif /* POSIX_SEMANTICS */
for (; *format && s < endp - 1; format++) {
#define FLAG_FOUND() do { \
- if (precision > 0) \
+ if (precision > 0 || flags & (BIT_OF(LOCALE_E)|BIT_OF(LOCALE_O))) \
goto unknown; \
} while (0)
-#define NEEDS(n) do if (s >= endp || (n) >= endp - s - 1) goto err; while (0)
+#define NEEDS(n) do if (s + (n) >= endp - 1) goto err; while (0)
#define FILL_PADDING(i) do { \
- if (!(flags & BIT_OF(LEFT)) && precision > (i)) { \
+ if (!(flags & BIT_OF(LEFT)) && precision > i) { \
NEEDS(precision); \
- memset(s, padding ? padding : ' ', precision - (i)); \
- s += precision - (i); \
+ memset(s, padding ? padding : ' ', precision - i); \
+ s += precision - i; \
} \
else { \
NEEDS(i); \
@@ -230,14 +299,14 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
if (precision <= 0) precision = (def_prec); \
if (flags & BIT_OF(LEFT)) precision = 1; \
l = snprintf(s, endp - s, \
- ((padding == '0' || (!padding && (def_pad) == '0')) ? "%0*"fmt : "%*"fmt), \
- precision, (val)); \
+ ((padding == '0' || (!padding && def_pad == '0')) ? "%0*"fmt : "%*"fmt), \
+ precision, val); \
if (l < 0) goto err; \
s += l; \
} while (0)
#define STRFTIME(fmt) \
do { \
- i = rb_strftime_with_timespec(s, endp - s, (fmt), enc, vtm, timev, ts, gmt); \
+ i = rb_strftime_with_timespec(s, endp - s, fmt, vtm, timev, ts, gmt); \
if (!i) return 0; \
if (precision > i) {\
NEEDS(precision); \
@@ -259,8 +328,8 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
if (precision <= 0) precision = (def_prec); \
if (flags & BIT_OF(LEFT)) precision = 1; \
args[0] = INT2FIX(precision); \
- args[1] = (val); \
- if (padding == '0' || (!padding && (def_pad) == '0')) \
+ args[1] = val; \
+ if (padding == '0' || (!padding && def_pad == '0')) \
result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \
else \
result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \
@@ -280,7 +349,6 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
precision = -1;
flags = 0;
padding = 0;
- colons = 0;
again:
switch (*++format) {
case '\0':
@@ -438,87 +506,89 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
case 'Y': /* year with century */
if (FIXNUM_P(vtm->year)) {
- long y = FIX2LONG(vtm->year);
- FMT('0', 0 <= y ? 4 : 5, "ld", y);
+ long y = FIX2LONG(vtm->year);
+ FMT('0', 0 <= y ? 4 : 5, "ld", y);
}
else {
- FMTV('0', 4, "d", vtm->year);
+ FMTV('0', 4, "d", vtm->year);
}
continue;
#ifdef MAILHEADER_EXT
+ /*
+ * From: Chip Rosenthal <chip@chinacat.unicom.com>
+ * Date: Sun, 19 Mar 1995 00:33:29 -0600 (CST)
+ *
+ * Warning: the %z [code] is implemented by inspecting the
+ * timezone name conditional compile settings, and
+ * inferring a method to get timezone offsets. I've tried
+ * this code on a couple of machines, but I don't doubt
+ * there is some system out there that won't like it.
+ * Maybe the easiest thing to do would be to bracket this
+ * with an #ifdef that can turn it off. The %z feature
+ * would be an admittedly obscure one that most folks can
+ * live without, but it would be a great help to those of
+ * us that muck around with various message processors.
+ */
case 'z': /* time zone offset east of GMT e.g. -0600 */
+ if (precision < 4) precision = 4;
+ NEEDS(precision + 1);
if (gmt) {
off = 0;
}
else {
- off = NUM2LONG(rb_funcall(vtm->utc_offset, rb_intern("round"), 0));
+ off = NUM2LONG(rb_funcall(quo(vtm->utc_offset, INT2FIX(60)), rb_intern("round"), 0));
+#if 0
+#ifdef HAVE_TM_NAME
+ /*
+ * Systems with tm_name probably have tm_tzadj as
+ * secs west of GMT. Convert to mins east of GMT.
+ */
+ off = -timeptr->tm_tzadj / 60;
+#else /* !HAVE_TM_NAME */
+#ifdef HAVE_TM_ZONE
+ /*
+ * Systems with tm_zone probably have tm_gmtoff as
+ * secs east of GMT. Convert to mins east of GMT.
+ */
+ off = timeptr->tm_gmtoff / 60;
+#else /* !HAVE_TM_ZONE */
+#if HAVE_VAR_TIMEZONE
+#if HAVE_VAR_ALTZONE
+ off = -(daylight ? timezone : altzone) / 60;
+#else
+ off = -timezone / 60;
+#endif
+#else /* !HAVE_VAR_TIMEZONE */
+#ifdef HAVE_GETTIMEOFDAY
+ gettimeofday(&tv, &zone);
+ off = -zone.tz_minuteswest;
+#else
+ /* no timezone info, then calc by myself */
+ {
+ struct tm utc;
+ time_t now;
+ time(&now);
+ utc = *gmtime(&now);
+ off = (long)((now - mktime(&utc)) / 60);
+ }
+#endif
+#endif /* !HAVE_VAR_TIMEZONE */
+#endif /* !HAVE_TM_ZONE */
+#endif /* !HAVE_TM_NAME */
+#endif /* 0 */
}
if (off < 0) {
off = -off;
- sign = -1;
+ *s++ = '-';
} else {
- sign = +1;
+ *s++ = '+';
}
- switch (colons) {
- case 0: /* %z -> +hhmm */
- precision = precision <= 5 ? 2 : precision-3;
- NEEDS(precision + 3);
- break;
-
- case 1: /* %:z -> +hh:mm */
- precision = precision <= 6 ? 2 : precision-4;
- NEEDS(precision + 4);
- break;
-
- case 2: /* %::z -> +hh:mm:ss */
- precision = precision <= 9 ? 2 : precision-7;
- NEEDS(precision + 7);
- break;
-
- case 3: /* %:::z -> +hh[:mm[:ss]] */
- if (off % 3600 == 0) {
- precision = precision <= 3 ? 2 : precision-1;
- NEEDS(precision + 3);
- }
- else if (off % 60 == 0) {
- precision = precision <= 6 ? 2 : precision-4;
- NEEDS(precision + 4);
- }
- else {
- precision = precision <= 9 ? 2 : precision-7;
- NEEDS(precision + 9);
- }
- break;
-
- default:
- format--;
- goto unknown;
- }
- i = snprintf(s, endp - s, (padding == ' ' ? "%+*ld" : "%+.*ld"),
- precision + 1, sign * (off / 3600));
+ off = off/60*100 + off%60;
+ i = snprintf(s, endp - s, (padding == ' ' ? "%*ld" : "%.*ld"),
+ precision - (precision > 4), off);
if (i < 0) goto err;
- if (sign < 0 && off < 3600) {
- *(padding == ' ' ? s + i - 2 : s) = '-';
- }
s += i;
- off = off % 3600;
- if (colons == 3 && off == 0)
- continue;
- if (1 <= colons)
- *s++ = ':';
- i = snprintf(s, endp - s, "%02d", (int)(off / 60));
- if (i < 0) goto err;
- s += i;
- off = off % 60;
- if (colons == 3 && off == 0)
- continue;
- if (2 <= colons) {
- *s++ = ':';
- i = snprintf(s, endp - s, "%02d", (int)off);
- if (i < 0) goto err;
- s += i;
- }
continue;
#endif /* MAILHEADER_EXT */
@@ -532,24 +602,34 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
tp = "UTC";
break;
}
- if (vtm->zone == NULL) {
- i = 0;
- }
- else {
+#if 0
+#ifdef HAVE_TZNAME
+ i = (daylight && timeptr->tm_isdst > 0); /* 0 or 1 */
+ tp = tzname[i];
+#else
+#ifdef HAVE_TM_ZONE
+ tp = timeptr->tm_zone;
+#else
+#ifdef HAVE_TM_NAME
+ tp = timeptr->tm_name;
+#else
+#ifdef HAVE_TIMEZONE
+ gettimeofday(& tv, & zone);
+#ifdef TIMEZONE_VOID
+ tp = timezone();
+#else
+ tp = timezone(zone.tz_minuteswest, timeptr->tm_isdst > 0);
+#endif /* TIMEZONE_VOID */
+#endif /* HAVE_TIMEZONE */
+#endif /* HAVE_TM_NAME */
+#endif /* HAVE_TM_ZONE */
+#endif /* HAVE_TZNAME */
+#endif /* 0 */
+ if (vtm->zone == NULL)
+ tp = "";
+ else
tp = vtm->zone;
- if (enc) {
- for (i = 0; i < TBUFSIZE && tp[i]; i++) {
- if ((unsigned char)tp[i] > 0x7F) {
- VALUE str = rb_str_conv_enc_opts(rb_str_new_cstr(tp), rb_locale_encoding(), enc, ECONV_UNDEF_REPLACE|ECONV_INVALID_REPLACE, Qnil);
- i = strlcpy(tbuf, RSTRING_PTR(str), TBUFSIZE);
- tp = tbuf;
- break;
- }
- }
- }
- else
- i = strlen(tp);
- }
+ i = strlen(tp);
break;
#ifdef SYSV_EXT
@@ -615,13 +695,11 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
case 'E':
/* POSIX locale extensions, ignored for now */
- if (!format[1] || !strchr("cCxXyY", format[1]))
- goto unknown;
+ flags |= BIT_OF(LOCALE_E);
goto again;
case 'O':
/* POSIX locale extensions, ignored for now */
- if (!format[1] || !strchr("deHkIlmMSuUVwWy", format[1]))
- goto unknown;
+ flags |= BIT_OF(LOCALE_O);
goto again;
case 'V': /* week of year according ISO 8601 */
@@ -655,13 +733,7 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
yv = sub(yv, INT2FIX(1));
if (*format == 'G') {
- if (FIXNUM_P(yv)) {
- const long y = FIX2LONG(yv);
- FMT('0', 0 <= y ? 4 : 5, "ld", y);
- }
- else {
- FMTV('0', 4, "d", yv);
- }
+ FMTV('0', 1, "d", yv);
}
else {
yv = mod(yv, INT2FIX(100));
@@ -727,15 +799,17 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
subsec = div(subsec, INT2FIX(1));
if (FIXNUM_P(subsec)) {
- (void)snprintf(s, endp - s, "%0*ld", precision, FIX2LONG(subsec));
+ int l;
+ l = snprintf(s, endp - s, "%0*ld", precision, FIX2LONG(subsec));
s += precision;
}
else {
VALUE args[2], result;
+ size_t l;
args[0] = INT2FIX(precision);
args[1] = subsec;
result = rb_str_format(2, args, rb_str_new2("%0*d"));
- (void)strlcpy(s, StringValueCStr(result), endp-s);
+ l = strlcpy(s, StringValueCStr(result), endp-s);
s += precision;
}
}
@@ -766,15 +840,6 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
padding = ' ';
goto again;
- case ':':
- {
- size_t l = strspn(format, ":");
- if (l > 3 || format[l] != 'z') goto unknown;
- colons = (int)l;
- format += l - 1;
- }
- goto again;
-
case '0':
padding = '0';
case '1': case '2': case '3': case '4':
@@ -793,7 +858,6 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
precision = -1;
flags = 0;
padding = 0;
- colons = 0;
break;
}
if (i) {
@@ -827,21 +891,27 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, rb_encodi
}
size_t
-rb_strftime(char *s, size_t maxsize, const char *format, rb_encoding *enc, const struct vtm *vtm, VALUE timev, int gmt)
+rb_strftime(char *s, size_t maxsize, const char *format, const struct vtm *vtm, VALUE timev, int gmt)
{
- return rb_strftime_with_timespec(s, maxsize, format, enc, vtm, timev, NULL, gmt);
+ return rb_strftime_with_timespec(s, maxsize, format, vtm, timev, NULL, gmt);
}
size_t
-rb_strftime_timespec(char *s, size_t maxsize, const char *format, rb_encoding *enc, const struct vtm *vtm, struct timespec *ts, int gmt)
+rb_strftime_timespec(char *s, size_t maxsize, const char *format, const struct vtm *vtm, struct timespec *ts, int gmt)
{
- return rb_strftime_with_timespec(s, maxsize, format, enc, vtm, Qnil, ts, gmt);
+ return rb_strftime_with_timespec(s, maxsize, format, vtm, Qnil, ts, gmt);
}
/* isleap --- is a year a leap year? */
+#ifndef __STDC__
+static int
+isleap(year)
+long year;
+#else
static int
isleap(long year)
+#endif
{
return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0);
}
@@ -875,8 +945,14 @@ vtm2tm_noyear(const struct vtm *vtm, struct tm *result)
#ifdef POSIX2_DATE
/* iso8601wknum --- compute week number according to ISO 8601 */
+#ifndef __STDC__
+static int
+iso8601wknum(timeptr)
+const struct tm *timeptr;
+#else
static int
iso8601wknum(const struct tm *timeptr)
+#endif
{
/*
* From 1003.2:
@@ -996,8 +1072,15 @@ iso8601wknum_v(const struct vtm *vtm)
/* With thanks and tip of the hatlo to ado@elsie.nci.nih.gov */
+#ifndef __STDC__
+static int
+weeknumber(timeptr, firstweekday)
+const struct tm *timeptr;
+int firstweekday;
+#else
static int
weeknumber(const struct tm *timeptr, int firstweekday)
+#endif
{
int wday = timeptr->tm_wday;
int ret;
@@ -1133,7 +1216,9 @@ static char *array[] =
/* main routine. */
int
-main(int argc, char **argv)
+main(argc, argv)
+int argc;
+char **argv;
{
long time();
diff --git a/string.c b/string.c
index c675331c74..3db3d6c4f6 100644
--- a/string.c
+++ b/string.c
@@ -14,13 +14,10 @@
#include "ruby/ruby.h"
#include "ruby/re.h"
#include "ruby/encoding.h"
-#include "vm_core.h"
-#include "internal.h"
-#include "probes.h"
#include <assert.h>
-#define BEG(no) (regs->beg[(no)])
-#define END(no) (regs->end[(no)])
+#define BEG(no) regs->beg[no]
+#define END(no) regs->end[no]
#include <math.h>
#include <ctype.h>
@@ -48,8 +45,6 @@
#undef rb_str_buf_cat2
#undef rb_str_cat2
-static VALUE rb_str_clear(VALUE str);
-
VALUE rb_cString;
VALUE rb_cSymbol;
@@ -58,21 +53,21 @@ VALUE rb_cSymbol;
#define STR_NOEMBED FL_USER1
#define STR_SHARED FL_USER2 /* = ELTS_SHARED */
#define STR_ASSOC FL_USER3
-#define STR_SHARED_P(s) FL_ALL((s), STR_NOEMBED|ELTS_SHARED)
-#define STR_ASSOC_P(s) FL_ALL((s), STR_NOEMBED|STR_ASSOC)
+#define STR_SHARED_P(s) FL_ALL(s, STR_NOEMBED|ELTS_SHARED)
+#define STR_ASSOC_P(s) FL_ALL(s, STR_NOEMBED|STR_ASSOC)
#define STR_NOCAPA (STR_NOEMBED|ELTS_SHARED|STR_ASSOC)
-#define STR_NOCAPA_P(s) (FL_TEST((s),STR_NOEMBED) && FL_ANY((s),ELTS_SHARED|STR_ASSOC))
+#define STR_NOCAPA_P(s) (FL_TEST(s,STR_NOEMBED) && FL_ANY(s,ELTS_SHARED|STR_ASSOC))
#define STR_UNSET_NOCAPA(s) do {\
- if (FL_TEST((s),STR_NOEMBED)) FL_UNSET((s),(ELTS_SHARED|STR_ASSOC));\
+ if (FL_TEST(s,STR_NOEMBED)) FL_UNSET(s,(ELTS_SHARED|STR_ASSOC));\
} while (0)
#define STR_SET_NOEMBED(str) do {\
- FL_SET((str), STR_NOEMBED);\
- STR_SET_EMBED_LEN((str), 0);\
+ FL_SET(str, STR_NOEMBED);\
+ STR_SET_EMBED_LEN(str, 0);\
} while (0)
-#define STR_SET_EMBED(str) FL_UNSET((str), STR_NOEMBED)
-#define STR_EMBED_P(str) (!FL_TEST((str), STR_NOEMBED))
+#define STR_SET_EMBED(str) FL_UNSET(str, STR_NOEMBED)
+#define STR_EMBED_P(str) (!FL_TEST(str, STR_NOEMBED))
#define STR_SET_EMBED_LEN(str, n) do { \
long tmp_n = (n);\
RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\
@@ -81,7 +76,7 @@ VALUE rb_cSymbol;
#define STR_SET_LEN(str, n) do { \
if (STR_EMBED_P(str)) {\
- STR_SET_EMBED_LEN((str), (n));\
+ STR_SET_EMBED_LEN(str, n);\
}\
else {\
RSTRING(str)->as.heap.len = (n);\
@@ -92,7 +87,7 @@ VALUE rb_cSymbol;
if (STR_EMBED_P(str)) {\
long n = RSTRING_LEN(str);\
n--;\
- STR_SET_EMBED_LEN((str), n);\
+ STR_SET_EMBED_LEN(str, n);\
}\
else {\
RSTRING(str)->as.heap.len--;\
@@ -102,7 +97,7 @@ VALUE rb_cSymbol;
#define RESIZE_CAPA(str,capacity) do {\
if (STR_EMBED_P(str)) {\
if ((capacity) > RSTRING_EMBED_LEN_MAX) {\
- char *tmp = ALLOC_N(char, (capacity)+1);\
+ char *tmp = ALLOC_N(char, capacity+1);\
memcpy(tmp, RSTRING_PTR(str), RSTRING_LEN(str));\
RSTRING(str)->as.heap.ptr = tmp;\
RSTRING(str)->as.heap.len = RSTRING_LEN(str);\
@@ -293,13 +288,6 @@ rb_enc_cr_str_copy_for_substr(VALUE dest, VALUE src)
* from src to new string "dest" which is made from the part of src.
*/
str_enc_copy(dest, src);
- if (RSTRING_LEN(dest) == 0) {
- if (!rb_enc_asciicompat(STR_ENC_GET(src)))
- ENC_CODERANGE_SET(dest, ENC_CODERANGE_VALID);
- else
- ENC_CODERANGE_SET(dest, ENC_CODERANGE_7BIT);
- return;
- }
switch (ENC_CODERANGE(src)) {
case ENC_CODERANGE_7BIT:
ENC_CODERANGE_SET(dest, ENC_CODERANGE_7BIT);
@@ -312,6 +300,12 @@ rb_enc_cr_str_copy_for_substr(VALUE dest, VALUE src)
ENC_CODERANGE_SET(dest, ENC_CODERANGE_7BIT);
break;
default:
+ if (RSTRING_LEN(dest) == 0) {
+ if (!rb_enc_asciicompat(STR_ENC_GET(src)))
+ ENC_CODERANGE_SET(dest, ENC_CODERANGE_VALID);
+ else
+ ENC_CODERANGE_SET(dest, ENC_CODERANGE_7BIT);
+ }
break;
}
}
@@ -356,6 +350,14 @@ str_mod_check(VALUE s, const char *p, long len)
}
}
+static inline void
+str_frozen_check(VALUE s)
+{
+ if (OBJ_FROZEN(s)) {
+ rb_raise(rb_eRuntimeError, "string frozen");
+ }
+}
+
size_t
rb_str_capacity(VALUE str)
{
@@ -373,7 +375,8 @@ rb_str_capacity(VALUE str)
static inline VALUE
str_alloc(VALUE klass)
{
- NEWOBJ_OF(str, struct RString, klass, T_STRING);
+ NEWOBJ(str, struct RString);
+ OBJSETUP(str, klass, T_STRING);
str->as.heap.ptr = 0;
str->as.heap.len = 0;
@@ -382,15 +385,6 @@ str_alloc(VALUE klass)
return (VALUE)str;
}
-static inline VALUE
-empty_str_alloc(VALUE klass)
-{
- if (RUBY_DTRACE_STRING_CREATE_ENABLED()) {
- RUBY_DTRACE_STRING_CREATE(0, rb_sourcefile(), rb_sourceline());
- }
- return str_alloc(klass);
-}
-
static VALUE
str_new(VALUE klass, const char *ptr, long len)
{
@@ -400,10 +394,6 @@ str_new(VALUE klass, const char *ptr, long len)
rb_raise(rb_eArgError, "negative string size (or size too big)");
}
- if (RUBY_DTRACE_STRING_CREATE_ENABLED()) {
- RUBY_DTRACE_STRING_CREATE(len, rb_sourcefile(), rb_sourceline());
- }
-
str = str_alloc(klass);
if (len > RSTRING_EMBED_LEN_MAX) {
RSTRING(str)->as.heap.aux.capa = len;
@@ -490,18 +480,14 @@ RUBY_ALIAS_FUNCTION(rb_tainted_str_new2(const char *ptr), rb_tainted_str_new_cst
VALUE
rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags, VALUE ecopts)
{
- extern VALUE rb_cEncodingConverter;
rb_econv_t *ec;
rb_econv_result_t ret;
- long len, olen;
- VALUE econv_wrapper;
+ long len;
VALUE newstr;
- const unsigned char *start, *sp;
- unsigned char *dest, *dp;
- size_t converted_output = 0;
+ const unsigned char *sp;
+ unsigned char *dp;
if (!to) return str;
- if (!from) from = rb_enc_get(str);
if (from == to) return str;
if ((rb_enc_asciicompat(to) && ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) ||
to == rb_ascii8bit_encoding()) {
@@ -514,39 +500,23 @@ rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags,
len = RSTRING_LEN(str);
newstr = rb_str_new(0, len);
- olen = len;
- econv_wrapper = rb_obj_alloc(rb_cEncodingConverter);
- RBASIC(econv_wrapper)->klass = 0;
+ retry:
ec = rb_econv_open_opts(from->name, to->name, ecflags, ecopts);
if (!ec) return str;
- DATA_PTR(econv_wrapper) = ec;
sp = (unsigned char*)RSTRING_PTR(str);
- start = sp;
- while ((dest = (unsigned char*)RSTRING_PTR(newstr)),
- (dp = dest + converted_output),
- (ret = rb_econv_convert(ec, &sp, start + len, &dp, dest + olen, 0)),
- ret == econv_destination_buffer_full) {
- /* destination buffer short */
- size_t converted_input = sp - start;
- size_t rest = len - converted_input;
- converted_output = dp - dest;
- rb_str_set_len(newstr, converted_output);
- if (converted_input && converted_output &&
- rest < (LONG_MAX / converted_output)) {
- rest = (rest * converted_output) / converted_input;
- }
- else {
- rest = olen;
- }
- olen += rest < 2 ? 2 : rest;
- rb_str_resize(newstr, olen);
- }
- DATA_PTR(econv_wrapper) = 0;
+ dp = (unsigned char*)RSTRING_PTR(newstr);
+ ret = rb_econv_convert(ec, &sp, (unsigned char*)RSTRING_END(str),
+ &dp, (unsigned char*)RSTRING_END(newstr), 0);
rb_econv_close(ec);
- rb_gc_force_recycle(econv_wrapper);
switch (ret) {
+ case econv_destination_buffer_full:
+ /* destination buffer short */
+ len = len < 2 ? 2 : len * 2;
+ rb_str_resize(newstr, len);
+ goto retry;
+
case econv_finished:
len = dp - (unsigned char*)RSTRING_PTR(newstr);
rb_str_set_len(newstr, len);
@@ -635,7 +605,7 @@ rb_str_export_to_enc(VALUE str, rb_encoding *enc)
}
static VALUE
-str_replace_shared_without_enc(VALUE str2, VALUE str)
+str_replace_shared(VALUE str2, VALUE str)
{
if (RSTRING_LEN(str) <= RSTRING_EMBED_LEN_MAX) {
STR_SET_EMBED(str2);
@@ -650,14 +620,8 @@ str_replace_shared_without_enc(VALUE str2, VALUE str)
RSTRING(str2)->as.heap.aux.shared = str;
FL_SET(str2, ELTS_SHARED);
}
- return str2;
-}
-
-static VALUE
-str_replace_shared(VALUE str2, VALUE str)
-{
- str_replace_shared_without_enc(str2, str);
rb_enc_cr_str_exact_copy(str2, str);
+
return str2;
}
@@ -721,7 +685,7 @@ rb_str_new_frozen(VALUE orig)
assert(OBJ_FROZEN(str));
ofs = RSTRING_LEN(str) - RSTRING_LEN(orig);
if ((ofs > 0) || (klass != RBASIC(str)->klass) ||
- ((RBASIC(str)->flags ^ RBASIC(orig)->flags) & (FL_TAINT|FL_UNTRUSTED)) ||
+ (!OBJ_TAINTED(str) && OBJ_TAINTED(orig)) ||
ENCODING_GET(str) != ENCODING_GET(orig)) {
str = str_new3(klass, str);
RSTRING(str)->as.heap.ptr += ofs;
@@ -766,7 +730,6 @@ static VALUE
str_new_empty(VALUE str)
{
VALUE v = rb_str_new5(str, 0, 0);
- rb_enc_copy(v, str);
OBJ_INFECT(v, str);
return v;
}
@@ -810,22 +773,6 @@ rb_str_tmp_new(long len)
return str_new(0, 0, len);
}
-void *
-rb_alloc_tmp_buffer(volatile VALUE *store, long len)
-{
- VALUE s = rb_str_tmp_new(len);
- *store = s;
- return RSTRING_PTR(s);
-}
-
-void
-rb_free_tmp_buffer(volatile VALUE *store)
-{
- VALUE s = *store;
- *store = 0;
- if (s) rb_str_clear(s);
-}
-
void
rb_str_free(VALUE str)
{
@@ -834,11 +781,11 @@ rb_str_free(VALUE str)
}
}
-RUBY_FUNC_EXPORTED size_t
+size_t
rb_str_memsize(VALUE str)
{
if (!STR_EMBED_P(str) && !STR_SHARED_P(str)) {
- return RSTRING(str)->as.heap.aux.capa + 1; /* termlen */
+ return RSTRING(str)->as.heap.aux.capa;
}
else {
return 0;
@@ -896,11 +843,11 @@ rb_obj_as_string(VALUE obj)
{
VALUE str;
- if (RB_TYPE_P(obj, T_STRING)) {
+ if (TYPE(obj) == T_STRING) {
return obj;
}
str = rb_funcall(obj, id_to_s, 0);
- if (!RB_TYPE_P(str, T_STRING))
+ if (TYPE(str) != T_STRING)
return rb_any_to_s(obj);
if (OBJ_TAINTED(obj)) OBJ_TAINT(str);
return str;
@@ -951,10 +898,6 @@ rb_str_dup(VALUE str)
VALUE
rb_str_resurrect(VALUE str)
{
- if (RUBY_DTRACE_STRING_CREATE_ENABLED()) {
- RUBY_DTRACE_STRING_CREATE(RSTRING_LEN(str),
- rb_sourcefile(), rb_sourceline());
- }
return str_replace(str_alloc(rb_cString), str);
}
@@ -1085,30 +1028,13 @@ rb_enc_strlen_cr(const char *p, const char *e, rb_encoding *enc, int *cr)
#ifdef NONASCII_MASK
#define is_utf8_lead_byte(c) (((c)&0xC0) != 0x80)
-
-/*
- * UTF-8 leading bytes have either 0xxxxxxx or 11xxxxxx
- * bit represention. (see http://en.wikipedia.org/wiki/UTF-8)
- * Therefore, following pseudo code can detect UTF-8 leading byte.
- *
- * if (!(byte & 0x80))
- * byte |= 0x40; // turn on bit6
- * return ((byte>>6) & 1); // bit6 represent it's leading byte or not.
- *
- * This function calculate every bytes in the argument word `s'
- * using the above logic concurrently. and gather every bytes result.
- */
static inline VALUE
count_utf8_lead_bytes_with_word(const VALUE *s)
{
VALUE d = *s;
-
- /* Transform into bit0 represent UTF-8 leading or not. */
d |= ~(d>>1);
d >>= 6;
d &= NONASCII_MASK >> 7;
-
- /* Gather every bytes. */
d += (d>>8);
d += (d>>16);
#if SIZEOF_VALUE == 8
@@ -1191,16 +1117,13 @@ rb_str_length(VALUE str)
* call-seq:
* str.bytesize -> integer
*
- * Returns the length of +str+ in bytes.
- *
- * "\x80\u3042".bytesize #=> 4
- * "hello".bytesize #=> 5
+ * Returns the length of <i>str</i> in bytes.
*/
static VALUE
rb_str_bytesize(VALUE str)
{
- return LONG2NUM(RSTRING_LEN(str));
+ return INT2NUM(RSTRING_LEN(str));
}
/*
@@ -1210,7 +1133,6 @@ rb_str_bytesize(VALUE str)
* Returns <code>true</code> if <i>str</i> has a length of zero.
*
* "hello".empty? #=> false
- * " ".empty? #=> false
* "".empty? #=> true
*/
@@ -1257,11 +1179,10 @@ rb_str_plus(VALUE str1, VALUE str2)
* call-seq:
* str * integer -> new_str
*
- * Copy --- Returns a new String containing +integer+ copies of the receiver.
- * +integer+ must be greater than or equal to 0.
+ * Copy---Returns a new <code>String</code> containing <i>integer</i> copies of
+ * the receiver.
*
* "Ho! " * 3 #=> "Ho! Ho! Ho! "
- * "Ho! " * 0 #=> ""
*/
VALUE
@@ -1329,7 +1250,7 @@ str_modifiable(VALUE str)
if (FL_TEST(str, STR_TMPLOCK)) {
rb_raise(rb_eRuntimeError, "can't modify string; temporarily locked");
}
- rb_check_frozen(str);
+ if (OBJ_FROZEN(str)) rb_error_frozen("string");
if (!OBJ_UNTRUSTED(str) && rb_safe_level() >= 4)
rb_raise(rb_eSecurityError, "Insecure: can't modify string");
}
@@ -1344,27 +1265,23 @@ str_independent(VALUE str)
}
static void
-str_make_independent_expand(VALUE str, long expand)
+str_make_independent(VALUE str)
{
char *ptr;
long len = RSTRING_LEN(str);
- long capa = len + expand;
- if (len > capa) len = capa;
- ptr = ALLOC_N(char, capa + 1);
+ ptr = ALLOC_N(char, len+1);
if (RSTRING_PTR(str)) {
memcpy(ptr, RSTRING_PTR(str), len);
}
STR_SET_NOEMBED(str);
- STR_UNSET_NOCAPA(str);
ptr[len] = 0;
RSTRING(str)->as.heap.ptr = ptr;
RSTRING(str)->as.heap.len = len;
- RSTRING(str)->as.heap.aux.capa = capa;
+ RSTRING(str)->as.heap.aux.capa = len;
+ STR_UNSET_NOCAPA(str);
}
-#define str_make_independent(str) str_make_independent_expand((str), 0L)
-
void
rb_str_modify(VALUE str)
{
@@ -1373,30 +1290,6 @@ rb_str_modify(VALUE str)
ENC_CODERANGE_CLEAR(str);
}
-void
-rb_str_modify_expand(VALUE str, long expand)
-{
- if (expand < 0) {
- rb_raise(rb_eArgError, "negative expanding string size");
- }
- if (!str_independent(str)) {
- str_make_independent_expand(str, expand);
- }
- else if (expand > 0) {
- long len = RSTRING_LEN(str);
- long capa = len + expand;
- if (!STR_EMBED_P(str)) {
- REALLOC_N(RSTRING(str)->as.heap.ptr, char, capa+1);
- STR_UNSET_NOCAPA(str);
- RSTRING(str)->as.heap.aux.capa = capa;
- }
- else if (capa > RSTRING_EMBED_LEN_MAX) {
- str_make_independent_expand(str, expand);
- }
- }
- ENC_CODERANGE_CLEAR(str);
-}
-
/* As rb_str_modify(), but don't clear coderange */
static void
str_modify_keep_cr(VALUE str)
@@ -1423,7 +1316,7 @@ void
rb_str_associate(VALUE str, VALUE add)
{
/* sanity check */
- rb_check_frozen(str);
+ if (OBJ_FROZEN(str)) rb_error_frozen("string");
if (STR_ASSOC_P(str)) {
/* already associated */
rb_ary_concat(RSTRING(str)->as.heap.aux.shared, add);
@@ -1460,20 +1353,11 @@ rb_str_associated(VALUE str)
return Qfalse;
}
-void
-rb_must_asciicompat(VALUE str)
-{
- rb_encoding *enc = rb_enc_get(str);
- if (!rb_enc_asciicompat(enc)) {
- rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc));
- }
-}
-
VALUE
rb_string_value(volatile VALUE *ptr)
{
VALUE s = *ptr;
- if (!RB_TYPE_P(s, T_STRING)) {
+ if (TYPE(s) != T_STRING) {
s = rb_str_to_str(s);
*ptr = s;
}
@@ -1529,10 +1413,9 @@ rb_str_s_try_convert(VALUE dummy, VALUE str)
return rb_check_string_type(str);
}
-static char*
-str_nth_len(const char *p, const char *e, long *nthp, rb_encoding *enc)
+char*
+rb_enc_nth(const char *p, const char *e, long nth, rb_encoding *enc)
{
- long nth = *nthp;
if (rb_enc_mbmaxlen(enc) == 1) {
p += nth;
}
@@ -1545,17 +1428,12 @@ str_nth_len(const char *p, const char *e, long *nthp, rb_encoding *enc)
while (p < e && 0 < nth) {
e2 = p + nth;
- if (e < e2) {
- *nthp = nth;
+ if (e < e2)
return (char *)e;
- }
if (ISASCII(*p)) {
p2 = search_nonascii(p, e2);
- if (!p2) {
- nth -= e2 - p;
- *nthp = nth;
+ if (!p2)
return (char *)e2;
- }
nth -= p2 - p;
p = p2;
}
@@ -1563,35 +1441,26 @@ str_nth_len(const char *p, const char *e, long *nthp, rb_encoding *enc)
p += n;
nth--;
}
- *nthp = nth;
- if (nth != 0) {
+ if (nth != 0)
return (char *)e;
- }
return (char *)p;
}
else {
- while (p < e && nth--) {
+ while (p<e && nth--) {
p += rb_enc_mbclen(p, e, enc);
}
}
if (p > e) p = e;
- *nthp = nth;
return (char*)p;
}
-char*
-rb_enc_nth(const char *p, const char *e, long nth, rb_encoding *enc)
-{
- return str_nth_len(p, e, &nth, enc);
-}
-
static char*
str_nth(const char *p, const char *e, long nth, rb_encoding *enc, int singlebyte)
{
if (singlebyte)
p += nth;
else {
- p = str_nth_len(p, e, &nth, enc);
+ p = rb_enc_nth(p, e, nth, enc);
}
if (!p) return 0;
if (p > e) p = e;
@@ -1616,9 +1485,8 @@ rb_str_offset(VALUE str, long pos)
#ifdef NONASCII_MASK
static char *
-str_utf8_nth(const char *p, const char *e, long *nthp)
+str_utf8_nth(const char *p, const char *e, long nth)
{
- long nth = *nthp;
if ((int)SIZEOF_VALUE * 2 < e - p && (int)SIZEOF_VALUE * 2 < nth) {
const VALUE *s, *t;
const VALUE lowbits = sizeof(VALUE) - 1;
@@ -1641,14 +1509,13 @@ str_utf8_nth(const char *p, const char *e, long *nthp)
}
p++;
}
- *nthp = nth;
return (char *)p;
}
static long
str_utf8_offset(const char *p, const char *e, long nth)
{
- const char *pp = str_utf8_nth(p, e, &nth);
+ const char *pp = str_utf8_nth(p, e, nth);
return pp - p;
}
#endif
@@ -1677,7 +1544,6 @@ rb_str_subseq(VALUE str, long beg, long len)
}
else {
str2 = rb_str_new5(str, RSTRING_PTR(str)+beg, len);
- RB_GC_GUARD(str);
}
rb_enc_cr_str_copy_for_substr(str2, str);
@@ -1686,30 +1552,32 @@ rb_str_subseq(VALUE str, long beg, long len)
return str2;
}
-static char *
-rb_str_subpos(VALUE str, long beg, long *lenp)
+VALUE
+rb_str_substr(VALUE str, long beg, long len)
{
- long len = *lenp;
- long slen = -1L;
- long blen = RSTRING_LEN(str);
rb_encoding *enc = STR_ENC_GET(str);
- char *p, *s = RSTRING_PTR(str), *e = s + blen;
+ VALUE str2;
+ char *p, *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
- if (len < 0) return 0;
- if (!blen) {
+ if (len < 0) return Qnil;
+ if (!RSTRING_LEN(str)) {
len = 0;
}
if (single_byte_optimizable(str)) {
- if (beg > blen) return 0;
+ if (beg > RSTRING_LEN(str)) return Qnil;
if (beg < 0) {
- beg += blen;
- if (beg < 0) return 0;
+ beg += RSTRING_LEN(str);
+ if (beg < 0) return Qnil;
}
- if (beg + len > blen)
- len = blen - beg;
- if (len < 0) return 0;
- p = s + beg;
- goto end;
+ if (beg + len > RSTRING_LEN(str))
+ len = RSTRING_LEN(str) - beg;
+ if (len <= 0) {
+ len = 0;
+ p = 0;
+ }
+ else
+ p = s + beg;
+ goto sub;
}
if (beg < 0) {
if (len > -beg) len = -beg;
@@ -1717,32 +1585,27 @@ rb_str_subpos(VALUE str, long beg, long *lenp)
beg = -beg;
while (beg-- > len && (e = rb_enc_prev_char(s, e, e, enc)) != 0);
p = e;
- if (!p) return 0;
+ if (!p) return Qnil;
while (len-- > 0 && (p = rb_enc_prev_char(s, p, e, enc)) != 0);
- if (!p) return 0;
+ if (!p) return Qnil;
len = e - p;
- goto end;
+ goto sub;
}
else {
- slen = str_strlen(str, enc);
- beg += slen;
- if (beg < 0) return 0;
- p = s + beg;
- if (len == 0) goto end;
+ beg += str_strlen(str, enc);
+ if (beg < 0) return Qnil;
}
}
- else if (beg > 0 && beg > RSTRING_LEN(str)) {
- return 0;
+ else if (beg > 0 && beg > str_strlen(str, enc)) {
+ return Qnil;
}
if (len == 0) {
- if (beg > str_strlen(str, enc)) return 0;
- p = s + beg;
+ p = 0;
}
#ifdef NONASCII_MASK
else if (ENC_CODERANGE(str) == ENC_CODERANGE_VALID &&
enc == rb_utf8_encoding()) {
- p = str_utf8_nth(s, e, &beg);
- if (beg > 0) return 0;
+ p = str_utf8_nth(s, e, beg);
len = str_utf8_offset(p, e, len);
}
#endif
@@ -1751,34 +1614,22 @@ rb_str_subpos(VALUE str, long beg, long *lenp)
p = s + beg * char_sz;
if (p > e) {
- return 0;
+ p = e;
+ len = 0;
}
else if (len * char_sz > e - p)
len = e - p;
else
len *= char_sz;
}
- else if ((p = str_nth_len(s, e, &beg, enc)) == e) {
- if (beg > 0) return 0;
+ else if ((p = str_nth(s, e, beg, enc, 0)) == e) {
len = 0;
}
else {
len = str_offset(p, e, len, enc, 0);
}
- end:
- *lenp = len;
- RB_GC_GUARD(str);
- return p;
-}
-
-VALUE
-rb_str_substr(VALUE str, long beg, long len)
-{
- VALUE str2;
- char *p = rb_str_subpos(str, beg, &len);
-
- if (!p) return Qnil;
- if (len > RSTRING_EMBED_LEN_MAX && p + len == RSTRING_END(str)) {
+ sub:
+ if (len > RSTRING_EMBED_LEN_MAX && beg + len == RSTRING_LEN(str)) {
str2 = rb_str_new4(str);
str2 = str_new3(rb_obj_class(str2), str2);
RSTRING(str2)->as.heap.ptr += RSTRING(str2)->as.heap.len - len;
@@ -1786,10 +1637,9 @@ rb_str_substr(VALUE str, long beg, long len)
}
else {
str2 = rb_str_new5(str, p, len);
+ rb_enc_cr_str_copy_for_substr(str2, str);
OBJ_INFECT(str2, str);
- RB_GC_GUARD(str);
}
- rb_enc_cr_str_copy_for_substr(str2, str);
return str2;
}
@@ -1827,25 +1677,10 @@ rb_str_unlocktmp(VALUE str)
return str;
}
-VALUE
-rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg)
-{
- rb_str_locktmp(str);
- return rb_ensure(func, arg, rb_str_unlocktmp, str);
-}
-
void
rb_str_set_len(VALUE str, long len)
{
- long capa;
-
- str_modifiable(str);
- if (STR_SHARED_P(str)) {
- rb_raise(rb_eRuntimeError, "can't set length of shared string");
- }
- if (len > (capa = (long)rb_str_capacity(str))) {
- rb_bug("probable buffer overflow: %ld for %ld", len, capa);
- }
+ rb_str_modify(str);
STR_SET_LEN(str, len);
RSTRING_PTR(str)[len] = '\0';
}
@@ -1854,25 +1689,24 @@ VALUE
rb_str_resize(VALUE str, long len)
{
long slen;
- int independent;
if (len < 0) {
rb_raise(rb_eArgError, "negative string size (or size too big)");
}
- independent = str_independent(str);
- ENC_CODERANGE_CLEAR(str);
+ rb_str_modify(str);
slen = RSTRING_LEN(str);
- {
- long capa;
+ if (len != slen) {
if (STR_EMBED_P(str)) {
- if (len == slen) return str;
- if (len + 1 <= RSTRING_EMBED_LEN_MAX + 1) {
+ char *ptr;
+ if (len <= RSTRING_EMBED_LEN_MAX) {
STR_SET_EMBED_LEN(str, len);
RSTRING(str)->as.ary[len] = '\0';
return str;
}
- str_make_independent_expand(str, len - slen);
+ ptr = ALLOC_N(char,len+1);
+ MEMCPY(ptr, RSTRING(str)->as.ary, char, slen);
+ RSTRING(str)->as.heap.ptr = ptr;
STR_SET_NOEMBED(str);
}
else if (len <= RSTRING_EMBED_LEN_MAX) {
@@ -1882,19 +1716,15 @@ rb_str_resize(VALUE str, long len)
if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, slen);
RSTRING(str)->as.ary[len] = '\0';
STR_SET_EMBED_LEN(str, len);
- if (independent) xfree(ptr);
+ xfree(ptr);
return str;
}
- else if (!independent) {
- if (len == slen) return str;
- str_make_independent_expand(str, len - slen);
- }
- else if ((capa = RSTRING(str)->as.heap.aux.capa) < len ||
- (capa - len) > (len < 1024 ? len : 1024)) {
+ else if (slen < len || slen - len > 1024) {
REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1);
+ }
+ if (!STR_NOCAPA_P(str)) {
RSTRING(str)->as.heap.aux.capa = len;
}
- else if (len == slen) return str;
RSTRING(str)->as.heap.len = len;
RSTRING(str)->as.heap.ptr[len] = '\0'; /* sentinel */
}
@@ -1928,7 +1758,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
if (capa <= total) {
while (total > capa) {
if (capa + 1 >= LONG_MAX / 2) {
- capa = (total + 4095) / 4096 * 4096;
+ capa = (total + 4095) / 4096;
break;
}
capa = (capa + 1) * 2;
@@ -1945,7 +1775,7 @@ str_buf_cat(VALUE str, const char *ptr, long len)
return str;
}
-#define str_buf_cat2(str, ptr) str_buf_cat((str), (ptr), strlen(ptr))
+#define str_buf_cat2(str, ptr) str_buf_cat(str, (ptr), strlen(ptr))
VALUE
rb_str_buf_cat(VALUE str, const char *ptr, long len)
@@ -1970,12 +1800,12 @@ rb_str_cat(VALUE str, const char *ptr, long len)
rb_raise(rb_eArgError, "negative string size (or size too big)");
}
if (STR_ASSOC_P(str)) {
- char *p;
- rb_str_modify_expand(str, len);
- p = RSTRING(str)->as.heap.ptr;
- memcpy(p + RSTRING(str)->as.heap.len, ptr, len);
- len = RSTRING(str)->as.heap.len += len;
- p[len] = '\0'; /* sentinel */
+ rb_str_modify(str);
+ if (STR_EMBED_P(str)) str_make_independent(str);
+ REALLOC_N(RSTRING(str)->as.heap.ptr, char, RSTRING(str)->as.heap.len+len+1);
+ memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len, ptr, len);
+ RSTRING(str)->as.heap.len += len;
+ RSTRING(str)->as.heap.ptr[RSTRING(str)->as.heap.len] = '\0'; /* sentinel */
return str;
}
@@ -1995,12 +1825,16 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
int str_encindex = ENCODING_GET(str);
int res_encindex;
int str_cr, res_cr;
+ int str_a8 = ENCODING_IS_ASCII8BIT(str);
+ int ptr_a8 = ptr_encindex == 0;
str_cr = ENC_CODERANGE(str);
if (str_encindex == ptr_encindex) {
- if (str_cr == ENC_CODERANGE_UNKNOWN)
+ if (str_cr == ENC_CODERANGE_UNKNOWN ||
+ (ptr_a8 && str_cr != ENC_CODERANGE_7BIT)) {
ptr_cr = ENC_CODERANGE_UNKNOWN;
+ }
else if (ptr_cr == ENC_CODERANGE_UNKNOWN) {
ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex));
}
@@ -2022,7 +1856,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
ptr_cr = coderange_scan(ptr, len, ptr_enc);
}
if (str_cr == ENC_CODERANGE_UNKNOWN) {
- if (ENCODING_IS_ASCII8BIT(str) || ptr_cr != ENC_CODERANGE_7BIT) {
+ if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) {
str_cr = rb_enc_str_coderange(str);
}
}
@@ -2045,7 +1879,7 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
}
else if (str_cr == ENC_CODERANGE_7BIT) {
if (ptr_cr == ENC_CODERANGE_7BIT) {
- res_encindex = str_encindex;
+ res_encindex = !str_a8 ? str_encindex : ptr_encindex;
res_cr = ENC_CODERANGE_7BIT;
}
else {
@@ -2126,17 +1960,17 @@ rb_str_append(VALUE str, VALUE str2)
{
rb_encoding *enc;
int cr, cr2;
- long len2;
StringValue(str2);
- if ((len2 = RSTRING_LEN(str2)) > 0 && STR_ASSOC_P(str)) {
- long len = RSTRING_LEN(str) + len2;
+ if (RSTRING_LEN(str2) > 0 && STR_ASSOC_P(str)) {
+ long len = RSTRING_LEN(str)+RSTRING_LEN(str2);
enc = rb_enc_check(str, str2);
cr = ENC_CODERANGE(str);
if ((cr2 = ENC_CODERANGE(str2)) > cr) cr = cr2;
- rb_str_modify_expand(str, len2);
+ rb_str_modify(str);
+ REALLOC_N(RSTRING(str)->as.heap.ptr, char, len+1);
memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len,
- RSTRING_PTR(str2), len2+1);
+ RSTRING_PTR(str2), RSTRING_LEN(str2)+1);
RSTRING(str)->as.heap.len = len;
rb_enc_associate(str, enc);
ENC_CODERANGE_SET(str, cr);
@@ -2146,6 +1980,7 @@ rb_str_append(VALUE str, VALUE str2)
return rb_str_buf_append(str, str2);
}
+
/*
* call-seq:
* str << integer -> str
@@ -2165,83 +2000,48 @@ rb_str_append(VALUE str, VALUE str2)
VALUE
rb_str_concat(VALUE str1, VALUE str2)
{
- unsigned int code;
- rb_encoding *enc = STR_ENC_GET(str1);
+ unsigned int lc;
- if (FIXNUM_P(str2) || RB_TYPE_P(str2, T_BIGNUM)) {
- if (rb_num_to_uint(str2, &code) == 0) {
- }
- else if (FIXNUM_P(str2)) {
- rb_raise(rb_eRangeError, "%ld out of char range", FIX2LONG(str2));
- }
- else {
- rb_raise(rb_eRangeError, "bignum out of char range");
- }
+ if (FIXNUM_P(str2)) {
+ if ((int)str2 < 0)
+ rb_raise(rb_eRangeError, "negative argument");
+ lc = FIX2UINT(str2);
+ }
+ else if (TYPE(str2) == T_BIGNUM) {
+ if (!RBIGNUM_SIGN(str2))
+ rb_raise(rb_eRangeError, "negative argument");
+ lc = NUM2UINT(str2);
}
else {
return rb_str_append(str1, str2);
}
-
- if (enc == rb_usascii_encoding()) {
- /* US-ASCII automatically extended to ASCII-8BIT */
- char buf[1];
- buf[0] = (char)code;
- if (code > 0xFF) {
- rb_raise(rb_eRangeError, "%u out of char range", code);
- }
- rb_str_cat(str1, buf, 1);
- if (code > 127) {
- rb_enc_associate(str1, rb_ascii8bit_encoding());
- ENC_CODERANGE_SET(str1, ENC_CODERANGE_VALID);
- }
+#if SIZEOF_INT < SIZEOF_VALUE
+ if ((VALUE)lc > UINT_MAX) {
+ rb_raise(rb_eRangeError, "%"PRIuVALUE" out of char range", lc);
}
- else {
+#endif
+ {
+ rb_encoding *enc = STR_ENC_GET(str1);
long pos = RSTRING_LEN(str1);
int cr = ENC_CODERANGE(str1);
int len;
- char *buf;
- switch (len = rb_enc_codelen(code, enc)) {
- case ONIGERR_INVALID_CODE_POINT_VALUE:
- rb_raise(rb_eRangeError, "invalid codepoint 0x%X in %s", code, rb_enc_name(enc));
- break;
- case ONIGERR_TOO_BIG_WIDE_CHAR_VALUE:
- case 0:
- rb_raise(rb_eRangeError, "%u out of char range", code);
- break;
- }
- buf = ALLOCA_N(char, len + 1);
- rb_enc_mbcput(code, buf, enc);
- if (rb_enc_precise_mbclen(buf, buf + len + 1, enc) != len) {
- rb_raise(rb_eRangeError, "invalid codepoint 0x%X in %s", code, rb_enc_name(enc));
+ if ((len = rb_enc_codelen(lc, enc)) <= 0) {
+ rb_raise(rb_eRangeError, "%u invalid char", lc);
}
rb_str_resize(str1, pos+len);
- memcpy(RSTRING_PTR(str1) + pos, buf, len);
- if (cr == ENC_CODERANGE_7BIT && code > 127)
+ rb_enc_mbcput(lc, RSTRING_PTR(str1)+pos, enc);
+ if (cr == ENC_CODERANGE_7BIT && lc > 127)
cr = ENC_CODERANGE_VALID;
ENC_CODERANGE_SET(str1, cr);
+ return str1;
}
- return str1;
}
-/*
- * call-seq:
- * str.prepend(other_str) -> str
- *
- * Prepend---Prepend the given string to <i>str</i>.
- *
- * a = "world"
- * a.prepend("hello ") #=> "hello world"
- * a #=> "hello world"
- */
-
-static VALUE
-rb_str_prepend(VALUE str, VALUE str2)
+st_index_t
+rb_memhash(const void *ptr, long len)
{
- StringValue(str2);
- StringValue(str);
- rb_str_update(str, 0L, 0L, str2);
- return str;
+ return st_hash(ptr, len, rb_hash_start(0));
}
st_index_t
@@ -2311,15 +2111,13 @@ rb_str_comparable(VALUE str1, VALUE str2)
int
rb_str_cmp(VALUE str1, VALUE str2)
{
- long len1, len2;
- const char *ptr1, *ptr2;
+ long len;
int retval;
- if (str1 == str2) return 0;
- RSTRING_GETMEM(str1, ptr1, len1);
- RSTRING_GETMEM(str2, ptr2, len2);
- if (ptr1 == ptr2 || (retval = memcmp(ptr1, ptr2, lesser(len1, len2))) == 0) {
- if (len1 == len2) {
+ len = lesser(RSTRING_LEN(str1), RSTRING_LEN(str2));
+ retval = memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2), len);
+ if (retval == 0) {
+ if (RSTRING_LEN(str1) == RSTRING_LEN(str2)) {
if (!rb_str_comparable(str1, str2)) {
if (ENCODING_GET(str1) > ENCODING_GET(str2))
return 1;
@@ -2327,7 +2125,7 @@ rb_str_cmp(VALUE str1, VALUE str2)
}
return 0;
}
- if (len1 > len2) return 1;
+ if (RSTRING_LEN(str1) > RSTRING_LEN(str2)) return 1;
return -1;
}
if (retval > 0) return 1;
@@ -2339,17 +2137,13 @@ static VALUE
str_eql(const VALUE str1, const VALUE str2)
{
const long len = RSTRING_LEN(str1);
- const char *ptr1, *ptr2;
if (len != RSTRING_LEN(str2)) return Qfalse;
if (!rb_str_comparable(str1, str2)) return Qfalse;
- if ((ptr1 = RSTRING_PTR(str1)) == (ptr2 = RSTRING_PTR(str2)))
- return Qtrue;
- if (memcmp(ptr1, ptr2, len) == 0)
+ if (memcmp(RSTRING_PTR(str1), RSTRING_PTR(str2), len) == 0)
return Qtrue;
return Qfalse;
}
-
/*
* call-seq:
* str == obj -> true or false
@@ -2363,7 +2157,7 @@ VALUE
rb_str_equal(VALUE str1, VALUE str2)
{
if (str1 == str2) return Qtrue;
- if (!RB_TYPE_P(str2, T_STRING)) {
+ if (TYPE(str2) != T_STRING) {
if (!rb_respond_to(str2, rb_intern("to_str"))) {
return Qfalse;
}
@@ -2382,29 +2176,26 @@ rb_str_equal(VALUE str1, VALUE str2)
static VALUE
rb_str_eql(VALUE str1, VALUE str2)
{
- if (str1 == str2) return Qtrue;
- if (!RB_TYPE_P(str2, T_STRING)) return Qfalse;
+ if (TYPE(str2) != T_STRING) return Qfalse;
return str_eql(str1, str2);
}
/*
* call-seq:
- * string <=> other_string -> -1, 0, +1 or nil
+ * str <=> other_str -> -1, 0, +1 or nil
*
- *
- * Comparison---Returns -1, 0, +1 or nil depending on whether +string+ is less
- * than, equal to, or greater than +other_string+.
- *
- * +nil+ is returned if the two values are incomparable.
- *
- * If the strings are of different lengths, and the strings are equal when
- * compared up to the shortest length, then the longer string is considered
- * greater than the shorter one.
+ * Comparison---Returns -1 if <i>other_str</i> is greater than, 0 if
+ * <i>other_str</i> is equal to, and +1 if <i>other_str</i> is less than
+ * <i>str</i>. If the strings are of different lengths, and the strings are
+ * equal when compared up to the shortest length, then the longer string is
+ * considered greater than the shorter one. In older versions of Ruby, setting
+ * <code>$=</code> allowed case-insensitive comparisons; this is now deprecated
+ * in favor of using <code>String#casecmp</code>.
*
* <code><=></code> is the basis for the methods <code><</code>,
- * <code><=</code>, <code>></code>, <code>>=</code>, and
- * <code>between?</code>, included from module Comparable. The method
- * String#== does not use Comparable#==.
+ * <code><=</code>, <code>></code>, <code>>=</code>, and <code>between?</code>,
+ * included from module <code>Comparable</code>. The method
+ * <code>String#==</code> does not use <code>Comparable#==</code>.
*
* "abcdef" <=> "abcde" #=> 1
* "abcdef" <=> "abcdef" #=> 0
@@ -2415,21 +2206,29 @@ rb_str_eql(VALUE str1, VALUE str2)
static VALUE
rb_str_cmp_m(VALUE str1, VALUE str2)
{
- int result;
+ long result;
- if (!RB_TYPE_P(str2, T_STRING)) {
- VALUE tmp = rb_check_funcall(str2, rb_intern("to_str"), 0, 0);
- if (RB_TYPE_P(tmp, T_STRING)) {
- result = rb_str_cmp(str1, tmp);
+ if (TYPE(str2) != T_STRING) {
+ if (!rb_respond_to(str2, rb_intern("to_str"))) {
+ return Qnil;
+ }
+ else if (!rb_respond_to(str2, rb_intern("<=>"))) {
+ return Qnil;
}
else {
- return rb_invcmp(str1, str2);
+ VALUE tmp = rb_funcall(str2, rb_intern("<=>"), 1, str1);
+
+ if (NIL_P(tmp)) return Qnil;
+ if (!FIXNUM_P(tmp)) {
+ return rb_funcall(LONG2FIX(0), '-', 1, tmp);
+ }
+ result = -FIX2LONG(tmp);
}
}
else {
result = rb_str_cmp(str1, str2);
}
- return INT2FIX(result);
+ return LONG2NUM(result);
}
/*
@@ -2579,15 +2378,14 @@ rb_str_index_m(int argc, VALUE *argv, VALUE str)
if (pos < 0) {
pos += str_strlen(str, STR_ENC_GET(str));
if (pos < 0) {
- if (RB_TYPE_P(sub, T_REGEXP)) {
+ if (TYPE(sub) == T_REGEXP) {
rb_backref_set(Qnil);
}
return Qnil;
}
}
- if (SPECIAL_CONST_P(sub)) goto generic;
- switch (BUILTIN_TYPE(sub)) {
+ switch (TYPE(sub)) {
case T_REGEXP:
if (pos > str_strlen(str, STR_ENC_GET(str)))
return Qnil;
@@ -2598,7 +2396,6 @@ rb_str_index_m(int argc, VALUE *argv, VALUE str)
pos = rb_str_sublen(str, pos);
break;
- generic:
default: {
VALUE tmp;
@@ -2646,14 +2443,14 @@ rb_str_rindex(VALUE str, VALUE sub, long pos)
e = RSTRING_END(str);
t = RSTRING_PTR(sub);
slen = RSTRING_LEN(sub);
- s = str_nth(sbeg, e, pos, enc, singlebyte);
- while (s) {
+ for (;;) {
+ s = str_nth(sbeg, e, pos, enc, singlebyte);
+ if (!s) return -1;
if (memcmp(s, t, slen) == 0) {
return pos;
}
if (pos == 0) break;
pos--;
- s = rb_enc_prev_char(sbeg, s, e, enc);
}
return -1;
}
@@ -2690,7 +2487,7 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
if (pos < 0) {
pos += len;
if (pos < 0) {
- if (RB_TYPE_P(sub, T_REGEXP)) {
+ if (TYPE(sub) == T_REGEXP) {
rb_backref_set(Qnil);
}
return Qnil;
@@ -2702,8 +2499,7 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
pos = len;
}
- if (SPECIAL_CONST_P(sub)) goto generic;
- switch (BUILTIN_TYPE(sub)) {
+ switch (TYPE(sub)) {
case T_REGEXP:
/* enc = rb_get_check(str, sub); */
pos = str_offset(RSTRING_PTR(str), RSTRING_END(str), pos,
@@ -2716,7 +2512,6 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
if (pos >= 0) return LONG2NUM(pos);
break;
- generic:
default: {
VALUE tmp;
@@ -2746,10 +2541,6 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
* <i>obj.=~</i>, passing <i>str</i> as an argument. The default
* <code>=~</code> in <code>Object</code> returns <code>nil</code>.
*
- * Note: <code>str =~ regexp</code> is not the same as
- * <code>regexp =~ str</code>. Strings captured from named capture groups
- * are assigned to local variables only in the second case.
- *
* "cat o' 9 tails" =~ /\d/ #=> 7
* "cat o' 9 tails" =~ 9 #=> nil
*/
@@ -2757,15 +2548,13 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
static VALUE
rb_str_match(VALUE x, VALUE y)
{
- if (SPECIAL_CONST_P(y)) goto generic;
- switch (BUILTIN_TYPE(y)) {
+ switch (TYPE(y)) {
case T_STRING:
rb_raise(rb_eTypeError, "type mismatch: String given");
case T_REGEXP:
return rb_reg_match(y, x);
- generic:
default:
return rb_funcall(y, rb_intern("=~"), 1, x);
}
@@ -2784,6 +2573,8 @@ static VALUE get_pat(VALUE, int);
* then invokes its <code>match</code> method on <i>str</i>. If the second
* parameter is present, it specifies the position in the string to begin the
* search.
+ * If the second parameter is present, it specifies the position in the string
+ * to begin the search.
*
* 'hello'.match('(.)\1') #=> #<MatchData "ll" 1:"l">
* 'hello'.match('(.)\1')[0] #=> "ll"
@@ -2809,7 +2600,7 @@ rb_str_match_m(int argc, VALUE *argv, VALUE str)
{
VALUE re, result;
if (argc < 1)
- rb_check_arity(argc, 1, 2);
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
re = argv[0];
argv[0] = str;
result = rb_funcall2(get_pat(re, 0), rb_intern("match"), argc, argv);
@@ -3220,17 +3011,15 @@ rb_str_aref(VALUE str, VALUE indx)
{
long idx;
- if (FIXNUM_P(indx)) {
+ switch (TYPE(indx)) {
+ case T_FIXNUM:
idx = FIX2LONG(indx);
num_index:
str = rb_str_substr(str, idx, 1);
if (!NIL_P(str) && RSTRING_LEN(str) == 0) return Qnil;
return str;
- }
- if (SPECIAL_CONST_P(indx)) goto generic;
- switch (BUILTIN_TYPE(indx)) {
case T_REGEXP:
return rb_str_subpat(str, indx, INT2FIX(0));
@@ -3239,7 +3028,6 @@ rb_str_aref(VALUE str, VALUE indx)
return rb_str_dup(indx);
return Qnil;
- generic:
default:
/* check if indx is Range */
{
@@ -3260,76 +3048,54 @@ rb_str_aref(VALUE str, VALUE indx)
idx = NUM2LONG(indx);
goto num_index;
}
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
/*
* call-seq:
- * str[index] -> new_str or nil
- * str[start, length] -> new_str or nil
- * str[range] -> new_str or nil
- * str[regexp] -> new_str or nil
- * str[regexp, capture] -> new_str or nil
- * str[match_str] -> new_str or nil
- * str.slice(index) -> new_str or nil
- * str.slice(start, length) -> new_str or nil
- * str.slice(range) -> new_str or nil
- * str.slice(regexp) -> new_str or nil
- * str.slice(regexp, capture) -> new_str or nil
- * str.slice(match_str) -> new_str or nil
- *
- * Element Reference --- If passed a single +index+, returns a substring of
- * one character at that index. If passed a +start+ index and a +length+,
- * returns a substring containing +length+ characters starting at the
- * +index+. If passed a +range+, its beginning and end are interpreted as
- * offsets delimiting the substring to be returned.
- *
- * In these three cases, if an index is negative, it is counted from the end
- * of the string. For the +start+ and +range+ cases the starting index
- * is just before a character and an index matching the string's size.
- * Additionally, an empty string is returned when the starting index for a
- * character range is at the end of the string.
- *
- * Returns +nil+ if the initial index falls outside the string or the length
- * is negative.
- *
- * If a +Regexp+ is supplied, the matching portion of the string is
- * returned. If a +capture+ follows the regular expression, which may be a
- * capture group index or name, follows the regular expression that component
- * of the MatchData is returned instead.
- *
- * If a +match_str+ is given, that string is returned if it occurs in
- * the string.
- *
- * Returns +nil+ if the regular expression does not match or the match string
- * cannot be found.
+ * str[fixnum] -> new_str or nil
+ * str[fixnum, fixnum] -> new_str or nil
+ * str[range] -> new_str or nil
+ * str[regexp] -> new_str or nil
+ * str[regexp, fixnum] -> new_str or nil
+ * str[other_str] -> new_str or nil
+ * str.slice(fixnum) -> new_str or nil
+ * str.slice(fixnum, fixnum) -> new_str or nil
+ * str.slice(range) -> new_str or nil
+ * str.slice(regexp) -> new_str or nil
+ * str.slice(regexp, fixnum) -> new_str or nil
+ * str.slice(regexp, capname) -> new_str or nil
+ * str.slice(other_str) -> new_str or nil
+ *
+ * Element Reference---If passed a single <code>Fixnum</code>, returns a
+ * substring of one character at that position. If passed two <code>Fixnum</code>
+ * objects, returns a substring starting at the offset given by the first, and
+ * a length given by the second. If given a range, a substring containing
+ * characters at offsets given by the range is returned. In all three cases, if
+ * an offset is negative, it is counted from the end of <i>str</i>. Returns
+ * <code>nil</code> if the initial offset falls outside the string, the length
+ * is negative, or the beginning of the range is greater than the end.
*
- * a = "hello there"
+ * If a <code>Regexp</code> is supplied, the matching portion of <i>str</i> is
+ * returned. If a numeric or name parameter follows the regular expression, that
+ * component of the <code>MatchData</code> is returned instead. If a
+ * <code>String</code> is given, that string is returned if it occurs in
+ * <i>str</i>. In both cases, <code>nil</code> is returned if there is no
+ * match.
*
+ * a = "hello there"
* a[1] #=> "e"
- * a[2, 3] #=> "llo"
- * a[2..3] #=> "ll"
- *
- * a[-3, 2] #=> "er"
- * a[7..-2] #=> "her"
+ * a[1,3] #=> "ell"
+ * a[1..3] #=> "ell"
+ * a[-3,2] #=> "er"
* a[-4..-2] #=> "her"
- * a[-2..-4] #=> ""
- *
- * a[11, 0] #=> ""
- * a[11] #=> nil
- * a[12, 0] #=> nil
* a[12..-1] #=> nil
- *
+ * a[-2..-4] #=> ""
* a[/[aeiou](.)\1/] #=> "ell"
* a[/[aeiou](.)\1/, 0] #=> "ell"
* a[/[aeiou](.)\1/, 1] #=> "l"
* a[/[aeiou](.)\1/, 2] #=> nil
- *
- * a[/(?<vowel>[aeiou])(?<non_vowel>[^aeiou])/, "non_vowel"] #=> "l"
- * a[/(?<vowel>[aeiou])(?<non_vowel>[^aeiou])/, "vowel"] #=> "e"
- *
* a["lo"] #=> "lo"
* a["bye"] #=> nil
*/
@@ -3338,12 +3104,14 @@ static VALUE
rb_str_aref_m(int argc, VALUE *argv, VALUE str)
{
if (argc == 2) {
- if (RB_TYPE_P(argv[0], T_REGEXP)) {
+ if (TYPE(argv[0]) == T_REGEXP) {
return rb_str_subpat(str, argv[0], argv[1]);
}
return rb_str_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]));
}
- rb_check_arity(argc, 1, 2);
+ if (argc != 1) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+ }
return rb_str_aref(str, argv[0]);
}
@@ -3500,15 +3268,13 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
{
long idx, beg;
- if (FIXNUM_P(indx)) {
+ switch (TYPE(indx)) {
+ case T_FIXNUM:
idx = FIX2LONG(indx);
num_index:
rb_str_splice(str, idx, 1, val);
return val;
- }
- if (SPECIAL_CONST_P(indx)) goto generic;
- switch (TYPE(indx)) {
case T_REGEXP:
rb_str_subpat_set(str, indx, INT2FIX(0), val);
return val;
@@ -3522,7 +3288,6 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
rb_str_splice(str, beg, str_strlen(indx, 0), val);
return val;
- generic:
default:
/* check if indx is Range */
{
@@ -3559,14 +3324,14 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
* <code>Fixnum</code> will raise an <code>IndexError</code> if the value is
* out of range; the <code>Range</code> form will raise a
* <code>RangeError</code>, and the <code>Regexp</code> and <code>String</code>
- * will raise an <code>IndexError</code> on negative match.
+ * forms will silently ignore the assignment.
*/
static VALUE
rb_str_aset_m(int argc, VALUE *argv, VALUE str)
{
if (argc == 3) {
- if (RB_TYPE_P(argv[0], T_REGEXP)) {
+ if (TYPE(argv[0]) == T_REGEXP) {
rb_str_subpat_set(str, argv[0], argv[1], argv[2]);
}
else {
@@ -3574,7 +3339,9 @@ rb_str_aset_m(int argc, VALUE *argv, VALUE str)
}
return argv[2];
}
- rb_check_arity(argc, 2, 3);
+ if (argc != 2) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 2..3)", argc);
+ }
return rb_str_aset(str, argv[0], argv[1]);
}
@@ -3637,14 +3404,16 @@ rb_str_slice_bang(int argc, VALUE *argv, VALUE str)
VALUE buf[3];
int i;
- rb_check_arity(argc, 1, 2);
+ if (argc < 1 || 2 < argc) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+ }
for (i=0; i<argc; i++) {
buf[i] = argv[i];
}
str_modify_keep_cr(str);
+ buf[i] = rb_str_new(0,0);
result = rb_str_aref_m(argc, buf, str);
if (!NIL_P(result)) {
- buf[i] = rb_str_new(0,0);
rb_str_aset_m(argc+1, buf, str);
}
return result;
@@ -3683,10 +3452,9 @@ get_pat(VALUE pat, int quote)
* str.sub!(pattern, replacement) -> str or nil
* str.sub!(pattern) {|match| block } -> str or nil
*
- * Performs the same substitution as String#sub in-place.
- *
- * Returns +str+ if a substitution was performed or +nil+ if no substitution
- * was performed.
+ * Performs the substitutions of <code>String#sub</code> in place,
+ * returning <i>str</i>, or <code>nil</code> if no substitutions were
+ * performed.
*/
static VALUE
@@ -3697,21 +3465,22 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
int tainted = 0;
int untrusted = 0;
long plen;
- int min_arity = rb_block_given_p() ? 1 : 2;
- rb_check_arity(argc, min_arity, 2);
- if (argc == 1) {
+ if (argc == 1 && rb_block_given_p()) {
iter = 1;
}
- else {
+ else if (argc == 2) {
repl = argv[1];
- hash = rb_check_hash_type(argv[1]);
+ hash = rb_check_convert_type(argv[1], T_HASH, "Hash", "to_hash");
if (NIL_P(hash)) {
StringValue(repl);
}
if (OBJ_TAINTED(repl)) tainted = 1;
if (OBJ_UNTRUSTED(repl)) untrusted = 1;
}
+ else {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+ }
pat = get_pat(argv[0], 1);
str_modifiable(str);
@@ -3736,7 +3505,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
repl = rb_obj_as_string(repl);
}
str_mod_check(str, p, len);
- rb_check_frozen(str);
+ str_frozen_check(str);
}
else {
repl = rb_reg_regsub(repl, str, regs, pat);
@@ -3795,22 +3564,23 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
* str.sub(pattern, hash) -> new_str
* str.sub(pattern) {|match| block } -> new_str
*
- * Returns a copy of +str+ with the _first_ occurrence of +pattern+
- * replaced by the second argument. The +pattern+ is typically a Regexp; if
- * given as a String, any regular expression metacharacters it contains will
- * be interpreted literally, e.g. <code>'\\\d'</code> will match a backlash
- * followed by 'd', instead of a digit.
+ * Returns a copy of <i>str</i> with the <em>first</em> occurrence of
+ * <i>pattern</i> substituted for the second argument. The <i>pattern</i> is
+ * typically a <code>Regexp</code>; if given as a <code>String</code>, any
+ * regular expression metacharacters it contains will be interpreted
+ * literally, e.g. <code>'\\\d'</code> will match a backlash followed by 'd',
+ * instead of a digit.
*
- * If +replacement+ is a String it will be substituted for the matched text.
- * It may contain back-references to the pattern's capture groups of the form
- * <code>"\\d"</code>, where <i>d</i> is a group number, or
- * <code>"\\k<n>"</code>, where <i>n</i> is a group name. If it is a
+ * If <i>replacement</i> is a <code>String</code> it will be substituted for
+ * the matched text. It may contain back-references to the pattern's capture
+ * groups of the form <code>\\\d</code>, where <i>d</i> is a group number, or
+ * <code>\\\k<n></code>, where <i>n</i> is a group name. If it is a
* double-quoted string, both back-references must be preceded by an
- * additional backslash. However, within +replacement+ the special match
+ * additional backslash. However, within <i>replacement</i> the special match
* variables, such as <code>&$</code>, will not refer to the current match.
*
- * If the second argument is a Hash, and the matched text is one of its keys,
- * the corresponding value is the replacement string.
+ * If the second argument is a <code>Hash</code>, and the matched text is one
+ * of its keys, the corresponding value is the replacement string.
*
* In the block form, the current match string is passed in as a parameter,
* and variables such as <code>$1</code>, <code>$2</code>, <code>$`</code>,
@@ -3856,14 +3626,14 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
break;
case 2:
repl = argv[1];
- hash = rb_check_hash_type(argv[1]);
+ hash = rb_check_convert_type(argv[1], T_HASH, "Hash", "to_hash");
if (NIL_P(hash)) {
StringValue(repl);
}
if (OBJ_TAINTED(repl)) tainted = 1;
break;
default:
- rb_check_arity(argc, 1, 2);
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
}
pat = get_pat(argv[0], 1);
@@ -3881,8 +3651,6 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
slen = RSTRING_LEN(str);
cp = sp;
str_enc = STR_ENC_GET(str);
- rb_enc_associate(dest, str_enc);
- ENC_CODERANGE_SET(dest, rb_enc_asciicompat(str_enc) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID);
do {
n++;
@@ -3909,7 +3677,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
if (OBJ_TAINTED(val)) tainted = 1;
- len = beg0 - offset; /* copy pre-match substr */
+ len = beg - offset; /* copy pre-match substr */
if (len) {
rb_enc_str_buf_cat(dest, cp, len, str_enc);
}
@@ -3989,7 +3757,7 @@ rb_str_gsub_bang(int argc, VALUE *argv, VALUE str)
* <code>\\\k<n></code>, where <i>n</i> is a group name. If it is a
* double-quoted string, both back-references must be preceded by an
* additional backslash. However, within <i>replacement</i> the special match
- * variables, such as <code>$&</code>, will not refer to the current match.
+ * variables, such as <code>&$</code>, will not refer to the current match.
*
* If the second argument is a <code>Hash</code>, and the matched text is one
* of its keys, the corresponding value is the replacement string.
@@ -4102,9 +3870,9 @@ rb_str_getbyte(VALUE str, VALUE index)
/*
* call-seq:
- * str.setbyte(index, integer) -> integer
+ * str.setbyte(index, int) -> int
*
- * modifies the <i>index</i>th byte as <i>integer</i>.
+ * modifies the <i>index</i>th byte as <i>int</i>.
*/
static VALUE
rb_str_setbyte(VALUE str, VALUE index, VALUE value)
@@ -4124,128 +3892,6 @@ rb_str_setbyte(VALUE str, VALUE index, VALUE value)
return value;
}
-static VALUE
-str_byte_substr(VALUE str, long beg, long len)
-{
- char *p, *s = RSTRING_PTR(str);
- long n = RSTRING_LEN(str);
- VALUE str2;
-
- if (beg > n || len < 0) return Qnil;
- if (beg < 0) {
- beg += n;
- if (beg < 0) return Qnil;
- }
- if (beg + len > n)
- len = n - beg;
- if (len <= 0) {
- len = 0;
- p = 0;
- }
- else
- p = s + beg;
-
- if (len > RSTRING_EMBED_LEN_MAX && beg + len == n) {
- str2 = rb_str_new4(str);
- str2 = str_new3(rb_obj_class(str2), str2);
- RSTRING(str2)->as.heap.ptr += RSTRING(str2)->as.heap.len - len;
- RSTRING(str2)->as.heap.len = len;
- }
- else {
- str2 = rb_str_new5(str, p, len);
- }
-
- str_enc_copy(str2, str);
-
- if (RSTRING_LEN(str2) == 0) {
- if (!rb_enc_asciicompat(STR_ENC_GET(str)))
- ENC_CODERANGE_SET(str2, ENC_CODERANGE_VALID);
- else
- ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT);
- }
- else {
- switch (ENC_CODERANGE(str)) {
- case ENC_CODERANGE_7BIT:
- ENC_CODERANGE_SET(str2, ENC_CODERANGE_7BIT);
- break;
- default:
- ENC_CODERANGE_SET(str2, ENC_CODERANGE_UNKNOWN);
- break;
- }
- }
-
- OBJ_INFECT(str2, str);
-
- return str2;
-}
-
-static VALUE
-str_byte_aref(VALUE str, VALUE indx)
-{
- long idx;
- switch (TYPE(indx)) {
- case T_FIXNUM:
- idx = FIX2LONG(indx);
-
- num_index:
- str = str_byte_substr(str, idx, 1);
- if (NIL_P(str) || RSTRING_LEN(str) == 0) return Qnil;
- return str;
-
- default:
- /* check if indx is Range */
- {
- long beg, len = RSTRING_LEN(str);
-
- switch (rb_range_beg_len(indx, &beg, &len, len, 0)) {
- case Qfalse:
- break;
- case Qnil:
- return Qnil;
- default:
- return str_byte_substr(str, beg, len);
- }
- }
- idx = NUM2LONG(indx);
- goto num_index;
- }
-
- UNREACHABLE;
-}
-
-/*
- * call-seq:
- * str.byteslice(fixnum) -> new_str or nil
- * str.byteslice(fixnum, fixnum) -> new_str or nil
- * str.byteslice(range) -> new_str or nil
- *
- * Byte Reference---If passed a single <code>Fixnum</code>, returns a
- * substring of one byte at that position. If passed two <code>Fixnum</code>
- * objects, returns a substring starting at the offset given by the first, and
- * a length given by the second. If given a <code>Range</code>, a substring containing
- * bytes at offsets given by the range is returned. In all three cases, if
- * an offset is negative, it is counted from the end of <i>str</i>. Returns
- * <code>nil</code> if the initial offset falls outside the string, the length
- * is negative, or the beginning of the range is greater than the end.
- * The encoding of the resulted string keeps original encoding.
- *
- * "hello".byteslice(1) #=> "e"
- * "hello".byteslice(-1) #=> "o"
- * "hello".byteslice(1, 2) #=> "el"
- * "\x80\u3042".byteslice(1, 3) #=> "\u3042"
- * "\x03\u3042\xff".byteslice(1..3) #=> "\u3042"
- */
-
-static VALUE
-rb_str_byteslice(int argc, VALUE *argv, VALUE str)
-{
- if (argc == 2) {
- return str_byte_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]));
- }
- rb_check_arity(argc, 1, 2);
- return str_byte_aref(str, argv[0]);
-}
-
/*
* call-seq:
* str.reverse -> new_str
@@ -4518,10 +4164,7 @@ rb_str_inspect(VALUE str)
rb_encoding *resenc = rb_default_internal_encoding();
int unicode_p = rb_enc_unicode_p(enc);
int asciicompat = rb_enc_asciicompat(enc);
- static rb_encoding *utf16, *utf32;
- if (!utf16) utf16 = rb_enc_find("UTF-16");
- if (!utf32) utf32 = rb_enc_find("UTF-32");
if (resenc == NULL) resenc = rb_default_external_encoding();
if (!rb_enc_asciicompat(resenc)) resenc = rb_usascii_encoding();
rb_enc_associate(result, resenc);
@@ -4529,24 +4172,6 @@ rb_str_inspect(VALUE str)
p = RSTRING_PTR(str); pend = RSTRING_END(str);
prev = p;
- if (enc == utf16) {
- const unsigned char *q = (const unsigned char *)p;
- if (q[0] == 0xFE && q[1] == 0xFF)
- enc = rb_enc_find("UTF-16BE");
- else if (q[0] == 0xFF && q[1] == 0xFE)
- enc = rb_enc_find("UTF-16LE");
- else
- unicode_p = 0;
- }
- else if (enc == utf32) {
- const unsigned char *q = (const unsigned char *)p;
- if (q[0] == 0 && q[1] == 0 && q[2] == 0xFE && q[3] == 0xFF)
- enc = rb_enc_find("UTF-32BE");
- else if (q[3] == 0 && q[2] == 0 && q[1] == 0xFE && q[0] == 0xFF)
- enc = rb_enc_find("UTF-32LE");
- else
- unicode_p = 0;
- }
while (p < pend) {
unsigned int c, cc;
int n;
@@ -4567,13 +4192,12 @@ rb_str_inspect(VALUE str)
n = MBCLEN_CHARFOUND_LEN(n);
c = rb_enc_mbc_to_codepoint(p, pend, enc);
p += n;
- if ((asciicompat || unicode_p) &&
- (c == '"'|| c == '\\' ||
+ if (c == '"'|| c == '\\' ||
(c == '#' &&
p < pend &&
MBCLEN_CHARFOUND_P(rb_enc_precise_mbclen(p,pend,enc)) &&
(cc = rb_enc_codepoint(p,pend,enc),
- (cc == '$' || cc == '@' || cc == '{'))))) {
+ (cc == '$' || cc == '@' || cc == '{')))) {
if (p - n > prev) str_buf_cat(result, prev, p - n - prev);
str_buf_cat2(result, "\\");
if (asciicompat || enc == resenc) {
@@ -4624,10 +4248,8 @@ rb_str_inspect(VALUE str)
* call-seq:
* str.dump -> new_str
*
- * Produces a version of +str+ with all non-printing characters replaced by
+ * Produces a version of <i>str</i> with all nonprinting characters replaced by
* <code>\nnn</code> notation and all special characters escaped.
- *
- * "hello \n ''".dump #=> "\"hello \\n ''\"
*/
VALUE
@@ -5010,7 +4632,7 @@ rb_str_capitalize(VALUE str)
/*
* call-seq:
- * str.swapcase! -> str or nil
+* str.swapcase! -> str or nil
*
* Equivalent to <code>String#swapcase</code>, but modifies the receiver in
* place, returning <i>str</i>, or <code>nil</code> if no changes were made.
@@ -5085,15 +4707,14 @@ trnext(struct tr *t, rb_encoding *enc)
for (;;) {
if (!t->gen) {
-nextpart:
if (t->p == t->pend) return -1;
- if (rb_enc_ascget(t->p, t->pend, &n, enc) == '\\' && t->p + n < t->pend) {
- t->p += n;
+ if (t->p < t->pend - 1 && *t->p == '\\') {
+ t->p++;
}
t->now = rb_enc_codepoint_len(t->p, t->pend, &n, enc);
t->p += n;
- if (rb_enc_ascget(t->p, t->pend, &n, enc) == '-' && t->p + n < t->pend) {
- t->p += n;
+ if (t->p < t->pend - 1 && *t->p == '-') {
+ t->p++;
if (t->p < t->pend) {
unsigned int c = rb_enc_codepoint_len(t->p, t->pend, &n, enc);
t->p += n;
@@ -5114,20 +4735,12 @@ nextpart:
}
return t->now;
}
+ else if (++t->now < t->max) {
+ return t->now;
+ }
else {
- while (ONIGENC_CODE_TO_MBCLEN(enc, ++t->now) <= 0) {
- if (t->now == t->max) {
- t->gen = 0;
- goto nextpart;
- }
- }
- if (t->now < t->max) {
- return t->now;
- }
- else {
- t->gen = 0;
- return t->max;
- }
+ t->gen = 0;
+ return t->max;
}
}
}
@@ -5142,8 +4755,8 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
rb_encoding *enc, *e1, *e2;
struct tr trsrc, trrepl;
int cflag = 0;
- unsigned int c, c0, last = 0;
- int modify = 0, i, l;
+ unsigned int c, c0;
+ int last = 0, modify = 0, i, l;
char *s, *send;
VALUE hash = 0;
int singlebyte = single_byte_optimizable(str);
@@ -5333,7 +4946,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
else c = NUM2INT(tmp);
}
else {
- c = cflag ? last : errc;
+ c = errc;
}
if (c != errc) {
tlen = rb_enc_codelen(c, enc);
@@ -5397,37 +5010,19 @@ rb_str_tr_bang(VALUE str, VALUE src, VALUE repl)
/*
* call-seq:
- * str.tr(from_str, to_str) => new_str
+ * str.tr(from_str, to_str) -> new_str
*
- * Returns a copy of +str+ with the characters in +from_str+ replaced by the
- * corresponding characters in +to_str+. If +to_str+ is shorter than
- * +from_str+, it is padded with its last character in order to maintain the
- * correspondence.
+ * Returns a copy of <i>str</i> with the characters in <i>from_str</i> replaced
+ * by the corresponding characters in <i>to_str</i>. If <i>to_str</i> is
+ * shorter than <i>from_str</i>, it is padded with its last character. Both
+ * strings may use the c1--c2 notation to denote ranges of characters, and
+ * <i>from_str</i> may start with a <code>^</code>, which denotes all
+ * characters except those listed.
*
- * "hello".tr('el', 'ip') #=> "hippo"
* "hello".tr('aeiou', '*') #=> "h*ll*"
- * "hello".tr('aeiou', 'AA*') #=> "hAll*"
- *
- * Both strings may use the <code>c1-c2</code> notation to denote ranges of
- * characters, and +from_str+ may start with a <code>^</code>, which denotes
- * all characters except those listed.
- *
- * "hello".tr('a-y', 'b-z') #=> "ifmmp"
* "hello".tr('^aeiou', '*') #=> "*e**o"
- *
- * The backslash character <code>\</code> can be used to escape
- * <code>^</code> or <code>-</code> and is otherwise ignored unless it
- * appears at the end of a range or the end of the +from_str+ or +to_str+:
- *
- * "hello^world".tr("\\^aeiou", "*") #=> "h*ll**w*rld"
- * "hello-world".tr("a\\-eo", "*") #=> "h*ll**w*rld"
- *
- * "hello\r\nworld".tr("\r", "") #=> "hello\nworld"
- * "hello\r\nworld".tr("\\r", "") #=> "hello\r\nwold"
- * "hello\r\nworld".tr("\\\r", "") #=> "hello\nworld"
- *
- * "X['\\b']".tr("X\\", "") #=> "['b']"
- * "X['\\b']".tr("X-\\]", "") #=> "'b'"
+ * "hello".tr('el', 'ip') #=> "hippo"
+ * "hello".tr('a-y', 'b-z') #=> "ifmmp"
*/
static VALUE
@@ -5438,9 +5033,8 @@ rb_str_tr(VALUE str, VALUE src, VALUE repl)
return str;
}
-#define TR_TABLE_SIZE 257
static void
-tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
+tr_setup_table(VALUE str, char stable[256], int first,
VALUE *tablep, VALUE *ctablep, rb_encoding *enc)
{
const unsigned int errc = -1;
@@ -5456,15 +5050,20 @@ tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
if (RSTRING_LEN(str) > 1 && rb_enc_ascget(tr.p, tr.pend, &l, enc) == '^') {
cflag = 1;
tr.p += l;
+
+ table = rb_hash_new();
+ ptable = *ctablep;
+ *ctablep = table;
+ }
+ else {
+ table = rb_hash_new();
+ ptable = *tablep;
+ *tablep = table;
}
if (first) {
for (i=0; i<256; i++) {
stable[i] = 1;
}
- stable[256] = cflag;
- }
- else if (stable[256] && !cflag) {
- stable[256] = 0;
}
for (i=0; i<256; i++) {
buf[i] = cflag;
@@ -5477,19 +5076,12 @@ tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
else {
VALUE key = UINT2NUM(c);
- if (!table && (first || *tablep || stable[256])) {
- if (cflag) {
- ptable = *ctablep;
- table = ptable ? ptable : rb_hash_new();
- *ctablep = table;
- }
- else {
- table = rb_hash_new();
- ptable = *tablep;
- *tablep = table;
- }
+ if (!table) {
+ table = rb_hash_new();
+ ptable = *tablep;
+ *tablep = table;
}
- if (table && (!ptable || (cflag ^ !NIL_P(rb_hash_aref(ptable, key))))) {
+ if (!ptable || !NIL_P(rb_hash_aref(ptable, key))) {
rb_hash_aset(table, key, Qtrue);
}
}
@@ -5497,14 +5089,11 @@ tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
for (i=0; i<256; i++) {
stable[i] = stable[i] && buf[i];
}
- if (!table && !cflag) {
- *tablep = 0;
- }
}
static int
-tr_find(unsigned int c, char table[TR_TABLE_SIZE], VALUE del, VALUE nodel)
+tr_find(unsigned int c, char table[256], VALUE del, VALUE nodel)
{
if (c < 256) {
return table[c] != 0;
@@ -5518,10 +5107,10 @@ tr_find(unsigned int c, char table[TR_TABLE_SIZE], VALUE del, VALUE nodel)
return TRUE;
}
}
- else if (nodel && !NIL_P(rb_hash_lookup(nodel, v))) {
- return FALSE;
+ else if (nodel && NIL_P(rb_hash_lookup(nodel, v))) {
+ return TRUE;
}
- return table[256] ? TRUE : FALSE;
+ return FALSE;
}
}
@@ -5536,7 +5125,7 @@ tr_find(unsigned int c, char table[TR_TABLE_SIZE], VALUE del, VALUE nodel)
static VALUE
rb_str_delete_bang(int argc, VALUE *argv, VALUE str)
{
- char squeez[TR_TABLE_SIZE];
+ char squeez[256];
rb_encoding *enc = 0;
char *s, *send, *t;
VALUE del = 0, nodel = 0;
@@ -5544,7 +5133,9 @@ rb_str_delete_bang(int argc, VALUE *argv, VALUE str)
int i, ascompat, cr;
if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil;
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+ if (argc < 1) {
+ rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+ }
for (i=0; i<argc; i++) {
VALUE s = argv[i];
@@ -5629,7 +5220,7 @@ rb_str_delete(int argc, VALUE *argv, VALUE str)
static VALUE
rb_str_squeeze_bang(int argc, VALUE *argv, VALUE str)
{
- char squeez[TR_TABLE_SIZE];
+ char squeez[256];
rb_encoding *enc = 0;
VALUE del = 0, nodel = 0;
char *s, *send, *t;
@@ -5766,53 +5357,40 @@ rb_str_tr_s(VALUE str, VALUE src, VALUE repl)
* call-seq:
* str.count([other_str]+) -> fixnum
*
- * Each +other_str+ parameter defines a set of characters to count. The
- * intersection of these sets defines the characters to count in +str+. Any
- * +other_str+ that starts with a caret <code>^</code> is negated. The
- * sequence <code>c1-c2</code> means all characters between c1 and c2. The
- * backslash character <code>\</code> can be used to escape <code>^</code> or
- * <code>-</code> and is otherwise ignored unless it appears at the end of a
- * sequence or the end of a +other_str+.
+ * Each <i>other_str</i> parameter defines a set of characters to count. The
+ * intersection of these sets defines the characters to count in
+ * <i>str</i>. Any <i>other_str</i> that starts with a caret (^) is
+ * negated. The sequence c1--c2 means all characters between c1 and c2.
*
* a = "hello world"
- * a.count "lo" #=> 5
- * a.count "lo", "o" #=> 2
- * a.count "hello", "^l" #=> 4
- * a.count "ej-m" #=> 4
- *
- * "hello^world".count "\\^aeiou" #=> 4
- * "hello-world".count "a\\-eo" #=> 4
- *
- * c = "hello world\\r\\n"
- * c.count "\\" #=> 2
- * c.count "\\A" #=> 0
- * c.count "X-\\w" #=> 3
+ * a.count "lo" #=> 5
+ * a.count "lo", "o" #=> 2
+ * a.count "hello", "^l" #=> 4
+ * a.count "ej-m" #=> 4
*/
static VALUE
rb_str_count(int argc, VALUE *argv, VALUE str)
{
- char table[TR_TABLE_SIZE];
+ char table[256];
rb_encoding *enc = 0;
- VALUE del = 0, nodel = 0, tstr;
+ VALUE del = 0, nodel = 0;
char *s, *send;
int i;
int ascompat;
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-
- tstr = argv[0];
- StringValue(tstr);
- enc = rb_enc_check(str, tstr);
- if (argc == 1) {
- const char *ptstr;
- if (RSTRING_LEN(tstr) == 1 && rb_enc_asciicompat(enc) &&
- (ptstr = RSTRING_PTR(tstr),
- ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc, (const unsigned char *)ptstr, (const unsigned char *)ptstr+1)) &&
- !is_broken_string(str)) {
+ if (argc < 1) {
+ rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
+ }
+ for (i=0; i<argc; i++) {
+ VALUE tstr = argv[i];
+ unsigned char c;
+
+ StringValue(tstr);
+ enc = rb_enc_check(str, tstr);
+ if (argc == 1 && RSTRING_LEN(tstr) == 1 && rb_enc_asciicompat(enc) &&
+ (c = RSTRING_PTR(tstr)[0]) < 0x80 && !is_broken_string(str)) {
int n = 0;
- int clen;
- unsigned char c = rb_enc_codepoint_len(ptstr, ptstr+1, &clen, enc);
s = RSTRING_PTR(str);
if (!s || RSTRING_LEN(str) == 0) return INT2FIX(0);
@@ -5822,14 +5400,7 @@ rb_str_count(int argc, VALUE *argv, VALUE str)
}
return INT2NUM(n);
}
- }
-
- tr_setup_table(tstr, table, TRUE, &del, &nodel, enc);
- for (i=1; i<argc; i++) {
- tstr = argv[i];
- StringValue(tstr);
- enc = rb_enc_check(str, tstr);
- tr_setup_table(tstr, table, FALSE, &del, &nodel, enc);
+ tr_setup_table(tstr, table, i==0, &del, &nodel, enc);
}
s = RSTRING_PTR(str);
@@ -5908,9 +5479,6 @@ static const char isspacetable[256] = {
* limit to the number of fields returned, and trailing null fields are not
* suppressed.
*
- * When the input +str+ is empty an empty Array is returned as the string is
- * considered to have no fields to split.
- *
* " now's the time".split #=> ["now's", "the", "time"]
* " now's the time".split(' ') #=> ["now's", "the", "time"]
* " now's the time".split(/ /) #=> ["", "now's", "", "the", "time"]
@@ -5923,8 +5491,6 @@ static const char isspacetable[256] = {
* "1,2,,3,4,,".split(',') #=> ["1", "2", "", "3", "4"]
* "1,2,,3,4,,".split(',', 4) #=> ["1", "2", "", "3,4,,"]
* "1,2,,3,4,,".split(',', -4) #=> ["1", "2", "", "3", "4", "", ""]
- *
- * "".split(',', -1) #=> []
*/
static VALUE
@@ -5959,7 +5525,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str)
}
else {
fs_set:
- if (RB_TYPE_P(spat, T_STRING)) {
+ if (TYPE(spat) == T_STRING) {
rb_encoding *enc2 = STR_ENC_GET(spat);
split_type = string;
@@ -6153,8 +5719,45 @@ rb_str_split(VALUE str, const char *sep0)
}
+/*
+ * call-seq:
+ * str.each_line(separator=$/) {|substr| block } -> str
+ * str.each_line(separator=$/) -> an_enumerator
+ *
+ * str.lines(separator=$/) {|substr| block } -> str
+ * str.lines(separator=$/) -> an_enumerator
+ *
+ * Splits <i>str</i> using the supplied parameter as the record separator
+ * (<code>$/</code> by default), passing each substring in turn to the supplied
+ * block. If a zero-length record separator is supplied, the string is split
+ * into paragraphs delimited by multiple successive newlines.
+ *
+ * If no block is given, an enumerator is returned instead.
+ *
+ * print "Example one\n"
+ * "hello\nworld".each_line {|s| p s}
+ * print "Example two\n"
+ * "hello\nworld".each_line('l') {|s| p s}
+ * print "Example three\n"
+ * "hello\n\n\nworld".each_line('') {|s| p s}
+ *
+ * <em>produces:</em>
+ *
+ * Example one
+ * "hello\n"
+ * "world"
+ * Example two
+ * "hel"
+ * "l"
+ * "o\nworl"
+ * "d"
+ * Example three
+ * "hello\n\n\n"
+ * "world"
+ */
+
static VALUE
-rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
+rb_str_each_line(int argc, VALUE *argv, VALUE str)
{
rb_encoding *enc;
VALUE rs;
@@ -6164,7 +5767,6 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
VALUE line;
int n;
VALUE orig = str;
- VALUE UNINITIALIZED_VAR(ary);
if (argc == 0) {
rs = rb_rs;
@@ -6172,34 +5774,10 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
else {
rb_scan_args(argc, argv, "01", &rs);
}
-
- if (rb_block_given_p()) {
- if (wantarray) {
-#if 0 /* next major */
- rb_warn("given block not used");
- ary = rb_ary_new();
-#else
- rb_warning("passing a block to String#lines is deprecated");
- wantarray = 0;
-#endif
- }
- }
- else {
- if (wantarray)
- ary = rb_ary_new();
- else
- RETURN_ENUMERATOR(str, argc, argv);
- }
-
+ RETURN_ENUMERATOR(str, argc, argv);
if (NIL_P(rs)) {
- if (wantarray) {
- rb_ary_push(ary, str);
- return ary;
- }
- else {
- rb_yield(str);
- return orig;
- }
+ rb_yield(str);
+ return orig;
}
str = rb_str_new4(str);
ptr = p = s = RSTRING_PTR(str);
@@ -6219,11 +5797,10 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
continue;
}
p = p0 + rb_enc_mbclen(p0, pend, enc);
- line = rb_str_subseq(str, s - ptr, p - s);
- if (wantarray)
- rb_ary_push(ary, line);
- else
- rb_yield(line);
+ line = rb_str_new5(str, s, p - s);
+ OBJ_INFECT(line, str);
+ rb_enc_cr_str_copy_for_substr(line, str);
+ rb_yield(line);
str_mod_check(str, ptr, len);
s = p;
}
@@ -6256,216 +5833,86 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
if (c == newline &&
(rslen <= 1 ||
(pend - p >= rslen && memcmp(RSTRING_PTR(rs), p, rslen) == 0))) {
- const char *pp = p + (rslen ? rslen : n);
- line = rb_str_subseq(str, s - ptr, pp - s);
- if (wantarray)
- rb_ary_push(ary, line);
- else
- rb_yield(line);
+ line = rb_str_new5(str, s, p - s + (rslen ? rslen : n));
+ OBJ_INFECT(line, str);
+ rb_enc_cr_str_copy_for_substr(line, str);
+ rb_yield(line);
str_mod_check(str, ptr, len);
- s = pp;
+ s = p + (rslen ? rslen : n);
}
p += n;
}
finish:
if (s != pend) {
- line = rb_str_subseq(str, s - ptr, pend - s);
- if (wantarray)
- rb_ary_push(ary, line);
- else
- rb_yield(line);
- RB_GC_GUARD(str);
+ line = rb_str_new5(str, s, pend - s);
+ OBJ_INFECT(line, str);
+ rb_enc_cr_str_copy_for_substr(line, str);
+ rb_yield(line);
}
- if (wantarray)
- return ary;
- else
- return orig;
+ return orig;
}
+
/*
* call-seq:
- * str.each_line(separator=$/) {|substr| block } -> str
- * str.each_line(separator=$/) -> an_enumerator
+ * str.bytes {|fixnum| block } -> str
+ * str.bytes -> an_enumerator
*
- * Splits <i>str</i> using the supplied parameter as the record
- * separator (<code>$/</code> by default), passing each substring in
- * turn to the supplied block. If a zero-length record separator is
- * supplied, the string is split into paragraphs delimited by
- * multiple successive newlines.
+ * str.each_byte {|fixnum| block } -> str
+ * str.each_byte -> an_enumerator
*
- * If no block is given, an enumerator is returned instead.
+ * Passes each byte in <i>str</i> to the given block, or returns
+ * an enumerator if no block is given.
*
- * print "Example one\n"
- * "hello\nworld".each_line {|s| p s}
- * print "Example two\n"
- * "hello\nworld".each_line('l') {|s| p s}
- * print "Example three\n"
- * "hello\n\n\nworld".each_line('') {|s| p s}
+ * "hello".each_byte {|c| print c, ' ' }
*
* <em>produces:</em>
*
- * Example one
- * "hello\n"
- * "world"
- * Example two
- * "hel"
- * "l"
- * "o\nworl"
- * "d"
- * Example three
- * "hello\n\n\n"
- * "world"
- */
-
-static VALUE
-rb_str_each_line(int argc, VALUE *argv, VALUE str)
-{
- return rb_str_enumerate_lines(argc, argv, str, 0);
-}
-
-/*
- * call-seq:
- * str.lines(separator=$/) -> an_array
- *
- * Returns an array of lines in <i>str</i> split using the supplied
- * record separator (<code>$/</code> by default). This is a
- * shorthand for <code>str.each_line(separator).to_a</code>.
- *
- * If a block is given, which is a deprecated form, works the same as
- * <code>each_line</code>.
+ * 104 101 108 108 111
*/
static VALUE
-rb_str_lines(int argc, VALUE *argv, VALUE str)
-{
- return rb_str_enumerate_lines(argc, argv, str, 1);
-}
-
-static VALUE
-rb_str_each_byte_size(VALUE str, VALUE args)
-{
- return LONG2FIX(RSTRING_LEN(str));
-}
-
-static VALUE
-rb_str_enumerate_bytes(VALUE str, int wantarray)
+rb_str_each_byte(VALUE str)
{
long i;
- VALUE UNINITIALIZED_VAR(ary);
-
- if (rb_block_given_p()) {
- if (wantarray) {
-#if 0 /* next major */
- rb_warn("given block not used");
- ary = rb_ary_new();
-#else
- rb_warning("passing a block to String#bytes is deprecated");
- wantarray = 0;
-#endif
- }
- }
- else {
- if (wantarray)
- ary = rb_ary_new2(RSTRING_LEN(str));
- else
- RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_byte_size);
- }
+ RETURN_ENUMERATOR(str, 0, 0);
for (i=0; i<RSTRING_LEN(str); i++) {
- if (wantarray)
- rb_ary_push(ary, INT2FIX(RSTRING_PTR(str)[i] & 0xff));
- else
- rb_yield(INT2FIX(RSTRING_PTR(str)[i] & 0xff));
+ rb_yield(INT2FIX(RSTRING_PTR(str)[i] & 0xff));
}
- if (wantarray)
- return ary;
- else
- return str;
+ return str;
}
+
/*
* call-seq:
- * str.each_byte {|fixnum| block } -> str
- * str.each_byte -> an_enumerator
+ * str.chars {|cstr| block } -> str
+ * str.chars -> an_enumerator
*
- * Passes each byte in <i>str</i> to the given block, or returns an
- * enumerator if no block is given.
- *
- * "hello".each_byte {|c| print c, ' ' }
+ * str.each_char {|cstr| block } -> str
+ * str.each_char -> an_enumerator
*
- * <em>produces:</em>
+ * Passes each character in <i>str</i> to the given block, or returns
+ * an enumerator if no block is given.
*
- * 104 101 108 108 111
- */
-
-static VALUE
-rb_str_each_byte(VALUE str)
-{
- return rb_str_enumerate_bytes(str, 0);
-}
-
-/*
- * call-seq:
- * str.bytes -> an_array
+ * "hello".each_char {|c| print c, ' ' }
*
- * Returns an array of bytes in <i>str</i>. This is a shorthand for
- * <code>str.each_byte.to_a</code>.
+ * <em>produces:</em>
*
- * If a block is given, which is a deprecated form, works the same as
- * <code>each_byte</code>.
+ * h e l l o
*/
static VALUE
-rb_str_bytes(VALUE str)
-{
- return rb_str_enumerate_bytes(str, 1);
-}
-
-static VALUE
-rb_str_each_char_size(VALUE str)
-{
- long len = RSTRING_LEN(str);
- if (!single_byte_optimizable(str)) {
- const char *ptr = RSTRING_PTR(str);
- rb_encoding *enc = rb_enc_get(str);
- const char *end_ptr = ptr + len;
- for (len = 0; ptr < end_ptr; ++len) {
- ptr += rb_enc_mbclen(ptr, end_ptr, enc);
- }
- }
- return LONG2FIX(len);
-}
-
-static VALUE
-rb_str_enumerate_chars(VALUE str, int wantarray)
+rb_str_each_char(VALUE str)
{
VALUE orig = str;
- VALUE substr;
long i, len, n;
const char *ptr;
rb_encoding *enc;
- VALUE UNINITIALIZED_VAR(ary);
-
- if (rb_block_given_p()) {
- if (wantarray) {
-#if 0 /* next major */
- rb_warn("given block not used");
- ary = rb_ary_new();
-#else
- rb_warning("passing a block to String#chars is deprecated");
- wantarray = 0;
-#endif
- }
- }
- else {
- if (wantarray)
- ary = rb_ary_new();
- else
- RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
- }
+ RETURN_ENUMERATOR(str, 0, 0);
str = rb_str_new4(str);
ptr = RSTRING_PTR(str);
len = RSTRING_LEN(str);
@@ -6475,162 +5922,64 @@ rb_str_enumerate_chars(VALUE str, int wantarray)
case ENC_CODERANGE_7BIT:
for (i = 0; i < len; i += n) {
n = rb_enc_fast_mbclen(ptr + i, ptr + len, enc);
- substr = rb_str_subseq(str, i, n);
- if (wantarray)
- rb_ary_push(ary, substr);
- else
- rb_yield(substr);
+ rb_yield(rb_str_subseq(str, i, n));
}
break;
default:
for (i = 0; i < len; i += n) {
n = rb_enc_mbclen(ptr + i, ptr + len, enc);
- substr = rb_str_subseq(str, i, n);
- if (wantarray)
- rb_ary_push(ary, substr);
- else
- rb_yield(substr);
+ rb_yield(rb_str_subseq(str, i, n));
}
}
- RB_GC_GUARD(str);
- if (wantarray)
- return ary;
- else
- return orig;
+ return orig;
}
/*
* call-seq:
- * str.each_char {|cstr| block } -> str
- * str.each_char -> an_enumerator
+ * str.codepoints {|integer| block } -> str
+ * str.codepoints -> an_enumerator
*
- * Passes each character in <i>str</i> to the given block, or returns
- * an enumerator if no block is given.
+ * str.each_codepoint {|integer| block } -> str
+ * str.each_codepoint -> an_enumerator
*
- * "hello".each_char {|c| print c, ' ' }
+ * Passes the <code>Integer</code> ordinal of each character in <i>str</i>,
+ * also known as a <i>codepoint</i> when applied to Unicode strings to the
+ * given block.
*
- * <em>produces:</em>
+ * If no block is given, an enumerator is returned instead.
*
- * h e l l o
- */
-
-static VALUE
-rb_str_each_char(VALUE str)
-{
- return rb_str_enumerate_chars(str, 0);
-}
-
-/*
- * call-seq:
- * str.chars -> an_array
+ * "hello\u0639".each_codepoint {|c| print c, ' ' }
*
- * Returns an array of characters in <i>str</i>. This is a shorthand
- * for <code>str.each_char.to_a</code>.
+ * <em>produces:</em>
*
- * If a block is given, which is a deprecated form, works the same as
- * <code>each_char</code>.
+ * 104 101 108 108 111 1593
*/
static VALUE
-rb_str_chars(VALUE str)
-{
- return rb_str_enumerate_chars(str, 1);
-}
-
-
-static VALUE
-rb_str_enumerate_codepoints(VALUE str, int wantarray)
+rb_str_each_codepoint(VALUE str)
{
VALUE orig = str;
+ long len;
int n;
unsigned int c;
const char *ptr, *end;
rb_encoding *enc;
- VALUE UNINITIALIZED_VAR(ary);
-
- if (single_byte_optimizable(str))
- return rb_str_enumerate_bytes(str, wantarray);
-
- if (rb_block_given_p()) {
- if (wantarray) {
-#if 0 /* next major */
- rb_warn("given block not used");
- ary = rb_ary_new();
-#else
- rb_warning("passing a block to String#codepoints is deprecated");
- wantarray = 0;
-#endif
- }
- }
- else {
- if (wantarray)
- ary = rb_ary_new();
- else
- RETURN_SIZED_ENUMERATOR(str, 0, 0, rb_str_each_char_size);
- }
+ if (single_byte_optimizable(str)) return rb_str_each_byte(str);
+ RETURN_ENUMERATOR(str, 0, 0);
str = rb_str_new4(str);
ptr = RSTRING_PTR(str);
+ len = RSTRING_LEN(str);
end = RSTRING_END(str);
enc = STR_ENC_GET(str);
while (ptr < end) {
c = rb_enc_codepoint_len(ptr, end, &n, enc);
- if (wantarray)
- rb_ary_push(ary, UINT2NUM(c));
- else
- rb_yield(UINT2NUM(c));
+ rb_yield(UINT2NUM(c));
ptr += n;
}
- RB_GC_GUARD(str);
- if (wantarray)
- return ary;
- else
- return orig;
+ return orig;
}
-/*
- * call-seq:
- * str.each_codepoint {|integer| block } -> str
- * str.each_codepoint -> an_enumerator
- *
- * Passes the <code>Integer</code> ordinal of each character in <i>str</i>,
- * also known as a <i>codepoint</i> when applied to Unicode strings to the
- * given block.
- *
- * If no block is given, an enumerator is returned instead.
- *
- * "hello\u0639".each_codepoint {|c| print c, ' ' }
- *
- * <em>produces:</em>
- *
- * 104 101 108 108 111 1593
- */
-
-static VALUE
-rb_str_each_codepoint(VALUE str)
-{
- return rb_str_enumerate_codepoints(str, 0);
-}
-
-/*
- * call-seq:
- * str.codepoints -> an_array
- *
- * Returns an array of the <code>Integer</code> ordinals of the
- * characters in <i>str</i>. This is a shorthand for
- * <code>str.each_codepoint.to_a</code>.
- *
- * If a block is given, which is a deprecated form, works the same as
- * <code>each_codepoint</code>.
- */
-
-static VALUE
-rb_str_codepoints(VALUE str)
-{
- return rb_str_enumerate_codepoints(str, 1);
-}
-
-
static long
chopped_length(VALUE str)
{
@@ -6696,7 +6045,10 @@ rb_str_chop_bang(VALUE str)
static VALUE
rb_str_chop(VALUE str)
{
- return rb_str_subseq(str, 0, chopped_length(str));
+ VALUE str2 = rb_str_new5(str, RSTRING_PTR(str), chopped_length(str));
+ rb_enc_cr_str_copy_for_substr(str2, str);
+ OBJ_INFECT(str2, str);
+ return str2;
}
@@ -6817,18 +6169,15 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str)
* from the end of <i>str</i> (if present). If <code>$/</code> has not been
* changed from the default Ruby record separator, then <code>chomp</code> also
* removes carriage return characters (that is it will remove <code>\n</code>,
- * <code>\r</code>, and <code>\r\n</code>). If <code>$/</code> is an empty string,
- * it will remove all trailing newlines from the string.
- *
- * "hello".chomp #=> "hello"
- * "hello\n".chomp #=> "hello"
- * "hello\r\n".chomp #=> "hello"
- * "hello\n\r".chomp #=> "hello\n"
- * "hello\r".chomp #=> "hello"
- * "hello \n there".chomp #=> "hello \n there"
- * "hello".chomp("llo") #=> "he"
- * "hello\r\n\r\n".chomp('') #=> "hello"
- * "hello\r\n\r\r\n".chomp('') #=> "hello\r\n\r"
+ * <code>\r</code>, and <code>\r\n</code>).
+ *
+ * "hello".chomp #=> "hello"
+ * "hello\n".chomp #=> "hello"
+ * "hello\r\n".chomp #=> "hello"
+ * "hello\n\r".chomp #=> "hello\n"
+ * "hello\r".chomp #=> "hello"
+ * "hello \n there".chomp #=> "hello \n there"
+ * "hello".chomp("llo") #=> "he"
*/
static VALUE
@@ -7126,6 +6475,11 @@ rb_str_scan(VALUE str, VALUE pat)
static VALUE
rb_str_hex(VALUE str)
{
+ rb_encoding *enc = rb_enc_get(str);
+
+ if (!rb_enc_asciicompat(enc)) {
+ rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc));
+ }
return rb_str_to_inum(str, 16, FALSE);
}
@@ -7147,25 +6501,23 @@ rb_str_hex(VALUE str)
static VALUE
rb_str_oct(VALUE str)
{
+ rb_encoding *enc = rb_enc_get(str);
+
+ if (!rb_enc_asciicompat(enc)) {
+ rb_raise(rb_eEncCompatError, "ASCII incompatible encoding: %s", rb_enc_name(enc));
+ }
return rb_str_to_inum(str, -8, FALSE);
}
/*
* call-seq:
- * str.crypt(salt_str) -> new_str
- *
- * Applies a one-way cryptographic hash to <i>str</i> by invoking the
- * standard library function <code>crypt(3)</code> with the given
- * salt string. While the format and the result are system and
- * implementation dependent, using a salt matching the regular
- * expression <code>\A[a-zA-Z0-9./]{2}</code> should be valid and
- * safe on any platform, in which only the first two characters are
- * significant.
- *
- * This method is for use in system specific scripts, so if you want
- * a cross-platform hash function consider using Digest or OpenSSL
- * instead.
+ * str.crypt(other_str) -> new_str
+ *
+ * Applies a one-way cryptographic hash to <i>str</i> by invoking the standard
+ * library function <code>crypt</code>. The argument is the salt string, which
+ * should be two characters long, each character drawn from
+ * <code>[a-zA-Z0-9./]</code>.
*/
static VALUE
@@ -7174,7 +6526,6 @@ rb_str_crypt(VALUE str, VALUE salt)
extern char *crypt(const char *, const char *);
VALUE result;
const char *s, *saltp;
- char *res;
#ifdef BROKEN_CRYPT
char salt_8bit_clean[3];
#endif
@@ -7194,11 +6545,7 @@ rb_str_crypt(VALUE str, VALUE salt)
saltp = salt_8bit_clean;
}
#endif
- res = crypt(s, saltp);
- if (!res) {
- rb_sys_fail("crypt");
- }
- result = rb_str_new2(res);
+ result = rb_str_new2(crypt(s, saltp));
OBJ_INFECT(result, str);
OBJ_INFECT(result, salt);
return result;
@@ -7455,11 +6802,11 @@ rb_str_rjust(int argc, VALUE *argv, VALUE str)
/*
* call-seq:
- * str.center(width, padstr=' ') -> new_str
+ * str.center(integer, padstr) -> new_str
*
- * Centers +str+ in +width+. If +width+ is greater than the length of +str+,
- * returns a new String of length +width+ with +str+ centered and padded with
- * +padstr+; otherwise, returns +str+.
+ * If <i>integer</i> is greater than the length of <i>str</i>, returns a new
+ * <code>String</code> of length <i>integer</i> with <i>str</i> centered and
+ * padded with <i>padstr</i>; otherwise, returns <i>str</i>.
*
* "hello".center(4) #=> "hello"
* "hello".center(20) #=> " hello "
@@ -7493,7 +6840,7 @@ rb_str_partition(VALUE str, VALUE sep)
long pos;
int regex = FALSE;
- if (RB_TYPE_P(sep, T_REGEXP)) {
+ if (TYPE(sep) == T_REGEXP) {
pos = rb_reg_search(sep, str, 0, 0);
regex = TRUE;
}
@@ -7543,7 +6890,7 @@ rb_str_rpartition(VALUE str, VALUE sep)
long pos = RSTRING_LEN(str);
int regex = FALSE;
- if (RB_TYPE_P(sep, T_REGEXP)) {
+ if (TYPE(sep) == T_REGEXP) {
pos = rb_reg_search(sep, str, pos, 1);
regex = TRUE;
}
@@ -7572,15 +6919,18 @@ rb_str_rpartition(VALUE str, VALUE sep)
/*
* call-seq:
- * str.start_with?([prefixes]+) -> true or false
+ * str.start_with?([prefix]+) -> true or false
+ *
+ * Returns true if <i>str</i> starts with a prefix given.
+ *
+ * p "hello".start_with?("hell") #=> true
+ *
+ * # returns true if one of prefix matches.
+ * p "hello".start_with?("heaven", "hell") #=> true
+ * p "hello".start_with?("heaven", "paradice") #=> false
*
- * Returns true if +str+ starts with one of the +prefixes+ given.
*
- * "hello".start_with?("hell") #=> true
*
- * # returns true if one of the prefixes matches.
- * "hello".start_with?("heaven", "hell") #=> true
- * "hello".start_with?("heaven", "paradise") #=> false
*/
static VALUE
@@ -7589,8 +6939,8 @@ rb_str_start_with(int argc, VALUE *argv, VALUE str)
int i;
for (i=0; i<argc; i++) {
- VALUE tmp = argv[i];
- StringValue(tmp);
+ VALUE tmp = rb_check_string_type(argv[i]);
+ if (NIL_P(tmp)) continue;
rb_enc_check(str, tmp);
if (RSTRING_LEN(str) < RSTRING_LEN(tmp)) continue;
if (memcmp(RSTRING_PTR(str), RSTRING_PTR(tmp), RSTRING_LEN(tmp)) == 0)
@@ -7601,9 +6951,9 @@ rb_str_start_with(int argc, VALUE *argv, VALUE str)
/*
* call-seq:
- * str.end_with?([suffixes]+) -> true or false
+ * str.end_with?([suffix]+) -> true or false
*
- * Returns true if +str+ ends with one of the +suffixes+ given.
+ * Returns true if <i>str</i> ends with a suffix given.
*/
static VALUE
@@ -7614,8 +6964,8 @@ rb_str_end_with(int argc, VALUE *argv, VALUE str)
rb_encoding *enc;
for (i=0; i<argc; i++) {
- VALUE tmp = argv[i];
- StringValue(tmp);
+ VALUE tmp = rb_check_string_type(argv[i]);
+ if (NIL_P(tmp)) continue;
enc = rb_enc_check(str, tmp);
if (RSTRING_LEN(str) < RSTRING_LEN(tmp)) continue;
p = RSTRING_PTR(str);
@@ -7632,7 +6982,7 @@ rb_str_end_with(int argc, VALUE *argv, VALUE str)
void
rb_str_setter(VALUE val, ID id, VALUE *var)
{
- if (!NIL_P(val) && !RB_TYPE_P(val, T_STRING)) {
+ if (!NIL_P(val) && TYPE(val) != T_STRING) {
rb_raise(rb_eTypeError, "value of %s must be String", rb_id2name(id));
}
*var = val;
@@ -7657,23 +7007,6 @@ rb_str_force_encoding(VALUE str, VALUE enc)
/*
* call-seq:
- * str.b -> str
- *
- * Returns a copied string whose encoding is ASCII-8BIT.
- */
-
-static VALUE
-rb_str_b(VALUE str)
-{
- VALUE str2 = str_alloc(rb_cString);
- str_replace_shared_without_enc(str2, str);
- OBJ_INFECT(str2, str);
- ENC_CODERANGE_SET(str2, ENC_CODERANGE_VALID);
- return str2;
-}
-
-/*
- * call-seq:
* str.valid_encoding? -> true or false
*
* Returns true for a string which encoded correctly.
@@ -7709,57 +7042,6 @@ rb_str_is_ascii_only_p(VALUE str)
return cr == ENC_CODERANGE_7BIT ? Qtrue : Qfalse;
}
-/**
- * Shortens _str_ and adds three dots, an ellipsis, if it is longer
- * than _len_ characters.
- *
- * \param str the string to ellipsize.
- * \param len the maximum string length.
- * \return the ellipsized string.
- * \pre _len_ must not be negative.
- * \post the length of the returned string in characters is less than or equal to _len_.
- * \post If the length of _str_ is less than or equal _len_, returns _str_ itself.
- * \post the encoded of returned string is equal to the encoded of _str_.
- * \post the class of returned string is equal to the class of _str_.
- * \note the length is counted in characters.
- */
-VALUE
-rb_str_ellipsize(VALUE str, long len)
-{
- static const char ellipsis[] = "...";
- const long ellipsislen = sizeof(ellipsis) - 1;
- rb_encoding *const enc = rb_enc_get(str);
- const long blen = RSTRING_LEN(str);
- const char *const p = RSTRING_PTR(str), *e = p + blen;
- VALUE estr, ret = 0;
-
- if (len < 0) rb_raise(rb_eIndexError, "negative length %ld", len);
- if (len * rb_enc_mbminlen(enc) >= blen ||
- (e = rb_enc_nth(p, e, len, enc)) - p == blen) {
- ret = str;
- }
- else if (len <= ellipsislen ||
- !(e = rb_enc_step_back(p, e, e, len = ellipsislen, enc))) {
- if (rb_enc_asciicompat(enc)) {
- ret = rb_str_new_with_class(str, ellipsis, len);
- rb_enc_associate(ret, enc);
- }
- else {
- estr = rb_usascii_str_new(ellipsis, len);
- ret = rb_str_encode(estr, rb_enc_from_encoding(enc), 0, Qnil);
- }
- }
- else if (ret = rb_str_subseq(str, 0, e - p), rb_enc_asciicompat(enc)) {
- rb_str_cat(ret, ellipsis, ellipsislen);
- }
- else {
- estr = rb_str_encode(rb_usascii_str_new(ellipsis, ellipsislen),
- rb_enc_from_encoding(enc), 0, Qnil);
- rb_str_append(ret, estr);
- }
- return ret;
-}
-
/**********************************************************************
* Document-class: Symbol
*
@@ -7823,52 +7105,6 @@ sym_printable(const char *s, const char *send, rb_encoding *enc)
return TRUE;
}
-int
-rb_str_symname_p(VALUE sym)
-{
- rb_encoding *enc;
- const char *ptr;
- long len;
- rb_encoding *resenc = rb_default_internal_encoding();
-
- if (resenc == NULL) resenc = rb_default_external_encoding();
- enc = STR_ENC_GET(sym);
- ptr = RSTRING_PTR(sym);
- len = RSTRING_LEN(sym);
- if ((resenc != enc && !rb_str_is_ascii_only_p(sym)) || len != (long)strlen(ptr) ||
- !rb_enc_symname_p(ptr, enc) || !sym_printable(ptr, ptr + len, enc)) {
- return FALSE;
- }
- return TRUE;
-}
-
-VALUE
-rb_str_quote_unprintable(VALUE str)
-{
- rb_encoding *enc;
- const char *ptr;
- long len;
- rb_encoding *resenc;
-
- Check_Type(str, T_STRING);
- resenc = rb_default_internal_encoding();
- if (resenc == NULL) resenc = rb_default_external_encoding();
- enc = STR_ENC_GET(str);
- ptr = RSTRING_PTR(str);
- len = RSTRING_LEN(str);
- if ((resenc != enc && !rb_str_is_ascii_only_p(str)) ||
- !sym_printable(ptr, ptr + len, enc)) {
- return rb_str_inspect(str);
- }
- return str;
-}
-
-VALUE
-rb_id_quote_unprintable(ID id)
-{
- return rb_str_quote_unprintable(rb_id2str(id));
-}
-
/*
* call-seq:
* sym.inspect -> string
@@ -7882,13 +7118,20 @@ static VALUE
sym_inspect(VALUE sym)
{
VALUE str;
+ ID id = SYM2ID(sym);
+ rb_encoding *enc;
const char *ptr;
long len;
- ID id = SYM2ID(sym);
char *dest;
+ rb_encoding *resenc = rb_default_internal_encoding();
+ if (resenc == NULL) resenc = rb_default_external_encoding();
sym = rb_id2str(id);
- if (!rb_str_symname_p(sym)) {
+ enc = STR_ENC_GET(sym);
+ ptr = RSTRING_PTR(sym);
+ len = RSTRING_LEN(sym);
+ if ((resenc != enc && !rb_str_is_ascii_only_p(sym)) || len != (long)strlen(ptr) ||
+ !rb_enc_symname_p(ptr, enc) || !sym_printable(ptr, ptr + len, enc)) {
str = rb_str_inspect(sym);
len = RSTRING_LEN(str);
rb_str_resize(str, len + 1);
@@ -7897,9 +7140,7 @@ sym_inspect(VALUE sym)
dest[0] = ':';
}
else {
- rb_encoding *enc = STR_ENC_GET(sym);
- ptr = RSTRING_PTR(sym);
- len = RSTRING_LEN(sym);
+ char *dest;
str = rb_enc_str_new(0, len + 1, enc);
dest = RSTRING_PTR(str);
dest[0] = ':';
@@ -7945,8 +7186,10 @@ sym_to_sym(VALUE sym)
return sym;
}
+VALUE rb_funcall_passing_block(VALUE recv, ID mid, int argc, const VALUE *argv);
+
static VALUE
-sym_call(VALUE args, VALUE sym, int argc, VALUE *argv, VALUE passed_proc)
+sym_call(VALUE args, VALUE sym, int argc, VALUE *argv)
{
VALUE obj;
@@ -7954,7 +7197,7 @@ sym_call(VALUE args, VALUE sym, int argc, VALUE *argv, VALUE passed_proc)
rb_raise(rb_eArgError, "no receiver given");
}
obj = argv[0];
- return rb_funcall_with_block(obj, (ID)sym, argc - 1, argv + 1, passed_proc);
+ return rb_funcall_passing_block(obj, (ID)sym, argc - 1, argv + 1);
}
/*
@@ -8013,15 +7256,9 @@ sym_succ(VALUE sym)
/*
* call-seq:
*
- * symbol <=> other_symbol -> -1, 0, +1 or nil
- *
- * Compares +symbol+ with +other_symbol+ after calling #to_s on each of the
- * symbols. Returns -1, 0, +1 or nil depending on whether +symbol+ is less
- * than, equal to, or greater than +other_symbol+.
- *
- * +nil+ is returned if the two values are incomparable.
+ * str <=> other -> -1, 0, +1 or nil
*
- * See String#<=> for more information.
+ * Compares _sym_ with _other_ in string form.
*/
static VALUE
@@ -8172,6 +7409,7 @@ ID
rb_to_id(VALUE name)
{
VALUE tmp;
+ ID id;
switch (TYPE(name)) {
default:
@@ -8189,8 +7427,7 @@ rb_to_id(VALUE name)
case T_SYMBOL:
return SYM2ID(name);
}
-
- UNREACHABLE;
+ return id;
}
/*
@@ -8214,7 +7451,7 @@ Init_String(void)
rb_cString = rb_define_class("String", rb_cObject);
rb_include_module(rb_cString, rb_mComparable);
- rb_define_alloc_func(rb_cString, empty_str_alloc);
+ rb_define_alloc_func(rb_cString, str_alloc);
rb_define_singleton_method(rb_cString, "try_convert", rb_str_s_try_convert, 1);
rb_define_method(rb_cString, "initialize", rb_str_init, -1);
rb_define_method(rb_cString, "initialize_copy", rb_str_replace, 1);
@@ -8248,7 +7485,6 @@ Init_String(void)
rb_define_method(rb_cString, "chr", rb_str_chr, 0);
rb_define_method(rb_cString, "getbyte", rb_str_getbyte, 1);
rb_define_method(rb_cString, "setbyte", rb_str_setbyte, 2);
- rb_define_method(rb_cString, "byteslice", rb_str_byteslice, -1);
rb_define_method(rb_cString, "to_i", rb_str_to_i, -1);
rb_define_method(rb_cString, "to_f", rb_str_to_f, 0);
@@ -8270,15 +7506,14 @@ Init_String(void)
rb_define_method(rb_cString, "hex", rb_str_hex, 0);
rb_define_method(rb_cString, "oct", rb_str_oct, 0);
rb_define_method(rb_cString, "split", rb_str_split_m, -1);
- rb_define_method(rb_cString, "lines", rb_str_lines, -1);
- rb_define_method(rb_cString, "bytes", rb_str_bytes, 0);
- rb_define_method(rb_cString, "chars", rb_str_chars, 0);
- rb_define_method(rb_cString, "codepoints", rb_str_codepoints, 0);
+ rb_define_method(rb_cString, "lines", rb_str_each_line, -1);
+ rb_define_method(rb_cString, "bytes", rb_str_each_byte, 0);
+ rb_define_method(rb_cString, "chars", rb_str_each_char, 0);
+ rb_define_method(rb_cString, "codepoints", rb_str_each_codepoint, 0);
rb_define_method(rb_cString, "reverse", rb_str_reverse, 0);
rb_define_method(rb_cString, "reverse!", rb_str_reverse_bang, 0);
rb_define_method(rb_cString, "concat", rb_str_concat, 1);
rb_define_method(rb_cString, "<<", rb_str_concat, 1);
- rb_define_method(rb_cString, "prepend", rb_str_prepend, 1);
rb_define_method(rb_cString, "crypt", rb_str_crypt, 1);
rb_define_method(rb_cString, "intern", rb_str_intern, 0);
rb_define_method(rb_cString, "to_sym", rb_str_intern, 0);
@@ -8336,7 +7571,6 @@ Init_String(void)
rb_define_method(rb_cString, "encoding", rb_obj_encoding, 0); /* in encoding.c */
rb_define_method(rb_cString, "force_encoding", rb_str_force_encoding, 1);
- rb_define_method(rb_cString, "b", rb_str_b, 0);
rb_define_method(rb_cString, "valid_encoding?", rb_str_valid_encoding_p, 0);
rb_define_method(rb_cString, "ascii_only?", rb_str_is_ascii_only_p, 0);
diff --git a/struct.c b/struct.c
index 7af7944c9d..f0a377c211 100644
--- a/struct.c
+++ b/struct.c
@@ -10,7 +10,6 @@
**********************************************************************/
#include "ruby/ruby.h"
-#include "internal.h"
VALUE rb_cStruct;
static ID id_members;
@@ -43,7 +42,7 @@ rb_struct_s_members(VALUE klass)
if (NIL_P(members)) {
rb_raise(rb_eTypeError, "uninitialized struct");
}
- if (!RB_TYPE_P(members, T_ARRAY)) {
+ if (TYPE(members) != T_ARRAY) {
rb_raise(rb_eTypeError, "corrupted struct");
}
return members;
@@ -64,16 +63,25 @@ rb_struct_members(VALUE s)
static VALUE
rb_struct_s_members_m(VALUE klass)
{
- VALUE members = rb_struct_s_members(klass);
+ VALUE members, ary;
+ VALUE *p, *pend;
- return rb_ary_dup(members);
+ members = rb_struct_s_members(klass);
+ ary = rb_ary_new2(RARRAY_LEN(members));
+ p = RARRAY_PTR(members); pend = p + RARRAY_LEN(members);
+ while (p < pend) {
+ rb_ary_push(ary, *p);
+ p++;
+ }
+
+ return ary;
}
/*
* call-seq:
* struct.members -> array
*
- * Returns an array of symbols representing the names of the instance
+ * Returns an array of strings representing the names of the instance
* variables.
*
* Customer = Struct.new(:name, :address, :zip)
@@ -87,13 +95,6 @@ rb_struct_members_m(VALUE obj)
return rb_struct_s_members_m(rb_obj_class(obj));
}
-NORETURN(static void not_a_member(ID id));
-static void
-not_a_member(ID id)
-{
- rb_name_error(id, "`%"PRIsVALUE"' is not a struct member", QUOTE_ID(id));
-}
-
VALUE
rb_struct_getmember(VALUE obj, ID id)
{
@@ -110,9 +111,8 @@ rb_struct_getmember(VALUE obj, ID id)
return ptr[i];
}
}
- not_a_member(id);
-
- UNREACHABLE;
+ rb_name_error(id, "%s is not struct member", rb_id2name(id));
+ return Qnil; /* not reached */
}
static VALUE
@@ -151,8 +151,9 @@ static VALUE (*const ref_func[])(VALUE) = {
static void
rb_struct_modify(VALUE s)
{
- rb_check_frozen(s);
- rb_check_trusted(s);
+ if (OBJ_FROZEN(s)) rb_error_frozen("Struct");
+ if (!OBJ_UNTRUSTED(s) && rb_safe_level() >= 4)
+ rb_raise(rb_eSecurityError, "Insecure: can't modify Struct");
}
static VALUE
@@ -160,7 +161,6 @@ rb_struct_set(VALUE obj, VALUE val)
{
VALUE members, slot, *ptr, *ptr_members;
long i, len;
- ID fid = rb_frame_this_func();
members = rb_struct_members(obj);
ptr_members = RARRAY_PTR(members);
@@ -169,51 +169,41 @@ rb_struct_set(VALUE obj, VALUE val)
ptr = RSTRUCT_PTR(obj);
for (i=0; i<len; i++) {
slot = ptr_members[i];
- if (rb_id_attrset(SYM2ID(slot)) == fid) {
+ if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) {
return ptr[i] = val;
}
}
- not_a_member(fid);
-
- UNREACHABLE;
+ rb_name_error(rb_frame_this_func(), "`%s' is not a struct member",
+ rb_id2name(rb_frame_this_func()));
+ return Qnil; /* not reached */
}
static VALUE
-anonymous_struct(VALUE klass)
+make_struct(VALUE name, VALUE members, VALUE klass)
{
- VALUE nstr;
-
- nstr = rb_class_new(klass);
- rb_make_metaclass(nstr, RBASIC(klass)->klass);
- rb_class_inherited(klass, nstr);
- return nstr;
-}
-
-static VALUE
-new_struct(VALUE name, VALUE super)
-{
- /* old style: should we warn? */
+ VALUE nstr, *ptr_members;
ID id;
- name = rb_str_to_str(name);
- if (!rb_is_const_name(name)) {
- rb_name_error_str(name, "identifier %"PRIsVALUE" needs to be constant",
- QUOTE(name));
- }
- id = rb_to_id(name);
- if (rb_const_defined_at(super, id)) {
- rb_warn("redefining constant %"PRIsVALUE"::%"PRIsVALUE, super, name);
- rb_mod_remove_const(super, ID2SYM(id));
- }
- return rb_define_class_id_under(super, id, super);
-}
-
-static VALUE
-setup_struct(VALUE nstr, VALUE members)
-{
- VALUE *ptr_members;
long i, len;
OBJ_FREEZE(members);
+ if (NIL_P(name)) {
+ nstr = rb_class_new(klass);
+ rb_make_metaclass(nstr, RBASIC(klass)->klass);
+ rb_class_inherited(klass, nstr);
+ }
+ else {
+ /* old style: should we warn? */
+ name = rb_str_to_str(name);
+ id = rb_to_id(name);
+ if (!rb_is_const_id(id)) {
+ rb_name_error(id, "identifier %s needs to be constant", StringValuePtr(name));
+ }
+ if (rb_const_defined_at(klass, id)) {
+ rb_warn("redefining constant Struct::%s", StringValuePtr(name));
+ rb_mod_remove_const(klass, ID2SYM(id));
+ }
+ nstr = rb_define_class_id_under(klass, id, klass);
+ }
rb_ivar_set(nstr, id_members, members);
rb_define_alloc_func(nstr, struct_alloc);
@@ -224,13 +214,15 @@ setup_struct(VALUE nstr, VALUE members)
len = RARRAY_LEN(members);
for (i=0; i< len; i++) {
ID id = SYM2ID(ptr_members[i]);
- if (i < N_REF_FUNC) {
- rb_define_method_id(nstr, id, ref_func[i], 0);
- }
- else {
- rb_define_method_id(nstr, id, rb_struct_ref, 0);
+ if (rb_is_local_id(id) || rb_is_const_id(id)) {
+ if (i < N_REF_FUNC) {
+ rb_define_method_id(nstr, id, ref_func[i], 0);
+ }
+ else {
+ rb_define_method_id(nstr, id, rb_struct_ref, 0);
+ }
+ rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
}
- rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
}
return nstr;
@@ -248,10 +240,12 @@ rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_
VALUE klass;
va_list ar;
VALUE members;
+ long i;
char *name;
- members = rb_ary_tmp_new(0);
+ members = rb_ary_new2(0);
va_start(ar, alloc);
+ i = 0;
while ((name = va_arg(ar, char*)) != NULL) {
rb_ary_push(members, ID2SYM(rb_intern(name)));
}
@@ -262,7 +256,9 @@ rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_
klass = rb_define_class(class_name, super);
}
else {
- klass = anonymous_struct(super);
+ klass = rb_class_new(super);
+ rb_make_metaclass(klass, RBASIC(super)->klass);
+ rb_class_inherited(super, klass);
}
rb_ivar_set(klass, id_members, members);
@@ -279,10 +275,12 @@ VALUE
rb_struct_define(const char *name, ...)
{
va_list ar;
- VALUE st, ary;
+ VALUE nm, ary;
char *mem;
- ary = rb_ary_tmp_new(0);
+ if (!name) nm = Qnil;
+ else nm = rb_str_new2(name);
+ ary = rb_ary_new();
va_start(ar, name);
while ((mem = va_arg(ar, char*)) != 0) {
@@ -291,17 +289,14 @@ rb_struct_define(const char *name, ...)
}
va_end(ar);
- if (!name) st = anonymous_struct(rb_cStruct);
- else st = new_struct(rb_str_new2(name), rb_cStruct);
- return setup_struct(st, ary);
+ return make_struct(nm, ary, rb_cStruct);
}
/*
* call-seq:
- * Struct.new( [aString] [, aSym]+> ) -> StructClass
- * Struct.new( [aString] [, aSym]+> ) {|StructClass| block } -> StructClass
- * StructClass.new(arg, ...) -> obj
- * StructClass[arg, ...] -> obj
+ * Struct.new( [aString] [, aSym]+> ) -> StructClass
+ * StructClass.new(arg, ...) -> obj
+ * StructClass[arg, ...] -> obj
*
* Creates a new class, named by <i>aString</i>, containing accessor
* methods for the given symbols. If the name <i>aString</i> is
@@ -312,16 +307,6 @@ rb_struct_define(const char *name, ...)
* letter. Assigning a structure class to a constant effectively gives
* the class the name of the constant.
*
- * If a block is given, it will be evaluated in the context of
- * <i>StructClass</i>, passing <i>StructClass</i> as a parameter.
- *
- * Customer = Struct.new(:name, :address) do
- * def greeting
- * "Hello #{name}!"
- * end
- * end
- * Customer.new("Dave", "123 Main").greeting # => "Hello Dave!"
- *
* <code>Struct::new</code> returns a new <code>Class</code> object,
* which can then be used to create specific instances of the new
* structure. The number of actual parameters must be
@@ -349,28 +334,16 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
VALUE st;
ID id;
- rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
- name = argv[0];
- if (SYMBOL_P(name)) {
+ rb_scan_args(argc, argv, "1*", &name, &rest);
+ if (!NIL_P(name) && SYMBOL_P(name)) {
+ rb_ary_unshift(rest, name);
name = Qnil;
}
- else {
- --argc;
- ++argv;
- }
- rest = rb_ary_tmp_new(argc);
- for (i=0; i<argc; i++) {
- id = rb_to_id(argv[i]);
+ for (i=0; i<RARRAY_LEN(rest); i++) {
+ id = rb_to_id(RARRAY_PTR(rest)[i]);
RARRAY_PTR(rest)[i] = ID2SYM(id);
- rb_ary_set_len(rest, i+1);
- }
- if (NIL_P(name)) {
- st = anonymous_struct(klass);
- }
- else {
- st = new_struct(name, klass);
}
- setup_struct(st, rest);
+ st = make_struct(name, rest, klass);
if (rb_block_given_p()) {
rb_mod_module_eval(0, 0, st);
}
@@ -383,7 +356,7 @@ num_members(VALUE klass)
{
VALUE members;
members = struct_ivar_get(klass, id_members);
- if (!RB_TYPE_P(members, T_ARRAY)) {
+ if (TYPE(members) != T_ARRAY) {
rb_raise(rb_eTypeError, "broken members");
}
return RARRAY_LEN(members);
@@ -420,7 +393,8 @@ static VALUE
struct_alloc(VALUE klass)
{
long n;
- NEWOBJ_OF(st, struct RStruct, klass, T_STRUCT);
+ NEWOBJ(st, struct RStruct);
+ OBJSETUP(st, klass, T_STRUCT);
n = num_members(klass);
@@ -465,9 +439,6 @@ rb_struct_new(VALUE klass, ...)
return rb_class_new_instance(size, mem, klass);
}
-static VALUE
-rb_struct_size(VALUE s);
-
/*
* call-seq:
* struct.each {|obj| block } -> struct
@@ -494,7 +465,7 @@ rb_struct_each(VALUE s)
{
long i;
- RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
+ RETURN_ENUMERATOR(s, 0, 0);
for (i=0; i<RSTRUCT_LEN(s); i++) {
rb_yield(RSTRUCT_PTR(s)[i]);
}
@@ -528,12 +499,10 @@ rb_struct_each_pair(VALUE s)
VALUE members;
long i;
- RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
+ RETURN_ENUMERATOR(s, 0, 0);
members = rb_struct_members(s);
for (i=0; i<RSTRUCT_LEN(s); i++) {
- VALUE key = rb_ary_entry(members, i);
- VALUE value = RSTRUCT_PTR(s)[i];
- rb_yield(rb_assoc_new(key, value));
+ rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]);
}
return s;
}
@@ -617,36 +586,15 @@ rb_struct_to_a(VALUE s)
return rb_ary_new4(RSTRUCT_LEN(s), RSTRUCT_PTR(s));
}
-/*
- * call-seq:
- * struct.to_h -> hash
- *
- * Returns the values for this instance as a hash with keys
- * corresponding to the instance variable name.
- *
- * Customer = Struct.new(:name, :address, :zip)
- * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
- * joe.to_h[:address] #=> "123 Maple, Anytown NC"
- */
-
-static VALUE
-rb_struct_to_h(VALUE s)
-{
- VALUE h = rb_hash_new();
- VALUE members = rb_struct_members(s);
- long i;
-
- for (i=0; i<RSTRUCT_LEN(s); i++) {
- rb_hash_aset(h, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]);
- }
- return h;
-}
-
/* :nodoc: */
VALUE
rb_struct_init_copy(VALUE copy, VALUE s)
{
- if (!OBJ_INIT_COPY(copy, s)) return copy;
+ if (copy == s) return copy;
+ rb_check_frozen(copy);
+ if (!rb_obj_is_instance_of(s, rb_obj_class(copy))) {
+ rb_raise(rb_eTypeError, "wrong argument class");
+ }
if (RSTRUCT_LEN(copy) != RSTRUCT_LEN(s)) {
rb_raise(rb_eTypeError, "struct size mismatch");
}
@@ -671,8 +619,7 @@ rb_struct_aref_id(VALUE s, ID id)
}
}
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
-
- UNREACHABLE;
+ return Qnil; /* not reached */
}
/*
@@ -699,16 +646,8 @@ rb_struct_aref(VALUE s, VALUE idx)
{
long i;
- if (RB_TYPE_P(idx, T_SYMBOL)) {
- return rb_struct_aref_id(s, SYM2ID(idx));
- }
- else if (RB_TYPE_P(idx, T_STRING)) {
- ID id = rb_check_id(&idx);
- if (!id) {
- rb_name_error_str(idx, "no member '%"PRIsVALUE"' in struct",
- QUOTE(idx));
- }
- return rb_struct_aref_id(s, id);
+ if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
+ return rb_struct_aref_id(s, rb_to_id(idx));
}
i = NUM2LONG(idx);
@@ -744,8 +683,6 @@ rb_struct_aset_id(VALUE s, ID id, VALUE val)
}
}
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
-
- UNREACHABLE;
}
/*
@@ -774,16 +711,8 @@ rb_struct_aset(VALUE s, VALUE idx, VALUE val)
{
long i;
- if (RB_TYPE_P(idx, T_SYMBOL)) {
- return rb_struct_aset_id(s, SYM2ID(idx), val);
- }
- if (RB_TYPE_P(idx, T_STRING)) {
- ID id = rb_check_id(&idx);
- if (!id) {
- rb_name_error_str(idx, "no member '%"PRIsVALUE"' in struct",
- QUOTE(idx));
- }
- return rb_struct_aset_id(s, id, val);
+ if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
+ return rb_struct_aset_id(s, rb_to_id(idx), val);
}
i = NUM2LONG(idx);
@@ -849,8 +778,10 @@ rb_struct_select(int argc, VALUE *argv, VALUE s)
VALUE result;
long i;
- rb_check_arity(argc, 0, 0);
- RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+ }
+ RETURN_ENUMERATOR(s, 0, 0);
result = rb_ary_new();
for (i = 0; i < RSTRUCT_LEN(s); i++) {
if (RTEST(rb_yield(RSTRUCT_PTR(s)[i]))) {
@@ -898,7 +829,7 @@ static VALUE
rb_struct_equal(VALUE s, VALUE s2)
{
if (s == s2) return Qtrue;
- if (!RB_TYPE_P(s2, T_STRUCT)) return Qfalse;
+ if (TYPE(s2) != T_STRUCT) return Qfalse;
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
rb_bug("inconsistent struct"); /* should never happen */
@@ -957,7 +888,7 @@ recursive_eql(VALUE s, VALUE s2, int recur)
}
/*
- * call-seq:
+ * code-seq:
* struct.eql?(other) -> true or false
*
* Two structures are equal if they are the same object, or if all their
@@ -968,7 +899,7 @@ static VALUE
rb_struct_eql(VALUE s, VALUE s2)
{
if (s == s2) return Qtrue;
- if (!RB_TYPE_P(s2, T_STRUCT)) return Qfalse;
+ if (TYPE(s2) != T_STRUCT) return Qfalse;
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
rb_bug("inconsistent struct"); /* should never happen */
@@ -1029,7 +960,6 @@ Init_Struct(void)
rb_define_method(rb_cStruct, "inspect", rb_struct_inspect, 0);
rb_define_alias(rb_cStruct, "to_s", "inspect");
rb_define_method(rb_cStruct, "to_a", rb_struct_to_a, 0);
- rb_define_method(rb_cStruct, "to_h", rb_struct_to_h, 0);
rb_define_method(rb_cStruct, "values", rb_struct_to_a, 0);
rb_define_method(rb_cStruct, "size", rb_struct_size, 0);
rb_define_method(rb_cStruct, "length", rb_struct_size, 0);
diff --git a/symbian/configure.bat b/symbian/configure.bat
index 58a83a35fc..c9782ee652 100644
--- a/symbian/configure.bat
+++ b/symbian/configure.bat
@@ -65,11 +65,10 @@ echo>> ~ver~.mak CPP = $(CC) -E
if "%srcdir%" == "" echo>> ~ver~.mak srcdir=..
echo>> ~ver~.mak all:
echo>> ~ver~.mak ^ @echo^> ~tmp~.c #define RUBY_REVISION 0
-echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c #define RUBY_LIB_VERSION_STYLE 3
echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c #include "version.h"
-echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c MAJOR = RUBY_API_VERSION_MAJOR
-echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c MINOR = RUBY_API_VERSION_MINOR
-echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c TEENY = RUBY_API_VERSION_TEENY
+echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c MAJOR = RUBY_VERSION_MAJOR
+echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c MINOR = RUBY_VERSION_MINOR
+echo>> ~ver~.mak ^ @echo^>^> ~tmp~.c TEENY = RUBY_VERSION_TEENY
echo>> ~ver~.mak ^ @$(CPP) -I$(srcdir) -I$(srcdir)\include ~tmp~.c ^| find "=" ^>^>~tmp~.mak
echo>> ~ver~.mak ^ @del /Q ~tmp~.c
diff --git a/symbian/setup b/symbian/setup
index 74ff21c16a..54f5c30ca6 100644
--- a/symbian/setup
+++ b/symbian/setup
@@ -178,8 +178,6 @@ define config_h
@echo>>$(1) #define _THREAD_SAFE 1
@echo>>$(1) #define HAVE_LIBPTHREAD 1
@echo>>$(1) #define HAVE_NANOSLEEP 1
-@echo>>$(1) #define HAVE_LABS 1
-@echo>>$(1) #define HAVE_LLABS 1
@echo>>$(1) #define USE_ELF 1
@echo>>$(1) #define MANGLED_PATH 1
@echo>>$(1) #define DLEXT_MAXLEN 4
diff --git a/template/Doxyfile.tmpl b/template/Doxyfile.tmpl
index 6b91e20c1d..34a42983ce 100644
--- a/template/Doxyfile.tmpl
+++ b/template/Doxyfile.tmpl
@@ -9,7 +9,7 @@ end
srcdir ||= File.dirname(File.dirname(__FILE__))
load 'rbconfig.rb'
unless miniruby
- miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./-'
+ miniruby = './miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
RbConfig.expand(miniruby, RbConfig::CONFIG.merge("srcdir"=>srcdir))
end
dot = RbConfig::CONFIG['DOT'] || ""
@@ -85,6 +85,7 @@ GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = NO
SHOW_FILES = YES
SHOW_NAMESPACES = YES
LAYOUT_FILE =
@@ -102,16 +103,16 @@ WARN_LOGFILE =
# configuration options related to the input files
#---------------------------------------------------------------------------
INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c *.h *.y *.def
+FILE_PATTERNS = *.c *.h *.y *.inc
RECURSIVE = YES
-EXCLUDE = ext/dl/callback
+EXCLUDE =
EXCLUDE_SYMLINKS = YES
-EXCLUDE_PATTERNS = *.src doc enc build */ext/-test-/* tmp test yarvtest lib bootstraptest spec .ext .git .svn extconf.h *prelude.c encdb.h transdb.h insns.def
+EXCLUDE_PATTERNS = *.src doc build tmp test yarvtest lib bootstraptest spec .ext .git .svn
EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH = <%=srcdir%>/doc/images
+IMAGE_PATH = <%= "#{srcdir}/doc/images" %>
FILTER_PATTERNS =
FILTER_SOURCE_FILES = YES
#---------------------------------------------------------------------------
@@ -139,6 +140,7 @@ HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_FOOTER =
HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
HTML_DYNAMIC_SECTIONS = NO
GENERATE_DOCSET = NO
DOCSET_FEEDNAME = "Doxygen generated docs"
@@ -211,19 +213,19 @@ PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
-INCLUDE_PATH = <%=srcdir%> <%=srcdir%>/include
+INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE =
@@ -231,7 +233,7 @@ ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = NO
MSCGEN_PATH =
@@ -260,6 +262,6 @@ DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
diff --git a/template/encdb.h.tmpl b/template/encdb.h.tmpl
index 308227e9e9..4275a4c2f0 100644
--- a/template/encdb.h.tmpl
+++ b/template/encdb.h.tmpl
@@ -61,7 +61,7 @@ encdirs.each do |encdir|
raise ArgumentError,
'%s:%d: ENC_ALIAS: %s is not defined yet. (alias %s)' %
[fn, $., $2, $1] unless defs[$2.upcase]
- when /^ENC_DUMMY\w*\(\s*"([^"]+)"/
+ when /^ENC_DUMMY\(\s*"([^"]+)"/
count += 1
else
next
diff --git a/template/fake.rb.in b/template/fake.rb.in
index c94eec3516..e47cb4d759 100644..100755
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -1,12 +1,7 @@
baseruby="@BASERUBY@"
ruby="${RUBY-$baseruby}"
-"eval" "{" \
-"`expr \"$ruby\" : echo > /dev/null || echo exec`" \
-"$ruby" '-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' \
-"}" || "exit" "$?"
-ruby=ruby
+"eval" "{ `expr \"$ruby\" : echo > /dev/null || echo exec` $ruby "'-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' "}" || "exit" "$?"
class Object
- remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
CROSS_COMPILING = RUBY_PLATFORM
remove_const :RUBY_PLATFORM
remove_const :RUBY_VERSION
@@ -22,11 +17,11 @@ if RUBY_PLATFORM =~ /mswin|bccwin|mingw/
end
end
-builddir = File.expand_path(File.dirname(__FILE__))
-$:.unshift(builddir)
+$:.unshift(File.expand_path("..", __FILE__))
posthook = proc do
+ config = RbConfig::CONFIG
mkconfig = RbConfig::MAKEFILE_CONFIG
- extout = File.expand_path(mkconfig["EXTOUT"], builddir)
+ extout = File.expand_path(mkconfig["EXTOUT"], mkconfig["builddir"])
$arch_hdrdir = "#{extout}/include/$(arch)"
$ruby = baseruby
untrace_var(:$ruby, posthook)
@@ -35,9 +30,9 @@ prehook = proc do |extmk|
unless extmk
config = RbConfig::CONFIG
mkconfig = RbConfig::MAKEFILE_CONFIG
- mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@top_srcdir@", builddir)
+ mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@")
mkconfig["rubyhdrdir"] = "$(top_srcdir)/include"
- mkconfig["builddir"] = config["builddir"] = builddir
+ mkconfig["builddir"] = config["builddir"] = File.expand_path(File.dirname(__FILE__))
config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include")
mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"]
trace_var(:$ruby, posthook)
diff --git a/template/id.c.tmpl b/template/id.c.tmpl
deleted file mode 100644
index cac213a8fb..0000000000
--- a/template/id.c.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-%# -*- c -*-
-/* DO NOT EDIT THIS FILE DIRECTLY */
-/**********************************************************************
-
- id.c -
-
- $Author$
- created at: Wed Dec 5 02:36:10 2012
-
- Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-<%
-defs = File.join(File.dirname(File.dirname(erb.filename)), "defs/id.def")
-ids = eval(File.read(defs), binding, defs)
-%>
-static void
-Init_id(void)
-{
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
- rb_encoding *enc = rb_usascii_encoding();
-
-% ids[:predefined].each do |token, name|
- REGISTER_SYMID(id<%=token%>, "<%=name%>");
-% end
-}
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index c993243424..11df0507f4 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -12,18 +12,25 @@
**********************************************************************/
<%
require 'optparse'
+vpath = ["."]
+input = nil
+opt = OptionParser.new do |o|
+ o.on('-v', '--vpath=DIR') {|dirs| vpath.concat dirs.split(File::PATH_SEPARATOR)}
+ input, = o.order!(ARGV)
+end or abort opt.opt_s
-op_id_offset = 128
-
-token_op_ids = %w[
- tDOT2 tDOT3 tUPLUS tUMINUS tPOW tDSTAR tCMP tLSHFT tRSHFT
- tLEQ tGEQ tEQ tEQQ tNEQ tMATCH tNMATCH tAREF tASET
- tCOLON2 tCOLON3
-]
-
-defs = File.join(File.dirname(File.dirname(erb.filename)), "defs/id.def")
-ids = eval(File.read(defs), binding, defs)
-types = ids.keys.grep(/^[A-Z]/)
+tokens = nil
+vpath.find do |dir|
+ begin
+ if line = File.read(File.join(dir, input))[/^\s*enum\s+yytokentype\s*\{([^{}]*)\s*\};/m, 1]
+ tokens = line.scan(/\b(t(?:LAST_TOKEN|U(?:PLUS|MINUS)|POW|CMP|EQQ?|[NGL]EQ|(?:AND|OR)OP|N?MATCH|DOT\d|AREF|ASET|[LR]SHFT|LAMBDA)|id\w+)\s*=\s*(\d+),?/m)
+ end
+ rescue Errno::ENOENT
+ nil
+ else
+ true
+ end
+end
%>
#ifndef RUBY_ID_H
#define RUBY_ID_H
@@ -39,60 +46,91 @@ types = ids.keys.grep(/^[A-Z]/)
#define ID_JUNK 0x07
#define ID_INTERNAL ID_JUNK
-#define ID2ATTRSET(id) (((id)&~ID_SCOPE_MASK)|ID_ATTRSET)
+#ifdef USE_PARSE_H
+#include "parse.h"
+#endif
#define symIFUNC ID2SYM(idIFUNC)
#define symCFUNC ID2SYM(idCFUNC)
-% token_op_ids.each_with_index do |token, index|
-#define RUBY_TOKEN_<%=token[/\At(.+)\z/, 1]%> <%=op_id_offset + index%>
-% end
-#define RUBY_TOKEN(t) RUBY_TOKEN_##t
+#if !defined tLAST_TOKEN && defined YYTOKENTYPE
+#define tLAST_TOKEN tLAST_TOKEN
+#endif
enum ruby_method_ids {
- idDot2 = RUBY_TOKEN(DOT2),
- idDot3 = RUBY_TOKEN(DOT3),
- idUPlus = RUBY_TOKEN(UPLUS),
- idUMinus = RUBY_TOKEN(UMINUS),
- idPow = RUBY_TOKEN(POW),
- idCmp = RUBY_TOKEN(CMP),
+#ifndef tLAST_TOKEN
+% tokens.each do |token, value|
+ <%=token%> = <%=value%>,
+% end
+#endif
+ idDot2 = tDOT2,
+ idDot3 = tDOT3,
+ idUPlus = tUPLUS,
+ idUMinus = tUMINUS,
+ idPow = tPOW,
+ idCmp = tCMP,
idPLUS = '+',
idMINUS = '-',
idMULT = '*',
idDIV = '/',
idMOD = '%',
idLT = '<',
- idLTLT = RUBY_TOKEN(LSHFT),
- idLE = RUBY_TOKEN(LEQ),
+ idLTLT = tLSHFT,
+ idLE = tLEQ,
idGT = '>',
- idGE = RUBY_TOKEN(GEQ),
- idEq = RUBY_TOKEN(EQ),
- idEqq = RUBY_TOKEN(EQQ),
- idNeq = RUBY_TOKEN(NEQ),
+ idGE = tGEQ,
+ idEq = tEQ,
+ idEqq = tEQQ,
+ idNeq = tNEQ,
idNot = '!',
idBackquote = '`',
- idEqTilde = RUBY_TOKEN(MATCH),
- idNeqTilde = RUBY_TOKEN(NMATCH),
- idAREF = RUBY_TOKEN(AREF),
- idASET = RUBY_TOKEN(ASET),
- tPRESERVED_ID_BEGIN = <%=op_id_offset + token_op_ids.size - 1%>,
-% ids[:preserved].each do |token|
- id<%=token%>,
-% end
- tPRESERVED_ID_END,
-% ids.values_at(*types).flatten.each do |token|
- t<%=token%>,
-% end
-% types.each do |type|
-% types = ids[type] or next
-% types.empty? and next
-#define TOKEN2<%=type%>ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_<%=type%>)
-% types.each do |token|
- TOKEN2<%=type%>ID(<%=token%>),
-% end
+ idEqTilde = tMATCH,
+ idNeqTilde = tNMATCH,
+ idAREF = tAREF,
+ idASET = tASET,
+ idLAST_TOKEN = tLAST_TOKEN >> ID_SCOPE_SHIFT,
+ tIntern,
+ tMethodMissing,
+ tLength,
+ tSize,
+ tGets,
+ tSucc,
+ tEach,
+ tLambda,
+ tSend,
+ t__send__,
+ tInitialize,
+#if SUPPORT_JOKE
+ tBitblt,
+ tAnswer,
+#endif
+ tLAST_ID,
+#define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
+#if SUPPORT_JOKE
+ TOKEN2ID(Bitblt),
+ TOKEN2ID(Answer),
+#endif
+ TOKEN2ID(Intern),
+ TOKEN2ID(MethodMissing),
+ TOKEN2ID(Length),
+ TOKEN2ID(Size),
+ TOKEN2ID(Gets),
+ TOKEN2ID(Succ),
+ TOKEN2ID(Each),
+ TOKEN2ID(Lambda),
+ TOKEN2ID(Send),
+ TOKEN2ID(__send__),
+ TOKEN2ID(Initialize)
+};
+
+#ifdef tLAST_TOKEN
+struct ruby_method_ids_check {
+#define ruby_method_id_check_for(name, value) \
+ int checking_for_##name[name == value ? 1 : -1]
+% tokens.map do |token, value|
+ruby_method_id_check_for(<%=token%>, <%=value%>);
% end
- tLAST_OP_ID = tPRESERVED_ID_END-1,
- idLAST_OP_ID = tLAST_OP_ID >> ID_SCOPE_SHIFT
};
+#endif
#endif /* RUBY_ID_H */
diff --git a/template/ruby.pc.in b/template/ruby.pc.in
deleted file mode 100644
index 65a3f79857..0000000000
--- a/template/ruby.pc.in
+++ /dev/null
@@ -1,53 +0,0 @@
-arch=@arch@
-sitearch=@sitearch@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-includedir=@includedir@
-MAJOR=@MAJOR@
-MINOR=@MINOR@
-TEENY=@TEENY@
-ruby_version=@ruby_version@
-RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
-RUBY_BASE_NAME=@RUBY_BASE_NAME@
-RUBY_VERSION_NAME=@RUBY_VERSION_NAME@
-RUBY_SO_NAME=@RUBY_SO_NAME@
-RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
-DEFFILE=@DEFFILE@
-LIBPATH=@LIBPATH@
-LIBRUBY_A=@LIBRUBY_A@
-LIBRUBY_SO=@LIBRUBY_SO@
-LIBRUBY=@LIBRUBY@
-LIBRUBYARG_SHARED=@LIBRUBYARG_SHARED@
-LIBRUBYARG_STATIC=@LIBRUBYARG_STATIC@
-LIBRUBYARG=@LIBRUBYARG@
-LIBS=@LIBS@
-DLDFLAGS=@DLDFLAGS@
-archlibdir=@archlibdir@
-sitearchlibdir=@sitearchlibdir@
-archincludedir=@archincludedir@
-sitearchincludedir=@sitearchincludedir@
-ruby=${bindir}/${RUBY_INSTALL_NAME}@EXEEXT@
-rubylibprefix=@rubylibprefix@
-rubyarchprefix=@rubyarchprefix@
-rubysitearchprefix=@rubysitearchprefix@
-rubylibdir=@rubylibdir@
-vendordir=@vendordir@
-sitedir=@sitedir@
-vendorlibdir=@vendorlibdir@
-sitelibdir=@sitelibdir@
-rubyarchdir=@rubyarchdir@
-vendorarchdir=@vendorarchdir@
-sitearchdir=@sitearchdir@
-rubyhdrdir=@rubyhdrdir@
-vendorhdrdir=@vendorhdrdir@
-sitehdrdir=@sitehdrdir@
-
-Name: Ruby
-Description: Object Oriented Script Language
-Version: ${ruby_version}
-URL: http://www.ruby-lang.org
-Cflags: -I${rubyhdrdir}/${arch} -I${rubyhdrdir}
-Libs: ${DLDFLAGS} ${LIBRUBYARG_SHARED} ${LIBS}
-Requires:
diff --git a/template/yarvarch.ja b/template/yarvarch.ja
index bb90f0c0d2..c332c20811 100644
--- a/template/yarvarch.ja
+++ b/template/yarvarch.ja
@@ -1,17 +1,17 @@
-#title YARVアーキテクãƒãƒ£
-#set author 日本 Ruby ã®ä¼š ã•ã•ã ã“ã†ã„ã¡
+#title YARVƒA[ƒLƒeƒNƒ`ƒƒ
+#set author “ú–{ Ruby ‚Ì‰ï ‚³‚³‚¾‚±‚¤‚¢‚¿
-- 2005-03-03(Thu) 00:31:12 +0900 ã„ã‚ã„ã‚ã¨æ›¸ãç›´ã—
+- 2005-03-03(Thu) 00:31:12 +0900 ‚¢‚ë‚¢‚ë‚Æ‘‚«’¼‚µ
----
-* ã“れã¯ï¼Ÿ
+* ‚±‚ê‚ÍH
-[[YARV: Yet Another RubyVM|http://www.atdot.net/yarv]] 㮠設計メモã§ã™ã€‚
+[[YARV: Yet Another RubyVM|http://www.atdot.net/yarv]] ‚Ì ÝŒvƒƒ‚‚Å‚·B
-YARV ã¯ã€Ruby プログラムã®ãŸã‚ã®æ¬¡ã®æ©Ÿèƒ½ã‚’æä¾›ã—ã¾ã™ã€‚
+YARV ‚ÍARuby ƒvƒƒOƒ‰ƒ€‚Ì‚½‚߂̎Ÿ‚Ì‹@”\‚ð’ñ‹Ÿ‚µ‚Ü‚·B
- Compiler
- VM Generator
@@ -22,72 +22,72 @@ YARV ã¯ã€Ruby プログラムã®ãŸã‚ã®æ¬¡ã®æ©Ÿèƒ½ã‚’æä¾›ã—ã¾ã™ã€‚
- (experimental) AOT Compiler
-ç¾åœ¨ã® YARV 㯠Ruby ã‚¤ãƒ³ã‚¿ãƒ—ãƒªã‚¿ã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã¨ã—ã¦å®Ÿè£…ã—ã¦ã„ã¾ã™ã€‚ã“
-れã«ã‚ˆã‚Šã€Ruby インタプリタã®å¿…è¦ãªæ©Ÿèƒ½ï¼ˆãƒ‘ーサã€ã‚ªãƒ–ジェクト管ç†ã€æ—¢å­˜
-ã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリ)ãªã©ãŒã»ã¼ãã®ã¾ã¾åˆ©ç”¨ã§ãã¾ã™ã€‚
+Œ»Ý‚Ì YARV ‚Í Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚ÌŠg’£ƒ‰ƒCƒuƒ‰ƒŠ‚Æ‚µ‚ÄŽÀ‘•‚µ‚Ä‚¢‚Ü‚·B‚±
+‚ê‚É‚æ‚èARuby ƒCƒ“ƒ^ƒvƒŠƒ^‚Ì•K—v‚È‹@”\iƒp[ƒTAƒIƒuƒWƒFƒNƒgŠÇ—AŠù‘¶
+‚ÌŠg’£ƒ‰ƒCƒuƒ‰ƒŠj‚Ȃǂª‚Ù‚Ú‚»‚̂܂ܗ˜—p‚Å‚«‚Ü‚·B
-ãŸã ã—ã€ã„ãã¤ã‹ã®ãƒ‘ッãƒã‚’ Ruby インタプリタã«å½“ã¦ãªã‘れã°ãªã‚Šã¾ã›ã‚“。
+‚½‚¾‚µA‚¢‚­‚‚©‚̃pƒbƒ`‚ð Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚É“–‚ĂȂ¯‚ê‚΂Ȃè‚Ü‚¹‚ñB
-今後ã¯ã€Ruby 本体ã®ã‚¤ãƒ³ã‚¿ãƒ—リタ部分(eval.cï¼‰ã‚’ç½®ãæ›ãˆã‚‹ã“ã¨ã‚’目指ã—ã¦
-開発を継続ã™ã‚‹äºˆå®šã§ã™ã€‚
+¡Œã‚ÍARuby –{‘̂̃Cƒ“ƒ^ƒvƒŠƒ^•”•ªieval.cj‚ð’u‚«Š·‚¦‚邱‚Æ‚ð–ÚŽw‚µ‚Ä
+ŠJ”­‚ðŒp‘±‚·‚é—\’è‚Å‚·B
* Compiler (compile.h, compile.c)
-コンパイラã¯ã€Ruby インタプリタã®ãƒ‘ーサã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚ŒãŸæ§‹æ–‡æœ¨ï¼ˆRNode
-データã«ã‚ˆã‚‹æœ¨ï¼‰ã‚’ YARV 命令列ã«å¤‰æ›ã—ã¾ã™ã€‚YARV 命令ã«ã¤ã„ã¦ã¯å¾Œè¿°ã—ã¾
-ã™ã€‚
+ƒRƒ“ƒpƒCƒ‰‚ÍARuby ƒCƒ“ƒ^ƒvƒŠƒ^‚̃p[ƒT‚É‚æ‚Á‚ͬ‚³‚ꂽ\•¶–ØiRNode
+ƒf[ƒ^‚É‚æ‚é–Øj‚ð YARV –½—ß—ñ‚ɕϊ·‚µ‚Ü‚·BYARV –½—߂ɂ‚¢‚Ă͌ãq‚µ‚Ü
+‚·B
-ã¨ãã«é›£ã—ã„ã“ã¨ã¯ã—ã¦ã„ã¾ã›ã‚“ãŒã€ã‚¹ã‚³ãƒ¼ãƒ—ãªã©ã®é–‹å§‹æ™‚ã«ãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã®åˆ
-期化ãªã©ã‚’行ã„ã€ã‚ã¨ã¯æ§‹æ–‡æœ¨ã‚’辿り変æ›ã—ã¦ã„ãã¾ã™ã€‚
+‚Æ‚­‚ɓ‚¢‚±‚Ƃ͂µ‚Ä‚¢‚Ü‚¹‚ñ‚ªAƒXƒR[ƒv‚Ȃǂ̊JŽnŽž‚Ƀ[ƒJƒ‹•Ï”‚̉
+Šú‰»‚Ȃǂðs‚¢A‚ ‚Æ‚Í\•¶–Ø‚ð’H‚è•ÏŠ·‚µ‚Ä‚¢‚«‚Ü‚·B
-変æ›ä¸­ã¯ Ruby ã® Array オブジェクト㫠YARV 命令オブジェクトã€ãŠã‚ˆã³ã‚ªãƒš
-ランドを格ç´ã—ã¦ã„ãã€æœ€å¾Œã«å®Ÿè¡Œã§ãã‚‹å½¢ã«å¤‰æ›ã—ã¾ã™ã€‚コンパイラã§ã¯ã€ã‚³
-ンパイル中ã«ç”Ÿæˆã™ã‚‹ãƒ¡ãƒ¢ãƒªé ˜åŸŸã®ç®¡ç†ãŒå•題ã«ãªã‚‹ã“ã¨ãŒã‚りã¾ã™ãŒã€YARV
-ã®å ´åˆã€Ruby インタプリタãŒã™ã¹ã¦é¢å€’ã‚’ã¿ã¦ãれるã®ã§ã“ã®éƒ¨åˆ†ã¯éžå¸¸ã«æ¥½
-ã«ä½œã‚‹ã“ã¨ãŒã§ãã¾ã—ãŸï¼ˆã‚¬ãƒ¼ãƒ™ãƒ¼ã‚¸ã‚³ãƒ¬ã‚¯ã‚¿ã«ã‚ˆã£ã¦è‡ªå‹•çš„ã«ãƒ¡ãƒ¢ãƒªç®¡ç†ã‚’ã—
-ã¦ãれるãŸã‚)。
+•ÏŠ·’†‚Í Ruby ‚Ì Array ƒIƒuƒWƒFƒNƒg‚É YARV –½—߃IƒuƒWƒFƒNƒgA‚¨‚æ‚уIƒy
+ƒ‰ƒ“ƒh‚ðŠi”[‚µ‚Ä‚¢‚«AÅŒã‚ÉŽÀs‚Å‚«‚éŒ`‚ɕϊ·‚µ‚Ü‚·BƒRƒ“ƒpƒCƒ‰‚Å‚ÍAƒR
+ƒ“ƒpƒCƒ‹’†‚ɶ¬‚·‚郃‚ƒŠ—̈æ‚ÌŠÇ—‚ª–â‘è‚ɂȂ邱‚Æ‚ª‚ ‚è‚Ü‚·‚ªAYARV
+‚Ìê‡ARuby ƒCƒ“ƒ^ƒvƒŠƒ^‚ª‚·‚ׂĖʓ|‚ð‚݂Ă­‚ê‚é‚̂ł±‚Ì•”•ª‚Í”ñí‚ÉŠy
+‚Éì‚邱‚Æ‚ª‚Å‚«‚Ü‚µ‚½iƒK[ƒx[ƒWƒRƒŒƒNƒ^‚É‚æ‚Á‚ÄŽ©“®“I‚Ƀƒ‚ƒŠŠÇ—‚ð‚µ
+‚Ä‚­‚ê‚邽‚ßjB
-YARV 命令ã¯ã€å‘½ä»¤ã‚’示ã™è­˜åˆ¥å­ã€ã‚ªãƒšãƒ©ãƒ³ãƒ‰ãªã©ã€ã™ã¹ã¦ 1 word (マシンã§
-表ç¾ã§ãる自然ãªå€¤ã€‚C 言語ã§ã¯ãƒã‚¤ãƒ³ã‚¿ã®ã‚µã‚¤ã‚ºã€‚Ruby インタプリタ用語ã§
-㯠VALUE ã®ã‚µã‚¤ã‚ºï¼‰ã§è¡¨ç¾ã•れã¾ã™ã€‚ãã®ãŸã‚ã€YARV 命令ã¯ã„ã‚ゆる「ãƒã‚¤ãƒˆ
-コードã€ã§ã¯ã‚りã¾ã›ã‚“。ãã®ãŸã‚ã€YARV ã®èª¬æ˜Žãªã©ã§ã¯ã€Œå‘½ä»¤åˆ—ã€ã¨ã„ã†ç”¨
-語を使ã£ã¦ã„ã¾ã™ã€‚
+YARV –½—ß‚ÍA–½—ß‚ðŽ¦‚·Ž¯•ÊŽqAƒIƒyƒ‰ƒ“ƒh‚È‚ÇA‚·‚×‚Ä 1 word iƒ}ƒVƒ“‚Å
+•\Œ»‚Å‚«‚鎩‘R‚È’lBC Œ¾Œê‚ł̓|ƒCƒ“ƒ^‚̃TƒCƒYBRuby ƒCƒ“ƒ^ƒvƒŠƒ^—pŒê‚Å
+‚Í VALUE ‚̃TƒCƒYj‚Å•\Œ»‚³‚ê‚Ü‚·B‚»‚Ì‚½‚ßAYARV –½—߂͂¢‚í‚ä‚éuƒoƒCƒg
+ƒR[ƒhv‚ł͂ ‚è‚Ü‚¹‚ñB‚»‚Ì‚½‚ßAYARV ‚Ìà–¾‚ȂǂłÍu–½—ß—ñv‚Æ‚¢‚¤—p
+Œê‚ðŽg‚Á‚Ä‚¢‚Ü‚·B
-1 word ã§ã‚ã‚‹ãŸã‚ã€ãƒ¡ãƒ¢ãƒªã®åˆ©ç”¨åŠ¹çŽ‡ã¯å¤šå°‘悪ããªã‚Šã¾ã™ãŒã€ã‚¢ã‚¯ã‚»ã‚¹é€Ÿåº¦ãª
-ã©ã‚’考慮ã™ã‚‹ã¨ã€æœ¬æ–¹å¼ãŒä¸€ç•ªã„ã„ã¨è€ƒãˆã¦ãŠã‚Šã¾ã™ã€‚ãŸã¨ãˆã°ã‚ªãƒšãƒ©ãƒ³ãƒ‰ã‚’コ
-ãƒ³ã‚¹ã‚¿ãƒ³ãƒˆãƒ—ãƒ¼ãƒ«ã«æ ¼ç´ã—ã€ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã®ã¿ã‚’オペランドã§ç¤ºã™ã“ã¨ã‚‚å¯èƒ½ã§
-ã™ãŒã€é–“接アクセスã«ãªã£ã¦ã—ã¾ã†ã®ã§æ€§èƒ½ã«å½±éŸ¿ãŒå‡ºã‚‹ãŸã‚ã€å´ä¸‹ã—ã¾ã—ãŸã€‚
+1 word ‚Å‚ ‚邽‚ßAƒƒ‚ƒŠ‚Ì—˜—pŒø—¦‚Í‘½­ˆ«‚­‚È‚è‚Ü‚·‚ªAƒAƒNƒZƒX‘¬“x‚È
+‚Ç‚ðl—¶‚·‚邯A–{•ûŽ®‚ªˆê”Ô‚¢‚¢‚Æl‚¦‚Ä‚¨‚è‚Ü‚·B‚½‚Æ‚¦‚΃Iƒyƒ‰ƒ“ƒh‚ðƒR
+ƒ“ƒXƒ^ƒ“ƒgƒv[ƒ‹‚ÉŠi”[‚µAƒCƒ“ƒfƒbƒNƒX‚݂̂ðƒIƒyƒ‰ƒ“ƒh‚ÅŽ¦‚·‚±‚Æ‚à‰Â”\‚Å
+‚·‚ªAŠÔÚƒAƒNƒZƒX‚ɂȂÁ‚Ä‚µ‚Ü‚¤‚̂ū”\‚ɉe‹¿‚ªo‚邽‚ßA‹p‰º‚µ‚Ü‚µ‚½B
* VM Generator (rb/insns2vm.rb, insns.def)
-rb/insns2vm.rb ã¨ã„ã†ã‚¹ã‚¯ãƒªãƒ—トã¯ã€insns.def ã¨ã„ã†ãƒ•ァイルを読ã¿è¾¼ã¿ã€
-VM ã®ãŸã‚ã«å¿…è¦ãªãƒ•ァイルを生æˆã—ã¾ã™ã€‚具体的ã«ã¯ã€å‘½ä»¤ã‚’実行ã™ã‚‹éƒ¨åˆ†ã‚’
-生æˆã—ã¾ã™ãŒã€ã»ã‹ã«ã‚‚コンパイルã«å¿…è¦ãªæƒ…å ±ã€æœ€é©åŒ–ã«å¿…è¦ãªæƒ…å ±ã€ã‚„アセ
-ンブラã€é€†ã‚¢ã‚»ãƒ³ãƒ–ラã«å¿…è¦ãªæƒ…報を示ã™ãƒ•ァイルも生æˆã—ã¾ã™ã€‚
+rb/insns2vm.rb ‚Æ‚¢‚¤ƒXƒNƒŠƒvƒg‚ÍAinsns.def ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ð“ǂݞ‚ÝA
+VM ‚Ì‚½‚߂ɕK—v‚ȃtƒ@ƒCƒ‹‚𶬂µ‚Ü‚·B‹ï‘Ì“I‚É‚ÍA–½—ß‚ðŽÀs‚·‚é•”•ª‚ð
+¶¬‚µ‚Ü‚·‚ªA‚Ù‚©‚É‚àƒRƒ“ƒpƒCƒ‹‚É•K—v‚Èî•ñAÅ“K‰»‚É•K—v‚Èî•ñA‚âƒAƒZ
+ƒ“ƒuƒ‰A‹tƒAƒZƒ“ƒuƒ‰‚É•K—v‚Èî•ñ‚ðŽ¦‚·ƒtƒ@ƒCƒ‹‚ඬ‚µ‚Ü‚·B
-** 命令記述
+** –½—ß‹Lq
-insns.def ã«ã¯ã€å„命令ãŒã©ã®ã‚ˆã†ãªå‘½ä»¤ã§ã‚ã‚‹ã‹ã‚’記述ã—ã¾ã™ã€‚具体的ã«ã¯æ¬¡
-ã®æƒ…報を記述ã—ã¾ã™ã€‚
+insns.def ‚É‚ÍAŠe–½—ß‚ª‚ǂ̂悤‚È–½—߂ł ‚é‚©‚ð‹Lq‚µ‚Ü‚·B‹ï‘Ì“I‚ɂ͎Ÿ
+‚Ìî•ñ‚ð‹Lq‚µ‚Ü‚·B
-- 命令ã®åå‰
-- ãã®å‘½ä»¤ã®ã‚«ãƒ†ã‚´ãƒªã€ã‚³ãƒ¡ãƒ³ãƒˆï¼ˆè‹±èªžã€æ—¥æœ¬èªžï¼‰
-- オペランドã®åå‰
-- ãã®å‘½ä»¤å®Ÿè¡Œå‰ã«ã‚¹ã‚¿ãƒƒã‚¯ã‹ã‚‰ãƒãƒƒãƒ—ã™ã‚‹å€¤
-- ãã®å‘½ä»¤å®Ÿè¡Œå¾Œã«ã‚¹ã‚¿ãƒƒã‚¯ã«ãƒ—ッシュã™ã‚‹å€¤
-- ãã®å‘½ä»¤ã®ãƒ­ã‚¸ãƒƒã‚¯ï¼ˆC 言語ã§è¨˜è¿°ï¼‰
+- –½—߂̖¼‘O
+- ‚»‚Ì–½—߂̃JƒeƒSƒŠAƒRƒƒ“ƒgi‰pŒêA“ú–{Œêj
+- ƒIƒyƒ‰ƒ“ƒh‚Ì–¼‘O
+- ‚»‚Ì–½—ߎÀs‘O‚ɃXƒ^ƒbƒN‚©‚çƒ|ƒbƒv‚·‚é’l
+- ‚»‚Ì–½—ߎÀsŒã‚ɃXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚é’l
+- ‚»‚Ì–½—߂̃ƒWƒbƒNiC Œ¾Œê‚Å‹Lqj
-ãŸã¨ãˆã°ã€ã‚¹ã‚¿ãƒƒã‚¯ã« self ã‚’ãŠã putself ã¨ã„ã†å‘½ä»¤ã¯æ¬¡ã®ã‚ˆã†ã«è¨˜è¿°ã—ã¾
-ã™ã€‚
+‚½‚Æ‚¦‚ÎAƒXƒ^ƒbƒN‚É self ‚ð‚¨‚­ putself ‚Æ‚¢‚¤–½—߂͎Ÿ‚̂悤‚É‹Lq‚µ‚Ü
+‚·B
#code
/**
@c put
@e put self.
- @j self ã‚’ç½®ã。
+ @j self ‚ð’u‚­B
*/
DEFINE_INSN
putself
@@ -99,36 +99,36 @@ putself
}
#end
-ã“ã®å ´åˆã€ã‚ªãƒšãƒ©ãƒ³ãƒ‰ã¨ã€ã‚¹ã‚¿ãƒƒã‚¯ã‹ã‚‰ãƒãƒƒãƒ—ã™ã‚‹å€¤ã¯ç„¡ã„ã“ã¨ã«ãªã‚Šã¾ã™ã€‚命
-令終了後ã€self をスタックトップã«ç½®ããŸã„ã‚ã‘ã§ã™ãŒã€ãれ㯠val ã¨ã„ã†ã€
-スタックã«ãƒ—ッシュã™ã‚‹å€¤ã¨ã—ã¦å®£è¨€ã—ã¦ãŠã„ãŸå¤‰æ•°ã«ä»£å…¥ã—ã¦ãŠãã“ã¨ã§ã€ã“
-れを変æ›ã™ã‚‹ã¨ã‚¹ã‚¿ãƒƒã‚¯ãƒˆãƒƒãƒ—ã«ç½®ã C プログラムãŒç”Ÿæˆã•れã¾ã™ã€‚
+‚±‚Ìê‡AƒIƒyƒ‰ƒ“ƒh‚ÆAƒXƒ^ƒbƒN‚©‚çƒ|ƒbƒv‚·‚é’l‚Í–³‚¢‚±‚ƂɂȂè‚Ü‚·B–½
+—ßI—¹ŒãAself ‚ðƒXƒ^ƒbƒNƒgƒbƒv‚É’u‚«‚½‚¢‚킯‚Å‚·‚ªA‚»‚ê‚Í val ‚Æ‚¢‚¤A
+ƒXƒ^ƒbƒN‚ɃvƒbƒVƒ…‚·‚é’l‚Æ‚µ‚Ä錾‚µ‚Ä‚¨‚¢‚½•Ï”‚É‘ã“ü‚µ‚Ä‚¨‚­‚±‚Æ‚ÅA‚±
+‚ê‚ð•ÏŠ·‚·‚邯ƒXƒ^ƒbƒNƒgƒbƒv‚É’u‚­ C ƒvƒƒOƒ‰ƒ€‚ª¶¬‚³‚ê‚Ü‚·B
-ç´°ã‹ã„フォーマット㯠insns.def ã®å†’é ­ã‚’å‚ç…§ã—ã¦ãã ã•ã„。ãã‚“ãªã«é›£ã—ã
-ãªã„ã¨æ€ã„ã¾ã™ã€‚
+ׂ©‚¢ƒtƒH[ƒ}ƒbƒg‚Í insns.def ‚Ì–`“ª‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B‚»‚ñ‚Ȃɓ‚­
+‚È‚¢‚ÆŽv‚¢‚Ü‚·B
-insnhelper.h ã¨ã„ã†ãƒ•ァイルã«ã€å‘½ä»¤ãƒ­ã‚¸ãƒƒã‚¯ã‚’記述ã™ã‚‹ãŸã‚ã«å¿…è¦ãªãƒžã‚¯ãƒ­
-ãŒå®šç¾©ã•れã¦ã„ã¾ã™ã€‚ã¾ãŸã€VM ã®å†…部構造ã«é–¢ã™ã‚‹å®šç¾©ã¯ vm.h ã¨ã„ã†ãƒ•ァイ
-ルã«ã‚りã¾ã™ã€‚
+insnhelper.h ‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ÉA–½—߃ƒWƒbƒN‚ð‹Lq‚·‚邽‚߂ɕK—v‚ȃ}ƒNƒ
+‚ª’è‹`‚³‚ê‚Ä‚¢‚Ü‚·B‚Ü‚½AVM ‚Ì“à•”\‘¢‚ÉŠÖ‚·‚é’è‹`‚Í vm.h ‚Æ‚¢‚¤ƒtƒ@ƒC
+ƒ‹‚É‚ ‚è‚Ü‚·B
* VM (Virtual Machine, vm.h, vm.c)
-VM ã¯ã€å®Ÿéš›ã«ã‚³ãƒ³ãƒ‘イルã—ãŸçµæžœç”Ÿæˆã•れる YARV 命令列を実行ã—ã¾ã™ã€‚ã¾ã•
-ã«ã€ã“ã®éƒ¨åˆ†ãŒ YARV ã®ã‚­ãƒ¢ã«ãªã‚Šã€å°†æ¥çš„ã«ã¯ eval.c ã‚’ã“ã® VM ã§ç½®ãæ›ãˆ
-ãŸã„ã¨è€ƒãˆã¦ã„ã¾ã™ã€‚
+VM ‚ÍAŽÀۂɃRƒ“ƒpƒCƒ‹‚µ‚½Œ‹‰Ê¶¬‚³‚ê‚é YARV –½—ß—ñ‚ðŽÀs‚µ‚Ü‚·B‚Ü‚³
+‚ÉA‚±‚Ì•”•ª‚ª YARV ‚̃Lƒ‚‚ɂȂèA«—ˆ“I‚É‚Í eval.c ‚ð‚±‚Ì VM ‚Å’u‚«Š·‚¦
+‚½‚¢‚Æl‚¦‚Ä‚¢‚Ü‚·B
-ç¾åœ¨ã® Ruby インタプリタã§å®Ÿè¡Œã§ãã‚‹ã™ã¹ã¦ã®ã“ã¨ãŒã€ã“ã® VM ã§å®Ÿç¾ã§ãã‚‹
-よã†ã«ä½œã£ã¦ã„ã¾ã™ï¼ˆç¾æ®µéšŽã§ã¯ã¾ã å®Œå…¨ã§ã¯ã‚りã¾ã›ã‚“ãŒã€ãã†ãªã‚‹ã¹ãã§ã™ï¼‰ã€‚
+Œ»Ý‚Ì Ruby ƒCƒ“ƒ^ƒvƒŠƒ^‚ÅŽÀs‚Å‚«‚é‚·‚ׂĂ̂±‚Æ‚ªA‚±‚Ì VM ‚ÅŽÀŒ»‚Å‚«‚é
+‚悤‚Éì‚Á‚Ä‚¢‚Ü‚·iŒ»’iŠK‚ł͂܂¾Š®‘S‚ł͂ ‚è‚Ü‚¹‚ñ‚ªA‚»‚¤‚È‚é‚ׂ«‚Å‚·jB
-VM ã¯ã€å˜ç´”ãªã‚¹ã‚¿ãƒƒã‚¯ãƒžã‚·ãƒ³ã¨ã—ã¦å®Ÿè£…ã—ã¦ã„ã¾ã™ã€‚スレッドã²ã¨ã¤ã«ã‚¹ã‚¿ãƒƒ
-クã²ã¨ã¤ã‚’ä¿æŒã—ã¾ã™ã€‚スタックã®é ˜åŸŸã¯ãƒ’ープã‹ã‚‰å–å¾—ã™ã‚‹ã®ã§ã€æŸ”軟ãªé ˜åŸŸ
-設定ãŒå¯èƒ½ã§ã™ã€‚
+VM ‚ÍA’Pƒ‚ȃXƒ^ƒbƒNƒ}ƒVƒ“‚Æ‚µ‚ÄŽÀ‘•‚µ‚Ä‚¢‚Ü‚·BƒXƒŒƒbƒh‚ЂƂ‚ɃXƒ^ƒb
+ƒN‚ЂƂ‚ð•ÛŽ‚µ‚Ü‚·BƒXƒ^ƒbƒN‚̗̈æ‚̓q[ƒv‚©‚çŽæ“¾‚·‚é‚Ì‚ÅA_“î‚ȗ̈æ
+ݒ肪‰Â”\‚Å‚·B
-** レジスタ
+** ƒŒƒWƒXƒ^
-VM 㯠5 ã¤ã®ä»®æƒ³çš„ãªãƒ¬ã‚¸ã‚¹ã‚¿ã«ã‚ˆã£ã¦åˆ¶å¾¡ã•れã¾ã™ã€‚
+VM ‚Í 5 ‚‚̉¼‘z“I‚ȃŒƒWƒXƒ^‚É‚æ‚Á‚ħŒä‚³‚ê‚Ü‚·B
- PC (Program Counter)
- SP (Stack Pointer)
@@ -136,77 +136,77 @@ VM 㯠5 ã¤ã®ä»®æƒ³çš„ãªãƒ¬ã‚¸ã‚¹ã‚¿ã«ã‚ˆã£ã¦åˆ¶å¾¡ã•れã¾ã™ã€‚
- LFP (Local Frame Pointer)
- DFP (Dynamic Frame Pointer)
-PC ã¯ç¾åœ¨å®Ÿè¡Œä¸­ã®å‘½ä»¤åˆ—ã®ä½ç½®ã‚’示ã—ã¾ã™ã€‚SP ã¯ã‚¹ã‚¿ãƒƒã‚¯ãƒˆãƒƒãƒ—ã®ä½ç½®ã‚’示ã—
-ã¾ã™ã€‚CFPã€LFPã€DFP ã¯ãれãžã‚Œãƒ•ãƒ¬ãƒ¼ãƒ ã®æƒ…報を示ã—ã¾ã™ã€‚詳細ã¯å¾Œè¿°ã—ã¾ã™ã€‚
+PC ‚ÍŒ»ÝŽÀs’†‚Ì–½—ß—ñ‚̈ʒu‚ðŽ¦‚µ‚Ü‚·BSP ‚̓Xƒ^ƒbƒNƒgƒbƒv‚̈ʒu‚ðŽ¦‚µ
+‚Ü‚·BCFPALFPADFP ‚Í‚»‚ꂼ‚êƒtƒŒ[ƒ€‚Ìî•ñ‚ðŽ¦‚µ‚Ü‚·BÚׂ͌ãq‚µ‚Ü‚·B
-** スタックフレーム
+** ƒXƒ^ƒbƒNƒtƒŒ[ƒ€
obsolete (update soon)
-** フレームデザインã«ã¤ã„ã¦ã®è£œè¶³
+** ƒtƒŒ[ƒ€ƒfƒUƒCƒ“‚ɂ‚¢‚Ă̕⑫
-Lisp ã®å‡¦ç†ç³»ãªã©ã‚’ã‹ã‚“ãŒãˆã‚‹ã¨ã€ã‚ã–ã‚ã–ブロックローカルフレームã¨ãƒ¡ã‚½
-ッドローカルフレームã®ã‚ˆã†ãªã‚‚ã®ã‚’用æ„ã™ã‚‹ã®ã¯å¥‡ç•°ã«è¦‹ãˆã‚‹ã‹ã‚‚ã—れã¾ã›ã‚“。
-ã‚るフレームをã€å…¥ã‚Œå­æ§‹é€ ã«ã—ã¦ã€ãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã®ã‚¢ã‚¯ã‚»ã‚¹ã¯ãã®å…¥ã‚Œå­ã‚’外
-å´ã«è¾¿ã‚Œã°å¿…ãšãŸã©ã‚Šç€ãã“ã¨ãŒã§ãã‚‹ã‹ã‚‰ã§ã™ï¼ˆã¤ã¾ã‚Šã€lfp ã¯å¿…è¦ãªã„)。
+Lisp ‚̈—Œn‚È‚Ç‚ð‚©‚ñ‚ª‚¦‚邯A‚í‚´‚í‚´ƒuƒƒbƒNƒ[ƒJƒ‹ƒtƒŒ[ƒ€‚ƃƒ\
+ƒbƒhƒ[ƒJƒ‹ƒtƒŒ[ƒ€‚̂悤‚È‚à‚Ì‚ð—pˆÓ‚·‚é‚̂͊ïˆÙ‚ÉŒ©‚¦‚é‚©‚à‚µ‚ê‚Ü‚¹‚ñB
+‚ ‚éƒtƒŒ[ƒ€‚ðA“ü‚êŽq\‘¢‚É‚µ‚ÄAƒ[ƒJƒ‹•Ï”‚̃AƒNƒZƒX‚Í‚»‚Ì“ü‚êŽq‚ðŠO
+‘¤‚É’H‚ê‚ΕK‚¸‚½‚ǂ蒅‚­‚±‚Æ‚ª‚Å‚«‚é‚©‚ç‚Å‚·i‚‚܂èAlfp ‚Í•K—v‚È‚¢jB
-ã—ã‹ã—ã€Ruby ã§ã¯ã„ãã¤ã‹çжæ³ãŒé•ã„ã¾ã™ã€‚ã¾ãšã€ãƒ¡ã‚½ãƒƒãƒ‰ãƒ­ãƒ¼ã‚«ãƒ«ãªæƒ…å ±ãŒ
-ã‚ã‚‹ã“ã¨ã€å…·ä½“çš„ã«ã¯ãƒ–ロックã¨self(callee ã‹ã‚‰ã¿ã‚‹ã¨ reciever)ã§ã™ã€‚ã“
-ã®æƒ…報をãれãžã‚Œã®ãƒ•レームã«ã‚‚ãŸã›ã‚‹ã®ã¯ç„¡é§„ã§ã™ã€‚
+‚µ‚©‚µARuby ‚ł͂¢‚­‚‚©ó‹µ‚ªˆá‚¢‚Ü‚·B‚Ü‚¸Aƒƒ\ƒbƒhƒ[ƒJƒ‹‚Èî•ñ‚ª
+‚ ‚邱‚ÆA‹ï‘Ì“I‚ɂ̓uƒƒbƒN‚Æselficallee ‚©‚ç‚Ý‚é‚Æ recieverj‚Å‚·B‚±
+‚Ìî•ñ‚ð‚»‚ê‚¼‚ê‚̃tƒŒ[ƒ€‚É‚à‚½‚¹‚é‚͖̂³‘ʂł·B
-ã¾ãŸã€Ruby2.0 ã‹ã‚‰ã¯ãƒ–ロックローカル変数ã¯ãªããªã‚Šã¾ã™ï¼ˆãƒ–ロックローカル
-å¼•æ•°ã¯æ®‹ã‚‹ã®ã§ã€æ§‹é€ è‡ªä½“ã¯ã‚ã¾ã‚Šå¤‰ã‚りã¾ã›ã‚“)。ãã®ãŸã‚ã€ãƒ¡ã‚½ãƒƒãƒ‰ãƒ­ãƒ¼ã‚«
-ル変数ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŒé »ç™ºã™ã‚‹ã“ã¨ãŒäºˆæƒ³ã•れã¾ã™ã€‚
+‚Ü‚½ARuby2.0 ‚©‚ç‚̓uƒƒbƒNƒ[ƒJƒ‹•Ï”‚͂Ȃ­‚È‚è‚Ü‚·iƒuƒƒbƒNƒ[ƒJƒ‹
+ˆø”‚ÍŽc‚é‚Ì‚ÅA\‘¢Ž©‘̂͂ ‚Ü‚è•Ï‚í‚è‚Ü‚¹‚ñjB‚»‚Ì‚½‚ßAƒƒ\ƒbƒhƒ[ƒJ
+ƒ‹•Ï”‚ւ̃AƒNƒZƒX‚ª•p”­‚·‚邱‚Æ‚ª—\‘z‚³‚ê‚Ü‚·B
-ã“ã®ã¨ãã€ãƒ¡ã‚½ãƒƒãƒ‰ãƒ­ãƒ¼ã‚«ãƒ«å¤‰æ•°ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã®ãŸã³ã«ãƒ•レーム(スコープ)ã®
-リストをãŸã©ã‚‹ã®ã¯ç„¡é§„ã§ã‚ã‚‹ã¨åˆ¤æ–­ã—ã€æ˜Žç¤ºçš„ã«ãƒ¡ã‚½ãƒƒãƒ‰ãƒ­ãƒ¼ã‚«ãƒ«ã‚¹ã‚³ãƒ¼ãƒ—ã¨
-ブロックフレームを分離ã—ã€ãƒ–ロックフレームã‹ã‚‰ã¯ãƒ¡ã‚½ãƒƒãƒ‰ãƒ­ãƒ¼ã‚«ãƒ«ãƒ•レーム
-㌠lfpレジスタã«ã‚ˆã£ã¦å®¹æ˜“ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãるよã†ã«ã—ã¾ã—ãŸã€‚
+‚±‚̂Ƃ«Aƒƒ\ƒbƒhƒ[ƒJƒ‹•Ï”‚ւ̃AƒNƒZƒX‚Ì‚½‚тɃtƒŒ[ƒ€iƒXƒR[ƒvj‚Ì
+ƒŠƒXƒg‚ð‚½‚Ç‚é‚͖̂³‘ʂł ‚邯”»’f‚µA–¾Ž¦“I‚Ƀƒ\ƒbƒhƒ[ƒJƒ‹ƒXƒR[ƒv‚Æ
+ƒuƒƒbƒNƒtƒŒ[ƒ€‚𕪗£‚µAƒuƒƒbƒNƒtƒŒ[ƒ€‚©‚ç‚̓ƒ\ƒbƒhƒ[ƒJƒ‹ƒtƒŒ[ƒ€
+‚ª lfpƒŒƒWƒXƒ^‚É‚æ‚Á‚Ä—eˆÕ‚ɃAƒNƒZƒX‚Å‚«‚邿‚¤‚É‚µ‚Ü‚µ‚½B
-** メソッド呼ã³å‡ºã—ã«ã¤ã„ã¦
+** ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ɂ‚¢‚Ä
-メソッド呼ã³å‡ºã—ã¯ã€YARV 命令列ã§è¨˜è¿°ã•れãŸãƒ¡ã‚½ãƒƒãƒ‰ã‹ã€C ã§è¨˜è¿°ã•れãŸãƒ¡
-ソッドã‹ã«ã‚ˆã£ã¦ãƒ‡ã‚£ã‚¹ãƒ‘ãƒƒãƒæ‰‹æ³•ãŒå¤‰ã‚りã¾ã™ã€‚
+ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ÍAYARV –½—ß—ñ‚Å‹Lq‚³‚ꂽƒƒ\ƒbƒh‚©AC ‚Å‹Lq‚³‚ꂽƒ
+ƒ\ƒbƒh‚©‚É‚æ‚Á‚ăfƒBƒXƒpƒbƒ`Žè–@‚ª•Ï‚í‚è‚Ü‚·B
-YARV 命令列ã§ã‚ã£ãŸå ´åˆã€ä¸Šè¿°ã—ãŸã‚¹ã‚¿ãƒƒã‚¯ãƒ•レームを作æˆã—ã¦å‘½ä»¤ã‚’継続ã—
-ã¾ã™ã€‚ã¨ãã« VM ã®é–¢æ•°ã‚’å†å¸°å‘¼ã³å‡ºã™ã™ã‚‹ã“ã¨ã¯è¡Œãªã„ã¾ã›ã‚“。
+YARV –½—ß—ñ‚Å‚ ‚Á‚½ê‡Aãq‚µ‚½ƒXƒ^ƒbƒNƒtƒŒ[ƒ€‚ð쬂µ‚Ä–½—ß‚ðŒp‘±‚µ
+‚Ü‚·B‚Æ‚­‚É VM ‚ÌŠÖ”‚ðÄ‹AŒÄ‚Ño‚·‚·‚邱‚Æ‚Ís‚È‚¢‚Ü‚¹‚ñB
-C ã§è¨˜è¿°ã•れãŸãƒ¡ã‚½ãƒƒãƒ‰ã ã£ãŸå ´åˆã€å˜ç´”ã«ãã®é–¢æ•°ã‚’呼ã³å‡ºã—ã¾ã™ï¼ˆãŸã ã—ã€
-ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã‚’æ­£ã—ã生æˆã™ã‚‹ãŸã‚ã«ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã®æƒ…報を付加ã—ã¦ã‹ã‚‰
-行ãªã„ã¾ã™ï¼‰ã€‚
+C ‚Å‹Lq‚³‚ꂽƒƒ\ƒbƒh‚¾‚Á‚½ê‡A’Pƒ‚É‚»‚ÌŠÖ”‚ðŒÄ‚Ño‚µ‚Ü‚·i‚½‚¾‚µA
+ƒoƒbƒNƒgƒŒ[ƒX‚𳂵‚­¶¬‚·‚邽‚߂Ƀƒ\ƒbƒhŒÄ‚Ño‚µ‚Ìî•ñ‚ð•t‰Á‚µ‚Ä‚©‚ç
+s‚È‚¢‚Ü‚·jB
-ã“ã®ãŸã‚ã€VM 用スタックを別途用æ„ã—ãŸã‚‚ã®ã®ã€ãƒ—ログラムã«ã‚ˆã£ã¦ã¯ãƒžã‚·ãƒ³
-スタックを使ã„切ã£ã¦ã—ã¾ã†å¯èƒ½æ€§ãŒã‚りã¾ã™ï¼ˆC -> Ruby -> C -> ... ã¨ã„ã†
-呼ã³å‡ºã—ãŒç¶šã„ãŸå ´åˆï¼‰ã€‚ã“れã¯ã€ç¾åœ¨ã§ã¯é¿ã‘られãªã„仕様ã¨ãªã£ã¦ã„ã¾ã™ã€‚
+‚±‚Ì‚½‚ßAVM —pƒXƒ^ƒbƒN‚ð•Ê“r—pˆÓ‚µ‚½‚à‚Ì‚ÌAƒvƒƒOƒ‰ƒ€‚É‚æ‚Á‚Ă̓}ƒVƒ“
+ƒXƒ^ƒbƒN‚ðŽg‚¢Ø‚Á‚Ä‚µ‚Ü‚¤‰Â”\«‚ª‚ ‚è‚Ü‚·iC -> Ruby -> C -> ... ‚Æ‚¢‚¤
+ŒÄ‚Ño‚µ‚ª‘±‚¢‚½ê‡jB‚±‚ê‚ÍAŒ»Ý‚Å‚Í”ð‚¯‚ç‚ê‚È‚¢Žd—l‚ƂȂÁ‚Ä‚¢‚Ü‚·B
-** 例外
+** —áŠO
-例外ã¯ã€Java ã® JVM ã¨åŒæ§˜ã«ä¾‹å¤–テーブルを用æ„ã™ã‚‹ã“ã¨ã§å®Ÿç¾ã—ã¾ã™ã€‚例外
-ãŒç™ºç”Ÿã—ãŸã‚‰ã€å½“該フレームをã€ä¾‹å¤–テーブルを検査ã—ã¾ã™ã€‚ãã“ã§ã€ä¾‹å¤–ãŒç™º
-生ã—ãŸã¨ãã® PC ã®å€¤ã«åˆè‡´ã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªãŒã‚ã£ãŸå ´åˆã€ãã®ã‚¨ãƒ³ãƒˆãƒªã«å¾“ã£ã¦
-動作ã—ã¾ã™ã€‚ã‚‚ã—エントリãŒè¦‹ã¤ã‹ã‚‰ãªã‹ã£ãŸå ´åˆã€ã‚¹ã‚¿ãƒƒã‚¯ã‚’æ’’ãæˆ»ã—ã¦ã¾ãŸ
-åŒæ§˜ã«ãã®ã‚¹ã‚³ãƒ¼ãƒ—ã®ä¾‹å¤–テーブルを検査ã—ã¾ã™ã€‚
+—áŠO‚ÍAJava ‚Ì JVM ‚Æ“¯—l‚É—áŠOƒe[ƒuƒ‹‚ð—pˆÓ‚·‚邱‚ƂŎÀŒ»‚µ‚Ü‚·B—áŠO
+‚ª”­¶‚µ‚½‚çA“–ŠYƒtƒŒ[ƒ€‚ðA—áŠOƒe[ƒuƒ‹‚ðŒŸ¸‚µ‚Ü‚·B‚»‚±‚ÅA—áŠO‚ª”­
+¶‚µ‚½‚Æ‚«‚Ì PC ‚Ì’l‚ɇ’v‚·‚éƒGƒ“ƒgƒŠ‚ª‚ ‚Á‚½ê‡A‚»‚̃Gƒ“ƒgƒŠ‚É]‚Á‚Ä
+“®ì‚µ‚Ü‚·B‚à‚µƒGƒ“ƒgƒŠ‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½ê‡AƒXƒ^ƒbƒN‚ðŽT‚«–ß‚µ‚Ă܂½
+“¯—l‚É‚»‚̃XƒR[ƒv‚Ì—áŠOƒe[ƒuƒ‹‚ðŒŸ¸‚µ‚Ü‚·B
-ã¾ãŸã€breakã€return(ブロック中)ã€retry ãªã©ã‚‚åŒæ§˜ã®ä»•組ã¿ã§å®Ÿç¾ã—ã¾ã™ã€‚
+‚Ü‚½AbreakAreturniƒuƒƒbƒN’†jAretry ‚È‚Ç‚à“¯—l‚ÌŽd‘g‚݂ŎÀŒ»‚µ‚Ü‚·B
-*** 例外テーブル
+*** —áŠOƒe[ƒuƒ‹
-例外テーブルエントリã¯å…·ä½“çš„ã«ã¯æ¬¡ã®æƒ…å ±ãŒæ ¼ç´ã•れã¦ã„ã¾ã™ã€‚
+—áŠOƒe[ƒuƒ‹ƒGƒ“ƒgƒŠ‚Í‹ï‘Ì“I‚ɂ͎Ÿ‚Ìî•ñ‚ªŠi”[‚³‚ê‚Ä‚¢‚Ü‚·B
-- 対象ã¨ã™ã‚‹ PC ã®ç¯„囲
-- 対象ã¨ã™ã‚‹ä¾‹å¤–ã®ç¨®é¡ž
-- ã‚‚ã—対象ã¨ãªã£ãŸã¨ãã«ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹å…ˆï¼ˆç¨®é¡žã«ã‚ˆã‚‹ï¼‰
-- ã‚‚ã—対象ã¨ãªã£ãŸã¨ãã«èµ·å‹•ã™ã‚‹ãƒ–ロック㮠iseq
+- ‘ÎÛ‚Æ‚·‚é PC ‚͈̔Í
+- ‘ÎÛ‚Æ‚·‚é—áŠO‚ÌŽí—Þ
+- ‚à‚µ‘ÎۂƂȂÁ‚½‚Æ‚«‚ɃWƒƒƒ“ƒv‚·‚éæiŽí—Þ‚É‚æ‚éj
+- ‚à‚µ‘ÎۂƂȂÁ‚½‚Æ‚«‚É‹N“®‚·‚éƒuƒƒbƒN‚Ì iseq
*** rescue
-rescue 節ã¯ãƒ–ロックã¨ã—ã¦å®Ÿç¾ã—ã¦ã„ã¾ã™ã€‚$! ã®å€¤ã‚’唯一ã®å¼•æ•°ã¨ã—ã¦æŒã¡ã¾
-ã™ã€‚
+rescue ߂̓uƒƒbƒN‚Æ‚µ‚ÄŽÀŒ»‚µ‚Ä‚¢‚Ü‚·B$! ‚Ì’l‚ð—Bˆê‚̈ø”‚Æ‚µ‚ÄŽ‚¿‚Ü
+‚·B
#code
begin
@@ -216,7 +216,7 @@ rescue C
end
#end
-ã¯ã€æ¬¡ã®ã‚ˆã†ãª Ruby スクリプトã«å¤‰æ›ã•れã¾ã™ã€‚
+‚ÍAŽŸ‚̂悤‚È Ruby ƒXƒNƒŠƒvƒg‚ɕϊ·‚³‚ê‚Ü‚·B
#code
{|err|
@@ -225,7 +225,7 @@ end
when B === err
when C === err
else
- raise # yarv ã®å‘½ä»¤ã§ã¯ throw
+ raise # yarv ‚Ì–½—ß‚Å‚Í throw
end
}
#end
@@ -233,32 +233,32 @@ end
*** ensure
-正常系(例外ãŒç™ºç”Ÿã—ãªã‹ã£ãŸå ´åˆï¼‰ã¨ç•°å¸¸ç³»ï¼ˆä¾‹å¤–ãŒç™ºç”Ÿã—ãŸã¨ããªã©ï¼‰ã®2
-種類ã®å‘½ä»¤åˆ—ãŒç”Ÿæˆã•れã¾ã™ã€‚正常系ã§ã¯ã€ãŸã ã®é€£ç¶šã—ãŸã‚³ãƒ¼ãƒ‰é ˜åŸŸã¨ã—ã¦ã‚³
-ンパイルã•れã¾ã™ã€‚ã¾ãŸã€ç•°å¸¸ç³»ã§ã¯ãƒ–ロックã¨ã—ã¦å®Ÿè£…ã—ã¾ã™ã€‚最後ã¯å¿…ãš
-throw 命令ã§ç· ã‚ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚
+³íŒni—áŠO‚ª”­¶‚µ‚È‚©‚Á‚½ê‡j‚ƈÙíŒni—áŠO‚ª”­¶‚µ‚½‚Æ‚«‚È‚Çj‚Ì2
+Ží—Þ‚Ì–½—ß—ñ‚ª¶¬‚³‚ê‚Ü‚·B³íŒn‚Å‚ÍA‚½‚¾‚̘A‘±‚µ‚½ƒR[ƒh—Ìˆæ‚Æ‚µ‚ăR
+ƒ“ƒpƒCƒ‹‚³‚ê‚Ü‚·B‚Ü‚½AˆÙíŒn‚ł̓uƒƒbƒN‚Æ‚µ‚ÄŽÀ‘•‚µ‚Ü‚·BÅŒã‚Í•K‚¸
+throw –½—߂Œ÷‚߂邱‚ƂɂȂè‚Ü‚·B
-*** break, return(ブロック中)ã€retry
+*** break, returniƒuƒƒbƒN’†jAretry
-break æ–‡ã€ãƒ–ロック中㮠return æ–‡ã€retry 文㯠throw 命令ã¨ã—ã¦ã‚³ãƒ³ãƒ‘イル
-ã•れã¾ã™ã€‚ã©ã“ã¾ã§æˆ»ã‚‹ã‹ã¯ã€break をフックã™ã‚‹ä¾‹å¤–テーブルã®ã‚¨ãƒ³ãƒˆãƒªãŒåˆ¤
-æ–­ã—ã¾ã™ã€‚
+break •¶AƒuƒƒbƒN’†‚Ì return •¶Aretry •¶‚Í throw –½—߂Ƃµ‚ăRƒ“ƒpƒCƒ‹
+‚³‚ê‚Ü‚·B‚Ç‚±‚܂Ŗ߂邩‚ÍAbreak ‚ðƒtƒbƒN‚·‚é—áŠOƒe[ƒuƒ‹‚̃Gƒ“ƒgƒŠ‚ª”»
+’f‚µ‚Ü‚·B
-** å®šæ•°ã®æ¤œç´¢
+** ’蔂̌Ÿõ
-定数ã¨ã„ã†åå‰ãªã®ã«ã€Ruby ã§ã¯ã‚³ãƒ³ãƒ‘ã‚¤ãƒ«æ™‚ã«æ±ºå®šã—ã¾ã›ã‚“。ã¨ã„ã†ã‹ã€ã„
-ã¤ã¾ã§ã‚‚å†å®šç¾©å¯èƒ½ã«ãªã£ã¦ã„ã¾ã™ã€‚
+’蔂Ƃ¢‚¤–¼‘O‚Ȃ̂ÉARuby ‚ł̓Rƒ“ƒpƒCƒ‹Žž‚ÉŒˆ’肵‚Ü‚¹‚ñB‚Æ‚¢‚¤‚©A‚¢
+‚‚܂łàÄ’è‹`‰Â”\‚ɂȂÁ‚Ä‚¢‚Ü‚·B
-定数アクセスã®ãŸã‚ã®Rubyè¨˜è¿°ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚
+’蔃AƒNƒZƒX‚Ì‚½‚ß‚ÌRuby‹Lq‚ÍŽŸ‚̂悤‚ɂȂè‚Ü‚·B
#code
-Ruby表ç¾:
+Ruby•\Œ»:
expr::ID::...::ID
#end
-ã“れã¯ã€yarv命令セットã§ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚
+‚±‚ê‚ÍAyarv–½—߃Zƒbƒg‚ł͎Ÿ‚̂悤‚ɂȂè‚Ü‚·B
#code
(expr)
@@ -268,161 +268,161 @@ getconstant ID
#end
-*** 定数検索パス
+*** ’蔌ŸõƒpƒX
-ã‚‚ã— expr ㌠nil ã ã£ãŸå ´åˆã€å®šæ•°æ¤œç´¢ãƒ‘スã«å¾“ã£ã¦å®šæ•°ã‚’検索ã—ã¾ã™ã€‚ã“ã®
-挙動ã¯ä»Šå¾Œ Ruby 2.0 ã«å‘ã‘ã¦å¤‰æ›´ã•れる場åˆãŒã‚りã¾ã™ã€‚
+‚à‚µ expr ‚ª nil ‚¾‚Á‚½ê‡A’蔌ŸõƒpƒX‚É]‚Á‚Ē蔂ðŒŸõ‚µ‚Ü‚·B‚±‚Ì
+‹““®‚Í¡Œã Ruby 2.0 ‚ÉŒü‚¯‚Ä•ÏX‚³‚ê‚éꇂª‚ ‚è‚Ü‚·B
-+ クラスã€ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®å‹•çš„ãƒã‚¹ãƒˆé–¢ä¿‚(プログラムã®å­—é¢ä¸Šï¼‰ã‚’ルートã¾ã§è¾¿ã‚‹
-+ 継承関係をルート(Object)ã¾ã§è¾¿ã‚‹
++ ƒNƒ‰ƒXAƒ‚ƒWƒ…[ƒ‹‚Ì“®“IƒlƒXƒgŠÖŒWiƒvƒƒOƒ‰ƒ€‚ÌŽš–Êãj‚ðƒ‹[ƒg‚܂ŒH‚é
++ Œp³ŠÖŒW‚ðƒ‹[ƒgiObjectj‚܂ŒH‚é
-ã“ã®ãŸã‚ã€ã‚¯ãƒ©ã‚¹ã€ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®å‹•çš„ãƒã‚¹ãƒˆé–¢ä¿‚ã‚’ä¿å­˜ã—ãªã‘れã°ãªã‚Šã¾ã›ã‚“。
-ã“ã®ãŸã‚ã«ã€thread_object ã«ã¯ klass_nest_stack ã¨ã„ã†ã‚‚ã®ã‚’用æ„ã—ã¾ã—ãŸã€‚
-ã“れã¯ã€ç¾åœ¨ã®ãƒã‚¹ãƒˆã®æƒ…報をä¿å­˜ã—ã¾ã™ã€‚
+‚±‚Ì‚½‚ßAƒNƒ‰ƒXAƒ‚ƒWƒ…[ƒ‹‚Ì“®“IƒlƒXƒgŠÖŒW‚ð•Û‘¶‚µ‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñB
+‚±‚Ì‚½‚ß‚ÉAthread_object ‚É‚Í klass_nest_stack ‚Æ‚¢‚¤‚à‚Ì‚ð—pˆÓ‚µ‚Ü‚µ‚½B
+‚±‚ê‚ÍAŒ»Ý‚̃lƒXƒg‚Ìî•ñ‚ð•Û‘¶‚µ‚Ü‚·B
-メソッド定義時ã€ãã®ç¾åœ¨ã®ãƒã‚¹ãƒˆæƒ…報をメソッド定義時ã«ï¼ˆdupã—ã¦ï¼‰åŠ ãˆã‚‹
-ã“ã¨ã§ã€ãã®ãƒ¡ã‚½ãƒƒãƒ‰ã®å®Ÿè¡Œæ™‚ã€ãã®ãƒã‚¹ãƒˆæƒ…報をå‚ç…§ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã«ãªã‚Šã¾
-ã™ã€‚
+ƒƒ\ƒbƒh’è‹`ŽžA‚»‚ÌŒ»Ý‚̃lƒXƒgî•ñ‚ðƒƒ\ƒbƒh’è‹`Žž‚Éidup‚µ‚Äj‰Á‚¦‚é
+‚±‚Æ‚ÅA‚»‚̃ƒ\ƒbƒh‚ÌŽÀsŽžA‚»‚̃lƒXƒgî•ñ‚ðŽQÆ‚·‚邱‚Æ‚ª‰Â”\‚ɂȂè‚Ü
+‚·B
-トップレベルã§ã¯ã€ãã®æƒ…å ±ã¯ãªã„ã“ã¨ã«ãªã‚Šã¾ã™ã€‚
+ƒgƒbƒvƒŒƒxƒ‹‚Å‚ÍA‚»‚Ìî•ñ‚͂Ȃ¢‚±‚ƂɂȂè‚Ü‚·B
-クラス/モジュール定義文実行時ã¯ã€ç¾åœ¨ã®æƒ…å ±ãã®ã‚‚ã®ã‚’å‚ç…§ã™ã‚‹ã“ã¨ã«ãªã‚Š
-ã¾ã™ã€‚ã“れã¯ã€ã‚¯ãƒ©ã‚¹ã‚¹ã‚³ãƒ¼ãƒ—çªå…¥æ™‚ã€ãã®æƒ…報をクラス定義文ã«ã‚³ãƒ”ーã—ã¾ã™
-(ã™ã§ã«ã‚³ãƒ”ーã•れã¦ã„れã°ã€ã“れを行ã„ã¾ã›ã‚“)。
+ƒNƒ‰ƒX/ƒ‚ƒWƒ…[ƒ‹’è‹`•¶ŽÀsŽž‚ÍAŒ»Ý‚Ìî•ñ‚»‚Ì‚à‚Ì‚ðŽQÆ‚·‚邱‚ƂɂȂè
+‚Ü‚·B‚±‚ê‚ÍAƒNƒ‰ƒXƒXƒR[ƒv“Ë“üŽžA‚»‚Ìî•ñ‚ðƒNƒ‰ƒX’è‹`•¶‚ɃRƒs[‚µ‚Ü‚·
+i‚·‚łɃRƒs[‚³‚ê‚Ä‚¢‚ê‚ÎA‚±‚ê‚ðs‚¢‚Ü‚¹‚ñjB
-ã“れã«ã‚ˆã‚Šã€å‹•çš„ãªãƒã‚¹ãƒˆæƒ…å ±ã‚’çµ±ä¸€çš„ã«æ‰±ã†ã“ã¨ãŒã§ãã¾ã™ã€‚
+‚±‚ê‚É‚æ‚èA“®“I‚ȃlƒXƒgî•ñ‚ð“ˆê“I‚Ɉµ‚¤‚±‚Æ‚ª‚Å‚«‚Ü‚·B
-** 最é©åŒ–手法
+** Å“K‰»Žè–@
-YARV ã§ã¯é«˜é€ŸåŒ–を目的ã¨ã—ã¦ã„ã‚‹ã®ã§ã€ã•ã¾ã–ã¾ãªæœ€é©åŒ–手法を利用ã—ã¦ã„ã¾
-ã™ã€‚詳細ã¯å‰²æ„›ã—ã¾ã™ãŒã€ä»¥ä¸‹ã«è¿°ã¹ã‚‹æœ€é©åŒ–ãªã©ã‚’行ãªã£ã¦ãŠã‚Šã¾ã™ã€‚
+YARV ‚ł͂‘¬‰»‚ð–Ú“I‚Æ‚µ‚Ä‚¢‚é‚Ì‚ÅA‚³‚Ü‚´‚Ü‚ÈÅ“K‰»Žè–@‚ð—˜—p‚µ‚Ä‚¢‚Ü
+‚·BÚׂ͊„ˆ¤‚µ‚Ü‚·‚ªAˆÈ‰º‚Éq‚ׂéÅ“K‰»‚Ȃǂðs‚È‚Á‚Ä‚¨‚è‚Ü‚·B
*** threaded code
-GCC ã® C 言語拡張ã§ã‚る値ã¨ã—ã¦ã®ãƒ©ãƒ™ãƒ«ã‚’利用ã—㦠direct threaded code
-を実ç¾ã—ã¦ã„ã¾ã™ã€‚
+GCC ‚Ì C Œ¾ŒêŠg’£‚Å‚ ‚é’l‚Æ‚µ‚Ẵ‰ƒxƒ‹‚ð—˜—p‚µ‚Ä direct threaded code
+‚ðŽÀŒ»‚µ‚Ä‚¢‚Ü‚·B
*** Peephole optimization
-ã„ãã¤ã‹ã®ç°¡å˜ãªæœ€é©åŒ–ã‚’ã—ã¦ã„ã¾ã™ã€‚
+‚¢‚­‚‚©‚ÌŠÈ’P‚ÈÅ“K‰»‚ð‚µ‚Ä‚¢‚Ü‚·B
*** inline method cache
-命令列ã®ä¸­ã«ãƒ¡ã‚½ãƒƒãƒ‰æ¤œç´¢çµæžœã‚’埋ã‚è¾¼ã¿ã¾ã™ã€‚
+–½—ß—ñ‚Ì’†‚Ƀƒ\ƒbƒhŒŸõŒ‹‰Ê‚ð–„‚ßž‚݂܂·B
*** inline constant cache
-命令列ã®ä¸­ã«å®šæ•°æ¤œç´¢çµæžœã‚’埋ã‚è¾¼ã¿ã¾ã™ã€‚
+–½—ß—ñ‚Ì’†‚ɒ蔌ŸõŒ‹‰Ê‚ð–„‚ßž‚݂܂·B
-*** ブロック㨠Proc オブジェクトã®åˆ†é›¢
+*** ƒuƒƒbƒN‚Æ Proc ƒIƒuƒWƒFƒNƒg‚Ì•ª—£
-ブロック付ãメソッド呼ã³å‡ºã—ãŒè¡Œãªã‚れãŸã¨ãã«ã¯ã™ãã«ã¯ãƒ–ロックを Proc
-オブジェクトã¨ã—ã¦ç”Ÿæˆã—ã¾ã›ã‚“。ã“れã«ã‚ˆã‚Šã€å¿…è¦ãªã„ Proc オブジェクトã®
-生æˆã‚’抑ãˆã¦ã„ã¾ã™ã€‚
+ƒuƒƒbƒN•t‚«ƒƒ\ƒbƒhŒÄ‚Ño‚µ‚ªs‚È‚í‚ꂽ‚Æ‚«‚ɂ͂·‚®‚ɂ̓uƒƒbƒN‚ð Proc
+ƒIƒuƒWƒFƒNƒg‚Æ‚µ‚ͬ‚µ‚Ü‚¹‚ñB‚±‚ê‚É‚æ‚èA•K—v‚È‚¢ Proc ƒIƒuƒWƒFƒNƒg‚Ì
+¶¬‚ð—}‚¦‚Ä‚¢‚Ü‚·B
-Proc メソッドã¯ã€å®Ÿéš›ã«å¿…è¦ã«ãªã£ãŸæ™‚点ã§ä½œã‚‰ã‚Œã€ãã®ã¨ãã«ç’°å¢ƒï¼ˆã‚¹ã‚³ãƒ¼
-プ上ã«ç¢ºä¿ã•れãŸå¤‰æ•°ãªã©ï¼‰ã‚’ヒープã«ä¿å­˜ã—ã¾ã™ã€‚
+Proc ƒƒ\ƒbƒh‚ÍAŽÀÛ‚É•K—v‚ɂȂÁ‚½Žž“_‚Åì‚ç‚êA‚»‚̂Ƃ«‚Ɋ‹«iƒXƒR[
+ƒvã‚ÉŠm•Û‚³‚ꂽ•Ï”‚È‚Çj‚ðƒq[ƒv‚ɕۑ¶‚µ‚Ü‚·B
-*** 特化命令
+*** “Á‰»–½—ß
-Fixnum åŒå£«ã®åŠ ç®—ãªã©ã‚’正直ã«é–¢æ•°å‘¼ã³å‡ºã—ã«ã‚ˆã£ã¦è¡Œãªã†ã¨ã€ã‚³ã‚¹ãƒˆãŒã‹ã‹
-ã‚‹ã®ã§ã€ã“れらã®ãƒ—ãƒªãƒŸãƒ†ã‚£ãƒ–ãªæ“作を行ãªã†ãŸã‚ã®ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã¯å°‚用命
-令を用æ„ã—ã¾ã—ãŸã€‚
+Fixnum “¯Žm‚̉ÁŽZ‚Ȃǂ𳒼‚ÉŠÖ”ŒÄ‚Ño‚µ‚É‚æ‚Á‚Äs‚È‚¤‚ÆAƒRƒXƒg‚ª‚©‚©
+‚é‚Ì‚ÅA‚±‚ê‚ç‚̃vƒŠƒ~ƒeƒBƒu‚È‘€ì‚ðs‚È‚¤‚½‚߂̃ƒ\ƒbƒhŒÄ‚Ño‚µ‚Íê—p–½
+—ß‚ð—pˆÓ‚µ‚Ü‚µ‚½B
-*** 命令èžåˆ
+*** –½—ß—Z‡
-複数ã®å‘½ä»¤ã‚’ 1 命令ã«å¤‰æ›ã—ã¾ã™ã€‚èžåˆå‘½ä»¤ã¯ opt_insn_unif.def ã®è¨˜è¿°ã«ã‚ˆ
-り自動的ã«ç”Ÿæˆã•れã¾ã™ã€‚
+•¡”‚Ì–½—ß‚ð 1 –½—߂ɕϊ·‚µ‚Ü‚·B—Z‡–½—ß‚Í opt_insn_unif.def ‚Ì‹Lq‚É‚æ
+‚莩“®“I‚ɶ¬‚³‚ê‚Ü‚·B
-*** オペランドèžåˆ
+*** ƒIƒyƒ‰ƒ“ƒh—Z‡
-複数ã®ã‚ªãƒšãƒ©ãƒ³ãƒ‰ã‚’å«ã‚ãŸå‘½ä»¤ã‚’生æˆã—ã¾ã™ã€‚èžåˆå‘½ä»¤ã¯ opt_operand.def ã®
-記述ã«ã‚ˆã£ã¦è‡ªå‹•çš„ã«ç”Ÿæˆã•れã¾ã™ã€‚
+•¡”‚̃Iƒyƒ‰ƒ“ƒh‚ðŠÜ‚ß‚½–½—߂𶬂µ‚Ü‚·B—Z‡–½—ß‚Í opt_operand.def ‚Ì
+‹Lq‚É‚æ‚Á‚ÄŽ©“®“I‚ɶ¬‚³‚ê‚Ü‚·B
*** stack caching
-スタックトップを仮想レジスタã«ä¿æŒã™ã‚‹ã‚ˆã†ã«ã—ã¾ã™ã€‚ç¾åœ¨ã¯ 2 個ã®ä»®æƒ³ãƒ¬
-ジスタを想定ã—ã€5状態ã®ã‚¹ã‚¿ãƒƒã‚¯ã‚­ãƒ£ãƒƒã‚·ãƒ³ã‚°ã‚’行ãªã„ã¾ã™ã€‚スタックキャッ
-シングã™ã‚‹å‘½ä»¤ã¯è‡ªå‹•çš„ã«ç”Ÿæˆã•れã¾ã™ã€‚
+ƒXƒ^ƒbƒNƒgƒbƒv‚ð‰¼‘zƒŒƒWƒXƒ^‚ɕێ‚·‚邿‚¤‚É‚µ‚Ü‚·BŒ»Ý‚Í 2 ŒÂ‚̉¼‘zƒŒ
+ƒWƒXƒ^‚ð‘z’肵A5ó‘Ԃ̃Xƒ^ƒbƒNƒLƒƒƒbƒVƒ“ƒO‚ðs‚È‚¢‚Ü‚·BƒXƒ^ƒbƒNƒLƒƒƒb
+ƒVƒ“ƒO‚·‚é–½—߂͎©“®“I‚ɶ¬‚³‚ê‚Ü‚·B
*** JIT Compile
-機械語を切り貼りã—ã¾ã™ã€‚éžå¸¸ã«å®Ÿé¨“çš„ãªã‚³ãƒ¼ãƒ‰ã‚‚ã®ã—ã‹ä½œã£ã¦ãŠã‚Šã¾ã›ã‚“。ã»
-ã¨ã‚“ã©ã®ãƒ—ログラムã¯å‹•ãã¾ã›ã‚“。
+‹@ŠBŒê‚ðØ‚è“\‚肵‚Ü‚·B”ñí‚ÉŽÀŒ±“I‚ȃR[ƒh‚à‚Ì‚µ‚©ì‚Á‚Ä‚¨‚è‚Ü‚¹‚ñB‚Ù
+‚Æ‚ñ‚ǂ̃vƒƒOƒ‰ƒ€‚Í“®‚«‚Ü‚¹‚ñB
*** AOT Compile
-YARV 命令列を C 言語ã«å¤‰æ›ã—ã¾ã™ã€‚ã¾ã ååˆ†ãªæœ€é©åŒ–を行ãªãˆã¦ãŠã‚Šã¾ã›ã‚“ãŒã€
-ãれãªã‚Šã«å‹•ãã¾ã™ã€‚rb/aotc.rb ãŒã‚³ãƒ³ãƒ‘イラã§ã™ã€‚
+YARV –½—ß—ñ‚ð C Œ¾Œê‚ɕϊ·‚µ‚Ü‚·B‚Ü‚¾\•ª‚ÈÅ“K‰»‚ðs‚È‚¦‚Ä‚¨‚è‚Ü‚¹‚ñ‚ªA
+‚»‚ê‚È‚è‚É“®‚«‚Ü‚·Brb/aotc.rb ‚ªƒRƒ“ƒpƒCƒ‰‚Å‚·B
* Assembler (rb/yasm.rb)
-YARV 命令列ã®ã‚¢ã‚»ãƒ³ãƒ–ラを用æ„ã—ã¾ã—ãŸã€‚ä½¿ã„æ–¹ã¯ rb/yasm.rb ã‚’å‚ç…§ã—ã¦ã
-ã ã•ã„(ã¾ã ã€ä¾‹ç¤ºã—ã¦ã‚ã‚‹ç”Ÿæˆæ‰‹æ³•ã®ã™ã¹ã¦ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹ã‚ã‘ã§ã¯ã‚り
-ã¾ã›ã‚“)。
+YARV –½—ß—ñ‚̃AƒZƒ“ƒuƒ‰‚ð—pˆÓ‚µ‚Ü‚µ‚½BŽg‚¢•û‚Í rb/yasm.rb ‚ðŽQÆ‚µ‚Ä‚­
+‚¾‚³‚¢i‚Ü‚¾A—Ꭶ‚µ‚Ä‚ ‚鶬Žè–@‚Ì‚·‚ׂĂðƒTƒ|[ƒg‚µ‚Ä‚¢‚é‚킯‚ł͂ ‚è
+‚Ü‚¹‚ñjB
* Dis-Assembler (disasm.c)
-YARV 命令列を示ã™ã‚ªãƒ–ジェクト YARVCore::InstructionSequence ã«ã¯ disasm
-メソッドãŒã‚りã¾ã™ã€‚ã“れã¯ã€å‘½ä»¤åˆ—を逆アセンブルã—ãŸæ–‡å­—列を返ã—ã¾ã™ã€‚
+YARV –½—ß—ñ‚ðŽ¦‚·ƒIƒuƒWƒFƒNƒg YARVCore::InstructionSequence ‚É‚Í disasm
+ƒƒ\ƒbƒh‚ª‚ ‚è‚Ü‚·B‚±‚ê‚ÍA–½—ß—ñ‚ð‹tƒAƒZƒ“ƒuƒ‹‚µ‚½•¶Žš—ñ‚ð•Ô‚µ‚Ü‚·B
-* YARV 命令セット
+* YARV –½—߃Zƒbƒg
<%= d %>
-* ãã®ä»–
+* ‚»‚Ì‘¼
-** テスト
+** ƒeƒXƒg
-test/test_* ãŒãƒ†ã‚¹ãƒˆã‚±ãƒ¼ã‚¹ã§ã™ã€‚一応ã€ãƒŸã‚¹ãªãå‹•ãã¯ãšã§ã™ã€‚逆ã«ã„ã†ã¨ã€
-ã“ã®ãƒ†ã‚¹ãƒˆã«è¨˜è¿°ã•れã¦ã„る例ã§ã¯ãã¡ã‚“ã¨å‹•作ã™ã‚‹ã¨ã„ã†ã“ã¨ã§ã™ã€‚
+test/test_* ‚ªƒeƒXƒgƒP[ƒX‚Å‚·Bˆê‰žAƒ~ƒX‚È‚­“®‚­‚Í‚¸‚Å‚·B‹t‚É‚¢‚¤‚ÆA
+‚±‚̃eƒXƒg‚É‹Lq‚³‚ê‚Ä‚¢‚é—Ⴓ͂«‚¿‚ñ‚Æ“®ì‚·‚邯‚¢‚¤‚±‚Ƃł·B
-** ベンãƒãƒžãƒ¼ã‚¯
+** ƒxƒ“ƒ`ƒ}[ƒN
-benchmark/bm_* ã«ãƒ™ãƒ³ãƒãƒžãƒ¼ã‚¯ãƒ—ログラムãŒãŠã„ã¦ã‚りã¾ã™ã€‚
+benchmark/bm_* ‚Ƀxƒ“ƒ`ƒ}[ƒNƒvƒƒOƒ‰ƒ€‚ª‚¨‚¢‚Ä‚ ‚è‚Ü‚·B
-** 今後ã®äºˆå®š
+** ¡Œã‚Ì—\’è
-ã¾ã ã¾ã ã‚„らãªã‘れã°ã„ã‘ãªã„ã“ã¨ã€æœªå®Ÿè£…部分ãŒãŸãã•ã‚“ã‚りã¾ã™ã‚“ã§ã‚„ã£ã¦
-ã„ã‹ãªã‘れã°ãªã‚Šã¾ã›ã‚“。一番大ããªç›®æ¨™ã¯ eval.c ã‚’ç½®ãæ›ãˆã‚‹ã“ã¨ã§ã—ょã†
-ã‹ã€‚
+‚Ü‚¾‚Ü‚¾‚â‚ç‚È‚¯‚ê‚΂¢‚¯‚È‚¢‚±‚ÆA–¢ŽÀ‘••”•ª‚ª‚½‚­‚³‚ñ‚ ‚è‚Ü‚·‚ñ‚Å‚â‚Á‚Ä
+‚¢‚©‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñBˆê”Ô‘å‚«‚È–Ú•W‚Í eval.c ‚ð’u‚«Š·‚¦‚邱‚Ƃłµ‚傤
+‚©B
*** Verifier
-YARV 命令列ã¯ã€ãƒŸã‚¹ãŒã‚ã£ã¦ã‚‚å‹•ã‹ã—ã¦ã—ã¾ã†ãŸã‚å±é™ºã§ã‚ã‚‹å¯èƒ½æ€§ãŒã‚りã¾
-ã™ã€‚ãã®ãŸã‚ã€ã‚¹ã‚¿ãƒƒã‚¯ã®åˆ©ç”¨çŠ¶æ…‹ã‚’ãã¡ã‚“ã¨äº‹å‰ã«æ¤œè¨¼ã™ã‚‹ã‚ˆã†ãªãƒ™ãƒªãƒ•ァイ
-アを用æ„ã—ãªã‘れã°ãªã‚‰ãªã„ã¨è€ƒãˆã¦ã„ã¾ã™ã€‚
+YARV –½—ß—ñ‚ÍAƒ~ƒX‚ª‚ ‚Á‚Ä‚à“®‚©‚µ‚Ä‚µ‚Ü‚¤‚½‚ߊ댯‚Å‚ ‚é‰Â”\«‚ª‚ ‚è‚Ü
+‚·B‚»‚Ì‚½‚ßAƒXƒ^ƒbƒN‚Ì—˜—pó‘Ô‚ð‚«‚¿‚ñ‚ÆŽ–‘O‚ÉŒŸØ‚·‚邿‚¤‚ȃxƒŠƒtƒ@ƒC
+ƒA‚ð—pˆÓ‚µ‚È‚¯‚ê‚΂Ȃç‚È‚¢‚Æl‚¦‚Ä‚¢‚Ü‚·B
-*** Compiled File ã®æ§‹æƒ³
+*** Compiled File ‚Ì\‘z
-Ruby プログラムをã“ã®å‘½ä»¤ã‚»ãƒƒãƒˆã«ã‚·ãƒªã‚¢ãƒ©ã‚¤ã‚ºã—ãŸãƒ‡ãƒ¼ã‚¿æ§‹é€ ã‚’ファイルã«
-出力ã§ãるよã†ã«ã—ãŸã„ã¨è€ƒãˆã¦ã„ã¾ã™ã€‚ã“れを利用ã—ã¦ä¸€åº¦ã‚³ãƒ³ãƒ‘イルã—ãŸå‘½
-令列をファイルã«ä¿å­˜ã—ã¦ãŠã‘ã°ã€æ¬¡å›žãƒ­ãƒ¼ãƒ‰æ™‚ã«ã¯ã‚³ãƒ³ãƒ‘ã‚¤ãƒ«ã®æ‰‹é–“ã€ã‚³ã‚¹ãƒˆ
-ã‚’çœãã“ã¨ãŒã§ãã¾ã™ã€‚
+Ruby ƒvƒƒOƒ‰ƒ€‚ð‚±‚Ì–½—߃Zƒbƒg‚ɃVƒŠƒAƒ‰ƒCƒY‚µ‚½ƒf[ƒ^\‘¢‚ðƒtƒ@ƒCƒ‹‚É
+o—͂ł«‚邿‚¤‚É‚µ‚½‚¢‚Æl‚¦‚Ä‚¢‚Ü‚·B‚±‚ê‚ð—˜—p‚µ‚Ĉê“xƒRƒ“ƒpƒCƒ‹‚µ‚½–½
+—ß—ñ‚ðƒtƒ@ƒCƒ‹‚ɕۑ¶‚µ‚Ä‚¨‚¯‚ÎAŽŸ‰ñƒ[ƒhŽž‚ɂ̓Rƒ“ƒpƒCƒ‹‚ÌŽèŠÔAƒRƒXƒg
+‚ðÈ‚­‚±‚Æ‚ª‚Å‚«‚Ü‚·B
-**** 全体構æˆ
+**** ‘S‘Ì\¬
-次ã®ã‚ˆã†ãªãƒ•ァイル構æˆã‚’考ãˆã¦ã„ã¾ã™ãŒã€ã¾ã æœªå®šã§ã™ã€‚
+ŽŸ‚̂悤‚ȃtƒ@ƒCƒ‹\¬‚ðl‚¦‚Ä‚¢‚Ü‚·‚ªA‚Ü‚¾–¢’è‚Å‚·B
#code
u4 : 4 byte unsigned storage
@@ -450,5 +450,5 @@ CompiledFile{
}
#end
-Java classfile ã®ãƒ‘クリ。
+Java classfile ‚̃pƒNƒŠB
diff --git a/test/-ext-/array/test_resize.rb b/test/-ext-/array/test_resize.rb
deleted file mode 100644
index 8e526b5a0c..0000000000
--- a/test/-ext-/array/test_resize.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'test/unit'
-require '-test-/array/resize'
-
-class TestArray < Test::Unit::TestCase
- class TestResize < Test::Unit::TestCase
- def test_expand
- feature = '[ruby-dev:42912]'
- ary = [*1..10]
- ary.__resize__(10)
- assert_equal(10, ary.size, feature)
- assert_equal([*1..10], ary, feature)
- ary.__resize__(100)
- assert_equal(100, ary.size, feature)
- assert_equal([*1..10]+[nil]*90, ary, feature)
- ary.__resize__(20)
- assert_equal(20, ary.size, feature)
- assert_equal([*1..10]+[nil]*10, ary, feature)
- ary.__resize__(2)
- assert_equal(2, ary.size, feature)
- assert_equal([1,2], ary, feature)
- ary.__resize__(3)
- assert_equal(3, ary.size, feature)
- assert_equal([1,2,nil], ary, feature)
- ary.__resize__(10)
- assert_equal(10, ary.size, feature)
- assert_equal([1,2]+[nil]*8, ary, feature)
- end
- end
-end
diff --git a/test/-ext-/debug/test_debug.rb b/test/-ext-/debug/test_debug.rb
deleted file mode 100644
index 4c45057b5d..0000000000
--- a/test/-ext-/debug/test_debug.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'test/unit'
-require '-test-/debug'
-
-class TestDebug < Test::Unit::TestCase
-
- def binds_check binds
- count = Hash.new(0)
- assert_instance_of(Array, binds)
- binds.each{|(_self, bind, klass, iseq, loc)|
- if _self == self
- count[:self] += 1
- end
-
- if bind
- assert_instance_of(Binding, bind)
- count[:bind] += 1
- end
-
- if klass
- assert(klass.instance_of?(Module) || klass.instance_of?(Class))
- count[:class] += 1
- end
-
- if iseq
- count[:iseq] += 1
- assert_instance_of(RubyVM::InstructionSequence, iseq)
-
- # check same location
- assert_equal(loc.path, iseq.path)
- assert_equal(loc.absolute_path, iseq.absolute_path)
- assert_equal(loc.label, iseq.label)
- assert_operator(loc.lineno, :>=, iseq.first_lineno)
- end
-
- assert_instance_of(Thread::Backtrace::Location, loc)
-
- }
- assert_operator(0, :<, count[:self])
- assert_operator(0, :<, count[:bind])
- assert_operator(0, :<, count[:iseq])
- assert_operator(0, :<, count[:class])
- end
-
- def test_inspector_open
- binds = Bug::Debug.inspector
- binds_check binds
- end
-
- def inspector_in_eval
- eval("Bug::Debug.inspector")
- end
-
- def test_inspector_open_in_eval
- bug7635 = '[ruby-core:51640]'
- binds = inspector_in_eval
- binds_check binds
- end
-end
diff --git a/test/-ext-/exception/test_enc_raise.rb b/test/-ext-/exception/test_enc_raise.rb
deleted file mode 100644
index a578b167ea..0000000000
--- a/test/-ext-/exception/test_enc_raise.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'test/unit'
-require '-test-/exception'
-
-module Bug
- class TestException < Test::Unit::TestCase
- def test_enc_raise
- feature5650 = '[ruby-core:41160]'
- Encoding.list.each do |enc|
- next unless enc.ascii_compatible?
- e = assert_raise(Bug::Exception) {Bug::Exception.enc_raise(enc, "[Feature #5650]")}
- assert_equal(enc, e.message.encoding, feature5650)
- end
- end
- end
-end
diff --git a/test/-ext-/exception/test_ensured.rb b/test/-ext-/exception/test_ensured.rb
deleted file mode 100644
index 103250c678..0000000000
--- a/test/-ext-/exception/test_ensured.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'test/unit'
-require_relative '../../ruby/envutil'
-
-module Bug
- class Bug7802 < RuntimeError
- end
-
- class TestException < Test::Unit::TestCase
- def test_ensured
- assert_separately([], <<-'end;') # do
-
- require '-test-/exception'
-
- module Bug
- class Bug7802 < RuntimeError
- def try_method
- raise self
- end
-
- def ensured_method
- [1].detect {|i| true}
- end
- end
- end
-
- assert_raise(Bug::Bug7802, '[ruby-core:52022] [Bug #7802]') {
- Bug::Exception.ensured(Bug::Bug7802.new)
- }
- end;
- end
- end
-end
diff --git a/test/-ext-/funcall/test_passing_block.rb b/test/-ext-/funcall/test_passing_block.rb
deleted file mode 100644
index 87aed2212c..0000000000
--- a/test/-ext-/funcall/test_passing_block.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'test/unit'
-
-class TestFuncall < Test::Unit::TestCase
- module Relay
- def self.target(*args, &block)
- yield(*args) if block
- end
- end
- require '-test-/funcall/funcall'
-
- def test_with_funcall2
- ok = nil
- Relay.with_funcall2("feature#4504") {|arg| ok = arg || true}
- assert_nil(ok)
- end
-
- def test_with_funcall_passing_block
- ok = nil
- Relay.with_funcall_passing_block("feature#4504") {|arg| ok = arg || true}
- assert_equal("feature#4504", ok)
- end
-end
diff --git a/test/-ext-/iter/test_iter_break.rb b/test/-ext-/iter/test_iter_break.rb
deleted file mode 100644
index 1ef2aad3c2..0000000000
--- a/test/-ext-/iter/test_iter_break.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test/unit'
-require '-test-/iter/break'
-
-class TestIterBreak < Test::Unit::TestCase
- def test_iter_break
- backport7896 = '[ruby-core:52607]'
- assert_equal(nil, 1.times{Bug::Breakable.iter_break}, backport7896)
-
- feature5895 = '[ruby-dev:45132]'
- assert_equal(42, 1.times{Bug::Breakable.iter_break_value(42)}, feature5895)
- end
-end
diff --git a/test/-ext-/load/test_dot_dot.rb b/test/-ext-/load/test_dot_dot.rb
deleted file mode 100644
index 82aa10a95f..0000000000
--- a/test/-ext-/load/test_dot_dot.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'test/unit'
-
-class Test_DotDot < Test::Unit::TestCase
- def test_load_dot_dot
- feature = '[ruby-dev:41774]'
- assert_nothing_raised(LoadError, feature) {
- require '-test-/load/dot.dot/dot.dot'
- }
- end
-end
diff --git a/test/-ext-/marshal/test_usrmarshal.rb b/test/-ext-/marshal/test_usrmarshal.rb
deleted file mode 100644
index 54adace7d6..0000000000
--- a/test/-ext-/marshal/test_usrmarshal.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'test/unit'
-require_relative '../../ruby/envutil'
-require '-test-/marshal/usr'
-
-module Bug end
-
-module Bug::Marshal
- class TestUsrMarshal < Test::Unit::TestCase
- def old_dump
- @old_dump ||=
- begin
- src = "module Bug; module Marshal; class UsrMarshal; def initialize(val) @value = val; end; end; ::Marshal.dump(UsrMarshal.new(42), STDOUT); end; end"
- EnvUtil.invoke_ruby([], src, true)[0]
- end
- end
-
- def test_marshal
- v = ::Marshal.load(::Marshal.dump(UsrMarshal.new(42)))
- assert_instance_of(UsrMarshal, v)
- assert_equal(42, v.value)
- end
-
- def test_incompat
- e = assert_raise(ArgumentError) {::Marshal.load(old_dump)}
- assert_equal("dump format error", e.message)
- end
-
- def test_compat
- out, err = EnvUtil.invoke_ruby(["-r-test-/marshal/usr", "-r-test-/marshal/compat", "-e", "::Marshal.dump(::Marshal.load(STDIN), STDOUT)"], old_dump, true, true)
- assert_equal(::Marshal.dump(UsrMarshal.new(42)), out)
- assert_equal("", err)
- end
- end
-end
diff --git a/test/-ext-/method/test_arity.rb b/test/-ext-/method/test_arity.rb
deleted file mode 100644
index 79ef23b34f..0000000000
--- a/test/-ext-/method/test_arity.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require '-test-/method'
-require 'test/unit'
-
-class TestMethod < Test::Unit::TestCase
- class TestArity < Test::Unit::TestCase
- class A
- def foo0()
- end
- def foom1(*a)
- end
- def foom2(a,*b)
- end
- def foo1(a)
- end
- def foo2(a,b)
- end
- end
-
- class B<A
- private :foo1, :foo2
- end
-
- METHODS = {foo0: 0, foo1: 1, foo2: 2, foom1: -1, foom2: -2}
-
- def test_base
- METHODS.each do |name, arity|
- assert_equal(arity, Bug::Method.mod_method_arity(A, name), "A##{name}")
- end
- end
-
- def test_zsuper
- METHODS.each do |name, arity|
- assert_equal(arity, Bug::Method.mod_method_arity(B, name), "B##{name}")
- end
- end
- end
-end
diff --git a/test/-ext-/num2int/test_num2int.rb b/test/-ext-/num2int/test_num2int.rb
deleted file mode 100644
index b69f29a516..0000000000
--- a/test/-ext-/num2int/test_num2int.rb
+++ /dev/null
@@ -1,227 +0,0 @@
-require 'test/unit'
-
-class TestNum2int < Test::Unit::TestCase
- module Num2int
- end
- require '-test-/num2int/num2int'
-
- SHRT_MIN = -32768
- SHRT_MAX = 32767
- USHRT_MAX = 65535
-
- INT_MIN = -2147483648
- INT_MAX = 2147483647
- UINT_MAX = 4294967295
-
- case [0].pack('L!').size
- when 4
- LONG_MAX = 2147483647
- LONG_MIN = -2147483648
- ULONG_MAX = 4294967295
- when 8
- LONG_MAX = 9223372036854775807
- LONG_MIN = -9223372036854775808
- ULONG_MAX = 18446744073709551615
- end
-
- LLONG_MAX = 9223372036854775807
- LLONG_MIN = -9223372036854775808
- ULLONG_MAX = 18446744073709551615
-
- FIXNUM_MAX = LONG_MAX/2
- FIXNUM_MIN = LONG_MIN/2
-
- def test_num2short
- assert_output(SHRT_MIN.to_s) do
- Num2int.print_num2short(SHRT_MIN)
- end
- assert_output(SHRT_MAX.to_s) do
- Num2int.print_num2short(SHRT_MAX)
- end
- assert_raise(RangeError) do
- Num2int.print_num2short(SHRT_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2short(SHRT_MAX+1)
- end
- end
-
- def test_num2ushort
- assert_output("0") do
- Num2int.print_num2ushort(0)
- end
- assert_output(USHRT_MAX.to_s) do
- Num2int.print_num2ushort(USHRT_MAX)
- end
- assert_output(USHRT_MAX.to_s) do
- Num2int.print_num2ushort(-1)
- end
- assert_output((SHRT_MAX+1).to_s) do
- Num2int.print_num2ushort(SHRT_MIN)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ushort(SHRT_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ushort(USHRT_MAX+1)
- end
- end
-
- def test_num2int
- assert_output(INT_MIN.to_s) do
- Num2int.print_num2int(INT_MIN)
- end
- assert_output(INT_MAX.to_s) do
- Num2int.print_num2int(INT_MAX)
- end
- assert_raise(RangeError) do
- Num2int.print_num2int(INT_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2int(INT_MAX+1)
- end
- end
-
- def test_num2uint
- assert_output("0") do
- Num2int.print_num2uint(0)
- end
- assert_output(UINT_MAX.to_s) do
- Num2int.print_num2uint(UINT_MAX)
- end
- assert_output(UINT_MAX.to_s) do
- Num2int.print_num2uint(-1)
- end
- assert_output((INT_MAX+1).to_s) do
- Num2int.print_num2uint(INT_MIN)
- end
- assert_raise(RangeError) do
- Num2int.print_num2uint(INT_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2uint(UINT_MAX+1)
- end
- end
-
- def test_num2long
- assert_output(LONG_MIN.to_s) do
- Num2int.print_num2long(LONG_MIN)
- end
- assert_output(LONG_MAX.to_s) do
- Num2int.print_num2long(LONG_MAX)
- end
- assert_raise(RangeError) do
- Num2int.print_num2long(LONG_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2long(LONG_MAX+1)
- end
- assert_output(FIXNUM_MIN.to_s) do
- Num2int.print_num2long(FIXNUM_MIN)
- end
- assert_output((FIXNUM_MIN-1).to_s) do
- Num2int.print_num2long(FIXNUM_MIN-1)
- end
- assert_output(FIXNUM_MAX.to_s) do
- Num2int.print_num2long(FIXNUM_MAX)
- end
- assert_output((FIXNUM_MAX+1).to_s) do
- Num2int.print_num2long(FIXNUM_MAX+1)
- end
- end
-
- def test_num2ulong
- assert_output("0") do
- Num2int.print_num2ulong(0)
- end
- assert_output(ULONG_MAX.to_s) do
- Num2int.print_num2ulong(ULONG_MAX)
- end
- assert_output(ULONG_MAX.to_s) do
- Num2int.print_num2ulong(-1)
- end
- assert_output((LONG_MAX+1).to_s) do
- Num2int.print_num2ulong(LONG_MIN)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ulong(LONG_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ulong(ULONG_MAX+1)
- end
- assert_output((ULONG_MAX-FIXNUM_MAX).to_s) do
- Num2int.print_num2ulong(FIXNUM_MIN)
- end
- assert_output((ULONG_MAX-FIXNUM_MAX-1).to_s) do
- Num2int.print_num2ulong(FIXNUM_MIN-1)
- end
- assert_output(FIXNUM_MAX.to_s) do
- Num2int.print_num2ulong(FIXNUM_MAX)
- end
- assert_output((FIXNUM_MAX+1).to_s) do
- Num2int.print_num2ulong(FIXNUM_MAX+1)
- end
- end
-
- def test_num2ll
- assert_output(LONG_MIN.to_s) do
- Num2int.print_num2ll(LONG_MIN)
- end
- assert_output(LLONG_MAX.to_s) do
- Num2int.print_num2ll(LLONG_MAX)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ll(LLONG_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ll(LLONG_MAX+1)
- end
- assert_output(FIXNUM_MIN.to_s) do
- Num2int.print_num2ll(FIXNUM_MIN)
- end
- assert_output((FIXNUM_MIN-1).to_s) do
- Num2int.print_num2ll(FIXNUM_MIN-1)
- end
- assert_output(FIXNUM_MAX.to_s) do
- Num2int.print_num2ll(FIXNUM_MAX)
- end
- assert_output((FIXNUM_MAX+1).to_s) do
- Num2int.print_num2ll(FIXNUM_MAX+1)
- end
- end if defined?(Num2int.print_num2ll)
-
- def test_num2ull
- assert_output("0") do
- Num2int.print_num2ull(0)
- end
- assert_output(ULLONG_MAX.to_s) do
- Num2int.print_num2ull(ULLONG_MAX)
- end
- assert_output(ULLONG_MAX.to_s) do
- Num2int.print_num2ull(-1)
- end
- assert_output((LLONG_MAX+1).to_s) do
- Num2int.print_num2ull(LLONG_MIN)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ull(LLONG_MIN-1)
- end
- assert_raise(RangeError) do
- Num2int.print_num2ull(ULLONG_MAX+1)
- end
- assert_output((ULLONG_MAX-FIXNUM_MAX).to_s) do
- Num2int.print_num2ull(FIXNUM_MIN)
- end
- assert_output((ULLONG_MAX-FIXNUM_MAX-1).to_s) do
- Num2int.print_num2ull(FIXNUM_MIN-1)
- end
- assert_output(FIXNUM_MAX.to_s) do
- Num2int.print_num2ull(FIXNUM_MAX)
- end
- assert_output((FIXNUM_MAX+1).to_s) do
- Num2int.print_num2ull(FIXNUM_MAX+1)
- end
- end if defined?(Num2int.print_num2ull)
-end
-
-
diff --git a/test/-ext-/old_thread_select/test_old_thread_select.rb b/test/-ext-/old_thread_select/test_old_thread_select.rb
deleted file mode 100644
index 340351a08e..0000000000
--- a/test/-ext-/old_thread_select/test_old_thread_select.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'test/unit'
-
-class TestOldThreadSelect < Test::Unit::TestCase
- require '-test-/old_thread_select/old_thread_select'
-
- ANCIENT_LINUX = RUBY_PLATFORM =~ /linux/ && `uname -r`.chomp < '2.6.32'
- DARWIN_10 = RUBY_PLATFORM =~ /darwin10/
-
- def with_pipe
- r, w = IO.pipe
- begin
- yield r, w
- ensure
- r.close unless r.closed?
- w.close unless w.closed?
- end
- end
-
- def test_old_select_read_timeout
- with_pipe do |r, w|
- t0 = Time.now
- rc = IO.old_thread_select([r.fileno], nil, nil, 0.001)
- diff = Time.now - t0
- assert_equal 0, rc
- assert_operator diff, :>=, 0.001, "returned too early: diff=#{diff}"
- end
- end unless ANCIENT_LINUX
-
- def test_old_select_error_timeout
- bug5299 = '[ruby-core:39380]'
- with_pipe do |r, w|
- t0 = Time.now
- rc = IO.old_thread_select(nil, nil, [r.fileno], 0.001)
- diff = Time.now - t0
- assert_equal 0, rc, bug5299
- assert_operator diff, :>=, 0.001, "returned too early: diff=#{diff}"
- end
- end unless ANCIENT_LINUX
-
- def test_old_select_false_positive
- bug5306 = '[ruby-core:39435]'
- with_pipe do |r2, w2|
- with_pipe do |r, w|
- t0 = Time.now
- w.syswrite '.'
- rfds = [ r.fileno, r2.fileno ]
- rc = IO.old_thread_select(rfds, nil, nil, nil)
- assert_equal [ r.fileno ], rfds, bug5306
- assert_equal 1, rc, bug5306
- end
- end
- end
-
- def test_old_select_read_write_check
- with_pipe do |r, w|
- w.syswrite('.')
- rc = IO.old_thread_select([r.fileno], nil, nil, nil)
- assert_equal 1, rc
-
- rc = IO.old_thread_select([r.fileno], [w.fileno], nil, nil)
- assert_equal 2, rc
-
- assert_equal '.', r.read(1)
-
- rc = IO.old_thread_select([r.fileno], [w.fileno], nil, nil)
- assert_equal 1, rc
- end
- end
-
- def test_old_select_signal_safe
- return unless Process.respond_to?(:kill)
- received = false
- trap(:INT) { received = true }
- main = Thread.current
- thr = Thread.new do
- Thread.pass until main.stop?
- Process.kill(:INT, $$)
- true
- end
-
- rc = nil
- diff = nil
- with_pipe do |r,w|
- assert_nothing_raised do
- t0 = Time.now
- rc = IO.old_thread_select([r.fileno], nil, nil, 1)
- diff = Time.now - t0
- end
- end
-
- unless ANCIENT_LINUX || DARWIN_10
- assert_operator diff, :>=, 1, "interrupted or short wait: diff=#{diff}"
- end
- assert_equal 0, rc
- assert_equal true, thr.value
- assert_not_equal false, received, "SIGINT not received"
- ensure
- trap(:INT, "DEFAULT")
- end
-end
diff --git a/test/-ext-/path_to_class/test_path_to_class.rb b/test/-ext-/path_to_class/test_path_to_class.rb
deleted file mode 100644
index fdf4097fde..0000000000
--- a/test/-ext-/path_to_class/test_path_to_class.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test/unit'
-
-class Test_PathToClass < Test::Unit::TestCase
- require '-test-/path_to_class/path_to_class'
-
- def test_path_to_class
- bug5691 = '[ruby-core:41410]'
- assert_raise(ArgumentError, bug5691) {
- Test_PathToClass.path_to_class("Test_PathToClass::Object")
- }
- end
-end
diff --git a/test/-ext-/st/test_numhash.rb b/test/-ext-/st/test_numhash.rb
deleted file mode 100644
index 24dc87c1d9..0000000000
--- a/test/-ext-/st/test_numhash.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test/unit'
-require "-test-/st/numhash"
-
-class Bug::StNumHash
- class Test_NumHash < Test::Unit::TestCase
- def setup
- @tbl = Bug::StNumHash.new
- 5.times {|i| @tbl[i] = i}
- end
-
- def test_check
- keys = []
- @tbl.each do |k, v, t|
- keys << k
- t[5] = 5 if k == 3
- true
- end
- assert_equal([*0..5], keys)
- end
-
- def test_update
- assert_equal(true, @tbl.update(0) {@tbl[5] = :x})
- assert_equal(:x, @tbl[0])
- assert_equal(:x, @tbl[5])
- end
-
- def test_size_after_delete_safe
- 10.downto(1) do |up|
- tbl = Bug::StNumHash.new
- 1.upto(up){|i| tbl[i] = i}
- assert_equal(1, tbl.delete_safe(1))
- assert_equal(up - 1, tbl.size, "delete_safe doesn't change size from #{up} to #{up-1}")
- end
- end
-
- def test_delete_safe_on_iteration
- 10.downto(1) do |up|
- tbl = Bug::StNumHash.new
- 1.upto(up){|i| tbl[i] = i}
- assert_nothing_raised("delete_safe forces iteration to fail with size #{up}") do
- tbl.each do |k, v, t|
- assert_equal k, t.delete_safe(k)
- true
- end
- end
- end
- end
- end
-end
diff --git a/test/-ext-/st/test_update.rb b/test/-ext-/st/test_update.rb
deleted file mode 100644
index 1b41d2bc03..0000000000
--- a/test/-ext-/st/test_update.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'test/unit'
-require "-test-/st/update"
-
-class Bug::StTable
- class Test_Update < Test::Unit::TestCase
- def setup
- @tbl = Bug::StTable.new
- @tbl[:a] = 1
- @tbl[:b] = 2
- end
-
- def test_notfound
- assert_equal(false, @tbl.st_update(:c) {42})
- assert_equal({a: 1, b: 2, c: 42}, @tbl)
- end
-
- def test_continue
- args = nil
- assert_equal(true, @tbl.st_update(:a) {|*x| args = x; false})
- assert_equal({a: 1, b: 2}, @tbl, :a)
- assert_equal([:a, 1], args)
- end
-
- def test_delete
- args = nil
- assert_equal(true, @tbl.st_update(:a) {|*x| args = x; nil})
- assert_equal({b: 2}, @tbl, :a)
- assert_equal([:a, 1], args)
- end
-
- def test_update
- args = nil
- assert_equal(true, @tbl.st_update(:a) {|*x| args = x; 3})
- assert_equal({a: 3, b: 2}, @tbl, :a)
- assert_equal([:a, 1], args)
- end
-
- def test_pass_objects_in_st_table
- bug7330 = '[ruby-core:49220]'
- key = "abc".freeze
- value = "def"
- @tbl[key] = value
- @tbl.st_update("abc") {|*args|
- assert_same(key, args[0], bug7330)
- assert_same(value, args[1], bug7330)
- nil
- }
- end
- end
-end
diff --git a/test/-ext-/string/test_ellipsize.rb b/test/-ext-/string/test_ellipsize.rb
deleted file mode 100644
index 6ef7d0a1a3..0000000000
--- a/test/-ext-/string/test_ellipsize.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'test/unit'
-require "-test-/string/string"
-
-class Test_StringEllipsize < Test::Unit::TestCase
- def setup
- @foobar = Bug::String.new("foobar")
- end
-
- def assert_equal_with_class(expected, result, *rest)
- assert_equal(expected.encoding, result.encoding, *rest)
- assert_equal(expected, result, result.encoding.name)
- assert_instance_of(Bug::String, result, *rest)
- end
-
- def test_longer
- assert_equal_with_class("", @foobar.ellipsize(0))
- assert_equal_with_class(".", @foobar.ellipsize(1))
- assert_equal_with_class("..", @foobar.ellipsize(2))
- assert_equal_with_class("...", @foobar.ellipsize(3))
- assert_equal_with_class("f...", @foobar.ellipsize(4))
- assert_equal_with_class("fo...", @foobar.ellipsize(5))
- end
-
- def test_shorter
- assert_same(@foobar, @foobar.ellipsize(6))
- assert_same(@foobar, @foobar.ellipsize(7))
- end
-
- def test_negative_length
- assert_raise(IndexError) {@foobar.ellipsize(-1)}
- end
-
- def test_nonascii
- a = "\u3042"
- encs = Encoding.list.each do |enc|
- next if enc.dummy?
- begin
- s = a.encode(enc)
- e = "...".encode(enc)
- rescue
- else
- assert_equal_with_class(s*12+e, Bug::String.new(s*20).ellipsize(15))
- end
- end
- end
-end
diff --git a/test/-ext-/string/test_enc_associate.rb b/test/-ext-/string/test_enc_associate.rb
deleted file mode 100644
index edddfb4316..0000000000
--- a/test/-ext-/string/test_enc_associate.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'test/unit'
-require "-test-/string/string"
-
-class Test_StrEncAssociate < Test::Unit::TestCase
- def test_frozen
- s = Bug::String.new("abc")
- s.force_encoding(Encoding::US_ASCII)
- s.freeze
- assert_raise(RuntimeError) {s.associate_encoding!(Encoding::US_ASCII)}
- assert_raise(RuntimeError) {s.associate_encoding!(Encoding::UTF_8)}
- end
-end
diff --git a/test/-ext-/string/test_enc_str_buf_cat.rb b/test/-ext-/string/test_enc_str_buf_cat.rb
deleted file mode 100644
index 9582fe268c..0000000000
--- a/test/-ext-/string/test_enc_str_buf_cat.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'test/unit'
-require "-test-/string/string"
-
-class Test_StringEncStrBufCat < Test::Unit::TestCase
- Bug6509 = '[ruby-dev:45688]'
-
- def test_unknown
- a8_str = "a\xBE".force_encoding(Encoding::ASCII_8BIT)
- cr_unknown_str = [0x62].pack('C*')
- assert_equal(true, a8_str.valid_encoding?, "an assertion for following tests")
- assert_equal(:valid, Bug::String.new(a8_str).coderange, "an assertion for following tests")
- assert_equal(:unknown, Bug::String.new(cr_unknown_str).coderange, "an assertion for following tests")
- assert_equal(:valid, Bug::String.new(a8_str).enc_str_buf_cat(cr_unknown_str).coderange, Bug6509)
- end
-end
diff --git a/test/-ext-/string/test_modify_expand.rb b/test/-ext-/string/test_modify_expand.rb
deleted file mode 100644
index 6a18560bd4..0000000000
--- a/test/-ext-/string/test_modify_expand.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'test/unit'
-require "-test-/string/string"
-require_relative '../../ruby/envutil'
-
-class Test_StringModifyExpand < Test::Unit::TestCase
- def test_modify_expand_memory_leak
- assert_no_memory_leak(["-r-test-/string/string"], <<-PRE, <<-CMD, "rb_str_modify_expand()")
- s=Bug::String.new
- PRE
- size = $initial_size
- 10.times{s.modify_expand!(size)}
- s.replace("")
- CMD
- end
-end
diff --git a/test/-ext-/string/test_qsort.rb b/test/-ext-/string/test_qsort.rb
deleted file mode 100644
index 3a58523200..0000000000
--- a/test/-ext-/string/test_qsort.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'test/unit'
-require "-test-/string/string"
-
-class Test_StringQSort < Test::Unit::TestCase
- def test_qsort
- s = Bug::String.new("xxozfxx")
- s.qsort!
- assert_equal("foxxxxz", s)
- end
-
- def test_qsort_slice
- s = Bug::String.new("xxofzx1")
- s.qsort!(nil, nil, 3)
- assert_equal("fzxxxo1", s)
- s = Bug::String.new("xxofzx231")
- s.qsort!(nil, nil, 3)
- assert_equal("231fzxxxo", s)
- end
-end
diff --git a/test/-ext-/string/test_set_len.rb b/test/-ext-/string/test_set_len.rb
deleted file mode 100644
index e257cacb83..0000000000
--- a/test/-ext-/string/test_set_len.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'test/unit'
-require "-test-/string/string"
-
-class Test_StrSetLen < Test::Unit::TestCase
- def setup
- @s0 = [*"a".."z"].join("").freeze
- @s1 = Bug::String.new(@s0)
- end
-
- def teardown
- orig = [*"a".."z"].join("")
- assert_equal(orig, @s0)
- end
-
- def test_non_shared
- @s1.modify!
- assert_equal("abc", @s1.set_len(3))
- end
-
- def test_shared
- assert_raise(RuntimeError) {
- assert_equal("abc", @s1.set_len(3))
- }
- end
-end
diff --git a/test/-ext-/struct/test_member.rb b/test/-ext-/struct/test_member.rb
deleted file mode 100644
index 4e6295c218..0000000000
--- a/test/-ext-/struct/test_member.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'test/unit'
-require "-test-/struct"
-require_relative '../../ruby/envutil'
-
-class Bug::Struct::Test_Member < Test::Unit::TestCase
- S = Bug::Struct.new(:a)
-
- def test_member_get
- s = S.new(1)
- assert_equal(1, s.get(:a))
- assert_raise_with_message(NameError, /is not a struct member/) {s.get(:b)}
- EnvUtil.with_default_external(Encoding::UTF_8) do
- assert_raise_with_message(NameError, /\u{3042}/) {s.get(:"\u{3042}")}
- end
- end
-end
diff --git a/test/-ext-/symbol/test_inadvertent_creation.rb b/test/-ext-/symbol/test_inadvertent_creation.rb
deleted file mode 100644
index 6447c955c5..0000000000
--- a/test/-ext-/symbol/test_inadvertent_creation.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-require 'test/unit'
-require "-test-/symbol/symbol"
-
-module Test_Symbol
- class TestInadvertent < Test::Unit::TestCase
- def noninterned_name(prefix = "")
- prefix += "_#{Thread.current.object_id.to_s(36).tr('-', '_')}"
- begin
- name = "#{prefix}_#{rand(0x1000).to_s(16)}_#{Time.now.usec}"
- end while Bug::Symbol.interned?(name)
- name
- end
-
- def setup
- @obj = Object.new
- end
-
- def assert_not_interned(name, msg = nil)
- assert_not_send([Bug::Symbol, :interned?, name], msg)
- end
-
- def assert_not_interned_error(obj, meth, name, msg = nil)
- e = assert_raise(NameError, msg) {obj.__send__(meth, name)}
- assert_not_interned(name, msg)
- e
- end
-
- def assert_not_interned_false(obj, meth, name, msg = nil)
- assert_not_send([obj, meth, name], msg)
- assert_not_interned(name, msg)
- end
-
- Feature5072 = '[ruby-core:38367]'
-
- def test_module_const_get
- cl = Class.new
- name = noninterned_name("A")
-
- assert_not_interned_false(cl, :const_defined?, name, Feature5072)
- end
-
- def test_respond_to_missing
- feature5072 = Feature5072
- c = Class.new do
- def self.respond_to_missing?(*)
- super
- end
- end
- s = noninterned_name
-
- # assert_not_interned_false(c, :respond_to?, s, feature5072)
- assert_not_interned_false(c, :method_defined?, s, feature5072)
- assert_not_interned_false(c, :public_method_defined?, s, feature5072)
- assert_not_interned_false(c, :private_method_defined?, s, feature5072)
- assert_not_interned_false(c, :protected_method_defined?, s, feature5072)
- assert_not_interned_false(c, :const_defined?, noninterned_name("A"), feature5072)
- assert_not_interned_false(c, :instance_variable_defined?, noninterned_name("@"), feature5072)
- assert_not_interned_false(c, :class_variable_defined?, noninterned_name("@@"), feature5072)
- end
-
- Feature5079 = '[ruby-core:38404]'
-
- def test_undefined_instance_variable
- feature5079 = feature5079
- c = Class.new
- iv = noninterned_name("@")
-
- assert_not_interned_false(c, :instance_variable_get, iv, feature5079)
- assert_not_interned_error(c, :remove_instance_variable, iv, feature5079)
- end
-
- def test_undefined_class_variable
- feature5079 = feature5079
- c = Class.new
- cv = noninterned_name("@@")
-
- assert_not_interned_error(c, :class_variable_get, cv, feature5079)
- assert_not_interned_error(c, :remove_class_variable, cv, feature5079)
- end
-
-
- def test_undefined_const
- feature5079 = feature5079
- c = Class.new
- s = noninterned_name("A")
-
- assert_not_interned_error(c, :remove_const, s, feature5079)
- end
-
- def test_undefined_method
- feature5079 = feature5079
- c = Class.new
- s = noninterned_name
-
- assert_not_interned_error(c, :method, s, feature5079)
- assert_not_interned_error(c, :public_method, s, feature5079)
- assert_not_interned_error(c, :instance_method, s, feature5079)
- assert_not_interned_error(c, :public_instance_method, s, feature5079)
- end
-
- Feature5089 = '[ruby-core:38447]'
- def test_const_missing
- feature5089 = Feature5089
- c = Class.new do
- def self.const_missing(const_name)
- raise NameError, const_name.to_s
- end
- end
- s = noninterned_name("A")
-
- # assert_not_interned_error(c, :const_get, s, feature5089)
- assert_not_interned_false(c, :autoload?, s, feature5089)
- end
-
- def test_aliased_method
- feature5089 = Feature5089
- c = Class.new do
- def self.alias_method(str)
- super(:puts, str)
- end
- end
- s = noninterned_name
-
- assert_not_interned_error(c, :alias_method, s, feature5089)
- assert_not_interned_error(c, :private_class_method, s, feature5089)
- assert_not_interned_error(c, :private_constant, s, feature5089)
- assert_not_interned_error(c, :private, s, feature5089)
- assert_not_interned_error(c, :protected, s, feature5089)
- assert_not_interned_error(c, :public, s, feature5089)
- assert_not_interned_error(c, :public_class_method, s, feature5089)
- assert_not_interned_error(c, :public_constant, s, feature5089)
- assert_not_interned_error(c, :remove_method, s, feature5089)
- assert_not_interned_error(c, :undef_method, s, feature5089)
- assert_not_interned_error(c, :untrace_var, s, feature5089)
- end
-
- Feature5112 = '[ruby-core:38576]'
-
- def test_public_send
- name = noninterned_name
- e = assert_raise(NoMethodError) {@obj.public_send(name, Feature5112)}
- assert_not_send([Bug::Symbol, :interned?, name])
- assert_equal(name, e.name)
- assert_equal([Feature5112], e.args)
- end
-
- def test_send
- name = noninterned_name
- e = assert_raise(NoMethodError) {@obj.send(name, Feature5112)}
- assert_not_send([Bug::Symbol, :interned?, name])
- assert_equal(name, e.name)
- assert_equal([Feature5112], e.args)
- end
-
- def test___send__
- name = noninterned_name
- e = assert_raise(NoMethodError) {@obj.__send__(name, Feature5112)}
- assert_not_send([Bug::Symbol, :interned?, name])
- assert_equal(name, e.name)
- assert_equal([Feature5112], e.args)
- end
-
- def test_struct_new
- name = noninterned_name
- assert_raise(NameError) {Struct.new(name)}
- assert_not_send([Bug::Symbol, :interned?, name])
- end
-
- def test_struct_aref
- s = Struct.new(:foo).new
- name = noninterned_name
- assert_raise(NameError) {s[name]}
- assert_not_send([Bug::Symbol, :interned?, name])
- end
-
- def test_struct_aset
- s = Struct.new(:foo).new
- name = noninterned_name
- assert_raise(NameError) {s[name] = true}
- assert_not_send([Bug::Symbol, :interned?, name])
- end
- end
-end
diff --git a/test/-ext-/symbol/test_type.rb b/test/-ext-/symbol/test_type.rb
deleted file mode 100644
index 034d8bc0fd..0000000000
--- a/test/-ext-/symbol/test_type.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'test/unit'
-require "-test-/symbol"
-
-module Test_Symbol
- class TestType < Test::Unit::TestCase
- def assert_symtype(sym, pred, msg = nil)
- assert_send([Bug::Symbol, pred, sym], msg)
- end
-
- def assert_not_symtype(sym, pred, msg = nil)
- assert_not_send([Bug::Symbol, pred, sym], msg)
- end
-
- def test_const
- assert_symtype("Foo", :const?)
- assert_not_symtype("F!", :const?)
- assert_not_symtype("foo", :const?)
- assert_not_symtype("@foo", :const?)
- assert_not_symtype("@@foo", :const?)
- assert_not_symtype("$foo", :const?)
- assert_not_symtype("foo=", :const?)
- assert_not_symtype("[foo]", :const?)
- assert_not_symtype("xFoo", :const?)
- end
-
- def test_local
- assert_symtype("foo", :local?)
- assert_symtype("fooBar", :local?)
- assert_symtype("foo_bar", :local?)
- assert_not_symtype("foo!", :local?)
- assert_not_symtype("foo?", :local?)
- assert_not_symtype("Foo", :local?)
- assert_not_symtype("@foo", :local?)
- assert_not_symtype("@@foo", :local?)
- assert_not_symtype("$foo", :local?)
- assert_not_symtype("foo=", :local?)
- assert_not_symtype("[foo]", :local?)
- end
-
- def test_global
- assert_symtype("$foo", :global?)
- assert_symtype("$$", :global?)
- assert_not_symtype("$()", :global?)
- assert_not_symtype("$", :global?)
- assert_not_symtype("foo", :global?)
- assert_not_symtype("Foo", :global?)
- assert_not_symtype("@foo", :global?)
- assert_not_symtype("@@foo", :global?)
- assert_not_symtype("foo=", :global?)
- assert_not_symtype("[foo]", :global?)
- end
-
- def test_instance
- assert_symtype("@foo", :instance?)
- assert_not_symtype("@", :instance?)
- assert_not_symtype("@1", :instance?)
- assert_not_symtype("@@", :instance?)
- assert_not_symtype("foo", :instance?)
- assert_not_symtype("Foo", :instance?)
- assert_not_symtype("@@foo", :instance?)
- assert_not_symtype("$foo", :instance?)
- assert_not_symtype("foo=", :instance?)
- assert_not_symtype("[foo]", :instance?)
- end
-
- def test_class
- assert_symtype("@@foo", :class?)
- assert_not_symtype("@@", :class?)
- assert_not_symtype("@", :class?)
- assert_not_symtype("@@1", :class?)
- assert_not_symtype("foo", :class?)
- assert_not_symtype("Foo", :class?)
- assert_not_symtype("@foo", :class?)
- assert_not_symtype("$foo", :class?)
- assert_not_symtype("foo=", :class?)
- assert_not_symtype("[foo]", :class?)
- end
-
- def test_attrset
- assert_symtype("foo=", :attrset?)
- assert_symtype("Foo=", :attrset?)
- assert_symtype("@foo=", :attrset?)
- assert_symtype("@@foo=", :attrset?)
- assert_symtype("$foo=", :attrset?)
- assert_symtype("0=", :attrset?)
- assert_symtype("@=", :attrset?)
- assert_symtype("@@=", :attrset?)
- assert_not_symtype("foo", :attrset?)
- assert_not_symtype("Foo", :attrset?)
- assert_not_symtype("@foo", :attrset?)
- assert_not_symtype("@@foo", :attrset?)
- assert_not_symtype("$foo", :attrset?)
- assert_not_symtype("[foo]", :attrset?)
- assert_symtype("[foo]=", :attrset?)
- assert_equal(:"foo=", Bug::Symbol.attrset("foo"))
- assert_symtype(Bug::Symbol.attrset("foo"), :attrset?)
- assert_equal(:"Foo=", Bug::Symbol.attrset("Foo"))
- assert_symtype(Bug::Symbol.attrset("Foo"), :attrset?)
- assert_equal(:"@foo=", Bug::Symbol.attrset("@foo"))
- assert_symtype(Bug::Symbol.attrset("@foo"), :attrset?)
- assert_equal(:"@@foo=", Bug::Symbol.attrset("@@foo"))
- assert_symtype(Bug::Symbol.attrset("@@foo"), :attrset?)
- assert_equal(:"$foo=", Bug::Symbol.attrset("$foo"))
- assert_symtype(Bug::Symbol.attrset("$foo"), :attrset?)
- assert_equal(:"[foo]=", Bug::Symbol.attrset("[foo]"))
- assert_symtype(Bug::Symbol.attrset("[foo]"), :attrset?)
- assert_equal(:[]=, Bug::Symbol.attrset(:[]))
- assert_symtype(Bug::Symbol.attrset("foo?="), :attrset?)
- assert_equal(:"foo?=", Bug::Symbol.attrset(:foo?))
- assert_symtype(Bug::Symbol.attrset("foo!="), :attrset?)
- assert_equal(:"foo!=", Bug::Symbol.attrset(:foo!))
- end
- end
-end
diff --git a/test/-ext-/test_bug-3571.rb b/test/-ext-/test_bug-3571.rb
deleted file mode 100644
index cd43d0330d..0000000000
--- a/test/-ext-/test_bug-3571.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'test/unit'
-require_relative '../ruby/envutil'
-
-class Test_BUG_3571 < Test::Unit::TestCase
- def test_block_call_id
- bug3571 = '[ruby-dev:41852]'
- src = <<SRC
-begin
- Bug.start
-rescue NotImplementedError => e
- STDERR.puts e.message, e.backtrace[$0.size..-1]
-end
-SRC
- out = [
- "start() function is unimplemented on this machine",
- "-:2:in `start'",
- "-:2:in `<main>'",
- ]
- assert_in_out_err(%w"-r-test-/bug-3571/bug", src, [], out, bug3571)
- end
-end
diff --git a/test/-ext-/test_bug-5832.rb b/test/-ext-/test_bug-5832.rb
deleted file mode 100644
index 11f8a52a95..0000000000
--- a/test/-ext-/test_bug-5832.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require '-test-/bug-5832/bug'
-
-class Test_BUG_5832 < Test::Unit::TestCase
- def test_block_passing
- bug5832 = '[ruby-dev:45071]'
-
- c = Class.new do
- define_method(:call_invoke_block_from_c) do
- Bug.funcall_callback(self)
- end
-
- def callback
- yield if block_given?
- end
- end
-
- assert_nothing_raised(RuntimeError, bug5832) do
- c.new.call_invoke_block_from_c { raise 'unreachable' }
- end
- end
-end
diff --git a/test/-ext-/test_printf.rb b/test/-ext-/test_printf.rb
deleted file mode 100644
index c652e46f20..0000000000
--- a/test/-ext-/test_printf.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'test/unit'
-require "-test-/printf"
-
-class Test_SPrintf < Test::Unit::TestCase
- def to_s
- "#{self.class}:#{object_id}"
- end
-
- def inspect
- "<#{self.class}:#{object_id}>"
- end
-
- def test_int
- assert_match(/\A<-?\d+>\z/, Bug::Printf.i(self))
- end
-
- def test_to_str
- assert_equal("<#{self.class}:#{object_id}>", Bug::Printf.s(self))
- end
-
- def test_inspect
- assert_equal("{<#{self.class}:#{object_id}>}", Bug::Printf.v(self))
- end
-
- def test_quote
- assert_equal('["\n"]', Bug::Printf.q("\n"))
- assert_equal('[aaa]', Bug::Printf.q('aaa'))
- assert_equal('[a a]', Bug::Printf.q('a a'))
- end
-
- def test_encoding
- def self.to_s
- "\u{3042 3044 3046 3048 304a}"
- end
- assert_equal("<\u{3042 3044 3046 3048 304a}>", Bug::Printf.s(self))
- end
-
- def test_taint
- obj = Object.new.taint
- assert_equal({to_s: true, inspect: true},
- {
- to_s: Bug::Printf.s(obj).tainted?,
- inspect: Bug::Printf.v(obj).tainted?,
- })
- end
-
- def test_untrust
- obj = Object.new.untrust
- assert_equal({to_s: true, inspect: true},
- {
- to_s: Bug::Printf.s(obj).untrusted?,
- inspect: Bug::Printf.v(obj).untrusted?,
- })
- end
-
- def test_string_prec
- assert_equal("a", Bug::Printf.("s", "a", prec: 3)[0])
- assert_equal(" a", Bug::Printf.("s", "a", width: 3, prec: 3)[0])
- assert_equal("a ", Bug::Printf.("s", "a", minus: true, width: 3, prec: 3)[0])
- end
-end
diff --git a/test/-ext-/typeddata/test_typeddata.rb b/test/-ext-/typeddata/test_typeddata.rb
deleted file mode 100644
index 50505850d8..0000000000
--- a/test/-ext-/typeddata/test_typeddata.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'test/unit'
-require "-test-/typeddata/typeddata"
-
-class Test_TypedData < Test::Unit::TestCase
- def test_wrong_argtype
- e = assert_raise(TypeError) {Bug::TypedData.check(false)}
- assert_equal("wrong argument type false (expected typed_data)", e.message)
-
- e = assert_raise(TypeError) {Bug::TypedData.check(true)}
- assert_equal("wrong argument type true (expected typed_data)", e.message)
-
- e = assert_raise(TypeError) {Bug::TypedData.check(:e)}
- assert_equal("wrong argument type Symbol (expected typed_data)", e.message)
-
- e = assert_raise(TypeError) {Bug::TypedData.check(0)}
- assert_equal("wrong argument type Fixnum (expected typed_data)", e.message)
-
- e = assert_raise(TypeError) {Bug::TypedData.check("a")}
- assert_equal("wrong argument type String (expected typed_data)", e.message)
- end
-end
diff --git a/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb b/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
deleted file mode 100644
index e181068611..0000000000
--- a/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'test/unit'
-
-class TestWaitForSingleFD < Test::Unit::TestCase
- require '-test-/wait_for_single_fd/wait_for_single_fd'
-
- def with_pipe
- r, w = IO.pipe
- begin
- yield r, w
- ensure
- r.close unless r.closed?
- w.close unless w.closed?
- end
- end
-
- def test_wait_for_valid_fd
- with_pipe do |r,w|
- rc = IO.wait_for_single_fd(w.fileno, RB_WAITFD_OUT, nil)
- assert_equal RB_WAITFD_OUT, rc
- end
- end
-
- def test_wait_for_invalid_fd
- # FreeBSD 8.2 or prior sticks this
- # http://bugs.ruby-lang.org/issues/5524
- skip if /freebsd[1-8]/ =~ RUBY_PLATFORM
- with_pipe do |r,w|
- wfd = w.fileno
- w.close
- assert_raises(Errno::EBADF) do
- IO.wait_for_single_fd(wfd, RB_WAITFD_OUT, nil)
- end
- end
- end
-
- def test_wait_for_closed_pipe
- with_pipe do |r,w|
- w.close
- rc = IO.wait_for_single_fd(r.fileno, RB_WAITFD_IN, nil)
- assert_equal RB_WAITFD_IN, rc
- end
- end
-
-
-end
diff --git a/test/-ext-/win32/test_dln.rb b/test/-ext-/win32/test_dln.rb
deleted file mode 100644
index 7c5fe61f59..0000000000
--- a/test/-ext-/win32/test_dln.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'test/unit'
-require_relative '../../ruby/envutil'
-
-module Bug
- module Win32
- class TestDln < Test::Unit::TestCase
- def test_check_imported
- bug = '[Bug #6303]'
- assert_in_out_err(['-r-test-/win32/dln', '-eexit'], '', [], [], bug, timeout: 10)
- end
- end
- end
-end if /mswin|mingw/ =~ RUBY_PLATFORM
diff --git a/test/-ext-/win32/test_fd_setsize.rb b/test/-ext-/win32/test_fd_setsize.rb
deleted file mode 100644
index 0881971969..0000000000
--- a/test/-ext-/win32/test_fd_setsize.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'test/unit'
-require_relative '../../ruby/envutil'
-
-module Bug
- module Win32
- class TestFdSetSize < Test::Unit::TestCase
- def test_select_with_unmatched_fd_setsize
- bug6532 = '[ruby-core:44588]'
- assert_in_out_err([], <<-INPUT, %w(:ok), [], bug6532)
- require '-test-/win32/fd_setsize'
- Bug::Win32.test_select
- p :ok
- INPUT
- end
-
- def test_fdset_with_unmatched_fd_setsize
- bug6532 = '[ruby-core:44588]'
- assert_in_out_err([], <<-INPUT, %w(:ok), [], bug6532)
- require '-test-/win32/fd_setsize'
- p :ok if Bug::Win32.test_fdset
- INPUT
- end
- end
- end
-end if /mswin|mingw/ =~ RUBY_PLATFORM
diff --git a/test/base64/test_base64.rb b/test/base64/test_base64.rb
index c5e61b31ac..9ae54cb405 100644
--- a/test/base64/test_base64.rb
+++ b/test/base64/test_base64.rb
@@ -1,4 +1,3 @@
-# coding: US-ASCII
require "test/unit"
require "base64"
diff --git a/test/benchmark/test_benchmark.rb b/test/benchmark/test_benchmark.rb
index 7477fa8e05..6d390558ac 100644
--- a/test/benchmark/test_benchmark.rb
+++ b/test/benchmark/test_benchmark.rb
@@ -1,169 +1,10 @@
-require 'minitest/spec'
-require 'benchmark'
+require "test/unit"
+require "benchmark"
-MiniTest::Unit.autorun
-
-describe Benchmark do
- bench_for_times_upto = lambda do |x|
- n = 1000
- tf = x.report("for:") { for _ in 1..n; '1'; end }
- tt = x.report("times:") { n.times do ; '1'; end }
- tu = x.report("upto:") { 1.upto(n) do ; '1'; end }
- [tf+tt+tu, (tf+tt+tu)/3]
- end
-
- bench_for_times_upto_no_label = lambda do |x|
- n = 1000
- x.report { for _ in 1..n; '1'; end }
- x.report { n.times do ; '1'; end }
- x.report { 1.upto(n) do ; '1'; end }
- end
-
- def labels
- %w[first second third]
- end
-
- def bench(type = :bm, *args, &block)
- if block
- Benchmark.send(type, *args, &block)
- else
- Benchmark.send(type, *args) do |x|
- labels.each { |label|
- x.report(label) {}
- }
- end
- end
- end
-
- def capture_output
- capture_io { yield }.first.gsub(/[ \-]\d\.\d{6}/, ' --time--')
- end
-
- def capture_bench_output(type, *args, &block)
- capture_output { bench(type, *args, &block) }
- end
-
- describe 'Tms' do
- it 'outputs nicely' do
- Benchmark::Tms.new.to_s.must_equal " 0.000000 0.000000 0.000000 ( 0.000000)\n"
- Benchmark::Tms.new(1,2,3,4,5).to_s.must_equal " 1.000000 2.000000 10.000000 ( 5.000000)\n"
- Benchmark::Tms.new(1,2,3,4,5,'label').format('%u %y %U %Y %t %r %n').must_equal \
- "1.000000 2.000000 3.000000 4.000000 10.000000 (5.000000) label"
- Benchmark::Tms.new(1).format('%u %.3f', 2).must_equal "1.000000 2.000"
- Benchmark::Tms.new(100, 150, 0, 0, 200).to_s.must_equal \
- "100.000000 150.000000 250.000000 (200.000000)\n"
- end
-
- it 'wont modify the format String given' do
- format = "format %u"
- Benchmark::Tms.new.format(format)
- format.must_equal "format %u"
- end
- end
-
- benchmark_output_with_total_avg = <<BENCH
- user system total real
-for: --time-- --time-- --time-- ( --time--)
-times: --time-- --time-- --time-- ( --time--)
-upto: --time-- --time-- --time-- ( --time--)
->total: --time-- --time-- --time-- ( --time--)
->avg: --time-- --time-- --time-- ( --time--)
-BENCH
-
- describe 'benchmark' do
- it 'does not print any space if the given caption is empty' do
- capture_bench_output(:benchmark).must_equal <<-BENCH
-first --time-- --time-- --time-- ( --time--)
-second --time-- --time-- --time-- ( --time--)
-third --time-- --time-- --time-- ( --time--)
-BENCH
- end
-
- it 'makes extra calcultations with an Array at the end of the benchmark and show the result' do
- capture_bench_output(:benchmark,
- Benchmark::CAPTION, 7,
- Benchmark::FORMAT, ">total:", ">avg:",
- &bench_for_times_upto).must_equal benchmark_output_with_total_avg
- end
- end
-
- describe 'bm' do
- it "returns an Array of the times with the labels" do
- [:bm, :bmbm].each do |meth|
- capture_io do
- results = bench(meth)
- results.must_be_instance_of Array
- results.size.must_equal labels.size
- results.zip(labels).each { |tms, label|
- tms.must_be_instance_of Benchmark::Tms
- tms.label.must_equal label
- }
- end
- end
- end
-
- it 'correctly output when the label width is given' do
- capture_bench_output(:bm, 6).must_equal <<-BENCH
- user system total real
-first --time-- --time-- --time-- ( --time--)
-second --time-- --time-- --time-- ( --time--)
-third --time-- --time-- --time-- ( --time--)
-BENCH
- end
-
- it 'correctly output when no label is given' do
- capture_bench_output(:bm, &bench_for_times_upto_no_label).must_equal <<-BENCH
- user system total real
- --time-- --time-- --time-- ( --time--)
- --time-- --time-- --time-- ( --time--)
- --time-- --time-- --time-- ( --time--)
-BENCH
- end
-
- it 'can make extra calcultations with an array at the end of the benchmark' do
- capture_bench_output(:bm, 7, ">total:", ">avg:",
- &bench_for_times_upto).must_equal benchmark_output_with_total_avg
- end
- end
-
- describe 'bmbm' do
- bmbm_output = <<BENCH
-Rehearsal ------------------------------------------
-first --time-- --time-- --time-- ( --time--)
-second --time-- --time-- --time-- ( --time--)
-third --time-- --time-- --time-- ( --time--)
---------------------------------- total: --time--sec
-
- user system total real
-first --time-- --time-- --time-- ( --time--)
-second --time-- --time-- --time-- ( --time--)
-third --time-- --time-- --time-- ( --time--)
-BENCH
-
- it 'correctly guess the label width even when not given' do
- capture_bench_output(:bmbm).must_equal bmbm_output
- end
-
- it 'correctly output when the label width is given (bmbm ignore it, but it is a frequent mistake)' do
- capture_bench_output(:bmbm, 6).must_equal bmbm_output
- end
- end
-
- describe 'Report' do
- describe '#item' do
- it 'shows the title, even if not a string' do
- capture_bench_output(:bm) { |x| x.report(:title) {} }.must_include 'title'
- capture_bench_output(:bmbm) { |x| x.report(:title) {} }.must_include 'title'
- end
- end
- end
-
- describe 'Bugs' do
- it '[ruby-dev:40906] can add in-place the time of execution of the block given' do
- t = Benchmark::Tms.new
- t.real.must_equal 0
- t.add! { sleep 0.1 }
- t.real.wont_equal 0
+class TestBenchmark < Test::Unit::TestCase
+ def test_add!
+ assert_nothing_raised("[ruby-dev:40906]") do
+ Benchmark::Tms.new.add! {}
end
end
end
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
index 5cbafdafd4..b622358758 100644
--- a/test/bigdecimal/test_bigdecimal.rb
+++ b/test/bigdecimal/test_bigdecimal.rb
@@ -1,110 +1,16 @@
require_relative "testbase"
-require_relative "../ruby/envutil"
-
-require 'thread'
class TestBigDecimal < Test::Unit::TestCase
include TestBigDecimalBase
- ROUNDING_MODE_MAP = [
- [ BigDecimal::ROUND_UP, :up],
- [ BigDecimal::ROUND_DOWN, :down],
- [ BigDecimal::ROUND_DOWN, :truncate],
- [ BigDecimal::ROUND_HALF_UP, :half_up],
- [ BigDecimal::ROUND_HALF_UP, :default],
- [ BigDecimal::ROUND_HALF_DOWN, :half_down],
- [ BigDecimal::ROUND_HALF_EVEN, :half_even],
- [ BigDecimal::ROUND_HALF_EVEN, :banker],
- [ BigDecimal::ROUND_CEILING, :ceiling],
- [ BigDecimal::ROUND_CEILING, :ceil],
- [ BigDecimal::ROUND_FLOOR, :floor],
- ]
-
- def assert_nan(x)
- assert(x.nan?, "Expected #{x.inspect} to be NaN")
- end
-
- def assert_positive_infinite(x)
- assert(x.infinite?, "Expected #{x.inspect} to be positive infinite")
- assert_operator(x, :>, 0)
- end
-
- def assert_negative_infinite(x)
- assert(x.infinite?, "Expected #{x.inspect} to be negative infinite")
- assert_operator(x, :<, 0)
- end
-
- def assert_positive_zero(x)
- assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, x.sign,
- "Expected #{x.inspect} to be positive zero")
- end
-
- def assert_negative_zero(x)
- assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, x.sign,
- "Expected #{x.inspect} to be negative zero")
- end
-
- def test_not_equal
- assert_not_equal BigDecimal("1"), BigDecimal.allocate
+ def test_version
+ assert_equal("1.0.1", BigDecimal.ver)
end
def test_global_new
assert_equal(1, BigDecimal("1"))
assert_equal(1, BigDecimal("1", 1))
assert_raise(ArgumentError) { BigDecimal("1", -1) }
- assert_raise(ArgumentError) { BigDecimal(4.2) }
- begin
- BigDecimal(4.2)
- rescue ArgumentError => error
- assert_match(/Float/, error.message)
- end
- assert_raise(ArgumentError) { BigDecimal(42.quo(7)) }
- begin
- BigDecimal(42.quo(7))
- rescue ArgumentError => error
- assert_match(/Rational/, error.message)
- end
- end
-
- def test_global_new_with_integer
- assert_equal(BigDecimal("1"), BigDecimal(1))
- assert_equal(BigDecimal("-1"), BigDecimal(-1))
- assert_equal(BigDecimal((2**100).to_s), BigDecimal(2**100))
- assert_equal(BigDecimal((-2**100).to_s), BigDecimal(-2**100))
- end
-
- def test_global_new_with_rational
- assert_equal(BigDecimal("0.333333333333333333333"), BigDecimal(1.quo(3), 21))
- assert_equal(BigDecimal("-0.333333333333333333333"), BigDecimal(-1.quo(3), 21))
- assert_raise(ArgumentError) { BigDecimal(1.quo(3)) }
- end
-
- def test_global_new_with_float
- assert_equal(BigDecimal("0.1235"), BigDecimal(0.1234567, 4))
- assert_equal(BigDecimal("-0.1235"), BigDecimal(-0.1234567, 4))
- assert_raise(ArgumentError) { BigDecimal(0.1) }
- assert_raise(ArgumentError) { BigDecimal(0.1, Float::DIG + 2) }
- assert_nothing_raised { BigDecimal(0.1, Float::DIG + 1) }
- end
-
- def test_global_new_with_big_decimal
- assert_equal(BigDecimal(1), BigDecimal(BigDecimal(1)))
- assert_equal(BigDecimal('+0'), BigDecimal(BigDecimal('+0')))
- assert_equal(BigDecimal('-0'), BigDecimal(BigDecimal('-0')))
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- assert_positive_infinite(BigDecimal(BigDecimal('Infinity')))
- assert_negative_infinite(BigDecimal(BigDecimal('-Infinity')))
- assert_nan(BigDecimal(BigDecimal('NaN')))
- end
- end
-
- def test_global_new_with_tainted_string
- Thread.new {
- $SAFE = 1
- BigDecimal('1'.taint)
- }.join
end
def test_new
@@ -113,55 +19,13 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(1, BigDecimal.new(" 1 "))
assert_equal(111, BigDecimal.new("1_1_1_"))
assert_equal(0, BigDecimal.new("_1_1_1"))
- assert_equal(10**(-1), BigDecimal.new("1E-1"), '#4825')
BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
assert_equal( 1, BigDecimal.new("Infinity").infinite?)
assert_equal(-1, BigDecimal.new("-Infinity").infinite?)
assert_equal(true, BigDecimal.new("NaN").nan?)
- assert_equal( 1, BigDecimal.new("1E1111111111111111111").infinite?)
- end
-
- def test_new_with_integer
- assert_equal(BigDecimal("1"), BigDecimal.new(1))
- assert_equal(BigDecimal("-1"), BigDecimal.new(-1))
- assert_equal(BigDecimal((2**100).to_s), BigDecimal.new(2**100))
- assert_equal(BigDecimal((-2**100).to_s), BigDecimal.new(-2**100))
- end
-
- def test_new_with_rational
- assert_equal(BigDecimal("0.333333333333333333333"), BigDecimal.new(1.quo(3), 21))
- assert_equal(BigDecimal("-0.333333333333333333333"), BigDecimal.new(-1.quo(3), 21))
- assert_raise(ArgumentError) { BigDecimal.new(1.quo(3)) }
- end
-
- def test_new_with_float
- assert_equal(BigDecimal("0.1235"), BigDecimal(0.1234567, 4))
- assert_equal(BigDecimal("-0.1235"), BigDecimal(-0.1234567, 4))
- assert_raise(ArgumentError) { BigDecimal.new(0.1) }
- assert_raise(ArgumentError) { BigDecimal.new(0.1, Float::DIG + 2) }
- assert_nothing_raised { BigDecimal.new(0.1, Float::DIG + 1) }
- end
-
- def test_new_with_big_decimal
- assert_equal(BigDecimal(1), BigDecimal.new(BigDecimal(1)))
- assert_equal(BigDecimal('+0'), BigDecimal.new(BigDecimal('+0')))
- assert_equal(BigDecimal('-0'), BigDecimal.new(BigDecimal('-0')))
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- assert_positive_infinite(BigDecimal.new(BigDecimal('Infinity')))
- assert_negative_infinite(BigDecimal.new(BigDecimal('-Infinity')))
- assert_nan(BigDecimal(BigDecimal.new('NaN')))
- end
- end
-
- def test_new_with_tainted_string
- Thread.new {
- $SAFE = 1
- BigDecimal.new('1'.taint)
- }.join
+ assert_equal( 1, BigDecimal.new("1E11111111111").infinite?)
end
def _test_mode(type)
@@ -173,92 +37,9 @@ class TestBigDecimal < Test::Unit::TestCase
end
def test_mode
- assert_raise(ArgumentError) { BigDecimal.mode(BigDecimal::EXCEPTION_ALL, 1) }
- assert_raise(ArgumentError) { BigDecimal.mode(BigDecimal::ROUND_MODE, 256) }
- assert_raise(ArgumentError) { BigDecimal.mode(BigDecimal::ROUND_MODE, :xyzzy) }
+ assert_raise(TypeError) { BigDecimal.mode(BigDecimal::EXCEPTION_ALL, 1) }
+ assert_raise(TypeError) { BigDecimal.mode(BigDecimal::ROUND_MODE, 256) }
assert_raise(TypeError) { BigDecimal.mode(0xf000, true) }
-
- begin
- saved_mode = BigDecimal.mode(BigDecimal::ROUND_MODE)
-
- [ BigDecimal::ROUND_UP,
- BigDecimal::ROUND_DOWN,
- BigDecimal::ROUND_HALF_UP,
- BigDecimal::ROUND_HALF_DOWN,
- BigDecimal::ROUND_CEILING,
- BigDecimal::ROUND_FLOOR,
- BigDecimal::ROUND_HALF_EVEN,
- ].each do |mode|
- BigDecimal.mode(BigDecimal::ROUND_MODE, mode)
- assert_equal(mode, BigDecimal.mode(BigDecimal::ROUND_MODE))
- end
- ensure
- BigDecimal.mode(BigDecimal::ROUND_MODE, saved_mode)
- end
-
- BigDecimal.save_rounding_mode do
- ROUNDING_MODE_MAP.each do |const, sym|
- BigDecimal.mode(BigDecimal::ROUND_MODE, sym)
- assert_equal(const, BigDecimal.mode(BigDecimal::ROUND_MODE))
- end
- end
- end
-
- def test_thread_local_mode
- begin
- saved_mode = BigDecimal.mode(BigDecimal::ROUND_MODE)
-
- BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_UP)
- Thread.start {
- BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
- assert_equal(BigDecimal::ROUND_HALF_EVEN, BigDecimal.mode(BigDecimal::ROUND_MODE))
- }.join
- assert_equal(BigDecimal::ROUND_UP, BigDecimal.mode(BigDecimal::ROUND_MODE))
- ensure
- BigDecimal.mode(BigDecimal::ROUND_MODE, saved_mode)
- end
- end
-
- def test_save_exception_mode
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- mode = BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW)
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, true)
- end
- assert_equal(mode, BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW))
-
- BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_FLOOR)
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
- end
- assert_equal(BigDecimal::ROUND_HALF_EVEN, BigDecimal.mode(BigDecimal::ROUND_MODE))
-
- assert_equal(42, BigDecimal.save_exception_mode { 42 })
- end
-
- def test_save_rounding_mode
- BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_FLOOR)
- BigDecimal.save_rounding_mode do
- BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
- end
- assert_equal(BigDecimal::ROUND_FLOOR, BigDecimal.mode(BigDecimal::ROUND_MODE))
-
- assert_equal(42, BigDecimal.save_rounding_mode { 42 })
- end
-
- def test_save_limit
- begin
- old = BigDecimal.limit
- BigDecimal.limit(100)
- BigDecimal.save_limit do
- BigDecimal.limit(200)
- end
- assert_equal(100, BigDecimal.limit);
- ensure
- BigDecimal.limit(old)
- end
-
- assert_equal(42, BigDecimal.save_limit { 42 })
end
def test_exception_nan
@@ -429,9 +210,6 @@ class TestBigDecimal < Test::Unit::TestCase
inf = BigDecimal.new("Infinity")
assert_operator(inf, :>, 1)
assert_operator(1, :<, inf)
-
- assert_operator(BigDecimal("1E-1"), :==, 10**(-1), '#4825')
- assert_equal(0, BigDecimal("1E-1") <=> 10**(-1), '#4825')
end
def test_cmp_nan
@@ -565,41 +343,6 @@ class TestBigDecimal < Test::Unit::TestCase
BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
assert_kind_of(Float, x .to_f)
assert_kind_of(Float, (-x).to_f)
-
- bug6944 = '[ruby-core:47342]'
-
- BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, true)
- x = "1e#{Float::MIN_10_EXP - 2*Float::DIG}"
- assert_raise(FloatDomainError, x) {BigDecimal(x).to_f}
- x = "-#{x}"
- assert_raise(FloatDomainError, x) {BigDecimal(x).to_f}
- x = "1e#{Float::MIN_10_EXP - Float::DIG}"
- assert_nothing_raised(FloatDomainError, x) {
- assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
- }
- x = "-#{x}"
- assert_nothing_raised(FloatDomainError, x) {
- assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
- }
-
- BigDecimal.mode(BigDecimal::EXCEPTION_UNDERFLOW, false)
- x = "1e#{Float::MIN_10_EXP - 2*Float::DIG}"
- assert_equal( 0.0, BigDecimal(x).to_f, x)
- x = "-#{x}"
- assert_equal(-0.0, BigDecimal(x).to_f, x)
- x = "1e#{Float::MIN_10_EXP - Float::DIG}"
- assert_nothing_raised(FloatDomainError, x) {
- assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
- }
- x = "-#{x}"
- assert_nothing_raised(FloatDomainError, x) {
- assert_in_delta(0.0, BigDecimal(x).to_f, 10**Float::MIN_10_EXP, bug6944)
- }
-
- assert_equal( 0.0, BigDecimal( '9e-325').to_f)
- assert_equal( 0.0, BigDecimal( '10e-325').to_f)
- assert_equal(-0.0, BigDecimal( '-9e-325').to_f)
- assert_equal(-0.0, BigDecimal('-10e-325').to_f)
end
def test_coerce
@@ -607,16 +350,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_instance_of(Float, a)
assert_instance_of(Float, b)
assert_equal(2, 1 + BigDecimal.new("1"), '[ruby-core:25697]')
-
- a, b = BigDecimal("1").coerce(1.quo(10))
- assert_equal(BigDecimal("0.1"), a, '[ruby-core:34318]')
-
- a, b = BigDecimal("0.11111").coerce(1.quo(3))
- assert_equal(BigDecimal("0." + "3"*a.precs[0]), a)
-
- assert_nothing_raised(TypeError, '#7176') do
- BigDecimal.new('1') + Rational(1)
- end
end
def test_uplus
@@ -652,14 +385,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(BigDecimal.new((2**100-1).to_s), x - 1)
end
- def test_sub_with_float
- assert_kind_of(BigDecimal, BigDecimal.new("3") - 1.0)
- end
-
- def test_sub_with_rational
- assert_kind_of(BigDecimal, BigDecimal.new("3") - 1.quo(3))
- end
-
def test_mult
x = BigDecimal.new((2**100).to_s)
assert_equal(BigDecimal.new((2**100 * 3).to_s), (x * 3).to_i)
@@ -668,14 +393,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(BigDecimal.new((2**200).to_s), (x * x).to_i)
end
- def test_mult_with_float
- assert_kind_of(BigDecimal, BigDecimal.new("3") * 1.5)
- end
-
- def test_mult_with_rational
- assert_kind_of(BigDecimal, BigDecimal.new("3") * 1.quo(3))
- end
-
def test_div
x = BigDecimal.new((2**100).to_s)
assert_equal(BigDecimal.new((2**100 / 3).to_s), (x / 3).to_i)
@@ -685,14 +402,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(-2, BigDecimal.new("2") / -1)
end
- def test_div_with_float
- assert_kind_of(BigDecimal, BigDecimal.new("3") / 1.5)
- end
-
- def test_div_with_rational
- assert_kind_of(BigDecimal, BigDecimal.new("3") / 1.quo(3))
- end
-
def test_mod
x = BigDecimal.new((2**100).to_s)
assert_equal(1, x % 3)
@@ -701,14 +410,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(-1, (-x) % -3)
end
- def test_mod_with_float
- assert_kind_of(BigDecimal, BigDecimal.new("3") % 1.5)
- end
-
- def test_mod_with_rational
- assert_kind_of(BigDecimal, BigDecimal.new("3") % 1.quo(3))
- end
-
def test_remainder
x = BigDecimal.new((2**100).to_s)
assert_equal(1, x.remainder(3))
@@ -717,14 +418,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(-1, (-x).remainder(-3))
end
- def test_remainder_with_float
- assert_kind_of(BigDecimal, BigDecimal.new("3").remainder(1.5))
- end
-
- def test_remainder_with_rational
- assert_kind_of(BigDecimal, BigDecimal.new("3").remainder(1.quo(3)))
- end
-
def test_divmod
x = BigDecimal.new((2**100).to_s)
assert_equal([(x / 3).floor, 1], x.divmod(3))
@@ -763,10 +456,6 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(400000000000000000000000000000, x.div(3, 1))
assert_equal(420000000000000000000000000000, x.div(3, 2))
assert_equal(423000000000000000000000000000, x.div(3, 3))
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert_equal(0, BigDecimal("0").div(BigDecimal("Infinity")))
- end
end
def test_abs_bigdecimal
@@ -841,24 +530,7 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(2, x.round(0, BigDecimal::ROUND_HALF_EVEN))
assert_equal(3, x.round(0, BigDecimal::ROUND_CEILING))
assert_equal(2, x.round(0, BigDecimal::ROUND_FLOOR))
- assert_raise(ArgumentError) { x.round(0, 256) }
-
- ROUNDING_MODE_MAP.each do |const, sym|
- assert_equal(x.round(0, const), x.round(0, sym))
- end
-
- bug3803 = '[ruby-core:32136]'
- 15.times do |n|
- x = BigDecimal.new("5#{'0'*n}1")
- assert_equal(10**(n+2), x.round(-(n+2), BigDecimal::ROUND_HALF_DOWN), bug3803)
- assert_equal(10**(n+2), x.round(-(n+2), BigDecimal::ROUND_HALF_EVEN), bug3803)
- x = BigDecimal.new("0.5#{'0'*n}1")
- assert_equal(1, x.round(0, BigDecimal::ROUND_HALF_DOWN), bug3803)
- assert_equal(1, x.round(0, BigDecimal::ROUND_HALF_EVEN), bug3803)
- x = BigDecimal.new("-0.5#{'0'*n}1")
- assert_equal(-1, x.round(0, BigDecimal::ROUND_HALF_DOWN), bug3803)
- assert_equal(-1, x.round(0, BigDecimal::ROUND_HALF_EVEN), bug3803)
- end
+ assert_raise(TypeError) { x.round(0, 256) }
end
def test_truncate
@@ -915,199 +587,30 @@ class TestBigDecimal < Test::Unit::TestCase
end
def test_power
- assert_nothing_raised(TypeError, '[ruby-core:47632]') do
- 1000.times { BigDecimal.new('1001.10')**0.75 }
- end
- end
-
- def test_power_with_nil
- assert_raise(TypeError) do
- BigDecimal(3) ** nil
- end
- end
-
- def test_power_of_nan
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- assert_nan(BigDecimal::NAN ** 0)
- assert_nan(BigDecimal::NAN ** 1)
- assert_nan(BigDecimal::NAN ** 42)
- assert_nan(BigDecimal::NAN ** -42)
- assert_nan(BigDecimal::NAN ** 42.0)
- assert_nan(BigDecimal::NAN ** -42.0)
- assert_nan(BigDecimal::NAN ** BigDecimal(42))
- assert_nan(BigDecimal::NAN ** BigDecimal(-42))
- assert_nan(BigDecimal::NAN ** BigDecimal::INFINITY)
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert_nan(BigDecimal::NAN ** (-BigDecimal::INFINITY))
- end
- end
- end
-
- def test_power_with_Bignum
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert_equal(0, BigDecimal(0) ** (2**100))
-
- assert_positive_infinite(BigDecimal(0) ** -(2**100))
- assert_positive_infinite((-BigDecimal(0)) ** -(2**100))
- assert_negative_infinite((-BigDecimal(0)) ** -(2**100 + 1))
-
- assert_equal(1, BigDecimal(1) ** (2**100))
-
- assert_positive_infinite(BigDecimal(3) ** (2**100))
- assert_positive_zero(BigDecimal(3) ** (-2**100))
-
- assert_negative_infinite(BigDecimal(-3) ** (2**100))
- assert_positive_infinite(BigDecimal(-3) ** (2**100 + 1))
- assert_negative_zero(BigDecimal(-3) ** (-2**100))
- assert_positive_zero(BigDecimal(-3) ** (-2**100 - 1))
-
- assert_positive_zero(BigDecimal(0.5, Float::DIG) ** (2**100))
- assert_positive_infinite(BigDecimal(0.5, Float::DIG) ** (-2**100))
-
- assert_negative_zero(BigDecimal(-0.5, Float::DIG) ** (2**100))
- assert_positive_zero(BigDecimal(-0.5, Float::DIG) ** (2**100 - 1))
- assert_negative_infinite(BigDecimal(-0.5, Float::DIG) ** (-2**100))
- assert_positive_infinite(BigDecimal(-0.5, Float::DIG) ** (-2**100 - 1))
- end
- end
-
- def test_power_with_BigDecimal
- assert_nothing_raised do
- assert_in_delta(3 ** 3, BigDecimal(3) ** BigDecimal(3))
- end
- end
-
- def test_power_of_finite_with_zero
- x = BigDecimal(1)
- assert_equal(1, x ** 0)
- assert_equal(1, x ** 0.quo(1))
- assert_equal(1, x ** 0.0)
- assert_equal(1, x ** BigDecimal(0))
-
- x = BigDecimal(42)
- assert_equal(1, x ** 0)
- assert_equal(1, x ** 0.quo(1))
- assert_equal(1, x ** 0.0)
- assert_equal(1, x ** BigDecimal(0))
-
- x = BigDecimal(-42)
- assert_equal(1, x ** 0)
- assert_equal(1, x ** 0.quo(1))
- assert_equal(1, x ** 0.0)
- assert_equal(1, x ** BigDecimal(0))
- end
-
- def test_power_of_three
- x = BigDecimal(3)
+ x = BigDecimal.new("3")
assert_equal(81, x ** 4)
- assert_equal(1.quo(81), x ** -4)
- assert_in_delta(1.0/81, x ** -4)
- end
-
- def test_power_of_zero
- zero = BigDecimal(0)
- assert_equal(0, zero ** 4)
- assert_equal(0, zero ** 4.quo(1))
- assert_equal(0, zero ** 4.0)
- assert_equal(0, zero ** BigDecimal(4))
- assert_equal(1, zero ** 0)
- assert_equal(1, zero ** 0.quo(1))
- assert_equal(1, zero ** 0.0)
- assert_equal(1, zero ** BigDecimal(0))
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- assert_positive_infinite(zero ** -1)
- assert_positive_infinite(zero ** -1.quo(1))
- assert_positive_infinite(zero ** -1.0)
- assert_positive_infinite(zero ** BigDecimal(-1))
-
- m_zero = BigDecimal("-0")
- assert_negative_infinite(m_zero ** -1)
- assert_negative_infinite(m_zero ** -1.quo(1))
- assert_negative_infinite(m_zero ** -1.0)
- assert_negative_infinite(m_zero ** BigDecimal(-1))
- assert_positive_infinite(m_zero ** -2)
- assert_positive_infinite(m_zero ** -2.quo(1))
- assert_positive_infinite(m_zero ** -2.0)
- assert_positive_infinite(m_zero ** BigDecimal(-2))
- end
- end
-
- def test_power_of_positive_infinity
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- assert_positive_infinite(BigDecimal::INFINITY ** 3)
- assert_positive_infinite(BigDecimal::INFINITY ** 3.quo(1))
- assert_positive_infinite(BigDecimal::INFINITY ** 3.0)
- assert_positive_infinite(BigDecimal::INFINITY ** BigDecimal(3))
- assert_positive_infinite(BigDecimal::INFINITY ** 2)
- assert_positive_infinite(BigDecimal::INFINITY ** 2.quo(1))
- assert_positive_infinite(BigDecimal::INFINITY ** 2.0)
- assert_positive_infinite(BigDecimal::INFINITY ** BigDecimal(2))
- assert_positive_infinite(BigDecimal::INFINITY ** 1)
- assert_positive_infinite(BigDecimal::INFINITY ** 1.quo(1))
- assert_positive_infinite(BigDecimal::INFINITY ** 1.0)
- assert_positive_infinite(BigDecimal::INFINITY ** BigDecimal(1))
- assert_equal(1, BigDecimal::INFINITY ** 0)
- assert_equal(1, BigDecimal::INFINITY ** 0.quo(1))
- assert_equal(1, BigDecimal::INFINITY ** 0.0)
- assert_equal(1, BigDecimal::INFINITY ** BigDecimal(0))
- assert_positive_zero(BigDecimal::INFINITY ** -1)
- assert_positive_zero(BigDecimal::INFINITY ** -1.quo(1))
- assert_positive_zero(BigDecimal::INFINITY ** -1.0)
- assert_positive_zero(BigDecimal::INFINITY ** BigDecimal(-1))
- assert_positive_zero(BigDecimal::INFINITY ** -2)
- assert_positive_zero(BigDecimal::INFINITY ** -2.0)
- assert_positive_zero(BigDecimal::INFINITY ** BigDecimal(-2))
- end
- end
-
- def test_power_of_negative_infinity
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
- assert_negative_infinite((-BigDecimal::INFINITY) ** 3)
- assert_negative_infinite((-BigDecimal::INFINITY) ** 3.quo(1))
- assert_negative_infinite((-BigDecimal::INFINITY) ** 3.0)
- assert_negative_infinite((-BigDecimal::INFINITY) ** BigDecimal(3))
- assert_positive_infinite((-BigDecimal::INFINITY) ** 2)
- assert_positive_infinite((-BigDecimal::INFINITY) ** 2.quo(1))
- assert_positive_infinite((-BigDecimal::INFINITY) ** 2.0)
- assert_positive_infinite((-BigDecimal::INFINITY) ** BigDecimal(2))
- assert_negative_infinite((-BigDecimal::INFINITY) ** 1)
- assert_negative_infinite((-BigDecimal::INFINITY) ** 1.quo(1))
- assert_negative_infinite((-BigDecimal::INFINITY) ** 1.0)
- assert_negative_infinite((-BigDecimal::INFINITY) ** BigDecimal(1))
- assert_equal(1, (-BigDecimal::INFINITY) ** 0)
- assert_equal(1, (-BigDecimal::INFINITY) ** 0.quo(1))
- assert_equal(1, (-BigDecimal::INFINITY) ** 0.0)
- assert_equal(1, (-BigDecimal::INFINITY) ** BigDecimal(0))
- assert_negative_zero((-BigDecimal::INFINITY) ** -1)
- assert_negative_zero((-BigDecimal::INFINITY) ** -1.quo(1))
- assert_negative_zero((-BigDecimal::INFINITY) ** -1.0)
- assert_negative_zero((-BigDecimal::INFINITY) ** BigDecimal(-1))
- assert_positive_zero((-BigDecimal::INFINITY) ** -2)
- assert_positive_zero((-BigDecimal::INFINITY) ** -2.quo(1))
- assert_positive_zero((-BigDecimal::INFINITY) ** -2.0)
- assert_positive_zero((-BigDecimal::INFINITY) ** BigDecimal(-2))
- end
- end
+ assert_equal(1.0/81, x ** -4)
+ assert_equal(1, x ** 0)
+ assert_raise(TypeError) { x ** x }
+ assert_equal(0, BigDecimal.new("0") ** 4)
+ assert_equal(1, BigDecimal.new("0") ** 0)
+ BigDecimal.mode(BigDecimal::EXCEPTION_OVERFLOW, false)
+ assert_equal(BigDecimal.new("Infinity"), BigDecimal.new("0") ** -1)
+ assert_equal(BigDecimal.new("-Infinity"), BigDecimal.new("-0") ** -1)
+ BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
+ assert_equal(true, (BigDecimal.new("NaN") ** 1).nan?)
- def test_power_without_prec
- pi = BigDecimal("3.14159265358979323846264338327950288419716939937511")
- e = BigDecimal("2.71828182845904523536028747135266249775724709369996")
- pow = BigDecimal("22.4591577183610454734271522045437350275893151339967843873233068")
- assert_equal(pow, pi.power(e))
- end
+ assert_equal(BigDecimal::SIGN_POSITIVE_INFINITE, (BigDecimal.new("Infinity") ** 2).sign)
+ assert_equal(BigDecimal::SIGN_POSITIVE_INFINITE, (BigDecimal.new("Infinity") ** 1).sign)
+ assert_equal(1, BigDecimal.new("Infinity") ** 0)
+ assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal.new("Infinity") ** -1).sign)
+ assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal.new("Infinity") ** -2).sign)
- def test_power_with_prec
- pi = BigDecimal("3.14159265358979323846264338327950288419716939937511")
- e = BigDecimal("2.71828182845904523536028747135266249775724709369996")
- pow = BigDecimal("22.459157718361045473")
- assert_equal(pow, pi.power(e, 20))
+ assert_equal(BigDecimal::SIGN_POSITIVE_INFINITE, (BigDecimal.new("-Infinity") ** 2).sign)
+ assert_equal(BigDecimal::SIGN_NEGATIVE_INFINITE, (BigDecimal.new("-Infinity") ** 1).sign)
+ assert_equal(1, BigDecimal.new("-Infinity") ** 0)
+ assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, (BigDecimal.new("-Infinity") ** -1).sign)
+ assert_equal(BigDecimal::SIGN_POSITIVE_ZERO, (BigDecimal.new("-Infinity") ** -2).sign)
end
def test_limit
@@ -1196,254 +699,14 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(BigDecimal::SIGN_NEGATIVE_ZERO, BigDecimal.new("-1E-1" + "0" * 10000).sign)
end
- def test_split_under_gc_stress
+ def test_gc
bug3258 = '[ruby-dev:41213]'
- expect = 10.upto(20).map{|i|[1, "1", 10, i+1].inspect}
- assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, expect, [], bug3258)
- GC.stress = true
+ stress, GC.stress = GC.stress, true
10.upto(20) do |i|
- p BigDecimal.new("1"+"0"*i).split
- end
- EOS
- end
-
- def test_coerce_under_gc_stress
- assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
- expect = ":too_long_to_embed_as_string can't be coerced into BigDecimal"
- b = BigDecimal.new("1")
- GC.stress = true
- 10.times do
- begin
- b.coerce(:too_long_to_embed_as_string)
- rescue => e
- raise unless e.is_a?(TypeError)
- raise "'\#{expect}' is expected, but '\#{e.message}'" unless e.message == expect
- end
- end
- EOS
- end
-
- def test_INFINITY
- assert(BigDecimal::INFINITY.infinite?, "BigDecimal::INFINITY is not a infinity")
- end
-
- def test_NAN
- assert(BigDecimal::NAN.nan?, "BigDecimal::NAN is not NaN")
- end
-
- def test_exp_with_zerp_precision
- assert_raise(ArgumentError) do
- BigMath.exp(1, 0)
- end
- end
-
- def test_exp_with_negative_precision
- assert_raise(ArgumentError) do
- BigMath.exp(1, -42)
- end
- end
-
- def test_exp_with_complex
- assert_raise(ArgumentError) do
- BigMath.exp(Complex(1, 2), 20)
- end
- end
-
- def test_exp_with_negative_infinite
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert_equal(0, BigMath.exp(-BigDecimal::INFINITY, 20))
- end
- end
-
- def test_exp_with_positive_infinite
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert(BigMath.exp(BigDecimal::INFINITY, 20) > 0)
- assert(BigMath.exp(BigDecimal::INFINITY, 20).infinite?)
- end
- end
-
- def test_exp_with_nan
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- assert(BigMath.exp(BigDecimal::NAN, 20).nan?)
- end
- end
-
- def test_exp_with_1
- assert_in_epsilon(Math::E, BigMath.exp(1, 20))
- end
-
- def test_BigMath_exp
- prec = 20
- assert_in_epsilon(Math.exp(20), BigMath.exp(BigDecimal("20"), prec))
- assert_in_epsilon(Math.exp(40), BigMath.exp(BigDecimal("40"), prec))
- assert_in_epsilon(Math.exp(-20), BigMath.exp(BigDecimal("-20"), prec))
- assert_in_epsilon(Math.exp(-40), BigMath.exp(BigDecimal("-40"), prec))
- end
-
- def test_BigMath_exp_with_float
- prec = 20
- assert_in_epsilon(Math.exp(20), BigMath.exp(20.0, prec))
- assert_in_epsilon(Math.exp(40), BigMath.exp(40.0, prec))
- assert_in_epsilon(Math.exp(-20), BigMath.exp(-20.0, prec))
- assert_in_epsilon(Math.exp(-40), BigMath.exp(-40.0, prec))
- end
-
- def test_BigMath_exp_with_fixnum
- prec = 20
- assert_in_epsilon(Math.exp(20), BigMath.exp(20, prec))
- assert_in_epsilon(Math.exp(40), BigMath.exp(40, prec))
- assert_in_epsilon(Math.exp(-20), BigMath.exp(-20, prec))
- assert_in_epsilon(Math.exp(-40), BigMath.exp(-40, prec))
- end
-
- def test_BigMath_exp_with_rational
- prec = 20
- assert_in_epsilon(Math.exp(20), BigMath.exp(Rational(40,2), prec))
- assert_in_epsilon(Math.exp(40), BigMath.exp(Rational(80,2), prec))
- assert_in_epsilon(Math.exp(-20), BigMath.exp(Rational(-40,2), prec))
- assert_in_epsilon(Math.exp(-40), BigMath.exp(Rational(-80,2), prec))
- end
-
- def test_BigMath_exp_under_gc_stress
- assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
- expect = ":too_long_to_embed_as_string can't be coerced into BigDecimal"
- 10.times do
- begin
- BigMath.exp(:too_long_to_embed_as_string, 6)
- rescue => e
- raise unless e.is_a?(ArgumentError)
- raise "'\#{expect}' is expected, but '\#{e.message}'" unless e.message == expect
- end
- end
- EOS
- end
-
- def test_BigMath_log_with_nil
- assert_raise(ArgumentError) do
- BigMath.log(nil, 20)
- end
- end
-
- def test_BigMath_log_with_nil_precision
- assert_raise(ArgumentError) do
- BigMath.log(1, nil)
- end
- end
-
- def test_BigMath_log_with_complex
- assert_raise(Math::DomainError) do
- BigMath.log(Complex(1, 2), 20)
- end
- end
-
- def test_BigMath_log_with_zerp_precision
- assert_raise(ArgumentError) do
- BigMath.log(1, 0)
- end
- end
-
- def test_BigMath_log_with_negative_precision
- assert_raise(ArgumentError) do
- BigMath.log(1, -42)
- end
- end
-
- def test_BigMath_log_with_negative_infinite
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert_raise(Math::DomainError) do
- BigMath.log(-BigDecimal::INFINITY, 20)
- end
- end
- end
-
- def test_BigMath_log_with_positive_infinite
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
- assert(BigMath.log(BigDecimal::INFINITY, 20) > 0)
- assert(BigMath.log(BigDecimal::INFINITY, 20).infinite?)
- end
- end
-
- def test_BigMath_log_with_nan
- BigDecimal.save_exception_mode do
- BigDecimal.mode(BigDecimal::EXCEPTION_NaN, false)
- assert(BigMath.log(BigDecimal::NAN, 20).nan?)
- end
- end
-
- def test_BigMath_log_with_1
- assert_in_delta(0.0, BigMath.log(1, 20))
- assert_in_delta(0.0, BigMath.log(1.0, 20))
- assert_in_delta(0.0, BigMath.log(BigDecimal(1), 20))
- end
-
- def test_BigMath_log_with_exp_1
- assert_in_delta(1.0, BigMath.log(BigMath.exp(1, 20), 20))
- end
-
- def test_BigMath_log_with_2
- assert_in_delta(Math.log(2), BigMath.log(2, 20))
- assert_in_delta(Math.log(2), BigMath.log(2.0, 20))
- assert_in_delta(Math.log(2), BigMath.log(BigDecimal(2), 20))
- end
-
- def test_BigMath_log_with_square_of_exp_2
- assert_in_delta(2, BigMath.log(BigMath.exp(1, 20)**2, 20))
- end
-
- def test_BigMath_log_with_42
- assert_in_delta(Math.log(42), BigMath.log(42, 20))
- assert_in_delta(Math.log(42), BigMath.log(42.0, 20))
- assert_in_delta(Math.log(42), BigMath.log(BigDecimal(42), 20))
- end
-
- def test_BigMath_log_with_reciprocal_of_42
- assert_in_delta(Math.log(1e-42), BigMath.log(1e-42, 20))
- assert_in_delta(Math.log(1e-42), BigMath.log(BigDecimal("1e-42"), 20))
- end
-
- def test_BigMath_log_under_gc_stress
- assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
- expect = ":too_long_to_embed_as_string can't be coerced into BigDecimal"
- 10.times do
- begin
- BigMath.log(:too_long_to_embed_as_string, 6)
- rescue => e
- raise unless e.is_a?(ArgumentError)
- raise "'\#{expect}' is expected, but '\#{e.message}'" unless e.message == expect
- end
- end
- EOS
- end
-
- def test_dup
- [1, -1, 2**100, -2**100].each do |i|
- x = BigDecimal(i)
- assert_equal(x, x.dup)
+ b = BigDecimal.new("1"+"0"*i)
+ assert_equal([1, "1", 10, i+1], b.split, bug3258)
end
- end
-
- def test_dup_subclass
- c = Class.new(BigDecimal)
- x = c.new(1)
- y = x.dup
- assert_equal(1, y)
- assert_kind_of(c, y)
- end
-
- def test_to_d
- bug6093 = '[ruby-core:42969]'
- code = "exit(BigDecimal.new('10.0') == 10.0.to_d)"
- assert_ruby_status(%w[-rbigdecimal -rbigdecimal/util -rmathn -], code, bug6093)
- end
-
- def test_bug6406
- assert_in_out_err(%w[-rbigdecimal --disable-gems], <<-EOS, [], [])
- Thread.current.keys.to_s
- EOS
+ ensure
+ GC.stress = stress
end
end
diff --git a/test/bigdecimal/test_bigdecimal_util.rb b/test/bigdecimal/test_bigdecimal_util.rb
deleted file mode 100644
index 72342b922f..0000000000
--- a/test/bigdecimal/test_bigdecimal_util.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require_relative "testbase"
-
-require 'bigdecimal/util'
-
-class TestBigDecimalUtil < Test::Unit::TestCase
- def test_BigDecimal_to_d
- x = BigDecimal(1)
- assert_same(x, x.to_d)
- end
-
- def test_Integer_to_d
- assert_equal(BigDecimal(1), 1.to_d)
- assert_equal(BigDecimal(2<<100), (2<<100).to_d)
- end
-
- def test_Float_to_d_without_precision
- delta = 1.0/10**(Float::DIG + 1)
- assert_in_delta(BigDecimal(0.5, Float::DIG+1), 0.5.to_d, delta)
- assert_in_delta(BigDecimal(355.0/113.0, Float::DIG+1), (355.0/113.0).to_d, delta)
- end
-
- def test_Float_to_d_with_precision
- digits = 5
- delta = 1.0/10**(digits)
- assert_in_delta(BigDecimal(0.5, 5), 0.5.to_d(digits), delta)
- assert_in_delta(BigDecimal(355.0/113.0, 5), (355.0/113.0).to_d(digits), delta)
- end
-
- def test_Rational_to_d
- digits = 100
- delta = 1.0/10**(digits)
- assert_in_delta(BigDecimal(1.quo(2), digits), 1.quo(2).to_d(digits), delta)
- assert_in_delta(BigDecimal(355.quo(113), digits), 355.quo(113).to_d(digits), delta)
- end
-
- def test_Rational_to_d_with_zero_precision
- assert_raise(ArgumentError) { 355.quo(113).to_d(0) }
- end
-
- def test_Rational_to_d_with_negative_precision
- assert_raise(ArgumentError) { 355.quo(113).to_d(-42) }
- end
-end
diff --git a/test/bigdecimal/test_bigmath.rb b/test/bigdecimal/test_bigmath.rb
index 2ccdb510f9..453c47ec6b 100644
--- a/test/bigdecimal/test_bigmath.rb
+++ b/test/bigdecimal/test_bigmath.rb
@@ -60,4 +60,21 @@ class TestBigMath < Test::Unit::TestCase
assert_equal(BigDecimal("0.823840753418636291769355073102514088959345624027952954058347023122539489"),
atan(BigDecimal("1.08"), 72).round(72), '[ruby-dev:41257]')
end
+
+ def test_exp
+ assert_in_epsilon(Math::E, exp(BigDecimal("1"), N))
+ assert_in_epsilon(Math.exp(N), exp(BigDecimal("20"), N))
+ assert_in_epsilon(Math.exp(40), exp(BigDecimal("40"), N))
+ assert_in_epsilon(Math.exp(-N), exp(BigDecimal("-20"), N))
+ assert_in_epsilon(Math.exp(-40), exp(BigDecimal("-40"), N))
+ end
+
+ def test_log
+ assert_in_delta(0.0, log(BigDecimal("1"), N))
+ assert_in_delta(1.0, log(E(N), N))
+ assert_in_delta(Math.log(2.0), log(BigDecimal("2"), N))
+ assert_in_delta(2.0, log(E(N)*E(N), N))
+ assert_in_delta(Math.log(42.0), log(BigDecimal("42"), N))
+ assert_in_delta(Math.log(1e-42), log(BigDecimal("1e-42"), N))
+ end
end
diff --git a/test/bigdecimal/testbase.rb b/test/bigdecimal/testbase.rb
index c014e61e92..275b1b2b5d 100644
--- a/test/bigdecimal/testbase.rb
+++ b/test/bigdecimal/testbase.rb
@@ -17,11 +17,4 @@ module TestBigDecimalBase
BigDecimal.mode(mode, !(@mode & mode).zero?)
end
end
-
- def under_gc_stress
- stress, GC.stress = GC.stress, true
- yield
- ensure
- GC.stress = stress
- end
end
diff --git a/test/cgi/test_cgi_core.rb b/test/cgi/test_cgi_core.rb
index 123caf7acd..23b8891576 100644
--- a/test/cgi/test_cgi_core.rb
+++ b/test/cgi/test_cgi_core.rb
@@ -38,7 +38,7 @@ class CGICoreTest < Test::Unit::TestCase
def test_cgi_core_params_GET
@environ = {
'REQUEST_METHOD' => 'GET',
- 'QUERY_STRING' => 'id=123&id=456&id=&id&str=%40h+%3D%7E+%2F%5E%24%2F',
+ 'QUERY_STRING' => 'id=123&id=456&id=&str=%40h+%3D%7E+%2F%5E%24%2F',
'HTTP_COOKIE' => '_session_id=12345; name1=val1&val2;',
'SERVER_SOFTWARE' => 'Apache 2.2.0',
'SERVER_PROTOCOL' => 'HTTP/1.1',
@@ -183,7 +183,7 @@ class CGICoreTest < Test::Unit::TestCase
}
ENV.update(@environ)
ex = assert_raise(StandardError) do
- CGI.new
+ cgi = CGI.new
end
assert_equal("too large post data.", ex.message)
end if CGI.const_defined?(:MAX_CONTENT_LENGTH)
@@ -304,7 +304,7 @@ class CGICoreTest < Test::Unit::TestCase
HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM HTTP_HOST
HTTP_NEGOTIATE HTTP_PRAGMA HTTP_REFERER HTTP_USER_AGENT
]
- # list2 = %w[ CONTENT_LENGTH SERVER_PORT ]
+ list2 = %w[ CONTENT_LENGTH SERVER_PORT ]
## string expected
list1.each do |name|
@environ[name] = "**#{name}**"
@@ -329,7 +329,7 @@ class CGICoreTest < Test::Unit::TestCase
end
- def test_cgi_core_htmltype_header
+ def test_cgi_core_htmltype
@environ = {
'REQUEST_METHOD' => 'GET',
}
@@ -337,32 +337,22 @@ class CGICoreTest < Test::Unit::TestCase
## no htmltype
cgi = CGI.new
assert_raise(NoMethodError) do cgi.doctype end
- assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
## html3
cgi = CGI.new('html3')
expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">'
assert_equal(expected, cgi.doctype)
- assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
## html4
cgi = CGI.new('html4')
expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
assert_equal(expected, cgi.doctype)
- assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
## html4 transitional
cgi = CGI.new('html4Tr')
expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
assert_equal(expected, cgi.doctype)
- assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
## html4 frameset
cgi = CGI.new('html4Fr')
expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
assert_equal(expected, cgi.doctype)
- assert_equal("Content-Type: text/html\r\n\r\n",cgi.header)
- ## html5
- cgi = CGI.new('html5')
- expected = '<!DOCTYPE HTML>'
- assert_equal(expected, cgi.doctype)
- assert_match(/^<HEADER><\/HEADER>$/i,cgi.header)
end
diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb
index c6306eb0ff..6b110a07f6 100644
--- a/test/cgi/test_cgi_header.rb
+++ b/test/cgi/test_cgi_header.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'cgi'
-require 'time'
class CGIHeaderTest < Test::Unit::TestCase
@@ -21,28 +20,28 @@ class CGIHeaderTest < Test::Unit::TestCase
end
- def test_cgi_http_header_simple
+ def test_cgi_header_simple
cgi = CGI.new
## default content type
expected = "Content-Type: text/html\r\n\r\n"
- actual = cgi.http_header
+ actual = cgi.header
assert_equal(expected, actual)
## content type specified as string
expected = "Content-Type: text/xhtml; charset=utf8\r\n\r\n"
- actual = cgi.http_header('text/xhtml; charset=utf8')
+ actual = cgi.header('text/xhtml; charset=utf8')
assert_equal(expected, actual)
## content type specified as hash
expected = "Content-Type: image/png\r\n\r\n"
- actual = cgi.http_header('type'=>'image/png')
+ actual = cgi.header('type'=>'image/png')
assert_equal(expected, actual)
## charset specified
expected = "Content-Type: text/html; charset=utf8\r\n\r\n"
- actual = cgi.http_header('charset'=>'utf8')
+ actual = cgi.header('charset'=>'utf8')
assert_equal(expected, actual)
end
- def test_cgi_http_header_complex
+ def test_cgi_header_complex
cgi = CGI.new
options = {
'type' => 'text/xhtml',
@@ -64,12 +63,12 @@ class CGIHeaderTest < Test::Unit::TestCase
expected << "Expires: Sun, 23 Jan 2000 12:34:56 GMT\r\n"
expected << "location: http://www.ruby-lang.org/\r\n"
expected << "\r\n"
- actual = cgi.http_header(options)
+ actual = cgi.header(options)
assert_equal(expected, actual)
end
- def test_cgi_http_header_argerr
+ def test_cgi_header_argerr
cgi = CGI.new
#expected = NoMethodError # must be ArgumentError
if RUBY_VERSION>="1.9.0"
@@ -77,13 +76,13 @@ class CGIHeaderTest < Test::Unit::TestCase
else
expected = NoMethodError # for Ruby1.8
end
- assert_raise(expected) do
- cgi.http_header(nil)
+ ex = assert_raise(expected) do
+ cgi.header(nil)
end
end
- def test_cgi_http_header_cookie
+ def test_cgi_header_cookie
cgi = CGI.new
cookie1 = CGI::Cookie.new('name1', 'abc', '123')
cookie2 = CGI::Cookie.new('name'=>'name2', 'value'=>'value2', 'secure'=>true)
@@ -92,25 +91,25 @@ class CGIHeaderTest < Test::Unit::TestCase
c1 = "Set-Cookie: name1=abc&123; path=\r\n"
c2 = "Set-Cookie: name2=value2; path=; secure\r\n"
## CGI::Cookie object
- actual = cgi.http_header('cookie'=>cookie1)
+ actual = cgi.header('cookie'=>cookie1)
expected = ctype + c1 + sep
assert_equal(expected, actual)
## String
- actual = cgi.http_header('cookie'=>cookie2.to_s)
+ actual = cgi.header('cookie'=>cookie2.to_s)
expected = ctype + c2 + sep
assert_equal(expected, actual)
## Array
- actual = cgi.http_header('cookie'=>[cookie1, cookie2])
+ actual = cgi.header('cookie'=>[cookie1, cookie2])
expected = ctype + c1 + c2 + sep
assert_equal(expected, actual)
## Hash
- actual = cgi.http_header('cookie'=>{'name1'=>cookie1, 'name2'=>cookie2})
+ actual = cgi.header('cookie'=>{'name1'=>cookie1, 'name2'=>cookie2})
expected = ctype + c1 + c2 + sep
assert_equal(expected, actual)
end
- def test_cgi_http_header_output_cookies
+ def test_cgi_header_output_cookies
cgi = CGI.new
## output cookies
cookies = [ CGI::Cookie.new('name1', 'abc', '123'),
@@ -122,38 +121,31 @@ class CGIHeaderTest < Test::Unit::TestCase
expected << "Set-Cookie: name2=value2; path=; secure\r\n"
expected << "\r\n"
## header when string
- actual = cgi.http_header('text/html; charset=utf8')
+ actual = cgi.header('text/html; charset=utf8')
assert_equal(expected, actual)
## _header_for_string
- actual = cgi.http_header('type'=>'text/html', 'charset'=>'utf8')
+ actual = cgi.header('type'=>'text/html', 'charset'=>'utf8')
assert_equal(expected, actual)
end
- def test_cgi_http_header_nph
- time_start = Time.now.to_i
+ def test_cgi_header_nph
cgi = CGI.new
## 'nph' is true
ENV['SERVER_SOFTWARE'] = 'Apache 2.2.0'
- actual1 = cgi.http_header('nph'=>true)
+ actual1 = cgi.header('nph'=>true)
+ now = Time.now
## when old IIS, NPH-mode is forced
ENV['SERVER_SOFTWARE'] = 'IIS/4.0'
- actual2 = cgi.http_header
- actual3 = cgi.http_header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
+ actual2 = cgi.header
+ actual3 = cgi.header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
## newer IIS doesn't require NPH-mode ## [ruby-dev:30537]
ENV['SERVER_SOFTWARE'] = 'IIS/5.0'
- actual4 = cgi.http_header
- actual5 = cgi.http_header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
- time_end = Time.now.to_i
- date = /^Date: ([A-Z][a-z]{2}, \d{2} [A-Z][a-z]{2} \d{4} \d\d:\d\d:\d\d GMT)\r\n/
- [actual1, actual2, actual3].each do |actual|
- assert_match(date, actual)
- assert_includes(time_start..time_end, date =~ actual && Time.parse($1).to_i)
- actual.sub!(date, "Date: DATE_IS_REMOVED\r\n")
- end
+ actual4 = cgi.header
+ actual5 = cgi.header('status'=>'REDIRECT', 'location'=>'http://www.example.com/')
## assertion
expected = "HTTP/1.1 200 OK\r\n"
- expected << "Date: DATE_IS_REMOVED\r\n"
+ expected << "Date: #{CGI.rfc1123_date(now)}\r\n"
expected << "Server: Apache 2.2.0\r\n"
expected << "Connection: close\r\n"
expected << "Content-Type: text/html\r\n"
diff --git a/test/cgi/test_cgi_modruby.rb b/test/cgi/test_cgi_modruby.rb
index b0fc442bc9..4eb02fac56 100644
--- a/test/cgi/test_cgi_modruby.rb
+++ b/test/cgi/test_cgi_modruby.rb
@@ -30,7 +30,7 @@ class CGIModrubyTest < Test::Unit::TestCase
cgi = CGI.new
assert(req._setup_cgi_env_invoked?)
assert(! req._send_http_header_invoked?)
- actual = cgi.http_header
+ actual = cgi.header
assert_equal('', actual)
assert_equal('text/html', req.content_type)
assert(req._send_http_header_invoked?)
@@ -51,7 +51,7 @@ class CGIModrubyTest < Test::Unit::TestCase
}
assert(req._setup_cgi_env_invoked?)
assert(! req._send_http_header_invoked?)
- actual = cgi.http_header(options)
+ actual = cgi.header(options)
assert_equal('', actual)
assert_equal('image/gif', req.content_type)
assert_equal('403 Forbidden', req.status_line)
@@ -71,7 +71,7 @@ class CGIModrubyTest < Test::Unit::TestCase
'status' => '200 OK',
'location' => 'http://www.example.com/',
}
- cgi.http_header(options)
+ actual = cgi.header(options)
assert_equal('200 OK', req.status_line) # should be '302 Found' ?
assert_equal(302, req.status)
assert_equal('http://www.example.com/', req.headers_out['location'])
@@ -113,7 +113,6 @@ class Apache #:nodoc:
def hash.add(name, value)
(self[name] ||= []) << value
end
- @http_header = nil
@headers_out = hash
@status_line = nil
@status = nil
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
index ea40535dfd..c123aa80b5 100644
--- a/test/cgi/test_cgi_multipart.rb
+++ b/test/cgi/test_cgi_multipart.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'cgi'
require 'tempfile'
require 'stringio'
-require_relative '../ruby/envutil'
##
@@ -108,7 +107,6 @@ class CGIMultipartTest < Test::Unit::TestCase
def setup
ENV['REQUEST_METHOD'] = 'POST'
- @tempfiles = []
end
def teardown
@@ -117,14 +115,11 @@ class CGIMultipartTest < Test::Unit::TestCase
end
$stdin.close() if $stdin.is_a?(Tempfile)
$stdin = STDIN
- @tempfiles.each {|t|
- t.unlink
- }
end
def _prepare(data)
## create multipart input
- multipart = MultiPart.new(defined?(@boundary) ? @boundary : nil)
+ multipart = MultiPart.new(@boundary)
data.each do |hash|
multipart.append(hash[:name], hash[:value], hash[:filename])
end
@@ -138,7 +133,6 @@ class CGIMultipartTest < Test::Unit::TestCase
ENV['REQUEST_METHOD'] = 'POST'
## set $stdin
tmpfile = Tempfile.new('test_cgi_multipart')
- @tempfiles << tmpfile
tmpfile.binmode
tmpfile << input
tmpfile.rewind()
@@ -147,7 +141,7 @@ class CGIMultipartTest < Test::Unit::TestCase
def _test_multipart
caller(0).find {|s| s =~ /in `test_(.*?)'/ }
- #testname = $1
+ testname = $1
#$stderr.puts "*** debug: testname=#{testname.inspect}"
_prepare(@data)
cgi = RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
@@ -174,16 +168,6 @@ class CGIMultipartTest < Test::Unit::TestCase
assert_equal(hash[:filename] || '', cgi[name].original_filename) #if hash[:filename]
assert_equal(hash[:content_type] || '', cgi[name].content_type) #if hash[:content_type]
end
- ensure
- if cgi
- cgi.params.each {|name, vals|
- vals.each {|val|
- if val.kind_of?(Tempfile) && val.path
- val.unlink
- end
- }
- }
- end
end
@@ -286,9 +270,9 @@ class CGIMultipartTest < Test::Unit::TestCase
input2
end
ex = assert_raise(EOFError) do
- RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
+ cgi = RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
end
- assert_equal("bad content body", ex.message)
+ assert_equal("bad boundary end of body part", ex.message)
#
_prepare(@data) do |input|
input2 = input.sub(/--(\r\n)?\z/, "")
@@ -297,7 +281,7 @@ class CGIMultipartTest < Test::Unit::TestCase
input2
end
ex = assert_raise(EOFError) do
- RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
+ cgi = RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
end
assert_equal("bad content body", ex.message)
end
@@ -319,48 +303,6 @@ class CGIMultipartTest < Test::Unit::TestCase
assert_equal('file1.html', cgi['file1'].original_filename)
end
- def test_cgi_multipart_boundary_10240 # [Bug #3866]
- @boundary = 'AaB03x'
- @data = [
- {:name=>'file', :value=>"b"*10134,
- :filename=>'file.txt', :content_type=>'text/plain'},
- {:name=>'foo', :value=>"bar"},
- ]
- _prepare(@data)
- cgi = RUBY_VERSION>="1.9" ? CGI.new(:accept_charset=>"UTF-8") : CGI.new
- assert_equal(cgi['foo'], 'bar')
- assert_equal(cgi['file'].read, 'b'*10134)
- cgi['file'].unlink if cgi['file'].kind_of? Tempfile
- end
-
- def test_cgi_multipart_without_tempfile
- assert_in_out_err([], <<-'EOM')
- require 'cgi'
- require 'stringio'
- ENV['REQUEST_METHOD'] = 'POST'
- ENV['CONTENT_TYPE'] = 'multipart/form-data; boundary=foobar1234'
- body = <<-BODY
---foobar1234
-Content-Disposition: form-data: name=\"name1\"
-
-value1
---foobar1234
-Content-Disposition: form-data: name=\"file1\"; filename=\"file1.html\"
-Content-Type: text/html
-
-<html>
-<body><p>Hello</p></body>
-</html>
-
---foobar1234--
-BODY
- body.gsub!(/\n/, "\r\n")
- ENV['CONTENT_LENGTH'] = body.size.to_s
- $stdin = StringIO.new(body)
- CGI.new
- EOM
- end
-
###
self.instance_methods.each do |method|
diff --git a/test/cgi/test_cgi_session.rb b/test/cgi/test_cgi_session.rb
index 8bd51776ff..f3b8e60865 100644
--- a/test/cgi/test_cgi_session.rb
+++ b/test/cgi/test_cgi_session.rb
@@ -7,7 +7,8 @@ require 'tmpdir'
class CGISessionTest < Test::Unit::TestCase
def setup
- @session_dir = Dir.mktmpdir(%w'session dir')
+ @session_dir = File.join(File.dirname(__FILE__), 'session_dir')
+ FileUtils.mkdir_p @session_dir
end
def teardown
@@ -110,7 +111,7 @@ class CGISessionTest < Test::Unit::TestCase
assert_equal(value1,session["key1"])
assert_equal(value2,session["key2"])
assert_equal("foo",session.session_id)
- #session_id=session.session_id
+ session_id=session.session_id
session.close
$stdout = StringIO.new
cgi.out{""}
diff --git a/test/cgi/test_cgi_tag_helper.rb b/test/cgi/test_cgi_tag_helper.rb
index 51d1d58bd3..29306578b0 100644
--- a/test/cgi/test_cgi_tag_helper.rb
+++ b/test/cgi/test_cgi_tag_helper.rb
@@ -338,17 +338,4 @@ class CGITagHelperTest < Test::Unit::TestCase
end
=end
- def test_cgi_tag_helper_html5
- @environ = {
- 'REQUEST_METHOD' => 'GET',
- }
- ENV.update(@environ)
- ## html5
- cgi = CGI.new('html5')
- assert_equal('<HEADER></HEADER>',cgi.header)
- assert_equal('<FOOTER></FOOTER>',cgi.footer)
- assert_equal('<ARTICLE></ARTICLE>',cgi.article)
- assert_equal('<SECTION></SECTION>',cgi.section)
- end
-
end
diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb
index 7129cb6c9e..71e8beac3d 100644
--- a/test/cgi/test_cgi_util.rb
+++ b/test/cgi/test_cgi_util.rb
@@ -24,45 +24,15 @@ class CGIUtilTest < Test::Unit::TestCase
assert_equal('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI::escape(@str1).ascii_only?) if defined?(::Encoding)
end
- def test_cgi_escape_with_invalid_byte_sequence
- assert_nothing_raised(ArgumentError) do
- assert_equal('%C0%3C%3C', CGI::escape("\xC0<<".force_encoding("UTF-8")))
- end
- end
-
- def test_cgi_escape_preserve_encoding
- assert_equal(Encoding::US_ASCII, CGI::escape("\xC0<<".force_encoding("US-ASCII")).encoding)
- assert_equal(Encoding::ASCII_8BIT, CGI::escape("\xC0<<".force_encoding("ASCII-8BIT")).encoding)
- assert_equal(Encoding::UTF_8, CGI::escape("\xC0<<".force_encoding("UTF-8")).encoding)
- end
-
def test_cgi_unescape
assert_equal(@str1, CGI::unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93'))
assert_equal(@str1.encoding, CGI::unescape('%26%3C%3E%22+%E3%82%86%E3%82%93%E3%82%86%E3%82%93').encoding) if defined?(::Encoding)
assert_equal("\u{30E1 30E2 30EA 691C 7D22}", CGI.unescape("\u{30E1 30E2 30EA}%E6%A4%9C%E7%B4%A2"))
end
- def test_cgi_unescape_preserve_encoding
- assert_equal(Encoding::US_ASCII, CGI::unescape("%C0%3C%3C".force_encoding("US-ASCII")).encoding)
- assert_equal(Encoding::ASCII_8BIT, CGI::unescape("%C0%3C%3C".force_encoding("ASCII-8BIT")).encoding)
- assert_equal(Encoding::UTF_8, CGI::unescape("%C0%3C%3C".force_encoding("UTF-8")).encoding)
- end
-
def test_cgi_pretty
assert_equal("<HTML>\n <BODY>\n </BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>"))
assert_equal("<HTML>\n\t<BODY>\n\t</BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>","\t"))
end
- def test_cgi_escapeHTML
- assert_equal(CGI::escapeHTML("'&\"><"),"&#39;&amp;&quot;&gt;&lt;")
- end
-
- def test_cgi_unescapeHTML
- assert_equal(CGI::unescapeHTML("&#39;&amp;&quot;&gt;&lt;"),"'&\"><")
- end
-
- def test_cgi_unescapeHTML_uppercasecharacter
- assert_equal(CGI::unescapeHTML("&#x3042;&#x3044;&#X3046;"),"\xE3\x81\x82\xE3\x81\x84\xE3\x81\x86")
- end
-
end
diff --git a/test/coverage/test_coverage.rb b/test/coverage/test_coverage.rb
deleted file mode 100644
index f4f192a578..0000000000
--- a/test/coverage/test_coverage.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require "test/unit"
-require "coverage"
-require "tmpdir"
-
-class TestCoverage < Test::Unit::TestCase
- def test_result_without_start
- assert_raise(RuntimeError) {Coverage.result}
- end
- def test_result_with_nothing
- Coverage.start
- result = Coverage.result
- assert_kind_of(Hash, result)
- result.each do |key, val|
- assert_kind_of(String, key)
- assert_kind_of(Array, val)
- end
- end
-
- def test_restarting_coverage
- loaded_features = $".dup
-
- Dir.mktmpdir {|tmp|
- Dir.chdir(tmp) {
- File.open("test.rb", "w") do |f|
- f.puts <<-EOS
- def coverage_test_method
- :ok
- end
- EOS
- end
-
- Coverage.start
- require tmp + '/test.rb'
- assert_equal 3, Coverage.result[tmp + '/test.rb'].size
- Coverage.start
- coverage_test_method
- assert_equal 0, Coverage.result[tmp + '/test.rb'].size
- }
- }
- ensure
- $".replace loaded_features
- end
-
- def test_big_code
- loaded_features = $".dup
-
- Dir.mktmpdir {|tmp|
- Dir.chdir(tmp) {
- File.open("test.rb", "w") do |f|
- f.puts "__id__\n" * 10000
- f.puts "def ignore(x); end"
- f.puts "ignore([1"
- f.puts "])"
- end
-
- Coverage.start
- require tmp + '/test.rb'
- assert_equal 10003, Coverage.result[tmp + '/test.rb'].size
- }
- }
- ensure
- $".replace loaded_features
- end
-end
diff --git a/test/csv/base.rb b/test/csv/base.rb
deleted file mode 100644
index 42f4fa26ea..0000000000
--- a/test/csv/base.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "test/unit"
-
-require "csv"
-
-require_relative "../with_different_ofs.rb"
-
-class TestCSV < Test::Unit::TestCase
-end
diff --git a/test/csv/test_csv_parsing.rb b/test/csv/test_csv_parsing.rb
index 319f3f392f..c0b8d83f96 100755..100644
--- a/test/csv/test_csv_parsing.rb
+++ b/test/csv/test_csv_parsing.rb
@@ -7,9 +7,10 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
+require "test/unit"
require "timeout"
-require_relative "base"
+require "csv"
#
# Following tests are my interpretation of the
@@ -17,9 +18,7 @@ require_relative "base"
# document in one place (intentionally) and that is to make the default row
# separator <tt>$/</tt>.
#
-class TestCSV::Parsing < TestCSV
- extend DifferentOFS
-
+class TestCSVParsing < Test::Unit::TestCase
BIG_DATA = "123456789\n" * 1024
def test_mastering_regex_example
@@ -191,7 +190,7 @@ class TestCSV::Parsing < TestCSV
assert_send([csv.lineno, :<, 4])
end
rescue CSV::MalformedCSVError
- assert_equal("Illegal quoting in line 4.", $!.message)
+ assert_equal("Illegal quoting on line 4.", $!.message)
end
end
diff --git a/test/csv/test_csv_writing.rb b/test/csv/test_csv_writing.rb
index 704c1d7ddc..eacba49613 100755..100644
--- a/test/csv/test_csv_writing.rb
+++ b/test/csv/test_csv_writing.rb
@@ -7,11 +7,11 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
+require "test/unit"
-class TestCSV::Writing < TestCSV
- extend DifferentOFS
+require "csv"
+class TestCSVWriting < Test::Unit::TestCase
def test_writing
[ ["\t", ["\t"]],
["foo,\"\"\"\"\"\",baz", ["foo", "\"\"", "baz"]],
diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
index 3351620e10..1ad5093424 100755..100644
--- a/test/csv/test_data_converters.rb
+++ b/test/csv/test_data_converters.rb
@@ -7,13 +7,12 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
+require "test/unit"
-class TestCSV::DataConverters < TestCSV
- extend DifferentOFS
+require "csv"
+class TestDataConverters < Test::Unit::TestCase
def setup
- super
@data = "Numbers,:integer,1,:float,3.015"
@parser = CSV.new(@data)
@@ -66,25 +65,24 @@ class TestCSV::DataConverters < TestCSV
assert_instance_of(String, CSV::Converters[:date_time]["junk"])
end
- def test_convert_with_builtin_integer
+ def test_convert_with_builtin
# setup parser...
assert(@parser.respond_to?(:convert))
assert_nothing_raised(Exception) { @parser.convert(:integer) }
# and use
assert_equal(["Numbers", ":integer", 1, ":float", "3.015"], @parser.shift)
- end
- def test_convert_with_builtin_float
+ setup # reset
+
# setup parser...
- assert(@parser.respond_to?(:convert))
assert_nothing_raised(Exception) { @parser.convert(:float) }
# and use
assert_equal(["Numbers", ":integer", 1.0, ":float", 3.015], @parser.shift)
end
- def test_convert_order_float_integer
+ def test_convert_order
# floats first, then integers...
assert_nothing_raised(Exception) do
@parser.convert(:float)
@@ -94,9 +92,9 @@ class TestCSV::DataConverters < TestCSV
# gets us nothing but floats
assert_equal( [String, String, Float, String, Float],
@parser.shift.map { |field| field.class } )
- end
- def test_convert_order_integer_float
+ setup # reset
+
# integers have precendance...
assert_nothing_raised(Exception) do
@parser.convert(:integer)
@@ -136,9 +134,9 @@ class TestCSV::DataConverters < TestCSV
# and use
assert_equal(["Numbers", :integer, "1", :float, "3.015"], @parser.shift)
- end
- def test_convert_with_custom_code_mix
+ setup # reset
+
# mix built-in and custom...
assert_nothing_raised(Exception) { @parser.convert(:numeric) }
assert_nothing_raised(Exception) { @parser.convert(&@custom) }
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 4e2c60545d..bea4c620bb 100755..100644
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -7,13 +7,12 @@
# Copyright 2008 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
+require "test/unit"
-class TestCSV::Encodings < TestCSV
- extend DifferentOFS
+require "csv"
+class TestEncodings < Test::Unit::TestCase
def setup
- super
require 'tempfile'
@temp_csv_file = Tempfile.new(%w"test_csv. .csv")
@temp_csv_path = @temp_csv_file.path
@@ -22,7 +21,6 @@ class TestCSV::Encodings < TestCSV
def teardown
@temp_csv_file.close!
- super
end
########################################
@@ -79,25 +77,6 @@ class TestCSV::Encodings < TestCSV
end
end
- def test_read_with_default_encoding
- data = "abc"
- default_external = Encoding.default_external
- each_encoding do |encoding|
- File.open(@temp_csv_path, "wb", encoding: encoding) {|f| f << data}
- begin
- no_warnings do
- Encoding.default_external = encoding
- end
- result = CSV.read(@temp_csv_path)[0][0]
- ensure
- no_warnings do
- Encoding.default_external = default_external
- end
- end
- assert_equal(encoding, result.encoding)
- end
- end
-
#######################################################################
### Stress Test ASCII Compatible and Non-ASCII Compatible Encodings ###
#######################################################################
@@ -177,9 +156,10 @@ class TestCSV::Encodings < TestCSV
def test_foreach_allows_you_to_set_encodings
encode_for_tests([%w[abc def]]) do |data|
# read and write in encoding
- File.open(@temp_csv_path, "wb", encoding: data.encoding) { |f| f << data }
- CSV.foreach(@temp_csv_path, encoding: data.encoding) do |row|
- row.each {|f| assert_equal(f.encoding, data.encoding)}
+ File.open(@temp_csv_path, "wb:#{data.encoding.name}") { |f| f << data }
+ CSV.foreach(@temp_csv_path, encoding: data.encoding.name) do |row|
+ assert( row.all? { |f| f.encoding == data.encoding },
+ "Wrong data encoding." )
end
# read and write with transcoding
@@ -240,74 +220,33 @@ class TestCSV::Encodings < TestCSV
assert_equal(data, CSV.read(@temp_csv_path, encoding: encoding.name))
end
end
-
+
def test_encoding_is_upgraded_during_writing_as_needed
data = ["foo".force_encoding("US-ASCII"), "\u3042"]
assert_equal("US-ASCII", data.first.encoding.name)
assert_equal("UTF-8", data.last.encoding.name)
- assert_equal("UTF-8", data.join('').encoding.name)
+ assert_equal("UTF-8", data.join.encoding.name)
assert_equal("UTF-8", data.to_csv.encoding.name)
end
-
+
def test_encoding_is_upgraded_for_ascii_content_during_writing_as_needed
data = ["foo".force_encoding("ISO-8859-1"), "\u3042"]
assert_equal("ISO-8859-1", data.first.encoding.name)
assert_equal("UTF-8", data.last.encoding.name)
- assert_equal("UTF-8", data.join('').encoding.name)
+ assert_equal("UTF-8", data.join.encoding.name)
assert_equal("UTF-8", data.to_csv.encoding.name)
end
- def test_explicit_encoding
- bug9766 = '[ruby-core:62113] [Bug #9766]'
- s = CSV.generate(encoding: "Windows-31J") do |csv|
- csv << ["foo".force_encoding("ISO-8859-1"), "\u3042"]
- end
- assert_equal(["foo,\u3042\n".encode(Encoding::Windows_31J), Encoding::Windows_31J], [s, s.encoding], bug9766)
- end
-
private
def assert_parses(fields, encoding, options = { })
encoding = Encoding.find(encoding) unless encoding.is_a? Encoding
- orig_fields = fields
fields = encode_ary(fields, encoding)
- data = ary_to_data(fields, options)
- parsed = CSV.parse(data, options)
+ parsed = CSV.parse(ary_to_data(fields, options), options)
assert_equal(fields, parsed)
parsed.flatten.each_with_index do |field, i|
assert_equal(encoding, field.encoding, "Field[#{i + 1}] was transcoded.")
end
- File.open(@temp_csv_path, "wb") {|f| f.print(data)}
- CSV.open(@temp_csv_path, "rb:#{encoding}", options) do |csv|
- csv.each_with_index do |row, i|
- assert_equal(fields[i], row)
- end
- end
- begin
- CSV.open(@temp_csv_path, "rb:#{encoding}:#{__ENCODING__}", options) do |csv|
- csv.each_with_index do |row, i|
- assert_equal(orig_fields[i], row)
- end
- end unless encoding == __ENCODING__
- rescue Encoding::ConverterNotFoundError
- end
- options[:encoding] = encoding.name
- CSV.open(@temp_csv_path, options) do |csv|
- csv.each_with_index do |row, i|
- assert_equal(fields[i], row)
- end
- end
- options.delete(:encoding)
- options[:external_encoding] = encoding.name
- options[:internal_encoding] = __ENCODING__.name
- begin
- CSV.open(@temp_csv_path, options) do |csv|
- csv.each_with_index do |row, i|
- assert_equal(orig_fields[i], row)
- end
- end unless encoding == __ENCODING__
- rescue Encoding::ConverterNotFoundError
- end
end
def encode_ary(ary, encoding)
@@ -321,9 +260,9 @@ class TestCSV::Encodings < TestCSV
row_sep = (options[:row_sep] || "\n").encode(encoding)
ary.map { |row|
row.map { |field|
- [quote_char, field.encode(encoding), quote_char].join('')
+ [quote_char, field.encode(encoding), quote_char].join
}.join(col_sep) + row_sep
- }.join('').encode(encoding)
+ }.join.encode(encoding)
end
def encode_for_tests(data, options = { })
@@ -337,11 +276,4 @@ class TestCSV::Encodings < TestCSV
yield encoding
end
end
-
- def no_warnings
- old_verbose, $VERBOSE = $VERBOSE, nil
- yield
- ensure
- $VERBOSE = old_verbose
- end
end
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index 5f8550e6ee..58efd1c9b3 100755..100644
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -7,17 +7,12 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-begin
- require "zlib"
-rescue LoadError
-end
-
-require_relative "base"
-require "tempfile"
+require "test/unit"
+require "zlib"
-class TestCSV::Features < TestCSV
- extend DifferentOFS
+require "csv"
+class TestCSVFeatures < Test::Unit::TestCase
TEST_CASES = [ [%Q{a,b}, ["a", "b"]],
[%Q{a,"""b"""}, ["a", "\"b\""]],
[%Q{a,"""b"}, ["a", "\"b"]],
@@ -37,7 +32,6 @@ class TestCSV::Features < TestCSV
[%Q{"\r\n,",}, ["\r\n,", nil]] ]
def setup
- super
@sample_data = <<-END_DATA.gsub(/^ +/, "")
line,1,abc
line,2,"def\nghi"
@@ -74,14 +68,6 @@ class TestCSV::Features < TestCSV
end
end
- def test_bug_8405
- TEST_CASES.each do |test_case|
- assert_equal( test_case.last.map { |t| t.tr('"', "|") unless t.nil? },
- CSV.parse_line( test_case.first.tr('"', "|"),
- quote_char: "|" ) )
- end
- end
-
def test_csv_char_readers
%w[col_sep row_sep quote_char].each do |reader|
csv = CSV.new("abc,def", reader.to_sym => "|")
@@ -217,12 +203,10 @@ class TestCSV::Features < TestCSV
)
end
assert_equal("\r\n", zipped.row_sep)
- end if defined?(Zlib::GzipReader)
+ end
def test_gzip_writer_bug_fix
- tempfile = Tempfile.new(%w"temp .gz")
- tempfile.close
- file = tempfile.path
+ file = File.join(File.dirname(__FILE__), "temp.gz")
zipped = nil
assert_nothing_raised(NoMethodError) do
zipped = CSV.new(Zlib::GzipWriter.open(file))
@@ -234,8 +218,8 @@ class TestCSV::Features < TestCSV
assert( Zlib::GzipReader.open(file) { |f| f.read }.
include?($INPUT_RECORD_SEPARATOR),
"@row_sep did not default" )
- tempfile.close(true)
- end if defined?(Zlib::GzipWriter)
+ File.unlink(file)
+ end
def test_inspect_is_smart_about_io_types
str = CSV.new("string,data").inspect
@@ -244,13 +228,11 @@ class TestCSV::Features < TestCSV
str = CSV.new($stderr).inspect
assert(str.include?("io_type:$stderr"), "IO type not detected.")
- tempfile = Tempfile.new(%w"temp .csv")
- tempfile.close
- path = tempfile.path
+ path = File.join(File.dirname(__FILE__), "temp.csv")
File.open(path, "w") { |csv| csv << "one,two,three\n1,2,3\n" }
str = CSV.open(path) { |csv| csv.inspect }
assert(str.include?("io_type:File"), "IO type not detected.")
- tempfile.close(true)
+ File.unlink(path)
end
def test_inspect_shows_key_attributes
@@ -282,37 +264,4 @@ class TestCSV::Features < TestCSV
assert(CSV::VERSION.frozen?)
assert_match(/\A\d\.\d\.\d\Z/, CSV::VERSION)
end
-
- def test_accepts_comment_skip_lines_option
- assert_nothing_raised(ArgumentError) do
- CSV.new nil, :skip_lines => /\A\s*#/
- end
- end
-
- def test_accepts_comment_defaults_to_nil
- c = CSV.new nil
- assert_equal c.skip_lines, nil
- end
-
- class RegexStub
- end
-
- def test_requires_skip_lines_to_call_match
- regex_stub = RegexStub.new
- assert_raise(ArgumentError) do
- CSV.new nil, :skip_lines => regex_stub
- end
- end
-
- def test_comment_rows_are_ignored
- sample_data = "line,1,a\n#not,a,line\nline,2,b\n #also,no,line"
- c = CSV.new sample_data, :skip_lines => /\A\s*#/
- assert_equal c.each.to_a, [["line", "1", "a"], ["line", "2", "b"]]
- end
-
- def test_quoted_skip_line_markers_are_ignored
- sample_data = "line,1,a\n\"#not\",a,line\nline,2,b"
- c = CSV.new sample_data, :skip_lines => /\A\s*#/
- assert_equal c.each.to_a, [["line", "1", "a"], ["#not", "a", "line"], ["line", "2", "b"]]
- end
end
diff --git a/test/csv/test_headers.rb b/test/csv/test_headers.rb
index 00ae82af06..6e56ffc27c 100755..100644
--- a/test/csv/test_headers.rb
+++ b/test/csv/test_headers.rb
@@ -7,13 +7,12 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
+require "test/unit"
-class TestCSV::Headers < TestCSV
- extend DifferentOFS
+require "csv"
+class TestCSVHeaders < Test::Unit::TestCase
def setup
- super
@data = <<-END_CSV.gsub(/^\s+/, "")
first,second,third
A,B,C
diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb
index 73e6ca9a4a..a58e9c6179 100755..100644
--- a/test/csv/test_interface.rb
+++ b/test/csv/test_interface.rb
@@ -7,17 +7,13 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
-require "tempfile"
+require "test/unit"
-class TestCSV::Interface < TestCSV
- extend DifferentOFS
+require "csv"
+class TestCSVInterface < Test::Unit::TestCase
def setup
- super
- @tempfile = Tempfile.new(%w"temp .csv")
- @tempfile.close
- @path = @tempfile.path
+ @path = File.join(File.dirname(__FILE__), "temp_test_data.csv")
File.open(@path, "wb") do |file|
file << "1\t2\t3\r\n"
@@ -28,8 +24,7 @@ class TestCSV::Interface < TestCSV
end
def teardown
- @tempfile.close(true)
- super
+ File.unlink(@path)
end
### Test Read Interface ###
@@ -84,7 +79,7 @@ class TestCSV::Interface < TestCSV
assert_equal(nil, CSV.parse_line("")) # to signal eof
assert_equal(Array.new, CSV.parse_line("\n1,2,3"))
end
-
+
def test_read_and_readlines
assert_equal( @expected,
CSV.read(@path, col_sep: "\t", row_sep: "\r\n") )
@@ -116,14 +111,6 @@ class TestCSV::Interface < TestCSV
end
end
- def test_enumerators_are_supported
- CSV.open(@path, col_sep: "\t", row_sep: "\r\n") do |csv|
- enum = csv.each
- assert_instance_of(Enumerator, enum)
- assert_equal(@expected.shift, enum.next)
- end
- end
-
### Test Write Interface ###
def test_generate
@@ -319,19 +306,4 @@ class TestCSV::Interface < TestCSV
assert_equal(STDOUT, CSV.instance.instance_eval { @io })
assert_equal(STDOUT, CSV { |new_csv| new_csv.instance_eval { @io } })
end
-
- def test_options_are_not_modified
- opt = {}.freeze
- assert_nothing_raised { CSV.foreach(@path, opt) }
- assert_nothing_raised { CSV.open(@path, opt){} }
- assert_nothing_raised { CSV.parse("", opt) }
- assert_nothing_raised { CSV.parse_line("", opt) }
- assert_nothing_raised { CSV.read(@path, opt) }
- assert_nothing_raised { CSV.readlines(@path, opt) }
- assert_nothing_raised { CSV.table(@path, opt) }
- assert_nothing_raised { CSV.generate(opt){} }
- assert_nothing_raised { CSV.generate_line([], opt) }
- assert_nothing_raised { CSV.filter("", "", opt){} }
- assert_nothing_raised { CSV.instance("", opt) }
- end
end
diff --git a/test/csv/test_row.rb b/test/csv/test_row.rb
index 697c7d56c8..f9aa959701 100755..100644
--- a/test/csv/test_row.rb
+++ b/test/csv/test_row.rb
@@ -7,13 +7,12 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
+require "test/unit"
-class TestCSV::Row < TestCSV
- extend DifferentOFS
+require "csv"
+class TestCSVRow < Test::Unit::TestCase
def setup
- super
@row = CSV::Row.new(%w{A B C A A}, [1, 2, 3, 4])
end
@@ -78,33 +77,6 @@ class TestCSV::Row < TestCSV
assert_equal(nil, @row.field("A", 5))
end
- def test_fetch
- # only by name
- assert_equal(2, @row.fetch('B'))
-
- # missing header raises KeyError
- assert_raise KeyError do
- @row.fetch('foo')
- end
-
- # missing header yields itself to block
- assert_equal 'bar', @row.fetch('foo') { |header|
- header == 'foo' ? 'bar' : false }
-
- # missing header returns the given default value
- assert_equal 'bar', @row.fetch('foo', 'bar')
-
- # more than one vararg raises ArgumentError
- assert_raise ArgumentError do
- @row.fetch('foo', 'bar', 'baz')
- end
- end
-
- def test_has_key?
- assert_equal(true, @row.has_key?('B'))
- assert_equal(false, @row.has_key?('foo'))
- end
-
def test_set_field
# set field by name
assert_equal(100, @row["A"] = 100)
@@ -283,7 +255,7 @@ class TestCSV::Row < TestCSV
assert_equal( [["A", 1], ["A", 4], ["A", nil]],
@row.select { |pair| pair.first == "A" } )
- assert_equal(10, @row.inject(0) { |sum, (_, n)| sum + (n || 0) })
+ assert_equal(10, @row.inject(0) { |sum, (header, n)| sum + (n || 0) })
end
def test_to_a
@@ -337,8 +309,4 @@ class TestCSV::Row < TestCSV
"Header field pair not found." )
end
end
-
- def test_can_be_compared_with_other_classes
- assert(CSV::Row.new([ ], [ ]) != nil, "The row was nil")
- end
end
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb
new file mode 100644
index 0000000000..5f0201ed90
--- /dev/null
+++ b/test/csv/test_serialization.rb
@@ -0,0 +1,156 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+
+# tc_serialization.rb
+#
+# 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.
+
+require "test/unit"
+
+require "csv"
+
+# An example of how to provide custom CSV serialization.
+class Hash
+ def self.csv_load( meta, headers, fields )
+ self[*headers.zip(fields).to_a.flatten.map { |e| eval(e) }]
+ end
+
+ def csv_headers
+ keys.map { |key| key.inspect }
+ end
+
+ def csv_dump( headers )
+ headers.map { |header| fetch(eval(header)).inspect }
+ end
+end
+
+class TestSerialization < Test::Unit::TestCase
+
+ ### Classes Used to Test Serialization ###
+
+ class ReadOnlyName
+ def initialize( first, last )
+ @first, @last = first, last
+ end
+
+ attr_reader :first, :last
+
+ def ==( other )
+ %w{first last}.all? { |att| send(att) == other.send(att) }
+ end
+ end
+
+ Name = Struct.new(:first, :last)
+
+ class FullName < Name
+ def initialize( first, last, suffix = nil )
+ super(first, last)
+
+ @suffix = suffix
+ end
+
+ attr_accessor :suffix
+
+ def ==( other )
+ %w{first last suffix}.all? { |att| send(att) == other.send(att) }
+ end
+ end
+
+ ### Tests ###
+
+ def test_class_dump
+ @names = [ %w{James Gray},
+ %w{Dana Gray},
+ %w{Greg Brown} ].map do |first, last|
+ ReadOnlyName.new(first, last)
+ end
+
+ assert_nothing_raised(Exception) do
+ @data = CSV.dump(@names)
+ end
+ assert_equal(<<-END_CLASS_DUMP.gsub(/^\s*/, ""), @data)
+ class,TestSerialization::ReadOnlyName
+ @first,@last
+ James,Gray
+ Dana,Gray
+ Greg,Brown
+ END_CLASS_DUMP
+ end
+
+ def test_struct_dump
+ @names = [ %w{James Gray},
+ %w{Dana Gray},
+ %w{Greg Brown} ].map do |first, last|
+ Name.new(first, last)
+ end
+
+ assert_nothing_raised(Exception) do
+ @data = CSV.dump(@names)
+ end
+ assert_equal(<<-END_STRUCT_DUMP.gsub(/^\s*/, ""), @data)
+ class,TestSerialization::Name
+ first=,last=
+ James,Gray
+ Dana,Gray
+ Greg,Brown
+ END_STRUCT_DUMP
+ end
+
+ def test_inherited_struct_dump
+ @names = [ %w{James Gray II},
+ %w{Dana Gray},
+ %w{Greg Brown} ].map do |first, last, suffix|
+ FullName.new(first, last, suffix)
+ end
+
+ assert_nothing_raised(Exception) do
+ @data = CSV.dump(@names)
+ end
+ assert_equal(<<-END_STRUCT_DUMP.gsub(/^\s*/, ""), @data)
+ class,TestSerialization::FullName
+ @suffix,first=,last=
+ II,James,Gray
+ ,Dana,Gray
+ ,Greg,Brown
+ END_STRUCT_DUMP
+ end
+
+ def test_load
+ %w{ test_class_dump
+ test_struct_dump
+ test_inherited_struct_dump }.each do |test|
+ send(test)
+ CSV.load(@data).each do |loaded|
+ assert_instance_of(@names.first.class, loaded)
+ assert_equal(@names.shift, loaded)
+ end
+ end
+ end
+
+ def test_io
+ test_class_dump
+
+ data_file = File.join(File.dirname(__FILE__), "temp_test_data.csv")
+ CSV.dump(@names, File.open(data_file, "wb"))
+
+ assert(File.exist?(data_file))
+ assert_equal(<<-END_IO_DUMP.gsub(/^\s*/, ""), File.read(data_file))
+ class,TestSerialization::ReadOnlyName
+ @first,@last
+ James,Gray
+ Dana,Gray
+ Greg,Brown
+ END_IO_DUMP
+
+ assert_equal(@names, CSV.load(File.open(data_file)))
+
+ File.unlink(data_file)
+ end
+
+ def test_custom_dump_and_load
+ obj = {1 => "simple", test: Hash}
+ assert_equal(obj, CSV.load(CSV.dump([obj])).first)
+ end
+end
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
index 318825f2b1..d0b421750f 100755..100644
--- a/test/csv/test_table.rb
+++ b/test/csv/test_table.rb
@@ -7,13 +7,12 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require_relative "base"
+require "test/unit"
-class TestCSV::Table < TestCSV
- extend DifferentOFS
+require "csv"
+class TestCSVTable < Test::Unit::TestCase
def setup
- super
@rows = [ CSV::Row.new(%w{A B C}, [1, 2, 3]),
CSV::Row.new(%w{A B C}, [4, 5, 6]),
CSV::Row.new(%w{A B C}, [7, 8, 9]) ]
@@ -254,7 +253,7 @@ class TestCSV::Table < TestCSV
# with options
assert_equal( csv.gsub(",", "|").gsub("\n", "\r\n"),
@table.to_csv(col_sep: "|", row_sep: "\r\n") )
- assert_equal( csv.lines.to_a[1..-1].join(''),
+ assert_equal( csv.lines.to_a[1..-1].join,
@table.to_csv(:write_headers => false) )
# with headers
@@ -273,7 +272,7 @@ class TestCSV::Table < TestCSV
assert_equal(CSV::Row.new(%w[A B C], [13, 14, 15]), @table[-1])
end
- def test_delete_mixed
+ def test_delete
##################
### Mixed Mode ###
##################
@@ -289,12 +288,11 @@ class TestCSV::Table < TestCSV
2,3
8,9
END_RESULT
- end
- def test_delete_column
###################
### Column Mode ###
###################
+ setup
@table.by_col!
assert_equal(@rows.map { |row| row[0] }, @table.delete(0))
@@ -307,12 +305,11 @@ class TestCSV::Table < TestCSV
5
8
END_RESULT
- end
- def test_delete_row
################
### Row Mode ###
################
+ setup
@table.by_row!
assert_equal(@rows[1], @table.delete(1))
@@ -331,8 +328,8 @@ class TestCSV::Table < TestCSV
table = CSV.parse(data, :headers => true)
assert_equal(["ra2", nil, "rb2"], table.delete("col2"))
end
-
- def test_delete_if_row
+
+ def test_delete_if
######################
### Mixed/Row Mode ###
######################
@@ -344,12 +341,11 @@ class TestCSV::Table < TestCSV
A,B,C
4,5,6
END_RESULT
- end
- def test_delete_if_column
###################
### Column Mode ###
###################
+ setup
@table.by_col!
assert_equal(@table, @table.delete_if { |h, v| h > "A" })
diff --git a/test/csv/ts_all.rb b/test/csv/ts_all.rb
index 389384168b..4fadbb46e9 100644
--- a/test/csv/ts_all.rb
+++ b/test/csv/ts_all.rb
@@ -17,4 +17,5 @@ require "test_data_converters"
require "test_row"
require "test_table"
require "test_headers"
+require "test_serialization"
require "test_encodings"
diff --git a/test/date/test_date.rb b/test/date/test_date.rb
index 86790e4cde..47ce568408 100644
--- a/test/date/test_date.rb
+++ b/test/date/test_date.rb
@@ -41,9 +41,9 @@ class TestDate < Test::Unit::TestCase
assert_instance_of(DateSub, DateSub.today)
assert_instance_of(DateTimeSub, DateTimeSub.now)
-# assert_equal('#<DateSub: -4712-01-01 (-1/2,0,2299161)>', d.inspect)
+ assert_equal('#<DateSub: -4712-01-01 (-1/2,0,2299161)>', d.inspect)
assert_equal('-4712-01-01', d.to_s)
-# assert_equal('#<DateTimeSub: -4712-01-01T00:00:00+00:00 (-1/2,0,2299161)>', dt.inspect)
+ assert_equal('#<DateTimeSub: -4712-01-01T00:00:00+00:00 (-1/2,0,2299161)>', dt.inspect)
assert_equal('-4712-01-01T00:00:00+00:00', dt.to_s)
d2 = d + 1
@@ -113,6 +113,27 @@ class TestDate < Test::Unit::TestCase
assert_equal(d2, dt2)
end
+ def test_coerce
+ bug4375 = '[ruby-core:35127]'
+ d = Date.jd(0)
+ d2 = Date.jd(1)
+ others = [1, d2, Date::Infinity.new, nil, Object.new]
+ assert_nothing_raised(bug4375) {
+ others.each do |o|
+ case o
+ when d
+ flunk("expected not to match")
+ end
+ end
+ }
+ assert_nothing_raised(bug4375) {
+ case d
+ when *others
+ flunk("expected not to match")
+ end
+ }
+ end
+
def test_hash
h = {}
h[Date.new(1999,5,23)] = 0
diff --git a/test/date/test_date_attr.rb b/test/date/test_date_attr.rb
index 88a54d7461..5187d5d3e5 100644
--- a/test/date/test_date_attr.rb
+++ b/test/date/test_date_attr.rb
@@ -8,7 +8,6 @@ class TestDateAttr < Test::Unit::TestCase
datetime = DateTime.new(1965, 5, 23, 22, 31, 59)
[date, datetime].each_with_index do |d, i|
-=begin
if i == 0
assert_match(/\#<Date\d?: 1965-05-23 \(4877807\/2,0,2299161\)>/,
d.inspect)
@@ -16,7 +15,6 @@ class TestDateAttr < Test::Unit::TestCase
assert_match(/\#<DateTime\d?: 1965-05-23T22:31:59\+00:00 \(210721343519\/86400,0,2299161\)>/,
d.inspect)
end
-=end
if i == 0
assert_equal('1965-05-23', d.to_s)
@@ -96,7 +94,6 @@ class TestDateAttr < Test::Unit::TestCase
end
def test_nth_kday
- skip unless Date.new.respond_to?(:nth_kday?, true)
assert_equal(false, Date.new(2001,1,14).__send__(:nth_kday?, 1,0))
assert_equal(true, Date.new(2001,1,14).__send__(:nth_kday?, 2,0))
assert_equal(false, Date.new(2001,1,14).__send__(:nth_kday?, 3,0))
diff --git a/test/date/test_date_base.rb b/test/date/test_date_base.rb
index 1f3d8c0a55..a8dc2ee6b2 100644
--- a/test/date/test_date_base.rb
+++ b/test/date/test_date_base.rb
@@ -53,7 +53,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_ordinal__julian
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from..@to
m, d, y = julian_from_absolute(absolute_from_julian_day_number(j))
j0 = julian_day_number_from_absolute(absolute_from_julian(12, 31, y - 1))
@@ -68,7 +70,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_ordinal__gregorian
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from..@to
m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j))
j0 =
@@ -84,7 +88,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_civil__julian
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from..@to
m, d, y = julian_from_absolute(absolute_from_julian_day_number(j))
j2 = julian_day_number_from_absolute(absolute_from_julian(m, d, y))
@@ -99,7 +105,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_civil__gregorian
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from..@to
m, d, y = gregorian_from_absolute(absolute_from_julian_day_number(j))
j2 = julian_day_number_from_absolute(absolute_from_gregorian(m, d, y))
@@ -114,7 +122,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_commercial__gregorian
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from..@to
w, d, y = iso_from_absolute(absolute_from_julian_day_number(j))
j2 = julian_day_number_from_absolute(absolute_from_iso(w, d, y))
@@ -129,7 +139,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_weeknum
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from..@to
for k in 0..1
wy, ww, wd = Date.__send__(:jd_to_weeknum, j, k, Date::GREGORIAN)
@@ -140,7 +152,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_weeknum__2
- skip unless defined?(Calendar)
+ unless defined?(Calendar)
+ return
+ end
for j in @from4t..@to4t
d = Date.jd(j)
t = Time.mktime(d.year, d.mon, d.mday)
@@ -158,9 +172,9 @@ class TestDateBase < Test::Unit::TestCase
end
def test_nth_kday
- skip unless defined?(Calendar)
- skip unless (Date.respond_to?(:nth_kday_to_jd, true) &&
- Date.respond_to?(:jd_to_nth_kday, true))
+ unless defined?(Calendar)
+ return
+ end
for y in 1601..2401
for m in 1..12
for n in -5..5
@@ -179,26 +193,19 @@ class TestDateBase < Test::Unit::TestCase
end
end
- def test_jd
- assert_equal(1 << 33, Date.jd(1 << 33).jd)
- end
-
def test_mjd
- skip unless Date.respond_to?(:mjd_to_jd, true)
jd = Date.__send__(:mjd_to_jd, 51321)
mjd = Date.__send__(:jd_to_mjd, jd)
assert_equal(51321, mjd)
end
def test_ld
- skip unless Date.respond_to?(:ld_to_jd, true)
jd = Date.__send__(:ld_to_jd, 152162)
ld = Date.__send__(:jd_to_ld, jd)
assert_equal(152162, ld)
end
def test_wday
- skip unless Date.respond_to?(:jd_to_wday, true)
assert_equal(4, Date.__send__(:jd_to_wday, 3))
assert_equal(3, Date.__send__(:jd_to_wday, 2))
assert_equal(2, Date.__send__(:jd_to_wday, 1))
@@ -224,7 +231,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_jd
valid_jd_p = :_valid_jd?
- skip unless Date.respond_to?(valid_jd_p, true)
assert_equal(-1, Date.__send__(valid_jd_p, -1))
assert_equal(0, Date.__send__(valid_jd_p, 0))
assert_equal(1, Date.__send__(valid_jd_p, 1))
@@ -233,7 +239,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal
valid_ordinal_p = :_valid_ordinal?
- skip unless Date.respond_to?(valid_ordinal_p, true)
assert_nil(Date.__send__(valid_ordinal_p, 1999,366))
assert_equal(2451910, Date.__send__(valid_ordinal_p, 2000,366))
assert_nil(Date.__send__(valid_ordinal_p, 1999,-366))
@@ -248,7 +253,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal__edge
valid_ordinal_p = :_valid_ordinal?
- skip unless Date.respond_to?(valid_ordinal_p, true)
(1601..2400).each do |y|
d = if Date.leap?(y) then 366 else 365 end
assert_not_nil(Date.__send__(valid_ordinal_p, y,d))
@@ -274,7 +278,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal__italy
valid_ordinal_p = :_valid_ordinal?
- skip unless Date.respond_to?(valid_ordinal_p, true)
(1..355).each do |d|
assert_not_nil(Date.__send__(valid_ordinal_p, 1582,d,Date::ITALY))
end
@@ -291,7 +294,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_ordinal__england
valid_ordinal_p = :_valid_ordinal?
- skip unless Date.respond_to?(valid_ordinal_p, true)
(1..355).each do |d|
assert_not_nil(Date.__send__(valid_ordinal_p, 1752,d,Date::ENGLAND))
end
@@ -302,7 +304,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil
valid_civil_p = :_valid_civil?
- skip unless Date.respond_to?(valid_civil_p, true)
assert_nil(Date.__send__(valid_civil_p, 1999,2,29))
assert_equal(2451604, Date.__send__(valid_civil_p, 2000,2,29))
assert_nil(Date.__send__(valid_civil_p, 1999,2,-29))
@@ -313,12 +314,10 @@ class TestDateBase < Test::Unit::TestCase
Date.__send__(valid_civil_p, 2001,1,-31))
assert_nil(Date.__send__(valid_civil_p, 2001,1,-32))
assert_equal(2452348, Date.__send__(valid_civil_p, 2002,3,14))
- assert_nil(Date.__send__(valid_civil_p, 2010,-13,-1))
end
def test_valid_civil__edge
valid_civil_p = :_valid_civil?
- skip unless Date.respond_to?(valid_civil_p, true)
(1601..2400).each do |y|
d = if Date.leap?(y) then 29 else 28 end
assert_not_nil(Date.__send__(valid_civil_p, y,2,d))
@@ -337,7 +336,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil__italy
valid_civil_p = :_valid_civil?
- skip unless Date.respond_to?(valid_civil_p, true)
(1..4).each do |d|
assert_not_nil(Date.__send__(valid_civil_p, 1582,10,d,Date::ITALY))
end
@@ -366,7 +364,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_civil__england
valid_civil_p = :_valid_civil?
- skip unless Date.respond_to?(valid_civil_p, true)
(1..2).each do |d|
assert_not_nil(Date.__send__(valid_civil_p, 1752,9,d,Date::ENGLAND))
end
@@ -389,7 +386,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_commercial
valid_commercial_p = :_valid_commercial?
- skip unless Date.respond_to?(valid_commercial_p, true)
assert_nil(Date.__send__(valid_commercial_p, 1999,53,1))
assert_equal(2453367, Date.__send__(valid_commercial_p, 2004,53,1))
assert_nil(Date.__send__(valid_commercial_p, 1999,-53,-1))
@@ -399,7 +395,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_weeknum
valid_weeknum_p = :_valid_weeknum?
- skip unless Date.respond_to?(valid_weeknum_p, true)
assert_nil(Date.__send__(valid_weeknum_p, 1999,53,0, 0))
assert_equal(2454101, Date.__send__(valid_weeknum_p, 2006,53,0, 0))
assert_nil(Date.__send__(valid_weeknum_p, 1999,-53,-1, 0))
@@ -414,7 +409,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_nth_kday
valid_nth_kday_p = :_valid_nth_kday?
- skip unless Date.respond_to?(valid_nth_kday_p, true)
assert_nil(Date.__send__(valid_nth_kday_p, 1992,2, 5,0))
assert_equal(2448682, Date.__send__(valid_nth_kday_p, 1992,2, 5,6))
assert_equal(2448682, Date.__send__(valid_nth_kday_p, 1992,2, 5,-1))
@@ -424,7 +418,6 @@ class TestDateBase < Test::Unit::TestCase
def test_valid_time
valid_time_p = :_valid_time?
- skip unless Date.respond_to?(valid_time_p, true)
assert_equal(Rational(0), DateTime.__send__(valid_time_p, 0,0,0))
assert_nil(DateTime.__send__(valid_time_p, 25,59,59))
assert_nil(DateTime.__send__(valid_time_p, 23,60,59))
diff --git a/test/date/test_date_marshal.rb b/test/date/test_date_marshal.rb
index 4ea5565716..2f86a8c8c2 100644
--- a/test/date/test_date_marshal.rb
+++ b/test/date/test_date_marshal.rb
@@ -24,18 +24,6 @@ class TestDateMarshal < Test::Unit::TestCase
assert_equal(d, d2)
assert_equal(d.start, d2.start)
assert_instance_of(String, d2.to_s)
-
- d = Date.today
- a = d.marshal_dump
- d.freeze
- assert(d.frozen?)
- assert_raise(RuntimeError){d.marshal_load(a)}
-
- d = DateTime.now
- a = d.marshal_dump
- d.freeze
- assert(d.frozen?)
- assert_raise(RuntimeError){d.marshal_load(a)}
end
end
diff --git a/test/date/test_date_new.rb b/test/date/test_date_new.rb
index 0bbbfee44b..14ff247294 100644
--- a/test/date/test_date_new.rb
+++ b/test/date/test_date_new.rb
@@ -68,6 +68,9 @@ class TestDateNew < Test::Unit::TestCase
def test_ordinal__ex
assert_raise(ArgumentError) do
+ Date.ordinal(2001,1.1)
+ end
+ assert_raise(ArgumentError) do
Date.ordinal(2001,366)
end
assert_raise(ArgumentError) do
@@ -127,6 +130,9 @@ class TestDateNew < Test::Unit::TestCase
def test_civil__ex
assert_raise(ArgumentError) do
+ Date.civil(2001,2,1.1)
+ end
+ assert_raise(ArgumentError) do
Date.civil(2001,2,29)
end
assert_raise(ArgumentError) do
@@ -194,6 +200,9 @@ class TestDateNew < Test::Unit::TestCase
def test_commercial__ex
assert_raise(ArgumentError) do
+ Date.commercial(1997,1,1.1)
+ end
+ assert_raise(ArgumentError) do
Date.commercial(1997,53,1)
end
assert_raise(ArgumentError) do
@@ -202,7 +211,6 @@ class TestDateNew < Test::Unit::TestCase
end
def test_weeknum
- skip unless Date.respond_to?(:weeknum, true)
d = Date.__send__(:weeknum)
dt = DateTime.__send__(:weeknum)
assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
@@ -225,7 +233,6 @@ class TestDateNew < Test::Unit::TestCase
end
def test_nth_kday
- skip unless Date.respond_to?(:nth_kday, true)
d = Date.__send__(:nth_kday)
dt = DateTime.__send__(:nth_kday)
assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index 30976067a4..e9e0ae83fc 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -6,470 +6,471 @@ class TestDateParse < Test::Unit::TestCase
def test__parse
[
# ctime(3), asctime(3)
- [['Sat Aug 28 02:55:50 1999',false],[1999,8,28,2,55,50,nil,nil,6], __LINE__],
- [['Sat Aug 28 02:55:50 02',false],[2,8,28,2,55,50,nil,nil,6], __LINE__],
- [['Sat Aug 28 02:55:50 02',true],[2002,8,28,2,55,50,nil,nil,6], __LINE__],
- [['Sat Aug 28 02:55:50 0002',false],[2,8,28,2,55,50,nil,nil,6], __LINE__],
- [['Sat Aug 28 02:55:50 0002',true],[2,8,28,2,55,50,nil,nil,6], __LINE__],
+ [['Sat Aug 28 02:55:50 1999',false],[1999,8,28,2,55,50,nil,nil,6]],
+ [['Sat Aug 28 02:55:50 02',false],[2,8,28,2,55,50,nil,nil,6]],
+ [['Sat Aug 28 02:55:50 02',true],[2002,8,28,2,55,50,nil,nil,6]],
+ [['Sat Aug 28 02:55:50 0002',false],[2,8,28,2,55,50,nil,nil,6]],
+ [['Sat Aug 28 02:55:50 0002',true],[2,8,28,2,55,50,nil,nil,6]],
# date(1)
- [['Sat Aug 28 02:29:34 JST 1999',false],[1999,8,28,2,29,34,'JST',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 MET DST 1999',false],[1999,8,28,2,29,34,'MET DST',2*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 AMT 1999',false],[1999,8,28,2,29,34,'AMT',nil,6], __LINE__],
- [['Sat Aug 28 02:29:34 PMT 1999',false],[1999,8,28,2,29,34,'PMT',nil,6], __LINE__],
- [['Sat Aug 28 02:29:34 PMT -1999',false],[-1999,8,28,2,29,34,'PMT',nil,6], __LINE__],
-
- [['Sat Aug 28 02:29:34 JST 02',false],[2,8,28,2,29,34,'JST',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 JST 02',true],[2002,8,28,2,29,34,'JST',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 JST 0002',false],[2,8,28,2,29,34,'JST',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 JST 0002',true],[2,8,28,2,29,34,'JST',9*3600,6], __LINE__],
-
- [['Sat Aug 28 02:29:34 GMT+09 0002',false],[2,8,28,2,29,34,'GMT+09',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT+0900 0002',false],[2,8,28,2,29,34,'GMT+0900',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT+09:00 0002',false],[2,8,28,2,29,34,'GMT+09:00',9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT-09 0002',false],[2,8,28,2,29,34,'GMT-09',-9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT-0900 0002',false],[2,8,28,2,29,34,'GMT-0900',-9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT-09:00 0002',false],[2,8,28,2,29,34,'GMT-09:00',-9*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT-090102 0002',false],[2,8,28,2,29,34,'GMT-090102',-9*3600-60-2,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT-09:01:02 0002',false],[2,8,28,2,29,34,'GMT-09:01:02',-9*3600-60-2,6], __LINE__],
-
- [['Sat Aug 28 02:29:34 GMT Standard Time 2000',false],[2000,8,28,2,29,34,'GMT Standard Time',0*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 Mountain Standard Time 2000',false],[2000,8,28,2,29,34,'Mountain Standard Time',-7*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 Mountain Daylight Time 2000',false],[2000,8,28,2,29,34,'Mountain Daylight Time',-6*3600,6], __LINE__],
- [['Sat Aug 28 02:29:34 Mexico Standard Time 2000',false],[2000,8,28,2,29,34,'Mexico Standard Time',-6*3600,6], __LINE__],
-# [['Sat Aug 28 02:29:34 Mexico Standard Time 2 2000',false],[2000,8,28,2,29,34,'Mexico Standard Time 2',-7*3600,6], __LINE__], # cp
- [['Sat Aug 28 02:29:34 E. Australia Standard Time 2000',false],[2000,8,28,2,29,34,'E. Australia Standard Time',10*3600,6], __LINE__],
+ [['Sat Aug 28 02:29:34 JST 1999',false],[1999,8,28,2,29,34,'JST',9*3600,6]],
+ [['Sat Aug 28 02:29:34 MET DST 1999',false],[1999,8,28,2,29,34,'MET DST',2*3600,6]],
+ [['Sat Aug 28 02:29:34 AMT 1999',false],[1999,8,28,2,29,34,'AMT',nil,6]],
+ [['Sat Aug 28 02:29:34 PMT 1999',false],[1999,8,28,2,29,34,'PMT',nil,6]],
+ [['Sat Aug 28 02:29:34 PMT -1999',false],[-1999,8,28,2,29,34,'PMT',nil,6]],
+
+ [['Sat Aug 28 02:29:34 JST 02',false],[2,8,28,2,29,34,'JST',9*3600,6]],
+ [['Sat Aug 28 02:29:34 JST 02',true],[2002,8,28,2,29,34,'JST',9*3600,6]],
+ [['Sat Aug 28 02:29:34 JST 0002',false],[2,8,28,2,29,34,'JST',9*3600,6]],
+ [['Sat Aug 28 02:29:34 JST 0002',true],[2,8,28,2,29,34,'JST',9*3600,6]],
+
+ [['Sat Aug 28 02:29:34 GMT+09 0002',false],[2,8,28,2,29,34,'GMT+09',9*3600,6]],
+ [['Sat Aug 28 02:29:34 GMT+0900 0002',false],[2,8,28,2,29,34,'GMT+0900',9*3600,6]],
+ [['Sat Aug 28 02:29:34 GMT+09:00 0002',false],[2,8,28,2,29,34,'GMT+09:00',9*3600,6]],
+ [['Sat Aug 28 02:29:34 GMT-09 0002',false],[2,8,28,2,29,34,'GMT-09',-9*3600,6]],
+ [['Sat Aug 28 02:29:34 GMT-0900 0002',false],[2,8,28,2,29,34,'GMT-0900',-9*3600,6]],
+ [['Sat Aug 28 02:29:34 GMT-09:00 0002',false],[2,8,28,2,29,34,'GMT-09:00',-9*3600,6]],
+ [['Sat Aug 28 02:29:34 GMT-090102 0002',false],[2,8,28,2,29,34,'GMT-090102',-9*3600-60-2,6]],
+ [['Sat Aug 28 02:29:34 GMT-09:01:02 0002',false],[2,8,28,2,29,34,'GMT-09:01:02',-9*3600-60-2,6]],
+
+ [['Sat Aug 28 02:29:34 GMT Standard Time 2000',false],[2000,8,28,2,29,34,'GMT Standard Time',0*3600,6]],
+ [['Sat Aug 28 02:29:34 Mountain Standard Time 2000',false],[2000,8,28,2,29,34,'Mountain Standard Time',-7*3600,6]],
+ [['Sat Aug 28 02:29:34 Mountain Daylight Time 2000',false],[2000,8,28,2,29,34,'Mountain Daylight Time',-6*3600,6]],
+ [['Sat Aug 28 02:29:34 Mexico Standard Time 2000',false],[2000,8,28,2,29,34,'Mexico Standard Time',-6*3600,6]],
+# [['Sat Aug 28 02:29:34 Mexico Standard Time 2 2000',false],[2000,8,28,2,29,34,'Mexico Standard Time 2',-7*3600,6]], # cp
+ [['Sat Aug 28 02:29:34 E. Australia Standard Time 2000',false],[2000,8,28,2,29,34,'E. Australia Standard Time',10*3600,6]],
# part of iso 8601
- [['1999-05-23 23:55:21',false],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['1999-05-23 23:55:21+0900',false],[1999,5,23,23,55,21,'+0900',9*3600,nil], __LINE__],
- [['1999-05-23 23:55:21-0900',false],[1999,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['1999-05-23 23:55:21+09:00',false],[1999,5,23,23,55,21,'+09:00',9*3600,nil], __LINE__],
- [['1999-05-23T23:55:21-09:00',false],[1999,5,23,23,55,21,'-09:00',-9*3600,nil], __LINE__],
- [['1999-05-23 23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__],
- [['1999-05-23T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__],
- [['-1999-05-23T23:55:21Z',false],[-1999,5,23,23,55,21,'Z',0,nil], __LINE__],
- [['-1999-05-23T23:55:21Z',true],[-1999,5,23,23,55,21,'Z',0,nil], __LINE__],
- [['19990523T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__],
-
- [['+011985-04-12',false],[11985,4,12,nil,nil,nil,nil,nil,nil], __LINE__],
- [['+011985-04-12T10:15:30',false],[11985,4,12,10,15,30,nil,nil,nil], __LINE__],
- [['-011985-04-12',false],[-11985,4,12,nil,nil,nil,nil,nil,nil], __LINE__],
- [['-011985-04-12T10:15:30',false],[-11985,4,12,10,15,30,nil,nil,nil], __LINE__],
-
- [['02-04-12',false],[2,4,12,nil,nil,nil,nil,nil,nil], __LINE__],
- [['02-04-12',true],[2002,4,12,nil,nil,nil,nil,nil,nil], __LINE__],
- [['0002-04-12',false],[2,4,12,nil,nil,nil,nil,nil,nil], __LINE__],
- [['0002-04-12',true],[2,4,12,nil,nil,nil,nil,nil,nil], __LINE__],
-
- [['19990523',true],[1999,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['-19990523',true],[-1999,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['990523',true],[1999,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['0523',false],[nil,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['23',false],[nil,nil,23,nil,nil,nil,nil,nil,nil], __LINE__],
-
- [['19990523 235521',true],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['990523 235521',true],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['0523 2355',false],[nil,5,23,23,55,nil,nil,nil,nil], __LINE__],
- [['23 2355',false],[nil,nil,23,23,55,nil,nil,nil,nil], __LINE__],
-
- [['19990523T235521',true],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['990523T235521',true],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['19990523T235521.99',true],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['990523T235521.99',true],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['0523T2355',false],[nil,5,23,23,55,nil,nil,nil,nil], __LINE__],
-
- [['19990523T235521+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil], __LINE__],
- [['990523T235521-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['19990523T235521.99+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil], __LINE__],
- [['990523T235521.99-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['0523T2355Z',false],[nil,5,23,23,55,nil,'Z',0,nil], __LINE__],
-
- [['19990523235521.123456+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil], __LINE__],
- [['19990523235521.123456-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['19990523235521,123456+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil], __LINE__],
- [['19990523235521,123456-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
-
- [['990523235521,123456-0900',false],[99,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['0523235521,123456-0900',false],[nil,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['23235521,123456-0900',false],[nil,nil,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['235521,123456-0900',false],[nil,nil,nil,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['5521,123456-0900',false],[nil,nil,nil,nil,55,21,'-0900',-9*3600,nil], __LINE__],
- [['21,123456-0900',false],[nil,nil,nil,nil,nil,21,'-0900',-9*3600,nil], __LINE__],
-
- [['3235521,123456-0900',false],[nil,nil,3,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['35521,123456-0900',false],[nil,nil,nil,3,55,21,'-0900',-9*3600,nil], __LINE__],
- [['521,123456-0900',false],[nil,nil,nil,nil,5,21,'-0900',-9*3600,nil], __LINE__],
+ [['1999-05-23 23:55:21',false],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['1999-05-23 23:55:21+0900',false],[1999,5,23,23,55,21,'+0900',9*3600,nil]],
+ [['1999-05-23 23:55:21-0900',false],[1999,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['1999-05-23 23:55:21+09:00',false],[1999,5,23,23,55,21,'+09:00',9*3600,nil]],
+ [['1999-05-23T23:55:21-09:00',false],[1999,5,23,23,55,21,'-09:00',-9*3600,nil]],
+ [['1999-05-23 23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil]],
+ [['1999-05-23T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil]],
+ [['-1999-05-23T23:55:21Z',false],[-1999,5,23,23,55,21,'Z',0,nil]],
+ [['-1999-05-23T23:55:21Z',true],[-1999,5,23,23,55,21,'Z',0,nil]],
+ [['19990523T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil]],
+
+ [['+011985-04-12',false],[11985,4,12,nil,nil,nil,nil,nil,nil]],
+ [['+011985-04-12T10:15:30',false],[11985,4,12,10,15,30,nil,nil,nil]],
+ [['-011985-04-12',false],[-11985,4,12,nil,nil,nil,nil,nil,nil]],
+ [['-011985-04-12T10:15:30',false],[-11985,4,12,10,15,30,nil,nil,nil]],
+
+ [['02-04-12',false],[2,4,12,nil,nil,nil,nil,nil,nil]],
+ [['02-04-12',true],[2002,4,12,nil,nil,nil,nil,nil,nil]],
+ [['0002-04-12',false],[2,4,12,nil,nil,nil,nil,nil,nil]],
+ [['0002-04-12',true],[2,4,12,nil,nil,nil,nil,nil,nil]],
+
+ [['19990523',true],[1999,5,23,nil,nil,nil,nil,nil,nil]],
+ [['-19990523',true],[-1999,5,23,nil,nil,nil,nil,nil,nil]],
+ [['990523',true],[1999,5,23,nil,nil,nil,nil,nil,nil]],
+ [['0523',false],[nil,5,23,nil,nil,nil,nil,nil,nil]],
+ [['23',false],[nil,nil,23,nil,nil,nil,nil,nil,nil]],
+
+ [['19990523 235521',true],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['990523 235521',true],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['0523 2355',false],[nil,5,23,23,55,nil,nil,nil,nil]],
+ [['23 2355',false],[nil,nil,23,23,55,nil,nil,nil,nil]],
+
+ [['19990523T235521',true],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['990523T235521',true],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['19990523T235521.99',true],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['990523T235521.99',true],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['0523T2355',false],[nil,5,23,23,55,nil,nil,nil,nil]],
+
+ [['19990523T235521+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil]],
+ [['990523T235521-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['19990523T235521.99+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil]],
+ [['990523T235521.99-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['0523T2355Z',false],[nil,5,23,23,55,nil,'Z',0,nil]],
+
+ [['19990523235521.123456+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil]],
+ [['19990523235521.123456-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['19990523235521,123456+0900',true],[1999,5,23,23,55,21,'+0900',9*3600,nil]],
+ [['19990523235521,123456-0900',true],[1999,5,23,23,55,21,'-0900',-9*3600,nil]],
+
+ [['990523235521,123456-0900',false],[99,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['0523235521,123456-0900',false],[nil,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['23235521,123456-0900',false],[nil,nil,23,23,55,21,'-0900',-9*3600,nil]],
+ [['235521,123456-0900',false],[nil,nil,nil,23,55,21,'-0900',-9*3600,nil]],
+ [['5521,123456-0900',false],[nil,nil,nil,nil,55,21,'-0900',-9*3600,nil]],
+ [['21,123456-0900',false],[nil,nil,nil,nil,nil,21,'-0900',-9*3600,nil]],
+
+ [['3235521,123456-0900',false],[nil,nil,3,23,55,21,'-0900',-9*3600,nil]],
+ [['35521,123456-0900',false],[nil,nil,nil,3,55,21,'-0900',-9*3600,nil]],
+ [['521,123456-0900',false],[nil,nil,nil,nil,5,21,'-0900',-9*3600,nil]],
# reversed iso 8601 (?)
- [['23-05-1999',false],[1999,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['23-05-1999 23:55:21',false],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['23-05--1999 23:55:21',false],[-1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [["23-05-'99",false],[99,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [["23-05-'99",true],[1999,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['23-05-1999',false],[1999,5,23,nil,nil,nil,nil,nil,nil]],
+ [['23-05-1999 23:55:21',false],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['23-05--1999 23:55:21',false],[-1999,5,23,23,55,21,nil,nil,nil]],
+ [["23-05-'99",false],[99,5,23,nil,nil,nil,nil,nil,nil]],
+ [["23-05-'99",true],[1999,5,23,nil,nil,nil,nil,nil,nil]],
# broken iso 8601 (?)
-# [['1999-05-23T235521Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__], # cp
- [['19990523T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__],
- [['19990523235521.1234-100',true],[1999,5,23,23,55,21,'-100',-1*3600,nil], __LINE__],
- [['19990523235521.1234-10',true],[1999,5,23,23,55,21,'-10',-10*3600,nil], __LINE__],
+# [['1999-05-23T235521Z',false],[1999,5,23,23,55,21,'Z',0,nil]], # cp
+ [['19990523T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil]],
+ [['19990523235521.1234-100',true],[1999,5,23,23,55,21,'-100',-1*3600,nil]],
+ [['19990523235521.1234-10',true],[1999,5,23,23,55,21,'-10',-10*3600,nil]],
# part of jis x0301
- [['M11.05.23',false],[1878,5,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['T11.05.23 23:55:21+0900',false],[1922,5,23,23,55,21,'+0900',9*3600,nil], __LINE__],
- [['S11.05.23 23:55:21-0900',false],[1936,5,23,23,55,21,'-0900',-9*3600,nil], __LINE__],
- [['S40.05.23 23:55:21+09:00',false],[1965,5,23,23,55,21,'+09:00',9*3600,nil], __LINE__],
- [['S40.05.23T23:55:21-09:00',false],[1965,5,23,23,55,21,'-09:00',-9*3600,nil], __LINE__],
- [['H11.05.23 23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__],
- [['H11.05.23T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil], __LINE__],
+ [['M11.05.23',false],[1878,5,23,nil,nil,nil,nil,nil,nil]],
+ [['T11.05.23 23:55:21+0900',false],[1922,5,23,23,55,21,'+0900',9*3600,nil]],
+ [['S11.05.23 23:55:21-0900',false],[1936,5,23,23,55,21,'-0900',-9*3600,nil]],
+ [['S40.05.23 23:55:21+09:00',false],[1965,5,23,23,55,21,'+09:00',9*3600,nil]],
+ [['S40.05.23T23:55:21-09:00',false],[1965,5,23,23,55,21,'-09:00',-9*3600,nil]],
+ [['H11.05.23 23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil]],
+ [['H11.05.23T23:55:21Z',false],[1999,5,23,23,55,21,'Z',0,nil]],
# ofx date
- [['19990523235521',false],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['19990523235521.123',false],[1999,5,23,23,55,21,nil,nil,nil], __LINE__],
- [['19990523235521.123[-9]',false],[1999,5,23,23,55,21,'-9',-(9*3600),nil], __LINE__],
- [['19990523235521.123[+9]',false],[1999,5,23,23,55,21,'+9',+(9*3600),nil], __LINE__],
- [['19990523235521.123[9]',false],[1999,5,23,23,55,21,'9',+(9*3600),nil], __LINE__],
- [['19990523235521.123[-9.50]',false],[1999,5,23,23,55,21,'-9.50',-(9*3600+30*60),nil], __LINE__],
- [['19990523235521.123[+9.50]',false],[1999,5,23,23,55,21,'+9.50',+(9*3600+30*60),nil], __LINE__],
- [['19990523235521.123[-5:EST]',false],[1999,5,23,23,55,21,'EST',-5*3600,nil], __LINE__],
- [['19990523235521.123[+9:JST]',false],[1999,5,23,23,55,21,'JST',9*3600,nil], __LINE__],
- [['19990523235521.123[+12:XXX YYY ZZZ]',false],[1999,5,23,23,55,21,'XXX YYY ZZZ',12*3600,nil], __LINE__],
-# [['235521',false],[nil,nil,nil,23,55,21,nil,nil,nil], __LINE__], # cp
- [['235521.123',false],[nil,nil,nil,23,55,21,nil,nil,nil], __LINE__],
- [['235521.123[-9]',false],[nil,nil,nil,23,55,21,'-9',-9*3600,nil], __LINE__],
- [['235521.123[+9]',false],[nil,nil,nil,23,55,21,'+9',+9*3600,nil], __LINE__],
- [['235521.123[-5:EST]',false],[nil,nil,nil,23,55,21,'EST',-5*3600,nil], __LINE__],
- [['235521.123[+9:JST]',false],[nil,nil,nil,23,55,21,'JST',+9*3600,nil], __LINE__],
+ [['19990523235521',false],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['19990523235521.123',false],[1999,5,23,23,55,21,nil,nil,nil]],
+ [['19990523235521.123[-9]',false],[1999,5,23,23,55,21,'-9',-(9*3600),nil]],
+ [['19990523235521.123[+9]',false],[1999,5,23,23,55,21,'+9',+(9*3600),nil]],
+ [['19990523235521.123[9]',false],[1999,5,23,23,55,21,'9',+(9*3600),nil]],
+ [['19990523235521.123[-9.50]',false],[1999,5,23,23,55,21,'-9.50',-(9*3600+30*60),nil]],
+ [['19990523235521.123[+9.50]',false],[1999,5,23,23,55,21,'+9.50',+(9*3600+30*60),nil]],
+ [['19990523235521.123[-5:EST]',false],[1999,5,23,23,55,21,'EST',-5*3600,nil]],
+ [['19990523235521.123[+9:JST]',false],[1999,5,23,23,55,21,'JST',9*3600,nil]],
+ [['19990523235521.123[+12:XXX YYY ZZZ]',false],[1999,5,23,23,55,21,'XXX YYY ZZZ',12*3600,nil]],
+# [['235521',false],[nil,nil,nil,23,55,21,nil,nil,nil]], # cp
+ [['235521.123',false],[nil,nil,nil,23,55,21,nil,nil,nil]],
+ [['235521.123[-9]',false],[nil,nil,nil,23,55,21,'-9',-9*3600,nil]],
+ [['235521.123[+9]',false],[nil,nil,nil,23,55,21,'+9',+9*3600,nil]],
+ [['235521.123[-5:EST]',false],[nil,nil,nil,23,55,21,'EST',-5*3600,nil]],
+ [['235521.123[+9:JST]',false],[nil,nil,nil,23,55,21,'JST',+9*3600,nil]],
# rfc 2822
- [['Sun, 22 Aug 1999 00:45:29 -0400',false],[1999,8,22,0,45,29,'-0400',-4*3600,0], __LINE__],
- [['Sun, 22 Aug 1999 00:45:29 -9959',false],[1999,8,22,0,45,29,'-9959',-(99*3600+59*60),0], __LINE__],
- [['Sun, 22 Aug 1999 00:45:29 +9959',false],[1999,8,22,0,45,29,'+9959',+(99*3600+59*60),0], __LINE__],
- [['Sun, 22 Aug 05 00:45:29 -0400',true],[2005,8,22,0,45,29,'-0400',-4*3600,0], __LINE__],
- [['Sun, 22 Aug 49 00:45:29 -0400',true],[2049,8,22,0,45,29,'-0400',-4*3600,0], __LINE__],
-# [['Sun, 22 Aug 50 00:45:29 -0400',true],[1950,8,22,0,45,29,'-0400',-4*3600,0], __LINE__],
-# [['Sun, 22 Aug 111 00:45:29 -0400',true],[2011,8,22,0,45,29,'-0400',-4*3600,0], __LINE__],
- [['Sun, 22 Aug 1999 00:45:29 GMT',false],[1999,8,22,0,45,29,'GMT',0,0], __LINE__],
- [["Sun,\00022\r\nAug\r\n1999\r\n00:45:29\r\nGMT",false],[1999,8,22,0,45,29,'GMT',0,0], __LINE__],
- [['Sun, 22 Aug 1999 00:45 GMT',false],[1999,8,22,0,45,nil,'GMT',0,0], __LINE__],
- [['Sun, 22 Aug -1999 00:45 GMT',false],[-1999,8,22,0,45,nil,'GMT',0,0], __LINE__],
- [['Sun, 22 Aug 99 00:45:29 UT',true],[1999,8,22,0,45,29,'UT',0,0], __LINE__],
- [['Sun, 22 Aug 0099 00:45:29 UT',true],[99,8,22,0,45,29,'UT',0,0], __LINE__],
+ [['Sun, 22 Aug 1999 00:45:29 -0400',false],[1999,8,22,0,45,29,'-0400',-4*3600,0]],
+ [['Sun, 22 Aug 1999 00:45:29 -9959',false],[1999,8,22,0,45,29,'-9959',-(99*3600+59*60),0]],
+ [['Sun, 22 Aug 1999 00:45:29 +9959',false],[1999,8,22,0,45,29,'+9959',+(99*3600+59*60),0]],
+ [['Sun, 22 Aug 05 00:45:29 -0400',true],[2005,8,22,0,45,29,'-0400',-4*3600,0]],
+ [['Sun, 22 Aug 49 00:45:29 -0400',true],[2049,8,22,0,45,29,'-0400',-4*3600,0]],
+# [['Sun, 22 Aug 50 00:45:29 -0400',true],[1950,8,22,0,45,29,'-0400',-4*3600,0]],
+# [['Sun, 22 Aug 111 00:45:29 -0400',true],[2011,8,22,0,45,29,'-0400',-4*3600,0]],
+ [['Sun, 22 Aug 1999 00:45:29 GMT',false],[1999,8,22,0,45,29,'GMT',0,0]],
+ [["Sun,\00022\r\nAug\r\n1999\r\n00:45:29\r\nGMT",false],[1999,8,22,0,45,29,'GMT',0,0]],
+ [['Sun, 22 Aug 1999 00:45 GMT',false],[1999,8,22,0,45,nil,'GMT',0,0]],
+ [['Sun, 22 Aug -1999 00:45 GMT',false],[-1999,8,22,0,45,nil,'GMT',0,0]],
+ [['Sun, 22 Aug 99 00:45:29 UT',true],[1999,8,22,0,45,29,'UT',0,0]],
+ [['Sun, 22 Aug 0099 00:45:29 UT',true],[99,8,22,0,45,29,'UT',0,0]],
# rfc 850, obsoleted by rfc 1036
- [['Tuesday, 02-Mar-99 11:20:32 GMT',true],[1999,3,2,11,20,32,'GMT',0,2], __LINE__],
+ [['Tuesday, 02-Mar-99 11:20:32 GMT',true],[1999,3,2,11,20,32,'GMT',0,2]],
# W3C Working Draft - XForms - 4.8 Time
- [['2000-01-31 13:20:00-5',false],[2000,1,31,13,20,0,'-5',-5*3600,nil], __LINE__],
+ [['2000-01-31 13:20:00-5',false],[2000,1,31,13,20,0,'-5',-5*3600,nil]],
# [-+]\d+.\d+
- [['2000-01-31 13:20:00-5.5',false],[2000,1,31,13,20,0,'-5.5',-5*3600-30*60,nil], __LINE__],
- [['2000-01-31 13:20:00-5,5',false],[2000,1,31,13,20,0,'-5,5',-5*3600-30*60,nil], __LINE__],
- [['2000-01-31 13:20:00+3.5',false],[2000,1,31,13,20,0,'+3.5',3*3600+30*60,nil], __LINE__],
- [['2000-01-31 13:20:00+3,5',false],[2000,1,31,13,20,0,'+3,5',3*3600+30*60,nil], __LINE__],
+ [['2000-01-31 13:20:00-5.5',false],[2000,1,31,13,20,0,'-5.5',-5*3600-30*60,nil]],
+ [['2000-01-31 13:20:00-5,5',false],[2000,1,31,13,20,0,'-5,5',-5*3600-30*60,nil]],
+ [['2000-01-31 13:20:00+3.5',false],[2000,1,31,13,20,0,'+3.5',3*3600+30*60,nil]],
+ [['2000-01-31 13:20:00+3,5',false],[2000,1,31,13,20,0,'+3,5',3*3600+30*60,nil]],
# mil
- [['2000-01-31 13:20:00 Z',false],[2000,1,31,13,20,0,'Z',0*3600,nil], __LINE__],
- [['2000-01-31 13:20:00 H',false],[2000,1,31,13,20,0,'H',8*3600,nil], __LINE__],
- [['2000-01-31 13:20:00 M',false],[2000,1,31,13,20,0,'M',12*3600,nil], __LINE__],
- [['2000-01-31 13:20 M',false],[2000,1,31,13,20,nil,'M',12*3600,nil], __LINE__],
- [['2000-01-31 13:20:00 S',false],[2000,1,31,13,20,0,'S',-6*3600,nil], __LINE__],
- [['2000-01-31 13:20:00 A',false],[2000,1,31,13,20,0,'A',1*3600,nil], __LINE__],
- [['2000-01-31 13:20:00 P',false],[2000,1,31,13,20,0,'P',-3*3600,nil], __LINE__],
+ [['2000-01-31 13:20:00 Z',false],[2000,1,31,13,20,0,'Z',0*3600,nil]],
+ [['2000-01-31 13:20:00 H',false],[2000,1,31,13,20,0,'H',8*3600,nil]],
+ [['2000-01-31 13:20:00 M',false],[2000,1,31,13,20,0,'M',12*3600,nil]],
+ [['2000-01-31 13:20 M',false],[2000,1,31,13,20,nil,'M',12*3600,nil]],
+ [['2000-01-31 13:20:00 S',false],[2000,1,31,13,20,0,'S',-6*3600,nil]],
+ [['2000-01-31 13:20:00 A',false],[2000,1,31,13,20,0,'A',1*3600,nil]],
+ [['2000-01-31 13:20:00 P',false],[2000,1,31,13,20,0,'P',-3*3600,nil]],
# dot
- [['1999.5.2',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['1999.05.02',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['-1999.05.02',false],[-1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
-# [['05.02',false],[nil,5,2,nil,nil,nil,nil,nil,nil], __LINE__], # not support
-# [[' 5. 2',false],[nil,5,2,nil,nil,nil,nil,nil,nil], __LINE__], # not support
+ [['1999.5.2',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['1999.05.02',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['-1999.05.02',false],[-1999,5,2,nil,nil,nil,nil,nil,nil]],
+# [['05.02',false],[nil,5,2,nil,nil,nil,nil,nil,nil]], # not support
+# [[' 5. 2',false],[nil,5,2,nil,nil,nil,nil,nil,nil]], # not support
- [['0099.5.2',false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['0099.5.2',true],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['0099.5.2',false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [['0099.5.2',true],[99,5,2,nil,nil,nil,nil,nil,nil]],
- [["'99.5.2",false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [["'99.5.2",true],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [["'99.5.2",false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [["'99.5.2",true],[1999,5,2,nil,nil,nil,nil,nil,nil]],
# reversed dot
- [['2.5.1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['02.05.1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['02.05.-1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['2.5.1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['02.05.1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['02.05.-1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil]],
- [['2.5.0099',false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2.5.0099',true],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['2.5.0099',false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [['2.5.0099',true],[99,5,2,nil,nil,nil,nil,nil,nil]],
- [["2.5.'99",false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [["2.5.'99",true],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [["2.5.'99",false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [["2.5.'99",true],[1999,5,2,nil,nil,nil,nil,nil,nil]],
# vms
- [['08-DEC-1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31-JAN-1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31-JAN--1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['08-DEC-1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['31-JAN-1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['31-JAN--1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
- [['08-DEC-88',false],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['08-DEC-88',true],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['08-DEC-0088',false],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['08-DEC-0088',true],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['08-DEC-88',false],[88,12,8,nil,nil,nil,nil,nil,nil]],
+ [['08-DEC-88',true],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['08-DEC-0088',false],[88,12,8,nil,nil,nil,nil,nil,nil]],
+ [['08-DEC-0088',true],[88,12,8,nil,nil,nil,nil,nil,nil]],
# swaped vms
- [['DEC-08-1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['JAN-31-1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['JAN-31--1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['JAN-1999',false],[1999,1,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['JAN--1999',false],[-1999,1,nil,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['DEC-08-1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['JAN-31-1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['JAN-31--1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['JAN-1999',false],[1999,1,nil,nil,nil,nil,nil,nil,nil]],
+ [['JAN--1999',false],[-1999,1,nil,nil,nil,nil,nil,nil,nil]],
# reversed vms
- [['1988-DEC-08',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['1999-JAN-31',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['-1999-JAN-31',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['1988-DEC-08',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['1999-JAN-31',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['-1999-JAN-31',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
- [['0088-DEC-08',false],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['0088-DEC-08',true],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['0088-DEC-08',false],[88,12,8,nil,nil,nil,nil,nil,nil]],
+ [['0088-DEC-08',true],[88,12,8,nil,nil,nil,nil,nil,nil]],
- [["'88/12/8",false],[88,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [["'88/12/8",true],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
+ [["'88/12/8",false],[88,12,8,nil,nil,nil,nil,nil,nil]],
+ [["'88/12/8",true],[1988,12,8,nil,nil,nil,nil,nil,nil]],
# non-spaced eu
- [['08/dec/1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31/jan/1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31/jan/-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['08.dec.1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31.jan.1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31.jan.-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['08/dec/1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['31/jan/1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['31/jan/-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['08.dec.1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['31.jan.1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['31.jan.-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
# non-spaced us
- [['dec/08/1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan/31/1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan/31/-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan/31',false],[nil,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan/1988',false],[1988,1,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['dec.08.1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan.31.1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan.31.-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan.31',false],[nil,1,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['jan.1988',false],[1988,1,nil,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['dec/08/1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['jan/31/1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['jan/31/-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['jan/31',false],[nil,1,31,nil,nil,nil,nil,nil,nil]],
+ [['jan/1988',false],[1988,1,nil,nil,nil,nil,nil,nil,nil]],
+ [['dec.08.1988',false],[1988,12,8,nil,nil,nil,nil,nil,nil]],
+ [['jan.31.1999',false],[1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['jan.31.-1999',false],[-1999,1,31,nil,nil,nil,nil,nil,nil]],
+ [['jan.31',false],[nil,1,31,nil,nil,nil,nil,nil,nil]],
+ [['jan.1988',false],[1988,1,nil,nil,nil,nil,nil,nil,nil]],
# month and day of month
- [['Jan 1',false],[nil,1,1,nil,nil,nil,nil,nil,nil], __LINE__],
- [['Jul 11',false],[nil,7,11,nil,nil,nil,nil,nil,nil], __LINE__],
- [['July 11',false],[nil,7,11,nil,nil,nil,nil,nil,nil], __LINE__],
- [['Sept 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['Sep. 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['Sept. 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['September 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['October 1st',false],[nil,10,1,nil,nil,nil,nil,nil,nil], __LINE__],
- [['October 23rd',false],[nil,10,23,nil,nil,nil,nil,nil,nil], __LINE__],
- [['October 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil], __LINE__],
- [['October 25th -1999',false],[-1999,10,25,nil,nil,nil,nil,nil,nil], __LINE__],
- [['october 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil], __LINE__],
- [['OCTOBER 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil], __LINE__],
- [['oCtoBer 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil], __LINE__],
- [['aSep 23',false],[nil,nil,23,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['Jan 1',false],[nil,1,1,nil,nil,nil,nil,nil,nil]],
+ [['Jul 11',false],[nil,7,11,nil,nil,nil,nil,nil,nil]],
+ [['July 11',false],[nil,7,11,nil,nil,nil,nil,nil,nil]],
+ [['Sept 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil]],
+ [['Sep. 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil]],
+ [['Sept. 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil]],
+ [['September 23',false],[nil,9,23,nil,nil,nil,nil,nil,nil]],
+ [['October 1st',false],[nil,10,1,nil,nil,nil,nil,nil,nil]],
+ [['October 23rd',false],[nil,10,23,nil,nil,nil,nil,nil,nil]],
+ [['October 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil]],
+ [['October 25th -1999',false],[-1999,10,25,nil,nil,nil,nil,nil,nil]],
+ [['october 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil]],
+ [['OCTOBER 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil]],
+ [['oCtoBer 25th 1999',false],[1999,10,25,nil,nil,nil,nil,nil,nil]],
+ [['aSep 23',false],[nil,nil,23,nil,nil,nil,nil,nil,nil]],
# month and year
- [['Sept 1990',false],[1990,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["Sept '90",false],[90,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["Sept '90",true],[1990,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['1990/09',false],[1990,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['09/1990',false],[1990,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["aSep '90",false],[90,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['Sept 1990',false],[1990,9,nil,nil,nil,nil,nil,nil,nil]],
+ [["Sept '90",false],[90,9,nil,nil,nil,nil,nil,nil,nil]],
+ [["Sept '90",true],[1990,9,nil,nil,nil,nil,nil,nil,nil]],
+ [['1990/09',false],[1990,9,nil,nil,nil,nil,nil,nil,nil]],
+ [['09/1990',false],[1990,9,nil,nil,nil,nil,nil,nil,nil]],
+ [["aSep '90",false],[90,nil,nil,nil,nil,nil,nil,nil,nil]],
# year
- [["'90",false],[90,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["'90",true],[1990,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
+ [["'90",false],[90,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["'90",true],[1990,nil,nil,nil,nil,nil,nil,nil,nil]],
# month
- [['Jun',false],[nil,6,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['June',false],[nil,6,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['Sep',false],[nil,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['Sept',false],[nil,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['September',false],[nil,9,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['aSep',false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['Jun',false],[nil,6,nil,nil,nil,nil,nil,nil,nil]],
+ [['June',false],[nil,6,nil,nil,nil,nil,nil,nil,nil]],
+ [['Sep',false],[nil,9,nil,nil,nil,nil,nil,nil,nil]],
+ [['Sept',false],[nil,9,nil,nil,nil,nil,nil,nil,nil]],
+ [['September',false],[nil,9,nil,nil,nil,nil,nil,nil,nil]],
+ [['aSep',false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
# day of month
- [['1st',false],[nil,nil,1,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2nd',false],[nil,nil,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['3rd',false],[nil,nil,3,nil,nil,nil,nil,nil,nil], __LINE__],
- [['4th',false],[nil,nil,4,nil,nil,nil,nil,nil,nil], __LINE__],
- [['29th',false],[nil,nil,29,nil,nil,nil,nil,nil,nil], __LINE__],
- [['31st',false],[nil,nil,31,nil,nil,nil,nil,nil,nil], __LINE__],
- [['1sta',false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['1st',false],[nil,nil,1,nil,nil,nil,nil,nil,nil]],
+ [['2nd',false],[nil,nil,2,nil,nil,nil,nil,nil,nil]],
+ [['3rd',false],[nil,nil,3,nil,nil,nil,nil,nil,nil]],
+ [['4th',false],[nil,nil,4,nil,nil,nil,nil,nil,nil]],
+ [['29th',false],[nil,nil,29,nil,nil,nil,nil,nil,nil]],
+ [['31st',false],[nil,nil,31,nil,nil,nil,nil,nil,nil]],
+ [['1sta',false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
# era
- [['Sat Aug 28 02:29:34 GMT CE 2000',false],[2000,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT C.E. 2000',false],[2000,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT BCE 2000',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT B.C.E. 2000',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT AD 2000',false],[2000,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT A.D. 2000',false],[2000,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT BC 2000',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT B.C. 2000',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT 2000 BC',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT 2000 BCE',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT 2000 B.C.',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
- [['Sat Aug 28 02:29:34 GMT 2000 B.C.E.',false],[-1999,8,28,2,29,34,'GMT',0,6], __LINE__],
+ [['Sat Aug 28 02:29:34 GMT CE 2000',false],[2000,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT C.E. 2000',false],[2000,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT BCE 2000',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT B.C.E. 2000',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT AD 2000',false],[2000,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT A.D. 2000',false],[2000,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT BC 2000',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT B.C. 2000',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT 2000 BC',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT 2000 BCE',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT 2000 B.C.',false],[-1999,8,28,2,29,34,'GMT',0,6]],
+ [['Sat Aug 28 02:29:34 GMT 2000 B.C.E.',false],[-1999,8,28,2,29,34,'GMT',0,6]],
# collection
-# [['le ler juillet 1982',false],[1982,7,1,nil,nil,nil,nil,nil,nil], __LINE__], # bih 1982
-# [['30 June 1982 , 23h 59m 59s',false],[1982,6,30,23,59,59,nil,nil,nil], __LINE__], # bih 1982
- [['Tuesday, May 18, 1999 Published at 13:36 GMT 14:36 UK',false],[1999,5,18,13,36,nil,'GMT',0,2], __LINE__], # bbc.co.uk
- [['July 20, 2000 Web posted at: 3:37 p.m. EDT (1937 GMT)',false],[2000,7,20,15,37,nil,'EDT',-4*3600,nil], __LINE__], # cnn.com
- [['12:54 p.m. EDT, September 11, 2006',false],[2006,9,11,12,54,nil,'EDT',-4*3600,nil], __LINE__], # cnn.com
- [['February 04, 2001 at 10:59 AM PST',false],[2001,2,4,10,59,nil,'PST',-8*3600,nil], __LINE__], # old amazon.com
- [['Monday May 08, @01:55PM',false],[nil,5,8,13,55,nil,nil,nil,1], __LINE__], # slashdot.org
- [['06.June 2005',false],[2005,6,6,nil,nil,nil,nil,nil,nil], __LINE__], # dhl.com
+# [['le ler juillet 1982',false],[1982,7,1,nil,nil,nil,nil,nil,nil]], # bih 1982
+# [['30 June 1982 , 23h 59m 59s',false],[1982,6,30,23,59,59,nil,nil,nil]], # bih 1982
+ [['Tuesday, May 18, 1999 Published at 13:36 GMT 14:36 UK',false],[1999,5,18,13,36,nil,'GMT',0,2]], # bbc.co.uk
+ [['July 20, 2000 Web posted at: 3:37 p.m. EDT (1937 GMT)',false],[2000,7,20,15,37,nil,'EDT',-4*3600,nil]], # cnn.com
+ [['12:54 p.m. EDT, September 11, 2006',false],[2006,9,11,12,54,nil,'EDT',-4*3600,nil]], # cnn.com
+ [['February 04, 2001 at 10:59 AM PST',false],[2001,2,4,10,59,nil,'PST',-8*3600,nil]], # old amazon.com
+ [['Monday May 08, @01:55PM',false],[nil,5,8,13,55,nil,nil,nil,1]], # slashdot.org
+ [['06.June 2005',false],[2005,6,6,nil,nil,nil,nil,nil,nil]], # dhl.com
# etc.
- [['8:00 pm lt',false],[nil,nil,nil,20,0,nil,'lt',nil,nil], __LINE__],
- [['4:00 AM, Jan. 12, 1990',false],[1990,1,12,4,0,nil,nil,nil,nil], __LINE__],
- [['Jan. 12 4:00 AM 1990',false],[1990,1,12,4,0,nil,nil,nil,nil], __LINE__],
-# [['Jan. 12 4:00 -1990',false],[-1990,1,12,4,0,nil,nil,nil,nil], __LINE__], # cp
- [['1990-01-12 04:00:00+00',false],[1990,1,12,4,0,0,'+00',0,nil], __LINE__],
- [['1990-01-11 20:00:00-08',false],[1990,1,11,20,0,0,'-08',-8*3600,nil], __LINE__],
- [['1990/01/12 04:00:00',false],[1990,1,12,4,0,0,nil,nil,nil], __LINE__],
-# [['Thu Jan 11 20:00:00 1990 LT',false], [1990,1,11,20,0,0,'LT',nil,4], __LINE__], # cp
- [['Thu Jan 11 20:00:00 PST 1990',false],[1990,1,11,20,0,0,'PST',-8*3600,4], __LINE__],
- [['Fri Jan 12 04:00:00 GMT 1990',false],[1990,1,12,4,0,0,'GMT',0,5], __LINE__],
- [['Thu, 11 Jan 1990 20:00:00 -0800',false],[1990,1,11,20,0,0,'-0800',-8*3600,4], __LINE__],
- [['12-January-1990, 04:00 WET',false],[1990,1,12,4,0,nil,'WET',0*3600,nil], __LINE__],
- [['jan 2 3 am +4 5',false],[5,1,2,3,nil,nil,'+4',4*3600,nil], __LINE__],
- [['jan 2 3 am +4 5',true],[2005,1,2,3,nil,nil,'+4',4*3600,nil], __LINE__],
- [['fri1feb3bc4pm+5',false],[-2,2,1,16,nil,nil,'+5',5*3600,5], __LINE__],
- [['fri1feb3bc4pm+5',true],[-2,2,1,16,nil,nil,'+5',5*3600,5], __LINE__],
- [['03 feb 1st',false],[03,2,1,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['8:00 pm lt',false],[nil,nil,nil,20,0,nil,'lt',nil,nil]],
+ [['4:00 AM, Jan. 12, 1990',false],[1990,1,12,4,0,nil,nil,nil,nil]],
+ [['Jan. 12 4:00 AM 1990',false],[1990,1,12,4,0,nil,nil,nil,nil]],
+# [['Jan. 12 4:00 -1990',false],[-1990,1,12,4,0,nil,nil,nil,nil]], # cp
+ [['1990-01-12 04:00:00+00',false],[1990,1,12,4,0,0,'+00',0,nil]],
+ [['1990-01-11 20:00:00-08',false],[1990,1,11,20,0,0,'-08',-8*3600,nil]],
+ [['1990/01/12 04:00:00',false],[1990,1,12,4,0,0,nil,nil,nil]],
+# [['Thu Jan 11 20:00:00 1990 LT',false], [1990,1,11,20,0,0,'LT',nil,4]], # cp
+ [['Thu Jan 11 20:00:00 PST 1990',false],[1990,1,11,20,0,0,'PST',-8*3600,4]],
+ [['Fri Jan 12 04:00:00 GMT 1990',false],[1990,1,12,4,0,0,'GMT',0,5]],
+ [['Thu, 11 Jan 1990 20:00:00 -0800',false],[1990,1,11,20,0,0,'-0800',-8*3600,4]],
+ [['12-January-1990, 04:00 WET',false],[1990,1,12,4,0,nil,'WET',0*3600,nil]],
+ [['jan 2 3 am +4 5',false],[5,1,2,3,nil,nil,'+4',4*3600,nil]],
+ [['jan 2 3 am +4 5',true],[2005,1,2,3,nil,nil,'+4',4*3600,nil]],
+ [['fri1feb3bc4pm+5',false],[-2,2,1,16,nil,nil,'+5',5*3600,5]],
+ [['fri1feb3bc4pm+5',true],[-2,2,1,16,nil,nil,'+5',5*3600,5]],
+ [['03 feb 1st',false],[03,2,1,nil,nil,nil,nil,nil,nil]],
# apostrophe
- [["July 4, '79",true],[1979,7,4,nil,nil,nil,nil,nil,nil], __LINE__],
- [["4th July '79",true],[1979,7,4,nil,nil,nil,nil,nil,nil], __LINE__],
+ [["July 4, '79",true],[1979,7,4,nil,nil,nil,nil,nil,nil]],
+ [["4th July '79",true],[1979,7,4,nil,nil,nil,nil,nil,nil]],
# day of week
- [['Sunday',false],[nil,nil,nil,nil,nil,nil,nil,nil,0], __LINE__],
- [['Mon',false],[nil,nil,nil,nil,nil,nil,nil,nil,1], __LINE__],
- [['Tue',false],[nil,nil,nil,nil,nil,nil,nil,nil,2], __LINE__],
- [['Wed',false],[nil,nil,nil,nil,nil,nil,nil,nil,3], __LINE__],
- [['Thurs',false],[nil,nil,nil,nil,nil,nil,nil,nil,4], __LINE__],
- [['Friday',false],[nil,nil,nil,nil,nil,nil,nil,nil,5], __LINE__],
- [['Sat.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6], __LINE__],
- [['sat.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6], __LINE__],
- [['SAT.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6], __LINE__],
- [['sAt.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6], __LINE__],
-# [['su',false],[nil,nil,nil,nil,nil,nil,nil,nil,0], __LINE__],
-# [['mo',false],[nil,nil,nil,nil,nil,nil,nil,nil,1], __LINE__],
+ [['Sunday',false],[nil,nil,nil,nil,nil,nil,nil,nil,0]],
+ [['Mon',false],[nil,nil,nil,nil,nil,nil,nil,nil,1]],
+ [['Tue',false],[nil,nil,nil,nil,nil,nil,nil,nil,2]],
+ [['Wed',false],[nil,nil,nil,nil,nil,nil,nil,nil,3]],
+ [['Thurs',false],[nil,nil,nil,nil,nil,nil,nil,nil,4]],
+ [['Friday',false],[nil,nil,nil,nil,nil,nil,nil,nil,5]],
+ [['Sat.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6]],
+ [['sat.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6]],
+ [['SAT.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6]],
+ [['sAt.',false],[nil,nil,nil,nil,nil,nil,nil,nil,6]],
+# [['su',false],[nil,nil,nil,nil,nil,nil,nil,nil,0]],
+# [['mo',false],[nil,nil,nil,nil,nil,nil,nil,nil,1]],
# time
- [['09:55',false],[nil,nil,nil,9,55,nil,nil,nil,nil], __LINE__],
- [['09:55:30',false],[nil,nil,nil,9,55,30,nil,nil,nil], __LINE__],
- [['09:55:30am',false],[nil,nil,nil,9,55,30,nil,nil,nil], __LINE__],
- [['09:55:30pm',false],[nil,nil,nil,21,55,30,nil,nil,nil], __LINE__],
- [['09:55:30a.m.',false],[nil,nil,nil,9,55,30,nil,nil,nil], __LINE__],
- [['09:55:30p.m.',false],[nil,nil,nil,21,55,30,nil,nil,nil], __LINE__],
- [['09:55:30pm GMT',false],[nil,nil,nil,21,55,30,'GMT',0,nil], __LINE__],
- [['09:55:30p.m. GMT',false],[nil,nil,nil,21,55,30,'GMT',0,nil], __LINE__],
- [['09:55+0900',false],[nil,nil,nil,9,55,nil,'+0900',9*3600,nil], __LINE__],
- [['09 AM',false],[nil,nil,nil,9,nil,nil,nil,nil,nil], __LINE__],
- [['09am',false],[nil,nil,nil,9,nil,nil,nil,nil,nil], __LINE__],
- [['09 A.M.',false],[nil,nil,nil,9,nil,nil,nil,nil,nil], __LINE__],
- [['09 PM',false],[nil,nil,nil,21,nil,nil,nil,nil,nil], __LINE__],
- [['09pm',false],[nil,nil,nil,21,nil,nil,nil,nil,nil], __LINE__],
- [['09 P.M.',false],[nil,nil,nil,21,nil,nil,nil,nil,nil], __LINE__],
-
- [['9h22m23s',false],[nil,nil,nil,9,22,23,nil,nil,nil], __LINE__],
- [['9h 22m 23s',false],[nil,nil,nil,9,22,23,nil,nil,nil], __LINE__],
- [['9h22m',false],[nil,nil,nil,9,22,nil,nil,nil,nil], __LINE__],
- [['9h 22m',false],[nil,nil,nil,9,22,nil,nil,nil,nil], __LINE__],
- [['9h',false],[nil,nil,nil,9,nil,nil,nil,nil,nil], __LINE__],
- [['9h 22m 23s am',false],[nil,nil,nil,9,22,23,nil,nil,nil], __LINE__],
- [['9h 22m 23s pm',false],[nil,nil,nil,21,22,23,nil,nil,nil], __LINE__],
- [['9h 22m am',false],[nil,nil,nil,9,22,nil,nil,nil,nil], __LINE__],
- [['9h 22m pm',false],[nil,nil,nil,21,22,nil,nil,nil,nil], __LINE__],
- [['9h am',false],[nil,nil,nil,9,nil,nil,nil,nil,nil], __LINE__],
- [['9h pm',false],[nil,nil,nil,21,nil,nil,nil,nil,nil], __LINE__],
-
- [['00:00',false],[nil,nil,nil,0,0,nil,nil,nil,nil], __LINE__],
- [['01:00',false],[nil,nil,nil,1,0,nil,nil,nil,nil], __LINE__],
- [['11:00',false],[nil,nil,nil,11,0,nil,nil,nil,nil], __LINE__],
- [['12:00',false],[nil,nil,nil,12,0,nil,nil,nil,nil], __LINE__],
- [['13:00',false],[nil,nil,nil,13,0,nil,nil,nil,nil], __LINE__],
- [['23:00',false],[nil,nil,nil,23,0,nil,nil,nil,nil], __LINE__],
- [['24:00',false],[nil,nil,nil,24,0,nil,nil,nil,nil], __LINE__],
-
- [['00:00 AM',false],[nil,nil,nil,0,0,nil,nil,nil,nil], __LINE__],
- [['12:00 AM',false],[nil,nil,nil,0,0,nil,nil,nil,nil], __LINE__],
- [['01:00 AM',false],[nil,nil,nil,1,0,nil,nil,nil,nil], __LINE__],
- [['11:00 AM',false],[nil,nil,nil,11,0,nil,nil,nil,nil], __LINE__],
- [['00:00 PM',false],[nil,nil,nil,12,0,nil,nil,nil,nil], __LINE__],
- [['12:00 PM',false],[nil,nil,nil,12,0,nil,nil,nil,nil], __LINE__],
- [['01:00 PM',false],[nil,nil,nil,13,0,nil,nil,nil,nil], __LINE__],
- [['11:00 PM',false],[nil,nil,nil,23,0,nil,nil,nil,nil], __LINE__],
+ [['09:55',false],[nil,nil,nil,9,55,nil,nil,nil,nil]],
+ [['09:55:30',false],[nil,nil,nil,9,55,30,nil,nil,nil]],
+ [['09:55:30am',false],[nil,nil,nil,9,55,30,nil,nil,nil]],
+ [['09:55:30pm',false],[nil,nil,nil,21,55,30,nil,nil,nil]],
+ [['09:55:30a.m.',false],[nil,nil,nil,9,55,30,nil,nil,nil]],
+ [['09:55:30p.m.',false],[nil,nil,nil,21,55,30,nil,nil,nil]],
+ [['09:55:30pm GMT',false],[nil,nil,nil,21,55,30,'GMT',0,nil]],
+ [['09:55:30p.m. GMT',false],[nil,nil,nil,21,55,30,'GMT',0,nil]],
+ [['09:55+0900',false],[nil,nil,nil,9,55,nil,'+0900',9*3600,nil]],
+ [['09 AM',false],[nil,nil,nil,9,nil,nil,nil,nil,nil]],
+ [['09am',false],[nil,nil,nil,9,nil,nil,nil,nil,nil]],
+ [['09 A.M.',false],[nil,nil,nil,9,nil,nil,nil,nil,nil]],
+ [['09 PM',false],[nil,nil,nil,21,nil,nil,nil,nil,nil]],
+ [['09pm',false],[nil,nil,nil,21,nil,nil,nil,nil,nil]],
+ [['09 P.M.',false],[nil,nil,nil,21,nil,nil,nil,nil,nil]],
+
+ [['9h22m23s',false],[nil,nil,nil,9,22,23,nil,nil,nil]],
+ [['9h 22m 23s',false],[nil,nil,nil,9,22,23,nil,nil,nil]],
+ [['9h22m',false],[nil,nil,nil,9,22,nil,nil,nil,nil]],
+ [['9h 22m',false],[nil,nil,nil,9,22,nil,nil,nil,nil]],
+ [['9h',false],[nil,nil,nil,9,nil,nil,nil,nil,nil]],
+ [['9h 22m 23s am',false],[nil,nil,nil,9,22,23,nil,nil,nil]],
+ [['9h 22m 23s pm',false],[nil,nil,nil,21,22,23,nil,nil,nil]],
+ [['9h 22m am',false],[nil,nil,nil,9,22,nil,nil,nil,nil]],
+ [['9h 22m pm',false],[nil,nil,nil,21,22,nil,nil,nil,nil]],
+ [['9h am',false],[nil,nil,nil,9,nil,nil,nil,nil,nil]],
+ [['9h pm',false],[nil,nil,nil,21,nil,nil,nil,nil,nil]],
+
+ [['00:00',false],[nil,nil,nil,0,0,nil,nil,nil,nil]],
+ [['01:00',false],[nil,nil,nil,1,0,nil,nil,nil,nil]],
+ [['11:00',false],[nil,nil,nil,11,0,nil,nil,nil,nil]],
+ [['12:00',false],[nil,nil,nil,12,0,nil,nil,nil,nil]],
+ [['13:00',false],[nil,nil,nil,13,0,nil,nil,nil,nil]],
+ [['23:00',false],[nil,nil,nil,23,0,nil,nil,nil,nil]],
+ [['24:00',false],[nil,nil,nil,24,0,nil,nil,nil,nil]],
+
+ [['00:00 AM',false],[nil,nil,nil,0,0,nil,nil,nil,nil]],
+ [['12:00 AM',false],[nil,nil,nil,0,0,nil,nil,nil,nil]],
+ [['01:00 AM',false],[nil,nil,nil,1,0,nil,nil,nil,nil]],
+ [['11:00 AM',false],[nil,nil,nil,11,0,nil,nil,nil,nil]],
+ [['00:00 PM',false],[nil,nil,nil,12,0,nil,nil,nil,nil]],
+ [['12:00 PM',false],[nil,nil,nil,12,0,nil,nil,nil,nil]],
+ [['01:00 PM',false],[nil,nil,nil,13,0,nil,nil,nil,nil]],
+ [['11:00 PM',false],[nil,nil,nil,23,0,nil,nil,nil,nil]],
# pick up the rest
- [['2000-01-02 1',false],[2000,1,2,1,nil,nil,nil,nil,nil], __LINE__],
- [['2000-01-02 23',false],[2000,1,2,23,nil,nil,nil,nil,nil], __LINE__],
- [['2000-01-02 24',false],[2000,1,2,24,nil,nil,nil,nil,nil], __LINE__],
- [['1 03:04:05',false],[nil,nil,1,3,4,5,nil,nil,nil], __LINE__],
- [['02 03:04:05',false],[nil,nil,2,3,4,5,nil,nil,nil], __LINE__],
- [['31 03:04:05',false],[nil,nil,31,3,4,5,nil,nil,nil], __LINE__],
+ [['2000-01-02 1',false],[2000,1,2,1,nil,nil,nil,nil,nil]],
+ [['2000-01-02 23',false],[2000,1,2,23,nil,nil,nil,nil,nil]],
+ [['2000-01-02 24',false],[2000,1,2,24,nil,nil,nil,nil,nil]],
+ [['1 03:04:05',false],[nil,nil,1,3,4,5,nil,nil,nil]],
+ [['02 03:04:05',false],[nil,nil,2,3,4,5,nil,nil,nil]],
+ [['31 03:04:05',false],[nil,nil,31,3,4,5,nil,nil,nil]],
# null, space
- [['',false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\s",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\s" * 10, true],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\t",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\n",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\v",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\f",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\r",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["\t\n\v\f\r\s",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [["1999-05-23\t\n\v\f\r\s21:34:56",false],[1999,5,23,21,34,56,nil,nil,nil], __LINE__],
- ].each do |x,y,l|
+ [['',false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\s",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\s" * 10, true],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\t",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\n",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\v",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\f",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\r",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["\t\n\v\f\r\s",false],[nil,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [["1999-05-23\t\n\v\f\r\s21:34:56",false],[1999,5,23,21,34,56,nil,nil,nil]],
+ [["1999-05-23\n\n\n\n\n\n21:34:56",false],[1999,5,23,21,34,56,nil,nil,nil]],
+ ].each do |x,y|
h = Date._parse(*x)
a = h.values_at(:year,:mon,:mday,:hour,:min,:sec,:zone,:offset,:wday)
if y[1] == -1
a[1] = -1
a[2] = h[:yday]
end
- assert_equal(y, a, format('<failed at line %d>', l))
+ assert_equal(y, a, [x, y, a].inspect)
end
end
def test__parse_slash_exp
[
# little
- [['2/5/1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['02/05/1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['02/05/-1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['05/02',false],[nil,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [[' 5/ 2',false],[nil,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['2/5/1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['02/05/1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['02/05/-1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['05/02',false],[nil,5,2,nil,nil,nil,nil,nil,nil]],
+ [[' 5/ 2',false],[nil,5,2,nil,nil,nil,nil,nil,nil]],
- [["2/5/'99",true],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2/5/0099',false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2/5/0099',true],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [["2/5/'99",true],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['2/5/0099',false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [['2/5/0099',true],[99,5,2,nil,nil,nil,nil,nil,nil]],
- [['2/5 1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2/5-1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2/5--1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['2/5 1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['2/5-1999',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['2/5--1999',false],[-1999,5,2,nil,nil,nil,nil,nil,nil]],
# big
- [['99/5/2',false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['99/5/2',true],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['99/5/2',false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [['99/5/2',true],[1999,5,2,nil,nil,nil,nil,nil,nil]],
- [['1999/5/2',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['1999/05/02',false],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['-1999/05/02',false],[-1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['1999/5/2',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['1999/05/02',false],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ [['-1999/05/02',false],[-1999,5,2,nil,nil,nil,nil,nil,nil]],
- [['0099/5/2',false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [['0099/5/2',true],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
+ [['0099/5/2',false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [['0099/5/2',true],[99,5,2,nil,nil,nil,nil,nil,nil]],
- [["'99/5/2",false],[99,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- [["'99/5/2",true],[1999,5,2,nil,nil,nil,nil,nil,nil], __LINE__],
- ].each do |x,y,l|
+ [["'99/5/2",false],[99,5,2,nil,nil,nil,nil,nil,nil]],
+ [["'99/5/2",true],[1999,5,2,nil,nil,nil,nil,nil,nil]],
+ ].each do |x,y|
h = Date._parse(*x)
a = h.values_at(:year,:mon,:mday,:hour,:min,:sec,:zone,:offset,:wday)
if y[1] == -1
a[1] = -1
a[2] = h[:yday]
end
- assert_equal(y, a, format('<failed at line %d>', l))
+ assert_equal(y, a, [x, y, a].inspect)
end
end
@@ -540,9 +541,6 @@ class TestDateParse < Test::Unit::TestCase
assert_equal([2006, 333], h.values_at(:year, :yday))
h = Date._parse('333')
assert_equal([nil, 333], h.values_at(:year, :yday))
-
- h = Date._parse('')
- assert_equal({}, h)
end
def test_parse
@@ -578,15 +576,6 @@ class TestDateParse < Test::Unit::TestCase
assert_equal(d2, d1)
end
- def test__parse_odd_offset
- h = DateTime._parse('2001-02-03T04:05:06+1')
- assert_equal(3600, h[:offset])
- h = DateTime._parse('2001-02-03T04:05:06+123')
- assert_equal(4980, h[:offset])
- h = DateTime._parse('2001-02-03T04:05:06+12345')
- assert_equal(5025, h[:offset])
- end
-
require 'time'
def test_parse__time
@@ -667,37 +656,25 @@ class TestDateParse < Test::Unit::TestCase
Date.parse('')
end
assert_raise(ArgumentError) do
- DateTime.parse('')
- end
- assert_raise(ArgumentError) do
Date.parse('2001-02-29')
end
assert_raise(ArgumentError) do
DateTime.parse('2001-02-29T23:59:60')
end
- assert_nothing_raised(ArgumentError) do
- DateTime.parse('2001-03-01T23:59:60')
- end
- assert_raise(ArgumentError) do
- DateTime.parse('2001-03-01T23:59:61')
- end
assert_raise(ArgumentError) do
Date.parse('23:55')
end
end
def test__iso8601
- h = Date._iso8601('01-02-03T04:05:06Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('2001-02-03T04:05:06Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
+ h = Date._iso8601('01-02-03')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('--02-03T04:05:06Z')
- assert_equal([nil, 2, 3, 4, 5, 6, 0],
+ h = Date._iso8601('2001-02-03')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('---03T04:05:06Z')
- assert_equal([nil, nil, 3, 4, 5, 6, 0],
+ h = Date._iso8601('--02-03')
+ assert_equal([nil, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
h = Date._iso8601('2001-02-03T04:05')
@@ -716,17 +693,14 @@ class TestDateParse < Test::Unit::TestCase
assert_equal([2001, 2, 3, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('010203T040506Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('20010203T040506Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
+ h = Date._iso8601('010203')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('--0203T040506Z')
- assert_equal([nil, 2, 3, 4, 5, 6, 0],
+ h = Date._iso8601('20010203')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('---03T040506Z')
- assert_equal([nil, nil, 3, 4, 5, 6, 0],
+ h = Date._iso8601('--0203')
+ assert_equal([nil, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
h = Date._iso8601('010203T0405')
@@ -764,51 +738,15 @@ class TestDateParse < Test::Unit::TestCase
assert_equal([2001, 2, 3, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('01-023T04:05:06Z')
- assert_equal([2001, 23, 4, 5, 6, 0],
- h.values_at(:year, :yday, :hour, :min, :sec, :offset))
- h = Date._iso8601('2001-023T04:05:06Z')
- assert_equal([2001, 23, 4, 5, 6, 0],
+ h = Date._iso8601('01-023')
+ assert_equal([2001, 23, nil, nil, nil, nil],
h.values_at(:year, :yday, :hour, :min, :sec, :offset))
- h = Date._iso8601('-023T04:05:06Z')
- assert_equal([nil, 23, 4, 5, 6, 0],
- h.values_at(:year, :yday, :hour, :min, :sec, :offset))
-
- h = Date._iso8601('01023T040506Z')
- assert_equal([2001, 23, 4, 5, 6, 0],
+ h = Date._iso8601('2001-023')
+ assert_equal([2001, 23, nil, nil, nil, nil],
h.values_at(:year, :yday, :hour, :min, :sec, :offset))
- h = Date._iso8601('2001023T040506Z')
- assert_equal([2001, 23, 4, 5, 6, 0],
+ h = Date._iso8601('-023')
+ assert_equal([nil, 23, nil, nil, nil, nil],
h.values_at(:year, :yday, :hour, :min, :sec, :offset))
- h = Date._iso8601('-023T040506Z')
- assert_equal([nil, 23, 4, 5, 6, 0],
- h.values_at(:year, :yday, :hour, :min, :sec, :offset))
-
- h = Date._iso8601('01-w02-3T04:05:06Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
- h = Date._iso8601('2001-w02-3T04:05:06Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
- h = Date._iso8601('-w02-3T04:05:06Z')
- assert_equal([nil, 2, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
- h = Date._iso8601('-w-3T04:05:06Z')
- assert_equal([nil, nil, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
-
- h = Date._iso8601('01w023T040506Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
- h = Date._iso8601('2001w023T040506Z')
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
- h = Date._iso8601('-w023T040506Z')
- assert_equal([nil, 2, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
- h = Date._iso8601('-w-3T040506Z')
- assert_equal([nil, nil, 3, 4, 5, 6, 0],
- h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
h = Date._iso8601('04:05')
assert_equal([nil, nil, nil, 4, 5, nil, nil],
@@ -833,8 +771,21 @@ class TestDateParse < Test::Unit::TestCase
assert_equal([nil, nil, nil, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
- h = Date._iso8601('')
- assert_equal({}, h)
+ h = Date._iso8601('01-w02-3')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
+ h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
+ h = Date._iso8601('2001-w02-3')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
+ h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
+ h = Date._iso8601('2001w023')
+ assert_equal([2001, 2, 3, nil, nil, nil, nil],
+ h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
+ h = Date._iso8601('-w02-3')
+ assert_equal([nil, 2, 3, nil, nil, nil, nil],
+ h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
+ h = Date._iso8601('-w-3')
+ assert_equal([nil, nil, 3, nil, nil, nil, nil],
+ h.values_at(:cwyear, :cweek, :cwday, :hour, :min, :sec, :offset))
end
def test__rfc3339
@@ -847,9 +798,6 @@ class TestDateParse < Test::Unit::TestCase
h = Date._rfc3339('2001-02-03T04:05:06.07+01:00')
assert_equal([2001, 2, 3, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
-
- h = Date._rfc3339('')
- assert_equal({}, h)
end
def test__xmlschema
@@ -929,9 +877,6 @@ class TestDateParse < Test::Unit::TestCase
h = Date._xmlschema('-92001-02-03T04:05:06.07+01:00')
assert_equal([-92001, 2, 3, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
-
- h = Date._xmlschema('')
- assert_equal({}, h)
end
def test__rfc2822
@@ -961,9 +906,6 @@ class TestDateParse < Test::Unit::TestCase
h1 = Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT')
h2 = Date._rfc822('Sat, 3 Feb 2001 04:05:06 UT')
assert_equal(h1, h2)
-
- h = Date._rfc2822('')
- assert_equal({}, h)
end
def test__httpdate
@@ -981,9 +923,6 @@ class TestDateParse < Test::Unit::TestCase
h = Date._httpdate('Sat Feb 03 04:05:06 2001')
assert_equal([2001, 2, 3, 4, 5, 6, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
-
- h = Date._httpdate('')
- assert_equal({}, h)
end
def test__jisx0301
@@ -1009,48 +948,21 @@ class TestDateParse < Test::Unit::TestCase
h = Date._jisx0301('H13.02.03T04:05:06.07+0100')
assert_equal([2001, 2, 3, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
-
- h = Date._jisx0301('')
- assert_equal({}, h)
end
def test_iso8601
assert_instance_of(Date, Date.iso8601)
assert_instance_of(DateTime, DateTime.iso8601)
-
- d = Date.iso8601('2001-02-03', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
-
- d = DateTime.iso8601('2001-02-03T04:05:06+07:00', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
end
def test_rfc3339
assert_instance_of(Date, Date.rfc3339)
assert_instance_of(DateTime, DateTime.rfc3339)
-
- d = Date.rfc3339('2001-02-03T04:05:06+07:00', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
-
- d = DateTime.rfc3339('2001-02-03T04:05:06+07:00', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
end
def test_xmlschema
assert_instance_of(Date, Date.xmlschema)
assert_instance_of(DateTime, DateTime.xmlschema)
-
- d = Date.xmlschema('2001-02-03', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
-
- d = DateTime.xmlschema('2001-02-03T04:05:06+07:00', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
end
def test_rfc2822
@@ -1058,80 +970,16 @@ class TestDateParse < Test::Unit::TestCase
assert_instance_of(DateTime, DateTime.rfc2822)
assert_instance_of(Date, Date.rfc822)
assert_instance_of(DateTime, DateTime.rfc822)
-
- d = Date.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
- d = Date.rfc2822('3 Feb 2001 04:05:06 +0700', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
-
- d = DateTime.rfc2822('Sat, 3 Feb 2001 04:05:06 +0700', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
- d = DateTime.rfc2822('3 Feb 2001 04:05:06 +0700', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
end
def test_httpdate
assert_instance_of(Date, Date.httpdate)
assert_instance_of(DateTime, DateTime.httpdate)
-
- d = Date.httpdate('Sat, 03 Feb 2001 04:05:06 GMT', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
-
- d = DateTime.httpdate('Sat, 03 Feb 2001 04:05:06 GMT', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+00:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
end
def test_jisx0301
assert_instance_of(Date, Date.jisx0301)
assert_instance_of(DateTime, DateTime.jisx0301)
-
- d = Date.jisx0301('H13.02.03', Date::ITALY + 10)
- assert_equal(Date.new(2001,2,3), d)
- assert_equal(Date::ITALY + 10, d.start)
-
- d = DateTime.jisx0301('H13.02.03T04:05:06+07:00', Date::ITALY + 10)
- assert_equal(DateTime.new(2001,2,3,4,5,6,'+07:00'), d)
- assert_equal(Date::ITALY + 10, d.start)
- end
-
- def test_given_string
- s = '2001-02-03T04:05:06Z'
- s0 = s.dup
-
- assert_not_equal({}, Date._parse(s))
- assert_equal(s0, s)
-
- assert_not_equal({}, Date._iso8601(s))
- assert_equal(s0, s)
-
- assert_not_equal({}, Date._rfc3339(s))
- assert_equal(s0, s)
-
- assert_not_equal({}, Date._xmlschema(s))
- assert_equal(s0, s)
-
- s = 'Sat, 3 Feb 2001 04:05:06 UT'
- s0 = s.dup
- assert_not_equal({}, Date._rfc2822(s))
- assert_equal(s0, s)
- assert_not_equal({}, Date._rfc822(s))
- assert_equal(s0, s)
-
- s = 'Sat, 03 Feb 2001 04:05:06 GMT'
- s0 = s.dup
- assert_not_equal({}, Date._httpdate(s))
- assert_equal(s0, s)
-
- s = 'H13.02.03T04:05:06,07Z'
- s0 = s.dup
- assert_not_equal({}, Date._jisx0301(s))
- assert_equal(s0, s)
end
end
diff --git a/test/date/test_date_strftime.rb b/test/date/test_date_strftime.rb
index 0ed9215e1e..117517256c 100644
--- a/test/date/test_date_strftime.rb
+++ b/test/date/test_date_strftime.rb
@@ -79,7 +79,7 @@ class TestDateStrftime < Test::Unit::TestCase
assert_equal(f2, d.strftime(f2), [f2, s].inspect)
end
case f[-1,1]
- when 'd', 'e', 'H', 'k', 'I', 'l', 'm', 'M', 'S', 'u', 'U', 'V', 'w', 'W', 'y'
+ when 'd', 'e', 'H', 'I', 'm', 'M', 'S', 'u', 'U', 'V', 'w', 'W', 'y'
f2 = f.sub(/\A%/, '%O')
assert_equal(s[0], d.strftime(f2), [f2, s].inspect)
else
@@ -124,7 +124,9 @@ class TestDateStrftime < Test::Unit::TestCase
def test_strftime__3_2
s = Time.now.strftime('%G')
- skip if s.empty? || s == '%G'
+ if s.empty? || s == '%G'
+ return
+ end
(Date.new(1970,1,1)..Date.new(2037,12,31)).each do |d|
t = Time.utc(d.year,d.mon,d.mday)
assert_equal(t.strftime('%G'), d.strftime('%G'))
@@ -184,25 +186,12 @@ class TestDateStrftime < Test::Unit::TestCase
s = '2006-08-08T23:15:33'
(-24..24).collect{|x| '%+.2d' % x}.each do |hh|
%w(00 30).each do |mm|
- r = hh + mm
- if r[-4,4] == '2430'
- r = '+0000'
- end
d = DateTime.parse(s + hh + mm)
- assert_equal(r, d.strftime('%z'))
+ assert_equal(hh + mm, d.strftime('%z'))
end
end
end
- def test_strftime_milli
- s = '1970-01-01T00:00:00.123456789'
- d = DateTime.parse(s)
- assert_equal('123', d.strftime('%Q'))
- s = '1970-01-02T02:03:04.123456789'
- d = DateTime.parse(s)
- assert_equal('93784123', d.strftime('%Q'))
- end
-
def test_strftime__minus
d = DateTime.new(1969, 12, 31, 23, 59, 59)
assert_equal('-1', d.strftime('%s'))
@@ -336,21 +325,6 @@ class TestDateStrftime < Test::Unit::TestCase
assert_equal('+09:08:07', d.strftime('%:::z'))
end
- def test_strftime__gnuext_complex
- d = DateTime.parse('2001-02-03T04:05:06+09:00')
- assert_equal('Sat Feb 3 04:05:06 2001', d.strftime('%-100c'))
- assert_equal('Sat Feb 3 04:05:06 2001'.rjust(100), d.strftime('%100c'))
- assert_equal('Sat Feb 3 04:05:06 2001'.rjust(100), d.strftime('%_100c'))
- assert_equal('Sat Feb 3 04:05:06 2001'.rjust(100, '0'), d.strftime('%0100c'))
- assert_equal('SAT FEB 3 04:05:06 2001', d.strftime('%^c'))
-
- assert_equal('Sat Feb 3 04:05:06 +09:00 2001', d.strftime('%-100+'))
- assert_equal('Sat Feb 3 04:05:06 +09:00 2001'.rjust(100), d.strftime('%100+'))
- assert_equal('Sat Feb 3 04:05:06 +09:00 2001'.rjust(100), d.strftime('%_100+'))
- assert_equal('Sat Feb 3 04:05:06 +09:00 2001'.rjust(100, '0'), d.strftime('%0100+'))
- assert_equal('SAT FEB 3 04:05:06 +09:00 2001', d.strftime('%^+'))
- end
-
def test__different_format
d = Date.new(2001,2,3)
@@ -358,8 +332,8 @@ class TestDateStrftime < Test::Unit::TestCase
assert_equal(d.ctime, d.asctime)
assert_equal('2001-02-03', d.iso8601)
+ assert_equal(d.rfc3339, d.iso8601)
assert_equal(d.xmlschema, d.iso8601)
- assert_equal('2001-02-03T00:00:00+00:00', d.rfc3339)
assert_equal('Sat, 3 Feb 2001 00:00:00 +0000', d.rfc2822)
assert_equal(d.rfc822, d.rfc2822)
assert_equal('Sat, 03 Feb 2001 00:00:00 GMT', d.httpdate)
@@ -382,17 +356,9 @@ class TestDateStrftime < Test::Unit::TestCase
assert_equal('2001-02-03T04:05:06.123+00:00', d2.iso8601(3))
assert_equal('2001-02-03T04:05:06.123+00:00', d2.rfc3339(3))
assert_equal('H13.02.03T04:05:06.123+00:00', d2.jisx0301(3))
- assert_equal('2001-02-03T04:05:06.123+00:00', d2.iso8601(3.5))
- assert_equal('2001-02-03T04:05:06.123+00:00', d2.rfc3339(3.5))
- assert_equal('H13.02.03T04:05:06.123+00:00', d2.jisx0301(3.5))
assert_equal('2001-02-03T04:05:06.123456000+00:00', d2.iso8601(9))
assert_equal('2001-02-03T04:05:06.123456000+00:00', d2.rfc3339(9))
assert_equal('H13.02.03T04:05:06.123456000+00:00', d2.jisx0301(9))
- assert_equal('2001-02-03T04:05:06.123456000+00:00', d2.iso8601(9.9))
- assert_equal('2001-02-03T04:05:06.123456000+00:00', d2.rfc3339(9.9))
- assert_equal('H13.02.03T04:05:06.123456000+00:00', d2.jisx0301(9.9))
-
- assert_equal('1800-01-01T00:00:00+00:00', DateTime.new(1800).jisx0301)
assert_equal('1868-01-25', Date.parse('1868-01-25').jisx0301)
assert_equal('1872-12-31', Date.parse('1872-12-31').jisx0301)
diff --git a/test/date/test_date_strptime.rb b/test/date/test_date_strptime.rb
index f8483f9e4c..d9904939e9 100644
--- a/test/date/test_date_strptime.rb
+++ b/test/date/test_date_strptime.rb
@@ -119,63 +119,63 @@ class TestDateStrptime < Test::Unit::TestCase
def test__strptime__3
[
# iso8601
- [['2001-02-03', '%Y-%m-%d'], [2001,2,3,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2001-02-03T23:59:60', '%Y-%m-%dT%H:%M:%S'], [2001,2,3,23,59,60,nil,nil,nil], __LINE__],
- [['2001-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [2001,2,3,23,59,60,'+09:00',9*3600,nil], __LINE__],
- [['-2001-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [-2001,2,3,23,59,60,'+09:00',9*3600,nil], __LINE__],
- [['+012345-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [12345,2,3,23,59,60,'+09:00',9*3600,nil], __LINE__],
- [['-012345-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [-12345,2,3,23,59,60,'+09:00',9*3600,nil], __LINE__],
+ [['2001-02-03', '%Y-%m-%d'], [2001,2,3,nil,nil,nil,nil,nil,nil]],
+ [['2001-02-03T23:59:60', '%Y-%m-%dT%H:%M:%S'], [2001,2,3,23,59,60,nil,nil,nil]],
+ [['2001-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [2001,2,3,23,59,60,'+09:00',9*3600,nil]],
+ [['-2001-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [-2001,2,3,23,59,60,'+09:00',9*3600,nil]],
+ [['+012345-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [12345,2,3,23,59,60,'+09:00',9*3600,nil]],
+ [['-012345-02-03T23:59:60+09:00', '%Y-%m-%dT%H:%M:%S%Z'], [-12345,2,3,23,59,60,'+09:00',9*3600,nil]],
# ctime(3), asctime(3)
- [['Thu Jul 29 14:47:19 1999', '%c'], [1999,7,29,14,47,19,nil,nil,4], __LINE__],
- [['Thu Jul 29 14:47:19 -1999', '%c'], [-1999,7,29,14,47,19,nil,nil,4], __LINE__],
+ [['Thu Jul 29 14:47:19 1999', '%c'], [1999,7,29,14,47,19,nil,nil,4]],
+ [['Thu Jul 29 14:47:19 -1999', '%c'], [-1999,7,29,14,47,19,nil,nil,4]],
# date(1)
- [['Thu Jul 29 16:39:41 EST 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'EST',-5*3600,4], __LINE__],
- [['Thu Jul 29 16:39:41 MET DST 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'MET DST',2*3600,4], __LINE__],
- [['Thu Jul 29 16:39:41 AMT 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'AMT',nil,4], __LINE__],
- [['Thu Jul 29 16:39:41 AMT -1999', '%a %b %d %H:%M:%S %Z %Y'], [-1999,7,29,16,39,41,'AMT',nil,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT+09 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT+09',9*3600,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT+0908 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT+0908',9*3600+8*60,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT+090807 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT+090807',9*3600+8*60+7,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT-09 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-09',-9*3600,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT-09:08 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-09:08',-9*3600-8*60,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT-09:08:07 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-09:08:07',-9*3600-8*60-7,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT-3.5 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-3.5',-3*3600-30*60,4], __LINE__],
- [['Thu Jul 29 16:39:41 GMT-3,5 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-3,5',-3*3600-30*60,4], __LINE__],
- [['Thu Jul 29 16:39:41 Mountain Daylight Time 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'Mountain Daylight Time',-6*3600,4], __LINE__],
- [['Thu Jul 29 16:39:41 E. Australia Standard Time 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'E. Australia Standard Time',10*3600,4], __LINE__],
+ [['Thu Jul 29 16:39:41 EST 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'EST',-5*3600,4]],
+ [['Thu Jul 29 16:39:41 MET DST 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'MET DST',2*3600,4]],
+ [['Thu Jul 29 16:39:41 AMT 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'AMT',nil,4]],
+ [['Thu Jul 29 16:39:41 AMT -1999', '%a %b %d %H:%M:%S %Z %Y'], [-1999,7,29,16,39,41,'AMT',nil,4]],
+ [['Thu Jul 29 16:39:41 GMT+09 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT+09',9*3600,4]],
+ [['Thu Jul 29 16:39:41 GMT+0908 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT+0908',9*3600+8*60,4]],
+ [['Thu Jul 29 16:39:41 GMT+090807 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT+090807',9*3600+8*60+7,4]],
+ [['Thu Jul 29 16:39:41 GMT-09 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-09',-9*3600,4]],
+ [['Thu Jul 29 16:39:41 GMT-09:08 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-09:08',-9*3600-8*60,4]],
+ [['Thu Jul 29 16:39:41 GMT-09:08:07 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-09:08:07',-9*3600-8*60-7,4]],
+ [['Thu Jul 29 16:39:41 GMT-3.5 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-3.5',-3*3600-30*60,4]],
+ [['Thu Jul 29 16:39:41 GMT-3,5 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'GMT-3,5',-3*3600-30*60,4]],
+ [['Thu Jul 29 16:39:41 Mountain Daylight Time 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'Mountain Daylight Time',-6*3600,4]],
+ [['Thu Jul 29 16:39:41 E. Australia Standard Time 1999', '%a %b %d %H:%M:%S %Z %Y'], [1999,7,29,16,39,41,'E. Australia Standard Time',10*3600,4]],
# rfc822
- [['Thu, 29 Jul 1999 09:54:21 UT', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'UT',0,4], __LINE__],
- [['Thu, 29 Jul 1999 09:54:21 GMT', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'GMT',0,4], __LINE__],
- [['Thu, 29 Jul 1999 09:54:21 PDT', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'PDT',-7*3600,4], __LINE__],
- [['Thu, 29 Jul 1999 09:54:21 z', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'z',0,4], __LINE__],
- [['Thu, 29 Jul 1999 09:54:21 +0900', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'+0900',9*3600,4], __LINE__],
- [['Thu, 29 Jul 1999 09:54:21 +0430', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'+0430',4*3600+30*60,4], __LINE__],
- [['Thu, 29 Jul 1999 09:54:21 -0430', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'-0430',-4*3600-30*60,4], __LINE__],
- [['Thu, 29 Jul -1999 09:54:21 -0430', '%a, %d %b %Y %H:%M:%S %Z'], [-1999,7,29,9,54,21,'-0430',-4*3600-30*60,4], __LINE__],
+ [['Thu, 29 Jul 1999 09:54:21 UT', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'UT',0,4]],
+ [['Thu, 29 Jul 1999 09:54:21 GMT', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'GMT',0,4]],
+ [['Thu, 29 Jul 1999 09:54:21 PDT', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'PDT',-7*3600,4]],
+ [['Thu, 29 Jul 1999 09:54:21 z', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'z',0,4]],
+ [['Thu, 29 Jul 1999 09:54:21 +0900', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'+0900',9*3600,4]],
+ [['Thu, 29 Jul 1999 09:54:21 +0430', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'+0430',4*3600+30*60,4]],
+ [['Thu, 29 Jul 1999 09:54:21 -0430', '%a, %d %b %Y %H:%M:%S %Z'], [1999,7,29,9,54,21,'-0430',-4*3600-30*60,4]],
+ [['Thu, 29 Jul -1999 09:54:21 -0430', '%a, %d %b %Y %H:%M:%S %Z'], [-1999,7,29,9,54,21,'-0430',-4*3600-30*60,4]],
# etc
- [['06-DEC-99', '%d-%b-%y'], [1999,12,6,nil,nil,nil,nil,nil,nil], __LINE__],
- [['sUnDay oCtoBer 31 01', '%A %B %d %y'], [2001,10,31,nil,nil,nil,nil,nil,0], __LINE__],
- [["October\t\n\v\f\r 15,\t\n\v\f\r99", '%B %d, %y'], [1999,10,15,nil,nil,nil,nil,nil,nil], __LINE__],
- [["October\t\n\v\f\r 15,\t\n\v\f\r99", '%B%t%d,%n%y'], [1999,10,15,nil,nil,nil,nil,nil,nil], __LINE__],
-
- [['09:02:11 AM', '%I:%M:%S %p'], [nil,nil,nil,9,2,11,nil,nil,nil], __LINE__],
- [['09:02:11 A.M.', '%I:%M:%S %p'], [nil,nil,nil,9,2,11,nil,nil,nil], __LINE__],
- [['09:02:11 PM', '%I:%M:%S %p'], [nil,nil,nil,21,2,11,nil,nil,nil], __LINE__],
- [['09:02:11 P.M.', '%I:%M:%S %p'], [nil,nil,nil,21,2,11,nil,nil,nil], __LINE__],
-
- [['12:33:44 AM', '%r'], [nil,nil,nil,0,33,44,nil,nil,nil], __LINE__],
- [['01:33:44 AM', '%r'], [nil,nil,nil,1,33,44,nil,nil,nil], __LINE__],
- [['11:33:44 AM', '%r'], [nil,nil,nil,11,33,44,nil,nil,nil], __LINE__],
- [['12:33:44 PM', '%r'], [nil,nil,nil,12,33,44,nil,nil,nil], __LINE__],
- [['01:33:44 PM', '%r'], [nil,nil,nil,13,33,44,nil,nil,nil], __LINE__],
- [['11:33:44 PM', '%r'], [nil,nil,nil,23,33,44,nil,nil,nil], __LINE__],
-
- [['11:33:44 PM AMT', '%I:%M:%S %p %Z'], [nil,nil,nil,23,33,44,'AMT',nil,nil], __LINE__],
- [['11:33:44 P.M. AMT', '%I:%M:%S %p %Z'], [nil,nil,nil,23,33,44,'AMT',nil,nil], __LINE__],
+ [['06-DEC-99', '%d-%b-%y'], [1999,12,6,nil,nil,nil,nil,nil,nil]],
+ [['sUnDay oCtoBer 31 01', '%A %B %d %y'], [2001,10,31,nil,nil,nil,nil,nil,0]],
+ [["October\t\n\v\f\r 15,\t\n\v\f\r99", '%B %d, %y'], [1999,10,15,nil,nil,nil,nil,nil,nil]],
+ [["October\t\n\v\f\r 15,\t\n\v\f\r99", '%B%t%d,%n%y'], [1999,10,15,nil,nil,nil,nil,nil,nil]],
+
+ [['09:02:11 AM', '%I:%M:%S %p'], [nil,nil,nil,9,2,11,nil,nil,nil]],
+ [['09:02:11 A.M.', '%I:%M:%S %p'], [nil,nil,nil,9,2,11,nil,nil,nil]],
+ [['09:02:11 PM', '%I:%M:%S %p'], [nil,nil,nil,21,2,11,nil,nil,nil]],
+ [['09:02:11 P.M.', '%I:%M:%S %p'], [nil,nil,nil,21,2,11,nil,nil,nil]],
+
+ [['12:33:44 AM', '%r'], [nil,nil,nil,0,33,44,nil,nil,nil]],
+ [['01:33:44 AM', '%r'], [nil,nil,nil,1,33,44,nil,nil,nil]],
+ [['11:33:44 AM', '%r'], [nil,nil,nil,11,33,44,nil,nil,nil]],
+ [['12:33:44 PM', '%r'], [nil,nil,nil,12,33,44,nil,nil,nil]],
+ [['01:33:44 PM', '%r'], [nil,nil,nil,13,33,44,nil,nil,nil]],
+ [['11:33:44 PM', '%r'], [nil,nil,nil,23,33,44,nil,nil,nil]],
+
+ [['11:33:44 PM AMT', '%I:%M:%S %p %Z'], [nil,nil,nil,23,33,44,'AMT',nil,nil]],
+ [['11:33:44 P.M. AMT', '%I:%M:%S %p %Z'], [nil,nil,nil,23,33,44,'AMT',nil,nil]],
[['fri1feb034pm+5', '%a%d%b%y%H%p%Z'], [2003,2,1,16,nil,nil,'+5',5*3600,5]]
].each do |x, y|
@@ -191,45 +191,45 @@ class TestDateStrptime < Test::Unit::TestCase
def test__strptime__width
[
- [['99', '%y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['01', '%y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['19 99', '%C %y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['20 01', '%C %y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['1999', '%C%y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2001', '%C%y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
-
- [['20060806', '%Y'], [20060806,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['20060806', "%Y\s"], [20060806,nil,nil,nil,nil,nil,nil,nil,nil], __LINE__],
- [['20060806', '%Y%m%d'], [2006,8,6,nil,nil,nil,nil,nil,nil], __LINE__],
- [['2006908906', '%Y9%m9%d'], [2006,8,6,nil,nil,nil,nil,nil,nil], __LINE__],
- [['12006 08 06', '%Y %m %d'], [12006,8,6,nil,nil,nil,nil,nil,nil], __LINE__],
- [['12006-08-06', '%Y-%m-%d'], [12006,8,6,nil,nil,nil,nil,nil,nil], __LINE__],
- [['200608 6', '%Y%m%e'], [2006,8,6,nil,nil,nil,nil,nil,nil], __LINE__],
-
- [['2006333', '%Y%j'], [2006,-1,333,nil,nil,nil,nil,nil,nil], __LINE__],
- [['20069333', '%Y9%j'], [2006,-1,333,nil,nil,nil,nil,nil,nil], __LINE__],
- [['12006 333', '%Y %j'], [12006,-1,333,nil,nil,nil,nil,nil,nil], __LINE__],
- [['12006-333', '%Y-%j'], [12006,-1,333,nil,nil,nil,nil,nil,nil], __LINE__],
-
- [['232425', '%H%M%S'], [nil,nil,nil,23,24,25,nil,nil,nil], __LINE__],
- [['23924925', '%H9%M9%S'], [nil,nil,nil,23,24,25,nil,nil,nil], __LINE__],
- [['23 24 25', '%H %M %S'], [nil,nil,nil,23,24,25,nil,nil,nil], __LINE__],
- [['23:24:25', '%H:%M:%S'], [nil,nil,nil,23,24,25,nil,nil,nil], __LINE__],
- [[' 32425', '%k%M%S'], [nil,nil,nil,3,24,25,nil,nil,nil], __LINE__],
- [[' 32425', '%l%M%S'], [nil,nil,nil,3,24,25,nil,nil,nil], __LINE__],
-
- [['FriAug', '%a%b'], [nil,8,nil,nil,nil,nil,nil,nil,5], __LINE__],
- [['FriAug', '%A%B'], [nil,8,nil,nil,nil,nil,nil,nil,5], __LINE__],
- [['FridayAugust', '%A%B'], [nil,8,nil,nil,nil,nil,nil,nil,5], __LINE__],
- [['FridayAugust', '%a%b'], [nil,8,nil,nil,nil,nil,nil,nil,5], __LINE__],
- ].each do |x,y,l|
+ [['99', '%y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['01', '%y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['19 99', '%C %y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['20 01', '%C %y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['1999', '%C%y'], [1999,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['2001', '%C%y'], [2001,nil,nil,nil,nil,nil,nil,nil,nil]],
+
+ [['20060806', '%Y'], [20060806,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['20060806', "%Y\s"], [20060806,nil,nil,nil,nil,nil,nil,nil,nil]],
+ [['20060806', '%Y%m%d'], [2006,8,6,nil,nil,nil,nil,nil,nil]],
+ [['2006908906', '%Y9%m9%d'], [2006,8,6,nil,nil,nil,nil,nil,nil]],
+ [['12006 08 06', '%Y %m %d'], [12006,8,6,nil,nil,nil,nil,nil,nil]],
+ [['12006-08-06', '%Y-%m-%d'], [12006,8,6,nil,nil,nil,nil,nil,nil]],
+ [['200608 6', '%Y%m%e'], [2006,8,6,nil,nil,nil,nil,nil,nil]],
+
+ [['2006333', '%Y%j'], [2006,-1,333,nil,nil,nil,nil,nil,nil]],
+ [['20069333', '%Y9%j'], [2006,-1,333,nil,nil,nil,nil,nil,nil]],
+ [['12006 333', '%Y %j'], [12006,-1,333,nil,nil,nil,nil,nil,nil]],
+ [['12006-333', '%Y-%j'], [12006,-1,333,nil,nil,nil,nil,nil,nil]],
+
+ [['232425', '%H%M%S'], [nil,nil,nil,23,24,25,nil,nil,nil]],
+ [['23924925', '%H9%M9%S'], [nil,nil,nil,23,24,25,nil,nil,nil]],
+ [['23 24 25', '%H %M %S'], [nil,nil,nil,23,24,25,nil,nil,nil]],
+ [['23:24:25', '%H:%M:%S'], [nil,nil,nil,23,24,25,nil,nil,nil]],
+ [[' 32425', '%k%M%S'], [nil,nil,nil,3,24,25,nil,nil,nil]],
+ [[' 32425', '%l%M%S'], [nil,nil,nil,3,24,25,nil,nil,nil]],
+
+ [['FriAug', '%a%b'], [nil,8,nil,nil,nil,nil,nil,nil,5]],
+ [['FriAug', '%A%B'], [nil,8,nil,nil,nil,nil,nil,nil,5]],
+ [['FridayAugust', '%A%B'], [nil,8,nil,nil,nil,nil,nil,nil,5]],
+ [['FridayAugust', '%a%b'], [nil,8,nil,nil,nil,nil,nil,nil,5]]
+ ].each do |x, y|
h = Date._strptime(*x)
- a = (h || {}).values_at(:year,:mon,:mday,:hour,:min,:sec,:zone,:offset,:wday)
+ a = h.values_at(:year,:mon,:mday,:hour,:min,:sec,:zone,:offset,:wday)
if y[1] == -1
a[1] = -1
a[2] = h[:yday]
end
- assert_equal(y, a, format('<failed at line %d>', l))
+ assert_equal(y, a, [x, y, a].inspect)
end
end
@@ -456,37 +456,14 @@ class TestDateStrptime < Test::Unit::TestCase
def test_strptime__ex
assert_raise(ArgumentError) do
- Date.strptime('')
- end
- assert_raise(ArgumentError) do
- DateTime.strptime('')
- end
- assert_raise(ArgumentError) do
Date.strptime('2001-02-29', '%F')
end
assert_raise(ArgumentError) do
DateTime.strptime('2001-02-29T23:59:60', '%FT%T')
end
- assert_nothing_raised(ArgumentError) do
- DateTime.strptime('2001-03-01T23:59:60', '%FT%T')
- end
- assert_raise(ArgumentError) do
- DateTime.strptime('2001-03-01T23:59:61', '%FT%T')
- end
assert_raise(ArgumentError) do
Date.strptime('23:55', '%H:%M')
end
- assert_raise(ArgumentError) do
- Date.strptime('01-31-2011', '%m/%d/%Y')
- end
- end
-
- def test_given_string
- s = '2001-02-03T04:05:06Z'
- s0 = s.dup
-
- assert_not_equal({}, Date._strptime(s, '%FT%T%Z'))
- assert_equal(s0, s)
end
end
diff --git a/test/date/test_switch_hitter.rb b/test/date/test_switch_hitter.rb
deleted file mode 100644
index 08e23015dc..0000000000
--- a/test/date/test_switch_hitter.rb
+++ /dev/null
@@ -1,664 +0,0 @@
-require 'test/unit'
-require 'date'
-
-class TestSH < Test::Unit::TestCase
-
- def test_new
- [Date.new,
- Date.civil,
- DateTime.new,
- DateTime.civil
- ].each do |d|
- assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
- end
-
- [Date.new(2001),
- Date.civil(2001),
- DateTime.new(2001),
- DateTime.civil(2001)
- ].each do |d|
- assert_equal([2001, 1, 1], [d.year, d.mon, d.mday])
- end
-
- d = Date.new(2001, 2, 3)
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = Date.new(2001, 2, Rational('3.5'))
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = Date.new(2001,2, 3, Date::JULIAN)
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = Date.new(2001,2, 3, Date::GREGORIAN)
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
-
- d = Date.new(2001,-12, -31)
- assert_equal([2001, 1, 1], [d.year, d.mon, d.mday])
- d = Date.new(2001,-12, -31, Date::JULIAN)
- assert_equal([2001, 1, 1], [d.year, d.mon, d.mday])
- d = Date.new(2001,-12, -31, Date::GREGORIAN)
- assert_equal([2001, 1, 1], [d.year, d.mon, d.mday])
-
- d = DateTime.new(2001, 2, 3, 4, 5, 6)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, 2, 3, 4, 5, 6, 0)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, 2, 3, 4, 5, 6, Rational(9,24))
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, 2, 3, 4, 5, 6, 0.375)
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, 2, 3, 4, 5, 6, '+09:00')
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, 2, 3, 4, 5, 6, '-09:00')
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(-9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, -12, -31, -4, -5, -6, '-09:00')
- assert_equal([2001, 1, 1, 20, 55, 54, Rational(-9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, -12, -31, -4, -5, -6, '-09:00', Date::JULIAN)
- assert_equal([2001, 1, 1, 20, 55, 54, Rational(-9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001, -12, -31, -4, -5, -6, '-09:00', Date::GREGORIAN)
- assert_equal([2001, 1, 1, 20, 55, 54, Rational(-9,24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- end
-
- def test_jd
- d = Date.jd
- assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
- d = Date.jd(0)
- assert_equal([-4712, 1, 1], [d.year, d.mon, d.mday])
- d = Date.jd(2451944)
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
-
- d = DateTime.jd
- assert_equal([-4712, 1, 1, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.jd(0)
- assert_equal([-4712, 1, 1, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.jd(2451944)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.jd(2451944, 4, 5, 6)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.jd(2451944, 4, 5, 6, 0)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.jd(2451944, 4, 5, 6, '+9:00')
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(9, 24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.jd(2451944, -4, -5, -6, '-9:00')
- assert_equal([2001, 2, 3, 20, 55, 54, Rational(-9, 24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- end
-
- def test_ordinal
- d = Date.ordinal
- assert_equal([-4712, 1], [d.year, d.yday])
- d = Date.ordinal(-4712, 1)
- assert_equal([-4712, 1], [d.year, d.yday])
-
- d = Date.ordinal(2001, 2)
- assert_equal([2001, 2], [d.year, d.yday])
- d = Date.ordinal(2001, 2, Date::JULIAN)
- assert_equal([2001, 2], [d.year, d.yday])
- d = Date.ordinal(2001, 2, Date::GREGORIAN)
- assert_equal([2001, 2], [d.year, d.yday])
-
- d = Date.ordinal(2001, -2, Date::JULIAN)
- assert_equal([2001, 364], [d.year, d.yday])
- d = Date.ordinal(2001, -2, Date::GREGORIAN)
- assert_equal([2001, 364], [d.year, d.yday])
-
- d = DateTime.ordinal
- assert_equal([-4712, 1, 1, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(-4712, 1)
- assert_equal([-4712, 1, 1, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(2001, 34)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(2001, 34, 4, 5, 6)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(2001, 34, 4, 5, 6, 0)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(2001, 34, 4, 5, 6, '+9:00')
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(9, 24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(2001, 34, -4, -5, -6, '-9:00')
- assert_equal([2001, 2, 3, 20, 55, 54, Rational(-9, 24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- end
-
- def test_commercial
- d = Date.commercial
- assert_equal([-4712, 1, 1], [d.cwyear, d.cweek, d.cwday])
- d = Date.commercial(-4712, 1, 1)
- assert_equal([-4712, 1, 1], [d.cwyear, d.cweek, d.cwday])
-
- d = Date.commercial(2001, 2, 3)
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
- d = Date.commercial(2001, 2, 3, Date::JULIAN)
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
- d = Date.commercial(2001, 2, 3, Date::GREGORIAN)
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
-
- d = Date.commercial(2001, -2, -3)
- assert_equal([2001, 51, 5], [d.cwyear, d.cweek, d.cwday])
- d = Date.commercial(2001, -2, -3, Date::JULIAN)
- assert_equal([2001, 51, 5], [d.cwyear, d.cweek, d.cwday])
- d = Date.commercial(2001, -2, -3, Date::GREGORIAN)
- assert_equal([2001, 51, 5], [d.cwyear, d.cweek, d.cwday])
-
- d = DateTime.commercial
- assert_equal([-4712, 1, 1, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(-4712, 1, 1)
- assert_equal([-4712, 1, 1, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(2001, 5, 6)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(2001, 5, 6, 4, 5, 6)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(2001, 5, 6, 4, 5, 6, 0)
- assert_equal([2001, 2, 3, 4, 5, 6, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(2001, 5, 6, 4, 5, 6, '+9:00')
- assert_equal([2001, 2, 3, 4, 5, 6, Rational(9, 24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(2001, 5, 6, -4, -5, -6, '-9:00')
- assert_equal([2001, 2, 3, 20, 55, 54, Rational(-9, 24)],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- end
-
- def test_fractional
- d = Date.jd(2451944.0)
- assert_equal(2451944, d.jd)
- d = Date.jd(Rational(2451944))
- assert_equal(2451944, d.jd)
- d = Date.jd(2451944.5)
- assert_equal([2451944, 12], [d.jd, d.send('hour')])
- d = Date.jd(Rational('2451944.5'))
- assert_equal([2451944, 12], [d.jd, d.send('hour')])
-
- d = Date.civil(2001, 2, 3.0)
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = Date.civil(2001, 2, Rational(3))
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = Date.civil(2001, 2, 3.5)
- assert_equal([2001, 2, 3, 12], [d.year, d.mon, d.mday, d.send('hour')])
- d = Date.civil(2001, 2, Rational('3.5'))
- assert_equal([2001, 2, 3, 12], [d.year, d.mon, d.mday, d.send('hour')])
-
- d = Date.ordinal(2001, 2.0)
- assert_equal([2001, 2], [d.year, d.yday])
- d = Date.ordinal(2001, Rational(2))
- assert_equal([2001, 2], [d.year, d.yday])
-
- d = Date.commercial(2001, 2, 3.0)
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
- d = Date.commercial(2001, 2, Rational(3))
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
-
- d = DateTime.jd(2451944.0)
- assert_equal(2451944, d.jd)
- d = DateTime.jd(Rational(2451944))
- assert_equal(2451944, d.jd)
- d = DateTime.jd(2451944.5)
- assert_equal([2451944, 12], [d.jd, d.hour])
- d = DateTime.jd(Rational('2451944.5'))
- assert_equal([2451944, 12], [d.jd, d.hour])
-
- d = DateTime.civil(2001, 2, 3.0)
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = DateTime.civil(2001, 2, Rational(3))
- assert_equal([2001, 2, 3], [d.year, d.mon, d.mday])
- d = DateTime.civil(2001, 2, 3.5)
- assert_equal([2001, 2, 3, 12], [d.year, d.mon, d.mday, d.hour])
- d = DateTime.civil(2001, 2, Rational('3.5'))
- assert_equal([2001, 2, 3, 12], [d.year, d.mon, d.mday, d.hour])
- d = DateTime.civil(2001, 2, 3, 4.5)
- assert_equal([2001, 2, 3, 4, 30], [d.year, d.mon, d.mday, d.hour, d.min])
- d = DateTime.civil(2001, 2, 3, Rational('4.5'))
- assert_equal([2001, 2, 3, 4, 30], [d.year, d.mon, d.mday, d.hour, d.min])
- d = DateTime.civil(2001, 2, 3, 4, 5.5)
- assert_equal([2001, 2, 3, 4, 5, 30],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec])
- d = DateTime.civil(2001, 2, 3, 4, Rational('5.5'))
- assert_equal([2001, 2, 3, 4, 5, 30],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec])
-
- d = DateTime.ordinal(2001, 2.0)
- assert_equal([2001, 2], [d.year, d.yday])
- d = DateTime.ordinal(2001, Rational(2))
- assert_equal([2001, 2], [d.year, d.yday])
-
- d = DateTime.commercial(2001, 2, 3.0)
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
- d = DateTime.commercial(2001, 2, Rational(3))
- assert_equal([2001, 2, 3], [d.cwyear, d.cweek, d.cwday])
-
- end
-
- def test_canon24oc
- d = DateTime.jd(2451943,24)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.ordinal(2001,33,24)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.new(2001,2,2,24)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- d = DateTime.commercial(2001,5,5,24)
- assert_equal([2001, 2, 3, 0, 0, 0, 0],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.offset])
- end
-
- def test_zone
- d = Date.new(2001, 2, 3)
- assert_equal(Encoding::US_ASCII, d.send(:zone).encoding)
- d = DateTime.new(2001, 2, 3)
- assert_equal(Encoding::US_ASCII, d.send(:zone).encoding)
- end
-
- def test_to_s
- d = Date.new(2001, 2, 3)
- assert_equal(Encoding::US_ASCII, d.to_s.encoding)
- assert_equal(Encoding::US_ASCII, d.strftime.encoding)
- d = DateTime.new(2001, 2, 3)
- assert_equal(Encoding::US_ASCII, d.to_s.encoding)
- assert_equal(Encoding::US_ASCII, d.strftime.encoding)
- end
-
- def test_inspect
- d = Date.new(2001, 2, 3)
- assert_equal(Encoding::US_ASCII, d.inspect.encoding)
- d = DateTime.new(2001, 2, 3)
- assert_equal(Encoding::US_ASCII, d.inspect.encoding)
- end
-
- def test_strftime
- assert_raise(Errno::ERANGE) do
- Date.today.strftime('%100000z')
- end
- assert_raise(Errno::ERANGE) do
- Date.new(1 << 10000).strftime('%Y')
- end
- assert_equal('-3786825600', Date.new(1850).strftime('%s'))
- assert_equal('-3786825600000', Date.new(1850).strftime('%Q'))
- end
-
- def test_cmp
- assert_equal(-1, Date.new(2001,2,3) <=> Date.new(2001,2,4))
- assert_equal(0, Date.new(2001,2,3) <=> Date.new(2001,2,3))
- assert_equal(1, Date.new(2001,2,3) <=> Date.new(2001,2,2))
-
- assert_equal(-1, Date.new(2001,2,3) <=> 2451944.0)
- assert_equal(-1, Date.new(2001,2,3) <=> 2451944)
- assert_equal(0, Date.new(2001,2,3) <=> 2451943.5)
- assert_equal(1, Date.new(2001,2,3) <=> 2451943.0)
- assert_equal(1, Date.new(2001,2,3) <=> 2451943)
-
- assert_equal(-1, Date.new(2001,2,3) <=> Rational('4903888/2'))
- assert_equal(0, Date.new(2001,2,3) <=> Rational('4903887/2'))
- assert_equal(1, Date.new(2001,2,3) <=> Rational('4903886/2'))
-
- assert_equal(-1, Date.new(-4713,11,1,Date::GREGORIAN) <=> Date.new(-4713,12,1,Date::GREGORIAN))
- end
-
- def test_eqeqeq
- assert_equal(false, Date.new(2001,2,3) === Date.new(2001,2,4))
- assert_equal(true, Date.new(2001,2,3) === Date.new(2001,2,3))
- assert_equal(false, Date.new(2001,2,3) === Date.new(2001,2,2))
-
- assert_equal(true, Date.new(2001,2,3) === 2451944.0)
- assert_equal(true, Date.new(2001,2,3) === 2451944)
- assert_equal(false, Date.new(2001,2,3) === 2451943.5)
- assert_equal(false, Date.new(2001,2,3) === 2451943.0)
- assert_equal(false, Date.new(2001,2,3) === 2451943)
-
- assert_equal(true, Date.new(2001,2,3) === Rational('4903888/2'))
- assert_equal(false, Date.new(2001,2,3) === Rational('4903887/2'))
- assert_equal(false, Date.new(2001,2,3) === Rational('4903886/2'))
- end
-
- def test_period
- # -5000
- d = Date.new(-5000,1,1)
- assert_equal([-5000, 1, 1, 5], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5001, 11, 22, 5], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.new(-5000,1,1,Date::JULIAN)
- assert_equal([-5000, 1, 1, 5], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5001, 11, 22, 5], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.new(-5000,1,1,Date::GREGORIAN)
- assert_equal([-5000, 1, 1, 3], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([-5000, 2, 10, 3], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(-105192)
- assert_equal([-5000, 1, 1, 5], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5001, 11, 22, 5], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(-105192,Date::JULIAN)
- assert_equal([-5000, 1, 1, 5], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5001, 11, 22, 5], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(-105152,Date::GREGORIAN)
- assert_equal([-5000, 1, 1, 3], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([-5000, 2, 10, 3], [d2.year, d2.mon, d2.mday, d.wday])
-
- # -5000000
- d = Date.new(-5_000_000,1,1)
- assert_equal([-5_000_000, 1, 1, 3], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5_000_103, 4, 28, 3], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.new(-5_000_000,1,1,Date::JULIAN)
- assert_equal([-5_000_000, 1, 1, 3], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5_000_103, 4, 28, 3], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.new(-5_000_000,1,1,Date::GREGORIAN)
- assert_equal([-5_000_000, 1, 1, 6], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([-4_999_898, 9, 4, 6], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(-1824528942)
- assert_equal([-5_000_000, 1, 1, 3], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5_000_103, 4, 28, 3], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(-1824528942,Date::JULIAN)
- assert_equal([-5_000_000, 1, 1, 3], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([-5_000_103, 4, 28, 3], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(-1824491440,Date::GREGORIAN)
- assert_equal([-5_000_000, 1, 1, 6], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([-4_999_898, 9, 4, 6], [d2.year, d2.mon, d2.mday, d.wday])
-
- # 5000000
- d = Date.new(5_000_000,1,1)
- assert_equal([5_000_000, 1, 1, 6], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([4_999_897, 5, 3, 6], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.new(5_000_000,1,1,Date::JULIAN)
- assert_equal([5_000_000, 1, 1, 5], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([5_000_102, 9, 1, 5], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.new(5_000_000,1,1,Date::GREGORIAN)
- assert_equal([5_000_000, 1, 1, 6], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([4_999_897, 5, 3, 6], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(1827933560)
- assert_equal([5_000_000, 1, 1, 6], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([4_999_897, 5, 3, 6], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(1827971058,Date::JULIAN)
- assert_equal([5_000_000, 1, 1, 5], [d.year, d.mon, d.mday, d.wday])
- d2 = d.gregorian
- assert_equal([5_000_102, 9, 1, 5], [d2.year, d2.mon, d2.mday, d.wday])
-
- d = Date.jd(1827933560,Date::GREGORIAN)
- assert_equal([5_000_000, 1, 1, 6], [d.year, d.mon, d.mday, d.wday])
- d2 = d.julian
- assert_equal([4_999_897, 5, 3, 6], [d2.year, d2.mon, d2.mday, d.wday])
-
- # dt
- d = DateTime.new(-123456789,2,3,4,5,6,0)
- assert_equal([-123456789, 2, 3, 4, 5, 6, 1],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.wday])
- d2 = d.gregorian
- assert_equal([-123459325, 12, 27, 4, 5, 6, 1],
- [d2.year, d2.mon, d2.mday, d2.hour, d2.min, d2.sec, d.wday])
-
- d = DateTime.new(123456789,2,3,4,5,6,0)
- assert_equal([123456789, 2, 3, 4, 5, 6, 5],
- [d.year, d.mon, d.mday, d.hour, d.min, d.sec, d.wday])
- d2 = d.julian
- assert_equal([123454254, 1, 19, 4, 5, 6, 5],
- [d2.year, d2.mon, d2.mday, d2.hour, d2.min, d2.sec, d.wday])
- end
-
- def period2_iter2(from, to, sg)
- (from..to).each do |j|
- d = Date.jd(j, sg)
- d2 = Date.new(d.year, d.mon, d.mday, sg)
- assert_equal(d2.jd, j)
- assert_equal(d2.ajd, d.ajd)
- assert_equal(d2.year, d.year)
-
- d = DateTime.jd(j, 12,0,0, '+12:00', sg)
- d2 = DateTime.new(d.year, d.mon, d.mday,
- d.hour, d.min, d.sec, d.offset, sg)
- assert_equal(d2.jd, j)
- assert_equal(d2.ajd, d.ajd)
- assert_equal(d2.year, d.year)
- end
- end
-
- def period2_iter(from, to)
- period2_iter2(from, to, Date::GREGORIAN)
- period2_iter2(from, to, Date::ITALY)
- period2_iter2(from, to, Date::ENGLAND)
- period2_iter2(from, to, Date::JULIAN)
- end
-
- def test_period2
- cm_period0 = 71149239
- cm_period = 0xfffffff.div(cm_period0) * cm_period0
- period2_iter(-cm_period * (1 << 64) - 3, -cm_period * (1 << 64) + 3)
- period2_iter(-cm_period - 3, -cm_period + 3)
- period2_iter(0 - 3, 0 + 3)
- period2_iter(+cm_period - 3, +cm_period + 3)
- period2_iter(+cm_period * (1 << 64) - 3, +cm_period * (1 << 64) + 3)
- end
-
- def test_different_alignments
- assert_equal(0, Date.jd(0) <=> Date.civil(-4713, 11, 24, Date::GREGORIAN))
- assert_equal(0, Date.jd(213447717) <=> Date.civil(579687, 11, 24))
- assert_equal(0, Date.jd(-213447717) <=> Date.civil(-589113, 11, 24, Date::GREGORIAN))
-
- assert_equal(0, Date.jd(0) <=> DateTime.civil(-4713, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
- assert_equal(0, Date.jd(213447717) <=> DateTime.civil(579687, 11, 24))
- assert_equal(0, Date.jd(-213447717) <=> DateTime.civil(-589113, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
-
- assert(Date.jd(0) == Date.civil(-4713, 11, 24, Date::GREGORIAN))
- assert(Date.jd(213447717) == Date.civil(579687, 11, 24))
- assert(Date.jd(-213447717) == Date.civil(-589113, 11, 24, Date::GREGORIAN))
-
- assert(Date.jd(0) == DateTime.civil(-4713, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
- assert(Date.jd(213447717) == DateTime.civil(579687, 11, 24))
- assert(Date.jd(-213447717) == DateTime.civil(-589113, 11, 24, 0, 0, 0, 0, Date::GREGORIAN))
-
- assert(Date.jd(0) === Date.civil(-4713, 11, 24, Date::GREGORIAN))
- assert(Date.jd(213447717) === Date.civil(579687, 11, 24))
- assert(Date.jd(-213447717) === Date.civil(-589113, 11, 24, Date::GREGORIAN))
-
- assert(Date.jd(0) === DateTime.civil(-4713, 11, 24, 12, 0, 0, 0, Date::GREGORIAN))
- assert(Date.jd(213447717) === DateTime.civil(579687, 11, 24, 12))
- assert(Date.jd(-213447717) === DateTime.civil(-589113, 11, 24, 12, 0, 0, 0, Date::GREGORIAN))
-
- a = Date.jd(0)
- b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
- assert_equal(0, a <=> b)
-
- a = Date.civil(-4712, 1, 1, Date::JULIAN)
- b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
- a.jd; b.jd
- assert_equal(0, a <=> b)
-
- a = Date.jd(0)
- b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
- assert(a == b)
-
- a = Date.civil(-4712, 1, 1, Date::JULIAN)
- b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
- a.jd; b.jd
- assert(a == b)
-
- a = Date.jd(0)
- b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
- assert(a === b)
-
- a = Date.civil(-4712, 1, 1, Date::JULIAN)
- b = Date.civil(-4713, 11, 24, Date::GREGORIAN)
- a.jd; b.jd
- assert(a === b)
- end
-
- def test_marshal14
- s = "\x04\x03u:\x01\x04Date\x01\v\x04\x03[\x01\x02i\x03\xE8i%T"
- d = Marshal.load(s)
- assert_equal(Rational(4903887,2), d.ajd)
- assert_equal(0, d.send(:offset))
- assert_equal(Date::GREGORIAN, d.start)
- end
-
- def test_marshal16
- s = "\x04\x06u:\tDate\x0F\x04\x06[\ai\x03\xE8i%T"
- d = Marshal.load(s)
- assert_equal(Rational(4903887,2), d.ajd)
- assert_equal(0, d.send(:offset))
- assert_equal(Date::GREGORIAN, d.start)
- end
-
- def test_marshal18
- s = "\x04\bu:\tDateP\x04\b[\bo:\rRational\a:\x0F@numeratori\x03\xCF\xD3J:\x11@denominatori\ai\x00o:\x13Date::Infinity\x06:\a@di\xFA"
- d = Marshal.load(s)
- assert_equal(Rational(4903887,2), d.ajd)
- assert_equal(0, d.send(:offset))
- assert_equal(Date::GREGORIAN, d.start)
-
- s = "\x04\bu:\rDateTime`\x04\b[\bo:\rRational\a:\x0F@numeratorl+\b\xC9\xB0\x81\xBD\x02\x00:\x11@denominatori\x02\xC0\x12o;\x00\a;\x06i\b;\ai\ro:\x13Date::Infinity\x06:\a@di\xFA"
- d = Marshal.load(s)
- assert_equal(Rational(11769327817,4800), d.ajd)
- assert_equal(Rational(9,24), d.offset)
- assert_equal(Date::GREGORIAN, d.start)
- end
-
- def test_marshal192
- s = "\x04\bU:\tDate[\bU:\rRational[\ai\x03\xCF\xD3Ji\ai\x00o:\x13Date::Infinity\x06:\a@di\xFA"
- d = Marshal.load(s)
- assert_equal(Rational(4903887,2), d.ajd)
- assert_equal(Rational(0,24), d.send(:offset))
- assert_equal(Date::GREGORIAN, d.start)
-
- s = "\x04\bU:\rDateTime[\bU:\rRational[\al+\b\xC9\xB0\x81\xBD\x02\x00i\x02\xC0\x12U;\x06[\ai\bi\ro:\x13Date::Infinity\x06:\a@di\xFA"
- d = Marshal.load(s)
- assert_equal(Rational(11769327817,4800), d.ajd)
- assert_equal(Rational(9,24), d.offset)
- assert_equal(Date::GREGORIAN, d.start)
- end
-
- def test_taint
- h = Date._strptime('15:43+09:00', '%R%z')
- assert_equal(false, h[:zone].tainted?)
- h = Date._strptime('15:43+09:00'.taint, '%R%z')
- assert_equal(true, h[:zone].tainted?)
-
- h = Date._strptime('1;1/0', '%d')
- assert_equal(false, h[:leftover].tainted?)
- h = Date._strptime('1;1/0'.taint, '%d')
- assert_equal(true, h[:leftover].tainted?)
-
- h = Date._parse('15:43+09:00')
- assert_equal(false, h[:zone].tainted?)
- h = Date._parse('15:43+09:00'.taint)
- assert_equal(true, h[:zone].tainted?)
-
- s = Date.today.strftime('new 105')
- assert_equal(false, s.tainted?)
- s = Date.today.strftime('new 105'.taint)
- assert_equal(true, s.tainted?)
- s = Date.today.strftime("new \000 105".taint)
- assert_equal(true, s.tainted?)
-
- s = DateTime.now.strftime('super $record')
- assert_equal(false, s.tainted?)
- s = DateTime.now.strftime('super $record'.taint)
- assert_equal(true, s.tainted?)
- end
-
- def test_enc
- Date::MONTHNAMES.each do |s|
- assert_equal(Encoding::US_ASCII, s.encoding) if s
- end
- Date::DAYNAMES.each do |s|
- assert_equal(Encoding::US_ASCII, s.encoding) if s
- end
- Date::ABBR_MONTHNAMES.each do |s|
- assert_equal(Encoding::US_ASCII, s.encoding) if s
- end
- Date::ABBR_DAYNAMES.each do |s|
- assert_equal(Encoding::US_ASCII, s.encoding) if s
- end
-
- h = Date._strptime('15:43+09:00'.force_encoding('euc-jp'), '%R%z')
- assert_equal(Encoding::EUC_JP, h[:zone].encoding)
- h = Date._strptime('15:43+09:00'.force_encoding('ascii-8bit'), '%R%z')
- assert_equal(Encoding::ASCII_8BIT, h[:zone].encoding)
-
- h = Date._strptime('1;1/0'.force_encoding('euc-jp'), '%d')
- assert_equal(Encoding::EUC_JP, h[:leftover].encoding)
- h = Date._strptime('1;1/0'.force_encoding('ascii-8bit'), '%d')
- assert_equal(Encoding::ASCII_8BIT, h[:leftover].encoding)
-
- h = Date._parse('15:43+09:00'.force_encoding('euc-jp'))
- assert_equal(Encoding::EUC_JP, h[:zone].encoding)
- h = Date._parse('15:43+09:00'.force_encoding('ascii-8bit'))
- assert_equal(Encoding::ASCII_8BIT, h[:zone].encoding)
-
- s = Date.today.strftime('new 105'.force_encoding('euc-jp'))
- assert_equal(Encoding::EUC_JP, s.encoding)
- s = Date.today.strftime('new 105'.force_encoding('ascii-8bit'))
- assert_equal(Encoding::ASCII_8BIT, s.encoding)
-
- s = DateTime.now.strftime('super $record'.force_encoding('euc-jp'))
- assert_equal(Encoding::EUC_JP, s.encoding)
- s = DateTime.now.strftime('super $record'.force_encoding('ascii-8bit'))
- assert_equal(Encoding::ASCII_8BIT, s.encoding)
- end
-
- def test_dup
- d = Date.new(2001,2,3)
- d2 = d.dup
- assert_not_equal(d.object_id, d2.object_id)
- assert_kind_of(Date, d2)
- assert_equal(d, d2)
-
- d = DateTime.new(2001,2,3)
- d2 = d.dup
- assert_not_equal(d.object_id, d2.object_id)
- assert_kind_of(DateTime, d2)
- assert_equal(d, d2)
- end
-
- def test_base
- skip unless defined?(Date.test_all)
- assert_equal(true, Date.test_all)
- end
-
-end
diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb
index 1b851207da..14fd83899e 100644
--- a/test/dbm/test_dbm.rb
+++ b/test/dbm/test_dbm.rb
@@ -10,8 +10,8 @@ if defined? DBM
require 'tmpdir'
require 'fileutils'
- class TestDBM_RDONLY < Test::Unit::TestCase
- def TestDBM_RDONLY.uname_s
+ class TestDBM < Test::Unit::TestCase
+ def TestDBM.uname_s
require 'rbconfig'
case RbConfig::CONFIG['target_os']
when 'cygwin'
@@ -31,6 +31,7 @@ if defined? DBM
@tmpdir = Dir.mktmpdir("tmptest_dbm")
@prefix = "tmptest_dbm_#{$$}"
@path = "#{@tmpdir}/#{@prefix}_"
+ assert_instance_of(DBM, @dbm = DBM.new(@path))
# prepare to make readonly DBM file
DBM.open("#{@tmpdir}/#{@prefix}_rdonly") {|dbm|
@@ -42,6 +43,7 @@ if defined? DBM
assert_instance_of(DBM, @dbm_rdonly = DBM.new("#{@tmpdir}/#{@prefix}_rdonly", nil))
end
def teardown
+ assert_nil(@dbm.close)
assert_nil(@dbm_rdonly.close)
ObjectSpace.each_object(DBM) do |obj|
obj.close unless obj.closed?
@@ -49,32 +51,6 @@ if defined? DBM
FileUtils.remove_entry_secure @tmpdir
end
- def test_delete_rdonly
- if /^CYGWIN_9/ !~ SYSTEM
- assert_raise(DBMError) {
- @dbm_rdonly.delete("foo")
- }
-
- assert_nil(@dbm_rdonly.delete("bar"))
- end
- end
- end
-
- class TestDBM < Test::Unit::TestCase
- def setup
- @tmpdir = Dir.mktmpdir("tmptest_dbm")
- @prefix = "tmptest_dbm_#{$$}"
- @path = "#{@tmpdir}/#{@prefix}_"
- assert_instance_of(DBM, @dbm = DBM.new(@path))
- end
- def teardown
- assert_nil(@dbm.close) unless @dbm.closed?
- ObjectSpace.each_object(DBM) do |obj|
- obj.close unless obj.closed?
- end
- FileUtils.remove_entry_secure @tmpdir
- end
-
def check_size(expect, dbm=@dbm)
assert_equal(expect, dbm.size)
n = 0
@@ -96,58 +72,6 @@ if defined? DBM
end
end
- def test_dbmfile_suffix
- @dbm.close
- prefix = File.basename(@path)
- suffixes = Dir.entries(@tmpdir).grep(/\A#{Regexp.escape prefix}/) { $' }.sort
- pagname = "#{@path}.pag"
- dirname = "#{@path}.dir"
- dbname = "#{@path}.db"
- case DBM::VERSION
- when /\bNDBM\b/
- assert_equal(%w[.dir .pag], suffixes)
- assert(File.zero?(pagname))
- assert(File.zero?(dirname))
- when /\bGDBM\b/
- assert_equal(%w[.dir .pag], suffixes)
- assert(!File.zero?(pagname))
- assert(!File.zero?(dirname))
- pag = File.binread(pagname, 16)
- pag_magics = [
- 0x13579ace, # GDBM_OMAGIC
- 0x13579acd, # GDBM_MAGIC32
- 0x13579acf, # GDBM_MAGIC64
- ]
- assert_operator(pag_magics, :include?,
- pag.unpack("i")[0]) # native endian, native int.
- if !File.identical?(pagname, dirname)
- dir = File.binread(dirname, 16)
- assert_equal("GDBM", dir[0, 4])
- end
- when /\bBerkeley DB\b/
- assert_equal(%w[.db], suffixes)
- assert(!File.zero?(dbname))
- db = File.binread(dbname, 16)
- assert(db[0,4].unpack("N") == [0x00061561] || # Berkeley DB 1
- db[12,4].unpack("L") == [0x00061561]) # Berkeley DBM 2 or later.
- when /\bQDBM\b/
- assert_equal(%w[.dir .pag], suffixes)
- assert(!File.zero?(pagname))
- assert(!File.zero?(dirname))
- dir = File.binread(dirname, 16)
- assert_equal("[depot]\0\v", dir[0, 9])
- pag = File.binread(pagname, 16)
- if [1].pack("s") == "\x00\x01" # big endian
- assert_equal("[DEPOT]\n\f", pag[0, 9])
- else # little endian
- assert_equal("[depot]\n\f", pag[0, 9])
- end
- end
- if suffixes == %w[.db]
- assert_match(/\bBerkeley DB\b/, DBM::VERSION)
- end
- end
-
def test_s_new_has_no_block
# DBM.new ignore the block
foo = true
@@ -155,14 +79,11 @@ if defined? DBM
assert_equal(foo, true)
assert_nil(dbm.close)
end
-
def test_s_open_no_create
- skip "dbm_open() is broken on libgdbm 1.8.0 or prior (#{DBM::VERSION})" if /GDBM version 1\.(?:[0-7]\b|8\.0)/ =~ DBM::VERSION
assert_nil(dbm = DBM.open("#{@tmpdir}/#{@prefix}", nil))
ensure
dbm.close if dbm
end
-
def test_s_open_with_block
assert_equal(DBM.open("#{@tmpdir}/#{@prefix}") { :foo }, :foo)
end
@@ -401,8 +322,15 @@ if defined? DBM
assert_equal(2, @dbm.size)
assert_nil(@dbm.delete(key))
- end
+ if /^CYGWIN_9/ !~ SYSTEM
+ assert_raise(DBMError) {
+ @dbm_rdonly.delete("foo")
+ }
+
+ assert_nil(@dbm_rdonly.delete("bar"))
+ end
+ end
def test_delete_with_block
key = 'no called block'
@dbm[key] = 'foo'
@@ -574,10 +502,6 @@ if defined? DBM
FileUtils.remove_entry_secure @tmproot if File.directory?(@tmproot)
end
- def test_version
- assert_instance_of(String, DBM::VERSION)
- end
-
def test_reader_open_notexist
assert_raise(Errno::ENOENT) {
DBM.open("#{@tmproot}/a", 0666, DBM::READER)
@@ -585,7 +509,6 @@ if defined? DBM
end
def test_writer_open_notexist
- skip "dbm_open() is broken on libgdbm 1.8.0 or prior (#{DBM::VERSION})" if /GDBM version 1\.(?:[0-7]\b|8\.0)/ =~ DBM::VERSION
assert_raise(Errno::ENOENT) {
DBM.open("#{@tmproot}/a", 0666, DBM::WRITER)
}
diff --git a/test/digest/test_digest.rb b/test/digest/test_digest.rb
index 7c990d4320..e35047e979 100755
--- a/test/digest/test_digest.rb
+++ b/test/digest/test_digest.rb
@@ -17,35 +17,23 @@ module TestDigest
Data1 = "abc"
Data2 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- def test_s_new
- self.class::DATA.each do |str, hexdigest|
- assert_raise(ArgumentError) { self.class::ALGO.new("") }
- end
- end
-
def test_s_hexdigest
self.class::DATA.each do |str, hexdigest|
- actual = self.class::ALGO.hexdigest(str)
- assert_equal(hexdigest, actual)
- assert_equal(Encoding::US_ASCII, actual.encoding)
+ assert_equal(hexdigest, self.class::ALGO.hexdigest(str))
end
end
def test_s_base64digest
self.class::DATA.each do |str, hexdigest|
digest = [hexdigest].pack("H*")
- actual = self.class::ALGO.base64digest(str)
- assert_equal([digest].pack("m0"), actual)
- assert_equal(Encoding::US_ASCII, actual.encoding)
+ assert_equal([digest].pack("m0"), self.class::ALGO.base64digest(str))
end
end
def test_s_digest
self.class::DATA.each do |str, hexdigest|
digest = [hexdigest].pack("H*")
- actual = self.class::ALGO.digest(str)
- assert_equal(digest, actual)
- assert_equal(Encoding::BINARY, actual.encoding)
+ assert_equal(digest, self.class::ALGO.digest(str))
end
end
@@ -68,9 +56,6 @@ module TestDigest
assert_equal(md1, md1.clone, self.class::ALGO)
- bug9913 = '[ruby-core:62967] [Bug #9913]'
- assert_not_equal(md1, nil, bug9913)
-
md2 = self.class::ALGO.new
md2 << "A"
@@ -87,15 +72,6 @@ module TestDigest
}
end
- def test_alignment
- md = self.class::ALGO.new
- assert_nothing_raised('#4320') {
- md.update('a' * 97)
- md.update('a' * 97)
- md.hexdigest
- }
- end
-
class TestMD5 < Test::Unit::TestCase
include TestDigest
ALGO = Digest::MD5
diff --git a/test/digest/test_digest_extend.rb b/test/digest/test_digest_extend.rb
index 2992e28877..9b8eda03fa 100644
--- a/test/digest/test_digest_extend.rb
+++ b/test/digest/test_digest_extend.rb
@@ -1,10 +1,7 @@
require 'test/unit'
require 'digest'
-require_relative '../with_different_ofs.rb'
class TestDigestExtend < Test::Unit::TestCase
- extend DifferentOFS
-
class MyDigest < Digest::Class
def initialize(*arg)
super
@@ -23,7 +20,7 @@ class TestDigestExtend < Test::Unit::TestCase
alias << update
def finish
- (@buf.join('').length % 256).chr
+ (@buf.join.length % 256).chr
end
def reset
@@ -38,18 +35,13 @@ class TestDigestExtend < Test::Unit::TestCase
end
end
- def setup
- @MyDigest = Class.new(MyDigest)
- end
-
def test_digest_s_hexencode
assert_equal('', Digest.hexencode(''))
assert_equal('0102', Digest.hexencode("\1\2"))
assert_equal(
- (0..0xff).to_a.map { |c| sprintf("%02x", c ) }.join(''),
- Digest.hexencode((0..0xff).to_a.map { |c| c.chr }.join(''))
+ (0..0xff).to_a.map { |c| sprintf("%02x", c ) }.join,
+ Digest.hexencode((0..0xff).to_a.map { |c| c.chr }.join)
)
- assert_equal(Encoding::US_ASCII, Digest.hexencode("\1\2").encoding)
end
def test_class_reset
@@ -68,11 +60,11 @@ class TestDigestExtend < Test::Unit::TestCase
end
def test_hexdigest
- assert_equal("03", @MyDigest.hexdigest("foo"))
+ assert_equal("03", MyDigest.hexdigest("foo"))
end
def test_context
- digester = @MyDigest.new
+ digester = MyDigest.new
digester.update("foo")
assert_equal("\3", digester.digest)
digester.update("foobar")
@@ -96,7 +88,7 @@ class TestDigestExtend < Test::Unit::TestCase
[:digest, :hexdigest].each do |m|
exp_1st = "\3"; exp_1st = Digest.hexencode(exp_1st) if m == :hexdigest
exp_2nd = "\6"; exp_2nd = Digest.hexencode(exp_2nd) if m == :hexdigest
- digester = @MyDigest.new
+ digester = MyDigest.new
digester.update("foo")
obj = digester.send(m)
# digest w/o param does not reset the org digester.
@@ -113,7 +105,7 @@ class TestDigestExtend < Test::Unit::TestCase
def test_digest_hexdigest_bang
[:digest!, :hexdigest!].each do |m|
exp_1st = "\3"; exp_1st = Digest.hexencode(exp_1st) if m == :hexdigest!
- digester = @MyDigest.new
+ digester = MyDigest.new
digester.update("foo")
obj = digester.send(m) # digest! always resets the org digester.
assert_equal(exp_1st, obj)
@@ -124,35 +116,30 @@ class TestDigestExtend < Test::Unit::TestCase
end
def test_to_s
- digester = @MyDigest.new
+ digester = MyDigest.new
digester.update("foo")
assert_equal("03", digester.to_s)
end
def test_length
- @MyDigest.class_eval do
- def digest_length
- 2
- end
- end
- digester = @MyDigest.new
+ digester = MyDigest.new
assert_equal(2, digester.length)
assert_equal(2, digester.size)
end
- def test_digest_length # breaks @MyDigest#digest_length
- assert_equal(1, @MyDigest.new.digest_length)
- @MyDigest.class_eval do
+ def test_digest_length # breaks MyDigest#digest_length
+ assert_equal(1, MyDigest.new.digest_length)
+ MyDigest.class_eval do
def digest_length
2
end
end
- assert_equal(2, @MyDigest.new.digest_length)
+ assert_equal(2, MyDigest.new.digest_length)
end
def test_block_length
assert_raises(RuntimeError) do
- @MyDigest.new.block_length
+ MyDigest.new.block_length
end
end
end
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index 6dc98765f3..4ba0cca6f9 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -1,7 +1,6 @@
-# -*- coding: us-ascii -*-
require 'test/unit'
+require 'dl'
require_relative '../ruby/envutil'
-EnvUtil.suppress_warning {require 'dl'}
libc_so = libm_so = nil
@@ -33,12 +32,6 @@ when /darwin/
when /kfreebsd/
libc_so = "/lib/libc.so.0.1"
libm_so = "/lib/libm.so.1"
-when /gnu/ #GNU/Hurd
- libc_so = "/lib/libc.so.0.3"
- libm_so = "/lib/libm.so.6"
-when /freebsd/
- libc_so = "/lib/libc.so.7"
- libm_so = "/lib/libm.so.5"
when /bsd|dragonfly/
libc_so = "/usr/lib/libc.so"
libm_so = "/usr/lib/libm.so"
@@ -52,8 +45,8 @@ when /solaris/
# 64-bit ruby
libdir = '/lib/64' if File.directory? '/lib/64'
end
- libc_so = File.join(libdir, "libc.so")
- libm_so = File.join(libdir, "libm.so")
+ libc_so = File.join(libdir, "libc.so.6")
+ libm_so = File.join(libdir, "libm.so.6")
when /aix/
pwd=Dir.pwd
libc_so = libm_so = "#{pwd}/libaixdltest.so"
diff --git a/test/dl/test_c_struct_entry.rb b/test/dl/test_c_struct_entry.rb
deleted file mode 100644
index b2f1f94419..0000000000
--- a/test/dl/test_c_struct_entry.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: us-ascii -*-
-require_relative 'test_base'
-
-EnvUtil.suppress_warning {require 'dl/struct'}
-
-module DL
- class TestCStructEntity < TestBase
- def test_class_size
- types = [TYPE_DOUBLE, TYPE_CHAR]
-
- size = CStructEntity.size types
-
- alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
- expected = PackInfo.align 0, alignments[0]
- expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
-
- expected = PackInfo.align expected, alignments[1]
- expected += PackInfo::SIZE_MAP[TYPE_CHAR]
-
- expected = PackInfo.align expected, alignments.max
-
- assert_equal expected, size
- end
-
- def test_class_size_with_count
- size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
- types = [TYPE_DOUBLE, TYPE_CHAR]
- alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
- expected = PackInfo.align 0, alignments[0]
- expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2
-
- expected = PackInfo.align expected, alignments[1]
- expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20
-
- expected = PackInfo.align expected, alignments.max
-
- assert_equal expected, size
- end
-
- def test_set_ctypes
- union = CStructEntity.malloc [TYPE_INT, TYPE_LONG]
- union.assign_names %w[int long]
-
- # this test is roundabout because the stored ctypes are not accessible
- union['long'] = 1
- union['int'] = 2
-
- assert_equal 1, union['long']
- assert_equal 2, union['int']
- end
- end
-end
diff --git a/test/dl/test_c_union_entity.rb b/test/dl/test_c_union_entity.rb
deleted file mode 100644
index 09f7c60e4c..0000000000
--- a/test/dl/test_c_union_entity.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require_relative 'test_base'
-
-require 'dl/struct'
-
-module DL
- class TestCUnionEntity < TestBase
- def test_class_size
- size = CUnionEntity.size([TYPE_DOUBLE, TYPE_CHAR])
-
- assert_equal SIZEOF_DOUBLE, size
- end
-
- def test_class_size_with_count
- size = CUnionEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
- assert_equal SIZEOF_CHAR * 20, size
- end
-
- def test_set_ctypes
- union = CUnionEntity.malloc [TYPE_INT, TYPE_LONG]
- union.assign_names %w[int long]
-
- # this test is roundabout because the stored ctypes are not accessible
- union['long'] = 1
- assert_equal 1, union['long']
-
- union['int'] = 1
- assert_equal 1, union['int']
- end
- end
-end
diff --git a/test/dl/test_callback.rb b/test/dl/test_callback.rb
index 8ae652b95a..ed3be661e7 100644
--- a/test/dl/test_callback.rb
+++ b/test/dl/test_callback.rb
@@ -25,7 +25,7 @@ module DL
func = CFunc.new(addr, TYPE_VOIDP, 'test')
f = Function.new(func, [TYPE_VOIDP])
ptr = CPtr['blah']
- assert_equal ptr.to_i, f.call(ptr).to_i
+ assert_equal ptr, f.call(ptr)
end
def test_callback_return_arbitrary
@@ -48,11 +48,8 @@ module DL
func = CFunc.new(addr, TYPE_VOID, 'test')
f = Function.new(func, [TYPE_VOIDP])
- # Don't remove local variable arg.
- # This necessary to protect objects from GC.
- arg = 'foo'
- f.call(dlwrap(arg))
- assert_equal arg, called_with
+ f.call(dlwrap('foo'))
+ assert_equal 'foo', called_with
end
def test_call_callback
diff --git a/test/dl/test_cfunc.rb b/test/dl/test_cfunc.rb
index 39fa8133a2..c0bab45700 100644
--- a/test/dl/test_cfunc.rb
+++ b/test/dl/test_cfunc.rb
@@ -72,7 +72,7 @@ module DL
Thread.new do
f = Function.new(@cf, [TYPE_VOIDP, TYPE_VOIDP])
assert_nil CFunc.last_error
- f.call("000", "123")
+ str = f.call("000", "123")
assert_not_nil CFunc.last_error
end.join
end
diff --git a/test/dl/test_cparser.rb b/test/dl/test_cparser.rb
index a4deb6733e..3be727a759 100644
--- a/test/dl/test_cparser.rb
+++ b/test/dl/test_cparser.rb
@@ -4,30 +4,10 @@ require 'dl/cparser'
module DL
class TestCParser < TestBase
- include CParser
+ include DL::CParser
def test_uint_ctype
- assert_equal(-TYPE_INT, parse_ctype('uint'))
- end
-
- def test_size_t_ctype
- assert_equal(TYPE_SIZE_T, parse_ctype("size_t"))
- end
-
- def test_ssize_t_ctype
- assert_equal(TYPE_SSIZE_T, parse_ctype("ssize_t"))
- end
-
- def test_ptrdiff_t_ctype
- assert_equal(TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t"))
- end
-
- def test_intptr_t_ctype
- assert_equal(TYPE_INTPTR_T, parse_ctype("intptr_t"))
- end
-
- def test_uintptr_t_ctype
- assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
+ assert_equal(-DL::TYPE_INT, parse_ctype('uint'))
end
end
end
diff --git a/test/dl/test_cptr.rb b/test/dl/test_cptr.rb
index aa74a73fe5..953af286e1 100644
--- a/test/dl/test_cptr.rb
+++ b/test/dl/test_cptr.rb
@@ -212,15 +212,5 @@ module DL
assert_equal ptr3.to_i, ptr[0,2] = ptr3.to_i
check.call(str, ptr)
end
-
- def test_null_pointer
- nullpo = CPtr.new(0)
- assert_raise(DLError) {nullpo[0]}
- assert_raise(DLError) {nullpo[0] = 1}
- end
- end
-
- def test_no_memory_leak
- assert_no_memory_leak(%w[-W0 -rdl.so], '', '100_000.times {DL::CPtr.allocate}', rss: true)
end
end
diff --git a/test/dl/test_dl2.rb b/test/dl/test_dl2.rb
index 88ef0869b1..1d6e39114f 100644
--- a/test/dl/test_dl2.rb
+++ b/test/dl/test_dl2.rb
@@ -28,7 +28,7 @@ class TestDL < TestBase
assert_equal ptr_id, ptr.to_i
cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy')
- cfunc.call([ptr_id,str].pack("l!p").unpack("l!*"))
+ x = cfunc.call([ptr_id,str].pack("l!p").unpack("l!*"))
assert_equal("abc\0", ptr[0,4])
DL.free ptr_id
end
@@ -51,7 +51,7 @@ class TestDL < TestBase
assert_equal ptr_id, ptr.to_i
cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy')
- cfunc.call([ptr_id,str].pack("l!p").unpack("l!*"))
+ x = cfunc.call([ptr_id,str].pack("l!p").unpack("l!*"))
assert_equal("abc\0", ptr[0,4])
DL.free ptr_id
end
@@ -151,17 +151,5 @@ class TestDL < TestBase
ary2 = dlunwrap(addr)
assert_equal(ary, ary2)
end
-
- def test_type_size_t
- assert_equal(DL::TYPE_SSIZE_T, DL::TYPE_SIZE_T.abs)
- end
-
- def test_type_uintptr_t
- assert_equal(-DL::TYPE_INTPTR_T, DL::TYPE_UINTPTR_T)
- end
-
- def test_sizeof_uintptr_t
- assert_equal(DL::SIZEOF_VOIDP, DL::SIZEOF_INTPTR_T)
- end
end
end # module DL
diff --git a/test/dl/test_func.rb b/test/dl/test_func.rb
index 3b5ad3394f..27bf7daf7f 100644
--- a/test/dl/test_func.rb
+++ b/test/dl/test_func.rb
@@ -9,71 +9,6 @@ module DL
assert_equal 'strcpy', f.name
end
- def test_name_with_block
- begin
- cb = Function.new(CFunc.new(0, TYPE_INT, '<callback>qsort'),
- [TYPE_VOIDP, TYPE_VOIDP]){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
- assert_equal('<callback>qsort', cb.name)
- ensure
- cb.unbind if cb # max number of callbacks is limited to MAX_CALLBACK
- end
- end
-
- def test_bound
- f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
- assert_equal false, f.bound?
- begin
- f.bind { |x,y| x + y }
- assert_equal true, f.bound?
- ensure
- f.unbind # max number of callbacks is limited to MAX_CALLBACK
- end
- end
-
- def test_bound_for_callback_closure
- begin
- f = Function.new(CFunc.new(0, TYPE_INT, 'test'),
- [TYPE_INT, TYPE_INT]) { |x,y| x + y }
- assert_equal true, f.bound?
- ensure
- f.unbind if f # max number of callbacks is limited to MAX_CALLBACK
- end
- end
-
- def test_unbind
- f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
- begin
- f.bind { |x, y| x + y }
- assert_nothing_raised { f.unbind }
- assert_equal false, f.bound?
- # unbind() after unbind() should not raise error
- assert_nothing_raised { f.unbind }
- ensure
- f.unbind # max number of callbacks is limited to MAX_CALLBACK
- end
- end
-
- def test_unbind_normal_function
- f = Function.new(CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy'),
- [TYPE_VOIDP, TYPE_VOIDP])
- assert_nothing_raised { f.unbind }
- assert_equal false, f.bound?
- # unbind() after unbind() should not raise error
- assert_nothing_raised { f.unbind }
- end
-
- def test_bind
- f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
- begin
- assert_nothing_raised {
- f.bind { |x, y| x + y }
- }
- assert_equal 579, f.call(123, 456)
- ensure
- f.unbind # max number of callbacks is limited to MAX_CALLBACK
- end
- end
-
def test_to_i
cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy')
f = Function.new(cfunc, [TYPE_VOIDP, TYPE_VOIDP])
@@ -123,7 +58,7 @@ module DL
assert_equal("123", str.to_s)
ensure
GC.stress = stress
- end
+ end
def test_isdigit()
f = Function.new(CFunc.new(@libc['isdigit'], TYPE_INT, 'isdigit'),
@@ -153,29 +88,20 @@ module DL
end
def test_qsort1()
- begin
- cb = Function.new(CFunc.new(0, TYPE_INT, '<callback>qsort'),
- [TYPE_VOIDP, TYPE_VOIDP]){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
- qsort = Function.new(CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort'),
- [TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP])
- buff = "9341"
- qsort.call(buff, buff.size, 1, cb)
- assert_equal("1349", buff)
-
- bug4929 = '[ruby-core:37395]'
- buff = "9341"
- EnvUtil.under_gc_stress {qsort.call(buff, buff.size, 1, cb)}
- assert_equal("1349", buff, bug4929)
- ensure
- cb.unbind if cb # max number of callbacks is limited to MAX_CALLBACK
- end
+ cb = Function.new(CFunc.new(0, TYPE_INT, '<callback>qsort'),
+ [TYPE_VOIDP, TYPE_VOIDP]){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
+ qsort = Function.new(CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort'),
+ [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP])
+ buff = "9341"
+ qsort.call(buff, buff.size, 1, cb)
+ assert_equal("1349", buff)
end
def test_qsort2()
cb = TempFunction.new(CFunc.new(0, TYPE_INT, '<callback>qsort'),
[TYPE_VOIDP, TYPE_VOIDP])
qsort = Function.new(CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort'),
- [TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP])
+ [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP])
buff = "9341"
qsort.call(buff, buff.size, 1, cb){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
assert_equal("1349", buff)
diff --git a/test/dl/test_handle.rb b/test/dl/test_handle.rb
index 6a8964e9a0..75edb10534 100644
--- a/test/dl/test_handle.rb
+++ b/test/dl/test_handle.rb
@@ -1,5 +1,4 @@
require_relative 'test_base'
-require_relative '../ruby/envutil'
module DL
class TestHandle < TestBase
@@ -134,6 +133,7 @@ module DL
end
def test_NEXT
+ skip "DL::Handle::NEXT is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM
begin
# Linux / Darwin
#
@@ -159,33 +159,16 @@ module DL
# interface, below, should be used, since getpid() is a function and not a
# data object.)
# --- FreeBSD 8.0 dlsym(3)
- assert_in_out_err(['RUBYOPT' => '-W0'], <<-INPUT, /\A#<DL::Handle:0x[0-9a-f]+>\z/)
- require 'dl'
- require 'objspace'
- print DL::Handle::NEXT.inspect
- INPUT
+ require 'objspace'
+ handle = DL::Handle::NEXT
+ assert_not_nil handle['Init_objspace']
end
- end unless /mswin|mingw/ =~ RUBY_PLATFORM
+ end
def test_DEFAULT
skip "DL::Handle::DEFAULT is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM
handle = DL::Handle::DEFAULT
assert_not_nil handle['malloc']
- end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
- def test_dlerror
- # FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
- # getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
- # it calls _nss_cache_cycle_prevention_function with dlsym(3).
- # So our DL::Handle#sym must call dlerror(3) before call dlsym.
- # In general uses of dlerror(3) should call it before use it.
- require 'socket'
- Socket.gethostbyname("localhost")
- DL.dlopen("/lib/libc.so.7").sym('strcpy')
- end if /freebsd/=~ RUBY_PLATFORM
- end
-
- def test_no_memory_leak
- assert_no_memory_leak(%w[-W0 -rdl.so], '', '100_000.times {DL::Handle.allocate}; GC.start', rss: true)
+ end
end
end
diff --git a/test/dl/test_import.rb b/test/dl/test_import.rb
index 8b3f39b851..56a417f9ab 100644
--- a/test/dl/test_import.rb
+++ b/test/dl/test_import.rb
@@ -1,4 +1,3 @@
-# coding: US-ASCII
require_relative 'test_base'
require 'dl/import'
@@ -35,23 +34,13 @@ module DL
]
CallCallback = bind("void call_callback(void*, void*)"){|ptr1, ptr2|
- f = Function.new(CFunc.new(ptr1.to_i, TYPE_VOID, "<anonymous>"), [TYPE_VOIDP])
+ f = Function.new(CFunc.new(ptr1.to_i, DL::TYPE_VOID, "<anonymous>"), [TYPE_VOIDP])
f.call(ptr2)
}
CarriedFunction = bind("void callback_function(void*)", :carried, 0)
end
class TestImport < TestBase
- def test_ensure_call_dlload
- err = assert_raises(RuntimeError) do
- Class.new do
- extend Importer
- extern "void *strcpy(char*, char*)"
- end
- end
- assert_match(/call dlload before/, err.message)
- end
-
def test_malloc()
s1 = LIBC::Timeval.malloc()
s2 = LIBC::Timeval.malloc()
@@ -59,7 +48,7 @@ module DL
end
def test_sizeof()
- assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
+ assert_equal(DL::SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
end
@@ -71,7 +60,7 @@ module DL
end
def test_io()
- if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM )
+ if( RUBY_PLATFORM != DL::BUILD_RUBY_PLATFORM )
return
end
io_in,io_out = IO.pipe()
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 6de85cee82..fe39a6e5b8 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -11,7 +11,7 @@ class DRbService
@@ruby += " -d" if $DEBUG
def self.add_service_command(nm)
dir = File.dirname(File.expand_path(__FILE__))
- DRb::ExtServManager.command[nm] = [@@ruby, "#{dir}/#{nm}"]
+ DRb::ExtServManager.command[nm] = "#{@@ruby} \"#{dir}/#{nm}\""
end
%w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb ut_eq.rb).each do |nm|
@@ -65,34 +65,12 @@ end
module DRbCore
def setup
- @service_name = 'ut_drb.rb'
- @ext = DRbService.ext_service(@service_name)
+ @ext = DRbService.ext_service('ut_drb.rb')
@there = @ext.front
end
def teardown
- @ext.stop_service if defined?(@ext) && @ext
- DRbService.manager.unregist(@service_name)
- while (@there&&@there.to_s rescue nil)
- # nop
- end
- signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
- Thread.list.each {|th|
- if th.respond_to?(:pid) && th[:drb_service] == @service_name
- 10.times do
- begin
- Process.kill signal, th.pid
- break
- rescue Errno::ESRCH
- break
- rescue Errno::EPERM # on Windows
- sleep 0.1
- retry
- end
- end
- th.join
- end
- }
+ @ext.stop_service if @ext
end
def test_00_DRbObject
@@ -293,34 +271,12 @@ end
module DRbAry
def setup
- @service_name = 'ut_array.rb'
- @ext = DRbService.ext_service(@service_name)
+ @ext = DRbService.ext_service('ut_array.rb')
@there = @ext.front
end
def teardown
- @ext.stop_service if defined?(@ext) && @ext
- DRbService.manager.unregist(@service_name)
- while (@there&&@there.to_s rescue nil)
- # nop
- end
- signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
- Thread.list.each {|th|
- if th.respond_to?(:pid) && th[:drb_service] == @service_name
- 10.times do
- begin
- Process.kill signal, th.pid
- break
- rescue Errno::ESRCH
- break
- rescue Errno::EPERM # on Windows
- sleep 0.1
- retry
- end
- end
- th.join
- end
- }
+ @ext.stop_service if @ext
end
def test_01
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index 5841687b38..8ab00ec2a0 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -202,8 +202,7 @@ end
class TestDRbSafe1 < TestDRbAry
def setup
- @service_name = 'ut_safe1.rb'
- @ext = DRbService.ext_service(@service_name)
+ @ext = DRbService.ext_service('ut_safe1.rb')
@there = @ext.front
end
end
@@ -310,7 +309,7 @@ class TestBug4409 < Test::Unit::TestCase
def teardown
@ext.stop_service if @ext
end
-
+
def test_bug4409
foo = @there.foo
assert(@there.foo?(foo))
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index 6322434eaa..8f6c4f2341 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -36,8 +36,7 @@ end
class TestDRbSSLCore < Test::Unit::TestCase
include DRbCore
def setup
- @service_name = 'ut_drb_drbssl.rb'
- @ext = DRbSSLService.ext_service(@service_name)
+ @ext = DRbSSLService.ext_service('ut_drb_drbssl.rb')
@there = @ext.front
end
@@ -54,8 +53,7 @@ end
class TestDRbSSLAry < Test::Unit::TestCase
include DRbAry
def setup
- @service_name = 'ut_array_drbssl.rb'
- @ext = DRbSSLService.ext_service(@service_name)
+ @ext = DRbSSLService.ext_service('ut_array_drbssl.rb')
@there = @ext.front
end
end
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index 1fba033aca..5b93f52d2c 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -20,8 +20,7 @@ end
class TestDRbUNIXCore < Test::Unit::TestCase
include DRbCore
def setup
- @service_name = 'ut_drb_drbunix.rb'
- @ext = DRbUNIXService.ext_service(@service_name)
+ @ext = DRbUNIXService.ext_service('ut_drb_drbunix.rb')
@there = @ext.front
end
@@ -38,8 +37,7 @@ end
class TestDRbUNIXAry < Test::Unit::TestCase
include DRbAry
def setup
- @service_name = 'ut_array_drbunix.rb'
- @ext = DRbUNIXService.ext_service(@service_name)
+ @ext = DRbUNIXService.ext_service('ut_array_drbunix.rb')
@there = @ext.front
end
end
diff --git a/test/drb/ut_array.rb b/test/drb/ut_array.rb
index 6d9778ffbc..ad5ce0e3e5 100644
--- a/test/drb/ut_array.rb
+++ b/test/drb/ut_array.rb
@@ -8,7 +8,7 @@ if __FILE__ == $0
it
end
- DRb.start_service(nil, [1, 2, 'III', 4, "five", 6])
+ DRb.start_service("druby://localhost:0", [1, 2, 'III', 4, "five", 6])
es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
end
diff --git a/test/drb/ut_array_drbssl.rb b/test/drb/ut_array_drbssl.rb
index 77ff7ca354..4c4edca599 100644
--- a/test/drb/ut_array_drbssl.rb
+++ b/test/drb/ut_array_drbssl.rb
@@ -9,18 +9,7 @@ if __FILE__ == $0
it
end
- TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
------END DH PARAMETERS-----
- _end_of_pem_
-
- TEST_KEY_DH1024.priv_key = OpenSSL::BN.new("48561834C67E65FFD2A9B47F41E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB451E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672EEF3EF13AB47A15275FC2836F3AC74CEA", 16)
-
config = Hash.new
- config[:SSLTmpDhCallback] = proc { TEST_KEY_DH1024 }
config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
config[:SSLVerifyCallback] = lambda{|ok,x509_store|
true
@@ -28,7 +17,7 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
config[:SSLCertName] =
[ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ]
- DRb.start_service('drbssl://:0', [1, 2, 'III', 4, "five", 6], config)
+ DRb.start_service('drbssl://localhost:0', [1, 2, 'III', 4, "five", 6], config)
es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
end
diff --git a/test/drb/ut_drb.rb b/test/drb/ut_drb.rb
index c6cc0590f1..f5720cfca2 100644
--- a/test/drb/ut_drb.rb
+++ b/test/drb/ut_drb.rb
@@ -32,8 +32,6 @@ class DRbEx
class UError < RuntimeError; end
def initialize
- @xary2_hash = nil
- @hash = nil
@hello = 'hello'
end
attr_reader :hello
@@ -159,5 +157,4 @@ if __FILE__ == $0
DRb.start_service('druby://localhost:0', DRbEx.new)
es = DRb::ExtServ.new(ARGV.shift, ARGV.shift)
DRb.thread.join
- es.stop_service if es.alive?
end
diff --git a/test/drb/ut_drb_drbssl.rb b/test/drb/ut_drb_drbssl.rb
index c3a3eb075d..0a2191e71a 100644
--- a/test/drb/ut_drb_drbssl.rb
+++ b/test/drb/ut_drb_drbssl.rb
@@ -1,4 +1,4 @@
-require_relative "ut_drb"
+require "#{File.dirname(File.expand_path(__FILE__))}/ut_drb"
require 'drb/ssl'
if __FILE__ == $0
@@ -8,18 +8,7 @@ if __FILE__ == $0
it
end
- TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
------END DH PARAMETERS-----
- _end_of_pem_
-
- TEST_KEY_DH1024.priv_key = OpenSSL::BN.new("48561834C67E65FFD2A9B47F41E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB451E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672EEF3EF13AB47A15275FC2836F3AC74CEA", 16)
-
config = Hash.new
- config[:SSLTmpDhCallback] = proc { TEST_KEY_DH1024 }
config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER
config[:SSLVerifyCallback] = lambda{|ok,x509_store|
true
diff --git a/test/drb/ut_eq.rb b/test/drb/ut_eq.rb
index 330af95289..10dc85698c 100644
--- a/test/drb/ut_eq.rb
+++ b/test/drb/ut_eq.rb
@@ -11,7 +11,7 @@ class Bar
@foo = Foo.new
end
attr_reader :foo
-
+
def foo?(foo)
@foo == foo
end
diff --git a/test/dtrace/dummy.rb b/test/dtrace/dummy.rb
deleted file mode 100644
index e85614228c..0000000000
--- a/test/dtrace/dummy.rb
+++ /dev/null
@@ -1 +0,0 @@
-# this is a dummy file used by test/dtrace/test_require.rb
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
deleted file mode 100644
index 7a327a8695..0000000000
--- a/test/dtrace/helper.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: us-ascii -*-
-require 'minitest/autorun'
-require 'tempfile'
-require_relative '../ruby/envutil'
-
-if Process.euid == 0
- ok = true
-elsif (sudo = ENV["SUDO"]) and (`#{sudo} echo ok` rescue false)
- ok = true
-else
- ok = false
-end
-ok &= (`dtrace -V` rescue false)
-module DTrace
- class TestCase < MiniTest::Unit::TestCase
- INCLUDE = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
- def trap_probe d_program, ruby_program
- d = Tempfile.new('probe.d')
- d.write d_program
- d.flush
-
- rb = Tempfile.new('probed.rb')
- rb.write ruby_program
- rb.flush
-
- d_path = d.path
- rb_path = rb.path
-
- cmd = ["dtrace", "-q", "-s", d_path, "-c", "#{EnvUtil.rubybin} -I#{INCLUDE} #{rb_path}"]
- sudo = ENV["SUDO"] and cmd.unshift(sudo)
- probes = IO.popen(cmd) do |io|
- io.readlines
- end
- d.close(true)
- rb.close(true)
- yield(d_path, rb_path, probes)
- end
- end
-end if ok
diff --git a/test/dtrace/test_array_create.rb b/test/dtrace/test_array_create.rb
deleted file mode 100644
index affcd475c0..0000000000
--- a/test/dtrace/test_array_create.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestArrayCreate < TestCase
- def test_lit
- trap_probe(probe, '[]') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |num, file, line|
- file == rbfile && num == '0'
- }
- assert_equal([rbfile], saw.map { |line| line[1] })
- assert_equal(['1'], saw.map { |line| line[2] })
- }
- end
-
- def test_many_lit
- trap_probe(probe, '[1,2,3,4]') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |num, file, line|
- file == rbfile && num == '4' && line == '1'
- }
- assert_operator saw.length, :>, 0
- }
- end
-
- private
- def probe type = 'array'
- <<-eoprobe
-ruby$target:::#{type}-create
-/arg1/
-{
- printf("%d %s %d\\n", arg0, copyinstr(arg1), arg2);
-}
- eoprobe
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_cmethod.rb b/test/dtrace/test_cmethod.rb
deleted file mode 100644
index 138ec55ab3..0000000000
--- a/test/dtrace/test_cmethod.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestCMethod < TestCase
- def test_entry
- probe = <<-eoprobe
-ruby$target:::cmethod-entry
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row[1] == 'times'
- }
-
- assert_equal 1, foo_calls.length
- }
- end
-
- def test_exit
- probe = <<-eoprobe
-ruby$target:::cmethod-return
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row[1] == 'times'
- }
-
- assert_equal 1, foo_calls.length
- }
- end
-
- def ruby_program
- <<-eoruby
- class Foo
- def self.foo; end
- end
- 10.times { Foo.foo }
- eoruby
- end
- end
-end if defined?(DTrace::TestCase)
-
diff --git a/test/dtrace/test_function_entry.rb b/test/dtrace/test_function_entry.rb
deleted file mode 100644
index c7bf478643..0000000000
--- a/test/dtrace/test_function_entry.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestFunctionEntry < TestCase
- def test_function_entry
- probe = <<-eoprobe
-ruby$target:::method-entry
-/arg0 && arg1 && arg2/
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row.first == 'Foo' && row[1] == 'foo'
- }
-
- assert_equal 10, foo_calls.length
- line = '2'
- foo_calls.each { |f| assert_equal line, f[3] }
- foo_calls.each { |f| assert_equal rb_file, f[2] }
- }
- end
-
- def test_function_return
- probe = <<-eoprobe
-ruby$target:::method-return
-/arg0 && arg1 && arg2/
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row.first == 'Foo' && row[1] == 'foo'
- }
-
- assert_equal 10, foo_calls.length
- line = '2'
- foo_calls.each { |f| assert_equal line, f[3] }
- foo_calls.each { |f| assert_equal rb_file, f[2] }
- }
- end
-
- def test_return_from_raise
- program = <<-eoruby
- class Foo
- def bar; raise; end
- def baz
- bar
- rescue
- end
- end
-
- Foo.new.baz
- eoruby
-
- probe = <<-eoprobe
-ruby$target:::method-return
-/arg0 && arg1 && arg2/
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row.first == 'Foo' && row[1] == 'bar'
- }
- assert foo_calls.any?
- }
- end
-
- private
- def ruby_program
- <<-eoruby
- class Foo
- def foo; end
- end
- x = Foo.new
- 10.times { x.foo }
- eoruby
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_gc.rb b/test/dtrace/test_gc.rb
deleted file mode 100644
index f2a01fb6a0..0000000000
--- a/test/dtrace/test_gc.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestGC < TestCase
- %w{
- gc-mark-begin
- gc-mark-end
- gc-sweep-begin
- gc-sweep-end
- }.each do |probe_name|
- define_method(:"test_#{probe_name.gsub(/-/, '_')}") do
- probe = "ruby$target:::#{probe_name} { printf(\"#{probe_name}\\n\"); }"
-
- trap_probe(probe, ruby_program) { |_, _, saw|
- assert_operator saw.length, :>, 0
- }
-
- end
- end
-
- private
- def ruby_program
- "100000.times { Object.new }"
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_hash_create.rb b/test/dtrace/test_hash_create.rb
deleted file mode 100644
index 91dd6ce552..0000000000
--- a/test/dtrace/test_hash_create.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestHashCreate < TestCase
- def test_hash_new
- trap_probe(probe, 'Hash.new') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |num, file, line|
- file == rbfile && num == '0'
- }
- assert_operator saw.length, :>, 0
- }
- end
-
- def test_hash_lit
- trap_probe(probe, '{}') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |num, file, line|
- file == rbfile && num == '0'
- }
- assert_operator saw.length, :>, 0
- }
- end
-
- def test_hash_lit_elements
- trap_probe(probe, '{ :foo => :bar }') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |num, file, line|
- file == rbfile && num == '2'
- }
- assert_operator saw.length, :>, 0
- }
- end
-
- def test_hash_lit_elements_string
- trap_probe(probe, '{ :foo => :bar, :bar => "baz" }') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |num, file, line|
- file == rbfile && num == '4'
- }
- assert_operator saw.length, :>, 0
- }
- end
-
- private
- def probe
- <<-eoprobe
-ruby$target:::hash-create
-/arg1/
-{
- printf("%d %s %d\\n", arg0, copyinstr(arg1), arg2);
-}
- eoprobe
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_load.rb b/test/dtrace/test_load.rb
deleted file mode 100644
index 095a61d78d..0000000000
--- a/test/dtrace/test_load.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'dtrace/helper'
-require 'tempfile'
-
-module DTrace
- class TestLoad < TestCase
- def setup
- super
- @rbfile = Tempfile.new(['omg', 'rb'])
- @rbfile.write 'x = 10'
- end
-
- def teardown
- super
- @rbfile.close(true) if @rbfile
- end
-
- def test_load_entry
- probe = <<-eoprobe
-ruby$target:::load-entry
-{
- printf("%s %s %d\\n", copyinstr(arg0), copyinstr(arg1), arg2);
-}
- eoprobe
- trap_probe(probe, program) { |dpath, rbpath, saw|
- saw = saw.map(&:split).find_all { |loaded, _, _|
- loaded == @rbfile.path
- }
- assert_equal 10, saw.length
- }
- end
-
- def test_load_return
- probe = <<-eoprobe
-ruby$target:::load-return
-{
- printf("%s\\n", copyinstr(arg0));
-}
- eoprobe
- trap_probe(probe, program) { |dpath, rbpath, saw|
- saw = saw.map(&:split).find_all { |loaded, _, _|
- loaded == @rbfile.path
- }
- assert_equal 10, saw.length
- }
- end
-
- private
- def program
- "10.times { load '#{@rbfile.path}' }"
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_object_create_start.rb b/test/dtrace/test_object_create_start.rb
deleted file mode 100644
index ae4fb742e2..0000000000
--- a/test/dtrace/test_object_create_start.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestObjectCreateStart < TestCase
- def test_object_create_start
- trap_probe(probe, '10.times { Object.new }') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |_, file, _|
- file == rbfile
- }
- assert_equal 10, saw.length
- }
- end
-
- def test_object_create_start_name
- trap_probe(probe, 'Hash.new') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |klass, file, line|
- file == rbfile
- }
- assert_equal(%w{ Hash }, saw.map(&:first))
- assert_equal([rbfile], saw.map { |line| line[1] })
- assert_equal(['1'], saw.map { |line| line[2] })
- }
- end
-
- private
- def probe
- <<-eoprobe
-ruby$target:::object-create
-{
- printf("%s %s %d\\n", copyinstr(arg0), copyinstr(arg1), arg2);
-}
- eoprobe
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_raise.rb b/test/dtrace/test_raise.rb
deleted file mode 100644
index b56ce750d9..0000000000
--- a/test/dtrace/test_raise.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestRaise < TestCase
- def test_raise
- probe = <<-eoprobe
-ruby$target:::raise
-{
- printf("%s %s %d\\n", copyinstr(arg0), copyinstr(arg1), arg2);
-}
- eoprobe
- trap_probe(probe, program) { |dpath, rbpath, saw|
- saw = saw.map(&:split).find_all { |_, source_file, _|
- source_file == rbpath
- }
- assert_equal 10, saw.length
- saw.each do |klass, _, source_line|
- assert_equal 'RuntimeError', klass
- assert_equal '1', source_line
- end
- }
- end
-
- private
- def program
- '10.times { raise rescue nil }'
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_require.rb b/test/dtrace/test_require.rb
deleted file mode 100644
index 4dc1bdf360..0000000000
--- a/test/dtrace/test_require.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestRequire < TestCase
- def test_require_entry
- probe = <<-eoprobe
-ruby$target:::require-entry
-{
- printf("%s %s %d\\n", copyinstr(arg0), copyinstr(arg1), arg2);
-}
- eoprobe
- trap_probe(probe, ruby_program) { |d_file, rb_file, saw|
- required = saw.map { |s| s.split }.find_all do |(required, _)|
- required == 'dtrace/dummy'
- end
- assert_equal 10, required.length
- }
- end
-
- def test_require_return
- probe = <<-eoprobe
-ruby$target:::require-return
-{
- printf("%s\\n", copyinstr(arg0));
-}
- eoprobe
- end
-
- private
- def ruby_program
- "10.times { require 'dtrace/dummy' }"
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_singleton_function.rb b/test/dtrace/test_singleton_function.rb
deleted file mode 100644
index 4b5d3d7f18..0000000000
--- a/test/dtrace/test_singleton_function.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestSingletonFunctionEntry < TestCase
- def test_entry
- probe = <<-eoprobe
-ruby$target:::method-entry
-/strstr(copyinstr(arg0), "Foo") != NULL/
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row.first == 'Foo' && row[1] == 'foo'
- }
-
- assert_equal 10, foo_calls.length
- line = '2'
- foo_calls.each { |f| assert_equal line, f[3] }
- foo_calls.each { |f| assert_equal rb_file, f[2] }
- }
- end
-
- def test_exit
- probe = <<-eoprobe
-ruby$target:::method-return
-{
- printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
-}
- eoprobe
-
- trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
- foo_calls = probes.map { |line| line.split }.find_all { |row|
- row.first == 'Foo' && row[1] == 'foo'
- }
-
- assert_equal 10, foo_calls.length
- line = '2'
- foo_calls.each { |f| assert_equal line, f[3] }
- foo_calls.each { |f| assert_equal rb_file, f[2] }
- }
- end
-
- def ruby_program
- <<-eoruby
- class Foo
- def self.foo; end
- end
- 10.times { Foo.foo }
- eoruby
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_string.rb b/test/dtrace/test_string.rb
deleted file mode 100644
index 05e8033e39..0000000000
--- a/test/dtrace/test_string.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'dtrace/helper'
-
-module DTrace
- class TestStringProbes < TestCase
- def test_object_create_start_string_lit
- trap_probe(probe, '"omglolwutbbq"') { |_,rbfile,saw|
- saw = saw.map(&:split).find_all { |klass, file, line, len|
- file == rbfile && len == '12' && line == '1'
- }
- assert_equal(%w{ String }, saw.map(&:first))
- assert_equal([rbfile], saw.map { |line| line[1] })
- assert_equal(['1'], saw.map { |line| line[2] })
- }
- end
-
- private
- def probe
- <<-eoprobe
-ruby$target:::string-create
-/arg1/
-{
- printf("String %s %d %d\\n", copyinstr(arg1), arg2, arg0);
-}
- eoprobe
- end
- end
-end if defined?(DTrace::TestCase)
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 89fdbff6eb..05d255623a 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -1,4 +1,3 @@
-# -*- coding: us-ascii -*-
require 'test/unit'
require 'erb'
@@ -38,27 +37,6 @@ class TestERB < Test::Unit::TestCase
}
assert_match(/\Atest filename:1\b/, e.backtrace[0])
end
-
- def test_html_escape
- assert_equal(" !&quot;\#$%&amp;&#39;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
- ERB::Util.html_escape(" !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"))
-
- assert_equal("", ERB::Util.html_escape(""))
- assert_equal("abc", ERB::Util.html_escape("abc"))
- assert_equal("&lt;&lt;", ERB::Util.html_escape("<\<"))
-
- assert_equal("", ERB::Util.html_escape(nil))
- assert_equal("123", ERB::Util.html_escape(123))
- end
-
- def test_concurrent_default_binding
- template1 = 'one <%= ERB.new(template2).result %>'
-
- eval 'template2 = "two"', TOPLEVEL_BINDING
-
- bug7046 = '[ruby-core:47638]'
- assert_equal("one two", ERB.new(template1).result, bug7046)
- end
end
class TestERBCore < Test::Unit::TestCase
@@ -71,13 +49,7 @@ class TestERBCore < Test::Unit::TestCase
_test_core(0)
_test_core(1)
_test_core(2)
- orig = $VERBOSE
- begin
- $VERBOSE = false
- _test_core(3)
- ensure
- $VERBOSE = orig
- end
+ _test_core(3)
end
def _test_core(safe)
@@ -210,26 +182,26 @@ EOS
%n = 1
<%= n%>
EOS
- assert_equal("1\n", ERB.new(src, nil, '%').result(binding))
+ assert_equal("1\n", ERB.new(src, nil, '%').result)
src = <<EOS
<%
%>
EOS
ans = "\n"
- assert_equal(ans, ERB.new(src, nil, '%').result(binding))
+ assert_equal(ans, ERB.new(src, nil, '%').result)
src = "<%\n%>"
# ans = "\n"
ans = ""
- assert_equal(ans, ERB.new(src, nil, '%').result(binding))
+ assert_equal(ans, ERB.new(src, nil, '%').result)
src = <<EOS
<%
n = 1
%><%= n%>
EOS
- assert_equal("1\n", ERB.new(src, nil, '%').result(binding))
+ assert_equal("1\n", ERB.new(src, nil, '%').result)
src = <<EOS
%n = 1
@@ -240,12 +212,12 @@ end%>
%%%
EOS
ans = <<EOS
-%\s
+%
% %%><%0
% %%><%1
%%
EOS
- assert_equal(ans, ERB.new(src, nil, '%').result(binding))
+ assert_equal(ans, ERB.new(src, nil, '%').result)
end
def test_def_erb_method
@@ -328,7 +300,7 @@ EOS
def test_keep_lineno
src = <<EOS
-Hello,\s
+Hello,
% x = "World"
<%= x%>
% raise("lineno")
@@ -344,21 +316,21 @@ EOS
src = <<EOS
%>
-Hello,\s
+Hello,
<% x = "World%%>
"%>
<%= x%>
EOS
ans = <<EOS
-%>Hello,\s
+%>Hello,
World%>
EOS
assert_equal(ans, ERB.new(src, nil, '>').result)
ans = <<EOS
%>
-Hello,\s
+Hello,
World%>
EOS
@@ -366,7 +338,7 @@ EOS
ans = <<EOS
%>
-Hello,\s
+Hello,
World%>
@@ -374,7 +346,7 @@ EOS
assert_equal(ans, ERB.new(src).result)
src = <<EOS
-Hello,\s
+Hello,
<% x = "World%%>
"%>
<%= x%>
@@ -409,7 +381,7 @@ EOS
% y = 'Hello'
<%- x = "World%%>
"-%>
-<%= x %><%- x = nil -%>\s
+<%= x %><%- x = nil -%>
<% raise("lineno") %>
EOS
@@ -445,19 +417,19 @@ NotSkip <%- y = x -%> NotSkip
<%- up = w.upcase -%>
* <%= up %>
<%- end -%>
-KeepNewLine <%- z = nil -%>\s
+KeepNewLine <%- z = nil -%>
EOS
ans = <<EOS
NotSkip NotSkip
* HELLO
* WORLD
- NotSkip\s
+ NotSkip
* hello
* HELLO
* world
* WORLD
-KeepNewLine \s
+KeepNewLine
EOS
assert_equal(ans, ERB.new(src, nil, '-').result)
assert_equal(ans, ERB.new(src, nil, '-%').result)
diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb
index 946be9bdf6..c4db71cdf4 100644
--- a/test/etc/test_etc.rb
+++ b/test/etc/test_etc.rb
@@ -4,9 +4,7 @@ require "etc"
class TestEtc < Test::Unit::TestCase
def test_getlogin
s = Etc.getlogin
- return if s == nil
- assert(s.is_a?(String), "getlogin must return a String or nil")
- assert_predicate(s, :valid_encoding?, "login name should be a valid string")
+ assert(s.is_a?(String) || s == nil, "getlogin must return a String or nil")
end
def test_passwd
@@ -30,18 +28,11 @@ class TestEtc < Test::Unit::TestCase
end
def test_getpwuid
- # password database is not unique on UID, and which entry will be
- # returned by getpwuid() is not specified.
- passwd = Hash.new {[]}
- # on MacOSX, same entries are returned from /etc/passwd and Open
- # Directory.
- Etc.passwd {|s| passwd[s.uid] |= [s]}
- passwd.each_pair do |uid, s|
- assert_include(s, Etc.getpwuid(uid))
- end
- s = passwd[Process.euid]
- unless s.empty?
- assert_include(s, Etc.getpwuid)
+ passwd = {}
+ Etc.passwd {|s| passwd[s.uid] ||= s }
+ passwd.each_value do |s|
+ assert_equal(s, Etc.getpwuid(s.uid))
+ assert_equal(s, Etc.getpwuid) if Process.euid == s.uid
end
end
@@ -78,18 +69,13 @@ class TestEtc < Test::Unit::TestCase
end
def test_getgrgid
- # group database is not unique on GID, and which entry will be
- # returned by getgrgid() is not specified.
- groups = Hash.new {[]}
- # on MacOSX, same entries are returned from /etc/group and Open
- # Directory.
- Etc.group {|s| groups[s.gid] |= [s]}
- groups.each_pair do |gid, s|
- assert_include(s, Etc.getgrgid(gid))
+ groups = {}
+ Etc.group do |s|
+ groups[s.gid] ||= s
end
- s = groups[Process.egid]
- unless s.empty?
- assert_include(s, Etc.getgrgid)
+ groups.each_value do |s|
+ assert_equal(s, Etc.getgrgid(s.gid))
+ assert_equal(s, Etc.getgrgid) if Process.egid == s.gid
end
end
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index 7f8fe131d6..b11f2e40c6 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -1,4 +1,5 @@
require 'minitest/autorun'
+require 'dl'
require 'fiddle'
# FIXME: this is stolen from DL and needs to be refactored.
@@ -27,34 +28,16 @@ when /linux/
libm_so = File.join(libdir, "libm.so.6")
when /mingw/, /mswin/
require "rbconfig"
- libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/).find{|e| /^msvc/ =~ e} + ".dll"
+ libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll"
when /darwin/
libc_so = "/usr/lib/libc.dylib"
libm_so = "/usr/lib/libm.dylib"
when /kfreebsd/
libc_so = "/lib/libc.so.0.1"
libm_so = "/lib/libm.so.1"
-when /gnu/ #GNU/Hurd
- libc_so = "/lib/libc.so.0.3"
- libm_so = "/lib/libm.so.6"
-when /freebsd/
- libc_so = "/lib/libc.so.7"
- libm_so = "/lib/libm.so.5"
when /bsd|dragonfly/
libc_so = "/usr/lib/libc.so"
libm_so = "/usr/lib/libm.so"
-when /solaris/
- libdir = '/lib'
- case [0].pack('L!').size
- when 4
- # 32-bit ruby
- libdir = '/lib' if File.directory? '/lib'
- when 8
- # 64-bit ruby
- libdir = '/lib/64' if File.directory? '/lib/64'
- end
- libc_so = File.join(libdir, "libc.so")
- libm_so = File.join(libdir, "libm.so")
when /aix/
pwd=Dir.pwd
libc_so = libm_so = "#{pwd}/libaixdltest.so"
@@ -109,8 +92,8 @@ Fiddle::LIBM_SO = libm_so
module Fiddle
class TestCase < MiniTest::Unit::TestCase
def setup
- @libc = Fiddle.dlopen(LIBC_SO)
- @libm = Fiddle.dlopen(LIBM_SO)
+ @libc = DL.dlopen(LIBC_SO)
+ @libm = DL.dlopen(LIBM_SO)
end
end
end
diff --git a/test/fiddle/test_c_struct_entry.rb b/test/fiddle/test_c_struct_entry.rb
deleted file mode 100644
index de5449b43d..0000000000
--- a/test/fiddle/test_c_struct_entry.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-begin
- require_relative 'helper'
- require 'fiddle/struct'
-rescue LoadError
-end
-
-module Fiddle
- class TestCStructEntity < TestCase
- def test_class_size
- types = [TYPE_DOUBLE, TYPE_CHAR]
-
- size = CStructEntity.size types
-
- alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
- expected = PackInfo.align 0, alignments[0]
- expected += PackInfo::SIZE_MAP[TYPE_DOUBLE]
-
- expected = PackInfo.align expected, alignments[1]
- expected += PackInfo::SIZE_MAP[TYPE_CHAR]
-
- expected = PackInfo.align expected, alignments.max
-
- assert_equal expected, size
- end
-
- def test_class_size_with_count
- size = CStructEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
- types = [TYPE_DOUBLE, TYPE_CHAR]
- alignments = types.map { |type| PackInfo::ALIGN_MAP[type] }
-
- expected = PackInfo.align 0, alignments[0]
- expected += PackInfo::SIZE_MAP[TYPE_DOUBLE] * 2
-
- expected = PackInfo.align expected, alignments[1]
- expected += PackInfo::SIZE_MAP[TYPE_CHAR] * 20
-
- expected = PackInfo.align expected, alignments.max
-
- assert_equal expected, size
- end
-
- def test_set_ctypes
- union = CStructEntity.malloc [TYPE_INT, TYPE_LONG]
- union.assign_names %w[int long]
-
- # this test is roundabout because the stored ctypes are not accessible
- union['long'] = 1
- union['int'] = 2
-
- assert_equal 1, union['long']
- assert_equal 2, union['int']
- end
-
- def test_aref_pointer_array
- team = CStructEntity.malloc([[TYPE_VOIDP, 2]])
- team.assign_names(["names"])
- alice = Fiddle::Pointer.malloc(6)
- alice[0, 6] = "Alice\0"
- bob = Fiddle::Pointer.malloc(4)
- bob[0, 4] = "Bob\0"
- team["names"] = [alice, bob]
- assert_equal(["Alice", "Bob"], team["names"].map(&:to_s))
- end
-
- def test_aref_pointer
- user = CStructEntity.malloc([TYPE_VOIDP])
- user.assign_names(["name"])
- alice = Fiddle::Pointer.malloc(6)
- alice[0, 6] = "Alice\0"
- user["name"] = alice
- assert_equal("Alice", user["name"].to_s)
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_c_union_entity.rb b/test/fiddle/test_c_union_entity.rb
deleted file mode 100644
index 165c4ecacb..0000000000
--- a/test/fiddle/test_c_union_entity.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-begin
- require_relative 'helper'
- require 'fiddle/struct'
-rescue LoadError
-end
-
-
-module Fiddle
- class TestCUnionEntity < TestCase
- def test_class_size
- size = CUnionEntity.size([TYPE_DOUBLE, TYPE_CHAR])
-
- assert_equal SIZEOF_DOUBLE, size
- end
-
- def test_class_size_with_count
- size = CUnionEntity.size([[TYPE_DOUBLE, 2], [TYPE_CHAR, 20]])
-
- assert_equal SIZEOF_CHAR * 20, size
- end
-
- def test_set_ctypes
- union = CUnionEntity.malloc [TYPE_INT, TYPE_LONG]
- union.assign_names %w[int long]
-
- # this test is roundabout because the stored ctypes are not accessible
- union['long'] = 1
- assert_equal 1, union['long']
-
- union['int'] = 1
- assert_equal 1, union['int']
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_closure.rb b/test/fiddle/test_closure.rb
index 56839e7b63..ae343460f2 100644
--- a/test/fiddle/test_closure.rb
+++ b/test/fiddle/test_closure.rb
@@ -1,7 +1,4 @@
-begin
- require_relative 'helper'
-rescue LoadError
-end
+require_relative 'helper'
module Fiddle
class TestClosure < Fiddle::TestCase
@@ -48,37 +45,5 @@ module Fiddle
func = Function.new(cb, [TYPE_INT], TYPE_INT)
assert_equal 11, func.call(11)
end
-
- def test_memsize
- require 'objspace'
- bug = '[ruby-dev:42480]'
- n = 10000
- assert_equal(n, n.times {ObjectSpace.memsize_of(Closure.allocate)}, bug)
- end
-
- %w[INT SHORT CHAR LONG LONG_LONG].each do |name|
- type = Fiddle.const_get("TYPE_#{name}") rescue next
- size = Fiddle.const_get("SIZEOF_#{name}")
- [[type, size-1, name], [-type, size, "unsigned_"+name]].each do |t, s, n|
- define_method("test_conversion_#{n.downcase}") do
- arg = nil
-
- clos = Class.new(Closure) do
- define_method(:call) {|x| arg = x}
- end.new(t, [t])
-
- v = ~(~0 << (8*s))
-
- arg = nil
- assert_equal(v, clos.call(v))
- assert_equal(arg, v, n)
-
- arg = nil
- func = Function.new(clos, [t], t)
- assert_equal(v, func.call(v))
- assert_equal(arg, v, n)
- end
- end
- end
end
-end if defined?(Fiddle)
+end
diff --git a/test/fiddle/test_cparser.rb b/test/fiddle/test_cparser.rb
deleted file mode 100644
index 666d8c89d6..0000000000
--- a/test/fiddle/test_cparser.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-begin
- require_relative 'helper'
- require 'fiddle/cparser'
-rescue LoadError
-end
-
-module Fiddle
- class TestCParser < TestCase
- include CParser
-
- def test_uint_ctype
- assert_equal(-TYPE_INT, parse_ctype('uint'))
- end
-
- def test_size_t_ctype
- assert_equal(TYPE_SIZE_T, parse_ctype("size_t"))
- end
-
- def test_ssize_t_ctype
- assert_equal(TYPE_SSIZE_T, parse_ctype("ssize_t"))
- end
-
- def test_ptrdiff_t_ctype
- assert_equal(TYPE_PTRDIFF_T, parse_ctype("ptrdiff_t"))
- end
-
- def test_intptr_t_ctype
- assert_equal(TYPE_INTPTR_T, parse_ctype("intptr_t"))
- end
-
- def test_uintptr_t_ctype
- assert_equal(TYPE_UINTPTR_T, parse_ctype("uintptr_t"))
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_fiddle.rb b/test/fiddle/test_fiddle.rb
index 4c6ab97b12..625aaf940d 100644
--- a/test/fiddle/test_fiddle.rb
+++ b/test/fiddle/test_fiddle.rb
@@ -1,9 +1,22 @@
-begin
- require_relative 'helper'
-rescue LoadError
-end
+require_relative 'helper'
class TestFiddle < Fiddle::TestCase
+ def test_constants_match
+ [
+ :TYPE_VOID,
+ :TYPE_VOIDP,
+ :TYPE_CHAR,
+ :TYPE_SHORT,
+ :TYPE_INT,
+ :TYPE_LONG,
+ :TYPE_LONG_LONG,
+ :TYPE_FLOAT,
+ :TYPE_DOUBLE,
+ ].each do |name|
+ assert_equal(DL.const_get(name), Fiddle.const_get(name))
+ end
+ end
+
def test_windows_constant
require 'rbconfig'
if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
@@ -13,4 +26,4 @@ class TestFiddle < Fiddle::TestCase
end
end
-end if defined?(Fiddle)
+end
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb
deleted file mode 100644
index 529aaa8baf..0000000000
--- a/test/fiddle/test_func.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-begin
- require_relative 'helper'
-rescue LoadError
-end
-
-module Fiddle
- class TestFunc < TestCase
- def test_random
- f = Function.new(@libc['srand'], [-TYPE_LONG], TYPE_VOID)
- assert_nil f.call(10)
- end
-
- def test_syscall_with_tainted_string
- f = Function.new(@libc['system'], [TYPE_VOIDP], TYPE_INT)
- assert_raises(SecurityError) do
- Thread.new {
- $SAFE = 1
- f.call("uname -rs".taint)
- }.join
- end
- end
-
- def test_sinf
- begin
- f = Function.new(@libm['sinf'], [TYPE_FLOAT], TYPE_FLOAT)
- rescue Fiddle::DLError
- skip "libm may not have sinf()"
- end
- assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
- end
-
- def test_sin
- f = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
- assert_in_delta 1.0, f.call(90 * Math::PI / 180), 0.0001
- end
-
- def test_string
- stress, GC.stress = GC.stress, true
- f = Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
- buff = "000"
- str = f.call(buff, "123")
- assert_equal("123", buff)
- assert_equal("123", str.to_s)
- ensure
- GC.stress = stress
- end
-
- def test_isdigit
- f = Function.new(@libc['isdigit'], [TYPE_INT], TYPE_INT)
- r1 = f.call(?1.ord)
- r2 = f.call(?2.ord)
- rr = f.call(?r.ord)
- assert_operator r1, :>, 0
- assert_operator r2, :>, 0
- assert_equal 0, rr
- end
-
- def test_atof
- f = Function.new(@libc['atof'], [TYPE_VOIDP], TYPE_DOUBLE)
- r = f.call("12.34")
- assert_includes(12.00..13.00, r)
- end
-
- def test_strtod
- f = Function.new(@libc['strtod'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_DOUBLE)
- buff1 = Pointer["12.34"]
- buff2 = buff1 + 4
- r = f.call(buff1, - buff2)
- assert_in_delta(12.34, r, 0.001)
- end
-
- def test_qsort1
- cb = Class.new(Closure) {
- def call(x, y)
- Pointer.new(x)[0] <=> Pointer.new(y)[0]
- end
- }.new(TYPE_INT, [TYPE_VOIDP, TYPE_VOIDP])
-
- qsort = Function.new(@libc['qsort'],
- [TYPE_VOIDP, TYPE_SIZE_T, TYPE_SIZE_T, TYPE_VOIDP],
- TYPE_VOID)
- buff = "9341"
- qsort.call(buff, buff.size, 1, cb)
- assert_equal("1349", buff)
-
- bug4929 = '[ruby-core:37395]'
- buff = "9341"
- EnvUtil.under_gc_stress {qsort.call(buff, buff.size, 1, cb)}
- assert_equal("1349", buff, bug4929)
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
index f7a49dc6fa..50b214a9e0 100644
--- a/test/fiddle/test_function.rb
+++ b/test/fiddle/test_function.rb
@@ -1,7 +1,4 @@
-begin
- require_relative 'helper'
-rescue LoadError
-end
+require_relative 'helper'
module Fiddle
class TestFunction < Fiddle::TestCase
@@ -15,11 +12,6 @@ module Fiddle
assert_equal Function::DEFAULT, func.abi
end
- def test_name
- func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE, name: 'sin')
- assert_equal 'sin', func.name
- end
-
def test_argument_errors
assert_raises(TypeError) do
Function.new(@libm['sin'], TYPE_DOUBLE, TYPE_DOUBLE)
@@ -71,4 +63,4 @@ module Fiddle
assert_equal("123", str.to_s)
end
end
-end if defined?(Fiddle)
+end
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
deleted file mode 100644
index 7621e1d933..0000000000
--- a/test/fiddle/test_handle.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-begin
- require_relative 'helper'
- require_relative '../ruby/envutil'
-rescue LoadError
-end
-
-module Fiddle
- class TestHandle < TestCase
- include Fiddle
-
- include Test::Unit::Assertions
-
- def test_to_i
- handle = Fiddle::Handle.new(LIBC_SO)
- assert_kind_of Integer, handle.to_i
- end
-
- def test_static_sym_secure
- assert_raises(SecurityError) do
- Thread.new do
- $SAFE = 2
- Fiddle::Handle.sym('calloc')
- end.join
- end
- end
-
- def test_static_sym_unknown
- assert_raises(DLError) { Fiddle::Handle.sym('fooo') }
- assert_raises(DLError) { Fiddle::Handle['fooo'] }
- end
-
- def test_static_sym
- skip "Fiddle::Handle.sym is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM
- begin
- # Linux / Darwin / FreeBSD
- refute_nil Fiddle::Handle.sym('dlopen')
- assert_equal Fiddle::Handle.sym('dlopen'), Fiddle::Handle['dlopen']
- rescue
- # NetBSD
- require 'objspace'
- refute_nil Fiddle::Handle.sym('Init_objspace')
- assert_equal Fiddle::Handle.sym('Init_objspace'), Fiddle::Handle['Init_objspace']
- end
- end
-
- def test_sym_closed_handle
- handle = Fiddle::Handle.new(LIBC_SO)
- handle.close
- assert_raises(DLError) { handle.sym("calloc") }
- assert_raises(DLError) { handle["calloc"] }
- end
-
- def test_sym_unknown
- handle = Fiddle::Handle.new(LIBC_SO)
- assert_raises(DLError) { handle.sym('fooo') }
- assert_raises(DLError) { handle['fooo'] }
- end
-
- def test_sym_with_bad_args
- handle = Handle.new(LIBC_SO)
- assert_raises(TypeError) { handle.sym(nil) }
- assert_raises(TypeError) { handle[nil] }
- end
-
- def test_sym_secure
- assert_raises(SecurityError) do
- Thread.new do
- $SAFE = 2
- handle = Handle.new(LIBC_SO)
- handle.sym('calloc')
- end.join
- end
- end
-
- def test_sym
- handle = Handle.new(LIBC_SO)
- refute_nil handle.sym('calloc')
- refute_nil handle['calloc']
- end
-
- def test_handle_close
- handle = Handle.new(LIBC_SO)
- assert_equal 0, handle.close
- end
-
- def test_handle_close_twice
- handle = Handle.new(LIBC_SO)
- handle.close
- assert_raises(DLError) do
- handle.close
- end
- end
-
- def test_dlopen_returns_handle
- assert_instance_of Handle, dlopen(LIBC_SO)
- end
-
- def test_dlopen_safe
- assert_raises(SecurityError) do
- Thread.new do
- $SAFE = 2
- dlopen(LIBC_SO)
- end.join
- end
- end
-
- def test_initialize_safe
- assert_raises(SecurityError) do
- Thread.new do
- $SAFE = 2
- Handle.new(LIBC_SO)
- end.join
- end
- end
-
- def test_initialize_noargs
- handle = Handle.new
- refute_nil handle['rb_str_new']
- end
-
- def test_initialize_flags
- handle = Handle.new(LIBC_SO, RTLD_LAZY | RTLD_GLOBAL)
- refute_nil handle['calloc']
- end
-
- def test_enable_close
- handle = Handle.new(LIBC_SO)
- assert !handle.close_enabled?, 'close is enabled'
-
- handle.enable_close
- assert handle.close_enabled?, 'close is not enabled'
- end
-
- def test_disable_close
- handle = Handle.new(LIBC_SO)
-
- handle.enable_close
- assert handle.close_enabled?, 'close is enabled'
- handle.disable_close
- assert !handle.close_enabled?, 'close is enabled'
- end
-
- def test_NEXT
- begin
- # Linux / Darwin
- #
- # There are two special pseudo-handles, RTLD_DEFAULT and RTLD_NEXT. The former will find
- # the first occurrence of the desired symbol using the default library search order. The
- # latter will find the next occurrence of a function in the search order after the current
- # library. This allows one to provide a wrapper around a function in another shared
- # library.
- # --- Ubuntu Linux 8.04 dlsym(3)
- handle = Handle::NEXT
- refute_nil handle['malloc']
- rescue
- # BSD
- #
- # If dlsym() is called with the special handle RTLD_NEXT, then the search
- # for the symbol is limited to the shared objects which were loaded after
- # the one issuing the call to dlsym(). Thus, if the function is called
- # from the main program, all the shared libraries are searched. If it is
- # called from a shared library, all subsequent shared libraries are
- # searched. RTLD_NEXT is useful for implementing wrappers around library
- # functions. For example, a wrapper function getpid() could access the
- # "real" getpid() with dlsym(RTLD_NEXT, "getpid"). (Actually, the dlfunc()
- # interface, below, should be used, since getpid() is a function and not a
- # data object.)
- # --- FreeBSD 8.0 dlsym(3)
- require 'objspace'
- handle = Handle::NEXT
- refute_nil handle['Init_objspace']
- end
- end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
- def test_DEFAULT
- skip "Handle::DEFAULT is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM
- handle = Handle::DEFAULT
- refute_nil handle['malloc']
- end unless /mswin|mingw/ =~ RUBY_PLATFORM
-
- def test_dlerror
- # FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
- # getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
- # it calls _nss_cache_cycle_prevention_function with dlsym(3).
- # So our Fiddle::Handle#sym must call dlerror(3) before call dlsym.
- # In general uses of dlerror(3) should call it before use it.
- require 'socket'
- Socket.gethostbyname("localhost")
- Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
- end if /freebsd/=~ RUBY_PLATFORM
-
- def test_no_memory_leak
- assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Handle.allocate}; GC.start', rss: true)
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
deleted file mode 100644
index d06477bfa5..0000000000
--- a/test/fiddle/test_import.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# coding: US-ASCII
-begin
- require_relative 'helper'
- require 'fiddle/import'
-rescue LoadError
-end
-
-module Fiddle
- module LIBC
- extend Importer
- dlload LIBC_SO, LIBM_SO
-
- typealias 'string', 'char*'
- typealias 'FILE*', 'void*'
-
- extern "void *strcpy(char*, char*)"
- extern "int isdigit(int)"
- extern "double atof(string)"
- extern "unsigned long strtoul(char*, char **, int)"
- extern "int qsort(void*, unsigned long, unsigned long, void*)"
- extern "int fprintf(FILE*, char*)"
- extern "int gettimeofday(timeval*, timezone*)" rescue nil
-
- BoundQsortCallback = bind("void *bound_qsort_callback(void*, void*)"){|ptr1,ptr2| ptr1[0] <=> ptr2[0]}
- Timeval = struct [
- "long tv_sec",
- "long tv_usec",
- ]
- Timezone = struct [
- "int tz_minuteswest",
- "int tz_dsttime",
- ]
- MyStruct = struct [
- "short num[5]",
- "char c",
- "unsigned char buff[7]",
- ]
-
- CallCallback = bind("void call_callback(void*, void*)"){ | ptr1, ptr2|
- f = Function.new(ptr1.to_i, [TYPE_VOIDP], TYPE_VOID)
- f.call(ptr2)
- }
- end
-
- class TestImport < TestCase
- def test_ensure_call_dlload
- err = assert_raises(RuntimeError) do
- Class.new do
- extend Importer
- extern "void *strcpy(char*, char*)"
- end
- end
- assert_match(/call dlload before/, err.message)
- end
-
- def test_malloc()
- s1 = LIBC::Timeval.malloc()
- s2 = LIBC::Timeval.malloc()
- refute_equal(s1.to_ptr.to_i, s2.to_ptr.to_i)
- end
-
- def test_sizeof()
- assert_equal(SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
- assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
- assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct.malloc()))
- end
-
- Fiddle.constants.grep(/\ATYPE_(?!VOID\z)(.*)/) do
- type = $&
- size = Fiddle.const_get("SIZEOF_#{$1}")
- name = $1.sub(/P\z/,"*").gsub(/_(?!T\z)/, " ").downcase
- define_method("test_sizeof_#{name}") do
- assert_equal(size, Fiddle::Importer.sizeof(name), type)
- end
- end
-
- def test_unsigned_result()
- d = (2 ** 31) + 1
-
- r = LIBC.strtoul(d.to_s, 0, 0)
- assert_equal(d, r)
- end
-
- def test_io()
- if( RUBY_PLATFORM != BUILD_RUBY_PLATFORM )
- return
- end
- io_in,io_out = IO.pipe()
- LIBC.fprintf(io_out, "hello")
- io_out.flush()
- io_out.close()
- str = io_in.read()
- io_in.close()
- assert_equal("hello", str)
- end
-
- def test_value()
- i = LIBC.value('int', 2)
- assert_equal(2, i.value)
-
- d = LIBC.value('double', 2.0)
- assert_equal(2.0, d.value)
-
- ary = LIBC.value('int[3]', [0,1,2])
- assert_equal([0,1,2], ary.value)
- end
-
- def test_struct()
- s = LIBC::MyStruct.malloc()
- s.num = [0,1,2,3,4]
- s.c = ?a.ord
- s.buff = "012345\377"
- assert_equal([0,1,2,3,4], s.num)
- assert_equal(?a.ord, s.c)
- assert_equal([?0.ord,?1.ord,?2.ord,?3.ord,?4.ord,?5.ord,?\377.ord], s.buff)
- end
-
- def test_gettimeofday()
- if( defined?(LIBC.gettimeofday) )
- timeval = LIBC::Timeval.malloc()
- timezone = LIBC::Timezone.malloc()
- LIBC.gettimeofday(timeval, timezone)
- cur = Time.now()
- assert(cur.to_i - 2 <= timeval.tv_sec && timeval.tv_sec <= cur.to_i)
- end
- end
-
- def test_strcpy()
- buff = "000"
- str = LIBC.strcpy(buff, "123")
- assert_equal("123", buff)
- assert_equal("123", str.to_s)
- end
-
- def test_isdigit
- r1 = LIBC.isdigit(?1.ord)
- r2 = LIBC.isdigit(?2.ord)
- rr = LIBC.isdigit(?r.ord)
- assert_operator(r1, :>, 0)
- assert_operator(r2, :>, 0)
- assert_equal(0, rr)
- end
-
- def test_atof
- r = LIBC.atof("12.34")
- assert_includes(12.00..13.00, r)
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
deleted file mode 100644
index 2ba11b4ed7..0000000000
--- a/test/fiddle/test_pointer.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-begin
- require_relative 'helper'
- require_relative '../ruby/envutil'
-rescue LoadError
-end
-
-module Fiddle
- class TestPointer < TestCase
- def dlwrap arg
- Fiddle.dlwrap arg
- end
-
- include Test::Unit::Assertions
-
- def test_cptr_to_int
- null = Fiddle::NULL
- assert_equal(null.to_i, null.to_int)
- end
-
- def test_malloc_free_func_int
- free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
- assert_equal free.to_i, Fiddle::RUBY_FREE.to_i
-
- ptr = Pointer.malloc(10, free.to_i)
- assert_equal 10, ptr.size
- assert_equal free.to_i, ptr.free.to_i
- end
-
- def test_malloc_free_func
- free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
-
- ptr = Pointer.malloc(10, free)
- assert_equal 10, ptr.size
- assert_equal free.to_i, ptr.free.to_i
- end
-
- def test_to_str
- str = "hello world"
- ptr = Pointer[str]
-
- assert_equal 3, ptr.to_str(3).length
- assert_equal str, ptr.to_str
-
- ptr[5] = 0
- assert_equal "hello\0world", ptr.to_str
- end
-
- def test_to_s
- str = "hello world"
- ptr = Pointer[str]
-
- assert_equal 3, ptr.to_s(3).length
- assert_equal str, ptr.to_s
-
- ptr[5] = 0
- assert_equal 'hello', ptr.to_s
- end
-
- def test_minus
- str = "hello world"
- ptr = Pointer[str]
- assert_equal ptr.to_s, (ptr + 3 - 3).to_s
- end
-
- # TODO: what if the pointer size is 0? raise an exception? do we care?
- def test_plus
- str = "hello world"
- ptr = Pointer[str]
- new_str = ptr + 3
- assert_equal 'lo world', new_str.to_s
- end
-
- def test_inspect
- ptr = Pointer.new(0)
- inspect = ptr.inspect
- assert_match(/size=#{ptr.size}/, inspect)
- assert_match(/free=#{sprintf("%#x", ptr.free.to_i)}/, inspect)
- assert_match(/ptr=#{sprintf("%#x", ptr.to_i)}/, inspect)
- end
-
- def test_to_ptr_string
- str = "hello world"
- ptr = Pointer[str]
- assert ptr.tainted?, 'pointer should be tainted'
- assert_equal str.length, ptr.size
- assert_equal 'hello', ptr[0,5]
- end
-
- def test_to_ptr_io
- buf = Pointer.malloc(10)
- File.open(__FILE__, 'r') do |f|
- ptr = Pointer.to_ptr f
- fread = Function.new(@libc['fread'],
- [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP],
- TYPE_INT)
- fread.call(buf.to_i, Fiddle::SIZEOF_CHAR, buf.size - 1, ptr.to_i)
- end
-
- File.open(__FILE__, 'r') do |f|
- assert_equal f.read(9), buf.to_s
- end
- end
-
- def test_to_ptr_with_ptr
- ptr = Pointer.new 0
- ptr2 = Pointer.to_ptr Struct.new(:to_ptr).new(ptr)
- assert_equal ptr, ptr2
-
- assert_raises(Fiddle::DLError) do
- Pointer.to_ptr Struct.new(:to_ptr).new(nil)
- end
- end
-
- def test_to_ptr_with_num
- ptr = Pointer.new 0
- assert_equal ptr, Pointer[0]
- end
-
- def test_equals
- ptr = Pointer.new 0
- ptr2 = Pointer.new 0
- assert_equal ptr2, ptr
- end
-
- def test_not_equals
- ptr = Pointer.new 0
- refute_equal 10, ptr, '10 should not equal the pointer'
- end
-
- def test_cmp
- ptr = Pointer.new 0
- assert_nil(ptr <=> 10, '10 should not be comparable')
- end
-
- def test_ref_ptr
- ary = [0,1,2,4,5]
- addr = Pointer.new(dlwrap(ary))
- assert_equal addr.to_i, addr.ref.ptr.to_i
-
- assert_equal addr.to_i, (+ (- addr)).to_i
- end
-
- def test_to_value
- ary = [0,1,2,4,5]
- addr = Pointer.new(dlwrap(ary))
- assert_equal ary, addr.to_value
- end
-
- def test_free
- ptr = Pointer.malloc(4)
- assert_nil ptr.free
- end
-
- def test_free=
- assert_normal_exit(<<-"End", '[ruby-dev:39269]')
- require 'fiddle'
- Fiddle::LIBC_SO = #{Fiddle::LIBC_SO.dump}
- Fiddle::LIBM_SO = #{Fiddle::LIBM_SO.dump}
- include Fiddle
- @libc = dlopen(LIBC_SO)
- @libm = dlopen(LIBM_SO)
- free = Fiddle::Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
- ptr = Fiddle::Pointer.malloc(4)
- ptr.free = free
- free.ptr
- ptr.free.ptr
- End
-
- free = Function.new(Fiddle::RUBY_FREE, [TYPE_VOIDP], TYPE_VOID)
- ptr = Pointer.malloc(4)
- ptr.free = free
-
- assert_equal free.ptr, ptr.free.ptr
- end
-
- def test_null?
- ptr = Pointer.new(0)
- assert ptr.null?
- end
-
- def test_size
- ptr = Pointer.malloc(4)
- assert_equal 4, ptr.size
- Fiddle.free ptr.to_i
- end
-
- def test_size=
- ptr = Pointer.malloc(4)
- ptr.size = 10
- assert_equal 10, ptr.size
- Fiddle.free ptr.to_i
- end
-
- def test_aref_aset
- check = Proc.new{|str,ptr|
- assert_equal(str.size(), ptr.size())
- assert_equal(str, ptr.to_s())
- assert_equal(str[0,2], ptr.to_s(2))
- assert_equal(str[0,2], ptr[0,2])
- assert_equal(str[1,2], ptr[1,2])
- assert_equal(str[1,0], ptr[1,0])
- assert_equal(str[0].ord, ptr[0])
- assert_equal(str[1].ord, ptr[1])
- }
- str = 'abc'
- ptr = Pointer[str]
- check.call(str, ptr)
-
- str[0] = "c"
- assert_equal 'c'.ord, ptr[0] = "c".ord
- check.call(str, ptr)
-
- str[0,2] = "aa"
- assert_equal 'aa', ptr[0,2] = "aa"
- check.call(str, ptr)
-
- ptr2 = Pointer['cdeeee']
- str[0,2] = "cd"
- assert_equal ptr2, ptr[0,2] = ptr2
- check.call(str, ptr)
-
- ptr3 = Pointer['vvvv']
- str[0,2] = "vv"
- assert_equal ptr3.to_i, ptr[0,2] = ptr3.to_i
- check.call(str, ptr)
- end
-
- def test_null_pointer
- nullpo = Pointer.new(0)
- assert_raise(DLError) {nullpo[0]}
- assert_raise(DLError) {nullpo[0] = 1}
- end
-
- def test_no_memory_leak
- assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Pointer.allocate}', rss: true)
- end
- end
-end if defined?(Fiddle)
diff --git a/test/fileutils/clobber.rb b/test/fileutils/clobber.rb
index 9f946651bf..b3359e91a4 100644
--- a/test/fileutils/clobber.rb
+++ b/test/fileutils/clobber.rb
@@ -7,8 +7,6 @@ class TestFileUtils < Test::Unit::TestCase
end
module TestFileUtils::Clobber
- include Test::Unit::FileAssertions
-
def my_rm_rf(path)
if File.exist?('/bin/rm')
system %Q[/bin/rm -rf "#{path}"]
diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb
index 0aa139fe16..9b853a6e00 100644
--- a/test/fileutils/fileasserts.rb
+++ b/test/fileutils/fileasserts.rb
@@ -2,9 +2,22 @@
module Test
module Unit
- module FileAssertions
+ module Assertions # redefine
+
+ def _wrap_assertion
+ yield
+ end
+
+ def assert_block(*msgs)
+ assert yield, *msgs.compact
+ end
+
def assert_same_file(from, to, message=nil)
- assert_equal(File.read(from), File.read(to), "file #{from} != #{to}#{message&&': '}#{message||''}")
+ _wrap_assertion {
+ assert_block("file #{from} != #{to}#{message&&': '}#{message||''}") {
+ File.read(from) == File.read(to)
+ }
+ }
end
def assert_same_entry(from, to, message=nil)
@@ -19,52 +32,76 @@ module Test
end
def assert_file_exist(path, message=nil)
- assert(File.exist?(path), "file not exist: #{path}#{message&&': '}#{message||''}")
+ _wrap_assertion {
+ assert_block("file not exist: #{path}#{message&&': '}#{message||''}") {
+ File.exist?(path)
+ }
+ }
end
def assert_file_not_exist(path, message=nil)
- assert(!File.exist?(path), "file exist: #{path}#{message&&': '}#{message||''}")
+ _wrap_assertion {
+ assert_block("file not exist: #{path}#{message&&': '}#{message||''}") {
+ not File.exist?(path)
+ }
+ }
end
def assert_directory(path, message=nil)
- assert(File.directory?(path), "is not directory: #{path}#{message&&': '}#{message||''}")
+ _wrap_assertion {
+ assert_block("is not directory: #{path}#{message&&': '}#{message||''}") {
+ File.directory?(path)
+ }
+ }
end
def assert_symlink(path, message=nil)
- assert(File.symlink?(path), "is not a symlink: #{path}#{message&&': '}#{message||''}")
+ _wrap_assertion {
+ assert_block("is not a symlink: #{path}#{message&&': '}#{message||''}") {
+ File.symlink?(path)
+ }
+ }
end
def assert_not_symlink(path)
- assert(!File.symlink?(path), "is a symlink: #{path}#{message&&': '}#{message||''}")
+ _wrap_assertion {
+ assert_block("is a symlink: #{path}#{message&&': '}#{message||''}") {
+ not File.symlink?(path)
+ }
+ }
end
def assert_equal_time(expected, actual, message=nil)
- expected_str = expected.to_s
- actual_str = actual.to_s
- if expected_str == actual_str
- expected_str << " (nsec=#{expected.nsec})"
- actual_str << " (nsec=#{actual.nsec})"
- end
- full_message = build_message(message, <<EOT)
+ _wrap_assertion {
+ expected_str = expected.to_s
+ actual_str = actual.to_s
+ if expected_str == actual_str
+ expected_str << " (nsec=#{expected.nsec})"
+ actual_str << " (nsec=#{actual.nsec})"
+ end
+ full_message = build_message(message, <<EOT)
<#{expected_str}> expected but was
<#{actual_str}>.
EOT
- assert_equal(expected, actual, full_message)
+ assert_block(full_message) { expected == actual }
+ }
end
def assert_equal_timestamp(expected, actual, message=nil)
- expected_str = expected.to_s
- actual_str = actual.to_s
- if expected_str == actual_str
- expected_str << " (nsec=#{expected.nsec})"
- actual_str << " (nsec=#{actual.nsec})"
- end
- full_message = build_message(message, <<EOT)
+ _wrap_assertion {
+ expected_str = expected.to_s
+ actual_str = actual.to_s
+ if expected_str == actual_str
+ expected_str << " (nsec=#{expected.nsec})"
+ actual_str << " (nsec=#{actual.nsec})"
+ end
+ full_message = build_message(message, <<EOT)
<#{expected_str}> expected but was
<#{actual_str}>.
EOT
- # subsecond timestamp is not portable.
- assert_equal(expected.tv_sec, actual.tv_sec, full_message)
+ # subsecond timestamp is not portable.
+ assert_block(full_message) { expected.tv_sec == actual.tv_sec }
+ }
end
end
diff --git a/test/fileutils/test_dryrun.rb b/test/fileutils/test_dryrun.rb
index 03f6bed387..85badbdb06 100644
--- a/test/fileutils/test_dryrun.rb
+++ b/test/fileutils/test_dryrun.rb
@@ -2,16 +2,26 @@
require 'fileutils'
require 'test/unit'
-require_relative 'visibility_tests'
+require_relative 'clobber'
class TestFileUtilsDryRun < Test::Unit::TestCase
include FileUtils::DryRun
- include TestFileUtils::Visibility
+ include TestFileUtils::Clobber
- def setup
- super
- @fu_module = FileUtils::DryRun
+ def test_visibility
+ FileUtils::METHODS.each do |m|
+ assert_equal true, FileUtils::DryRun.respond_to?(m, true),
+ "FileUtils::DryRun.#{m} not defined"
+ assert_equal true, FileUtils::DryRun.respond_to?(m, false),
+ "FileUtils::DryRun.#{m} not public"
+ end
+ FileUtils::METHODS.each do |m|
+ assert_equal true, respond_to?(m, true),
+ "FileUtils::DryRun\##{m} is not defined"
+ assert_equal true, FileUtils::DryRun.private_method_defined?(m),
+ "FileUtils::DryRun\##{m} is not private"
+ end
end
end
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 22f3e5864e..494204ced5 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -8,7 +8,6 @@ require 'test/unit'
class TestFileUtils < Test::Unit::TestCase
TMPROOT = "#{Dir.tmpdir}/fileutils.rb.#{$$}"
- include Test::Unit::FileAssertions
end
prevdir = Dir.pwd
@@ -105,8 +104,9 @@ class TestFileUtils
end
def teardown
+ tmproot = Dir.pwd
Dir.chdir @prevdir
- my_rm_rf TMPROOT
+ my_rm_rf tmproot
end
@@ -229,32 +229,6 @@ class TestFileUtils
}
end
- def test_cp_preserve_permissions
- bug4507 = '[ruby-core:35518]'
- touch 'tmp/cptmp'
- chmod 0755, 'tmp/cptmp'
- cp 'tmp/cptmp', 'tmp/cptmp2'
- assert_equal(File.stat('tmp/cptmp').mode,
- File.stat('tmp/cptmp2').mode,
- bug4507)
- end
-
- def test_cp_preserve_permissions_dir
- bug7246 = '[ruby-core:48603]'
- mkdir 'tmp/cptmp'
- mkdir 'tmp/cptmp/d1'
- chmod 0745, 'tmp/cptmp/d1'
- mkdir 'tmp/cptmp/d2'
- chmod 0700, 'tmp/cptmp/d2'
- cp_r 'tmp/cptmp', 'tmp/cptmp2', :preserve => true
- assert_equal(File.stat('tmp/cptmp/d1').mode,
- File.stat('tmp/cptmp2/d1').mode,
- bug7246)
- assert_equal(File.stat('tmp/cptmp/d2').mode,
- File.stat('tmp/cptmp2/d2').mode,
- bug7246)
- end
-
def test_cp_symlink
touch 'tmp/cptmp'
# src==dest (2) symlink and its target
@@ -340,19 +314,6 @@ class TestFileUtils
assert_equal 'SLdest', File.readlink('tmp/cpr_dest2/symlink')
end if have_symlink?
- def test_cp_r_symlink_preserve
- mkdir 'tmp/cross'
- mkdir 'tmp/cross/a'
- mkdir 'tmp/cross/b'
- touch 'tmp/cross/a/f'
- touch 'tmp/cross/b/f'
- ln_s '../a/f', 'tmp/cross/b/l'
- ln_s '../b/f', 'tmp/cross/a/l'
- assert_nothing_raised {
- cp_r 'tmp/cross', 'tmp/cross2', :preserve => true
- }
- end if have_symlink?
-
def test_cp_r_pathname
# pathname
touch 'tmp/cprtmp'
@@ -411,12 +372,6 @@ class TestFileUtils
assert_raise(Errno::ELOOP) {
mv 'tmp/symlink', 'tmp/symlink'
}
- # unexist symlink
- File.symlink 'xxx', 'tmp/src'
- assert_nothing_raised {
- mv 'tmp/src', 'tmp/dest'
- }
- assert_equal true, File.symlink?('tmp/dest')
end if have_symlink?
def test_mv_pathname
@@ -927,37 +882,6 @@ class TestFileUtils
assert_equal 0500, File.stat('tmp/a').mode & 0777
end if have_file_perm?
- def test_chmod_symbol_mode
- check_singleton :chmod
-
- touch 'tmp/a'
- chmod "u=wrx,g=,o=", 'tmp/a'
- assert_equal 0700, File.stat('tmp/a').mode & 0777
- chmod "u=rx,go=", 'tmp/a'
- assert_equal 0500, File.stat('tmp/a').mode & 0777
- chmod "+wrx", 'tmp/a'
- assert_equal 0777, File.stat('tmp/a').mode & 0777
- chmod "u+s,o=s", 'tmp/a'
- assert_equal 04770, File.stat('tmp/a').mode & 07777
- chmod "u-w,go-wrx", 'tmp/a'
- assert_equal 04500, File.stat('tmp/a').mode & 07777
- chmod "+s", 'tmp/a'
- assert_equal 06500, File.stat('tmp/a').mode & 07777
-
- # FreeBSD ufs and tmpfs don't allow to change sticky bit against
- # regular file. It's slightly strange. Anyway it's no effect bit.
- # see /usr/src/sys/ufs/ufs/ufs_chmod()
- # NetBSD, OpenBSD and Solaris also denies it.
- if /freebsd|netbsd|openbsd|solaris/ !~ RUBY_PLATFORM
- chmod "u+t,o+t", 'tmp/a'
- assert_equal 07500, File.stat('tmp/a').mode & 07777
- chmod "a-t,a-s", 'tmp/a'
- assert_equal 0500, File.stat('tmp/a').mode & 07777
- end
-
- end if have_file_perm?
-
-
def test_chmod_R
check_singleton :chmod_R
@@ -976,61 +900,6 @@ class TestFileUtils
chmod_R 0700, 'tmp/dir' # to remove
end if have_file_perm?
- def test_chmod_symbol_mode_R
- check_singleton :chmod_R
-
- mkdir_p 'tmp/dir/dir'
- touch %w( tmp/dir/file tmp/dir/dir/file )
- chmod_R "u=wrx,g=,o=", 'tmp/dir'
- assert_equal 0700, File.stat('tmp/dir').mode & 0777
- assert_equal 0700, File.stat('tmp/dir/file').mode & 0777
- assert_equal 0700, File.stat('tmp/dir/dir').mode & 0777
- assert_equal 0700, File.stat('tmp/dir/dir/file').mode & 0777
- chmod_R "u=xr,g+X,o=", 'tmp/dir'
- assert_equal 0510, File.stat('tmp/dir').mode & 0777
- assert_equal 0500, File.stat('tmp/dir/file').mode & 0777
- assert_equal 0510, File.stat('tmp/dir/dir').mode & 0777
- assert_equal 0500, File.stat('tmp/dir/dir/file').mode & 0777
- chmod_R 0700, 'tmp/dir' # to remove
- end if have_file_perm?
-
- def test_chmod_verbose
- check_singleton :chmod
-
- stderr_back = $stderr
- read, $stderr = IO.pipe
- th = Thread.new { read.read }
-
- touch 'tmp/a'
- chmod 0700, 'tmp/a', verbose: true
- assert_equal 0700, File.stat('tmp/a').mode & 0777
- chmod 0500, 'tmp/a', verbose: true
- assert_equal 0500, File.stat('tmp/a').mode & 0777
-
- $stderr.close
- lines = th.value.lines.map {|l| l.chomp }
- assert_equal(["chmod 700 tmp/a", "chmod 500 tmp/a"], lines)
- ensure
- $stderr = stderr_back if stderr_back
- end if have_file_perm?
-
- def test_s_chmod_verbose
- output_back = FileUtils.instance_variable_get(:@fileutils_output)
- read, write = IO.pipe
- FileUtils.instance_variable_set(:@fileutils_output, write)
- th = Thread.new { read.read }
-
- touch 'tmp/a'
- FileUtils.chmod 0700, 'tmp/a', verbose: true
- assert_equal 0700, File.stat('tmp/a').mode & 0777
-
- write.close
- lines = th.value.lines.map {|l| l.chomp }
- assert_equal(["chmod 700 tmp/a"], lines)
- ensure
- FileUtils.instance_variable_set(:@fileutils_output, output_back) if output_back
- end if have_file_perm?
-
# FIXME: How can I test this method?
def test_chown
check_singleton :chown
@@ -1175,29 +1044,7 @@ class TestFileUtils
uptodate? 'tmp/a', ['tmp/b', Pathname.new('tmp/c')]
uptodate? Pathname.new('tmp/a'), [Pathname.new('tmp/b'), Pathname.new('tmp/c')]
}
- # [Bug #6708] [ruby-core:46256]
- assert_raises_with_message(ArgumentError, "wrong number of arguments (3 for 2)") {
- uptodate?('new',['old', 'oldest'], {})
- }
- end
-
- def assert_raises_with_message(klass, message)
- begin
- yield
- flunk("Expected Exception #{klass} didn't raise")
- rescue klass => ex
- if message.kind_of? String
- flag = !!(ex.message == message)
- assert(flag, "Expected Exception(#{klass}) was raised, but the message doesn't match")
- elsif message.kind_of? Regexp
- flag = !!(ex.message =~ message)
- assert(flag, "Expected Exception(#{klass}) was raised, but the message doesn't match")
- else
- raise
- end
- end
end
- private :assert_raises_with_message
def test_cd
check_singleton :cd
diff --git a/test/fileutils/test_nowrite.rb b/test/fileutils/test_nowrite.rb
index 946eed3b6c..8ca9e89fa7 100644
--- a/test/fileutils/test_nowrite.rb
+++ b/test/fileutils/test_nowrite.rb
@@ -2,16 +2,25 @@
require 'fileutils'
require 'test/unit'
-require_relative 'visibility_tests'
+require_relative 'clobber'
class TestFileUtilsNoWrite < Test::Unit::TestCase
include FileUtils::NoWrite
- include TestFileUtils::Visibility
+ include TestFileUtils::Clobber
- def setup
- super
- @fu_module = FileUtils::NoWrite
+ def test_visibility
+ FileUtils::METHODS.each do |m|
+ assert_equal true, FileUtils::NoWrite.respond_to?(m, true),
+ "FileUtils::NoWrite.#{m} is not defined"
+ assert_equal true, FileUtils::NoWrite.respond_to?(m, false),
+ "FileUtils::NoWrite.#{m} is not public"
+ end
+ FileUtils::METHODS.each do |m|
+ assert_equal true, respond_to?(m, true),
+ "FileUtils::NoWrite\##{m} is not defined"
+ assert_equal true, FileUtils::NoWrite.private_method_defined?(m),
+ "FileUtils::NoWrite\##{m} is not private"
+ end
end
-
end
diff --git a/test/fileutils/test_verbose.rb b/test/fileutils/test_verbose.rb
index fb069bcf14..e60e85ea4e 100644
--- a/test/fileutils/test_verbose.rb
+++ b/test/fileutils/test_verbose.rb
@@ -2,16 +2,24 @@
require 'test/unit'
require 'fileutils'
-require_relative 'visibility_tests'
class TestFileUtilsVerbose < Test::Unit::TestCase
include FileUtils::Verbose
- include TestFileUtils::Visibility
- def setup
- super
- @fu_module = FileUtils::Verbose
+ def test_visibility
+ FileUtils::METHODS.each do |m|
+ assert_equal true, FileUtils::Verbose.respond_to?(m, true),
+ "FileUtils::Verbose.#{m} is not defined"
+ assert_equal true, FileUtils::Verbose.respond_to?(m, false),
+ "FileUtils::Verbose.#{m} is not public"
+ end
+ FileUtils::METHODS.each do |m|
+ assert_equal true, respond_to?(m, true),
+ "FileUtils::Verbose.#{m} is not defined"
+ assert_equal true, FileUtils::Verbose.private_method_defined?(m),
+ "FileUtils::Verbose.#{m} is not private"
+ end
end
end
diff --git a/test/fileutils/visibility_tests.rb b/test/fileutils/visibility_tests.rb
deleted file mode 100644
index a140614674..0000000000
--- a/test/fileutils/visibility_tests.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'test/unit'
-require 'fileutils'
-
-class TestFileUtils < Test::Unit::TestCase
-end
-
-##
-# These tests are reused in the FileUtils::Verbose, FileUtils::NoWrite and
-# FileUtils::DryRun tests
-
-module TestFileUtils::Visibility
-
- FileUtils::METHODS.each do |m|
- define_method "test_singleton_visibility_#{m}" do
- assert @fu_module.respond_to?(m, true),
- "FileUtils::Verbose.#{m} is not defined"
- assert @fu_module.respond_to?(m, false),
- "FileUtils::Verbose.#{m} is not public"
- end
-
- define_method "test_visibility_#{m}" do
- assert respond_to?(m, true),
- "FileUtils::Verbose\##{m} is not defined"
- assert @fu_module.private_method_defined?(m),
- "FileUtils::Verbose\##{m} is not private"
- end
- end
-
- FileUtils::StreamUtils_.private_instance_methods.each do |m|
- define_method "test_singleton_visibility_#{m}" do
- assert @fu_module.respond_to?(m, true),
- "FileUtils::Verbose\##{m} is not defined"
- end
-
- define_method "test_visibility_#{m}" do
- assert respond_to?(m, true),
- "FileUtils::Verbose\##{m} is not defined"
- end
- end
-
-end
diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb
index 38d97c1605..27e2019d1d 100644
--- a/test/gdbm/test_gdbm.rb
+++ b/test/gdbm/test_gdbm.rb
@@ -10,8 +10,8 @@ if defined? GDBM
require 'tmpdir'
require 'fileutils'
- class TestGDBM_RDONLY < Test::Unit::TestCase
- def TestGDBM_RDONLY.uname_s
+ class TestGDBM < Test::Unit::TestCase
+ def TestGDBM.uname_s
require 'rbconfig'
case RbConfig::CONFIG['target_os']
when 'cygwin'
@@ -31,6 +31,7 @@ if defined? GDBM
@tmpdir = Dir.mktmpdir("tmptest_gdbm")
@prefix = "tmptest_gdbm_#{$$}"
@path = "#{@tmpdir}/#{@prefix}_"
+ assert_instance_of(GDBM, @gdbm = GDBM.new(@path))
# prepare to make readonly GDBM file
GDBM.open("#{@tmpdir}/#{@prefix}_rdonly", 0400) {|gdbm|
@@ -39,35 +40,8 @@ if defined? GDBM
assert_instance_of(GDBM, @gdbm_rdonly = GDBM.new("#{@tmpdir}/#{@prefix}_rdonly", nil))
end
def teardown
- assert_nil(@gdbm_rdonly.close)
- ObjectSpace.each_object(GDBM) do |obj|
- obj.close unless obj.closed?
- end
- FileUtils.remove_entry_secure @tmpdir
- end
-
- def test_delete_rdonly
- if /^CYGWIN_9/ !~ SYSTEM
- assert_raise(GDBMError) {
- @gdbm_rdonly.delete("foo")
- }
-
- assert_nil(@gdbm_rdonly.delete("bar"))
- end
- end
- end
-
- class TestGDBM < Test::Unit::TestCase
- SYSTEM = TestGDBM_RDONLY::SYSTEM
-
- def setup
- @tmpdir = Dir.mktmpdir("tmptest_gdbm")
- @prefix = "tmptest_gdbm_#{$$}"
- @path = "#{@tmpdir}/#{@prefix}_"
- assert_instance_of(GDBM, @gdbm = GDBM.new(@path))
- end
- def teardown
assert_nil(@gdbm.close)
+ assert_nil(@gdbm_rdonly.close)
ObjectSpace.each_object(GDBM) do |obj|
obj.close unless obj.closed?
end
@@ -118,8 +92,8 @@ if defined? GDBM
end
end
def test_s_open_no_create
- skip "gdbm_open(GDBM_WRITER) is broken on libgdbm 1.8.0" if /1\.8\.0/ =~ GDBM::VERSION
- assert_nil(gdbm = GDBM.open("#{@tmpdir}/#{@prefix}", nil))
+ assert_nil(gdbm = GDBM.open("#{@tmpdir}/#{@prefix}", nil),
+ "this test is failed on libgdbm 1.8.0")
ensure
gdbm.close if gdbm
end
@@ -147,14 +121,14 @@ if defined? GDBM
def test_s_open_lock
return unless have_fork? # snip this test
pid = fork() {
- assert_instance_of(GDBM, GDBM.open("#{@tmpdir}/#{@prefix}", 0644))
+ assert_instance_of(GDBM, gdbm = GDBM.open("#{@tmpdir}/#{@prefix}", 0644))
sleep 2
}
begin
sleep 1
assert_raise(Errno::EWOULDBLOCK) {
begin
- assert_instance_of(GDBM, GDBM.open("#{@tmpdir}/#{@prefix}", 0644))
+ assert_instance_of(GDBM, gdbm2 = GDBM.open("#{@tmpdir}/#{@prefix}", 0644))
rescue Errno::EAGAIN, Errno::EACCES
raise Errno::EWOULDBLOCK
end
@@ -187,7 +161,7 @@ if defined? GDBM
return unless have_fork? # snip this test
pid = fork() {
- assert_instance_of(GDBM, GDBM.open("#{@tmpdir}/#{@prefix}", 0644,
+ assert_instance_of(GDBM, gdbm = GDBM.open("#{@tmpdir}/#{@prefix}", 0644,
GDBM::NOLOCK))
sleep 2
}
@@ -202,10 +176,10 @@ if defined? GDBM
gdbm2.close if gdbm2
end
- STDERR.puts Dir.glob("#{@tmpdir}/#{@prefix}*") if $DEBUG
+ p Dir.glob("#{@tmpdir}/#{@prefix}*") if $DEBUG
pid = fork() {
- assert_instance_of(GDBM, GDBM.open("#{@tmpdir}/#{@prefix}", 0644))
+ assert_instance_of(GDBM, gdbm = GDBM.open("#{@tmpdir}/#{@prefix}", 0644))
sleep 2
}
begin
@@ -464,8 +438,15 @@ if defined? GDBM
assert_equal(2, @gdbm.size)
assert_nil(@gdbm.delete(key))
- end
+ if /^CYGWIN_9/ !~ SYSTEM
+ assert_raise(GDBMError) {
+ @gdbm_rdonly.delete("foo")
+ }
+
+ assert_nil(@gdbm_rdonly.delete("bar"))
+ end
+ end
def test_delete_with_block
key = 'no called block'
@gdbm[key] = 'foo'
@@ -686,8 +667,6 @@ if defined? GDBM
end
def test_writer_open_notexist
- skip "gdbm_open(GDBM_WRITER) is broken on libgdbm 1.8.0" if /1\.8\.0/ =~ GDBM::VERSION
-
assert_raise(Errno::ENOENT) {
GDBM.open("#{@tmproot}/a", 0666, GDBM::WRITER)
}
diff --git a/test/iconv/test_basic.rb b/test/iconv/test_basic.rb
new file mode 100644
index 0000000000..2575b22eb9
--- /dev/null
+++ b/test/iconv/test_basic.rb
@@ -0,0 +1,59 @@
+require File.expand_path("../utils.rb", __FILE__)
+
+class TestIconv::Basic < TestIconv
+ def test_euc2sjis
+ iconv = Iconv.open('SHIFT_JIS', 'EUC-JP')
+ str = iconv.iconv(EUCJ_STR)
+ str << iconv.iconv(nil)
+ assert_equal(SJIS_STR, str)
+ iconv.close
+ end
+
+ def test_close
+ iconv = Iconv.new('Shift_JIS', 'EUC-JP')
+ output = ""
+ begin
+ output += iconv.iconv(EUCJ_STR)
+ output += iconv.iconv(nil)
+ ensure
+ assert_respond_to(iconv, :close)
+ assert_equal("", iconv.close)
+ assert_equal(SJIS_STR, output)
+ end
+ end
+
+ def test_open_without_block
+ assert_respond_to(Iconv, :open)
+ iconv = Iconv.open('SHIFT_JIS', 'EUC-JP')
+ str = iconv.iconv(EUCJ_STR)
+ str << iconv.iconv(nil)
+ assert_equal(SJIS_STR, str )
+ iconv.close
+ end
+
+ def test_open_with_block
+ input = "#{EUCJ_STR}\n"*2
+ output = ""
+ Iconv.open("Shift_JIS", "EUC-JP") do |cd|
+ input.each_line do |s|
+ output << cd.iconv(s)
+ end
+ output << cd.iconv(nil)
+ end
+ assert_equal("#{SJIS_STR}\n"*2, output)
+ end
+
+ def test_invalid_arguments
+ assert_raise(TypeError) { Iconv.new(nil, 'Shift_JIS') }
+ assert_raise(TypeError) { Iconv.new('Shift_JIS', nil) }
+ assert_raise(TypeError) { Iconv.open(nil, 'Shift_JIS') }
+ assert_raise(TypeError) { Iconv.open('Shift_JIS', nil) }
+ end
+
+ def test_unknown_encoding
+ assert_raise(Iconv::InvalidEncoding) { Iconv.iconv("utf-8", "X-UKNOWN", "heh") }
+ assert_raise(Iconv::InvalidEncoding, '[ruby-dev:39487]') {
+ Iconv.iconv("X-UNKNOWN-1", "X-UNKNOWN-2") {break}
+ }
+ end
+end if defined?(TestIconv)
diff --git a/test/iconv/test_option.rb b/test/iconv/test_option.rb
new file mode 100644
index 0000000000..b210fa498a
--- /dev/null
+++ b/test/iconv/test_option.rb
@@ -0,0 +1,43 @@
+require File.expand_path("../utils.rb", __FILE__)
+
+class TestIconv::Option < TestIconv
+ def test_ignore_option
+ begin
+ iconv = Iconv.new('SHIFT_JIS', 'EUC-JP')
+ iconv.transliterate?
+ rescue NotImplementedError
+ return
+ end
+ iconv = Iconv.new('SHIFT_JIS', 'EUC-JP//ignore')
+ str = iconv.iconv(EUCJ_STR)
+ str << iconv.iconv(nil)
+ assert_equal(SJIS_STR, str)
+ iconv.close
+
+ iconv = Iconv.new('SHIFT_JIS//IGNORE', 'EUC-JP//ignore')
+ str = iconv.iconv(EUCJ_STR)
+ str << iconv.iconv(nil)
+ assert_equal(SJIS_STR, str)
+ iconv.close
+ end
+
+ def test_translit_option
+ begin
+ iconv = Iconv.new('SHIFT_JIS', 'EUC-JP')
+ iconv.transliterate?
+ rescue NotImplementedError
+ return
+ end
+ iconv = Iconv.new('SHIFT_JIS', 'EUC-JP//ignore')
+ str = iconv.iconv(EUCJ_STR)
+ str << iconv.iconv(nil)
+ assert_equal(SJIS_STR, str)
+ iconv.close
+
+ iconv = Iconv.new('SHIFT_JIS//TRANSLIT', 'EUC-JP//translit//ignore')
+ str = iconv.iconv(EUCJ_STR)
+ str << iconv.iconv(nil)
+ assert_equal(SJIS_STR, str)
+ iconv.close
+ end
+end if false and defined?(TestIconv)
diff --git a/test/iconv/test_partial.rb b/test/iconv/test_partial.rb
new file mode 100644
index 0000000000..a98960b070
--- /dev/null
+++ b/test/iconv/test_partial.rb
@@ -0,0 +1,41 @@
+require File.expand_path("../utils.rb", __FILE__)
+
+class TestIconv::Partial < TestIconv
+ def test_partial_ascii
+ c = Iconv.open(ASCII, ASCII)
+ ref = '[ruby-core:17092]'
+ rescue
+ return
+ else
+ assert_equal("abc", c.iconv("abc"))
+ assert_equal("c", c.iconv("abc", 2), "#{ref}: with start")
+ assert_equal("c", c.iconv("abc", 2, 1), "#{ref}: with start, length")
+ assert_equal("c", c.iconv("abc", 2, 5), "#{ref}: with start, longer length")
+ assert_equal("bc", c.iconv("abc", -2), "#{ref}: with nagative start")
+ assert_equal("b", c.iconv("abc", -2, 1), "#{ref}: with nagative start, length")
+ assert_equal("bc", c.iconv("abc", -2, 5), "#{ref}: with nagative start, longer length")
+ assert_equal("", c.iconv("abc", 5), "#{ref}: with OOB")
+ assert_equal("", c.iconv("abc", 5, 2), "#{ref}: with OOB, length")
+ ensure
+ c.close if c
+ end
+
+ def test_partial_euc2sjis
+ c = Iconv.open('SHIFT_JIS', 'EUC-JP')
+ rescue
+ return
+ else
+ assert_equal(SJIS_STR[0, 2], c.iconv(EUCJ_STR, 0, 2))
+ assert_equal(SJIS_STR, c.iconv(EUCJ_STR, 0, 20))
+ assert_equal(SJIS_STR[2..-1], c.iconv(EUCJ_STR, 2))
+ assert_equal(SJIS_STR[2, 2], c.iconv(EUCJ_STR, 2, 2))
+ assert_equal(SJIS_STR[2..-1], c.iconv(EUCJ_STR, 2, 20))
+ assert_equal(SJIS_STR[-4..-1], c.iconv(EUCJ_STR, -4))
+ assert_equal(SJIS_STR[-4, 2], c.iconv(EUCJ_STR, -4, 2))
+ assert_equal(SJIS_STR[-4..-1], c.iconv(EUCJ_STR, -4, 20))
+ assert_equal("", c.iconv(EUCJ_STR, 20))
+ assert_equal("", c.iconv(EUCJ_STR, 20, 2))
+ ensure
+ c.close
+ end
+end if defined?(TestIconv)
diff --git a/test/iconv/utils.rb b/test/iconv/utils.rb
new file mode 100644
index 0000000000..bc75deb173
--- /dev/null
+++ b/test/iconv/utils.rb
@@ -0,0 +1,26 @@
+begin
+ require 'iconv'
+rescue LoadError
+else
+ require 'test/unit'
+end
+
+class TestIconv < ::Test::Unit::TestCase
+ if defined?(::Encoding) and String.method_defined?(:force_encoding)
+ def self.encode(str, enc)
+ str.force_encoding(enc)
+ end
+ else
+ def self.encode(str, enc)
+ str
+ end
+ end
+
+ def default_test
+ self.class == TestIconv or super
+ end
+
+ ASCII = "ascii"
+ EUCJ_STR = encode("\xa4\xa2\xa4\xa4\xa4\xa6\xa4\xa8\xa4\xaa", "EUC-JP").freeze
+ SJIS_STR = encode("\x82\xa0\x82\xa2\x82\xa4\x82\xa6\x82\xa8", "Shift_JIS").freeze
+end if defined?(::Iconv)
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
deleted file mode 100644
index 65514f2b81..0000000000
--- a/test/io/console/test_io_console.rb
+++ /dev/null
@@ -1,294 +0,0 @@
-begin
- require 'io/console'
- require 'test/unit'
- require 'pty'
-rescue LoadError
-end
-require_relative '../../ruby/envutil'
-
-class TestIO_Console < Test::Unit::TestCase
- Bug6116 = '[ruby-dev:45309]'
-
- def test_raw
- helper {|m, s|
- s.print "abc\n"
- assert_equal("abc\r\n", m.gets)
- assert_send([s, :echo?])
- s.raw {
- assert_not_send([s, :echo?], Bug6116)
- s.print "def\n"
- assert_equal("def\n", m.gets)
- }
- assert_send([s, :echo?])
- s.print "ghi\n"
- assert_equal("ghi\r\n", m.gets)
- }
- end
-
- def test_raw_minchar
- len = 0
- th = nil
- helper {|m, s|
- assert_equal([nil, 0], [s.getch(min: 0), len])
- main = Thread.current
- go = false
- th = Thread.start {
- len += 1
- m.print("a")
- m.flush
- sleep 0.01 until go and main.stop?
- len += 10
- m.print("1234567890")
- m.flush
- }
- assert_equal(["a", 1], [s.getch(min: 1), len])
- go = true
- assert_equal(["1", 11], [s.getch, len])
- }
- ensure
- th.kill if th and th.alive?
- end
-
- def test_raw_timeout
- len = 0
- th = nil
- helper {|m, s|
- assert_equal([nil, 0], [s.getch(min: 0, time: 0.1), len])
- main = Thread.current
- th = Thread.start {
- sleep 0.01 until main.stop?
- len += 2
- m.print("ab")
- }
- assert_equal(["a", 2], [s.getch(min: 1, time: 1), len])
- assert_equal(["b", 2], [s.getch(time: 1), len])
- }
- ensure
- th.kill if th and th.alive?
- end
-
- def test_cooked
- helper {|m, s|
- assert_send([s, :echo?])
- s.raw {
- s.print "abc\n"
- assert_equal("abc\n", m.gets)
- assert_not_send([s, :echo?], Bug6116)
- s.cooked {
- assert_send([s, :echo?])
- s.print "def\n"
- assert_equal("def\r\n", m.gets)
- }
- assert_not_send([s, :echo?], Bug6116)
- }
- assert_send([s, :echo?])
- s.print "ghi\n"
- assert_equal("ghi\r\n", m.gets)
- }
- end
-
- def test_echo
- helper {|m, s|
- assert_send([s, :echo?])
- m.print "a"
- assert_equal("a", m.readpartial(10))
- }
- end
-
- def test_noecho
- helper {|m, s|
- s.noecho {
- assert_not_send([s, :echo?])
- m.print "a"
- sleep 0.1
- }
- m.print "b"
- assert_equal("b", m.readpartial(10))
- }
- end
-
- def test_noecho2
- helper {|m, s|
- assert_send([s, :echo?])
- m.print "a\n"
- sleep 0.1
- s.print "b\n"
- sleep 0.1
- assert_equal("a\r\nb\r\n", m.readpartial(10))
- assert_equal("a\n", s.readpartial(10))
- s.noecho {
- assert_not_send([s, :echo?])
- m.print "a\n"
- s.print "b\n"
- assert_equal("b\r\n", m.readpartial(10))
- assert_equal("a\n", s.readpartial(10))
- }
- assert_send([s, :echo?])
- m.print "a\n"
- sleep 0.1
- s.print "b\n"
- sleep 0.1
- assert_equal("a\r\nb\r\n", m.readpartial(10))
- assert_equal("a\n", s.readpartial(10))
- }
- end
-
- def test_setecho
- helper {|m, s|
- assert_send([s, :echo?])
- s.echo = false
- m.print "a"
- sleep 0.1
- s.echo = true
- m.print "b"
- assert_equal("b", m.readpartial(10))
- }
- end
-
- def test_setecho2
- helper {|m, s|
- assert_send([s, :echo?])
- m.print "a\n"
- sleep 0.1
- s.print "b\n"
- sleep 0.1
- assert_equal("a\r\nb\r\n", m.readpartial(10))
- assert_equal("a\n", s.readpartial(10))
- s.echo = false
- assert_not_send([s, :echo?])
- m.print "a\n"
- s.print "b\n"
- assert_equal("b\r\n", m.readpartial(10))
- assert_equal("a\n", s.readpartial(10))
- s.echo = true
- assert_send([s, :echo?])
- m.print "a\n"
- sleep 0.1
- s.print "b\n"
- sleep 0.1
- assert_equal("a\r\nb\r\n", m.readpartial(10))
- assert_equal("a\n", s.readpartial(10))
- }
- end
-
- def test_iflush
- helper {|m, s|
- m.print "a"
- s.iflush
- m.print "b\n"
- assert_equal("b\n", s.readpartial(10))
- }
- end
-
- def test_oflush
- helper {|m, s|
- s.print "a"
- s.oflush # oflush may be issued after "a" is already sent.
- s.print "b"
- assert_include(["b", "ab"], m.readpartial(10))
- }
- end
-
- def test_ioflush
- helper {|m, s|
- m.print "a"
- s.ioflush
- m.print "b\n"
- assert_equal("b\n", s.readpartial(10))
- }
- end
-
- def test_ioflush2
- helper {|m, s|
- s.print "a"
- s.ioflush # ioflush may be issued after "a" is already sent.
- s.print "b"
- assert_include(["b", "ab"], m.readpartial(10))
- }
- end
-
- def test_winsize
- helper {|m, s|
- begin
- assert_equal([0, 0], s.winsize)
- rescue Errno::EINVAL # OpenSolaris 2009.06 TIOCGWINSZ causes Errno::EINVAL before TIOCSWINSZ.
- end
- }
- end
-
- if IO.console
- def test_sync
- assert(IO.console.sync, "console should be unbuffered")
- end
- else
- def test_sync
- r, w, pid = PTY.spawn(EnvUtil.rubybin, "-rio/console", "-e", "p IO.console.class")
- rescue RuntimeError
- skip $!
- else
- con = r.gets.chomp
- Process.wait(pid)
- assert_match("File", con)
- end
- end
-
- private
- def helper
- m, s = PTY.open
- rescue RuntimeError
- skip $!
- else
- yield m, s
- ensure
- m.close if m
- s.close if s
- end
-end if defined?(PTY) and defined?(IO::console)
-
-class TestIO_Console < Test::Unit::TestCase
- case
- when Process.respond_to?(:daemon)
- noctty = [EnvUtil.rubybin, "-e", "Process.daemon(true)"]
- when !(rubyw = RbConfig::CONFIG["RUBYW_INSTALL_NAME"]).empty?
- dir, base = File.split(EnvUtil.rubybin)
- noctty = [File.join(dir, base.sub(/ruby/, rubyw))]
- end
-
- if noctty
- require 'tempfile'
- NOCTTY = noctty
- def test_noctty
- t = Tempfile.new("console")
- t.close
- t2 = Tempfile.new("console")
- t2.close
- cmd = NOCTTY + [
- '--disable=gems',
- '-rio/console',
- '-e', 'open(ARGV[0], "w") {|f| f.puts IO.console.inspect}',
- '-e', 'File.unlink(ARGV[1])',
- '--', t.path, t2.path]
- system(*cmd)
- sleep 0.1 while File.exist?(t2.path)
- t.open
- assert_equal("nil", t.gets.chomp)
- ensure
- t.close! if t and !t.closed?
- t2.close!
- end
- end
-end if defined?(IO.console)
-
-class TestIO_Console < Test::Unit::TestCase
- def test_stringio_getch
- assert_separately %w"--disable=gems -rstringio -rio/console", %q{
- assert_operator(StringIO, :method_defined?, :getch)
- }
- assert_separately %w"--disable=gems -rio/console -rstringio", %q{
- assert_operator(StringIO, :method_defined?, :getch)
- }
- assert_separately %w"--disable=gems -rstringio", %q{
- assert_not_operator(StringIO, :method_defined?, :getch)
- }
- end
-end
diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb
index b031c71bf8..5dc55a67fe 100644
--- a/test/io/nonblock/test_flush.rb
+++ b/test/io/nonblock/test_flush.rb
@@ -41,6 +41,5 @@ class TestIONonblock < Test::Unit::TestCase
assert_nothing_raised {t.join}
}
assert_equal(4097, result.size)
- true
end
end if IO.method_defined?(:nonblock)
diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb
index 46097e00c6..4aad7cd106 100644
--- a/test/io/wait/test_io_wait.rb
+++ b/test/io/wait/test_io_wait.rb
@@ -1,7 +1,5 @@
-# -*- coding: us-ascii -*-
require 'test/unit'
require 'timeout'
-require 'socket'
begin
require 'io/wait'
rescue LoadError
@@ -10,11 +8,7 @@ end
class TestIOWait < Test::Unit::TestCase
def setup
- if /mswin|mingw/ =~ RUBY_PLATFORM
- @r, @w = Socket.pair(Socket::AF_INET, Socket::SOCK_STREAM, 0)
- else
- @r, @w = IO.pipe
- end
+ @r, @w = IO.pipe
end
def teardown
@@ -25,7 +19,6 @@ class TestIOWait < Test::Unit::TestCase
def test_nread
assert_equal 0, @r.nread
@w.syswrite "."
- sleep 0.1
assert_equal 1, @r.nread
end
@@ -36,10 +29,9 @@ class TestIOWait < Test::Unit::TestCase
end
def test_ready?
- refute @r.ready?, "shouldn't ready, but ready"
+ refute @r.ready?
@w.syswrite "."
- sleep 0.1
- assert @r.ready?, "should ready, but not"
+ assert @r.ready?
end
def test_buffered_ready?
@@ -51,7 +43,6 @@ class TestIOWait < Test::Unit::TestCase
def test_wait
assert_nil @r.wait(0)
@w.syswrite "."
- sleep 0.1
assert_equal @r, @r.wait(0)
end
@@ -70,39 +61,4 @@ class TestIOWait < Test::Unit::TestCase
Thread.new { sleep 0.01; @w.close }
assert_nil @r.wait
end
-
- def test_wait_writable
- assert_equal @w, @w.wait_writable
- end
-
- def test_wait_writable_timeout
- assert_equal @w, @w.wait_writable(0.01)
- written = fill_pipe
- assert_nil @w.wait_writable(0.01)
- @r.read(written)
- assert_equal @w, @w.wait_writable(0.01)
- end
-
- def test_wait_writable_EPIPE
- fill_pipe
- @r.close
- assert_equal @w, @w.wait_writable
- end
-
- def test_wait_writable_closed
- @w.close
- assert_raises(IOError) { @w.wait_writable }
- end
-
-private
-
- def fill_pipe
- written = 0
- buf = " " * 4096
- begin
- written += @w.write_nonblock(buf)
- rescue Errno::EAGAIN, Errno::EWOULDBLOCK
- return written
- end while true
- end
end if IO.method_defined?(:wait)
diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb
deleted file mode 100644
index e8baa0d8f5..0000000000
--- a/test/irb/test_completion.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'test/unit'
-require_relative '../ruby/envutil'
-
-module TestIRB
- class TestCompletion < Test::Unit::TestCase
- def test_nonstring_module_name
- begin
- require "irb/completion"
- bug5938 = '[ruby-core:42244]'
- cmds = %W[-rirb -rirb/completion -e IRB.setup(__FILE__)
- -e IRB.conf[:MAIN_CONTEXT]=IRB::Irb.new.context
- -e module\sFoo;def\sself.name;//;end;end
- -e IRB::InputCompletor::CompletionProc.call("[1].first.")
- -- -f --]
- status = assert_in_out_err(cmds, "", //, [], bug5938)
- assert(status.success?, bug5938)
- rescue LoadError
- skip "cannot load irb/completion"
- end
- end
- end
-end
diff --git a/test/json/fixtures/fail18.json b/test/json/fixtures/fail18.json
index ebc11eb4c2..e2d130c6eb 100644
--- a/test/json/fixtures/fail18.json
+++ b/test/json/fixtures/fail18.json
@@ -1 +1 @@
-[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
diff --git a/test/json/setup_variant.rb b/test/json/setup_variant.rb
deleted file mode 100644
index 2dab184bc4..0000000000
--- a/test/json/setup_variant.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-case ENV['JSON']
-when 'pure'
- $:.unshift 'lib'
- require 'json/pure'
-when 'ext'
- $:.unshift 'ext', 'lib'
- require 'json/ext'
-else
- $:.unshift 'ext', 'lib'
- require 'json'
-end
diff --git a/test/json/test_json.rb b/test/json/test_json.rb
index 6af6b32208..4cf5972b58 100755
--- a/test/json/test_json.rb
+++ b/test/json/test_json.rb
@@ -1,11 +1,13 @@
#!/usr/bin/env ruby
-# encoding: utf-8
+# -*- coding: utf-8 -*-
require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
require 'stringio'
-require 'tempfile'
-require 'ostruct'
unless Array.method_defined?(:permutation)
begin
@@ -21,7 +23,7 @@ unless Array.method_defined?(:permutation)
end
end
-class TestJSON < Test::Unit::TestCase
+class TC_JSON < Test::Unit::TestCase
include JSON
def setup
@@ -106,46 +108,6 @@ class TestJSON < Test::Unit::TestCase
assert_equal({ "a" => 0.23 }, parse(' { "a" : 0.23 } '))
end
- def test_parse_json_primitive_values
- assert_raise(JSON::ParserError) { JSON.parse('') }
- assert_raise(JSON::ParserError) { JSON.parse('', :quirks_mode => true) }
- assert_raise(TypeError) { JSON::Parser.new(nil).parse }
- assert_raise(TypeError) { JSON::Parser.new(nil, :quirks_mode => true).parse }
- assert_raise(TypeError) { JSON.parse(nil) }
- assert_raise(TypeError) { JSON.parse(nil, :quirks_mode => true) }
- assert_raise(JSON::ParserError) { JSON.parse(' /* foo */ ') }
- assert_raise(JSON::ParserError) { JSON.parse(' /* foo */ ', :quirks_mode => true) }
- parser = JSON::Parser.new('null')
- assert_equal false, parser.quirks_mode?
- assert_raise(JSON::ParserError) { parser.parse }
- assert_raise(JSON::ParserError) { JSON.parse('null') }
- assert_equal nil, JSON.parse('null', :quirks_mode => true)
- parser = JSON::Parser.new('null', :quirks_mode => true)
- assert_equal true, parser.quirks_mode?
- assert_equal nil, parser.parse
- assert_raise(JSON::ParserError) { JSON.parse('false') }
- assert_equal false, JSON.parse('false', :quirks_mode => true)
- assert_raise(JSON::ParserError) { JSON.parse('true') }
- assert_equal true, JSON.parse('true', :quirks_mode => true)
- assert_raise(JSON::ParserError) { JSON.parse('23') }
- assert_equal 23, JSON.parse('23', :quirks_mode => true)
- assert_raise(JSON::ParserError) { JSON.parse('1') }
- assert_equal 1, JSON.parse('1', :quirks_mode => true)
- assert_raise(JSON::ParserError) { JSON.parse('3.141') }
- assert_in_delta 3.141, JSON.parse('3.141', :quirks_mode => true), 1E-3
- assert_raise(JSON::ParserError) { JSON.parse('18446744073709551616') }
- assert_equal 2 ** 64, JSON.parse('18446744073709551616', :quirks_mode => true)
- assert_raise(JSON::ParserError) { JSON.parse('"foo"') }
- assert_equal 'foo', JSON.parse('"foo"', :quirks_mode => true)
- assert_raise(JSON::ParserError) { JSON.parse('NaN', :allow_nan => true) }
- assert JSON.parse('NaN', :quirks_mode => true, :allow_nan => true).nan?
- assert_raise(JSON::ParserError) { JSON.parse('Infinity', :allow_nan => true) }
- assert JSON.parse('Infinity', :quirks_mode => true, :allow_nan => true).infinite?
- assert_raise(JSON::ParserError) { JSON.parse('-Infinity', :allow_nan => true) }
- assert JSON.parse('-Infinity', :quirks_mode => true, :allow_nan => true).infinite?
- assert_raise(JSON::ParserError) { JSON.parse('[ 1, ]', :quirks_mode => true) }
- end
-
if Array.method_defined?(:permutation)
def test_parse_more_complex_arrays
a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
@@ -192,68 +154,16 @@ class TestJSON < Test::Unit::TestCase
assert_equal(@ary,
parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]]'\
',[false],[true]]'))
- assert_equal(@ary, parse(%Q{ [ [1] , ["foo"] , [3.14] \t , [47.11e+2]\s
+ assert_equal(@ary, parse(%Q{ [ [1] , ["foo"] , [3.14] \t , [47.11e+2]
, [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ] }))
end
- class SubArray < Array
- def <<(v)
- @shifted = true
- super
- end
-
- def shifted?
- @shifted
- end
- end
-
- class SubArray2 < Array
- def to_json(*a)
- {
- JSON.create_id => self.class.name,
- 'ary' => to_a,
- }.to_json(*a)
- end
-
- def self.json_create(o)
- o.delete JSON.create_id
- o['ary']
- end
- end
-
- class SubArrayWrapper
- def initialize
- @data = []
- end
-
- attr_reader :data
-
- def [](index)
- @data[index]
- end
-
- def <<(value)
- @data << value
- @shifted = true
- end
-
- def shifted?
- @shifted
- end
- end
+ class SubArray < Array; end
- def test_parse_array_custom_array_derived_class
- res = parse('[1,2]', :array_class => SubArray)
- assert_equal([1,2], res)
+ def test_parse_array_custom_class
+ res = parse('[]', :array_class => SubArray)
+ assert_equal([], res)
assert_equal(SubArray, res.class)
- assert res.shifted?
- end
-
- def test_parse_array_custom_non_array_derived_class
- res = parse('[1,2]', :array_class => SubArrayWrapper)
- assert_equal([1,2], res.data)
- assert_equal(SubArrayWrapper, res.class)
- assert res.shifted?
end
def test_parse_object
@@ -263,93 +173,12 @@ class TestJSON < Test::Unit::TestCase
assert_equal({'foo'=>'bar'}, parse(' { "foo" : "bar" } '))
end
- class SubHash < Hash
- def []=(k, v)
- @item_set = true
- super
- end
-
- def item_set?
- @item_set
- end
- end
-
- class SubHash2 < Hash
- def to_json(*a)
- {
- JSON.create_id => self.class.name,
- }.merge(self).to_json(*a)
- end
-
- def self.json_create(o)
- o.delete JSON.create_id
- self[o]
- end
- end
-
- class SubOpenStruct < OpenStruct
- def [](k)
- __send__(k)
- end
-
- def []=(k, v)
- @item_set = true
- __send__("#{k}=", v)
- end
+ class SubHash < Hash; end
- def item_set?
- @item_set
- end
- end
-
- def test_parse_object_custom_hash_derived_class
- res = parse('{"foo":"bar"}', :object_class => SubHash)
- assert_equal({"foo" => "bar"}, res)
+ def test_parse_object_custom_class
+ res = parse('{}', :object_class => SubHash)
+ assert_equal({}, res)
assert_equal(SubHash, res.class)
- assert res.item_set?
- end
-
- def test_parse_object_custom_non_hash_derived_class
- res = parse('{"foo":"bar"}', :object_class => SubOpenStruct)
- assert_equal "bar", res.foo
- assert_equal(SubOpenStruct, res.class)
- assert res.item_set?
- end
-
- def test_parse_generic_object
- res = parse('{"foo":"bar", "baz":{}}', :object_class => JSON::GenericObject)
- assert_equal(JSON::GenericObject, res.class)
- assert_equal "bar", res.foo
- assert_equal "bar", res["foo"]
- assert_equal "bar", res[:foo]
- assert_equal "bar", res.to_hash[:foo]
- assert_equal(JSON::GenericObject, res.baz.class)
- end
-
- def test_generate_core_subclasses_with_new_to_json
- obj = SubHash2["foo" => SubHash2["bar" => true]]
- obj_json = JSON(obj)
- obj_again = JSON.parse(obj_json, :create_additions => true)
- assert_kind_of SubHash2, obj_again
- assert_kind_of SubHash2, obj_again['foo']
- assert obj_again['foo']['bar']
- assert_equal obj, obj_again
- assert_equal ["foo"], JSON(JSON(SubArray2["foo"]), :create_additions => true)
- end
-
- def test_generate_core_subclasses_with_default_to_json
- assert_equal '{"foo":"bar"}', JSON(SubHash["foo" => "bar"])
- assert_equal '["foo"]', JSON(SubArray["foo"])
- end
-
- def test_generate_of_core_subclasses
- obj = SubHash["foo" => SubHash["bar" => true]]
- obj_json = JSON(obj)
- obj_again = JSON(obj_json)
- assert_kind_of Hash, obj_again
- assert_kind_of Hash, obj_again['foo']
- assert obj_again['foo']['bar']
- assert_equal obj, obj_again
end
def test_parser_reset
@@ -446,12 +275,12 @@ EOT
assert_raises(JSON::NestingError) { JSON.parse '[[]]', :max_nesting => 1 }
assert_raises(JSON::NestingError) { JSON.parser.new('[[]]', :max_nesting => 1).parse }
assert_equal [[]], JSON.parse('[[]]', :max_nesting => 2)
- too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
+ too_deep = '[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]'
too_deep_ary = eval too_deep
assert_raises(JSON::NestingError) { JSON.parse too_deep }
assert_raises(JSON::NestingError) { JSON.parser.new(too_deep).parse }
- assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 100 }
- ok = JSON.parse too_deep, :max_nesting => 101
+ assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 19 }
+ ok = JSON.parse too_deep, :max_nesting => 20
assert_equal too_deep_ary, ok
ok = JSON.parse too_deep, :max_nesting => nil
assert_equal too_deep_ary, ok
@@ -462,8 +291,8 @@ EOT
assert_raises(JSON::NestingError) { JSON.generate [[]], :max_nesting => 1 }
assert_equal '[[]]', JSON.generate([[]], :max_nesting => 2)
assert_raises(JSON::NestingError) { JSON.generate too_deep_ary }
- assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 }
- ok = JSON.generate too_deep_ary, :max_nesting => 101
+ assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 19 }
+ ok = JSON.generate too_deep_ary, :max_nesting => 20
assert_equal too_deep, ok
ok = JSON.generate too_deep_ary, :max_nesting => nil
assert_equal too_deep, ok
@@ -480,38 +309,19 @@ EOT
JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
end
- def test_load
- assert_equal @hash, JSON.load(@json)
- tempfile = Tempfile.open('json')
- tempfile.write @json
- tempfile.rewind
- assert_equal @hash, JSON.load(tempfile)
- stringio = StringIO.new(@json)
- stringio.rewind
- assert_equal @hash, JSON.load(stringio)
- assert_equal nil, JSON.load(nil)
- assert_equal nil, JSON.load('')
- end
-
- def test_load_with_options
- small_hash = JSON("foo" => 'bar')
- symbol_hash = { :foo => 'bar' }
- assert_equal symbol_hash, JSON.load(small_hash, nil, :symbolize_names => true)
- end
-
- def test_dump
- too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
+ def test_load_dump
+ too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]'
assert_equal too_deep, JSON.dump(eval(too_deep))
assert_kind_of String, Marshal.dump(eval(too_deep))
- assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 100) }
- assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 100) }
- assert_equal too_deep, JSON.dump(eval(too_deep), 101)
- assert_kind_of String, Marshal.dump(eval(too_deep), 101)
+ assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 19) }
+ assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 19) }
+ assert_equal too_deep, JSON.dump(eval(too_deep), 20)
+ assert_kind_of String, Marshal.dump(eval(too_deep), 20)
output = StringIO.new
JSON.dump(eval(too_deep), output)
assert_equal too_deep, output.string
output = StringIO.new
- JSON.dump(eval(too_deep), output, 101)
+ JSON.dump(eval(too_deep), output, 20)
assert_equal too_deep, output.string
end
@@ -528,18 +338,10 @@ EOT
assert_equal orig, JSON[json5][0]
end
- if defined?(JSON::Ext::Parser)
- def test_allocate
- parser = JSON::Ext::Parser.new("{}")
- assert_raise(TypeError, '[ruby-core:35079]') {parser.__send__(:initialize, "{}")}
- parser = JSON::Ext::Parser.allocate
- assert_raise(TypeError, '[ruby-core:35079]') {parser.source}
- end
+ def test_allocate
+ json = JSON::Parser.new("{}")
+ assert_raises(TypeError, '[ruby-core:35079]') {json.__send__(:initialize, "{}")}
+ json = JSON::Parser.allocate
+ assert_raises(TypeError, '[ruby-core:35079]') {json.source}
end
-
- def test_argument_encoding
- source = "{}".force_encoding("ascii-8bit")
- JSON::Parser.new(source)
- assert_equal Encoding::ASCII_8BIT, source.encoding
- end if defined?(Encoding::ASCII_8BIT)
end
diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb
index a30f06addd..844cd4f7ae 100755
--- a/test/json/test_json_addition.rb
+++ b/test/json/test_json_addition.rb
@@ -2,15 +2,15 @@
# -*- coding:utf-8 -*-
require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
require 'json/add/core'
-require 'json/add/complex'
-require 'json/add/rational'
-require 'json/add/bigdecimal'
-require 'json/add/ostruct'
require 'date'
-class TestJSONAddition < Test::Unit::TestCase
+class TC_JSONAddition < Test::Unit::TestCase
include JSON
class A
@@ -23,7 +23,7 @@ class TestJSONAddition < Test::Unit::TestCase
def ==(other)
a == other.a
end
-
+
def self.json_create(object)
new(*object['args'])
end
@@ -36,15 +36,6 @@ class TestJSONAddition < Test::Unit::TestCase
end
end
- class A2 < A
- def to_json(*args)
- {
- 'json_class' => self.class.name,
- 'args' => [ @a ],
- }.to_json(*args)
- end
- end
-
class B
def self.json_creatable?
false
@@ -64,7 +55,7 @@ class TestJSONAddition < Test::Unit::TestCase
def to_json(*args)
{
- 'json_class' => 'TestJSONAddition::Nix',
+ 'json_class' => 'TC_JSONAddition::Nix',
}.to_json(*args)
end
end
@@ -73,19 +64,11 @@ class TestJSONAddition < Test::Unit::TestCase
a = A.new(666)
assert A.json_creatable?
json = generate(a)
- a_again = JSON.parse(json, :create_additions => true)
+ a_again = JSON.parse(json)
assert_kind_of a.class, a_again
assert_equal a, a_again
end
- def test_extended_json_default
- a = A.new(666)
- assert A.json_creatable?
- json = generate(a)
- a_hash = JSON.parse(json)
- assert_kind_of Hash, a_hash
- end
-
def test_extended_json_disabled
a = A.new(666)
assert A.json_creatable?
@@ -96,7 +79,7 @@ class TestJSONAddition < Test::Unit::TestCase
a_hash = JSON.parse(json, :create_additions => false)
assert_kind_of Hash, a_hash
assert_equal(
- {"args"=>[666], "json_class"=>"TestJSONAddition::A"}.sort_by { |k,| k },
+ {"args"=>[666], "json_class"=>"TC_JSONAddition::A"}.sort_by { |k,| k },
a_hash.sort_by { |k,| k }
)
end
@@ -105,14 +88,14 @@ class TestJSONAddition < Test::Unit::TestCase
b = B.new
assert !B.json_creatable?
json = generate(b)
- assert_equal({ "json_class"=>"TestJSONAddition::B" }, JSON.parse(json))
+ assert_equal({ "json_class"=>"TC_JSONAddition::B" }, JSON.parse(json))
end
def test_extended_json_fail2
c = C.new
assert !C.json_creatable?
json = generate(c)
- assert_raises(ArgumentError, NameError) { JSON.parse(json, :create_additions => true) }
+ assert_raises(ArgumentError, NameError) { JSON.parse(json) }
end
def test_raw_strings
@@ -127,10 +110,10 @@ class TestJSONAddition < Test::Unit::TestCase
json_raw_object = raw.to_json_raw_object
hash = { 'json_class' => 'String', 'raw'=> raw_array }
assert_equal hash, json_raw_object
- assert_match(/\A\{.*\}\z/, json)
- assert_match(/"json_class":"String"/, json)
- assert_match(/"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json)
- raw_again = JSON.parse(json, :create_additions => true)
+ assert_match /\A\{.*\}\Z/, json
+ assert_match /"json_class":"String"/, json
+ assert_match /"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json
+ raw_again = JSON.parse(json)
assert_equal raw, raw_again
end
@@ -138,17 +121,17 @@ class TestJSONAddition < Test::Unit::TestCase
def test_core
t = Time.now
- assert_equal t, JSON(JSON(t), :create_additions => true)
+ assert_equal t.inspect, JSON(JSON(t)).inspect
d = Date.today
- assert_equal d, JSON(JSON(d), :create_additions => true)
+ assert_equal d, JSON(JSON(d))
d = DateTime.civil(2007, 6, 14, 14, 57, 10, Rational(1, 12), 2299161)
- assert_equal d, JSON(JSON(d), :create_additions => true)
- assert_equal 1..10, JSON(JSON(1..10), :create_additions => true)
- assert_equal 1...10, JSON(JSON(1...10), :create_additions => true)
- assert_equal "a".."c", JSON(JSON("a".."c"), :create_additions => true)
- assert_equal "a"..."c", JSON(JSON("a"..."c"), :create_additions => true)
+ assert_equal d, JSON(JSON(d))
+ assert_equal 1..10, JSON(JSON(1..10))
+ assert_equal 1...10, JSON(JSON(1...10))
+ assert_equal "a".."c", JSON(JSON("a".."c"))
+ assert_equal "a"..."c", JSON(JSON("a"..."c"))
s = MyJsonStruct.new 4711, 'foot'
- assert_equal s, JSON(JSON(s), :create_additions => true)
+ assert_equal s, JSON(JSON(s))
struct = Struct.new :foo, :bar
s = struct.new 4711, 'foot'
assert_raises(JSONError) { JSON(s) }
@@ -156,41 +139,24 @@ class TestJSONAddition < Test::Unit::TestCase
raise TypeError, "test me"
rescue TypeError => e
e_json = JSON.generate e
- e_again = JSON e_json, :create_additions => true
+ e_again = JSON e_json
assert_kind_of TypeError, e_again
assert_equal e.message, e_again.message
assert_equal e.backtrace, e_again.backtrace
end
- assert_equal(/foo/, JSON(JSON(/foo/), :create_additions => true))
- assert_equal(/foo/i, JSON(JSON(/foo/i), :create_additions => true))
+ assert_equal(/foo/, JSON(JSON(/foo/)))
+ assert_equal(/foo/i, JSON(JSON(/foo/i)))
end
def test_utc_datetime
now = Time.now
- d = DateTime.parse(now.to_s, :create_additions => true) # usual case
- assert_equal d, JSON.parse(d.to_json, :create_additions => true)
+ d = DateTime.parse(now.to_s) # usual case
+ assert_equal d, JSON.parse(d.to_json)
d = DateTime.parse(now.utc.to_s) # of = 0
- assert_equal d, JSON.parse(d.to_json, :create_additions => true)
+ assert_equal d, JSON.parse(d.to_json)
d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
- assert_equal d, JSON.parse(d.to_json, :create_additions => true)
+ assert_equal d, JSON.parse(d.to_json)
d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
- assert_equal d, JSON.parse(d.to_json, :create_additions => true)
- end
-
- def test_rational_complex
- assert_equal Rational(2, 9), JSON.parse(JSON(Rational(2, 9)), :create_additions => true)
- assert_equal Complex(2, 9), JSON.parse(JSON(Complex(2, 9)), :create_additions => true)
- end
-
- def test_bigdecimal
- assert_equal BigDecimal('3.141', 23), JSON(JSON(BigDecimal('3.141', 23)), :create_additions => true)
- assert_equal BigDecimal('3.141', 666), JSON(JSON(BigDecimal('3.141', 666)), :create_additions => true)
- end
-
- def test_ostruct
- o = OpenStruct.new
- # XXX this won't work; o.foo = { :bar => true }
- o.foo = { 'bar' => true }
- assert_equal o, JSON.parse(JSON(o), :create_additions => true)
+ assert_equal d, JSON.parse(d.to_json)
end
end
diff --git a/test/json/test_json_encoding.rb b/test/json/test_json_encoding.rb
index fa7d878920..fdea329605 100644
--- a/test/json/test_json_encoding.rb
+++ b/test/json/test_json_encoding.rb
@@ -1,30 +1,33 @@
#!/usr/bin/env ruby
-# encoding: utf-8
+# -*- coding: utf-8 -*-
require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
+require 'iconv'
-class TestJSONEncoding < Test::Unit::TestCase
+class TC_JSONEncoding < Test::Unit::TestCase
include JSON
def setup
@utf_8 = '["© ≠ €!"]'
@parsed = [ "© ≠ €!" ]
+ @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first)
@generated = '["\u00a9 \u2260 \u20ac!"]'
- if String.method_defined?(:encode)
- @utf_16_data = [@parsed.first.encode('utf-16be', 'utf-8')]
+ if defined?(::Encoding)
@utf_8_ascii_8bit = @utf_8.dup.force_encoding(Encoding::ASCII_8BIT)
- @utf_16be = @utf_8.encode('utf-16be', 'utf-8')
+ @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
@utf_16be_ascii_8bit = @utf_16be.dup.force_encoding(Encoding::ASCII_8BIT)
- @utf_16le = @utf_8.encode('utf-16le', 'utf-8')
+ @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8)
@utf_16le_ascii_8bit = @utf_16le.dup.force_encoding(Encoding::ASCII_8BIT)
- @utf_32be = @utf_8.encode('utf-32be', 'utf-8')
+ @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8)
@utf_32be_ascii_8bit = @utf_32be.dup.force_encoding(Encoding::ASCII_8BIT)
- @utf_32le = @utf_8.encode('utf-32le', 'utf-8')
+ @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8)
@utf_32le_ascii_8bit = @utf_32le.dup.force_encoding(Encoding::ASCII_8BIT)
else
- require 'iconv'
- @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first)
@utf_8_ascii_8bit = @utf_8.dup
@utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
@utf_16be_ascii_8bit = @utf_16be.dup
diff --git a/test/json/test_json_fixtures.rb b/test/json/test_json_fixtures.rb
index 584dffdfdb..95e57ebfdc 100755
--- a/test/json/test_json_fixtures.rb
+++ b/test/json/test_json_fixtures.rb
@@ -1,10 +1,14 @@
#!/usr/bin/env ruby
-# encoding: utf-8
+# -*- coding: utf-8 -*-
require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
-class TestJSONFixtures < Test::Unit::TestCase
+class TC_JSONFixtures < Test::Unit::TestCase
def setup
fixtures = File.join(File.dirname(__FILE__), 'fixtures/*.json')
passed, failed = Dir[fixtures].partition { |f| f['pass'] }
@@ -14,20 +18,15 @@ class TestJSONFixtures < Test::Unit::TestCase
def test_passing
for name, source in @passed
- begin
- assert JSON.parse(source),
- "Did not pass for fixture '#{name}': #{source.inspect}"
- rescue => e
- warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
- raise e
- end
+ assert JSON.parse(source),
+ "Did not pass for fixture '#{name}'"
end
end
def test_failing
for name, source in @failed
assert_raises(JSON::ParserError, JSON::NestingError,
- "Did not fail for fixture '#{name}': #{source.inspect}") do
+ "Did not fail for fixture '#{name}'") do
JSON.parse(source)
end
end
diff --git a/test/json/test_json_generate.rb b/test/json/test_json_generate.rb
index 1c8f0bc968..26ca1adcf9 100755
--- a/test/json/test_json_generate.rb
+++ b/test/json/test_json_generate.rb
@@ -1,10 +1,14 @@
#!/usr/bin/env ruby
-# encoding: utf-8
+# -*- coding: utf-8 -*-
require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
-class TestJSONGenerate < Test::Unit::TestCase
+class TC_JSONGenerate < Test::Unit::TestCase
include JSON
def setup
@@ -43,8 +47,6 @@ EOT
def test_generate
json = generate(@hash)
assert_equal(JSON.parse(@json2), JSON.parse(json))
- json = JSON[@hash]
- assert_equal(JSON.parse(@json2), JSON.parse(json))
parsed_json = parse(json)
assert_equal(@hash, parsed_json)
json = generate({1=>2})
@@ -52,12 +54,10 @@ EOT
parsed_json = parse(json)
assert_equal({"1"=>2}, parsed_json)
assert_raise(GeneratorError) { generate(666) }
- assert_equal '666', generate(666, :quirks_mode => true)
end
def test_generate_pretty
json = pretty_generate(@hash)
- # hashes aren't (insertion) ordered on every ruby implementation assert_equal(@json3, json)
assert_equal(JSON.parse(@json3), JSON.parse(json))
parsed_json = parse(json)
assert_equal(@hash, parsed_json)
@@ -70,7 +70,6 @@ EOT
parsed_json = parse(json)
assert_equal({"1"=>2}, parsed_json)
assert_raise(GeneratorError) { pretty_generate(666) }
- assert_equal '666', pretty_generate(666, :quirks_mode => true)
end
def test_fast_generate
@@ -83,23 +82,6 @@ EOT
parsed_json = parse(json)
assert_equal({"1"=>2}, parsed_json)
assert_raise(GeneratorError) { fast_generate(666) }
- assert_equal '666', fast_generate(666, :quirks_mode => true)
- end
-
- def test_own_state
- state = State.new
- json = generate(@hash, state)
- assert_equal(JSON.parse(@json2), JSON.parse(json))
- parsed_json = parse(json)
- assert_equal(@hash, parsed_json)
- json = generate({1=>2}, state)
- assert_equal('{"1":2}', json)
- parsed_json = parse(json)
- assert_equal({"1"=>2}, parsed_json)
- assert_raise(GeneratorError) { generate(666, state) }
- state.quirks_mode = true
- assert state.quirks_mode?
- assert_equal '666', generate(666, state)
end
def test_states
@@ -120,57 +102,6 @@ EOT
assert s[:check_circular?]
end
- def test_pretty_state
- state = PRETTY_STATE_PROTOTYPE.dup
- assert_equal({
- :allow_nan => false,
- :array_nl => "\n",
- :ascii_only => false,
- :buffer_initial_length => 1024,
- :quirks_mode => false,
- :depth => 0,
- :indent => " ",
- :max_nesting => 100,
- :object_nl => "\n",
- :space => " ",
- :space_before => "",
- }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
- end
-
- def test_safe_state
- state = SAFE_STATE_PROTOTYPE.dup
- assert_equal({
- :allow_nan => false,
- :array_nl => "",
- :ascii_only => false,
- :buffer_initial_length => 1024,
- :quirks_mode => false,
- :depth => 0,
- :indent => "",
- :max_nesting => 100,
- :object_nl => "",
- :space => "",
- :space_before => "",
- }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
- end
-
- def test_fast_state
- state = FAST_STATE_PROTOTYPE.dup
- assert_equal({
- :allow_nan => false,
- :array_nl => "",
- :ascii_only => false,
- :buffer_initial_length => 1024,
- :quirks_mode => false,
- :depth => 0,
- :indent => "",
- :max_nesting => 0,
- :object_nl => "",
- :space => "",
- :space_before => "",
- }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
- end
-
def test_allow_nan
assert_raises(GeneratorError) { generate([JSON::NaN]) }
assert_equal '[NaN]', generate([JSON::NaN], :allow_nan => true)
@@ -188,114 +119,4 @@ EOT
assert_raises(GeneratorError) { pretty_generate([JSON::MinusInfinity]) }
assert_equal "[\n -Infinity\n]", pretty_generate([JSON::MinusInfinity], :allow_nan => true)
end
-
- def test_depth
- ary = []; ary << ary
- assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth
- assert_raises(JSON::NestingError) { JSON.generate(ary) }
- assert_equal 0, JSON::SAFE_STATE_PROTOTYPE.depth
- assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth
- assert_raises(JSON::NestingError) { JSON.pretty_generate(ary) }
- assert_equal 0, JSON::PRETTY_STATE_PROTOTYPE.depth
- s = JSON.state.new
- assert_equal 0, s.depth
- assert_raises(JSON::NestingError) { ary.to_json(s) }
- assert_equal 100, s.depth
- end
-
- def test_buffer_initial_length
- s = JSON.state.new
- assert_equal 1024, s.buffer_initial_length
- s.buffer_initial_length = 0
- assert_equal 1024, s.buffer_initial_length
- s.buffer_initial_length = -1
- assert_equal 1024, s.buffer_initial_length
- s.buffer_initial_length = 128
- assert_equal 128, s.buffer_initial_length
- end
-
- def test_gc
- require_relative '../ruby/envutil.rb'
- assert_in_out_err(%w[-rjson --disable-gems], <<-EOS, [], [])
- bignum_too_long_to_embed_as_string = 1234567890123456789012345
- expect = bignum_too_long_to_embed_as_string.to_s
- GC.stress = true
-
- 10.times do |i|
- tmp = bignum_too_long_to_embed_as_string.to_json
- raise "'\#{expect}' is expected, but '\#{tmp}'" unless tmp == expect
- end
- EOS
- end if GC.respond_to?(:stress=)
-
- def test_configure_using_configure_and_merge
- numbered_state = {
- :indent => "1",
- :space => '2',
- :space_before => '3',
- :object_nl => '4',
- :array_nl => '5'
- }
- state1 = JSON.state.new
- state1.merge(numbered_state)
- assert_equal '1', state1.indent
- assert_equal '2', state1.space
- assert_equal '3', state1.space_before
- assert_equal '4', state1.object_nl
- assert_equal '5', state1.array_nl
- state2 = JSON.state.new
- state2.configure(numbered_state)
- assert_equal '1', state2.indent
- assert_equal '2', state2.space
- assert_equal '3', state2.space_before
- assert_equal '4', state2.object_nl
- assert_equal '5', state2.array_nl
- end
-
- if defined?(JSON::Ext::Generator)
- def test_broken_bignum # [ruby-core:38867]
- pid = fork do
- Bignum.class_eval do
- def to_s
- end
- end
- begin
- JSON::Ext::Generator::State.new.generate(1<<64)
- exit 1
- rescue TypeError
- exit 0
- end
- end
- _, status = Process.waitpid2(pid)
- assert status.success?
- rescue NotImplementedError
- # forking to avoid modifying core class of a parent process and
- # introducing race conditions of tests are run in parallel
- end
- end
-
- def test_hash_likeness_set_symbol
- state = JSON.state.new
- assert_equal nil, state[:foo]
- assert_equal nil.class, state[:foo].class
- assert_equal nil, state['foo']
- state[:foo] = :bar
- assert_equal :bar, state[:foo]
- assert_equal :bar, state['foo']
- state_hash = state.to_hash
- assert_kind_of Hash, state_hash
- assert_equal :bar, state_hash[:foo]
- end
-
- def test_hash_likeness_set_string
- state = JSON.state.new
- assert_equal nil, state[:foo]
- assert_equal nil, state['foo']
- state['foo'] = :bar
- assert_equal :bar, state[:foo]
- assert_equal :bar, state['foo']
- state_hash = state.to_hash
- assert_kind_of Hash, state_hash
- assert_equal :bar, state_hash[:foo]
- end
end
diff --git a/test/json/test_json_generic_object.rb b/test/json/test_json_generic_object.rb
deleted file mode 100644
index 77ef22e6ae..0000000000
--- a/test/json/test_json_generic_object.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
-class TestJSONGenericObject < Test::Unit::TestCase
- include JSON
-
- def setup
- @go = GenericObject[ :a => 1, :b => 2 ]
- end
-
- def test_attributes
- assert_equal 1, @go.a
- assert_equal 1, @go[:a]
- assert_equal 2, @go.b
- assert_equal 2, @go[:b]
- assert_nil @go.c
- assert_nil @go[:c]
- end
-
- def test_generate_json
- switch_json_creatable do
- assert_equal @go, JSON(JSON(@go), :create_additions => true)
- end
- end
-
- def test_parse_json
- assert_kind_of Hash, JSON('{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }', :create_additions => true)
- switch_json_creatable do
- assert_equal @go, l = JSON('{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }', :create_additions => true)
- assert_equal 1, l.a
- assert_equal @go, l = JSON('{ "a": 1, "b": 2 }', :object_class => GenericObject)
- assert_equal 1, l.a
- assert_equal GenericObject[:a => GenericObject[:b => 2]],
- l = JSON('{ "a": { "b": 2 } }', :object_class => GenericObject)
- assert_equal 2, l.a.b
- end
- end
-
- def test_from_hash
- result = GenericObject.from_hash(
- :foo => { :bar => { :baz => true }, :quux => [ { :foobar => true } ] })
- assert_kind_of GenericObject, result.foo
- assert_kind_of GenericObject, result.foo.bar
- assert_equal true, result.foo.bar.baz
- assert_kind_of GenericObject, result.foo.quux.first
- assert_equal true, result.foo.quux.first.foobar
- assert_equal true, GenericObject.from_hash(true)
- end
-
- private
-
- def switch_json_creatable
- JSON::GenericObject.json_creatable = true
- yield
- ensure
- JSON::GenericObject.json_creatable = false
- end
-end
diff --git a/test/json/test_json_rails.rb b/test/json/test_json_rails.rb
new file mode 100755
index 0000000000..29903642c3
--- /dev/null
+++ b/test/json/test_json_rails.rb
@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require 'test/unit'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
+require 'json/add/rails'
+require 'date'
+
+class TC_JSONRails < Test::Unit::TestCase
+ include JSON
+
+ def setup
+ Symbol.class_eval do
+ def to_json(*a)
+ to_s.to_json(*a)
+ end
+ end
+ end
+
+ class A
+ def initialize(a)
+ @a = a
+ end
+
+ attr_reader :a
+
+ def ==(other)
+ a == other.a
+ end
+
+ def self.json_create(object)
+ new(*object['args'])
+ end
+
+ def to_json(*args)
+ {
+ 'json_class' => self.class.name,
+ 'args' => [ @a ],
+ }.to_json(*args)
+ end
+ end
+
+ class B
+ def self.json_creatable?
+ false
+ end
+
+ def to_json(*args)
+ {
+ 'json_class' => self.class.name,
+ }.to_json(*args)
+ end
+ end
+
+ class C
+ def to_json(*args)
+ {
+ 'json_class' => 'TC_JSONRails::Nix',
+ }.to_json(*args)
+ end
+ end
+
+ class D
+ def initialize
+ @foo = 666
+ end
+
+ attr_reader :foo
+
+ def ==(other)
+ foo == other.foo
+ end
+ end
+
+ def test_extended_json
+ a = A.new(666)
+ assert A.json_creatable?
+ assert_equal 666, a.a
+ json = generate(a)
+ a_again = JSON.parse(json)
+ assert_kind_of a.class, a_again
+ assert_equal a, a_again
+ assert_equal 666, a_again.a
+ end
+
+ def test_extended_json_generic_object
+ d = D.new
+ assert D.json_creatable?
+ assert_equal 666, d.foo
+ json = generate(d)
+ d_again = JSON.parse(json)
+ assert_kind_of d.class, d_again
+ assert_equal d, d_again
+ assert_equal 666, d_again.foo
+ end
+
+ def test_extended_json_disabled
+ a = A.new(666)
+ assert A.json_creatable?
+ json = generate(a)
+ a_again = JSON.parse(json, :create_additions => true)
+ assert_kind_of a.class, a_again
+ assert_equal a, a_again
+ a_hash = JSON.parse(json, :create_additions => false)
+ assert_kind_of Hash, a_hash
+ assert_equal(
+ {"args"=>[666], "json_class"=>"TC_JSONRails::A"}.sort_by { |k,| k },
+ a_hash.sort_by { |k,| k }
+ )
+ end
+
+ def test_extended_json_fail1
+ b = B.new
+ assert !B.json_creatable?
+ json = generate(b)
+ assert_equal({ 'json_class' => B.name }, JSON.parse(json))
+ end
+
+ def test_extended_json_fail2
+ c = C.new # with rails addition all objects are theoretically creatable
+ assert C.json_creatable?
+ json = generate(c)
+ assert_raises(ArgumentError, NameError) { JSON.parse(json) }
+ end
+
+ def test_raw_strings
+ raw = ''
+ raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
+ raw_array = []
+ for i in 0..255
+ raw << i
+ raw_array << i
+ end
+ json = raw.to_json_raw
+ json_raw_object = raw.to_json_raw_object
+ hash = { 'json_class' => 'String', 'raw'=> raw_array }
+ assert_equal hash, json_raw_object
+ assert_match /\A\{.*\}\Z/, json
+ assert_match /"json_class":"String"/, json
+ assert_match /"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json
+ raw_again = JSON.parse(json)
+ assert_equal raw, raw_again
+ end
+
+ def test_symbol
+ assert_equal '"foo"', :foo.to_json # we don't want an object here
+ end
+end
diff --git a/test/json/test_json_string_matching.rb b/test/json/test_json_string_matching.rb
deleted file mode 100644
index c233df8c2c..0000000000
--- a/test/json/test_json_string_matching.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
-require 'stringio'
-require 'time'
-
-class TestJSONStringMatching < Test::Unit::TestCase
- include JSON
-
- class TestTime < ::Time
- def self.json_create(string)
- Time.parse(string)
- end
-
- def to_json(*)
- %{"#{strftime('%FT%T%z')}"}
- end
-
- def ==(other)
- to_i == other.to_i
- end
- end
-
- def test_match_date
- t = TestTime.new
- t_json = [ t ].to_json
- assert_equal [ t ],
- JSON.parse(t_json, :create_additions => true,
- :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
- assert_equal [ t.strftime('%FT%T%z') ],
- JSON.parse(t_json, :create_additions => true,
- :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
- assert_equal [ t.strftime('%FT%T%z') ],
- JSON.parse(t_json,
- :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
- end
-end
diff --git a/test/json/test_json_unicode.rb b/test/json/test_json_unicode.rb
index 8352d5c6c6..505f5d5e40 100755
--- a/test/json/test_json_unicode.rb
+++ b/test/json/test_json_unicode.rb
@@ -1,10 +1,14 @@
#!/usr/bin/env ruby
-# encoding: utf-8
+# -*- coding: utf-8 -*-
require 'test/unit'
-require File.join(File.dirname(__FILE__), 'setup_variant')
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext' then require 'json/ext'
+else require 'json'
+end
-class TestJSONUnicode < Test::Unit::TestCase
+class TC_JSONUnicode < Test::Unit::TestCase
include JSON
def test_unicode
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index b153658659..576bec519f 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -1,4 +1,3 @@
-# coding: US-ASCII
require 'test/unit'
require 'logger'
require 'tempfile'
@@ -22,6 +21,13 @@ class TestLogger < Test::Unit::TestCase
def setup
@logger = Logger.new(nil)
+ @filename = __FILE__ + ".#{$$}"
+ end
+
+ def teardown
+ unless $DEBUG
+ File.unlink(@filename) if File.exist?(@filename)
+ end
end
class Log
@@ -46,7 +52,7 @@ class TestLogger < Test::Unit::TestCase
logger.__send__(msg_id, *arg, &block)
logdev.open
msg = logdev.read
- logdev.close(true)
+ logdev.close
msg
end
@@ -126,7 +132,7 @@ class TestLogger < Test::Unit::TestCase
end
logger.formatter = o
line = log_raw(logger, :info, "foo")
- assert_equal("<""<INFO-foo>>\n", line)
+ assert_equal("<<INFO-foo>>\n", line)
end
def test_initialize
@@ -273,14 +279,13 @@ class TestLogDevice < Test::Unit::TestCase
end
def setup
- @tempfile = Tempfile.new("logger")
- @tempfile.close
- @filename = @tempfile.path
- File.unlink(@filename)
+ @filename = __FILE__ + ".#{$$}"
end
def teardown
- @tempfile.close(true)
+ unless $DEBUG
+ File.unlink(@filename) if File.exist?(@filename)
+ end
end
def d(log, opt = {})
@@ -354,13 +359,11 @@ class TestLogDevice < Test::Unit::TestCase
end
def test_shifting_size
- tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
- logfile = tmpfile.path
+ logfile = File.basename(__FILE__) + '_1.log'
logfile0 = logfile + '.0'
logfile1 = logfile + '.1'
logfile2 = logfile + '.2'
logfile3 = logfile + '.3'
- tmpfile.close(true)
File.unlink(logfile) if File.exist?(logfile)
File.unlink(logfile0) if File.exist?(logfile0)
File.unlink(logfile1) if File.exist?(logfile1)
@@ -388,13 +391,11 @@ class TestLogDevice < Test::Unit::TestCase
File.unlink(logfile1)
File.unlink(logfile2)
- tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_2.log'])
- logfile = tmpfile.path
+ logfile = File.basename(__FILE__) + '_2.log'
logfile0 = logfile + '.0'
logfile1 = logfile + '.1'
logfile2 = logfile + '.2'
logfile3 = logfile + '.3'
- tmpfile.close(true)
logger = Logger.new(logfile, 4, 150)
logger.error("0" * 15)
assert(File.exist?(logfile))
@@ -479,14 +480,13 @@ end
class TestLoggerApplication < Test::Unit::TestCase
def setup
@app = Logger::Application.new('appname')
- @tempfile = Tempfile.new("logger")
- @tempfile.close
- @filename = @tempfile.path
- File.unlink(@filename)
+ @filename = __FILE__ + ".#{$$}"
end
def teardown
- @tempfile.close(true)
+ unless $DEBUG
+ File.unlink(@filename) if File.exist?(@filename)
+ end
end
def test_initialize
@@ -498,7 +498,7 @@ class TestLoggerApplication < Test::Unit::TestCase
@app.set_log(@filename)
begin
@app.level = Logger::UNKNOWN
- @app.start # logs FATAL log
+ @app.start # logs FATAL log
assert_equal(1, File.read(@filename).split(/\n/).size)
ensure
@app.logger.close
diff --git a/test/matrix/test_matrix.rb b/test/matrix/test_matrix.rb
index 26248e5746..13cc32800b 100644
--- a/test/matrix/test_matrix.rb
+++ b/test/matrix/test_matrix.rb
@@ -318,6 +318,7 @@ class TestMatrix < Test::Unit::TestCase
def test_exp
assert_equal(Matrix[[67,96],[48,99]], Matrix[[7,6],[3,9]] ** 2)
assert_equal(Matrix.I(5), Matrix.I(5) ** -1)
+ assert_raise(Matrix::ErrOperationNotImplemented) { Matrix.I(5) ** 1.0 }
assert_raise(Matrix::ErrOperationNotDefined) { Matrix.I(5) ** Object.new }
end
diff --git a/test/matrix/test_vector.rb b/test/matrix/test_vector.rb
index 18660df574..582509fd20 100644
--- a/test/matrix/test_vector.rb
+++ b/test/matrix/test_vector.rb
@@ -131,19 +131,4 @@ class TestVector < Test::Unit::TestCase
assert_equal("Vector[1, 2, 3]", @v1.inspect)
end
- def test_magnitude
- assert_in_epsilon(3.7416573867739413, @v1.norm)
- assert_in_epsilon(3.7416573867739413, @v4.norm)
- end
-
- def test_complex_magnitude
- bug6966 = '[ruby-dev:46100]'
- v = Vector[Complex(0,1), 0]
- assert_equal(1.0, v.norm, bug6966)
- end
-
- def test_rational_magnitude
- v = Vector[Rational(1,2), 0]
- assert_equal(0.5, v.norm)
- end
end
diff --git a/test/minitest/metametameta.rb b/test/minitest/metametameta.rb
deleted file mode 100644
index 65eece07ca..0000000000
--- a/test/minitest/metametameta.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-require 'tempfile'
-require 'stringio'
-require 'minitest/autorun'
-
-class MiniTest::Unit::TestCase
- def clean s
- s.gsub(/^ {6}/, '')
- end
-end
-
-class MetaMetaMetaTestCase < MiniTest::Unit::TestCase
- def assert_report expected, flags = %w[--seed 42]
- header = clean <<-EOM
- Run options: #{flags.map { |s| s =~ /\|/ ? s.inspect : s }.join " "}
-
- # Running tests:
-
- EOM
-
- with_output do
- @tu.run flags
- end
-
- output = @output.string.dup
- output.sub!(/Finished tests in .*/, "Finished tests in 0.00")
- output.sub!(/Loaded suite .*/, 'Loaded suite blah')
-
- output.gsub!(/ = \d+.\d\d s = /, ' = 0.00 s = ')
- output.gsub!(/0x[A-Fa-f0-9]+/, '0xXXX')
-
- if windows? then
- output.gsub!(/\[(?:[A-Za-z]:)?[^\]:]+:\d+\]/, '[FILE:LINE]')
- output.gsub!(/^(\s+)(?:[A-Za-z]:)?[^:]+:\d+:in/, '\1FILE:LINE:in')
- else
- output.gsub!(/\[[^\]:]+:\d+\]/, '[FILE:LINE]')
- output.gsub!(/^(\s+)[^:]+:\d+:in/, '\1FILE:LINE:in')
- end
-
- assert_equal header + expected, output
- end
-
- def setup
- super
- srand 42
- MiniTest::Unit::TestCase.reset
- @tu = MiniTest::Unit.new
-
- MiniTest::Unit.runner = nil # protect the outer runner from the inner tests
- end
-
- def teardown
- super
- end
-
- def with_output
- synchronize do
- begin
- @output = StringIO.new("")
- MiniTest::Unit.output = @output
-
- yield
- ensure
- MiniTest::Unit.output = STDOUT
- end
- end
- end
-end
diff --git a/test/minitest/test_mini_mock.rb b/test/minitest/test_mini_mock.rb
new file mode 100644
index 0000000000..c189cb7df7
--- /dev/null
+++ b/test/minitest/test_mini_mock.rb
@@ -0,0 +1,89 @@
+############################################################
+# 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/mock'
+require 'minitest/unit'
+
+MiniTest::Unit.autorun
+
+class TestMiniMock < MiniTest::Unit::TestCase
+ def setup
+ @mock = MiniTest::Mock.new.expect(:foo, nil)
+ @mock.expect(:meaning_of_life, 42)
+ end
+
+ def test_should_create_stub_method
+ assert_nil @mock.foo
+ end
+
+ def test_should_allow_return_value_specification
+ assert_equal 42, @mock.meaning_of_life
+ end
+
+ def test_should_blow_up_if_not_called
+ @mock.foo
+
+ util_verify_bad
+ end
+
+ def test_should_not_blow_up_if_everything_called
+ @mock.foo
+ @mock.meaning_of_life
+
+ assert @mock.verify
+ end
+
+ def test_should_allow_expectations_to_be_added_after_creation
+ @mock.expect(:bar, true)
+ assert @mock.bar
+ end
+
+ def test_should_not_verify_if_new_expected_method_is_not_called
+ @mock.foo
+ @mock.meaning_of_life
+ @mock.expect(:bar, true)
+
+ util_verify_bad
+ end
+
+ def test_should_not_verify_if_unexpected_method_is_called
+ assert_raises NoMethodError do
+ @mock.unexpected
+ end
+ end
+
+ def test_should_blow_up_on_wrong_number_of_arguments
+ @mock.foo
+ @mock.meaning_of_life
+ @mock.expect(:sum, 3, [1, 2])
+
+ assert_raises ArgumentError do
+ @mock.sum
+ end
+ end
+
+ def test_should_blow_up_on_wrong_arguments
+ @mock.foo
+ @mock.meaning_of_life
+ @mock.expect(:sum, 3, [1, 2])
+
+ @mock.sum(2, 4)
+
+ util_verify_bad
+ end
+
+ def test_no_method_error_on_unexpected_methods
+ assert_raises NoMethodError do
+ @mock.bar
+ end
+ end
+
+ def util_verify_bad
+ assert_raises MockExpectationError do
+ @mock.verify
+ end
+ end
+end
diff --git a/test/minitest/test_mini_spec.rb b/test/minitest/test_mini_spec.rb
new file mode 100644
index 0000000000..f80310c4d1
--- /dev/null
+++ b/test/minitest/test_mini_spec.rb
@@ -0,0 +1,172 @@
+############################################################
+# 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/spec'
+
+MiniTest::Unit.autorun
+
+describe MiniTest::Spec do
+ before do
+ @assertion_count = 4
+ end
+
+ after do
+ self._assertions.must_equal @assertion_count
+ end
+
+ # TODO: figure out how the hell to write a test for this
+ # it "will skip if there is no block"
+
+ it "needs to have all methods named well" do
+ @assertion_count = 2
+
+ methods = Object.public_instance_methods.find_all { |n| n =~ /^must|^wont/ }
+ methods.map! { |m| m.to_s } if Symbol === methods.first
+
+ musts, wonts = methods.sort.partition { |m| m =~ /^must/ }
+
+ expected_musts = %w(must_be
+ must_be_close_to
+ must_be_empty
+ must_be_instance_of
+ must_be_kind_of
+ must_be_nil
+ must_be_same_as
+ must_be_within_delta
+ must_be_within_epsilon
+ must_equal
+ must_include
+ must_match
+ must_raise
+ must_respond_to
+ must_send
+ must_throw)
+
+ expected_wonts = expected_musts.map { |m| m.sub(/^must/, 'wont') }
+ expected_wonts.reject! { |m| m =~ /wont_(not|raise|throw|send)/ }
+
+ musts.must_equal expected_musts
+ wonts.must_equal expected_wonts
+ end
+
+ it "needs to verify equality" do
+ (6 * 7).must_equal(42).must_equal true
+ proc { (6 * 9).must_equal(42) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify floats within a delta" do
+ (6.0 * 7).must_be_close_to(42.0).must_equal true
+ proc { 42.002.must_be_close_to 42.0 }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify types of objects" do
+ (6 * 7).must_be_instance_of(Fixnum).must_equal true
+ proc { (6 * 7).must_be_instance_of String }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify kinds of objects" do
+ @assertion_count = 6
+
+ (6 * 7).must_be_kind_of(Fixnum).must_equal true
+ (6 * 7).must_be_kind_of(Numeric).must_equal true
+ proc { (6 * 7).must_be_kind_of String }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify regexp matches" do
+ @assertion_count = 6
+
+ "blah".must_match(/\w+/).must_equal true
+ proc { "blah".must_match(/\d+/) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify nil" do
+ nil.must_be_nil.must_equal true
+ proc { 42.must_be_nil }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify using any operator" do
+ 41.must_be(:<, 42).must_equal true
+ proc { 42.must_be(:<, 41) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to catch an expected exception" do
+ @assertion_count = 2
+
+ proc { raise "blah" }.must_raise RuntimeError
+ proc { raise MiniTest::Assertion }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to catch an unexpected exception" do
+ @assertion_count = 2
+
+ proc {
+ proc { raise MiniTest::Assertion }.must_raise(RuntimeError)
+ }.must_raise MiniTest::Assertion
+ end
+
+ it "needs raise if an expected exception is not raised" do
+ @assertion_count = 2
+
+ proc { proc { 42 }.must_raise(RuntimeError) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to be able to catch a MiniTest::Assertion exception" do
+ @assertion_count = 2
+
+ proc { 1.wont_equal 1 }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify using respond_to" do
+ 42.must_respond_to(:+).must_equal true
+ proc { 42.must_respond_to(:clear) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify identity" do
+ 1.must_be_same_as(1).must_equal true
+ proc { 1.must_be_same_as 2 }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify throw" do
+ @assertion_count = 6
+
+ proc { throw :blah }.must_throw(:blah).must_equal true
+ proc { proc { }.must_throw(:blah) }.must_raise MiniTest::Assertion
+ proc { proc { throw :xxx }.must_throw(:blah) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify inequality" do
+ 42.wont_equal(6 * 9).must_equal false
+ proc { 1.wont_equal 1 }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify mismatch" do
+ @assertion_count = 6
+ "blah".wont_match(/\d+/).must_equal false
+ proc { "blah".wont_match(/\w+/) }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify non-nil" do
+ 42.wont_be_nil.must_equal false
+ proc { nil.wont_be_nil }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to verify non-identity" do
+ 1.wont_be_same_as(2).must_equal false
+ proc { 1.wont_be_same_as 1 }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to be sensible about must_include order" do
+ @assertion_count = 6
+ [1, 2, 3].must_include(2).must_equal true
+ proc { [1, 2, 3].must_include 5 }.must_raise MiniTest::Assertion
+ end
+
+ it "needs to be sensible about wont_include order" do
+ @assertion_count = 6
+ [1, 2, 3].wont_include(5).must_equal false
+ proc { [1, 2, 3].wont_include 2 }.must_raise MiniTest::Assertion
+ end
+end
diff --git a/test/minitest/test_mini_test.rb b/test/minitest/test_mini_test.rb
new file mode 100644
index 0000000000..c29d9b6e52
--- /dev/null
+++ b/test/minitest/test_mini_test.rb
@@ -0,0 +1,1040 @@
+############################################################
+# 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 'stringio'
+require 'pathname'
+require 'minitest/unit'
+
+MiniTest::Unit.autorun
+
+module M; end
+class E < StandardError; include M; end
+
+class TestMiniTest < MiniTest::Unit::TestCase
+ def setup
+ srand 42
+ MiniTest::Unit::TestCase.reset
+ @tu = MiniTest::Unit.new
+ @output = StringIO.new("")
+ MiniTest::Unit.output = @output
+ assert_equal [0, 0], @tu.run_test_suites
+ end
+
+ def teardown
+ MiniTest::Unit.output = $stdout
+ Object.send :remove_const, :ATestCase if defined? ATestCase
+ end
+
+ pwd = Pathname.new(File.expand_path(Dir.pwd))
+ basedir = Pathname.new(File.expand_path(MiniTest::MINI_DIR)) + 'mini'
+ basedir = basedir.relative_path_from(pwd).to_s
+ MINITEST_BASE_DIR = basedir[/\A\./] ? basedir : "./#{basedir}"
+ BT_MIDDLE = ["#{MINITEST_BASE_DIR}/test.rb:165:in `run_test_suites'",
+ "#{MINITEST_BASE_DIR}/test.rb:161:in `each'",
+ "#{MINITEST_BASE_DIR}/test.rb:161:in `run_test_suites'",
+ "#{MINITEST_BASE_DIR}/test.rb:158:in `each'",
+ "#{MINITEST_BASE_DIR}/test.rb:158:in `run_test_suites'",
+ "#{MINITEST_BASE_DIR}/test.rb:139:in `run'",
+ "#{MINITEST_BASE_DIR}/test.rb:106:in `run'"]
+
+ def test_filter_backtrace
+ # this is a semi-lame mix of relative paths.
+ # I cheated by making the autotest parts not have ./
+ bt = (["lib/autotest.rb:571:in `add_exception'",
+ "test/test_autotest.rb:62:in `test_add_exception'",
+ "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
+ BT_MIDDLE +
+ ["#{MINITEST_BASE_DIR}/test.rb:29",
+ "test/test_autotest.rb:422"])
+ bt = util_expand_bt bt
+
+ ex = ["lib/autotest.rb:571:in `add_exception'",
+ "test/test_autotest.rb:62:in `test_add_exception'"]
+ ex = util_expand_bt ex
+
+ fu = MiniTest::filter_backtrace(bt)
+
+ assert_equal ex, fu
+ end
+
+ def util_expand_bt bt
+ if RUBY_VERSION =~ /^1\.9/ then
+ bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f }
+ else
+ bt
+ end
+ end
+
+ def test_filter_backtrace_all_unit
+ bt = (["#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
+ BT_MIDDLE +
+ ["#{MINITEST_BASE_DIR}/test.rb:29"])
+ ex = bt.clone
+ fu = MiniTest::filter_backtrace(bt)
+ assert_equal ex, fu
+ end
+
+ def test_filter_backtrace_unit_starts
+ bt = (["#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
+ BT_MIDDLE +
+ ["#{MINITEST_BASE_DIR}/mini/test.rb:29",
+ "-e:1"])
+
+ bt = util_expand_bt bt
+
+ ex = ["-e:1"]
+ fu = MiniTest::filter_backtrace(bt)
+ assert_equal ex, fu
+ end
+
+ def test_class_puke_with_assertion_failed
+ exception = MiniTest::Assertion.new "Oh no!"
+ exception.set_backtrace ["unhappy"]
+ assert_equal 'F', @tu.puke('SomeClass', 'method_name', exception)
+ assert_equal 1, @tu.failures
+ assert_match(/^Failure.*Oh no!/m, @tu.report.first)
+ assert_match("method_name(SomeClass) [unhappy]", @tu.report.first)
+ end
+
+ def test_class_puke_with_failure_and_flunk_in_backtrace
+ exception = begin
+ MiniTest::Unit::TestCase.new('fake tc').flunk
+ rescue MiniTest::Assertion => failure
+ failure
+ end
+ assert_equal 'F', @tu.puke('SomeClass', 'method_name', exception)
+ refute @tu.report.any?{|line| line =~ /in .flunk/}
+ end
+
+ def test_class_puke_with_assertion_failed_and_long_backtrace
+ bt = (["test/test_some_class.rb:615:in `method_name'",
+ "#{MINITEST_BASE_DIR}/unit.rb:140:in `assert_raises'",
+ "test/test_some_class.rb:615:in `each'",
+ "test/test_some_class.rb:614:in `test_method_name'",
+ "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
+ BT_MIDDLE +
+ ["#{MINITEST_BASE_DIR}/test.rb:29"])
+ bt = util_expand_bt bt
+
+ ex_location = util_expand_bt(["test/test_some_class.rb:615"]).first
+
+ exception = MiniTest::Assertion.new "Oh no!"
+ exception.set_backtrace bt
+ assert_equal 'F', @tu.puke('TestSomeClass', 'test_method_name', exception)
+ assert_equal 1, @tu.failures
+ assert_match(/^Failure.*Oh no!/m, @tu.report.first)
+ assert_match("test_method_name(TestSomeClass) [#{ex_location}]", @tu.report.first)
+ end
+
+ def test_class_puke_with_assertion_failed_and_user_defined_assertions
+ bt = (["lib/test/my/util.rb:16:in `another_method_name'",
+ "#{MINITEST_BASE_DIR}/unit.rb:140:in `assert_raises'",
+ "lib/test/my/util.rb:15:in `block in assert_something'",
+ "lib/test/my/util.rb:14:in `each'",
+ "lib/test/my/util.rb:14:in `assert_something'",
+ "test/test_some_class.rb:615:in `each'",
+ "test/test_some_class.rb:614:in `test_method_name'",
+ "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
+ BT_MIDDLE +
+ ["#{MINITEST_BASE_DIR}/test.rb:29"])
+ bt = util_expand_bt bt
+
+ ex_location = util_expand_bt(["test/test_some_class.rb:615"]).first
+
+ exception = MiniTest::Assertion.new "Oh no!"
+ exception.set_backtrace bt
+ assert_equal 'F', @tu.puke('TestSomeClass', 'test_method_name', exception)
+ assert_equal 1, @tu.failures
+ assert_match(/^Failure.*Oh no!/m, @tu.report.first)
+ assert_match("test_method_name(TestSomeClass) [#{ex_location}]", @tu.report.first)
+ end
+
+ def test_class_puke_with_flunk_and_user_defined_assertions
+ bt = (["lib/test/my/util.rb:16:in `flunk'",
+ "#{MINITEST_BASE_DIR}/unit.rb:140:in `assert_raises'",
+ "lib/test/my/util.rb:15:in `block in assert_something'",
+ "lib/test/my/util.rb:14:in `each'",
+ "lib/test/my/util.rb:14:in `assert_something'",
+ "test/test_some_class.rb:615:in `each'",
+ "test/test_some_class.rb:614:in `test_method_name'",
+ "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
+ BT_MIDDLE +
+ ["#{MINITEST_BASE_DIR}/test.rb:29"])
+ bt = util_expand_bt bt
+
+ ex_location = util_expand_bt(["test/test_some_class.rb:615"]).first
+
+ exception = MiniTest::Assertion.new "Oh no!"
+ exception.set_backtrace bt
+ assert_equal 'F', @tu.puke('TestSomeClass', 'test_method_name', exception)
+ assert_equal 1, @tu.failures
+ assert_match(/^Failure.*Oh no!/m, @tu.report.first)
+ assert_match("test_method_name(TestSomeClass) [#{ex_location}]", @tu.report.first)
+ end
+
+ def test_class_puke_with_non_failure_exception
+ exception = Exception.new("Oh no again!")
+ assert_equal 'E', @tu.puke('SomeClass', 'method_name', exception)
+ assert_equal 1, @tu.errors
+ assert_match(/^Exception.*Oh no again!/m, @tu.report.first)
+ end
+
+ def test_class_run_test_suites
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ assert_equal [1, 1], @tu.run_test_suites
+ end
+
+ def test_run_failing # TODO: add error test
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+
+ def test_failure
+ assert false
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ @tu.run %w[-s 42]
+
+ expected = "Loaded suite blah
+Started
+F.
+Finished in 0.00
+
+ 1) Failure:
+test_failure(ATestCase) [FILE:LINE]:
+Failed assertion, no message given.
+
+2 tests, 2 assertions, 1 failures, 0 errors, 0 skips
+
+Test run options: --seed 42
+"
+ util_assert_report expected
+ end
+
+ def test_run_error
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+
+ def test_error
+ raise "unhandled exception"
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ @tu.run %w[-s 42]
+
+ expected = "Loaded suite blah
+Started
+E.
+Finished in 0.00
+
+ 1) Error:
+test_error(ATestCase):
+RuntimeError: unhandled exception
+ FILE:LINE:in `test_error'
+
+2 tests, 1 assertions, 0 failures, 1 errors, 0 skips
+
+Test run options: --seed 42
+"
+ util_assert_report expected
+ end
+
+ def test_run_error_teardown
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+
+ def teardown
+ raise "unhandled exception"
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ @tu.run %w[-s 42]
+
+ expected = "Loaded suite blah
+Started
+E
+Finished in 0.00
+
+ 1) Error:
+test_something(ATestCase):
+RuntimeError: unhandled exception
+ FILE:LINE:in `teardown'
+
+1 tests, 1 assertions, 0 failures, 1 errors, 0 skips
+
+Test run options: --seed 42
+"
+ util_assert_report expected
+ end
+
+ def test_run_skip
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+
+ def test_skip
+ skip "not yet"
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ @tu.run %w[-s 42]
+
+ expected = "Loaded suite blah
+Started
+S.
+Finished in 0.00
+
+ 1) Skipped:
+test_skip(ATestCase) [FILE:LINE]:
+not yet
+
+2 tests, 1 assertions, 0 failures, 0 errors, 1 skips
+
+Test run options: --seed 42
+"
+ util_assert_report expected
+ end
+
+ def util_assert_report expected = nil
+ expected ||= "Loaded suite blah
+Started
+.
+Finished in 0.00
+
+1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
+
+Test run options: --seed 42
+"
+ output = @output.string.sub(/Finished in .*/, "Finished in 0.00")
+ output.sub!(/Loaded suite .*/, 'Loaded suite blah')
+ output.sub!(/^(\s+)(?:#{Regexp.union(__FILE__, File.expand_path(__FILE__))}):\d+:/o, '\1FILE:LINE:')
+ output.sub!(/\[(?:#{Regexp.union(__FILE__, File.expand_path(__FILE__))}):\d+\]/o, '[FILE:LINE]')
+ assert_equal(expected, output)
+ end
+
+ def test_run_failing_filtered
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+
+ def test_failure
+ assert false
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ @tu.run %w[-n /something/ -s 42]
+
+ expected = "Loaded suite blah
+Started
+.
+Finished in 0.00
+
+1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
+
+Test run options: --seed 42 --name \"/something/\"
+"
+ util_assert_report expected
+ end
+
+ def test_run_passing
+ tc = Class.new(MiniTest::Unit::TestCase) do
+ def test_something
+ assert true
+ end
+ end
+
+ Object.const_set(:ATestCase, tc)
+
+ @tu.run %w[-s 42]
+
+ util_assert_report
+ end
+end
+
+class TestMiniTestTestCase < MiniTest::Unit::TestCase
+ def setup
+ MiniTest::Unit::TestCase.reset
+
+ @tc = MiniTest::Unit::TestCase.new 'fake tc'
+ @zomg = "zomg ponies!"
+ @assertion_count = 1
+ end
+
+ def teardown
+ assert_equal(@assertion_count, @tc._assertions,
+ "expected #{@assertion_count} assertions to be fired during the test, not #{@tc._assertions}") if @tc._assertions
+ Object.send :remove_const, :ATestCase if defined? ATestCase
+ end
+
+ def test_class_inherited
+ @assertion_count = 0
+
+ Object.const_set(:ATestCase, Class.new(MiniTest::Unit::TestCase))
+
+ assert_equal [ATestCase], MiniTest::Unit::TestCase.test_suites
+ end
+
+ def test_class_test_suites
+ @assertion_count = 0
+
+ Object.const_set(:ATestCase, Class.new(MiniTest::Unit::TestCase))
+
+ assert_equal 1, MiniTest::Unit::TestCase.test_suites.size
+ assert_equal [ATestCase], MiniTest::Unit::TestCase.test_suites
+ end
+
+ def test_class_asserts_match_refutes
+ @assertion_count = 0
+
+ methods = MiniTest::Assertions.public_instance_methods
+ methods.map! { |m| m.to_s } if Symbol === methods.first
+
+ ignores = %w(assert_block assert_no_match assert_not_equal assert_not_nil
+ assert_not_same assert_nothing_thrown assert_raise
+ assert_nothing_raised assert_raises assert_throws assert_send)
+ asserts = methods.grep(/^assert/).sort - ignores
+ refutes = methods.grep(/^refute/).sort - ignores
+
+ assert_empty refutes.map { |n| n.sub(/^refute/, 'assert') } - asserts
+ assert_empty asserts.map { |n| n.sub(/^assert/, 'refute') } - refutes
+ end
+
+ def test_assert
+ @assertion_count = 2
+
+ @tc.assert_equal true, @tc.assert(true), "returns true on success"
+ end
+
+ def test_assert__triggered
+ util_assert_triggered "Failed assertion, no message given." do
+ @tc.assert false
+ end
+ end
+
+ def test_assert__triggered_message
+ util_assert_triggered @zomg do
+ @tc.assert false, @zomg
+ end
+ end
+
+ def test_assert_block
+ @tc.assert_block do
+ true
+ end
+ end
+
+ def test_assert_block_triggered
+ util_assert_triggered 'Expected block to return true value.' do
+ @tc.assert_block do
+ false
+ end
+ end
+ end
+
+ def test_assert_empty
+ @assertion_count = 2
+
+ @tc.assert_empty []
+ end
+
+ def test_assert_empty_triggered
+ @assertion_count = 2
+
+ util_assert_triggered "Expected [1] to be empty." do
+ @tc.assert_empty [1]
+ end
+ end
+
+ def test_assert_equal
+ @tc.assert_equal 1, 1
+ end
+
+ def test_assert_equal_different
+ util_assert_triggered "Expected 1, not 2." do
+ @tc.assert_equal 1, 2
+ end
+ end
+
+ def test_assert_in_delta
+ @tc.assert_in_delta 0.0, 1.0 / 1000, 0.1
+ end
+
+ def test_assert_in_delta_triggered
+ util_assert_triggered 'Expected 0.0 - 0.001 (0.001) to be < 1.0e-06.' do
+ @tc.assert_in_delta 0.0, 1.0 / 1000, 0.000001
+ end
+ end
+
+ def test_assert_in_epsilon
+ @assertion_count = 8
+
+ @tc.assert_in_epsilon 10000, 9991
+ @tc.assert_in_epsilon 9991, 10000
+ @tc.assert_in_epsilon 1.0, 1.001
+ @tc.assert_in_epsilon 1.001, 1.0
+
+ @tc.assert_in_epsilon 10000, 9999.1, 0.0001
+ @tc.assert_in_epsilon 9999.1, 10000, 0.0001
+ @tc.assert_in_epsilon 1.0, 1.0001, 0.0001
+ @tc.assert_in_epsilon 1.0001, 1.0, 0.0001
+ end
+
+ def test_assert_in_epsilon_triggered
+ util_assert_triggered 'Expected 10000 - 9990 (10) to be < 9.99.' do
+ @tc.assert_in_epsilon 10000, 9990
+ end
+ end
+
+ def test_assert_includes
+ @assertion_count = 2
+
+ @tc.assert_includes [true], true
+ end
+
+ def test_assert_includes_triggered
+ @assertion_count = 3
+
+ e = @tc.assert_raises MiniTest::Assertion do
+ @tc.assert_includes [true], false
+ end
+
+ expected = "Expected [true] to include false."
+ assert_equal expected, e.message
+ end
+
+ def test_assert_instance_of
+ @tc.assert_instance_of String, "blah"
+ end
+
+ def test_assert_instance_of_triggered
+ util_assert_triggered 'Expected "blah" to be an instance of Array, not String.' do
+ @tc.assert_instance_of Array, "blah"
+ end
+ end
+
+ def test_assert_kind_of
+ @tc.assert_kind_of String, "blah"
+ end
+
+ def test_assert_kind_of_triggered
+ util_assert_triggered 'Expected "blah" to be a kind of Array, not String.' do
+ @tc.assert_kind_of Array, "blah"
+ end
+ end
+
+ def test_assert_match
+ @assertion_count = 2
+ @tc.assert_match(/\w+/, "blah blah blah")
+ end
+
+ def test_assert_match_object
+ @assertion_count = 2
+
+ pattern = Object.new
+ def pattern.=~(other) true end
+
+ @tc.assert_match pattern, 5
+ end
+
+ def test_assert_match_object_triggered
+ @assertion_count = 2
+
+ pattern = Object.new
+ def pattern.=~(other) false end
+ def pattern.inspect; "<<Object>>" end
+
+ util_assert_triggered 'Expected <<Object>> to match 5.' do
+ @tc.assert_match pattern, 5
+ end
+ end
+
+ def test_assert_match_triggered
+ @assertion_count = 2
+ util_assert_triggered 'Expected /\d+/ to match "blah blah blah".' do
+ @tc.assert_match(/\d+/, "blah blah blah")
+ end
+ end
+
+ def test_assert_nil
+ @tc.assert_nil nil
+ end
+
+ def test_assert_nil_triggered
+ util_assert_triggered 'Expected 42 to be nil.' do
+ @tc.assert_nil 42
+ end
+ end
+
+ def test_assert_operator
+ @tc.assert_operator 2, :>, 1
+ end
+
+ def test_assert_operator_triggered
+ util_assert_triggered "Expected 2 to be < 1." do
+ @tc.assert_operator 2, :<, 1
+ end
+ end
+
+ def test_assert_raises
+ @tc.assert_raises RuntimeError do
+ raise "blah"
+ end
+ end
+
+ ##
+ # *sigh* This is quite an odd scenario, but it is from real (albeit
+ # ugly) test code in ruby-core:
+ #
+ # http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29259
+
+ def test_assert_raises_skip
+ @assertion_count = 0
+
+ util_assert_triggered "skipped", MiniTest::Skip do
+ @tc.assert_raises ArgumentError do
+ begin
+ raise "blah"
+ rescue
+ skip "skipped"
+ end
+ end
+ end
+ end
+
+ def test_assert_raises_module
+ @tc.assert_raises M do
+ raise E
+ end
+ end
+
+ def test_assert_raises_triggered_different
+ e = assert_raises MiniTest::Assertion do
+ @tc.assert_raises RuntimeError do
+ raise SyntaxError, "icky"
+ end
+ end
+
+ expected = "[RuntimeError] exception expected, not
+Class: <SyntaxError>
+Message: <\"icky\">
+---Backtrace---
+FILE:LINE:in `test_assert_raises_triggered_different'
+---------------"
+
+ actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
+ actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/
+
+ assert_equal expected, actual
+ end
+
+ def test_assert_raises_triggered_different_msg
+ e = assert_raises MiniTest::Assertion do
+ @tc.assert_raises RuntimeError, "XXX" do
+ raise SyntaxError, "icky"
+ end
+ end
+
+ expected = "XXX
+[RuntimeError] exception expected, not
+Class: <SyntaxError>
+Message: <\"icky\">
+---Backtrace---
+FILE:LINE:in `test_assert_raises_triggered_different_msg'
+---------------"
+
+ actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
+ actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/
+
+ assert_equal expected, actual
+ end
+
+ def test_assert_raises_triggered_none
+ e = assert_raises MiniTest::Assertion do
+ @tc.assert_raises MiniTest::Assertion do
+ # do nothing
+ end
+ end
+
+ expected = "MiniTest::Assertion expected but nothing was raised."
+
+ assert_equal expected, e.message
+ end
+
+ def test_assert_raises_triggered_none_msg
+ e = assert_raises MiniTest::Assertion do
+ @tc.assert_raises MiniTest::Assertion, "XXX" do
+ # do nothing
+ end
+ end
+
+ expected = "XXX\nMiniTest::Assertion expected but nothing was raised."
+
+ assert_equal expected, e.message
+ end
+
+ def test_assert_raises_triggered_subclass
+ e = assert_raises MiniTest::Assertion do
+ @tc.assert_raises StandardError do
+ raise E
+ end
+ end
+
+ expected = "[StandardError] exception expected, not
+Class: <E>
+Message: <\"E\">
+---Backtrace---
+FILE:LINE:in `test_assert_raises_triggered_subclass'
+---------------"
+
+ actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
+ actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION =~ /^1\.9/
+
+ assert_equal expected, actual
+ end
+
+ def test_assert_respond_to
+ @tc.assert_respond_to "blah", :empty?
+ end
+
+ def test_assert_respond_to_triggered
+ util_assert_triggered 'Expected "blah" (String) to respond to #rawr!.' do
+ @tc.assert_respond_to "blah", :rawr!
+ end
+ end
+
+ def test_assert_same
+ @assertion_count = 3
+
+ o = "blah"
+ @tc.assert_same 1, 1
+ @tc.assert_same :blah, :blah
+ @tc.assert_same o, o
+ end
+
+ def test_assert_same_triggered
+ @assertion_count = 2
+
+ util_assert_triggered 'Expected 2 (oid=N) to be the same as 1 (oid=N).' do
+ @tc.assert_same 1, 2
+ end
+
+ s1 = "blah"
+ s2 = "blah"
+
+ util_assert_triggered 'Expected "blah" (oid=N) to be the same as "blah" (oid=N).' do
+ @tc.assert_same s1, s2
+ end
+ end
+
+ def test_assert_send
+ @tc.assert_send [1, :<, 2]
+ end
+
+ def test_assert_send_bad
+ util_assert_triggered "Expected 1.>(*[2]) to return true." do
+ @tc.assert_send [1, :>, 2]
+ end
+ end
+
+ def test_assert_throws
+ @tc.assert_throws(:blah) do
+ throw :blah
+ end
+ end
+
+ def test_assert_throws_different
+ util_assert_triggered 'Expected :blah to have been thrown, not :not_blah.' do
+ @tc.assert_throws(:blah) do
+ throw :not_blah
+ end
+ end
+ end
+
+ def test_assert_throws_unthrown
+ util_assert_triggered 'Expected :blah to have been thrown.' do
+ @tc.assert_throws(:blah) do
+ # do nothing
+ end
+ end
+ end
+
+ def test_capture_io
+ @assertion_count = 0
+
+ out, err = capture_io do
+ puts 'hi'
+ warn 'bye!'
+ end
+
+ assert_equal "hi\n", out
+ assert_equal "bye!\n", err
+ end
+
+ def test_flunk
+ util_assert_triggered 'Epic Fail!' do
+ @tc.flunk
+ end
+ end
+
+ def test_flunk_message
+ util_assert_triggered @zomg do
+ @tc.flunk @zomg
+ end
+ end
+
+ def test_message
+ @assertion_count = 0
+
+ assert_equal "blah2.", @tc.message { "blah2" }.call
+ assert_equal "blah2.", @tc.message("") { "blah2" }.call
+ assert_equal "blah1.\nblah2.", @tc.message("blah1") { "blah2" }.call
+ end
+
+ def test_pass
+ @tc.pass
+ end
+
+ def test_test_methods_sorted
+ @assertion_count = 0
+
+ sample_test_case = Class.new(MiniTest::Unit::TestCase) do
+ def self.test_order; :sorted end
+ def test_test3; assert "does not matter" end
+ def test_test2; assert "does not matter" end
+ def test_test1; assert "does not matter" end
+ end
+
+ expected = %w(test_test1 test_test2 test_test3)
+ assert_equal expected, sample_test_case.test_methods
+ end
+
+ def test_test_methods_random
+ @assertion_count = 0
+
+ sample_test_case = Class.new(MiniTest::Unit::TestCase) do
+ def test_test1; assert "does not matter" end
+ def test_test2; assert "does not matter" end
+ def test_test3; assert "does not matter" end
+ end
+
+ srand 42
+ expected = %w(test_test2 test_test1 test_test3)
+ assert_equal expected, sample_test_case.test_methods
+ end
+
+ def test_refute
+ @assertion_count = 2
+
+ @tc.assert_equal false, @tc.refute(false), "returns false on success"
+ end
+
+ def test_refute_empty
+ @assertion_count = 2
+
+ @tc.refute_empty [1]
+ end
+
+ def test_refute_empty_triggered
+ @assertion_count = 2
+
+ util_assert_triggered "Expected [] to not be empty." do
+ @tc.refute_empty []
+ end
+ end
+
+ def test_refute_equal
+ @tc.refute_equal "blah", "yay"
+ end
+
+ def test_refute_equal_triggered
+ util_assert_triggered 'Expected "blah" to not be equal to "blah".' do
+ @tc.refute_equal "blah", "blah"
+ end
+ end
+
+ def test_refute_in_delta
+ @tc.refute_in_delta 0.0, 1.0 / 1000, 0.000001
+ end
+
+ def test_refute_in_delta_triggered
+ util_assert_triggered 'Expected 0.0 - 0.001 (0.001) to not be < 0.1.' do
+ @tc.refute_in_delta 0.0, 1.0 / 1000, 0.1
+ end
+ end
+
+ def test_refute_in_epsilon
+ @tc.refute_in_epsilon 10000, 9990
+ end
+
+ def test_refute_in_epsilon_triggered
+ util_assert_triggered 'Expected 10000 - 9991 (9) to not be < 10.0.' do
+ @tc.refute_in_epsilon 10000, 9991
+ fail
+ end
+ end
+
+ def test_refute_includes
+ @assertion_count = 2
+
+ @tc.refute_includes [true], false
+ end
+
+ def test_refute_includes_triggered
+ @assertion_count = 3
+
+ e = @tc.assert_raises MiniTest::Assertion do
+ @tc.refute_includes [true], true
+ end
+
+ expected = "Expected [true] to not include true."
+ assert_equal expected, e.message
+ end
+
+ def test_refute_instance_of
+ @tc.refute_instance_of Array, "blah"
+ end
+
+ def test_refute_instance_of_triggered
+ util_assert_triggered 'Expected "blah" to not be an instance of String.' do
+ @tc.refute_instance_of String, "blah"
+ end
+ end
+
+ def test_refute_kind_of
+ @tc.refute_kind_of Array, "blah"
+ end
+
+ def test_refute_kind_of_triggered
+ util_assert_triggered 'Expected "blah" to not be a kind of String.' do
+ @tc.refute_kind_of String, "blah"
+ end
+ end
+
+ def test_refute_match
+ @assertion_count = 2
+ @tc.refute_match(/\d+/, "blah blah blah")
+ end
+
+ def test_refute_match_object
+ @assertion_count = 2
+ @tc.refute_match Object.new, 5 # default #=~ returns false
+ end
+
+ def test_assert_object_triggered
+ @assertion_count = 2
+
+ pattern = Object.new
+ def pattern.=~(other) false end
+ def pattern.inspect; "<<Object>>" end
+
+ util_assert_triggered 'Expected <<Object>> to match 5.' do
+ @tc.assert_match pattern, 5
+ end
+ end
+
+ def test_refute_match_object_triggered
+ @assertion_count = 2
+
+ pattern = Object.new
+ def pattern.=~(other) true end
+ def pattern.inspect; "<<Object>>" end
+
+ util_assert_triggered 'Expected <<Object>> to not match 5.' do
+ @tc.refute_match pattern, 5
+ end
+ end
+
+ def test_refute_match_triggered
+ @assertion_count = 2
+ util_assert_triggered 'Expected /\w+/ to not match "blah blah blah".' do
+ @tc.refute_match(/\w+/, "blah blah blah")
+ end
+ end
+
+ def test_refute_nil
+ @tc.refute_nil 42
+ end
+
+ def test_refute_nil_triggered
+ util_assert_triggered 'Expected nil to not be nil.' do
+ @tc.refute_nil nil
+ end
+ end
+
+ def test_refute_operator
+ @tc.refute_operator 2, :<, 1
+ end
+
+ def test_refute_operator_triggered
+ util_assert_triggered "Expected 2 to not be > 1." do
+ @tc.refute_operator 2, :>, 1
+ end
+ end
+
+ def test_refute_respond_to
+ @tc.refute_respond_to "blah", :rawr!
+ end
+
+ def test_refute_respond_to_triggered
+ util_assert_triggered 'Expected "blah" to not respond to empty?.' do
+ @tc.refute_respond_to "blah", :empty?
+ end
+ end
+
+ def test_refute_same
+ @tc.refute_same 1, 2
+ end
+
+ def test_refute_same_triggered
+ util_assert_triggered 'Expected 1 (oid=N) to not be the same as 1 (oid=N).' do
+ @tc.refute_same 1, 1
+ end
+ end
+
+ def test_skip
+ @assertion_count = 0
+
+ util_assert_triggered "haha!", MiniTest::Skip do
+ @tc.skip "haha!"
+ end
+ end
+
+ def util_assert_triggered expected, klass = MiniTest::Assertion
+ e = assert_raises(klass) do
+ yield
+ end
+
+ msg = e.message.sub(/(---Backtrace---).*/m, '\1')
+ msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
+
+ assert_equal expected, msg
+ end
+end
diff --git a/test/minitest/test_minitest_benchmark.rb b/test/minitest/test_minitest_benchmark.rb
deleted file mode 100644
index 708589b3fa..0000000000
--- a/test/minitest/test_minitest_benchmark.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-require 'minitest/autorun'
-require 'minitest/benchmark'
-
-##
-# Used to verify data:
-# http://www.wolframalpha.com/examples/RegressionAnalysis.html
-
-class TestMiniTestBenchmark < MiniTest::Unit::TestCase
- def test_cls_bench_exp
- assert_equal [2, 4, 8, 16, 32], self.class.bench_exp(2, 32, 2)
- end
-
- def test_cls_bench_linear
- assert_equal [2, 4, 6, 8, 10], self.class.bench_linear(2, 10, 2)
- end
-
- def test_cls_benchmark_methods
- assert_equal [], self.class.benchmark_methods
-
- c = Class.new(MiniTest::Unit::TestCase) do
- def bench_blah
- end
- end
-
- assert_equal ["bench_blah"], c.benchmark_methods
- end
-
- def test_cls_bench_range
- assert_equal [1, 10, 100, 1_000, 10_000], self.class.bench_range
- end
-
- def test_fit_exponential_clean
- x = [1.0, 2.0, 3.0, 4.0, 5.0]
- y = x.map { |n| 1.1 * Math.exp(2.1 * n) }
-
- assert_fit :exponential, x, y, 1.0, 1.1, 2.1
- end
-
- def test_fit_exponential_noisy
- x = [1.0, 1.9, 2.6, 3.4, 5.0]
- y = [12, 10, 8.2, 6.9, 5.9]
-
- # verified with Numbers and R
- assert_fit :exponential, x, y, 0.95, 13.81148, -0.1820
- end
-
- def test_fit_constant_clean
- x = (1..5).to_a
- y = [5.0, 5.0, 5.0, 5.0, 5.0]
-
- assert_fit :linear, x, y, nil, 5.0, 0
- end
-
- def test_fit_constant_noisy
- x = (1..5).to_a
- y = [1.0, 1.2, 1.0, 0.8, 1.0]
-
- # verified in numbers and R
- assert_fit :linear, x, y, nil, 1.12, -0.04
- end
-
- def test_fit_linear_clean
- # y = m * x + b where m = 2.2, b = 3.1
- x = (1..5).to_a
- y = x.map { |n| 2.2 * n + 3.1 }
-
- assert_fit :linear, x, y, 1.0, 3.1, 2.2
- end
-
- def test_fit_linear_noisy
- x = [ 60, 61, 62, 63, 65]
- y = [3.1, 3.6, 3.8, 4.0, 4.1]
-
- # verified in numbers and R
- assert_fit :linear, x, y, 0.8315, -7.9635, 0.1878
- end
-
- def test_fit_power_clean
- # y = A x ** B, where B = b and A = e ** a
- # if, A = 1, B = 2, then
-
- x = [1.0, 2.0, 3.0, 4.0, 5.0]
- y = [1.0, 4.0, 9.0, 16.0, 25.0]
-
- assert_fit :power, x, y, 1.0, 1.0, 2.0
- end
-
- def test_fit_power_noisy
- # from www.engr.uidaho.edu/thompson/courses/ME330/lecture/least_squares.html
- x = [10, 12, 15, 17, 20, 22, 25, 27, 30, 32, 35]
- y = [95, 105, 125, 141, 173, 200, 253, 298, 385, 459, 602]
-
- # verified in numbers
- assert_fit :power, x, y, 0.90, 2.6217, 1.4556
-
- # income to % of households below income amount
- # http://library.wolfram.com/infocenter/Conferences/6461/PowerLaws.nb
- x = [15000, 25000, 35000, 50000, 75000, 100000]
- y = [0.154, 0.283, 0.402, 0.55, 0.733, 0.843]
-
- # verified in numbers
- assert_fit :power, x, y, 0.96, 3.119e-5, 0.8959
- end
-
- def assert_fit msg, x, y, fit, exp_a, exp_b
- a, b, rr = send "fit_#{msg}", x, y
-
- assert_operator rr, :>=, fit if fit
- assert_in_delta exp_a, a
- assert_in_delta exp_b, b
- end
-end
diff --git a/test/minitest/test_minitest_mock.rb b/test/minitest/test_minitest_mock.rb
deleted file mode 100644
index cfd97e4002..0000000000
--- a/test/minitest/test_minitest_mock.rb
+++ /dev/null
@@ -1,377 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-require 'minitest/mock'
-require 'minitest/unit'
-
-MiniTest::Unit.autorun
-
-class TestMiniTestMock < MiniTest::Unit::TestCase
- parallelize_me! if ENV["PARALLEL"]
-
- def setup
- @mock = MiniTest::Mock.new.expect(:foo, nil)
- @mock.expect(:meaning_of_life, 42)
- end
-
- def test_create_stub_method
- assert_nil @mock.foo
- end
-
- def test_allow_return_value_specification
- assert_equal 42, @mock.meaning_of_life
- end
-
- def test_blow_up_if_not_called
- @mock.foo
-
- util_verify_bad "expected meaning_of_life() => 42, got []"
- end
-
- def test_not_blow_up_if_everything_called
- @mock.foo
- @mock.meaning_of_life
-
- assert @mock.verify
- end
-
- def test_allow_expectations_to_be_added_after_creation
- @mock.expect(:bar, true)
- assert @mock.bar
- end
-
- def test_not_verify_if_new_expected_method_is_not_called
- @mock.foo
- @mock.meaning_of_life
- @mock.expect(:bar, true)
-
- util_verify_bad "expected bar() => true, got []"
- end
-
- def test_blow_up_on_wrong_number_of_arguments
- @mock.foo
- @mock.meaning_of_life
- @mock.expect(:sum, 3, [1, 2])
-
- e = assert_raises ArgumentError do
- @mock.sum
- end
-
- assert_equal "mocked method :sum expects 2 arguments, got 0", e.message
- end
-
- def test_return_mock_does_not_raise
- retval = MiniTest::Mock.new
- mock = MiniTest::Mock.new
- mock.expect(:foo, retval)
- mock.foo
-
- assert mock.verify
- end
-
- def test_mock_args_does_not_raise
- arg = MiniTest::Mock.new
- mock = MiniTest::Mock.new
- mock.expect(:foo, nil, [arg])
- mock.foo(arg)
-
- assert mock.verify
- end
-
- def test_blow_up_on_wrong_arguments
- @mock.foo
- @mock.meaning_of_life
- @mock.expect(:sum, 3, [1, 2])
-
- e = assert_raises MockExpectationError do
- @mock.sum(2, 4)
- end
-
- exp = "mocked method :sum called with unexpected arguments [2, 4]"
- assert_equal exp, e.message
- end
-
- def test_expect_with_non_array_args
- e = assert_raises ArgumentError do
- @mock.expect :blah, 3, false
- end
-
- assert_equal "args must be an array", e.message
- end
-
- def test_respond_appropriately
- assert @mock.respond_to?(:foo)
- assert @mock.respond_to?(:foo, true)
- assert @mock.respond_to?('foo')
- assert !@mock.respond_to?(:bar)
- end
-
- def test_no_method_error_on_unexpected_methods
- e = assert_raises NoMethodError do
- @mock.bar
- end
-
- expected = "unmocked method :bar, expected one of [:foo, :meaning_of_life]"
-
- assert_equal expected, e.message
- end
-
- def test_assign_per_mock_return_values
- a = MiniTest::Mock.new
- b = MiniTest::Mock.new
-
- a.expect(:foo, :a)
- b.expect(:foo, :b)
-
- assert_equal :a, a.foo
- assert_equal :b, b.foo
- end
-
- def test_do_not_create_stub_method_on_new_mocks
- a = MiniTest::Mock.new
- a.expect(:foo, :a)
-
- assert !MiniTest::Mock.new.respond_to?(:foo)
- end
-
- def test_mock_is_a_blank_slate
- @mock.expect :kind_of?, true, [Fixnum]
- @mock.expect :==, true, [1]
-
- assert @mock.kind_of?(Fixnum), "didn't mock :kind_of\?"
- assert @mock == 1, "didn't mock :=="
- end
-
- def test_verify_allows_called_args_to_be_loosely_specified
- mock = MiniTest::Mock.new
- mock.expect :loose_expectation, true, [Integer]
- mock.loose_expectation 1
-
- assert mock.verify
- end
-
- def test_verify_raises_with_strict_args
- mock = MiniTest::Mock.new
- mock.expect :strict_expectation, true, [2]
-
- e = assert_raises MockExpectationError do
- mock.strict_expectation 1
- end
-
- exp = "mocked method :strict_expectation called with unexpected arguments [1]"
- assert_equal exp, e.message
- end
-
- def test_method_missing_empty
- mock = MiniTest::Mock.new
-
- mock.expect :a, nil
-
- mock.a
-
- e = assert_raises MockExpectationError do
- mock.a
- end
-
- assert_equal "No more expects available for :a: []", e.message
- end
-
- def test_same_method_expects_are_verified_when_all_called
- mock = MiniTest::Mock.new
- mock.expect :foo, nil, [:bar]
- mock.expect :foo, nil, [:baz]
-
- mock.foo :bar
- mock.foo :baz
-
- assert mock.verify
- end
-
- def test_same_method_expects_blow_up_when_not_all_called
- mock = MiniTest::Mock.new
- mock.expect :foo, nil, [:bar]
- mock.expect :foo, nil, [:baz]
-
- mock.foo :bar
-
- e = assert_raises(MockExpectationError) { mock.verify }
-
- exp = "expected foo(:baz) => nil, got [foo(:bar) => nil]"
-
- assert_equal exp, e.message
- end
-
- def test_verify_passes_when_mock_block_returns_true
- mock = MiniTest::Mock.new
- mock.expect :foo, nil do
- true
- end
-
- mock.foo
-
- assert mock.verify
- end
-
- def test_mock_block_is_passed_function_params
- arg1, arg2, arg3 = :bar, [1,2,3], {:a => 'a'}
- mock = MiniTest::Mock.new
- mock.expect :foo, nil do |a1, a2, a3|
- a1 == arg1 &&
- a2 == arg2 &&
- a3 == arg3
- end
-
- mock.foo arg1, arg2, arg3
-
- assert mock.verify
- end
-
- def test_verify_fails_when_mock_block_returns_false
- mock = MiniTest::Mock.new
- mock.expect :foo, nil do
- false
- end
-
- e = assert_raises(MockExpectationError) { mock.foo }
- exp = "mocked method :foo failed block w/ []"
-
- assert_equal exp, e.message
- end
-
- def test_mock_block_throws_if_args_passed
- mock = MiniTest::Mock.new
-
- e = assert_raises(ArgumentError) do
- mock.expect :foo, nil, [:a, :b, :c] do
- true
- end
- end
-
- exp = "args ignored when block given"
-
- assert_equal exp, e.message
- end
-
- def test_mock_returns_retval_when_called_with_block
- mock = MiniTest::Mock.new
- mock.expect(:foo, 32) do
- true
- end
-
- rs = mock.foo
-
- assert_equal rs, 32
- end
-
- def util_verify_bad exp
- e = assert_raises MockExpectationError do
- @mock.verify
- end
-
- assert_equal exp, e.message
- end
-end
-
-require "minitest/metametameta"
-
-class TestMiniTestStub < MiniTest::Unit::TestCase
- parallelize_me! if ENV["PARALLEL"]
-
- def setup
- super
- MiniTest::Unit::TestCase.reset
-
- @tc = MiniTest::Unit::TestCase.new 'fake tc'
- @assertion_count = 1
- end
-
- def teardown
- super
- assert_equal @assertion_count, @tc._assertions
- end
-
- def assert_stub val_or_callable
- @assertion_count += 1
-
- synchronize do
- t = Time.now.to_i
-
- Time.stub :now, val_or_callable do
- @tc.assert_equal 42, Time.now
- end
-
- @tc.assert_operator Time.now.to_i, :>=, t
- end
- end
-
- def test_stub_value
- assert_stub 42
- end
-
- def test_stub_block
- assert_stub lambda { 42 }
- end
-
- def test_stub_block_args
- @assertion_count += 1
-
- synchronize do
- t = Time.now.to_i
-
- Time.stub :now, lambda { |n| n * 2 } do
- @tc.assert_equal 42, Time.now(21)
- end
-
- @tc.assert_operator Time.now.to_i, :>=, t
- end
- end
-
- def test_stub_callable
- obj = Object.new
-
- def obj.call
- 42
- end
-
- assert_stub obj
- end
-
- def test_stub_yield_self
- obj = "foo"
-
- val = obj.stub :to_s, "bar" do |s|
- s.to_s
- end
-
- @tc.assert_equal "bar", val
- end
-
- def test_dynamic_method
- @assertion_count = 2
-
- dynamic = Class.new do
- def self.respond_to?(meth)
- meth == :found
- end
-
- def self.method_missing(meth, *args, &block)
- if meth == :found
- false
- else
- super
- end
- end
- end
-
- val = dynamic.stub(:found, true) do |s|
- s.found
- end
-
- @tc.assert_equal true, val
- @tc.assert_equal false, dynamic.found
- end
-end
diff --git a/test/minitest/test_minitest_spec.rb b/test/minitest/test_minitest_spec.rb
deleted file mode 100644
index 85cb95f42b..0000000000
--- a/test/minitest/test_minitest_spec.rb
+++ /dev/null
@@ -1,738 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-# encoding: utf-8
-require 'minitest/autorun'
-require 'stringio'
-
-class MiniSpecA < MiniTest::Spec; end
-class MiniSpecB < MiniTest::Spec; end
-class ExampleA; end
-class ExampleB < ExampleA; end
-
-describe MiniTest::Spec do
- # do not parallelize this suite... it just can't handle it.
-
- def assert_triggered expected = "blah", klass = MiniTest::Assertion
- @assertion_count += 2
-
- e = assert_raises(klass) do
- yield
- end
-
- msg = e.message.sub(/(---Backtrace---).*/m, '\1')
- msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
-
- assert_equal expected, msg
- end
-
- before do
- @assertion_count = 4
- end
-
- after do
- self._assertions.must_equal @assertion_count
- end
-
- it "needs to be able to catch a MiniTest::Assertion exception" do
- @assertion_count = 1
-
- assert_triggered "Expected 1 to not be equal to 1." do
- 1.wont_equal 1
- end
- end
-
- it "needs to be sensible about must_include order" do
- @assertion_count += 3 # must_include is 2 assertions
-
- [1, 2, 3].must_include(2).must_equal true
-
- assert_triggered "Expected [1, 2, 3] to include 5." do
- [1, 2, 3].must_include 5
- end
-
- assert_triggered "msg.\nExpected [1, 2, 3] to include 5." do
- [1, 2, 3].must_include 5, "msg"
- end
- end
-
- it "needs to be sensible about wont_include order" do
- @assertion_count += 3 # wont_include is 2 assertions
-
- [1, 2, 3].wont_include(5).must_equal false
-
- assert_triggered "Expected [1, 2, 3] to not include 2." do
- [1, 2, 3].wont_include 2
- end
-
- assert_triggered "msg.\nExpected [1, 2, 3] to not include 2." do
- [1, 2, 3].wont_include 2, "msg"
- end
- end
-
- it "needs to catch an expected exception" do
- @assertion_count = 2
-
- proc { raise "blah" }.must_raise RuntimeError
- proc { raise MiniTest::Assertion }.must_raise MiniTest::Assertion
- end
-
- it "needs to catch an unexpected exception" do
- @assertion_count -= 2 # no positive
-
- msg = <<-EOM.gsub(/^ {6}/, '').chomp
- [RuntimeError] exception expected, not
- Class: <MiniTest::Assertion>
- Message: <\"MiniTest::Assertion\">
- ---Backtrace---
- EOM
-
- assert_triggered msg do
- proc { raise MiniTest::Assertion }.must_raise RuntimeError
- end
-
- assert_triggered "msg.\n#{msg}" do
- proc { raise MiniTest::Assertion }.must_raise RuntimeError, "msg"
- end
- end
-
- it "needs to ensure silence" do
- @assertion_count -= 1 # no msg
- @assertion_count += 2 # assert_output is 2 assertions
-
- proc { }.must_be_silent.must_equal true
-
- assert_triggered "In stdout.\nExpected: \"\"\n Actual: \"xxx\"" do
- proc { print "xxx" }.must_be_silent
- end
- end
-
- it "needs to have all methods named well" do
- @assertion_count = 2
-
- methods = Object.public_instance_methods.find_all { |n| n =~ /^must|^wont/ }
- methods.map! { |m| m.to_s } if Symbol === methods.first
-
- musts, wonts = methods.sort.partition { |m| m =~ /^must/ }
-
- expected_musts = %w(must_be
- must_be_close_to
- must_be_empty
- must_be_instance_of
- must_be_kind_of
- must_be_nil
- must_be_same_as
- must_be_silent
- must_be_within_delta
- must_be_within_epsilon
- must_equal
- must_include
- must_match
- must_output
- must_raise
- must_respond_to
- must_send
- must_throw)
-
- bad = %w[not raise throw send output be_silent]
-
- expected_wonts = expected_musts.map { |m| m.sub(/^must/, 'wont') }
- expected_wonts.reject! { |m| m =~ /wont_#{Regexp.union(*bad)}/ }
-
- musts.must_equal expected_musts
- wonts.must_equal expected_wonts
- end
-
- it "needs to raise if an expected exception is not raised" do
- @assertion_count -= 2 # no positive test
-
- assert_triggered "RuntimeError expected but nothing was raised." do
- proc { 42 }.must_raise RuntimeError
- end
-
- assert_triggered "msg.\nRuntimeError expected but nothing was raised." do
- proc { 42 }.must_raise RuntimeError, "msg"
- end
- end
-
- it "needs to verify binary messages" do
- 42.wont_be(:<, 24).must_equal false
-
- assert_triggered 'Expected 24 to not be < 42.' do
- 24.wont_be :<, 42
- end
-
- assert_triggered "msg.\nExpected 24 to not be < 42." do
- 24.wont_be :<, 42, "msg"
- end
- end
-
- it "needs to verify emptyness" do
- @assertion_count += 3 # empty is 2 assertions
-
- [].must_be_empty.must_equal true
-
- assert_triggered "Expected [42] to be empty." do
- [42].must_be_empty
- end
-
- assert_triggered "msg.\nExpected [42] to be empty." do
- [42].must_be_empty "msg"
- end
- end
-
- it "needs to verify equality" do
- (6 * 7).must_equal(42).must_equal true
-
- assert_triggered "Expected: 42\n Actual: 54" do
- (6 * 9).must_equal 42
- end
-
- assert_triggered "msg.\nExpected: 42\n Actual: 54" do
- (6 * 9).must_equal 42, "msg"
- end
- end
-
- it "needs to verify floats outside a delta" do
- @assertion_count += 1 # extra test
-
- 24.wont_be_close_to(42).must_equal false
-
- assert_triggered 'Expected |42 - 42.0| (0.0) to not be < 0.001.' do
- (6 * 7.0).wont_be_close_to 42
- end
-
- assert_triggered 'Expected |42 - 42.0| (0.0) to not be < 1.0e-05.' do
- (6 * 7.0).wont_be_close_to 42, 0.00001
- end
-
- assert_triggered "msg.\nExpected |42 - 42.0| (0.0) to not be < 1.0e-05." do
- (6 * 7.0).wont_be_close_to 42, 0.00001, "msg"
- end
- end
-
- it "needs to verify floats outside an epsilon" do
- @assertion_count += 1 # extra test
-
- 24.wont_be_within_epsilon(42).must_equal false
-
- assert_triggered 'Expected |42 - 42.0| (0.0) to not be < 0.042.' do
- (6 * 7.0).wont_be_within_epsilon 42
- end
-
- assert_triggered 'Expected |42 - 42.0| (0.0) to not be < 0.00042.' do
- (6 * 7.0).wont_be_within_epsilon 42, 0.00001
- end
-
- assert_triggered "msg.\nExpected |42 - 42.0| (0.0) to not be < 0.00042." do
- (6 * 7.0).wont_be_within_epsilon 42, 0.00001, "msg"
- end
- end
-
- it "needs to verify floats within a delta" do
- @assertion_count += 1 # extra test
-
- (6.0 * 7).must_be_close_to(42.0).must_equal true
-
- assert_triggered 'Expected |0.0 - 0.01| (0.01) to be < 0.001.' do
- (1.0 / 100).must_be_close_to 0.0
- end
-
- assert_triggered 'Expected |0.0 - 0.001| (0.001) to be < 1.0e-06.' do
- (1.0 / 1000).must_be_close_to 0.0, 0.000001
- end
-
- assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be < 1.0e-06." do
- (1.0 / 1000).must_be_close_to 0.0, 0.000001, "msg"
- end
- end
-
- it "needs to verify floats within an epsilon" do
- @assertion_count += 1 # extra test
-
- (6.0 * 7).must_be_within_epsilon(42.0).must_equal true
-
- assert_triggered 'Expected |0.0 - 0.01| (0.01) to be < 0.0.' do
- (1.0 / 100).must_be_within_epsilon 0.0
- end
-
- assert_triggered 'Expected |0.0 - 0.001| (0.001) to be < 0.0.' do
- (1.0 / 1000).must_be_within_epsilon 0.0, 0.000001
- end
-
- assert_triggered "msg.\nExpected |0.0 - 0.001| (0.001) to be < 0.0." do
- (1.0 / 1000).must_be_within_epsilon 0.0, 0.000001, "msg"
- end
- end
-
- it "needs to verify identity" do
- 1.must_be_same_as(1).must_equal true
-
- assert_triggered "Expected 1 (oid=N) to be the same as 2 (oid=N)." do
- 1.must_be_same_as 2
- end
-
- assert_triggered "msg.\nExpected 1 (oid=N) to be the same as 2 (oid=N)." do
- 1.must_be_same_as 2, "msg"
- end
- end
-
- it "needs to verify inequality" do
- 42.wont_equal(6 * 9).must_equal false
-
- assert_triggered "Expected 1 to not be equal to 1." do
- 1.wont_equal 1
- end
-
- assert_triggered "msg.\nExpected 1 to not be equal to 1." do
- 1.wont_equal 1, "msg"
- end
- end
-
- it "needs to verify instances of a class" do
- 42.wont_be_instance_of(String).must_equal false
-
- assert_triggered 'Expected 42 to not be an instance of Fixnum.' do
- 42.wont_be_instance_of Fixnum
- end
-
- assert_triggered "msg.\nExpected 42 to not be an instance of Fixnum." do
- 42.wont_be_instance_of Fixnum, "msg"
- end
- end
-
- it "needs to verify kinds of a class" do
- 42.wont_be_kind_of(String).must_equal false
-
- assert_triggered 'Expected 42 to not be a kind of Integer.' do
- 42.wont_be_kind_of Integer
- end
-
- assert_triggered "msg.\nExpected 42 to not be a kind of Integer." do
- 42.wont_be_kind_of Integer, "msg"
- end
- end
-
- it "needs to verify kinds of objects" do
- @assertion_count += 2 # extra test
-
- (6 * 7).must_be_kind_of(Fixnum).must_equal true
- (6 * 7).must_be_kind_of(Numeric).must_equal true
-
- assert_triggered "Expected 42 to be a kind of String, not Fixnum." do
- (6 * 7).must_be_kind_of String
- end
-
- assert_triggered "msg.\nExpected 42 to be a kind of String, not Fixnum." do
- (6 * 7).must_be_kind_of String, "msg"
- end
- end
-
- it "needs to verify mismatch" do
- @assertion_count += 3 # match is 2
-
- "blah".wont_match(/\d+/).must_equal false
-
- assert_triggered "Expected /\\w+/ to not match \"blah\"." do
- "blah".wont_match(/\w+/)
- end
-
- assert_triggered "msg.\nExpected /\\w+/ to not match \"blah\"." do
- "blah".wont_match(/\w+/, "msg")
- end
- end
-
- it "needs to verify nil" do
- nil.must_be_nil.must_equal true
-
- assert_triggered "Expected 42 to be nil." do
- 42.must_be_nil
- end
-
- assert_triggered "msg.\nExpected 42 to be nil." do
- 42.must_be_nil "msg"
- end
- end
-
- it "needs to verify non-emptyness" do
- @assertion_count += 3 # empty is 2 assertions
-
- ['some item'].wont_be_empty.must_equal false
-
- assert_triggered "Expected [] to not be empty." do
- [].wont_be_empty
- end
-
- assert_triggered "msg.\nExpected [] to not be empty." do
- [].wont_be_empty "msg"
- end
- end
-
- it "needs to verify non-identity" do
- 1.wont_be_same_as(2).must_equal false
-
- assert_triggered "Expected 1 (oid=N) to not be the same as 1 (oid=N)." do
- 1.wont_be_same_as 1
- end
-
- assert_triggered "msg.\nExpected 1 (oid=N) to not be the same as 1 (oid=N)." do
- 1.wont_be_same_as 1, "msg"
- end
- end
-
- it "needs to verify non-nil" do
- 42.wont_be_nil.must_equal false
-
- assert_triggered "Expected nil to not be nil." do
- nil.wont_be_nil
- end
-
- assert_triggered "msg.\nExpected nil to not be nil." do
- nil.wont_be_nil "msg"
- end
- end
-
- it "needs to verify objects not responding to a message" do
- "".wont_respond_to(:woot!).must_equal false
-
- assert_triggered 'Expected "" to not respond to to_s.' do
- "".wont_respond_to :to_s
- end
-
- assert_triggered "msg.\nExpected \"\" to not respond to to_s." do
- "".wont_respond_to :to_s, "msg"
- end
- end
-
- it "needs to verify output in stderr" do
- @assertion_count -= 1 # no msg
-
- proc { $stderr.print "blah" }.must_output(nil, "blah").must_equal true
-
- assert_triggered "In stderr.\nExpected: \"blah\"\n Actual: \"xxx\"" do
- proc { $stderr.print "xxx" }.must_output(nil, "blah")
- end
- end
-
- it "needs to verify output in stdout" do
- @assertion_count -= 1 # no msg
-
- proc { print "blah" }.must_output("blah").must_equal true
-
- assert_triggered "In stdout.\nExpected: \"blah\"\n Actual: \"xxx\"" do
- proc { print "xxx" }.must_output("blah")
- end
- end
-
- it "needs to verify regexp matches" do
- @assertion_count += 3 # must_match is 2 assertions
-
- "blah".must_match(/\w+/).must_equal true
-
- assert_triggered "Expected /\\d+/ to match \"blah\"." do
- "blah".must_match(/\d+/)
- end
-
- assert_triggered "msg.\nExpected /\\d+/ to match \"blah\"." do
- "blah".must_match(/\d+/, "msg")
- end
- end
-
- it "needs to verify throw" do
- @assertion_count += 2 # 2 extra tests
-
- proc { throw :blah }.must_throw(:blah).must_equal true
-
- assert_triggered "Expected :blah to have been thrown." do
- proc { }.must_throw :blah
- end
-
- assert_triggered "Expected :blah to have been thrown, not :xxx." do
- proc { throw :xxx }.must_throw :blah
- end
-
- assert_triggered "msg.\nExpected :blah to have been thrown." do
- proc { }.must_throw :blah, "msg"
- end
-
- assert_triggered "msg.\nExpected :blah to have been thrown, not :xxx." do
- proc { throw :xxx }.must_throw :blah, "msg"
- end
- end
-
- it "needs to verify types of objects" do
- (6 * 7).must_be_instance_of(Fixnum).must_equal true
-
- exp = "Expected 42 to be an instance of String, not Fixnum."
-
- assert_triggered exp do
- (6 * 7).must_be_instance_of String
- end
-
- assert_triggered "msg.\n#{exp}" do
- (6 * 7).must_be_instance_of String, "msg"
- end
- end
-
- it "needs to verify using any (negative) predicate" do
- @assertion_count -= 1 # doesn't take a message
-
- "blah".wont_be(:empty?).must_equal false
-
- assert_triggered "Expected \"\" to not be empty?." do
- "".wont_be :empty?
- end
- end
-
- it "needs to verify using any binary operator" do
- @assertion_count -= 1 # no msg
-
- 41.must_be(:<, 42).must_equal true
-
- assert_triggered "Expected 42 to be < 41." do
- 42.must_be(:<, 41)
- end
- end
-
- it "needs to verify using any predicate" do
- @assertion_count -= 1 # no msg
-
- "".must_be(:empty?).must_equal true
-
- assert_triggered "Expected \"blah\" to be empty?." do
- "blah".must_be :empty?
- end
- end
-
- it "needs to verify using respond_to" do
- 42.must_respond_to(:+).must_equal true
-
- assert_triggered "Expected 42 (Fixnum) to respond to #clear." do
- 42.must_respond_to :clear
- end
-
- assert_triggered "msg.\nExpected 42 (Fixnum) to respond to #clear." do
- 42.must_respond_to :clear, "msg"
- end
- end
-
-end
-
-describe MiniTest::Spec, :let do
- i_suck_and_my_tests_are_order_dependent!
-
- def _count
- $let_count ||= 0
- end
-
- let :count do
- $let_count += 1
- $let_count
- end
-
- it "is evaluated once per example" do
- _count.must_equal 0
-
- count.must_equal 1
- count.must_equal 1
-
- _count.must_equal 1
- end
-
- it "is REALLY evaluated once per example" do
- _count.must_equal 1
-
- count.must_equal 2
- count.must_equal 2
-
- _count.must_equal 2
- end
-end
-
-describe MiniTest::Spec, :subject do
- attr_reader :subject_evaluation_count
-
- subject do
- @subject_evaluation_count ||= 0
- @subject_evaluation_count += 1
- @subject_evaluation_count
- end
-
- it "is evaluated once per example" do
- subject.must_equal 1
- subject.must_equal 1
- subject_evaluation_count.must_equal 1
- end
-end
-
-class TestMetaStatic < MiniTest::Unit::TestCase
- def test_children
- MiniTest::Spec.children.clear # prevents parallel run
-
- x = y = z = nil
- x = describe "top-level thingy" do
- y = describe "first thingy" do end
-
- it "top-level-it" do end
-
- z = describe "second thingy" do end
- end
-
- assert_equal [x], MiniTest::Spec.children
- assert_equal [y, z], x.children
- assert_equal [], y.children
- assert_equal [], z.children
- end
-end
-
-class TestMeta < MiniTest::Unit::TestCase
- parallelize_me! if ENV["PARALLEL"]
-
- def util_structure
- x = y = z = nil
- before_list = []
- after_list = []
- x = describe "top-level thingy" do
- before { before_list << 1 }
- after { after_list << 1 }
-
- it "top-level-it" do end
-
- y = describe "inner thingy" do
- before { before_list << 2 }
- after { after_list << 2 }
- it "inner-it" do end
-
- z = describe "very inner thingy" do
- before { before_list << 3 }
- after { after_list << 3 }
- it "inner-it" do end
-
- it {} # ignore me
- specify {} # anonymous it
- end
- end
- end
-
- return x, y, z, before_list, after_list
- end
-
- def test_register_spec_type
- original_types = MiniTest::Spec::TYPES.dup
-
- assert_equal [[//, MiniTest::Spec]], MiniTest::Spec::TYPES
-
- MiniTest::Spec.register_spec_type(/woot/, TestMeta)
-
- p = lambda do |x| true end
- MiniTest::Spec.register_spec_type TestMeta, &p
-
- keys = MiniTest::Spec::TYPES.map(&:first)
-
- assert_includes keys, /woot/
- assert_includes keys, p
- ensure
- MiniTest::Spec::TYPES.replace original_types
- end
-
- def test_spec_type
- original_types = MiniTest::Spec::TYPES.dup
-
- MiniTest::Spec.register_spec_type(/A$/, MiniSpecA)
- MiniTest::Spec.register_spec_type MiniSpecB do |desc|
- desc.superclass == ExampleA
- end
-
- assert_equal MiniSpecA, MiniTest::Spec.spec_type(ExampleA)
- assert_equal MiniSpecB, MiniTest::Spec.spec_type(ExampleB)
- ensure
- MiniTest::Spec::TYPES.replace original_types
- end
-
- def test_structure
- x, y, z, * = util_structure
-
- assert_equal "top-level thingy", x.to_s
- assert_equal "top-level thingy::inner thingy", y.to_s
- assert_equal "top-level thingy::inner thingy::very inner thingy", z.to_s
-
- assert_equal "top-level thingy", x.desc
- assert_equal "inner thingy", y.desc
- assert_equal "very inner thingy", z.desc
-
- top_methods = %w(setup teardown test_0001_top-level-it)
- inner_methods1 = %w(setup teardown test_0001_inner-it)
- inner_methods2 = inner_methods1 +
- %w(test_0002_anonymous test_0003_anonymous)
-
- assert_equal top_methods, x.instance_methods(false).sort.map(&:to_s)
- assert_equal inner_methods1, y.instance_methods(false).sort.map(&:to_s)
- assert_equal inner_methods2, z.instance_methods(false).sort.map(&:to_s)
- end
-
- def test_setup_teardown_behavior
- _, _, z, before_list, after_list = util_structure
-
- @tu = MiniTest::Unit.new
- MiniTest::Unit.runner = nil # protect the outer runner from the inner tests
-
- with_output do
- tc = z.new :test_0002_anonymous
- tc.run @tu
- end
-
- assert_equal [1, 2, 3], before_list
- assert_equal [3, 2, 1], after_list
- end
-
- def test_describe_first_structure
- x = x1 = x2 = y = z = nil
- x = describe "top-level thingy" do
- y = describe "first thingy" do end
-
- x1 = it "top level it" do end
- x2 = it "не латинÑкие буквы-и-ÑпецÑимволы&ã„ã£ãŸ α, β, γ, δ, ε hello!!! world" do end
-
- z = describe "second thingy" do end
- end
-
- test_methods = ['test_0001_top level it', 'test_0002_не латинÑкие буквы-и-ÑпецÑимволы&ã„ã£ãŸ α, β, γ, δ, ε hello!!! world'].sort
-
- assert_equal test_methods, [x1, x2]
- assert_equal test_methods,
- x.instance_methods.grep(/^test/).map {|o| o.to_s}.sort
- assert_equal [], y.instance_methods.grep(/^test/)
- assert_equal [], z.instance_methods.grep(/^test/)
- end
-
- def test_structure_subclasses
- z = nil
- x = Class.new MiniTest::Spec do
- def xyz; end
- end
- y = Class.new x do
- z = describe("inner") {}
- end
-
- assert_respond_to x.new(nil), "xyz"
- assert_respond_to y.new(nil), "xyz"
- assert_respond_to z.new(nil), "xyz"
- end
-
- def with_output # REFACTOR: dupe from metametameta
- synchronize do
- begin
- @output = StringIO.new("")
- MiniTest::Unit.output = @output
-
- yield
- ensure
- MiniTest::Unit.output = STDOUT
- end
- end
- end
-end
diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb
deleted file mode 100644
index c47aa300c2..0000000000
--- a/test/minitest/test_minitest_unit.rb
+++ /dev/null
@@ -1,1701 +0,0 @@
-# encoding: utf-8
-######################################################################
-# This file is imported from the minitest project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis.
-######################################################################
-
-require 'pathname'
-require 'minitest/metametameta'
-
-module MyModule; end
-class AnError < StandardError; include MyModule; end
-class ImmutableString < String; def inspect; super.freeze; end; end
-
-class TestMiniTestUnit < MetaMetaMetaTestCase
- parallelize_me! if ENV["PARALLEL"]
-
- pwd = Pathname.new File.expand_path Dir.pwd
- basedir = Pathname.new(File.expand_path "lib/minitest") + 'mini'
- basedir = basedir.relative_path_from(pwd).to_s
- MINITEST_BASE_DIR = basedir[/\A\./] ? basedir : "./#{basedir}"
- BT_MIDDLE = ["#{MINITEST_BASE_DIR}/test.rb:161:in `each'",
- "#{MINITEST_BASE_DIR}/test.rb:158:in `each'",
- "#{MINITEST_BASE_DIR}/test.rb:139:in `run'",
- "#{MINITEST_BASE_DIR}/test.rb:106:in `run'"]
-
- def test_wtf
- $hook_value = nil
-
- capture_io do # don't care about deprecation
- MiniTest::Unit::TestCase.add_setup_hook do
- $hook_value = 42
- end
- end
-
- run_setup_hooks
-
- assert_equal 42, $hook_value
- assert_equal [Proc], MiniTest::Unit::TestCase.setup_hooks.map(&:class)
- MiniTest::Unit::TestCase.reset_setup_teardown_hooks
- assert_equal [], MiniTest::Unit::TestCase.setup_hooks.map(&:class)
- end
-
- def test_class_puke_with_assertion_failed
- exception = MiniTest::Assertion.new "Oh no!"
- exception.set_backtrace ["unhappy"]
- assert_equal 'F', @tu.puke('SomeClass', 'method_name', exception)
- assert_equal 1, @tu.failures
- assert_match(/^Failure.*Oh no!/m, @tu.report.first)
- assert_match("method_name(SomeClass) [unhappy]", @tu.report.first)
- end
-
- def test_class_puke_with_assertion_failed_and_long_backtrace
- bt = (["test/test_some_class.rb:615:in `method_name'",
- "#{MINITEST_BASE_DIR}/unit.rb:140:in `assert_raises'",
- "test/test_some_class.rb:615:in `each'",
- "test/test_some_class.rb:614:in `test_method_name'",
- "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
- BT_MIDDLE +
- ["#{MINITEST_BASE_DIR}/test.rb:29"])
- bt = util_expand_bt bt
-
- ex_location = util_expand_bt(["test/test_some_class.rb:615"]).first
-
- exception = MiniTest::Assertion.new "Oh no!"
- exception.set_backtrace bt
- assert_equal 'F', @tu.puke('TestSomeClass', 'test_method_name', exception)
- assert_equal 1, @tu.failures
- assert_match(/^Failure.*Oh no!/m, @tu.report.first)
- assert_match("test_method_name(TestSomeClass) [#{ex_location}]", @tu.report.first)
- end
-
- def test_class_puke_with_assertion_failed_and_user_defined_assertions
- bt = (["lib/test/my/util.rb:16:in `another_method_name'",
- "#{MINITEST_BASE_DIR}/unit.rb:140:in `assert_raises'",
- "lib/test/my/util.rb:15:in `block in assert_something'",
- "lib/test/my/util.rb:14:in `each'",
- "lib/test/my/util.rb:14:in `assert_something'",
- "test/test_some_class.rb:615:in `each'",
- "test/test_some_class.rb:614:in `test_method_name'",
- "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
- BT_MIDDLE +
- ["#{MINITEST_BASE_DIR}/test.rb:29"])
- bt = util_expand_bt bt
-
- ex_location = util_expand_bt(["test/test_some_class.rb:615"]).first
-
- exception = MiniTest::Assertion.new "Oh no!"
- exception.set_backtrace bt
- assert_equal 'F', @tu.puke('TestSomeClass', 'test_method_name', exception)
- assert_equal 1, @tu.failures
- assert_match(/^Failure.*Oh no!/m, @tu.report.first)
- assert_match("test_method_name(TestSomeClass) [#{ex_location}]", @tu.report.first)
- end
-
- def test_class_puke_with_failure_and_flunk_in_backtrace
- exception = begin
- MiniTest::Unit::TestCase.new('fake tc').flunk
- rescue MiniTest::Assertion => failure
- failure
- end
- assert_equal 'F', @tu.puke('SomeClass', 'method_name', exception)
- refute @tu.report.any?{|line| line =~ /in .flunk/}
- end
-
- def test_class_puke_with_flunk_and_user_defined_assertions
- bt = (["lib/test/my/util.rb:16:in `flunk'",
- "#{MINITEST_BASE_DIR}/unit.rb:140:in `assert_raises'",
- "lib/test/my/util.rb:15:in `block in assert_something'",
- "lib/test/my/util.rb:14:in `each'",
- "lib/test/my/util.rb:14:in `assert_something'",
- "test/test_some_class.rb:615:in `each'",
- "test/test_some_class.rb:614:in `test_method_name'",
- "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
- BT_MIDDLE +
- ["#{MINITEST_BASE_DIR}/test.rb:29"])
- bt = util_expand_bt bt
-
- ex_location = util_expand_bt(["test/test_some_class.rb:615"]).first
-
- exception = MiniTest::Assertion.new "Oh no!"
- exception.set_backtrace bt
- assert_equal 'F', @tu.puke('TestSomeClass', 'test_method_name', exception)
- assert_equal 1, @tu.failures
- assert_match(/^Failure.*Oh no!/m, @tu.report.first)
- assert_match("test_method_name(TestSomeClass) [#{ex_location}]", @tu.report.first)
- end
-
- def test_class_puke_with_non_failure_exception
- exception = Exception.new("Oh no again!")
- assert_equal 'E', @tu.puke('SomeClass', 'method_name', exception)
- assert_equal 1, @tu.errors
- assert_match(/^Exception.*Oh no again!/m, @tu.report.first)
- end
-
- def test_filter_backtrace
- # this is a semi-lame mix of relative paths.
- # I cheated by making the autotest parts not have ./
- bt = (["lib/autotest.rb:571:in `add_exception'",
- "test/test_autotest.rb:62:in `test_add_exception'",
- "#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
- BT_MIDDLE +
- ["#{MINITEST_BASE_DIR}/test.rb:29",
- "test/test_autotest.rb:422"])
- bt = util_expand_bt bt
-
- ex = ["lib/autotest.rb:571:in `add_exception'",
- "test/test_autotest.rb:62:in `test_add_exception'"]
- ex = util_expand_bt ex
-
- fu = MiniTest::filter_backtrace(bt)
-
- assert_equal ex, fu
- end
-
- def test_filter_backtrace_all_unit
- bt = (["#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
- BT_MIDDLE +
- ["#{MINITEST_BASE_DIR}/test.rb:29"])
- ex = bt.clone
- fu = MiniTest::filter_backtrace(bt)
- assert_equal ex, fu
- end
-
- def test_filter_backtrace_unit_starts
- bt = (["#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
- BT_MIDDLE +
- ["#{MINITEST_BASE_DIR}/mini/test.rb:29",
- "-e:1"])
-
- bt = util_expand_bt bt
-
- ex = ["-e:1"]
- fu = MiniTest::filter_backtrace bt
- assert_equal ex, fu
- end
-
- def test_default_runner_is_minitest_unit
- assert_instance_of MiniTest::Unit, MiniTest::Unit.runner
- end
-
- def with_overridden_include
- Class.class_eval do
- def inherited_with_hacks klass
- throw :inherited_hook
- end
-
- alias inherited_without_hacks inherited
- alias inherited inherited_with_hacks
- alias IGNORE_ME! inherited # 1.8 bug. god I love venture bros
- end
-
- yield
- ensure
- Class.class_eval do
- alias inherited inherited_without_hacks
-
- undef_method :inherited_with_hacks
- undef_method :inherited_without_hacks
- end
-
- refute_respond_to Class, :inherited_with_hacks
- refute_respond_to Class, :inherited_without_hacks
- end
-
- def test_inherited_hook_plays_nice_with_others
- with_overridden_include do
- assert_throws :inherited_hook do
- Class.new MiniTest::Unit::TestCase
- end
- end
- end
-
- def test_passed_eh_teardown_good
- test_class = Class.new MiniTest::Unit::TestCase do
- def teardown; assert true; end
- def test_omg; assert true; end
- end
-
- test = test_class.new :test_omg
- test.run @tu
- assert test.passed?
- end
-
- def test_passed_eh_teardown_flunked
- test_class = Class.new MiniTest::Unit::TestCase do
- def teardown; flunk; end
- def test_omg; assert true; end
- end
-
- test = test_class.new :test_omg
- test.run @tu
- refute test.passed?
- end
-
- def util_expand_bt bt
- bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f }
- end
-end
-
-class TestMiniTestRunner < MetaMetaMetaTestCase
- # do not parallelize this suite... it just can't handle it.
-
- def test_class_test_suites
- @assertion_count = 0
-
- tc = Class.new(MiniTest::Unit::TestCase)
-
- assert_equal 1, MiniTest::Unit::TestCase.test_suites.size
- assert_equal [tc], MiniTest::Unit::TestCase.test_suites
- end
-
- def test_run_test
- Class.new MiniTest::Unit::TestCase do
- attr_reader :foo
-
- def run_test name
- @foo = "hi mom!"
- super
- @foo = "okay"
- end
-
- def test_something
- assert_equal "hi mom!", foo
- end
- end
-
- expected = clean <<-EOM
- .
-
- Finished tests in 0.00
-
- 1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
- EOM
-
- assert_report expected
- end
-
- def test_run_error
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
-
- def test_error
- raise "unhandled exception"
- end
- end
-
- expected = clean <<-EOM
- E.
-
- Finished tests in 0.00
-
- 1) Error:
- test_error(#<Class:0xXXX>):
- RuntimeError: unhandled exception
- FILE:LINE:in `test_error'
-
- 2 tests, 1 assertions, 0 failures, 1 errors, 0 skips
- EOM
-
- assert_report expected
- end
-
- def test_run_error_teardown
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
-
- def teardown
- raise "unhandled exception"
- end
- end
-
- expected = clean <<-EOM
- E
-
- Finished tests in 0.00
-
- 1) Error:
- test_something(#<Class:0xXXX>):
- RuntimeError: unhandled exception
- FILE:LINE:in `teardown'
-
- 1 tests, 1 assertions, 0 failures, 1 errors, 0 skips
- EOM
-
- assert_report expected
- end
-
- def test_run_failing
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
-
- def test_failure
- assert false
- end
- end
-
- expected = clean <<-EOM
- F.
-
- Finished tests in 0.00
-
- 1) Failure:
- test_failure(#<Class:0xXXX>) [FILE:LINE]:
- Failed assertion, no message given.
-
- 2 tests, 2 assertions, 1 failures, 0 errors, 0 skips
- EOM
-
- assert_report expected
- end
-
- def test_run_failing_filtered
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
-
- def test_failure
- assert false
- end
- end
-
- expected = clean <<-EOM
- .
-
- Finished tests in 0.00
-
- 1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
- EOM
-
- assert_report expected, %w[--name /some|thing/ --seed 42]
- end
-
- def test_run_passing
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
- end
-
- expected = clean <<-EOM
- .
-
- Finished tests in 0.00
-
- 1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
- EOM
-
- assert_report expected
- end
-
- def test_run_skip
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
-
- def test_skip
- skip "not yet"
- end
- end
-
- expected = clean <<-EOM
- S.
-
- Finished tests in 0.00
-
- 2 tests, 1 assertions, 0 failures, 0 errors, 1 skips
- EOM
-
- assert_report expected
- end
-
- def test_run_skip_verbose
- Class.new MiniTest::Unit::TestCase do
- def test_something
- assert true
- end
-
- def test_skip
- skip "not yet"
- end
- end
-
- expected = clean <<-EOM
- #<Class:0xXXX>#test_skip = 0.00 s = S
- #<Class:0xXXX>#test_something = 0.00 s = .
-
-
- Finished tests in 0.00
-
- 1) Skipped:
- test_skip(#<Class:0xXXX>) [FILE:LINE]:
- not yet
-
- 2 tests, 1 assertions, 0 failures, 0 errors, 1 skips
- EOM
-
- assert_report expected, %w[--seed 42 --verbose]
- end
-
- def test_run_with_other_runner
- MiniTest::Unit.runner = Class.new MiniTest::Unit do
- def _run_suite suite, type
- suite.before_suite # Run once before each suite
- super suite, type
- end
- end.new
-
- Class.new MiniTest::Unit::TestCase do
- def self.name; "wacky!" end
-
- def self.before_suite
- MiniTest::Unit.output.puts "Running #{self.name} tests"
- @@foo = 1
- end
-
- def test_something
- assert_equal 1, @@foo
- end
-
- def test_something_else
- assert_equal 1, @@foo
- end
- end
-
- expected = clean <<-EOM
- Running wacky! tests
- ..
-
- Finished tests in 0.00
-
- 2 tests, 2 assertions, 0 failures, 0 errors, 0 skips
- EOM
-
- assert_report expected
- end
-
- require 'monitor'
-
- class Latch
- def initialize count = 1
- @count = count
- @lock = Monitor.new
- @cv = @lock.new_cond
- end
-
- def release
- @lock.synchronize do
- @count -= 1 if @count > 0
- @cv.broadcast if @count == 0
- end
- end
-
- def await
- @lock.synchronize { @cv.wait_while { @count > 0 } }
- end
- end
-
- def test_run_parallel
- test_count = 2
- test_latch = Latch.new test_count
- main_latch = Latch.new
-
- thread = Thread.new {
- Thread.current.abort_on_exception = true
-
- # This latch waits until both test latches have been released. Both
- # latches can't be released unless done in separate threads because
- # `main_latch` keeps the test method from finishing.
- test_latch.await
- main_latch.release
- }
-
- Class.new MiniTest::Unit::TestCase do
- parallelize_me!
-
- test_count.times do |i|
- define_method :"test_wait_on_main_thread_#{i}" do
- test_latch.release
-
- # This latch blocks until the "main thread" releases it. The main
- # thread can't release this latch until both test latches have
- # been released. This forces the latches to be released in separate
- # threads.
- main_latch.await
- assert true
- end
- end
- end
-
- expected = clean <<-EOM
- ..
-
- Finished tests in 0.00
-
- 2 tests, 2 assertions, 0 failures, 0 errors, 0 skips
- EOM
-
- assert_report expected
- assert thread.join
- end
-end
-
-class TestMiniTestUnitOrder < MetaMetaMetaTestCase
- # do not parallelize this suite... it just can't handle it.
-
- def test_before_setup
- call_order = []
- Class.new MiniTest::Unit::TestCase do
- define_method :setup do
- super()
- call_order << :setup
- end
-
- define_method :before_setup do
- call_order << :before_setup
- end
-
- def test_omg; assert true; end
- end
-
- with_output do
- @tu.run %w[--seed 42]
- end
-
- expected = [:before_setup, :setup]
- assert_equal expected, call_order
- end
-
- def test_after_teardown
- call_order = []
- Class.new MiniTest::Unit::TestCase do
- define_method :teardown do
- super()
- call_order << :teardown
- end
-
- define_method :after_teardown do
- call_order << :after_teardown
- end
-
- def test_omg; assert true; end
- end
-
- with_output do
- @tu.run %w[--seed 42]
- end
-
- expected = [:teardown, :after_teardown]
- assert_equal expected, call_order
- end
-
- def test_all_teardowns_are_guaranteed_to_run
- call_order = []
- Class.new MiniTest::Unit::TestCase do
- define_method :after_teardown do
- super()
- call_order << :after_teardown
- raise
- end
-
- define_method :teardown do
- super()
- call_order << :teardown
- raise
- end
-
- define_method :before_teardown do
- super()
- call_order << :before_teardown
- raise
- end
-
- def test_omg; assert true; end
- end
-
- with_output do
- @tu.run %w[--seed 42]
- end
-
- expected = [:before_teardown, :teardown, :after_teardown]
- assert_equal expected, call_order
- end
-
- def test_setup_and_teardown_survive_inheritance
- call_order = []
-
- parent = Class.new MiniTest::Spec do
- before do
- call_order << :setup_method
- end
-
- after do
- call_order << :teardown_method
- end
-
- define_method :test_something do
- call_order << :test
- end
- end
-
- _ = Class.new parent
-
- with_output do
- @tu.run %w[--seed 42]
- end
-
- # Once for the parent class, once for the child
- expected = [:setup_method, :test, :teardown_method] * 2
-
- assert_equal expected, call_order
- end
-end
-
-class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
- parallelize_me! if ENV["PARALLEL"]
-
- RUBY18 = ! defined? Encoding
-
- def setup
- super
-
- MiniTest::Unit::TestCase.reset
-
- @tc = MiniTest::Unit::TestCase.new 'fake tc'
- @zomg = "zomg ponies!"
- @assertion_count = 1
- end
-
- def teardown
- assert_equal(@assertion_count, @tc._assertions,
- "expected #{@assertion_count} assertions to be fired during the test, not #{@tc._assertions}") if @tc._assertions
- end
-
- def non_verbose
- orig_verbose = $VERBOSE
- $VERBOSE = false
-
- yield
- ensure
- $VERBOSE = orig_verbose
- end
-
- def test_assert
- @assertion_count = 2
-
- @tc.assert_equal true, @tc.assert(true), "returns true on success"
- end
-
- def test_assert__triggered
- util_assert_triggered "Failed assertion, no message given." do
- @tc.assert false
- end
- end
-
- def test_assert__triggered_message
- util_assert_triggered @zomg do
- @tc.assert false, @zomg
- end
- end
-
- def test_assert_block
- exp = ["NOTE: MiniTest::Unit::TestCase#assert_block is deprecated,",
- "use assert. It will be removed on 2013-01-01."].join " "
-
- out, err = capture_io do
- @tc.assert_block do
- true
- end
- end
-
- assert_equal "", out
- assert_match exp, err
- end
-
- def test_assert_block_triggered
- assert_output do
- util_assert_triggered "blah.\nExpected block to return true value." do
- @tc.assert_block "blah" do
- false
- end
- end
- end
- end
-
- def test_assert_empty
- @assertion_count = 2
-
- @tc.assert_empty []
- end
-
- def test_assert_empty_triggered
- @assertion_count = 2
-
- util_assert_triggered "Expected [1] to be empty." do
- @tc.assert_empty [1]
- end
- end
-
- def test_assert_equal
- @tc.assert_equal 1, 1
- end
-
- def test_assert_equal_different_collection_array_hex_invisible
- object1 = Object.new
- object2 = Object.new
- msg = "No visible difference in the Array#inspect output.
- You should look at the implementation of #== on Array or its members.
- [#<Object:0xXXXXXX>]".gsub(/^ +/, "")
- util_assert_triggered msg do
- @tc.assert_equal [object1], [object2]
- end
- end
-
- def test_assert_equal_different_collection_hash_hex_invisible
- h1, h2 = {}, {}
- h1[1] = Object.new
- h2[1] = Object.new
- msg = "No visible difference in the Hash#inspect output.
- You should look at the implementation of #== on Hash or its members.
- {1=>#<Object:0xXXXXXX>}".gsub(/^ +/, "")
-
- util_assert_triggered msg do
- @tc.assert_equal h1, h2
- end
- end
-
- def test_assert_equal_different_diff_deactivated
- without_diff do
- util_assert_triggered util_msg("haha" * 10, "blah" * 10) do
- o1 = "haha" * 10
- o2 = "blah" * 10
-
- @tc.assert_equal o1, o2
- end
- end
- end
-
- def test_assert_equal_different_hex
- c = Class.new do
- def initialize s; @name = s; end
- end
-
- o1 = c.new "a"
- o2 = c.new "b"
- msg = "--- expected
- +++ actual
- @@ -1 +1 @@
- -#<#<Class:0xXXXXXX>:0xXXXXXX @name=\"a\">
- +#<#<Class:0xXXXXXX>:0xXXXXXX @name=\"b\">
- ".gsub(/^ +/, "")
-
- util_assert_triggered msg do
- @tc.assert_equal o1, o2
- end
- end
-
- def test_assert_equal_different_hex_invisible
- o1 = Object.new
- o2 = Object.new
-
- msg = "No visible difference in the Object#inspect output.
- You should look at the implementation of #== on Object or its members.
- #<Object:0xXXXXXX>".gsub(/^ +/, "")
-
- util_assert_triggered msg do
- @tc.assert_equal o1, o2
- end
- end
-
- def test_assert_equal_different_long
- msg = "--- expected
- +++ actual
- @@ -1 +1 @@
- -\"hahahahahahahahahahahahahahahahahahahaha\"
- +\"blahblahblahblahblahblahblahblahblahblah\"
- ".gsub(/^ +/, "")
-
- util_assert_triggered msg do
- o1 = "haha" * 10
- o2 = "blah" * 10
-
- @tc.assert_equal o1, o2
- end
- end
-
- def test_assert_equal_different_long_invisible
- msg = "No visible difference in the String#inspect output.
- You should look at the implementation of #== on String or its members.
- \"blahblahblahblahblahblahblahblahblahblah\"".gsub(/^ +/, "")
-
- util_assert_triggered msg do
- o1 = "blah" * 10
- o2 = "blah" * 10
- def o1.== o
- false
- end
- @tc.assert_equal o1, o2
- end
- end
-
- def test_assert_equal_different_long_msg
- msg = "message.
- --- expected
- +++ actual
- @@ -1 +1 @@
- -\"hahahahahahahahahahahahahahahahahahahaha\"
- +\"blahblahblahblahblahblahblahblahblahblah\"
- ".gsub(/^ +/, "")
-
- util_assert_triggered msg do
- o1 = "haha" * 10
- o2 = "blah" * 10
- @tc.assert_equal o1, o2, "message"
- end
- end
-
- def test_assert_equal_different_short
- util_assert_triggered util_msg(1, 2) do
- @tc.assert_equal 1, 2
- end
- end
-
- def test_assert_equal_different_short_msg
- util_assert_triggered util_msg(1, 2, "message") do
- @tc.assert_equal 1, 2, "message"
- end
- end
-
- def test_assert_equal_different_short_multiline
- msg = "--- expected\n+++ actual\n@@ -1,2 +1,2 @@\n \"a\n-b\"\n+c\"\n"
- util_assert_triggered msg do
- @tc.assert_equal "a\nb", "a\nc"
- end
- end
-
- def test_assert_in_delta
- @tc.assert_in_delta 0.0, 1.0 / 1000, 0.1
- end
-
- def test_assert_in_delta_triggered
- util_assert_triggered 'Expected |0.0 - 0.001| (0.001) to be < 1.0e-06.' do
- @tc.assert_in_delta 0.0, 1.0 / 1000, 0.000001
- end
- end
-
- def test_assert_in_epsilon
- @assertion_count = 10
-
- @tc.assert_in_epsilon 10000, 9991
- @tc.assert_in_epsilon 9991, 10000
- @tc.assert_in_epsilon 1.0, 1.001
- @tc.assert_in_epsilon 1.001, 1.0
-
- @tc.assert_in_epsilon 10000, 9999.1, 0.0001
- @tc.assert_in_epsilon 9999.1, 10000, 0.0001
- @tc.assert_in_epsilon 1.0, 1.0001, 0.0001
- @tc.assert_in_epsilon 1.0001, 1.0, 0.0001
-
- @tc.assert_in_epsilon(-1, -1)
- @tc.assert_in_epsilon(-10000, -9991)
- end
-
- def test_assert_in_epsilon_triggered
- util_assert_triggered 'Expected |10000 - 9990| (10) to be < 9.99.' do
- @tc.assert_in_epsilon 10000, 9990
- end
- end
-
- def test_assert_in_epsilon_triggered_negative_case
- x = RUBY18 ? "0.1" : "0.10000000000000009"
- util_assert_triggered "Expected |-1.1 - -1| (#{x}) to be < 0.1." do
- @tc.assert_in_epsilon(-1.1, -1, 0.1)
- end
- end
-
- def test_assert_includes
- @assertion_count = 2
-
- @tc.assert_includes [true], true
- end
-
- def test_assert_includes_triggered
- @assertion_count = 3
-
- e = @tc.assert_raises MiniTest::Assertion do
- @tc.assert_includes [true], false
- end
-
- expected = "Expected [true] to include false."
- assert_equal expected, e.message
- end
-
- def test_assert_instance_of
- @tc.assert_instance_of String, "blah"
- end
-
- def test_assert_instance_of_triggered
- util_assert_triggered 'Expected "blah" to be an instance of Array, not String.' do
- @tc.assert_instance_of Array, "blah"
- end
- end
-
- def test_assert_kind_of
- @tc.assert_kind_of String, "blah"
- end
-
- def test_assert_kind_of_triggered
- util_assert_triggered 'Expected "blah" to be a kind of Array, not String.' do
- @tc.assert_kind_of Array, "blah"
- end
- end
-
- def test_assert_match
- @assertion_count = 2
- @tc.assert_match(/\w+/, "blah blah blah")
- end
-
- def test_assert_match_matcher_object
- @assertion_count = 2
-
- pattern = Object.new
- def pattern.=~(other) true end
-
- @tc.assert_match pattern, 5
- end
-
- def test_assert_match_matchee_to_str
- @assertion_count = 2
-
- obj = Object.new
- def obj.to_str; "blah" end
-
- @tc.assert_match "blah", obj
- end
-
- def test_assert_match_object_triggered
- @assertion_count = 2
-
- pattern = Object.new
- def pattern.=~(other) false end
- def pattern.inspect; "[Object]" end
-
- util_assert_triggered 'Expected [Object] to match 5.' do
- @tc.assert_match pattern, 5
- end
- end
-
- def test_assert_match_triggered
- @assertion_count = 2
- util_assert_triggered 'Expected /\d+/ to match "blah blah blah".' do
- @tc.assert_match(/\d+/, "blah blah blah")
- end
- end
-
- def test_assert_nil
- @tc.assert_nil nil
- end
-
- def test_assert_nil_triggered
- util_assert_triggered 'Expected 42 to be nil.' do
- @tc.assert_nil 42
- end
- end
-
- def test_assert_operator
- @tc.assert_operator 2, :>, 1
- end
-
- def test_assert_operator_bad_object
- bad = Object.new
- def bad.==(other) true end
-
- @tc.assert_operator bad, :equal?, bad
- end
-
- def test_assert_operator_triggered
- util_assert_triggered "Expected 2 to be < 1." do
- @tc.assert_operator 2, :<, 1
- end
- end
-
- def test_assert_output_both
- @assertion_count = 2
-
- @tc.assert_output "yay", "blah" do
- print "yay"
- $stderr.print "blah"
- end
- end
-
- def test_assert_output_both_regexps
- @assertion_count = 4
-
- @tc.assert_output(/y.y/, /bl.h/) do
- print "yay"
- $stderr.print "blah"
- end
- end
-
- def test_assert_output_err
- @tc.assert_output nil, "blah" do
- $stderr.print "blah"
- end
- end
-
- def test_assert_output_neither
- @assertion_count = 0
-
- @tc.assert_output do
- # do nothing
- end
- end
-
- def test_assert_output_out
- @tc.assert_output "blah" do
- print "blah"
- end
- end
-
- def test_assert_output_triggered_both
- util_assert_triggered util_msg("blah", "blah blah", "In stderr") do
- @tc.assert_output "yay", "blah" do
- print "boo"
- $stderr.print "blah blah"
- end
- end
- end
-
- def test_assert_output_triggered_err
- util_assert_triggered util_msg("blah", "blah blah", "In stderr") do
- @tc.assert_output nil, "blah" do
- $stderr.print "blah blah"
- end
- end
- end
-
- def test_assert_output_triggered_out
- util_assert_triggered util_msg("blah", "blah blah", "In stdout") do
- @tc.assert_output "blah" do
- print "blah blah"
- end
- end
- end
-
- def test_assert_predicate
- @tc.assert_predicate "", :empty?
- end
-
- def test_assert_predicate_triggered
- util_assert_triggered 'Expected "blah" to be empty?.' do
- @tc.assert_predicate "blah", :empty?
- end
- end
-
- def test_assert_raises
- @tc.assert_raises RuntimeError do
- raise "blah"
- end
- end
-
- def test_assert_raises_module
- @tc.assert_raises MyModule do
- raise AnError
- end
- end
-
- ##
- # *sigh* This is quite an odd scenario, but it is from real (albeit
- # ugly) test code in ruby-core:
- #
- # http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29259
-
- def test_assert_raises_skip
- @assertion_count = 0
-
- util_assert_triggered "skipped", MiniTest::Skip do
- @tc.assert_raises ArgumentError do
- begin
- raise "blah"
- rescue
- skip "skipped"
- end
- end
- end
- end
-
- def test_assert_raises_triggered_different
- e = assert_raises MiniTest::Assertion do
- @tc.assert_raises RuntimeError do
- raise SyntaxError, "icky"
- end
- end
-
- expected = clean <<-EOM.chomp
- [RuntimeError] exception expected, not
- Class: <SyntaxError>
- Message: <\"icky\">
- ---Backtrace---
- FILE:LINE:in `test_assert_raises_triggered_different'
- ---------------
- EOM
-
- actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
- actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION >= '1.9.0'
-
- assert_equal expected, actual
- end
-
- def test_assert_raises_triggered_different_msg
- e = assert_raises MiniTest::Assertion do
- @tc.assert_raises RuntimeError, "XXX" do
- raise SyntaxError, "icky"
- end
- end
-
- expected = clean <<-EOM
- XXX.
- [RuntimeError] exception expected, not
- Class: <SyntaxError>
- Message: <\"icky\">
- ---Backtrace---
- FILE:LINE:in `test_assert_raises_triggered_different_msg'
- ---------------
- EOM
-
- actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
- actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION >= '1.9.0'
-
- assert_equal expected.chomp, actual
- end
-
- def test_assert_raises_triggered_none
- e = assert_raises MiniTest::Assertion do
- @tc.assert_raises MiniTest::Assertion do
- # do nothing
- end
- end
-
- expected = "MiniTest::Assertion expected but nothing was raised."
-
- assert_equal expected, e.message
- end
-
- def test_assert_raises_triggered_none_msg
- e = assert_raises MiniTest::Assertion do
- @tc.assert_raises MiniTest::Assertion, "XXX" do
- # do nothing
- end
- end
-
- expected = "XXX.\nMiniTest::Assertion expected but nothing was raised."
-
- assert_equal expected, e.message
- end
-
- def test_assert_raises_triggered_subclass
- e = assert_raises MiniTest::Assertion do
- @tc.assert_raises StandardError do
- raise AnError
- end
- end
-
- expected = clean <<-EOM.chomp
- [StandardError] exception expected, not
- Class: <AnError>
- Message: <\"AnError\">
- ---Backtrace---
- FILE:LINE:in `test_assert_raises_triggered_subclass'
- ---------------
- EOM
-
- actual = e.message.gsub(/^.+:\d+/, 'FILE:LINE')
- actual.gsub!(/block \(\d+ levels\) in /, '') if RUBY_VERSION >= '1.9.0'
-
- assert_equal expected, actual
- end
-
- def test_assert_respond_to
- @tc.assert_respond_to "blah", :empty?
- end
-
- def test_assert_respond_to_triggered
- util_assert_triggered 'Expected "blah" (String) to respond to #rawr!.' do
- @tc.assert_respond_to "blah", :rawr!
- end
- end
-
- def test_assert_same
- @assertion_count = 3
-
- o = "blah"
- @tc.assert_same 1, 1
- @tc.assert_same :blah, :blah
- @tc.assert_same o, o
- end
-
- def test_assert_same_triggered
- @assertion_count = 2
-
- util_assert_triggered 'Expected 2 (oid=N) to be the same as 1 (oid=N).' do
- @tc.assert_same 1, 2
- end
-
- s1 = "blah"
- s2 = "blah"
-
- util_assert_triggered 'Expected "blah" (oid=N) to be the same as "blah" (oid=N).' do
- @tc.assert_same s1, s2
- end
- end
-
- def test_assert_send
- @tc.assert_send [1, :<, 2]
- end
-
- def test_assert_send_bad
- util_assert_triggered "Expected 1.>(*[2]) to return true." do
- @tc.assert_send [1, :>, 2]
- end
- end
-
- def test_assert_silent
- @assertion_count = 2
-
- @tc.assert_silent do
- # do nothing
- end
- end
-
- def test_assert_silent_triggered_err
- util_assert_triggered util_msg("", "blah blah", "In stderr") do
- @tc.assert_silent do
- $stderr.print "blah blah"
- end
- end
- end
-
- def test_assert_silent_triggered_out
- @assertion_count = 2
-
- util_assert_triggered util_msg("", "blah blah", "In stdout") do
- @tc.assert_silent do
- print "blah blah"
- end
- end
- end
-
- def test_assert_throws
- @tc.assert_throws :blah do
- throw :blah
- end
- end
-
- def test_assert_throws_different
- util_assert_triggered 'Expected :blah to have been thrown, not :not_blah.' do
- @tc.assert_throws :blah do
- throw :not_blah
- end
- end
- end
-
- def test_assert_throws_unthrown
- util_assert_triggered 'Expected :blah to have been thrown.' do
- @tc.assert_throws :blah do
- # do nothing
- end
- end
- end
-
- def test_capture_io
- @assertion_count = 0
-
- non_verbose do
- out, err = capture_io do
- puts 'hi'
- warn 'bye!'
- end
-
- assert_equal "hi\n", out
- assert_equal "bye!\n", err
- end
- end
-
- def test_capture_subprocess_io
- @assertion_count = 0
- skip "Dunno why but the parallel run of this fails"
-
- non_verbose do
- out, err = capture_subprocess_io do
- system("echo 'hi'")
- system("echo 'bye!' 1>&2")
- end
-
- assert_equal "hi\n", out
- assert_equal "bye!\n", err
- end
- end
-
- def test_class_asserts_match_refutes
- @assertion_count = 0
-
- methods = MiniTest::Assertions.public_instance_methods
- methods.map! { |m| m.to_s } if Symbol === methods.first
-
- # These don't have corresponding refutes _on purpose_. They're
- # useless and will never be added, so don't bother.
- ignores = %w[assert_block assert_output assert_raises assert_send
- assert_silent assert_throws]
-
- # These are test/unit methods. I'm not actually sure why they're still here
- ignores += %w[assert_no_match assert_not_equal assert_not_nil
- assert_not_same assert_nothing_raised
- assert_nothing_thrown assert_raise]
-
- asserts = methods.grep(/^assert/).sort - ignores
- refutes = methods.grep(/^refute/).sort - ignores
-
- assert_empty refutes.map { |n| n.sub(/^refute/, 'assert') } - asserts
- assert_empty asserts.map { |n| n.sub(/^assert/, 'refute') } - refutes
- end
-
- def test_expectation
- @assertion_count = 2
-
- @tc.assert_equal true, 1.must_equal(1)
- end
-
- def test_expectation_triggered
- util_assert_triggered "Expected: 2\n Actual: 1" do
- 1.must_equal 2
- end
- end
-
- def test_expectation_with_a_message
- util_assert_triggered "Expected: 2\n Actual: 1" do
- 1.must_equal 2, ''
- end
- end
-
- def test_flunk
- util_assert_triggered 'Epic Fail!' do
- @tc.flunk
- end
- end
-
- def test_flunk_message
- util_assert_triggered @zomg do
- @tc.flunk @zomg
- end
- end
-
- def test_message
- @assertion_count = 0
-
- assert_equal "blah2.", @tc.message { "blah2" }.call
- assert_equal "blah2.", @tc.message("") { "blah2" }.call
- assert_equal "blah1.\nblah2.", @tc.message(:blah1) { "blah2" }.call
- assert_equal "blah1.\nblah2.", @tc.message("blah1") { "blah2" }.call
- end
-
- def test_pass
- @tc.pass
- end
-
- def test_prints
- printer = Class.new { extend MiniTest::Assertions }
- @tc.assert_equal '"test"', printer.mu_pp(ImmutableString.new 'test')
- end
-
- def test_refute
- @assertion_count = 2
-
- @tc.assert_equal false, @tc.refute(false), "returns false on success"
- end
-
- def test_refute_empty
- @assertion_count = 2
-
- @tc.refute_empty [1]
- end
-
- def test_refute_empty_triggered
- @assertion_count = 2
-
- util_assert_triggered "Expected [] to not be empty." do
- @tc.refute_empty []
- end
- end
-
- def test_refute_equal
- @tc.refute_equal "blah", "yay"
- end
-
- def test_refute_equal_triggered
- util_assert_triggered 'Expected "blah" to not be equal to "blah".' do
- @tc.refute_equal "blah", "blah"
- end
- end
-
- def test_refute_in_delta
- @tc.refute_in_delta 0.0, 1.0 / 1000, 0.000001
- end
-
- def test_refute_in_delta_triggered
- util_assert_triggered 'Expected |0.0 - 0.001| (0.001) to not be < 0.1.' do
- @tc.refute_in_delta 0.0, 1.0 / 1000, 0.1
- end
- end
-
- def test_refute_in_epsilon
- @tc.refute_in_epsilon 10000, 9990
- end
-
- def test_refute_in_epsilon_triggered
- util_assert_triggered 'Expected |10000 - 9991| (9) to not be < 10.0.' do
- @tc.refute_in_epsilon 10000, 9991
- fail
- end
- end
-
- def test_refute_includes
- @assertion_count = 2
-
- @tc.refute_includes [true], false
- end
-
- def test_refute_includes_triggered
- @assertion_count = 3
-
- e = @tc.assert_raises MiniTest::Assertion do
- @tc.refute_includes [true], true
- end
-
- expected = "Expected [true] to not include true."
- assert_equal expected, e.message
- end
-
- def test_refute_instance_of
- @tc.refute_instance_of Array, "blah"
- end
-
- def test_refute_instance_of_triggered
- util_assert_triggered 'Expected "blah" to not be an instance of String.' do
- @tc.refute_instance_of String, "blah"
- end
- end
-
- def test_refute_kind_of
- @tc.refute_kind_of Array, "blah"
- end
-
- def test_refute_kind_of_triggered
- util_assert_triggered 'Expected "blah" to not be a kind of String.' do
- @tc.refute_kind_of String, "blah"
- end
- end
-
- def test_refute_match
- @assertion_count = 2
- @tc.refute_match(/\d+/, "blah blah blah")
- end
-
- def test_refute_match_matcher_object
- @assertion_count = 2
- @tc.refute_match Object.new, 5 # default #=~ returns false
- end
-
- def test_refute_match_object_triggered
- @assertion_count = 2
-
- pattern = Object.new
- def pattern.=~(other) true end
- def pattern.inspect; "[Object]" end
-
- util_assert_triggered 'Expected [Object] to not match 5.' do
- @tc.refute_match pattern, 5
- end
- end
-
- def test_refute_match_triggered
- @assertion_count = 2
- util_assert_triggered 'Expected /\w+/ to not match "blah blah blah".' do
- @tc.refute_match(/\w+/, "blah blah blah")
- end
- end
-
- def test_refute_nil
- @tc.refute_nil 42
- end
-
- def test_refute_nil_triggered
- util_assert_triggered 'Expected nil to not be nil.' do
- @tc.refute_nil nil
- end
- end
-
- def test_refute_predicate
- @tc.refute_predicate "42", :empty?
- end
-
- def test_refute_predicate_triggered
- util_assert_triggered 'Expected "" to not be empty?.' do
- @tc.refute_predicate "", :empty?
- end
- end
-
- def test_refute_operator
- @tc.refute_operator 2, :<, 1
- end
-
- def test_refute_operator_bad_object
- bad = Object.new
- def bad.==(other) true end
-
- @tc.refute_operator true, :equal?, bad
- end
-
- def test_refute_operator_triggered
- util_assert_triggered "Expected 2 to not be > 1." do
- @tc.refute_operator 2, :>, 1
- end
- end
-
- def test_refute_respond_to
- @tc.refute_respond_to "blah", :rawr!
- end
-
- def test_refute_respond_to_triggered
- util_assert_triggered 'Expected "blah" to not respond to empty?.' do
- @tc.refute_respond_to "blah", :empty?
- end
- end
-
- def test_refute_same
- @tc.refute_same 1, 2
- end
-
- def test_refute_same_triggered
- util_assert_triggered 'Expected 1 (oid=N) to not be the same as 1 (oid=N).' do
- @tc.refute_same 1, 1
- end
- end
-
- def test_skip
- @assertion_count = 0
-
- util_assert_triggered "haha!", MiniTest::Skip do
- @tc.skip "haha!"
- end
- end
-
- def test_test_methods_random
- @assertion_count = 0
-
- sample_test_case = Class.new MiniTest::Unit::TestCase do
- def self.test_order; :random; end
- def test_test1; assert "does not matter" end
- def test_test2; assert "does not matter" end
- def test_test3; assert "does not matter" end
- end
-
- srand 42
- expected = %w(test_test2 test_test1 test_test3)
- assert_equal expected, sample_test_case.test_methods
- end
-
- def test_test_methods_sorted
- @assertion_count = 0
-
- sample_test_case = Class.new MiniTest::Unit::TestCase do
- def self.test_order; :sorted end
- def test_test3; assert "does not matter" end
- def test_test2; assert "does not matter" end
- def test_test1; assert "does not matter" end
- end
-
- expected = %w(test_test1 test_test2 test_test3)
- assert_equal expected, sample_test_case.test_methods
- end
-
- def test_i_suck_and_my_tests_are_order_dependent_bang_sets_test_order_alpha
- @assertion_count = 0
-
- shitty_test_case = Class.new MiniTest::Unit::TestCase
-
- shitty_test_case.i_suck_and_my_tests_are_order_dependent!
-
- assert_equal :alpha, shitty_test_case.test_order
- end
-
- def test_i_suck_and_my_tests_are_order_dependent_bang_does_not_warn
- @assertion_count = 0
-
- shitty_test_case = Class.new MiniTest::Unit::TestCase
-
- def shitty_test_case.test_order ; :lol end
-
- assert_silent do
- shitty_test_case.i_suck_and_my_tests_are_order_dependent!
- end
- end
-
- def util_assert_triggered expected, klass = MiniTest::Assertion
- e = assert_raises klass do
- yield
- end
-
- msg = e.message.sub(/(---Backtrace---).*/m, '\1')
- msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
-
- assert_equal expected, msg
- end
-
- def util_msg exp, act, msg = nil
- s = "Expected: #{exp.inspect}\n Actual: #{act.inspect}"
- s = "#{msg}.\n#{s}" if msg
- s
- end
-
- def without_diff
- old_diff = MiniTest::Assertions.diff
- MiniTest::Assertions.diff = nil
-
- yield
- ensure
- MiniTest::Assertions.diff = old_diff
- end
-end
-
-class TestMiniTestGuard < MiniTest::Unit::TestCase
- parallelize_me! if ENV["PARALLEL"]
-
- def test_mri_eh
- assert self.class.mri? "ruby blah"
- assert self.mri? "ruby blah"
- end
-
- def test_jruby_eh
- assert self.class.jruby? "java"
- assert self.jruby? "java"
- end
-
- def test_rubinius_eh
- assert self.class.rubinius? "rbx"
- assert self.rubinius? "rbx"
- end
-
- def test_windows_eh
- assert self.class.windows? "mswin"
- assert self.windows? "mswin"
- end
-end
diff --git a/test/misc/test_ruby_mode.rb b/test/misc/test_ruby_mode.rb
deleted file mode 100644
index e011ece1cf..0000000000
--- a/test/misc/test_ruby_mode.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-require 'test/unit'
-require 'tempfile'
-
-class TestRubyMode < Test::Unit::TestCase
- MISCDIR = File.expand_path("../../../misc", __FILE__)
- e = ENV["EMACS"] || "emacs"
- emacs = %W"#{e} -q --no-site-file --batch --load #{MISCDIR}/ruby-mode.el"
- begin
- raise if IO.popen([e, "--version", :err=>[:child, :out]]) {|f| f.read}[/[0-9]+/].to_i < 23
- IO.popen([*emacs, :err=>[:child, :out]]) {|f| f.read}
- rescue
- EMACS = nil
- else
- EMACS = (emacs if $? and $?.success?)
- end
-end
-
-class TestRubyMode
- EVAL_OPT = "--eval"
- EXPR_SAVE = "(save-buffer)"
- EXPR_RUBYMODE = "(ruby-mode)"
- EXPR_NOBACKUP = "(progn" \
- " (set (make-local-variable \'backup-inhibited) t)" \
- " (set-buffer-modified-p t)" \
- ")"
-
- def run_emacs(src, *exprs)
- tmp = Tempfile.new(%w"ruby-mode.test. .rb")
- tmp.puts(src)
- tmp.close
- exprs = exprs.map {|expr| [EVAL_OPT, expr]}.flatten
- exprs.unshift(EVAL_OPT, EXPR_RUBYMODE)
- exprs.unshift(EVAL_OPT, EXPR_NOBACKUP)
- output = IO.popen([*EMACS, tmp.path, *exprs, err:[:child, :out]], "r") {|e| e.read}
- tmp.open
- result = tmp.read
- tmp.close!
- return result, output
- end
-
- class TestIndent < self
- EXPR_INDENT = "(indent-region (point-min) (point-max))"
-
- def assert_indent(expected, source, *message)
- if space = expected[/\A\n?(\s*\|)/, 1]
- space = /^#{Regexp.quote(space)}/m
- expected.gsub!(space, '')
- source.gsub!(space, '')
- end
- result, output = run_emacs(source, EXPR_INDENT, EXPR_SAVE)
- assert_match(/^Wrote /, output)
- assert_equal(expected, result, *message)
- end
-
- def test_simple
- assert_indent('
- |if foo
- | bar
- |end
- |zot
- |', '
- |if foo
- |bar
- | end
- | zot
- |')
- end
-
- def test_keyword_label
- assert_indent('
- |bar(class: XXX) do
- | foo
- |end
- |bar
- |', '
- |bar(class: XXX) do
- | foo
- | end
- | bar
- |')
- end
-
- def test_method_with_question_mark
- assert_indent('
- |if x.is_a?(XXX)
- | foo
- |end
- |', '
- |if x.is_a?(XXX)
- | foo
- | end
- |')
- end
-
- def test_expr_in_regexp
- assert_indent('
- |if /#{foo}/ =~ s
- | x = 1
- |end
- |', '
- |if /#{foo}/ =~ s
- | x = 1
- | end
- |')
- end
-
- def test_singleton_class
- skip("pending")
- assert_indent('
- |class<<bar
- | foo
- |end
- |', '
- |class<<bar
- |foo
- | end
- |')
- end
-
- def test_array_literal
- assert_indent('
- |foo = [
- | bar
- |]
- |', '
- |foo = [
- | bar
- | ]
- |')
- assert_indent('
- |foo do
- | [bar]
- |end
- |', '
- |foo do
- |[bar]
- | end
- |')
- end
-
- def test_begin_end
- assert_indent('
- |begin
- | a[b]
- |end
- |', '
- |begin
- | a[b]
- | end
- |')
- end
-
- def test_array_after_paren_and_space
- assert_indent('
- |class A
- | def foo
- | foo( [])
- | end
- |end
- |', '
- |class A
- | def foo
- |foo( [])
- |end
- | end
- |')
- end
-
- def test_spread_arguments
- assert_indent('
- |foo(1,
- | 2,
- | 3)
- |', '
- |foo(1,
- | 2,
- | 3)
- |')
- end
- end
-end if TestRubyMode::EMACS
diff --git a/test/mkmf/base.rb b/test/mkmf/base.rb
index 3ae10aa797..1b5b89e17c 100644
--- a/test/mkmf/base.rb
+++ b/test/mkmf/base.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'mkmf'
require 'tmpdir'
-require_relative '../ruby/envutil'
$extout = '$(topdir)/'+RbConfig::CONFIG["EXTOUT"]
RbConfig::CONFIG['topdir'] = CONFIG['topdir'] = File.expand_path(CONFIG['topdir'])
@@ -10,136 +9,26 @@ $INCFLAGS << " -I."
$extout_prefix = "$(extout)$(target_prefix)/"
class TestMkmf < Test::Unit::TestCase
- MKMFLOG = proc {File.read("mkmf.log") rescue ""}
- class << MKMFLOG
- alias to_s call
- end
-
- class Capture
- attr_accessor :origin
- def initialize
- @buffer = ""
- @filter = nil
- @out = true
- @origin = nil
- end
- def clear
- @buffer.clear
- end
- def flush
- STDOUT.print @filter ? @filter.call(@buffer) : @buffer
- clear
- end
- def reopen(io)
- case io
- when Capture
- initialize_copy(io)
- when File
- @out = false
- @origin.reopen(io) if @origin
- when IO
- @out = true
- @origin.reopen(io) if @origin
- else
- @out = false
- end
- end
- def filter(&block)
- @filter = block
- end
- def write(s)
- @buffer << s if @out
- end
- end
-end
-
-module TestMkmf::Base
- attr_reader :stdout
-
- def mkmflog(msg)
- log = proc {MKMFLOG[] << msg}
- class << log
- alias to_s call
- end
- log
- end
-
def setup
- @rbconfig = rbconfig0 = RbConfig::CONFIG
- @mkconfig = mkconfig0 = RbConfig::MAKEFILE_CONFIG
- rbconfig = {
- "hdrdir" => $hdrdir,
- "srcdir" => $srcdir,
- "topdir" => $topdir,
- }
- mkconfig = {
- "hdrdir" => "$(top_srcdir)/include",
- "srcdir" => "$(top_srcdir)",
- "topdir" => $topdir,
- }
- rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
- mkconfig0.each_pair {|key, val| mkconfig[key] ||= val.dup}
- RbConfig.module_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, rbconfig)
- remove_const(:MAKEFILE_CONFIG)
- const_set(:MAKEFILE_CONFIG, mkconfig)
- }
- MakeMakefile.class_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, mkconfig)
- }
@tmpdir = Dir.mktmpdir
@curdir = Dir.pwd
@mkmfobj = Object.new
- @stdout = TestMkmf::Capture.new
Dir.chdir(@tmpdir)
- @quiet, Logging.quiet = Logging.quiet, true
- init_mkmf
- $INCFLAGS[0, 0] = "-I. "
+ class << (@output = "")
+ def flush; end
+ def reopen(*) end
+ alias write <<
+ end
+ $stdout = @output
end
def teardown
- rbconfig0 = @rbconfig
- mkconfig0 = @mkconfig
- RbConfig.module_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, rbconfig0)
- remove_const(:MAKEFILE_CONFIG)
- const_set(:MAKEFILE_CONFIG, mkconfig0)
- }
- MakeMakefile.class_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, mkconfig0)
- }
- Logging.quiet = @quiet
- Logging.log_close
- FileUtils.rm_f("mkmf.log")
+ $stdout = STDOUT
Dir.chdir(@curdir)
FileUtils.rm_rf(@tmpdir)
end
def mkmf(*args, &block)
- @stdout.clear
- stdout, @stdout.origin, $stdout = @stdout.origin, $stdout, @stdout
@mkmfobj.instance_eval(*args, &block)
- ensure
- $stdout, @stdout.origin = @stdout.origin, stdout
- end
-
- def config_value(name)
- create_tmpsrc("---config-value=#{name}")
- xpopen(cpp_command('')) do |f|
- f.grep(/^---config-value=(.*)/) {return $1}
- end
- nil
- end
-end
-
-class TestMkmf
- include TestMkmf::Base
-
- def assert_separately(args, src, *rest)
- super(args + ["-r#{__FILE__}"], "extend TestMkmf::Base; setup\n#{src}", *rest)
end
end
diff --git a/test/mkmf/test_constant.rb b/test/mkmf/test_constant.rb
deleted file mode 100644
index fd1f940c44..0000000000
--- a/test/mkmf/test_constant.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require_relative 'base'
-
-class TestMkmf
- class TestTryConstant < TestMkmf
- def test_simple
- assert_equal( 0, mkmf {try_constant("0")}, MKMFLOG)
- assert_equal( 1, mkmf {try_constant("1")}, MKMFLOG)
- assert_equal(-1, mkmf {try_constant("-1")}, MKMFLOG)
- end
-
- def test_sizeof
- assert_equal(config_value("SIZEOF_INT").to_i, mkmf {try_constant("sizeof(int)")}, MKMFLOG)
- assert_equal(config_value("SIZEOF_LONG").to_i, mkmf {try_constant("sizeof(long)")}, MKMFLOG)
- assert_equal(config_value("SIZEOF_VOIDP").to_i, mkmf {try_constant("sizeof(void*)")}, MKMFLOG)
- assert_equal(config_value("SIZEOF_VALUE").to_i, mkmf {try_constant("sizeof(Qnil)")}, MKMFLOG)
- end
-
- def test_long
- sizeof_int = config_value("SIZEOF_INT").to_i
- sizeof_long = config_value("SIZEOF_LONG").to_i
- if sizeof_long > sizeof_int
- type = 'long'
- else
- sizeof_long_long = config_value("SIZEOF_LONG_LONG").to_i
- return if !sizeof_long_long or sizeof_long_long <= sizeof_int
- type = 'LONG_LONG'
- end
-
- decl = "#define CONFTEST_VALUE (unsigned #{type})(((unsigned #{type})1)<<(CHAR_BIT*sizeof(int)))"
- assert_operator(mkmf {try_constant("CONFTEST_VALUE", [[decl]])}, :>, 0, MKMFLOG)
- end
-
- def test_large_unsigned
- assert_operator(mkmf {try_constant("1U<<(CHAR_BIT*sizeof(int)-1)")}, :>, 0, MKMFLOG)
- end
- end
-end
diff --git a/test/mkmf/test_convertible.rb b/test/mkmf/test_convertible.rb
deleted file mode 100644
index eec2d12c66..0000000000
--- a/test/mkmf/test_convertible.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require_relative 'base'
-
-class TestMkmf
- class TestConvertible < TestMkmf
- def test_typeof_builtin
- ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
- %w[short int long].each do |type|
- assert_equal((prefix || signed)+type,
- mkmf {convertible_int(signed+type)}, MKMFLOG)
- end
- end
- end
-
- def test_typeof_typedef
- ["", ["signed ", ""], "unsigned "].each do |signed, prefix|
- %w[short int long].each do |type|
- open("confdefs.h", "w") {|f|
- f.puts "typedef #{signed}#{type} test1_t;"
- }
- $defs.clear
- assert_equal((prefix || signed)+type,
- mkmf {convertible_int("test1_t", "confdefs.h")}, MKMFLOG)
- (u = signed[/^u/]) and u.upcase!
- assert_include($defs, "-DTYPEOF_TEST1_T="+"#{prefix||signed}#{type}".quote)
- assert_include($defs, "-DPRI_TEST1T_PREFIX=PRI_#{type.upcase}_PREFIX")
- assert_include($defs, "-DTEST1T2NUM=#{u}#{type.upcase}2NUM")
- assert_include($defs, "-DNUM2TEST1T=NUM2#{u}#{type.upcase}")
- end
- end
- ensure
- File.unlink("confdefs.h")
- end
- end
-end
diff --git a/test/mkmf/test_find_executable.rb b/test/mkmf/test_find_executable.rb
index fe45ef2d1c..87e1d03c51 100644
--- a/test/mkmf/test_find_executable.rb
+++ b/test/mkmf/test_find_executable.rb
@@ -2,49 +2,35 @@ require_relative 'base'
class TestMkmf
class TestFindExecutable < TestMkmf
- def setup
- super
- @path, ENV["PATH"] = ENV["PATH"], @tmpdir
- end
-
- def teardown
- ENV["PATH"] = @path
- super
+ class F
+ def do_find_executable(name)
+ find_executable(name)
+ end
end
def test_find_executable
bug2669 = '[ruby-core:27912]'
+ path, ENV["PATH"] = ENV["PATH"], path
+ ENV["PATH"] = @tmpdir
+ f = F.new
name = "foobar#{$$}#{rand(1000)}"
- exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
- stdout.filter {|s| s.sub(name, "<executable>")}
- exts[0] ||= ""
+ if /mswin\d|mingw|cygwin/ =~ RUBY_PLATFORM
+ exts = %w[.exe .com .cmd .bat]
+ else
+ exts = [""]
+ end
exts.each do |ext|
full = name+ext
begin
open(full, "w") {|ff| ff.chmod(0755)}
- result = mkmf {find_executable(name)}
+ result = f.do_find_executable(name)
ensure
File.unlink(full)
end
assert_equal("#{@tmpdir}/#{name}#{ext}", result, bug2669)
end
- end
-
- def test_find_executable_dir
- name = "foobar#{$$}#{rand(1000)}"
- exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
- stdout.filter {|s| s.sub(name, "<executable>")}
- exts[0] ||= ""
- exts.each do |ext|
- full = name+ext
- begin
- Dir.mkdir(full)
- result = mkmf {find_executable(name)}
- ensure
- Dir.rmdir(full)
- end
- assert_nil(result)
- end
+ ensure
+ ENV["PATH"] = path
end
end
end
diff --git a/test/mkmf/test_flags.rb b/test/mkmf/test_flags.rb
deleted file mode 100644
index e49d474dc9..0000000000
--- a/test/mkmf/test_flags.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require_relative 'base'
-
-class TestMkmf
- class TestFlags < TestMkmf
- def test_valid_warnflags
- val = $extmk
- warnflags = $warnflags
- makefile = mkmf do
- $extmk = false
- self.class::CONFIG['warnflags'] = %w"-Wextra
- -Wno-unused-parameter -Wno-parentheses -Wno-long-long
- -Wno-missing-field-initializers -Werror=pointer-arith
- -Werror=write-strings -Werror=declaration-after-statement
- -Werror=shorten-64-to-32
- -Werror-implicit-function-declaration
- ".join(' ')
- self.class::CONFIG['GCC'] = 'yes'
- init_mkmf(self.class::CONFIG)
- configuration '.'
- end
- generated_flags = makefile.grep(/warnflags/).first[/^warnflags = (.*)$/, 1].split
-
- assert_equal %w"
- -Wextra -Wno-unused-parameter -Wno-parentheses
- -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith
- -Wwrite-strings -Wdeclaration-after-statement
- -Wshorten-64-to-32 -Wimplicit-function-declaration
- ", generated_flags
-
- ensure
- $warnflags = warnflags
- $extmk = val
- end
-
- def test_try_ldflag_invalid_opt
- assert_separately([], <<-'end;') #do
- assert(!try_ldflags("nosuch.c"), TestMkmf::MKMFLOG)
- assert(have_devel?, TestMkmf::MKMFLOG)
- end;
- end
-
- def test_try_cflag_invalid_opt
- assert_separately([], <<-'end;') #do
- assert(!try_cflags("nosuch.c"), TestMkmf::MKMFLOG)
- assert(have_devel?, TestMkmf::MKMFLOG)
- end;
- end
-
- def test_try_cppflag_invalid_opt
- assert_separately([], <<-'end;') #do
- assert(!try_cppflags("nosuch.c"), TestMkmf::MKMFLOG)
- assert(have_devel?, TestMkmf::MKMFLOG)
- end;
- end
- end
-end
diff --git a/test/mkmf/test_framework.rb b/test/mkmf/test_framework.rb
deleted file mode 100644
index 48e8bf7213..0000000000
--- a/test/mkmf/test_framework.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require_relative 'base'
-
-class TestMkmf
- class TestHaveFramework < TestMkmf
- def create_framework(fw, hdrname = "#{fw}.h")
- Dir.mktmpdir("frameworks") do |dir|
- fwdir = "#{dir}/#{fw}.framework"
- hdrdir = "#{fwdir}/Headers"
- FileUtils.mkdir_p(hdrdir)
- File.write("#{hdrdir}/#{hdrname}", "")
- src = "#{fwdir}/main.c"
- File.write(src, "void #{fw}(void) {}")
- cmd = LINK_SO.dup
- RbConfig.expand(cmd, RbConfig::CONFIG.merge("OBJS"=>src))
- cmd.gsub!("$@", "#{fwdir}/#{fw}")
- cmd.gsub!(/ -bundle /, ' -dynamiclib ')
- assert(xsystem(cmd), MKMFLOG)
- $INCFLAGS << " " << "-F#{dir}".quote
- yield fw, hdrname
- end
- end
-
- def test_core_foundation_framework
- assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C"))
- end
-
- def test_multi_frameworks
- assert(have_framework("CoreFoundation"), mkmflog("try as Objective-C"))
- assert(have_framework("Cocoa"), mkmflog("try as Objective-C"))
- end
-
- def test_empty_framework
- create_framework("MkmfTest") do |fw|
- assert(have_framework(fw), MKMFLOG)
- end
- end
-
- def test_different_name_header
- bug8593 = '[ruby-core:55745] [Bug #8593]'
- create_framework("MkmfTest", "test_mkmf.h") do |fw, hdrname|
- assert(!have_framework(fw), MKMFLOG)
- assert(have_framework([fw, hdrname]), MKMFLOG)
- end
- end
- end
-end if /darwin/ =~ RUBY_PLATFORM
diff --git a/test/mkmf/test_have_func.rb b/test/mkmf/test_have_func.rb
deleted file mode 100644
index 8049ffba18..0000000000
--- a/test/mkmf/test_have_func.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require_relative 'base'
-require 'tempfile'
-
-class TestMkmf
- class TestHaveFunc < TestMkmf
- def test_have_func
- assert_equal(true, have_func("ruby_init"), MKMFLOG)
- end
-
- def test_not_have_func
- assert_equal(false, have_func("no_ruby_init"), MKMFLOG)
- end
- end
-end
diff --git a/test/mkmf/test_have_library.rb b/test/mkmf/test_have_library.rb
deleted file mode 100644
index 3cdc6e2c9f..0000000000
--- a/test/mkmf/test_have_library.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require_relative 'base'
-require 'tempfile'
-
-class TestMkmf
- class TestHaveLibrary < TestMkmf
- LIBRARY_NAME = 'mkmftest'
- HEADER_NAME = "#{LIBRARY_NAME}.h"
- FUNC_NAME = 'ruby_mkmftest_foo'
- ARPREFIX = config_string('LIBRUBY_A') {|lib| lib[/\A\w+/]}
-
- def create_library(libname = LIBRARY_NAME)
- lib = "#{ARPREFIX}#{libname}.#{$LIBEXT}"
- open(HEADER_NAME, "w") do |hdr|
- hdr.puts "void #{FUNC_NAME}(void);"
- hdr.puts "void #{FUNC_NAME}_fake(void);"
- end
- create_tmpsrc("#include \"#{HEADER_NAME}\"\n""void #{FUNC_NAME}(void) {}")
- xsystem(cc_command)
- xsystem("#{CONFIG['AR']} #{config_string('ARFLAGS') || 'cru '}#{lib} conftest.#{$OBJEXT}")
- File.unlink("conftest.#{$OBJEXT}")
- config_string('RANLIB') do |ranlib|
- xsystem("#{ranlib} #{lib}")
- end
- end
-
- def assert_have_library(*args)
- assert_equal(true, have_library(LIBRARY_NAME, *args), MKMFLOG)
- end
-
- def assert_not_have_library(*args)
- assert_equal(false, have_library(LIBRARY_NAME, *args), MKMFLOG)
- end
-
- def test_have_library
- create_library
- assert_have_library
- end
-
- def test_have_library_with_name
- create_library
- assert_have_library(FUNC_NAME, HEADER_NAME)
- end
-
- def test_not_have_library
- assert_not_have_library
- end
-
- def test_not_have_library_with_name
- create_library
- assert_not_have_library("#{FUNC_NAME}_fake", HEADER_NAME)
- end
- end
-end
diff --git a/test/mkmf/test_have_macro.rb b/test/mkmf/test_have_macro.rb
deleted file mode 100644
index 735a57c093..0000000000
--- a/test/mkmf/test_have_macro.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require_relative 'base'
-require 'tempfile'
-
-class TestMkmf
- class TestHaveMacro < TestMkmf
- MACRO_NAME = "RUBY_MKMFTEST_FOOBAR"
-
- def test_have_macro_opt
- assert_equal(true, have_macro(MACRO_NAME, nil, "-D#{MACRO_NAME}"), MKMFLOG)
- end
-
- def test_have_macro_header
- Tempfile.open(%w"test_mkmf .h", ".") do |tmp|
- tmp.puts("#undef #{MACRO_NAME}")
- tmp.puts("#define #{MACRO_NAME} 1")
- tmp.close
- base = File.basename(tmp.path)
- assert_equal(true, have_macro(MACRO_NAME, base, "-I."), MKMFLOG)
- end
- end
-
- def test_not_have_macro_opt
- assert_equal(false, have_macro(MACRO_NAME, nil, "-U#{MACRO_NAME}"), MKMFLOG)
- end
-
- def test_not_have_macro_header
- Tempfile.open(%w"test_mkmf .h", ".") do |tmp|
- tmp.puts("#undef #{MACRO_NAME}")
- tmp.close
- base = File.basename(tmp.path)
- assert_equal(false, have_macro(MACRO_NAME, base, "-I."), MKMFLOG)
- end
- end
- end
-end
diff --git a/test/mkmf/test_libs.rb b/test/mkmf/test_libs.rb
deleted file mode 100644
index 27674dfd26..0000000000
--- a/test/mkmf/test_libs.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require_relative 'base'
-
-class TestMkmf
- class TestLibs < TestMkmf
- def test_split_libs
- assert_equal(%w[-lfoo -lbar], split_libs("-lfoo -lbar"))
- assert_equal(%w[-ObjC -framework\ Ruby], split_libs("-ObjC -framework Ruby"), 'Bug #6987')
- end
-
- def assert_in_order(array, x, y, mesg = nil)
- mesg = "#{x} must proceed to #{y}#{': ' if mesg}#{mesg}"
- assert_operator(array.index(x), :<, array.rindex(y), mesg)
- end
-
- def test_merge_simple
- bug = '[ruby-dev:21765]'
- assert_equal([], merge_libs(%w[]))
- assert_equal(%w[a b], merge_libs(%w[a], %w[b]))
- array = merge_libs(%w[a c], %w[b])
- assert_in_order(array, "a", "c", bug)
- end
-
- def test_merge_seq
- bug = '[ruby-dev:21765]'
- array = merge_libs(%w[a c d], %w[c b e])
- assert_in_order(array, "a", "c", bug)
- assert_in_order(array, "c", "d", bug)
- assert_in_order(array, "c", "b", bug)
- assert_in_order(array, "b", "e", bug)
- end
-
- def test_merge_seq_pre
- bug = '[ruby-dev:21765]'
- array = merge_libs(%w[a c d], %w[b c d e])
- assert_in_order(array, "a", "c", bug)
- assert_in_order(array, "c", "d", bug)
- assert_in_order(array, "b", "c", bug)
- assert_in_order(array, "d", "e", bug)
- end
-
- def test_merge_cyclic
- bug = '[ruby-dev:21765]'
- array = merge_libs(%w[a c d], %w[b c b])
- assert_in_order(array, "a", "c", bug)
- assert_in_order(array, "c", "d", bug)
- assert_in_order(array, "b", "c", bug)
- assert_in_order(array, "c", "b", bug)
- end
-
- def test_merge_cyclic_2
- bug = '[ruby-dev:21765]'
- array = merge_libs(%w[a c a d], %w[b c b])
- assert_in_order(array, "a", "c", bug)
- assert_in_order(array, "c", "a", bug)
- assert_in_order(array, "c", "d", bug)
- assert_in_order(array, "a", "d", bug)
- assert_in_order(array, "b", "c", bug)
- assert_in_order(array, "c", "b", bug)
- end
-
- def test_merge_reversal
- bug = '[ruby-dev:22440]'
- array = merge_libs(%w[a b c], %w[c d a])
- assert_in_order(array, "a", "b" , bug)
- assert_in_order(array, "c", "d" , bug)
- ## assume that a and c have no dependency
- end
-
- def test_merge_reversal_followed
- bug7467 = '[ruby-core:50314] [Bug #7467]'
- array = nil
- assert_nothing_raised(bug7467) {
- array = merge_libs(%w[a b c d e f g h], %w[d c d e], [])
- }
- assert_in_order(array, "a", "b", bug7467)
- assert_in_order(array, "b", "c", bug7467)
- assert_in_order(array, "c", "d", bug7467)
- assert_in_order(array, "d", "e", bug7467)
- assert_in_order(array, "e", "f", bug7467)
- assert_in_order(array, "f", "g", bug7467)
- assert_in_order(array, "g", "h", bug7467)
- assert_in_order(array, "d", "c", bug7467)
- assert_in_order(array, "c", "e", bug7467)
- end
- end
-end if RUBY_ENGINE == "ruby"
diff --git a/test/mkmf/test_signedness.rb b/test/mkmf/test_signedness.rb
deleted file mode 100644
index 8d58073698..0000000000
--- a/test/mkmf/test_signedness.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require_relative 'base'
-
-class TestMkmf
- class TestSignedness < TestMkmf
- def test_typeof_builtin
- bug4144 = '[ruby-dev:42731]'
- [["", "-1"], ["signed ", "-1"], ["unsigned ", "+1"]].each do |signed, expect|
- %w[short int long].each do |type|
- assert_equal(expect.to_i, mkmf {check_signedness(signed+type)}, mkmflog(bug4144))
- end
- end
- end
-
- def test_typeof_typedef
- [["", "-1"], ["signed ", "-1"], ["unsigned ", "+1"]].each do |signed, expect|
- %w[short int long].each do |type|
- open("confdefs.h", "w") {|f|
- f.puts "typedef #{signed}#{type} test1_t;"
- }
- $defs.clear
- assert_equal(expect.to_i, mkmf {check_signedness("test1_t", "confdefs.h")}, MKMFLOG)
- assert_include($defs, "-DSIGNEDNESS_OF_TEST1_T=#{expect}")
- end
- end
- ensure
- File.unlink("confdefs.h")
- end
- end
-end
diff --git a/test/mkmf/test_sizeof.rb b/test/mkmf/test_sizeof.rb
index c0144226d5..e1c498dc0a 100644
--- a/test/mkmf/test_sizeof.rb
+++ b/test/mkmf/test_sizeof.rb
@@ -2,46 +2,11 @@ require_relative 'base'
class TestMkmf
class TestSizeof < TestMkmf
- def setup
- super
- @sizeof_short = config_value("SIZEOF_SHORT").to_i
- @sizeof_int = config_value("SIZEOF_INT").to_i
- @sizeof_long = config_value("SIZEOF_LONG").to_i
- @sizeof_long_long = config_value("SIZEOF_LONG_LONG").to_i
- @sizeof___int64 = config_value("SIZEOF___INT64").to_i
- end
-
- def test_sizeof_builtin
- %w[char short int long float double void*].each do |type|
- assert_kind_of(Integer, mkmf {check_sizeof(type)}, MKMFLOG)
- end
- assert_operator(@sizeof_short, :<=, @sizeof_int)
- assert_operator(@sizeof_int, :<=, @sizeof_long)
- assert_operator(@sizeof_long, :<=, @sizeof_long_long) unless @sizeof_long_long.zero?
- assert_equal(8, @sizeof___int64) unless @sizeof___int64.zero?
- end
-
- def test_sizeof_struct
+ def test_sizeof
open("confdefs.h", "w") {|f|
f.puts "typedef struct {char x;} test1_t;"
}
- assert_equal(1, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
-
- open("confdefs.h", "w") {|f|
- f.puts "typedef struct {char x, y;} test1_t;"
- }
- assert_equal(2, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
-
- open("confdefs.h", "w") {|f|
- f.puts "typedef struct {int x;} test1_t;"
- }
- assert_equal(@sizeof_int, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
- open("confdefs.h", "w") {|f|
- f.puts "typedef struct {int x, y;} test1_t;"
- }
- assert_equal(2 * @sizeof_int, mkmf {check_sizeof("test1_t", "confdefs.h")}, MKMFLOG)
- ensure
- File.unlink("confdefs.h")
+ assert_equal(1, mkmf {size = check_sizeof("test1_t", "confdefs.h")})
end
end
end
diff --git a/test/net/ftp/test_buffered_socket.rb b/test/net/ftp/test_buffered_socket.rb
deleted file mode 100644
index f9eefcd988..0000000000
--- a/test/net/ftp/test_buffered_socket.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require "net/ftp"
-require "test/unit"
-require "ostruct"
-require "stringio"
-
-class FTPTest < Test::Unit::TestCase
- def test_gets_empty
- sock = create_buffered_socket("")
- assert_equal(nil, sock.gets)
- end
-
- def test_gets_one_line
- sock = create_buffered_socket("foo\n")
- assert_equal("foo\n", sock.gets)
- end
-
- def test_gets_one_line_without_term
- sock = create_buffered_socket("foo")
- assert_equal("foo", sock.gets)
- end
-
- def test_gets_two_lines
- sock = create_buffered_socket("foo\nbar\n")
- assert_equal("foo\n", sock.gets)
- assert_equal("bar\n", sock.gets)
- end
-
- def test_gets_two_lines_without_term
- sock = create_buffered_socket("foo\nbar")
- assert_equal("foo\n", sock.gets)
- assert_equal("bar", sock.gets)
- end
-
- private
-
- def create_buffered_socket(s)
- io = StringIO.new(s)
- return Net::FTP::BufferedSocket.new(io)
- end
-end
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
deleted file mode 100644
index f25e10747b..0000000000
--- a/test/net/ftp/test_ftp.rb
+++ /dev/null
@@ -1,813 +0,0 @@
-require "net/ftp"
-require "test/unit"
-require "ostruct"
-require "stringio"
-
-class FTPTest < Test::Unit::TestCase
- SERVER_ADDR = "127.0.0.1"
-
- def setup
- @thread = nil
- end
-
- def teardown
- if @thread
- @thread.join
- end
- end
-
- def test_not_connected
- ftp = Net::FTP.new
- assert_raise(Net::FTPConnectionError) do
- ftp.quit
- end
- end
-
- def test_connect_fail
- server = create_ftp_server { |sock|
- sock.print("421 Service not available, closing control connection.\r\n")
- }
- begin
- ftp = Net::FTP.new
- assert_raise(Net::FTPTempError){ ftp.connect(SERVER_ADDR, server.port) }
- ensure
- ftp.close if ftp
- server.close
- end
- end
-
- def test_parse227
- ftp = Net::FTP.new
- host, port = ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1,12,34)")
- assert_equal("192.168.0.1", host)
- assert_equal(3106, port)
- assert_raise(Net::FTPReplyError) do
- ftp.send(:parse227, "500 Syntax error")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse227, "227 Entering Passive Mode")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1,12,34,56)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse227, "227 Entering Passive Mode (192,168,0,1)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse227, "227 ) foo bar (")
- end
- end
-
- def test_parse228
- ftp = Net::FTP.new
- host, port = ftp.send(:parse228, "228 Entering Long Passive Mode (4,4,192,168,0,1,2,12,34)")
- assert_equal("192.168.0.1", host)
- assert_equal(3106, port)
- host, port = ftp.send(:parse228, "228 Entering Long Passive Mode (6,16,16,128,0,0,0,0,0,0,0,8,8,0,32,12,65,122,2,12,34)")
- assert_equal("1080:0000:0000:0000:0008:0800:200c:417a", host)
- assert_equal(3106, port)
- assert_raise(Net::FTPReplyError) do
- ftp.send(:parse228, "500 Syntax error")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse228, "228 Entering Passive Mode")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse228, "228 Entering Long Passive Mode (6,4,192,168,0,1,2,12,34)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse228, "228 Entering Long Passive Mode (4,4,192,168,0,1,3,12,34,56)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse228, "228 Entering Long Passive Mode (4,16,16,128,0,0,0,0,0,0,0,8,8,0,32,12,65,122,2,12,34)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse228, "228 Entering Long Passive Mode (6,16,16,128,0,0,0,0,0,0,0,8,8,0,32,12,65,122,3,12,34,56)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse228, "228 Entering Long Passive Mode (6,16,16,128,0,0,0,0,0,0,0,8,8,0,32,12,65,122,2,12,34,56)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse227, "227 ) foo bar (")
- end
- end
-
- def test_parse229
- ftp = Net::FTP.new
- sock = OpenStruct.new
- sock.peeraddr = [nil, nil, nil, "1080:0000:0000:0000:0008:0800:200c:417a"]
- ftp.instance_variable_set(:@sock, sock)
- host, port = ftp.send(:parse229, "229 Entering Passive Mode (|||3106|)")
- assert_equal("1080:0000:0000:0000:0008:0800:200c:417a", host)
- assert_equal(3106, port)
- host, port = ftp.send(:parse229, "229 Entering Passive Mode (!!!3106!)")
- assert_equal("1080:0000:0000:0000:0008:0800:200c:417a", host)
- assert_equal(3106, port)
- host, port = ftp.send(:parse229, "229 Entering Passive Mode (~~~3106~)")
- assert_equal("1080:0000:0000:0000:0008:0800:200c:417a", host)
- assert_equal(3106, port)
- assert_raise(Net::FTPReplyError) do
- ftp.send(:parse229, "500 Syntax error")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse229, "229 Entering Passive Mode")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse229, "229 Entering Passive Mode (|!!3106!)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse229, "229 Entering Passive Mode ( 3106 )")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse229, "229 Entering Passive Mode (\x7f\x7f\x7f3106\x7f)")
- end
- assert_raise(Net::FTPProtoError) do
- ftp.send(:parse229, "229 ) foo bar (")
- end
- end
-
- def test_parse_pasv_port
- ftp = Net::FTP.new
- assert_equal(12, ftp.send(:parse_pasv_port, "12"))
- assert_equal(3106, ftp.send(:parse_pasv_port, "12,34"))
- assert_equal(795192, ftp.send(:parse_pasv_port, "12,34,56"))
- assert_equal(203569230, ftp.send(:parse_pasv_port, "12,34,56,78"))
- end
-
- def test_login
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_login_fail1
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("502 Command not implemented.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.connect(SERVER_ADDR, server.port)
- assert_raise(Net::FTPPermError){ ftp.login }
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_login_fail2
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("530 Not logged in.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.connect(SERVER_ADDR, server.port)
- assert_raise(Net::FTPPermError){ ftp.login }
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- # TODO: How can we test open_timeout? sleep before accept cannot delay
- # connections.
- def _test_open_timeout_exceeded
- commands = []
- server = create_ftp_server(0.2) { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.open_timeout = 0.1
- ftp.connect(SERVER_ADDR, server.port)
- assert_raise(Net::OpenTimeout) do
- ftp.login
- end
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_read_timeout_exceeded
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sleep(0.1)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sleep(0.3)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sleep(0.1)
- sock.print("200 Switching to Binary mode.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- assert_raise(Net::ReadTimeout) do
- ftp.login
- end
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_read_timeout_not_exceeded
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sleep(0.1)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sleep(0.1)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sleep(0.1)
- sock.print("200 Switching to Binary mode.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close
- assert_equal(0.2, ftp.read_timeout)
- end
- ensure
- server.close
- end
- end
-
- def test_list_read_timeout_exceeded
- commands = []
- list_lines = [
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 foo.txt",
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 bar.txt",
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 baz.txt"
- ]
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to ASCII mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("150 Here comes the directory listing.\r\n")
- begin
- conn = TCPSocket.new(host, port)
- list_lines.each_with_index do |l, i|
- if i == 1
- sleep(0.5)
- else
- sleep(0.1)
- end
- conn.print(l, "\r\n")
- end
- rescue Errno::EPIPE
- ensure
- assert_nil($!)
- conn.close
- end
- sock.print("226 Directory send OK.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_raise(Net::ReadTimeout) do
- ftp.list
- end
- assert_equal("TYPE A\r\n", commands.shift)
- assert_match(/\APORT /, commands.shift)
- assert_equal("LIST\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_list_read_timeout_not_exceeded
- commands = []
- list_lines = [
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 foo.txt",
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 bar.txt",
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 baz.txt"
- ]
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to ASCII mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("150 Here comes the directory listing.\r\n")
- conn = TCPSocket.new(host, port)
- list_lines.each do |l|
- sleep(0.1)
- conn.print(l, "\r\n")
- end
- conn.close
- sock.print("226 Directory send OK.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_equal(list_lines, ftp.list)
- assert_equal("TYPE A\r\n", commands.shift)
- assert_match(/\APORT /, commands.shift)
- assert_equal("LIST\r\n", commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_list_fail
- commands = []
- list_lines = [
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 foo.txt",
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 bar.txt",
- "-rw-r--r-- 1 0 0 0 Mar 30 11:22 baz.txt"
- ]
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to ASCII mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("553 Requested action not taken.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_raise(Net::FTPPermError){ ftp.list }
- assert_equal("TYPE A\r\n", commands.shift)
- assert_match(/\APORT /, commands.shift)
- assert_equal("LIST\r\n", commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_retrbinary_read_timeout_exceeded
- commands = []
- binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n")
- conn = TCPSocket.new(host, port)
- sleep(0.1)
- conn.print(binary_data[0,1024])
- sleep(0.5)
- conn.print(binary_data[1024, 1024]) rescue nil # may raise EPIPE or something
- conn.close
- sock.print("226 Transfer complete.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- buf = ""
- assert_raise(Net::ReadTimeout) do
- ftp.retrbinary("RETR foo", 1024) do |s|
- buf << s
- end
- end
- assert_equal(1024, buf.bytesize)
- assert_equal(binary_data[0, 1024], buf)
- assert_match(/\APORT /, commands.shift)
- assert_equal("RETR foo\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close unless ftp.closed?
- end
- ensure
- server.close
- end
- end
-
- def test_retrbinary_read_timeout_not_exceeded
- commands = []
- binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("150 Opening BINARY mode data connection for foo (#{binary_data.size} bytes)\r\n")
- conn = TCPSocket.new(host, port)
- binary_data.scan(/.{1,1024}/nm) do |s|
- sleep(0.1)
- conn.print(s)
- end
- conn.shutdown(Socket::SHUT_WR)
- conn.read
- conn.close
- sock.print("226 Transfer complete.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- buf = ""
- ftp.retrbinary("RETR foo", 1024) do |s|
- buf << s
- end
- assert_equal(binary_data.bytesize, buf.bytesize)
- assert_equal(binary_data, buf)
- assert_match(/\APORT /, commands.shift)
- assert_equal("RETR foo\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_retrbinary_fail
- commands = []
- binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("550 Requested action not taken.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_raise(Net::FTPPermError){ ftp.retrbinary("RETR foo", 1024) }
- assert_match(/\APORT /, commands.shift)
- assert_equal("RETR foo\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_storbinary
- commands = []
- binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
- stored_data = nil
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("150 Opening BINARY mode data connection for foo\r\n")
- conn = TCPSocket.new(host, port)
- stored_data = conn.read
- conn.close
- sock.print("226 Transfer complete.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- ftp.storbinary("STOR foo", StringIO.new(binary_data), 1024)
- assert_equal(binary_data, stored_data)
- assert_match(/\APORT /, commands.shift)
- assert_equal("STOR foo\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_storbinary_fail
- commands = []
- binary_data = (0..0xff).map {|i| i.chr}.join * 4 * 3
- stored_data = nil
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- line = sock.gets
- commands.push(line)
- port_args = line.slice(/\APORT (.*)/, 1).split(/,/)
- host = port_args[0, 4].join(".")
- port = port_args[4, 2].map(&:to_i).inject {|x, y| (x << 8) + y}
- sock.print("200 PORT command successful.\r\n")
- commands.push(sock.gets)
- sock.print("452 Requested file action aborted.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- assert_raise(Net::FTPTempError){ ftp.storbinary("STOR foo", StringIO.new(binary_data), 1024) }
- assert_match(/\APORT /, commands.shift)
- assert_equal("STOR foo\r\n", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_abort
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.recv(1024))
- sock.print("225 No transfer to ABOR.\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- #ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- ftp.abort
- assert_equal("ABOR\r", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- def test_status
- commands = []
- server = create_ftp_server { |sock|
- sock.print("220 (test_ftp).\r\n")
- commands.push(sock.gets)
- sock.print("331 Please specify the password.\r\n")
- commands.push(sock.gets)
- sock.print("230 Login successful.\r\n")
- commands.push(sock.gets)
- sock.print("200 Switching to Binary mode.\r\n")
- commands.push(sock.recv(1024))
- sock.print("211 End of status\r\n")
- }
- begin
- begin
- ftp = Net::FTP.new
- ftp.read_timeout = 0.2
- ftp.connect(SERVER_ADDR, server.port)
- ftp.login
- assert_match(/\AUSER /, commands.shift)
- assert_match(/\APASS /, commands.shift)
- assert_equal("TYPE I\r\n", commands.shift)
- ftp.status
- assert_equal("STAT\r", commands.shift)
- assert_equal(nil, commands.shift)
- ensure
- ftp.close if ftp
- end
- ensure
- server.close
- end
- end
-
- private
-
-
- def create_ftp_server(sleep_time = nil)
- server = TCPServer.new(SERVER_ADDR, 0)
- @thread = Thread.start do
- begin
- if sleep_time
- sleep(sleep_time)
- end
- sock = server.accept
- begin
- yield(sock)
- sock.shutdown(Socket::SHUT_WR)
- sock.read_timeout = 1
- sock.read unless sock.eof?
- ensure
- sock.close
- end
- rescue
- end
- end
- def server.port
- addr[1]
- end
- return server
- end
-end
diff --git a/test/net/http/test_buffered_io.rb b/test/net/http/test_buffered_io.rb
deleted file mode 100644
index e24e7c1ed9..0000000000
--- a/test/net/http/test_buffered_io.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'test/unit'
-require 'net/http'
-require 'stringio'
-
-require_relative 'utils'
-
-module Net
- class TestBufferedIO < Test::Unit::TestCase
- def test_eof?
- s = StringIO.new
- assert s.eof?
- bio = BufferedIO.new(s)
- assert_equal s, bio.io
- assert_equal s.eof?, bio.eof?
- end
- end
-end
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 527b7b6f05..bc87febbd9 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -1,195 +1,9 @@
-# coding: US-ASCII
+# $Id$
+
require 'test/unit'
require 'net/http'
require 'stringio'
-require_relative 'utils'
-require_relative '../../ruby/envutil'
-
-class TestNetHTTP < Test::Unit::TestCase
-
- def test_class_Proxy
- no_proxy_class = Net::HTTP.Proxy nil
-
- assert_equal Net::HTTP, no_proxy_class
-
- proxy_class = Net::HTTP.Proxy 'proxy.example', 8000, 'user', 'pass'
-
- refute_equal Net::HTTP, proxy_class
-
- assert_operator proxy_class, :<, Net::HTTP
-
- assert_equal 'proxy.example', proxy_class.proxy_address
- assert_equal 8000, proxy_class.proxy_port
- assert_equal 'user', proxy_class.proxy_user
- assert_equal 'pass', proxy_class.proxy_pass
-
- http = proxy_class.new 'example'
-
- refute http.proxy_from_env?
-
-
- proxy_class = Net::HTTP.Proxy 'proxy.example'
- assert_equal 'proxy.example', proxy_class.proxy_address
- assert_equal 80, proxy_class.proxy_port
- end
-
- def test_class_Proxy_from_ENV
- clean_http_proxy_env do
- ENV['http_proxy'] = 'http://proxy.example:8000'
-
- # These are ignored on purpose. See Bug 4388 and Feature 6546
- ENV['http_proxy_user'] = 'user'
- ENV['http_proxy_pass'] = 'pass'
-
- proxy_class = Net::HTTP.Proxy :ENV
-
- refute_equal Net::HTTP, proxy_class
-
- assert_operator proxy_class, :<, Net::HTTP
-
- assert_nil proxy_class.proxy_address
- assert_nil proxy_class.proxy_user
- assert_nil proxy_class.proxy_pass
-
- refute_equal 8000, proxy_class.proxy_port
-
- http = proxy_class.new 'example'
-
- assert http.proxy_from_env?
- end
- end
-
- def test_edit_path
- http = Net::HTTP.new 'example', nil, nil
-
- edited = http.send :edit_path, '/path'
-
- assert_equal '/path', edited
-
- http.use_ssl = true
-
- edited = http.send :edit_path, '/path'
-
- assert_equal '/path', edited
- end
-
- def test_edit_path_proxy
- http = Net::HTTP.new 'example', nil, 'proxy.example'
-
- edited = http.send :edit_path, '/path'
-
- assert_equal 'http://example/path', edited
-
- http.use_ssl = true
-
- edited = http.send :edit_path, '/path'
-
- assert_equal '/path', edited
- end
-
- def test_proxy_address
- clean_http_proxy_env do
- http = Net::HTTP.new 'example', nil, 'proxy.example'
- assert_equal 'proxy.example', http.proxy_address
-
- http = Net::HTTP.new 'example', nil
- assert_equal nil, http.proxy_address
- end
- end
-
- def test_proxy_address_ENV
- clean_http_proxy_env do
- ENV['http_proxy'] = 'http://proxy.example:8000'
-
- http = Net::HTTP.new 'example'
-
- assert_equal 'proxy.example', http.proxy_address
- end
- end
-
- def test_proxy_eh_no_proxy
- clean_http_proxy_env do
- assert_equal false, Net::HTTP.new('example', nil, nil).proxy?
- end
- end
-
- def test_proxy_eh_ENV
- clean_http_proxy_env do
- ENV['http_proxy'] = 'http://proxy.example:8000'
-
- http = Net::HTTP.new 'example'
-
- assert_equal true, http.proxy?
- end
- end
-
- def test_proxy_eh_ENV_none_set
- clean_http_proxy_env do
- assert_equal false, Net::HTTP.new('example').proxy?
- end
- end
-
- def test_proxy_eh_ENV_no_proxy
- clean_http_proxy_env do
- ENV['http_proxy'] = 'http://proxy.example:8000'
- ENV['no_proxy'] = 'example'
-
- assert_equal false, Net::HTTP.new('example').proxy?
- end
- end
-
- def test_proxy_port
- clean_http_proxy_env do
- http = Net::HTTP.new 'exmaple', nil, 'proxy.example'
- assert_equal 'proxy.example', http.proxy_address
- assert_equal 80, http.proxy_port
- http = Net::HTTP.new 'exmaple', nil, 'proxy.example', 8000
- assert_equal 8000, http.proxy_port
- http = Net::HTTP.new 'exmaple', nil
- assert_equal nil, http.proxy_port
- end
- end
-
- def test_proxy_port_ENV
- clean_http_proxy_env do
- ENV['http_proxy'] = 'http://proxy.example:8000'
-
- http = Net::HTTP.new 'example'
-
- assert_equal 8000, http.proxy_port
- end
- end
-
- def test_newobj
- clean_http_proxy_env do
- ENV['http_proxy'] = 'http://proxy.example:8000'
-
- http = Net::HTTP.newobj 'example'
-
- assert_equal false, http.proxy?
- end
- end
-
- def clean_http_proxy_env
- orig = {
- 'http_proxy' => ENV['http_proxy'],
- 'http_proxy_user' => ENV['http_proxy_user'],
- 'http_proxy_pass' => ENV['http_proxy_pass'],
- 'no_proxy' => ENV['no_proxy'],
- }
-
- orig.each_key do |key|
- ENV.delete key
- end
-
- yield
- ensure
- orig.each do |key, value|
- ENV[key] = value
- end
- end
-
-end
+require File.expand_path("utils", File.dirname(__FILE__))
module TestNetHTTP_version_1_1_methods
@@ -218,29 +32,31 @@ module TestNetHTTP_version_1_1_methods
end
def _test_get__get(http)
- res = http.get('/')
+ res, body = http.get('/')
assert_kind_of Net::HTTPResponse, res
assert_kind_of String, res.body
+ assert_kind_of String, body
unless self.is_a?(TestNetHTTP_v1_2_chunked)
assert_not_nil res['content-length']
assert_equal $test_net_http_data.size, res['content-length'].to_i
end
assert_equal $test_net_http_data_type, res['Content-Type']
+ assert_equal $test_net_http_data.size, body.size
+ assert_equal $test_net_http_data, body
assert_equal $test_net_http_data.size, res.body.size
assert_equal $test_net_http_data, res.body
assert_nothing_raised {
- http.get('/', { 'User-Agent' => 'test' }.freeze)
+ res, body = http.get('/', { 'User-Agent' => 'test' }.freeze)
}
-
- assert res.decode_content, '[Bug #7924]' if Net::HTTP::HAVE_ZLIB
end
def _test_get__iter(http)
buf = ''
- res = http.get('/') {|s| buf << s }
+ res, body = http.get('/') {|s| buf << s }
assert_kind_of Net::HTTPResponse, res
# assert_kind_of String, res.body
+ # assert_kind_of String, body
unless self.is_a?(TestNetHTTP_v1_2_chunked)
assert_not_nil res['content-length']
assert_equal $test_net_http_data.size, res['content-length'].to_i
@@ -254,9 +70,10 @@ module TestNetHTTP_version_1_1_methods
def _test_get__chunked(http)
buf = ''
- res = http.get('/') {|s| buf << s }
+ res, body = http.get('/') {|s| buf << s }
assert_kind_of Net::HTTPResponse, res
# assert_kind_of String, res.body
+ # assert_kind_of String, body
unless self.is_a?(TestNetHTTP_v1_2_chunked)
assert_not_nil res['content-length']
assert_equal $test_net_http_data.size, res['content-length'].to_i
@@ -280,8 +97,9 @@ module TestNetHTTP_version_1_1_methods
end
def test_get__implicit_start
- res = new().get('/')
+ res, body = new().get('/')
assert_kind_of Net::HTTPResponse, res
+ assert_kind_of String, body
assert_kind_of String, res.body
unless self.is_a?(TestNetHTTP_v1_2_chunked)
assert_not_nil res['content-length']
@@ -294,11 +112,8 @@ module TestNetHTTP_version_1_1_methods
def test_get2
start {|http|
http.get2('/') {|res|
- EnvUtil.suppress_warning do
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of Net::HTTPResponse, res.header
- end
-
+ assert_kind_of Net::HTTPResponse, res
+ assert_kind_of Net::HTTPResponse, res.header
unless self.is_a?(TestNetHTTP_v1_2_chunked)
assert_not_nil res['content-length']
end
@@ -316,18 +131,18 @@ module TestNetHTTP_version_1_1_methods
start {|http|
_test_post__base http
_test_post__file http
- _test_post__no_data http
}
end
def _test_post__base(http)
uheader = {}
uheader['Accept'] = 'application/octet-stream'
- uheader['Content-Type'] = 'application/x-www-form-urlencoded'
data = 'post data'
- res = http.post('/', data, uheader)
+ res, body = http.post('/', data)
assert_kind_of Net::HTTPResponse, res
+ assert_kind_of String, body
assert_kind_of String, res.body
+ assert_equal data, body
assert_equal data, res.body
assert_equal data, res.entity
end
@@ -335,78 +150,42 @@ module TestNetHTTP_version_1_1_methods
def _test_post__file(http)
data = 'post data'
f = StringIO.new
- http.post('/', data, {'content-type' => 'application/x-www-form-urlencoded'}, f)
+ http.post('/', data, nil, f)
assert_equal data, f.string
end
- def _test_post__no_data(http)
- unless self.is_a?(TestNetHTTP_v1_2_chunked)
- EnvUtil.suppress_warning do
- data = nil
- res = http.post('/', data)
- assert_not_equal '411', res.code
- end
- end
- end
-
def test_s_post_form
- url = "http://#{config('host')}:#{config('port')}/"
res = Net::HTTP.post_form(
- URI.parse(url),
+ URI.parse("http://#{config('host')}:#{config('port')}/"),
"a" => "x")
assert_equal ["a=x"], res.body.split(/[;&]/).sort
res = Net::HTTP.post_form(
- URI.parse(url),
+ URI.parse("http://#{config('host')}:#{config('port')}/"),
"a" => "x",
"b" => "y")
assert_equal ["a=x", "b=y"], res.body.split(/[;&]/).sort
res = Net::HTTP.post_form(
- URI.parse(url),
+ URI.parse("http://#{config('host')}:#{config('port')}/"),
"a" => ["x1", "x2"],
"b" => "y")
- assert_equal url, res['X-request-uri']
assert_equal ["a=x1", "a=x2", "b=y"], res.body.split(/[;&]/).sort
-
- res = Net::HTTP.post_form(
- URI.parse(url + '?a=x'),
- "b" => "y")
- assert_equal url + '?a=x', res['X-request-uri']
- assert_equal ["b=y"], res.body.split(/[;&]/).sort
- end
-
- def test_patch
- start {|http|
- _test_patch__base http
- }
- end
-
- def _test_patch__base(http)
- uheader = {}
- uheader['Accept'] = 'application/octet-stream'
- uheader['Content-Type'] = 'application/x-www-form-urlencoded'
- data = 'patch data'
- res = http.patch('/', data, uheader)
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of String, res.body
- assert_equal data, res.body
- assert_equal data, res.entity
end
def test_timeout_during_HTTP_session
bug4246 = "expected the HTTP session to have timed out but have not. c.f. [ruby-core:34203]"
- # listen for connections... but deliberately do not read
- TCPServer.open('localhost', 0) {|server|
+ # listen for connections... but deliberately do not complete SSL handshake
+ TCPServer.open(0) {|server|
port = server.addr[1]
conn = Net::HTTP.new('localhost', port)
- conn.read_timeout = 0.01
- conn.open_timeout = 0.01
+ conn.read_timeout = 1
+ conn.open_timeout = 1
th = Thread.new do
- assert_raise(Net::ReadTimeout) {
+ assert_raise(Timeout::Error) {
conn.get('/')
}
end
@@ -421,14 +200,11 @@ module TestNetHTTP_version_1_2_methods
def test_request
start {|http|
_test_request__GET http
- _test_request__accept_encoding http
_test_request__file http
# _test_request__range http # WEBrick does not support Range: header.
_test_request__HEAD http
_test_request__POST http
_test_request__stream_body http
- _test_request__uri http
- _test_request__uri_host http
}
end
@@ -443,24 +219,6 @@ module TestNetHTTP_version_1_2_methods
end
assert_equal $test_net_http_data.size, res.body.size
assert_equal $test_net_http_data, res.body
-
- assert res.decode_content, 'Bug #7831' if Net::HTTP::HAVE_ZLIB
- }
- end
-
- def _test_request__accept_encoding(http)
- req = Net::HTTP::Get.new('/', 'accept-encoding' => 'deflate')
- http.request(req) {|res|
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of String, res.body
- unless self.is_a?(TestNetHTTP_v1_2_chunked)
- assert_not_nil res['content-length']
- assert_equal $test_net_http_data.size, res['content-length'].to_i
- end
- assert_equal $test_net_http_data.size, res.body.size
- assert_equal $test_net_http_data, res.body
-
- refute res.decode_content, 'Bug #7831' if Net::HTTP::HAVE_ZLIB
}
end
@@ -502,7 +260,6 @@ module TestNetHTTP_version_1_2_methods
data = 'post data'
req = Net::HTTP::Post.new('/')
req['Accept'] = $test_net_http_data_type
- req['Content-Type'] = 'application/x-www-form-urlencoded'
http.request(req, data) {|res|
assert_kind_of Net::HTTPResponse, res
unless self.is_a?(TestNetHTTP_v1_2_chunked)
@@ -517,7 +274,6 @@ module TestNetHTTP_version_1_2_methods
req = Net::HTTP::Post.new('/')
data = $test_net_http_data
req.content_length = data.size
- req['Content-Type'] = 'application/x-www-form-urlencoded'
req.body_stream = StringIO.new(data)
res = http.request(req)
assert_kind_of Net::HTTPResponse, res
@@ -526,55 +282,9 @@ module TestNetHTTP_version_1_2_methods
assert_equal data, res.body
end
- def _test_request__path(http)
- uri = URI 'https://example/'
- req = Net::HTTP::Get.new('/')
-
- res = http.request(req)
-
- assert_kind_of URI::Generic, req.uri
-
- refute_equal uri, req.uri
-
- assert_equal uri, res.uri
-
- refute_same uri, req.uri
- refute_same req.uri, res.uri
- end
-
- def _test_request__uri(http)
- uri = URI 'https://example/'
- req = Net::HTTP::Get.new(uri)
-
- res = http.request(req)
-
- assert_kind_of URI::Generic, req.uri
-
- refute_equal uri, req.uri
-
- assert_equal req.uri, res.uri
-
- refute_same uri, req.uri
- refute_same req.uri, res.uri
- end
-
- def _test_request__uri_host(http)
- uri = URI 'http://example/'
-
- req = Net::HTTP::Get.new(uri)
- req['host'] = 'other.example'
-
- res = http.request(req)
-
- assert_kind_of URI::Generic, req.uri
-
- assert_equal URI("http://example:#{http.port}"), res.uri
- end
-
def test_send_request
start {|http|
_test_send_request__GET http
- _test_send_request__HEAD http
_test_send_request__POST http
}
end
@@ -589,131 +299,37 @@ module TestNetHTTP_version_1_2_methods
assert_equal $test_net_http_data, res.body
end
- def _test_send_request__HEAD(http)
- res = http.send_request('HEAD', '/')
- assert_kind_of Net::HTTPResponse, res
- unless self.is_a?(TestNetHTTP_v1_2_chunked)
- assert_not_nil res['content-length']
- assert_equal $test_net_http_data.size, res['content-length'].to_i
- end
- assert_nil res.body
- end
-
def _test_send_request__POST(http)
data = 'aaabbb cc ddddddddddd lkjoiu4j3qlkuoa'
- res = http.send_request('POST', '/', data, 'content-type' => 'application/x-www-form-urlencoded')
+ res = http.send_request('POST', '/', data)
assert_kind_of Net::HTTPResponse, res
assert_kind_of String, res.body
assert_equal data.size, res.body.size
assert_equal data, res.body
end
+end
- def test_set_form
- require 'tempfile'
- file = Tempfile.new('ruby-test')
- file << "\u{30c7}\u{30fc}\u{30bf}"
- data = [
- ['name', 'Gonbei Nanashi'],
- ['name', "\u{540d}\u{7121}\u{3057}\u{306e}\u{6a29}\u{5175}\u{885b}"],
- ['s"i\o', StringIO.new("\u{3042 3044 4e9c 925b}")],
- ["file", file, filename: "ruby-test"]
- ]
- expected = <<"__EOM__".gsub(/\n/, "\r\n")
---<boundary>
-Content-Disposition: form-data; name="name"
-
-Gonbei Nanashi
---<boundary>
-Content-Disposition: form-data; name="name"
-
-\xE5\x90\x8D\xE7\x84\xA1\xE3\x81\x97\xE3\x81\xAE\xE6\xA8\xA9\xE5\x85\xB5\xE8\xA1\x9B
---<boundary>
-Content-Disposition: form-data; name="s\\"i\\\\o"
-
-\xE3\x81\x82\xE3\x81\x84\xE4\xBA\x9C\xE9\x89\x9B
---<boundary>
-Content-Disposition: form-data; name="file"; filename="ruby-test"
-Content-Type: application/octet-stream
-
-\xE3\x83\x87\xE3\x83\xBC\xE3\x82\xBF
---<boundary>--
-__EOM__
- start {|http|
- _test_set_form_urlencoded(http, data.reject{|k,v|!v.is_a?(String)})
- _test_set_form_multipart(http, false, data, expected)
- _test_set_form_multipart(http, true, data, expected)
- }
- ensure
- file.close! if file
- end
-
- def _test_set_form_urlencoded(http, data)
- req = Net::HTTP::Post.new('/')
- req.set_form(data)
- res = http.request req
- assert_equal "name=Gonbei+Nanashi&name=%E5%90%8D%E7%84%A1%E3%81%97%E3%81%AE%E6%A8%A9%E5%85%B5%E8%A1%9B", res.body
- end
+class TestNetHTTP_version_1_1 < Test::Unit::TestCase
+ CONFIG = {
+ 'host' => '127.0.0.1',
+ 'port' => 10081,
+ 'proxy_host' => nil,
+ 'proxy_port' => nil,
+ }
- def _test_set_form_multipart(http, chunked_p, data, expected)
- data.each{|k,v|v.rewind rescue nil}
- req = Net::HTTP::Post.new('/')
- req.set_form(data, 'multipart/form-data')
- req['Transfer-Encoding'] = 'chunked' if chunked_p
- res = http.request req
- body = res.body
- assert_match(/\A--(?<boundary>\S+)/, body)
- /\A--(?<boundary>\S+)/ =~ body
- expected = expected.gsub(/<boundary>/, boundary)
- assert_equal(expected, body)
- end
+ include TestNetHTTPUtils
+ include TestNetHTTP_version_1_1_methods
- def test_set_form_with_file
- require 'tempfile'
- file = Tempfile.new('ruby-test')
- file.binmode
- file << $test_net_http_data
- filename = File.basename(file.to_path)
- data = [['file', file]]
- expected = <<"__EOM__".gsub(/\n/, "\r\n")
---<boundary>
-Content-Disposition: form-data; name="file"; filename="<filename>"
-Content-Type: application/octet-stream
-
-<data>
---<boundary>--
-__EOM__
- expected.sub!(/<filename>/, filename)
- expected.sub!(/<data>/, $test_net_http_data)
- start {|http|
- data.each{|k,v|v.rewind rescue nil}
- req = Net::HTTP::Post.new('/')
- req.set_form(data, 'multipart/form-data')
- res = http.request req
- body = res.body
- header, _ = body.split(/\r\n\r\n/, 2)
- assert_match(/\A--(?<boundary>\S+)/, body)
- /\A--(?<boundary>\S+)/ =~ body
- expected = expected.gsub(/<boundary>/, boundary)
- assert_match(/^--(?<boundary>\S+)\r\n/, header)
- assert_match(
- /^Content-Disposition: form-data; name="file"; filename="#{filename}"\r\n/,
- header)
- assert_equal(expected, body)
-
- data.each{|k,v|v.rewind rescue nil}
- req['Transfer-Encoding'] = 'chunked'
- res = http.request req
- #assert_equal(expected, res.body)
- }
- ensure
- file.close! if file
+ def new
+ Net::HTTP.version_1_1
+ super
end
end
class TestNetHTTP_v1_2 < Test::Unit::TestCase
CONFIG = {
'host' => '127.0.0.1',
- 'port' => 0,
+ 'port' => 10081,
'proxy_host' => nil,
'proxy_port' => nil,
}
@@ -731,7 +347,7 @@ end
class TestNetHTTP_v1_2_chunked < Test::Unit::TestCase
CONFIG = {
'host' => '127.0.0.1',
- 'port' => 0,
+ 'port' => 10081,
'proxy_host' => nil,
'proxy_port' => nil,
'chunked' => true,
@@ -747,6 +363,7 @@ class TestNetHTTP_v1_2_chunked < Test::Unit::TestCase
end
def test_chunked_break
+ i = 0
assert_nothing_raised("[ruby-core:29229]") {
start {|http|
http.request_get('/') {|res|
@@ -759,176 +376,22 @@ class TestNetHTTP_v1_2_chunked < Test::Unit::TestCase
end
end
-class TestNetHTTPContinue < Test::Unit::TestCase
- CONFIG = {
- 'host' => '127.0.0.1',
- 'port' => 0,
- 'proxy_host' => nil,
- 'proxy_port' => nil,
- 'chunked' => true,
- }
-
- include TestNetHTTPUtils
-
- def logfile
- @debug = StringIO.new('')
- end
-
- def mount_proc(&block)
- @server.mount('/continue', WEBrick::HTTPServlet::ProcHandler.new(block.to_proc))
- end
-
- def test_expect_continue
- mount_proc {|req, res|
- req.continue
- res.body = req.query['body']
- }
- start {|http|
- uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
- http.continue_timeout = 0.2
- http.request_post('/continue', 'body=BODY', uheader) {|res|
- assert_equal('BODY', res.read_body)
- }
- }
- assert_match(/Expect: 100-continue/, @debug.string)
- assert_match(/HTTP\/1.1 100 continue/, @debug.string)
- end
-
- def test_expect_continue_timeout
- mount_proc {|req, res|
- sleep 0.2
- req.continue # just ignored because it's '100'
- res.body = req.query['body']
- }
- start {|http|
- uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
- http.continue_timeout = 0
- http.request_post('/continue', 'body=BODY', uheader) {|res|
- assert_equal('BODY', res.read_body)
- }
- }
- assert_match(/Expect: 100-continue/, @debug.string)
- assert_match(/HTTP\/1.1 100 continue/, @debug.string)
- end
-
- def test_expect_continue_error
- mount_proc {|req, res|
- res.status = 501
- res.body = req.query['body']
- }
- start {|http|
- uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
- http.continue_timeout = 0
- http.request_post('/continue', 'body=ERROR', uheader) {|res|
- assert_equal('ERROR', res.read_body)
- }
- }
- assert_match(/Expect: 100-continue/, @debug.string)
- assert_not_match(/HTTP\/1.1 100 continue/, @debug.string)
- end
-
- def test_expect_continue_error_while_waiting
- mount_proc {|req, res|
- res.status = 501
- res.body = req.query['body']
- }
- start {|http|
- uheader = {'content-type' => 'application/x-www-form-urlencoded', 'expect' => '100-continue'}
- http.continue_timeout = 0.5
- http.request_post('/continue', 'body=ERROR', uheader) {|res|
- assert_equal('ERROR', res.read_body)
- }
- }
- assert_match(/Expect: 100-continue/, @debug.string)
- assert_not_match(/HTTP\/1.1 100 continue/, @debug.string)
- end
-end
-
-class TestNetHTTPKeepAlive < Test::Unit::TestCase
+=begin
+class TestNetHTTP_proxy < Test::Unit::TestCase
CONFIG = {
'host' => '127.0.0.1',
- 'port' => 0,
- 'proxy_host' => nil,
- 'proxy_port' => nil,
- 'RequestTimeout' => 1,
- }
-
- include TestNetHTTPUtils
-
- def test_keep_alive_get_auto_reconnect
- start {|http|
- res = http.get('/')
- http.keep_alive_timeout = 1
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of String, res.body
- sleep 1.5
- assert_nothing_raised {
- res = http.get('/')
- }
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of String, res.body
- }
- end
-
- def test_keep_alive_get_auto_retry
- start {|http|
- res = http.get('/')
- http.keep_alive_timeout = 5
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of String, res.body
- sleep 1.5
- res = http.get('/')
- assert_kind_of Net::HTTPResponse, res
- assert_kind_of String, res.body
- }
- end
-
- def test_keep_alive_server_close
- def @server.run(sock)
- sock.close
- end
-
- start {|http|
- assert_raises(EOFError, Errno::ECONNRESET, IOError) {
- http.get('/')
- }
- }
- end
-end
-
-class TestNetHTTPLocalBind < Test::Unit::TestCase
- CONFIG = {
- 'host' => 'localhost',
- 'port' => 0,
- 'proxy_host' => nil,
- 'proxy_port' => nil,
+ 'port' => 10081,
+ 'proxy_host' => '127.0.0.1',
+ 'proxy_port' => 10082,
}
include TestNetHTTPUtils
+ include TestNetHTTP_version_1_1_methods
+ include TestNetHTTP_version_1_2_methods
- def test_bind_to_local_host
- @server.mount_proc('/show_ip') { |req, res| res.body = req.remote_ip }
-
- http = Net::HTTP.new(config('host'), config('port'))
- http.local_host = Addrinfo.tcp(config('host'), config('port')).ip_address
- assert_not_nil(http.local_host)
- assert_nil(http.local_port)
-
- res = http.get('/show_ip')
- assert_equal(http.local_host, res.body)
- end
-
- def test_bind_to_local_port
- @server.mount_proc('/show_port') { |req, res| res.body = req.peeraddr[1].to_s }
-
- http = Net::HTTP.new(config('host'), config('port'))
- http.local_host = Addrinfo.tcp(config('host'), config('port')).ip_address
- http.local_port = [*10000..20000].shuffle.first.to_s
- assert_not_nil(http.local_host)
- assert_not_nil(http.local_port)
-
- res = http.get('/show_port')
- assert_equal(http.local_port, res.body)
+ def new
+ Net::HTTP.version_1_2
+ super
end
end
-
+=end
diff --git a/test/net/http/test_http_request.rb b/test/net/http/test_http_request.rb
deleted file mode 100644
index 1dcb847c3f..0000000000
--- a/test/net/http/test_http_request.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'net/http'
-require 'test/unit'
-require 'stringio'
-
-class HTTPRequestTest < Test::Unit::TestCase
-
- def test_initialize_GET
- req = Net::HTTP::Get.new '/'
-
- assert_equal 'GET', req.method
- refute req.request_body_permitted?
- assert req.response_body_permitted?
-
- expected = {
- 'accept' => %w[*/*],
- 'user-agent' => %w[Ruby],
- }
-
- expected['accept-encoding'] = %w[gzip;q=1.0,deflate;q=0.6,identity;q=0.3] if
- Net::HTTP::HAVE_ZLIB
-
- assert_equal expected, req.to_hash
- end
-
- def test_initialize_GET_range
- req = Net::HTTP::Get.new '/', 'Range' => 'bytes=0-9'
-
- assert_equal 'GET', req.method
- refute req.request_body_permitted?
- assert req.response_body_permitted?
-
- expected = {
- 'accept' => %w[*/*],
- 'user-agent' => %w[Ruby],
- 'range' => %w[bytes=0-9],
- }
-
- assert_equal expected, req.to_hash
- end
-
- def test_initialize_HEAD
- req = Net::HTTP::Head.new '/'
-
- assert_equal 'HEAD', req.method
- refute req.request_body_permitted?
- refute req.response_body_permitted?
-
- expected = {
- 'accept' => %w[*/*],
- 'user-agent' => %w[Ruby],
- }
-
- assert_equal expected, req.to_hash
- end
-
- def test_initialize_accept_encoding
- req1 = Net::HTTP::Get.new '/'
-
- assert req1.decode_content, 'Bug #7831 - automatically decode content'
-
- req2 = Net::HTTP::Get.new '/', 'accept-encoding' => 'identity'
-
- refute req2.decode_content,
- 'Bug #7381 - do not decode content if the user overrides'
- end if Net::HTTP::HAVE_ZLIB
-
- def test_header_set
- req = Net::HTTP::Get.new '/'
-
- assert req.decode_content, 'Bug #7831 - automatically decode content'
-
- req['accept-encoding'] = 'identity'
-
- refute req.decode_content,
- 'Bug #7831 - do not decode content if the user overrides'
- end if Net::HTTP::HAVE_ZLIB
-
-end
-
diff --git a/test/net/http/test_httpheader.rb b/test/net/http/test_httpheader.rb
index 062387189d..379c9bd1ad 100644
--- a/test/net/http/test_httpheader.rb
+++ b/test/net/http/test_httpheader.rb
@@ -156,32 +156,15 @@ class HTTPHeaderTest < Test::Unit::TestCase
end
def test_range
- try_range([1..5], '1-5')
- try_invalid_range('5-1')
- try_range([234..567], '234-567')
- try_range([-5..-1], '-5')
- try_invalid_range('-0')
- try_range([1..-1], '1-')
- try_range([0..0,-1..-1], '0-0,-1')
- try_range([1..2, 3..4], '1-2,3-4')
- try_range([1..2, 3..4], '1-2 , 3-4')
- try_range([1..2, 1..4], '1-2,1-4')
-
- try_invalid_range('invalid')
- try_invalid_range(' 12-')
- try_invalid_range('12- ')
- try_invalid_range('123-abc')
- try_invalid_range('abc-123')
+ try_range(1..5, '1-5')
+ try_range(234..567, '234-567')
+ try_range(-5..-1, '-5')
+ try_range(1..-1, '1-')
end
def try_range(r, s)
@c['range'] = "bytes=#{s}"
- assert_equal r, @c.range
- end
-
- def try_invalid_range(s)
- @c['range'] = "bytes=#{s}"
- assert_raise(Net::HTTPHeaderSyntaxError, s){ @c.range }
+ assert_equal r, Array(@c.range)[0]
end
def test_range=
diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb
index 0193a153e4..ab6fdd0ea9 100644
--- a/test/net/http/test_httpresponse.rb
+++ b/test/net/http/test_httpresponse.rb
@@ -1,11 +1,10 @@
-# coding: US-ASCII
require 'net/http'
require 'test/unit'
require 'stringio'
class HTTPResponseTest < Test::Unit::TestCase
def test_singleline_header
- io = dummy_io(<<EOS)
+ io = dummy_io(<<EOS.gsub(/\n/, "\r\n"))
HTTP/1.1 200 OK
Content-Length: 5
Connection: close
@@ -13,12 +12,12 @@ Connection: close
hello
EOS
res = Net::HTTPResponse.read_new(io)
- assert_equal('5', res['content-length'])
- assert_equal('close', res['connection'])
+ assert_equal('5', res.header['content-length'])
+ assert_equal('close', res.header['connection'])
end
def test_multiline_header
- io = dummy_io(<<EOS)
+ io = dummy_io(<<EOS.gsub(/\n/, "\r\n"))
HTTP/1.1 200 OK
X-Foo: XXX
YYY
@@ -29,285 +28,13 @@ X-Bar:
hello
EOS
res = Net::HTTPResponse.read_new(io)
- assert_equal('XXX YYY', res['x-foo'])
- assert_equal('XXX YYY', res['x-bar'])
- end
-
- def test_read_body
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Length: 5
-
-hello
-EOS
-
- res = Net::HTTPResponse.read_new(io)
-
- body = nil
-
- res.reading_body io, true do
- body = res.read_body
- end
-
- assert_equal 'hello', body
- end
-
- def test_read_body_block
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Length: 5
-
-hello
-EOS
-
- res = Net::HTTPResponse.read_new(io)
-
- body = ''
-
- res.reading_body io, true do
- res.read_body do |chunk|
- body << chunk
- end
- end
-
- assert_equal 'hello', body
- end
-
- def test_read_body_content_encoding_deflate
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Encoding: deflate
-Content-Length: 13
-
-x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- res.decode_content = true
-
- body = nil
-
- res.reading_body io, true do
- body = res.read_body
- end
-
- if Net::HTTP::HAVE_ZLIB
- assert_equal nil, res['content-encoding']
- assert_equal 'hello', body
- else
- assert_equal 'deflate', res['content-encoding']
- assert_equal "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15", body
- end
- end
-
- def test_read_body_content_encoding_deflate_chunked
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Encoding: deflate
-Transfer-Encoding: chunked
-
-6
-x\x9C\xCBH\xCD\xC9
-7
-\xC9\a\x00\x06,\x02\x15
-0
-
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- res.decode_content = true
-
- body = nil
-
- res.reading_body io, true do
- body = res.read_body
- end
-
- if Net::HTTP::HAVE_ZLIB
- assert_equal nil, res['content-encoding']
- assert_equal 'hello', body
- else
- assert_equal 'deflate', res['content-encoding']
- assert_equal "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15", body
- end
- end
-
- def test_read_body_content_encoding_deflate_disabled
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Encoding: deflate
-Content-Length: 13
-
-x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- res.decode_content = false # user set accept-encoding in request
-
- body = nil
-
- res.reading_body io, true do
- body = res.read_body
- end
-
- assert_equal 'deflate', res['content-encoding'], 'Bug #7831'
- assert_equal "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15", body, 'Bug #7381'
- end
-
- def test_read_body_content_encoding_deflate_no_length
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Encoding: deflate
-
-x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- res.decode_content = true
-
- body = nil
-
- res.reading_body io, true do
- body = res.read_body
- end
-
- if Net::HTTP::HAVE_ZLIB
- assert_equal nil, res['content-encoding']
- assert_equal 'hello', body
- else
- assert_equal 'deflate', res['content-encoding']
- assert_equal "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15\r\n", body
- end
- end
-
- def test_read_body_content_encoding_deflate_content_range
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Accept-Ranges: bytes
-Connection: close
-Content-Encoding: gzip
-Content-Length: 10
-Content-Range: bytes 0-9/55
-
-\x1F\x8B\b\x00\x00\x00\x00\x00\x00\x03
-EOS
-
- res = Net::HTTPResponse.read_new(io)
-
- body = nil
-
- res.reading_body io, true do
- body = res.read_body
- end
-
- assert_equal "\x1F\x8B\b\x00\x00\x00\x00\x00\x00\x03", body
- end
-
- def test_read_body_string
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Connection: close
-Content-Length: 5
-
-hello
-EOS
-
- res = Net::HTTPResponse.read_new(io)
-
- body = ''
-
- res.reading_body io, true do
- res.read_body body
- end
-
- assert_equal 'hello', body
- end
-
- def test_uri_equals
- uri = URI 'http://example'
-
- response = Net::HTTPResponse.new '1.1', 200, 'OK'
-
- response.uri = nil
-
- assert_nil response.uri
-
- response.uri = uri
-
- assert_equal uri, response.uri
- refute_same uri, response.uri
- end
-
- def test_ensure_zero_space_does_not_regress
- io = dummy_io(<<EOS)
-HTTP/1.1 200OK
-Content-Length: 5
-Connection: close
-
-hello
-EOS
-
- assert_raises Net::HTTPBadResponse do
- Net::HTTPResponse.read_new(io)
- end
- end
-
- def test_allow_trailing_space_after_status
- io = dummy_io(<<EOS)
-HTTP/1.1 200\s
-Content-Length: 5
-Connection: close
-
-hello
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- assert_equal('1.1', res.http_version)
- assert_equal('200', res.code)
- assert_equal('', res.message)
- end
-
- def test_normal_status_line
- io = dummy_io(<<EOS)
-HTTP/1.1 200 OK
-Content-Length: 5
-Connection: close
-
-hello
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- assert_equal('1.1', res.http_version)
- assert_equal('200', res.code)
- assert_equal('OK', res.message)
- end
-
- def test_allow_empty_reason_code
- io = dummy_io(<<EOS)
-HTTP/1.1 200
-Content-Length: 5
-Connection: close
-
-hello
-EOS
-
- res = Net::HTTPResponse.read_new(io)
- assert_equal('1.1', res.http_version)
- assert_equal('200', res.code)
- assert_equal(nil, res.message)
+ assert_equal('XXX YYY', res.header['x-foo'])
+ assert_equal('XXX YYY', res.header['x-bar'])
end
private
def dummy_io(str)
- str = str.gsub(/\n/, "\r\n")
-
Net::BufferedIO.new(StringIO.new(str))
end
end
diff --git a/test/net/http/test_httpresponses.rb b/test/net/http/test_httpresponses.rb
deleted file mode 100644
index bf7fbeef11..0000000000
--- a/test/net/http/test_httpresponses.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'net/http'
-require 'test/unit'
-
-class HTTPResponsesTest < Test::Unit::TestCase
- def test_status_code_classes
- Net::HTTPResponse::CODE_TO_OBJ.each_pair { |code, klass|
- case code
- when /\A1\d\d\z/
- group = Net::HTTPInformation
- when /\A2\d\d\z/
- group = Net::HTTPSuccess
- when /\A3\d\d\z/
- group = Net::HTTPRedirection
- when /\A4\d\d\z/
- group = Net::HTTPClientError
- when /\A5\d\d\z/
- group = Net::HTTPServerError
- else
- flunk "Unknown HTTP status code: #{code} => #{klass.name}"
- end
- assert(klass < group, "#{klass.name} (#{code}) must inherit from #{group.name}")
- }
- end
-end
diff --git a/test/net/http/test_https.rb b/test/net/http/test_https.rb
index b711582b99..11bb4a1f1e 100644
--- a/test/net/http/test_https.rb
+++ b/test/net/http/test_https.rb
@@ -24,7 +24,7 @@ class TestNetHTTPS < Test::Unit::TestCase
CONFIG = {
'host' => '127.0.0.1',
- 'port' => 0,
+ 'port' => 10081,
'proxy_host' => nil,
'proxy_port' => nil,
'ssl_enable' => true,
@@ -41,8 +41,6 @@ class TestNetHTTPS < Test::Unit::TestCase
http.request_get("/") {|res|
assert_equal($test_net_http_data, res.body)
}
- rescue SystemCallError
- skip $!
end
def test_post
@@ -55,33 +53,6 @@ class TestNetHTTPS < Test::Unit::TestCase
http.request_post("/", data) {|res|
assert_equal(data, res.body)
}
- rescue SystemCallError
- skip $!
- end
-
- def test_session_reuse
- http = Net::HTTP.new("localhost", config("port"))
- http.use_ssl = true
- http.verify_callback = Proc.new do |preverify_ok, store_ctx|
- store_ctx.current_cert.to_der == config('ssl_certificate').to_der
- end
-
- http.start
- http.get("/")
- http.finish
-
- http.start
- http.get("/")
- http.finish # three times due to possible bug in OpenSSL 0.9.8
-
- http.start
- http.get("/")
-
- socket = http.instance_variable_get(:@socket).io
-
- assert socket.session_reused?
- rescue SystemCallError
- skip $!
end
if ENV["RUBY_OPENSSL_TEST_ALL"]
@@ -102,19 +73,13 @@ class TestNetHTTPS < Test::Unit::TestCase
http.request_get("/") {|res|
assert_equal($test_net_http_data, res.body)
}
- rescue SystemCallError
- skip $!
end
def test_certificate_verify_failure
http = Net::HTTP.new("localhost", config("port"))
http.use_ssl = true
ex = assert_raise(OpenSSL::SSL::SSLError){
- begin
- http.request_get("/") {|res| }
- rescue SystemCallError
- skip $!
- end
+ http.request_get("/") {|res| }
}
assert_match(/certificate verify failed/, ex.message)
end
@@ -128,23 +93,23 @@ class TestNetHTTPS < Test::Unit::TestCase
ex = assert_raise(OpenSSL::SSL::SSLError){
http.request_get("/") {|res| }
}
- assert_match(/hostname \"127.0.0.1\" does not match/, ex.message)
+ assert_match(/hostname was not match/, ex.message)
end
def test_timeout_during_SSL_handshake
bug4246 = "expected the SSL connection to have timed out but have not. [ruby-core:34203]"
# listen for connections... but deliberately do not complete SSL handshake
- TCPServer.open('localhost', 0) {|server|
+ TCPServer.open(0) {|server|
port = server.addr[1]
conn = Net::HTTP.new('localhost', port)
conn.use_ssl = true
- conn.read_timeout = 0.01
- conn.open_timeout = 0.01
+ conn.read_timeout = 1
+ conn.open_timeout = 1
th = Thread.new do
- assert_raise(Net::OpenTimeout) {
+ assert_raise(Timeout::Error) {
conn.get('/')
}
end
diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb
index 57cabf05e0..5618830587 100644
--- a/test/net/http/test_https_proxy.rb
+++ b/test/net/http/test_https_proxy.rb
@@ -6,12 +6,6 @@ require 'test/unit'
class HTTPSProxyTest < Test::Unit::TestCase
def test_https_proxy_authentication
- begin
- OpenSSL
- rescue LoadError
- skip 'autoload problem. see [ruby-dev:45021][Bug #5786]'
- end
-
t = nil
TCPServer.open("127.0.0.1", 0) {|serv|
_, port, _, _ = serv.addr
diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index 02e99d45fb..10c88d70d7 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -19,8 +19,7 @@ module TestNetHTTPUtils
end
def config(key)
- @config ||= self.class::CONFIG
- @config[key]
+ self.class::CONFIG[key]
end
def logfile
@@ -32,18 +31,15 @@ module TestNetHTTPUtils
end
def teardown
- if @server
- @server.shutdown
- until @server.status == :Stop
- sleep 0.1
- end
+ @server.shutdown
+ until @server.status == :Stop
+ sleep 0.1
end
# resume global state
Net::HTTP.version_1_2
end
def spawn_server
- @config = self.class::CONFIG
server_config = {
:BindAddress => config('host'),
:Port => config('port'),
@@ -53,19 +49,16 @@ module TestNetHTTPUtils
:ServerType => Thread,
}
server_config[:OutputBufferSize] = 4 if config('chunked')
- server_config[:RequestTimeout] = config('RequestTimeout') if config('RequestTimeout')
if defined?(OpenSSL) and config('ssl_enable')
server_config.update({
:SSLEnable => true,
:SSLCertificate => config('ssl_certificate'),
:SSLPrivateKey => config('ssl_private_key'),
- :SSLTmpDhCallback => proc { OpenSSL::TestUtils::TEST_KEY_DH1024 },
})
end
@server = WEBrick::HTTPServer.new(server_config)
@server.mount('/', Servlet, config('chunked'))
@server.start
- @config['port'] = @server[:Port] if @config['port'] == 0
n_try_max = 5
begin
TCPSocket.open(config('host'), config('port')).close
@@ -96,13 +89,6 @@ module TestNetHTTPUtils
# echo server
def do_POST(req, res)
res['Content-Type'] = req['Content-Type']
- res['X-request-uri'] = req.request_uri.to_s
- res.body = req.body
- res.chunked = @chunked
- end
-
- def do_PATCH(req, res)
- res['Content-Type'] = req['Content-Type']
res.body = req.body
res.chunked = @chunked
end
diff --git a/test/net/imap/Makefile b/test/net/imap/Makefile
deleted file mode 100644
index b2bc9c7368..0000000000
--- a/test/net/imap/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all:
-
-regen_certs:
- touch server.key
- make server.crt
-
-cacert.pem: server.key
- openssl req -new -x509 -days 1825 -key server.key -out cacert.pem -text -subj "/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org"
-
-server.csr:
- openssl req -new -key server.key -out server.csr -text -subj "/C=JP/ST=Shimane/O=Ruby Core Team/OU=Ruby Test/CN=localhost"
-
-server.crt: server.csr cacert.pem
- openssl x509 -days 1825 -CA cacert.pem -CAkey server.key -set_serial 00 -in server.csr -req -text -out server.crt
- rm server.csr
diff --git a/test/net/imap/cacert.pem b/test/net/imap/cacert.pem
index 7073387877..bd7e68ac95 100644
--- a/test/net/imap/cacert.pem
+++ b/test/net/imap/cacert.pem
@@ -2,65 +2,59 @@ Certificate:
Data:
Version: 3 (0x2)
Serial Number:
- b9:90:a2:bf:62:69:17:9c
+ 9f:dc:f7:94:98:05:43:4c
Signature Algorithm: sha1WithRSAEncryption
Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
Validity
- Not Before: Jan 3 01:34:17 2014 GMT
- Not After : Jan 2 01:34:17 2019 GMT
+ Not Before: Dec 23 10:21:33 2010 GMT
+ Not After : Jan 1 10:21:33 2014 GMT
Subject: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
- RSA Public Key: (1024 bit)
- Modulus (1024 bit):
- 00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6:
- bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be:
- 9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13:
- 9d:7e:eb:a2:06:e2:ea:7d:07:c7:c7:99:c7:fb:d5:
- b8:eb:63:77:62:2b:18:12:c3:53:58:d0:f5:c7:40:
- 0c:01:d1:26:82:34:16:09:e3:dc:65:f4:dc:bb:5d:
- a5:41:60:e7:a9:74:ba:d7:4c:b6:a3:9c:c5:8c:89:
- af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6:
- d0:fc:d6:eb:fc:06:82:10:fb
+ Public-Key: (1024 bit)
+ Modulus:
+ 00:ce:be:2c:9f:47:ba:db:9c:9c:5b:f0:38:3b:f3:
+ 74:20:37:76:23:9f:84:1c:81:90:b4:3e:00:20:34:
+ 98:7e:81:69:50:a1:c3:65:96:ea:fa:00:da:8c:cc:
+ 53:3f:ba:3c:d0:50:7a:5a:b4:6b:ac:d3:2e:18:ca:
+ 2a:69:b3:6a:6f:38:c2:32:a8:06:b6:0a:30:a9:ee:
+ 03:38:e9:05:a5:19:23:54:a8:3c:b9:08:ad:2b:72:
+ 23:df:93:22:c4:46:a8:ea:f1:a6:e9:30:4a:3f:83:
+ 39:e9:62:8e:8b:a3:5e:67:89:1d:7c:75:de:05:aa:
+ 58:b1:b7:79:7c:10:80:6d:87
Exponent: 65537 (0x10001)
X509v3 extensions:
X509v3 Subject Key Identifier:
- E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2
+ 41:C9:49:37:B1:FA:61:E3:BA:D7:19:3D:D9:DA:8C:B9:82:C9:B4:6A
X509v3 Authority Key Identifier:
- keyid:E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2
- DirName:/C=JP/ST=Shimane/L=Matz-e city/O=Ruby Core Team/CN=Ruby Test CA/emailAddress=security@ruby-lang.org
- serial:B9:90:A2:BF:62:69:17:9C
+ keyid:41:C9:49:37:B1:FA:61:E3:BA:D7:19:3D:D9:DA:8C:B9:82:C9:B4:6A
X509v3 Basic Constraints:
CA:TRUE
Signature Algorithm: sha1WithRSAEncryption
- 8f:77:06:4e:31:72:12:ee:68:09:70:27:d4:31:85:ef:10:95:
- f9:0f:2b:66:63:08:37:88:6e:b7:9b:40:3e:18:77:33:86:e8:
- 61:6a:b7:3c:cb:c7:a6:d6:d5:92:6a:1f:56:d0:9f:5c:32:56:
- d3:37:52:fe:0e:20:c2:7a:0d:fe:2d:3c:81:da:b8:7f:4d:6a:
- 08:01:d9:be:7a:a2:15:be:a6:ce:49:64:90:8c:9a:ca:6e:2e:
- 84:48:1d:94:19:56:94:46:aa:25:9b:68:c2:80:60:bf:cb:2e:
- 35:03:ea:0a:65:5a:33:38:c6:cc:81:46:c0:bc:36:86:96:39:
- 10:7d
+ 86:00:33:b9:dd:ff:5f:83:59:5f:c3:29:3c:d7:11:db:10:b3:
+ d7:d1:70:fb:0a:c6:74:85:c6:ea:e1:15:c4:92:f8:0e:11:cc:
+ ff:a6:3c:31:c2:2c:66:d8:fe:63:93:9f:b0:97:e6:f5:bc:5c:
+ 80:68:96:5d:eb:77:b9:23:dd:68:a7:49:03:ff:22:48:55:f1:
+ 39:7c:20:21:ff:64:52:e1:f6:cf:3c:b3:4d:2c:5c:03:62:ea:
+ c5:49:99:07:fa:8d:ff:7b:c2:75:0c:ca:24:b5:0b:f5:b7:57:
+ 3a:10:f0:8a:bb:9a:e8:92:4d:d5:6f:c2:a2:29:36:61:78:a4:
+ dc:7b
-----BEGIN CERTIFICATE-----
-MIIDjTCCAvagAwIBAgIJALmQor9iaRecMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJKUDEQMA4GA1UECBMHU2hpbWFuZTEUMBIGA1UEBxMLTWF0ei1lIGNpdHkx
-FzAVBgNVBAoTDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDEwxSdWJ5IFRlc3QgQ0Ex
-JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTQwMTAz
-MDEzNDE3WhcNMTkwMTAyMDEzNDE3WjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT
-B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv
-cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
+MIIC6DCCAlGgAwIBAgIJAJ/c95SYBUNMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+VQQGEwJKUDEQMA4GA1UECAwHU2hpbWFuZTEUMBIGA1UEBwwLTWF0ei1lIGNpdHkx
+FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRUwEwYDVQQDDAxSdWJ5IFRlc3QgQ0Ex
+JTAjBgkqhkiG9w0BCQEWFnNlY3VyaXR5QHJ1YnktbGFuZy5vcmcwHhcNMTAxMjIz
+MTAyMTMzWhcNMTQwMTAxMTAyMTMzWjCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgM
+B1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQKDA5SdWJ5IENv
+cmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
ZWN1cml0eUBydWJ5LWxhbmcub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDbddBF3rHfv3GgDrCl5rz0HJ3lJWdkxXvL8a/Gvpqq6n4PzAWv70BpBrLJE51+
-66IG4up9B8fHmcf71bjrY3diKxgSw1NY0PXHQAwB0SaCNBYJ49xl9Ny7XaVBYOep
-dLrXTLajnMWMia/L6J8F/ur+ZCS/5+3j9tD81uv8BoIQ+wIDAQABo4H0MIHxMB0G
-A1UdDgQWBBToflisE3sDIo2erzILhImAgAwewjCBwQYDVR0jBIG5MIG2gBToflis
-E3sDIo2erzILhImAgAwewqGBkqSBjzCBjDELMAkGA1UEBhMCSlAxEDAOBgNVBAgT
-B1NoaW1hbmUxFDASBgNVBAcTC01hdHotZSBjaXR5MRcwFQYDVQQKEw5SdWJ5IENv
-cmUgVGVhbTEVMBMGA1UEAxMMUnVieSBUZXN0IENBMSUwIwYJKoZIhvcNAQkBFhZz
-ZWN1cml0eUBydWJ5LWxhbmcub3JnggkAuZCiv2JpF5wwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOBgQCPdwZOMXIS7mgJcCfUMYXvEJX5DytmYwg3iG63m0A+
-GHczhuhharc8y8em1tWSah9W0J9cMlbTN1L+DiDCeg3+LTyB2rh/TWoIAdm+eqIV
-vqbOSWSQjJrKbi6ESB2UGVaURqolm2jCgGC/yy41A+oKZVozOMbMgUbAvDaGljkQ
-fQ==
+gQDOviyfR7rbnJxb8Dg783QgN3Yjn4QcgZC0PgAgNJh+gWlQocNllur6ANqMzFM/
+ujzQUHpatGus0y4Yyipps2pvOMIyqAa2CjCp7gM46QWlGSNUqDy5CK0rciPfkyLE
+Rqjq8abpMEo/gznpYo6Lo15niR18dd4Fqlixt3l8EIBthwIDAQABo1AwTjAdBgNV
+HQ4EFgQUQclJN7H6YeO61xk92dqMuYLJtGowHwYDVR0jBBgwFoAUQclJN7H6YeO6
+1xk92dqMuYLJtGowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCGADO5
+3f9fg1lfwyk81xHbELPX0XD7CsZ0hcbq4RXEkvgOEcz/pjwxwixm2P5jk5+wl+b1
+vFyAaJZd63e5I91op0kD/yJIVfE5fCAh/2RS4fbPPLNNLFwDYurFSZkH+o3/e8J1
+DMoktQv1t1c6EPCKu5rokk3Vb8KiKTZheKTcew==
-----END CERTIFICATE-----
diff --git a/test/net/imap/server.crt b/test/net/imap/server.crt
index fa4f99493a..d848b26ab0 100644
--- a/test/net/imap/server.crt
+++ b/test/net/imap/server.crt
@@ -1,17 +1,17 @@
Certificate:
Data:
- Version: 1 (0x0)
+ Version: 3 (0x2)
Serial Number: 0 (0x0)
Signature Algorithm: sha1WithRSAEncryption
Issuer: C=JP, ST=Shimane, L=Matz-e city, O=Ruby Core Team, CN=Ruby Test CA/emailAddress=security@ruby-lang.org
Validity
- Not Before: Jan 3 01:34:17 2014 GMT
- Not After : Jan 2 01:34:17 2019 GMT
+ Not Before: Dec 23 10:23:52 2010 GMT
+ Not After : Jan 1 10:23:52 2014 GMT
Subject: C=JP, ST=Shimane, O=Ruby Core Team, OU=Ruby Test, CN=localhost
Subject Public Key Info:
Public Key Algorithm: rsaEncryption
- RSA Public Key: (1024 bit)
- Modulus (1024 bit):
+ Public-Key: (1024 bit)
+ Modulus:
00:db:75:d0:45:de:b1:df:bf:71:a0:0e:b0:a5:e6:
bc:f4:1c:9d:e5:25:67:64:c5:7b:cb:f1:af:c6:be:
9a:aa:ea:7e:0f:cc:05:af:ef:40:69:06:b2:c9:13:
@@ -22,27 +22,40 @@ Certificate:
af:cb:e8:9f:05:fe:ea:fe:64:24:bf:e7:ed:e3:f6:
d0:fc:d6:eb:fc:06:82:10:fb
Exponent: 65537 (0x10001)
+ X509v3 extensions:
+ X509v3 Basic Constraints:
+ CA:FALSE
+ Netscape Comment:
+ OpenSSL Generated Certificate
+ X509v3 Subject Key Identifier:
+ E8:7E:58:AC:13:7B:03:22:8D:9E:AF:32:0B:84:89:80:80:0C:1E:C2
+ X509v3 Authority Key Identifier:
+ keyid:41:C9:49:37:B1:FA:61:E3:BA:D7:19:3D:D9:DA:8C:B9:82:C9:B4:6A
+
Signature Algorithm: sha1WithRSAEncryption
- 85:f5:d3:05:8b:8c:f4:43:1c:88:f2:8f:b2:f2:93:77:b7:3d:
- 95:c6:a0:34:bc:33:6a:d8:85:5f:3e:86:08:10:c5:5c:c1:76:
- a3:53:3c:dc:38:98:23:97:e7:da:21:ac:e8:4d:3c:96:70:29:
- ff:ff:1e:4a:9a:17:2b:db:04:62:b9:ef:ab:ea:a7:a5:e8:7c:
- b1:d5:ed:30:a8:6c:78:de:51:7e:e3:8a:c2:a4:64:a8:63:a2:
- bc:fd:43:9c:f3:55:7d:54:c9:6a:d8:53:1c:4b:6b:03:aa:b6:
- 19:e6:a4:4f:47:00:96:c5:42:59:85:4e:c3:4e:cd:41:82:53:
- 10:f8
+ ae:ee:cd:fe:c9:af:48:0b:50:37:ac:6a:f6:68:90:9b:67:df:
+ 6f:2d:17:c9:3c:a5:da:ad:39:dc:2a:5b:07:88:26:38:19:30:
+ d6:95:cf:10:69:c7:92:14:83:be:f1:b5:8e:6f:d9:91:51:c5:
+ 63:ae:1c:89:ac:27:bf:4f:2a:8f:4e:0c:57:42:0a:c9:8e:0c:
+ f4:f3:02:f7:ea:44:b6:e4:47:05:af:4e:74:e4:87:87:d9:c8:
+ 76:ed:ab:32:7c:f0:31:34:10:14:bc:a6:37:cd:d7:dc:33:da:
+ 82:d3:d4:9b:e9:d5:cd:38:cc:fa:81:5f:4e:fd:5f:53:05:5d:
+ 76:f9
-----BEGIN CERTIFICATE-----
-MIICXDCCAcUCAQAwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAkpQMRAwDgYD
-VQQIEwdTaGltYW5lMRQwEgYDVQQHEwtNYXR6LWUgY2l0eTEXMBUGA1UEChMOUnVi
-eSBDb3JlIFRlYW0xFTATBgNVBAMTDFJ1YnkgVGVzdCBDQTElMCMGCSqGSIb3DQEJ
-ARYWc2VjdXJpdHlAcnVieS1sYW5nLm9yZzAeFw0xNDAxMDMwMTM0MTdaFw0xOTAx
-MDIwMTM0MTdaMGAxCzAJBgNVBAYTAkpQMRAwDgYDVQQIEwdTaGltYW5lMRcwFQYD
-VQQKEw5SdWJ5IENvcmUgVGVhbTESMBAGA1UECxMJUnVieSBUZXN0MRIwEAYDVQQD
-Ewlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANt10EXesd+/
-caAOsKXmvPQcneUlZ2TFe8vxr8a+mqrqfg/MBa/vQGkGsskTnX7rogbi6n0Hx8eZ
-x/vVuOtjd2IrGBLDU1jQ9cdADAHRJoI0Fgnj3GX03LtdpUFg56l0utdMtqOcxYyJ
-r8vonwX+6v5kJL/n7eP20PzW6/wGghD7AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEA
-hfXTBYuM9EMciPKPsvKTd7c9lcagNLwzatiFXz6GCBDFXMF2o1M83DiYI5fn2iGs
-6E08lnAp//8eSpoXK9sEYrnvq+qnpeh8sdXtMKhseN5RfuOKwqRkqGOivP1DnPNV
-fVTJathTHEtrA6q2GeakT0cAlsVCWYVOw07NQYJTEPg=
+MIIC3jCCAkegAwIBAgIBADANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMCSlAx
+EDAOBgNVBAgMB1NoaW1hbmUxFDASBgNVBAcMC01hdHotZSBjaXR5MRcwFQYDVQQK
+DA5SdWJ5IENvcmUgVGVhbTEVMBMGA1UEAwwMUnVieSBUZXN0IENBMSUwIwYJKoZI
+hvcNAQkBFhZzZWN1cml0eUBydWJ5LWxhbmcub3JnMB4XDTEwMTIyMzEwMjM1MloX
+DTE0MDEwMTEwMjM1MlowYDELMAkGA1UEBhMCSlAxEDAOBgNVBAgMB1NoaW1hbmUx
+FzAVBgNVBAoMDlJ1YnkgQ29yZSBUZWFtMRIwEAYDVQQLDAlSdWJ5IFRlc3QxEjAQ
+BgNVBAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA23XQ
+Rd6x379xoA6wpea89Byd5SVnZMV7y/Gvxr6aqup+D8wFr+9AaQayyROdfuuiBuLq
+fQfHx5nH+9W462N3YisYEsNTWND1x0AMAdEmgjQWCePcZfTcu12lQWDnqXS610y2
+o5zFjImvy+ifBf7q/mQkv+ft4/bQ/Nbr/AaCEPsCAwEAAaN7MHkwCQYDVR0TBAIw
+ADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUw
+HQYDVR0OBBYEFOh+WKwTewMijZ6vMguEiYCADB7CMB8GA1UdIwQYMBaAFEHJSTex
++mHjutcZPdnajLmCybRqMA0GCSqGSIb3DQEBBQUAA4GBAK7uzf7Jr0gLUDesavZo
+kJtn328tF8k8pdqtOdwqWweIJjgZMNaVzxBpx5IUg77xtY5v2ZFRxWOuHImsJ79P
+Ko9ODFdCCsmODPTzAvfqRLbkRwWvTnTkh4fZyHbtqzJ88DE0EBS8pjfN19wz2oLT
+1Jvp1c04zPqBX079X1MFXXb5
-----END CERTIFICATE-----
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 9484ab8f6c..f5ffc84e36 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -18,26 +18,16 @@ class IMAPTest < Test::Unit::TestCase
end
def test_encode_utf7
- assert_equal("foo", Net::IMAP.encode_utf7("foo"))
- assert_equal("&-", Net::IMAP.encode_utf7("&"))
-
utf8 = "\357\274\241\357\274\242\357\274\243".force_encoding("UTF-8")
s = Net::IMAP.encode_utf7(utf8)
- assert_equal("&,yH,Iv8j-", s)
- s = Net::IMAP.encode_utf7("foo&#{utf8}-bar".encode("EUC-JP"))
- assert_equal("foo&-&,yH,Iv8j--bar", s)
+ assert_equal("&,yH,Iv8j-".force_encoding("UTF-8"), s)
utf8 = "\343\201\202&".force_encoding("UTF-8")
s = Net::IMAP.encode_utf7(utf8)
- assert_equal("&MEI-&-", s)
- s = Net::IMAP.encode_utf7(utf8.encode("EUC-JP"))
- assert_equal("&MEI-&-", s)
+ assert_equal("&MEI-&-".force_encoding("UTF-8"), s)
end
def test_decode_utf7
- assert_equal("&", Net::IMAP.decode_utf7("&-"))
- assert_equal("&-", Net::IMAP.decode_utf7("&--"))
-
s = Net::IMAP.decode_utf7("&,yH,Iv8j-")
utf8 = "\357\274\241\357\274\242\357\274\243".force_encoding("UTF-8")
assert_equal(utf8, s)
@@ -55,36 +45,32 @@ class IMAPTest < Test::Unit::TestCase
assert_match(/\A24-Jul-2009 01:23 [+\-]\d{4}\z/, s)
end
- if defined?(OpenSSL::SSL::SSLError)
- def test_imaps_unknown_ca
+ def test_imaps_unknown_ca
+ if defined?(OpenSSL)
assert_raise(OpenSSL::SSL::SSLError) do
imaps_test do |port|
- begin
- Net::IMAP.new("localhost",
- :port => port,
- :ssl => true)
- rescue SystemCallError
- skip $!
- end
+ Net::IMAP.new("localhost",
+ :port => port,
+ :ssl => true)
end
end
end
+ end
- def test_imaps_with_ca_file
+ def test_imaps_with_ca_file
+ if defined?(OpenSSL)
assert_nothing_raised do
imaps_test do |port|
- begin
- Net::IMAP.new("localhost",
- :port => port,
- :ssl => { :ca_file => CA_FILE })
- rescue SystemCallError
- skip $!
- end
+ Net::IMAP.new("localhost",
+ :port => port,
+ :ssl => { :ca_file => CA_FILE })
end
end
end
+ end
- def test_imaps_verify_none
+ def test_imaps_verify_none
+ if defined?(OpenSSL)
assert_nothing_raised do
imaps_test do |port|
Net::IMAP.new(SERVER_ADDR,
@@ -93,8 +79,10 @@ class IMAPTest < Test::Unit::TestCase
end
end
end
+ end
- def test_imaps_post_connection_check
+ def test_imaps_post_connection_check
+ if defined?(OpenSSL)
assert_raise(OpenSSL::SSL::SSLError) do
imaps_test do |port|
# SERVER_ADDR is different from the hostname in the certificate,
@@ -107,20 +95,18 @@ class IMAPTest < Test::Unit::TestCase
end
end
- if defined?(OpenSSL::SSL)
- def test_starttls
- imap = nil
+ def test_starttls
+ imap = nil
+ if defined?(OpenSSL)
starttls_test do |port|
imap = Net::IMAP.new("localhost", :port => port)
imap.starttls(:ca_file => CA_FILE)
imap
end
- rescue SystemCallError
- skip $!
- ensure
- if imap && !imap.disconnected?
- imap.disconnect
- end
+ end
+ ensure
+ if imap && !imap.disconnected?
+ imap.disconnect
end
end
@@ -367,88 +353,6 @@ class IMAPTest < Test::Unit::TestCase
end
end
- def test_connection_closed_during_idle
- server = create_tcp_server
- port = server.addr[1]
- requests = []
- sock = nil
- Thread.start do
- begin
- sock = server.accept
- sock.print("* OK test server\r\n")
- requests.push(sock.gets)
- sock.print("+ idling\r\n")
- rescue
- end
- end
- begin
- imap = Net::IMAP.new(SERVER_ADDR, :port => port)
- begin
- th = Thread.current
- m = Monitor.new
- in_idle = false
- exception_raised = false
- c = m.new_cond
- Thread.start do
- m.synchronize do
- until in_idle
- c.wait(0.1)
- end
- end
- sock.close
- exception_raised = true
- end
- assert_raise(Net::IMAP::Error) do
- imap.idle do |res|
- m.synchronize do
- in_idle = true
- c.signal
- until exception_raised
- c.wait(0.1)
- end
- end
- end
- end
- assert_equal(1, requests.length)
- assert_equal("RUBY0001 IDLE\r\n", requests[0])
- ensure
- imap.disconnect if imap
- end
- ensure
- server.close
- if sock && !sock.closed?
- sock.close
- end
- end
- end
-
- def test_connection_closed_without_greeting
- server = create_tcp_server
- port = server.addr[1]
- Thread.start do
- begin
- sock = server.accept
- sock.close
- rescue
- end
- end
- begin
- assert_raise(Net::IMAP::Error) do
- Net::IMAP.new(SERVER_ADDR, :port => port)
- end
- ensure
- server.close
- end
- end
-
- def test_default_port
- assert_equal(143, Net::IMAP.default_port)
- assert_equal(143, Net::IMAP.default_imap_port)
- assert_equal(993, Net::IMAP.default_tls_port)
- assert_equal(993, Net::IMAP.default_ssl_port)
- assert_equal(993, Net::IMAP.default_imaps_port)
- end
-
private
def imaps_test
diff --git a/test/net/imap/test_imap_response_parser.rb b/test/net/imap/test_imap_response_parser.rb
index 608941c0f1..f106e4a61d 100644
--- a/test/net/imap/test_imap_response_parser.rb
+++ b/test/net/imap/test_imap_response_parser.rb
@@ -56,14 +56,6 @@ EOF
end
end
- def test_flag_xlist_inbox
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* XLIST (\\Inbox) "." "INBOX"
-EOF
- assert_equal [:Inbox], response.data.attr
- end
-
def test_resp_text_code
parser = Net::IMAP::ResponseParser.new
response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
@@ -71,191 +63,4 @@ EOF
EOF
assert_equal "CLOSED", response.data.code.name
end
-
- def test_search_response
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH
-EOF
- assert_equal [], response.data
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH 1
-EOF
- assert_equal [1], response.data
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH 1 2 3
-EOF
- assert_equal [1, 2, 3], response.data
- end
-
- def test_search_response_of_yahoo
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH 1\s
-EOF
- assert_equal [1], response.data
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH 1 2 3\s
-EOF
- assert_equal [1, 2, 3], response.data
- end
-
- def test_msg_att_extra_space
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 1 FETCH (UID 92285)
-EOF
- assert_equal 92285, response.data.attr["UID"]
-
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 1 FETCH (UID 92285 )
-EOF
- assert_equal 92285, response.data.attr["UID"]
-
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 1 FETCH (UID 92285 )
-EOF
- end
-
- def test_msg_att_parse_error
- parser = Net::IMAP::ResponseParser.new
- e = assert_raise(Net::IMAP::ResponseParseError) {
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 123 FETCH (UNKNOWN 92285)
-EOF
- }
- assert_match(/ for \{123\}/, e.message)
- end
-
- def test_msg_att_rfc822_text
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 123 FETCH (RFC822 {5}
-foo
-)
-EOF
- assert_equal("foo\r\n", response.data.attr["RFC822"])
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 123 FETCH (RFC822[] {5}
-foo
-)
-EOF
- assert_equal("foo\r\n", response.data.attr["RFC822"])
- end
-
- # [Bug #6397] [ruby-core:44849]
- def test_body_type_attachment
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 980 FETCH (UID 2862 BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "7BIT" 416 21 NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "7BIT" 1493 32 NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "Boundary_(ID_IaecgfnXwG5bn3x8lIeGIQ)") NIL NIL)("MESSAGE" "RFC822" ("NAME" "Fw_ ____ _____ ____.eml") NIL NIL "7BIT" 1980088 NIL ("ATTACHMENT" ("FILENAME" "Fw_ ____ _____ ____.eml")) NIL) "MIXED" ("BOUNDARY" "Boundary_(ID_eDdLc/j0mBIzIlR191pHjA)") NIL NIL))
-EOF
- assert_equal("Fw_ ____ _____ ____.eml",
- response.data.attr["BODYSTRUCTURE"].parts[1].body.param["FILENAME"])
- end
-
- def assert_parseable(s)
- parser = Net::IMAP::ResponseParser.new
- parser.parse(s.gsub(/\n/, "\r\n").taint)
- end
-
- # [Bug #7146]
- def test_msg_delivery_status
- # This was part of a larger response that caused crashes, but this was the
- # minimal test case to demonstrate it
- assert_parseable <<EOF
-* 4902 FETCH (BODY (("MESSAGE" "DELIVERY-STATUS" NIL NIL NIL "7BIT" 324) "REPORT"))
-EOF
- end
-
- # [Bug #7147]
- def test_msg_with_message_rfc822_attachment
- assert_parseable <<EOF
-* 5441 FETCH (BODY ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 69 1)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 455 12) "ALTERNATIVE")("MESSAGE" "RFC822" ("NAME" "ATT00026.eml") NIL NIL "7BIT" 4079755) "MIXED"))
-EOF
- end
-
- # [Bug #7153]
- def test_msg_body_mixed
- assert_parseable <<EOF
-* 1038 FETCH (BODY ("MIXED"))
-EOF
- end
-
- # [Bug #8281]
- def test_acl
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* ACL "INBOX/share" "imshare2copy1366146467@xxxxxxxxxxxxxxxxxx.com" lrswickxteda
-EOF
- assert_equal("ACL", response.name)
- assert_equal(1, response.data.length)
- assert_equal("INBOX/share", response.data[0].mailbox)
- assert_equal("imshare2copy1366146467@xxxxxxxxxxxxxxxxxx.com",
- response.data[0].user)
- assert_equal("lrswickxteda", response.data[0].rights)
- end
-
- # [Bug #8415]
- def test_capability
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse("* CAPABILITY st11p00mm-iscream009 1Q49 XAPPLEPUSHSERVICE IMAP4 IMAP4rev1 SASL-IR AUTH=ATOKEN AUTH=PLAIN\r\n")
- assert_equal("CAPABILITY", response.name)
- assert_equal("AUTH=PLAIN", response.data.last)
- response = parser.parse("* CAPABILITY st11p00mm-iscream009 1Q49 XAPPLEPUSHSERVICE IMAP4 IMAP4rev1 SASL-IR AUTH=ATOKEN AUTH=PLAIN \r\n")
- assert_equal("CAPABILITY", response.name)
- assert_equal("AUTH=PLAIN", response.data.last)
- end
-
- # [Bug #8167]
- def test_msg_delivery_status_with_extra_data
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* 29021 FETCH (RFC822.SIZE 3162 UID 113622 RFC822.HEADER {1155}
-Return-path: <>
-Envelope-to: info@xxxxxxxx.si
-Delivery-date: Tue, 26 Mar 2013 12:42:58 +0100
-Received: from mail by xxxx.xxxxxxxxxxx.net with spam-scanned (Exim 4.76)
- id 1UKSHI-000Cwl-AR
- for info@xxxxxxxx.si; Tue, 26 Mar 2013 12:42:58 +0100
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on xxxx.xxxxxxxxxxx.net
-X-Spam-Level: **
-X-Spam-Status: No, score=2.1 required=7.0 tests=DKIM_ADSP_NXDOMAIN,RDNS_NONE
- autolearn=no version=3.3.1
-Received: from [xx.xxx.xxx.xx] (port=56890 helo=xxxxxx.localdomain)
- by xxxx.xxxxxxxxxxx.net with esmtp (Exim 4.76)
- id 1UKSHI-000Cwi-9j
- for info@xxxxxxxx.si; Tue, 26 Mar 2013 12:42:56 +0100
-Received: by xxxxxx.localdomain (Postfix)
- id 72725BEA64A; Tue, 26 Mar 2013 12:42:55 +0100 (CET)
-Date: Tue, 26 Mar 2013 12:42:55 +0100 (CET)
-From: MAILER-DAEMON@xxxxxx.localdomain (Mail Delivery System)
-Subject: Undelivered Mail Returned to Sender
-To: info@xxxxxxxx.si
-Auto-Submitted: auto-replied
-MIME-Version: 1.0
-Content-Type: multipart/report; report-type=delivery-status;
- boundary="27797BEA649.1364298175/xxxxxx.localdomain"
-Message-Id: <20130326114255.72725BEA64A@xxxxxx.localdomain>
-
- BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL "Notification" "7bit" 510 14 NIL NIL NIL NIL)("message" "delivery-status" NIL NIL "Delivery report" "7bit" 410 NIL NIL NIL NIL)("text" "rfc822-headers" ("charset" "us-ascii") NIL "Undelivered Message Headers" "7bit" 612 15 NIL NIL NIL NIL) "report" ("report-type" "delivery-status" "boundary" "27797BEA649.1364298175/xxxxxx.localdomain") NIL NIL NIL))
-EOF
- delivery_status = response.data.attr["BODYSTRUCTURE"].parts[1]
- assert_equal("MESSAGE", delivery_status.media_type)
- assert_equal("DELIVERY-STATUS", delivery_status.subtype)
- assert_equal(nil, delivery_status.param)
- assert_equal(nil, delivery_status.content_id)
- assert_equal("Delivery report", delivery_status.description)
- assert_equal("7BIT", delivery_status.encoding)
- assert_equal(410, delivery_status.size)
- end
-
- def test_mixed_boundry
- parser = Net::IMAP::ResponseParser.new
- response = parser.parse("* 2688 FETCH (UID 179161 BODYSTRUCTURE ((\"TEXT\" \"PLAIN\" (\"CHARSET\" \"iso-8859-1\") NIL NIL \"QUOTED-PRINTABLE\" 200 4 NIL NIL NIL)(\"MESSAGE\" \"DELIVERY-STATUS\" NIL NIL NIL \"7BIT\" 318 NIL NIL NIL)(\"MESSAGE\" \"RFC822\" NIL NIL NIL \"7BIT\" 2177 (\"Tue, 11 May 2010 18:28:16 -0400\" \"Re: Welcome letter\" ((\"David\" NIL \"info\" \"xxxxxxxx.si\")) ((\"David\" NIL \"info\" \"xxxxxxxx.si\")) ((\"David\" NIL \"info\" \"xxxxxxxx.si\")) ((\"Doretha\" NIL \"doretha.info\" \"xxxxxxxx.si\")) NIL NIL \"<AC1D15E06EA82F47BDE18E851CC32F330717704E@localdomain>\" \"<AANLkTikKMev1I73L2E7XLjRs67IHrEkb23f7ZPmD4S_9@localdomain>\") (\"MIXED\" (\"BOUNDARY\" \"000e0cd29212e3e06a0486590ae2\") NIL NIL) 37 NIL NIL NIL) \"REPORT\" (\"BOUNDARY\" \"16DuG.4XbaNOvCi.9ggvq.8Ipnyp3\" \"REPORT-TYPE\" \"delivery-status\") NIL NIL))\r\n")
- empty_part = response.data.attr['BODYSTRUCTURE'].parts[2]
- assert_equal(empty_part.lines, 37)
- assert_equal(empty_part.body.media_type, 'MULTIPART')
- assert_equal(empty_part.body.subtype, 'MIXED')
- assert_equal(empty_part.body.param['BOUNDARY'], '000e0cd29212e3e06a0486590ae2')
- end
end
diff --git a/test/net/protocol/test_protocol.rb b/test/net/protocol/test_protocol.rb
deleted file mode 100644
index 4453422552..0000000000
--- a/test/net/protocol/test_protocol.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require "test/unit"
-require "net/protocol"
-require "stringio"
-
-class TestProtocol < Test::Unit::TestCase
- def test_should_properly_dot_stuff_period_with_no_endline
- bug9627 = '[ruby-core:61441] [Bug #9627]'
- sio = StringIO.new("")
- imio = Net::InternetMessageIO.new(sio)
- email = "To: bob@aol.com\nlook, a period with no endline\n."
- imio.write_message(email)
- assert_equal("To: bob@aol.com\r\nlook, a period with no endline\r\n..\r\n.\r\n", sio.string, bug9627)
- end
-
- def test_each_crlf_line
- assert_output('', '') do
- sio = StringIO.new("")
- imio = Net::InternetMessageIO.new(sio)
- assert_equal(23, imio.write_message("\u3042\r\u3044\n\u3046\r\n\u3048"))
- assert_equal("\u3042\r\n\u3044\r\n\u3046\r\n\u3048\r\n.\r\n", sio.string)
-
- sio = StringIO.new("")
- imio = Net::InternetMessageIO.new(sio)
- assert_equal(8, imio.write_message("\u3042\r"))
- assert_equal("\u3042\r\n.\r\n", sio.string)
- end
- end
-end
diff --git a/test/net/smtp/test_smtp.rb b/test/net/smtp/test_smtp.rb
deleted file mode 100644
index ba2943db56..0000000000
--- a/test/net/smtp/test_smtp.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'net/smtp'
-require 'minitest/autorun'
-
-module Net
- class TestSMTP < MiniTest::Unit::TestCase
- def test_critical
- smtp = Net::SMTP.new 'localhost', 25
-
- assert_raises RuntimeError do
- smtp.send :critical do
- raise 'fail on purpose'
- end
- end
-
- assert_kind_of Net::SMTP::Response, smtp.send(:critical),
- '[Bug #9125]'
- end
-
- def test_esmtp
- smtp = Net::SMTP.new 'localhost', 25
- assert smtp.esmtp
- assert smtp.esmtp?
-
- smtp.esmtp = 'omg'
- assert_equal 'omg', smtp.esmtp
- assert_equal 'omg', smtp.esmtp?
- end
- end
-end
diff --git a/test/nkf/test_nkf.rb b/test/nkf/test_nkf.rb
index 7329e75f12..2c6b964eb9 100644
--- a/test/nkf/test_nkf.rb
+++ b/test/nkf/test_nkf.rb
@@ -15,7 +15,7 @@ Ruby"
def test_ruby_dev_36909
assert_nothing_raised do
- 100.times { NKF.nkf("--oc=eucJP-nkf", "foo") }
+ 1000.times { NKF.nkf("--oc=eucJP-nkf", "foo") }
end
end
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 8a8d7ce8ea..cfdb485747 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -1,12 +1,9 @@
require "test/unit"
require "objspace"
-require_relative "../ruby/envutil"
class TestObjSpace < Test::Unit::TestCase
def test_memsize_of
assert_equal(0, ObjectSpace.memsize_of(true))
- assert_equal(0, ObjectSpace.memsize_of(nil))
- assert_equal(0, ObjectSpace.memsize_of(1))
assert_kind_of(Integer, ObjectSpace.memsize_of(Object.new))
assert_kind_of(Integer, ObjectSpace.memsize_of(Class))
assert_kind_of(Integer, ObjectSpace.memsize_of(""))
@@ -18,30 +15,6 @@ class TestObjSpace < Test::Unit::TestCase
f.close
assert_kind_of(Integer, ObjectSpace.memsize_of(/a/.match("a")))
assert_kind_of(Integer, ObjectSpace.memsize_of(Struct.new(:a)))
-
- assert_operator(ObjectSpace.memsize_of(Regexp.new("(a)"*1000).match("a"*1000)),
- :>,
- ObjectSpace.memsize_of(//.match("")))
- end
-
- def test_argf_memsize
- size = ObjectSpace.memsize_of(ARGF)
- assert_kind_of(Integer, size)
- assert_operator(size, :>, 0)
- argf = ARGF.dup
- argf.inplace_mode = nil
- size = ObjectSpace.memsize_of(argf)
- argf.inplace_mode = "inplace_mode_suffix"
- assert_equal(size + 20, ObjectSpace.memsize_of(argf))
- end
-
- def test_memsize_of_all
- assert_kind_of(Integer, a = ObjectSpace.memsize_of_all)
- assert_kind_of(Integer, b = ObjectSpace.memsize_of_all(String))
- assert(a > b)
- assert(a > 0)
- assert(b > 0)
- assert_raise(TypeError) {ObjectSpace.memsize_of_all('error')}
end
def test_count_objects_size
@@ -58,9 +31,7 @@ class TestObjSpace < Test::Unit::TestCase
assert_equal(false, res.empty?)
arg = {}
ObjectSpace.count_nodes(arg)
- assert_not_empty(arg)
- bug8014 = '[ruby-core:53130] [Bug #8014]'
- assert_empty(arg.select {|k, v| !(Symbol === k && Integer === v)}, bug8014)
+ assert_equal(false, arg.empty?)
end
def test_count_tdata_objects
@@ -70,42 +41,4 @@ class TestObjSpace < Test::Unit::TestCase
ObjectSpace.count_tdata_objects(arg)
assert_equal(false, arg.empty?)
end
-
- def test_reachable_objects_from
- assert_separately %w[--disable-gem -robjspace], __FILE__, __LINE__, <<-'eom'
- assert_equal(nil, ObjectSpace.reachable_objects_from(nil))
- assert_equal([Array, 'a', 'b', 'c'], ObjectSpace.reachable_objects_from(['a', 'b', 'c']))
-
- assert_equal([Array, 'a', 'a', 'a'], ObjectSpace.reachable_objects_from(['a', 'a', 'a']))
- assert_equal([Array, 'a', 'a'], ObjectSpace.reachable_objects_from(['a', v = 'a', v]))
- assert_equal([Array, 'a'], ObjectSpace.reachable_objects_from([v = 'a', v, v]))
-
- long_ary = Array.new(1_000){''}
- max = 0
-
- ObjectSpace.each_object{|o|
- refs = ObjectSpace.reachable_objects_from(o)
- max = [refs.size, max].max
-
- unless refs.nil?
- refs.each_with_index {|ro, i|
- assert_not_nil(ro, "#{i}: this referenced object is internal object")
- }
- end
- }
- assert_operator(max, :>=, long_ary.size+1, "1000 elems + Array class")
- eom
- end
-
- def test_reachable_objects_size
- assert_separately %w[--disable-gem -robjspace], __FILE__, __LINE__, <<-'eom'
- ObjectSpace.each_object{|o|
- ObjectSpace.reachable_objects_from(o).each{|reached_obj|
- size = ObjectSpace.memsize_of(reached_obj)
- assert_kind_of(Integer, size)
- assert_operator(size, :>=, 0)
- }
- }
- eom
- end
end
diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb
index 740728e9e7..14f08ffd98 100644
--- a/test/open-uri/test_open-uri.rb
+++ b/test/open-uri/test_open-uri.rb
@@ -2,10 +2,7 @@ require 'test/unit'
require 'open-uri'
require 'webrick'
require 'webrick/httpproxy'
-begin
- require 'zlib'
-rescue LoadError
-end
+require 'zlib'
class TestOpenURI < Test::Unit::TestCase
@@ -24,13 +21,10 @@ class TestOpenURI < Test::Unit::TestCase
:Port => 0})
_, port, _, host = srv.listeners[0].addr
begin
- srv.start
+ th = srv.start
yield srv, dr, "http://#{host}:#{port}"
ensure
srv.shutdown
- until srv.status == :Stop
- sleep 0.1
- end
end
}
end
@@ -58,7 +52,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_200
with_http {|srv, dr, url|
- srv.mount_proc("/foo200", lambda { |req, res| res.body = "foo200" } )
+ open("#{dr}/foo200", "w") {|f| f << "foo200" }
open("#{url}/foo200") {|f|
assert_equal("200", f.status[0])
assert_equal("foo200", f.read)
@@ -69,7 +63,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_200big
with_http {|srv, dr, url|
content = "foo200big"*10240
- srv.mount_proc("/foo200big", lambda { |req, res| res.body = content } )
+ open("#{dr}/foo200big", "w") {|f| f << content }
open("#{url}/foo200big") {|f|
assert_equal("200", f.status[0])
assert_equal(content, f.read)
@@ -86,7 +80,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_open_uri
with_http {|srv, dr, url|
- srv.mount_proc("/foo_ou", lambda { |req, res| res.body = "foo_ou" } )
+ open("#{dr}/foo_ou", "w") {|f| f << "foo_ou" }
u = URI("#{url}/foo_ou")
open(u) {|f|
assert_equal("200", f.status[0])
@@ -116,7 +110,7 @@ class TestOpenURI < Test::Unit::TestCase
end
}
begin
- assert_raise(Net::ReadTimeout) { URI("http://127.0.0.1:#{port}/foo/bar").read(:read_timeout=>0.1) }
+ assert_raise(Timeout::Error) { URI("http://127.0.0.1:#{port}/foo/bar").read(:read_timeout=>0.01) }
ensure
Thread.kill(th)
th.join
@@ -130,7 +124,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_mode
with_http {|srv, dr, url|
- srv.mount_proc("/mode", lambda { |req, res| res.body = "mode" } )
+ open("#{dr}/mode", "w") {|f| f << "mode" }
open("#{url}/mode", "r") {|f|
assert_equal("200", f.status[0])
assert_equal("mode", f.read)
@@ -152,13 +146,13 @@ class TestOpenURI < Test::Unit::TestCase
def test_without_block
with_http {|srv, dr, url|
- srv.mount_proc("/without_block", lambda { |req, res| res.body = "without_block" } )
+ open("#{dr}/without_block", "w") {|g| g << "without_block" }
begin
f = open("#{url}/without_block")
assert_equal("200", f.status[0])
assert_equal("without_block", f.read)
ensure
- f.close if f && !f.closed?
+ f.close
end
}
end
@@ -202,8 +196,8 @@ class TestOpenURI < Test::Unit::TestCase
_, proxy_port, _, proxy_host = proxy.listeners[0].addr
proxy_url = "http://#{proxy_host}:#{proxy_port}/"
begin
- proxy.start
- srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+ th = proxy.start
+ open("#{dr}/proxy", "w") {|f| f << "proxy" }
open("#{url}/proxy", :proxy=>proxy_url) {|f|
assert_equal("200", f.status[0])
assert_equal("proxy", f.read)
@@ -255,8 +249,8 @@ class TestOpenURI < Test::Unit::TestCase
_, proxy_port, _, proxy_host = proxy.listeners[0].addr
proxy_url = "http://#{proxy_host}:#{proxy_port}/"
begin
- proxy.start
- srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+ th = proxy.start
+ open("#{dr}/proxy", "w") {|f| f << "proxy" }
exc = assert_raise(OpenURI::HTTPError) { open("#{url}/proxy", :proxy=>proxy_url) {} }
assert_equal("407", exc.io.status[0])
assert_match(/#{Regexp.quote url}/, log); log.clear
@@ -425,7 +419,7 @@ class TestOpenURI < Test::Unit::TestCase
def test_uri_read
with_http {|srv, dr, url|
- srv.mount_proc("/uriread", lambda { |req, res| res.body = "uriread" } )
+ open("#{dr}/uriread", "w") {|f| f << "uriread" }
data = URI("#{url}/uriread").read
assert_equal("200", data.status[0])
assert_equal("uriread", data)
@@ -488,22 +482,58 @@ class TestOpenURI < Test::Unit::TestCase
srv.mount_proc("/data2/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true }
srv.mount_proc("/noce/") {|req, res| res.body = content_gz }
open("#{url}/data/") {|f|
- assert_equal [], f.content_encoding
- assert_equal(content, f.read)
+ assert_equal ['gzip'], f.content_encoding
+ assert_equal(content_gz, f.read.force_encoding("ascii-8bit"))
}
open("#{url}/data2/") {|f|
- assert_equal [], f.content_encoding
- assert_equal(content, f.read)
+ assert_equal ['gzip'], f.content_encoding
+ assert_equal(content_gz, f.read.force_encoding("ascii-8bit"))
}
open("#{url}/noce/") {|f|
assert_equal [], f.content_encoding
assert_equal(content_gz, f.read.force_encoding("ascii-8bit"))
}
}
- end if defined?(Zlib::GzipWriter)
+ end
# 192.0.2.0/24 is TEST-NET. [RFC3330]
+ def test_find_proxy
+ assert_nil(URI("http://192.0.2.1/").find_proxy)
+ assert_nil(URI("ftp://192.0.2.1/").find_proxy)
+ with_env('http_proxy'=>'http://127.0.0.1:8080') {
+ assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy)
+ assert_nil(URI("ftp://192.0.2.1/").find_proxy)
+ }
+ with_env('ftp_proxy'=>'http://127.0.0.1:8080') {
+ assert_nil(URI("http://192.0.2.1/").find_proxy)
+ assert_equal(URI('http://127.0.0.1:8080'), URI("ftp://192.0.2.1/").find_proxy)
+ }
+ with_env('REQUEST_METHOD'=>'GET') {
+ assert_nil(URI("http://192.0.2.1/").find_proxy)
+ }
+ with_env('CGI_HTTP_PROXY'=>'http://127.0.0.1:8080', 'REQUEST_METHOD'=>'GET') {
+ assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy)
+ }
+ with_env('http_proxy'=>'http://127.0.0.1:8080', 'no_proxy'=>'192.0.2.2') {
+ assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy)
+ assert_nil(URI("http://192.0.2.2/").find_proxy)
+ }
+ end
+
+ def test_find_proxy_case_sensitive_env
+ skip "environment variable name is not case sensitive on Windows" if RUBY_PLATFORM =~ /mswin|mingw/
+ with_env('http_proxy'=>'http://127.0.0.1:8080', 'REQUEST_METHOD'=>'GET') {
+ assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy)
+ }
+ with_env('HTTP_PROXY'=>'http://127.0.0.1:8081', 'REQUEST_METHOD'=>'GET') {
+ assert_nil(nil, URI("http://192.0.2.1/").find_proxy)
+ }
+ with_env('http_proxy'=>'http://127.0.0.1:8080', 'HTTP_PROXY'=>'http://127.0.0.1:8081', 'REQUEST_METHOD'=>'GET') {
+ assert_equal(URI('http://127.0.0.1:8080'), URI("http://192.0.2.1/").find_proxy)
+ }
+ end
+
def test_ftp_invalid_request
assert_raise(ArgumentError) { URI("ftp://127.0.0.1/").read }
assert_raise(ArgumentError) { URI("ftp://127.0.0.1/a%0Db").read }
@@ -526,7 +556,7 @@ class TestOpenURI < Test::Unit::TestCase
assert_equal("CWD foo\r\n", s.gets); s.print "250 CWD successful\r\n"
assert_equal("PASV\r\n", s.gets)
TCPServer.open("127.0.0.1", 0) {|data_serv|
- _, data_serv_port, _, _ = data_serv.addr
+ _, data_serv_port, _, data_serv_host = data_serv.addr
hi = data_serv_port >> 8
lo = data_serv_port & 0xff
s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n"
@@ -609,7 +639,7 @@ class TestOpenURI < Test::Unit::TestCase
assert_equal("SIZE bar\r\n", s.gets); s.print "213 #{content.bytesize}\r\n"
assert_equal("PASV\r\n", s.gets)
TCPServer.open("127.0.0.1", 0) {|data_serv|
- _, data_serv_port, _, _ = data_serv.addr
+ _, data_serv_port, _, data_serv_host = data_serv.addr
hi = data_serv_port >> 8
lo = data_serv_port & 0xff
s.print "227 Entering Passive Mode (127,0,0,1,#{hi},#{lo}).\r\n"
diff --git a/test/open-uri/test_ssl.rb b/test/open-uri/test_ssl.rb
index f3e1f48de7..0502f76346 100644
--- a/test/open-uri/test_ssl.rb
+++ b/test/open-uri/test_ssl.rb
@@ -1,18 +1,13 @@
require 'test/unit'
require 'open-uri'
+require 'openssl'
require 'stringio'
require 'webrick'
-begin
- require 'openssl'
- require 'webrick/https'
-rescue LoadError
-end
+require 'webrick/https'
require 'webrick/httpproxy'
class TestOpenURISSL < Test::Unit::TestCase
-end
-class TestOpenURISSL
NullLog = Object.new
def NullLog.<<(arg)
end
@@ -31,13 +26,10 @@ class TestOpenURISSL
:Port => 0})
_, port, _, host = srv.listeners[0].addr
begin
- srv.start
+ th = srv.start
yield srv, dr, "https://#{host}:#{port}"
ensure
srv.shutdown
- until srv.status == :Stop
- sleep 0.1
- end
end
}
end
@@ -56,7 +48,7 @@ class TestOpenURISSL
with_https {|srv, dr, url|
cacert_filename = "#{dr}/cacert.pem"
open(cacert_filename, "w") {|f| f << CA_CERT }
- srv.mount_proc("/data", lambda { |req, res| res.body = "ddd" } )
+ open("#{dr}/data", "w") {|f| f << "ddd" }
open("#{url}/data", :ssl_ca_cert => cacert_filename) {|f|
assert_equal("200", f.status[0])
assert_equal("ddd", f.read)
@@ -85,8 +77,8 @@ class TestOpenURISSL
:Port => 0})
_, p_port, _, p_host = prxy.listeners[0].addr
begin
- prxy.start
- srv.mount_proc("/proxy", lambda { |req, res| res.body = "proxy" } )
+ th = prxy.start
+ open("#{dr}/proxy", "w") {|f| f << "proxy" }
open("#{url}/proxy", :proxy=>"http://#{p_host}:#{p_port}/", :ssl_ca_cert => cacert_filename) {|f|
assert_equal("200", f.status[0])
assert_equal("proxy", f.read)
@@ -101,14 +93,11 @@ class TestOpenURISSL
sio.truncate(0); sio.rewind
ensure
prxy.shutdown
- until prxy.status == :Stop
- sleep 0.1
- end
end
}
end
-end if defined?(OpenSSL)
+end
# mkdir demoCA demoCA/private demoCA/newcerts
# touch demoCA/index.txt
@@ -154,13 +143,13 @@ Certificate:
36:c1:44:4e:ab:9a:b2:73:6d
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Basic Constraints:
+ X509v3 Basic Constraints:
CA:FALSE
- Netscape Comment:
+ Netscape Comment:
OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
24:6F:03:A3:EE:06:51:75:B2:BA:FC:3A:38:59:BF:ED:87:CD:E8:7F
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:24:6F:03:A3:EE:06:51:75:B2:BA:FC:3A:38:59:BF:ED:87:CD:E8:7F
Signature Algorithm: sha1WithRSAEncryption
@@ -216,15 +205,15 @@ Certificate:
f0:86:61:ce:f1:ff:42:c7:23
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Basic Constraints:
+ X509v3 Basic Constraints:
CA:FALSE
- Netscape Cert Type:
+ Netscape Cert Type:
SSL Server
- Netscape Comment:
+ Netscape Comment:
OpenSSL Generated Certificate
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
7F:17:5A:58:88:96:E1:1F:44:EA:FF:AD:C6:2E:90:E2:95:32:DD:F0
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:24:6F:03:A3:EE:06:51:75:B2:BA:FC:3A:38:59:BF:ED:87:CD:E8:7F
Signature Algorithm: sha1WithRSAEncryption
diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb
index 3ea2638b0b..9486e09a13 100644
--- a/test/openssl/test_asn1.rb
+++ b/test/openssl/test_asn1.rb
@@ -1,4 +1,9 @@
-require_relative 'utils'
+begin
+ require "openssl"
+ require_relative 'utils'
+rescue LoadError
+end
+require 'test/unit'
class OpenSSL::TestASN1 < Test::Unit::TestCase
def test_decode
@@ -198,412 +203,9 @@ class OpenSSL::TestASN1 < Test::Unit::TestCase
encode_decode_test(OpenSSL::ASN1::Integer, [72, -127, -128, 128, -1, 0, 1, -(2**12345), 2**12345])
end
- def test_encode_nil
- m = OpenSSL::ASN1
- [
- m::Boolean, m::Integer, m::BitString, m::OctetString,
- m::ObjectId, m::Enumerated, m::UTF8String, m::UTCTime,
- m::GeneralizedTime, m::Sequence, m::Set
- ].each do |klass|
- #Primitives raise TypeError, Constructives NoMethodError
- assert_raise(TypeError, NoMethodError) { klass.send(:new, nil).to_der }
- end
- end
-
def encode_decode_test(type, values)
values.each do |v|
assert_equal(v, OpenSSL::ASN1.decode(type.new(v).to_der).value)
end
end
-
- def test_decode_pem #should fail gracefully (cf. [ruby-dev:44542])
- pem = <<-_EOS_
------BEGIN CERTIFICATE-----
-MIIC8zCCAdugAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MRMwEQYKCZImiZPyLGQB
-GRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVieS1sYW5nMQswCQYDVQQDDAJDQTAe
-Fw0xMTA5MjUxMzQ4MjZaFw0xMTA5MjUxNDQ4MjZaMD0xEzARBgoJkiaJk/IsZAEZ
-FgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5LWxhbmcxCzAJBgNVBAMMAkNBMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuV9ht9J7k4NBs38jOXvvTKY9
-gW8nLICSno5EETR1cuF7i4pNs9I1QJGAFAX0BEO4KbzXmuOvfCpD3CU+Slp1enen
-fzq/t/e/1IRW0wkJUJUFQign4CtrkJL+P07yx18UjyPlBXb81ApEmAB5mrJVSrWm
-qbjs07JbuS4QQGGXLc+Su96DkYKmSNVjBiLxVVSpyZfAY3hD37d60uG+X8xdW5v6
-8JkRFIhdGlb6JL8fllf/A/blNwdJOhVr9mESHhwGjwfSeTDPfd8ZLE027E5lyAVX
-9KZYcU00mOX+fdxOSnGqS/8JDRh0EPHDL15RcJjV2J6vZjPb0rOYGDoMcH+94wID
-AQABMA0GCSqGSIb3DQEBBQUAA4IBAQAiAtrIr1pLX4GYN5klviWKb8HC9ICYuAFI
-NfE3FwqzErEVXotuMe3yPVyB3Bv6rjYY/x5EtS5+WPTbHlvHZTkfcsnTpizcn4mW
-dJ6dDRaFCHt1YKKjUxqBt9lvvrc3nReYZN/P+s1mrDhWzGf8iPZgf8sFUHgnaK7W
-CXRVXmPFgCDRNpDDVQ0MQkr509yYfTH+dujNzqTCwSvkyZFyQ7Oe8Yj0VR6kquG3
-rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm
-/93PnPG1IvPjYNd5VlV+sXSnaxQn974HRCsMv7jA8BD6IgSaX6WK
------END CERTIFICATE-----
- _EOS_
- assert_raise(OpenSSL::ASN1::ASN1Error) { OpenSSL::ASN1.decode(pem) }
- assert_raise(OpenSSL::ASN1::ASN1Error) { OpenSSL::ASN1.decode_all(pem) }
- end
-
- def test_primitive_cannot_set_infinite_length
- begin
- prim = OpenSSL::ASN1::Integer.new(50)
- assert_equal(false, prim.infinite_length)
- prim.infinite_length = true
- flunk('Could set infinite length on primitive value')
- rescue NoMethodError
- #ok
- end
- end
-
- def test_decode_all
- expected = %w{ 02 01 01 02 01 02 02 01 03 }
- raw = [expected.join('')].pack('H*')
- ary = OpenSSL::ASN1.decode_all(raw)
- assert_equal(3, ary.size)
- ary.each_with_index do |asn1, i|
- assert_universal(OpenSSL::ASN1::INTEGER, asn1)
- assert_equal(i + 1, asn1.value)
- end
- end
-
- def test_decode_utctime
- expected = Time.at 1374535380
- assert_equal expected, OpenSSL::ASN1.decode("\x17\v1307222323Z").value
-
- expected += 17
- assert_equal expected, OpenSSL::ASN1.decode("\x17\r130722232317Z").value
- end
-
- def test_create_inf_length_primitive
- expected = %w{ 24 80 04 01 61 00 00 }
- raw = [expected.join('')].pack('H*')
- val = OpenSSL::ASN1::OctetString.new('a')
- cons = OpenSSL::ASN1::Constructive.new([val,
- OpenSSL::ASN1::EndOfContent.new],
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- cons.infinite_length = true
- assert_equal(nil, cons.tagging)
- assert_equal(raw, cons.to_der)
- asn1 = OpenSSL::ASN1.decode(raw)
- assert(asn1.infinite_length)
- assert_equal(raw, asn1.to_der)
- end
-
- def test_cons_without_inf_length_forbidden
- assert_raise(OpenSSL::ASN1::ASN1Error) do
- val = OpenSSL::ASN1::OctetString.new('a')
- cons = OpenSSL::ASN1::Constructive.new([val],
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- cons.to_der
- end
- end
-
- def test_cons_without_array_forbidden
- assert_raise(OpenSSL::ASN1::ASN1Error) do
- val = OpenSSL::ASN1::OctetString.new('a')
- cons = OpenSSL::ASN1::Constructive.new(val,
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- cons.infinite_length = true
- cons.to_der
- end
- end
-
- def test_parse_empty_sequence
- expected = %w{ A0 07 30 02 30 00 02 01 00 }
- raw = [expected.join('')].pack('H*')
- asn1 = OpenSSL::ASN1.decode(raw)
- assert_equal(raw, asn1.to_der)
- assert_equal(2, asn1.value.size)
- seq = asn1.value[0]
- assert_equal(1, seq.value.size)
- inner_seq = seq.value[0]
- assert_equal(0, inner_seq.value.size)
- end
-
- def test_parse_tagged_0_infinite
- expected = %w{ 30 80 02 01 01 80 01 02 00 00 }
- raw = [expected.join('')].pack('H*')
- asn1 = OpenSSL::ASN1.decode(raw)
- assert_equal(3, asn1.value.size)
- int = asn1.value[0]
- assert_universal(OpenSSL::ASN1::INTEGER, int)
- tagged = asn1.value[1]
- assert_equal(0, tagged.tag)
- assert_universal(OpenSSL::ASN1::EOC, asn1.value[2])
- assert_equal(raw, asn1.to_der)
- end
-
- def test_seq_infinite_length
- begin
- content = [ OpenSSL::ASN1::Null.new(nil),
- OpenSSL::ASN1::EndOfContent.new ]
- cons = OpenSSL::ASN1::Sequence.new(content)
- cons.infinite_length = true
- expected = %w{ 30 80 05 00 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_set_infinite_length
- begin
- content = [ OpenSSL::ASN1::Null.new(nil),
- OpenSSL::ASN1::EndOfContent.new() ]
- cons = OpenSSL::ASN1::Set.new(content)
- cons.infinite_length = true
- expected = %w{ 31 80 05 00 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_octet_string_infinite_length
- begin
- octets = [ OpenSSL::ASN1::OctetString.new('aaa'),
- OpenSSL::ASN1::EndOfContent.new() ]
- cons = OpenSSL::ASN1::Constructive.new(
- octets,
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- cons.infinite_length = true
- expected = %w{ 24 80 04 03 61 61 61 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_prim_explicit_tagging
- begin
- oct_str = OpenSSL::ASN1::OctetString.new("a", 0, :EXPLICIT)
- expected = %w{ A0 03 04 01 61 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, oct_str.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_prim_explicit_tagging_tag_class
- begin
- oct_str = OpenSSL::ASN1::OctetString.new("a", 0, :EXPLICIT)
- oct_str2 = OpenSSL::ASN1::OctetString.new(
- "a",
- 0,
- :EXPLICIT,
- :CONTEXT_SPECIFIC)
- assert_equal(oct_str.to_der, oct_str2.to_der)
- end
- end
-
- def test_prim_implicit_tagging
- begin
- int = OpenSSL::ASN1::Integer.new(1, 0, :IMPLICIT)
- expected = %w{ 80 01 01 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, int.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_prim_implicit_tagging_tag_class
- begin
- int = OpenSSL::ASN1::Integer.new(1, 0, :IMPLICIT)
- int2 = OpenSSL::ASN1::Integer.new(1, 0, :IMPLICIT, :CONTEXT_SPECIFIC);
- assert_equal(int.to_der, int2.to_der)
- end
- end
-
- def test_cons_explicit_tagging
- begin
- content = [ OpenSSL::ASN1::PrintableString.new('abc') ]
- seq = OpenSSL::ASN1::Sequence.new(content, 2, :EXPLICIT)
- expected = %w{ A2 07 30 05 13 03 61 62 63 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, seq.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_cons_explicit_tagging_inf_length
- begin
- content = [ OpenSSL::ASN1::PrintableString.new('abc') ,
- OpenSSL::ASN1::EndOfContent.new() ]
- seq = OpenSSL::ASN1::Sequence.new(content, 2, :EXPLICIT)
- seq.infinite_length = true
- expected = %w{ A2 80 30 80 13 03 61 62 63 00 00 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, seq.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_cons_implicit_tagging
- begin
- content = [ OpenSSL::ASN1::Null.new(nil) ]
- seq = OpenSSL::ASN1::Sequence.new(content, 1, :IMPLICIT)
- expected = %w{ A1 02 05 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, seq.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_cons_implicit_tagging_inf_length
- begin
- content = [ OpenSSL::ASN1::Null.new(nil),
- OpenSSL::ASN1::EndOfContent.new() ]
- seq = OpenSSL::ASN1::Sequence.new(content, 1, :IMPLICIT)
- seq.infinite_length = true
- expected = %w{ A1 80 05 00 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, seq.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_octet_string_infinite_length_explicit_tagging
- begin
- octets = [ OpenSSL::ASN1::OctetString.new('aaa'),
- OpenSSL::ASN1::EndOfContent.new() ]
- cons = OpenSSL::ASN1::Constructive.new(
- octets,
- 1,
- :EXPLICIT)
- cons.infinite_length = true
- expected = %w{ A1 80 24 80 04 03 61 61 61 00 00 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_octet_string_infinite_length_implicit_tagging
- begin
- octets = [ OpenSSL::ASN1::OctetString.new('aaa'),
- OpenSSL::ASN1::EndOfContent.new() ]
- cons = OpenSSL::ASN1::Constructive.new(
- octets,
- 0,
- :IMPLICIT)
- cons.infinite_length = true
- expected = %w{ A0 80 04 03 61 61 61 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_recursive_octet_string_infinite_length
- begin
- octets_sub1 = [ OpenSSL::ASN1::OctetString.new("\x01"),
- OpenSSL::ASN1::EndOfContent.new() ]
- octets_sub2 = [ OpenSSL::ASN1::OctetString.new("\x02"),
- OpenSSL::ASN1::EndOfContent.new() ]
- container1 = OpenSSL::ASN1::Constructive.new(
- octets_sub1,
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- container1.infinite_length = true
- container2 = OpenSSL::ASN1::Constructive.new(
- octets_sub2,
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- container2.infinite_length = true
- octets3 = OpenSSL::ASN1::OctetString.new("\x03")
-
- octets = [ container1, container2, octets3,
- OpenSSL::ASN1::EndOfContent.new() ]
- cons = OpenSSL::ASN1::Constructive.new(
- octets,
- OpenSSL::ASN1::OCTET_STRING,
- nil,
- :UNIVERSAL)
- cons.infinite_length = true
- expected = %w{ 24 80 24 80 04 01 01 00 00 24 80 04 01 02 00 00 04 01 03 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_bit_string_infinite_length
- begin
- content = [ OpenSSL::ASN1::BitString.new("\x01"),
- OpenSSL::ASN1::EndOfContent.new() ]
- cons = OpenSSL::ASN1::Constructive.new(
- content,
- OpenSSL::ASN1::BIT_STRING,
- nil,
- :UNIVERSAL)
- cons.infinite_length = true
- expected = %w{ 23 80 03 02 00 01 00 00 }
- raw = [expected.join('')].pack('H*')
- assert_equal(raw, cons.to_der)
- assert_equal(raw, OpenSSL::ASN1.decode(raw).to_der)
- end
- end
-
- def test_primitive_inf_length
- assert_raises(OpenSSL::ASN1::ASN1Error) do
- spec = %w{ 02 80 02 01 01 00 00 }
- raw = [spec.join('')].pack('H*')
- OpenSSL::ASN1.decode(raw)
- OpenSSL::ASN1.decode_all(raw)
- end
- end
-
- def test_recursive_octet_string_parse
- test = %w{ 24 80 24 80 04 01 01 00 00 24 80 04 01 02 00 00 04 01 03 00 00 }
- raw = [test.join('')].pack('H*')
- asn1 = OpenSSL::ASN1.decode(raw)
- assert_equal(OpenSSL::ASN1::Constructive, asn1.class)
- assert_universal(OpenSSL::ASN1::OCTET_STRING, asn1)
- assert_equal(true, asn1.infinite_length)
- assert_equal(4, asn1.value.size)
- nested1 = asn1.value[0]
- assert_equal(OpenSSL::ASN1::Constructive, nested1.class)
- assert_universal(OpenSSL::ASN1::OCTET_STRING, nested1)
- assert_equal(true, nested1.infinite_length)
- assert_equal(2, nested1.value.size)
- oct1 = nested1.value[0]
- assert_universal(OpenSSL::ASN1::OCTET_STRING, oct1)
- assert_equal(false, oct1.infinite_length)
- assert_universal(OpenSSL::ASN1::EOC, nested1.value[1])
- assert_equal(false, nested1.value[1].infinite_length)
- nested2 = asn1.value[1]
- assert_equal(OpenSSL::ASN1::Constructive, nested2.class)
- assert_universal(OpenSSL::ASN1::OCTET_STRING, nested2)
- assert_equal(true, nested2.infinite_length)
- assert_equal(2, nested2.value.size)
- oct2 = nested2.value[0]
- assert_universal(OpenSSL::ASN1::OCTET_STRING, oct2)
- assert_equal(false, oct2.infinite_length)
- assert_universal(OpenSSL::ASN1::EOC, nested2.value[1])
- assert_equal(false, nested2.value[1].infinite_length)
- oct3 = asn1.value[2]
- assert_universal(OpenSSL::ASN1::OCTET_STRING, oct3)
- assert_equal(false, oct3.infinite_length)
- assert_universal(OpenSSL::ASN1::EOC, asn1.value[3])
- assert_equal(false, asn1.value[3].infinite_length)
- end
-
- private
-
- def assert_universal(tag, asn1)
- assert_equal(tag, asn1.tag)
- if asn1.respond_to?(:tagging)
- assert_nil(asn1.tagging)
- end
- assert_equal(:UNIVERSAL, asn1.tag_class)
- end
-
end if defined?(OpenSSL)
-
diff --git a/test/openssl/test_bn.rb b/test/openssl/test_bn.rb
index af1c72c8e9..d913d0c953 100644
--- a/test/openssl/test_bn.rb
+++ b/test/openssl/test_bn.rb
@@ -1,26 +1,21 @@
-require_relative 'utils'
+begin
+ require "openssl"
+rescue LoadError
+end
+require "digest/md5"
+require "test/unit"
if defined?(OpenSSL)
class OpenSSL::TestBN < Test::Unit::TestCase
- def test_bn_to_bn
- assert_equal(999.to_bn, OpenSSL::BN.new(999.to_bn))
- end
-
def test_integer_to_bn
assert_equal(999.to_bn, OpenSSL::BN.new(999.to_s(16), 16))
assert_equal((2 ** 107 - 1).to_bn, OpenSSL::BN.new((2 ** 107 - 1).to_s(16), 16))
end
def test_prime_p
- assert_equal(true, OpenSSL::BN.new((2 ** 107 - 1).to_s(16), 16).prime?)
- assert_equal(true, OpenSSL::BN.new((2 ** 127 - 1).to_s(16), 16).prime?(1))
- end
-
- def test_cmp_nil
- bn = OpenSSL::BN.new('1')
- assert_equal(false, bn == nil)
- assert_equal(true, bn != nil)
+ OpenSSL::BN.new((2 ** 107 - 1).to_s(16), 16).prime?
+ OpenSSL::BN.new((2 ** 127 - 1).to_s(16), 16).prime?(1)
end
end
diff --git a/test/openssl/test_buffering.rb b/test/openssl/test_buffering.rb
index c4894e1291..49335de8d2 100644
--- a/test/openssl/test_buffering.rb
+++ b/test/openssl/test_buffering.rb
@@ -1,7 +1,8 @@
require_relative 'utils'
require 'stringio'
+require 'minitest/unit'
-class OpenSSL::TestBuffering < Test::Unit::TestCase
+class OpenSSL::TestBuffering < MiniTest::Unit::TestCase
class IO
include OpenSSL::Buffering
@@ -9,10 +10,7 @@ class OpenSSL::TestBuffering < Test::Unit::TestCase
attr_accessor :sync
def initialize
- @io = ""
- def @io.sync
- true
- end
+ @io = StringIO.new
super
@@ -20,18 +18,15 @@ class OpenSSL::TestBuffering < Test::Unit::TestCase
end
def string
- @io
+ @io.string
end
- def sysread(size)
- str = @io.slice!(0, size)
- raise EOFError if str.empty?
- str
+ def sysread *a
+ @io.sysread *a
end
- def syswrite(str)
- @io << str
- str.size
+ def syswrite *a
+ @io.syswrite *a
end
end
@@ -68,20 +63,4 @@ class OpenSSL::TestBuffering < Test::Unit::TestCase
refute @io.sync, 'sync must not change'
end
- def test_getc
- @io.syswrite('abc')
- assert_equal(?a, @io.getc)
- assert_equal(?b, @io.getc)
- assert_equal(?c, @io.getc)
- end
-
- def test_each_byte
- @io.syswrite('abc')
- res = []
- @io.each_byte do |c|
- res << c
- end
- assert_equal([97, 98, 99], res)
- end
-
end if defined?(OpenSSL)
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index 35a6374565..cc21e818ed 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -1,27 +1,12 @@
-require_relative 'utils'
+begin
+ require "openssl"
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
class OpenSSL::TestCipher < Test::Unit::TestCase
-
- class << self
-
- def has_cipher?(name)
- ciphers = OpenSSL::Cipher.ciphers
- # redefine method so we can use the cached ciphers value from the closure
- # and need not recompute the list each time
- define_singleton_method :has_cipher? do |name|
- ciphers.include?(name)
- end
- has_cipher?(name)
- end
-
- def has_ciphers?(list)
- list.all? { |name| has_cipher?(name) }
- end
-
- end
-
def setup
@c1 = OpenSSL::Cipher::Cipher.new("DES-EDE3-CBC")
@c2 = OpenSSL::Cipher::DES.new(:EDE3, "CBC")
@@ -83,33 +68,10 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
assert_raise(ArgumentError){ @c1.update("") }
end
- def test_initialize
- assert_raise(RuntimeError) {@c1.__send__(:initialize, "DES-EDE3-CBC")}
- assert_raise(RuntimeError) {OpenSSL::Cipher.allocate.final}
- end
-
- def test_ctr_if_exists
- begin
- cipher = OpenSSL::Cipher.new('aes-128-ctr')
- cipher.encrypt
- cipher.pkcs5_keyivgen('password')
- c = cipher.update('hello,world') + cipher.final
- cipher.decrypt
- cipher.pkcs5_keyivgen('password')
- assert_equal('hello,world', cipher.update(c) + cipher.final)
- end
- end if has_cipher?('aes-128-ctr')
-
if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00907000
def test_ciphers
OpenSSL::Cipher.ciphers.each{|name|
- next if /netbsd/ =~ RUBY_PLATFORM && /idea|rc5/i =~ name
- begin
- assert_kind_of(OpenSSL::Cipher::Cipher, OpenSSL::Cipher::Cipher.new(name))
- rescue OpenSSL::Cipher::CipherError => e
- next if /wrap/ =~ name and e.message == 'wrap mode not allowed'
- raise
- end
+ assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))
}
end
@@ -127,134 +89,7 @@ class OpenSSL::TestCipher < Test::Unit::TestCase
assert_equal(pt, c2.update(ct) + c2.final)
}
end
-
- def test_AES_crush
- 500.times do
- assert_nothing_raised("[Bug #2768]") do
- # it caused OpenSSL SEGV by uninitialized key
- OpenSSL::Cipher::AES128.new("ECB").update "." * 17
- end
- end
- end
- end
-
- if has_ciphers?(['aes-128-gcm', 'aes-192-gcm', 'aes-128-gcm'])
-
- def test_authenticated
- cipher = OpenSSL::Cipher.new('aes-128-gcm')
- assert(cipher.authenticated?)
- cipher = OpenSSL::Cipher.new('aes-128-cbc')
- refute(cipher.authenticated?)
- end
-
- def test_aes_gcm
- ['aes-128-gcm', 'aes-192-gcm', 'aes-128-gcm'].each do |algo|
- pt = "You should all use Authenticated Encryption!"
- cipher, key, iv = new_encryptor(algo)
-
- cipher.auth_data = "aad"
- ct = cipher.update(pt) + cipher.final
- tag = cipher.auth_tag
- assert_equal(16, tag.size)
-
- decipher = new_decryptor(algo, key, iv)
- decipher.auth_tag = tag
- decipher.auth_data = "aad"
-
- assert_equal(pt, decipher.update(ct) + decipher.final)
- end
- end
-
- def test_aes_gcm_short_tag
- ['aes-128-gcm', 'aes-192-gcm', 'aes-128-gcm'].each do |algo|
- pt = "You should all use Authenticated Encryption!"
- cipher, key, iv = new_encryptor(algo)
-
- cipher.auth_data = "aad"
- ct = cipher.update(pt) + cipher.final
- tag = cipher.auth_tag(8)
- assert_equal(8, tag.size)
-
- decipher = new_decryptor(algo, key, iv)
- decipher.auth_tag = tag
- decipher.auth_data = "aad"
-
- assert_equal(pt, decipher.update(ct) + decipher.final)
- end
- end
-
- def test_aes_gcm_wrong_tag
- pt = "You should all use Authenticated Encryption!"
- cipher, key, iv = new_encryptor('aes-128-gcm')
-
- cipher.auth_data = "aad"
- ct = cipher.update(pt) + cipher.final
- tag = cipher.auth_tag
-
- decipher = new_decryptor('aes-128-gcm', key, iv)
- tag.setbyte(-1, (tag.getbyte(-1) + 1) & 0xff)
- decipher.auth_tag = tag
- decipher.auth_data = "aad"
-
- assert_raise OpenSSL::Cipher::CipherError do
- decipher.update(ct) + decipher.final
- end
- end
-
- def test_aes_gcm_wrong_auth_data
- pt = "You should all use Authenticated Encryption!"
- cipher, key, iv = new_encryptor('aes-128-gcm')
-
- cipher.auth_data = "aad"
- ct = cipher.update(pt) + cipher.final
- tag = cipher.auth_tag
-
- decipher = new_decryptor('aes-128-gcm', key, iv)
- decipher.auth_tag = tag
- decipher.auth_data = "daa"
-
- assert_raise OpenSSL::Cipher::CipherError do
- decipher.update(ct) + decipher.final
- end
- end
-
- def test_aes_gcm_wrong_ciphertext
- pt = "You should all use Authenticated Encryption!"
- cipher, key, iv = new_encryptor('aes-128-gcm')
-
- cipher.auth_data = "aad"
- ct = cipher.update(pt) + cipher.final
- tag = cipher.auth_tag
-
- decipher = new_decryptor('aes-128-gcm', key, iv)
- decipher.auth_tag = tag
- decipher.auth_data = "aad"
-
- assert_raise OpenSSL::Cipher::CipherError do
- decipher.update(ct[0..-2] << ct[-1].succ) + decipher.final
- end
- end
-
end
-
- private
-
- def new_encryptor(algo)
- cipher = OpenSSL::Cipher.new(algo)
- cipher.encrypt
- key = cipher.random_key
- iv = cipher.random_iv
- [cipher, key, iv]
- end
-
- def new_decryptor(algo, key, iv)
- OpenSSL::Cipher.new(algo).tap do |cipher|
- cipher.decrypt
- cipher.key = key
- cipher.iv = iv
- end
- end
-
end
end
diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
index 88bb5af7be..6be40d2be2 100644
--- a/test/openssl/test_config.rb
+++ b/test/openssl/test_config.rb
@@ -1,299 +1,16 @@
-require_relative 'utils'
+require 'openssl'
+require "test/unit"
class OpenSSL::TestConfig < Test::Unit::TestCase
- def setup
- file = Tempfile.open("openssl.cnf")
- file << <<__EOD__
-HOME = .
-[ ca ]
-default_ca = CA_default
-[ CA_default ]
-dir = ./demoCA
-certs = ./certs
-__EOD__
- file.close
- @tmpfile = file
- @it = OpenSSL::Config.new(file.path)
- end
-
- def teardown
- @tmpfile.unlink
- end
-
- def test_constants
- assert(defined?(OpenSSL::Config::DEFAULT_CONFIG_FILE))
- config_file = OpenSSL::Config::DEFAULT_CONFIG_FILE
- skip "DEFAULT_CONFIG_FILE may return a wrong path on your platforms. [Bug #6830]" unless File.readable?(config_file)
- assert_nothing_raised do
- OpenSSL::Config.load(config_file)
- end
- end
-
- def test_s_parse
- c = OpenSSL::Config.parse('')
- assert_equal("[ default ]\n\n", c.to_s)
- c = OpenSSL::Config.parse(@it.to_s)
- assert_equal(['CA_default', 'ca', 'default'], c.sections.sort)
- end
-
- def test_s_parse_format
- c = OpenSSL::Config.parse(<<__EOC__)
- baz =qx\t # "baz = qx"
-
-foo::bar = baz # shortcut section::key format
- default::bar = baz # ditto
-a=\t \t # "a = ": trailing spaces are ignored
- =b # " = b": empty key
- =c # " = c": empty key (override the above line)
- d= # "c = ": trailing comment is ignored
-
-sq = 'foo''b\\'ar'
- dq ="foo""''\\""
- dq2 = foo""bar
-esc=a\\r\\n\\b\\tb
-foo\\bar = foo\\b\\\\ar
-foo\\bar::foo\\bar = baz
-[default1 default2]\t\t # space is allowed in section name
- fo =b ar # space allowed in value
-[emptysection]
- [doller ]
-foo=bar
-bar = $(foo)
-baz = 123$(default::bar)456${foo}798
-qux = ${baz}
-quxx = $qux.$qux
-__EOC__
- assert_equal(['default', 'default1 default2', 'doller', 'emptysection', 'foo', 'foo\\bar'], c.sections.sort)
- assert_equal(['', 'a', 'bar', 'baz', 'd', 'dq', 'dq2', 'esc', 'foo\\bar', 'sq'], c['default'].keys.sort)
- assert_equal('c', c['default'][''])
- assert_equal('', c['default']['a'])
- assert_equal('qx', c['default']['baz'])
- assert_equal('', c['default']['d'])
- assert_equal('baz', c['default']['bar'])
- assert_equal("foob'ar", c['default']['sq'])
- assert_equal("foo''\"", c['default']['dq'])
- assert_equal("foobar", c['default']['dq2'])
- assert_equal("a\r\n\b\tb", c['default']['esc'])
- assert_equal("foo\b\\ar", c['default']['foo\\bar'])
- assert_equal('baz', c['foo']['bar'])
- assert_equal('baz', c['foo\\bar']['foo\\bar'])
- assert_equal('b ar', c['default1 default2']['fo'])
-
- # dolloer
- assert_equal('bar', c['doller']['foo'])
- assert_equal('bar', c['doller']['bar'])
- assert_equal('123baz456bar798', c['doller']['baz'])
- assert_equal('123baz456bar798', c['doller']['qux'])
- assert_equal('123baz456bar798.123baz456bar798', c['doller']['quxx'])
-
- excn = assert_raise(OpenSSL::ConfigError) do
- OpenSSL::Config.parse("foo = $bar")
- end
- assert_equal("error in line 1: variable has no value", excn.message)
-
- excn = assert_raise(OpenSSL::ConfigError) do
- OpenSSL::Config.parse("foo = $(bar")
- end
- assert_equal("error in line 1: no close brace", excn.message)
-
- excn = assert_raise(OpenSSL::ConfigError) do
- OpenSSL::Config.parse("f o =b ar # no space in key")
- end
- assert_equal("error in line 1: missing equal sign", excn.message)
-
- excn = assert_raise(OpenSSL::ConfigError) do
- OpenSSL::Config.parse(<<__EOC__)
-# comment 1 # comments
-
-#
- # comment 2
-\t#comment 3
- [second ]\t
-[third # section not terminated
-__EOC__
- end
- assert_equal("error in line 7: missing close square bracket", excn.message)
- end
-
- def test_s_load
- # alias of new
- c = OpenSSL::Config.load
- assert_equal("", c.to_s)
- assert_equal([], c.sections)
- #
- file = Tempfile.open("openssl.cnf")
- file.close
- c = OpenSSL::Config.load(file.path)
- assert_equal("[ default ]\n\n", c.to_s)
- assert_equal(['default'], c.sections)
- ensure
- file.unlink if file
- end
-
- def test_initialize
- c = OpenSSL::Config.new
- assert_equal("", c.to_s)
- assert_equal([], c.sections)
- end
-
- def test_initialize_with_empty_file
- file = Tempfile.open("openssl.cnf")
- file.close
- c = OpenSSL::Config.new(file.path)
- assert_equal("[ default ]\n\n", c.to_s)
- assert_equal(['default'], c.sections)
- ensure
- file.unlink if file
- end
-
- def test_initialize_with_example_file
- assert_equal(['CA_default', 'ca', 'default'], @it.sections.sort)
- end
-
- def test_get_value
- assert_equal('CA_default', @it.get_value('ca', 'default_ca'))
- assert_equal(nil, @it.get_value('ca', 'no such key'))
- assert_equal(nil, @it.get_value('no such section', 'no such key'))
- assert_equal('.', @it.get_value('', 'HOME'))
- assert_raise(TypeError) do
- @it.get_value(nil, 'HOME') # not allowed unlike Config#value
- end
- # fallback to 'default' ugly...
- assert_equal('.', @it.get_value('unknown', 'HOME'))
- end
-
- def test_get_value_ENV
- key = ENV.keys.first
- assert_not_nil(key) # make sure we have at least one ENV var.
- assert_equal(ENV[key], @it.get_value('ENV', key))
- end
-
- def test_value
- # supress deprecation warnings
- OpenSSL::TestUtils.silent do
- assert_equal('CA_default', @it.value('ca', 'default_ca'))
- assert_equal(nil, @it.value('ca', 'no such key'))
- assert_equal(nil, @it.value('no such section', 'no such key'))
- assert_equal('.', @it.value('', 'HOME'))
- assert_equal('.', @it.value(nil, 'HOME'))
- assert_equal('.', @it.value('HOME'))
- # fallback to 'default' ugly...
- assert_equal('.', @it.value('unknown', 'HOME'))
- end
- end
-
- def test_value_ENV
- OpenSSL::TestUtils.silent do
- key = ENV.keys.first
- assert_not_nil(key) # make sure we have at least one ENV var.
- assert_equal(ENV[key], @it.value('ENV', key))
- end
- end
-
- def test_aref
- assert_equal({'HOME' => '.'}, @it['default'])
- assert_equal({'dir' => './demoCA', 'certs' => './certs'}, @it['CA_default'])
- assert_equal({}, @it['no_such_section'])
- assert_equal({}, @it[''])
- end
-
- def test_section
- OpenSSL::TestUtils.silent do
- assert_equal({'HOME' => '.'}, @it.section('default'))
- assert_equal({'dir' => './demoCA', 'certs' => './certs'}, @it.section('CA_default'))
- assert_equal({}, @it.section('no_such_section'))
- assert_equal({}, @it.section(''))
- end
- end
-
- def test_sections
- assert_equal(['CA_default', 'ca', 'default'], @it.sections.sort)
- @it['new_section'] = {'foo' => 'bar'}
- assert_equal(['CA_default', 'ca', 'default', 'new_section'], @it.sections.sort)
- @it['new_section'] = {}
- assert_equal(['CA_default', 'ca', 'default', 'new_section'], @it.sections.sort)
- end
-
- def test_add_value
- c = OpenSSL::Config.new
- assert_equal("", c.to_s)
- # add key
- c.add_value('default', 'foo', 'bar')
- assert_equal("[ default ]\nfoo=bar\n\n", c.to_s)
- # add another key
- c.add_value('default', 'baz', 'qux')
- assert_equal('bar', c['default']['foo'])
- assert_equal('qux', c['default']['baz'])
- # update the value
- c.add_value('default', 'baz', 'quxxx')
- assert_equal('bar', c['default']['foo'])
- assert_equal('quxxx', c['default']['baz'])
- # add section and key
- c.add_value('section', 'foo', 'bar')
- assert_equal('bar', c['default']['foo'])
- assert_equal('quxxx', c['default']['baz'])
- assert_equal('bar', c['section']['foo'])
- end
-
- def test_aset
- @it['foo'] = {'bar' => 'baz'}
- assert_equal({'bar' => 'baz'}, @it['foo'])
- @it['foo'] = {'bar' => 'qux', 'baz' => 'quxx'}
- assert_equal({'bar' => 'qux', 'baz' => 'quxx'}, @it['foo'])
-
- # OpenSSL::Config is add only for now.
- @it['foo'] = {'foo' => 'foo'}
- assert_equal({'foo' => 'foo', 'bar' => 'qux', 'baz' => 'quxx'}, @it['foo'])
- # you cannot override or remove any section and key.
- @it['foo'] = {}
- assert_equal({'foo' => 'foo', 'bar' => 'qux', 'baz' => 'quxx'}, @it['foo'])
- end
-
- def test_each
- # each returns [section, key, value] array.
- ary = @it.map { |e| e }.sort { |a, b| a[0] <=> b[0] }
- assert_equal(4, ary.size)
- assert_equal('CA_default', ary[0][0])
- assert_equal('CA_default', ary[1][0])
- assert_equal(["ca", "default_ca", "CA_default"], ary[2])
- assert_equal(["default", "HOME", "."], ary[3])
- end
-
- def test_to_s
- c = OpenSSL::Config.parse("[empty]\n")
- assert_equal("[ default ]\n\n[ empty ]\n\n", c.to_s)
- end
-
- def test_inspect
- assert_match(/#<OpenSSL::Config sections=\[.*\]>/, @it.inspect)
- end
-
def test_freeze
+ skip "need an argument for OpenSSL::Config.new on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
c = OpenSSL::Config.new
c['foo'] = [['key', 'value']]
c.freeze
- bug = '[ruby-core:18377]'
- # RuntimeError for 1.9, TypeError for 1.8
- e = assert_raise(TypeError, bug) do
+ # [ruby-core:18377]
+ assert_raise(RuntimeError, /frozen/) do
c['foo'] = [['key', 'wrong']]
end
- assert_match(/can't modify/, e.message, bug)
- end
-
- def test_dup
- assert(!@it.sections.empty?)
- c = @it.dup
- assert_equal(@it.sections.sort, c.sections.sort)
- @it['newsection'] = {'a' => 'b'}
- assert_not_equal(@it.sections.sort, c.sections.sort)
- end
-
- def test_clone
- assert(!@it.sections.empty?)
- c = @it.clone
- assert_equal(@it.sections.sort, c.sections.sort)
- @it['newsection'] = {'a' => 'b'}
- assert_not_equal(@it.sections.sort, c.sections.sort)
end
-end if defined?(OpenSSL)
+end
diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb
index 86c30d973c..8941588b97 100644
--- a/test/openssl/test_digest.rb
+++ b/test/openssl/test_digest.rb
@@ -1,4 +1,9 @@
-require_relative 'utils'
+begin
+ require "openssl"
+rescue LoadError
+end
+require "digest/md5"
+require "test/unit"
if defined?(OpenSSL)
@@ -56,23 +61,6 @@ class OpenSSL::TestDigest < Test::Unit::TestCase
assert_equal(dig1, dig2, "reset")
end
- def test_digest_constants
- algs = %w(DSS1 MD4 MD5 RIPEMD160 SHA SHA1)
- if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
- algs += %w(SHA224 SHA256 SHA384 SHA512)
- end
- algs.each do |alg|
- assert_not_nil(OpenSSL::Digest.new(alg))
- klass = OpenSSL::Digest.const_get(alg)
- assert_not_nil(klass.new)
- end
- end
-
- def test_digest_by_oid_and_name
- check_digest(OpenSSL::ASN1::ObjectId.new("MD5"))
- check_digest(OpenSSL::ASN1::ObjectId.new("SHA1"))
- end
-
if OpenSSL::OPENSSL_VERSION_NUMBER > 0x00908000
def encode16(str)
str.unpack("H*").first
@@ -94,32 +82,6 @@ class OpenSSL::TestDigest < Test::Unit::TestCase
assert_equal(sha384_a, encode16(OpenSSL::Digest::SHA384.digest("a")))
assert_equal(sha512_a, encode16(OpenSSL::Digest::SHA512.digest("a")))
end
-
- def test_digest_by_oid_and_name_sha2
- check_digest(OpenSSL::ASN1::ObjectId.new("SHA224"))
- check_digest(OpenSSL::ASN1::ObjectId.new("SHA256"))
- check_digest(OpenSSL::ASN1::ObjectId.new("SHA384"))
- check_digest(OpenSSL::ASN1::ObjectId.new("SHA512"))
- end
- end
-
- def test_openssl_digest
- assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
-
- assert_raises NameError do
- OpenSSL::Digest("no such digest")
- end
- end
-
- private
-
- def check_digest(oid)
- d = OpenSSL::Digest.new(oid.sn)
- assert_not_nil(d)
- d = OpenSSL::Digest.new(oid.ln)
- assert_not_nil(d)
- d = OpenSSL::Digest.new(oid.oid)
- assert_not_nil(d)
end
end
diff --git a/test/openssl/test_ec.rb b/test/openssl/test_ec.rb
new file mode 100644
index 0000000000..39f5577dc2
--- /dev/null
+++ b/test/openssl/test_ec.rb
@@ -0,0 +1,128 @@
+begin
+ require "openssl"
+ require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL::PKey::EC)
+
+class OpenSSL::TestEC < Test::Unit::TestCase
+ def setup
+ @data1 = 'foo'
+ @data2 = 'bar' * 1000 # data too long for DSA sig
+
+ @group1 = OpenSSL::PKey::EC::Group.new('secp112r1')
+ @group2 = OpenSSL::PKey::EC::Group.new('sect163k1')
+
+ @key1 = OpenSSL::PKey::EC.new
+ @key1.group = @group1
+ @key1.generate_key
+
+ @key2 = OpenSSL::PKey::EC.new(@group2.curve_name)
+ @key2.generate_key
+
+ @groups = [@group1, @group2]
+ @keys = [@key1, @key2]
+ end
+
+ def compare_keys(k1, k2)
+ assert_equal(k1.to_pem, k2.to_pem)
+ end
+
+ def test_curve_names
+ @groups.each_with_index do |group, idx|
+ key = @keys[idx]
+ assert_equal(group.curve_name, key.group.curve_name)
+ end
+ end
+
+ def test_check_key
+ for key in @keys
+ assert_equal(key.check_key, true)
+ assert_equal(key.private_key?, true)
+ assert_equal(key.public_key?, true)
+ end
+ end
+
+ def test_encoding
+ for group in @groups
+ for meth in [:to_der, :to_pem]
+ txt = group.send(meth)
+ gr = OpenSSL::PKey::EC::Group.new(txt)
+ assert_equal(txt, gr.send(meth))
+
+ assert_equal(group.generator.to_bn, gr.generator.to_bn)
+ assert_equal(group.cofactor, gr.cofactor)
+ assert_equal(group.order, gr.order)
+ assert_equal(group.seed, gr.seed)
+ assert_equal(group.degree, gr.degree)
+ end
+ end
+
+ for key in @keys
+ group = key.group
+
+ for meth in [:to_der, :to_pem]
+ txt = key.send(meth)
+ assert_equal(txt, OpenSSL::PKey::EC.new(txt).send(meth))
+ end
+
+ bn = key.public_key.to_bn
+ assert_equal(bn, OpenSSL::PKey::EC::Point.new(group, bn).to_bn)
+ end
+ end
+
+ def test_set_keys
+ for key in @keys
+ k = OpenSSL::PKey::EC.new
+ k.group = key.group
+ k.private_key = key.private_key
+ k.public_key = key.public_key
+
+ compare_keys(key, k)
+ end
+ end
+
+ def test_dsa_sign_verify
+ for key in @keys
+ sig = key.dsa_sign_asn1(@data1)
+ assert(key.dsa_verify_asn1(@data1, sig))
+ end
+ end
+
+ def test_dsa_sign_asn1_FIPS186_3
+ for key in @keys
+ size = key.group.order.num_bits / 8 + 1
+ dgst = (1..size).to_a.pack('C*')
+ begin
+ sig = key.dsa_sign_asn1(dgst)
+ # dgst is auto-truncated according to FIPS186-3 after openssl-0.9.8m
+ assert(key.dsa_verify_asn1(dgst + "garbage", sig))
+ rescue OpenSSL::PKey::ECError => e
+ # just an exception for longer dgst before openssl-0.9.8m
+ assert_equal('ECDSA_sign: data too large for key size', e.message)
+ # no need to do following tests
+ return
+ end
+ end
+ end
+
+ def test_dh_compute_key
+ for key in @keys
+ k = OpenSSL::PKey::EC.new(key.group)
+ k.generate_key
+
+ puba = key.public_key
+ pubb = k.public_key
+ a = key.dh_compute_key(pubb)
+ b = k.dh_compute_key(puba)
+ assert_equal(a, b)
+ end
+ end
+
+# test Group: asn1_flag, point_conversion
+
+end
+
+end
diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb
deleted file mode 100644
index 46a2948cbf..0000000000
--- a/test/openssl/test_engine.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require_relative 'utils'
-
-class OpenSSL::TestEngine < Test::Unit::TestCase
-
- def teardown
- OpenSSL::Engine.cleanup # [ruby-core:40669]
- assert_equal(0, OpenSSL::Engine.engines.size)
- end
-
- def test_engines_free # [ruby-dev:44173]
- OpenSSL::Engine.load("openssl")
- OpenSSL::Engine.engines
- OpenSSL::Engine.engines
- end
-
- def test_openssl_engine_builtin
- engine = OpenSSL::Engine.load("openssl")
- assert_equal(true, engine)
- assert_equal(1, OpenSSL::Engine.engines.size)
- end
-
- def test_openssl_engine_by_id_string
- engine = get_engine
- assert_not_nil(engine)
- assert_equal(1, OpenSSL::Engine.engines.size)
- end
-
- def test_openssl_engine_id_name_inspect
- engine = get_engine
- assert_equal("openssl", engine.id)
- assert_not_nil(engine.name)
- assert_not_nil(engine.inspect)
- end
-
- def test_openssl_engine_digest_sha1
- engine = get_engine
- digest = engine.digest("SHA1")
- assert_not_nil(digest)
- data = "test"
- assert_equal(OpenSSL::Digest::SHA1.digest(data), digest.digest(data))
- end
-
- def test_openssl_engine_cipher_rc4
- engine = get_engine
- algo = "RC4" #AES is not supported by openssl Engine (<=1.0.0e)
- data = "a" * 1000
- key = OpenSSL::Random.random_bytes(16)
- # suppress message from openssl Engine's RC4 cipher [ruby-core:41026]
- err_back = $stderr.dup
- $stderr.reopen(IO::NULL)
- encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
- decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
- assert_equal(data, decrypted)
- ensure
- if err_back
- $stderr.reopen(err_back)
- err_back.close
- end
- end
-
- private
-
- def get_engine
- OpenSSL::Engine.by_id("openssl")
- end
-
- def crypt_data(data, key, mode)
- cipher = yield
- cipher.send mode
- cipher.key = key
- cipher.update(data) + cipher.final
- end
-
-end if defined?(OpenSSL)
-
diff --git a/test/openssl/test_fips.rb b/test/openssl/test_fips.rb
deleted file mode 100644
index 882647f7e1..0000000000
--- a/test/openssl/test_fips.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require_relative 'utils'
-
-if defined?(OpenSSL)
-
-class OpenSSL::TestFIPS < Test::Unit::TestCase
-
- def test_fips_mode_is_reentrant
- OpenSSL.fips_mode = false
- OpenSSL.fips_mode = false
- end
-
-end
-
-end
diff --git a/test/openssl/test_hmac.rb b/test/openssl/test_hmac.rb
index ba158d2b51..23a3ce4264 100644
--- a/test/openssl/test_hmac.rb
+++ b/test/openssl/test_hmac.rb
@@ -1,4 +1,8 @@
-require_relative 'utils'
+begin
+ require "openssl"
+rescue LoadError
+end
+require "test/unit"
class OpenSSL::TestHMAC < Test::Unit::TestCase
def setup
diff --git a/test/openssl/test_ns_spki.rb b/test/openssl/test_ns_spki.rb
index 7cddefad6d..14895edb7d 100644
--- a/test/openssl/test_ns_spki.rb
+++ b/test/openssl/test_ns_spki.rb
@@ -1,7 +1,13 @@
-require_relative 'utils'
+begin
+ require "openssl"
+ require_relative 'utils'
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
+
class OpenSSL::TestNSSPI < Test::Unit::TestCase
def setup
# This request data is adopt from the specification of
@@ -14,6 +20,9 @@ class OpenSSL::TestNSSPI < Test::Unit::TestCase
@b64 << "i0//rgBvmco="
end
+ def teardown
+ end
+
def test_build_data
key1 = OpenSSL::TestUtils::TEST_KEY_RSA1024
key2 = OpenSSL::TestUtils::TEST_KEY_RSA2048
@@ -30,7 +39,6 @@ class OpenSSL::TestNSSPI < Test::Unit::TestCase
assert_equal("RandomString", spki.challenge)
assert_equal(key1.public_key.to_der, spki.public_key.to_der)
assert(spki.verify(spki.public_key))
- assert_not_nil(spki.to_text)
end
def test_decode_data
diff --git a/test/openssl/test_ocsp.rb b/test/openssl/test_ocsp.rb
deleted file mode 100644
index b42b57d498..0000000000
--- a/test/openssl/test_ocsp.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require_relative "utils"
-
-if defined?(OpenSSL)
-
-class OpenSSL::TestOCSP < Test::Unit::TestCase
- def setup
- ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
- ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
- ca_serial = 0xabcabcabcabc
-
- subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
- @key = OpenSSL::TestUtils::TEST_KEY_RSA1024
- serial = 0xabcabcabcabd
-
- now = Time.at(Time.now.to_i) # suppress usec
- dgst = OpenSSL::Digest::SHA1.new
-
- @ca_cert = OpenSSL::TestUtils.issue_cert(
- ca_subj, ca_key, ca_serial, now, now+3600, [], nil, nil, dgst)
- @cert = OpenSSL::TestUtils.issue_cert(
- subj, @key, serial, now, now+3600, [], @ca_cert, nil, dgst)
- end
-
- def test_new_certificate_id
- cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert)
- assert_kind_of OpenSSL::OCSP::CertificateId, cid
- assert_equal @cert.serial, cid.serial
- end
-
- def test_new_certificate_id_with_digest
- cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA256.new)
- assert_kind_of OpenSSL::OCSP::CertificateId, cid
- assert_equal @cert.serial, cid.serial
- end if defined?(OpenSSL::Digest::SHA256)
-
- def test_new_ocsp_request
- request = OpenSSL::OCSP::Request.new
- cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA1.new)
- request.add_certid(cid)
- request.sign(@cert, @key, [@cert])
- assert_kind_of OpenSSL::OCSP::Request, request
- # in current implementation not same instance of certificate id, but should contain same data
- assert_equal cid.serial, request.certid.first.serial
- end
-end
-
-end
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index aa492abc11..d25a59b740 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -1,18 +1,21 @@
-require_relative 'utils'
+begin
+ require "openssl"
+rescue LoadError
+end
+require 'test/unit'
if defined?(OpenSSL)
require 'socket'
require_relative '../ruby/ut_eof'
-module OpenSSL::SSLPairM
+module SSLPair
def server
host = "127.0.0.1"
port = 0
ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH"
- ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
- tcps = create_tcp_server(host, port)
+ tcps = TCPServer.new(host, port)
ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
return ssls
end
@@ -21,7 +24,7 @@ module OpenSSL::SSLPairM
host = "127.0.0.1"
ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH"
- s = create_tcp_client(host, port)
+ s = TCPSocket.new(host, port)
ssl = OpenSSL::SSL::SSLSocket.new(s, ctx)
ssl.connect
ssl.sync_close = true
@@ -35,7 +38,7 @@ module OpenSSL::SSLPairM
ssls.close
ns
}
- port = ssls.to_io.local_address.ip_port
+ port = ssls.to_io.addr[1]
c = client(port)
s = th.value
if block_given?
@@ -56,31 +59,10 @@ module OpenSSL::SSLPairM
end
end
-module OpenSSL::SSLPair
- include OpenSSL::SSLPairM
-
- def create_tcp_server(host, port)
- TCPServer.new(host, port)
- end
-
- def create_tcp_client(host, port)
- TCPSocket.new(host, port)
- end
-end
-
-module OpenSSL::SSLPairLowlevelSocket
- include OpenSSL::SSLPairM
-
- def create_tcp_server(host, port)
- Addrinfo.tcp(host, port).listen
- end
-
- def create_tcp_client(host, port)
- Addrinfo.tcp(host, port).connect
- end
-end
+class OpenSSL::TestEOF1 < Test::Unit::TestCase
+ include TestEOF
+ include SSLPair
-module OpenSSL::TestEOF1M
def open_file(content)
s1, s2 = ssl_pair
Thread.new { s2 << content; s2.close }
@@ -88,7 +70,10 @@ module OpenSSL::TestEOF1M
end
end
-module OpenSSL::TestEOF2M
+class OpenSSL::TestEOF2 < Test::Unit::TestCase
+ include TestEOF
+ include SSLPair
+
def open_file(content)
s1, s2 = ssl_pair
Thread.new { s1 << content; s1.close }
@@ -96,7 +81,9 @@ module OpenSSL::TestEOF2M
end
end
-module OpenSSL::TestPairM
+class OpenSSL::TestPair < Test::Unit::TestCase
+ include SSLPair
+
def test_getc
ssl_pair {|s1, s2|
s1 << "a"
@@ -207,8 +194,8 @@ module OpenSSL::TestPairM
port = 0
ctx = OpenSSL::SSL::SSLContext.new()
ctx.ciphers = "ADH"
- ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
serv = TCPServer.new(host, port)
+ ssls = OpenSSL::SSL::SSLServer.new(serv, ctx)
port = serv.connect_address.ip_port
@@ -253,46 +240,11 @@ module OpenSSL::TestPairM
s1.print "a\ndef"
assert_equal("a\n", s2.gets)
ensure
- s1.close if s1 && !s1.closed?
- s2.close if s2 && !s2.closed?
serv.close if serv && !serv.closed?
sock1.close if sock1 && !sock1.closed?
sock2.close if sock2 && !sock2.closed?
end
-end
-
-class OpenSSL::TestEOF1 < Test::Unit::TestCase
- include TestEOF
- include OpenSSL::SSLPair
- include OpenSSL::TestEOF1M
-end
-
-class OpenSSL::TestEOF1LowlevelSocket < Test::Unit::TestCase
- include TestEOF
- include OpenSSL::SSLPairLowlevelSocket
- include OpenSSL::TestEOF1M
-end
-
-class OpenSSL::TestEOF2 < Test::Unit::TestCase
- include TestEOF
- include OpenSSL::SSLPair
- include OpenSSL::TestEOF2M
-end
-
-class OpenSSL::TestEOF2LowlevelSocket < Test::Unit::TestCase
- include TestEOF
- include OpenSSL::SSLPairLowlevelSocket
- include OpenSSL::TestEOF2M
-end
-
-class OpenSSL::TestPair < Test::Unit::TestCase
- include OpenSSL::SSLPair
- include OpenSSL::TestPairM
-end
-class OpenSSL::TestPairLowlevelSocket < Test::Unit::TestCase
- include OpenSSL::SSLPairLowlevelSocket
- include OpenSSL::TestPairM
end
end
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
deleted file mode 100644
index 25ff606384..0000000000
--- a/test/openssl/test_pkcs12.rb
+++ /dev/null
@@ -1,209 +0,0 @@
-require_relative "utils"
-
-if defined?(OpenSSL)
-
-module OpenSSL
- class TestPKCS12 < Test::Unit::TestCase
- include OpenSSL::TestUtils
-
- def setup
- ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
-
- now = Time.now
- ca_exts = [
- ["basicConstraints","CA:TRUE",true],
- ["keyUsage","keyCertSign, cRLSign",true],
- ["subjectKeyIdentifier","hash",false],
- ["authorityKeyIdentifier","keyid:always",false],
- ]
-
- @cacert = issue_cert(ca, TEST_KEY_RSA2048, 1, now, now+3600, ca_exts,
- nil, nil, OpenSSL::Digest::SHA1.new)
-
- inter_ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Intermediate CA")
- inter_ca_key = OpenSSL::PKey.read <<-_EOS_
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDp7hIG0SFMG/VWv1dBUWziAPrNmkMXJgTCAoB7jffzRtyyN04K
-oq/89HAszTMStZoMigQURfokzKsjpUp8OYCAEsBtt9d5zPndWMz/gHN73GrXk3LT
-ZsxEn7Xv5Da+Y9F/Hx2QZUHarV5cdZixq2NbzWGwrToogOQMh2pxN3Z/0wIDAQAB
-AoGBAJysUyx3olpsGzv3OMRJeahASbmsSKTXVLZvoIefxOINosBFpCIhZccAG6UV
-5c/xCvS89xBw8aD15uUfziw3AuT8QPEtHCgfSjeT7aWzBfYswEgOW4XPuWr7EeI9
-iNHGD6z+hCN/IQr7FiEBgTp6A+i/hffcSdR83fHWKyb4M7TRAkEA+y4BNd668HmC
-G5MPRx25n6LixuBxrNp1umfjEI6UZgEFVpYOg4agNuimN6NqM253kcTR94QNTUs5
-Kj3EhG1YWwJBAO5rUjiOyCNVX2WUQrOMYK/c1lU7fvrkdygXkvIGkhsPoNRzLPeA
-HGJszKtrKD8bNihWpWNIyqKRHfKVD7yXT+kCQGCAhVCIGTRoypcDghwljHqLnysf
-ci0h5ZdPcIqc7ODfxYhFsJ/Rql5ONgYsT5Ig/+lOQAkjf+TRYM4c2xKx2/8CQBvG
-jv6dy70qDgIUgqzONtlmHeYyFzn9cdBO5sShdVYHvRHjFSMEXsosqK9zvW2UqvuK
-FJx7d3f29gkzynCLJDkCQGQZlEZJC4vWmWJGRKJ24P6MyQn3VsPfErSKOg4lvyM3
-Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
------END RSA PRIVATE KEY-----
- _EOS_
-
- @inter_cacert = issue_cert(inter_ca, inter_ca_key, 2, now, now+3600, ca_exts,
- @cacert, TEST_KEY_RSA2048, OpenSSL::Digest::SHA1.new)
-
- exts = [
- ["keyUsage","digitalSignature",true],
- ["subjectKeyIdentifier","hash",false],
- ]
- ee = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=Ruby PKCS12 Test Certificate")
- @mycert = issue_cert(ee, TEST_KEY_RSA1024, 3, now, now+3600, exts,
- @inter_cacert, inter_ca_key, OpenSSL::Digest::SHA1.new)
- end
-
- def test_create
- pkcs12 = OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert
- )
- assert_equal @mycert, pkcs12.certificate
- assert_equal TEST_KEY_RSA1024, pkcs12.key
- assert_nil pkcs12.ca_certs
- end
-
- def test_create_no_pass
- pkcs12 = OpenSSL::PKCS12.create(
- nil,
- "hello",
- TEST_KEY_RSA1024,
- @mycert
- )
- assert_equal @mycert, pkcs12.certificate
- assert_equal TEST_KEY_RSA1024, pkcs12.key
- assert_nil pkcs12.ca_certs
-
- decoded = OpenSSL::PKCS12.new(pkcs12.to_der)
- assert_cert @mycert, decoded.certificate
- end
-
- def test_create_with_chain
- chain = [@inter_cacert, @cacert]
-
- pkcs12 = OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- chain
- )
- assert_equal chain, pkcs12.ca_certs
- end
-
- def test_create_with_chain_decode
- chain = [@cacert, @inter_cacert]
-
- passwd = "omg"
-
- pkcs12 = OpenSSL::PKCS12.create(
- passwd,
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- chain
- )
-
- decoded = OpenSSL::PKCS12.new(pkcs12.to_der, passwd)
- assert_equal chain.size, decoded.ca_certs.size
- assert_include_cert @cacert, decoded.ca_certs
- assert_include_cert @inter_cacert, decoded.ca_certs
- assert_cert @mycert, decoded.certificate
- assert_equal TEST_KEY_RSA1024.to_der, decoded.key.to_der
- end
-
- def test_create_with_bad_nid
- assert_raises(ArgumentError) do
- OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- [],
- "foo"
- )
- end
- end
-
- def test_create_with_itr
- OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- [],
- nil,
- nil,
- 2048
- )
-
- assert_raises(TypeError) do
- OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- [],
- nil,
- nil,
- "omg"
- )
- end
- end
-
- def test_create_with_mac_itr
- OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- [],
- nil,
- nil,
- nil,
- 2048
- )
-
- assert_raises(TypeError) do
- OpenSSL::PKCS12.create(
- "omg",
- "hello",
- TEST_KEY_RSA1024,
- @mycert,
- [],
- nil,
- nil,
- nil,
- "omg"
- )
- end
- end
-
- private
- def assert_cert expected, actual
- [
- :subject,
- :issuer,
- :serial,
- :not_before,
- :not_after,
- ].each do |attribute|
- assert_equal expected.send(attribute), actual.send(attribute)
- end
- assert_equal expected.to_der, actual.to_der
- end
-
- def assert_include_cert cert, ary
- der = cert.to_der
- ary.each do |candidate|
- if candidate.to_der == der
- return true
- end
- end
- false
- end
-
- end
-end
-
-end
diff --git a/test/openssl/test_pkcs5.rb b/test/openssl/test_pkcs5.rb
deleted file mode 100644
index 30fa3e5b0a..0000000000
--- a/test/openssl/test_pkcs5.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-require_relative 'utils'
-
-class OpenSSL::TestPKCS5 < Test::Unit::TestCase
-
- def test_pbkdf2_hmac_sha1_rfc6070_c_1_len_20
- p ="password"
- s = "salt"
- c = 1
- dk_len = 20
- raw = %w{ 0c 60 c8 0f 96 1f 0e 71
- f3 a9 b5 24 af 60 12 06
- 2f e0 37 a6 }
- expected = [raw.join('')].pack('H*')
- value = OpenSSL::PKCS5.pbkdf2_hmac_sha1(p, s, c, dk_len)
- assert_equal(expected, value)
- end
-
- def test_pbkdf2_hmac_sha1_rfc6070_c_2_len_20
- p ="password"
- s = "salt"
- c = 2
- dk_len = 20
- raw = %w{ ea 6c 01 4d c7 2d 6f 8c
- cd 1e d9 2a ce 1d 41 f0
- d8 de 89 57 }
- expected = [raw.join('')].pack('H*')
- value = OpenSSL::PKCS5.pbkdf2_hmac_sha1(p, s, c, dk_len)
- assert_equal(expected, value)
- end
-
- def test_pbkdf2_hmac_sha1_rfc6070_c_4096_len_20
- p ="password"
- s = "salt"
- c = 4096
- dk_len = 20
- raw = %w{ 4b 00 79 01 b7 65 48 9a
- be ad 49 d9 26 f7 21 d0
- 65 a4 29 c1 }
- expected = [raw.join('')].pack('H*')
- value = OpenSSL::PKCS5.pbkdf2_hmac_sha1(p, s, c, dk_len)
- assert_equal(expected, value)
- end
-
-# takes too long!
-# def test_pbkdf2_hmac_sha1_rfc6070_c_16777216_len_20
-# p ="password"
-# s = "salt"
-# c = 16777216
-# dk_len = 20
-# raw = %w{ ee fe 3d 61 cd 4d a4 e4
-# e9 94 5b 3d 6b a2 15 8c
-# 26 34 e9 84 }
-# expected = [raw.join('')].pack('H*')
-# value = OpenSSL::PKCS5.pbkdf2_hmac_sha1(p, s, c, dk_len)
-# assert_equal(expected, value)
-# end
-
- def test_pbkdf2_hmac_sha1_rfc6070_c_4096_len_25
- p ="passwordPASSWORDpassword"
- s = "saltSALTsaltSALTsaltSALTsaltSALTsalt"
- c = 4096
- dk_len = 25
-
- raw = %w{ 3d 2e ec 4f e4 1c 84 9b
- 80 c8 d8 36 62 c0 e4 4a
- 8b 29 1a 96 4c f2 f0 70
- 38 }
- expected = [raw.join('')].pack('H*')
- value = OpenSSL::PKCS5.pbkdf2_hmac_sha1(p, s, c, dk_len)
- assert_equal(expected, value)
- end
-
- def test_pbkdf2_hmac_sha1_rfc6070_c_4096_len_16
- p ="pass\0word"
- s = "sa\0lt"
- c = 4096
- dk_len = 16
- raw = %w{ 56 fa 6a a7 55 48 09 9d
- cc 37 d7 f0 34 25 e0 c3 }
- expected = [raw.join('')].pack('H*')
- value = OpenSSL::PKCS5.pbkdf2_hmac_sha1(p, s, c, dk_len)
- assert_equal(expected, value)
- end
-
- def test_pbkdf2_hmac_sha256_c_20000_len_32
- #unfortunately no official test vectors available yet for SHA-2
- p ="password"
- s = OpenSSL::Random.random_bytes(16)
- c = 20000
- dk_len = 32
- digest = OpenSSL::Digest::SHA256.new
- value1 = OpenSSL::PKCS5.pbkdf2_hmac(p, s, c, dk_len, digest)
- value2 = OpenSSL::PKCS5.pbkdf2_hmac(p, s, c, dk_len, digest)
- assert_equal(value1, value2)
- end if OpenSSL::PKCS5.respond_to?(:pbkdf2_hmac)
-
-end if defined?(OpenSSL)
diff --git a/test/openssl/test_pkcs7.rb b/test/openssl/test_pkcs7.rb
index 4a6692a74c..85e9b89b55 100644
--- a/test/openssl/test_pkcs7.rb
+++ b/test/openssl/test_pkcs7.rb
@@ -1,4 +1,9 @@
-require_relative 'utils'
+begin
+ require "openssl"
+ require_relative 'utils'
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
@@ -17,16 +22,16 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase
["subjectKeyIdentifier","hash",false],
["authorityKeyIdentifier","keyid:always",false],
]
- @ca_cert = issue_cert(ca, @rsa2048, 1, now, now+3600, ca_exts,
+ @ca_cert = issue_cert(ca, @rsa2048, 1, Time.now, Time.now+3600, ca_exts,
nil, nil, OpenSSL::Digest::SHA1.new)
ee_exts = [
["keyUsage","Non Repudiation, Digital Signature, Key Encipherment",true],
["authorityKeyIdentifier","keyid:always",false],
["extendedKeyUsage","clientAuth, emailProtection, codeSigning",false],
]
- @ee1_cert = issue_cert(ee1, @rsa1024, 2, now, now+1800, ee_exts,
+ @ee1_cert = issue_cert(ee1, @rsa1024, 2, Time.now, Time.now+1800, ee_exts,
@ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
- @ee2_cert = issue_cert(ee2, @rsa1024, 3, now, now+1800, ee_exts,
+ @ee2_cert = issue_cert(ee2, @rsa1024, 3, Time.now, Time.now+1800, ee_exts,
@ca_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
end
@@ -104,9 +109,7 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase
flag = OpenSSL::PKCS7::BINARY|OpenSSL::PKCS7::DETACHED
tmp = OpenSSL::PKCS7.sign(@ee1_cert, @rsa1024, data, ca_certs, flag)
p7 = OpenSSL::PKCS7.new(tmp.to_der)
- assert_nothing_raised do
- OpenSSL::ASN1.decode(p7)
- end
+ a1 = OpenSSL::ASN1.decode(p7)
certs = p7.certificates
signers = p7.signers
@@ -146,11 +149,6 @@ class OpenSSL::TestPKCS7 < Test::Unit::TestCase
assert_equal(3, recip[1].serial)
assert_equal(data, p7.decrypt(@rsa1024, @ee2_cert))
end
-
- def test_graceful_parsing_failure #[ruby-core:43250]
- contents = File.read(__FILE__)
- assert_raise(ArgumentError) { OpenSSL::PKCS7.new(contents) }
- end
end
end
diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
deleted file mode 100644
index 160a131c06..0000000000
--- a/test/openssl/test_pkey_dh.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-require_relative 'utils'
-
-if defined?(OpenSSL)
-
-class OpenSSL::TestPKeyDH < Test::Unit::TestCase
-
- NEW_KEYLEN = 256
-
- def test_new
- dh = OpenSSL::PKey::DH.new(NEW_KEYLEN)
- assert_key(dh)
- end
-
- def test_new_break
- assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
- assert_raises(RuntimeError) do
- OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
- end
- end
-
- def test_to_der
- dh = OpenSSL::TestUtils::TEST_KEY_DH1024
- der = dh.to_der
- dh2 = OpenSSL::PKey::DH.new(der)
- assert_equal_params(dh, dh2)
- assert_no_key(dh2)
- end
-
- def test_to_pem
- dh = OpenSSL::TestUtils::TEST_KEY_DH1024
- pem = dh.to_pem
- dh2 = OpenSSL::PKey::DH.new(pem)
- assert_equal_params(dh, dh2)
- assert_no_key(dh2)
- end
-
- def test_public_key
- dh = OpenSSL::TestUtils::TEST_KEY_DH1024
- public_key = dh.public_key
- assert_no_key(public_key) #implies public_key.public? is false!
- assert_equal(dh.to_der, public_key.to_der)
- assert_equal(dh.to_pem, public_key.to_pem)
- end
-
- def test_generate_key
- dh = OpenSSL::TestUtils::TEST_KEY_DH512_PUB.public_key # creates a copy
- assert_no_key(dh)
- dh.generate_key!
- assert_key(dh)
- end
-
- def test_key_exchange
- dh = OpenSSL::TestUtils::TEST_KEY_DH512_PUB
- dh2 = dh.public_key
- dh.generate_key!
- dh2.generate_key!
- assert_equal(dh.compute_key(dh2.pub_key), dh2.compute_key(dh.pub_key))
- end
-
- private
-
- def assert_equal_params(dh1, dh2)
- assert_equal(dh1.g, dh2.g)
- assert_equal(dh1.p, dh2.p)
- end
-
- def assert_no_key(dh)
- assert_equal(false, dh.public?)
- assert_equal(false, dh.private?)
- assert_equal(nil, dh.pub_key)
- assert_equal(nil, dh.priv_key)
- end
-
- def assert_key(dh)
- assert(dh.public?)
- assert(dh.private?)
- assert(dh.pub_key)
- assert(dh.priv_key)
- end
-end
-
-end
diff --git a/test/openssl/test_pkey_dsa.rb b/test/openssl/test_pkey_dsa.rb
index 555637e7a4..f594a19917 100644
--- a/test/openssl/test_pkey_dsa.rb
+++ b/test/openssl/test_pkey_dsa.rb
@@ -22,21 +22,6 @@ class OpenSSL::TestPKeyDSA < Test::Unit::TestCase
assert_equal([], OpenSSL.errors)
end
- def test_new_break
- assert_nil(OpenSSL::PKey::DSA.new(512) { break })
- assert_raise(RuntimeError) do
- OpenSSL::PKey::DSA.new(512) { raise }
- end
- end
-
- def test_sys_sign_verify
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
- data = 'Sign me!'
- digest = OpenSSL::Digest::SHA1.digest(data)
- sig = key.syssign(digest)
- assert(key.sysverify(digest, sig))
- end
-
def test_sign_verify
check_sign_verify(OpenSSL::Digest::DSS1.new)
end
@@ -52,7 +37,7 @@ if (OpenSSL::OPENSSL_VERSION_NUMBER > 0x10000000)
end
def test_digest_state_irrelevant_verify
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
+ key = OpenSSL::PKey::DSA.new(256)
digest1 = OpenSSL::Digest::DSS1.new
digest2 = OpenSSL::Digest::DSS1.new
data = 'Sign me!'
@@ -83,7 +68,6 @@ end
assert_equal(g, key.g)
assert_equal(y, key.pub_key)
assert_equal(nil, key.priv_key)
- assert_equal([], OpenSSL.errors)
end
def test_read_DSAPublicKey_pem
@@ -108,7 +92,6 @@ fWLOqqkzFeRrYMDzUpl36XktY6Yq8EJYlW9pCMmBVNy/dQ==
assert_equal(g, key.g)
assert_equal(y, key.pub_key)
assert_equal(nil, key.priv_key)
- assert_equal([], OpenSSL.errors)
end
def test_read_DSA_PUBKEY_pem
@@ -134,103 +117,12 @@ YNMbNw==
assert_equal(g, key.g)
assert_equal(y, key.pub_key)
assert_equal(nil, key.priv_key)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_export_format_is_DSA_PUBKEY_pem
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
- pem = key.public_key.to_pem
- pem.gsub!(/^-+(\w|\s)+-+$/, "") # eliminate --------BEGIN...-------
- asn1 = OpenSSL::ASN1.decode(Base64.decode64(pem))
- assert_equal(OpenSSL::ASN1::SEQUENCE, asn1.tag)
- assert_equal(2, asn1.value.size)
- seq = asn1.value
- assert_equal(OpenSSL::ASN1::SEQUENCE, seq[0].tag)
- assert_equal(2, seq[0].value.size)
- algo_id = seq[0].value
- assert_equal(OpenSSL::ASN1::OBJECT, algo_id[0].tag)
- assert_equal('DSA', algo_id[0].value)
- assert_equal(OpenSSL::ASN1::SEQUENCE, algo_id[1].tag)
- assert_equal(3, algo_id[1].value.size)
- params = algo_id[1].value
- assert_equal(OpenSSL::ASN1::INTEGER, params[0].tag)
- assert_equal(key.p, params[0].value)
- assert_equal(OpenSSL::ASN1::INTEGER, params[1].tag)
- assert_equal(key.q, params[1].value)
- assert_equal(OpenSSL::ASN1::INTEGER, params[2].tag)
- assert_equal(key.g, params[2].value)
- assert_equal(OpenSSL::ASN1::BIT_STRING, seq[1].tag)
- assert_equal(0, seq[1].unused_bits)
- pub_key = OpenSSL::ASN1.decode(seq[1].value)
- assert_equal(OpenSSL::ASN1::INTEGER, pub_key.tag)
- assert_equal(key.pub_key, pub_key.value)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_der
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
- der = key.to_der
- key2 = OpenSSL::PKey.read(der)
- assert(key2.private?)
- assert_equal(der, key2.to_der)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
- pem = key.to_pem
- key2 = OpenSSL::PKey.read(pem)
- assert(key2.private?)
- assert_equal(pem, key2.to_pem)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_public_key_der
- key = OpenSSL::TestUtils::TEST_KEY_DSA256.public_key
- der = key.to_der
- key2 = OpenSSL::PKey.read(der)
- assert(!key2.private?)
- assert_equal(der, key2.to_der)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_public_key_pem
- key = OpenSSL::TestUtils::TEST_KEY_DSA256.public_key
- pem = key.to_pem
- key2 = OpenSSL::PKey.read(pem)
- assert(!key2.private?)
- assert_equal(pem, key2.to_pem)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem_pw
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
- pem = key.to_pem(OpenSSL::Cipher.new('AES-128-CBC'), 'secret')
- #callback form for password
- key2 = OpenSSL::PKey.read(pem) do
- 'secret'
- end
- assert(key2.private?)
- # pass password directly
- key2 = OpenSSL::PKey.read(pem, 'secret')
- assert(key2.private?)
- #omit pem equality check, will be different due to cipher iv
- assert_equal([], OpenSSL.errors)
- end
-
- def test_export_password_length
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
- assert_raise(OpenSSL::OpenSSLError) do
- key.export(OpenSSL::Cipher.new('AES-128-CBC'), 'sec')
- end
- pem = key.export(OpenSSL::Cipher.new('AES-128-CBC'), 'secr')
- assert(pem)
end
private
def check_sign_verify(digest)
- key = OpenSSL::TestUtils::TEST_KEY_DSA256
+ key = OpenSSL::PKey::DSA.new(256)
data = 'Sign me!'
sig = key.sign(digest, data)
assert(key.verify(digest, sig, data))
diff --git a/test/openssl/test_pkey_ec.rb b/test/openssl/test_pkey_ec.rb
deleted file mode 100644
index 5ceea4c867..0000000000
--- a/test/openssl/test_pkey_ec.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-require_relative 'utils'
-
-if defined?(OpenSSL::PKey::EC)
-
-class OpenSSL::TestEC < Test::Unit::TestCase
- def setup
- @data1 = 'foo'
- @data2 = 'bar' * 1000 # data too long for DSA sig
-
- @groups = []
- @keys = []
-
- OpenSSL::PKey::EC.builtin_curves.each do |curve, comment|
- next if curve.start_with?("Oakley") # Oakley curves are not suitable for ECDSA
- group = OpenSSL::PKey::EC::Group.new(curve)
-
- key = OpenSSL::PKey::EC.new(group)
- key.generate_key
-
- @groups << group
- @keys << key
- end
- end
-
- def compare_keys(k1, k2)
- assert_equal(k1.to_pem, k2.to_pem)
- end
-
- def test_builtin_curves
- assert(!OpenSSL::PKey::EC.builtin_curves.empty?)
- end
-
- def test_curve_names
- @groups.each_with_index do |group, idx|
- key = @keys[idx]
- assert_equal(group.curve_name, key.group.curve_name)
- end
- end
-
- def test_check_key
- for key in @keys
- assert_equal(key.check_key, true)
- assert_equal(key.private_key?, true)
- assert_equal(key.public_key?, true)
- end
- end
-
- def test_group_encoding
- for group in @groups
- for meth in [:to_der, :to_pem]
- txt = group.send(meth)
- gr = OpenSSL::PKey::EC::Group.new(txt)
-
- assert_equal(txt, gr.send(meth))
-
- assert_equal(group.generator.to_bn, gr.generator.to_bn)
- assert_equal(group.cofactor, gr.cofactor)
- assert_equal(group.order, gr.order)
- assert_equal(group.seed, gr.seed)
- assert_equal(group.degree, gr.degree)
- end
- end
- end
-
- def test_key_encoding
- for key in @keys
- group = key.group
-
- for meth in [:to_der, :to_pem]
- txt = key.send(meth)
- assert_equal(txt, OpenSSL::PKey::EC.new(txt).send(meth))
- end
-
- bn = key.public_key.to_bn
- assert_equal(bn, OpenSSL::PKey::EC::Point.new(group, bn).to_bn)
- end
- end
-
- def test_set_keys
- for key in @keys
- k = OpenSSL::PKey::EC.new
- k.group = key.group
- k.private_key = key.private_key
- k.public_key = key.public_key
-
- compare_keys(key, k)
- end
- end
-
- def test_dsa_sign_verify
- for key in @keys
- sig = key.dsa_sign_asn1(@data1)
- assert(key.dsa_verify_asn1(@data1, sig))
- end
- end
-
- def test_dsa_sign_asn1_FIPS186_3
- for key in @keys
- size = key.group.order.num_bits / 8 + 1
- dgst = (1..size).to_a.pack('C*')
- begin
- sig = key.dsa_sign_asn1(dgst)
- # dgst is auto-truncated according to FIPS186-3 after openssl-0.9.8m
- assert(key.dsa_verify_asn1(dgst + "garbage", sig))
- rescue OpenSSL::PKey::ECError => e
- # just an exception for longer dgst before openssl-0.9.8m
- assert_equal('ECDSA_sign: data too large for key size', e.message)
- # no need to do following tests
- return
- end
- end
- end
-
- def test_dh_compute_key
- for key in @keys
- k = OpenSSL::PKey::EC.new(key.group)
- k.generate_key
-
- puba = key.public_key
- pubb = k.public_key
- a = key.dh_compute_key(pubb)
- b = k.dh_compute_key(puba)
- assert_equal(a, b)
- end
- end
-
- def test_read_private_key_der
- ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- der = ec.to_der
- ec2 = OpenSSL::PKey.read(der)
- assert(ec2.private_key?)
- assert_equal(der, ec2.to_der)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem
- ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- pem = ec.to_pem
- ec2 = OpenSSL::PKey.read(pem)
- assert(ec2.private_key?)
- assert_equal(pem, ec2.to_pem)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_public_key_der
- ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- ec2 = OpenSSL::PKey::EC.new(ec.group)
- ec2.public_key = ec.public_key
- der = ec2.to_der
- ec3 = OpenSSL::PKey.read(der)
- assert(!ec3.private_key?)
- assert_equal(der, ec3.to_der)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_public_key_pem
- ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- ec2 = OpenSSL::PKey::EC.new(ec.group)
- ec2.public_key = ec.public_key
- pem = ec2.to_pem
- ec3 = OpenSSL::PKey.read(pem)
- assert(!ec3.private_key?)
- assert_equal(pem, ec3.to_pem)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem_pw
- ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- pem = ec.to_pem(OpenSSL::Cipher.new('AES-128-CBC'), 'secret')
- #callback form for password
- ec2 = OpenSSL::PKey.read(pem) do
- 'secret'
- end
- assert(ec2.private_key?)
- # pass password directly
- ec2 = OpenSSL::PKey.read(pem, 'secret')
- assert(ec2.private_key?)
- #omit pem equality check, will be different due to cipher iv
- assert_equal([], OpenSSL.errors)
- end
-
- def test_export_password_length
- key = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- assert_raise(OpenSSL::OpenSSLError) do
- key.export(OpenSSL::Cipher.new('AES-128-CBC'), 'sec')
- end
- pem = key.export(OpenSSL::Cipher.new('AES-128-CBC'), 'secr')
- assert(pem)
- end
-
- def test_ec_point_mul
- ec = OpenSSL::TestUtils::TEST_KEY_EC_P256V1
- p1 = ec.public_key
- bn1 = OpenSSL::BN.new('10')
- bn2 = OpenSSL::BN.new('20')
-
- p2 = p1.mul(bn1)
- assert(p1.group == p2.group)
- p2 = p1.mul(bn1, bn2)
- assert(p1.group == p2.group)
- p2 = p1.mul([bn1, bn2], [p1])
- assert(p1.group == p2.group)
- p2 = p1.mul([bn1, bn2], [p1], bn2)
- assert(p1.group == p2.group)
- end
-
-# test Group: asn1_flag, point_conversion
-
-end
-
-end
diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb
index df0c6090cb..4e07cbd500 100644
--- a/test/openssl/test_pkey_rsa.rb
+++ b/test/openssl/test_pkey_rsa.rb
@@ -1,5 +1,9 @@
-require_relative 'utils'
-require 'base64'
+begin
+ require "openssl"
+ require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require 'test/unit'
if defined?(OpenSSL)
@@ -48,65 +52,16 @@ class OpenSSL::TestPKeyRSA < Test::Unit::TestCase
assert_equal([], OpenSSL.errors)
end
- def test_new_exponent_default
- assert_equal(65537, OpenSSL::PKey::RSA.new(512).e)
- end
-
- def test_new_with_exponent
- 1.upto(30) do |idx|
- e = (2 ** idx) + 1
- key = OpenSSL::PKey::RSA.new(512, e)
- assert_equal(e, key.e)
- end
- end
-
- def test_new_break
- assert_nil(OpenSSL::PKey::RSA.new(1024) { break })
- assert_raise(RuntimeError) do
- OpenSSL::PKey::RSA.new(1024) { raise }
- end
- end
-
def test_sign_verify
- key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+ key = OpenSSL::PKey::RSA.new(512)
digest = OpenSSL::Digest::SHA1.new
data = 'Sign me!'
sig = key.sign(digest, data)
assert(key.verify(digest, sig, data))
end
- def test_sign_verify_memory_leak
- bug9743 = '[ruby-core:62038] [Bug #9743]'
- assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true, timeout: 30)
- data = 'Sign me!'
- digest = OpenSSL::Digest::SHA512.new
- pkey = OpenSSL::PKey::RSA.new(2048)
- signature = pkey.sign(digest, data)
- pub_key = pkey.public_key
- PREP
- 20_000.times {
- pub_key.verify(digest, signature, data)
- }
- CODE
-
- assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true, timeout: 30)
- data = 'Sign me!'
- digest = OpenSSL::Digest::SHA512.new
- pkey = OpenSSL::PKey::RSA.new(2048)
- signature = pkey.sign(digest, data)
- pub_key = pkey.public_key
- PREP
- 20_000.times {
- begin
- pub_key.verify(digest, signature, 1)
- rescue TypeError
- end
- }
- CODE
- end
-
def test_digest_state_irrelevant_sign
- key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+ key = OpenSSL::PKey::RSA.new(512)
digest1 = OpenSSL::Digest::SHA1.new
digest2 = OpenSSL::Digest::SHA1.new
data = 'Sign me!'
@@ -117,7 +72,7 @@ class OpenSSL::TestPKeyRSA < Test::Unit::TestCase
end
def test_digest_state_irrelevant_verify
- key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+ key = OpenSSL::PKey::RSA.new(512)
digest1 = OpenSSL::Digest::SHA1.new
digest2 = OpenSSL::Digest::SHA1.new
data = 'Sign me!'
@@ -127,187 +82,5 @@ class OpenSSL::TestPKeyRSA < Test::Unit::TestCase
assert(key.verify(digest1, sig, data))
assert(key.verify(digest2, sig, data))
end
-
- def test_read_RSAPublicKey
- modulus = 10664264882656732240315063514678024569492171560814833397008094754351396057398262071307709191731289492697968568138092052265293364132872019762410446076526351
- exponent = 65537
- seq = OpenSSL::ASN1::Sequence.new([OpenSSL::ASN1::Integer.new(modulus), OpenSSL::ASN1::Integer.new(exponent)])
- key = OpenSSL::PKey::RSA.new(seq.to_der)
- assert(key.public?)
- assert(!key.private?)
- assert_equal(modulus, key.n)
- assert_equal(exponent, key.e)
- assert_equal(nil, key.d)
- assert_equal(nil, key.p)
- assert_equal(nil, key.q)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_RSA_PUBKEY
- modulus = 10664264882656732240315063514678024569492171560814833397008094754351396057398262071307709191731289492697968568138092052265293364132872019762410446076526351
- exponent = 65537
- algo = OpenSSL::ASN1::ObjectId.new('rsaEncryption')
- null_params = OpenSSL::ASN1::Null.new(nil)
- algo_id = OpenSSL::ASN1::Sequence.new ([algo, null_params])
- pub_key = OpenSSL::ASN1::Sequence.new([OpenSSL::ASN1::Integer.new(modulus), OpenSSL::ASN1::Integer.new(exponent)])
- seq = OpenSSL::ASN1::Sequence.new([algo_id, OpenSSL::ASN1::BitString.new(pub_key.to_der)])
- key = OpenSSL::PKey::RSA.new(seq.to_der)
- assert(key.public?)
- assert(!key.private?)
- assert_equal(modulus, key.n)
- assert_equal(exponent, key.e)
- assert_equal(nil, key.d)
- assert_equal(nil, key.p)
- assert_equal(nil, key.q)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_RSAPublicKey_pem
- modulus = 9416340886363418692990906464787534854462163316648195510702927337693641649864839352187127240942127674615733815606532506566068276485089353644309497938966061
- exponent = 65537
- pem = <<-EOF
------BEGIN RSA PUBLIC KEY-----
-MEgCQQCzyh2RIZK62E2PbTWqUljD+K23XR9AGBKNtXjal6WD2yRGcLqzPJLNCa60
-AudJR1JobbIbDJrQu6AXnWh5k/YtAgMBAAE=
------END RSA PUBLIC KEY-----
- EOF
- key = OpenSSL::PKey::RSA.new(pem)
- assert(key.public?)
- assert(!key.private?)
- assert_equal(modulus, key.n)
- assert_equal(exponent, key.e)
- assert_equal(nil, key.d)
- assert_equal(nil, key.p)
- assert_equal(nil, key.q)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_RSA_PUBKEY_pem
- modulus = 9416340886363418692990906464787534854462163316648195510702927337693641649864839352187127240942127674615733815606532506566068276485089353644309497938966061
- exponent = 65537
- pem = <<-EOF
------BEGIN PUBLIC KEY-----
-MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALPKHZEhkrrYTY9tNapSWMP4rbdd
-H0AYEo21eNqXpYPbJEZwurM8ks0JrrQC50lHUmhtshsMmtC7oBedaHmT9i0C
-AwEAAQ==
------END PUBLIC KEY-----
- EOF
- key = OpenSSL::PKey::RSA.new(pem)
- assert(key.public?)
- assert(!key.private?)
- assert_equal(modulus, key.n)
- assert_equal(exponent, key.e)
- assert_equal(nil, key.d)
- assert_equal(nil, key.p)
- assert_equal(nil, key.q)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_export_format_is_RSA_PUBKEY
- key = OpenSSL::PKey::RSA.new(512)
- asn1 = OpenSSL::ASN1.decode(key.public_key.to_der)
- check_PUBKEY(asn1, key)
- end
-
- def test_export_format_is_RSA_PUBKEY_pem
- key = OpenSSL::PKey::RSA.new(512)
- pem = key.public_key.to_pem
- pem.gsub!(/^-+(\w|\s)+-+$/, "") # eliminate --------BEGIN...-------
- asn1 = OpenSSL::ASN1.decode(Base64.decode64(pem))
- check_PUBKEY(asn1, key)
- end
-
- def test_read_private_key_der
- der = OpenSSL::TestUtils::TEST_KEY_RSA1024.to_der
- key = OpenSSL::PKey.read(der)
- assert(key.private?)
- assert_equal(der, key.to_der)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem
- pem = OpenSSL::TestUtils::TEST_KEY_RSA1024.to_pem
- key = OpenSSL::PKey.read(pem)
- assert(key.private?)
- assert_equal(pem, key.to_pem)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_public_key_der
- der = OpenSSL::TestUtils::TEST_KEY_RSA1024.public_key.to_der
- key = OpenSSL::PKey.read(der)
- assert(!key.private?)
- assert_equal(der, key.to_der)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_public_key_pem
- pem = OpenSSL::TestUtils::TEST_KEY_RSA1024.public_key.to_pem
- key = OpenSSL::PKey.read(pem)
- assert(!key.private?)
- assert_equal(pem, key.to_pem)
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem_pw
- pem = OpenSSL::TestUtils::TEST_KEY_RSA1024.to_pem(OpenSSL::Cipher.new('AES-128-CBC'), 'secret')
- #callback form for password
- key = OpenSSL::PKey.read(pem) do
- 'secret'
- end
- assert(key.private?)
- # pass password directly
- key = OpenSSL::PKey.read(pem, 'secret')
- assert(key.private?)
- #omit pem equality check, will be different due to cipher iv
- assert_equal([], OpenSSL.errors)
- end
-
- def test_read_private_key_pem_pw_exception
- pem = OpenSSL::TestUtils::TEST_KEY_RSA1024.to_pem(OpenSSL::Cipher.new('AES-128-CBC'), 'secret')
- # it raises an ArgumentError from PEM reading. The exception raised inside are ignored for now.
- assert_raise(ArgumentError) do
- OpenSSL::PKey.read(pem) do
- raise RuntimeError
- end
- end
- assert_equal([], OpenSSL.errors)
- end
-
- def test_export_password_length
- key = OpenSSL::TestUtils::TEST_KEY_RSA1024
- assert_raise(OpenSSL::OpenSSLError) do
- key.export(OpenSSL::Cipher.new('AES-128-CBC'), 'sec')
- end
- pem = key.export(OpenSSL::Cipher.new('AES-128-CBC'), 'secr')
- assert(pem)
- end
-
- private
-
- def check_PUBKEY(asn1, key)
- assert_equal(OpenSSL::ASN1::SEQUENCE, asn1.tag)
- assert_equal(2, asn1.value.size)
- seq = asn1.value
- assert_equal(OpenSSL::ASN1::SEQUENCE, seq[0].tag)
- assert_equal(2, seq[0].value.size)
- algo_id = seq[0].value
- assert_equal(OpenSSL::ASN1::OBJECT, algo_id[0].tag)
- assert_equal('rsaEncryption', algo_id[0].value)
- assert_equal(OpenSSL::ASN1::NULL, algo_id[1].tag)
- assert_equal(nil, algo_id[1].value)
- assert_equal(OpenSSL::ASN1::BIT_STRING, seq[1].tag)
- assert_equal(0, seq[1].unused_bits)
- pub_key = OpenSSL::ASN1.decode(seq[1].value)
- assert_equal(OpenSSL::ASN1::SEQUENCE, pub_key.tag)
- assert_equal(2, pub_key.value.size)
- assert_equal(OpenSSL::ASN1::INTEGER, pub_key.value[0].tag)
- assert_equal(key.n, pub_key.value[0].value)
- assert_equal(OpenSSL::ASN1::INTEGER, pub_key.value[1].tag)
- assert_equal(key.e, pub_key.value[1].value)
- assert_equal([], OpenSSL.errors)
- end
-
end
-
end
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index 072b993efe..42bbfff002 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -1,26 +1,166 @@
-require_relative "utils"
+begin
+ require "openssl"
+ require_relative "utils.rb"
+rescue LoadError
+end
+require "rbconfig"
+require "socket"
+require "test/unit"
+require_relative '../ruby/envutil'
if defined?(OpenSSL)
-class OpenSSL::TestSSL < OpenSSL::SSLTestCase
+class OpenSSL::TestSSL < Test::Unit::TestCase
+ RUBY = EnvUtil.rubybin
+ SSL_SERVER = File.join(File.dirname(__FILE__), "ssl_server.rb")
+ PORT = 20443
+ ITERATIONS = ($0 == __FILE__) ? 100 : 10
+
+ def setup
+ @ca_key = OpenSSL::TestUtils::TEST_KEY_RSA2048
+ @svr_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+ @cli_key = OpenSSL::TestUtils::TEST_KEY_DSA256
+ @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
+ @svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
+ @cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
+
+ now = Time.at(Time.now.to_i)
+ ca_exts = [
+ ["basicConstraints","CA:TRUE",true],
+ ["keyUsage","cRLSign,keyCertSign",true],
+ ]
+ ee_exts = [
+ ["keyUsage","keyEncipherment,digitalSignature",true],
+ ]
+ @ca_cert = issue_cert(@ca, @ca_key, 1, now, now+3600, ca_exts,
+ nil, nil, OpenSSL::Digest::SHA1.new)
+ @svr_cert = issue_cert(@svr, @svr_key, 2, now, now+1800, ee_exts,
+ @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
+ @cli_cert = issue_cert(@cli, @cli_key, 3, now, now+1800, ee_exts,
+ @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
+ @server = nil
+ end
- def test_ctx_setup
+ def teardown
+ end
+
+ def issue_cert(*arg)
+ OpenSSL::TestUtils.issue_cert(*arg)
+ end
+
+ def issue_crl(*arg)
+ OpenSSL::TestUtils.issue_crl(*arg)
+ end
+
+ def readwrite_loop(ctx, ssl)
+ while line = ssl.gets
+ if line =~ /^STARTTLS$/
+ ssl.accept
+ next
+ end
+ ssl.write(line)
+ end
+ rescue OpenSSL::SSL::SSLError
+ rescue IOError
+ ensure
+ ssl.close rescue nil
+ end
+
+ def server_loop(ctx, ssls, server_proc)
+ loop do
+ ssl = nil
+ begin
+ ssl = ssls.accept
+ rescue OpenSSL::SSL::SSLError
+ retry
+ end
+
+ Thread.start do
+ Thread.current.abort_on_exception = true
+ server_proc.call(ctx, ssl)
+ end
+ end
+ rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK
+ end
+
+ def start_server(port0, verify_mode, start_immediately, args = {}, &block)
+ ctx_proc = args[:ctx_proc]
+ server_proc = args[:server_proc]
+ server_proc ||= method(:readwrite_loop)
+
+ store = OpenSSL::X509::Store.new
+ store.add_cert(@ca_cert)
+ store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
ctx = OpenSSL::SSL::SSLContext.new
- assert_equal(ctx.setup, true)
- assert_equal(ctx.setup, nil)
+ ctx.cert_store = store
+ #ctx.extra_chain_cert = [ ca_cert ]
+ ctx.cert = @svr_cert
+ ctx.key = @svr_key
+ ctx.verify_mode = verify_mode
+ ctx_proc.call(ctx) if ctx_proc
+
+ Socket.do_not_reverse_lookup = true
+ tcps = nil
+ port = port0
+ begin
+ tcps = TCPServer.new("127.0.0.1", port)
+ rescue Errno::EADDRINUSE
+ port += 1
+ retry
+ end
+
+ ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
+ ssls.start_immediately = start_immediately
+
+ begin
+ server = Thread.new do
+ Thread.current.abort_on_exception = true
+ server_loop(ctx, ssls, server_proc)
+ end
+
+ $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, pid, port) if $DEBUG
+
+ block.call(server, port.to_i)
+ ensure
+ begin
+ begin
+ tcps.shutdown
+ rescue Errno::ENOTCONN
+ # when `Errno::ENOTCONN: Socket is not connected' on some platforms,
+ # call #close instead of #shutdown.
+ tcps.close
+ tcps = nil
+ end if (tcps)
+ if (server)
+ server.join(5)
+ if server.alive?
+ server.kill
+ server.join
+ flunk("TCPServer was closed and SSLServer is still alive") unless $!
+ end
+ end
+ ensure
+ tcps.close if (tcps)
+ end
+ end
end
- def test_ctx_setup_no_compression
+ def starttls(ssl)
+ ssl.puts("STARTTLS")
+
+ sleep 1 # When this line is eliminated, process on Cygwin blocks
+ # forever at ssl.connect. But I don't know why it does.
+
+ ssl.connect
+ end
+
+ def test_ctx_setup
ctx = OpenSSL::SSL::SSLContext.new
- ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_COMPRESSION
assert_equal(ctx.setup, true)
assert_equal(ctx.setup, nil)
- assert_equal(OpenSSL::SSL::OP_NO_COMPRESSION,
- ctx.options & OpenSSL::SSL::OP_NO_COMPRESSION)
- end if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
+ end
def test_not_started_session
- skip "non socket argument of SSLSocket.new is not supported on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
open(__FILE__) do |f|
assert_nil OpenSSL::SSL::SSLSocket.new(f).cert
end
@@ -28,14 +168,16 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_ssl_read_nonblock
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) { |server, port|
- server_connect(port) { |ssl|
- assert_raise(IO::WaitReadable) { ssl.read_nonblock(100) }
- ssl.write("abc\n")
- IO.select [ssl]
- assert_equal('a', ssl.read_nonblock(1))
- assert_equal("bc\n", ssl.read_nonblock(100))
- assert_raise(IO::WaitReadable) { ssl.read_nonblock(100) }
- }
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock)
+ ssl.sync_close = true
+ ssl.connect
+ assert_raise(IO::WaitReadable) { ssl.read_nonblock(100) }
+ ssl.write("abc\n")
+ IO.select [ssl]
+ assert_equal('a', ssl.read_nonblock(1))
+ assert_equal("bc\n", ssl.read_nonblock(100))
+ assert_raise(IO::WaitReadable) { ssl.read_nonblock(100) }
}
end
@@ -59,45 +201,50 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
def test_read_and_write
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
- server_connect(port) { |ssl|
- # syswrite and sysread
- ITERATIONS.times{|i|
- str = "x" * 100 + "\n"
- ssl.syswrite(str)
- assert_equal(str, ssl.sysread(str.size))
-
- str = "x" * i * 100 + "\n"
- buf = ""
- ssl.syswrite(str)
- assert_equal(buf.object_id, ssl.sysread(str.size, buf).object_id)
- assert_equal(str, buf)
- }
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock)
+ ssl.sync_close = true
+ ssl.connect
- # puts and gets
- ITERATIONS.times{
- str = "x" * 100 + "\n"
- ssl.puts(str)
- assert_equal(str, ssl.gets)
+ # syswrite and sysread
+ ITERATIONS.times{|i|
+ str = "x" * 100 + "\n"
+ ssl.syswrite(str)
+ assert_equal(str, ssl.sysread(str.size))
+
+ str = "x" * i * 100 + "\n"
+ buf = ""
+ ssl.syswrite(str)
+ assert_equal(buf.object_id, ssl.sysread(str.size, buf).object_id)
+ assert_equal(str, buf)
+ }
- str = "x" * 100
- ssl.puts(str)
- assert_equal(str, ssl.gets("\n", 100))
- assert_equal("\n", ssl.gets)
- }
+ # puts and gets
+ ITERATIONS.times{
+ str = "x" * 100 + "\n"
+ ssl.puts(str)
+ assert_equal(str, ssl.gets)
- # read and write
- ITERATIONS.times{|i|
- str = "x" * 100 + "\n"
- ssl.write(str)
- assert_equal(str, ssl.read(str.size))
-
- str = "x" * i * 100 + "\n"
- buf = ""
- ssl.write(str)
- assert_equal(buf.object_id, ssl.read(str.size, buf).object_id)
- assert_equal(str, buf)
- }
+ str = "x" * 100
+ ssl.puts(str)
+ assert_equal(str, ssl.gets("\n", 100))
+ assert_equal("\n", ssl.gets)
}
+
+ # read and write
+ ITERATIONS.times{|i|
+ str = "x" * 100 + "\n"
+ ssl.write(str)
+ assert_equal(str, ssl.read(str.size))
+
+ str = "x" * i * 100 + "\n"
+ buf = ""
+ ssl.write(str)
+ assert_equal(buf.object_id, ssl.read(str.size, buf).object_id)
+ assert_equal(str, buf)
+ }
+
+ ssl.close
}
end
@@ -113,11 +260,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ctx = OpenSSL::SSL::SSLContext.new
ctx.key = @cli_key
ctx.cert = @cli_cert
-
- server_connect(port, ctx) { |ssl|
- ssl.puts("foo")
- assert_equal("foo\n", ssl.gets)
- }
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+ ssl.sync_close = true
+ ssl.connect
+ ssl.puts("foo")
+ assert_equal("foo\n", ssl.gets)
+ ssl.close
called = nil
ctx = OpenSSL::SSL::SSLContext.new
@@ -125,29 +274,14 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
called = true
[@cli_cert, @cli_key]
}
-
- server_connect(port, ctx) { |ssl|
- assert(called)
- ssl.puts("foo")
- assert_equal("foo\n", ssl.gets)
- }
- }
- end
-
- def test_client_ca
- ctx_proc = Proc.new do |ctx|
- ctx.client_ca = [@ca_cert]
- end
-
- vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
- start_server(PORT, vflag, true, :ctx_proc => ctx_proc){|server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- client_ca_from_server = nil
- ctx.client_cert_cb = Proc.new do |sslconn|
- client_ca_from_server = sslconn.client_ca
- [@cli_cert, @cli_key]
- end
- server_connect(port, ctx) { |ssl| assert_equal([@ca], client_ca_from_server) }
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+ ssl.sync_close = true
+ ssl.connect
+ assert(called)
+ ssl.puts("foo")
+ assert_equal("foo\n", ssl.gets)
+ ssl.close
}
end
@@ -158,13 +292,12 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
ssl.sync_close = true
str = "x" * 1000 + "\n"
- OpenSSL::TestUtils.silent do
- ITERATIONS.times{
- ssl.puts(str)
- assert_equal(str, ssl.gets)
- }
- starttls(ssl)
- end
+ ITERATIONS.times{
+ ssl.puts(str)
+ assert_equal(str, ssl.gets)
+ }
+
+ starttls(ssl)
ITERATIONS.times{
ssl.puts(str)
@@ -232,33 +365,13 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
}
end
- def test_exception_in_verify_callback_is_ignored
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
- sock = TCPSocket.new("127.0.0.1", port)
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.set_params(
- :verify_callback => Proc.new do |preverify_ok, store_ctx|
- store_ctx.error = OpenSSL::X509::V_OK
- raise RuntimeError
- end
- )
- ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
- OpenSSL::TestUtils.silent do
- # SSLError, not RuntimeError
- assert_raise(OpenSSL::SSL::SSLError) { ssl.connect }
- end
- assert_equal(OpenSSL::X509::V_ERR_CERT_REJECTED, ssl.verify_result)
- ssl.close
- }
- end
-
def test_sslctx_set_params
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new
ctx.set_params
assert_equal(OpenSSL::SSL::VERIFY_PEER, ctx.verify_mode)
- assert_equal(OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options], ctx.options)
+ assert_equal(OpenSSL::SSL::OP_ALL, ctx.options)
ciphers = ctx.ciphers
ciphers_versions = ciphers.collect{|_, v, _, _| v }
ciphers_names = ciphers.collect{|v, _, _, _| v }
@@ -274,18 +387,19 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
sslerr = OpenSSL::SSL::SSLError
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
- server_connect(port) { |ssl|
- assert_raise(sslerr){ssl.post_connection_check("localhost.localdomain")}
- assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}
- assert(ssl.post_connection_check("localhost"))
- assert_raise(sslerr){ssl.post_connection_check("foo.example.com")}
-
- cert = ssl.peer_cert
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "localhost.localdomain"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "127.0.0.1"))
- assert(OpenSSL::SSL.verify_certificate_identity(cert, "localhost"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "foo.example.com"))
- }
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock)
+ ssl.connect
+ assert_raise(sslerr){ssl.post_connection_check("localhost.localdomain")}
+ assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}
+ assert(ssl.post_connection_check("localhost"))
+ assert_raise(sslerr){ssl.post_connection_check("foo.example.com")}
+
+ cert = ssl.peer_cert
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "localhost.localdomain"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "127.0.0.1"))
+ assert(OpenSSL::SSL.verify_certificate_identity(cert, "localhost"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "foo.example.com"))
}
now = Time.now
@@ -297,18 +411,19 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
@svr_cert = issue_cert(@svr, @svr_key, 4, now, now+1800, exts,
@ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
- server_connect(port) { |ssl|
- assert(ssl.post_connection_check("localhost.localdomain"))
- assert(ssl.post_connection_check("127.0.0.1"))
- assert_raise(sslerr){ssl.post_connection_check("localhost")}
- assert_raise(sslerr){ssl.post_connection_check("foo.example.com")}
-
- cert = ssl.peer_cert
- assert(OpenSSL::SSL.verify_certificate_identity(cert, "localhost.localdomain"))
- assert(OpenSSL::SSL.verify_certificate_identity(cert, "127.0.0.1"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "localhost"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "foo.example.com"))
- }
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock)
+ ssl.connect
+ assert(ssl.post_connection_check("localhost.localdomain"))
+ assert(ssl.post_connection_check("127.0.0.1"))
+ assert_raise(sslerr){ssl.post_connection_check("localhost")}
+ assert_raise(sslerr){ssl.post_connection_check("foo.example.com")}
+
+ cert = ssl.peer_cert
+ assert(OpenSSL::SSL.verify_certificate_identity(cert, "localhost.localdomain"))
+ assert(OpenSSL::SSL.verify_certificate_identity(cert, "127.0.0.1"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "localhost"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "foo.example.com"))
}
now = Time.now
@@ -319,197 +434,197 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
@svr_cert = issue_cert(@svr, @svr_key, 5, now, now+1800, exts,
@ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
- server_connect(port) { |ssl|
- assert(ssl.post_connection_check("localhost.localdomain"))
- assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}
- assert_raise(sslerr){ssl.post_connection_check("localhost")}
- assert_raise(sslerr){ssl.post_connection_check("foo.example.com")}
- cert = ssl.peer_cert
- assert(OpenSSL::SSL.verify_certificate_identity(cert, "localhost.localdomain"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "127.0.0.1"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "localhost"))
- assert(!OpenSSL::SSL.verify_certificate_identity(cert, "foo.example.com"))
- }
- }
- end
+ sock = TCPSocket.new("127.0.0.1", port)
+ ssl = OpenSSL::SSL::SSLSocket.new(sock)
+ ssl.connect
+ assert(ssl.post_connection_check("localhost.localdomain"))
+ assert_raise(sslerr){ssl.post_connection_check("127.0.0.1")}
+ assert_raise(sslerr){ssl.post_connection_check("localhost")}
+ assert_raise(sslerr){ssl.post_connection_check("foo.example.com")}
+ cert = ssl.peer_cert
+ assert(OpenSSL::SSL.verify_certificate_identity(cert, "localhost.localdomain"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "127.0.0.1"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "localhost"))
+ assert(!OpenSSL::SSL.verify_certificate_identity(cert, "foo.example.com"))
+ }
+ end
+
+ DUMMY_SESSION = <<__EOS__
+-----BEGIN SSL SESSION PARAMETERS-----
+MIIDzQIBAQICAwEEAgA5BCAF219w9ZEV8dNA60cpEGOI34hJtIFbf3bkfzSgMyad
+MQQwyGLbkCxE4OiMLdKKem+pyh8V7ifoP7tCxhdmwoDlJxI1v6nVCjai+FGYuncy
+NNSWoQYCBE4DDWuiAwIBCqOCAo4wggKKMIIBcqADAgECAgECMA0GCSqGSIb3DQEB
+BQUAMD0xEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
+LWxhbmcxCzAJBgNVBAMMAkNBMB4XDTExMDYyMzA5NTQ1MVoXDTExMDYyMzEwMjQ1
+MVowRDETMBEGCgmSJomT8ixkARkWA29yZzEZMBcGCgmSJomT8ixkARkWCXJ1Ynkt
+bGFuZzESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7CxaKPERYHs
+k4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/Q3geLv8Z
+D9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQABoxIwEDAO
+BgNVHQ8BAf8EBAMCBaAwDQYJKoZIhvcNAQEFBQADggEBACj5WhoZ/ODVeHpwgq1d
+8fW/13ICRYHYpv6dzlWihyqclGxbKMlMnaVCPz+4JaVtMz3QB748KJQgL3Llg3R1
+ek+f+n1MBCMfFFsQXJ2gtLB84zD6UCz8aaCWN5/czJCd7xMz7fRLy3TOIW5boXAU
+zIa8EODk+477K1uznHm286ab0Clv+9d304hwmBZgkzLg6+31Of6d6s0E0rwLGiS2
+sOWYg34Y3r4j8BS9Ak4jzpoLY6cJ0QAKCOJCgmjGr4XHpyXMLbicp3ga1uSbwtVO
+gF/gTfpLhJC+y0EQ5x3Ftl88Cq7ZJuLBDMo/TLIfReJMQu/HlrTT7+LwtneSWGmr
+KkSkAgQApQMCAROqgcMEgcAuDkAVfj6QAJMz9yqTzW5wPFyty7CxUEcwKjUqj5UP
+/Yvky1EkRuM/eQfN7ucY+MUvMqv+R8ZSkHPsnjkBN5ChvZXjrUSZKFVjR4eFVz2V
+jismLEJvIFhQh6pqTroRrOjMfTaM5Lwoytr2FTGobN9rnjIRsXeFQW1HLFbXn7Dh
+8uaQkMwIVVSGRB8T7t6z6WIdWruOjCZ6G5ASI5XoqAHwGezhLodZuvJEfsVyCF9y
+j+RBGfCFrrQbBdnkFI/ztgM=
+-----END SSL SESSION PARAMETERS-----
+__EOS__
+
+ def test_session_time
+ sess = OpenSSL::SSL::Session.new(DUMMY_SESSION)
+ sess.time = (now = Time.now)
+ assert_equal(now.to_i, sess.time.to_i)
+ sess.time = 1
+ assert_equal(1, sess.time.to_i)
+ sess.time = 1.2345
+ assert_equal(1, sess.time.to_i)
+ # Can OpenSSL handle t>2038y correctly? Version?
+ sess.time = 2**31 - 1
+ assert_equal(2**31 - 1, sess.time.to_i)
+ end
+
+ def test_session_timeout
+ sess = OpenSSL::SSL::Session.new(DUMMY_SESSION)
+
+ # it is trivial that this is a wrong feature
+ # but necessary to keep it for compatibility.
+ sess.timeout = (now = Time.now)
+ assert_equal(now.to_i, sess.timeout.to_i)
+
+ sess.timeout = 1
+ assert_equal(1, sess.timeout.to_i)
+ sess.timeout = 1.2345
+ assert_equal(1, sess.timeout.to_i)
+ sess.timeout = 2**31 - 1
+ assert_equal(2**31 - 1, sess.timeout.to_i)
+ end
+
+
+ def test_client_session
+ last_session = nil
+ start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
+ 2.times do
+ sock = TCPSocket.new("127.0.0.1", port)
+ # Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
+ # when use default SSLContext. [ruby-dev:36167]
+ ctx = OpenSSL::SSL::SSLContext.new("TLSv1")
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+ ssl.sync_close = true
+ ssl.session = last_session if last_session
+ ssl.connect
- def test_verify_certificate_identity
- [true, false].each do |criticality|
- cert = create_null_byte_SAN_certificate(criticality)
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(cert, 'www.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, "www.example.com\0.evil.com"))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(cert, '192.168.7.255'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, '192.168.7.1'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(cert, '13::17'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(cert, '13:0:0:0:0:0:0:17'))
+ session = ssl.session
+ if last_session
+ assert(ssl.session_reused?)
+
+ if session.respond_to?(:id)
+ assert_equal(session.id, last_session.id)
+ end
+ assert_equal(session.to_pem, last_session.to_pem)
+ assert_equal(session.to_der, last_session.to_der)
+ # Older version of OpenSSL may not be consistent. Look up which versions later.
+ assert_equal(session.to_text, last_session.to_text)
+ else
+ assert(!ssl.session_reused?)
+ end
+ last_session = session
+
+ str = "x" * 100 + "\n"
+ ssl.puts(str)
+ assert_equal(str, ssl.gets)
+
+ ssl.close
+ end
end
end
- def test_verify_hostname
- assert_equal(true, OpenSSL::SSL.verify_hostname("www.example.com", "*.example.com"))
- assert_equal(false, OpenSSL::SSL.verify_hostname("www.subdomain.example.com", "*.example.com"))
- end
+ def test_server_session
+ connections = 0
+ saved_session = nil
- def test_verify_wildcard
- assert_equal(false, OpenSSL::SSL.verify_wildcard("foo", "x*"))
- assert_equal(true, OpenSSL::SSL.verify_wildcard("foo", "foo"))
- assert_equal(true, OpenSSL::SSL.verify_wildcard("foo", "f*"))
- assert_equal(true, OpenSSL::SSL.verify_wildcard("foo", "*"))
- assert_equal(false, OpenSSL::SSL.verify_wildcard("abc*bcd", "abcd"))
- assert_equal(false, OpenSSL::SSL.verify_wildcard("xn--qdk4b9b", "x*"))
- assert_equal(false, OpenSSL::SSL.verify_wildcard("xn--qdk4b9b", "*--qdk4b9b"))
- assert_equal(true, OpenSSL::SSL.verify_wildcard("xn--qdk4b9b", "xn--qdk4b9b"))
- end
+ ctx_proc = Proc.new do |ctx, ssl|
+# add test for session callbacks here
+ end
- # Comments in this test is excerpted from http://tools.ietf.org/html/rfc6125#page-27
- def test_post_connection_check_wildcard_san
- # case-insensitive ASCII comparison
- # RFC 6125, section 6.4.1
- #
- # "..matching of the reference identifier against the presented identifier
- # is performed by comparing the set of domain name labels using a
- # case-insensitive ASCII comparison, as clarified by [DNS-CASE] (e.g.,
- # "WWW.Example.Com" would be lower-cased to "www.example.com" for
- # comparison purposes)
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*.example.com'), 'www.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*.Example.COM'), 'www.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*.example.com'), 'WWW.Example.COM'))
- # 1. The client SHOULD NOT attempt to match a presented identifier in
- # which the wildcard character comprises a label other than the
- # left-most label (e.g., do not match bar.*.example.net).
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:www.*.com'), 'www.example.com'))
- # 2. If the wildcard character is the only character of the left-most
- # label in the presented identifier, the client SHOULD NOT compare
- # against anything but the left-most label of the reference
- # identifier (e.g., *.example.com would match foo.example.com but
- # not bar.foo.example.com or example.com).
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*.example.com'), 'foo.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*.example.com'), 'bar.foo.example.com'))
- # 3. The client MAY match a presented identifier in which the wildcard
- # character is not the only character of the label (e.g.,
- # baz*.example.net and *baz.example.net and b*z.example.net would
- # be taken to match baz1.example.net and foobaz.example.net and
- # buzz.example.net, respectively). ...
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:baz*.example.com'), 'baz1.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*baz.example.com'), 'foobaz.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:b*z.example.com'), 'buzz.example.com'))
- # Section 6.4.3 of RFC6125 states that client should NOT match identifier
- # where wildcard is other than left-most label.
- #
- # Also implicitly mentions the wildcard character only in singular form,
- # and discourages matching against more than one wildcard.
- #
- # See RFC 6125, section 7.2, subitem 2.
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*b*.example.com'), 'abc.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*b*.example.com'), 'ab.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:*b*.example.com'), 'bc.example.com'))
- # ... However, the client SHOULD NOT
- # attempt to match a presented identifier where the wildcard
- # character is embedded within an A-label or U-label [IDNA-DEFS] of
- # an internationalized domain name [IDNA-PROTO].
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:xn*.example.com'), 'xn1ca.example.com'))
- # part of A-label
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:xn--*.example.com'), 'xn--1ca.example.com'))
- # part of U-label
- # dNSName in RFC5280 is an IA5String so U-label should NOT be allowed
- # regardless of wildcard.
- #
- # See Section 7.2 of RFC 5280:
- # IA5String is limited to the set of ASCII characters.
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_san('DNS:á*.example.com'), 'á1.example.com'))
- end
+ server_proc = Proc.new do |ctx, ssl|
+ session = ssl.session
+ stats = ctx.session_cache_stats
+
+ case connections
+ when 0
+ assert_equal(stats[:cache_num], 1)
+ assert_equal(stats[:cache_hits], 0)
+ assert_equal(stats[:cache_misses], 0)
+ assert(!ssl.session_reused?)
+ when 1
+ assert_equal(stats[:cache_num], 1)
+ assert_equal(stats[:cache_hits], 1)
+ assert_equal(stats[:cache_misses], 0)
+ assert(ssl.session_reused?)
+ ctx.session_remove(session)
+ saved_session = session
+ when 2
+ assert_equal(stats[:cache_num], 1)
+ assert_equal(stats[:cache_hits], 1)
+ assert_equal(stats[:cache_misses], 1)
+ assert(!ssl.session_reused?)
+ ctx.session_add(saved_session)
+ when 3
+ assert_equal(stats[:cache_num], 2)
+ assert_equal(stats[:cache_hits], 2)
+ assert_equal(stats[:cache_misses], 1)
+ assert(ssl.session_reused?)
+ ctx.flush_sessions(Time.now + 5000)
+ when 4
+ assert_equal(stats[:cache_num], 1)
+ assert_equal(stats[:cache_hits], 2)
+ assert_equal(stats[:cache_misses], 2)
+ assert(!ssl.session_reused?)
+ ctx.session_add(saved_session)
+ end
+ connections += 1
- def test_post_connection_check_wildcard_cn
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*.example.com'), 'www.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*.Example.COM'), 'www.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*.example.com'), 'WWW.Example.COM'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('www.*.com'), 'www.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*.example.com'), 'foo.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*.example.com'), 'bar.foo.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('baz*.example.com'), 'baz1.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*baz.example.com'), 'foobaz.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('b*z.example.com'), 'buzz.example.com'))
- # Section 6.4.3 of RFC6125 states that client should NOT match identifier
- # where wildcard is other than left-most label.
- #
- # Also implicitly mentions the wildcard character only in singular form,
- # and discourages matching against more than one wildcard.
- #
- # See RFC 6125, section 7.2, subitem 2.
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*b*.example.com'), 'abc.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*b*.example.com'), 'ab.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('*b*.example.com'), 'bc.example.com'))
- assert_equal(true, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('xn*.example.com'), 'xn1ca.example.com'))
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('xn--*.example.com'), 'xn--1ca.example.com'))
- # part of U-label
- # Subject in RFC5280 states case-insensitive ASCII comparison.
- #
- # See Section 7.2 of RFC 5280:
- # IA5String is limited to the set of ASCII characters.
- assert_equal(false, OpenSSL::SSL.verify_certificate_identity(
- create_cert_with_name('á*.example.com'), 'á1.example.com'))
- end
+ readwrite_loop(ctx, ssl)
+ end
- def create_cert_with_san(san)
- ef = OpenSSL::X509::ExtensionFactory.new
- cert = OpenSSL::X509::Certificate.new
- cert.subject = OpenSSL::X509::Name.parse("/DC=some/DC=site/CN=Some Site")
- ext = ef.create_ext('subjectAltName', san)
- cert.add_extension(ext)
- cert
- end
+ first_session = nil
+ start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port|
+ 10.times do |i|
+ sock = TCPSocket.new("127.0.0.1", port)
+ ctx = OpenSSL::SSL::SSLContext.new
+ if defined?(OpenSSL::SSL::OP_NO_TICKET)
+ # disable RFC4507 support
+ ctx.options = OpenSSL::SSL::OP_NO_TICKET
+ end
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+ ssl.sync_close = true
+ ssl.session = first_session if first_session
+ ssl.connect
- def create_cert_with_name(name)
- cert = OpenSSL::X509::Certificate.new
- cert.subject = OpenSSL::X509::Name.new([['DC', 'some'], ['DC', 'site'], ['CN', name]])
- cert
- end
+ session = ssl.session
+ if first_session
+ case i
+ when 1; assert(ssl.session_reused?)
+ when 2; assert(!ssl.session_reused?)
+ when 3; assert(ssl.session_reused?)
+ when 4; assert(!ssl.session_reused?)
+ when 5..10; assert(ssl.session_reused?)
+ end
+ end
+ first_session ||= session
+ str = "x" * 100 + "\n"
+ ssl.puts(str)
+ assert_equal(str, ssl.gets)
- # Create NULL byte SAN certificate
- def create_null_byte_SAN_certificate(critical = false)
- ef = OpenSSL::X509::ExtensionFactory.new
- cert = OpenSSL::X509::Certificate.new
- cert.subject = OpenSSL::X509::Name.parse "/DC=some/DC=site/CN=Some Site"
- ext = ef.create_ext('subjectAltName', 'DNS:placeholder,IP:192.168.7.1,IP:13::17', critical)
- ext_asn1 = OpenSSL::ASN1.decode(ext.to_der)
- san_list_der = ext_asn1.value.reduce(nil) { |memo,val| val.tag == 4 ? val.value : memo }
- san_list_asn1 = OpenSSL::ASN1.decode(san_list_der)
- san_list_asn1.value[0].value = "www.example.com\0.evil.com"
- pos = critical ? 2 : 1
- ext_asn1.value[pos].value = san_list_asn1.to_der
- real_ext = OpenSSL::X509::Extension.new ext_asn1
- cert.add_extension(real_ext)
- cert
+ ssl.close
+ end
+ end
end
def test_tlsext_hostname
@@ -536,289 +651,39 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port|
2.times do |i|
+ sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new
if defined?(OpenSSL::SSL::OP_NO_TICKET)
# disable RFC4507 support
ctx.options = OpenSSL::SSL::OP_NO_TICKET
end
- server_connect(port, ctx) { |ssl|
- ssl.hostname = (i & 1 == 0) ? 'foo.example.com' : 'bar.example.com'
- str = "x" * 100 + "\n"
- ssl.puts(str)
- assert_equal(str, ssl.gets)
- }
- end
- end
- end
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
+ ssl.sync_close = true
+ ssl.hostname = (i & 1 == 0) ? 'foo.example.com' : 'bar.example.com'
+ ssl.connect
+
+ str = "x" * 100 + "\n"
+ ssl.puts(str)
+ assert_equal(str, ssl.gets)
- def test_multibyte_read_write
- #German a umlaut
- auml = [%w{ C3 A4 }.join('')].pack('H*')
- auml.force_encoding(Encoding::UTF_8)
-
- [10, 1000, 100000].each {|i|
- str = nil
- num_written = nil
- server_proc = Proc.new {|ctx, ssl|
- cmp = ssl.read
- raw_size = cmp.size
- cmp.force_encoding(Encoding::UTF_8)
- assert_equal(str, cmp)
- assert_equal(num_written, raw_size)
ssl.close
- }
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :server_proc => server_proc){|server, port|
- server_connect(port) { |ssl|
- str = auml * i
- num_written = ssl.write(str)
- }
- }
- }
+ end
+ end
end
def test_unset_OP_ALL
ctx_proc = Proc.new { |ctx|
- # If OP_DONT_INSERT_EMPTY_FRAGMENTS is not defined, this test is
- # redundant because the default options already are equal to OP_ALL.
- # But it also degrades gracefully, so keep it
- ctx.options = OpenSSL::SSL::OP_ALL
+ ctx.options = OpenSSL::SSL::OP_ALL & ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
}
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc){|server, port|
- server_connect(port) { |ssl|
- ssl.puts('hello')
- assert_equal("hello\n", ssl.gets)
- }
- }
- end
-
- # different OpenSSL versions react differently when facing a SSL/TLS version
- # that has been marked as forbidden, therefore either of these may be raised
- HANDSHAKE_ERRORS = [OpenSSL::SSL::SSLError, Errno::ECONNRESET]
-
-if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1
-
- def test_forbid_ssl_v3_for_client
- ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3 }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.ssl_version = :SSLv3
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end
-
- def test_forbid_ssl_v3_from_server
- start_server_version(:SSLv3) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv3
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end
-
-end
-
-if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_1
-
- def test_tls_v1_1
- start_server_version(:TLSv1_1) { |server, port|
- server_connect(port) { |ssl| assert_equal("TLSv1.1", ssl.ssl_version) }
- }
- end
-
- def test_forbid_tls_v1_for_client
- ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1 }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.ssl_version = :TLSv1
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end
-
- def test_forbid_tls_v1_from_server
- start_server_version(:TLSv1) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end
-
-end
-
-if OpenSSL::SSL::SSLContext::METHODS.include? :TLSv1_2
-
- def test_tls_v1_2
- start_server_version(:TLSv1_2) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.ssl_version = :TLSv1_2_client
- server_connect(port, ctx) { |ssl| assert_equal("TLSv1.2", ssl.ssl_version) }
- }
- end if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000
-
- def test_forbid_tls_v1_1_for_client
- ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1 }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.ssl_version = :TLSv1_1
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end if defined?(OpenSSL::SSL::OP_NO_TLSv1_1)
-
- def test_forbid_tls_v1_1_from_server
- start_server_version(:TLSv1_1) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_1
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end if defined?(OpenSSL::SSL::OP_NO_TLSv1_1)
-
- def test_forbid_tls_v1_2_for_client
- ctx_proc = Proc.new { |ctx| ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2 }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.ssl_version = :TLSv1_2
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end if defined?(OpenSSL::SSL::OP_NO_TLSv1_2)
-
- def test_forbid_tls_v1_2_from_server
- start_server_version(:TLSv1_2) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_TLSv1_2
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end if defined?(OpenSSL::SSL::OP_NO_TLSv1_2)
-
-end
-
- def test_renegotiation_cb
- num_handshakes = 0
- renegotiation_cb = Proc.new { |ssl| num_handshakes += 1 }
- ctx_proc = Proc.new { |ctx| ctx.renegotiation_cb = renegotiation_cb }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- server_connect(port) { |ssl|
- assert_equal(1, num_handshakes)
- }
- }
- end
-
-if OpenSSL::OPENSSL_VERSION_NUMBER > 0x10001000
-
- def test_npn_protocol_selection_ary
- advertised = ["http/1.1", "spdy/2"]
- ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- selector = lambda { |which|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.npn_select_cb = -> (protocols) { protocols.send(which) }
- server_connect(port, ctx) { |ssl|
- assert_equal(advertised.send(which), ssl.npn_protocol)
- }
- }
- selector.call(:first)
- selector.call(:last)
- }
- end
-
- def test_npn_protocol_selection_enum
- advertised = Object.new
- def advertised.each
- yield "http/1.1"
- yield "spdy/2"
- end
- ctx_proc = Proc.new { |ctx| ctx.npn_protocols = advertised }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- selector = lambda { |selected, which|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.npn_select_cb = -> (protocols) { protocols.to_a.send(which) }
- server_connect(port, ctx) { |ssl|
- assert_equal(selected, ssl.npn_protocol)
- }
- }
- selector.call("http/1.1", :first)
- selector.call("spdy/2", :last)
- }
- end
-
- def test_npn_protocol_selection_cancel
- ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.npn_select_cb = -> (protocols) { raise RuntimeError.new }
- assert_raise(RuntimeError) { server_connect(port, ctx) }
- }
- end
-
- def test_npn_advertised_protocol_too_long
- ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["a" * 256] }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.npn_select_cb = -> (protocols) { protocols.first }
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end
-
- def test_npn_selected_protocol_too_long
- ctx_proc = Proc.new { |ctx| ctx.npn_protocols = ["http/1.1"] }
- start_server_version(:SSLv23, ctx_proc) { |server, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.npn_select_cb = -> (protocols) { "a" * 256 }
- assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) }
- }
- end
-
-end
-
- def test_invalid_shutdown_by_gc
- assert_nothing_raised {
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
- 10.times {
- sock = TCPSocket.new("127.0.0.1", port)
- ssl = OpenSSL::SSL::SSLSocket.new(sock)
- GC.start
- ssl.connect
- sock.close
- }
- }
- }
- end
-
- def test_close_after_socket_close
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port|
sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock)
ssl.sync_close = true
ssl.connect
- sock.close
- assert_nothing_raised do
- ssl.close
- end
- }
- end
-
- private
-
- def start_server_version(version, ctx_proc=nil, server_proc=nil, &blk)
- ctx_wrap = Proc.new { |ctx|
- ctx.ssl_version = version
- ctx_proc.call(ctx) if ctx_proc
+ ssl.puts('hello')
+ assert_equal("hello\n", ssl.gets)
+ ssl.close
}
- start_server(
- PORT,
- OpenSSL::SSL::VERIFY_NONE,
- true,
- :ctx_proc => ctx_wrap,
- :server_proc => server_proc,
- &blk
- )
- end
-
- def server_connect(port, ctx=nil)
- sock = TCPSocket.new("127.0.0.1", port)
- ssl = ctx ? OpenSSL::SSL::SSLSocket.new(sock, ctx) : OpenSSL::SSL::SSLSocket.new(sock)
- ssl.sync_close = true
- ssl.connect
- yield ssl
- ensure
- ssl.close
end
end
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
deleted file mode 100644
index 69a3a0d876..0000000000
--- a/test/openssl/test_ssl_session.rb
+++ /dev/null
@@ -1,367 +0,0 @@
-require_relative "utils"
-
-if defined?(OpenSSL)
-
-class OpenSSL::TestSSLSession < OpenSSL::SSLTestCase
- def test_session_equals
- session = OpenSSL::SSL::Session.new <<-SESSION
------BEGIN SSL SESSION PARAMETERS-----
-MIIDFgIBAQICAwEEAgA5BCCY3pW6iTkPoD5SENuztz/gZjhvey6XnHbsxd22k0Ol
-dgQw8uaN3hCRnlhoIKPWInCFzrp/tQsDRFs9jDjc9pwpy/oKHmJdQQMQA1g8FYnO
-gpdVoQYCBE52ikKiBAICASyjggKOMIICijCCAXKgAwIBAgIBAjANBgkqhkiG9w0B
-AQUFADA9MRMwEQYKCZImiZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVi
-eS1sYW5nMQswCQYDVQQDDAJDQTAeFw0xMTA5MTkwMDE4MTBaFw0xMTA5MTkwMDQ4
-MTBaMEQxEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
-LWxhbmcxEjAQBgNVBAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEAy8LEsNRApz7U/j5DoB4XBgO9Z8Atv5y/OVQRp0ag8Tqo1YewsWijxEWB
-7JOATwpBN267U4T1nPZIxxEEO7n/WNa2ws9JWsjah8ssEBFSxZqdXKSLf0N4Hi7/
-GQ/aYoaMCiQ8jA4jegK2FJmXM71uPe+jFN/peeBOpRfyXxRFOYcCAwEAAaMSMBAw
-DgYDVR0PAQH/BAQDAgWgMA0GCSqGSIb3DQEBBQUAA4IBAQARC7GP7InX1t7VEXz2
-I8RI57S0/HSJL4fDIYP3zFpitHX1PZeo+7XuzMilvPjjBo/ky9Jzo8TYiY+N+JEz
-mY/A/zPA4ZsJ7KYj6/FEdIc/vRlS0CvsbClbNjw1jl/PoB2FLr2b3uuBcZEsyZeP
-yq154ijq37Ajf8K5Mi5FgshoP41BPtRPj+VVf61rv1IcEnNWdDCS6DR4XsaNC+zt
-G6AqCqkytIXWRuDw6n6vYLF3A/tn2sldLo7/scY0PMDNbo63O/LTxkDHmPhSkD68
-8m9SsMeTR+RCiDEZWFPVcAH/8mDfi+5k8uN3qS+gOU/PPrmHGgl5ykiSFgqs4v61
-tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM=
------END SSL SESSION PARAMETERS-----
- SESSION
-
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) { |_, port|
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
- ctx.session_id_context = self.object_id.to_s
-
- sock = TCPSocket.new '127.0.0.1', port
- ssl = OpenSSL::SSL::SSLSocket.new sock, ctx
- ssl.session = session
-
- assert_equal session, ssl.session
- sock.close
- }
- end
-
- def test_session
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
- sock = TCPSocket.new("127.0.0.1", port)
- ctx = OpenSSL::SSL::SSLContext.new("TLSv1")
- ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
- ssl.sync_close = true
- ssl.connect
- session = ssl.session
- assert(session == OpenSSL::SSL::Session.new(session.to_pem))
- assert(session == OpenSSL::SSL::Session.new(ssl))
- assert_equal(300, session.timeout)
- session.timeout = 5
- assert_equal(5, session.timeout)
- assert_not_nil(session.time)
- # SSL_SESSION_time keeps long value so we can't keep nsec fragment.
- session.time = t1 = Time.now.to_i
- assert_equal(Time.at(t1), session.time)
- if session.respond_to?(:id)
- assert_not_nil(session.id)
- end
- pem = session.to_pem
- assert_match(/\A-----BEGIN SSL SESSION PARAMETERS-----/, pem)
- assert_match(/-----END SSL SESSION PARAMETERS-----\Z/, pem)
- pem.gsub!(/-----(BEGIN|END) SSL SESSION PARAMETERS-----/, '').gsub!(/[\r\n]+/m, '')
- assert_equal(session.to_der, pem.unpack('m*')[0])
- assert_not_nil(session.to_text)
- ssl.close
- end
- end
-
- DUMMY_SESSION = <<__EOS__
------BEGIN SSL SESSION PARAMETERS-----
-MIIDzQIBAQICAwEEAgA5BCAF219w9ZEV8dNA60cpEGOI34hJtIFbf3bkfzSgMyad
-MQQwyGLbkCxE4OiMLdKKem+pyh8V7ifoP7tCxhdmwoDlJxI1v6nVCjai+FGYuncy
-NNSWoQYCBE4DDWuiAwIBCqOCAo4wggKKMIIBcqADAgECAgECMA0GCSqGSIb3DQEB
-BQUAMD0xEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
-LWxhbmcxCzAJBgNVBAMMAkNBMB4XDTExMDYyMzA5NTQ1MVoXDTExMDYyMzEwMjQ1
-MVowRDETMBEGCgmSJomT8ixkARkWA29yZzEZMBcGCgmSJomT8ixkARkWCXJ1Ynkt
-bGFuZzESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQDLwsSw1ECnPtT+PkOgHhcGA71nwC2/nL85VBGnRqDxOqjVh7CxaKPERYHs
-k4BPCkE3brtThPWc9kjHEQQ7uf9Y1rbCz0layNqHyywQEVLFmp1cpIt/Q3geLv8Z
-D9pihowKJDyMDiN6ArYUmZczvW4976MU3+l54E6lF/JfFEU5hwIDAQABoxIwEDAO
-BgNVHQ8BAf8EBAMCBaAwDQYJKoZIhvcNAQEFBQADggEBACj5WhoZ/ODVeHpwgq1d
-8fW/13ICRYHYpv6dzlWihyqclGxbKMlMnaVCPz+4JaVtMz3QB748KJQgL3Llg3R1
-ek+f+n1MBCMfFFsQXJ2gtLB84zD6UCz8aaCWN5/czJCd7xMz7fRLy3TOIW5boXAU
-zIa8EODk+477K1uznHm286ab0Clv+9d304hwmBZgkzLg6+31Of6d6s0E0rwLGiS2
-sOWYg34Y3r4j8BS9Ak4jzpoLY6cJ0QAKCOJCgmjGr4XHpyXMLbicp3ga1uSbwtVO
-gF/gTfpLhJC+y0EQ5x3Ftl88Cq7ZJuLBDMo/TLIfReJMQu/HlrTT7+LwtneSWGmr
-KkSkAgQApQMCAROqgcMEgcAuDkAVfj6QAJMz9yqTzW5wPFyty7CxUEcwKjUqj5UP
-/Yvky1EkRuM/eQfN7ucY+MUvMqv+R8ZSkHPsnjkBN5ChvZXjrUSZKFVjR4eFVz2V
-jismLEJvIFhQh6pqTroRrOjMfTaM5Lwoytr2FTGobN9rnjIRsXeFQW1HLFbXn7Dh
-8uaQkMwIVVSGRB8T7t6z6WIdWruOjCZ6G5ASI5XoqAHwGezhLodZuvJEfsVyCF9y
-j+RBGfCFrrQbBdnkFI/ztgM=
------END SSL SESSION PARAMETERS-----
-__EOS__
-
- DUMMY_SESSION_NO_EXT = <<-__EOS__
------BEGIN SSL SESSION PARAMETERS-----
-MIIDCAIBAQICAwAEAgA5BCDyAW7rcpzMjDSosH+Tv6sukymeqgq3xQVVMez628A+
-lAQw9TrKzrIqlHEh6ltuQaqv/Aq83AmaAlogYktZgXAjOGnhX7ifJDNLMuCfQq53
-hPAaoQYCBE4iDeeiBAICASyjggKOMIICijCCAXKgAwIBAgIBAjANBgkqhkiG9w0B
-AQUFADA9MRMwEQYKCZImiZPyLGQBGRYDb3JnMRkwFwYKCZImiZPyLGQBGRYJcnVi
-eS1sYW5nMQswCQYDVQQDDAJDQTAeFw0xMTA3MTYyMjE3MTFaFw0xMTA3MTYyMjQ3
-MTFaMEQxEzARBgoJkiaJk/IsZAEZFgNvcmcxGTAXBgoJkiaJk/IsZAEZFglydWJ5
-LWxhbmcxEjAQBgNVBAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEAy8LEsNRApz7U/j5DoB4XBgO9Z8Atv5y/OVQRp0ag8Tqo1YewsWijxEWB
-7JOATwpBN267U4T1nPZIxxEEO7n/WNa2ws9JWsjah8ssEBFSxZqdXKSLf0N4Hi7/
-GQ/aYoaMCiQ8jA4jegK2FJmXM71uPe+jFN/peeBOpRfyXxRFOYcCAwEAAaMSMBAw
-DgYDVR0PAQH/BAQDAgWgMA0GCSqGSIb3DQEBBQUAA4IBAQA3TRzABRG3kz8jEEYr
-tDQqXgsxwTsLhTT5d1yF0D8uFw+y15hJAJnh6GJHjqhWBrF4zNoTApFo+4iIL6g3
-q9C3mUsxIVAHx41DwZBh/FI7J4FqlAoGOguu7892CNVY3ZZjc3AXMTdKjcNoWPzz
-FCdj5fNT24JMMe+ZdGZK97ChahJsdn/6B3j6ze9NK9mfYEbiJhejGTPLOFVHJCGR
-KYYZ3ZcKhLDr9ql4d7cCo1gBtemrmFQGPui7GttNEqmXqUKvV8mYoa8farf5i7T4
-L6a/gp2cVZTaDIS1HjbJsA/Ag7AajZqiN6LfqShNUVsrMZ+5CoV8EkBDTZPJ9MSr
-a3EqpAIEAKUDAgET
------END SSL SESSION PARAMETERS-----
-__EOS__
-
-
- def test_session_time
- sess = OpenSSL::SSL::Session.new(DUMMY_SESSION_NO_EXT)
- sess.time = (now = Time.now)
- assert_equal(now.to_i, sess.time.to_i)
- sess.time = 1
- assert_equal(1, sess.time.to_i)
- sess.time = 1.2345
- assert_equal(1, sess.time.to_i)
- # Can OpenSSL handle t>2038y correctly? Version?
- sess.time = 2**31 - 1
- assert_equal(2**31 - 1, sess.time.to_i)
- end
-
- def test_session_timeout
- sess = OpenSSL::SSL::Session.new(DUMMY_SESSION_NO_EXT)
- assert_raise(TypeError) do
- sess.timeout = Time.now
- end
- sess.timeout = 1
- assert_equal(1, sess.timeout.to_i)
- sess.timeout = 1.2345
- assert_equal(1, sess.timeout.to_i)
- sess.timeout = 2**31 - 1
- assert_equal(2**31 - 1, sess.timeout.to_i)
- end
-
- def test_session_exts_read
- assert(OpenSSL::SSL::Session.new(DUMMY_SESSION))
- end if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x009080bf
-
- def test_client_session
- last_session = nil
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
- 2.times do
- sock = TCPSocket.new("127.0.0.1", port)
- # Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
- # when use default SSLContext. [ruby-dev:36167]
- ctx = OpenSSL::SSL::SSLContext.new("TLSv1")
- ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
- ssl.sync_close = true
- ssl.session = last_session if last_session
- ssl.connect
-
- session = ssl.session
- if last_session
- assert(ssl.session_reused?)
-
- if session.respond_to?(:id)
- assert_equal(session.id, last_session.id)
- end
- assert_equal(session.to_pem, last_session.to_pem)
- assert_equal(session.to_der, last_session.to_der)
- # Older version of OpenSSL may not be consistent. Look up which versions later.
- assert_equal(session.to_text, last_session.to_text)
- else
- assert(!ssl.session_reused?)
- end
- last_session = session
-
- str = "x" * 100 + "\n"
- ssl.puts(str)
- assert_equal(str, ssl.gets)
-
- ssl.close
- end
- end
- end
-
- def test_server_session
- connections = 0
- saved_session = nil
-
- ctx_proc = Proc.new do |ctx, ssl|
-# add test for session callbacks here
- end
-
- server_proc = Proc.new do |ctx, ssl|
- session = ssl.session
- stats = ctx.session_cache_stats
-
- case connections
- when 0
- assert_equal(stats[:cache_num], 1)
- assert_equal(stats[:cache_hits], 0)
- assert_equal(stats[:cache_misses], 0)
- assert(!ssl.session_reused?)
- when 1
- assert_equal(stats[:cache_num], 1)
- assert_equal(stats[:cache_hits], 1)
- assert_equal(stats[:cache_misses], 0)
- assert(ssl.session_reused?)
- ctx.session_remove(session)
- saved_session = session
- when 2
- assert_equal(stats[:cache_num], 1)
- assert_equal(stats[:cache_hits], 1)
- assert_equal(stats[:cache_misses], 1)
- assert(!ssl.session_reused?)
- ctx.session_add(saved_session)
- when 3
- assert_equal(stats[:cache_num], 2)
- assert_equal(stats[:cache_hits], 2)
- assert_equal(stats[:cache_misses], 1)
- assert(ssl.session_reused?)
- ctx.flush_sessions(Time.now + 5000)
- when 4
- assert_equal(stats[:cache_num], 1)
- assert_equal(stats[:cache_hits], 2)
- assert_equal(stats[:cache_misses], 2)
- assert(!ssl.session_reused?)
- ctx.session_add(saved_session)
- end
- connections += 1
-
- readwrite_loop(ctx, ssl)
- end
-
- first_session = nil
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port|
- 10.times do |i|
- sock = TCPSocket.new("127.0.0.1", port)
- ctx = OpenSSL::SSL::SSLContext.new
- if defined?(OpenSSL::SSL::OP_NO_TICKET)
- # disable RFC4507 support
- ctx.options = OpenSSL::SSL::OP_NO_TICKET
- end
- ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
- ssl.sync_close = true
- ssl.session = first_session if first_session
- ssl.connect
-
- session = ssl.session
- if first_session
- case i
- when 1; assert(ssl.session_reused?)
- when 2; assert(!ssl.session_reused?)
- when 3; assert(ssl.session_reused?)
- when 4; assert(!ssl.session_reused?)
- when 5..10; assert(ssl.session_reused?)
- end
- end
- first_session ||= session
-
- str = "x" * 100 + "\n"
- ssl.puts(str)
- assert_equal(str, ssl.gets)
-
- ssl.close
- end
- end
- end
-
- def test_ctx_client_session_cb
- called = {}
- ctx = OpenSSL::SSL::SSLContext.new("SSLv3")
- ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT
-
- ctx.session_new_cb = lambda { |ary|
- sock, sess = ary
- called[:new] = [sock, sess]
- }
-
- ctx.session_remove_cb = lambda { |ary|
- ctx, sess = ary
- called[:remove] = [ctx, sess]
- # any resulting value is OK (ignored)
- }
-
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
- sock = TCPSocket.new("127.0.0.1", port)
- ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
- ssl.sync_close = true
- ssl.connect
- assert_equal(1, ctx.session_cache_stats[:cache_num])
- assert_equal(1, ctx.session_cache_stats[:connect_good])
- assert_equal([ssl, ssl.session], called[:new])
- assert(ctx.session_remove(ssl.session))
- assert(!ctx.session_remove(ssl.session))
- assert_equal([ctx, ssl.session], called[:remove])
- ssl.close
- end
- end
-
- def test_ctx_server_session_cb
- called = {}
-
- ctx_proc = Proc.new { |ctx, ssl|
- ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER
- last_server_session = nil
-
- # get_cb is called whenever a client proposed to resume a session but
- # the session could not be found in the internal session cache.
- ctx.session_get_cb = lambda { |ary|
- sess, data = ary
- if last_server_session
- called[:get2] = [sess, data]
- last_server_session
- else
- called[:get1] = [sess, data]
- last_server_session = sess
- nil
- end
- }
-
- ctx.session_new_cb = lambda { |ary|
- sock, sess = ary
- called[:new] = [sock, sess]
- # SSL server doesn't cache sessions so get_cb is called next time.
- ctx.session_remove(sess)
- }
-
- ctx.session_remove_cb = lambda { |ary|
- ctx, sess = ary
- called[:remove] = [ctx, sess]
- }
- }
-
- server_proc = Proc.new { |c, ssl|
- ssl.session
- c.session_cache_stats
- readwrite_loop(c, ssl)
- }
- start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port|
- last_client_session = nil
- 3.times do
- sock = TCPSocket.new("127.0.0.1", port)
- ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new("SSLv3"))
- ssl.sync_close = true
- ssl.session = last_client_session if last_client_session
- ssl.connect
- last_client_session = ssl.session
- ssl.close
- timeout(5) do
- Thread.pass until called.key?(:new)
- assert(called.delete(:new))
- Thread.pass until called.key?(:remove)
- assert(called.delete(:remove))
- end
- end
- end
- assert(called[:get1])
- assert(called[:get2])
- end
-end
-
-end
diff --git a/test/openssl/test_x509cert.rb b/test/openssl/test_x509cert.rb
index dd5751eb48..48bab1715a 100644
--- a/test/openssl/test_x509cert.rb
+++ b/test/openssl/test_x509cert.rb
@@ -1,4 +1,9 @@
-require_relative "utils"
+begin
+ require "openssl"
+ require_relative "utils"
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
@@ -38,10 +43,9 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
]
sha1 = OpenSSL::Digest::SHA1.new
- dsa_digest = OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new
-
+ dss1 = OpenSSL::Digest::DSS1.new
[
- [@rsa1024, sha1], [@rsa2048, sha1], [@dsa256, dsa_digest], [@dsa512, dsa_digest]
+ [@rsa1024, sha1], [@rsa2048, sha1], [@dsa256, dss1], [@dsa512, dss1],
].each{|pk, digest|
cert = issue_cert(@ca, pk, 1, Time.now, Time.now+3600, exts,
nil, nil, digest)
@@ -146,7 +150,7 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
assert_equal(false, cert.verify(@rsa2048))
cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
+ nil, nil, OpenSSL::Digest::DSS1.new)
assert_equal(false, certificate_error_returns_false { cert.verify(@rsa1024) })
assert_equal(false, certificate_error_returns_false { cert.verify(@rsa2048) })
assert_equal(false, cert.verify(@dsa256))
@@ -154,61 +158,18 @@ class OpenSSL::TestX509Certificate < Test::Unit::TestCase
cert.not_after = Time.now
assert_equal(false, cert.verify(@dsa512))
- begin
+ assert_raise(OpenSSL::X509::CertificateError){
cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
nil, nil, OpenSSL::Digest::DSS1.new)
- assert_equal(false, cert.verify(@rsa1024))
- assert_equal(true, cert.verify(@rsa2048))
- assert_equal(false, certificate_error_returns_false { cert.verify(@dsa256) })
- assert_equal(false, certificate_error_returns_false { cert.verify(@dsa512) })
- cert.subject = @ee1
- assert_equal(false, cert.verify(@rsa2048))
- rescue OpenSSL::X509::CertificateError
- end
-
+ }
assert_raise(OpenSSL::X509::CertificateError){
- issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::Digest::MD5.new)
+ cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
+ nil, nil, OpenSSL::Digest::MD5.new)
}
end
-
- def test_dsig_algorithm_mismatch
- assert_raise(OpenSSL::X509::CertificateError) do
- issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::Digest::DSS1.new)
- end if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10001000 # [ruby-core:42949]
-
- assert_raise(OpenSSL::X509::CertificateError) do
- issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::Digest::MD5.new)
- end
- end
-
- def test_dsa_with_sha2
- begin
- cert = issue_cert(@ca, @dsa256, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::Digest::SHA256.new)
- assert_equal("dsa_with_SHA256", cert.signature_algorithm)
- rescue OpenSSL::X509::CertificateError
- # dsa_with_sha2 not supported. skip following test.
- return
- end
- # TODO: need more tests for dsa + sha2
-
- # SHA1 is allowed from OpenSSL 1.0.0 (0.9.8 requires DSS1)
- cert = issue_cert(@ca, @dsa256, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::Digest::SHA1.new)
- assert_equal("dsaWithSHA1", cert.signature_algorithm)
- end if defined?(OpenSSL::Digest::SHA256)
-
- def test_check_private_key
- cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::Digest::SHA1.new)
- assert_equal(true, cert.check_private_key(@rsa2048))
- end
-
+
private
-
+
def certificate_error_returns_false
yield
rescue OpenSSL::X509::CertificateError
diff --git a/test/openssl/test_x509crl.rb b/test/openssl/test_x509crl.rb
index d5024751d2..61a8de5723 100644
--- a/test/openssl/test_x509crl.rb
+++ b/test/openssl/test_x509crl.rb
@@ -1,4 +1,9 @@
-require_relative "utils"
+begin
+ require "openssl"
+ require_relative "utils"
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
@@ -101,6 +106,7 @@ class OpenSSL::TestX509CRL < Test::Unit::TestCase
assert_equal(false, revoked[3].extensions[0].critical?)
assert_equal(false, revoked[4].extensions[0].critical?)
+ crl = OpenSSL::X509::CRL.new(crl.to_der)
assert_equal("Key Compromise", revoked[0].extensions[0].value)
assert_equal("CA Compromise", revoked[1].extensions[0].value)
assert_equal("Affiliation Changed", revoked[2].extensions[0].value)
@@ -197,9 +203,9 @@ class OpenSSL::TestX509CRL < Test::Unit::TestCase
assert_equal(false, crl.verify(@rsa2048))
cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [],
- nil, nil, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
+ nil, nil, OpenSSL::Digest::DSS1.new)
crl = issue_crl([], 1, Time.now, Time.now+1600, [],
- cert, @dsa512, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
+ cert, @dsa512, OpenSSL::Digest::DSS1.new)
assert_equal(false, crl_error_returns_false { crl.verify(@rsa1024) })
assert_equal(false, crl_error_returns_false { crl.verify(@rsa2048) })
assert_equal(false, crl.verify(@dsa256))
@@ -207,9 +213,9 @@ class OpenSSL::TestX509CRL < Test::Unit::TestCase
crl.version = 0
assert_equal(false, crl.verify(@dsa512))
end
-
+
private
-
+
def crl_error_returns_false
yield
rescue OpenSSL::X509::CRLError
diff --git a/test/openssl/test_x509ext.rb b/test/openssl/test_x509ext.rb
index 89b45c728f..d43bbd6bd3 100644
--- a/test/openssl/test_x509ext.rb
+++ b/test/openssl/test_x509ext.rb
@@ -1,4 +1,9 @@
-require_relative 'utils'
+begin
+ require "openssl"
+ require File.join(File.dirname(__FILE__), "utils.rb")
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
diff --git a/test/openssl/test_x509name.rb b/test/openssl/test_x509name.rb
index de35fc303a..fb5a1ae4ff 100644
--- a/test/openssl/test_x509name.rb
+++ b/test/openssl/test_x509name.rb
@@ -1,5 +1,8 @@
-# coding: US-ASCII
-require_relative 'utils'
+begin
+ require "openssl"
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
@@ -101,58 +104,6 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
assert_equal(name_from_der.to_der, name.to_der)
end
- def test_unrecognized_oid
- dn = [ ["1.2.3.4.5.6.7.8.9.7.5.3.1", "Unknown OID 1"],
- ["1.1.2.3.5.8.13.21.34", "Unknown OID 2"],
- ["C", "US"],
- ["postalCode", "60602"],
- ["ST", "Illinois"],
- ["L", "Chicago"],
- #["street", "123 Fake St"],
- ["O", "Some Company LLC"],
- ["CN", "mydomain.com"] ]
-
- name = OpenSSL::X509::Name.new(dn)
- ary = name.to_a
- #assert_equal("/1.2.3.4.5.6.7.8.9.7.5.3.1=Unknown OID 1/1.1.2.3.5.8.13.21.34=Unknown OID 2/C=US/postalCode=60602/ST=Illinois/L=Chicago/street=123 Fake St/O=Some Company LLC/CN=mydomain.com", name.to_s)
- assert_equal("/1.2.3.4.5.6.7.8.9.7.5.3.1=Unknown OID 1/1.1.2.3.5.8.13.21.34=Unknown OID 2/C=US/postalCode=60602/ST=Illinois/L=Chicago/O=Some Company LLC/CN=mydomain.com", name.to_s)
- assert_equal("1.2.3.4.5.6.7.8.9.7.5.3.1", ary[0][0])
- assert_equal("1.1.2.3.5.8.13.21.34", ary[1][0])
- assert_equal("C", ary[2][0])
- assert_equal("postalCode", ary[3][0])
- assert_equal("ST", ary[4][0])
- assert_equal("L", ary[5][0])
- #assert_equal("street", ary[6][0])
- assert_equal("O", ary[6][0])
- assert_equal("CN", ary[7][0])
- assert_equal("Unknown OID 1", ary[0][1])
- assert_equal("Unknown OID 2", ary[1][1])
- assert_equal("US", ary[2][1])
- assert_equal("60602", ary[3][1])
- assert_equal("Illinois", ary[4][1])
- assert_equal("Chicago", ary[5][1])
- #assert_equal("123 Fake St", ary[6][1])
- assert_equal("Some Company LLC", ary[6][1])
- assert_equal("mydomain.com", ary[7][1])
- end
-
- def test_unrecognized_oid_parse_encode_equality
- dn = [ ["1.2.3.4.5.6.7.8.9.7.5.3.2", "Unknown OID1"],
- ["1.1.2.3.5.8.13.21.35", "Unknown OID2"],
- ["C", "US"],
- ["postalCode", "60602"],
- ["ST", "Illinois"],
- ["L", "Chicago"],
- #["street", "123 Fake St"],
- ["O", "Some Company LLC"],
- ["CN", "mydomain.com"] ]
-
- name1 = OpenSSL::X509::Name.new(dn)
- name2 = OpenSSL::X509::Name.parse(name1.to_s)
- assert_equal(name1.to_s, name2.to_s)
- assert_equal(name1.to_a, name2.to_a)
- end
-
def test_s_parse
dn = "/DC=org/DC=ruby-lang/CN=www.ruby-lang.org"
name = OpenSSL::X509::Name.parse(dn)
@@ -169,14 +120,14 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
assert_equal(OpenSSL::ASN1::UTF8STRING, ary[2][2])
dn2 = "DC=org, DC=ruby-lang, CN=www.ruby-lang.org"
- name = OpenSSL::X509::Name.parse(dn2)
+ name = OpenSSL::X509::Name.parse(dn)
ary = name.to_a
assert_equal(dn, name.to_s)
assert_equal("org", ary[0][1])
assert_equal("ruby-lang", ary[1][1])
assert_equal("www.ruby-lang.org", ary[2][1])
- name = OpenSSL::X509::Name.parse(dn2, @obj_type_tmpl)
+ name = OpenSSL::X509::Name.parse(dn, @obj_type_tmpl)
ary = name.to_a
assert_equal(OpenSSL::ASN1::IA5STRING, ary[0][2])
assert_equal(OpenSSL::ASN1::IA5STRING, ary[1][2])
@@ -310,58 +261,6 @@ class OpenSSL::TestX509Name < Test::Unit::TestCase
assert_equal(OpenSSL::ASN1::IA5STRING, ary[3][2])
assert_equal(OpenSSL::ASN1::PRINTABLESTRING, ary[4][2])
end
-
- def test_add_entry_street
- return if OpenSSL::OPENSSL_VERSION_NUMBER < 0x009080df # 0.9.8m
- # openssl/crypto/objects/obj_mac.h 1.83
- dn = [
- ["DC", "org"],
- ["DC", "ruby-lang"],
- ["CN", "GOTOU Yuuzou"],
- ["emailAddress", "gotoyuzo@ruby-lang.org"],
- ["serialNumber", "123"],
- ["street", "Namiki"],
- ]
- name = OpenSSL::X509::Name.new
- dn.each{|attr| name.add_entry(*attr) }
- ary = name.to_a
- assert_equal("/DC=org/DC=ruby-lang/CN=GOTOU Yuuzou/emailAddress=gotoyuzo@ruby-lang.org/serialNumber=123/street=Namiki", name.to_s)
- assert_equal("Namiki", ary[5][1])
- end
-
- def test_equals2
- n1 = OpenSSL::X509::Name.parse 'CN=a'
- n2 = OpenSSL::X509::Name.parse 'CN=a'
-
- assert_equal n1, n2
- end
-
- def test_spaceship
- n1 = OpenSSL::X509::Name.parse 'CN=a'
- n2 = OpenSSL::X509::Name.parse 'CN=b'
-
- assert_equal(-1, n1 <=> n2)
- end
-
- def name_hash(name)
- # OpenSSL 1.0.0 uses SHA1 for canonical encoding (not just a der) of
- # X509Name for X509_NAME_hash.
- name.respond_to?(:hash_old) ? name.hash_old : name.hash
- end
-
- def test_hash
- dn = "/DC=org/DC=ruby-lang/CN=www.ruby-lang.org"
- name = OpenSSL::X509::Name.parse(dn)
- d = Digest::MD5.digest(name.to_der)
- expected = (d[0].ord & 0xff) | (d[1].ord & 0xff) << 8 | (d[2].ord & 0xff) << 16 | (d[3].ord & 0xff) << 24
- assert_equal(expected, name_hash(name))
- #
- dn = "/DC=org/DC=ruby-lang/CN=baz.ruby-lang.org"
- name = OpenSSL::X509::Name.parse(dn)
- d = Digest::MD5.digest(name.to_der)
- expected = (d[0].ord & 0xff) | (d[1].ord & 0xff) << 8 | (d[2].ord & 0xff) << 16 | (d[3].ord & 0xff) << 24
- assert_equal(expected, name_hash(name))
- end
end
end
diff --git a/test/openssl/test_x509req.rb b/test/openssl/test_x509req.rb
index e6c89c5e81..f53408f696 100644
--- a/test/openssl/test_x509req.rb
+++ b/test/openssl/test_x509req.rb
@@ -1,4 +1,9 @@
-require_relative "utils"
+begin
+ require "openssl"
+ require_relative "utils"
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
@@ -26,7 +31,7 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
req = OpenSSL::X509::Request.new(req.to_der)
assert_equal(@rsa1024.public_key.to_der, req.public_key.to_der)
- req = issue_csr(0, @dn, @dsa512, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
+ req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest::DSS1.new)
assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
req = OpenSSL::X509::Request.new(req.to_der)
assert_equal(@dsa512.public_key.to_der, req.public_key.to_der)
@@ -115,7 +120,7 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
req.subject = OpenSSL::X509::Name.parse("/C=JP/CN=FooBar")
assert_equal(false, req.verify(@rsa2048))
- req = issue_csr(0, @dn, @dsa512, OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new)
+ req = issue_csr(0, @dn, @dsa512, OpenSSL::Digest::DSS1.new)
assert_equal(false, request_error_returns_false { req.verify(@rsa1024) })
assert_equal(false, request_error_returns_false { req.verify(@rsa2048) })
assert_equal(false, req.verify(@dsa256))
@@ -123,23 +128,14 @@ class OpenSSL::TestX509Request < Test::Unit::TestCase
req.public_key = @rsa1024.public_key
assert_equal(false, req.verify(@dsa512))
- begin
- req = issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new)
- assert_equal(true, req.verify(@rsa1024))
- assert_equal(false, req.verify(@rsa2048))
- assert_equal(false, request_error_returns_false { req.verify(@dsa256) })
- assert_equal(false, request_error_returns_false { req.verify(@dsa512) })
- req.version = 1
- assert_equal(false, req.verify(@rsa1024))
- rescue OpenSSL::X509::RequestError
- end
-
+ assert_raise(OpenSSL::X509::RequestError){
+ issue_csr(0, @dn, @rsa1024, OpenSSL::Digest::DSS1.new) }
assert_raise(OpenSSL::X509::RequestError){
issue_csr(0, @dn, @dsa512, OpenSSL::Digest::MD5.new) }
end
-
+
private
-
+
def request_error_returns_false
yield
rescue OpenSSL::X509::RequestError
diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb
index ff820c1c58..238ee90030 100644
--- a/test/openssl/test_x509store.rb
+++ b/test/openssl/test_x509store.rb
@@ -1,4 +1,9 @@
-require_relative "utils"
+begin
+ require "openssl"
+ require_relative "utils"
+rescue LoadError
+end
+require "test/unit"
if defined?(OpenSSL)
@@ -17,14 +22,6 @@ class OpenSSL::TestX509Store < Test::Unit::TestCase
def teardown
end
- def test_nosegv_on_cleanup
- cert = OpenSSL::X509::Certificate.new
- store = OpenSSL::X509::Store.new
- ctx = OpenSSL::X509::StoreContext.new(store, cert, [])
- ctx.cleanup
- ctx.verify
- end
-
def issue_cert(*args)
OpenSSL::TestUtils.issue_cert(*args)
end
@@ -212,17 +209,9 @@ class OpenSSL::TestX509Store < Test::Unit::TestCase
crl2 = issue_crl(revoke_info, 2, now+1800, now+3600, [],
ca1_cert, @rsa2048, OpenSSL::Digest::SHA1.new)
store.add_crl(crl1)
- if /0\.9\.8.*-rhel/ =~ OpenSSL::OPENSSL_VERSION
- # RedHat is distributing a patched version of OpenSSL that allows
- # multiple CRL for a key (multi-crl.patch)
- assert_nothing_raised do
- store.add_crl(crl2) # add CRL issued by same CA twice.
- end
- else
- assert_raise(OpenSSL::X509::StoreError){
- store.add_crl(crl2) # add CRL issued by same CA twice.
- }
- end
+ assert_raise(OpenSSL::X509::StoreError){
+ store.add_crl(crl2) # add CRL issued by same CA twice.
+ }
end
end
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index ba9714b3fc..2edb7b0c99 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -1,18 +1,5 @@
-begin
- require "openssl"
-
- # Disable FIPS mode for tests for installations
- # where FIPS mode would be enabled by default.
- # Has no effect on all other installations.
- OpenSSL.fips_mode=false
-rescue LoadError
-end
+require "openssl"
require "test/unit"
-require "digest/md5"
-require 'tempfile'
-require "rbconfig"
-require "socket"
-require_relative '../ruby/envutil'
module OpenSSL::TestUtils
TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_
@@ -85,39 +72,6 @@ Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
-----END DSA PRIVATE KEY-----
_end_of_pem_
-if defined?(OpenSSL::PKey::EC)
-
- TEST_KEY_EC_P256V1 = OpenSSL::PKey::EC.new <<-_end_of_pem_
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIID49FDqcf1O1eO8saTgG70UbXQw9Fqwseliit2aWhH1oAoGCCqGSM49
-AwEHoUQDQgAEFglk2c+oVUIKQ64eZG9bhLNPWB7lSZ/ArK41eGy5wAzU/0G51Xtt
-CeBUl+MahZtn9fO1JKdF4qJmS39dXnpENg==
------END EC PRIVATE KEY-----
- _end_of_pem_
-
-end
-
- TEST_KEY_DH512_PUB = OpenSSL::PKey::DH.new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MEYCQQDmWXGPqk76sKw/edIOdhAQD4XzjJ+AR/PTk2qzaGs+u4oND2yU5D2NN4wr
-aPgwHyJBiK1/ebK3tYcrSKrOoRyrAgEC
------END DH PARAMETERS-----
- _end_of_pem_
-
- TEST_KEY_DH1024 = OpenSSL::PKey::DH.new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAKnKQ8MNK6nYZzLrrcuTsLxuiJGXoOO5gT+tljOTbHBuiktdMTITzIY0
-pFxIvjG05D7HoBZQfrR0c92NGWPkAiCkhQKB8JCbPVzwNLDy6DZ0pmofDKrEsYHG
-AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
------END DH PARAMETERS-----
- _end_of_pem_
-
- TEST_KEY_DH1024.priv_key = OpenSSL::BN.new("48561834C67E65FFD2A9B47F41E5E78FDC95C387428FDB1E4B0188B64D1643C3A8D3455B945B7E8C4D166010C7C2CE23BFB9BEF43D0348FE7FA5284B0225E7FE1537546D114E3D8A4411B9B9351AB451E1A358F50ED61B1F00DA29336EEBBD649980AC86D76AF8BBB065298C2052672EEF3EF13AB47A15275FC2836F3AC74CEA", 16)
-
- DSA_SIGNATURE_DIGEST = OpenSSL::OPENSSL_VERSION_NUMBER > 0x10000000 ?
- OpenSSL::Digest::SHA1 :
- OpenSSL::Digest::DSS1
-
module_function
def issue_cert(dn, key, serial, not_before, not_after, extensions,
@@ -178,154 +132,4 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC
pkvalue = publickey.value
OpenSSL::Digest::SHA1.hexdigest(pkvalue).scan(/../).join(":").upcase
end
-
- def silent
- begin
- back, $VERBOSE = $VERBOSE, nil
- yield
- ensure
- $VERBOSE = back
- end
- end
-
- class OpenSSL::SSLTestCase < Test::Unit::TestCase
- RUBY = EnvUtil.rubybin
- SSL_SERVER = File.join(File.dirname(__FILE__), "ssl_server.rb")
- PORT = 20443
- ITERATIONS = ($0 == __FILE__) ? 100 : 10
-
- def setup
- @ca_key = OpenSSL::TestUtils::TEST_KEY_RSA2048
- @svr_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
- @cli_key = OpenSSL::TestUtils::TEST_KEY_DSA256
- @ca = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=CA")
- @svr = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
- @cli = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=localhost")
- now = Time.at(Time.now.to_i)
- ca_exts = [
- ["basicConstraints","CA:TRUE",true],
- ["keyUsage","cRLSign,keyCertSign",true],
- ]
- ee_exts = [
- ["keyUsage","keyEncipherment,digitalSignature",true],
- ]
- @ca_cert = issue_cert(@ca, @ca_key, 1, now, now+3600, ca_exts, nil, nil, OpenSSL::Digest::SHA1.new)
- @svr_cert = issue_cert(@svr, @svr_key, 2, now, now+1800, ee_exts, @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
- @cli_cert = issue_cert(@cli, @cli_key, 3, now, now+1800, ee_exts, @ca_cert, @ca_key, OpenSSL::Digest::SHA1.new)
- @server = nil
- end
-
- def teardown
- end
-
- def issue_cert(*arg)
- OpenSSL::TestUtils.issue_cert(*arg)
- end
-
- def issue_crl(*arg)
- OpenSSL::TestUtils.issue_crl(*arg)
- end
-
- def readwrite_loop(ctx, ssl)
- while line = ssl.gets
- if line =~ /^STARTTLS$/
- ssl.accept
- next
- end
- ssl.write(line)
- end
- rescue OpenSSL::SSL::SSLError
- rescue IOError
- ensure
- ssl.close rescue nil
- end
-
- def server_loop(ctx, ssls, server_proc)
- loop do
- ssl = nil
- begin
- ssl = ssls.accept
- rescue OpenSSL::SSL::SSLError
- retry
- end
-
- Thread.start do
- Thread.current.abort_on_exception = true
- server_proc.call(ctx, ssl)
- end
- end
- rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK, Errno::ECONNRESET
- end
-
- def start_server(port0, verify_mode, start_immediately, args = {}, &block)
- ctx_proc = args[:ctx_proc]
- server_proc = args[:server_proc]
- server_proc ||= method(:readwrite_loop)
-
- store = OpenSSL::X509::Store.new
- store.add_cert(@ca_cert)
- store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
- ctx = OpenSSL::SSL::SSLContext.new
- ctx.cert_store = store
- #ctx.extra_chain_cert = [ ca_cert ]
- ctx.cert = @svr_cert
- ctx.key = @svr_key
- ctx.tmp_dh_callback = proc { OpenSSL::TestUtils::TEST_KEY_DH1024 }
- ctx.verify_mode = verify_mode
- ctx_proc.call(ctx) if ctx_proc
-
- Socket.do_not_reverse_lookup = true
- tcps = nil
- port = port0
- begin
- tcps = TCPServer.new("127.0.0.1", port)
- rescue Errno::EADDRINUSE
- port += 1
- retry
- end
-
- ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
- ssls.start_immediately = start_immediately
-
- begin
- server = Thread.new do
- Thread.current.abort_on_exception = true
- server_loop(ctx, ssls, server_proc)
- end
-
- $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, $$, port) if $DEBUG
-
- block.call(server, port.to_i)
- ensure
- begin
- begin
- tcps.shutdown
- rescue Errno::ENOTCONN
- # when `Errno::ENOTCONN: Socket is not connected' on some platforms,
- # call #close instead of #shutdown.
- tcps.close
- tcps = nil
- end if (tcps)
- if (server)
- server.join(5)
- if server.alive?
- server.kill
- server.join
- flunk("TCPServer was closed and SSLServer is still alive") unless $!
- end
- end
- ensure
- tcps.close if (tcps)
- end
- end
- end
-
- def starttls(ssl)
- ssl.puts("STARTTLS")
- sleep 1 # When this line is eliminated, process on Cygwin blocks
- # forever at ssl.connect. But I don't know why it does.
- ssl.connect
- end
- end
-
-end if defined?(OpenSSL)
+end
diff --git a/test/optparse/test_acceptable.rb b/test/optparse/test_acceptable.rb
deleted file mode 100644
index 6ec619ef8c..0000000000
--- a/test/optparse/test_acceptable.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-require_relative 'test_optparse'
-
-class TestOptionParser::Acceptable < TestOptionParser
-
- def setup
- super
- @opt.def_option("--integer VAL", Integer) { |v| @integer = v }
- @opt.def_option("--float VAL", Float) { |v| @float = v }
- @opt.def_option("--numeric VAL", Numeric) { |v| @numeric = v }
-
- @opt.def_option("--decimal-integer VAL",
- OptionParser::DecimalInteger) { |i| @decimal_integer = i }
- @opt.def_option("--octal-integer VAL",
- OptionParser::OctalInteger) { |i| @octal_integer = i }
- @opt.def_option("--decimal-numeric VAL",
- OptionParser::DecimalNumeric) { |i| @decimal_numeric = i }
- end
-
- def test_integer
- assert_equal(%w"", no_error {@opt.parse!(%w"--integer 0")})
- assert_equal(0, @integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--integer 0b10")})
- assert_equal(2, @integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--integer 077")})
- assert_equal(63, @integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--integer 10")})
- assert_equal(10, @integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--integer 0x3")})
- assert_equal(3, @integer)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--integer 0b")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--integer 09")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--integer 0x")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--integer 1234xyz")
- end
- end
-
- def test_float
- assert_equal(%w"", no_error {@opt.parse!(%w"--float 0")})
- assert_in_epsilon(0.0, @float)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--float 0.0")})
- assert_in_epsilon(0.0, @float)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--float 1.2")})
- assert_in_epsilon(1.2, @float)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--float 1E2")})
- assert_in_epsilon(100, @float)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--float 1E-2")})
- assert_in_epsilon(0.01, @float)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--float 0e")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--float 1.234xyz")
- end
- end
-
- def test_numeric
- assert_equal(%w"", no_error {@opt.parse!(%w"--numeric 0")})
- assert_equal(0, @numeric)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--numeric 0/1")})
- assert_equal(0, @numeric)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--numeric 1/2")})
- assert_equal(Rational(1, 2), @numeric)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--numeric 1.2/2.3")})
- assert_equal(Rational(12, 23), @numeric)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--numeric 1/")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--numeric 12/34xyz")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--numeric 12x/34yz")
- end
- end
-
- def test_decimal_integer
- assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-integer 0")})
- assert_equal(0, @decimal_integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-integer 10")})
- assert_equal(10, @decimal_integer)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-integer 0b1")
- end
-
- e = assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-integer 09")
- end
-
- assert_equal("invalid argument: --decimal-integer 09", e.message)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-integer x")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-integer 1234xyz")
- end
- end
-
- def test_octal_integer
- assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 0")})
- assert_equal(0, @octal_integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 6")})
- assert_equal(6, @octal_integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 07")})
- assert_equal(7, @octal_integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 10")})
- assert_equal(8, @octal_integer)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--octal-integer 011")})
- assert_equal(9, @octal_integer)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--octal-integer 09")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--octal-integer 0b1")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--octal-integer x")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--octal-integer 01234xyz")
- end
- end
-
- def test_decimal_numeric
- assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-numeric 0")})
- assert_equal(0, @decimal_numeric)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-numeric 01")})
- assert_equal(1, @decimal_numeric)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-numeric 1.2")})
- assert_in_delta(1.2, @decimal_numeric)
-
- assert_equal(%w"", no_error {@opt.parse!(%w"--decimal-numeric 1E2")})
- assert_in_delta(100.0, @decimal_numeric)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-numeric 0b1")
- end
-
- e = assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-numeric 09")
- end
-
- assert_equal("invalid argument: --decimal-numeric 09", e.message)
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-integer 1234xyz")
- end
-
- assert_raises(OptionParser::InvalidArgument) do
- @opt.parse!(%w"--decimal-integer 12.34xyz")
- end
- end
-
-end
-
diff --git a/test/optparse/test_autoconf.rb b/test/optparse/test_autoconf.rb
deleted file mode 100644
index cb9c938609..0000000000
--- a/test/optparse/test_autoconf.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'test/unit'
-require 'optparse/ac'
-
-class TestOptionParser < Test::Unit::TestCase; end
-
-class TestOptionParser::AutoConf < Test::Unit::TestCase
- def setup
- @opt = OptionParser::AC.new
- @foo = @bar = self.class
- @opt.ac_arg_enable("foo", "foo option") {|x| @foo = x}
- @opt.ac_arg_disable("bar", "bar option") {|x| @bar = x}
- @opt.ac_arg_with("zot", "zot option") {|x| @zot = x}
- end
-
- class DummyOutput < String
- alias write <<
- end
- def no_error(*args)
- $stderr, stderr = DummyOutput.new, $stderr
- assert_nothing_raised(*args) {return yield}
- ensure
- stderr, $stderr = $stderr, stderr
- $!.backtrace.delete_if {|e| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}/o =~ e} if $!
- assert_empty(stderr)
- end
-
- def test_enable
- @opt.parse!(%w"--enable-foo")
- assert_equal(true, @foo)
- @opt.parse!(%w"--enable-bar")
- assert_equal(true, @bar)
- end
-
- def test_disable
- @opt.parse!(%w"--disable-foo")
- assert_equal(false, @foo)
- @opt.parse!(%w"--disable-bar")
- assert_equal(false, @bar)
- end
-
- def test_with
- @opt.parse!(%w"--with-zot=foobar")
- assert_equal("foobar", @zot)
- @opt.parse!(%w"--without-zot")
- assert_nil(@zot)
- end
-
- def test_without
- @opt.parse!(%w"--without-zot")
- assert_nil(@zot)
- assert_raise(OptionParser::NeedlessArgument) {@opt.parse!(%w"--without-zot=foobar")}
- end
-
- def test_help
- help = @opt.help
- assert_match(/--enable-foo/, help)
- assert_match(/--disable-bar/, help)
- assert_match(/--with-zot/, help)
- assert_not_match(/--disable-foo/, help)
- assert_not_match(/--enable-bar/, help)
- assert_not_match(/--without/, help)
- end
-end
diff --git a/test/optparse/test_bash_completion.rb b/test/optparse/test_bash_completion.rb
deleted file mode 100644
index baeb6d9882..0000000000
--- a/test/optparse/test_bash_completion.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'test/unit'
-require 'optparse'
-
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::BashCompletion < Test::Unit::TestCase
- def setup
- @opt = OptionParser.new
- @opt.define("-z", "zzz") {}
- @opt.define("--foo") {}
- @opt.define("--bar=BAR") {}
- @opt.define("--for=TYPE", [:hello, :help, :zot]) {}
- end
-
- def test_empty
- assert_equal([], @opt.candidate(""))
- end
-
- def test_one_hyphen
- assert_equal(%w[-z --foo --bar= --for=], @opt.candidate("-"))
- end
-
- def test_two_hyphen
- assert_equal(%w[--foo --bar= --for=], @opt.candidate("--"))
- end
-
- def test_long_f
- assert_equal(%w[--foo --for=], @opt.candidate("--f"))
- end
-
- def test_long_for_option
- assert_equal(%w[--for=], @opt.candidate("--for"))
- end
-
- def test_long_for_option_args
- assert_equal(%w[hello help zot], @opt.candidate("--for="))
- end
-
- def test_long_for_option_complete
- assert_equal(%w[hello help], @opt.candidate("--for=h"))
- end
-end
diff --git a/test/optparse/test_getopts.rb b/test/optparse/test_getopts.rb
index ae22f68184..1ba194ace1 100644
--- a/test/optparse/test_getopts.rb
+++ b/test/optparse/test_getopts.rb
@@ -1,9 +1,7 @@
require 'test/unit'
require 'optparse'
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::Getopts < Test::Unit::TestCase
+class TestOptionParserGetopts < Test::Unit::TestCase
def setup
@opt = OptionParser.new
end
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 54fd194bbd..0c67d7f0f9 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -18,29 +18,4 @@ class TestOptionParser::SummaryTest < TestOptionParser
assert_match(/description 2/, s[1])
assert_match(/last-option/, s[-1])
end
-
- def test_banner
- o = OptionParser.new("foo bar")
- assert_equal("foo bar", o.banner)
- end
-
- def test_banner_from_progname
- o = OptionParser.new
- o.program_name = "foobar"
- assert_equal("Usage: foobar [options]\n", o.help)
- end
-
- def test_summary
- o = OptionParser.new("foo\nbar")
- assert_equal("foo\nbar\n", o.to_s)
- assert_equal(["foo\n", "bar"], o.to_a)
- end
-
- def test_summary_containing_space
- # test for r35467. OptionParser#to_a shouldn't split str by spaces.
- bug6348 = '[ruby-dev:45568]'
- o = OptionParser.new("foo bar")
- assert_equal("foo bar\n", o.to_s, bug6348)
- assert_equal(["foo bar"], o.to_a, bug6348)
- end
end
diff --git a/test/optparse/test_zsh_completion.rb b/test/optparse/test_zsh_completion.rb
deleted file mode 100644
index 7e5ba71384..0000000000
--- a/test/optparse/test_zsh_completion.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'test/unit'
-require 'optparse'
-
-class TestOptionParser < Test::Unit::TestCase
-end
-class TestOptionParser::BashCompletion < Test::Unit::TestCase
- def setup
- @opt = OptionParser.new
- @opt.define("-z", "zzz") {}
- @opt.define("--foo") {}
- @opt.define("--bar=BAR") {}
- @opt.define("--for=TYPE", [:hello, :help, :zot]) {}
- end
-
- def test_compsys
- compsys = @opt.compsys("", "zshcompsys")
- assert_match(/\"-z\[zzz\]\"/, compsys)
- assert_match(/\"--foo\[\]\"/, compsys)
- assert_match(/\"--bar\[\]\"/, compsys)
- assert_match(/\"--for\[\]\"/, compsys)
- end
-end
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index d82bab9784..d92092339a 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -2,13 +2,6 @@ require 'test/unit'
require 'ostruct'
class TC_OpenStruct < Test::Unit::TestCase
- def test_initialize
- h = {name: "John Smith", age: 70, pension: 300}
- assert_equal h, OpenStruct.new(h).to_h
- assert_equal h, OpenStruct.new(OpenStruct.new(h)).to_h
- assert_equal h, OpenStruct.new(Struct.new(*h.keys).new(*h.values)).to_h
- end
-
def test_equality
o1 = OpenStruct.new
o2 = OpenStruct.new
@@ -55,63 +48,4 @@ class TC_OpenStruct < Test::Unit::TestCase
o.freeze
assert_raise(TypeError, '[ruby-core:22559]') {o.a = 1764}
end
-
- def test_delete_field
- bug = '[ruby-core:33010]'
- o = OpenStruct.new
- assert_not_respond_to(o, :a)
- assert_not_respond_to(o, :a=)
- o.a = 'a'
- assert_respond_to(o, :a)
- assert_respond_to(o, :a=)
- a = o.delete_field :a
- assert_not_respond_to(o, :a, bug)
- assert_not_respond_to(o, :a=, bug)
- assert_equal(a, 'a')
- end
-
- def test_setter
- os = OpenStruct.new
- os[:foo] = :bar
- assert_equal :bar, os.foo
- os['foo'] = :baz
- assert_equal :baz, os.foo
- end
-
- def test_getter
- os = OpenStruct.new
- os.foo = :bar
- assert_equal :bar, os[:foo]
- assert_equal :bar, os['foo']
- end
-
- def test_to_h
- h = {name: "John Smith", age: 70, pension: 300}
- os = OpenStruct.new(h)
- to_h = os.to_h
- assert_equal(h, to_h)
-
- to_h[:age] = 71
- assert_equal(70, os.age)
- assert_equal(70, h[:age])
-
- assert_equal(h, OpenStruct.new("name" => "John Smith", "age" => 70, pension: 300).to_h)
- end
-
- def test_each_pair
- h = {name: "John Smith", age: 70, pension: 300}
- os = OpenStruct.new(h)
- assert_equal '#<Enumerator: #<OpenStruct name="John Smith", age=70, pension=300>:each_pair>', os.each_pair.inspect
- assert_equal [[:name, "John Smith"], [:age, 70], [:pension, 300]], os.each_pair.to_a
- end
-
- def test_eql_and_hash
- os1 = OpenStruct.new age: 70
- os2 = OpenStruct.new age: 70.0
- assert_equal os1, os2
- assert_equal false, os1.eql?(os2)
- assert_not_equal os1.hash, os2.hash
- assert_equal true, os1.eql?(os1.dup)
- assert_equal os1.hash, os1.dup.hash
- end
end
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index ba3686f740..6d44ec1b80 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require 'test/unit'
require 'pathname'
@@ -5,35 +7,17 @@ require 'fileutils'
require 'tmpdir'
require 'enumerator'
-require_relative '../ruby/envutil'
-
class TestPathname < Test::Unit::TestCase
- def self.define_assertion(name, linenum, &block)
- name = "test_#{name}_#{linenum}"
- define_method(name, &block)
- end
-
- def self.get_linenum
- if /:(\d+):/ =~ caller[1]
- $1.to_i
- else
- nil
- end
+ def self.define_assertion(name, &block)
+ @defassert_num ||= {}
+ @defassert_num[name] ||= 0
+ @defassert_num[name] += 1
+ define_method("test_#{name}_#{@defassert_num[name]}", &block)
end
def self.defassert(name, result, *args)
- define_assertion(name, get_linenum) {
- mesg = "#{name}(#{args.map {|a| a.inspect }.join(', ')})"
- assert_nothing_raised(mesg) {
- assert_equal(result, self.send(name, *args), mesg)
- }
- }
- end
-
- def self.defassert_raise(name, exc, *args)
- define_assertion(name, get_linenum) {
- message = "#{name}(#{args.map {|a| a.inspect }.join(', ')})"
- assert_raise(exc, message) { self.send(name, *args) }
+ define_assertion(name) {
+ assert_equal(result, self.send(name, *args), "#{name}(#{args.map {|a| a.inspect }.join(', ')})")
}
end
@@ -88,10 +72,6 @@ class TestPathname < Test::Unit::TestCase
defassert(:cleanpath_aggressive, '/', '///a/../..')
end
- if DOSISH
- defassert(:cleanpath_aggressive, 'c:/foo/bar', 'c:\\foo\\bar')
- end
-
def cleanpath_conservative(path)
Pathname.new(path).cleanpath(true).to_s
end
@@ -128,10 +108,6 @@ class TestPathname < Test::Unit::TestCase
defassert(:cleanpath_conservative, '/a', '/../.././../a')
defassert(:cleanpath_conservative, 'a/b/../../../../c/../d', 'a/b/../../../../c/../d')
- if DOSISH
- defassert(:cleanpath_conservative, 'c:/foo/bar', 'c:\\foo\\bar')
- end
-
if DOSISH_UNC
defassert(:cleanpath_conservative, '//', '//')
else
@@ -191,12 +167,10 @@ class TestPathname < Test::Unit::TestCase
if DOSISH
defassert(:del_trailing_separator, "a", "a\\")
- defassert(:del_trailing_separator, "\225\\".force_encoding("cp932"), "\225\\\\".force_encoding("cp932"))
- defassert(:del_trailing_separator, "\225".force_encoding("cp437"), "\225\\\\".force_encoding("cp437"))
- end
-
- def test_plus
- assert_kind_of(Pathname, Pathname("a") + Pathname("b"))
+ require 'Win32API'
+ if Win32API.new('kernel32', 'GetACP', nil, 'L').call == 932
+ defassert(:del_trailing_separator, "\225\\", "\225\\\\") # SJIS
+ end
end
def plus(path1, path2) # -> path
@@ -221,34 +195,6 @@ class TestPathname < Test::Unit::TestCase
defassert(:plus, 'a//b/d//e', 'a//b/c', '../d//e')
- def test_parent
- assert_equal(Pathname("."), Pathname("a").parent)
- end
-
- def parent(path) # -> path
- Pathname.new(path).parent.to_s
- end
-
- defassert(:parent, '/', '/')
- defassert(:parent, '/', '/a')
- defassert(:parent, '/a', '/a/b')
- defassert(:parent, '/a/b', '/a/b/c')
- defassert(:parent, '.', 'a')
- defassert(:parent, 'a', 'a/b')
- defassert(:parent, 'a/b', 'a/b/c')
- defassert(:parent, '..', '.')
- defassert(:parent, '../..', '..')
-
- def test_join
- r = Pathname("a").join(Pathname("b"), Pathname("c"))
- assert_equal(Pathname("a/b/c"), r)
- end
-
- def test_absolute
- assert_equal(true, Pathname("/").absolute?)
- assert_equal(false, Pathname("a").absolute?)
- end
-
def relative?(path)
Pathname.new(path).relative?
end
@@ -311,6 +257,13 @@ class TestPathname < Test::Unit::TestCase
defassert(:relative_path_from, "a", "a", "b/..")
defassert(:relative_path_from, "b/c", "b/c", "b/..")
+ def self.defassert_raise(name, exc, *args)
+ define_assertion(name) {
+ message = "#{name}(#{args.map {|a| a.inspect }.join(', ')})"
+ assert_raise(exc, message) { self.send(name, *args) }
+ }
+ end
+
defassert_raise(:relative_path_from, ArgumentError, "/", ".")
defassert_raise(:relative_path_from, ArgumentError, ".", "/")
defassert_raise(:relative_path_from, ArgumentError, "a", "..")
@@ -519,7 +472,6 @@ class TestPathname < Test::Unit::TestCase
defassert(:pathsubext, 'lex.yy.o', 'lex.yy.c', '.o')
defassert(:pathsubext, 'fooaa.o', 'fooaa', '.o')
defassert(:pathsubext, 'd.e/aa.o', 'd.e/aa', '.o')
- defassert(:pathsubext, 'long_enough.bug-3664', 'long_enough.not_to_be_embeded[ruby-core:31640]', '.bug-3664')
def test_sub_matchdata
result = Pathname("abc.gif").sub(/\..*/) {
@@ -540,11 +492,6 @@ class TestPathname < Test::Unit::TestCase
defassert(:root?, false, "")
defassert(:root?, false, "a")
- def test_mountpoint?
- r = Pathname("/").mountpoint?
- assert_include([true, false], r)
- end
-
def test_destructive_update
path = Pathname.new("a")
path.to_s.replace "b"
@@ -601,20 +548,6 @@ class TestPathname < Test::Unit::TestCase
assert_equal(false, Pathname.new("a".freeze).freeze.to_s.frozen?)
end
- def test_freeze_and_taint
- obj = Pathname.new("a")
- obj.freeze
- assert_equal(false, obj.tainted?)
- assert_raise(RuntimeError) { obj.taint }
-
- obj = Pathname.new("a")
- obj.taint
- assert_equal(true, obj.tainted?)
- obj.freeze
- assert_equal(true, obj.tainted?)
- assert_nothing_raised { obj.taint }
- end
-
def test_to_s
str = "a"
obj = Pathname.new(str)
@@ -718,9 +651,7 @@ class TestPathname < Test::Unit::TestCase
def test_binread
with_tmpchdir('rubytest-pathname') {|dir|
open("a", "w") {|f| f.write "abc" }
- str = Pathname("a").binread
- assert_equal("abc", str)
- assert_equal(Encoding::ASCII_8BIT, str.encoding)
+ assert_equal("abc", Pathname("a").read)
}
end
@@ -1165,10 +1096,6 @@ class TestPathname < Test::Unit::TestCase
open("f", "w") {|f| f.write "abc" }
Dir.mkdir("d")
assert_equal([Pathname("d"), Pathname("f")], Pathname.glob("*").sort)
- a = []
- Pathname.glob("*") {|path| a << path }
- a.sort!
- assert_equal([Pathname("d"), Pathname("f")], a)
}
end
@@ -1177,11 +1104,6 @@ class TestPathname < Test::Unit::TestCase
assert_kind_of(Pathname, wd)
end
- def test_s_pwd
- wd = Pathname.pwd
- assert_kind_of(Pathname, wd)
- end
-
def test_entries
with_tmpchdir('rubytest-pathname') {|dir|
open("a", "w") {}
@@ -1204,8 +1126,6 @@ class TestPathname < Test::Unit::TestCase
with_tmpchdir('rubytest-pathname') {|dir|
Pathname("d").mkdir
assert(File.directory?("d"))
- Pathname("e").mkdir(0770)
- assert(File.directory?("e"))
}
end
@@ -1241,10 +1161,6 @@ class TestPathname < Test::Unit::TestCase
assert_equal([Pathname("."), Pathname("a"), Pathname("b"), Pathname("d"), Pathname("d/x"), Pathname("d/y")], a)
a = []; Pathname("d").find {|v| a << v }; a.sort!
assert_equal([Pathname("d"), Pathname("d/x"), Pathname("d/y")], a)
- a = Pathname(".").find.sort
- assert_equal([Pathname("."), Pathname("a"), Pathname("b"), Pathname("d"), Pathname("d/x"), Pathname("d/y")], a)
- a = Pathname("d").find.sort
- assert_equal([Pathname("d"), Pathname("d/x"), Pathname("d/y")], a)
}
end
@@ -1306,17 +1222,4 @@ class TestPathname < Test::Unit::TestCase
assert_equal("foo/bar", File.join(Pathname.new("foo"), Pathname.new("bar").taint))
}.call
end
-
- def test_relative_path_from_casefold
- assert_separately([], <<-'end;') # do
- module File::Constants
- remove_const :FNM_SYSCASE
- FNM_SYSCASE = FNM_CASEFOLD
- end
- require 'pathname'
- foo = Pathname.new("fo\u{f6}")
- bar = Pathname.new("b\u{e4}r".encode("ISO-8859-1"))
- assert_instance_of(Pathname, foo.relative_path_from(bar))
- end;
- end
end
diff --git a/test/profile_test_all.rb b/test/profile_test_all.rb
deleted file mode 100644
index 54e916b73b..0000000000
--- a/test/profile_test_all.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'objspace'
-
-#
-# purpose:
-# Profile memory usage of each tests.
-#
-# usage:
-# RUBY_TEST_ALL_PROFILE=true make test-all
-#
-# output:
-# ./test_all_profile
-#
-# collected information:
-# - ObjectSpace.memsize_of_all
-# - GC.stat
-# - /proc/self/statm (if it exists)
-#
-
-class MiniTest::Unit::TestCase
- alias orig_run run
-
- $test_all_profile_out = open('test_all_profile', 'w')
- $test_all_profile_gc_stat_hash = {}
-
- if FileTest.exist?('/proc/self/statm')
- # for Linux (only?)
- $test_all_profile_out.puts "name\tmemsize_of_all\t" +
- (GC.stat.keys +
- %w(size resident share text lib data dt)).join("\t")
-
- def memprofile_test_all_result_result
- "#{self.class}\##{self.__name__}\t" \
- "#{ObjectSpace.memsize_of_all}\t" \
- "#{GC.stat($test_all_profile_gc_stat_hash).values.join("\t")}\t" \
- "#{File.read('/proc/self/statm').split(/\s+/).join("\t")}"
- end
- else
- $test_all_profile_out.puts "name\tmemsize_of_alls\t" + GC.stat.keys.join("\t")
- def memprofile_test_all_result_result
- "#{self.class}\##{self.__name__}\t" \
- "#{ObjectSpace.memsize_of_all}\t" \
- "#{GC.stat($test_all_profile_gc_stat_hash).values.join("\t")}"
- end
- end
-
- def run runner
- result = orig_run(runner)
- $test_all_profile_out.puts memprofile_test_all_result_result
- $test_all_profile_out.flush
- result
- end
-end
diff --git a/test/psych/handlers/test_recorder.rb b/test/psych/handlers/test_recorder.rb
deleted file mode 100644
index 96b8eac1fc..0000000000
--- a/test/psych/handlers/test_recorder.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'psych/helper'
-require 'psych/handlers/recorder'
-
-module Psych
- module Handlers
- class TestRecorder < TestCase
- def test_replay
- yaml = "--- foo\n...\n"
- output = StringIO.new
-
- recorder = Psych::Handlers::Recorder.new
- parser = Psych::Parser.new recorder
- parser.parse yaml
-
- assert_equal 5, recorder.events.length
-
- emitter = Psych::Emitter.new output
- recorder.events.each do |m, args|
- emitter.send m, *args
- end
- assert_equal yaml, output.string
- end
- end
- end
-end
diff --git a/test/psych/helper.rb b/test/psych/helper.rb
index f5800303fd..61049d6cf2 100644
--- a/test/psych/helper.rb
+++ b/test/psych/helper.rb
@@ -2,7 +2,6 @@ require 'minitest/autorun'
require 'stringio'
require 'tempfile'
require 'date'
-require 'psych'
module Psych
class TestCase < MiniTest::Unit::TestCase
@@ -33,7 +32,7 @@ module Psych
def assert_cycle( obj )
v = Visitors::YAMLTree.new
v << obj
- assert_equal(obj, Psych.load(v.tree.yaml))
+ assert_equal(obj, Psych.load(v.tree.to_yaml))
assert_equal( obj, Psych::load(Psych.dump(obj)))
assert_equal( obj, Psych::load( obj.psych_to_yaml ) )
end
@@ -54,3 +53,11 @@ module Psych
end
end
end
+
+require 'psych'
+
+# FIXME: remove this when syck is removed
+o = Object.new
+a = o.method(:psych_to_yaml)
+b = o.method(:to_yaml)
+raise "psych should define to_yaml" unless a == b
diff --git a/test/psych/json/test_stream.rb b/test/psych/json/test_stream.rb
deleted file mode 100644
index 4690ad2f1e..0000000000
--- a/test/psych/json/test_stream.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'psych/helper'
-
-module Psych
- module JSON
- class TestStream < TestCase
- def setup
- @io = StringIO.new
- @stream = Psych::JSON::Stream.new(@io)
- @stream.start
- end
-
- def test_explicit_documents
- @io = StringIO.new
- @stream = Psych::JSON::Stream.new(@io)
- @stream.start
-
- @stream.push({ 'foo' => 'bar' })
-
- assert !@stream.finished?, 'stream not finished'
- @stream.finish
- assert @stream.finished?, 'stream finished'
-
- assert_match(/^---/, @io.string)
- assert_match(/\.\.\.$/, @io.string)
- end
-
- def test_null
- @stream.push(nil)
- assert_match(/^--- null/, @io.string)
- end
-
- def test_string
- @stream.push "foo"
- assert_match(/(["])foo\1/, @io.string)
- end
-
- def test_symbol
- @stream.push :foo
- assert_match(/(["])foo\1/, @io.string)
- end
-
- def test_int
- @stream.push 10
- assert_match(/^--- 10/, @io.string)
- end
-
- def test_float
- @stream.push 1.2
- assert_match(/^--- 1.2/, @io.string)
- end
-
- def test_hash
- hash = { 'one' => 'two' }
- @stream.push hash
-
- json = @io.string
- assert_match(/}$/, json)
- assert_match(/^--- \{/, json)
- assert_match(/["]one['"]/, json)
- assert_match(/["]two['"]/, json)
- end
-
- def test_list_to_json
- list = %w{ one two }
- @stream.push list
-
- json = @io.string
- assert_match(/]$/, json)
- assert_match(/^--- \[/, json)
- assert_match(/["]one["]/, json)
- assert_match(/["]two["]/, json)
- end
-
- class Foo; end
-
- def test_json_dump_exclude_tag
- @stream << Foo.new
- json = @io.string
- refute_match('Foo', json)
- end
-
- class Bar
- def encode_with coder
- coder.represent_seq 'omg', %w{ a b c }
- end
- end
-
- def test_json_list_dump_exclude_tag
- @stream << Bar.new
- json = @io.string
- refute_match('omg', json)
- end
-
- def test_time
- time = Time.utc(2010, 10, 10)
- @stream.push({'a' => time })
- json = @io.string
- assert_match "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n", json
- end
-
- def test_datetime
- time = Time.new(2010, 10, 10).to_datetime
- @stream.push({'a' => time })
- json = @io.string
- assert_match "{\"a\": \"#{time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")}\"}\n", json
- end
- end
- end
-end
diff --git a/test/psych/nodes/test_enumerable.rb b/test/psych/nodes/test_enumerable.rb
deleted file mode 100644
index 19cf94bd51..0000000000
--- a/test/psych/nodes/test_enumerable.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'psych/helper'
-
-module Psych
- module Nodes
- class TestEnumerable < TestCase
- def test_includes_enumerable
- yaml = '--- hello'
- assert_equal 3, Psych.parse_stream(yaml).to_a.length
- end
-
- def test_returns_enumerator
- yaml = '--- hello'
- assert_equal 3, Psych.parse_stream(yaml).each.map { |x| x }.length
- end
-
- def test_scalar
- assert_equal 3, calls('--- hello').length
- end
-
- def test_sequence
- assert_equal 4, calls("---\n- hello").length
- end
-
- def test_mapping
- assert_equal 5, calls("---\nhello: world").length
- end
-
- def test_alias
- assert_equal 5, calls("--- &yay\n- foo\n- *yay\n").length
- end
-
- private
-
- def calls yaml
- calls = []
- Psych.parse_stream(yaml).each do |node|
- calls << node
- end
- calls
- end
- end
- end
-end
diff --git a/test/psych/test_alias_and_anchor.rb b/test/psych/test_alias_and_anchor.rb
index 7cb5a6e52b..8c9cd8076a 100644
--- a/test/psych/test_alias_and_anchor.rb
+++ b/test/psych/test_alias_and_anchor.rb
@@ -1,12 +1,4 @@
-require 'psych/helper'
-
-class ObjectWithInstanceVariables
- attr_accessor :var1, :var2
-end
-
-class SubStringWithInstanceVariables < String
- attr_accessor :var1
-end
+require_relative 'helper'
module Psych
class TestAliasAndAnchor < TestCase
@@ -22,40 +14,6 @@ EOYAML
result.each {|el| assert_same(result[0], el) }
end
- def test_mri_compatibility_object_with_ivars
- yaml = <<EOYAML
----
-- &id001 !ruby/object:ObjectWithInstanceVariables
- var1: test1
- var2: test2
-- *id001
-- *id001
-EOYAML
-
- result = Psych.load yaml
- result.each do |el|
- assert_same(result[0], el)
- assert_equal('test1', el.var1)
- assert_equal('test2', el.var2)
- end
- end
-
- def test_mri_compatibility_substring_with_ivars
- yaml = <<EOYAML
----
-- &id001 !str:SubStringWithInstanceVariables
- str: test
- "@var1": test
-- *id001
-- *id001
-EOYAML
- result = Psych.load yaml
- result.each do |el|
- assert_same(result[0], el)
- assert_equal('test', el.var1)
- end
- end
-
def test_anchor_alias_round_trip
o = Object.new
original = [o,o,o]
@@ -64,33 +22,5 @@ EOYAML
result = Psych.load yaml
result.each {|el| assert_same(result[0], el) }
end
-
- def test_anchor_alias_round_trip_object_with_ivars
- o = ObjectWithInstanceVariables.new
- o.var1 = 'test1'
- o.var2 = 'test2'
- original = [o,o,o]
-
- yaml = Psych.dump original
- result = Psych.load yaml
- result.each do |el|
- assert_same(result[0], el)
- assert_equal('test1', el.var1)
- assert_equal('test2', el.var2)
- end
- end
-
- def test_anchor_alias_round_trip_substring_with_ivars
- o = SubStringWithInstanceVariables.new
- o.var1 = 'test'
- original = [o,o,o]
-
- yaml = Psych.dump original
- result = Psych.load yaml
- result.each do |el|
- assert_same(result[0], el)
- assert_equal('test', el.var1)
- end
- end
end
end
diff --git a/test/psych/test_array.rb b/test/psych/test_array.rb
index 747fe95062..f006cc866c 100644
--- a/test/psych/test_array.rb
+++ b/test/psych/test_array.rb
@@ -1,50 +1,12 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestArray < TestCase
- class X < Array
- end
-
- class Y < Array
- attr_accessor :val
- end
-
def setup
super
@list = [{ :a => 'b' }, 'foo']
end
- def test_another_subclass_with_attributes
- y = Y.new.tap {|y| y.val = 1}
- y << "foo" << "bar"
- y = Psych.load Psych.dump y
-
- assert_equal %w{foo bar}, y
- assert_equal Y, y.class
- assert_equal 1, y.val
- end
-
- def test_subclass
- yaml = Psych.dump X.new
- assert_match X.name, yaml
-
- list = X.new
- list << 1
- assert_equal X, list.class
- assert_equal 1, list.first
- end
-
- def test_subclass_with_attributes
- y = Psych.load Psych.dump Y.new.tap {|y| y.val = 1}
- assert_equal Y, y.class
- assert_equal 1, y.val
- end
-
- def test_backwards_with_syck
- x = Psych.load "--- !seq:#{X.name} []\n\n"
- assert_equal X, x.class
- end
-
def test_self_referential
@list << @list
assert_cycle(@list)
diff --git a/test/psych/test_boolean.rb b/test/psych/test_boolean.rb
index ebfa25e56a..b656f4f90e 100644
--- a/test/psych/test_boolean.rb
+++ b/test/psych/test_boolean.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
###
diff --git a/test/psych/test_class.rb b/test/psych/test_class.rb
index 156f2fb0ad..5a39b8c74a 100644
--- a/test/psych/test_class.rb
+++ b/test/psych/test_class.rb
@@ -1,36 +1,17 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestClass < TestCase
- module Foo
- end
-
- def test_cycle_anonymous_class
+ def test_cycle
assert_raises(::TypeError) do
- assert_cycle(Class.new)
+ assert_cycle(TestClass)
end
end
- def test_cycle_anonymous_module
+ def test_dump
assert_raises(::TypeError) do
- assert_cycle(Module.new)
+ Psych.dump TestClass
end
end
-
- def test_cycle
- assert_cycle(TestClass)
- end
-
- def test_dump
- Psych.dump TestClass
- end
-
- def test_cycle_module
- assert_cycle(Foo)
- end
-
- def test_dump_module
- Psych.dump Foo
- end
end
end
diff --git a/test/psych/test_coder.rb b/test/psych/test_coder.rb
index 7539c7d408..c171c5ad0d 100644
--- a/test/psych/test_coder.rb
+++ b/test/psych/test_coder.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestCoder < TestCase
@@ -89,17 +89,6 @@ module Psych
end
end
- class RepresentWithObject
- def encode_with coder
- coder.represent_object self.class.name, 20
- end
- end
-
- def test_represent_with_object
- thing = Psych.load(Psych.dump(RepresentWithObject.new))
- assert_equal 20, thing
- end
-
def test_json_dump_exclude_tag
refute_match('TestCoder::InitApi', Psych.to_json(InitApi.new))
end
diff --git a/test/psych/test_date_time.rb b/test/psych/test_date_time.rb
index fb76cb3a00..5b38adb2ce 100644
--- a/test/psych/test_date_time.rb
+++ b/test/psych/test_date_time.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
require 'date'
module Psych
@@ -13,5 +13,11 @@ module Psych
dt = DateTime.now
assert_cycle dt
end
+
+ def test_round_trip_with_offset
+ dt = DateTime.now
+ dt = dt.new_offset(Rational(3671, 60 * 60 * 24))
+ assert_cycle dt
+ end
end
end
diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb
index 3740b6f31c..a272db2332 100644
--- a/test/psych/test_deprecated.rb
+++ b/test/psych/test_deprecated.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestDeprecated < TestCase
@@ -145,7 +145,7 @@ module Psych
end
class YamlAs
- psych_yaml_as 'helloworld' # this should be yaml_as but to avoid syck
+ yaml_as 'helloworld'
end
def test_yaml_as
diff --git a/test/psych/test_document.rb b/test/psych/test_document.rb
index 05d9bbfb87..358fc51c4a 100644
--- a/test/psych/test_document.rb
+++ b/test/psych/test_document.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestDocument < TestCase
@@ -18,12 +18,12 @@ module Psych
end
def test_emit_tag
- assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.yaml)
+ assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.to_yaml)
end
def test_emit_multitag
@doc.tag_directives << ['!!', 'foo.com,2009:']
- yaml = @stream.yaml
+ yaml = @stream.to_yaml
assert_match('%TAG ! tag:tenderlovemaking.com,2009:', yaml)
assert_match('%TAG !! foo.com,2009:', yaml)
end
@@ -31,7 +31,7 @@ module Psych
def test_emit_bad_tag
assert_raises(RuntimeError) do
@doc.tag_directives = [['!']]
- @stream.yaml
+ @stream.to_yaml
end
end
@@ -40,7 +40,7 @@ module Psych
end
def test_emit_version
- assert_match('%YAML 1.1', @stream.yaml)
+ assert_match('%YAML 1.1', @stream.to_yaml)
end
end
end
diff --git a/test/psych/test_emitter.rb b/test/psych/test_emitter.rb
index dfd20e1507..3738c1ac04 100644
--- a/test/psych/test_emitter.rb
+++ b/test/psych/test_emitter.rb
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestEmitter < TestCase
@@ -10,12 +10,6 @@ module Psych
@emitter = Psych::Emitter.new @out
end
- def test_line_width
- assert_equal 0, @emitter.line_width
- assert_equal 10, @emitter.line_width = 10
- assert_equal 10, @emitter.line_width
- end
-
def test_set_canonical
@emitter.canonical = true
assert_equal true, @emitter.canonical
@@ -70,7 +64,6 @@ module Psych
['foo', Object.new, nil, false, true, 1],
['foo', nil, Object.new, false, true, 1],
['foo', nil, nil, false, true, :foo],
- [nil, nil, nil, false, true, 1],
].each do |args|
assert_raises(TypeError) do
@emitter.scalar(*args)
diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb
index 1abee0df16..bf8318a774 100644
--- a/test/psych/test_encoding.rb
+++ b/test/psych/test_encoding.rb
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestEncoding < TestCase
@@ -24,170 +24,9 @@ module Psych
def setup
super
- @buffer = StringIO.new
@handler = EncodingCatcher.new
@parser = Psych::Parser.new @handler
@utf8 = Encoding.find('UTF-8')
- @emitter = Psych::Emitter.new @buffer
- end
-
- def test_transcode_shiftjis
- str = "ã“ã‚“ã«ã¡ã¯ï¼"
- loaded = Psych.load("--- ã“ã‚“ã«ã¡ã¯ï¼".encode('SHIFT_JIS'))
- assert_equal str, loaded
- end
-
- def test_transcode_utf16le
- str = "ã“ã‚“ã«ã¡ã¯ï¼"
- loaded = Psych.load("--- ã“ã‚“ã«ã¡ã¯ï¼".encode('UTF-16LE'))
- assert_equal str, loaded
- end
-
- def test_transcode_utf16be
- str = "ã“ã‚“ã«ã¡ã¯ï¼"
- loaded = Psych.load("--- ã“ã‚“ã«ã¡ã¯ï¼".encode('UTF-16BE'))
- assert_equal str, loaded
- end
-
- def test_io_shiftjis
- t = Tempfile.new(['shiftjis', 'yml'], :encoding => 'SHIFT_JIS')
- t.write '--- ã“ã‚“ã«ã¡ã¯ï¼'
- t.close
-
- # If the external encoding isn't utf8, utf16le, or utf16be, we cannot
- # process the file.
- File.open(t.path, 'r', :encoding => 'SHIFT_JIS') do |f|
- assert_raises Psych::SyntaxError do
- Psych.load(f)
- end
- end
-
- t.close(true)
- end
-
- def test_io_utf16le
- t = Tempfile.new(['utf16le', 'yml'])
- t.binmode
- t.write '--- ã“ã‚“ã«ã¡ã¯ï¼'.encode('UTF-16LE')
- t.close
-
- File.open(t.path, 'rb', :encoding => 'UTF-16LE') do |f|
- assert_equal "ã“ã‚“ã«ã¡ã¯ï¼", Psych.load(f)
- end
-
- t.close(true)
- end
-
- def test_io_utf16be
- t = Tempfile.new(['utf16be', 'yml'])
- t.binmode
- t.write '--- ã“ã‚“ã«ã¡ã¯ï¼'.encode('UTF-16BE')
- t.close
-
- File.open(t.path, 'rb', :encoding => 'UTF-16BE') do |f|
- assert_equal "ã“ã‚“ã«ã¡ã¯ï¼", Psych.load(f)
- end
-
- t.close(true)
- end
-
- def test_io_utf8
- t = Tempfile.new(['utf8', 'yml'])
- t.binmode
- t.write '--- ã“ã‚“ã«ã¡ã¯ï¼'.encode('UTF-8')
- t.close
-
- File.open(t.path, 'rb', :encoding => 'UTF-8') do |f|
- assert_equal "ã“ã‚“ã«ã¡ã¯ï¼", Psych.load(f)
- end
-
- t.close(true)
- end
-
- def test_emit_alias
- @emitter.start_stream Psych::Parser::UTF8
- @emitter.start_document [], [], true
- e = assert_raises(RuntimeError) do
- @emitter.alias 'ドラãˆã‚‚ã‚“'.encode('EUC-JP')
- end
- assert_match(/alias value/, e.message)
- end
-
- def test_to_yaml_is_valid
- ext_before = Encoding.default_external
- int_before = Encoding.default_internal
-
- Encoding.default_external = Encoding::US_ASCII
- Encoding.default_internal = nil
-
- s = "ã“ã‚“ã«ã¡ã¯ï¼"
- # If no encoding is specified, use UTF-8
- assert_equal Encoding::UTF_8, Psych.dump(s).encoding
- assert_equal s, Psych.load(Psych.dump(s))
- ensure
- Encoding.default_external = ext_before
- Encoding.default_internal = int_before
- end
-
- def test_start_mapping
- foo = 'foo'
- bar = 'ãƒãƒ¼'
-
- @emitter.start_stream Psych::Parser::UTF8
- @emitter.start_document [], [], true
- @emitter.start_mapping(
- foo.encode('Shift_JIS'),
- bar.encode('UTF-16LE'),
- false, Nodes::Sequence::ANY)
- @emitter.end_mapping
- @emitter.end_document false
- @emitter.end_stream
-
- @parser.parse @buffer.string
- assert_encodings @utf8, @handler.strings
- assert_equal [foo, bar], @handler.strings
- end
-
- def test_start_sequence
- foo = 'foo'
- bar = 'ãƒãƒ¼'
-
- @emitter.start_stream Psych::Parser::UTF8
- @emitter.start_document [], [], true
- @emitter.start_sequence(
- foo.encode('Shift_JIS'),
- bar.encode('UTF-16LE'),
- false, Nodes::Sequence::ANY)
- @emitter.end_sequence
- @emitter.end_document false
- @emitter.end_stream
-
- @parser.parse @buffer.string
- assert_encodings @utf8, @handler.strings
- assert_equal [foo, bar], @handler.strings
- end
-
- def test_doc_tag_encoding
- key = 'éµ'
- @emitter.start_stream Psych::Parser::UTF8
- @emitter.start_document(
- [1, 1],
- [['!'.encode('EUC-JP'), key.encode('EUC-JP')]],
- true
- )
- @emitter.scalar 'foo', nil, nil, true, false, Nodes::Scalar::ANY
- @emitter.end_document false
- @emitter.end_stream
-
- @parser.parse @buffer.string
- assert_encodings @utf8, @handler.strings
- assert_equal key, @handler.strings[1]
- end
-
- def test_emitter_encoding
- str = "å£ã«è€³ã‚りã€éšœå­ã«ç›®ã‚り"
- thing = Psych.load Psych.dump str.encode('EUC-JP')
- assert_equal str, thing
end
def test_default_internal
diff --git a/test/psych/test_engine_manager.rb b/test/psych/test_engine_manager.rb
index e7bfb2ea72..8bd7d6c1da 100644
--- a/test/psych/test_engine_manager.rb
+++ b/test/psych/test_engine_manager.rb
@@ -1,8 +1,12 @@
-require 'psych/helper'
+require_relative 'helper'
require 'yaml'
module Psych
class TestEngineManager < TestCase
+ def teardown
+ YAML::ENGINE.yamler = 'syck'
+ end
+
def test_bad_engine
assert_raises(ArgumentError) do
YAML::ENGINE.yamler = 'foooo'
@@ -15,6 +19,12 @@ module Psych
assert_equal 'psych', YAML::ENGINE.yamler
end
+ def test_set_syck
+ YAML::ENGINE.yamler = 'syck'
+ assert_equal Syck, YAML
+ assert_equal 'syck', YAML::ENGINE.yamler
+ end
+
A = Struct.new(:name)
def test_dump_types
diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb
index 46dece4127..7d08ad166a 100644
--- a/test/psych/test_exception.rb
+++ b/test/psych/test_exception.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestException < TestCase
@@ -16,97 +16,6 @@ module Psych
@wups = Wups.new
end
- def test_load_takes_file
- ex = assert_raises(Psych::SyntaxError) do
- Psych.load '--- `'
- end
- assert_nil ex.file
-
- ex = assert_raises(Psych::SyntaxError) do
- Psych.load '--- `', 'meow'
- end
- assert_equal 'meow', ex.file
- end
-
- def test_psych_parse_stream_takes_file
- ex = assert_raises(Psych::SyntaxError) do
- Psych.parse_stream '--- `'
- end
- assert_nil ex.file
- assert_match '(<unknown>)', ex.message
-
- ex = assert_raises(Psych::SyntaxError) do
- Psych.parse_stream '--- `', 'omg!'
- end
- assert_equal 'omg!', ex.file
- assert_match 'omg!', ex.message
- end
-
- def test_load_stream_takes_file
- ex = assert_raises(Psych::SyntaxError) do
- Psych.load_stream '--- `'
- end
- assert_nil ex.file
- assert_match '(<unknown>)', ex.message
-
- ex = assert_raises(Psych::SyntaxError) do
- Psych.load_stream '--- `', 'omg!'
- end
- assert_equal 'omg!', ex.file
- end
-
- def test_parse_file_exception
- t = Tempfile.new(['parsefile', 'yml'])
- t.binmode
- t.write '--- `'
- t.close
- ex = assert_raises(Psych::SyntaxError) do
- Psych.parse_file t.path
- end
- assert_equal t.path, ex.file
- t.close(true)
- end
-
- def test_load_file_exception
- t = Tempfile.new(['loadfile', 'yml'])
- t.binmode
- t.write '--- `'
- t.close
- ex = assert_raises(Psych::SyntaxError) do
- Psych.load_file t.path
- end
- assert_equal t.path, ex.file
- t.close(true)
- end
-
- def test_psych_parse_takes_file
- ex = assert_raises(Psych::SyntaxError) do
- Psych.parse '--- `'
- end
- assert_match '(<unknown>)', ex.message
- assert_nil ex.file
-
- ex = assert_raises(Psych::SyntaxError) do
- Psych.parse '--- `', 'omg!'
- end
- assert_match 'omg!', ex.message
- end
-
- def test_attributes
- e = assert_raises(Psych::SyntaxError) {
- Psych.load '--- `foo'
- }
-
- assert_nil e.file
- assert_equal 1, e.line
- assert_equal 5, e.column
- # FIXME: offset isn't being set correctly by libyaml
- # assert_equal 5, e.offset
-
- assert e.problem
- assert e.context
- end
-
def test_convert
w = Psych.load(Psych.dump(@wups))
assert_equal @wups, w
@@ -126,27 +35,5 @@ module Psych
assert_equal 1, w.foo
assert_nil w.bar
end
-
- def test_psych_syntax_error
- Tempfile.open(['parsefile', 'yml']) do |t|
- t.binmode
- t.write '--- `'
- t.close
-
- begin
- Psych.parse_file t.path
- rescue StandardError
- assert true # count assertion
- ensure
- t.close(true)
- return unless $!
-
- ancestors = $!.class.ancestors.inspect
-
- flunk "Psych::SyntaxError not rescued by StandardError: #{ancestors}"
- end
- end
- end
-
end
end
diff --git a/test/psych/test_hash.rb b/test/psych/test_hash.rb
index 4bd4edfc8c..e682ab2a8d 100644
--- a/test/psych/test_hash.rb
+++ b/test/psych/test_hash.rb
@@ -1,26 +1,12 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestHash < TestCase
- class X < Hash
- end
-
def setup
super
@hash = { :a => 'b' }
end
- def test_empty_subclass
- assert_match "!ruby/hash:#{X}", Psych.dump(X.new)
- x = Psych.load Psych.dump X.new
- assert_equal X, x.class
- end
-
- def test_map
- x = Psych.load "--- !map:#{X} { }\n"
- assert_equal X, x.class
- end
-
def test_self_referential
@hash['self'] = @hash
assert_cycle(@hash)
diff --git a/test/psych/test_json_tree.rb b/test/psych/test_json_tree.rb
index eed8cf36c4..590482c0bb 100644
--- a/test/psych/test_json_tree.rb
+++ b/test/psych/test_json_tree.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestJSONTree < TestCase
@@ -50,16 +50,5 @@ module Psych
assert_match(/"one"/, json)
assert_match(/"two"/, json)
end
-
- def test_time
- time = Time.utc(2010, 10, 10)
- assert_equal "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n",
-Psych.to_json({'a' => time })
- end
-
- def test_datetime
- time = Time.new(2010, 10, 10).to_datetime
- assert_equal "{\"a\": \"#{time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")}\"}\n", Psych.to_json({'a' => time })
- end
end
end
diff --git a/test/psych/test_merge_keys.rb b/test/psych/test_merge_keys.rb
index c31f9b80c0..fef8892727 100644
--- a/test/psych/test_merge_keys.rb
+++ b/test/psych/test_merge_keys.rb
@@ -1,67 +1,7 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestMergeKeys < TestCase
- def test_merge_nil
- yaml = <<-eoyml
-defaults: &defaults
-development:
- <<: *defaults
- eoyml
- assert_equal({'<<' => nil }, Psych.load(yaml)['development'])
- end
-
- def test_merge_array
- yaml = <<-eoyml
-foo: &hello
-- 1
-baz:
- <<: *hello
- eoyml
- assert_equal({'<<' => [1]}, Psych.load(yaml)['baz'])
- end
-
- def test_merge_is_not_partial
- yaml = <<-eoyml
-default: &default
- hello: world
-foo: &hello
-- 1
-baz:
- <<: [*hello, *default]
- eoyml
- doc = Psych.load yaml
- refute doc['baz'].key? 'hello'
- assert_equal({'<<' => [[1], {"hello"=>"world"}]}, Psych.load(yaml)['baz'])
- end
-
- def test_merge_seq_nil
- yaml = <<-eoyml
-foo: &hello
-baz:
- <<: [*hello]
- eoyml
- assert_equal({'<<' => [nil]}, Psych.load(yaml)['baz'])
- end
-
- def test_bad_seq_merge
- yaml = <<-eoyml
-defaults: &defaults [1, 2, 3]
-development:
- <<: *defaults
- eoyml
- assert_equal({'<<' => [1,2,3]}, Psych.load(yaml)['development'])
- end
-
- def test_missing_merge_key
- yaml = <<-eoyml
-bar:
- << : *foo
- eoyml
- exp = assert_raises(Psych::BadAlias) { Psych.load yaml }
- assert_match 'foo', exp.message
- end
-
# [ruby-core:34679]
def test_merge_key
yaml = <<-eoyml
diff --git a/test/psych/test_nil.rb b/test/psych/test_nil.rb
deleted file mode 100644
index 4f32b7703b..0000000000
--- a/test/psych/test_nil.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'psych/helper'
-
-module Psych
- class TestNil < TestCase
- def test_nil
- yml = Psych.dump nil
- assert_match(/--- \n(?:\.\.\.\n)?/, yml)
- assert_nil Psych.load(yml)
- end
-
- def test_array_nil
- yml = Psych.dump [nil]
- assert_equal "---\n- \n", yml
- assert_equal [nil], Psych.load(yml)
- end
-
- end
-end
diff --git a/test/psych/test_null.rb b/test/psych/test_null.rb
index 0fee1d2464..e953515ad8 100644
--- a/test/psych/test_null.rb
+++ b/test/psych/test_null.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
###
@@ -10,7 +10,7 @@ module Psych
---
- ~
- null
--
+-
- Null
- NULL
eoyml
diff --git a/test/psych/test_numeric.rb b/test/psych/test_numeric.rb
deleted file mode 100644
index 0858e799aa..0000000000
--- a/test/psych/test_numeric.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'psych/helper'
-require 'bigdecimal'
-
-module Psych
- ###
- # Test numerics from YAML spec:
- # http://yaml.org/type/float.html
- # http://yaml.org/type/int.html
- class TestNumeric < TestCase
- def setup
- @old_debug = $DEBUG
- $DEBUG = true
- end
-
- def teardown
- $DEBUG = @old_debug
- end
-
- def test_load_float_with_dot
- assert_equal 1.0, Psych.load('--- 1.')
- end
-
- def test_non_float_with_0
- str = Psych.load('--- 090')
- assert_equal '090', str
- end
-
- def test_big_decimal_tag
- decimal = BigDecimal("12.34")
- assert_match "!ruby/object:BigDecimal", Psych.dump(decimal)
- end
-
- def test_big_decimal_round_trip
- decimal = BigDecimal("12.34")
- assert_cycle decimal
- end
-
- def test_does_not_attempt_numeric
- str = Psych.load('--- 4 roses')
- assert_equal '4 roses', str
- str = Psych.load('--- 1.1.1')
- assert_equal '1.1.1', str
- end
- end
-end
diff --git a/test/psych/test_object.rb b/test/psych/test_object.rb
index 6145bb6ada..930f31f0b0 100644
--- a/test/psych/test_object.rb
+++ b/test/psych/test_object.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class Tagged
@@ -11,14 +11,6 @@ module Psych
end
end
- class Foo
- attr_accessor :parent
-
- def initialize parent
- @parent = parent
- end
- end
-
class TestObject < TestCase
def test_dump_with_tag
tag = Tagged.new
@@ -31,14 +23,5 @@ module Psych
assert_equal tag.baz, tag2.baz
assert_instance_of(Tagged, tag2)
end
-
- def test_cyclic_references
- foo = Foo.new(nil)
- foo.parent = foo
- loaded = Psych.load Psych.dump foo
-
- assert_instance_of(Foo, loaded)
- assert_equal loaded, loaded.parent
- end
end
end
diff --git a/test/psych/test_object_references.rb b/test/psych/test_object_references.rb
deleted file mode 100644
index 51d8085fa0..0000000000
--- a/test/psych/test_object_references.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'psych/helper'
-
-module Psych
- class TestObjectReferences < TestCase
- def test_range_has_references
- assert_reference_trip 1..2
- end
-
- def test_module_has_references
- assert_reference_trip Psych
- end
-
- def test_class_has_references
- assert_reference_trip TestObjectReferences
- end
-
- def test_rational_has_references
- assert_reference_trip Rational('1.2')
- end
-
- def test_complex_has_references
- assert_reference_trip Complex(1, 2)
- end
-
- def test_datetime_has_references
- assert_reference_trip DateTime.now
- end
-
- def assert_reference_trip obj
- yml = Psych.dump([obj, obj])
- assert_match(/\*-?\d+/, yml)
- data = Psych.load yml
- assert_equal data.first.object_id, data.last.object_id
- end
-
- def test_float_references
- data = Psych.load <<-eoyml
----\s
-- &name 1.2
-- *name
- eoyml
- assert_equal data.first, data.last
- assert_equal data.first.object_id, data.last.object_id
- end
-
- def test_binary_references
- data = Psych.load <<-eoyml
----
-- &name !binary |-
- aGVsbG8gd29ybGQh
-- *name
- eoyml
- assert_equal data.first, data.last
- assert_equal data.first.object_id, data.last.object_id
- end
-
- def test_regexp_references
- data = Psych.load <<-eoyml
----\s
-- &name !ruby/regexp /pattern/i
-- *name
- eoyml
- assert_equal data.first, data.last
- assert_equal data.first.object_id, data.last.object_id
- end
- end
-end
diff --git a/test/psych/test_omap.rb b/test/psych/test_omap.rb
index 34df724998..f2f36d15f3 100644
--- a/test/psych/test_omap.rb
+++ b/test/psych/test_omap.rb
@@ -1,14 +1,7 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestOmap < TestCase
- def test_parse_as_map
- o = Psych.load "--- !!omap\na: 1\nb: 2"
- assert_kind_of Psych::Omap, o
- assert_equal 1, o['a']
- assert_equal 2, o['b']
- end
-
def test_self_referential
map = Psych::Omap.new
map['foo'] = 'bar'
diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
index acbdd96f5c..6df474e620 100644
--- a/test/psych/test_parser.rb
+++ b/test/psych/test_parser.rb
@@ -1,16 +1,11 @@
-# coding: utf-8
-
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestParser < TestCase
class EventCatcher < Handler
- attr_accessor :parser
- attr_reader :calls, :marks
+ attr_reader :calls
def initialize
- @parser = nil
- @calls = []
- @marks = []
+ @calls = []
end
(Handler.instance_methods(true) -
@@ -18,7 +13,6 @@ module Psych
class_eval %{
def #{m} *args
super
- @marks << @parser.mark if @parser
@calls << [:#{m}, args]
end
}
@@ -27,129 +21,11 @@ module Psych
def setup
super
- @handler = EventCatcher.new
- @parser = Psych::Parser.new @handler
- @handler.parser = @parser
- end
-
- def test_ast_roundtrip
- parser = Psych.parser
- parser.parse('null')
- ast = parser.handler.root
- assert_match(/^null/, ast.yaml)
- end
-
- def test_exception_memory_leak
- yaml = <<-eoyaml
-%YAML 1.1
-%TAG ! tag:tenderlovemaking.com,2009:
---- &ponies
-- first element
-- *ponies
-- foo: bar
-...
- eoyaml
-
- [:start_stream, :start_document, :end_document, :alias, :scalar,
- :start_sequence, :end_sequence, :start_mapping, :end_mapping,
- :end_stream].each do |method|
-
- klass = Class.new(Psych::Handler) do
- define_method(method) do |*args|
- raise
- end
- end
-
- parser = Psych::Parser.new klass.new
- 2.times {
- assert_raises(RuntimeError, method.to_s) do
- parser.parse yaml
- end
- }
- end
- end
-
- def test_multiparse
- 3.times do
- @parser.parse '--- foo'
- end
- end
-
- def test_filename
- ex = assert_raises(Psych::SyntaxError) do
- @parser.parse '--- `', 'omg!'
- end
- assert_match 'omg!', ex.message
- end
-
- def test_line_numbers
- assert_equal 0, @parser.mark.line
- @parser.parse "---\n- hello\n- world"
- line_calls = @handler.marks.map(&:line).zip(@handler.calls.map(&:first))
- assert_equal [[0, :start_stream],
- [0, :start_document],
- [1, :start_sequence],
- [2, :scalar],
- [3, :scalar],
- [3, :end_sequence],
- [3, :end_document],
- [3, :end_stream]], line_calls
-
- assert_equal 3, @parser.mark.line
- end
-
- def test_column_numbers
- assert_equal 0, @parser.mark.column
- @parser.parse "---\n- hello\n- world"
- col_calls = @handler.marks.map(&:column).zip(@handler.calls.map(&:first))
- assert_equal [[0, :start_stream],
- [3, :start_document],
- [1, :start_sequence],
- [0, :scalar],
- [0, :scalar],
- [0, :end_sequence],
- [0, :end_document],
- [0, :end_stream]], col_calls
-
- assert_equal 0, @parser.mark.column
- end
-
- def test_index_numbers
- assert_equal 0, @parser.mark.index
- @parser.parse "---\n- hello\n- world"
- idx_calls = @handler.marks.map(&:index).zip(@handler.calls.map(&:first))
- assert_equal [[0, :start_stream],
- [3, :start_document],
- [5, :start_sequence],
- [12, :scalar],
- [19, :scalar],
- [19, :end_sequence],
- [19, :end_document],
- [19, :end_stream]], idx_calls
-
- assert_equal 19, @parser.mark.index
- end
-
- def test_bom
- tadpole = 'ãŠãŸã¾ã˜ã‚ƒãã—'
-
- # BOM + text
- yml = "\uFEFF#{tadpole}".encode('UTF-16LE')
- @parser.parse yml
- assert_equal tadpole, @parser.handler.calls[2][1].first
- end
-
- def test_external_encoding
- tadpole = 'ãŠãŸã¾ã˜ã‚ƒãã—'
-
- @parser.external_encoding = Psych::Parser::UTF16LE
- @parser.parse tadpole.encode 'UTF-16LE'
- assert_equal tadpole, @parser.handler.calls[2][1].first
+ @parser = Psych::Parser.new EventCatcher.new
end
def test_bogus_io
o = Object.new
- def o.external_encoding; nil end
def o.read len; self end
assert_raises(TypeError) do
@@ -170,31 +46,19 @@ module Psych
end
end
- def test_syntax_error_twice
- assert_raises(Psych::SyntaxError) do
- @parser.parse("---\n\"foo\"\n\"bar\"\n")
- end
-
- assert_raises(Psych::SyntaxError) do
- @parser.parse("---\n\"foo\"\n\"bar\"\n")
- end
- end
-
- def test_syntax_error_has_path_for_string
- e = assert_raises(Psych::SyntaxError) do
- @parser.parse("---\n\"foo\"\n\"bar\"\n")
- end
- assert_match '(<unknown>):', e.message
- end
-
- def test_syntax_error_has_path_for_io
- io = StringIO.new "---\n\"foo\"\n\"bar\"\n"
- def io.path; "hello!"; end
-
+ # ruby-core:34690
+ def test_exception_line
e = assert_raises(Psych::SyntaxError) do
- @parser.parse(io)
+ @parser.parse(<<-eoyaml)
+# based on "SGML/XML character entity reference" at http://www.bitjungle.com/isoent/
+#
+---
+#DOUBLE LOW-9 QUOTATION MARK
+#requires fontenc:T1
+ldquor: ,,
+ eoyaml
end
- assert_match "(#{io.path}):", e.message
+ assert_match 'line 6', e.message
end
def test_mapping_end
diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb
index 543367538a..0d33cb1970 100644
--- a/test/psych/test_psych.rb
+++ b/test/psych/test_psych.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
require 'stringio'
require 'tempfile'
@@ -8,41 +8,6 @@ class TestPsych < Psych::TestCase
Psych.domain_types.clear
end
- def test_line_width
- yml = Psych.dump('123456 7', { :line_width => 5 })
- assert_match(/^\s*7/, yml)
- end
-
- def test_indent
- yml = Psych.dump({:a => {'b' => 'c'}}, {:indentation => 5})
- assert_match(/^[ ]{5}b/, yml)
- end
-
- def test_canonical
- yml = Psych.dump({:a => {'b' => 'c'}}, {:canonical => true})
- assert_match(/\? "b/, yml)
- end
-
- def test_header
- yml = Psych.dump({:a => {'b' => 'c'}}, {:header => true})
- assert_match(/YAML/, yml)
- end
-
- def test_version_array
- yml = Psych.dump({:a => {'b' => 'c'}}, {:version => [1,1]})
- assert_match(/1.1/, yml)
- end
-
- def test_version_string
- yml = Psych.dump({:a => {'b' => 'c'}}, {:version => '1.1'})
- assert_match(/1.1/, yml)
- end
-
- def test_version_bool
- yml = Psych.dump({:a => {'b' => 'c'}}, {:version => true})
- assert_match(/1.1/, yml)
- end
-
def test_load_argument_error
assert_raises(TypeError) do
Psych.load nil
@@ -68,7 +33,6 @@ class TestPsych < Psych::TestCase
assert_equal io, Psych.dump(hash, io)
io.rewind
assert_equal Psych.dump(hash), io.read
- io.close(true)
end
end
@@ -100,7 +64,7 @@ class TestPsych < Psych::TestCase
def test_add_builtin_type
got = nil
- Psych.add_builtin_type 'omap' do |type, val|
+ Psych.add_builtin_type 'omap', do |type, val|
got = val
end
Psych.load('--- !!omap hello')
diff --git a/test/psych/test_scalar.rb b/test/psych/test_scalar.rb
index 3cf6b0938c..e6b76975a6 100644
--- a/test/psych/test_scalar.rb
+++ b/test/psych/test_scalar.rb
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestScalar < TestCase
diff --git a/test/psych/test_scalar_scanner.rb b/test/psych/test_scalar_scanner.rb
index 8483eabc7d..df54eb1eed 100644
--- a/test/psych/test_scalar_scanner.rb
+++ b/test/psych/test_scalar_scanner.rb
@@ -1,5 +1,4 @@
-require 'psych/helper'
-require 'date'
+require_relative 'helper'
module Psych
class TestScalarScanner < TestCase
@@ -21,38 +20,6 @@ module Psych
end
end
- def test_scan_bad_time
- [ '2001-12-15T02:59:73.1Z',
- '2001-12-14t90:59:43.10-05:00',
- '2001-92-14 21:59:43.10 -5',
- '2001-12-15 92:59:43.10',
- '2011-02-24 81:17:06 -0800',
- ].each do |time_str|
- assert_equal time_str, @ss.tokenize(time_str)
- end
- end
-
- def test_scan_bad_dates
- x = '2000-15-01'
- assert_equal x, @ss.tokenize(x)
-
- x = '2000-10-51'
- assert_equal x, @ss.tokenize(x)
-
- x = '2000-10-32'
- assert_equal x, @ss.tokenize(x)
- end
-
- def test_scan_good_edge_date
- x = '2000-1-31'
- assert_equal Date.strptime(x, '%Y-%m-%d'), @ss.tokenize(x)
- end
-
- def test_scan_bad_edge_date
- x = '2000-11-31'
- assert_equal x, @ss.tokenize(x)
- end
-
def test_scan_date
date = '1980-12-16'
token = @ss.tokenize date
@@ -98,9 +65,5 @@ module Psych
def test_scan_true
assert_equal true, ss.tokenize('true')
end
-
- def test_scan_strings_starting_with_underscores
- assert_equal "_100", ss.tokenize('_100')
- end
end
end
diff --git a/test/psych/test_serialize_subclasses.rb b/test/psych/test_serialize_subclasses.rb
index c8221928a1..f597b7a051 100644
--- a/test/psych/test_serialize_subclasses.rb
+++ b/test/psych/test_serialize_subclasses.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestSerializeSubclasses < TestCase
diff --git a/test/psych/test_set.rb b/test/psych/test_set.rb
index bea67d95b6..921fe2284f 100644
--- a/test/psych/test_set.rb
+++ b/test/psych/test_set.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestSet < TestCase
diff --git a/test/psych/test_stream.rb b/test/psych/test_stream.rb
deleted file mode 100644
index beca365608..0000000000
--- a/test/psych/test_stream.rb
+++ /dev/null
@@ -1,93 +0,0 @@
-require 'psych/helper'
-
-module Psych
- class TestStream < TestCase
- def test_parse_partial
- rb = Psych.parse("--- foo\n...\n--- `").to_ruby
- assert_equal 'foo', rb
- end
-
- def test_load_partial
- rb = Psych.load("--- foo\n...\n--- `")
- assert_equal 'foo', rb
- end
-
- def test_parse_stream_yields_documents
- list = []
- Psych.parse_stream("--- foo\n...\n--- bar") do |doc|
- list << doc.to_ruby
- end
- assert_equal %w{ foo bar }, list
- end
-
- def test_parse_stream_break
- list = []
- Psych.parse_stream("--- foo\n...\n--- `") do |doc|
- list << doc.to_ruby
- break
- end
- assert_equal %w{ foo }, list
- end
-
- def test_load_stream_yields_documents
- list = []
- Psych.load_stream("--- foo\n...\n--- bar") do |ruby|
- list << ruby
- end
- assert_equal %w{ foo bar }, list
- end
-
- def test_load_stream_break
- list = []
- Psych.load_stream("--- foo\n...\n--- `") do |ruby|
- list << ruby
- break
- end
- assert_equal %w{ foo }, list
- end
-
- def test_explicit_documents
- io = StringIO.new
- stream = Psych::Stream.new(io)
- stream.start
- stream.push({ 'foo' => 'bar' })
-
- assert !stream.finished?, 'stream not finished'
- stream.finish
- assert stream.finished?, 'stream finished'
-
- assert_match(/^---/, io.string)
- assert_match(/\.\.\.$/, io.string)
- end
-
- def test_start_takes_block
- io = StringIO.new
- stream = Psych::Stream.new(io)
- stream.start do |emitter|
- emitter.push({ 'foo' => 'bar' })
- end
-
- assert stream.finished?, 'stream finished'
- assert_match(/^---/, io.string)
- assert_match(/\.\.\.$/, io.string)
- end
-
- def test_no_backreferences
- io = StringIO.new
- stream = Psych::Stream.new(io)
- stream.start do |emitter|
- x = { 'foo' => 'bar' }
- emitter.push x
- emitter.push x
- end
-
- assert stream.finished?, 'stream finished'
- assert_match(/^---/, io.string)
- assert_match(/\.\.\.$/, io.string)
- assert_equal 2, io.string.scan('---').length
- assert_equal 2, io.string.scan('...').length
- assert_equal 2, io.string.scan('foo').length
- assert_equal 2, io.string.scan('bar').length
- end
- end
-end
diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb
index aa6866b618..1addc9fd22 100644
--- a/test/psych/test_string.rb
+++ b/test/psych/test_string.rb
@@ -1,65 +1,7 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestString < TestCase
- class X < String
- end
-
- class Y < String
- attr_accessor :val
- end
-
- class Z < String
- def initialize
- force_encoding Encoding::US_ASCII
- end
- end
-
- def test_another_subclass_with_attributes
- y = Psych.load Psych.dump Y.new("foo").tap {|y| y.val = 1}
- assert_equal "foo", y
- assert_equal Y, y.class
- assert_equal 1, y.val
- end
-
- def test_backwards_with_syck
- x = Psych.load "--- !str:#{X.name} foo\n\n"
- assert_equal X, x.class
- assert_equal 'foo', x
- end
-
- def test_empty_subclass
- assert_match "!ruby/string:#{X}", Psych.dump(X.new)
- x = Psych.load Psych.dump X.new
- assert_equal X, x.class
- end
-
- def test_empty_character_subclass
- assert_match "!ruby/string:#{Z}", Psych.dump(Z.new)
- x = Psych.load Psych.dump Z.new
- assert_equal Z, x.class
- end
-
- def test_subclass_with_attributes
- y = Psych.load Psych.dump Y.new.tap {|y| y.val = 1}
- assert_equal Y, y.class
- assert_equal 1, y.val
- end
-
- def test_string_with_base_60
- yaml = Psych.dump '01:03:05'
- assert_match "'01:03:05'", yaml
- assert_equal '01:03:05', Psych.load(yaml)
- end
-
- def test_nonascii_string_as_binary
- string = "hello \x80 world!"
- string.force_encoding 'ascii-8bit'
- yml = Psych.dump string
- assert_match(/binary/, yml)
- assert_equal string, Psych.load(yml)
- end
-
def test_binary_string_null
string = "\x00"
yml = Psych.dump string
@@ -81,13 +23,6 @@ module Psych
assert_equal string, Psych.load(yml)
end
- def test_ascii_only_8bit_string
- string = "abc".encode(Encoding::ASCII_8BIT)
- yml = Psych.dump string
- refute_match(/binary/, yml)
- assert_equal string, Psych.load(yml)
- end
-
def test_string_with_ivars
food = "is delicious"
ivar = "on rock and roll"
@@ -102,10 +37,6 @@ module Psych
assert_cycle string
end
- def test_float_confusion
- assert_cycle '1.'
- end
-
def binary_string percentage = 0.31, length = 100
string = ''
(percentage * length).to_i.times do |i|
diff --git a/test/psych/test_struct.rb b/test/psych/test_struct.rb
index 977aae08ba..5c6e9b85d2 100644
--- a/test/psych/test_struct.rb
+++ b/test/psych/test_struct.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
class PsychStructWithIvar < Struct.new(:foo)
attr_reader :bar
@@ -24,7 +24,9 @@ module Psych
loaded = Psych.load(Psych.dump(ss))
assert_instance_of(StructSubclass, loaded.foo)
- assert_equal(ss, loaded)
+ # FIXME: This seems to cause an infinite loop. wtf. Must report a bug
+ # in ruby.
+ # assert_equal(ss, loaded)
end
def test_roundtrip
@@ -37,7 +39,7 @@ module Psych
def test_load
obj = Psych.load(<<-eoyml)
---- !ruby/struct:PsychStructWithIvar
+--- !ruby/struct:PsychStructWithIvar
:foo: bar
:@bar: hello
eoyml
diff --git a/test/psych/test_symbol.rb b/test/psych/test_symbol.rb
index 3226141d02..2b4470d184 100644
--- a/test/psych/test_symbol.rb
+++ b/test/psych/test_symbol.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestSymbol < TestCase
diff --git a/test/psych/test_tainted.rb b/test/psych/test_tainted.rb
index fdcced4cf3..0b4e8207d3 100644
--- a/test/psych/test_tainted.rb
+++ b/test/psych/test_tainted.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require 'psych/handler'
module Psych
class TestStringTainted < TestCase
@@ -121,9 +121,7 @@ module Psych
t.binmode
t.write string
t.close
- File.open(t.path, 'r:bom|utf-8') { |f|
- @parser.parse f
- }
+ File.open(t.path) { |f| @parser.parse f }
t.close(true)
end
end
diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb
index 2636becf00..5b4860c435 100644
--- a/test/psych/test_to_yaml_properties.rb
+++ b/test/psych/test_to_yaml_properties.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestToYamlProperties < MiniTest::Unit::TestCase
diff --git a/test/psych/test_tree_builder.rb b/test/psych/test_tree_builder.rb
index 9a134d5a2d..7ad3ddd8a0 100644
--- a/test/psych/test_tree_builder.rb
+++ b/test/psych/test_tree_builder.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
module Psych
class TestTreeBuilder < TestCase
diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb
index 9891349118..20bf26e5b4 100644
--- a/test/psych/test_yaml.rb
+++ b/test/psych/test_yaml.rb
@@ -1,9 +1,8 @@
-# -*- coding: us-ascii; mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
+# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
# vim:sw=4:ts=4
# $Id$
#
-require 'psych/helper'
-require 'ostruct'
+require_relative 'helper'
# [ruby-core:01946]
module Psych_Tests
@@ -15,18 +14,6 @@ class Psych_Unit_Tests < Psych::TestCase
Psych.domain_types.clear
end
- def test_y_method
- assert_raises(NoMethodError) do
- OpenStruct.new.y 1
- end
- end
-
- def test_syck_compat
- time = Time.utc(2010, 10, 10)
- yaml = Psych.dump time
- assert_match "2010-10-10 00:00:00.000000000 Z", yaml
- end
-
# [ruby-core:34969]
def test_regexp_with_n
assert_cycle(Regexp.new('',0,'n'))
@@ -1266,24 +1253,4 @@ EOY
Psych.load("2000-01-01 00:00:00.#{"0"*1000} +00:00\n")
# '[ruby-core:13735]'
end
-
- def test_multiline_string_uses_literal_style
- yaml = Psych.dump("multi\nline\nstring")
- assert_match("|", yaml)
- end
-
- def test_string_starting_with_non_word_character_uses_double_quotes_without_exclamation_mark
- yaml = Psych.dump("@123'abc")
- refute_match("!", yaml)
- end
-
- def test_string_dump_with_colon
- yaml = Psych.dump 'x: foo'
- refute_match '!', yaml
- end
-
- def test_string_dump_starting_with_star
- yaml = Psych.dump '*foo'
- refute_match '!', yaml
- end
end
diff --git a/test/psych/test_yamldbm.rb b/test/psych/test_yamldbm.rb
deleted file mode 100644
index d9780035f2..0000000000
--- a/test/psych/test_yamldbm.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-require 'psych/helper'
-require 'tmpdir'
-
-begin
- require 'yaml/dbm'
-rescue LoadError
-end
-
-module Psych
- ::Psych::DBM = ::YAML::DBM unless defined?(::Psych::DBM)
-
- class YAMLDBMTest < TestCase
- def setup
- @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
- @dir = Dir.mktmpdir("rubytest-file")
- File.chown(-1, Process.gid, @dir)
- @yamldbm_file = make_tmp_filename("yamldbm")
- @yamldbm = YAML::DBM.new(@yamldbm_file)
- end
-
- def teardown
- YAML::ENGINE.yamler = @engine
- @yamldbm.clear
- @yamldbm.close
- FileUtils.remove_entry_secure @dir
- end
-
- def make_tmp_filename(prefix)
- @dir + "/" + prefix + File.basename(__FILE__) + ".#{$$}.test"
- end
-
- def test_store
- @yamldbm.store('a','b')
- @yamldbm.store('c','d')
- assert_equal 'b', @yamldbm['a']
- assert_equal 'd', @yamldbm['c']
- assert_nil @yamldbm['e']
- end
-
- def test_store_using_carret
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal 'b', @yamldbm['a']
- assert_equal 'd', @yamldbm['c']
- assert_nil @yamldbm['e']
- end
-
- def test_to_a
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal([['a','b'],['c','d']], @yamldbm.to_a.sort)
- end
-
- def test_to_hash
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal({'a'=>'b','c'=>'d'}, @yamldbm.to_hash)
- end
-
- def test_has_value?
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal true, @yamldbm.has_value?('b')
- assert_equal true, @yamldbm.has_value?('d')
- assert_equal false, @yamldbm.has_value?('f')
- end
-
- # Note:
- # YAML::DBM#index makes warning from internal of ::DBM#index.
- # It says 'DBM#index is deprecated; use DBM#key', but DBM#key
- # behaves not same as DBM#index.
- #
- # def test_index
- # @yamldbm['a'] = 'b'
- # @yamldbm['c'] = 'd'
- # assert_equal 'a', @yamldbm.index('b')
- # assert_equal 'c', @yamldbm.index('d')
- # assert_nil @yamldbm.index('f')
- # end
-
- def test_key
- skip 'only on ruby 2.0.0' if RUBY_VERSION < '2.0.0'
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal 'a', @yamldbm.key('b')
- assert_equal 'c', @yamldbm.key('d')
- assert_nil @yamldbm.key('f')
- end
-
- def test_fetch
- assert_equal('bar', @yamldbm['foo']='bar')
- assert_equal('bar', @yamldbm.fetch('foo'))
- assert_nil @yamldbm.fetch('bar')
- assert_equal('baz', @yamldbm.fetch('bar', 'baz'))
- assert_equal('foobar', @yamldbm.fetch('bar') {|key| 'foo' + key })
- end
-
- def test_shift
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal([['a','b'], ['c','d']],
- [@yamldbm.shift, @yamldbm.shift].sort)
- assert_nil @yamldbm.shift
- end
-
- def test_invert
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal({'b'=>'a','d'=>'c'}, @yamldbm.invert)
- end
-
- def test_update
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- @yamldbm.update({'c'=>'d','e'=>'f'})
- assert_equal 'b', @yamldbm['a']
- assert_equal 'd', @yamldbm['c']
- assert_equal 'f', @yamldbm['e']
- end
-
- def test_replace
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- @yamldbm.replace({'c'=>'d','e'=>'f'})
- assert_nil @yamldbm['a']
- assert_equal 'd', @yamldbm['c']
- assert_equal 'f', @yamldbm['e']
- end
-
- def test_delete
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal 'b', @yamldbm.delete('a')
- assert_nil @yamldbm['a']
- assert_equal 'd', @yamldbm['c']
- assert_nil @yamldbm.delete('e')
- end
-
- def test_delete_if
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- @yamldbm['e'] = 'f'
-
- @yamldbm.delete_if {|k,v| k == 'a'}
- assert_nil @yamldbm['a']
- assert_equal 'd', @yamldbm['c']
- assert_equal 'f', @yamldbm['e']
-
- @yamldbm.delete_if {|k,v| v == 'd'}
- assert_nil @yamldbm['c']
- assert_equal 'f', @yamldbm['e']
-
- @yamldbm.delete_if {|k,v| false }
- assert_equal 'f', @yamldbm['e']
- end
-
- def test_reject
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- @yamldbm['e'] = 'f'
- assert_equal({'c'=>'d','e'=>'f'}, @yamldbm.reject {|k,v| k == 'a'})
- assert_equal({'a'=>'b','e'=>'f'}, @yamldbm.reject {|k,v| v == 'd'})
- assert_equal({'a'=>'b','c'=>'d','e'=>'f'}, @yamldbm.reject {false})
- end
-
- def test_values
- assert_equal [], @yamldbm.values
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal ['b','d'], @yamldbm.values.sort
- end
-
- def test_values_at
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- assert_equal ['b','d'], @yamldbm.values_at('a','c')
- end
-
- def test_selsct
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- @yamldbm['e'] = 'f'
- assert_equal(['b','d'], @yamldbm.select('a','c'))
- end
-
- def test_selsct_with_block
- @yamldbm['a'] = 'b'
- @yamldbm['c'] = 'd'
- @yamldbm['e'] = 'f'
- assert_equal([['a','b']], @yamldbm.select {|k,v| k == 'a'})
- assert_equal([['c','d']], @yamldbm.select {|k,v| v == 'd'})
- assert_equal([], @yamldbm.select {false})
- end
- end
-end if defined?(YAML::DBM) && defined?(Psych)
diff --git a/test/psych/test_yamlstore.rb b/test/psych/test_yamlstore.rb
deleted file mode 100644
index 5d6fcb79b2..0000000000
--- a/test/psych/test_yamlstore.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'psych/helper'
-require 'yaml/store'
-require 'tmpdir'
-
-module Psych
- Psych::Store = YAML::Store unless defined?(Psych::Store)
-
- class YAMLStoreTest < TestCase
- def setup
- @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
- @dir = Dir.mktmpdir("rubytest-file")
- File.chown(-1, Process.gid, @dir)
- @yamlstore_file = make_tmp_filename("yamlstore")
- @yamlstore = YAML::Store.new(@yamlstore_file)
- end
-
- def teardown
- YAML::ENGINE.yamler = @engine
- FileUtils.remove_entry_secure @dir
- end
-
- def make_tmp_filename(prefix)
- @dir + "/" + prefix + File.basename(__FILE__) + ".#{$$}.test"
- end
-
- def test_opening_new_file_in_readonly_mode_should_result_in_empty_values
- @yamlstore.transaction(true) do
- assert_nil @yamlstore[:foo]
- assert_nil @yamlstore[:bar]
- end
- end
-
- def test_opening_new_file_in_readwrite_mode_should_result_in_empty_values
- @yamlstore.transaction do
- assert_nil @yamlstore[:foo]
- assert_nil @yamlstore[:bar]
- end
- end
-
- def test_data_should_be_loaded_correctly_when_in_readonly_mode
- @yamlstore.transaction do
- @yamlstore[:foo] = "bar"
- end
- @yamlstore.transaction(true) do
- assert_equal "bar", @yamlstore[:foo]
- end
- end
-
- def test_data_should_be_loaded_correctly_when_in_readwrite_mode
- @yamlstore.transaction do
- @yamlstore[:foo] = "bar"
- end
- @yamlstore.transaction do
- assert_equal "bar", @yamlstore[:foo]
- end
- end
-
- def test_changes_after_commit_are_discarded
- @yamlstore.transaction do
- @yamlstore[:foo] = "bar"
- @yamlstore.commit
- @yamlstore[:foo] = "baz"
- end
- @yamlstore.transaction(true) do
- assert_equal "bar", @yamlstore[:foo]
- end
- end
-
- def test_changes_are_not_written_on_abort
- @yamlstore.transaction do
- @yamlstore[:foo] = "bar"
- @yamlstore.abort
- end
- @yamlstore.transaction(true) do
- assert_nil @yamlstore[:foo]
- end
- end
-
- def test_writing_inside_readonly_transaction_raises_error
- assert_raises(PStore::Error) do
- @yamlstore.transaction(true) do
- @yamlstore[:foo] = "bar"
- end
- end
- end
- end
-end if defined?(Psych)
diff --git a/test/psych/visitors/test_depth_first.rb b/test/psych/visitors/test_depth_first.rb
deleted file mode 100644
index 837c8e8c11..0000000000
--- a/test/psych/visitors/test_depth_first.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'psych/helper'
-
-module Psych
- module Visitors
- class TestDepthFirst < TestCase
- class Collector < Struct.new(:calls)
- def initialize(calls = [])
- super
- end
-
- def call obj
- calls << obj
- end
- end
-
- def test_scalar
- collector = Collector.new
- visitor = Visitors::DepthFirst.new collector
- visitor.accept Psych.parse_stream '--- hello'
-
- assert_equal 3, collector.calls.length
- end
-
- def test_sequence
- collector = Collector.new
- visitor = Visitors::DepthFirst.new collector
- visitor.accept Psych.parse_stream "---\n- hello"
-
- assert_equal 4, collector.calls.length
- end
-
- def test_mapping
- collector = Collector.new
- visitor = Visitors::DepthFirst.new collector
- visitor.accept Psych.parse_stream "---\nhello: world"
-
- assert_equal 5, collector.calls.length
- end
-
- def test_alias
- collector = Collector.new
- visitor = Visitors::DepthFirst.new collector
- visitor.accept Psych.parse_stream "--- &yay\n- foo\n- *yay\n"
-
- assert_equal 5, collector.calls.length
- end
- end
- end
-end
diff --git a/test/psych/visitors/test_emitter.rb b/test/psych/visitors/test_emitter.rb
index 780c953693..bdae1bd855 100644
--- a/test/psych/visitors/test_emitter.rb
+++ b/test/psych/visitors/test_emitter.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative '../helper'
module Psych
module Visitors
@@ -9,26 +9,6 @@ module Psych
@visitor = Visitors::Emitter.new @io
end
- def test_options
- io = StringIO.new
- visitor = Visitors::Emitter.new io, :indentation => 3
-
- s = Nodes::Stream.new
- doc = Nodes::Document.new
- mapping = Nodes::Mapping.new
- m2 = Nodes::Mapping.new
- m2.children << Nodes::Scalar.new('a')
- m2.children << Nodes::Scalar.new('b')
-
- mapping.children << Nodes::Scalar.new('key')
- mapping.children << m2
- doc.children << mapping
- s.children << doc
-
- visitor.accept s
- assert_match(/^[ ]{3}a/, io.string)
- end
-
def test_stream
s = Nodes::Stream.new
@visitor.accept s
@@ -46,7 +26,7 @@ module Psych
@visitor.accept s
assert_match(/1.1/, @io.string)
- assert_equal @io.string, s.yaml
+ assert_equal @io.string, s.to_yaml
end
def test_document_implicit_end
@@ -61,8 +41,8 @@ module Psych
@visitor.accept s
assert_match(/key: value/, @io.string)
- assert_equal @io.string, s.yaml
- assert(/\.\.\./ !~ s.yaml)
+ assert_equal @io.string, s.to_yaml
+ assert(/\.\.\./ !~ s.to_yaml)
end
def test_scalar
@@ -76,7 +56,7 @@ module Psych
@visitor.accept s
assert_match(/hello/, @io.string)
- assert_equal @io.string, s.yaml
+ assert_equal @io.string, s.to_yaml
end
def test_scalar_with_tag
@@ -91,7 +71,7 @@ module Psych
assert_match(/str/, @io.string)
assert_match(/hello/, @io.string)
- assert_equal @io.string, s.yaml
+ assert_equal @io.string, s.to_yaml
end
def test_sequence
@@ -107,7 +87,7 @@ module Psych
@visitor.accept s
assert_match(/- hello/, @io.string)
- assert_equal @io.string, s.yaml
+ assert_equal @io.string, s.to_yaml
end
def test_mapping
@@ -122,7 +102,7 @@ module Psych
@visitor.accept s
assert_match(/key: value/, @io.string)
- assert_equal @io.string, s.yaml
+ assert_equal @io.string, s.to_yaml
end
def test_alias
@@ -137,7 +117,7 @@ module Psych
@visitor.accept s
assert_match(/&A key: \*A/, @io.string)
- assert_equal @io.string, s.yaml
+ assert_equal @io.string, s.to_yaml
end
end
end
diff --git a/test/psych/visitors/test_to_ruby.rb b/test/psych/visitors/test_to_ruby.rb
index ee473c9ba2..b5b8e1443d 100644
--- a/test/psych/visitors/test_to_ruby.rb
+++ b/test/psych/visitors/test_to_ruby.rb
@@ -1,5 +1,4 @@
-# coding: US-ASCII
-require 'psych/helper'
+require_relative '../helper'
module Psych
module Visitors
diff --git a/test/psych/visitors/test_yaml_tree.rb b/test/psych/visitors/test_yaml_tree.rb
index 496cdd05cc..ed89e78600 100644
--- a/test/psych/visitors/test_yaml_tree.rb
+++ b/test/psych/visitors/test_yaml_tree.rb
@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative '../helper'
module Psych
module Visitors
@@ -8,24 +8,6 @@ module Psych
@v = Visitors::YAMLTree.new
end
- def test_tree_can_be_called_twice
- @v.start
- @v << Object.new
- t = @v.tree
- assert_equal t, @v.tree
- end
-
- def test_yaml_tree_can_take_an_emitter
- io = StringIO.new
- e = Psych::Emitter.new io
- v = Visitors::YAMLTree.new({}, e)
- v.start
- v << "hello world"
- v.finish
-
- assert_match "hello world", io.string
- end
-
def test_binary_formatting
gif = "GIF89a\f\x00\f\x00\x84\x00\x00\xFF\xFF\xF7\xF5\xF5\xEE\xE9\xE9\xE5fff\x00\x00\x00\xE7\xE7\xE7^^^\xF3\xF3\xED\x8E\x8E\x8E\xE0\xE0\xE0\x9F\x9F\x9F\x93\x93\x93\xA7\xA7\xA7\x9E\x9E\x9Eiiiccc\xA3\xA3\xA3\x84\x84\x84\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9\xFF\xFE\xF9!\xFE\x0EMade with GIMP\x00,\x00\x00\x00\x00\f\x00\f\x00\x00\x05, \x8E\x810\x9E\xE3@\x14\xE8i\x10\xC4\xD1\x8A\b\x1C\xCF\x80M$z\xEF\xFF0\x85p\xB8\xB01f\r\e\xCE\x01\xC3\x01\x1E\x10' \x82\n\x01\x00;"
@v << gif
@@ -56,12 +38,6 @@ module Psych
assert_equal s.foo, obj.foo
end
- def test_override_method
- s = Struct.new(:method).new('override')
- obj = Psych.load(Psych.dump(s))
- assert_equal s.method, obj.method
- end
-
def test_exception
ex = Exception.new 'foo'
loaded = Psych.load(Psych.dump(ex))
diff --git a/test/rake/capture_stdout.rb b/test/rake/capture_stdout.rb
new file mode 100644
index 0000000000..f54ec42f69
--- /dev/null
+++ b/test/rake/capture_stdout.rb
@@ -0,0 +1,24 @@
+require 'stringio'
+
+# Mix-in for capturing standard output.
+module CaptureStdout
+ def capture_stdout
+ s = StringIO.new
+ oldstdout = $stdout
+ $stdout = s
+ yield
+ s.string
+ ensure
+ $stdout = oldstdout
+ end
+
+ def capture_stderr
+ s = StringIO.new
+ oldstderr = $stderr
+ $stderr = s
+ yield
+ s.string
+ ensure
+ $stderr = oldstderr
+ end
+end
diff --git a/test/rake/check_expansion.rb b/test/rake/check_expansion.rb
new file mode 100644
index 0000000000..659cf71e51
--- /dev/null
+++ b/test/rake/check_expansion.rb
@@ -0,0 +1,5 @@
+if ARGV[0] != ARGV[1]
+ exit 1
+else
+ exit 0
+end
diff --git a/test/rake/check_no_expansion.rb b/test/rake/check_no_expansion.rb
new file mode 100644
index 0000000000..24f586a7f5
--- /dev/null
+++ b/test/rake/check_no_expansion.rb
@@ -0,0 +1,5 @@
+if ARGV[0] != ARGV[1]
+ exit 0
+else
+ exit 1
+end
diff --git a/test/rake/contrib/test_ftp.rb b/test/rake/contrib/test_ftp.rb
new file mode 100644
index 0000000000..0346dd71ca
--- /dev/null
+++ b/test/rake/contrib/test_ftp.rb
@@ -0,0 +1,55 @@
+require 'date'
+require 'time'
+require 'test/unit'
+require 'rake/contrib/ftptools'
+
+class Rake::TestFtpFile < Test::Unit::TestCase
+ class FakeDate
+ def self.today
+ Date.new(2003,10,3)
+ end
+ def self.now
+ Time.local(2003,10,3,12,00,00)
+ end
+ end
+
+ def setup
+ Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }
+ end
+
+ def test_general
+ file = Rake::FtpFile.new("here", "-rw-r--r-- 1 a279376 develop 121770 Mar 6 14:50 wiki.pl")
+ assert_equal "wiki.pl", file.name
+ assert_equal "here/wiki.pl", file.path
+ assert_equal "a279376", file.owner
+ assert_equal "develop", file.group
+ assert_equal 0644, file.mode
+ assert_equal 121770, file.size
+ assert_equal Time.mktime(2003,3,6,14,50,0,0), file.time
+ assert ! file.directory?
+ assert ! file.symlink?
+ end
+
+ def test_far_date
+ file = Rake::FtpFile.new(".", "drwxr-xr-x 3 a279376 develop 4096 Nov 26 2001 vss")
+ assert_equal Time.mktime(2001,11,26,0,0,0,0), file.time
+ end
+
+ def test_close_date
+ file = Rake::FtpFile.new(".", "drwxr-xr-x 3 a279376 develop 4096 Nov 26 15:35 vss")
+ assert_equal Time.mktime(2002,11,26,15,35,0,0), file.time
+ end
+
+ def test_directory
+ file = Rake::FtpFile.new(".", "drwxrwxr-x 9 a279376 develop 4096 Mar 13 14:32 working")
+ assert file.directory?
+ assert !file.symlink?
+ end
+
+ def test_symlink
+ file = Rake::FtpFile.new(".", "lrwxrwxrwx 1 a279376 develop 64 Mar 26 2002 xtrac -> /home/a279376/working/ics/development/java/com/fmr/fwp/ics/xtrac")
+ assert_equal 'xtrac', file.name
+ assert file.symlink?
+ assert !file.directory?
+ end
+end
diff --git a/test/rake/data/chains/Rakefile b/test/rake/data/chains/Rakefile
new file mode 100644
index 0000000000..31bdc2578d
--- /dev/null
+++ b/test/rake/data/chains/Rakefile
@@ -0,0 +1,15 @@
+# -*- ruby -*-
+
+task :default => "play.app"
+
+file "play.scpt" => "base" do |t|
+ cp t.prerequisites.first, t.name
+end
+
+rule ".app" => ".scpt" do |t|
+ cp t.source, t.name
+end
+
+file 'base' do
+ touch 'base'
+end
diff --git a/test/rake/data/default/Rakefile b/test/rake/data/default/Rakefile
new file mode 100644
index 0000000000..22ed5e0ca9
--- /dev/null
+++ b/test/rake/data/default/Rakefile
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+if ENV['TESTTOPSCOPE']
+ puts "TOPSCOPE"
+end
+
+task :default do
+ puts "DEFAULT"
+end
+
+task :other => [:default] do
+ puts "OTHER"
+end
+
+task :task_scope do
+ if ENV['TESTTASKSCOPE']
+ puts "TASKSCOPE"
+ end
+end
diff --git a/test/rake/data/dryrun/Rakefile b/test/rake/data/dryrun/Rakefile
new file mode 100644
index 0000000000..0a68a0d606
--- /dev/null
+++ b/test/rake/data/dryrun/Rakefile
@@ -0,0 +1,22 @@
+#
+
+task :default => ["temp_main"]
+
+file "temp_main" => [:all_apps] do touch "temp_main" end
+
+task :all_apps => [:one, :two]
+task :one => ["temp_one"]
+task :two => ["temp_two"]
+
+file "temp_one" do |t|
+ touch "temp_one"
+end
+file "temp_two" do |t|
+ touch "temp_two"
+end
+
+task :clean do
+ ["temp_one", "temp_two", "temp_main"].each do |file|
+ rm_f file
+ end
+end
diff --git a/test/rake/data/file_creation_task/Rakefile b/test/rake/data/file_creation_task/Rakefile
new file mode 100644
index 0000000000..94641b6972
--- /dev/null
+++ b/test/rake/data/file_creation_task/Rakefile
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+N = 2
+
+task :default => :run
+
+BUILD_DIR = 'build'
+task :clean do
+ rm_rf 'build'
+ rm_rf 'src'
+end
+
+task :run
+
+TARGET_DIR = 'build/copies'
+
+FileList['src/*'].each do |src|
+ directory TARGET_DIR
+ target = File.join TARGET_DIR, File.basename(src)
+ file target => [src, TARGET_DIR] do
+ cp src, target
+ # sleep 3 if src !~ /foo#{N-1}$/ # I'm commenting out this sleep, it doesn't seem to do anything.
+ end
+ task :run => target
+end
+
+task :prep => :clean do
+ mkdir_p 'src'
+ N.times do |n|
+ puts "DBG: Touching src/foo#{n}"
+ touch "src/foo#{n}"
+ end
+end
diff --git a/test/rake/data/imports/Rakefile b/test/rake/data/imports/Rakefile
new file mode 100644
index 0000000000..6a60f612bc
--- /dev/null
+++ b/test/rake/data/imports/Rakefile
@@ -0,0 +1,19 @@
+# -*- ruby -*-
+
+require 'rake/loaders/makefile'
+
+task :default
+
+task :other do
+ puts "OTHER"
+end
+
+file "dynamic_deps" do |t|
+ open(t.name, "w") do |f| f.puts "puts 'DYNAMIC'" end
+end
+
+import "dynamic_deps"
+import "static_deps"
+import "static_deps"
+import "deps.mf"
+puts "FIRST"
diff --git a/test/rake/data/imports/deps.mf b/test/rake/data/imports/deps.mf
new file mode 100644
index 0000000000..04643d0d8e
--- /dev/null
+++ b/test/rake/data/imports/deps.mf
@@ -0,0 +1 @@
+default: other
diff --git a/test/rake/data/multidesc/Rakefile b/test/rake/data/multidesc/Rakefile
new file mode 100644
index 0000000000..5342481922
--- /dev/null
+++ b/test/rake/data/multidesc/Rakefile
@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+task :b
+
+desc "A"
+task :a
+
+desc "B"
+task :b
+
+desc "A2"
+task :a
+
+task :c
+
+desc "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+task :d
diff --git a/test/rake/data/namespace/Rakefile b/test/rake/data/namespace/Rakefile
new file mode 100644
index 0000000000..6de98edae9
--- /dev/null
+++ b/test/rake/data/namespace/Rakefile
@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+desc "copy"
+task :copy do
+ puts "COPY"
+end
+
+namespace "nest" do
+ desc "nest copy"
+ task :copy do
+ puts "NEST COPY"
+ end
+ task :xx => :copy
+end
+
+anon_ns = namespace do
+ desc "anonymous copy task"
+ task :copy do
+ puts "ANON COPY"
+ end
+end
+
+desc "Top level task to run the anonymous version of copy"
+task :anon => anon_ns[:copy]
+
+namespace "very" do
+ namespace "nested" do
+ task "run" => "rake:copy"
+ end
+end
+
+namespace "a" do
+ desc "Run task in the 'a' namespace"
+ task "run" do
+ puts "IN A"
+ end
+end
+
+namespace "b" do
+ desc "Run task in the 'b' namespace"
+ task "run" => "a:run" do
+ puts "IN B"
+ end
+end
+
+namespace "file1" do
+ file "xyz.rb" do
+ puts "XYZ1"
+ end
+end
+
+namespace "file2" do
+ file "xyz.rb" do
+ puts "XYZ2"
+ end
+end
+
diff --git a/test/rake/data/rakelib/test1.rake b/test/rake/data/rakelib/test1.rake
new file mode 100644
index 0000000000..bb1c419b40
--- /dev/null
+++ b/test/rake/data/rakelib/test1.rake
@@ -0,0 +1,3 @@
+task :default do
+ puts "TEST1"
+end
diff --git a/test/rake/data/rbext/rakefile.rb b/test/rake/data/rbext/rakefile.rb
new file mode 100644
index 0000000000..670604d733
--- /dev/null
+++ b/test/rake/data/rbext/rakefile.rb
@@ -0,0 +1,3 @@
+task :default do
+ puts "OK"
+end
diff --git a/test/rake/data/sample.mf b/test/rake/data/sample.mf
new file mode 100644
index 0000000000..778e9d456f
--- /dev/null
+++ b/test/rake/data/sample.mf
@@ -0,0 +1,14 @@
+# Comments
+a: a1 a2 a3 a4
+b: b1 b2 b3 \
+ b4 b5 b6\
+# Mid: Comment
+b7
+
+ a : a5 a6 a7
+c: c1
+d: d1 d2 \
+
+e f : e1 f1
+
+g\ 0: g1 g\ 2 g\ 3 g4
diff --git a/test/rake/data/statusreturn/Rakefile b/test/rake/data/statusreturn/Rakefile
new file mode 100644
index 0000000000..68023052f8
--- /dev/null
+++ b/test/rake/data/statusreturn/Rakefile
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+task :exit5 do
+ exit(5)
+end
+
+task :normal do
+end
diff --git a/test/rake/data/unittest/Rakefile b/test/rake/data/unittest/Rakefile
new file mode 100644
index 0000000000..9c3b8ac11c
--- /dev/null
+++ b/test/rake/data/unittest/Rakefile
@@ -0,0 +1 @@
+# Empty Rakefile for Unit Test
diff --git a/test/rake/data/unittest/subdir/.gitignore b/test/rake/data/unittest/subdir/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/test/rake/data/unittest/subdir/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/test/rake/file_creation.rb b/test/rake/file_creation.rb
deleted file mode 100644
index facc57a038..0000000000
--- a/test/rake/file_creation.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module FileCreation
- OLDFILE = "old"
- NEWFILE = "new"
-
- def create_timed_files(oldfile, *newfiles)
- return if (File.exist?(oldfile) &&
- newfiles.all? { |newfile|
- File.exist?(newfile) && File.stat(newfile).mtime > File.stat(oldfile).mtime
- })
- now = Time.now
-
- create_file(oldfile, now - 60)
-
- newfiles.each do |newfile|
- create_file(newfile, now)
- end
- end
-
- def create_dir(dirname)
- FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
- File.stat(dirname).mtime
- end
-
- def create_file(name, file_time=nil)
- create_dir(File.dirname(name))
- FileUtils.touch(name) unless File.exist?(name)
- File.utime(file_time, file_time, name) unless file_time.nil?
- File.stat(name).mtime
- end
-
- def delete_file(name)
- File.delete(name) rescue nil
- end
-end
diff --git a/test/rake/filecreation.rb b/test/rake/filecreation.rb
new file mode 100644
index 0000000000..e4c6e347da
--- /dev/null
+++ b/test/rake/filecreation.rb
@@ -0,0 +1,30 @@
+module FileCreation
+ OLDFILE = "testdata/old"
+ NEWFILE = "testdata/new"
+
+ def create_timed_files(oldfile, *newfiles)
+ return if File.exist?(oldfile) && newfiles.all? { |newfile| File.exist?(newfile) }
+ old_time = create_file(oldfile)
+ newfiles.each do |newfile|
+ while create_file(newfile) <= old_time
+ sleep(0.1)
+ File.delete(newfile) rescue nil
+ end
+ end
+ end
+
+ def create_dir(dirname)
+ FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
+ File.stat(dirname).mtime
+ end
+
+ def create_file(name)
+ create_dir(File.dirname(name))
+ FileUtils.touch(name) unless File.exist?(name)
+ File.stat(name).mtime
+ end
+
+ def delete_file(name)
+ File.delete(name) rescue nil
+ end
+end
diff --git a/test/rake/helper.rb b/test/rake/helper.rb
deleted file mode 100644
index 9817e8f0cd..0000000000
--- a/test/rake/helper.rb
+++ /dev/null
@@ -1,562 +0,0 @@
-require 'rubygems'
-$:.unshift File.expand_path('../../lib', __FILE__)
-
-begin
- gem 'minitest'
-rescue Gem::LoadError
-end
-
-require 'minitest/autorun'
-require 'rake'
-require 'tmpdir'
-require File.expand_path('../file_creation', __FILE__)
-
-begin
- require_relative '../ruby/envutil'
-rescue NoMethodError, LoadError
- # for ruby trunk
-end
-
-class Rake::TestCase < MiniTest::Unit::TestCase
- include FileCreation
-
- include Rake::DSL
-
- class TaskManager
- include Rake::TaskManager
- end
-
- RUBY = defined?(EnvUtil) ? EnvUtil.rubybin : Gem.ruby
-
- def setup
- ARGV.clear
-
- test_dir = File.basename File.dirname File.expand_path __FILE__
-
- @rake_root = if test_dir == 'test' then
- # rake repository
- File.expand_path '../../', __FILE__
- else
- # ruby repository
- File.expand_path '../../../', __FILE__
- end
-
- @rake_exec = File.join @rake_root, 'bin', 'rake'
- @rake_lib = File.join @rake_root, 'lib'
-
- @orig_PWD = Dir.pwd
- @orig_APPDATA = ENV['APPDATA']
- @orig_HOME = ENV['HOME']
- @orig_HOMEDRIVE = ENV['HOMEDRIVE']
- @orig_HOMEPATH = ENV['HOMEPATH']
- @orig_RAKE_COLUMNS = ENV['RAKE_COLUMNS']
- @orig_RAKE_SYSTEM = ENV['RAKE_SYSTEM']
- @orig_RAKEOPT = ENV['RAKEOPT']
- @orig_USERPROFILE = ENV['USERPROFILE']
- ENV.delete 'RAKE_COLUMNS'
- ENV.delete 'RAKE_SYSTEM'
- ENV.delete 'RAKEOPT'
-
- tmpdir = Dir.chdir Dir.tmpdir do Dir.pwd end
- @tempdir = File.join tmpdir, "test_rake_#{$$}"
-
- FileUtils.mkdir_p @tempdir
-
- Dir.chdir @tempdir
-
- Rake.application = Rake::Application.new
- Rake::TaskManager.record_task_metadata = true
- RakeFileUtils.verbose_flag = false
- end
-
- def teardown
- Dir.chdir @orig_PWD
- FileUtils.rm_rf @tempdir
-
- if @orig_APPDATA then
- ENV['APPDATA'] = @orig_APPDATA
- else
- ENV.delete 'APPDATA'
- end
-
- ENV['HOME'] = @orig_HOME
- ENV['HOMEDRIVE'] = @orig_HOMEDRIVE
- ENV['HOMEPATH'] = @orig_HOMEPATH
- ENV['RAKE_COLUMNS'] = @orig_RAKE_COLUMNS
- ENV['RAKE_SYSTEM'] = @orig_RAKE_SYSTEM
- ENV['RAKEOPT'] = @orig_RAKEOPT
- ENV['USERPROFILE'] = @orig_USERPROFILE
- end
-
- def ignore_deprecations
- Rake.application.options.ignore_deprecate = true
- yield
- ensure
- Rake.application.options.ignore_deprecate = false
- end
-
- def rake_system_dir
- @system_dir = 'system'
-
- FileUtils.mkdir_p @system_dir
-
- open File.join(@system_dir, 'sys1.rake'), 'w' do |io|
- io << <<-SYS
-task "sys1" do
- puts "SYS1"
-end
- SYS
- end
-
- ENV['RAKE_SYSTEM'] = @system_dir
- end
-
- def rakefile contents
- open 'Rakefile', 'w' do |io|
- io << contents
- end
- end
-
- def rakefile_access
- rakefile <<-ACCESS
-TOP_LEVEL_CONSTANT = 0
-
-def a_top_level_function
-end
-
-task :default => [:work, :obj, :const]
-
-task :work do
- begin
- a_top_level_function
- puts "GOOD:M Top level methods can be called in tasks"
- rescue NameError => ex
- puts "BAD:M Top level methods can not be called in tasks"
- end
-end
-
-# TODO: remove `disabled_' when DeprecatedObjectDSL removed
-task :obj
-task :disabled_obj do
- begin
- Object.new.instance_eval { task :xyzzy }
- puts "BAD:D Rake DSL are polluting objects"
- rescue StandardError => ex
- puts "GOOD:D Rake DSL are not polluting objects"
- end
-end
-
-task :const do
- begin
- TOP_LEVEL_CONSTANT
- puts "GOOD:C Top level constants are available in tasks"
- rescue StandardError => ex
- puts "BAD:C Top level constants are NOT available in tasks"
- end
-end
- ACCESS
- end
-
- def rakefile_chains
- rakefile <<-DEFAULT
-task :default => "play.app"
-
-file "play.scpt" => "base" do |t|
- cp t.prerequisites.first, t.name
-end
-
-rule ".app" => ".scpt" do |t|
- cp t.source, t.name
-end
-
-file 'base' do
- touch 'base'
-end
- DEFAULT
- end
-
- def rakefile_comments
- rakefile <<-COMMENTS
-# comment for t1
-task :t1 do
-end
-
-# no comment or task because there's a blank line
-
-task :t2 do
-end
-
-desc "override comment for t3"
-# this is not the description
-multitask :t3 do
-end
-
-# this is not the description
-desc "override comment for t4"
-file :t4 do
-end
- COMMENTS
- end
-
- def rakefile_default
- rakefile <<-DEFAULT
-if ENV['TESTTOPSCOPE']
- puts "TOPSCOPE"
-end
-
-task :default do
- puts "DEFAULT"
-end
-
-task :other => [:default] do
- puts "OTHER"
-end
-
-task :task_scope do
- if ENV['TESTTASKSCOPE']
- puts "TASKSCOPE"
- end
-end
- DEFAULT
- end
-
- def rakefile_dryrun
- rakefile <<-DRYRUN
-task :default => ["temp_main"]
-
-file "temp_main" => [:all_apps] do touch "temp_main" end
-
-task :all_apps => [:one, :two]
-task :one => ["temp_one"]
-task :two => ["temp_two"]
-
-file "temp_one" do |t|
- touch "temp_one"
-end
-file "temp_two" do |t|
- touch "temp_two"
-end
-
-task :clean do
- ["temp_one", "temp_two", "temp_main"].each do |file|
- rm_f file
- end
-end
- DRYRUN
-
- FileUtils.touch 'temp_main'
- FileUtils.touch 'temp_two'
- end
-
- def rakefile_extra
- rakefile 'task :default'
-
- FileUtils.mkdir_p 'rakelib'
-
- open File.join('rakelib', 'extra.rake'), 'w' do |io|
- io << <<-EXTRA_RAKE
-# Added for testing
-
-namespace :extra do
- desc "An Extra Task"
- task :extra do
- puts "Read all about it"
- end
-end
- EXTRA_RAKE
- end
- end
-
- def rakefile_file_creation
- rakefile <<-'FILE_CREATION'
-N = 2
-
-task :default => :run
-
-BUILD_DIR = 'build'
-task :clean do
- rm_rf 'build'
- rm_rf 'src'
-end
-
-task :run
-
-TARGET_DIR = 'build/copies'
-
-FileList['src/*'].each do |src|
- directory TARGET_DIR
- target = File.join TARGET_DIR, File.basename(src)
- file target => [src, TARGET_DIR] do
- cp src, target
- # sleep 3 if src !~ /foo#{N-1}$/ # I'm commenting out this sleep, it doesn't seem to do anything.
- end
- task :run => target
-end
-
-task :prep => :clean do
- mkdir_p 'src'
- N.times do |n|
- touch "src/foo#{n}"
- end
-end
- FILE_CREATION
- end
-
- def rakefile_imports
- rakefile <<-IMPORTS
-require 'rake/loaders/makefile'
-
-task :default
-
-task :other do
- puts "OTHER"
-end
-
-file "dynamic_deps" do |t|
- open(t.name, "w") do |f| f.puts "puts 'DYNAMIC'" end
-end
-
-import "dynamic_deps"
-import "static_deps"
-import "static_deps"
-import "deps.mf"
-puts "FIRST"
- IMPORTS
-
- open 'deps.mf', 'w' do |io|
- io << <<-DEPS
-default: other
- DEPS
- end
-
- open "static_deps", "w" do |f|
- f.puts 'puts "STATIC"'
- end
- end
-
- def rakefile_multidesc
- rakefile <<-MULTIDESC
-task :b
-
-desc "A"
-task :a
-
-desc "B"
-task :b
-
-desc "A2"
-task :a
-
-task :c
-
-desc "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-task :d
- MULTIDESC
- end
-
- def rakefile_namespace
- rakefile <<-NAMESPACE
-desc "copy"
-task :copy do
- puts "COPY"
-end
-
-namespace "nest" do
- desc "nest copy"
- task :copy do
- puts "NEST COPY"
- end
- task :xx => :copy
-end
-
-anon_ns = namespace do
- desc "anonymous copy task"
- task :copy do
- puts "ANON COPY"
- end
-end
-
-desc "Top level task to run the anonymous version of copy"
-task :anon => anon_ns[:copy]
-
-namespace "very" do
- namespace "nested" do
- task "run" => "rake:copy"
- end
-end
-
-namespace "a" do
- desc "Run task in the 'a' namespace"
- task "run" do
- puts "IN A"
- end
-end
-
-namespace "b" do
- desc "Run task in the 'b' namespace"
- task "run" => "a:run" do
- puts "IN B"
- end
-end
-
-namespace "file1" do
- file "xyz.rb" do
- puts "XYZ1"
- end
-end
-
-namespace "file2" do
- file "xyz.rb" do
- puts "XYZ2"
- end
-end
-
-namespace "scopedep" do
- task :prepare do
- touch "scopedep.rb"
- puts "PREPARE"
- end
- file "scopedep.rb" => [:prepare] do
- puts "SCOPEDEP"
- end
-end
- NAMESPACE
- end
-
- def rakefile_nosearch
- FileUtils.touch 'dummy'
- end
-
- def rakefile_rakelib
- FileUtils.mkdir_p 'rakelib'
-
- Dir.chdir 'rakelib' do
- open 'test1.rb', 'w' do |io|
- io << <<-TEST1
-task :default do
- puts "TEST1"
-end
- TEST1
- end
-
- open 'test2.rake', 'w' do |io|
- io << <<-TEST1
-task :default do
- puts "TEST2"
-end
- TEST1
- end
- end
- end
-
- def rakefile_rbext
- open 'rakefile.rb', 'w' do |io|
- io << 'task :default do puts "OK" end'
- end
- end
-
- def rakefile_unittest
- rakefile '# Empty Rakefile for Unit Test'
-
- readme = File.join 'subdir', 'README'
- FileUtils.mkdir_p File.dirname readme
-
- FileUtils.touch readme
- end
-
- def rakefile_verbose
- rakefile <<-VERBOSE
-task :standalone_verbose_true do
- verbose true
- sh "#{RUBY} -e '0'"
-end
-
-task :standalone_verbose_false do
- verbose false
- sh "#{RUBY} -e '0'"
-end
-
-task :inline_verbose_default do
- sh "#{RUBY} -e '0'"
-end
-
-task :inline_verbose_false do
- sh "#{RUBY} -e '0'", :verbose => false
-end
-
-task :inline_verbose_true do
- sh "#{RUBY} -e '0'", :verbose => true
-end
-
-task :block_verbose_true do
- verbose(true) do
- sh "#{RUBY} -e '0'"
- end
-end
-
-task :block_verbose_false do
- verbose(false) do
- sh "#{RUBY} -e '0'"
- end
-end
- VERBOSE
- end
-
- def rakefile_test_signal
- rakefile <<-TEST_SIGNAL
-require 'rake/testtask'
-
-Rake::TestTask.new(:a) do |t|
- t.test_files = ['a_test.rb']
-end
-
-Rake::TestTask.new(:b) do |t|
- t.test_files = ['b_test.rb']
-end
-
-task :test do
- Rake::Task[:a].invoke
- Rake::Task[:b].invoke
-end
-
-task :default => :test
- TEST_SIGNAL
- open 'a_test.rb', 'w' do |io|
- io << 'puts "ATEST"' << "\n"
- io << '$stdout.flush' << "\n"
- io << 'Process.kill("TERM", $$)' << "\n"
- end
- open 'b_test.rb', 'w' do |io|
- io << 'puts "BTEST"' << "\n"
- io << '$stdout.flush' << "\n"
- end
- end
-
- def rakefile_failing_test_task
- rakefile <<-TEST_TASK
-require 'rake/testtask'
-
-task :default => :test
-Rake::TestTask.new(:test) do |t|
- t.test_files = ['a_test.rb']
-end
- TEST_TASK
- open 'a_test.rb', 'w' do |io|
- io << "require 'minitest/autorun'\n"
- io << "class ExitTaskTest < MiniTest::Unit::TestCase\n"
- io << " def test_exit\n"
- io << " assert false, 'this should fail'\n"
- io << " end\n"
- io << "end\n"
- end
- end
-
- def rakefile_stand_alone_filelist
- open 'stand_alone_filelist.rb', 'w' do |io|
- io << "require 'rake/file_list'\n"
- io << "FL = Rake::FileList['*.rb']\n"
- io << "puts FL\n"
- end
- end
-
-end
diff --git a/test/rake/in_environment.rb b/test/rake/in_environment.rb
new file mode 100644
index 0000000000..f0a340fac9
--- /dev/null
+++ b/test/rake/in_environment.rb
@@ -0,0 +1,30 @@
+module InEnvironment
+ private
+
+ # Create an environment for a test. At the completion of the yielded
+ # block, the environment is restored to its original conditions.
+ def in_environment(settings)
+ original_settings = set_env(settings)
+ yield
+ ensure
+ set_env(original_settings) if original_settings
+ end
+
+ # Set the environment according to the settings hash.
+ def set_env(settings) # :nodoc:
+ result = {}
+ settings.each do |k, v|
+ result[k] = ENV[k]
+ if k == 'PWD'
+ result[k] = Dir.pwd
+ Dir.chdir(v)
+ elsif v.nil?
+ ENV.delete(k)
+ else
+ ENV[k] = v
+ end
+ end
+ result
+ end
+
+end
diff --git a/test/rake/rake_test_setup.rb b/test/rake/rake_test_setup.rb
new file mode 100644
index 0000000000..de94d56b40
--- /dev/null
+++ b/test/rake/rake_test_setup.rb
@@ -0,0 +1,9 @@
+# Common setup for all test files.
+
+# require 'flexmock/test_unit'
+
+module TestMethods
+ def assert_exception(ex, msg=nil, &block)
+ assert_raise(ex, msg, &block)
+ end
+end
diff --git a/test/rake/reqfile.rb b/test/rake/reqfile.rb
new file mode 100644
index 0000000000..5372544b66
--- /dev/null
+++ b/test/rake/reqfile.rb
@@ -0,0 +1,3 @@
+# For --require testing
+
+TESTING_REQUIRE << 1
diff --git a/test/rake/reqfile2.rb b/test/rake/reqfile2.rb
new file mode 100644
index 0000000000..65993907ac
--- /dev/null
+++ b/test/rake/reqfile2.rb
@@ -0,0 +1,3 @@
+# For --require testing
+
+TESTING_REQUIRE << 2
diff --git a/test/rake/reqfile3.rb b/test/rake/reqfile3.rb
new file mode 100644
index 0000000000..11fc16b2ab
--- /dev/null
+++ b/test/rake/reqfile3.rb
@@ -0,0 +1,3 @@
+# For --require testing
+
+TESTING_REQUIRE << 3
diff --git a/test/rake/shellcommand.rb b/test/rake/shellcommand.rb
new file mode 100755
index 0000000000..58db8a0871
--- /dev/null
+++ b/test/rake/shellcommand.rb
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exit((ARGV[0] || "0").to_i)
diff --git a/test/rake/test_application.rb b/test/rake/test_application.rb
new file mode 100644
index 0000000000..77f9859b24
--- /dev/null
+++ b/test/rake/test_application.rb
@@ -0,0 +1,687 @@
+require 'test/unit'
+require 'rake'
+require_relative 'capture_stdout'
+require_relative 'in_environment'
+
+TESTING_REQUIRE = [ ]
+
+######################################################################
+class Rake::TestApplication < Test::Unit::TestCase
+ include CaptureStdout
+ include InEnvironment
+ BASEDIR = File.dirname(__FILE__)
+
+ def defmock(*names, &block)
+ class << (@mock ||= Object.new); self; end.class_eval do
+ names.each do |name|
+ define_method(name, block)
+ end
+ end
+ @mock
+ end
+
+ def setup
+ @app = Rake::Application.new
+ @app.options.rakelib = []
+ end
+
+ def test_constant_warning
+ err = capture_stderr do @app.instance_eval { const_warning("Task") } end
+ assert_match(/warning/i, err)
+ assert_match(/deprecated/i, err)
+ assert_match(/Task/i, err)
+ end
+
+ def test_display_tasks
+ @app.options.show_task_pattern = //
+ @app.last_description = "COMMENT"
+ @app.define_task(Rake::Task, "t")
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ assert_match(/^rake t/, out)
+ assert_match(/# COMMENT/, out)
+ end
+
+ def test_display_tasks_with_long_comments
+ in_environment('RAKE_COLUMNS' => '80') do
+ @app.options.show_task_pattern = //
+ @app.last_description = "1234567890" * 8
+ @app.define_task(Rake::Task, "t")
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ assert_match(/^rake t/, out)
+ assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
+ end
+ end
+
+ def test_display_tasks_with_task_name_wider_than_tty_display
+ in_environment('RAKE_COLUMNS' => '80') do
+ @app.options.show_task_pattern = //
+ description = "something short"
+ task_name = "task name" * 80
+ @app.last_description = "something short"
+ @app.define_task(Rake::Task, task_name )
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ # Ensure the entire task name is output and we end up showing no description
+ assert_match(/rake #{task_name} # .../, out)
+ end
+ end
+
+ def test_display_tasks_with_very_long_task_name_to_a_non_tty_shows_name_and_comment
+ @app.options.show_task_pattern = //
+ @app.tty_output = false
+ description = "something short"
+ task_name = "task name" * 80
+ @app.last_description = "something short"
+ @app.define_task(Rake::Task, task_name )
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ # Ensure the entire task name is output and we end up showing no description
+ assert_match(/rake #{task_name} # #{description}/, out)
+ end
+
+ def test_display_tasks_with_long_comments_to_a_non_tty_shows_entire_comment
+ @app.options.show_task_pattern = //
+ @app.tty_output = false
+ @app.last_description = "1234567890" * 8
+ @app.define_task(Rake::Task, "t")
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ assert_match(/^rake t/, out)
+ assert_match(/# #{@app.last_description}/, out)
+ end
+
+ def test_display_tasks_with_long_comments_to_a_non_tty_with_columns_set_truncates_comments
+ in_environment("RAKE_COLUMNS" => '80') do
+ @app.options.show_task_pattern = //
+ @app.tty_output = false
+ @app.last_description = "1234567890" * 8
+ @app.define_task(Rake::Task, "t")
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ assert_match(/^rake t/, out)
+ assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
+ end
+ end
+
+ def test_display_tasks_with_full_descriptions
+ @app.options.show_task_pattern = //
+ @app.options.full_description = true
+ @app.last_description = "COMMENT"
+ @app.define_task(Rake::Task, "t")
+ out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+ assert_match(/^rake t$/, out)
+ assert_match(/^ {4}COMMENT$/, out)
+ end
+
+ def test_finding_rakefile
+ in_environment("PWD" => File.join(BASEDIR, "data/unittest")) do
+ assert_match(/Rakefile/i, @app.instance_eval { have_rakefile })
+ end
+ end
+
+ def test_not_finding_rakefile
+ @app.instance_eval { @rakefiles = ['NEVER_FOUND'] }
+ assert( ! @app.instance_eval do have_rakefile end )
+ assert_nil @app.rakefile
+ end
+
+ def test_load_rakefile
+ in_environment("PWD" => File.join(BASEDIR, "data/unittest")) do
+ @app.instance_eval do
+ handle_options
+ options.silent = true
+ load_rakefile
+ end
+ assert_equal "rakefile", @app.rakefile.downcase
+ assert_match(%r(unittest$), Dir.pwd)
+ end
+ end
+
+ def test_load_rakefile_from_subdir
+ in_environment("PWD" => File.join(BASEDIR, "data/unittest/subdir")) do
+ @app.instance_eval do
+ handle_options
+ options.silent = true
+ load_rakefile
+ end
+ assert_equal "rakefile", @app.rakefile.downcase
+ assert_match(%r(unittest$), Dir.pwd)
+ end
+ end
+
+ def test_load_rakefile_not_found
+ in_environment("PWD" => "/", "RAKE_SYSTEM" => 'not_exist') do
+ @app.instance_eval do
+ handle_options
+ options.silent = true
+ end
+ ex = assert_raise(RuntimeError) do
+ @app.instance_eval do raw_load_rakefile end
+ end
+ assert_match(/no rakefile found/i, ex.message)
+ end
+ end
+
+ def test_load_from_system_rakefile
+ system_dir = File.expand_path('../data/default', __FILE__)
+ in_environment('RAKE_SYSTEM' => system_dir) do
+ @app.options.rakelib = []
+ @app.instance_eval do
+ handle_options
+ options.silent = true
+ options.load_system = true
+ options.rakelib = []
+ load_rakefile
+ end
+ assert_equal system_dir, @app.system_dir
+ assert_nil @app.rakefile
+ end
+ end
+
+ def test_windows
+ assert ! (@app.windows? && @app.unix?)
+ end
+
+ def test_loading_imports
+ args = []
+ mock = defmock(:load) {|*a| args << a}
+ @app.instance_eval do
+ add_loader("dummy", mock)
+ add_import("x.dummy")
+ load_imports
+ end
+ assert_equal([["x.dummy"]], args)
+ end
+
+ def test_building_imported_files_on_demand
+ args = []
+ callback = false
+ mock = defmock(:load) {|*a| args << a}
+ @app.instance_eval do
+ intern(Rake::Task, "x.dummy").enhance do callback = true end
+ add_loader("dummy", mock)
+ add_import("x.dummy")
+ load_imports
+ end
+ assert_equal([["x.dummy"]], args)
+ assert(callback)
+ end
+
+ def test_handle_options_should_strip_options_from_ARGV
+ assert !@app.options.trace
+
+ valid_option = '--trace'
+ ARGV.clear
+ ARGV << valid_option
+
+ @app.handle_options
+
+ assert !ARGV.include?(valid_option)
+ assert @app.options.trace
+ end
+
+ def test_good_run
+ ran = false
+ ARGV.clear
+ ARGV << '--rakelib=""'
+ @app.options.silent = true
+ @app.instance_eval do
+ intern(Rake::Task, "default").enhance { ran = true }
+ end
+ in_environment("PWD" => File.join(BASEDIR, "data/default")) do
+ @app.run
+ end
+ assert ran
+ end
+
+ def test_display_task_run
+ ran = false
+ ARGV.clear
+ ARGV << '-f' << '-s' << '--tasks' << '--rakelib=""'
+ @app.last_description = "COMMENT"
+ @app.define_task(Rake::Task, "default")
+ out = capture_stdout { @app.run }
+ assert @app.options.show_tasks
+ assert ! ran
+ assert_match(/rake default/, out)
+ assert_match(/# COMMENT/, out)
+ end
+
+ def test_display_prereqs
+ ran = false
+ ARGV.clear
+ ARGV << '-f' << '-s' << '--prereqs' << '--rakelib=""'
+ @app.last_description = "COMMENT"
+ t = @app.define_task(Rake::Task, "default")
+ t.enhance([:a, :b])
+ @app.define_task(Rake::Task, "a")
+ @app.define_task(Rake::Task, "b")
+ out = capture_stdout { @app.run }
+ assert @app.options.show_prereqs
+ assert ! ran
+ assert_match(/rake a$/, out)
+ assert_match(/rake b$/, out)
+ assert_match(/rake default\n( *(a|b)\n){2}/m, out)
+ end
+
+ def test_bad_run
+ @app.intern(Rake::Task, "default").enhance { fail }
+ ARGV.clear
+ ARGV << '-f' << '-s' << '--rakelib=""'
+ assert_raise(SystemExit) {
+ err = capture_stderr { @app.run }
+ assert_match(/see full trace/, err)
+ }
+ ensure
+ ARGV.clear
+ end
+
+ def test_bad_run_with_trace
+ @app.intern(Rake::Task, "default").enhance { fail }
+ ARGV.clear
+ ARGV << '-f' << '-s' << '-t'
+ assert_raise(SystemExit) {
+ err = capture_stderr { capture_stdout { @app.run } }
+ assert_no_match(/see full trace/, err)
+ }
+ ensure
+ ARGV.clear
+ end
+
+ def test_run_with_bad_options
+ @app.intern(Rake::Task, "default").enhance { fail }
+ ARGV.clear
+ ARGV << '-f' << '-s' << '--xyzzy'
+ assert_raise(SystemExit) {
+ err = capture_stderr { capture_stdout { @app.run } }
+ }
+ ensure
+ ARGV.clear
+ end
+end
+
+
+######################################################################
+class Rake::TestApplicationOptions < Test::Unit::TestCase
+ include CaptureStdout
+
+ def setup
+ clear_argv
+ RakeFileUtils.verbose_flag = false
+ RakeFileUtils.nowrite_flag = false
+ TESTING_REQUIRE.clear
+ end
+
+ def teardown
+ clear_argv
+ RakeFileUtils.verbose_flag = false
+ RakeFileUtils.nowrite_flag = false
+ end
+
+ def clear_argv
+ while ! ARGV.empty?
+ ARGV.pop
+ end
+ end
+
+ def test_default_options
+ opts = command_line
+ assert_nil opts.classic_namespace
+ assert_nil opts.dryrun
+ assert_nil opts.full_description
+ assert_nil opts.ignore_system
+ assert_nil opts.load_system
+ assert_nil opts.nosearch
+ assert_equal ['rakelib'], opts.rakelib
+ assert_nil opts.show_prereqs
+ assert_nil opts.show_task_pattern
+ assert_nil opts.show_tasks
+ assert_nil opts.silent
+ assert_nil opts.trace
+ assert_equal ['rakelib'], opts.rakelib
+ assert ! RakeFileUtils.verbose_flag
+ assert ! RakeFileUtils.nowrite_flag
+ end
+
+ def test_dry_run
+ flags('--dry-run', '-n') do |opts|
+ assert opts.dryrun
+ assert opts.trace
+ assert RakeFileUtils.verbose_flag
+ assert RakeFileUtils.nowrite_flag
+ end
+ end
+
+ def test_describe
+ flags('--describe') do |opts|
+ assert opts.full_description
+ assert opts.show_tasks
+ assert_equal(//.to_s, opts.show_task_pattern.to_s)
+ end
+ end
+
+ def test_describe_with_pattern
+ flags('--describe=X') do |opts|
+ assert opts.full_description
+ assert opts.show_tasks
+ assert_equal(/X/.to_s, opts.show_task_pattern.to_s)
+ end
+ end
+
+ def test_execute
+ $xyzzy = 0
+ flags('--execute=$xyzzy=1', '-e $xyzzy=1') do |opts|
+ assert_equal 1, $xyzzy
+ assert_equal :exit, @exit
+ $xyzzy = 0
+ end
+ end
+
+ def test_execute_and_continue
+ $xyzzy = 0
+ flags('--execute-continue=$xyzzy=1', '-E $xyzzy=1') do |opts|
+ assert_equal 1, $xyzzy
+ assert_not_equal :exit, @exit
+ $xyzzy = 0
+ end
+ end
+
+ def test_execute_and_print
+ $xyzzy = 0
+ flags('--execute-print=$xyzzy="pugh"', '-p $xyzzy="pugh"') do |opts|
+ assert_equal 'pugh', $xyzzy
+ assert_equal :exit, @exit
+ assert_match(/^pugh$/, @out)
+ $xyzzy = 0
+ end
+ end
+
+ def test_help
+ flags('--help', '-H', '-h') do |opts|
+ assert_match(/\Arake/, @out)
+ assert_match(/\boptions\b/, @out)
+ assert_match(/\btargets\b/, @out)
+ assert_equal :exit, @exit
+ assert_equal :exit, @exit
+ end
+ end
+
+ def test_libdir
+ flags(['--libdir', 'xx'], ['-I', 'xx'], ['-Ixx']) do |opts|
+ $:.include?('xx')
+ end
+ ensure
+ $:.delete('xx')
+ end
+
+ def test_rakefile
+ flags(['--rakefile', 'RF'], ['--rakefile=RF'], ['-f', 'RF'], ['-fRF']) do |opts|
+ assert_equal ['RF'], @app.instance_eval { @rakefiles }
+ end
+ end
+
+ def test_rakelib
+ flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
+ assert_equal ['A', 'B', 'C'], opts.rakelib
+ end
+ end
+
+ def test_require
+ flags(['--require', File.expand_path('../reqfile', __FILE__)],
+ "-r#{File.expand_path('../reqfile2', __FILE__)}",
+ "-r#{File.expand_path('../reqfile3', __FILE__)}") do |opts|
+ end
+ assert TESTING_REQUIRE.include?(1)
+ assert TESTING_REQUIRE.include?(2)
+ assert TESTING_REQUIRE.include?(3)
+ assert_equal 3, TESTING_REQUIRE.size
+ end
+
+ def test_missing_require
+ ex = assert_raise(LoadError) do
+ flags(['--require', File.expand_path('../missing', __FILE__)]) do |opts|
+ end
+ end
+ assert_match(/no such file/, ex.message)
+ assert_match(/#{File.basename(File.dirname(__FILE__))}\/missing/, ex.message)
+ end
+
+ def test_prereqs
+ flags('--prereqs', '-P') do |opts|
+ assert opts.show_prereqs
+ end
+ end
+
+ def test_quiet
+ flags('--quiet', '-q') do |opts|
+ assert ! RakeFileUtils.verbose_flag
+ assert ! opts.silent
+ end
+ end
+
+ def test_no_search
+ flags('--nosearch', '--no-search', '-N') do |opts|
+ assert opts.nosearch
+ end
+ end
+
+ def test_silent
+ flags('--silent', '-s') do |opts|
+ assert ! RakeFileUtils.verbose_flag
+ assert opts.silent
+ end
+ end
+
+ def test_system
+ flags('--system', '-g') do |opts|
+ assert opts.load_system
+ end
+ end
+
+ def test_no_system
+ flags('--no-system', '-G') do |opts|
+ assert opts.ignore_system
+ end
+ end
+
+ def test_trace
+ flags('--trace', '-t') do |opts|
+ assert opts.trace
+ assert RakeFileUtils.verbose_flag
+ assert ! RakeFileUtils.nowrite_flag
+ end
+ end
+
+ def test_trace_rules
+ flags('--rules') do |opts|
+ assert opts.trace_rules
+ end
+ end
+
+ def test_tasks
+ flags('--tasks', '-T') do |opts|
+ assert opts.show_tasks
+ assert_equal(//.to_s, opts.show_task_pattern.to_s)
+ end
+ flags(['--tasks', 'xyz'], ['-Txyz']) do |opts|
+ assert opts.show_tasks
+ assert_equal(/xyz/, opts.show_task_pattern)
+ end
+ end
+
+ def test_verbose
+ flags('--verbose', '-V') do |opts|
+ assert RakeFileUtils.verbose_flag
+ assert ! opts.silent
+ end
+ end
+
+ def test_version
+ flags('--version', '-V') do |opts|
+ assert_match(/\bversion\b/, @out)
+ assert_match(/\b#{RAKEVERSION}\b/, @out)
+ assert_equal :exit, @exit
+ end
+ end
+
+ def test_classic_namespace
+ flags(['--classic-namespace'], ['-C', '-T', '-P', '-n', '-s', '-t']) do |opts|
+ assert opts.classic_namespace
+ assert_equal opts.show_tasks, $show_tasks
+ assert_equal opts.show_prereqs, $show_prereqs
+ assert_equal opts.trace, $trace
+ assert_equal opts.dryrun, $dryrun
+ assert_equal opts.silent, $silent
+ end
+ end
+
+ def test_bad_option
+ capture_stderr do
+ ex = assert_raise(OptionParser::InvalidOption) do
+ flags('--bad-option')
+ end
+ if ex.message =~ /^While/ # Ruby 1.9 error message
+ assert_match(/while parsing/i, ex.message)
+ else # Ruby 1.8 error message
+ assert_match(/(invalid|unrecognized) option/i, ex.message)
+ assert_match(/--bad-option/, ex.message)
+ end
+ end
+ end
+
+ def test_task_collection
+ command_line("a", "b")
+ assert_equal ["a", "b"], @tasks.sort
+ end
+
+ def test_default_task_collection
+ command_line()
+ assert_equal ["default"], @tasks
+ end
+
+ def test_environment_definition
+ ENV.delete('TESTKEY')
+ command_line("a", "TESTKEY=12")
+ assert_equal ["a"], @tasks.sort
+ assert '12', ENV['TESTKEY']
+ end
+
+ private
+
+ def flags(*sets)
+ sets.each do |set|
+ ARGV.clear
+ @out = capture_stdout {
+ @exit = catch(:system_exit) { opts = command_line(*set) }
+ }
+ yield(@app.options) if block_given?
+ end
+ end
+
+ def command_line(*options)
+ options.each do |opt| ARGV << opt end
+ @app = Rake::Application.new
+ def @app.exit(*args)
+ throw :system_exit, :exit
+ end
+ @app.instance_eval do
+ handle_options
+ collect_tasks
+ end
+ @tasks = @app.top_level_tasks
+ @app.options
+ end
+end
+
+class Rake::TestTaskArgumentParsing < Test::Unit::TestCase
+ def setup
+ @app = Rake::Application.new
+ end
+
+ def test_name_only
+ name, args = @app.parse_task_string("name")
+ assert_equal "name", name
+ assert_equal [], args
+ end
+
+ def test_empty_args
+ name, args = @app.parse_task_string("name[]")
+ assert_equal "name", name
+ assert_equal [], args
+ end
+
+ def test_one_argument
+ name, args = @app.parse_task_string("name[one]")
+ assert_equal "name", name
+ assert_equal ["one"], args
+ end
+
+ def test_two_arguments
+ name, args = @app.parse_task_string("name[one,two]")
+ assert_equal "name", name
+ assert_equal ["one", "two"], args
+ end
+
+ def test_can_handle_spaces_between_args
+ name, args = @app.parse_task_string("name[one, two,\tthree , \tfour]")
+ assert_equal "name", name
+ assert_equal ["one", "two", "three", "four"], args
+ end
+
+ def test_keeps_embedded_spaces
+ name, args = @app.parse_task_string("name[a one ana, two]")
+ assert_equal "name", name
+ assert_equal ["a one ana", "two"], args
+ end
+
+end
+
+class Rake::TestTaskArgumentParsing < Test::Unit::TestCase
+ include InEnvironment
+
+ def test_terminal_width_using_env
+ app = Rake::Application.new
+ in_environment('RAKE_COLUMNS' => '1234') do
+ assert_equal 1234, app.terminal_width
+ end
+ end
+
+ def test_terminal_width_using_stty
+ app = Rake::Application.new
+ def app.unix?() true end
+ def app.dynamic_width_stty() 1235 end
+ def app.dynamic_width_tput() 0 end
+ in_environment('RAKE_COLUMNS' => nil) do
+ assert_equal 1235, app.terminal_width
+ end
+ end
+
+ def test_terminal_width_using_tput
+ app = Rake::Application.new
+ def app.unix?() true end
+ def app.dynamic_width_stty() 0 end
+ def app.dynamic_width_tput() 1236 end
+ in_environment('RAKE_COLUMNS' => nil) do
+ assert_equal 1236, app.terminal_width
+ end
+ end
+
+ def test_terminal_width_using_hardcoded_80
+ app = Rake::Application.new
+ def app.unix?() false end
+ in_environment('RAKE_COLUMNS' => nil) do
+ assert_equal 80, app.terminal_width
+ end
+ end
+
+ def test_terminal_width_with_failure
+ app = Rake::Application.new
+ called = false
+ class << app; self; end.class_eval do
+ define_method(:unix?) {|*a|
+ called = a
+ raise RuntimeError
+ }
+ end
+ in_environment('RAKE_COLUMNS' => nil) do
+ assert_equal 80, app.terminal_width
+ end
+ assert_equal([], called)
+ end
+end
diff --git a/test/rake/test_clean.rb b/test/rake/test_clean.rb
new file mode 100644
index 0000000000..0e8b81c2c7
--- /dev/null
+++ b/test/rake/test_clean.rb
@@ -0,0 +1,12 @@
+require 'test/unit'
+require 'rake/clean'
+
+class Rake::TestClean < Test::Unit::TestCase
+ include Rake
+ def test_clean
+ assert Task['clean'], "Should define clean"
+ assert Task['clobber'], "Should define clobber"
+ assert Task['clobber'].prerequisites.include?("clean"),
+ "Clobber should require clean"
+ end
+end
diff --git a/test/rake/test_definitions.rb b/test/rake/test_definitions.rb
new file mode 100644
index 0000000000..164958ecd5
--- /dev/null
+++ b/test/rake/test_definitions.rb
@@ -0,0 +1,81 @@
+require 'test/unit'
+require 'fileutils'
+require 'rake'
+require_relative 'filecreation'
+
+######################################################################
+class Rake::TestDefinitions < Test::Unit::TestCase
+ include Rake
+
+ EXISTINGFILE = "testdata/existing"
+
+ def setup
+ Task.clear
+ end
+
+ def test_task
+ done = false
+ task :one => [:two] do done = true end
+ task :two
+ task :three => [:one, :two]
+ check_tasks(:one, :two, :three)
+ assert done, "Should be done"
+ end
+
+ def test_file_task
+ done = false
+ file "testdata/one" => "testdata/two" do done = true end
+ file "testdata/two"
+ file "testdata/three" => ["testdata/one", "testdata/two"]
+ check_tasks("testdata/one", "testdata/two", "testdata/three")
+ assert done, "Should be done"
+ end
+
+ def check_tasks(n1, n2, n3)
+ t = Task[n1]
+ assert Task === t, "Should be a Task"
+ assert_equal n1.to_s, t.name
+ assert_equal [n2.to_s], t.prerequisites.collect{|n| n.to_s}
+ t.invoke
+ t2 = Task[n2]
+ assert_equal FileList[], t2.prerequisites
+ t3 = Task[n3]
+ assert_equal [n1.to_s, n2.to_s], t3.prerequisites.collect{|n|n.to_s}
+ end
+
+ def test_incremental_definitions
+ runs = []
+ task :t1 => [:t2] do runs << "A"; 4321 end
+ task :t1 => [:t3] do runs << "B"; 1234 end
+ task :t1 => [:t3]
+ task :t2
+ task :t3
+ Task[:t1].invoke
+ assert_equal ["A", "B"], runs
+ assert_equal ["t2", "t3"], Task[:t1].prerequisites
+ end
+
+ def test_missing_dependencies
+ task :x => ["testdata/missing"]
+ assert_raise(RuntimeError) { Task[:x].invoke }
+ end
+
+ def test_implicit_file_dependencies
+ runs = []
+ create_existing_file
+ task :y => [EXISTINGFILE] do |t| runs << t.name end
+ Task[:y].invoke
+ assert_equal runs, ['y']
+ end
+
+ private # ----------------------------------------------------------
+
+ def create_existing_file
+ Dir.mkdir File.dirname(EXISTINGFILE) unless
+ File.exist?(File.dirname(EXISTINGFILE))
+ open(EXISTINGFILE, "w") do |f| f.puts "HI" end unless
+ File.exist?(EXISTINGFILE)
+ end
+
+end
+
diff --git a/test/rake/test_earlytime.rb b/test/rake/test_earlytime.rb
new file mode 100644
index 0000000000..a228146679
--- /dev/null
+++ b/test/rake/test_earlytime.rb
@@ -0,0 +1,33 @@
+require 'test/unit'
+require 'rake'
+
+class Rake::TestEarlyTime < Test::Unit::TestCase
+ def test_create
+ early = Rake::EarlyTime.instance
+ time = Time.mktime(1970, 1, 1, 0, 0, 0)
+ assert early <= Time.now
+ assert early < Time.now
+ assert early != Time.now
+ assert Time.now > early
+ assert Time.now >= early
+ assert Time.now != early
+ end
+
+ def test_equality
+ early = Rake::EarlyTime.instance
+ assert_equal early, early, "two early times should be equal"
+ end
+
+ def test_original_time_compare_is_not_messed_up
+ t1 = Time.mktime(1970, 1, 1, 0, 0, 0)
+ t2 = Time.now
+ assert t1 < t2
+ assert t2 > t1
+ assert t1 == t1
+ assert t2 == t2
+ end
+
+ def test_to_s
+ assert_equal "<EARLY TIME>", Rake::EARLY.to_s
+ end
+end
diff --git a/test/rake/test_extension.rb b/test/rake/test_extension.rb
new file mode 100644
index 0000000000..94348aafa6
--- /dev/null
+++ b/test/rake/test_extension.rb
@@ -0,0 +1,61 @@
+require 'test/unit'
+require 'rake'
+require 'stringio'
+
+######################################################################
+class Rake::TestExtension < Test::Unit::TestCase
+
+ module Redirect
+ def error_redirect
+ old_err = $stderr
+ result = StringIO.new
+ $stderr = result
+ yield
+ result
+ ensure
+ $stderr = old_err
+ end
+ end
+
+ class Sample
+ extend Redirect
+
+ def duplicate_method
+ :original
+ end
+
+ OK_ERRS = error_redirect do
+ rake_extension("a") do
+ def ok_method
+ end
+ end
+ end
+
+
+ DUP_ERRS = error_redirect do
+ rake_extension("duplicate_method") do
+ def duplicate_method
+ :override
+ end
+ end
+ end
+ end
+
+ def test_methods_actually_exist
+ sample = Sample.new
+ sample.ok_method
+ sample.duplicate_method
+ end
+
+ def test_no_warning_when_defining_ok_method
+ assert_equal "", Sample::OK_ERRS.string
+ end
+
+ def test_extension_complains_when_a_method_that_is_present
+ assert_match(/warning:/i, Sample::DUP_ERRS.string)
+ assert_match(/already exists/i, Sample::DUP_ERRS.string)
+ assert_match(/duplicate_method/i, Sample::DUP_ERRS.string)
+ assert_equal :original, Sample.new.duplicate_method
+ end
+
+end
diff --git a/test/rake/test_file_creation_task.rb b/test/rake/test_file_creation_task.rb
new file mode 100644
index 0000000000..1f2af90399
--- /dev/null
+++ b/test/rake/test_file_creation_task.rb
@@ -0,0 +1,60 @@
+require 'test/unit'
+require 'fileutils'
+require 'rake'
+require_relative 'filecreation'
+
+######################################################################
+class Rake::TestFileCreationTask < Test::Unit::TestCase
+ include Rake
+ include FileCreation
+
+ DUMMY_DIR = 'testdata/dummy_dir'
+
+ def setup
+ Task.clear
+ end
+
+ def teardown
+ FileUtils.rm_rf DUMMY_DIR
+ end
+
+ def test_file_needed
+ create_dir DUMMY_DIR
+ fc_task = Task[DUMMY_DIR]
+ assert_equal DUMMY_DIR, fc_task.name
+ FileUtils.rm_rf fc_task.name
+ assert fc_task.needed?, "file should be needed"
+ FileUtils.mkdir fc_task.name
+ assert_equal nil, fc_task.prerequisites.collect{|n| Task[n].timestamp}.max
+ assert ! fc_task.needed?, "file should not be needed"
+ end
+
+ def test_directory
+ directory DUMMY_DIR
+ fc_task = Task[DUMMY_DIR]
+ assert_equal DUMMY_DIR, fc_task.name
+ assert FileCreationTask === fc_task
+ end
+
+ def test_no_retriggers_on_filecreate_task
+ create_timed_files(OLDFILE, NEWFILE)
+ t1 = Rake.application.intern(FileCreationTask, OLDFILE).enhance([NEWFILE])
+ t2 = Rake.application.intern(FileCreationTask, NEWFILE)
+ assert ! t2.needed?, "Should not need to build new file"
+ assert ! t1.needed?, "Should not need to rebuild old file because of new"
+ end
+
+ def test_no_retriggers_on_file_task
+ create_timed_files(OLDFILE, NEWFILE)
+ t1 = Rake.application.intern(FileCreationTask, OLDFILE).enhance([NEWFILE])
+ t2 = Rake.application.intern(FileCreationTask, NEWFILE)
+ assert ! t2.needed?, "Should not need to build new file"
+ assert ! t1.needed?, "Should not need to rebuild old file because of new"
+ end
+
+ def test_very_early_timestamp
+ t1 = Rake.application.intern(FileCreationTask, OLDFILE)
+ assert t1.timestamp < Time.now
+ assert t1.timestamp < Time.now - 1000000
+ end
+end
diff --git a/test/rake/test_file_task.rb b/test/rake/test_file_task.rb
new file mode 100644
index 0000000000..1b0c0a5614
--- /dev/null
+++ b/test/rake/test_file_task.rb
@@ -0,0 +1,139 @@
+require 'test/unit'
+require 'fileutils'
+require 'rake'
+require_relative 'filecreation'
+
+######################################################################
+class Rake::TestFileTask < Test::Unit::TestCase
+ include Rake
+ include FileCreation
+
+ def setup
+ Task.clear
+ @runs = Array.new
+ FileUtils.rm_f NEWFILE
+ FileUtils.rm_f OLDFILE
+ end
+
+ def test_file_need
+ name = "testdata/dummy"
+ file name
+ ftask = Task[name]
+ assert_equal name.to_s, ftask.name
+ File.delete(ftask.name) rescue nil
+ assert ftask.needed?, "file should be needed"
+ open(ftask.name, "w") { |f| f.puts "HI" }
+ assert_equal nil, ftask.prerequisites.collect{|n| Task[n].timestamp}.max
+ assert ! ftask.needed?, "file should not be needed"
+ File.delete(ftask.name) rescue nil
+ end
+
+ def test_file_times_new_depends_on_old
+ create_timed_files(OLDFILE, NEWFILE)
+
+ t1 = Rake.application.intern(FileTask, NEWFILE).enhance([OLDFILE])
+ t2 = Rake.application.intern(FileTask, OLDFILE)
+ assert ! t2.needed?, "Should not need to build old file"
+ assert ! t1.needed?, "Should not need to rebuild new file because of old"
+ end
+
+ def test_file_times_old_depends_on_new
+ create_timed_files(OLDFILE, NEWFILE)
+
+ t1 = Rake.application.intern(FileTask,OLDFILE).enhance([NEWFILE])
+ t2 = Rake.application.intern(FileTask, NEWFILE)
+ assert ! t2.needed?, "Should not need to build new file"
+ preq_stamp = t1.prerequisites.collect{|t| Task[t].timestamp}.max
+ assert_equal t2.timestamp, preq_stamp
+ assert t1.timestamp < preq_stamp, "T1 should be older"
+ assert t1.needed?, "Should need to rebuild old file because of new"
+ end
+
+ def test_file_depends_on_task_depend_on_file
+ create_timed_files(OLDFILE, NEWFILE)
+
+ file NEWFILE => [:obj] do |t| @runs << t.name end
+ task :obj => [OLDFILE] do |t| @runs << t.name end
+ file OLDFILE do |t| @runs << t.name end
+
+ Task[:obj].invoke
+ Task[NEWFILE].invoke
+ assert ! @runs.include?(NEWFILE)
+ end
+
+ def test_existing_file_depends_on_non_existing_file
+ create_file(OLDFILE)
+ delete_file(NEWFILE)
+ file NEWFILE
+ file OLDFILE => NEWFILE
+ assert_nothing_raised do Task[OLDFILE].invoke end
+ end
+
+ # I have currently disabled this test. I'm not convinced that
+ # deleting the file target on failure is always the proper thing to
+ # do. I'm willing to hear input on this topic.
+ def ztest_file_deletes_on_failure
+ task :obj
+ file NEWFILE => [:obj] do |t|
+ FileUtils.touch NEWFILE
+ fail "Ooops"
+ end
+ assert Task[NEWFILE]
+ begin
+ Task[NEWFILE].invoke
+ rescue Exception
+ end
+ assert( ! File.exist?(NEWFILE), "NEWFILE should be deleted")
+ end
+
+end
+
+######################################################################
+class Rake::TestDirectoryTask < Test::Unit::TestCase
+ include Rake
+
+ def setup
+ rm_rf "testdata", :verbose=>false
+ end
+
+ def teardown
+ rm_rf "testdata", :verbose=>false
+ end
+
+ def test_directory
+ desc "DESC"
+ directory "testdata/a/b/c"
+ assert_equal FileCreationTask, Task["testdata"].class
+ assert_equal FileCreationTask, Task["testdata/a"].class
+ assert_equal FileCreationTask, Task["testdata/a/b/c"].class
+ assert_nil Task["testdata"].comment
+ assert_equal "DESC", Task["testdata/a/b/c"].comment
+ assert_nil Task["testdata/a/b"].comment
+ verbose(false) {
+ Task['testdata/a/b'].invoke
+ }
+ assert File.exist?("testdata/a/b")
+ assert ! File.exist?("testdata/a/b/c")
+ end
+
+ if Rake::Win32.windows?
+ def test_directory_win32
+ desc "WIN32 DESC"
+ FileUtils.mkdir_p("testdata")
+ Dir.chdir("testdata") do
+ directory 'c:/testdata/a/b/c'
+ assert_equal FileCreationTask, Task['c:/testdata'].class
+ assert_equal FileCreationTask, Task['c:/testdata/a'].class
+ assert_equal FileCreationTask, Task['c:/testdata/a/b/c'].class
+ assert_nil Task['c:/testdata'].comment
+ assert_equal "WIN32 DESC", Task['c:/testdata/a/b/c'].comment
+ assert_nil Task['c:/testdata/a/b'].comment
+ verbose(false) {
+ Task['c:/testdata/a/b'].invoke
+ }
+ assert File.exist?('c:/testdata/a/b')
+ assert ! File.exist?('c:/testdata/a/b/c')
+ end
+ end
+ end
+end
diff --git a/test/rake/test_filelist.rb b/test/rake/test_filelist.rb
new file mode 100644
index 0000000000..08456a4da8
--- /dev/null
+++ b/test/rake/test_filelist.rb
@@ -0,0 +1,625 @@
+require 'test/unit'
+require 'tmpdir'
+require 'rake'
+
+require_relative 'capture_stdout'
+
+class Rake::TestFileList < Test::Unit::TestCase
+ FileList = Rake::FileList
+ include CaptureStdout
+
+ def setup
+ @oldwd = Dir.pwd
+ @tmpwd = Dir.mktmpdir
+ Dir.chdir(@tmpwd)
+ create_test_data
+ end
+
+ def teardown
+# FileList.select_default_ignore_patterns
+ FileUtils.rm_rf("testdata")
+ Dir.chdir(@oldwd)
+ FileUtils.rm_rf(@tmpwd)
+ end
+
+ def test_delgating_methods_do_not_include_to_a_or_to_ary
+ assert ! FileList::DELEGATING_METHODS.include?("to_a"), "should not include to_a"
+ assert ! FileList::DELEGATING_METHODS.include?(:to_a), "should not include to_a"
+ assert ! FileList::DELEGATING_METHODS.include?("to_ary"), "should not include to_ary"
+ assert ! FileList::DELEGATING_METHODS.include?(:to_ary), "should not include to_ary"
+ end
+
+ def test_create
+ fl = FileList.new
+ assert_equal 0, fl.size
+ end
+
+ def test_create_with_args
+ fl = FileList.new("testdata/*.c", "x")
+ assert_equal ["testdata/abc.c", "testdata/x.c", "testdata/xyz.c", "x"].sort,
+ fl.sort
+ end
+
+ def test_create_with_block
+ fl = FileList.new { |f| f.include("x") }
+ assert_equal ["x"], fl.resolve
+ end
+
+ def test_create_with_brackets
+ fl = FileList["testdata/*.c", "x"]
+ assert_equal ["testdata/abc.c", "testdata/x.c", "testdata/xyz.c", "x"].sort,
+ fl.sort
+ end
+
+ def test_create_with_brackets_and_filelist
+ fl = FileList[FileList["testdata/*.c", "x"]]
+ assert_equal ["testdata/abc.c", "testdata/x.c", "testdata/xyz.c", "x"].sort,
+ fl.sort
+ end
+
+ def test_include_with_another_array
+ fl = FileList.new.include(["x", "y", "z"])
+ assert_equal ["x", "y", "z"].sort, fl.sort
+ end
+
+ def test_include_with_another_filelist
+ fl = FileList.new.include(FileList["testdata/*.c", "x"])
+ assert_equal ["testdata/abc.c", "testdata/x.c", "testdata/xyz.c", "x"].sort,
+ fl.sort
+ end
+
+ def test_append
+ fl = FileList.new
+ fl << "a.rb" << "b.rb"
+ assert_equal ['a.rb', 'b.rb'], fl
+ end
+
+ def test_add_many
+ fl = FileList.new
+ fl.include %w(a d c)
+ fl.include('x', 'y')
+ assert_equal ['a', 'd', 'c', 'x', 'y'], fl
+ assert_equal ['a', 'd', 'c', 'x', 'y'], fl.resolve
+ end
+
+ def test_add_return
+ f = FileList.new
+ g = f << "x"
+ assert_equal f.object_id, g.object_id
+ h = f.include("y")
+ assert_equal f.object_id, h.object_id
+ end
+
+ def test_match
+ fl = FileList.new
+ fl.include(File.expand_path('../test*.rb', __FILE__))
+ assert fl.include?(__FILE__)
+ assert fl.size > 3
+ fl.each { |fn| assert_match(/\.rb$/, fn) }
+ end
+
+ def test_add_matching
+ fl = FileList.new
+ fl << "a.java"
+ fl.include(File.dirname(__FILE__)+"/*.rb")
+ assert_equal "a.java", fl[0]
+ assert fl.size > 2
+ assert fl.include?(__FILE__)
+ end
+
+ def test_multiple_patterns
+ create_test_data
+ fl = FileList.new
+ fl.include('*.c', '*xist*')
+ assert_equal [], fl
+ fl.include('testdata/*.c', 'testdata/*xist*')
+ assert_equal [
+ 'testdata/x.c', 'testdata/xyz.c', 'testdata/abc.c', 'testdata/existing'
+ ].sort, fl.sort
+ end
+
+ def test_square_bracket_pattern
+ fl = FileList.new
+ fl.include("testdata/abc.[ch]")
+ assert fl.size == 2
+ assert fl.include?("testdata/abc.c")
+ assert fl.include?("testdata/abc.h")
+ end
+
+ def test_curly_bracket_pattern
+ fl = FileList.new
+ fl.include("testdata/abc.{c,h}")
+ assert fl.size == 2
+ assert fl.include?("testdata/abc.c")
+ assert fl.include?("testdata/abc.h")
+ end
+
+ def test_reject
+ fl = FileList.new
+ fl.include %w(testdata/x.c testdata/abc.c testdata/xyz.c testdata/existing)
+ fl.reject! { |fn| fn =~ %r{/x} }
+ assert_equal [
+ 'testdata/abc.c', 'testdata/existing'
+ ], fl
+ end
+
+ def test_exclude
+ fl = FileList['testdata/x.c', 'testdata/abc.c', 'testdata/xyz.c', 'testdata/existing']
+ fl.each { |fn| touch fn, :verbose => false }
+ x = fl.exclude(%r{/x.+\.})
+ assert_equal FileList, x.class
+ assert_equal %w(testdata/x.c testdata/abc.c testdata/existing), fl
+ assert_equal fl.object_id, x.object_id
+ fl.exclude('testdata/*.c')
+ assert_equal ['testdata/existing'], fl
+ fl.exclude('testdata/existing')
+ assert_equal [], fl
+ end
+
+ def test_excluding_via_block
+ fl = FileList['testdata/a.c', 'testdata/b.c', 'testdata/xyz.c']
+ fl.exclude { |fn| fn.pathmap('%n') == 'xyz' }
+ assert fl.exclude?("xyz.c"), "Should exclude xyz.c"
+ assert_equal ['testdata/a.c', 'testdata/b.c'], fl
+ end
+
+ def test_exclude_return_on_create
+ fl = FileList['testdata/*'].exclude(/.*\.[hcx]$/)
+ assert_equal ['testdata/existing', 'testdata/cfiles'].sort, fl.sort
+ assert_equal FileList, fl.class
+ end
+
+ def test_exclude_with_string_return_on_create
+ fl = FileList['testdata/*'].exclude('testdata/abc.c')
+ assert_equal %w(testdata/existing testdata/cfiles testdata/x.c testdata/abc.h testdata/abc.x testdata/xyz.c).sort, fl.sort
+ assert_equal FileList, fl.class
+ end
+
+ def test_default_exclude
+ fl = FileList.new
+ fl.clear_exclude
+ fl.include("**/*~", "**/*.bak", "**/core")
+ assert fl.member?("testdata/core"), "Should include core"
+ assert fl.member?("testdata/x.bak"), "Should include .bak files"
+ end
+
+ def test_unique
+ fl = FileList.new
+ fl << "x.c" << "a.c" << "b.rb" << "a.c"
+ assert_equal ['x.c', 'a.c', 'b.rb', 'a.c'], fl
+ fl.uniq!
+ assert_equal ['x.c', 'a.c', 'b.rb'], fl
+ end
+
+ def test_to_string
+ fl = FileList.new
+ fl << "a.java" << "b.java"
+ assert_equal "a.java b.java", fl.to_s
+ assert_equal "a.java b.java", "#{fl}"
+ end
+
+ def test_to_array
+ fl = FileList['a.java', 'b.java']
+ assert_equal ['a.java', 'b.java'], fl.to_a
+ assert_equal Array, fl.to_a.class
+ assert_equal ['a.java', 'b.java'], fl.to_ary
+ assert_equal Array, fl.to_ary.class
+ end
+
+ def test_to_s_pending
+ fl = FileList['testdata/abc.*']
+ result = fl.to_s
+ assert_match(%r{testdata/abc\.c}, result)
+ assert_match(%r{testdata/abc\.h}, result)
+ assert_match(%r{testdata/abc\.x}, result)
+ assert_match(%r{(testdata/abc\..\b ?){2}}, result)
+ end
+
+ def test_inspect_pending
+ fl = FileList['testdata/abc.*']
+ result = fl.inspect
+ assert_match(%r{"testdata/abc\.c"}, result)
+ assert_match(%r{"testdata/abc\.h"}, result)
+ assert_match(%r{"testdata/abc\.x"}, result)
+ assert_match(%r|^\[("testdata/abc\..", ){2}"testdata/abc\.."\]$|, result)
+ end
+
+ def test_sub
+ fl = FileList["testdata/*.c"]
+ f2 = fl.sub(/\.c$/, ".o")
+ assert_equal FileList, f2.class
+ assert_equal ["testdata/abc.o", "testdata/x.o", "testdata/xyz.o"].sort,
+ f2.sort
+ f3 = fl.gsub(/\.c$/, ".o")
+ assert_equal FileList, f3.class
+ assert_equal ["testdata/abc.o", "testdata/x.o", "testdata/xyz.o"].sort,
+ f3.sort
+ end
+
+ def test_claim_to_be_a_kind_of_array
+ fl = FileList['testdata/*.c']
+ assert fl.is_a?(Array)
+ assert fl.kind_of?(Array)
+ end
+
+ def test_claim_to_be_a_kind_of_filelist
+ fl = FileList['testdata/*.c']
+ assert fl.is_a?(FileList)
+ assert fl.kind_of?(FileList)
+ end
+
+ def test_claim_to_be_a_filelist_instance
+ fl = FileList['testdata/*.c']
+ assert fl.instance_of?(FileList)
+ end
+
+ def test_dont_claim_to_be_an_array_instance
+ fl = FileList['testdata/*.c']
+ assert ! fl.instance_of?(Array)
+ end
+
+ def test_sub!
+ f = "x/a.c"
+ fl = FileList[f, "x/b.c"]
+ res = fl.sub!(/\.c$/, ".o")
+ assert_equal ["x/a.o", "x/b.o"].sort, fl.sort
+ assert_equal "x/a.c", f
+ assert_equal fl.object_id, res.object_id
+ end
+
+ def test_sub_with_block
+ fl = FileList["src/org/onestepback/a.java", "src/org/onestepback/b.java"]
+# The block version doesn't work the way I want it to ...
+# f2 = fl.sub(%r{^src/(.*)\.java$}) { |x| "classes/" + $1 + ".class" }
+ f2 = fl.sub(%r{^src/(.*)\.java$}, "classes/\\1.class")
+ assert_equal [
+ "classes/org/onestepback/a.class",
+ "classes/org/onestepback/b.class"
+ ].sort,
+ f2.sort
+ end
+
+ def test_string_ext
+ assert_equal "one.net", "one.two".ext("net")
+ assert_equal "one.net", "one.two".ext(".net")
+ assert_equal "one.net", "one".ext("net")
+ assert_equal "one.net", "one".ext(".net")
+ assert_equal "one.two.net", "one.two.c".ext(".net")
+ assert_equal "one/two.net", "one/two.c".ext(".net")
+ assert_equal "one.x/two.net", "one.x/two.c".ext(".net")
+ assert_equal "one.x/two.net", "one.x/two".ext(".net")
+ assert_equal ".onerc.net", ".onerc.dot".ext("net")
+ assert_equal ".onerc.net", ".onerc".ext("net")
+ assert_equal ".a/.onerc.net", ".a/.onerc".ext("net")
+ assert_equal "one", "one.two".ext('')
+ assert_equal "one", "one.two".ext
+ assert_equal ".one", ".one.two".ext
+ assert_equal ".one", ".one".ext
+ assert_equal ".", ".".ext("c")
+ assert_equal "..", "..".ext("c")
+ # These only need to work in windows
+ if Rake::Win32.windows?
+ assert_equal "one.x\\two.net", "one.x\\two.c".ext(".net")
+ assert_equal "one.x\\two.net", "one.x\\two".ext(".net")
+ end
+ end
+
+ def test_filelist_ext
+ assert_equal FileList['one.c', '.one.c'],
+ FileList['one.net', '.one'].ext('c')
+ end
+
+ def test_gsub
+ create_test_data
+ fl = FileList["testdata/*.c"]
+ f2 = fl.gsub(/a/, "A")
+ assert_equal ["testdAtA/Abc.c", "testdAtA/x.c", "testdAtA/xyz.c"].sort,
+ f2.sort
+ end
+
+ def test_gsub!
+ create_test_data
+ f = FileList["testdata/*.c"]
+ f.gsub!(/a/, "A")
+ assert_equal ["testdAtA/Abc.c", "testdAtA/x.c", "testdAtA/xyz.c"].sort,
+ f.sort
+ end
+
+ def test_egrep_with_output
+ files = FileList[File.expand_path('../test*.rb', __FILE__)]
+ the_line_number = __LINE__ + 1
+ out = capture_stdout do files.egrep(/PUGH/) end
+ assert_match(/:#{the_line_number}:/, out)
+ end
+
+ def test_egrep_with_block
+ files = FileList[File.expand_path('../test*.rb', __FILE__)]
+ found = false
+ the_line_number = __LINE__ + 1
+ files.egrep(/XYZZY/) do |fn, ln, line |
+ assert_equal __FILE__, fn
+ assert_equal the_line_number, ln
+ assert_match(/files\.egrep/, line)
+ found = true
+ end
+ assert found, "should have found a matching line"
+ end
+
+ def test_existing
+ fl = FileList['testdata/abc.c', 'testdata/notthere.c']
+ assert_equal ["testdata/abc.c"], fl.existing
+ assert fl.existing.is_a?(FileList)
+ end
+
+ def test_existing!
+ fl = FileList['testdata/abc.c', 'testdata/notthere.c']
+ result = fl.existing!
+ assert_equal ["testdata/abc.c"], fl
+ assert_equal fl.object_id, result.object_id
+ end
+
+ def test_ignore_special
+ f = FileList['testdata/*']
+ assert ! f.include?("testdata/CVS"), "Should not contain CVS"
+ assert ! f.include?("testdata/.svn"), "Should not contain .svn"
+ assert ! f.include?("testdata/.dummy"), "Should not contain dot files"
+ assert ! f.include?("testdata/x.bak"), "Should not contain .bak files"
+ assert ! f.include?("testdata/x~"), "Should not contain ~ files"
+ assert ! f.include?("testdata/core"), "Should not contain core files"
+ end
+
+ def test_clear_ignore_patterns
+ f = FileList['testdata/*', 'testdata/.svn']
+ f.clear_exclude
+ assert f.include?("testdata/abc.c")
+ assert f.include?("testdata/xyz.c")
+ assert f.include?("testdata/CVS")
+ assert f.include?("testdata/.svn")
+ assert f.include?("testdata/x.bak")
+ assert f.include?("testdata/x~")
+ end
+
+ def test_exclude_with_alternate_file_seps
+ fl = FileList.new
+ assert fl.exclude?("x/CVS/y")
+ assert fl.exclude?("x\\CVS\\y")
+ assert fl.exclude?("x/.svn/y")
+ assert fl.exclude?("x\\.svn\\y")
+ assert fl.exclude?("x/core")
+ assert fl.exclude?("x\\core")
+ end
+
+ def test_add_default_exclude_list
+ fl = FileList.new
+ fl.exclude(/~\d+$/)
+ assert fl.exclude?("x/CVS/y")
+ assert fl.exclude?("x\\CVS\\y")
+ assert fl.exclude?("x/.svn/y")
+ assert fl.exclude?("x\\.svn\\y")
+ assert fl.exclude?("x/core")
+ assert fl.exclude?("x\\core")
+ assert fl.exclude?("x/abc~1")
+ end
+
+ def test_basic_array_functions
+ f = FileList['b', 'c', 'a']
+ assert_equal 'b', f.first
+ assert_equal 'b', f[0]
+ assert_equal 'a', f.last
+ assert_equal 'a', f[2]
+ assert_equal 'a', f[-1]
+ assert_equal ['a', 'b', 'c'], f.sort
+ f.sort!
+ assert_equal ['a', 'b', 'c'], f
+ end
+
+ def test_flatten
+ assert_equal ['a', 'testdata/x.c', 'testdata/xyz.c', 'testdata/abc.c'].sort,
+ ['a', FileList['testdata/*.c']].flatten.sort
+ end
+
+ def test_clone_and_dup
+ a = FileList['a', 'b', 'c']
+ c = a.clone
+ d = a.dup
+ a << 'd'
+ assert_equal ['a', 'b', 'c', 'd'], a
+ assert_equal ['a', 'b', 'c'], c
+ assert_equal ['a', 'b', 'c'], d
+ end
+
+ def test_dup_and_clone_replicate_taint
+ a = FileList['a', 'b', 'c']
+ a.taint
+ c = a.clone
+ d = a.dup
+ assert c.tainted?, "Clone should be tainted"
+ assert d.tainted?, "Dup should be tainted"
+ end
+
+ def test_duped_items_will_thaw
+ a = FileList['a', 'b', 'c']
+ a.freeze
+ d = a.dup
+ d << 'more'
+ assert_equal ['a', 'b', 'c', 'more'], d
+ end
+
+ def test_cloned_items_stay_frozen
+ a = FileList['a', 'b', 'c']
+ a.freeze
+ c = a.clone
+ assert_raise(TypeError, RuntimeError) do
+ c << 'more'
+ end
+ end
+
+ def test_array_comparisons
+ fl = FileList['b', 'b']
+ a = ['b', 'a']
+ b = ['b', 'b']
+ c = ['b', 'c']
+ assert_equal( 1, fl <=> a )
+ assert_equal( 0, fl <=> b )
+ assert_equal( -1, fl <=> c )
+ assert_equal( -1, a <=> fl )
+ assert_equal( 0, b <=> fl )
+ assert_equal( 1, c <=> fl )
+ end
+
+ def test_array_equality
+ a = FileList['a', 'b']
+ b = ['a', 'b']
+ assert a == b
+ assert b == a
+# assert a.eql?(b)
+# assert b.eql?(a)
+ assert ! a.equal?(b)
+ assert ! b.equal?(a)
+ end
+
+ def test_enumeration_methods
+ a = FileList['a', 'b']
+ b = a.collect { |it| it.upcase }
+ assert_equal ['A', 'B'], b
+ assert_equal FileList, b.class
+
+ b = a.map { |it| it.upcase }
+ assert_equal ['A', 'B'], b
+ assert_equal FileList, b.class
+
+ b = a.sort
+ assert_equal ['a', 'b'], b
+ assert_equal FileList, b.class
+
+ b = a.sort_by { |it| it }
+ assert_equal ['a', 'b'], b
+ assert_equal FileList, b.class
+
+ b = a.find_all { |it| it == 'b'}
+ assert_equal ['b'], b
+ assert_equal FileList, b.class
+
+ b = a.select { |it| it.size == 1 }
+ assert_equal ['a', 'b'], b
+ assert_equal FileList, b.class
+
+ b = a.reject { |it| it == 'b' }
+ assert_equal ['a'], b
+ assert_equal FileList, b.class
+
+ b = a.grep(/./)
+ assert_equal ['a', 'b'], b
+ assert_equal FileList, b.class
+
+ b = a.partition { |it| it == 'b' }
+ assert_equal [['b'], ['a']], b
+ assert_equal Array, b.class
+ assert_equal FileList, b[0].class
+ assert_equal FileList, b[1].class
+
+ b = a.zip(['x', 'y']).to_a
+ assert_equal [['a', 'x'], ['b', 'y']], b
+ assert_equal Array, b.class
+ assert_equal Array, b[0].class
+ assert_equal Array, b[1].class
+ end
+
+ def test_array_operators
+ a = ['a', 'b']
+ b = ['c', 'd']
+ f = FileList['x', 'y']
+ g = FileList['w', 'z']
+
+ r = f + g
+ assert_equal ['x', 'y', 'w', 'z'], r
+ assert_equal FileList, r.class
+
+ r = a + g
+ assert_equal ['a', 'b', 'w', 'z'], r
+ assert_equal Array, r.class
+
+ r = f + b
+ assert_equal ['x', 'y', 'c', 'd'], r
+ assert_equal FileList, r.class
+
+ r = FileList['w', 'x', 'y', 'z'] - f
+ assert_equal ['w', 'z'], r
+ assert_equal FileList, r.class
+
+ r = FileList['w', 'x', 'y', 'z'] & f
+ assert_equal ['x', 'y'], r
+ assert_equal FileList, r.class
+
+ r = f * 2
+ assert_equal ['x', 'y', 'x', 'y'], r
+ assert_equal FileList, r.class
+
+ r = f * ','
+ assert_equal 'x,y', r
+ assert_equal String, r.class
+
+ r = f | ['a', 'x']
+ assert_equal ['a', 'x', 'y'].sort, r.sort
+ assert_equal FileList, r.class
+ end
+
+ def test_other_array_returning_methods
+ f = FileList['a', nil, 'b']
+ r = f.compact
+ assert_equal ['a', 'b'], r
+ assert_equal FileList, r.class
+
+ f = FileList['a', 'b']
+ r = f.concat(['x', 'y'])
+ assert_equal ['a', 'b', 'x', 'y'], r
+ assert_equal FileList, r.class
+
+ f = FileList['a', ['b', 'c'], FileList['d', 'e']]
+ r = f.flatten
+ assert_equal ['a', 'b', 'c', 'd', 'e'], r
+ assert_equal FileList, r.class
+
+ f = FileList['a', 'b', 'a']
+ r = f.uniq
+ assert_equal ['a', 'b'], r
+ assert_equal FileList, r.class
+
+ f = FileList['a', 'b', 'c', 'd']
+ r = f.values_at(1,3)
+ assert_equal ['b', 'd'], r
+ assert_equal FileList, r.class
+ end
+
+ def test_file_utils_can_use_filelists
+ cfiles = FileList['testdata/*.c']
+
+ cp cfiles, @cdir, :verbose => false
+
+ assert File.exist?(File.join(@cdir, 'abc.c'))
+ assert File.exist?(File.join(@cdir, 'xyz.c'))
+ assert File.exist?(File.join(@cdir, 'x.c'))
+ end
+
+ def create_test_data
+ verbose(false) do
+
+ mkdir "testdata" unless File.exist? "testdata"
+ mkdir "testdata/CVS" rescue nil
+ mkdir "testdata/.svn" rescue nil
+ @cdir = "testdata/cfiles"
+ mkdir @cdir rescue nil
+ touch "testdata/.dummy"
+ touch "testdata/x.bak"
+ touch "testdata/x~"
+ touch "testdata/core"
+ touch "testdata/x.c"
+ touch "testdata/xyz.c"
+ touch "testdata/abc.c"
+ touch "testdata/abc.h"
+ touch "testdata/abc.x"
+ touch "testdata/existing"
+ end
+ end
+
+end
diff --git a/test/rake/test_fileutils.rb b/test/rake/test_fileutils.rb
new file mode 100644
index 0000000000..1664ec80c3
--- /dev/null
+++ b/test/rake/test_fileutils.rb
@@ -0,0 +1,262 @@
+require 'rake'
+require 'test/unit'
+require_relative 'filecreation'
+require 'fileutils'
+require 'stringio'
+
+class Rake::TestFileUtils < Test::Unit::TestCase
+ include FileCreation
+ BASEDIR = File.dirname(__FILE__)
+ ShellCommand = "#{BASEDIR}/shellcommand.rb"
+ ENV_RUBY = ENV['RUBY']
+
+ def setup
+ if ruby = ENV_RUBY
+ @oldruby = FileUtils.class_eval {remove_const :RUBY}
+ FileUtils.class_eval {const_set(:RUBY, ruby)}
+ else
+ @oldruby = nil
+ end
+ end
+
+ def teardown
+ FileUtils.rm_rf("testdata")
+ FileUtils::LN_SUPPORTED[0] = true
+ if @oldruby
+ ruby = @oldruby
+ FileUtils.class_eval {remove_const :RUBY}
+ FileUtils.class_eval {const_set(:RUBY, ruby)}
+ end
+ end
+
+ def test_rm_one_file
+ create_file("testdata/a")
+ FileUtils.rm_rf "testdata/a"
+ assert ! File.exist?("testdata/a")
+ end
+
+ def test_rm_two_files
+ create_file("testdata/a")
+ create_file("testdata/b")
+ FileUtils.rm_rf ["testdata/a", "testdata/b"]
+ assert ! File.exist?("testdata/a")
+ assert ! File.exist?("testdata/b")
+ end
+
+ def test_rm_filelist
+ list = Rake::FileList.new << "testdata/a" << "testdata/b"
+ list.each { |fn| create_file(fn) }
+ FileUtils.rm_r list
+ assert ! File.exist?("testdata/a")
+ assert ! File.exist?("testdata/b")
+ end
+
+ def test_ln
+ create_dir("testdata")
+ open("testdata/a", "w") { |f| f.puts "TEST_LN" }
+ RakeFileUtils.safe_ln("testdata/a", "testdata/b", :verbose => false)
+ assert_equal "TEST_LN\n", open("testdata/b") { |f| f.read }
+ end
+
+ class BadLink
+ include RakeFileUtils
+ attr_reader :cp_args
+ def initialize(klass)
+ @failure_class = klass
+ end
+ def cp(*args)
+ @cp_args = args
+ end
+ def ln(*args)
+ fail @failure_class, "ln not supported"
+ end
+ public :safe_ln
+ end
+
+ def test_safe_ln_failover_to_cp_on_standard_error
+ FileUtils::LN_SUPPORTED[0] = true
+ c = BadLink.new(StandardError)
+ c.safe_ln "a", "b"
+ assert_equal ['a', 'b'], c.cp_args
+ c.safe_ln "x", "y"
+ assert_equal ['x', 'y'], c.cp_args
+ end
+
+ def test_safe_ln_failover_to_cp_on_not_implemented_error
+ FileUtils::LN_SUPPORTED[0] = true
+ c = BadLink.new(NotImplementedError)
+ c.safe_ln "a", "b"
+ assert_equal ['a', 'b'], c.cp_args
+ end
+
+ def test_safe_ln_fails_on_script_error
+ FileUtils::LN_SUPPORTED[0] = true
+ c = BadLink.new(ScriptError)
+ assert_raise(ScriptError) do c.safe_ln "a", "b" end
+ end
+
+ def test_verbose
+ verbose true
+ assert_equal true, verbose
+ verbose false
+ assert_equal false, verbose
+ verbose(true) {
+ assert_equal true, verbose
+ }
+ assert_equal false, verbose
+ end
+
+ def test_nowrite
+ nowrite true
+ assert_equal true, nowrite
+ nowrite false
+ assert_equal false, nowrite
+ nowrite(true){
+ assert_equal true, nowrite
+ }
+ assert_equal false, nowrite
+ end
+
+ def test_file_utils_methods_are_available_at_top_level
+ create_file("testdata/a")
+ verbose(false) do
+ rm_rf "testdata/a"
+ end
+ assert ! File.exist?("testdata/a")
+ end
+
+ def test_fileutils_methods_dont_leak
+ obj = Object.new
+ assert_raise(NoMethodError) { obj.copy } # from FileUtils
+ assert_raise(NoMethodError) { obj.ruby } # from RubyFileUtils
+ end
+
+ def test_sh
+ verbose(false) { sh %{#{RUBY} #{ShellCommand}} }
+ assert true, "should not fail"
+ end
+
+ # If the :sh method is invoked directly from a test unit instance
+ # (under mini/test), the mini/test version of fail is invoked rather
+ # than the kernel version of fail. So we run :sh from within a
+ # non-test class to avoid the problem.
+ class Sh
+ include FileUtils
+ def run(*args)
+ sh(*args)
+ end
+ def self.run(*args)
+ new.run(*args)
+ end
+ end
+
+ def test_sh_with_a_single_string_argument
+ ENV['RAKE_TEST_SH'] = 'someval'
+ verbose(false) {
+ sh %{#{RUBY} #{BASEDIR}/check_expansion.rb #{env_var} someval}
+ }
+ end
+
+ def test_sh_with_multiple_arguments
+ ENV['RAKE_TEST_SH'] = 'someval'
+ verbose(false) {
+ Sh.run RUBY, File.expand_path('../check_no_expansion.rb', __FILE__), env_var, 'someval'
+ }
+ end
+
+ def test_sh_failure
+ assert_raise(RuntimeError) {
+ verbose(false) { Sh.run "#{RUBY} #{File.expand_path('../shellcommand.rb', __FILE__)} 1" }
+ }
+ end
+
+ def test_sh_special_handling
+ count = 0
+ verbose(false) {
+ sh(%{#{RUBY} #{ShellCommand}}) do |ok, res|
+ assert(ok)
+ assert_equal 0, res.exitstatus
+ count += 1
+ end
+ sh(%{#{RUBY} #{ShellCommand} 1}) do |ok, res|
+ assert(!ok)
+ assert_equal 1, res.exitstatus
+ count += 1
+ end
+ }
+ assert_equal 2, count, "Block count should be 2"
+ end
+
+ def test_sh_noop
+ verbose(false) { sh %{#{ShellCommand} 1}, :noop=>true }
+ assert true, "should not fail"
+ end
+
+ def test_sh_bad_option
+ ex = assert_raise(ArgumentError) {
+ verbose(false) { sh %{#{ShellCommand}}, :bad_option=>true }
+ }
+ assert_match(/bad_option/, ex.message)
+ end
+
+ def test_sh_verbose
+ out = redirect_stderr {
+ verbose(true) {
+ sh %{#{ShellCommand}}, :noop=>true
+ }
+ }
+ assert_match(/^#{Regexp.quote(ShellCommand)}$/o, out)
+ end
+
+ def test_sh_no_verbose
+ out = redirect_stderr {
+ verbose(false) {
+ sh %{#{ShellCommand}}, :noop=>true
+ }
+ }
+ assert_equal '', out
+ end
+
+ def test_ruby_with_a_single_string_argument
+ ENV['RAKE_TEST_SH'] = 'someval'
+ verbose(false) {
+ ruby %{#{BASEDIR}/check_expansion.rb #{env_var} someval}
+ }
+ end
+
+ def test_ruby_with_multiple_arguments
+ ENV['RAKE_TEST_SH'] = 'someval'
+ verbose(false) {
+ ruby "#{BASEDIR}/check_no_expansion.rb", env_var, 'someval'
+ }
+ end
+
+ def test_split_all
+ assert_equal ['a'], RakeFileUtils.split_all('a')
+ assert_equal ['..'], RakeFileUtils.split_all('..')
+ assert_equal ['/'], RakeFileUtils.split_all('/')
+ assert_equal ['a', 'b'], RakeFileUtils.split_all('a/b')
+ assert_equal ['/', 'a', 'b'], RakeFileUtils.split_all('/a/b')
+ assert_equal ['..', 'a', 'b'], RakeFileUtils.split_all('../a/b')
+ end
+
+ private
+
+ def redirect_stderr
+ old_err = $stderr
+ $stderr = StringIO.new
+ yield
+ $stderr.string
+ ensure
+ $stderr = old_err
+ end
+
+ def windows?
+ ! File::ALT_SEPARATOR.nil?
+ end
+
+ def env_var
+ windows? ? '%RAKE_TEST_SH%' : '$RAKE_TEST_SH'
+ end
+
+end
diff --git a/test/rake/test_invocation_chain.rb b/test/rake/test_invocation_chain.rb
new file mode 100644
index 0000000000..2b06493773
--- /dev/null
+++ b/test/rake/test_invocation_chain.rb
@@ -0,0 +1,75 @@
+require 'test/unit'
+require 'rake'
+
+######################################################################
+class Rake::TestAnEmptyInvocationChain < Test::Unit::TestCase
+
+ def setup
+ @empty = Rake::InvocationChain::EMPTY
+ end
+
+ def test_should_be_able_to_add_members
+ assert_nothing_raised do
+ @empty.append("A")
+ end
+ end
+
+ def test_to_s
+ assert_equal "TOP", @empty.to_s
+ end
+end
+
+######################################################################
+class Rake::TestAnInvocationChainWithOneMember < Test::Unit::TestCase
+
+ def setup
+ @empty = Rake::InvocationChain::EMPTY
+ @first_member = "A"
+ @chain = @empty.append(@first_member)
+ end
+
+ def test_should_report_first_member_as_a_member
+ assert @chain.member?(@first_member)
+ end
+
+ def test_should_fail_when_adding_original_member
+ ex = assert_raise RuntimeError do
+ @chain.append(@first_member)
+ end
+ assert_match(/circular +dependency/i, ex.message)
+ assert_match(/A.*=>.*A/, ex.message)
+ end
+
+ def test_to_s
+ assert_equal "TOP => A", @chain.to_s
+ end
+
+end
+
+######################################################################
+class Rake::TestAnInvocationChainWithMultipleMember < Test::Unit::TestCase
+
+ def setup
+ @first_member = "A"
+ @second_member = "B"
+ ch = Rake::InvocationChain::EMPTY.append(@first_member)
+ @chain = ch.append(@second_member)
+ end
+
+ def test_should_report_first_member_as_a_member
+ assert @chain.member?(@first_member)
+ end
+
+ def test_should_report_second_member_as_a_member
+ assert @chain.member?(@second_member)
+ end
+
+ def test_should_fail_when_adding_original_member
+ ex = assert_raise RuntimeError do
+ @chain.append(@first_member)
+ end
+ assert_match(/A.*=>.*B.*=>.*A/, ex.message)
+ end
+end
+
+
diff --git a/test/rake/test_makefile_loader.rb b/test/rake/test_makefile_loader.rb
new file mode 100644
index 0000000000..15933b1f9b
--- /dev/null
+++ b/test/rake/test_makefile_loader.rb
@@ -0,0 +1,24 @@
+require 'test/unit'
+require 'rake'
+require 'rake/loaders/makefile'
+
+class Rake::TestMakefileLoader < Test::Unit::TestCase
+ include Rake
+
+ def test_parse
+ Task.clear
+ loader = Rake::MakefileLoader.new
+ loader.load("#{File.dirname(__FILE__)}/data/sample.mf")
+ %w(a b c d).each do |t|
+ assert Task.task_defined?(t), "#{t} should be a defined task"
+ end
+ assert_equal %w(a1 a2 a3 a4 a5 a6 a7).sort, Task['a'].prerequisites.sort
+ assert_equal %w(b1 b2 b3 b4 b5 b6 b7).sort, Task['b'].prerequisites.sort
+ assert_equal %w(c1).sort, Task['c'].prerequisites.sort
+ assert_equal %w(d1 d2).sort, Task['d'].prerequisites.sort
+ assert_equal %w(e1 f1).sort, Task['e'].prerequisites.sort
+ assert_equal %w(e1 f1).sort, Task['f'].prerequisites.sort
+ assert_equal ["g1", "g 2", "g 3", "g4"].sort, Task['g 0'].prerequisites.sort
+ assert_equal 7, Task.tasks.size
+ end
+end
diff --git a/test/rake/test_multitask.rb b/test/rake/test_multitask.rb
new file mode 100644
index 0000000000..9711e7e77e
--- /dev/null
+++ b/test/rake/test_multitask.rb
@@ -0,0 +1,43 @@
+require 'test/unit'
+require 'rake'
+
+######################################################################
+class Rake::TestMultiTask < Test::Unit::TestCase
+ include Rake
+
+ def setup
+ Task.clear
+ @runs = Array.new
+ end
+
+ def test_running_multitasks
+ task :a do 3.times do |i| @runs << "A#{i}"; sleep 0.01; end end
+ task :b do 3.times do |i| @runs << "B#{i}"; sleep 0.01; end end
+ multitask :both => [:a, :b]
+ Task[:both].invoke
+ assert_equal 6, @runs.size
+ assert @runs.index("A0") < @runs.index("A1")
+ assert @runs.index("A1") < @runs.index("A2")
+ assert @runs.index("B0") < @runs.index("B1")
+ assert @runs.index("B1") < @runs.index("B2")
+ end
+
+ def test_all_multitasks_wait_on_slow_prerequisites
+ task :slow do 3.times do |i| @runs << "S#{i}"; sleep 0.05 end end
+ task :a => [:slow] do 3.times do |i| @runs << "A#{i}"; sleep 0.01 end end
+ task :b => [:slow] do 3.times do |i| @runs << "B#{i}"; sleep 0.01 end end
+ multitask :both => [:a, :b]
+ Task[:both].invoke
+ assert_equal 9, @runs.size
+ assert @runs.index("S0") < @runs.index("S1")
+ assert @runs.index("S1") < @runs.index("S2")
+ assert @runs.index("S2") < @runs.index("A0")
+ assert @runs.index("S2") < @runs.index("B0")
+ assert @runs.index("A0") < @runs.index("A1")
+ assert @runs.index("A1") < @runs.index("A2")
+ assert @runs.index("B0") < @runs.index("B1")
+ assert @runs.index("B1") < @runs.index("B2")
+ end
+end
+
+
diff --git a/test/rake/test_namespace.rb b/test/rake/test_namespace.rb
new file mode 100644
index 0000000000..bd513b6a10
--- /dev/null
+++ b/test/rake/test_namespace.rb
@@ -0,0 +1,44 @@
+require 'test/unit'
+require 'rake'
+
+class Rake::TestNameSpace < Test::Unit::TestCase
+
+ class TM
+ include Rake::TaskManager
+ end
+
+ def test_namespace_creation
+ mgr = TM.new
+ ns = Rake::NameSpace.new(mgr, [])
+ assert_not_nil ns
+ end
+
+ def test_namespace_lookup
+ mgr = TM.new
+ ns = mgr.in_namespace("n") do
+ mgr.define_task(Rake::Task, "t")
+ end
+
+ assert_not_nil ns["t"]
+ assert_equal mgr["n:t"], ns["t"]
+ end
+
+ def test_namespace_reports_tasks_it_owns
+ mgr = TM.new
+ nns = nil
+ ns = mgr.in_namespace("n") do
+ mgr.define_task(Rake::Task, :x)
+ mgr.define_task(Rake::Task, :y)
+ nns = mgr.in_namespace("nn") do
+ mgr.define_task(Rake::Task, :z)
+ end
+ end
+ mgr.in_namespace("m") do
+ mgr.define_task(Rake::Task, :x)
+ end
+
+ assert_equal ["n:nn:z", "n:x", "n:y"],
+ ns.tasks.map { |tsk| tsk.name }
+ assert_equal ["n:nn:z"], nns.tasks.map {|t| t.name}
+ end
+end
diff --git a/test/rake/test_package_task.rb b/test/rake/test_package_task.rb
new file mode 100644
index 0000000000..0ed20e42c0
--- /dev/null
+++ b/test/rake/test_package_task.rb
@@ -0,0 +1,115 @@
+require 'tmpdir'
+require 'fileutils'
+require 'test/unit'
+require 'rake/packagetask'
+
+class Rake::TestPackageTask < Test::Unit::TestCase
+ include Rake
+
+ def test_create
+ pwd = Dir.pwd
+ tmpdir = Dir.mktmpdir("rake")
+ Dir.chdir(tmpdir)
+ Dir.mkdir("bin")
+ open("bin/rake", "wb") {}
+ pkg = Rake::PackageTask.new("pkgr", "1.2.3") { |p|
+ p.package_files << "install.rb"
+ p.package_files.include(
+ '[A-Z]*',
+ 'bin/**/*',
+ 'lib/**/*.rb',
+ 'test/**/*.rb',
+ 'doc/**/*',
+ 'build/rubyapp.rb',
+ '*.blurb')
+ p.package_files.exclude(/\bCVS\b/)
+ p.package_files.exclude(/~$/)
+ p.package_dir = 'pkg'
+ p.need_tar = true
+ p.need_tar_gz = true
+ p.need_tar_bz2 = true
+ p.need_zip = true
+ }
+ assert_equal "pkg", pkg.package_dir
+ assert pkg.package_files.include?("bin/rake")
+ assert "pkgr", pkg.name
+ assert "1.2.3", pkg.version
+ assert Task[:package]
+ assert Task['pkg/pkgr-1.2.3.tgz']
+ assert Task['pkg/pkgr-1.2.3.tar.gz']
+ assert Task['pkg/pkgr-1.2.3.tar.bz2']
+ assert Task['pkg/pkgr-1.2.3.zip']
+ assert Task["pkg/pkgr-1.2.3"]
+ assert Task[:clobber_package]
+ assert Task[:repackage]
+ ensure
+ Dir.chdir(pwd)
+ FileUtils.rm_rf(tmpdir)
+ end
+
+ def test_missing_version
+ assert_raise(RuntimeError) {
+ pkg = Rake::PackageTask.new("pkgr") { |p| }
+ }
+ end
+
+ def test_no_version
+ pkg = Rake::PackageTask.new("pkgr", :noversion) { |p| }
+ assert "pkgr", pkg.send(:package_name)
+ end
+
+ def test_clone
+ pkg = Rake::PackageTask.new("x", :noversion)
+ p2 = pkg.clone
+ pkg.package_files << "y"
+ p2.package_files << "x"
+ assert_equal ["y"], pkg.package_files
+ assert_equal ["x"], p2.package_files
+ end
+end
+
+
+require 'rake/gempackagetask'
+
+class Rake::TestGemPackageTask < Test::Unit::TestCase
+ def test_gem_package
+ gem = Gem::Specification.new do |g|
+ g.name = "pkgr"
+ g.version = "1.2.3"
+ g.files = FileList["x"].resolve
+ end
+ pkg = Rake::GemPackageTask.new(gem) do |p|
+ p.package_files << "y"
+ end
+ assert_equal ["x", "y"], pkg.package_files
+ assert_equal "pkgr-1.2.3.gem", pkg.gem_file
+ end
+
+ def test_gem_package_with_current_platform
+ gem = Gem::Specification.new do |g|
+ g.name = "pkgr"
+ g.version = "1.2.3"
+ g.files = FileList["x"].resolve
+ g.platform = Gem::Platform::CURRENT
+ end
+ pkg = Rake::GemPackageTask.new(gem) do |p|
+ p.package_files << "y"
+ end
+ assert_equal ["x", "y"], pkg.package_files
+ assert_match(/^pkgr-1\.2\.3-(\S+)\.gem$/, pkg.gem_file)
+ end
+
+ def test_gem_package_with_ruby_platform
+ gem = Gem::Specification.new do |g|
+ g.name = "pkgr"
+ g.version = "1.2.3"
+ g.files = FileList["x"].resolve
+ g.platform = Gem::Platform::RUBY
+ end
+ pkg = Rake::GemPackageTask.new(gem) do |p|
+ p.package_files << "y"
+ end
+ assert_equal ["x", "y"], pkg.package_files
+ assert_equal "pkgr-1.2.3.gem", pkg.gem_file
+ end
+end
diff --git a/test/rake/test_pathmap.rb b/test/rake/test_pathmap.rb
new file mode 100644
index 0000000000..257529ab87
--- /dev/null
+++ b/test/rake/test_pathmap.rb
@@ -0,0 +1,207 @@
+require 'test/unit'
+require 'rake'
+
+# ====================================================================
+class Rake::TestPathMap < Test::Unit::TestCase
+
+ def test_returns_self_with_no_args
+ assert_equal "abc.rb", "abc.rb".pathmap
+ end
+
+ def test_s_returns_file_separator
+ sep = File::ALT_SEPARATOR || File::SEPARATOR
+ assert_equal sep, "abc.rb".pathmap("%s")
+ assert_equal sep, "".pathmap("%s")
+ assert_equal "a#{sep}b", "a/b".pathmap("%d%s%f")
+ end
+
+ def test_f_returns_basename
+ assert_equal "abc.rb", "abc.rb".pathmap("%f")
+ assert_equal "abc.rb", "this/is/a/dir/abc.rb".pathmap("%f")
+ assert_equal "abc.rb", "/this/is/a/dir/abc.rb".pathmap("%f")
+ end
+
+ def test_n_returns_basename_without_extension
+ assert_equal "abc", "abc.rb".pathmap("%n")
+ assert_equal "abc", "abc".pathmap("%n")
+ assert_equal "abc", "this/is/a/dir/abc.rb".pathmap("%n")
+ assert_equal "abc", "/this/is/a/dir/abc.rb".pathmap("%n")
+ assert_equal "abc", "/this/is/a/dir/abc".pathmap("%n")
+ end
+
+ def test_d_returns_dirname
+ assert_equal ".", "abc.rb".pathmap("%d")
+ assert_equal "/", "/abc".pathmap("%d")
+ assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%d")
+ assert_equal "/this/is/a/dir", "/this/is/a/dir/abc.rb".pathmap("%d")
+ end
+
+ def test_9d_returns_partial_dirname
+ assert_equal "this/is", "this/is/a/dir/abc.rb".pathmap("%2d")
+ assert_equal "this", "this/is/a/dir/abc.rb".pathmap("%1d")
+ assert_equal ".", "this/is/a/dir/abc.rb".pathmap("%0d")
+ assert_equal "dir", "this/is/a/dir/abc.rb".pathmap("%-1d")
+ assert_equal "a/dir", "this/is/a/dir/abc.rb".pathmap("%-2d")
+ assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%100d")
+ assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%-100d")
+ end
+
+ def test_x_returns_extension
+ assert_equal "", "abc".pathmap("%x")
+ assert_equal ".rb", "abc.rb".pathmap("%x")
+ assert_equal ".rb", "abc.xyz.rb".pathmap("%x")
+ assert_equal "", ".depends".pathmap("%x")
+ assert_equal "", "dir/.depends".pathmap("%x")
+ end
+
+ def test_X_returns_everything_but_extension
+ assert_equal "abc", "abc".pathmap("%X")
+ assert_equal "abc", "abc.rb".pathmap("%X")
+ assert_equal "abc.xyz", "abc.xyz.rb".pathmap("%X")
+ assert_equal "ab.xyz", "ab.xyz.rb".pathmap("%X")
+ assert_equal "a.xyz", "a.xyz.rb".pathmap("%X")
+ assert_equal "abc", "abc.rb".pathmap("%X")
+ assert_equal "ab", "ab.rb".pathmap("%X")
+ assert_equal "a", "a.rb".pathmap("%X")
+ assert_equal ".depends", ".depends".pathmap("%X")
+ assert_equal "a/dir/.depends", "a/dir/.depends".pathmap("%X")
+ assert_equal "/.depends", "/.depends".pathmap("%X")
+ end
+
+ def test_p_returns_entire_pathname
+ assert_equal "abc.rb", "abc.rb".pathmap("%p")
+ assert_equal "this/is/a/dir/abc.rb", "this/is/a/dir/abc.rb".pathmap("%p")
+ assert_equal "/this/is/a/dir/abc.rb", "/this/is/a/dir/abc.rb".pathmap("%p")
+ end
+
+ def test_dash_returns_empty_string
+ assert_equal "", "abc.rb".pathmap("%-")
+ assert_equal "abc.rb", "abc.rb".pathmap("%X%-%x")
+ end
+
+ def test_percent_percent_returns_percent
+ assert_equal "a%b", "".pathmap("a%%b")
+ end
+
+ def test_undefined_percent_causes_error
+ ex = assert_raise(ArgumentError) {
+ "dir/abc.rb".pathmap("%z")
+ }
+ end
+
+ def test_pattern_returns_substitutions
+ assert_equal "bin/org/osb",
+ "src/org/osb/Xyz.java".pathmap("%{src,bin}d")
+ end
+
+ def test_pattern_can_use_backreferences
+ assert_equal "dir/hi/is", "dir/this/is".pathmap("%{t(hi)s,\\1}p")
+ end
+
+ def test_pattern_with_star_replacement_string_uses_block
+ assert_equal "src/ORG/osb",
+ "src/org/osb/Xyz.java".pathmap("%{/org,*}d") { |d| d.upcase }
+ assert_equal "Xyz.java",
+ "src/org/osb/Xyz.java".pathmap("%{.*,*}f") { |f| f.capitalize }
+ end
+
+ def test_pattern_with_no_replacement_nor_block_substitutes_empty_string
+ assert_equal "bc.rb", "abc.rb".pathmap("%{a}f")
+ end
+
+ def test_pattern_works_with_certain_valid_operators
+ assert_equal "dir/xbc.rb", "dir/abc.rb".pathmap("%{a,x}p")
+ assert_equal "d1r", "dir/abc.rb".pathmap("%{i,1}d")
+ assert_equal "xbc.rb", "dir/abc.rb".pathmap("%{a,x}f")
+ assert_equal ".Rb", "dir/abc.rb".pathmap("%{r,R}x")
+ assert_equal "xbc", "dir/abc.rb".pathmap("%{a,x}n")
+ end
+
+ def test_multiple_patterns
+ assert_equal "this/is/b/directory/abc.rb",
+ "this/is/a/dir/abc.rb".pathmap("%{a,b;dir,\\0ectory}p")
+ end
+
+ def test_partial_directory_selection_works_with_patterns
+ assert_equal "this/is/a/long",
+ "this/is/a/really/long/path/ok.rb".pathmap("%{/really/,/}5d")
+ end
+
+ def test_pattern_with_invalid_operator
+ ex = assert_raise(ArgumentError) do
+ "abc.xyz".pathmap("%{src,bin}z")
+ end
+ assert_match(/unknown.*pathmap.*spec.*z/i, ex.message)
+ end
+
+ def test_works_with_windows_separators
+ if File::ALT_SEPARATOR
+ assert_equal "abc", 'dir\abc.rb'.pathmap("%n")
+ assert_equal 'this\is\a\dir',
+ 'this\is\a\dir\abc.rb'.pathmap("%d")
+ end
+ end
+
+ def test_complex_patterns
+ sep = "".pathmap("%s")
+ assert_equal "dir/abc.rb", "dir/abc.rb".pathmap("%d/%n%x")
+ assert_equal "./abc.rb", "abc.rb".pathmap("%d/%n%x")
+ assert_equal "Your file extension is '.rb'",
+ "dir/abc.rb".pathmap("Your file extension is '%x'")
+ assert_equal "bin/org/onstepback/proj/A.class",
+ "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class")
+ assert_equal "src_work/bin/org/onstepback/proj/A.class",
+ "src_work/src/org/onstepback/proj/A.java".pathmap('%{\bsrc\b,bin}X.class')
+ assert_equal ".depends.bak", ".depends".pathmap("%X.bak")
+ assert_equal "d#{sep}a/b/c#{sep}file.txt", "a/b/c/d/file.txt".pathmap("%-1d%s%3d%s%f")
+ end
+end
+
+class Rake::TestPathMapExplode < Test::Unit::TestCase
+ def setup
+ String.class_eval { public :pathmap_explode }
+ end
+
+ def teardown
+ String.class_eval { protected :pathmap_explode }
+ end
+
+ def test_explode
+ assert_equal ['a'], 'a'.pathmap_explode
+ assert_equal ['a', 'b'], 'a/b'.pathmap_explode
+ assert_equal ['a', 'b', 'c'], 'a/b/c'.pathmap_explode
+ assert_equal ['/', 'a'], '/a'.pathmap_explode
+ assert_equal ['/', 'a', 'b'], '/a/b'.pathmap_explode
+ assert_equal ['/', 'a', 'b', 'c'], '/a/b/c'.pathmap_explode
+ if File::ALT_SEPARATOR
+ assert_equal ['c:.', 'a'], 'c:a'.pathmap_explode
+ assert_equal ['c:.', 'a', 'b'], 'c:a/b'.pathmap_explode
+ assert_equal ['c:.', 'a', 'b', 'c'], 'c:a/b/c'.pathmap_explode
+ assert_equal ['c:/', 'a'], 'c:/a'.pathmap_explode
+ assert_equal ['c:/', 'a', 'b'], 'c:/a/b'.pathmap_explode
+ assert_equal ['c:/', 'a', 'b', 'c'], 'c:/a/b/c'.pathmap_explode
+ end
+ end
+end
+
+class Rake::TestPathMapPartial < Test::Unit::TestCase
+ def test_pathmap_partial
+ @path = "1/2/file"
+ def @path.call(n)
+ pathmap_partial(n)
+ end
+ assert_equal("1", @path.call(1))
+ assert_equal("1/2", @path.call(2))
+ assert_equal("1/2", @path.call(3))
+ assert_equal(".", @path.call(0))
+ assert_equal("2", @path.call(-1))
+ assert_equal("1/2", @path.call(-2))
+ assert_equal("1/2", @path.call(-3))
+ end
+end
+
+class Rake::TestFileListPathMap < Test::Unit::TestCase
+ def test_file_list_supports_pathmap
+ assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n")
+ end
+end
diff --git a/test/rake/test_private_reader.rb b/test/rake/test_private_reader.rb
deleted file mode 100644
index f86d4249b2..0000000000
--- a/test/rake/test_private_reader.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/private_reader'
-
-class TestPrivateAttrs < Rake::TestCase
-
- class Sample
- include Rake::PrivateReader
-
- private_reader :reader, :a
-
- def initialize
- @reader = :RVALUE
- end
-
- def get_reader
- reader
- end
-
- end
-
- def setup
- super
- @sample = Sample.new
- end
-
- def test_private_reader_is_private
- assert_private do @sample.reader end
- assert_private do @sample.a end
- end
-
- def test_private_reader_returns_data
- assert_equal :RVALUE, @sample.get_reader
- end
-
- private
-
- def assert_private
- ex = assert_raises(NoMethodError) do yield end
- assert_match(/private/, ex.message)
- end
-
-end
diff --git a/test/rake/test_pseudo_status.rb b/test/rake/test_pseudo_status.rb
new file mode 100644
index 0000000000..8bafd5f80a
--- /dev/null
+++ b/test/rake/test_pseudo_status.rb
@@ -0,0 +1,23 @@
+require 'test/unit'
+require 'rake'
+
+require_relative 'capture_stdout'
+
+class Rake::TestPseudoStatus < Test::Unit::TestCase
+ def test_with_zero_exit_status
+ s = Rake::PseudoStatus.new
+ assert_equal 0, s.exitstatus
+ assert_equal 0, s.to_i
+ assert_equal 0, s >> 8
+ assert ! s.stopped?
+ assert s.exited?
+ end
+ def test_with_99_exit_status
+ s = Rake::PseudoStatus.new(99)
+ assert_equal 99, s.exitstatus
+ assert_equal 25344, s.to_i
+ assert_equal 99, s >> 8
+ assert ! s.stopped?
+ assert s.exited?
+ end
+end
diff --git a/test/rake/test_rake.rb b/test/rake/test_rake.rb
index b2a3928b26..52230fe148 100644
--- a/test/rake/test_rake.rb
+++ b/test/rake/test_rake.rb
@@ -1,6 +1,7 @@
-require File.expand_path('../helper', __FILE__)
+require 'test/unit'
+require 'rake'
-class TestRake < Rake::TestCase
+class Rake::TestRake < Test::Unit::TestCase
def test_each_dir_parent
assert_equal ['a'], alldirs('a')
assert_equal ['a/b', 'a'], alldirs('a/b')
@@ -26,15 +27,13 @@ class TestRake < Rake::TestCase
old_app = Rake.application
fake_app = Object.new
Rake.application = fake_app
-
assert_equal fake_app, Rake.application
-
ensure
Rake.application = old_app
end
def test_original_dir_reports_current_dir
- assert_equal @tempdir, Rake.original_dir
+ assert_equal Dir.pwd, Rake.original_dir
end
-
+
end
diff --git a/test/rake/test_rake_application.rb b/test/rake/test_rake_application.rb
deleted file mode 100644
index f2358552c8..0000000000
--- a/test/rake/test_rake_application.rb
+++ /dev/null
@@ -1,531 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeApplication < Rake::TestCase
-
- def setup
- super
-
- @app = Rake.application
- @app.options.rakelib = []
- end
-
- def test_constant_warning
- _, err = capture_io do @app.instance_eval { const_warning("Task") } end
- assert_match(/warning/i, err)
- assert_match(/deprecated/i, err)
- assert_match(/Task/i, err)
- end
-
- def test_display_tasks
- @app.options.show_tasks = :tasks
- @app.options.show_task_pattern = //
- @app.last_description = "COMMENT"
- @app.define_task(Rake::Task, "t")
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
- assert_match(/^rake t/, out)
- assert_match(/# COMMENT/, out)
- end
-
- def test_display_tasks_with_long_comments
- @app.terminal_columns = 80
- @app.options.show_tasks = :tasks
- @app.options.show_task_pattern = //
- @app.last_description = "1234567890" * 8
- @app.define_task(Rake::Task, "t")
-
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
-
- assert_match(/^rake t/, out)
- assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
- end
-
- def test_display_tasks_with_task_name_wider_than_tty_display
- @app.terminal_columns = 80
- @app.options.show_tasks = :tasks
- @app.options.show_task_pattern = //
- task_name = "task name" * 80
- @app.last_description = "something short"
- @app.define_task(Rake::Task, task_name )
-
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
-
- # Ensure the entire task name is output and we end up showing no description
- assert_match(/rake #{task_name} # .../, out)
- end
-
- def test_display_tasks_with_very_long_task_name_to_a_non_tty_shows_name_and_comment
- @app.options.show_tasks = :tasks
- @app.options.show_task_pattern = //
- @app.tty_output = false
- description = "something short"
- task_name = "task name" * 80
- @app.last_description = "something short"
- @app.define_task(Rake::Task, task_name )
-
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
-
- # Ensure the entire task name is output and we end up showing no description
- assert_match(/rake #{task_name} # #{description}/, out)
- end
-
- def test_display_tasks_with_long_comments_to_a_non_tty_shows_entire_comment
- @app.options.show_tasks = :tasks
- @app.options.show_task_pattern = //
- @app.tty_output = false
- @app.last_description = "1234567890" * 8
- @app.define_task(Rake::Task, "t")
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
- assert_match(/^rake t/, out)
- assert_match(/# #{@app.last_description}/, out)
- end
-
- def test_display_tasks_with_long_comments_to_a_non_tty_with_columns_set_truncates_comments
- @app.terminal_columns = 80
- @app.options.show_tasks = :tasks
- @app.options.show_task_pattern = //
- @app.tty_output = false
- @app.last_description = "1234567890" * 8
- @app.define_task(Rake::Task, "t")
-
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
-
- assert_match(/^rake t/, out)
- assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
- end
-
- def test_describe_tasks
- @app.options.show_tasks = :describe
- @app.options.show_task_pattern = //
- @app.last_description = "COMMENT"
- @app.define_task(Rake::Task, "t")
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
- assert_match(/^rake t$/, out)
- assert_match(/^ {4}COMMENT$/, out)
- end
-
- def test_show_lines
- @app.options.show_tasks = :lines
- @app.options.show_task_pattern = //
- @app.last_description = "COMMENT"
- @app.define_task(Rake::Task, "t")
- @app['t'].locations << "HERE:1"
- out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
- assert_match(/^rake t +[^:]+:\d+ *$/, out)
- end
-
- def test_finding_rakefile
- rakefile_default
-
- assert_match(/Rakefile/i, @app.instance_eval { have_rakefile })
- end
-
- def test_not_finding_rakefile
- @app.instance_eval { @rakefiles = ['NEVER_FOUND'] }
- assert( ! @app.instance_eval do have_rakefile end )
- assert_nil @app.rakefile
- end
-
- def test_load_rakefile
- rakefile_unittest
-
- @app.instance_eval do
- handle_options
- options.silent = true
- load_rakefile
- end
-
- assert_equal "rakefile", @app.rakefile.downcase
- assert_equal @tempdir, Dir.pwd
- end
-
- def test_load_rakefile_doesnt_print_rakefile_directory_from_same_dir
- rakefile_unittest
-
- _, err = capture_io do
- @app.instance_eval do
- # pretend we started from the unittest dir
- @original_dir = File.expand_path(".")
- raw_load_rakefile
- end
- end
-
- assert_empty err
- end
-
- def test_load_rakefile_from_subdir
- rakefile_unittest
- Dir.chdir 'subdir'
-
- @app.instance_eval do
- handle_options
- options.silent = true
- load_rakefile
- end
-
- assert_equal "rakefile", @app.rakefile.downcase
- assert_equal @tempdir, Dir.pwd
- end
-
- def test_load_rakefile_prints_rakefile_directory_from_subdir
- rakefile_unittest
- Dir.chdir 'subdir'
-
- app = Rake::Application.new
- app.options.rakelib = []
-
- _, err = capture_io do
- app.instance_eval do
- raw_load_rakefile
- end
- end
-
- assert_equal "(in #{@tempdir}\)\n", err
- end
-
- def test_load_rakefile_doesnt_print_rakefile_directory_from_subdir_if_silent
- rakefile_unittest
- Dir.chdir 'subdir'
-
- _, err = capture_io do
- @app.instance_eval do
- handle_options
- options.silent = true
- raw_load_rakefile
- end
- end
-
- assert_empty err
- end
-
- def test_load_rakefile_not_found
- Dir.chdir @tempdir
- ENV['RAKE_SYSTEM'] = 'not_exist'
-
- @app.instance_eval do
- handle_options
- options.silent = true
- end
-
- ex = assert_raises(RuntimeError) do
- @app.instance_eval do raw_load_rakefile end
- end
-
- assert_match(/no rakefile found/i, ex.message)
- end
-
- def test_load_from_system_rakefile
- rake_system_dir
-
- @app.instance_eval do
- handle_options
- options.silent = true
- options.load_system = true
- options.rakelib = []
- load_rakefile
- end
-
- assert_equal @system_dir, @app.system_dir
- assert_nil @app.rakefile
- rescue SystemExit
- flunk 'failed to load rakefile'
- end
-
- def test_load_from_calculated_system_rakefile
- rakefile_default
- def @app.standard_system_dir
- "__STD_SYS_DIR__"
- end
-
- ENV['RAKE_SYSTEM'] = nil
-
- @app.instance_eval do
- handle_options
- options.silent = true
- options.load_system = true
- options.rakelib = []
- load_rakefile
- end
-
- assert_equal "__STD_SYS_DIR__", @app.system_dir
- rescue SystemExit
- flunk 'failed to find system rakefile'
- end
-
- def test_terminal_columns
- old_RAKE_COLUMNS = ENV['RAKE_COLUMNS']
-
- ENV['RAKE_COLUMNS'] = '42'
-
- app = Rake::Application.new
-
- assert_equal 42, app.terminal_columns
- ensure
- if old_RAKE_COLUMNS then
- ENV['RAKE_COLUMNS'].delete
- else
- ENV['RAKE_COLUMNS'] = old_RAKE_COLUMNS
- end
- end
-
- def test_windows
- assert ! (@app.windows? && @app.unix?)
- end
-
- def test_loading_imports
- loader = util_loader
-
- @app.instance_eval do
- add_loader("dummy", loader)
- add_import("x.dummy")
- load_imports
- end
-
- # HACK no assertions
- end
-
- def test_building_imported_files_on_demand
- loader = util_loader
-
- @app.instance_eval do
- intern(Rake::Task, "x.dummy").enhance do loader.make_dummy end
- add_loader("dummy", loader)
- add_import("x.dummy")
- load_imports
- end
-
- # HACK no assertions
- end
-
- def test_handle_options_should_strip_options_from_ARGV
- assert !@app.options.trace
-
- valid_option = '--trace'
- ARGV.clear
- ARGV << valid_option
-
- @app.handle_options
-
- assert !ARGV.include?(valid_option)
- assert @app.options.trace
- end
-
- def test_handle_options_trace_default_is_stderr
- ARGV.clear
- ARGV << "--trace"
-
- @app.handle_options
-
- assert_equal STDERR, @app.options.trace_output
- assert @app.options.trace
- end
-
- def test_handle_options_trace_overrides_to_stdout
- ARGV.clear
- ARGV << "--trace=stdout"
-
- @app.handle_options
-
- assert_equal STDOUT, @app.options.trace_output
- assert @app.options.trace
- end
-
- def test_handle_options_trace_does_not_eat_following_task_names
- assert !@app.options.trace
-
- ARGV.clear
- ARGV << "--trace" << "sometask"
-
- @app.handle_options
- assert ARGV.include?("sometask")
- assert @app.options.trace
- end
-
- def test_good_run
- ran = false
-
- ARGV << '--rakelib=""'
-
- @app.options.silent = true
-
- @app.instance_eval do
- intern(Rake::Task, "default").enhance { ran = true }
- end
-
- rakefile_default
-
- out, err = capture_io do
- @app.run
- end
-
- assert ran
- assert_empty err
- assert_equal "DEFAULT\n", out
- end
-
- def test_display_task_run
- ran = false
- ARGV.clear
- ARGV << '-f' << '-s' << '--tasks' << '--rakelib=""'
- @app.last_description = "COMMENT"
- @app.define_task(Rake::Task, "default")
- out, = capture_io { @app.run }
- assert @app.options.show_tasks
- assert ! ran
- assert_match(/rake default/, out)
- assert_match(/# COMMENT/, out)
- end
-
- def test_display_prereqs
- ran = false
- ARGV.clear
- ARGV << '-f' << '-s' << '--prereqs' << '--rakelib=""'
- @app.last_description = "COMMENT"
- t = @app.define_task(Rake::Task, "default")
- t.enhance([:a, :b])
- @app.define_task(Rake::Task, "a")
- @app.define_task(Rake::Task, "b")
- out, = capture_io { @app.run }
- assert @app.options.show_prereqs
- assert ! ran
- assert_match(/rake a$/, out)
- assert_match(/rake b$/, out)
- assert_match(/rake default\n( *(a|b)\n){2}/m, out)
- end
-
- def test_bad_run
- @app.intern(Rake::Task, "default").enhance { fail }
- ARGV.clear
- ARGV << '-f' << '-s' << '--rakelib=""'
- assert_raises(SystemExit) {
- _, err = capture_io { @app.run }
- assert_match(/see full trace/, err)
- }
- ensure
- ARGV.clear
- end
-
- def test_bad_run_with_trace
- @app.intern(Rake::Task, "default").enhance { fail }
- ARGV.clear
- ARGV << '-f' << '-s' << '-t'
- assert_raises(SystemExit) {
- _, err = capture_io { @app.run }
- refute_match(/see full trace/, err)
- }
- ensure
- ARGV.clear
- end
-
- def test_bad_run_with_backtrace
- @app.intern(Rake::Task, "default").enhance { fail }
- ARGV.clear
- ARGV << '-f' << '-s' << '--backtrace'
- assert_raises(SystemExit) {
- _, err = capture_io { @app.run }
- refute_match(/see full trace/, err)
- }
- ensure
- ARGV.clear
- end
-
- def test_run_with_bad_options
- @app.intern(Rake::Task, "default").enhance { fail }
- ARGV.clear
- ARGV << '-f' << '-s' << '--xyzzy'
- assert_raises(SystemExit) {
- capture_io { @app.run }
- }
- ensure
- ARGV.clear
- end
-
- def test_deprecation_message
- _, err = capture_io do
- @app.deprecate("a", "b", "c")
- end
- assert_match(/'a' is deprecated/i, err)
- assert_match(/use 'b' instead/i, err)
- assert_match(/at c$/i, err)
- end
-
- def test_standard_exception_handling_invalid_option
- out, err = capture_io do
- e = assert_raises SystemExit do
- @app.standard_exception_handling do
- raise OptionParser::InvalidOption, 'blah'
- end
- end
-
- assert_equal 1, e.status
- end
-
- assert_empty out
- assert_equal "invalid option: blah\n", err
- end
-
- def test_standard_exception_handling_other
- out, err = capture_io do
- e = assert_raises SystemExit do
- @app.standard_exception_handling do
- raise 'blah'
- end
- end
-
- assert_equal 1, e.status
- end
-
- assert_empty out
- assert_match "rake aborted!\n", err
- assert_match "blah\n", err
- end
-
- def test_standard_exception_handling_system_exit
- out, err = capture_io do
- e = assert_raises SystemExit do
- @app.standard_exception_handling do
- exit 0
- end
- end
-
- assert_equal 0, e.status
- end
-
- assert_empty out
- assert_empty err
- end
-
- def test_standard_exception_handling_system_exit_nonzero
- out, err = capture_io do
- e = assert_raises SystemExit do
- @app.standard_exception_handling do
- exit 5
- end
- end
-
- assert_equal 5, e.status
- end
-
- assert_empty out
- assert_empty err
- end
-
- def util_loader
- loader = Object.new
-
- loader.instance_variable_set :@load_called, false
- def loader.load arg
- raise 'called more than once' if @load_called
- raise ArgumentError, arg unless arg == 'x.dummy'
- @load_called = true
- end
-
- loader.instance_variable_set :@make_dummy_called, false
- def loader.make_dummy
- raise 'called more than once' if @make_dummy_called
- @make_dummy_called = true
- end
-
- loader
- end
-
-end
diff --git a/test/rake/test_rake_application_options.rb b/test/rake/test_rake_application_options.rb
deleted file mode 100644
index 6a8aba652b..0000000000
--- a/test/rake/test_rake_application_options.rb
+++ /dev/null
@@ -1,460 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-TESTING_REQUIRE = [ ]
-
-class TestRakeApplicationOptions < Rake::TestCase
-
- def setup
- super
-
- clear_argv
- Rake::FileUtilsExt.verbose_flag = false
- Rake::FileUtilsExt.nowrite_flag = false
- TESTING_REQUIRE.clear
- end
-
- def teardown
- clear_argv
- Rake::FileUtilsExt.verbose_flag = false
- Rake::FileUtilsExt.nowrite_flag = false
-
- super
- end
-
- def clear_argv
- while ! ARGV.empty?
- ARGV.pop
- end
- end
-
- def test_default_options
- opts = command_line
- assert_nil opts.backtrace
- assert_nil opts.classic_namespace
- assert_nil opts.dryrun
- assert_nil opts.ignore_system
- assert_nil opts.load_system
- assert_nil opts.always_multitask
- assert_nil opts.nosearch
- assert_equal ['rakelib'], opts.rakelib
- assert_nil opts.show_prereqs
- assert_nil opts.show_task_pattern
- assert_nil opts.show_tasks
- assert_nil opts.silent
- assert_nil opts.trace
- assert_nil opts.thread_pool_size
- assert_equal ['rakelib'], opts.rakelib
- assert ! Rake::FileUtilsExt.verbose_flag
- assert ! Rake::FileUtilsExt.nowrite_flag
- end
-
- def test_dry_run
- flags('--dry-run', '-n') do |opts|
- assert opts.dryrun
- assert opts.trace
- assert Rake::FileUtilsExt.verbose_flag
- assert Rake::FileUtilsExt.nowrite_flag
- end
- end
-
- def test_describe
- flags('--describe') do |opts|
- assert_equal :describe, opts.show_tasks
- assert_equal(//.to_s, opts.show_task_pattern.to_s)
- end
- end
-
- def test_describe_with_pattern
- flags('--describe=X') do |opts|
- assert_equal :describe, opts.show_tasks
- assert_equal(/X/.to_s, opts.show_task_pattern.to_s)
- end
- end
-
- def test_execute
- $xyzzy = 0
- flags('--execute=$xyzzy=1', '-e $xyzzy=1') do |opts|
- assert_equal 1, $xyzzy
- assert_equal :exit, @exit
- $xyzzy = 0
- end
- end
-
- def test_execute_and_continue
- $xyzzy = 0
- flags('--execute-continue=$xyzzy=1', '-E $xyzzy=1') do |opts|
- assert_equal 1, $xyzzy
- refute_equal :exit, @exit
- $xyzzy = 0
- end
- end
-
- def test_execute_and_print
- $xyzzy = 0
- out, = capture_io do
- flags('--execute-print=$xyzzy="pugh"', '-p $xyzzy="pugh"') do |opts|
- assert_equal 'pugh', $xyzzy
- assert_equal :exit, @exit
- $xyzzy = 0
- end
- end
-
- assert_match(/^pugh$/, out)
- end
-
- def test_help
- out, = capture_io do
- flags '--help', '-H', '-h'
- end
-
- assert_match(/\Arake/, out)
- assert_match(/\boptions\b/, out)
- assert_match(/\btargets\b/, out)
- assert_equal :exit, @exit
- end
-
- def test_jobs
- flags(['--jobs', '4'], ['-j', '4']) do |opts|
- assert_equal 4, opts.thread_pool_size
- end
- flags(['--jobs', 'asdas'], ['-j', 'asdas']) do |opts|
- assert_equal 2, opts.thread_pool_size
- end
- flags('--jobs', '-j') do |opts|
- assert_equal 2, opts.thread_pool_size
- end
- end
-
- def test_libdir
- flags(['--libdir', 'xx'], ['-I', 'xx'], ['-Ixx']) do |opts|
- $:.include?('xx')
- end
- ensure
- $:.delete('xx')
- end
-
- def test_multitask
- flags('--multitask', '-m') do |opts|
- assert_equal opts.always_multitask, true
- end
- end
-
- def test_rakefile
- flags(['--rakefile', 'RF'], ['--rakefile=RF'], ['-f', 'RF'], ['-fRF']) do |opts|
- assert_equal ['RF'], @app.instance_eval { @rakefiles }
- end
- end
-
- def test_rakelib
- dirs = %w(A B C).join(File::PATH_SEPARATOR)
- flags(['--rakelibdir', dirs], ["--rakelibdir=#{dirs}"], ['-R', dirs], ["-R#{dirs}"]) do |opts|
- assert_equal ['A', 'B', 'C'], opts.rakelib
- end
- end
-
- def test_require
- $LOAD_PATH.unshift @tempdir
-
- open 'reqfile.rb', 'w' do |io| io << 'TESTING_REQUIRE << 1' end
- open 'reqfile2.rb', 'w' do |io| io << 'TESTING_REQUIRE << 2' end
- open 'reqfile3.rake', 'w' do |io| io << 'TESTING_REQUIRE << 3' end
-
- flags(['--require', 'reqfile'], '-rreqfile2', '-rreqfile3')
-
- assert_includes TESTING_REQUIRE, 1
- assert_includes TESTING_REQUIRE, 2
- assert_includes TESTING_REQUIRE, 3
-
- assert_equal 3, TESTING_REQUIRE.size
- ensure
- $LOAD_PATH.delete @tempdir
- end
-
- def test_missing_require
- ex = assert_raises(LoadError) do
- flags(['--require', 'test/missing']) do |opts|
- end
- end
- assert_match(/such file/, ex.message)
- assert_match(/test\/missing/, ex.message)
- end
-
- def test_prereqs
- flags('--prereqs', '-P') do |opts|
- assert opts.show_prereqs
- end
- end
-
- def test_quiet
- flags('--quiet', '-q') do |opts|
- assert ! Rake::FileUtilsExt.verbose_flag
- assert ! opts.silent
- end
- end
-
- def test_no_search
- flags('--nosearch', '--no-search', '-N') do |opts|
- assert opts.nosearch
- end
- end
-
- def test_silent
- flags('--silent', '-s') do |opts|
- assert ! Rake::FileUtilsExt.verbose_flag
- assert opts.silent
- end
- end
-
- def test_system
- flags('--system', '-g') do |opts|
- assert opts.load_system
- end
- end
-
- def test_no_system
- flags('--no-system', '-G') do |opts|
- assert opts.ignore_system
- end
- end
-
- def test_trace
- flags('--trace', '-t') do |opts|
- assert opts.trace, "should enable trace option"
- assert opts.backtrace, "should enabled backtrace option"
- assert_equal $stderr, opts.trace_output
- assert Rake::FileUtilsExt.verbose_flag
- assert ! Rake::FileUtilsExt.nowrite_flag
- end
- end
-
- def test_trace_with_stdout
- flags('--trace=stdout', '-tstdout') do |opts|
- assert opts.trace, "should enable trace option"
- assert opts.backtrace, "should enabled backtrace option"
- assert_equal $stdout, opts.trace_output
- assert Rake::FileUtilsExt.verbose_flag
- assert ! Rake::FileUtilsExt.nowrite_flag
- end
- end
-
- def test_trace_with_stderr
- flags('--trace=stderr', '-tstderr') do |opts|
- assert opts.trace, "should enable trace option"
- assert opts.backtrace, "should enabled backtrace option"
- assert_equal $stderr, opts.trace_output
- assert Rake::FileUtilsExt.verbose_flag
- assert ! Rake::FileUtilsExt.nowrite_flag
- end
- end
-
- def test_trace_with_error
- ex = assert_raises(Rake::CommandLineOptionError) do
- flags('--trace=xyzzy') do |opts| end
- end
- assert_match(/un(known|recognized).*\btrace\b.*xyzzy/i, ex.message)
- end
-
- def test_trace_with_following_task_name
- flags(['--trace', 'taskname'], ['-t', 'taskname']) do |opts|
- assert opts.trace, "should enable trace option"
- assert opts.backtrace, "should enabled backtrace option"
- assert_equal $stderr, opts.trace_output
- assert Rake::FileUtilsExt.verbose_flag
- assert_equal ['taskname'], @app.top_level_tasks
- end
- end
-
- def test_backtrace
- flags('--backtrace') do |opts|
- assert opts.backtrace, "should enable backtrace option"
- assert_equal $stderr, opts.trace_output
- assert ! opts.trace, "should not enable trace option"
- end
- end
-
- def test_backtrace_with_stdout
- flags('--backtrace=stdout') do |opts|
- assert opts.backtrace, "should enable backtrace option"
- assert_equal $stdout, opts.trace_output
- assert ! opts.trace, "should not enable trace option"
- end
- end
-
- def test_backtrace_with_stderr
- flags('--backtrace=stderr') do |opts|
- assert opts.backtrace, "should enable backtrace option"
- assert_equal $stderr, opts.trace_output
- assert ! opts.trace, "should not enable trace option"
- end
- end
-
- def test_backtrace_with_error
- ex = assert_raises(Rake::CommandLineOptionError) do
- flags('--backtrace=xyzzy') do |opts| end
- end
- assert_match(/un(known|recognized).*\bbacktrace\b.*xyzzy/i, ex.message)
- end
-
- def test_backtrace_with_following_task_name
- flags(['--backtrace', 'taskname']) do |opts|
- assert ! opts.trace, "should enable trace option"
- assert opts.backtrace, "should enabled backtrace option"
- assert_equal $stderr, opts.trace_output
- assert_equal ['taskname'], @app.top_level_tasks
- end
- end
-
- def test_trace_rules
- flags('--rules') do |opts|
- assert opts.trace_rules
- end
- end
-
- def test_tasks
- flags('--tasks', '-T') do |opts|
- assert_equal :tasks, opts.show_tasks
- assert_equal(//.to_s, opts.show_task_pattern.to_s)
- assert_equal nil, opts.show_all_tasks
- end
- flags(['--tasks', 'xyz'], ['-Txyz']) do |opts|
- assert_equal :tasks, opts.show_tasks
- assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
- assert_equal nil, opts.show_all_tasks
- end
- flags(['--tasks', 'xyz', '--comments']) do |opts|
- assert_equal :tasks, opts.show_tasks
- assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
- assert_equal false, opts.show_all_tasks
- end
- end
-
- def test_where
- flags('--where', '-W') do |opts|
- assert_equal :lines, opts.show_tasks
- assert_equal(//.to_s, opts.show_task_pattern.to_s)
- assert_equal true, opts.show_all_tasks
- end
- flags(['--where', 'xyz'], ['-Wxyz']) do |opts|
- assert_equal :lines, opts.show_tasks
- assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
- assert_equal true, opts.show_all_tasks
- end
- flags(['--where', 'xyz', '--comments'], ['-Wxyz', '--comments']) do |opts|
- assert_equal :lines, opts.show_tasks
- assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
- assert_equal false, opts.show_all_tasks
- end
- end
-
- def test_no_deprecated_messages
- flags('--no-deprecation-warnings', '-X') do |opts|
- assert opts.ignore_deprecate
- end
- end
-
- def test_verbose
- out, = capture_io do
- flags('--verbose', '-V') do |opts|
- assert Rake::FileUtilsExt.verbose_flag
- assert ! opts.silent
- end
- end
-
- assert_equal "rake, version #{Rake::VERSION}\n", out
- end
-
- def test_version
- out, = capture_io do
- flags '--version', '-V'
- end
-
- assert_match(/\bversion\b/, out)
- assert_match(/\b#{RAKEVERSION}\b/, out)
- assert_equal :exit, @exit
- end
-
- def test_classic_namespace
- _, err = capture_io do
- flags(['--classic-namespace'],
- ['-C', '-T', '-P', '-n', '-s', '-t']) do |opts|
- assert opts.classic_namespace
- assert_equal opts.show_tasks, $show_tasks
- assert_equal opts.show_prereqs, $show_prereqs
- assert_equal opts.trace, $trace
- assert_equal opts.dryrun, $dryrun
- assert_equal opts.silent, $silent
- end
- end
-
- assert_match(/deprecated/, err)
- end
-
- def test_bad_option
- _, err = capture_io do
- ex = assert_raises(OptionParser::InvalidOption) do
- flags('--bad-option')
- end
-
- if ex.message =~ /^While/ # Ruby 1.9 error message
- assert_match(/while parsing/i, ex.message)
- else # Ruby 1.8 error message
- assert_match(/(invalid|unrecognized) option/i, ex.message)
- assert_match(/--bad-option/, ex.message)
- end
- end
-
- assert_equal '', err
- end
-
- def test_task_collection
- command_line("a", "b")
- assert_equal ["a", "b"], @tasks.sort
- end
-
- def test_default_task_collection
- command_line()
- assert_equal ["default"], @tasks
- end
-
- def test_environment_definition
- ENV.delete('TESTKEY')
- command_line("a", "TESTKEY=12")
- assert_equal ["a"], @tasks.sort
- assert '12', ENV['TESTKEY']
- end
-
- def test_rake_explicit_task_library
- Rake.add_rakelib 'app/task', 'other'
-
- libs = Rake.application.options.rakelib
-
- assert libs.include?("app/task")
- assert libs.include?("other")
- end
-
- private
-
- def flags(*sets)
- sets.each do |set|
- ARGV.clear
-
- @exit = catch(:system_exit) { command_line(*set) }
-
- yield(@app.options) if block_given?
- end
- end
-
- def command_line(*options)
- options.each do |opt| ARGV << opt end
- @app = Rake::Application.new
- def @app.exit(*args)
- throw :system_exit, :exit
- end
- @app.instance_eval do
- handle_options
- collect_tasks
- end
- @tasks = @app.top_level_tasks
- @app.options
- end
-end
diff --git a/test/rake/test_rake_backtrace.rb b/test/rake/test_rake_backtrace.rb
deleted file mode 100644
index cfd58f2aac..0000000000
--- a/test/rake/test_rake_backtrace.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'open3'
-
-class TestRakeBacktrace < Rake::TestCase
-
- def setup
- super
-
- skip 'tmpdir is suppressed in backtrace' if
- Dir.pwd =~ Rake::Backtrace::SUPPRESS_PATTERN
- end
-
- # TODO: factor out similar code in test_rake_functional.rb
- def rake(*args)
- Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, _, err, _|
- err.read
- }
- end
-
- def invoke(task_name)
- rake task_name.to_s
- end
-
- def test_single_collapse
- rakefile %q{
- task :foo do
- raise "foooo!"
- end
- }
-
- lines = invoke(:foo).split("\n")
-
- assert_equal "rake aborted!", lines[0]
- assert_equal "foooo!", lines[1]
- assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!i, lines
- assert_something_matches %r!\ATasks:!, lines
- end
-
- def test_multi_collapse
- rakefile %q{
- task :foo do
- Rake.application.invoke_task(:bar)
- end
- task :bar do
- raise "barrr!"
- end
- }
-
- lines = invoke(:foo).split("\n")
-
- assert_equal "rake aborted!", lines[0]
- assert_equal "barrr!", lines[1]
- assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:6!i, lines
- assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!i, lines
- assert_something_matches %r!\ATasks:!, lines
- end
-
- def test_suppress_option
- rakefile %q{
- task :baz do
- raise "bazzz!"
- end
- }
-
- lines = rake("baz").split("\n")
- assert_equal "rake aborted!", lines[0]
- assert_equal "bazzz!", lines[1]
- assert_something_matches %r!Rakefile!i, lines
-
- lines = rake("--suppress-backtrace", ".ak.file", "baz").split("\n")
- assert_equal "rake aborted!", lines[0]
- assert_equal "bazzz!", lines[1]
- refute_match %r!Rakefile!i, lines[2]
- end
-
- private
-
- # Assert that the pattern matches at least one line in +lines+.
- def assert_something_matches(pattern, lines)
- lines.each do |ln|
- if pattern =~ ln
- assert_match pattern, ln
- return
- end
- end
- flunk "expected #{pattern.inspect} to match something in:\n #{lines.join("\n ")}"
- end
-
-end
diff --git a/test/rake/test_rake_clean.rb b/test/rake/test_rake_clean.rb
deleted file mode 100644
index 1541c69359..0000000000
--- a/test/rake/test_rake_clean.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/clean'
-
-class TestRakeClean < Rake::TestCase
- include Rake
- def test_clean
- load 'rake/clean.rb', true
-
- assert Task['clean'], "Should define clean"
- assert Task['clobber'], "Should define clobber"
- assert Task['clobber'].prerequisites.include?("clean"),
- "Clobber should require clean"
- end
-end
diff --git a/test/rake/test_rake_definitions.rb b/test/rake/test_rake_definitions.rb
deleted file mode 100644
index 839c40419e..0000000000
--- a/test/rake/test_rake_definitions.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-
-class TestRakeDefinitions < Rake::TestCase
- include Rake
-
- EXISTINGFILE = "existing"
-
- def setup
- super
-
- Task.clear
- end
-
- def test_task
- done = false
- task :one => [:two] do done = true end
- task :two
- task :three => [:one, :two]
- check_tasks(:one, :two, :three)
- assert done, "Should be done"
- end
-
- def test_file_task
- done = false
- file "one" => "two" do done = true end
- file "two"
- file "three" => ["one", "two"]
- check_tasks("one", "two", "three")
- assert done, "Should be done"
- end
-
- def check_tasks(n1, n2, n3)
- t = Task[n1]
- assert Task === t, "Should be a Task"
- assert_equal n1.to_s, t.name
- assert_equal [n2.to_s], t.prerequisites.collect{|n| n.to_s}
- t.invoke
- t2 = Task[n2]
- assert_equal FileList[], t2.prerequisites
- t3 = Task[n3]
- assert_equal [n1.to_s, n2.to_s], t3.prerequisites.collect{|n|n.to_s}
- end
-
- def test_incremental_definitions
- runs = []
- task :t1 => [:t2] do runs << "A"; 4321 end
- task :t1 => [:t3] do runs << "B"; 1234 end
- task :t1 => [:t3]
- task :t2
- task :t3
- Task[:t1].invoke
- assert_equal ["A", "B"], runs
- assert_equal ["t2", "t3"], Task[:t1].prerequisites
- end
-
- def test_missing_dependencies
- task :x => ["missing"]
- assert_raises(RuntimeError) { Task[:x].invoke }
- end
-
- def test_implicit_file_dependencies
- runs = []
- create_existing_file
- task :y => [EXISTINGFILE] do |t| runs << t.name end
- Task[:y].invoke
- assert_equal runs, ['y']
- end
-
- private # ----------------------------------------------------------
-
- def create_existing_file
- Dir.mkdir File.dirname(EXISTINGFILE) unless
- File.exist?(File.dirname(EXISTINGFILE))
- open(EXISTINGFILE, "w") do |f| f.puts "HI" end unless
- File.exist?(EXISTINGFILE)
- end
-
-end
-
diff --git a/test/rake/test_rake_directory_task.rb b/test/rake/test_rake_directory_task.rb
deleted file mode 100644
index 8ae7537b50..0000000000
--- a/test/rake/test_rake_directory_task.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-
-class TestRakeDirectoryTask < Rake::TestCase
- include Rake
-
- def test_directory
- desc "DESC"
-
- directory "a/b/c"
-
- assert_equal FileCreationTask, Task["a"].class
- assert_equal FileCreationTask, Task["a/b"].class
- assert_equal FileCreationTask, Task["a/b/c"].class
-
- assert_nil Task["a"].comment
- assert_nil Task["a/b"].comment
- assert_equal "DESC", Task["a/b/c"].comment
-
- verbose(false) {
- Task['a/b'].invoke
- }
-
- assert File.exist?("a/b")
- refute File.exist?("a/b/c")
- end
-
- if Rake::Win32.windows?
- def test_directory_win32
- desc "WIN32 DESC"
- directory 'c:/a/b/c'
- assert_equal FileTask, Task['c:'].class
- assert_equal FileCreationTask, Task['c:/a'].class
- assert_equal FileCreationTask, Task['c:/a/b'].class
- assert_equal FileCreationTask, Task['c:/a/b/c'].class
- assert_nil Task['c:/'].comment
- assert_equal "WIN32 DESC", Task['c:/a/b/c'].comment
- assert_nil Task['c:/a/b'].comment
- end
- end
-
- def test_can_use_blocks
- runlist = []
-
- t1 = directory("a/b/c" => :t2) { |t| runlist << t.name }
- task(:t2) { |t| runlist << t.name }
-
- verbose(false) {
- t1.invoke
- }
-
- assert_equal Task["a/b/c"], t1
- assert_equal FileCreationTask, Task["a/b/c"].class
- assert_equal ["t2", "a/b/c"], runlist
- assert File.directory?("a/b/c")
- end
-end
diff --git a/test/rake/test_rake_dsl.rb b/test/rake/test_rake_dsl.rb
deleted file mode 100644
index de83b89ab4..0000000000
--- a/test/rake/test_rake_dsl.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeDsl < Rake::TestCase
-
- def setup
- super
- Rake::Task.clear
- end
-
- def test_namespace_command
- namespace "n" do
- task "t"
- end
- refute_nil Rake::Task["n:t"]
- end
-
- def test_namespace_command_with_bad_name
- ex = assert_raises(ArgumentError) do
- namespace 1 do end
- end
- assert_match(/string/i, ex.message)
- assert_match(/symbol/i, ex.message)
- end
-
- def test_namespace_command_with_a_string_like_object
- name = Object.new
- def name.to_str
- "bob"
- end
- namespace name do
- task "t"
- end
- refute_nil Rake::Task["bob:t"]
- end
-
- class Foo
- def initialize
- task :foo_deprecated_a => "foo_deprecated_b" do
- print "a"
- end
- file "foo_deprecated_b" do
- print "b"
- end
- end
- end
-
- def test_deprecated_object_dsl
- out, err = capture_io do
- Foo.new
- Rake.application.invoke_task :foo_deprecated_a
- end
- assert_equal("ba", out)
- assert_match(/deprecated/, err)
- assert_match(/Foo\#task/, err)
- assert_match(/Foo\#file/, err)
- assert_match(/test_rake_dsl\.rb:\d+/, err)
- end
-
- def test_no_commands_constant
- assert ! defined?(Commands), "should not define Commands"
- end
-
- def test_deprecated_object_dsl_with_suppressed_warnings
- Rake.application.options.ignore_deprecate = true
- out, err = capture_io do
- Foo.new
- Rake.application.invoke_task :foo_deprecated_a
- end
- assert_equal("ba", out)
- refute_match(/deprecated/, err)
- refute_match(/Foo\#task/, err)
- refute_match(/Foo\#file/, err)
- refute_match(/test_rake_dsl\.rb:\d+/, err)
- ensure
- Rake.application.options.ignore_deprecate = false
- end
-end
diff --git a/test/rake/test_rake_early_time.rb b/test/rake/test_rake_early_time.rb
deleted file mode 100644
index 18c4dad324..0000000000
--- a/test/rake/test_rake_early_time.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeEarlyTime < Rake::TestCase
- def test_create
- early = Rake::EarlyTime.instance
- assert early <= Time.now
- assert early < Time.now
- assert early != Time.now
- assert Time.now > early
- assert Time.now >= early
- assert Time.now != early
- end
-
- def test_equality
- early = Rake::EarlyTime.instance
- assert_equal early, early, "two early times should be equal"
- end
-
- def test_original_time_compare_is_not_messed_up
- t1 = Time.mktime(1970, 1, 1, 0, 0, 0)
- t2 = Time.now
- assert t1 < t2
- assert t2 > t1
- assert t1 == t1
- assert t2 == t2
- end
-
- def test_to_s
- assert_equal "<EARLY TIME>", Rake::EARLY.to_s
- end
-end
diff --git a/test/rake/test_rake_extension.rb b/test/rake/test_rake_extension.rb
deleted file mode 100644
index 18d55f19f9..0000000000
--- a/test/rake/test_rake_extension.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'stringio'
-
-class TestRakeExtension < Rake::TestCase
-
- module Redirect
- def error_redirect
- old_err = $stderr
- result = StringIO.new
- $stderr = result
- yield
- result
- ensure
- $stderr = old_err
- end
- end
-
- class Sample
- extend Redirect
-
- def duplicate_method
- :original
- end
-
- OK_ERRS = error_redirect do
- rake_extension("a") do
- def ok_method
- end
- end
- end
-
-
- DUP_ERRS = error_redirect do
- rake_extension("duplicate_method") do
- def duplicate_method
- :override
- end
- end
- end
- end
-
- def test_methods_actually_exist
- sample = Sample.new
- sample.ok_method
- sample.duplicate_method
- end
-
- def test_no_warning_when_defining_ok_method
- assert_equal "", Sample::OK_ERRS.string
- end
-
- def test_extension_complains_when_a_method_that_is_present
- assert_match(/warning:/i, Sample::DUP_ERRS.string)
- assert_match(/already exists/i, Sample::DUP_ERRS.string)
- assert_match(/duplicate_method/i, Sample::DUP_ERRS.string)
- assert_equal :original, Sample.new.duplicate_method
- end
-
-end
diff --git a/test/rake/test_rake_file_creation_task.rb b/test/rake/test_rake_file_creation_task.rb
deleted file mode 100644
index d486d2f0d4..0000000000
--- a/test/rake/test_rake_file_creation_task.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-
-######################################################################
-class TestRakeFileCreationTask < Rake::TestCase
- include Rake
- include Rake::DSL
-
- DUMMY_DIR = 'dummy_dir'
-
- def setup
- super
-
- Task.clear
- end
-
- def test_file_needed
- create_dir DUMMY_DIR
- fc_task = Task[DUMMY_DIR]
- assert_equal DUMMY_DIR, fc_task.name
- FileUtils.rm_rf fc_task.name
- assert fc_task.needed?, "file should be needed"
- FileUtils.mkdir fc_task.name
- assert_equal nil, fc_task.prerequisites.collect{|n| Task[n].timestamp}.max
- assert ! fc_task.needed?, "file should not be needed"
- end
-
- def test_directory
- directory DUMMY_DIR
- fc_task = Task[DUMMY_DIR]
- assert_equal DUMMY_DIR, fc_task.name
- assert FileCreationTask === fc_task
- end
-
- def test_no_retriggers_on_filecreate_task
- create_timed_files(OLDFILE, NEWFILE)
- t1 = Rake.application.intern(FileCreationTask, OLDFILE).enhance([NEWFILE])
- t2 = Rake.application.intern(FileCreationTask, NEWFILE)
- assert ! t2.needed?, "Should not need to build new file"
- assert ! t1.needed?, "Should not need to rebuild old file because of new"
- end
-
- def test_no_retriggers_on_file_task
- create_timed_files(OLDFILE, NEWFILE)
- t1 = Rake.application.intern(FileCreationTask, OLDFILE).enhance([NEWFILE])
- t2 = Rake.application.intern(FileCreationTask, NEWFILE)
- assert ! t2.needed?, "Should not need to build new file"
- assert ! t1.needed?, "Should not need to rebuild old file because of new"
- end
-
- def test_very_early_timestamp
- t1 = Rake.application.intern(FileCreationTask, OLDFILE)
- assert t1.timestamp < Time.now
- assert t1.timestamp < Time.now - 1000000
- end
-end
diff --git a/test/rake/test_rake_file_list.rb b/test/rake/test_rake_file_list.rb
deleted file mode 100644
index 08939fb6ed..0000000000
--- a/test/rake/test_rake_file_list.rb
+++ /dev/null
@@ -1,628 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeFileList < Rake::TestCase
- FileList = Rake::FileList
-
- def setup
- super
-
- FileUtils.mkdir "CVS" rescue nil
- FileUtils.mkdir ".svn" rescue nil
- @cdir = "cfiles"
- FileUtils.mkdir @cdir rescue nil
- FileUtils.touch ".dummy"
- FileUtils.touch "x.bak"
- FileUtils.touch "x~"
- FileUtils.touch "core"
- FileUtils.touch "x.c"
- FileUtils.touch "xyz.c"
- FileUtils.touch "abc.c"
- FileUtils.touch "abc.h"
- FileUtils.touch "abc.x"
- FileUtils.touch "existing"
-
- open 'xyzzy.txt', 'w' do |io|
- io.puts 'x'
- io.puts 'XYZZY'
- end
-
- end
-
- def test_delegating_methods_do_not_include_to_a_or_to_ary
- assert ! FileList::DELEGATING_METHODS.include?("to_a"), "should not include to_a"
- assert ! FileList::DELEGATING_METHODS.include?(:to_a), "should not include to_a"
- assert ! FileList::DELEGATING_METHODS.include?("to_ary"), "should not include to_ary"
- assert ! FileList::DELEGATING_METHODS.include?(:to_ary), "should not include to_ary"
- end
-
- def test_create
- fl = FileList.new
- assert_equal 0, fl.size
- end
-
- def test_create_with_args
- fl = FileList.new("*.c", "x")
- assert_equal ["abc.c", "x.c", "xyz.c", "x"].sort,
- fl.sort
- end
-
- def test_create_with_block
- fl = FileList.new { |f| f.include("x") }
- assert_equal ["x"], fl.resolve
- end
-
- def test_create_with_brackets
- fl = FileList["*.c", "x"]
- assert_equal ["abc.c", "x.c", "xyz.c", "x"].sort,
- fl.sort
- end
-
- def test_create_with_brackets_and_filelist
- fl = FileList[FileList["*.c", "x"]]
- assert_equal ["abc.c", "x.c", "xyz.c", "x"].sort,
- fl.sort
- end
-
- def test_include_with_another_array
- fl = FileList.new.include(["x", "y", "z"])
- assert_equal ["x", "y", "z"].sort, fl.sort
- end
-
- def test_include_with_another_filelist
- fl = FileList.new.include(FileList["*.c", "x"])
- assert_equal ["abc.c", "x.c", "xyz.c", "x"].sort,
- fl.sort
- end
-
- def test_append
- fl = FileList.new
- fl << "a.rb" << "b.rb"
- assert_equal ['a.rb', 'b.rb'], fl
- end
-
- def test_add_many
- fl = FileList.new
- fl.include %w(a d c)
- fl.include('x', 'y')
- assert_equal ['a', 'd', 'c', 'x', 'y'], fl
- assert_equal ['a', 'd', 'c', 'x', 'y'], fl.resolve
- end
-
- def test_add_return
- f = FileList.new
- g = f << "x"
- assert_equal f.object_id, g.object_id
- h = f.include("y")
- assert_equal f.object_id, h.object_id
- end
-
- def test_match
- fl = FileList.new
- fl.include '*.c'
-
- assert_equal %w[abc.c x.c xyz.c], fl.sort
- end
-
- def test_add_matching
- fl = FileList.new
- fl << "a.java"
- fl.include '*.c'
-
- assert_equal %w[a.java abc.c x.c xyz.c], fl.sort
- end
-
- def test_multiple_patterns
- fl = FileList.new
- fl.include('*.z', '*foo*')
-
- assert_equal [], fl
-
- fl.include('*.c', '*xist*')
- assert_equal %w[x.c xyz.c abc.c existing].sort, fl.sort
- end
-
- def test_square_bracket_pattern
- fl = FileList.new
- fl.include("abc.[ch]")
- assert fl.size == 2
- assert fl.include?("abc.c")
- assert fl.include?("abc.h")
- end
-
- def test_curly_bracket_pattern
- fl = FileList.new
- fl.include("abc.{c,h}")
- assert fl.size == 2
- assert fl.include?("abc.c")
- assert fl.include?("abc.h")
- end
-
- def test_reject
- fl = FileList.new
- fl.include %w(x.c abc.c xyz.c existing)
- fl.reject! { |fn| fn =~ /^x/ }
- assert_equal %w[abc.c existing], fl
- end
-
- def test_exclude
- fl = FileList['x.c', 'abc.c', 'xyz.c', 'existing']
- fl.each { |fn| touch fn, :verbose => false }
-
- x = fl.exclude(%r{^x.+\.})
-
- assert_equal FileList, x.class
- assert_equal %w(x.c abc.c existing), fl
- assert_equal fl.object_id, x.object_id
-
- fl.exclude('*.c')
-
- assert_equal ['existing'], fl
-
- fl.exclude('existing')
-
- assert_equal [], fl
- end
-
- def test_excluding_via_block
- fl = FileList['a.c', 'b.c', 'xyz.c']
- fl.exclude { |fn| fn.pathmap('%n') == 'xyz' }
- assert fl.exclude?("xyz.c"), "Should exclude xyz.c"
- assert_equal ['a.c', 'b.c'], fl
- end
-
- def test_exclude_return_on_create
- fl = FileList['*'].exclude(/.*\.[hcx]$/)
- assert_equal %w[cfiles existing xyzzy.txt], fl.sort
- assert_equal FileList, fl.class
- end
-
- def test_exclude_with_string_return_on_create
- fl = FileList['*'].exclude('abc.c')
- assert_equal %w[abc.h abc.x cfiles existing x.c xyz.c xyzzy.txt], fl.sort
- assert_equal FileList, fl.class
- end
-
- def test_default_exclude
- fl = FileList.new
- fl.clear_exclude
- fl.include("**/*~", "**/*.bak", "**/core")
- assert fl.member?("core"), "Should include core"
- assert fl.member?("x.bak"), "Should include .bak files"
- end
-
- def test_unique
- fl = FileList.new
- fl << "x.c" << "a.c" << "b.rb" << "a.c"
- assert_equal ['x.c', 'a.c', 'b.rb', 'a.c'], fl
- fl.uniq!
- assert_equal ['x.c', 'a.c', 'b.rb'], fl
- end
-
- def test_to_string
- fl = FileList.new
- fl << "a.java" << "b.java"
- assert_equal "a.java b.java", fl.to_s
- assert_equal "a.java b.java", "#{fl}"
- end
-
- def test_to_array
- fl = FileList['a.java', 'b.java']
- assert_equal ['a.java', 'b.java'], fl.to_a
- assert_equal Array, fl.to_a.class
- assert_equal ['a.java', 'b.java'], fl.to_ary
- assert_equal Array, fl.to_ary.class
- end
-
- def test_to_s_pending
- fl = FileList['abc.*']
- result = fl.to_s
- assert_match(%r{abc\.c}, result)
- assert_match(%r{abc\.h}, result)
- assert_match(%r{abc\.x}, result)
- assert_match(%r{(abc\..\b ?){2}}, result)
- end
-
- def test_inspect_pending
- fl = FileList['abc.*']
- result = fl.inspect
- assert_match(%r{"abc\.c"}, result)
- assert_match(%r{"abc\.h"}, result)
- assert_match(%r{"abc\.x"}, result)
- assert_match(%r|^\[("abc\..", ){2}"abc\.."\]$|, result)
- end
-
- def test_sub
- fl = FileList["*.c"]
- f2 = fl.sub(/\.c$/, ".o")
- assert_equal FileList, f2.class
- assert_equal ["abc.o", "x.o", "xyz.o"].sort,
- f2.sort
- f3 = fl.gsub(/\.c$/, ".o")
- assert_equal FileList, f3.class
- assert_equal ["abc.o", "x.o", "xyz.o"].sort,
- f3.sort
- end
-
- def test_claim_to_be_a_kind_of_array
- fl = FileList['*.c']
- assert fl.is_a?(Array)
- assert fl.kind_of?(Array)
- end
-
- def test_claim_to_be_a_kind_of_filelist
- fl = FileList['*.c']
- assert fl.is_a?(FileList)
- assert fl.kind_of?(FileList)
- end
-
- def test_claim_to_be_a_filelist_instance
- fl = FileList['*.c']
- assert fl.instance_of?(FileList)
- end
-
- def test_dont_claim_to_be_an_array_instance
- fl = FileList['*.c']
- assert ! fl.instance_of?(Array)
- end
-
- def test_sub!
- f = "x/a.c"
- fl = FileList[f, "x/b.c"]
- res = fl.sub!(/\.c$/, ".o")
- assert_equal ["x/a.o", "x/b.o"].sort, fl.sort
- assert_equal "x/a.c", f
- assert_equal fl.object_id, res.object_id
- end
-
- def test_sub_with_block
- fl = FileList["src/org/onestepback/a.java", "src/org/onestepback/b.java"]
-# The block version doesn't work the way I want it to ...
-# f2 = fl.sub(%r{^src/(.*)\.java$}) { |x| "classes/" + $1 + ".class" }
- f2 = fl.sub(%r{^src/(.*)\.java$}, "classes/\\1.class")
- assert_equal [
- "classes/org/onestepback/a.class",
- "classes/org/onestepback/b.class"
- ].sort,
- f2.sort
- end
-
- def test_string_ext
- assert_equal "one.net", "one.two".ext("net")
- assert_equal "one.net", "one.two".ext(".net")
- assert_equal "one.net", "one".ext("net")
- assert_equal "one.net", "one".ext(".net")
- assert_equal "one.two.net", "one.two.c".ext(".net")
- assert_equal "one/two.net", "one/two.c".ext(".net")
- assert_equal "one.x/two.net", "one.x/two.c".ext(".net")
- assert_equal "one.x/two.net", "one.x/two".ext(".net")
- assert_equal ".onerc.net", ".onerc.dot".ext("net")
- assert_equal ".onerc.net", ".onerc".ext("net")
- assert_equal ".a/.onerc.net", ".a/.onerc".ext("net")
- assert_equal "one", "one.two".ext('')
- assert_equal "one", "one.two".ext
- assert_equal ".one", ".one.two".ext
- assert_equal ".one", ".one".ext
- assert_equal ".", ".".ext("c")
- assert_equal "..", "..".ext("c")
- # These only need to work in windows
- if Rake::Win32.windows?
- assert_equal "one.x\\two.net", "one.x\\two.c".ext(".net")
- assert_equal "one.x\\two.net", "one.x\\two".ext(".net")
- end
- end
-
- def test_filelist_ext
- assert_equal FileList['one.c', '.one.c'],
- FileList['one.net', '.one'].ext('c')
- end
-
- def test_gsub
- fl = FileList["*.c"]
- f2 = fl.gsub(/a/, "A")
- assert_equal ["Abc.c", "x.c", "xyz.c"].sort,
- f2.sort
- end
-
- def test_gsub!
- f = FileList["*.c"]
- f.gsub!(/a/, "A")
- assert_equal ["Abc.c", "x.c", "xyz.c"].sort,
- f.sort
- end
-
- def test_egrep_returns_0_if_no_matches
- files = FileList['test/lib/*_test.rb'].exclude("test/lib/filelist_test.rb")
- assert_equal 0, files.egrep(/XYZZY/) { }
- end
-
- def test_egrep_with_output
- files = FileList['*.txt']
-
- out, = capture_io do
- files.egrep(/XYZZY/)
- end
-
- assert_equal "xyzzy.txt:2:XYZZY\n", out
- end
-
- def test_egrep_with_block
- files = FileList['*.txt']
- found = nil
-
- files.egrep(/XYZZY/) do |fn, ln, line|
- found = [fn, ln, line]
- end
-
- assert_equal ["xyzzy.txt", 2, "XYZZY\n"], found
- end
-
- def test_egrep_with_error
- files = FileList['*.txt']
-
- _, err = capture_io do
- files.egrep(/XYZZY/) do |fn, ln, line |
- raise "_EGREP_FAILURE_"
- end
- end
-
- assert_equal "Error while processing 'xyzzy.txt': _EGREP_FAILURE_\n", err
- end
-
- def test_existing
- fl = FileList['abc.c', 'notthere.c']
- assert_equal ["abc.c"], fl.existing
- assert fl.existing.is_a?(FileList)
- end
-
- def test_existing!
- fl = FileList['abc.c', 'notthere.c']
- result = fl.existing!
- assert_equal ["abc.c"], fl
- assert_equal fl.object_id, result.object_id
- end
-
- def test_ignore_special
- f = FileList['*']
- assert ! f.include?("CVS"), "Should not contain CVS"
- assert ! f.include?(".svn"), "Should not contain .svn"
- assert ! f.include?(".dummy"), "Should not contain dot files"
- assert ! f.include?("x.bak"), "Should not contain .bak files"
- assert ! f.include?("x~"), "Should not contain ~ files"
- assert ! f.include?("core"), "Should not contain core files"
- end
-
- def test_clear_ignore_patterns
- f = FileList['*', '.svn']
- f.clear_exclude
- assert f.include?("abc.c")
- assert f.include?("xyz.c")
- assert f.include?("CVS")
- assert f.include?(".svn")
- assert f.include?("x.bak")
- assert f.include?("x~")
- end
-
- def test_exclude_with_alternate_file_seps
- fl = FileList.new
- assert fl.exclude?("x/CVS/y")
- assert fl.exclude?("x\\CVS\\y")
- assert fl.exclude?("x/.svn/y")
- assert fl.exclude?("x\\.svn\\y")
- assert fl.exclude?("x/core")
- assert fl.exclude?("x\\core")
- end
-
- def test_add_default_exclude_list
- fl = FileList.new
- fl.exclude(/~\d+$/)
- assert fl.exclude?("x/CVS/y")
- assert fl.exclude?("x\\CVS\\y")
- assert fl.exclude?("x/.svn/y")
- assert fl.exclude?("x\\.svn\\y")
- assert fl.exclude?("x/core")
- assert fl.exclude?("x\\core")
- assert fl.exclude?("x/abc~1")
- end
-
- def test_basic_array_functions
- f = FileList['b', 'c', 'a']
- assert_equal 'b', f.first
- assert_equal 'b', f[0]
- assert_equal 'a', f.last
- assert_equal 'a', f[2]
- assert_equal 'a', f[-1]
- assert_equal ['a', 'b', 'c'], f.sort
- f.sort!
- assert_equal ['a', 'b', 'c'], f
- end
-
- def test_flatten
- assert_equal ['a', 'x.c', 'xyz.c', 'abc.c'].sort,
- ['a', FileList['*.c']].flatten.sort
- end
-
- def test_clone_and_dup
- a = FileList['a', 'b', 'c']
- c = a.clone
- d = a.dup
- a << 'd'
- assert_equal ['a', 'b', 'c', 'd'], a
- assert_equal ['a', 'b', 'c'], c
- assert_equal ['a', 'b', 'c'], d
- end
-
- def test_dup_and_clone_replicate_taint
- a = FileList['a', 'b', 'c']
- a.taint
- c = a.clone
- d = a.dup
- assert c.tainted?, "Clone should be tainted"
- assert d.tainted?, "Dup should be tainted"
- end
-
- def test_duped_items_will_thaw
- a = FileList['a', 'b', 'c']
- a.freeze
- d = a.dup
- d << 'more'
- assert_equal ['a', 'b', 'c', 'more'], d
- end
-
- def test_cloned_items_stay_frozen
- a = FileList['a', 'b', 'c']
- a.freeze
- c = a.clone
- assert_raises(TypeError, RuntimeError) do
- c << 'more'
- end
- end
-
- def test_array_comparisons
- fl = FileList['b', 'b']
- a = ['b', 'a']
- b = ['b', 'b']
- c = ['b', 'c']
- assert_equal( 1, fl <=> a )
- assert_equal( 0, fl <=> b )
- assert_equal( -1, fl <=> c )
- assert_equal( -1, a <=> fl )
- assert_equal( 0, b <=> fl )
- assert_equal( 1, c <=> fl )
- end
-
- def test_array_equality
- a = FileList['a', 'b']
- b = ['a', 'b']
- assert a == b
- assert b == a
-# assert a.eql?(b)
-# assert b.eql?(a)
- assert ! a.equal?(b)
- assert ! b.equal?(a)
- end
-
- def test_enumeration_methods
- a = FileList['a', 'b']
- b = a.collect { |it| it.upcase }
- assert_equal ['A', 'B'], b
- assert_equal FileList, b.class
-
- b = a.map { |it| it.upcase }
- assert_equal ['A', 'B'], b
- assert_equal FileList, b.class
-
- b = a.sort
- assert_equal ['a', 'b'], b
- assert_equal FileList, b.class
-
- b = a.sort_by { |it| it }
- assert_equal ['a', 'b'], b
- assert_equal FileList, b.class
-
- b = a.find_all { |it| it == 'b'}
- assert_equal ['b'], b
- assert_equal FileList, b.class
-
- b = a.select { |it| it.size == 1 }
- assert_equal ['a', 'b'], b
- assert_equal FileList, b.class
-
- b = a.reject { |it| it == 'b' }
- assert_equal ['a'], b
- assert_equal FileList, b.class
-
- b = a.grep(/./)
- assert_equal ['a', 'b'], b
- assert_equal FileList, b.class
-
- b = a.partition { |it| it == 'b' }
- assert_equal [['b'], ['a']], b
- assert_equal Array, b.class
- assert_equal FileList, b[0].class
- assert_equal FileList, b[1].class
-
- b = a.zip(['x', 'y']).to_a
- assert_equal [['a', 'x'], ['b', 'y']], b
- assert_equal Array, b.class
- assert_equal Array, b[0].class
- assert_equal Array, b[1].class
- end
-
- def test_array_operators
- a = ['a', 'b']
- b = ['c', 'd']
- f = FileList['x', 'y']
- g = FileList['w', 'z']
-
- r = f + g
- assert_equal ['x', 'y', 'w', 'z'], r
- assert_equal FileList, r.class
-
- r = a + g
- assert_equal ['a', 'b', 'w', 'z'], r
- assert_equal Array, r.class
-
- r = f + b
- assert_equal ['x', 'y', 'c', 'd'], r
- assert_equal FileList, r.class
-
- r = FileList['w', 'x', 'y', 'z'] - f
- assert_equal ['w', 'z'], r
- assert_equal FileList, r.class
-
- r = FileList['w', 'x', 'y', 'z'] & f
- assert_equal ['x', 'y'], r
- assert_equal FileList, r.class
-
- r = f * 2
- assert_equal ['x', 'y', 'x', 'y'], r
- assert_equal FileList, r.class
-
- r = f * ','
- assert_equal 'x,y', r
- assert_equal String, r.class
-
- r = f | ['a', 'x']
- assert_equal ['a', 'x', 'y'].sort, r.sort
- assert_equal FileList, r.class
- end
-
- def test_other_array_returning_methods
- f = FileList['a', nil, 'b']
- r = f.compact
- assert_equal ['a', 'b'], r
- assert_equal FileList, r.class
-
- f = FileList['a', 'b']
- r = f.concat(['x', 'y'])
- assert_equal ['a', 'b', 'x', 'y'], r
- assert_equal FileList, r.class
-
- f = FileList['a', ['b', 'c'], FileList['d', 'e']]
- r = f.flatten
- assert_equal ['a', 'b', 'c', 'd', 'e'], r
- assert_equal FileList, r.class
-
- f = FileList['a', 'b', 'a']
- r = f.uniq
- assert_equal ['a', 'b'], r
- assert_equal FileList, r.class
-
- f = FileList['a', 'b', 'c', 'd']
- r = f.values_at(1,3)
- assert_equal ['b', 'd'], r
- assert_equal FileList, r.class
- end
-
- def test_file_utils_can_use_filelists
- cfiles = FileList['*.c']
-
- cp cfiles, @cdir, :verbose => false
-
- assert File.exist?(File.join(@cdir, 'abc.c'))
- assert File.exist?(File.join(@cdir, 'xyz.c'))
- assert File.exist?(File.join(@cdir, 'x.c'))
- end
-
-end
-
diff --git a/test/rake/test_rake_file_list_path_map.rb b/test/rake/test_rake_file_list_path_map.rb
deleted file mode 100644
index 5935dc2689..0000000000
--- a/test/rake/test_rake_file_list_path_map.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeFileListPathMap < Rake::TestCase
- def test_file_list_supports_pathmap
- assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n")
- end
-end
-
diff --git a/test/rake/test_rake_file_task.rb b/test/rake/test_rake_file_task.rb
deleted file mode 100644
index 0ed32e5655..0000000000
--- a/test/rake/test_rake_file_task.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-
-class TestRakeFileTask < Rake::TestCase
- include Rake
-
- def setup
- super
-
- Task.clear
- @runs = Array.new
- FileUtils.rm_f NEWFILE
- FileUtils.rm_f OLDFILE
- end
-
- def test_file_need
- name = "dummy"
- file name
-
- ftask = Task[name]
-
- assert_equal name.to_s, ftask.name
- File.delete(ftask.name) rescue nil
-
- assert ftask.needed?, "file should be needed"
-
- open(ftask.name, "w") { |f| f.puts "HI" }
-
- assert_equal nil, ftask.prerequisites.collect{|n| Task[n].timestamp}.max
- assert ! ftask.needed?, "file should not be needed"
- ensure
- File.delete(ftask.name) rescue nil
- end
-
- def test_file_times_new_depends_on_old
- create_timed_files(OLDFILE, NEWFILE)
-
- t1 = Rake.application.intern(FileTask, NEWFILE).enhance([OLDFILE])
- t2 = Rake.application.intern(FileTask, OLDFILE)
- assert ! t2.needed?, "Should not need to build old file"
- assert ! t1.needed?, "Should not need to rebuild new file because of old"
- end
-
- def test_file_times_new_depend_on_regular_task_timestamps
- load_phony
-
- name = "dummy"
- task name
-
- create_timed_files(NEWFILE)
-
- t1 = Rake.application.intern(FileTask, NEWFILE).enhance([name])
-
- assert t1.needed?, "depending on non-file task uses Time.now"
-
- task(name => :phony)
-
- assert ! t1.needed?, "unless the non-file task has a timestamp"
- end
-
- def test_file_times_old_depends_on_new
- create_timed_files(OLDFILE, NEWFILE)
-
- t1 = Rake.application.intern(FileTask,OLDFILE).enhance([NEWFILE])
- t2 = Rake.application.intern(FileTask, NEWFILE)
- assert ! t2.needed?, "Should not need to build new file"
- preq_stamp = t1.prerequisites.collect{|t| Task[t].timestamp}.max
- assert_equal t2.timestamp, preq_stamp
- assert t1.timestamp < preq_stamp, "T1 should be older"
- assert t1.needed?, "Should need to rebuild old file because of new"
- end
-
- def test_file_depends_on_task_depend_on_file
- create_timed_files(OLDFILE, NEWFILE)
-
- file NEWFILE => [:obj] do |t| @runs << t.name end
- task :obj => [OLDFILE] do |t| @runs << t.name end
- file OLDFILE do |t| @runs << t.name end
-
- Task[:obj].invoke
- Task[NEWFILE].invoke
- assert ! @runs.include?(NEWFILE)
- end
-
- def test_existing_file_depends_on_non_existing_file
- @ran = false
-
- create_file(OLDFILE)
- delete_file(NEWFILE)
- file NEWFILE do
- @ran = true
- end
-
- file OLDFILE => NEWFILE
-
- Task[OLDFILE].invoke
-
- assert @ran
- end
-
- # I have currently disabled this test. I'm not convinced that
- # deleting the file target on failure is always the proper thing to
- # do. I'm willing to hear input on this topic.
- def ztest_file_deletes_on_failure
- task :obj
- file NEWFILE => [:obj] do |t|
- FileUtils.touch NEWFILE
- fail "Ooops"
- end
- assert Task[NEWFILE]
- begin
- Task[NEWFILE].invoke
- rescue Exception
- end
- assert( ! File.exist?(NEWFILE), "NEWFILE should be deleted")
- end
-
- def load_phony
- load File.join(@rake_lib, "rake/phony.rb")
- end
-
-end
diff --git a/test/rake/test_rake_file_utils.rb b/test/rake/test_rake_file_utils.rb
deleted file mode 100644
index 90565e3ebd..0000000000
--- a/test/rake/test_rake_file_utils.rb
+++ /dev/null
@@ -1,305 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-require 'stringio'
-
-class TestRakeFileUtils < Rake::TestCase
-
- def teardown
- FileUtils::LN_SUPPORTED[0] = true
- RakeFileUtils.verbose_flag = Rake::FileUtilsExt::DEFAULT
-
- super
- end
-
- def test_rm_one_file
- create_file("a")
- FileUtils.rm_rf "a"
- refute File.exist?("a")
- end
-
- def test_rm_two_files
- create_file("a")
- create_file("b")
- FileUtils.rm_rf ["a", "b"]
- refute File.exist?("a")
- refute File.exist?("b")
- end
-
- def test_rm_filelist
- list = Rake::FileList.new << "a" << "b"
- list.each { |fn| create_file(fn) }
- FileUtils.rm_r list
- refute File.exist?("a")
- refute File.exist?("b")
- end
-
- def test_ln
- open("a", "w") { |f| f.puts "TEST_LN" }
-
- Rake::FileUtilsExt.safe_ln("a", "b", :verbose => false)
-
- assert_equal "TEST_LN\n", File.read('b')
- end
-
- class BadLink
- include Rake::FileUtilsExt
- attr_reader :cp_args
- def initialize(klass)
- @failure_class = klass
- end
- def cp(*args)
- @cp_args = args
- end
- def ln(*args)
- fail @failure_class, "ln not supported"
- end
- public :safe_ln
- end
-
- def test_safe_ln_failover_to_cp_on_standard_error
- FileUtils::LN_SUPPORTED[0] = true
- c = BadLink.new(StandardError)
- c.safe_ln "a", "b"
- assert_equal ['a', 'b'], c.cp_args
- c.safe_ln "x", "y"
- assert_equal ['x', 'y'], c.cp_args
- end
-
- def test_safe_ln_failover_to_cp_on_not_implemented_error
- FileUtils::LN_SUPPORTED[0] = true
- c = BadLink.new(NotImplementedError)
- c.safe_ln "a", "b"
- assert_equal ['a', 'b'], c.cp_args
- end
-
- def test_safe_ln_fails_on_script_error
- FileUtils::LN_SUPPORTED[0] = true
- c = BadLink.new(ScriptError)
- assert_raises(ScriptError) do c.safe_ln "a", "b" end
- end
-
- def test_verbose
- verbose true
- assert_equal true, verbose
- verbose false
- assert_equal false, verbose
- verbose(true) {
- assert_equal true, verbose
- }
- assert_equal false, verbose
- end
-
- def test_nowrite
- nowrite true
- assert_equal true, nowrite
- nowrite false
- assert_equal false, nowrite
- nowrite(true){
- assert_equal true, nowrite
- }
- assert_equal false, nowrite
- end
-
- def test_file_utils_methods_are_available_at_top_level
- create_file("a")
-
- capture_io do
- rm_rf "a"
- end
-
- refute File.exist?("a")
- end
-
- def test_fileutils_methods_dont_leak
- obj = Object.new
- assert_raises(NoMethodError) { obj.copy } # from FileUtils
- assert_raises(NoMethodError) { obj.ruby "-v" } # from RubyFileUtils
- end
-
- def test_sh
- shellcommand
-
- verbose(false) { sh %{#{Rake::TestCase::RUBY} shellcommand.rb} }
- assert true, "should not fail"
- end
-
- def test_sh_with_a_single_string_argument
- check_expansion
-
- ENV['RAKE_TEST_SH'] = 'someval'
- verbose(false) {
- sh %{#{RUBY} check_expansion.rb #{env_var} someval}
- }
- end
-
- def test_sh_with_multiple_arguments
- check_no_expansion
- ENV['RAKE_TEST_SH'] = 'someval'
-
- verbose(false) {
- sh RUBY, 'check_no_expansion.rb', env_var, 'someval'
- }
- end
-
- def test_sh_failure
- shellcommand
-
- assert_raises(RuntimeError) {
- verbose(false) { sh %{#{RUBY} shellcommand.rb 1} }
- }
- end
-
- def test_sh_special_handling
- shellcommand
-
- count = 0
- verbose(false) {
- sh(%{#{RUBY} shellcommand.rb}) do |ok, res|
- assert(ok)
- assert_equal 0, res.exitstatus
- count += 1
- end
- sh(%{#{RUBY} shellcommand.rb 1}) do |ok, res|
- assert(!ok)
- assert_equal 1, res.exitstatus
- count += 1
- end
- }
- assert_equal 2, count, "Block count should be 2"
- end
-
- def test_sh_noop
- shellcommand
-
- verbose(false) { sh %{shellcommand.rb 1}, :noop=>true }
- assert true, "should not fail"
- end
-
- def test_sh_bad_option
- shellcommand
-
- ex = assert_raises(ArgumentError) {
- verbose(false) { sh %{shellcommand.rb}, :bad_option=>true }
- }
- assert_match(/bad_option/, ex.message)
- end
-
- def test_sh_verbose
- shellcommand
-
- _, err = capture_io do
- verbose(true) {
- sh %{shellcommand.rb}, :noop=>true
- }
- end
-
- assert_equal "shellcommand.rb\n", err
- end
-
- def test_sh_verbose_false
- shellcommand
-
- _, err = capture_io do
- verbose(false) {
- sh %{shellcommand.rb}, :noop=>true
- }
- end
-
- assert_equal '', err
- end
-
- def test_sh_verbose_flag_nil
- shellcommand
-
- RakeFileUtils.verbose_flag = nil
-
- assert_silent do
- sh %{shellcommand.rb}, :noop=>true
- end
- end
-
- def test_ruby_with_a_single_string_argument
- check_expansion
-
- ENV['RAKE_TEST_SH'] = 'someval'
-
- verbose(false) {
- replace_ruby {
- ruby %{check_expansion.rb #{env_var} someval}
- }
- }
- end
-
- def test_ruby_with_multiple_arguments
- check_no_expansion
-
- ENV['RAKE_TEST_SH'] = 'someval'
- verbose(false) {
- replace_ruby {
- ruby 'check_no_expansion.rb', env_var, 'someval'
- }
- }
- end
-
- def test_split_all
- assert_equal ['a'], Rake::FileUtilsExt.split_all('a')
- assert_equal ['..'], Rake::FileUtilsExt.split_all('..')
- assert_equal ['/'], Rake::FileUtilsExt.split_all('/')
- assert_equal ['a', 'b'], Rake::FileUtilsExt.split_all('a/b')
- assert_equal ['/', 'a', 'b'], Rake::FileUtilsExt.split_all('/a/b')
- assert_equal ['..', 'a', 'b'], Rake::FileUtilsExt.split_all('../a/b')
- end
-
- def command name, text
- open name, 'w', 0750 do |io|
- io << text
- end
- end
-
- def check_no_expansion
- command 'check_no_expansion.rb', <<-CHECK_EXPANSION
-if ARGV[0] != ARGV[1]
- exit 0
-else
- exit 1
-end
- CHECK_EXPANSION
- end
-
- def check_expansion
- command 'check_expansion.rb', <<-CHECK_EXPANSION
-if ARGV[0] != ARGV[1]
- exit 1
-else
- exit 0
-end
- CHECK_EXPANSION
- end
-
- def replace_ruby
- ruby = FileUtils::RUBY
- FileUtils.send :remove_const, :RUBY
- FileUtils.const_set :RUBY, RUBY
- yield
- ensure
- FileUtils.send :remove_const, :RUBY
- FileUtils.const_set:RUBY, ruby
- end
-
- def shellcommand
- command 'shellcommand.rb', <<-SHELLCOMMAND
-#!/usr/bin/env ruby
-
-exit((ARGV[0] || "0").to_i)
- SHELLCOMMAND
- end
-
- def env_var
- windows? ? '%RAKE_TEST_SH%' : '$RAKE_TEST_SH'
- end
-
- def windows?
- ! File::ALT_SEPARATOR.nil?
- end
-
-end
diff --git a/test/rake/test_rake_ftp_file.rb b/test/rake/test_rake_ftp_file.rb
deleted file mode 100644
index 7f41faf0dd..0000000000
--- a/test/rake/test_rake_ftp_file.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'date'
-require 'time'
-require 'rake/contrib/ftptools'
-
-class FakeDate
- def self.today
- Date.new(2003,10,3)
- end
- def self.now
- Time.local(2003,10,3,12,00,00)
- end
-end
-
-class TestRakeFtpFile < Rake::TestCase
-
- def setup
- super
-
- Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }
- end
-
- def test_general
- file = Rake::FtpFile.new("here", "-rw-r--r-- 1 a279376 develop 121770 Mar 6 14:50 wiki.pl")
- assert_equal "wiki.pl", file.name
- assert_equal "here/wiki.pl", file.path
- assert_equal "a279376", file.owner
- assert_equal "develop", file.group
- assert_equal 0644, file.mode
- assert_equal 121770, file.size
- assert_equal Time.mktime(2003,3,6,14,50,0,0), file.time
- assert ! file.directory?
- assert ! file.symlink?
- end
-
- def test_far_date
- file = Rake::FtpFile.new(".", "drwxr-xr-x 3 a279376 develop 4096 Nov 26 2001 vss")
- assert_equal Time.mktime(2001,11,26,0,0,0,0), file.time
- end
-
- def test_close_date
- file = Rake::FtpFile.new(".", "drwxr-xr-x 3 a279376 develop 4096 Nov 26 15:35 vss")
- assert_equal Time.mktime(2002,11,26,15,35,0,0), file.time
- end
-
- def test_directory
- file = Rake::FtpFile.new(".", "drwxrwxr-x 9 a279376 develop 4096 Mar 13 14:32 working")
- assert file.directory?
- assert !file.symlink?
- end
-
- def test_symlink
- file = Rake::FtpFile.new(".", "lrwxrwxrwx 1 a279376 develop 64 Mar 26 2002 xtrac -> /home/a279376/working/ics/development/java/com/fmr/fwp/ics/xtrac")
- assert_equal 'xtrac', file.name
- assert file.symlink?
- assert !file.directory?
- end
-end
-
diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb
deleted file mode 100644
index 23249b97fb..0000000000
--- a/test/rake/test_rake_functional.rb
+++ /dev/null
@@ -1,496 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-require 'open3'
-
-class TestRakeFunctional < Rake::TestCase
-
- def setup
- super
-
- @ruby_options = ["-I#{@rake_lib}", "-I."]
- @verbose = ENV['VERBOSE']
-
- if @verbose
- puts
- puts
- puts '-' * 80
- puts @__name__
- puts '-' * 80
- end
- end
-
- def test_rake_default
- rakefile_default
-
- rake
-
- assert_match(/^DEFAULT$/, @out)
- end
-
- def test_rake_error_on_bad_task
- rakefile_default
-
- rake '-t', 'xyz'
-
- assert_match(/rake aborted/, @err)
- end
-
- def test_env_available_at_top_scope
- rakefile_default
-
- rake "TESTTOPSCOPE=1"
-
- assert_match(/^TOPSCOPE$/, @out)
- end
-
- def test_env_available_at_task_scope
- rakefile_default
-
- rake 'TESTTASKSCOPE=1', 'task_scope'
-
- assert_match(/^TASKSCOPE$/, @out)
- end
-
- def test_multi_desc
- ENV['RAKE_COLUMNS'] = '80'
- rakefile_multidesc
-
- rake "-T"
-
- assert_match %r{^rake a *# A / A2 *$}, @out
- assert_match %r{^rake b *# B *$}, @out
- refute_match %r{^rake c}, @out
- assert_match %r{^rake d *# x{65}\.\.\.$}, @out
- end
-
- def test_long_description
- rakefile_multidesc
-
- rake "--describe"
-
- assert_match %r{^rake a\n *A / A2 *$}m, @out
- assert_match %r{^rake b\n *B *$}m, @out
- assert_match %r{^rake d\n *x{80}}m, @out
- refute_match %r{^rake c\n}m, @out
- end
-
- def test_proper_namespace_access
- rakefile_access
-
- rake
-
- refute_match %r{^BAD:}, @out
- end
-
- def test_rbext
- rakefile_rbext
-
- rake "-N"
-
- assert_match %r{^OK$}, @out
- end
-
- def test_system
- rake_system_dir
-
- rake '-g', "sys1"
-
- assert_match %r{^SYS1}, @out
- end
-
- def test_system_excludes_rakelib_files_too
- rake_system_dir
-
- rake '-g', "sys1", '-T', 'extra'
-
- refute_match %r{extra:extra}, @out
- end
-
- def test_by_default_rakelib_files_are_included
- rake_system_dir
- rakefile_extra
-
- rake '-T', 'extra', '--trace'
-
- assert_match %r{extra:extra}, @out
- end
-
- def test_implicit_system
- rake_system_dir
- Dir.chdir @tempdir
-
- rake "sys1", "--trace"
-
- assert_match %r{^SYS1}, @out
- end
-
- def test_no_system
- rake_system_dir
- rakefile_extra
-
- rake '-G', "sys1"
-
- assert_match %r{^Don't know how to build task}, @err # emacs wart: '
- end
-
- def test_nosearch_with_rakefile_uses_local_rakefile
- rakefile_default
-
- rake "--nosearch"
-
- assert_match %r{^DEFAULT}, @out
- end
-
- def test_nosearch_without_rakefile_finds_system
- rakefile_nosearch
- rake_system_dir
-
- rake "--nosearch", "sys1"
-
- assert_match %r{^SYS1}, @out
- end
-
- def test_nosearch_without_rakefile_and_no_system_fails
- rakefile_nosearch
- ENV['RAKE_SYSTEM'] = 'not_exist'
-
- rake "--nosearch"
-
- assert_match %r{^No Rakefile found}, @err
- end
-
- def test_invalid_command_line_options
- rakefile_default
-
- rake "--bad-options"
-
- assert_match %r{invalid +option}i, @err
- end
-
- def test_inline_verbose_default_should_show_command
- rakefile_verbose
-
- rake "inline_verbose_default"
-
- assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_inline_verbose_true_should_show_command
- rakefile_verbose
-
- rake "inline_verbose_true"
-
- assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_inline_verbose_false_should_not_show_command
- rakefile_verbose
-
- rake "inline_verbose_false"
-
- refute_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_block_verbose_false_should_not_show_command
- rakefile_verbose
-
- rake "block_verbose_false"
-
- refute_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_block_verbose_true_should_show_command
- rakefile_verbose
-
- rake "block_verbose_true"
-
- assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_standalone_verbose_true_should_show_command
- rakefile_verbose
-
- rake "standalone_verbose_true"
-
- assert_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_standalone_verbose_false_should_not_show_command
- rakefile_verbose
-
- rake "standalone_verbose_false"
-
- refute_match(/#{Regexp.quote(RUBY)} -e/, @err)
- end
-
- def test_dry_run
- rakefile_default
-
- rake "-n", "other"
-
- assert_match %r{Execute \(dry run\) default}, @err
- assert_match %r{Execute \(dry run\) other}, @err
- refute_match %r{DEFAULT}, @out
- refute_match %r{OTHER}, @out
- end
-
- # Test for the trace/dry_run bug found by Brian Chandler
- def test_dry_run_bug
- rakefile_dryrun
-
- rake
-
- FileUtils.rm_f 'temp_one'
-
- rake "--dry-run"
-
- refute_match(/No such file/, @out)
- end
-
- # Test for the trace/dry_run bug found by Brian Chandler
- def test_trace_bug
- rakefile_dryrun
-
- rake
-
- FileUtils.rm_f 'temp_one'
-
- rake "--trace"
-
- refute_match(/No such file/, @out)
- end
-
- def test_imports
- rakefile_imports
-
- rake
-
- assert File.exist?(File.join(@tempdir, 'dynamic_deps')),
- "'dynamic_deps' file should exist"
- assert_match(/^FIRST$\s+^DYNAMIC$\s+^STATIC$\s+^OTHER$/, @out)
- end
-
- def test_rules_chaining_to_file_task
- rakefile_chains
-
- rake
-
- assert File.exist?(File.join(@tempdir, 'play.app')),
- "'play.app' file should exist"
- end
-
- def test_file_creation_task
- rakefile_file_creation
-
- rake "prep"
- rake "run"
- rake "run"
-
- assert(@err !~ /^cp src/, "Should not recopy data")
- end
-
- def test_dash_f_with_no_arg_foils_rakefile_lookup
- rakefile_rakelib
-
- rake '-I', 'rakelib', '-rtest1', '-f'
-
- assert_match(/^TEST1$/, @out)
- end
-
- def test_dot_rake_files_can_be_loaded_with_dash_r
- rakefile_rakelib
-
- rake '-I', 'rakelib', '-rtest2', '-f'
-
- assert_empty @err
- assert_match(/^TEST2$/, @out)
- end
-
- def test_can_invoke_task_in_toplevel_namespace
- rakefile_namespace
-
- rake "copy"
-
- assert_match(/^COPY$/, @out)
- end
-
- def test_can_invoke_task_in_nested_namespace
- rakefile_namespace
-
- rake "nest:copy"
-
- assert_match(/^NEST COPY$/, @out)
- end
-
- def test_tasks_can_reference_task_in_same_namespace
- rakefile_namespace
-
- rake "nest:xx"
-
- assert_match(/^NEST COPY$/m, @out)
- end
-
- def test_tasks_can_reference_task_in_other_namespaces
- rakefile_namespace
-
- rake "b:run"
-
- assert_match(/^IN A\nIN B$/m, @out)
- end
-
- def test_anonymous_tasks_can_be_invoked_indirectly
- rakefile_namespace
-
- rake "anon"
-
- assert_match(/^ANON COPY$/m, @out)
- end
-
- def test_rake_namespace_refers_to_toplevel
- rakefile_namespace
-
- rake "very:nested:run"
-
- assert_match(/^COPY$/m, @out)
- end
-
- def test_file_task_are_not_scoped_by_namespaces
- rakefile_namespace
-
- rake "xyz.rb"
-
- assert_match(/^XYZ1\nXYZ2$/m, @out)
- end
-
- def test_file_task_dependencies_scoped_by_namespaces
- rakefile_namespace
-
- rake "scopedep.rb"
-
- assert_match(/^PREPARE\nSCOPEDEP$/m, @out)
- end
-
- def test_comment_before_task_acts_like_desc
- rakefile_comments
-
- rake "-T"
-
- refute_match(/comment for t1/, @out)
- end
-
- def test_comment_separated_from_task_by_blank_line_is_not_picked_up
- rakefile_comments
-
- rake "-T"
-
- refute_match("t2", @out)
- end
-
- def test_comment_after_desc_is_ignored
- rakefile_comments
-
- rake "-T"
-
- assert_match("override comment for t3", @out)
- end
-
- def test_comment_before_desc_is_ignored
- rakefile_comments
-
- rake "-T"
-
- assert_match("override comment for t4", @out)
- end
-
- def test_correct_number_of_tasks_reported
- rakefile_comments
-
- rake "-T"
-
- assert_equal(2, @out.split(/\n/).grep(/t\d/).size)
- end
-
- def test_file_list_is_requirable_separately
- ruby '-rrake/file_list', '-e', 'puts Rake::FileList["a"].size'
- assert_equal "1\n", @out
- end
-
- def can_detect_signals?
- system "ruby -e 'Process.kill \"TERM\", $$'"
- status = $?
- if @verbose
- puts " SIG status = #{$?.inspect}"
- puts " SIG status.respond_to?(:signaled?) = #{$?.respond_to?(:signaled?).inspect}"
- puts " SIG status.signaled? = #{status.signaled?}" if status.respond_to?(:signaled?)
- end
- status.respond_to?(:signaled?) && status.signaled?
- end
-
- def test_signal_propagation_in_tests
- if can_detect_signals?
- rakefile_test_signal
- rake
- assert_match(/ATEST/, @out)
- refute_match(/BTEST/, @out)
- else
- skip "Signal detect seems broken on this system"
- end
- end
-
- def test_failing_test_sets_exit_status
- skip if uncertain_exit_status?
- rakefile_failing_test_task
- rake
- assert @exit.exitstatus > 0, "should be non-zero"
- end
-
- def test_stand_alone_filelist
- rakefile_stand_alone_filelist
-
- run_ruby @ruby_options + ["stand_alone_filelist.rb"]
-
- assert_match(/^stand_alone_filelist\.rb$/, @out)
- assert_equal 0, @exit.exitstatus unless uncertain_exit_status?
- end
-
- private
-
- # We are unable to accurately verify that Rake returns a proper
- # error exit status using popen3 in Ruby 1.8.7 and JRuby. This
- # predicate function can be used to skip tests or assertions as
- # needed.
- def uncertain_exit_status?
- RUBY_VERSION < "1.9" || defined?(JRUBY_VERSION)
- end
-
- # Run a shell Ruby command with command line options (using the
- # default test options). Output is captured in @out and @err
- def ruby(*option_list)
- run_ruby(@ruby_options + option_list)
- end
-
- # Run a command line rake with the give rake options. Default
- # command line ruby options are included. Output is captured in
- # @out and @err
- def rake(*rake_options)
- run_ruby @ruby_options + [@rake_exec] + rake_options
- end
-
- # Low level ruby command runner ...
- def run_ruby(option_list)
- puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
-
- inn, out, err, wait = Open3.popen3(RUBY, *option_list)
- inn.close
-
- @exit = wait ? wait.value : $?
- @out = out.read
- @err = err.read
-
- puts "OUTPUT: [#{@out}]" if @verbose
- puts "ERROR: [#{@err}]" if @verbose
- puts "EXIT: [#{@exit.inspect}]" if @verbose
- puts "PWD: [#{Dir.pwd}]" if @verbose
- end
-
-end
diff --git a/test/rake/test_rake_invocation_chain.rb b/test/rake/test_rake_invocation_chain.rb
deleted file mode 100644
index 1aab1eac81..0000000000
--- a/test/rake/test_rake_invocation_chain.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeInvocationChain < Rake::TestCase
-
- def setup
- super
-
- @empty = Rake::InvocationChain::EMPTY
-
- @first_member = "A"
- @second_member = "B"
- @one = @empty.append(@first_member)
- @two = @one.append(@second_member)
- end
-
- def test_append
- chain = @empty.append("A")
-
- assert_equal 'TOP => A', chain.to_s # HACK
- end
-
- def test_append_one_circular
- ex = assert_raises RuntimeError do
- @one.append(@first_member)
- end
- assert_match(/circular +dependency/i, ex.message)
- assert_match(/A.*=>.*A/, ex.message)
- end
-
- def test_append_two_circular
- ex = assert_raises RuntimeError do
- @two.append(@first_member)
- end
- assert_match(/A.*=>.*B.*=>.*A/, ex.message)
- end
-
- def test_member_eh_one
- assert @one.member?(@first_member)
- end
-
- def test_member_eh_two
- assert @two.member?(@first_member)
- assert @two.member?(@second_member)
- end
-
- def test_to_s_empty
- assert_equal "TOP", @empty.to_s
- assert_equal "TOP => A", @one.to_s
- end
-
-end
-
diff --git a/test/rake/test_rake_makefile_loader.rb b/test/rake/test_rake_makefile_loader.rb
deleted file mode 100644
index bd3c99ba71..0000000000
--- a/test/rake/test_rake_makefile_loader.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/loaders/makefile'
-
-class TestRakeMakefileLoader < Rake::TestCase
- include Rake
-
- def test_parse
- Dir.chdir @tempdir
-
- open 'sample.mf', 'w' do |io|
- io << <<-'SAMPLE_MF'
-# Comments
-a: a1 a2 a3 a4
-b: b1 b2 b3 \
- b4 b5 b6\
-# Mid: Comment
-b7
-
- a : a5 a6 a7
-c: c1
-d: d1 d2 \
-
-e f : e1 f1
-
-g\ 0: g1 g\ 2 g\ 3 g4
- SAMPLE_MF
- end
-
- Task.clear
- loader = Rake::MakefileLoader.new
- loader.load 'sample.mf'
- %w(a b c d).each do |t|
- assert Task.task_defined?(t), "#{t} should be a defined task"
- end
- assert_equal %w(a1 a2 a3 a4 a5 a6 a7).sort, Task['a'].prerequisites.sort
- assert_equal %w(b1 b2 b3 b4 b5 b6 b7).sort, Task['b'].prerequisites.sort
- assert_equal %w(c1).sort, Task['c'].prerequisites.sort
- assert_equal %w(d1 d2).sort, Task['d'].prerequisites.sort
- assert_equal %w(e1 f1).sort, Task['e'].prerequisites.sort
- assert_equal %w(e1 f1).sort, Task['f'].prerequisites.sort
- assert_equal ["g1", "g 2", "g 3", "g4"].sort, Task['g 0'].prerequisites.sort
- assert_equal 7, Task.tasks.size
- end
-end
diff --git a/test/rake/test_rake_multi_task.rb b/test/rake/test_rake_multi_task.rb
deleted file mode 100644
index 22d13d27a0..0000000000
--- a/test/rake/test_rake_multi_task.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'thread'
-
-class TestRakeMultiTask < Rake::TestCase
- include Rake
- include Rake::DSL
-
- def setup
- super
-
- Task.clear
- @runs = Array.new
- @mutex = Mutex.new
- end
-
- def add_run(obj)
- @mutex.synchronize do
- @runs << obj
- end
- end
-
- def test_running_multitasks
- task :a do 3.times do |i| add_run("A#{i}"); sleep 0.01; end end
- task :b do 3.times do |i| add_run("B#{i}"); sleep 0.01; end end
- multitask :both => [:a, :b]
- Task[:both].invoke
- assert_equal 6, @runs.size
- assert @runs.index("A0") < @runs.index("A1")
- assert @runs.index("A1") < @runs.index("A2")
- assert @runs.index("B0") < @runs.index("B1")
- assert @runs.index("B1") < @runs.index("B2")
- end
-
- def test_all_multitasks_wait_on_slow_prerequisites
- task :slow do 3.times do |i| add_run("S#{i}"); sleep 0.05 end end
- task :a => [:slow] do 3.times do |i| add_run("A#{i}"); sleep 0.01 end end
- task :b => [:slow] do 3.times do |i| add_run("B#{i}"); sleep 0.01 end end
- multitask :both => [:a, :b]
- Task[:both].invoke
- assert_equal 9, @runs.size
- assert @runs.index("S0") < @runs.index("S1")
- assert @runs.index("S1") < @runs.index("S2")
- assert @runs.index("S2") < @runs.index("A0")
- assert @runs.index("S2") < @runs.index("B0")
- assert @runs.index("A0") < @runs.index("A1")
- assert @runs.index("A1") < @runs.index("A2")
- assert @runs.index("B0") < @runs.index("B1")
- assert @runs.index("B1") < @runs.index("B2")
- end
-
- def test_multitasks_with_parameters
- task :a, [:arg] do |t,args| add_run(args[:arg]) end
- multitask :b, [:arg] => [:a] do |t,args| add_run(args[:arg]+'mt') end
- Task[:b].invoke "b"
- assert @runs[0] == "b"
- assert @runs[1] == "bmt"
- end
-end
-
diff --git a/test/rake/test_rake_name_space.rb b/test/rake/test_rake_name_space.rb
deleted file mode 100644
index b1f2ed00b2..0000000000
--- a/test/rake/test_rake_name_space.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeNameSpace < Rake::TestCase
-
- class TM
- include Rake::TaskManager
- end
-
- def test_namespace_creation
- mgr = TM.new
- ns = Rake::NameSpace.new(mgr, [])
- refute_nil ns
- end
-
- def test_namespace_lookup
- mgr = TM.new
- ns = mgr.in_namespace("n") do
- mgr.define_task(Rake::Task, "t")
- end
-
- refute_nil ns["t"]
- assert_equal mgr["n:t"], ns["t"]
- end
-
- def test_namespace_reports_tasks_it_owns
- mgr = TM.new
- nns = nil
- ns = mgr.in_namespace("n") do
- mgr.define_task(Rake::Task, :x)
- mgr.define_task(Rake::Task, :y)
- nns = mgr.in_namespace("nn") do
- mgr.define_task(Rake::Task, :z)
- end
- end
- mgr.in_namespace("m") do
- mgr.define_task(Rake::Task, :x)
- end
-
- assert_equal ["n:nn:z", "n:x", "n:y"],
- ns.tasks.map { |tsk| tsk.name }
- assert_equal ["n:nn:z"], nns.tasks.map {|t| t.name}
- end
-end
diff --git a/test/rake/test_rake_package_task.rb b/test/rake/test_rake_package_task.rb
deleted file mode 100644
index 87cb57c105..0000000000
--- a/test/rake/test_rake_package_task.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/packagetask'
-
-class TestRakePackageTask < Rake::TestCase
-
- def test_initialize
- touch 'install.rb'
- touch 'a.c'
- touch 'b.c'
- mkdir 'CVS'
- touch 'a.rb~'
-
- pkg = Rake::PackageTask.new("pkgr", "1.2.3") { |p|
- p.package_files << "install.rb"
- p.package_files.include '*.c'
- p.package_files.exclude(/\bCVS\b/)
- p.package_files.exclude(/~$/)
- p.package_dir = 'pkg'
- p.need_tar = true
- p.need_tar_gz = true
- p.need_tar_bz2 = true
- p.need_zip = true
- }
-
- assert_equal "pkg", pkg.package_dir
-
- assert_includes pkg.package_files, 'a.c'
-
- assert_equal 'pkgr', pkg.name
- assert_equal '1.2.3', pkg.version
- assert Rake::Task[:package]
- assert Rake::Task['pkg/pkgr-1.2.3.tgz']
- assert Rake::Task['pkg/pkgr-1.2.3.tar.gz']
- assert Rake::Task['pkg/pkgr-1.2.3.tar.bz2']
- assert Rake::Task['pkg/pkgr-1.2.3.zip']
- assert Rake::Task['pkg/pkgr-1.2.3']
- assert Rake::Task[:clobber_package]
- assert Rake::Task[:repackage]
- end
-
- def test_initialize_no_version
- e = assert_raises RuntimeError do
- Rake::PackageTask.new 'pkgr'
- end
-
- assert_equal 'Version required (or :noversion)', e.message
- end
-
- def test_initialize_noversion
- pkg = Rake::PackageTask.new 'pkgr', :noversion
-
- assert_equal 'pkg', pkg.package_dir
- assert_equal 'pkgr', pkg.name
- assert_equal nil, pkg.version
- end
-
- def test_clone
- pkg = Rake::PackageTask.new("x", :noversion)
- p2 = pkg.clone
- pkg.package_files << "y"
- p2.package_files << "x"
- assert_equal ["y"], pkg.package_files
- assert_equal ["x"], p2.package_files
- end
-
- def test_package_name
- pkg = Rake::PackageTask.new 'a', '1'
-
- assert_equal 'a-1', pkg.package_name
- end
-
- def test_package_name_noversion
- pkg = Rake::PackageTask.new 'a', :noversion
-
- assert_equal 'a', pkg.package_name
- end
-
-end
-
diff --git a/test/rake/test_rake_path_map.rb b/test/rake/test_rake_path_map.rb
deleted file mode 100644
index 32ffb854b1..0000000000
--- a/test/rake/test_rake_path_map.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakePathMap < Rake::TestCase
-
- def test_returns_self_with_no_args
- assert_equal "abc.rb", "abc.rb".pathmap
- end
-
- def test_s_returns_file_separator
- sep = File::ALT_SEPARATOR || File::SEPARATOR
- assert_equal sep, "abc.rb".pathmap("%s")
- assert_equal sep, "".pathmap("%s")
- assert_equal "a#{sep}b", "a/b".pathmap("%d%s%f")
- end
-
- def test_f_returns_basename
- assert_equal "abc.rb", "abc.rb".pathmap("%f")
- assert_equal "abc.rb", "this/is/a/dir/abc.rb".pathmap("%f")
- assert_equal "abc.rb", "/this/is/a/dir/abc.rb".pathmap("%f")
- end
-
- def test_n_returns_basename_without_extension
- assert_equal "abc", "abc.rb".pathmap("%n")
- assert_equal "abc", "abc".pathmap("%n")
- assert_equal "abc", "this/is/a/dir/abc.rb".pathmap("%n")
- assert_equal "abc", "/this/is/a/dir/abc.rb".pathmap("%n")
- assert_equal "abc", "/this/is/a/dir/abc".pathmap("%n")
- end
-
- def test_d_returns_dirname
- assert_equal ".", "abc.rb".pathmap("%d")
- assert_equal "/", "/abc".pathmap("%d")
- assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%d")
- assert_equal "/this/is/a/dir", "/this/is/a/dir/abc.rb".pathmap("%d")
- end
-
- def test_9d_returns_partial_dirname
- assert_equal "this/is", "this/is/a/dir/abc.rb".pathmap("%2d")
- assert_equal "this", "this/is/a/dir/abc.rb".pathmap("%1d")
- assert_equal ".", "this/is/a/dir/abc.rb".pathmap("%0d")
- assert_equal "dir", "this/is/a/dir/abc.rb".pathmap("%-1d")
- assert_equal "a/dir", "this/is/a/dir/abc.rb".pathmap("%-2d")
- assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%100d")
- assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%-100d")
- end
-
- def test_x_returns_extension
- assert_equal "", "abc".pathmap("%x")
- assert_equal ".rb", "abc.rb".pathmap("%x")
- assert_equal ".rb", "abc.xyz.rb".pathmap("%x")
- assert_equal "", ".depends".pathmap("%x")
- assert_equal "", "dir/.depends".pathmap("%x")
- end
-
- def test_X_returns_everything_but_extension
- assert_equal "abc", "abc".pathmap("%X")
- assert_equal "abc", "abc.rb".pathmap("%X")
- assert_equal "abc.xyz", "abc.xyz.rb".pathmap("%X")
- assert_equal "ab.xyz", "ab.xyz.rb".pathmap("%X")
- assert_equal "a.xyz", "a.xyz.rb".pathmap("%X")
- assert_equal "abc", "abc.rb".pathmap("%X")
- assert_equal "ab", "ab.rb".pathmap("%X")
- assert_equal "a", "a.rb".pathmap("%X")
- assert_equal ".depends", ".depends".pathmap("%X")
- assert_equal "a/dir/.depends", "a/dir/.depends".pathmap("%X")
- assert_equal "/.depends", "/.depends".pathmap("%X")
- end
-
- def test_p_returns_entire_pathname
- assert_equal "abc.rb", "abc.rb".pathmap("%p")
- assert_equal "this/is/a/dir/abc.rb", "this/is/a/dir/abc.rb".pathmap("%p")
- assert_equal "/this/is/a/dir/abc.rb", "/this/is/a/dir/abc.rb".pathmap("%p")
- end
-
- def test_dash_returns_empty_string
- assert_equal "", "abc.rb".pathmap("%-")
- assert_equal "abc.rb", "abc.rb".pathmap("%X%-%x")
- end
-
- def test_percent_percent_returns_percent
- assert_equal "a%b", "".pathmap("a%%b")
- end
-
- def test_undefined_percent_causes_error
- assert_raises(ArgumentError) {
- "dir/abc.rb".pathmap("%z")
- }
- end
-
- def test_pattern_returns_substitutions
- assert_equal "bin/org/osb",
- "src/org/osb/Xyz.java".pathmap("%{src,bin}d")
- end
-
- def test_pattern_can_use_backreferences
- assert_equal "dir/hi/is", "dir/this/is".pathmap("%{t(hi)s,\\1}p")
- end
-
- def test_pattern_with_star_replacement_string_uses_block
- assert_equal "src/ORG/osb",
- "src/org/osb/Xyz.java".pathmap("%{/org,*}d") { |d| d.upcase }
- assert_equal "Xyz.java",
- "src/org/osb/Xyz.java".pathmap("%{.*,*}f") { |f| f.capitalize }
- end
-
- def test_pattern_with_no_replacement_nor_block_substitutes_empty_string
- assert_equal "bc.rb", "abc.rb".pathmap("%{a}f")
- end
-
- def test_pattern_works_with_certain_valid_operators
- assert_equal "dir/xbc.rb", "dir/abc.rb".pathmap("%{a,x}p")
- assert_equal "d1r", "dir/abc.rb".pathmap("%{i,1}d")
- assert_equal "xbc.rb", "dir/abc.rb".pathmap("%{a,x}f")
- assert_equal ".Rb", "dir/abc.rb".pathmap("%{r,R}x")
- assert_equal "xbc", "dir/abc.rb".pathmap("%{a,x}n")
- end
-
- def test_multiple_patterns
- assert_equal "this/is/b/directory/abc.rb",
- "this/is/a/dir/abc.rb".pathmap("%{a,b;dir,\\0ectory}p")
- end
-
- def test_partial_directory_selection_works_with_patterns
- assert_equal "this/is/a/long",
- "this/is/a/really/long/path/ok.rb".pathmap("%{/really/,/}5d")
- end
-
- def test_pattern_with_invalid_operator
- ex = assert_raises(ArgumentError) do
- "abc.xyz".pathmap("%{src,bin}z")
- end
- assert_match(/unknown.*pathmap.*spec.*z/i, ex.message)
- end
-
- def test_works_with_windows_separators
- if File::ALT_SEPARATOR
- assert_equal "abc", 'dir\abc.rb'.pathmap("%n")
- assert_equal 'this\is\a\dir',
- 'this\is\a\dir\abc.rb'.pathmap("%d")
- end
- end
-
- def test_complex_patterns
- sep = "".pathmap("%s")
- assert_equal "dir/abc.rb", "dir/abc.rb".pathmap("%d/%n%x")
- assert_equal "./abc.rb", "abc.rb".pathmap("%d/%n%x")
- assert_equal "Your file extension is '.rb'",
- "dir/abc.rb".pathmap("Your file extension is '%x'")
- assert_equal "bin/org/onstepback/proj/A.class",
- "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class")
- assert_equal "src_work/bin/org/onstepback/proj/A.class",
- "src_work/src/org/onstepback/proj/A.java".pathmap('%{\bsrc\b,bin}X.class')
- assert_equal ".depends.bak", ".depends".pathmap("%X.bak")
- assert_equal "d#{sep}a/b/c#{sep}file.txt", "a/b/c/d/file.txt".pathmap("%-1d%s%3d%s%f")
- end
-end
-
diff --git a/test/rake/test_rake_path_map_explode.rb b/test/rake/test_rake_path_map_explode.rb
deleted file mode 100644
index a79235ee74..0000000000
--- a/test/rake/test_rake_path_map_explode.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakePathMapExplode < Rake::TestCase
- def setup
- super
-
- String.class_eval { public :pathmap_explode }
- end
-
- def teardown
- String.class_eval { protected :pathmap_explode }
-
- super
- end
-
- def test_explode
- assert_equal ['a'], 'a'.pathmap_explode
- assert_equal ['a', 'b'], 'a/b'.pathmap_explode
- assert_equal ['a', 'b', 'c'], 'a/b/c'.pathmap_explode
- assert_equal ['/', 'a'], '/a'.pathmap_explode
- assert_equal ['/', 'a', 'b'], '/a/b'.pathmap_explode
- assert_equal ['/', 'a', 'b', 'c'], '/a/b/c'.pathmap_explode
-
- if File::ALT_SEPARATOR
- assert_equal ['c:.', 'a'], 'c:a'.pathmap_explode
- assert_equal ['c:.', 'a', 'b'], 'c:a/b'.pathmap_explode
- assert_equal ['c:.', 'a', 'b', 'c'], 'c:a/b/c'.pathmap_explode
- assert_equal ['c:/', 'a'], 'c:/a'.pathmap_explode
- assert_equal ['c:/', 'a', 'b'], 'c:/a/b'.pathmap_explode
- assert_equal ['c:/', 'a', 'b', 'c'], 'c:/a/b/c'.pathmap_explode
- end
- end
-end
-
diff --git a/test/rake/test_rake_path_map_partial.rb b/test/rake/test_rake_path_map_partial.rb
deleted file mode 100644
index 566e681bb1..0000000000
--- a/test/rake/test_rake_path_map_partial.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakePathMapPartial < Rake::TestCase
- def test_pathmap_partial
- @path = "1/2/file"
- def @path.call(n)
- pathmap_partial(n)
- end
- assert_equal("1", @path.call(1))
- assert_equal("1/2", @path.call(2))
- assert_equal("1/2", @path.call(3))
- assert_equal(".", @path.call(0))
- assert_equal("2", @path.call(-1))
- assert_equal("1/2", @path.call(-2))
- assert_equal("1/2", @path.call(-3))
- end
-end
-
diff --git a/test/rake/test_rake_pseudo_status.rb b/test/rake/test_rake_pseudo_status.rb
deleted file mode 100644
index 51b3fef34e..0000000000
--- a/test/rake/test_rake_pseudo_status.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakePseudoStatus < Rake::TestCase
- def test_with_zero_exit_status
- s = Rake::PseudoStatus.new
- assert_equal 0, s.exitstatus
- assert_equal 0, s.to_i
- assert_equal 0, s >> 8
- refute s.stopped?
- assert s.exited?
- end
-
- def test_with_99_exit_status
- s = Rake::PseudoStatus.new(99)
- assert_equal 99, s.exitstatus
- assert_equal 25344, s.to_i
- assert_equal 99, s >> 8
- refute s.stopped?
- assert s.exited?
- end
-end
diff --git a/test/rake/test_rake_rake_test_loader.rb b/test/rake/test_rake_rake_test_loader.rb
deleted file mode 100644
index 7b5337c234..0000000000
--- a/test/rake/test_rake_rake_test_loader.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeRakeTestLoader < Rake::TestCase
-
- def test_pattern
- orig_LOADED_FEATURES = $:.dup
- FileUtils.touch 'foo.rb'
- FileUtils.touch 'test_a.rb'
- FileUtils.touch 'test_b.rb'
-
- ARGV.replace %w[foo.rb test_*.rb -v]
-
- load File.join(@rake_lib, 'rake/rake_test_loader.rb')
-
- assert_equal %w[-v], ARGV
- ensure
- $:.replace orig_LOADED_FEATURES
- end
-
-end
-
diff --git a/test/rake/test_rake_rdoc_task.rb b/test/rake/test_rake_rdoc_task.rb
deleted file mode 100644
index 0d24ef04a3..0000000000
--- a/test/rake/test_rake_rdoc_task.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-begin
- old_stderr = $stderr
- dev_null = File.exist?('/dev/null') ? '/dev/null' : 'NUL'
- $stderr = open dev_null, 'w'
- require 'rake/rdoctask'
-ensure
- $stderr.close
- $stderr = old_stderr
-end
-
-class TestRakeRDocTask < Rake::TestCase
- include Rake
-
- def setup
- super
-
- Task.clear
- end
-
- def test_tasks_creation
- Rake::RDocTask.new
- assert Task[:rdoc]
- assert Task[:clobber_rdoc]
- assert Task[:rerdoc]
- end
-
- def test_tasks_creation_with_custom_name_symbol
- rd = Rake::RDocTask.new(:rdoc_dev)
- assert Task[:rdoc_dev]
- assert Task[:clobber_rdoc_dev]
- assert Task[:rerdoc_dev]
- assert_equal :rdoc_dev, rd.name
- end
-
- def test_tasks_creation_with_custom_name_string
- rd = Rake::RDocTask.new("rdoc_dev")
- assert Task[:rdoc_dev]
- assert Task[:clobber_rdoc_dev]
- assert Task[:rerdoc_dev]
- assert_equal "rdoc_dev", rd.name
- end
-
- def test_tasks_creation_with_custom_name_hash
- options = { :rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force" }
- rd = Rake::RDocTask.new(options)
- assert Task[:"rdoc"]
- assert Task[:"rdoc:clean"]
- assert Task[:"rdoc:force"]
- assert_raises(RuntimeError) { Task[:clobber_rdoc] }
- assert_equal options, rd.name
- end
-
- def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
- Rake::RDocTask.new(:clobber_rdoc => "rdoc:clean")
- assert Task[:rdoc]
- assert Task[:"rdoc:clean"]
- assert Task[:rerdoc]
- end
-
- def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
- assert_raises(ArgumentError) do
- Rake::RDocTask.new(:foo => "bar")
- end
-
- begin
- Rake::RDocTask.new(:foo => "bar")
- rescue ArgumentError => e
- assert_match(/foo/, e.message)
- end
- end
-
- def test_inline_source_option_is_only_appended_if_option_not_already_given
- rd = Rake::RDocTask.new
- rd.options << '--inline-source'
- assert_equal 1, rd.option_list.grep('--inline-source').size
-
- rd = Rake::RDocTask.new
- rd.options << '-S'
- assert_equal 1, rd.option_list.grep('-S').size
- assert_equal 0, rd.option_list.grep('--inline-source').size
- end
-end
diff --git a/test/rake/test_rake_reduce_compat.rb b/test/rake/test_rake_reduce_compat.rb
deleted file mode 100644
index 6da8e4259c..0000000000
--- a/test/rake/test_rake_reduce_compat.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'open3'
-
-class TestRakeReduceCompat < Rake::TestCase
- # TODO: factor out similar code in test_rake_functional.rb
- def rake(*args)
- Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, out, _, _|
- out.read
- }
- end
-
- def invoke_normal(task_name)
- rake task_name.to_s
- end
-
- def invoke_reduce_compat(task_name)
- rake "--reduce-compat", task_name.to_s
- end
-
- def test_no_deprecated_dsl
- rakefile %q{
- task :check_task do
- Module.new { p defined?(task) }
- end
-
- task :check_file do
- Module.new { p defined?(file) }
- end
- }
-
- assert_equal %{"method"}, invoke_normal(:check_task).chomp
- assert_equal %{"method"}, invoke_normal(:check_file).chomp
-
- assert_equal "nil", invoke_reduce_compat(:check_task).chomp
- assert_equal "nil", invoke_reduce_compat(:check_file).chomp
- end
-
- def test_no_classic_namespace
- rakefile %q{
- task :check_task do
- begin
- Task
- print "present"
- rescue NameError
- print "absent"
- end
- end
-
- task :check_file_task do
- begin
- FileTask
- print "present"
- rescue NameError
- print "absent"
- end
- end
- }
-
- assert_equal "present", invoke_normal(:check_task)
- assert_equal "present", invoke_normal(:check_file_task)
-
- assert_equal "absent", invoke_reduce_compat(:check_task)
- assert_equal "absent", invoke_reduce_compat(:check_file_task)
- end
-end
diff --git a/test/rake/test_rake_require.rb b/test/rake/test_rake_require.rb
deleted file mode 100644
index d229edbc2b..0000000000
--- a/test/rake/test_rake_require.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeRequire < Rake::TestCase
-
- def test_can_load_rake_library
- rakefile_rakelib
- app = Rake::Application.new
-
- assert app.instance_eval {
- rake_require("test2", ['rakelib'], [])
- }
- end
-
- def test_wont_reload_rake_library
- rakefile_rakelib
- app = Rake::Application.new
-
- paths = ['rakelib']
- loaded_files = []
- app.rake_require("test2", paths, loaded_files)
-
- assert ! app.instance_eval {
- rake_require("test2", paths, loaded_files)
- }
- end
-
- def test_throws_error_if_library_not_found
- rakefile_rakelib
-
- app = Rake::Application.new
- ex = assert_raises(LoadError) {
- assert app.instance_eval {
- rake_require("testx", ['rakelib'], [])
- }
- }
- assert_match(/(can *not|can't)\s+find/i, ex.message)
- assert_match(/testx/, ex.message)
- end
-end
-
diff --git a/test/rake/test_rake_rules.rb b/test/rake/test_rake_rules.rb
deleted file mode 100644
index 3f6e352322..0000000000
--- a/test/rake/test_rake_rules.rb
+++ /dev/null
@@ -1,327 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-
-class TestRakeRules < Rake::TestCase
- include Rake
-
- SRCFILE = "abc.c"
- SRCFILE2 = "xyz.c"
- FTNFILE = "abc.f"
- OBJFILE = "abc.o"
- FOOFILE = "foo"
- DOTFOOFILE = ".foo"
-
- def setup
- super
-
- Task.clear
- @runs = []
- end
-
- def test_multiple_rules1
- create_file(FTNFILE)
- delete_file(SRCFILE)
- delete_file(OBJFILE)
- rule(/\.o$/ => ['.c']) do @runs << :C end
- rule(/\.o$/ => ['.f']) do @runs << :F end
- t = Task[OBJFILE]
- t.invoke
- Task[OBJFILE].invoke
- assert_equal [:F], @runs
- end
-
- def test_multiple_rules2
- create_file(FTNFILE)
- delete_file(SRCFILE)
- delete_file(OBJFILE)
- rule(/\.o$/ => ['.f']) do @runs << :F end
- rule(/\.o$/ => ['.c']) do @runs << :C end
- Task[OBJFILE].invoke
- assert_equal [:F], @runs
- end
-
- def test_create_with_source
- create_file(SRCFILE)
- rule(/\.o$/ => ['.c']) do |t|
- @runs << t.name
- assert_equal OBJFILE, t.name
- assert_equal SRCFILE, t.source
- end
- Task[OBJFILE].invoke
- assert_equal [OBJFILE], @runs
- end
-
- def test_single_dependent
- create_file(SRCFILE)
- rule(/\.o$/ => '.c') do |t|
- @runs << t.name
- end
- Task[OBJFILE].invoke
- assert_equal [OBJFILE], @runs
- end
-
- def test_rule_can_be_created_by_string
- create_file(SRCFILE)
- rule '.o' => ['.c'] do |t|
- @runs << t.name
- end
- Task[OBJFILE].invoke
- assert_equal [OBJFILE], @runs
- end
-
- def test_rule_prereqs_can_be_created_by_string
- create_file(SRCFILE)
- rule '.o' => '.c' do |t|
- @runs << t.name
- end
- Task[OBJFILE].invoke
- assert_equal [OBJFILE], @runs
- end
-
- def test_plain_strings_as_dependents_refer_to_files
- create_file(SRCFILE)
- rule '.o' => SRCFILE do |t|
- @runs << t.name
- end
- Task[OBJFILE].invoke
- assert_equal [OBJFILE], @runs
- end
-
- def test_file_names_beginning_with_dot_can_be_tricked_into_referring_to_file
- verbose(false) do
- create_file('.foo')
- rule '.o' => "./.foo" do |t|
- @runs << t.name
- end
- Task[OBJFILE].invoke
- assert_equal [OBJFILE], @runs
- end
- end
-
- def test_file_names_beginning_with_dot_can_be_wrapped_in_lambda
- verbose(false) do
-
- create_file(".foo")
- rule '.o' => lambda{".foo"} do |t|
- @runs << "#{t.name} - #{t.source}"
- end
- Task[OBJFILE].invoke
- assert_equal ["#{OBJFILE} - .foo"], @runs
- end
- end
-
- def test_file_names_containing_percent_can_be_wrapped_in_lambda
- verbose(false) do
- create_file("foo%x")
- rule '.o' => lambda{"foo%x"} do |t|
- @runs << "#{t.name} - #{t.source}"
- end
- Task[OBJFILE].invoke
- assert_equal ["#{OBJFILE} - foo%x"], @runs
- end
- end
-
- def test_non_extension_rule_name_refers_to_file
- verbose(false) do
- create_file("abc.c")
- rule "abc" => '.c' do |t|
- @runs << t.name
- end
- Task["abc"].invoke
- assert_equal ["abc"], @runs
- end
- end
-
- def test_pathmap_automatically_applies_to_name
- verbose(false) do
- create_file("zzabc.c")
- rule ".o" => 'zz%{x,a}n.c' do |t|
- @runs << "#{t.name} - #{t.source}"
- end
- Task["xbc.o"].invoke
- assert_equal ["xbc.o - zzabc.c"], @runs
- end
- end
-
- def test_plain_strings_are_just_filenames
- verbose(false) do
- create_file("plainname")
- rule ".o" => 'plainname' do |t|
- @runs << "#{t.name} - #{t.source}"
- end
- Task["xbc.o"].invoke
- assert_equal ["xbc.o - plainname"], @runs
- end
- end
-
- def test_rule_runs_when_explicit_task_has_no_actions
- create_file(SRCFILE)
- create_file(SRCFILE2)
- delete_file(OBJFILE)
- rule '.o' => '.c' do |t|
- @runs << t.source
- end
- file OBJFILE => [SRCFILE2]
- Task[OBJFILE].invoke
- assert_equal [SRCFILE], @runs
- end
-
- def test_close_matches_on_name_do_not_trigger_rule
- create_file("x.c")
- rule '.o' => ['.c'] do |t|
- @runs << t.name
- end
- assert_raises(RuntimeError) { Task['x.obj'].invoke }
- assert_raises(RuntimeError) { Task['x.xyo'].invoke }
- end
-
- def test_rule_rebuilds_obj_when_source_is_newer
- create_timed_files(OBJFILE, SRCFILE)
- rule(/\.o$/ => ['.c']) do
- @runs << :RULE
- end
- Task[OBJFILE].invoke
- assert_equal [:RULE], @runs
- end
-
- def test_rule_with_two_sources_runs_if_both_sources_are_present
- create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
- rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
- @runs << :RULE
- end
- Task[OBJFILE].invoke
- assert_equal [:RULE], @runs
- end
-
- def test_rule_with_two_sources_but_one_missing_does_not_run
- create_timed_files(OBJFILE, SRCFILE)
- delete_file(SRCFILE2)
- rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
- @runs << :RULE
- end
- Task[OBJFILE].invoke
- assert_equal [], @runs
- end
-
- def test_rule_with_two_sources_builds_both_sources
- task 'x.aa'
- task 'x.bb'
- rule '.a' => '.aa' do
- @runs << "A"
- end
- rule '.b' => '.bb' do
- @runs << "B"
- end
- rule ".c" => ['.a', '.b'] do
- @runs << "C"
- end
- Task["x.c"].invoke
- assert_equal ["A", "B", "C"], @runs.sort
- end
-
- def test_second_rule_runs_when_first_rule_doesnt
- create_timed_files(OBJFILE, SRCFILE)
- delete_file(SRCFILE2)
- rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
- @runs << :RULE1
- end
- rule OBJFILE => [lambda{SRCFILE}] do
- @runs << :RULE2
- end
- Task[OBJFILE].invoke
- assert_equal [:RULE2], @runs
- end
-
- def test_second_rule_doest_run_if_first_triggers
- create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
- rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
- @runs << :RULE1
- end
- rule OBJFILE => [lambda{SRCFILE}] do
- @runs << :RULE2
- end
- Task[OBJFILE].invoke
- assert_equal [:RULE1], @runs
- end
-
- def test_second_rule_doest_run_if_first_triggers_with_reversed_rules
- create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
- rule OBJFILE => [lambda{SRCFILE}] do
- @runs << :RULE1
- end
- rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
- @runs << :RULE2
- end
- Task[OBJFILE].invoke
- assert_equal [:RULE1], @runs
- end
-
- def test_rule_with_proc_dependent_will_trigger
- mkdir_p("src/jw")
- create_file("src/jw/X.java")
- rule %r(classes/.*\.class) => [
- proc { |fn| fn.pathmap("%{classes,src}d/%n.java") }
- ] do |task|
- assert_equal task.name, 'classes/jw/X.class'
- assert_equal task.source, 'src/jw/X.java'
- @runs << :RULE
- end
- Task['classes/jw/X.class'].invoke
- assert_equal [:RULE], @runs
- ensure
- rm_r("src", :verbose=>false) rescue nil
- end
-
- def test_proc_returning_lists_are_flattened_into_prereqs
- ran = false
- mkdir_p("flatten")
- create_file("flatten/a.txt")
- task 'flatten/b.data' do |t|
- ran = true
- touch t.name, :verbose => false
- end
- rule '.html' =>
- proc { |fn|
- [
- fn.ext("txt"),
- "flatten/b.data"
- ]
- } do |task|
- end
- Task['flatten/a.html'].invoke
- assert ran, "Should have triggered flattened dependency"
- ensure
- rm_r("flatten", :verbose=>false) rescue nil
- end
-
- def test_recursive_rules_will_work_as_long_as_they_terminate
- actions = []
- create_file("abc.xml")
- rule '.y' => '.xml' do actions << 'y' end
- rule '.c' => '.y' do actions << 'c'end
- rule '.o' => '.c' do actions << 'o'end
- rule '.exe' => '.o' do actions << 'exe'end
- Task["abc.exe"].invoke
- assert_equal ['y', 'c', 'o', 'exe'], actions
- end
-
- def test_recursive_rules_that_dont_terminate_will_overflow
- create_file("a.a")
- prev = 'a'
- ('b'..'z').each do |letter|
- rule ".#{letter}" => ".#{prev}" do |t| puts "#{t.name}" end
- prev = letter
- end
- ex = assert_raises(Rake::RuleRecursionOverflowError) {
- Task["a.z"].invoke
- }
- assert_match(/a\.z => a.y/, ex.message)
- end
-
- def test_rules_with_bad_dependents_will_fail
- rule "a" => [ 1 ] do |t| puts t.name end
- assert_raises(RuntimeError) do Task['a'].invoke end
- end
-
-end
-
diff --git a/test/rake/test_rake_task.rb b/test/rake/test_rake_task.rb
deleted file mode 100644
index 7d844ac22b..0000000000
--- a/test/rake/test_rake_task.rb
+++ /dev/null
@@ -1,316 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'fileutils'
-
-class TestRakeTask < Rake::TestCase
- include Rake
-
- def setup
- super
-
- Task.clear
- Rake::TaskManager.record_task_metadata = true
- end
-
- def teardown
- Rake::TaskManager.record_task_metadata = false
-
- super
- end
-
- def test_create
- arg = nil
- t = task(:name) { |task| arg = task; 1234 }
- assert_equal "name", t.name
- assert_equal [], t.prerequisites
- assert t.needed?
- t.execute(0)
- assert_equal t, arg
- assert_nil t.source
- assert_equal [], t.sources
- assert_equal 1, t.locations.size
- assert_match(/#{Regexp.quote(__FILE__)}/, t.locations.first)
- end
-
- def test_inspect
-# t = task(:foo, :needs => [:bar, :baz])
- t = task(:foo => [:bar, :baz])
- assert_equal "<Rake::Task foo => [bar, baz]>", t.inspect
- end
-
- def test_invoke
- runlist = []
- t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
- task(:t2) { |t| runlist << t.name }
- task(:t3) { |t| runlist << t.name }
- assert_equal ["t2", "t3"], t1.prerequisites
- t1.invoke
- assert_equal ["t2", "t3", "t1"], runlist
- end
-
- def test_invoke_with_circular_dependencies
- runlist = []
- t1 = task(:t1 => [:t2]) { |t| runlist << t.name; 3321 }
- t2 = task(:t2 => [:t1]) { |t| runlist << t.name }
- assert_equal ["t2"], t1.prerequisites
- assert_equal ["t1"], t2.prerequisites
- ex = assert_raises RuntimeError do
- t1.invoke
- end
- assert_match(/circular dependency/i, ex.message)
- assert_match(/t1 => t2 => t1/, ex.message)
- end
-
- def test_dry_run_prevents_actions
- Rake.application.options.dryrun = true
- runlist = []
- t1 = task(:t1) { |t| runlist << t.name; 3321 }
- _, err = capture_io { t1.invoke }
- assert_match(/execute .*t1/i, err)
- assert_match(/dry run/i, err)
- refute_match(/invoke/i, err)
- assert_equal [], runlist
- ensure
- Rake.application.options.dryrun = false
- end
-
- def test_tasks_can_be_traced
- Rake.application.options.trace = true
- t1 = task(:t1)
- _, err = capture_io {
- t1.invoke
- }
- assert_match(/invoke t1/i, err)
- assert_match(/execute t1/i, err)
- ensure
- Rake.application.options.trace = false
- end
-
- def test_no_double_invoke
- runlist = []
- t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
- task(:t2 => [:t3]) { |t| runlist << t.name }
- task(:t3) { |t| runlist << t.name }
- t1.invoke
- assert_equal ["t3", "t2", "t1"], runlist
- end
-
- def test_can_double_invoke_with_reenable
- runlist = []
- t1 = task(:t1) { |t| runlist << t.name }
- t1.invoke
- t1.reenable
- t1.invoke
- assert_equal ["t1", "t1"], runlist
- end
-
- def test_clear
- desc "a task"
- t = task("t" => "a") { }
- t.clear
- assert t.prerequisites.empty?, "prerequisites should be empty"
- assert t.actions.empty?, "actions should be empty"
- assert_nil t.comment, "comments should be empty"
- end
-
- def test_clear_prerequisites
- t = task("t" => ["a", "b"])
- assert_equal ['a', 'b'], t.prerequisites
- t.clear_prerequisites
- assert_equal [], t.prerequisites
- end
-
- def test_clear_actions
- t = task("t") { }
- t.clear_actions
- assert t.actions.empty?, "actions should be empty"
- end
-
- def test_clear_comments
- desc "the original foo"
- task :foo => [:x] do
- # Dummy action
- end
-
- task(:foo).clear_comments
-
- desc "a slightly different foo"
- task :foo
-
- assert_equal "a slightly different foo", task(:foo).comment
- assert_equal ["x"], task(:foo).prerequisites
- assert_equal 1, task(:foo).actions.size
- end
-
- def test_find
- task :tfind
- assert_equal "tfind", Task[:tfind].name
- ex = assert_raises(RuntimeError) { Task[:leaves] }
- assert_equal "Don't know how to build task 'leaves'", ex.message
- end
-
- def test_defined
- assert ! Task.task_defined?(:a)
- task :a
- assert Task.task_defined?(:a)
- end
-
- def test_multi_invocations
- runs = []
- p = proc do |t| runs << t.name end
- task({:t1=>[:t2,:t3]}, &p)
- task({:t2=>[:t3]}, &p)
- task(:t3, &p)
- Task[:t1].invoke
- assert_equal ["t1", "t2", "t3"], runs.sort
- end
-
- def test_task_list
- task :t2
- task :t1 => [:t2]
- assert_equal ["t1", "t2"], Task.tasks.collect {|t| t.name}
- end
-
- def test_task_gives_name_on_to_s
- task :abc
- assert_equal "abc", Task[:abc].to_s
- end
-
- def test_symbols_can_be_prerequisites
- task :a => :b
- assert_equal ["b"], Task[:a].prerequisites
- end
-
- def test_strings_can_be_prerequisites
- task :a => "b"
- assert_equal ["b"], Task[:a].prerequisites
- end
-
- def test_arrays_can_be_prerequisites
- task :a => ["b", "c"]
- assert_equal ["b", "c"], Task[:a].prerequisites
- end
-
- def test_filelists_can_be_prerequisites
- task :a => FileList.new.include("b", "c")
- assert_equal ["b", "c"], Task[:a].prerequisites
- end
-
- def test_prerequiste_tasks_returns_tasks_not_strings
- a = task :a => ["b", "c"]
- b = task :b
- c = task :c
- assert_equal [b, c], a.prerequisite_tasks
- end
-
- def test_prerequiste_tasks_fails_if_prerequisites_are_undefined
- a = task :a => ["b", "c"]
- task :b
- assert_raises(RuntimeError) do
- a.prerequisite_tasks
- end
- end
-
- def test_prerequiste_tasks_honors_namespaces
- a = b = nil
- namespace "X" do
- a = task :a => ["b", "c"]
- b = task :b
- end
- c = task :c
-
- assert_equal [b, c], a.prerequisite_tasks
- end
-
- def test_timestamp_returns_now_if_all_prereqs_have_no_times
- a = task :a => ["b", "c"]
- task :b
- task :c
-
- assert_in_delta Time.now, a.timestamp, 0.1, 'computer too slow?'
- end
-
- def test_timestamp_returns_latest_prereq_timestamp
- a = task :a => ["b", "c"]
- b = task :b
- c = task :c
-
- now = Time.now
- def b.timestamp() Time.now + 10 end
- def c.timestamp() Time.now + 5 end
-
- assert_in_delta now + 10, a.timestamp, 0.1, 'computer too slow?'
- end
-
- def test_always_multitask
- mx = Mutex.new
- result = []
-
- t_a = task(:a) do |t|
- sleep 0.02
- mx.synchronize{ result << t.name }
- end
-
- t_b = task(:b) do |t|
- mx.synchronize{ result << t.name }
- end
-
- t_c = task(:c => [:a,:b]) do |t|
- mx.synchronize{ result << t.name }
- end
-
- t_c.invoke
-
- # task should always run in order
- assert_equal ['a', 'b', 'c'], result
-
- [t_a, t_b, t_c].each { |t| t.reenable }
- result.clear
-
- Rake.application.options.always_multitask = true
- t_c.invoke
-
- # with multitask, task 'b' should grab the mutex first
- assert_equal ['b', 'a', 'c'], result
- end
-
- def test_investigation_output
- t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
- task(:t2)
- task(:t3)
- out = t1.investigation
- assert_match(/class:\s*Rake::Task/, out)
- assert_match(/needed:\s*true/, out)
- assert_match(/pre-requisites:\s*--t[23]/, out)
- end
-
-
- def test_extended_comments
- desc %{
- This is a comment.
-
- And this is the extended comment.
- name -- Name of task to execute.
- rev -- Software revision to use.
- }
- t = task(:t, :name, :rev)
- assert_equal "[name,rev]", t.arg_description
- assert_equal "This is a comment.", t.comment
- assert_match(/^\s*name -- Name/, t.full_comment)
- assert_match(/^\s*rev -- Software/, t.full_comment)
- assert_match(/\A\s*This is a comment\.$/, t.full_comment)
- end
-
- def test_multiple_comments
- desc "line one"
- t = task(:t)
- desc "line two"
- task(:t)
- assert_equal "line one / line two", t.comment
- end
-
- def test_settable_comments
- t = task(:t)
- t.comment = "HI"
- assert_equal "HI", t.comment
- end
-end
diff --git a/test/rake/test_rake_task_argument_parsing.rb b/test/rake/test_rake_task_argument_parsing.rb
deleted file mode 100644
index 9b99991de9..0000000000
--- a/test/rake/test_rake_task_argument_parsing.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeTaskArgumentParsing < Rake::TestCase
- def setup
- super
-
- @app = Rake::Application.new
- end
-
- def test_name_only
- name, args = @app.parse_task_string("name")
- assert_equal "name", name
- assert_equal [], args
- end
-
- def test_empty_args
- name, args = @app.parse_task_string("name[]")
- assert_equal "name", name
- assert_equal [], args
- end
-
- def test_one_argument
- name, args = @app.parse_task_string("name[one]")
- assert_equal "name", name
- assert_equal ["one"], args
- end
-
- def test_two_arguments
- name, args = @app.parse_task_string("name[one,two]")
- assert_equal "name", name
- assert_equal ["one", "two"], args
- end
-
- def test_can_handle_spaces_between_args
- name, args = @app.parse_task_string("name[one, two,\tthree , \tfour]")
- assert_equal "name", name
- assert_equal ["one", "two", "three", "four"], args
- end
-
- def test_keeps_embedded_spaces
- name, args = @app.parse_task_string("name[a one ana, two]")
- assert_equal "name", name
- assert_equal ["a one ana", "two"], args
- end
-
- def test_terminal_width_using_env
- app = Rake::Application.new
- app.terminal_columns = 1234
-
- assert_equal 1234, app.terminal_width
- end
-
- def test_terminal_width_using_stty
- def @app.unix?() true end
- def @app.dynamic_width_stty() 1235 end
- def @app.dynamic_width_tput() 0 end
-
- assert_equal 1235, @app.terminal_width
- end
-
- def test_terminal_width_using_tput
- def @app.unix?() true end
- def @app.dynamic_width_stty() 0 end
- def @app.dynamic_width_tput() 1236 end
-
- assert_equal 1236, @app.terminal_width
- end
-
- def test_terminal_width_using_hardcoded_80
- def @app.unix?() false end
-
- assert_equal 80, @app.terminal_width
- end
-
- def test_terminal_width_with_failure
- def @app.unix?() raise end
-
- assert_equal 80, @app.terminal_width
- end
-
- def test_no_rakeopt
- ARGV << '--trace'
- app = Rake::Application.new
- app.init
- assert !app.options.silent
- end
-
- def test_rakeopt_with_blank_options
- ARGV << '--trace'
- app = Rake::Application.new
- app.init
- assert !app.options.silent
- end
-
- def test_rakeopt_with_silent_options
- ENV['RAKEOPT'] = '-s'
- app = Rake::Application.new
-
- app.init
-
- assert app.options.silent
- end
-end
diff --git a/test/rake/test_rake_task_arguments.rb b/test/rake/test_rake_task_arguments.rb
deleted file mode 100644
index 7001a4aeb2..0000000000
--- a/test/rake/test_rake_task_arguments.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-######################################################################
-class TestRakeTaskArguments < Rake::TestCase
- def teardown
- ENV.delete('rev')
- ENV.delete('VER')
-
- super
- end
-
- def test_empty_arg_list_is_empty
- ta = Rake::TaskArguments.new([], [])
- assert_equal({}, ta.to_hash)
- end
-
- def test_multiple_values_in_args
- ta = Rake::TaskArguments.new([:a, :b, :c], [:one, :two, :three])
- assert_equal({:a => :one, :b => :two, :c => :three}, ta.to_hash)
- end
-
- def test_to_s
- ta = Rake::TaskArguments.new([:a, :b, :c], [1, 2, 3])
- assert_equal ta.to_hash.inspect, ta.to_s
- assert_equal ta.to_hash.inspect, ta.inspect
- end
-
- def test_enumerable_behavior
- ta = Rake::TaskArguments.new([:a, :b, :c], [1, 2 ,3])
- assert_equal [10, 20, 30], ta.collect { |k,v| v * 10 }.sort
- end
-
- def test_named_args
- ta = Rake::TaskArguments.new(["aa", "bb"], [1, 2])
- assert_equal 1, ta.aa
- assert_equal 1, ta[:aa]
- assert_equal 1, ta["aa"]
- assert_equal 2, ta.bb
- assert_nil ta.cc
- end
-
- def test_args_knows_its_names
- ta = Rake::TaskArguments.new(["aa", "bb"], [1, 2])
- assert_equal ["aa", "bb"], ta.names
- end
-
- def test_extra_names_are_nil
- ta = Rake::TaskArguments.new(["aa", "bb", "cc"], [1, 2])
- assert_nil ta.cc
- end
-
- def test_args_do_not_reference_env_values
- ta = Rake::TaskArguments.new(["aa"], [1])
- ENV['rev'] = "1.2"
- ENV['VER'] = "2.3"
- assert_nil ta.rev
- assert_nil ta.ver
- end
-
- def test_creating_new_argument_scopes
- parent = Rake::TaskArguments.new(['p'], [1])
- child = parent.new_scope(['c', 'p'])
- assert_equal({:p=>1}, child.to_hash)
- assert_equal 1, child.p
- assert_equal 1, child["p"]
- assert_equal 1, child[:p]
- assert_nil child.c
- end
-
- def test_child_hides_parent_arg_names
- parent = Rake::TaskArguments.new(['aa'], [1])
- child = Rake::TaskArguments.new(['aa'], [2], parent)
- assert_equal 2, child.aa
- end
-
- def test_default_arguments_values_can_be_merged
- ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
- ta.with_defaults({ :aa => 'default_val' })
- assert_equal 'default_val', ta[:aa]
- assert_equal 'original_val', ta[:bb]
- end
-
- def test_default_arguments_that_dont_match_names_are_ignored
- ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
- ta.with_defaults({ "cc" => "default_val" })
- assert_nil ta[:cc]
- end
-end
diff --git a/test/rake/test_rake_task_lib.rb b/test/rake/test_rake_task_lib.rb
deleted file mode 100644
index 9f3f7e9dae..0000000000
--- a/test/rake/test_rake_task_lib.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/tasklib'
-
-class TestRakeTaskLib < Rake::TestCase
- def test_paste
- tl = Rake::TaskLib.new
- assert_equal :ab, tl.paste(:a, :b)
- end
-end
diff --git a/test/rake/test_rake_task_manager.rb b/test/rake/test_rake_task_manager.rb
deleted file mode 100644
index 110ce65d4c..0000000000
--- a/test/rake/test_rake_task_manager.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeTaskManager < Rake::TestCase
-
- def setup
- super
-
- @tm = Rake::TestCase::TaskManager.new
- end
-
- def test_create_task_manager
- refute_nil @tm
- assert_equal [], @tm.tasks
- end
-
- def test_define_task
- t = @tm.define_task(Rake::Task, :t)
- assert_equal "t", t.name
- assert_equal @tm, t.application
- end
-
- def test_index
- e = assert_raises RuntimeError do
- @tm['bad']
- end
-
- assert_equal "Don't know how to build task 'bad'", e.message
- end
-
- def test_name_lookup
- t = @tm.define_task(Rake::Task, :t)
- assert_equal t, @tm[:t]
- end
-
- def test_namespace_task_create
- @tm.in_namespace("x") do
- t = @tm.define_task(Rake::Task, :t)
- assert_equal "x:t", t.name
- end
- assert_equal ["x:t"], @tm.tasks.collect { |t| t.name }
- end
-
- def test_anonymous_namespace
- anon_ns = @tm.in_namespace(nil) do
- t = @tm.define_task(Rake::Task, :t)
- assert_equal "_anon_1:t", t.name
- end
- task = anon_ns[:t]
- assert_equal "_anon_1:t", task.name
- end
-
- def test_create_filetask_in_namespace
- @tm.in_namespace("x") do
- t = @tm.define_task(Rake::FileTask, "fn")
- assert_equal "fn", t.name
- end
-
- assert_equal ["fn"], @tm.tasks.collect { |t| t.name }
- end
-
- def test_namespace_yields_same_namespace_as_returned
- yielded_namespace = nil
- returned_namespace = @tm.in_namespace("x") do |ns|
- yielded_namespace = ns
- end
- assert_equal returned_namespace, yielded_namespace
- end
-
- def test_name_lookup_with_implicit_file_tasks
- FileUtils.touch 'README.rdoc'
-
- t = @tm["README.rdoc"]
-
- assert_equal "README.rdoc", t.name
- assert Rake::FileTask === t
- end
-
- def test_name_lookup_with_nonexistent_task
- assert_raises(RuntimeError) {
- @tm["DOES NOT EXIST"]
- }
- end
-
- def test_name_lookup_in_multiple_scopes
- aa = nil
- bb = nil
- xx = @tm.define_task(Rake::Task, :xx)
- top_z = @tm.define_task(Rake::Task, :z)
- @tm.in_namespace("a") do
- aa = @tm.define_task(Rake::Task, :aa)
- mid_z = @tm.define_task(Rake::Task, :z)
- @tm.in_namespace("b") do
- bb = @tm.define_task(Rake::Task, :bb)
- bot_z = @tm.define_task(Rake::Task, :z)
-
- assert_equal ["a", "b"], @tm.current_scope
-
- assert_equal bb, @tm["a:b:bb"]
- assert_equal aa, @tm["a:aa"]
- assert_equal xx, @tm["xx"]
- assert_equal bot_z, @tm["z"]
- assert_equal mid_z, @tm["^z"]
- assert_equal top_z, @tm["^^z"]
- assert_equal top_z, @tm["rake:z"]
- end
-
- assert_equal ["a"], @tm.current_scope
-
- assert_equal bb, @tm["a:b:bb"]
- assert_equal aa, @tm["a:aa"]
- assert_equal xx, @tm["xx"]
- assert_equal bb, @tm["b:bb"]
- assert_equal aa, @tm["aa"]
- assert_equal mid_z, @tm["z"]
- assert_equal top_z, @tm["^z"]
- assert_equal top_z, @tm["rake:z"]
- end
-
- assert_equal [], @tm.current_scope
-
- assert_equal [], xx.scope
- assert_equal ['a'], aa.scope
- assert_equal ['a', 'b'], bb.scope
- end
-
- def test_lookup_with_explicit_scopes
- t1, t2, t3, s = (0...4).collect { nil }
- t1 = @tm.define_task(Rake::Task, :t)
- @tm.in_namespace("a") do
- t2 = @tm.define_task(Rake::Task, :t)
- s = @tm.define_task(Rake::Task, :s)
- @tm.in_namespace("b") do
- t3 = @tm.define_task(Rake::Task, :t)
- end
- end
- assert_equal t1, @tm[:t, []]
- assert_equal t2, @tm[:t, ["a"]]
- assert_equal t3, @tm[:t, ["a", "b"]]
- assert_equal s, @tm[:s, ["a", "b"]]
- assert_equal s, @tm[:s, ["a"]]
- end
-
- def test_correctly_scoped_prerequisites_are_invoked
- values = []
- @tm = Rake::Application.new
- @tm.define_task(Rake::Task, :z) do values << "top z" end
- @tm.in_namespace("a") do
- @tm.define_task(Rake::Task, :z) do values << "next z" end
- @tm.define_task(Rake::Task, :x => :z)
- end
-
- @tm["a:x"].invoke
- assert_equal ["next z"], values
- end
-
-end
-
diff --git a/test/rake/test_rake_task_manager_argument_resolution.rb b/test/rake/test_rake_task_manager_argument_resolution.rb
deleted file mode 100644
index 35e0862ef7..0000000000
--- a/test/rake/test_rake_task_manager_argument_resolution.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeTaskManagerArgumentResolution < Rake::TestCase
-
- def setup
- super
-
- Rake.application.options.ignore_deprecate = true
- end
-
- def teardown
- Rake.application.options.ignore_deprecate = false
-
- super
- end
-
- def test_good_arg_patterns
- assert_equal [:t, [], []], task(:t)
- assert_equal [:t, [], [:x]], task(:t => :x)
- assert_equal [:t, [], [:x, :y]], task(:t => [:x, :y])
-
- assert_equal [:t, [:a, :b], []], task(:t, :a, :b)
- assert_equal [:t, [], [:x]], task(:t, :needs => :x)
- assert_equal [:t, [:a, :b], [:x]], task(:t, :a, :b, :needs => :x)
- assert_equal [:t, [:a, :b], [:x, :y]], task(:t, :a, :b, :needs => [:x, :y])
-
- assert_equal [:t, [:a, :b], []], task(:t, [:a, :b])
- assert_equal [:t, [:a, :b], [:x]], task(:t, [:a, :b] => :x)
- assert_equal [:t, [:a, :b], [:x, :y]], task(:t, [:a, :b] => [:x, :y])
- end
-
- def task(*args)
- tm = Rake::TestCase::TaskManager.new
- tm.resolve_args(args)
- end
-end
diff --git a/test/rake/test_rake_task_with_arguments.rb b/test/rake/test_rake_task_with_arguments.rb
deleted file mode 100644
index cf4c157256..0000000000
--- a/test/rake/test_rake_task_with_arguments.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeTaskWithArguments < Rake::TestCase
- include Rake
-
- def setup
- super
-
- Task.clear
- Rake::TaskManager.record_task_metadata = true
- end
-
- def teardown
- Rake::TaskManager.record_task_metadata = false
-
- super
- end
-
- def test_no_args_given
- t = task :t
- assert_equal [], t.arg_names
- end
-
- def test_args_given
- t = task :t, :a, :b
- assert_equal [:a, :b], t.arg_names
- end
-
- def test_name_and_needs
- t = task(:t => [:pre])
- assert_equal "t", t.name
- assert_equal [], t.arg_names
- assert_equal ["pre"], t.prerequisites
- end
-
- def test_name_args_and_explicit_needs
- ignore_deprecations do
- t = task(:t, :x, :y, :needs => [:pre])
- assert_equal "t", t.name
- assert_equal [:x, :y], t.arg_names
- assert_equal ["pre"], t.prerequisites
- end
- end
-
- def test_illegal_keys_in_task_name_hash
- ignore_deprecations do
- assert_raises RuntimeError do
- task(:t, :x, :y => 1, :needs => [:pre])
- end
- end
- end
-
- def test_arg_list_is_empty_if_no_args_given
- t = task(:t) { |tt, args| assert_equal({}, args.to_hash) }
- t.invoke(1, 2, 3)
- end
-
- def test_tasks_can_access_arguments_as_hash
- t = task :t, :a, :b, :c do |tt, args|
- assert_equal({:a => 1, :b => 2, :c => 3}, args.to_hash)
- assert_equal 1, args[:a]
- assert_equal 2, args[:b]
- assert_equal 3, args[:c]
- assert_equal 1, args.a
- assert_equal 2, args.b
- assert_equal 3, args.c
- end
- t.invoke(1, 2, 3)
- end
-
- def test_actions_of_various_arity_are_ok_with_args
- notes = []
- t = task(:t, :x) do
- notes << :a
- end
- t.enhance do | |
- notes << :b
- end
- t.enhance do |task|
- notes << :c
- assert_kind_of Task, task
- end
- t.enhance do |t2, args|
- notes << :d
- assert_equal t, t2
- assert_equal({:x => 1}, args.to_hash)
- end
- t.invoke(1)
- assert_equal [:a, :b, :c, :d], notes
- end
-
- def test_arguments_are_passed_to_block
- t = task(:t, :a, :b) { |tt, args|
- assert_equal( { :a => 1, :b => 2 }, args.to_hash )
- }
- t.invoke(1, 2)
- end
-
- def test_extra_parameters_are_ignored
- t = task(:t, :a) { |tt, args|
- assert_equal 1, args.a
- assert_nil args.b
- }
- t.invoke(1, 2)
- end
-
- def test_arguments_are_passed_to_all_blocks
- counter = 0
- t = task :t, :a
- task :t do |tt, args|
- assert_equal 1, args.a
- counter += 1
- end
- task :t do |tt, args|
- assert_equal 1, args.a
- counter += 1
- end
- t.invoke(1)
- assert_equal 2, counter
- end
-
- def test_block_with_no_parameters_is_ok
- t = task(:t) { }
- t.invoke(1, 2)
- end
-
- def test_name_with_args
- desc "T"
- t = task(:tt, :a, :b)
- assert_equal "tt", t.name
- assert_equal "T", t.comment
- assert_equal "[a,b]", t.arg_description
- assert_equal "tt[a,b]", t.name_with_args
- assert_equal [:a, :b],t.arg_names
- end
-
- def test_named_args_are_passed_to_prereqs
- value = nil
- task(:pre, :rev) { |t, args| value = args.rev }
- t = task(:t, [:name, :rev] => [:pre])
- t.invoke("bill", "1.2")
- assert_equal "1.2", value
- end
-
- def test_args_not_passed_if_no_prereq_names_on_task
- task(:pre) { |t, args|
- assert_equal({}, args.to_hash)
- assert_equal "bill", args.name
- }
- t = task(:t, [:name, :rev] => [:pre])
- t.invoke("bill", "1.2")
- end
-
- def test_args_not_passed_if_no_prereq_names_on_multitask
- task(:pre) { |t, args|
- assert_equal({}, args.to_hash)
- assert_equal "bill", args.name
- }
- t = multitask(:t, [:name, :rev] => [:pre])
- t.invoke("bill", "1.2")
- end
-
- def test_args_not_passed_if_no_arg_names
- task(:pre, :rev) { |t, args|
- assert_equal({}, args.to_hash)
- }
- t = task(:t => [:pre])
- t.invoke("bill", "1.2")
- end
-
- def test_values_at
- t = task(:pre, [:a, :b, :c]) { |task, args|
- a, b, c = args.values_at(:a, :b, :c)
- assert_equal %w[1 2 3], [a, b, c]
- }
-
- t.invoke(*%w[1 2 3])
-
- # HACK no assertions
- end
-end
diff --git a/test/rake/test_rake_test_task.rb b/test/rake/test_rake_test_task.rb
deleted file mode 100644
index 1a6d23e425..0000000000
--- a/test/rake/test_rake_test_task.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/testtask'
-
-class TestRakeTestTask < Rake::TestCase
- include Rake
-
- def test_initialize
- tt = Rake::TestTask.new do |t| end
- refute_nil tt
- assert_equal :test, tt.name
- assert_equal ['lib'], tt.libs
- assert_equal 'test/test*.rb', tt.pattern
- assert_equal false, tt.verbose
- assert Task.task_defined?(:test)
- end
-
- def test_initialize_override
- tt = Rake::TestTask.new(:example) do |t|
- t.libs = ['src', 'ext']
- t.pattern = 'test/tc_*.rb'
- t.verbose = true
- end
- refute_nil tt
- assert_equal :example, tt.name
- assert_equal ['src', 'ext'], tt.libs
- assert_equal 'test/tc_*.rb', tt.pattern
- assert_equal true, tt.verbose
- assert Task.task_defined?(:example)
- end
-
- def test_file_list_ENV_TEST
- ENV['TEST'] = 'testfile.rb'
- tt = Rake::TestTask.new do |t|
- t.pattern = '*'
- end
-
- assert_equal ["testfile.rb"], tt.file_list.to_a
- ensure
- ENV.delete 'TEST'
- end
-
- def test_libs_equals
- test_task = Rake::TestTask.new do |t|
- t.libs << ["A", "B"]
- end
-
- path = %w[lib A B].join File::PATH_SEPARATOR
-
- assert_equal "-I\"#{path}\"", test_task.ruby_opts_string
- end
-
- def test_libs_equals_empty
- test_task = Rake::TestTask.new do |t|
- t.libs = []
- end
-
- assert_equal '', test_task.ruby_opts_string
- end
-
- def test_pattern_equals
- tt = Rake::TestTask.new do |t|
- t.pattern = '*.rb'
- end
- assert_equal ['*.rb'], tt.file_list.to_a
- end
-
- def test_pattern_equals_test_files_equals
- tt = Rake::TestTask.new do |t|
- t.test_files = FileList['a.rb', 'b.rb']
- t.pattern = '*.rb'
- end
- assert_equal ['a.rb', 'b.rb', '*.rb'], tt.file_list.to_a
- end
-
- def test_run_code_direct
- test_task = Rake::TestTask.new do |t|
- t.loader = :direct
- end
-
- assert_equal '-e "ARGV.each{|f| require f}"', test_task.run_code
- end
-
- def test_run_code_rake
- test_task = Rake::TestTask.new do |t|
- t.loader = :rake
- end
-
- assert_match(/-I".*?" ".*?"/, test_task.run_code)
- end
-
- def test_run_code_testrb_ruby_1_8_2
- test_task = Rake::TestTask.new do |t|
- t.loader = :testrb
- end
-
- def test_task.ruby_version() '1.8.2' end
-
- assert_match(/^-S testrb +".*"$/, test_task.run_code)
- end
-
- def test_run_code_testrb_ruby_1_8_6
- test_task = Rake::TestTask.new do |t|
- t.loader = :testrb
- end
-
- def test_task.ruby_version() '1.8.6' end
-
- assert_match(/^-S testrb +$/, test_task.run_code)
- end
-
- def test_test_files_equals
- tt = Rake::TestTask.new do |t|
- t.test_files = FileList['a.rb', 'b.rb']
- end
-
- assert_equal ["a.rb", 'b.rb'], tt.file_list.to_a
- end
-
-end
-
diff --git a/test/rake/test_rake_thread_pool.rb b/test/rake/test_rake_thread_pool.rb
deleted file mode 100644
index cc8163a9e0..0000000000
--- a/test/rake/test_rake_thread_pool.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'rake/thread_pool'
-require 'test/unit/assertions'
-
-class TestRakeTestThreadPool < Rake::TestCase
- include Rake
-
- def test_pool_executes_in_current_thread_for_zero_threads
- pool = ThreadPool.new(0)
- f = pool.future{Thread.current}
- pool.join
- assert_equal Thread.current, f.value
- end
-
- def test_pool_executes_in_other_thread_for_pool_of_size_one
- pool = ThreadPool.new(1)
- f = pool.future{Thread.current}
- pool.join
- refute_equal Thread.current, f.value
- end
-
- def test_pool_executes_in_two_other_threads_for_pool_of_size_two
- pool = ThreadPool.new(2)
- threads = 2.times.collect{ pool.future{ sleep 0.1; Thread.current } }.each{|f|f.value}
-
- refute_equal threads[0], threads[1]
- refute_equal Thread.current, threads[0]
- refute_equal Thread.current, threads[1]
- end
-
- def test_pool_creates_the_correct_number_of_threads
- pool = ThreadPool.new(2)
- threads = Set.new
- t_mutex = Mutex.new
- 10.times.each do
- pool.future do
- sleep 0.02
- t_mutex.synchronize{ threads << Thread.current }
- end
- end
- pool.join
- assert_equal 2, threads.count
- end
-
- def test_pool_future_captures_arguments
- pool = ThreadPool.new(2)
- a = 'a'
- b = 'b'
- c = 5 # 5 throws an exception with 5.dup. It should be ignored
- pool.future(a,c){ |a_var,ignore| a_var.capitalize!; b.capitalize! }
- pool.join
- assert_equal 'a', a
- assert_equal 'b'.capitalize, b
- end
-
- def test_pool_join_empties_queue
- pool = ThreadPool.new(2)
- repeat = 25
- repeat.times {
- pool.future do
- repeat.times {
- pool.future do
- repeat.times {
- pool.future do end
- }
- end
- }
- end
- }
-
- pool.join
- assert_equal true, pool.__send__(:__queue__).empty?, "queue should be empty"
- end
-
- # test that throwing an exception way down in the blocks propagates
- # to the top
- def test_exceptions
- pool = ThreadPool.new(10)
-
- deep_exception_block = lambda do |count|
- next raise Exception.new if ( count < 1 )
- pool.future(count-1, &deep_exception_block).value
- end
-
- assert_raises(Exception) do
- pool.future(2, &deep_exception_block).value
- end
-
- end
-
- def test_pool_prevents_deadlock
- pool = ThreadPool.new(5)
-
- common_dependency_a = pool.future { sleep 0.2 }
- futures_a = 10.times.collect { pool.future{ common_dependency_a.value; sleep(rand() * 0.01) } }
-
- common_dependency_b = pool.future { futures_a.each { |f| f.value } }
- futures_b = 10.times.collect { pool.future{ common_dependency_b.value; sleep(rand() * 0.01) } }
-
- futures_b.each{|f|f.value}
- pool.join
- end
-
- def test_pool_reports_correct_results
- pool = ThreadPool.new(7)
-
- a = 18
- b = 5
- c = 3
-
- result = a.times.collect do
- pool.future do
- b.times.collect do
- pool.future { sleep rand * 0.001; c }
- end.inject(0) { |m,f| m+f.value }
- end
- end.inject(0) { |m,f| m+f.value }
-
- assert_equal( (a*b*c), result )
- pool.join
- end
-
-end
diff --git a/test/rake/test_rake_top_level_functions.rb b/test/rake/test_rake_top_level_functions.rb
deleted file mode 100644
index 4cc4b4cfdd..0000000000
--- a/test/rake/test_rake_top_level_functions.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeTopLevelFunctions < Rake::TestCase
-
- def setup
- super
-
- @app = Object.new
-
- def @app.called
- @called
- end
-
- def @app.method_missing(*a, &b)
- @called ||= []
- @called << [a, b]
- nil
- end
-
- Rake.application = @app
- end
-
- def test_namespace
- block = proc do end
-
- namespace("xyz", &block)
-
- expected = [
- [[:in_namespace, 'xyz'], block]
- ]
-
- assert_equal expected, @app.called
- end
-
- def test_import
- import('x', 'y', 'z')
-
- expected = [
- [[:add_import, 'x'], nil],
- [[:add_import, 'y'], nil],
- [[:add_import, 'z'], nil],
- ]
-
- assert_equal expected, @app.called
- end
-
- def test_when_writing
- out, = capture_io do
- when_writing("NOTWRITING") do
- puts "WRITING"
- end
- end
- assert_equal "WRITING\n", out
- end
-
- def test_when_not_writing
- Rake::FileUtilsExt.nowrite_flag = true
- _, err = capture_io do
- when_writing("NOTWRITING") do
- puts "WRITING"
- end
- end
- assert_equal "DRYRUN: NOTWRITING\n", err
- ensure
- Rake::FileUtilsExt.nowrite_flag = false
- end
-
- def test_missing_constants_task
- Object.const_missing(:Task)
-
- expected = [
- [[:const_warning, :Task], nil]
- ]
-
- assert_equal expected, @app.called
- end
-
- def test_missing_constants_file_task
- Object.const_missing(:FileTask)
-
- expected = [
- [[:const_warning, :FileTask], nil]
- ]
-
- assert_equal expected, @app.called
- end
-
- def test_missing_constants_file_creation_task
- Object.const_missing(:FileCreationTask)
-
- expected = [
- [[:const_warning, :FileCreationTask], nil]
- ]
-
- assert_equal expected, @app.called
- end
-
- def test_missing_constants_rake_app
- Object.const_missing(:RakeApp)
-
- expected = [
- [[:const_warning, :RakeApp], nil]
- ]
-
- assert_equal expected, @app.called
- end
-
- def test_missing_other_constant
- assert_raises(NameError) do Object.const_missing(:Xyz) end
- end
-end
diff --git a/test/rake/test_rake_win32.rb b/test/rake/test_rake_win32.rb
deleted file mode 100644
index fc2746a0a1..0000000000
--- a/test/rake/test_rake_win32.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestRakeWin32 < Rake::TestCase
-
- Win32 = Rake::Win32
-
- def test_win32_system_dir_uses_home_if_defined
- ENV['HOME'] = 'C:\\HP'
-
- assert_equal "C:/HP/Rake", Win32.win32_system_dir
- end
-
- def test_win32_system_dir_uses_homedrive_homepath_when_no_home_defined
- ENV['HOME'] = nil
- ENV['HOMEDRIVE'] = 'C:'
- ENV['HOMEPATH'] = '\\HP'
-
- assert_equal "C:/HP/Rake", Win32.win32_system_dir
- end
-
- def test_win32_system_dir_uses_appdata_when_no_home_or_home_combo
- ENV['APPDATA'] = "C:\\Documents and Settings\\HP\\Application Data"
- ENV['HOME'] = nil
- ENV['HOMEDRIVE'] = nil
- ENV['HOMEPATH'] = nil
-
- assert_equal "C:/Documents and Settings/HP/Application Data/Rake",
- Win32.win32_system_dir
- end
-
- def test_win32_system_dir_fallback_to_userprofile_otherwise
- ENV['HOME'] = nil
- ENV['HOMEDRIVE'] = nil
- ENV['HOMEPATH'] = nil
- ENV['APPDATA'] = nil
- ENV['USERPROFILE'] = "C:\\Documents and Settings\\HP"
-
- assert_equal "C:/Documents and Settings/HP/Rake", Win32.win32_system_dir
- end
-
- def test_win32_system_dir_nil_of_no_env_vars
- ENV['APPDATA'] = nil
- ENV['HOME'] = nil
- ENV['HOMEDRIVE'] = nil
- ENV['HOMEPATH'] = nil
- ENV['RAKE_SYSTEM'] = nil
- ENV['USERPROFILE'] = nil
-
- assert_raises(Rake::Win32::Win32HomeError) do
- Win32.win32_system_dir
- end
- end
-
- def test_win32_backtrace_with_different_case
- ex = nil
- begin
- raise 'test exception'
- rescue => ex
- end
-
- ex.set_backtrace ['abc', 'rakefile']
-
- rake = Rake::Application.new
- rake.options.trace = true
- rake.instance_variable_set(:@rakefile, 'Rakefile')
-
- _, err = capture_io { rake.display_error_message(ex) }
-
- assert_match(/rakefile/, err)
- end
-
-end
diff --git a/test/rake/test_rdoc_task.rb b/test/rake/test_rdoc_task.rb
new file mode 100644
index 0000000000..362c2c6800
--- /dev/null
+++ b/test/rake/test_rdoc_task.rb
@@ -0,0 +1,84 @@
+require 'test/unit'
+require 'rake/rdoctask'
+
+class Rake::TestRDocTask < Test::Unit::TestCase
+ include Rake
+
+ def setup
+ Task.clear
+ end
+
+ def test_tasks_creation
+ Rake::RDocTask.new
+ assert Task[:rdoc]
+ assert Task[:clobber_rdoc]
+ assert Task[:rerdoc]
+ end
+
+ def test_tasks_creation_with_custom_name_symbol
+ rd = Rake::RDocTask.new(:rdoc_dev)
+ assert Task[:rdoc_dev]
+ assert Task[:clobber_rdoc_dev]
+ assert Task[:rerdoc_dev]
+ assert_equal :rdoc_dev, rd.name
+ end
+
+ def test_tasks_creation_with_custom_name_string
+ rd = Rake::RDocTask.new("rdoc_dev")
+ assert Task[:rdoc_dev]
+ assert Task[:clobber_rdoc_dev]
+ assert Task[:rerdoc_dev]
+ assert_equal "rdoc_dev", rd.name
+ end
+
+ def test_tasks_creation_with_custom_name_hash
+ options = { :rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force" }
+ rd = Rake::RDocTask.new(options)
+ assert Task[:"rdoc"]
+ assert Task[:"rdoc:clean"]
+ assert Task[:"rdoc:force"]
+ assert_raises(RuntimeError) { Task[:clobber_rdoc] }
+ assert_equal options, rd.name
+ end
+
+ def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
+ rd = Rake::RDocTask.new(:clobber_rdoc => "rdoc:clean")
+ assert Task[:rdoc]
+ assert Task[:"rdoc:clean"]
+ assert Task[:rerdoc]
+ end
+
+ def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
+ assert_raises(ArgumentError) do
+ Rake::RDocTask.new(:foo => "bar")
+ end
+
+ begin
+ Rake::RDocTask.new(:foo => "bar")
+ rescue ArgumentError => e
+ assert_match(/foo/, e.message)
+ end
+ end
+
+ def test_inline_source_is_enabled_by_default
+ rd = Rake::RDocTask.new
+ assert rd.option_list.include?('--inline-source')
+ end
+
+ def test_inline_source_option_is_only_appended_if_option_not_already_given
+ rd = Rake::RDocTask.new
+ rd.options << '--inline-source'
+ assert_equal 1, rd.option_list.grep('--inline-source').size
+
+ rd = Rake::RDocTask.new
+ rd.options << '-S'
+ assert_equal 1, rd.option_list.grep('-S').size
+ assert_equal 0, rd.option_list.grep('--inline-source').size
+ end
+
+ def test_inline_source_option_can_be_disabled
+ rd = Rake::RDocTask.new
+ rd.inline_source = false
+ assert !rd.option_list.include?('--inline-source')
+ end
+end
diff --git a/test/rake/test_require.rb b/test/rake/test_require.rb
new file mode 100644
index 0000000000..8e6e2e9d5b
--- /dev/null
+++ b/test/rake/test_require.rb
@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'rake'
+
+# ====================================================================
+class Rake::TestRequire < Test::Unit::TestCase
+ RakeLibDir = File.dirname(__FILE__) + '/data/rakelib'
+
+ def test_can_load_rake_library
+ app = Rake::Application.new
+ assert app.instance_eval {
+ rake_require("test1", [RakeLibDir], [])
+ }
+ end
+
+ def test_wont_reload_rake_library
+ app = Rake::Application.new
+ assert ! app.instance_eval {
+ rake_require("test2", [RakeLibDir], ['test2'])
+ }
+ end
+
+ def test_throws_error_if_library_not_found
+ app = Rake::Application.new
+ ex = assert_raise(LoadError) {
+ assert app.instance_eval {
+ rake_require("testx", [RakeLibDir], [])
+ }
+ }
+ assert_match(/x/, ex.message)
+ end
+end
+
diff --git a/test/rake/test_rules.rb b/test/rake/test_rules.rb
new file mode 100644
index 0000000000..34df180ff4
--- /dev/null
+++ b/test/rake/test_rules.rb
@@ -0,0 +1,352 @@
+require 'test/unit'
+require 'tmpdir'
+require 'fileutils'
+require 'rake'
+require_relative 'filecreation'
+
+######################################################################
+class Rake::TestRules < Test::Unit::TestCase
+ include Rake
+ include FileCreation
+
+ SRCFILE = "testdata/abc.c"
+ SRCFILE2 = "testdata/xyz.c"
+ FTNFILE = "testdata/abc.f"
+ OBJFILE = "testdata/abc.o"
+ FOOFILE = "testdata/foo"
+ DOTFOOFILE = "testdata/.foo"
+
+ def setup
+ @oldpwd = Dir.pwd
+ @tmpdir = Dir.mktmpdir("rake")
+ Dir.chdir(@tmpdir)
+ Dir.mkdir("testdata")
+ Task.clear
+ @runs = []
+ end
+
+ def teardown
+ FileList['testdata/{*,.[^.]*,}'].uniq.each do |f| rm_r(f, :verbose=>false) end
+ Dir.chdir(@oldpwd)
+ Dir.rmdir(@tmpdir)
+ end
+
+ def test_multiple_rules1
+ create_file(FTNFILE)
+ delete_file(SRCFILE)
+ delete_file(OBJFILE)
+ rule(/\.o$/ => ['.c']) do @runs << :C end
+ rule(/\.o$/ => ['.f']) do @runs << :F end
+ t = Task[OBJFILE]
+ t.invoke
+ Task[OBJFILE].invoke
+ assert_equal [:F], @runs
+ end
+
+ def test_multiple_rules2
+ create_file(FTNFILE)
+ delete_file(SRCFILE)
+ delete_file(OBJFILE)
+ rule(/\.o$/ => ['.f']) do @runs << :F end
+ rule(/\.o$/ => ['.c']) do @runs << :C end
+ Task[OBJFILE].invoke
+ assert_equal [:F], @runs
+ end
+
+ def test_create_with_source
+ create_file(SRCFILE)
+ rule(/\.o$/ => ['.c']) do |t|
+ @runs << t.name
+ assert_equal OBJFILE, t.name
+ assert_equal SRCFILE, t.source
+ end
+ Task[OBJFILE].invoke
+ assert_equal [OBJFILE], @runs
+ end
+
+ def test_single_dependent
+ create_file(SRCFILE)
+ rule(/\.o$/ => '.c') do |t|
+ @runs << t.name
+ end
+ Task[OBJFILE].invoke
+ assert_equal [OBJFILE], @runs
+ end
+
+ def test_rule_can_be_created_by_string
+ create_file(SRCFILE)
+ rule '.o' => ['.c'] do |t|
+ @runs << t.name
+ end
+ Task[OBJFILE].invoke
+ assert_equal [OBJFILE], @runs
+ end
+
+ def test_rule_prereqs_can_be_created_by_string
+ create_file(SRCFILE)
+ rule '.o' => '.c' do |t|
+ @runs << t.name
+ end
+ Task[OBJFILE].invoke
+ assert_equal [OBJFILE], @runs
+ end
+
+ def test_plain_strings_as_dependents_refer_to_files
+ create_file(SRCFILE)
+ rule '.o' => SRCFILE do |t|
+ @runs << t.name
+ end
+ Task[OBJFILE].invoke
+ assert_equal [OBJFILE], @runs
+ end
+
+ def test_file_names_beginning_with_dot_can_be_tricked_into_refering_to_file
+ verbose(false) do
+ chdir("testdata") do
+ create_file('.foo')
+ rule '.o' => "./.foo" do |t|
+ @runs << t.name
+ end
+ Task[OBJFILE].invoke
+ assert_equal [OBJFILE], @runs
+ end
+ end
+ end
+
+ def test_file_names_beginning_with_dot_can_be_wrapped_in_lambda
+ verbose(false) do
+ chdir("testdata") do
+ create_file(".foo")
+ rule '.o' => lambda{".foo"} do |t|
+ @runs << "#{t.name} - #{t.source}"
+ end
+ Task[OBJFILE].invoke
+ assert_equal ["#{OBJFILE} - .foo"], @runs
+ end
+ end
+ end
+
+ def test_file_names_containing_percent_can_be_wrapped_in_lambda
+ verbose(false) do
+ chdir("testdata") do
+ create_file("foo%x")
+ rule '.o' => lambda{"foo%x"} do |t|
+ @runs << "#{t.name} - #{t.source}"
+ end
+ Task[OBJFILE].invoke
+ assert_equal ["#{OBJFILE} - foo%x"], @runs
+ end
+ end
+ end
+
+ def test_non_extension_rule_name_refers_to_file
+ verbose(false) do
+ chdir("testdata") do
+ create_file("abc.c")
+ rule "abc" => '.c' do |t|
+ @runs << t.name
+ end
+ Task["abc"].invoke
+ assert_equal ["abc"], @runs
+ end
+ end
+ end
+
+ def test_pathmap_automatically_applies_to_name
+ verbose(false) do
+ chdir("testdata") do
+ create_file("zzabc.c")
+ rule ".o" => 'zz%{x,a}n.c' do |t|
+ @runs << "#{t.name} - #{t.source}"
+ end
+ Task["xbc.o"].invoke
+ assert_equal ["xbc.o - zzabc.c"], @runs
+ end
+ end
+ end
+
+ def test_plain_strings_are_just_filenames
+ verbose(false) do
+ chdir("testdata") do
+ create_file("plainname")
+ rule ".o" => 'plainname' do |t|
+ @runs << "#{t.name} - #{t.source}"
+ end
+ Task["xbc.o"].invoke
+ assert_equal ["xbc.o - plainname"], @runs
+ end
+ end
+ end
+
+ def test_rule_runs_when_explicit_task_has_no_actions
+ create_file(SRCFILE)
+ create_file(SRCFILE2)
+ delete_file(OBJFILE)
+ rule '.o' => '.c' do |t|
+ @runs << t.source
+ end
+ file OBJFILE => [SRCFILE2]
+ Task[OBJFILE].invoke
+ assert_equal [SRCFILE], @runs
+ end
+
+ def test_close_matches_on_name_do_not_trigger_rule
+ create_file("testdata/x.c")
+ rule '.o' => ['.c'] do |t|
+ @runs << t.name
+ end
+ assert_raise(RuntimeError) { Task['testdata/x.obj'].invoke }
+ assert_raise(RuntimeError) { Task['testdata/x.xyo'].invoke }
+ end
+
+ def test_rule_rebuilds_obj_when_source_is_newer
+ create_timed_files(OBJFILE, SRCFILE)
+ rule(/\.o$/ => ['.c']) do
+ @runs << :RULE
+ end
+ Task[OBJFILE].invoke
+ assert_equal [:RULE], @runs
+ end
+
+ def test_rule_with_two_sources_runs_if_both_sources_are_present
+ create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
+ rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
+ @runs << :RULE
+ end
+ Task[OBJFILE].invoke
+ assert_equal [:RULE], @runs
+ end
+
+ def test_rule_with_two_sources_but_one_missing_does_not_run
+ create_timed_files(OBJFILE, SRCFILE)
+ delete_file(SRCFILE2)
+ rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
+ @runs << :RULE
+ end
+ Task[OBJFILE].invoke
+ assert_equal [], @runs
+ end
+
+ def test_rule_with_two_sources_builds_both_sources
+ task 'x.aa'
+ task 'x.bb'
+ rule '.a' => '.aa' do
+ @runs << "A"
+ end
+ rule '.b' => '.bb' do
+ @runs << "B"
+ end
+ rule ".c" => ['.a', '.b'] do
+ @runs << "C"
+ end
+ Task["x.c"].invoke
+ assert_equal ["A", "B", "C"], @runs.sort
+ end
+
+ def test_second_rule_runs_when_first_rule_doesnt
+ create_timed_files(OBJFILE, SRCFILE)
+ delete_file(SRCFILE2)
+ rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
+ @runs << :RULE1
+ end
+ rule OBJFILE => [lambda{SRCFILE}] do
+ @runs << :RULE2
+ end
+ Task[OBJFILE].invoke
+ assert_equal [:RULE2], @runs
+ end
+
+ def test_second_rule_doest_run_if_first_triggers
+ create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
+ rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
+ @runs << :RULE1
+ end
+ rule OBJFILE => [lambda{SRCFILE}] do
+ @runs << :RULE2
+ end
+ Task[OBJFILE].invoke
+ assert_equal [:RULE1], @runs
+ end
+
+ def test_second_rule_doest_run_if_first_triggers_with_reversed_rules
+ create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
+ rule OBJFILE => [lambda{SRCFILE}] do
+ @runs << :RULE1
+ end
+ rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
+ @runs << :RULE2
+ end
+ Task[OBJFILE].invoke
+ assert_equal [:RULE1], @runs
+ end
+
+ def test_rule_with_proc_dependent_will_trigger
+ ran = false
+ mkdir_p("testdata/src/jw")
+ create_file("testdata/src/jw/X.java")
+ rule %r(classes/.*\.class) => [
+ proc { |fn| fn.pathmap("%{classes,testdata/src}d/%n.java") }
+ ] do |task|
+ assert_equal task.name, 'classes/jw/X.class'
+ assert_equal task.source, 'testdata/src/jw/X.java'
+ @runs << :RULE
+ end
+ Task['classes/jw/X.class'].invoke
+ assert_equal [:RULE], @runs
+ ensure
+ rm_r("testdata/src", :verbose=>false) rescue nil
+ end
+
+ def test_proc_returning_lists_are_flattened_into_prereqs
+ ran = false
+ mkdir_p("testdata/flatten")
+ create_file("testdata/flatten/a.txt")
+ task 'testdata/flatten/b.data' do |t|
+ ran = true
+ touch t.name, :verbose => false
+ end
+ rule '.html' =>
+ proc { |fn|
+ [
+ fn.ext("txt"),
+ "testdata/flatten/b.data"
+ ]
+ } do |task|
+ end
+ Task['testdata/flatten/a.html'].invoke
+ assert ran, "Should have triggered flattened dependency"
+ ensure
+ rm_r("testdata/flatten", :verbose=>false) rescue nil
+ end
+
+ def test_recursive_rules_will_work_as_long_as_they_terminate
+ actions = []
+ create_file("testdata/abc.xml")
+ rule '.y' => '.xml' do actions << 'y' end
+ rule '.c' => '.y' do actions << 'c'end
+ rule '.o' => '.c' do actions << 'o'end
+ rule '.exe' => '.o' do actions << 'exe'end
+ Task["testdata/abc.exe"].invoke
+ assert_equal ['y', 'c', 'o', 'exe'], actions
+ end
+
+ def test_recursive_rules_that_dont_terminate_will_overflow
+ create_file("testdata/a.a")
+ prev = 'a'
+ ('b'..'z').each do |letter|
+ rule ".#{letter}" => ".#{prev}" do |t| puts "#{t.name}" end
+ prev = letter
+ end
+ ex = assert_raise(Rake::RuleRecursionOverflowError) {
+ Task["testdata/a.z"].invoke
+ }
+ assert_match(/a\.z => testdata\/a.y/, ex.message)
+ end
+
+ def test_rules_with_bad_dependents_will_fail
+ rule "a" => [ 1 ] do |t| puts t.name end
+ assert_raise(RuntimeError) do Task['a'].invoke end
+ end
+
+end
+
diff --git a/test/rake/test_sys.rb b/test/rake/test_sys.rb
deleted file mode 100644
index 21f7e2c708..0000000000
--- a/test/rake/test_sys.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-begin
- old_verbose = $VERBOSE
- $VERBOSE = nil
- require 'rake/contrib/sys'
-ensure
- $VERBOSE = old_verbose
-end
-
-class TestSys < Rake::TestCase
-
- def test_split_all
- assert_equal ['a'], Sys.split_all('a')
- assert_equal ['..'], Sys.split_all('..')
- assert_equal ['/'], Sys.split_all('/')
- assert_equal ['a', 'b'], Sys.split_all('a/b')
- assert_equal ['/', 'a', 'b'], Sys.split_all('/a/b')
- assert_equal ['..', 'a', 'b'], Sys.split_all('../a/b')
- end
-end
diff --git a/test/rake/test_task_arguments.rb b/test/rake/test_task_arguments.rb
new file mode 100644
index 0000000000..d40144f3fd
--- /dev/null
+++ b/test/rake/test_task_arguments.rb
@@ -0,0 +1,92 @@
+require 'test/unit'
+require 'rake'
+
+######################################################################
+class Rake::TestTaskArguments < Test::Unit::TestCase
+ def setup
+ @backup = ENV.to_hash
+ ENV.clear
+ end
+
+ def teardown
+ ENV.clear
+ @backup.each {|k, v| ENV[k] = v }
+ end
+
+ def test_empty_arg_list_is_empty
+ ta = Rake::TaskArguments.new([], [])
+ assert_equal({}, ta.to_hash)
+ end
+
+ def test_multiple_values_in_args
+ ta = Rake::TaskArguments.new([:a, :b, :c], [:one, :two, :three])
+ assert_equal({:a => :one, :b => :two, :c => :three}, ta.to_hash)
+ end
+
+ def test_to_s
+ ta = Rake::TaskArguments.new([:a, :b, :c], [1, 2, 3])
+ assert_equal ta.to_hash.inspect, ta.to_s
+ assert_equal ta.to_hash.inspect, ta.inspect
+ end
+
+ def test_enumerable_behavior
+ ta = Rake::TaskArguments.new([:a, :b, :c], [1, 2 ,3])
+ assert_equal [10, 20, 30], ta.collect { |k,v| v * 10 }.sort
+ end
+
+ def test_named_args
+ ta = Rake::TaskArguments.new(["aa", "bb"], [1, 2])
+ assert_equal 1, ta.aa
+ assert_equal 1, ta[:aa]
+ assert_equal 1, ta["aa"]
+ assert_equal 2, ta.bb
+ assert_nil ta.cc
+ end
+
+ def test_args_knows_its_names
+ ta = Rake::TaskArguments.new(["aa", "bb"], [1, 2])
+ assert_equal ["aa", "bb"], ta.names
+ end
+
+ def test_extra_names_are_nil
+ ta = Rake::TaskArguments.new(["aa", "bb", "cc"], [1, 2])
+ assert_nil ta.cc
+ end
+
+ def test_args_can_reference_env_values
+ ta = Rake::TaskArguments.new(["aa"], [1])
+ ENV['rev'] = "1.2"
+ ENV['VER'] = "2.3"
+ assert_equal "1.2", ta.rev
+ assert_equal "2.3", ta.ver
+ end
+
+ def test_creating_new_argument_scopes
+ parent = Rake::TaskArguments.new(['p'], [1])
+ child = parent.new_scope(['c', 'p'])
+ assert_equal({:p=>1}, child.to_hash)
+ assert_equal 1, child.p
+ assert_equal 1, child["p"]
+ assert_equal 1, child[:p]
+ assert_nil child.c
+ end
+
+ def test_child_hides_parent_arg_names
+ parent = Rake::TaskArguments.new(['aa'], [1])
+ child = Rake::TaskArguments.new(['aa'], [2], parent)
+ assert_equal 2, child.aa
+ end
+
+ def test_default_arguments_values_can_be_merged
+ ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
+ ta.with_defaults({ :aa => 'default_val' })
+ assert_equal 'default_val', ta[:aa]
+ assert_equal 'original_val', ta[:bb]
+ end
+
+ def test_default_arguements_that_dont_match_names_are_ignored
+ ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
+ ta.with_defaults({ "cc" => "default_val" })
+ assert_nil ta[:cc]
+ end
+end
diff --git a/test/rake/test_task_manager.rb b/test/rake/test_task_manager.rb
new file mode 100644
index 0000000000..1e92e25fbf
--- /dev/null
+++ b/test/rake/test_task_manager.rb
@@ -0,0 +1,181 @@
+require 'test/unit'
+require 'fileutils'
+require 'tmpdir'
+require 'rake'
+
+class Rake::TestTaskManager < Test::Unit::TestCase
+ class TaskManager
+ include Rake::TaskManager
+ end
+
+ def setup
+ @oldpwd = Dir.pwd
+ @tmpdir = Dir.mktmpdir("rake")
+ Dir.chdir(@tmpdir)
+ @tm = TaskManager.new
+ open("README", "wb") {}
+ end
+
+ def teardown
+ Dir.chdir(@oldpwd)
+ FileUtils.rm_rf(@tmpdir)
+ end
+
+ def test_create_task_manager
+ assert_not_nil @tm
+ assert_equal [], @tm.tasks
+ end
+
+ def test_define_task
+ t = @tm.define_task(Rake::Task, :t)
+ assert_equal "t", t.name
+ assert_equal @tm, t.application
+ end
+
+ def test_name_lookup
+ t = @tm.define_task(Rake::Task, :t)
+ assert_equal t, @tm[:t]
+ end
+
+ def test_namespace_task_create
+ @tm.in_namespace("x") do
+ t = @tm.define_task(Rake::Task, :t)
+ assert_equal "x:t", t.name
+ end
+ assert_equal ["x:t"], @tm.tasks.collect { |t| t.name }
+ end
+
+ def test_anonymous_namespace
+ anon_ns = @tm.in_namespace(nil) do
+ t = @tm.define_task(Rake::Task, :t)
+ assert_equal "_anon_1:t", t.name
+ end
+ task = anon_ns[:t]
+ assert_equal "_anon_1:t", task.name
+ end
+
+ def test_create_filetask_in_namespace
+ @tm.in_namespace("x") do
+ t = @tm.define_task(Rake::FileTask, "fn")
+ assert_equal "fn", t.name
+ end
+ assert_equal ["fn"], @tm.tasks.collect { |t| t.name }
+ end
+
+ def test_namespace_yields_same_namespace_as_returned
+ yielded_namespace = nil
+ returned_namespace = @tm.in_namespace("x") do |ns|
+ yielded_namespace = ns
+ end
+ assert_equal returned_namespace, yielded_namespace
+ end
+
+ def test_name_lookup_with_implicit_file_tasks
+ t = @tm["README"]
+ assert_equal "README", t.name
+ assert Rake::FileTask === t
+ end
+
+ def test_name_lookup_with_nonexistent_task
+ assert_raise(RuntimeError) {
+ t = @tm["DOES NOT EXIST"]
+ }
+ end
+
+ def test_name_lookup_in_multiple_scopes
+ aa = nil
+ bb = nil
+ xx = @tm.define_task(Rake::Task, :xx)
+ top_z = @tm.define_task(Rake::Task, :z)
+ @tm.in_namespace("a") do
+ aa = @tm.define_task(Rake::Task, :aa)
+ mid_z = @tm.define_task(Rake::Task, :z)
+ @tm.in_namespace("b") do
+ bb = @tm.define_task(Rake::Task, :bb)
+ bot_z = @tm.define_task(Rake::Task, :z)
+
+ assert_equal ["a", "b"], @tm.current_scope
+
+ assert_equal bb, @tm["a:b:bb"]
+ assert_equal aa, @tm["a:aa"]
+ assert_equal xx, @tm["xx"]
+ assert_equal bot_z, @tm["z"]
+ assert_equal mid_z, @tm["^z"]
+ assert_equal top_z, @tm["^^z"]
+ assert_equal top_z, @tm["rake:z"]
+ end
+
+ assert_equal ["a"], @tm.current_scope
+
+ assert_equal bb, @tm["a:b:bb"]
+ assert_equal aa, @tm["a:aa"]
+ assert_equal xx, @tm["xx"]
+ assert_equal bb, @tm["b:bb"]
+ assert_equal aa, @tm["aa"]
+ assert_equal mid_z, @tm["z"]
+ assert_equal top_z, @tm["^z"]
+ assert_equal top_z, @tm["rake:z"]
+ end
+
+ assert_equal [], @tm.current_scope
+
+ assert_equal [], xx.scope
+ assert_equal ['a'], aa.scope
+ assert_equal ['a', 'b'], bb.scope
+ end
+
+ def test_lookup_with_explicit_scopes
+ t1, t2, t3, s = (0...4).collect { nil }
+ t1 = @tm.define_task(Rake::Task, :t)
+ @tm.in_namespace("a") do
+ t2 = @tm.define_task(Rake::Task, :t)
+ s = @tm.define_task(Rake::Task, :s)
+ @tm.in_namespace("b") do
+ t3 = @tm.define_task(Rake::Task, :t)
+ end
+ end
+ assert_equal t1, @tm[:t, []]
+ assert_equal t2, @tm[:t, ["a"]]
+ assert_equal t3, @tm[:t, ["a", "b"]]
+ assert_equal s, @tm[:s, ["a", "b"]]
+ assert_equal s, @tm[:s, ["a"]]
+ end
+
+ def test_correctly_scoped_prerequisites_are_invoked
+ values = []
+ @tm = Rake::Application.new
+ @tm.define_task(Rake::Task, :z) do values << "top z" end
+ @tm.in_namespace("a") do
+ @tm.define_task(Rake::Task, :z) do values << "next z" end
+ @tm.define_task(Rake::Task, :x => :z)
+ end
+
+ @tm["a:x"].invoke
+ assert_equal ["next z"], values
+ end
+
+end
+
+class Rake::TestTaskManagerArgumentResolution < Test::Unit::TestCase
+ TaskManager = Rake::TestTaskManager::TaskManager
+
+ def test_good_arg_patterns
+ assert_equal [:t, [], []], task(:t)
+ assert_equal [:t, [], [:x]], task(:t => :x)
+ assert_equal [:t, [], [:x, :y]], task(:t => [:x, :y])
+
+ assert_equal [:t, [:a, :b], []], task(:t, :a, :b)
+ assert_equal [:t, [], [:x]], task(:t, :needs => :x)
+ assert_equal [:t, [:a, :b], [:x]], task(:t, :a, :b, :needs => :x)
+ assert_equal [:t, [:a, :b], [:x, :y]], task(:t, :a, :b, :needs => [:x, :y])
+
+ assert_equal [:t, [:a, :b], []], task(:t, [:a, :b])
+ assert_equal [:t, [:a, :b], [:x]], task(:t, [:a, :b] => :x)
+ assert_equal [:t, [:a, :b], [:x, :y]], task(:t, [:a, :b] => [:x, :y])
+ end
+
+ def task(*args)
+ tm = TaskManager.new
+ tm.resolve_args(args)
+ end
+end
diff --git a/test/rake/test_tasklib.rb b/test/rake/test_tasklib.rb
new file mode 100644
index 0000000000..c8b9cecdb2
--- /dev/null
+++ b/test/rake/test_tasklib.rb
@@ -0,0 +1,10 @@
+require 'test/unit'
+require 'rake/tasklib'
+
+
+class Rake::TestTaskLib < Test::Unit::TestCase
+ def test_paste
+ tl = Rake::TaskLib.new
+ assert_equal :ab, tl.paste(:a, :b)
+ end
+end
diff --git a/test/rake/test_tasks.rb b/test/rake/test_tasks.rb
new file mode 100644
index 0000000000..a042ec4fc2
--- /dev/null
+++ b/test/rake/test_tasks.rb
@@ -0,0 +1,369 @@
+require 'test/unit'
+require 'fileutils'
+require 'rake'
+require_relative 'filecreation'
+require_relative 'capture_stdout'
+
+######################################################################
+class Rake::TestTasks < Test::Unit::TestCase
+ include CaptureStdout
+ include Rake
+
+ def setup
+ Task.clear
+ end
+
+ def test_create
+ arg = nil
+ t = task(:name) { |task| arg = task; 1234 }
+ assert_equal "name", t.name
+ assert_equal [], t.prerequisites
+ assert t.needed?
+ t.execute(0)
+ assert_equal t, arg
+ assert_nil t.source
+ assert_equal [], t.sources
+ end
+
+ def test_inspect
+ t = task(:foo, :needs => [:bar, :baz])
+ assert_equal "<Rake::Task foo => [bar, baz]>", t.inspect
+ end
+
+ def test_invoke
+ runlist = []
+ t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
+ t2 = task(:t2) { |t| runlist << t.name }
+ t3 = task(:t3) { |t| runlist << t.name }
+ assert_equal ["t2", "t3"], t1.prerequisites
+ t1.invoke
+ assert_equal ["t2", "t3", "t1"], runlist
+ end
+
+ def test_invoke_with_circular_dependencies
+ runlist = []
+ t1 = task(:t1 => [:t2]) { |t| runlist << t.name; 3321 }
+ t2 = task(:t2 => [:t1]) { |t| runlist << t.name }
+ assert_equal ["t2"], t1.prerequisites
+ assert_equal ["t1"], t2.prerequisites
+ ex = assert_raise RuntimeError do
+ t1.invoke
+ end
+ assert_match(/circular dependency/i, ex.message)
+ assert_match(/t1 => t2 => t1/, ex.message)
+ end
+
+ def test_dry_run_prevents_actions
+ Rake.application.options.dryrun = true
+ runlist = []
+ t1 = task(:t1) { |t| runlist << t.name; 3321 }
+ out = capture_stdout { t1.invoke }
+ assert_match(/execute .*t1/i, out)
+ assert_match(/dry run/i, out)
+ assert_no_match(/invoke/i, out)
+ assert_equal [], runlist
+ ensure
+ Rake.application.options.dryrun = false
+ end
+
+ def test_tasks_can_be_traced
+ Rake.application.options.trace = true
+ t1 = task(:t1)
+ out = capture_stdout {
+ t1.invoke
+ }
+ assert_match(/invoke t1/i, out)
+ assert_match(/execute t1/i, out)
+ ensure
+ Rake.application.options.trace = false
+ end
+
+ def test_no_double_invoke
+ runlist = []
+ t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
+ t2 = task(:t2 => [:t3]) { |t| runlist << t.name }
+ t3 = task(:t3) { |t| runlist << t.name }
+ t1.invoke
+ assert_equal ["t3", "t2", "t1"], runlist
+ end
+
+ def test_can_double_invoke_with_reenable
+ runlist = []
+ t1 = task(:t1) { |t| runlist << t.name }
+ t1.invoke
+ t1.reenable
+ t1.invoke
+ assert_equal ["t1", "t1"], runlist
+ end
+
+ def test_clear
+ t = task("t" => "a") { }
+ t.clear
+ assert t.prerequisites.empty?, "prerequisites should be empty"
+ assert t.actions.empty?, "actions should be empty"
+ end
+
+ def test_clear_prerequisites
+ t = task("t" => ["a", "b"])
+ assert_equal ['a', 'b'], t.prerequisites
+ t.clear_prerequisites
+ assert_equal [], t.prerequisites
+ end
+
+ def test_clear_actions
+ t = task("t") { }
+ t.clear_actions
+ assert t.actions.empty?, "actions should be empty"
+ end
+
+ def test_find
+ task :tfind
+ assert_equal "tfind", Task[:tfind].name
+ ex = assert_raise(RuntimeError) { Task[:leaves] }
+ assert_equal "Don't know how to build task 'leaves'", ex.message
+ end
+
+ def test_defined
+ assert ! Task.task_defined?(:a)
+ task :a
+ assert Task.task_defined?(:a)
+ end
+
+ def test_multi_invocations
+ runs = []
+ p = proc do |t| runs << t.name end
+ task({:t1=>[:t2,:t3]}, &p)
+ task({:t2=>[:t3]}, &p)
+ task(:t3, &p)
+ Task[:t1].invoke
+ assert_equal ["t1", "t2", "t3"], runs.sort
+ end
+
+ def test_task_list
+ task :t2
+ task :t1 => [:t2]
+ assert_equal ["t1", "t2"], Task.tasks.collect {|t| t.name}
+ end
+
+ def test_task_gives_name_on_to_s
+ task :abc
+ assert_equal "abc", Task[:abc].to_s
+ end
+
+ def test_symbols_can_be_prerequisites
+ task :a => :b
+ assert_equal ["b"], Task[:a].prerequisites
+ end
+
+ def test_strings_can_be_prerequisites
+ task :a => "b"
+ assert_equal ["b"], Task[:a].prerequisites
+ end
+
+ def test_arrays_can_be_prerequisites
+ task :a => ["b", "c"]
+ assert_equal ["b", "c"], Task[:a].prerequisites
+ end
+
+ def test_filelists_can_be_prerequisites
+ task :a => FileList.new.include("b", "c")
+ assert_equal ["b", "c"], Task[:a].prerequisites
+ end
+
+ def test_investigation_output
+ t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
+ task(:t2)
+ task(:t3)
+ out = t1.investigation
+ assert_match(/class:\s*Rake::Task/, out)
+ assert_match(/needed:\s*true/, out)
+ assert_match(/pre-requisites:\s*--t[23]/, out)
+ end
+
+
+ def test_extended_comments
+ desc %{
+ This is a comment.
+
+ And this is the extended comment.
+ name -- Name of task to execute.
+ rev -- Software revision to use.
+ }
+ t = task(:t, :name, :rev)
+ assert_equal "[name,rev]", t.arg_description
+ assert_equal "This is a comment.", t.comment
+ assert_match(/^\s*name -- Name/, t.full_comment)
+ assert_match(/^\s*rev -- Software/, t.full_comment)
+ assert_match(/\A\s*This is a comment\.$/, t.full_comment)
+ end
+
+ def test_multiple_comments
+ desc "line one"
+ t = task(:t)
+ desc "line two"
+ task(:t)
+ assert_equal "line one / line two", t.comment
+ end
+
+ def test_settable_comments
+ t = task(:t)
+ t.comment = "HI"
+ assert_equal "HI", t.comment
+ end
+end
+
+######################################################################
+class Rake::TestTaskWithArguments < Test::Unit::TestCase
+ include CaptureStdout
+ include Rake
+
+ def setup
+ Task.clear
+ end
+
+ def test_no_args_given
+ t = task :t
+ assert_equal [], t.arg_names
+ end
+
+ def test_args_given
+ t = task :t, :a, :b
+ assert_equal [:a, :b], t.arg_names
+ end
+
+ def test_name_and_needs
+ t = task(:t => [:pre])
+ assert_equal "t", t.name
+ assert_equal [], t.arg_names
+ assert_equal ["pre"], t.prerequisites
+ end
+
+ def test_name_and_explicit_needs
+ t = task(:t, :needs => [:pre])
+ assert_equal "t", t.name
+ assert_equal [], t.arg_names
+ assert_equal ["pre"], t.prerequisites
+ end
+
+ def test_name_args_and_explicit_needs
+ t = task(:t, :x, :y, :needs => [:pre])
+ assert_equal "t", t.name
+ assert_equal [:x, :y], t.arg_names
+ assert_equal ["pre"], t.prerequisites
+ end
+
+ def test_illegal_keys_in_task_name_hash
+ assert_raise RuntimeError do
+ t = task(:t, :x, :y => 1, :needs => [:pre])
+ end
+ end
+
+ def test_arg_list_is_empty_if_no_args_given
+ t = task(:t) { |tt, args| assert_equal({}, args.to_hash) }
+ t.invoke(1, 2, 3)
+ end
+
+ def test_tasks_can_access_arguments_as_hash
+ t = task :t, :a, :b, :c do |tt, args|
+ assert_equal({:a => 1, :b => 2, :c => 3}, args.to_hash)
+ assert_equal 1, args[:a]
+ assert_equal 2, args[:b]
+ assert_equal 3, args[:c]
+ assert_equal 1, args.a
+ assert_equal 2, args.b
+ assert_equal 3, args.c
+ end
+ t.invoke(1, 2, 3)
+ end
+
+ def test_actions_of_various_arity_are_ok_with_args
+ notes = []
+ t = task(:t, :x) do
+ notes << :a
+ end
+ t.enhance do | |
+ notes << :b
+ end
+ t.enhance do |task|
+ notes << :c
+ assert_kind_of Task, task
+ end
+ t.enhance do |t2, args|
+ notes << :d
+ assert_equal t, t2
+ assert_equal({:x => 1}, args.to_hash)
+ end
+ assert_nothing_raised do t.invoke(1) end
+ assert_equal [:a, :b, :c, :d], notes
+ end
+
+ def test_arguments_are_passed_to_block
+ t = task(:t, :a, :b) { |tt, args|
+ assert_equal( { :a => 1, :b => 2 }, args.to_hash )
+ }
+ t.invoke(1, 2)
+ end
+
+ def test_extra_parameters_are_ignored
+ t = task(:t, :a) { |tt, args|
+ assert_equal 1, args.a
+ assert_nil args.b
+ }
+ t.invoke(1, 2)
+ end
+
+ def test_arguments_are_passed_to_all_blocks
+ counter = 0
+ t = task :t, :a
+ task :t do |tt, args|
+ assert_equal 1, args.a
+ counter += 1
+ end
+ task :t do |tt, args|
+ assert_equal 1, args.a
+ counter += 1
+ end
+ t.invoke(1)
+ assert_equal 2, counter
+ end
+
+ def test_block_with_no_parameters_is_ok
+ t = task(:t) { }
+ t.invoke(1, 2)
+ end
+
+ def test_name_with_args
+ desc "T"
+ t = task(:tt, :a, :b)
+ assert_equal "tt", t.name
+ assert_equal "T", t.comment
+ assert_equal "[a,b]", t.arg_description
+ assert_equal "tt[a,b]", t.name_with_args
+ assert_equal [:a, :b],t.arg_names
+ end
+
+ def test_named_args_are_passed_to_prereqs
+ value = nil
+ pre = task(:pre, :rev) { |t, args| value = args.rev }
+ t = task(:t, :name, :rev, :needs => [:pre])
+ t.invoke("bill", "1.2")
+ assert_equal "1.2", value
+ end
+
+ def test_args_not_passed_if_no_prereq_names
+ pre = task(:pre) { |t, args|
+ assert_equal({}, args.to_hash)
+ assert_equal "bill", args.name
+ }
+ t = task(:t, :name, :rev, :needs => [:pre])
+ t.invoke("bill", "1.2")
+ end
+
+ def test_args_not_passed_if_no_arg_names
+ pre = task(:pre, :rev) { |t, args|
+ assert_equal({}, args.to_hash)
+ }
+ t = task(:t, :needs => [:pre])
+ t.invoke("bill", "1.2")
+ end
+end
diff --git a/test/rake/test_test_task.rb b/test/rake/test_test_task.rb
new file mode 100644
index 0000000000..a0dc7a0717
--- /dev/null
+++ b/test/rake/test_test_task.rb
@@ -0,0 +1,81 @@
+require 'tmpdir'
+require 'test/unit'
+require 'rake/testtask'
+
+class Rake::TestTestTask < Test::Unit::TestCase
+ include Rake
+
+ def setup
+ @oldwd = Dir.pwd
+ @tmpwd = Dir.mktmpdir
+ Dir.chdir(@tmpwd)
+ Task.clear
+ ENV.delete('TEST')
+ open('install.rb', 'w') {}
+ end
+
+ def teardown
+ FileUtils.rm_rf("testdata")
+ Dir.chdir(@oldwd)
+ FileUtils.rm_rf(@tmpwd)
+ end
+
+ def test_no_task
+ assert ! Task.task_defined?(:test)
+ end
+
+ def test_defaults
+ tt = Rake::TestTask.new do |t| end
+ assert_not_nil tt
+ assert_equal :test, tt.name
+ assert_equal ['lib'], tt.libs
+ assert_equal 'test/test*.rb', tt.pattern
+ assert_equal false, tt.verbose
+ assert Task.task_defined?(:test)
+ end
+
+ def test_non_defaults
+ tt = Rake::TestTask.new(:example) do |t|
+ t.libs = ['src', 'ext']
+ t.pattern = 'test/tc_*.rb'
+ t.verbose = true
+ end
+ assert_not_nil tt
+ assert_equal :example, tt.name
+ assert_equal ['src', 'ext'], tt.libs
+ assert_equal 'test/tc_*.rb', tt.pattern
+ assert_equal true, tt.verbose
+ assert Task.task_defined?(:example)
+ end
+
+ def test_pattern
+ tt = Rake::TestTask.new do |t|
+ t.pattern = '*.rb'
+ end
+ assert_equal ['install.rb'], tt.file_list.to_a
+ end
+
+ def test_env_test
+ ENV['TEST'] = 'testfile.rb'
+ tt = Rake::TestTask.new do |t|
+ t.pattern = '*'
+ end
+ assert_equal ["testfile.rb"], tt.file_list.to_a
+ end
+
+ def test_test_files
+ tt = Rake::TestTask.new do |t|
+ t.test_files = FileList['a.rb', 'b.rb']
+ end
+ assert_equal ["a.rb", 'b.rb'], tt.file_list.to_a
+ end
+
+ def test_both_pattern_and_test_files
+ tt = Rake::TestTask.new do |t|
+ t.test_files = FileList['a.rb', 'b.rb']
+ t.pattern = '*.rb'
+ end
+ assert_equal ['a.rb', 'b.rb', 'install.rb'], tt.file_list.to_a
+ end
+
+end
diff --git a/test/rake/test_thread_history_display.rb b/test/rake/test_thread_history_display.rb
deleted file mode 100644
index 2ac83b0dc0..0000000000
--- a/test/rake/test_thread_history_display.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-require 'rake/thread_history_display'
-
-class TestThreadHistoryDisplay < Rake::TestCase
- def setup
- super
- @time = 1000000
- @stats = []
- @display = Rake::ThreadHistoryDisplay.new(@stats)
- end
-
- def test_banner
- out, _ = capture_io do
- @display.show
- end
- assert_match(/Job History/i, out)
- end
-
- def test_item_queued
- @stats << event(:item_queued, :item_id => 123)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +item_queued +item_id:1$/, out)
- end
-
- def test_item_dequeued
- @stats << event(:item_dequeued, :item_id => 123)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +item_dequeued +item_id:1$/, out)
- end
-
- def test_multiple_items
- @stats << event(:item_queued, :item_id => 123)
- @stats << event(:item_queued, :item_id => 124)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +item_queued +item_id:1$/, out)
- assert_match(/^ *1000001 +A +item_queued +item_id:2$/, out)
- end
-
- def test_waiting
- @stats << event(:waiting, :item_id => 123)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +waiting +item_id:1$/, out)
- end
-
- def test_continue
- @stats << event(:continue, :item_id => 123)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +continue +item_id:1$/, out)
- end
-
- def test_thread_deleted
- @stats << event(:thread_deleted, :deleted_thread => 123456, :thread_count => 12)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +thread_deleted( +deleted_thread:B| +thread_count:12){2}$/, out)
- end
-
- def test_thread_created
- @stats << event(:thread_created, :new_thread => 123456, :thread_count => 13)
- out, _ = capture_io do
- @display.show
- end
- assert_match(/^ *1000000 +A +thread_created( +new_thread:B| +thread_count:13){2}$/, out)
- end
-
- private
-
- def event(type, data={})
- result = {
- :event => type,
- :time => @time / 1_000_000.0,
- :data => data,
- :thread => Thread.current.object_id
- }
- @time += 1
- result
- end
-
-end
diff --git a/test/rake/test_top_level_functions.rb b/test/rake/test_top_level_functions.rb
new file mode 100644
index 0000000000..12a8cd1e36
--- /dev/null
+++ b/test/rake/test_top_level_functions.rb
@@ -0,0 +1,91 @@
+require 'test/unit'
+require_relative 'capture_stdout'
+require 'rake'
+
+class Rake::TestTopLevelFunctions < Test::Unit::TestCase
+ include CaptureStdout
+
+ def setup
+ super
+ @app = Rake.application
+ Rake.application = @mock = Object.new
+ end
+
+ def teardown
+ Rake.application = @app
+ super
+ end
+
+ def defmock(sym, &block)
+ class << @mock; self; end.class_eval do
+ define_method(sym, block)
+ end
+ end
+
+ def test_namespace
+ args = []
+ defmock(:in_namespace) {|a, *| args << a}
+ namespace "xyz" do end
+ assert_equal(["xyz"], args)
+ end
+
+ def test_import
+ args = []
+ defmock(:add_import) {|a| args << a}
+ import('x', 'y', 'z')
+ assert_equal(['x', 'y', 'z'], args)
+ end
+
+ def test_when_writing
+ out = capture_stdout do
+ when_writing("NOTWRITING") do
+ puts "WRITING"
+ end
+ end
+ assert_equal "WRITING\n", out
+ end
+
+ def test_when_not_writing
+ RakeFileUtils.nowrite_flag = true
+ out = capture_stdout do
+ when_writing("NOTWRITING") do
+ puts "WRITING"
+ end
+ end
+ assert_equal "DRYRUN: NOTWRITING\n", out
+ ensure
+ RakeFileUtils.nowrite_flag = false
+ end
+
+ def test_missing_constants_task
+ args = []
+ defmock(:const_warning) {|a| args << a}
+ Object.const_missing(:Task)
+ assert_equal([:Task], args)
+ end
+
+ def test_missing_constants_file_task
+ args = []
+ defmock(:const_warning) {|a| args << a}
+ Object.const_missing(:FileTask)
+ assert_equal([:FileTask], args)
+ end
+
+ def test_missing_constants_file_creation_task
+ args = []
+ defmock(:const_warning) {|a| args << a}
+ Object.const_missing(:FileCreationTask)
+ assert_equal([:FileCreationTask], args)
+ end
+
+ def test_missing_constants_rake_app
+ args = []
+ defmock(:const_warning) {|a| args << a}
+ Object.const_missing(:RakeApp)
+ assert_equal([:RakeApp], args)
+ end
+
+ def test_missing_other_constant
+ assert_raise(NameError) do Object.const_missing(:Xyz) end
+ end
+end
diff --git a/test/rake/test_trace_output.rb b/test/rake/test_trace_output.rb
deleted file mode 100644
index 750ea1447e..0000000000
--- a/test/rake/test_trace_output.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-require 'stringio'
-
-class TestTraceOutput < Rake::TestCase
- include Rake::TraceOutput
-
- class PrintSpy
- attr_reader :result, :calls
- def initialize
- @result = ""
- @calls = 0
- end
- def print(string)
- @result << string
- @calls += 1
- end
- end
-
- def test_trace_issues_single_io_for_args_with_empty_args
- spy = PrintSpy.new
- trace_on(spy)
- assert_equal "\n", spy.result
- assert_equal 1, spy.calls
- end
-
- def test_trace_issues_single_io_for_args_multiple_strings
- spy = PrintSpy.new
- trace_on(spy, "HI\n", "LO")
- assert_equal "HI\nLO\n", spy.result
- assert_equal 1, spy.calls
- end
-
- def test_trace_issues_single_io_for_args_multiple_strings_and_alternate_sep
- old_sep = $\
- $\ = "\r"
- spy = PrintSpy.new
- trace_on(spy, "HI\r", "LO")
- assert_equal "HI\rLO\r", spy.result
- assert_equal 1, spy.calls
- ensure
- $\ = old_sep
- end
-end
diff --git a/test/rake/test_win32.rb b/test/rake/test_win32.rb
new file mode 100644
index 0000000000..dade540629
--- /dev/null
+++ b/test/rake/test_win32.rb
@@ -0,0 +1,45 @@
+require 'test/unit'
+require_relative 'in_environment'
+
+require 'rake'
+
+class Rake::TestWin32 < Test::Unit::TestCase
+ include InEnvironment
+
+ Win32 = Rake::Win32
+
+ def test_win32_system_dir_uses_home_if_defined
+ in_environment('RAKE_SYSTEM' => nil,
+ 'HOME' => "C:\\HP",
+ 'APPDATA' => nil
+ ) do
+ assert_equal "C:/HP/Rake", Win32.win32_system_dir
+ end
+ end
+
+ def test_win32_system_dir_uses_appdata_if_defined
+ in_environment(
+ 'RAKE_SYSTEM' => nil,
+ 'HOME' => "C:\\HP",
+ 'APPDATA' => "C:\\Documents and Settings\\HP\\Application Data"
+ ) do
+ assert_equal "C:/Documents and Settings/HP/Application Data/Rake", Win32.win32_system_dir
+ end
+ end
+
+ def test_win32_system_dir_nil_of_no_env_vars
+ in_environment(
+ 'RAKE_SYSTEM' => nil,
+ 'HOME' => nil,
+ 'HOMEDRIVE' => nil,
+ "HOMEPATH" => nil,
+ 'APPDATA' => nil,
+ 'USERPROFILE' => "C:\\Documents and Settings\\HP"
+ ) do
+ assert_raise(ArgumentError) do
+ Win32.win32_system_dir
+ end
+ end
+ end
+
+end if Rake::Win32.windows?
diff --git a/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text b/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text
deleted file mode 100644
index 0e9527f931..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Amps and angle encoding.text
+++ /dev/null
@@ -1,21 +0,0 @@
-AT&T has an ampersand in their name.
-
-AT&amp;T is another way to write it.
-
-This & that.
-
-4 < 5.
-
-6 > 5.
-
-Here's a [link] [1] with an ampersand in the URL.
-
-Here's a link with an amersand in the link text: [AT&T] [2].
-
-Here's an inline [link](/script?foo=1&bar=2).
-
-Here's an inline [link](</script?foo=1&bar=2>).
-
-
-[1]: http://example.com/?foo=1&bar=2
-[2]: http://att.com/ "AT&T" \ No newline at end of file
diff --git a/test/rdoc/MarkdownTest_1.0.3/Auto links.text b/test/rdoc/MarkdownTest_1.0.3/Auto links.text
deleted file mode 100644
index abbc48869d..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Auto links.text
+++ /dev/null
@@ -1,13 +0,0 @@
-Link: <http://example.com/>.
-
-With an ampersand: <http://example.com/?foo=1&bar=2>
-
-* In a list?
-* <http://example.com/>
-* It should.
-
-> Blockquoted: <http://example.com/>
-
-Auto-links should not occur here: `<http://example.com/>`
-
- or here: <http://example.com/> \ No newline at end of file
diff --git a/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text b/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text
deleted file mode 100644
index 5b014cb33d..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Backslash escapes.text
+++ /dev/null
@@ -1,120 +0,0 @@
-These should all get escaped:
-
-Backslash: \\
-
-Backtick: \`
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \>
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-
-
-
-These should not, because they occur within a code block:
-
- Backslash: \\
-
- Backtick: \`
-
- Asterisk: \*
-
- Underscore: \_
-
- Left brace: \{
-
- Right brace: \}
-
- Left bracket: \[
-
- Right bracket: \]
-
- Left paren: \(
-
- Right paren: \)
-
- Greater-than: \>
-
- Hash: \#
-
- Period: \.
-
- Bang: \!
-
- Plus: \+
-
- Minus: \-
-
-
-Nor should these, which occur in code spans:
-
-Backslash: `\\`
-
-Backtick: `` \` ``
-
-Asterisk: `\*`
-
-Underscore: `\_`
-
-Left brace: `\{`
-
-Right brace: `\}`
-
-Left bracket: `\[`
-
-Right bracket: `\]`
-
-Left paren: `\(`
-
-Right paren: `\)`
-
-Greater-than: `\>`
-
-Hash: `\#`
-
-Period: `\.`
-
-Bang: `\!`
-
-Plus: `\+`
-
-Minus: `\-`
-
-
-These should get escaped, even though they're matching pairs for
-other Markdown constructs:
-
-\*asterisks\*
-
-\_underscores\_
-
-\`backticks\`
-
-This is a code span with a literal backslash-backtick sequence: `` \` ``
-
-This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.
-
-This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text b/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text
deleted file mode 100644
index c31d171049..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Blockquotes with code blocks.text
+++ /dev/null
@@ -1,11 +0,0 @@
-> Example:
->
-> sub status {
-> print "working";
-> }
->
-> Or:
->
-> sub status {
-> return "working";
-> }
diff --git a/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text b/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text
deleted file mode 100644
index b54b09285a..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Code Blocks.text
+++ /dev/null
@@ -1,14 +0,0 @@
- code block on the first line
-
-Regular text.
-
- code block indented by spaces
-
-Regular text.
-
- the lines in this block
- all contain trailing spaces
-
-Regular Text.
-
- code block on the last line \ No newline at end of file
diff --git a/test/rdoc/MarkdownTest_1.0.3/Code Spans.text b/test/rdoc/MarkdownTest_1.0.3/Code Spans.text
deleted file mode 100644
index 750a1973df..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Code Spans.text
+++ /dev/null
@@ -1,6 +0,0 @@
-`<test a="` content of attribute `">`
-
-Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
-
-Here's how you put `` `backticks` `` in a code span.
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text b/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
deleted file mode 100644
index f8a5b27bf4..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text
+++ /dev/null
@@ -1,8 +0,0 @@
-In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.
-
-Here's one with a bullet.
-* criminey.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text b/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text
deleted file mode 100644
index 1594bda27b..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Horizontal rules.text
+++ /dev/null
@@ -1,67 +0,0 @@
-Dashes:
-
----
-
- ---
-
- ---
-
- ---
-
- ---
-
-- - -
-
- - - -
-
- - - -
-
- - - -
-
- - - -
-
-
-Asterisks:
-
-***
-
- ***
-
- ***
-
- ***
-
- ***
-
-* * *
-
- * * *
-
- * * *
-
- * * *
-
- * * *
-
-
-Underscores:
-
-___
-
- ___
-
- ___
-
- ___
-
- ___
-
-_ _ _
-
- _ _ _
-
- _ _ _
-
- _ _ _
-
- _ _ _
diff --git a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text
deleted file mode 100644
index 86b7206d2a..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Advanced).text
+++ /dev/null
@@ -1,15 +0,0 @@
-Simple block on one line:
-
-<div>foo</div>
-
-And nested without indentation:
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
diff --git a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text
deleted file mode 100644
index 14aa2dc272..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Inline HTML (Simple).text
+++ /dev/null
@@ -1,69 +0,0 @@
-Here's a simple block:
-
-<div>
- foo
-</div>
-
-This should be a code block, though:
-
- <div>
- foo
- </div>
-
-As should this:
-
- <div>foo</div>
-
-Now, nested:
-
-<div>
- <div>
- <div>
- foo
- </div>
- </div>
-</div>
-
-This should just be an HTML comment:
-
-<!-- Comment -->
-
-Multiline:
-
-<!--
-Blah
-Blah
--->
-
-Code block:
-
- <!-- Comment -->
-
-Just plain comment, with trailing spaces on the line:
-
-<!-- foo -->
-
-Code:
-
- <hr />
-
-Hr's:
-
-<hr>
-
-<hr/>
-
-<hr />
-
-<hr>
-
-<hr/>
-
-<hr />
-
-<hr class="foo" id="bar" />
-
-<hr class="foo" id="bar"/>
-
-<hr class="foo" id="bar" >
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text b/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text
deleted file mode 100644
index 41d830d038..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Inline HTML comments.text
+++ /dev/null
@@ -1,13 +0,0 @@
-Paragraph one.
-
-<!-- This is a simple comment -->
-
-<!--
- This is another comment.
--->
-
-Paragraph two.
-
-<!-- one comment block -- -- with two comments -->
-
-The end.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text b/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text
deleted file mode 100644
index 09017a90c7..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Links, inline style.text
+++ /dev/null
@@ -1,12 +0,0 @@
-Just a [URL](/url/).
-
-[URL and title](/url/ "title").
-
-[URL and title](/url/ "title preceded by two spaces").
-
-[URL and title](/url/ "title preceded by a tab").
-
-[URL and title](/url/ "title has spaces afterward" ).
-
-
-[Empty]().
diff --git a/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text b/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text
deleted file mode 100644
index 341ec88e3d..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Links, reference style.text
+++ /dev/null
@@ -1,71 +0,0 @@
-Foo [bar] [1].
-
-Foo [bar][1].
-
-Foo [bar]
-[1].
-
-[1]: /url/ "Title"
-
-
-With [embedded [brackets]] [b].
-
-
-Indented [once][].
-
-Indented [twice][].
-
-Indented [thrice][].
-
-Indented [four][] times.
-
- [once]: /url
-
- [twice]: /url
-
- [thrice]: /url
-
- [four]: /url
-
-
-[b]: /url/
-
-* * *
-
-[this] [this] should work
-
-So should [this][this].
-
-And [this] [].
-
-And [this][].
-
-And [this].
-
-But not [that] [].
-
-Nor [that][].
-
-Nor [that].
-
-[Something in brackets like [this][] should work]
-
-[Same with [this].]
-
-In this case, [this](/somethingelse/) points to something else.
-
-Backslashing should suppress \[this] and [this\].
-
-[this]: foo
-
-
-* * *
-
-Here's one where the [link
-breaks] across lines.
-
-Here's another where the [link
-breaks] across lines, but with a line-ending space.
-
-
-[link breaks]: /url/
diff --git a/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text b/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text
deleted file mode 100644
index 8c44c98fee..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Links, shortcut references.text
+++ /dev/null
@@ -1,20 +0,0 @@
-This is the [simple case].
-
-[simple case]: /simple
-
-
-
-This one has a [line
-break].
-
-This one has a [line
-break] with a line-ending space.
-
-[line break]: /foo
-
-
-[this] [that] and the [other]
-
-[this]: /this
-[that]: /that
-[other]: /other
diff --git a/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text b/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text
deleted file mode 100644
index 29d0e4235b..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Literal quotes in titles.text
+++ /dev/null
@@ -1,7 +0,0 @@
-Foo [bar][].
-
-Foo [bar](/url/ "Title with "quotes" inside").
-
-
- [bar]: /url/ "Title with "quotes" inside"
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
deleted file mode 100644
index 486055ca7f..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Basics.text
+++ /dev/null
@@ -1,306 +0,0 @@
-Markdown: Basics
-================
-
-<ul id="ProjectSubmenu">
- <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
- <li><a class="selected" title="Markdown Basics">Basics</a></li>
- <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
- <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
- <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
- [s]: /projects/markdown/syntax "Markdown Syntax"
- [d]: /projects/markdown/dingus "Markdown Dingus"
- [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `<h1>` and `<h2>` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`>`' angle brackets.
-
-Markdown:
-
- A First Level Header
- ====================
-
- A Second Level Header
- ---------------------
-
- Now is the time for all good men to come to
- the aid of their country. This is just a
- regular paragraph.
-
- The quick brown fox jumped over the lazy
- dog's back.
-
- ### Header 3
-
- > This is a blockquote.
- >
- > This is the second paragraph in the blockquote.
- >
- > ## This is an H2 in a blockquote
-
-
-Output:
-
- <h1>A First Level Header</h1>
-
- <h2>A Second Level Header</h2>
-
- <p>Now is the time for all good men to come to
- the aid of their country. This is just a
- regular paragraph.</p>
-
- <p>The quick brown fox jumped over the lazy
- dog's back.</p>
-
- <h3>Header 3</h3>
-
- <blockquote>
- <p>This is a blockquote.</p>
-
- <p>This is the second paragraph in the blockquote.</p>
-
- <h2>This is an H2 in a blockquote</h2>
- </blockquote>
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
- Some of these words *are emphasized*.
- Some of these words _are emphasized also_.
-
- Use two asterisks for **strong emphasis**.
- Or, if you prefer, __use two underscores instead__.
-
-Output:
-
- <p>Some of these words <em>are emphasized</em>.
- Some of these words <em>are emphasized also</em>.</p>
-
- <p>Use two asterisks for <strong>strong emphasis</strong>.
- Or, if you prefer, <strong>use two underscores instead</strong>.</p>
-
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangable; this:
-
- * Candy.
- * Gum.
- * Booze.
-
-this:
-
- + Candy.
- + Gum.
- + Booze.
-
-and this:
-
- - Candy.
- - Gum.
- - Booze.
-
-all produce the same output:
-
- <ul>
- <li>Candy.</li>
- <li>Gum.</li>
- <li>Booze.</li>
- </ul>
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
- 1. Red
- 2. Green
- 3. Blue
-
-Output:
-
- <ol>
- <li>Red</li>
- <li>Green</li>
- <li>Blue</li>
- </ol>
-
-If you put blank lines between items, you'll get `<p>` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
- * A list item.
-
- With multiple paragraphs.
-
- * Another item in the list.
-
-Output:
-
- <ul>
- <li><p>A list item.</p>
- <p>With multiple paragraphs.</p></li>
- <li><p>Another item in the list.</p></li>
- </ul>
-
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
- This is an [example link](http://example.com/).
-
-Output:
-
- <p>This is an <a href="http://example.com/">
- example link</a>.</p>
-
-Optionally, you may include a title attribute in the parentheses:
-
- This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
- <p>This is an <a href="http://example.com/" title="With a Title">
- example link</a>.</p>
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
- I get 10 times more traffic from [Google][1] than from
- [Yahoo][2] or [MSN][3].
-
- [1]: http://google.com/ "Google"
- [2]: http://search.yahoo.com/ "Yahoo Search"
- [3]: http://search.msn.com/ "MSN Search"
-
-Output:
-
- <p>I get 10 times more traffic from <a href="http://google.com/"
- title="Google">Google</a> than from <a href="http://search.yahoo.com/"
- title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
- title="MSN Search">MSN</a>.</p>
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
- I start my morning with a cup of coffee and
- [The New York Times][NY Times].
-
- [ny times]: http://www.nytimes.com/
-
-Output:
-
- <p>I start my morning with a cup of coffee and
- <a href="http://www.nytimes.com/">The New York Times</a>.</p>
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
- ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
- ![alt text][id]
-
- [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
- <img src="/path/to/img.jpg" alt="alt text" title="Title" />
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&`) and angle brackets (`<` or
-`>`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
- I strongly recommend against using any `<blink>` tags.
-
- I wish SmartyPants used named entities like `&mdash;`
- instead of decimal-encoded entites like `&#8212;`.
-
-Output:
-
- <p>I strongly recommend against using any
- <code>&lt;blink&gt;</code> tags.</p>
-
- <p>I wish SmartyPants used named entities like
- <code>&amp;mdash;</code> instead of decimal-encoded
- entites like <code>&amp;#8212;</code>.</p>
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`,
-and `>` characters will be escaped automatically.
-
-Markdown:
-
- If you want your page to validate under XHTML 1.0 Strict,
- you've got to put paragraph tags in your blockquotes:
-
- <blockquote>
- <p>For example.</p>
- </blockquote>
-
-Output:
-
- <p>If you want your page to validate under XHTML 1.0 Strict,
- you've got to put paragraph tags in your blockquotes:</p>
-
- <pre><code>&lt;blockquote&gt;
- &lt;p&gt;For example.&lt;/p&gt;
- &lt;/blockquote&gt;
- </code></pre>
diff --git a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text b/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
deleted file mode 100644
index 57360a16c8..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text
+++ /dev/null
@@ -1,888 +0,0 @@
-Markdown: Syntax
-================
-
-<ul id="ProjectSubmenu">
- <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
- <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
- <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
- <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
- <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-* [Overview](#overview)
- * [Philosophy](#philosophy)
- * [Inline HTML](#html)
- * [Automatic Escaping for Special Characters](#autoescape)
-* [Block Elements](#block)
- * [Paragraphs and Line Breaks](#p)
- * [Headers](#header)
- * [Blockquotes](#blockquote)
- * [Lists](#list)
- * [Code Blocks](#precode)
- * [Horizontal Rules](#hr)
-* [Span Elements](#span)
- * [Links](#link)
- * [Emphasis](#em)
- * [Code](#code)
- * [Images](#img)
-* [Miscellaneous](#misc)
- * [Backslash Escapes](#backslash)
- * [Automatic Links](#autolink)
-
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL][src].
-
- [src]: /projects/markdown/syntax.text
-
-* * *
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-Markdown is intended to be as easy-to-read and easy-to-write as is feasible.
-
-Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
-[Grutatext] [5], and [EtText] [6] -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.
-
- [1]: http://docutils.sourceforge.net/mirror/setext.html
- [2]: http://www.aaronsw.com/2002/atx/
- [3]: http://textism.com/tools/textile/
- [4]: http://docutils.sourceforge.net/rst.html
- [5]: http://www.triptico.com/software/grutatxt.html
- [6]: http://ettext.taint.org/doc/
-
-To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like \*emphasis\*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.
-
-
-
-<h3 id="html">Inline HTML</h3>
-
-Markdown's syntax is intended for one purpose: to be used as a
-format for *writing* for the web.
-
-Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is *not* to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a *publishing* format; Markdown is a *writing*
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.
-
-For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.
-
-The only restrictions are that block-level HTML elements -- e.g. `<div>`,
-`<table>`, `<pre>`, `<p>`, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) `<p>` tags around HTML block-level tags.
-
-For example, to add an HTML table to a Markdown article:
-
- This is a regular paragraph.
-
- <table>
- <tr>
- <td>Foo</td>
- </tr>
- </table>
-
- This is another regular paragraph.
-
-Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an
-HTML block.
-
-Span-level HTML tags -- e.g. `<span>`, `<cite>`, or `<del>` -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML `<a>` or `<img>` tags instead of Markdown's
-link or image syntax, go right ahead.
-
-Unlike block-level HTML tags, Markdown syntax *is* processed within
-span-level tags.
-
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-In HTML, there are two characters that demand special treatment: `<`
-and `&`. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. `&lt;`, and
-`&amp;`.
-
-Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&T', you need to write '`AT&amp;T`'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:
-
- http://images.google.com/images?num=30&q=larry+bird
-
-you need to encode the URL as:
-
- http://images.google.com/images?num=30&amp;q=larry+bird
-
-in your anchor tag `href` attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.
-
-Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into `&amp;`.
-
-So, if you want to include a copyright symbol in your article, you can write:
-
- &copy;
-
-and Markdown will leave it alone. But if you write:
-
- AT&T
-
-Markdown will translate it to:
-
- AT&amp;T
-
-Similarly, because Markdown supports [inline HTML](#html), if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:
-
- 4 < 5
-
-Markdown will translate it to:
-
- 4 &lt; 5
-
-However, inside Markdown code spans and blocks, angle brackets and
-ampersands are *always* encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single `<`
-and `&` in your example code needs to be escaped.)
-
-
-* * *
-
-
-<h2 id="block">Block Elements</h2>
-
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a `<br />` tag.
-
-When you *do* want to insert a `<br />` break tag using Markdown, you
-end a line with two or more spaces, then type return.
-
-Yes, this takes a tad more effort to create a `<br />`, but a simplistic
-"every line break is a `<br />`" rule wouldn't work for Markdown.
-Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l]
-work best -- and look better -- when you format them with hard breaks.
-
- [bq]: #blockquote
- [l]: #list
-
-
-
-<h3 id="header">Headers</h3>
-
-Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
-
-Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:
-
- This is an H1
- =============
-
- This is an H2
- -------------
-
-Any number of underlining `=`'s or `-`'s will work.
-
-Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:
-
- # This is an H1
-
- ## This is an H2
-
- ###### This is an H6
-
-Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :
-
- # This is an H1 #
-
- ## This is an H2 ##
-
- ### This is an H3 ######
-
-
-<h3 id="blockquote">Blockquotes</h3>
-
-Markdown uses email-style `>` characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a `>` before every line:
-
- > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
- > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
- > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
- >
- > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
- > id sem consectetuer libero luctus adipiscing.
-
-Markdown allows you to be lazy and only put the `>` before the first
-line of a hard-wrapped paragraph:
-
- > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
- consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
- Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
- > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
- id sem consectetuer libero luctus adipiscing.
-
-Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of `>`:
-
- > This is the first level of quoting.
- >
- > > This is nested blockquote.
- >
- > Back to the first level.
-
-Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:
-
- > ## This is a header.
- >
- > 1. This is the first list item.
- > 2. This is the second list item.
- >
- > Here's some example code:
- >
- > return shell_exec("echo $input | $markdown_script");
-
-Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.
-
-
-<h3 id="list">Lists</h3>
-
-Markdown supports ordered (numbered) and unordered (bulleted) lists.
-
-Unordered lists use asterisks, pluses, and hyphens -- interchangably
--- as list markers:
-
- * Red
- * Green
- * Blue
-
-is equivalent to:
-
- + Red
- + Green
- + Blue
-
-and:
-
- - Red
- - Green
- - Blue
-
-Ordered lists use numbers followed by periods:
-
- 1. Bird
- 2. McHale
- 3. Parish
-
-It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:
-
- <ol>
- <li>Bird</li>
- <li>McHale</li>
- <li>Parish</li>
- </ol>
-
-If you instead wrote the list in Markdown like this:
-
- 1. Bird
- 1. McHale
- 1. Parish
-
-or even:
-
- 3. Bird
- 1. McHale
- 8. Parish
-
-you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.
-
-If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.
-
-List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.
-
-To make lists look nice, you can wrap items with hanging indents:
-
- * Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
- viverra nec, fringilla in, laoreet vitae, risus.
- * Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
- Suspendisse id sem consectetuer libero luctus adipiscing.
-
-But if you want to be lazy, you don't have to:
-
- * Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
- viverra nec, fringilla in, laoreet vitae, risus.
- * Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
- Suspendisse id sem consectetuer libero luctus adipiscing.
-
-If list items are separated by blank lines, Markdown will wrap the
-items in `<p>` tags in the HTML output. For example, this input:
-
- * Bird
- * Magic
-
-will turn into:
-
- <ul>
- <li>Bird</li>
- <li>Magic</li>
- </ul>
-
-But this:
-
- * Bird
-
- * Magic
-
-will turn into:
-
- <ul>
- <li><p>Bird</p></li>
- <li><p>Magic</p></li>
- </ul>
-
-List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:
-
- 1. This is a list item with two paragraphs. Lorem ipsum dolor
- sit amet, consectetuer adipiscing elit. Aliquam hendrerit
- mi posuere lectus.
-
- Vestibulum enim wisi, viverra nec, fringilla in, laoreet
- vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
- sit amet velit.
-
- 2. Suspendisse id sem consectetuer libero luctus adipiscing.
-
-It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:
-
- * This is a list item with two paragraphs.
-
- This is the second paragraph in the list item. You're
- only required to indent the first line. Lorem ipsum dolor
- sit amet, consectetuer adipiscing elit.
-
- * Another item in the same list.
-
-To put a blockquote within a list item, the blockquote's `>`
-delimiters need to be indented:
-
- * A list item with a blockquote:
-
- > This is a blockquote
- > inside a list item.
-
-To put a code block within a list item, the code block needs
-to be indented *twice* -- 8 spaces or two tabs:
-
- * A list item with a code block:
-
- <code goes here>
-
-
-It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:
-
- 1986. What a great season.
-
-In other words, a *number-period-space* sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:
-
- 1986\. What a great season.
-
-
-
-<h3 id="precode">Code Blocks</h3>
-
-Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both `<pre>` and `<code>` tags.
-
-To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:
-
- This is a normal paragraph:
-
- This is a code block.
-
-Markdown will generate:
-
- <p>This is a normal paragraph:</p>
-
- <pre><code>This is a code block.
- </code></pre>
-
-One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:
-
- Here is an example of AppleScript:
-
- tell application "Foo"
- beep
- end tell
-
-will turn into:
-
- <p>Here is an example of AppleScript:</p>
-
- <pre><code>tell application "Foo"
- beep
- end tell
- </code></pre>
-
-A code block continues until it reaches a line that is not indented
-(or the end of the article).
-
-Within a code block, ampersands (`&`) and angle brackets (`<` and `>`)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:
-
- <div class="footer">
- &copy; 2004 Foo Corporation
- </div>
-
-will turn into:
-
- <pre><code>&lt;div class="footer"&gt;
- &amp;copy; 2004 Foo Corporation
- &lt;/div&gt;
- </code></pre>
-
-Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.
-
-
-
-<h3 id="hr">Horizontal Rules</h3>
-
-You can produce a horizontal rule tag (`<hr />`) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:
-
- * * *
-
- ***
-
- *****
-
- - - -
-
- ---------------------------------------
-
- _ _ _
-
-
-* * *
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-Markdown supports two style of links: *inline* and *reference*.
-
-In both styles, the link text is delimited by [square brackets].
-
-To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an *optional*
-title for the link, surrounded in quotes. For example:
-
- This is [an example](http://example.com/ "Title") inline link.
-
- [This link](http://example.net/) has no title attribute.
-
-Will produce:
-
- <p>This is <a href="http://example.com/" title="Title">
- an example</a> inline link.</p>
-
- <p><a href="http://example.net/">This link</a> has no
- title attribute.</p>
-
-If you're referring to a local resource on the same server, you can
-use relative paths:
-
- See my [About](/about/) page for details.
-
-Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:
-
- This is [an example][id] reference-style link.
-
-You can optionally use a space to separate the sets of brackets:
-
- This is [an example] [id] reference-style link.
-
-Then, anywhere in the document, you define your link label like this,
-on a line by itself:
-
- [id]: http://example.com/ "Optional Title Here"
-
-That is:
-
-* Square brackets containing the link identifier (optionally
- indented from the left margin using up to three spaces);
-* followed by a colon;
-* followed by one or more spaces (or tabs);
-* followed by the URL for the link;
-* optionally followed by a title attribute for the link, enclosed
- in double or single quotes.
-
-The link URL may, optionally, be surrounded by angle brackets:
-
- [id]: <http://example.com/> "Optional Title Here"
-
-You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:
-
- [id]: http://example.com/longish/path/to/resource/here
- "Optional Title Here"
-
-Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.
-
-Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links:
-
- [link text][a]
- [link text][A]
-
-are equivalent.
-
-The *implicit link name* shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:
-
- [Google][]
-
-And then define the link:
-
- [Google]: http://google.com/
-
-Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:
-
- Visit [Daring Fireball][] for more information.
-
-And then define the link:
-
- [Daring Fireball]: http://daringfireball.net/
-
-Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.
-
-Here's an example of reference links in action:
-
- I get 10 times more traffic from [Google] [1] than from
- [Yahoo] [2] or [MSN] [3].
-
- [1]: http://google.com/ "Google"
- [2]: http://search.yahoo.com/ "Yahoo Search"
- [3]: http://search.msn.com/ "MSN Search"
-
-Using the implicit link name shortcut, you could instead write:
-
- I get 10 times more traffic from [Google][] than from
- [Yahoo][] or [MSN][].
-
- [google]: http://google.com/ "Google"
- [yahoo]: http://search.yahoo.com/ "Yahoo Search"
- [msn]: http://search.msn.com/ "MSN Search"
-
-Both of the above examples will produce the following HTML output:
-
- <p>I get 10 times more traffic from <a href="http://google.com/"
- title="Google">Google</a> than from
- <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
- or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
-
-For comparison, here is the same paragraph written using
-Markdown's inline link style:
-
- I get 10 times more traffic from [Google](http://google.com/ "Google")
- than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
- [MSN](http://search.msn.com/ "MSN Search").
-
-The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.
-
-With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.
-
-
-<h3 id="em">Emphasis</h3>
-
-Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-emphasis. Text wrapped with one `*` or `_` will be wrapped with an
-HTML `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML
-`<strong>` tag. E.g., this input:
-
- *single asterisks*
-
- _single underscores_
-
- **double asterisks**
-
- __double underscores__
-
-will produce:
-
- <em>single asterisks</em>
-
- <em>single underscores</em>
-
- <strong>double asterisks</strong>
-
- <strong>double underscores</strong>
-
-You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.
-
-Emphasis can be used in the middle of a word:
-
- un*fucking*believable
-
-But if you surround an `*` or `_` with spaces, it'll be treated as a
-literal asterisk or underscore.
-
-To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:
-
- \*this text is surrounded by literal asterisks\*
-
-
-
-<h3 id="code">Code</h3>
-
-To indicate a span of code, wrap it with backtick quotes (`` ` ``).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:
-
- Use the `printf()` function.
-
-will produce:
-
- <p>Use the <code>printf()</code> function.</p>
-
-To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:
-
- ``There is a literal backtick (`) here.``
-
-which will produce this:
-
- <p><code>There is a literal backtick (`) here.</code></p>
-
-The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:
-
- A single backtick in a code span: `` ` ``
-
- A backtick-delimited string in a code span: `` `foo` ``
-
-will produce:
-
- <p>A single backtick in a code span: <code>`</code></p>
-
- <p>A backtick-delimited string in a code span: <code>`foo`</code></p>
-
-With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:
-
- Please don't use any `<blink>` tags.
-
-into:
-
- <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
-
-You can write this:
-
- `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
-
-to produce:
-
- <p><code>&amp;#8212;</code> is the decimal-encoded
- equivalent of <code>&amp;mdash;</code>.</p>
-
-
-
-<h3 id="img">Images</h3>
-
-Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.
-
-Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: *inline* and *reference*.
-
-Inline image syntax looks like this:
-
- ![Alt text](/path/to/img.jpg)
-
- ![Alt text](/path/to/img.jpg "Optional title")
-
-That is:
-
-* An exclamation mark: `!`;
-* followed by a set of square brackets, containing the `alt`
- attribute text for the image;
-* followed by a set of parentheses, containing the URL or path to
- the image, and an optional `title` attribute enclosed in double
- or single quotes.
-
-Reference-style image syntax looks like this:
-
- ![Alt text][id]
-
-Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:
-
- [id]: url/to/image "Optional title attribute"
-
-As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML `<img>` tags.
-
-
-* * *
-
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:
-
- <http://example.com/>
-
-Markdown will turn this into:
-
- <a href="http://example.com/">http://example.com/</a>
-
-Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:
-
- <address@example.com>
-
-into something like this:
-
- <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
- &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
- &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
- &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
-
-which will render in a browser as a clickable link to "address@example.com".
-
-(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)
-
-
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML `<em>` tag), you can backslashes
-before the asterisks, like this:
-
- \*literal asterisks\*
-
-Markdown provides backslash escapes for the following characters:
-
- \ backslash
- ` backtick
- * asterisk
- _ underscore
- {} curly braces
- [] square brackets
- () parentheses
- # hash mark
- + plus sign
- - minus sign (hyphen)
- . dot
- ! exclamation mark
-
diff --git a/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text b/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text
deleted file mode 100644
index ed3c624ffb..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Nested blockquotes.text
+++ /dev/null
@@ -1,5 +0,0 @@
-> foo
->
-> > bar
->
-> foo
diff --git a/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text b/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text
deleted file mode 100644
index 7f3b49777f..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Ordered and unordered lists.text
+++ /dev/null
@@ -1,131 +0,0 @@
-## Unordered
-
-Asterisks tight:
-
-* asterisk 1
-* asterisk 2
-* asterisk 3
-
-
-Asterisks loose:
-
-* asterisk 1
-
-* asterisk 2
-
-* asterisk 3
-
-* * *
-
-Pluses tight:
-
-+ Plus 1
-+ Plus 2
-+ Plus 3
-
-
-Pluses loose:
-
-+ Plus 1
-
-+ Plus 2
-
-+ Plus 3
-
-* * *
-
-
-Minuses tight:
-
-- Minus 1
-- Minus 2
-- Minus 3
-
-
-Minuses loose:
-
-- Minus 1
-
-- Minus 2
-
-- Minus 3
-
-
-## Ordered
-
-Tight:
-
-1. First
-2. Second
-3. Third
-
-and:
-
-1. One
-2. Two
-3. Three
-
-
-Loose using tabs:
-
-1. First
-
-2. Second
-
-3. Third
-
-and using spaces:
-
-1. One
-
-2. Two
-
-3. Three
-
-Multiple paragraphs:
-
-1. Item 1, graf one.
-
- Item 2. graf two. The quick brown fox jumped over the lazy dog's
- back.
-
-2. Item 2.
-
-3. Item 3.
-
-
-
-## Nested
-
-* Tab
- * Tab
- * Tab
-
-Here's another:
-
-1. First
-2. Second:
- * Fee
- * Fie
- * Foe
-3. Third
-
-Same thing but with paragraphs:
-
-1. First
-
-2. Second:
- * Fee
- * Fie
- * Foe
-
-3. Third
-
-
-This was an error in Markdown 1.0.1:
-
-* this
-
- * sub
-
- that
diff --git a/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text b/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text
deleted file mode 100644
index 95ee690dbe..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Strong and em together.text
+++ /dev/null
@@ -1,7 +0,0 @@
-***This is strong and em.***
-
-So is ***this*** word.
-
-___This is strong and em.___
-
-So is ___this___ word.
diff --git a/test/rdoc/MarkdownTest_1.0.3/Tabs.text b/test/rdoc/MarkdownTest_1.0.3/Tabs.text
deleted file mode 100644
index 589d1136e1..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Tabs.text
+++ /dev/null
@@ -1,21 +0,0 @@
-+ this is a list item
- indented with tabs
-
-+ this is a list item
- indented with spaces
-
-Code:
-
- this code block is indented by one tab
-
-And:
-
- this code block is indented by two tabs
-
-And:
-
- + this is an example list item
- indented with tabs
-
- + this is an example list item
- indented with spaces
diff --git a/test/rdoc/MarkdownTest_1.0.3/Tidyness.text b/test/rdoc/MarkdownTest_1.0.3/Tidyness.text
deleted file mode 100644
index 5f18b8da21..0000000000
--- a/test/rdoc/MarkdownTest_1.0.3/Tidyness.text
+++ /dev/null
@@ -1,5 +0,0 @@
-> A list within a blockquote:
->
-> * asterisk 1
-> * asterisk 2
-> * asterisk 3
diff --git a/test/rdoc/test.ja.large.rdoc b/test/rdoc/test.ja.large.rdoc
deleted file mode 100644
index a9c6c4691c..0000000000
--- a/test/rdoc/test.ja.large.rdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
- å¾è¼©ï¼ˆã‚ãŒã¯ã„)ã¯çŒ«ã§ã‚る。åå‰ã¯ã¾ã ç„¡ã„。
- ã©ã“ã§ç”Ÿã‚ŒãŸã‹ã¨ã‚“ã¨è¦‹å½“(ã‘ã‚“ã¨ã†ï¼‰ãŒã¤ã‹ã¬ã€‚何ã§ã‚‚è–„æš—ã„ã˜ã‚ã˜ã‚ã—ãŸæ‰€ã§ãƒ‹ãƒ£ãƒ¼ãƒ‹ãƒ£ãƒ¼æ³£ã„ã¦ã„ãŸäº‹ã ã‘ã¯è¨˜æ†¶ã—ã¦ã„る。å¾è¼©ã¯ã“ã“ã§å§‹ã‚ã¦äººé–“ã¨ã„ã†ã‚‚ã®ã‚’見ãŸã€‚ã—ã‹ã‚‚ã‚ã¨ã§èžãã¨ãã‚Œã¯æ›¸ç”Ÿã¨ã„ã†äººé–“中ã§ä¸€ç•ªç°æ‚ªï¼ˆã©ã†ã‚ã)ãªç¨®æ—ã§ã‚ã£ãŸãã†ã ã€‚ã“ã®æ›¸ç”Ÿã¨ã„ã†ã®ã¯æ™‚々我々をæ•(ã¤ã‹ã¾ï¼‰ãˆã¦ç…®ï¼ˆã«ï¼‰ã¦é£Ÿã†ã¨ã„ã†è©±ã§ã‚る。ã—ã‹ã—ãã®å½“時ã¯ä½•ã¨ã„ã†è€ƒã‚‚ãªã‹ã£ãŸã‹ã‚‰åˆ¥æ®µæã—ã„ã¨ã‚‚æ€ã‚ãªã‹ã£ãŸã€‚ãŸã å½¼ã®æŽŒï¼ˆã¦ã®ã²ã‚‰ï¼‰ã«è¼‰ã›ã‚‰ã‚Œã¦ã‚¹ãƒ¼ã¨æŒã¡ä¸Šã’ã‚‰ã‚ŒãŸæ™‚何ã ã‹ãƒ•ワフワã—ãŸæ„Ÿã˜ãŒã‚ã£ãŸã°ã‹ã‚Šã§ã‚る。掌ã®ä¸Šã§å°‘ã—è½ã¡ã¤ã„ã¦æ›¸ç”Ÿã®é¡”を見ãŸã®ãŒã„ã‚ゆる人間ã¨ã„ã†ã‚‚ã®ã®è¦‹å§‹ï¼ˆã¿ã¯ã˜ã‚)ã§ã‚ã‚ã†ã€‚ã“ã®æ™‚妙ãªã‚‚ã®ã ã¨æ€ã£ãŸæ„Ÿã˜ãŒä»Šã§ã‚‚残ã£ã¦ã„る。第一毛をもã£ã¦è£…飾ã•れã¹ãã¯ãšã®é¡”ãŒã¤ã‚‹ã¤ã‚‹ã—ã¦ã¾ã‚‹ã§è–¬ç¼¶ï¼ˆã‚„ã‹ã‚“)ã ã€‚ãã®å¾Œï¼ˆã”)猫ã«ã‚‚ã ã„ã¶é€¢ï¼ˆã‚)ã£ãŸãŒã“ã‚“ãªç‰‡è¼ªï¼ˆã‹ãŸã‚)ã«ã¯ä¸€åº¦ã‚‚出会(ã§ã)ã‚ã—ãŸäº‹ãŒãªã„。ã®ã¿ãªã‚‰ãšé¡”ã®çœŸä¸­ãŒã‚ã¾ã‚Šã«çªèµ·ã—ã¦ã„る。ãã†ã—ã¦ãã®ç©´ã®ä¸­ã‹ã‚‰æ™‚々ã·ã†ã·ã†ã¨ç…™ï¼ˆã‘むり)をå¹ã。ã©ã†ã‚‚咽(む)ã›ã½ãã¦å®Ÿã«å¼±ã£ãŸã€‚ã“れãŒäººé–“ã®é£²ã‚€ç…™è‰ï¼ˆãŸã°ã“)ã¨ã„ã†ã‚‚ã®ã§ã‚る事ã¯ã‚ˆã†ã‚„ãã“ã®é ƒçŸ¥ã£ãŸã€‚
diff --git a/test/rdoc/test.ja.largedoc b/test/rdoc/test.ja.largedoc
deleted file mode 100644
index a9c6c4691c..0000000000
--- a/test/rdoc/test.ja.largedoc
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
- å¾è¼©ï¼ˆã‚ãŒã¯ã„)ã¯çŒ«ã§ã‚る。åå‰ã¯ã¾ã ç„¡ã„。
- ã©ã“ã§ç”Ÿã‚ŒãŸã‹ã¨ã‚“ã¨è¦‹å½“(ã‘ã‚“ã¨ã†ï¼‰ãŒã¤ã‹ã¬ã€‚何ã§ã‚‚è–„æš—ã„ã˜ã‚ã˜ã‚ã—ãŸæ‰€ã§ãƒ‹ãƒ£ãƒ¼ãƒ‹ãƒ£ãƒ¼æ³£ã„ã¦ã„ãŸäº‹ã ã‘ã¯è¨˜æ†¶ã—ã¦ã„る。å¾è¼©ã¯ã“ã“ã§å§‹ã‚ã¦äººé–“ã¨ã„ã†ã‚‚ã®ã‚’見ãŸã€‚ã—ã‹ã‚‚ã‚ã¨ã§èžãã¨ãã‚Œã¯æ›¸ç”Ÿã¨ã„ã†äººé–“中ã§ä¸€ç•ªç°æ‚ªï¼ˆã©ã†ã‚ã)ãªç¨®æ—ã§ã‚ã£ãŸãã†ã ã€‚ã“ã®æ›¸ç”Ÿã¨ã„ã†ã®ã¯æ™‚々我々をæ•(ã¤ã‹ã¾ï¼‰ãˆã¦ç…®ï¼ˆã«ï¼‰ã¦é£Ÿã†ã¨ã„ã†è©±ã§ã‚る。ã—ã‹ã—ãã®å½“時ã¯ä½•ã¨ã„ã†è€ƒã‚‚ãªã‹ã£ãŸã‹ã‚‰åˆ¥æ®µæã—ã„ã¨ã‚‚æ€ã‚ãªã‹ã£ãŸã€‚ãŸã å½¼ã®æŽŒï¼ˆã¦ã®ã²ã‚‰ï¼‰ã«è¼‰ã›ã‚‰ã‚Œã¦ã‚¹ãƒ¼ã¨æŒã¡ä¸Šã’ã‚‰ã‚ŒãŸæ™‚何ã ã‹ãƒ•ワフワã—ãŸæ„Ÿã˜ãŒã‚ã£ãŸã°ã‹ã‚Šã§ã‚る。掌ã®ä¸Šã§å°‘ã—è½ã¡ã¤ã„ã¦æ›¸ç”Ÿã®é¡”を見ãŸã®ãŒã„ã‚ゆる人間ã¨ã„ã†ã‚‚ã®ã®è¦‹å§‹ï¼ˆã¿ã¯ã˜ã‚)ã§ã‚ã‚ã†ã€‚ã“ã®æ™‚妙ãªã‚‚ã®ã ã¨æ€ã£ãŸæ„Ÿã˜ãŒä»Šã§ã‚‚残ã£ã¦ã„る。第一毛をもã£ã¦è£…飾ã•れã¹ãã¯ãšã®é¡”ãŒã¤ã‚‹ã¤ã‚‹ã—ã¦ã¾ã‚‹ã§è–¬ç¼¶ï¼ˆã‚„ã‹ã‚“)ã ã€‚ãã®å¾Œï¼ˆã”)猫ã«ã‚‚ã ã„ã¶é€¢ï¼ˆã‚)ã£ãŸãŒã“ã‚“ãªç‰‡è¼ªï¼ˆã‹ãŸã‚)ã«ã¯ä¸€åº¦ã‚‚出会(ã§ã)ã‚ã—ãŸäº‹ãŒãªã„。ã®ã¿ãªã‚‰ãšé¡”ã®çœŸä¸­ãŒã‚ã¾ã‚Šã«çªèµ·ã—ã¦ã„る。ãã†ã—ã¦ãã®ç©´ã®ä¸­ã‹ã‚‰æ™‚々ã·ã†ã·ã†ã¨ç…™ï¼ˆã‘むり)をå¹ã。ã©ã†ã‚‚咽(む)ã›ã½ãã¦å®Ÿã«å¼±ã£ãŸã€‚ã“れãŒäººé–“ã®é£²ã‚€ç…™è‰ï¼ˆãŸã°ã“)ã¨ã„ã†ã‚‚ã®ã§ã‚る事ã¯ã‚ˆã†ã‚„ãã“ã®é ƒçŸ¥ã£ãŸã€‚
diff --git a/test/rdoc/test.ja.rdoc b/test/rdoc/test.ja.rdoc
index cd01cab37a..96e1db93d3 100644
--- a/test/rdoc/test.ja.rdoc
+++ b/test/rdoc/test.ja.rdoc
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
ã“ã‚“ã«ã¡ã¯ï¼
åˆã‚ã¾ã—ã¦ã€‚アーロンã¨ç”³ã—ã¾ã™ã€‚
diff --git a/test/rdoc/test_attribute_manager.rb b/test/rdoc/test_attribute_manager.rb
index 8832a5d515..9506f3b40f 100644
--- a/test/rdoc/test_attribute_manager.rb
+++ b/test/rdoc/test_attribute_manager.rb
@@ -1,35 +1,14 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc'
+require 'rdoc/markup'
+require 'rdoc/markup/attribute_manager'
-class TestAttributeManager < RDoc::TestCase # HACK fix test name
+class TestAttributeManager < MiniTest::Unit::TestCase
def setup
- super
-
- @options = RDoc::Options.new
-
@am = RDoc::Markup::AttributeManager.new
@klass = RDoc::Markup::AttributeManager
- @formatter = RDoc::Markup::Formatter.new @options
- @formatter.add_tag :BOLD, '<B>', '</B>'
- @formatter.add_tag :EM, '<EM>', '</EM>'
- @formatter.add_tag :TT, '<CODE>', '</CODE>'
- end
-
- def test_convert_attrs_ignores_code
- assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <code>__send__</code> bar')
- end
-
- def test_convert_attrs_ignores_tt
- assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <tt>__send__</tt> bar')
- end
-
- def test_convert_attrs_preserves_double
- assert_equal 'foo.__send__ :bar', output('foo.__send__ :bar')
- assert_equal 'use __FILE__ to', output('use __FILE__ to')
- end
-
- def test_convert_attrs_does_not_ignore_after_tt
- assert_equal 'the <CODE>IF:</CODE><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
end
def test_initial_word_pairs
@@ -72,48 +51,18 @@ class TestAttributeManager < RDoc::TestCase # HACK fix test name
end
def test_add_special
- @am.add_special "WikiWord", :WIKIWORD
+ @am.add_special("WikiWord", :WIKIWORD)
specials = @am.special
-
- assert_equal 1, specials.size
- assert specials.assoc "WikiWord"
- end
-
- def test_escapes
- assert_equal '<CODE>text</CODE>', output('<tt>text</tt>')
- assert_equal '<tt>text</tt>', output('\\<tt>text</tt>')
- assert_equal '<tt>', output('\\<tt>')
- assert_equal '<CODE><tt></CODE>', output('<tt>\\<tt></tt>')
- assert_equal '<CODE>\\<tt></CODE>', output('<tt>\\\\<tt></tt>')
- assert_equal '<B>text</B>', output('*text*')
- assert_equal '*text*', output('\\*text*')
- assert_equal '\\', output('\\')
- assert_equal '\\text', output('\\text')
- assert_equal '\\\\text', output('\\\\text')
- assert_equal 'text \\ text', output('text \\ text')
-
- assert_equal 'and <CODE>\\s</CODE> matches space',
- output('and <tt>\\s</tt> matches space')
- assert_equal 'use <CODE><tt>text</CODE></tt> for code',
- output('use <tt>\\<tt>text</tt></tt> for code')
- assert_equal 'use <CODE><tt>text</tt></CODE> for code',
- output('use <tt>\\<tt>text\\</tt></tt> for code')
- assert_equal 'use <tt><tt>text</tt></tt> for code',
- output('use \\<tt>\\<tt>text</tt></tt> for code')
- assert_equal 'use <tt><CODE>text</CODE></tt> for code',
- output('use \\<tt><tt>text</tt></tt> for code')
- assert_equal 'use <CODE>+text+</CODE> for code',
- output('use <tt>\\+text+</tt> for code')
- assert_equal 'use <tt><CODE>text</CODE></tt> for code',
- output('use \\<tt>+text+</tt> for code')
- assert_equal 'illegal <tag>not</tag> changed',
- output('illegal <tag>not</tag> changed')
- assert_equal 'unhandled <p>tag</p> unchanged',
- output('unhandled <p>tag</p> unchanged')
+ assert_equal(1,specials.size)
+ assert(specials.has_key?("WikiWord"))
end
- def output str
- @formatter.convert_flow @am.flow str
+ def silently(&block)
+ warn_level = $VERBOSE
+ $VERBOSE = nil
+ result = block.call
+ $VERBOSE = warn_level
+ result
end
end
diff --git a/test/rdoc/test_rdoc_alias.rb b/test/rdoc/test_rdoc_alias.rb
deleted file mode 100644
index ff499af962..0000000000
--- a/test/rdoc/test_rdoc_alias.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require File.expand_path '../xref_test_case', __FILE__
-
-class TestRDocAlias < XrefTestCase
-
- def test_to_s
- a = RDoc::Alias.new nil, 'a', 'b', ''
- a.parent = @c2
-
- assert_equal 'alias: b -> #a in: RDoc::NormalClass C2 < Object', a.to_s
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_any_method.rb b/test/rdoc/test_rdoc_any_method.rb
index cb4a979392..a4c3eec48c 100644
--- a/test/rdoc/test_rdoc_any_method.rb
+++ b/test/rdoc/test_rdoc_any_method.rb
@@ -1,15 +1,15 @@
require File.expand_path '../xref_test_case', __FILE__
-class TestRDocAnyMethod < XrefTestCase
+class RDocAnyMethodTest < XrefTestCase
def test_aref
m = RDoc::AnyMethod.new nil, 'method?'
- assert_equal 'method-i-method-3F', m.aref
+ assert_equal 'method-i-method%3F', m.aref
m.singleton = true
- assert_equal 'method-c-method-3F', m.aref
+ assert_equal 'method-c-method%3F', m.aref
end
def test_arglists
@@ -32,146 +32,22 @@ method(a, b) { |c, d| ... }
assert_equal call_seq, m.arglists
end
- def test_c_function
- @c1_m.c_function = 'my_c1_m'
-
- assert_equal 'my_c1_m', @c1_m.c_function
- end
-
def test_full_name
assert_equal 'C1::m', @c1.method_list.first.full_name
end
- def test_markup_code
- tokens = [
- RDoc::RubyToken::TkCONSTANT. new(0, 0, 0, 'CONSTANT'),
- ]
-
- @c2_a.collect_tokens
- @c2_a.add_tokens(*tokens)
-
- expected = '<span class="ruby-constant">CONSTANT</span>'
-
- assert_equal expected, @c2_a.markup_code
- end
-
- def test_markup_code_empty
- assert_equal '', @c2_a.markup_code
- end
-
- def test_marshal_dump
- @store.path = Dir.tmpdir
- top_level = @store.add_file 'file.rb'
-
- m = RDoc::AnyMethod.new nil, 'method'
- m.block_params = 'some_block'
- m.call_seq = 'call_seq'
- m.comment = 'this is a comment'
- m.params = 'param'
- m.record_location top_level
-
- cm = top_level.add_class RDoc::ClassModule, 'Klass'
- cm.add_method m
-
- section = cm.sections.first
-
- al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
- al_m = m.add_alias al, cm
-
- loaded = Marshal.load Marshal.dump m
- loaded.store = @store
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
-
- assert_equal m, loaded
-
- assert_equal [al_m.name], loaded.aliases.map { |alas| alas.name }
- assert_equal 'some_block', loaded.block_params
- assert_equal 'call_seq', loaded.call_seq
- assert_equal comment, loaded.comment
- assert_equal top_level, loaded.file
- assert_equal 'Klass#method', loaded.full_name
- assert_equal 'method', loaded.name
- assert_equal 'param', loaded.params
- assert_equal nil, loaded.singleton # defaults to nil
- assert_equal :public, loaded.visibility
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
- end
-
- def test_marshal_load_aliased_method
- aliased_method = Marshal.load Marshal.dump(@c2.method_list.last)
-
- assert_equal 'C2#a', aliased_method.full_name
- assert_equal 'C2', aliased_method.parent_name
- assert_equal '()', aliased_method.params
- assert aliased_method.display?
- end
-
- def test_marshal_load_class_method
- class_method = Marshal.load Marshal.dump(@c1.method_list.first)
-
- assert_equal 'C1::m', class_method.full_name
- assert_equal 'C1', class_method.parent_name
- assert_equal '()', class_method.params
- assert class_method.display?
- end
-
- def test_marshal_load_instance_method
+ def test_marshal_load
instance_method = Marshal.load Marshal.dump(@c1.method_list.last)
assert_equal 'C1#m', instance_method.full_name
assert_equal 'C1', instance_method.parent_name
assert_equal '(foo)', instance_method.params
- assert instance_method.display?
- end
-
- def test_marshal_load_version_0
- @store.path = Dir.tmpdir
- top_level = @store.add_file 'file.rb'
-
- m = RDoc::AnyMethod.new nil, 'method'
-
- cm = top_level.add_class RDoc::ClassModule, 'Klass'
- cm.add_method m
-
- section = cm.sections.first
-
- al = RDoc::Alias.new nil, 'method', 'aliased', 'alias comment'
- al_m = m.add_alias al, cm
-
- loaded = Marshal.load "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
- "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
- "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
- "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
- "\"\x16this is a comment\x06;\x06FI" +
- "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
- "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
- "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
- "\"\nparam\x06;\x06F"
-
- loaded.store = @store
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
-
- assert_equal m, loaded
- assert_equal [al_m.name], loaded.aliases.map { |alas| alas.name }
- assert_equal 'some_block', loaded.block_params
- assert_equal 'call_seq', loaded.call_seq
- assert_equal comment, loaded.comment
- assert_equal 'Klass#method', loaded.full_name
- assert_equal 'method', loaded.name
- assert_equal 'param', loaded.params
- assert_equal nil, loaded.singleton # defaults to nil
- assert_equal :public, loaded.visibility
- assert_equal nil, loaded.file
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
+ class_method = Marshal.load Marshal.dump(@c1.method_list.first)
- assert loaded.display?
+ assert_equal 'C1::m', class_method.full_name
+ assert_equal 'C1', class_method.parent_name
+ assert_equal '()', class_method.params
end
def test_name
@@ -180,57 +56,6 @@ method(a, b) { |c, d| ... }
assert_nil m.name
end
- def test_param_list_block_params
- m = RDoc::AnyMethod.new nil, 'method'
- m.parent = @c1
-
- m.block_params = 'c, d'
-
- assert_equal %w[c d], m.param_list
- end
-
- def test_param_list_call_seq
- m = RDoc::AnyMethod.new nil, 'method'
- m.parent = @c1
-
- call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
- SEQ
-
- m.call_seq = call_seq
-
- assert_equal %w[a b c d], m.param_list
- end
-
- def test_param_list_default
- m = RDoc::AnyMethod.new nil, 'method'
- m.parent = @c1
-
- m.params = '(b = default)'
-
- assert_equal %w[b], m.param_list
- end
-
- def test_param_list_params
- m = RDoc::AnyMethod.new nil, 'method'
- m.parent = @c1
-
- m.params = '(a, b)'
-
- assert_equal %w[a b], m.param_list
- end
-
- def test_param_list_params_block_params
- m = RDoc::AnyMethod.new nil, 'method'
- m.parent = @c1
-
- m.params = '(a, b)'
- m.block_params = 'c, d'
-
- assert_equal %w[a b c d], m.param_list
- end
-
def test_param_seq
m = RDoc::AnyMethod.new nil, 'method'
m.parent = @c1
@@ -251,78 +76,10 @@ method(a, b) { |c, d| ... }
assert_equal '(a, b) { |c, d| ... }', m.param_seq
end
- def test_param_seq_call_seq
- m = RDoc::AnyMethod.new nil, 'method'
- m.parent = @c1
-
- call_seq = <<-SEQ
-method(a) { |c| ... }
-method(a, b) { |c, d| ... }
- SEQ
-
- m.call_seq = call_seq
-
- assert_equal '(a, b) { |c, d| }', m.param_seq
-
- end
-
def test_parent_name
assert_equal 'C1', @c1.method_list.first.parent_name
assert_equal 'C1', @c1.method_list.last.parent_name
end
- def test_store_equals
- loaded = Marshal.load Marshal.dump(@c1.method_list.last)
-
- loaded.store = @store
-
- assert_equal @store, loaded.file.store
- end
-
- def test_superclass_method
- m3 = RDoc::AnyMethod.new '', 'no_super'
-
- m2 = RDoc::AnyMethod.new '', 'supers'
- m2.calls_super = true
-
- m1 = RDoc::AnyMethod.new '', 'supers'
-
- c1 = RDoc::NormalClass.new 'Outer'
- c1.store = @store
- c1.add_method m1
-
- c2 = RDoc::NormalClass.new 'Inner', c1
- c2.store = @store
- c2.add_method m2
- c2.add_method m3
-
- assert_nil m3.superclass_method,
- 'no superclass method for no_super'
-
- assert_equal m1, m2.superclass_method,
- 'superclass method missing for supers'
- end
-
- def test_superclass_method_multilevel
- m2 = RDoc::AnyMethod.new '', 'supers'
- m2.calls_super = true
-
- m1 = RDoc::AnyMethod.new '', 'supers'
-
- c1 = RDoc::NormalClass.new 'Outer'
- c1.store = @store
- c1.add_method m1
-
- c2 = RDoc::NormalClass.new 'Middle', c1
- c2.store = @store
-
- c3 = RDoc::NormalClass.new 'Inner', c2
- c3.store = @store
- c3.add_method m2
-
- assert_equal m1, m2.superclass_method,
- 'superclass method missing for supers'
- end
-
end
diff --git a/test/rdoc/test_rdoc_attr.rb b/test/rdoc/test_rdoc_attr.rb
index a4922df06c..10965d00b6 100644
--- a/test/rdoc/test_rdoc_attr.rb
+++ b/test/rdoc/test_rdoc_attr.rb
@@ -1,19 +1,13 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/rdoc'
-class TestRDocAttr < RDoc::TestCase
+class TestRDocAttr < MiniTest::Unit::TestCase
def setup
- super
-
@a = RDoc::Attr.new nil, 'attr', 'RW', ''
end
- def test_aref
- m = RDoc::Attr.new nil, 'attr', 'RW', nil
-
- assert_equal 'attribute-i-attr', m.aref
- end
-
def test_arglists
assert_nil @a.arglists
end
@@ -26,151 +20,10 @@ class TestRDocAttr < RDoc::TestCase
assert_nil @a.call_seq
end
- def test_definition
- assert_equal 'attr_accessor', @a.definition
-
- @a.rw = 'R'
-
- assert_equal 'attr_reader', @a.definition
-
- @a.rw = 'W'
-
- assert_equal 'attr_writer', @a.definition
- end
-
def test_full_name
assert_equal '(unknown)#attr', @a.full_name
end
- def test_marshal_dump
- tl = @store.add_file 'file.rb'
-
- @a.comment = 'this is a comment'
- @a.record_location tl
-
- cm = tl.add_class RDoc::NormalClass, 'Klass'
- cm.add_attribute @a
-
- section = cm.sections.first
-
- loaded = Marshal.load Marshal.dump @a
- loaded.store = @store
-
- assert_equal @a, loaded
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
-
- assert_equal comment, loaded.comment
- assert_equal 'file.rb', loaded.file.relative_name
- assert_equal 'Klass#attr', loaded.full_name
- assert_equal 'attr', loaded.name
- assert_equal 'RW', loaded.rw
- assert_equal false, loaded.singleton
- assert_equal :public, loaded.visibility
- assert_equal tl, loaded.file
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
- end
-
- def test_marshal_dump_singleton
- tl = @store.add_file 'file.rb'
-
- @a.comment = 'this is a comment'
- @a.record_location tl
-
- cm = tl.add_class RDoc::NormalClass, 'Klass'
- cm.add_attribute @a
-
- section = cm.sections.first
-
- @a.rw = 'R'
- @a.singleton = true
- @a.visibility = :protected
-
- loaded = Marshal.load Marshal.dump @a
- loaded.store = @store
-
- assert_equal @a, loaded
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
-
- assert_equal comment, loaded.comment
- assert_equal 'Klass::attr', loaded.full_name
- assert_equal 'attr', loaded.name
- assert_equal 'R', loaded.rw
- assert_equal true, loaded.singleton
- assert_equal :protected, loaded.visibility
- assert_equal tl, loaded.file
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
- end
-
- def test_marshal_load_version_1
- tl = @store.add_file 'file.rb'
- cm = tl.add_class RDoc::NormalClass, 'Klass'
- section = cm.sections.first
-
- data = "\x04\bU:\x0FRDoc::Attr[\fi\x06I\"\tattr\x06:\x06EF" +
- "\"\x0FKlass#attrI\"\aRW\x06;\x06F:\vpublic" +
- "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
- "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
- "\"\x16this is a comment\x06;\x06FF"
-
- loaded = Marshal.load data
- loaded.store = @store
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
-
- assert_equal comment, loaded.comment
- assert_equal 'Klass#attr', loaded.full_name
- assert_equal 'attr', loaded.name
- assert_equal 'RW', loaded.rw
- assert_equal false, loaded.singleton
- assert_equal :public, loaded.visibility
-
- # version 2
- assert_nil loaded.file
-
- # version 3
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
-
- assert loaded.display?
- end
-
- def test_marshal_load_version_2
- tl = @store.add_file 'file.rb'
- cm = tl.add_class RDoc::NormalClass, 'Klass'
- section = cm.sections.first
-
- loaded = Marshal.load "\x04\bU:\x0FRDoc::Attr[\ri\aI\"\tattr\x06" +
- ":\x06ETI\"\x0FKlass#attr\x06;\x06TI\"\aRW\x06" +
- ";\x06T:\vpublico:\eRDoc::Markup::Document\a" +
- ":\v@parts[\x06o:\x1CRDoc::Markup::Paragraph\x06;" +
- "\t[\x06I\"\x16this is a comment\x06;\x06T:\n" +
- "@file0FI\"\ffile.rb\x06;\x06T"
- loaded.store = @store
-
- comment = doc(para('this is a comment'))
-
- assert_equal comment, loaded.comment
- assert_equal 'Klass#attr', loaded.full_name
- assert_equal 'attr', loaded.name
- assert_equal 'RW', loaded.rw
- assert_equal false, loaded.singleton
- assert_equal :public, loaded.visibility
- assert_equal tl, loaded.file
-
- # version 3
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
-
- assert loaded.display?
- end
-
def test_params
assert_nil @a.params
end
@@ -180,10 +33,15 @@ class TestRDocAttr < RDoc::TestCase
end
def test_type
- assert_equal 'instance', @a.type
+ assert_equal 'attr_accessor', @a.type
+
+ @a.rw = 'R'
+
+ assert_equal 'attr_reader', @a.type
+
+ @a.rw = 'W'
- @a.singleton = true
- assert_equal 'class', @a.type
+ assert_equal 'attr_writer', @a.type
end
end
diff --git a/test/rdoc/test_rdoc_class_module.rb b/test/rdoc/test_rdoc_class_module.rb
index ec81282c35..23291b969e 100644
--- a/test/rdoc/test_rdoc_class_module.rb
+++ b/test/rdoc/test_rdoc_class_module.rb
@@ -2,68 +2,10 @@ require File.expand_path '../xref_test_case', __FILE__
class TestRDocClassModule < XrefTestCase
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_add_comment
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
- tl3 = @store.add_file 'three.rb'
-
- cm = RDoc::ClassModule.new 'Klass'
- cm.add_comment '# comment 1', tl1
-
- assert_equal [['comment 1', tl1]], cm.comment_location
- assert_equal 'comment 1', cm.comment
-
- cm.add_comment '# comment 2', tl2
-
- assert_equal [['comment 1', tl1], ['comment 2', tl2]], cm.comment_location
- assert_equal "comment 1\n---\ncomment 2", cm.comment
-
- cm.add_comment "# * comment 3", tl3
-
- assert_equal [['comment 1', tl1],
- ['comment 2', tl2],
- ['* comment 3', tl3]], cm.comment_location
- assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment
- end
-
- def test_add_comment_comment
- cm = RDoc::ClassModule.new 'Klass'
+ def setup
+ super
- cm.add_comment comment('comment'), @top_level
-
- assert_equal 'comment', cm.comment.text
- end
-
- def test_add_comment_duplicate
- tl1 = @store.add_file 'one.rb'
-
- cm = RDoc::ClassModule.new 'Klass'
- cm.add_comment '# comment 1', tl1
- cm.add_comment '# comment 2', tl1
-
- assert_equal [['comment 2', tl1]], cm.comment_location
- end
-
- def test_add_comment_stopdoc
- tl = @store.add_file 'file.rb'
-
- cm = RDoc::ClassModule.new 'Klass'
- cm.stop_doc
-
- cm.add_comment '# comment 1', tl
-
- assert_empty cm.comment
- end
-
- def test_ancestors
- assert_equal [@parent, "Object"], @child.ancestors
+ @RM = RDoc::Markup
end
def test_comment_equals
@@ -81,65 +23,6 @@ class TestRDocClassModule < XrefTestCase
assert_equal "comment 1\n---\ncomment 2\n---\n* comment 3", cm.comment
end
- def test_comment_equals_comment
- cm = RDoc::ClassModule.new 'Klass'
-
- cm.comment = comment 'comment'
-
- assert_equal 'comment', cm.comment.text
- end
-
- def test_docuent_self_or_methods
- assert @c1.document_self_or_methods
-
- @c1.document_self = false
-
- assert @c1.document_self_or_methods
-
- @c1_m.document_self = false
-
- assert @c1.document_self_or_methods
-
- @c1__m.document_self = false
-
- refute @c1.document_self_or_methods
- end
-
- def test_documented_eh
- cm = RDoc::ClassModule.new 'C'
-
- refute cm.documented?
-
- cm.add_comment 'hi', @top_level
-
- assert cm.documented?
-
- cm.comment.replace ''
-
- assert cm.documented?
-
- cm.comment_location.clear
-
- refute cm.documented?
-
- cm.document_self = nil # notify :nodoc:
-
- assert cm.documented?
- end
-
- def test_each_ancestor
- assert_equal [@parent], @child.each_ancestor.to_a
- end
-
- def test_each_ancestor_cycle
- m_incl = RDoc::Include.new 'M', nil
-
- m = @top_level.add_module RDoc::NormalModule, 'M'
- m.add_include m_incl
-
- assert_empty m.each_ancestor.to_a
- end
-
# handle making a short module alias of yourself
def test_find_class_named
@@ -148,1298 +31,70 @@ class TestRDocClassModule < XrefTestCase
assert_nil @c2.find_class_named('C1')
end
- def test_from_module_comment
- tl = @store.add_file 'file.rb'
- klass = tl.add_class RDoc::NormalModule, 'Klass'
- klass.add_comment 'really a class', tl
-
- klass = RDoc::ClassModule.from_module RDoc::NormalClass, klass
-
- assert_equal [['really a class', tl]], klass.comment_location
- end
-
- def test_marshal_dump
- @store.path = Dir.tmpdir
- tl = @store.add_file 'file.rb'
-
- ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
- cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
- cm.record_location tl
-
- a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
- a1.record_location tl
- a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
- a2.record_location tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location tl
-
- c1 = RDoc::Constant.new 'C1', nil, ''
- c1.record_location tl
-
- i1 = RDoc::Include.new 'I1', ''
- i1.record_location tl
-
- e1 = RDoc::Extend.new 'E1', ''
- e1.record_location tl
-
- section_comment = RDoc::Comment.new('section comment')
- section_comment.location = tl
-
- assert_equal 1, cm.sections.length, 'sanity, default section only'
- s0 = cm.sections.first
- s1 = cm.add_section 'section', section_comment
-
- cm.add_attribute a1
- cm.add_attribute a2
- cm.add_method m1
- cm.add_constant c1
- cm.add_include i1
- cm.add_extend e1
- cm.add_comment 'this is a comment', tl
-
- loaded = Marshal.load Marshal.dump cm
- loaded.store = @store
-
- assert_equal cm, loaded
-
- inner = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
- inner.file = tl
-
- comment = RDoc::Markup::Document.new inner
-
- assert_equal [a2, a1], loaded.attributes.sort
- assert_equal comment, loaded.comment
- assert_equal [c1], loaded.constants
- assert_equal 'Namespace::Klass', loaded.full_name
- assert_equal [i1], loaded.includes
- assert_equal [e1], loaded.extends
- assert_equal [m1], loaded.method_list
- assert_equal 'Klass', loaded.name
- assert_equal 'Super', loaded.superclass
- assert_equal [tl], loaded.in_files
- assert_equal 'Namespace', loaded.parent.name
-
- expected = { nil => s0, 'section' => s1 }
- assert_equal expected, loaded.sections_hash
-
- assert_equal tl, loaded.attributes.first.file
-
- assert_equal tl, loaded.constants.first.file
-
- assert_equal tl, loaded.includes.first.file
-
- assert_equal tl, loaded.extends.first.file
-
- assert_equal tl, loaded.method_list.first.file
- end
-
- def test_marshal_load_version_0
- tl = @store.add_file 'file.rb'
- ns = tl.add_module RDoc::NormalModule, 'Namespace'
- cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
-
- a = RDoc::Attr.new(nil, 'a1', 'RW', '')
- m = RDoc::AnyMethod.new(nil, 'm1')
- c = RDoc::Constant.new('C1', nil, '')
- i = RDoc::Include.new('I1', '')
-
- s0 = cm.sections.first
-
- cm.add_attribute a
- cm.add_method m
- cm.add_constant c
- cm.add_include i
- cm.add_comment 'this is a comment', tl
-
- loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x00\"\nKlass" +
- "\"\x15Namespace::KlassI\"\nSuper\x06:\x06EF" +
- "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
- "o:\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
- "\"\x16this is a comment\x06;\x06F[\x06[\aI" +
- "\"\aa1\x06;\x06FI\"\aRW\x06;\x06F[\x06[\aI" +
- "\"\aC1\x06;\x06Fo;\a\x06;\b[\x00[\x06[\aI" +
- "\"\aI1\x06;\x06Fo;\a\x06;\b[\x00[\a[\aI" +
- "\"\nclass\x06;\x06F[\b[\a:\vpublic[\x00[\a" +
- ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
- "\"\rinstance\x06;\x06F[\b[\a;\n[\x06I" +
- "\"\am1\x06;\x06F[\a;\v[\x00[\a;\f[\x00"
-
- loaded.store = @store
-
- assert_equal cm, loaded
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
-
- assert_equal [a], loaded.attributes
- assert_equal comment, loaded.comment
- assert_equal [c], loaded.constants
- assert_equal 'Namespace::Klass', loaded.full_name
- assert_equal [i], loaded.includes
- assert_equal [m], loaded.method_list
- assert_equal 'Klass', loaded.name
- assert_equal 'Super', loaded.superclass
- assert_nil loaded.file
- assert_empty loaded.in_files
- assert_nil loaded.parent
- assert loaded.current_section
-
- expected = { nil => s0 }
- assert_equal expected, loaded.sections_hash
-
- assert loaded.display?
- end
-
- def test_marshal_load_version_1
- tl = @store.add_file 'file.rb'
-
- ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
- cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
- cm.record_location tl
-
- a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
- a1.record_location tl
- a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
- a2.record_location tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location tl
-
- c1 = RDoc::Constant.new 'C1', nil, ''
- c1.record_location tl
-
- i1 = RDoc::Include.new 'I1', ''
- i1.record_location tl
-
- s0 = cm.sections.first
-
- cm.add_attribute a1
- cm.add_attribute a2
- cm.add_method m1
- cm.add_constant c1
- cm.add_include i1
- cm.add_comment 'this is a comment', tl
-
- loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Ei\x06I\"\nKlass" +
- "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
- "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
- ":\v@parts[\x06o;\a\a;\b[\x06o" +
- ":\x1CRDoc::Markup::Paragraph\x06;\b" +
- "[\x06I\"\x16this is a comment\x06;\x06F" +
- ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
- "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
- "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
- "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
- "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
- "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
- "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
- "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
- "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00"
-
- loaded.store = @store
-
- assert_equal cm, loaded
-
- inner = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
- inner.file = tl
-
- comment = RDoc::Markup::Document.new inner
-
- assert_equal [a2, a1], loaded.attributes.sort
- assert_equal comment, loaded.comment
- assert_equal [c1], loaded.constants
- assert_equal 'Namespace::Klass', loaded.full_name
- assert_equal [i1], loaded.includes
- assert_empty loaded.extends
- assert_equal [m1], loaded.method_list
- assert_equal 'Klass', loaded.name
- assert_equal 'Super', loaded.superclass
- assert_empty loaded.in_files
- assert_nil loaded.parent
- assert loaded.current_section
-
- assert_equal tl, loaded.attributes.first.file
- assert_equal tl, loaded.constants.first.file
- assert_equal tl, loaded.includes.first.file
- assert_equal tl, loaded.method_list.first.file
-
- expected = { nil => s0 }
- assert_equal expected, loaded.sections_hash
- end
-
- def test_marshal_load_version_2
- tl = @store.add_file 'file.rb'
-
- ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
- cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
- cm.record_location tl
-
- a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
- a1.record_location tl
- a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
- a2.record_location tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location tl
-
- c1 = RDoc::Constant.new 'C1', nil, ''
- c1.record_location tl
-
- i1 = RDoc::Include.new 'I1', ''
- i1.record_location tl
-
- e1 = RDoc::Extend.new 'E1', ''
- e1.record_location tl
-
- s0 = cm.sections.first
-
- cm.add_attribute a1
- cm.add_attribute a2
- cm.add_method m1
- cm.add_constant c1
- cm.add_include i1
- cm.add_extend e1
- cm.add_comment 'this is a comment', tl
-
- loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
- "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
- "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
- ":\v@parts[\x06o;\a\a;\b[\x06o" +
- ":\x1CRDoc::Markup::Paragraph\x06;\b" +
- "[\x06I\"\x16this is a comment\x06;\x06F" +
- ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
- "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
- "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
- "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
- "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
- "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
- "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
- "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
- "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
- "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
- loaded.store = @store
-
- assert_equal cm, loaded
-
- inner = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
- inner.file = tl
-
- comment = RDoc::Markup::Document.new inner
-
- assert_equal [a2, a1], loaded.attributes.sort
- assert_equal comment, loaded.comment
- assert_equal [c1], loaded.constants
- assert_equal 'Namespace::Klass', loaded.full_name
- assert_equal [i1], loaded.includes
- assert_equal [e1], loaded.extends
- assert_equal [m1], loaded.method_list
- assert_equal 'Klass', loaded.name
- assert_equal 'Super', loaded.superclass
- assert_empty loaded.in_files
- assert_nil loaded.parent
- assert loaded.current_section
-
- assert_equal tl, loaded.attributes. first.file
- assert_equal tl, loaded.constants. first.file
- assert_equal tl, loaded.includes. first.file
- assert_equal tl, loaded.extends. first.file
- assert_equal tl, loaded.method_list.first.file
-
- expected = { nil => s0 }
- assert_equal expected, loaded.sections_hash
- end
-
- def test_marshal_load_version_3
- tl = @store.add_file 'file.rb'
-
- ns = tl.add_module RDoc::NormalModule, 'Namespace'
-
- cm = ns.add_class RDoc::NormalClass, 'Klass', 'Super'
- cm.record_location tl
-
- a1 = RDoc::Attr.new nil, 'a1', 'RW', ''
- a1.record_location tl
- a2 = RDoc::Attr.new nil, 'a2', 'RW', '', true
- a2.record_location tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location tl
-
- c1 = RDoc::Constant.new 'C1', nil, ''
- c1.record_location tl
-
- i1 = RDoc::Include.new 'I1', ''
- i1.record_location tl
-
- e1 = RDoc::Extend.new 'E1', ''
- e1.record_location tl
-
- section_comment = RDoc::Comment.new('section comment')
- section_comment.location = tl
-
- assert_equal 1, cm.sections.length, 'sanity, default section only'
- s0 = cm.sections.first
- s1 = cm.add_section 'section', section_comment
-
- cm.add_attribute a1
- cm.add_attribute a2
- cm.add_method m1
- cm.add_constant c1
- cm.add_include i1
- cm.add_extend e1
- cm.add_comment 'this is a comment', tl
-
- loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x13i\bI\"\nKlass" +
- "\x06:\x06ETI\"\x15Namespace::Klass\x06;\x06TI" +
- "\"\nSuper\x06;\x06To:\eRDoc::Markup::Document\a" +
- ":\v@parts[\x06o;\a\a;\b[\x06o" +
- ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
- "\"\x16this is a comment\x06;\x06T:\n@fileI" +
- "\"\ffile.rb\x06;\x06T;\n0[\a[\nI\"\aa2\x06;" +
- "\x06TI\"\aRW\x06;\x06T:\vpublicT@\x11[\nI" +
- "\"\aa1\x06;\x06TI\"\aRW\x06;\x06T;\vF@\x11" +
- "[\x06U:\x13RDoc::Constant[\x0Fi\x00I\"\aC1\x06" +
- ";\x06TI\"\x19Namespace::Klass::C1\x06;\x06T00o" +
- ";\a\a;\b[\x00;\n0@\x11@\ac\x16RDoc::NormalClass0" +
- "[\x06[\bI\"\aI1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
- "[\a[\aI\"\nclass\x06;\x06T[\b[\a;\v[\x00[\a" +
- ":\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
- "\"\rinstance\x06;\x06T[\b[\a;\v[\x06[\aI" +
- "\"\am1\x06;\x06T@\x11[\a;\r[\x00[\a;\x0E[\x00" +
- "[\x06[\bI\"\aE1\x06;\x06To;\a\a;\b[\x00;\n0@\x11" +
- "[\aU:\eRDoc::Context::Section[\bi\x000o;\a\a;\b" +
- "[\x00;\n0U;\x0F[\bi\x00I\"\fsection\x06;\x06To" +
- ";\a\a;\b[\x06o;\a\a;\b[\x06o;\t\x06;\b[\x06I" +
- "\"\x14section comment\x06;\x06T;\n@\x11;\n0" +
- "[\x06@\x11I\"\x0ENamespace\x06" +
- ";\x06Tc\x17RDoc::NormalModule"
-
- loaded.store = @store
-
- assert_equal cm, loaded
-
- inner = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('this is a comment'))
- inner.file = tl
-
- comment = RDoc::Markup::Document.new inner
-
- assert_equal [a2, a1], loaded.attributes.sort
- assert_equal comment, loaded.comment
- assert_equal [c1], loaded.constants
- assert_equal 'Namespace::Klass', loaded.full_name
- assert_equal [i1], loaded.includes
- assert_equal [e1], loaded.extends
- assert_equal [m1], loaded.method_list
- assert_equal 'Klass', loaded.name
- assert_equal 'Super', loaded.superclass
- assert_equal 'Namespace', loaded.parent.name
- assert loaded.current_section
-
- expected = {
- nil => s0,
- 'section' => s1,
- }
-
- assert_equal expected, loaded.sections_hash
- assert_equal [tl], loaded.in_files
-
- assert_equal tl, loaded.attributes. first.file
- assert_equal tl, loaded.constants. first.file
- assert_equal tl, loaded.includes. first.file
- assert_equal tl, loaded.extends. first.file
- assert_equal tl, loaded.method_list.first.file
- end
-
def test_merge
- tl = @store.add_file 'one.rb'
- p1 = tl.add_class RDoc::NormalClass, 'Parent'
- c1 = p1.add_class RDoc::NormalClass, 'Klass'
-
- c2 = RDoc::NormalClass.new 'Klass'
-
- c2.merge c1
-
- assert_equal 'Parent', c1.parent_name, 'original parent name'
- assert_equal 'Parent', c2.parent_name, 'merged parent name'
-
- assert c1.current_section, 'original current_section'
- assert c2.current_section, 'merged current_section'
- end
-
- def test_merge_attributes
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
-
cm1 = RDoc::ClassModule.new 'Klass'
-
- attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
- attr.record_location tl1
- attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
- attr.record_location tl1
- attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
- attr.record_location tl1
+ cm1.comment = 'klass 1'
+ cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
+ cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
+ cm1.add_constant RDoc::Constant.new('C1', nil, '')
+ cm1.add_include RDoc::Include.new('I1', '')
+ cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
cm2 = RDoc::ClassModule.new 'Klass'
- # TODO allow merging when comment == ''
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
- attr.record_location tl2
- attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
- attr.record_location tl1
- attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
- attr.record_location tl1
+ cm2.instance_variable_set(:@comment,
+ @RM::Document.new(
+ @RM::Paragraph.new('klass 2')))
+ cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
+ cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
+ cm2.add_constant RDoc::Constant.new('C2', nil, '')
+ cm2.add_include RDoc::Include.new('I2', '')
+ cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
cm1.merge cm2
- expected = [
- RDoc::Attr.new(nil, 'a2', 'RW', ''),
- RDoc::Attr.new(nil, 'a3', 'W', ''),
- RDoc::Attr.new(nil, 'a4', 'W', ''),
- ]
-
- expected.each do |a| a.parent = cm1 end
- assert_equal expected, cm1.attributes.sort
- end
-
- def test_merge_attributes_version_0
- tl1 = @store.add_file 'one.rb'
-
- cm1 = RDoc::ClassModule.new 'Klass'
-
- attr = cm1.add_attribute RDoc::Attr.new(nil, 'a1', 'RW', '')
- attr.record_location tl1
- attr = cm1.add_attribute RDoc::Attr.new(nil, 'a3', 'R', '')
- attr.record_location tl1
- attr = cm1.add_attribute RDoc::Attr.new(nil, 'a4', 'R', '')
- attr.record_location tl1
-
- cm2 = RDoc::ClassModule.new 'Klass'
- # TODO allow merging when comment == ''
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- attr = cm2.add_attribute RDoc::Attr.new(nil, 'a2', 'RW', '')
- attr = cm2.add_attribute RDoc::Attr.new(nil, 'a3', 'W', '')
- attr = cm2.add_attribute RDoc::Attr.new(nil, 'a4', 'W', '')
+ document = @RM::Document.new(
+ @RM::Paragraph.new('klass 2'),
+ @RM::Paragraph.new('klass 1'))
- cm1.merge cm2
+ assert_equal document, cm1.comment
expected = [
RDoc::Attr.new(nil, 'a1', 'RW', ''),
RDoc::Attr.new(nil, 'a2', 'RW', ''),
RDoc::Attr.new(nil, 'a3', 'RW', ''),
- RDoc::Attr.new(nil, 'a4', 'RW', ''),
]
expected.each do |a| a.parent = cm1 end
assert_equal expected, cm1.attributes.sort
- end
-
- def test_merge_collections_drop
- tl = @store.add_file 'file'
-
- cm1 = RDoc::ClassModule.new 'C'
- cm1.record_location tl
-
- const = cm1.add_constant RDoc::Constant.new('CONST', nil, nil)
- const.record_location tl
-
- cm2 = RDoc::ClassModule.new 'C'
- cm2.record_location tl
-
- added = []
- removed = []
-
- cm1.merge_collections cm1.constants, cm2.constants, cm2.in_files do |add, c|
- if add then
- added << c
- else
- removed << c
- end
- end
-
- assert_empty added
- assert_equal [const], removed
- end
-
- def test_merge_comment
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
-
- cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
- cm1.add_comment 'klass 1', tl1
- cm1.record_location tl1
-
- cm2 = tl1.add_class RDoc::NormalClass, 'Klass'
- cm2.add_comment 'klass 2', tl2
- cm2.add_comment 'klass 3', tl1
- cm2.record_location tl1
- cm2.record_location tl2
-
- cm2 = Marshal.load Marshal.dump cm2
- cm2.store = @store
-
- cm1.merge cm2
-
- inner1 = @RM::Document.new @RM::Paragraph.new 'klass 3'
- inner1.file = 'one.rb'
- inner2 = @RM::Document.new @RM::Paragraph.new 'klass 2'
- inner2.file = 'two.rb'
-
- expected = @RM::Document.new inner2, inner1
-
- assert_equal expected, cm1.comment
- end
-
- def test_merge_comment_version_0
- tl = @store.add_file 'file.rb'
-
- cm1 = RDoc::ClassModule.new 'Klass'
- cm1.add_comment 'klass 1', tl
-
- cm2 = RDoc::ClassModule.new 'Klass'
-
- cm2.instance_variable_set(:@comment,
- @RM::Document.new(
- @RM::Paragraph.new('klass 2')))
- cm2.instance_variable_set :@comment_location, @RM::Document.new(cm2.comment)
-
- cm1.merge cm2
-
- inner = @RM::Document.new @RM::Paragraph.new 'klass 1'
- inner.file = 'file.rb'
-
- expected = @RM::Document.new \
- inner,
- @RM::Document.new(@RM::Paragraph.new('klass 2'))
-
- assert_equal expected, cm1.comment
- end
-
- def test_merge_constants
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
-
- cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
- const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
- const.record_location tl1
- const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
- const.record_location tl1
-
- store = RDoc::Store.new
- tl = store.add_file 'one.rb'
- cm2 = tl.add_class RDoc::ClassModule, 'Klass'
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
- const.record_location tl2
- const = cm2.add_constant RDoc::Constant.new('C3', nil, 'one')
- const.record_location tl1
- const = cm2.add_constant RDoc::Constant.new('C4', nil, 'one')
- const.record_location tl1
-
- cm1.merge cm2
expected = [
- RDoc::Constant.new('C2', nil, 'two'),
- RDoc::Constant.new('C3', nil, 'one'),
- RDoc::Constant.new('C4', nil, 'one'),
+ RDoc::Constant.new('C1', nil, ''),
+ RDoc::Constant.new('C2', nil, ''),
]
- expected.each do |a| a.parent = cm1 end
-
+ expected.each do |c| c.parent = cm1 end
assert_equal expected, cm1.constants.sort
- end
-
- def test_merge_constants_version_0
- tl1 = @store.add_file 'one.rb'
-
- cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
- const = cm1.add_constant RDoc::Constant.new('C1', nil, 'one')
- const.record_location tl1
- const = cm1.add_constant RDoc::Constant.new('C3', nil, 'one')
- const.record_location tl1
-
- store = RDoc::Store.new
- tl = store.add_file 'one.rb'
- cm2 = tl.add_class RDoc::ClassModule, 'Klass'
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- const = cm2.add_constant RDoc::Constant.new('C2', nil, 'two')
- const = cm2.add_constant RDoc::Constant.new('C3', nil, 'two')
- const = cm2.add_constant RDoc::Constant.new('C4', nil, 'two')
-
- cm1.merge cm2
expected = [
- RDoc::Constant.new('C1', nil, 'one'),
- RDoc::Constant.new('C2', nil, 'two'),
- RDoc::Constant.new('C3', nil, 'one'),
- RDoc::Constant.new('C4', nil, 'two'),
+ RDoc::Include.new('I1', ''),
+ RDoc::Include.new('I2', ''),
]
- expected.each do |a| a.parent = cm1 end
-
- assert_equal expected, cm1.constants.sort
- end
-
- def test_merge_extends
- tl1 = @store.add_file 'one.rb'
- cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
- ext = cm1.add_extend RDoc::Extend.new('I1', 'one')
- ext.record_location tl1
- ext = cm1.add_extend RDoc::Extend.new('I3', 'one')
- ext.record_location tl1
-
- tl2 = @store.add_file 'two.rb'
- tl2.store = RDoc::Store.new
-
- cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- ext = cm2.add_extend RDoc::Extend.new('I2', 'two')
- ext.record_location tl2
- ext = cm2.add_extend RDoc::Extend.new('I3', 'one')
- ext.record_location tl1
- ext = cm2.add_extend RDoc::Extend.new('I4', 'one')
- ext.record_location tl1
-
- cm1.merge cm2
-
- expected = [
- RDoc::Extend.new('I2', 'two'),
- RDoc::Extend.new('I3', 'one'),
- RDoc::Extend.new('I4', 'one'),
- ]
-
- expected.each do |a| a.parent = cm1 end
-
- assert_equal expected, cm1.extends.sort
- end
-
- def test_merge_includes
- tl1 = @store.add_file 'one.rb'
-
- cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
- incl = cm1.add_include RDoc::Include.new('I1', 'one')
- incl.record_location tl1
- incl = cm1.add_include RDoc::Include.new('I3', 'one')
- incl.record_location tl1
-
- tl2 = @store.add_file 'two.rb'
- tl2.store = RDoc::Store.new
-
- cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- incl = cm2.add_include RDoc::Include.new('I2', 'two')
- incl.record_location tl2
- incl = cm2.add_include RDoc::Include.new('I3', 'one')
- incl.record_location tl1
- incl = cm2.add_include RDoc::Include.new('I4', 'one')
- incl.record_location tl1
-
- cm1.merge cm2
-
- expected = [
- RDoc::Include.new('I2', 'two'),
- RDoc::Include.new('I3', 'one'),
- RDoc::Include.new('I4', 'one'),
- ]
-
- expected.each do |a| a.parent = cm1 end
-
+ expected.each do |i| i.parent = cm1 end
assert_equal expected, cm1.includes.sort
- end
-
- def test_merge_includes_version_0
- tl1 = @store.add_file 'one.rb'
-
- cm1 = tl1.add_class RDoc::ClassModule, 'Klass'
-
- incl = cm1.add_include RDoc::Include.new('I1', 'one')
- incl.record_location tl1
- incl = cm1.add_include RDoc::Include.new('I3', 'one')
- incl.record_location tl1
-
- tl2 = @store.add_file 'one.rb'
- tl2.store = RDoc::Store.new
-
- cm2 = tl2.add_class RDoc::ClassModule, 'Klass'
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- incl = cm2.add_include RDoc::Include.new('I2', 'two')
- incl = cm2.add_include RDoc::Include.new('I3', 'two')
- incl = cm2.add_include RDoc::Include.new('I4', 'two')
-
- cm1.merge cm2
-
- expected = [
- RDoc::Include.new('I1', 'one'),
- RDoc::Include.new('I2', 'two'),
- RDoc::Include.new('I3', 'one'),
- RDoc::Include.new('I4', 'two'),
- ]
-
- expected.each do |a| a.parent = cm1 end
-
- assert_equal expected, cm1.includes.sort
- end
-
- def test_merge_methods
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
-
- cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
- meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
- meth.record_location tl1
- meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
- meth.record_location tl1
-
- cm2 = RDoc::ClassModule.new 'Klass'
- cm2.store = @store
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
- meth.record_location tl2
- meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
- meth.record_location tl1
- meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
- meth.record_location tl1
-
- cm1.merge cm2
-
- expected = [
- RDoc::AnyMethod.new(nil, 'm2'),
- RDoc::AnyMethod.new(nil, 'm3'),
- RDoc::AnyMethod.new(nil, 'm4'),
- ]
-
- expected.each do |a| a.parent = cm1 end
-
- assert_equal expected, cm1.method_list.sort
- end
-
- def test_merge_methods_version_0
- tl1 = @store.add_file 'one.rb'
-
- cm1 = tl1.add_class RDoc::NormalClass, 'Klass'
-
- meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm1')
- meth.record_location tl1
- meth = cm1.add_method RDoc::AnyMethod.new(nil, 'm3')
- meth.record_location tl1
-
- cm2 = RDoc::ClassModule.new 'Klass'
- cm2.store = @store
- cm2.instance_variable_set :@comment, @RM::Document.new
-
- meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm2')
- meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm3')
- meth = cm2.add_method RDoc::AnyMethod.new(nil, 'm4')
-
- cm1.merge cm2
expected = [
RDoc::AnyMethod.new(nil, 'm1'),
RDoc::AnyMethod.new(nil, 'm2'),
- RDoc::AnyMethod.new(nil, 'm3'),
- RDoc::AnyMethod.new(nil, 'm4'),
]
- expected.each do |a| a.parent = cm1 end
-
+ expected.each do |m| m.parent = cm1 end
assert_equal expected, cm1.method_list.sort
end
- def test_merge_sections
- store1 = @store
-
- tl1_1 = store1.add_file 'one.rb'
-
- cm1 = tl1_1.add_class RDoc::ClassModule, 'Klass'
- cm1.record_location tl1_1
-
- s1_0 = cm1.sections.first
- s1_1 = cm1.add_section 'section 1', comment('comment 1', tl1_1)
- cm1.add_section 'section 2', comment('comment 2 a', tl1_1)
- cm1.add_section 'section 4', comment('comment 4 a', tl1_1)
-
- store2 = RDoc::Store.new
- tl2_1 = store2.add_file 'one.rb'
- tl2_2 = store2.add_file 'two.rb'
-
- cm2 = tl2_1.add_class RDoc::ClassModule, 'Klass'
- cm2.record_location tl2_1
- cm2.record_location tl2_2
-
- cm2.sections.first
- s2_2 = cm2.add_section 'section 2', comment('comment 2 b', tl2_1)
- s2_3 = cm2.add_section 'section 3', comment('comment 3', tl2_2)
- cm2.add_section 'section 4', comment('comment 4 b', tl2_2)
-
- cm1.merge cm2
-
- expected = [
- s1_0,
- s1_1,
- s2_2,
- s2_3,
- RDoc::Context::Section.new(cm1, 'section 4', nil)
- ]
-
- merged_sections = cm1.sections.sort_by do |s|
- s.title || ''
- end
-
- assert_equal expected, merged_sections
-
- assert_equal [comment('comment 2 b', tl2_1)],
- cm1.sections_hash['section 2'].comments
-
- expected_s4_comments = [
- comment('comment 4 a', tl2_1),
- comment('comment 4 b', tl2_2),
- ]
-
- assert_equal expected_s4_comments, cm1.sections_hash['section 4'].comments
- end
-
- def test_merge_sections_overlap
- store1 = @store
-
- tl1_1 = store1.add_file 'one.rb'
- tl1_3 = store1.add_file 'three.rb'
-
- cm1 = tl1_1.add_class RDoc::ClassModule, 'Klass'
- cm1.record_location tl1_1
-
- cm1.add_section 'section', comment('comment 1 a', tl1_1)
- cm1.add_section 'section', comment('comment 3', tl1_3)
-
- store2 = RDoc::Store.new
- tl2_1 = store2.add_file 'one.rb'
- tl2_2 = store2.add_file 'two.rb'
- tl2_3 = store2.add_file 'three.rb'
-
- cm2 = tl2_1.add_class RDoc::ClassModule, 'Klass'
- cm2.record_location tl2_1
- cm2.record_location tl2_2
-
- s2_0 = cm2.sections.first
- s2_1 = cm2.add_section 'section', comment('comment 1 b', tl1_1)
- cm2.add_section 'section', comment('comment 2', tl2_2)
-
- cm1.merge_sections cm2
-
- expected = [
- s2_0,
- s2_1,
- ]
-
- merged_sections = cm1.sections.sort_by do |s|
- s.title || ''
- end
-
- assert_equal expected, merged_sections
-
- expected = [
- comment('comment 1 b', tl2_1),
- comment('comment 3', tl2_3),
- comment('comment 2', tl2_2),
- ]
-
- comments = cm1.sections_hash['section'].comments
-
- assert_equal expected, comments.sort_by { |c| c.file.name }
- end
-
- def test_parse
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
-
- cm = RDoc::ClassModule.new 'Klass'
- cm.add_comment 'comment 1', tl1
- cm.add_comment 'comment 2', tl2
-
- doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
- doc1.file = tl1
- doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
- doc2.file = tl2
-
- expected = @RM::Document.new doc1, doc2
-
- assert_equal expected, cm.parse(cm.comment_location)
- end
-
- def test_parse_comment
- tl1 = @store.add_file 'one.rb'
-
- cm = RDoc::ClassModule.new 'Klass'
- cm.comment = comment 'comment 1', tl1
-
- doc = @RM::Document.new @RM::Paragraph.new 'comment 1'
- doc.file = tl1
-
- assert_equal doc, cm.parse(cm.comment)
- end
-
- def test_parse_comment_format
- tl1 = @store.add_file 'one.rb'
-
- cm = RDoc::ClassModule.new 'Klass'
- cm.comment = comment 'comment ((*1*))', tl1
- cm.comment.format = 'rd'
-
- doc = @RM::Document.new @RM::Paragraph.new 'comment <em>1</em>'
- doc.file = tl1
-
- assert_equal doc, cm.parse(cm.comment)
- end
-
- def test_parse_comment_location
- tl1 = @store.add_file 'one.rb'
- tl2 = @store.add_file 'two.rb'
-
- cm = tl1.add_class RDoc::NormalClass, 'Klass'
- cm.add_comment 'comment 1', tl1
- cm.add_comment 'comment 2', tl2
-
- cm = Marshal.load Marshal.dump cm
-
- doc1 = @RM::Document.new @RM::Paragraph.new 'comment 1'
- doc1.file = tl1
- doc2 = @RM::Document.new @RM::Paragraph.new 'comment 2'
- doc2.file = tl2
-
- assert_same cm.comment_location, cm.parse(cm.comment_location)
- end
-
- def test_remove_nodoc_children
- parent = @top_level.add_class RDoc::ClassModule, 'A'
- parent.modules_hash.replace 'B' => true, 'C' => true
- @store.modules_hash.replace 'A::B' => true
-
- parent.classes_hash.replace 'D' => true, 'E' => true
- @store.classes_hash.replace 'A::D' => true
-
- parent.remove_nodoc_children
-
- assert_equal %w[B], parent.modules_hash.keys
- assert_equal %w[D], parent.classes_hash.keys
- end
-
- def test_search_record
- @c2_c3.add_comment 'This is a comment.', @xref_data
-
- expected = [
- 'C3',
- 'C2::C3',
- 'C2::C3',
- '',
- 'C2/C3.html',
- '',
- "<p>This is a comment.\n"
- ]
-
- assert_equal expected, @c2_c3.search_record
- end
-
- def test_search_record_merged
- @c2_c3.add_comment 'comment A', @store.add_file('a.rb')
- @c2_c3.add_comment 'comment B', @store.add_file('b.rb')
-
- expected = [
- 'C3',
- 'C2::C3',
- 'C2::C3',
- '',
- 'C2/C3.html',
- '',
- "<p>comment A\n<p>comment B\n"
- ]
-
- assert_equal expected, @c2_c3.search_record
- end
-
- def test_store_equals
- # version 2
- loaded = Marshal.load "\x04\bU:\x16RDoc::NormalClass[\x0Fi\aI\"\nKlass" +
- "\x06:\x06EFI\"\x15Namespace::Klass\x06;\x06FI" +
- "\"\nSuper\x06;\x06Fo:\eRDoc::Markup::Document\a" +
- ":\v@parts[\x06o;\a\a;\b[\x06o" +
- ":\x1CRDoc::Markup::Paragraph\x06;\b" +
- "[\x06I\"\x16this is a comment\x06;\x06F" +
- ":\n@fileI\"\ffile.rb\x06;\x06F;\n0[\a[\nI" +
- "\"\aa2\x06;\x06FI\"\aRW\x06;\x06F:\vpublicT@\x11" +
- "[\nI\"\aa1\x06;\x06FI\"\aRW\x06;\x06F;\vF@\x11" +
- "[\x06[\bI\"\aC1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
- "[\x06[\bI\"\aI1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11" +
- "[\a[\aI\"\nclass\x06;\x06F[\b[\a;\v[\x00" +
- "[\a:\x0Eprotected[\x00[\a:\fprivate[\x00[\aI" +
- "\"\rinstance\x06;\x06F[\b[\a;\v[\x06[\aI" +
- "\"\am1\x06;\x06F@\x11[\a;\f[\x00[\a;\r[\x00" +
- "[\x06[\bI\"\aE1\x06;\x06Fo;\a\a;\b[\x00;\n0@\x11"
-
- loaded.store = @store
-
- assert_same @store, loaded.store
-
- a = loaded.attributes.first
- assert_same @store, a.store
- assert_same @store, a.file.store
-
- c = loaded.constants.first
- assert_same @store, c.store
- assert_same @store, c.file.store
-
- i = loaded.includes.first
- assert_same @store, i.store
- assert_same @store, i.file.store
-
- e = loaded.extends.first
- assert_same @store, e.store
- assert_same @store, e.file.store
-
- m = loaded.method_list.first
- assert_same @store, m.store
- assert_same @store, m.file.store
- end
-
def test_superclass
assert_equal @c3_h1, @c3_h2.superclass
end
- def test_update_aliases_class
- n1 = @xref_data.add_module RDoc::NormalClass, 'N1'
- n1_k2 = n1.add_module RDoc::NormalClass, 'N2'
-
- n1.add_module_alias n1_k2, 'A1', @xref_data
-
- n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
- refute_nil n1_a1_c
- assert_equal n1_k2, n1_a1_c.is_alias_for, 'sanity check'
-
- n1.update_aliases
-
- n1_a1_k = @xref_data.find_class_or_module 'N1::A1'
- refute_nil n1_a1_k
- assert_equal n1_k2, n1_a1_k.is_alias_for
- refute_equal n1_k2, n1_a1_k
-
- assert_equal 1, n1_k2.aliases.length
- assert_equal n1_a1_k, n1_k2.aliases.first
-
- assert_equal 'N1::N2', n1_k2.full_name
- assert_equal 'N1::A1', n1_a1_k.full_name
- end
-
- def test_update_aliases_module
- n1 = @xref_data.add_module RDoc::NormalModule, 'N1'
- n1_n2 = n1.add_module RDoc::NormalModule, 'N2'
-
- n1.add_module_alias n1_n2, 'A1', @xref_data
-
- n1_a1_c = n1.constants.find { |c| c.name == 'A1' }
- refute_nil n1_a1_c
- assert_equal n1_n2, n1_a1_c.is_alias_for, 'sanity check'
-
- n1.update_aliases
-
- n1_a1_m = @xref_data.find_class_or_module 'N1::A1'
- refute_nil n1_a1_m
- assert_equal n1_n2, n1_a1_m.is_alias_for
- refute_equal n1_n2, n1_a1_m
-
- assert_equal 1, n1_n2.aliases.length
- assert_equal n1_a1_m, n1_n2.aliases.first
-
- assert_equal 'N1::N2', n1_n2.full_name
- assert_equal 'N1::A1', n1_a1_m.full_name
- end
-
- def test_update_aliases_reparent
- l1 = @xref_data.add_module RDoc::NormalModule, 'L1'
- l1_l2 = l1.add_module RDoc::NormalModule, 'L2'
- o1 = @xref_data.add_module RDoc::NormalModule, 'O1'
-
- o1.add_module_alias l1_l2, 'A1', @xref_data
-
- o1_a1_c = o1.constants.find { |c| c.name == 'A1' }
- refute_nil o1_a1_c
- assert_equal l1_l2, o1_a1_c.is_alias_for
- refute_equal l1_l2, o1_a1_c
-
- o1.update_aliases
-
- o1_a1_m = @xref_data.find_class_or_module 'O1::A1'
- refute_nil o1_a1_m
- assert_equal l1_l2, o1_a1_m.is_alias_for
-
- assert_equal 1, l1_l2.aliases.length
- assert_equal o1_a1_m, l1_l2.aliases[0]
-
- assert_equal 'L1::L2', l1_l2.full_name
- assert_equal 'O1::A1', o1_a1_m.full_name
- end
-
- def test_update_aliases_reparent_root
- store = RDoc::Store.new
-
- top_level = store.add_file 'file.rb'
-
- klass = top_level.add_class RDoc::NormalClass, 'Klass'
- object = top_level.add_class RDoc::NormalClass, 'Object'
-
- const = RDoc::Constant.new 'A', nil, ''
- const.record_location top_level
- const.is_alias_for = klass
-
- top_level.add_module_alias klass, 'A', top_level
-
- object.add_constant const
-
- object.update_aliases
-
- assert_equal %w[A Klass Object], store.classes_hash.keys.sort
-
- assert_equal 'A', store.classes_hash['A'].full_name
- assert_equal 'Klass', store.classes_hash['Klass'].full_name
- end
-
- def test_update_includes
- a = RDoc::Include.new 'M1', nil
- b = RDoc::Include.new 'M2', nil
- c = RDoc::Include.new 'C', nil
-
- @c1.add_include a
- @c1.add_include b
- @c1.add_include c
- @c1.ancestors # cache included modules
-
- @m1_m2.document_self = nil
- assert @m1_m2.remove_from_documentation?
-
- assert @store.modules_hash.key? @m1_m2.full_name
- refute @store.modules_hash[@m1_m2.full_name].nil?
-
- @store.remove_nodoc @store.modules_hash
- refute @store.modules_hash.key? @m1_m2.full_name
-
- @c1.update_includes
-
- assert_equal [a, c], @c1.includes
- end
-
- def test_update_includes_trim
- a = RDoc::Include.new 'D::M', nil
- b = RDoc::Include.new 'D::M', nil
-
- @c1.add_include a
- @c1.add_include b
- @c1.ancestors # cache included modules
-
- @c1.update_includes
-
- assert_equal [a], @c1.includes
- end
-
- def test_update_includes_with_colons
- a = RDoc::Include.new 'M1', nil
- b = RDoc::Include.new 'M1::M2', nil
- c = RDoc::Include.new 'C', nil
-
- @c1.add_include a
- @c1.add_include b
- @c1.add_include c
- @c1.ancestors # cache included modules
-
- @m1_m2.document_self = nil
- assert @m1_m2.remove_from_documentation?
-
- assert @store.modules_hash.key? @m1_m2.full_name
- refute @store.modules_hash[@m1_m2.full_name].nil?
- @store.remove_nodoc @store.modules_hash
- refute @store.modules_hash.key? @m1_m2.full_name
-
- @c1.update_includes
-
- assert_equal [a, c], @c1.includes
- end
-
- def test_update_extends
- a = RDoc::Extend.new 'M1', nil
- b = RDoc::Extend.new 'M2', nil
- c = RDoc::Extend.new 'C', nil
-
- @c1.add_extend a
- @c1.add_extend b
- @c1.add_extend c
- @c1.each_extend do |extend| extend.module end # cache extended modules
-
- @m1_m2.document_self = nil
- assert @m1_m2.remove_from_documentation?
-
- assert @store.modules_hash.key? @m1_m2.full_name
- refute @store.modules_hash[@m1_m2.full_name].nil?
- @store.remove_nodoc @store.modules_hash
- refute @store.modules_hash.key? @m1_m2.full_name
-
- @c1.update_extends
-
- assert_equal [a, c], @c1.extends
- end
-
- def test_update_extends_trim
- a = RDoc::Extend.new 'D::M', nil
- b = RDoc::Extend.new 'D::M', nil
-
- @c1.add_extend a
- @c1.add_extend b
- @c1.each_extend do |extend| extend.module end # cache extended modules
-
- @c1.update_extends
-
- assert_equal [a], @c1.extends
- end
-
- def test_update_extends_with_colons
- a = RDoc::Extend.new 'M1', nil
- b = RDoc::Extend.new 'M1::M2', nil
- c = RDoc::Extend.new 'C', nil
-
- @c1.add_extend a
- @c1.add_extend b
- @c1.add_extend c
- @c1.each_extend do |extend| extend.module end # cache extended modules
-
- @m1_m2.document_self = nil
- assert @m1_m2.remove_from_documentation?
-
- assert @store.modules_hash.key? @m1_m2.full_name
- refute @store.modules_hash[@m1_m2.full_name].nil?
-
- @store.remove_nodoc @store.modules_hash
- refute @store.modules_hash.key? @m1_m2.full_name
-
- @c1.update_extends
-
- assert_equal [a, c], @c1.extends
- end
-
end
diff --git a/test/rdoc/test_rdoc_code_object.rb b/test/rdoc/test_rdoc_code_object.rb
index ef8a5df713..907bb7a3d5 100644
--- a/test/rdoc/test_rdoc_code_object.rb
+++ b/test/rdoc/test_rdoc_code_object.rb
@@ -1,6 +1,7 @@
-# coding: US-ASCII
-
+require 'rubygems'
+require 'minitest/autorun'
require File.expand_path '../xref_test_case', __FILE__
+require 'rdoc/code_object'
class TestRDocCodeObject < XrefTestCase
@@ -15,7 +16,6 @@ class TestRDocCodeObject < XrefTestCase
assert @co.document_children, 'document_children'
refute @co.force_documentation, 'force_documentation'
refute @co.done_documenting, 'done_documenting'
- refute @co.received_nodoc, 'received_nodoc'
assert_equal '', @co.comment, 'comment is empty'
end
@@ -29,95 +29,20 @@ class TestRDocCodeObject < XrefTestCase
assert_equal 'I am a comment', @co.comment
end
- def test_comment_equals_comment
- @co.comment = comment ''
-
- assert_equal '', @co.comment.text
-
- @co.comment = comment 'I am a comment'
-
- assert_equal 'I am a comment', @co.comment.text
- end
-
- def test_comment_equals_document
- doc = RDoc::Markup::Document.new
- @co.comment = doc
-
- @co.comment = ''
-
- assert_equal doc, @co.comment
- end
-
- def test_comment_equals_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
- input = 'text'
- input.force_encoding Encoding::UTF_8
-
- @co.comment = input
-
- assert_equal 'text', @co.comment
- assert_equal Encoding::UTF_8, @co.comment.encoding
- end
-
- def test_comment_equals_encoding_blank
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
- input = ''
- input.force_encoding Encoding::UTF_8
-
- @co.comment = input
-
- assert_equal '', @co.comment
- assert_equal Encoding::UTF_8, @co.comment.encoding
- end
-
- def test_display_eh_document_self
- assert @co.display?
-
- @co.document_self = false
-
- refute @co.display?
- end
-
- def test_display_eh_ignore
- assert @co.display?
-
- @co.ignore
-
- refute @co.display?
-
- @co.stop_doc
-
- refute @co.display?
-
- @co.done_documenting = false
-
- refute @co.display?
- end
-
def test_document_children_equals
@co.document_children = false
refute @co.document_children
- # TODO this is not true anymore:
- # test all the nodoc stuff etc...
- #@c2.document_children = false
- #assert_empty @c2.classes
+ @c2.document_children = false
+ assert_empty @c2.classes
end
def test_document_self_equals
@co.document_self = false
refute @co.document_self
- # TODO this is not true anymore:
- # test all the nodoc stuff etc...
- #@c1.document_self = false
- #assert_empty @c1.method_list
+ @c1.document_self = false
+ assert_empty @c1.method_list
end
def test_documented_eh
@@ -131,86 +56,11 @@ class TestRDocCodeObject < XrefTestCase
refute @co.documented?
- @co.document_self = nil # notify :nodoc:
+ @co.document_self = false
assert @co.documented?
end
- def test_done_documenting
- # once done_documenting is set, other properties refuse to go to "true"
- @co.done_documenting = true
-
- @co.document_self = true
- refute @co.document_self
-
- @co.document_children = true
- refute @co.document_children
-
- @co.force_documentation = true
- refute @co.force_documentation
-
- @co.start_doc
- refute @co.document_self
- refute @co.document_children
-
- # turning done_documenting on
- # resets others to true
-
- @co.done_documenting = false
- assert @co.document_self
- assert @co.document_children
- end
-
- def test_each_parent
- parents = []
-
- @parent_m.each_parent do |code_object|
- parents << code_object
- end
-
- assert_equal [@parent, @xref_data], parents
- end
-
- def test_file_name
- assert_equal nil, @co.file_name
-
- @co.record_location @store.add_file 'lib/file.rb'
-
- assert_equal 'lib/file.rb', @co.file_name
- end
-
- def test_full_name_equals
- @co.full_name = 'hi'
-
- assert_equal 'hi', @co.instance_variable_get(:@full_name)
-
- @co.full_name = nil
-
- assert_nil @co.instance_variable_get(:@full_name)
- end
-
- def test_ignore
- @co.ignore
-
- refute @co.document_self
- refute @co.document_children
- assert @co.ignored?
- end
-
- def test_ignore_eh
- refute @co.ignored?
-
- @co.ignore
-
- assert @co.ignored?
- end
-
- def test_line
- @c1_m.line = 5
-
- assert_equal 5, @c1_m.line
- end
-
def test_metadata
assert_empty @co.metadata
@@ -223,12 +73,6 @@ class TestRDocCodeObject < XrefTestCase
assert_equal 'not_rdoc', @co.metadata['markup']
end
- def test_offset
- @c1_m.offset = 5
-
- assert_equal 5, @c1_m.offset
- end
-
def test_parent_file_name
assert_equal '(unknown)', @co.parent_file_name
assert_equal 'xref_data.rb', @c1.parent_file_name
@@ -240,49 +84,6 @@ class TestRDocCodeObject < XrefTestCase
assert_equal 'C2', @c2_c3.parent_name
end
- def test_received_ndoc
- @co.document_self = false
- refute @co.received_nodoc
-
- @co.document_self = nil
- assert @co.received_nodoc
-
- @co.document_self = true
- end
-
- def test_record_location
- @co.record_location @xref_data
-
- assert_equal 'xref_data.rb', @co.file.relative_name
- end
-
- def test_record_location_ignored
- @co.ignore
- @co.record_location @xref_data
-
- refute @co.ignored?
- end
-
- def test_section
- parent = RDoc::Context.new
- section = parent.sections.first
-
- @co.parent = parent
- @co.instance_variable_set :@section, section
-
- assert_equal section, @co.section
-
- @co.instance_variable_set :@section, nil
- @co.instance_variable_set :@section_title, nil
-
- assert_equal section, @co.section
-
- @co.instance_variable_set :@section, nil
- @co.instance_variable_set :@section_title, 'new title'
-
- assert_equal 'new title', @co.section.title
- end
-
def test_start_doc
@co.document_self = false
@co.document_children = false
@@ -293,16 +94,6 @@ class TestRDocCodeObject < XrefTestCase
assert @co.document_children
end
- def test_start_doc_ignored
- @co.ignore
-
- @co.start_doc
-
- assert @co.document_self
- assert @co.document_children
- refute @co.ignored?
- end
-
def test_stop_doc
@co.document_self = true
@co.document_children = true
diff --git a/test/rdoc/test_rdoc_comment.rb b/test/rdoc/test_rdoc_comment.rb
deleted file mode 100644
index 2a1318b66c..0000000000
--- a/test/rdoc/test_rdoc_comment.rb
+++ /dev/null
@@ -1,504 +0,0 @@
-# coding: us-ascii
-
-require 'rdoc/test_case'
-
-class TestRDocComment < RDoc::TestCase
-
- def setup
- super
-
- @top_level = @store.add_file 'file.rb'
- @comment = RDoc::Comment.new
- @comment.location = @top_level
- @comment.text = 'this is a comment'
- end
-
- def test_empty_eh
- refute_empty @comment
-
- @comment = ''
-
- assert_empty @comment
- end
-
- def test_equals2
- assert_equal @comment, @comment.dup
-
- c2 = @comment.dup
- c2.text = nil
-
- refute_equal @comment, c2
-
- c3 = @comment.dup
- c3.location = nil
-
- refute_equal @comment, c3
- end
-
- def test_extract_call_seq
- m = RDoc::AnyMethod.new nil, 'm'
-
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
- bla => true or false
-
-moar comment
- COMMENT
-
- comment.extract_call_seq m
-
- assert_equal "bla => true or false\n", m.call_seq
- end
-
- def test_extract_call_seq_blank
- m = RDoc::AnyMethod.new nil, 'm'
-
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
- bla => true or false
-
- COMMENT
-
- comment.extract_call_seq m
-
- assert_equal "bla => true or false\n", m.call_seq
- end
-
- def test_extract_call_seq_commented
- m = RDoc::AnyMethod.new nil, 'm'
-
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-# call-seq:
-# bla => true or false
-#
-# moar comment
- COMMENT
-
- comment.extract_call_seq m
-
- assert_equal nil, m.call_seq
- end
-
- def test_extract_call_seq_no_blank
- m = RDoc::AnyMethod.new nil, 'm'
-
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
- bla => true or false
- COMMENT
-
- comment.extract_call_seq m
-
- assert_equal "bla => true or false\n", m.call_seq
- end
-
- def test_extract_call_seq_undent
- m = RDoc::AnyMethod.new nil, 'm'
-
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-call-seq:
- bla => true or false
-moar comment
- COMMENT
-
- comment.extract_call_seq m
-
- assert_equal "bla => true or false\nmoar comment\n", m.call_seq
- end
-
- def test_extract_call_seq_c
- comment = RDoc::Comment.new <<-COMMENT
-call-seq:
- commercial() -> Date <br />
- commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
- commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
-If no arguments are given:
-* ruby 1.8: returns a +Date+ for 1582-10-15 (the Day of Calendar Reform in
- Italy)
-* ruby 1.9: returns a +Date+ for julian day 0
-
-Otherwise, returns a +Date+ for the commercial week year, commercial week,
-and commercial week day given. Ignores the 4th argument.
- COMMENT
-
- method_obj = RDoc::AnyMethod.new nil, 'blah'
-
- comment.extract_call_seq method_obj
-
- expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
- CALL_SEQ
-
- assert_equal expected, method_obj.call_seq
- end
-
- def test_extract_call_seq_c_no_blank
- comment = RDoc::Comment.new <<-COMMENT
-call-seq:
- commercial() -> Date <br />
- commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
- commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
- COMMENT
-
- method_obj = RDoc::AnyMethod.new nil, 'blah'
-
- comment.extract_call_seq method_obj
-
- expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
-
- CALL_SEQ
-
- assert_equal expected, method_obj.call_seq
- end
-
- def test_extract_call_seq_c_separator
- comment = RDoc::Comment.new <<-'COMMENT'
-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"
-
- COMMENT
-
- method_obj = RDoc::AnyMethod.new nil, 'blah'
-
- comment.extract_call_seq method_obj
-
- expected = <<-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
- CALL_SEQ
-
- assert_equal expected, method_obj.call_seq
-
- expected = <<-'COMMENT'
-
-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"
-
- COMMENT
-
- assert_equal expected, comment.text
- end
-
- def test_force_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @comment.force_encoding Encoding::UTF_8
-
- assert_equal Encoding::UTF_8, @comment.text.encoding
- end
-
- def test_format
- assert_equal 'rdoc', @comment.format
- end
-
- def test_format_equals
- c = comment 'content'
- document = c.parse
-
- c.format = RDoc::RD
-
- assert_equal RDoc::RD, c.format
- refute_same document, c.parse
- end
-
- def test_initialize_copy
- copy = @comment.dup
-
- refute_same @comment.text, copy.text
- assert_same @comment.location, copy.location
- end
-
- def test_location
- assert_equal @top_level, @comment.location
- end
-
- def test_normalize
- @comment.text = <<-TEXT
- # comment
- TEXT
-
- assert_same @comment, @comment.normalize
-
- assert_equal 'comment', @comment.text
- end
-
- def test_normalize_twice
- @comment.text = <<-TEXT
- # comment
- TEXT
-
- @comment.normalize
-
- text = @comment.text
-
- @comment.normalize
-
- assert_same text, @comment.text, 'normalize not cached'
- end
-
- def test_normalize_document
- @comment.text = nil
- @comment.document = @RM::Document.new
-
- assert_same @comment, @comment.normalize
-
- assert_nil @comment.text
- end
-
- def test_normalize_eh
- refute @comment.normalized?
-
- @comment.normalize
-
- assert @comment.normalized?
- end
-
- def test_text
- assert_equal 'this is a comment', @comment.text
- end
-
- def test_text_equals
- @comment.text = 'other'
-
- assert_equal 'other', @comment.text
- refute @comment.normalized?
- end
-
- def test_text_equals_no_text
- c = RDoc::Comment.new nil, @top_level
- c.document = @RM::Document.new
-
- e = assert_raises RDoc::Error do
- c.text = 'other'
- end
-
- assert_equal 'replacing document-only comment is not allowed', e.message
- end
-
- def test_text_equals_parsed
- document = @comment.parse
-
- @comment.text = 'other'
-
- refute_equal document, @comment.parse
- end
-
- def test_tomdoc_eh
- refute @comment.tomdoc?
-
- @comment.format = 'tomdoc'
-
- assert @comment.tomdoc?
- end
-
- def test_parse
- parsed = @comment.parse
-
- expected = @RM::Document.new(
- @RM::Paragraph.new('this is a comment'))
-
- expected.file = @top_level
-
- assert_equal expected, parsed
- assert_same parsed, @comment.parse
- end
-
- def test_parse_rd
- c = comment 'it ((*works*))'
- c.format = 'rd'
-
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('it <em>works</em>'))
- expected.file = @top_level
-
- assert_equal expected, c.parse
- end
-
- def test_remove_private_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
- EOS
-
- comment.force_encoding Encoding::IBM437
-
- comment.remove_private
-
- assert_equal Encoding::IBM437, comment.text.encoding
- end
-
- def test_remove_private_hash
- @comment.text = <<-TEXT
-#--
-# private
-#++
-# public
- TEXT
-
- @comment.remove_private
-
- assert_equal "# public\n", @comment.text
- end
-
- def test_remove_private_hash_trail
- comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
- EOS
-
- expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
- EOS
-
- comment.remove_private
-
- assert_equal expected, comment
- end
-
- def test_remove_private_long
- comment = RDoc::Comment.new <<-EOS, @top_level
-#-----
-#++
-# this is text
-#-----
- EOS
-
- expected = RDoc::Comment.new <<-EOS, @top_level
-# this is text
- EOS
-
- comment.remove_private
-
- assert_equal expected, comment
- end
-
- def test_remove_private_rule
- comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text with a rule:
-# ---
-# this is also text
- EOS
-
- expected = comment.dup
-
- comment.remove_private
-
- assert_equal expected, comment
- end
-
- def test_remove_private_star
- @comment.text = <<-TEXT
-/*
- *--
- * private
- *++
- * public
- */
- TEXT
-
- @comment.remove_private
-
- assert_equal "/*\n * public\n */\n", @comment.text
- end
-
- def test_remove_private_star2
- @comment.text = <<-TEXT
-/*--
- * private
- *++
- * public
- */
- TEXT
-
- @comment.remove_private
-
- assert_equal "/*--\n * private\n *++\n * public\n */\n", @comment.text
- end
-
- def test_remove_private_toggle
- comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
- EOS
-
- expected = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-# This is text again.
- EOS
-
- comment.remove_private
-
- assert_equal expected, comment
- end
-
- def test_remove_private_toggle_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- comment = RDoc::Comment.new <<-EOS, @top_level
-# This is text
-#--
-# this is private
-#++
-# This is text again.
- EOS
-
- comment.force_encoding Encoding::IBM437
-
- comment.remove_private
-
- assert_equal Encoding::IBM437, comment.text.encoding
- end
-
- def test_remove_private_toggle_encoding_ruby_bug?
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- comment = RDoc::Comment.new <<-EOS, @top_level
-#--
-# this is private
-#++
-# This is text again.
- EOS
-
- comment.force_encoding Encoding::IBM437
-
- comment.remove_private
-
- assert_equal Encoding::IBM437, comment.text.encoding
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_constant.rb b/test/rdoc/test_rdoc_constant.rb
index 5c347f62ae..b915f5cc7a 100644
--- a/test/rdoc/test_rdoc_constant.rb
+++ b/test/rdoc/test_rdoc_constant.rb
@@ -8,142 +8,6 @@ class TestRDocConstant < XrefTestCase
@const = @c1.constants.first
end
- def test_full_name
- assert_equal 'C1::CONST', @const.full_name
- end
-
- def test_is_alias_for
- top_level = @store.add_file 'file.rb'
-
- c = RDoc::Constant.new 'CONST', nil, 'comment'
- top_level.add_constant c
-
- assert_nil c.is_alias_for
-
- c.is_alias_for = 'C1'
-
- assert_equal @c1, c.is_alias_for
-
- c.is_alias_for = 'unknown'
-
- assert_equal 'unknown', c.is_alias_for
- end
-
- def test_marshal_dump
- top_level = @store.add_file 'file.rb'
-
- c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
- c.record_location top_level
-
- aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
- c.is_alias_for = aliased
-
- cm = top_level.add_class RDoc::NormalClass, 'Klass'
- cm.add_constant c
-
- section = cm.sections.first
-
- loaded = Marshal.load Marshal.dump c
- loaded.store = @store
-
- comment = doc(para('this is a comment'))
-
- assert_equal c, loaded
-
- assert_equal aliased, loaded.is_alias_for
- assert_equal comment, loaded.comment
- assert_equal top_level, loaded.file
- assert_equal 'Klass::CONST', loaded.full_name
- assert_equal 'CONST', loaded.name
- assert_nil loaded.visibility
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
- end
-
- def test_marshal_load
- top_level = @store.add_file 'file.rb'
-
- c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
- c.record_location top_level
-
- cm = top_level.add_class RDoc::NormalClass, 'Klass'
- cm.add_constant c
-
- section = cm.sections.first
-
- loaded = Marshal.load Marshal.dump c
- loaded.store = @store
-
- comment = doc(para('this is a comment'))
-
- assert_equal c, loaded
-
- assert_nil loaded.is_alias_for
- assert_equal comment, loaded.comment
- assert_equal top_level, loaded.file
- assert_equal 'Klass::CONST', loaded.full_name
- assert_equal 'CONST', loaded.name
- assert_nil loaded.visibility
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
-
- assert loaded.display?
- end
-
- def test_marshal_load_version_0
- top_level = @store.add_file 'file.rb'
-
- aliased = top_level.add_class RDoc::NormalClass, 'Aliased'
- cm = top_level.add_class RDoc::NormalClass, 'Klass'
- section = cm.sections.first
-
- loaded = Marshal.load "\x04\bU:\x13RDoc::Constant[\x0Fi\x00I" +
- "\"\nCONST\x06:\x06ETI\"\x11Klass::CONST\x06" +
- ";\x06T0I\"\fAliased\x06;\x06To" +
- ":\eRDoc::Markup::Document\a:\v@parts[\x06o" +
- ":\x1CRDoc::Markup::Paragraph\x06;\b[\x06I" +
- "\"\x16this is a comment\x06;\x06T:\n@file0I" +
- "\"\ffile.rb\x06;\x06TI\"\nKlass\x06" +
- ";\x06Tc\x16RDoc::NormalClass0"
-
- loaded.store = @store
-
- comment = doc(para('this is a comment'))
-
- assert_equal aliased, loaded.is_alias_for
- assert_equal comment, loaded.comment
- assert_equal top_level, loaded.file
- assert_equal 'Klass::CONST', loaded.full_name
- assert_equal 'CONST', loaded.name
- assert_nil loaded.visibility
- assert_equal cm, loaded.parent
- assert_equal section, loaded.section
-
- assert loaded.display?
- end
-
- def test_marshal_round_trip
- top_level = @store.add_file 'file.rb'
-
- c = RDoc::Constant.new 'CONST', nil, 'this is a comment'
- c.record_location top_level
- c.is_alias_for = 'Unknown'
-
- cm = top_level.add_class RDoc::NormalClass, 'Klass'
- cm.add_constant c
-
- section = cm.sections.first
-
- loaded = Marshal.load Marshal.dump c
- loaded.store = @store
-
- reloaded = Marshal.load Marshal.dump loaded
- reloaded.store = @store
-
- assert_equal section, reloaded.section
- assert_equal 'Unknown', reloaded.is_alias_for
- end
-
def test_path
assert_equal 'C1.html#CONST', @const.path
end
diff --git a/test/rdoc/test_rdoc_context.rb b/test/rdoc/test_rdoc_context.rb
index 28b98dfe55..cd0ad0fae3 100644
--- a/test/rdoc/test_rdoc_context.rb
+++ b/test/rdoc/test_rdoc_context.rb
@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'minitest/autorun'
require File.expand_path '../xref_test_case', __FILE__
class TestRDocContext < XrefTestCase
@@ -6,10 +8,6 @@ class TestRDocContext < XrefTestCase
super
@context = RDoc::Context.new
- @context.store = @store
-
- @enumerator = # 1.8 vs 1.9
- Object.const_defined?(:Enumerator) ? Enumerator : Enumerable::Enumerator
end
def test_initialize
@@ -19,7 +17,6 @@ class TestRDocContext < XrefTestCase
assert_equal nil, @context.parent
assert_equal :public, @context.visibility
assert_equal 1, @context.sections.length
- assert_equal nil, @context.temporary_section
assert_empty @context.classes_hash
assert_empty @context.modules_hash
@@ -37,38 +34,13 @@ class TestRDocContext < XrefTestCase
@context.add_alias as
- assert_equal [as], @context.external_aliases
- assert_equal [as], @context.unmatched_alias_lists['#old_name']
- end
-
- def test_add_alias_method_attr
- top_level = @store.add_file 'file.rb'
-
- attr = RDoc::Attr.new nil, 'old_name', 'R', ''
-
- as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
- as.record_location top_level
- as.parent = @context
-
- @context.add_attribute attr
- @context.add_alias as
-
- assert_empty @context.aliases
- assert_empty @context.unmatched_alias_lists
- assert_equal %w[old_name new_name], @context.attributes.map { |m| m.name }
-
- new = @context.attributes.last
- assert_equal top_level, new.file
+ assert_equal [as], @context.aliases
+ assert_equal [as], @context.unmatched_alias_lists['old_name']
end
def test_add_alias_method
- top_level = @store.add_file 'file.rb'
-
meth = RDoc::AnyMethod.new nil, 'old_name'
- meth.singleton = false
-
as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
- as.record_location top_level
as.parent = @context
@context.add_method meth
@@ -77,74 +49,35 @@ class TestRDocContext < XrefTestCase
assert_empty @context.aliases
assert_empty @context.unmatched_alias_lists
assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
-
- new = @context.method_list.last
- assert_equal top_level, new.file
end
- def test_add_alias_method_singleton
+ def test_add_alias_impl
meth = RDoc::AnyMethod.new nil, 'old_name'
- meth.singleton = true
+ meth.comment = 'old comment'
+ meth.singleton = false
+ meth.visibility = :private
- as = RDoc::Alias.new nil, 'old_name', 'new_name', 'comment'
- as.singleton = true
+ alas = RDoc::Alias.new nil, 'old_name', 'new_name', 'new comment'
- as.parent = @context
+ @context.add_alias_impl alas, meth
- @context.add_method meth
- @context.add_alias as
+ assert_equal 1, @context.method_list.length
- assert_empty @context.aliases
- assert_empty @context.unmatched_alias_lists
- assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
+ alas_meth = @context.method_list.first
+ assert_equal 'new_name', alas_meth.name
+ assert_equal 'new comment', alas_meth.comment
+ assert_equal false, alas_meth.singleton
+ assert_equal meth, alas_meth.is_alias_for
+ assert_equal :private, alas_meth.visibility
- assert @context.method_list.last.singleton
+ assert_equal [alas_meth], meth.aliases
end
def test_add_class
@c1.add_class RDoc::NormalClass, 'Klass', 'Object'
assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
- assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
- end
-
- def test_add_class_basic_object
- skip 'BasicObject is 1.9 only' unless defined?(BasicObject)
-
- @xref_data.add_class RDoc::NormalClass, 'BasicObject'
-
- basic = @xref_data.find_module_named 'BasicObject'
-
- assert_nil basic.superclass
-
- @c1.add_class RDoc::NormalClass, 'BasicObject'
-
- basic = @c1.find_module_named 'BasicObject'
-
- assert_equal 'Object', basic.superclass
- end
-
- def test_add_class_object
- root_class = defined?(BasicObject) ? 'BasicObject' : nil
-
- @xref_data.add_class RDoc::NormalClass, 'Object'
-
- object = @xref_data.find_module_named 'Object'
-
- assert_equal root_class, object.superclass
-
- @c1.add_class RDoc::NormalClass, 'Object'
-
- object = @c1.find_module_named 'Object'
-
- assert_equal 'Object', object.superclass.full_name
- end
-
- def test_add_class_singleton
- @c1.add_class RDoc::NormalClass, 'Klass', 'Object'
-
- assert_includes @c1.classes.map { |k| k.full_name }, 'C1::Klass'
- assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass'
+ assert_includes RDoc::TopLevel.classes.map { |k| k.full_name }, 'C1::Klass'
end
def test_add_class_superclass
@@ -165,9 +98,9 @@ class TestRDocContext < XrefTestCase
refute_includes @c1.modules.map { |k| k.full_name }, 'C1::Klass',
'c1 modules'
- assert_includes @store.all_classes.map { |k| k.full_name }, 'C1::Klass',
+ assert_includes RDoc::TopLevel.classes.map { |k| k.full_name }, 'C1::Klass',
'TopLevel classes'
- refute_includes @store.all_modules.map { |k| k.full_name }, 'C1::Klass',
+ refute_includes RDoc::TopLevel.modules.map { |k| k.full_name }, 'C1::Klass',
'TopLevel modules'
end
@@ -178,13 +111,6 @@ class TestRDocContext < XrefTestCase
assert_equal [const], @context.constants
end
- def test_add_extend
- ext = RDoc::Extend.new 'Name', 'comment'
- @context.add_extend ext
-
- assert_equal [ext], @context.extends
- end
-
def test_add_include
incl = RDoc::Include.new 'Name', 'comment'
@context.add_include incl
@@ -207,68 +133,15 @@ class TestRDocContext < XrefTestCase
meth = RDoc::AnyMethod.new nil, 'old_name'
@context.add_alias as
- refute_empty @context.external_aliases
+ refute_empty @context.aliases
@context.add_method meth
- assert_empty @context.external_aliases
+ assert_empty @context.aliases
assert_empty @context.unmatched_alias_lists
assert_equal %w[old_name new_name], @context.method_list.map { |m| m.name }
end
- def test_add_method_duplicate
- @store.rdoc.options.verbosity = 2
-
- meth1 = RDoc::AnyMethod.new nil, 'name'
- meth1.record_location @store.add_file 'first.rb'
- meth1.visibility = nil
- meth1.comment = comment 'first'
-
- @context.add_method meth1
-
- meth2 = RDoc::AnyMethod.new nil, 'name'
- meth2.record_location @store.add_file 'second.rb'
- meth2.comment = comment 'second'
-
- _, err = verbose_capture_io do
- @context.add_method meth2
- end
-
- expected = 'Duplicate method (unknown)#name in file second.rb, ' \
- 'previously in file first.rb'
-
- assert_equal expected, err.chomp
-
- method = @context.method_list.first
-
- assert_equal 'first', method.comment.text
- end
-
- def test_add_method_duplicate_loading
- @context.store = nil
-
- meth1 = RDoc::AnyMethod.new nil, 'name'
- meth1.record_location @store.add_file 'first.rb'
- meth1.visibility = nil
- meth1.comment = comment 'first'
-
- @context.add_method meth1
-
- meth2 = RDoc::AnyMethod.new nil, 'name'
- meth2.record_location @store.add_file 'second.rb'
- meth2.comment = comment 'second'
-
- _, err = verbose_capture_io do
- @context.add_method meth2
- end
-
- assert_empty err
-
- method = @context.method_list.first
-
- assert_equal 'first', method.comment.text
- end
-
def test_add_module
@c1.add_module RDoc::NormalModule, 'Mod'
@@ -276,33 +149,9 @@ class TestRDocContext < XrefTestCase
end
def test_add_module_alias
- tl = @store.add_file 'file.rb'
-
- c3_c4 = @c2.add_module_alias @c2_c3, 'C4', tl
-
- alias_constant = @c2.constants.first
-
- assert_equal 'C2::C4', c3_c4.full_name
- assert_equal tl, alias_constant.file
- end
+ c3_c4 = @c2.add_module_alias @c2_c3, 'C4'
- def test_add_module_alias_top_level
- store = RDoc::Store.new
-
- top_level = store.add_file 'file.rb'
-
- klass = top_level.add_class RDoc::NormalClass, 'Klass'
- klass.comment = 'klass comment'
-
- object = top_level.add_class RDoc::NormalClass, 'Object'
-
- top_level.add_module_alias klass, 'A', top_level
-
- refute_empty object.constants
-
- constant = object.constants.first
-
- assert_equal 'klass comment', constant.comment
+ assert_equal @c2.find_module_named('C4'), c3_c4
end
def test_add_module_class
@@ -321,48 +170,6 @@ class TestRDocContext < XrefTestCase
assert_includes @c1.top_level.requires, req
end
- def test_add_section
- default_section = @context.sections.first
-
- @context.add_section nil, comment('comment', @top_level)
-
- assert_equal 1, @context.sections.length
- assert_equal [comment("comment", @top_level)],
- @context.sections.first.comments
-
- @context.add_section nil, comment('new comment', @top_level)
-
- assert_equal 1, @context.sections.length
- assert_equal [comment('comment', @top_level),
- comment('new comment', @top_level)],
- @context.sections.first.comments
-
- @context.add_section 'other', comment('', @top_level)
-
- assert_equal 2, @context.sections.length
-
- new_section = @context.sections.find { |section| section.title == 'other' }
- assert new_section
- assert_equal default_section, @context.current_section
- end
-
- def test_add_section_no_comment
- default_section = @context.sections.first
-
- @context.add_section nil
-
- assert_equal 1, @context.sections.length
-
- @context.add_section 'other'
-
- assert_equal 2, @context.sections.length
-
- new_section = @context.sections.find { |section| section.title == 'other' }
-
- assert new_section
- assert_equal default_section, @context.current_section
- end
-
def test_add_to
incl = RDoc::Include.new 'Name', 'comment'
arr = []
@@ -373,20 +180,6 @@ class TestRDocContext < XrefTestCase
assert_equal @context.current_section, incl.section
end
- def test_add_to_temporary_section
- incl = RDoc::Include.new 'Name', 'comment'
- arr = []
- section =
- @context.add_section 'temporary', RDoc::Comment.new('', @top_level)
- @context.temporary_section = section
-
- @context.add_to arr, incl
-
- assert_includes arr, incl
- assert_equal @context, incl.parent
- assert_equal section, incl.section
- end
-
def test_add_to_no_document_self
incl = RDoc::Include.new 'Name', 'comment'
arr = []
@@ -405,40 +198,19 @@ class TestRDocContext < XrefTestCase
refute_includes arr, incl
end
- def bench_add_include
- cm = RDoc::ClassModule.new 'Klass'
-
- assert_performance_linear 0.9 do |count|
- count.times do |i|
- cm.add_include RDoc::Include.new("N::M#{i}", nil)
- end
- end
- end
-
def test_child_name
assert_equal 'C1::C1', @c1.child_name('C1')
end
def test_classes
assert_equal %w[C2::C3], @c2.classes.map { |k| k.full_name }
- assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }.sort
- end
-
- def test_current_section
- default_section = @context.current_section
-
- new_section =
- @context.add_section 'other', RDoc::Comment.new('', @top_level)
- @context.temporary_section = new_section
-
- assert_equal new_section, @context.current_section
- assert_equal default_section, @context.current_section
+ assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }
end
def test_defined_in_eh
assert @c1.defined_in?(@c1.top_level)
- refute @c1.defined_in?(@store.add_file('name.rb'))
+ refute @c1.defined_in?(RDoc::TopLevel.new('name.rb'))
end
def test_equals2
@@ -447,42 +219,6 @@ class TestRDocContext < XrefTestCase
refute_equal @c2_c3, @c3
end
- def test_each_method_enumerator
- assert_kind_of @enumerator, @c1.each_method
- end
-
- def test_each_section
- sects = []
- consts = []
- attrs = []
-
- @c1.each_section do |section, constants, attributes|
- sects << section
- consts << constants
- attrs << attributes
- end
-
- assert_equal [nil, 'separate'], sects.map { |section| section.title }
-
- expected_consts = [
- [@c1.constants.first],
- [],
- ]
-
- assert_equal expected_consts, consts
-
- expected_attrs = [
- [@c1.attributes[0], @c1.attributes[3]],
- [@c1.attributes[1], @c1.attributes[2]],
- ]
-
- assert_equal expected_attrs, attrs
- end
-
- def test_each_section_enumerator
- assert_kind_of @enumerator, @c1.each_section
- end
-
def test_find_attribute_named
assert_equal nil, @c1.find_attribute_named('none')
assert_equal 'R', @c1.find_attribute_named('attr').rw
@@ -556,56 +292,6 @@ class TestRDocContext < XrefTestCase
assert_equal @c1__m, @c1.find_symbol('::m')
end
- def test_find_symbol_module
- assert_nil @m1_m2.find_symbol_module 'N'
- assert_nil @m1_m2.find_symbol_module 'M2::M1'
-
- @m1_m2.parent = nil # loaded from legacy ri store
-
- assert_nil @m1_m2.find_symbol_module 'N'
- assert_nil @m1_m2.find_symbol_module 'M2::M1'
- end
-
- def test_fully_documented_eh
- context = RDoc::Context.new
-
- refute context.fully_documented?
-
- context.comment = 'hi'
-
- assert context.fully_documented?
-
- m = @c1_m
-
- context.add_method m
-
- refute context.fully_documented?
-
- m.comment = 'hi'
-
- assert context.fully_documented?
-
- c = RDoc::Constant.new 'C', '0', nil
-
- context.add_constant c
-
- refute context.fully_documented?
-
- c.comment = 'hi'
-
- assert context.fully_documented?
-
- a = RDoc::Attr.new '', 'a', 'RW', nil
-
- context.add_attribute a
-
- refute context.fully_documented?
-
- a.comment = 'hi'
-
- assert context.fully_documented?
- end
-
def test_spaceship
assert_equal(-1, @c2.<=>(@c3))
assert_equal 0, @c2.<=>(@c2)
@@ -615,268 +301,5 @@ class TestRDocContext < XrefTestCase
assert_equal(-1, @c2_c3.<=>(@c3))
end
- def test_methods_by_type
- expected = {
- 'instance' => {
- :private => [],
- :protected => [],
- :public => [@c1_m],
- },
- 'class' => {
- :private => [],
- :protected => [],
- :public => [@c1__m],
- },
- }
-
- assert_equal expected, @c1.methods_by_type
- end
-
- def test_methods_by_type_section
- separate = @c1.sections_hash['separate']
- @c1_m.section = separate
-
- expected = {
- 'instance' => {
- :private => [],
- :protected => [],
- :public => [@c1_m],
- },
- 'class' => {
- :private => [],
- :protected => [],
- :public => [],
- },
- }
-
- assert_equal expected, @c1.methods_by_type(separate)
- end
-
- def test_methods_matching
- methods = []
-
- @parent.methods_matching 'm' do |m|
- methods << m
- end
-
- assert_equal [@parent_m], methods
- end
-
- def test_methods_matching_singleton
- methods = []
-
- @parent.methods_matching 'm', true do |m|
- methods << m
- end
-
- assert_equal [@parent__m], methods
- end
-
- def test_methods_matching_inherit
- methods = []
-
- @child.methods_matching 'm' do |m|
- methods << m
- end
-
- assert_equal [@parent_m], methods
- end
-
- def test_remove_invisible_private
- util_visibilities
-
- @vis.remove_invisible :private
-
- assert_equal [@pub, @prot, @priv], @vis.method_list
- assert_equal [@apub, @aprot, @apriv], @vis.attributes
- end
-
- def test_remove_invisible_protected
- util_visibilities
-
- @vis.remove_invisible :protected
-
- assert_equal [@pub, @prot], @vis.method_list
- assert_equal [@apub, @aprot], @vis.attributes
- end
-
- def test_remove_invisible_public
- util_visibilities
-
- @vis.remove_invisible :public
-
- assert_equal [@pub], @vis.method_list
- assert_equal [@apub], @vis.attributes
- end
-
- def test_remove_invisible_public_force
- util_visibilities
-
- @priv.force_documentation = true
- @prot.force_documentation = true
- @apriv.force_documentation = true
- @aprot.force_documentation = true
-
- @vis.remove_invisible :public
-
- assert_equal [@pub, @prot, @priv], @vis.method_list
- assert_equal [@apub, @aprot, @apriv], @vis.attributes
- end
-
- def test_remove_invisible_in_protected
- util_visibilities
-
- methods = [@pub, @prot, @priv]
-
- @c1.remove_invisible_in methods, :protected
-
- assert_equal [@pub, @prot], methods
- end
-
- def test_remove_invisible_in_protected_force
- util_visibilities
-
- @priv.force_documentation = true
-
- methods = [@pub, @prot, @priv]
-
- @c1.remove_invisible_in methods, :protected
-
- assert_equal [@pub, @prot, @priv], methods
- end
-
- def test_remove_invisible_in_public
- util_visibilities
-
- methods = [@pub, @prot, @priv]
-
- @c1.remove_invisible_in methods, :public
-
- assert_equal [@pub], methods
- end
-
- def test_remove_invisible_in_public_force
- util_visibilities
-
- @prot.force_documentation = true
- @priv.force_documentation = true
-
- methods = [@pub, @prot, @priv]
-
- @c1.remove_invisible_in methods, :public
-
- assert_equal [@pub, @prot, @priv], methods
- end
-
- def test_section_contents
- default = @context.sections.first
- @context.add_method RDoc::AnyMethod.new(nil, 'm1')
-
- b = @context.add_section 'B'
- m = @context.add_method RDoc::AnyMethod.new(nil, 'm2')
- m.section = b
-
- assert_equal [default, b], @context.section_contents
- end
-
- def test_section_contents_no_default
- @context = RDoc::Context.new
- b = @context.add_section 'B'
- m = @context.add_method RDoc::AnyMethod.new(nil, 'm')
- m.section = b
-
- assert_equal [b], @context.section_contents
- end
-
- def test_section_contents_only_default
- @context = RDoc::Context.new
-
- @context.add_method RDoc::AnyMethod.new(nil, 'm')
-
- assert_empty @context.section_contents
- end
-
- def test_section_contents_unused
- @context = RDoc::Context.new
-
- @context.add_method RDoc::AnyMethod.new(nil, 'm')
- @context.add_section 'B'
-
- assert_empty @context.section_contents
- end
-
- def test_set_current_section
- default_section = @context.sections.first
-
- @context.set_current_section nil, RDoc::Comment.new('', @top_level)
-
- assert_equal default_section, @context.current_section
-
- @context.set_current_section 'other', RDoc::Comment.new('', @top_level)
-
- new_section = @context.sections.find { |section|
- section != default_section
- }
-
- assert_equal new_section, @context.current_section
- end
-
- def test_sort_sections
- c = RDoc::Context.new
- c.add_section 'C'
- c.add_section 'A'
- c.add_section 'B'
-
- titles = c.sort_sections.map { |section| section.title }
-
- assert_equal [nil, 'A', 'B', 'C'], titles
- end
-
- def test_sort_sections_tomdoc
- c = RDoc::Context.new
- c.add_section 'Public'
- c.add_section 'Internal'
- c.add_section 'Deprecated'
-
- titles = c.sort_sections.map { |section| section.title }
-
- assert_equal [nil, 'Public', 'Internal', 'Deprecated'], titles
- end
-
- def test_sort_sections_tomdoc_missing
- c = RDoc::Context.new
- c.add_section 'Internal'
- c.add_section 'Public'
-
- titles = c.sort_sections.map { |section| section.title }
-
- assert_equal [nil, 'Public', 'Internal'], titles
- end
-
- def util_visibilities
- @pub = RDoc::AnyMethod.new nil, 'pub'
- @prot = RDoc::AnyMethod.new nil, 'prot'
- @priv = RDoc::AnyMethod.new nil, 'priv'
-
- @apub = RDoc::Attr.new nil, 'pub', 'RW', nil
- @aprot = RDoc::Attr.new nil, 'prot', 'RW', nil
- @apriv = RDoc::Attr.new nil, 'priv', 'RW', nil
-
- @vis = RDoc::NormalClass.new 'Vis'
- @vis.add_method @pub
- @vis.add_method @prot
- @vis.add_method @priv
-
- @vis.add_attribute @apub
- @vis.add_attribute @aprot
- @vis.add_attribute @apriv
-
- @prot.visibility = :protected
- @priv.visibility = :private
-
- @aprot.visibility = :protected
- @apriv.visibility = :private
- end
-
end
diff --git a/test/rdoc/test_rdoc_context_section.rb b/test/rdoc/test_rdoc_context_section.rb
deleted file mode 100644
index d492c17048..0000000000
--- a/test/rdoc/test_rdoc_context_section.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocContextSection < RDoc::TestCase
-
- def setup
- super
-
- @top_level = @store.add_file 'file.rb'
-
- @klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
- @S = RDoc::Context::Section
- @s = @S.new @klass, 'section', comment('# comment', @top_level)
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_add_comment
- file1 = @store.add_file 'file1.rb'
-
- klass = file1.add_class RDoc::NormalClass, 'Klass'
-
- c1 = RDoc::Comment.new "# :section: section\n", file1
- c2 = RDoc::Comment.new "# hello\n", file1
- c3 = RDoc::Comment.new "# world\n", file1
-
- s = @S.new klass, 'section', c1
-
- assert_empty s.comments
-
- s.add_comment nil
-
- assert_empty s.comments
-
- s.add_comment c2
-
- assert_equal [c2], s.comments
-
- s.add_comment c3
-
- assert_equal [c2, c3], s.comments
- end
-
- def test_aref
- assert_equal 'section', @s.aref
-
- assert_equal '5Buntitled-5D', @S.new(nil, nil, nil).aref
-
- assert_equal 'one+two', @S.new(nil, 'one two', nil).aref
- end
-
- def test_extract_comment
- assert_equal '', @s.extract_comment(comment('')).text
- assert_equal '', @s.extract_comment(comment("# :section: b\n")).text
- assert_equal '# c', @s.extract_comment(comment("# :section: b\n# c")).text
- assert_equal '# c',
- @s.extract_comment(comment("# a\n# :section: b\n# c")).text
- end
-
- def test_marshal_dump
- loaded = Marshal.load Marshal.dump @s
-
- expected = RDoc::Comment.new('comment', @top_level).parse
- expected = doc(expected)
-
- assert_equal 'section', loaded.title
- assert_equal expected, loaded.comments
- assert_nil loaded.parent, 'parent is set manually'
- end
-
- def test_marshal_dump_no_comment
- s = @S.new @klass, 'section', comment('')
-
- loaded = Marshal.load Marshal.dump s
-
- assert_equal 'section', loaded.title
- assert_empty loaded.comments
- assert_nil loaded.parent, 'parent is set manually'
- end
-
- def test_marshal_load_version_0
- loaded = Marshal.load "\x04\bU:\eRDoc::Context::Section" +
- "[\bi\x00I\"\fsection\x06:\x06EFo" +
- ":\eRDoc::Markup::Document\a:\v@parts" +
- "[\x06o;\a\a;\b[\x06o" +
- ":\x1CRDoc::Markup::Paragraph\x06;\b" +
- "[\x06I\"\fcomment\x06;\x06F:\n@fileI" +
- "\"\ffile.rb\x06;\x06F;\n0"
-
- expected = doc RDoc::Comment.new('comment', @top_level).parse
-
- assert_equal 'section', loaded.title
- assert_equal expected, loaded.comments
- assert_nil loaded.parent, 'parent is set manually'
- end
-
- def test_remove_comment_array
- other = @store.add_file 'other.rb'
-
- other_comment = comment('bogus', other)
-
- @s.add_comment other_comment
-
- @s.remove_comment comment('bogus', @top_level)
-
- assert_equal [other_comment], @s.comments
- end
-
- def test_remove_comment_document
- other = @store.add_file 'other.rb'
-
- other_comment = comment('bogus', other)
-
- @s.add_comment other_comment
-
- loaded = Marshal.load Marshal.dump @s
-
- loaded.remove_comment comment('bogus', @top_level)
-
- assert_equal doc(other_comment.parse), loaded.comments
- end
-
- def test_sequence
- _, err = verbose_capture_io do
- assert_match(/\ASEC\d{5}\Z/, @s.sequence)
- end
-
- assert_equal "#{@S}#sequence is deprecated, use #aref\n", err
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_cross_reference.rb b/test/rdoc/test_rdoc_cross_reference.rb
deleted file mode 100644
index ecb5f9aa41..0000000000
--- a/test/rdoc/test_rdoc_cross_reference.rb
+++ /dev/null
@@ -1,191 +0,0 @@
-require File.expand_path '../xref_test_case', __FILE__
-
-class TestRDocCrossReference < XrefTestCase
-
- def setup
- super
-
- @xref = RDoc::CrossReference.new @c1
- end
-
- def assert_ref expected, name
- assert_equal expected, @xref.resolve(name, 'fail')
- end
-
- def refute_ref name
- assert_equal name, @xref.resolve(name, name)
- end
-
- def test_METHOD_REGEXP_STR
- re = /#{RDoc::CrossReference::METHOD_REGEXP_STR}/
-
- re =~ '==='
-
- assert_equal '===', $&
- end
-
- def test_resolve_C2
- @xref = RDoc::CrossReference.new @c2
-
- refute_ref '#m'
-
- assert_ref @c1__m, 'C1::m'
- assert_ref @c2_c3, 'C2::C3'
- assert_ref @c2_c3_m, 'C2::C3#m'
- assert_ref @c2_c3_h1, 'C3::H1'
- assert_ref @c4, 'C4'
-
- assert_ref @c3_h2, 'C3::H2'
- refute_ref 'H1'
- end
-
- def test_resolve_C2_C3
- @xref = RDoc::CrossReference.new @c2_c3
-
- assert_ref @c2_c3_m, '#m'
-
- assert_ref @c2_c3, 'C3'
- assert_ref @c2_c3_m, 'C3#m'
-
- assert_ref @c2_c3_h1, 'H1'
- assert_ref @c2_c3_h1, 'C3::H1'
-
- assert_ref @c4, 'C4'
-
- assert_ref @c3_h2, 'C3::H2'
- end
-
- def test_resolve_C3
- @xref = RDoc::CrossReference.new @c3
-
- assert_ref @c3, 'C3'
-
- refute_ref '#m'
- refute_ref 'C3#m'
-
- assert_ref @c3_h1, 'H1'
-
- assert_ref @c3_h1, 'C3::H1'
- assert_ref @c3_h2, 'C3::H2'
-
- assert_ref @c4, 'C4'
- end
-
- def test_resolve_C4
- @xref = RDoc::CrossReference.new @c4
-
- # C4 ref inside a C4 containing a C4 should resolve to the contained class
- assert_ref @c4_c4, 'C4'
- end
-
- def test_resolve_C4_C4
- @xref = RDoc::CrossReference.new @c4_c4
-
- # A C4 reference inside a C4 class contained within a C4 class should
- # resolve to the inner C4 class.
- assert_ref @c4_c4, 'C4'
- end
-
- def test_resolve_class
- assert_ref @c1, 'C1'
- refute_ref 'H1'
-
- assert_ref @c2, 'C2'
- assert_ref @c2_c3, 'C2::C3'
- assert_ref @c2_c3_h1, 'C2::C3::H1'
-
- assert_ref @c3, '::C3'
- assert_ref @c3_h1, '::C3::H1'
-
- assert_ref @c4_c4, 'C4::C4'
- end
-
- def test_resolve_file
- refute_ref 'xref_data.rb'
- end
-
- def test_resolve_method
- assert_ref @c1__m, 'm'
- assert_ref @c1_m, '#m'
- assert_ref @c1__m, '::m'
-
- assert_ref @c1_m, 'C1#m'
- assert_ref @c1__m, 'C1.m'
- assert_ref @c1__m, 'C1::m'
-
- assert_ref @c1_m, 'C1#m'
- assert_ref @c1_m, 'C1#m()'
- assert_ref @c1_m, 'C1#m(*)'
-
- assert_ref @c1__m, 'C1.m'
- assert_ref @c1__m, 'C1.m()'
- assert_ref @c1__m, 'C1.m(*)'
-
- assert_ref @c1__m, 'C1::m'
- assert_ref @c1__m, 'C1::m()'
- assert_ref @c1__m, 'C1::m(*)'
-
- assert_ref @c2_c3_m, 'C2::C3#m'
-
- assert_ref @c2_c3_m, 'C2::C3.m'
-
- # TODO stop escaping - HTML5 allows anything but space
- assert_ref @c2_c3_h1_meh, 'C2::C3::H1#m?'
-
- assert_ref @c2_c3_m, '::C2::C3#m'
- assert_ref @c2_c3_m, '::C2::C3#m()'
- assert_ref @c2_c3_m, '::C2::C3#m(*)'
- end
-
- def test_resolve_method_equals3
- m = RDoc::AnyMethod.new '', '==='
- @c1.add_method m
-
- assert_ref m, '==='
- end
-
- def test_resolve_page
- page = @store.add_file 'README.txt'
- page.parser = RDoc::Parser::Simple
-
- assert_ref page, 'README'
- end
-
- def test_resolve_percent
- i_percent = RDoc::AnyMethod.new nil, '%'
- i_percent.singleton = false
- @c1.add_method i_percent
-
- c_percent = RDoc::AnyMethod.new nil, '%'
- c_percent.singleton = true
- @c1.add_method c_percent
-
- assert_ref i_percent, '%'
- assert_ref i_percent, '#%'
- assert_ref c_percent, '::%'
-
- assert_ref i_percent, 'C1#%'
- assert_ref c_percent, 'C1::%'
- end
-
- def test_resolve_no_ref
- assert_equal '', @xref.resolve('', '')
-
- assert_equal "bogus", @xref.resolve("bogus", "bogus")
- assert_equal "\\bogus", @xref.resolve("\\bogus", "\\bogus")
- assert_equal "\\\\bogus", @xref.resolve("\\\\bogus", "\\\\bogus")
-
- assert_equal "\\#n", @xref.resolve("\\#n", "fail")
- assert_equal "\\#n()", @xref.resolve("\\#n()", "fail")
- assert_equal "\\#n(*)", @xref.resolve("\\#n(*)", "fail")
-
- assert_equal "C1", @xref.resolve("\\C1", "fail")
- assert_equal "::C3", @xref.resolve("\\::C3", "fail")
-
- assert_equal "succeed", @xref.resolve("::C3::H1#n", "succeed")
- assert_equal "succeed", @xref.resolve("::C3::H1#n(*)", "succeed")
- assert_equal "\\::C3::H1#n", @xref.resolve("\\::C3::H1#n", "fail")
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb
deleted file mode 100644
index 89277585ec..0000000000
--- a/test/rdoc/test_rdoc_encoding.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-# coding: US-ASCII
-
-require 'rdoc/test_case'
-
-class TestRDocEncoding < RDoc::TestCase
-
- def setup
- super
-
- @tempfile = Tempfile.new 'test_rdoc_encoding'
- end
-
- def test_class_read_file
- @tempfile.write "hi everybody"
- @tempfile.flush
-
- assert_equal "hi everybody", RDoc::Encoding.read_file(@tempfile.path, nil)
- end
-
- def test_class_read_file_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- expected = "# coding: utf-8\nhi everybody"
-
- @tempfile.write expected
- @tempfile.flush
-
- contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
- assert_equal "hi everybody", contents
- assert_equal Encoding::UTF_8, contents.encoding
- end
-
- def test_class_read_file_encoding_convert
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- content = ""
- content.encode! 'ISO-8859-1'
- content << "# coding: ISO-8859-1\nhi \xE9verybody"
-
- @tempfile.write content
- @tempfile.flush
-
- contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
- assert_equal Encoding::UTF_8, contents.encoding
- assert_equal "hi \u00e9verybody", contents.sub("\r", '')
- end
-
- def test_class_read_file_encoding_fail
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @tempfile.write "# coding: utf-8\n\317\200" # pi
- @tempfile.flush
-
- contents = :junk
-
- _, err = verbose_capture_io do
- contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII
- end
-
- assert_nil contents
-
- assert_match %r%^unable to convert%, err
- end
-
- def test_class_read_file_encoding_fancy
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- expected = "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody"
- expected.encode! Encoding::UTF_8
-
- @tempfile.write expected
- @tempfile.flush
-
- contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
- assert_equal "hi everybody", contents
- assert_equal Encoding::UTF_8, contents.encoding
- end
-
- def test_class_read_file_encoding_force_transcode
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @tempfile.write "# coding: utf-8\n\317\200" # pi
- @tempfile.flush
-
- contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII, true
-
- assert_equal '?', contents
- assert_equal Encoding::US_ASCII, contents.encoding
- end
-
- def test_class_read_file_encoding_guess
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- path = File.expand_path '../test.ja.txt', __FILE__
- content = RDoc::Encoding.read_file path, Encoding::UTF_8
-
- assert_equal Encoding::UTF_8, content.encoding
- end
-
- def test_class_read_file_encoding_invalid
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @tempfile.write "# coding: ascii\nM\xE4r"
- @tempfile.flush
-
- contents = :junk
- _, err = verbose_capture_io do
- contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
- end
-
- assert_equal "unable to convert \"\\xE4\" on US-ASCII for #{@tempfile.path}, skipping\n", err
-
- assert_nil contents
- end
-
- def test_class_read_file_encoding_with_signature
- skip "Encoding not implemented" unless defined? ::Encoding
-
- @tempfile.write "\xEF\xBB\xBFhi everybody"
- @tempfile.flush
-
- bug3360 = '[ruby-dev:41452]'
- content = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
- assert_equal Encoding::UTF_8, content.encoding, bug3360
- assert_equal "hi everybody", content, bug3360
- end
-
- def test_class_set_encoding
- s = "# coding: UTF-8\n"
- RDoc::Encoding.set_encoding s
-
- # sanity check for 1.8
-
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- assert_equal Encoding::UTF_8, s.encoding
-
- s = "#!/bin/ruby\n# coding: UTF-8\n"
- RDoc::Encoding.set_encoding s
-
- assert_equal Encoding::UTF_8, s.encoding
-
- s = "<?xml version='1.0' encoding='UTF-8'?>\n"
- expected = s.encoding
- RDoc::Encoding.set_encoding s
-
- assert_equal Encoding::UTF_8, s.encoding
-
- s = "<?xml version='1.0' encoding=\"UTF-8\"?>\n"
- expected = s.encoding
- RDoc::Encoding.set_encoding s
-
- assert_equal Encoding::UTF_8, s.encoding
- end
-
- def test_class_set_encoding_strip
- s = "# coding: UTF-8\n# more comments"
-
- RDoc::Encoding.set_encoding s
-
- assert_equal "# more comments", s
-
- s = "#!/bin/ruby\n# coding: UTF-8\n# more comments"
-
- RDoc::Encoding.set_encoding s
-
- assert_equal "#!/bin/ruby\n# more comments", s
- end
-
- def test_class_set_encoding_bad
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- s = ""
- expected = s.encoding
- RDoc::Encoding.set_encoding s
-
- assert_equal expected, s.encoding
-
- s = "# vim:set fileencoding=utf-8:\n"
- expected = s.encoding
- RDoc::Encoding.set_encoding s
-
- assert_equal expected, s.encoding
-
- s = "# vim:set fileencoding=utf-8:\n"
- expected = s.encoding
- RDoc::Encoding.set_encoding s
-
- assert_equal expected, s.encoding
-
- assert_raises ArgumentError do
- RDoc::Encoding.set_encoding "# -*- encoding: undecided -*-\n"
- end
- end
-
- def test_sanity
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- assert_equal Encoding::US_ASCII, ''.encoding,
- 'If this file is not ASCII tests may incorrectly pass'
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_extend.rb b/test/rdoc/test_rdoc_extend.rb
deleted file mode 100644
index 149931549d..0000000000
--- a/test/rdoc/test_rdoc_extend.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-require File.expand_path '../xref_test_case', __FILE__
-
-class TestRDocExtend < XrefTestCase
-
- def setup
- super
-
- @ext = RDoc::Extend.new 'M1', 'comment'
- @ext.parent = @m1
- @ext.store = @store
- end
-
- def test_module
- assert_equal @m1, @ext.module
- assert_equal 'Unknown', RDoc::Extend.new('Unknown', 'comment').module
- end
-
- def test_module_extended
- m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
- m1.add_module RDoc::NormalModule, 'Mod3'
- m1_m2 = m1.add_module RDoc::NormalModule, 'Mod2'
- m1_m2_m3 = m1_m2.add_module RDoc::NormalModule, 'Mod3'
- m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
- m1_m2.add_module RDoc::NormalModule, 'Mod4'
- m1_m2_k0 = m1_m2.add_class RDoc::NormalClass, 'Klass0'
- m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
- m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
- m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
- e0_m4 = RDoc::Extend.new 'Mod4', nil
- e0_m5 = RDoc::Extend.new 'Mod5', nil
- e0_m6 = RDoc::Extend.new 'Mod6', nil
- e0_m1 = RDoc::Extend.new 'Mod1', nil
- e0_m2 = RDoc::Extend.new 'Mod2', nil
- e0_m3 = RDoc::Extend.new 'Mod3', nil
-
- m1_m2_k0.add_extend e0_m4
- m1_m2_k0.add_extend e0_m5
- m1_m2_k0.add_extend e0_m6
- m1_m2_k0.add_extend e0_m1
- m1_m2_k0.add_extend e0_m2
- m1_m2_k0.add_extend e0_m3
-
- assert_equal [e0_m4, e0_m5, e0_m6, e0_m1, e0_m2, e0_m3], m1_m2_k0.extends
- assert_equal ['Object'], m1_m2_k0.ancestors
-
- m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
- e1_m1 = RDoc::Extend.new 'Mod1', nil
- e1_m2 = RDoc::Extend.new 'Mod2', nil
- e1_m3 = RDoc::Extend.new 'Mod3', nil
- e1_m4 = RDoc::Extend.new 'Mod4', nil
- e1_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
- m1_k1.add_extend e1_m1
- m1_k1.add_extend e1_m2
- m1_k1.add_extend e1_m3
- m1_k1.add_extend e1_m4
- m1_k1.add_extend e1_k0_m4
-
- assert_equal [e1_m1, e1_m2, e1_m3, e1_m4, e1_k0_m4], m1_k1.extends
- assert_equal ['Object'], m1_k1.ancestors
-
- m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
- e2_m1 = RDoc::Extend.new 'Mod1', nil
- e2_m2 = RDoc::Extend.new 'Mod2', nil
- e2_m3 = RDoc::Extend.new 'Mod3', nil
- e2_k0_m4 = RDoc::Extend.new 'Klass0::Mod4', nil
-
- m1_k2.add_extend e2_m1
- m1_k2.add_extend e2_m3
- m1_k2.add_extend e2_m2
- m1_k2.add_extend e2_k0_m4
-
- assert_equal [e2_m1, e2_m3, e2_m2, e2_k0_m4], m1_k2.extends
- assert_equal ['Object'], m1_k2.ancestors
-
- m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
- e3_m1 = RDoc::Extend.new 'Mod1', nil
- e3_m2 = RDoc::Extend.new 'Mod2', nil
- e3_m4 = RDoc::Extend.new 'Mod4', nil
-
- m1_k3.add_extend e3_m1
- m1_k3.add_extend e3_m2
- m1_k3.add_extend e3_m4
-
- assert_equal [e3_m1, e3_m2, e3_m4], m1_k3.extends
- assert_equal ['Object'], m1_k3.ancestors
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
deleted file mode 100644
index 613a1151e7..0000000000
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocGeneratorDarkfish < RDoc::TestCase
-
- def setup
- super
-
- @lib_dir = "#{@pwd}/lib"
- $LOAD_PATH.unshift @lib_dir # ensure we load from this RDoc
-
- @options = RDoc::Options.new
- @options.option_parser = OptionParser.new
-
- @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_darkfish_#{$$}"
- FileUtils.mkdir_p @tmpdir
- Dir.chdir @tmpdir
- @options.op_dir = @tmpdir
- @options.generator = RDoc::Generator::Darkfish
-
- $LOAD_PATH.each do |path|
- darkfish_dir = File.join path, 'rdoc/generator/template/darkfish/'
- next unless File.directory? darkfish_dir
- @options.template_dir = darkfish_dir
- break
- end
-
- @rdoc.options = @options
-
- @g = @options.generator.new @store, @options
- @rdoc.generator = @g
-
- @top_level = @store.add_file 'file.rb'
- @top_level.parser = RDoc::Parser::Ruby
- @klass = @top_level.add_class RDoc::NormalClass, 'Klass'
-
- @alias_constant = RDoc::Constant.new 'A', nil, ''
- @alias_constant.record_location @top_level
-
- @top_level.add_constant @alias_constant
-
- @klass.add_module_alias @klass, 'A', @top_level
-
- @meth = RDoc::AnyMethod.new nil, 'method'
- @meth_bang = RDoc::AnyMethod.new nil, 'method!'
- @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
-
- @klass.add_method @meth
- @klass.add_method @meth_bang
- @klass.add_attribute @attr
-
- @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
- @ignored.ignore
-
- @store.complete :private
-
- @object = @store.find_class_or_module 'Object'
- @klass_alias = @store.find_class_or_module 'Klass::A'
- end
-
- def teardown
- super
-
- $LOAD_PATH.shift
- Dir.chdir @pwd
- FileUtils.rm_rf @tmpdir
- end
-
- def assert_file path
- assert File.file?(path), "#{path} is not a file"
- end
-
- def refute_file path
- refute File.exist?(path), "#{path} exists"
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_generate
- top_level = @store.add_file 'file.rb'
- top_level.add_class @klass.class, @klass.name
-
- @g.generate
-
- assert_file 'index.html'
- assert_file 'Object.html'
- assert_file 'table_of_contents.html'
- assert_file 'js/search_index.js'
-
- encoding = if Object.const_defined? :Encoding then
- Regexp.escape Encoding::UTF_8.name
- else
- Regexp.escape 'UTF-8'
- end
-
- assert_match(/<meta content="text\/html; charset=#{encoding}"/,
- File.read('index.html'))
- assert_match(/<meta content="text\/html; charset=#{encoding}"/,
- File.read('Object.html'))
-
- refute_match(/Ignored/, File.read('index.html'))
- end
-
- def test_generate_dry_run
- @g.dry_run = true
- top_level = @store.add_file 'file.rb'
- top_level.add_class @klass.class, @klass.name
-
- @g.generate
-
- refute_file 'index.html'
- refute_file 'Object.html'
- end
-
- def test_generate_static
- FileUtils.mkdir_p 'dir/images'
- FileUtils.touch 'dir/images/image.png'
- FileUtils.mkdir_p 'file'
- FileUtils.touch 'file/file.txt'
-
- @options.static_path = [
- File.expand_path('dir'),
- File.expand_path('file/file.txt'),
- ]
-
- @g.generate
-
- assert_file 'images/image.png'
- assert_file 'file.txt'
- end
-
- def test_generate_static_dry_run
- FileUtils.mkdir 'static'
- FileUtils.touch 'static/image.png'
-
- @options.static_path = [File.expand_path('static')]
- @g.dry_run = true
-
- @g.generate
-
- refute_file 'image.png'
- end
-
- def test_setup
- @g.setup
-
- assert_equal [@klass_alias, @ignored, @klass, @object],
- @g.classes.sort_by { |klass| klass.full_name }
- assert_equal [@top_level], @g.files
- assert_equal [@meth, @meth, @meth_bang, @meth_bang], @g.methods
- assert_equal [@klass_alias, @klass, @object], @g.modsort
- end
-
- def test_template_for
- classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
- template = @g.send(:template_for, classpage, true, RDoc::ERBIO)
- assert_kind_of RDoc::ERBIO, template
-
- assert_same template, @g.send(:template_for, classpage)
- end
-
- def test_template_for_dry_run
- classpage = Pathname.new @options.template_dir + 'class.rhtml'
-
- template = @g.send(:template_for, classpage, true, ERB)
- assert_kind_of ERB, template
-
- assert_same template, @g.send(:template_for, classpage)
- end
-
- def test_template_for_partial
- partial = Pathname.new @options.template_dir + '_sidebar_classes.rhtml'
-
- template = @g.send(:template_for, partial, false, RDoc::ERBPartial)
-
- assert_kind_of RDoc::ERBPartial, template
-
- assert_same template, @g.send(:template_for, partial)
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
deleted file mode 100644
index 717159eeda..0000000000
--- a/test/rdoc/test_rdoc_generator_json_index.rb
+++ /dev/null
@@ -1,275 +0,0 @@
-# coding: US-ASCII
-
-require 'rdoc/test_case'
-
-class TestRDocGeneratorJsonIndex < RDoc::TestCase
-
- def setup
- super
-
- @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_darkfish_#{$$}"
- FileUtils.mkdir_p @tmpdir
-
- @options = RDoc::Options.new
- @options.files = []
- # JsonIndex is used in conjunction with another generator
- @options.setup_generator 'darkfish'
- @options.template_dir = ''
- @options.op_dir = @tmpdir
- @options.option_parser = OptionParser.new
- @options.finish
-
- @darkfish = RDoc::Generator::Darkfish.new @store, @options
- @g = RDoc::Generator::JsonIndex.new @darkfish, @options
-
- @rdoc.options = @options
- @rdoc.generator = @g
-
- @top_level = @store.add_file 'file.rb'
- @top_level.parser = RDoc::Parser::Ruby
-
- @klass = @top_level.add_class RDoc::NormalClass, 'C'
-
- @meth = @klass.add_method RDoc::AnyMethod.new(nil, 'meth')
- @meth.record_location @top_level
-
- @nest_klass = @klass.add_class RDoc::NormalClass, 'D'
- @nest_klass.record_location @top_level
-
- @nest_meth = @nest_klass.add_method RDoc::AnyMethod.new(nil, 'meth')
-
- @ignored = @top_level.add_class RDoc::NormalClass, 'Ignored'
- @ignored.ignore
-
- @page = @store.add_file 'page.rdoc'
- @page.parser = RDoc::Parser::Simple
-
- @top_levels = [@top_level, @page].sort
- @klasses = [@klass, @nest_klass, @ignored]
-
- Dir.chdir @tmpdir
- end
-
- def teardown
- super
-
- Dir.chdir @pwd
- FileUtils.rm_rf @tmpdir
- end
-
- def assert_file path
- assert File.file?(path), "#{path} is not a file"
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_build_index
- index = @g.build_index
-
- expected = {
- :index => {
- :searchIndex => %w[c d meth() meth() page],
- :longSearchIndex => %w[c c::d c#meth() c::d#meth()],
- :info => [
- @klass.search_record[2..-1],
- @nest_klass.search_record[2..-1],
- @meth.search_record[2..-1],
- @nest_meth.search_record[2..-1],
- @page.search_record[2..-1],
- ],
- },
- }
-
- expected[:index][:longSearchIndex] << ''
-
- assert_equal expected, index
- end
-
- def test_class_dir
- assert_equal @darkfish.class_dir, @g.class_dir
- end
-
- def test_file_dir
- assert_equal @darkfish.file_dir, @g.file_dir
- end
-
- def test_generate
- @g.generate
-
- assert_file 'js/searcher.js'
- assert_file 'js/navigation.js'
- assert_file 'js/search_index.js'
-
- json = File.read 'js/search_index.js'
-
- json =~ /\Avar search_data = /
-
- assignment = $&
- index = $'
-
- refute_empty assignment
-
- index = JSON.parse index
-
- info = [
- @klass.search_record[2..-1],
- @nest_klass.search_record[2..-1],
- @meth.search_record[2..-1],
- @nest_meth.search_record[2..-1],
- @page.search_record[2..-1],
- ]
-
- expected = {
- 'index' => {
- 'searchIndex' => [
- 'c',
- 'd',
- 'meth()',
- 'meth()',
- 'page',
- ],
- 'longSearchIndex' => [
- 'c',
- 'c::d',
- 'c#meth()',
- 'c::d#meth()',
- '',
- ],
- 'info' => info,
- },
- }
-
- assert_equal expected, index
- end
-
- def test_generate_utf_8
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- text = "5\xB0"
- text.force_encoding Encoding::ISO_8859_1
- @klass.add_comment comment(text), @top_level
-
- @g.generate
-
- json = File.read 'js/search_index.js'
- json.force_encoding Encoding::UTF_8
-
- json =~ /\Avar search_data = /
-
- index = $'
-
- index = JSON.parse index
-
- klass_record = @klass.search_record[2..-1]
- klass_record[-1] = "<p>5\xc2\xb0\n"
- klass_record.last.force_encoding Encoding::UTF_8
-
- info = [
- klass_record,
- @nest_klass.search_record[2..-1],
- @meth.search_record[2..-1],
- @nest_meth.search_record[2..-1],
- @page.search_record[2..-1],
- ]
-
- expected = {
- 'index' => {
- 'searchIndex' => [
- 'c',
- 'd',
- 'meth()',
- 'meth()',
- 'page',
- ],
- 'longSearchIndex' => [
- 'c',
- 'c::d',
- 'c#meth()',
- 'c::d#meth()',
- '',
- ],
- 'info' => info,
- },
- }
-
- assert_equal expected, index
- end
-
- def test_index_classes
- @g.reset @top_levels, @klasses
-
- @g.index_classes
-
- expected = {
- :searchIndex => %w[c d],
- :longSearchIndex => %w[c c::d],
- :info => [
- @klass.search_record[2..-1],
- @nest_klass.search_record[2..-1],
- ],
- }
-
- assert_equal expected, @g.index
- end
-
- def test_index_classes_nodoc
- @klass.document_self = false
- @nest_klass.document_self = false
- @meth.document_self = false
- @nest_meth.document_self = false
-
- @g.reset @top_levels, @klasses
-
- @g.index_classes
-
- expected = {
- :searchIndex => [],
- :longSearchIndex => [],
- :info => [],
- }
-
- assert_equal expected, @g.index
- end
-
- def test_index_methods
- @g.reset @top_levels, @klasses
-
- @g.index_methods
-
- expected = {
- :searchIndex => %w[meth() meth()],
- :longSearchIndex => %w[c#meth() c::d#meth()],
- :info => [
- @meth.search_record[2..-1],
- @nest_meth.search_record[2..-1],
- ],
- }
-
- assert_equal expected, @g.index
- end
-
- def test_index_pages
- @g.reset @top_levels, @klasses
-
- @g.index_pages
-
- expected = {
- :searchIndex => %w[page],
- :longSearchIndex => [''],
- :info => [@page.search_record[2..-1]],
- }
-
- assert_equal expected, @g.index
- end
-
- def test_search_string
- assert_equal 'cd', @g.search_string('C d')
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_generator_markup.rb b/test/rdoc/test_rdoc_generator_markup.rb
deleted file mode 100644
index b3b5c04588..0000000000
--- a/test/rdoc/test_rdoc_generator_markup.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocGeneratorMarkup < RDoc::TestCase
-
- include RDoc::Text
- include RDoc::Generator::Markup
-
- attr_reader :store
-
- def setup
- super
-
- @options = RDoc::Options.new
- @rdoc.options = @options
-
- @parent = self
- @path = '/index.html'
- @symbols = {}
- end
-
- def test_aref_to
- assert_equal 'Foo/Bar.html', aref_to('Foo/Bar.html')
- end
-
- def test_as_href
- assert_equal '../index.html', as_href('Foo/Bar.html')
- end
-
- def test_cvs_url
- assert_equal 'http://example/this_page',
- cvs_url('http://example/', 'this_page')
-
- assert_equal 'http://example/?page=this_page&foo=bar',
- cvs_url('http://example/?page=%s&foo=bar', 'this_page')
- end
-
- def test_description
- @comment = '= Hello'
-
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", description
- end
-
- def test_formatter
- assert_kind_of RDoc::Markup::ToHtmlCrossref, formatter
- refute formatter.show_hash
- assert_same self, formatter.context
- end
-
- attr_reader :path
-
- def find_symbol name
- @symbols[name]
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_generator_ri.rb b/test/rdoc/test_rdoc_generator_ri.rb
index a2bcec534d..7027080c9b 100644
--- a/test/rdoc/test_rdoc_generator_ri.rb
+++ b/test/rdoc/test_rdoc_generator_ri.rb
@@ -1,43 +1,34 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/rdoc'
+require 'tmpdir'
+require 'fileutils'
-class TestRDocGeneratorRI < RDoc::TestCase
+class TestRDocGeneratorRI < MiniTest::Unit::TestCase
def setup
- super
-
- @options = RDoc::Options.new
- if Object.const_defined? :Encoding then
- @options.encoding = Encoding::UTF_8
- @store.encoding = Encoding::UTF_8
- end
+ @pwd = Dir.pwd
+ RDoc::TopLevel.reset
@tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
FileUtils.mkdir_p @tmpdir
+ Dir.chdir @tmpdir
+ options = RDoc::Options.new
- @g = RDoc::Generator::RI.new @store, @options
+ @g = RDoc::Generator::RI.new options
- @top_level = @store.add_file 'file.rb'
+ @top_level = RDoc::TopLevel.new 'file.rb'
@klass = @top_level.add_class RDoc::NormalClass, 'Object'
-
@meth = RDoc::AnyMethod.new nil, 'method'
- @meth.record_location @top_level
-
@meth_bang = RDoc::AnyMethod.new nil, 'method!'
- @meth_bang.record_location @top_level
-
@attr = RDoc::Attr.new nil, 'attr', 'RW', ''
- @attr.record_location @top_level
@klass.add_method @meth
@klass.add_method @meth_bang
@klass.add_attribute @attr
-
- Dir.chdir @tmpdir
end
def teardown
- super
-
Dir.chdir @pwd
FileUtils.rm_rf @tmpdir
end
@@ -46,12 +37,11 @@ class TestRDocGeneratorRI < RDoc::TestCase
assert File.file?(path), "#{path} is not a file"
end
- def refute_file path
- refute File.exist?(path), "#{path} exists"
- end
-
def test_generate
- @g.generate
+ top_level = RDoc::TopLevel.new 'file.rb'
+ top_level.add_class @klass.class, @klass.name
+
+ @g.generate nil
assert_file File.join(@tmpdir, 'cache.ri')
@@ -60,26 +50,6 @@ class TestRDocGeneratorRI < RDoc::TestCase
assert_file File.join(@tmpdir, 'Object', 'attr-i.ri')
assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
assert_file File.join(@tmpdir, 'Object', 'method%21-i.ri')
-
- store = RDoc::RI::Store.new @tmpdir
- store.load_cache
-
- encoding = Object.const_defined?(:Encoding) ? Encoding::UTF_8 : nil
-
- assert_equal encoding, store.encoding
- end
-
- def test_generate_dry_run
- @store.dry_run = true
- @g = RDoc::Generator::RI.new @store, @options
-
- top_level = @store.add_file 'file.rb'
- top_level.add_class @klass.class, @klass.name
-
- @g.generate
-
- refute_file File.join(@tmpdir, 'cache.ri')
- refute_file File.join(@tmpdir, 'Object')
end
end
diff --git a/test/rdoc/test_rdoc_include.rb b/test/rdoc/test_rdoc_include.rb
index 464a698018..e4a44b4358 100644
--- a/test/rdoc/test_rdoc_include.rb
+++ b/test/rdoc/test_rdoc_include.rb
@@ -6,9 +6,6 @@ class TestRDocInclude < XrefTestCase
super
@inc = RDoc::Include.new 'M1', 'comment'
- @inc.parent = @m1
- @inc.record_location @top_level
- @inc.store = @store
end
def test_module
@@ -16,93 +13,5 @@ class TestRDocInclude < XrefTestCase
assert_equal 'Unknown', RDoc::Include.new('Unknown', 'comment').module
end
- def test_module_extended
- m1 = @xref_data.add_module RDoc::NormalModule, 'Mod1'
- m1_m3 = m1.add_module RDoc::NormalModule, 'Mod3'
- m1_m2 = m1.add_module RDoc::NormalModule, 'Mod2'
- m1_m2_m3 = m1_m2.add_module RDoc::NormalModule, 'Mod3'
- m1_m2_m3_m4 = m1_m2_m3.add_module RDoc::NormalModule, 'Mod4'
- m1_m2_m4 = m1_m2.add_module RDoc::NormalModule, 'Mod4'
- m1_m2_k0 = m1_m2.add_class RDoc::NormalClass, 'Klass0'
- m1_m2_k0_m4 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod4'
- #m1_m2_k0_m4_m5 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod5'
- m1_m2_k0_m4_m6 = m1_m2_k0_m4.add_module RDoc::NormalModule, 'Mod6'
- m1_m2_k0_m5 = m1_m2_k0.add_module RDoc::NormalModule, 'Mod5'
-
- i0_m4 = RDoc::Include.new 'Mod4', nil
- i0_m5 = RDoc::Include.new 'Mod5', nil
- i0_m6 = RDoc::Include.new 'Mod6', nil
- i0_m1 = RDoc::Include.new 'Mod1', nil
- i0_m2 = RDoc::Include.new 'Mod2', nil
- i0_m3 = RDoc::Include.new 'Mod3', nil
-
- m1_m2_k0.add_include i0_m4
- m1_m2_k0.add_include i0_m5
- m1_m2_k0.add_include i0_m6
- m1_m2_k0.add_include i0_m1
- m1_m2_k0.add_include i0_m2
- m1_m2_k0.add_include i0_m3
-
- assert_equal [i0_m4, i0_m5, i0_m6, i0_m1, i0_m2, i0_m3], m1_m2_k0.includes
- assert_equal [m1_m2_m3, m1_m2, m1, m1_m2_k0_m4_m6, m1_m2_k0_m5,
- m1_m2_k0_m4, 'Object'], m1_m2_k0.ancestors
-
- m1_k1 = m1.add_class RDoc::NormalClass, 'Klass1'
-
- i1_m1 = RDoc::Include.new 'Mod1', nil
- i1_m2 = RDoc::Include.new 'Mod2', nil
- i1_m3 = RDoc::Include.new 'Mod3', nil
- i1_m4 = RDoc::Include.new 'Mod4', nil
- i1_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
- m1_k1.add_include i1_m1
- m1_k1.add_include i1_m2
- m1_k1.add_include i1_m3
- m1_k1.add_include i1_m4
- m1_k1.add_include i1_k0_m4
-
- assert_equal [i1_m1, i1_m2, i1_m3, i1_m4, i1_k0_m4], m1_k1.includes
- assert_equal [m1_m2_k0_m4, m1_m2_m3_m4, m1_m2_m3, m1_m2, m1, 'Object'],
- m1_k1.ancestors
-
- m1_k2 = m1.add_class RDoc::NormalClass, 'Klass2'
-
- i2_m1 = RDoc::Include.new 'Mod1', nil
- i2_m2 = RDoc::Include.new 'Mod2', nil
- i2_m3 = RDoc::Include.new 'Mod3', nil
- i2_k0_m4 = RDoc::Include.new 'Klass0::Mod4', nil
-
- m1_k2.add_include i2_m1
- m1_k2.add_include i2_m3
- m1_k2.add_include i2_m2
- m1_k2.add_include i2_k0_m4
-
- assert_equal [i2_m1, i2_m3, i2_m2, i2_k0_m4], m1_k2.includes
- assert_equal [m1_m2_k0_m4, m1_m2, m1_m3, m1, 'Object'], m1_k2.ancestors
-
- m1_k3 = m1.add_class RDoc::NormalClass, 'Klass3'
-
- i3_m1 = RDoc::Include.new 'Mod1', nil
- i3_m2 = RDoc::Include.new 'Mod2', nil
- i3_m4 = RDoc::Include.new 'Mod4', nil
-
- m1_k3.add_include i3_m1
- m1_k3.add_include i3_m2
- m1_k3.add_include i3_m4
-
- assert_equal [i3_m1, i3_m2, i3_m4], m1_k3.includes
- assert_equal [m1_m2_m4, m1_m2, m1, 'Object'], m1_k3.ancestors
- end
-
- def test_store_equals
- incl = RDoc::Include.new 'M', nil
- incl.record_location RDoc::TopLevel.new @top_level.name
-
- incl.store = @store
-
- assert_same @top_level, incl.file
- assert_same @store, incl.file.store
- end
-
end
diff --git a/test/rdoc/test_rdoc_markdown.rb b/test/rdoc/test_rdoc_markdown.rb
deleted file mode 100644
index f3eb22227c..0000000000
--- a/test/rdoc/test_rdoc_markdown.rb
+++ /dev/null
@@ -1,977 +0,0 @@
-# coding: UTF-8
-
-require 'rubygems'
-require 'minitest/autorun'
-require 'pp'
-
-require 'rdoc'
-require 'rdoc/markup/block_quote'
-require 'rdoc/markdown'
-
-class TestRDocMarkdown < RDoc::TestCase
-
- def setup
- @RM = RDoc::Markup
-
- @parser = RDoc::Markdown.new
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_class_parse
- doc = RDoc::Markdown.parse "hello\n\nworld"
-
- expected = doc(para("hello"), para("world"))
-
- assert_equal expected, doc
- end
-
- def test_emphasis
- assert_equal '_word_', @parser.emphasis('word')
- assert_equal '<em>two words</em>', @parser.emphasis('two words')
- assert_equal '<em>*bold*</em>', @parser.emphasis('*bold*')
- end
-
- def test_parse_auto_link_email
- doc = parse "Autolink: <nobody-0+_./!%~$@example>"
-
- expected = doc(para("Autolink: mailto:nobody-0+_./!%~$@example"))
-
- assert_equal expected, doc
- end
-
- def test_parse_auto_link_url
- doc = parse "Autolink: <http://example>"
-
- expected = doc(para("Autolink: http://example"))
-
- assert_equal expected, doc
- end
-
- def test_parse_block_quote
- doc = parse <<-BLOCK_QUOTE
-> this is
-> a block quote
- BLOCK_QUOTE
-
- expected =
- doc(
- block(
- para("this is\na block quote")))
-
- assert_equal expected, doc
- end
-
- def test_parse_block_quote_continue
- doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
- BLOCK_QUOTE
-
- expected =
- doc(
- block(
- para("this is\na block quote")))
-
- assert_equal expected, doc
- end
-
- def test_parse_block_quote_list
- doc = parse <<-BLOCK_QUOTE
-> text
->
-> * one
-> * two
- BLOCK_QUOTE
-
- expected =
- doc(
- block(
- para("text"),
- list(:BULLET,
- item(nil, para("one")),
- item(nil, para("two")))))
-
- assert_equal expected, doc
- end
-
- def test_parse_block_quote_newline
- doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
- BLOCK_QUOTE
-
- expected =
- doc(
- block(
- para("this is\na block quote")))
-
- assert_equal expected, doc
- end
-
- def test_parse_block_quote_separate
- doc = parse <<-BLOCK_QUOTE
-> this is
-a block quote
-
-> that continues
- BLOCK_QUOTE
-
- expected =
- doc(
- block(
- para("this is\na block quote"),
- para("that continues")))
-
- assert_equal expected, doc
- end
-
- def test_parse_char_entity
- doc = parse '&pi; &nn;'
-
- expected = doc(para('Ï€ &nn;'))
-
- assert_equal expected, doc
- end
-
- def test_parse_code
- doc = parse "Code: `text`"
-
- expected = doc(para("Code: <code>text</code>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_code_github
- doc = parse <<-MD
-Example:
-
-```
-code goes here
-```
- MD
-
- expected =
- doc(
- para("Example:"),
- verb("code goes here\n"))
-
- assert_equal expected, doc
- end
-
- def test_parse_code_github_format
- doc = parse <<-MD
-Example:
-
-``` ruby
-code goes here
-```
- MD
-
- code = verb("code goes here\n")
- code.format = :ruby
-
- expected =
- doc(
- para("Example:"),
- code)
-
- assert_equal expected, doc
- end
-
- def test_parse_definition_list
- doc = parse <<-MD
-one
-: This is a definition
-
-two
-: This is another definition
- MD
-
- expected = doc(
- list(:NOTE,
- item(%w[one], para("This is a definition")),
- item(%w[two], para("This is another definition"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_definition_list_indents
- doc = parse <<-MD
-zero
-: Indented zero characters
-
-one
- : Indented one characters
-
-two
- : Indented two characters
-
-three
- : Indented three characters
-
-four
- : Indented four characters
-
- MD
-
- expected = doc(
- list(:NOTE,
- item(%w[zero], para("Indented zero characters")),
- item(%w[one], para("Indented one characters")),
- item(%w[two], para("Indented two characters")),
- item(%w[three], para("Indented three characters"))),
- para("four\n : Indented four characters"))
-
- assert_equal expected, doc
- end
-
- def test_parse_definition_list_multi_description
- doc = parse <<-MD
-label
-: This is a definition
-
-: This is another definition
- MD
-
- expected = doc(
- list(:NOTE,
- item(%w[label], para("This is a definition")),
- item(nil, para("This is another definition"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_definition_list_multi_label
- doc = parse <<-MD
-one
-two
-: This is a definition
- MD
-
- expected = doc(
- list(:NOTE,
- item(%w[one two], para("This is a definition"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_definition_list_multi_line
- doc = parse <<-MD
-one
-: This is a definition
-that extends to two lines
-
-two
-: This is another definition
-that also extends to two lines
- MD
-
- expected = doc(
- list(:NOTE,
- item(%w[one],
- para("This is a definition\nthat extends to two lines")),
- item(%w[two],
- para("This is another definition\nthat also extends to two lines"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_definition_list_no
- @parser.definition_lists = false
-
- doc = parse <<-MD
-one
-: This is a definition
-
-two
-: This is another definition
- MD
-
- expected = doc(
- para("one\n: This is a definition"),
- para("two\n: This is another definition"))
-
- assert_equal expected, doc
- end
-
- def test_parse_entity_dec
- doc = parse "Entity: &#65;"
-
- expected = doc(para("Entity: A"))
-
- assert_equal expected, doc
- end
-
- def test_parse_entity_hex
- doc = parse "Entity: &#x41;"
-
- expected = doc(para("Entity: A"))
-
- assert_equal expected, doc
- end
-
- def test_parse_entity_named
- doc = parse "Entity: &pi;"
-
- expected = doc(para("Entity: π"))
-
- assert_equal expected, doc
- end
-
- def test_parse_emphasis_star
- doc = parse "it *works*\n"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it _works_"))
-
- assert_equal expected, doc
- end
-
- def test_parse_emphasis_underscore
- doc = parse "it _works_\n"
-
- expected =
- doc(
- para("it _works_"))
-
- assert_equal expected, doc
- end
-
- def test_parse_emphasis_underscore_embedded
- doc = parse "foo_bar bar_baz\n"
-
- expected =
- doc(
- para("foo_bar bar_baz"))
-
- assert_equal expected, doc
- end
-
- def test_parse_emphasis_underscore_in_word
- doc = parse "it foo_bar_baz\n"
-
- expected =
- doc(
- para("it foo_bar_baz"))
-
- assert_equal expected, doc
- end
-
- def test_parse_escape
- assert_equal doc(para("Backtick: `")), parse("Backtick: \\`")
-
- assert_equal doc(para("Backslash: \\")), parse("Backslash: \\\\")
-
- assert_equal doc(para("Colon: :")), parse("Colon: \\:")
- end
-
- def test_parse_heading_atx
- doc = parse "# heading\n"
-
- expected = @RM::Document.new(
- @RM::Heading.new(1, "heading"))
-
- assert_equal expected, doc
- end
-
- def test_parse_heading_setext_dash
- doc = parse <<-MD
-heading
----
- MD
-
- expected = @RM::Document.new(
- @RM::Heading.new(2, "heading"))
-
- assert_equal expected, doc
- end
-
- def test_parse_heading_setext_equals
- doc = parse <<-MD
-heading
-===
- MD
-
- expected = @RM::Document.new(
- @RM::Heading.new(1, "heading"))
-
- assert_equal expected, doc
- end
-
- def test_parse_html
- @parser.html = true
-
- doc = parse "<address>Links here</address>\n"
-
- expected = doc(
- @RM::Raw.new("<address>Links here</address>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_html_hr
- @parser.html = true
-
- doc = parse "<hr>\n"
-
- expected = doc(raw("<hr>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_html_no_html
- @parser.html = false
-
- doc = parse "<address>Links here</address>\n"
-
- expected = doc()
-
- assert_equal expected, doc
- end
-
- def test_parse_image
- doc = parse "image ![alt text](path/to/image.jpg)"
-
- expected = doc(para("image {alt text}[path/to/image.jpg]"))
-
- assert_equal expected, doc
- end
-
- def test_parse_line_break
- doc = parse "Some text \nwith extra lines"
-
- expected = doc(
- para("Some text", hard_break, "with extra lines"))
-
- assert_equal expected, doc
- end
-
- def test_parse_link_reference_id
- doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
- MD
-
- expected = doc(
- para("This is {an example}[http://example.com] reference-style link."))
-
- assert_equal expected, doc
- end
-
- def test_parse_link_reference_id_adjacent
- doc = parse <<-MD
-[this] [this] should work
-
-[this]: example
- MD
-
- expected = doc(
- para("{this}[example] should work"))
-
- assert_equal expected, doc
- end
-
- def test_parse_link_reference_id_eof
- doc = parse <<-MD.chomp
-This is [an example][id] reference-style link.
-
-[id]: http://example.com "Optional Title Here"
- MD
-
- expected = doc(
- para("This is {an example}[http://example.com] reference-style link."))
-
- assert_equal expected, doc
- end
-
- def test_parse_link_reference_id_many
- doc = parse <<-MD
-This is [an example][id] reference-style link.
-
-And [another][id].
-
-[id]: http://example.com "Optional Title Here"
- MD
-
- expected = doc(
- para("This is {an example}[http://example.com] reference-style link."),
- para("And {another}[http://example.com]."))
-
- assert_equal expected, doc
- end
-
- def test_parse_link_reference_implicit
- doc = parse <<-MD
-This is [an example][] reference-style link.
-
-[an example]: http://example.com "Optional Title Here"
- MD
-
- expected = doc(
- para("This is {an example}[http://example.com] reference-style link."))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet
- doc = parse <<-MD
-* one
-* two
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil, para("one")),
- item(nil, para("two"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet_auto_link
- doc = parse <<-MD
-* <http://example/>
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil, para("http://example/"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet_continue
- doc = parse <<-MD
-* one
-
-* two
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil, para("one")),
- item(nil, para("two"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet_multiline
- doc = parse <<-MD
-* one
- two
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil, para("one\n two"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet_nest
- doc = parse <<-MD
-* outer
- * inner
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil,
- para("outer"),
- list(:BULLET,
- item(nil,
- para("inner"))))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet_nest_loose
- doc = parse <<-MD
-* outer
-
- * inner
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil,
- para("outer"),
- list(:BULLET,
- item(nil, para("inner"))))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_bullet_nest_continue
- doc = parse <<-MD
-* outer
- * inner
- continue inner
-* outer 2
- MD
-
- expected = doc(
- list(:BULLET,
- item(nil,
- para("outer"),
- list(:BULLET,
- item(nil,
- para("inner\n continue inner")))),
- item(nil,
- para("outer 2"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_number
- doc = parse <<-MD
-1. one
-1. two
- MD
-
- expected = doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil, para("two"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_list_number_continue
- doc = parse <<-MD
-1. one
-
-1. two
- MD
-
- expected = doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil, para("two"))))
-
- assert_equal expected, doc
- end
-
- def test_parse_note
- @parser.notes = true
-
- doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
- MD
-
- expected = doc(
- para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
- @RM::Rule.new(1),
- para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
- assert_equal expected, doc
- end
-
- def test_parse_note_indent
- @parser.notes = true
-
- doc = parse <<-MD
-Some text.[^1]
-
-[^1]: With a footnote
-
- more
- MD
-
- expected = doc(
- para("Some text.{*1}[rdoc-label:foottext-1:footmark-1]"),
- rule(1),
- para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote\n\nmore"))
-
- assert_equal expected, doc
- end
-
- def test_parse_note_inline
- @parser.notes = true
-
- doc = parse <<-MD
-Some text. ^[With a footnote]
- MD
-
- expected = doc(
- para("Some text. {*1}[rdoc-label:foottext-1:footmark-1]"),
- @RM::Rule.new(1),
- para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"))
-
- assert_equal expected, doc
- end
-
- def test_parse_note_no_notes
- @parser.notes = false
-
- assert_raises RuntimeError do # TODO use a real error
- parse "Some text.[^1]"
- end
- end
-
- def test_parse_note_multiple
- @parser.notes = true
-
- doc = parse <<-MD
-Some text[^1]
-with inline notes^[like this]
-and an extra note.[^2]
-
-[^1]: With a footnote
-
-[^2]: Which should be numbered correctly
- MD
-
- expected = doc(
- para("Some text{*1}[rdoc-label:foottext-1:footmark-1]\n" +
- "with inline notes{*2}[rdoc-label:foottext-2:footmark-2]\n" +
- "and an extra note.{*3}[rdoc-label:foottext-3:footmark-3]"),
-
- rule(1),
-
- para("{^1}[rdoc-label:footmark-1:foottext-1] With a footnote"),
- para("{^2}[rdoc-label:footmark-2:foottext-2] like this"),
- para("{^3}[rdoc-label:footmark-3:foottext-3] " +
- "Which should be numbered correctly"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph
- doc = parse "it worked\n"
-
- expected = doc(para("it worked"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_break_on_newline
- @parser.break_on_newline = true
-
- doc = parse "one\ntwo\n"
-
- expected = doc(para("one", hard_break, "two"))
-
- assert_equal expected, doc
-
- doc = parse "one \ntwo\nthree\n"
-
- expected = doc(para("one", hard_break, "two", hard_break, "three"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_stars
- doc = parse "it worked ****\n"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it worked ****"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_html
- @parser.html = true
-
- doc = parse "<address>Links here</address>"
-
- expected = doc(raw("<address>Links here</address>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_html_no_html
- @parser.html = false
-
- doc = parse "<address>Links here</address>"
-
- expected = doc()
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_indent_one
- doc = parse <<-MD
- text
- MD
-
- expected = doc(para("text"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_indent_two
- doc = parse <<-MD
- text
- MD
-
- expected = doc(para("text"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_indent_three
- doc = parse <<-MD
- text
- MD
-
- expected = doc(para("text"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_multiline
- doc = parse "one\ntwo"
-
- expected = doc(para("one\ntwo"))
-
- assert_equal expected, doc
- end
-
- def test_parse_paragraph_two
- doc = parse "one\n\ntwo"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("one"),
- @RM::Paragraph.new("two"))
-
- assert_equal expected, doc
- end
-
- def test_parse_plain
- doc = parse "it worked"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it worked"))
-
- assert_equal expected, doc
- end
-
- def test_parse_reference_link_embedded_bracket
- doc = parse "With [embedded [brackets]] [b].\n\n[b]: /url/\n"
-
- expected =
- doc(
- para("With {embedded [brackets]}[/url/]."))
-
- assert_equal expected, doc
- end
-
- def test_parse_rule_dash
- doc = parse "- - -\n\n"
-
- expected = @RM::Document.new(@RM::Rule.new(1))
-
- assert_equal expected, doc
- end
-
- def test_parse_rule_underscore
- doc = parse "_ _ _\n\n"
-
- expected = @RM::Document.new(@RM::Rule.new(1))
-
- assert_equal expected, doc
- end
-
- def test_parse_rule_star
- doc = parse "* * *\n\n"
-
- expected = @RM::Document.new(@RM::Rule.new(1))
-
- assert_equal expected, doc
- end
-
- def test_parse_strong_star
- doc = parse "it **works**\n"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it *works*"))
-
- assert_equal expected, doc
- end
-
- def test_parse_strong_underscore
- doc = parse "it __works__\n"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it *works*"))
-
- assert_equal expected, doc
- end
-
- def test_parse_strong_emphasis_star
- doc = parse "it ***works***\n"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it <b>_works_</b>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_strong_emphasis_underscore
- doc = parse "it ___works___\n"
-
- expected = @RM::Document.new(
- @RM::Paragraph.new("it <b>_works_</b>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_style
- @parser.css = true
-
- doc = parse "<style>h1 { color: red }</style>\n"
-
- expected = doc(
- @RM::Raw.new("<style>h1 { color: red }</style>"))
-
- assert_equal expected, doc
- end
-
- def test_parse_style_disabled
- doc = parse "<style>h1 { color: red }</style>\n"
-
- expected = doc()
-
- assert_equal expected, doc
- end
-
- def test_parse_verbatim
- doc = parse <<-MD
- text
- MD
-
- expected = doc(verb("text\n"))
-
- assert_equal expected, doc
- end
-
- def test_parse_verbatim_eof
- doc = parse " text"
-
- expected = doc(verb("text\n"))
-
- assert_equal expected, doc
- end
-
- def test_strong
- assert_equal '*word*', @parser.strong('word')
- assert_equal '<b>two words</b>', @parser.strong('two words')
- assert_equal '<b>_emphasis_</b>', @parser.strong('_emphasis_')
- end
-
- def parse text
- @parser.parse text
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markdown_test.rb b/test/rdoc/test_rdoc_markdown_test.rb
deleted file mode 100644
index 7dfe727ef5..0000000000
--- a/test/rdoc/test_rdoc_markdown_test.rb
+++ /dev/null
@@ -1,1891 +0,0 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'pp'
-
-require 'rdoc'
-require 'rdoc/markdown'
-
-class TestRDocMarkdownTest < RDoc::TestCase
-
- MARKDOWN_TEST_PATH = File.expand_path '../MarkdownTest_1.0.3/', __FILE__
-
- def setup
- super
-
- @parser = RDoc::Markdown.new
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_amps_and_angle_encoding
- input = File.read "#{MARKDOWN_TEST_PATH}/Amps and angle encoding.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("AT&T has an ampersand in their name."),
- para("AT&T is another way to write it."),
- para("This & that."),
- para("4 < 5."),
- para("6 > 5."),
- para("Here's a {link}[http://example.com/?foo=1&bar=2] with " +
- "an ampersand in the URL."),
- para("Here's a link with an amersand in the link text: " +
- "{AT&T}[http://att.com/]."),
- para("Here's an inline {link}[/script?foo=1&bar=2]."),
- para("Here's an inline {link}[/script?foo=1&bar=2]."))
-
- assert_equal expected, doc
- end
-
- def test_auto_links
- input = File.read "#{MARKDOWN_TEST_PATH}/Auto links.text"
-
- doc = @parser.parse input
-
- # TODO verify rdoc auto-links too
- expected =
- doc(
- para("Link: http://example.com/."),
- para("With an ampersand: http://example.com/?foo=1&bar=2"),
- list(:BULLET,
- item(nil, para("In a list?")),
- item(nil, para("http://example.com/")),
- item(nil, para("It should."))),
- block(
- para("Blockquoted: http://example.com/")),
- para("Auto-links should not occur here: " +
- "<code><http://example.com/></code>"),
- verb("or here: <http://example.com/>\n"))
-
- assert_equal expected, doc
- end
-
- def test_backslash_escapes
- input = File.read "#{MARKDOWN_TEST_PATH}/Backslash escapes.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("These should all get escaped:"),
-
- para("Backslash: \\"),
- para("Backtick: `"),
- para("Asterisk: *"),
- para("Underscore: _"),
- para("Left brace: {"),
- para("Right brace: }"),
- para("Left bracket: ["),
- para("Right bracket: ]"),
- para("Left paren: ("),
- para("Right paren: )"),
- para("Greater-than: >"),
- para("Hash: #"),
- para("Period: ."),
- para("Bang: !"),
- para("Plus: +"),
- para("Minus: -"),
-
- para("These should not, because they occur within a code block:"),
-
- verb("Backslash: \\\\\n",
- "\n",
- "Backtick: \\`\n",
- "\n",
- "Asterisk: \\*\n",
- "\n",
- "Underscore: \\_\n",
- "\n",
- "Left brace: \\{\n",
- "\n",
- "Right brace: \\}\n",
- "\n",
- "Left bracket: \\[\n",
- "\n",
- "Right bracket: \\]\n",
- "\n",
- "Left paren: \\(\n",
- "\n",
- "Right paren: \\)\n",
- "\n",
- "Greater-than: \\>\n",
- "\n",
- "Hash: \\#\n",
- "\n",
- "Period: \\.\n",
- "\n",
- "Bang: \\!\n",
- "\n",
- "Plus: \\+\n",
- "\n",
- "Minus: \\-\n"),
-
- para("Nor should these, which occur in code spans:"),
-
- para("Backslash: <code>\\\\</code>"),
- para("Backtick: <code>\\`</code>"),
- para("Asterisk: <code>\\*</code>"),
- para("Underscore: <code>\\_</code>"),
- para("Left brace: <code>\\{</code>"),
- para("Right brace: <code>\\}</code>"),
- para("Left bracket: <code>\\[</code>"),
- para("Right bracket: <code>\\]</code>"),
- para("Left paren: <code>\\(</code>"),
- para("Right paren: <code>\\)</code>"),
- para("Greater-than: <code>\\></code>"),
- para("Hash: <code>\\#</code>"),
- para("Period: <code>\\.</code>"),
- para("Bang: <code>\\!</code>"),
- para("Plus: <code>\\+</code>"),
- para("Minus: <code>\\-</code>"),
-
- para("These should get escaped, even though they're matching pairs for\n" +
- "other Markdown constructs:"),
-
- para("\*asterisks\*"),
- para("\_underscores\_"),
- para("`backticks`"),
-
- para("This is a code span with a literal backslash-backtick " +
- "sequence: <code>\\`</code>"),
-
- para("This is a tag with unescaped backticks " +
- "<span attr='`ticks`'>bar</span>."),
-
- para("This is a tag with backslashes " +
- "<span attr='\\\\backslashes\\\\'>bar</span>."))
-
- assert_equal expected, doc
- end
-
- def test_blockquotes_with_code_blocks
- input = File.read "#{MARKDOWN_TEST_PATH}/Blockquotes with code blocks.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- block(
- para("Example:"),
- verb("sub status {\n",
- " print \"working\";\n",
- "}\n"),
- para("Or:"),
- verb("sub status {\n",
- " return \"working\";\n",
- "}\n")))
-
- assert_equal expected, doc
- end
-
- def test_code_blocks
- input = File.read "#{MARKDOWN_TEST_PATH}/Code Blocks.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- verb("code block on the first line\n"),
- para("Regular text."),
-
- verb("code block indented by spaces\n"),
- para("Regular text."),
-
- verb("the lines in this block \n",
- "all contain trailing spaces \n"),
- para("Regular Text."),
-
- verb("code block on the last line\n"))
-
- assert_equal expected, doc
- end
-
- def test_code_spans
- input = File.read "#{MARKDOWN_TEST_PATH}/Code Spans.text"
-
- doc = @parser.parse input
-
- expected = doc(
- para("<code><test a=\"</code> content of attribute <code>\"></code>"),
- para("Fix for backticks within HTML tag: " +
- "<span attr='`ticks`'>like this</span>"),
- para("Here's how you put <code>`backticks`</code> in a code span."))
-
- assert_equal expected, doc
- end
-
- def test_hard_wrapped_paragraphs_with_list_like_lines
- input = File.read "#{MARKDOWN_TEST_PATH}/Hard-wrapped paragraphs with list-like lines.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("In Markdown 1.0.0 and earlier. Version\n" +
- "8. This line turns into a list item.\n" +
- "Because a hard-wrapped line in the\n" +
- "middle of a paragraph looked like a\n" +
- "list item."),
- para("Here's one with a bullet.\n" +
- "* criminey."))
-
- assert_equal expected, doc
- end
-
- def test_horizontal_rules
- input = File.read "#{MARKDOWN_TEST_PATH}/Horizontal rules.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("Dashes:"),
-
- rule(1),
- rule(1),
- rule(1),
- rule(1),
- verb("---\n"),
-
- rule(1),
- rule(1),
- rule(1),
- rule(1),
- verb("- - -\n"),
-
- para("Asterisks:"),
-
- rule(1),
- rule(1),
- rule(1),
- rule(1),
- verb("***\n"),
-
- rule(1),
- rule(1),
- rule(1),
- rule(1),
- verb("* * *\n"),
-
- para("Underscores:"),
-
- rule(1),
- rule(1),
- rule(1),
- rule(1),
- verb("___\n"),
-
- rule(1),
- rule(1),
- rule(1),
- rule(1),
- verb("_ _ _\n"))
-
- assert_equal expected, doc
- end
-
- def test_inline_html_advanced
- input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Advanced).text"
-
- @parser.html = true
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("Simple block on one line:"),
- raw("<div>foo</div>"),
- para("And nested without indentation:"),
- raw(<<-RAW.chomp))
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"/>
-</div>
-<div>bar</div>
-</div>
- RAW
-
- assert_equal expected, doc
- end
-
- def test_inline_html_simple
- input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML (Simple).text"
-
- @parser.html = true
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("Here's a simple block:"),
- raw("<div>\n\tfoo\n</div>"),
-
- para("This should be a code block, though:"),
- verb("<div>\n",
- "\tfoo\n",
- "</div>\n"),
-
- para("As should this:"),
- verb("<div>foo</div>\n"),
-
- para("Now, nested:"),
- raw("<div>\n\t<div>\n\t\t<div>\n\t\t\tfoo\n" +
- "\t\t</div>\n\t</div>\n</div>"),
-
- para("This should just be an HTML comment:"),
- raw("<!-- Comment -->"),
-
- para("Multiline:"),
- raw("<!--\nBlah\nBlah\n-->"),
-
- para("Code block:"),
- verb("<!-- Comment -->\n"),
-
- para("Just plain comment, with trailing spaces on the line:"),
- raw("<!-- foo -->"),
-
- para("Code:"),
- verb("<hr />\n"),
-
- para("Hr's:"),
- raw("<hr>"),
- raw("<hr/>"),
- raw("<hr />"),
-
- raw("<hr>"),
- raw("<hr/>"),
- raw("<hr />"),
-
- raw("<hr class=\"foo\" id=\"bar\" />"),
- raw("<hr class=\"foo\" id=\"bar\"/>"),
- raw("<hr class=\"foo\" id=\"bar\" >"))
-
- assert_equal expected, doc
- end
-
- def test_inline_html_comments
- input = File.read "#{MARKDOWN_TEST_PATH}/Inline HTML comments.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("Paragraph one."),
-
- raw("<!-- This is a simple comment -->"),
-
- raw("<!--\n\tThis is another comment.\n-->"),
-
- para("Paragraph two."),
-
- raw("<!-- one comment block -- -- with two comments -->"),
-
- para("The end."))
-
- assert_equal expected, doc
- end
-
- def test_links_inline_style
- input = File.read "#{MARKDOWN_TEST_PATH}/Links, inline style.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("Just a {URL}[/url/]."),
- para("{URL and title}[/url/]."),
- para("{URL and title}[/url/]."),
- para("{URL and title}[/url/]."),
- para("{URL and title}[/url/]."),
- para("{Empty}[]."))
-
- assert_equal expected, doc
- end
-
- def test_links_reference_style
- input = File.read "#{MARKDOWN_TEST_PATH}/Links, reference style.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("Foo {bar}[/url/]."),
- para("Foo {bar}[/url/]."),
- para("Foo {bar}[/url/]."),
-
- para("With {embedded [brackets]}[/url/]."),
-
- para("Indented {once}[/url]."),
- para("Indented {twice}[/url]."),
- para("Indented {thrice}[/url]."),
- para("Indented [four][] times."),
-
- verb("[four]: /url\n"),
-
- rule(1),
-
- para("{this}[foo] should work"),
- para("So should {this}[foo]."),
- para("And {this}[foo]."),
- para("And {this}[foo]."),
- para("And {this}[foo]."),
-
- para("But not [that] []."),
- para("Nor [that][]."),
- para("Nor [that]."),
-
- para("[Something in brackets like {this}[foo] should work]"),
- para("[Same with {this}[foo].]"),
-
- para("In this case, {this}[/somethingelse/] points to something else."),
- para("Backslashing should suppress [this] and [this]."),
-
- rule(1),
-
- para("Here's one where the {link breaks}[/url/] across lines."),
- para("Here's another where the {link breaks}[/url/] across lines, " +
- "but with a line-ending space."))
-
- assert_equal expected, doc
- end
-
- def test_links_shortcut_references
- input = File.read "#{MARKDOWN_TEST_PATH}/Links, shortcut references.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("This is the {simple case}[/simple]."),
- para("This one has a {line break}[/foo]."),
- para("This one has a {line break}[/foo] with a line-ending space."),
- para("{this}[/that] and the {other}[/other]"))
-
- assert_equal expected, doc
- end
-
- def test_literal_quotes_in_titles
- input = File.read "#{MARKDOWN_TEST_PATH}/Literal quotes in titles.text"
-
- doc = @parser.parse input
-
- # TODO support title attribute
- expected =
- doc(
- para("Foo {bar}[/url/]."),
- para("Foo {bar}[/url/]."))
-
- assert_equal expected, doc
- end
-
- def test_markdown_documentation_basics
- input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Basics.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- head(1, "Markdown: Basics"),
-
- raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
- <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
- <li><a class="selected" title="Markdown Basics">Basics</a></li>
- <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
- <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
- <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
- RAW
-
- head(2, "Getting the Gist of Markdown's Formatting Syntax"),
-
- para("This page offers a brief overview of what it's like to use Markdown.\n" +
- "The {syntax page}[/projects/markdown/syntax] provides complete, detailed documentation for\n" +
- "every feature, but Markdown should be very easy to pick up simply by\n" +
- "looking at a few examples of it in action. The examples on this page\n" +
- "are written in a before/after style, showing example syntax and the\n" +
- "HTML output produced by Markdown."),
-
- para("It's also helpful to simply try Markdown out; the {Dingus}[/projects/markdown/dingus] is a\n" +
- "web application that allows you type your own Markdown-formatted text\n" +
- "and translate it to XHTML."),
-
- para("<b>Note:</b> This document is itself written using Markdown; you\n" +
- "can {see the source for it by adding '.text' to the URL}[/projects/markdown/basics.text]."),
-
- head(2, "Paragraphs, Headers, Blockquotes"),
-
- para("A paragraph is simply one or more consecutive lines of text, separated\n" +
- "by one or more blank lines. (A blank line is any line that looks like a\n" +
- "blank line -- a line containing nothing spaces or tabs is considered\n" +
- "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
- para("Markdown offers two styles of headers: _Setext_ and _atx_.\n" +
- "Setext-style headers for <code><h1></code> and <code><h2></code> are created by\n" +
- "\"underlining\" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.\n" +
- "To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the\n" +
- "beginning of the line -- the number of hashes equals the resulting\n" +
- "HTML header level."),
-
- para("Blockquotes are indicated using email-style '<code>></code>' angle brackets."),
-
- para("Markdown:"),
-
- verb("A First Level Header\n",
- "====================\n",
- "\n",
- "A Second Level Header\n",
- "---------------------\n",
- "\n",
- "Now is the time for all good men to come to\n",
- "the aid of their country. This is just a\n",
- "regular paragraph.\n",
- "\n",
- "The quick brown fox jumped over the lazy\n",
- "dog's back.\n",
- "\n",
- "### Header 3\n",
- "\n",
- "> This is a blockquote.\n",
- "> \n",
- "> This is the second paragraph in the blockquote.\n",
- ">\n",
- "> ## This is an H2 in a blockquote\n"),
-
- para("Output:"),
-
- verb("<h1>A First Level Header</h1>\n",
- "\n",
- "<h2>A Second Level Header</h2>\n",
- "\n",
- "<p>Now is the time for all good men to come to\n",
- "the aid of their country. This is just a\n",
- "regular paragraph.</p>\n",
- "\n",
- "<p>The quick brown fox jumped over the lazy\n",
- "dog's back.</p>\n",
- "\n",
- "<h3>Header 3</h3>\n",
- "\n",
- "<blockquote>\n",
- " <p>This is a blockquote.</p>\n",
- "\n",
- " <p>This is the second paragraph in the blockquote.</p>\n",
- "\n",
- " <h2>This is an H2 in a blockquote</h2>\n",
- "</blockquote>\n"),
-
- head(3, "Phrase Emphasis"),
- para("Markdown uses asterisks and underscores to indicate spans of emphasis."),
-
- para("Markdown:"),
-
- verb("Some of these words *are emphasized*.\n",
- "Some of these words _are emphasized also_.\n",
- "\n",
- "Use two asterisks for **strong emphasis**.\n",
- "Or, if you prefer, __use two underscores instead__.\n"),
-
- para("Output:"),
-
- verb("<p>Some of these words <em>are emphasized</em>.\n",
- "Some of these words <em>are emphasized also</em>.</p>\n",
- "\n",
- "<p>Use two asterisks for <strong>strong emphasis</strong>.\n",
- "Or, if you prefer, <strong>use two underscores instead</strong>.</p>\n"),
-
- head(2, "Lists"),
-
- para("Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,\n" +
- "<code>+</code>, and <code>-</code>) as list markers. These three markers are\n" +
- "interchangable; this:"),
-
- verb("* Candy.\n",
- "* Gum.\n",
- "* Booze.\n"),
-
- para("this:"),
-
- verb("+ Candy.\n",
- "+ Gum.\n",
- "+ Booze.\n"),
-
- para("and this:"),
-
- verb("- Candy.\n",
- "- Gum.\n",
- "- Booze.\n"),
-
- para("all produce the same output:"),
-
- verb("<ul>\n",
- "<li>Candy.</li>\n",
- "<li>Gum.</li>\n",
- "<li>Booze.</li>\n",
- "</ul>\n"),
-
- para("Ordered (numbered) lists use regular numbers, followed by periods, as\n" +
- "list markers:"),
-
- verb("1. Red\n",
- "2. Green\n",
- "3. Blue\n"),
-
- para("Output:"),
-
- verb("<ol>\n",
- "<li>Red</li>\n",
- "<li>Green</li>\n",
- "<li>Blue</li>\n",
- "</ol>\n"),
-
- para("If you put blank lines between items, you'll get <code><p></code> tags for the\n" +
- "list item text. You can create multi-paragraph list items by indenting\n" +
- "the paragraphs by 4 spaces or 1 tab:"),
-
- verb("* A list item.\n",
- "\n",
- " With multiple paragraphs.\n",
- "\n",
- "* Another item in the list.\n"),
-
- para("Output:"),
-
- verb("<ul>\n",
- "<li><p>A list item.</p>\n",
- "<p>With multiple paragraphs.</p></li>\n",
- "<li><p>Another item in the list.</p></li>\n",
- "</ul>\n"),
-
- head(3, "Links"),
-
- para("Markdown supports two styles for creating links: _inline_ and\n" +
- "_reference_. With both styles, you use square brackets to delimit the\n" +
- "text you want to turn into a link."),
-
- para("Inline-style links use parentheses immediately after the link text.\n" +
- "For example:"),
-
- verb("This is an [example link](http://example.com/).\n"),
-
- para("Output:"),
-
- verb("<p>This is an <a href=\"http://example.com/\">\n",
- "example link</a>.</p>\n"),
-
- para("Optionally, you may include a title attribute in the parentheses:"),
-
- verb("This is an [example link](http://example.com/ \"With a Title\").\n"),
-
- para("Output:"),
-
- verb("<p>This is an <a href=\"http://example.com/\" title=\"With a Title\">\n",
- "example link</a>.</p>\n"),
-
- para("Reference-style links allow you to refer to your links by names, which\n" +
- "you define elsewhere in your document:"),
-
- verb("I get 10 times more traffic from [Google][1] than from\n",
- "[Yahoo][2] or [MSN][3].\n",
- "\n",
- "[1]: http://google.com/ \"Google\"\n",
- "[2]: http://search.yahoo.com/ \"Yahoo Search\"\n",
- "[3]: http://search.msn.com/ \"MSN Search\"\n"),
-
- para("Output:"),
-
- verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
- "title=\"Google\">Google</a> than from <a href=\"http://search.yahoo.com/\"\n",
- "title=\"Yahoo Search\">Yahoo</a> or <a href=\"http://search.msn.com/\"\n",
- "title=\"MSN Search\">MSN</a>.</p>\n"),
-
- para("The title attribute is optional. Link names may contain letters,\n" +
- "numbers and spaces, but are _not_ case sensitive:"),
-
- verb("I start my morning with a cup of coffee and\n",
- "[The New York Times][NY Times].\n",
- "\n",
- "[ny times]: http://www.nytimes.com/\n"),
-
- para("Output:"),
-
- verb("<p>I start my morning with a cup of coffee and\n",
- "<a href=\"http://www.nytimes.com/\">The New York Times</a>.</p>\n"),
-
- head(3, "Images"),
-
- para("Image syntax is very much like link syntax."),
-
- para("Inline (titles are optional):"),
-
- verb("![alt text](/path/to/img.jpg \"Title\")\n"),
-
- para("Reference-style:"),
-
- verb("![alt text][id]\n",
- "\n",
- "[id]: /path/to/img.jpg \"Title\"\n"),
-
- para("Both of the above examples produce the same output:"),
-
- verb("<img src=\"/path/to/img.jpg\" alt=\"alt text\" title=\"Title\" />\n"),
-
- head(3, "Code"),
-
- para("In a regular paragraph, you can create code span by wrapping text in\n" +
- "backtick quotes. Any ampersands (<code>&</code>) and angle brackets (<code><</code> or\n" +
- "<code>></code>) will automatically be translated into HTML entities. This makes\n" +
- "it easy to use Markdown to write about HTML example code:"),
-
- verb(
- "I strongly recommend against using any `<blink>` tags.\n",
- "\n",
- "I wish SmartyPants used named entities like `&mdash;`\n",
- "instead of decimal-encoded entites like `&#8212;`.\n"),
-
- para("Output:"),
-
- verb("<p>I strongly recommend against using any\n",
- "<code>&lt;blink&gt;</code> tags.</p>\n",
- "\n",
- "<p>I wish SmartyPants used named entities like\n",
- "<code>&amp;mdash;</code> instead of decimal-encoded\n",
- "entites like <code>&amp;#8212;</code>.</p>\n"),
-
- para("To specify an entire block of pre-formatted code, indent every line of\n" +
- "the block by 4 spaces or 1 tab. Just like with code spans, <code>&</code>, <code><</code>,\n" +
- "and <code>></code> characters will be escaped automatically."),
-
- para("Markdown:"),
-
- verb("If you want your page to validate under XHTML 1.0 Strict,\n",
- "you've got to put paragraph tags in your blockquotes:\n",
- "\n",
- " <blockquote>\n",
- " <p>For example.</p>\n",
- " </blockquote>\n"),
-
- para("Output:"),
-
- verb("<p>If you want your page to validate under XHTML 1.0 Strict,\n",
- "you've got to put paragraph tags in your blockquotes:</p>\n",
- "\n",
- "<pre><code>&lt;blockquote&gt;\n",
- " &lt;p&gt;For example.&lt;/p&gt;\n",
- "&lt;/blockquote&gt;\n",
- "</code></pre>\n"))
-
- assert_equal expected, doc
- end
-
- def test_markdown_documentation_syntax
- input = File.read "#{MARKDOWN_TEST_PATH}/Markdown Documentation - Syntax.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- head(1, "Markdown: Syntax"),
-
- raw(<<-RAW.chomp),
-<ul id="ProjectSubmenu">
- <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
- <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
- <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
- <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
- <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
- RAW
-
- list(:BULLET,
- item(nil,
- para("{Overview}[#overview]"),
- list(:BULLET,
- item(nil,
- para("{Philosophy}[#philosophy]")),
- item(nil,
- para("{Inline HTML}[#html]")),
- item(nil,
- para("{Automatic Escaping for Special Characters}[#autoescape]")))),
- item(nil,
- para("{Block Elements}[#block]"),
- list(:BULLET,
- item(nil,
- para("{Paragraphs and Line Breaks}[#p]")),
- item(nil,
- para("{Headers}[#header]")),
- item(nil,
- para("{Blockquotes}[#blockquote]")),
- item(nil,
- para("{Lists}[#list]")),
- item(nil,
- para("{Code Blocks}[#precode]")),
- item(nil,
- para("{Horizontal Rules}[#hr]")))),
- item(nil,
- para("{Span Elements}[#span]"),
- list(:BULLET,
- item(nil,
- para("{Links}[#link]")),
- item(nil,
- para("{Emphasis}[#em]")),
- item(nil,
- para("{Code}[#code]")),
- item(nil,
- para("{Images}[#img]")))),
- item(nil,
- para("{Miscellaneous}[#misc]"),
- list(:BULLET,
- item(nil,
- para("{Backslash Escapes}[#backslash]")),
- item(nil,
- para("{Automatic Links}[#autolink]"))))),
-
- para("<b>Note:</b> This document is itself written using Markdown; you\n" +
- "can {see the source for it by adding '.text' to the URL}[/projects/markdown/syntax.text]."),
-
- rule(1),
-
- raw("<h2 id=\"overview\">Overview</h2>"),
-
- raw("<h3 id=\"philosophy\">Philosophy</h3>"),
-
- para("Markdown is intended to be as easy-to-read and easy-to-write as is feasible."),
-
- para("Readability, however, is emphasized above all else. A Markdown-formatted\n" +
- "document should be publishable as-is, as plain text, without looking\n" +
- "like it's been marked up with tags or formatting instructions. While\n" +
- "Markdown's syntax has been influenced by several existing text-to-HTML\n" +
- "filters -- including {Setext}[http://docutils.sourceforge.net/mirror/setext.html], {atx}[http://www.aaronsw.com/2002/atx/], {Textile}[http://textism.com/tools/textile/], {reStructuredText}[http://docutils.sourceforge.net/rst.html],\n" +
- "{Grutatext}[http://www.triptico.com/software/grutatxt.html], and {EtText}[http://ettext.taint.org/doc/] -- the single biggest source of\n" +
- "inspiration for Markdown's syntax is the format of plain text email."),
-
- para("To this end, Markdown's syntax is comprised entirely of punctuation\n" +
- "characters, which punctuation characters have been carefully chosen so\n" +
- "as to look like what they mean. E.g., asterisks around a word actually\n" +
- "look like \*emphasis\*. Markdown lists look like, well, lists. Even\n" +
- "blockquotes look like quoted passages of text, assuming you've ever\n" +
- "used email."),
-
- raw("<h3 id=\"html\">Inline HTML</h3>"),
-
- para("Markdown's syntax is intended for one purpose: to be used as a\n" +
- "format for _writing_ for the web."),
-
- para("Markdown is not a replacement for HTML, or even close to it. Its\n" +
- "syntax is very small, corresponding only to a very small subset of\n" +
- "HTML tags. The idea is _not_ to create a syntax that makes it easier\n" +
- "to insert HTML tags. In my opinion, HTML tags are already easy to\n" +
- "insert. The idea for Markdown is to make it easy to read, write, and\n" +
- "edit prose. HTML is a _publishing_ format; Markdown is a _writing_\n" +
- "format. Thus, Markdown's formatting syntax only addresses issues that\n" +
- "can be conveyed in plain text."),
-
- para("For any markup that is not covered by Markdown's syntax, you simply\n" +
- "use HTML itself. There's no need to preface it or delimit it to\n" +
- "indicate that you're switching from Markdown to HTML; you just use\n" +
- "the tags."),
-
- para("The only restrictions are that block-level HTML elements -- e.g. <code><div></code>,\n" +
- "<code><table></code>, <code><pre></code>, <code><p></code>, etc. -- must be separated from surrounding\n" +
- "content by blank lines, and the start and end tags of the block should\n" +
- "not be indented with tabs or spaces. Markdown is smart enough not\n" +
- "to add extra (unwanted) <code><p></code> tags around HTML block-level tags."),
-
- para("For example, to add an HTML table to a Markdown article:"),
-
- verb("This is a regular paragraph.\n",
- "\n",
- "<table>\n",
- " <tr>\n",
- " <td>Foo</td>\n",
- " </tr>\n",
- "</table>\n",
- "\n",
- "This is another regular paragraph.\n"),
-
- para("Note that Markdown formatting syntax is not processed within block-level\n" +
- "HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an\n" +
- "HTML block."),
-
- para("Span-level HTML tags -- e.g. <code><span></code>, <code><cite></code>, or <code><del></code> -- can be\n" +
- "used anywhere in a Markdown paragraph, list item, or header. If you\n" +
- "want, you can even use HTML tags instead of Markdown formatting; e.g. if\n" +
- "you'd prefer to use HTML <code><a></code> or <code><img></code> tags instead of Markdown's\n" +
- "link or image syntax, go right ahead."),
-
- para("Unlike block-level HTML tags, Markdown syntax _is_ processed within\n" +
- "span-level tags."),
-
- raw("<h3 id=\"autoescape\">Automatic Escaping for Special Characters</h3>"),
-
- para("In HTML, there are two characters that demand special treatment: <code><</code>\n" +
- "and <code>&</code>. Left angle brackets are used to start tags; ampersands are\n" +
- "used to denote HTML entities. If you want to use them as literal\n" +
- "characters, you must escape them as entities, e.g. <code>&lt;</code>, and\n" +
- "<code>&amp;</code>."),
-
- para("Ampersands in particular are bedeviling for web writers. If you want to\n" +
- "write about 'AT&T', you need to write '<code>AT&amp;T</code>'. You even need to\n" +
- "escape ampersands within URLs. Thus, if you want to link to:"),
-
- verb("http://images.google.com/images?num=30&q=larry+bird\n"),
-
- para("you need to encode the URL as:"),
-
- verb("http://images.google.com/images?num=30&amp;q=larry+bird\n"),
-
- para("in your anchor tag <code>href</code> attribute. Needless to say, this is easy to\n" +
- "forget, and is probably the single most common source of HTML validation\n" +
- "errors in otherwise well-marked-up web sites."),
-
- para("Markdown allows you to use these characters naturally, taking care of\n" +
- "all the necessary escaping for you. If you use an ampersand as part of\n" +
- "an HTML entity, it remains unchanged; otherwise it will be translated\n" +
- "into <code>&amp;</code>."),
-
- para("So, if you want to include a copyright symbol in your article, you can write:"),
-
- verb("&copy;\n"),
-
- para("and Markdown will leave it alone. But if you write:"),
-
- verb("AT&T\n"),
-
- para("Markdown will translate it to:"),
-
- verb("AT&amp;T\n"),
-
- para("Similarly, because Markdown supports {inline HTML}[#html], if you use\n" +
- "angle brackets as delimiters for HTML tags, Markdown will treat them as\n" +
- "such. But if you write:"),
-
- verb("4 < 5\n"),
-
- para("Markdown will translate it to:"),
-
- verb("4 &lt; 5\n"),
-
- para("However, inside Markdown code spans and blocks, angle brackets and\n" +
- "ampersands are _always_ encoded automatically. This makes it easy to use\n" +
- "Markdown to write about HTML code. (As opposed to raw HTML, which is a\n" +
- "terrible format for writing about HTML syntax, because every single <code><</code>\n" +
- "and <code>&</code> in your example code needs to be escaped.)"),
-
- rule(1),
-
- raw("<h2 id=\"block\">Block Elements</h2>"),
-
- raw("<h3 id=\"p\">Paragraphs and Line Breaks</h3>"),
-
- para("A paragraph is simply one or more consecutive lines of text, separated\n" +
- "by one or more blank lines. (A blank line is any line that looks like a\n" +
- "blank line -- a line containing nothing but spaces or tabs is considered\n" +
- "blank.) Normal paragraphs should not be intended with spaces or tabs."),
-
- para("The implication of the \"one or more consecutive lines of text\" rule is\n" +
- "that Markdown supports \"hard-wrapped\" text paragraphs. This differs\n" +
- "significantly from most other text-to-HTML formatters (including Movable\n" +
- "Type's \"Convert Line Breaks\" option) which translate every line break\n" +
- "character in a paragraph into a <code><br /></code> tag."),
-
- para("When you _do_ want to insert a <code><br /></code> break tag using Markdown, you\n" +
- "end a line with two or more spaces, then type return."),
-
- para("Yes, this takes a tad more effort to create a <code><br /></code>, but a simplistic\n" +
- "\"every line break is a <code><br /></code>\" rule wouldn't work for Markdown.\n" +
- "Markdown's email-style {blockquoting}[#blockquote] and multi-paragraph {list items}[#list]\n" +
- "work best -- and look better -- when you format them with hard breaks."),
-
- raw("<h3 id=\"header\">Headers</h3>"),
-
- para("Markdown supports two styles of headers, {Setext}[http://docutils.sourceforge.net/mirror/setext.html] and {atx}[http://www.aaronsw.com/2002/atx/]."),
-
- para("Setext-style headers are \"underlined\" using equal signs (for first-level\n" +
- "headers) and dashes (for second-level headers). For example:"),
-
- verb("This is an H1\n",
- "=============\n",
- "\n",
- "This is an H2\n",
- "-------------\n"),
-
- para("Any number of underlining <code>=</code>'s or <code>-</code>'s will work."),
-
- para("Atx-style headers use 1-6 hash characters at the start of the line,\n" +
- "corresponding to header levels 1-6. For example:"),
-
- verb("# This is an H1\n",
- "\n",
- "## This is an H2\n",
- "\n",
- "###### This is an H6\n"),
-
- para("Optionally, you may \"close\" atx-style headers. This is purely\n" +
- "cosmetic -- you can use this if you think it looks better. The\n" +
- "closing hashes don't even need to match the number of hashes\n" +
- "used to open the header. (The number of opening hashes\n" +
- "determines the header level.) :"),
-
- verb("# This is an H1 #\n",
- "\n",
- "## This is an H2 ##\n",
- "\n",
- "### This is an H3 ######\n"),
-
- raw("<h3 id=\"blockquote\">Blockquotes</h3>"),
-
- para(
- "Markdown uses email-style <code>></code> characters for blockquoting. If you're\n" +
- "familiar with quoting passages of text in an email message, then you\n" +
- "know how to create a blockquote in Markdown. It looks best if you hard\n" +
- "wrap the text and put a <code>></code> before every line:"),
-
- verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
- "> consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
- "> Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
- "> \n",
- "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
- "> id sem consectetuer libero luctus adipiscing.\n"),
-
- para("Markdown allows you to be lazy and only put the <code>></code> before the first\n" +
- "line of a hard-wrapped paragraph:"),
-
- verb("> This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,\n",
- "consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.\n",
- "Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.\n",
- "\n",
- "> Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse\n",
- "id sem consectetuer libero luctus adipiscing.\n"),
-
- para("Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by\n" +
- "adding additional levels of <code>></code>:"),
-
- verb("> This is the first level of quoting.\n",
- ">\n",
- "> > This is nested blockquote.\n",
- ">\n",
- "> Back to the first level.\n"),
-
- para("Blockquotes can contain other Markdown elements, including headers, lists,\n" +
- "and code blocks:"),
-
- verb("> ## This is a header.\n",
- "> \n",
- "> 1. This is the first list item.\n",
- "> 2. This is the second list item.\n",
- "> \n",
- "> Here's some example code:\n",
- "> \n",
- "> return shell_exec(\"echo $input | $markdown_script\");\n"),
-
- para("Any decent text editor should make email-style quoting easy. For\n" +
- "example, with BBEdit, you can make a selection and choose Increase\n" +
- "Quote Level from the Text menu."),
-
- raw("<h3 id=\"list\">Lists</h3>"),
-
- para("Markdown supports ordered (numbered) and unordered (bulleted) lists."),
-
- para("Unordered lists use asterisks, pluses, and hyphens -- interchangably\n" +
- "-- as list markers:"),
-
- verb("* Red\n",
- "* Green\n",
- "* Blue\n"),
-
- para("is equivalent to:"),
-
- verb("+ Red\n",
- "+ Green\n",
- "+ Blue\n"),
-
- para("and:"),
-
- verb("- Red\n",
- "- Green\n",
- "- Blue\n"),
-
- para("Ordered lists use numbers followed by periods:"),
-
- verb("1. Bird\n",
- "2. McHale\n",
- "3. Parish\n"),
-
- para("It's important to note that the actual numbers you use to mark the\n" +
- "list have no effect on the HTML output Markdown produces. The HTML\n" +
- "Markdown produces from the above list is:"),
-
- verb("<ol>\n",
- "<li>Bird</li>\n",
- "<li>McHale</li>\n",
- "<li>Parish</li>\n",
- "</ol>\n"),
-
- para("If you instead wrote the list in Markdown like this:"),
-
- verb("1. Bird\n",
- "1. McHale\n",
- "1. Parish\n"),
-
- para("or even:"),
-
- verb("3. Bird\n",
- "1. McHale\n",
- "8. Parish\n"),
-
- para("you'd get the exact same HTML output. The point is, if you want to,\n" +
- "you can use ordinal numbers in your ordered Markdown lists, so that\n" +
- "the numbers in your source match the numbers in your published HTML.\n" +
- "But if you want to be lazy, you don't have to."),
-
- para("If you do use lazy list numbering, however, you should still start the\n" +
- "list with the number 1. At some point in the future, Markdown may support\n" +
- "starting ordered lists at an arbitrary number."),
-
- para("List markers typically start at the left margin, but may be indented by\n" +
- "up to three spaces. List markers must be followed by one or more spaces\n" +
- "or a tab."),
-
- para("To make lists look nice, you can wrap items with hanging indents:"),
-
- verb("* Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
- " Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
- " viverra nec, fringilla in, laoreet vitae, risus.\n",
- "* Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
- " Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
- para("But if you want to be lazy, you don't have to:"),
-
- verb("* Lorem ipsum dolor sit amet, consectetuer adipiscing elit.\n",
- "Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,\n",
- "viverra nec, fringilla in, laoreet vitae, risus.\n",
- "* Donec sit amet nisl. Aliquam semper ipsum sit amet velit.\n",
- "Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
- para("If list items are separated by blank lines, Markdown will wrap the\n" +
- "items in <code><p></code> tags in the HTML output. For example, this input:"),
-
- verb("* Bird\n",
- "* Magic\n"),
-
- para("will turn into:"),
-
- verb("<ul>\n",
- "<li>Bird</li>\n",
- "<li>Magic</li>\n",
- "</ul>\n"),
-
- para("But this:"),
-
- verb("* Bird\n",
- "\n",
- "* Magic\n"),
-
- para("will turn into:"),
-
- verb("<ul>\n",
- "<li><p>Bird</p></li>\n",
- "<li><p>Magic</p></li>\n",
- "</ul>\n"),
-
- para("List items may consist of multiple paragraphs. Each subsequent\n" +
- "paragraph in a list item must be intended by either 4 spaces\n" +
- "or one tab:"),
-
- verb("1. This is a list item with two paragraphs. Lorem ipsum dolor\n",
- " sit amet, consectetuer adipiscing elit. Aliquam hendrerit\n",
- " mi posuere lectus.\n",
- "\n",
- " Vestibulum enim wisi, viverra nec, fringilla in, laoreet\n",
- " vitae, risus. Donec sit amet nisl. Aliquam semper ipsum\n",
- " sit amet velit.\n",
- "\n",
- "2. Suspendisse id sem consectetuer libero luctus adipiscing.\n"),
-
- para("It looks nice if you indent every line of the subsequent\n" +
- "paragraphs, but here again, Markdown will allow you to be\n" +
- "lazy:"),
-
- verb("* This is a list item with two paragraphs.\n",
- "\n",
- " This is the second paragraph in the list item. You're\n",
- "only required to indent the first line. Lorem ipsum dolor\n",
- "sit amet, consectetuer adipiscing elit.\n",
- "\n",
- "* Another item in the same list.\n"),
-
- para("To put a blockquote within a list item, the blockquote's <code>></code>\n" +
- "delimiters need to be indented:"),
-
- verb("* A list item with a blockquote:\n",
- "\n",
- " > This is a blockquote\n",
- " > inside a list item.\n"),
-
- para(
- "To put a code block within a list item, the code block needs\n" +
- "to be indented _twice_ -- 8 spaces or two tabs:"),
-
- verb("* A list item with a code block:\n",
- "\n",
- " <code goes here>\n"),
-
- para("It's worth noting that it's possible to trigger an ordered list by\n" +
- "accident, by writing something like this:"),
-
- verb("1986. What a great season.\n"),
-
- para("In other words, a <em>number-period-space</em> sequence at the beginning of a\n" +
- "line. To avoid this, you can backslash-escape the period:"),
-
- verb("1986\\. What a great season.\n"),
-
- raw("<h3 id=\"precode\">Code Blocks</h3>"),
-
- para("Pre-formatted code blocks are used for writing about programming or\n" +
- "markup source code. Rather than forming normal paragraphs, the lines\n" +
- "of a code block are interpreted literally. Markdown wraps a code block\n" +
- "in both <code><pre></code> and <code><code></code> tags."),
-
- para("To produce a code block in Markdown, simply indent every line of the\n" +
- "block by at least 4 spaces or 1 tab. For example, given this input:"),
-
- verb("This is a normal paragraph:\n",
- "\n",
- " This is a code block.\n"),
-
- para("Markdown will generate:"),
-
- verb("<p>This is a normal paragraph:</p>\n",
- "\n",
- "<pre><code>This is a code block.\n",
- "</code></pre>\n"),
-
- para("One level of indentation -- 4 spaces or 1 tab -- is removed from each\n" +
- "line of the code block. For example, this:"),
-
- verb("Here is an example of AppleScript:\n",
- "\n",
- " tell application \"Foo\"\n",
- " beep\n",
- " end tell\n"),
-
- para("will turn into:"),
-
- verb("<p>Here is an example of AppleScript:</p>\n",
- "\n",
- "<pre><code>tell application \"Foo\"\n",
- " beep\n",
- "end tell\n",
- "</code></pre>\n"),
-
- para("A code block continues until it reaches a line that is not indented\n" +
- "(or the end of the article)."),
-
- para("Within a code block, ampersands (<code>&</code>) and angle brackets (<code><</code> and <code>></code>)\n" +
- "are automatically converted into HTML entities. This makes it very\n" +
- "easy to include example HTML source code using Markdown -- just paste\n" +
- "it and indent it, and Markdown will handle the hassle of encoding the\n" +
- "ampersands and angle brackets. For example, this:"),
-
- verb(" <div class=\"footer\">\n",
- " &copy; 2004 Foo Corporation\n",
- " </div>\n"),
-
- para("will turn into:"),
-
- verb("<pre><code>&lt;div class=\"footer\"&gt;\n",
- " &amp;copy; 2004 Foo Corporation\n",
- "&lt;/div&gt;\n",
- "</code></pre>\n"),
-
- para("Regular Markdown syntax is not processed within code blocks. E.g.,\n" +
- "asterisks are just literal asterisks within a code block. This means\n" +
- "it's also easy to use Markdown to write about Markdown's own syntax."),
-
- raw("<h3 id=\"hr\">Horizontal Rules</h3>"),
-
- para("You can produce a horizontal rule tag (<code><hr /></code>) by placing three or\n" +
- "more hyphens, asterisks, or underscores on a line by themselves. If you\n" +
- "wish, you may use spaces between the hyphens or asterisks. Each of the\n" +
- "following lines will produce a horizontal rule:"),
-
- verb("* * *\n",
- "\n",
- "***\n",
- "\n",
- "*****\n",
- "\n",
- "- - -\n",
- "\n",
- "---------------------------------------\n",
- "\n",
- "_ _ _\n"),
-
- rule(1),
-
- raw("<h2 id=\"span\">Span Elements</h2>"),
-
- raw("<h3 id=\"link\">Links</h3>"),
-
- para("Markdown supports two style of links: _inline_ and _reference_."),
-
- para("In both styles, the link text is delimited by [square brackets]."),
-
- para("To create an inline link, use a set of regular parentheses immediately\n" +
- "after the link text's closing square bracket. Inside the parentheses,\n" +
- "put the URL where you want the link to point, along with an _optional_\n" +
- "title for the link, surrounded in quotes. For example:"),
-
- verb("This is [an example](http://example.com/ \"Title\") inline link.\n",
- "\n",
- "[This link](http://example.net/) has no title attribute.\n"),
-
- para("Will produce:"),
-
- verb("<p>This is <a href=\"http://example.com/\" title=\"Title\">\n",
- "an example</a> inline link.</p>\n",
- "\n",
- "<p><a href=\"http://example.net/\">This link</a> has no\n",
- "title attribute.</p>\n"),
-
- para("If you're referring to a local resource on the same server, you can\n" +
- "use relative paths:"),
-
- verb("See my [About](/about/) page for details.\n"),
-
- para("Reference-style links use a second set of square brackets, inside\n" +
- "which you place a label of your choosing to identify the link:"),
-
- verb("This is [an example][id] reference-style link.\n"),
-
- para("You can optionally use a space to separate the sets of brackets:"),
-
- verb("This is [an example] [id] reference-style link.\n"),
-
- para("Then, anywhere in the document, you define your link label like this,\n" +
- "on a line by itself:"),
-
- verb("[id]: http://example.com/ \"Optional Title Here\"\n"),
-
- para("That is:"),
-
- list(:BULLET,
- item(nil,
- para("Square brackets containing the link identifier (optionally\n" +
- "indented from the left margin using up to three spaces);")),
- item(nil,
- para("followed by a colon;")),
- item(nil,
- para("followed by one or more spaces (or tabs);")),
- item(nil,
- para("followed by the URL for the link;")),
- item(nil,
- para("optionally followed by a title attribute for the link, enclosed\n" +
- "in double or single quotes."))),
-
- para("The link URL may, optionally, be surrounded by angle brackets:"),
-
- verb("[id]: <http://example.com/> \"Optional Title Here\"\n"),
-
- para("You can put the title attribute on the next line and use extra spaces\n" +
- "or tabs for padding, which tends to look better with longer URLs:"),
-
- verb("[id]: http://example.com/longish/path/to/resource/here\n",
- " \"Optional Title Here\"\n"),
-
- para("Link definitions are only used for creating links during Markdown\n" +
- "processing, and are stripped from your document in the HTML output."),
-
- para("Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are _not_ case sensitive. E.g. these two links:"),
-
- verb("[link text][a]\n",
- "[link text][A]\n"),
-
- para("are equivalent."),
-
- para("The <em>implicit link name</em> shortcut allows you to omit the name of the\n" +
- "link, in which case the link text itself is used as the name.\n" +
- "Just use an empty set of square brackets -- e.g., to link the word\n" +
- "\"Google\" to the google.com web site, you could simply write:"),
-
- verb("[Google][]\n"),
-
- para("And then define the link:"),
-
- verb("[Google]: http://google.com/\n"),
-
- para("Because link names may contain spaces, this shortcut even works for\n" +
- "multiple words in the link text:"),
-
-
- verb("Visit [Daring Fireball][] for more information.\n"),
-
- para("And then define the link:"),
-
- verb("[Daring Fireball]: http://daringfireball.net/\n"),
-
- para("Link definitions can be placed anywhere in your Markdown document. I\n" +
- "tend to put them immediately after each paragraph in which they're\n" +
- "used, but if you want, you can put them all at the end of your\n" +
- "document, sort of like footnotes."),
-
- para("Here's an example of reference links in action:"),
-
- verb("I get 10 times more traffic from [Google] [1] than from\n",
- "[Yahoo] [2] or [MSN] [3].\n",
- "\n",
- " [1]: http://google.com/ \"Google\"\n",
- " [2]: http://search.yahoo.com/ \"Yahoo Search\"\n",
- " [3]: http://search.msn.com/ \"MSN Search\"\n"),
-
- para("Using the implicit link name shortcut, you could instead write:"),
-
- verb("I get 10 times more traffic from [Google][] than from\n",
- "[Yahoo][] or [MSN][].\n",
- "\n",
- " [google]: http://google.com/ \"Google\"\n",
- " [yahoo]: http://search.yahoo.com/ \"Yahoo Search\"\n",
- " [msn]: http://search.msn.com/ \"MSN Search\"\n"),
-
- para("Both of the above examples will produce the following HTML output:"),
-
- verb("<p>I get 10 times more traffic from <a href=\"http://google.com/\"\n",
- "title=\"Google\">Google</a> than from\n",
- "<a href=\"http://search.yahoo.com/\" title=\"Yahoo Search\">Yahoo</a>\n",
- "or <a href=\"http://search.msn.com/\" title=\"MSN Search\">MSN</a>.</p>\n"),
-
- para("For comparison, here is the same paragraph written using\n" +
- "Markdown's inline link style:"),
-
- verb("I get 10 times more traffic from [Google](http://google.com/ \"Google\")\n",
- "than from [Yahoo](http://search.yahoo.com/ \"Yahoo Search\") or\n",
- "[MSN](http://search.msn.com/ \"MSN Search\").\n"),
-
- para("The point of reference-style links is not that they're easier to\n" +
- "write. The point is that with reference-style links, your document\n" +
- "source is vastly more readable. Compare the above examples: using\n" +
- "reference-style links, the paragraph itself is only 81 characters\n" +
- "long; with inline-style links, it's 176 characters; and as raw HTML,\n" +
- "it's 234 characters. In the raw HTML, there's more markup than there\n" +
- "is text."),
-
- para("With Markdown's reference-style links, a source document much more\n" +
- "closely resembles the final output, as rendered in a browser. By\n" +
- "allowing you to move the markup-related metadata out of the paragraph,\n" +
- "you can add links without interrupting the narrative flow of your\n" +
- "prose."),
-
- raw("<h3 id=\"em\">Emphasis</h3>"),
-
- para("Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of\n" +
- "emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an\n" +
- "HTML <code><em></code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML\n" +
- "<code><strong></code> tag. E.g., this input:"),
-
- verb("*single asterisks*\n",
- "\n",
- "_single underscores_\n",
- "\n",
- "**double asterisks**\n",
- "\n",
- "__double underscores__\n"),
-
- para("will produce:"),
-
- verb("<em>single asterisks</em>\n",
- "\n",
- "<em>single underscores</em>\n",
- "\n",
- "<strong>double asterisks</strong>\n",
- "\n",
- "<strong>double underscores</strong>\n"),
-
- para("You can use whichever style you prefer; the lone restriction is that\n" +
- "the same character must be used to open and close an emphasis span."),
-
- para("Emphasis can be used in the middle of a word:"),
-
- verb("un*fucking*believable\n"),
-
- para("But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a\n" +
- "literal asterisk or underscore."),
-
- para("To produce a literal asterisk or underscore at a position where it\n" +
- "would otherwise be used as an emphasis delimiter, you can backslash\n" +
- "escape it:"),
-
- verb("\\*this text is surrounded by literal asterisks\\*\n"),
-
- raw("<h3 id=\"code\">Code</h3>"),
-
- para("To indicate a span of code, wrap it with backtick quotes (<code>`</code>).\n" +
- "Unlike a pre-formatted code block, a code span indicates code within a\n" +
- "normal paragraph. For example:"),
-
- verb("Use the `printf()` function.\n"),
-
- para("will produce:"),
-
- verb("<p>Use the <code>printf()</code> function.</p>\n"),
-
- para("To include a literal backtick character within a code span, you can use\n" +
- "multiple backticks as the opening and closing delimiters:"),
-
- verb("``There is a literal backtick (`) here.``\n"),
-
- para("which will produce this:"),
-
- verb("<p><code>There is a literal backtick (`) here.</code></p>\n"),
-
- para("The backtick delimiters surrounding a code span may include spaces --\n" +
- "one after the opening, one before the closing. This allows you to place\n" +
- "literal backtick characters at the beginning or end of a code span:"),
-
- verb("A single backtick in a code span: `` ` ``\n",
- "\n",
- "A backtick-delimited string in a code span: `` `foo` ``\n"),
-
- para("will produce:"),
-
- verb("<p>A single backtick in a code span: <code>`</code></p>\n",
- "\n",
- "<p>A backtick-delimited string in a code span: <code>`foo`</code></p>\n"),
-
- para("With a code span, ampersands and angle brackets are encoded as HTML\n" +
- "entities automatically, which makes it easy to include example HTML\n" +
- "tags. Markdown will turn this:"),
-
- verb("Please don't use any `<blink>` tags.\n"),
-
- para("into:"),
-
- verb("<p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>\n"),
-
- para("You can write this:"),
-
- verb("`&#8212;` is the decimal-encoded equivalent of `&mdash;`.\n"),
-
- para("to produce:"),
-
- verb( "<p><code>&amp;#8212;</code> is the decimal-encoded\n",
- "equivalent of <code>&amp;mdash;</code>.</p>\n"),
-
- raw("<h3 id=\"img\">Images</h3>"),
-
- para("Admittedly, it's fairly difficult to devise a \"natural\" syntax for\n" +
- "placing images into a plain text document format."),
-
- para("Markdown uses an image syntax that is intended to resemble the syntax\n" +
- "for links, allowing for two styles: _inline_ and _reference_."),
-
- para("Inline image syntax looks like this:"),
-
- verb("![Alt text](/path/to/img.jpg)\n",
- "\n",
- "![Alt text](/path/to/img.jpg \"Optional title\")\n"),
-
- para("That is:"),
-
- list(:BULLET,
- item(nil,
- para("An exclamation mark: <code>!</code>;")),
- item(nil,
- para("followed by a set of square brackets, containing the <code>alt</code>\n" +
- "attribute text for the image;")),
- item(nil,
- para("followed by a set of parentheses, containing the URL or path to\n" +
- "the image, and an optional <code>title</code> attribute enclosed in double\n" +
- "or single quotes."))),
-
- para("Reference-style image syntax looks like this:"),
-
- verb("![Alt text][id]\n"),
-
- para("Where \"id\" is the name of a defined image reference. Image references\n" +
- "are defined using syntax identical to link references:"),
-
- verb("[id]: url/to/image \"Optional title attribute\"\n"),
-
- para("As of this writing, Markdown has no syntax for specifying the\n" +
- "dimensions of an image; if this is important to you, you can simply\n" +
- "use regular HTML <code><img></code> tags."),
-
- rule(1),
-
- raw("<h2 id=\"misc\">Miscellaneous</h2>"),
-
- raw("<h3 id=\"autolink\">Automatic Links</h3>"),
-
- para("Markdown supports a shortcut style for creating \"automatic\" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:"),
-
- verb("<http://example.com/>\n"),
-
- para("Markdown will turn this into:"),
-
- verb("<a href=\"http://example.com/\">http://example.com/</a>\n"),
-
- para("Automatic links for email addresses work similarly, except that\n" +
- "Markdown will also perform a bit of randomized decimal and hex\n" +
- "entity-encoding to help obscure your address from address-harvesting\n" +
- "spambots. For example, Markdown will turn this:"),
-
- verb("<address@example.com>\n"),
-
- para("into something like this:"),
-
- verb("<a href=\"&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;\n",
- "&#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;\n",
- "&#109;\">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;\n",
- "&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>\n"),
-
- para("which will render in a browser as a clickable link to \"address@example.com\"."),
-
- para("(This sort of entity-encoding trick will indeed fool many, if not\n" +
- "most, address-harvesting bots, but it definitely won't fool all of\n" +
- "them. It's better than nothing, but an address published in this way\n" +
- "will probably eventually start receiving spam.)"),
-
- raw("<h3 id=\"backslash\">Backslash Escapes</h3>"),
-
- para("Markdown allows you to use backslash escapes to generate literal\n" +
- "characters which would otherwise have special meaning in Markdown's\n" +
- "formatting syntax. For example, if you wanted to surround a word with\n" +
- "literal asterisks (instead of an HTML <code><em></code> tag), you can backslashes\n" +
- "before the asterisks, like this:"),
-
- verb("\\*literal asterisks\\*\n"),
-
- para("Markdown provides backslash escapes for the following characters:"),
-
- verb("\\ backslash\n",
- "` backtick\n",
- "* asterisk\n",
- "_ underscore\n",
- "{} curly braces\n",
- "[] square brackets\n",
- "() parentheses\n",
- "# hash mark\n",
- "+ plus sign\n",
- "- minus sign (hyphen)\n",
- ". dot\n",
- "! exclamation mark\n"))
-
- assert_equal expected, doc
- end
-
- def test_nested_blockquotes
- input = File.read "#{MARKDOWN_TEST_PATH}/Nested blockquotes.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- block(
- para("foo"),
- block(
- para("bar")),
- para("foo")))
-
- assert_equal expected, doc
- end
-
- def test_ordered_and_unordered_lists
- input = File.read "#{MARKDOWN_TEST_PATH}/Ordered and unordered lists.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- head(2, 'Unordered'),
-
- para('Asterisks tight:'),
- list(:BULLET,
- item(nil, para("asterisk 1")),
- item(nil, para("asterisk 2")),
- item(nil, para("asterisk 3"))),
- para('Asterisks loose:'),
- list(:BULLET,
- item(nil, para("asterisk 1")),
- item(nil, para("asterisk 2")),
- item(nil, para("asterisk 3"))),
-
- rule(1),
-
- para("Pluses tight:"),
- list(:BULLET,
- item(nil, para("Plus 1")),
- item(nil, para("Plus 2")),
- item(nil, para("Plus 3"))),
- para("Pluses loose:"),
- list(:BULLET,
- item(nil, para("Plus 1")),
- item(nil, para("Plus 2")),
- item(nil, para("Plus 3"))),
-
- rule(1),
-
- para("Minuses tight:"),
- list(:BULLET,
- item(nil, para("Minus 1")),
- item(nil, para("Minus 2")),
- item(nil, para("Minus 3"))),
- para("Minuses loose:"),
- list(:BULLET,
- item(nil, para("Minus 1")),
- item(nil, para("Minus 2")),
- item(nil, para("Minus 3"))),
-
- head(2, "Ordered"),
-
- para("Tight:"),
- list(:NUMBER,
- item(nil, para("First")),
- item(nil, para("Second")),
- item(nil, para("Third"))),
- para("and:"),
- list(:NUMBER,
- item(nil, para("One")),
- item(nil, para("Two")),
- item(nil, para("Three"))),
-
- para("Loose using tabs:"),
- list(:NUMBER,
- item(nil, para("First")),
- item(nil, para("Second")),
- item(nil, para("Third"))),
- para("and using spaces:"),
- list(:NUMBER,
- item(nil, para("One")),
- item(nil, para("Two")),
- item(nil, para("Three"))),
-
- para("Multiple paragraphs:"),
- list(:NUMBER,
- item(nil,
- para("Item 1, graf one."),
- para("Item 2. graf two. The quick brown fox " +
- "jumped over the lazy dog's\nback.")),
- item(nil, para("Item 2.")),
- item(nil, para("Item 3."))),
-
- head(2, "Nested"),
- list(:BULLET,
- item(nil,
- para("Tab"),
- list(:BULLET,
- item(nil,
- para("Tab"),
- list(:BULLET,
- item(nil,
- para("Tab"))))))),
-
- para("Here's another:"),
- list(:NUMBER,
- item(nil, para("First")),
- item(nil, para("Second:"),
- list(:BULLET,
- item(nil, para("Fee")),
- item(nil, para("Fie")),
- item(nil, para("Foe")))),
- item(nil, para("Third"))),
-
- para("Same thing but with paragraphs:"),
- list(:NUMBER,
- item(nil, para("First")),
- item(nil, para("Second:"),
- list(:BULLET,
- item(nil, para("Fee")),
- item(nil, para("Fie")),
- item(nil, para("Foe")))),
- item(nil, para("Third"))),
-
- para("This was an error in Markdown 1.0.1:"),
- list(:BULLET,
- item(nil,
- para("this"),
- list(:BULLET,
- item(nil, para("sub"))),
- para("that"))))
-
- assert_equal expected, doc
- end
-
- def test_strong_and_em_together
- input = File.read "#{MARKDOWN_TEST_PATH}/Strong and em together.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- para("<b><em>This is strong and em.</em></b>"),
- para("So is <b>_this_</b> word."),
- para("<b><em>This is strong and em.</em></b>"),
- para("So is <b>_this_</b> word."))
-
- assert_equal expected, doc
- end
-
- def test_tabs
- input = File.read "#{MARKDOWN_TEST_PATH}/Tabs.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- list(:BULLET,
- item(nil,
- para("this is a list item\nindented with tabs")),
- item(nil,
- para("this is a list item\nindented with spaces"))),
-
- para("Code:"),
-
- verb("this code block is indented by one tab\n"),
-
- para("And:"),
-
- verb("\tthis code block is indented by two tabs\n"),
-
- para("And:"),
-
- verb(
- "+\tthis is an example list item\n",
- "\tindented with tabs\n",
- "\n",
- "+ this is an example list item\n",
- " indented with spaces\n"))
-
- assert_equal expected, doc
- end
-
- def test_tidyness
- input = File.read "#{MARKDOWN_TEST_PATH}/Tidyness.text"
-
- doc = @parser.parse input
-
- expected =
- doc(
- block(
- para("A list within a blockquote:"),
- list(:BULLET,
- item(nil, para("asterisk 1")),
- item(nil, para("asterisk 2")),
- item(nil, para("asterisk 3")))))
-
- assert_equal expected, doc
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup.rb b/test/rdoc/test_rdoc_markup.rb
index 5c28a2c6e6..9f7866fb5a 100644
--- a/test/rdoc/test_rdoc_markup.rb
+++ b/test/rdoc/test_rdoc_markup.rb
@@ -1,13 +1,9 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/markup'
+require 'rdoc/markup/to_test'
-class TestRDocMarkup < RDoc::TestCase
-
- def test_class_parse
- expected = @RM::Document.new(
- @RM::Paragraph.new('hello'))
-
- assert_equal expected, RDoc::Markup.parse('hello')
- end
+class TestRDocMarkup < MiniTest::Unit::TestCase
def test_convert
str = <<-STR
@@ -22,61 +18,7 @@ the time
STR
m = RDoc::Markup.new
-
- tt = RDoc::Markup::ToTest.new m
-
- out = m.convert str, tt
-
- expected = [
- "now is the time",
- "\n",
- " hello\n dave\n",
- "1: ",
- "l1",
- "1: ",
- "l2",
- ]
-
- assert_equal expected, out
- end
-
- def test_convert_custom_markup
- str = <<-STR
-{stricken}
- STR
-
- m = RDoc::Markup.new
- m.add_word_pair '{', '}', :STRIKE
-
- tt = RDoc::Markup::ToTest.new nil, m
- tt.add_tag :STRIKE, 'STRIKE ', ' STRIKE'
-
- out = m.convert str, tt
-
- expected = [
- "STRIKE stricken STRIKE",
- ]
-
- assert_equal expected, out
- end
-
- def test_convert_document
- doc = RDoc::Markup::Parser.parse <<-STR
-now is
-the time
-
- hello
- dave
-
-1. l1
-2. l2
- STR
-
- m = RDoc::Markup.new
-
- tt = RDoc::Markup::ToTest.new m
-
- out = m.convert doc, tt
+ out = m.convert str, RDoc::Markup::ToTest.new
expected = [
"now is the time",
diff --git a/test/rdoc/test_rdoc_markup_attribute_manager.rb b/test/rdoc/test_rdoc_markup_attribute_manager.rb
index 36edea3f73..f6b1b6cf17 100644
--- a/test/rdoc/test_rdoc_markup_attribute_manager.rb
+++ b/test/rdoc/test_rdoc_markup_attribute_manager.rb
@@ -1,10 +1,13 @@
-require 'rdoc/test_case'
+require "rubygems"
+require "minitest/autorun"
+require 'rdoc'
+require 'rdoc/markup'
+require "rdoc/markup/inline"
+require "rdoc/markup/to_html_crossref"
-class TestRDocMarkupAttributeManager < RDoc::TestCase
+class TestRDocMarkupAttributeManager < MiniTest::Unit::TestCase
def setup
- super
-
@am = RDoc::Markup::AttributeManager.new
@bold_on = @am.changed_attribute_by_name([], [:BOLD])
@@ -29,8 +32,8 @@ class TestRDocMarkupAttributeManager < RDoc::TestCase
end
def crossref(text)
- crossref_bitmap = @am.attributes.bitmap_for(:_SPECIAL_) |
- @am.attributes.bitmap_for(:CROSSREF)
+ crossref_bitmap = RDoc::Markup::Attribute.bitmap_for(:_SPECIAL_) |
+ RDoc::Markup::Attribute.bitmap_for(:CROSSREF)
[ @am.changed_attribute_by_name([], [:CROSSREF, :_SPECIAL_]),
RDoc::Markup::Special.new(crossref_bitmap, text),
@@ -209,7 +212,7 @@ class TestRDocMarkupAttributeManager < RDoc::TestCase
end
def test_special
- @am.add_special(RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF)
+ @am.add_special(RDoc::Markup::ToHtmlCrossref::CROSSREF_REGEXP, :CROSSREF)
#
# The apostrophes in "cats'" and "dogs'" suppress the flagging of these
diff --git a/test/rdoc/test_rdoc_markup_attributes.rb b/test/rdoc/test_rdoc_markup_attributes.rb
deleted file mode 100644
index 636e0cca68..0000000000
--- a/test/rdoc/test_rdoc_markup_attributes.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupAttributes < RDoc::TestCase
-
- def setup
- super
-
- @as = RDoc::Markup::Attributes.new
- end
-
- def test_bitmap_for
- assert_equal 2, @as.bitmap_for('two')
- assert_equal 2, @as.bitmap_for('two')
- assert_equal 4, @as.bitmap_for('three')
- end
-
- def test_as_string
- @as.bitmap_for 'two'
- @as.bitmap_for 'three'
-
- assert_equal 'none', @as.as_string(0)
- assert_equal '_SPECIAL_', @as.as_string(1)
- assert_equal 'two', @as.as_string(2)
- assert_equal '_SPECIAL_,two', @as.as_string(3)
- end
-
- def test_each_name_of
- @as.bitmap_for 'two'
- @as.bitmap_for 'three'
-
- assert_equal %w[], @as.each_name_of(0).to_a
- assert_equal %w[], @as.each_name_of(1).to_a
- assert_equal %w[two], @as.each_name_of(2).to_a
- assert_equal %w[three], @as.each_name_of(4).to_a
- assert_equal %w[two three], @as.each_name_of(6).to_a
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_document.rb b/test/rdoc/test_rdoc_markup_document.rb
index 0ab87280eb..ab2f1c2362 100644
--- a/test/rdoc/test_rdoc_markup_document.rb
+++ b/test/rdoc/test_rdoc_markup_document.rb
@@ -1,10 +1,12 @@
-require 'rdoc/test_case'
+require 'pp'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/markup'
-class TestRDocMarkupDocument < RDoc::TestCase
+class TestRDocMarkupDocument < MiniTest::Unit::TestCase
def setup
- super
-
+ @RM = RDoc::Markup
@d = @RM::Document.new
end
@@ -45,170 +47,5 @@ class TestRDocMarkupDocument < RDoc::TestCase
end
end
- def test_concat
- @d.concat [@RM::BlankLine.new, @RM::BlankLine.new]
-
- refute_empty @d
- end
-
- def test_each
- a = @RM::Document.new
- b = @RM::Document.new(@RM::Paragraph.new('hi'))
-
- @d.push a, b
-
- assert_equal [a, b], @d.map { |sub_doc| sub_doc }
- end
-
- def test_empty_eh
- assert_empty @d
-
- @d << @RM::BlankLine.new
-
- refute_empty @d
- end
-
- def test_empty_eh_document
- d = @RM::Document.new @d
-
- assert_empty d
- end
-
- def test_equals2
- d2 = @RM::Document.new
-
- assert_equal @d, d2
-
- d2 << @RM::BlankLine.new
-
- refute_equal @d, d2
- end
-
- def test_equals2_file
- d2 = @RM::Document.new
- d2.file = 'file.rb'
-
- refute_equal @d, d2
-
- @d.file = 'file.rb'
-
- assert_equal @d, d2
- end
-
- def test_file_equals
- @d.file = 'file.rb'
-
- assert_equal 'file.rb', @d.file
- end
-
- def test_file_equals_top_level
- @d.file = @store.add_file 'file.rb'
-
- assert_equal 'file.rb', @d.file
- end
-
- def test_lt2
- @d << @RM::BlankLine.new
-
- refute_empty @d
- end
-
- def test_merge
- original = @RM::Document.new @RM::Paragraph.new 'original'
- original.file = 'file.rb'
- root = @RM::Document.new original
-
- replace = @RM::Document.new @RM::Paragraph.new 'replace'
- replace.file = 'file.rb'
-
- other = @RM::Document.new replace
-
- result = root.merge other
-
- inner = @RM::Document.new @RM::Paragraph.new 'replace'
- inner.file = 'file.rb'
- expected = @RM::Document.new inner
-
- assert_equal expected, result
- end
-
- def test_merge_add
- original = @RM::Document.new @RM::Paragraph.new 'original'
- original.file = 'file.rb'
- root = @RM::Document.new original
-
- addition = @RM::Document.new @RM::Paragraph.new 'addition'
- addition.file = 'other.rb'
-
- other = @RM::Document.new addition
-
- result = root.merge other
-
- expected = @RM::Document.new original, addition
-
- assert_equal expected, result
- end
-
- def test_merge_empty
- original = @RM::Document.new
- root = @RM::Document.new original
-
- replace = @RM::Document.new @RM::Paragraph.new 'replace'
- replace.file = 'file.rb'
-
- other = @RM::Document.new replace
-
- result = root.merge other
-
- inner = @RM::Document.new @RM::Paragraph.new 'replace'
- inner.file = 'file.rb'
- expected = @RM::Document.new inner
-
- assert_equal expected, result
- end
-
- def test_push
- @d.push @RM::BlankLine.new, @RM::BlankLine.new
-
- refute_empty @d
- end
-
- def test_table_of_contents
- doc = @RM::Document.new(
- @RM::Heading.new(1, 'A'),
- @RM::Paragraph.new('B'),
- @RM::Heading.new(2, 'C'),
- @RM::Paragraph.new('D'),
- @RM::Heading.new(1, 'E'),
- @RM::Paragraph.new('F'))
-
- expected = [
- @RM::Heading.new(1, 'A'),
- @RM::Heading.new(2, 'C'),
- @RM::Heading.new(1, 'E'),
- ]
-
- assert_equal expected, doc.table_of_contents
- end
-
- def test_table_of_contents_omit_headings_below
- document = doc(
- head(1, 'A'),
- para('B'),
- head(2, 'C'),
- para('D'),
- head(1, 'E'),
- para('F'))
-
- document.omit_headings_below = 1
-
- expected = [
- head(1, 'A'),
- head(1, 'E'),
- ]
-
- assert_equal expected, document.table_of_contents
- end
-
end
diff --git a/test/rdoc/test_rdoc_markup_formatter.rb b/test/rdoc/test_rdoc_markup_formatter.rb
deleted file mode 100644
index c0dde757cb..0000000000
--- a/test/rdoc/test_rdoc_markup_formatter.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupFormatter < RDoc::TestCase
-
- class ToTest < RDoc::Markup::Formatter
-
- def initialize markup
- super nil, markup
-
- add_tag :TT, '<code>', '</code>'
- end
-
- def accept_paragraph paragraph
- @res << attributes(paragraph.text)
- end
-
- def attributes text
- convert_flow @am.flow text.dup
- end
-
- def handle_special_CAPS special
- "handled #{special.text}"
- end
-
- def start_accepting
- @res = ""
- end
-
- def end_accepting
- @res
- end
-
- end
-
- def setup
- super
-
- @markup = @RM.new
- @markup.add_special(/[A-Z]+/, :CAPS)
-
- @attribute_manager = @markup.attribute_manager
- @attributes = @attribute_manager.attributes
-
- @to = ToTest.new @markup
-
- @caps = @attributes.bitmap_for :CAPS
- @special = @attributes.bitmap_for :_SPECIAL_
- @tt = @attributes.bitmap_for :TT
- end
-
- def test_class_gen_relative_url
- def gen(from, to)
- RDoc::Markup::ToHtml.gen_relative_url from, to
- end
-
- assert_equal 'a.html', gen('a.html', 'a.html')
- assert_equal 'b.html', gen('a.html', 'b.html')
-
- assert_equal 'd.html', gen('a/c.html', 'a/d.html')
- assert_equal '../a.html', gen('a/c.html', 'a.html')
- assert_equal 'a/c.html', gen('a.html', 'a/c.html')
- end
-
- def special_names
- @attribute_manager.special.map do |_, mask|
- @attributes.as_string mask
- end
- end
-
- def test_add_special_RDOCLINK
- @to.add_special_RDOCLINK
-
- assert_includes special_names, 'RDOCLINK'
- end
-
- def test_add_special_TIDYLINK
- @to.add_special_TIDYLINK
-
- assert_includes special_names, 'TIDYLINK'
- end
-
- def test_parse_url
- scheme, url, id = @to.parse_url 'example/foo'
-
- assert_equal 'http', scheme
- assert_equal 'http://example/foo', url
- assert_equal nil, id
- end
-
- def test_parse_url_anchor
- scheme, url, id = @to.parse_url '#foottext-1'
-
- assert_equal nil, scheme
- assert_equal '#foottext-1', url
- assert_equal nil, id
- end
-
- def test_parse_url_link
- scheme, url, id = @to.parse_url 'link:README.txt'
-
- assert_equal 'link', scheme
- assert_equal 'README.txt', url
- assert_equal nil, id
- end
-
- def test_parse_url_link_id
- scheme, url, id = @to.parse_url 'link:README.txt#label-foo'
-
- assert_equal 'link', scheme
- assert_equal 'README.txt#label-foo', url
- assert_equal nil, id
- end
-
- def test_parse_url_rdoc_label
- scheme, url, id = @to.parse_url 'rdoc-label:foo'
-
- assert_equal 'link', scheme
- assert_equal '#foo', url
- assert_equal nil, id
-
- scheme, url, id = @to.parse_url 'rdoc-label:foo:bar'
-
- assert_equal 'link', scheme
- assert_equal '#foo', url
- assert_equal ' id="bar"', id
- end
-
- def test_parse_url_scheme
- scheme, url, id = @to.parse_url 'http://example/foo'
-
- assert_equal 'http', scheme
- assert_equal 'http://example/foo', url
- assert_equal nil, id
-
- scheme, url, id = @to.parse_url 'https://example/foo'
-
- assert_equal 'https', scheme
- assert_equal 'https://example/foo', url
- assert_equal nil, id
- end
-
- def test_convert_tt_special
- converted = @to.convert '<code>AAA</code>'
-
- assert_equal '<code>AAA</code>', converted
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_hard_break.rb b/test/rdoc/test_rdoc_markup_hard_break.rb
deleted file mode 100644
index b9f7873160..0000000000
--- a/test/rdoc/test_rdoc_markup_hard_break.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupHardBreak < RDoc::TestCase
-
- def setup
- super
-
- @hb = RDoc::Markup::HardBreak.new
- end
-
- def test_accept
- visitor = Object.new
-
- def visitor.accept_hard_break(obj) @obj = obj end
- def visitor.obj() @obj end
-
- @hb.accept visitor
-
- assert_same @hb, visitor.obj
- end
-
- def test_equals2
- other = RDoc::Markup::HardBreak.new
-
- assert_equal @hb, other
-
- refute_equal @hb, Object.new
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_heading.rb b/test/rdoc/test_rdoc_markup_heading.rb
deleted file mode 100644
index eef051a64e..0000000000
--- a/test/rdoc/test_rdoc_markup_heading.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupHeading < RDoc::TestCase
-
- def setup
- super
-
- @h = RDoc::Markup::Heading.new 1, 'Hello *Friend*!'
- end
-
- def test_aref
- assert_equal 'label-Hello+Friend%21', @h.aref
- end
-
- def test_plain_html
- assert_equal 'Hello <strong>Friend</strong>!', @h.plain_html
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_include.rb b/test/rdoc/test_rdoc_markup_include.rb
deleted file mode 100644
index 37a5b320e9..0000000000
--- a/test/rdoc/test_rdoc_markup_include.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupInclude < RDoc::TestCase
-
- def setup
- super
-
- @include = @RM::Include.new 'file', [Dir.tmpdir]
- end
-
- def test_equals2
- assert_equal @include, @RM::Include.new('file', [Dir.tmpdir])
- refute_equal @include, @RM::Include.new('file', %w[.])
- refute_equal @include, @RM::Include.new('other', [Dir.tmpdir])
- refute_equal @include, Object.new
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_indented_paragraph.rb b/test/rdoc/test_rdoc_markup_indented_paragraph.rb
deleted file mode 100644
index d8dd795e5b..0000000000
--- a/test/rdoc/test_rdoc_markup_indented_paragraph.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupIndentedParagraph < RDoc::TestCase
-
- def setup
- super
-
- @IP = RDoc::Markup::IndentedParagraph
- end
-
- def test_initialize
- ip = @IP.new 2, 'a', 'b'
-
- assert_equal 2, ip.indent
- assert_equal %w[a b], ip.parts
- end
-
- def test_accept
- visitor = Object.new
- def visitor.accept_indented_paragraph(obj) @obj = obj end
- def visitor.obj() @obj end
-
- paragraph = @IP.new 0
-
- paragraph.accept visitor
-
- assert_equal paragraph, visitor.obj
- end
-
- def test_equals2
- one = @IP.new 1
- two = @IP.new 2
-
- assert_equal one, one
- refute_equal one, two
- end
-
- def test_text
- paragraph = @IP.new(2, 'hello', ' world')
-
- assert_equal 'hello world', paragraph.text
- end
-
- def test_text_break
- paragraph = @IP.new(2, 'hello', hard_break, 'world')
-
- assert_equal 'helloworld', paragraph.text
-
- assert_equal "hello\n world", paragraph.text("\n")
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_paragraph.rb b/test/rdoc/test_rdoc_markup_paragraph.rb
index 8de1c3cff5..a1eba7038d 100644
--- a/test/rdoc/test_rdoc_markup_paragraph.rb
+++ b/test/rdoc/test_rdoc_markup_paragraph.rb
@@ -1,32 +1,9 @@
-require 'rdoc/test_case'
+require 'pp'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/markup'
-class TestRDocMarkupParagraph < RDoc::TestCase
-
- def test_accept
- visitor = Object.new
- def visitor.accept_paragraph(obj) @obj = obj end
- def visitor.obj() @obj end
-
- paragraph = RDoc::Markup::Paragraph.new
-
- paragraph.accept visitor
-
- assert_same paragraph, visitor.obj
- end
-
- def test_text
- paragraph = para('hello', ' world')
-
- assert_equal 'hello world', paragraph.text
- end
-
- def test_text_break
- paragraph = para('hello', hard_break, 'world')
-
- assert_equal 'helloworld', paragraph.text
-
- assert_equal "hello\nworld", paragraph.text("\n")
- end
+class TestRDocMarkupParagraph < MiniTest::Unit::TestCase
end
diff --git a/test/rdoc/test_rdoc_markup_parser.rb b/test/rdoc/test_rdoc_markup_parser.rb
index b367b23bcc..d418900116 100644
--- a/test/rdoc/test_rdoc_markup_parser.rb
+++ b/test/rdoc/test_rdoc_markup_parser.rb
@@ -1,21 +1,20 @@
-# coding: utf-8
+require 'pp'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/markup'
+require 'rdoc/markup/to_test'
-require 'rdoc/test_case'
-
-class TestRDocMarkupParser < RDoc::TestCase
+class TestRDocMarkupParser < MiniTest::Unit::TestCase
def setup
- super
-
- @have_byteslice = ''.respond_to? :byteslice
-
+ @RM = RDoc::Markup
@RMP = @RM::Parser
end
def mu_pp(obj)
s = ''
s = PP.pp obj, s
- s = s.force_encoding(Encoding.default_external) if @have_encoding
+ s = s.force_encoding(Encoding.default_external) if defined? Encoding
s.chomp
end
@@ -30,19 +29,6 @@ class TestRDocMarkupParser < RDoc::TestCase
assert_equal @RM::Heading.new(3, 'heading three'), parser.build_heading(3)
end
- def test_char_pos
- parser = @RMP.new
- s = parser.setup_scanner 'cät'
-
- s.scan(/\S+/)
-
- if @have_byteslice or @have_encoding then
- assert_equal 3, parser.char_pos(s.pos)
- else
- assert_equal 4, parser.char_pos(s.pos)
- end
- end
-
def test_get
parser = util_parser
@@ -67,19 +53,6 @@ class TestRDocMarkupParser < RDoc::TestCase
assert_equal expected, @RMP.parse(str).parts
end
- def test_parse_bullet_utf_8
- str = <<-STR
-* æ–°ã—ã„æ©Ÿèƒ½
- STR
-
- expected = [
- @RM::List.new(:BULLET, *[
- @RM::ListItem.new(nil,
- @RM::Paragraph.new('æ–°ã—ã„æ©Ÿèƒ½'))])]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
def test_parse_bullet_verbatim_heading
str = <<-STR
* l1
@@ -92,7 +65,7 @@ class TestRDocMarkupParser < RDoc::TestCase
@RM::List.new(:BULLET, *[
@RM::ListItem.new(nil,
@RM::Paragraph.new('l1'),
- @RM::Verbatim.new("v\n"))]),
+ @RM::Verbatim.new(' ', 'v', "\n"))]),
@RM::Heading.new(1, 'H')]
assert_equal expected, @RMP.parse(str).parts
@@ -161,11 +134,13 @@ the time
STR
expected = [
- list(:BULLET,
- item(nil,
- para('l1 ', 'l1+')),
- item(nil,
- para('l2')))]
+ @RM::List.new(:BULLET, *[
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1', 'l1+')),
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l2')),
+ ]),
+ ]
assert_equal expected, @RMP.parse(str).parts
end
@@ -202,16 +177,17 @@ the time
STR
expected = [
- list(:BULLET,
- item(nil,
- para('l1'),
- list(:BULLET,
- item(nil,
- para('l1.1 ', 'text'),
- verb("code\n", " code\n"),
- para('text')))),
- item(nil,
- para('l2')))]
+ @RM::List.new(:BULLET, *[
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1'),
+ @RM::List.new(:BULLET, *[
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1.1', 'text'),
+ @RM::Verbatim.new(' ', 'code', "\n",
+ ' ', 'code', "\n"),
+ @RM::Paragraph.new('text'))])),
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l2'))])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -259,23 +235,6 @@ the time
assert_equal expected, @RMP.parse(str).parts
end
- def test_parse_heading_empty
- str = <<-STR
-===
-* bullet
- STR
-
- expected = [
- @RM::Heading.new(3, ''),
- @RM::BlankLine.new,
- @RM::List.new(:BULLET, *[
- @RM::ListItem.new(nil,
- @RM::Paragraph.new('bullet'))]),
- ]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
def test_parse_heading_heading
str = '= ='
@@ -337,11 +296,11 @@ the time
STR
expected = [
- list(:LABEL,
- item(%w[one],
- para('item one')),
- item(%w[two],
- para('item two')))]
+ @RM::List.new(:LABEL, *[
+ @RM::ListItem.new('one',
+ @RM::Paragraph.new('item one')),
+ @RM::ListItem.new('two',
+ @RM::Paragraph.new('item two'))])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -354,33 +313,19 @@ the time
STR
expected = [
- list(:LABEL,
- item(%w[cat],
- para('l1'),
- list(:BULLET,
- item(nil,
- para('l1.1')))),
- item(%w[dog],
- para('l2')))]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
- def test_parse_label_multi_label
- str = <<-STR
-[one]
-[two] some description
- STR
-
- expected = [
- list(:LABEL,
- item(%w[one two],
- para('some description')))]
+ @RM::List.new(:LABEL, *[
+ @RM::ListItem.new('cat',
+ @RM::Paragraph.new('l1'),
+ @RM::List.new(:BULLET, *[
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1.1'))])),
+ @RM::ListItem.new('dog',
+ @RM::Paragraph.new('l2'))])]
assert_equal expected, @RMP.parse(str).parts
end
- def test_parse_label_multi_line
+ def test_parse_label_multiline
str = <<-STR
[cat] l1
continuation
@@ -388,11 +333,11 @@ the time
STR
expected = [
- list(:LABEL,
- item(%w[cat],
- para('l1 ', 'continuation')),
- item(%w[dog],
- para('l2')))]
+ @RM::List.new(:LABEL, *[
+ @RM::ListItem.new('cat',
+ @RM::Paragraph.new('l1', 'continuation')),
+ @RM::ListItem.new('dog',
+ @RM::Paragraph.new('l2'))])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -406,11 +351,12 @@ the time
STR
expected = [
- list(:LABEL,
- item(%w[one],
- para('item one')),
- item(%w[two],
- para('item two')))]
+ @RM::List.new(:LABEL, *[
+ @RM::ListItem.new('one',
+ @RM::Paragraph.new('item one')),
+ @RM::ListItem.new('two',
+ @RM::Paragraph.new('item two')),
+ ])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -454,79 +400,6 @@ A. l4
assert_equal expected, @RMP.parse(str).parts
end
- def test_parse_lalpha_utf_8
- str = <<-STR
-a. æ–°ã—ã„æ©Ÿèƒ½
- STR
-
- expected = [
- @RM::List.new(:LALPHA, *[
- @RM::ListItem.new(nil,
- @RM::Paragraph.new('æ–°ã—ã„æ©Ÿèƒ½'))])]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
- def test_parse_line_break
- str = "now is\nthe time \nfor all"
-
- expected = [
- para('now is ', 'the time'),
- blank_line,
- para('for all')]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
- def test_parse_list_list_1
- str = <<-STR
-10. para 1
-
- [label 1]
- para 1.1
-
- code
-
- para 1.2
- STR
-
- expected = [
- list(:NUMBER,
- item(nil,
- para('para 1'),
- blank_line,
- list(:LABEL,
- item(%w[label\ 1],
- para('para 1.1'),
- blank_line,
- verb("code\n"),
- para('para 1.2')))))]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
- def test_parse_list_list_2
- str = <<-STR
-6. para
-
- label 1:: text 1
- label 2:: text 2
- STR
-
- expected = [
- list(:NUMBER,
- item(nil,
- para('para'),
- blank_line,
- list(:NOTE,
- item(%w[label\ 1],
- para('text 1')),
- item(%w[label\ 2],
- para('text 2')))))]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
def test_parse_list_verbatim
str = <<-STR
* one
@@ -539,7 +412,8 @@ a. æ–°ã—ã„æ©Ÿèƒ½
@RM::List.new(:BULLET, *[
@RM::ListItem.new(nil,
@RM::Paragraph.new('one'),
- @RM::Verbatim.new("verb1\n", "verb2\n")),
+ @RM::Verbatim.new(' ', 'verb1', "\n",
+ ' ', 'verb2', "\n")),
@RM::ListItem.new(nil,
@RM::Paragraph.new('two'))])]
@@ -581,11 +455,11 @@ two:: item two
STR
expected = [
- list(:NOTE,
- item(%w[one],
- para('item one')),
- item(%w[two],
- para('item two')))]
+ @RM::List.new(:NOTE, *[
+ @RM::ListItem.new('one',
+ @RM::Paragraph.new('item one')),
+ @RM::ListItem.new('two',
+ @RM::Paragraph.new('item two'))])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -597,9 +471,11 @@ two::
STR
expected = [
- list(:NOTE,
- item(%w[one two],
- blank_line))]
+ @RM::List.new(:NOTE, *[
+ @RM::ListItem.new('one',
+ @RM::BlankLine.new),
+ @RM::ListItem.new('two',
+ @RM::BlankLine.new)])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -610,11 +486,11 @@ one:: two::
STR
expected = [
- list(:NOTE,
- item(%w[one],
- list(:NOTE,
- item(%w[two],
- blank_line))))]
+ @RM::List.new(:NOTE, *[
+ @RM::ListItem.new('one',
+ @RM::List.new(:NOTE, *[
+ @RM::ListItem.new('two',
+ @RM::BlankLine.new)]))])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -627,14 +503,14 @@ one:: two::
STR
expected = [
- list(:NUMBER,
- item(nil,
- para('l1'),
- list(:BULLET,
- item(nil,
- para('l1.1')))),
- item(nil,
- para('l2')))]
+ @RM::List.new(:NUMBER, *[
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1'),
+ @RM::List.new(:BULLET, *[
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1.1'))])),
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l2'))])]
assert_equal expected, @RMP.parse(str).parts
end
@@ -656,7 +532,7 @@ for all good men
def test_parse_paragraph_multiline
str = "now is the time\nfor all good men"
- expected = @RM::Paragraph.new 'now is the time ', 'for all good men'
+ expected = @RM::Paragraph.new 'now is the time for all good men'
assert_equal [expected], @RMP.parse(str).parts
end
@@ -669,31 +545,12 @@ for all good men
expected = [
@RM::Paragraph.new('now is the time'),
- @RM::Verbatim.new("code _line_ here\n"),
+ @RM::Verbatim.new(' ', 'code _line_ here', "\n"),
@RM::Paragraph.new('for all good men'),
]
assert_equal expected, @RMP.parse(str).parts
end
- def test_parse_rule
- str = <<-STR
-now is the time
-
----
-
-for all good men
- STR
-
- expected = [
- @RM::Paragraph.new('now is the time'),
- @RM::BlankLine.new,
- @RM::Rule.new(1),
- @RM::BlankLine.new,
- @RM::Paragraph.new('for all good men')]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
def test_parse_ualpha
str = <<-STR
A. l1
@@ -710,12 +567,6 @@ B. l2
assert_equal expected, @RMP.parse(str).parts
end
- def test_parse_trailing_cr
- expected = [ @RM::Paragraph.new('Text') ]
- # FIXME hangs the parser:
- assert_equal expected, @RMP.parse("Text\r").parts
- end
-
def test_parse_verbatim
str = <<-STR
now is
@@ -725,7 +576,7 @@ the time
expected = [
@RM::Paragraph.new('now is'),
- @RM::Verbatim.new("code\n"),
+ @RM::Verbatim.new(' ', 'code', "\n"),
@RM::Paragraph.new('the time'),
]
@@ -738,18 +589,7 @@ the time
STR
expected = [
- @RM::Verbatim.new("* blah\n")]
-
- assert_equal expected, @RMP.parse(str).parts
- end
-
- def test_parse_verbatim_dash
- str = <<-STR
- - blah
- STR
-
- expected = [
- @RM::Verbatim.new("- blah\n")]
+ @RM::Verbatim.new(' ', '*', ' ', 'blah', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -767,7 +607,9 @@ the time
expected = [
@RM::Paragraph.new('now is'),
- @RM::Verbatim.new("code\n", "\n", "code1\n"),
+ @RM::Verbatim.new(' ', 'code', "\n",
+ "\n",
+ ' ', 'code1', "\n"),
@RM::Paragraph.new('the time'),
]
@@ -782,7 +624,7 @@ text
expected = [
@RM::Paragraph.new('text'),
- @RM::Verbatim.new("=== heading three\n")]
+ @RM::Verbatim.new(' ', '===', ' ', 'heading three', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -792,7 +634,7 @@ text
expected = [
@RM::Paragraph.new('text'),
- @RM::Verbatim.new("code\n"),
+ @RM::Verbatim.new(' ', 'code', "\n"),
@RM::Heading.new(3, 'heading three')]
assert_equal expected, @RMP.parse(str).parts
@@ -804,7 +646,7 @@ text
STR
expected = [
- @RM::Verbatim.new("[blah] blah\n")]
+ @RM::Verbatim.new(' ', '[blah]', ' ', 'blah', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -815,7 +657,7 @@ text
STR
expected = [
- @RM::Verbatim.new("b. blah\n")]
+ @RM::Verbatim.new(' ', 'b.', ' ', 'blah', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -829,7 +671,8 @@ text
expected = [
@RM::Paragraph.new('text'),
- @RM::Verbatim.new("code\n", "=== heading three\n")]
+ @RM::Verbatim.new(' ', 'code', "\n",
+ ' ', '===', ' ', 'heading three', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -845,7 +688,9 @@ the time
expected = [
@RM::Paragraph.new('now is'),
- @RM::Verbatim.new("code\n", "\n", "code1\n"),
+ @RM::Verbatim.new(' ', 'code', "\n",
+ "\n",
+ ' ', 'code1', "\n"),
@RM::Paragraph.new('the time'),
]
@@ -865,7 +710,11 @@ the time
expected = [
@RM::Paragraph.new('now is'),
- @RM::Verbatim.new("code\n", "\n", "code1\n", "\n", "code2\n"),
+ @RM::Verbatim.new(' ', 'code', "\n",
+ "\n",
+ ' ', 'code1', "\n",
+ "\n",
+ ' ', 'code2', "\n"),
@RM::Paragraph.new('the time'),
]
@@ -882,7 +731,8 @@ the time
expected = [
@RM::Paragraph.new('now is'),
- @RM::Verbatim.new("code\n", "code1\n"),
+ @RM::Verbatim.new(' ', 'code', "\n",
+ ' ', 'code1', "\n"),
@RM::Paragraph.new('the time'),
]
@@ -899,8 +749,8 @@ for all good men
expected = [
@RM::Paragraph.new('now is the time'),
- @RM::Verbatim.new(" code\n",
- "more code\n"),
+ @RM::Verbatim.new(' ', 'code', "\n",
+ ' ', 'more code', "\n"),
@RM::Paragraph.new('for all good men'),
]
@@ -913,7 +763,7 @@ for all good men
STR
expected = [
- @RM::Verbatim.new("blah:: blah\n")]
+ @RM::Verbatim.new(' ', 'blah::', ' ', 'blah', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -924,7 +774,7 @@ for all good men
STR
expected = [
- @RM::Verbatim.new("2. blah\n")]
+ @RM::Verbatim.new(' ', '2.', ' ', 'blah', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -940,8 +790,8 @@ text
expected = [
@RM::Paragraph.new('text'),
@RM::BlankLine.new,
- @RM::Verbatim.new("--- lib/blah.rb.orig\n",
- "+++ lib/blah.rb\n")]
+ @RM::Verbatim.new(' ', '---', ' ', 'lib/blah.rb.orig', "\n",
+ ' ', '+++', ' ', 'lib/blah.rb', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -956,7 +806,7 @@ text
expected = [
@RM::Paragraph.new('text'),
@RM::BlankLine.new,
- @RM::Verbatim.new("---")]
+ @RM::Verbatim.new(' ', '---', '')]
assert_equal expected, @RMP.parse(str).parts
end
@@ -973,9 +823,9 @@ the time
expected = [
@RM::Paragraph.new('now is'),
- @RM::Verbatim.new("code\n",
+ @RM::Verbatim.new(' ', 'code', "\n",
"\n",
- "code1\n"),
+ ' ', 'code1', "\n"),
@RM::Paragraph.new('the time'),
]
@@ -988,7 +838,7 @@ the time
STR
expected = [
- @RM::Verbatim.new("B. blah\n")]
+ @RM::Verbatim.new(' ', 'B.', ' ', 'blah', "\n")]
assert_equal expected, @RMP.parse(str).parts
end
@@ -1001,57 +851,58 @@ the time
assert_equal expected, @RMP.parse('hello').parts
expected = [
- @RM::Verbatim.new('hello '),
+ @RM::Verbatim.new(' ', 'hello '),
]
- assert_equal expected, @RMP.parse(' hello ').parts
+ assert_equal expected, @RMP.parse(' hello ').parts
expected = [
- @RM::Verbatim.new('hello '),
+ @RM::Verbatim.new(' ', 'hello '),
]
- assert_equal expected, @RMP.parse(' hello ').parts
+ assert_equal expected, @RMP.parse(" hello ").parts
expected = [
@RM::Paragraph.new('1'),
- @RM::Verbatim.new("2\n", ' 3'),
+ @RM::Verbatim.new(' ', '2', "\n",
+ ' ', '3'),
]
assert_equal expected, @RMP.parse("1\n 2\n 3").parts
expected = [
- @RM::Verbatim.new("1\n",
- " 2\n",
- " 3"),
+ @RM::Verbatim.new(' ', '1', "\n",
+ ' ', '2', "\n",
+ ' ', '3'),
]
assert_equal expected, @RMP.parse(" 1\n 2\n 3").parts
expected = [
@RM::Paragraph.new('1'),
- @RM::Verbatim.new("2\n",
- " 3\n"),
+ @RM::Verbatim.new(' ', '2', "\n",
+ ' ', '3', "\n"),
@RM::Paragraph.new('1'),
- @RM::Verbatim.new('2'),
+ @RM::Verbatim.new(' ', '2'),
]
assert_equal expected, @RMP.parse("1\n 2\n 3\n1\n 2").parts
expected = [
- @RM::Verbatim.new("1\n",
- " 2\n",
- " 3\n",
- "1\n",
- ' 2'),
+ @RM::Verbatim.new(' ', '1', "\n",
+ ' ', '2', "\n",
+ ' ', '3', "\n",
+ ' ', '1', "\n",
+ ' ', '2'),
]
assert_equal expected, @RMP.parse(" 1\n 2\n 3\n 1\n 2").parts
expected = [
- @RM::Verbatim.new("1\n",
- " 2\n",
+ @RM::Verbatim.new(' ', '1', "\n",
+ ' ', '2', "\n",
"\n",
- ' 3'),
+ ' ', '3'),
]
assert_equal expected, @RMP.parse(" 1\n 2\n\n 3").parts
@@ -1091,7 +942,8 @@ the time
STR
expected = [
- [:BULLET, '*', 0, 0],
+ [:BULLET, :BULLET, 0, 0],
+ [:SPACE, 2, 0, 0],
[:TEXT, 'l1', 2, 0],
[:NEWLINE, "\n", 4, 0],
]
@@ -1106,10 +958,13 @@ the time
STR
expected = [
- [:BULLET, '*', 0, 0],
+ [:BULLET, :BULLET, 0, 0],
+ [:SPACE, 2, 0, 0],
[:TEXT, 'l1', 2, 0],
[:NEWLINE, "\n", 4, 0],
- [:BULLET, '*', 2, 1],
+ [:INDENT, 2, 0, 1],
+ [:BULLET, :BULLET, 2, 1],
+ [:SPACE, 2, 2, 1],
[:TEXT, 'l1.1', 4, 1],
[:NEWLINE, "\n", 8, 1],
]
@@ -1135,23 +990,6 @@ the time
assert_equal expected, @RMP.tokenize(str)
end
- def test_tokenize_heading_empty
- str = <<-STR
-===
-* bullet
- STR
-
- expected = [
- [:HEADER, 3, 0, 0],
- [:NEWLINE, "\n", 3, 0],
- [:BULLET, "*", 0, 1],
- [:TEXT, "bullet", 2, 1],
- [:NEWLINE, "\n", 8, 1],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
def test_tokenize_heading_heading
str = <<-STR
= =
@@ -1192,9 +1030,11 @@ the time
expected = [
[:LABEL, 'cat', 0, 0],
+ [:SPACE, 6, 0, 0],
[:TEXT, 'l1', 6, 0],
[:NEWLINE, "\n", 8, 0],
[:LABEL, 'dog', 0, 1],
+ [:SPACE, 6, 0, 1],
[:TEXT, 'l1.1', 6, 1],
[:NEWLINE, "\n", 10, 1],
]
@@ -1210,46 +1050,17 @@ the time
expected = [
[:LABEL, 'label', 0, 0],
+ [:SPACE, 7, 0, 0],
[:NEWLINE, "\n", 7, 0],
+ [:INDENT, 2, 0, 1],
[:NOTE, 'note', 2, 1],
+ [:SPACE, 6, 2, 1],
[:NEWLINE, "\n", 8, 1],
]
assert_equal expected, @RMP.tokenize(str)
end
- def test_tokenize_label_newline
- str = <<-STR
-[cat]
- l1
- STR
-
- expected = [
- [:LABEL, 'cat', 0, 0],
- [:NEWLINE, "\n", 5, 0],
- [:TEXT, 'l1', 2, 1],
- [:NEWLINE, "\n", 4, 1],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_label_newline_windows
- str = <<-STR
-[cat]\r
- l1\r
- STR
-
- expected = [
- [:LABEL, 'cat', 0, 0],
- [:NEWLINE, "\n", 6, 0],
- [:TEXT, 'l1', 2, 1],
- [:NEWLINE, "\n", 5, 1],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
def test_tokenize_lalpha
str = <<-STR
a. l1
@@ -1258,9 +1069,11 @@ b. l1.1
expected = [
[:LALPHA, 'a', 0, 0],
+ [:SPACE, 3, 0, 0],
[:TEXT, 'l1', 3, 0],
[:NEWLINE, "\n", 5, 0],
[:LALPHA, 'b', 0, 1],
+ [:SPACE, 3, 0, 1],
[:TEXT, 'l1.1', 3, 1],
[:NEWLINE, "\n", 7, 1],
]
@@ -1268,53 +1081,6 @@ b. l1.1
assert_equal expected, @RMP.tokenize(str)
end
- def test_tokenize_line_break
- str = "now is\nthe time \nfor all\n"
-
- expected = [
- [:TEXT, 'now is', 0, 0],
- [:NEWLINE, "\n", 6, 0],
- [:TEXT, 'the time', 0, 1],
- [:BREAK, " ", 8, 1],
- [:NEWLINE, "\n", 10, 1],
- [:TEXT, 'for all', 0, 2],
- [:NEWLINE, "\n", 7, 2],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_line_break_long
- str = "now is\nthe time \nfor all\n"
-
- expected = [
- [:TEXT, 'now is', 0, 0],
- [:NEWLINE, "\n", 6, 0],
- [:TEXT, 'the time ', 0, 1],
- [:BREAK, ' ', 9, 1],
- [:NEWLINE, "\n", 11, 1],
- [:TEXT, 'for all', 0, 2],
- [:NEWLINE, "\n", 7, 2],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_line_break_no_short
- str = "now is\nthe time \nfor all\n"
-
- expected = [
- [:TEXT, 'now is', 0, 0],
- [:NEWLINE, "\n", 6, 0],
- [:TEXT, 'the time ', 0, 1],
- [:NEWLINE, "\n", 9, 1],
- [:TEXT, 'for all', 0, 2],
- [:NEWLINE, "\n", 7, 2],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
def test_tokenize_note
str = <<-STR
cat:: l1
@@ -1323,9 +1089,11 @@ dog:: l1.1
expected = [
[:NOTE, 'cat', 0, 0],
+ [:SPACE, 6, 0, 0],
[:TEXT, 'l1', 6, 0],
[:NEWLINE, "\n", 8, 0],
[:NOTE, 'dog', 0, 1],
+ [:SPACE, 6, 0, 1],
[:TEXT, 'l1.1', 6, 1],
[:NEWLINE, "\n", 10, 1],
]
@@ -1341,72 +1109,16 @@ dog::
expected = [
[:NOTE, 'cat', 0, 0],
+ [:SPACE, 5, 0, 0],
[:NEWLINE, "\n", 5, 0],
[:NOTE, 'dog', 0, 1],
+ [:SPACE, 5, 0, 1],
[:NEWLINE, "\n", 5, 1],
]
assert_equal expected, @RMP.tokenize(str)
end
- def test_tokenize_note_newline
- str = <<-STR
-cat::
- l1
- STR
-
- expected = [
- [:NOTE, 'cat', 0, 0],
- [:NEWLINE, "\n", 5, 0],
- [:TEXT, 'l1', 2, 1],
- [:NEWLINE, "\n", 4, 1],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_note_utf_8
- skip 'Encoding not implemented' unless @have_encoding
-
- str = <<-STR
-cät:: l1a
- l1b
-døg:: l2a
- l2b
- STR
-
- expected = [
- [:NOTE, 'cät', 0, 0],
- [:TEXT, 'l1a', 6, 0],
- [:NEWLINE, "\n", 9, 0],
- [:TEXT, 'l1b', 6, 1],
- [:NEWLINE, "\n", 9, 1],
- [:NOTE, 'døg', 0, 2],
- [:TEXT, 'l2a', 6, 2],
- [:NEWLINE, "\n", 9, 2],
- [:TEXT, 'l2b', 6, 3],
- [:NEWLINE, "\n", 9, 3],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_note_newline_windows
- str = <<-STR
-cat::\r
- l1\r
- STR
-
- expected = [
- [:NOTE, 'cat', 0, 0],
- [:NEWLINE, "\n", 6, 0],
- [:TEXT, 'l1', 2, 1],
- [:NEWLINE, "\n", 5, 1],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
def test_tokenize_note_not
str = <<-STR
Cat::Dog
@@ -1428,9 +1140,11 @@ Cat::Dog
expected = [
[:NUMBER, '1', 0, 0],
+ [:SPACE, 3, 0, 0],
[:TEXT, 'l1', 3, 0],
[:NEWLINE, "\n", 5, 0],
[:NUMBER, '2', 0, 1],
+ [:SPACE, 3, 0, 1],
[:TEXT, 'l1.1', 3, 1],
[:NEWLINE, "\n", 7, 1],
]
@@ -1448,16 +1162,20 @@ Cat::Dog
expected = [
[:NUMBER, "1", 0, 0],
+ [:SPACE, 3, 0, 0],
[:TEXT, "blah blah blah", 3, 0],
[:NEWLINE, "\n", 17, 0],
+ [:INDENT, 3, 0, 1],
[:TEXT, "l.", 3, 1],
[:NEWLINE, "\n", 5, 1],
[:NUMBER, "2", 0, 2],
+ [:SPACE, 3, 0, 2],
[:TEXT, "blah blah blah blah", 3, 2],
[:NEWLINE, "\n", 22, 2],
+ [:INDENT, 3, 0, 3],
[:TEXT, "d.", 3, 3],
[:NEWLINE, "\n", 5, 3]
]
@@ -1475,18 +1193,24 @@ Cat::Dog
expected = [
[:NUMBER, "1", 0, 0],
+ [:SPACE, 3, 0, 0],
[:TEXT, "blah blah blah", 3, 0],
[:NEWLINE, "\n", 17, 0],
+ [:INDENT, 3, 0, 1],
[:LALPHA, "l", 3, 1],
+ [:SPACE, 4, 3, 1],
[:TEXT, "more stuff", 7, 1],
[:NEWLINE, "\n", 17, 1],
[:NUMBER, "2", 0, 2],
+ [:SPACE, 3, 0, 2],
[:TEXT, "blah blah blah blah", 3, 2],
[:NEWLINE, "\n", 22, 2],
+ [:INDENT, 3, 0, 3],
[:LALPHA, "d", 3, 3],
+ [:SPACE, 3, 3, 3],
[:TEXT, "other stuff", 6, 3],
[:NEWLINE, "\n", 17, 3]
]
@@ -1517,35 +1241,17 @@ for all
def test_tokenize_rule
str = <<-STR
----
+---
--- blah ---
STR
expected = [
[:RULE, 1, 0, 0],
- [:NEWLINE, "\n", 3, 0],
- [:NEWLINE, "\n", 0, 1],
- [:TEXT, "--- blah ---", 0, 2],
- [:NEWLINE, "\n", 12, 2],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_rule_windows
- str = <<-STR
----\r
-
---- blah ---\r
- STR
-
- expected = [
- [:RULE, 1, 0, 0],
[:NEWLINE, "\n", 4, 0],
[:NEWLINE, "\n", 0, 1],
[:TEXT, "--- blah ---", 0, 2],
- [:NEWLINE, "\n", 13, 2],
+ [:NEWLINE, "\n", 12, 2],
]
assert_equal expected, @RMP.tokenize(str)
@@ -1559,9 +1265,11 @@ B. l1.1
expected = [
[:UALPHA, 'A', 0, 0],
+ [:SPACE, 3, 0, 0],
[:TEXT, 'l1', 3, 0],
[:NEWLINE, "\n", 5, 0],
[:UALPHA, 'B', 0, 1],
+ [:SPACE, 3, 0, 1],
[:TEXT, 'l1.1', 3, 1],
[:NEWLINE, "\n", 7, 1],
]
@@ -1580,6 +1288,7 @@ Example heading:
[:TEXT, 'Example heading:', 0, 0],
[:NEWLINE, "\n", 16, 0],
[:NEWLINE, "\n", 0, 1],
+ [:INDENT, 3, 0, 2],
[:HEADER, 3, 3, 2],
[:TEXT, 'heading three', 7, 2],
[:NEWLINE, "\n", 20, 2],
@@ -1588,70 +1297,19 @@ Example heading:
assert_equal expected, @RMP.tokenize(str)
end
- def test_tokenize_verbatim_rule
- str = <<-STR
- Verbatim section here that is double-underlined
- ===============================================
- STR
-
- expected = [
- [:TEXT, 'Verbatim section here that is double-underlined', 2, 0],
- [:NEWLINE, "\n", 49, 0],
- [:HEADER, 47, 2, 1],
- [:NEWLINE, "\n", 49, 1],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_tokenize_verbatim_rule_fancy
- str = <<-STR
- A
- b
- ===============================================
- c
- STR
-
- expected = [
- [:TEXT, 'A', 2, 0],
- [:NEWLINE, "\n", 3, 0],
- [:TEXT, 'b', 4, 1],
- [:NEWLINE, "\n", 5, 1],
- [:HEADER, 47, 2, 2],
- [:NEWLINE, "\n", 49, 2],
- [:TEXT, 'c', 4, 3],
- [:NEWLINE, "\n", 5, 3],
- ]
-
- assert_equal expected, @RMP.tokenize(str)
- end
-
- def test_token_pos
- parser = @RMP.new
- s = parser.setup_scanner 'cät'
-
- s.scan(/\S+/)
-
- if @have_encoding or @have_byteslice then
- assert_equal [3, 0], parser.token_pos(s.pos)
- else
- assert_equal [4, 0], parser.token_pos(s.pos)
- end
- end
-
# HACK move to Verbatim test case
def test_verbatim_normalize
- v = @RM::Verbatim.new "foo\n", "\n", "\n", "bar\n"
+ v = @RM::Verbatim.new ' ', 'foo', "\n", "\n", "\n", ' ', 'bar', "\n"
v.normalize
- assert_equal ["foo\n", "\n", "bar\n"], v.parts
+ assert_equal [' ', 'foo', "\n", "\n", ' ', 'bar', "\n"], v.parts
- v = @RM::Verbatim.new "foo\n", "\n"
+ v = @RM::Verbatim.new ' ', 'foo', "\n", "\n"
v.normalize
- assert_equal ["foo\n"], v.parts
+ assert_equal [' ', 'foo', "\n"], v.parts
end
def test_unget
diff --git a/test/rdoc/test_rdoc_markup_pre_process.rb b/test/rdoc/test_rdoc_markup_pre_process.rb
index 3a991a6397..cae4da9e05 100644
--- a/test/rdoc/test_rdoc_markup_pre_process.rb
+++ b/test/rdoc/test_rdoc_markup_pre_process.rb
@@ -1,37 +1,26 @@
-# coding: utf-8
+require 'tempfile'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/markup/preprocess'
+require 'rdoc/code_objects'
-require 'rdoc/test_case'
-
-class TestRDocMarkupPreProcess < RDoc::TestCase
+class TestRDocMarkupPreProcess < MiniTest::Unit::TestCase
def setup
- super
+ RDoc::Markup::PreProcess.registered.clear
@tempfile = Tempfile.new 'test_rdoc_markup_pre_process'
- @file_name = File.basename @tempfile.path
+ @tempfile.binmode
+ @name = File.basename @tempfile.path
@dir = File.dirname @tempfile.path
@pp = RDoc::Markup::PreProcess.new __FILE__, [@dir]
end
def teardown
- super
-
@tempfile.close
end
- def test_class_register
- RDoc::Markup::PreProcess.register 'for_test' do raise 'fail' end
-
- assert_equal %w[for_test], RDoc::Markup::PreProcess.registered.keys
- end
-
- def test_class_post_process
- RDoc::Markup::PreProcess.post_process do end
-
- assert_equal 1, RDoc::Markup::PreProcess.post_processors.length
- end
-
def test_include_file
@tempfile.write <<-INCLUDE
# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
@@ -43,7 +32,7 @@ contents of a string.
@tempfile.flush
@tempfile.rewind
- content = @pp.include_file @file_name, '', nil
+ content = @pp.include_file @name, ''
expected = <<-EXPECTED
Regular expressions (<i>regexp</i>s) are patterns which describe the
@@ -53,408 +42,139 @@ contents of a string.
assert_equal expected, content
end
- def test_include_file_encoding_incompatible
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @tempfile.write <<-INCLUDE
-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
-
-Ï€
- INCLUDE
-
- @tempfile.flush
- @tempfile.rewind
-
- content = @pp.include_file @file_name, '', Encoding::US_ASCII
-
- expected = "?\n"
-
- assert_equal expected, content
- end
-
def test_handle
- text = "# :main: M\n"
+ text = "# :x: y\n"
out = @pp.handle text
assert_same out, text
- assert_equal "#\n", text
- end
-
- def test_handle_comment
- text = "# :main: M\n"
- c = comment text
-
- out = @pp.handle c
-
- assert_same out, text
- assert_equal "#\n", text
- end
-
- def test_handle_markup
- c = comment ':markup: rd'
-
- @pp.handle c
-
- assert_equal 'rd', c.format
- end
-
- def test_handle_markup_empty
- c = comment ':markup:'
-
- @pp.handle c
-
- assert_equal 'rdoc', c.format
+ assert_equal "# :x: y\n", text
end
- def test_handle_post_process
- cd = RDoc::CodeObject.new
-
- RDoc::Markup::PreProcess.post_process do |text, code_object|
- code_object.metadata[:stuff] = text
+ def test_handle_block
+ text = "# :x: y\n"
- :junk
+ @pp.handle text do |directive, param|
+ false
end
- text = "# a b c\n"
+ assert_equal "# :x: y\n", text
- out = @pp.handle text, cd
+ @pp.handle text do |directive, param|
+ ''
+ end
- assert_same out, text
- assert_equal "# a b c\n", text
- assert_equal "# a b c\n", cd.metadata[:stuff]
+ assert_equal "", text
end
- def test_handle_unregistered
+ def test_handle_code_object
+ cd = RDoc::CodeObject.new
text = "# :x: y\n"
- out = @pp.handle text
+ @pp.handle text, cd
- assert_same out, text
assert_equal "# :x: y\n", text
- end
-
- def test_handle_directive_blankline
- result = @pp.handle_directive '#', 'arg', 'a, b'
-
- assert_equal "#\n", result
- end
-
- def test_handle_directive_downcase
- method = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'ARG', 'a, b', method
-
- assert_equal 'a, b', method.params
- end
-
- def test_handle_directive_arg
- method = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'arg', 'a, b', method
+ assert_equal 'y', cd.metadata['x']
- assert_equal 'a, b', method.params
- end
-
- def test_handle_directive_arg_no_context
- result = @pp.handle_directive '', 'arg', 'a, b', nil
-
- assert_equal "\n", result
- end
-
- def test_handle_directive_args
- method = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'args', 'a, b', method
-
- assert_equal 'a, b', method.params
- end
-
- def test_handle_directive_block
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
- ''
- end
+ cd.metadata.clear
+ text = "# :x:\n"
+ @pp.handle text, cd
- assert_empty result
+ assert_equal "# :x: \n", text
+ assert_includes cd.metadata, 'x'
end
- def test_handle_directive_block_false
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
+ def test_handle_code_object_block
+ cd = RDoc::CodeObject.new
+ text = "# :x: y\n"
+ @pp.handle text, cd do
false
end
- assert_equal ":x: y\n", result
- end
+ assert_equal "# :x: y\n", text
+ assert_empty cd.metadata
- def test_handle_directive_block_nil
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
+ @pp.handle text, cd do
nil
end
- assert_equal ":x: y\n", result
- end
-
- def test_handle_directive_category
- context = RDoc::Context.new
- original_section = context.current_section
-
- @pp.handle_directive '', 'category', 'other', context
-
- refute_equal original_section, context.current_section
- end
-
- def test_handle_directive_doc
- code_object = RDoc::CodeObject.new
- code_object.document_self = false
- code_object.force_documentation = false
-
- @pp.handle_directive '', 'doc', nil, code_object
-
- assert code_object.document_self
- assert code_object.force_documentation
- end
-
- def test_handle_directive_doc_no_context
- result = @pp.handle_directive '', 'doc', nil
-
- assert_equal "\n", result
- end
-
- def test_handle_directive_enddoc
- code_object = RDoc::CodeObject.new
-
- @pp.handle_directive '', 'enddoc', nil, code_object
-
- assert code_object.done_documenting
- end
-
- def test_handle_directive_include
- @tempfile.write 'included'
- @tempfile.flush
-
- result = @pp.handle_directive '', 'include', @file_name
-
- assert_equal 'included', result
- end
-
- def test_handle_directive_main
- @pp.options = RDoc::Options.new
-
- @pp.handle_directive '', 'main', 'M'
-
- assert_equal 'M', @pp.options.main_page
- end
-
- def test_handle_directive_notnew
- m = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'notnew', nil, m
-
- assert m.dont_rename_initialize
- end
-
- def test_handle_directive_not_new
- m = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'not_new', nil, m
-
- assert m.dont_rename_initialize
- end
-
- def test_handle_directive_not_dash_new
- m = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'not-new', nil, m
-
- assert m.dont_rename_initialize
- end
-
- def test_handle_directive_nodoc
- code_object = RDoc::CodeObject.new
- code_object.document_self = true
- code_object.document_children = true
-
- @pp.handle_directive '', 'nodoc', nil, code_object
-
- refute code_object.document_self
- assert code_object.document_children
- end
-
- def test_handle_directive_nodoc_all
- code_object = RDoc::CodeObject.new
- code_object.document_self = true
- code_object.document_children = true
-
- @pp.handle_directive '', 'nodoc', 'all', code_object
+ assert_equal "# :x: y\n", text
+ assert_equal 'y', cd.metadata['x']
- refute code_object.document_self
- refute code_object.document_children
- end
+ cd.metadata.clear
- def test_handle_directive_nodoc_no_context
- result = @pp.handle_directive '', 'nodoc', nil
+ @pp.handle text, cd do
+ ''
+ end
- assert_equal "\n", result
+ assert_equal '', text
+ assert_empty cd.metadata
end
- def test_handle_directive_registered
+ def test_handle_registered
RDoc::Markup::PreProcess.register 'x'
+ text = "# :x: y\n"
+ @pp.handle text
- result = @pp.handle_directive '', 'x', 'y'
+ assert_equal '', text
- assert_nil result
+ text = "# :x: y\n"
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
+ @pp.handle text do |directive, param|
false
end
- assert_equal ":x: y\n", result
+ assert_equal "# :x: y\n", text
+
+ text = "# :x: y\n"
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
+ @pp.handle text do |directive, param|
''
end
- assert_equal '', result
+ assert_equal "", text
end
- def test_handle_directive_registered_block
+ def test_handle_registered_block
called = nil
-
RDoc::Markup::PreProcess.register 'x' do |directive, param|
called = [directive, param]
'blah'
end
- result = @pp.handle_directive '', 'x', 'y'
+ text = "# :x: y\n"
+ @pp.handle text
- assert_equal 'blah', result
+ assert_equal 'blah', text
assert_equal %w[x y], called
end
- def test_handle_directive_registered_code_object
+ def test_handle_registered_code_object
RDoc::Markup::PreProcess.register 'x'
- code_object = RDoc::CodeObject.new
-
- @pp.handle_directive '', 'x', 'y', code_object
-
- assert_equal 'y', code_object.metadata['x']
-
- code_object.metadata.clear
-
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
- false
- end
-
- assert_equal ":x: y\n", result
- assert_empty code_object.metadata
-
- result = @pp.handle_directive '', 'x', 'y' do |directive, param|
- ''
- end
-
- assert_equal '', result
- assert_empty code_object.metadata
- end
-
- def test_handle_directive_startdoc
- code_object = RDoc::CodeObject.new
- code_object.stop_doc
- code_object.force_documentation = false
-
- @pp.handle_directive '', 'startdoc', nil, code_object
-
- assert code_object.document_self
- assert code_object.document_children
- assert code_object.force_documentation
- end
-
- def test_handle_directive_stopdoc
- code_object = RDoc::CodeObject.new
-
- @pp.handle_directive '', 'stopdoc', nil, code_object
-
- refute code_object.document_self
- refute code_object.document_children
- end
-
- def test_handle_directive_title
- @pp.options = RDoc::Options.new
-
- @pp.handle_directive '', 'title', 'T'
-
- assert_equal 'T', @pp.options.title
- end
-
- def test_handle_directive_unhandled
- code_object = RDoc::CodeObject.new
-
- @pp.handle_directive '', 'x', 'y', code_object
-
- assert_equal 'y', code_object.metadata['x']
+ cd = RDoc::CodeObject.new
- code_object.metadata.clear
+ text = "# :x: y\n"
+ @pp.handle text, cd
- @pp.handle_directive '', 'x', '', code_object
+ assert_equal '', text
+ assert_equal 'y', cd.metadata['x']
- assert_includes code_object.metadata, 'x'
- end
-
- def test_handle_directive_unhandled_block
- code_object = RDoc::CodeObject.new
+ cd.metadata.clear
+ text = "# :x: y\n"
- @pp.handle_directive '', 'x', 'y', code_object do
+ @pp.handle text do |directive, param|
false
end
- assert_empty code_object.metadata
-
- @pp.handle_directive '', 'x', 'y', code_object do
- nil
- end
-
- assert_equal 'y', code_object.metadata['x']
+ assert_equal "# :x: y\n", text
+ assert_empty cd.metadata
- code_object.metadata.clear
+ text = "# :x: y\n"
- @pp.handle_directive '', 'x', 'y', code_object do
+ @pp.handle text do |directive, param|
''
end
- assert_empty code_object.metadata
- end
-
- def test_handle_directive_yield
- method = RDoc::AnyMethod.new nil, 'm'
- method.params = 'index, &block'
-
- @pp.handle_directive '', 'yield', 'item', method
-
- assert_equal 'item', method.block_params
- assert_equal 'index', method.params
- end
-
- def test_handle_directive_yield_block_param
- method = RDoc::AnyMethod.new nil, 'm'
- method.params = '&block'
-
- @pp.handle_directive '', 'yield', 'item', method
-
- assert_equal 'item', method.block_params
- assert_empty method.params
- end
-
- def test_handle_directive_yield_no_context
- method = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'yield', 'item', method
-
- assert_equal 'item', method.block_params
- end
-
- def test_handle_directive_yields
- method = RDoc::AnyMethod.new nil, 'm'
-
- @pp.handle_directive '', 'yields', 'item', method
-
- assert_equal 'item', method.block_params
+ assert_equal "", text
+ assert_empty cd.metadata
end
end
diff --git a/test/rdoc/test_rdoc_markup_raw.rb b/test/rdoc/test_rdoc_markup_raw.rb
index 16cc60e3a8..4e57b7df39 100644
--- a/test/rdoc/test_rdoc_markup_raw.rb
+++ b/test/rdoc/test_rdoc_markup_raw.rb
@@ -1,10 +1,12 @@
-require 'rdoc/test_case'
+require 'pp'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/markup'
-class TestRDocMarkupRaw < RDoc::TestCase
+class TestRDocMarkupRaw < MiniTest::Unit::TestCase
def setup
- super
-
+ @RM = RDoc::Markup
@p = @RM::Raw.new
end
@@ -21,9 +23,5 @@ class TestRDocMarkupRaw < RDoc::TestCase
assert_equal @RM::Raw.new('hi', 'there'), @p
end
- def test_pretty_print
- assert_equal '[raw: ]', mu_pp(@p)
- end
-
end
diff --git a/test/rdoc/test_rdoc_markup_to_ansi.rb b/test/rdoc/test_rdoc_markup_to_ansi.rb
index 5afaf94350..a8fab98d19 100644
--- a/test/rdoc/test_rdoc_markup_to_ansi.rb
+++ b/test/rdoc/test_rdoc_markup_to_ansi.rb
@@ -1,9 +1,11 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'rdoc/markup/formatter_test_case'
+require 'rdoc/markup/to_ansi'
+require 'minitest/autorun'
-class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
+class TestRDocMarkupToAnsi < RDoc::Markup::FormatterTestCase
add_visitor_tests
- add_text_tests
def setup
super
@@ -15,14 +17,6 @@ class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
assert_equal "\e[0m\n", @to.res.join
end
- def accept_block_quote
- assert_equal "\e[0m> quote\n", @to.res.join
- end
-
- def accept_document
- assert_equal "\e[0mhello\n", @to.res.join
- end
-
def accept_heading
assert_equal "\e[0mHello\n", @to.res.join
end
@@ -68,7 +62,7 @@ class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
end
def accept_list_item_end_label
- assert_equal "\e[0mcat:\n", @to.res.join
+ assert_equal "\e[0m\n", @to.res.join
assert_equal 0, @to.indent, 'indent'
end
@@ -78,7 +72,7 @@ class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
end
def accept_list_item_end_note
- assert_equal "\e[0mcat:\n", @to.res.join
+ assert_equal "\e[0m\n", @to.res.join
assert_equal 0, @to.indent, 'indent'
end
@@ -197,8 +191,8 @@ class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
assert_equal "\e[0m#{'-' * 78}\n", @to.res.join
end
- def accept_verbatim
- assert_equal "\e[0m hi\n world\n\n", @to.res.join
+ def accept_verbatim # FormatterTestCase doesn't set indent for ToAnsi
+ assert_equal "\e[0m hi\n world\n\n", @to.res.join
end
def end_accepting
@@ -213,121 +207,214 @@ class TestRDocMarkupToAnsi < RDoc::Markup::TextFormatterTestCase
assert_empty @to.list_width
end
- def accept_heading_1
+ def test_accept_heading_1
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(1, 'Hello')
+
assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
end
- def accept_heading_2
+ def test_accept_heading_2
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(2, 'Hello')
+
assert_equal "\e[0m\e[4;32mHello\e[m\n", @to.end_accepting
end
- def accept_heading_3
+ def test_accept_heading_3
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(3, 'Hello')
+
assert_equal "\e[0m\e[32mHello\e[m\n", @to.end_accepting
end
- def accept_heading_4
+ def test_accept_heading_4
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(4, 'Hello')
+
assert_equal "\e[0mHello\n", @to.end_accepting
end
- def accept_heading_indent
+ def test_accept_heading_indent
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_heading @RM::Heading.new(1, 'Hello')
+
assert_equal "\e[0m \e[1;32mHello\e[m\n", @to.end_accepting
end
- def accept_heading_b
- assert_equal "\e[0m\e[1;32m\e[1mHello\e[m\e[m\n", @to.end_accepting
- end
+ def test_accept_heading_b
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_heading @RM::Heading.new(1, '*Hello*')
- def accept_heading_suppressed_crossref
- assert_equal "\e[0m\e[1;32mHello\e[m\n", @to.end_accepting
+ assert_equal "\e[0m \e[1;32m\e[1mHello\e[m\e[m\n", @to.end_accepting
end
- def accept_list_item_start_note_2
- assert_equal "\e[0m\e[7mteletype\e[m:\n teletype description\n\n",
- @to.res.join
- end
+ def test_accept_list_item_start_note_2
+ list = @RM::List.new(:NOTE,
+ @RM::ListItem.new('<tt>teletype</tt>',
+ @RM::Paragraph.new('teletype description')))
- def accept_list_item_start_note_multi_description
- assert_equal "\e[0mlabel:\n description one\n\n description two\n\n",
- @to.res.join
- end
+ @to.start_accepting
- def accept_list_item_start_note_multi_label
- assert_equal "\e[0mone\ntwo:\n two headers\n\n",
- @to.res.join
- end
+ list.accept @to
- def accept_paragraph_b
- assert_equal "\e[0mreg \e[1mbold words\e[m reg\n", @to.end_accepting
- end
+ expected = "\e[0m\e[7mteletype\e[m:\n teletype description\n\n"
- def accept_paragraph_br
- assert_equal "\e[0mone\ntwo\n", @to.end_accepting
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_break
- assert_equal "\e[0mhello\nworld\n", @to.end_accepting
+ def test_accept_paragraph_b
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('reg <b>bold words</b> reg')
+
+ expected = "\e[0mreg \e[1mbold words\e[m reg\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_i
- assert_equal "\e[0mreg \e[4mitalic words\e[m reg\n", @to.end_accepting
+ def test_accept_paragraph_i
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('reg <em>italic words</em> reg')
+
+ expected = "\e[0mreg \e[4mitalic words\e[m reg\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_indent
+ def test_accept_paragraph_indent
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_paragraph @RM::Paragraph.new('words ' * 30)
+
expected = <<-EXPECTED
\e[0m words words words words words words words words words words words words
words words words words words words words words words words words words
- words words words words words words
+ words words words words words words
EXPECTED
assert_equal expected, @to.end_accepting
end
- def accept_paragraph_plus
- assert_equal "\e[0mreg \e[7mteletype\e[m reg\n", @to.end_accepting
+ def test_accept_paragraph_plus
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular +teletype+ regular')
+
+ expected = "\e[0mregular \e[7mteletype\e[m regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_star
- assert_equal "\e[0mreg \e[1mbold\e[m reg\n", @to.end_accepting
+ def test_accept_paragraph_star
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular *bold* regular')
+
+ expected = "\e[0mregular \e[1mbold\e[m regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_underscore
- assert_equal "\e[0mreg \e[4mitalic\e[m reg\n", @to.end_accepting
+ def test_accept_paragraph_underscore
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular _italic_ regular')
+
+ expected = "\e[0mregular \e[4mitalic\e[m regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_wrap
+ def test_accept_paragraph_wrap
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('words ' * 30)
+
expected = <<-EXPECTED
\e[0mwords words words words words words words words words words words words words
words words words words words words words words words words words words words
-words words words words
+words words words words
EXPECTED
assert_equal expected, @to.end_accepting
end
- def accept_rule_indent
+ def test_accept_rule_indent
+ @to.start_accepting
+ @to.indent = 3
+
+ @to.accept_rule @RM::Rule.new(1)
+
assert_equal "\e[0m #{'-' * 75}\n", @to.end_accepting
end
- def accept_verbatim_indent
+ def test_accept_verbatim_indent
+ @to.start_accepting
+
+ @to.indent = 2
+
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
+
assert_equal "\e[0m hi\n world\n\n", @to.end_accepting
end
- def accept_verbatim_big_indent
+ def test_accept_verbatim_big_indent
+ @to.start_accepting
+
+ @to.indent = 2
+
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
+
assert_equal "\e[0m hi\n world\n\n", @to.end_accepting
end
- def list_nested
+ def test_attributes
+ assert_equal 'Dog', @to.attributes("\\Dog")
+ end
+
+ def test_list_nested
+ doc = @RM::Document.new(
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1'),
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1.1')))),
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l2'))))
+
+ output = doc.accept @to
+
expected = <<-EXPECTED
\e[0m* l1
* l1.1
* l2
EXPECTED
- assert_equal expected, @to.end_accepting
- end
+ assert_equal expected, output
+ end
+
+ def test_list_verbatim # HACK overblown
+ doc = @RM::Document.new(
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('list', 'stuff'),
+ @RM::BlankLine.new(),
+ @RM::Verbatim.new(' ', '*', ' ', 'list', "\n",
+ ' ', 'with', "\n",
+ "\n",
+ ' ', 'second', "\n",
+ "\n",
+ ' ', '1.', ' ', 'indented', "\n",
+ ' ', '2.', ' ', 'numbered', "\n",
+ "\n",
+ ' ', 'third', "\n",
+ "\n",
+ ' ', '*', ' ', 'second', "\n"))))
+
+ output = doc.accept @to
- def list_verbatim
- expected = <<-EXPECTED # HACK overblown
+ expected = <<-EXPECTED
\e[0m* list stuff
* list
@@ -344,25 +431,7 @@ words words words words
EXPECTED
- assert_equal expected, @to.end_accepting
- end
-
- # functional test
- def test_convert_list_note
- note_list = <<-NOTE_LIST
-foo ::
-bar ::
- hi
- NOTE_LIST
-
- expected = <<-EXPECTED
-\e[0mfoo
-bar:
- hi
-
- EXPECTED
-
- assert_equal expected, @to.convert(note_list)
+ assert_equal expected, output
end
end
diff --git a/test/rdoc/test_rdoc_markup_to_bs.rb b/test/rdoc/test_rdoc_markup_to_bs.rb
index f2e6352b69..c042452637 100644
--- a/test/rdoc/test_rdoc_markup_to_bs.rb
+++ b/test/rdoc/test_rdoc_markup_to_bs.rb
@@ -1,9 +1,11 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'rdoc/markup/formatter_test_case'
+require 'rdoc/markup/to_bs'
+require 'minitest/autorun'
-class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
+class TestRDocMarkupToBs < RDoc::Markup::FormatterTestCase
add_visitor_tests
- add_text_tests
def setup
super
@@ -15,14 +17,6 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
assert_equal "\n", @to.res.join
end
- def accept_block_quote
- assert_equal "> quote\n", @to.res.join
- end
-
- def accept_document
- assert_equal "hello\n", @to.res.join
- end
-
def accept_heading
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
assert_equal "===== H\bHe\bel\bll\blo\bo\n", @to.res.join
@@ -69,7 +63,6 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
end
def accept_list_item_end_label
- assert_equal "cat:\n", @to.res.join
assert_equal 0, @to.indent, 'indent'
end
@@ -79,7 +72,6 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
end
def accept_list_item_end_note
- assert_equal "cat:\n", @to.res.join
assert_equal 0, @to.indent, 'indent'
end
@@ -198,8 +190,8 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
assert_equal "#{'-' * 78}\n", @to.res.join
end
- def accept_verbatim
- assert_equal " hi\n world\n\n", @to.res.join
+ def accept_verbatim # FormatterTestCase doesn't set indent for ToAnsi
+ assert_equal " hi\n world\n\n", @to.res.join
end
def end_accepting
@@ -214,135 +206,232 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
assert_empty @to.list_width
end
- def accept_heading_1
+ def test_accept_heading_1
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(1, 'Hello')
+
assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_heading_2
+ def test_accept_heading_2
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(2, 'Hello')
+
assert_equal "== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_heading_3
+ def test_accept_heading_3
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(3, 'Hello')
+
assert_equal "=== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_heading_4
+ def test_accept_heading_4
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(4, 'Hello')
+
assert_equal "==== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_heading_indent
+ def test_accept_heading_indent
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_heading @RM::Heading.new(1, 'Hello')
+
assert_equal " = H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_heading_b
+ def test_accept_heading_b
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_heading @RM::Heading.new(1, '*Hello*')
+
+ assert_equal " = H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_heading_suppressed_crossref
+ def test_accept_heading_suppressed_crossref
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(1, '\\Hello')
+
assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
end
- def accept_list_item_start_note_2
- assert_equal "teletype:\n teletype description\n\n", @to.res.join
- end
+ def test_accept_list_item_start_note_2
+ list = @RM::List.new(:NOTE,
+ @RM::ListItem.new('<tt>teletype</tt>',
+ @RM::Paragraph.new('teletype description')))
- def accept_list_item_start_note_multi_description
- assert_equal "label:\n description one\n\n description two\n\n",
- @to.res.join
- end
+ @to.start_accepting
- def accept_list_item_start_note_multi_label
- assert_equal "one\ntwo:\n two headers\n\n", @to.res.join
- end
+ list.accept @to
- def accept_paragraph_b
- skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "reg b\bbo\bol\bld\bd \b w\bwo\bor\brd\bds\bs reg\n",
- @to.end_accepting
- end
+ expected = "teletype:\n teletype description\n\n"
- def accept_paragraph_br
- skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "one\ntwo\n", @to.end_accepting
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_break
+ def test_accept_paragraph_b
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "hello\nworld\n",
- @to.end_accepting
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('reg <b>bold words</b> reg')
+
+ expected = "reg b\bbo\bol\bld\bd \b w\bwo\bor\brd\bds\bs reg\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_i
+ def test_accept_paragraph_i
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc_\b _\bw_\bo_\br_\bd_\bs reg\n",
- @to.end_accepting
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('reg <em>italic words</em> reg')
+
+ expected = "reg _\bi_\bt_\ba_\bl_\bi_\bc_\b _\bw_\bo_\br_\bd_\bs reg\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_indent
+ def test_accept_paragraph_indent
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_paragraph @RM::Paragraph.new('words ' * 30)
+
expected = <<-EXPECTED
words words words words words words words words words words words words
words words words words words words words words words words words words
- words words words words words words
+ words words words words words words
EXPECTED
assert_equal expected, @to.end_accepting
end
- def accept_paragraph_plus
- assert_equal "reg teletype reg\n", @to.end_accepting
+ def test_accept_paragraph_plus
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular +teletype+ regular')
+
+ expected = "regular teletype regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_star
+ def test_accept_paragraph_star
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "reg b\bbo\bol\bld\bd reg\n", @to.end_accepting
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular *bold* regular')
+
+ expected = "regular b\bbo\bol\bld\bd regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_underscore
+ def test_accept_paragraph_underscore
skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
- assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc reg\n", @to.end_accepting
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular _italic_ regular')
+
+ expected = "regular _\bi_\bt_\ba_\bl_\bi_\bc regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_wrap
+ def test_accept_paragraph_wrap
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('words ' * 30)
+
expected = <<-EXPECTED
words words words words words words words words words words words words words
words words words words words words words words words words words words words
-words words words words
+words words words words
EXPECTED
assert_equal expected, @to.end_accepting
end
- def accept_rule_indent
+ def test_accept_rule_indent
+ @to.start_accepting
+ @to.indent = 3
+
+ @to.accept_rule @RM::Rule.new(1)
+
assert_equal " #{'-' * 75}\n", @to.end_accepting
end
- def accept_verbatim_indent
+ def test_accept_verbatim_indent
+ @to.start_accepting
+
+ @to.indent = 2
+
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
+
assert_equal " hi\n world\n\n", @to.end_accepting
end
- def accept_verbatim_big_indent
+ def test_accept_verbatim_big_indent
+ @to.start_accepting
+
+ @to.indent = 2
+
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
+
assert_equal " hi\n world\n\n", @to.end_accepting
end
- def list_nested
+ def test_attributes
+ assert_equal 'Dog', @to.attributes("\\Dog")
+ end
+
+ def test_list_nested
+ doc = @RM::Document.new(
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1'),
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1.1')))),
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l2'))))
+
+ output = doc.accept @to
+
expected = <<-EXPECTED
* l1
* l1.1
* l2
EXPECTED
- assert_equal expected, @to.end_accepting
- end
+ assert_equal expected, output
+ end
+
+ def test_list_verbatim # HACK overblown
+ doc = @RM::Document.new(
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('list', 'stuff'),
+ @RM::BlankLine.new(),
+ @RM::Verbatim.new(' ', '*', ' ', 'list', "\n",
+ ' ', 'with', "\n",
+ "\n",
+ ' ', 'second', "\n",
+ "\n",
+ ' ', '1.', ' ', 'indented', "\n",
+ ' ', '2.', ' ', 'numbered', "\n",
+ "\n",
+ ' ', 'third', "\n",
+ "\n",
+ ' ', '*', ' ', 'second', "\n"))))
+
+ output = doc.accept @to
- def list_verbatim
- expected = <<-EXPECTED # HACK overblown
+ expected = <<-EXPECTED
* list stuff
* list
@@ -359,7 +448,7 @@ words words words words
EXPECTED
- assert_equal expected, @to.end_accepting
+ assert_equal expected, output
end
end
diff --git a/test/rdoc/test_rdoc_markup_to_html.rb b/test/rdoc/test_rdoc_markup_to_html.rb
index ebd2fe7dd2..f6014391c8 100644
--- a/test/rdoc/test_rdoc_markup_to_html.rb
+++ b/test/rdoc/test_rdoc_markup_to_html.rb
@@ -1,4 +1,7 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'rdoc/markup/formatter_test_case'
+require 'rdoc/markup/to_html'
+require 'minitest/autorun'
class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
@@ -7,113 +10,70 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
def setup
super
- @to = RDoc::Markup::ToHtml.new @options
+ @to = RDoc::Markup::ToHtml.new
end
- def accept_blank_line
- assert_empty @to.res.join
- end
-
- def accept_block_quote
- assert_equal "\n<blockquote>\n<p>quote</p>\n</blockquote>\n", @to.res.join
- end
-
- def accept_document
- assert_equal "\n<p>hello</p>\n", @to.res.join
- end
-
- def accept_heading
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
- expected = "\n<h5 id=\"label-Hello\">Hello#{links}</h5>\n"
-
- assert_equal expected, @to.res.join
- end
+ def test_class_gen_relative_url
+ def gen(from, to)
+ RDoc::Markup::ToHtml.gen_relative_url from, to
+ end
- def accept_heading_1
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
+ assert_equal 'a.html', gen('a.html', 'a.html')
+ assert_equal 'b.html', gen('a.html', 'b.html')
- assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
+ assert_equal 'd.html', gen('a/c.html', 'a/d.html')
+ assert_equal '../a.html', gen('a/c.html', 'a.html')
+ assert_equal 'a/c.html', gen('a.html', 'a/c.html')
end
- def accept_heading_2
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h2 id=\"label-Hello\">Hello#{links}</h2>\n", @to.res.join
- end
-
- def accept_heading_3
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h3 id=\"label-Hello\">Hello#{links}</h3>\n", @to.res.join
- end
-
- def accept_heading_4
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h4 id=\"label-Hello\">Hello#{links}</h4>\n", @to.res.join
- end
-
- def accept_heading_b
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
- inner = "<strong>Hello</strong>"
-
- assert_equal "\n<h1 id=\"label-Hello\">#{inner}#{links}</h1>\n",
- @to.res.join
+ def accept_blank_line
+ assert_empty @to.res.join
end
- def accept_heading_suppressed_crossref
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n", @to.res.join
+ def accept_heading
+ assert_equal "<h5>Hello</h5>\n", @to.res.join
end
def accept_list_end_bullet
assert_equal [], @to.list
assert_equal [], @to.in_list_entry
- assert_equal "<ul></ul>\n", @to.res.join
+ assert_equal "<ul>\n</ul>\n", @to.res.join
end
def accept_list_end_label
assert_equal [], @to.list
assert_equal [], @to.in_list_entry
- assert_equal "<dl class=\"rdoc-list label-list\"></dl>\n", @to.res.join
+ assert_equal "<dl>\n</dl>\n", @to.res.join
end
def accept_list_end_lalpha
assert_equal [], @to.list
assert_equal [], @to.in_list_entry
- assert_equal "<ol style=\"list-style-type: lower-alpha\"></ol>\n", @to.res.join
+ assert_equal "<ol style=\"display: lower-alpha\">\n</ol>\n", @to.res.join
end
def accept_list_end_number
assert_equal [], @to.list
assert_equal [], @to.in_list_entry
- assert_equal "<ol></ol>\n", @to.res.join
+ assert_equal "<ol>\n</ol>\n", @to.res.join
end
def accept_list_end_note
assert_equal [], @to.list
assert_equal [], @to.in_list_entry
- assert_equal "<dl class=\"rdoc-list note-list\"></dl>\n", @to.res.join
+ assert_equal "<table>\n</table>\n", @to.res.join
end
def accept_list_end_ualpha
assert_equal [], @to.list
assert_equal [], @to.in_list_entry
- assert_equal "<ol style=\"list-style-type: upper-alpha\"></ol>\n", @to.res.join
+ assert_equal "<ol style=\"display: upper-alpha\">\n</ol>\n", @to.res.join
end
def accept_list_item_end_bullet
@@ -129,7 +89,7 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
end
def accept_list_item_end_note
- assert_equal %w[</dd>], @to.in_list_entry
+ assert_equal %w[</td></tr>], @to.in_list_entry
end
def accept_list_item_end_number
@@ -141,138 +101,73 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
end
def accept_list_item_start_bullet
- assert_equal "<ul><li>", @to.res.join
+ assert_equal "<ul>\n<li>", @to.res.join
end
def accept_list_item_start_label
- assert_equal "<dl class=\"rdoc-list label-list\"><dt>cat\n<dd>", @to.res.join
+ assert_equal "<dl>\n<dt>cat</dt><dd>", @to.res.join
end
def accept_list_item_start_lalpha
- assert_equal "<ol style=\"list-style-type: lower-alpha\"><li>", @to.res.join
+ assert_equal "<ol style=\"display: lower-alpha\">\n<li>", @to.res.join
end
def accept_list_item_start_note
- assert_equal "<dl class=\"rdoc-list note-list\"><dt>cat\n<dd>",
- @to.res.join
- end
-
- def accept_list_item_start_note_2
- expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt><code>teletype</code>
-<dd>
-<p>teletype description</p>
-</dd></dl>
- EXPECTED
-
- assert_equal expected, @to.res.join
- end
-
- def accept_list_item_start_note_multi_description
- expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>label
-<dd>
-<p>description one</p>
-</dd><dd>
-<p>description two</p>
-</dd></dl>
- EXPECTED
-
- assert_equal expected, @to.res.join
- end
-
- def accept_list_item_start_note_multi_label
- expected = <<-EXPECTED
-<dl class="rdoc-list note-list"><dt>one
-<dt>two
-<dd>
-<p>two headers</p>
-</dd></dl>
- EXPECTED
-
- assert_equal expected, @to.res.join
+ assert_equal "<table>\n<tr><td valign=\"top\">cat</td><td>", @to.res.join
end
def accept_list_item_start_number
- assert_equal "<ol><li>", @to.res.join
+ assert_equal "<ol>\n<li>", @to.res.join
end
def accept_list_item_start_ualpha
- assert_equal "<ol style=\"list-style-type: upper-alpha\"><li>", @to.res.join
+ assert_equal "<ol style=\"display: upper-alpha\">\n<li>", @to.res.join
end
def accept_list_start_bullet
assert_equal [:BULLET], @to.list
assert_equal [false], @to.in_list_entry
- assert_equal "<ul>", @to.res.join
+ assert_equal "<ul>\n", @to.res.join
end
def accept_list_start_label
assert_equal [:LABEL], @to.list
assert_equal [false], @to.in_list_entry
- assert_equal '<dl class="rdoc-list label-list">', @to.res.join
+ assert_equal "<dl>\n", @to.res.join
end
def accept_list_start_lalpha
assert_equal [:LALPHA], @to.list
assert_equal [false], @to.in_list_entry
- assert_equal "<ol style=\"list-style-type: lower-alpha\">", @to.res.join
+ assert_equal "<ol style=\"display: lower-alpha\">\n", @to.res.join
end
def accept_list_start_note
assert_equal [:NOTE], @to.list
assert_equal [false], @to.in_list_entry
- assert_equal "<dl class=\"rdoc-list note-list\">", @to.res.join
+ assert_equal "<table>\n", @to.res.join
end
def accept_list_start_number
assert_equal [:NUMBER], @to.list
assert_equal [false], @to.in_list_entry
- assert_equal "<ol>", @to.res.join
+ assert_equal "<ol>\n", @to.res.join
end
def accept_list_start_ualpha
assert_equal [:UALPHA], @to.list
assert_equal [false], @to.in_list_entry
- assert_equal "<ol style=\"list-style-type: upper-alpha\">", @to.res.join
+ assert_equal "<ol style=\"display: upper-alpha\">\n", @to.res.join
end
def accept_paragraph
- assert_equal "\n<p>hi</p>\n", @to.res.join
- end
-
- def accept_paragraph_b
- assert_equal "\n<p>reg <strong>bold words</strong> reg</p>\n", @to.res.join
- end
-
- def accept_paragraph_br
- assert_equal "\n<p>one<br>two</p>\n", @to.res.join
- end
-
- def accept_paragraph_break
- assert_equal "\n<p>hello<br>\nworld</p>\n", @to.res.join
- end
-
- def accept_paragraph_i
- assert_equal "\n<p>reg <em>italic words</em> reg</p>\n", @to.res.join
- end
-
- def accept_paragraph_plus
- assert_equal "\n<p>reg <code>teletype</code> reg</p>\n", @to.res.join
- end
-
- def accept_paragraph_star
- assert_equal "\n<p>reg <strong>bold</strong> reg</p>\n", @to.res.join
- end
-
- def accept_paragraph_underscore
- assert_equal "\n<p>reg <em>italic</em> reg</p>\n", @to.res.join
+ assert_equal "<p>\nhi\n</p>\n", @to.res.join
end
def accept_raw
@@ -288,11 +183,11 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
end
def accept_rule
- assert_equal "<hr style=\"height: 4px\">\n", @to.res.join
+ assert_equal '<hr style="height: 4px"></hr>', @to.res.join
end
def accept_verbatim
- assert_equal "\n<pre>hi\n world</pre>\n", @to.res.join
+ assert_equal "<pre>\n hi\n world\n</pre>\n", @to.res.join
end
def end_accepting
@@ -305,266 +200,54 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
assert_equal [], @to.list
end
- def list_nested
- expected = <<-EXPECTED
-<ul><li>
-<p>l1</p>
-<ul><li>
-<p>l1.1</p>
-</li></ul>
-</li><li>
-<p>l2</p>
-</li></ul>
- EXPECTED
-
- assert_equal expected, @to.res.join
- end
-
- def list_verbatim
- expected = <<-EXPECTED
-<ul><li>
-<p>list stuff</p>
-
-<pre>* list
- with
-
- second
-
- 1. indented
- 2. numbered
-
- third
-
-* second</pre>
-</li></ul>
- EXPECTED
-
- assert_equal expected, @to.end_accepting
- end
-
- def test_accept_heading_7
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(7, 'Hello')
-
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h6 id=\"label-Hello\">Hello#{links}</h6>\n", @to.res.join
- end
-
- def test_accept_heading_aref_class
- @to.code_object = RDoc::NormalClass.new 'Foo'
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- links = '<span><a href="#label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h1 id=\"label-Hello\">Hello#{links}</h1>\n",
- @to.res.join
- end
-
- def test_accept_heading_aref_method
- @to.code_object = RDoc::AnyMethod.new nil, 'foo'
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- links = '<span><a href="#method-i-foo-label-Hello">&para;</a> ' +
- '<a href="#documentation">&uarr;</a></span>'
-
- assert_equal "\n<h1 id=\"method-i-foo-label-Hello\">Hello#{links}</h1>\n",
- @to.res.join
- end
-
- def test_accept_heading_pipe
- @options.pipe = true
-
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- assert_equal "\n<h1 id=\"label-Hello\">Hello</h1>\n", @to.res.join
- end
-
- def test_accept_verbatim_parseable
- verb = @RM::Verbatim.new("class C\n", "end\n")
-
- @to.start_accepting
- @to.accept_verbatim verb
-
- expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
- EXPECTED
-
- assert_equal expected, @to.res.join
- end
-
- def test_accept_verbatim_parseable_error
- verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
- @to.start_accepting
- @to.accept_verbatim verb
-
- inner = CGI.escapeHTML "a % 09 # => blah"
-
- expected = <<-EXPECTED
-
-<pre>#{inner}
-</pre>
- EXPECTED
-
- assert_equal expected, @to.res.join
- end
-
- def test_accept_verbatim_ruby
- verb = @RM::Verbatim.new("1 + 1\n")
- verb.format = :ruby
-
- @to.start_accepting
- @to.accept_verbatim verb
+ def test_list_verbatim
+ str = "* one\n verb1\n verb2\n* two\n"
expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-value">1</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>
+<ul>
+<li><p>
+one
+</p>
+<pre>
+ verb1
+ verb2
</pre>
+</li>
+<li><p>
+two
+</p>
+</li>
+</ul>
EXPECTED
- assert_equal expected, @to.res.join
- end
-
- def test_convert_string
- assert_equal '&lt;&gt;', @to.convert_string('<>')
- end
-
- def test_convert_HYPERLINK_irc
- result = @to.convert 'irc://irc.freenode.net/#ruby-lang'
-
- assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">irc.freenode.net/#ruby-lang</a></p>\n", result
- end
-
- def test_convert_RDOCLINK_label_label
- result = @to.convert 'rdoc-label:label-One'
-
- assert_equal "\n<p><a href=\"#label-One\">One</a></p>\n", result
- end
-
- def test_convert_RDOCLINK_label_foottext
- result = @to.convert 'rdoc-label:foottext-1'
-
- assert_equal "\n<p><a href=\"#foottext-1\">*1</a></p>\n", result
- end
-
- def test_convert_RDOCLINK_label_footmark
- result = @to.convert 'rdoc-label:footmark-1'
-
- assert_equal "\n<p><a href=\"#footmark-1\">^1</a></p>\n", result
- end
-
- def test_convert_RDOCLINK_ref
- result = @to.convert 'rdoc-ref:C'
-
- assert_equal "\n<p>C</p>\n", result
- end
-
- def test_convert_TIDYLINK_footnote
- result = @to.convert 'text{*1}[rdoc-label:foottext-1:footmark-1]'
-
- assert_equal "\n<p>text<a id=\"footmark-1\" href=\"#foottext-1\">*1</a></p>\n", result
- end
-
- def test_convert_TIDYLINK_rdoc_label
- result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
- assert_equal "\n<p><a href=\"#foottext-1\">foo</a></p>\n", result
- end
-
- def test_convert_TIDYLINK_irc
- result = @to.convert '{ruby-lang}[irc://irc.freenode.net/#ruby-lang]'
-
- assert_equal "\n<p><a href=\"irc://irc.freenode.net/#ruby-lang\">ruby-lang</a></p>\n", result
- end
-
- def test_gen_url
- assert_equal '<a href="example">example</a>',
- @to.gen_url('link:example', 'example')
- end
-
- def test_gen_url_rdoc_label
- assert_equal '<a href="#foottext-1">example</a>',
- @to.gen_url('rdoc-label:foottext-1', 'example')
- end
-
- def test_gen_url_rdoc_label_id
- assert_equal '<a id="footmark-1" href="#foottext-1">example</a>',
- @to.gen_url('rdoc-label:foottext-1:footmark-1', 'example')
- end
-
- def test_gen_url_image_url
- assert_equal '<img src="http://example.com/image.png" />', @to.gen_url('http://example.com/image.png', 'ignored')
- end
-
- def test_gen_url_ssl_image_url
- assert_equal '<img src="https://example.com/image.png" />', @to.gen_url('https://example.com/image.png', 'ignored')
- end
-
- def test_handle_special_HYPERLINK_link
- special = RDoc::Markup::Special.new 0, 'link:README.txt'
-
- link = @to.handle_special_HYPERLINK special
-
- assert_equal '<a href="README.txt">README.txt</a>', link
- end
-
- def test_handle_special_HYPERLINK_irc
- special = RDoc::Markup::Special.new 0, 'irc://irc.freenode.net/#ruby-lang'
-
- link = @to.handle_special_HYPERLINK special
-
- assert_equal '<a href="irc://irc.freenode.net/#ruby-lang">irc.freenode.net/#ruby-lang</a>', link
+ assert_equal expected, @m.convert(str, @to)
end
- def test_list_verbatim_2
- str = "* one\n verb1\n verb2\n* two\n"
+ def test_tt_formatting
+ assert_equal "<p>\n<tt>--</tt> &#8212; <tt>cats'</tt> cats&#8217;\n</p>\n",
+ util_format("<tt>--</tt> -- <tt>cats'</tt> cats'")
- expected = <<-EXPECTED
-<ul><li>
-<p>one</p>
-
-<pre>verb1
-verb2</pre>
-</li><li>
-<p>two</p>
-</li></ul>
- EXPECTED
-
- assert_equal expected, @m.convert(str, @to)
+ assert_equal "<p>\n<b>&#8212;</b>\n</p>\n", util_format("<b>--</b>")
end
- def test_parseable_eh
- assert @to.parseable?('def x() end'), 'def'
- assert @to.parseable?('class C end'), 'class'
- assert @to.parseable?('module M end'), 'module'
- assert @to.parseable?('a # => blah'), '=>'
- assert @to.parseable?('x { |y| ... }'), '{ |x|'
- assert @to.parseable?('x do |y| ... end'), 'do |x|'
- refute @to.parseable?('* 1'), '* 1'
- refute @to.parseable?('# only a comment'), '# only a comment'
- refute @to.parseable?('<% require "foo" %>'), 'ERB'
- refute @to.parseable?('class="foo"'), 'HTML class'
+ def test_convert_string_fancy
+ #
+ # The HTML typesetting is broken in a number of ways, but I have fixed
+ # the most glaring issues for single and double quotes. Note that
+ # "strange" symbols (periods or dashes) need to be at the end of the
+ # test case strings in order to suppress cross-references.
+ #
+ assert_equal "<p>\n&#8220;cats&#8221;.\n</p>\n", util_format("\"cats\".")
+ assert_equal "<p>\n&#8216;cats&#8217;.\n</p>\n", util_format("\'cats\'.")
+ assert_equal "<p>\ncat&#8217;s-\n</p>\n", util_format("cat\'s-")
end
- def test_to_html
- assert_equal "\n<p><code>--</code></p>\n", util_format("<tt>--</tt>")
+ def util_paragraph(text)
+ RDoc::Markup::Paragraph.new text
end
- def util_format text
- paragraph = RDoc::Markup::Paragraph.new text
+ def util_format(text)
+ paragraph = util_paragraph text
@to.start_accepting
@to.accept_paragraph paragraph
diff --git a/test/rdoc/test_rdoc_markup_to_html_crossref.rb b/test/rdoc/test_rdoc_markup_to_html_crossref.rb
index 27a60120f4..67dfc0cbc9 100644
--- a/test/rdoc/test_rdoc_markup_to_html_crossref.rb
+++ b/test/rdoc/test_rdoc_markup_to_html_crossref.rb
@@ -1,3 +1,8 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/rdoc'
+require 'rdoc/code_objects'
+require 'rdoc/markup/to_html_crossref'
require File.expand_path '../xref_test_case', __FILE__
class TestRDocMarkupToHtmlCrossref < XrefTestCase
@@ -5,213 +10,152 @@ class TestRDocMarkupToHtmlCrossref < XrefTestCase
def setup
super
- @options.hyperlink_all = true
-
- @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
- end
-
- def test_convert_CROSSREF
- result = @to.convert 'C1'
-
- assert_equal para("<a href=\"C1.html\">C1</a>"), result
- end
-
- def test_convert_CROSSREF_label
- result = @to.convert 'C1@foo'
- assert_equal para("<a href=\"C1.html#label-foo\">foo at C1</a>"), result
-
- result = @to.convert 'C1#m@foo'
- assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at C1#m</a>"),
- result
+ @xref = RDoc::Markup::ToHtmlCrossref.new 'index.html', @c1, true
end
- def test_convert_CROSSREF_label_period
- result = @to.convert 'C1@foo.'
- assert_equal para("<a href=\"C1.html#label-foo\">foo at C1</a>."), result
+ def assert_ref(path, ref)
+ assert_equal "<p>\n<a href=\"#{path}\">#{ref}</a>\n</p>\n",
+ @xref.convert(ref)
end
- def test_convert_CROSSREF_label_space
- result = @to.convert 'C1@foo+bar'
- assert_equal para("<a href=\"C1.html#label-foo+bar\">foo bar at C1</a>"),
- result
- end
-
- def test_convert_RDOCLINK_rdoc_ref
- result = @to.convert 'rdoc-ref:C1'
-
- assert_equal para("<a href=\"C1.html\">C1</a>"), result
+ def refute_ref(body, ref)
+ assert_equal "<p>\n#{body}\n</p>\n", @xref.convert(ref)
end
- def test_convert_RDOCLINK_rdoc_ref_method
- result = @to.convert 'rdoc-ref:C1#m'
+ def test_handle_special_CROSSREF_C2
+ @xref = RDoc::Markup::ToHtmlCrossref.new 'classes/C2.html', @c2, true
- assert_equal para("<a href=\"C1.html#method-i-m\">#m</a>"), result
- end
+ refute_ref '#m', '#m'
- def test_convert_RDOCLINK_rdoc_ref_method_label
- result = @to.convert 'rdoc-ref:C1#m@foo'
+ assert_ref '../C1.html#method-c-m', 'C1::m'
+ assert_ref '../C2/C3.html', 'C2::C3'
+ assert_ref '../C2/C3.html#method-i-m', 'C2::C3#m'
+ assert_ref '../C2/C3/H1.html', 'C3::H1'
+ assert_ref '../C4.html', 'C4'
- assert_equal para("<a href=\"C1.html#method-i-m-label-foo\">foo at C1#m</a>"),
- result, 'rdoc-ref:C1#m@foo'
+ assert_ref '../C3/H2.html', 'C3::H2'
+ refute_ref 'H1', 'H1'
end
- def test_convert_RDOCLINK_rdoc_ref_method_percent
- m = @c1.add_method RDoc::AnyMethod.new nil, '%'
- m.singleton = false
+ def test_handle_special_CROSSREF_C2_C3
+ @xref = RDoc::Markup::ToHtmlCrossref.new 'classes/C2/C3.html', @c2_c3, true
- result = @to.convert 'rdoc-ref:C1#%'
+ assert_ref '../../C2/C3.html#method-i-m', '#m'
- assert_equal para("<a href=\"C1.html#method-i-25\">#%</a>"), result
+ assert_ref '../../C2/C3.html', 'C3'
+ assert_ref '../../C2/C3.html#method-i-m', 'C3#m'
- m.singleton = true
+ assert_ref '../../C2/C3/H1.html', 'H1'
+ assert_ref '../../C2/C3/H1.html', 'C3::H1'
- result = @to.convert 'rdoc-ref:C1::%'
+ assert_ref '../../C4.html', 'C4'
- assert_equal para("<a href=\"C1.html#method-c-25\">::%</a>"), result
+ assert_ref '../../C3/H2.html', 'C3::H2'
end
- def test_convert_RDOCLINK_rdoc_ref_method_percent_label
- m = @c1.add_method RDoc::AnyMethod.new nil, '%'
- m.singleton = false
+ def test_handle_special_CROSSREF_C3
+ @xref = RDoc::Markup::ToHtmlCrossref.new 'classes/C3.html', @c3, true
- result = @to.convert 'rdoc-ref:C1#%@f'
+ assert_ref '../C3.html', 'C3'
- assert_equal para("<a href=\"C1.html#method-i-25-label-f\">f at C1#%</a>"),
- result
+ refute_ref '#m', '#m'
+ refute_ref 'C3#m', 'C3#m'
- m.singleton = true
+ assert_ref '../C3/H1.html', 'H1'
- result = @to.convert 'rdoc-ref:C1::%@f'
+ assert_ref '../C3/H1.html', 'C3::H1'
+ assert_ref '../C3/H2.html', 'C3::H2'
- assert_equal para("<a href=\"C1.html#method-c-25-label-f\">f at C1::%</a>"),
- result
+ assert_ref '../C4.html', 'C4'
end
- def test_convert_RDOCLINK_rdoc_ref_label
- result = @to.convert 'rdoc-ref:C1@foo'
+ def test_handle_special_CROSSREF_C4
+ @xref = RDoc::Markup::ToHtmlCrossref.new 'classes/C4.html', @c4, true
- assert_equal para("<a href=\"C1.html#label-foo\">foo at C1</a>"), result,
- 'rdoc-ref:C1@foo'
+ # C4 ref inside a C4 containing a C4 should resolve to the contained class
+ assert_ref '../C4/C4.html', 'C4'
end
- def test_gen_url
- assert_equal '<a href="C1.html">Some class</a>',
- @to.gen_url('rdoc-ref:C1', 'Some class')
+ def test_handle_special_CROSSREF_C4_C4
+ @xref = RDoc::Markup::ToHtmlCrossref.new 'classes/C4/C4.html', @c4_c4, true
- assert_equal '<a href="http://example">HTTP example</a>',
- @to.gen_url('http://example', 'HTTP example')
+ # A C4 reference inside a C4 class contained within a C4 class should
+ # resolve to the inner C4 class.
+ assert_ref '../../C4/C4.html', 'C4'
end
- def test_handle_special_CROSSREF
- assert_equal "<a href=\"C2/C3.html\">C2::C3</a>", SPECIAL('C2::C3')
- end
+ def test_handle_special_CROSSREF_class
+ assert_ref 'C1.html', 'C1'
+ refute_ref 'H1', 'H1'
- def test_handle_special_CROSSREF_label
- assert_equal "<a href=\"C1.html#method-i-m-label-foo\">foo at C1#m</a>",
- SPECIAL('C1#m@foo')
- end
+ assert_ref 'C2.html', 'C2'
+ assert_ref 'C2/C3.html', 'C2::C3'
+ assert_ref 'C2/C3/H1.html', 'C2::C3::H1'
- def test_handle_special_CROSSREF_show_hash_false
- @to.show_hash = false
+ assert_ref 'C3.html', '::C3'
+ assert_ref 'C3/H1.html', '::C3::H1'
- assert_equal "<a href=\"C1.html#method-i-m\">m</a>",
- SPECIAL('#m')
+ assert_ref 'C4/C4.html', 'C4::C4'
end
- def test_handle_special_HYPERLINK_rdoc
- readme = @store.add_file 'README.txt'
- readme.parser = RDoc::Parser::Simple
-
- @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
-
- link = @to.handle_special_HYPERLINK hyper 'C2::C3'
-
- assert_equal '<a href="C2/C3.html">C2::C3</a>', link
-
- link = @to.handle_special_HYPERLINK hyper 'C4'
-
- assert_equal '<a href="C4.html">C4</a>', link
-
- link = @to.handle_special_HYPERLINK hyper 'README.txt'
-
- assert_equal '<a href="README_txt.html">README.txt</a>', link
+ def test_handle_special_CROSSREF_file
+ assert_ref 'xref_data_rb.html', 'xref_data.rb'
end
- def test_handle_special_TIDYLINK_rdoc
- readme = @store.add_file 'README.txt'
- readme.parser = RDoc::Parser::Simple
+ def test_handle_special_CROSSREF_method
+ refute_ref 'm', 'm'
+ assert_ref 'C1.html#method-i-m', '#m'
+ assert_ref 'C1.html#method-c-m', '::m'
- @to = RDoc::Markup::ToHtmlCrossref.new @options, 'C2.html', @c2
+ assert_ref 'C1.html#method-i-m', 'C1#m'
+ assert_ref 'C1.html#method-i-m', 'C1.m'
+ assert_ref 'C1.html#method-c-m', 'C1::m'
- link = @to.handle_special_TIDYLINK tidy 'C2::C3'
+ assert_ref 'C1.html#method-i-m', 'C1#m'
+ assert_ref 'C1.html#method-i-m', 'C1#m()'
+ assert_ref 'C1.html#method-i-m', 'C1#m(*)'
- assert_equal '<a href="C2/C3.html">tidy</a>', link
+ assert_ref 'C1.html#method-i-m', 'C1.m'
+ assert_ref 'C1.html#method-i-m', 'C1.m()'
+ assert_ref 'C1.html#method-i-m', 'C1.m(*)'
- link = @to.handle_special_TIDYLINK tidy 'C4'
+ assert_ref 'C1.html#method-c-m', 'C1::m'
+ assert_ref 'C1.html#method-c-m', 'C1::m()'
+ assert_ref 'C1.html#method-c-m', 'C1::m(*)'
- assert_equal '<a href="C4.html">tidy</a>', link
+ assert_ref 'C2/C3.html#method-i-m', 'C2::C3#m'
- link = @to.handle_special_TIDYLINK tidy 'C1#m'
+ assert_ref 'C2/C3.html#method-i-m', 'C2::C3.m'
- assert_equal '<a href="C1.html#method-i-m">tidy</a>', link
+ assert_ref 'C2/C3/H1.html#method-i-m%3F', 'C2::C3::H1#m?'
- link = @to.handle_special_TIDYLINK tidy 'README.txt'
-
- assert_equal '<a href="README_txt.html">tidy</a>', link
- end
-
- def test_handle_special_TIDYLINK_label
- link = @to.handle_special_TIDYLINK tidy 'C1#m@foo'
-
- assert_equal "<a href=\"C1.html#method-i-m-label-foo\">tidy</a>",
- link, 'C1#m@foo'
- end
-
- def test_to_html_CROSSREF_email
- @options.hyperlink_all = false
-
- @to = RDoc::Markup::ToHtmlCrossref.new @options, 'index.html', @c1
-
- result = @to.to_html 'first.last@example.com'
-
- assert_equal 'first.last@example.com', result
+ assert_ref 'C2/C3.html#method-i-m', '::C2::C3#m'
+ assert_ref 'C2/C3.html#method-i-m', '::C2::C3#m()'
+ assert_ref 'C2/C3.html#method-i-m', '::C2::C3#m(*)'
end
- def test_to_html_CROSSREF_email_hyperlink_all
- result = @to.to_html 'first.last@example.com'
+ def test_handle_special_CROSSREF_no_ref
+ assert_equal '', @xref.convert('')
- assert_equal 'first.last@example.com', result
- end
+ refute_ref 'bogus', 'bogus'
+ refute_ref 'bogus', '\bogus'
+ refute_ref '\bogus', '\\\bogus'
- def test_link
- assert_equal 'n', @to.link('n', 'n')
+ refute_ref '#n', '\#n'
+ refute_ref '#n()', '\#n()'
+ refute_ref '#n(*)', '\#n(*)'
- assert_equal '<a href="C1.html#method-c-m">::m</a>', @to.link('m', 'm')
- end
-
- def test_link_class_method_full
- assert_equal '<a href="Parent.html#method-c-m">Parent.m</a>',
- @to.link('Parent::m', 'Parent::m')
- end
-
- def para text
- "\n<p>#{text}</p>\n"
- end
-
- def SPECIAL text
- @to.handle_special_CROSSREF special text
- end
-
- def hyper reference
- RDoc::Markup::Special.new 0, "rdoc-ref:#{reference}"
- end
+ refute_ref 'C1', '\C1'
+ refute_ref '::C3', '\::C3'
- def special text
- RDoc::Markup::Special.new 0, text
+ refute_ref '::C3::H1#n', '::C3::H1#n'
+ refute_ref '::C3::H1#n(*)', '::C3::H1#n(*)'
+ refute_ref '::C3::H1#n', '\::C3::H1#n'
end
- def tidy reference
- RDoc::Markup::Special.new 0, "{tidy}[rdoc-ref:#{reference}]"
+ def test_handle_special_CROSSREF_special
+ assert_equal "<p>\n<a href=\"C2/C3.html\">C2::C3</a>;method(*)\n</p>\n",
+ @xref.convert('C2::C3;method(*)')
end
end
diff --git a/test/rdoc/test_rdoc_markup_to_html_snippet.rb b/test/rdoc/test_rdoc_markup_to_html_snippet.rb
deleted file mode 100644
index 065b2edbc8..0000000000
--- a/test/rdoc/test_rdoc_markup_to_html_snippet.rb
+++ /dev/null
@@ -1,710 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupToHtmlSnippet < RDoc::Markup::FormatterTestCase
-
- add_visitor_tests
-
- def setup
- super
-
- @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 100
- @ellipsis = @to.to_html '...'
- end
-
- def accept_blank_line
- assert_empty @to.res.join
- end
-
- def accept_block_quote
- assert_equal "\n<blockquote><p>quote\n</blockquote>\n", @to.res.join
-
- assert_equal 5, @to.characters
- end
-
- def accept_document
- assert_equal "<p>hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading_1
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading_2
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading_3
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading_4
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading_b
- assert_equal "<p><strong>Hello</strong>\n",
- @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_heading_suppressed_crossref
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def accept_list_end_bullet
- assert_equal [], @to.list
- assert_equal [], @to.in_list_entry
-
- assert_equal "\n", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_end_label
- assert_equal [], @to.list
- assert_equal [], @to.in_list_entry
-
- assert_equal "\n", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_end_lalpha
- assert_equal [], @to.list
- assert_equal [], @to.in_list_entry
-
- assert_equal "\n", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_end_number
- assert_equal [], @to.list
- assert_equal [], @to.in_list_entry
-
- assert_equal "\n", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_end_note
- assert_equal [], @to.list
- assert_equal [], @to.in_list_entry
-
- assert_equal "\n", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_end_ualpha
- assert_equal [], @to.list
- assert_equal [], @to.in_list_entry
-
- assert_equal "\n", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_end_bullet
- assert_equal [''], @to.in_list_entry
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_end_label
- assert_equal [''], @to.in_list_entry
- assert_equal 4, @to.characters
- end
-
- def accept_list_item_end_lalpha
- assert_equal [''], @to.in_list_entry
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_end_note
- assert_equal [''], @to.in_list_entry
- assert_equal 4, @to.characters
- end
-
- def accept_list_item_end_number
- assert_equal [''], @to.in_list_entry
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_end_ualpha
- assert_equal [''], @to.in_list_entry
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_start_bullet
- assert_equal "<p>", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_start_label
- assert_equal "<p>cat &mdash; ", @to.res.join
- assert_equal 4, @to.characters
- end
-
- def accept_list_item_start_lalpha
- assert_equal "<p>", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_start_note
- assert_equal "<p>cat &mdash; ",
- @to.res.join
- assert_equal 4, @to.characters
- end
-
- def accept_list_item_start_note_2
- expected = <<-EXPECTED
-<p><code>teletype</code> &mdash; teletype description
-
- EXPECTED
-
- assert_equal expected, @to.res.join
- assert_equal 29, @to.characters
- end
-
- def accept_list_item_start_note_multi_description
- expected = <<-EXPECTED
-<p>label &mdash; description one
-<p>description two
-
- EXPECTED
-
- assert_equal expected, @to.res.join
- assert_equal 37, @to.characters
- end
-
- def accept_list_item_start_note_multi_label
- expected = <<-EXPECTED
-<p>one, two &mdash; two headers
-
- EXPECTED
-
- assert_equal expected, @to.res.join
- assert_equal 18, @to.characters
- end
-
- def accept_list_item_start_number
- assert_equal "<p>", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_item_start_ualpha
- assert_equal "<p>", @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_start_bullet
- assert_equal [:BULLET], @to.list
- assert_equal [''], @to.in_list_entry
-
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_start_label
- assert_equal [:LABEL], @to.list
- assert_equal [''], @to.in_list_entry
-
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_start_lalpha
- assert_equal [:LALPHA], @to.list
- assert_equal [''], @to.in_list_entry
-
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_start_note
- assert_equal [:NOTE], @to.list
- assert_equal [''], @to.in_list_entry
-
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_start_number
- assert_equal [:NUMBER], @to.list
- assert_equal [''], @to.in_list_entry
-
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_list_start_ualpha
- assert_equal [:UALPHA], @to.list
- assert_equal [''], @to.in_list_entry
-
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_paragraph
- assert_equal "<p>hi\n", @to.res.join
-
- assert_equal 2, @to.characters
- end
-
- def accept_paragraph_b
- assert_equal "<p>reg <strong>bold words</strong> reg\n", @to.res.join
-
- assert_equal 18, @to.characters
- end
-
- def accept_paragraph_br
- assert_equal "<p>one<br>two\n", @to.res.join
-
- assert_equal 6, @to.characters
- end
-
- def accept_paragraph_break
- assert_equal "<p>hello<br>\nworld\n", @to.res.join
-
- assert_equal 11, @to.characters
- end
-
- def accept_paragraph_i
- assert_equal "<p>reg <em>italic words</em> reg\n", @to.res.join
-
- assert_equal 20, @to.characters
- end
-
- def accept_paragraph_plus
- assert_equal "<p>reg <code>teletype</code> reg\n", @to.res.join
-
- assert_equal 16, @to.characters
- end
-
- def accept_paragraph_star
- assert_equal "<p>reg <strong>bold</strong> reg\n", @to.res.join
-
- assert_equal 12, @to.characters
- end
-
- def accept_paragraph_underscore
- assert_equal "<p>reg <em>italic</em> reg\n", @to.res.join
-
- assert_equal 14, @to.characters
- end
-
- def accept_raw
- assert_equal '', @to.res.join
- assert_equal 0, @to.characters
- end
-
- def accept_rule
- assert_empty @to.res
- assert_equal 0, @to.characters
- end
-
- def accept_verbatim
- assert_equal "\n<pre>hi\n world</pre>\n", @to.res.join
- assert_equal 10, @to.characters
- end
-
- def end_accepting
- assert_equal 'hi', @to.res.join
- end
-
- def start_accepting
- assert_equal [], @to.res
- assert_equal [], @to.in_list_entry
- assert_equal [], @to.list
- assert_equal 0, @to.characters
- end
-
- def list_nested
- expected = <<-EXPECTED
-<p>l1
-<p>l1.1
-
-<p>l2
-
- EXPECTED
-
- assert_equal expected, @to.res.join
- assert_equal 8, @to.characters
- end
-
- def list_verbatim
- expected = <<-EXPECTED
-<p>list stuff
-
-<pre>* list
- with
-
- second
-
- 1. indented
- 2. numbered
-
- third
-
-* second</pre>
-
- EXPECTED
-
- assert_equal expected, @to.end_accepting
- assert_equal 81, @to.characters
- end
-
- def test_accept_heading_7
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(7, 'Hello')
-
- assert_equal "<p>Hello\n", @to.res.join
- assert_equal 5, @to.characters
- end
-
- def test_accept_heading_aref_class
- @to.code_object = RDoc::NormalClass.new 'Foo'
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- assert_equal "<p>Hello\n",
- @to.res.join
- assert_equal 5, @to.characters
- end
-
- def test_accept_heading_aref_method
- @to.code_object = RDoc::AnyMethod.new nil, 'foo'
- @to.start_accepting
-
- @to.accept_heading @RM::Heading.new(1, 'Hello')
-
- assert_equal "<p>Hello\n",
- @to.res.join
- assert_equal 5, @to.characters
- end
-
- def test_accept_verbatim_ruby
- options = RDoc::Options.new
- rdoc = RDoc::RDoc.new
- rdoc.options = options
- RDoc::RDoc.current = rdoc
-
- verb = @RM::Verbatim.new("class C\n", "end\n")
-
- @to.start_accepting
- @to.accept_verbatim verb
-
- expected = <<-EXPECTED
-
-<pre class="ruby"><span class="ruby-keyword">class</span> <span class="ruby-constant">C</span>
-<span class="ruby-keyword">end</span>
-</pre>
- EXPECTED
-
- assert_equal expected, @to.res.join
- assert_equal 11, @to.characters
- end
-
- def test_accept_verbatim_ruby_error
- options = RDoc::Options.new
- rdoc = RDoc::RDoc.new
- rdoc.options = options
- RDoc::RDoc.current = rdoc
-
- verb = @RM::Verbatim.new("a % 09 # => blah\n")
-
- @to.start_accepting
- @to.accept_verbatim verb
-
- inner = CGI.escapeHTML "a % 09 # => blah"
-
- expected = <<-EXPECTED
-
-<pre>#{inner}
-</pre>
- EXPECTED
-
- assert_equal expected, @to.res.join
- assert_equal 16, @to.characters
- end
-
- def test_add_paragraph
- @to = RDoc::Markup::ToHtmlSnippet.new @options, 0, 3
- assert_throws :done do
- @to.add_paragraph
- @to.add_paragraph
- @to.add_paragraph
- end
-
- assert_equal 3, @to.paragraphs
- end
-
- def test_convert_limit
- rdoc = <<-RDOC
-= Hello
-
-This is some text, it *will* be cut off after 100 characters and an ellipsis
-must follow
-
-So there you have it
- RDOC
-
- expected = <<-EXPECTED
-<p>Hello
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters
-and an ellipsis must follow
-<p>So there you #{@ellipsis}
- EXPECTED
-
- actual = @to.convert rdoc
-
- assert_equal expected, actual
- assert_equal 111, @to.characters, 'snippet character length'
- end
-
- def test_convert_limit_2
- rdoc = <<-RDOC
-Outputs formatted RI data for the class or method +name+.
-
-Returns true if +name+ was found, false if it was not an alternative could
-be guessed, raises an error if +name+ couldn't be guessed.
- RDOC
-
- expected = <<-EXPECTED
-<p>Outputs formatted RI data for the class or method <code>name</code>.
-<p>Returns true if <code>name</code> was found, false if it was #{@ellipsis}
- EXPECTED
-
- actual = @to.convert rdoc
-
- assert_equal expected, actual
- assert_equal 159, @to.characters, 'snippet character length'
- end
-
- def test_convert_limit_paragraphs
- @to = RDoc::Markup::ToHtmlSnippet.new @options, 100, 3
-
- rdoc = <<-RDOC
-= \RDoc - Ruby Documentation System
-
-* {RDoc Project Page}[https://github.com/rdoc/rdoc/]
-* {RDoc Documentation}[http://docs.seattlerb.org/rdoc]
-* {RDoc Bug Tracker}[https://github.com/rdoc/rdoc/issues]
-
-== DESCRIPTION:
-
-RDoc produces HTML and command-line documentation for Ruby projects. RDoc
-includes the +rdoc+ and +ri+ tools for generating and displaying online
-documentation.
-
-See RDoc for a description of RDoc's markup and basic use.
- RDOC
-
- expected = <<-EXPECTED
-<p>RDoc - Ruby Documentation System
-<p>RDoc Project Page
-<p>RDoc Documentation
- EXPECTED
-
- actual = @to.convert rdoc
-
- assert_equal expected, actual
- assert_equal 67, @to.characters
- end
-
- def test_convert_limit_in_tag
- @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
- rdoc = "* ab *c* d\n"
-
- expected = "<p>ab <strong>c</strong> #{@ellipsis}\n\n"
-
- actual = @to.convert rdoc
-
- assert_equal 4, @to.characters
- assert_equal expected, actual
- end
-
- def test_convert_limit_verbatim
- rdoc = <<-RDOC
-= Hello There
-
-This is some text, it *will* be cut off after 100 characters
-
- This one is cut off in this verbatim section
- RDOC
-
- expected = <<-EXPECTED
-<p>Hello There
-<p>This is some text, it <strong>will</strong> be cut off after 100 characters
-
-<pre>This one is cut off in this verbatim ...</pre>
- EXPECTED
-
- actual = @to.convert rdoc
-
- assert_equal expected, actual
- assert_equal 113, @to.characters
- end
-
- def test_convert_limit_verbatim_2
- rdoc = <<-RDOC
-Extracts the class, selector and method name parts from +name+ like
-Foo::Bar#baz.
-
-NOTE: Given Foo::Bar, Bar is considered a class even though it may be a
- method
- RDOC
-
- expected = <<-EXPECTED
-<p>Extracts the class, selector and method name parts from <code>name</code>
-like Foo::Bar#baz.
-<p>NOTE: Given Foo::Bar, #{@ellipsis}
- EXPECTED
-
- actual = @to.convert rdoc
-
- assert_equal expected, actual
- assert_equal 101, @to.characters
- end
-
- def test_convert_limit_verbatim_multiline
- rdoc = <<-RDOC
-Look for directives in a normal comment block:
-
- # :stopdoc:
- # Don't display comment from this point forward
-
-This routine modifies its +comment+ parameter.
- RDOC
-
- inner = CGI.escapeHTML "# Don't display comment from this point forward"
- expected = <<-EXPECTED
-<p>Look for directives in a normal comment block:
-
-<pre># :stopdoc:
-#{inner}</pre>
- EXPECTED
-
- actual = @to.convert rdoc
-
- assert_equal expected, actual
- assert_equal 105, @to.characters
- end
-
- def test_convert_limit_over
- @to = RDoc::Markup::ToHtmlSnippet.new @options, 4
- rdoc = "* text\n" * 2
-
- expected = "<p>text\n"
- expected.chomp!
- expected << " #{@ellipsis}\n"
-
- actual = @to.convert rdoc
-
- assert_equal 4, @to.characters
- assert_equal expected, actual
- end
-
- def test_convert_string
- assert_equal '&lt;&gt;', @to.convert_string('<>')
- end
-
- def test_convert_RDOCLINK_label_label
- result = @to.convert 'rdoc-label:label-One'
-
- assert_equal "<p>One\n", result
- assert_equal 3, @to.characters
- end
-
- def test_convert_RDOCLINK_label_foottext
- result = @to.convert 'rdoc-label:foottext-1'
-
- assert_equal "<p>*1\n", result
- assert_equal 2, @to.characters
- end
-
- def test_convert_RDOCLINK_label_footmark
- result = @to.convert 'rdoc-label:footmark-1'
-
- assert_equal "<p>^1\n", result
- assert_equal 2, @to.characters
- end
-
- def test_convert_RDOCLINK_ref
- result = @to.convert 'rdoc-ref:C'
-
- assert_equal "<p>C\n", result
- assert_equal 1, @to.characters
- end
-
- def test_convert_TIDYLINK_rdoc_label
- result = @to.convert '{foo}[rdoc-label:foottext-1]'
-
- assert_equal "<p>foo\n", result
- assert_equal 3, @to.characters
- end
-
- def test_handle_special_HYPERLINK_link
- special = RDoc::Markup::Special.new 0, 'link:README.txt'
-
- link = @to.handle_special_HYPERLINK special
-
- assert_equal 'README.txt', link
- end
-
- def test_list_verbatim_2
- str = "* one\n verb1\n verb2\n* two\n"
-
- expected = <<-EXPECTED
-<p>one
-
-<pre>verb1
-verb2</pre>
-<p>two
-
- EXPECTED
-
- assert_equal expected, @m.convert(str, @to)
- assert_equal 17, @to.characters
- end
-
- def test_on_tags
- on = RDoc::Markup::AttrChanger.new 2, 0
-
- @to.on_tags [], on
-
- assert_equal 2, @to.mask
- end
-
- def test_off_tags
- on = RDoc::Markup::AttrChanger.new 2, 0
- off = RDoc::Markup::AttrChanger.new 0, 2
-
- @to.on_tags [], on
- @to.off_tags [], off
-
- assert_equal 0, @to.mask
- end
-
- def test_to_html
- assert_equal "<p><code>--</code>\n", util_format("<tt>--</tt>")
- assert_equal 2, @to.characters
- end
-
- def util_format text
- paragraph = RDoc::Markup::Paragraph.new text
-
- @to.start_accepting
- @to.accept_paragraph paragraph
- @to.end_accepting
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb b/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
deleted file mode 100644
index 148edb1772..0000000000
--- a/test/rdoc/test_rdoc_markup_to_joined_paragraph.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupToJoinedParagraph < RDoc::TestCase
-
- def setup
- super
-
- @to = RDoc::Markup::ToJoinedParagraph.new
- end
-
- def test_accept_paragraph
- parsed = para('hello', ' ', 'world')
-
- @to.accept_paragraph parsed
-
- expected = para('hello world')
-
- assert_equal expected, parsed
- end
-
- def test_accept_paragraph_break
- parsed = para('hello', ' ', 'world', hard_break, 'everyone')
-
- @to.accept_paragraph parsed
-
- expected = para('hello world', hard_break, 'everyone')
-
- assert_equal expected, parsed
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_to_label.rb b/test/rdoc/test_rdoc_markup_to_label.rb
deleted file mode 100644
index 5fb358bee3..0000000000
--- a/test/rdoc/test_rdoc_markup_to_label.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupToLabel < RDoc::Markup::FormatterTestCase
-
- add_visitor_tests
-
- def setup
- super
-
- @to = RDoc::Markup::ToLabel.new
- end
-
- def empty
- assert_empty @to.res
- end
-
- def end_accepting
- assert_equal %w[hi], @to.res
- end
-
- alias accept_blank_line empty
- alias accept_block_quote empty
- alias accept_document empty
- alias accept_heading empty
- alias accept_heading_1 empty
- alias accept_heading_2 empty
- alias accept_heading_3 empty
- alias accept_heading_4 empty
- alias accept_heading_b empty
- alias accept_heading_suppressed_crossref empty
- alias accept_list_end_bullet empty
- alias accept_list_end_label empty
- alias accept_list_end_lalpha empty
- alias accept_list_end_note empty
- alias accept_list_end_number empty
- alias accept_list_end_ualpha empty
- alias accept_list_item_end_bullet empty
- alias accept_list_item_end_label empty
- alias accept_list_item_end_lalpha empty
- alias accept_list_item_end_note empty
- alias accept_list_item_end_number empty
- alias accept_list_item_end_ualpha empty
- alias accept_list_item_start_bullet empty
- alias accept_list_item_start_label empty
- alias accept_list_item_start_lalpha empty
- alias accept_list_item_start_note empty
- alias accept_list_item_start_note_2 empty
- alias accept_list_item_start_note_multi_description empty
- alias accept_list_item_start_note_multi_label empty
- alias accept_list_item_start_number empty
- alias accept_list_item_start_ualpha empty
- alias accept_list_start_bullet empty
- alias accept_list_start_label empty
- alias accept_list_start_lalpha empty
- alias accept_list_start_note empty
- alias accept_list_start_number empty
- alias accept_list_start_ualpha empty
- alias accept_paragraph empty
- alias accept_paragraph_b empty
- alias accept_paragraph_br empty
- alias accept_paragraph_break empty
- alias accept_paragraph_i empty
- alias accept_paragraph_plus empty
- alias accept_paragraph_star empty
- alias accept_paragraph_underscore empty
- alias accept_raw empty
- alias accept_rule empty
- alias accept_verbatim empty
- alias list_nested empty
- alias list_verbatim empty
- alias start_accepting empty
-
- def test_convert_bold
- assert_equal 'bold', @to.convert('<b>bold</b>')
- assert_equal 'bold', @to.convert('*bold*')
- end
-
- def test_convert_crossref
- assert_equal 'SomeClass', @to.convert('SomeClass')
- assert_equal 'SomeClass', @to.convert('\\SomeClass')
-
- assert_equal 'some_method', @to.convert('some_method')
- assert_equal 'some_method', @to.convert('\\some_method')
-
- assert_equal '%23some_method', @to.convert('#some_method')
- assert_equal '%23some_method', @to.convert('\\#some_method')
- end
-
- def test_convert_em
- assert_equal 'em', @to.convert('<em>em</em>')
- assert_equal 'em', @to.convert('*em*')
- end
-
- def test_convert_em_dash # for HTML conversion
- assert_equal '--', @to.convert('--')
- end
-
- def test_convert_escape
- assert_equal 'a+%3E+b', @to.convert('a > b')
- end
-
- def test_convert_tidylink
- assert_equal 'text', @to.convert('{text}[stuff]')
- assert_equal 'text', @to.convert('text[stuff]')
- end
-
- def test_convert_tt
- assert_equal 'tt', @to.convert('<tt>tt</tt>')
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_to_markdown.rb b/test/rdoc/test_rdoc_markup_to_markdown.rb
deleted file mode 100644
index 6d09ca62ea..0000000000
--- a/test/rdoc/test_rdoc_markup_to_markdown.rb
+++ /dev/null
@@ -1,383 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupToMarkdown < RDoc::Markup::TextFormatterTestCase
-
- add_visitor_tests
- add_text_tests
-
- def setup
- super
-
- @to = RDoc::Markup::ToMarkdown.new
- end
-
- def accept_blank_line
- assert_equal "\n", @to.res.join
- end
-
- def accept_block_quote
- assert_equal "> quote\n", @to.res.join
- end
-
- def accept_document
- assert_equal "hello\n", @to.res.join
- end
-
- def accept_heading
- assert_equal "##### Hello\n", @to.res.join
- end
-
- def accept_list_end_bullet
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_list_end_label
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_list_end_lalpha
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_list_end_note
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_list_end_number
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_list_end_ualpha
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_list_item_end_bullet
- assert_equal 0, @to.indent, 'indent'
- end
-
- def accept_list_item_end_label
- assert_equal "cat\n: ", @to.res.join
- assert_equal 0, @to.indent, 'indent'
- end
-
- def accept_list_item_end_lalpha
- assert_equal 0, @to.indent, 'indent'
- assert_equal 2, @to.list_index.last
- end
-
- def accept_list_item_end_note
- assert_equal "cat\n: ", @to.res.join
- assert_equal 0, @to.indent, 'indent'
- end
-
- def accept_list_item_end_number
- assert_equal 0, @to.indent, 'indent'
- assert_equal 2, @to.list_index.last
- end
-
- def accept_list_item_end_ualpha
- assert_equal 0, @to.indent, 'indent'
- assert_equal 2, @to.list_index.last
- end
-
- def accept_list_item_start_bullet
- assert_equal [""], @to.res
- assert_equal '* ', @to.prefix
- end
-
- def accept_list_item_start_label
- assert_equal [""], @to.res
- assert_equal "cat\n: ", @to.prefix
-
- assert_equal 4, @to.indent
- end
-
- def accept_list_item_start_lalpha
- assert_equal [""], @to.res
- assert_equal '1. ', @to.prefix
-
- assert_equal 1, @to.list_index.last
- assert_equal 4, @to.indent
- end
-
- def accept_list_item_start_note
- assert_equal [""], @to.res
- assert_equal "cat\n: ", @to.prefix
-
- assert_equal 4, @to.indent
- end
-
- def accept_list_item_start_number
- assert_equal [""], @to.res
- assert_equal '1. ', @to.prefix
-
- assert_equal 1, @to.list_index.last
- assert_equal 4, @to.indent
- end
-
- def accept_list_item_start_ualpha
- assert_equal [""], @to.res
- assert_equal '1. ', @to.prefix
-
- assert_equal 1, @to.list_index.last
- assert_equal 4, @to.indent
- end
-
- def accept_list_start_bullet
- assert_equal "", @to.res.join
- assert_equal [nil], @to.list_index
- assert_equal [:BULLET], @to.list_type
- assert_equal [4], @to.list_width
- end
-
- def accept_list_start_label
- assert_equal "", @to.res.join
- assert_equal [nil], @to.list_index
- assert_equal [:LABEL], @to.list_type
- assert_equal [4], @to.list_width
- end
-
- def accept_list_start_lalpha
- assert_equal "", @to.res.join
- assert_equal [1], @to.list_index
- assert_equal [:LALPHA], @to.list_type
- assert_equal [4], @to.list_width
- end
-
- def accept_list_start_note
- assert_equal "", @to.res.join
- assert_equal [nil], @to.list_index
- assert_equal [:NOTE], @to.list_type
- assert_equal [4], @to.list_width
- end
-
- def accept_list_start_number
- assert_equal "", @to.res.join
- assert_equal [1], @to.list_index
- assert_equal [:NUMBER], @to.list_type
- assert_equal [4], @to.list_width
- end
-
- def accept_list_start_ualpha
- assert_equal "", @to.res.join
- assert_equal [1], @to.list_index
- assert_equal [:UALPHA], @to.list_type
- assert_equal [4], @to.list_width
- end
-
- def accept_paragraph
- assert_equal "hi\n", @to.res.join
- end
-
- def accept_raw
- raw = <<-RAW.rstrip
-<table>
-<tr><th>Name<th>Count
-<tr><td>a<td>1
-<tr><td>b<td>2
-</table>
- RAW
-
- assert_equal raw, @to.res.join
- end
-
- def accept_rule
- assert_equal "---\n", @to.res.join
- end
-
- def accept_verbatim
- assert_equal " hi\n world\n\n", @to.res.join
- end
-
- def end_accepting
- assert_equal "hi", @to.end_accepting
- end
-
- def start_accepting
- assert_equal 0, @to.indent
- assert_equal [""], @to.res
- assert_empty @to.list_index
- assert_empty @to.list_type
- assert_empty @to.list_width
- end
-
- def accept_heading_1
- assert_equal "# Hello\n", @to.end_accepting
- end
-
- def accept_heading_2
- assert_equal "## Hello\n", @to.end_accepting
- end
-
- def accept_heading_3
- assert_equal "### Hello\n", @to.end_accepting
- end
-
- def accept_heading_4
- assert_equal "#### Hello\n", @to.end_accepting
- end
-
- def accept_heading_indent
- assert_equal " # Hello\n", @to.end_accepting
- end
-
- def accept_heading_b
- assert_equal "# **Hello**\n", @to.end_accepting
- end
-
- def accept_heading_suppressed_crossref
- assert_equal "# Hello\n", @to.end_accepting
- end
-
- def accept_list_item_start_note_2
- assert_equal "`teletype`\n: teletype description\n\n", @to.res.join
- end
-
- def accept_list_item_start_note_multi_description
- assert_equal "label\n: description one\n\n: description two\n\n",
- @to.res.join
- end
-
- def accept_list_item_start_note_multi_label
- assert_equal "one\ntwo\n: two headers\n\n", @to.res.join
- end
-
- def accept_paragraph_b
- assert_equal "reg **bold words** reg\n", @to.end_accepting
- end
-
- def accept_paragraph_br
- assert_equal "one \ntwo\n", @to.end_accepting
- end
-
- def accept_paragraph_break
- assert_equal "hello \nworld\n", @to.end_accepting
- end
-
- def accept_paragraph_i
- assert_equal "reg *italic words* reg\n", @to.end_accepting
- end
-
- def accept_paragraph_indent
- expected = <<-EXPECTED
- words words words words words words words words words words words words
- words words words words words words words words words words words words
- words words words words words words
- EXPECTED
-
- assert_equal expected, @to.end_accepting
- end
-
- def accept_paragraph_plus
- assert_equal "reg `teletype` reg\n", @to.end_accepting
- end
-
- def accept_paragraph_star
- assert_equal "reg **bold** reg\n", @to.end_accepting
- end
-
- def accept_paragraph_underscore
- assert_equal "reg *italic* reg\n", @to.end_accepting
- end
-
- def accept_paragraph_wrap
- expected = <<-EXPECTED
-words words words words words words words words words words words words words
-words words words words words words words words words words words words words
-words words words words
- EXPECTED
-
- assert_equal expected, @to.end_accepting
- end
-
- def accept_rule_indent
- assert_equal " ---\n", @to.end_accepting
- end
-
- def accept_verbatim_indent
- assert_equal " hi\n world\n\n", @to.end_accepting
- end
-
- def accept_verbatim_big_indent
- assert_equal " hi\n world\n\n", @to.end_accepting
- end
-
- def list_nested
- expected = <<-EXPECTED
-* l1
- * l1.1
-
-* l2
-
- EXPECTED
-
- assert_equal expected, @to.end_accepting
- end
-
- def list_verbatim
- expected = <<-EXPECTED # HACK overblown
-* list stuff
-
- * list
- with
-
- second
-
- 1. indented
- 2. numbered
-
- third
-
- * second
-
-
- EXPECTED
-
- assert_equal expected, @to.end_accepting
- end
-
- def test_convert_RDOCLINK
- result = @to.convert 'rdoc-garbage:C'
-
- assert_equal "C\n", result
- end
-
- def test_convert_TIDYLINK
- result = @to.convert \
- '{DSL}[http://en.wikipedia.org/wiki/Domain-specific_language]'
-
- expected = "[DSL](http://en.wikipedia.org/wiki/Domain-specific_language)\n"
-
- assert_equal expected, result
- end
-
- def test_handle_rdoc_link_label_footmark
- assert_equal '[^1]:', @to.handle_rdoc_link('rdoc-label:footmark-1:x')
- end
-
- def test_handle_rdoc_link_label_foottext
- assert_equal '[^1]', @to.handle_rdoc_link('rdoc-label:foottext-1:x')
- end
-
- def test_handle_rdoc_link_label_label
- assert_equal '[x](#label-x)', @to.handle_rdoc_link('rdoc-label:label-x')
- end
-
- def test_handle_rdoc_link_ref
- assert_equal 'x', @to.handle_rdoc_link('rdoc-ref:x')
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_to_rdoc.rb b/test/rdoc/test_rdoc_markup_to_rdoc.rb
index 4b60d0133e..ac6884ba58 100644
--- a/test/rdoc/test_rdoc_markup_to_rdoc.rb
+++ b/test/rdoc/test_rdoc_markup_to_rdoc.rb
@@ -1,9 +1,11 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'rdoc/markup/formatter_test_case'
+require 'rdoc/markup/to_rdoc'
+require 'minitest/autorun'
-class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
+class TestRDocMarkupToRdoc < RDoc::Markup::FormatterTestCase
add_visitor_tests
- add_text_tests
def setup
super
@@ -15,14 +17,6 @@ class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
assert_equal "\n", @to.res.join
end
- def accept_block_quote
- assert_equal "> quote\n", @to.res.join
- end
-
- def accept_document
- assert_equal "hello\n", @to.res.join
- end
-
def accept_heading
assert_equal "===== Hello\n", @to.res.join
end
@@ -68,7 +62,7 @@ class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
end
def accept_list_item_end_label
- assert_equal "cat:\n", @to.res.join
+ assert_equal "\n", @to.res.join
assert_equal 0, @to.indent, 'indent'
end
@@ -78,7 +72,7 @@ class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
end
def accept_list_item_end_note
- assert_equal "cat:\n", @to.res.join
+ assert_equal "\n", @to.res.join
assert_equal 0, @to.indent, 'indent'
end
@@ -197,8 +191,8 @@ class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
assert_equal "#{'-' * 78}\n", @to.res.join
end
- def accept_verbatim
- assert_equal " hi\n world\n\n", @to.res.join
+ def accept_verbatim # FormatterTestCase doesn't set indent for ToAnsi
+ assert_equal " hi\n world\n\n", @to.res.join
end
def end_accepting
@@ -213,119 +207,214 @@ class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
assert_empty @to.list_width
end
- def accept_heading_1
+ def test_accept_heading_1
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(1, 'Hello')
+
assert_equal "= Hello\n", @to.end_accepting
end
- def accept_heading_2
+ def test_accept_heading_2
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(2, 'Hello')
+
assert_equal "== Hello\n", @to.end_accepting
end
- def accept_heading_3
+ def test_accept_heading_3
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(3, 'Hello')
+
assert_equal "=== Hello\n", @to.end_accepting
end
- def accept_heading_4
+ def test_accept_heading_4
+ @to.start_accepting
+ @to.accept_heading @RM::Heading.new(4, 'Hello')
+
assert_equal "==== Hello\n", @to.end_accepting
end
- def accept_heading_indent
+ def test_accept_heading_indent
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_heading @RM::Heading.new(1, 'Hello')
+
assert_equal " = Hello\n", @to.end_accepting
end
- def accept_heading_b
- assert_equal "= <b>Hello</b>\n", @to.end_accepting
- end
+ def test_accept_heading_b
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_heading @RM::Heading.new(1, '*Hello*')
- def accept_heading_suppressed_crossref
- assert_equal "= Hello\n", @to.end_accepting
+ assert_equal " = <b>Hello</b>\n", @to.end_accepting
end
- def accept_list_item_start_note_2
- assert_equal "<tt>teletype</tt>:\n teletype description\n\n", @to.res.join
- end
+ def test_accept_list_item_start_note_2
+ list = @RM::List.new(:NOTE,
+ @RM::ListItem.new('<tt>teletype</tt>',
+ @RM::Paragraph.new('teletype description')))
- def accept_list_item_start_note_multi_description
- assert_equal "label:\n description one\n\n description two\n\n",
- @to.res.join
- end
+ @to.start_accepting
- def accept_list_item_start_note_multi_label
- assert_equal "one\ntwo:\n two headers\n\n", @to.res.join
- end
+ list.accept @to
- def accept_paragraph_b
- assert_equal "reg <b>bold words</b> reg\n", @to.end_accepting
- end
+ expected = "<tt>teletype</tt>:\n teletype description\n\n"
- def accept_paragraph_br
- assert_equal "one\ntwo\n", @to.end_accepting
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_break
- assert_equal "hello\nworld\n", @to.end_accepting
+ def test_accept_paragraph_b
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('reg <b>bold words</b> reg')
+
+ expected = "reg <b>bold words</b> reg\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_i
- assert_equal "reg <em>italic words</em> reg\n", @to.end_accepting
+ def test_accept_paragraph_i
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('reg <em>italic words</em> reg')
+
+ expected = "reg <em>italic words</em> reg\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_indent
+ def test_accept_paragraph_indent
+ @to.start_accepting
+ @to.indent = 3
+ @to.accept_paragraph @RM::Paragraph.new('words ' * 30)
+
expected = <<-EXPECTED
words words words words words words words words words words words words
words words words words words words words words words words words words
- words words words words words words
+ words words words words words words
EXPECTED
assert_equal expected, @to.end_accepting
end
- def accept_paragraph_plus
- assert_equal "reg <tt>teletype</tt> reg\n", @to.end_accepting
+ def test_accept_paragraph_plus
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular +teletype+ regular')
+
+ expected = "regular <tt>teletype</tt> regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_star
- assert_equal "reg <b>bold</b> reg\n", @to.end_accepting
+ def test_accept_paragraph_star
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular *bold* regular')
+
+ expected = "regular <b>bold</b> regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_underscore
- assert_equal "reg <em>italic</em> reg\n", @to.end_accepting
+ def test_accept_paragraph_underscore
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('regular _italic_ regular')
+
+ expected = "regular <em>italic</em> regular\n"
+
+ assert_equal expected, @to.end_accepting
end
- def accept_paragraph_wrap
+ def test_accept_paragraph_wrap
+ @to.start_accepting
+ @to.accept_paragraph @RM::Paragraph.new('words ' * 30)
+
expected = <<-EXPECTED
words words words words words words words words words words words words words
words words words words words words words words words words words words words
-words words words words
+words words words words
EXPECTED
assert_equal expected, @to.end_accepting
end
- def accept_rule_indent
+ def test_accept_rule_indent
+ @to.start_accepting
+ @to.indent = 3
+
+ @to.accept_rule @RM::Rule.new(1)
+
assert_equal " #{'-' * 75}\n", @to.end_accepting
end
- def accept_verbatim_indent
+ def test_accept_verbatim_indent
+ @to.start_accepting
+
+ @to.indent = 2
+
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
+
assert_equal " hi\n world\n\n", @to.end_accepting
end
- def accept_verbatim_big_indent
+ def test_accept_verbatim_big_indent
+ @to.start_accepting
+
+ @to.indent = 2
+
+ @to.accept_verbatim @RM::Verbatim.new(' ', 'hi', "\n",
+ ' ', 'world', "\n")
+
assert_equal " hi\n world\n\n", @to.end_accepting
end
- def list_nested
+ def test_attributes
+ assert_equal 'Dog', @to.attributes("\\Dog")
+ end
+
+ def test_list_nested
+ doc = @RM::Document.new(
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1'),
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l1.1')))),
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('l2'))))
+
+ output = doc.accept @to
+
expected = <<-EXPECTED
* l1
* l1.1
* l2
EXPECTED
- assert_equal expected, @to.end_accepting
- end
+ assert_equal expected, output
+ end
+
+ def test_list_verbatim # HACK overblown
+ doc = @RM::Document.new(
+ @RM::List.new(:BULLET,
+ @RM::ListItem.new(nil,
+ @RM::Paragraph.new('list', 'stuff'),
+ @RM::BlankLine.new(),
+ @RM::Verbatim.new(' ', '*', ' ', 'list', "\n",
+ ' ', 'with', "\n",
+ "\n",
+ ' ', 'second', "\n",
+ "\n",
+ ' ', '1.', ' ', 'indented', "\n",
+ ' ', '2.', ' ', 'numbered', "\n",
+ "\n",
+ ' ', 'third', "\n",
+ "\n",
+ ' ', '*', ' ', 'second', "\n"))))
+
+ output = doc.accept @to
- def list_verbatim
- expected = <<-EXPECTED # HACK overblown
+ expected = <<-EXPECTED
* list stuff
* list
@@ -342,35 +431,7 @@ words words words words
EXPECTED
- assert_equal expected, @to.end_accepting
- end
-
- # functional test
- def test_convert_list_note
- note_list = <<-NOTE_LIST
-foo ::
-bar ::
- hi
- NOTE_LIST
-
- expected = <<-EXPECTED
-foo
-bar:
- hi
-
- EXPECTED
-
- assert_equal expected, @to.convert(note_list)
- end
-
- def test_accept_indented_paragraph
- ip = RDoc::Markup::IndentedParagraph.new 2, 'cats are cool'
-
- @to.start_accepting
-
- @to.accept_indented_paragraph ip
-
- assert_equal " cats are cool\n", @to.end_accepting
+ assert_equal expected, output
end
end
diff --git a/test/rdoc/test_rdoc_markup_to_table_of_contents.rb b/test/rdoc/test_rdoc_markup_to_table_of_contents.rb
deleted file mode 100644
index ba17b845a7..0000000000
--- a/test/rdoc/test_rdoc_markup_to_table_of_contents.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupToTableOfContents < RDoc::Markup::FormatterTestCase
-
- add_visitor_tests
-
- def setup
- super
-
- @to = RDoc::Markup::ToTableOfContents.new
- end
-
- def end_accepting
- assert_equal %w[hi], @to.res
- end
-
- def empty
- assert_empty @to.res
- end
-
- def accept_heading
- assert_equal [@RM::Heading.new(5, 'Hello')], @to.res
- end
-
- def accept_heading_1
- assert_equal [@RM::Heading.new(1, 'Hello')], @to.res
- end
-
- def accept_heading_2
- assert_equal [@RM::Heading.new(2, 'Hello')], @to.res
- end
-
- def accept_heading_3
- assert_equal [@RM::Heading.new(3, 'Hello')], @to.res
- end
-
- def accept_heading_4
- assert_equal [@RM::Heading.new(4, 'Hello')], @to.res
- end
-
- def accept_heading_b
- assert_equal [@RM::Heading.new(1, '*Hello*')], @to.res
- end
-
- def accept_heading_suppressed_crossref
- assert_equal [@RM::Heading.new(1, '\\Hello')], @to.res
- end
-
- alias accept_blank_line empty
- alias accept_block_quote empty
- alias accept_document empty
- alias accept_list_end_bullet empty
- alias accept_list_end_label empty
- alias accept_list_end_lalpha empty
- alias accept_list_end_note empty
- alias accept_list_end_number empty
- alias accept_list_end_ualpha empty
- alias accept_list_item_end_bullet empty
- alias accept_list_item_end_label empty
- alias accept_list_item_end_lalpha empty
- alias accept_list_item_end_note empty
- alias accept_list_item_end_number empty
- alias accept_list_item_end_ualpha empty
- alias accept_list_item_start_bullet empty
- alias accept_list_item_start_label empty
- alias accept_list_item_start_lalpha empty
- alias accept_list_item_start_note empty
- alias accept_list_item_start_note_2 empty
- alias accept_list_item_start_note_multi_description empty
- alias accept_list_item_start_note_multi_label empty
- alias accept_list_item_start_number empty
- alias accept_list_item_start_ualpha empty
- alias accept_list_start_bullet empty
- alias accept_list_start_label empty
- alias accept_list_start_lalpha empty
- alias accept_list_start_note empty
- alias accept_list_start_number empty
- alias accept_list_start_ualpha empty
- alias accept_paragraph empty
- alias accept_paragraph_b empty
- alias accept_paragraph_br empty
- alias accept_paragraph_break empty
- alias accept_paragraph_i empty
- alias accept_paragraph_plus empty
- alias accept_paragraph_star empty
- alias accept_paragraph_underscore empty
- alias accept_raw empty
- alias accept_rule empty
- alias accept_verbatim empty
- alias list_nested empty
- alias list_verbatim empty
- alias start_accepting empty
-
- def test_accept_document_omit_headings_below
- document = doc
- document.omit_headings_below = 2
-
- @to.accept_document document
-
- assert_equal 2, @to.omit_headings_below
- end
-
- def test_accept_heading_suppressed
- @to.start_accepting
- @to.omit_headings_below = 4
-
- suppressed = head 5, 'Hello'
-
- @to.accept_heading suppressed
-
- assert_empty @to.res
- end
-
- def test_suppressed_eh
- @to.omit_headings_below = nil
-
- refute @to.suppressed? head(1, '')
-
- @to.omit_headings_below = 1
-
- refute @to.suppressed? head(1, '')
- assert @to.suppressed? head(2, '')
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_to_tt_only.rb b/test/rdoc/test_rdoc_markup_to_tt_only.rb
deleted file mode 100644
index 2e950dd1b0..0000000000
--- a/test/rdoc/test_rdoc_markup_to_tt_only.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupToTtOnly < RDoc::Markup::FormatterTestCase
-
- add_visitor_tests
-
- def setup
- super
-
- @to = RDoc::Markup::ToTtOnly.new
- end
-
- def accept_blank_line
- assert_empty @to.end_accepting
- end
-
- def accept_block_quote
- assert_empty @to.end_accepting
- end
-
- def accept_document
- assert_equal [], @to.res
- end
-
- def accept_heading
- assert_empty @to.end_accepting
- end
-
- def accept_list_end_bullet
- assert_empty @to.res
- end
-
- def accept_list_end_label
- assert_empty @to.res
- end
-
- def accept_list_end_lalpha
- assert_empty @to.res
- end
-
- def accept_list_end_note
- assert_empty @to.res
- end
-
- def accept_list_end_number
- assert_empty @to.res
- end
-
- def accept_list_end_ualpha
- assert_empty @to.res
- end
-
- def accept_list_item_end_bullet
- assert_empty @to.res
- end
-
- def accept_list_item_end_label
- assert_empty @to.res
- end
-
- def accept_list_item_end_lalpha
- assert_empty @to.res
- end
-
- def accept_list_item_end_note
- assert_empty @to.res
- end
-
- def accept_list_item_end_number
- assert_empty @to.res
- end
-
- def accept_list_item_end_ualpha
- assert_empty @to.res
- end
-
- def accept_list_item_start_bullet
- assert_empty @to.res
- end
-
- def accept_list_item_start_label
- assert_empty @to.res
- end
-
- def accept_list_item_start_lalpha
- assert_empty @to.res
- end
-
- def accept_list_item_start_note
- assert_empty @to.res
- end
-
- def accept_list_item_start_number
- assert_empty @to.res
- end
-
- def accept_list_item_start_ualpha
- assert_empty @to.res
- end
-
- def accept_list_start_bullet
- assert_empty @to.res
- end
-
- def accept_list_start_label
- assert_empty @to.res
- end
-
- def accept_list_start_lalpha
- assert_empty @to.res
- end
-
- def accept_list_start_note
- assert_empty @to.res
- end
-
- def accept_list_start_number
- assert_empty @to.res
- end
-
- def accept_list_start_ualpha
- assert_empty @to.res
- end
-
- def accept_paragraph
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_break
- assert_empty @to.end_accepting
- end
-
- def accept_raw
- assert_empty @to.end_accepting
- end
-
- def accept_rule
- assert_empty @to.end_accepting
- end
-
- def accept_verbatim
- assert_empty @to.end_accepting
- end
-
- def end_accepting
- assert_equal %w[hi], @to.end_accepting
- end
-
- def start_accepting
- assert_empty @to.end_accepting
- end
-
- def accept_heading_1
- assert_empty @to.end_accepting
- end
-
- def accept_heading_2
- assert_empty @to.end_accepting
- end
-
- def accept_heading_3
- assert_empty @to.end_accepting
- end
-
- def accept_heading_4
- assert_empty @to.end_accepting
- end
-
- def accept_heading_indent
- assert_empty @to.end_accepting
- end
-
- def accept_heading_b
- assert_empty @to.end_accepting
- end
-
- def accept_heading_suppressed_crossref
- assert_empty @to.end_accepting
- end
-
- def accept_list_item_start_note_2
- assert_equal [nil, 'teletype', nil], @to.res
- end
-
- def accept_list_item_start_note_multi_description
- assert_empty @to.res
- end
-
- def accept_list_item_start_note_multi_label
- assert_empty @to.res
- end
-
- def accept_paragraph_b
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_br
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_i
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_indent
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_plus
- assert_equal %w[teletype], @to.end_accepting
- end
-
- def accept_paragraph_star
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_underscore
- assert_empty @to.end_accepting
- end
-
- def accept_paragraph_wrap
- assert_empty @to.end_accepting
- end
-
- def accept_rule_indent
- assert_empty @to.end_accepting
- end
-
- def accept_verbatim_indent
- assert_empty @to.end_accepting
- end
-
- def accept_verbatim_big_indent
- assert_empty @to.end_accepting
- end
-
- def list_nested
- assert_empty @to.end_accepting
- end
-
- def list_verbatim
- assert_empty @to.end_accepting
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_markup_verbatim.rb b/test/rdoc/test_rdoc_markup_verbatim.rb
deleted file mode 100644
index 781d52849a..0000000000
--- a/test/rdoc/test_rdoc_markup_verbatim.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocMarkupVerbatim < RDoc::TestCase
-
- def test_equals2
- v1 = verb('1 + 1')
- v2 = verb('1 + 1')
- v3 = verb('1 + 2')
- v4 = verb('1 + 1')
- v4.format = :ruby
-
- assert_equal v1, v2
-
- refute_equal v1, v3
- refute_equal v1, v4
- end
-
- def test_ruby_eh
- verbatim = RDoc::Markup::Verbatim.new
-
- refute verbatim.ruby?
-
- verbatim.format = :ruby
-
- assert verbatim.ruby?
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_method_attr.rb b/test/rdoc/test_rdoc_method_attr.rb
deleted file mode 100644
index 8fff038289..0000000000
--- a/test/rdoc/test_rdoc_method_attr.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-require File.expand_path '../xref_test_case', __FILE__
-
-class TestRDocMethodAttr < XrefTestCase
-
- def test_block_params_equal
-
- m = RDoc::MethodAttr.new(nil, 'foo')
-
- m.block_params = ''
- assert_equal '', m.block_params
-
- m.block_params = 'a_var'
- assert_equal 'a_var', m.block_params
-
- m.block_params = '()'
- assert_equal '', m.block_params
-
- m.block_params = '(a_var, b_var)'
- assert_equal 'a_var, b_var', m.block_params
-
- m.block_params = '.to_s + "</#{element.upcase}>"'
- assert_equal '', m.block_params
-
- m.block_params = 'i.name'
- assert_equal 'name', m.block_params
-
- m.block_params = 'attr.expanded_name, attr.value'
- assert_equal 'expanded_name, value', m.block_params
-
- m.block_params = 'expanded_name, attr.value'
- assert_equal 'expanded_name, value', m.block_params
-
- m.block_params = 'attr.expanded_name, value'
- assert_equal 'expanded_name, value', m.block_params
-
- m.block_params = '(@base_notifier)'
- assert_equal 'base_notifier', m.block_params
-
- m.block_params = 'if @signal_status == :IN_LOAD'
- assert_equal '', m.block_params
-
- m.block_params = 'e if e.kind_of? Element'
- assert_equal 'e', m.block_params
-
- m.block_params = '(e, f) if e.kind_of? Element'
- assert_equal 'e, f', m.block_params
-
- m.block_params = 'back_path, back_name'
- assert_equal 'back_path, back_name', m.block_params
-
- m.block_params = '(*a[1..-1])'
- assert_equal '*a', m.block_params
-
- m.block_params = '@@context[:node] if defined? @@context[:node].namespace'
- assert_equal 'context', m.block_params
-
- m.block_params = '(result, klass.const_get(constant_name))'
- assert_equal 'result, const', m.block_params
-
- m.block_params = 'name.to_s if (bitmap & bit) != 0'
- assert_equal 'name', m.block_params
-
- m.block_params = 'line unless line.deleted'
- assert_equal 'line', m.block_params
-
- m.block_params = 'str + rs'
- assert_equal 'str', m.block_params
-
- m.block_params = 'f+rs'
- assert_equal 'f', m.block_params
-
- m.block_params = '[user, realm, hash[user]]'
- assert_equal 'user, realm, hash', m.block_params
-
- m.block_params = 'proc{|rc| rc == "rc" ? irbrc : irbrc+rc| ... }'
- assert_equal 'proc', m.block_params
-
- m.block_params = 'lambda { |x| x.to_i }'
- assert_equal 'lambda', m.block_params
-
- m.block_params = '$&'
- assert_equal 'str', m.block_params
-
- m.block_params = 'Inflections.instance'
- assert_equal 'instance', m.block_params
-
- m.block_params = 'self.class::STARTED'
- assert_equal 'STARTED', m.block_params
-
- m.block_params = 'Test::Unit::TestCase::STARTED'
- assert_equal 'STARTED', m.block_params
-
- m.block_params = 'ActiveSupport::OptionMerger.new(self, options)'
- assert_equal 'option_merger', m.block_params
-
- m.block_params = ', msg'
- assert_equal '', m.block_params
-
- m.block_params = '[size.to_s(16), term, chunk, term].join'
- assert_equal '[size, term, chunk, term].join', m.block_params
-
- m.block_params = 'YPath.new( path )'
- assert_equal 'y_path', m.block_params
-
- end
-
- def test_find_method_or_attribute_recursive
- inc = RDoc::Include.new 'M1', nil
- @m1.add_include inc # M1 now includes itself
-
- assert_nil @m1_m.find_method_or_attribute 'm'
- end
-
- def test_full_name
- assert_equal 'C1#m', @c1_m.full_name
- assert_equal 'C1::m', @c1__m.full_name
- end
-
- def test_output_name
- assert_equal '#m', @c1_m.output_name(@c1)
- assert_equal '::m', @c1__m.output_name(@c1)
-
- assert_equal 'C1#m', @c1_m.output_name(@c2)
- assert_equal 'C1.m', @c1__m.output_name(@c2)
- end
-
- def test_search_record
- @c1_m.comment = 'This is a comment.'
-
- expected = [
- 'm',
- 'C1#m',
- 'm',
- 'C1',
- 'C1.html#method-i-m',
- '(foo)',
- "<p>This is a comment.\n",
- ]
-
- assert_equal expected, @c1_m.search_record
- end
-
- def test_equals2
- assert_equal @c1_m, @c1_m
- refute_equal @c1_m, @parent_m
- end
-
- def test_to_s
- assert_equal 'RDoc::AnyMethod: C1#m', @c1_m.to_s
- assert_equal 'RDoc::AnyMethod: C2#b', @c2_b.to_s
- assert_equal 'RDoc::AnyMethod: C1::m', @c1__m.to_s
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_normal_class.rb b/test/rdoc/test_rdoc_normal_class.rb
index f3c7890d59..b7471f654f 100644
--- a/test/rdoc/test_rdoc_normal_class.rb
+++ b/test/rdoc/test_rdoc_normal_class.rb
@@ -2,40 +2,15 @@ require File.expand_path '../xref_test_case', __FILE__
class TestRDocNormalClass < XrefTestCase
- def test_ancestors
- klass = @top_level.add_class RDoc::NormalClass, 'Klass'
+ def test_ancestors_class
+ top_level = RDoc::TopLevel.new 'file.rb'
+ klass = top_level.add_class RDoc::NormalClass, 'Klass'
incl = RDoc::Include.new 'Incl', ''
- sub_klass = @top_level.add_class RDoc::NormalClass, 'SubClass'
- sub_klass.superclass = klass
+ sub_klass = klass.add_class RDoc::NormalClass, 'SubClass', 'Klass'
sub_klass.add_include incl
- assert_equal [incl.name, klass, 'Object'], sub_klass.ancestors
- end
-
- def test_ancestors_multilevel
- c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
- c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1
- c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2
-
- assert_equal [c2, c1, 'Object'], c3.ancestors
- end
-
- def test_direct_ancestors
- incl = RDoc::Include.new 'Incl', ''
-
- c1 = @top_level.add_class RDoc::NormalClass, 'Outer'
- c2 = @top_level.add_class RDoc::NormalClass, 'Middle', c1
- c3 = @top_level.add_class RDoc::NormalClass, 'Inner', c2
- c3.add_include incl
-
- assert_equal [incl.name, c2], c3.direct_ancestors
- end
-
- def test_definition
- c = RDoc::NormalClass.new 'C'
-
- assert_equal 'class C', c.definition
+ assert_equal [incl, klass], sub_klass.ancestors
end
end
diff --git a/test/rdoc/test_rdoc_normal_module.rb b/test/rdoc/test_rdoc_normal_module.rb
index 120f56a284..da48d33f55 100644
--- a/test/rdoc/test_rdoc_normal_module.rb
+++ b/test/rdoc/test_rdoc_normal_module.rb
@@ -9,24 +9,13 @@ class TestRDocNormalModule < XrefTestCase
end
def test_ancestors_module
- top_level = @store.add_file 'file.rb'
+ top_level = RDoc::TopLevel.new 'file.rb'
mod = top_level.add_module RDoc::NormalModule, 'Mod'
incl = RDoc::Include.new 'Incl', ''
mod.add_include incl
- assert_equal [incl.name], mod.ancestors
-
- mod2 = top_level.add_module RDoc::NormalModule, 'Inc2'
- inc2 = RDoc::Include.new 'Inc2', ''
- mod.add_include inc2
- assert_equal [mod2, incl.name], mod.ancestors
- end
-
- def test_definition
- m = RDoc::NormalModule.new 'M'
-
- assert_equal 'module M', m.definition
+ assert_equal [incl], mod.ancestors
end
def test_module_eh
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
index 5d7135c795..f4a8d51c8e 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/test_rdoc_options.rb
@@ -1,375 +1,11 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/options'
-class TestRDocOptions < RDoc::TestCase
+class TestRDocOptions < MiniTest::Unit::TestCase
def setup
- super
-
- @options = RDoc::Options.new
- @generators = RDoc::RDoc::GENERATORS.dup
- end
-
- def teardown
- super
-
- RDoc::RDoc::GENERATORS.replace @generators
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_check_files
- skip "assumes UNIX permission model" if /mswin|mingw/ =~ RUBY_PLATFORM
-
- out, err = capture_io do
- temp_dir do
- FileUtils.touch 'unreadable'
- FileUtils.chmod 0, 'unreadable'
-
- @options.files = %w[nonexistent unreadable]
-
- @options.check_files
- end
- end
-
- assert_empty @options.files
-
- assert_empty out
- assert_empty err
- end
-
- def test_check_files_warn
- @options.verbosity = 2
-
- out, err = verbose_capture_io do
- @options.files = %w[nonexistent]
-
- @options.check_files
- end
-
- assert_empty out
- assert_equal "file 'nonexistent' not found\n", err
- assert_empty @options.files
- end
-
- def test_dry_run_default
- refute @options.dry_run
- end
-
- def test_encode_with
- coder = {}
- class << coder; alias add []=; end
-
- @options.encode_with coder
-
- encoding = Object.const_defined?(:Encoding) ? 'UTF-8' : nil
-
- expected = {
- 'charset' => 'UTF-8',
- 'encoding' => encoding,
- 'exclude' => [],
- 'hyperlink_all' => false,
- 'line_numbers' => false,
- 'main_page' => nil,
- 'markup' => 'rdoc',
- 'page_dir' => nil,
- 'rdoc_include' => [],
- 'show_hash' => false,
- 'static_path' => [],
- 'tab_width' => 8,
- 'title' => nil,
- 'visibility' => :protected,
- 'webcvs' => nil,
- }
-
- assert_equal expected, coder
- end
-
- def test_encode_with_trim_paths
- subdir = nil
- coder = {}
- class << coder; alias add []=; end
-
- temp_dir do |dir|
- FileUtils.mkdir 'project'
- FileUtils.mkdir 'dir'
- FileUtils.touch 'file'
-
- Dir.chdir 'project' do
- subdir = File.expand_path 'subdir'
- FileUtils.mkdir 'subdir'
- @options.parse %w[
- --copy subdir
- --copy ../file
- --copy ../
- --copy /
- --include subdir
- --include ../dir
- --include ../
- --include /
- ]
-
- @options.encode_with coder
- end
- end
-
- assert_equal [subdir], coder['rdoc_include']
-
- assert_equal [subdir], coder['static_path']
- end
-
- def test_encoding_default
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- assert_equal Encoding::UTF_8, @options.encoding
- end
-
- def test_generator_descriptions
- # HACK autotest/isolate should take care of this
- RDoc::RDoc::GENERATORS.clear
- RDoc::RDoc::GENERATORS['darkfish'] = RDoc::Generator::Darkfish
- RDoc::RDoc::GENERATORS['ri'] = RDoc::Generator::RI
-
- expected = <<-EXPECTED.chomp
- darkfish - HTML generator, written by Michael Granger
- ri - creates ri data files
- EXPECTED
-
- assert_equal expected, @options.generator_descriptions
- end
-
- def test_init_with_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
- RDoc.load_yaml
-
- @options.encoding = Encoding::IBM437
-
- options = YAML.load YAML.dump @options
-
- assert_equal Encoding::IBM437, options.encoding
- end
-
- def test_init_with_trim_paths
- RDoc.load_yaml
-
- yaml = <<-YAML
---- !ruby/object:RDoc::Options
-static_path:
-- /etc
-rdoc_include:
-- /etc
- YAML
-
- options = YAML.load yaml
-
- assert_empty options.rdoc_include
- assert_empty options.static_path
- end
-
- def test_parse_copy_files_file_relative
- file = File.basename __FILE__
- expected = File.expand_path __FILE__
-
- Dir.chdir File.expand_path('..', __FILE__) do
- @options.parse %W[--copy-files #{file}]
-
- assert_equal [expected], @options.static_path
- end
- end
-
- def test_parse_copy_files_file_absolute
- @options.parse %W[--copy-files #{File.expand_path __FILE__}]
-
- assert_equal [File.expand_path(__FILE__)], @options.static_path
- end
-
- def test_parse_copy_files_directory_relative
- @options.parse %w[--copy-files .]
-
- assert_equal [@pwd], @options.static_path
- end
-
- def test_parse_copy_files_directory_absolute
- @options.parse %w[--copy-files /]
-
- assert_equal 1, @options.static_path.length
-
- assert_match %r%^([A-Z]:)?/$%i, @options.static_path.first
- end
-
- def test_parse_coverage
- @options.parse %w[--dcov]
-
- assert @options.coverage_report
- assert @options.force_update
- end
-
- def test_parse_coverage_no
- @options.parse %w[--no-dcov]
-
- refute @options.coverage_report
- end
-
- def test_parse_coverage_level_1
- @options.parse %w[--dcov=1]
-
- assert_equal 1, @options.coverage_report
- end
-
- def test_parse_dash_p
- out, err = capture_io do
- @options.parse %w[-p]
- end
-
- assert @options.pipe
- refute_match %r%^Usage: %, err
- refute_match %r%^invalid options%, err
-
- assert_empty out
- end
-
- def test_parse_dash_p_files
- out, err = capture_io do
- @options.parse ['-p', File.expand_path(__FILE__)]
- end
-
- refute @options.pipe
- refute_match %r%^Usage: %, err
- assert_match %r%^invalid options: -p .with files.%, err
-
- assert_empty out
- end
-
- def test_parse_default
- @options.parse []
-
- assert_equal RDoc::Generator::Darkfish, @options.generator
- assert_equal 'darkfish', @options.template
- assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
- end
-
- def test_parse_deprecated
- dep_hash = RDoc::Options::DEPRECATED
- options = dep_hash.keys.sort
-
- out, err = capture_io do
- @options.parse options
- end
-
- dep_hash.each_pair do |opt, message|
- assert_match %r%.*#{opt}.+#{message}%, err
- end
-
- assert_empty out
- end
-
- def test_parse_dry_run
- @options.parse %w[--dry-run]
-
- assert @options.dry_run
- end
-
- def test_parse_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @options.parse %w[--encoding Big5]
-
- assert_equal Encoding::Big5, @options.encoding
- assert_equal 'Big5', @options.charset
- end
-
- def test_parse_encoding_invalid
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- out, err = capture_io do
- @options.parse %w[--encoding invalid]
- end
-
- assert_match %r%^invalid options: --encoding invalid%, err
-
- assert_empty out
- end
-
- def test_parse_formatter
- e = assert_raises OptionParser::InvalidOption do
- @options.parse %w[--format darkfish --format ri]
- end
-
- assert_equal 'invalid option: --format generator already set to darkfish',
- e.message
- end
-
- def test_parse_formatter_ri
- e = assert_raises OptionParser::InvalidOption do
- @options.parse %w[--format darkfish --ri]
- end
-
- assert_equal 'invalid option: --ri generator already set to darkfish',
- e.message
-
- @options = RDoc::Options.new
-
- e = assert_raises OptionParser::InvalidOption do
- @options.parse %w[--format darkfish -r]
- end
-
- assert_equal 'invalid option: -r generator already set to darkfish',
- e.message
- end
-
- def test_parse_formatter_ri_site
- e = assert_raises OptionParser::InvalidOption do
- @options.parse %w[--format darkfish --ri-site]
- end
-
- assert_equal 'invalid option: --ri-site generator already set to darkfish',
- e.message
-
@options = RDoc::Options.new
-
- e = assert_raises OptionParser::InvalidOption do
- @options.parse %w[--format darkfish -R]
- end
-
- assert_equal 'invalid option: -R generator already set to darkfish',
- e.message
- end
-
- def test_parse_help
- out, = capture_io do
- begin
- @options.parse %w[--help]
- rescue SystemExit
- end
- end
-
- assert_equal 1, out.scan(/HTML generator options:/).length
- assert_equal 1, out.scan(/ri generator options:/). length
- end
-
- def test_parse_help_extra_generator
- RDoc::RDoc::GENERATORS['test'] = Class.new do
- def self.setup_options options
- op = options.option_parser
-
- op.separator 'test generator options:'
- end
- end
-
- out, = capture_io do
- begin
- @options.parse %w[--help]
- rescue SystemExit
- end
- end
-
- assert_equal 1, out.scan(/HTML generator options:/).length
- assert_equal 1, out.scan(/ri generator options:/). length
- assert_equal 1, out.scan(/test generator options:/).length
end
def test_parse_ignore_invalid
@@ -379,8 +15,6 @@ rdoc_include:
refute_match %r%^Usage: %, err
assert_match %r%^invalid options: --bogus%, err
-
- assert_empty out
end
def test_parse_ignore_invalid_default
@@ -392,21 +26,17 @@ rdoc_include:
assert_match %r%^invalid options: --bogus%, err
assert_equal 'BLAH', @options.main_page
-
- assert_empty out
end
def test_parse_ignore_invalid_no
out, err = capture_io do
assert_raises SystemExit do
- @options.parse %w[--no-ignore-invalid --bogus=arg --bobogus --visibility=extended]
+ @options.parse %w[--no-ignore-invalid --bogus]
end
end
assert_match %r%^Usage: %, err
- assert_match %r%^invalid options: --bogus=arg, --bobogus, --visibility=extended%, err
-
- assert_empty out
+ assert_match %r%^invalid option: --bogus%, err
end
def test_parse_main
@@ -420,223 +50,24 @@ rdoc_include:
assert_equal 'MAIN', @options.main_page
end
- def test_parse_markup
- out, err = capture_io do
- @options.parse %w[--markup tomdoc]
- end
-
- assert_empty out
- assert_empty err
-
- assert_equal 'tomdoc', @options.markup
- end
-
- def test_parse_page_dir
- assert_nil @options.page_dir
-
- out, err = capture_io do
- @options.parse %W[--page-dir #{Dir.tmpdir}]
- end
-
- assert_empty out
- assert_empty err
-
- expected =
- Pathname(Dir.tmpdir).expand_path.relative_path_from @options.root
-
- assert_equal expected, @options.page_dir
- assert_equal [Dir.tmpdir], @options.files
- end
-
- def test_parse_page_dir_root
- assert_nil @options.page_dir
-
- Dir.mktmpdir do |dir|
- abs_root = dir
- abs_page_dir = File.join dir, 'pages'
- FileUtils.mkdir abs_page_dir
-
- out, err = capture_io do
- @options.parse %W[--page-dir #{abs_page_dir} --root #{abs_root}]
- end
-
- assert_empty out
- assert_empty err
-
- assert_equal Pathname('pages'), @options.page_dir
- assert_equal [abs_page_dir], @options.files
- end
- end
-
- def test_parse_root
- assert_equal Pathname(Dir.pwd), @options.root
-
- out, err = capture_io do
- @options.parse %W[--root #{Dir.tmpdir}]
- end
-
- assert_empty out
- assert_empty err
-
- assert_equal Pathname(Dir.tmpdir), @options.root
- end
-
- def test_parse_template
- out, err = capture_io do
- @options.parse %w[--template darkfish]
- end
-
- assert_empty out
- assert_empty err
-
- assert_equal 'darkfish', @options.template
-
- assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
- end
-
- def test_parse_template_nonexistent
- out, err = capture_io do
- @options.parse %w[--template NONEXISTENT]
- end
-
- assert_empty out
- assert_equal "could not find template NONEXISTENT\n", err
-
- assert_equal 'darkfish', @options.template
- assert_match %r%rdoc/generator/template/darkfish$%, @options.template_dir
- end
-
- def test_parse_template_load_path
- orig_LOAD_PATH = $LOAD_PATH.dup
-
- template_dir = nil
-
- Dir.mktmpdir do |dir|
- $LOAD_PATH << dir
-
- template_dir = File.join dir, 'rdoc', 'generator', 'template', 'load_path'
-
- FileUtils.mkdir_p template_dir
-
- out, err = capture_io do
- @options.parse %w[--template load_path]
- end
-
- assert_empty out
- assert_empty err
- end
-
- assert_equal 'load_path', @options.template
- assert_equal template_dir, @options.template_dir
- ensure
- $LOAD_PATH.replace orig_LOAD_PATH
- end
-
- def test_parse_write_options
- tmpdir = File.join Dir.tmpdir, "test_rdoc_options_#{$$}"
- FileUtils.mkdir_p tmpdir
-
- Dir.chdir tmpdir do
- e = assert_raises SystemExit do
- @options.parse %w[--write-options]
- end
-
- assert_equal 0, e.status
-
- assert File.exist? '.rdoc_options'
- end
- ensure
- FileUtils.rm_rf tmpdir
- end
-
- def test_parse_extension_alias
+ def test_parse_dash_p
out, err = capture_io do
- @options.parse %w[--extension foobar=rdoc]
- end
-
- assert_includes RDoc::Parser.parsers, [/\.foobar$/, RDoc::Parser::Simple]
-
- assert_empty out
- assert_empty err
- end
-
- def test_setup_generator
- test_generator = Class.new do
- def self.setup_options op
- @op = op
- end
-
- def self.op() @op end
- end
-
- RDoc::RDoc::GENERATORS['test'] = test_generator
-
- @options.setup_generator 'test'
-
- assert_equal test_generator, @options.generator
- assert_equal [test_generator], @options.generator_options
-
- assert_equal @options, test_generator.op
- ensure
- RDoc::RDoc::GENERATORS.delete 'test'
- end
-
- def test_setup_generator_no_option_parser
- test_generator = Class.new do
- def self.setup_options op
- op.option_parser.separator nil
- @op = op
- end
-
- def self.op() @op end
+ @options.parse %w[-p]
end
- RDoc::RDoc::GENERATORS['test'] = test_generator
-
- @options.setup_generator 'test'
-
- assert_equal test_generator, @options.generator
- assert_equal [test_generator], @options.generator_options
-
- assert_equal @options, test_generator.op
- ensure
- RDoc::RDoc::GENERATORS.delete 'test'
- end
-
- def test_update_output_dir
- assert @options.update_output_dir
-
- @options.update_output_dir = false
-
- refute @options.update_output_dir
+ assert @options.pipe
+ refute_match %r%^Usage: %, err
+ refute_match %r%^invalid options%, err
end
- def test_warn
+ def test_parse_dash_p_files
out, err = capture_io do
- @options.warn "warnings off"
- end
-
- assert_empty out
- assert_empty err
-
- @options.verbosity = 2
-
- out, err = verbose_capture_io do
- @options.warn "warnings on"
+ @options.parse %w[-p README]
end
- assert_empty out
- assert_equal "warnings on\n", err
- end
-
- def test_write_options
- temp_dir do |dir|
- @options.write_options
-
- assert File.exist? '.rdoc_options'
-
- assert_equal @options, YAML.load(File.read('.rdoc_options'))
- end
+ refute @options.pipe
+ refute_match %r%^Usage: %, err
+ assert_match %r%^invalid options: -p .with files.%, err
end
end
diff --git a/test/rdoc/test_rdoc_parser.rb b/test/rdoc/test_rdoc_parser.rb
index 338693f97a..ebb520032d 100644
--- a/test/rdoc/test_rdoc_parser.rb
+++ b/test/rdoc/test_rdoc_parser.rb
@@ -1,18 +1,33 @@
-# -*- coding: us-ascii -*-
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/parser'
+require 'rdoc/parser/ruby'
+require 'tmpdir'
-require 'rdoc/test_case'
-
-class TestRDocParser < RDoc::TestCase
+class TestRDocParser < MiniTest::Unit::TestCase
def setup
- super
-
@RP = RDoc::Parser
@binary_dat = File.expand_path '../binary.dat', __FILE__
+ end
- @fn = 'file.rb'
- @top_level = RDoc::TopLevel.new @fn
- @options = RDoc::Options.new
+ def test_class_binary_eh_erb
+ erb = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.erb"
+ open erb, 'wb' do |io|
+ io.write 'blah blah <%= stuff %> <% more stuff %>'
+ end
+
+ assert @RP.binary?(erb)
+
+ erb_rb = File.join Dir.tmpdir, "test_rdoc_parser_#{$$}.erb.rb"
+ open erb_rb, 'wb' do |io|
+ io.write 'blah blah <%= stuff %>'
+ end
+
+ refute @RP.binary?(erb_rb)
+ ensure
+ File.unlink erb
+ File.unlink erb_rb if erb_rb
end
def test_class_binary_eh_marshal
@@ -27,33 +42,6 @@ class TestRDocParser < RDoc::TestCase
File.unlink marshal
end
- def test_class_binary_japanese_text
- file_name = File.expand_path '../test.ja.txt', __FILE__
- refute @RP.binary?(file_name)
- end
-
- def test_class_binary_large_japanese_rdoc
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- capture_io do
- begin
- extenc, Encoding.default_external =
- Encoding.default_external, Encoding::US_ASCII
- file_name = File.expand_path '../test.ja.largedoc', __FILE__
- assert !@RP.binary?(file_name)
- ensure
- Encoding.default_external = extenc
- end
- end
- end
-
- def test_class_binary_japanese_rdoc
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- file_name = File.expand_path '../test.ja.rdoc', __FILE__
- refute @RP.binary?(file_name)
- end
-
def test_class_can_parse
assert_equal @RP.can_parse(__FILE__), @RP::Ruby
@@ -61,7 +49,7 @@ class TestRDocParser < RDoc::TestCase
assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
- assert_equal @RP::Simple, @RP.can_parse(@binary_dat)
+ assert_nil @RP.can_parse(@binary_dat)
jtest_file_name = File.expand_path '../test.ja.txt', __FILE__
assert_equal @RP::Simple, @RP.can_parse(jtest_file_name)
@@ -71,57 +59,6 @@ class TestRDocParser < RDoc::TestCase
readme_file_name = File.expand_path '../README', __FILE__
assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
-
- jtest_largerdoc_file_name = File.expand_path '../test.ja.largedoc', __FILE__
- assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
-
- @RP.alias_extension 'rdoc', 'largedoc'
- assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
- end
-
- def test_class_for_executable
- temp_dir do
- content = "#!/usr/bin/env ruby -w\n"
- open 'app', 'w' do |io| io.write content end
- app = @store.add_file 'app'
-
- parser = @RP.for app, 'app', content, @options, :stats
-
- assert_kind_of RDoc::Parser::Ruby, parser
-
- assert_equal 'app', parser.file_name
- end
- end
-
- def test_class_for_forbidden
- skip 'chmod not supported' if Gem.win_platform?
-
- Tempfile.open 'forbidden' do |io|
- begin
- File.chmod 0000, io.path
- forbidden = @store.add_file io.path
-
- parser = @RP.for forbidden, 'forbidden', '', @options, :stats
-
- assert_nil parser
- ensure
- File.chmod 0400, io.path
- end
- end
- end
-
- def test_can_parse_modeline
- readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
- open readme_ext, 'w' do |io|
- io.puts "# README.EXT - -*- rdoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
- io.puts
- io.puts "This document explains how to make extension libraries for Ruby."
- end
-
- assert_equal RDoc::Parser::Simple, @RP.can_parse(readme_ext)
- ensure
- File.unlink readme_ext
end
##
@@ -132,156 +69,13 @@ class TestRDocParser < RDoc::TestCase
assert_nil @RP.can_parse(hidden_zip)
end
- def test_check_modeline
- readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
- open readme_ext, 'w' do |io|
- io.puts "# README.EXT - -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995"
- io.puts
- io.puts "This document explains how to make extension libraries for Ruby."
- end
-
- assert_equal 'rdoc', @RP.check_modeline(readme_ext)
- ensure
- File.unlink readme_ext
- end
-
- def test_check_modeline_coding
- readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
- open readme_ext, 'w' do |io|
- io.puts "# -*- coding: utf-8 -*-"
- end
-
- assert_nil @RP.check_modeline readme_ext
- ensure
- File.unlink readme_ext
- end
-
- def test_check_modeline_with_other
- readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
- open readme_ext, 'w' do |io|
- io.puts "# README.EXT - -*- mode: RDoc; indent-tabs-mode: nil -*-"
- io.puts
- io.puts "This document explains how to make extension libraries for Ruby."
- end
-
- assert_equal 'rdoc', @RP.check_modeline(readme_ext)
- ensure
- File.unlink readme_ext
- end
-
- def test_check_modeline_no_modeline
- readme_ext = File.join Dir.tmpdir, "README.EXT.#{$$}"
-
- open readme_ext, 'w' do |io|
- io.puts "This document explains how to make extension libraries for Ruby."
- end
-
- assert_nil @RP.check_modeline(readme_ext)
- ensure
- File.unlink readme_ext
- end
-
def test_class_for_binary
rp = @RP.dup
- class << rp
- alias old_can_parse can_parse
- end
-
def rp.can_parse(*args) nil end
assert_nil @RP.for(nil, @binary_dat, nil, nil, nil)
end
- def test_class_for_markup
- content = <<-CONTENT
-# coding: utf-8 markup: rd
- CONTENT
-
- parser = @RP.for @top_level, __FILE__, content, @options, nil
-
- assert_kind_of @RP::RD, parser
- end
-
- def test_class_use_markup
- content = <<-CONTENT
-# coding: utf-8 markup: rd
- CONTENT
-
- parser = @RP.use_markup content
-
- assert_equal @RP::RD, parser
- end
-
- def test_class_use_markup_markdown
- content = <<-CONTENT
-# coding: utf-8 markup: markdown
- CONTENT
-
- parser = @RP.use_markup content
-
- assert_equal @RP::Ruby, parser
- end
-
- def test_class_use_markup_modeline
- content = <<-CONTENT
-# -*- coding: utf-8 -*-
-# markup: rd
- CONTENT
-
- parser = @RP.use_markup content
-
- assert_equal @RP::RD, parser
- end
-
- def test_class_use_markup_modeline_shebang
- content = <<-CONTENT
-#!/bin/sh
-/* -*- coding: utf-8 -*-
- * markup: rd
- */
- CONTENT
-
- parser = @RP.use_markup content
-
- assert_equal @RP::RD, parser
- end
-
- def test_class_use_markup_shebang
- content = <<-CONTENT
-#!/usr/bin/env ruby
-# coding: utf-8 markup: rd
- CONTENT
-
- parser = @RP.use_markup content
-
- assert_equal @RP::RD, parser
- end
-
- def test_class_use_markup_tomdoc
- content = <<-CONTENT
-# coding: utf-8 markup: tomdoc
- CONTENT
-
- parser = @RP.use_markup content
-
- assert_equal @RP::Ruby, parser
- end
-
- def test_class_use_markup_none
- parser = @RP.use_markup ''
-
- assert_nil parser
- end
-
- def test_initialize
- @RP.new @top_level, @fn, '', @options, nil
-
- assert_equal @RP, @top_level.parser
- end
-
end
diff --git a/test/rdoc/test_rdoc_parser_c.rb b/test/rdoc/test_rdoc_parser_c.rb
index 8fe1bf46ec..4f5d9e3171 100644
--- a/test/rdoc/test_rdoc_parser_c.rb
+++ b/test/rdoc/test_rdoc_parser_c.rb
@@ -1,264 +1,35 @@
-require 'rdoc/test_case'
+require 'stringio'
+require 'tempfile'
+require 'rubygems'
+require 'minitest/unit'
+require 'rdoc/options'
+require 'rdoc/parser/c'
-=begin
- TODO: test call-seq parsing
+class RDoc::Parser::C
+ attr_accessor :classes
-/*
- * 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"
- */
-
-assert call-seq did not stop at first empty line
-
-/*
- * call-seq:
- *
- * flt ** other -> float
- *
- * Raises <code>float</code> the <code>other</code> power.
- *
- * 2.0**3 #=> 8.0
- */
-
-assert call-seq correct (bug: was empty)
-
-/* call-seq: flt ** other -> float */
-
-assert call-seq correct
-
-=end
+ public :do_classes, :do_constants
+end
-class TestRDocParserC < RDoc::TestCase
+class TestRDocParserC < MiniTest::Unit::TestCase
def setup
- super
-
@tempfile = Tempfile.new self.class.name
filename = @tempfile.path
- @top_level = @store.add_file filename
+ @top_level = RDoc::TopLevel.new filename
@fn = filename
@options = RDoc::Options.new
- @options.verbosity = 2
- @stats = RDoc::Stats.new @store, 0
+ @stats = RDoc::Stats.new 0
+
+ RDoc::Parser::C.reset
+ RDoc::TopLevel.reset
end
def teardown
- super
-
@tempfile.close
end
- def test_class_can_parse
- c_parser = RDoc::Parser::C
-
- temp_dir do
- FileUtils.touch 'file.C'
- assert_equal c_parser, c_parser.can_parse('file.C')
-
- FileUtils.touch 'file.CC'
- assert_equal c_parser, c_parser.can_parse('file.CC')
-
- FileUtils.touch 'file.H'
- assert_equal c_parser, c_parser.can_parse('file.H')
-
- FileUtils.touch 'file.HH'
- assert_equal c_parser, c_parser.can_parse('file.HH')
-
- FileUtils.touch 'file.c'
- assert_equal c_parser, c_parser.can_parse('file.c')
-
- FileUtils.touch 'file.cc'
- assert_equal c_parser, c_parser.can_parse('file.cc')
-
- FileUtils.touch 'file.cpp'
- assert_equal c_parser, c_parser.can_parse('file.cpp')
-
- FileUtils.touch 'file.cxx'
- assert_equal c_parser, c_parser.can_parse('file.cxx')
-
- FileUtils.touch 'file.h'
- assert_equal c_parser, c_parser.can_parse('file.h')
-
- FileUtils.touch 'file.hh'
- assert_equal c_parser, c_parser.can_parse('file.hh')
-
- FileUtils.touch 'file.y'
- assert_equal c_parser, c_parser.can_parse('file.y')
- end
- end
-
- def test_initialize
- some_ext = @top_level.add_class RDoc::NormalClass, 'SomeExt'
- @top_level.add_class RDoc::SingleClass, 'SomeExtSingle'
-
- @store.cache[:c_class_variables] = {
- @fn => { 'cSomeExt' => 'SomeExt' }
- }
-
- @store.cache[:c_singleton_class_variables] = {
- @fn => { 'cSomeExtSingle' => 'SomeExtSingle' }
- }
-
- parser = RDoc::Parser::C.new @top_level, @fn, '', @options, @stats
-
- expected = { 'cSomeExt' => some_ext }
- assert_equal expected, parser.classes
-
- expected = { 'cSomeExtSingle' => 'SomeExtSingle' }
- assert_equal expected, parser.singleton_classes
-
- expected = {
- 'cSomeExt' => 'SomeExt',
- 'cSomeExtSingle' => 'SomeExtSingle',
- }
- known_classes = parser.known_classes.delete_if do |key, _|
- RDoc::KNOWN_CLASSES.keys.include? key
- end
-
- assert_equal expected, known_classes
- end
-
- def test_do_attr_rb_attr
- content = <<-EOF
-void Init_Blah(void) {
- cBlah = rb_define_class("Blah", rb_cObject);
-
- /*
- * This is an accessor
- */
- rb_attr(cBlah, rb_intern("accessor"), 1, 1, Qfalse);
-
- /*
- * This is a reader
- */
- rb_attr(cBlah, rb_intern("reader"), 1, 0, Qfalse);
-
- /*
- * This is a writer
- */
- rb_attr(cBlah, rb_intern("writer"), 0, 1, Qfalse);
-}
- EOF
-
- klass = util_get_class content, 'cBlah'
-
- attrs = klass.attributes
- assert_equal 3, attrs.length, attrs.inspect
-
- accessor = attrs.shift
- assert_equal 'accessor', accessor.name
- assert_equal 'RW', accessor.rw
- assert_equal 'This is an accessor', accessor.comment.text
- assert_equal @top_level, accessor.file
-
- reader = attrs.shift
- assert_equal 'reader', reader.name
- assert_equal 'R', reader.rw
- assert_equal 'This is a reader', reader.comment.text
-
- writer = attrs.shift
- assert_equal 'writer', writer.name
- assert_equal 'W', writer.rw
- assert_equal 'This is a writer', writer.comment.text
- end
-
- def test_do_attr_rb_define_attr
- content = <<-EOF
-void Init_Blah(void) {
- cBlah = rb_define_class("Blah", rb_cObject);
-
- /*
- * This is an accessor
- */
- rb_define_attr(cBlah, "accessor", 1, 1);
-}
- EOF
-
- klass = util_get_class content, 'cBlah'
-
- attrs = klass.attributes
- assert_equal 1, attrs.length, attrs.inspect
-
- accessor = attrs.shift
- assert_equal 'accessor', accessor.name
- assert_equal 'RW', accessor.rw
- assert_equal 'This is an accessor', accessor.comment.text
- assert_equal @top_level, accessor.file
- end
-
- def test_do_aliases
- content = <<-EOF
-/*
- * This should show up as an alias with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
-
- rb_define_method(cDate, "blah", blah, 1);
-
- rb_define_alias(cDate, "bleh", "blah");
-}
- EOF
-
- klass = util_get_class content, 'cDate'
-
- methods = klass.method_list
- assert_equal 2, methods.length
- assert_equal 'bleh', methods.last.name
- assert_equal 'blah', methods.last.is_alias_for.name
-
- assert_equal @top_level, methods.last.is_alias_for.file
- assert_equal @top_level, methods.last.file
- end
-
- def test_do_aliases_singleton
- content = <<-EOF
-/*
- * This should show up as a method with documentation
- */
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
- sDate = rb_singleton_class(cDate);
-
- rb_define_method(sDate, "blah", blah, 1);
-
- /*
- * This should show up as an alias
- */
- rb_define_alias(sDate, "bleh", "blah");
-}
- EOF
-
- klass = util_get_class content, 'cDate'
-
- methods = klass.method_list
-
- assert_equal 2, methods.length
- assert_equal 'bleh', methods.last.name
- assert methods.last.singleton
- assert_equal 'blah', methods.last.is_alias_for.name
- assert_equal 'This should show up as an alias', methods.last.comment.text
- end
-
def test_do_classes_boot_class
content = <<-EOF
/* Document-class: Foo
@@ -268,7 +39,7 @@ VALUE cFoo = boot_defclass("Foo", rb_cObject);
EOF
klass = util_get_class content, 'cFoo'
- assert_equal "this is the Foo boot class", klass.comment.text
+ assert_equal "this is the Foo boot class", klass.comment
assert_equal 'Object', klass.superclass
end
@@ -281,25 +52,10 @@ VALUE cFoo = boot_defclass("Foo", 0);
EOF
klass = util_get_class content, 'cFoo'
- assert_equal "this is the Foo boot class", klass.comment.text
+ assert_equal "this is the Foo boot class", klass.comment
assert_equal nil, klass.superclass
end
- def test_do_aliases_missing_class
- content = <<-EOF
-void Init_Blah(void) {
- rb_define_alias(cDate, "b", "a");
-}
- EOF
-
- _, err = verbose_capture_io do
- refute util_get_class(content, 'cDate')
- end
-
- assert_equal "Enclosing class or module \"cDate\" for alias b a is not known\n",
- err
- end
-
def test_do_classes_class
content = <<-EOF
/* Document-class: Foo
@@ -309,21 +65,7 @@ VALUE cFoo = rb_define_class("Foo", rb_cObject);
EOF
klass = util_get_class content, 'cFoo'
- assert_equal "this is the Foo class", klass.comment.text
- end
-
- def test_do_classes_struct
- content = <<-EOF
-/* Document-class: Foo
- * this is the Foo class
- */
-VALUE cFoo = rb_struct_define_without_accessor(
- "Foo", rb_cObject, foo_alloc,
- "some", "various", "fields", NULL);
- EOF
-
- klass = util_get_class content, 'cFoo'
- assert_equal "this is the Foo class", klass.comment.text
+ assert_equal "this is the Foo class", klass.comment
end
def test_do_classes_class_under
@@ -335,34 +77,7 @@ VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_cObject);
EOF
klass = util_get_class content, 'cFoo'
- assert_equal 'Kernel::Foo', klass.full_name
- assert_equal "this is the Foo class under Kernel", klass.comment.text
- end
-
- def test_do_classes_class_under_rb_path2class
- content = <<-EOF
-/* Document-class: Kernel::Foo
- * this is Kernel::Foo < A::B
- */
-VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_path2class("A::B"));
- EOF
-
- klass = util_get_class content, 'cFoo'
-
- assert_equal 'Kernel::Foo', klass.full_name
- assert_equal 'A::B', klass.superclass
- assert_equal 'this is Kernel::Foo < A::B', klass.comment.text
- end
-
- def test_do_classes_singleton
- content = <<-EOF
-VALUE cFoo = rb_define_class("Foo", rb_cObject);
-VALUE cFooS = rb_singleton_class(cFoo);
- EOF
-
- util_get_class content, 'cFooS'
-
- assert_equal 'Foo', @parser.singleton_classes['cFooS']
+ assert_equal "this is the Foo class under Kernel", klass.comment
end
def test_do_classes_module
@@ -374,7 +89,7 @@ VALUE mFoo = rb_define_module("Foo");
EOF
klass = util_get_class content, 'mFoo'
- assert_equal "this is the Foo module", klass.comment.text
+ assert_equal "this is the Foo module", klass.comment
end
def test_do_classes_module_under
@@ -386,7 +101,7 @@ VALUE mFoo = rb_define_module_under(rb_mKernel, "Foo");
EOF
klass = util_get_class content, 'mFoo'
- assert_equal "this is the Foo module under Kernel", klass.comment.text
+ assert_equal "this is the Foo module under Kernel", klass.comment
end
def test_do_constants
@@ -436,12 +151,6 @@ void Init_foo(){
*/
rb_define_const(cFoo, "MULTILINE_NOT_EMPTY", INT2FIX(1));
- /*
- * Multiline comment goes here because this comment spans multiple lines.
- * 1: However, the value extraction should only happen for the first line
- */
- rb_define_const(cFoo, "MULTILINE_COLON_ON_SECOND_LINE", INT2FIX(1));
-
}
EOF
@@ -456,9 +165,7 @@ void Init_foo(){
constants = klass.constants
assert !klass.constants.empty?
- assert_equal @top_level, constants.first.file
-
- constants = constants.map { |c| [c.name, c.value, c.comment.text] }
+ constants = constants.map { |c| [c.name, c.value, c.comment] }
assert_equal ['PERFECT', '300', 'The highest possible score in bowling '],
constants.shift
@@ -491,274 +198,27 @@ Multiline comment goes here because this comment spans multiple lines.
assert_equal ['MULTILINE_VALUE', '1', comment], constants.shift
assert_equal ['MULTILINE_NOT_EMPTY', 'INT2FIX(1)', comment], constants.shift
- comment = <<-EOF.chomp
-Multiline comment goes here because this comment spans multiple lines.
-1: However, the value extraction should only happen for the first line
- EOF
- assert_equal ['MULTILINE_COLON_ON_SECOND_LINE', 'INT2FIX(1)', comment],
- constants.shift
-
assert constants.empty?, constants.inspect
end
- def test_do_constants_curses
- content = <<-EOF
-void Init_curses(){
- mCurses = rb_define_module("Curses");
-
- /*
- * Document-const: Curses::COLOR_BLACK
- *
- * Value of the color black
- */
- rb_curses_define_const(COLOR_BLACK);
-}
- EOF
-
- @parser = util_parser content
-
- @parser.do_modules
- @parser.do_classes
- @parser.do_constants
-
- klass = @parser.classes['mCurses']
-
- constants = klass.constants
- refute_empty klass.constants
-
- assert_equal 'COLOR_BLACK', constants.first.name
- assert_equal 'UINT2NUM(COLOR_BLACK)', constants.first.value
- assert_equal 'Value of the color black', constants.first.comment.text
- end
-
- def test_do_constants_file
- content = <<-EOF
-void Init_File(void) {
- rb_cFile = rb_define_class("File", rb_cIO);
- rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
- rb_include_module(rb_cIO, rb_mFConst);
-
- /* Document-const: LOCK_SH
- *
- * Shared lock
- */
- rb_file_const("LOCK_SH", INT2FIX(LOCK_SH));
-}
- EOF
-
- @parser = util_parser content
-
- @parser.do_modules
- @parser.do_classes
- @parser.do_constants
-
- klass = @parser.classes['rb_mFConst']
-
- constants = klass.constants
- refute_empty klass.constants
-
- constant = constants.first
-
- assert_equal 'LOCK_SH', constant.name
- assert_equal 'INT2FIX(LOCK_SH)', constant.value
- assert_equal 'Shared lock', constant.comment.text
- end
-
- def test_do_includes
- content = <<-EOF
-Init_foo() {
- VALUE cFoo = rb_define_class("Foo", rb_cObject);
- VALUE mInc = rb_define_module("Inc");
-
- rb_include_module(cFoo, mInc);
-}
- EOF
-
- klass = util_get_class content, 'cFoo'
-
- incl = klass.includes.first
- assert_equal 'Inc', incl.name
- assert_equal '', incl.comment.text
- assert_equal @top_level, incl.file
- end
-
- # HACK parsing warning instead of setting up in file
- def test_do_methods_in_c
- content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
-
- rb_define_method(cDate, "blah", blah, 1); /* in blah.c */
-}
- EOF
-
- klass = nil
-
- _, err = verbose_capture_io do
- klass = util_get_class content, 'cDate'
- end
-
- assert_match ' blah.c ', err
- end
-
- # HACK parsing warning instead of setting up in file
- def test_do_methods_in_cpp
- content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
-
- rb_define_method(cDate, "blah", blah, 1); /* in blah.cpp */
-}
- EOF
-
- klass = nil
-
- _, err = verbose_capture_io do
- klass = util_get_class content, 'cDate'
- end
-
- assert_match ' blah.cpp ', err
- end
-
- # HACK parsing warning instead of setting up in file
- def test_do_methods_in_y
- content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
-
- rb_define_method(cDate, "blah", blah, 1); /* in blah.y */
-}
- EOF
-
- klass = nil
-
- _, err = verbose_capture_io do
- klass = util_get_class content, 'cDate'
- end
-
- assert_match ' blah.y ', err
- end
-
- def test_do_methods_singleton_class
- content = <<-EOF
-VALUE blah(VALUE klass, VALUE year) {
-}
-
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
- sDate = rb_singleton_class(cDate);
-
- rb_define_method(sDate, "blah", blah, 1);
-}
- EOF
-
- klass = util_get_class content, 'cDate'
-
- methods = klass.method_list
- assert_equal 1, methods.length
- assert_equal 'blah', methods.first.name
- assert methods.first.singleton
- end
-
- def test_do_missing
- parser = util_parser
-
- klass_a = @top_level.add_class RDoc::ClassModule, 'A'
- parser.classes['a'] = klass_a
-
- parser.enclosure_dependencies['c'] << 'b'
- parser.enclosure_dependencies['b'] << 'a'
- parser.enclosure_dependencies['d'] << 'a'
-
- parser.missing_dependencies['d'] = ['d', :class, 'D', 'Object', 'a']
- parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
- parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
- parser.do_missing
-
- assert_equal %w[A A::B A::B::C A::D],
- @store.all_classes_and_modules.map { |m| m.full_name }.sort
- end
-
- def test_do_missing_cycle
- parser = util_parser
-
- klass_a = @top_level.add_class RDoc::ClassModule, 'A'
- parser.classes['a'] = klass_a
-
- parser.enclosure_dependencies['c'] << 'b'
- parser.enclosure_dependencies['b'] << 'a'
-
- parser.missing_dependencies['c'] = ['c', :class, 'C', 'Object', 'b']
- parser.missing_dependencies['b'] = ['b', :class, 'B', 'Object', 'a']
-
- parser.enclosure_dependencies['y'] << 'z'
- parser.enclosure_dependencies['z'] << 'y'
-
- parser.missing_dependencies['y'] = ['y', :class, 'Y', 'Object', 'z']
- parser.missing_dependencies['z'] = ['z', :class, 'Z', 'Object', 'y']
-
- _, err = verbose_capture_io do
- parser.do_missing
- end
-
- expected = 'Unable to create class Y (y), class Z (z) ' +
- 'due to a cyclic class or module creation'
-
- assert_equal expected, err.chomp
-
- assert_equal %w[A A::B A::B::C],
- @store.all_classes_and_modules.map { |m| m.full_name }.sort
- end
-
- def test_find_alias_comment
- parser = util_parser
-
- comment = parser.find_alias_comment 'C', '[]', 'index'
-
- assert_equal '', comment.text
-
- parser = util_parser <<-C
-/*
- * comment
- */
-
-rb_define_alias(C, "[]", "index");
- C
-
- comment = parser.find_alias_comment 'C', '[]', 'index'
-
- assert_equal "/*\n * comment\n */\n\n", comment.text
- end
-
- def test_find_class_comment
+ def test_find_class_comment_include
@options.rdoc_include << File.dirname(__FILE__)
content = <<-EOF
/*
- * Comment 1
- */
-foo = rb_define_class("MyClassName1", rb_cObject);
-
-/*
- * Comment 2
+ * a comment for class Foo
+ *
+ * :include: test.txt
*/
-bar = rb_define_class("MyClassName2", rb_cObject);
+void
+Init_Foo(void) {
+ VALUE foo = rb_define_class("Foo", rb_cObject);
+}
EOF
- util_get_class content
+ klass = util_get_class content, 'foo'
- assert_equal "Comment 1", @parser.classes['foo'].comment.text
- assert_equal "Comment 2", @parser.classes['bar'].comment.text
+ assert_equal "a comment for class Foo\n\ntest file", klass.comment
end
def test_find_class_comment_init
@@ -774,7 +234,7 @@ Init_Foo(void) {
klass = util_get_class content, 'foo'
- assert_equal "a comment for class Foo", klass.comment.text
+ assert_equal "a comment for class Foo", klass.comment
end
def test_find_class_comment_define_class
@@ -787,7 +247,7 @@ VALUE foo = rb_define_class("Foo", rb_cObject);
klass = util_get_class content, 'foo'
- assert_equal "a comment for class Foo", klass.comment.text
+ assert_equal "a comment for class Foo", klass.comment
end
def test_find_class_comment_define_class_Init_Foo
@@ -806,7 +266,7 @@ Init_Foo(void) {
klass = util_get_class content, 'foo'
- assert_equal "a comment for class Foo on Init", klass.comment.text
+ assert_equal "a comment for class Foo on Init", klass.comment
end
def test_find_class_comment_define_class_Init_Foo_no_void
@@ -825,7 +285,7 @@ Init_Foo() {
klass = util_get_class content, 'foo'
- assert_equal "a comment for class Foo on Init", klass.comment.text
+ assert_equal "a comment for class Foo on Init", klass.comment
end
def test_find_class_comment_define_class_bogus_comment
@@ -845,89 +305,7 @@ Init_Foo(void) {
klass = util_get_class content, 'foo'
- assert_equal '', klass.comment.text
- end
-
- def test_find_class_comment_define_class_under
- content = <<-EOF
-/*
- * a comment for class Foo
- */
-VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
- EOF
-
- klass = util_get_class content, 'foo'
-
- assert_equal "a comment for class Foo", klass.comment.text
- end
-
- def test_find_class_comment_define_class_under_Init
- content = <<-EOF
-/*
- * a comment for class Foo on Init
- */
-void
-Init_Foo(void) {
- /*
- * a comment for class Foo on rb_define_class
- */
- VALUE foo = rb_define_class_under(rb_cObject, "Foo", rb_cObject);
-}
- EOF
-
- klass = util_get_class content, 'foo'
-
- # the inner comment is used since Object::Foo is not necessarily the same
- # thing as "Foo" for Init_
- assert_equal "a comment for class Foo on rb_define_class",
- klass.comment.text
- end
-
- def test_find_const_comment_rb_define
- content = <<-EOF
-/*
- * A comment
- */
-rb_define_const(cFoo, "CONST", value);
- EOF
-
- parser = util_parser content
-
- comment = parser.find_const_comment 'const', 'CONST'
-
- assert_equal "/*\n * A comment\n */\n", comment.text
- end
-
- def test_find_const_comment_document_const
- content = <<-EOF
-/*
- * Document-const: CONST
- *
- * A comment
- */
- EOF
-
- parser = util_parser content
-
- comment = parser.find_const_comment nil, 'CONST'
-
- assert_equal "/*\n *\n * A comment\n */", comment.text
- end
-
- def test_find_const_comment_document_const_full_name
- content = <<-EOF
-/*
- * Document-const: Foo::CONST
- *
- * A comment
- */
- EOF
-
- parser = util_parser content
-
- comment = parser.find_const_comment nil, 'CONST', 'Foo'
-
- assert_equal "/*\n *\n * A comment\n */", comment.text
+ assert_equal '', klass.comment
end
def test_find_body
@@ -952,91 +330,16 @@ Init_Foo(void) {
assert_equal 'my_method', other_function.name
assert_equal "a comment for other_function",
- other_function.comment.text
+ other_function.comment
assert_equal '()', other_function.params
code = other_function.token_stream.first.text
- assert_equal "VALUE\nother_function() {\n}", code
- end
-
- def test_find_body_2
- content = <<-CONTENT
-/* Copyright (C) 2010 Sven Herzberg
- *
- * This file is free software; the author(s) gives unlimited
- * permission to copy and/or distribute it, with or without
- * modifications, as long as this notice is preserved.
- */
-
-#include <ruby.h>
-
-static VALUE
-wrap_initialize (VALUE self)
-{
- return self;
-}
-
-/* */
-static VALUE
-wrap_shift (VALUE self,
- VALUE arg)
-{
- return self;
-}
-
-void
-init_gi_repository (void)
-{
- VALUE mTest = rb_define_module ("Test");
- VALUE cTest = rb_define_class_under (mTest, "Test", rb_cObject);
-
- rb_define_method (cTest, "initialize", wrap_initialize, 0);
- rb_define_method (cTest, "shift", wrap_shift, 0);
-}
- CONTENT
-
- klass = util_get_class content, 'cTest'
- assert_equal 2, klass.method_list.length
+ assert_equal "VALUE\nother_function() ", code
end
def test_find_body_define
content = <<-EOF
-#define something something_else
-
-#define other_function rb_other_function
-
-/*
- * a comment for rb_other_function
- */
-VALUE
-rb_other_function() {
-}
-
-void
-Init_Foo(void) {
- VALUE foo = rb_define_class("Foo", rb_cObject);
-
- rb_define_method(foo, "my_method", other_function, 0);
-}
- EOF
-
- klass = util_get_class content, 'foo'
- other_function = klass.method_list.first
-
- assert_equal 'my_method', other_function.name
- assert_equal 'a comment for rb_other_function', other_function.comment.text
- assert_equal '()', other_function.params
- assert_equal 118, other_function.offset
- assert_equal 8, other_function.line
-
- code = other_function.token_stream.first.text
-
- assert_equal "VALUE\nrb_other_function() {\n}", code
- end
-
- def test_find_body_define_comment
- content = <<-EOF
/*
* a comment for other_function
*/
@@ -1059,10 +362,9 @@ Init_Foo(void) {
other_function = klass.method_list.first
assert_equal 'my_method', other_function.name
- assert_equal 'a comment for other_function', other_function.comment.text
+ assert_equal "a comment for other_function",
+ other_function.comment
assert_equal '()', other_function.params
- assert_equal 39, other_function.offset
- assert_equal 4, other_function.line
code = other_function.token_stream.first.text
@@ -1097,347 +399,22 @@ Init_Foo(void) {
bar = methods.first
assert_equal 'Foo#bar', bar.full_name
- assert_equal "a comment for bar", bar.comment.text
+ assert_equal "a comment for bar", bar.comment
baz = methods.last
assert_equal 'Foo#baz', baz.full_name
- assert_equal "a comment for bar", baz.comment.text
- end
-
- def test_find_body_document_method_equals
- content = <<-EOF
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
-static VALUE
-rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
-{
-
-void
-Init_zlib() {
- mZlib = rb_define_module("Zlib");
- cGzipFile = rb_define_class_under(mZlib, "GzipFile", rb_cObject);
- cGzipWriter = rb_define_class_under(mZlib, "GzipWriter", cGzipFile);
- rb_define_method(cGzipWriter, "mtime=", rb_gzfile_set_mtime, 1);
-}
- EOF
-
- klass = util_get_class content, 'cGzipWriter'
- assert_equal 1, klass.method_list.length
-
- methods = klass.method_list.sort
-
- bar = methods.first
- assert_equal 'Zlib::GzipWriter#mtime=', bar.full_name
- assert_equal 'A comment', bar.comment.text
- end
-
- def test_find_body_document_method_same
- content = <<-EOF
-VALUE
-s_bar() {
-}
-
-VALUE
-bar() {
-}
-
-/*
- * Document-method: Foo::bar
- *
- * a comment for Foo::bar
- */
-
-/*
- * Document-method: Foo#bar
- *
- * a comment for Foo#bar
- */
-
-void
-Init_Foo(void) {
- VALUE foo = rb_define_class("Foo", rb_cObject);
-
- rb_define_singleton_method(foo, "bar", s_bar, 0);
- rb_define_method(foo, "bar", bar, 0);
-}
- EOF
-
- klass = util_get_class content, 'foo'
- assert_equal 2, klass.method_list.length
-
- methods = klass.method_list.sort
-
- s_bar = methods.first
- assert_equal 'Foo::bar', s_bar.full_name
- assert_equal "a comment for Foo::bar", s_bar.comment.text
-
- bar = methods.last
- assert_equal 'Foo#bar', bar.full_name
- assert_equal "a comment for Foo#bar", bar.comment.text
- end
-
- def test_find_modifiers_call_seq
- comment = RDoc::Comment.new <<-COMMENT
-call-seq:
- commercial() -> Date <br />
-
-If no arguments are given:
-
- COMMENT
-
- parser = util_parser
- method_obj = RDoc::AnyMethod.new nil, 'blah'
-
- parser.find_modifiers comment, method_obj
-
- expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-
- CALL_SEQ
-
- assert_equal expected, method_obj.call_seq
- end
-
- def test_find_modifiers_nodoc
- comment = RDoc::Comment.new <<-COMMENT
-/* :nodoc:
- *
- * Blah
- */
-
- COMMENT
-
- parser = util_parser
- method_obj = RDoc::AnyMethod.new nil, 'blah'
-
- parser.find_modifiers comment, method_obj
-
- assert_equal nil, method_obj.document_self
- end
-
- def test_find_modifiers_yields
- comment = RDoc::Comment.new <<-COMMENT
-/* :yields: a, b
- *
- * Blah
- */
-
- COMMENT
-
- parser = util_parser
- method_obj = RDoc::AnyMethod.new nil, 'blah'
-
- parser.find_modifiers comment, method_obj
-
- assert_equal 'a, b', method_obj.block_params
-
- assert_equal "\n\nBlah", comment.text
- end
-
- def test_handle_method_args_minus_1
- parser = util_parser "Document-method: Object#m\n blah */"
-
- parser.content = <<-BODY
-VALUE
-rb_other(VALUE obj) {
- rb_funcall(obj, rb_intern("other"), 0);
- return rb_str_new2("blah, blah, blah");
-}
-
-VALUE
-rb_m(int argc, VALUE *argv, VALUE obj) {
- VALUE o1, o2;
- rb_scan_args(argc, argv, "1", &o1, &o2);
-}
- BODY
-
- parser.handle_method 'method', 'rb_cObject', 'm', 'rb_m', -1
-
- m = @top_level.find_module_named('Object').method_list.first
-
- assert_equal 'm', m.name
- assert_equal @top_level, m.file
- assert_equal 115, m.offset
- assert_equal 7, m.line
-
- assert_equal '(p1)', m.params
- end
-
- def test_handle_method_args_0
- parser = util_parser "Document-method: BasicObject#==\n blah */"
-
- parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 0
-
- bo = @top_level.find_module_named 'BasicObject'
-
- assert_equal 1, bo.method_list.length
-
- equals2 = bo.method_list.first
-
- assert_equal '()', equals2.params
- end
-
- def test_handle_method_args_1
- parser = util_parser "Document-method: BasicObject#==\n blah */"
-
- parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 1
-
- bo = @top_level.find_module_named 'BasicObject'
-
- assert_equal 1, bo.method_list.length
-
- equals2 = bo.method_list.first
-
- assert_equal '(p1)', equals2.params
- end
-
- def test_handle_method_args_2
- parser = util_parser "Document-method: BasicObject#==\n blah */"
-
- parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 2
-
- bo = @top_level.find_module_named 'BasicObject'
-
- assert_equal 1, bo.method_list.length
-
- equals2 = bo.method_list.first
-
- assert_equal '(p1, p2)', equals2.params
- end
-
- # test_handle_args_minus_1 handled by test_handle_method
-
- def test_handle_method_args_minus_2
- parser = util_parser "Document-method: BasicObject#==\n blah */"
-
- parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', -2
-
- bo = @top_level.find_module_named 'BasicObject'
-
- assert_equal 1, bo.method_list.length
-
- equals2 = bo.method_list.first
-
- assert_equal '(*args)', equals2.params
- end
-
- def test_handle_method_initialize
- parser = util_parser "Document-method: BasicObject::new\n blah */"
-
- parser.handle_method('private_method', 'rb_cBasicObject',
- 'initialize', 'rb_obj_dummy', -1)
-
- bo = @top_level.find_module_named 'BasicObject'
-
- assert_equal 1, bo.method_list.length
-
- new = bo.method_list.first
-
- assert_equal 'new', new.name
- assert_equal :public, new.visibility
- end
-
- def test_handle_singleton
- parser = util_parser <<-SINGLE
-void Init_Blah(void) {
- cDate = rb_define_class("Date", rb_cObject);
- sDate = rb_singleton_class(cDate);
-}
- SINGLE
-
- parser.scan
-
- assert_equal 'Date', parser.known_classes['sDate']
- assert_equal 'Date', parser.singleton_classes['sDate']
+ assert_equal "a comment for bar", bar.comment
end
def test_look_for_directives_in
- parser = util_parser
+ parser = util_parser ''
- comment = RDoc::Comment.new "# :other: not_handled\n"
+ comment = "# :markup: not_rdoc\n"
parser.look_for_directives_in @top_level, comment
- assert_equal "# :other: not_handled\n", comment.text
- assert_equal 'not_handled', @top_level.metadata['other']
- end
-
- def test_load_variable_map
- some_ext = @top_level.add_class RDoc::NormalClass, 'SomeExt'
- @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
- @store.cache[:c_class_variables][@fn] = { 'cSomeExt' => 'SomeExt' }
- @store.cache[:c_class_variables]['other.c'] = { 'cOtherExt' => 'OtherExt' }
-
- parser = util_parser
-
- map = parser.load_variable_map :c_class_variables
-
- expected = { 'cSomeExt' => some_ext }
-
- assert_equal expected, map
-
- assert_equal 'SomeExt', parser.known_classes['cSomeExt']
- assert_nil parser.known_classes['cOtherExt']
- end
-
- def test_load_variable_map_empty
- parser = util_parser
-
- map = parser.load_variable_map :c_class_variables
-
- assert_empty map
- end
-
- def test_load_variable_map_legacy
- @store.cache[:c_class_variables] = nil
-
- parser = util_parser
-
- map = parser.load_variable_map :c_class_variables
-
- assert_empty map
- end
-
- def test_load_variable_map_singleton
- @top_level.add_class RDoc::NormalClass, 'SomeExt'
- @top_level.add_class RDoc::NormalClass, 'OtherExt'
-
- @store.cache[:c_singleton_class_variables][@fn] =
- { 'cSomeExt' => 'SomeExt' }
- @store.cache[:c_singleton_class_variables]['other.c'] =
- { 'cOtherExt' => 'OtherExt' }
-
- parser = util_parser
-
- map = parser.load_variable_map :c_singleton_class_variables
-
- expected = { 'cSomeExt' => 'SomeExt' }
-
- assert_equal expected, map
-
- assert_equal 'SomeExt', parser.known_classes['cSomeExt']
- assert_nil parser.known_classes['cOtherExt']
- end
-
- def test_load_variable_map_trim
- a = @top_level.add_class RDoc::NormalClass, 'A'
-
- @store.cache[:c_class_variables][@fn] = {
- 'cA' => 'A',
- 'cB' => 'B',
- }
-
- parser = util_parser
-
- map = parser.load_variable_map :c_class_variables
-
- expected = { 'cA' => a }
-
- assert_equal expected, map
+ assert_equal "# :markup: not_rdoc\n", comment
+ assert_equal 'not_rdoc', @top_level.metadata['markup']
end
def test_define_method
@@ -1464,40 +441,7 @@ Init_IO(void) {
klass = util_get_class content, 'rb_cIO'
read_method = klass.method_list.first
assert_equal "read", read_method.name
- assert_equal "Method Comment! ", read_method.comment.text
- assert_equal "rb_io_s_read", read_method.c_function
- assert read_method.singleton
- end
-
- def test_define_method_with_prototype
- content = <<-EOF
-static VALUE rb_io_s_read(int, VALUE*, VALUE);
-
-/* Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
- int argc;
- VALUE *argv;
- VALUE io;
-{
-}
-
-void
-Init_IO(void) {
- /*
- * a comment for class Foo on rb_define_class
- */
- VALUE rb_cIO = rb_define_class("IO", rb_cObject);
- rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
-}
- EOF
-
- klass = util_get_class content, 'rb_cIO'
- read_method = klass.method_list.first
- assert_equal "read", read_method.name
- assert_equal "Method Comment! ", read_method.comment.text
- assert_equal "rb_io_s_read", read_method.c_function
- assert read_method.singleton
+ assert_equal "Method Comment! ", read_method.comment
end
def test_define_method_private
@@ -1525,185 +469,19 @@ Init_IO(void) {
read_method = klass.method_list.first
assert_equal 'IO#read', read_method.full_name
assert_equal :private, read_method.visibility
- assert_equal "Method Comment! ", read_method.comment.text
- end
-
- def test_define_method_private_singleton
- content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
- int argc;
- VALUE *argv;
- VALUE io;
-{
-}
-
-void
-Init_IO(void) {
- /*
- * a comment for class Foo on rb_define_class
- */
- VALUE rb_cIO = rb_define_class("IO", rb_cObject);
- VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
- rb_define_private_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
- EOF
-
- klass = util_get_class content, 'rb_cIO'
- read_method = klass.method_list.first
- assert_equal "read", read_method.name
- assert_equal "Method Comment! ", read_method.comment.text
- assert_equal :private, read_method.visibility
- assert read_method.singleton
- end
-
- def test_define_method_singleton
- content = <<-EOF
-/*Method Comment! */
-static VALUE
-rb_io_s_read(argc, argv, io)
- int argc;
- VALUE *argv;
- VALUE io;
-{
-}
-
-void
-Init_IO(void) {
- /*
- * a comment for class Foo on rb_define_class
- */
- VALUE rb_cIO = rb_define_class("IO", rb_cObject);
- VALUE rb_cIO_s = rb_singleton_class(rb_cIO);
- rb_define_method(rb_cIO_s, "read", rb_io_s_read, -1);
-}
- EOF
-
- klass = util_get_class content, 'rb_cIO'
- read_method = klass.method_list.first
- assert_equal "read", read_method.name
- assert_equal "Method Comment! ", read_method.comment.text
- assert read_method.singleton
- end
-
- def test_rb_scan_args
- parser = util_parser
-
- assert_equal '(p1)',
- parser.rb_scan_args('rb_scan_args(a, b, "1",)')
- assert_equal '(p1, p2)',
- parser.rb_scan_args('rb_scan_args(a, b, "2",)')
-
- assert_equal '(p1 = v1)',
- parser.rb_scan_args('rb_scan_args(a, b, "01",)')
- assert_equal '(p1 = v1, p2 = v2)',
- parser.rb_scan_args('rb_scan_args(a, b, "02",)')
-
- assert_equal '(p1, p2 = v2)',
- parser.rb_scan_args('rb_scan_args(a, b, "11",)')
-
- assert_equal '(p1, *args)',
- parser.rb_scan_args('rb_scan_args(a, b, "1*",)')
- assert_equal '(p1, p2 = {})',
- parser.rb_scan_args('rb_scan_args(a, b, "1:",)')
- assert_equal '(p1, &block)',
- parser.rb_scan_args('rb_scan_args(a, b, "1&",)')
-
- assert_equal '(p1, p2)',
- parser.rb_scan_args('rb_scan_args(a, b, "101",)')
-
- assert_equal '(p1, p2 = v2, p3)',
- parser.rb_scan_args('rb_scan_args(a, b, "111",)')
-
- assert_equal '(p1, *args, p3)',
- parser.rb_scan_args('rb_scan_args(a, b, "1*1",)')
-
- assert_equal '(p1, p2 = v2, *args)',
- parser.rb_scan_args('rb_scan_args(a, b, "11*",)')
- assert_equal '(p1, p2 = v2, p3 = {})',
- parser.rb_scan_args('rb_scan_args(a, b, "11:",)')
- assert_equal '(p1, p2 = v2, &block)',
- parser.rb_scan_args('rb_scan_args(a, b, "11&",)')
-
- assert_equal '(p1, p2 = v2, *args, p4, p5 = {}, &block)',
- parser.rb_scan_args('rb_scan_args(a, b, "11*1:&",)')
-
- # The following aren't valid according to spec but are according to the
- # implementation.
- assert_equal '(*args)',
- parser.rb_scan_args('rb_scan_args(a, b, "*",)')
- assert_equal '(p1 = {})',
- parser.rb_scan_args('rb_scan_args(a, b, ":",)')
- assert_equal '(&block)',
- parser.rb_scan_args('rb_scan_args(a, b, "&",)')
-
- assert_equal '(*args, p2 = {})',
- parser.rb_scan_args('rb_scan_args(a, b, "*:",)')
- assert_equal '(p1 = {}, &block)',
- parser.rb_scan_args('rb_scan_args(a, b, ":&",)')
- assert_equal '(*args, p2 = {}, &block)',
- parser.rb_scan_args('rb_scan_args(a, b, "*:&",)')
- end
-
- def test_scan
- parser = util_parser <<-C
-void Init(void) {
- mM = rb_define_module("M");
- cC = rb_define_class("C", rb_cObject);
- sC = rb_singleton_class(cC);
-}
- C
-
- parser.scan
-
- expected = {
- @fn => {
- 'mM' => 'M',
- 'cC' => 'C', }}
- assert_equal expected, @store.c_class_variables
-
- expected = {
- @fn => {
- 'sC' => 'C' } }
- assert_equal expected, @store.c_singleton_class_variables
+ assert_equal "Method Comment! ", read_method.comment
end
- def test_scan_order_dependent
- parser = util_parser <<-C
-void a(void) {
- mA = rb_define_module("A");
-}
-
-void b(void) {
- cB = rb_define_class_under(mA, "B", rb_cObject);
-}
-
-void c(void) {
- mC = rb_define_module_under(cB, "C");
-}
-
-void d(void) {
- mD = rb_define_class_under(mC, "D");
-}
- C
-
- parser.scan
-
- assert_equal %w[A A::B A::B::C],
- @store.all_classes_and_modules.map { |m| m.full_name }.sort
- end
-
- def util_get_class content, name = nil
+ def util_get_class(content, name)
@parser = util_parser content
@parser.scan
-
- @parser.classes[name] if name
+ @parser.classes[name]
end
- def util_parser content = ''
+ def util_parser(content)
RDoc::Parser::C.new @top_level, @fn, content, @options, @stats
end
end
+MiniTest::Unit.autorun
diff --git a/test/rdoc/test_rdoc_parser_changelog.rb b/test/rdoc/test_rdoc_parser_changelog.rb
deleted file mode 100644
index ccd66f2b84..0000000000
--- a/test/rdoc/test_rdoc_parser_changelog.rb
+++ /dev/null
@@ -1,322 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocParserChangeLog < RDoc::TestCase
-
- def setup
- super
-
- @tempfile = Tempfile.new 'ChangeLog'
- @top_level = @store.add_file @tempfile.path
- @options = RDoc::Options.new
- @stats = RDoc::Stats.new @store, 0
- end
-
- def teardown
- @tempfile.close
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_class_can_parse
- parser = RDoc::Parser::ChangeLog
-
- temp_dir do
- FileUtils.touch 'ChangeLog'
- assert_equal parser, parser.can_parse('ChangeLog')
-
- assert_equal parser, parser.can_parse(@tempfile.path)
-
- FileUtils.touch 'ChangeLog.rb'
- assert_equal RDoc::Parser::Ruby, parser.can_parse('ChangeLog.rb')
- end
- end
-
- def test_continue_entry_body
- parser = util_parser
-
- entry_body = ['a']
-
- parser.continue_entry_body entry_body, 'b'
-
- assert_equal ['a b'], entry_body
- end
-
- def test_continue_entry_body_empty
- parser = util_parser
-
- entry_body = []
-
- parser.continue_entry_body entry_body, ''
-
- assert_empty entry_body
- end
-
- def test_continue_entry_body_function
- parser = util_parser
-
- entry_body = ['file: (func1)']
-
- parser.continue_entry_body entry_body, '(func2): blah'
-
- assert_equal ['file: (func1, func2): blah'], entry_body
- end
-
- def test_create_document
- parser = util_parser
-
- groups = {
- '2012-12-04' => [
- ['Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>',
- %w[a:one b:two]],
- ['Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>',
- %w[c:three d:four]]],
- '2012-12-03' => [
- ['Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>',
- %w[e:five f:six]]],
- }
-
- expected =
- doc(
- head(1, File.basename(@tempfile.path)),
- blank_line,
- head(2, '2012-12-04'),
- blank_line,
- head(3, 'Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>'),
- blank_line,
- list(:NOTE, item('a', para('one')), item('b', para('two'))),
- head(3, 'Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>'),
- blank_line,
- list(:NOTE, item('c', para('three')), item('d', para('four'))),
- head(2, '2012-12-03'),
- blank_line,
- head(3, 'Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>'),
- blank_line,
- list(:NOTE, item('e', para('five')), item('f', para('six'))))
-
- expected.file = @top_level
-
- document = parser.create_document(groups)
-
- assert_equal expected, document
-
- assert_equal 2, document.omit_headings_below
-
- headings = document.parts.select do |part|
- RDoc::Markup::Heading === part and part.level == 2
- end
-
- refute headings.all? { |heading| heading.text.frozen? }
- end
-
- def test_create_entries
- parser = util_parser
-
- entries = [
- ['Tue Dec 1 02:03:04 2012 Eric Hodel <drbrain@segment7.net>',
- %w[a:one b:two]],
- ['Tue Dec 5 06:07:08 2012 Eric Hodel <drbrain@segment7.net>',
- %w[c:three d:four]],
- ]
-
- expected = [
- head(3, 'Tue Dec 1 02:03:04 2012 Eric Hodel <drbrain@segment7.net>'),
- blank_line,
- list(:NOTE, item('a', para('one')), item('b', para('two'))),
- head(3, 'Tue Dec 5 06:07:08 2012 Eric Hodel <drbrain@segment7.net>'),
- blank_line,
- list(:NOTE, item('c', para('three')), item('d', para('four'))),
- ]
-
- entries = parser.create_entries(entries)
- assert_equal expected, entries
- end
-
- def test_create_entries_colons
- parser = util_parser
-
- entries = [
- ['Wed Dec 5 12:17:11 2012 Naohisa Goto <ngotogenome@gmail.com>',
- ['func.rb (DL::Function#bind): log stuff [ruby-core:50562]']],
- ]
-
- expected = [
- head(3,
- 'Wed Dec 5 12:17:11 2012 Naohisa Goto <ngotogenome@gmail.com>'),
- blank_line,
- list(:NOTE,
- item('func.rb (DL::Function#bind)',
- para('log stuff [ruby-core:50562]')))]
-
- assert_equal expected, parser.create_entries(entries)
- end
-
- def test_create_items
- parser = util_parser
-
- items = [
- 'README.EXT: Converted to RDoc format',
- 'README.EXT.ja: ditto',
- ]
-
- expected =
- list(:NOTE,
- item('README.EXT',
- para('Converted to RDoc format')),
- item('README.EXT.ja',
- para('ditto')))
-
- assert_equal expected, parser.create_items(items)
- end
-
- def test_group_entries
- parser = util_parser
-
- entries = [
- [ 'Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>',
- %w[one two]],
- [ 'Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>',
- %w[three four]],
- [ 'Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>',
- %w[five six]],
- [ '2008-01-30 H.J. Lu <hongjiu.lu@intel.com>',
- %w[seven eight]]]
-
- expected = {
- '2012-12-04' => [
- ['Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>',
- %w[one two]],
- ['Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>',
- %w[three four]]],
- '2012-12-03' => [
- ['Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>',
- %w[five six]]],
- '2008-01-30' => [
- ['2008-01-30 H.J. Lu <hongjiu.lu@intel.com>',
- %w[seven eight]]],
- }
-
- assert_equal expected, parser.group_entries(entries)
- end
-
- def test_parse_entries
- parser = util_parser <<-ChangeLog
-Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>
-
- * README.EXT: Converted to RDoc format
- * README.EXT.ja: ditto
-
-Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>
-
- * compile.c (iseq_specialized_instruction):
- change condition of using `opt_send_simple'.
- More method invocations can be simple.
-
-Other note that will be ignored
-
- ChangeLog
-
- expected = [
- [ 'Tue Dec 4 08:33:46 2012 Eric Hodel <drbrain@segment7.net>',
- [ 'README.EXT: Converted to RDoc format',
- 'README.EXT.ja: ditto']],
- [ 'Mon Dec 3 20:28:02 2012 Koichi Sasada <ko1@atdot.net>',
- [ 'compile.c (iseq_specialized_instruction): change condition of ' +
- 'using `opt_send_simple\'. More method invocations can be simple.']]]
-
- assert_equal expected, parser.parse_entries
- end
-
- def test_parse_entries_bad_time
- parser = util_parser <<-ChangeLog
-2008-01-30 H.J. Lu <hongjiu.lu@intel.com>
-
- PR libffi/34612
- * src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when
- returning struct.
-
- ChangeLog
-
- expected = [
- [ '2008-01-30 H.J. Lu <hongjiu.lu@intel.com>',
- [ 'src/x86/sysv.S (ffi_closure_SYSV): Pop 4 byte from stack when ' +
- 'returning struct.']]
- ]
-
- assert_equal expected, parser.parse_entries
- end
-
- def test_parse_entries_gnu
- parser = util_parser <<-ChangeLog
-1998-08-17 Richard Stallman <rms@gnu.org>
-
-* register.el (insert-register): Return nil.
-(jump-to-register): Likewise.
-
-* sort.el (sort-subr): Return nil.
-
-* keyboard.c (menu_bar_items, tool_bar_items)
-(Fexecute_extended_command): Deal with 'keymap' property.
- ChangeLog
-
- expected = [
- [ '1998-08-17 Richard Stallman <rms@gnu.org>',
- [ 'register.el (insert-register): Return nil.',
- '(jump-to-register): Likewise.',
- 'sort.el (sort-subr): Return nil.',
- 'keyboard.c (menu_bar_items, tool_bar_items, ' +
- 'Fexecute_extended_command): Deal with \'keymap\' property.']]]
-
- assert_equal expected, parser.parse_entries
- end
-
- def test_scan
- parser = util_parser <<-ChangeLog
-Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/driver.rb: Fixed ri page display for files with
- extensions.
- * test/rdoc/test_rdoc_ri_driver.rb: Test for above
-
-Mon Dec 3 20:37:22 2012 Koichi Sasada <ko1@atdot.net>
-
- * vm_exec.c: check VM_COLLECT_USAGE_DETAILS.
-
- ChangeLog
-
- parser.scan
-
- expected = doc(
- head(1, File.basename(@tempfile.path)),
- blank_line,
- head(2, '2012-12-04'),
- blank_line,
- head(3, 'Tue Dec 4 08:32:10 2012 Eric Hodel <drbrain@segment7.net>'),
- blank_line,
- list(:NOTE,
- item('lib/rdoc/ri/driver.rb', para('Fixed ri page display for ' +
- 'files with extensions.')),
- item('test/rdoc/test_rdoc_ri_driver.rb', para('Test for above'))),
- head(2, '2012-12-03'),
- blank_line,
- head(3, 'Mon Dec 3 20:37:22 2012 Koichi Sasada <ko1@atdot.net>'),
- blank_line,
- list(:NOTE,
- item('vm_exec.c', para('check VM_COLLECT_USAGE_DETAILS.'))))
-
- expected.file = @top_level
-
- assert_equal expected, @top_level.comment
- end
-
- def util_parser content = ''
- RDoc::Parser::ChangeLog.new \
- @top_level, @tempfile.path, content, @options, @stats
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_parser_markdown.rb b/test/rdoc/test_rdoc_parser_markdown.rb
deleted file mode 100644
index 597407ff68..0000000000
--- a/test/rdoc/test_rdoc_parser_markdown.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocParserMarkdown < RDoc::TestCase
-
- def setup
- super
-
- @RP = RDoc::Parser
-
- @tempfile = Tempfile.new self.class.name
- filename = @tempfile.path
-
- @top_level = @store.add_file filename
- @fn = filename
- @options = RDoc::Options.new
- @stats = RDoc::Stats.new @store, 0
- end
-
- def teardown
- super
-
- @tempfile.close
- end
-
- def test_file
- assert_kind_of RDoc::Parser::Text, util_parser('')
- end
-
- def test_class_can_parse
- temp_dir do
- FileUtils.touch 'foo.md'
- assert_equal @RP::Markdown, @RP.can_parse('foo.md')
- FileUtils.touch 'foo.md.ja'
- assert_equal @RP::Markdown, @RP.can_parse('foo.md.ja')
-
- FileUtils.touch 'foo.markdown'
- assert_equal @RP::Markdown, @RP.can_parse('foo.markdown')
- FileUtils.touch 'foo.markdown.ja'
- assert_equal @RP::Markdown, @RP.can_parse('foo.markdown.ja')
- end
- end
-
- def test_scan
- parser = util_parser 'it *really* works'
-
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('it _really_ works'))
- expected.file = @top_level
-
- parser.scan
-
- assert_equal expected, @top_level.comment.parse
- end
-
- def util_parser content
- RDoc::Parser::Markdown.new @top_level, @fn, content, @options, @stats
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_parser_perl.rb b/test/rdoc/test_rdoc_parser_perl.rb
new file mode 100644
index 0000000000..ce4e7d2b65
--- /dev/null
+++ b/test/rdoc/test_rdoc_parser_perl.rb
@@ -0,0 +1,73 @@
+require 'stringio'
+require 'tempfile'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/options'
+require 'rdoc/parser/perl'
+
+class TestRdocParserPerlPOD < MiniTest::Unit::TestCase
+
+ def setup
+ @tempfile = Tempfile.new self.class.name
+ filename = @tempfile.path
+
+ @top_level = RDoc::TopLevel.new filename
+ @fn = filename
+ @options = RDoc::Options.new
+ @stats = RDoc::Stats.new 0
+ end
+
+ def teardown
+ @tempfile.close
+ end
+
+ def test_uncommented_perl
+ content = <<-EOF
+while (<>) {
+ tr/a-z/A-Z;
+ print
+}
+ EOF
+
+ comment = util_get_comment content
+ assert_equal "", comment
+ end
+
+ def test_perl_without_pod
+ content = <<-EOF
+#!/usr/local/bin/perl
+#
+#This is a pointless perl program because it does -p.
+#
+while(<>) {print;}:
+ EOF
+
+ comment = util_get_comment content
+ assert_equal "", comment
+ end
+
+ def test_simple_pod_no_structure
+ content = <<-EOF
+=begin pod
+
+This just contains plain old documentation
+
+=end
+ EOF
+ comment = util_get_comment content
+ assert_equal 'This just contains plain old documentation', comment
+ end
+
+ # Get the comment of the @top_level when it has processed the input.
+ def util_get_comment(content)
+ parser = util_parser content
+ parser.scan.comment
+ end
+
+ # create a new parser with the supplied content.
+ def util_parser(content)
+ RDoc::Parser::PerlPOD.new @top_level, @fn, content, @options, @stats
+ end
+
+end
+
diff --git a/test/rdoc/test_rdoc_parser_rd.rb b/test/rdoc/test_rdoc_parser_rd.rb
deleted file mode 100644
index 79959d2aae..0000000000
--- a/test/rdoc/test_rdoc_parser_rd.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocParserRd < RDoc::TestCase
-
- def setup
- super
-
- @RP = RDoc::Parser
-
- @tempfile = Tempfile.new self.class.name
- filename = @tempfile.path
-
- @top_level = @store.add_file filename
- @fn = filename
- @options = RDoc::Options.new
- @stats = RDoc::Stats.new @store, 0
- end
-
- def teardown
- super
-
- @tempfile.close
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_file
- assert_kind_of RDoc::Parser::Text, util_parser('')
- end
-
- def test_class_can_parse
- temp_dir do
- FileUtils.touch 'foo.rd'
- assert_equal @RP::RD, @RP.can_parse('foo.rd')
-
- FileUtils.touch 'foo.rd.ja'
- assert_equal @RP::RD, @RP.can_parse('foo.rd.ja')
- end
- end
-
- def test_scan
- parser = util_parser 'it ((*really*)) works'
-
- expected = doc(para('it <em>really</em> works'))
- expected.file = @top_level
-
- parser.scan
-
- assert_equal expected, @top_level.comment.parse
- end
-
- def util_parser content
- RDoc::Parser::RD.new @top_level, @fn, content, @options, @stats
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb
index 2c61728571..33ffded723 100644
--- a/test/rdoc/test_rdoc_parser_ruby.rb
+++ b/test/rdoc/test_rdoc_parser_ruby.rb
@@ -1,12 +1,17 @@
# coding: utf-8
-require 'rdoc/test_case'
+require 'stringio'
+require 'tempfile'
+require 'rubygems'
+require 'minitest/autorun'
-class TestRDocParserRuby < RDoc::TestCase
+require 'rdoc/options'
+require 'rdoc/parser/ruby'
+require 'rdoc/stats'
- def setup
- super
+class TestRDocParserRuby < MiniTest::Unit::TestCase
+ def setup
@tempfile = Tempfile.new self.class.name
@filename = @tempfile.path
@@ -14,288 +19,157 @@ class TestRDocParserRuby < RDoc::TestCase
@tempfile2 = Tempfile.new self.class.name
@filename2 = @tempfile2.path
- @top_level = @store.add_file @filename
- @top_level2 = @store.add_file @filename2
-
+ util_top_level
@options = RDoc::Options.new
@options.quiet = true
- @options.option_parser = OptionParser.new
-
- @comment = RDoc::Comment.new '', @top_level
-
- @stats = RDoc::Stats.new @store, 0
+ @stats = RDoc::Stats.new 0
end
def teardown
- super
-
@tempfile.close
@tempfile2.close
end
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding(Encoding.default_external) if defined? Encoding
- s.chomp
- end
-
- def test_collect_first_comment
- p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
- CONTENT
-
- comment = p.collect_first_comment
-
- assert_equal RDoc::Comment.new("# first\n", @top_level), comment
- end
-
- def test_collect_first_comment_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- @options.encoding = Encoding::CP852
-
- p = util_parser <<-CONTENT
-# first
-
-# second
-class C; end
- CONTENT
-
- comment = p.collect_first_comment
+ def test_look_for_directives_in_attr
+ util_parser ""
- assert_equal Encoding::CP852, comment.text.encoding
- end
+ comment = "# :attr: my_attr\n"
- def test_get_class_or_module
- ctxt = RDoc::Context.new
- ctxt.store = @store
+ @parser.look_for_directives_in @top_level, comment
- cont, name_t, given_name = util_parser('A') .get_class_or_module ctxt
+ assert_equal "# :attr: my_attr\n", comment
- assert_equal ctxt, cont
- assert_equal 'A', name_t.text
- assert_equal 'A', given_name
+ comment = "# :attr_reader: my_method\n"
- cont, name_t, given_name = util_parser('B::C') .get_class_or_module ctxt
+ @parser.look_for_directives_in @top_level, comment
- b = @store.find_module_named('B')
- assert_equal b, cont
- assert_equal [@top_level], b.in_files
- assert_equal 'C', name_t.text
- assert_equal 'B::C', given_name
+ assert_equal "# :attr_reader: my_method\n", comment
- cont, name_t, given_name = util_parser('D:: E').get_class_or_module ctxt
+ comment = "# :attr_writer: my_method\n"
- assert_equal @store.find_module_named('D'), cont
- assert_equal 'E', name_t.text
- assert_equal 'D::E', given_name
+ @parser.look_for_directives_in @top_level, comment
- assert_raises NoMethodError do
- util_parser("A::\nB").get_class_or_module ctxt
- end
+ assert_equal "# :attr_writer: my_method\n", comment
end
- def test_get_class_or_module_document_children
- ctxt = @top_level.add_class RDoc::NormalClass, 'A'
- ctxt.stop_doc
-
- util_parser('B::C').get_class_or_module ctxt
-
- b = @store.find_module_named('A::B')
- assert b.ignored?
-
- d = @top_level.add_class RDoc::NormalClass, 'A::D'
-
- util_parser('D::E').get_class_or_module ctxt
+ def test_look_for_directives_in_commented
+ util_parser ""
- refute d.ignored?
- end
+ comment = "# how to make a section:\n# # :section: new section\n"
- def test_get_class_or_module_ignore_constants
- ctxt = RDoc::Context.new
- ctxt.store = @store
+ @parser.look_for_directives_in @top_level, comment
- util_parser('A') .get_class_or_module ctxt, true
- util_parser('A::B').get_class_or_module ctxt, true
+ section = @top_level.current_section
+ assert_equal nil, section.title
+ assert_equal nil, section.comment
- assert_empty ctxt.constants
- assert_empty @store.modules_hash.keys
- assert_empty @store.classes_hash.keys
+ assert_equal "# how to make a section:\n# # :section: new section\n",
+ comment
end
- def test_get_class_specification
- assert_equal 'A', util_parser('A') .get_class_specification
- assert_equal 'A::B', util_parser('A::B').get_class_specification
- assert_equal '::A', util_parser('::A').get_class_specification
-
- assert_equal 'self', util_parser('self').get_class_specification
-
- assert_equal '', util_parser('').get_class_specification
+ def test_look_for_directives_in_enddoc
+ util_parser ""
- assert_equal '', util_parser('$g').get_class_specification
+ assert_throws :enddoc do
+ @parser.look_for_directives_in @top_level, "# :enddoc:\n"
+ end
end
- def test_get_symbol_or_name
- util_parser "* & | + 5 / 4"
-
- assert_equal '*', @parser.get_symbol_or_name
-
- @parser.skip_tkspace
-
- assert_equal '&', @parser.get_symbol_or_name
-
- @parser.skip_tkspace
-
- assert_equal '|', @parser.get_symbol_or_name
-
- @parser.skip_tkspace
-
- assert_equal '+', @parser.get_symbol_or_name
+ def test_look_for_directives_in_main
+ util_parser ""
- @parser.skip_tkspace
- @parser.get_tk
- @parser.skip_tkspace
+ @parser.look_for_directives_in @top_level, "# :main: new main page\n"
- assert_equal '/', @parser.get_symbol_or_name
+ assert_equal 'new main page', @options.main_page
end
- def test_look_for_directives_in_attr
+ def test_look_for_directives_in_method
util_parser ""
- comment = RDoc::Comment.new "# :attr: my_attr\n", @top_level
-
- @parser.look_for_directives_in @top_level, comment
-
- assert_equal "# :attr: my_attr\n", comment.text
-
- comment = RDoc::Comment.new "# :attr_reader: my_method\n", @top_level
+ comment = "# :method: my_method\n"
@parser.look_for_directives_in @top_level, comment
- assert_equal "# :attr_reader: my_method\n", comment.text
+ assert_equal "# :method: my_method\n", comment
- comment = RDoc::Comment.new "# :attr_writer: my_method\n", @top_level
+ comment = "# :singleton-method: my_method\n"
@parser.look_for_directives_in @top_level, comment
- assert_equal "# :attr_writer: my_method\n", comment.text
+ assert_equal "# :singleton-method: my_method\n", comment
end
- def test_look_for_directives_in_commented
+ def test_look_for_directives_in_startdoc
util_parser ""
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-# how to make a section:
-# # :section: new section
- COMMENT
-
- @parser.look_for_directives_in @top_level, comment
+ @top_level.stop_doc
+ assert !@top_level.document_self
+ assert !@top_level.document_children
+ assert !@top_level.force_documentation
- section = @top_level.current_section
- assert_equal nil, section.title
- assert_equal nil, section.comment
+ @parser.look_for_directives_in @top_level, "# :startdoc:\n"
- assert_equal "# how to make a section:\n# # :section: new section\n",
- comment.text
+ assert @top_level.document_self
+ assert @top_level.document_children
+ assert @top_level.force_documentation
end
- def test_look_for_directives_in_method
+ def test_look_for_directives_in_stopdoc
util_parser ""
- comment = RDoc::Comment.new "# :method: my_method\n", @top_level
-
- @parser.look_for_directives_in @top_level, comment
-
- assert_equal "# :method: my_method\n", comment.text
+ assert @top_level.document_self
+ assert @top_level.document_children
- comment = RDoc::Comment.new "# :singleton-method: my_method\n", @top_level
+ @parser.look_for_directives_in @top_level, "# :stopdoc:\n"
- @parser.look_for_directives_in @top_level, comment
-
- assert_equal "# :singleton-method: my_method\n", comment.text
+ assert !@top_level.document_self
+ assert !@top_level.document_children
end
def test_look_for_directives_in_section
util_parser ""
- comment = RDoc::Comment.new <<-COMMENT, @top_level
-# :section: new section
-# woo stuff
- COMMENT
+ comment = "# :section: new section\n# woo stuff\n"
@parser.look_for_directives_in @top_level, comment
section = @top_level.current_section
assert_equal 'new section', section.title
- assert_equal [comment("# woo stuff\n", @top_level)], section.comments
+ assert_equal "# woo stuff\n", section.comment
- assert_empty comment
+ assert_equal '', comment
end
- def test_look_for_directives_in_unhandled
+ def test_look_for_directives_in_title
util_parser ""
- comment = RDoc::Comment.new "# :unhandled: blah\n", @top_level
-
- @parser.look_for_directives_in @top_level, comment
-
- assert_equal 'blah', @top_level.metadata['unhandled']
- end
-
- def test_parse_alias
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- util_parser "alias :next= :bar"
-
- tk = @parser.get_tk
-
- alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
+ @parser.look_for_directives_in @top_level, "# :title: new title\n"
- assert_equal 'bar', alas.old_name
- assert_equal 'next=', alas.new_name
- assert_equal klass, alas.parent
- assert_equal 'comment', alas.comment
- assert_equal @top_level, alas.file
- assert_equal 0, alas.offset
- assert_equal 1, alas.line
+ assert_equal 'new title', @options.title
end
- def test_parse_alias_singleton
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- util_parser "alias :next= :bar"
-
- tk = @parser.get_tk
+ def test_look_for_directives_in_unhandled
+ util_parser ""
- alas = @parser.parse_alias klass, RDoc::Parser::Ruby::SINGLE, tk, 'comment'
+ @parser.look_for_directives_in @top_level, "# :unhandled: blah\n"
- assert_equal 'bar', alas.old_name
- assert_equal 'next=', alas.new_name
- assert_equal klass, alas.parent
- assert_equal 'comment', alas.comment
- assert_equal @top_level, alas.file
- assert alas.singleton
+ assert_equal 'blah', @top_level.metadata['unhandled']
end
- def test_parse_alias_stopdoc
+ def test_parse_alias
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- klass.stop_doc
util_parser "alias :next= :bar"
tk = @parser.get_tk
- @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
+ alas = @parser.parse_alias klass, RDoc::Parser::Ruby::NORMAL, tk, 'comment'
- assert_empty klass.aliases
- assert_empty klass.unmatched_alias_lists
+ assert_equal 'bar', alas.old_name
+ assert_equal 'next=', alas.new_name
+ assert_equal klass, alas.parent
+ assert_equal 'comment', alas.comment
end
def test_parse_alias_meta
@@ -315,7 +189,7 @@ class C; end
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# my attr\n", @top_level
+ comment = "##\n# my attr\n"
util_parser "attr :foo, :bar"
@@ -327,33 +201,14 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
- assert_equal 'my attr', foo.comment.text
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
- end
-
- def test_parse_attr_stopdoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
- util_parser "attr :foo, :bar"
-
- tk = @parser.get_tk
-
- @parser.parse_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_empty klass.attributes
+ assert_equal 'my attr', foo.comment
end
def test_parse_attr_accessor
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# my attr\n", @top_level
+ comment = "##\n# my attr\n"
util_parser "attr_accessor :foo, :bar"
@@ -366,53 +221,19 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'RW', foo.rw
- assert_equal 'my attr', foo.comment.text
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
+ assert_equal 'my attr', foo.comment
bar = klass.attributes.last
assert_equal 'bar', bar.name
assert_equal 'RW', bar.rw
- assert_equal 'my attr', bar.comment.text
- end
-
- def test_parse_attr_accessor_nodoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
- util_parser "attr_accessor :foo, :bar # :nodoc:"
-
- tk = @parser.get_tk
-
- @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_equal 0, klass.attributes.length
- end
-
- def test_parse_attr_accessor_stopdoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# my attr\n", @top_level
-
- util_parser "attr_accessor :foo, :bar"
-
- tk = @parser.get_tk
-
- @parser.parse_attr_accessor klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_empty klass.attributes
+ assert_equal 'my attr', bar.comment
end
def test_parse_attr_accessor_writer
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# my attr\n", @top_level
+ comment = "##\n# my attr\n"
util_parser "attr_writer :foo, :bar"
@@ -425,20 +246,19 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'W', foo.rw
- assert_equal "my attr", foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal "my attr", foo.comment
bar = klass.attributes.last
assert_equal 'bar', bar.name
assert_equal 'W', bar.rw
- assert_equal "my attr", bar.comment.text
+ assert_equal "my attr", bar.comment
end
def test_parse_meta_attr
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level
+ comment = "##\n# :attr: \n# my method\n"
util_parser "add_my_method :foo, :bar"
@@ -450,16 +270,14 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'RW', foo.rw
- assert_equal "my method", foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal "my method", foo.comment
end
def test_parse_meta_attr_accessor
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment =
- RDoc::Comment.new "##\n# :attr_accessor: \n# my method\n", @top_level
+ comment = "##\n# :attr_accessor: \n# my method\n"
util_parser "add_my_method :foo, :bar"
@@ -471,15 +289,14 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'RW', foo.rw
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_attr_named
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# :attr: foo\n# my method\n", @top_level
+ comment = "##\n# :attr: foo\n# my method\n"
util_parser "add_my_method :foo, :bar"
@@ -491,16 +308,14 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'RW', foo.rw
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_attr_reader
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment =
- RDoc::Comment.new "##\n# :attr_reader: \n# my method\n", @top_level
+ comment = "##\n# :attr_reader: \n# my method\n"
util_parser "add_my_method :foo, :bar"
@@ -511,32 +326,14 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'R', foo.rw
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
- end
-
- def test_parse_meta_attr_stopdoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# :attr: \n# my method\n", @top_level
-
- util_parser "add_my_method :foo, :bar"
-
- tk = @parser.get_tk
-
- @parser.parse_meta_attr klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_empty klass.attributes
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_attr_writer
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment =
- RDoc::Comment.new "##\n# :attr_writer: \n# my method\n", @top_level
+ comment = "##\n# :attr_writer: \n# my method\n"
util_parser "add_my_method :foo, :bar"
@@ -547,14 +344,13 @@ class C; end
foo = klass.attributes.first
assert_equal 'foo', foo.name
assert_equal 'W', foo.rw
- assert_equal "my method", foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal "my method", foo.comment
end
def test_parse_class
- comment = RDoc::Comment.new "##\n# my class\n", @top_level
+ comment = "##\n# my method\n"
- util_parser "class Foo\nend"
+ util_parser 'class Foo; end'
tk = @parser.get_tk
@@ -562,10 +358,7 @@ class C; end
foo = @top_level.classes.first
assert_equal 'Foo', foo.full_name
- assert_equal 'my class', foo.comment.text
- assert_equal [@top_level], foo.in_files
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
+ assert_equal 'my method', foo.comment
end
def test_parse_class_ghost_method
@@ -579,157 +372,33 @@ end
tk = @parser.get_tk
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, ''
foo = @top_level.classes.first
assert_equal 'Foo', foo.full_name
blah = foo.method_list.first
assert_equal 'Foo#blah', blah.full_name
- assert_equal @top_level, blah.file
- end
-
- def test_parse_class_multi_ghost_methods
- util_parser <<-'CLASS'
-class Foo
- ##
- # :method: one
- #
- # my method
-
- ##
- # :method: two
- #
- # my method
-
- [:one, :two].each do |t|
- eval("def #{t}; \"#{t}\"; end")
- end
-end
- CLASS
-
- tk = @parser.get_tk
-
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- foo = @top_level.classes.first
- assert_equal 'Foo', foo.full_name
-
- assert_equal 2, foo.method_list.length
- end
-
- def test_parse_class_nodoc
- comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
- util_parser "class Foo # :nodoc:\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- foo = @top_level.classes.first
- assert_equal 'Foo', foo.full_name
- assert_empty foo.comment
- assert_equal [@top_level], foo.in_files
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
- end
-
- def test_parse_class_single_root
- comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
- util_parser "class << ::Foo\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- foo = @store.all_modules.first
- assert_equal 'Foo', foo.full_name
- end
-
- def test_parse_class_stopdoc
- @top_level.stop_doc
-
- comment = RDoc::Comment.new "##\n# my class\n", @top_level
-
- util_parser "class Foo\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_empty @top_level.classes.first.comment
- end
-
- def test_parse_multi_ghost_methods
- util_parser <<-'CLASS'
-class Foo
- ##
- # :method: one
- #
- # my method
-
- ##
- # :method: two
- #
- # my method
-
- [:one, :two].each do |t|
- eval("def #{t}; \"#{t}\"; end")
- end
-end
- CLASS
-
- tk = @parser.get_tk
-
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- foo = @top_level.classes.first
- assert_equal 'Foo', foo.full_name
-
- assert_equal 2, foo.method_list.length
- end
-
- def test_parse_const_fail_w_meta
- util_parser <<-CLASS
-class ConstFailMeta
- ##
- # :attr: one
- #
- # an attribute
-
- OtherModule.define_attr(self, :one)
-end
- CLASS
-
- tk = @parser.get_tk
-
- @parser.parse_class @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- const_fail_meta = @top_level.classes.first
- assert_equal 'ConstFailMeta', const_fail_meta.full_name
-
- assert_equal 1, const_fail_meta.attributes.length
end
def test_parse_class_nested_superclass
- foo = @top_level.add_module RDoc::NormalModule, 'Foo'
+ foo = RDoc::NormalModule.new 'Foo'
+ foo.parent = @top_level
util_parser "class Bar < Super\nend"
tk = @parser.get_tk
- @parser.parse_class foo, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_class foo, RDoc::Parser::Ruby::NORMAL, tk, ''
bar = foo.classes.first
assert_equal 'Super', bar.superclass
end
def test_parse_module
- comment = RDoc::Comment.new "##\n# my module\n", @top_level
+ comment = "##\n# my module\n"
- util_parser "module Foo\nend"
+ util_parser 'module Foo; end'
tk = @parser.get_tk
@@ -737,39 +406,7 @@ end
foo = @top_level.modules.first
assert_equal 'Foo', foo.full_name
- assert_equal 'my module', foo.comment.text
- end
-
- def test_parse_module_nodoc
- @top_level.stop_doc
-
- comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
- util_parser "module Foo # :nodoc:\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- foo = @top_level.modules.first
- assert_equal 'Foo', foo.full_name
- assert_empty foo.comment
- end
-
- def test_parse_module_stopdoc
- @top_level.stop_doc
-
- comment = RDoc::Comment.new "##\n# my module\n", @top_level
-
- util_parser "module Foo\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_module @top_level, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- foo = @top_level.modules.first
- assert_equal 'Foo', foo.full_name
- assert_empty foo.comment
+ assert_equal 'my module', foo.comment
end
def test_parse_class_colon3
@@ -782,24 +419,9 @@ end
util_parser code
- @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
- assert_equal %w[A B], @store.all_classes.map { |c| c.full_name }.sort
- end
-
- def test_parse_class_colon3_self_reference
- code = <<-CODE
-class A::B
- class ::A
- end
-end
- CODE
-
- util_parser code
-
- @parser.parse_class @top_level, false, @parser.get_tk, @comment
+ @parser.parse_class @top_level, false, @parser.get_tk, ''
- assert_equal %w[A A::B], @store.all_classes.map { |c| c.full_name }.sort
+ assert_equal %w[A B], RDoc::TopLevel.classes.map { |c| c.full_name }
end
def test_parse_class_single
@@ -808,38 +430,6 @@ class A
class << B
end
class << d = Object.new
- def foo; end
- alias bar foo
- end
-end
- CODE
-
- util_parser code
-
- @parser.parse_class @top_level, false, @parser.get_tk, @comment
-
- assert_equal %w[A], @store.all_classes.map { |c| c.full_name }
-
- modules = @store.all_modules.sort_by { |c| c.full_name }
- assert_equal %w[A::B A::d], modules.map { |c| c.full_name }
-
- b = modules.first
- assert_equal 10, b.offset
- assert_equal 2, b.line
-
- # make sure method/alias was not added to enclosing class/module
- a = @store.classes_hash['A']
- assert_empty a.method_list
-
- # make sure non-constant-named module will be removed from documentation
- d = @store.modules_hash['A::d']
- assert d.remove_from_documentation?
- end
-
- def test_parse_class_single_gvar
- code = <<-CODE
-class << $g
- def m
end
end
CODE
@@ -848,39 +438,8 @@ end
@parser.parse_class @top_level, false, @parser.get_tk, ''
- assert_empty @store.all_classes
- mod = @store.all_modules.first
-
- refute mod.document_self
-
- assert_empty mod.method_list
- end
-
- # TODO this is really a Context#add_class test
- def test_parse_class_object
- code = <<-CODE
-module A
- class B
- end
- class Object
- end
- class C < Object
- end
-end
- CODE
-
- util_parser code
-
- @parser.parse_module @top_level, false, @parser.get_tk, @comment
-
- assert_equal %w[A],
- @store.all_modules.map { |c| c.full_name }
- assert_equal %w[A::B A::C A::Object],
- @store.all_classes.map { |c| c.full_name }.sort
-
- assert_equal 'Object', @store.classes_hash['A::B'].superclass
- assert_equal 'Object', @store.classes_hash['A::Object'].superclass
- assert_equal 'A::Object', @store.classes_hash['A::C'].superclass.full_name
+ assert_equal %w[A], RDoc::TopLevel.classes.map { |c| c.full_name }
+ assert_equal %w[A::B], RDoc::TopLevel.modules.map { |c| c.full_name }
end
def test_parse_class_mistaken_for_module
@@ -888,7 +447,7 @@ end
# before Foo::Bar is encountered), but RDoc might encounter Foo::Bar
# before Foo if they live in different files.
- code = <<-RUBY
+ code = <<-EOF
class Foo::Bar
end
@@ -897,13 +456,13 @@ end
class Foo
end
- RUBY
+ EOF
util_parser code
@parser.scan
- assert_equal %w[Foo::Baz], @store.modules_hash.keys
+ assert_equal %w[Foo::Baz], RDoc::TopLevel.modules_hash.keys
assert_empty @top_level.modules
foo = @top_level.classes.first
@@ -917,9 +476,9 @@ end
end
def test_parse_class_definition_encountered_after_class_reference
- # The code below is not legal Ruby (Foo must have been defined before
- # Foo.bar is encountered), but RDoc might encounter Foo.bar before Foo if
- # they live in different files.
+ # The code below is not strictly legal Ruby (Foo must have been defined
+ # before Foo.bar is encountered), but RDoc might encounter Foo.bar before
+ # Foo if they live in different files.
code = <<-EOF
def Foo.bar
@@ -933,8 +492,9 @@ end
@parser.scan
- assert_empty @store.modules_hash
- assert_empty @store.all_modules
+ assert_empty RDoc::TopLevel.modules_hash
+ # HACK why does it fail?
+ #assert_empty @top_level.modules
foo = @top_level.classes.first
assert_equal 'Foo', foo.full_name
@@ -945,14 +505,13 @@ end
end
def test_parse_module_relative_to_top_level_namespace
- comment = RDoc::Comment.new <<-EOF, @top_level
+ comment = <<-EOF
#
# Weirdly named module
#
EOF
- code = <<-EOF
-#{comment.text}
+ code = comment + <<-EOF
module ::Foo
class Helper
end
@@ -964,7 +523,7 @@ EOF
foo = @top_level.modules.first
assert_equal 'Foo', foo.full_name
- assert_equal 'Weirdly named module', foo.comment.text
+ assert_equal 'Weirdly named module', foo.comment
helper = foo.classes.first
assert_equal 'Foo::Helper', helper.full_name
@@ -974,7 +533,7 @@ EOF
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level
+ comment = "##\n# :attr: foo\n# my attr\n"
util_parser "\n"
@@ -983,46 +542,26 @@ EOF
@parser.parse_comment klass, tk, comment
foo = klass.attributes.first
- assert_equal 'foo', foo.name
- assert_equal 'RW', foo.rw
- assert_equal 'my attr', foo.comment.text
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
-
- assert_equal nil, foo.viewer
- assert_equal true, foo.document_children
- assert_equal true, foo.document_self
- assert_equal false, foo.done_documenting
- assert_equal false, foo.force_documentation
- assert_equal klass, foo.parent
- assert_equal :public, foo.visibility
- assert_equal "\n", foo.text
+ assert_equal 'foo', foo.name
+ assert_equal 'RW', foo.rw
+ assert_equal 'my attr', foo.comment
+ assert_equal nil, foo.viewer
+ assert_equal true, foo.document_children
+ assert_equal true, foo.document_self
+ assert_equal false, foo.done_documenting
+ assert_equal false, foo.force_documentation
+ assert_equal klass, foo.parent
+ assert_equal :public, foo.visibility
+ assert_equal "\n", foo.text
assert_equal klass.current_section, foo.section
end
- def test_parse_comment_attr_stopdoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# :attr: foo\n# my attr\n", @top_level
-
- util_parser "\n"
-
- tk = @parser.get_tk
-
- @parser.parse_comment klass, tk, comment
-
- assert_empty klass.attributes
- end
-
def test_parse_comment_method
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level
+ comment = "##\n# :method: foo\n# my method\n"
util_parser "\n"
@@ -1031,11 +570,8 @@ EOF
@parser.parse_comment klass, tk, comment
foo = klass.method_list.first
- assert_equal 'foo', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
+ assert_equal 'foo', foo.name
+ assert_equal 'my method', foo.comment
assert_equal [], foo.aliases
assert_equal nil, foo.block_params
@@ -1055,199 +591,49 @@ EOF
assert_equal klass.current_section, foo.section
stream = [
- tk(:COMMENT, 0, 1, 1, nil,
- "# File #{@top_level.relative_name}, line 1"),
+ tk(:COMMENT, 1, 1, nil, "# File #{@top_level.absolute_name}, line 1"),
RDoc::Parser::Ruby::NEWLINE_TOKEN,
- tk(:SPACE, 0, 1, 1, nil, ''),
+ tk(:SPACE, 1, 1, nil, ''),
]
assert_equal stream, foo.token_stream
end
- def test_parse_comment_method_stopdoc
+ def test_parse_constant_alias
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# :method: foo\n# my method\n", @top_level
-
- util_parser "\n"
-
- tk = @parser.get_tk
-
- @parser.parse_comment klass, tk, comment
-
- assert_empty klass.method_list
- end
-
- def test_parse_constant
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "A = v"
-
- tk = @parser.get_tk
-
- @parser.parse_constant klass, tk, @comment
-
- foo = klass.constants.first
-
- assert_equal 'A', foo.name
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
- end
-
- def test_parse_constant_attrasgn
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "A[k] = v"
-
- tk = @parser.get_tk
-
- @parser.parse_constant klass, tk, @comment
-
- assert klass.constants.empty?
- end
-
- def test_parse_constant_alias
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
- klass.add_class RDoc::NormalClass, 'B'
+ cB = klass.add_class RDoc::NormalClass, 'B'
util_parser "A = B"
tk = @parser.get_tk
- @parser.parse_constant klass, tk, @comment
+ @parser.parse_constant klass, tk, ''
- assert_equal 'Foo::A', klass.find_module_named('A').full_name
+ assert_equal cB, klass.find_module_named('A')
end
def test_parse_constant_alias_same_name
foo = @top_level.add_class RDoc::NormalClass, 'Foo'
- @top_level.add_class RDoc::NormalClass, 'Bar'
+ top_bar = @top_level.add_class RDoc::NormalClass, 'Bar'
bar = foo.add_class RDoc::NormalClass, 'Bar'
- assert @store.find_class_or_module('::Bar')
+ assert RDoc::TopLevel.find_class_or_module('::Bar')
util_parser "A = ::Bar"
tk = @parser.get_tk
- @parser.parse_constant foo, tk, @comment
-
- assert_equal 'A', bar.find_module_named('A').full_name
- end
-
- def test_parse_constant_in_method
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser 'A::B = v'
-
- tk = @parser.get_tk
-
- @parser.parse_constant klass, tk, @comment, true
-
- assert_empty klass.constants
-
- assert_empty @store.modules_hash.keys
- assert_equal %w[Foo], @store.classes_hash.keys
- end
-
- def test_parse_constant_rescue
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "A => e"
-
- tk = @parser.get_tk
-
- @parser.parse_constant klass, tk, @comment
-
- assert_empty klass.constants
- assert_empty klass.modules
-
- assert_empty @store.modules_hash.keys
- assert_equal %w[Foo], @store.classes_hash.keys
- end
-
- def test_parse_constant_stopdoc
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
- klass.stop_doc
-
- util_parser "A = v"
-
- tk = @parser.get_tk
-
- @parser.parse_constant klass, tk, @comment
-
- assert_empty klass.constants
- end
-
- def test_parse_comment_nested
- content = <<-CONTENT
-A::B::C = 1
- CONTENT
-
- util_parser content
-
- tk = @parser.get_tk
-
- parsed = @parser.parse_constant @top_level, tk, 'comment'
-
- assert parsed
-
- a = @top_level.find_module_named 'A'
- b = a.find_module_named 'B'
- c = b.constants.first
-
- assert_equal 'A::B::C', c.full_name
- assert_equal 'comment', c.comment
- end
-
- def test_parse_include
- klass = RDoc::NormalClass.new 'C'
- klass.parent = @top_level
-
- comment = RDoc::Comment.new "# my include\n", @top_level
-
- util_parser "include I"
-
- @parser.get_tk # include
-
- @parser.parse_include klass, comment
-
- assert_equal 1, klass.includes.length
+ @parser.parse_constant foo, tk, ''
- incl = klass.includes.first
- assert_equal 'I', incl.name
- assert_equal 'my include', incl.comment.text
- assert_equal @top_level, incl.file
- end
-
- def test_parse_extend
- klass = RDoc::NormalClass.new 'C'
- klass.parent = @top_level
-
- comment = RDoc::Comment.new "# my extend\n", @top_level
-
- util_parser "extend I"
-
- @parser.get_tk # extend
-
- @parser.parse_extend klass, comment
-
- assert_equal 1, klass.extends.length
-
- ext = klass.extends.first
- assert_equal 'I', ext.name
- assert_equal 'my extend', ext.comment.text
- assert_equal @top_level, ext.file
+ assert_equal top_bar, bar.find_module_named('A')
end
def test_parse_meta_method
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
+ comment = "##\n# my method\n"
util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
@@ -1256,11 +642,8 @@ A::B::C = 1
@parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
foo = klass.method_list.first
- assert_equal 'foo', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
+ assert_equal 'foo', foo.name
+ assert_equal 'my method', foo.comment
assert_equal [], foo.aliases
assert_equal nil, foo.block_params
@@ -1280,65 +663,26 @@ A::B::C = 1
assert_equal klass.current_section, foo.section
stream = [
- tk(:COMMENT, 0, 1, 1, nil,
- "# File #{@top_level.relative_name}, line 1"),
+ tk(:COMMENT, 1, 1, nil, "# File #{@top_level.absolute_name}, line 1"),
RDoc::Parser::Ruby::NEWLINE_TOKEN,
- tk(:SPACE, 0, 1, 1, nil, ''),
- tk(:IDENTIFIER, 0, 1, 0, 'add_my_method', 'add_my_method'),
- tk(:SPACE, 0, 1, 13, nil, ' '),
- tk(:SYMBOL, 0, 1, 14, nil, ':foo'),
- tk(:COMMA, 0, 1, 18, nil, ','),
- tk(:SPACE, 0, 1, 19, nil, ' '),
- tk(:SYMBOL, 0, 1, 20, nil, ':bar'),
- tk(:NL, 0, 1, 24, nil, "\n"),
+ tk(:SPACE, 1, 1, nil, ''),
+ tk(:IDENTIFIER, 1, 0, 'add_my_method', 'add_my_method'),
+ tk(:SPACE, 1, 13, nil, ' '),
+ tk(:SYMBOL, 1, 14, nil, ':foo'),
+ tk(:COMMA, 1, 18, nil, ','),
+ tk(:SPACE, 1, 19, nil, ' '),
+ tk(:SYMBOL, 1, 20, nil, ':bar'),
+ tk(:NL, 1, 24, nil, "\n"),
]
assert_equal stream, foo.token_stream
end
- def test_parse_meta_method_block
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
- content = <<-CONTENT
-inline(:my_method) do |*args|
- "this method causes z to disappear"
-end
- CONTENT
-
- util_parser content
-
- tk = @parser.get_tk
-
- @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_equal tk(:NL, 0, 3, 3, 3, "\n"), @parser.get_tk
- end
-
- def test_parse_meta_method_define_method
- klass = RDoc::NormalClass.new 'Foo'
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
- util_parser "define_method :foo do end"
-
- tk = @parser.get_tk
-
- @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- foo = klass.method_list.first
- assert_equal 'foo', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
- end
-
def test_parse_meta_method_name
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment =
- RDoc::Comment.new "##\n# :method: woo_hoo!\n# my method\n", @top_level
+ comment = "##\n# :method: woo_hoo!\n# my method\n"
util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
@@ -1347,17 +691,15 @@ end
@parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
foo = klass.method_list.first
- assert_equal 'woo_hoo!', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal 'woo_hoo!', foo.name
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_method_singleton
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment =
- RDoc::Comment.new "##\n# :singleton-method:\n# my method\n", @top_level
+ comment = "##\n# :singleton-method:\n# my method\n"
util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
@@ -1368,17 +710,14 @@ end
foo = klass.method_list.first
assert_equal 'foo', foo.name
assert_equal true, foo.singleton, 'singleton method'
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_method_singleton_name
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment =
- RDoc::Comment.new "##\n# :singleton-method: woo_hoo!\n# my method\n",
- @top_level
+ comment = "##\n# :singleton-method: woo_hoo!\n# my method\n"
util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
@@ -1389,13 +728,12 @@ end
foo = klass.method_list.first
assert_equal 'woo_hoo!', foo.name
assert_equal true, foo.singleton, 'singleton method'
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_method_string_name
klass = RDoc::NormalClass.new 'Foo'
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
+ comment = "##\n# my method\n"
util_parser "add_my_method 'foo'"
@@ -1405,29 +743,12 @@ end
foo = klass.method_list.first
assert_equal 'foo', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
- end
-
- def test_parse_meta_method_stopdoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
- util_parser "add_my_method :foo, :bar\nadd_my_method :baz"
-
- tk = @parser.get_tk
-
- @parser.parse_meta_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_empty klass.method_list
+ assert_equal 'my method', foo.comment
end
def test_parse_meta_method_unknown
klass = RDoc::NormalClass.new 'Foo'
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
+ comment = "##\n# my method\n"
util_parser "add_my_method ('foo')"
@@ -1437,15 +758,14 @@ end
foo = klass.method_list.first
assert_equal 'unknown', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
+ assert_equal 'my method', foo.comment
end
def test_parse_method
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
+ comment = "##\n# my method\n"
util_parser "def foo() :bar end"
@@ -1454,11 +774,8 @@ end
@parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
foo = klass.method_list.first
- assert_equal 'foo', foo.name
- assert_equal 'my method', foo.comment.text
- assert_equal @top_level, foo.file
- assert_equal 0, foo.offset
- assert_equal 1, foo.line
+ assert_equal 'foo', foo.name
+ assert_equal 'my method', foo.comment
assert_equal [], foo.aliases
assert_equal nil, foo.block_params
@@ -1478,20 +795,19 @@ end
assert_equal klass.current_section, foo.section
stream = [
- tk(:COMMENT, 0, 1, 1, nil,
- "# File #{@top_level.relative_name}, line 1"),
+ tk(:COMMENT, 1, 1, nil, "# File #{@top_level.absolute_name}, line 1"),
RDoc::Parser::Ruby::NEWLINE_TOKEN,
- tk(:SPACE, 0, 1, 1, nil, ''),
- tk(:DEF, 0, 1, 0, 'def', 'def'),
- tk(:SPACE, 3, 1, 3, nil, ' '),
- tk(:IDENTIFIER, 4, 1, 4, 'foo', 'foo'),
- tk(:LPAREN, 7, 1, 7, nil, '('),
- tk(:RPAREN, 8, 1, 8, nil, ')'),
- tk(:SPACE, 9, 1, 9, nil, ' '),
- tk(:COLON, 10, 1, 10, nil, ':'),
- tk(:IDENTIFIER, 11, 1, 11, 'bar', 'bar'),
- tk(:SPACE, 14, 1, 14, nil, ' '),
- tk(:END, 15, 1, 15, 'end', 'end'),
+ tk(:SPACE, 1, 1, nil, ''),
+ tk(:DEF, 1, 0, 'def', 'def'),
+ tk(:SPACE, 1, 3, nil, ' '),
+ tk(:IDENTIFIER, 1, 4, 'foo', 'foo'),
+ tk(:LPAREN, 1, 7, nil, '('),
+ tk(:RPAREN, 1, 8, nil, ')'),
+ tk(:SPACE, 1, 9, nil, ' '),
+ tk(:COLON, 1, 10, nil, ':'),
+ tk(:IDENTIFIER, 1, 11, 'bar', 'bar'),
+ tk(:SPACE, 1, 14, nil, ' '),
+ tk(:END, 1, 15, 'end', 'end'),
]
assert_equal stream, foo.token_stream
@@ -1505,104 +821,44 @@ end
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, ''
assert klass.aliases.empty?
end
- def test_parse_method_ampersand
+ def test_parse_method_utf8
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- util_parser "def self.&\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- ampersand = klass.method_list.first
- assert_equal '&', ampersand.name
- assert ampersand.singleton
- end
-
- def test_parse_method_constant
- c = RDoc::Constant.new 'CONST', nil, ''
- m = @top_level.add_class RDoc::NormalModule, 'M'
- m.add_constant c
-
- util_parser "def CONST.m() end"
-
- tk = @parser.get_tk
+ comment = "##\n# my method\n"
- @parser.parse_method m, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ method = "def ω() end"
- assert_empty @store.modules_hash.keys
- assert_equal %w[M], @store.classes_hash.keys
- end
+ assert_equal Encoding::UTF_8, method.encoding if defined? ::Encoding
- def test_parse_method_false
- util_parser "def false.foo() :bar end"
+ util_parser method
tk = @parser.get_tk
- @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- klass = @store.find_class_named 'FalseClass'
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
- foo = klass.method_list.first
- assert_equal 'foo', foo.name
+ omega = klass.method_list.first
+ assert_equal "def \317\211", omega.text
end
def test_parse_method_funky
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- util_parser "def (blah).foo() :bar end"
-
- tk = @parser.get_tk
-
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- assert_empty klass.method_list
- end
-
- def test_parse_method_gvar
- util_parser "def $stdout.foo() :bar end"
-
- tk = @parser.get_tk
-
- @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- assert @top_level.method_list.empty?
- end
-
- def test_parse_method_gvar_insane
- util_parser "def $stdout.foo() class << $other; end; end"
-
- tk = @parser.get_tk
-
- @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- assert @top_level.method_list.empty?
-
- assert_empty @store.all_classes
-
- assert_equal 1, @store.all_modules.length
+ comment = "##\n# my method\n"
- refute @store.all_modules.first.document_self
- end
-
- def test_parse_method_internal_gvar
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- util_parser "def foo() def $blah.bar() end end"
+ util_parser "def (blah).foo() :bar end"
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
- assert_equal 1, klass.method_list.length
+ assert klass.method_list.empty?
end
def test_parse_method_internal_ivar
@@ -1613,7 +869,7 @@ end
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, ''
assert_equal 1, klass.method_list.length
end
@@ -1626,48 +882,38 @@ end
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, ''
assert_equal 1, klass.method_list.length
end
- def test_parse_method_nil
- util_parser "def nil.foo() :bar end"
-
- tk = @parser.get_tk
-
- @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- klass = @store.find_class_named 'NilClass'
-
- foo = klass.method_list.first
- assert_equal 'foo', foo.name
- end
-
def test_parse_method_no_parens
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
- util_parser "def foo arg1, arg2 = {}\nend"
+ comment = "##\n# my method\n"
+
+ util_parser "def foo arg1, arg2\nend"
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
foo = klass.method_list.first
- assert_equal '(arg1, arg2 = {})', foo.params
- assert_equal @top_level, foo.file
+ assert_equal '(arg1, arg2)', foo.params
end
def test_parse_method_parameters_comment
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
+ comment = "##\n# my method\n"
+
util_parser "def foo arg1, arg2 # some useful comment\nend"
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
foo = klass.method_list.first
assert_equal '(arg1, arg2)', foo.params
@@ -1677,61 +923,33 @@ end
klass = RDoc::NormalClass.new 'Foo'
klass.parent = @top_level
+ comment = "##\n# my method\n"
+
util_parser "def foo arg1, arg2, # some useful comment\narg3\nend"
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
foo = klass.method_list.first
assert_equal '(arg1, arg2, arg3)', foo.params
end
- def test_parse_method_star
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- util_parser "def self.*\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- ampersand = klass.method_list.first
- assert_equal '*', ampersand.name
- assert ampersand.singleton
- end
-
- def test_parse_method_stopdoc
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
- klass.stop_doc
-
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
-
- util_parser "def foo() :bar end"
-
- tk = @parser.get_tk
-
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
-
- assert_empty klass.method_list
- end
-
def test_parse_method_toplevel
klass = @top_level
+ comment = "##\n# my method\n"
+
util_parser "def foo arg1, arg2\nend"
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, comment
- object = @store.find_class_named 'Object'
+ object = RDoc::TopLevel.find_class_named 'Object'
foo = object.method_list.first
assert_equal 'Object#foo', foo.full_name
- assert_equal @top_level, foo.file
end
def test_parse_method_toplevel_class
@@ -1741,65 +959,17 @@ end
tk = @parser.get_tk
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
+ @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, ''
- object = @store.find_class_named 'Object'
+ object = RDoc::TopLevel.find_class_named 'Object'
foo = object.method_list.first
assert_equal 'Object::foo', foo.full_name
end
- def test_parse_method_true
- util_parser "def true.foo() :bar end"
-
- tk = @parser.get_tk
-
- @parser.parse_method @top_level, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- klass = @store.find_class_named 'TrueClass'
-
- foo = klass.method_list.first
- assert_equal 'foo', foo.name
- end
-
- def test_parse_method_utf8
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- method = "def ω() end"
-
- assert_equal Encoding::UTF_8, method.encoding if
- Object.const_defined? :Encoding
-
- util_parser method
-
- tk = @parser.get_tk
-
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- omega = klass.method_list.first
- assert_equal "def \317\211", omega.text
- end
-
- def test_parse_method_dummy
- util_parser ".method() end"
-
- @parser.parse_method_dummy @top_level
-
- assert_nil @parser.get_tk
- end
-
- def test_parse_method_or_yield_parameters_hash
- util_parser "({})\n"
-
- m = RDoc::AnyMethod.new nil, 'm'
-
- result = @parser.parse_method_or_yield_parameters m
-
- assert_equal '({})', result
- end
-
def test_parse_statements_class_if
+ comment = "##\n# my method\n"
+
util_parser <<-CODE
module Foo
X = if TRUE then
@@ -1811,7 +981,7 @@ module Foo
end
CODE
- @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.modules.first
assert_equal 'Foo', foo.full_name, 'module Foo'
@@ -1822,66 +992,18 @@ end
end
def test_parse_statements_class_nested
- comment = RDoc::Comment.new "##\n# my method\n", @top_level
+ comment = "##\n# my method\n"
- util_parser "module Foo\n#{comment.text}class Bar\nend\nend"
+ util_parser "module Foo\n#{comment}class Bar\nend\nend"
- @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.modules.first
assert_equal 'Foo', foo.full_name, 'module Foo'
bar = foo.classes.first
assert_equal 'Foo::Bar', bar.full_name, 'class Foo::Bar'
- assert_equal 'my method', bar.comment.text
- end
-
- def test_parse_statements_def_percent_string_pound
- util_parser "class C\ndef a\n%r{#}\nend\ndef b() end\nend"
-
- @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
- x = @top_level.classes.first
-
- assert_equal 2, x.method_list.length
- a = x.method_list.first
-
- expected = [
- tk(:COMMENT, 0, 2, 1, nil, "# File #{@filename}, line 2"),
- tk(:NL, 0, 0, 0, nil, "\n"),
- tk(:SPACE, 0, 1, 1, nil, ''),
- tk(:DEF, 8, 2, 0, 'def', 'def'),
- tk(:SPACE, 11, 2, 3, nil, ' '),
- tk(:IDENTIFIER, 12, 2, 4, 'a', 'a'),
- tk(:NL, 13, 2, 5, nil, "\n"),
- tk(:DREGEXP, 14, 3, 0, nil, '%r{#}'),
- tk(:NL, 19, 3, 5, nil, "\n"),
- tk(:END, 20, 4, 0, 'end', 'end'),
- ]
-
- assert_equal expected, a.token_stream
- end
-
- def test_parse_statements_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
- @options.encoding = Encoding::CP852
-
- content = <<-EOF
-class Foo
- ##
- # this is my method
- add_my_method :foo
-end
- EOF
-
- util_parser content
-
- @parser.parse_statements @top_level
-
- foo = @top_level.classes.first.method_list.first
- assert_equal 'foo', foo.name
- assert_equal 'this is my method', foo.comment.text
- assert_equal Encoding::CP852, foo.comment.text.encoding
+ assert_equal 'my method', bar.comment
end
def test_parse_statements_identifier_meta_method
@@ -1895,23 +1017,18 @@ end
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first.method_list.first
assert_equal 'foo', foo.name
end
def test_parse_statements_identifier_alias_method
- content = <<-RUBY
-class Foo
- def foo() end
- alias_method :foo2, :foo
-end
- RUBY
+ content = "class Foo def foo() end; alias_method :foo2, :foo end"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first.method_list[0]
assert_equal 'foo', foo.name
@@ -1944,7 +1061,7 @@ EOF
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first.method_list[0]
assert_equal 'foo', foo.name
@@ -1961,42 +1078,10 @@ EOF
assert_equal 'foo4', foo4.name
assert_equal 'foo', foo4.is_alias_for.name
- assert_equal 'unknown', @top_level.classes.first.external_aliases[0].old_name
- end
-
- def test_parse_statements_identifier_args
- comment = "##\n# :args: x\n# :method: b\n# my method\n"
-
- util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
- @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
- m = @top_level.modules.first
- assert_equal 'M', m.full_name
-
- b = m.method_list.first
- assert_equal 'M#b', b.full_name
- assert_equal 'x', b.params
- assert_equal 'my method', b.comment.text
-
- assert_nil m.params, 'Module parameter not removed'
+ assert_equal 'unknown', @top_level.classes.first.aliases[0].old_name
end
def test_parse_statements_identifier_constant
- sixth_constant = <<-EOF
-Class.new do
- rule :file do
- all(x, y, z) {
- def value
- find(:require).each {|r| require r.value }
- find(:grammar).map {|g| g.value }
- end
- def min; end
- }
- end
-end
- EOF
-
content = <<-EOF
class Foo
FIRST_CONSTANT = 5
@@ -2018,63 +1103,42 @@ class Foo
end
FIFTH_CONSTANT = SECOND_CONSTANT.map { |element| element + 1 }
-
- SIXTH_CONSTANT = #{sixth_constant}
-
- SEVENTH_CONSTANT = proc { |i| begin i end }
end
EOF
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
constants = @top_level.classes.first.constants
constant = constants[0]
assert_equal 'FIRST_CONSTANT', constant.name
assert_equal '5', constant.value
- assert_equal @top_level, constant.file
constant = constants[1]
assert_equal 'SECOND_CONSTANT', constant.name
- assert_equal "[\n1,\n2,\n3\n]", constant.value
- assert_equal @top_level, constant.file
+ assert_equal '[ 1, 2, 3 ]', constant.value
constant = constants[2]
assert_equal 'THIRD_CONSTANT', constant.name
- assert_equal "{\n:foo => 'bar',\n:x => 'y'\n}", constant.value
- assert_equal @top_level, constant.file
+ assert_equal "{ :foo => 'bar', :x => 'y' }", constant.value
constant = constants[3]
assert_equal 'FOURTH_CONSTANT', constant.name
- assert_equal "SECOND_CONSTANT.map do |element|\nelement + 1\nelement + 2\nend", constant.value
- assert_equal @top_level, constant.file
+ assert_equal 'SECOND_CONSTANT.map do |element| element + 1 element + 2 end', constant.value
- constant = constants[4]
+ constant = constants.last
assert_equal 'FIFTH_CONSTANT', constant.name
assert_equal 'SECOND_CONSTANT.map { |element| element + 1 }', constant.value
- assert_equal @top_level, constant.file
-
- # TODO: parse as class
- constant = constants[5]
- assert_equal 'SIXTH_CONSTANT', constant.name
- assert_equal sixth_constant.lines.map(&:strip).join("\n"), constant.value
- assert_equal @top_level, constant.file
-
- # TODO: parse as method
- constant = constants[6]
- assert_equal 'SEVENTH_CONSTANT', constant.name
- assert_equal "proc { |i| begin i end }", constant.value
- assert_equal @top_level, constant.file
end
def test_parse_statements_identifier_attr
- content = "class Foo\nattr :foo\nend"
+ content = "class Foo; attr :foo; end"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first.attributes.first
assert_equal 'foo', foo.name
@@ -2082,41 +1146,23 @@ EOF
end
def test_parse_statements_identifier_attr_accessor
- content = "class Foo\nattr_accessor :foo\nend"
+ content = "class Foo; attr_accessor :foo; end"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first.attributes.first
assert_equal 'foo', foo.name
assert_equal 'RW', foo.rw
end
- def test_parse_statements_identifier_define_method
- util_parser <<-RUBY
-class C
- ##
- # :method: a
- define_method :a do end
- ##
- # :method: b
- define_method :b do end
-end
- RUBY
-
- @parser.parse_statements @top_level
- c = @top_level.classes.first
-
- assert_equal %w[a b], c.method_list.map { |m| m.name }
- end
-
def test_parse_statements_identifier_include
- content = "class Foo\ninclude Bar\nend"
+ content = "class Foo; include Bar; end"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first
assert_equal 'Foo', foo.name
@@ -2124,185 +1170,44 @@ end
end
def test_parse_statements_identifier_module_function
- content = "module Foo\ndef foo() end\nmodule_function :foo\nend"
+ content = "module Foo def foo() end; module_function :foo; end"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo, s_foo = @top_level.modules.first.method_list
- assert_equal 'foo', foo.name, 'instance method name'
+ assert_equal 'foo', foo.name, 'instance method name'
assert_equal :private, foo.visibility, 'instance method visibility'
- assert_equal false, foo.singleton, 'instance method singleton'
+ assert_equal false, foo.singleton, 'instance method singleton'
- assert_equal 'foo', s_foo.name, 'module function name'
+ assert_equal 'foo', s_foo.name, 'module function name'
assert_equal :public, s_foo.visibility, 'module function visibility'
- assert_equal true, s_foo.singleton, 'module function singleton'
+ assert_equal true, s_foo.singleton, 'module function singleton'
end
def test_parse_statements_identifier_private
- content = "class Foo\nprivate\ndef foo() end\nend"
+ content = "class Foo private; def foo() end end"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
foo = @top_level.classes.first.method_list.first
assert_equal 'foo', foo.name
assert_equal :private, foo.visibility
end
- def test_parse_statements_identifier_public_class_method
- content = <<-CONTENT
-class Date
- def self.now; end
- private_class_method :now
-end
-
-class DateTime < Date
- public_class_method :now
-end
- CONTENT
-
- util_parser content
-
- @parser.parse_statements @top_level
-
- date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
- date_now = date.method_list.first
- date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
- assert_equal :private, date_now.visibility
- assert_equal :public, date_time_now.visibility
- end
-
- def test_parse_statements_identifier_private_class_method
- content = <<-CONTENT
-class Date
- def self.now; end
- public_class_method :now
-end
-
-class DateTime < Date
- private_class_method :now
-end
- CONTENT
-
- util_parser content
-
- @parser.parse_statements @top_level
-
- # TODO sort classes by default
- date, date_time = @top_level.classes.sort_by { |c| c.full_name }
-
- date_now = date.method_list.first
- date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
-
- assert_equal :public, date_now.visibility, date_now.full_name
- assert_equal :private, date_time_now.visibility, date_time_now.full_name
- end
-
def test_parse_statements_identifier_require
content = "require 'bar'"
util_parser content
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
assert_equal 1, @top_level.requires.length
end
- def test_parse_statements_identifier_yields
- comment = "##\n# :yields: x\n# :method: b\n# my method\n"
-
- util_parser "module M\n#{comment}def_delegator :a, :b, :b\nend"
-
- @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL
-
- m = @top_level.modules.first
- assert_equal 'M', m.full_name
-
- b = m.method_list.first
- assert_equal 'M#b', b.full_name
- assert_equal 'x', b.block_params
- assert_equal 'my method', b.comment.text
-
- assert_nil m.params, 'Module parameter not removed'
- end
-
- def test_parse_statements_stopdoc_TkALIAS
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "\n# :stopdoc:\nalias old new"
-
- @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
- assert_empty klass.aliases
- assert_empty klass.unmatched_alias_lists
- end
-
- def test_parse_statements_stopdoc_TkIDENTIFIER_alias_method
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "\n# :stopdoc:\nalias_method :old :new"
-
- @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
- assert_empty klass.aliases
- assert_empty klass.unmatched_alias_lists
- end
-
- def test_parse_statements_stopdoc_TkIDENTIFIER_metaprogrammed
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "\n# :stopdoc:\n# attr :meta"
-
- @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
- assert_empty klass.method_list
- assert_empty klass.attributes
- end
-
- def test_parse_statements_stopdoc_TkCONSTANT
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "\n# :stopdoc:\nA = v"
-
- @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
- assert_empty klass.constants
- end
-
- def test_parse_statements_stopdoc_TkDEF
- klass = @top_level.add_class RDoc::NormalClass, 'Foo'
-
- util_parser "\n# :stopdoc:\ndef m\n end"
-
- @parser.parse_statements klass, RDoc::Parser::Ruby::NORMAL, nil
-
- assert_empty klass.method_list
- end
-
- def test_parse_statements_super
- m = RDoc::AnyMethod.new '', 'm'
- util_parser 'super'
-
- @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, m
-
- assert m.calls_super
- end
-
- def test_parse_statements_super_no_method
- content = "super"
-
- util_parser content
-
- @parser.parse_statements @top_level
-
- assert_nil @parser.get_tk
- end
-
def test_parse_statements_while_begin
util_parser <<-RUBY
class A
@@ -2316,7 +1221,7 @@ class A
end
RUBY
- @parser.parse_statements @top_level
+ @parser.parse_statements @top_level, RDoc::Parser::Ruby::NORMAL, nil, ''
c_a = @top_level.classes.first
assert_equal 'A', c_a.full_name
@@ -2330,25 +1235,7 @@ end
assert_equal 'A#b', m_b.full_name
end
- def test_parse_symbol_in_arg
- util_parser ':blah "blah" "#{blah}" blah'
-
- assert_equal 'blah', @parser.parse_symbol_in_arg
-
- @parser.skip_tkspace
-
- assert_equal 'blah', @parser.parse_symbol_in_arg
-
- @parser.skip_tkspace
-
- assert_equal nil, @parser.parse_symbol_in_arg
-
- @parser.skip_tkspace
-
- assert_equal nil, @parser.parse_symbol_in_arg
- end
-
- def test_parse_statements_alias_method
+ def test_parse_top_level_statements_alias_method
content = <<-CONTENT
class A
alias_method :a, :[] unless c
@@ -2363,164 +1250,6 @@ end
util_parser content
@parser.parse_statements @top_level
-
- # HACK where are the assertions?
- end
-
- def test_parse_top_level_statements_stopdoc
- @top_level.stop_doc
- content = "# this is the top-level comment"
-
- util_parser content
-
- @parser.parse_top_level_statements @top_level
-
- assert_empty @top_level.comment
- end
-
- def test_parse_top_level_statements_stopdoc_integration
- content = <<-CONTENT
-# :stopdoc:
-
-class Example
- def method_name
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.parse_top_level_statements @top_level
-
- assert_equal 1, @top_level.classes.length
- assert_empty @top_level.modules
-
- assert @top_level.find_module_named('Example').ignored?
- end
-
- # This tests parse_comment
- def test_parse_top_level_statements_constant_nodoc_integration
- content = <<-CONTENT
-class A
- C = A # :nodoc:
-end
- CONTENT
-
- util_parser content
-
- @parser.parse_top_level_statements @top_level
-
- klass = @top_level.find_module_named('A')
-
- c = klass.constants.first
-
- assert_nil c.document_self, 'C should not be documented'
- end
-
- def test_parse_yield_in_braces_with_parens
- klass = RDoc::NormalClass.new 'Foo'
- klass.parent = @top_level
-
- util_parser "def foo\nn.times { |i| yield nth(i) }\nend"
-
- tk = @parser.get_tk
-
- @parser.parse_method klass, RDoc::Parser::Ruby::NORMAL, tk, @comment
-
- foo = klass.method_list.first
- assert_equal 'nth(i)', foo.block_params
- end
-
- def test_read_directive
- parser = util_parser '# :category: test'
-
- directive, value = parser.read_directive %w[category]
-
- assert_equal 'category', directive
- assert_equal 'test', value
-
- assert_kind_of RDoc::RubyToken::TkNL, parser.get_tk
- end
-
- def test_read_directive_allow
- parser = util_parser '# :category: test'
-
- directive = parser.read_directive []
-
- assert_nil directive
-
- assert_kind_of RDoc::RubyToken::TkNL, parser.get_tk
- end
-
- def test_read_directive_empty
- parser = util_parser '# test'
-
- directive = parser.read_directive %w[category]
-
- assert_nil directive
-
- assert_kind_of RDoc::RubyToken::TkNL, parser.get_tk
- end
-
- def test_read_directive_no_comment
- parser = util_parser ''
-
- directive = parser.read_directive %w[category]
-
- assert_nil directive
-
- assert_kind_of RDoc::RubyToken::TkNL, parser.get_tk
- end
-
- def test_read_directive_one_liner
- parser = util_parser '; end # :category: test'
-
- directive, value = parser.read_directive %w[category]
-
- assert_equal 'category', directive
- assert_equal 'test', value
-
- assert_kind_of RDoc::RubyToken::TkSEMICOLON, parser.get_tk
- end
-
- def test_read_documentation_modifiers
- c = RDoc::Context.new
-
- parser = util_parser '# :category: test'
-
- parser.read_documentation_modifiers c, %w[category]
-
- assert_equal 'test', c.current_section.title
- end
-
- def test_read_documentation_modifiers_notnew
- m = RDoc::AnyMethod.new nil, 'initialize'
-
- parser = util_parser '# :notnew: test'
-
- parser.read_documentation_modifiers m, %w[notnew]
-
- assert m.dont_rename_initialize
- end
-
- def test_read_documentation_modifiers_not_dash_new
- m = RDoc::AnyMethod.new nil, 'initialize'
-
- parser = util_parser '# :not-new: test'
-
- parser.read_documentation_modifiers m, %w[not-new]
-
- assert m.dont_rename_initialize
- end
-
- def test_read_documentation_modifiers_not_new
- m = RDoc::AnyMethod.new nil, 'initialize'
-
- parser = util_parser '# :not_new: test'
-
- parser.read_documentation_modifiers m, %w[not_new]
-
- assert m.dont_rename_initialize
end
def test_sanity_integer
@@ -2543,6 +1272,7 @@ end
# If you're writing code like this you're doing it wrong
def test_sanity_interpolation_crazy
+ last_tk = nil
util_parser '"#{"#{"a")}" if b}"'
assert_equal '"#{"#{"a")}" if b}"', @parser.get_tk.text
@@ -2550,442 +1280,33 @@ end
end
def test_sanity_interpolation_curly
+ last_tk = nil
util_parser '%{ #{} }'
- assert_equal '%Q{ #{} }', @parser.get_tk.text
+ assert_equal '%{ #{} }', @parser.get_tk.text
assert_equal RDoc::RubyToken::TkNL, @parser.get_tk.class
end
def test_sanity_interpolation_format
util_parser '"#{stftime("%m-%d")}"'
- while @parser.get_tk do end
+ while tk = @parser.get_tk do end
end
def test_sanity_symbol_interpolation
util_parser ':"#{bar}="'
- while @parser.get_tk do end
- end
-
- def test_scan_cr
- content = <<-CONTENT
-class C\r
- def m\r
- a=\\\r
- 123\r
- end\r
-end\r
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- c = @top_level.classes.first
-
- assert_equal 1, c.method_list.length
- end
-
- def test_scan_block_comment
- content = <<-CONTENT
-=begin rdoc
-Foo comment
-=end
-
-class Foo
-
-=begin
-m comment
-=end
-
- def m() end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- foo = @top_level.classes.first
-
- assert_equal 'Foo comment', foo.comment.text
-
- m = foo.method_list.first
-
- assert_equal 'm comment', m.comment.text
- end
-
- def test_scan_block_comment_nested # Issue #41
- content = <<-CONTENT
-require 'something'
-=begin rdoc
-findmeindoc
-=end
-module Foo
- class Bar
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- foo = @top_level.modules.first
-
- assert_equal 'Foo', foo.full_name
- assert_equal 'findmeindoc', foo.comment.text
-
- bar = foo.classes.first
-
- assert_equal 'Foo::Bar', bar.full_name
- assert_equal '', bar.comment.text
- end
-
- def test_scan_block_comment_notflush
- ##
- #
- # The previous test assumes that between the =begin/=end blocs that there is
- # only one line, or minima formatting directives. This test tests for those
- # who use the =begin bloc with longer / more advanced formatting within.
- #
- ##
- content = <<-CONTENT
-=begin rdoc
-
-= DESCRIPTION
-
-This is a simple test class
-
-= RUMPUS
-
-Is a silly word
-
-=end
-class StevenSimpleClass
- # A band on my iPhone as I wrote this test
- FRUIT_BATS="Make nice music"
-
-=begin rdoc
-A nice girl
-=end
-
- def lauren
- puts "Summoning Lauren!"
- end
-end
- CONTENT
- util_parser content
-
- @parser.scan
-
- foo = @top_level.classes.first
-
- assert_equal "= DESCRIPTION\n\nThis is a simple test class\n\n= RUMPUS\n\nIs a silly word",
- foo.comment.text
-
- m = foo.method_list.first
-
- assert_equal 'A nice girl', m.comment.text
- end
-
- def test_scan_constant_in_method
- content = <<-CONTENT # newline is after M is important
-module M
- def m
- A
- B::C
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- m = @top_level.modules.first
-
- assert_empty m.constants
-
- assert_empty @store.classes_hash.keys
- assert_equal %w[M], @store.modules_hash.keys
- end
-
- def test_scan_constant_in_rescue
- content = <<-CONTENT # newline is after M is important
-module M
- def m
- rescue A::B
- rescue A::C => e
- rescue A::D, A::E
- rescue A::F,
- A::G
- rescue H
- rescue I => e
- rescue J, K
- rescue L =>
- e
- rescue M;
- rescue N,
- O => e
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- m = @top_level.modules.first
-
- assert_empty m.constants
-
- assert_empty @store.classes_hash.keys
- assert_equal %w[M], @store.modules_hash.keys
+ while tk = @parser.get_tk do end
end
- def test_scan_constant_nodoc
- content = <<-CONTENT # newline is after M is important
-module M
-
- C = v # :nodoc:
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- c = @top_level.modules.first.constants.first
-
- assert c.documented?
- end
-
- def test_scan_constant_nodoc_block
- content = <<-CONTENT # newline is after M is important
-module M
-
- C = v do # :nodoc:
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- c = @top_level.modules.first.constants.first
-
- assert c.documented?
- end
-
- def test_scan_meta_method_block
- content = <<-CONTENT
-class C
-
- ##
- # my method
-
- inline(:my_method) do |*args|
- "this method used to cause z to disappear"
- end
-
- def z
- end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- assert_equal 2, @top_level.classes.first.method_list.length
- end
-
- def test_scan_markup_override
- content = <<-CONTENT
-# *awesome*
-class C
- # :markup: rd
- # ((*radical*))
- def m
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- c = @top_level.classes.first
-
- assert_equal 'rdoc', c.comment.format
-
- assert_equal 'rd', c.method_list.first.comment.format
- end
-
- def test_scan_markup_first_comment
- content = <<-CONTENT
-# :markup: rd
-
-# ((*awesome*))
-class C
- # ((*radical*))
- def m
- end
-end
- CONTENT
-
- util_parser content
-
- @parser.scan
-
- c = @top_level.classes.first
-
- assert_equal 'rd', c.comment.format
-
- assert_equal 'rd', c.method_list.first.comment.format
- end
-
- def test_scan_tomdoc_meta
- util_parser <<-RUBY
-# :markup: tomdoc
-
-class C
-
- # Signature
- #
- # find_by_<field>[_and_<field>...](args)
- #
- # field - A field name.
-
-end
-
- RUBY
-
- @parser.scan
-
- c = @top_level.classes.first
-
- m = c.method_list.first
-
- assert_equal "find_by_<field>[_and_<field>...]", m.name
- assert_equal "find_by_<field>[_and_<field>...](args)\n", m.call_seq
-
- expected =
- doc(
- head(3, 'Signature'),
- list(:NOTE,
- item(%w[field],
- para('A field name.'))))
- expected.file = @top_level
-
- assert_equal expected, m.comment.parse
- end
-
- def test_scan_stopdoc
- util_parser <<-RUBY
-class C
- # :stopdoc:
- class Hidden
- end
-end
- RUBY
-
- @parser.scan
-
- c = @top_level.classes.first
-
- hidden = c.classes.first
-
- refute hidden.document_self
- assert hidden.ignored?
- end
-
- def test_scan_stopdoc_class_alias
- util_parser <<-RUBY
-# :stopdoc:
-module A
- B = C
-end
- RUBY
-
- @parser.scan
-
- assert_empty @store.all_classes
-
- assert_equal 1, @store.all_modules.length
- m = @store.all_modules.first
-
- assert m.ignored?
- end
-
- def test_scan_stopdoc_nested
- util_parser <<-RUBY
-# :stopdoc:
-class A::B
-end
- RUBY
-
- @parser.scan
-
- a = @store.modules_hash['A']
- a_b = @store.classes_hash['A::B']
-
- refute a.document_self, 'A is inside stopdoc'
- assert a.ignored?, 'A is inside stopdoc'
-
- refute a_b.document_self, 'A::B is inside stopdoc'
- assert a_b.ignored?, 'A::B is inside stopdoc'
- end
-
- def test_scan_struct_self_brackets
- util_parser <<-RUBY
-class C < M.m
- def self.[]
- end
-end
- RUBY
-
- @parser.scan
-
- c = @store.find_class_named 'C'
- assert_equal %w[C::[]], c.method_list.map { |m| m.full_name }
- end
-
- def test_stopdoc_after_comment
- util_parser <<-EOS
- module Bar
- # hello
- module Foo
- # :stopdoc:
- end
- # there
- class Baz
- # :stopdoc:
- end
- end
- EOS
-
- @parser.parse_statements @top_level
-
- foo = @top_level.modules.first.modules.first
- assert_equal 'Foo', foo.name
- assert_equal 'hello', foo.comment.text
-
- baz = @top_level.modules.first.classes.first
- assert_equal 'Baz', baz.name
- assert_equal 'there', baz.comment.text
- end
-
- def tk klass, scan, line, char, name, text
+ def tk(klass, line, char, name, text)
klass = RDoc::RubyToken.const_get "Tk#{klass.to_s.upcase}"
token = if klass.instance_method(:initialize).arity == 3 then
- raise ArgumentError, "name not used for #{klass}" if name
- klass.new scan, line, char
+ raise ArgumentError, "name not used for #{klass}" unless name.nil?
+ klass.new nil, line, char
else
- klass.new scan, line, char, name
+ klass.new nil, line, char, name
end
token.set_text text
@@ -3005,5 +1326,11 @@ end
second_file_content, @options, @stats
end
+ def util_top_level
+ RDoc::TopLevel.reset
+ @top_level = RDoc::TopLevel.new @filename
+ @top_level2 = RDoc::TopLevel.new @filename2
+ end
+
end
diff --git a/test/rdoc/test_rdoc_parser_simple.rb b/test/rdoc/test_rdoc_parser_simple.rb
index 356ea07504..d09cced5a4 100644
--- a/test/rdoc/test_rdoc_parser_simple.rb
+++ b/test/rdoc/test_rdoc_parser_simple.rb
@@ -1,22 +1,24 @@
-require 'rdoc/test_case'
+require 'tempfile'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/options'
+require 'rdoc/parser'
-class TestRDocParserSimple < RDoc::TestCase
+class TestRDocParserSimple < MiniTest::Unit::TestCase
def setup
- super
-
@tempfile = Tempfile.new self.class.name
filename = @tempfile.path
- @top_level = @store.add_file filename
+ @top_level = RDoc::TopLevel.new filename
@fn = filename
@options = RDoc::Options.new
- @stats = RDoc::Stats.new @store, 0
+ @stats = RDoc::Stats.new 0
+
+ RDoc::TopLevel.reset
end
def teardown
- super
-
@tempfile.close
end
@@ -39,72 +41,30 @@ contents of a string.
parser.scan
expected = <<-TEXT.strip
+
Regular expressions (<i>regexp</i>s) are patterns which describe the
contents of a string.
TEXT
- assert_equal expected, @top_level.comment.text
+ assert_equal expected, @top_level.comment
end
- # 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>'.
- #
- # I've seen guys that comment their code like this:
- # # This method....
- # #-----------------
- # def method
- #
- # => either we do it only in ruby code, or we require the leading #
- # (to avoid conflict with rules).
- #
- # TODO: require the leading #, to provide the feature in simple text files.
- # Note: in ruby & C code, we require '#--' & '#++' or '*--' & '*++',
- # to allow rules:
- #
- # # this is a comment
- # #---
- # # private text
- # #+++
- # # this is a rule:
- # # ---
-
def test_remove_private_comments
- parser = util_parser "foo\n\n--\nbar\n++\n\nbaz\n"
+ parser = util_parser ''
+ text = "foo\n\n--\nbar\n++\n\nbaz\n"
- parser.scan
-
- expected = "foo\n\n\nbaz"
+ expected = "foo\n\n\n\nbaz\n"
- assert_equal expected, @top_level.comment.text
- end
-
- def test_remove_private_comments_rule
- parser = util_parser "foo\n---\nbar"
-
- parser.scan
-
- expected = "foo\n---\nbar"
-
- assert_equal expected, @top_level.comment.text
+ assert_equal expected, parser.remove_private_comments(text)
end
def test_remove_private_comments_star
- parser = util_parser "* foo\n* bar\n"
-
- parser.scan
+ parser = util_parser ''
- assert_equal "* foo\n* bar", @top_level.comment.text
- end
-
- def test_scan
- parser = util_parser 'it *really* works'
-
- parser.scan
+ text = "* foo\n* bar\n"
+ expected = text.dup
- assert_equal 'it *really* works', @top_level.comment.text
+ assert_equal expected, parser.remove_private_comments(text)
end
def util_parser(content)
diff --git a/test/rdoc/test_rdoc_rd.rb b/test/rdoc/test_rdoc_rd.rb
deleted file mode 100644
index d917a63661..0000000000
--- a/test/rdoc/test_rdoc_rd.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocRd < RDoc::TestCase
-
- def test_class_parse
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('hello'))
-
- assert_equal expected, RDoc::RD.parse("hello")
- end
-
- def test_class_parse_begin_end
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('hello'))
-
- assert_equal expected, RDoc::RD.parse("=begin\nhello\n=end\n")
- end
-
- def test_class_parse_newline
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('hello'))
-
- assert_equal expected, RDoc::RD.parse("hello\n")
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_rd_block_parser.rb b/test/rdoc/test_rdoc_rd_block_parser.rb
deleted file mode 100644
index 8bb1c27c2d..0000000000
--- a/test/rdoc/test_rdoc_rd_block_parser.rb
+++ /dev/null
@@ -1,541 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocRdBlockParser < RDoc::TestCase
-
- def setup
- super
-
- @block_parser = RDoc::RD::BlockParser.new
- end
-
- def mu_pp(obj)
- s = ""
- s = PP.pp obj, s
- s = s.force_encoding(Encoding.default_external) if defined? Encoding
- s.chomp
- end
-
- def test_add_footnote
- index = @block_parser.add_footnote 'context'
-
- assert_equal 1, index
-
- expected = [
- para('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'context'),
- blank_line,
- ]
-
- assert_equal expected, @block_parser.footnotes
-
- index = @block_parser.add_footnote 'other'
-
- assert_equal 2, index
- end
-
- def test_parse_desclist
- list = <<-LIST
-:one
- desc one
-:two
- desc two
- LIST
-
- expected =
- doc(
- list(:NOTE,
- item("one", para("desc one")),
- item("two", para("desc two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_enumlist
- list = <<-LIST
-(1) one
-(1) two
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil, para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_enumlist_paragraphs
- list = <<-LIST
-(1) one
-
- two
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil,
- para("one"),
- para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_enumlist_multiline
- list = <<-LIST
-(1) one
- two
- LIST
-
- contents = "one\n two" # 1.8 vs 1.9
-
- expected =
- doc(
- list(:NUMBER,
- item(nil, para(*contents))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_enumlist_verbatim
- list = <<-LIST
-(1) item
- verbatim
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil,
- para("item"),
- verb("verbatim\n"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_enumlist_verbatim_continue
- list = <<-LIST
-(1) one
- verbatim
- two
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil,
- para("one"),
- verb("verbatim\n"),
- para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_footnote
- expected =
- doc(
- para("{*1}[rdoc-label:foottext-1:footmark-1]"),
- rule(1),
- para("{^1}[rdoc-label:footmark-1:foottext-1]", " ", "text"),
- blank_line)
-
- assert_equal expected, parse("((-text-))")
- end
-
- def test_parse_include
- @block_parser.include_path = [Dir.tmpdir]
-
- expected = doc(@RM::Include.new("parse_include", [Dir.tmpdir]))
-
- assert_equal expected, parse("<<< parse_include")
- end
-
- def test_parse_include_subtree
- @block_parser.include_path = [Dir.tmpdir]
-
- expected =
- doc(
- blank_line,
- para("include <em>worked</em>"),
- blank_line,
- blank_line)
-
- Tempfile.open %w[parse_include .rd] do |io|
- io.puts "=begin\ninclude ((*worked*))\n=end"
- io.flush
-
- str = <<-STR
-<<< #{File.basename io.path}
- STR
-
- assert_equal expected, parse(str)
- end
- end
-
- def test_parse_heading
- assert_equal doc(head(1, "H")), parse("= H")
- assert_equal doc(head(2, "H")), parse("== H")
- assert_equal doc(head(3, "H")), parse("=== H")
- assert_equal doc(head(4, "H")), parse("==== H")
- assert_equal doc(head(5, "H")), parse("+ H")
- assert_equal doc(head(6, "H")), parse("++ H")
- end
-
- def test_parse_itemlist
- list = <<-LIST
-* one
-* two
- LIST
-
- expected =
- doc(
- list(:BULLET,
- item(nil, para("one")),
- item(nil, para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_itemlist_multiline
- list = <<-LIST
-* one
- two
- LIST
-
- contents = "one\n two" # 1.8 vs 1.9
-
- expected =
- doc(
- list(:BULLET,
- item(nil, para(*contents))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_itemlist_nest
- list = <<-LIST
-* one
- * inner
-* two
- LIST
-
- expected =
- doc(
- list(:BULLET,
- item(nil,
- para("one"),
- list(:BULLET,
- item(nil, para("inner")))),
- item(nil,
- para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_itemlist_paragraphs
- list = <<-LIST
-* one
-
- two
- LIST
-
- expected =
- doc(
- list(:BULLET,
- item(nil,
- para("one"),
- para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_itemlist_verbatim
- list = <<-LIST
-* item
- verbatim
- LIST
-
- expected =
- doc(
- list(:BULLET,
- item(nil,
- para("item"),
- verb("verbatim\n"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_itemlist_verbatim_continue
- list = <<-LIST
-* one
- verbatim
- two
- LIST
-
- expected =
- doc(
- list(:BULLET,
- item(nil,
- para("one"),
- verb("verbatim\n"),
- para("two"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_lists
- list = <<-LIST
-(1) one
-(1) two
-* three
-* four
-(1) five
-(1) six
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil, para("two"))),
- list(:BULLET,
- item(nil, para("three")),
- item(nil, para("four"))),
- list(:NUMBER,
- item(nil, para("five")),
- item(nil, para("six"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_lists_nest
- list = <<-LIST
-(1) one
-(1) two
- * three
- * four
-(1) five
-(1) six
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil,
- para("two"),
- list(:BULLET,
- item(nil, para("three")),
- item(nil, para("four")))),
- item(nil, para("five")),
- item(nil, para("six"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_lists_nest_verbatim
- list = <<-LIST
-(1) one
-(1) two
- * three
- * four
- verbatim
-(1) five
-(1) six
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil,
- para("two"),
- list(:BULLET,
- item(nil, para("three")),
- item(nil, para("four"))),
- verb("verbatim\n")),
- item(nil, para("five")),
- item(nil, para("six"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_lists_nest_verbatim2
- list = <<-LIST
-(1) one
-(1) two
- * three
- * four
- verbatim
-(1) five
-(1) six
- LIST
-
- expected =
- doc(
- list(:NUMBER,
- item(nil, para("one")),
- item(nil,
- para("two"),
- list(:BULLET,
- item(nil, para("three")),
- item(nil, para("four"))),
- verb("verbatim\n")),
- item(nil, para("five")),
- item(nil, para("six"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_methodlist
- list = <<-LIST
---- Array#each {|i| ... }
- yield block for each item.
---- Array#index(val)
- return index of first item which equals with val. if it hasn't
- same item, return nil.
- LIST
-
- expected =
- doc(
- list(:LABEL,
- item(
- "<tt>Array#each {|i| ... }</tt>",
- para("yield block for each item.")),
- item(
- "<tt>Array#index(val)</tt>",
- para("return index of first item which equals with val. if it hasn't same item, return nil."))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_methodlist_empty
- list = <<-LIST
---- A#b
-
- LIST
-
- expected =
- doc(
- list(:LABEL,
- item("<tt>A#b</tt>")))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_methodlist_paragraph
- list = <<-LIST
---- A#b
-
- one
- LIST
-
- expected =
- doc(
- list(:LABEL,
- item(
- "<tt>A#b</tt>",
- para("one"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_methodlist_paragraph2
- list = <<-LIST.chomp
---- A#b
-
- one
-two
- LIST
-
- expected =
- doc(
- list(:LABEL,
- item(
- "<tt>A#b</tt>",
- para("one"))),
- para("two"))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_methodlist_paragraph_verbatim
- list = <<-LIST.chomp
---- A#b
-
- text
- verbatim
- LIST
-
- expected =
- doc(
- list(:LABEL,
- item(
- "<tt>A#b</tt>",
- para("text"),
- verb("verbatim\n"))))
-
- assert_equal expected, parse(list)
- end
-
- def test_parse_verbatim
- assert_equal doc(verb("verbatim\n")), parse(" verbatim")
- end
-
- def test_parse_verbatim_blankline
- expected = doc(verb("one\n", "\n", "two\n"))
-
- verbatim = <<-VERBATIM
- one
-
- two
- VERBATIM
-
- assert_equal expected, parse(verbatim)
- end
-
- def test_parse_verbatim_indent
- expected = doc(verb("one\n", " two\n"))
-
- verbatim = <<-VERBATIM
- one
- two
- VERBATIM
-
- assert_equal expected, parse(verbatim)
- end
-
- def test_parse_verbatim_multi
- expected = doc(verb("one\n", "two\n"))
-
- verbatim = <<-VERBATIM
- one
- two
- VERBATIM
-
- assert_equal expected, parse(verbatim)
- end
-
- def test_parse_textblock
- assert_equal doc(para("text")), parse("text")
- end
-
- def test_parse_textblock_multi
- expected = doc(para("one two"))
-
- assert_equal expected, parse("one\ntwo")
- end
-
- def parse text
- text = ["=begin", text, "=end"].join "\n"
-
- doc = @block_parser.parse text.lines.to_a
-
- assert_equal blank_line, doc.parts.shift, "=begin blankline"
- assert_equal blank_line, doc.parts.pop, "=end blankline"
-
- doc
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_rd_inline.rb b/test/rdoc/test_rdoc_rd_inline.rb
deleted file mode 100644
index d601ecca1a..0000000000
--- a/test/rdoc/test_rdoc_rd_inline.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocRdInline < RDoc::TestCase
-
- def setup
- super
-
- @inline = RDoc::RD::Inline.new '+text+', 'text'
- end
-
- def test_class_new
- inline = RDoc::RD::Inline.new @inline
-
- refute_equal inline.rdoc, inline.reference
- end
-
- def test_initialize
- inline = RDoc::RD::Inline.new 'text'
-
- assert_equal inline.rdoc, inline.reference
- refute_same inline.rdoc, inline.reference
- end
-
- def test_initialize_inline
- inline = RDoc::RD::Inline.new @inline
-
- assert_equal '+text+', inline.rdoc
- assert_equal 'text', inline.reference
- end
-
- def test_append_inline
- out = @inline.append @inline
-
- assert_same @inline, out
-
- assert_equal '+text++text+', @inline.rdoc
- assert_equal 'texttext', @inline.reference
- end
-
- def test_append_string
- @inline.append ' more'
-
- assert_equal '+text+ more', @inline.rdoc
- assert_equal 'text more', @inline.reference
- end
-
- def test_equals2
- assert_equal @inline, RDoc::RD::Inline.new('+text+', 'text')
- refute_equal @inline, RDoc::RD::Inline.new('+text+', 'other')
- refute_equal @inline, RDoc::RD::Inline.new('+other+', 'text')
- refute_equal @inline, Object.new
- end
-
- def test_inspect
- assert_equal '(inline: +text+)', @inline.inspect
- end
-
- def test_to_s
- assert_equal '+text+', @inline.to_s
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_rd_inline_parser.rb b/test/rdoc/test_rdoc_rd_inline_parser.rb
deleted file mode 100644
index 6f8c9557c4..0000000000
--- a/test/rdoc/test_rdoc_rd_inline_parser.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocRdInlineParser < RDoc::TestCase
-
- def setup
- super
-
- @block_parser = RDoc::RD::BlockParser.new
- @block_parser.instance_variable_set :@i, 0
- @inline_parser = RDoc::RD::InlineParser.new @block_parser
- end
-
- def test_parse
- assert_equal 'regular <em>emphasis</em>', parse('regular ((*emphasis*))')
- end
-
- def test_parse_code
- assert_equal '<code>text</code>', parse('(({text}))')
- end
-
- def test_parse_em
- assert_equal '<em>text</em>', parse('((*text*))')
- end
-
- def test_parse_footnote
- assert_equal '{*1}[rdoc-label:foottext-1:footmark-1]', parse('((-text-))')
-
- expected = [
- @RM::Paragraph.new('{^1}[rdoc-label:footmark-1:foottext-1]', ' ', 'text'),
- blank_line,
- ]
-
- assert_equal expected, @block_parser.footnotes
- end
-
- def test_parse_index
- assert_equal '<span id="label-text">text</span>', parse('((:text:))')
-
- assert_includes @block_parser.labels, 'text'
- end
-
- def test_parse_kbd
- assert_equal '<tt>text</tt>', parse('((%text%))')
- end
-
- def test_parse_multiple
- assert_equal '<em>one</em> <em>two</em>', parse('((*one*)) ((*two*))')
- end
-
- def test_parse_newline
- assert_equal "one\ntwo", parse("one\ntwo")
- end
-
- def test_parse_quote
- assert_equal 'one " two', parse('one " two')
- end
-
- def test_parse_ref
- assert_equal '{text}[rdoc-label:text]', parse('((<text>))')
- end
-
- def test_parse_ref_em
- assert_equal '{<em>text</em>}[rdoc-label:text]', parse('((<((*text*))>))')
- end
-
- def test_parse_ref_filename_quote
- assert_equal '{RD/foo}[rdoc-label:RD/foo]', parse('((<RD/"foo">))')
- end
-
- def test_parse_ref_filename
- assert_equal '{RD}[rdoc-label:RD/]', parse('((<RD/>))')
- end
-
- def test_parse_ref_quote
- assert_equal '{text \\"}[rdoc-label:text \\"]', parse('((<text \">))')
- end
-
- def test_parse_ref_quote_content
- assert_equal '{<em>text</em>}[rdoc-label:text]',
- parse('((<"((*text*))">))')
- end
-
- def test_parse_ref_quote_content_multi
- assert_equal '{<em>one</em> <em>two</em>}[rdoc-label:one two]',
- parse('((<"((*one*)) ((*two*))">))')
- end
-
- def test_parse_ref_substitute
- assert_equal '{text}[rdoc-label:thing]', parse('((<text|thing>))')
- end
-
- def test_parse_ref_substitute_element_quote
- assert_equal '{text}[rdoc-label:"RD"]',
- parse('((<text|"RD">))')
- end
-
- def test_parse_ref_substitute_filename
- assert_equal '{text}[rdoc-label:RD/]', parse('((<text|RD/>))')
- end
-
- def test_parse_ref_substitute_filename_label
- assert_equal '{text}[rdoc-label:RD/label]',
- parse('((<text|RD/label>))')
- end
-
- def test_parse_ref_substitute_filename_quote
- assert_equal '{text}[rdoc-label:"RD"/]', parse('((<text|"RD"/>))')
- end
-
- def test_parse_ref_substitute_multi_content
- assert_equal '{<em>one</em> two}[rdoc-label:thing]',
- parse('((<((*one*)) two|thing>))')
- end
-
- def test_parse_ref_substitute_multi_content2
- assert_equal '{<em>one</em> \\" two}[rdoc-label:thing]',
- parse('((<((*one*)) \" two|thing>))')
- end
-
- def test_parse_ref_substitute_multi_content3
- assert_equal '{<em>one</em> \\" <em>two</em>}[rdoc-label:thing]',
- parse('((<((*one*)) \" ((*two*))|thing>))')
- end
-
- def test_parse_ref_substitute_quote
- assert_equal '{one | two}[rdoc-label:thing]',
- parse('((<"one | two"|thing>))')
- end
-
- def test_parse_ref_substitute_quote_content
- assert_equal '{<em>text</em>}[rdoc-label:thing]',
- parse('((<"((*text*))"|thing>))')
- end
-
- def test_parse_ref_substitute_url
- assert_equal '{text}[http://example]',
- parse('((<text|URL:http://example>))')
- end
-
- def test_parse_ref_url
- assert_equal '{http://example}[http://example]',
- parse('((<URL:http://example>))')
- end
-
- def test_parse_var
- assert_equal '+text+', parse('((|text|))')
- end
-
- def test_parse_verb
- assert_equal '<tt>text</tt>', parse("(('text'))")
- end
-
- def test_parse_verb_backslash
- assert_equal "<tt>(('text'))</tt>", parse("(('(('text\\'))'))")
- end
-
- def test_parse_verb_backslash_backslash
- assert_equal '<tt>text \\</tt>', parse("(('text \\\\'))")
- end
-
- def test_parse_verb_backslash_quote
- assert_equal '<tt>text "</tt>', parse("(('text \\\"'))")
- end
-
- def test_parse_verb_emphasis
- assert_equal '<tt>((*emphasis*))</tt>', parse("(('((*emphasis*))'))")
- end
-
- def test_parse_verb_multiple
- assert_equal '<tt>((*text*))</tt>', parse("(('((*text*))'))")
- end
-
- def parse text
- @inline_parser.parse text
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb
index 28b6a2bb4d..b02ef2ae1a 100644
--- a/test/rdoc/test_rdoc_rdoc.rb
+++ b/test/rdoc/test_rdoc_rdoc.rb
@@ -1,110 +1,24 @@
-require 'rdoc/test_case'
+require 'tempfile'
+require 'tmpdir'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/rdoc'
-class TestRDocRDoc < RDoc::TestCase
+class TestRDocRDoc < MiniTest::Unit::TestCase
def setup
- super
-
@rdoc = RDoc::RDoc.new
- @rdoc.options = RDoc::Options.new
-
- @stats = RDoc::Stats.new @store, 0, 0
- @rdoc.instance_variable_set :@stats, @stats
+ @tempfile = Tempfile.new 'test_rdoc_rdoc'
+ @tempfile.binmode
end
- def test_document # functional test
- options = RDoc::Options.new
- options.files = [File.expand_path('../xref_data.rb', __FILE__)]
- options.setup_generator 'ri'
- options.main_page = 'MAIN_PAGE.rdoc'
- options.root = Pathname File.expand_path('..', __FILE__)
- options.title = 'title'
-
- rdoc = RDoc::RDoc.new
-
- temp_dir do
- options.op_dir = 'ri'
-
- capture_io do
- rdoc.document options
- end
-
- assert File.directory? 'ri'
- assert_equal rdoc, rdoc.store.rdoc
- end
-
- store = rdoc.store
-
- assert_equal 'MAIN_PAGE.rdoc', store.main
- assert_equal 'title', store.title
+ def teardown
+ @tempfile.close rescue nil # HACK for 1.8.6
end
def test_gather_files
- a = File.expand_path __FILE__
- b = File.expand_path '../test_rdoc_text.rb', __FILE__
-
- assert_equal [a, b], @rdoc.gather_files([b, a, b])
- end
-
- def test_handle_pipe
- $stdin = StringIO.new "hello"
-
- out, = capture_io do
- @rdoc.handle_pipe
- end
-
- assert_equal "\n<p>hello</p>\n", out
- ensure
- $stdin = STDIN
- end
-
- def test_handle_pipe_rd
- $stdin = StringIO.new "=begin\nhello\n=end"
-
- @rdoc.options.markup = 'rd'
-
- out, = capture_io do
- @rdoc.handle_pipe
- end
-
- assert_equal "\n<p>hello</p>\n", out
- ensure
- $stdin = STDIN
- end
-
- def test_load_options
- temp_dir do
- options = RDoc::Options.new
- options.markup = 'tomdoc'
- options.write_options
-
- options = @rdoc.load_options
-
- assert_equal 'tomdoc', options.markup
- end
- end
-
- def test_load_options_invalid
- temp_dir do
- open '.rdoc_options', 'w' do |io|
- io.write "a: !ruby.yaml.org,2002:str |\nfoo"
- end
-
- e = assert_raises RDoc::Error do
- @rdoc.load_options
- end
-
- options_file = File.expand_path '.rdoc_options'
- assert_equal "#{options_file} is not a valid rdoc options file", e.message
- end
- end
-
- def load_options_no_file
- temp_dir do
- options = @rdoc.load_options
-
- assert_kind_of RDoc::Options, options
- end
+ file = File.expand_path __FILE__
+ assert_equal [file], @rdoc.gather_files([file, file])
end
def test_normalized_file_list
@@ -125,128 +39,49 @@ class TestRDocRDoc < RDoc::TestCase
assert_empty files
end
- def test_normalized_file_list_non_file_directory
- dev = defined?(File::NULL) ? File::NULL : '/dev/stdin'
- skip "#{dev} is not a character special" unless
- File.chardev? dev
-
- files = nil
-
- out, err = verbose_capture_io do
- files = @rdoc.normalized_file_list [dev]
- end
-
- files = files.map { |file| File.expand_path file }
-
- assert_empty files
+ def test_read_file_contents
+ @tempfile.write "hi everybody"
+ @tempfile.flush
- assert_empty out
- assert_match %r"^rdoc can't parse", err
- assert_match %r"#{dev}$", err
+ assert_equal "hi everybody", @rdoc.read_file_contents(@tempfile.path)
end
- def test_parse_file
- @rdoc.store = RDoc::Store.new
-
- temp_dir do |dir|
- @rdoc.options.root = Pathname(Dir.pwd)
-
- open 'test.txt', 'w' do |io|
- io.puts 'hi'
- end
+ def test_read_file_contents_encoding
+ skip "Encoding not implemented" unless defined? ::Encoding
- top_level = @rdoc.parse_file 'test.txt'
+ @tempfile.write "# coding: utf-8\nhi everybody"
+ @tempfile.flush
- assert_equal 'test.txt', top_level.absolute_name
- assert_equal 'test.txt', top_level.relative_name
- end
+ contents = @rdoc.read_file_contents @tempfile.path
+ assert_equal "# coding: utf-8\nhi everybody", contents
+ assert_equal Encoding::UTF_8, contents.encoding
end
- def test_parse_file_page_dir
- @rdoc.store = RDoc::Store.new
-
- temp_dir do |dir|
- FileUtils.mkdir 'pages'
- @rdoc.options.page_dir = Pathname('pages')
- @rdoc.options.root = Pathname(Dir.pwd)
-
- open 'pages/test.txt', 'w' do |io|
- io.puts 'hi'
- end
+ def test_read_file_contents_encoding_fancy
+ skip "Encoding not implemented" unless defined? ::Encoding
- top_level = @rdoc.parse_file 'pages/test.txt'
+ @tempfile.write "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody"
+ @tempfile.flush
- assert_equal 'pages/test.txt', top_level.absolute_name
- assert_equal 'test.txt', top_level.relative_name
- end
+ contents = @rdoc.read_file_contents @tempfile.path
+ assert_equal("# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody",
+ contents)
+ assert_equal Encoding::UTF_8, contents.encoding
end
- def test_parse_file_relative
- pwd = Dir.pwd
-
- @rdoc.store = RDoc::Store.new
+ def test_read_file_contents_encoding_with_signature
+ skip "Encoding not implemented" unless defined? ::Encoding
- temp_dir do |dir|
- @rdoc.options.root = Pathname(dir)
-
- open 'test.txt', 'w' do |io|
- io.puts 'hi'
- end
+ @tempfile.write "\xEF\xBB\xBF""hi everybody"
+ @tempfile.flush
- test_txt = File.join dir, 'test.txt'
-
- Dir.chdir pwd do
- top_level = @rdoc.parse_file test_txt
-
- assert_equal test_txt, top_level.absolute_name
- assert_equal 'test.txt', top_level.relative_name
- end
- end
- end
-
- def test_parse_file_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
- @rdoc.options.encoding = Encoding::ISO_8859_1
- @rdoc.store = RDoc::Store.new
-
- Tempfile.open 'test.txt' do |io|
- io.write 'hi'
- io.rewind
-
- top_level = @rdoc.parse_file io.path
-
- assert_equal Encoding::ISO_8859_1, top_level.absolute_name.encoding
- end
- end
-
- def test_parse_file_forbidden
- skip 'chmod not supported' if Gem.win_platform?
-
- @rdoc.store = RDoc::Store.new
-
- Tempfile.open 'test.txt' do |io|
- io.write 'hi'
- io.rewind
-
- File.chmod 0000, io.path
-
- begin
- top_level = :bug
-
- _, err = capture_io do
- top_level = @rdoc.parse_file io.path
- end
-
- assert_match "Unable to read #{io.path},", err
-
- assert_nil top_level
- ensure
- File.chmod 0400, io.path
- end
- end
+ bug3360 = '[ruby-dev:41452]'
+ contents = @rdoc.read_file_contents @tempfile.path
+ assert_equal "hi everybody", contents, bug3360
+ assert_equal Encoding::UTF_8, contents.encoding, bug3360
end
- def test_remove_unparseable
+ def test_remove_unparsable
file_list = %w[
blah.class
blah.eps
@@ -259,60 +94,23 @@ class TestRDocRDoc < RDoc::TestCase
assert_empty @rdoc.remove_unparseable file_list
end
- def test_remove_unparseable_tags_emacs
- temp_dir do
- open 'TAGS', 'wb' do |io| # emacs
- io.write "\f\nlib/foo.rb,43\n"
- end
-
- file_list = %w[
- TAGS
- ]
-
- assert_empty @rdoc.remove_unparseable file_list
- end
- end
-
- def test_remove_unparseable_tags_vim
- temp_dir do
- open 'TAGS', 'w' do |io| # emacs
- io.write "!_TAG_"
- end
-
- file_list = %w[
- TAGS
- ]
-
- assert_empty @rdoc.remove_unparseable file_list
- end
- end
-
def test_setup_output_dir
+ skip "No Dir::mktmpdir, upgrade your ruby" unless Dir.respond_to? :mktmpdir
+
Dir.mktmpdir {|d|
- path = File.join d, 'testdir'
+ path = File.join(d, 'testdir')
last = @rdoc.setup_output_dir path, false
assert_empty last
assert File.directory? path
- assert File.exist? @rdoc.output_flag_file path
}
end
- def test_setup_output_dir_dry_run
- @rdoc.options.dry_run = true
-
- Dir.mktmpdir do |d|
- path = File.join d, 'testdir'
-
- @rdoc.setup_output_dir path, false
-
- refute File.exist? path
- end
- end
-
def test_setup_output_dir_exists
+ skip "No Dir::mktmpdir, upgrade your ruby" unless Dir.respond_to? :mktmpdir
+
Dir.mktmpdir {|path|
open @rdoc.output_flag_file(path), 'w' do |io|
io.puts Time.at 0
@@ -327,6 +125,8 @@ class TestRDocRDoc < RDoc::TestCase
end
def test_setup_output_dir_exists_empty_created_rid
+ skip "No Dir::mktmpdir, upgrade your ruby" unless Dir.respond_to? :mktmpdir
+
Dir.mktmpdir {|path|
open @rdoc.output_flag_file(path), 'w' do end
@@ -339,19 +139,19 @@ class TestRDocRDoc < RDoc::TestCase
end
def test_setup_output_dir_exists_file
- Tempfile.open 'test_rdoc_rdoc' do |tempfile|
- path = tempfile.path
+ path = @tempfile.path
- e = assert_raises RDoc::Error do
- @rdoc.setup_output_dir path, false
- end
-
- assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
- e.message)
+ e = assert_raises RDoc::Error do
+ @rdoc.setup_output_dir path, false
end
+
+ assert_match(%r%#{Regexp.escape path} exists and is not a directory%,
+ e.message)
end
def test_setup_output_dir_exists_not_rdoc
+ skip "No Dir::mktmpdir, upgrade your ruby" unless Dir.respond_to? :mktmpdir
+
Dir.mktmpdir do |dir|
e = assert_raises RDoc::Error do
@rdoc.setup_output_dir dir, false
@@ -361,31 +161,5 @@ class TestRDocRDoc < RDoc::TestCase
end
end
- def test_update_output_dir
- Dir.mktmpdir do |d|
- @rdoc.update_output_dir d, Time.now, {}
-
- assert File.exist? "#{d}/created.rid"
- end
- end
-
- def test_update_output_dir_dont
- Dir.mktmpdir do |d|
- @rdoc.options.update_output_dir = false
- @rdoc.update_output_dir d, Time.now, {}
-
- refute File.exist? "#{d}/created.rid"
- end
- end
-
- def test_update_output_dir_dry_run
- Dir.mktmpdir do |d|
- @rdoc.options.dry_run = true
- @rdoc.update_output_dir d, Time.now, {}
-
- refute File.exist? "#{d}/created.rid"
- end
- end
-
end
diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb
index 92403e12f4..8d64916088 100644
--- a/test/rdoc/test_rdoc_ri_driver.rb
+++ b/test/rdoc/test_rdoc_ri_driver.rb
@@ -1,9 +1,14 @@
-require 'rdoc/test_case'
+require 'pp'
+require 'rubygems'
+require 'minitest/autorun'
+require 'tmpdir'
+require 'fileutils'
+require 'rdoc/ri/driver'
-class TestRDocRIDriver < RDoc::TestCase
+class TestRDocRIDriver < MiniTest::Unit::TestCase
def setup
- super
+ @RM = RDoc::Markup
@tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_driver_#{$$}"
@home_ri = File.join @tmpdir, 'dot_ri'
@@ -16,22 +21,14 @@ class TestRDocRIDriver < RDoc::TestCase
ENV['HOME'] = @tmpdir
ENV.delete 'RI'
- @options = RDoc::RI::Driver.default_options
- @options[:use_system] = false
- @options[:use_site] = false
- @options[:use_home] = false
- @options[:use_gems] = false
-
- @options[:home] = @tmpdir
- @options[:use_stdout] = true
- @options[:formatter] = @RM::ToRdoc
-
- @driver = RDoc::RI::Driver.new @options
+ options = RDoc::RI::Driver.process_args []
+ options[:home] = @tmpdir
+ options[:use_stdout] = true
+ options[:formatter] = @RM::ToRdoc
+ @driver = RDoc::RI::Driver.new options
end
def teardown
- super
-
ENV['HOME'] = @orig_home
ENV['RI'] = @orig_ri
FileUtils.rm_rf @tmpdir
@@ -56,8 +53,8 @@ class TestRDocRIDriver < RDoc::TestCase
def test_self_dump
util_store
- out, = capture_io do
- RDoc::RI::Driver.dump @store1.cache_path
+ out, err = capture_io do
+ RDoc::RI::Driver.dump @store.cache_path
end
assert_match %r%:class_methods%, out
@@ -86,8 +83,8 @@ class TestRDocRIDriver < RDoc::TestCase
expected = @RM::Document.new(
@RM::Rule.new(1),
@RM::Paragraph.new('Also found in:'),
- @RM::Verbatim.new("ruby core", "\n",
- "~/.rdoc", "\n"))
+ @RM::Verbatim.new(' ', 'ruby core', "\n",
+ ' ', '~/.ri', "\n"))
assert_equal expected, out
end
@@ -108,44 +105,26 @@ class TestRDocRIDriver < RDoc::TestCase
def test_add_from
util_store
- @store1.type = :system
+ @store.type = :system
out = @RM::Document.new
- @driver.add_from out, @store1
+ @driver.add_from out, @store
expected = @RM::Document.new @RM::Paragraph.new("(from ruby core)")
assert_equal expected, out
end
- def test_add_extends
- util_store
-
- out = @RM::Document.new
-
- @driver.add_extends out, [[[@cFooExt], @store1]]
-
- expected = @RM::Document.new(
- @RM::Rule.new(1),
- @RM::Heading.new(1, "Extended by:"),
- @RM::Paragraph.new("Ext (from #{@store1.friendly_path})"),
- @RM::BlankLine.new,
- @RM::Paragraph.new("Extend thingy"),
- @RM::BlankLine.new)
-
- assert_equal expected, out
- end
-
- def test_add_extension_modules_empty
+ def test_add_includes_empty
out = @RM::Document.new
- @driver.add_extension_modules out, 'Includes', []
+ @driver.add_includes out, []
assert_empty out
end
- def test_add_extension_modules_many
+ def test_add_includes_many
util_store
out = @RM::Document.new
@@ -153,23 +132,23 @@ class TestRDocRIDriver < RDoc::TestCase
enum = RDoc::Include.new 'Enumerable', nil
@cFoo.add_include enum
- @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
+ @driver.add_includes out, [[[@cFooInc, enum], @store]]
expected = @RM::Document.new(
@RM::Rule.new(1),
@RM::Heading.new(1, "Includes:"),
- @RM::Paragraph.new("(from #{@store1.friendly_path})"),
+ @RM::Paragraph.new("(from #{@store.friendly_path})"),
@RM::BlankLine.new,
@RM::Paragraph.new("Inc"),
@RM::BlankLine.new,
@RM::Paragraph.new("Include thingy"),
@RM::BlankLine.new,
- @RM::Verbatim.new("Enumerable", "\n"))
+ @RM::Verbatim.new(' ', 'Enumerable', "\n"))
assert_equal expected, out
end
- def test_add_extension_modules_many_no_doc
+ def test_add_includes_many_no_doc
util_store
out = @RM::Document.new
@@ -178,29 +157,29 @@ class TestRDocRIDriver < RDoc::TestCase
@cFoo.add_include enum
@cFooInc.instance_variable_set :@comment, ''
- @driver.add_extension_modules out, 'Includes', [[[@cFooInc, enum], @store1]]
+ @driver.add_includes out, [[[@cFooInc, enum], @store]]
expected = @RM::Document.new(
@RM::Rule.new(1),
@RM::Heading.new(1, "Includes:"),
- @RM::Paragraph.new("(from #{@store1.friendly_path})"),
- @RM::Verbatim.new("Inc", "\n",
- "Enumerable", "\n"))
+ @RM::Paragraph.new("(from #{@store.friendly_path})"),
+ @RM::Verbatim.new(' ', 'Inc', "\n",
+ ' ', 'Enumerable', "\n"))
assert_equal expected, out
end
- def test_add_extension_modules_one
+ def test_add_includes_one
util_store
out = @RM::Document.new
- @driver.add_extension_modules out, 'Includes', [[[@cFooInc], @store1]]
+ @driver.add_includes out, [[[@cFooInc], @store]]
expected = @RM::Document.new(
@RM::Rule.new(1),
@RM::Heading.new(1, "Includes:"),
- @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
+ @RM::Paragraph.new("Inc (from #{@store.friendly_path})"),
@RM::BlankLine.new,
@RM::Paragraph.new("Include thingy"),
@RM::BlankLine.new)
@@ -208,164 +187,15 @@ class TestRDocRIDriver < RDoc::TestCase
assert_equal expected, out
end
- def test_add_includes
- util_store
-
- out = @RM::Document.new
-
- @driver.add_includes out, [[[@cFooInc], @store1]]
-
- expected = @RM::Document.new(
- @RM::Rule.new(1),
- @RM::Heading.new(1, "Includes:"),
- @RM::Paragraph.new("Inc (from #{@store1.friendly_path})"),
- @RM::BlankLine.new,
- @RM::Paragraph.new("Include thingy"),
- @RM::BlankLine.new)
-
- assert_equal expected, out
- end
-
- def test_add_method
- util_store
-
- out = doc
-
- @driver.add_method out, 'Foo::Bar#blah'
-
- expected =
- doc(
- head(1, 'Foo::Bar#blah'),
- blank_line,
- para('(from ~/.rdoc)'),
- head(3, 'Implementation from Bar'),
- rule(1),
- verb("blah(5) => 5\n",
- "blah(6) => 6\n"),
- rule(1),
- blank_line,
- blank_line)
-
- assert_equal expected, out
- end
-
- def test_add_method_attribute
- util_store
-
- out = doc
-
- @driver.add_method out, 'Foo::Bar#attr'
-
- expected =
- doc(
- head(1, 'Foo::Bar#attr'),
- blank_line,
- para('(from ~/.rdoc)'),
- rule(1),
- blank_line,
- blank_line)
-
- assert_equal expected, out
- end
-
- def test_add_method_inherited
- util_multi_store
-
- out = doc
-
- @driver.add_method out, 'Bar#inherit'
-
- expected =
- doc(
- head(1, 'Bar#inherit'),
- blank_line,
- para('(from ~/.rdoc)'),
- head(3, 'Implementation from Foo'),
- rule(1),
- blank_line,
- blank_line)
-
- assert_equal expected, out
- end
-
- def test_add_method_overriden
- util_multi_store
-
- out = doc
-
- @driver.add_method out, 'Bar#override'
-
- expected =
- doc(
- head(1, 'Bar#override'),
- blank_line,
- para("(from #{@store2.path})"),
- rule(1),
- blank_line,
- para('must be displayed'),
- blank_line,
- blank_line)
-
- assert_equal expected, out
- end
-
- def test_add_method_documentation
- util_store
-
- out = doc()
-
- missing = RDoc::AnyMethod.new nil, 'missing'
- @cFoo.add_method missing
-
- @driver.add_method_documentation out, @cFoo
-
- expected =
- doc(
- head(1, 'Foo#inherit'),
- blank_line,
- para('(from ~/.rdoc)'),
- rule(1),
- blank_line,
- blank_line,
- head(1, 'Foo#override'),
- blank_line,
- para('(from ~/.rdoc)'),
- rule(1),
- blank_line,
- para('must not be displayed in Bar#override'),
- blank_line,
- blank_line)
-
- assert_equal expected, out
- end
-
def test_add_method_list
out = @RM::Document.new
- @driver.add_method_list out, %w[new parse], 'Class methods'
+ @driver.add_method_list out, %w[new], 'Class methods'
expected = @RM::Document.new(
@RM::Heading.new(1, 'Class methods:'),
@RM::BlankLine.new,
- @RM::Verbatim.new('new'),
- @RM::Verbatim.new('parse'),
- @RM::BlankLine.new)
-
- assert_equal expected, out
- end
-
- def test_add_method_list_interative
- @options[:interactive] = true
- driver = RDoc::RI::Driver.new @options
-
- out = @RM::Document.new
-
- driver.add_method_list out, %w[new parse], 'Class methods'
-
- expected = @RM::Document.new(
- @RM::Heading.new(1, 'Class methods:'),
- @RM::BlankLine.new,
- @RM::IndentedParagraph.new(2, 'new, parse'),
+ @RM::Verbatim.new(' ', 'new'),
@RM::BlankLine.new)
assert_equal expected, out
@@ -374,7 +204,7 @@ class TestRDocRIDriver < RDoc::TestCase
def test_add_method_list_none
out = @RM::Document.new
- @driver.add_method_list out, [], 'Class'
+ @driver.add_method_list out, nil, 'Class'
assert_equal @RM::Document.new, out
end
@@ -391,66 +221,13 @@ class TestRDocRIDriver < RDoc::TestCase
expected = {
'Ambiguous' => [@store1, @store2],
'Bar' => [@store2],
- 'Ext' => [@store1],
- 'Foo' => [@store1, @store2],
+ 'Foo' => [@store1],
'Foo::Bar' => [@store1],
'Foo::Baz' => [@store1, @store2],
'Inc' => [@store1],
}
- classes = @driver.classes
-
- assert_equal expected.keys.sort, classes.keys.sort
-
- expected.each do |klass, stores|
- assert_equal stores, classes[klass].sort_by { |store| store.path },
- "mismatch for #{klass}"
- end
- end
-
- def test_class_document
- util_store
-
- tl1 = @store1.add_file 'one.rb'
- tl2 = @store1.add_file 'two.rb'
-
- @cFoo.add_comment 'one', tl1
- @cFoo.add_comment 'two', tl2
-
- @store1.save_class @cFoo
-
- found = [
- [@store1, @store1.load_class(@cFoo.full_name)]
- ]
-
- extends = [[[@cFooExt], @store1]]
- includes = [[[@cFooInc], @store1]]
-
- out = @driver.class_document @cFoo.full_name, found, [], includes, extends
-
- expected = @RM::Document.new
- @driver.add_class expected, 'Foo', []
- @driver.add_includes expected, includes
- @driver.add_extends expected, extends
- @driver.add_from expected, @store1
- expected << @RM::Rule.new(1)
-
- doc = @RM::Document.new(@RM::Paragraph.new('one'))
- doc.file = 'one.rb'
- expected.push doc
- expected << @RM::BlankLine.new
- doc = @RM::Document.new(@RM::Paragraph.new('two'))
- doc.file = 'two.rb'
- expected.push doc
-
- expected << @RM::Rule.new(1)
- expected << @RM::Heading.new(1, 'Instance methods:')
- expected << @RM::BlankLine.new
- expected << @RM::Verbatim.new('inherit')
- expected << @RM::Verbatim.new('override')
- expected << @RM::BlankLine.new
-
- assert_equal expected, out
+ assert_equal expected, @driver.classes
end
def test_complete
@@ -472,14 +249,12 @@ class TestRDocRIDriver < RDoc::TestCase
@driver.stores = [store]
- assert_equal %w[Foo ], @driver.complete('F')
+ assert_equal %w[Foo Foo::Bar], @driver.complete('F')
assert_equal %w[ Foo::Bar], @driver.complete('Foo::B')
- assert_equal %w[Foo#Bar], @driver.complete('Foo#'), 'Foo#'
- assert_equal %w[Foo#Bar Foo::bar], @driver.complete('Foo.'), 'Foo.'
- assert_equal %w[Foo::Bar Foo::bar], @driver.complete('Foo::'), 'Foo::'
-
- assert_equal %w[ Foo::bar], @driver.complete('Foo::b'), 'Foo::b'
+ assert_equal %w[Foo#Bar], @driver.complete('Foo#'), 'Foo#'
+ assert_equal %w[Foo#Bar Foo::bar], @driver.complete('Foo.'), 'Foo.'
+ assert_equal %w[Foo::Bar Foo::bar], @driver.complete('Foo::'), 'Foo::'
end
def test_complete_ancestor
@@ -494,9 +269,7 @@ class TestRDocRIDriver < RDoc::TestCase
def test_complete_classes
util_store
- assert_equal %w[ ], @driver.complete('[')
- assert_equal %w[ ], @driver.complete('[::')
- assert_equal %w[Foo ], @driver.complete('F')
+ assert_equal %w[Foo Foo::Bar Foo::Baz], @driver.complete('F')
assert_equal %w[Foo:: Foo::Bar Foo::Baz], @driver.complete('Foo::')
assert_equal %w[ Foo::Bar Foo::Baz], @driver.complete('Foo::B')
end
@@ -505,15 +278,14 @@ class TestRDocRIDriver < RDoc::TestCase
util_multi_store
assert_equal %w[Bar], @driver.complete('B')
- assert_equal %w[Foo], @driver.complete('F')
- assert_equal %w[Foo::Bar Foo::Baz], @driver.complete('Foo::B')
+ assert_equal %w[Foo Foo::Bar Foo::Baz], @driver.complete('F')
end
def test_display
doc = @RM::Document.new(
@RM::Paragraph.new('hi'))
- out, = capture_io do
+ out, err = capture_io do
@driver.display doc
end
@@ -523,12 +295,12 @@ class TestRDocRIDriver < RDoc::TestCase
def test_display_class
util_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_class 'Foo::Bar'
end
assert_match %r%^= Foo::Bar%, out
- assert_match %r%^\(from%, out
+ assert_match %r%^\(from%, out # )
assert_match %r%^= Class methods:%, out
assert_match %r%^ new%, out
@@ -538,38 +310,12 @@ class TestRDocRIDriver < RDoc::TestCase
assert_match %r%^ attr_accessor attr%, out
assert_equal 1, out.scan(/-\n/).length
-
- refute_match %r%Foo::Bar#blah%, out
- end
-
- def test_display_class_all
- util_store
-
- @driver.show_all = true
-
- out, = capture_io do
- @driver.display_class 'Foo::Bar'
- end
-
- assert_match %r%^= Foo::Bar%, out
- assert_match %r%^\(from%, out
-
- assert_match %r%^= Class methods:%, out
- assert_match %r%^ new%, out
- assert_match %r%^= Instance methods:%, out
- assert_match %r%^ blah%, out
- assert_match %r%^= Attributes:%, out
- assert_match %r%^ attr_accessor attr%, out
-
- assert_equal 6, out.scan(/-\n/).length
-
- assert_match %r%Foo::Bar#blah%, out
end
def test_display_class_ambiguous
util_multi_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_class 'Ambiguous'
end
@@ -579,7 +325,7 @@ class TestRDocRIDriver < RDoc::TestCase
def test_display_class_multi_no_doc
util_multi_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_class 'Foo::Baz'
end
@@ -593,7 +339,7 @@ class TestRDocRIDriver < RDoc::TestCase
def test_display_class_superclass
util_multi_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_class 'Bar'
end
@@ -603,25 +349,17 @@ class TestRDocRIDriver < RDoc::TestCase
def test_display_class_module
util_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_class 'Inc'
end
assert_match %r%^= Inc$%, out
end
- def test_display_class_page
- out, = capture_io do
- @driver.display_class 'ruby:README'
- end
-
- assert_empty out
- end
-
def test_display_method
util_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_method 'Foo::Bar#blah'
end
@@ -633,7 +371,7 @@ class TestRDocRIDriver < RDoc::TestCase
def test_display_method_attribute
util_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_method 'Foo::Bar#attr'
end
@@ -644,7 +382,7 @@ class TestRDocRIDriver < RDoc::TestCase
def test_display_method_inherited
util_multi_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_method 'Bar#inherit'
end
@@ -652,20 +390,10 @@ class TestRDocRIDriver < RDoc::TestCase
assert_match %r%^=== Implementation from Foo%, out
end
- def test_display_method_overriden
- util_multi_store
-
- out, = capture_io do
- @driver.display_method 'Bar#override'
- end
-
- refute_match %r%must not be displayed%, out
- end
-
def test_display_name_not_found_class
util_store
- out, = capture_io do
+ out, err = capture_io do
assert_equal false, @driver.display_name('Foo::B')
end
@@ -682,7 +410,7 @@ Foo::Baz
def test_display_name_not_found_method
util_store
- out, = capture_io do
+ out, err = capture_io do
assert_equal false, @driver.display_name('Foo::Bar#b')
end
@@ -699,128 +427,13 @@ Foo::Bar#bother
def test_display_method_params
util_store
- out, = capture_io do
+ out, err = capture_io do
@driver.display_method 'Foo::Bar#bother'
end
assert_match %r%things.*stuff%, out
end
- def test_display_page
- util_store
-
- out, = capture_io do
- @driver.display_page 'home:README.rdoc'
- end
-
- assert_match %r%= README%, out
- end
-
- def test_display_page_add_extension
- util_store
-
- out, = capture_io do
- @driver.display_page 'home:README'
- end
-
- assert_match %r%= README%, out
- end
-
- def test_display_page_ambiguous
- util_store
-
- other = @store1.add_file 'README.md'
- other.parser = RDoc::Parser::Simple
- other.comment =
- doc(
- head(1, 'README.md'),
- para('This is the other README'))
-
- @store1.save_page other
-
- out, = capture_io do
- @driver.display_page 'home:README'
- end
-
- assert_match %r%= README pages in ~/\.rdoc%, out
- assert_match %r%README\.rdoc%, out
- assert_match %r%README\.md%, out
- end
-
- def test_display_page_extension
- util_store
-
- other = @store1.add_file 'README.EXT'
- other.parser = RDoc::Parser::Simple
- other.comment =
- doc(
- head(1, 'README.EXT'),
- para('This is the other README'))
-
- @store1.save_page other
-
- out, = capture_io do
- @driver.display_page 'home:README.EXT'
- end
-
- assert_match 'other README', out
- end
-
- def test_display_page_ignore_directory
- util_store
-
- other = @store1.add_file 'doc/globals.rdoc'
- other.parser = RDoc::Parser::Simple
- other.comment =
- doc(
- head(1, 'globals.rdoc'),
- para('Globals go here'))
-
- @store1.save_page other
-
- out, = capture_io do
- @driver.display_page 'home:globals'
- end
-
- assert_match %r%= globals\.rdoc%, out
- end
-
- def test_display_page_missing
- util_store
-
- out, = capture_io do
- @driver.display_page 'home:missing'
- end
-
- out, = capture_io do
- @driver.display_page_list @store1
- end
-
- assert_match %r%= Pages in ~/\.rdoc%, out
- assert_match %r%README\.rdoc%, out
- end
-
- def test_display_page_list
- util_store
-
- other = @store1.add_file 'OTHER.rdoc'
- other.parser = RDoc::Parser::Simple
- other.comment =
- doc(
- head(1, 'OTHER'),
- para('This is OTHER'))
-
- @store1.save_page other
-
- out, = capture_io do
- @driver.display_page_list @store1
- end
-
- assert_match %r%= Pages in ~/\.rdoc%, out
- assert_match %r%README\.rdoc%, out
- assert_match %r%OTHER\.rdoc%, out
- end
-
def test_expand_class
util_store
@@ -844,17 +457,6 @@ Foo::Bar#bother
end
assert_equal 'Z', e.name
-
- @driver.stores << RDoc::Store.new(nil, :system)
-
- assert_equal 'ruby:README', @driver.expand_name('ruby:README')
- assert_equal 'ruby:', @driver.expand_name('ruby:')
-
- e = assert_raises RDoc::RI::Driver::NotFoundError do
- @driver.expand_name 'nonexistent_gem:'
- end
-
- assert_equal 'nonexistent_gem', e.name
end
def test_find_methods
@@ -867,7 +469,7 @@ Foo::Bar#bother
end
expected = [
- [@store1, 'Foo::Bar', 'Foo::Bar', :both, nil],
+ [@store, 'Foo::Bar', 'Foo::Bar', :both, nil],
]
assert_equal expected, items
@@ -883,88 +485,31 @@ Foo::Bar#bother
end
expected = [
- [@store1, 'Ambiguous', 'Ambiguous', :both, 'blah'],
- [@store1, 'Ext', 'Ext', :both, 'blah'],
- [@store1, 'Foo', 'Foo', :both, 'blah'],
- [@store1, 'Foo::Bar', 'Foo::Bar', :both, 'blah'],
- [@store1, 'Foo::Baz', 'Foo::Baz', :both, 'blah'],
- [@store1, 'Inc', 'Inc', :both, 'blah'],
+ [@store, 'Ambiguous', 'Ambiguous', :both, 'blah'],
+ [@store, 'Foo', 'Foo', :both, 'blah'],
+ [@store, 'Foo::Bar', 'Foo::Bar', :both, 'blah'],
+ [@store, 'Foo::Baz', 'Foo::Baz', :both, 'blah'],
+ [@store, 'Inc', 'Inc', :both, 'blah'],
]
assert_equal expected, items
end
- def test_filter_methods
- util_multi_store
-
- name = 'Bar#override'
-
- found = @driver.load_methods_matching name
-
- sorted = @driver.filter_methods found, name
-
- expected = [[@store2, [@override]]]
-
- assert_equal expected, sorted
- end
-
- def test_filter_methods_not_found
- util_multi_store
-
- name = 'Bar#inherit'
-
- found = @driver.load_methods_matching name
-
- sorted = @driver.filter_methods found, name
-
- assert_equal found, sorted
- end
-
- def test_find_store
- @driver.stores << RDoc::Store.new(nil, :system)
- @driver.stores << RDoc::Store.new('doc/gem-1.0/ri', :gem)
-
- assert_equal 'ruby', @driver.find_store('ruby')
- assert_equal 'gem-1.0', @driver.find_store('gem-1.0')
- assert_equal 'gem-1.0', @driver.find_store('gem')
-
- e = assert_raises RDoc::RI::Driver::NotFoundError do
- @driver.find_store 'nonexistent'
- end
-
- assert_equal 'nonexistent', e.name
- end
-
def test_formatter
- tty = Object.new
- def tty.tty?() true; end
-
driver = RDoc::RI::Driver.new
- assert_instance_of @RM::ToAnsi, driver.formatter(tty)
+ io = Object.new
+ def io.tty?; true; end
- assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
+ assert_instance_of @RM::ToAnsi, driver.formatter(io)
driver.instance_variable_set :@paging, true
- assert_instance_of @RM::ToBs, driver.formatter(StringIO.new)
- end
-
- def test_in_path_eh
- path = ENV['PATH']
-
- test_path = File.expand_path '..', __FILE__
-
- temp_dir do |dir|
- nonexistent = File.join dir, 'nonexistent'
- refute @driver.in_path?(nonexistent)
+ assert_instance_of @RM::ToBs, driver.formatter(io)
- ENV['PATH'] = test_path
+ driver.instance_variable_set :@formatter_klass, @RM::ToHtml
- assert @driver.in_path?(File.basename(__FILE__))
- end
- ensure
- ENV['PATH'] = path
+ assert_instance_of @RM::ToHtml, driver.formatter(io)
end
def test_method_type
@@ -974,90 +519,27 @@ Foo::Bar#bother
assert_equal :class, @driver.method_type('::')
end
- def test_name_regexp
- assert_equal %r%^RDoc::AnyMethod#new$%,
- @driver.name_regexp('RDoc::AnyMethod#new')
-
- assert_equal %r%^RDoc::AnyMethod::new$%,
- @driver.name_regexp('RDoc::AnyMethod::new')
-
- assert_equal %r%^RDoc::AnyMethod(#|::)new$%,
- @driver.name_regexp('RDoc::AnyMethod.new')
-
- assert_equal %r%^Hash(#|::)\[\]$%,
- @driver.name_regexp('Hash.[]')
-
- assert_equal %r%^Hash::\[\]$%,
- @driver.name_regexp('Hash::[]')
- end
-
def test_list_known_classes
util_store
- out, = capture_io do
- @driver.list_known_classes
+ out, err = capture_io do
+ @driver.list_known_classes
end
- assert_equal "Ambiguous\nExt\nFoo\nFoo::Bar\nFoo::Baz\nInc\n", out
- end
-
- def test_list_known_classes_name
- util_store
-
- out, = capture_io do
- @driver.list_known_classes %w[F I]
- end
-
- assert_equal "Foo\nFoo::Bar\nFoo::Baz\nInc\n", out
+ assert_equal "Ambiguous\nFoo\nFoo::Bar\nFoo::Baz\nInc\n", out
end
def test_list_methods_matching
util_store
- assert_equal %w[
- Foo::Bar#attr
- Foo::Bar#blah
- Foo::Bar#bother
- Foo::Bar::new
- ],
- @driver.list_methods_matching('Foo::Bar.').sort
- end
-
- def test_list_methods_matching_inherit
- util_multi_store
-
- assert_equal %w[
- Bar#baz
- Bar#inherit
- Bar#override
- ],
- @driver.list_methods_matching('Bar.').sort
- end
-
- def test_list_methods_matching_regexp
- util_store
-
- index = RDoc::AnyMethod.new nil, '[]'
- index.record_location @top_level
- @cFoo.add_method index
- @store1.save_method @cFoo, index
-
- c_index = RDoc::AnyMethod.new nil, '[]'
- c_index.singleton = true
- c_index.record_location @top_level
- @cFoo.add_method c_index
- @store1.save_method @cFoo, c_index
-
- @store1.save_cache
-
- assert_equal %w[Foo#[]], @driver.list_methods_matching('Foo#[]')
- assert_equal %w[Foo::[]], @driver.list_methods_matching('Foo::[]')
+ assert_equal %w[Foo::Bar#attr Foo::Bar#blah Foo::Bar#bother Foo::Bar::new],
+ @driver.list_methods_matching('Foo::Bar.')
end
def test_load_method
util_store
- method = @driver.load_method(@store1, :instance_methods, 'Foo', '#',
+ method = @driver.load_method(@store, :instance_methods, 'Foo', '#',
'inherit')
assert_equal @inherit, method
@@ -1075,11 +557,11 @@ Foo::Bar#bother
def test_load_methods_matching
util_store
- expected = [[@store1, [@inherit]]]
+ expected = [[@store, [@inherit]]]
assert_equal expected, @driver.load_methods_matching('Foo#inherit')
- expected = [[@store1, [@blah]]]
+ expected = [[@store, [@blah]]]
assert_equal expected, @driver.load_methods_matching('.blah')
@@ -1108,20 +590,6 @@ Foo::Bar#bother
refute @driver.paging?
end
- # this test is too fragile. Perhaps using Process.spawn will make this
- # reliable
- def _test_page_in_presence_of_child_status
- skip 'this test hangs on travis-ci.org' if ENV['CI']
- @driver.use_stdout = false
-
- with_dummy_pager do
- @driver.page do |io|
- refute_equal $stdout, io
- assert @driver.paging?
- end
- end
- end
-
def test_page_stdout
@driver.use_stdout = true
@@ -1152,28 +620,6 @@ Foo::Bar#bother
assert_equal 'foo', meth, '::foo method'
end
- def test_parse_name_page
- klass, type, meth = @driver.parse_name 'ruby:README'
-
- assert_equal 'ruby', klass, 'ruby project'
- assert_equal ':', type, 'ruby type'
- assert_equal 'README', meth, 'ruby page'
-
- klass, type, meth = @driver.parse_name 'ruby:'
-
- assert_equal 'ruby', klass, 'ruby project'
- assert_equal ':', type, 'ruby type'
- assert_equal nil, meth, 'ruby page'
- end
-
- def test_parse_name_page_extenson
- klass, type, meth = @driver.parse_name 'ruby:README.EXT'
-
- assert_equal 'ruby', klass, 'ruby project'
- assert_equal ':', type, 'ruby type'
- assert_equal 'README.EXT', meth, 'ruby page'
- end
-
def test_parse_name_single_class
klass, type, meth = @driver.parse_name 'Foo'
@@ -1238,42 +684,6 @@ Foo::Bar#bother
assert_equal 'baz', meth, 'Foo::Bar#baz method'
end
- def test_parse_name_special
- specials = %w[
- %
- &
- *
- +
- +@
- -
- -@
- /
- <
- <<
- <=
- <=>
- ==
- ===
- =>
- =~
- >
- >>
- []
- []=
- ^
- `
- |
- ~
- ~@
- ]
-
- specials.each do |special|
- parsed = @driver.parse_name special
-
- assert_equal ['', '.', special], parsed
- end
- end
-
def _test_setup_pager # this test doesn't do anything anymore :(
@driver.use_stdout = false
@@ -1333,88 +743,89 @@ Foo::Bar#bother
def util_multi_store
util_store
+ @store1 = @store
@home_ri2 = "#{@home_ri}2"
@store2 = RDoc::RI::Store.new @home_ri2
- @top_level = @store2.add_file 'file.rb'
-
# as if seen in a namespace like class Ambiguous::Other
- @mAmbiguous = @top_level.add_module RDoc::NormalModule, 'Ambiguous'
+ @mAmbiguous = RDoc::NormalModule.new 'Ambiguous'
- @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
+ @cFoo = RDoc::NormalClass.new 'Foo'
+ @cBar = RDoc::NormalClass.new 'Bar'
+ @cBar.superclass = 'Foo'
+ @cFoo_Baz = RDoc::NormalClass.new 'Baz'
+ @cFoo_Baz.parent = @cFoo
- @cBar = @top_level.add_class RDoc::NormalClass, 'Bar', 'Foo'
- @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
+ @baz = RDoc::AnyMethod.new nil, 'baz'
+ @cBar.add_method @baz
- @baz = @cBar.add_method RDoc::AnyMethod.new(nil, 'baz')
- @baz.record_location @top_level
+ @store2.save_class @mAmbiguous
+ @store2.save_class @cBar
+ @store2.save_class @cFoo_Baz
- @override = @cBar.add_method RDoc::AnyMethod.new(nil, 'override')
- @override.comment = 'must be displayed'
- @override.record_location @top_level
+ @store2.save_method @cBar, @baz
- @store2.save
+ @store2.save_cache
@driver.stores = [@store1, @store2]
end
def util_store
- @store1 = RDoc::RI::Store.new @home_ri, :home
-
- @top_level = @store1.add_file 'file.rb'
+ @store = RDoc::RI::Store.new @home_ri
- @readme = @store1.add_file 'README.rdoc'
- @readme.parser = RDoc::Parser::Simple
- @readme.comment =
- doc(
- head(1, 'README'),
- para('This is a README'))
+ @cFoo = RDoc::NormalClass.new 'Foo'
+ @mInc = RDoc::NormalModule.new 'Inc'
+ @cAmbiguous = RDoc::NormalClass.new 'Ambiguous'
- @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
- @mExt = @top_level.add_module RDoc::NormalModule, 'Ext'
- @mInc = @top_level.add_module RDoc::NormalModule, 'Inc'
- @cAmbiguous = @top_level.add_class RDoc::NormalClass, 'Ambiguous'
-
- doc = @RM::Document.new @RM::Paragraph.new('Extend thingy')
- @cFooExt = @cFoo.add_extend RDoc::Extend.new('Ext', doc)
- @cFooExt.record_location @top_level
doc = @RM::Document.new @RM::Paragraph.new('Include thingy')
- @cFooInc = @cFoo.add_include RDoc::Include.new('Inc', doc)
- @cFooInc.record_location @top_level
- @cFoo_Bar = @cFoo.add_class RDoc::NormalClass, 'Bar'
+ @cFooInc = RDoc::Include.new 'Inc', doc
+ @cFoo.add_include @cFooInc
+
+ @cFoo_Bar = RDoc::NormalClass.new 'Bar'
+ @cFoo_Bar.parent = @cFoo
- @blah = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'blah')
+ @blah = RDoc::AnyMethod.new nil, 'blah'
@blah.call_seq = "blah(5) => 5\nblah(6) => 6\n"
- @blah.record_location @top_level
- @bother = @cFoo_Bar.add_method RDoc::AnyMethod.new(nil, 'bother')
- @bother.block_params = "stuff"
+ @bother = RDoc::AnyMethod.new nil, 'bother'
@bother.params = "(things)"
- @bother.record_location @top_level
+ @bother.block_params = "stuff"
- @new = @cFoo_Bar.add_method RDoc::AnyMethod.new nil, 'new'
- @new.record_location @top_level
+ @new = RDoc::AnyMethod.new nil, 'new'
@new.singleton = true
- @attr = @cFoo_Bar.add_attribute RDoc::Attr.new nil, 'attr', 'RW', ''
- @attr.record_location @top_level
+ @cFoo_Bar.add_method @blah
+ @cFoo_Bar.add_method @bother
+ @cFoo_Bar.add_method @new
+
+ @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
+
+ @cFoo_Bar.add_attribute @attr
+
+ @cFoo_Baz = RDoc::NormalClass.new 'Baz'
+ @cFoo_Baz.parent = @cFoo
+
+ @inherit = RDoc::AnyMethod.new nil, 'inherit'
+ @cFoo.add_method @inherit
- @cFoo_Baz = @cFoo.add_class RDoc::NormalClass, 'Baz'
- @cFoo_Baz.record_location @top_level
+ @store.save_class @cFoo
+ @store.save_class @cFoo_Bar
+ @store.save_class @cFoo_Baz
+ @store.save_class @mInc
+ @store.save_class @cAmbiguous
- @inherit = @cFoo.add_method RDoc::AnyMethod.new(nil, 'inherit')
- @inherit.record_location @top_level
+ @store.save_method @cFoo_Bar, @blah
+ @store.save_method @cFoo_Bar, @bother
+ @store.save_method @cFoo_Bar, @new
+ @store.save_method @cFoo_Bar, @attr
- # overriden by Bar in multi_store
- @overriden = @cFoo.add_method RDoc::AnyMethod.new(nil, 'override')
- @overriden.comment = 'must not be displayed in Bar#override'
- @overriden.record_location @top_level
+ @store.save_method @cFoo, @inherit
- @store1.save
+ @store.save_cache
- @driver.stores = [@store1]
+ @driver.stores = [@store]
end
end
diff --git a/test/rdoc/test_rdoc_ri_paths.rb b/test/rdoc/test_rdoc_ri_paths.rb
index e377b0b1d0..e6f33d7d5e 100644
--- a/test/rdoc/test_rdoc_ri_paths.rb
+++ b/test/rdoc/test_rdoc_ri_paths.rb
@@ -1,154 +1,42 @@
-require 'rdoc/test_case'
+require 'rubygems'
+require 'minitest/autorun'
+require 'tmpdir'
+require 'fileutils'
+require 'rdoc/ri/paths'
-class TestRDocRIPaths < RDoc::TestCase
+class TestRDocRIPaths < MiniTest::Unit::TestCase
def setup
- super
-
- @orig_gem_path = Gem.path
-
- @tempdir = File.join Dir.tmpdir, "test_rdoc_ri_paths_#{$$}"
- Gem.use_paths @tempdir
- Gem.ensure_gem_subdirectories @tempdir
-
- specs = [
- @rake_10 = Gem::Specification.new('rake', '10.0.1'),
- @rdoc_4_0 = Gem::Specification.new('rdoc', '4.0'),
- @rdoc_3_12 = Gem::Specification.new('rdoc', '3.12'),
- @nodoc = Gem::Specification.new('nodoc', '1.0'),
- ]
-
- specs.each do |spec|
- spec.loaded_from = spec.spec_file
-
- open spec.spec_file, 'w' do |file|
- file.write spec.to_ruby_for_cache
- end
-
- FileUtils.mkdir_p File.join(spec.doc_dir, 'ri') unless
- spec.name == 'nodoc'
- end
-
- Gem::Specification.reset
- Gem::Specification.all = specs
+ RDoc::RI::Paths.instance_variable_set :@gemdirs, %w[/nonexistent/gemdir]
end
def teardown
- super
-
- Gem.use_paths(*@orig_gem_path)
- Gem::Specification.reset
- FileUtils.rm_rf @tempdir
- end
-
- def test_class_each
- enum = RDoc::RI::Paths.each true, true, true, :all
-
- path = enum.map { |dir,| dir }
-
- assert_equal RDoc::RI::Paths.system_dir, path.shift
- assert_equal RDoc::RI::Paths.site_dir, path.shift
- assert_equal RDoc::RI::Paths.home_dir, path.shift
- assert_equal File.join(@nodoc.doc_dir, 'ri'), path.shift
- assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
- assert_equal File.join(@rdoc_4_0.doc_dir, 'ri'), path.shift
- assert_equal File.join(@rdoc_3_12.doc_dir, 'ri'), path.shift
- assert_empty path
- end
-
- def test_class_gemdirs_latest
- Dir.chdir @tempdir do
- gemdirs = RDoc::RI::Paths.gemdirs :latest
-
- expected = [
- File.join(@rake_10.doc_dir, 'ri'),
- File.join(@rdoc_4_0.doc_dir, 'ri'),
- ]
-
- assert_equal expected, gemdirs
- end
- end
-
- def test_class_gemdirs_legacy
- Dir.chdir @tempdir do
- gemdirs = RDoc::RI::Paths.gemdirs true
-
- expected = [
- File.join(@rake_10.doc_dir, 'ri'),
- File.join(@rdoc_4_0.doc_dir, 'ri'),
- ]
-
- assert_equal expected, gemdirs
- end
- end
-
- def test_class_gemdirs_all
- Dir.chdir @tempdir do
- gemdirs = RDoc::RI::Paths.gemdirs :all
-
- expected = [
- File.join(@nodoc.doc_dir, 'ri'),
- File.join(@rake_10.doc_dir, 'ri'),
- File.join(@rdoc_4_0.doc_dir, 'ri'),
- File.join(@rdoc_3_12.doc_dir, 'ri'),
- ]
-
- assert_equal expected, gemdirs
- end
- end
-
- def test_class_gem_dir
- dir = RDoc::RI::Paths.gem_dir 'rake', '10.0.1'
-
- expected = File.join @rake_10.doc_dir, 'ri'
-
- assert_equal expected, dir
- end
-
- def test_class_home_dir
- dir = RDoc::RI::Paths.home_dir
-
- assert_equal RDoc::RI::Paths::HOMEDIR, dir
+ RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
end
def test_class_path_nonexistent
- temp_dir do |dir|
- nonexistent = File.join dir, 'nonexistent'
- dir = RDoc::RI::Paths.path true, true, true, true, nonexistent
+ path = RDoc::RI::Paths.path true, true, true, true, '/nonexistent'
- refute_includes dir, nonexistent
- end
+ refute_includes path, '/nonexistent'
end
def test_class_raw_path
path = RDoc::RI::Paths.raw_path true, true, true, true
- assert_equal RDoc::RI::Paths.system_dir, path.shift
- assert_equal RDoc::RI::Paths.site_dir, path.shift
- assert_equal RDoc::RI::Paths.home_dir, path.shift
- assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
+ assert_equal RDoc::RI::Paths::SYSDIR, path.shift
+ assert_equal RDoc::RI::Paths::SITEDIR, path.shift
+ assert_equal RDoc::RI::Paths::HOMEDIR, path.shift
+ assert_equal '/nonexistent/gemdir', path.shift
end
def test_class_raw_path_extra_dirs
path = RDoc::RI::Paths.raw_path true, true, true, true, '/nonexistent'
- assert_equal '/nonexistent', path.shift
- assert_equal RDoc::RI::Paths.system_dir, path.shift
- assert_equal RDoc::RI::Paths.site_dir, path.shift
- assert_equal RDoc::RI::Paths.home_dir, path.shift
- assert_equal File.join(@rake_10.doc_dir, 'ri'), path.shift
- end
-
- def test_class_site_dir
- dir = RDoc::RI::Paths.site_dir
-
- assert_equal File.join(RDoc::RI::Paths::BASE, 'site'), dir
- end
-
- def test_class_system_dir
- dir = RDoc::RI::Paths.system_dir
-
- assert_equal File.join(RDoc::RI::Paths::BASE, 'system'), dir
+ assert_equal '/nonexistent', path.shift
+ assert_equal RDoc::RI::Paths::SYSDIR, path.shift
+ assert_equal RDoc::RI::Paths::SITEDIR, path.shift
+ assert_equal RDoc::RI::Paths::HOMEDIR, path.shift
+ assert_equal '/nonexistent/gemdir', path.shift
end
end
diff --git a/test/rdoc/test_rdoc_ri_store.rb b/test/rdoc/test_rdoc_ri_store.rb
new file mode 100644
index 0000000000..4a52ded989
--- /dev/null
+++ b/test/rdoc/test_rdoc_ri_store.rb
@@ -0,0 +1,309 @@
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/ri'
+require 'rdoc/markup'
+require 'tmpdir'
+require 'fileutils'
+
+class TestRDocRIStore < MiniTest::Unit::TestCase
+
+ def setup
+ RDoc::TopLevel.reset
+
+ @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
+ @s = RDoc::RI::Store.new @tmpdir
+
+ @top_level = RDoc::TopLevel.new 'file.rb'
+
+ @klass = @top_level.add_class RDoc::NormalClass, 'Object'
+ @klass.comment = 'original'
+
+ @cmeth = RDoc::AnyMethod.new nil, 'cmethod'
+ @cmeth.singleton = true
+
+ @meth = RDoc::AnyMethod.new nil, 'method'
+ @meth_bang = RDoc::AnyMethod.new nil, 'method!'
+
+ @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
+
+ @klass.add_method @cmeth
+ @klass.add_method @meth
+ @klass.add_method @meth_bang
+ @klass.add_attribute @attr
+
+ @nest_klass = @klass.add_class RDoc::NormalClass, 'SubClass'
+ @nest_meth = RDoc::AnyMethod.new nil, 'method'
+ @nest_incl = RDoc::Include.new 'Incl', ''
+
+ @nest_klass.add_method @nest_meth
+ @nest_klass.add_include @nest_incl
+
+ @RM = RDoc::Markup
+ end
+
+ def teardown
+ FileUtils.rm_rf @tmpdir
+ end
+
+ def assert_cache imethods, cmethods, attrs, modules, ancestors = {}
+ expected = {
+ :class_methods => cmethods,
+ :instance_methods => imethods,
+ :attributes => attrs,
+ :modules => modules,
+ :ancestors => ancestors
+ }
+
+ assert_equal expected, @s.cache
+ end
+
+ def assert_directory path
+ assert File.directory?(path), "#{path} is not a directory"
+ end
+
+ def assert_file path
+ assert File.file?(path), "#{path} is not a file"
+ end
+
+ def test_attributes
+ @s.cache[:attributes]['Object'] = %w[attr]
+
+ expected = { 'Object' => %w[attr] }
+
+ assert_equal expected, @s.attributes
+ end
+
+ def test_class_file
+ assert_equal File.join(@tmpdir, 'Object', 'cdesc-Object.ri'),
+ @s.class_file('Object')
+ assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri'),
+ @s.class_file('Object::SubClass')
+ end
+
+ def test_class_methods
+ @s.cache[:class_methods]['Object'] = %w[method]
+
+ expected = { 'Object' => %w[method] }
+
+ assert_equal expected, @s.class_methods
+ end
+
+ def test_class_path
+ assert_equal File.join(@tmpdir, 'Object'), @s.class_path('Object')
+ assert_equal File.join(@tmpdir, 'Object', 'SubClass'),
+ @s.class_path('Object::SubClass')
+ end
+
+ def test_friendly_path
+ @s.path = @tmpdir
+ @s.type = nil
+ assert_equal @s.path, @s.friendly_path
+
+ @s.type = :extra
+ assert_equal @s.path, @s.friendly_path
+
+ @s.type = :system
+ assert_equal "ruby core", @s.friendly_path
+
+ @s.type = :site
+ assert_equal "ruby site", @s.friendly_path
+
+ @s.type = :home
+ assert_equal "~/.ri", @s.friendly_path
+
+ @s.type = :gem
+ @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
+ assert_equal "gem gem_name-1.0", @s.friendly_path
+ end
+
+ def test_instance_methods
+ @s.cache[:instance_methods]['Object'] = %w[method]
+
+ expected = { 'Object' => %w[method] }
+
+ assert_equal expected, @s.instance_methods
+ end
+
+ def test_load_cache
+ cache = {
+ :methods => %w[Object#method],
+ :modules => %w[Object],
+ }
+
+ Dir.mkdir @tmpdir
+
+ open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
+ Marshal.dump cache, io
+ end
+
+ @s.load_cache
+
+ assert_equal cache, @s.cache
+ end
+
+ def test_load_cache_no_cache
+ cache = {
+ :ancestors => {},
+ :attributes => {},
+ :class_methods => {},
+ :instance_methods => {},
+ :modules => [],
+ }
+
+ @s.load_cache
+
+ assert_equal cache, @s.cache
+ end
+
+ def test_load_class
+ @s.save_class @klass
+
+ assert_equal @klass, @s.load_class('Object')
+ end
+
+ def test_load_method_bang
+ @s.save_method @klass, @meth_bang
+
+ meth = @s.load_method('Object', '#method!')
+ assert_equal @meth_bang, meth
+ end
+
+ def test_method_file
+ assert_equal File.join(@tmpdir, 'Object', 'method-i.ri'),
+ @s.method_file('Object', 'Object#method')
+
+ assert_equal File.join(@tmpdir, 'Object', 'method%21-i.ri'),
+ @s.method_file('Object', 'Object#method!')
+
+ assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'method%21-i.ri'),
+ @s.method_file('Object::SubClass', 'Object::SubClass#method!')
+
+ assert_equal File.join(@tmpdir, 'Object', 'method-c.ri'),
+ @s.method_file('Object', 'Object::method')
+ end
+
+ def test_save_cache
+ @s.save_class @klass
+ @s.save_method @klass, @meth
+ @s.save_method @klass, @cmeth
+ @s.save_class @nest_klass
+
+ @s.save_cache
+
+ assert_file File.join(@tmpdir, 'cache.ri')
+
+ expected = {
+ :attributes => { 'Object' => ['attr_accessor attr'] },
+ :class_methods => { 'Object' => %w[cmethod] },
+ :instance_methods => { 'Object' => %w[method] },
+ :modules => %w[Object Object::SubClass],
+ :ancestors => {
+ 'Object' => %w[Object],
+ 'Object::SubClass' => %w[Incl Object],
+ },
+ }
+
+ open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
+ cache = Marshal.load io.read
+
+ assert_equal expected, cache
+ end
+ end
+
+ def test_save_cache_duplicate_methods
+ @s.save_method @klass, @meth
+ @s.save_method @klass, @meth
+
+ @s.save_cache
+
+ assert_cache({ 'Object' => %w[method] }, {}, {}, [])
+ end
+
+ def test_save_class
+ @s.save_class @klass
+
+ assert_directory File.join(@tmpdir, 'Object')
+ assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
+
+ assert_cache({}, {}, { 'Object' => ['attr_accessor attr'] }, %w[Object],
+ 'Object' => %w[Object])
+
+ assert_equal @klass, @s.load_class('Object')
+ end
+
+ def test_save_class_basic_object
+ @klass.instance_variable_set :@superclass, nil
+
+ @s.save_class @klass
+
+ assert_directory File.join(@tmpdir, 'Object')
+ assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
+
+ assert_cache({}, {}, { 'Object' => ['attr_accessor attr'] }, %w[Object],
+ 'Object' => %w[])
+
+ assert_equal @klass, @s.load_class('Object')
+ end
+
+ def test_save_class_merge
+ @s.save_class @klass
+
+ klass = RDoc::NormalClass.new 'Object'
+ klass.comment = 'new class'
+
+ s = RDoc::RI::Store.new @tmpdir
+ s.save_class klass
+
+ s = RDoc::RI::Store.new @tmpdir
+
+ document = @RM::Document.new(
+ @RM::Paragraph.new('original'),
+ @RM::Paragraph.new('new class'))
+
+ assert_equal document, s.load_class('Object').comment
+ end
+
+ def test_save_class_methods
+ @s.save_class @klass
+
+ assert_directory File.join(@tmpdir, 'Object')
+ assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
+
+ assert_cache({}, {}, { 'Object' => ['attr_accessor attr'] }, %w[Object],
+ 'Object' => %w[Object])
+
+ assert_equal @klass, @s.load_class('Object')
+ end
+
+ def test_save_class_nested
+ @s.save_class @nest_klass
+
+ assert_directory File.join(@tmpdir, 'Object', 'SubClass')
+ assert_file File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri')
+
+ assert_cache({}, {}, {}, %w[Object::SubClass],
+ 'Object::SubClass' => %w[Incl Object])
+ end
+
+ def test_save_method
+ @s.save_method @klass, @meth
+
+ assert_directory File.join(@tmpdir, 'Object')
+ assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
+
+ assert_cache({ 'Object' => %w[method] }, {}, {}, [])
+
+ assert_equal @meth, @s.load_method('Object', '#method')
+ end
+
+ def test_save_method_nested
+ @s.save_method @nest_klass, @nest_meth
+
+ assert_directory File.join(@tmpdir, 'Object', 'SubClass')
+ assert_file File.join(@tmpdir, 'Object', 'SubClass', 'method-i.ri')
+
+ assert_cache({ 'Object::SubClass' => %w[method] }, {}, {}, [])
+ end
+
+end
+
diff --git a/test/rdoc/test_rdoc_ruby_lex.rb b/test/rdoc/test_rdoc_ruby_lex.rb
deleted file mode 100644
index 0dcb42565d..0000000000
--- a/test/rdoc/test_rdoc_ruby_lex.rb
+++ /dev/null
@@ -1,291 +0,0 @@
-# coding: UTF-8
-
-require 'rdoc/test_case'
-
-class TestRDocRubyLex < RDoc::TestCase
-
- def setup
- @TK = RDoc::RubyToken
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding(Encoding.default_external) if defined? Encoding
- s.chomp
- end
-
- def test_class_tokenize
- tokens = RDoc::RubyLex.tokenize "def x() end", nil
-
- expected = [
- @TK::TkDEF .new( 0, 1, 0, "def"),
- @TK::TkSPACE .new( 3, 1, 3, " "),
- @TK::TkIDENTIFIER.new( 4, 1, 4, "x"),
- @TK::TkLPAREN .new( 5, 1, 5, "("),
- @TK::TkRPAREN .new( 6, 1, 6, ")"),
- @TK::TkSPACE .new( 7, 1, 7, " "),
- @TK::TkEND .new( 8, 1, 8, "end"),
- @TK::TkNL .new(11, 1, 11, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize___END__
- tokens = RDoc::RubyLex.tokenize '__END__', nil
-
- expected = [
- @TK::TkEND_OF_SCRIPT.new(0, 1, 0, '__END__'),
- @TK::TkNL .new(7, 1, 7, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_character_literal
- tokens = RDoc::RubyLex.tokenize "?\\", nil
-
- expected = [
- @TK::TkSTRING.new( 0, 1, 0, "\\"),
- @TK::TkNL .new( 2, 1, 2, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_def_heredoc
- tokens = RDoc::RubyLex.tokenize <<-'RUBY', nil
-def x
- <<E
-Line 1
-Line 2
-E
-end
- RUBY
-
- expected = [
- @TK::TkDEF .new( 0, 1, 0, 'def'),
- @TK::TkSPACE .new( 3, 1, 3, ' '),
- @TK::TkIDENTIFIER.new( 4, 1, 4, 'x'),
- @TK::TkNL .new( 5, 1, 5, "\n"),
- @TK::TkSPACE .new( 6, 2, 0, ' '),
- @TK::TkHEREDOC .new( 8, 2, 2,
- %Q{<<E\nLine 1\nLine 2\nE}),
- @TK::TkNL .new(27, 5, 28, "\n"),
- @TK::TkEND .new(28, 6, 0, 'end'),
- @TK::TkNL .new(31, 6, 28, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_hash_symbol
- tokens = RDoc::RubyLex.tokenize '{ class:"foo" }', nil
-
- expected = [
- @TK::TkLBRACE .new( 0, 1, 0, '{'),
- @TK::TkSPACE .new( 1, 1, 1, ' '),
- @TK::TkIDENTIFIER.new( 2, 1, 2, 'class'),
- @TK::TkSYMBEG .new( 7, 1, 7, ':'),
- @TK::TkSTRING .new( 8, 1, 8, '"foo"'),
- @TK::TkSPACE .new(13, 1, 13, ' '),
- @TK::TkRBRACE .new(14, 1, 14, '}'),
- @TK::TkNL .new(15, 1, 15, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_heredoc_CR_NL
- tokens = RDoc::RubyLex.tokenize <<-RUBY, nil
-string = <<-STRING\r
-Line 1\r
-Line 2\r
- STRING\r
- RUBY
-
- expected = [
- @TK::TkIDENTIFIER.new( 0, 1, 0, 'string'),
- @TK::TkSPACE .new( 6, 1, 6, ' '),
- @TK::TkASSIGN .new( 7, 1, 7, '='),
- @TK::TkSPACE .new( 8, 1, 8, ' '),
- @TK::TkHEREDOC .new( 9, 1, 9,
- %Q{<<-STRING\nLine 1\nLine 2\n STRING}),
- @TK::TkSPACE .new(44, 4, 45, "\r"),
- @TK::TkNL .new(45, 4, 46, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_heredoc_call
- tokens = RDoc::RubyLex.tokenize <<-'RUBY', nil
-string = <<-STRING.chomp
-Line 1
-Line 2
- STRING
- RUBY
-
- expected = [
- @TK::TkIDENTIFIER.new( 0, 1, 0, 'string'),
- @TK::TkSPACE .new( 6, 1, 6, ' '),
- @TK::TkASSIGN .new( 7, 1, 7, '='),
- @TK::TkSPACE .new( 8, 1, 8, ' '),
- @TK::TkSTRING .new( 9, 1, 9, %Q{"Line 1\nLine 2\n"}),
- @TK::TkDOT .new(41, 4, 42, '.'),
- @TK::TkIDENTIFIER.new(42, 4, 43, 'chomp'),
- @TK::TkNL .new(47, 4, 48, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_heredoc_indent
- tokens = RDoc::RubyLex.tokenize <<-'RUBY', nil
-string = <<-STRING
-Line 1
-Line 2
- STRING
- RUBY
-
- expected = [
- @TK::TkIDENTIFIER.new( 0, 1, 0, 'string'),
- @TK::TkSPACE .new( 6, 1, 6, ' '),
- @TK::TkASSIGN .new( 7, 1, 7, '='),
- @TK::TkSPACE .new( 8, 1, 8, ' '),
- @TK::TkHEREDOC .new( 9, 1, 9,
- %Q{<<-STRING\nLine 1\nLine 2\n STRING}),
- @TK::TkNL .new(41, 4, 42, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_heredoc_percent_N
- tokens = RDoc::RubyLex.tokenize <<-'RUBY', nil
-a b <<-U
-%N
-U
- RUBY
-
- expected = [
- @TK::TkIDENTIFIER.new( 0, 1, 0, 'a'),
- @TK::TkSPACE .new( 1, 1, 1, ' '),
- @TK::TkIDENTIFIER.new( 2, 1, 2, 'b'),
- @TK::TkSPACE .new( 3, 1, 3, ' '),
- @TK::TkHEREDOC .new( 4, 1, 4, %Q{<<-U\n%N\nU}),
- @TK::TkNL .new(13, 3, 14, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_identifier_high_unicode
- tokens = RDoc::RubyLex.tokenize 'ð–’', nil
-
- expected = @TK::TkIDENTIFIER.new(0, 1, 0, 'ð–’')
-
- assert_equal expected, tokens.first
- end
-
- def test_class_tokenize_percent_1
- tokens = RDoc::RubyLex.tokenize 'v%10==10', nil
-
- expected = [
- @TK::TkIDENTIFIER.new(0, 1, 0, 'v'),
- @TK::TkMOD.new( 1, 1, 1, '%'),
- @TK::TkINTEGER.new( 2, 1, 2, '10'),
- @TK::TkEQ.new( 4, 1, 4, '=='),
- @TK::TkINTEGER.new( 6, 1, 6, '10'),
- @TK::TkNL.new( 8, 1, 8, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_percent_r
- tokens = RDoc::RubyLex.tokenize '%r[hi]', nil
-
- expected = [
- @TK::TkREGEXP.new( 0, 1, 0, '%r[hi]'),
- @TK::TkNL .new( 6, 1, 6, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_percent_w
- tokens = RDoc::RubyLex.tokenize '%w[hi]', nil
-
- expected = [
- @TK::TkDSTRING.new( 0, 1, 0, '%w[hi]'),
- @TK::TkNL .new( 6, 1, 6, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_regexp
- tokens = RDoc::RubyLex.tokenize "/hay/", nil
-
- expected = [
- @TK::TkREGEXP.new( 0, 1, 0, "/hay/"),
- @TK::TkNL .new( 5, 1, 5, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_regexp_backref
- tokens = RDoc::RubyLex.tokenize "/[csh](..) [csh]\\1 in/", nil
-
- expected = [
- @TK::TkREGEXP.new( 0, 1, 0, "/[csh](..) [csh]\\1 in/"),
- @TK::TkNL .new(22, 1, 22, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_regexp_escape
- tokens = RDoc::RubyLex.tokenize "/\\//", nil
-
- expected = [
- @TK::TkREGEXP.new( 0, 1, 0, "/\\//"),
- @TK::TkNL .new( 4, 1, 4, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_class_tokenize_string
- tokens = RDoc::RubyLex.tokenize "'hi'", nil
-
- expected = [
- @TK::TkSTRING.new( 0, 1, 0, "'hi'"),
- @TK::TkNL .new( 4, 1, 4, "\n"),
- ]
-
- assert_equal expected, tokens
- end
-
- def test_unary_minus
- ruby_lex = RDoc::RubyLex.new("-1", nil)
- assert_equal("-1", ruby_lex.token.value)
-
- ruby_lex = RDoc::RubyLex.new("a[-2]", nil)
- 2.times { ruby_lex.token } # skip "a" and "["
- assert_equal("-2", ruby_lex.token.value)
-
- ruby_lex = RDoc::RubyLex.new("a[0..-12]", nil)
- 4.times { ruby_lex.token } # skip "a", "[", "0", and ".."
- assert_equal("-12", ruby_lex.token.value)
-
- ruby_lex = RDoc::RubyLex.new("0+-0.1", nil)
- 2.times { ruby_lex.token } # skip "0" and "+"
- assert_equal("-0.1", ruby_lex.token.value)
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_ruby_token.rb b/test/rdoc/test_rdoc_ruby_token.rb
deleted file mode 100644
index ed8c8275ba..0000000000
--- a/test/rdoc/test_rdoc_ruby_token.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocRubyToken < RDoc::TestCase
-
- def test_Token_text
- token = RDoc::RubyToken::Token.new 0, 0, 0, 'text'
-
- assert_equal 'text', token.text
- end
-
- def test_TkOp_name
- token = RDoc::RubyToken::TkOp.new 0, 0, 0, '&'
-
- assert_equal '&', token.text
- assert_equal '&', token.name
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb
deleted file mode 100644
index da9c3edd9f..0000000000
--- a/test/rdoc/test_rdoc_rubygems_hook.rb
+++ /dev/null
@@ -1,254 +0,0 @@
-require 'rubygems'
-require 'rubygems/test_case'
-require 'rdoc/rubygems_hook'
-
-class TestRDocRubygemsHook < Gem::TestCase
-
- def setup
- super
-
- skip 'requires RubyGems 1.9+' unless
- Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.9')
-
- @a = quick_spec 'a' do |s|
- s.rdoc_options = %w[--main MyTitle]
- s.extra_rdoc_files = %w[README]
- end
-
- write_file File.join(@tempdir, 'lib', 'a.rb')
- write_file File.join(@tempdir, 'README')
-
- install_gem @a
-
- @hook = RDoc::RubygemsHook.new @a
-
- begin
- RDoc::RubygemsHook.load_rdoc
- rescue Gem::DocumentError => e
- skip e.message
- end
-
- Gem.configuration[:rdoc] = nil
- end
-
- def test_initialize
- refute @hook.generate_rdoc
- assert @hook.generate_ri
-
- rdoc = RDoc::RubygemsHook.new @a, false, false
-
- refute rdoc.generate_rdoc
- refute rdoc.generate_ri
- end
-
- def test_delete_legacy_args
- args = %w[
- --inline-source
- --one-file
- --promiscuous
- -p
- ]
-
- @hook.delete_legacy_args args
-
- assert_empty args
- end
-
- def test_document
- options = RDoc::Options.new
- options.files = []
-
- rdoc = @hook.new_rdoc
- rdoc.store = RDoc::Store.new
- @hook.instance_variable_set :@rdoc, rdoc
- @hook.instance_variable_set :@file_info, []
-
- @hook.document 'darkfish', options, @a.doc_dir('rdoc')
-
- assert @hook.rdoc_installed?
- end
-
- def test_generate
- FileUtils.mkdir_p @a.doc_dir
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.generate
-
- refute @hook.rdoc_installed?
- assert @hook.ri_installed?
-
- rdoc = @hook.instance_variable_get :@rdoc
-
- refute rdoc.options.hyperlink_all
- assert_equal Pathname(@a.full_gem_path), rdoc.options.root
- assert_equal %w[README lib], rdoc.options.files.sort
-
- assert_equal 'MyTitle', rdoc.store.main
- end
-
- def test_generate_all
- @hook.generate_rdoc = true
- @hook.generate_ri = true
-
- FileUtils.mkdir_p @a.doc_dir
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.generate
-
- assert @hook.rdoc_installed?
- assert @hook.ri_installed?
-
- rdoc = @hook.instance_variable_get :@rdoc
-
- refute rdoc.options.hyperlink_all
- assert_equal Pathname(@a.full_gem_path), rdoc.options.root
- assert_equal %w[README lib], rdoc.options.files.sort
-
- assert_equal 'MyTitle', rdoc.store.main
- end
-
- def test_generate_configuration_rdoc_array
- Gem.configuration[:rdoc] = %w[-A]
-
- FileUtils.mkdir_p @a.doc_dir
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.generate
-
- rdoc = @hook.instance_variable_get :@rdoc
-
- assert rdoc.options.hyperlink_all
- end
-
- def test_generate_configuration_rdoc_string
- Gem.configuration[:rdoc] = '-A'
-
- FileUtils.mkdir_p @a.doc_dir
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.generate
-
- rdoc = @hook.instance_variable_get :@rdoc
-
- assert rdoc.options.hyperlink_all
- end
-
- def test_generate_default_gem
- skip 'RubyGems 2 required' unless @a.respond_to? :default_gem?
- @a.loaded_from =
- File.join Gem::Specification.default_specifications_dir, 'a.gemspec'
-
- FileUtils.mkdir_p @a.doc_dir
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.generate
-
- refute @hook.rdoc_installed?
- refute @hook.ri_installed?
- end
-
- def test_generate_disabled
- @hook.generate_rdoc = false
- @hook.generate_ri = false
-
- @hook.generate
-
- refute @hook.rdoc_installed?
- refute @hook.ri_installed?
- end
-
- def test_generate_force
- FileUtils.mkdir_p @a.doc_dir 'ri'
- FileUtils.mkdir_p @a.doc_dir 'rdoc'
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.force = true
-
- @hook.generate
-
- refute_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
- assert_path_exists File.join(@a.doc_dir('ri'), 'cache.ri')
- end
-
- def test_generate_no_overwrite
- FileUtils.mkdir_p @a.doc_dir 'ri'
- FileUtils.mkdir_p @a.doc_dir 'rdoc'
- FileUtils.mkdir_p File.join(@a.gem_dir, 'lib')
-
- @hook.generate
-
- refute_path_exists File.join(@a.doc_dir('rdoc'), 'index.html')
- refute_path_exists File.join(@a.doc_dir('ri'), 'cache.ri')
- end
-
- def test_new_rdoc
- assert_kind_of RDoc::RDoc, @hook.new_rdoc
- end
-
- def test_rdoc_installed?
- refute @hook.rdoc_installed?
-
- FileUtils.mkdir_p @a.doc_dir 'rdoc'
-
- assert @hook.rdoc_installed?
- end
-
- def test_remove
- FileUtils.mkdir_p @a.doc_dir 'rdoc'
- FileUtils.mkdir_p @a.doc_dir 'ri'
-
- @hook.remove
-
- refute @hook.rdoc_installed?
- refute @hook.ri_installed?
-
- assert_path_exists @a.doc_dir
- end
-
- def test_remove_unwritable
- skip 'chmod not supported' if Gem.win_platform?
- FileUtils.mkdir_p @a.base_dir
- FileUtils.chmod 0, @a.base_dir
-
- e = assert_raises Gem::FilePermissionError do
- @hook.remove
- end
-
- assert_equal @a.base_dir, e.directory
- ensure
- FileUtils.chmod(0755, @a.base_dir) if File.directory?(@a.base_dir)
- end
-
- def test_ri_installed?
- refute @hook.ri_installed?
-
- FileUtils.mkdir_p @a.doc_dir 'ri'
-
- assert @hook.ri_installed?
- end
-
- def test_setup
- @hook.setup
-
- assert_path_exists @a.doc_dir
- end
-
- def test_setup_unwritable
- skip 'chmod not supported' if Gem.win_platform?
- FileUtils.mkdir_p @a.doc_dir
- FileUtils.chmod 0, @a.doc_dir
-
- e = assert_raises Gem::FilePermissionError do
- @hook.setup
- end
-
- assert_equal @a.doc_dir, e.directory
- ensure
- if File.exist? @a.doc_dir
- FileUtils.chmod 0755, @a.doc_dir
- FileUtils.rm_r @a.doc_dir
- end
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb
deleted file mode 100644
index 40de171b6b..0000000000
--- a/test/rdoc/test_rdoc_servlet.rb
+++ /dev/null
@@ -1,467 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocServlet < RDoc::TestCase
-
- def setup
- super
-
- @orig_gem_path = Gem.path
-
- @tempdir = File.join Dir.tmpdir, "test_rdoc_servlet_#{$$}"
- Gem.use_paths @tempdir
- Gem.ensure_gem_subdirectories @tempdir
-
- @spec = Gem::Specification.new 'spec', '1.0'
- @spec.loaded_from = @spec.spec_file
-
- Gem::Specification.reset
- Gem::Specification.all = [@spec]
-
- @server = {}
- def @server.mount(*) end
-
- @stores = {}
- @cache = Hash.new { |hash, store| hash[store] = {} }
-
- @s = RDoc::Servlet.new @server, @stores, @cache
-
- @req = WEBrick::HTTPRequest.new :Logger => nil
- @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
-
- def @req.path= path
- instance_variable_set :@path, path
- end
-
- @req.instance_variable_set :@header, Hash.new { |h, k| h[k] = [] }
-
- @base = File.join @tempdir, 'base'
- @system_dir = File.join @tempdir, 'base', 'system'
- @home_dir = File.join @tempdir, 'home'
- @gem_doc_dir = File.join @tempdir, 'doc'
-
- @orig_base = RDoc::RI::Paths::BASE
- RDoc::RI::Paths::BASE.replace @base
- @orig_ri_path_homedir = RDoc::RI::Paths::HOMEDIR
- RDoc::RI::Paths::HOMEDIR.replace @home_dir
-
- RDoc::RI::Paths.instance_variable_set \
- :@gemdirs, %w[/nonexistent/gems/example-1.0/ri]
- end
-
- def teardown
- super
-
- Gem.use_paths(*@orig_gem_path)
- Gem::Specification.reset
-
- FileUtils.rm_rf @tempdir
-
- RDoc::RI::Paths::BASE.replace @orig_base
- RDoc::RI::Paths::HOMEDIR.replace @orig_ri_path_homedir
- RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
- end
-
- def test_asset
- temp_dir do
- now = Time.now
-
- open 'rdoc.css', 'w' do |io| io.write 'h1 { color: red }' end
- File.utime now, now, 'rdoc.css'
-
- @s.asset_dirs[:darkfish] = '.'
-
- @req.path = 'rdoc.css'
-
- @s.asset :darkfish, @req, @res
-
- assert_equal 'h1 { color: red }', @res.body
- assert_equal 'text/css', @res.content_type
- assert_equal now.httpdate, @res['last-modified']
- end
- end
-
- def test_do_GET
- touch_system_cache_path
-
- @req.path = '/ruby/Missing.html'
-
- @s.do_GET @req, @res
-
- assert_equal 404, @res.status
- end
-
- def test_do_GET_asset_darkfish
- temp_dir do
- FileUtils.touch 'rdoc.css'
-
- @s.asset_dirs[:darkfish] = '.'
-
- @req.path = '/rdoc.css'
-
- @s.do_GET @req, @res
-
- assert_equal 'text/css', @res.content_type
- end
- end
-
- def test_do_GET_asset_json_index
- temp_dir do
- FileUtils.mkdir 'js'
- FileUtils.touch 'js/navigation.js'
-
- @s.asset_dirs[:json_index] = '.'
-
- @req.path = '/js/navigation.js'
-
- @s.do_GET @req, @res
-
- assert_equal 'application/javascript', @res.content_type
- end
- end
-
- def test_do_GET_error
- touch_system_cache_path
-
- def @req.path() raise 'no' end
-
- @s.do_GET @req, @res
-
- assert_equal 500, @res.status
- end
-
- def test_do_GET_mount_path
- @s = RDoc::Servlet.new @server, @stores, @cache, '/mount/path'
-
- temp_dir do
- FileUtils.touch 'rdoc.css'
-
- @s.asset_dirs[:darkfish] = '.'
-
- @req.path = '/mount/path/rdoc.css'
-
- @s.do_GET @req, @res
-
- assert_equal 'text/css', @res.content_type
- end
- end
-
- def test_do_GET_not_modified
- touch_system_cache_path
- @req.header['if-modified-since'] = [(Time.now + 10).httpdate]
- @req.path = '/ruby/Missing.html'
-
- assert_raises WEBrick::HTTPStatus::NotModified do
- @s.do_GET @req, @res
- end
- end
-
- def test_do_GET_root
- touch_system_cache_path
-
- @req.path = '/'
-
- @s.do_GET @req, @res
-
- assert_equal 'text/html', @res.content_type
- assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
- end
-
- def test_do_GET_root_search
- touch_system_cache_path
-
- @req.path = '/js/search_index.js'
-
- @s.do_GET @req, @res
-
- assert_equal 'application/javascript', @res.content_type
- end
-
- def test_documentation_page_class
- store = RDoc::Store.new
-
- generator = @s.generator_for store
-
- file = store.add_file 'file.rb'
- klass = file.add_class RDoc::NormalClass, 'Klass'
- klass.add_class RDoc::NormalClass, 'Sub'
-
- @s.documentation_page store, generator, 'Klass::Sub.html', @req, @res
-
- assert_match %r%<title>class Klass::Sub - </title>%, @res.body
- assert_match %r%<body id="top" class="class">%, @res.body
- end
-
- def test_documentation_page_not_found
- store = RDoc::Store.new
-
- generator = @s.generator_for store
-
- @req.path = '/ruby/Missing.html'
-
- @s.documentation_page store, generator, 'Missing.html', @req, @res
-
- assert_equal 404, @res.status
- end
-
- def test_documentation_page_page
- store = RDoc::Store.new
-
- generator = @s.generator_for store
-
- readme = store.add_file 'README.rdoc'
- readme.parser = RDoc::Parser::Simple
-
- @s.documentation_page store, generator, 'README_rdoc.html', @req, @res
-
- assert_match %r%<title>README - </title>%, @res.body
- assert_match %r%<body class="file">%, @res.body
- end
-
- def test_documentation_source
- store, path = @s.documentation_source '/ruby/Object.html'
-
- assert_equal @system_dir, store.path
-
- assert_equal 'Object.html', path
- end
-
- def test_documentation_source_cached
- cached_store = RDoc::Store.new
-
- @stores['ruby'] = cached_store
-
- store, path = @s.documentation_source '/ruby/Object.html'
-
- assert_same cached_store, store
-
- assert_equal 'Object.html', path
- end
-
- def test_error
- e = RuntimeError.new 'foo'
- e.set_backtrace caller
-
- @s.error e, @req, @res
-
- assert_equal 'text/html', @res.content_type
- assert_equal 500, @res.status
- assert_match %r%<title>Error%, @res.body
- end
-
- def test_generator_for
- store = RDoc::Store.new
- store.main = 'MAIN_PAGE.rdoc'
- store.title = 'Title'
-
- generator = @s.generator_for store
-
- refute generator.file_output
-
- assert_equal '..', generator.asset_rel_path
-
- assert_equal 'MAIN_PAGE.rdoc', @s.options.main_page
- assert_equal 'Title', @s.options.title
-
- assert_kind_of RDoc::RDoc, store.rdoc
- assert_same generator, store.rdoc.generator
- end
-
- def test_if_modified_since
- skip 'File.utime on directory not supported' if Gem.win_platform?
-
- temp_dir do
- now = Time.now
- File.utime now, now, '.'
-
- @s.if_modified_since @req, @res, '.'
-
- assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
- end
- end
-
- def test_if_modified_since_not_modified
- skip 'File.utime on directory not supported' if Gem.win_platform?
-
- temp_dir do
- now = Time.now
- File.utime now, now, '.'
-
- @req.header['if-modified-since'] = [(now + 10).httpdate]
-
- assert_raises WEBrick::HTTPStatus::NotModified do
- @s.if_modified_since @req, @res, '.'
- end
-
- assert_equal now.to_i, Time.parse(@res['last-modified']).to_i
- end
- end
-
- def test_installed_docs
- touch_system_cache_path
-
- expected = [
- ['Ruby Documentation', 'ruby/', true, :system,
- @system_dir],
- ['Site Documentation', 'site/', false, :site,
- File.join(@base, 'site')],
- ['Home Documentation', 'home/', false, :home,
- RDoc::RI::Paths::HOMEDIR],
- ['spec-1.0', 'spec-1.0/', false, :gem,
- File.join(@spec.doc_dir, 'ri')],
- ]
-
- assert_equal expected, @s.installed_docs
- end
-
- def test_not_found
- generator = @s.generator_for RDoc::Store.new
-
- @req.path = '/ruby/Missing.html'
-
- @s.not_found generator, @req, @res
-
- assert_equal 404, @res.status
- assert_match %r%<title>Not Found</title>%, @res.body
- assert_match %r%<kbd>/ruby/Missing\.html</kbd>%, @res.body
- end
-
- def test_ri_paths
- paths = @s.ri_paths
-
- expected = [
- [@system_dir, :system],
- [File.join(@base, 'site'), :site],
- [RDoc::RI::Paths::HOMEDIR, :home],
- [File.join(@spec.doc_dir, 'ri'), :gem],
- ]
-
- assert_equal expected, paths.to_a
- end
-
- def test_root
- @s.root @req, @res
-
- assert_equal 'text/html', @res.content_type
- assert_match %r%<title>Local RDoc Documentation</title>%, @res.body
- end
-
- def test_root_search
- touch_system_cache_path
-
- @s.root_search @req, @res
-
- assert_equal 'application/javascript', @res.content_type
-
- @res.body =~ /\{.*\}/
-
- index = JSON.parse $&
-
- expected = {
- 'index' => {
- 'searchIndex' => %w[
- Ruby\ Documentation
- ],
- 'longSearchIndex' => %w[
- Ruby\ Documentation
- ],
- 'info' => [
- ['Ruby Documentation', '', 'ruby', '',
- 'Documentation for the Ruby standard library'],
- ],
- }
- }
-
- assert_equal expected, index
- end
-
- def test_show_documentation_index
- touch_system_cache_path
-
- @req.path = '/ruby'
-
- @s.show_documentation @req, @res
-
- assert_equal 'text/html', @res.content_type
- assert_match %r%<title>Standard Library Documentation%, @res.body
- end
-
- def test_show_documentation_table_of_contents
- touch_system_cache_path
-
- @req.path = '/ruby/table_of_contents.html'
-
- @s.show_documentation @req, @res
-
- assert_equal 'text/html', @res.content_type
- assert_match %r%<title>Table of Contents - Standard Library Documentation%,
- @res.body
- end
-
- def test_show_documentation_page
- touch_system_cache_path
-
- @req.path = '/ruby/Missing.html'
-
- @s.show_documentation @req, @res
-
- assert_equal 404, @res.status
- end
-
- def test_show_documentation_search_index
- touch_system_cache_path
-
- @req.path = '/ruby/js/search_index.js'
-
- @s.show_documentation @req, @res
-
- assert_equal 'application/javascript', @res.content_type
- assert_match %r%\Avar search_data =%, @res.body
- end
-
- def test_store_for_gem
- store = @s.store_for 'spec-1.0'
-
- assert_equal File.join(@gem_doc_dir, 'spec-1.0', 'ri'), store.path
- assert_equal :gem, store.type
- end
-
- def test_store_for_home
- store = @s.store_for 'home'
-
- assert_equal @home_dir, store.path
- assert_equal :home, store.type
- end
-
- def test_store_for_missing
- e = assert_raises RDoc::Error do
- @s.store_for 'missing'
- end
-
- assert_equal 'could not find ri documentation for missing', e.message
- end
-
- def test_store_for_ruby
- store = @s.store_for 'ruby'
-
- assert_equal @system_dir, store.path
- assert_equal :system, store.type
- end
-
- def test_store_for_site
- store = @s.store_for 'site'
-
- assert_equal File.join(@base, 'site'), store.path
- assert_equal :site, store.type
- end
-
- def touch_system_cache_path
- store = RDoc::Store.new @system_dir
- store.title = 'Standard Library Documentation'
-
- FileUtils.mkdir_p File.dirname store.cache_path
-
- store.save
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_single_class.rb b/test/rdoc/test_rdoc_single_class.rb
deleted file mode 100644
index d0c71e9eeb..0000000000
--- a/test/rdoc/test_rdoc_single_class.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require File.expand_path '../xref_test_case', __FILE__
-
-class TestRDocSingleClass < XrefTestCase
-
- def test_definition
- c = RDoc::SingleClass.new 'C'
-
- assert_equal 'class << C', c.definition
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_stats.rb b/test/rdoc/test_rdoc_stats.rb
deleted file mode 100644
index 5073e53b7e..0000000000
--- a/test/rdoc/test_rdoc_stats.rb
+++ /dev/null
@@ -1,647 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocStats < RDoc::TestCase
-
- def setup
- super
-
- @s = RDoc::Stats.new @store, 0
-
- @tl = @store.add_file 'file.rb'
- @tl.parser = RDoc::Parser::Ruby
- end
-
- def test_doc_stats
- c = RDoc::CodeObject.new
-
- assert_equal [1, 1], @s.doc_stats([c])
- end
-
- def test_doc_stats_documented
- c = RDoc::CodeObject.new
- c.comment = comment 'x'
-
- assert_equal [1, 0], @s.doc_stats([c])
- end
-
- def test_doc_stats_display_eh
- c = RDoc::CodeObject.new
- c.ignore
-
- assert_equal [0, 0], @s.doc_stats([c])
- end
-
- def test_report_attr
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- a = RDoc::Attr.new nil, 'a', 'RW', nil
- a.record_location @tl
- c.add_attribute a
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-class C # is documented
-
- attr_accessor :a # in file file.rb
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_attr_documented
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- a = RDoc::Attr.new nil, 'a', 'RW', 'a'
- a.record_location @tl
- c.add_attribute a
-
- @store.complete :public
-
- report = @s.report
-
- assert_equal @s.great_job, report
- end
-
- def test_report_attr_line
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- a = RDoc::Attr.new nil, 'a', 'RW', nil
- a.record_location @tl
- a.line = 3
- c.add_attribute a
-
- @store.complete :public
-
- assert_match '# in file file.rb:3', @s.report
- end
-
- def test_report_constant
- m = @tl.add_module RDoc::NormalModule, 'M'
- m.record_location @tl
- m.add_comment 'M', @tl
-
- c = RDoc::Constant.new 'C', nil, nil
- c.record_location @tl
- m.add_constant c
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-module M # is documented
-
- # in file file.rb
- C = nil
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_constant_alias
- mod = @tl.add_module RDoc::NormalModule, 'M'
-
- c = @tl.add_class RDoc::NormalClass, 'C'
- mod.add_constant c
-
- ca = RDoc::Constant.new 'CA', nil, nil
- ca.is_alias_for = c
-
- @tl.add_constant ca
-
- @store.complete :public
-
- report = @s.report
-
- # TODO change this to refute match, aliases should be ignored as they are
- # programmer convenience constructs
- assert_match(/class Object/, report)
- end
-
- def test_report_constant_documented
- m = @tl.add_module RDoc::NormalModule, 'M'
- m.record_location @tl
- m.comment = 'M'
-
- c = RDoc::Constant.new 'C', nil, 'C'
- c.record_location @tl
- m.add_constant c
-
- @store.complete :public
-
- report = @s.report
-
- assert_equal @s.great_job, report
- end
-
- def test_report_constant_line
- m = @tl.add_module RDoc::NormalModule, 'M'
- m.record_location @tl
- m.add_comment 'M', @tl
-
- c = RDoc::Constant.new 'C', nil, nil
- c.record_location @tl
- c.line = 5
- m.add_constant c
-
- @store.complete :public
-
- assert_match '# in file file.rb:5', @s.report
- end
-
- def test_report_class
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- c.add_method m
- m.comment = 'm'
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-# in files:
-# file.rb
-
-class C
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_skip_object
- c = @tl.add_class RDoc::NormalClass, 'Object'
- c.record_location @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- c.add_method m
- m.comment = 'm'
-
- @store.complete :public
-
- refute_match %r%^class Object$%, @s.report
- end
-
- def test_report_class_documented
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- c.add_method m
- m.comment = 'm'
-
- @store.complete :public
-
- report = @s.report
-
- assert_equal @s.great_job, report
- end
-
- def test_report_class_documented_level_1
- c1 = @tl.add_class RDoc::NormalClass, 'C1'
- c1.record_location @tl
- c1.add_comment 'C1', @tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location @tl
- c1.add_method m1
- m1.comment = 'm1'
-
- c2 = @tl.add_class RDoc::NormalClass, 'C2'
- c2.record_location @tl
-
- m2 = RDoc::AnyMethod.new nil, 'm2'
- m2.record_location @tl
- c2.add_method m2
- m2.comment = 'm2'
-
- @store.complete :public
-
- @s.coverage_level = 1
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-
-# in files:
-# file.rb
-
-class C2
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_class_empty
- @tl.add_class RDoc::NormalClass, 'C'
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-# class C is referenced but empty.
-#
-# It probably came from another project. I'm sorry I'm holding it against you.
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_class_empty_2
- c1 = @tl.add_class RDoc::NormalClass, 'C1'
- c1.record_location @tl
-
- c2 = @tl.add_class RDoc::NormalClass, 'C2'
- c2.record_location @tl
- c2.add_comment 'C2', @tl
-
- @store.complete :public
-
- @s.coverage_level = 1
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-# in files:
-# file.rb
-
-class C1
-end
-
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_class_method_documented
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- c.add_method m
- m.comment = 'm'
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-# in files:
-# file.rb
-
-class C
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_class_module_ignore
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.ignore
-
- @store.complete :public
-
- report = @s.report_class_module c
-
- assert_nil report
- end
-
- def test_report_empty
- @store.complete :public
-
- report = @s.report
-
- assert_equal @s.great_job, report
- end
-
- def test_report_method
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location @tl
- c.add_method m1
-
- m2 = RDoc::AnyMethod.new nil, 'm2'
- m2.record_location @tl
- c.add_method m2
- m2.comment = 'm2'
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-class C # is documented
-
- # in file file.rb
- def m1; end
-
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_method_class
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location @tl
- m1.singleton = true
- c.add_method m1
-
- m2 = RDoc::AnyMethod.new nil, 'm2'
- m2.record_location @tl
- m2.singleton = true
- c.add_method m2
- m2.comment = 'm2'
-
- @store.complete :public
-
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-class C # is documented
-
- # in file file.rb
- def self.m1; end
-
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_method_documented
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- c.add_method m
- m.comment = 'm'
-
- @store.complete :public
-
- report = @s.report
-
- assert_equal @s.great_job, report
- end
-
- def test_report_method_line
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location @tl
- m1.line = 4
- c.add_method m1
-
- @store.complete :public
-
- assert_match '# in file file.rb:4', @s.report
- end
-
- def test_report_method_parameters
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m1 = RDoc::AnyMethod.new nil, 'm1'
- m1.record_location @tl
- m1.params = '(p1, p2)'
- m1.comment = 'Stuff with +p1+'
- c.add_method m1
-
- m2 = RDoc::AnyMethod.new nil, 'm2'
- m2.record_location @tl
- c.add_method m2
- m2.comment = 'm2'
-
- @store.complete :public
-
- @s.coverage_level = 1
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-class C # is documented
-
- # in file file.rb
- # +p2+ is not documented
- def m1(p1, p2); end
-
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_report_method_parameters_documented
- @tl.parser = RDoc::Parser::Ruby
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- m.params = '(p1)'
- m.comment = 'Stuff with +p1+'
- c.add_method m
-
- @store.complete :public
-
- @s.coverage_level = 1
- report = @s.report
-
- assert_equal @s.great_job, report
- end
-
- def test_report_method_parameters_yield
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- m.call_seq = <<-SEQ
-m(a) { |c| ... }
-m(a, b) { |c, d| ... }
- SEQ
- m.comment = 'Stuff with +a+, yields +c+ for you to do stuff with'
- c.add_method m
-
- @store.complete :public
-
- @s.coverage_level = 1
- report = @s.report
-
- expected = <<-EXPECTED
-The following items are not documented:
-
-class C # is documented
-
- # in file file.rb
- # +b+, +d+ is not documented
- def m; end
-
-end
- EXPECTED
-
- assert_equal expected, report
- end
-
- def test_summary
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
-
- m = @tl.add_module RDoc::NormalModule, 'M'
- m.record_location @tl
-
- a = RDoc::Attr.new nil, 'a', 'RW', nil
- a.record_location @tl
- c.add_attribute a
-
- c_c = RDoc::Constant.new 'C', nil, nil
- c_c.record_location @tl
- c.add_constant c_c
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- c.add_method m
-
- @store.complete :public
-
- summary = @s.summary
- summary.sub!(/Elapsed:.*/, '')
-
- expected = <<-EXPECTED
-Files: 0
-
-Classes: 1 (1 undocumented)
-Modules: 1 (1 undocumented)
-Constants: 1 (1 undocumented)
-Attributes: 1 (1 undocumented)
-Methods: 1 (1 undocumented)
-
-Total: 5 (5 undocumented)
- 0.00% documented
-
- EXPECTED
-
- assert_equal summary, expected
- end
-
- def test_summary_level_false
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
-
- @store.complete :public
-
- @s.coverage_level = false
-
- summary = @s.summary
- summary.sub!(/Elapsed:.*/, '')
-
- expected = <<-EXPECTED
-Files: 0
-
-Classes: 1 (1 undocumented)
-Modules: 0 (0 undocumented)
-Constants: 0 (0 undocumented)
-Attributes: 0 (0 undocumented)
-Methods: 0 (0 undocumented)
-
-Total: 1 (1 undocumented)
- 0.00% documented
-
- EXPECTED
-
- assert_equal summary, expected
- end
-
- def test_summary_level_1
- c = @tl.add_class RDoc::NormalClass, 'C'
- c.record_location @tl
- c.add_comment 'C', @tl
-
- m = RDoc::AnyMethod.new nil, 'm'
- m.record_location @tl
- m.params = '(p1, p2)'
- m.comment = 'Stuff with +p1+'
- c.add_method m
-
- @store.complete :public
-
- @s.coverage_level = 1
- @s.report
-
- summary = @s.summary
- summary.sub!(/Elapsed:.*/, '')
-
- expected = <<-EXPECTED
-Files: 0
-
-Classes: 1 (0 undocumented)
-Modules: 0 (0 undocumented)
-Constants: 0 (0 undocumented)
-Attributes: 0 (0 undocumented)
-Methods: 1 (0 undocumented)
-Parameters: 2 (1 undocumented)
-
-Total: 4 (1 undocumented)
- 75.00% documented
-
- EXPECTED
-
- assert_equal summary, expected
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_store.rb b/test/rdoc/test_rdoc_store.rb
deleted file mode 100644
index 3b92707987..0000000000
--- a/test/rdoc/test_rdoc_store.rb
+++ /dev/null
@@ -1,1001 +0,0 @@
-require File.expand_path '../xref_test_case', __FILE__
-
-class TestRDocStore < XrefTestCase
-
- OBJECT_ANCESTORS = defined?(::BasicObject) ? %w[BasicObject] : []
-
- def setup
- super
-
- @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
- @s = RDoc::RI::Store.new @tmpdir
-
- @top_level = @s.add_file 'file.rb'
-
- @page = @s.add_file 'README.txt'
- @page.parser = RDoc::Parser::Simple
- @page.comment = RDoc::Comment.new 'This is a page', @page
-
- @klass = @top_level.add_class RDoc::NormalClass, 'Object'
- @klass.add_comment 'original', @top_level
- @klass.record_location @top_level
-
- @cmeth = RDoc::AnyMethod.new nil, 'cmethod'
- @cmeth.singleton = true
- @cmeth.record_location @top_level
-
- @meth_comment = RDoc::Comment.new 'method comment'
- @meth_comment.location = @top_level
-
- @meth = RDoc::AnyMethod.new nil, 'method'
- @meth.record_location @top_level
- @meth.comment = @meth_comment
-
- @meth_bang = RDoc::AnyMethod.new nil, 'method!'
- @meth_bang.record_location @top_level
-
- @meth_bang_alias = RDoc::Alias.new nil, 'method!', 'method_bang', ''
- @meth_bang_alias.record_location @top_level
-
- @meth_bang.add_alias @meth_bang_alias, @klass
-
- @attr_comment = RDoc::Comment.new 'attribute comment'
- @attr_comment.location = @top_level
-
- @attr = RDoc::Attr.new nil, 'attr', 'RW', ''
- @attr.record_location @top_level
- @attr.comment = @attr_comment
-
- @klass.add_method @cmeth
- @klass.add_method @meth
- @klass.add_method @meth_bang
- @klass.add_attribute @attr
-
- @nest_klass = @klass.add_class RDoc::NormalClass, 'SubClass'
- @nest_meth = RDoc::AnyMethod.new nil, 'method'
- @nest_meth.record_location @top_level
-
- @nest_incl = RDoc::Include.new 'Incl', ''
- @nest_incl.record_location @top_level
-
- @nest_klass.add_method @nest_meth
- @nest_klass.add_include @nest_incl
-
- @mod = @top_level.add_module RDoc::NormalModule, 'Mod'
- @mod.record_location @top_level
- end
-
- def teardown
- super
-
- FileUtils.rm_rf @tmpdir
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def assert_cache imethods, cmethods, attrs, modules,
- ancestors = {}, pages = [], main = nil, title = nil
- imethods ||= { 'Object' => %w[method method! method_bang] }
- cmethods ||= { 'Object' => %w[cmethod] }
- attrs ||= { 'Object' => ['attr_accessor attr'] }
-
- # this is sort-of a hack
- @s.clean_cache_collection ancestors
-
- expected = {
- :ancestors => ancestors,
- :attributes => attrs,
- :class_methods => cmethods,
- :c_class_variables => {},
- :c_singleton_class_variables => {},
- :encoding => nil,
- :instance_methods => imethods,
- :modules => modules,
- :pages => pages,
- :main => main,
- :title => title,
- }
-
- @s.save_cache
-
- assert_equal expected, @s.cache
- end
-
- def assert_directory path
- assert File.directory?(path), "#{path} is not a directory"
- end
-
- def assert_file path
- assert File.file?(path), "#{path} is not a file"
- end
-
- def refute_file path
- refute File.exist?(path), "#{path} exists"
- end
-
- def test_add_c_enclosure
- @s.add_c_enclosure 'cC1', @c1
-
- expected = { 'cC1' => @c1 }
-
- assert_equal expected, @s.c_enclosure_classes
- end
-
- def test_add_c_variables
- options = RDoc::Options.new
-
- c_file = @s.add_file 'ext.c'
-
- some_ext = c_file.add_class RDoc::NormalClass, 'SomeExt'
- c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
- c_parser = RDoc::Parser::C.new c_file, 'ext.c', '', options, nil
-
- c_parser.classes['cSomeExt'] = some_ext
- c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
- @s.add_c_variables c_parser
-
- expected = { 'ext.c' => { 'cSomeExt' => 'SomeExt' } }
-
- assert_equal expected, @s.c_class_variables
-
- expected = { 'ext.c' => { 's_cSomeExt' => 'SomeExtSingle' } }
-
- assert_equal expected, @s.c_singleton_class_variables
- end
-
- def test_add_file
- top_level = @store.add_file 'file.rb'
-
- assert_kind_of RDoc::TopLevel, top_level
- assert_equal @store, top_level.store
- assert_equal 'file.rb', top_level.name
- assert_includes @store.all_files, top_level
-
- assert_same top_level, @store.add_file('file.rb')
- refute_same top_level, @store.add_file('other.rb')
- end
-
- def test_add_file_relative
- top_level = @store.add_file 'path/file.rb', 'file.rb'
-
- assert_kind_of RDoc::TopLevel, top_level
- assert_equal @store, top_level.store
-
- assert_equal 'path/file.rb', top_level.absolute_name
- assert_equal 'file.rb', top_level.relative_name
-
- assert_includes @store.all_files, top_level
-
- assert_same top_level, @store.add_file('file.rb')
- refute_same top_level, @store.add_file('other.rb')
- end
-
- def test_all_classes_and_modules
- expected = %w[
- C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1
- Child
- M1 M1::M2
- Parent
- ]
-
- assert_equal expected,
- @store.all_classes_and_modules.map { |m| m.full_name }.sort
- end
-
- def test_all_files
- assert_equal %w[xref_data.rb],
- @store.all_files.map { |m| m.full_name }.sort
- end
-
- def test_all_modules
- assert_equal %w[M1 M1::M2],
- @store.all_modules.map { |m| m.full_name }.sort
- end
-
- def test_attributes
- @s.cache[:attributes]['Object'] = %w[attr]
-
- expected = { 'Object' => %w[attr] }
-
- assert_equal expected, @s.attributes
- end
-
- def test_class_file
- assert_equal File.join(@tmpdir, 'Object', 'cdesc-Object.ri'),
- @s.class_file('Object')
- assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri'),
- @s.class_file('Object::SubClass')
- end
-
- def test_class_methods
- @s.cache[:class_methods]['Object'] = %w[method]
-
- expected = { 'Object' => %w[method] }
-
- assert_equal expected, @s.class_methods
- end
-
- def test_class_path
- assert_equal File.join(@tmpdir, 'Object'), @s.class_path('Object')
- assert_equal File.join(@tmpdir, 'Object', 'SubClass'),
- @s.class_path('Object::SubClass')
- end
-
- def test_classes
- expected = %w[
- C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1
- Child
- Parent
- ]
-
- assert_equal expected, @store.all_classes.map { |m| m.full_name }.sort
- end
-
- def test_complete
- @c2.add_module_alias @c2_c3, 'A1', @top_level
-
- @store.complete :public
-
- a1 = @xref_data.find_class_or_module 'C2::A1'
-
- assert_equal 'C2::A1', a1.full_name
- refute_empty a1.aliases
- end
-
- def test_find_c_enclosure
- assert_nil @s.find_c_enclosure 'cC1'
-
- @s.add_c_enclosure 'cC1', @c1
-
- assert_equal @c1, @s.find_c_enclosure('cC1')
- end
-
- def test_find_c_enclosure_from_cache
- @s.save_class @klass
- @s.classes_hash.clear
-
- assert_nil @s.find_c_enclosure 'cObject'
-
- @s.c_enclosure_names['cObject'] = 'Object'
-
- klass = @s.find_c_enclosure('cObject')
- assert_equal @klass, klass
-
- assert_empty klass.comment_location
- assert_equal @top_level, klass.parent
-
- assert_includes @s.c_enclosure_classes, 'cObject'
- end
-
- def test_find_c_enclosure_from_cache_legacy
- @klass.in_files.clear
- @s.save_class @klass
- @s.classes_hash.clear
-
- assert_nil @s.find_c_enclosure 'cObject'
-
- @s.c_enclosure_names['cObject'] = 'Object'
-
- assert_nil @s.find_c_enclosure('cObject')
- end
-
- def test_find_class_named
- assert_equal @c1, @store.find_class_named('C1')
-
- assert_equal @c2_c3, @store.find_class_named('C2::C3')
- end
-
- def test_find_class_named_from
- assert_equal @c5_c1, @store.find_class_named_from('C1', 'C5')
-
- assert_equal @c1, @store.find_class_named_from('C1', 'C4')
- end
-
- def test_find_class_or_module
- assert_equal @m1, @store.find_class_or_module('M1')
- assert_equal @c1, @store.find_class_or_module('C1')
-
- assert_equal @m1, @store.find_class_or_module('::M1')
- assert_equal @c1, @store.find_class_or_module('::C1')
- end
-
- def test_find_file_named
- assert_equal @xref_data, @store.find_file_named(@file_name)
- end
-
- def test_find_module_named
- assert_equal @m1, @store.find_module_named('M1')
- assert_equal @m1_m2, @store.find_module_named('M1::M2')
- end
-
- def test_find_text_page
- page = @store.add_file 'PAGE.txt'
- page.parser = RDoc::Parser::Simple
-
- assert_nil @store.find_text_page 'no such page'
-
- assert_equal page, @store.find_text_page('PAGE.txt')
- end
-
- def test_friendly_path
- @s.path = @tmpdir
- @s.type = nil
- assert_equal @s.path, @s.friendly_path
-
- @s.type = :extra
- assert_equal @s.path, @s.friendly_path
-
- @s.type = :system
- assert_equal "ruby core", @s.friendly_path
-
- @s.type = :site
- assert_equal "ruby site", @s.friendly_path
-
- @s.type = :home
- assert_equal "~/.rdoc", @s.friendly_path
-
- @s.type = :gem
- @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
- assert_equal "gem gem_name-1.0", @s.friendly_path
- end
-
- def test_dry_run
- refute @s.dry_run
-
- @s.dry_run = true
-
- assert @s.dry_run
- end
-
- def test_instance_methods
- @s.cache[:instance_methods]['Object'] = %w[method]
-
- expected = { 'Object' => %w[method] }
-
- assert_equal expected, @s.instance_methods
- end
-
- def test_load_all
- FileUtils.mkdir_p @tmpdir
-
- @s.save
-
- s = RDoc::Store.new @tmpdir
-
- s.load_all
-
- assert_equal [@klass, @nest_klass], s.all_classes.sort
- assert_equal [@mod], s.all_modules.sort
- assert_equal [@page, @top_level], s.all_files.sort
-
- methods = s.all_classes_and_modules.map do |mod|
- mod.method_list
- end.flatten.sort
-
- _meth_bang_alias = RDoc::AnyMethod.new nil, 'method_bang'
- _meth_bang_alias.parent = @klass
-
- assert_equal [@meth, @meth_bang, _meth_bang_alias, @nest_meth, @cmeth],
- methods.sort_by { |m| m.full_name }
-
- method = methods.find { |m| m == @meth }
- assert_equal @meth_comment.parse, method.comment
-
- assert_equal @klass, methods.last.parent
-
- attributes = s.all_classes_and_modules.map do |mod|
- mod.attributes
- end.flatten.sort
-
- assert_equal [@attr], attributes
-
- assert_equal @attr_comment.parse, attributes.first.comment
- end
-
- def test_load_cache
- cache = {
- :c_class_variables =>
- { 'file.c' => { 'cKlass' => 'Klass' } },
- :c_singleton_class_variables =>
- { 'file.c' => { 'sKlass' => 'KlassSingle' } },
- :encoding => :encoding_value,
- :methods => { "Object" => %w[Object#method] },
- :main => @page.full_name,
- :modules => %w[Object],
- :pages => [],
- }
-
- Dir.mkdir @tmpdir
-
- open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
- Marshal.dump cache, io
- end
-
- @s.load_cache
-
- assert_equal cache, @s.cache
-
- assert_equal :encoding_value, @s.encoding
- assert_equal 'README.txt', @s.main
-
- expected = { 'file.c' => { 'cKlass' => 'Klass' } }
- assert_equal expected, @s.cache[:c_class_variables]
-
- expected = { 'file.c' => { 'sKlass' => 'KlassSingle' } }
- assert_equal expected, @s.cache[:c_singleton_class_variables]
-
- expected = { 'cKlass' => 'Klass' }
- assert_equal expected, @s.c_enclosure_names
- end
-
- def test_load_cache_encoding_differs
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- cache = {
- :c_class_variables => {},
- :c_singleton_class_variables => {},
- :encoding => Encoding::ISO_8859_1,
- :main => nil,
- :methods => { "Object" => %w[Object#method] },
- :modules => %w[Object],
- :pages => [],
- }
-
- Dir.mkdir @tmpdir
-
- open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
- Marshal.dump cache, io
- end
-
- @s.encoding = Encoding::UTF_8
-
- @s.load_cache
-
- assert_equal cache, @s.cache
-
- assert_equal Encoding::UTF_8, @s.encoding
- end
-
- def test_load_cache_no_cache
- cache = {
- :ancestors => {},
- :attributes => {},
- :class_methods => {},
- :c_class_variables => {},
- :c_singleton_class_variables => {},
- :encoding => nil,
- :instance_methods => {},
- :main => nil,
- :modules => [],
- :pages => [],
- :title => nil,
- }
-
- @s.load_cache
-
- assert_equal cache, @s.cache
- end
-
- def test_load_cache_legacy
- cache = {
- :ancestors => {},
- :attributes => {},
- :class_methods => {},
- :encoding => :encoding_value,
- :instance_methods => { "Object" => %w[Object#method] },
- :modules => %w[Object],
- # no :pages
- # no :main
- # no :c_class_variables
- # no :c_singleton_class_variables
- }
-
- Dir.mkdir @tmpdir
-
- open File.join(@tmpdir, 'cache.ri'), 'wb' do |io|
- Marshal.dump cache, io
- end
-
- @s.load_cache
-
- expected = {
- :ancestors => {},
- :attributes => {},
- :class_methods => {},
- :c_class_variables => {},
- :c_singleton_class_variables => {},
- :encoding => :encoding_value,
- :instance_methods => { "Object" => %w[Object#method] },
- :main => nil,
- :modules => %w[Object],
- :pages => [],
- }
-
- assert_equal expected, @s.cache
-
- assert_equal :encoding_value, @s.encoding
- assert_nil @s.main
- end
-
- def test_load_class
- @s.save_class @klass
- @s.classes_hash.clear
-
- assert_equal @klass, @s.load_class('Object')
-
- assert_includes @s.classes_hash, 'Object'
- end
-
- def test_load_method
- @s.save_method @klass, @meth_bang
-
- meth = @s.load_method('Object', '#method!')
- assert_equal @meth_bang, meth
- assert_equal @klass, meth.parent
- assert_equal @s, meth.store
- end
-
- def test_load_method_legacy
- @s.save_method @klass, @meth
-
- file = @s.method_file @klass.full_name, @meth.full_name
-
- open file, 'wb' do |io|
- io.write "\x04\bU:\x14RDoc::AnyMethod[\x0Fi\x00I" +
- "\"\vmethod\x06:\x06EF\"\x11Klass#method0:\vpublic" +
- "o:\eRDoc::Markup::Document\x06:\v@parts[\x06" +
- "o:\x1CRDoc::Markup::Paragraph\x06;\t[\x06I" +
- "\"\x16this is a comment\x06;\x06FI" +
- "\"\rcall_seq\x06;\x06FI\"\x0Fsome_block\x06;\x06F" +
- "[\x06[\aI\"\faliased\x06;\x06Fo;\b\x06;\t[\x06" +
- "o;\n\x06;\t[\x06I\"\x12alias comment\x06;\x06FI" +
- "\"\nparam\x06;\x06F"
- end
-
- meth = @s.load_method('Object', '#method')
- assert_equal 'Klass#method', meth.full_name
- assert_equal @klass, meth.parent
- assert_equal @s, meth.store
- end
-
- def test_load_page
- @s.save_page @page
-
- assert_equal @page, @s.load_page('README.txt')
- end
-
- def test_main
- assert_equal nil, @s.main
-
- @s.main = 'README.txt'
-
- assert_equal 'README.txt', @s.main
- end
-
- def test_method_file
- assert_equal File.join(@tmpdir, 'Object', 'method-i.ri'),
- @s.method_file('Object', 'Object#method')
-
- assert_equal File.join(@tmpdir, 'Object', 'method%21-i.ri'),
- @s.method_file('Object', 'Object#method!')
-
- assert_equal File.join(@tmpdir, 'Object', 'SubClass', 'method%21-i.ri'),
- @s.method_file('Object::SubClass', 'Object::SubClass#method!')
-
- assert_equal File.join(@tmpdir, 'Object', 'method-c.ri'),
- @s.method_file('Object', 'Object::method')
- end
-
- def test_module_names
- @s.save_class @klass
-
- assert_equal %w[Object], @s.module_names
- end
-
- def test_page
- page = @store.add_file 'PAGE.txt'
- page.parser = RDoc::Parser::Simple
-
- assert_nil @store.page 'no such page'
-
- assert_equal page, @store.page('PAGE')
- end
-
- def test_save
- FileUtils.mkdir_p @tmpdir
-
- @s.save
-
- assert_directory File.join(@tmpdir, 'Object')
-
- assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
- assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
- assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
- assert_file File.join(@tmpdir, 'cache.ri')
-
- expected = {
- :ancestors => {
- 'Object::SubClass' => %w[Incl Object],
- },
- :attributes => { 'Object' => ['attr_accessor attr'] },
- :class_methods => { 'Object' => %w[cmethod] },
- :c_class_variables => {},
- :c_singleton_class_variables => {},
- :instance_methods => {
- 'Object' => %w[attr method method! method_bang],
- 'Object::SubClass' => %w[method],
- },
- :main => nil,
- :modules => %w[Mod Object Object::SubClass],
- :encoding => nil,
- :pages => %w[README.txt],
- :title => nil,
- }
-
- expected[:ancestors]['Object'] = %w[BasicObject] if defined?(::BasicObject)
-
- open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
- cache = Marshal.load io.read
-
- assert_equal expected, cache
- end
- end
-
- def test_save_cache
- @s.save_class @klass
- @s.save_method @klass, @meth
- @s.save_method @klass, @cmeth
- @s.save_class @nest_klass
- @s.save_page @page
- @s.encoding = :encoding_value
- @s.main = @page.full_name
- @s.title = 'title'
-
- options = RDoc::Options.new
-
- c_file = @s.add_file 'ext.c'
-
- some_ext = c_file.add_class RDoc::NormalClass, 'SomeExt'
- c_file.add_class RDoc::SingleClass, 'SomeExtSingle'
-
- c_parser = RDoc::Parser::C.new c_file, 'ext.c', '', options, nil
-
- c_parser.classes['cSomeExt'] = some_ext
- c_parser.singleton_classes['s_cSomeExt'] = 'SomeExtSingle'
-
- @s.add_c_variables c_parser
-
- @s.save_cache
-
- assert_file File.join(@tmpdir, 'cache.ri')
-
- c_class_variables = {
- 'ext.c' => {
- 'cSomeExt' => 'SomeExt'
- }
- }
-
- c_singleton_class_variables = {
- 'ext.c' => {
- 's_cSomeExt' => 'SomeExtSingle'
- }
- }
-
- expected = {
- :ancestors => {
- 'Object::SubClass' => %w[Incl Object],
- },
- :attributes => { 'Object' => ['attr_accessor attr'] },
- :class_methods => { 'Object' => %w[cmethod] },
- :c_class_variables => c_class_variables,
- :c_singleton_class_variables => c_singleton_class_variables,
- :instance_methods => {
- 'Object' => %w[method method! method_bang],
- 'Object::SubClass' => %w[method],
- },
- :main => @page.full_name,
- :modules => %w[Object Object::SubClass],
- :encoding => :encoding_value,
- :pages => %w[README.txt],
- :title => 'title',
- }
-
- expected[:ancestors]['Object'] = %w[BasicObject] if defined?(::BasicObject)
-
- open File.join(@tmpdir, 'cache.ri'), 'rb' do |io|
- cache = Marshal.load io.read
-
- assert_equal expected, cache
- end
- end
-
- def test_save_cache_dry_run
- @s.dry_run = true
-
- @s.save_class @klass
- @s.save_method @klass, @meth
- @s.save_method @klass, @cmeth
- @s.save_class @nest_klass
-
- @s.save_cache
-
- refute_file File.join(@tmpdir, 'cache.ri')
- end
-
- def test_save_cache_duplicate_methods
- @s.save_method @klass, @meth
- @s.save_method @klass, @meth
-
- @s.save_cache
-
- assert_cache({ 'Object' => %w[method] }, {}, {}, [])
- end
-
- def test_save_cache_duplicate_pages
- @s.save_page @page
- @s.save_page @page
-
- @s.save_cache
-
- assert_cache({}, {}, {}, [], {}, %w[README.txt])
- end
-
- def test_save_class
- @s.save_class @klass
-
- assert_directory File.join(@tmpdir, 'Object')
- assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
- assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
- assert_equal @klass, @s.load_class('Object')
- end
-
- def test_save_class_basic_object
- @klass.instance_variable_set :@superclass, nil
-
- @s.save_class @klass
-
- assert_directory File.join(@tmpdir, 'Object')
- assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
- assert_cache(nil, nil, nil, %w[Object])
-
- assert_equal @klass, @s.load_class('Object')
- end
-
- def test_save_class_delete
- # save original
- @s.save_class @klass
- @s.save_method @klass, @meth
- @s.save_method @klass, @meth_bang
- @s.save_method @klass, @cmeth
- @s.save_method @klass, @attr
- @s.save_cache
-
- klass = RDoc::NormalClass.new 'Object'
-
- meth = klass.add_method RDoc::AnyMethod.new(nil, 'replace')
- meth.record_location @top_level
-
- # load original, save newly updated class
- @s = RDoc::RI::Store.new @tmpdir
- @s.load_cache
- @s.save_class klass
- @s.save_cache
-
- # load from disk again
- @s = RDoc::RI::Store.new @tmpdir
- @s.load_cache
-
- @s.load_class 'Object'
-
- assert_cache({ 'Object' => %w[replace] }, {},
- { 'Object' => %w[attr_accessor\ attr] }, %w[Object],
- 'Object' => OBJECT_ANCESTORS)
-
- # assert these files were deleted
- refute_file @s.method_file(@klass.full_name, @meth.full_name)
- refute_file @s.method_file(@klass.full_name, @meth_bang.full_name)
- refute_file @s.method_file(@klass.full_name, @cmeth.full_name)
-
- # assert these files were not deleted
- assert_file @s.method_file(@klass.full_name, @attr.full_name)
- end
-
- def test_save_class_dry_run
- @s.dry_run = true
-
- @s.save_class @klass
-
- refute_file File.join(@tmpdir, 'Object')
- refute_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
- end
-
- def test_save_class_loaded
- @s.save
-
- assert_directory File.join(@tmpdir, 'Object')
- assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
- assert_file @s.method_file(@klass.full_name, @attr.full_name)
- assert_file @s.method_file(@klass.full_name, @cmeth.full_name)
- assert_file @s.method_file(@klass.full_name, @meth.full_name)
- assert_file @s.method_file(@klass.full_name, @meth_bang.full_name)
-
- s = RDoc::Store.new @s.path
- s.load_cache
-
- loaded = s.load_class 'Object'
-
- assert_equal @klass, loaded
-
- s.save_class loaded
-
- s = RDoc::Store.new @s.path
- s.load_cache
-
- reloaded = s.load_class 'Object'
-
- assert_equal @klass, reloaded
-
- # assert these files were not deleted. Bug #171
- assert_file s.method_file(@klass.full_name, @attr.full_name)
- assert_file s.method_file(@klass.full_name, @cmeth.full_name)
- assert_file s.method_file(@klass.full_name, @meth.full_name)
- assert_file s.method_file(@klass.full_name, @meth_bang.full_name)
- end
-
- def test_save_class_merge
- @s.save_class @klass
-
- klass = RDoc::NormalClass.new 'Object'
- klass.add_comment 'new comment', @top_level
-
- s = RDoc::RI::Store.new @tmpdir
- s.save_class klass
-
- s = RDoc::RI::Store.new @tmpdir
-
- inner = @RM::Document.new @RM::Paragraph.new 'new comment'
- inner.file = @top_level
-
- document = @RM::Document.new inner
-
- assert_equal document, s.load_class('Object').comment_location
- end
-
- # This is a functional test
- def test_save_class_merge_constant
- store = RDoc::Store.new
- tl = store.add_file 'file.rb'
-
- klass = tl.add_class RDoc::NormalClass, 'C'
- klass.add_comment 'comment', tl
-
- const = klass.add_constant RDoc::Constant.new('CONST', nil, nil)
- const.record_location tl
-
- @s.save_class klass
-
- # separate parse run, independent store
- store = RDoc::Store.new
- tl = store.add_file 'file.rb'
- klass2 = tl.add_class RDoc::NormalClass, 'C'
- klass2.record_location tl
-
- s = RDoc::RI::Store.new @tmpdir
- s.save_class klass2
-
- # separate `ri` run, independent store
- s = RDoc::RI::Store.new @tmpdir
-
- result = s.load_class 'C'
-
- assert_empty result.constants
- end
-
- def test_save_class_methods
- @s.save_class @klass
-
- assert_directory File.join(@tmpdir, 'Object')
- assert_file File.join(@tmpdir, 'Object', 'cdesc-Object.ri')
-
- assert_cache nil, nil, nil, %w[Object], 'Object' => OBJECT_ANCESTORS
-
- assert_equal @klass, @s.load_class('Object')
- end
-
- def test_save_class_nested
- @s.save_class @nest_klass
-
- assert_directory File.join(@tmpdir, 'Object', 'SubClass')
- assert_file File.join(@tmpdir, 'Object', 'SubClass', 'cdesc-SubClass.ri')
-
- assert_cache({ 'Object::SubClass' => %w[method] }, {}, {},
- %w[Object::SubClass], 'Object::SubClass' => %w[Incl Object])
- end
-
- def test_save_method
- @s.save_method @klass, @meth
-
- assert_directory File.join(@tmpdir, 'Object')
- assert_file File.join(@tmpdir, 'Object', 'method-i.ri')
-
- assert_cache({ 'Object' => %w[method] }, {}, {}, [])
-
- assert_equal @meth, @s.load_method('Object', '#method')
- end
-
- def test_save_method_dry_run
- @s.dry_run = true
-
- @s.save_method @klass, @meth
-
- refute_file File.join(@tmpdir, 'Object')
- refute_file File.join(@tmpdir, 'Object', 'method-i.ri')
- end
-
- def test_save_method_nested
- @s.save_method @nest_klass, @nest_meth
-
- assert_directory File.join(@tmpdir, 'Object', 'SubClass')
- assert_file File.join(@tmpdir, 'Object', 'SubClass', 'method-i.ri')
-
- assert_cache({ 'Object::SubClass' => %w[method] }, {}, {}, [])
- end
-
- def test_save_page
- @s.save_page @page
-
- assert_file File.join(@tmpdir, 'page-README_txt.ri')
-
- assert_cache({}, {}, {}, [], {}, %w[README.txt])
- end
-
- def test_save_page_file
- @s.save_page @top_level
-
- refute_file File.join(@tmpdir, 'page-file_rb.ri')
- end
-
- def test_source
- @s.path = @tmpdir
- @s.type = nil
- assert_equal @s.path, @s.source
-
- @s.type = :extra
- assert_equal @s.path, @s.source
-
- @s.type = :system
- assert_equal "ruby", @s.source
-
- @s.type = :site
- assert_equal "site", @s.source
-
- @s.type = :home
- assert_equal "home", @s.source
-
- @s.type = :gem
- @s.path = "#{@tmpdir}/gem_repository/doc/gem_name-1.0/ri"
- assert_equal "gem_name-1.0", @s.source
- end
-
- def test_title
- assert_equal nil, @s.title
-
- @s.title = 'rdoc'
-
- assert_equal 'rdoc', @s.title
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_task.rb b/test/rdoc/test_rdoc_task.rb
index 8faf3f7d92..e95ac46d4c 100644
--- a/test/rdoc/test_rdoc_task.rb
+++ b/test/rdoc/test_rdoc_task.rb
@@ -1,44 +1,11 @@
-require 'rdoc/test_case'
-require 'rake'
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc/task'
-class TestRDocTask < RDoc::TestCase
+class TestRDocTask < MiniTest::Unit::TestCase
def setup
- super
-
Rake::Task.clear
-
- @t = RDoc::Task.new
- end
-
- def test_clobber_task_description
- assert_equal 'Remove RDoc HTML files', @t.clobber_task_description
- end
-
- def test_inline_source
- _, err = verbose_capture_io do
- assert @t.inline_source
- end
-
- assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
- _, err = verbose_capture_io do
- @t.inline_source = false
- end
-
- assert_equal "RDoc::Task#inline_source is deprecated\n", err
-
- capture_io do
- assert @t.inline_source
- end
- end
-
- def test_markup_option
- rdoc_task = RDoc::Task.new do |rd|
- rd.markup = "tomdoc"
- end
-
- assert_equal %w[-o html --markup tomdoc], rdoc_task.option_list
end
def test_tasks_creation
@@ -56,22 +23,6 @@ class TestRDocTask < RDoc::TestCase
assert_equal :rdoc_dev, rd.name
end
- def test_generator_option
- rdoc_task = RDoc::Task.new do |rd|
- rd.generator = "ri"
- end
-
- assert_equal %w[-o html -f ri], rdoc_task.option_list
- end
-
- def test_rdoc_task_description
- assert_equal 'Build RDoc HTML files', @t.rdoc_task_description
- end
-
- def test_rerdoc_task_description
- assert_equal 'Rebuild RDoc HTML files', @t.rerdoc_task_description
- end
-
def test_tasks_creation_with_custom_name_string
rd = RDoc::Task.new("rdoc_dev")
assert Rake::Task[:rdoc_dev]
@@ -81,14 +32,7 @@ class TestRDocTask < RDoc::TestCase
end
def test_tasks_creation_with_custom_name_hash
- options = {
- :rdoc => "rdoc",
- :clobber_rdoc => "rdoc:clean",
- :rerdoc => "rdoc:force"
- }
-
- Rake::Task.clear
-
+ options = { :rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force" }
rd = RDoc::Task.new(options)
assert Rake::Task[:"rdoc"]
assert Rake::Task[:"rdoc:clean"]
@@ -98,7 +42,7 @@ class TestRDocTask < RDoc::TestCase
end
def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
- RDoc::Task.new(:clobber_rdoc => "rdoc:clean")
+ rd = RDoc::Task.new(:clobber_rdoc => "rdoc:clean")
assert Rake::Task[:rdoc]
assert Rake::Task[:"rdoc:clean"]
assert Rake::Task[:rerdoc]
diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb
index 9e0ec6fe94..7e0f2cf0ba 100644
--- a/test/rdoc/test_rdoc_text.rb
+++ b/test/rdoc/test_rdoc_text.rb
@@ -1,35 +1,14 @@
-# coding: utf-8
+require 'rubygems'
+require 'minitest/autorun'
+require 'rdoc'
+require 'rdoc/text'
+require 'rdoc/markup'
+require 'rdoc/markup/formatter'
-require 'rdoc/test_case'
-
-class TestRDocText < RDoc::TestCase
+class TestRDocText < MiniTest::Unit::TestCase
include RDoc::Text
- def setup
- super
-
- @options = RDoc::Options.new
-
- @top_level = @store.add_file 'file.rb'
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_self_encode_fallback
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- assert_equal '…',
- RDoc::Text::encode_fallback('…', Encoding::UTF_8, '...')
- assert_equal '...',
- RDoc::Text::encode_fallback('…', Encoding::US_ASCII, '...')
- end
-
def test_expand_tabs
assert_equal("hello\n dave",
expand_tabs("hello\n dave"), 'spaces')
@@ -63,28 +42,13 @@ class TestRDocText < RDoc::TestCase
assert_equal('. .',
expand_tabs(".\t\t."), 'dot tab tab dot')
-
- assert_equal('a a',
- Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
- end
-
- def test_expand_tabs_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- inn = "hello\ns\tdave"
- inn.force_encoding Encoding::BINARY
-
- out = expand_tabs inn
-
- assert_equal "hello\ns dave", out
- assert_equal Encoding::BINARY, out.encoding
end
def test_flush_left
text = <<-TEXT
-
+
we don't worry too much.
-
+
The comments associated with
TEXT
@@ -98,44 +62,13 @@ The comments associated with
assert_equal expected, flush_left(text)
end
- def test_flush_left_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- text = <<-TEXT
-
- we don't worry too much.
-
- The comments associated with
- TEXT
-
- text.force_encoding Encoding::US_ASCII
-
- expected = <<-EXPECTED
-
-we don't worry too much.
-
-The comments associated with
- EXPECTED
-
- result = flush_left text
-
- assert_equal expected, result
- assert_equal Encoding::US_ASCII, result.encoding
- end
-
- def test_markup_string
- out = markup('hi').gsub("\n", '')
+ def test_markup
+ def formatter() RDoc::Markup::ToHtml.new end
- assert_equal '<p>hi</p>', out
+ assert_equal "<p>\nhi\n</p>\n", markup('hi')
end
- def test_markup_comment
- out = markup(comment('hi')).gsub("\n", '')
-
- assert_equal '<p>hi</p>', out
- end
-
- def test_normalize_comment_hash
+ def test_normalize_comment
text = <<-TEXT
##
# we don't worry too much.
@@ -152,57 +85,10 @@ The comments associated with
assert_equal expected, normalize_comment(text)
end
- def test_normalize_comment_stars_single_space
- text = <<-TEXT
-/*
- * we don't worry too much.
- *
- * The comments associated with
- */
- TEXT
-
- expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
- EXPECTED
-
- assert_equal expected, normalize_comment(text)
- end
-
- def test_normalize_comment_stars_single_double_space
- text = <<-TEXT
-/*
- * we don't worry too much.
- *
- * The comments associated with
- */
- TEXT
-
- expected = <<-EXPECTED.rstrip
-we don't worry too much.
-
-The comments associated with
- EXPECTED
-
- assert_equal expected, normalize_comment(text)
- end
-
def test_parse
assert_kind_of RDoc::Markup::Document, parse('hi')
end
- def test_parse_comment
- expected = RDoc::Markup::Document.new
- expected.file = @top_level
-
- c = comment ''
- parsed = parse c
-
- assert_equal expected, parsed
- assert_same parsed, parse(c)
- end
-
def test_parse_document
assert_equal RDoc::Markup::Document.new, parse(RDoc::Markup::Document.new)
end
@@ -215,92 +101,10 @@ The comments associated with
assert_equal RDoc::Markup::Document.new, parse("#\n")
end
- def test_parse_format_markdown
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('it _works_'))
-
- parsed = parse 'it *works*', 'markdown'
-
- assert_equal expected, parsed
- end
-
- def test_parse_format_rd
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('it <em>works</em>'))
-
- parsed = parse 'it ((*works*))', 'rd'
-
- assert_equal expected, parsed
- end
-
- def test_parse_format_tomdoc
- code = verb('1 + 1')
- code.format = :ruby
-
- expected =
- doc(
- para('It does a thing'),
- blank_line,
- head(3, 'Examples'),
- blank_line,
- code)
-
- text = <<-TOMDOC
-It does a thing
-
-Examples
-
- 1 + 1
- TOMDOC
-
- parsed = parse text, 'tomdoc'
-
- assert_equal expected, parsed
- end
-
def test_parse_newline
assert_equal RDoc::Markup::Document.new, parse("\n")
end
-# def test_snippet
-# text = <<-TEXT
-#This is one-hundred characters or more of text in a single paragraph. This
-#paragraph will be cut off some point after the one-hundredth character.
-# TEXT
-#
-# expected = text.gsub(/\r?\n/, ' ').sub(/ some point.*/, '')
-#
-# assert_equal expected, snippet(text)
-# end
-#
-# def test_snippet_comment
-# c = comment 'This is a comment'
-#
-# assert_equal 'This is a comment', snippet(c)
-# end
-#
-# def test_snippet_no_space
-# text = <<-TEXT.strip
-#This is one-hundred characters or more of text in a single paragraph. This
-#paragraph will not be cut
-# TEXT
-#
-# expected = <<-EXPECTED.strip.gsub(/\r?\n/, ' ')
-#This is one-hundred characters or more of text in a single paragraph. This
-#paragraph will not be cut
-# EXPECTED
-#
-# assert_equal expected, snippet(text)
-# end
-#
-# def test_snippet_short
-# text = 'This is a comment'
-#
-# assert_equal text.dup, snippet(text)
-# end
-
def test_strip_hashes
text = <<-TEXT
##
@@ -310,40 +114,15 @@ Examples
TEXT
expected = <<-EXPECTED
-
+
we don't worry too much.
-
+
The comments associated with
EXPECTED
assert_equal expected, strip_hashes(text)
end
- def test_strip_hashes_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- text = <<-TEXT
-##
-# we don't worry too much.
-#
-# The comments associated with
- TEXT
-
- text.force_encoding Encoding::CP852
-
- expected = <<-EXPECTED
-
- we don't worry too much.
-
- The comments associated with
- EXPECTED
-
- stripped = strip_hashes text
-
- assert_equal expected, stripped
- assert_equal Encoding::CP852, stripped.encoding
- end
-
def test_strip_newlines
assert_equal ' ', strip_newlines("\n \n")
@@ -354,21 +133,6 @@ Examples
assert_equal 'hi', strip_newlines("\n\nhi\n\n")
end
- def test_strip_newlines_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- assert_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
-
- text = " \n"
- text.force_encoding Encoding::US_ASCII
-
- stripped = strip_newlines text
-
- assert_equal ' ', stripped
-
- assert_equal Encoding::US_ASCII, stripped.encoding
- end
-
def test_strip_stars
text = <<-TEXT
/*
@@ -379,193 +143,15 @@ Examples
TEXT
expected = <<-EXPECTED
-
+
* we don't worry too much.
-
+
The comments associated with
+
EXPECTED
assert_equal expected, strip_stars(text)
end
- def test_strip_stars_document_method
- text = <<-TEXT
-/*
- * Document-method: Zlib::GzipFile#mtime=
- *
- * A comment
- */
- TEXT
-
- expected = <<-EXPECTED
-
- A comment
- EXPECTED
-
- assert_equal expected, strip_stars(text)
- end
-
- def test_strip_stars_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
- TEXT
-
- text.force_encoding Encoding::CP852
-
- expected = <<-EXPECTED
-
- * we don't worry too much.
-
- The comments associated with
- EXPECTED
-
- result = strip_stars text
-
- assert_equal expected, result
- assert_equal Encoding::CP852, result.encoding
- end
-
- def test_strip_stars_encoding2
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- text = <<-TEXT
-/*
- * * we don't worry too much.
- *
- * The comments associated with
- */
- TEXT
-
- text.force_encoding Encoding::BINARY
-
- expected = <<-EXPECTED
-
- * we don't worry too much.
-
- The comments associated with
- EXPECTED
-
- result = strip_stars text
-
- assert_equal expected, result
- assert_equal Encoding::BINARY, result.encoding
- end
-
- def test_strip_stars_no_stars
- text = <<-TEXT
-* we don't worry too much.
-
-The comments associated with
-
- TEXT
-
- expected = <<-EXPECTED
-* we don't worry too much.
-
-The comments associated with
-
- EXPECTED
-
- assert_equal expected, strip_stars(text)
- end
-
- def test_to_html_apostrophe
- assert_equal '‘a', to_html("'a")
- assert_equal 'a’', to_html("a'")
-
- assert_equal '‘a’ ‘', to_html("'a' '")
- end
-
- def test_to_html_backslash
- assert_equal 'S', to_html('\\S')
- end
-
- def test_to_html_br
- assert_equal '<br>', to_html('<br>')
- end
-
- def test_to_html_copyright
- assert_equal '©', to_html('(c)')
- end
-
- def test_to_html_dash
- assert_equal '-', to_html('-')
- assert_equal '–', to_html('--')
- assert_equal '—', to_html('---')
- assert_equal '—-', to_html('----')
- end
-
- def test_to_html_double_backtick
- assert_equal '“a', to_html('``a')
- assert_equal '“a“', to_html('``a``')
- end
-
- def test_to_html_double_quote
- assert_equal '“a', to_html('"a')
- assert_equal '“aâ€', to_html('"a"')
- end
-
- def test_to_html_double_quote_quot
- assert_equal '“a', to_html('&quot;a')
- assert_equal '“aâ€', to_html('&quot;a&quot;')
- end
-
- def test_to_html_double_tick
- assert_equal 'â€a', to_html("''a")
- assert_equal 'â€aâ€', to_html("''a''")
- end
-
- def test_to_html_ellipsis
- assert_equal '..', to_html('..')
- assert_equal '…', to_html('...')
- assert_equal '.…', to_html('....')
- end
-
- def test_to_html_encoding
- skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
- s = '...(c)'.encode Encoding::Shift_JIS
-
- html = to_html s
-
- assert_equal Encoding::Shift_JIS, html.encoding
-
- expected = '…(c)'.encode Encoding::Shift_JIS
-
- assert_equal expected, html
- end
-
- def test_to_html_html_tag
- assert_equal '<a href="http://example">hi’s</a>',
- to_html('<a href="http://example">hi\'s</a>')
- end
-
- def test_to_html_registered_trademark
- assert_equal '®', to_html('(r)')
- end
-
- def test_to_html_tt_tag
- assert_equal '<tt>hi\'s</tt>', to_html('<tt>hi\'s</tt>')
- assert_equal '<tt>hi\\\'s</tt>', to_html('<tt>hi\\\\\'s</tt>')
- end
-
- def test_to_html_tt_tag_mismatch
- _, err = verbose_capture_io do
- assert_equal '<tt>hi', to_html('<tt>hi')
- end
-
- assert_equal "mismatched <tt> tag\n", err
- end
-
- def formatter()
- RDoc::Markup::ToHtml.new @options
- end
-
end
diff --git a/test/rdoc/test_rdoc_token_stream.rb b/test/rdoc/test_rdoc_token_stream.rb
deleted file mode 100644
index 3c1a225c25..0000000000
--- a/test/rdoc/test_rdoc_token_stream.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocTokenStream < RDoc::TestCase
-
- def test_class_to_html
- tokens = [
- RDoc::RubyToken::TkCONSTANT. new(0, 0, 0, 'CONSTANT'),
- RDoc::RubyToken::TkDEF. new(0, 0, 0, 'KW'),
- RDoc::RubyToken::TkIVAR. new(0, 0, 0, 'IVAR'),
- RDoc::RubyToken::TkOp. new(0, 0, 0, 'Op'),
- RDoc::RubyToken::TkId. new(0, 0, 0, 'Id'),
- RDoc::RubyToken::TkNode. new(0, 0, 0, 'Node'),
- RDoc::RubyToken::TkCOMMENT. new(0, 0, 0, 'COMMENT'),
- RDoc::RubyToken::TkREGEXP. new(0, 0, 0, 'REGEXP'),
- RDoc::RubyToken::TkSTRING. new(0, 0, 0, 'STRING'),
- RDoc::RubyToken::TkVal. new(0, 0, 0, 'Val'),
- RDoc::RubyToken::TkBACKSLASH.new(0, 0, 0, '\\'),
- ]
-
- expected = [
- '<span class="ruby-constant">CONSTANT</span>',
- '<span class="ruby-keyword">KW</span>',
- '<span class="ruby-ivar">IVAR</span>',
- '<span class="ruby-operator">Op</span>',
- '<span class="ruby-identifier">Id</span>',
- '<span class="ruby-node">Node</span>',
- '<span class="ruby-comment">COMMENT</span>',
- '<span class="ruby-regexp">REGEXP</span>',
- '<span class="ruby-string">STRING</span>',
- '<span class="ruby-value">Val</span>',
- '\\'
- ].join
-
- assert_equal expected, RDoc::TokenStream.to_html(tokens)
- end
-
- def test_class_to_html_empty
- assert_equal '', RDoc::TokenStream.to_html([])
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_tom_doc.rb b/test/rdoc/test_rdoc_tom_doc.rb
deleted file mode 100644
index b22411f89f..0000000000
--- a/test/rdoc/test_rdoc_tom_doc.rb
+++ /dev/null
@@ -1,492 +0,0 @@
-require 'rdoc/test_case'
-
-class TestRDocTomDoc < RDoc::TestCase
-
- def setup
- super
-
- @top_level = @store.add_file 'file.rb'
-
- @TD = RDoc::TomDoc
- @td = @TD.new
- end
-
- def mu_pp obj
- s = ''
- s = PP.pp obj, s
- s = s.force_encoding Encoding.default_external if defined? Encoding
- s.chomp
- end
-
- def test_class_add_post_processor
- RDoc::TomDoc.add_post_processor
-
- pp = RDoc::Markup::PreProcess.new __FILE__, []
-
- text = "# Public: Do some stuff\n"
-
- comment = RDoc::Comment.new text, nil
- comment.format = 'tomdoc'
-
- parent = RDoc::Context.new
-
- pp.handle comment, parent
-
- method = parent.add_method RDoc::AnyMethod.new(nil, 'm')
-
- assert_equal 'Public', method.section.title
- assert_equal "# Do some stuff\n", comment.text
- end
-
- def test_class_signature
- c = comment <<-COMMENT
-Signature
-
- method_<here>(args)
-
-here - something
- COMMENT
- c.format = 'tomdoc'
-
- signature = @TD.signature c
-
- assert_equal "method_<here>(args)\n", signature
- end
-
- def test_class_signature_no_space
- c = comment <<-COMMENT
-Signature
- method_<here>(args)
-
-here - something
- COMMENT
- c.format = 'tomdoc'
-
- signature = @TD.signature c
-
- assert_equal "method_<here>(args)\n", signature
-
- expected =
- doc(
- head(3, 'Signature'),
- list(:NOTE,
- item(%w[here],
- para('something'))))
- expected.file = @top_level
-
- assert_equal expected, c.parse
- end
-
- def test_class_signature_none
- c = comment ''
- c.format = 'tomdoc'
-
- assert_nil @TD.signature c
- end
-
- def test_class_rdoc
- c = comment <<-COMMENT
-=== Signature
-
- method_<here>(args)
-
-here - something
- COMMENT
- c.format = 'rdoc'
-
- signature = @TD.signature c
-
- assert_nil signature
- end
-
- def test_class_signature_two_space
- c = comment <<-COMMENT
-Signature
-
-
- method_<here>(args)
-
-here - something
- COMMENT
- c.format = 'tomdoc'
-
- signature = @TD.signature c
-
- assert_equal "method_<here>(args)\n", signature
-
- expected =
- doc(
- head(3, 'Signature'),
- list(:NOTE,
- item(%w[here],
- para('something'))))
- expected.file = @top_level
-
- assert_equal expected, c.parse
- end
-
- def test_parse_paragraph
- text = "Public: Do some stuff\n"
-
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('Do some stuff'))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_arguments
- text = <<-TEXT
-Create new Arg object.
-
-name - name of argument
-description - arguments description
- TEXT
-
- expected =
- doc(
- para('Create new Arg object.'),
- blank_line,
- list(:NOTE,
- item(%w[name],
- para('name of argument')),
- item(%w[description],
- para('arguments description'))))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_arguments_array
- text = <<-TEXT
-Create new Arg object.
-
-names[] - names of arguments
- TEXT
-
- expected =
- doc(
- para('Create new Arg object.'),
- blank_line,
- list(:NOTE,
- item(%w[names[]],
- para('names of arguments'))))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_arguments_multiline
- text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
- and is more than one line
- TEXT
-
- expected =
- doc(
- para('Do some stuff'),
- blank_line,
- list(:NOTE,
- item(%w[foo],
- para('A comment goes here', 'and is more than one line'))))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_arguments_nested
- text = <<-TEXT
-Do some stuff
-
-foo - A comment goes here
- :bar - bar documentation
- TEXT
-
- expected =
- doc(
- para('Do some stuff'),
- blank_line,
- list(:NOTE,
- item(%w[foo],
- para('A comment goes here'),
- list(:NOTE,
- item(%w[:bar],
- para('bar documentation'))))))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_examples
- text = <<-TEXT
-Do some stuff
-
-Examples
-
- 1 + 1
- TEXT
-
- code = verb("1 + 1\n")
- code.format = :ruby
-
- expected =
- doc(
- para('Do some stuff'),
- blank_line,
- head(3, 'Examples'),
- blank_line,
- code)
-
- document = @TD.parse(text)
- assert_equal expected, document
- assert document.parts.last.ruby?
- end
-
- def test_parse_examples_signature
- text = <<-TEXT
-Do some stuff
-
-Examples
-
- 1 + 1
-
-Signature
-
- foo(args)
- TEXT
-
- code1 = verb("1 + 1\n")
- code1.format = :ruby
-
- code2 = verb("foo(args)\n")
-
- expected =
- doc(
- para('Do some stuff'),
- blank_line,
- head(3, 'Examples'),
- blank_line,
- code1,
- head(3, 'Signature'),
- blank_line,
- code2)
-
- document = @TD.parse text
-
- assert_equal expected, document
- end
-
- def test_parse_returns
- text = <<-TEXT
-Do some stuff
-
-Returns a thing
- TEXT
-
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('Do some stuff'),
- @RM::BlankLine.new,
- @RM::Paragraph.new('Returns a thing'))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_returns_multiline
- text = <<-TEXT
-Do some stuff
-
-Returns a thing
- that is multiline
- TEXT
-
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('Do some stuff'),
- @RM::BlankLine.new,
- @RM::Paragraph.new('Returns a thing', 'that is multiline'))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_parse_signature
- text = <<-TEXT
-Do some stuff
-
-Signature
-
- some_method(args)
- TEXT
-
- expected =
- @RM::Document.new(
- @RM::Paragraph.new('Do some stuff'),
- @RM::BlankLine.new,
- @RM::Heading.new(3, 'Signature'),
- @RM::BlankLine.new,
- @RM::Verbatim.new("some_method(args)\n"))
-
- assert_equal expected, @TD.parse(text)
- end
-
- def test_tokenize_paragraph
- @td.tokenize "Public: Do some stuff\n"
-
- expected = [
- [:TEXT, "Do some stuff", 0, 0],
- [:NEWLINE, "\n", 13, 0],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_arguments
- @td.tokenize <<-TEXT
-Create new Arg object.
-
-name - name of argument
-description - arguments description
- TEXT
-
- expected = [
- [:TEXT, "Create new Arg object.", 0, 0],
- [:NEWLINE, "\n", 22, 0],
- [:NEWLINE, "\n", 0, 1],
- [:NOTE, "name", 0, 2],
- [:TEXT, "name of argument", 14, 2],
- [:NEWLINE, "\n", 30, 2],
- [:NOTE, "description", 0, 3],
- [:TEXT, "arguments description", 14, 3],
- [:NEWLINE, "\n", 35, 3],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_arguments_array
- @td.tokenize <<-TEXT
-Create new Arg object.
-
-names[stuff] - names of arguments
- TEXT
-
- expected = [
- [:TEXT, "Create new Arg object.", 0, 0],
- [:NEWLINE, "\n", 22, 0],
- [:NEWLINE, "\n", 0, 1],
- [:NOTE, "names[stuff]", 0, 2],
- [:TEXT, "names of arguments", 15, 2],
- [:NEWLINE, "\n", 33, 2],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_arguments_multiline
- @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
- and is more than one line
- TEXT
-
- expected = [
- [:TEXT, "Do some stuff", 0, 0],
- [:NEWLINE, "\n", 13, 0],
- [:NEWLINE, "\n", 0, 1],
- [:NOTE, "foo", 0, 2],
- [:TEXT, "A comment goes here", 6, 2],
- [:NEWLINE, "\n", 25, 2],
- [:TEXT, "and is more than one line", 2, 3],
- [:NEWLINE, "\n", 27, 3],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_arguments_nested
- @td.tokenize <<-TEXT
-Do some stuff
-
-foo - A comment goes here
- :bar - bar documentation
- TEXT
-
- expected = [
- [:TEXT, "Do some stuff", 0, 0],
- [:NEWLINE, "\n", 13, 0],
- [:NEWLINE, "\n", 0, 1],
- [:NOTE, "foo", 0, 2],
- [:TEXT, "A comment goes here", 6, 2],
- [:NEWLINE, "\n", 25, 2],
- [:NOTE, ":bar", 6, 3],
- [:TEXT, "bar documentation", 13, 3],
- [:NEWLINE, "\n", 30, 3],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_examples
- @td.tokenize <<-TEXT
-Do some stuff
-
-Examples
-
- 1 + 1
- TEXT
-
- expected = [
- [:TEXT, "Do some stuff", 0, 0],
- [:NEWLINE, "\n", 13, 0],
- [:NEWLINE, "\n", 0, 1],
- [:HEADER, 3, 0, 2],
- [:TEXT, "Examples", 0, 2],
- [:NEWLINE, "\n", 8, 2],
- [:NEWLINE, "\n", 0, 3],
- [:TEXT, "1 + 1", 2, 4],
- [:NEWLINE, "\n", 7, 4],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_returns
- @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
- TEXT
-
- expected = [
- [:TEXT, "Do some stuff", 0, 0],
- [:NEWLINE, "\n", 13, 0],
- [:NEWLINE, "\n", 0, 1],
- [:TEXT, "Returns a thing", 0, 2],
- [:NEWLINE, "\n", 15, 2],
- ]
-
- assert_equal expected, @td.tokens
- end
-
- def test_tokenize_returns_multiline
- @td.tokenize <<-TEXT
-Do some stuff
-
-Returns a thing
- that is multiline
- TEXT
-
- expected = [
- [:TEXT, "Do some stuff", 0, 0],
- [:NEWLINE, "\n", 13, 0],
- [:NEWLINE, "\n", 0, 1],
- [:TEXT, "Returns a thing", 0, 2],
- [:NEWLINE, "\n", 15, 2],
- [:TEXT, "that is multiline", 2, 3],
- [:NEWLINE, "\n", 19, 3],
- ]
-
- assert_equal expected, @td.tokens
- end
-
-end
-
diff --git a/test/rdoc/test_rdoc_top_level.rb b/test/rdoc/test_rdoc_top_level.rb
index f3ee6a4784..b96b74c182 100644
--- a/test/rdoc/test_rdoc_top_level.rb
+++ b/test/rdoc/test_rdoc_top_level.rb
@@ -1,3 +1,5 @@
+require 'rubygems'
+require 'minitest/autorun'
require File.expand_path '../xref_test_case', __FILE__
class TestRDocTopLevel < XrefTestCase
@@ -5,136 +7,77 @@ class TestRDocTopLevel < XrefTestCase
def setup
super
- @top_level = @store.add_file 'path/top_level.rb'
- @top_level.parser = RDoc::Parser::Ruby
+ @top_level = RDoc::TopLevel.new 'path/top_level.rb'
end
- def test_initialize
- t = RDoc::TopLevel.new 'path/file.rb'
+ def test_class_all_classes_and_modules
+ expected = %w[
+ C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1 M1 M1::M2
+ ]
- assert_equal 'path/file.rb', t.absolute_name
- assert_equal 'path/file.rb', t.relative_name
+ assert_equal expected,
+ RDoc::TopLevel.all_classes_and_modules.map { |m| m.full_name }.sort
end
- def test_initialize_relative
- t = RDoc::TopLevel.new 'path/file.rb', 'file.rb'
+ def test_class_classes
+ expected = %w[
+ C1 C2 C2::C3 C2::C3::H1 C3 C3::H1 C3::H2 C4 C4::C4 C5 C5::C1
+ ]
- assert_equal 'path/file.rb', t.absolute_name
- assert_equal 'file.rb', t.relative_name
+ assert_equal expected, RDoc::TopLevel.classes.map { |m| m.full_name }.sort
end
- def test_add_alias
- a = RDoc::Alias.new nil, 'old', 'new', nil
- @top_level.add_alias a
-
- object = @store.find_class_named 'Object'
- expected = { '#old' => [a] }
- assert_equal expected, object.unmatched_alias_lists
- assert_includes object.in_files, @top_level
+ def test_class_files
+ assert_equal %w[path/top_level.rb xref_data.rb],
+ RDoc::TopLevel.files.map { |m| m.full_name }.sort
end
- def test_add_alias_nodoc
- @top_level.document_self = false
+ def test_class_find_class_named
+ assert_equal @c1, RDoc::TopLevel.find_class_named('C1')
- a = RDoc::Alias.new nil, 'old', 'new', nil
- @top_level.add_alias a
-
- object = @store.find_class_named('Object')
- assert_empty object.unmatched_alias_lists
- assert_includes object.in_files, @top_level
+ assert_equal @c2_c3, RDoc::TopLevel.find_class_named('C2::C3')
end
- def test_add_constant
- const = RDoc::Constant.new 'C', nil, nil
- @top_level.add_constant const
+ def test_class_find_class_named_from
+ assert_equal @c5_c1, RDoc::TopLevel.find_class_named_from('C1', 'C5')
- object = @store.find_class_named 'Object'
- assert_equal [const], object.constants
- assert_includes object.in_files, @top_level
+ assert_equal @c1, RDoc::TopLevel.find_class_named_from('C1', 'C4')
end
- def test_add_constant_nodoc
- @top_level.document_self = false
-
- const = RDoc::Constant.new 'C', nil, nil
- @top_level.add_constant const
+ def test_class_find_class_or_module
+ assert_equal @m1, RDoc::TopLevel.find_class_or_module('M1')
+ assert_equal @c1, RDoc::TopLevel.find_class_or_module('C1')
- object = @store.find_class_named 'Object'
- assert_empty object.constants
- assert_includes object.in_files, @top_level
+ assert_equal @m1, RDoc::TopLevel.find_class_or_module('::M1')
+ assert_equal @c1, RDoc::TopLevel.find_class_or_module('::C1')
end
- def test_add_include
- include = RDoc::Include.new 'C', nil
- @top_level.add_include include
-
- object = @store.find_class_named 'Object'
- assert_equal [include], object.includes
- assert_includes object.in_files, @top_level
+ def test_class_find_file_named
+ assert_equal @xref_data, RDoc::TopLevel.find_file_named(@file_name)
end
- def test_add_include_nodoc
- @top_level.document_self = false
-
- include = RDoc::Include.new 'C', nil
- @top_level.add_include include
-
- object = @store.find_class_named('Object')
- assert_empty object.includes
- assert_includes object.in_files, @top_level
+ def test_class_find_module_named
+ assert_equal @m1, RDoc::TopLevel.find_module_named('M1')
+ assert_equal @m1_m2, RDoc::TopLevel.find_module_named('M1::M2')
end
- def test_add_method
- method = RDoc::AnyMethod.new nil, 'm'
- @top_level.add_method method
-
- object = @store.find_class_named 'Object'
- assert_equal [method], object.method_list
- assert_includes object.in_files, @top_level
+ def test_class_modules
+ assert_equal %w[M1 M1::M2],
+ RDoc::TopLevel.modules.map { |m| m.full_name }.sort
end
- def test_add_method_stopdoc
- @top_level.document_self = false
+ def test_class_reset
+ RDoc::TopLevel.reset
- method = RDoc::AnyMethod.new nil, 'm'
- @top_level.add_method method
-
- object = @store.find_class_named('Object')
- assert_empty object.method_list
- assert_includes object.in_files, @top_level
+ assert_empty RDoc::TopLevel.classes
+ assert_empty RDoc::TopLevel.modules
+ assert_empty RDoc::TopLevel.files
end
def test_base_name
assert_equal 'top_level.rb', @top_level.base_name
end
- def test_display_eh
- refute @top_level.display?
-
- page = @store.add_file 'README.txt'
- page.parser = RDoc::Parser::Simple
-
- assert page.display?
- end
-
- def test_eql_eh
- top_level2 = @store.add_file 'path/top_level.rb'
- other_level = @store.add_file 'path/other_level.rb'
-
- assert_operator @top_level, :eql?, top_level2
-
- refute_operator other_level, :eql?, @top_level
- end
-
- def test_equals2
- top_level2 = @store.add_file 'path/top_level.rb'
- other_level = @store.add_file 'path/other_level.rb'
-
- assert_equal @top_level, top_level2
-
- refute_equal other_level, @top_level
- end
-
def test_find_class_or_module
assert_equal @c1, @xref_data.find_class_or_module('C1')
assert_equal @c2_c3, @xref_data.find_class_or_module('C2::C3')
@@ -146,142 +89,23 @@ class TestRDocTopLevel < XrefTestCase
assert_equal 'path/top_level.rb', @top_level.full_name
end
- def test_hash
- tl2 = @store.add_file 'path/top_level.rb'
- tl3 = @store.add_file 'other/top_level.rb'
-
- assert_equal @top_level.hash, tl2.hash
- refute_equal @top_level.hash, tl3.hash
- end
-
def test_http_url
assert_equal 'prefix/path/top_level_rb.html', @top_level.http_url('prefix')
end
def test_last_modified
- assert_equal nil, @top_level.last_modified
+ assert_equal 'Unknown', @top_level.last_modified
+
stat = Object.new
def stat.mtime() 0 end
@top_level.file_stat = stat
- assert_equal 0, @top_level.last_modified
- end
-
- def test_marshal_dump
- page = @store.add_file 'README.txt'
- page.parser = RDoc::Parser::Simple
- page.comment = RDoc::Comment.new 'This is a page', page
-
- loaded = Marshal.load Marshal.dump page
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('This is a page'))
- comment.file = loaded
-
- assert_equal page, loaded
-
- assert_equal 'README.txt', loaded.absolute_name
- assert_equal 'README.txt', loaded.relative_name
-
- assert_equal RDoc::Parser::Simple, loaded.parser
-
- assert_equal comment, loaded.comment
- end
- def test_marshal_load_version_0
- loaded = Marshal.load "\x04\bU:\x13RDoc::TopLevel" +
- "[\ti\x00I\"\x0FREADME.txt\x06:\x06EF" +
- "c\x19RDoc::Parser::Simple" +
- "o:\eRDoc::Markup::Document\a:\v@parts" +
- "[\x06o:\x1CRDoc::Markup::Paragraph\x06;\b" +
- "[\x06I\"\x13This is a page\x06;\x06F:\n@file@\a"
-
- comment = RDoc::Markup::Document.new(
- RDoc::Markup::Paragraph.new('This is a page'))
- comment.file = loaded
-
- assert_equal 'README.txt', loaded.absolute_name
- assert_equal 'README.txt', loaded.relative_name
-
- assert_equal RDoc::Parser::Simple, loaded.parser
-
- assert_equal comment, loaded.comment
-
- assert loaded.display?
+ assert_equal '0', @top_level.last_modified
end
def test_name
assert_equal 'top_level.rb', @top_level.name
end
- def test_page_name
- assert_equal 'top_level', @top_level.page_name
-
- tl = @store.add_file 'README.ja'
-
- assert_equal 'README.ja', tl.page_name
-
- tl = @store.add_file 'Rakefile'
-
- assert_equal 'Rakefile', tl.page_name
- end
-
- def test_page_name_trim_extension
- tl = @store.add_file 'README.ja.rdoc'
-
- assert_equal 'README.ja', tl.page_name
-
- tl = @store.add_file 'README.ja.md'
-
- assert_equal 'README.ja', tl.page_name
-
- tl = @store.add_file 'README.txt'
-
- assert_equal 'README', tl.page_name
- end
-
- def test_search_record
- assert_nil @xref_data.search_record
- end
-
- def test_search_record_page
- page = @store.add_file 'README.txt'
- page.parser = RDoc::Parser::Simple
- page.comment = 'This is a comment.'
-
- expected = [
- 'README',
- '',
- 'README',
- '',
- 'README_txt.html',
- '',
- "<p>This is a comment.\n",
- ]
-
- assert_equal expected, page.search_record
- end
-
- def test_text_eh
- refute @xref_data.text?
-
- rd = @store.add_file 'rd_format.rd'
- rd.parser = RDoc::Parser::RD
-
- assert rd.text?
-
- simple = @store.add_file 'simple.txt'
- simple.parser = RDoc::Parser::Simple
-
- assert simple.text?
- end
-
- def test_text_eh_no_parser
- refute @xref_data.text?
-
- rd = @store.add_file 'rd_format.rd'
-
- refute rd.text?
- end
-
end
diff --git a/test/rdoc/xref_data.rb b/test/rdoc/xref_data.rb
index 4525a293ab..ac1c39a915 100644
--- a/test/rdoc/xref_data.rb
+++ b/test/rdoc/xref_data.rb
@@ -2,13 +2,8 @@ XREF_DATA = <<-XREF_DATA
class C1
attr :attr
-
- # :section: separate
-
attr_reader :attr_reader
attr_writer :attr_writer
-
- # :section:
attr_accessor :attr_accessor
CONST = :const
@@ -18,15 +13,9 @@ class C1
def m foo
end
-
end
class C2
- def b
- end
-
- alias a b
-
class C3
def m
end
@@ -57,20 +46,9 @@ class C5
end
module M1
- def m
- end
end
module M1::M2
end
-
-class Parent
- def m() end
- def self.m() end
-end
-
-class Child < Parent
-end
-
XREF_DATA
diff --git a/test/rdoc/xref_test_case.rb b/test/rdoc/xref_test_case.rb
index 29021a301c..b40956684b 100644
--- a/test/rdoc/xref_test_case.rb
+++ b/test/rdoc/xref_test_case.rb
@@ -1,21 +1,26 @@
ENV['RDOC_TEST'] = 'yes'
+require 'rubygems'
+require 'minitest/autorun'
require 'rdoc'
+require 'rdoc/stats'
+require 'rdoc/options'
+require 'rdoc/code_objects'
+require 'rdoc/parser/ruby'
require File.expand_path '../xref_data', __FILE__
-class XrefTestCase < RDoc::TestCase
+class XrefTestCase < MiniTest::Unit::TestCase
def setup
- super
+ RDoc::TopLevel.reset
+
+ @file_name = 'xref_data.rb'
+ @xref_data = RDoc::TopLevel.new @file_name
@options = RDoc::Options.new
@options.quiet = true
- @file_name = 'xref_data.rb'
- @xref_data = @store.add_file @file_name
- @top_level = @xref_data
-
- stats = RDoc::Stats.new @store, 0
+ stats = RDoc::Stats.new 0
parser = RDoc::Parser::Ruby.new @xref_data, @file_name, XREF_DATA, @options,
stats
@@ -25,23 +30,16 @@ class XrefTestCase < RDoc::TestCase
generator = Object.new
def generator.class_dir() nil end
def generator.file_dir() nil end
- @rdoc.options = @options
- @rdoc.generator = generator
+ rdoc = RDoc::RDoc.new
+ RDoc::RDoc.current = rdoc
+ rdoc.generator = generator
@c1 = @xref_data.find_module_named 'C1'
@c1_m = @c1.method_list.last # C1#m
@c1__m = @c1.method_list.first # C1::m
@c2 = @xref_data.find_module_named 'C2'
- @c2_a = @c2.method_list.last
- @c2_b = @c2.method_list.first
-
@c2_c3 = @xref_data.find_module_named 'C2::C3'
- @c2_c3_m = @c2_c3.method_list.first # C2::C3#m
-
- @c2_c3_h1 = @xref_data.find_module_named 'C2::C3::H1'
- @c2_c3_h1_meh = @c2_c3_h1.method_list.first # C2::C3::H1#m?
-
@c3 = @xref_data.find_module_named 'C3'
@c4 = @xref_data.find_module_named 'C4'
@c4_c4 = @xref_data.find_module_named 'C4::C4'
@@ -50,15 +48,7 @@ class XrefTestCase < RDoc::TestCase
@c3_h2 = @xref_data.find_module_named 'C3::H2'
@m1 = @xref_data.find_module_named 'M1'
- @m1_m = @m1.method_list.first
-
@m1_m2 = @xref_data.find_module_named 'M1::M2'
-
- @parent = @xref_data.find_module_named 'Parent'
- @child = @xref_data.find_module_named 'Child'
-
- @parent_m = @parent.method_list.first # Parent#m
- @parent__m = @parent.method_list.last # Parent::m
end
end
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index 84cfcf2ae3..fc1e719462 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -1,5 +1,34 @@
begin
require "readline"
+=begin
+ class << Readline
+ [
+ "line_buffer",
+ "point",
+ "set_screen_size",
+ "get_screen_size",
+ "vi_editing_mode",
+ "emacs_editing_mode",
+ "completion_append_character=",
+ "completion_append_character",
+ "basic_word_break_characters=",
+ "basic_word_break_characters",
+ "completer_word_break_characters=",
+ "completer_word_break_characters",
+ "basic_quote_characters=",
+ "basic_quote_characters",
+ "completer_quote_characters=",
+ "completer_quote_characters",
+ "filename_quote_characters=",
+ "filename_quote_characters",
+ "refresh_line",
+ ].each do |method_name|
+ define_method(method_name.to_sym) do |*args|
+ raise NotImplementedError
+ end
+ end
+ end
+=end
rescue LoadError
else
require "test/unit"
@@ -7,14 +36,7 @@ else
end
class TestReadline < Test::Unit::TestCase
- INPUTRC = "INPUTRC"
-
- def setup
- @inputrc, ENV[INPUTRC] = ENV[INPUTRC], IO::NULL
- end
-
def teardown
- ENV[INPUTRC] = @inputrc
Readline.instance_variable_set("@completion_proc", nil)
end
@@ -48,12 +70,6 @@ class TestReadline < Test::Unit::TestCase
["point"],
["set_screen_size", 1, 1],
["get_screen_size"],
- ["pre_input_hook=", proc {}],
- ["pre_input_hook"],
- ["insert_text", ""],
- ["redisplay"],
- ["special_prefixes=", "$"],
- ["special_prefixes"],
]
method_args.each do |method_name, *args|
assert_raise(SecurityError, NotImplementedError,
@@ -69,7 +85,9 @@ class TestReadline < Test::Unit::TestCase
if !/EditLine/n.match(Readline::VERSION)
def test_readline
- with_temp_stdio do |stdin, stdout|
+ stdin = Tempfile.new("test_readline_stdin")
+ stdout = Tempfile.new("test_readline_stdout")
+ begin
stdin.write("hello\n")
stdin.close
stdout.close
@@ -96,9 +114,12 @@ class TestReadline < Test::Unit::TestCase
replace_stdio(stdin.path, stdout.path) { Readline.readline("> ") }
}.join
end
+ ensure
+ stdin.close(true)
+ stdout.close(true)
end
- end
-
+ end
+
# line_buffer
# point
def test_line_buffer__point
@@ -108,51 +129,36 @@ class TestReadline < Test::Unit::TestCase
rescue NotImplementedError
return
end
-
- with_temp_stdio do |stdin, stdout|
+
+ stdin = Tempfile.new("test_readline_stdin")
+ stdout = Tempfile.new("test_readline_stdout")
+ begin
actual_text = nil
actual_line_buffer = nil
actual_point = nil
- Readline.completion_proc = ->(text) {
+ Readline.completion_proc = proc { |text|
actual_text = text
actual_point = Readline.point
- actual_line_buffer = Readline.line_buffer
+ actual_buffer_line = Readline.line_buffer
stdin.write(" finish\n")
stdin.close
stdout.close
return ["complete"]
}
-
stdin.write("first second\t")
stdin.flush
- Readline.completion_append_character = " "
line = replace_stdio(stdin.path, stdout.path) {
Readline.readline("> ", false)
}
- assert_equal("second", actual_text)
- assert_equal("first second", actual_line_buffer)
- assert_equal(12, actual_point)
- assert_equal("first complete finish", Readline.line_buffer)
- assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
- assert_equal(true, Readline.line_buffer.tainted?)
- assert_equal(22, Readline.point)
-
- stdin.open
- stdout.open
-
- stdin.write("first second\t")
- stdin.flush
- Readline.completion_append_character = nil
- line = replace_stdio(stdin.path, stdout.path) {
- Readline.readline("> ", false)
- }
- assert_equal("second", actual_text)
assert_equal("first second", actual_line_buffer)
assert_equal(12, actual_point)
assert_equal("first complete finish", Readline.line_buffer)
assert_equal(Encoding.find("locale"), Readline.line_buffer.encoding)
assert_equal(true, Readline.line_buffer.tainted?)
assert_equal(21, Readline.point)
+ ensure
+ stdin.close(true)
+ stdout.close(true)
end
end
end
@@ -187,27 +193,6 @@ class TestReadline < Test::Unit::TestCase
end
end
- def test_completion_proc_empty_result
- with_temp_stdio do |stdin, stdout|
- stdin.write("first\t")
- stdin.flush
- Readline.completion_proc = ->(text) {[]}
- line1 = line2 = nil
- replace_stdio(stdin.path, stdout.path) {
- assert_nothing_raised(NoMemoryError) {line1 = Readline.readline("> ")}
- stdin.write("\n")
- stdin.flush
- assert_nothing_raised(NoMemoryError) {line2 = Readline.readline("> ")}
- }
- assert_equal("first", line1)
- assert_equal("", line2)
- begin
- assert_equal("", Readline.line_buffer)
- rescue NotimplementedError
- end
- end
- end if !/EditLine/n.match(Readline::VERSION)
-
def test_get_screen_size
begin
res = Readline.get_screen_size
@@ -265,53 +250,11 @@ class TestReadline < Test::Unit::TestCase
end
end
- def test_completion_encoding
- bug5941 = '[Bug #5941]'
- append_character = Readline.completion_append_character
- Readline.completion_append_character = ""
- completion_case_fold = Readline.completion_case_fold
- locale = Encoding.find("locale")
- if locale == Encoding::UTF_8
- enc1 = Encoding::EUC_JP
- else
- enc1 = Encoding::UTF_8
- end
- results = nil
- Readline.completion_proc = ->(text) {results}
-
- [%W"\u{3042 3042} \u{3042 3044}", %W"\u{fe5b fe5b} \u{fe5b fe5c}"].any? do |w|
- begin
- results = w.map {|s| s.encode(locale)}
- rescue Encoding::UndefinedConversionError
- end
- end or
- begin
- "\xa1\xa2".encode(Encoding::UTF_8, locale)
- rescue
- else
- results = %W"\xa1\xa1 \xa1\xa2".map {|s| s.force_encoding(locale)}
- end or
- skip("missing test for locale #{locale.name}")
- expected = results[0][0...1]
- Readline.completion_case_fold = false
- assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941)
- Readline.completion_case_fold = true
- assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941)
- results.map! {|s| s.encode(enc1)}
- assert_raise(Encoding::CompatibilityError, bug5941) do
- with_pipe {|r, w| w << "\t"}
- end
- ensure
- Readline.completion_case_fold = completion_case_fold
- Readline.completion_append_character = append_character
- end if !/EditLine/n.match(Readline::VERSION)
-
# basic_word_break_characters
# completer_word_break_characters
# basic_quote_characters
# completer_quote_characters
# filename_quote_characters
- # special_prefixes
def test_some_characters_methods
method_names = [
"basic_word_break_characters",
@@ -319,7 +262,6 @@ class TestReadline < Test::Unit::TestCase
"basic_quote_characters",
"completer_quote_characters",
"filename_quote_characters",
- "special_prefixes",
]
method_names.each do |method_name|
begin
@@ -341,104 +283,6 @@ class TestReadline < Test::Unit::TestCase
end
end
- def test_closed_outstream
- bug5803 = '[ruby-dev:45043]'
- IO.pipe do |r, w|
- Readline.input = r
- Readline.output = w
- (w << "##\t").close
- assert_raise(IOError, bug5803) {Readline.readline}
- end
- end
-
- def test_pre_input_hook
- begin
- pr = proc {}
- Readline.pre_input_hook = pr
- assert_equal(pr, Readline.pre_input_hook)
- Readline.pre_input_hook = nil
- assert_nil(Readline.pre_input_hook)
- rescue NotImplementedError
- end
- end
-
- def test_insert_text
- begin
- str = "test_insert_text"
- assert_equal(Readline, Readline.insert_text(str))
- assert_equal(str, Readline.line_buffer)
- assert_equal(get_default_internal_encoding,
- Readline.line_buffer.encoding)
- rescue NotImplementedError
- end
- end if !/EditLine/n.match(Readline::VERSION)
-
- def test_modify_text_in_pre_input_hook
- begin
- stdin = Tempfile.new("readline_redisplay_stdin")
- stdout = Tempfile.new("readline_redisplay_stdout")
- stdin.write("world\n")
- stdin.close
- Readline.pre_input_hook = proc do
- assert_equal("", Readline.line_buffer)
- Readline.insert_text("hello ")
- Readline.redisplay
- end
- replace_stdio(stdin.path, stdout.path) do
- line = Readline.readline("> ")
- assert_equal("hello world", line)
- end
- assert_equal("> hello world\n", stdout.read)
- stdout.close
- rescue NotImplementedError
- ensure
- begin
- Readline.pre_input_hook = nil
- rescue NotImplementedError
- end
- stdin.close(true)
- stdout.close(true)
- end
- end if !/EditLine|\A4\.3\z/n.match(Readline::VERSION)
-
- def test_input_metachar
- bug6601 = '[ruby-core:45682]'
- Readline::HISTORY << "hello"
- wo = nil
- line = with_pipe do |r, w|
- wo = w.dup
- wo.write("\C-re\ef\n")
- end
- assert_equal("hello", line, bug6601)
- ensure
- wo.close
- with_pipe {|r, w| w.write("\C-a\C-k\n")} # clear line_buffer
- Readline::HISTORY.clear
- end if !/EditLine/n.match(Readline::VERSION)
-
- def test_input_metachar_multibyte
- skip 'this test needs UTF-8 locale' unless Encoding.find("locale") == Encoding::UTF_8
- bug6602 = '[ruby-core:45683]'
- Readline::HISTORY << "\u3042\u3093"
- Readline::HISTORY << "\u3044\u3093"
- Readline::HISTORY << "\u3046\u3093"
- open(IO::NULL, 'w') do |null|
- IO.pipe do |r, w|
- Readline.input = r
- Readline.output = null
- w << "\cr\u3093\n\n"
- w << "\cr\u3042\u3093"
- w.reopen(IO::NULL)
- assert_equal("\u3046\u3093", Readline.readline("", true), bug6602)
- assert_equal("\u3042\u3093", Readline.readline("", true), bug6602)
- assert_equal(nil, Readline.readline("", true), bug6602)
- end
- end
- ensure
- with_pipe {|r, w| w.write("\C-a\C-k\n")} # clear line_buffer
- Readline::HISTORY.clear
- end if !/EditLine/n.match(Readline::VERSION)
-
private
def replace_stdio(stdin_path, stdout_path)
@@ -446,16 +290,13 @@ class TestReadline < Test::Unit::TestCase
open(stdout_path, "w"){|stdout|
orig_stdin = STDIN.dup
orig_stdout = STDOUT.dup
- orig_stderr = STDERR.dup
STDIN.reopen(stdin)
STDOUT.reopen(stdout)
- STDERR.reopen(stdout)
begin
Readline.input = STDIN
Readline.output = STDOUT
yield
ensure
- STDERR.reopen(orig_stderr)
STDIN.reopen(orig_stdin)
STDOUT.reopen(orig_stdout)
orig_stdin.close
@@ -465,34 +306,6 @@ class TestReadline < Test::Unit::TestCase
}
end
- def with_temp_stdio
- stdin = Tempfile.new("test_readline_stdin")
- stdout = Tempfile.new("test_readline_stdout")
- yield stdin, stdout
- ensure
- stdin.close(true) if stdin
- stdout.close(true) if stdout
- end
-
- def with_pipe
- stderr = nil
- IO.pipe do |r, w|
- yield(r, w)
- Readline.input = r
- Readline.output = w.reopen(IO::NULL)
- stderr = STDERR.dup
- STDERR.reopen(w)
- Readline.readline
- end
- ensure
- if stderr
- STDERR.reopen(stderr)
- stderr.close
- end
- Readline.input = STDIN
- Readline.output = STDOUT
- end
-
def get_default_internal_encoding
return Encoding.default_internal || Encoding.find("locale")
end
diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb
index e21d170cc3..a5d8c686da 100644
--- a/test/readline/test_readline_history.rb
+++ b/test/readline/test_readline_history.rb
@@ -94,7 +94,7 @@ class Readline::TestHistory < Test::Unit::TestCase
end
def test_get__out_of_range
- push_history(5)
+ lines = push_history(5)
invalid_indexes = [5, 6, 100, -6, -7, -100]
invalid_indexes.each do |i|
assert_raise(IndexError, "i=<#{i}>") do
@@ -113,7 +113,7 @@ class Readline::TestHistory < Test::Unit::TestCase
def test_set
begin
- push_history(5)
+ lines = push_history(5)
5.times do |i|
expected = "set: #{i}"
HISTORY[i] = expected
@@ -128,7 +128,7 @@ class Readline::TestHistory < Test::Unit::TestCase
HISTORY[0] = "set: 0"
end
- push_history(5)
+ lines = push_history(5)
invalid_indexes = [5, 6, 100, -6, -7, -100]
invalid_indexes.each do |i|
assert_raise(IndexError, NotImplementedError, "index=<#{i}>") do
@@ -277,7 +277,7 @@ class Readline::TestHistory < Test::Unit::TestCase
HISTORY.delete_at(0)
end
- push_history(5)
+ lines = push_history(5)
invalid_indexes = [5, 6, 100, -6, -7, -100]
invalid_indexes.each do |i|
assert_raise(IndexError, NotImplementedError, "index=<#{i}>") do
diff --git a/test/resolv/test_addr.rb b/test/resolv/test_addr.rb
index b4718430cc..84bc8c2d3b 100644
--- a/test/resolv/test_addr.rb
+++ b/test/resolv/test_addr.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'resolv'
require 'socket'
-require 'tempfile'
class TestResolvAddr < Test::Unit::TestCase
def test_invalid_ipv4_address
@@ -14,16 +13,4 @@ class TestResolvAddr < Test::Unit::TestCase
end
}
end
-
- def test_invalid_byte_comment
- bug9273 = '[ruby-core:59239] [Bug #9273]'
- Tempfile.open('resolv_test_addr_') do |tmpfile|
- tmpfile.print("\xff\x00\x40")
- tmpfile.close
- hosts = Resolv::Hosts.new(tmpfile.path)
- assert_nothing_raised(ArgumentError, bug9273) do
- hosts.each_address("") {break}
- end
- end
- end
end
diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb
index e91d127f35..0ab59665a3 100644
--- a/test/resolv/test_dns.rb
+++ b/test/resolv/test_dns.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'resolv'
require 'socket'
-require 'tempfile'
class TestResolvDNS < Test::Unit::TestCase
def setup
@@ -23,27 +22,7 @@ class TestResolvDNS < Test::Unit::TestCase
end
end
- # [ruby-core:65836]
- def test_resolve_with_2_ndots
- conf = Resolv::DNS::Config.new :nameserver => ['127.0.0.1'], :ndots => 2
- assert conf.single?
-
- candidates = []
- conf.resolv('example.com') { |candidate, *args|
- candidates << candidate
- raise Resolv::DNS::Config::NXDomain
- }
- n = Resolv::DNS::Name.create 'example.com.'
- assert_equal n, candidates.last
- end
-
def test_query_ipv4_address
- begin
- OpenSSL
- rescue LoadError
- skip 'autoload problem. see [ruby-dev:45021][Bug #5786]'
- end if defined?(OpenSSL)
-
with_udp('127.0.0.1', 0) {|u|
_, server_port, _, server_address = u.addr
begin
@@ -125,67 +104,4 @@ class TestResolvDNS < Test::Unit::TestCase
end
}
end
-
- def test_query_ipv4_address_timeout
- with_udp('127.0.0.1', 0) {|u|
- _, port , _, host = u.addr
- start = nil
- rv = Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns|
- dns.timeouts = 0.1
- start = Time.now
- dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A)
- }
- t2 = Time.now
- diff = t2 - start
- assert rv.empty?, "unexpected: #{rv.inspect} (expected empty)"
- assert_operator 0.1, :<=, diff
-
- rv = Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns|
- dns.timeouts = [ 0.1, 0.2 ]
- start = Time.now
- dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A)
- }
- t2 = Time.now
- diff = t2 - start
- assert rv.empty?, "unexpected: #{rv.inspect} (expected empty)"
- assert_operator 0.3, :<=, diff
- }
- end
-
- def test_no_server
- u = UDPSocket.new
- u.bind("127.0.0.1", 0)
- _, port, _, host = u.addr
- u.close
- # A rase condition here.
- # Another program may use the port.
- # But no way to prevent it.
- Resolv::DNS.open(:nameserver_port => [[host, port]]) {|dns|
- assert_equal([], dns.getresources("test-no-server.example.org", Resolv::DNS::Resource::IN::A))
- }
- end
-
- def test_invalid_byte_comment
- bug9273 = '[ruby-core:59239] [Bug #9273]'
- Tempfile.open('resolv_test_dns_') do |tmpfile|
- tmpfile.print("\xff\x00\x40")
- tmpfile.close
- assert_nothing_raised(ArgumentError, bug9273) do
- Resolv::DNS::Config.parse_resolv_conf(tmpfile.path)
- end
- end
- end
-
- def test_dots_diffences
- name1 = Resolv::DNS::Name.create("example.org")
- name2 = Resolv::DNS::Name.create("ex.ampl.eo.rg")
- assert_not_equal(name1, name2, "different dots")
- end
-
- def test_case_insensitive_name
- bug10550 = '[ruby-core:66498] [Bug #10550]'
- lower = Resolv::DNS::Name.create("ruby-lang.org")
- upper = Resolv::DNS::Name.create("Ruby-Lang.org")
- assert_equal(lower, upper, bug10550)
- end
end
diff --git a/test/resolv/test_resource.rb b/test/resolv/test_resource.rb
deleted file mode 100644
index 7ec17e33e7..0000000000
--- a/test/resolv/test_resource.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'test/unit'
-require 'resolv'
-
-class TestResolvResource < Test::Unit::TestCase
- def setup
- address = "192.168.0.1"
- @name1 = Resolv::DNS::Resource::IN::A.new(address)
- @name1.instance_variable_set(:@ttl, 100)
- @name2 = Resolv::DNS::Resource::IN::A.new(address)
- end
-
- def test_equality
- bug10857 = '[ruby-core:68128] [Bug #10857]'
- assert_equal(@name1, @name2, bug10857)
- end
-
- def test_hash
- bug10857 = '[ruby-core:68128] [Bug #10857]'
- assert_equal(@name1.hash, @name2.hash, bug10857)
- end
-end
diff --git a/test/rexml/data/euc.xml b/test/rexml/data/euc.xml
index a3c3419498..685f84b8b4 100644
--- a/test/rexml/data/euc.xml
+++ b/test/rexml/data/euc.xml
@@ -1,296 +1,296 @@
-<?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN">
-<html xml:lang="ja">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=euc-jp" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="author" content="U.Nakamura" />
-<link rev="made" href="mailto:usa@ruby-lang.org" />
-<link rel="StyleSheet" href="./ruby.css" type="text/css" />
-<title>Ruby-mswin32</title>
-</head>
-<body>
-
-<h1><a id="top">Ruby-mswin32</a></h1>
-<p>¤¢¤ë¤¤¤Ï¡¢Windows¤È¤Î½ª¤ï¤ê¤Ê¤­À襤 ;-(</p>
-<p>[ÆüËܸì / <a href="./index_en.html">English</a>]</p>
-
-
-
-<h2><a id="menu">¢§ Ìܼ¡</a></h2>
-<ul>
-<li><a href="#remark">Ãí°Õ»ö¹à</a></li>
-<li><a href="#ruby">Ruby¤È¤Ï?</a></li>
-<li><a href="#mswin32">mswin32ÈÇruby¤È¤Ï?</a></li>
-<li><a href="#download">¥Ð¥¤¥Ê¥ê ¥À¥¦¥ó¥í¡¼¥É</a></li>
-<li><a href="#install">¥¤¥ó¥¹¥È¡¼¥ë</a></li>
-<li><a href="#recent">ºÇ¶á¤Î½ÐÍè»ö</a></li>
-<li><a href="#link">¥ê¥ó¥¯</a></li>
-</ul>
-
-
-
-<h2><a id="remark">¢§ Ãí°Õ»ö¹à</a></h2>
-<p>¤³¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢mswin32ÈÇruby¤ÎÇÛÉÛ¤ÈÊѹ¹¾õ¶·¤Î¤ªÃΤ餻¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-<p>¤³¤³¤ÏÊ̤˸ø¼°¥Ú¡¼¥¸¤Ç¤â¤Ê¤ó¤Ç¤â¤Ê¤¯¤Æ¡¢»ä¤¬¾¡¼ê¤Ë½ñ¤¤¤Æ¤ë¥Ú¡¼¥¸¤Ç¤¹¡£¤³¤³¤ÇÆþ¼ê¤Ç¤­¤ë¥×¥í¥°¥é¥à¡¦¾ðÊó(̵¤¤¤ËÅù¤·¤¤¤±¤É)¤Ë¤Ä¤¤¤Æ¤Ï¡¢³Æ¼«¤ÎȽÃǤǤ´ÍøÍѤ¯¤À¤µ¤¤¡£<br />
-Ì䤤¹ç¤ï¤»¤Ï<a href="mailto:usa@ruby-lang.org">»ä</a>¤Ø¡£´Ö°ã¤Ã¤Æ¤â¾¤Î¿Í¤ËÌÂÏǤò¤«¤±¤ë¤è¤¦¤Ê¤³¤È¤Ï¤·¤Ê¤¤¤Ç¤Í¡£</p>
-
-
-
-<h2><a id="ruby">¢§ Ruby¤È¤Ï?</a></h2>
-<p><a href="http://www.ruby-lang.org/ja/">Ruby¤Î¥µ¥¤¥È</a>¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-
-
-<h2><a id="mswin32">¢§ mswin32ÈÇruby¤È¤Ï?</a></h2>
-<p>mswin32ÈÇruby¤È¤Ï¡¢32bitÈÇWindows(Windows95¡¦Windows98¡¦WindowsMe¡¦Windows NT¡¦Windows 2000¡¦WindowsXP¡¦Windows 2003 Server¡¢°Ê²¼Windows¤Èɽµ­)¾å¤Çưºî¤¹¤ëRuby¤Î¥Ð¥¤¥Ê¥ê¤Î°ì¤Ä¤Ç¤¹¡£<br />
-Windows¾å¤Çưºî¤¹¤ëRuby¤È¤·¤Æ¤Ï¡¢¸½ºß¡¢5¼ïÎà¤Î¥Ð¥¤¥Ê¥ê¤¬Â¸ºß¤·¤Þ¤¹¡£¤³¤ì¤é¤Ï¤½¤ì¤¾¤ìmswin32ÈÇ¡¦cygwinÈÇ¡¦mingw32ÈÇ¡¦bccwin32ÈÇ¡¦djgppÈÇ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£<br />
-¤½¤ì¤¾¤ì¤Î°ã¤¤¤ò¤Þ¤È¤á¤ë¤È°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹(»ö¼Â¸íǧ¤¬¤¢¤ì¤Ð¤ªÃΤ餻¤¯¤À¤µ¤¤)¡£</p>
-<dl>
-<dt><a id="label:1">mswin32ÈÇ</a></dt><dd>
-<p>VC++¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£Windows¤«¤é¸«¤ì¤Ð¤â¤Ã¤È¤â¡ÖÉáÄ̡פΥХ¤¥Ê¥ê¤È¸À¤¨¤ë¤¬¡¢È¿ÌÌ¡¢Ruby¤¬»ý¤ÄUNIX¤ÇÆÃħŪ¤Êµ¡Ç½¤Î°ìÉô¤¬»ÈÍѤǤ­¤Ê¤¤¡£1.7.3°Ê¹ß¤Ïmingw32ÈǤȳÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï¥Ð¥¤¥Ê¥ê¸ß´¹À­¤¬¤¢¤ë¡£<br />
-RUBY_PLATFORM¤Ï*-mswin32¡£</p>
-</dd>
-<dt><a id="label:2">cygwinÈÇ</a></dt><dd>
-<p>gcc¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¡¢<a href="http://sources.redhat.com/cygwin/">cygwin</a>´Ä¶­¤Çưºî¤¹¤ë¡£cygwin´Ä¶­¤¬UNIX¥é¥¤¥¯¤Ê´Ä¶­¤òWindows¾å¤Ç¹½ÃÛ¤¹¤ë¤â¤Î¤Ç¤¢¤ë¤Î¤Ç¡¢ÅöÁ³¡¢cygwinÈÇruby¤Ï°ìÈ̤ÎUNIXÍѤΤâ¤Î¤È¤À¤¤¤¿¤¤Æ±¤¸¤è¤¦¤Ëưºî¤¹¤ë(¤³¤È¤¬´üÂԤǤ­¤ë)¡£<br />
-RUBY_PLATFORM¤Ï*-cygwin¡£</p>
-</dd>
-<dt><a id="label:3">mingw32ÈÇ</a></dt><dd>
-<p>gcc¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£¥½¡¼¥¹¤Ï¤Û¤È¤ó¤Émswin32ÈǤȶ¦Ä̤Ǥ¢¤ê¡¢¥é¥ó¥¿¥¤¥à¥é¥¤¥Ö¥é¥ê¤â¶¦ÄÌ(MSVCRT.dll)¤Ê¤Î¤Ç¡¢Æ°ºî¤â(¤ª¤½¤é¤¯)mswin32ÈÇ¤È¤Û¤ÜÆ±¤¸¡£1.7.3°Ê¹ß¤Ïmswin32ÈǤȳÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï¥Ð¥¤¥Ê¥ê¸ß´¹À­¤¬¤¢¤ë¡£<br />
-RUBY_PLATFORM¤Ï*-mingw32¡£</p>
-</dd>
-<dt><a id="label:4">bccwin32ÈÇ</a></dt><dd>
-<p>BC++¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£¥½¡¼¥¹¤Ï¤«¤Ê¤ê¤ÎÉôʬ¤¬mswin32ÈǤȶ¦Ä̤ǤϤ¢¤ë¤¬¡¢¥é¥ó¥¿¥¤¥à¥é¥¤¥Ö¥é¥ê¤¬°Û¤Ê¤ë¤Î¤Ç¡¢ºÙ¤«¤¤¤È¤³¤í¤Çµóư¤¬mswin32ÈǤȤϰۤʤë(¤Ï¤º)¡£1.7°Ê¹ß¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ë¡£<br />
-RUBY_PLATFORM¤Ï*-bccwin32¡£</p>
-</dd>
-<dt><a id="label:5">djgppÈÇ</a></dt><dd>
-<p>DJGPP¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£DOSÍѤΥХ¤¥Ê¥ê¤Ê¤Î¤Ç¡¢¤â¤Á¤í¤óDOS¤Ç¤âưºî¤¹¤ë¡£È¿ÌÌ¡¢Windows¤Ë¤¢¤Ã¤ÆDOS¤Ë¤Ê¤¤µ¡Ç½¤Î¿¤¯¤¬»È¤¨¤Ê¤¤(¥Í¥Ã¥È¥ï¡¼¥¯´ØÏ¢¤Ê¤É)¡£<br />
-RUBY_PLATFORM¤Ï*-msdosdjgpp¡£</p>
-</dd>
-</dl>
-<p>¤³¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢¾åµ­¤Î¤¦¤Ámswin32ÈǤΤߤò°·¤Ã¤Æ¤¤¤Þ¤¹¡£<br />
-¤Ê¤ª¡¢cygwinÈÇ¡¦mingw32ÈÇ¡¦djgppÈǤˤĤ¤¤Æ¤Ï¤ï¤¿¤Ê¤Ù¤µ¤ó¤Î<a href="http://www.os.rim.or.jp/~eban/">Ruby binaries</a>¤«¤éÆþ¼ê²Äǽ¤Ç¤¹¡£¤Þ¤¿¡¢bccwin32ÈǤˤĤ¤¤Æ¤Ï¾®À¾¤µ¤ó¤Î<a href="http://www001.upp.so-net.ne.jp/konishi/ruby/index.htm">Ruby</a>¤«¤éÆþ¼ê²Äǽ¤Ç¤¹¡£</p>
-
-
-
-<h2><a id="download">¢§ ¥Ð¥¤¥Ê¥ê ¥À¥¦¥ó¥í¡¼¥É</a></h2>
-<p>¸½ºßÇÛÉÛÃæ¤ÎÁ´¤Æ¤Î¥Ð¥¤¥Ê¥ê¤ÏVC++ 5.0(Version 11.00.7022 for 80x86)¤Çmake¤·¤¿¤â¤Î¤Ç¤¹¡£ruby¼«ÂΤ˴ؤ·¤Æ¤Ï¡¢<a href="http://www.ruby-lang.org/ja/download.html">ɸ½àÇÛÉۤΥ½¡¼¥¹</a>(¤Þ¤¿¤Ï<a href="http://www.ruby-lang.org/~knu/cvsrepo-guide.html">CVS</a>¤Î¥½¡¼¥¹)¤«¤é¤½¤Î¤Þ¤ÞºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï³Æ¡¹¤Î¥ê¥ó¥¯Àè¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£<br />
-¤¤¤º¤ì¤Î¥Ð¥¤¥Ê¥ê¤âzip·Á¼°¤Ç¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-<p>md5sum¤Î¥Á¥§¥Ã¥¯ÊýË¡¤Ç¤¹¤¬¡¢Î㤨¤Ðruby¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤Ê¤é²¼µ­¤Î¤è¤¦¤ÊÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£<br />
-<code>ruby -r md5 -e "puts MD5.new(File.open('filename', 'rb').read).hexdigest"</code></p>
-
-
-
-<h3><a id="release">Release</a></h3>
-<ul>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.1-i386-mswin32.zip">ruby-1.8.1-i386-mswin32.zip</a> (3,764KB) <em>ºÇ¿·ReleaseÈÇ</em><br />
- ruby 1.8.1 (2003-12-25) [i386-mswin32]<br />
- md5sum : 6bbdabeb29f1a15fa69901e87d1108ac</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.0-i386-mswin32.zip">ruby-1.8.0-i386-mswin32.zip</a> (2,507KB)<br />
- ruby 1.8.0 (2003-08-04) [i386-mswin32]<br />
- md5sum : eaf9263062429fd4f722d9a70a38a9dc</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.8-i586-mswin32.zip">ruby-1.6.8-i586-mswin32.zip</a> (1,964KB)<br />
- ruby 1.6.8 (2002-12-24) [i586-mswin32]<br />
- md5sum : f704f1248ec25b96e3e1f3070afa915e</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.7-i586-mswin32.zip">ruby-1.6.7-i586-mswin32.zip</a> (1,972KB)<br />
- ruby 1.6.7 (2002-03-01) [i586-mswin32]<br />
- md5sum : ddedc40d0fc3b0ea1d6ac74f4976bfc6</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.6-i586-mswin32.zip">ruby-1.6.6-i586-mswin32.zip</a> (1,944KB)<br />
- ruby 1.6.6 (2001-12-26) [i586-mswin32]<br />
- md5sum : 96e0d1d19a37e5e7e50ae7ce99e34636</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.5-i586-mswin32.zip">ruby-1.6.5-i586-mswin32.zip</a> (1,896KB)<br />
- ruby 1.6.5 (2001-09-19) [i586-mswin32]<br />
- md5sum : c708ae98a05df2ff8dea5a70e3791bfa</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.4-i586-mswin32.zip">ruby-1.6.4-i586-mswin32.zip</a> (1,821KB)<br />
- ruby 1.6.4 (2001-06-04) [i586-mswin32]<br />
- md5sum : cf813ca19e40be164057b3562575e4da</li>
-</ul>
-
-
-
-
-
-
-
-<h3><a id="develop">Developing versions snapshots</a></h3>
-<ul>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.9.0-20040126-i386-mswin32.zip">ruby-1.9.0-20040126-i386-mswin32.zip</a> (3,849KB)<br />
- ruby 1.9.0 (2004-01-26) [i386-mswin32]<br />
- md5sum : fffafbf881cb6a85982220eae5a5b4f5</li>
-</ul>
-
-
-
-<h3><a id="stable">Stable versions snapshots</a></h3>
-<h4><a id="stable">1.8.0</a></h4>
-<ul>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.1-20040127-i386-mswin32.zip">ruby-1.8.1-20040127-i386-mswin32.zip</a> (3,822KB)<br />
- ruby 1.8.1 (2004-01-27) [i386-mswin32]<br />
- md5sum : 1fc0d5f53f0a75d0c6d1ca5d21082089</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.1-20031027-i386-mswin32.zip">ruby-1.8.1-20031027-i386-mswin32.zip</a> (3,075KB)<br />
- ruby 1.8.1 (2003-10-27) [i386-mswin32]<br />
- md5sum : 9dbdc644c529d207d0bda5d64478a5c4</li>
-</ul>
-<h4><a id="stable">1.6.8</a></h4>
-<ul>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.8-20030727-i586-mswin32.zip">ruby-1.6.8-20030727-i586-mswin32.zip</a> (2,093KB)<br />
- ruby 1.6.8 (2003-07-27) [i586-mswin32]<br />
- md5sum : 28c3b92b162319b3d6bc99c9996cad15</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.8-20030515-i586-mswin32.zip">ruby-1.6.8-20030515-i586-mswin32.zip</a> (2,091KB)<br />
- ruby 1.6.8 (2003-05-15) [i586-mswin32]<br />
- md5sum : e5f6558de261d111add4f657ad5e345f</li>
-</ul>
-
-
-
-<h3><a id="ext">Extension libraries</a></h3>
-<h4><a id="ext">1.8.0</a></h4>
-<ul>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/racc-1.4.4-all-i386-mswin32-1.8.zip">racc-1.4.4-all-i386-mswin32-1.8.zip</a> (70KB)<br />
- <a href="http://www.loveruby.net/en/racc.html">racc</a> 1.4.4-all (for ruby 1.8.1)<br />
- md5sum : 46c4d48b714fb1ded880e7e7af456b28</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vrswin-030906-i386-mswin32-1.8.zip">vrswin-030906-i386-mswin32-1.8.zip</a> (54KB)<br />
- <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (swin)</a> 030906 (for ruby 1.8.0)<br />
- md5sum : 11c2d30e2a05e9ea7e097ec7b066cedf</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vruby-030906-i386-mswin32-1.8.zip">vruby-030906-i386-mswin32-1.8.zip</a> (96KB)<br />
- <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (vruby)</a> 030906 (for ruby 1.8.0)<br />
- md5sum : 77a42995e42e869932f5fb282cc297ea</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/eruby-1.0.4-i386-mswin32-1.8.zip">eruby-1.0.4-i386-mswin32-1.8.zip</a> (75KB)<br />
- <a href="http://www.modruby.net/">eruby</a> 1.0.4 (for ruby 1.8.0)<br />
- md5sum : de7282647f015b1d20a28dcf7c2b8715</li>
-</ul>
-<h4><a id="ext">1.6.8</a></h4>
-<ul>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vrswin-030521-i586-mswin32-1.6.zip">vrswin-030521-i586-mswin32-1.6.zip</a> (55KB)<br />
- <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (swin)</a> 030521 (for ruby 1.6.8)<br />
- md5sum : eae3284c6f79be7a119858ff9e940985</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vruby-030517-i586-mswin32-1.6.zip">vruby-030517-i586-mswin32-1.6.zip</a> (95KB)<br />
- <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (vruby)</a> 030517 (for ruby 1.6.8)<br />
- md5sum : a32af752428cf3aa03000d66d8deca33</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/tmail-0.10.7-i586-mswin32-1.6.zip">tmail-0.10.7-i586-mswin32-1.6.zip</a> (160KB)<br />
- <a href="http://www.loveruby.net/en/tmail.html">TMail</a> 0.10.7 (for ruby 1.6.8)<br />
- md5sum : 74351ed81550dfbf3bfaf8252c316326</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/eruby-1.0.3-i586-mswin32-1.6.zip">eruby-1.0.3-i586-mswin32-1.6.zip</a> (74KB)<br />
- <a href="http://www.modruby.net/">eruby</a> 1.0.3 (for ruby 1.6.8)<br />
- md5sum : e05d654128422846f86ca84f55bf7bcb</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/rubywin-0.0.4.3-i586-mswin32-1.6.zip">rubywin-0.0.4.3-i586-mswin32-1.6.zip</a> (286KB)<br />
- <a href="http://homepage1.nifty.com/markey/ruby/rubywin/index_e.html">RubyWin</a> 0.0.4.3 (for ruby 1.6.8)<br />
- md5sum : 3f2226ef0c6e41b31c2f337f778e3e18</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/shim-20021224-i586-mswin32-1.6.zip">shim-20021224-i586-mswin32-1.6.zip</a> (138KB)<br />
- <a href="http://www.ruby-lang.org/~knu/cgi-bin/cvsweb.cgi/shim/">Ruby Shim</a> 20021224 (for ruby 1.6.8)<br />
- md5sum : 7ee4363195973a1df0584cb467e5ce82</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/racc-1.4.3-all-i586-mswin32-1.6.zip">racc-1.4.3-all-i586-mswin32-1.6.zip</a> (124KB)<br />
- <a href="http://www.loveruby.net/en/racc.html">racc</a> 1.4.3-all (for ruby 1.6.8)<br />
- md5sum : 1f093aabb464bef3074112949228a8c6</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/win32ole-0.5.2-i586-mswin32-1.6.zip">win32ole-0.5.2-i586-mswin32-1.6.zip</a> (59KB)<br />
- <a href="http://homepage1.nifty.com/markey/ruby/win32ole/index_e.html">Win32OLE</a> 0.5.2 (for ruby 1.6.8)&lt;<br />
- md5sum : 960f7205923a9243cff567d291b254ad</li>
-<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/uconv-0.4.11-i586-mswin32-1.6.zip">uconv-0.4.11-i586-mswin32-1.6.zip</a> (110KB)<br />
- <a href="http://www.yoshidam.net/Ruby.html#uconv">uconv</a> 0.4.11 (for ruby 1.6.8)<br />
- md5sum : c08f3662abee8e7186283741f89b88d7</li>
-</ul>
-
-
-
-<h2><a id="install">¢§ ¥¤¥ó¥¹¥È¡¼¥ë</a></h2>
-<p>¾åµ­¤Î¥Ð¥¤¥Ê¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ï¡¢¤ª¹¥¤ß¤Î¥Ç¥£¥ì¥¯¥È¥ê(°Ê²¼<code>$TOPDIR</code>¤Èµ­½Ò)¤ËŸ³«¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¥£¥ì¥¯¥È¥êÉÕ¤­¤Ç°µ½Ì¤µ¤ì¤Æ¤Þ¤¹¤Î¤Ç¡¢Å¸³«»þ¤Ë¤Ï¥Ç¥£¥ì¥¯¥È¥êÉÕ¤­¤ÇŸ³«¤¹¤ë¤Î¤ò˺¤ì¤º¤Ë(°ÕÌ£¤¬¤ï¤«¤é¤Ê¤¤¿Í¤Ïµ¤¤Ë¤·¤Ê¤¯¤Æ¤¤¤¤¤Ç¤¹)¡£<br />
-Ÿ³«¸å¤Ï¡¢<code>$TOPDIR\bin</code>¤Ë<code>PATH</code>¤òÄ̤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</p>
-<p>¤Ê¤ª¡¢°Ê²¼¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ï¡¢¤³¤ÎÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤Ê¤¤³°Éô¤Î¥é¥¤¥Ö¥é¥ê¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</p>
-<ul>
-<li>curses.so : PDCurses¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>dbm.so : GDBM¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>gdbm.so : GDBM¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>iconv.so : Iconv¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>openssl.so : OpenSSL¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>readline.so : readline¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>tcltklib.so : Tcl/Tk¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li>zlib.so : Zlib¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
-</ul>
-<p>¾åµ­¤Î¤¦¤Á¡¢PDCurses¡¦GDBM¡¦OpenSSL¡¦readline¡¦Zlib¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://jarp.jin.gr.jp/win32/">Porting Libraries to Win32</a>¤Ë¥Ð¥¤¥Ê¥ê¤¬Â¸ºß¤·¤Þ¤¹¡£<br />
-Iconv¤Ë¤Ä¤¤¤Æ¤Ï¡¢Meadowy.org¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë<a href="http://www.meadowy.org/meadow/dists/snapshot/iconv-1.8.win32.zip">iconv-1.8.win32.zip</a>¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£<br />
-Tcl/Tk¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://www.activestate.com/">ActiveState</a>¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë<a href="http://www.activestate.com/Products/ActiveTcl/">ActiveTcl</a>¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£</p>
-
-
-
-<h2><a id="recent">¢§ ºÇ¶á¤Î½ÐÍè»ö</a></h2>
-
-
-
-<h3><a id="d20040127">2004-01-27</a></h3>
-<p>¤¢¤±¤Þ¤·¤Æ¤ª¤á¤Ç¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£¤Ã¤ÆÃÙ¤¤¤è!</p>
-<p>ruby-1.8.1-20040127¤Èruby-1.9.0-20040126¤òÃÖ¤­¤Þ¤·¤¿¡£<br />
-Á°¼Ô¤Ï¼ç¤Ë1.8.1¥ê¥ê¡¼¥¹ÈǤÇȯ¸«¤µ¤ì¤¿ÉÔ¶ñ¹ç¤Î½¤Àµ¤Ç¤¹¡£¸å¼Ô¤Ï³«È¯ÈÇ¡£</p>
-
-<h3><a id="d20031225">2003-12-25</a></h3>
-<p>¥á¥ê¡¼¥¯¥ê¥¹¥Þ¥¹! ruby-1.8.1¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤Þ¤·¤¿!<br />
-(preview¤ò°ì¤ÄÈô¤Ð¤·¤Á¤ã¤¤¤Þ¤·¤¿¡¢¤´¤á¤ó¤Ê¤µ¤¤...)</p>
-
-<h3><a id="d20031206">2003-12-06</a></h3>
-<p>ruby-1.8.1-preview3¤òÃÖ¤­¤Þ¤·¤¿¡£»×¤¤¤Î¤Û¤«´Ö¤¬¶õ¤¤¤Á¤ã¤¤¤Þ¤·¤¿¤Í¡£</p>
-
-<h3><a id="d20031101">2003-11-01</a></h3>
-<p>ruby-1.8.1-preview2¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
-
-<h3><a id="d20031028">2003-10-28</a></h3>
-<p>ruby-1.8.1-20031027¤òÃÖ¤­¤Þ¤·¤¿¡£<br />
-racc-1.4.4-all¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
-
-<h3><a id="d20030907">2003-09-07</a></h3>
-<p>eruby-1.0.4¡¦vrswin-030906¡¦vruby-030906¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
-
-<h3><a id="d20030812">2003-08-12</a></h3>
-<p>ruby-1.8.0-20030812¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
-<p>vrswin-030811¡¦vruby-030811¤òÃÖ¤­¤Þ¤·¤¿¡£º£²ó¤«¤éÃÖ¤¯³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ÏÁ´¤Æ1.8ÍѤˤʤê¤Þ¤¹¡£</p>
-
-<h3><a id="d20030804">2003-08-04</a></h3>
-<p>ruby-1.8.0¤òÃÖ¤­¤Þ¤·¤¿¡£Ruby 1.8·ÏºÇ½é¤Î¥ê¥ê¡¼¥¹¤È¤Ê¤ê¤Þ¤¹¡£<br />
-1.6·Ï¤«¤é¤ÎÊѹ¹ÅÀ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="ftp://ftp.ruby-lang.org/pub/ruby/1.8/changes.1.8.0">changes.1.8.0</a>¤Ê¤É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
-
-<h3><a id="d20030731">2003-07-31</a></h3>
-<p>ruby-1.8.0-preview6¤òÃÖ¤­¤Þ¤·¤¿¡£¤¨¡¼¤È¡¢¤³¤ì¤ò´Þ¤á¤Æ¤¢¤È2²ópreview¤¬½Ð¤ëÌÏÍͤǤ¹ :)</p>
-
-<h3><a id="d20030728">2003-07-28</a></h3>
-<p>ruby-1.8.0-preview5¤òÃÖ¤­¤Þ¤·¤¿¡£¤ª¤½¤é¤¯¤³¤ì¤¬1.8.0¤ÎºÇ¸å¤Îpreview¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£<br />
-ruby-1.6.8-20030727¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
-
-
-
-<h3><a id="old">¤«¤Ä¤Æ¤Î½ÐÍè»ö</a></h3>
-<p><a href="./old.html">¤³¤Á¤é</a>¤ò¤É¤¦¤¾¡£</p>
-
-
-
-<h2><a id="link">¢§ ¥ê¥ó¥¯</a></h2>
-<p>mswin32ÈǤ˴ؤ¹¤ë(¤È»×¤ï¤ì¤ë)¥ê¥ó¥¯¤Ç¤¹¡£¾¡¼ê¤ËÄ¥¤Ã¤Æ¤Þ¤¹¤Î¤Ç¡¢ÉÔÅԹ礬¤¢¤ì¤Ð<a href="mailto:usa@osb.att.ne.jp">»ä</a>¤Þ¤Ç¤´Ï¢Íí¤¯¤À¤µ¤¤¡£</p>
-<ul>
-<li><a href="http://www.ruby-lang.org/">Ruby Home Page</a> (<a href="http://www.ruby-lang.org/ja/">ÆüËܸì</a> / <a href="http://www.ruby-lang.org/en/">English</a>)<br />
- ¸À¤ï¤º¤È¤·¤ì¤¿¡¢Ëܲȥµ¥¤¥È¡£</li>
-<li>»¨µ­Ä¢ (<a href="http://homepage1.nifty.com/markey/">ÆüËܸì</a> / <a href="http://homepage1.nifty.com/markey/index_e.html">English</a>)<br />
- ½õÅĤµ¤ó¤Î¥Ú¡¼¥¸¡£<a href="http://homepage1.nifty.com/markey/ruby/rubywin/index.html">RubWin</a>¡¦<a href="http://homepage1.nifty.com/markey/ruby/win32ole/index.html">Win32OLE</a>¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</li>
-<li><a href="http://www.moonwolf.com/ruby/">Script/Ruby</a> (ÆüËܸì)<br />
- MoonWolf¤µ¤ó¤Î¥Ú¡¼¥¸¡£Win32Module¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</li>
-<li>ActiveScriptRuby (<a href="http://www.geocities.co.jp/SiliconValley-PaloAlto/9251/ruby/index.html">ÆüËܸì</a> / <a href="http://www.geocities.co.jp/SiliconValley-PaloAlto/9251/ruby/main.html">English</a>)<br />
- arton¤µ¤ó¤Î¥Ú¡¼¥¸¡£WindowsÈÇRuby¤Î̤Íè¤Ï¤³¤³¤Ë¤¢¤ë¤Î¤«¤â¡£</li>
-<li>VisualuRuby·×²è(²¾¾Î) (<a href="http://www.osk.3web.ne.jp/~nyasu/software/vrproject.html">ÆüËܸì</a> / <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">English</a>)<br />
- nyasu¤µ¤ó¤Î¥Ú¡¼¥¸¡£VisualuRuby¤Ê¤É¤¬¤¢¤ê¤Þ¤¹(¤Ã¤Æ¤³¤ì¤â¤½¤Î¤Þ¤ó¤Þ)¡£Windows¤ÇRuby¤ò»È¤¦¤¿¤á¤Î<a href="http://www.osk.3web.ne.jp/~nyasu/software/rubyonwin.html">¥ê¥ó¥¯½¸</a>¤¬½¼¼Â¤·¤Æ¤Þ¤¹¡£¤Á¤Ê¤ß¤Ë¡¢Åö¥µ¥¤¥È¤Î¥Ç¥¶¥¤¥ó¤Ï¤³¤Á¤é¤Î¥Ñ¥¯¥ê¤Ç¤¹¡£Â¿¼Õ!</li>
-<li>Ruby (<a href="http://www.yoshidam.net/Ruby_ja.html">ÆüËܸì</a> / <a href="http://www.yoshidam.net/Ruby.html">English</a>)<br />
- ¤è¤·¤À¤à¤µ¤ó¤Î¥Ú¡¼¥¸¡£<a href="http://www.yoshidam.net/Ruby_ja.html#susie">Susie¥×¥é¥°¥¤¥ó¥é¥¤¥Ö¥é¥ê</a>¤ä<a href="http://www.yoshidam.net/Ruby_ja.html#rddraw">DirectDraw for Ruby</a>¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</li>
-<li><a href="http://homepage2.nifty.com/sakazuki/rde.html">RDE(Ruby Development Environment)</a> (ÆüËܸì)<br />
- sakazuki¤µ¤ó¤Î¥Ú¡¼¥¸¡£mswin32Èǥ桼¥¶¤Ê¤éɬ¸«¤Ç¤¹¡£¿ä¾©´Ä¶­¤Ïarton¤µ¤ó¤È¤³¤ÎActiveScriptRuby¤Ç¤¹¤¬ (^^; ¤³¤³¤ÎÇÛÉÛʪ¤ò»È¤Ã¤Æ¤âÌäÂê¤Ê¤¯Æ°ºî¤·¤Þ¤¹¡£</li>
-</ul>
-
-
-
-<p class="footer">
-[<a href="../">Ìá¤ë</a>]
-</p>
-<address>written by <a href="mailto:usa@ruby-lang.org">U.Nakamura</a></address>
-<p class="versions">
-ruby 1.9.0 (2004-01-13)<br />
-ERb 2.0.4<br />
-RDtool 0.6.11<br />
-rublog 0.0.2
-</p>
-
-</body>
-</html>
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN">
+<html xml:lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=euc-jp" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="author" content="U.Nakamura" />
+<link rev="made" href="mailto:usa@ruby-lang.org" />
+<link rel="StyleSheet" href="./ruby.css" type="text/css" />
+<title>Ruby-mswin32</title>
+</head>
+<body>
+
+<h1><a id="top">Ruby-mswin32</a></h1>
+<p>¤¢¤ë¤¤¤Ï¡¢Windows¤È¤Î½ª¤ï¤ê¤Ê¤­À襤 ;-(</p>
+<p>[ÆüËܸì / <a href="./index_en.html">English</a>]</p>
+
+
+
+<h2><a id="menu">¢§ Ìܼ¡</a></h2>
+<ul>
+<li><a href="#remark">Ãí°Õ»ö¹à</a></li>
+<li><a href="#ruby">Ruby¤È¤Ï?</a></li>
+<li><a href="#mswin32">mswin32ÈÇruby¤È¤Ï?</a></li>
+<li><a href="#download">¥Ð¥¤¥Ê¥ê ¥À¥¦¥ó¥í¡¼¥É</a></li>
+<li><a href="#install">¥¤¥ó¥¹¥È¡¼¥ë</a></li>
+<li><a href="#recent">ºÇ¶á¤Î½ÐÍè»ö</a></li>
+<li><a href="#link">¥ê¥ó¥¯</a></li>
+</ul>
+
+
+
+<h2><a id="remark">¢§ Ãí°Õ»ö¹à</a></h2>
+<p>¤³¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢mswin32ÈÇruby¤ÎÇÛÉÛ¤ÈÊѹ¹¾õ¶·¤Î¤ªÃΤ餻¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
+<p>¤³¤³¤ÏÊ̤˸ø¼°¥Ú¡¼¥¸¤Ç¤â¤Ê¤ó¤Ç¤â¤Ê¤¯¤Æ¡¢»ä¤¬¾¡¼ê¤Ë½ñ¤¤¤Æ¤ë¥Ú¡¼¥¸¤Ç¤¹¡£¤³¤³¤ÇÆþ¼ê¤Ç¤­¤ë¥×¥í¥°¥é¥à¡¦¾ðÊó(̵¤¤¤ËÅù¤·¤¤¤±¤É)¤Ë¤Ä¤¤¤Æ¤Ï¡¢³Æ¼«¤ÎȽÃǤǤ´ÍøÍѤ¯¤À¤µ¤¤¡£<br />
+Ì䤤¹ç¤ï¤»¤Ï<a href="mailto:usa@ruby-lang.org">»ä</a>¤Ø¡£´Ö°ã¤Ã¤Æ¤â¾¤Î¿Í¤ËÌÂÏǤò¤«¤±¤ë¤è¤¦¤Ê¤³¤È¤Ï¤·¤Ê¤¤¤Ç¤Í¡£</p>
+
+
+
+<h2><a id="ruby">¢§ Ruby¤È¤Ï?</a></h2>
+<p><a href="http://www.ruby-lang.org/ja/">Ruby¤Î¥µ¥¤¥È</a>¤ò¤´Í÷²¼¤µ¤¤¡£</p>
+
+
+
+<h2><a id="mswin32">¢§ mswin32ÈÇruby¤È¤Ï?</a></h2>
+<p>mswin32ÈÇruby¤È¤Ï¡¢32bitÈÇWindows(Windows95¡¦Windows98¡¦WindowsMe¡¦Windows NT¡¦Windows 2000¡¦WindowsXP¡¦Windows 2003 Server¡¢°Ê²¼Windows¤Èɽµ­)¾å¤Çưºî¤¹¤ëRuby¤Î¥Ð¥¤¥Ê¥ê¤Î°ì¤Ä¤Ç¤¹¡£<br />
+Windows¾å¤Çưºî¤¹¤ëRuby¤È¤·¤Æ¤Ï¡¢¸½ºß¡¢5¼ïÎà¤Î¥Ð¥¤¥Ê¥ê¤¬Â¸ºß¤·¤Þ¤¹¡£¤³¤ì¤é¤Ï¤½¤ì¤¾¤ìmswin32ÈÇ¡¦cygwinÈÇ¡¦mingw32ÈÇ¡¦bccwin32ÈÇ¡¦djgppÈÇ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£<br />
+¤½¤ì¤¾¤ì¤Î°ã¤¤¤ò¤Þ¤È¤á¤ë¤È°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹(»ö¼Â¸íǧ¤¬¤¢¤ì¤Ð¤ªÃΤ餻¤¯¤À¤µ¤¤)¡£</p>
+<dl>
+<dt><a id="label:1">mswin32ÈÇ</a></dt><dd>
+<p>VC++¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£Windows¤«¤é¸«¤ì¤Ð¤â¤Ã¤È¤â¡ÖÉáÄ̡פΥХ¤¥Ê¥ê¤È¸À¤¨¤ë¤¬¡¢È¿ÌÌ¡¢Ruby¤¬»ý¤ÄUNIX¤ÇÆÃħŪ¤Êµ¡Ç½¤Î°ìÉô¤¬»ÈÍѤǤ­¤Ê¤¤¡£1.7.3°Ê¹ß¤Ïmingw32ÈǤȳÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï¥Ð¥¤¥Ê¥ê¸ß´¹À­¤¬¤¢¤ë¡£<br />
+RUBY_PLATFORM¤Ï*-mswin32¡£</p>
+</dd>
+<dt><a id="label:2">cygwinÈÇ</a></dt><dd>
+<p>gcc¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¡¢<a href="http://sources.redhat.com/cygwin/">cygwin</a>´Ä¶­¤Çưºî¤¹¤ë¡£cygwin´Ä¶­¤¬UNIX¥é¥¤¥¯¤Ê´Ä¶­¤òWindows¾å¤Ç¹½ÃÛ¤¹¤ë¤â¤Î¤Ç¤¢¤ë¤Î¤Ç¡¢ÅöÁ³¡¢cygwinÈÇruby¤Ï°ìÈ̤ÎUNIXÍѤΤâ¤Î¤È¤À¤¤¤¿¤¤Æ±¤¸¤è¤¦¤Ëưºî¤¹¤ë(¤³¤È¤¬´üÂԤǤ­¤ë)¡£<br />
+RUBY_PLATFORM¤Ï*-cygwin¡£</p>
+</dd>
+<dt><a id="label:3">mingw32ÈÇ</a></dt><dd>
+<p>gcc¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£¥½¡¼¥¹¤Ï¤Û¤È¤ó¤Émswin32ÈǤȶ¦Ä̤Ǥ¢¤ê¡¢¥é¥ó¥¿¥¤¥à¥é¥¤¥Ö¥é¥ê¤â¶¦ÄÌ(MSVCRT.dll)¤Ê¤Î¤Ç¡¢Æ°ºî¤â(¤ª¤½¤é¤¯)mswin32ÈÇ¤È¤Û¤ÜÆ±¤¸¡£1.7.3°Ê¹ß¤Ïmswin32ÈǤȳÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï¥Ð¥¤¥Ê¥ê¸ß´¹À­¤¬¤¢¤ë¡£<br />
+RUBY_PLATFORM¤Ï*-mingw32¡£</p>
+</dd>
+<dt><a id="label:4">bccwin32ÈÇ</a></dt><dd>
+<p>BC++¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£¥½¡¼¥¹¤Ï¤«¤Ê¤ê¤ÎÉôʬ¤¬mswin32ÈǤȶ¦Ä̤ǤϤ¢¤ë¤¬¡¢¥é¥ó¥¿¥¤¥à¥é¥¤¥Ö¥é¥ê¤¬°Û¤Ê¤ë¤Î¤Ç¡¢ºÙ¤«¤¤¤È¤³¤í¤Çµóư¤¬mswin32ÈǤȤϰۤʤë(¤Ï¤º)¡£1.7°Ê¹ß¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤ë¡£<br />
+RUBY_PLATFORM¤Ï*-bccwin32¡£</p>
+</dd>
+<dt><a id="label:5">djgppÈÇ</a></dt><dd>
+<p>DJGPP¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ë¡£DOSÍѤΥХ¤¥Ê¥ê¤Ê¤Î¤Ç¡¢¤â¤Á¤í¤óDOS¤Ç¤âưºî¤¹¤ë¡£È¿ÌÌ¡¢Windows¤Ë¤¢¤Ã¤ÆDOS¤Ë¤Ê¤¤µ¡Ç½¤Î¿¤¯¤¬»È¤¨¤Ê¤¤(¥Í¥Ã¥È¥ï¡¼¥¯´ØÏ¢¤Ê¤É)¡£<br />
+RUBY_PLATFORM¤Ï*-msdosdjgpp¡£</p>
+</dd>
+</dl>
+<p>¤³¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢¾åµ­¤Î¤¦¤Ámswin32ÈǤΤߤò°·¤Ã¤Æ¤¤¤Þ¤¹¡£<br />
+¤Ê¤ª¡¢cygwinÈÇ¡¦mingw32ÈÇ¡¦djgppÈǤˤĤ¤¤Æ¤Ï¤ï¤¿¤Ê¤Ù¤µ¤ó¤Î<a href="http://www.os.rim.or.jp/~eban/">Ruby binaries</a>¤«¤éÆþ¼ê²Äǽ¤Ç¤¹¡£¤Þ¤¿¡¢bccwin32ÈǤˤĤ¤¤Æ¤Ï¾®À¾¤µ¤ó¤Î<a href="http://www001.upp.so-net.ne.jp/konishi/ruby/index.htm">Ruby</a>¤«¤éÆþ¼ê²Äǽ¤Ç¤¹¡£</p>
+
+
+
+<h2><a id="download">¢§ ¥Ð¥¤¥Ê¥ê ¥À¥¦¥ó¥í¡¼¥É</a></h2>
+<p>¸½ºßÇÛÉÛÃæ¤ÎÁ´¤Æ¤Î¥Ð¥¤¥Ê¥ê¤ÏVC++ 5.0(Version 11.00.7022 for 80x86)¤Çmake¤·¤¿¤â¤Î¤Ç¤¹¡£ruby¼«ÂΤ˴ؤ·¤Æ¤Ï¡¢<a href="http://www.ruby-lang.org/ja/download.html">ɸ½àÇÛÉۤΥ½¡¼¥¹</a>(¤Þ¤¿¤Ï<a href="http://www.ruby-lang.org/~knu/cvsrepo-guide.html">CVS</a>¤Î¥½¡¼¥¹)¤«¤é¤½¤Î¤Þ¤ÞºîÀ®¤·¤Æ¤¤¤Þ¤¹¡£³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤Ä¤¤¤Æ¤Ï³Æ¡¹¤Î¥ê¥ó¥¯Àè¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£<br />
+¤¤¤º¤ì¤Î¥Ð¥¤¥Ê¥ê¤âzip·Á¼°¤Ç¥¢¡¼¥«¥¤¥Ö¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
+<p>md5sum¤Î¥Á¥§¥Ã¥¯ÊýË¡¤Ç¤¹¤¬¡¢Î㤨¤Ðruby¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤Ê¤é²¼µ­¤Î¤è¤¦¤ÊÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£<br />
+<code>ruby -r md5 -e "puts MD5.new(File.open('filename', 'rb').read).hexdigest"</code></p>
+
+
+
+<h3><a id="release">Release</a></h3>
+<ul>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.1-i386-mswin32.zip">ruby-1.8.1-i386-mswin32.zip</a> (3,764KB) <em>ºÇ¿·ReleaseÈÇ</em><br />
+ ruby 1.8.1 (2003-12-25) [i386-mswin32]<br />
+ md5sum : 6bbdabeb29f1a15fa69901e87d1108ac</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.0-i386-mswin32.zip">ruby-1.8.0-i386-mswin32.zip</a> (2,507KB)<br />
+ ruby 1.8.0 (2003-08-04) [i386-mswin32]<br />
+ md5sum : eaf9263062429fd4f722d9a70a38a9dc</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.8-i586-mswin32.zip">ruby-1.6.8-i586-mswin32.zip</a> (1,964KB)<br />
+ ruby 1.6.8 (2002-12-24) [i586-mswin32]<br />
+ md5sum : f704f1248ec25b96e3e1f3070afa915e</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.7-i586-mswin32.zip">ruby-1.6.7-i586-mswin32.zip</a> (1,972KB)<br />
+ ruby 1.6.7 (2002-03-01) [i586-mswin32]<br />
+ md5sum : ddedc40d0fc3b0ea1d6ac74f4976bfc6</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.6-i586-mswin32.zip">ruby-1.6.6-i586-mswin32.zip</a> (1,944KB)<br />
+ ruby 1.6.6 (2001-12-26) [i586-mswin32]<br />
+ md5sum : 96e0d1d19a37e5e7e50ae7ce99e34636</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.5-i586-mswin32.zip">ruby-1.6.5-i586-mswin32.zip</a> (1,896KB)<br />
+ ruby 1.6.5 (2001-09-19) [i586-mswin32]<br />
+ md5sum : c708ae98a05df2ff8dea5a70e3791bfa</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.4-i586-mswin32.zip">ruby-1.6.4-i586-mswin32.zip</a> (1,821KB)<br />
+ ruby 1.6.4 (2001-06-04) [i586-mswin32]<br />
+ md5sum : cf813ca19e40be164057b3562575e4da</li>
+</ul>
+
+
+
+
+
+
+
+<h3><a id="develop">Developing versions snapshots</a></h3>
+<ul>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.9.0-20040126-i386-mswin32.zip">ruby-1.9.0-20040126-i386-mswin32.zip</a> (3,849KB)<br />
+ ruby 1.9.0 (2004-01-26) [i386-mswin32]<br />
+ md5sum : fffafbf881cb6a85982220eae5a5b4f5</li>
+</ul>
+
+
+
+<h3><a id="stable">Stable versions snapshots</a></h3>
+<h4><a id="stable">1.8.0</a></h4>
+<ul>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.1-20040127-i386-mswin32.zip">ruby-1.8.1-20040127-i386-mswin32.zip</a> (3,822KB)<br />
+ ruby 1.8.1 (2004-01-27) [i386-mswin32]<br />
+ md5sum : 1fc0d5f53f0a75d0c6d1ca5d21082089</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.8.1-20031027-i386-mswin32.zip">ruby-1.8.1-20031027-i386-mswin32.zip</a> (3,075KB)<br />
+ ruby 1.8.1 (2003-10-27) [i386-mswin32]<br />
+ md5sum : 9dbdc644c529d207d0bda5d64478a5c4</li>
+</ul>
+<h4><a id="stable">1.6.8</a></h4>
+<ul>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.8-20030727-i586-mswin32.zip">ruby-1.6.8-20030727-i586-mswin32.zip</a> (2,093KB)<br />
+ ruby 1.6.8 (2003-07-27) [i586-mswin32]<br />
+ md5sum : 28c3b92b162319b3d6bc99c9996cad15</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ruby-1.6.8-20030515-i586-mswin32.zip">ruby-1.6.8-20030515-i586-mswin32.zip</a> (2,091KB)<br />
+ ruby 1.6.8 (2003-05-15) [i586-mswin32]<br />
+ md5sum : e5f6558de261d111add4f657ad5e345f</li>
+</ul>
+
+
+
+<h3><a id="ext">Extension libraries</a></h3>
+<h4><a id="ext">1.8.0</a></h4>
+<ul>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/racc-1.4.4-all-i386-mswin32-1.8.zip">racc-1.4.4-all-i386-mswin32-1.8.zip</a> (70KB)<br />
+ <a href="http://www.loveruby.net/en/racc.html">racc</a> 1.4.4-all (for ruby 1.8.1)<br />
+ md5sum : 46c4d48b714fb1ded880e7e7af456b28</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vrswin-030906-i386-mswin32-1.8.zip">vrswin-030906-i386-mswin32-1.8.zip</a> (54KB)<br />
+ <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (swin)</a> 030906 (for ruby 1.8.0)<br />
+ md5sum : 11c2d30e2a05e9ea7e097ec7b066cedf</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vruby-030906-i386-mswin32-1.8.zip">vruby-030906-i386-mswin32-1.8.zip</a> (96KB)<br />
+ <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (vruby)</a> 030906 (for ruby 1.8.0)<br />
+ md5sum : 77a42995e42e869932f5fb282cc297ea</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/eruby-1.0.4-i386-mswin32-1.8.zip">eruby-1.0.4-i386-mswin32-1.8.zip</a> (75KB)<br />
+ <a href="http://www.modruby.net/">eruby</a> 1.0.4 (for ruby 1.8.0)<br />
+ md5sum : de7282647f015b1d20a28dcf7c2b8715</li>
+</ul>
+<h4><a id="ext">1.6.8</a></h4>
+<ul>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vrswin-030521-i586-mswin32-1.6.zip">vrswin-030521-i586-mswin32-1.6.zip</a> (55KB)<br />
+ <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (swin)</a> 030521 (for ruby 1.6.8)<br />
+ md5sum : eae3284c6f79be7a119858ff9e940985</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/vruby-030517-i586-mswin32-1.6.zip">vruby-030517-i586-mswin32-1.6.zip</a> (95KB)<br />
+ <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">VisualuRuby (vruby)</a> 030517 (for ruby 1.6.8)<br />
+ md5sum : a32af752428cf3aa03000d66d8deca33</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/tmail-0.10.7-i586-mswin32-1.6.zip">tmail-0.10.7-i586-mswin32-1.6.zip</a> (160KB)<br />
+ <a href="http://www.loveruby.net/en/tmail.html">TMail</a> 0.10.7 (for ruby 1.6.8)<br />
+ md5sum : 74351ed81550dfbf3bfaf8252c316326</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/eruby-1.0.3-i586-mswin32-1.6.zip">eruby-1.0.3-i586-mswin32-1.6.zip</a> (74KB)<br />
+ <a href="http://www.modruby.net/">eruby</a> 1.0.3 (for ruby 1.6.8)<br />
+ md5sum : e05d654128422846f86ca84f55bf7bcb</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/rubywin-0.0.4.3-i586-mswin32-1.6.zip">rubywin-0.0.4.3-i586-mswin32-1.6.zip</a> (286KB)<br />
+ <a href="http://homepage1.nifty.com/markey/ruby/rubywin/index_e.html">RubyWin</a> 0.0.4.3 (for ruby 1.6.8)<br />
+ md5sum : 3f2226ef0c6e41b31c2f337f778e3e18</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/shim-20021224-i586-mswin32-1.6.zip">shim-20021224-i586-mswin32-1.6.zip</a> (138KB)<br />
+ <a href="http://www.ruby-lang.org/~knu/cgi-bin/cvsweb.cgi/shim/">Ruby Shim</a> 20021224 (for ruby 1.6.8)<br />
+ md5sum : 7ee4363195973a1df0584cb467e5ce82</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/racc-1.4.3-all-i586-mswin32-1.6.zip">racc-1.4.3-all-i586-mswin32-1.6.zip</a> (124KB)<br />
+ <a href="http://www.loveruby.net/en/racc.html">racc</a> 1.4.3-all (for ruby 1.6.8)<br />
+ md5sum : 1f093aabb464bef3074112949228a8c6</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/win32ole-0.5.2-i586-mswin32-1.6.zip">win32ole-0.5.2-i586-mswin32-1.6.zip</a> (59KB)<br />
+ <a href="http://homepage1.nifty.com/markey/ruby/win32ole/index_e.html">Win32OLE</a> 0.5.2 (for ruby 1.6.8)&lt;<br />
+ md5sum : 960f7205923a9243cff567d291b254ad</li>
+<li><a href="ftp://ftp.ruby-lang.org/pub/ruby/binaries/mswin32/ext/uconv-0.4.11-i586-mswin32-1.6.zip">uconv-0.4.11-i586-mswin32-1.6.zip</a> (110KB)<br />
+ <a href="http://www.yoshidam.net/Ruby.html#uconv">uconv</a> 0.4.11 (for ruby 1.6.8)<br />
+ md5sum : c08f3662abee8e7186283741f89b88d7</li>
+</ul>
+
+
+
+<h2><a id="install">¢§ ¥¤¥ó¥¹¥È¡¼¥ë</a></h2>
+<p>¾åµ­¤Î¥Ð¥¤¥Ê¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ï¡¢¤ª¹¥¤ß¤Î¥Ç¥£¥ì¥¯¥È¥ê(°Ê²¼<code>$TOPDIR</code>¤Èµ­½Ò)¤ËŸ³«¤·¤Æ¤¯¤À¤µ¤¤¡£¥Ç¥£¥ì¥¯¥È¥êÉÕ¤­¤Ç°µ½Ì¤µ¤ì¤Æ¤Þ¤¹¤Î¤Ç¡¢Å¸³«»þ¤Ë¤Ï¥Ç¥£¥ì¥¯¥È¥êÉÕ¤­¤ÇŸ³«¤¹¤ë¤Î¤ò˺¤ì¤º¤Ë(°ÕÌ£¤¬¤ï¤«¤é¤Ê¤¤¿Í¤Ïµ¤¤Ë¤·¤Ê¤¯¤Æ¤¤¤¤¤Ç¤¹)¡£<br />
+Ÿ³«¸å¤Ï¡¢<code>$TOPDIR\bin</code>¤Ë<code>PATH</code>¤òÄ̤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</p>
+<p>¤Ê¤ª¡¢°Ê²¼¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ï¡¢¤³¤ÎÇÛÉÛʪ¤Ë´Þ¤Þ¤ì¤Ê¤¤³°Éô¤Î¥é¥¤¥Ö¥é¥ê¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</p>
+<ul>
+<li>curses.so : PDCurses¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>dbm.so : GDBM¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>gdbm.so : GDBM¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>iconv.so : Iconv¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>openssl.so : OpenSSL¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>readline.so : readline¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>tcltklib.so : Tcl/Tk¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+<li>zlib.so : Zlib¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£</li>
+</ul>
+<p>¾åµ­¤Î¤¦¤Á¡¢PDCurses¡¦GDBM¡¦OpenSSL¡¦readline¡¦Zlib¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://jarp.jin.gr.jp/win32/">Porting Libraries to Win32</a>¤Ë¥Ð¥¤¥Ê¥ê¤¬Â¸ºß¤·¤Þ¤¹¡£<br />
+Iconv¤Ë¤Ä¤¤¤Æ¤Ï¡¢Meadowy.org¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë<a href="http://www.meadowy.org/meadow/dists/snapshot/iconv-1.8.win32.zip">iconv-1.8.win32.zip</a>¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£<br />
+Tcl/Tk¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="http://www.activestate.com/">ActiveState</a>¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë<a href="http://www.activestate.com/Products/ActiveTcl/">ActiveTcl</a>¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£</p>
+
+
+
+<h2><a id="recent">¢§ ºÇ¶á¤Î½ÐÍè»ö</a></h2>
+
+
+
+<h3><a id="d20040127">2004-01-27</a></h3>
+<p>¤¢¤±¤Þ¤·¤Æ¤ª¤á¤Ç¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£¤Ã¤ÆÃÙ¤¤¤è!</p>
+<p>ruby-1.8.1-20040127¤Èruby-1.9.0-20040126¤òÃÖ¤­¤Þ¤·¤¿¡£<br />
+Á°¼Ô¤Ï¼ç¤Ë1.8.1¥ê¥ê¡¼¥¹ÈǤÇȯ¸«¤µ¤ì¤¿ÉÔ¶ñ¹ç¤Î½¤Àµ¤Ç¤¹¡£¸å¼Ô¤Ï³«È¯ÈÇ¡£</p>
+
+<h3><a id="d20031225">2003-12-25</a></h3>
+<p>¥á¥ê¡¼¥¯¥ê¥¹¥Þ¥¹! ruby-1.8.1¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤Þ¤·¤¿!<br />
+(preview¤ò°ì¤ÄÈô¤Ð¤·¤Á¤ã¤¤¤Þ¤·¤¿¡¢¤´¤á¤ó¤Ê¤µ¤¤...)</p>
+
+<h3><a id="d20031206">2003-12-06</a></h3>
+<p>ruby-1.8.1-preview3¤òÃÖ¤­¤Þ¤·¤¿¡£»×¤¤¤Î¤Û¤«´Ö¤¬¶õ¤¤¤Á¤ã¤¤¤Þ¤·¤¿¤Í¡£</p>
+
+<h3><a id="d20031101">2003-11-01</a></h3>
+<p>ruby-1.8.1-preview2¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
+
+<h3><a id="d20031028">2003-10-28</a></h3>
+<p>ruby-1.8.1-20031027¤òÃÖ¤­¤Þ¤·¤¿¡£<br />
+racc-1.4.4-all¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
+
+<h3><a id="d20030907">2003-09-07</a></h3>
+<p>eruby-1.0.4¡¦vrswin-030906¡¦vruby-030906¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
+
+<h3><a id="d20030812">2003-08-12</a></h3>
+<p>ruby-1.8.0-20030812¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
+<p>vrswin-030811¡¦vruby-030811¤òÃÖ¤­¤Þ¤·¤¿¡£º£²ó¤«¤éÃÖ¤¯³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ÏÁ´¤Æ1.8ÍѤˤʤê¤Þ¤¹¡£</p>
+
+<h3><a id="d20030804">2003-08-04</a></h3>
+<p>ruby-1.8.0¤òÃÖ¤­¤Þ¤·¤¿¡£Ruby 1.8·ÏºÇ½é¤Î¥ê¥ê¡¼¥¹¤È¤Ê¤ê¤Þ¤¹¡£<br />
+1.6·Ï¤«¤é¤ÎÊѹ¹ÅÀ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="ftp://ftp.ruby-lang.org/pub/ruby/1.8/changes.1.8.0">changes.1.8.0</a>¤Ê¤É¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
+
+<h3><a id="d20030731">2003-07-31</a></h3>
+<p>ruby-1.8.0-preview6¤òÃÖ¤­¤Þ¤·¤¿¡£¤¨¡¼¤È¡¢¤³¤ì¤ò´Þ¤á¤Æ¤¢¤È2²ópreview¤¬½Ð¤ëÌÏÍͤǤ¹ :)</p>
+
+<h3><a id="d20030728">2003-07-28</a></h3>
+<p>ruby-1.8.0-preview5¤òÃÖ¤­¤Þ¤·¤¿¡£¤ª¤½¤é¤¯¤³¤ì¤¬1.8.0¤ÎºÇ¸å¤Îpreview¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£<br />
+ruby-1.6.8-20030727¤òÃÖ¤­¤Þ¤·¤¿¡£</p>
+
+
+
+<h3><a id="old">¤«¤Ä¤Æ¤Î½ÐÍè»ö</a></h3>
+<p><a href="./old.html">¤³¤Á¤é</a>¤ò¤É¤¦¤¾¡£</p>
+
+
+
+<h2><a id="link">¢§ ¥ê¥ó¥¯</a></h2>
+<p>mswin32ÈǤ˴ؤ¹¤ë(¤È»×¤ï¤ì¤ë)¥ê¥ó¥¯¤Ç¤¹¡£¾¡¼ê¤ËÄ¥¤Ã¤Æ¤Þ¤¹¤Î¤Ç¡¢ÉÔÅԹ礬¤¢¤ì¤Ð<a href="mailto:usa@osb.att.ne.jp">»ä</a>¤Þ¤Ç¤´Ï¢Íí¤¯¤À¤µ¤¤¡£</p>
+<ul>
+<li><a href="http://www.ruby-lang.org/">Ruby Home Page</a> (<a href="http://www.ruby-lang.org/ja/">ÆüËܸì</a> / <a href="http://www.ruby-lang.org/en/">English</a>)<br />
+ ¸À¤ï¤º¤È¤·¤ì¤¿¡¢Ëܲȥµ¥¤¥È¡£</li>
+<li>»¨µ­Ä¢ (<a href="http://homepage1.nifty.com/markey/">ÆüËܸì</a> / <a href="http://homepage1.nifty.com/markey/index_e.html">English</a>)<br />
+ ½õÅĤµ¤ó¤Î¥Ú¡¼¥¸¡£<a href="http://homepage1.nifty.com/markey/ruby/rubywin/index.html">RubWin</a>¡¦<a href="http://homepage1.nifty.com/markey/ruby/win32ole/index.html">Win32OLE</a>¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</li>
+<li><a href="http://www.moonwolf.com/ruby/">Script/Ruby</a> (ÆüËܸì)<br />
+ MoonWolf¤µ¤ó¤Î¥Ú¡¼¥¸¡£Win32Module¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</li>
+<li>ActiveScriptRuby (<a href="http://www.geocities.co.jp/SiliconValley-PaloAlto/9251/ruby/index.html">ÆüËܸì</a> / <a href="http://www.geocities.co.jp/SiliconValley-PaloAlto/9251/ruby/main.html">English</a>)<br />
+ arton¤µ¤ó¤Î¥Ú¡¼¥¸¡£WindowsÈÇRuby¤Î̤Íè¤Ï¤³¤³¤Ë¤¢¤ë¤Î¤«¤â¡£</li>
+<li>VisualuRuby·×²è(²¾¾Î) (<a href="http://www.osk.3web.ne.jp/~nyasu/software/vrproject.html">ÆüËܸì</a> / <a href="http://www.osk.3web.ne.jp/~nyasu/vruby/vrproject-e.html">English</a>)<br />
+ nyasu¤µ¤ó¤Î¥Ú¡¼¥¸¡£VisualuRuby¤Ê¤É¤¬¤¢¤ê¤Þ¤¹(¤Ã¤Æ¤³¤ì¤â¤½¤Î¤Þ¤ó¤Þ)¡£Windows¤ÇRuby¤ò»È¤¦¤¿¤á¤Î<a href="http://www.osk.3web.ne.jp/~nyasu/software/rubyonwin.html">¥ê¥ó¥¯½¸</a>¤¬½¼¼Â¤·¤Æ¤Þ¤¹¡£¤Á¤Ê¤ß¤Ë¡¢Åö¥µ¥¤¥È¤Î¥Ç¥¶¥¤¥ó¤Ï¤³¤Á¤é¤Î¥Ñ¥¯¥ê¤Ç¤¹¡£Â¿¼Õ!</li>
+<li>Ruby (<a href="http://www.yoshidam.net/Ruby_ja.html">ÆüËܸì</a> / <a href="http://www.yoshidam.net/Ruby.html">English</a>)<br />
+ ¤è¤·¤À¤à¤µ¤ó¤Î¥Ú¡¼¥¸¡£<a href="http://www.yoshidam.net/Ruby_ja.html#susie">Susie¥×¥é¥°¥¤¥ó¥é¥¤¥Ö¥é¥ê</a>¤ä<a href="http://www.yoshidam.net/Ruby_ja.html#rddraw">DirectDraw for Ruby</a>¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</li>
+<li><a href="http://homepage2.nifty.com/sakazuki/rde.html">RDE(Ruby Development Environment)</a> (ÆüËܸì)<br />
+ sakazuki¤µ¤ó¤Î¥Ú¡¼¥¸¡£mswin32Èǥ桼¥¶¤Ê¤éɬ¸«¤Ç¤¹¡£¿ä¾©´Ä¶­¤Ïarton¤µ¤ó¤È¤³¤ÎActiveScriptRuby¤Ç¤¹¤¬ (^^; ¤³¤³¤ÎÇÛÉÛʪ¤ò»È¤Ã¤Æ¤âÌäÂê¤Ê¤¯Æ°ºî¤·¤Þ¤¹¡£</li>
+</ul>
+
+
+
+<p class="footer">
+[<a href="../">Ìá¤ë</a>]
+</p>
+<address>written by <a href="mailto:usa@ruby-lang.org">U.Nakamura</a></address>
+<p class="versions">
+ruby 1.9.0 (2004-01-13)<br />
+ERb 2.0.4<br />
+RDtool 0.6.11<br />
+rublog 0.0.2
+</p>
+
+</body>
+</html>
diff --git a/test/rexml/data/testsrc.xml b/test/rexml/data/testsrc.xml
index 9c7a78212f..e18ba20dae 100644
--- a/test/rexml/data/testsrc.xml
+++ b/test/rexml/data/testsrc.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
- "http://my.netscape.com/publish/formats/rss-0.91.dtd">
-<rss version="0.91">
- <channel>
- <title>xmlhack</title>
- <link>http://www.xmlhack.com</link>
- <description>Developer news from the XML community</description>
- <language>en-us</language>
- <copyright>Copyright 1999-2001, xmlhack team.</copyright>
- <managingEditor>editor@xmlhack.com</managingEditor>
- <webMaster>webmaster@xmlhack.com</webMaster>
- <image>
- <title>xmlhack</title>
- <url>http://www.xmlhack.com/images/mynetscape88.gif</url>
- <link>http://www.xmlhack.com</link>
- <width>88</width>
- <height>31</height>
- <description>News, opinions, tips and issues concerning XML development</description>
- </image>
-<item x='0'>
-<title>Experimental non-XML syntax for RELAX NG</title>
-<link>http://www.xmlhack.com/read.php?item=1343</link>
-<description>
- James Clark has announced the release of an experimental non-XML syntax for RELAX
- NG and a Java translator implementation that converts
- instances of the syntax into RELAX NG's XML syntax.
-</description>
-<category>Schemas</category>
-</item>
-<item x='1'>
-<title>Long-awaited entity-resolver Java classes finally released</title>
-<link>http://www.xmlhack.com/read.php?item=1342</link>
-<description>Norman Walsh has
- announced the release of SAX entityResolver() and JAXP
- URIResolver() Java
- classes he wrote to implement the OASIS XML Catalogs
- Committee Specification (in addition to the TR9401 and
- Apache XCatalogs specifications).
-</description>
-<category>SGML/XML</category>
-<category>Java</category>
-</item>
-<item x='3'>
-
-<title>Beepcore-C framework released</title>
-<link>http://www.xmlhack.com/read.php?item=1341</link>
-<description>Invisible Worlds have announced the publication of Beepcore-C, an implementation of the BEEP framework written in C.</description>
-<category>Protocols</category>
-<category>C++</category>
-</item>
-<item>
-<title>SVG and XSL-FO by example</title>
-<link>http://www.xmlhack.com/read.php?item=1340</link>
-<description>Jirka Jirat has announced the
-addition of an XSL-FO and SVG examples repository to the Zvon developer
-reference site.</description>
-<category>SVG</category>
-<category>XSL-FO</category>
-</item>
-
-
-</channel>
-</rss>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
+ "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+<rss version="0.91">
+ <channel>
+ <title>xmlhack</title>
+ <link>http://www.xmlhack.com</link>
+ <description>Developer news from the XML community</description>
+ <language>en-us</language>
+ <copyright>Copyright 1999-2001, xmlhack team.</copyright>
+ <managingEditor>editor@xmlhack.com</managingEditor>
+ <webMaster>webmaster@xmlhack.com</webMaster>
+ <image>
+ <title>xmlhack</title>
+ <url>http://www.xmlhack.com/images/mynetscape88.gif</url>
+ <link>http://www.xmlhack.com</link>
+ <width>88</width>
+ <height>31</height>
+ <description>News, opinions, tips and issues concerning XML development</description>
+ </image>
+<item x='0'>
+<title>Experimental non-XML syntax for RELAX NG</title>
+<link>http://www.xmlhack.com/read.php?item=1343</link>
+<description>
+ James Clark has announced the release of an experimental non-XML syntax for RELAX
+ NG and a Java translator implementation that converts
+ instances of the syntax into RELAX NG's XML syntax.
+</description>
+<category>Schemas</category>
+</item>
+<item x='1'>
+<title>Long-awaited entity-resolver Java classes finally released</title>
+<link>http://www.xmlhack.com/read.php?item=1342</link>
+<description>Norman Walsh has
+ announced the release of SAX entityResolver() and JAXP
+ URIResolver() Java
+ classes he wrote to implement the OASIS XML Catalogs
+ Committee Specification (in addition to the TR9401 and
+ Apache XCatalogs specifications).
+</description>
+<category>SGML/XML</category>
+<category>Java</category>
+</item>
+<item x='3'>
+
+<title>Beepcore-C framework released</title>
+<link>http://www.xmlhack.com/read.php?item=1341</link>
+<description>Invisible Worlds have announced the publication of Beepcore-C, an implementation of the BEEP framework written in C.</description>
+<category>Protocols</category>
+<category>C++</category>
+</item>
+<item>
+<title>SVG and XSL-FO by example</title>
+<link>http://www.xmlhack.com/read.php?item=1340</link>
+<description>Jirka Jirat has announced the
+addition of an XSL-FO and SVG examples repository to the Zvon developer
+reference site.</description>
+<category>SVG</category>
+<category>XSL-FO</category>
+</item>
+
+
+</channel>
+</rss>
diff --git a/test/rexml/data/ticket_61.xml b/test/rexml/data/ticket_61.xml
index 4df1cc9b86..10ab7ebb4b 100644
--- a/test/rexml/data/ticket_61.xml
+++ b/test/rexml/data/ticket_61.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<HTML>
-<body onload="RunOnLoads()" ms_positioning="FlowLayout"><form id="CollectiveForm" name="CollectiveForm" action="Matter_List.aspx" method="post" defaultbutton="btSearch"><input type="hidden" name="LinkID"/> <input type="hidden" name="Param"/><input type="hidden" name="__EVENTTARGET"/> <input type="hidden" name="__EVENTARGUMENT"/><input type="hidden" value="dDwtMjA3ODMxNDk3NDt0PDtsPGk8MD47aTwxPjs+O2w8dDxAPC9BSU1TL3N0eWxlc2hlZXRzL0RhdGFDZXJ0U3R5bGUuYXNweDs+Ozs+O3Q8cDxsPGRlZmF1bHRCdXR0b247PjtsPGJ0U2VhcmNoOz4+O2w8aTwxPjtpPDM+O2k8ND47aTw4PjtpPDExPjtpPDEzPjtpPDE1Pjs+O2w8dDxAPC9BSU1TL2ltYWdlcy9oZWFkZXItYWltc2xvZ28uZ2lmOy9BSU1TL2ltYWdlcy9oZWFkZXItYmtnZC5naWY7Pjs7Pjt0PEA8L0FJTVMvaW1hZ2VzL2hlYWRlci1yaWdodGVuZC5naWY7Oz47Oz47dDw7bDxpPDI+Oz47bDx0PDtsPGk8MT47aTwyPjs+O2w8dDxwPDtwPGw8b25wcm9wZXJ0eWNoYW5nZTs+O2w8Q29sbGVjdGl2ZVZhbGlkYXRpb25TdW1tYXJ5X09uUHJvcGVydHlDaGFuZ2UoKTs+Pj47Oz47dDxAPC9BSU1TL2ltYWdlcy9hbGVydExlZnRUb3AuZ2lmOy9BSU1TL2ltYWdlcy9hbGVydEhvcml6b250YWwuZ2lmOy9BSU1TL2ltYWdlcy9hbGVydC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0SG9yaXpvbnRhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0UmlnaHRUb3AuZ2lmOy9BSU1TL2ltYWdlcy9hbGVydExlZnRWZXJ0aWNhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0UmlnaHRWZXJ0aWNhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0TGVmdEJvdHRvbS5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0SG9yaXpvbnRhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0UmlnaHRCb3R0b20uZ2lmOz47Oz47Pj47Pj47dDw7bDxpPDE+O2k8Mz47aTw3Pjs+O2w8dDxwPHA8bDxUZXh0O2luRXJyb3JTdGF0ZTs+O2w8WTtvPGY+Oz4+O3A8bDxvbmNoYW5nZTtjdXJyZW50dmFsdWU7PjtsPEluZGljYXRlQ2hhbmdlZCh0aGlzLCcnKVw7O1k7Pj4+Ozs+O3Q8cDxwPGw8VGV4dDtpbkVycm9yU3RhdGU7PjtsPE9wZW47bzxmPjs+PjtwPGw8b25jaGFuZ2U7Y3VycmVudHZhbHVlOz47bDxJbmRpY2F0ZUNoYW5nZWQodGhpcywnJylcOztPcGVuOz4+Pjs7Pjt0PHA8cDxsPFRvb2xUaXA7PjtsPFxlOz4+Oz47Oz47Pj47dDw7bDxpPDE+O2k8Mz47aTw1PjtpPDY+O2k8Nz47PjtsPHQ8cDxwPGw8aW5FcnJvclN0YXRlO1RleHQ7PjtsPG88Zj47XGU7Pj47cDxsPG9uY2hhbmdlO2N1cnJlbnR2YWx1ZTs+O2w8SW5kaWNhdGVDaGFuZ2VkKHRoaXMsJycpXDs7XGU7Pj4+Ozs+O3Q8cDxwPGw8aW5FcnJvclN0YXRlO1RleHQ7PjtsPG88Zj47XGU7Pj47cDxsPG9uY2hhbmdlO2N1cnJlbnR2YWx1ZTs+O2w8SW5kaWNhdGVDaGFuZ2VkKHRoaXMsJycpXDs7XGU7Pj4+Ozs+O3Q8cDxwPGw8aW5FcnJvclN0YXRlO1RleHQ7PjtsPG88Zj47XGU7Pj47cDxsPG9uY2hhbmdlO2N1cnJlbnR2YWx1ZTs+O2w8SW5kaWNhdGVDaGFuZ2VkKHRoaXMsJycpXDs7XGU7Pj4+Ozs+O3Q8QDxQcm9mZXNzaW9uYWwgaW4gQ2hhcmdlOz47Oz47dDxwPHA8bDxpbkVycm9yU3RhdGU7VGV4dDs+O2w8bzxmPjtcZTs+PjtwPGw8b25jaGFuZ2U7Y3VycmVudHZhbHVlOz47bDxJbmRpY2F0ZUNoYW5nZWQodGhpcywnJylcOztcZTs+Pj47Oz47Pj47dDxAMDxwPHA8bDxEYXRhS2V5cztQYWdpbmdWaWV3O1RvdGFsUmVjb3JkcztQYWdlQ291bnQ7UGFnZVNpemU7U29ydERpcmVjdGlvbjtVbmlxdWVJZDtTb3J0RXhwcmVzc2lvbjtDdXJyZW50UGFnZTtfIUl0ZW1Db3VudDtfIURhdGFTb3VyY2VJdGVtQ291bnQ7TWF4UGFnZU1vZGU7PjtsPGw8PjtPcGVuO2k8MD47aTwwPjtpPDIwPjtpPDE+O2MxNjA4M2Y4LTkwZjgtNDQ1Ni04YzM0LTc5ZTFhNjg2ZDhlMjttYXR0ZXJfbm87aTwxPjtpPC0xPjtpPC0xPjtEYXRhQ2VydC5XZWIuQ29udHJvbHMuTWF4UGFnZU1vZGUsIERhdGFDZXJ0LldlYiwgVmVyc2lvbj0xLjYuMi4xNCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsPE5PUk1BTD47Pj47PjtAMDw7OztAMDxwPGw8SGVhZGVyVGV4dDs+O2w8UHJvZmVzc2lvbmFsIGluIENoYXJnZTs+Pjs7Ozs+O0AwPHA8bDxWaXNpYmxlOz47bDxvPHQ+Oz4+Ozs7Oz47Oz47Ozs7Ozs7Ozs+Ozs+O3Q8QDwvQUlNUy9pbWFnZXMvZm9vdGVyLWJrZ2QuZ2lmOy9BSU1TL2ltYWdlcy9mb290ZXItYmtnZC5naWY7MjAwNjs7Pjs7Pjs+Pjs+Pjs+2T4SCaJMpmBYZKv3iwMGME7j8M0=" name="__VIEWSTATE"/> <input id="PageGuid" type="hidden" value="659179a1-bdcc-41f3-8f27-0495ae9356fd" name="PageGuid"/> <table style="BORDER-COLLAPSE: collapse" height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0"><tbody ><tr ><td ><table cellSpacing="0" cellPadding="0" width="100%" border="0"><tbody ><tr ><td vAlign="top" align="left" width="325"><br /></td><td align="right" background="/AIMS/images/header-bkgd.gif"><table style="DISPLAY: inline" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td ><img src="/Aims/images/nav-leftend.gif"/></td><td background="/Aims/images/nav-center.gif"><span ><table id="NavControl__ctl0_group_1" style="Z-INDEX: 999" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl0_group_1', null, null, 0);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ></tr></tbody></table></span><span ><table style="LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px"><tbody ><tr ><td ><br /></td></tr></tbody></table></span><span ><table class="MenuGroup" id="NavControl__ctl1_group_1" style="Z-INDEX: 999" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_1', null, null, 250);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_1" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_1', 'NavControl__ctl1_group_2', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '10', '', 'MyWork/Inbox.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_1', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_2', 250, null);">MY WORK</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_6" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_6', 'NavControl__ctl1_group_7', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '1', '', 'Matter/Matter_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_6', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_7', 250, null);">MATTER</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_7" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_7', 'NavControl__ctl1_group_8', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '2', '', 'Administrator/Admin_Home.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_7', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_8', 250, null);">ADMINISTRATOR</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_20" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_20', 'NavControl__ctl1_group_21', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '15', '', 'MyWork/AIE.aspx?ClearForm=true'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_20', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_21', 250, null);">AIE</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_21" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_21', 'NavControl__ctl1_group_22', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '16', '', 'Reports/ReportsFrontPage.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_21', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_22', 250, null);">REPORTS</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_22" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_22', 'NavControl__ctl1_group_23', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '17', '', 'javascript:window.open(&quot;[appRoot]/Documentation/PubAIMS_3_02/AIMS_Master_Page.htm&quot;)'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_22', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_23', 250, null);">HELP</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_23" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_23', 'NavControl__ctl1_group_24', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '34', '', 'Logon.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_23', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_24', 250, null);">LOGOFF</td></tr></tbody></table></span><span ><table class="MenuGroup" id="NavControl__ctl1_group_2" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_2')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_2', 'NavControl__ctl1_item_1', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_2" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_2', 'NavControl__ctl1_group_3', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '11', '', 'MyWork/Inbox.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_2', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_3', 250, null);">INBOX</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_3" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_3', 'NavControl__ctl1_group_4', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '12', '', 'MyWork/Coordinator.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_3', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_4', 250, null);">COORDINATOR</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_4" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_4', 'NavControl__ctl1_group_5', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '13', '', 'MyWork/ErrorManagement.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_4', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_5', 250, null);">ERROR MANAGER</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_5" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_5', 'NavControl__ctl1_group_6', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '14', '', 'MyWork/Invoice_Search.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_5', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_6', 250, null);">SEARCH</td></tr></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_3" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_3')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_3', 'NavControl__ctl1_item_2', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_4" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_4')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_4', 'NavControl__ctl1_item_3', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_5" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_5')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_5', 'NavControl__ctl1_item_4', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_6" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_6')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_6', 'NavControl__ctl1_item_5', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_7" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_7')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_7', 'NavControl__ctl1_item_6', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_8" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_8')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_8', 'NavControl__ctl1_item_7', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_8" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_8', 'NavControl__ctl1_group_9', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '19', '', 'Administrator/GeneralSettings_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_8', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_9', 250, null);">GENERAL SETTINGS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_9" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_9', 'NavControl__ctl1_group_10', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '30', '', 'Integration/Log_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_9', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_10', 250, null);">INTEGRATION LOG</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_10" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_10', 'NavControl__ctl1_group_11', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '20', '', 'Administrator/Lookup_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_10', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_11', 250, null);">LOOKUPS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_11" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_11', 'NavControl__ctl1_group_12', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '37', '', 'NotificationLog/Log_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_11', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_12', 250, null);">NOTIFICATION LOG</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_12" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_12', 'NavControl__ctl1_group_13', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '7', '', 'Administrator/MatterType_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_12', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_13', 250, null);">MATTER TYPES</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_13" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_13', 'NavControl__ctl1_group_14', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '6', '', 'Professional/Prof_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_13', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_14', 250, null);">PROFESSIONALS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_14" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_14', 'NavControl__ctl1_group_15', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '9', '', 'Vendor/Vendor_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_14', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_15', 250, null);">VENDORS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_15" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_15', 'NavControl__ctl1_group_16', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '32', '', 'Workflow/WorkflowTitle_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_15', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_16', 250, null);">WORKFLOW TITLES</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_16" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_16', 'NavControl__ctl1_group_17', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '36', '', 'Professional/Prof_SubList.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_16', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_17', 250, null);">WORKFLOW SEARCH-REPLACE</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_17" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_17', 'NavControl__ctl1_group_18', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '5', '', 'Workgroup/Workgroup_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_17', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_18', 250, null);">WORKGROUPS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_18" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_18', 'NavControl__ctl1_group_19', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '33', '', 'Administrator/System_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_18', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_19', 250, null);">SYSTEM POLICY</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_19" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_19', 'NavControl__ctl1_group_20', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '18', '', 'Timekeeper/TimekeeperClassification_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_19', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_20', 250, null);">TIMEKEEPER CLASSIFICATIONS</td></tr></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_9" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_9')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_9', 'NavControl__ctl1_item_8', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_10" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_10')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_10', 'NavControl__ctl1_item_9', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_11" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_11')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_11', 'NavControl__ctl1_item_10', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_12" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_12')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_12', 'NavControl__ctl1_item_11', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_13" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_13')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_13', 'NavControl__ctl1_item_12', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_14" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_14')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_14', 'NavControl__ctl1_item_13', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_15" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_15')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_15', 'NavControl__ctl1_item_14', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_16" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_16')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_16', 'NavControl__ctl1_item_15', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_17" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_17')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_17', 'NavControl__ctl1_item_16', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_18" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_18')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_18', 'NavControl__ctl1_item_17', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_19" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_19')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_19', 'NavControl__ctl1_item_18', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_20" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_20')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_20', 'NavControl__ctl1_item_19', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_21" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_21')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_21', 'NavControl__ctl1_item_20', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_22" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_22')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_22', 'NavControl__ctl1_item_21', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_23" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_23')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_23', 'NavControl__ctl1_item_22', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_24" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_24')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_24', 'NavControl__ctl1_item_23', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table style="LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px"><tbody ><tr ><td ><br /></td></tr></tbody></table></span></td><td ><img src="/Aims/images/nav-rightend.gif"/></td></tr></tbody></table></td><td vAlign="top" align="left" width="20"><img height="70" alt="" src="/AIMS/images/header-rightend.gif" width="20" border="0"/></td></tr></tbody></table></td></tr><tr ><td width="100%" height="100%"><table height="100%" width="100%" border="0"><tbody ><tr ><td vAlign="top" align="middle"><table border="0"><tbody ><tr ><td align="left"><center ><div id="CustomValidationSummary" style="DISPLAY: none"><div style="DISPLAY: none"></div><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0"><tbody ><tr ><td ><img src="/AIMS/images/alertLeftTop.gif"/><br /><br /></td><td ><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0"><tbody ><tr ><td width="50%" background="/AIMS/images/alertHorizontal.gif"><br /><br /></td><td ><img src="/AIMS/images/alert.gif"/><br /><br /></td><td width="50%" background="/AIMS/images/alertHorizontal.gif"><br /><br /></td></tr></tbody></table><br /><br /></td><td ><img src="/AIMS/images/alertRightTop.gif"/><br /><br /></td></tr><tr ><td background="/AIMS/images/alertLeftVertical.gif"><br /><br /></td><td vAlign="center" align="middle"><div id="ValidationSummaryHeader">     Header Text    <br /><br /></div><div id="ValidationSummaryItem" style="DISPLAY: none">    - Item Text    <br /></div><br /><br /></td><td background="/AIMS/images/alertRightVertical.gif"><br /><br /></td></tr><tr ><td ><img src="/AIMS/images/alertLeftBottom.gif"/><br /><br /></td><td background="/AIMS/images/alertHorizontal.gif"><br /><br /></td><td ><img src="/AIMS/images/alertRightBottom.gif"/><br /><br /></td></tr></tbody></table></div></center><input id="Version_FetchMatterVendorSummaryBO" type="hidden" value="0" name="Version_FetchMatterVendorSummaryBO"/><input id="Version_DocumentBO" type="hidden" value="0" name="Version_DocumentBO"/><input id="Version_MatterBO" type="hidden" value="0" name="Version_MatterBO"/><input id="Version_CustomSettingsBO" type="hidden" value="0" name="Version_CustomSettingsBO"/> <table class="Clear"><tbody ><tr ><td class="Title">List Matters</td></tr></tbody></table><br /><div id="Panel1" style="WIDTH: 400px; HEIGHT: 21px"><span class="DCViewListActive">Open</span> <span class="DCViewListActive"> |</span> <a class="DCViewListInactive" id="DCViewLink2" onclick="setView('Closed',this);" href="javascript:__doPostBack('DCViewLink2','')" pagecontext="">Closed</a> <span class="DCViewListActive"> |</span> <a class="DCViewListInactive" id="DCViewLink3" onclick="setView('All',this);" href="javascript:__doPostBack('DCViewLink3','')" pagecontext="">All</a> </div></td></tr><tr ><td ><div id="pnOpen" style="DISPLAY: block; WIDTH: 160px"><table class="Normal"><tbody ><tr class="Header"><td class="Header">Open Matters </td><td align="right"><table class="Invisible"><tbody ><tr ><td ><div id="DCImageButton1" title="Add Matter" onclick="DCImageButton1_onclick(this);return true;" anchorclicked="false"><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0" width="28" border="0"><tbody ><tr ><td width="1%"><img src="/AIMS/images/bt2Left26gray.gif" border="0"/></td><td style="PADDING-RIGHT: 2px; PADDING-LEFT: 4px" vAlign="center" align="middle" width="98%" background="/AIMS/images/bt2Center26gray.gif"><a class="ButtonText" id="imgbtaDCImageButton1" href="#AimsStandardLink"><nobr ><div class="ButtonText" id="dvbtDCImageButton1Text" style="DISPLAY: inline">Add</div></nobr></a></td><td style="PADDING-RIGHT: 4px; PADDING-LEFT: 2px" vAlign="center" align="middle" width="98%" background="/AIMS/images/bt2Center26gray.gif"><img id="imgbtDCImageButton1" src="/AIMS/images/add.gif" border="0"/></td><td width="1%"><img src="/AIMS/images/bt2Right26gray.gif" border="0"/></td></tr></tbody></table></div></td><td ><div id="DCCollapseButton1" title="" onclick="DCCollapseButton1_onclick(this);return true;" anchorclicked="false"><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0" width="0" border="0"><tbody ><tr ><td width="1%"><img src="/AIMS/images/bt2Left26gray.gif" border="0"/></td><td style="PADDING-RIGHT: 4px; PADDING-LEFT: 4px" vAlign="center" align="middle" width="98%" background="/AIMS/images/bt2Center26gray.gif"><a class="ButtonText" id="imgbtaDCCollapseButton1" href="#AimsStandardLink"><img id="imgbtDCCollapseButton1" src="/AIMS/images/blue-chevron_up.gif" border="0"/></a></td><td width="1%"><img src="/AIMS/images/bt2Right26gray.gif" border="0"/></td></tr></tbody></table></div><input id="SearchState" type="hidden" value="False" name="SearchState"/></td></tr></tbody></table></td></tr></tbody></table></div><div id="panelSearch" style="DISPLAY: block"><table class="Normal" id="Table1"><tbody ><tr class="Report"><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report" style="WIDTH: 287px"><br /></td><td class="Report"><br /></td></tr><tr class="Report"><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report" style="WIDTH: 283px"><br /></td><td class="Report" align="right"><br /></td></tr></tbody></table></div></td></tr></tbody></table></td></tr></tbody></table></td></tr><tr ><td ><table cellSpacing="0" cellPadding="0" width="100%"><tbody ><tr ><td vAlign="top" align="left" background="/AIMS/images/footer-bkgd.gif" colSpan="3"><img height="17" alt="" src="/AIMS/images/footer-bkgd.gif" width="50" border="0"/></td></tr><tr ><td vAlign="top" align="left" colSpan="3"><font face="verdana" color="#666666" size="1"><br /></font></td></tr></tbody></table></td></tr></tbody></table><input id="ViewLinkId" type="hidden" name="ViewLinkId"/><input id="View" type="hidden" value="Default" name="View"/><input id="CausesValidation" type="hidden" name="CausesValidation"/><input id="RenderLocation" type="hidden" value="Server" name="RenderLocation"/> </form></body>
-</HTML>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<HTML>
+<body onload="RunOnLoads()" ms_positioning="FlowLayout"><form id="CollectiveForm" name="CollectiveForm" action="Matter_List.aspx" method="post" defaultbutton="btSearch"><input type="hidden" name="LinkID"/> <input type="hidden" name="Param"/><input type="hidden" name="__EVENTTARGET"/> <input type="hidden" name="__EVENTARGUMENT"/><input type="hidden" value="dDwtMjA3ODMxNDk3NDt0PDtsPGk8MD47aTwxPjs+O2w8dDxAPC9BSU1TL3N0eWxlc2hlZXRzL0RhdGFDZXJ0U3R5bGUuYXNweDs+Ozs+O3Q8cDxsPGRlZmF1bHRCdXR0b247PjtsPGJ0U2VhcmNoOz4+O2w8aTwxPjtpPDM+O2k8ND47aTw4PjtpPDExPjtpPDEzPjtpPDE1Pjs+O2w8dDxAPC9BSU1TL2ltYWdlcy9oZWFkZXItYWltc2xvZ28uZ2lmOy9BSU1TL2ltYWdlcy9oZWFkZXItYmtnZC5naWY7Pjs7Pjt0PEA8L0FJTVMvaW1hZ2VzL2hlYWRlci1yaWdodGVuZC5naWY7Oz47Oz47dDw7bDxpPDI+Oz47bDx0PDtsPGk8MT47aTwyPjs+O2w8dDxwPDtwPGw8b25wcm9wZXJ0eWNoYW5nZTs+O2w8Q29sbGVjdGl2ZVZhbGlkYXRpb25TdW1tYXJ5X09uUHJvcGVydHlDaGFuZ2UoKTs+Pj47Oz47dDxAPC9BSU1TL2ltYWdlcy9hbGVydExlZnRUb3AuZ2lmOy9BSU1TL2ltYWdlcy9hbGVydEhvcml6b250YWwuZ2lmOy9BSU1TL2ltYWdlcy9hbGVydC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0SG9yaXpvbnRhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0UmlnaHRUb3AuZ2lmOy9BSU1TL2ltYWdlcy9hbGVydExlZnRWZXJ0aWNhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0UmlnaHRWZXJ0aWNhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0TGVmdEJvdHRvbS5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0SG9yaXpvbnRhbC5naWY7L0FJTVMvaW1hZ2VzL2FsZXJ0UmlnaHRCb3R0b20uZ2lmOz47Oz47Pj47Pj47dDw7bDxpPDE+O2k8Mz47aTw3Pjs+O2w8dDxwPHA8bDxUZXh0O2luRXJyb3JTdGF0ZTs+O2w8WTtvPGY+Oz4+O3A8bDxvbmNoYW5nZTtjdXJyZW50dmFsdWU7PjtsPEluZGljYXRlQ2hhbmdlZCh0aGlzLCcnKVw7O1k7Pj4+Ozs+O3Q8cDxwPGw8VGV4dDtpbkVycm9yU3RhdGU7PjtsPE9wZW47bzxmPjs+PjtwPGw8b25jaGFuZ2U7Y3VycmVudHZhbHVlOz47bDxJbmRpY2F0ZUNoYW5nZWQodGhpcywnJylcOztPcGVuOz4+Pjs7Pjt0PHA8cDxsPFRvb2xUaXA7PjtsPFxlOz4+Oz47Oz47Pj47dDw7bDxpPDE+O2k8Mz47aTw1PjtpPDY+O2k8Nz47PjtsPHQ8cDxwPGw8aW5FcnJvclN0YXRlO1RleHQ7PjtsPG88Zj47XGU7Pj47cDxsPG9uY2hhbmdlO2N1cnJlbnR2YWx1ZTs+O2w8SW5kaWNhdGVDaGFuZ2VkKHRoaXMsJycpXDs7XGU7Pj4+Ozs+O3Q8cDxwPGw8aW5FcnJvclN0YXRlO1RleHQ7PjtsPG88Zj47XGU7Pj47cDxsPG9uY2hhbmdlO2N1cnJlbnR2YWx1ZTs+O2w8SW5kaWNhdGVDaGFuZ2VkKHRoaXMsJycpXDs7XGU7Pj4+Ozs+O3Q8cDxwPGw8aW5FcnJvclN0YXRlO1RleHQ7PjtsPG88Zj47XGU7Pj47cDxsPG9uY2hhbmdlO2N1cnJlbnR2YWx1ZTs+O2w8SW5kaWNhdGVDaGFuZ2VkKHRoaXMsJycpXDs7XGU7Pj4+Ozs+O3Q8QDxQcm9mZXNzaW9uYWwgaW4gQ2hhcmdlOz47Oz47dDxwPHA8bDxpbkVycm9yU3RhdGU7VGV4dDs+O2w8bzxmPjtcZTs+PjtwPGw8b25jaGFuZ2U7Y3VycmVudHZhbHVlOz47bDxJbmRpY2F0ZUNoYW5nZWQodGhpcywnJylcOztcZTs+Pj47Oz47Pj47dDxAMDxwPHA8bDxEYXRhS2V5cztQYWdpbmdWaWV3O1RvdGFsUmVjb3JkcztQYWdlQ291bnQ7UGFnZVNpemU7U29ydERpcmVjdGlvbjtVbmlxdWVJZDtTb3J0RXhwcmVzc2lvbjtDdXJyZW50UGFnZTtfIUl0ZW1Db3VudDtfIURhdGFTb3VyY2VJdGVtQ291bnQ7TWF4UGFnZU1vZGU7PjtsPGw8PjtPcGVuO2k8MD47aTwwPjtpPDIwPjtpPDE+O2MxNjA4M2Y4LTkwZjgtNDQ1Ni04YzM0LTc5ZTFhNjg2ZDhlMjttYXR0ZXJfbm87aTwxPjtpPC0xPjtpPC0xPjtEYXRhQ2VydC5XZWIuQ29udHJvbHMuTWF4UGFnZU1vZGUsIERhdGFDZXJ0LldlYiwgVmVyc2lvbj0xLjYuMi4xNCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsPE5PUk1BTD47Pj47PjtAMDw7OztAMDxwPGw8SGVhZGVyVGV4dDs+O2w8UHJvZmVzc2lvbmFsIGluIENoYXJnZTs+Pjs7Ozs+O0AwPHA8bDxWaXNpYmxlOz47bDxvPHQ+Oz4+Ozs7Oz47Oz47Ozs7Ozs7Ozs+Ozs+O3Q8QDwvQUlNUy9pbWFnZXMvZm9vdGVyLWJrZ2QuZ2lmOy9BSU1TL2ltYWdlcy9mb290ZXItYmtnZC5naWY7MjAwNjs7Pjs7Pjs+Pjs+Pjs+2T4SCaJMpmBYZKv3iwMGME7j8M0=" name="__VIEWSTATE"/> <input id="PageGuid" type="hidden" value="659179a1-bdcc-41f3-8f27-0495ae9356fd" name="PageGuid"/> <table style="BORDER-COLLAPSE: collapse" height="100%" cellSpacing="0" cellPadding="0" width="100%" border="0"><tbody ><tr ><td ><table cellSpacing="0" cellPadding="0" width="100%" border="0"><tbody ><tr ><td vAlign="top" align="left" width="325"><br /></td><td align="right" background="/AIMS/images/header-bkgd.gif"><table style="DISPLAY: inline" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td ><img src="/Aims/images/nav-leftend.gif"/></td><td background="/Aims/images/nav-center.gif"><span ><table id="NavControl__ctl0_group_1" style="Z-INDEX: 999" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl0_group_1', null, null, 0);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ></tr></tbody></table></span><span ><table style="LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px"><tbody ><tr ><td ><br /></td></tr></tbody></table></span><span ><table class="MenuGroup" id="NavControl__ctl1_group_1" style="Z-INDEX: 999" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_1', null, null, 250);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_1" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_1', 'NavControl__ctl1_group_2', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '10', '', 'MyWork/Inbox.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_1', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_2', 250, null);">MY WORK</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_6" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_6', 'NavControl__ctl1_group_7', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '1', '', 'Matter/Matter_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_6', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_7', 250, null);">MATTER</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_7" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_7', 'NavControl__ctl1_group_8', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '2', '', 'Administrator/Admin_Home.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_7', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_8', 250, null);">ADMINISTRATOR</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_20" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_20', 'NavControl__ctl1_group_21', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '15', '', 'MyWork/AIE.aspx?ClearForm=true'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_20', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_21', 250, null);">AIE</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_21" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_21', 'NavControl__ctl1_group_22', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '16', '', 'Reports/ReportsFrontPage.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_21', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_22', 250, null);">REPORTS</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_22" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_22', 'NavControl__ctl1_group_23', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '17', '', 'javascript:window.open(&quot;[appRoot]/Documentation/PubAIMS_3_02/AIMS_Master_Page.htm&quot;)'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_22', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_23', 250, null);">HELP</td><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_23" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_23', 'NavControl__ctl1_group_24', 'belowleft', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '34', '', 'Logon.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_23', 'NavControl__ctl1_group_1', 'NavControl__ctl1_group_24', 250, null);">LOGOFF</td></tr></tbody></table></span><span ><table class="MenuGroup" id="NavControl__ctl1_group_2" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_2')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_2', 'NavControl__ctl1_item_1', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_2" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_2', 'NavControl__ctl1_group_3', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '11', '', 'MyWork/Inbox.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_2', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_3', 250, null);">INBOX</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_3" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_3', 'NavControl__ctl1_group_4', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '12', '', 'MyWork/Coordinator.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_3', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_4', 250, null);">COORDINATOR</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_4" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_4', 'NavControl__ctl1_group_5', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '13', '', 'MyWork/ErrorManagement.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_4', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_5', 250, null);">ERROR MANAGER</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_5" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_5', 'NavControl__ctl1_group_6', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '14', '', 'MyWork/Invoice_Search.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_5', 'NavControl__ctl1_group_2', 'NavControl__ctl1_group_6', 250, null);">SEARCH</td></tr></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_3" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_3')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_3', 'NavControl__ctl1_item_2', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_4" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_4')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_4', 'NavControl__ctl1_item_3', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_5" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_5')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_5', 'NavControl__ctl1_item_4', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_6" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_6')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_6', 'NavControl__ctl1_item_5', 'NavControl__ctl1_group_2', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_7" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_7')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_7', 'NavControl__ctl1_item_6', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_8" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_8')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_8', 'NavControl__ctl1_item_7', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_8" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_8', 'NavControl__ctl1_group_9', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '19', '', 'Administrator/GeneralSettings_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_8', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_9', 250, null);">GENERAL SETTINGS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_9" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_9', 'NavControl__ctl1_group_10', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '30', '', 'Integration/Log_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_9', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_10', 250, null);">INTEGRATION LOG</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_10" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_10', 'NavControl__ctl1_group_11', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '20', '', 'Administrator/Lookup_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_10', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_11', 250, null);">LOOKUPS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_11" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_11', 'NavControl__ctl1_group_12', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '37', '', 'NotificationLog/Log_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_11', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_12', 250, null);">NOTIFICATION LOG</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_12" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_12', 'NavControl__ctl1_group_13', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '7', '', 'Administrator/MatterType_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_12', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_13', 250, null);">MATTER TYPES</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_13" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_13', 'NavControl__ctl1_group_14', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '6', '', 'Professional/Prof_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_13', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_14', 250, null);">PROFESSIONALS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_14" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_14', 'NavControl__ctl1_group_15', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '9', '', 'Vendor/Vendor_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_14', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_15', 250, null);">VENDORS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_15" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_15', 'NavControl__ctl1_group_16', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '32', '', 'Workflow/WorkflowTitle_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_15', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_16', 250, null);">WORKFLOW TITLES</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_16" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_16', 'NavControl__ctl1_group_17', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '36', '', 'Professional/Prof_SubList.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_16', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_17', 250, null);">WORKFLOW SEARCH-REPLACE</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_17" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_17', 'NavControl__ctl1_group_18', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '5', '', 'Workgroup/Workgroup_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_17', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_18', 250, null);">WORKGROUPS</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_18" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_18', 'NavControl__ctl1_group_19', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '33', '', 'Administrator/System_View.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_18', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_19', 250, null);">SYSTEM POLICY</td></tr><tr ><td class="MenuItem" onmousemove="return false;" id="NavControl__ctl1_item_19" ondblclick="return false;" onmouseover="this.className='MenuItemOver';if (document.readyState == 'complete') aspnm_itemMsOver('NavControl__ctl1_item_19', 'NavControl__ctl1_group_20', 'rightdown', 0, 0, 250, null);" onclick="aspnm_hideAllGroups();Link_OnClick(this.id, '18', '', 'Timekeeper/TimekeeperClassification_List.aspx'); " onmouseout="this.className='MenuItem';if (document.readyState == 'complete') aspnm_itemMsOut('NavControl__ctl1_item_19', 'NavControl__ctl1_group_8', 'NavControl__ctl1_group_20', 250, null);">TIMEKEEPER CLASSIFICATIONS</td></tr></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_9" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_9')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_9', 'NavControl__ctl1_item_8', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_10" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_10')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_10', 'NavControl__ctl1_item_9', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_11" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_11')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_11', 'NavControl__ctl1_item_10', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_12" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_12')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_12', 'NavControl__ctl1_item_11', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_13" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_13')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_13', 'NavControl__ctl1_item_12', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_14" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_14')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_14', 'NavControl__ctl1_item_13', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_15" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_15')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_15', 'NavControl__ctl1_item_14', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_16" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_16')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_16', 'NavControl__ctl1_item_15', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_17" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_17')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_17', 'NavControl__ctl1_item_16', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_18" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_18')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_18', 'NavControl__ctl1_item_17', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_19" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_19')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_19', 'NavControl__ctl1_item_18', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_20" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_20')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_20', 'NavControl__ctl1_item_19', 'NavControl__ctl1_group_8', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_21" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_21')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_21', 'NavControl__ctl1_item_20', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_22" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_22')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_22', 'NavControl__ctl1_item_21', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_23" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_23')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_23', 'NavControl__ctl1_item_22', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table class="MenuGroup" id="NavControl__ctl1_group_24" onmouseover="aspnm_groupMsOver('NavControl__ctl1_group_24')" style="Z-INDEX: 999; LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px" onmouseout="if (document.readyState == 'complete') aspnm_groupMsOut('NavControl__ctl1_group_24', 'NavControl__ctl1_item_23', 'NavControl__ctl1_group_1', 250, null);" cellSpacing="0" cellPadding="0" border="0"><tbody ></tbody></table><table style="LEFT: 0px; VISIBILITY: hidden; POSITION: absolute; TOP: 0px"><tbody ><tr ><td ><br /></td></tr></tbody></table></span></td><td ><img src="/Aims/images/nav-rightend.gif"/></td></tr></tbody></table></td><td vAlign="top" align="left" width="20"><img height="70" alt="" src="/AIMS/images/header-rightend.gif" width="20" border="0"/></td></tr></tbody></table></td></tr><tr ><td width="100%" height="100%"><table height="100%" width="100%" border="0"><tbody ><tr ><td vAlign="top" align="middle"><table border="0"><tbody ><tr ><td align="left"><center ><div id="CustomValidationSummary" style="DISPLAY: none"><div style="DISPLAY: none"></div><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0"><tbody ><tr ><td ><img src="/AIMS/images/alertLeftTop.gif"/><br /><br /></td><td ><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0"><tbody ><tr ><td width="50%" background="/AIMS/images/alertHorizontal.gif"><br /><br /></td><td ><img src="/AIMS/images/alert.gif"/><br /><br /></td><td width="50%" background="/AIMS/images/alertHorizontal.gif"><br /><br /></td></tr></tbody></table><br /><br /></td><td ><img src="/AIMS/images/alertRightTop.gif"/><br /><br /></td></tr><tr ><td background="/AIMS/images/alertLeftVertical.gif"><br /><br /></td><td vAlign="center" align="middle"><div id="ValidationSummaryHeader">     Header Text    <br /><br /></div><div id="ValidationSummaryItem" style="DISPLAY: none">    - Item Text    <br /></div><br /><br /></td><td background="/AIMS/images/alertRightVertical.gif"><br /><br /></td></tr><tr ><td ><img src="/AIMS/images/alertLeftBottom.gif"/><br /><br /></td><td background="/AIMS/images/alertHorizontal.gif"><br /><br /></td><td ><img src="/AIMS/images/alertRightBottom.gif"/><br /><br /></td></tr></tbody></table></div></center><input id="Version_FetchMatterVendorSummaryBO" type="hidden" value="0" name="Version_FetchMatterVendorSummaryBO"/><input id="Version_DocumentBO" type="hidden" value="0" name="Version_DocumentBO"/><input id="Version_MatterBO" type="hidden" value="0" name="Version_MatterBO"/><input id="Version_CustomSettingsBO" type="hidden" value="0" name="Version_CustomSettingsBO"/> <table class="Clear"><tbody ><tr ><td class="Title">List Matters</td></tr></tbody></table><br /><div id="Panel1" style="WIDTH: 400px; HEIGHT: 21px"><span class="DCViewListActive">Open</span> <span class="DCViewListActive"> |</span> <a class="DCViewListInactive" id="DCViewLink2" onclick="setView('Closed',this);" href="javascript:__doPostBack('DCViewLink2','')" pagecontext="">Closed</a> <span class="DCViewListActive"> |</span> <a class="DCViewListInactive" id="DCViewLink3" onclick="setView('All',this);" href="javascript:__doPostBack('DCViewLink3','')" pagecontext="">All</a> </div></td></tr><tr ><td ><div id="pnOpen" style="DISPLAY: block; WIDTH: 160px"><table class="Normal"><tbody ><tr class="Header"><td class="Header">Open Matters </td><td align="right"><table class="Invisible"><tbody ><tr ><td ><div id="DCImageButton1" title="Add Matter" onclick="DCImageButton1_onclick(this);return true;" anchorclicked="false"><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0" width="28" border="0"><tbody ><tr ><td width="1%"><img src="/AIMS/images/bt2Left26gray.gif" border="0"/></td><td style="PADDING-RIGHT: 2px; PADDING-LEFT: 4px" vAlign="center" align="middle" width="98%" background="/AIMS/images/bt2Center26gray.gif"><a class="ButtonText" id="imgbtaDCImageButton1" href="#AimsStandardLink"><nobr ><div class="ButtonText" id="dvbtDCImageButton1Text" style="DISPLAY: inline">Add</div></nobr></a></td><td style="PADDING-RIGHT: 4px; PADDING-LEFT: 2px" vAlign="center" align="middle" width="98%" background="/AIMS/images/bt2Center26gray.gif"><img id="imgbtDCImageButton1" src="/AIMS/images/add.gif" border="0"/></td><td width="1%"><img src="/AIMS/images/bt2Right26gray.gif" border="0"/></td></tr></tbody></table></div></td><td ><div id="DCCollapseButton1" title="" onclick="DCCollapseButton1_onclick(this);return true;" anchorclicked="false"><table style="BORDER-COLLAPSE: collapse" cellSpacing="0" cellPadding="0" width="0" border="0"><tbody ><tr ><td width="1%"><img src="/AIMS/images/bt2Left26gray.gif" border="0"/></td><td style="PADDING-RIGHT: 4px; PADDING-LEFT: 4px" vAlign="center" align="middle" width="98%" background="/AIMS/images/bt2Center26gray.gif"><a class="ButtonText" id="imgbtaDCCollapseButton1" href="#AimsStandardLink"><img id="imgbtDCCollapseButton1" src="/AIMS/images/blue-chevron_up.gif" border="0"/></a></td><td width="1%"><img src="/AIMS/images/bt2Right26gray.gif" border="0"/></td></tr></tbody></table></div><input id="SearchState" type="hidden" value="False" name="SearchState"/></td></tr></tbody></table></td></tr></tbody></table></div><div id="panelSearch" style="DISPLAY: block"><table class="Normal" id="Table1"><tbody ><tr class="Report"><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report" style="WIDTH: 287px"><br /></td><td class="Report"><br /></td></tr><tr class="Report"><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report"><br /></td><td class="Report" style="WIDTH: 283px"><br /></td><td class="Report" align="right"><br /></td></tr></tbody></table></div></td></tr></tbody></table></td></tr></tbody></table></td></tr><tr ><td ><table cellSpacing="0" cellPadding="0" width="100%"><tbody ><tr ><td vAlign="top" align="left" background="/AIMS/images/footer-bkgd.gif" colSpan="3"><img height="17" alt="" src="/AIMS/images/footer-bkgd.gif" width="50" border="0"/></td></tr><tr ><td vAlign="top" align="left" colSpan="3"><font face="verdana" color="#666666" size="1"><br /></font></td></tr></tbody></table></td></tr></tbody></table><input id="ViewLinkId" type="hidden" name="ViewLinkId"/><input id="View" type="hidden" value="Default" name="View"/><input id="CausesValidation" type="hidden" name="CausesValidation"/><input id="RenderLocation" type="hidden" value="Server" name="RenderLocation"/> </form></body>
+</HTML>
diff --git a/test/rexml/data/xp.tst b/test/rexml/data/xp.tst
index 6551372575..fb670010b2 100644
--- a/test/rexml/data/xp.tst
+++ b/test/rexml/data/xp.tst
@@ -1,27 +1,27 @@
-/
-/rss
-//rss
-/rss/channel
-//link
-//image/*
-//link[2]
-//link[last()]
-rss/channel/link[last()]
-rss/channel/item/link[last()]
-rss/channel/item/link[1]
-rss/channel/item[@x='1']
-rss/channel/item[@x]
-//item[@x]
-//item[normalize-space(@name)='x']
-//*[count(title)=1]
-//*[name()='link']
-//*[starts-with(name(),'li')]
-//*[contains(name(),'y')]
-//*[string-length(name()) = 4]
-//copyright | //title
-/child::rss
-/descendant::*
-//language/parent::*
-/rss/channel/ancestor::*
-//item[position() mod 2 = 0 ]
+/
+/rss
+//rss
+/rss/channel
+//link
+//image/*
+//link[2]
+//link[last()]
+rss/channel/link[last()]
+rss/channel/item/link[last()]
+rss/channel/item/link[1]
+rss/channel/item[@x='1']
+rss/channel/item[@x]
+//item[@x]
+//item[normalize-space(@name)='x']
+//*[count(title)=1]
+//*[name()='link']
+//*[starts-with(name(),'li')]
+//*[contains(name(),'y')]
+//*[string-length(name()) = 4]
+//copyright | //title
+/child::rss
+/descendant::*
+//language/parent::*
+/rss/channel/ancestor::*
+//item[position() mod 2 = 0 ]
//item/ancestor::* \ No newline at end of file
diff --git a/test/rexml/test_attributes.rb b/test/rexml/test_attributes.rb
index e46850de3a..51a7774b0f 100644
--- a/test/rexml/test_attributes.rb
+++ b/test/rexml/test_attributes.rb
@@ -91,10 +91,10 @@ class AttributesTester < Test::Unit::TestCase
# Submitted by Kou
def test_namespace_conflict
- assert_raise( ParseException,
+ assert_raise( ParseException,
"Declaring two attributes with the same namespace should be an error" ) do
REXML::Document.new <<-XML
- <x xmlns:n1="http://www.w3.org"
+ <x xmlns:n1="http://www.w3.org"
xmlns:n2="http://www.w3.org" >
<bad n1:a="1" n2:a="2" />
</x>
diff --git a/test/rexml/test_changing_encoding.rb b/test/rexml/test_changing_encoding.rb
index c6c1f59a1a..f83247afb1 100644
--- a/test/rexml/test_changing_encoding.rb
+++ b/test/rexml/test_changing_encoding.rb
@@ -1,13 +1,15 @@
#!/usr/bin/ruby -Ku
# -*- coding: utf-8 -*-
+require 'kconv'
+require 'iconv'
require 'rexml/encoding'
class ChangingEncodings < Test::Unit::TestCase
def initialize a
@u = 'テスト ã»ã’ ãµãŒ 美ã—ã„'
- @e = @u.encode("EUC-JP")
+ @e = Kconv.toeuc(@u)
@f = Foo.new
super
end
diff --git a/test/rexml/test_comment.rb b/test/rexml/test_comment.rb
deleted file mode 100644
index ebe3eead8d..0000000000
--- a/test/rexml/test_comment.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "test/unit/testcase"
-
-require 'rexml/document'
-
-module REXMLTest
- class CommentTester < Test::Unit::TestCase
- # Bug #5278
- def test_hyphen_end_line_in_doctype
- xml = <<-XML
-<?xml version="1.0"?>
-<!DOCTYPE root [
-<!-- comment end with hyphen -
- here -->
-]>
-<root/>
- XML
- document = REXML::Document.new(xml)
- comments = document.doctype.children.find_all do |child|
- child.is_a?(REXML::Comment)
- end
- assert_equal([" comment end with hyphen -\n here "],
- comments.collect(&:to_s))
- end
- end
-end
diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb
index db7c18d027..bf559ddc9f 100644
--- a/test/rexml/test_contrib.rb
+++ b/test/rexml/test_contrib.rb
@@ -92,7 +92,7 @@ DELIMITER
doc = REXML::Document.new source
assert_equal "myprog-config", doc.root.name
count = 0
- REXML::XPath.each(doc, "x:myprog-config/x:main/x:parameter",
+ REXML::XPath.each(doc, "x:myprog-config/x:main/x:parameter",
{"x"=>"http://someurl/program/version"}) { |element|
assert_equal "name", element.attributes["name"]
count += 1;
@@ -183,7 +183,7 @@ DELIMITER
result = XPath.first(doc, xpath)
assert_equal desired_result.to_s, result.to_s
end
-
+
def test_xpath_whitespace_TobiasReif
# same as above, with whitespace in XPath
doc = Document.new(XML_STRING_01.dup)
@@ -193,7 +193,7 @@ DELIMITER
failure_message = "\n[[[TR: AFAIK, whitespace should be allowed]]]\n"
assert_equal(desired_result.to_s, result.to_s, failure_message)
end
-
+
def test_xpath_02_TobiasReif
doc = Document.new XML_STRING_01.dup
desired_result = Document.new '<author>Thomas, David; Hunt, Andrew</author>'
@@ -211,7 +211,7 @@ DELIMITER
failure_message = "\nHow to handle the apos inside the string inside the XPath?\nXPath = #{xpath}\n"
assert_equal desired_result.to_s, result.to_s, failure_message
end
-
+
def test_xpath_03_TobiasReif
doc = Document.new XML_STRING_02.dup
desired_result_string = "<entry type='Book'>
@@ -221,7 +221,7 @@ DELIMITER
<type>Book</type>
<year>2000</year>
</entry>"
- Document.new desired_result_string
+ desired_result_tree = Document.new desired_result_string
xpath = "/biblio/entry[not(author)]"
result = XPath.first(doc, xpath)
assert_equal desired_result_string, result.to_s
@@ -255,21 +255,23 @@ DELIMITER
<position><aktuell datum="01-10-11">Technik</aktuell></position>
<hauptspalte>
<headline>Technik</headline>
-Die Technik ist das R\xFCckgrat der meisten Gesch\xFCftsprozesse bei Home of the Brave. Deshalb sollen hier alle relevanten technischen Abl\xFCufe, Daten und Einrichtungen beschrieben werden, damit jeder im Bedarfsfall die n\xFCtigen Informationen, Anweisungen und Verhaltensempfehlungen nachlesen und/oder abrufen kann.
+Die Technik ist das Rückgrat der meisten Geschäftsprozesse bei Home of the Brave. Deshalb sollen hier alle relevanten technischen Abläufe, Daten und Einrichtungen beschrieben werden, damit jeder im Bedarfsfall die nötigen Informationen, Anweisungen und Verhaltensempfehlungen nachlesen und/oder abrufen kann.
</hauptspalte>
<nebenspalte>
<link ziel="Flash/">Flash</link><umbruch/>
- N\xFCtzliches von Flashern f\xFCr Flasher.<umbruch/>
+ Nützliches von Flashern für Flasher.<umbruch/>
<link neu="ja" ziel="Cvs/">CVS-FAQ</link><umbruch/>
FAQ zur Benutzung von CVS bei HOB
</nebenspalte>
</intranet>
EOF
tn = XPath.first(doc, "//nebenspalte/text()[2]")
- expected_iso = "N\xFCtzliches von Flashern f\xFCr Flasher."
- expected_utf = expected_iso.unpack('C*').pack('U*')
- expected_iso.force_encoding(::Encoding::ISO_8859_1)
- expected_utf.force_encoding(::Encoding::UTF_8)
+ expected_iso = "Nützliches von Flashern für Flasher."
+ expected_utf = expected_iso.unpack('C*').pack('U*')
+ if expected_utf.respond_to? :encode
+ expected_iso.force_encoding("iso-8859-1")
+ expected_utf.force_encoding(Encoding::UTF_8)
+ end
assert_equal(expected_utf, tn.to_s.strip)
f = REXML::Formatters::Default.new
f.write( tn, Output.new(o = "", "ISO-8859-1") )
@@ -303,7 +305,7 @@ EOF
assert_nil XPath.first(doc,'//leg')
assert_equal 'http://www.foo.com/human', doc.root.elements[1].namespace
- assert_equal 'human leg',
+ assert_equal 'human leg',
XPath.first(doc, '//x:leg/text()', {'x'=>'http://www.foo.com/human'}).to_s
end
@@ -312,8 +314,8 @@ EOF
source = File.new(fixture_path('ProductionSupport.xml'))
h = Hash.new
doc = REXML::Document.new source
- doc.elements.each("//CommonError") { |el|
- h[el.elements['Key'].text] = 'okay'
+ doc.elements.each("//CommonError") { |el|
+ h[el.elements['Key'].text] = 'okay'
}
assert(h.include?('MotorInsuranceContract(Object)>>#error:'))
end
@@ -426,7 +428,7 @@ EOF
assert text !~ /&rbconfig/, "'#{text}' failed"
end
- #Error occurred in test_package_file_opens(TC_PackageInstall):
+ #Error occurred in test_package_file_opens(TC_PackageInstall):
# ArgumentError:
#illegal access mode &rbconfig.prefix;/lib/rexml
#
@@ -438,7 +440,7 @@ EOF
end
def test_whitespace_after_xml_decl
- Document.new <<EOL
+ d = Document.new <<EOL
<?xml version='1.0'?>
<blo>
<wak>
@@ -464,7 +466,7 @@ EOL
end
end
- def test_maintain_dtd
+ def test_maintain_dtd
src = %q{<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ivattacks SYSTEM "../../ivacm.dtd" [
<!ENTITY % extern-packages SYSTEM "../../ivpackages.dtd">
@@ -506,7 +508,7 @@ EOL
b << c
a << b
- REXML::Formatters::Pretty.new.write(a,"")
+ REXML::Formatters::Pretty.new.write(a,s="")
end
def test_pos
@@ -523,7 +525,7 @@ EOL
testfile.puts testdata
testfile.rewind
assert_nothing_raised do
- REXML::Document.new(testfile)
+ d = REXML::Document.new(testfile)
end
testfile.close(true)
end
diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb
index 0865aa9747..b1f6332968 100644
--- a/test/rexml/test_core.rb
+++ b/test/rexml/test_core.rb
@@ -20,7 +20,7 @@ class Tester < Test::Unit::TestCase
<?xsl stylesheet="blah.xsl"?>
<!-- The first line tests the XMLDecl, the second tests PI.
The next line tests DocType. This line tests comments. -->
- <!DOCTYPE xsa PUBLIC
+ <!DOCTYPE xsa PUBLIC
"-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
"http://www.garshol.priv.no/download/xsa/xsa.dtd">
@@ -80,7 +80,7 @@ class Tester < Test::Unit::TestCase
# This because of a reported bug in attribute handling in 1.0a8
source = '<a att="A">blah</a>'
doc = Document.new source
- doc.elements.each do |a|
+ doc.elements.each do |a|
a.attributes['att'] << 'B'
assert_equal "AB", a.attributes['att']
a.attributes['att'] = 'C'
@@ -155,11 +155,11 @@ class Tester < Test::Unit::TestCase
assert_equal 3, doc.root.size
assert_equal 1, doc.root.elements.size
- text = " This is text
+ text = " This is text
with a lot of whitespace "
source = "<a>#{text}<b>#{text}</b><c>#{text}</c>#{text}</a>"
- doc = Document.new( source, {
+ doc = Document.new( source, {
:respect_whitespace => %w{ a c }
} )
assert_equal text, doc.elements["//c"].text
@@ -207,8 +207,8 @@ class Tester < Test::Unit::TestCase
doc.write(test="")
assert_equal(correct, test)
- multi_line_source = '<!DOCTYPE xsa PUBLIC
- "-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
+ multi_line_source = '<!DOCTYPE xsa PUBLIC
+ "-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
"http://www.garshol.priv.no/download/xsa/xsa.dtd">
<a/>'
d = Document.new( multi_line_source )
@@ -217,8 +217,8 @@ class Tester < Test::Unit::TestCase
doc.write(test="")
assert_equal(correct, test)
- odd_space_source = ' <!DOCTYPE
- xsa PUBLIC "-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
+ odd_space_source = ' <!DOCTYPE
+ xsa PUBLIC "-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
"http://www.garshol.priv.no/download/xsa/xsa.dtd"> <a/>'
d = Document.new( odd_space_source )
dt = d.doctype
@@ -230,12 +230,34 @@ class Tester < Test::Unit::TestCase
doc = Document.new(docin)
doc.write(test="")
assert_equal(31, doc.doctype.size)
+
+ # Here's a little ditty from Tobias...
+ src = <<-EOL
+ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
+ "http://www.w3.org/TR/SVG/DTD/svg10.dtd"
+ [
+ <!-- <!ENTITY % fast-slow "0 0 .5 1">-->
+ <!--<!ENTITY % slow-fast ".5 0 1 1">-->
+ <!ENTITY hover_ani
+ '<animateTransform attributeName="transform"
+ type="scale" restart="whenNotActive" values="1;0.96"
+ dur="0.5s" calcMode="spline" keySplines="0 0 .5 1"
+ fill="freeze" begin="mouseover"/>
+ <animateTransform attributeName="transform"
+ type="scale" restart="whenNotActive" values="0.96;1"
+ dur="0.5s" calcMode="spline" keySplines=".5 0 1 1"
+ fill="freeze" begin="mouseover+0.5s"/>'
+ >
+ ]
+ > <a/>
+ EOL
end
def test_document
# Testing cloning
source = "<element/>"
doc = Document.new source
+ doc2 = Document.new doc
# Testing Root
assert_equal doc.root.name.to_s, "element"
@@ -244,7 +266,7 @@ class Tester < Test::Unit::TestCase
source = @xsa_source
doc = Document.new source
assert_instance_of XMLDecl, doc.xml_decl
- assert_instance_of DocType, doc.doctype
+ assert_instance_of DocType, doc.doctype
assert_equal doc.version, "1.0"
source = File.new(fixture_path("dash.xml"))
@@ -349,6 +371,9 @@ class Tester < Test::Unit::TestCase
assert_equal(string, text.to_s)
text2 = Text.new(text)
assert_equal(text, text2)
+ string = "Frozen".freeze
+ text3 = Text.new(string)
+ assert_equal(string, text3.to_s)
#testing substitution
string = "0 < ( 1 & 1 )"
correct = "0 &lt; ( 1 &amp; 1 )"
@@ -361,7 +386,7 @@ class Tester < Test::Unit::TestCase
assert_equal(string, text.to_s)
string2 = "<a>#{string}</a>"
- doc = Document.new( string2, {
+ doc = Document.new( string2, {
:raw => %w{ a b }
} )
f.write(doc,out="")
@@ -400,12 +425,6 @@ class Tester < Test::Unit::TestCase
assert_equal( '<a><b/><c/></a>', doc.to_s )
end
- def test_text_frozen
- string = "Frozen".freeze
- text = Text.new(string)
- assert_equal(string, text.to_s)
- end
-
def test_xmldecl
source = "<?xml version='1.0'?>"
# test args
@@ -417,11 +436,6 @@ class Tester < Test::Unit::TestCase
assert_equal source, decl2.to_s
end
- def test_xmldecl_utf_16be_encoding_name
- assert_equal("<?xml version='1.0' encoding='UTF-16'?>",
- XMLDecl.new("1.0", "UTF-16").to_s)
- end
-
def each_test( element, xpath, num_children )
count = 0
element.each_element( xpath ) { |child|
@@ -447,7 +461,7 @@ class Tester < Test::Unit::TestCase
assert_equal "Datasets", child.name
}
each_test(doc, "Project/Datasets/link", 2 )
- each_test(doc.root, "/Project/Description", 1) {|child|
+ each_test(doc.root, "/Project/Description", 1) {|child|
assert_equal "Description", child.name
}
each_test(doc.root, "./Description",1 ) { |child|
@@ -626,10 +640,11 @@ class Tester < Test::Unit::TestCase
end
def test_line
- Document.new File.new(fixture_path("bad.xml"))
+ doc = Document.new File.new(fixture_path("bad.xml"))
assert_fail "There should have been an error"
rescue Exception
# We should get here
+ er = $!
assert($!.line == 5, "Should have been an error on line 5, "+
"but was reported as being on line #{$!.line}" )
end
@@ -647,11 +662,13 @@ class Tester < Test::Unit::TestCase
def test_exception
source = SourceFactory.create_from "<a/>"
p = ParseException.new( "dummy message", source )
+ s = p.to_s
begin
raise "dummy"
rescue Exception
p.continued_exception = $!
end
+ s = p.to_s
end
def test_bad_content
@@ -663,7 +680,7 @@ class Tester < Test::Unit::TestCase
assert_equal "content>content", tree_gt.elements[1].text
# This isn't
begin
- Document.new in_lt
+ tree_lt = Document.new in_lt
assert_fail "Should have gotten a parse error"
rescue ParseException
end
@@ -747,7 +764,7 @@ class Tester < Test::Unit::TestCase
doc.root.each_element_with_text( nil, 0, 'd', &block )
assert_equal 0, arry.size
end
-
+
def test_element_parse_stream
s = Source.new( "<a>some text</a>" )
l = Listener.new
@@ -791,7 +808,7 @@ EOL
assert_equal('eeü'.force_encoding("UTF-8"), a.root.text)
end
- def test_element_decl
+ def test_element_decl
element_decl = Source.new("<!DOCTYPE foo [
<!ELEMENT bar (#PCDATA)>
]>")
@@ -805,7 +822,7 @@ EOL
<!DOCTYPE blah [
<!ATTLIST blah
xmlns CDATA "foo">
- <!ATTLIST a
+ <!ATTLIST a
bar CDATA "gobble"
xmlns:one CDATA "two"
>
@@ -836,15 +853,17 @@ EOL
def test_attlist_write
file=File.new(fixture_path("foo.xml"))
- doc=Document.new file
+ doc=Document.new file
+ root = doc.root
+
out = ''
- doc.write(out)
+ doc.write(out)
end
def test_more_namespaces
- assert_raise( REXML::UndefinedNamespaceException,
+ assert_raise( REXML::UndefinedNamespaceException,
%Q{Should have gotten an Undefined Namespace error} ) {
- Document.new("<r><p><n:c/></p></r>")
+ doc1 = Document.new("<r><p><n:c/></p></r>")
}
doc2 = Document.new("<r xmlns:n='1'><p><n:c/></p></r>")
es = XPath.match(doc2, '//c')
@@ -895,7 +914,7 @@ EOL
end
def test_oses_with_bad_EOLs
- Document.new("\n\n\n<?xml version='1.0'?>\n\n\n<a/>\n\n")
+ d = Document.new("\n\n\n<?xml version='1.0'?>\n\n\n<a/>\n\n")
end
# Contributed (with patch to fix bug) by Kouhei
@@ -934,25 +953,25 @@ EOL
end
def test_accents
- docs = [
+ docs = [
%Q{<?xml version="1.0" encoding="ISO-8859-1"?>
<gnuPod>
<files>
<file id="57" artist="Coralie Cl\357\277\275ent" />
</files>
-</gnuPod>},
+</gnuPod>},
'<?xml version="1.0" encoding="ISO-8859-1"?>
<gnuPod>
<files>
<file id="71" album="Astrakan Caf" />
</files>
-</gnuPod>',
+</gnuPod>',
%Q{<?xml version="1.0" encoding="ISO-8859-1"?>
<gnuPod>
<files>
<file id="71" album="Astrakan Caf\357\277\275eria" />
</files>
-</gnuPod>},
+</gnuPod>},
%Q{<?xml version="1.0" encoding="ISO-8859-1"?>
<gnuPod>
<files>
@@ -1003,6 +1022,7 @@ EOL
document.write(s)
end
+
def test_write_cdata
src = "<a>A</a>"
doc = REXML::Document.new( src )
@@ -1023,15 +1043,15 @@ EOL
<x:b x:n="foo"/>
</a>
EOL
- d = Document.new( source )
+ d = REXML::Document.new( source )
assert_equal( 'foo', REXML::XPath.first(d.root, "//x:b/@x:n").value )
assert_equal( nil, REXML::XPath.first(d.root, "//x:b/@x:n", {}))
end
def test_null_element_name
- a = REXML::Document.new
+ a = REXML::Document.new
assert_raise( RuntimeError ) {
- a.add_element( nil )
+ a.add_element( nil )
}
end
@@ -1073,22 +1093,22 @@ EOL
# Ticket #44
t = REXML::Text.new( "&amp;", false, nil, true )
assert_equal( "&amp;", t.to_s )
-
+
t = REXML::Text.new("&amp;", false, false)
assert_equal( "&amp;amp;", t.to_s )
end
def test_to_xpath
- doc = REXML::Document.new( %q{<tag1>
- <tag2 name="tag2"/>
- <tag2 name="tag2"/>
- </tag1>})
+ doc = REXML::Document.new( %q{<tag1>
+ <tag2 name="tag2"/>
+ <tag2 name="tag2"/>
+ </tag1>})
names = %w{ /tag1/tag2[1] /tag1/tag2[2] }
- doc.root.elements.each_with_index {|el, i|
+ doc.root.elements.each_with_index {|el, i|
assert_equal( names[i], el.xpath )
- }
+ }
end
-
+
def test_transitive
doc = REXML::Document.new( "<a/>")
s = ""
@@ -1106,6 +1126,7 @@ EOL
end
def test_repeated_writes
+ require 'iconv'
a = IO.read(fixture_path("iso8859-1.xml"))
f = REXML::Formatters::Pretty.new
@@ -1129,29 +1150,6 @@ EOL
assert_not_equal( c, d )
end
- def test_pretty_format_long_text_finite
- n = 1_000_000
- long_text = 'aaaa ' * n
- xml = "<doc>#{long_text}</doc>"
- formatter = REXML::Formatters::Pretty.new
- document = nil
- begin
- document = REXML::Document.new(xml)
- rescue REXML::ParseException
- skip_message = "skip this test because we can't check Pretty#wrap " +
- "works without #<SystemStackError: stack level too deep> on " +
- "small memory system. #<RegexpError: failed to allocate memory> " +
- "will be raised on the system. See also [ruby-dev:42599]."
- return skip_message
- end
- output = ""
- formatter.write(document, output)
- assert_equal("<doc>\n" +
- ((" " + (" aaaa" * 15) + "\n") * (n / 15)) +
- " " + ("aaaa " * (n % 15)) + "\n" +
- "</doc>",
- output)
- end
def test_pretty_format_deep_indent
n = 6
@@ -1176,34 +1174,34 @@ EOL
element0
element0
element0
- element0\s
+ element0
<element1>
element1
element1
element1
element1
- element1\s
+ element1
<element2>
element2
element2
element2
element2
- element2\s
+ element2
<element3>
element3
element3
element3
element3
- element3\s
+ element3
<element4>
element4
element4
element4
element4
element4
- \s
+
<element5>
- element5 element5 element5 element5 element5\s
+ element5 element5 element5 element5 element5
</element5>
</element4>
</element3>
@@ -1218,19 +1216,19 @@ EOL
doc = REXML::Document.new
doc << REXML::XMLDecl.default
doc << REXML::Element.new("a")
-
+
str = ""
doc.write(str)
-
+
assert_equal("<a/>", str)
doc = REXML::Document.new
doc << REXML::XMLDecl.new("1.0", "UTF-8")
doc << REXML::Element.new("a")
-
+
str = ""
doc.write(str)
-
+
assert_equal("<?xml version='1.0' encoding='UTF-8'?><a/>", str)
end
@@ -1249,7 +1247,7 @@ EOL
def test_ticket_52
source = "<!-- this is a single line comment -->"
- d = REXML::Document.new(source)
+ d = REXML::Document.new(source)
d.write(k="")
assert_equal( source, k )
@@ -1270,17 +1268,17 @@ EOL
def test_ticket_21
src = "<foo bar=value/>"
assert_raise( ParseException, "invalid XML should be caught" ) {
- Document.new(src)
+ d = REXML::Document.new(src)
}
begin
- Document.new(src)
+ d = REXML::Document.new(src)
rescue
assert_match( /missing attribute quote/, $!.message )
end
end
def test_ticket_63
- Document.new(File.new(fixture_path("t63-1.xml")))
+ d = REXML::Document.new(File.new(fixture_path("t63-1.xml")))
end
def test_ticket_75
@@ -1293,7 +1291,7 @@ EOL
#- rexml sanity check (bugs in ruby 1.8.4, ruby 1.8.6)
xmldoc = Document.new("<test/>")
xmldoc << XMLDecl.new(XMLDecl::DEFAULT_VERSION, "UTF-8")
- content = ['61c3a927223c3e26'].pack("H*")
+ content = ['61c3a927223c3e26'].pack("H*")
content.force_encoding('UTF-8') if content.respond_to?(:force_encoding)
#- is some UTF-8 text but just to make sure my editor won't magically convert..
xmldoc.root.add_attribute('attr', content)
@@ -1309,14 +1307,14 @@ EOL
assert_equal( sanity1, sanity2 )
end
-
+
def test_ticket_88
doc = REXML::Document.new("<?xml version=\"1.0\" encoding=\"shift_jis\"?>")
assert_equal("<?xml version='1.0' encoding='SHIFT_JIS'?>", doc.to_s)
doc = REXML::Document.new("<?xml version = \"1.0\" encoding = \"shift_jis\"?>")
assert_equal("<?xml version='1.0' encoding='SHIFT_JIS'?>", doc.to_s)
end
-
+
def test_ticket_85
xml = <<ENDXML
<foo>
@@ -1332,6 +1330,8 @@ ENDXML
</bar>
</foo>"
+ zml = "<foo><bar><bob name='jimmy'/></bar></foo>"
+
# The pretty printer ignores all whitespace, anyway so output1 == output2
f = REXML::Formatters::Pretty.new( 2 )
d = Document.new( xml, :ignore_whitespace_nodes=>:all )
@@ -1346,7 +1346,7 @@ ENDXML
# The base case.
d = Document.new(yml)
f.write( d, output3="" )
-
+
assert_equal( output3.strip, output2.strip )
d = Document.new(yml)
@@ -1390,10 +1390,10 @@ ENDXML
end
def test_ticket_14
- # Per .2.5 Node Tests of XPath spec
- assert_raise( REXML::UndefinedNamespaceException,
+ # Per .2.5 Node Tests of XPath spec
+ assert_raise( REXML::UndefinedNamespaceException,
%Q{Should have gotten an Undefined Namespace error} ) {
- Document.new("<a><n:b/></a>")
+ d = Document.new("<a><n:b/></a>")
}
end
@@ -1430,7 +1430,7 @@ ENDXML
doc.add_element(bean_element)
REXML::Formatters::Pretty.new(3).write( doc, out = "" )
-
+
assert_equal "<bean>\n <prop key='filter'>\n (&amp;#38;(|(memberof=CN=somegroupabcdefgh,OU=OUsucks,DC=hookemhorns,DC=com)(mail=*someco.com))(acct=%u)(!(extraparameter:2.2.222.222222.2.2.222:=2)))\n </prop>\n</bean>", out
end
diff --git a/test/rexml/test_doctype.rb b/test/rexml/test_doctype.rb
deleted file mode 100644
index 0a87c0a304..0000000000
--- a/test/rexml/test_doctype.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-#! /usr/local/bin/ruby
-
-
-require 'test/unit'
-require 'rexml/document'
-
-class TestDocTypeAccessor < Test::Unit::TestCase
-
- def setup
- @sysid = "urn:x-test:sysid1"
- @notid1 = "urn:x-test:notation1"
- @notid2 = "urn:x-test:notation2"
- document_string1 = <<-"XMLEND"
- <!DOCTYPE r SYSTEM "#{@sysid}" [
- <!NOTATION n1 SYSTEM "#{@notid1}">
- <!NOTATION n2 SYSTEM "#{@notid2}">
- ]>
- <r/>
- XMLEND
- @doctype1 = REXML::Document.new(document_string1).doctype
-
- @pubid = "TEST_ID"
- document_string2 = <<-"XMLEND"
- <!DOCTYPE r PUBLIC "#{@pubid}">
- <r/>
- XMLEND
- @doctype2 = REXML::Document.new(document_string2).doctype
-
- document_string3 = <<-"XMLEND"
- <!DOCTYPE r PUBLIC "#{@pubid}" "#{@sysid}">
- <r/>
- XMLEND
- @doctype3 = REXML::Document.new(document_string3).doctype
-
- end
-
- def test_public
- assert_equal(nil, @doctype1.public)
- assert_equal(@pubid, @doctype2.public)
- assert_equal(@pubid, @doctype3.public)
- end
-
- def test_system
- assert_equal(@sysid, @doctype1.system)
- assert_equal(nil, @doctype2.system)
- assert_equal(@sysid, @doctype3.system)
- end
-
- def test_notation
- assert_equal(@notid1, @doctype1.notation("n1").system)
- assert_equal(@notid2, @doctype1.notation("n2").system)
- end
-
- def test_notations
- notations = @doctype1.notations
- assert_equal(2, notations.length)
- assert_equal(@notid1, find_notation(notations, "n1").system)
- assert_equal(@notid2, find_notation(notations, "n2").system)
- end
-
- def find_notation(notations, name)
- notations.find { |notation|
- name == notation.name
- }
- end
-
-end
-
-class TestNotationDeclPublic < Test::Unit::TestCase
- def setup
- @name = "vrml"
- @id = "VRML 1.0"
- @uri = "http://www.web3d.org/"
- end
-
- def test_to_s
- assert_equal("<!NOTATION #{@name} PUBLIC \"#{@id}\">",
- decl(@id, nil).to_s)
- end
-
- def test_to_s_with_uri
- assert_equal("<!NOTATION #{@name} PUBLIC \"#{@id}\" \"#{@uri}\">",
- decl(@id, @uri).to_s)
- end
-
- private
- def decl(id, uri)
- REXML::NotationDecl.new(@name, "PUBLIC", id, uri)
- end
-end
-
-class TestNotationDeclSystem < Test::Unit::TestCase
- def setup
- @name = "gif"
- @id = "gif viewer"
- end
-
- def test_to_s
- assert_equal("<!NOTATION #{@name} SYSTEM \"#{@id}\">",
- decl(@id).to_s)
- end
-
- private
- def decl(id)
- REXML::NotationDecl.new(@name, "SYSTEM", id, nil)
- end
-end
diff --git a/test/rexml/test_doctype_mixin.rb b/test/rexml/test_doctype_mixin.rb
new file mode 100644
index 0000000000..78014bb5da
--- /dev/null
+++ b/test/rexml/test_doctype_mixin.rb
@@ -0,0 +1,67 @@
+#! /usr/local/bin/ruby
+
+
+require 'test/unit'
+require 'rexml/document'
+
+class TestDoctype < Test::Unit::TestCase
+
+ def setup
+ @sysid = "urn:x-test:sysid1"
+ @notid1 = "urn:x-test:notation1"
+ @notid2 = "urn:x-test:notation2"
+ document_string1 = <<-"XMLEND"
+ <!DOCTYPE r SYSTEM "#{@sysid}" [
+ <!NOTATION n1 SYSTEM "#{@notid1}">
+ <!NOTATION n2 SYSTEM "#{@notid2}">
+ ]>
+ <r/>
+ XMLEND
+ @doctype1 = REXML::Document.new(document_string1).doctype
+
+ @pubid = "TEST_ID"
+ document_string2 = <<-"XMLEND"
+ <!DOCTYPE r PUBLIC "#{@pubid}">
+ <r/>
+ XMLEND
+ @doctype2 = REXML::Document.new(document_string2).doctype
+
+ document_string3 = <<-"XMLEND"
+ <!DOCTYPE r PUBLIC "#{@pubid}" "#{@sysid}">
+ <r/>
+ XMLEND
+ @doctype3 = REXML::Document.new(document_string3).doctype
+
+ end
+
+ def test_public
+ assert_equal(nil, @doctype1.public)
+ assert_equal(@pubid, @doctype2.public)
+ assert_equal(@pubid, @doctype3.public)
+ end
+
+ def test_system
+ assert_equal(@sysid, @doctype1.system)
+ assert_equal(nil, @doctype2.system)
+ assert_equal(@sysid, @doctype3.system)
+ end
+
+ def test_notation
+ assert_equal(@notid1, @doctype1.notation("n1").system)
+ assert_equal(@notid2, @doctype1.notation("n2").system)
+ end
+
+ def test_notations
+ notations = @doctype1.notations
+ assert_equal(2, notations.length)
+ assert_equal(@notid1, find_notation(notations, "n1").system)
+ assert_equal(@notid2, find_notation(notations, "n2").system)
+ end
+
+ def find_notation(notations, name)
+ notations.find { |notation|
+ name == notation.name
+ }
+ end
+
+end
diff --git a/test/rexml/test_document.rb b/test/rexml/test_document.rb
index 1f31635f49..ab0b1e4e96 100644
--- a/test/rexml/test_document.rb
+++ b/test/rexml/test_document.rb
@@ -47,49 +47,6 @@ EOF
</member>
EOF
- XML_WITH_NESTED_EMPTY_ENTITY = <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE member [
- <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
- <!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;">
- <!ENTITY c "&d;&d;&d;&d;&d;&d;&d;&d;&d;&d;">
- <!ENTITY d "&e;&e;&e;&e;&e;&e;&e;&e;&e;&e;">
- <!ENTITY e "&f;&f;&f;&f;&f;&f;&f;&f;&f;&f;">
- <!ENTITY f "&g;&g;&g;&g;&g;&g;&g;&g;&g;&g;">
- <!ENTITY g "">
-]>
-<member>
-&a;
-</member>
-EOF
-
- XML_WITH_NESTED_PARAMETER_ENTITY = <<EOF
-<!DOCTYPE root [
- <!ENTITY % a "BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.">
- <!ENTITY % b "%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;">
- <!ENTITY % c "%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;">
- <!ENTITY % d "%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;">
- <!ENTITY % e "%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;">
- <!ENTITY % f "%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;">
- <!ENTITY % g "%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;">
- <!ENTITY test "test %g;">
-]>
-<cd></cd>
-EOF
- XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY = <<EOF
-<!DOCTYPE root [
- <!ENTITY % a "">
- <!ENTITY % b "%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;">
- <!ENTITY % c "%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;">
- <!ENTITY % d "%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;">
- <!ENTITY % e "%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;">
- <!ENTITY % f "%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;">
- <!ENTITY % g "%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;">
- <!ENTITY test "test %g;">
-]>
-<cd></cd>
-EOF
-
XML_WITH_4_ENTITY_EXPANSION = <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE member [
@@ -116,18 +73,6 @@ EOF
end
assert_equal(101, doc.entity_expansion_count)
- doc = REXML::Document.new(XML_WITH_NESTED_EMPTY_ENTITY)
- assert_raise(RuntimeError) do
- doc.root.children.first.value
- end
- REXML::Document.entity_expansion_limit = 100
- assert_equal(100, REXML::Document.entity_expansion_limit)
- doc = REXML::Document.new(XML_WITH_NESTED_EMPTY_ENTITY)
- assert_raise(RuntimeError) do
- doc.root.children.first.value
- end
- assert_equal(101, doc.entity_expansion_count)
-
REXML::Document.entity_expansion_limit = 4
doc = REXML::Document.new(XML_WITH_4_ENTITY_EXPANSION)
assert_equal("\na\na a\n<\n", doc.root.children.first.value)
@@ -136,28 +81,6 @@ EOF
assert_raise(RuntimeError) do
doc.root.children.first.value
end
-
- assert_raise(REXML::ParseException) do
- REXML::Document.new(XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY)
- end
- REXML::Document.entity_expansion_limit = 100
- assert_equal(100, REXML::Document.entity_expansion_limit)
- assert_raise(REXML::ParseException) do
- REXML::Document.new(XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY)
- end
- ensure
- REXML::Document.entity_expansion_limit = 10000
- end
-
- def test_entity_expansion_limit_for_parameter_entity
- assert_raise(REXML::ParseException) do
- REXML::Document.new(XML_WITH_NESTED_PARAMETER_ENTITY)
- end
- REXML::Document.entity_expansion_limit = 100
- assert_equal(100, REXML::Document.entity_expansion_limit)
- assert_raise(REXML::ParseException) do
- REXML::Document.new(XML_WITH_NESTED_PARAMETER_ENTITY)
- end
ensure
REXML::Document.entity_expansion_limit = 10000
end
@@ -183,214 +106,4 @@ EOX
doc = REXML::Document.new('<?xml version="1.0" standalone= "no" ?>')
assert_equal('no', doc.stand_alone?, bug2539)
end
-
- class WriteTest < Test::Unit::TestCase
- def setup
- @document = REXML::Document.new(<<-EOX)
-<?xml version="1.0" encoding="UTF-8"?>
-<message>Hello world!</message>
-EOX
- end
-
- class ArgumentsTest < self
- def test_output
- output = ""
- @document.write(output)
- assert_equal(<<-EOX, output)
-<?xml version='1.0' encoding='UTF-8'?>
-<message>Hello world!</message>
-EOX
- end
-
- def test_indent
- output = ""
- indent = 2
- @document.write(output, indent)
- assert_equal(<<-EOX.chomp, output)
-<?xml version='1.0' encoding='UTF-8'?>
-<message>
- Hello world!
-</message>
-EOX
- end
-
- def test_transitive
- output = ""
- indent = 2
- transitive = true
- @document.write(output, indent, transitive)
- assert_equal(<<-EOX, output)
-<?xml version='1.0' encoding='UTF-8'?>
-<message
->Hello world!</message
->
-EOX
- end
-
- def test_ie_hack
- output = ""
- indent = -1
- transitive = false
- ie_hack = true
- document = REXML::Document.new("<empty/>")
- document.write(output, indent, transitive, ie_hack)
- assert_equal("<empty />", output)
- end
-
- def test_encoding
- output = ""
- indent = -1
- transitive = false
- ie_hack = false
- encoding = "Windows-31J"
-
- @document.xml_decl.encoding = "Shift_JIS"
- japanese_text = "ã“ã‚“ã«ã¡ã¯"
- @document.root.text = japanese_text
- @document.write(output, indent, transitive, ie_hack, encoding)
- assert_equal(<<-EOX.encode(encoding), output)
-<?xml version='1.0' encoding='SHIFT_JIS'?>
-<message>#{japanese_text}</message>
-EOX
- end
- end
-
- class OptionsTest < self
- def test_output
- output = ""
- @document.write(:output => output)
- assert_equal(<<-EOX, output)
-<?xml version='1.0' encoding='UTF-8'?>
-<message>Hello world!</message>
-EOX
- end
-
- def test_indent
- output = ""
- @document.write(:output => output, :indent => 2)
- assert_equal(<<-EOX.chomp, output)
-<?xml version='1.0' encoding='UTF-8'?>
-<message>
- Hello world!
-</message>
-EOX
- end
-
- def test_transitive
- output = ""
- @document.write(:output => output, :indent => 2, :transitive => true)
- assert_equal(<<-EOX, output)
-<?xml version='1.0' encoding='UTF-8'?>
-<message
->Hello world!</message
->
-EOX
- end
-
- def test_ie_hack
- output = ""
- document = REXML::Document.new("<empty/>")
- document.write(:output => output, :ie_hack => true)
- assert_equal("<empty />", output)
- end
-
- def test_encoding
- output = ""
- encoding = "Windows-31J"
- @document.xml_decl.encoding = "Shift_JIS"
- japanese_text = "ã“ã‚“ã«ã¡ã¯"
- @document.root.text = japanese_text
- @document.write(:output => output, :encoding => encoding)
- assert_equal(<<-EOX.encode(encoding), output)
-<?xml version='1.0' encoding='SHIFT_JIS'?>
-<message>#{japanese_text}</message>
-EOX
- end
- end
- end
-
- class BomTest < self
- class HaveEncodingTest < self
- def test_utf_8
- xml = <<-EOX.force_encoding("ASCII-8BIT")
-<?xml version="1.0" encoding="UTF-8"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
- assert_equal("UTF-8", document.encoding)
- end
-
- def test_utf_16le
- xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT")
-<?xml version="1.0" encoding="UTF-16"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
- assert_equal("UTF-16", document.encoding)
- end
-
- def test_utf_16be
- xml = <<-EOX.encode("UTF-16BE").force_encoding("ASCII-8BIT")
-<?xml version="1.0" encoding="UTF-16"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".encode("UTF-16BE").force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
- assert_equal("UTF-16", document.encoding)
- end
- end
-
- class NoEncodingTest < self
- def test_utf_8
- xml = <<-EOX.force_encoding("ASCII-8BIT")
-<?xml version="1.0"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
- assert_equal("UTF-8", document.encoding)
- end
-
- def test_utf_16le
- xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT")
-<?xml version="1.0"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
- assert_equal("UTF-16", document.encoding)
- end
-
- def test_utf_16be
- xml = <<-EOX.encode("UTF-16BE").force_encoding("ASCII-8BIT")
-<?xml version="1.0"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".encode("UTF-16BE").force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
- assert_equal("UTF-16", document.encoding)
- end
- end
-
- class WriteTest < self
- def test_utf_16
- xml = <<-EOX.encode("UTF-16LE").force_encoding("ASCII-8BIT")
-<?xml version="1.0"?>
-<message>Hello world!</message>
-EOX
- bom = "\ufeff".encode("UTF-16LE").force_encoding("ASCII-8BIT")
- document = REXML::Document.new(bom + xml)
-
- actual_xml = ""
- document.write(actual_xml)
- expected_xml = <<-EOX.encode("UTF-16BE")
-\ufeff<?xml version='1.0' encoding='UTF-16'?>
-<message>Hello world!</message>
-EOX
- assert_equal(expected_xml, actual_xml)
- end
- end
- end
end
diff --git a/test/rexml/test_elements.rb b/test/rexml/test_elements.rb
index e5e209ecdc..7d2839e261 100644
--- a/test/rexml/test_elements.rb
+++ b/test/rexml/test_elements.rb
@@ -3,14 +3,14 @@ require 'rexml/document'
class ElementsTester < Test::Unit::TestCase
include REXML
- def test_accessor
+ def test_elements_accessor
doc = Document.new '<a><b/><c id="1"/><c id="2"/><d/></a>'
assert_equal 'b', doc.root.elements[1].name
assert_equal '1', doc.root.elements['c'].attributes['id']
assert_equal '2', doc.root.elements[2,'c'].attributes['id']
end
- def test_indexing
+ def test_elements_indexing
doc = Document.new '<a/>'
doc.root.elements[10] = Element.new('b')
assert_equal 'b', doc.root.elements[1].name
@@ -19,16 +19,16 @@ class ElementsTester < Test::Unit::TestCase
doc.root.elements['c'] = Element.new('d')
assert_equal 'd', doc.root.elements[1].name
end
-
- def test_delete
+
+ def test_elements_delete
doc = Document.new '<a><b/><c/><c id="1"/></a>'
- block = proc { |str|
+ block = proc { |str|
out = ''
doc.write out
- assert_equal str, out
+ assert_equal str, out
}
b = doc.root.elements[1]
- doc.root.elements.delete b
+ doc.root.elements.delete b
block.call( "<a><c/><c id='1'/></a>" )
doc.elements.delete("a/c[@id='1']")
block.call( '<a><c/></a>' )
@@ -36,7 +36,7 @@ class ElementsTester < Test::Unit::TestCase
block.call( '<a/>' )
end
- def test_delete_all
+ def test_elements_delete_all
doc = Document.new '<a><c/><c/><c/><c/></a>'
deleted = doc.elements.delete_all 'a/c'
assert_equal 4, deleted.size
@@ -53,7 +53,7 @@ class ElementsTester < Test::Unit::TestCase
assert_equal( 2, deleted.size )
end
- def test_add
+ def test_elements_add
a = Element.new 'a'
a.elements.add Element.new('b')
assert_equal 'b', a.elements[1].name
@@ -61,13 +61,13 @@ class ElementsTester < Test::Unit::TestCase
assert_equal 'c', a.elements[2].name
end
- def test_size
+ def test_elements_size
doc = Document.new '<a>sean<b/>elliott<b/>russell<b/></a>'
assert_equal 6, doc.root.size
assert_equal 3, doc.root.elements.size
end
- def test_each
+ def test_elements_each
doc = Document.new '<a><b/><c/><d/>sean<b/><c/><d/></a>'
count = 0
block = proc {|e| count += 1}
@@ -93,20 +93,20 @@ class ElementsTester < Test::Unit::TestCase
assert_equal(["Ruby", "XML"], names)
end
- def test_to_a
+ def test_elements_to_a
doc = Document.new '<a>sean<b/>elliott<c/></a>'
assert_equal 2, doc.root.elements.to_a.size
assert_equal 2, doc.root.elements.to_a("child::node()").size
assert_equal 4, XPath.match(doc.root, "child::node()").size
end
-
- def test_collect
+
+ def test_elements_collect
doc = Document.new( "<a><b id='1'/><b id='2'/></a>" )
r = doc.elements.collect( "/a/b" ) { |e| e.attributes["id"].to_i }
assert_equal( [1,2], r )
end
-
- def test_inject
+
+ def test_elements_inject
doc = Document.new( "<a><b id='1'/><b id='2'/></a>" )
r = doc.elements.inject( "/a/b", 3 ) { |s, e|
s + e.attributes["id"].to_i
diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb
index 9bcdfb3118..23e4802927 100644
--- a/test/rexml/test_encoding.rb
+++ b/test/rexml/test_encoding.rb
@@ -3,16 +3,14 @@
require "rexml_test_utils"
require 'rexml/source'
-require 'rexml/document'
class EncodingTester < Test::Unit::TestCase
include REXMLTestUtils
include REXML
def setup
- @encoded_root = "<a><b>\346</b></a>"
@encoded = "<?xml version='1.0' encoding='ISO-8859-3'?>"+
- @encoded_root
+ "<a><b>\346</b></a>"
@not_encoded = "<a><b>ĉ</b></a>"
end
@@ -20,7 +18,7 @@ class EncodingTester < Test::Unit::TestCase
def test_encoded_in_encoded_out
doc = Document.new( @encoded )
doc.write( out="" )
- out.force_encoding(::Encoding::ASCII_8BIT)
+ out.force_encoding('binary') if out.respond_to? :force_encoding
assert_equal( @encoded, out )
end
@@ -28,12 +26,12 @@ class EncodingTester < Test::Unit::TestCase
def test_encoded_in_change_out
doc = Document.new( @encoded )
doc.xml_decl.encoding = "UTF-8"
- assert_equal("UTF-8", doc.encoding)
+ assert_equal( doc.encoding, "UTF-8" )
REXML::Formatters::Default.new.write( doc.root, out="" )
- out.force_encoding(::Encoding::ASCII_8BIT)
+ out.force_encoding('binary') if out.respond_to? :force_encoding
assert_equal( @not_encoded, out )
char = XPath.first( doc, "/a/b/text()" ).to_s
- char.force_encoding(::Encoding::ASCII_8BIT)
+ char.force_encoding('binary') if char.respond_to? :force_encoding
assert_equal( "ĉ", char )
end
@@ -41,7 +39,7 @@ class EncodingTester < Test::Unit::TestCase
def test_encoded_in_different_out
doc = Document.new( @encoded )
REXML::Formatters::Default.new.write( doc.root, Output.new( out="", "UTF-8" ) )
- out.force_encoding(::Encoding::ASCII_8BIT)
+ out.force_encoding('binary') if out.respond_to? :force_encoding
assert_equal( @not_encoded, out )
end
@@ -49,9 +47,9 @@ class EncodingTester < Test::Unit::TestCase
def test_in_change_out
doc = Document.new( @not_encoded )
doc.xml_decl.encoding = "ISO-8859-3"
- assert_equal("ISO-8859-3", doc.encoding)
+ assert_equal( doc.encoding, "ISO-8859-3" )
doc.write( out="" )
- out.force_encoding(::Encoding::ASCII_8BIT)
+ out.force_encoding('binary') if out.respond_to? :force_encoding
assert_equal( @encoded, out )
end
@@ -59,8 +57,8 @@ class EncodingTester < Test::Unit::TestCase
def test_in_different_out
doc = Document.new( @not_encoded )
doc.write( Output.new( out="", "ISO-8859-3" ) )
- out.force_encoding(::Encoding::ASCII_8BIT)
- assert_equal( "<?xml version='1.0'?>#{@encoded_root}", out )
+ out.force_encoding('binary') if out.respond_to? :force_encoding
+ assert_equal( @encoded, out )
end
# * Given an encoded document, accessing text and attribute nodes
@@ -68,10 +66,10 @@ class EncodingTester < Test::Unit::TestCase
def test_in_different_access
doc = Document.new <<-EOL
<?xml version='1.0' encoding='ISO-8859-1'?>
- <a a="\xFF">\xFF</a>
+ <a a="ÿ">ÿ</a>
EOL
expect = "\303\277"
- expect.force_encoding(::Encoding::UTF_8)
+ expect.force_encoding('UTF-8') if expect.respond_to? :force_encoding
assert_equal( expect, doc.elements['a'].attributes['a'] )
assert_equal( expect, doc.elements['a'].text )
end
@@ -88,7 +86,7 @@ class EncodingTester < Test::Unit::TestCase
def test_ticket_110
utf16 = REXML::Document.new(File.new(fixture_path("ticket_110_utf16.xml")))
- assert_equal(utf16.encoding, "UTF-16")
+ assert_equal( "UTF-16", utf16.encoding )
assert( utf16[0].kind_of?(REXML::XMLDecl))
end
end
diff --git a/test/rexml/test_encoding_2.rb b/test/rexml/test_encoding_2.rb
index 6a985f3897..2e845b58a0 100644
--- a/test/rexml/test_encoding_2.rb
+++ b/test/rexml/test_encoding_2.rb
@@ -44,7 +44,7 @@ END
end
end
- if broken_encodings > 0
+ if broken_encodings > 0
fail "There were #{broken_encodings} encoding failures out of #{UnixCharsets.size} plus some REXML internal encodings"
else
fail "There were no encoding failures"
diff --git a/test/rexml/test_entity.rb b/test/rexml/test_entity.rb
index 93c4c838f6..3bf310a4ca 100644
--- a/test/rexml/test_entity.rb
+++ b/test/rexml/test_entity.rb
@@ -1,6 +1,5 @@
require "test/unit/testcase"
-require 'rexml/document'
require 'rexml/entity'
require 'rexml/source'
@@ -10,23 +9,23 @@ class EntityTester < Test::Unit::TestCase
simple =~ /#{REXML::Entity::GEDECL}/
assert $&
assert_equal simple, $&
-
+
REXML::Entity::ENTITYDECL =~ simple
assert REXML::Entity::matches?(simple)
match = REXML::Entity::ENTITYDECL.match(simple)
assert_equal 'foo', match[1]
assert_equal "'bar'", match[2]
- simple = '<!ENTITY Pub-Status
+ simple = '<!ENTITY Pub-Status
"This is a pre-release of the specification.">'
assert REXML::Entity::matches?(simple)
match = REXML::Entity::ENTITYDECL.match(simple)
assert_equal 'Pub-Status', match[1]
assert_equal '"This is a pre-release of the specification."', match[2]
- txt = '"This is a
+ txt = '"This is a
pre-release of <the> specification."'
- simple = "<!ENTITY Pub-Status
+ simple = "<!ENTITY Pub-Status
#{txt}>"
assert REXML::Entity::matches?(simple)
match = REXML::Entity::ENTITYDECL.match(simple)
@@ -104,40 +103,6 @@ class EntityTester < Test::Unit::TestCase
assert_equal source, out
end
- def test_entity_string_limit
- template = '<!DOCTYPE bomb [ <!ENTITY a "^" > ]> <bomb>$</bomb>'
- len = 5120 # 5k per entity
- template.sub!(/\^/, "B" * len)
-
- # 10k is OK
- entities = '&a;' * 2 # 5k entity * 2 = 10k
- xmldoc = REXML::Document.new(template.sub(/\$/, entities))
- assert_equal(len * 2, xmldoc.root.text.bytesize)
-
- # above 10k explodes
- entities = '&a;' * 3 # 5k entity * 2 = 15k
- xmldoc = REXML::Document.new(template.sub(/\$/, entities))
- assert_raises(RuntimeError) do
- xmldoc.root.text
- end
- end
-
- def test_entity_string_limit_for_parameter_entity
- template = '<!DOCTYPE bomb [ <!ENTITY % a "^" > <!ENTITY bomb "$" > ]><root/>'
- len = 5120 # 5k per entity
- template.sub!(/\^/, "B" * len)
-
- # 10k is OK
- entities = '%a;' * 2 # 5k entity * 2 = 10k
- REXML::Document.new(template.sub(/\$/, entities))
-
- # above 10k explodes
- entities = '%a;' * 3 # 5k entity * 2 = 15k
- assert_raises(REXML::ParseException) do
- REXML::Document.new(template.sub(/\$/, entities))
- end
- end
-
def test_raw
source = '<!DOCTYPE foo [
<!ENTITY ent "replace">
@@ -151,7 +116,7 @@ class EntityTester < Test::Unit::TestCase
source = '<!DOCTYPE foo [
<!ENTITY ent "replace">
]><a>replace &ent;</a>'
- doc = REXML::Document.new( source )
+ doc = REXML::Document.new( source )
assert_equal(source, doc.to_s)
assert_equal("replace replace", doc.root.text)
assert_equal(source, doc.to_s)
diff --git a/test/rexml/test_functions.rb b/test/rexml/test_functions.rb
index 082d772e23..e0f8a67fc1 100644
--- a/test/rexml/test_functions.rb
+++ b/test/rexml/test_functions.rb
@@ -155,7 +155,7 @@ class FunctionsTester < Test::Unit::TestCase
id_1 = doc.elements["/a/b[@id='1']"]
id_2 = doc.elements["/a/b[@id='2']"]
id_3 = doc.elements["/a/b[@id='3']"]
-
+
good = {
"floor" => [[], [id_1], [id_2], [id_3]],
"ceiling" => [[id_1], [id_2], [id_3], []],
diff --git a/test/rexml/test_functions_number.rb b/test/rexml/test_functions_number.rb
index 3048c8dd00..849b60edb8 100644
--- a/test/rexml/test_functions_number.rb
+++ b/test/rexml/test_functions_number.rb
@@ -1,32 +1,32 @@
-require 'rexml/document'
-require 'test/unit'
-require 'rexml/functions'
-
-class TC_Rexml_Functions_Number < Test::Unit::TestCase
-
- def test_functions_number_int
- telem = REXML::Element.new("elem")
- telem.text="9"
- assert_equal(9, REXML::Functions::number(telem))
- end
- def test_functions_number_float
- telem = REXML::Element.new("elem")
- telem.text="10.4"
- assert_equal(10.4, REXML::Functions::number(telem))
- end
- def test_functions_number_negative_int
- telem = REXML::Element.new("elem")
- telem.text="-9"
- assert_equal(-9, REXML::Functions::number(telem))
- end
- def test_functions_number_negative_float
- telem = REXML::Element.new("elem")
- telem.text="-9.13"
- assert_equal(-9.13, REXML::Functions::number(telem))
- end
- #def test_functions_number_scientific_notation
- # telem = REXML::Element.new("elem")
- # telem.text="9.13E12"
- # assert_equal(9.13E12, REXML::Functions::number(telem))
- #end
-end
+require 'rexml/document'
+require 'test/unit'
+require 'rexml/functions'
+
+class TC_Rexml_Functions_Number < Test::Unit::TestCase
+
+ def test_functions_number_int
+ telem = REXML::Element.new("elem")
+ telem.text="9"
+ assert_equal(9, REXML::Functions::number(telem))
+ end
+ def test_functions_number_float
+ telem = REXML::Element.new("elem")
+ telem.text="10.4"
+ assert_equal(10.4, REXML::Functions::number(telem))
+ end
+ def test_functions_number_negative_int
+ telem = REXML::Element.new("elem")
+ telem.text="-9"
+ assert_equal(-9, REXML::Functions::number(telem))
+ end
+ def test_functions_number_negative_float
+ telem = REXML::Element.new("elem")
+ telem.text="-9.13"
+ assert_equal(-9.13, REXML::Functions::number(telem))
+ end
+ #def test_functions_number_scientific_notation
+ # telem = REXML::Element.new("elem")
+ # telem.text="9.13E12"
+ # assert_equal(9.13E12, REXML::Functions::number(telem))
+ #end
+end
diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb
index 222cf79c60..96c0c7bf48 100644
--- a/test/rexml/test_jaxen.rb
+++ b/test/rexml/test_jaxen.rb
@@ -1,126 +1,126 @@
-require 'rexml_test_utils'
-
-require "rexml/document"
-require "rexml/xpath"
-
-# Harness to test REXML's capabilities against the test suite from Jaxen
-# ryan.a.cox@gmail.com
-
-class JaxenTester < Test::Unit::TestCase
- include REXMLTestUtils
- include REXML
-
- def test_axis ; test("axis") ; end
- def test_basic ; test("basic") ; end
- def test_basicupdate ; test("basicupdate") ; end
- def test_contents ; test("contents") ; end
- def test_defaultNamespace ; test("defaultNamespace") ; end
- def test_fibo ; test("fibo") ; end
- def test_id ; test("id") ; end
- def test_jaxen24 ; test("jaxen24") ; end
- def test_lang ; test("lang") ; end
- def test_message ; test("message") ; end
- def test_moreover ; test("moreover") ; end
- def test_much_ado ; test("much_ado") ; end
- def test_namespaces ; test("namespaces") ; end
- def test_nitf ; test("nitf") ; end
- def test_numbers ; test("numbers") ; end
- def test_pi ; test("pi") ; end
- def test_pi2 ; test("pi2") ; end
- def test_simple ; test("simple") ; end
- def test_testNamespaces ; test("testNamespaces") ; end
- def test_text ; test("text") ; end
- def test_underscore ; test("underscore") ; end
- def test_web ; test("web") ; end
- def test_web2 ; test("web2") ; end
-
- private
- def test( fname )
-# Dir.entries( xml_dir ).each { |fname|
-# if fname =~ /\.xml$/
- file = File.new(fixture_path(fname+".xml"))
- doc = Document.new( file )
- XPath.each( doc, "/tests/document" ) {|e| handleDocument(e)}
-# end
-# }
- end
-
- # processes a tests/document/context node
- def handleContext( testDoc, ctxElement)
- testCtx = XPath.match( testDoc, ctxElement.attributes["select"] )[0]
- namespaces = {}
- if testCtx.class == Element
- testCtx.prefixes.each { |pre| handleNamespace( testCtx, pre, namespaces ) }
- end
- variables = {}
- XPath.each( ctxElement, "@*[namespace-uri() = 'http://jaxen.org/test-harness/var']") { |attrib| handleVariable(testCtx, variables, attrib) }
- XPath.each( ctxElement, "valueOf") { |e| handleValueOf(testCtx, variables, namespaces, e) }
- XPath.each( ctxElement, "test[not(@exception) or (@exception != 'true') ]") { |e| handleNominalTest(testCtx,variables, namespaces, e) }
- XPath.each( ctxElement, "test[@exception = 'true']") { |e| handleExceptionalTest(testCtx,variables, namespaces, e) }
- end
-
- # processes a tests/document/context/valueOf or tests/document/context/test/valueOf node
- def handleValueOf(ctx,variables, namespaces, valueOfElement)
- expected = valueOfElement.text
- got = XPath.match( ctx, valueOfElement.attributes["select"], namespaces, variables )[0]
- assert_true( (got.nil? && expected.nil?) || !got.nil? )
- case got.class
- when Element
- assert_equal( got.class, Element )
- when Attribute, Text, Comment, TrueClass, FalseClass
- assert_equal( expected, got.to_s )
- when Instruction
- assert_equal( expected, got.content )
- when Fixnum
- assert_equal( exected.to_f, got )
- when String
- # normalize values for comparison
- got = "" if got == nil or got == ""
- expected = "" if expected == nil or expected == ""
- assert_equal( expected, got )
- else
- assert_fail( "Wassup?" )
- end
- end
-
-
- # processes a tests/document/context/test node ( where @exception is false or doesn't exist )
- def handleNominalTest(ctx, variables, namespaces, testElement)
- expected = testElement.attributes["count"]
- got = XPath.match( ctx, testElement.attributes["select"], namespaces, variables )
- # might be a test with no count attribute, but nested valueOf elements
- assert( expected == got.size.to_s ) if !expected.nil?
-
- XPath.each( testElement, "valueOf") { |e|
- handleValueOf(got, variables, namespaces, e)
- }
- end
-
- # processes a tests/document/context/test node ( where @exception is true )
- def handleExceptionalTest(ctx, variables, namespaces, testElement)
- assert_raise( Exception ) {
- XPath.match( ctx, testElement.attributes["select"], namespaces, variables )
- }
- end
-
- # processes a tests/document node
- def handleDocument(docElement)
- puts "- Processing document: #{docElement.attributes['url']}"
- testFile = File.new( docElement.attributes["url"] )
- testDoc = Document.new testFile
- XPath.each( docElement, "context") { |e| handleContext(testDoc, e) }
- end
-
- # processes a variable definition in a namespace like <test var:foo="bar">
- def handleVariable( ctx, variables, attrib )
- puts "--- Found attribute: #{attrib.name}"
- variables[attrib.name] = attrib.value
- end
-
- # processes a namespace definition like <test xmlns:foo="fiz:bang:bam">
- def handleNamespace( ctx, prefix, namespaces )
- puts "--- Found namespace: #{prefix}"
- namespaces[prefix] = ctx.namespaces[prefix]
- end
-
-end
+require 'rexml_test_utils'
+
+require "rexml/document"
+require "rexml/xpath"
+
+# Harness to test REXML's capabilities against the test suite from Jaxen
+# ryan.a.cox@gmail.com
+
+class JaxenTester < Test::Unit::TestCase
+ include REXMLTestUtils
+ include REXML
+
+ def test_axis ; test("axis") ; end
+ def test_basic ; test("basic") ; end
+ def test_basicupdate ; test("basicupdate") ; end
+ def test_contents ; test("contents") ; end
+ def test_defaultNamespace ; test("defaultNamespace") ; end
+ def test_fibo ; test("fibo") ; end
+ def test_id ; test("id") ; end
+ def test_jaxen24 ; test("jaxen24") ; end
+ def test_lang ; test("lang") ; end
+ def test_message ; test("message") ; end
+ def test_moreover ; test("moreover") ; end
+ def test_much_ado ; test("much_ado") ; end
+ def test_namespaces ; test("namespaces") ; end
+ def test_nitf ; test("nitf") ; end
+ def test_numbers ; test("numbers") ; end
+ def test_pi ; test("pi") ; end
+ def test_pi2 ; test("pi2") ; end
+ def test_simple ; test("simple") ; end
+ def test_testNamespaces ; test("testNamespaces") ; end
+ def test_text ; test("text") ; end
+ def test_underscore ; test("underscore") ; end
+ def test_web ; test("web") ; end
+ def test_web2 ; test("web2") ; end
+
+ private
+ def test( fname )
+# Dir.entries( xml_dir ).each { |fname|
+# if fname =~ /\.xml$/
+ file = File.new(fixture_path(fname+".xml"))
+ doc = Document.new( file )
+ XPath.each( doc, "/tests/document" ) {|e| handleDocument(e)}
+# end
+# }
+ end
+
+ # processes a tests/document/context node
+ def handleContext( testDoc, ctxElement)
+ testCtx = XPath.match( testDoc, ctxElement.attributes["select"] )[0]
+ namespaces = {}
+ if testCtx.class == Element
+ testCtx.prefixes.each { |pre| handleNamespace( testCtx, pre, namespaces ) }
+ end
+ variables = {}
+ XPath.each( ctxElement, "@*[namespace-uri() = 'http://jaxen.org/test-harness/var']") { |attrib| handleVariable(testCtx, variables, attrib) }
+ XPath.each( ctxElement, "valueOf") { |e| handleValueOf(testCtx, variables, namespaces, e) }
+ XPath.each( ctxElement, "test[not(@exception) or (@exception != 'true') ]") { |e| handleNominalTest(testCtx,variables, namespaces, e) }
+ XPath.each( ctxElement, "test[@exception = 'true']") { |e| handleExceptionalTest(testCtx,variables, namespaces, e) }
+ end
+
+ # processes a tests/document/context/valueOf or tests/document/context/test/valueOf node
+ def handleValueOf(ctx,variables, namespaces, valueOfElement)
+ expected = valueOfElement.text
+ got = XPath.match( ctx, valueOfElement.attributes["select"], namespaces, variables )[0]
+ assert_true( (got.nil? && expected.nil?) || !got.nil? )
+ case got.class
+ when Element
+ assert_equal( got.class, Element )
+ when Attribute, Text, Comment, TrueClass, FalseClass
+ assert_equal( expected, got.to_s )
+ when Instruction
+ assert_equal( expected, got.content )
+ when Fixnum
+ assert_equal( exected.to_f, got )
+ when String
+ # normalize values for comparison
+ got = "" if got == nil or got == ""
+ expected = "" if expected == nil or expected == ""
+ assert_equal( expected, got )
+ else
+ assert_fail( "Wassup?" )
+ end
+ end
+
+
+ # processes a tests/document/context/test node ( where @exception is false or doesn't exist )
+ def handleNominalTest(ctx, variables, namespaces, testElement)
+ expected = testElement.attributes["count"]
+ got = XPath.match( ctx, testElement.attributes["select"], namespaces, variables )
+ # might be a test with no count attribute, but nested valueOf elements
+ assert( expected == got.size.to_s ) if !expected.nil?
+
+ XPath.each( testElement, "valueOf") { |e|
+ handleValueOf(got, variables, namespaces, e)
+ }
+ end
+
+ # processes a tests/document/context/test node ( where @exception is true )
+ def handleExceptionalTest(ctx, variables, namespaces, testElement)
+ assert_raise( Exception ) {
+ XPath.match( ctx, testElement.attributes["select"], namespaces, variables )
+ }
+ end
+
+ # processes a tests/document node
+ def handleDocument(docElement)
+ puts "- Processing document: #{docElement.attributes['url']}"
+ testFile = File.new( docElement.attributes["url"] )
+ testDoc = Document.new testFile
+ XPath.each( docElement, "context") { |e| handleContext(testDoc, e) }
+ end
+
+ # processes a variable definition in a namespace like <test var:foo="bar">
+ def handleVariable( ctx, variables, attrib )
+ puts "--- Found attribute: #{attrib.name}"
+ variables[attrib.name] = attrib.value
+ end
+
+ # processes a namespace definition like <test xmlns:foo="fiz:bang:bam">
+ def handleNamespace( ctx, prefix, namespaces )
+ puts "--- Found namespace: #{prefix}"
+ namespaces[prefix] = ctx.namespaces[prefix]
+ end
+
+end
diff --git a/test/rexml/test_light.rb b/test/rexml/test_light.rb
index 1b56159254..7ccf61298c 100644
--- a/test/rexml/test_light.rb
+++ b/test/rexml/test_light.rb
@@ -6,13 +6,11 @@ class LightTester < Test::Unit::TestCase
include REXMLTestUtils
include REXML::Light
- def test_parse_large
- xml_string = fixture_path("documentation.xml")
- parser = REXML::Parsers::LightParser.new(xml_string)
- tag, content = parser.parse
- assert_equal([:document, :text], [tag, content.first])
+ def test_parse_large
+ parser = REXML::Parsers::LightParser.new(fixture_path("documentation.xml"))
+ root = parser.parse
end
-
+
# FIXME INCOMPLETE
# This is because the light API is not yet ready to be used to produce
# trees.
@@ -22,7 +20,7 @@ class LightTester < Test::Unit::TestCase
foo = doc.add_element( 'foo' )
assert_equal( "foo", foo.name )
end
-
+
def test_add_attribute
foo = Node.new( "a" )
foo["attr"] = "bar"
diff --git a/test/rexml/test_lightparser.rb b/test/rexml/test_lightparser.rb
index 1728921434..ee33dc08fd 100644
--- a/test/rexml/test_lightparser.rb
+++ b/test/rexml/test_lightparser.rb
@@ -7,6 +7,6 @@ class LightParserTester < Test::Unit::TestCase
def test_parsing
f = File.new(fixture_path("documentation.xml"))
parser = REXML::Parsers::LightParser.new( f )
- parser.parse
+ root = parser.parse
end
end
diff --git a/test/rexml/test_listener.rb b/test/rexml/test_listener.rb
index 0afbdcd5ff..f2cc4b7c35 100644
--- a/test/rexml/test_listener.rb
+++ b/test/rexml/test_listener.rb
@@ -11,7 +11,7 @@ class BaseTester < Test::Unit::TestCase
return unless defined? @listener
# Empty.
t1 = %Q{<string></string>}
- assert_equal( "", @listener.parse( t1 ),
+ assert_equal( "", @listener.parse( t1 ),
"Empty" )
end
@@ -59,11 +59,11 @@ class BaseTester < Test::Unit::TestCase
return unless defined? @listener
# CR.
t7 = %Q{<string> \r\n \r \n </string>}
- assert_equal( " \n \n \n ".unpack("C*").inspect,
+ assert_equal( " \n \n \n ".unpack("C*").inspect,
@listener.parse( t7 ).unpack("C*").inspect, "CR" )
end
- # The accent bug, and the code that exibits the bug, was contributed by
+ # The accent bug, and the code that exibits the bug, was contributed by
# Guilhem Vellut
class AccentListener
def tag_start(name,attributes)
diff --git a/test/rexml/test_namespace.rb b/test/rexml/test_namespace.rb
deleted file mode 100644
index 6ab16b6342..0000000000
--- a/test/rexml/test_namespace.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require "rexml_test_utils"
-
-require "rexml/document"
-
-class TestNamespace < Test::Unit::TestCase
- include REXMLTestUtils
- include REXML
-
- def setup
- @xsa_source = <<-EOL
- <?xml version="1.0"?>
- <?xsl stylesheet="blah.xsl"?>
- <!-- The first line tests the XMLDecl, the second tests PI.
- The next line tests DocType. This line tests comments. -->
- <!DOCTYPE xsa PUBLIC
- "-//LM Garshol//DTD XML Software Autoupdate 1.0//EN//XML"
- "http://www.garshol.priv.no/download/xsa/xsa.dtd">
-
- <xsa>
- <vendor id="blah">
- <name>Lars Marius Garshol</name>
- <email>larsga@garshol.priv.no</email>
- <url>http://www.stud.ifi.uio.no/~lmariusg/</url>
- </vendor>
- </xsa>
- EOL
- end
-
- def test_xml_namespace
- xml = <<-XML
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:xml="http://www.w3.org/XML/1998/namespace" />
-XML
- document = Document.new(xml)
- assert_equal("http://www.w3.org/XML/1998/namespace",
- document.root.namespace("xml"))
- end
-end
diff --git a/test/rexml/test_notationdecl_mixin.rb b/test/rexml/test_notationdecl_mixin.rb
index 68dcc555ac..d5212534c1 100644
--- a/test/rexml/test_notationdecl_mixin.rb
+++ b/test/rexml/test_notationdecl_mixin.rb
@@ -31,11 +31,11 @@ class TestNotationDeclMixin < Test::Unit::TestCase
XMLEND
@doctype = REXML::Document.new(doc_string).doctype
end
-
+
def test_name
assert_equal('n1', @doctype.notation('n1').name)
end
-
+
def test_public_2
assert_equal(@pubid1, @doctype.notation('n1').public)
assert_equal(@pubid2, @doctype.notation('n2').public)
@@ -45,7 +45,7 @@ class TestNotationDeclMixin < Test::Unit::TestCase
assert_equal(@pubid6, @doctype.notation('n6').public)
assert_nil(@doctype.notation('n7').public)
end
-
+
def test_system_2
assert_equal(@sysid2, @doctype.notation('n2').system)
assert_nil(@doctype.notation('n3').system)
diff --git a/test/rexml/test_notationdecl_parsetest.rb b/test/rexml/test_notationdecl_parsetest.rb
index 2e86d322e0..6a8449e37d 100644
--- a/test/rexml/test_notationdecl_parsetest.rb
+++ b/test/rexml/test_notationdecl_parsetest.rb
@@ -14,7 +14,7 @@ class TestNotationDecl < Test::Unit::TestCase
XMLEND
@doctype = REXML::Document.new(doc_string).doctype
end
-
+
def test_notation
assert(@doctype.notation('n1'), "Testing notation n1")
assert(@doctype.notation('n2'), "Testing notation n2")
diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb
index 3f874c2052..2efb1d742e 100644
--- a/test/rexml/test_order.rb
+++ b/test/rexml/test_order.rb
@@ -1,9 +1,6 @@
require 'rexml_test_utils'
require 'rexml/document'
-begin
- require 'zlib'
-rescue LoadError
-end
+require 'zlib'
class OrderTester < Test::Unit::TestCase
include REXMLTestUtils
@@ -46,7 +43,7 @@ END
end
# Provided by Tom Talbott
def test_more_ordering
- doc = REXML::Document.new(Zlib::GzipReader.open(fixture_path('LostineRiver.kml.gz'), encoding: 'utf-8'))
+ doc = REXML::Document.new(Zlib::GzipReader.new(File.new(fixture_path('LostineRiver.kml.gz'),'r:utf-8')))
actual = [
"Head south from Phinney Ave N",
"Turn left at N 36th St",
@@ -101,5 +98,5 @@ END
assert_equal( actual[count], n ) unless n =~ /Arrive at/
count += 1
}
- end if defined?(Zlib::GzipReader)
+ end
end
diff --git a/test/rexml/test_pullparser.rb b/test/rexml/test_pullparser.rb
index 03c95642e4..1c9bcc0045 100644
--- a/test/rexml/test_pullparser.rb
+++ b/test/rexml/test_pullparser.rb
@@ -21,19 +21,19 @@ class PullParserTester < Test::Unit::TestCase
end
res[ :text ] += 1 if results.text?
end
- [ :xmldecl, :doctype, :a, :b ].each { |tag|
+ [ :xmldecl, :doctype, :a, :b ].each { |tag|
assert res[tag] , "#{tag} wasn't processed"
}
- assert_equal 4, res[ :text ]
- rescue ParseException
+ assert_equal 4, res[ :text ]
+ rescue ParseException
puts $!
end
def test_bad_document
source = "<a><b></a>"
parser = REXML::Parsers::PullParser.new(source)
- assert_raise(ParseException, "Parsing should have failed") {
- parser.pull while parser.has_next?
+ assert_raise(ParseException, "Parsing should have failed") {
+ results = parser.pull while parser.has_next?
}
end
@@ -63,7 +63,7 @@ class PullParserTester < Test::Unit::TestCase
def test_peek_unshift
source = "<a><b/></a>"
- REXML::Parsers::PullParser.new(source)
+ pp = REXML::Parsers::PullParser.new(source)
# FINISH ME!
end
diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb
index 8873e1703d..569270ceb1 100644
--- a/test/rexml/test_sax.rb
+++ b/test/rexml/test_sax.rb
@@ -1,7 +1,6 @@
require "rexml_test_utils"
require 'rexml/sax2listener'
require 'rexml/parsers/sax2parser'
-require 'rexml/document'
class SAX2Tester < Test::Unit::TestCase
include REXMLTestUtils
@@ -42,7 +41,7 @@ class SAX2Tester < Test::Unit::TestCase
}
start_document = 0
- end_document = 0
+ end_document = 0
parser.listen( :start_document ) { start_document += 1 }
parser.listen( :end_document ) { end_document += 1 }
parser.listen( :start_element, %w{ changelog bugs todo }, &blok )
@@ -70,8 +69,8 @@ class SAX2Tester < Test::Unit::TestCase
assert(text=~/@ANT_VERSION@/, "version was '#{text}'")
tc += 1
}
-
- begin
+
+ begin
parser.parse
rescue => exception
if exception.kind_of? Test::Unit::AssertionFailedError
@@ -256,12 +255,12 @@ class SAX2Tester < Test::Unit::TestCase
assert_equal(252, result[0])
end
- class Ticket68
- include REXML::SAX2Listener
- end
+ class Ticket68
+ include REXML::SAX2Listener
+ end
def test_ticket_68
parser = REXML::Parsers::SAX2Parser.new(File.new(fixture_path('ticket_68.xml')))
- parser.listen( Ticket68.new )
+ parser.listen( Ticket68.new )
begin
parser.parse
rescue
diff --git a/test/rexml/test_stream.rb b/test/rexml/test_stream.rb
index 3f876aed35..2d9c177008 100644
--- a/test/rexml/test_stream.rb
+++ b/test/rexml/test_stream.rb
@@ -12,11 +12,11 @@ class StreamTester < Test::Unit::TestCase
# Submitted by Han Holl
def test_listener
data = %Q{<session1 user="han" password="rootWeiler" />\n<session2 user="han" password="rootWeiler" />}
-
+
b = RequestReader.new( data )
b = RequestReader.new( data )
end
-
+
def test_ticket_49
source = StringIO.new( <<-EOL )
<!DOCTYPE foo [
@@ -26,7 +26,7 @@ class StreamTester < Test::Unit::TestCase
EOL
REXML::Document.parse_stream(source, MyListener.new)
end
-
+
def test_ticket_10
source = StringIO.new( <<-EOL )
<!DOCTYPE foo [
@@ -55,7 +55,7 @@ class StreamTester < Test::Unit::TestCase
end
end
listener.events = {}
-
+
REXML::Document.parse_stream( source, listener )
assert( listener.events[:entitydecl] )
diff --git a/test/rexml/test_validation_rng.rb b/test/rexml/test_validation_rng.rb
index 3643f0c32b..b02363c493 100644
--- a/test/rexml/test_validation_rng.rb
+++ b/test/rexml/test_validation_rng.rb
@@ -334,7 +334,7 @@ class RNGValidation < Test::Unit::TestCase
error( validator, %q{<A><B>XYZ</B></A>} )
no_error( validator, %q{<A><B>Option 1</B></A>} )
no_error( validator, %q{<A><B>Option 2</B></A>} )
-
+
# Attribute values
rng = %q{
<?xml version="1.0" encoding="UTF-8"?>
@@ -772,13 +772,13 @@ class RNGValidation < Test::Unit::TestCase
error( validator, %q{<A><B/><B/></A>} )
error( validator, %q{<A><C/></A>} )
end
-
+
def error( validator, source )
parser = REXML::Parsers::TreeParser.new( source )
parser.add_listener( validator.reset )
- assert_raise( REXML::Validation::ValidationException,
+ assert_raise( REXML::Validation::ValidationException,
"Expected a validation error" ) { parser.parse }
end
diff --git a/test/rexml/test_xml_declaration.rb b/test/rexml/test_xml_declaration.rb
deleted file mode 100644
index d58f9f08ba..0000000000
--- a/test/rexml/test_xml_declaration.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-#
-# Created by Henrik MÃ¥rtensson on 2007-02-18.
-# Copyright (c) 2007. All rights reserved.
-
-require "rexml/document"
-require "test/unit"
-
-class TestXmlDeclaration < Test::Unit::TestCase
- def setup
- xml = <<-'END_XML'
- <?xml encoding= 'UTF-8' standalone='yes'?>
- <root>
- </root>
- END_XML
- @doc = REXML::Document.new xml
- @root = @doc.root
- @xml_declaration = @doc.children[0]
- end
-
- def test_is_first_child
- assert_kind_of(REXML::XMLDecl, @xml_declaration)
- end
-
- def test_has_document_as_parent
- assert_kind_of(REXML::Document, @xml_declaration.parent)
- end
-
- def test_has_sibling
- assert_kind_of(REXML::XMLDecl, @root.previous_sibling.previous_sibling)
- assert_kind_of(REXML::Element, @xml_declaration.next_sibling.next_sibling)
- end
-end
diff --git a/test/rexml/test_xml_declaration_parent_child.rb b/test/rexml/test_xml_declaration_parent_child.rb
new file mode 100644
index 0000000000..6386bed4f1
--- /dev/null
+++ b/test/rexml/test_xml_declaration_parent_child.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+#
+# Created by Henrik MÃ¥rtensson on 2007-02-18.
+# Copyright (c) 2007. All rights reserved.
+
+require "rexml/document"
+require "test/unit"
+
+class TestXmlDeclaration < Test::Unit::TestCase
+ def setup
+ xml = <<-'END_XML'
+ <?xml encoding= 'UTF-8' standalone='yes'?>
+ <root>
+ </root>
+ END_XML
+ @doc = REXML::Document.new xml
+ @root = @doc.root
+ @xml_declaration = @doc.children[0]
+ end
+
+ def test_xml_declaration_is_first_child
+ assert_kind_of(REXML::XMLDecl, @xml_declaration)
+ end
+
+ def test_xml_declaration_has_document_as_parent
+ assert_kind_of(REXML::Document, @xml_declaration.parent)
+ end
+
+ def test_xml_declaration_has_sibling
+ assert_kind_of(REXML::XMLDecl, @root.previous_sibling.previous_sibling)
+ assert_kind_of(REXML::Element, @xml_declaration.next_sibling.next_sibling)
+ end
+end
diff --git a/test/rexml/test_xpath.rb b/test/rexml/test_xpath.rb
index 4ccd4edeaf..d7ab9620a8 100644
--- a/test/rexml/test_xpath.rb
+++ b/test/rexml/test_xpath.rb
@@ -163,7 +163,7 @@ class XPathTester < Test::Unit::TestCase
#res = XPath::first(doc, "*")
#assert_equal "a", res.name
- assert_equal( :processing_instruction,
+ assert_equal( :processing_instruction,
XPath::first(doc.root, "processing-instruction()").node_type)
assert_equal( :comment, XPath::first(doc.root, "comment()").node_type)
end
@@ -206,7 +206,7 @@ class XPathTester < Test::Unit::TestCase
# Here are some XPath tests that were originally submitted by ...
# The code has changed some, but the logic and the source documents are the
# same.
- # This method reads a document from a file, and then a series of xpaths,
+ # This method reads a document from a file, and then a series of xpaths,
# also from a file. It then checks each xpath against the source file.
def test_more
xmlsource = fixture_path("testsrc.xml")
@@ -219,10 +219,10 @@ class XPathTester < Test::Unit::TestCase
for line in File.new(xpathtests)
line.strip!
begin
- doc.root
+ rt = doc.root
#puts "#"*80
#print "\nDoing #{line} " ; $stdout.flush
- doc.elements.each(line) do |el|
+ doc.elements.each(line) do |el|
#print "." ; $stdout.flush
results.root << el.clone
#results << el.to_s
@@ -255,7 +255,7 @@ class XPathTester < Test::Unit::TestCase
result = XPath::first( @@doc, "descendant::f[@a='c']")
assert_equal "11", result.attributes['id']
-
+
assert_equal "11", XPath::first(@@doc, "a/e/f[@a='c']").attributes["id"]
assert_equal "11", XPath::first(@@doc, "a/e/*[@a='c']").attributes["id"]
end
@@ -282,9 +282,9 @@ class XPathTester < Test::Unit::TestCase
d = XPath.first( doc, "//d" )
assert_equal "d", d.name
b = each_test( d, "ancestor::b" ) { |el|
- assert((1..2) === el.attributes['id'].to_i,
+ assert((1..2) === el.attributes['id'].to_i,
"Expected #{el.attributes['id']} to be either 1 or 2"
- )
+ )
}
assert_equal 2, b
end
@@ -316,7 +316,7 @@ class XPathTester < Test::Unit::TestCase
def test_lang
doc = Document.new(File.new(fixture_path("lang0.xml")))
#puts IO.read( "test/lang.xml" )
-
+
#puts XPath.match( doc, "//language/*" ).size
c = each_test( doc, "//language/*" ) { |element|
#puts "#{element.name}: #{element.text}"
@@ -332,7 +332,7 @@ class XPathTester < Test::Unit::TestCase
</foo>
EOF
doc = Document.new source
- XPath.each( doc, "//bar" ) {
+ result = XPath.each( doc, "//bar" ) {
fail "'bar' should match nothing in this case"
}
@@ -428,9 +428,9 @@ class XPathTester < Test::Unit::TestCase
assert_equal 2, res.size
end
- # The following three paths were provided by
+ # The following three paths were provided by
# Jeni Tennison <jeni@jenitennison.com>
- # a consultant who is also an XSL and XPath expert
+ # a consultant who is also an XSL and XPath expert
#def test_child_cubed
# els = @@jeni.elements.to_a("*****")
# assert_equal 3, els.size
@@ -445,7 +445,7 @@ class XPathTester < Test::Unit::TestCase
# results = @@jeni.root.elements[1].elements[1].elements.to_a("../following-sibling::*[*[name() = name(current())]]")
# puts results
#end
-
+
# Contributed by Mike Stok
def test_starts_with
source = <<-EOF
@@ -511,7 +511,7 @@ class XPathTester < Test::Unit::TestCase
doc = Document.new source
[
- #['o', 2],
+ #['o', 2],
['foo', 1], ['bar', 0]].each { |search, expected|
set = doc.elements.to_a("//a[contains(@href, '#{search}')]")
assert_equal expected, set.size
@@ -523,7 +523,7 @@ class XPathTester < Test::Unit::TestCase
# examples from http://www.w3.org/TR/xpath#function-substring
doc = Document.new('<test string="12345" />')
- Document.new("<a b='1'/>")
+ d = Document.new("<a b='1'/>")
#puts XPath.first(d, 'node()[0 + 1]')
#d = Document.new("<a b='1'/>")
#puts XPath.first(d, 'a[0 mod 0]')
@@ -589,7 +589,7 @@ class XPathTester < Test::Unit::TestCase
def test_name
assert_raise( UndefinedNamespaceException, "x should be undefined" ) {
- REXML::Document.new("<a x='foo'><b/><x:b/></a>")
+ d = REXML::Document.new("<a x='foo'><b/><x:b/></a>")
}
d = REXML::Document.new("<a xmlns:x='foo'><b/><x:b/></a>")
assert_equal 1, d.root.elements.to_a('*[name() = "b"]').size
@@ -614,7 +614,7 @@ class XPathTester < Test::Unit::TestCase
assert_equal 1, REXML::XPath.match(doc, "//b[number(@id) = (1 mod 2)]").size
assert_equal 1, REXML::XPath.match(doc, "//b[number(@id) = (4 div 2)]").size
end
-
+
# Contributed by Kouhei
def test_substring_before
doc = Document.new("<r><a/><b/><c/></r>")
@@ -629,27 +629,27 @@ class XPathTester < Test::Unit::TestCase
</b>
<c id='b'/>
</a>")
- assert_equal( 1, REXML::XPath.match(doc,
+ assert_equal( 1, REXML::XPath.match(doc,
"//*[local-name()='c' and @id='b']").size )
- assert_equal( 1, REXML::XPath.match(doc,
+ assert_equal( 1, REXML::XPath.match(doc,
"//*[ local-name()='c' and @id='b' ]").size )
- assert_equal( 1, REXML::XPath.match(doc,
+ assert_equal( 1, REXML::XPath.match(doc,
"//*[ local-name() = 'c' and @id = 'b' ]").size )
- assert_equal( 1,
+ assert_equal( 1,
REXML::XPath.match(doc, '/a/c[@id]').size )
assert_equal( 1,
REXML::XPath.match(doc, '/a/c[(@id)]').size )
- assert_equal( 1,
+ assert_equal( 1,
REXML::XPath.match(doc, '/a/c[ @id ]').size )
- assert_equal( 1,
+ assert_equal( 1,
REXML::XPath.match(doc, '/a/c[ (@id) ]').size )
- assert_equal( 1,
+ assert_equal( 1,
REXML::XPath.match(doc, '/a/c[( @id )]').size )
- assert_equal( 1, REXML::XPath.match(doc.root,
+ assert_equal( 1, REXML::XPath.match(doc.root,
'/a/c[ ( @id ) ]').size )
- assert_equal( 1, REXML::XPath.match(doc,
+ assert_equal( 1, REXML::XPath.match(doc,
'/a/c [ ( @id ) ] ').size )
- assert_equal( 1, REXML::XPath.match(doc,
+ assert_equal( 1, REXML::XPath.match(doc,
' / a / c [ ( @id ) ] ').size )
end
@@ -719,8 +719,8 @@ class XPathTester < Test::Unit::TestCase
end
def test_and
- d = Document.new %q{<doc><route run='*' title='HNO'
- destination='debian_production1' date='*' edition='*'
+ d = Document.new %q{<doc><route run='*' title='HNO'
+ destination='debian_production1' date='*' edition='*'
source='debian_satellite1'/></doc>}
assert_equal( nil, d.root.elements["route[@run='0']"] )
assert_equal( nil, d.root.elements["route[@run='0' and @title='HNO']"] )
@@ -803,7 +803,7 @@ class XPathTester < Test::Unit::TestCase
EOL
rd = REXML::Document.new( src )
union = rd.get_elements('//em|//strong')
- assert_equal(2, union.length,
+ assert_equal(2, union.length,
'Both tag types are returned by XPath union operator')
end
@@ -828,7 +828,7 @@ class XPathTester < Test::Unit::TestCase
d = REXML::Document.new( string )
c1 = XPath.match( d, '/a/*/*[1]' )
assert_equal( 1, c1.length )
- assert_equal( 'c1', c1[0].name )
+ assert_equal( 'c1', c1[0].name )
end
def test_sum
@@ -872,25 +872,25 @@ class XPathTester < Test::Unit::TestCase
</channel>
</rss>
EOL
- root_node = XPath.first(doc, "rss")
- assert_not_nil root_node
- channel_node = XPath.first(root_node, "channel")
- assert_not_nil channel_node
- items = XPath.match(channel_node, "*")
- assert_equal 4, items.size
- items = XPath.match(channel_node, "item")
+ root_node = XPath.first(doc, "rss")
+ assert_not_nil root_node
+ channel_node = XPath.first(root_node, "channel")
+ assert_not_nil channel_node
+ items = XPath.match(channel_node, "*")
+ assert_equal 4, items.size
+ items = XPath.match(channel_node, "item")
assert_equal 3, items.size # fails
end
def test_ticket_42
- source = "<a></a>"
- doc = Document.new(source)
- bElem = Element.new('b')
- doc.root.add_element(bElem)
- doc.elements.each('//b[name(..) = "a"]') { |x|
- assert_equal x,bElem
- }
+ source = "<a></a>"
+ doc = Document.new(source)
+ bElem = Element.new('b')
+ doc.root.add_element(bElem)
+ doc.elements.each('//b[name(..) = "a"]') { |x|
+ assert_equal x,bElem
+ }
end
def test_ticket_56
@@ -900,7 +900,7 @@ class XPathTester < Test::Unit::TestCase
column_headers = []
- REXML::XPath.each(finaldoc, '//h:form[@action="ModifyCampaign"]//h:th',
+ REXML::XPath.each(finaldoc, '//h:form[@action="ModifyCampaign"]//h:th',
namespaces) do |el|
node = REXML::XPath.first(el, 'h:a/text()', namespaces)
column_headers << (node ? node.value : nil)
@@ -915,17 +915,17 @@ class XPathTester < Test::Unit::TestCase
def test_ticket_70
string = <<EOF
+
+<mydoc>
-<mydoc>
+ <someelement attribute="1.10">Text1, text,
+text</someelement>
- <someelement attribute="1.10">Text1, text,
-text</someelement>
+ <someelement attribute="1.11">Text2, text,
+text</someelement>
- <someelement attribute="1.11">Text2, text,
-text</someelement>
-
-
-</mydoc>
+
+</mydoc>
EOF
doc = Document.new string
@@ -933,7 +933,7 @@ EOF
end
def test_ticket_43
- #url = http://news.search.yahoo.com/news/rss?p=market&ei=UTF-8&fl=0&x=wrt
+ #url = http://news.search.yahoo.com/news/rss?p=market&ei=UTF-8&fl=0&x=wrt
sum = Document.new(File.new(fixture_path("yahoo.xml"))).elements.to_a("//item").size
assert_equal( 10, sum )
@@ -988,12 +988,12 @@ EOF
def ticket_61_fixture(doc, xpath)
matches = []
doc.elements.each(xpath) do |element|
- matches << element
- assert_equal('Add', element.text)
+ matches << element
+ assert_equal('Add', element.text)
assert_equal('ButtonText', element.attributes['class'])
end
assert_equal(1, matches.length)
- end
+ end
def test_ticket_61_text
file = File.open(fixture_path("ticket_61.xml"))
diff --git a/test/rexml/test_xpath_attribute_query.rb b/test/rexml/test_xpath_attribute_query.rb
index c0ad2c2e8c..99439f2286 100644
--- a/test/rexml/test_xpath_attribute_query.rb
+++ b/test/rexml/test_xpath_attribute_query.rb
@@ -6,7 +6,7 @@ require 'test/unit'
require 'rexml/document'
class TestRexmlXpathAttributeQuery < Test::Unit::TestCase
-
+
# xmlstr1 and xmlstr2 only differ in the second line - namespaces in the root element
@@xmlstr1 = '<?xml version="1.0" encoding="UTF-8"?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" xmlns:gd="http://schemas.google.com/g/2005" xmlns:gCal="http://schemas.google.com/gCal/2005">
@@ -26,7 +26,7 @@ class TestRexmlXpathAttributeQuery < Test::Unit::TestCase
</entry>
</feed>'
-
+
@@xmlstr2 = '<?xml version="1.0" encoding="UTF-8"?>
<feed>
<id>http://www.google.com/calendar/feeds/me%40gmail.com</id>
@@ -44,22 +44,22 @@ class TestRexmlXpathAttributeQuery < Test::Unit::TestCase
</author>
</entry>
</feed>'
-
+
# Fails
def test_xpath_query
do_test @@xmlstr1
end
-
+
# Passes
def test_xpath_query_no_namespace
do_test @@xmlstr2
end
-
+
def do_test(xmlString)
- hrefs = [
- "http://www.google.com/calendar/feeds/me%40gmail.com/private/full",
- "http://www.google.com/calendar/feeds/me%40gmail.com/acl/full",
- "http://www.google.com/calendar/feeds/me%40gmail.com/me%40gmail.com"
+ hrefs = [
+ "http://www.google.com/calendar/feeds/me%40gmail.com/private/full",
+ "http://www.google.com/calendar/feeds/me%40gmail.com/acl/full",
+ "http://www.google.com/calendar/feeds/me%40gmail.com/me%40gmail.com"
]
ctr=0
REXML::Document.new(xmlString).elements.each("feed/entry") do |element|
@@ -70,13 +70,13 @@ class TestRexmlXpathAttributeQuery < Test::Unit::TestCase
end
end
-
+
def test_another_way
doc = REXML::Document.new(@@xmlstr1)
- hrefs = [
- "http://www.google.com/calendar/feeds/me%40gmail.com/private/full",
- "http://www.google.com/calendar/feeds/me%40gmail.com/acl/full",
- "http://www.google.com/calendar/feeds/me%40gmail.com/me%40gmail.com"
+ hrefs = [
+ "http://www.google.com/calendar/feeds/me%40gmail.com/private/full",
+ "http://www.google.com/calendar/feeds/me%40gmail.com/acl/full",
+ "http://www.google.com/calendar/feeds/me%40gmail.com/me%40gmail.com"
]
ctr=0
REXML::XPath.each(doc, "//link[@rel='alternate']") do |element|
diff --git a/test/rexml/test_xpath_msw.rb b/test/rexml/test_xpath_msw.rb
index d0b474faf5..c03835e2f3 100644
--- a/test/rexml/test_xpath_msw.rb
+++ b/test/rexml/test_xpath_msw.rb
@@ -1,38 +1,38 @@
-require "test/unit/testcase"
-require "rexml/document"
-
-class XPathAxesTester < Test::Unit::TestCase
- include REXML
- SOURCE = <<-EOF
- <a id='1'>
- <e id='2'>
- <f id='3'/>
- <f id='4'/>
- <f id='5'/>
- <f id='6'/>
- </e>
- </a>
- EOF
-
- def setup
- @@doc = Document.new(SOURCE) unless defined? @@doc
- end
-
- def test_preceding_sibling_axis
- context = XPath.first(@@doc,"/a/e/f[last()]")
- assert_equal "6", context.attributes["id"]
-
- prev = XPath.first(context, "preceding-sibling::f")
- assert_equal "5", prev.attributes["id"]
-
- prev = XPath.first(context, "preceding-sibling::f[1]")
- assert_equal "5", prev.attributes["id"]
-
- prev = XPath.first(context, "preceding-sibling::f[2]")
- assert_equal "4", prev.attributes["id"]
-
- prev = XPath.first(context, "preceding-sibling::f[3]")
- assert_equal "3", prev.attributes["id"]
- end
-end
-
+require "test/unit/testcase"
+require "rexml/document"
+
+class XPathAxesTester < Test::Unit::TestCase
+ include REXML
+ SOURCE = <<-EOF
+ <a id='1'